From f4bca04edcff9a7e3189601424173a67e2e4dc13 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Tue, 24 Jan 2012 17:26:45 -0500
Subject: [PATCH 01/29] CC-3270: Update "airtime-update-db-settings.py" fails

-fixed. We no longer need to run phing.
---
 utils/airtime-update-db-settings.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/utils/airtime-update-db-settings.py b/utils/airtime-update-db-settings.py
index ff292a460..d28322fb1 100644
--- a/utils/airtime-update-db-settings.py
+++ b/utils/airtime-update-db-settings.py
@@ -2,7 +2,7 @@
 The purpose of this script is to consolidate into one location where 
 we need to update database host, dbname, username and password.
 
-This script reads from airtime.conf.
+This script reads from /etc/airtime/airtime.conf.
 """
 import os
 import sys
@@ -14,9 +14,11 @@ if os.geteuid() != 0:
     print "Please run this as root."
     sys.exit(1)
 
+airtime_conf = '/etc/airtime/airtime.conf'
+
 #Read the universal values
 parser = ConfigParser.SafeConfigParser()
-parser.read('/etc/airtime/airtime.conf')
+parser.read(airtime_conf)
 
 host = 'resources.db.params.host'
 dbname = 'resources.db.params.dbname'
@@ -24,7 +26,11 @@ username = 'resources.db.params.username'
 password = 'resources.db.params.password'
 
 airtime_dir = parser.get('general', 'airtime_dir')
-print 'Airtime root folder found at %s' % airtime_dir
+if os.path.exists(airtime_dir):
+    print 'Airtime root folder found at %s' % airtime_dir
+else:
+    print 'Could not find Airtime root folder specified by "airtime_dir" in %s' % airtime_conf
+    sys.exit(1)
 
 print ("Updating %s/application/configs/application.ini" % airtime_dir)
 f = file('%s/application/configs/application.ini' % airtime_dir,'r')
@@ -47,7 +53,7 @@ f.writelines(file_lines)
 f.close()
 
 
-print ("Updating %s/build.properties" % airtime_dir)
+print ("Updating %s/build/build.properties" % airtime_dir)
 
 f = file('%s/build/build.properties' % airtime_dir, 'r')
 file_lines = []
@@ -66,7 +72,7 @@ f = file('%s/build/build.properties' % airtime_dir, 'w')
 f.writelines(file_lines)
 f.close()
 
-print ("Updating %s/runtime-conf.xml" % airtime_dir)
+print ("Updating %s/build/runtime-conf.xml" % airtime_dir)
 
 doc = xml.dom.minidom.parse('%s/build/runtime-conf.xml' % airtime_dir)
 
@@ -78,6 +84,4 @@ xml_file = open('%s/build/runtime-conf.xml' % airtime_dir, "w")
 xml_file.writelines(doc.toxml('utf-8'))
 xml_file.close()
 
-print 'Regenerating propel-config.php'
-os.system('cd %s/build && %s/library/propel/generator/bin/propel-gen' % (airtime_dir, airtime_dir))
-
+print "Success!"

From c0e71dc58d3171dc310d076579c78450a7d91059 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 25 Jan 2012 02:26:46 -0500
Subject: [PATCH 02/29] -Some user-friendly changes to upgrade script

---
 .../airtime-2.0.0/airtime-upgrade.php         | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index 48f9a6b58..8ca0fc63e 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -32,8 +32,10 @@ class AirtimeDatabaseUpgrade{
     public static function start(){
         self::doDbMigration();
 
-        self::SetDefaultTimezone();
         self::setPhpDefaultTimeZoneToSystemTimezone();
+        self::SetDefaultTimezone();
+        
+        echo "* Converting database to store all schedule times in UTC. This may take a a while...".PHP_EOL;
         self::convert_cc_playlist();
         self::convert_cc_schedule();
         self::convert_cc_show_days();
@@ -69,6 +71,7 @@ class AirtimeDatabaseUpgrade{
     }
 
     private static function convert_cc_playlist(){
+        echo " * Converting playlists to UTC".PHP_EOL;
         /* cc_playlist has a field that keeps track of when the playlist was last modified. */
         $playlists = CcPlaylistQuery::create()->find();
         
@@ -78,10 +81,14 @@ class AirtimeDatabaseUpgrade{
             $pl->setDbMtime($dt);
             
             $pl->save();
+            echo ".";
         }
+        
+        echo PHP_EOL;
     }
 
     private static function convert_cc_schedule(){
+        echo " * Converting schedule to UTC".PHP_EOL;
         /* cc_schedule has start and end fields that need to be changed to UTC. */
         $schedules = CcScheduleQuery::create()->find();
         
@@ -95,10 +102,15 @@ class AirtimeDatabaseUpgrade{
             $s->setDbEnds($dt);
             
             $s->save();
+            echo ".";
         }
+        
+        echo PHP_EOL;
     }
     
     private static function convert_cc_show_days(){
+        echo " * Converting show days to UTC".PHP_EOL;
+        
         /* cc_show_days has first_show, last_show and start_time fields that need to be changed to UTC. */
         $showDays = CcShowDaysQuery::create()->find();
         
@@ -118,11 +130,15 @@ class AirtimeDatabaseUpgrade{
             
             $sd->setDbTimezone(date_default_timezone_get())->save();
             
-            
+            echo ".";
         }
+        
+        echo PHP_EOL;
     }
     
     private static function convert_cc_show_instances(){
+        echo " * Converting show instances to UTC".PHP_EOL;
+        
         /* convert_cc_show_instances has starts and ends fields that need to be changed to UTC. */
         $showInstances = CcShowInstancesQuery::create()->find();
         
@@ -136,7 +152,11 @@ class AirtimeDatabaseUpgrade{
             $si->setDbEnds($dt);
             
             $si->save();
+            
+            echo ".";
         }
+        
+        echo PHP_EOL;
     }
 
     private static function doDbMigration(){
@@ -356,9 +376,15 @@ class AirtimeMiscUpgrade{
     }
 }
 
+echo "Pausing Pypo".PHP_EOL;
+exec("/etc/init.d/airtime-playout stop");
+
 UpgradeCommon::connectToDatabase();
 
 AirtimeDatabaseUpgrade::start();
 AirtimeStorWatchedDirsUpgrade::start();
 AirtimeConfigFileUpgrade::start();
 AirtimeMiscUpgrade::start();
+
+echo "Resuming Pypo".PHP_EOL;
+exec("/etc/init.d/airtime-playout start");

From 6215eb0dba6e7b631cd42d11f0c52a1f130d38c6 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 25 Jan 2012 03:28:20 -0500
Subject: [PATCH 03/29] -fix upgrade for large result sets.

---
 .../upgrades/airtime-2.0.0/UpgradeCommon.php  |  12 ++
 .../airtime-2.0.0/airtime-upgrade.php         | 129 ++++++++++++++----
 python_apps/pypo/install/pypo-initialize.py   |   6 +-
 3 files changed, 115 insertions(+), 32 deletions(-)

diff --git a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
index 13836d6cd..ee638adfa 100644
--- a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
@@ -234,4 +234,16 @@ class UpgradeCommon{
         }
         fclose($fp);
     }
+    
+    public static function queryDb($p_sql){
+        global $CC_DBC;
+
+        $result = $CC_DBC->query($p_sql);
+        if (PEAR::isError($result)) {
+            echo "Error executing $sql. Exiting.";
+            exit(1);
+        }
+        
+        return $result;
+    }
 }
diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index 8ca0fc63e..69c35175a 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -72,7 +72,28 @@ class AirtimeDatabaseUpgrade{
 
     private static function convert_cc_playlist(){
         echo " * Converting playlists to UTC".PHP_EOL;
-        /* cc_playlist has a field that keeps track of when the playlist was last modified. */
+        
+        $sql = "SELECT * FROM cc_playlist";
+        $result = UpgradeCommon::queryDb($sql);
+
+        while ($result->fetchInto($row, DB_FETCHMODE_ASSOC)){
+            $dt = new DateTime($row['mtime'], new DateTimeZone(date_default_timezone_get()));
+            $dt->setTimezone(new DateTimeZone("UTC"));
+            
+            $id = $row['id'];
+            $mtime = $dt->format("Y-m-d H:i:s");
+            
+            $sql = "UPDATE cc_playlist SET mtime = '$mtime' WHERE id = $id";
+            UpgradeCommon::queryDb($sql);
+            //echo ".";
+            //flush();
+            //usleep(100000);
+        }
+        
+        
+        /*
+        echo " * Converting playlists to UTC".PHP_EOL;
+        // cc_playlist has a field that keeps track of when the playlist was last modified.
         $playlists = CcPlaylistQuery::create()->find();
         
         foreach ($playlists as $pl){
@@ -81,15 +102,39 @@ class AirtimeDatabaseUpgrade{
             $pl->setDbMtime($dt);
             
             $pl->save();
-            echo ".";
+            
         }
-        
-        echo PHP_EOL;
+        */
     }
 
     private static function convert_cc_schedule(){
+        
         echo " * Converting schedule to UTC".PHP_EOL;
-        /* cc_schedule has start and end fields that need to be changed to UTC. */
+        
+        $sql = "SELECT * FROM cc_schedule";
+        $result = UpgradeCommon::queryDb($sql);
+
+        while ($result->fetchInto($row, DB_FETCHMODE_ASSOC)){
+            $dtStarts = new DateTime($row['starts'], new DateTimeZone(date_default_timezone_get()));
+            $dtStarts->setTimezone(new DateTimeZone("UTC"));
+
+            $dtEnds = new DateTime($row['ends'], new DateTimeZone(date_default_timezone_get()));
+            $dtEnds->setTimezone(new DateTimeZone("UTC"));
+            
+            $id = $row['id'];
+            $starts = $dtStarts->format("Y-m-d H:i:s");
+            $ends = $dtEnds->format("Y-m-d H:i:s");
+            
+            $sql = "UPDATE cc_schedule SET starts = '$starts', ends = '$ends' WHERE id = $id";
+            UpgradeCommon::queryDb($sql);
+            //echo ".";
+            //flush();
+            //usleep(100000);
+        }
+        /*
+        
+        echo " * Converting schedule to UTC".PHP_EOL;
+        //cc_schedule has start and end fields that need to be changed to UTC.
         $schedules = CcScheduleQuery::create()->find();
         
         foreach ($schedules as $s){
@@ -104,42 +149,67 @@ class AirtimeDatabaseUpgrade{
             $s->save();
             echo ".";
         }
-        
-        echo PHP_EOL;
+        * */
     }
     
     private static function convert_cc_show_days(){
+
         echo " * Converting show days to UTC".PHP_EOL;
         
-        /* cc_show_days has first_show, last_show and start_time fields that need to be changed to UTC. */
+        $sql = "SELECT * FROM cc_show_days";
+        $result = UpgradeCommon::queryDb($sql);
+
+        while ($result->fetchInto($row, DB_FETCHMODE_ASSOC)){
+            
+            $id = $row['id'];
+            $timezone = date_default_timezone_get();
+            
+            $sql = "UPDATE cc_show_days SET timezone = '$timezone' WHERE id = $id";
+            UpgradeCommon::queryDb($sql);
+            //echo ".";
+            //flush();
+            //usleep(100000);
+        }
+        
+        /*
+        // cc_show_days has first_show, last_show and start_time fields that need to be changed to UTC.
         $showDays = CcShowDaysQuery::create()->find();
         
-        foreach ($showDays as $sd){
-            /*
-            $dt = new DateTime($sd->getDbFirstShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get()));
-            $dt->setTimezone(new DateTimeZone("UTC"));
-            $sd->setDbFirstShow($dt->format("Y-m-d"));
-            $sd->setDbStartTime($dt->format("H:i:s"));
-            
-            $dt = new DateTime($sd->getDbLastShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get()));
-            $dt->setTimezone(new DateTimeZone("UTC"));
-            $sd->setDbLastShow($dt->format("Y-m-d"));
-            
-            $sd->save();
-            * */
-            
+        foreach ($showDays as $sd){            
             $sd->setDbTimezone(date_default_timezone_get())->save();
             
             echo ".";
         }
-        
-        echo PHP_EOL;
+        */
     }
     
     private static function convert_cc_show_instances(){
         echo " * Converting show instances to UTC".PHP_EOL;
         
-        /* convert_cc_show_instances has starts and ends fields that need to be changed to UTC. */
+        // convert_cc_show_instances has starts and ends fields that need to be changed to UTC.
+        
+        $sql = "SELECT * FROM cc_show_instances";
+        $result = UpgradeCommon::queryDb($sql);
+
+        while ($result->fetchInto($row, DB_FETCHMODE_ASSOC)){
+            $dtStarts = new DateTime($row['starts'], new DateTimeZone(date_default_timezone_get()));
+            $dtStarts->setTimezone(new DateTimeZone("UTC"));
+
+            $dtEnds = new DateTime($row['ends'], new DateTimeZone(date_default_timezone_get()));
+            $dtEnds->setTimezone(new DateTimeZone("UTC"));
+            
+            $id = $row['id'];
+            $starts = $dtStarts->format("Y-m-d H:i:s");
+            $ends = $dtEnds->format("Y-m-d H:i:s");
+            
+            $sql = "UPDATE cc_show_instances SET starts = '$starts', ends = '$ends' WHERE id = $id";
+            UpgradeCommon::queryDb($sql);
+            //echo ".";
+            //flush();
+            //usleep(100000);
+        }        
+        
+        /*
         $showInstances = CcShowInstancesQuery::create()->find();
         
         foreach ($showInstances as $si){
@@ -155,8 +225,7 @@ class AirtimeDatabaseUpgrade{
             
             echo ".";
         }
-        
-        echo PHP_EOL;
+        * */
     }
 
     private static function doDbMigration(){
@@ -379,6 +448,8 @@ class AirtimeMiscUpgrade{
 echo "Pausing Pypo".PHP_EOL;
 exec("/etc/init.d/airtime-playout stop");
 
+while (@ob_end_flush());
+
 UpgradeCommon::connectToDatabase();
 
 AirtimeDatabaseUpgrade::start();
@@ -386,5 +457,5 @@ AirtimeStorWatchedDirsUpgrade::start();
 AirtimeConfigFileUpgrade::start();
 AirtimeMiscUpgrade::start();
 
-echo "Resuming Pypo".PHP_EOL;
-exec("/etc/init.d/airtime-playout start");
+//echo "Resuming Pypo".PHP_EOL;
+//exec("/etc/init.d/airtime-playout start");
diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py
index 9df8245aa..4fce8f81c 100644
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@@ -106,13 +106,13 @@ try:
         print "* Waiting for pypo processes to start..."
         if os.environ["liquidsoap_keep_alive"] == "f":
             print " * Restarting any previous Liquidsoap instances"
-            p = Popen("/etc/init.d/airtime-playout stop", shell=True)
+            p = Popen("/etc/init.d/airtime-playout stop > /dev/null 2>&1", shell=True)
             sts = os.waitpid(p.pid, 0)[1]
         else:
             print " * Keeping any previous Liquidsoap instances running"
-            p = Popen("/etc/init.d/airtime-playout pypo-stop", shell=True)
+            p = Popen("/etc/init.d/airtime-playout pypo-stop  > /dev/null 2>&1", shell=True)
             sts = os.waitpid(p.pid, 0)[1]
-        p = Popen("/etc/init.d/airtime-playout start-no-monit", shell=True)
+        p = Popen("/etc/init.d/airtime-playout start-no-monit  > /dev/null 2>&1", shell=True)
         sts = os.waitpid(p.pid, 0)[1]
     
 except Exception, e:

From 9cf8bdcad8ec6c53d4ccb8ee09741212f1d0ff86 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 25 Jan 2012 09:16:39 -0500
Subject: [PATCH 04/29] set max bitrate to 320 on airtime-upgrade

---
 install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
index 69c35175a..ddc3d9646 100644
--- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
@@ -247,7 +247,7 @@ class AirtimeDatabaseUpgrade{
         $sql = "INSERT INTO cc_pref(keystr, valstr) VALUES('stream_type', 'ogg, mp3');
                 INSERT INTO cc_pref(keystr, valstr) VALUES('stream_bitrate', '24, 32, 48, 64, 96, 128, 160, 192, 224, 256, 320');
                 INSERT INTO cc_pref(keystr, valstr) VALUES('num_of_streams', '3');
-                INSERT INTO cc_pref(keystr, valstr) VALUES('max_bitrate', '128');
+                INSERT INTO cc_pref(keystr, valstr) VALUES('max_bitrate', '320');
                 INSERT INTO cc_pref(keystr, valstr) VALUES('plan_level', 'disabled');
                 
                 INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('output_sound_device', 'false', 'boolean');

From 2027db3609753364fa469709e9b9d3f55f4b7ba9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 25 Jan 2012 14:12:19 -0500
Subject: [PATCH 05/29] SAAS-178: Demo instance should prevent changing of
 admin password

- Error msg is returned when try to update admin account
---
 airtime_mvc/application/controllers/UserController.php | 7 ++++++-
 airtime_mvc/public/css/styles.css                      | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 37404931c..3c8b993f2 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -19,6 +19,8 @@ class UserController extends Zend_Controller_Action
 
     public function addUserAction()
     {
+        global $CC_CONFIG;
+        
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
         $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
@@ -33,7 +35,10 @@ class UserController extends Zend_Controller_Action
             if ($form->isValid($request->getPost())) {  
     
 				$formdata = $form->getValues();
-                if ($form->validateLogin($formdata)){                                                                       
+                if(isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1 && $formdata['login'] == 'admin' && $formdata['user_id'] != 0){
+                    $this->view->successMessage = "<div class='errors'>Specific action is not allowed in demo version!</div>";
+                }
+                else if ($form->validateLogin($formdata)){
                     $user = new Application_Model_User($formdata['user_id']);
                     $user->setFirstName($formdata['first_name']);
                     $user->setLastName($formdata['last_name']);
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 7b95307f7..56129f751 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1338,6 +1338,15 @@ div.success{
 	border:1px solid #488214;
 }
 
+div.errors{
+	color:#902d2d;
+	font-size:11px;
+    padding:2px 4px;
+    background:#c6b4b4;
+    margin-bottom:2px;
+    border:1px solid #c83f3f;
+}
+
 .collapsible-header, .collapsible-header-disabled {
 	border: 1px solid #8f8f8f;
 	background-color: #cccccc;

From 9f2d0fc8d534a5f4f1751a90e379f9d86ae84adc Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Fri, 27 Jan 2012 15:30:44 -0500
Subject: [PATCH 06/29] CC-3284: Version the javascript directories so that
 upgrades work correctly for clients.

- appended timestamp of last modified time on all js and css file import
---
 airtime_mvc/application/Bootstrap.php         | 30 +++++++++---------
 .../controllers/DashboardController.php       |  4 ++-
 .../controllers/LibraryController.php         | 17 +++++-----
 .../controllers/LoginController.php           |  3 +-
 .../controllers/NowplayingController.php      | 18 ++++++-----
 .../controllers/PlaylistController.php        |  5 +--
 .../controllers/PluploadController.php        |  9 +++---
 .../controllers/PreferenceController.php      | 16 ++++++----
 .../controllers/ScheduleController.php        | 31 ++++++++++---------
 .../controllers/SystemstatusController.php    |  5 +--
 .../controllers/UserController.php            |  8 +++--
 11 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 60a9c9a64..09433a9c8 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -52,37 +52,39 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     {
         $view = $this->getResource('view');
         $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $view->headLink()->appendStylesheet($baseUrl.'/css/redmond/jquery-ui-1.8.8.custom.css');
-        $view->headLink()->appendStylesheet($baseUrl.'/css/pro_dropdown_3.css');
-        $view->headLink()->appendStylesheet($baseUrl.'/css/qtip/jquery.qtip.min.css');
-        $view->headLink()->appendStylesheet($baseUrl.'/css/styles.css');
+        $view->headLink()->appendStylesheet($baseUrl.'/css/redmond/jquery-ui-1.8.8.custom.css?'.filemtime($baseDir.'/css/redmond/jquery-ui-1.8.8.custom.css'));
+        $view->headLink()->appendStylesheet($baseUrl.'/css/pro_dropdown_3.css?'.filemtime($baseDir.'/css/pro_dropdown_3.css'));
+        $view->headLink()->appendStylesheet($baseUrl.'/css/qtip/jquery.qtip.min.css?'.filemtime($baseDir.'/css/qtip/jquery.qtip.min.css'));
+        $view->headLink()->appendStylesheet($baseUrl.'/css/styles.css?'.filemtime($baseDir.'/css/styles.css'));
     }
 
     protected function _initHeadScript()
     {
         $view = $this->getResource('view');
         $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.5.2.min.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.11.custom.min.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip2.min.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js');
+        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.5.2.min.js?'.filemtime($baseDir.'/js/libs/jquery-1.5.2.min.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.11.custom.min.js?'.filemtime($baseDir.'/js/libs/jquery-ui-1.8.11.custom.min.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js?'.filemtime($baseDir.'/js/libs/jquery.stickyPanel.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip2.min.js?'.filemtime($baseDir.'/js/qtip/jquery.qtip2.min.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.filemtime($baseDir.'/js/jplayer/jquery.jplayer.min.js'));
         $view->headScript()->appendScript("var baseUrl='$baseUrl/'");
 
         //scripts for now playing bar
-        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/helperfunctions.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/playlist.js','text/javascript');
-        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/helperfunctions.js?'.filemtime($baseDir.'/js/airtime/dashboard/helperfunctions.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/playlist.js?'.filemtime($baseDir.'/js/airtime/dashboard/playlist.js'),'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js?'.filemtime($baseDir.'/js/airtime/dashboard/versiontooltip.js'),'text/javascript');
 
-        $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js','text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js?'.filemtime($baseDir.'/js/airtime/common/common.js'),'text/javascript');
         
         if (Application_Model_Preference::GetPlanLevel() != "disabled"
                 && $_SERVER['REQUEST_URI'] != '/Dashboard/stream-player') {
             $client_id = Application_Model_Preference::GetClientId();
             $view->headScript()->appendScript("var livechat_client_id = '$client_id';");
-            $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js', 'text/javascript');
+            $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.filemtime($baseDir.'/js/airtime/common/livechat.js'), 'text/javascript');
         }
     }
 
diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index afdb26f33..b2a1e80a9 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -17,7 +17,9 @@ class DashboardController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
-        $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css');
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
+        
+        $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.blue.monday.css'));
         $this->_helper->layout->setLayout('bare');
 
         $logo = Application_Model_Preference::GetStationLogo();
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index f0b72099d..25813af73 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -26,16 +26,17 @@ class LibraryController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js?'.filemtime($baseDir.'/js/contextmenu/jjmenu.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.filemtime($baseDir.'/js/datatables/js/jquery.dataTables.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.filemtime($baseDir.'/js/datatables/plugin/dataTables.pluginAPI.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.filemtime($baseDir.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.filemtime($baseDir.'/js/airtime/library/library.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js?'.filemtime($baseDir.'/js/airtime/library/advancedsearch.js'),'text/javascript');
 
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css');
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css?'.filemtime($baseDir.'/css/media_library.css'));
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css?'.filemtime($baseDir.'/css/contextmenu.css'));
 
 
         $this->_helper->layout->setLayout('library');
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index b8c786be9..565b76f85 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -23,8 +23,9 @@ class LoginController extends Zend_Controller_Action
         $error = false;
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
         
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/login/login.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/login/login.js?'.filemtime($baseDir.'/js/airtime/login/login.js'),'text/javascript');
         
         $form = new Application_Form_Login();
         
diff --git a/airtime_mvc/application/controllers/NowplayingController.php b/airtime_mvc/application/controllers/NowplayingController.php
index 39841ab78..8c0e6c046 100644
--- a/airtime_mvc/application/controllers/NowplayingController.php
+++ b/airtime_mvc/application/controllers/NowplayingController.php
@@ -16,14 +16,15 @@ class NowplayingController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js?'.filemtime($baseDir.'/js/datatables/js/jquery.dataTables.min.js'),'text/javascript');
         
         //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time
         $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.filemtime($baseDir.'/js/airtime/nowplaying/nowplayingdatagrid.js'),'text/javascript');
         
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js?'.filemtime($baseDir.'/js/airtime/nowplaying/nowview.js'),'text/javascript');
         
         $refer_sses = new Zend_Session_Namespace('referrer');
         $userInfo = Zend_Auth::getInstance()->getStorage()->read();
@@ -67,7 +68,7 @@ class NowplayingController extends Zend_Controller_Action
                     $this->view->logoImg = $logo;
                 }
                 $this->view->dialog = $form;
-                $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');
+                $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.filemtime($baseDir.'/js/airtime/nowplaying/register.js'),'text/javascript');
             }
         }else{
             //popup if previous page was login
@@ -82,7 +83,7 @@ class NowplayingController extends Zend_Controller_Action
                     $this->view->logoImg = $logo;
                 }
                 $this->view->dialog = $form;
-            	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');
+            	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js?'.filemtime($baseDir.'/js/airtime/nowplaying/register.js'),'text/javascript');
             }
         }
     }
@@ -106,14 +107,15 @@ class NowplayingController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js?'.filemtime($baseDir.'/js/datatables/js/jquery.dataTables.min.js'),'text/javascript');
         
         //nowplayingdatagrid.js requires this variable, so that datePicker widget can be offset to server time instead of client time
         $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js?'.filemtime($baseDir.'/js/airtime/nowplaying/nowplayingdatagrid.js'),'text/javascript');
         
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/dayview.js?'.filemtime($baseDir.'/js/airtime/nowplaying/dayview.js'),'text/javascript');
     }
 
     public function remindmeAction()
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 9c3bc11ec..5f78bdd2d 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -79,9 +79,10 @@ class PlaylistController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js','text/javascript');
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.filemtime($baseDir.'/js/airtime/library/spl.js'),'text/javascript');
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.filemtime($baseDir.'/css/playlist_builder.css'));
 
 		$this->_helper->viewRenderer->setResponseSegment('spl');
 		$pl = $this->getPlaylist();
diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php
index df893ce0e..0a650498a 100644
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@@ -15,12 +15,13 @@ class PluploadController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/plupload/plupload.full.min.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/plupload/jquery.plupload.queue.min.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/plupload.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/plupload/plupload.full.min.js?'.filemtime($baseDir.'/js/plupload/plupload.full.min.js'),'text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/plupload/jquery.plupload.queue.min.js?'.filemtime($baseDir.'/js/plupload/jquery.plupload.queue.min.js'),'text/javascript');
+		$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/plupload.js?'.filemtime($baseDir.'/js/airtime/library/plupload.js'),'text/javascript');
 
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/plupload.queue.css');
+		$this->view->headLink()->appendStylesheet($baseUrl.'/css/plupload.queue.css?'.filemtime($baseDir.'/css/plupload.queue.css'));
     }
 
     public function uploadAction()
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 03ddd677b..62b9343b4 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -21,8 +21,9 @@ class PreferenceController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js?'.filemtime($baseDir.'/js/airtime/preferences/preferences.js'),'text/javascript');
         $this->view->statusMsg = "";
 
         $form = new Application_Form_Preferences();
@@ -58,8 +59,9 @@ class PreferenceController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/support-setting.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/support-setting.js?'.filemtime($baseDir.'/js/airtime/preferences/support-setting.js'),'text/javascript');
         $this->view->statusMsg = "";
 
         $isSass = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
@@ -117,9 +119,10 @@ class PreferenceController extends Zend_Controller_Action
         if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
             $request = $this->getRequest();
             $baseUrl = $request->getBaseUrl();
+            $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-            $this->view->headScript()->appendFile($baseUrl.'/js/serverbrowse/serverbrowser.js','text/javascript');
-            $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/musicdirs.js','text/javascript');
+            $this->view->headScript()->appendFile($baseUrl.'/js/serverbrowse/serverbrowser.js?'.filemtime($baseDir.'/js/serverbrowse/serverbrowser.js'),'text/javascript');
+            $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/musicdirs.js?'.filemtime($baseDir.'/js/airtime/preferences/musicdirs.js'),'text/javascript');
 
             $watched_dirs_pref = new Application_Form_WatchedDirPreferences();
 
@@ -131,9 +134,10 @@ class PreferenceController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/streamsetting.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/streamsetting.js?'.filemtime($baseDir.'/js/airtime/preferences/streamsetting.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js?'.filemtime($baseDir.'/js/meioMask/jquery.meio.mask.js'),'text/javascript');
 
         // get current settings
         $temp = Application_Model_StreamSetting::getStreamSetting();
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 0110ea335..82d7214f0 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -39,27 +39,28 @@ class ScheduleController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
-	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
-	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript');
-	$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js?'.filemtime($baseDir.'/js/contextmenu/jjmenu.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.filemtime($baseDir.'/js/datatables/js/jquery.dataTables.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.filemtime($baseDir.'/js/datatables/plugin/dataTables.pluginAPI.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar.js?'.filemtime($baseDir.'/js/fullcalendar/fullcalendar.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker-0.0.6.js?'.filemtime($baseDir.'/js/timepicker/jquery.ui.timepicker-0.0.6.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js?'.filemtime($baseDir.'/js/colorpicker/js/colorpicker.js'),'text/javascript');
 
         //full-calendar-functions.js requires this variable, so that datePicker widget can be offset to server time instead of client time
         $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
-    	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/full-calendar-functions.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/full-calendar-functions.js?'.filemtime($baseDir.'/js/airtime/schedule/full-calendar-functions.js'),'text/javascript');
 
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/add-show.js','text/javascript');
-    	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/schedule.js','text/javascript');
-    	$this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/add-show.js?'.filemtime($baseDir.'/js/airtime/schedule/add-show.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/schedule.js?'.filemtime($baseDir.'/js/airtime/schedule/schedule.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js?'.filemtime($baseDir.'/js/meioMask/jquery.meio.mask.js'),'text/javascript');
 
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css');
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
-        $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css?'.filemtime($baseDir.'/css/jquery-ui-timepicker.css'));
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css?'.filemtime($baseDir.'/css/fullcalendar.css'));
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css?'.filemtime($baseDir.'/css/colorpicker/css/colorpicker.css'));
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css?'.filemtime($baseDir.'/css/add-show.css'));
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css?'.filemtime($baseDir.'/css/contextmenu.css'));
 
         Application_Model_Schedule::createNewFormSections($this->view);
 
diff --git a/airtime_mvc/application/controllers/SystemstatusController.php b/airtime_mvc/application/controllers/SystemstatusController.php
index 3ed5e2508..35feec893 100644
--- a/airtime_mvc/application/controllers/SystemstatusController.php
+++ b/airtime_mvc/application/controllers/SystemstatusController.php
@@ -6,9 +6,10 @@ class SystemstatusController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
         
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/status/status.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js','text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/status/status.js?'.filemtime($baseDir.'/js/airtime/status/status.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.filemtime($baseDir.'/js/sprintf/sprintf-0.7-beta1.js'),'text/javascript');
     }
 
     public function indexAction()
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 3c8b993f2..30e39cfcd 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -23,9 +23,11 @@ class UserController extends Zend_Controller_Action
         
         $request = $this->getRequest();
         $baseUrl = $request->getBaseUrl();
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/user/user.js','text/javascript');    
+        $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
+        
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.filemtime($baseDir.'/js/datatables/js/jquery.dataTables.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.filemtime($baseDir.'/js/datatables/plugin/dataTables.pluginAPI.js'),'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/user/user.js?'.filemtime($baseDir.'/js/airtime/user/user.js'),'text/javascript');    
 
         $form = new Application_Form_AddUser();
 

From c5f3e40397b0933232b5fda2b9e4c1642657f17f Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 30 Jan 2012 16:28:27 -0500
Subject: [PATCH 07/29] SAAS-174: Ability to add Google Analytics to the demo
 instance

- done
---
 airtime_mvc/application/Bootstrap.php         | 19 +++++++++++++++++++
 .../application/layouts/scripts/bare.phtml    |  1 +
 .../application/layouts/scripts/layout.phtml  |  1 +
 .../application/layouts/scripts/library.phtml |  1 +
 .../application/layouts/scripts/login.phtml   |  1 +
 .../application/layouts/scripts/search.phtml  |  1 +
 6 files changed, 24 insertions(+)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 09433a9c8..69269b3b4 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -62,6 +62,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
     protected function _initHeadScript()
     {
+        global $CC_CONFIG;
+        
         $view = $this->getResource('view');
         $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
         $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
@@ -86,6 +88,23 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $view->headScript()->appendScript("var livechat_client_id = '$client_id';");
             $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.filemtime($baseDir.'/js/airtime/common/livechat.js'), 'text/javascript');
         }
+        if(isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1){
+            // since we need to append google analytic code right before </head> we can't use appendFile function
+            // we will just store raw html into some variable
+            $view->google_analytics = "<script type=\"text/javascript\">
+
+              var _gaq = _gaq || [];
+              _gaq.push(['_setAccount', 'UA-28765064-1']);
+              _gaq.push(['_trackPageview']);
+            
+              (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+              })();
+            
+            </script>";
+        }
     }
 
     protected function _initViewHelpers()
diff --git a/airtime_mvc/application/layouts/scripts/bare.phtml b/airtime_mvc/application/layouts/scripts/bare.phtml
index 43c42463c..b89443505 100644
--- a/airtime_mvc/application/layouts/scripts/bare.phtml
+++ b/airtime_mvc/application/layouts/scripts/bare.phtml
@@ -5,6 +5,7 @@
 	<title>Live stream</title>
     <?php echo $this->headScript() ?>
     <?php echo $this->headLink() ?>
+    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 <div id="content"><?php echo $this->layout()->content ?></div>
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 53ff557d1..10e6a5ec9 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -5,6 +5,7 @@
 	<?php echo $this->headTitle() ?>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
+	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 
diff --git a/airtime_mvc/application/layouts/scripts/library.phtml b/airtime_mvc/application/layouts/scripts/library.phtml
index 1241dfb50..b2982c1f4 100644
--- a/airtime_mvc/application/layouts/scripts/library.phtml
+++ b/airtime_mvc/application/layouts/scripts/library.phtml
@@ -5,6 +5,7 @@
 	<?php echo $this->headTitle() ?>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
+	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 
diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml
index 88328f2c5..e91b735ee 100644
--- a/airtime_mvc/application/layouts/scripts/login.phtml
+++ b/airtime_mvc/application/layouts/scripts/login.phtml
@@ -5,6 +5,7 @@
 	<?php echo $this->headTitle() ?>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
+	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 
diff --git a/airtime_mvc/application/layouts/scripts/search.phtml b/airtime_mvc/application/layouts/scripts/search.phtml
index 8cedbe21b..c3195b101 100644
--- a/airtime_mvc/application/layouts/scripts/search.phtml
+++ b/airtime_mvc/application/layouts/scripts/search.phtml
@@ -5,6 +5,7 @@
 	<?php echo $this->headTitle() ?>
 	<?php echo $this->headScript() ?>
 	<?php echo $this->headLink() ?>
+	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 <div id="nowplayingbar"><?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs())) ?></div>

From 733b23e7fc94bab39590f0c37e7c7ebfe96876fb Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 11:22:30 -0500
Subject: [PATCH 08/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
---
 python_apps/show-recorder/recorder.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 80bc4ada8..1cd4425a1 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -180,6 +180,7 @@ class CommandListener():
         self.current_schedule = {}
         self.shows_to_record = {}
         self.time_till_next_show = 3600
+        self.real_timeout = True
         self.logger.info("RecorderFetch: init complete")
         self.server_timezone = '';
 
@@ -240,11 +241,13 @@ class CommandListener():
             next_show = getDateTimeObj(start_time)
 
             delta = next_show - tnow
+            self.real_timeout = False
             out = delta.seconds
 
             self.logger.debug("Next show %s", next_show)
             self.logger.debug("Now %s", tnow)
         else:
+            self.real_timeout = True
             out = 3600
         return out
 
@@ -306,6 +309,8 @@ class CommandListener():
             self.logger.error(e)
 
         loops = 1
+        recording = False
+        
         while True:
             self.logger.info("Loop #%s", loops)
             try:
@@ -315,10 +320,19 @@ class CommandListener():
                 self.logger.info(s)
                 # start recording
                 self.start_record()
+                
+                # if real timeout happended get show schedule from airtime
+                if self.real_timeout :
+                    temp = self.api_client.get_shows_to_record()
+                    if temp is not None:
+                        shows = temp['shows']
+                        self.server_timezone = temp['server_timezone']
+                        self.parse_shows(shows)
+                    self.logger.info("Real Timeout: the schedule has updated")
+                
             except Exception, e:
                 self.logger.info(e)
                 time.sleep(3)
-
             loops += 1
 
 if __name__ == '__main__':

From 4874eb4f34801c5e08cead5c28564cb3529b51bc Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 11:37:12 -0500
Subject: [PATCH 09/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- bug fix
---
 python_apps/show-recorder/recorder.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 1cd4425a1..7ac18b046 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -275,8 +275,9 @@ class CommandListener():
                 self.sr.start()
                 #remove show from shows to record.
                 del self.shows_to_record[start_time]
-                time_till_next_show = self.get_time_till_next_show()
-                self.time_till_next_show = time_till_next_show
+                self.time_till_next_show = self.get_time_till_next_show()
+                # set real_timtout to false no matter what
+                self.real_timeout = False
             except Exception,e :
                 import traceback
                 top = traceback.format_exc()

From 3b64da7f4ebd2313fe085aa37b16bb314f1f4e04 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 15:28:57 -0500
Subject: [PATCH 10/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
---
 python_apps/show-recorder/recorder.cfg |  1 +
 python_apps/show-recorder/recorder.py  | 27 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/python_apps/show-recorder/recorder.cfg b/python_apps/show-recorder/recorder.cfg
index c010a8645..d817a32b2 100644
--- a/python_apps/show-recorder/recorder.cfg
+++ b/python_apps/show-recorder/recorder.cfg
@@ -24,6 +24,7 @@ record_bitrate = 256
 record_samplerate = 44100
 record_channels = 2
 record_sample_size = 16
+record_timeout = 3600
 
 #can be either ogg|mp3, mp3 recording requires installation of the package "lame"
 record_file_type = 'ogg'
diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 7ac18b046..3ec1caf39 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -179,8 +179,7 @@ class CommandListener():
         self.sr = None
         self.current_schedule = {}
         self.shows_to_record = {}
-        self.time_till_next_show = 3600
-        self.real_timeout = True
+        self.time_till_next_show = config["record_timeout"]
         self.logger.info("RecorderFetch: init complete")
         self.server_timezone = '';
 
@@ -214,7 +213,7 @@ class CommandListener():
                 self.parse_shows(temp)
                 self.server_timezone = m['server_timezone']
         elif(command == 'cancel_recording'):
-            if self.sr.is_recording():
+            if self.sr is not None and self.sr.is_recording():
                 self.sr.cancel_recording()
 
     def parse_shows(self, shows):
@@ -241,14 +240,12 @@ class CommandListener():
             next_show = getDateTimeObj(start_time)
 
             delta = next_show - tnow
-            self.real_timeout = False
             out = delta.seconds
 
             self.logger.debug("Next show %s", next_show)
             self.logger.debug("Now %s", tnow)
         else:
-            self.real_timeout = True
-            out = 3600
+            out = config["record_timeout"]
         return out
 
     def start_record(self):
@@ -276,8 +273,6 @@ class CommandListener():
                 #remove show from shows to record.
                 del self.shows_to_record[start_time]
                 self.time_till_next_show = self.get_time_till_next_show()
-                # set real_timtout to false no matter what
-                self.real_timeout = False
             except Exception,e :
                 import traceback
                 top = traceback.format_exc()
@@ -316,14 +311,21 @@ class CommandListener():
             self.logger.info("Loop #%s", loops)
             try:
                 # block until 5 seconds before the next show start
-                self.connection.drain_events(timeout=self.time_till_next_show)
+                self.connection.drain_events(timeout=int(self.time_till_next_show))
             except socket.timeout, s:
                 self.logger.info(s)
+                
+                # start_record set time_till_next_show to config["record_timeout"] so we should check before
+                # if timeout amount was 1 hr..
+                update_schedule = False
+                if int(self.time_till_next_show) == int(config["record_timeout"]) :
+                    update_schedule = True
+                    
                 # start recording
                 self.start_record()
                 
                 # if real timeout happended get show schedule from airtime
-                if self.real_timeout :
+                if update_schedule :
                     temp = self.api_client.get_shows_to_record()
                     if temp is not None:
                         shows = temp['shows']
@@ -332,7 +334,10 @@ class CommandListener():
                     self.logger.info("Real Timeout: the schedule has updated")
                 
             except Exception, e:
-                self.logger.info(e)
+                import traceback
+                top = traceback.format_exc()
+                self.logger.error('Exception: %s', e)
+                self.logger.error("traceback: %s", top)
                 time.sleep(3)
             loops += 1
 

From 7ee17ba07eb5a2b60f100ef9bb3234e0e5ad1860 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Tue, 31 Jan 2012 21:24:01 -0500
Subject: [PATCH 11/29] CC-3291: Airtime is missing Australia and Arctic
 timezones

-fixed
---
 airtime_mvc/application/forms/GeneralPreferences.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 1514e1460..7bbb1784f 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -71,8 +71,10 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
             'Africa' => DateTimeZone::AFRICA,
             'America' => DateTimeZone::AMERICA,
             'Antarctica' => DateTimeZone::ANTARCTICA,
+            'Arctic' => DateTimeZone::ARCTIC,
             'Asia' => DateTimeZone::ASIA,
             'Atlantic' => DateTimeZone::ATLANTIC,
+            'Australia' => DateTimeZone::AUSTRALIA,
             'Europe' => DateTimeZone::EUROPE,
             'Indian' => DateTimeZone::INDIAN,
             'Pacific' => DateTimeZone::PACIFIC

From 47acb16e20b96c3ba07dcc30ec23c94e1cb54b6a Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 11:22:30 -0500
Subject: [PATCH 12/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
---
 python_apps/show-recorder/recorder.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 80bc4ada8..1cd4425a1 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -180,6 +180,7 @@ class CommandListener():
         self.current_schedule = {}
         self.shows_to_record = {}
         self.time_till_next_show = 3600
+        self.real_timeout = True
         self.logger.info("RecorderFetch: init complete")
         self.server_timezone = '';
 
@@ -240,11 +241,13 @@ class CommandListener():
             next_show = getDateTimeObj(start_time)
 
             delta = next_show - tnow
+            self.real_timeout = False
             out = delta.seconds
 
             self.logger.debug("Next show %s", next_show)
             self.logger.debug("Now %s", tnow)
         else:
+            self.real_timeout = True
             out = 3600
         return out
 
@@ -306,6 +309,8 @@ class CommandListener():
             self.logger.error(e)
 
         loops = 1
+        recording = False
+        
         while True:
             self.logger.info("Loop #%s", loops)
             try:
@@ -315,10 +320,19 @@ class CommandListener():
                 self.logger.info(s)
                 # start recording
                 self.start_record()
+                
+                # if real timeout happended get show schedule from airtime
+                if self.real_timeout :
+                    temp = self.api_client.get_shows_to_record()
+                    if temp is not None:
+                        shows = temp['shows']
+                        self.server_timezone = temp['server_timezone']
+                        self.parse_shows(shows)
+                    self.logger.info("Real Timeout: the schedule has updated")
+                
             except Exception, e:
                 self.logger.info(e)
                 time.sleep(3)
-
             loops += 1
 
 if __name__ == '__main__':

From da89b9fa745e8a9a3827128acaf4e7fe2aa50bc9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 11:37:12 -0500
Subject: [PATCH 13/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- bug fix
---
 python_apps/show-recorder/recorder.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 1cd4425a1..7ac18b046 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -275,8 +275,9 @@ class CommandListener():
                 self.sr.start()
                 #remove show from shows to record.
                 del self.shows_to_record[start_time]
-                time_till_next_show = self.get_time_till_next_show()
-                self.time_till_next_show = time_till_next_show
+                self.time_till_next_show = self.get_time_till_next_show()
+                # set real_timtout to false no matter what
+                self.real_timeout = False
             except Exception,e :
                 import traceback
                 top = traceback.format_exc()

From 47eacd1165d0f827b8c243fc5ccff31056e06b46 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 31 Jan 2012 15:28:57 -0500
Subject: [PATCH 14/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
---
 python_apps/show-recorder/recorder.cfg |  1 +
 python_apps/show-recorder/recorder.py  | 27 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/python_apps/show-recorder/recorder.cfg b/python_apps/show-recorder/recorder.cfg
index c010a8645..d817a32b2 100644
--- a/python_apps/show-recorder/recorder.cfg
+++ b/python_apps/show-recorder/recorder.cfg
@@ -24,6 +24,7 @@ record_bitrate = 256
 record_samplerate = 44100
 record_channels = 2
 record_sample_size = 16
+record_timeout = 3600
 
 #can be either ogg|mp3, mp3 recording requires installation of the package "lame"
 record_file_type = 'ogg'
diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py
index 7ac18b046..3ec1caf39 100644
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@@ -179,8 +179,7 @@ class CommandListener():
         self.sr = None
         self.current_schedule = {}
         self.shows_to_record = {}
-        self.time_till_next_show = 3600
-        self.real_timeout = True
+        self.time_till_next_show = config["record_timeout"]
         self.logger.info("RecorderFetch: init complete")
         self.server_timezone = '';
 
@@ -214,7 +213,7 @@ class CommandListener():
                 self.parse_shows(temp)
                 self.server_timezone = m['server_timezone']
         elif(command == 'cancel_recording'):
-            if self.sr.is_recording():
+            if self.sr is not None and self.sr.is_recording():
                 self.sr.cancel_recording()
 
     def parse_shows(self, shows):
@@ -241,14 +240,12 @@ class CommandListener():
             next_show = getDateTimeObj(start_time)
 
             delta = next_show - tnow
-            self.real_timeout = False
             out = delta.seconds
 
             self.logger.debug("Next show %s", next_show)
             self.logger.debug("Now %s", tnow)
         else:
-            self.real_timeout = True
-            out = 3600
+            out = config["record_timeout"]
         return out
 
     def start_record(self):
@@ -276,8 +273,6 @@ class CommandListener():
                 #remove show from shows to record.
                 del self.shows_to_record[start_time]
                 self.time_till_next_show = self.get_time_till_next_show()
-                # set real_timtout to false no matter what
-                self.real_timeout = False
             except Exception,e :
                 import traceback
                 top = traceback.format_exc()
@@ -316,14 +311,21 @@ class CommandListener():
             self.logger.info("Loop #%s", loops)
             try:
                 # block until 5 seconds before the next show start
-                self.connection.drain_events(timeout=self.time_till_next_show)
+                self.connection.drain_events(timeout=int(self.time_till_next_show))
             except socket.timeout, s:
                 self.logger.info(s)
+                
+                # start_record set time_till_next_show to config["record_timeout"] so we should check before
+                # if timeout amount was 1 hr..
+                update_schedule = False
+                if int(self.time_till_next_show) == int(config["record_timeout"]) :
+                    update_schedule = True
+                    
                 # start recording
                 self.start_record()
                 
                 # if real timeout happended get show schedule from airtime
-                if self.real_timeout :
+                if update_schedule :
                     temp = self.api_client.get_shows_to_record()
                     if temp is not None:
                         shows = temp['shows']
@@ -332,7 +334,10 @@ class CommandListener():
                     self.logger.info("Real Timeout: the schedule has updated")
                 
             except Exception, e:
-                self.logger.info(e)
+                import traceback
+                top = traceback.format_exc()
+                self.logger.error('Exception: %s', e)
+                self.logger.error("traceback: %s", top)
                 time.sleep(3)
             loops += 1
 

From 8e40c95e9ab9b4999407d4d9c73befc21ed3073b Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 1 Feb 2012 10:57:38 -0500
Subject: [PATCH 15/29] SAAS-174: Ability to add Google Analytics to the demo
 instance

- done
---
 airtime_mvc/application/Bootstrap.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 09433a9c8..beeccf1a5 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -62,6 +62,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
     protected function _initHeadScript()
     {
+        global $CC_CONFIG;
+        
         $view = $this->getResource('view');
         $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
         $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
@@ -86,6 +88,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $view->headScript()->appendScript("var livechat_client_id = '$client_id';");
             $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.filemtime($baseDir.'/js/airtime/common/livechat.js'), 'text/javascript');
         }
+        if(isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1){
+            $view->headScript()->appendFile($baseUrl.'/js/libs/google-analytics.js?'.filemtime($baseDir.'/js/libs/google-analytics.js'),'text/javascript');
+        }
     }
 
     protected function _initViewHelpers()

From 81d24b7825b166a14360cca37906dc8082a71fc1 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 1 Feb 2012 11:48:29 -0500
Subject: [PATCH 16/29] SAAS-174: Ability to add Google Analytics to the demo
 instance

- adding google-analytics.js
---
 airtime_mvc/public/js/libs/google-analytics.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 airtime_mvc/public/js/libs/google-analytics.js

diff --git a/airtime_mvc/public/js/libs/google-analytics.js b/airtime_mvc/public/js/libs/google-analytics.js
new file mode 100644
index 000000000..5a9352270
--- /dev/null
+++ b/airtime_mvc/public/js/libs/google-analytics.js
@@ -0,0 +1,9 @@
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-28765064-1']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();

From 026bdebaccfa5b6c2fe621d943c22300dfe024d4 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 1 Feb 2012 12:09:59 -0500
Subject: [PATCH 17/29] CC-3293: Stream settings page does not remember the
 stream metadata format

- fixed
---
 airtime_mvc/application/controllers/PreferenceController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 62b9343b4..2053a947e 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -205,6 +205,7 @@ class PreferenceController extends Zend_Controller_Action
                 
                 $values['icecast_vorbis_metadata'] = $form->getValue('icecast_vorbis_metadata');
                 $values['output_sound_device_type'] = $form->getValue('output_sound_device_type');
+                $values['streamFormat'] = $form->getValue('streamFormat'); 
 
             }
             if(!$error){
@@ -214,6 +215,8 @@ class PreferenceController extends Zend_Controller_Action
                 for($i=1;$i<=$num_of_stream;$i++){
                     Application_Model_StreamSetting::setLiquidsoapError($i, "waiting");
                 }
+                // this goes into cc_pref table
+                Application_Model_Preference::SetStreamLabelFormat($values['streamFormat']);
                 // store stream update timestamp
                 Application_Model_Preference::SetStreamUpdateTimestamp();
                 Application_Model_RabbitMq::SendMessageToPypo("update_stream_setting", $data);

From d0de29c10a7d5fcc3511395d574c62e908f93e55 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 1 Feb 2012 14:52:17 -0500
Subject: [PATCH 18/29] CC-3286: Shows not recorded after upgrade to 2.0.0 from
 1.8.2

- missing a line from cfg in upgrade folder
---
 install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200 b/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200
index 2765f9781..9ac92ce44 100644
--- a/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200
+++ b/install_minimal/upgrades/airtime-2.0.0/recorder.cfg.200
@@ -24,6 +24,7 @@ record_bitrate = 256
 record_samplerate = 44100
 record_channels = 2
 record_sample_size = 16
+record_timeout = 3600
 
 #can be either ogg|mp3, mp3 recording requires installation of the package "lame"
 record_file_type = 'ogg'
\ No newline at end of file

From 11e0f3ead809ec0b083e2bc775b3ad8213270b80 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 2 Feb 2012 14:11:03 -0500
Subject: [PATCH 19/29] CC-3296: Sometimes the Current Playing Item on the top
 Panel in the UI incorrectly shows "Nothing Scheduled"

---
 airtime_mvc/application/models/ShowInstance.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index b5dbfb55b..7a70f73e2 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -784,6 +784,7 @@ class Application_Model_ShowInstance {
         $sql = "SELECT si.id"
         ." FROM $CC_CONFIG[showInstances] si"
         ." WHERE si.ends < TIMESTAMP '$p_timeNow'"
+        ." AND si.modified_instance = 'f'"
         ." ORDER BY si.ends DESC"
         ." LIMIT 1";
 
@@ -798,10 +799,18 @@ class Application_Model_ShowInstance {
     public static function GetCurrentShowInstance($p_timeNow){
         global $CC_CONFIG, $CC_DBC;
 
+        /* Orderby si.starts descending, because in some cases
+         * we can have multiple shows overlapping each other. In
+         * this case, the show that started later is the one that
+         * is actually playing, and so this is the one we want.
+         */
+
         $sql = "SELECT si.id"
         ." FROM $CC_CONFIG[showInstances] si"
         ." WHERE si.starts <= TIMESTAMP '$p_timeNow'"
         ." AND si.ends > TIMESTAMP '$p_timeNow'"
+        ." AND si.modified_instance = 'f'"
+        ." ORDER BY si.starts DESC"
         ." LIMIT 1";
 
         $id = $CC_DBC->GetOne($sql);
@@ -818,6 +827,7 @@ class Application_Model_ShowInstance {
         $sql = "SELECT si.id"
         ." FROM $CC_CONFIG[showInstances] si"
         ." WHERE si.starts > TIMESTAMP '$p_timeNow'"
+        ." AND si.modified_instance = 'f'"
         ." ORDER BY si.starts"
         ." LIMIT 1";
 

From 214c6e85ccb6178e3044d126cd6b6e387f6a0d48 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 2 Feb 2012 16:14:13 -0500
Subject: [PATCH 20/29] -remove unneeded check of "if file_info is not None:"
 -remove undefined variable fomr phone_home_stat.php

---
 .../airtimefilemonitor/airtimemetadata.py     | 30 ++++++++++---------
 utils/phone_home_stat.php                     |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
index 17c97259e..dd9b481af 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
@@ -161,22 +161,24 @@ class AirtimeMetadata:
             self.logger.error("Exception %s", e)
             return None
 
+        #check if file has any metadata
         if file_info is None:
             return None
-        #check if file has any metadata
-        if file_info is not None:
-            for key in file_info.keys() :
-                if key in self.mutagen2airtime and len(file_info[key]) > 0:
-                    info = file_info[key][0]
-                    while True:
-                        temp = re.search(u"[\x80-\x9f]", info)
-                        if temp is not None:
-                            s = temp.group(0)
-                            replace = self.cp1252toUnicode.get(s)
-                            info = re.sub(s, replace, info)
-                        else:
-                            break
-                    md[self.mutagen2airtime[key]] = info
+
+        for key in file_info.keys() :
+            if key in self.mutagen2airtime and len(file_info[key]) > 0:
+                info = file_info[key][0]
+                while True:
+                    temp = re.search(u"[\x80-\x9f]", info)
+                    if temp is not None:
+                        s = temp.group(0)
+                        replace = self.cp1252toUnicode.get(s)
+                        info = re.sub(s, replace, info)
+                    else:
+                        break
+                md[self.mutagen2airtime[key]] = info
+                    
+                    
         if 'MDATA_KEY_TITLE' not in md:
             #get rid of file extention from original name, name might have more than 1 '.' in it.
             #filepath = to_unicode(filepath)
diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php
index c7738a6b4..fa6848bea 100644
--- a/utils/phone_home_stat.php
+++ b/utils/phone_home_stat.php
@@ -48,9 +48,7 @@ if (PEAR::isError($CC_DBC)) {
     echo "Database connection problem.".PHP_EOL;
     echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists".
         " with corresponding permissions.".PHP_EOL;*/
-    if ($p_exitOnError) {
-        exit(1);
-    }
+    exit(1);
 } else {
     //echo "* Connected to database".PHP_EOL;
     $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);

From 084214b6c825940d773f4cac2d827f7ec1c188c2 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 6 Feb 2012 12:26:20 -0500
Subject: [PATCH 21/29] CC-3299: Media monitor changes the owner of watched
 files?

- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
---
 .../airtimefilemonitor/mediamonitorcommon.py  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index dc7e81768..c98e2e21e 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -46,9 +46,13 @@ class MediaMonitorCommon:
             return False
 
     #check if file is readable by "nobody"
-    def has_correct_permissions(self, filepath):
+    def has_correct_permissions(self, filepath, euid='nobody', egid='nogroup'):
+        uid = pwd.getpwnam(euid)[2]
+        gid = grp.getgrnam(egid)[2]
+        
         #drop root permissions and become "nobody"
-        os.seteuid(65534)
+        os.seteuid(uid)
+        os.setegid(gid)
 
         try:
             open(filepath)
@@ -65,19 +69,18 @@ class MediaMonitorCommon:
 
         return readable
 
+    # the function only changes the permission if its not readable by www-data
     def set_needed_file_permissions(self, item, is_dir):
         try:
             omask = os.umask(0)
-
-            uid = pwd.getpwnam('www-data')[2]
-            gid = grp.getgrnam('www-data')[2]
-
-            os.chown(item, uid, gid)
-
-            if is_dir is True:
-                os.chmod(item, 02777)
-            else:
-                os.chmod(item, 0666)
+            
+            if not has_correct_permissions(item, 'www-data', 'www-data'):
+                os.chown(item, uid, gid)
+    
+                if is_dir is True:
+                    os.chmod(item, 02777)
+                else:
+                    os.chmod(item, 0666)
 
         except Exception, e:
             self.logger.error("Failed to change file's owner/group/permissions. %s", e)

From e8afd086bd8cdb262cdfc4cabe379c36f43f22e5 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 12:28:39 -0500
Subject: [PATCH 22/29] -fix annoying issue where media-monitor refuses to
 start if tmp directory /var/tmp/airtime does not exist. Just create it.

---
 .../media-monitor/airtimefilemonitor/mediamonitorcommon.py     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index dc7e81768..7f6e4e582 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -245,6 +245,9 @@ class MediaMonitorCommon:
         return stdout.splitlines()
 
     def touch_index_file(self):
+        dirname = os.path.dirname(self.timestamp_file)
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
         open(self.timestamp_file, "w")
 
     def organize_new_file(self, pathname):

From 4b7272a173cb1358981347d54fb9ef6042557e6e Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 6 Feb 2012 12:32:21 -0500
Subject: [PATCH 23/29] CC-3299: Media monitor changes the owner of watched
 files?

- bug fixed
---
 .../media-monitor/airtimefilemonitor/mediamonitorcommon.py     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index c98e2e21e..838cb7937 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -75,6 +75,9 @@ class MediaMonitorCommon:
             omask = os.umask(0)
             
             if not has_correct_permissions(item, 'www-data', 'www-data'):
+                uid = pwd.getpwnam('www-data')[2]
+                gid = grp.getgrnam('www-data')[2]
+                
                 os.chown(item, uid, gid)
     
                 if is_dir is True:

From 58b4576ae1975dbd26c5ba1be9a8eee74aaa38c6 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 14:18:03 -0500
Subject: [PATCH 24/29] CC-3297: Depend on zendframework and php-pear as
 external packages

-DB dependency should now be externalized
---
 airtime_mvc/application/models/tests/AllTests.php           | 1 -
 install_full/ubuntu/airtime-full-install                    | 2 +-
 install_full/ubuntu/airtime-full-install-nginx              | 2 +-
 install_minimal/include/AirtimeInstall.php                  | 4 +---
 install_minimal/include/airtime-upgrade.php                 | 3 ---
 install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php  | 1 -
 install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php    | 1 -
 install_minimal/upgrades/upgrade-template/UpgradeCommon.php | 1 -
 python_apps/pypo/test/airtime-schedule-insert.php           | 3 ---
 utils/phone_home_stat.php                                   | 2 --
 utils/soundcloud-uploader.php                               | 2 --
 11 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/airtime_mvc/application/models/tests/AllTests.php b/airtime_mvc/application/models/tests/AllTests.php
index 7ff5a8d9f..2d5620935 100644
--- a/airtime_mvc/application/models/tests/AllTests.php
+++ b/airtime_mvc/application/models/tests/AllTests.php
@@ -1,5 +1,4 @@
 <?php
-$path = dirname(__FILE__).'/../../../library/pear';
 set_include_path(get_include_path() . PATH_SEPARATOR . $path);
 $WHITE_SCREEN_OF_DEATH = false;
 
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index a17fcced0..211ff24c6 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libvorbis-ocaml libpulse0 vorbis-tools lsb-release
+libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx
index ea767f73c..3c129e350 100755
--- a/install_full/ubuntu/airtime-full-install-nginx
+++ b/install_full/ubuntu/airtime-full-install-nginx
@@ -42,7 +42,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
 libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
 libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
 php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
-libvorbis-ocaml libpulse0 vorbis-tools lsb-release
+libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 
 #install packages with --force-yes option (this is useful in the case
 #of Debian, where these packages are unauthorized)
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 9ba2c58fa..42c17619f 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -1,9 +1,7 @@
 <?php
 set_include_path(__DIR__.'/../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
 require_once('Zend/Loader/Autoloader.php');
-//Pear classes.
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
-require_once('pear/DB.php');
+require_once('DB.php');
 
 class AirtimeInstall
 {
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 9394d265e..18c7c7712 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -6,9 +6,6 @@
  * @license http://www.gnu.org/licenses/gpl.txt
  */
 
-//Pear classes.
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
-
 require_once('DB.php');
 require_once(__DIR__.'/airtime-constants.php');
 require_once(dirname(__FILE__).'/AirtimeIni.php');
diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
index 7dbc4aa86..eeca6f9f8 100644
--- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php
@@ -7,7 +7,6 @@
  */
 
 set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
-set_include_path(__DIR__.'/../../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once 'conf.php';
 require_once 'DB.php';
 
diff --git a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
index ee638adfa..a66bfd5df 100644
--- a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
@@ -1,6 +1,5 @@
 <?php
 
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 
 /* These are helper functions that are common to each upgrade such as
diff --git a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
index 8c55de9fa..ead2ba311 100644
--- a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
+++ b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php
@@ -1,6 +1,5 @@
 <?php
 
-set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 
 /* These are helper functions that are common to each upgrade such as
diff --git a/python_apps/pypo/test/airtime-schedule-insert.php b/python_apps/pypo/test/airtime-schedule-insert.php
index 1d947225e..defb843b4 100644
--- a/python_apps/pypo/test/airtime-schedule-insert.php
+++ b/python_apps/pypo/test/airtime-schedule-insert.php
@@ -10,9 +10,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . realpath(APPLICATION_PATH
 set_include_path(get_include_path() . PATH_SEPARATOR . APPLICATION_PATH . '/models');
 echo get_include_path().PHP_EOL;
 
-//Pear classes.
-set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/../library/pear');
-
 //Controller plugins.
 set_include_path(APPLICATION_PATH . get_include_path() . PATH_SEPARATOR . '/controllers/plugins');
 
diff --git a/utils/phone_home_stat.php b/utils/phone_home_stat.php
index fa6848bea..98bc242f5 100644
--- a/utils/phone_home_stat.php
+++ b/utils/phone_home_stat.php
@@ -38,8 +38,6 @@ require_once($CC_CONFIG['phpDir'].'/application/models/ShowInstance.php');
 require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php');
 require_once($CC_CONFIG['phpDir'].'/application/models/StreamSetting.php');
 
-//Pear classes.
-set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
 if (PEAR::isError($CC_DBC)) {
diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php
index 2882dacf7..43b8e150a 100644
--- a/utils/soundcloud-uploader.php
+++ b/utils/soundcloud-uploader.php
@@ -35,8 +35,6 @@ set_include_path($CC_CONFIG['phpDir']."/application/models" . PATH_SEPARATOR . g
 require_once($CC_CONFIG['phpDir']."/library/propel/runtime/lib/Propel.php");
 Propel::init($CC_CONFIG['phpDir']."/application/configs/airtime-conf.php");
 
-//Pear classes.
-set_include_path($CC_CONFIG['phpDir'].'/library/pear' . PATH_SEPARATOR . get_include_path());
 require_once('DB.php');
 $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
 if (PEAR::isError($CC_DBC)) {

From c229097470cfb8e06240da3a845b36fc5eadeeab Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 15:10:03 -0500
Subject: [PATCH 25/29] CC-3297: Depend on zendframework and php-pear as
 external packages

-DB dependency should now be externalized
---
 airtime_mvc/application/configs/conf.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 3eb436520..2e0d56536 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -52,9 +52,9 @@ $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
 // Add libs to the PHP path
 $old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
-					.PATH_SEPARATOR.$CC_CONFIG['zendPath']
-					.PATH_SEPARATOR.$old_include_path);
+set_include_path('.'
+                .PATH_SEPARATOR.$CC_CONFIG['zendPath']
+                .PATH_SEPARATOR.$old_include_path);
 
 class Config {
     public static function loadConfig($p_path) {

From 51e181b4456307860ff5d22ede7b7651cb4b4d3c Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 15:16:57 -0500
Subject: [PATCH 26/29] CC-3297: Depend on zendframework and php-pear as
 external packages

-removed pear files
---
 airtime_mvc/application/configs/conf.php      |    1 -
 airtime_mvc/library/pear/Archive/Tar.php      | 1909 -------------
 .../library/pear/Calendar/Calendar.php        |  780 ------
 airtime_mvc/library/pear/Calendar/Day.php     |  232 --
 .../library/pear/Calendar/Decorator.php       |  650 -----
 .../pear/Calendar/Decorator/Textual.php       |  208 --
 .../library/pear/Calendar/Decorator/Uri.php   |  183 --
 .../pear/Calendar/Decorator/Weekday.php       |  195 --
 .../pear/Calendar/Decorator/Wrapper.php       |  115 -
 .../pear/Calendar/Engine/Interface.php        |  377 ---
 .../library/pear/Calendar/Engine/PearDate.php |  509 ----
 .../library/pear/Calendar/Engine/UnixTS.php   |  463 ----
 airtime_mvc/library/pear/Calendar/Factory.php |  168 --
 airtime_mvc/library/pear/Calendar/Hour.php    |  137 -
 airtime_mvc/library/pear/Calendar/Minute.php  |  138 -
 airtime_mvc/library/pear/Calendar/Month.php   |  138 -
 .../library/pear/Calendar/Month/Weekdays.php  |  215 --
 .../library/pear/Calendar/Month/Weeks.php     |  166 --
 airtime_mvc/library/pear/Calendar/Second.php  |  122 -
 .../library/pear/Calendar/Table/Helper.php    |  316 ---
 .../library/pear/Calendar/Util/Textual.php    |  304 ---
 .../library/pear/Calendar/Util/Uri.php        |  204 --
 .../library/pear/Calendar/Validator.php       |  377 ---
 airtime_mvc/library/pear/Calendar/Week.php    |  470 ----
 airtime_mvc/library/pear/Calendar/Year.php    |  140 -
 airtime_mvc/library/pear/Calendar/docs/Readme |    3 -
 .../library/pear/Calendar/docs/examples/1.php |   92 -
 .../pear/Calendar/docs/examples/1.phps        |   92 -
 .../pear/Calendar/docs/examples/10.php        |   93 -
 .../pear/Calendar/docs/examples/10.phps       |   93 -
 .../pear/Calendar/docs/examples/11.php        |  109 -
 .../pear/Calendar/docs/examples/11.phps       |  109 -
 .../pear/Calendar/docs/examples/12.php        |  116 -
 .../pear/Calendar/docs/examples/12.phps       |  116 -
 .../pear/Calendar/docs/examples/13.php        |   99 -
 .../pear/Calendar/docs/examples/13.phps       |   99 -
 .../pear/Calendar/docs/examples/14.php        |  141 -
 .../pear/Calendar/docs/examples/14.phps       |  141 -
 .../pear/Calendar/docs/examples/15.php        |   58 -
 .../pear/Calendar/docs/examples/15.phps       |   58 -
 .../pear/Calendar/docs/examples/16.php        |   31 -
 .../pear/Calendar/docs/examples/16.phps       |   31 -
 .../pear/Calendar/docs/examples/17.php        |   71 -
 .../pear/Calendar/docs/examples/17.phps       |   71 -
 .../pear/Calendar/docs/examples/18.php        |   36 -
 .../pear/Calendar/docs/examples/18.phps       |   36 -
 .../pear/Calendar/docs/examples/19.php        |   24 -
 .../pear/Calendar/docs/examples/19.phps       |   24 -
 .../library/pear/Calendar/docs/examples/2.php |  142 -
 .../pear/Calendar/docs/examples/2.phps        |  142 -
 .../pear/Calendar/docs/examples/20.php        |  240 --
 .../pear/Calendar/docs/examples/20.phps       |  240 --
 .../pear/Calendar/docs/examples/21.php        |  139 -
 .../pear/Calendar/docs/examples/21.phps       |  139 -
 .../pear/Calendar/docs/examples/22.php        |   46 -
 .../pear/Calendar/docs/examples/22.phps       |   46 -
 .../pear/Calendar/docs/examples/23.php        |   66 -
 .../pear/Calendar/docs/examples/23.phps       |   66 -
 .../library/pear/Calendar/docs/examples/3.php |  134 -
 .../pear/Calendar/docs/examples/3.phps        |  134 -
 .../library/pear/Calendar/docs/examples/4.php |   49 -
 .../pear/Calendar/docs/examples/4.phps        |   49 -
 .../library/pear/Calendar/docs/examples/5.php |  132 -
 .../pear/Calendar/docs/examples/5.phps        |  132 -
 .../library/pear/Calendar/docs/examples/6.php |  210 --
 .../pear/Calendar/docs/examples/6.phps        |  210 --
 .../library/pear/Calendar/docs/examples/7.php |   92 -
 .../pear/Calendar/docs/examples/7.phps        |   92 -
 .../library/pear/Calendar/docs/examples/8.php |   70 -
 .../pear/Calendar/docs/examples/8.phps        |   70 -
 .../library/pear/Calendar/docs/examples/9.php |   16 -
 .../pear/Calendar/docs/examples/9.phps        |   16 -
 .../pear/Calendar/docs/examples/index.html    |   50 -
 .../library/pear/Calendar/tests/README        |    7 -
 .../library/pear/Calendar/tests/all_tests.php |   34 -
 .../Calendar/tests/calendar_engine_tests.php  |   20 -
 .../pear/Calendar/tests/calendar_include.php  |   28 -
 .../Calendar/tests/calendar_tabular_tests.php |   22 -
 .../pear/Calendar/tests/calendar_test.php     |  124 -
 .../pear/Calendar/tests/calendar_tests.php    |   25 -
 .../library/pear/Calendar/tests/day_test.php  |  107 -
 .../pear/Calendar/tests/decorator_test.php    |  268 --
 .../pear/Calendar/tests/decorator_tests.php   |   21 -
 .../Calendar/tests/decorator_textual_test.php |  179 --
 .../Calendar/tests/decorator_uri_test.php     |   37 -
 .../pear/Calendar/tests/helper_test.php       |   83 -
 .../library/pear/Calendar/tests/hour_test.php |   98 -
 .../pear/Calendar/tests/minute_test.php       |   99 -
 .../pear/Calendar/tests/month_test.php        |  119 -
 .../Calendar/tests/month_weekdays_test.php    |  182 --
 .../pear/Calendar/tests/month_weeks_test.php  |  129 -
 .../Calendar/tests/peardate_engine_test.php   |  130 -
 .../pear/Calendar/tests/second_test.php       |   34 -
 .../pear/Calendar/tests/simple_include.php    |   10 -
 .../Calendar/tests/table_helper_tests.php     |   19 -
 .../Calendar/tests/unixts_engine_test.php     |  110 -
 .../pear/Calendar/tests/util_tests.php        |   20 -
 .../pear/Calendar/tests/util_textual_test.php |  196 --
 .../pear/Calendar/tests/util_uri_test.php     |   54 -
 .../Calendar/tests/validator_error_test.php   |   34 -
 .../pear/Calendar/tests/validator_tests.php   |   20 -
 .../Calendar/tests/validator_unit_test.php    |  210 --
 .../Calendar/tests/week_firstday_0_test.php   |  241 --
 .../library/pear/Calendar/tests/week_test.php |  276 --
 .../library/pear/Calendar/tests/year_test.php |  142 -
 airtime_mvc/library/pear/Console/Getopt.php   |  290 --
 airtime_mvc/library/pear/DB.php               | 1489 ----------
 airtime_mvc/library/pear/DB/common.php        | 2257 ----------------
 airtime_mvc/library/pear/DB/dbase.php         |  510 ----
 airtime_mvc/library/pear/DB/fbsql.php         |  769 ------
 airtime_mvc/library/pear/DB/ibase.php         | 1082 --------
 airtime_mvc/library/pear/DB/ifx.php           |  683 -----
 airtime_mvc/library/pear/DB/msql.php          |  831 ------
 airtime_mvc/library/pear/DB/mssql.php         |  963 -------
 airtime_mvc/library/pear/DB/mysql.php         | 1045 -------
 airtime_mvc/library/pear/DB/mysqli.php        | 1092 --------
 airtime_mvc/library/pear/DB/oci8.php          | 1156 --------
 airtime_mvc/library/pear/DB/odbc.php          |  883 ------
 airtime_mvc/library/pear/DB/pgsql.php         | 1116 --------
 airtime_mvc/library/pear/DB/sqlite.php        |  959 -------
 airtime_mvc/library/pear/DB/storage.php       |  506 ----
 airtime_mvc/library/pear/DB/sybase.php        |  942 -------
 airtime_mvc/library/pear/File.php             |  543 ----
 airtime_mvc/library/pear/File/CSV.php         |  628 -----
 airtime_mvc/library/pear/File/Find.php        |  485 ----
 airtime_mvc/library/pear/File/Util.php        |  482 ----
 airtime_mvc/library/pear/HTML/Common.php      |  465 ----
 airtime_mvc/library/pear/HTML/QuickForm.php   | 2065 --------------
 .../library/pear/HTML/QuickForm/Renderer.php  |  158 --
 .../pear/HTML/QuickForm/Renderer/Array.php    |  340 ---
 .../HTML/QuickForm/Renderer/ArraySmarty.php   |  403 ---
 .../pear/HTML/QuickForm/Renderer/Default.php  |  485 ----
 .../HTML/QuickForm/Renderer/ITDynamic.php     |  300 ---
 .../pear/HTML/QuickForm/Renderer/ITStatic.php |  504 ----
 .../pear/HTML/QuickForm/Renderer/Object.php   |  461 ----
 .../HTML/QuickForm/Renderer/ObjectFlexy.php   |  291 --
 .../HTML/QuickForm/Renderer/QuickHtml.php     |  213 --
 .../library/pear/HTML/QuickForm/Rule.php      |   82 -
 .../pear/HTML/QuickForm/Rule/Callback.php     |  124 -
 .../pear/HTML/QuickForm/Rule/Compare.php      |  105 -
 .../pear/HTML/QuickForm/Rule/Email.php        |   73 -
 .../pear/HTML/QuickForm/Rule/Range.php        |   75 -
 .../pear/HTML/QuickForm/Rule/Regex.php        |  107 -
 .../pear/HTML/QuickForm/Rule/Required.php     |   63 -
 .../pear/HTML/QuickForm/RuleRegistry.php      |  349 ---
 .../pear/HTML/QuickForm/advcheckbox.php       |  286 --
 .../pear/HTML/QuickForm/autocomplete.php      |  258 --
 .../library/pear/HTML/QuickForm/button.php    |   80 -
 .../library/pear/HTML/QuickForm/checkbox.php  |  277 --
 .../library/pear/HTML/QuickForm/date.php      |  528 ----
 .../library/pear/HTML/QuickForm/element.php   |  494 ----
 .../library/pear/HTML/QuickForm/file.php      |  358 ---
 .../library/pear/HTML/QuickForm/group.php     |  588 ----
 .../library/pear/HTML/QuickForm/header.php    |   74 -
 .../library/pear/HTML/QuickForm/hidden.php    |   94 -
 .../pear/HTML/QuickForm/hiddenselect.php      |  118 -
 .../pear/HTML/QuickForm/hierselect.php        |  596 ----
 .../library/pear/HTML/QuickForm/html.php      |   77 -
 .../library/pear/HTML/QuickForm/image.php     |  127 -
 .../library/pear/HTML/QuickForm/input.php     |  209 --
 .../library/pear/HTML/QuickForm/link.php      |  200 --
 .../library/pear/HTML/QuickForm/password.php  |  115 -
 .../library/pear/HTML/QuickForm/radio.php     |  251 --
 .../library/pear/HTML/QuickForm/reset.php     |   79 -
 .../library/pear/HTML/QuickForm/select.php    |  614 -----
 .../library/pear/HTML/QuickForm/static.php    |  201 --
 .../library/pear/HTML/QuickForm/submit.php    |   89 -
 .../library/pear/HTML/QuickForm/text.php      |   98 -
 .../library/pear/HTML/QuickForm/textarea.php  |  229 --
 .../library/pear/HTML/QuickForm/xbutton.php   |  153 --
 airtime_mvc/library/pear/OS/Guess.php         |  338 ---
 airtime_mvc/library/pear/PEAR.php             | 1063 --------
 airtime_mvc/library/pear/PEAR/Autoloader.php  |  218 --
 airtime_mvc/library/pear/PEAR/Builder.php     |  474 ----
 airtime_mvc/library/pear/PEAR/ChannelFile.php | 1559 -----------
 .../library/pear/PEAR/ChannelFile/Parser.php  |   68 -
 airtime_mvc/library/pear/PEAR/Command.php     |  414 ---
 .../library/pear/PEAR/Command/Auth.php        |   81 -
 .../library/pear/PEAR/Command/Auth.xml        |   30 -
 .../library/pear/PEAR/Command/Build.php       |   85 -
 .../library/pear/PEAR/Command/Build.xml       |   10 -
 .../library/pear/PEAR/Command/Channels.php    |  883 ------
 .../library/pear/PEAR/Command/Channels.xml    |  123 -
 .../library/pear/PEAR/Command/Common.php      |  273 --
 .../library/pear/PEAR/Command/Config.php      |  413 ---
 .../library/pear/PEAR/Command/Config.xml      |   92 -
 .../library/pear/PEAR/Command/Install.php     | 1266 ---------
 .../library/pear/PEAR/Command/Install.xml     |  276 --
 .../library/pear/PEAR/Command/Mirror.php      |  139 -
 .../library/pear/PEAR/Command/Mirror.xml      |   18 -
 .../library/pear/PEAR/Command/Package.php     | 1119 --------
 .../library/pear/PEAR/Command/Package.xml     |  237 --
 .../library/pear/PEAR/Command/Pickle.php      |  421 ---
 .../library/pear/PEAR/Command/Pickle.xml      |   36 -
 .../library/pear/PEAR/Command/Registry.php    | 1145 --------
 .../library/pear/PEAR/Command/Registry.xml    |   58 -
 .../library/pear/PEAR/Command/Remote.php      |  809 ------
 .../library/pear/PEAR/Command/Remote.xml      |  109 -
 .../library/pear/PEAR/Command/Test.php        |  337 ---
 .../library/pear/PEAR/Command/Test.xml        |   54 -
 airtime_mvc/library/pear/PEAR/Common.php      |  837 ------
 airtime_mvc/library/pear/PEAR/Config.php      | 2097 ---------------
 airtime_mvc/library/pear/PEAR/Dependency2.php | 1358 ----------
 .../library/pear/PEAR/DependencyDB.php        |  769 ------
 airtime_mvc/library/pear/PEAR/Downloader.php  | 1762 ------------
 .../library/pear/PEAR/Downloader/Package.php  | 2004 --------------
 airtime_mvc/library/pear/PEAR/ErrorStack.php  |  985 -------
 airtime_mvc/library/pear/PEAR/Exception.php   |  389 ---
 .../library/pear/PEAR/FixPHP5PEARWarnings.php |    7 -
 airtime_mvc/library/pear/PEAR/Frontend.php    |  228 --
 .../library/pear/PEAR/Frontend/CLI.php        |  736 -----
 airtime_mvc/library/pear/PEAR/Installer.php   | 1823 -------------
 .../library/pear/PEAR/Installer/Role.php      |  276 --
 .../library/pear/PEAR/Installer/Role/Cfg.php  |  106 -
 .../library/pear/PEAR/Installer/Role/Cfg.xml  |   15 -
 .../pear/PEAR/Installer/Role/Common.php       |  174 --
 .../library/pear/PEAR/Installer/Role/Data.php |   28 -
 .../library/pear/PEAR/Installer/Role/Data.xml |   15 -
 .../library/pear/PEAR/Installer/Role/Doc.php  |   28 -
 .../library/pear/PEAR/Installer/Role/Doc.xml  |   15 -
 .../library/pear/PEAR/Installer/Role/Ext.php  |   28 -
 .../library/pear/PEAR/Installer/Role/Ext.xml  |   12 -
 .../library/pear/PEAR/Installer/Role/Php.php  |   28 -
 .../library/pear/PEAR/Installer/Role/Php.xml  |   15 -
 .../pear/PEAR/Installer/Role/Script.php       |   28 -
 .../pear/PEAR/Installer/Role/Script.xml       |   15 -
 .../library/pear/PEAR/Installer/Role/Src.php  |   34 -
 .../library/pear/PEAR/Installer/Role/Src.xml  |   12 -
 .../library/pear/PEAR/Installer/Role/Test.php |   28 -
 .../library/pear/PEAR/Installer/Role/Test.xml |   15 -
 .../library/pear/PEAR/Installer/Role/Www.php  |   28 -
 .../library/pear/PEAR/Installer/Role/Www.xml  |   15 -
 airtime_mvc/library/pear/PEAR/PackageFile.php |  501 ----
 .../pear/PEAR/PackageFile/Generator/v1.php    | 1284 ---------
 .../pear/PEAR/PackageFile/Generator/v2.php    |  893 ------
 .../pear/PEAR/PackageFile/Parser/v1.php       |  459 ----
 .../pear/PEAR/PackageFile/Parser/v2.php       |  113 -
 .../library/pear/PEAR/PackageFile/v1.php      | 1612 -----------
 .../library/pear/PEAR/PackageFile/v2.php      | 2045 --------------
 .../pear/PEAR/PackageFile/v2/Validator.php    | 2154 ---------------
 .../library/pear/PEAR/PackageFile/v2/rw.php   | 1604 -----------
 airtime_mvc/library/pear/PEAR/Packager.php    |  201 --
 airtime_mvc/library/pear/PEAR/REST.php        |  448 ---
 airtime_mvc/library/pear/PEAR/REST/10.php     |  867 ------
 airtime_mvc/library/pear/PEAR/REST/11.php     |  341 ---
 airtime_mvc/library/pear/PEAR/REST/13.php     |  299 --
 airtime_mvc/library/pear/PEAR/Registry.php    | 2395 -----------------
 airtime_mvc/library/pear/PEAR/RunTest.php     |  962 -------
 airtime_mvc/library/pear/PEAR/Task/Common.php |  202 --
 .../pear/PEAR/Task/Postinstallscript.php      |  323 ---
 .../pear/PEAR/Task/Postinstallscript/rw.php   |  169 --
 .../library/pear/PEAR/Task/Replace.php        |  176 --
 .../library/pear/PEAR/Task/Replace/rw.php     |   61 -
 .../library/pear/PEAR/Task/Unixeol.php        |   77 -
 .../library/pear/PEAR/Task/Unixeol/rw.php     |   56 -
 .../library/pear/PEAR/Task/Windowseol.php     |   77 -
 .../library/pear/PEAR/Task/Windowseol/rw.php  |   56 -
 airtime_mvc/library/pear/PEAR/Validate.php    |  629 -----
 .../library/pear/PEAR/Validator/PECL.php      |   63 -
 airtime_mvc/library/pear/PEAR/XMLParser.php   |  253 --
 airtime_mvc/library/pear/PEAR5.php            |   33 -
 airtime_mvc/library/pear/PHPUnit.php          |  132 -
 airtime_mvc/library/pear/PHPUnit/Assert.php   |  426 ---
 airtime_mvc/library/pear/PHPUnit/GUI/Gtk.php  |  740 -----
 airtime_mvc/library/pear/PHPUnit/GUI/HTML.php |  252 --
 airtime_mvc/library/pear/PHPUnit/GUI/HTML.tpl |  156 --
 .../pear/PHPUnit/GUI/SetupDecorator.php       |  209 --
 .../library/pear/PHPUnit/RepeatedTest.php     |  154 --
 airtime_mvc/library/pear/PHPUnit/Skeleton.php |  448 ---
 airtime_mvc/library/pear/PHPUnit/TestCase.php |  293 --
 .../library/pear/PHPUnit/TestDecorator.php    |  156 --
 .../library/pear/PHPUnit/TestFailure.php      |  130 -
 .../library/pear/PHPUnit/TestListener.php     |  162 --
 .../library/pear/PHPUnit/TestResult.php       |  347 ---
 .../library/pear/PHPUnit/TestSuite.php        |  262 --
 airtime_mvc/library/pear/System.php           |  621 -----
 airtime_mvc/library/pear/VERSIONS.txt         |   20 -
 airtime_mvc/library/pear/XML/Beautifier.php   |  397 ---
 .../library/pear/XML/Beautifier/Renderer.php  |  226 --
 .../pear/XML/Beautifier/Renderer/Plain.php    |  313 ---
 .../library/pear/XML/Beautifier/Tokenizer.php |  456 ----
 airtime_mvc/library/pear/XML/Parser.php       |  768 ------
 .../library/pear/XML/Parser/Simple.php        |  326 ---
 airtime_mvc/library/pear/XML/RPC.php          | 2053 --------------
 airtime_mvc/library/pear/XML/RPC/Dump.php     |  189 --
 airtime_mvc/library/pear/XML/RPC/Server.php   |  672 -----
 airtime_mvc/library/pear/XML/Serializer.php   | 1255 ---------
 airtime_mvc/library/pear/XML/Unserializer.php |  983 -------
 airtime_mvc/library/pear/XML/Util.php         |  911 -------
 .../airtime-1.8.0/airtime-upgrade.php         |    5 +-
 .../airtime-1.8.1/airtime-upgrade.php         |    7 +-
 .../airtime-1.8.2/airtime-upgrade.php         |    7 +-
 .../upgrades/airtime-1.9.0/conf.php           |    7 +-
 293 files changed, 7 insertions(+), 105114 deletions(-)
 delete mode 100644 airtime_mvc/library/pear/Archive/Tar.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Calendar.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Day.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Decorator.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Decorator/Textual.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Decorator/Uri.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Decorator/Weekday.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Decorator/Wrapper.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Engine/Interface.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Engine/PearDate.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Engine/UnixTS.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Factory.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Hour.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Minute.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Month.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Month/Weekdays.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Month/Weeks.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Second.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Table/Helper.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Util/Textual.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Util/Uri.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Validator.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Week.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/Year.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/Readme
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/1.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/1.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/10.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/10.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/11.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/11.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/12.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/12.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/13.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/13.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/14.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/14.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/15.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/15.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/16.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/16.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/17.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/17.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/18.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/18.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/19.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/19.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/2.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/2.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/20.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/20.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/21.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/21.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/22.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/22.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/23.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/23.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/3.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/3.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/4.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/4.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/5.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/5.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/6.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/6.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/7.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/7.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/8.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/8.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/9.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/9.phps
 delete mode 100644 airtime_mvc/library/pear/Calendar/docs/examples/index.html
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/README
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/all_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/calendar_engine_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/calendar_include.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/calendar_tabular_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/calendar_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/calendar_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/day_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/decorator_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/decorator_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/decorator_textual_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/decorator_uri_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/helper_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/hour_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/minute_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/month_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/month_weekdays_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/month_weeks_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/peardate_engine_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/second_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/simple_include.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/table_helper_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/unixts_engine_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/util_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/util_textual_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/util_uri_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/validator_error_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/validator_tests.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/validator_unit_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/week_firstday_0_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/week_test.php
 delete mode 100644 airtime_mvc/library/pear/Calendar/tests/year_test.php
 delete mode 100644 airtime_mvc/library/pear/Console/Getopt.php
 delete mode 100644 airtime_mvc/library/pear/DB.php
 delete mode 100644 airtime_mvc/library/pear/DB/common.php
 delete mode 100644 airtime_mvc/library/pear/DB/dbase.php
 delete mode 100644 airtime_mvc/library/pear/DB/fbsql.php
 delete mode 100644 airtime_mvc/library/pear/DB/ibase.php
 delete mode 100644 airtime_mvc/library/pear/DB/ifx.php
 delete mode 100644 airtime_mvc/library/pear/DB/msql.php
 delete mode 100644 airtime_mvc/library/pear/DB/mssql.php
 delete mode 100644 airtime_mvc/library/pear/DB/mysql.php
 delete mode 100644 airtime_mvc/library/pear/DB/mysqli.php
 delete mode 100644 airtime_mvc/library/pear/DB/oci8.php
 delete mode 100644 airtime_mvc/library/pear/DB/odbc.php
 delete mode 100644 airtime_mvc/library/pear/DB/pgsql.php
 delete mode 100644 airtime_mvc/library/pear/DB/sqlite.php
 delete mode 100644 airtime_mvc/library/pear/DB/storage.php
 delete mode 100644 airtime_mvc/library/pear/DB/sybase.php
 delete mode 100644 airtime_mvc/library/pear/File.php
 delete mode 100644 airtime_mvc/library/pear/File/CSV.php
 delete mode 100644 airtime_mvc/library/pear/File/Find.php
 delete mode 100644 airtime_mvc/library/pear/File/Util.php
 delete mode 100644 airtime_mvc/library/pear/HTML/Common.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/Array.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/ArraySmarty.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/Default.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITDynamic.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITStatic.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/Object.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/ObjectFlexy.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Renderer/QuickHtml.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Callback.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Compare.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Email.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Range.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Regex.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/Rule/Required.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/RuleRegistry.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/advcheckbox.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/autocomplete.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/button.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/checkbox.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/date.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/element.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/file.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/group.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/header.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/hidden.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/hiddenselect.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/hierselect.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/html.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/image.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/input.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/link.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/password.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/radio.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/reset.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/select.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/static.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/submit.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/text.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/textarea.php
 delete mode 100644 airtime_mvc/library/pear/HTML/QuickForm/xbutton.php
 delete mode 100644 airtime_mvc/library/pear/OS/Guess.php
 delete mode 100644 airtime_mvc/library/pear/PEAR.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Autoloader.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Builder.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/ChannelFile.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/ChannelFile/Parser.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Auth.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Auth.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Build.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Build.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Channels.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Channels.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Common.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Config.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Config.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Install.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Install.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Mirror.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Mirror.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Package.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Package.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Pickle.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Pickle.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Registry.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Registry.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Remote.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Remote.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Test.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Command/Test.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Common.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Config.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Dependency2.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/DependencyDB.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Downloader.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Downloader/Package.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/ErrorStack.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Exception.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/FixPHP5PEARWarnings.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Frontend.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Frontend/CLI.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Common.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Data.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Data.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Doc.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Doc.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Ext.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Ext.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Php.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Php.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Script.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Script.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Src.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Src.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Test.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Test.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Www.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Installer/Role/Www.xml
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/Generator/v1.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/Generator/v2.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/Parser/v1.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/Parser/v2.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/v1.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/v2.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/v2/Validator.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/PackageFile/v2/rw.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Packager.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/REST.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/REST/10.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/REST/11.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/REST/13.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Registry.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/RunTest.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Common.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Postinstallscript.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Postinstallscript/rw.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Replace.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Replace/rw.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Unixeol.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Unixeol/rw.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Windowseol.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Task/Windowseol/rw.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Validate.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/Validator/PECL.php
 delete mode 100644 airtime_mvc/library/pear/PEAR/XMLParser.php
 delete mode 100644 airtime_mvc/library/pear/PEAR5.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/Assert.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/GUI/Gtk.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/GUI/HTML.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/GUI/HTML.tpl
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/GUI/SetupDecorator.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/RepeatedTest.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/Skeleton.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestCase.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestDecorator.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestFailure.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestListener.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestResult.php
 delete mode 100644 airtime_mvc/library/pear/PHPUnit/TestSuite.php
 delete mode 100644 airtime_mvc/library/pear/System.php
 delete mode 100644 airtime_mvc/library/pear/VERSIONS.txt
 delete mode 100644 airtime_mvc/library/pear/XML/Beautifier.php
 delete mode 100644 airtime_mvc/library/pear/XML/Beautifier/Renderer.php
 delete mode 100644 airtime_mvc/library/pear/XML/Beautifier/Renderer/Plain.php
 delete mode 100644 airtime_mvc/library/pear/XML/Beautifier/Tokenizer.php
 delete mode 100644 airtime_mvc/library/pear/XML/Parser.php
 delete mode 100644 airtime_mvc/library/pear/XML/Parser/Simple.php
 delete mode 100644 airtime_mvc/library/pear/XML/RPC.php
 delete mode 100644 airtime_mvc/library/pear/XML/RPC/Dump.php
 delete mode 100644 airtime_mvc/library/pear/XML/RPC/Server.php
 delete mode 100644 airtime_mvc/library/pear/XML/Serializer.php
 delete mode 100644 airtime_mvc/library/pear/XML/Unserializer.php
 delete mode 100644 airtime_mvc/library/pear/XML/Util.php

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 2e0d56536..17c79db9b 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -18,7 +18,6 @@ $CC_CONFIG = array(
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
     "rootDir" => __DIR__."/../..",
-    'pearPath'      =>  dirname(__FILE__).'/../../library/pear',
     'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
 );
 
diff --git a/airtime_mvc/library/pear/Archive/Tar.php b/airtime_mvc/library/pear/Archive/Tar.php
deleted file mode 100644
index 61eff98e6..000000000
--- a/airtime_mvc/library/pear/Archive/Tar.php
+++ /dev/null
@@ -1,1909 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * File::CSV
- *
- * PHP versions 4 and 5
- *
- * Copyright (c) 1997-2008,
- * Vincent Blavet <vincent@phpconcept.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * @category    File_Formats
- * @package     Archive_Tar
- * @author      Vincent Blavet <vincent@phpconcept.net>
- * @copyright   1997-2008 The Authors
- * @license     http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Tar.php 295988 2010-03-09 08:39:37Z mrook $
- * @link        http://pear.php.net/package/Archive_Tar
- */
-
-require_once 'PEAR.php';
-
-
-define ('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
-define ('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
-
-/**
-* Creates a (compressed) Tar archive
-*
-* @author   Vincent Blavet <vincent@phpconcept.net>
-* @version  $Revision: 295988 $
-* @license  http://www.opensource.org/licenses/bsd-license.php New BSD License
-* @package  Archive_Tar
-*/
-class Archive_Tar extends PEAR
-{
-    /**
-    * @var string Name of the Tar
-    */
-    var $_tarname='';
-
-    /**
-    * @var boolean if true, the Tar file will be gzipped
-    */
-    var $_compress=false;
-
-    /**
-    * @var string Type of compression : 'none', 'gz' or 'bz2'
-    */
-    var $_compress_type='none';
-
-    /**
-    * @var string Explode separator
-    */
-    var $_separator=' ';
-
-    /**
-    * @var file descriptor
-    */
-    var $_file=0;
-
-    /**
-    * @var string Local Tar name of a remote Tar (http:// or ftp://)
-    */
-    var $_temp_tarname='';
-
-    /**
-    * @var string regular expression for ignoring files or directories
-    */
-    var $_ignore_regexp='';
-
-    // {{{ constructor
-    /**
-    * Archive_Tar Class constructor. This flavour of the constructor only
-    * declare a new Archive_Tar object, identifying it by the name of the
-    * tar file.
-    * If the compress argument is set the tar will be read or created as a
-    * gzip or bz2 compressed TAR file.
-    *
-    * @param    string  $p_tarname  The name of the tar archive to create
-    * @param    string  $p_compress can be null, 'gz' or 'bz2'. This
-    *                   parameter indicates if gzip or bz2 compression
-    *                   is required.  For compatibility reason the
-    *                   boolean value 'true' means 'gz'.
-    * @access public
-    */
-    function Archive_Tar($p_tarname, $p_compress = null)
-    {
-        $this->PEAR();
-        $this->_compress = false;
-        $this->_compress_type = 'none';
-        if (($p_compress === null) || ($p_compress == '')) {
-            if (@file_exists($p_tarname)) {
-                if ($fp = @fopen($p_tarname, "rb")) {
-                    // look for gzip magic cookie
-                    $data = fread($fp, 2);
-                    fclose($fp);
-                    if ($data == "\37\213") {
-                        $this->_compress = true;
-                        $this->_compress_type = 'gz';
-                    // No sure it's enought for a magic code ....
-                    } elseif ($data == "BZ") {
-                        $this->_compress = true;
-                        $this->_compress_type = 'bz2';
-                    }
-                }
-            } else {
-                // probably a remote file or some file accessible
-                // through a stream interface
-                if (substr($p_tarname, -2) == 'gz') {
-                    $this->_compress = true;
-                    $this->_compress_type = 'gz';
-                } elseif ((substr($p_tarname, -3) == 'bz2') ||
-                          (substr($p_tarname, -2) == 'bz')) {
-                    $this->_compress = true;
-                    $this->_compress_type = 'bz2';
-                }
-            }
-        } else {
-            if (($p_compress === true) || ($p_compress == 'gz')) {
-                $this->_compress = true;
-                $this->_compress_type = 'gz';
-            } else if ($p_compress == 'bz2') {
-                $this->_compress = true;
-                $this->_compress_type = 'bz2';
-            } else {
-                $this->_error("Unsupported compression type '$p_compress'\n".
-                    "Supported types are 'gz' and 'bz2'.\n");
-                return false;
-            }
-        }
-        $this->_tarname = $p_tarname;
-        if ($this->_compress) { // assert zlib or bz2 extension support
-            if ($this->_compress_type == 'gz')
-                $extname = 'zlib';
-            else if ($this->_compress_type == 'bz2')
-                $extname = 'bz2';
-
-            if (!extension_loaded($extname)) {
-                PEAR::loadExtension($extname);
-            }
-            if (!extension_loaded($extname)) {
-                $this->_error("The extension '$extname' couldn't be found.\n".
-                    "Please make sure your version of PHP was built ".
-                    "with '$extname' support.\n");
-                return false;
-            }
-        }
-    }
-    // }}}
-
-    // {{{ destructor
-    function _Archive_Tar()
-    {
-        $this->_close();
-        // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
-            @unlink($this->_temp_tarname);
-        $this->_PEAR();
-    }
-    // }}}
-
-    // {{{ create()
-    /**
-    * This method creates the archive file and add the files / directories
-    * that are listed in $p_filelist.
-    * If a file with the same name exist and is writable, it is replaced
-    * by the new tar.
-    * The method return false and a PEAR error text.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * For each directory added in the archive, the files and
-    * sub-directories are also added.
-    * See also createModify() method for more details.
-    *
-    * @param array  $p_filelist An array of filenames and directory names, or a
-	*                           single string with names separated by a single
-	*                           blank space.
-    * @return                   true on success, false on error.
-    * @see createModify()
-    * @access public
-    */
-    function create($p_filelist)
-    {
-        return $this->createModify($p_filelist, '', '');
-    }
-    // }}}
-
-    // {{{ add()
-    /**
-    * This method add the files / directories that are listed in $p_filelist in
-    * the archive. If the archive does not exist it is created.
-    * The method return false and a PEAR error text.
-    * The files and directories listed are only added at the end of the archive,
-    * even if a file with the same name is already archived.
-    * See also createModify() method for more details.
-    *
-    * @param array  $p_filelist An array of filenames and directory names, or a
-	*                           single string with names separated by a single
-	*                           blank space.
-    * @return                   true on success, false on error.
-    * @see createModify()
-    * @access public
-    */
-    function add($p_filelist)
-    {
-        return $this->addModify($p_filelist, '', '');
-    }
-    // }}}
-
-    // {{{ extract()
-    function extract($p_path='')
-    {
-        return $this->extractModify($p_path, '');
-    }
-    // }}}
-
-    // {{{ listContent()
-    function listContent()
-    {
-        $v_list_detail = array();
-
-        if ($this->_openRead()) {
-            if (!$this->_extractList('', $v_list_detail, "list", '', '')) {
-                unset($v_list_detail);
-                $v_list_detail = 0;
-            }
-            $this->_close();
-        }
-
-        return $v_list_detail;
-    }
-    // }}}
-
-    // {{{ createModify()
-    /**
-    * This method creates the archive file and add the files / directories
-    * that are listed in $p_filelist.
-    * If the file already exists and is writable, it is replaced by the
-    * new tar. It is a create and not an add. If the file exists and is
-    * read-only or is a directory it is not replaced. The method return
-    * false and a PEAR error text.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * The path indicated in $p_remove_dir will be removed from the
-    * memorized path of each file / directory listed when this path
-    * exists. By default nothing is removed (empty path '')
-    * The path indicated in $p_add_dir will be added at the beginning of
-    * the memorized path of each file / directory listed. However it can
-    * be set to empty ''. The adding of a path is done after the removing
-    * of path.
-    * The path add/remove ability enables the user to prepare an archive
-    * for extraction in a different path than the origin files are.
-    * See also addModify() method for file adding properties.
-    *
-    * @param array  $p_filelist     An array of filenames and directory names,
-	*                               or a single string with names separated by
-	*                               a single blank space.
-    * @param string $p_add_dir      A string which contains a path to be added
-	*                               to the memorized path of each element in
-	*                               the list.
-    * @param string $p_remove_dir   A string which contains a path to be
-	*                               removed from the memorized path of each
-	*                               element in the list, when relevant.
-    * @return boolean               true on success, false on error.
-    * @access public
-    * @see addModify()
-    */
-    function createModify($p_filelist, $p_add_dir, $p_remove_dir='')
-    {
-        $v_result = true;
-
-        if (!$this->_openWrite())
-            return false;
-
-        if ($p_filelist != '') {
-            if (is_array($p_filelist))
-                $v_list = $p_filelist;
-            elseif (is_string($p_filelist))
-                $v_list = explode($this->_separator, $p_filelist);
-            else {
-                $this->_cleanFile();
-                $this->_error('Invalid file list');
-                return false;
-            }
-
-            $v_result = $this->_addList($v_list, $p_add_dir, $p_remove_dir);
-        }
-
-        if ($v_result) {
-            $this->_writeFooter();
-            $this->_close();
-        } else
-            $this->_cleanFile();
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ addModify()
-    /**
-    * This method add the files / directories listed in $p_filelist at the
-    * end of the existing archive. If the archive does not yet exists it
-    * is created.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * The path indicated in $p_remove_dir will be removed from the
-    * memorized path of each file / directory listed when this path
-    * exists. By default nothing is removed (empty path '')
-    * The path indicated in $p_add_dir will be added at the beginning of
-    * the memorized path of each file / directory listed. However it can
-    * be set to empty ''. The adding of a path is done after the removing
-    * of path.
-    * The path add/remove ability enables the user to prepare an archive
-    * for extraction in a different path than the origin files are.
-    * If a file/dir is already in the archive it will only be added at the
-    * end of the archive. There is no update of the existing archived
-    * file/dir. However while extracting the archive, the last file will
-    * replace the first one. This results in a none optimization of the
-    * archive size.
-    * If a file/dir does not exist the file/dir is ignored. However an
-    * error text is send to PEAR error.
-    * If a file/dir is not readable the file/dir is ignored. However an
-    * error text is send to PEAR error.
-    *
-    * @param array      $p_filelist     An array of filenames and directory
-	*                                   names, or a single string with names
-	*                                   separated by a single blank space.
-    * @param string     $p_add_dir      A string which contains a path to be
-	*                                   added to the memorized path of each
-	*                                   element in the list.
-    * @param string     $p_remove_dir   A string which contains a path to be
-	*                                   removed from the memorized path of
-	*                                   each element in the list, when
-    *                                   relevant.
-    * @return                           true on success, false on error.
-    * @access public
-    */
-    function addModify($p_filelist, $p_add_dir, $p_remove_dir='')
-    {
-        $v_result = true;
-
-        if (!$this->_isArchive())
-            $v_result = $this->createModify($p_filelist, $p_add_dir,
-			                                $p_remove_dir);
-        else {
-            if (is_array($p_filelist))
-                $v_list = $p_filelist;
-            elseif (is_string($p_filelist))
-                $v_list = explode($this->_separator, $p_filelist);
-            else {
-                $this->_error('Invalid file list');
-                return false;
-            }
-
-            $v_result = $this->_append($v_list, $p_add_dir, $p_remove_dir);
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ addString()
-    /**
-    * This method add a single string as a file at the
-    * end of the existing archive. If the archive does not yet exists it
-    * is created.
-    *
-    * @param string     $p_filename     A string which contains the full
-	*                                   filename path that will be associated
-	*                                   with the string.
-    * @param string     $p_string       The content of the file added in
-	*                                   the archive.
-    * @return                           true on success, false on error.
-    * @access public
-    */
-    function addString($p_filename, $p_string)
-    {
-        $v_result = true;
-
-        if (!$this->_isArchive()) {
-            if (!$this->_openWrite()) {
-                return false;
-            }
-            $this->_close();
-        }
-
-        if (!$this->_openAppend())
-            return false;
-
-        // Need to check the get back to the temporary file ? ....
-        $v_result = $this->_addString($p_filename, $p_string);
-
-        $this->_writeFooter();
-
-        $this->_close();
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ extractModify()
-    /**
-    * This method extract all the content of the archive in the directory
-    * indicated by $p_path. When relevant the memorized path of the
-    * files/dir can be modified by removing the $p_remove_path path at the
-    * beginning of the file/dir path.
-    * While extracting a file, if the directory path does not exists it is
-    * created.
-    * While extracting a file, if the file already exists it is replaced
-    * without looking for last modification date.
-    * While extracting a file, if the file already exists and is write
-    * protected, the extraction is aborted.
-    * While extracting a file, if a directory with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a directory, if a file with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a file/directory if the destination directory exist
-    * and is write protected, or does not exist but can not be created,
-    * the extraction is aborted.
-    * If after extraction an extracted file does not show the correct
-    * stored file size, the extraction is aborted.
-    * When the extraction is aborted, a PEAR error text is set and false
-    * is returned. However the result can be a partial extraction that may
-    * need to be manually cleaned.
-    *
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return boolean               true on success, false on error.
-    * @access public
-    * @see extractList()
-    */
-    function extractModify($p_path, $p_remove_path)
-    {
-        $v_result = true;
-        $v_list_detail = array();
-
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
-			                                "complete", 0, $p_remove_path);
-            $this->_close();
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ extractInString()
-    /**
-    * This method extract from the archive one file identified by $p_filename.
-    * The return value is a string with the file content, or NULL on error.
-    * @param string $p_filename     The path of the file to extract in a string.
-    * @return                       a string with the file content or NULL.
-    * @access public
-    */
-    function extractInString($p_filename)
-    {
-        if ($this->_openRead()) {
-            $v_result = $this->_extractInString($p_filename);
-            $this->_close();
-        } else {
-            $v_result = NULL;
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ extractList()
-    /**
-    * This method extract from the archive only the files indicated in the
-    * $p_filelist. These files are extracted in the current directory or
-    * in the directory indicated by the optional $p_path parameter.
-    * If indicated the $p_remove_path can be used in the same way as it is
-    * used in extractModify() method.
-    * @param array  $p_filelist     An array of filenames and directory names,
-	*                               or a single string with names separated
-	*                               by a single blank space.
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return                       true on success, false on error.
-    * @access public
-    * @see extractModify()
-    */
-    function extractList($p_filelist, $p_path='', $p_remove_path='')
-    {
-        $v_result = true;
-        $v_list_detail = array();
-
-        if (is_array($p_filelist))
-            $v_list = $p_filelist;
-        elseif (is_string($p_filelist))
-            $v_list = explode($this->_separator, $p_filelist);
-        else {
-            $this->_error('Invalid string list');
-            return false;
-        }
-
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail, "partial",
-			                                $v_list, $p_remove_path);
-            $this->_close();
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ setAttribute()
-    /**
-    * This method set specific attributes of the archive. It uses a variable
-    * list of parameters, in the format attribute code + attribute values :
-    * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
-    * @param mixed $argv            variable list of attributes and values
-    * @return                       true on success, false on error.
-    * @access public
-    */
-    function setAttribute()
-    {
-        $v_result = true;
-
-        // ----- Get the number of variable list of arguments
-        if (($v_size = func_num_args()) == 0) {
-            return true;
-        }
-
-        // ----- Get the arguments
-        $v_att_list = &func_get_args();
-
-        // ----- Read the attributes
-        $i=0;
-        while ($i<$v_size) {
-
-            // ----- Look for next option
-            switch ($v_att_list[$i]) {
-                // ----- Look for options that request a string value
-                case ARCHIVE_TAR_ATT_SEPARATOR :
-                    // ----- Check the number of parameters
-                    if (($i+1) >= $v_size) {
-                        $this->_error('Invalid number of parameters for '
-						              .'attribute ARCHIVE_TAR_ATT_SEPARATOR');
-                        return false;
-                    }
-
-                    // ----- Get the value
-                    $this->_separator = $v_att_list[$i+1];
-                    $i++;
-                break;
-
-                default :
-                    $this->_error('Unknow attribute code '.$v_att_list[$i].'');
-                    return false;
-            }
-
-            // ----- Next attribute
-            $i++;
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ setIgnoreRegexp()
-    /**
-    * This method sets the regular expression for ignoring files and directories
-    * at import, for example:
-    * $arch->setIgnoreRegexp("#CVS|\.svn#");
-    * @param string $regexp         regular expression defining which files or directories to ignore
-    * @access public
-    */
-    function setIgnoreRegexp($regexp)
-    {
-    	$this->_ignore_regexp = $regexp;
-    }
-    // }}}
-
-    // {{{ setIgnoreList()
-    /**
-    * This method sets the regular expression for ignoring all files and directories
-    * matching the filenames in the array list at import, for example:
-    * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
-    * @param array $list         a list of file or directory names to ignore
-    * @access public
-    */
-    function setIgnoreList($list)
-    {
-    	$regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
-    	$regexp = '#/'.join('$|/', $list).'#';
-    	$this->setIgnoreRegexp($regexp);
-    }
-    // }}}
-
-    // {{{ _error()
-    function _error($p_message)
-    {
-        // ----- To be completed
-        $this->raiseError($p_message);
-    }
-    // }}}
-
-    // {{{ _warning()
-    function _warning($p_message)
-    {
-        // ----- To be completed
-        $this->raiseError($p_message);
-    }
-    // }}}
-
-    // {{{ _isArchive()
-    function _isArchive($p_filename=NULL)
-    {
-        if ($p_filename == NULL) {
-            $p_filename = $this->_tarname;
-        }
-        clearstatcache();
-        return @is_file($p_filename) && !@is_link($p_filename);
-    }
-    // }}}
-
-    // {{{ _openWrite()
-    function _openWrite()
-    {
-        if ($this->_compress_type == 'gz')
-            $this->_file = @gzopen($this->_tarname, "wb9");
-        else if ($this->_compress_type == 'bz2')
-            $this->_file = @bzopen($this->_tarname, "w");
-        else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($this->_tarname, "wb");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
-
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in write mode \''
-			              .$this->_tarname.'\'');
-            return false;
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _openRead()
-    function _openRead()
-    {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
-
-          // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-                $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-                $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
-              @fclose($v_file_from);
-              @fclose($v_file_to);
-          }
-
-          // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
-
-        } else
-          // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
-
-        if ($this->_compress_type == 'gz')
-            $this->_file = @gzopen($v_filename, "rb");
-        else if ($this->_compress_type == 'bz2')
-            $this->_file = @bzopen($v_filename, "r");
-        else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($v_filename, "rb");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
-
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
-            return false;
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _openReadWrite()
-    function _openReadWrite()
-    {
-        if ($this->_compress_type == 'gz')
-            $this->_file = @gzopen($this->_tarname, "r+b");
-        else if ($this->_compress_type == 'bz2') {
-            $this->_error('Unable to open bz2 in read/write mode \''
-			              .$this->_tarname.'\' (limitation of bz2 extension)');
-            return false;
-        } else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($this->_tarname, "r+b");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
-
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in read/write mode \''
-			              .$this->_tarname.'\'');
-            return false;
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _close()
-    function _close()
-    {
-        //if (isset($this->_file)) {
-        if (is_resource($this->_file)) {
-            if ($this->_compress_type == 'gz')
-                @gzclose($this->_file);
-            else if ($this->_compress_type == 'bz2')
-                @bzclose($this->_file);
-            else if ($this->_compress_type == 'none')
-                @fclose($this->_file);
-            else
-                $this->_error('Unknown or missing compression type ('
-				              .$this->_compress_type.')');
-
-            $this->_file = 0;
-        }
-
-        // ----- Look if a local copy need to be erase
-        // Note that it might be interesting to keep the url for a time : ToDo
-        if ($this->_temp_tarname != '') {
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _cleanFile()
-    function _cleanFile()
-    {
-        $this->_close();
-
-        // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
-            // ----- Remove the local copy but not the remote tarname
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        } else {
-            // ----- Remove the local tarname file
-            @unlink($this->_tarname);
-        }
-        $this->_tarname = '';
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _writeBlock()
-    function _writeBlock($p_binary_data, $p_len=null)
-    {
-      if (is_resource($this->_file)) {
-          if ($p_len === null) {
-              if ($this->_compress_type == 'gz')
-                  @gzputs($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'bz2')
-                  @bzwrite($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'none')
-                  @fputs($this->_file, $p_binary_data);
-              else
-                  $this->_error('Unknown or missing compression type ('
-				                .$this->_compress_type.')');
-          } else {
-              if ($this->_compress_type == 'gz')
-                  @gzputs($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'bz2')
-                  @bzwrite($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'none')
-                  @fputs($this->_file, $p_binary_data, $p_len);
-              else
-                  $this->_error('Unknown or missing compression type ('
-				                .$this->_compress_type.')');
-
-          }
-      }
-      return true;
-    }
-    // }}}
-
-    // {{{ _readBlock()
-    function _readBlock()
-    {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-          if ($this->_compress_type == 'gz')
-              $v_block = @gzread($this->_file, 512);
-          else if ($this->_compress_type == 'bz2')
-              $v_block = @bzread($this->_file, 512);
-          else if ($this->_compress_type == 'none')
-              $v_block = @fread($this->_file, 512);
-          else
-              $this->_error('Unknown or missing compression type ('
-			                .$this->_compress_type.')');
-      }
-      return $v_block;
-    }
-    // }}}
-
-    // {{{ _jumpBlock()
-    function _jumpBlock($p_len=null)
-    {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
-
-          if ($this->_compress_type == 'gz') {
-              @gzseek($this->_file, gztell($this->_file)+($p_len*512));
-          }
-          else if ($this->_compress_type == 'bz2') {
-              // ----- Replace missing bztell() and bzseek()
-              for ($i=0; $i<$p_len; $i++)
-                  $this->_readBlock();
-          } else if ($this->_compress_type == 'none')
-              @fseek($this->_file, $p_len*512, SEEK_CUR);
-          else
-              $this->_error('Unknown or missing compression type ('
-			                .$this->_compress_type.')');
-
-      }
-      return true;
-    }
-    // }}}
-
-    // {{{ _writeFooter()
-    function _writeFooter()
-    {
-      if (is_resource($this->_file)) {
-          // ----- Write the last 0 filled block for end of archive
-          $v_binary_data = pack('a1024', '');
-          $this->_writeBlock($v_binary_data);
-      }
-      return true;
-    }
-    // }}}
-
-    // {{{ _addList()
-    function _addList($p_list, $p_add_dir, $p_remove_dir)
-    {
-      $v_result=true;
-      $v_header = array();
-
-      // ----- Remove potential windows directory separator
-      $p_add_dir = $this->_translateWinPath($p_add_dir);
-      $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
-
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
-
-      if (sizeof($p_list) == 0)
-          return true;
-
-      foreach ($p_list as $v_filename) {
-          if (!$v_result) {
-              break;
-          }
-
-        // ----- Skip the current tar name
-        if ($v_filename == $this->_tarname)
-            continue;
-
-        if ($v_filename == '')
-            continue;
-
-       	// ----- ignore files and directories matching the ignore regular expression
-       	if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/'.$v_filename)) {
-            $this->_warning("File '$v_filename' ignored");
-       	    continue;
-       	}
-
-        if (!file_exists($v_filename)) {
-            $this->_warning("File '$v_filename' does not exist");
-            continue;
-        }
-
-        // ----- Add the file or directory header
-        if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir))
-            return false;
-
-        if (@is_dir($v_filename) && !@is_link($v_filename)) {
-            if (!($p_hdir = opendir($v_filename))) {
-                $this->_warning("Directory '$v_filename' can not be read");
-                continue;
-            }
-            while (false !== ($p_hitem = readdir($p_hdir))) {
-                if (($p_hitem != '.') && ($p_hitem != '..')) {
-                    if ($v_filename != ".")
-                        $p_temp_list[0] = $v_filename.'/'.$p_hitem;
-                    else
-                        $p_temp_list[0] = $p_hitem;
-
-                    $v_result = $this->_addList($p_temp_list,
-					                            $p_add_dir,
-												$p_remove_dir);
-                }
-            }
-
-            unset($p_temp_list);
-            unset($p_hdir);
-            unset($p_hitem);
-        }
-      }
-
-      return $v_result;
-    }
-    // }}}
-
-    // {{{ _addFile()
-    function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir)
-    {
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
-
-      if ($p_filename == '') {
-          $this->_error('Invalid file name');
-          return false;
-      }
-
-      // ----- Calculate the stored filename
-      $p_filename = $this->_translateWinPath($p_filename, false);;
-      $v_stored_filename = $p_filename;
-      if (strcmp($p_filename, $p_remove_dir) == 0) {
-          return true;
-      }
-      if ($p_remove_dir != '') {
-          if (substr($p_remove_dir, -1) != '/')
-              $p_remove_dir .= '/';
-
-          if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
-              $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
-      }
-      $v_stored_filename = $this->_translateWinPath($v_stored_filename);
-      if ($p_add_dir != '') {
-          if (substr($p_add_dir, -1) == '/')
-              $v_stored_filename = $p_add_dir.$v_stored_filename;
-          else
-              $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
-      }
-
-      $v_stored_filename = $this->_pathReduction($v_stored_filename);
-
-      if ($this->_isArchive($p_filename)) {
-          if (($v_file = @fopen($p_filename, "rb")) == 0) {
-              $this->_warning("Unable to open file '".$p_filename
-			                  ."' in binary read mode");
-              return true;
-          }
-
-          if (!$this->_writeHeader($p_filename, $v_stored_filename))
-              return false;
-
-          while (($v_buffer = fread($v_file, 512)) != '') {
-              $v_binary_data = pack("a512", "$v_buffer");
-              $this->_writeBlock($v_binary_data);
-          }
-
-          fclose($v_file);
-
-      } else {
-          // ----- Only header for dir
-          if (!$this->_writeHeader($p_filename, $v_stored_filename))
-              return false;
-      }
-
-      return true;
-    }
-    // }}}
-
-    // {{{ _addString()
-    function _addString($p_filename, $p_string)
-    {
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
-
-      if ($p_filename == '') {
-          $this->_error('Invalid file name');
-          return false;
-      }
-
-      // ----- Calculate the stored filename
-      $p_filename = $this->_translateWinPath($p_filename, false);;
-
-      if (!$this->_writeHeaderBlock($p_filename, strlen($p_string),
-	                                  time(), 384, "", 0, 0))
-          return false;
-
-      $i=0;
-      while (($v_buffer = substr($p_string, (($i++)*512), 512)) != '') {
-          $v_binary_data = pack("a512", $v_buffer);
-          $this->_writeBlock($v_binary_data);
-      }
-
-      return true;
-    }
-    // }}}
-
-    // {{{ _writeHeader()
-    function _writeHeader($p_filename, $p_stored_filename)
-    {
-        if ($p_stored_filename == '')
-            $p_stored_filename = $p_filename;
-        $v_reduce_filename = $this->_pathReduction($p_stored_filename);
-
-        if (strlen($v_reduce_filename) > 99) {
-          if (!$this->_writeLongHeader($v_reduce_filename))
-            return false;
-        }
-
-        $v_info = lstat($p_filename);
-        $v_uid = sprintf("%07s", DecOct($v_info[4]));
-        $v_gid = sprintf("%07s", DecOct($v_info[5]));
-        $v_perms = sprintf("%07s", DecOct($v_info['mode'] & 000777));
-
-        $v_mtime = sprintf("%011s", DecOct($v_info['mtime']));
-
-        $v_linkname = '';
-
-        if (@is_link($p_filename)) {
-          $v_typeflag = '2';
-          $v_linkname = readlink($p_filename);
-          $v_size = sprintf("%011s", DecOct(0));
-        } elseif (@is_dir($p_filename)) {
-          $v_typeflag = "5";
-          $v_size = sprintf("%011s", DecOct(0));
-        } else {
-          $v_typeflag = '0';
-          clearstatcache();
-          $v_size = sprintf("%011s", DecOct($v_info['size']));
-        }
-
-        $v_magic = 'ustar ';
-
-        $v_version = ' ';
-        
-        if (function_exists('posix_getpwuid'))
-        {
-          $userinfo = posix_getpwuid($v_info[4]);
-          $groupinfo = posix_getgrgid($v_info[5]);
-          
-          $v_uname = $userinfo['name'];
-          $v_gname = $groupinfo['name'];
-        }
-        else
-        {
-          $v_uname = '';
-          $v_gname = '';
-        }
-
-        $v_devmajor = '';
-
-        $v_devminor = '';
-
-        $v_prefix = '';
-
-        $v_binary_data_first = pack("a100a8a8a8a12a12",
-		                            $v_reduce_filename, $v_perms, $v_uid,
-									$v_gid, $v_size, $v_mtime);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $v_typeflag, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
-
-        // ----- Write the first 148 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_first, 148);
-
-        // ----- Write the calculated checksum
-        $v_checksum = sprintf("%06s ", DecOct($v_checksum));
-        $v_binary_data = pack("a8", $v_checksum);
-        $this->_writeBlock($v_binary_data, 8);
-
-        // ----- Write the last 356 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_last, 356);
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _writeHeaderBlock()
-    function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
-	                           $p_type='', $p_uid=0, $p_gid=0)
-    {
-        $p_filename = $this->_pathReduction($p_filename);
-
-        if (strlen($p_filename) > 99) {
-          if (!$this->_writeLongHeader($p_filename))
-            return false;
-        }
-
-        if ($p_type == "5") {
-          $v_size = sprintf("%011s", DecOct(0));
-        } else {
-          $v_size = sprintf("%011s", DecOct($p_size));
-        }
-
-        $v_uid = sprintf("%07s", DecOct($p_uid));
-        $v_gid = sprintf("%07s", DecOct($p_gid));
-        $v_perms = sprintf("%07s", DecOct($p_perms & 000777));
-
-        $v_mtime = sprintf("%11s", DecOct($p_mtime));
-
-        $v_linkname = '';
-
-        $v_magic = 'ustar ';
-
-        $v_version = ' ';
-
-        if (function_exists('posix_getpwuid'))
-        {
-          $userinfo = posix_getpwuid($p_uid);
-          $groupinfo = posix_getgrgid($p_gid);
-          
-          $v_uname = $userinfo['name'];
-          $v_gname = $groupinfo['name'];
-        }
-        else
-        {
-          $v_uname = '';
-          $v_gname = '';
-        }
-        
-        $v_devmajor = '';
-
-        $v_devminor = '';
-
-        $v_prefix = '';
-
-        $v_binary_data_first = pack("a100a8a8a8a12A12",
-		                            $p_filename, $v_perms, $v_uid, $v_gid,
-									$v_size, $v_mtime);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $p_type, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
-
-        // ----- Write the first 148 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_first, 148);
-
-        // ----- Write the calculated checksum
-        $v_checksum = sprintf("%06s ", DecOct($v_checksum));
-        $v_binary_data = pack("a8", $v_checksum);
-        $this->_writeBlock($v_binary_data, 8);
-
-        // ----- Write the last 356 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_last, 356);
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _writeLongHeader()
-    function _writeLongHeader($p_filename)
-    {
-        $v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
-
-        $v_typeflag = 'L';
-
-        $v_linkname = '';
-
-        $v_magic = '';
-
-        $v_version = '';
-
-        $v_uname = '';
-
-        $v_gname = '';
-
-        $v_devmajor = '';
-
-        $v_devminor = '';
-
-        $v_prefix = '';
-
-        $v_binary_data_first = pack("a100a8a8a8a12a12",
-		                            '././@LongLink', 0, 0, 0, $v_size, 0);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $v_typeflag, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
-
-        // ----- Write the first 148 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_first, 148);
-
-        // ----- Write the calculated checksum
-        $v_checksum = sprintf("%06s ", DecOct($v_checksum));
-        $v_binary_data = pack("a8", $v_checksum);
-        $this->_writeBlock($v_binary_data, 8);
-
-        // ----- Write the last 356 bytes of the header in the archive
-        $this->_writeBlock($v_binary_data_last, 356);
-
-        // ----- Write the filename as content of the block
-        $i=0;
-        while (($v_buffer = substr($p_filename, (($i++)*512), 512)) != '') {
-            $v_binary_data = pack("a512", "$v_buffer");
-            $this->_writeBlock($v_binary_data);
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _readHeader()
-    function _readHeader($v_binary_data, &$v_header)
-    {
-        if (strlen($v_binary_data)==0) {
-            $v_header['filename'] = '';
-            return true;
-        }
-
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
-            return false;
-        }
-
-        if (!is_array($v_header)) {
-            $v_header = array();
-        }
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
-
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
-		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
-						 ."a32uname/a32gname/a8devmajor/a8devminor",
-						 $v_binary_data);
-
-        // ----- Extract the checksum
-        $v_header['checksum'] = OctDec(trim($v_data['checksum']));
-        if ($v_header['checksum'] != $v_checksum) {
-            $v_header['filename'] = '';
-
-            // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-                return true;
-
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
-						  .$v_header['checksum'].' expected');
-            return false;
-        }
-
-        // ----- Extract the properties
-        $v_header['filename'] = $v_data['filename'];
-        if ($this->_maliciousFilename($v_header['filename'])) {
-            $this->_error('Malicious .tar detected, file "' . $v_header['filename'] .
-                '" will not install in desired directory tree');
-            return false;
-        }
-        $v_header['mode'] = OctDec(trim($v_data['mode']));
-        $v_header['uid'] = OctDec(trim($v_data['uid']));
-        $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
-        $v_header['mtime'] = OctDec(trim($v_data['mtime']));
-        if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
-        }
-        $v_header['link'] = trim($v_data['link']);
-        /* ----- All these fields are removed form the header because
-		they do not carry interesting info
-        $v_header[magic] = trim($v_data[magic]);
-        $v_header[version] = trim($v_data[version]);
-        $v_header[uname] = trim($v_data[uname]);
-        $v_header[gname] = trim($v_data[gname]);
-        $v_header[devmajor] = trim($v_data[devmajor]);
-        $v_header[devminor] = trim($v_data[devminor]);
-        */
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _maliciousFilename()
-    /**
-     * Detect and report a malicious file name
-     *
-     * @param string $file
-     * @return bool
-     * @access private
-     */
-    function _maliciousFilename($file)
-    {
-        if (strpos($file, '/../') !== false) {
-            return true;
-        }
-        if (strpos($file, '../') === 0) {
-            return true;
-        }
-        return false;
-    }
-    // }}}
-
-    // {{{ _readLongHeader()
-    function _readLongHeader(&$v_header)
-    {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= trim($v_content);
-      }
-
-      // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      $v_filename = trim($v_filename);
-      $v_header['filename'] = $v_filename;
-        if ($this->_maliciousFilename($v_filename)) {
-            $this->_error('Malicious .tar detected, file "' . $v_filename .
-                '" will not install in desired directory tree');
-            return false;
-      }
-
-      return true;
-    }
-    // }}}
-
-    // {{{ _extractInString()
-    /**
-    * This method extract from the archive one file identified by $p_filename.
-    * The return value is a string with the file content, or NULL on error.
-    * @param string $p_filename     The path of the file to extract in a string.
-    * @return                       a string with the file content or NULL.
-    * @access private
-    */
-    function _extractInString($p_filename)
-    {
-        $v_result_str = "";
-
-        While (strlen($v_binary_data = $this->_readBlock()) != 0)
-        {
-          if (!$this->_readHeader($v_binary_data, $v_header))
-            return NULL;
-
-          if ($v_header['filename'] == '')
-            continue;
-
-          // ----- Look for long filename
-          if ($v_header['typeflag'] == 'L') {
-            if (!$this->_readLongHeader($v_header))
-              return NULL;
-          }
-
-          if ($v_header['filename'] == $p_filename) {
-              if ($v_header['typeflag'] == "5") {
-                  $this->_error('Unable to extract in string a directory '
-				                .'entry {'.$v_header['filename'].'}');
-                  return NULL;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_result_str .= $this->_readBlock();
-                  }
-                  if (($v_header['size'] % 512) != 0) {
-                      $v_content = $this->_readBlock();
-                      $v_result_str .= substr($v_content, 0,
-					                          ($v_header['size'] % 512));
-                  }
-                  return $v_result_str;
-              }
-          } else {
-              $this->_jumpBlock(ceil(($v_header['size']/512)));
-          }
-        }
-
-        return NULL;
-    }
-    // }}}
-
-    // {{{ _extractList()
-    function _extractList($p_path, &$p_list_detail, $p_mode,
-	                      $p_file_list, $p_remove_path)
-    {
-    $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
-    }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
-
-    switch ($p_mode) {
-      case "complete" :
-        $v_extract_all = TRUE;
-        $v_listing = FALSE;
-      break;
-      case "partial" :
-          $v_extract_all = FALSE;
-          $v_listing = FALSE;
-      break;
-      case "list" :
-          $v_extract_all = FALSE;
-          $v_listing = TRUE;
-      break;
-      default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
-        return false;
-    }
-
-    clearstatcache();
-
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
-    {
-      $v_extract_file = FALSE;
-      $v_extraction_stopped = 0;
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      if ($v_header['filename'] == '') {
-        continue;
-      }
-
-      // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
-      }
-
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
-        // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
-
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
-          // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
-            // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-				    == $p_file_list[$i])) {
-              $v_extract_file = TRUE;
-              break;
-            }
-          }
-
-          // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = TRUE;
-            break;
-          }
-        }
-      } else {
-        $v_extract_file = TRUE;
-      }
-
-      // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
-      {
-        if (($p_remove_path != '')
-            && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
-		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
-
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
-        }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists as a directory');
-            return false;
-          }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
-			              .' already exists as a file');
-            return false;
-          }
-          if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists and is write protected');
-            return false;
-          }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
-            // To be completed : An error or silent no replace ?
-          }
-        }
-
-        // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
-									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
-            return false;
-        }
-
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], 0777)) {
-                    $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
-                    return false;
-                }
-            }
-          } elseif ($v_header['typeflag'] == "2") {
-              if (@file_exists($v_header['filename'])) {
-                  @unlink($v_header['filename']);
-              }
-              if (!@symlink($v_header['link'], $v_header['filename'])) {
-                  $this->_error('Unable to extract symbolic link {'
-                                .$v_header['filename'].'}');
-                  return false;
-              }
-          } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
-				                .'} in write binary mode');
-                  return false;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
-                      fwrite($v_dest_file, $v_content, 512);
-                  }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
-              fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-            }
-
-            @fclose($v_dest_file);
-
-            // ----- Change the file mode, mtime
-            @touch($v_header['filename'], $v_header['mtime']);
-            if ($v_header['mode'] & 0111) {
-                // make file executable, obey umask
-                $mode = fileperms($v_header['filename']) | (~umask() & 0111);
-                @chmod($v_header['filename'], $mode);
-            }
-          }
-
-          // ----- Check the file size
-          clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
-			                .' does not have the correct file size \''
-							.filesize($v_header['filename'])
-							.'\' ('.$v_header['size']
-							.' expected). Archive may be corrupted.');
-              return false;
-          }
-          }
-        } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-        }
-      } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-      }
-
-      /* TBC : Seems to be unused ...
-      if ($this->_compress)
-        $v_end_of_file = @gzeof($this->_file);
-      else
-        $v_end_of_file = @feof($this->_file);
-        */
-
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-        // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
-
-        $p_list_detail[$v_nb++] = $v_header;
-        if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
-            return true;
-        }
-      }
-    }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _openAppend()
-    function _openAppend()
-    {
-        if (filesize($this->_tarname) == 0)
-          return $this->_openWrite();
-
-        if ($this->_compress) {
-            $this->_close();
-
-            if (!@rename($this->_tarname, $this->_tarname.".tmp")) {
-                $this->_error('Error while renaming \''.$this->_tarname
-				              .'\' to temporary file \''.$this->_tarname
-							  .'.tmp\'');
-                return false;
-            }
-
-            if ($this->_compress_type == 'gz')
-                $v_temp_tar = @gzopen($this->_tarname.".tmp", "rb");
-            elseif ($this->_compress_type == 'bz2')
-                $v_temp_tar = @bzopen($this->_tarname.".tmp", "r");
-
-            if ($v_temp_tar == 0) {
-                $this->_error('Unable to open file \''.$this->_tarname
-				              .'.tmp\' in binary read mode');
-                @rename($this->_tarname.".tmp", $this->_tarname);
-                return false;
-            }
-
-            if (!$this->_openWrite()) {
-                @rename($this->_tarname.".tmp", $this->_tarname);
-                return false;
-            }
-
-            if ($this->_compress_type == 'gz') {
-                while (!@gzeof($v_temp_tar)) {
-                    $v_buffer = @gzread($v_temp_tar, 512);
-                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
-                        // do not copy end blocks, we will re-make them
-                        // after appending
-                        continue;
-                    }
-                    $v_binary_data = pack("a512", $v_buffer);
-                    $this->_writeBlock($v_binary_data);
-                }
-
-                @gzclose($v_temp_tar);
-            }
-            elseif ($this->_compress_type == 'bz2') {
-                while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
-                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
-                        continue;
-                    }
-                    $v_binary_data = pack("a512", $v_buffer);
-                    $this->_writeBlock($v_binary_data);
-                }
-
-                @bzclose($v_temp_tar);
-            }
-
-            if (!@unlink($this->_tarname.".tmp")) {
-                $this->_error('Error while deleting temporary file \''
-				              .$this->_tarname.'.tmp\'');
-            }
-
-        } else {
-            // ----- For not compressed tar, just add files before the last
-			//       one or two 512 bytes block
-            if (!$this->_openReadWrite())
-               return false;
-
-            clearstatcache();
-            $v_size = filesize($this->_tarname);
-
-            // We might have zero, one or two end blocks.
-            // The standard is two, but we should try to handle
-            // other cases.
-            fseek($this->_file, $v_size - 1024);
-            if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
-                fseek($this->_file, $v_size - 1024);
-            }
-            elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
-                fseek($this->_file, $v_size - 512);
-            }
-        }
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _append()
-    function _append($p_filelist, $p_add_dir='', $p_remove_dir='')
-    {
-        if (!$this->_openAppend())
-            return false;
-
-        if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir))
-           $this->_writeFooter();
-
-        $this->_close();
-
-        return true;
-    }
-    // }}}
-
-    // {{{ _dirCheck()
-
-    /**
-     * Check if a directory exists and create it (including parent
-     * dirs) if not.
-     *
-     * @param string $p_dir directory to check
-     *
-     * @return bool TRUE if the directory exists or was created
-     */
-    function _dirCheck($p_dir)
-    {
-        clearstatcache();
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
-            return true;
-
-        $p_parent_dir = dirname($p_dir);
-
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
-
-        if (!@mkdir($p_dir, 0777)) {
-            $this->_error("Unable to create directory '$p_dir'");
-            return false;
-        }
-
-        return true;
-    }
-
-    // }}}
-
-    // {{{ _pathReduction()
-
-    /**
-     * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
-     * rand emove double slashes.
-     *
-     * @param string $p_dir path to reduce
-     *
-     * @return string reduced path
-     *
-     * @access private
-     *
-     */
-    function _pathReduction($p_dir)
-    {
-        $v_result = '';
-
-        // ----- Look for not empty path
-        if ($p_dir != '') {
-            // ----- Explode path by directory names
-            $v_list = explode('/', $p_dir);
-
-            // ----- Study directories from last to first
-            for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-                // ----- Look for current path
-                if ($v_list[$i] == ".") {
-                    // ----- Ignore this directory
-                    // Should be the first $i=0, but no check is done
-                }
-                else if ($v_list[$i] == "..") {
-                    // ----- Ignore it and ignore the $i-1
-                    $i--;
-                }
-                else if (   ($v_list[$i] == '')
-				         && ($i!=(sizeof($v_list)-1))
-						 && ($i!=0)) {
-                    // ----- Ignore only the double '//' in path,
-                    // but not the first and last /
-                } else {
-                    $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?'/'
-					            .$v_result:'');
-                }
-            }
-        }
-        $v_result = strtr($v_result, '\\', '/');
-        return $v_result;
-    }
-
-    // }}}
-
-    // {{{ _translateWinPath()
-    function _translateWinPath($p_path, $p_remove_disk_letter=true)
-    {
-      if (defined('OS_WINDOWS') && OS_WINDOWS) {
-          // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
-          }
-          // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
-          }
-      }
-      return $p_path;
-    }
-    // }}}
-
-}
-?>
diff --git a/airtime_mvc/library/pear/Calendar/Calendar.php b/airtime_mvc/library/pear/Calendar/Calendar.php
deleted file mode 100644
index f1670ff25..000000000
--- a/airtime_mvc/library/pear/Calendar/Calendar.php
+++ /dev/null
@@ -1,780 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Contains the Calendar and Calendar_Engine_Factory classes
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Calendar.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Constant which defines the calculation engine to use
- */
-if (!defined('CALENDAR_ENGINE')) {
-    define('CALENDAR_ENGINE', 'UnixTS');
-}
-
-/**
- * Define Calendar Month states
- */
-define('CALENDAR_USE_MONTH',          1);
-define('CALENDAR_USE_MONTH_WEEKDAYS', 2);
-define('CALENDAR_USE_MONTH_WEEKS',    3);
-
-/**
- * Contains a factory method to return a Singleton instance of a class
- * implementing the Calendar_Engine_Interface.<br>
- * <b>Note:</b> this class must be modified to "register" alternative
- * Calendar_Engines. The engine used can be controlled with the constant
- * CALENDAR_ENGINE
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @see       Calendar_Engine_Interface
- * @access    protected
- */
-class Calendar_Engine_Factory
-{
-    /**
-     * Returns an instance of the engine
-     *
-     * @return object instance of a calendar calculation engine
-     * @access protected
-     */
-    function & getEngine()
-    {
-        static $engine = false;
-        switch (CALENDAR_ENGINE) {
-        case 'PearDate':
-            $class = 'Calendar_Engine_PearDate';
-            break;
-        case 'UnixTS':
-        default:
-            $class = 'Calendar_Engine_UnixTS';
-            break;
-        }
-        if (!$engine) {
-            if (!class_exists($class)) {
-                include_once CALENDAR_ROOT.'Engine'.DIRECTORY_SEPARATOR.CALENDAR_ENGINE.'.php';
-            }
-            $engine = new $class;
-        }
-        return $engine;
-    }
-}
-
-/**
- * Base class for Calendar API. This class should not be instantiated directly.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @abstract
- */
-class Calendar
-{
-    /**
-     * Instance of class implementing calendar engine interface
-     * @var object
-     * @access private
-     */
-    var $cE;
-
-    /**
-     * Instance of Calendar_Validator (lazy initialized when isValid() or
-     * getValidor() is called
-     * @var Calendar_Validator
-     * @access private
-     */
-    var $validator;
-
-    /**
-     * Year for this calendar object e.g. 2003
-     * @access private
-     * @var int
-     */
-    var $year;
-
-    /**
-     * Month for this calendar object e.g. 9
-     * @access private
-     * @var int
-     */
-    var $month;
-
-    /**
-     * Day of month for this calendar object e.g. 23
-     * @access private
-     * @var int
-     */
-    var $day;
-
-    /**
-     * Hour of day for this calendar object e.g. 13
-     * @access private
-     * @var int
-     */
-    var $hour;
-
-    /**
-     * Minute of hour this calendar object e.g. 46
-     * @access private
-     * @var int
-     */
-    var $minute;
-
-    /**
-     * Second of minute this calendar object e.g. 34
-     * @access private
-     * @var int
-     */
-    var $second;
-
-    /**
-     * Marks this calendar object as selected (e.g. 'today')
-     * @access private
-     * @var boolean
-     */
-    var $selected = false;
-
-    /**
-     * Collection of child calendar objects created from subclasses
-     * of Calendar. Type depends on the object which created them.
-     * @access private
-     * @var array
-     */
-    var $children = array();
-
-    /**
-     * Constructs the Calendar
-     *
-     * @param int $y year
-     * @param int $m month
-     * @param int $d day
-     * @param int $h hour
-     * @param int $i minute
-     * @param int $s second
-     *
-     * @access protected
-     */
-    function Calendar($y = 2000, $m = 1, $d = 1, $h = 0, $i = 0, $s = 0)
-    {
-        static $cE = null;
-        if (!isset($cE)) {
-            $cE = & Calendar_Engine_Factory::getEngine();
-        }
-        $this->cE     = & $cE;
-        $this->year   = (int)$y;
-        $this->month  = (int)$m;
-        $this->day    = (int)$d;
-        $this->hour   = (int)$h;
-        $this->minute = (int)$i;
-        $this->second = (int)$s;
-    }
-
-    /**
-     * Defines the calendar by a timestamp (Unix or ISO-8601), replacing values
-     * passed to the constructor
-     *
-     * @param int|string $ts Unix or ISO-8601 timestamp
-     *
-     * @return void
-     * @access public
-     */
-    function setTimestamp($ts)
-    {
-        $this->year   = $this->cE->stampToYear($ts);
-        $this->month  = $this->cE->stampToMonth($ts);
-        $this->day    = $this->cE->stampToDay($ts);
-        $this->hour   = $this->cE->stampToHour($ts);
-        $this->minute = $this->cE->stampToMinute($ts);
-        $this->second = $this->cE->stampToSecond($ts);
-    }
-
-    /**
-     * Returns a timestamp from the current date / time values. Format of
-     * timestamp depends on Calendar_Engine implementation being used
-     *
-     * @return int|string timestamp
-     * @access public
-     */
-    function getTimestamp()
-    {
-        return $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second);
-    }
-
-    /**
-     * Defines calendar object as selected (e.g. for today)
-     *
-     * @param boolean $state whether Calendar subclass
-     *
-     * @return void
-     * @access public
-     */
-    function setSelected($state = true)
-    {
-        $this->selected = $state;
-    }
-
-    /**
-     * True if the calendar subclass object is selected (e.g. today)
-     *
-     * @return boolean
-     * @access public
-     */
-    function isSelected()
-    {
-        return $this->selected;
-    }
-
-    /**
-     * Checks if the current Calendar object is today's date
-     *
-     * @return boolean
-     * @access public
-     */
-    function isToday()
-    {
-        return $this->cE->isToday($this->getTimeStamp());
-    }
-
-    /**
-     * Adjusts the date (helper method)
-     *
-     * @return void
-     * @access public
-     */
-    function adjust()
-    {
-        $stamp        = $this->getTimeStamp();
-        $this->year   = $this->cE->stampToYear($stamp);
-        $this->month  = $this->cE->stampToMonth($stamp);
-        $this->day    = $this->cE->stampToDay($stamp);
-        $this->hour   = $this->cE->stampToHour($stamp);
-        $this->minute = $this->cE->stampToMinute($stamp);
-        $this->second = $this->cE->stampToSecond($stamp);
-    }
-
-    /**
-     * Returns the date as an associative array (helper method)
-     *
-     * @param mixed $stamp timestamp (leave empty for current timestamp)
-     *
-     * @return array
-     * @access public
-     */
-    function toArray($stamp=null)
-    {
-        if (is_null($stamp)) {
-            $stamp = $this->getTimeStamp();
-        }
-        return array(
-            'year'   => $this->cE->stampToYear($stamp),
-            'month'  => $this->cE->stampToMonth($stamp),
-            'day'    => $this->cE->stampToDay($stamp),
-            'hour'   => $this->cE->stampToHour($stamp),
-            'minute' => $this->cE->stampToMinute($stamp),
-            'second' => $this->cE->stampToSecond($stamp)
-        );
-    }
-
-    /**
-     * Returns the value as an associative array (helper method)
-     *
-     * @param string $returnType type of date object that return value represents
-     * @param string $format     ['int' | 'array' | 'timestamp' | 'object']
-     * @param mixed  $stamp      timestamp (depending on Calendar engine being used)
-     * @param int    $default    default value (i.e. give me the answer quick)
-     *
-     * @return mixed
-     * @access private
-     */
-    function returnValue($returnType, $format, $stamp, $default)
-    {
-        switch (strtolower($format)) {
-        case 'int':
-            return $default;
-        case 'array':
-            return $this->toArray($stamp);
-            break;
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Calendar_Factory::createByTimestamp($returnType, $stamp);
-            break;
-        case 'timestamp':
-        default:
-            return $stamp;
-            break;
-        }
-    }
-
-    /**
-     * Abstract method for building the children of a calendar object.
-     * Implemented by Calendar subclasses
-     *
-     * @param array $sDates array containing Calendar objects to select (optional)
-     *
-     * @return boolean
-     * @access public
-     * @abstract
-     */
-    function build($sDates = array())
-    {
-        include_once 'PEAR.php';
-        PEAR::raiseError('Calendar::build is abstract', null, PEAR_ERROR_TRIGGER,
-            E_USER_NOTICE, 'Calendar::build()');
-        return false;
-    }
-
-    /**
-     * Abstract method for selected data objects called from build
-     *
-     * @param array $sDates array of Calendar objects to select
-     *
-     * @return boolean
-     * @access public
-     * @abstract
-     */
-    function setSelection($sDates)
-    {
-        include_once 'PEAR.php';
-        PEAR::raiseError(
-            'Calendar::setSelection is abstract', null, PEAR_ERROR_TRIGGER,
-            E_USER_NOTICE, 'Calendar::setSelection()');
-        return false;
-    }
-
-    /**
-     * Iterator method for fetching child Calendar subclass objects
-     * (e.g. a minute from an hour object). On reaching the end of
-     * the collection, returns false and resets the collection for
-     * further iteratations.
-     *
-     * @return mixed either an object subclass of Calendar or false
-     * @access public
-     */
-    function fetch()
-    {
-        $child = each($this->children);
-        if ($child) {
-            return $child['value'];
-        } else {
-            reset($this->children);
-            return false;
-        }
-    }
-
-    /**
-     * Fetches all child from the current collection of children
-     *
-     * @return array
-     * @access public
-     */
-    function fetchAll()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Get the number Calendar subclass objects stored in the internal collection
-     *
-     * @return int
-     * @access public
-     */
-    function size()
-    {
-        return count($this->children);
-    }
-
-    /**
-     * Determine whether this date is valid, with the bounds determined by
-     * the Calendar_Engine. The call is passed on to Calendar_Validator::isValid
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValid()
-    {
-        $validator = & $this->getValidator();
-        return $validator->isValid();
-    }
-
-    /**
-     * Returns an instance of Calendar_Validator
-     *
-     * @return Calendar_Validator
-     * @access public
-     */
-    function & getValidator()
-    {
-        if (!isset($this->validator)) {
-            include_once CALENDAR_ROOT.'Validator.php';
-            $this->validator = new Calendar_Validator($this);
-        }
-        return $this->validator;
-    }
-
-    /**
-     * Returns a reference to the current Calendar_Engine being used. Useful
-     * for Calendar_Table_Helper and Calendar_Validator
-     *
-     * @return object implementing Calendar_Engine_Inteface
-     * @access protected
-     */
-    function & getEngine()
-    {
-        return $this->cE;
-    }
-
-    /**
-     * Set the CALENDAR_FIRST_DAY_OF_WEEK constant to the $firstDay value
-     * if the constant is not set yet.
-     *
-     * @param integer $firstDay first day of the week (0=sunday, 1=monday, ...)
-     *
-     * @return integer
-     * @throws E_USER_WARNING this method throws a WARNING if the
-     *    CALENDAR_FIRST_DAY_OF_WEEK constant is already defined and
-     *    the $firstDay parameter is set to a different value
-     * @access protected
-     */
-    function defineFirstDayOfWeek($firstDay = null)
-    {
-        if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
-            if (!is_null($firstDay) && ($firstDay != CALENDAR_FIRST_DAY_OF_WEEK)) {
-                $msg = 'CALENDAR_FIRST_DAY_OF_WEEK constant already defined.'
-                  .' The $firstDay parameter will be ignored.';
-                trigger_error($msg, E_USER_WARNING);
-            }
-            return CALENDAR_FIRST_DAY_OF_WEEK;
-        }
-        if (is_null($firstDay)) {
-            $firstDay = $this->cE->getFirstDayOfWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            );
-        }
-        define ('CALENDAR_FIRST_DAY_OF_WEEK', $firstDay);
-        return CALENDAR_FIRST_DAY_OF_WEEK;
-    }
-
-    /**
-     * Returns the value for the previous year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2002 or timestamp
-     * @access public
-     */
-    function prevYear($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year-1, 1, 1, 0, 0, 0);
-        return $this->returnValue('Year', $format, $ts, $this->year-1);
-    }
-
-    /**
-     * Returns the value for this year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2003 or timestamp
-     * @access public
-     */
-    function thisYear($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year, 1, 1, 0, 0, 0);
-        return $this->returnValue('Year', $format, $ts, $this->year);
-    }
-
-    /**
-     * Returns the value for next year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2004 or timestamp
-     * @access public
-     */
-    function nextYear($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year+1, 1, 1, 0, 0, 0);
-        return $this->returnValue('Year', $format, $ts, $this->year+1);
-    }
-
-    /**
-     * Returns the value for the previous month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 4 or Unix timestamp
-     * @access public
-     */
-    function prevMonth($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year, $this->month-1, 1, 0, 0, 0);
-        return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
-    }
-
-    /**
-     * Returns the value for this month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 5 or timestamp
-     * @access public
-     */
-    function thisMonth($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year, $this->month, 1, 0, 0, 0);
-        return $this->returnValue('Month', $format, $ts, $this->month);
-    }
-
-    /**
-     * Returns the value for next month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 6 or timestamp
-     * @access public
-     */
-    function nextMonth($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp($this->year, $this->month+1, 1, 0, 0, 0);
-        return $this->returnValue('Month', $format, $ts, $this->cE->stampToMonth($ts));
-    }
-
-    /**
-     * Returns the value for the previous day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 10 or timestamp
-     * @access public
-     */
-    function prevDay($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day-1, 0, 0, 0);
-        return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
-    }
-
-    /**
-     * Returns the value for this day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 11 or timestamp
-     * @access public
-     */
-    function thisDay($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, 0, 0, 0);
-        return $this->returnValue('Day', $format, $ts, $this->day);
-    }
-
-    /**
-     * Returns the value for the next day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 12 or timestamp
-     * @access public
-     */
-    function nextDay($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day+1, 0, 0, 0);
-        return $this->returnValue('Day', $format, $ts, $this->cE->stampToDay($ts));
-    }
-
-    /**
-     * Returns the value for the previous hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 13 or timestamp
-     * @access public
-     */
-    function prevHour($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, $this->hour-1, 0, 0);
-        return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
-    }
-
-    /**
-     * Returns the value for this hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 14 or timestamp
-     * @access public
-     */
-    function thisHour($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, $this->hour, 0, 0);
-        return $this->returnValue('Hour', $format, $ts, $this->hour);
-    }
-
-    /**
-     * Returns the value for the next hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 14 or timestamp
-     * @access public
-     */
-    function nextHour($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day, $this->hour+1, 0, 0);
-        return $this->returnValue('Hour', $format, $ts, $this->cE->stampToHour($ts));
-    }
-
-    /**
-     * Returns the value for the previous minute
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 23 or timestamp
-     * @access public
-     */
-    function prevMinute($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute-1, 0);
-        return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
-    }
-
-    /**
-     * Returns the value for this minute
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 24 or timestamp
-     * @access public
-     */
-    function thisMinute($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, 0);
-        return $this->returnValue('Minute', $format, $ts, $this->minute);
-    }
-
-    /**
-    * Returns the value for the next minute
-    *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 25 or timestamp
-     * @access public
-     */
-    function nextMinute($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute+1, 0);
-        return $this->returnValue('Minute', $format, $ts, $this->cE->stampToMinute($ts));
-    }
-
-    /**
-     * Returns the value for the previous second
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 43 or timestamp
-     * @access public
-     */
-    function prevSecond($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second-1);
-        return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
-    }
-
-    /**
-     * Returns the value for this second
-     *
-    * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-    *
-     * @return int e.g. 44 or timestamp
-     * @access public
-     */
-    function thisSecond($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second);
-        return $this->returnValue('Second', $format, $ts, $this->second);
-    }
-
-    /**
-     * Returns the value for the next second
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 45 or timestamp
-     * @access public
-     */
-    function nextSecond($format = 'int')
-    {
-        $ts = $this->cE->dateToStamp(
-            $this->year, $this->month, $this->day,
-            $this->hour, $this->minute, $this->second+1);
-        return $this->returnValue('Second', $format, $ts, $this->cE->stampToSecond($ts));
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Day.php b/airtime_mvc/library/pear/Calendar/Day.php
deleted file mode 100644
index 3ef48538c..000000000
--- a/airtime_mvc/library/pear/Calendar/Day.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Day class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Day.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Day and builds Hours.
- * <code>
- * require_once 'Calendar/Day.php';
- * $Day = new Calendar_Day(2003, 10, 21); // Oct 21st 2003
- * while ($Hour = & $Day->fetch()) {
- *    echo $Hour->thisHour().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Day extends Calendar
-{
-    /**
-     * Marks the Day at the beginning of a week
-     * @access private
-     * @var boolean
-     */
-    var $first = false;
-
-    /**
-     * Marks the Day at the end of a week
-     * @access private
-     * @var boolean
-     */
-    var $last = false;
-
-
-    /**
-     * Used for tabular calendars
-     * @access private
-     * @var boolean
-     */
-    var $empty = false;
-
-    /**
-     * Constructs Calendar_Day
-     *
-     * @param int $y year e.g. 2003
-     * @param int $m month e.g. 8
-     * @param int $d day e.g. 15
-     *
-     * @access public
-     */
-    function Calendar_Day($y, $m, $d)
-    {
-        parent::Calendar($y, $m, $d);
-    }
-
-    /**
-     * Builds the Hours of the Day
-     *
-     * @param array $sDates (optional) Caledar_Hour objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Hour.php';
-
-        $hID = $this->cE->getHoursInDay($this->year, $this->month, $this->day);
-        for ($i=0; $i < $hID; $i++) {
-            $this->children[$i] =
-                new Calendar_Hour($this->year, $this->month, $this->day, $i);
-        }
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates dates to be selected
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()
-                && $this->month == $sDate->thisMonth()
-                && $this->day == $sDate->thisDay())
-            {
-                $key = (int)$sDate->thisHour();
-                if (isset($this->children[$key])) {
-                    $sDate->setSelected();
-                    $this->children[$key] = $sDate;
-                }
-            }
-        }
-    }
-
-    /**
-     * Defines Day object as first in a week
-     * Only used by Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state set this day as first in week
-     *
-     * @return void
-     * @access private
-     */
-    function setFirst($state = true)
-    {
-        $this->first = $state;
-    }
-
-    /**
-     * Defines Day object as last in a week
-     * Used only following Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state set this day as last in week
-     *
-     * @return void
-     * @access private
-     */
-    function setLast($state = true)
-    {
-        $this->last = $state;
-    }
-
-    /**
-     * Returns true if Day object is first in a Week
-     * Only relevant when Day is created by Calendar_Month_Weekdays::build()
-     *
-     * @return boolean
-     * @access public
-     */
-    function isFirst() 
-    {
-        return $this->first;
-    }
-
-    /**
-     * Returns true if Day object is last in a Week
-     * Only relevant when Day is created by Calendar_Month_Weekdays::build()
-     *
-     * @return boolean
-     * @access public
-     */
-    function isLast()
-    {
-        return $this->last;
-    }
-
-    /**
-     * Defines Day object as empty
-     * Only used by Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state set this day as empty
-     *
-     * @return void
-     * @access private
-     */
-    function setEmpty ($state = true)
-    {
-        $this->empty = $state;
-    }
-
-    /**
-     * Check if this day is empty
-     *
-     * @return boolean
-     * @access public
-     */
-    function isEmpty()
-    {
-        return $this->empty;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Decorator.php b/airtime_mvc/library/pear/Calendar/Decorator.php
deleted file mode 100644
index e4e27663a..000000000
--- a/airtime_mvc/library/pear/Calendar/Decorator.php
+++ /dev/null
@@ -1,650 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Decorator.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Decorates any calendar class.
- * Create a subclass of this class for your own "decoration".
- * Used for "selections"
- * <code>
- * class DayDecorator extends Calendar_Decorator
- * {
- *     function thisDay($format = 'int')
- *     {
-.*         $day = parent::thisDay('timestamp');
-.*         return date('D', $day);
- *     }
- * }
- * $Day = new Calendar_Day(2003, 10, 25);
- * $DayDecorator = new DayDecorator($Day);
- * echo $DayDecorator->thisDay(); // Outputs "Sat"
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @abstract
- */
-class Calendar_Decorator
-{
-    /**
-     * Subclass of Calendar being decorated
-     * @var object
-     * @access private
-     */
-    var $calendar;
-
-    /**
-     * Constructs the Calendar_Decorator
-     *
-     * @param object &$calendar subclass to Calendar to decorate
-     */
-    function Calendar_Decorator(&$calendar)
-    {
-        $this->calendar = & $calendar;
-    }
-
-    /**
-     * Defines the calendar by a Unix timestamp, replacing values
-     * passed to the constructor
-     *
-     * @param int $ts Unix timestamp
-     *
-     * @return void
-     * @access public
-     */
-    function setTimestamp($ts)
-    {
-        $this->calendar->setTimestamp($ts);
-    }
-
-    /**
-     * Returns a timestamp from the current date / time values. Format of
-     * timestamp depends on Calendar_Engine implementation being used
-     *
-     * @return int $ts timestamp
-     * @access public
-     */
-    function getTimestamp()
-    {
-        return $this->calendar->getTimeStamp();
-    }
-
-    /**
-     * Defines calendar object as selected (e.g. for today)
-     *
-     * @param boolean $state whether Calendar subclass must be selected
-     *
-     * @return void
-     * @access public
-     */
-    function setSelected($state = true)
-    {
-        $this->calendar->setSelected($state = true);
-    }
-
-    /**
-     * True if the calendar subclass object is selected (e.g. today)
-     *
-     * @return boolean
-     * @access public
-     */
-    function isSelected()
-    {
-        return $this->calendar->isSelected();
-    }
-
-    /**
-     * Adjusts the date (helper method)
-     *
-     * @return void
-     * @access public
-     */
-    function adjust()
-    {
-        $this->calendar->adjust();
-    }
-
-    /**
-     * Returns the date as an associative array (helper method)
-     *
-     * @param mixed $stamp timestamp (leave empty for current timestamp)
-     *
-     * @return array
-     * @access public
-     */
-    function toArray($stamp = null)
-    {
-        return $this->calendar->toArray($stamp);
-    }
-
-    /**
-     * Returns the value as an associative array (helper method)
-     *
-     * @param string  $returnType type of date object that return value represents
-     * @param string  $format     ['int'|'timestamp'|'object'|'array']
-     * @param mixed   $stamp      timestamp (depending on Calendar engine being used)
-     * @param integer $default    default value (i.e. give me the answer quick)
-     *
-     * @return mixed
-     * @access private
-     */
-    function returnValue($returnType, $format, $stamp, $default)
-    {
-        return $this->calendar->returnValue($returnType, $format, $stamp, $default);
-    }
-
-    /**
-     * Defines Day object as first in a week
-     * Only used by Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state whether it's first or not
-     *
-     * @return void
-     * @access private
-     */
-    function setFirst($state = true)
-    {
-        if (method_exists($this->calendar, 'setFirst')) {
-            $this->calendar->setFirst($state);
-        }
-    }
-
-    /**
-     * Defines Day object as last in a week
-     * Used only following Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state whether it's last or not
-     *
-     * @return void
-     * @access private
-     */
-    function setLast($state = true)
-    {
-        if (method_exists($this->calendar, 'setLast')) {
-            $this->calendar->setLast($state);
-        }
-    }
-
-    /**
-     * Returns true if Day object is first in a Week
-     * Only relevant when Day is created by Calendar_Month_Weekdays::build()
-     *
-     * @return boolean
-     * @access public
-     */
-    function isFirst()
-    {
-        if (method_exists($this->calendar, 'isFirst')) {
-            return $this->calendar->isFirst();
-        }
-    }
-
-    /**
-     * Returns true if Day object is last in a Week
-     * Only relevant when Day is created by Calendar_Month_Weekdays::build()
-     *
-     * @return boolean
-     * @access public
-     */
-    function isLast()
-    {
-        if (method_exists($this->calendar, 'isLast')) {
-            return $this->calendar->isLast();
-        }
-    }
-
-    /**
-     * Defines Day object as empty
-     * Only used by Calendar_Month_Weekdays::build()
-     *
-     * @param boolean $state whether it's empty or not
-     *
-     * @return void
-     * @access private
-     */
-    function setEmpty ($state = true)
-    {
-        if (method_exists($this->calendar, 'setEmpty')) {
-            $this->calendar->setEmpty($state);
-        }
-    }
-
-    /**
-     * Check if the current object is empty
-     *
-     * @return boolean
-     * @access public
-     */
-    function isEmpty()
-    {
-        if (method_exists($this->calendar, 'isEmpty')) {
-            return $this->calendar->isEmpty();
-        }
-    }
-
-    /**
-     * Build the children
-     *
-     * @param array $sDates array containing Calendar objects to select (optional)
-     *
-     * @return boolean
-     * @access public
-     * @abstract
-     */
-    function build($sDates = array())
-    {
-        $this->calendar->build($sDates);
-    }
-
-    /**
-     * Iterator method for fetching child Calendar subclass objects
-     * (e.g. a minute from an hour object). On reaching the end of
-     * the collection, returns false and resets the collection for
-     * further iteratations.
-     *
-     * @return mixed either an object subclass of Calendar or false
-     * @access public
-     */
-    function fetch()
-    {
-        return $this->calendar->fetch();
-    }
-
-    /**
-     * Fetches all child from the current collection of children
-     *
-     * @return array
-     * @access public
-     */
-    function fetchAll()
-    {
-        return $this->calendar->fetchAll();
-    }
-
-    /**
-     * Get the number Calendar subclass objects stored in the internal collection
-     *
-     * @return int
-     * @access public
-     */
-    function size()
-    {
-        return $this->calendar->size();
-    }
-
-    /**
-     * Determine whether this date is valid, with the bounds determined by
-     * the Calendar_Engine. The call is passed on to Calendar_Validator::isValid
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValid()
-    {
-        return $this->calendar->isValid();
-    }
-
-    /**
-     * Returns an instance of Calendar_Validator
-     *
-     * @return Calendar_Validator
-     * @access public
-     */
-    function & getValidator()
-    {
-        $validator = $this->calendar->getValidator();
-        return $validator;
-    }
-
-    /**
-     * Returns a reference to the current Calendar_Engine being used. Useful
-     * for Calendar_Table_Helper and Calendar_Validator
-     *
-     * @return object implementing Calendar_Engine_Inteface
-     * @access private
-     */
-    function & getEngine()
-    {
-        $engine = $this->calendar->getEngine();
-        return $engine;
-    }
-
-    /**
-     * Returns the value for the previous year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2002 or timestamp
-     * @access public
-     */
-    function prevYear($format = 'int')
-    {
-        return $this->calendar->prevYear($format);
-    }
-
-    /**
-     * Returns the value for this year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2003 or timestamp
-     * @access public
-     */
-    function thisYear($format = 'int')
-    {
-        return $this->calendar->thisYear($format);
-    }
-
-    /**
-     * Returns the value for next year
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 2004 or timestamp
-     * @access public
-     */
-    function nextYear($format = 'int')
-    {
-        return $this->calendar->nextYear($format);
-    }
-
-    /**
-     * Returns the value for the previous month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 4 or Unix timestamp
-     * @access public
-      */
-    function prevMonth($format = 'int')
-    {
-        return $this->calendar->prevMonth($format);
-    }
-
-    /**
-     * Returns the value for this month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 5 or timestamp
-     * @access public
-     */
-    function thisMonth($format = 'int')
-    {
-        return $this->calendar->thisMonth($format);
-    }
-
-    /**
-     * Returns the value for next month
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 6 or timestamp
-     * @access public
-     */
-    function nextMonth($format = 'int')
-    {
-        return $this->calendar->nextMonth($format);
-    }
-
-    /**
-     * Returns the value for the previous week
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 4 or Unix timestamp
-     * @access public
-      */
-    function prevWeek($format = 'n_in_month')
-    {
-        if ( method_exists($this->calendar, 'prevWeek')) {
-            return $this->calendar->prevWeek($format);
-        } else {
-            include_once 'PEAR.php';
-            PEAR::raiseError(
-                'Cannot call prevWeek on Calendar object of type: '.
-                get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
-                E_USER_NOTICE, 'Calendar_Decorator::prevWeek()');
-            return false;
-        }
-    }
-
-    /**
-     * Returns the value for this week
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 5 or timestamp
-     * @access public
-     */
-    function thisWeek($format = 'n_in_month')
-    {
-        if ( method_exists($this->calendar, 'thisWeek')) {
-            return $this->calendar->thisWeek($format);
-        } else {
-            include_once 'PEAR.php';
-            PEAR::raiseError(
-                'Cannot call thisWeek on Calendar object of type: '.
-                get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
-                E_USER_NOTICE, 'Calendar_Decorator::thisWeek()');
-            return false;
-        }
-    }
-
-    /**
-     * Returns the value for next week
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 6 or timestamp
-     * @access public
-     */
-    function nextWeek($format = 'n_in_month')
-    {
-        if ( method_exists($this->calendar, 'nextWeek')) {
-            return $this->calendar->nextWeek($format);
-        } else {
-            include_once 'PEAR.php';
-            PEAR::raiseError(
-                'Cannot call thisWeek on Calendar object of type: '.
-                get_class($this->calendar), 133, PEAR_ERROR_TRIGGER,
-                E_USER_NOTICE, 'Calendar_Decorator::nextWeek()');
-            return false;
-        }
-    }
-
-    /**
-     * Returns the value for the previous day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 10 or timestamp
-     * @access public
-     */
-    function prevDay($format = 'int')
-    {
-        return $this->calendar->prevDay($format);
-    }
-
-    /**
-     * Returns the value for this day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 11 or timestamp
-     * @access public
-     */
-    function thisDay($format = 'int')
-    {
-        return $this->calendar->thisDay($format);
-    }
-
-    /**
-     * Returns the value for the next day
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 12 or timestamp
-     * @access public
-     */
-    function nextDay($format = 'int')
-    {
-        return $this->calendar->nextDay($format);
-    }
-
-    /**
-     * Returns the value for the previous hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 13 or timestamp
-     * @access public
-     */
-    function prevHour($format = 'int')
-    {
-        return $this->calendar->prevHour($format);
-    }
-
-    /**
-     * Returns the value for this hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 14 or timestamp
-     * @access public
-     */
-    function thisHour($format = 'int')
-    {
-        return $this->calendar->thisHour($format);
-    }
-
-    /**
-     * Returns the value for the next hour
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 14 or timestamp
-     * @access public
-     */
-    function nextHour($format = 'int')
-    {
-        return $this->calendar->nextHour($format);
-    }
-
-    /**
-     * Returns the value for the previous minute
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 23 or timestamp
-     * @access public
-     */
-    function prevMinute($format = 'int')
-    {
-        return $this->calendar->prevMinute($format);
-    }
-
-    /**
-     * Returns the value for this minute
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 24 or timestamp
-     * @access public
-     */
-    function thisMinute($format = 'int')
-    {
-        return $this->calendar->thisMinute($format);
-    }
-
-    /**
-     * Returns the value for the next minute
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 25 or timestamp
-     * @access public
-     */
-    function nextMinute($format = 'int')
-    {
-        return $this->calendar->nextMinute($format);
-    }
-
-    /**
-     * Returns the value for the previous second
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 43 or timestamp
-     * @access public
-     */
-    function prevSecond($format = 'int')
-    {
-        return $this->calendar->prevSecond($format);
-    }
-
-    /**
-     * Returns the value for this second
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 44 or timestamp
-     * @access public
-     */
-    function thisSecond($format = 'int')
-    {
-        return $this->calendar->thisSecond($format);
-    }
-
-    /**
-     * Returns the value for the next second
-     *
-     * @param string $format return value format ['int'|'timestamp'|'object'|'array']
-     *
-     * @return int e.g. 45 or timestamp
-     * @access public
-     */
-    function nextSecond($format = 'int')
-    {
-        return $this->calendar->nextSecond($format);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Decorator/Textual.php b/airtime_mvc/library/pear/Calendar/Decorator/Textual.php
deleted file mode 100644
index 729862010..000000000
--- a/airtime_mvc/library/pear/Calendar/Decorator/Textual.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator_Wrapper class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Textual.php 246907 2007-11-24 11:04:24Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar decorator base class
- */
-require_once CALENDAR_ROOT.'Decorator.php';
-
-/**
- * Load the Uri utility
- */
-require_once CALENDAR_ROOT.'Util'.DIRECTORY_SEPARATOR.'Textual.php';
-
-/**
- * Decorator to help with fetching textual representations of months and
- * days of the week.
- * <b>Note:</b> for performance you should prefer Calendar_Util_Textual unless you
- * have a specific need to use a decorator
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Decorator_Textual extends Calendar_Decorator
-{
-    /**
-     * Constructs Calendar_Decorator_Textual
-     *
-     * @param object &$Calendar subclass of Calendar
-     *
-     * @access public
-     */
-    function Calendar_Decorator_Textual(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    /**
-     * Returns an array of 12 month names (first index = 1)
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return array
-     * @access public
-     * @static
-     */
-    function monthNames($format = 'long')
-    {
-        return Calendar_Util_Textual::monthNames($format);
-    }
-
-    /**
-     * Returns an array of 7 week day names (first index = 0)
-     *
-     * @param string $format (optional) format of returned days (one|two|short|long)
-     *
-     * @return array
-     * @access public
-     * @static
-     */
-    function weekdayNames($format = 'long')
-    {
-        return Calendar_Util_Textual::weekdayNames($format);
-    }
-
-    /**
-     * Returns textual representation of the previous month of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function prevMonthName($format = 'long')
-    {
-        return Calendar_Util_Textual::prevMonthName($this->calendar, $format);
-    }
-
-    /**
-     * Returns textual representation of the month of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function thisMonthName($format = 'long')
-    {
-        return Calendar_Util_Textual::thisMonthName($this->calendar, $format);
-    }
-
-    /**
-     * Returns textual representation of the next month of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function nextMonthName($format = 'long')
-    {
-        return Calendar_Util_Textual::nextMonthName($this->calendar, $format);
-    }
-
-    /**
-     * Returns textual representation of the previous day of week of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function prevDayName($format = 'long')
-    {
-        return Calendar_Util_Textual::prevDayName($this->calendar, $format);
-    }
-
-    /**
-     * Returns textual representation of the day of week of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function thisDayName($format = 'long')
-    {
-        return Calendar_Util_Textual::thisDayName($this->calendar, $format);
-    }
-
-    /**
-     * Returns textual representation of the next day of week of the decorated calendar object
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return string
-     * @access public
-     */
-    function nextDayName($format = 'long')
-    {
-        return Calendar_Util_Textual::nextDayName($this->calendar, $format);
-    }
-
-    /**
-     * Returns the days of the week using the order defined in the decorated
-     * calendar object. Only useful for Calendar_Month_Weekdays, Calendar_Month_Weeks
-     * and Calendar_Week. Otherwise the returned array will begin on Sunday
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return array ordered array of week day names
-     * @access public
-     */
-    function orderedWeekdays($format = 'long')
-    {
-        return Calendar_Util_Textual::orderedWeekdays($this->calendar, $format);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Decorator/Uri.php b/airtime_mvc/library/pear/Calendar/Decorator/Uri.php
deleted file mode 100644
index 08e4deb69..000000000
--- a/airtime_mvc/library/pear/Calendar/Decorator/Uri.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator_Uri class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Uri.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar decorator base class
- */
-require_once CALENDAR_ROOT.'Decorator.php';
-
-/**
- * Load the Uri utility
- */
-require_once CALENDAR_ROOT.'Util'.DIRECTORY_SEPARATOR.'Uri.php';
-
-/**
- * Decorator to help with building HTML links for navigating the calendar<br />
- * <b>Note:</b> for performance you should prefer Calendar_Util_Uri unless you
- * have a specific need to use a decorator
- * <code>
- * $Day = new Calendar_Day(2003, 10, 23);
- * $Uri = new Calendar_Decorator_Uri($Day);
- * $Uri->setFragments('year', 'month', 'day');
- * echo $Uri->getPrev(); // Displays year=2003&month=10&day=22
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @see       Calendar_Util_Uri
- * @access    public
- */
-class Calendar_Decorator_Uri extends Calendar_Decorator
-{
-
-    /**
-     * @var Calendar_Util_Uri
-     * @access private
-     */
-    var $Uri;
-
-    /**
-     * Constructs Calendar_Decorator_Uri
-     *
-     * @param object &$Calendar subclass of Calendar
-     *
-     * @access public
-     */
-    function Calendar_Decorator_Uri(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    /**
-     * Sets the URI fragment names
-     *
-     * @param string $y URI fragment for year
-     * @param string $m (optional) URI fragment for month
-     * @param string $d (optional) URI fragment for day
-     * @param string $h (optional) URI fragment for hour
-     * @param string $i (optional) URI fragment for minute
-     * @param string $s (optional) URI fragment for second
-     *
-     * @return void
-     * @access public
-     */
-    function setFragments($y, $m = null, $d = null, $h = null, $i = null, $s = null)
-    {
-        $this->Uri = new Calendar_Util_Uri($y, $m, $d, $h, $i, $s);
-    }
-
-    /**
-     * Sets the separator string between fragments
-     *
-     * @param string $separator url fragment separator e.g. /
-     *
-     * @return void
-     * @access public
-     */
-    function setSeparator($separator)
-    {
-        $this->Uri->separator = $separator;
-    }
-
-    /**
-     * Puts Uri decorator into "scalar mode" - URI variable names are not returned
-     *
-     * @param boolean $state (optional)
-     *
-     * @return void
-     * @access public
-     */
-    function setScalar($state = true)
-    {
-        $this->Uri->scalar = $state;
-    }
-
-    /**
-     * Gets the URI string for the previous calendar unit
-     *
-     * @param string $method calendar unit to fetch uri for (year, month, week or day etc)
-     *
-     * @return string
-     * @access public
-     */
-    function prev($method)
-    {
-        return $this->Uri->prev($this, $method);
-    }
-
-    /**
-     * Gets the URI string for the current calendar unit
-     *
-     * @param string $method calendar unit to fetch uri for (year,month,week or day etc)
-     *
-     * @return string
-     * @access public
-     */
-    function this($method)
-    {
-        return $this->Uri->this($this, $method);
-    }
-
-    /**
-     * Gets the URI string for the next calendar unit
-     *
-     * @param string $method calendar unit to fetch uri for (year,month,week or day etc)
-     *
-     * @return string
-     * @access public
-     */
-    function next($method)
-    {
-        return $this->Uri->next($this, $method);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Decorator/Weekday.php b/airtime_mvc/library/pear/Calendar/Decorator/Weekday.php
deleted file mode 100644
index d02c87dcc..000000000
--- a/airtime_mvc/library/pear/Calendar/Decorator/Weekday.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator_Weekday class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weekday.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar decorator base class
- */
-require_once CALENDAR_ROOT.'Decorator.php';
-
-/**
- * Load a Calendar_Day
- */
-require_once CALENDAR_ROOT.'Day.php';
-/**
- * Decorator for fetching the day of the week
- * <code>
- * $Day = new Calendar_Day(2003, 10, 23);
- * $Weekday = new Calendar_Decorator_Weekday($Day);
- * $Weekday->setFirstDay(0); // Set first day of week to Sunday (default Mon)
- * echo $Weekday->thisWeekDay(); // Displays 5 - fifth day of week relative to Sun
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Decorator_Weekday extends Calendar_Decorator
-{
-    /**
-     * First day of week
-     * @var int (default = 1 for Monday)
-     * @access private
-     */
-    var $firstDay = 1;
-
-    /**
-     * Constructs Calendar_Decorator_Weekday
-     *
-     * @param object &$Calendar subclass of Calendar
-     *
-     * @access public
-     */
-    function Calendar_Decorator_Weekday(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    /**
-     * Sets the first day of the week (0 = Sunday, 1 = Monday (default) etc)
-     *
-     * @param int $firstDay first day of week
-     *
-     * @return void
-     * @access public
-     */
-    function setFirstDay($firstDay) 
-    {
-        $this->firstDay = (int)$firstDay;
-    }
-
-    /**
-     * Returns the previous weekday
-     *
-     * @param string $format (default = 'int') return value format
-     *
-     * @return int $format numeric day of week or timestamp
-     * @access public
-     */
-    function prevWeekDay($format = 'int')
-    {
-        $ts  = $this->calendar->prevDay('timestamp');
-        $Day = new Calendar_Day(2000, 1, 1);
-        $Day->setTimeStamp($ts);
-        $day = $this->calendar->cE->getDayOfWeek(
-            $Day->thisYear(),
-            $Day->thisMonth(),
-            $Day->thisDay()
-        );
-        $day = $this->adjustWeekScale($day);
-        return $this->returnValue('Day', $format, $ts, $day);
-    }
-
-    /**
-     * Returns the current weekday
-     *
-     * @param string $format (default = 'int') return value format
-     *
-     * @return int numeric day of week or timestamp
-     * @access public
-     */
-    function thisWeekDay($format = 'int')
-    {
-        $ts  = $this->calendar->thisDay('timestamp');
-        $day = $this->calendar->cE->getDayOfWeek(
-            $this->calendar->year,
-            $this->calendar->month,
-            $this->calendar->day
-        );
-        $day = $this->adjustWeekScale($day);
-        return $this->returnValue('Day', $format, $ts, $day);
-    }
-
-    /**
-     * Returns the next weekday
-     *
-     * @param string $format (default = 'int') return value format
-     *
-     * @return int numeric day of week or timestamp
-     * @access public
-     */
-    function nextWeekDay($format = 'int')
-    {
-        $ts  = $this->calendar->nextDay('timestamp');
-        $Day = new Calendar_Day(2000, 1, 1);
-        $Day->setTimeStamp($ts);
-        $day = $this->calendar->cE->getDayOfWeek(
-            $Day->thisYear(),
-            $Day->thisMonth(),
-            $Day->thisDay()
-        );
-        $day = $this->adjustWeekScale($day);
-        return $this->returnValue('Day', $format, $ts, $day);
-    }
-
-    /**
-     * Adjusts the day of the week relative to the first day of the week
-     *
-     * @param int $dayOfWeek day of week calendar from Calendar_Engine
-     *
-     * @return int day of week adjusted to first day
-     * @access private
-     */
-    function adjustWeekScale($dayOfWeek) 
-    {
-        $dayOfWeek = $dayOfWeek - $this->firstDay;
-        if ($dayOfWeek >= 0) {
-            return $dayOfWeek;
-        } else {
-            return $this->calendar->cE->getDaysInWeek(
-                $this->calendar->year,
-                $this->calendar->month,
-                $this->calendar->day
-            ) + $dayOfWeek;
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Decorator/Wrapper.php b/airtime_mvc/library/pear/Calendar/Decorator/Wrapper.php
deleted file mode 100644
index 4ed2f84ac..000000000
--- a/airtime_mvc/library/pear/Calendar/Decorator/Wrapper.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator_Wrapper class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Wrapper.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar decorator base class
- */
-require_once CALENDAR_ROOT.'Decorator.php';
-
-/**
- * Decorator to help with wrapping built children in another decorator
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Decorator_Wrapper extends Calendar_Decorator
-{
-    /**
-     * Constructs Calendar_Decorator_Wrapper
-     *
-     * @param object &$Calendar subclass of Calendar
-     *
-     * @access public
-     */
-    function Calendar_Decorator_Wrapper(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    /**
-     * Wraps objects returned from fetch in the named Decorator class
-     *
-     * @param string $decorator name of Decorator class to wrap with
-     *
-     * @return object instance of named decorator
-     * @access public
-     */
-    function & fetch($decorator)
-    {
-        $Calendar = parent::fetch();
-        if ($Calendar) {
-            $ret = new $decorator($Calendar);
-        } else {
-            $ret = false;
-        }
-        return $ret;
-    }
-
-    /**
-     * Wraps the returned calendar objects from fetchAll in the named decorator
-     *
-     * @param string $decorator name of Decorator class to wrap with
-     *
-     * @return array
-     * @access public
-     */
-    function fetchAll($decorator)
-    {
-        $children = parent::fetchAll();
-        foreach ($children as $key => $Calendar) {
-            $children[$key] = new $decorator($Calendar);
-        }
-        return $children;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Engine/Interface.php b/airtime_mvc/library/pear/Calendar/Engine/Interface.php
deleted file mode 100644
index d443210bc..000000000
--- a/airtime_mvc/library/pear/Calendar/Engine/Interface.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Engine_Interface class (interface)
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Interface.php 269074 2008-11-15 21:21:42Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * The methods the classes implementing the Calendar_Engine must implement.
- * Note this class is not used but simply to help development
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access protected
- */
-class Calendar_Engine_Interface
-{
-    /**
-     * Provides a mechansim to make sure parsing of timestamps
-     * into human dates is only performed once per timestamp.
-     * Typically called "internally" by methods like stampToYear.
-     * Return value can vary, depending on the specific implementation
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return mixed
-     * @access protected
-     */
-    function stampCollection($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric year given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int year (e.g. 2003)
-     * @access protected
-     */
-    function stampToYear($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric month given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int month (e.g. 9)
-     * @access protected
-     */
-    function stampToMonth($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric day given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int day (e.g. 15)
-     * @access protected
-     */
-    function stampToDay($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric hour given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int hour (e.g. 13)
-     * @access protected
-     */
-    function stampToHour($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric minute given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int minute (e.g. 34)
-     * @access protected
-     */
-    function stampToMinute($stamp)
-    {
-    }
-
-    /**
-     * Returns a numeric second given a timestamp
-     *
-     * @param int $stamp timestamp (depending on implementation)
-     *
-     * @return int second (e.g. 51)
-     * @access protected
-     */
-    function stampToSecond($stamp)
-    {
-    }
-
-    /**
-     * Returns a timestamp. Can be worth "caching" generated timestamps in a
-     * static variable, identified by the params this method accepts,
-     * to timestamp will only be calculated once.
-     *
-     * @param int $y year (e.g. 2003)
-     * @param int $m month (e.g. 9)
-     * @param int $d day (e.g. 13)
-     * @param int $h hour (e.g. 13)
-     * @param int $i minute (e.g. 34)
-     * @param int $s second (e.g. 53)
-     *
-     * @return int (depends on implementation)
-     * @access protected
-     */
-    function dateToStamp($y, $m, $d, $h, $i, $s)
-    {
-    }
-
-    /**
-     * The upper limit on years that the Calendar Engine can work with
-     *
-     * @return int (e.g. 2037)
-     * @access protected
-     */
-    function getMaxYears()
-    {
-    }
-
-    /**
-     * The lower limit on years that the Calendar Engine can work with
-     *
-     * @return int (e.g 1902)
-     * @access protected
-     */
-    function getMinYears()
-    {
-    }
-
-    /**
-     * Returns the number of months in a year
-     *
-     * @param int $y (optional) year to get months for
-     *
-     * @return int (e.g. 12)
-     * @access protected
-     */
-    function getMonthsInYear($y=null)
-    {
-    }
-
-    /**
-     * Returns the number of days in a month, given year and month
-     *
-     * @param int $y year (e.g. 2003)
-     * @param int $m month (e.g. 9)
-     *
-     * @return int days in month
-     * @access protected
-     */
-    function getDaysInMonth($y, $m)
-    {
-    }
-
-    /**
-     * Returns numeric representation of the day of the week in a month,
-     * given year and month
-     *
-     * @param int $y year (e.g. 2003)
-     * @param int $m month (e.g. 9)
-     *
-     * @return int
-     * @access protected
-     */
-    function getFirstDayInMonth ($y, $m)
-    {
-    }
-
-    /**
-     * Returns the number of days in a week
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (e.g. 7)
-     * @access protected
-     */
-    function getDaysInWeek($y=null, $m=null, $d=null)
-    {
-    }
-
-    /**
-     * Returns the number of the week in the year (ISO-8601), given a date
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInYear($y, $m, $d)
-    {
-    }
-
-    /**
-     * Returns the number of the week in the month, given a date
-     *
-     * @param int $y        year (2003)
-     * @param int $m        month (9)
-     * @param int $d        day (4)
-     * @param int $firstDay first day of the week (default: 1 - monday)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
-    {
-    }
-
-    /**
-     * Returns the number of weeks in the month
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     *
-     * @return int weeks number
-     * @access protected
-     */
-    function getWeeksInMonth($y, $m)
-    {
-    }
-
-    /**
-     * Returns the number of the day of the week (0=sunday, 1=monday...)
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int weekday number
-     * @access protected
-     */
-    function getDayOfWeek($y, $m, $d)
-    {
-    }
-
-    /**
-     * Returns the numeric values of the days of the week.
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return array list of numeric values of days in week, beginning 0
-     * @access protected
-     */
-    function getWeekDays($y=null, $m=null, $d=null)
-    {
-    }
-
-    /**
-     * Returns the default first day of the week as an integer. Must be a
-     * member of the array returned from getWeekDays
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (e.g. 1 for Monday)
-     * @see getWeekDays
-     * @access protected
-     */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
-    {
-    }
-
-    /**
-     * Returns the number of hours in a day
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (e.g. 24)
-     * @access protected
-     */
-    function getHoursInDay($y=null,$m=null,$d=null)
-    {
-    }
-
-    /**
-     * Returns the number of minutes in an hour
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     *
-     * @return int
-     * @access protected
-     */
-    function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
-    {
-    }
-
-    /**
-     * Returns the number of seconds in a minutes
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     * @param int $i minute
-     *
-     * @return int
-     * @access protected
-     */
-    function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
-    {
-    }
-
-    /**
-     * Checks if the given day is the current day
-     *
-     * @param int timestamp (depending on implementation)
-     *
-     * @return boolean
-     * @access protected
-     */
-    function isToday($stamp)
-    {
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Engine/PearDate.php b/airtime_mvc/library/pear/Calendar/Engine/PearDate.php
deleted file mode 100644
index 7c54d37cd..000000000
--- a/airtime_mvc/library/pear/Calendar/Engine/PearDate.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Engine_PearDate class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: PearDate.php 269076 2008-11-15 21:41:38Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Load PEAR::Date class
- */
-require_once 'Date.php';
-
-/**
- * Performs calendar calculations based on the PEAR::Date class
- * Timestamps are in the ISO-8601 format (YYYY-MM-DD HH:MM:SS)
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access protected
- */
-class Calendar_Engine_PearDate /* implements Calendar_Engine_Interface */
-{
-    /**
-     * Makes sure a given timestamp is only ever parsed once
-     * Uses a static variable to prevent date() being used twice
-     * for a date which is already known
-     *
-     * @param mixed $stamp Any timestamp format recognized by Pear::Date
-     *
-     * @return object Pear::Date object
-     * @access protected
-     */
-    function stampCollection($stamp)
-    {
-        static $stamps = array();
-        if (!isset($stamps[$stamp])) {
-            $stamps[$stamp] = new Date($stamp);
-        }
-        return $stamps[$stamp];
-    }
-
-    /**
-     * Returns a numeric year given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int year (e.g. 2003)
-     * @access protected
-     */
-    function stampToYear($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->year;
-    }
-
-    /**
-     * Returns a numeric month given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int month (e.g. 9)
-     * @access protected
-     */
-    function stampToMonth($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->month;
-    }
-
-    /**
-     * Returns a numeric day given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int day (e.g. 15)
-     * @access protected
-     */
-    function stampToDay($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->day;
-    }
-
-    /**
-     * Returns a numeric hour given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int hour (e.g. 13)
-     * @access protected
-     */
-    function stampToHour($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->hour;
-    }
-
-    /**
-     * Returns a numeric minute given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int minute (e.g. 34)
-     * @access protected
-     */
-    function stampToMinute($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->minute;
-    }
-
-    /**
-     * Returns a numeric second given a iso-8601 datetime
-     *
-     * @param string $stamp iso-8601 datetime (YYYY-MM-DD HH:MM:SS)
-     *
-     * @return int second (e.g. 51)
-     * @access protected
-     */
-    function stampToSecond($stamp)
-    {
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (int)$date->second;
-    }
-
-    /**
-     * Returns a iso-8601 datetime
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (13)
-     * @param int $h hour (13)
-     * @param int $i minute (34)
-     * @param int $s second (53)
-     *
-     * @return string iso-8601 datetime
-     * @access protected
-     */
-    function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
-    {
-        $r = array();
-        Calendar_Engine_PearDate::adjustDate($y, $m, $d, $h, $i, $s);
-        $key = $y.$m.$d.$h.$i.$s;
-        if (!isset($r[$key])) {
-            $r[$key] = sprintf("%04d-%02d-%02d %02d:%02d:%02d",
-                                $y, $m, $d, $h, $i, $s);
-        }
-        return $r[$key];
-    }
-
-    /**
-     * Set the correct date values (useful for math operations on dates)
-     *
-     * @param int &$y year   (2003)
-     * @param int &$m month  (9)
-     * @param int &$d day    (13)
-     * @param int &$h hour   (13)
-     * @param int &$i minute (34)
-     * @param int &$s second (53)
-     *
-     * @return void
-     * @access protected
-     */
-    function adjustDate(&$y, &$m, &$d, &$h, &$i, &$s)
-    {
-        if ($s < 0) {
-            $m -= floor($s / 60);
-            $s = -$s % 60;
-        }
-        if ($s > 60) {
-            $m += floor($s / 60);
-            $s %= 60;
-        }
-        if ($i < 0) {
-            $h -= floor($i / 60);
-            $i = -$i % 60;
-        }
-        if ($i > 60) {
-            $h += floor($i / 60);
-            $i %= 60;
-        }
-        if ($h < 0) {
-            $d -= floor($h / 24);
-            $h = -$h % 24;
-        }
-        if ($h > 24) {
-            $d += floor($h / 24);
-            $h %= 24;
-        }
-        for(; $m < 1; $y--, $m+=12);
-        for(; $m > 12; $y++, $m-=12);
-
-        while ($d < 1) {
-            if ($m > 1) {
-                $m--;
-            } else {
-                $m = 12;
-                $y--;
-            }
-            $d += Date_Calc::daysInMonth($m, $y);
-        }
-        for ($max_days = Date_Calc::daysInMonth($m, $y); $d > $max_days; ) {
-            $d -= $max_days;
-            if ($m < 12) {
-                $m++;
-            } else {
-                $m = 1;
-                $y++;
-            }
-        }
-    }
-
-    /**
-     * The upper limit on years that the Calendar Engine can work with
-     *
-     * @return int 9999
-     * @access protected
-     */
-    function getMaxYears()
-    {
-        return 9999;
-    }
-
-    /**
-     * The lower limit on years that the Calendar Engine can work with
-     *
-     * @return int 0
-     * @access protected
-     */
-    function getMinYears()
-    {
-        return 0;
-    }
-
-    /**
-     * Returns the number of months in a year
-     *
-     * @param int $y year
-     *
-     * @return int (12)
-     * @access protected
-     */
-    function getMonthsInYear($y=null)
-    {
-        return 12;
-    }
-
-    /**
-     * Returns the number of days in a month, given year and month
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     *
-     * @return int days in month
-     * @access protected
-     */
-    function getDaysInMonth($y, $m)
-    {
-        return (int)Date_Calc::daysInMonth($m, $y);
-    }
-
-    /**
-     * Returns numeric representation of the day of the week in a month,
-     * given year and month
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     *
-     * @return int from 0 to 7
-     * @access protected
-     */
-    function getFirstDayInMonth($y, $m)
-    {
-        return (int)Date_Calc::dayOfWeek(1, $m, $y);
-    }
-
-    /**
-     * Returns the number of days in a week
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (7)
-     * @access protected
-     */
-    function getDaysInWeek($y=null, $m=null, $d=null)
-    {
-        return 7;
-    }
-
-    /**
-     * Returns the number of the week in the year (ISO-8601), given a date
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInYear($y, $m, $d)
-    {
-        //return Date_Calc::weekOfYear($d, $m, $y); //beware, Date_Calc doesn't follow ISO-8601 standard!
-        list($nYear, $nWeek) = Date_Calc::weekOfYear4th($d, $m, $y);
-        return $nWeek;
-    }
-
-    /**
-     * Returns the number of the week in the month, given a date
-     *
-     * @param int $y        year (2003)
-     * @param int $m        month (9)
-     * @param int $d        day (4)
-     * @param int $firstDay first day of the week (default: monday)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
-    {
-        $weekEnd = ($firstDay == 0) ? $this->getDaysInWeek()-1 : $firstDay-1;
-        $end_of_week = (int)Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true);
-        $w = 1;
-        while ($d > $end_of_week) {
-            ++$w;
-            $end_of_week += $this->getDaysInWeek();
-        }
-        return $w;
-    }
-
-    /**
-     * Returns the number of weeks in the month
-     *
-     * @param int $y        year (2003)
-     * @param int $m        month (9)
-     * @param int $firstDay first day of the week (default: monday)
-     *
-     * @return int weeks number
-     * @access protected
-     */
-    function getWeeksInMonth($y, $m, $firstDay=1)
-    {
-        $FDOM = Date_Calc::firstOfMonthWeekday($m, $y);
-        if ($FDOM == 0) {
-            $FDOM = $this->getDaysInWeek();
-        }
-        if ($FDOM > $firstDay) {
-            $daysInTheFirstWeek = $this->getDaysInWeek() - $FDOM + $firstDay;
-            $weeks = 1;
-        } else {
-            $daysInTheFirstWeek = $firstDay - $FDOM;
-            $weeks = 0;
-        }
-        $daysInTheFirstWeek %= $this->getDaysInWeek();
-        return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) /
-                           $this->getDaysInWeek()) + $weeks);
-    }
-
-    /**
-     * Returns the number of the day of the week (0=sunday, 1=monday...)
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int weekday number
-     * @access protected
-     */
-    function getDayOfWeek($y, $m, $d)
-    {
-        return Date_Calc::dayOfWeek($d, $m, $y);
-    }
-
-    /**
-     * Returns a list of integer days of the week beginning 0
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday
-     * @access protected
-     */
-    function getWeekDays($y=null, $m=null, $d=null)
-    {
-        return array(0, 1, 2, 3, 4, 5, 6);
-    }
-
-    /**
-     * Returns the default first day of the week
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (default 1 = Monday)
-     * @access protected
-     */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the number of hours in a day
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (24)
-     * @access protected
-     */
-    function getHoursInDay($y=null,$m=null,$d=null)
-    {
-        return 24;
-    }
-
-    /**
-     * Returns the number of minutes in an hour
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     *
-     * @return int (60)
-     * @access protected
-     */
-    function getMinutesInHour($y=null,$m=null,$d=null,$h=null)
-    {
-        return 60;
-    }
-
-    /**
-     * Returns the number of seconds in a minutes
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     * @param int $i minute
-     *
-     * @return int (60)
-     * @access protected
-     */
-    function getSecondsInMinute($y=null,$m=null,$d=null,$h=null,$i=null)
-    {
-        return 60;
-    }
-
-    /**
-     * Checks if the given day is the current day
-     *
-     * @param mixed $stamp Any timestamp format recognized by Pear::Date
-     *
-     * @return boolean
-     * @access protected
-     */
-    function isToday($stamp)
-    {
-        static $today = null;
-        if (is_null($today)) {
-            $today = new Date();
-        }
-        $date = Calendar_Engine_PearDate::stampCollection($stamp);
-        return (   $date->day == $today->getDay()
-                && $date->month == $today->getMonth()
-                && $date->year == $today->getYear()
-        );
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Engine/UnixTS.php b/airtime_mvc/library/pear/Calendar/Engine/UnixTS.php
deleted file mode 100644
index e24f0240d..000000000
--- a/airtime_mvc/library/pear/Calendar/Engine/UnixTS.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Engine_UnixTS class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: UnixTS.php 269074 2008-11-15 21:21:42Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Performs calendar calculations based on the PHP date() function and
- * Unix timestamps (using PHP's mktime() function).
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    protected
- */
-class Calendar_Engine_UnixTS /* implements Calendar_Engine_Interface */
-{
-    /**
-     * Makes sure a given timestamp is only ever parsed once
-     * <pre>
-     * array (
-     *  [0] => year (e.g 2003),
-     *  [1] => month (e.g 9),
-     *  [2] => day (e.g 6),
-     *  [3] => hour (e.g 14),
-     *  [4] => minute (e.g 34),
-     *  [5] => second (e.g 45),
-     *  [6] => num days in month (e.g. 31),
-     *  [7] => week in year (e.g. 50),
-     *  [8] => day in week (e.g. 0 for Sunday)
-     * )
-     * </pre>
-     * Uses a static variable to prevent date() being used twice
-     * for a date which is already known
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return array
-     * @access protected
-     */
-    function stampCollection($stamp)
-    {
-        static $stamps = array();
-        if ( !isset($stamps[$stamp]) ) {
-            $date = @date('Y n j H i s t W w', $stamp);
-            $stamps[$stamp] = sscanf($date, "%d %d %d %d %d %d %d %d %d");
-        }
-        return $stamps[$stamp];
-    }
-
-    /**
-     * Returns a numeric year given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int year (e.g. 2003)
-     * @access protected
-     */
-    function stampToYear($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[0];
-    }
-
-    /**
-     * Returns a numeric month given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int month (e.g. 9)
-     * @access protected
-     */
-    function stampToMonth($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[1];
-    }
-
-    /**
-     * Returns a numeric day given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int day (e.g. 15)
-     * @access protected
-     */
-    function stampToDay($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[2];
-    }
-
-    /**
-     * Returns a numeric hour given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int hour (e.g. 13)
-     * @access protected
-     */
-    function stampToHour($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[3];
-    }
-
-    /**
-     * Returns a numeric minute given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int minute (e.g. 34)
-     * @access protected
-     */
-    function stampToMinute($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[4];
-    }
-
-    /**
-     * Returns a numeric second given a timestamp
-     *
-     * @param int $stamp Unix timestamp
-     *
-     * @return int second (e.g. 51)
-     * @access protected
-     */
-    function stampToSecond($stamp)
-    {
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (int)$date[5];
-    }
-
-    /**
-     * Returns a timestamp
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (13)
-     * @param int $h hour (13)
-     * @param int $i minute (34)
-     * @param int $s second (53)
-     *
-     * @return int Unix timestamp
-     * @access protected
-     */
-    function dateToStamp($y, $m, $d, $h=0, $i=0, $s=0)
-    {
-        static $dates = array();
-        if (!isset($dates[$y][$m][$d][$h][$i][$s])) {
-            $dates[$y][$m][$d][$h][$i][$s] = @mktime($h, $i, $s, $m, $d, $y);
-        }
-        return $dates[$y][$m][$d][$h][$i][$s];
-    }
-
-    /**
-     * The upper limit on years that the Calendar Engine can work with
-     *
-     * @return int (2037)
-     * @access protected
-     */
-    function getMaxYears()
-    {
-        return 2037;
-    }
-
-    /**
-     * The lower limit on years that the Calendar Engine can work with
-     *
-     * @return int (1970 if it's Windows and 1902 for all other OSs)
-     * @access protected
-     */
-    function getMinYears()
-    {
-        return $min = strpos(PHP_OS, 'WIN') === false ? 1902 : 1970;
-    }
-
-    /**
-     * Returns the number of months in a year
-     *
-     * @param int $y year
-     *
-     * @return int (12)
-     * @access protected
-     */
-    function getMonthsInYear($y=null)
-    {
-        return 12;
-    }
-
-    /**
-     * Returns the number of days in a month, given year and month
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     *
-     * @return int days in month
-     * @access protected
-     */
-    function getDaysInMonth($y, $m)
-    {
-        $stamp = Calendar_Engine_UnixTS::dateToStamp($y, $m, 1);
-        $date  = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return $date[6];
-    }
-
-    /**
-     * Returns numeric representation of the day of the week in a month,
-     * given year and month
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     *
-     * @return int from 0 to 6
-     * @access protected
-     */
-    function getFirstDayInMonth($y, $m)
-    {
-        $stamp = Calendar_Engine_UnixTS::dateToStamp($y, $m, 1);
-        $date  = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return $date[8];
-    }
-
-    /**
-     * Returns the number of days in a week
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (7)
-     * @access protected
-     */
-    function getDaysInWeek($y=null, $m=null, $d=null)
-    {
-        return 7;
-    }
-
-    /**
-     * Returns the number of the week in the year (ISO-8601), given a date
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInYear($y, $m, $d)
-    {
-        $stamp = Calendar_Engine_UnixTS::dateToStamp($y, $m, $d);
-        $date  = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return $date[7];
-    }
-
-    /**
-     * Returns the number of the week in the month, given a date
-     *
-     * @param int $y        year (2003)
-     * @param int $m        month (9)
-     * @param int $d        day (4)
-     * @param int $firstDay first day of the week (default: monday)
-     *
-     * @return int week number
-     * @access protected
-     */
-    function getWeekNInMonth($y, $m, $d, $firstDay=1)
-    {
-        $weekEnd = (0 == $firstDay) ? $this->getDaysInWeek()-1 : $firstDay-1;
-        $end_of_week = 1;
-        while (@date('w', @mktime(0, 0, 0, $m, $end_of_week, $y)) != $weekEnd) {
-            ++$end_of_week; //find first weekend of the month
-        }
-        $w = 1;
-        while ($d > $end_of_week) {
-            ++$w;
-            $end_of_week += $this->getDaysInWeek();
-        }
-        return $w;
-    }
-
-    /**
-     * Returns the number of weeks in the month
-     *
-     * @param int $y        year (2003)
-     * @param int $m        month (9)
-     * @param int $firstDay first day of the week (default: monday)
-     *
-     * @return int weeks number
-     * @access protected
-     */
-    function getWeeksInMonth($y, $m, $firstDay = 1)
-    {
-        $FDOM = $this->getFirstDayInMonth($y, $m);
-        if ($FDOM == 0) {
-            $FDOM = $this->getDaysInWeek();
-        }
-        if ($FDOM > $firstDay) {
-            $daysInTheFirstWeek = $this->getDaysInWeek() - $FDOM + $firstDay;
-            $weeks = 1;
-        } else {
-            $daysInTheFirstWeek = $firstDay - $FDOM;
-            $weeks = 0;
-        }
-        $daysInTheFirstWeek %= $this->getDaysInWeek();
-        return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) /
-                           $this->getDaysInWeek()) + $weeks);
-    }
-
-    /**
-     * Returns the number of the day of the week (0=sunday, 1=monday...)
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int weekday number
-     * @access protected
-     */
-    function getDayOfWeek($y, $m, $d)
-    {
-        $stamp = Calendar_Engine_UnixTS::dateToStamp($y, $m, $d);
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return $date[8];
-    }
-
-    /**
-     * Returns a list of integer days of the week beginning 0
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return array (0,1,2,3,4,5,6) 1 = Monday
-     * @access protected
-     */
-    function getWeekDays($y=null, $m=null, $d=null)
-    {
-        return array(0, 1, 2, 3, 4, 5, 6);
-    }
-
-    /**
-     * Returns the default first day of the week
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (default 1 = Monday)
-     * @access protected
-     */
-    function getFirstDayOfWeek($y=null, $m=null, $d=null)
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the number of hours in a day
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     *
-     * @return int (24)
-     * @access protected
-     */
-    function getHoursInDay($y=null, $m=null, $d=null)
-    {
-        return 24;
-    }
-
-    /**
-     * Returns the number of minutes in an hour
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     *
-     * @return int (60)
-     * @access protected
-     */
-    function getMinutesInHour($y=null, $m=null, $d=null, $h=null)
-    {
-        return 60;
-    }
-
-    /**
-     * Returns the number of seconds in a minutes
-     *
-     * @param int $y year (2003)
-     * @param int $m month (9)
-     * @param int $d day (4)
-     * @param int $h hour
-     * @param int $i minute
-     *
-     * @return int (60)
-     * @access protected
-     */
-    function getSecondsInMinute($y=null, $m=null, $d=null, $h=null, $i=null)
-    {
-        return 60;
-    }
-
-    /**
-     * Checks if the given day is the current day
-     *
-     * @param mixed $stamp Any timestamp format recognized by Pear::Date
-     *
-     * @return boolean
-     * @access protected
-     */
-    function isToday($stamp)
-    {
-        static $today = null;
-        if (is_null($today)) {
-            $today_date = @date('Y n j');
-            $today = sscanf($today_date, '%d %d %d');
-        }
-        $date = Calendar_Engine_UnixTS::stampCollection($stamp);
-        return (   $date[2] == $today[2]
-                && $date[1] == $today[1]
-                && $date[0] == $today[0]
-        );
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Factory.php b/airtime_mvc/library/pear/Calendar/Factory.php
deleted file mode 100644
index 39b3b3901..000000000
--- a/airtime_mvc/library/pear/Calendar/Factory.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Factory class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Factory.php 246404 2007-11-18 21:46:43Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Contains a factory method to return a Singleton instance of a class
- * implementing the Calendar_Engine_Interface.<br>
- * For Month objects, to control type of month returned, use CALENDAR_MONTH_STATE
- * constact e.g.;
- * <code>
- * require_once 'Calendar/Factory.php';
- * define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS); // Use Calendar_Month_Weekdays
- * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS); // Use Calendar_Month_Weeks
- * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH); // Use Calendar_Month
- * </code>
- * It defaults to building Calendar_Month objects.<br>
- * Use the constract CALENDAR_FIRST_DAY_OF_WEEK to control the first day of the week
- * for Month or Week objects (e.g. 0 = Sunday, 6 = Saturday)
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access protected
- */
-class Calendar_Factory
-{
-    /**
-     * Creates a calendar object given the type and units
-     *
-     * @param string $type class of calendar object to create
-     * @param int    $y    year
-     * @param int    $m    month
-     * @param int    $d    day
-     * @param int    $h    hour
-     * @param int    $i    minute
-     * @param int    $s    second
-     *
-     * @return object subclass of Calendar
-     * @access public
-     * @static
-     */
-    function create($type, $y = 2000, $m = 1, $d = 1, $h = 0, $i = 0, $s = 0)
-    {
-        $firstDay = defined('CALENDAR_FIRST_DAY_OF_WEEK') ? CALENDAR_FIRST_DAY_OF_WEEK : 1;
-        switch ($type) {
-        case 'Day':
-            include_once CALENDAR_ROOT.'Day.php';
-            return new Calendar_Day($y, $m, $d);
-        case 'Month':
-            // Set default state for which month type to build
-            if (!defined('CALENDAR_MONTH_STATE')) {
-                define('CALENDAR_MONTH_STATE', CALENDAR_USE_MONTH);
-            }
-            switch (CALENDAR_MONTH_STATE) {
-            case CALENDAR_USE_MONTH_WEEKDAYS:
-                include_once CALENDAR_ROOT.'Month/Weekdays.php';
-                $class = 'Calendar_Month_Weekdays';
-                break;
-            case CALENDAR_USE_MONTH_WEEKS:
-                include_once CALENDAR_ROOT.'Month/Weeks.php';
-                $class = 'Calendar_Month_Weeks';
-                break;
-            case CALENDAR_USE_MONTH:
-            default:
-                include_once CALENDAR_ROOT.'Month.php';
-                $class = 'Calendar_Month';
-                break;
-            }
-            return new $class($y, $m, $firstDay);
-        case 'Week':
-            include_once CALENDAR_ROOT.'Week.php';
-            return new Calendar_Week($y, $m, $d, $firstDay);
-        case 'Hour':
-            include_once CALENDAR_ROOT.'Hour.php';
-            return new Calendar_Hour($y, $m, $d, $h);
-        case 'Minute':
-            include_once CALENDAR_ROOT.'Minute.php';
-            return new Calendar_Minute($y, $m, $d, $h, $i);
-        case 'Second':
-            include_once CALENDAR_ROOT.'Second.php';
-            return new Calendar_Second($y, $m, $d, $h, $i, $s);
-        case 'Year':
-            include_once CALENDAR_ROOT.'Year.php';
-            return new Calendar_Year($y);
-        default:
-            include_once 'PEAR.php';
-            PEAR::raiseError('Calendar_Factory::create() unrecognised type: '.$type,
-                null, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Factory::create()');
-            return false;
-        }
-    }
-
-    /**
-     * Creates an instance of a calendar object, given a type and timestamp
-     *
-     * @param string $type  type of object to create
-     * @param mixed  $stamp timestamp (depending on Calendar engine being used)
-     *
-     * @return object subclass of Calendar
-     * @access public
-     * @static
-     */
-    function & createByTimestamp($type, $stamp)
-    {
-        $cE  = & Calendar_Engine_Factory::getEngine();
-        $y   = $cE->stampToYear($stamp);
-        $m   = $cE->stampToMonth($stamp);
-        $d   = $cE->stampToDay($stamp);
-        $h   = $cE->stampToHour($stamp);
-        $i   = $cE->stampToMinute($stamp);
-        $s   = $cE->stampToSecond($stamp);
-        $cal = Calendar_Factory::create($type, $y, $m, $d, $h, $i, $s);
-        return $cal;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Hour.php b/airtime_mvc/library/pear/Calendar/Hour.php
deleted file mode 100644
index fe05024b5..000000000
--- a/airtime_mvc/library/pear/Calendar/Hour.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Hour class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Hour.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents an Hour and builds Minutes
- * <code>
- * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Hour.php';
- * $Hour = new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm
- * $Hour->build(); // Build Calendar_Minute objects
- * while ($Minute = & $Hour->fetch()) {
- *     echo $Minute->thisMinute().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Hour extends Calendar
-{
-    /**
-     * Constructs Calendar_Hour
-     *
-     * @param int $y year e.g. 2003
-     * @param int $m month e.g. 5
-     * @param int $d day e.g. 11
-     * @param int $h hour e.g. 13
-     *
-     * @access public
-     */
-    function Calendar_Hour($y, $m, $d, $h)
-    {
-        parent::Calendar($y, $m, $d, $h);
-    }
-
-    /**
-     * Builds the Minutes in the Hour
-     *
-     * @param array $sDates (optional) Calendar_Minute objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Minute.php';
-        $mIH = $this->cE->getMinutesInHour($this->year, $this->month, $this->day,
-                           $this->hour);
-        for ($i=0; $i < $mIH; $i++) {
-            $this->children[$i] =
-                new Calendar_Minute($this->year, $this->month, $this->day,
-                           $this->hour, $i);
-        }
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates Calendar_Minute objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()
-                && $this->month == $sDate->thisMonth()
-                && $this->day == $sDate->thisDay()
-                && $this->hour == $sDate->thisHour())
-            {
-                $key = (int)$sDate->thisMinute();
-                if (isset($this->children[$key])) {
-                    $sDate->setSelected();
-                    $this->children[$key] = $sDate;
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Minute.php b/airtime_mvc/library/pear/Calendar/Minute.php
deleted file mode 100644
index 7c0b014f2..000000000
--- a/airtime_mvc/library/pear/Calendar/Minute.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Minute class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Minute.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Minute and builds Seconds
- * <code>
- * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Minute.php';
- * $Minute = new Calendar_Minute(2003, 10, 21, 15, 31); // Oct 21st 2003, 3:31pm
- * $Minute->build(); // Build Calendar_Second objects
- * while ($Second = & $Minute->fetch()) {
- *     echo $Second->thisSecond().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Minute extends Calendar
-{
-    /**
-     * Constructs Minute
-     *
-     * @param int $y year e.g. 2003
-     * @param int $m month e.g. 5
-     * @param int $d day e.g. 11
-     * @param int $h hour e.g. 13
-     * @param int $i minute e.g. 31
-     *
-     * @access public
-     */
-    function Calendar_Minute($y, $m, $d, $h, $i)
-    {
-        parent::Calendar($y, $m, $d, $h, $i);
-    }
-
-    /**
-     * Builds the Calendar_Second objects
-     *
-     * @param array $sDates (optional) Calendar_Second objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Second.php';
-        $sIM = $this->cE->getSecondsInMinute($this->year, $this->month,
-                $this->day, $this->hour, $this->minute);
-        for ($i=0; $i < $sIM; $i++) {
-            $this->children[$i] = new Calendar_Second($this->year, $this->month,
-                $this->day, $this->hour, $this->minute, $i);
-        }
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates Calendar_Second objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()
-                && $this->month == $sDate->thisMonth()
-                && $this->day == $sDate->thisDay()
-                && $this->hour == $sDate->thisHour()
-                && $this->minute == $sDate->thisMinute())
-            {
-                $key = (int)$sDate->thisSecond();
-                if (isset($this->children[$key])) {
-                    $sDate->setSelected();
-                    $this->children[$key] = $sDate;
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Month.php b/airtime_mvc/library/pear/Calendar/Month.php
deleted file mode 100644
index afd017277..000000000
--- a/airtime_mvc/library/pear/Calendar/Month.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Month class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Month.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Month and builds Days
- * <code>
- * require_once 'Calendar/Month.php';
- * $Month = new Calendar_Month(2003, 10); // Oct 2003
- * $Month->build(); // Build Calendar_Day objects
- * while ($Day = & $Month->fetch()) {
- *     echo $Day->thisDay().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Month extends Calendar
-{
-    /**
-     * Constructs Calendar_Month
-     *
-     * @param int $y        year e.g. 2003
-     * @param int $m        month e.g. 5
-     * @param int $firstDay first day of the week [optional]
-     *
-     * @access public
-     */
-    function Calendar_Month($y, $m, $firstDay=null)
-    {
-        parent::Calendar($y, $m);
-        $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
-    }
-
-    /**
-     * Builds Day objects for this Month. Creates as many Calendar_Day objects
-     * as there are days in the month
-     *
-     * @param array $sDates (optional) Calendar_Day objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Day.php';
-        $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
-            $this->children[$i] = new Calendar_Day($this->year, $this->month, $i);
-        }
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates Calendar_Day objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()
-                && $this->month == $sDate->thisMonth()
-            ) {
-                $key = $sDate->thisDay();
-                if (isset($this->children[$key])) {
-                    $sDate->setSelected();
-                    $class = strtolower(get_class($sDate));
-                    if ($class == 'calendar_day' || $class == 'calendar_decorator') {
-                        $sDate->setFirst($this->children[$key]->isFirst());
-                        $sDate->setLast($this->children[$key]->isLast());
-                    }
-                    $this->children[$key] = $sDate;
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Month/Weekdays.php b/airtime_mvc/library/pear/Calendar/Month/Weekdays.php
deleted file mode 100644
index a2a4cf19e..000000000
--- a/airtime_mvc/library/pear/Calendar/Month/Weekdays.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Month_Weekdays class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weekdays.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Load base month
- */
-require_once CALENDAR_ROOT.'Month.php';
-
-/**
- * Represents a Month and builds Days in tabular form<br>
- * <code>
- * require_once 'Calendar/Month/Weekdays.php';
- * $Month = new Calendar_Month_Weekdays(2003, 10); // Oct 2003
- * $Month->build(); // Build Calendar_Day objects
- * while ($Day = & $Month->fetch()) {
- *     if ($Day->isFirst()) {
- *         echo '<tr>';
- *     }
- *     if ($Day->isEmpty()) {
- *         echo '<td>&nbsp;</td>';
- *     } else {
- *         echo '<td>'.$Day->thisDay().'</td>';
- *     }
- *     if ($Day->isLast()) {
- *         echo '</tr>';
- *     }
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Month_Weekdays extends Calendar_Month
-{
-    /**
-     * Instance of Calendar_Table_Helper
-     * @var Calendar_Table_Helper
-     * @access private
-     */
-    var $tableHelper;
-
-    /**
-     * First day of the week
-     * @access private
-     * @var string
-     */
-    var $firstDay;
-
-    /**
-     * Constructs Calendar_Month_Weekdays
-     *
-     * @param int $y        year e.g. 2003
-     * @param int $m        month e.g. 5
-     * @param int $firstDay (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.)
-     *
-     * @access public
-     */
-    function Calendar_Month_Weekdays($y, $m, $firstDay=null)
-    {
-        parent::Calendar_Month($y, $m, $firstDay);
-    }
-
-    /**
-     * Builds Day objects in tabular form, to allow display of calendar month
-     * with empty cells if the first day of the week does not fall on the first
-     * day of the month.
-     *
-     * @param array $sDates (optional) Calendar_Day objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     * @see Calendar_Day::isEmpty()
-     * @see Calendar_Day_Base::isFirst()
-     * @see Calendar_Day_Base::isLast()
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Table/Helper.php';
-        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
-        Calendar_Month::build($sDates);
-        $this->buildEmptyDaysBefore();
-        $this->shiftDays();
-        $this->buildEmptyDaysAfter();
-        $this->setWeekMarkers();
-        return true;
-    }
-
-    /**
-     * Prepends empty days before the real days in the month
-     *
-     * @return void
-     * @access private
-     */
-    function buildEmptyDaysBefore()
-    {
-        $eBefore = $this->tableHelper->getEmptyDaysBefore();
-        for ($i=0; $i < $eBefore; $i++) {
-            $stamp = $this->cE->dateToStamp($this->year, $this->month, -$i);
-            $Day = new Calendar_Day(
-                                $this->cE->stampToYear($stamp),
-                                $this->cE->stampToMonth($stamp),
-                                $this->cE->stampToDay($stamp));
-            $Day->setEmpty();
-            $Day->adjust();
-            array_unshift($this->children, $Day);
-        }
-    }
-
-    /**
-     * Shifts the array of children forward, if necessary
-     *
-     * @return void
-     * @access private
-     */
-    function shiftDays()
-    {
-        if (isset($this->children[0])) {
-            array_unshift($this->children, null);
-            unset($this->children[0]);
-        }
-    }
-
-    /**
-     * Appends empty days after the real days in the month
-     *
-     * @return void
-     * @access private
-     */
-    function buildEmptyDaysAfter()
-    {
-        $eAfter = $this->tableHelper->getEmptyDaysAfter();
-        $sDOM   = $this->tableHelper->getNumTableDaysInMonth();
-        for ($i=1; $i <= $sDOM-$eAfter; $i++) {
-            $Day = new Calendar_Day($this->year, $this->month+1, $i);
-            $Day->setEmpty();
-            $Day->adjust();
-            array_push($this->children, $Day);
-        }
-    }
-
-    /**
-     * Sets the "markers" for the beginning and of a of week, in the
-     * built Calendar_Day children
-     *
-     * @return void
-     * @access private
-     */
-    function setWeekMarkers()
-    {
-        $dIW = $this->cE->getDaysInWeek(
-            $this->thisYear(),
-            $this->thisMonth(),
-            $this->thisDay()
-        );
-        $sDOM = $this->tableHelper->getNumTableDaysInMonth();
-        for ($i=1; $i <= $sDOM; $i+= $dIW) {
-            $this->children[$i]->setFirst();
-            $this->children[$i+($dIW-1)]->setLast();
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Month/Weeks.php b/airtime_mvc/library/pear/Calendar/Month/Weeks.php
deleted file mode 100644
index aab651392..000000000
--- a/airtime_mvc/library/pear/Calendar/Month/Weeks.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Month_Weeks class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weeks.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Load base month
- */
-require_once CALENDAR_ROOT.'Month.php';
-
-/**
- * Represents a Month and builds Weeks
- * <code>
- * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Month'.DIRECTORY_SEPARATOR.'Weeks.php';
- * $Month = new Calendar_Month_Weeks(2003, 10); // Oct 2003
- * $Month->build(); // Build Calendar_Day objects
- * while ($Week = & $Month->fetch()) {
- *     echo $Week->thisWeek().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Month_Weeks extends Calendar_Month
-{
-    /**
-     * Instance of Calendar_Table_Helper
-     * @var Calendar_Table_Helper
-     * @access private
-     */
-    var $tableHelper;
-
-    /**
-     * First day of the week
-     * @access private
-     * @var string
-     */
-    var $firstDay;
-
-    /**
-     * Constructs Calendar_Month_Weeks
-     *
-     * @param int $y        year e.g. 2003
-     * @param int $m        month e.g. 5
-     * @param int $firstDay (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.)
-     *
-     * @access public
-     */
-    function Calendar_Month_Weeks($y, $m, $firstDay=null)
-    {
-        parent::Calendar_Month($y, $m, $firstDay);
-    }
-
-    /**
-     * Builds Calendar_Week objects for the Month. Note that Calendar_Week
-     * builds Calendar_Day object in tabular form (with Calendar_Day->empty)
-     *
-     * @param array $sDates (optional) Calendar_Week objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Table/Helper.php';
-        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
-        include_once CALENDAR_ROOT.'Week.php';
-        $numWeeks = $this->tableHelper->getNumWeeks();
-        for ($i=1, $d=1; $i<=$numWeeks; $i++,
-            $d+=$this->cE->getDaysInWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            )
-        ) {
-            $this->children[$i] = new Calendar_Week(
-                $this->year, $this->month, $d, $this->tableHelper->getFirstDay());
-        }
-        //used to set empty days
-        $this->children[1]->setFirst(true);
-        $this->children[$numWeeks]->setLast(true);
-
-        // Handle selected weeks here
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates Calendar_Week objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()
-                && $this->month == $sDate->thisMonth())
-            {
-                $key = $sDate->thisWeek('n_in_month');
-                if (isset($this->children[$key])) {
-                    $this->children[$key]->setSelected();
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Second.php b/airtime_mvc/library/pear/Calendar/Second.php
deleted file mode 100644
index b1b962b8b..000000000
--- a/airtime_mvc/library/pear/Calendar/Second.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Second class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Second.php 300728 2010-06-24 11:43:56Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Second<br />
- * <b>Note:</b> Seconds do not build other objects
- * so related methods are overridden to return NULL
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Second extends Calendar
-{
-    /**
-     * Constructs Second
-     *
-     * @param int $y year e.g. 2003
-     * @param int $m month e.g. 5
-     * @param int $d day e.g. 11
-     * @param int $h hour e.g. 13
-     * @param int $i minute e.g. 31
-     * @param int $s second e.g. 45
-     */
-    function Calendar_Second($y, $m, $d, $h, $i, $s)
-    {
-        parent::Calendar($y, $m, $d, $h, $i, $s);
-    }
-
-    /**
-     * Overwrite build
-     *
-     * @return NULL
-     */
-    function build()
-    {
-        return null;
-    }
-
-    /**
-     * Overwrite fetch
-     *
-     * @return NULL
-     */
-    function fetch()
-    {
-        return null;
-    }
-
-    /**
-     * Overwrite fetchAll
-     *
-     * @return NULL
-     */
-    function fetchAll()
-    {
-        return null;
-    }
-
-    /**
-     * Overwrite size
-     *
-     * @return NULL
-     */
-    function size()
-    {
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Table/Helper.php b/airtime_mvc/library/pear/Calendar/Table/Helper.php
deleted file mode 100644
index c852dc083..000000000
--- a/airtime_mvc/library/pear/Calendar/Table/Helper.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Decorator_Wrapper class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Helper.php 246317 2007-11-16 20:05:32Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Used by Calendar_Month_Weekdays, Calendar_Month_Weeks and Calendar_Week to
- * help with building the calendar in tabular form
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access public
- */
-class Calendar_Table_Helper
-{
-    /**
-     * Instance of the Calendar object being helped.
-     * @var object
-     * @access private
-     */
-    var $calendar;
-
-    /**
-     * Instance of the Calendar_Engine
-     * @var object
-     * @access private
-     */
-    var $cE;
-
-    /**
-     * First day of the week
-     * @access private
-     * @var string
-     */
-    var $firstDay;
-
-    /**
-     * The seven days of the week named
-     * @access private
-     * @var array
-     */
-    var $weekDays;
-
-    /**
-     * Days of the week ordered with $firstDay at the beginning
-     * @access private
-     * @var array
-     */
-    var $daysOfWeek = array();
-
-    /**
-     * Days of the month built from days of the week
-     * @access private
-     * @var array
-     */
-    var $daysOfMonth = array();
-
-    /**
-     * Number of weeks in month
-     * @var int
-     * @access private
-     */
-    var $numWeeks = null;
-
-    /**
-     * Number of emtpy days before real days begin in month
-     * @var int
-     * @access private
-     */
-    var $emptyBefore = 0;
-
-    /**
-     * Constructs Calendar_Table_Helper
-     *
-     * @param object &$calendar Calendar_Month_Weekdays, Calendar_Month_Weeks, Calendar_Week
-     * @param int    $firstDay  (optional) first day of the week e.g. 1 for Monday
-     *
-     * @access protected
-     */
-    function Calendar_Table_Helper(& $calendar, $firstDay=null)
-    {
-        $this->calendar = & $calendar;
-        $this->cE = & $calendar->getEngine();
-        if (is_null($firstDay)) {
-            $firstDay = $this->cE->getFirstDayOfWeek(
-                $this->calendar->thisYear(),
-                $this->calendar->thisMonth(),
-                $this->calendar->thisDay()
-            );
-        }
-        $this->firstDay = $firstDay;
-        $this->setFirstDay();
-        $this->setDaysOfMonth();
-    }
-
-    /**
-     * Constructs $this->daysOfWeek based on $this->firstDay
-     *
-     * @return void
-     * @access private
-     */
-    function setFirstDay()
-    {
-        $weekDays = $this->cE->getWeekDays(
-            $this->calendar->thisYear(),
-            $this->calendar->thisMonth(),
-            $this->calendar->thisDay()
-        );
-        $endDays  = array();
-        $tmpDays  = array();
-        $begin = false;
-        foreach ($weekDays as $day) {
-            if ($begin) {
-                $endDays[] = $day;
-            } else if ($day === $this->firstDay) {
-                $begin = true;
-                $endDays[] = $day;
-            } else {
-                $tmpDays[] = $day;
-            }
-        }
-        $this->daysOfWeek = array_merge($endDays, $tmpDays);
-    }
-
-    /**
-     * Constructs $this->daysOfMonth
-     *
-     * @return void
-     * @access private
-     */
-    function setDaysOfMonth()
-    {
-        $this->daysOfMonth = $this->daysOfWeek;
-        $daysInMonth = $this->cE->getDaysInMonth(
-            $this->calendar->thisYear(), $this->calendar->thisMonth());
-        $firstDayInMonth = $this->cE->getFirstDayInMonth(
-            $this->calendar->thisYear(), $this->calendar->thisMonth());
-        $this->emptyBefore=0;
-        foreach ($this->daysOfMonth as $dayOfWeek) {
-            if ($firstDayInMonth == $dayOfWeek) {
-                break;
-            }
-            $this->emptyBefore++;
-        }
-        $this->numWeeks = ceil(
-            ($daysInMonth + $this->emptyBefore)
-                /
-            $this->cE->getDaysInWeek(
-                $this->calendar->thisYear(),
-                $this->calendar->thisMonth(),
-                $this->calendar->thisDay()
-            )
-        );
-        for ($i=1; $i < $this->numWeeks; $i++) {
-            $this->daysOfMonth =
-                array_merge($this->daysOfMonth, $this->daysOfWeek);
-        }
-    }
-
-    /**
-     * Returns the first day of the month
-     *
-     * @return int
-     * @access protected
-     * @see Calendar_Engine_Interface::getFirstDayOfWeek()
-     */
-    function getFirstDay()
-    {
-        return $this->firstDay;
-    }
-
-    /**
-     * Returns the order array of days in a week
-     *
-     * @return int
-     * @access protected
-     */
-    function getDaysOfWeek()
-    {
-        return $this->daysOfWeek;
-    }
-
-    /**
-     * Returns the number of tabular weeks in a month
-     *
-     * @return int
-     * @access protected
-     */
-    function getNumWeeks()
-    {
-        return $this->numWeeks;
-    }
-
-    /**
-     * Returns the number of real days + empty days
-     *
-     * @return int
-     * @access protected
-     */
-    function getNumTableDaysInMonth()
-    {
-        return count($this->daysOfMonth);
-    }
-
-    /**
-     * Returns the number of empty days before the real days begin
-     *
-     * @return int
-     * @access protected
-     */
-    function getEmptyDaysBefore()
-    {
-        return $this->emptyBefore;
-    }
-
-    /**
-     * Returns the index of the last real day in the month
-     *
-     * @todo Potential performance optimization with static
-     * @return int
-     * @access protected
-     */
-    function getEmptyDaysAfter()
-    {
-        // Causes bug when displaying more than one month
-        //static $index;
-        //if (!isset($index)) {
-            $index = $this->getEmptyDaysBefore() + $this->cE->getDaysInMonth(
-                $this->calendar->thisYear(), $this->calendar->thisMonth());
-        //}
-        return $index;
-    }
-
-    /**
-     * Returns the index of the last real day in the month, relative to the
-     * beginning of the tabular week it is part of
-     *
-     * @return int
-     * @access protected
-     */
-    function getEmptyDaysAfterOffset()
-    {
-        $eAfter = $this->getEmptyDaysAfter();
-        return $eAfter - (
-            $this->cE->getDaysInWeek(
-                $this->calendar->thisYear(),
-                $this->calendar->thisMonth(),
-                $this->calendar->thisDay()
-            ) * ($this->numWeeks-1));
-    }
-
-    /**
-     * Returns the timestamp of the first day of the current week
-     *
-     * @param int $y        year
-     * @param int $m        month
-     * @param int $d        day
-     * @param int $firstDay first day of the week (default 1 = Monday)
-     *
-     * @return int timestamp
-     */
-    function getWeekStart($y, $m, $d, $firstDay=1)
-    {
-        $dow = $this->cE->getDayOfWeek($y, $m, $d);
-        if ($dow > $firstDay) {
-            $d -= ($dow - $firstDay);
-        }
-        if ($dow < $firstDay) {
-            $d -= (
-                $this->cE->getDaysInWeek(
-                    $this->calendar->thisYear(),
-                    $this->calendar->thisMonth(),
-                    $this->calendar->thisDay()
-                ) - $firstDay + $dow);
-        }
-        return $this->cE->dateToStamp($y, $m, $d);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Util/Textual.php b/airtime_mvc/library/pear/Calendar/Util/Textual.php
deleted file mode 100644
index 109a00ba0..000000000
--- a/airtime_mvc/library/pear/Calendar/Util/Textual.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Util_Textual class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Textual.php 247250 2007-11-28 19:42:01Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * @package Calendar
- * @version $Id: Textual.php 247250 2007-11-28 19:42:01Z quipo $
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar decorator base class
- */
-require_once CALENDAR_ROOT.'Decorator.php';
-
-/**
- * Static utlities to help with fetching textual representations of months and
- * days of the week.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Util_Textual
-{
-
-    /**
-     * Returns an array of 12 month names (first index = 1)
-     *
-     * @param string $format (optional) format of returned months (one|two|short|long)
-     *
-     * @return array
-     * @access public
-     * @static
-     */
-    function monthNames($format = 'long')
-    {
-        $formats = array(
-            'one'   => '%b', 
-            'two'   => '%b', 
-            'short' => '%b', 
-            'long'  => '%B',
-        );
-        if (!array_key_exists($format, $formats)) {
-            $format = 'long';
-        }
-        $months = array();
-        for ($i=1; $i<=12; $i++) {
-            $stamp = mktime(0, 0, 0, $i, 1, 2003);
-            $month = strftime($formats[$format], $stamp);
-            switch($format) {
-            case 'one':
-                $month = substr($month, 0, 1);
-                break;
-            case 'two':
-                $month = substr($month, 0, 2);
-                break;
-            }
-            $months[$i] = $month;
-        }
-        return $months;
-    }
-
-    /**
-     * Returns an array of 7 week day names (first index = 0)
-     *
-     * @param string $format (optional) format of returned days (one,two,short or long)
-     *
-     * @return array
-     * @access public
-     * @static
-     */
-    function weekdayNames($format = 'long')
-    {
-        $formats = array(
-            'one'   => '%a', 
-            'two'   => '%a', 
-            'short' => '%a', 
-            'long'  => '%A',
-        );
-        if (!array_key_exists($format, $formats)) {
-            $format = 'long';
-        }
-        $days = array();
-        for ($i=0; $i<=6; $i++) {
-            $stamp = mktime(0, 0, 0, 11, $i+2, 2003);
-            $day = strftime($formats[$format], $stamp);
-            switch($format) {
-            case 'one':
-                $day = substr($day, 0, 1);
-                break;
-            case 'two':
-                $day = substr($day, 0, 2);
-                break;
-            }
-            $days[$i] = $day;
-        }
-        return $days;
-    }
-
-    /**
-     * Returns textual representation of the previous month of the decorated calendar object
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function prevMonthName($Calendar, $format = 'long')
-    {
-        $months = Calendar_Util_Textual::monthNames($format);
-        return $months[$Calendar->prevMonth()];
-    }
-
-    /**
-     * Returns textual representation of the month of the decorated calendar object
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function thisMonthName($Calendar, $format = 'long')
-    {
-        $months = Calendar_Util_Textual::monthNames($format);
-        return $months[$Calendar->thisMonth()];
-    }
-
-    /**
-     * Returns textual representation of the next month of the decorated calendar object
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function nextMonthName($Calendar, $format = 'long')
-    {
-        $months = Calendar_Util_Textual::monthNames($format);
-        return $months[$Calendar->nextMonth()];
-    }
-
-    /**
-     * Returns textual representation of the previous day of week of the decorated calendar object
-     * <b>Note:</b> Requires PEAR::Date
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function prevDayName($Calendar, $format = 'long')
-    {
-        $days = Calendar_Util_Textual::weekdayNames($format);
-        $stamp = $Calendar->prevDay('timestamp');
-        $cE = $Calendar->getEngine();
-        include_once 'Date/Calc.php';
-        $day = Date_Calc::dayOfWeek($cE->stampToDay($stamp),
-            $cE->stampToMonth($stamp), $cE->stampToYear($stamp));
-        return $days[$day];
-    }
-
-    /**
-     * Returns textual representation of the day of week of the decorated calendar object
-     * <b>Note:</b> Requires PEAR::Date
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function thisDayName($Calendar, $format='long')
-    {
-        $days = Calendar_Util_Textual::weekdayNames($format);
-        include_once 'Date/Calc.php';
-        $day = Date_Calc::dayOfWeek($Calendar->thisDay(), $Calendar->thisMonth(), $Calendar->thisYear());
-        return $days[$day];
-    }
-
-    /**
-     * Returns textual representation of the next day of week of the decorated calendar object
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return string
-     * @access public
-     * @static
-     */
-    function nextDayName($Calendar, $format='long')
-    {
-        $days = Calendar_Util_Textual::weekdayNames($format);
-        $stamp = $Calendar->nextDay('timestamp');
-        $cE = $Calendar->getEngine();
-        include_once 'Date/Calc.php';
-        $day = Date_Calc::dayOfWeek($cE->stampToDay($stamp),
-            $cE->stampToMonth($stamp), $cE->stampToYear($stamp));
-        return $days[$day];
-    }
-
-    /**
-     * Returns the days of the week using the order defined in the decorated
-     * calendar object. Only useful for Calendar_Month_Weekdays, Calendar_Month_Weeks
-     * and Calendar_Week. Otherwise the returned array will begin on Sunday
-     *
-     * @param object $Calendar subclass of Calendar e.g. Calendar_Month
-     * @param string $format   (optional) format of returned months (one,two,short or long)
-     *
-     * @return array ordered array of week day names
-     * @access public
-     * @static
-     */
-    function orderedWeekdays($Calendar, $format = 'long')
-    {
-        $days = Calendar_Util_Textual::weekdayNames($format);
-        
-        if (isset($Calendar->tableHelper)) {
-            $ordereddays = $Calendar->tableHelper->getDaysOfWeek();
-        } else {
-            //default: start from Sunday
-            $firstDay = 0;
-            //check if defined / set
-            if (defined('CALENDAR_FIRST_DAY_OF_WEEK')) {
-                $firstDay = CALENDAR_FIRST_DAY_OF_WEEK;
-            } elseif(isset($Calendar->firstDay)) {
-                $firstDay = $Calendar->firstDay;
-            }
-            $ordereddays = array();
-            for ($i = $firstDay; $i < 7; $i++) {
-                $ordereddays[] = $i;
-            }
-            for ($i = 0; $i < $firstDay; $i++) {
-                $ordereddays[] = $i;
-            }
-        }
-        
-        $ordereddays = array_flip($ordereddays);
-        $i = 0;
-        $returndays = array();
-        foreach ($ordereddays as $key => $value) {
-            $returndays[$i] = $days[$key];
-            $i++;
-        }
-        return $returndays;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Util/Uri.php b/airtime_mvc/library/pear/Calendar/Util/Uri.php
deleted file mode 100644
index 1490501f7..000000000
--- a/airtime_mvc/library/pear/Calendar/Util/Uri.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Util_Uri class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Uri.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Utility to help building HTML links for navigating the calendar<br />
- * <code>
- * $Day = new Calendar_Day(2003, 10, 23);
- * $Uri = new Calendar_Util_Uri('year', 'month', 'day');
- * echo $Uri->prev($Day,'month'); // Displays year=2003&amp;month=10
- * echo $Uri->prev($Day,'day'); // Displays year=2003&amp;month=10&amp;day=22
- * $Uri->seperator = '/';
- * $Uri->scalar = true;
- * echo $Uri->prev($Day,'month'); // Displays 2003/10
- * echo $Uri->prev($Day,'day'); // Displays 2003/10/22
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Util_Uri
-{
-    /**
-     * Uri fragments for year, month, day etc.
-     * @var array
-     * @access private
-     */
-    var $uris = array();
-
-    /**
-     * String to separate fragments with.
-     * Set to just & for HTML.
-     * For a scalar URL you might use / as the seperator
-     * @var string (default XHTML &amp;)
-     * @access public
-     */
-    var $separator = '&amp;';
-
-    /**
-     * To output a "scalar" string - variable names omitted.
-     * Used for urls like index.php/2004/8/12
-     * @var boolean (default false)
-     * @access public
-     */
-    var $scalar = false;
-
-    /**
-     * Constructs Calendar_Decorator_Uri
-     * The term "fragment" means <i>name</i> of a calendar GET variables in the URL
-     *
-     * @param string $y URI fragment for year
-     * @param string $m (optional) URI fragment for month
-     * @param string $d (optional) URI fragment for day
-     * @param string $h (optional) URI fragment for hour
-     * @param string $i (optional) URI fragment for minute
-     * @param string $s (optional) URI fragment for second
-     *
-     * @access public
-     */
-    function Calendar_Util_Uri($y, $m=null, $d=null, $h=null, $i=null, $s=null)
-    {
-        $this->setFragments($y, $m, $d, $h, $i, $s);
-    }
-
-    /**
-     * Sets the URI fragment names
-     *
-     * @param string $y URI fragment for year
-     * @param string $m (optional) URI fragment for month
-     * @param string $d (optional) URI fragment for day
-     * @param string $h (optional) URI fragment for hour
-     * @param string $i (optional) URI fragment for minute
-     * @param string $s (optional) URI fragment for second
-     *
-     * @return void
-     * @access public
-     */
-    function setFragments($y, $m=null, $d=null, $h=null, $i=null, $s=null) 
-    {
-        if (!is_null($y)) $this->uris['Year']   = $y;
-        if (!is_null($m)) $this->uris['Month']  = $m;
-        if (!is_null($d)) $this->uris['Day']    = $d;
-        if (!is_null($h)) $this->uris['Hour']   = $h;
-        if (!is_null($i)) $this->uris['Minute'] = $i;
-        if (!is_null($s)) $this->uris['Second'] = $s;
-    }
-
-    /**
-     * Gets the URI string for the previous calendar unit
-     *
-     * @param object $Calendar subclassed from Calendar e.g. Calendar_Month
-     * @param string $unit     calendar  unit (year|month|week|day|hour|minute|second)
-     *
-     * @return string
-     * @access public
-     */
-    function prev($Calendar, $unit)
-    {
-        $method = 'prev'.$unit;
-        $stamp  = $Calendar->{$method}('timestamp');
-        return $this->buildUriString($Calendar, $method, $stamp);
-    }
-
-    /**
-     * Gets the URI string for the current calendar unit
-     *
-     * @param object $Calendar subclassed from Calendar e.g. Calendar_Month
-     * @param string $unit     calendar  unit (year|month|week|day|hour|minute|second)
-     *
-     * @return string
-     * @access public
-     */
-    function this($Calendar, $unit)
-    {
-        $method = 'this'.$unit;
-        $stamp  = $Calendar->{$method}('timestamp');
-        return $this->buildUriString($Calendar, $method, $stamp);
-    }
-
-    /**
-     * Gets the URI string for the next calendar unit
-     *
-     * @param object $Calendar subclassed from Calendar e.g. Calendar_Month
-     * @param string $unit     calendar unit (year|month|week|day|hour|minute|second)
-     *
-     * @return string
-     * @access public
-     */
-    function next($Calendar, $unit)
-    {
-        $method = 'next'.$unit;
-        $stamp  = $Calendar->{$method}('timestamp');
-        return $this->buildUriString($Calendar, $method, $stamp);
-    }
-
-    /**
-     * Build the URI string
-     *
-     * @param object $Calendar subclassed from Calendar e.g. Calendar_Month
-     * @param string $method   method substring
-     * @param int    $stamp    timestamp
-     *
-     * @return string build uri string
-     * @access private
-     */
-    function buildUriString($Calendar, $method, $stamp)
-    {
-        $uriString = '';
-        $cE = & $Calendar->getEngine();
-        $separator = '';
-        foreach ($this->uris as $unit => $uri) {
-            $call = 'stampTo'.$unit;
-            $uriString .= $separator;
-            if (!$this->scalar) {
-                $uriString .= $uri.'=';
-            }
-            $uriString .= $cE->{$call}($stamp);
-            $separator = $this->separator;
-        }
-        return $uriString;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Validator.php b/airtime_mvc/library/pear/Calendar/Validator.php
deleted file mode 100644
index a96c8e223..000000000
--- a/airtime_mvc/library/pear/Calendar/Validator.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Validator class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Validator.php 247251 2007-11-28 19:42:33Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Validation Error Messages
- */
-if (!defined('CALENDAR_VALUE_TOOSMALL')) {
-    define('CALENDAR_VALUE_TOOSMALL', 'Too small: min = ');
-}
-if (!defined('CALENDAR_VALUE_TOOLARGE')) {
-    define('CALENDAR_VALUE_TOOLARGE', 'Too large: max = ');
-}
-
-/**
- * Used to validate any given Calendar date object. Instances of this class
- * can be obtained from any data object using the getValidator method
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @see       Calendar::getValidator()
- * @access    public
- */
-class Calendar_Validator
-{
-    /**
-     * Instance of the Calendar date object to validate
-     * @var object
-     * @access private
-     */
-    var $calendar;
-
-    /**
-     * Instance of the Calendar_Engine
-     * @var object
-     * @access private
-     */
-    var $cE;
-
-    /**
-     * Array of errors for validation failures
-     * @var array
-     * @access private
-     */
-    var $errors = array();
-
-    /**
-     * Constructs Calendar_Validator
-     *
-     * @param object &$calendar subclass of Calendar
-     *
-     * @access public
-     */
-    function Calendar_Validator(&$calendar)
-    {
-        $this->calendar = & $calendar;
-        $this->cE       = & $calendar->getEngine();
-    }
-
-    /**
-     * Calls all the other isValidXXX() methods in the validator
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValid()
-    {
-        $checks = array('isValidYear', 'isValidMonth', 'isValidDay',
-            'isValidHour', 'isValidMinute', 'isValidSecond');
-        $valid  = true;
-        foreach ($checks as $check) {
-            if (!$this->{$check}()) {
-                $valid = false;
-            }
-        }
-        return $valid;
-    }
-
-    /**
-     * Check whether this is a valid year
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidYear()
-    {
-        $y   = $this->calendar->thisYear();
-        $min = $this->cE->getMinYears();
-        if ($min > $y) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Year', $y, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = $this->cE->getMaxYears();
-        if ($y > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Year', $y, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check whether this is a valid month
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidMonth()
-    {
-        $m   = $this->calendar->thisMonth();
-        $min = 1;
-        if ($min > $m) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Month', $m, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = $this->cE->getMonthsInYear($this->calendar->thisYear());
-        if ($m > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Month', $m, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check whether this is a valid day
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidDay()
-    {
-        $d   = $this->calendar->thisDay();
-        $min = 1;
-        if ($min > $d) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Day', $d, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = $this->cE->getDaysInMonth(
-            $this->calendar->thisYear(), 
-            $this->calendar->thisMonth()
-        );
-        if ($d > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Day', $d, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check whether this is a valid hour
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidHour()
-    {
-        $h   = $this->calendar->thisHour();
-        $min = 0;
-        if ($min > $h) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Hour', $h, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = ($this->cE->getHoursInDay($this->calendar->thisDay())-1);
-        if ($h > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Hour', $h, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check whether this is a valid minute
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidMinute()
-    {
-        $i   = $this->calendar->thisMinute();
-        $min = 0;
-        if ($min > $i) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Minute', $i, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = ($this->cE->getMinutesInHour($this->calendar->thisHour())-1);
-        if ($i > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Minute', $i, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check whether this is a valid second
-     *
-     * @return boolean
-     * @access public
-     */
-    function isValidSecond()
-    {
-        $s   = $this->calendar->thisSecond();
-        $min = 0;
-        if ($min > $s) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Second', $s, CALENDAR_VALUE_TOOSMALL.$min);
-            return false;
-        }
-        $max = ($this->cE->getSecondsInMinute($this->calendar->thisMinute())-1);
-        if ($s > $max) {
-            $this->errors[] = new Calendar_Validation_Error(
-                'Second', $s, CALENDAR_VALUE_TOOLARGE.$max);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Iterates over any validation errors
-     *
-     * @return mixed either Calendar_Validation_Error or false
-     * @access public
-     */
-    function fetch()
-    {
-        $error = each($this->errors);
-        if ($error) {
-            return $error['value'];
-        } else {
-            reset($this->errors);
-            return false;
-        }
-    }
-}
-
-/**
- * For Validation Error messages
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @see       Calendar::fetch()
- * @access    public
- */
-class Calendar_Validation_Error
-{
-    /**
-     * Date unit (e.g. month,hour,second) which failed test
-     * @var string
-     * @access private
-     */
-    var $unit;
-
-    /**
-     * Value of unit which failed test
-     * @var int
-     * @access private
-     */
-    var $value;
-
-    /**
-     * Validation error message
-     * @var string
-     * @access private
-     */
-    var $message;
-
-    /**
-     * Constructs Calendar_Validation_Error
-     *
-     * @param string $unit    Date unit (e.g. month,hour,second)
-     * @param int    $value   Value of unit which failed test
-     * @param string $message Validation error message
-     *
-     * @access protected
-     */
-    function Calendar_Validation_Error($unit, $value, $message)
-    {
-        $this->unit    = $unit;
-        $this->value   = $value;
-        $this->message = $message;
-    }
-
-    /**
-     * Returns the Date unit
-     *
-     * @return string
-     * @access public
-     */
-    function getUnit()
-    {
-        return $this->unit;
-    }
-
-    /**
-     * Returns the value of the unit
-     *
-     * @return int
-     * @access public
-     */
-    function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the validation error message
-     *
-     * @return string
-     * @access public
-     */
-    function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Returns a string containing the unit, value and error message
-     *
-     * @return string
-     * @access public
-     */
-    function toString ()
-    {
-        return $this->unit.' = '.$this->value.' ['.$this->message.']';
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Week.php b/airtime_mvc/library/pear/Calendar/Week.php
deleted file mode 100644
index 966128f2c..000000000
--- a/airtime_mvc/library/pear/Calendar/Week.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Contains the Calendar_Week class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Week.php 300729 2010-06-24 12:05:53Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Week and builds Days in tabular format<br>
- * <code>
- * require_once 'Calendar/Week.php';
- * $Week = new Calendar_Week(2003, 10, 1); Oct 2003, 1st tabular week
- * echo '<tr>';
- * while ($Day = & $Week->fetch()) {
- *     if ($Day->isEmpty()) {
- *         echo '<td>&nbsp;</td>';
- *     } else {
- *         echo '<td>'.$Day->thisDay().'</td>';
- *      }
- * }
- * echo '</tr>';
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @author    Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- */
-class Calendar_Week extends Calendar
-{
-    /**
-     * Instance of Calendar_Table_Helper
-     * @var Calendar_Table_Helper
-     * @access private
-     */
-    var $tableHelper;
-
-    /**
-     * Stores the timestamp of the first day of this week
-     * @access private
-     * @var object
-     */
-    var $thisWeek;
-
-    /**
-     * Stores the timestamp of first day of previous week
-     * @access private
-     * @var object
-     */
-    var $prevWeek;
-
-    /**
-     * Stores the timestamp of first day of next week
-     * @access private
-     * @var object
-     */
-    var $nextWeek;
-
-    /**
-     * Used by build() to set empty days
-     * @access private
-     * @var boolean
-     */
-    var $firstWeek = false;
-
-    /**
-     * Used by build() to set empty days
-     * @access private
-     * @var boolean
-     */
-    var $lastWeek = false;
-
-    /**
-     * First day of the week (0=sunday, 1=monday...)
-     * @access private
-     * @var boolean
-     */
-    var $firstDay = 1;
-
-    /**
-     * Constructs Week
-     *
-     * @param int $y        year e.g. 2003
-     * @param int $m        month e.g. 5
-     * @param int $d        a day of the desired week
-     * @param int $firstDay (optional) first day of week (e.g. 0 for Sunday, 2 for Tuesday etc.)
-     *
-     * @access public
-     */
-    function Calendar_Week($y, $m, $d, $firstDay = null)
-    {
-        include_once CALENDAR_ROOT.'Table/Helper.php';
-        parent::Calendar($y, $m, $d);
-        $this->firstDay    = $this->defineFirstDayOfWeek($firstDay);
-        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
-        $this->thisWeek    = $this->tableHelper->getWeekStart($y, $m, $d, $this->firstDay);
-        $this->prevWeek    = $this->tableHelper->getWeekStart(
-            $y, 
-            $m, 
-            $d - $this->cE->getDaysInWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            ), 
-            $this->firstDay
-        );
-        $this->nextWeek = $this->tableHelper->getWeekStart(
-            $y, 
-            $m, 
-            $d + $this->cE->getDaysInWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            ), 
-            $this->firstDay
-        );
-    }
-
-    /**
-     * Defines the calendar by a timestamp (Unix or ISO-8601), replacing values
-     * passed to the constructor
-     *
-     * @param int|string $ts Unix or ISO-8601 timestamp
-     *
-     * @return void
-     * @access public
-     */
-    function setTimestamp($ts)
-    {
-        parent::setTimestamp($ts);
-        $this->thisWeek = $this->tableHelper->getWeekStart(
-            $this->year, $this->month, $this->day, $this->firstDay
-        );
-        $this->prevWeek = $this->tableHelper->getWeekStart(
-            $this->year, 
-            $this->month, 
-            $this->day - $this->cE->getDaysInWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            ), 
-            $this->firstDay
-        );
-        $this->nextWeek = $this->tableHelper->getWeekStart(
-            $this->year, 
-            $this->month, 
-            $this->day + $this->cE->getDaysInWeek(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay()
-            ), 
-            $this->firstDay
-        );
-    }
-
-    /**
-     * Builds Calendar_Day objects for this Week
-     *
-     * @param array $sDates (optional) Calendar_Day objects representing selected dates
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array())
-    {
-        include_once CALENDAR_ROOT.'Day.php';
-        $year  = $this->cE->stampToYear($this->thisWeek);
-        $month = $this->cE->stampToMonth($this->thisWeek);
-        $day   = $this->cE->stampToDay($this->thisWeek);
-        $end   = $this->cE->getDaysInWeek(
-            $this->thisYear(),
-            $this->thisMonth(),
-            $this->thisDay()
-        );
-
-        for ($i=1; $i <= $end; $i++) {
-            $stamp = $this->cE->dateToStamp($year, $month, $day++);
-            $this->children[$i] = new Calendar_Day(
-                $this->cE->stampToYear($stamp),
-                $this->cE->stampToMonth($stamp),
-                $this->cE->stampToDay($stamp)
-            );
-        }
-
-        //set empty days (@see Calendar_Month_Weeks::build())
-        if ($this->firstWeek) {
-            $eBefore = $this->tableHelper->getEmptyDaysBefore();
-            for ($i=1; $i <= $eBefore; $i++) {
-                $this->children[$i]->setEmpty();
-            }
-        }
-        if ($this->lastWeek) {
-            $eAfter = $this->tableHelper->getEmptyDaysAfterOffset();
-            for ($i = $eAfter+1; $i <= $end; $i++) {
-                $this->children[$i]->setEmpty();
-            }
-        }
-
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Set as first week of the month
-     *
-     * @param boolean $state whether it's first or not
-     *
-     * @return void
-     * @access private
-     */
-    function setFirst($state = true)
-    {
-        $this->firstWeek = $state;
-    }
-
-    /**
-     * Set as last week of the month
-     *
-     * @param boolean $state whether it's lasst or not
-     *
-     * @return void
-     * @access private
-     */
-    function setLast($state = true)
-    {
-        $this->lastWeek = $state;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates Calendar_Day objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates)
-    {
-        foreach ($sDates as $sDate) {
-            foreach ($this->children as $key => $child) {
-                if ($child->thisDay() == $sDate->thisDay() &&
-                    $child->thisMonth() == $sDate->thisMonth() &&
-                    $child->thisYear() == $sDate->thisYear()
-                ) {
-                    $this->children[$key] = $sDate;
-                    $this->children[$key]->setSelected();
-                }
-            }
-        }
-        reset($this->children);
-    }
-
-    /**
-     * Returns the value for this year
-     *
-     * When a on the first/last week of the year, the year of the week is
-     * calculated according to ISO-8601
-     *
-     * @param string $format return value format ['int' | 'timestamp' | 'object' | 'array']
-     *
-     * @return int e.g. 2003 or timestamp
-     * @access public
-     */
-    function thisYear($format = 'int')
-    {
-        if (null !== $this->thisWeek) {
-            $tmp_cal = new Calendar();
-            $tmp_cal->setTimestamp($this->thisWeek);
-            $first_dow = $tmp_cal->thisDay('array');
-            $days_in_week = $tmp_cal->cE->getDaysInWeek($tmp_cal->year, $tmp_cal->month, $tmp_cal->day);
-            $tmp_cal->day += $days_in_week;
-            $last_dow  = $tmp_cal->thisDay('array');
-
-            if ($first_dow['year'] == $last_dow['year']) {
-                return $first_dow['year'];
-            }
-
-            if ($last_dow['day'] > floor($days_in_week / 2)) {
-                return $last_dow['year'];
-            }
-            return $first_dow['year'];
-        }
-        return parent::thisYear();
-    }
-
-    /**
-     * Gets the value of the previous week, according to the requested format
-     *
-     * @param string $format ['timestamp' | 'n_in_month' | 'n_in_year' | 'array']
-     *
-     * @return mixed
-     * @access public
-     */
-    function prevWeek($format = 'n_in_month')
-    {
-        switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->firstWeek) ? null : $this->thisWeek('n_in_month') -1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->prevWeek),
-                $this->cE->stampToMonth($this->prevWeek),
-                $this->cE->stampToDay($this->prevWeek));
-        case 'array':
-            return $this->toArray($this->prevWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Calendar_Factory::createByTimestamp('Week', $this->prevWeek);
-        case 'timestamp':
-        default:
-            return $this->prevWeek;
-        }
-    }
-
-    /**
-     * Gets the value of the current week, according to the requested format
-     *
-     * @param string $format ['timestamp' | 'n_in_month' | 'n_in_year' | 'array']
-     *
-     * @return mixed
-     * @access public
-     */
-    function thisWeek($format = 'n_in_month')
-    {
-        switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            if ($this->firstWeek) {
-                return 1;
-            }
-            if ($this->lastWeek) {
-                return $this->cE->getWeeksInMonth(
-                    $this->thisYear(),
-                    $this->thisMonth(),
-                    $this->firstDay);
-            }
-            return $this->cE->getWeekNInMonth(
-                $this->thisYear(),
-                $this->thisMonth(),
-                $this->thisDay(),
-                $this->firstDay);
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->thisWeek),
-                $this->cE->stampToMonth($this->thisWeek),
-                $this->cE->stampToDay($this->thisWeek));
-        case 'array':
-            return $this->toArray($this->thisWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Calendar_Factory::createByTimestamp('Week', $this->thisWeek);
-        case 'timestamp':
-        default:
-            return $this->thisWeek;
-        }
-    }
-
-    /**
-     * Gets the value of the following week, according to the requested format
-     *
-     * @param string $format ['timestamp' | 'n_in_month' | 'n_in_year' | 'array']
-     *
-     * @return mixed
-     * @access public
-     */
-    function nextWeek($format = 'n_in_month')
-    {
-        switch (strtolower($format)) {
-        case 'int':
-        case 'n_in_month':
-            return ($this->lastWeek) ? null : $this->thisWeek('n_in_month') +1;
-        case 'n_in_year':
-            return $this->cE->getWeekNInYear(
-                $this->cE->stampToYear($this->nextWeek),
-                $this->cE->stampToMonth($this->nextWeek),
-                $this->cE->stampToDay($this->nextWeek));
-        case 'array':
-            return $this->toArray($this->nextWeek);
-        case 'object':
-            include_once CALENDAR_ROOT.'Factory.php';
-            return Calendar_Factory::createByTimestamp('Week', $this->nextWeek);
-        case 'timestamp':
-        default:
-            return $this->nextWeek;
-        }
-    }
-
-    /**
-     * Returns the instance of Calendar_Table_Helper.
-     * Called from Calendar_Validator::isValidWeek
-     *
-     * @return Calendar_Table_Helper
-     * @access protected
-     */
-    function & getHelper()
-    {
-        return $this->tableHelper;
-    }
-
-    /**
-     * Makes sure theres a value for $this->day
-     *
-     * @return void
-     * @access private
-     */
-    function findFirstDay()
-    {
-        if (!count($this->children) > 0) {
-            $this->build();
-            foreach ($this->children as $Day) {
-                if (!$Day->isEmpty()) {
-                    $this->day = $Day->thisDay();
-                    break;
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/Year.php b/airtime_mvc/library/pear/Calendar/Year.php
deleted file mode 100644
index a52f8dd25..000000000
--- a/airtime_mvc/library/pear/Calendar/Year.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-/**
- * Contains the Calendar_Minute class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Year.php 300728 2010-06-24 11:43:56Z quipo $
- * @link      http://pear.php.net/package/Calendar
- */
-
-/**
- * Allows Calendar include path to be redefined
- * @ignore
- */
-if (!defined('CALENDAR_ROOT')) {
-    define('CALENDAR_ROOT', 'Calendar'.DIRECTORY_SEPARATOR);
-}
-
-/**
- * Load Calendar base class
- */
-require_once CALENDAR_ROOT.'Calendar.php';
-
-/**
- * Represents a Year and builds Months<br>
- * <code>
- * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Year.php';
- * $Year = & new Calendar_Year(2003, 10, 21); // 21st Oct 2003
- * $Year->build(); // Build Calendar_Month objects
- * while ($Month = & $Year->fetch()) {
- *     echo $Month->thisMonth().'<br />';
- * }
- * </code>
- *
- * @category  Date and Time
- * @package   Calendar
- * @author    Harry Fuecks <hfuecks@phppatterns.com>
- * @copyright 2003-2007 Harry Fuecks
- * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @link      http://pear.php.net/package/Calendar
- * @access    public
- */
-class Calendar_Year extends Calendar
-{
-    /**
-     * Constructs Calendar_Year
-     *
-     * @param int $y year e.g. 2003
-     *
-     * @access public
-     */
-    function Calendar_Year($y)
-    {
-        parent::Calendar($y);
-    }
-
-    /**
-     * Builds the Months of the Year.<br>
-     * <b>Note:</b> by defining the constant CALENDAR_MONTH_STATE you can
-     * control what class of Calendar_Month is built e.g.;
-     * <code>
-     * require_once 'Calendar/Calendar_Year.php';
-     * define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS); // Use Calendar_Month_Weekdays
-     * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS); // Use Calendar_Month_Weeks
-     * // define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH); // Use Calendar_Month
-     * </code>
-     * It defaults to building Calendar_Month objects.
-     *
-     * @param array $sDates   (optional) array of Calendar_Month objects
-     *                        representing selected dates
-     * @param int   $firstDay (optional) first day of week
-     *                        (e.g. 0 for Sunday, 2 for Tuesday etc.)
-     *
-     * @return boolean
-     * @access public
-     */
-    function build($sDates = array(), $firstDay = null)
-    {
-        include_once CALENDAR_ROOT.'Factory.php';
-        $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
-        $monthsInYear   = $this->cE->getMonthsInYear($this->thisYear());
-        for ($i=1; $i <= $monthsInYear; $i++) {
-            $this->children[$i] = Calendar_Factory::create('Month', $this->year, $i);
-        }
-        if (count($sDates) > 0) {
-            $this->setSelection($sDates);
-        }
-        return true;
-    }
-
-    /**
-     * Called from build()
-     *
-     * @param array $sDates array of Calendar_Month objects representing selected dates
-     *
-     * @return void
-     * @access private
-     */
-    function setSelection($sDates) 
-    {
-        foreach ($sDates as $sDate) {
-            if ($this->year == $sDate->thisYear()) {
-                $key = $sDate->thisMonth();
-                if (isset($this->children[$key])) {
-                    $sDate->setSelected();
-                    $this->children[$key] = $sDate;
-                }
-            }
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/Readme b/airtime_mvc/library/pear/Calendar/docs/Readme
deleted file mode 100644
index 6bacca0f3..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/Readme
+++ /dev/null
@@ -1,3 +0,0 @@
-Readme
-
-See the PEAR manual at http://pear.php.net/manual/en/package.datetime.calendar.php for details.
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/1.php b/airtime_mvc/library/pear/Calendar/docs/examples/1.php
deleted file mode 100644
index 662a17da5..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/1.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-* Description: Passes through all main calendar classes, beginning with year
-* and down to seconds, skipping weeks. Useful to test Calendar is (basically)
-* working correctly
-*
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = 2003;
-if (!isset($_GET['m'])) $_GET['m'] = 8;
-if (!isset($_GET['d'])) $_GET['d'] = 9;
-if (!isset($_GET['h'])) $_GET['h'] = 12;
-if (!isset($_GET['i'])) $_GET['i'] = 34;
-if (!isset($_GET['s'])) $_GET['s'] = 46;
-
-switch ( @$_GET['view'] ) {
-    default:
-        $_GET['view'] = 'calendar_year';
-    case 'calendar_year':
-        require_once CALENDAR_ROOT.'Year.php';
-        $c = new Calendar_Year($_GET['y']);
-    break;
-    case 'calendar_month':
-        require_once CALENDAR_ROOT.'Month.php';
-        $c = new Calendar_Month($_GET['y'],$_GET['m']);
-    break;
-    case 'calendar_day':
-        require_once CALENDAR_ROOT.'Day.php';
-        $c = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-    break;
-    case 'calendar_hour':
-        require_once CALENDAR_ROOT.'Hour.php';
-        $c = new Calendar_Hour($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h']);
-    break;
-    case 'calendar_minute':
-        require_once CALENDAR_ROOT.'Minute.php';
-        $c = new Calendar_Minute($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i']);
-    break;
-    case 'calendar_second':
-        require_once CALENDAR_ROOT.'Second.php';
-        $c = new Calendar_Second($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i'],$_GET['s']);
-    break;
-}
-
-echo ( 'Viewing: '.@$_GET['view'].'<br />' );
-echo ( 'The time is now: '.date('Y M d H:i:s',$c->getTimestamp()).'<br >' );
-
-$i = 1;
-echo ( '<h1>First Iteration</h1>' );
-echo ( '<p>The first iteration is more "expensive", the calendar data
-        structures having to be built.</p>' );
-$start = getmicrotime();
-$c->build();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-
-$i = 1;
-echo ( '<h1>Second Iteration</h1>' );
-echo ( '<p>This second iteration is faster, the data structures
-        being re-used</p>' );
-$start = getmicrotime();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/1.phps b/airtime_mvc/library/pear/Calendar/docs/examples/1.phps
deleted file mode 100644
index 662a17da5..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/1.phps
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-* Description: Passes through all main calendar classes, beginning with year
-* and down to seconds, skipping weeks. Useful to test Calendar is (basically)
-* working correctly
-*
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = 2003;
-if (!isset($_GET['m'])) $_GET['m'] = 8;
-if (!isset($_GET['d'])) $_GET['d'] = 9;
-if (!isset($_GET['h'])) $_GET['h'] = 12;
-if (!isset($_GET['i'])) $_GET['i'] = 34;
-if (!isset($_GET['s'])) $_GET['s'] = 46;
-
-switch ( @$_GET['view'] ) {
-    default:
-        $_GET['view'] = 'calendar_year';
-    case 'calendar_year':
-        require_once CALENDAR_ROOT.'Year.php';
-        $c = new Calendar_Year($_GET['y']);
-    break;
-    case 'calendar_month':
-        require_once CALENDAR_ROOT.'Month.php';
-        $c = new Calendar_Month($_GET['y'],$_GET['m']);
-    break;
-    case 'calendar_day':
-        require_once CALENDAR_ROOT.'Day.php';
-        $c = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-    break;
-    case 'calendar_hour':
-        require_once CALENDAR_ROOT.'Hour.php';
-        $c = new Calendar_Hour($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h']);
-    break;
-    case 'calendar_minute':
-        require_once CALENDAR_ROOT.'Minute.php';
-        $c = new Calendar_Minute($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i']);
-    break;
-    case 'calendar_second':
-        require_once CALENDAR_ROOT.'Second.php';
-        $c = new Calendar_Second($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i'],$_GET['s']);
-    break;
-}
-
-echo ( 'Viewing: '.@$_GET['view'].'<br />' );
-echo ( 'The time is now: '.date('Y M d H:i:s',$c->getTimestamp()).'<br >' );
-
-$i = 1;
-echo ( '<h1>First Iteration</h1>' );
-echo ( '<p>The first iteration is more "expensive", the calendar data
-        structures having to be built.</p>' );
-$start = getmicrotime();
-$c->build();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-
-$i = 1;
-echo ( '<h1>Second Iteration</h1>' );
-echo ( '<p>This second iteration is faster, the data structures
-        being re-used</p>' );
-$start = getmicrotime();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/10.php b/airtime_mvc/library/pear/Calendar/docs/examples/10.php
deleted file mode 100644
index c9d92e026..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/10.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator to provide simple output formatting
-* on the month while still allowing the days to be accessed via the decorator
-* In practice you _wouldn't_ do this - each decorator comes with a performance
-* hit for extra method calls. For this example some simple functions could help
-* format the month while the days are accessed via the normal Month object
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator.php';
-
-// Decorate a Month with methods to improve formatting
-class MonthDecorator extends Calendar_Decorator {
-    /**
-    * @param Calendar_Month
-    */
-    function MonthDecorator(& $Month) {
-        parent::Calendar_Decorator($Month);
-    }
-    /**
-    * Override the prevMonth method to format the output
-    */
-    function prevMonth() {
-        $prevStamp = parent::prevMonth(TRUE);
-        // Build the URL for the previous month
-        return $_SERVER['PHP_SELF'].'?y='.date('Y',$prevStamp).
-            '&m='.date('n',$prevStamp).'&d='.date('j',$prevStamp);
-    }
-    /**
-    * Override the thisMonth method to format the output
-    */
-    function thisMonth() {
-        $thisStamp = parent::thisMonth(TRUE);
-        // A human readable string from this month
-        return date('F Y',$thisStamp);
-    }
-    /**
-    * Override the nextMonth method to format the output
-    */
-    function nextMonth() {
-        $nextStamp = parent::nextMonth(TRUE);
-        // Build the URL for next month
-        return $_SERVER['PHP_SELF'].'?y='.date('Y',$nextStamp).
-            '&m='.date('n',$nextStamp).'&d='.date('j',$nextStamp);
-    }
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-
-// Creata a month as usual
-$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-
-// Pass it to the decorator and use the decorator from now on...
-$MonthDecorator = new MonthDecorator($Month);
-$MonthDecorator->build();
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> A Simple Decorator </title>
-</head>
-<body>
-<h1>A Simple Decorator</h1>
-<table>
-<caption><?php echo ( $MonthDecorator->thisMonth() ); ?></caption>
-<?php
-while ( $Day = $MonthDecorator->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "\n<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td>&nbsp;</td>" );
-    } else {
-        echo ( "<td>".$Day->thisDay()."</td>" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "\n</tr>\n" );
-    }
-}
-?>
-<tr>
-<td><a href="<?php echo ($MonthDecorator->prevMonth()); ?>">Prev</a></td>
-<td colspan="5">&nbsp;</td>
-<td><a href="<?php echo ($MonthDecorator->nextMonth()); ?>">Next</a></td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/10.phps b/airtime_mvc/library/pear/Calendar/docs/examples/10.phps
deleted file mode 100644
index c9d92e026..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/10.phps
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator to provide simple output formatting
-* on the month while still allowing the days to be accessed via the decorator
-* In practice you _wouldn't_ do this - each decorator comes with a performance
-* hit for extra method calls. For this example some simple functions could help
-* format the month while the days are accessed via the normal Month object
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator.php';
-
-// Decorate a Month with methods to improve formatting
-class MonthDecorator extends Calendar_Decorator {
-    /**
-    * @param Calendar_Month
-    */
-    function MonthDecorator(& $Month) {
-        parent::Calendar_Decorator($Month);
-    }
-    /**
-    * Override the prevMonth method to format the output
-    */
-    function prevMonth() {
-        $prevStamp = parent::prevMonth(TRUE);
-        // Build the URL for the previous month
-        return $_SERVER['PHP_SELF'].'?y='.date('Y',$prevStamp).
-            '&m='.date('n',$prevStamp).'&d='.date('j',$prevStamp);
-    }
-    /**
-    * Override the thisMonth method to format the output
-    */
-    function thisMonth() {
-        $thisStamp = parent::thisMonth(TRUE);
-        // A human readable string from this month
-        return date('F Y',$thisStamp);
-    }
-    /**
-    * Override the nextMonth method to format the output
-    */
-    function nextMonth() {
-        $nextStamp = parent::nextMonth(TRUE);
-        // Build the URL for next month
-        return $_SERVER['PHP_SELF'].'?y='.date('Y',$nextStamp).
-            '&m='.date('n',$nextStamp).'&d='.date('j',$nextStamp);
-    }
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-
-// Creata a month as usual
-$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-
-// Pass it to the decorator and use the decorator from now on...
-$MonthDecorator = new MonthDecorator($Month);
-$MonthDecorator->build();
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> A Simple Decorator </title>
-</head>
-<body>
-<h1>A Simple Decorator</h1>
-<table>
-<caption><?php echo ( $MonthDecorator->thisMonth() ); ?></caption>
-<?php
-while ( $Day = $MonthDecorator->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "\n<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td>&nbsp;</td>" );
-    } else {
-        echo ( "<td>".$Day->thisDay()."</td>" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "\n</tr>\n" );
-    }
-}
-?>
-<tr>
-<td><a href="<?php echo ($MonthDecorator->prevMonth()); ?>">Prev</a></td>
-<td colspan="5">&nbsp;</td>
-<td><a href="<?php echo ($MonthDecorator->nextMonth()); ?>">Next</a></td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/11.php b/airtime_mvc/library/pear/Calendar/docs/examples/11.php
deleted file mode 100644
index 281dc8c70..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/11.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator used to "attach a payload" to a selection
-* to make it available when iterating over calendar children
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Hour.php';
-require_once CALENDAR_ROOT.'Decorator.php';
-
-// Decorator to "attach" functionality to selected hours
-class DiaryEvent extends Calendar_Decorator {
-    var $entry;
-    function DiaryEvent($calendar) {
-        Calendar_Decorator::Calendar_Decorator($calendar);
-    }
-    function setEntry($entry) {
-        $this->entry = $entry;
-    }
-    function getEntry() {
-        return $this->entry;
-    }
-}
-
-// Create a day to view the hours for
-$Day = & new Calendar_Day(2003,10,24);
-
-// A sample query to get the data for today (NOT ACTUALLY USED HERE)
-$sql = "
-        SELECT
-            *
-        FROM
-            diary
-        WHERE
-            eventtime >= '".$Day->thisDay(TRUE)."'
-        AND
-            eventtime < '".$Day->nextDay(TRUE)."';";
-
-// An array simulating data from a database
-$result = array (
-    array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
-    array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
-    array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
-    );
-
-// An array to place selected hours in
-$selection = array();
-
-// Loop through the "database result"
-foreach ( $result as $row ) {
-    $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
-    $Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
-
-    // Create the decorator, passing it the Hour
-    $DiaryEvent = new DiaryEvent($Hour);
-
-    // Attach the payload
-    $DiaryEvent->setEntry($row['entry']);
-
-    // Add the decorator to the selection
-    $selection[] = $DiaryEvent;
-}
-
-// Build the hours in that day, passing the selection
-$Day->build($selection);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Passing a Selection Payload with a Decorator </title>
-</head>
-<body>
-<h1>Passing a Selection "Payload" using a Decorator</h1>
-<table>
-<caption><b>Your Schedule for <?php echo ( date('D nS F Y',$Day->thisDay(TRUE)) ); ?></b></caption>
-<tr>
-<th width="5%">Time</th>
-<th>Entry</th>
-</tr>
-<?php
-while ( $Hour = & $Day->fetch() ) {
-
-    $hour = $Hour->thisHour();
-    $minute = $Hour->thisMinute();
-
-    // Office hours only...
-    if ( $hour >= 8 && $hour <= 18 ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>$hour:$minute</td>\n" );
-
-        // If the hour is selected, call the decorator method...
-        if ( $Hour->isSelected() ) {
-            echo ( "<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n" );
-        } else {
-            echo ( "<td>&nbsp;</td>\n" );
-        }
-        echo ( "</tr>\n" );
-    }
-}
-?>
-</table>
-<p>The query to fetch this data, with help from PEAR::Calendar, might be;</p>
-<pre>
-<?php echo ( $sql ); ?>
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/11.phps b/airtime_mvc/library/pear/Calendar/docs/examples/11.phps
deleted file mode 100644
index 281dc8c70..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/11.phps
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator used to "attach a payload" to a selection
-* to make it available when iterating over calendar children
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Hour.php';
-require_once CALENDAR_ROOT.'Decorator.php';
-
-// Decorator to "attach" functionality to selected hours
-class DiaryEvent extends Calendar_Decorator {
-    var $entry;
-    function DiaryEvent($calendar) {
-        Calendar_Decorator::Calendar_Decorator($calendar);
-    }
-    function setEntry($entry) {
-        $this->entry = $entry;
-    }
-    function getEntry() {
-        return $this->entry;
-    }
-}
-
-// Create a day to view the hours for
-$Day = & new Calendar_Day(2003,10,24);
-
-// A sample query to get the data for today (NOT ACTUALLY USED HERE)
-$sql = "
-        SELECT
-            *
-        FROM
-            diary
-        WHERE
-            eventtime >= '".$Day->thisDay(TRUE)."'
-        AND
-            eventtime < '".$Day->nextDay(TRUE)."';";
-
-// An array simulating data from a database
-$result = array (
-    array('eventtime'=>mktime(9,0,0,10,24,2003),'entry'=>'Meeting with sales team'),
-    array('eventtime'=>mktime(11,0,0,10,24,2003),'entry'=>'Conference call with Widget Inc.'),
-    array('eventtime'=>mktime(15,0,0,10,24,2003),'entry'=>'Presentation to board of directors')
-    );
-
-// An array to place selected hours in
-$selection = array();
-
-// Loop through the "database result"
-foreach ( $result as $row ) {
-    $Hour = new Calendar_Hour(2000,1,1,1); // Create Hour with dummy values
-    $Hour->setTimeStamp($row['eventtime']); // Set the real time with setTimeStamp
-
-    // Create the decorator, passing it the Hour
-    $DiaryEvent = new DiaryEvent($Hour);
-
-    // Attach the payload
-    $DiaryEvent->setEntry($row['entry']);
-
-    // Add the decorator to the selection
-    $selection[] = $DiaryEvent;
-}
-
-// Build the hours in that day, passing the selection
-$Day->build($selection);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Passing a Selection Payload with a Decorator </title>
-</head>
-<body>
-<h1>Passing a Selection "Payload" using a Decorator</h1>
-<table>
-<caption><b>Your Schedule for <?php echo ( date('D nS F Y',$Day->thisDay(TRUE)) ); ?></b></caption>
-<tr>
-<th width="5%">Time</th>
-<th>Entry</th>
-</tr>
-<?php
-while ( $Hour = & $Day->fetch() ) {
-
-    $hour = $Hour->thisHour();
-    $minute = $Hour->thisMinute();
-
-    // Office hours only...
-    if ( $hour >= 8 && $hour <= 18 ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>$hour:$minute</td>\n" );
-
-        // If the hour is selected, call the decorator method...
-        if ( $Hour->isSelected() ) {
-            echo ( "<td bgcolor=\"silver\">".$Hour->getEntry()."</td>\n" );
-        } else {
-            echo ( "<td>&nbsp;</td>\n" );
-        }
-        echo ( "</tr>\n" );
-    }
-}
-?>
-</table>
-<p>The query to fetch this data, with help from PEAR::Calendar, might be;</p>
-<pre>
-<?php echo ( $sql ); ?>
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/12.php b/airtime_mvc/library/pear/Calendar/docs/examples/12.php
deleted file mode 100644
index 0096d21ce..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/12.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-* Description: a complete year
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-require_once CALENDAR_ROOT.'Year.php';
-
-define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS);
-
-if ( !isset($_GET['year']) ) $_GET['year'] = date('Y');
-
-$Year = new Calendar_Year($_GET['year']);
-
-$Year->build();
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> <?php echo ( $Year->thisYear() ); ?> </title>
-<style type="text/css">
-body {
-    font-family: Georgia, serif;
-}
-caption.year {
-    font-weight: bold;
-    font-size: 120%;
-    font-color: navy;
-}
-caption.month {
-    font-size: 110%;
-    font-color: navy;
-}
-table.month {
-    border: thin groove #800080
-}
-tr {
-    vertical-align: top;
-}
-th, td {
-    text-align: right;
-    font-size: 70%;
-}
-#prev {
-    float: left;
-    font-size: 70%;
-}
-#next {
-    float: right;
-    font-size: 70%;
-}
-</style>
-</head>
-<body>
-<table>
-<caption class="year">
-<?php echo ( $Year->thisYear() ); ?>
-<div id="next">
-<a href="?year=<?php echo ( $Year->nextYear() ); ?>">>></a>
-</div>
-<div id="prev">
-<a href="?year=<?php echo ( $Year->prevYear() ); ?>"><<</a>
-</div>
-</caption>
-<?php
-$i = 0;
-while ( $Month = $Year->fetch() ) {
-
-    switch ( $i ) {
-        case 0:
-            echo ( "<tr>\n" );
-            break;
-        case 3:
-        case 6:
-        case 9:
-            echo ( "</tr>\n<tr>\n" );
-            break;
-        case 12:
-            echo ( "</tr>\n" );
-            break;
-    }
-
-    echo ( "<td>\n<table class=\"month\">\n" );
-    echo ( "<caption class=\"month\">".date('F',$Month->thisMonth(TRUE))."</caption>" );
-    echo ( "<tr>\n<th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>\n</tr>" );
-    $Month->build();
-    while ( $Day = $Month->fetch() ) {
-        if ( $Day->isFirst() ) {
-            echo ( "<tr>\n" );
-        }
-        if ( $Day->isEmpty() ) {
-            echo ( "<td>&nbsp;</td>\n" );
-        } else {
-            echo ( "<td>".$Day->thisDay()."</td>\n" );
-        }
-        if ( $Day->isLast() ) {
-            echo ( "</tr>\n" );
-        }
-    }
-    echo ( "</table>\n</td>\n" );
-
-    $i++;
-}
-?>
-</table>
-<p>Took: <?php echo ((getmicrotime()-$start)); ?></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/12.phps b/airtime_mvc/library/pear/Calendar/docs/examples/12.phps
deleted file mode 100644
index 0096d21ce..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/12.phps
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
-* Description: a complete year
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-require_once CALENDAR_ROOT.'Year.php';
-
-define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKDAYS);
-
-if ( !isset($_GET['year']) ) $_GET['year'] = date('Y');
-
-$Year = new Calendar_Year($_GET['year']);
-
-$Year->build();
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> <?php echo ( $Year->thisYear() ); ?> </title>
-<style type="text/css">
-body {
-    font-family: Georgia, serif;
-}
-caption.year {
-    font-weight: bold;
-    font-size: 120%;
-    font-color: navy;
-}
-caption.month {
-    font-size: 110%;
-    font-color: navy;
-}
-table.month {
-    border: thin groove #800080
-}
-tr {
-    vertical-align: top;
-}
-th, td {
-    text-align: right;
-    font-size: 70%;
-}
-#prev {
-    float: left;
-    font-size: 70%;
-}
-#next {
-    float: right;
-    font-size: 70%;
-}
-</style>
-</head>
-<body>
-<table>
-<caption class="year">
-<?php echo ( $Year->thisYear() ); ?>
-<div id="next">
-<a href="?year=<?php echo ( $Year->nextYear() ); ?>">>></a>
-</div>
-<div id="prev">
-<a href="?year=<?php echo ( $Year->prevYear() ); ?>"><<</a>
-</div>
-</caption>
-<?php
-$i = 0;
-while ( $Month = $Year->fetch() ) {
-
-    switch ( $i ) {
-        case 0:
-            echo ( "<tr>\n" );
-            break;
-        case 3:
-        case 6:
-        case 9:
-            echo ( "</tr>\n<tr>\n" );
-            break;
-        case 12:
-            echo ( "</tr>\n" );
-            break;
-    }
-
-    echo ( "<td>\n<table class=\"month\">\n" );
-    echo ( "<caption class=\"month\">".date('F',$Month->thisMonth(TRUE))."</caption>" );
-    echo ( "<tr>\n<th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>\n</tr>" );
-    $Month->build();
-    while ( $Day = $Month->fetch() ) {
-        if ( $Day->isFirst() ) {
-            echo ( "<tr>\n" );
-        }
-        if ( $Day->isEmpty() ) {
-            echo ( "<td>&nbsp;</td>\n" );
-        } else {
-            echo ( "<td>".$Day->thisDay()."</td>\n" );
-        }
-        if ( $Day->isLast() ) {
-            echo ( "</tr>\n" );
-        }
-    }
-    echo ( "</table>\n</td>\n" );
-
-    $i++;
-}
-?>
-</table>
-<p>Took: <?php echo ((getmicrotime()-$start)); ?></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/13.php b/airtime_mvc/library/pear/Calendar/docs/examples/13.php
deleted file mode 100644
index 4fb0f317e..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/13.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
-* Description: same as 1.php, but using the PEAR::Date engine
-* Notice the use of the CALENDAR_ENGINE constant, which
-* switches the calculation "engine"
-* Note: make sure PEAR::Date is a stable release!!!
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-// Switch to PEAR::Date engine
-define('CALENDAR_ENGINE','PearDate');
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = 2003;
-if (!isset($_GET['m'])) $_GET['m'] = 8;
-if (!isset($_GET['d'])) $_GET['d'] = 9;
-if (!isset($_GET['h'])) $_GET['h'] = 12;
-if (!isset($_GET['i'])) $_GET['i'] = 34;
-if (!isset($_GET['s'])) $_GET['s'] = 46;
-
-switch ( @$_GET['view'] ) {
-    default:
-        $_GET['view'] = 'calendar_year';
-    case 'calendar_year':
-        require_once CALENDAR_ROOT.'Year.php';
-        $c = new Calendar_Year($_GET['y']);
-    break;
-    case 'calendar_month':
-        require_once CALENDAR_ROOT.'Month.php';
-        $c = new Calendar_Month($_GET['y'],$_GET['m']);
-    break;
-    case 'calendar_day':
-        require_once CALENDAR_ROOT.'Day.php';
-        $c = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-    break;
-    case 'calendar_hour':
-        require_once CALENDAR_ROOT.'Hour.php';
-        $c = new Calendar_Hour($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h']);
-    break;
-    case 'calendar_minute':
-        require_once CALENDAR_ROOT.'Minute.php';
-        $c = new Calendar_Minute($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i']);
-    break;
-    case 'calendar_second':
-        require_once CALENDAR_ROOT.'Second.php';
-        $c = new Calendar_Second($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i'],$_GET['s']);
-    break;
-}
-
-// Convert timestamp to human readable date
-$date = new Date($c->getTimestamp());
-
-echo ( '<h1>Using PEAR::Date engine</h1>' );
-echo ( 'Viewing: '.@$_GET['view'].'<br />' );
-echo ( 'The time is now: '.$date->format('%Y %a %e %T').'<br >' );
-
-$i = 1;
-echo ( '<h1>First Iteration</h1>' );
-echo ( '<p>The first iteration is more "expensive", the calendar data
-        structures having to be built.</p>' );
-$start = getmicrotime();
-$c->build();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-
-$i = 1;
-echo ( '<h1>Second Iteration</h1>' );
-echo ( '<p>This second iteration is faster, the data structures
-        being re-used</p>' );
-$start = getmicrotime();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/13.phps b/airtime_mvc/library/pear/Calendar/docs/examples/13.phps
deleted file mode 100644
index 4fb0f317e..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/13.phps
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
-* Description: same as 1.php, but using the PEAR::Date engine
-* Notice the use of the CALENDAR_ENGINE constant, which
-* switches the calculation "engine"
-* Note: make sure PEAR::Date is a stable release!!!
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-
-// Switch to PEAR::Date engine
-define('CALENDAR_ENGINE','PearDate');
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-if (!isset($_GET['y'])) $_GET['y'] = 2003;
-if (!isset($_GET['m'])) $_GET['m'] = 8;
-if (!isset($_GET['d'])) $_GET['d'] = 9;
-if (!isset($_GET['h'])) $_GET['h'] = 12;
-if (!isset($_GET['i'])) $_GET['i'] = 34;
-if (!isset($_GET['s'])) $_GET['s'] = 46;
-
-switch ( @$_GET['view'] ) {
-    default:
-        $_GET['view'] = 'calendar_year';
-    case 'calendar_year':
-        require_once CALENDAR_ROOT.'Year.php';
-        $c = new Calendar_Year($_GET['y']);
-    break;
-    case 'calendar_month':
-        require_once CALENDAR_ROOT.'Month.php';
-        $c = new Calendar_Month($_GET['y'],$_GET['m']);
-    break;
-    case 'calendar_day':
-        require_once CALENDAR_ROOT.'Day.php';
-        $c = new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-    break;
-    case 'calendar_hour':
-        require_once CALENDAR_ROOT.'Hour.php';
-        $c = new Calendar_Hour($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h']);
-    break;
-    case 'calendar_minute':
-        require_once CALENDAR_ROOT.'Minute.php';
-        $c = new Calendar_Minute($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i']);
-    break;
-    case 'calendar_second':
-        require_once CALENDAR_ROOT.'Second.php';
-        $c = new Calendar_Second($_GET['y'],$_GET['m'],$_GET['d'],$_GET['h'],$_GET['i'],$_GET['s']);
-    break;
-}
-
-// Convert timestamp to human readable date
-$date = new Date($c->getTimestamp());
-
-echo ( '<h1>Using PEAR::Date engine</h1>' );
-echo ( 'Viewing: '.@$_GET['view'].'<br />' );
-echo ( 'The time is now: '.$date->format('%Y %a %e %T').'<br >' );
-
-$i = 1;
-echo ( '<h1>First Iteration</h1>' );
-echo ( '<p>The first iteration is more "expensive", the calendar data
-        structures having to be built.</p>' );
-$start = getmicrotime();
-$c->build();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-
-$i = 1;
-echo ( '<h1>Second Iteration</h1>' );
-echo ( '<p>This second iteration is faster, the data structures
-        being re-used</p>' );
-$start = getmicrotime();
-while ( $e = $c->fetch() ) {
-    $class = strtolower(get_class($e));
-    $link ="&y=".$e->thisYear()."&m=".$e->thisMonth()."&d=".$e->thisDay().
-        "&h=".$e->thisHour()."&i=".$e->thisMinute()."&s=".$e->thisSecond();
-    $method = 'this'.str_replace('calendar_','',$class);
-    echo ( "<a href=\"".$_SERVER['PHP_SELF']."?view=".$class.$link."\">".$e->{$method}()."</a> : " );
-    if ( ($i % 10) == 0 ) {
-        echo ( '<br>' );
-    }
-    $i++;
-}
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/14.php b/airtime_mvc/library/pear/Calendar/docs/examples/14.php
deleted file mode 100644
index b1c520c80..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/14.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
-* Description: same as 3.php, but using the PEAR::Date engine
-* Note: make sure PEAR::Date is a stable release!!!
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-// Switch to PEAR::Date engine
-define('CALENDAR_ENGINE', 'PearDate');
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-// Initialize GET variables if not set
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build the month
-$month = new Calendar_Month_Weekdays($_GET['y'], $_GET['m']);
-
-// Create an array of days which are "selected"
-// Used for Week::build() below
-$selectedDays = array (
-    new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']),
-    new Calendar_Day($_GET['y'], 12, 25),
-    );
-
-// Build the days in the month
-$month->build($selectedDays);
-
-// Construct strings for next/previous links
-$PMonth = $month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-
-$thisDate = new Date($month->thisMonth('timestamp'));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar using PEAR::Date Engine </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-</style>
-</head>
-
-<body>
-
-<h2>Calendar using PEAR::Date Engine</h2>
-<table class="calendar">
-<caption>
-<?php echo $thisDate->format('%B %Y'); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ($day = $month->fetch()) {
-    // Build a link string for each day
-    $link = $_SERVER['PHP_SELF'].
-                '?y='.$day->thisYear().
-                '&m='.$day->thisMonth().
-                '&d='.$day->thisDay();
-
-    // isFirst() to find start of week
-    if ($day->isFirst())
-        echo "<tr>\n";
-
-    if ($day->isSelected()) {
-       echo '<td class="selected">'.$day->thisDay().'</td>'."\n";
-    } else if ($day->isEmpty()) {
-        echo '<td>&nbsp;</td>'."\n";
-    } else {
-        echo '<td><a href="'.$link.'">'.$day->thisDay().'</a></td>'."\n";
-    }
-
-    // isLast() to find end of week
-    if ($day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-<tr>
-<td>
-<a href="<?php echo $prev; ?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo $next; ?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>';
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/14.phps b/airtime_mvc/library/pear/Calendar/docs/examples/14.phps
deleted file mode 100644
index b1c520c80..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/14.phps
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
-* Description: same as 3.php, but using the PEAR::Date engine
-* Note: make sure PEAR::Date is a stable release!!!
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-// Switch to PEAR::Date engine
-define('CALENDAR_ENGINE', 'PearDate');
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-// Initialize GET variables if not set
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build the month
-$month = new Calendar_Month_Weekdays($_GET['y'], $_GET['m']);
-
-// Create an array of days which are "selected"
-// Used for Week::build() below
-$selectedDays = array (
-    new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']),
-    new Calendar_Day($_GET['y'], 12, 25),
-    );
-
-// Build the days in the month
-$month->build($selectedDays);
-
-// Construct strings for next/previous links
-$PMonth = $month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-
-$thisDate = new Date($month->thisMonth('timestamp'));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar using PEAR::Date Engine </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-</style>
-</head>
-
-<body>
-
-<h2>Calendar using PEAR::Date Engine</h2>
-<table class="calendar">
-<caption>
-<?php echo $thisDate->format('%B %Y'); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ($day = $month->fetch()) {
-    // Build a link string for each day
-    $link = $_SERVER['PHP_SELF'].
-                '?y='.$day->thisYear().
-                '&m='.$day->thisMonth().
-                '&d='.$day->thisDay();
-
-    // isFirst() to find start of week
-    if ($day->isFirst())
-        echo "<tr>\n";
-
-    if ($day->isSelected()) {
-       echo '<td class="selected">'.$day->thisDay().'</td>'."\n";
-    } else if ($day->isEmpty()) {
-        echo '<td>&nbsp;</td>'."\n";
-    } else {
-        echo '<td><a href="'.$link.'">'.$day->thisDay().'</a></td>'."\n";
-    }
-
-    // isLast() to find end of week
-    if ($day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-<tr>
-<td>
-<a href="<?php echo $prev; ?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo $next; ?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>';
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/15.php b/airtime_mvc/library/pear/Calendar/docs/examples/15.php
deleted file mode 100644
index c13adc563..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/15.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
-* Shows more on how a week can be used
-*/
-function getmicrotime() {
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Week.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = 1;
-
-// Build the month
-$Week = new Calendar_Week($_GET['y'], $_GET['m'], $_GET['d']);
-/*
-$Validator = $Week->getValidator();
-if (!$Validator->isValidWeek()) {
-    die ('Please enter a valid week!');
-}
-*/
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Paging Weeks </title>
-</head>
-<body>
-<h1>Paging Weeks</h1>
-<h2>Week: <?php echo $Week->thisWeek().' '.date('F Y',$Week->thisMonth(true)); ?></h2>
-<?php
-$Week->build();
-while ($Day = $Week->fetch()) {
-    echo '<p>'.date('jS F',$Day->thisDay(true))."</p>\n";
-}
-$days = $Week->fetchAll();
-
-$prevWeek = $Week->prevWeek('array');
-$prevWeekLink = $_SERVER['PHP_SELF'].
-                    '?y='.$prevWeek['year'].
-                    '&m='.$prevWeek['month'].
-                    '&d='.$prevWeek['day'];
-
-$nextWeek = $Week->nextWeek('array');
-$nextWeekLink = $_SERVER['PHP_SELF'].
-                    '?y='.$nextWeek['year'].
-                    '&m='.$nextWeek['month'].
-                    '&d='.$nextWeek['day'];
-?>
-<p><a href="<?php echo $prevWeekLink; ?>"><<</a> | <a href="<?php echo $nextWeekLink; ?>">>></a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/15.phps b/airtime_mvc/library/pear/Calendar/docs/examples/15.phps
deleted file mode 100644
index c13adc563..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/15.phps
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
-* Shows more on how a week can be used
-*/
-function getmicrotime() {
-    list($usec, $sec) = explode(" ", microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Week.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = 1;
-
-// Build the month
-$Week = new Calendar_Week($_GET['y'], $_GET['m'], $_GET['d']);
-/*
-$Validator = $Week->getValidator();
-if (!$Validator->isValidWeek()) {
-    die ('Please enter a valid week!');
-}
-*/
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Paging Weeks </title>
-</head>
-<body>
-<h1>Paging Weeks</h1>
-<h2>Week: <?php echo $Week->thisWeek().' '.date('F Y',$Week->thisMonth(true)); ?></h2>
-<?php
-$Week->build();
-while ($Day = $Week->fetch()) {
-    echo '<p>'.date('jS F',$Day->thisDay(true))."</p>\n";
-}
-$days = $Week->fetchAll();
-
-$prevWeek = $Week->prevWeek('array');
-$prevWeekLink = $_SERVER['PHP_SELF'].
-                    '?y='.$prevWeek['year'].
-                    '&m='.$prevWeek['month'].
-                    '&d='.$prevWeek['day'];
-
-$nextWeek = $Week->nextWeek('array');
-$nextWeekLink = $_SERVER['PHP_SELF'].
-                    '?y='.$nextWeek['year'].
-                    '&m='.$nextWeek['month'].
-                    '&d='.$nextWeek['day'];
-?>
-<p><a href="<?php echo $prevWeekLink; ?>"><<</a> | <a href="<?php echo $nextWeekLink; ?>">>></a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/16.php b/airtime_mvc/library/pear/Calendar/docs/examples/16.php
deleted file mode 100644
index 2551708a3..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/16.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Uri decorator
-*/
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator/Uri.php';
-
-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
-
-// Build the month
-$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
-
-echo ( '<p>The current month is '
-        .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-
-$Uri = & new Calendar_Decorator_Uri($Calendar);
-$Uri->setFragments('jahr','monat');
-// $Uri->setSeperator('/'); // Default is &
-// $Uri->setScalar(); // Omit variable names
-echo ( "<pre>Previous Uri:\t".$Uri->prev('month')."\n" );
-echo ( "This Uri:\t".$Uri->this('month')."\n" );
-echo ( "Next Uri:\t".$Uri->next('month')."\n</pre>" );
-?>
-<p>
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month'));?>">Prev</a> :
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month'));?>">Next</a>
-</p>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/16.phps b/airtime_mvc/library/pear/Calendar/docs/examples/16.phps
deleted file mode 100644
index 2551708a3..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/16.phps
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Uri decorator
-*/
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator/Uri.php';
-
-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
-
-// Build the month
-$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
-
-echo ( '<p>The current month is '
-        .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-
-$Uri = & new Calendar_Decorator_Uri($Calendar);
-$Uri->setFragments('jahr','monat');
-// $Uri->setSeperator('/'); // Default is &
-// $Uri->setScalar(); // Omit variable names
-echo ( "<pre>Previous Uri:\t".$Uri->prev('month')."\n" );
-echo ( "This Uri:\t".$Uri->this('month')."\n" );
-echo ( "Next Uri:\t".$Uri->next('month')."\n</pre>" );
-?>
-<p>
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev('month'));?>">Prev</a> :
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next('month'));?>">Next</a>
-</p>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/17.php b/airtime_mvc/library/pear/Calendar/docs/examples/17.php
deleted file mode 100644
index 0cfebce3c..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/17.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Textual decorator
-*/
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator'.DIRECTORY_SEPARATOR.'Textual.php';
-
-// Could change language like this
-// setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo "<hr>Calling: Calendar_Decorator_Textual::monthNames('long');<pre>";
-print_r(Calendar_Decorator_Textual::monthNames('long'));
-echo '</pre>';
-
-echo "<hr>Calling: Calendar_Decorator_Textual::weekdayNames('two');<pre>";
-print_r(Calendar_Decorator_Textual::weekdayNames('two'));
-echo '</pre>';
-
-echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
-$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
-
-// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
-
-echo '<hr>Previous month is: '.$Textual->prevMonthName('two').'<br />';
-echo 'This month is: '.$Textual->thisMonthName('short').'<br />';
-echo 'Next month is: '.$Textual->nextMonthName().'<br /><hr />';
-echo 'Previous day is: '.$Textual->prevDayName().'<br />';
-echo 'This day is: '.$Textual->thisDayName('short').'<br />';
-echo 'Next day is: '.$Textual->nextDayName('one').'<br /><hr />';
-
-echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
-$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
-
-// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
-?>
-<p>Rendering calendar....</p>
-<table>
-<caption><?php echo $Textual->thisMonthName().' '.$Textual->thisYear(); ?></caption>
-<tr>
-<?php
-$dayheaders = $Textual->orderedWeekdays('short');
-foreach ($dayheaders as $dayheader) {
-    echo '<th>'.$dayheader.'</th>';
-}
-?>
-</tr>
-<?php
-$Calendar->build();
-while ($Day = $Calendar->fetch()) {
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-    if ($Day->isEmpty()) {
-        echo '<td>&nbsp;</td>';
-    } else {
-        echo '<td>'.$Day->thisDay().'</td>';
-    }
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/17.phps b/airtime_mvc/library/pear/Calendar/docs/examples/17.phps
deleted file mode 100644
index 0cfebce3c..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/17.phps
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Textual decorator
-*/
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php';
-require_once CALENDAR_ROOT.'Decorator'.DIRECTORY_SEPARATOR.'Textual.php';
-
-// Could change language like this
-// setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo "<hr>Calling: Calendar_Decorator_Textual::monthNames('long');<pre>";
-print_r(Calendar_Decorator_Textual::monthNames('long'));
-echo '</pre>';
-
-echo "<hr>Calling: Calendar_Decorator_Textual::weekdayNames('two');<pre>";
-print_r(Calendar_Decorator_Textual::weekdayNames('two'));
-echo '</pre>';
-
-echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
-$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
-
-// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
-
-echo '<hr>Previous month is: '.$Textual->prevMonthName('two').'<br />';
-echo 'This month is: '.$Textual->thisMonthName('short').'<br />';
-echo 'Next month is: '.$Textual->nextMonthName().'<br /><hr />';
-echo 'Previous day is: '.$Textual->prevDayName().'<br />';
-echo 'This day is: '.$Textual->thisDayName('short').'<br />';
-echo 'Next day is: '.$Textual->nextDayName('one').'<br /><hr />';
-
-echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
-$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
-
-// Decorate
-$Textual = & new Calendar_Decorator_Textual($Calendar);
-?>
-<p>Rendering calendar....</p>
-<table>
-<caption><?php echo $Textual->thisMonthName().' '.$Textual->thisYear(); ?></caption>
-<tr>
-<?php
-$dayheaders = $Textual->orderedWeekdays('short');
-foreach ($dayheaders as $dayheader) {
-    echo '<th>'.$dayheader.'</th>';
-}
-?>
-</tr>
-<?php
-$Calendar->build();
-while ($Day = $Calendar->fetch()) {
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-    if ($Day->isEmpty()) {
-        echo '<td>&nbsp;</td>';
-    } else {
-        echo '<td>'.$Day->thisDay().'</td>';
-    }
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/18.php b/airtime_mvc/library/pear/Calendar/docs/examples/18.php
deleted file mode 100644
index 7ec2a4988..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/18.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Wrapper decorator
-*/
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month.php';
-require_once CALENDAR_ROOT.'Decorator.php'; // Not really needed but added to help this make sense
-require_once CALENDAR_ROOT.'Decorator/Wrapper.php';
-
-class MyBoldDecorator extends Calendar_Decorator
-{
-    function MyBoldDecorator(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    function thisDay()
-    {
-        return '<b>'.parent::thisDay().'</b>';
-    }
-}
-
-$Month = new Calendar_Month(date('Y'), date('n'));
-
-$Wrapper = & new Calendar_Decorator_Wrapper($Month);
-$Wrapper->build();
-
-echo '<h2>The Wrapper decorator</h2>';
-echo '<i>Day numbers are rendered in bold</i><br /> <br />';
-while ($DecoratedDay = $Wrapper->fetch('MyBoldDecorator')) {
-    echo $DecoratedDay->thisDay().'<br />';
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/18.phps b/airtime_mvc/library/pear/Calendar/docs/examples/18.phps
deleted file mode 100644
index 7ec2a4988..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/18.phps
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Wrapper decorator
-*/
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month.php';
-require_once CALENDAR_ROOT.'Decorator.php'; // Not really needed but added to help this make sense
-require_once CALENDAR_ROOT.'Decorator/Wrapper.php';
-
-class MyBoldDecorator extends Calendar_Decorator
-{
-    function MyBoldDecorator(&$Calendar)
-    {
-        parent::Calendar_Decorator($Calendar);
-    }
-
-    function thisDay()
-    {
-        return '<b>'.parent::thisDay().'</b>';
-    }
-}
-
-$Month = new Calendar_Month(date('Y'), date('n'));
-
-$Wrapper = & new Calendar_Decorator_Wrapper($Month);
-$Wrapper->build();
-
-echo '<h2>The Wrapper decorator</h2>';
-echo '<i>Day numbers are rendered in bold</i><br /> <br />';
-while ($DecoratedDay = $Wrapper->fetch('MyBoldDecorator')) {
-    echo $DecoratedDay->thisDay().'<br />';
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/19.php b/airtime_mvc/library/pear/Calendar/docs/examples/19.php
deleted file mode 100644
index e46d10759..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/19.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Weekday decorator
-*/
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Decorator/Weekday.php';
-
-$Day = new Calendar_Day(date('Y'), date('n'),date('d'));
-$WeekDay = & new Calendar_Decorator_Weekday($Day);
-// $WeekDay->setFirstDay(0); // Make Sunday first Day
-
-echo 'Yesterday: '.$WeekDay->prevWeekDay().'<br>';
-echo 'Today: '.$WeekDay->thisWeekDay().'<br>';
-echo 'Tomorrow: '.$WeekDay->nextWeekDay().'<br>';
-
-$WeekDay->build();
-echo 'Hours today:<br>';
-while ( $Hour = $WeekDay->fetch() ) {
-    echo $Hour->thisHour().'<br>';
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/19.phps b/airtime_mvc/library/pear/Calendar/docs/examples/19.phps
deleted file mode 100644
index e46d10759..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/19.phps
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Weekday decorator
-*/
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Decorator/Weekday.php';
-
-$Day = new Calendar_Day(date('Y'), date('n'),date('d'));
-$WeekDay = & new Calendar_Decorator_Weekday($Day);
-// $WeekDay->setFirstDay(0); // Make Sunday first Day
-
-echo 'Yesterday: '.$WeekDay->prevWeekDay().'<br>';
-echo 'Today: '.$WeekDay->thisWeekDay().'<br>';
-echo 'Tomorrow: '.$WeekDay->nextWeekDay().'<br>';
-
-$WeekDay->build();
-echo 'Hours today:<br>';
-while ( $Hour = $WeekDay->fetch() ) {
-    echo $Hour->thisHour().'<br>';
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/2.php b/airtime_mvc/library/pear/Calendar/docs/examples/2.php
deleted file mode 100644
index 38de8a7ac..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/2.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-* Description: Demonstrates building a calendar for a month using the Week class
-* Uses UnixTs engine
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-// Force UnixTs engine (default setting)
-define('CALENDAR_ENGINE','UnixTS');
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weeks.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-// Initialize GET variables if not set
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build a month object
-$Month = new Calendar_Month_Weeks($_GET['y'], $_GET['m']);
-
-// Create an array of days which are "selected"
-// Used for Week::build() below
-$selectedDays = array (
-    new Calendar_Day($_GET['y'],$_GET['m'], $_GET['d']),
-    new Calendar_Day($_GET['y'], 12, 25),
-    new Calendar_Day(date('Y'), date('m'), date('d')),
-    );
-
-// Instruct month to build Week objects
-$Month->build();
-
-// Construct strings for next/previous links
-$PMonth = $Month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $Month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-.empty {
-    color: white;
-}
-</style>
-</head>
-
-<body>
-<h2>Build with Calendar_Month_Weeks::build() then Calendar_Week::build()</h2>
-<table class="calendar">
-<caption>
-<?php echo date('F Y', $Month->getTimeStamp()); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ($Week = $Month->fetch()) {
-    echo "<tr>\n";
-    // Build the days in the week, passing the selected days
-    $Week->build($selectedDays);
-    while ($Day = $Week->fetch()) {
-
-        // Build a link string for each day
-        $link = $_SERVER['PHP_SELF'].
-                    '?y='.$Day->thisYear().
-                    '&m='.$Day->thisMonth().
-                    '&d='.$Day->thisDay();
-
-        // Check to see if day is selected
-        if ($Day->isSelected()) {
-            echo '<td class="selected">'.$Day->thisDay().'</td>'."\n";
-        // Check to see if day is empty
-        } else if ($Day->isEmpty()) {
-            echo '<td class="empty">'.$Day->thisDay().'</td>'."\n";
-        } else {
-            echo '<td><a href="'.$link.'">'.$Day->thisDay().'</a></td>'."\n";
-        }
-    }
-    echo '</tr>'."\n";
-}
-?>
-<tr>
-<td>
-<a href="<?php echo $prev; ?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo $next; ?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>';
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/2.phps b/airtime_mvc/library/pear/Calendar/docs/examples/2.phps
deleted file mode 100644
index 38de8a7ac..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/2.phps
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-* Description: Demonstrates building a calendar for a month using the Week class
-* Uses UnixTs engine
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-// Force UnixTs engine (default setting)
-define('CALENDAR_ENGINE','UnixTS');
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weeks.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-// Initialize GET variables if not set
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build a month object
-$Month = new Calendar_Month_Weeks($_GET['y'], $_GET['m']);
-
-// Create an array of days which are "selected"
-// Used for Week::build() below
-$selectedDays = array (
-    new Calendar_Day($_GET['y'],$_GET['m'], $_GET['d']),
-    new Calendar_Day($_GET['y'], 12, 25),
-    new Calendar_Day(date('Y'), date('m'), date('d')),
-    );
-
-// Instruct month to build Week objects
-$Month->build();
-
-// Construct strings for next/previous links
-$PMonth = $Month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $Month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-.empty {
-    color: white;
-}
-</style>
-</head>
-
-<body>
-<h2>Build with Calendar_Month_Weeks::build() then Calendar_Week::build()</h2>
-<table class="calendar">
-<caption>
-<?php echo date('F Y', $Month->getTimeStamp()); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ($Week = $Month->fetch()) {
-    echo "<tr>\n";
-    // Build the days in the week, passing the selected days
-    $Week->build($selectedDays);
-    while ($Day = $Week->fetch()) {
-
-        // Build a link string for each day
-        $link = $_SERVER['PHP_SELF'].
-                    '?y='.$Day->thisYear().
-                    '&m='.$Day->thisMonth().
-                    '&d='.$Day->thisDay();
-
-        // Check to see if day is selected
-        if ($Day->isSelected()) {
-            echo '<td class="selected">'.$Day->thisDay().'</td>'."\n";
-        // Check to see if day is empty
-        } else if ($Day->isEmpty()) {
-            echo '<td class="empty">'.$Day->thisDay().'</td>'."\n";
-        } else {
-            echo '<td><a href="'.$link.'">'.$Day->thisDay().'</a></td>'."\n";
-        }
-    }
-    echo '</tr>'."\n";
-}
-?>
-<tr>
-<td>
-<a href="<?php echo $prev; ?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo $next; ?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>';
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/20.php b/airtime_mvc/library/pear/Calendar/docs/examples/20.php
deleted file mode 100644
index 31b868bbc..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/20.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator used to "attach a payload" to a selection
-* to make it available when iterating over calendar children
-*/
-
-//if you use ISO-8601 dates, switch to PearDate engine
-define('CALENDAR_ENGINE', 'PearDate');
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-require_once CALENDAR_ROOT . 'Month/Weekdays.php';
-require_once CALENDAR_ROOT . 'Day.php';
-require_once CALENDAR_ROOT . 'Decorator.php';
-
-// accepts multiple entries
-class DiaryEvent extends Calendar_Decorator
-{
-    var $entries = array();
-
-    function DiaryEvent($calendar) {
-        Calendar_Decorator::Calendar_Decorator($calendar);
-    }
-
-    function addEntry($entry) {
-        $this->entries[] = $entry;
-    }
-
-    function getEntry() {
-        $entry = each($this->entries);
-        if ($entry) {
-            return $entry['value'];
-        } else {
-            reset($this->entries);
-            return false;
-        }
-    }
-}
-
-class MonthPayload_Decorator extends Calendar_Decorator
-{
-    //Calendar engine
-    var $cE;
-    var $tableHelper;
-
-    var $year;
-    var $month;
-    var $firstDay = false;
-
-    function build($events=array())
-    {
-        require_once CALENDAR_ROOT . 'Day.php';
-        require_once CALENDAR_ROOT .  'Table/Helper.php';
-
-        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
-        $this->cE = & $this->getEngine();
-        $this->year  = $this->thisYear();
-        $this->month = $this->thisMonth();
-
-        $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
-            $Day = new Calendar_Day(2000,1,1); // Create Day with dummy values
-            $Day->setTimeStamp($this->cE->dateToStamp($this->year, $this->month, $i));
-            $this->children[$i] = new DiaryEvent($Day);
-        }
-        if (count($events) > 0) {
-            $this->setSelection($events);
-        }
-        Calendar_Month_Weekdays::buildEmptyDaysBefore();
-        Calendar_Month_Weekdays::shiftDays();
-        Calendar_Month_Weekdays::buildEmptyDaysAfter();
-        Calendar_Month_Weekdays::setWeekMarkers();
-        return true;
-    }
-
-    function setSelection($events)
-    {
-        $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
-            $stamp1 = $this->cE->dateToStamp($this->year, $this->month, $i);
-            $stamp2 = $this->cE->dateToStamp($this->year, $this->month, $i+1);
-            foreach ($events as $event) {
-                if (($stamp1 >= $event['start'] && $stamp1 < $event['end']) ||
-                    ($stamp2 >= $event['start'] && $stamp2 < $event['end']) ||
-                    ($stamp1 <= $event['start'] && $stamp2 > $event['end'])
-                ) {
-                    $this->children[$i]->addEntry($event);
-                    $this->children[$i]->setSelected();
-                }
-            }
-        }
-    }
-
-    function fetch()
-    {
-        $child = each($this->children);
-        if ($child) {
-            return $child['value'];
-        } else {
-            reset($this->children);
-            return false;
-        }
-    }
-}
-
-// Calendar instance used to get the dates in the preferred format:
-// you can switch Calendar Engine and the example still works
-$cal = new Calendar;
-
-$events = array();
-//add some events
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 1, 10),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 1, 12),
-    'desc'  => 'Important meeting'
-);
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 1, 21),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 1, 23, 59),
-    'desc'  => 'Dinner with the boss'
-);
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 5),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 10, 23, 59),
-    'desc'  => 'Holidays!'
-);
-
-
-
-$Month = & new Calendar_Month_Weekdays(2004, 6);
-$MonthDecorator = new MonthPayload_Decorator($Month);
-$MonthDecorator->build($events);
-
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    border-collapse: collapse;
-}
-caption {
-    font-family: verdana;
-    font-size: 14pt;
-    padding-bottom: 4pt;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: center;
-    background-color: #e7e3e7;
-    padding: 5pt;
-    line-height: 150%;
-    border: 1px solid #ccc;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: left;
-    vertical-align: top;
-}
-td.calCell {
-    border: 1px solid #b5bece;
-    padding: 3px;
-}
-td.calCellEmpty {
-    background-color: #f3f3f7;
-}
-td.calCellBusy {
-    background-color: #efeffa;
-}
-div.dayNumber {
-    text-align: right;
-    background-color: #f8f8f8;
-    border-bottom: 1px solid #ccc;
-}
-ul {
-    margin-left: 0;
-    margin-top: 5pt;
-    padding: 0 10pt 0 12pt;
-    list-style-type: square;
-}
-</style>
-</head>
-
-<body>
-
-<h2>Sample Calendar Payload Decorator (using <?php echo CALENDAR_ENGINE; ?> engine)</h2>
-<table class="calendar" width="98%" cellspacing="0" cellpadding="0">
-<caption>
-    <?php echo $MonthDecorator->thisMonth().' / '.$MonthDecorator->thisYear(); ?>
-</caption>
-<tr>
-    <th>Monday</th>
-    <th>Tuesday</th>
-    <th>Wednesday</th>
-    <th>Thursday</th>
-    <th>Friday</th>
-    <th>Saturday</th>
-    <th>Sunday</th>
-</tr>
-<?php
-while ($Day = $MonthDecorator->fetch()) {
-
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-
-    echo '<td class="calCell';
-    if ($Day->isSelected()) {
-        echo ' calCellBusy';
-    } elseif ($Day->isEmpty()) {
-        echo ' calCellEmpty';
-    }
-    echo '">';
-    echo '<div class="dayNumber">'.$Day->thisDay().'</div>';
-
-    if ($Day->isEmpty()) {
-        echo '&nbsp;';
-    } else {
-        echo '<div class="dayContents"><ul>';
-        while ($entry = $Day->getEntry()) {
-            echo  '<li>'.$entry['desc'].'</li>';
-            //you can print the time range as well
-        }
-        echo '</ul></div>';
-    }
-    echo '</td>';
-
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/20.phps b/airtime_mvc/library/pear/Calendar/docs/examples/20.phps
deleted file mode 100644
index 31b868bbc..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/20.phps
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
-* Description: demonstrates a decorator used to "attach a payload" to a selection
-* to make it available when iterating over calendar children
-*/
-
-//if you use ISO-8601 dates, switch to PearDate engine
-define('CALENDAR_ENGINE', 'PearDate');
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-
-require_once CALENDAR_ROOT . 'Month/Weekdays.php';
-require_once CALENDAR_ROOT . 'Day.php';
-require_once CALENDAR_ROOT . 'Decorator.php';
-
-// accepts multiple entries
-class DiaryEvent extends Calendar_Decorator
-{
-    var $entries = array();
-
-    function DiaryEvent($calendar) {
-        Calendar_Decorator::Calendar_Decorator($calendar);
-    }
-
-    function addEntry($entry) {
-        $this->entries[] = $entry;
-    }
-
-    function getEntry() {
-        $entry = each($this->entries);
-        if ($entry) {
-            return $entry['value'];
-        } else {
-            reset($this->entries);
-            return false;
-        }
-    }
-}
-
-class MonthPayload_Decorator extends Calendar_Decorator
-{
-    //Calendar engine
-    var $cE;
-    var $tableHelper;
-
-    var $year;
-    var $month;
-    var $firstDay = false;
-
-    function build($events=array())
-    {
-        require_once CALENDAR_ROOT . 'Day.php';
-        require_once CALENDAR_ROOT .  'Table/Helper.php';
-
-        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
-        $this->cE = & $this->getEngine();
-        $this->year  = $this->thisYear();
-        $this->month = $this->thisMonth();
-
-        $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
-            $Day = new Calendar_Day(2000,1,1); // Create Day with dummy values
-            $Day->setTimeStamp($this->cE->dateToStamp($this->year, $this->month, $i));
-            $this->children[$i] = new DiaryEvent($Day);
-        }
-        if (count($events) > 0) {
-            $this->setSelection($events);
-        }
-        Calendar_Month_Weekdays::buildEmptyDaysBefore();
-        Calendar_Month_Weekdays::shiftDays();
-        Calendar_Month_Weekdays::buildEmptyDaysAfter();
-        Calendar_Month_Weekdays::setWeekMarkers();
-        return true;
-    }
-
-    function setSelection($events)
-    {
-        $daysInMonth = $this->cE->getDaysInMonth($this->year, $this->month);
-        for ($i=1; $i<=$daysInMonth; $i++) {
-            $stamp1 = $this->cE->dateToStamp($this->year, $this->month, $i);
-            $stamp2 = $this->cE->dateToStamp($this->year, $this->month, $i+1);
-            foreach ($events as $event) {
-                if (($stamp1 >= $event['start'] && $stamp1 < $event['end']) ||
-                    ($stamp2 >= $event['start'] && $stamp2 < $event['end']) ||
-                    ($stamp1 <= $event['start'] && $stamp2 > $event['end'])
-                ) {
-                    $this->children[$i]->addEntry($event);
-                    $this->children[$i]->setSelected();
-                }
-            }
-        }
-    }
-
-    function fetch()
-    {
-        $child = each($this->children);
-        if ($child) {
-            return $child['value'];
-        } else {
-            reset($this->children);
-            return false;
-        }
-    }
-}
-
-// Calendar instance used to get the dates in the preferred format:
-// you can switch Calendar Engine and the example still works
-$cal = new Calendar;
-
-$events = array();
-//add some events
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 1, 10),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 1, 12),
-    'desc'  => 'Important meeting'
-);
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 1, 21),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 1, 23, 59),
-    'desc'  => 'Dinner with the boss'
-);
-$events[] = array(
-    'start' => $cal->cE->dateToStamp(2004, 6, 5),
-    'end'   => $cal->cE->dateToStamp(2004, 6, 10, 23, 59),
-    'desc'  => 'Holidays!'
-);
-
-
-
-$Month = & new Calendar_Month_Weekdays(2004, 6);
-$MonthDecorator = new MonthPayload_Decorator($Month);
-$MonthDecorator->build($events);
-
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    border-collapse: collapse;
-}
-caption {
-    font-family: verdana;
-    font-size: 14pt;
-    padding-bottom: 4pt;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: center;
-    background-color: #e7e3e7;
-    padding: 5pt;
-    line-height: 150%;
-    border: 1px solid #ccc;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: left;
-    vertical-align: top;
-}
-td.calCell {
-    border: 1px solid #b5bece;
-    padding: 3px;
-}
-td.calCellEmpty {
-    background-color: #f3f3f7;
-}
-td.calCellBusy {
-    background-color: #efeffa;
-}
-div.dayNumber {
-    text-align: right;
-    background-color: #f8f8f8;
-    border-bottom: 1px solid #ccc;
-}
-ul {
-    margin-left: 0;
-    margin-top: 5pt;
-    padding: 0 10pt 0 12pt;
-    list-style-type: square;
-}
-</style>
-</head>
-
-<body>
-
-<h2>Sample Calendar Payload Decorator (using <?php echo CALENDAR_ENGINE; ?> engine)</h2>
-<table class="calendar" width="98%" cellspacing="0" cellpadding="0">
-<caption>
-    <?php echo $MonthDecorator->thisMonth().' / '.$MonthDecorator->thisYear(); ?>
-</caption>
-<tr>
-    <th>Monday</th>
-    <th>Tuesday</th>
-    <th>Wednesday</th>
-    <th>Thursday</th>
-    <th>Friday</th>
-    <th>Saturday</th>
-    <th>Sunday</th>
-</tr>
-<?php
-while ($Day = $MonthDecorator->fetch()) {
-
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-
-    echo '<td class="calCell';
-    if ($Day->isSelected()) {
-        echo ' calCellBusy';
-    } elseif ($Day->isEmpty()) {
-        echo ' calCellEmpty';
-    }
-    echo '">';
-    echo '<div class="dayNumber">'.$Day->thisDay().'</div>';
-
-    if ($Day->isEmpty()) {
-        echo '&nbsp;';
-    } else {
-        echo '<div class="dayContents"><ul>';
-        while ($entry = $Day->getEntry()) {
-            echo  '<li>'.$entry['desc'].'</li>';
-            //you can print the time range as well
-        }
-        echo '</ul></div>';
-    }
-    echo '</td>';
-
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/21.php b/airtime_mvc/library/pear/Calendar/docs/examples/21.php
deleted file mode 100644
index dbdd68aec..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/21.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-* Description: a complete year with numeric week numbers
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-
-require_once CALENDAR_ROOT.'Year.php';
-require_once CALENDAR_ROOT.'Month/Weeks.php';
-
-define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS);
-
-if (!isset($_GET['year'])) $_GET['year'] = date('Y');
-
-$week_types = array(
-    'n_in_year',
-    'n_in_month',
-);
-
-if (!isset($_GET['week_type']) || !in_array($_GET['week_type'],$week_types) ) {
-    $_GET['week_type'] = 'n_in_year';
-}
-
-$Year = new Calendar_Year($_GET['year']);
-
-$Year->build();
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> <?php echo $Year->thisYear(); ?> </title>
-<style type="text/css">
-body {
-    font-family: Georgia, serif;
-}
-caption.year {
-    font-weight: bold;
-    font-size: 120%;
-    font-color: navy;
-}
-caption.month {
-    font-size: 110%;
-    font-color: navy;
-}
-table.month {
-    border: thin groove #800080
-}
-tr {
-    vertical-align: top;
-}
-th, td {
-    text-align: right;
-    font-size: 70%;
-}
-#prev {
-    float: left;
-    font-size: 70%;
-}
-#next {
-    float: right;
-    font-size: 70%;
-}
-#week_type {
-    float: none;
-    font-size: 70%;
-}
-.weekNumbers {
-    background-color: #e5e5f5;
-    padding-right: 3pt;
-}
-</style>
-</head>
-<body>
-<table>
-<caption class="year">
-<?php echo $Year->thisYear(); ?>
-<div id="next">
-<a href="?year=<?php echo $Year->nextYear(); ?>&week_type=<?php echo $_GET['week_type']; ?>">>></a>
-</div>
-<div id="prev">
-<a href="?year=<?php echo $Year->prevYear(); ?>&week_type=<?php echo $_GET['week_type']; ?>"><<</a>
-</div>
-<div id="week_type">
-<a href="?year=<?php echo $Year->thisYear(); ?>&week_type=n_in_year">Weeks by Year</a> : 
-<a href="?year=<?php echo $Year->thisYear(); ?>&week_type=n_in_month">Weeks by Month</a> 
-</div>
-</caption>
-<?php
-$i = 0;
-while ($Month = $Year->fetch()) {
-
-    switch ($i) {
-        case 0:
-            echo "<tr>\n";
-            break;
-        case 3:
-        case 6:
-        case 9:
-            echo "</tr>\n<tr>\n";
-           break;
-        case 12:
-            echo "</tr>\n";
-            break;
-    }
-
-    echo "<td>\n<table class=\"month\">\n";
-    echo '<caption class="month">'.date('F', $Month->thisMonth(TRUE)).'</caption>';
-    echo '<colgroup><col class="weekNumbers"><col span="7"></colgroup>'."\n";
-    echo "<tr>\n<th>Week</th><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>\n</tr>";
-    $Month->build();
-    while ($Week = $Month->fetch()) {
-        echo "<tr>\n";
-        echo '<td>'.$Week->thisWeek($_GET['week_type'])."</td>\n";
-        $Week->build();
-
-        while ($Day = $Week->fetch()) {
-            if ($Day->isEmpty()) {
-                echo "<td>&nbsp;</td>\n";
-            } else {
-                echo "<td>".$Day->thisDay()."</td>\n";
-            }
-        }
-    }
-    echo "</table>\n</td>\n";
-
-    $i++;
-}
-?>
-</table>
-<p>Took: <?php echo ((getmicrotime()-$start)); ?></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/21.phps b/airtime_mvc/library/pear/Calendar/docs/examples/21.phps
deleted file mode 100644
index dbdd68aec..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/21.phps
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
-* Description: a complete year with numeric week numbers
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-
-require_once CALENDAR_ROOT.'Year.php';
-require_once CALENDAR_ROOT.'Month/Weeks.php';
-
-define ('CALENDAR_MONTH_STATE',CALENDAR_USE_MONTH_WEEKS);
-
-if (!isset($_GET['year'])) $_GET['year'] = date('Y');
-
-$week_types = array(
-    'n_in_year',
-    'n_in_month',
-);
-
-if (!isset($_GET['week_type']) || !in_array($_GET['week_type'],$week_types) ) {
-    $_GET['week_type'] = 'n_in_year';
-}
-
-$Year = new Calendar_Year($_GET['year']);
-
-$Year->build();
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> <?php echo $Year->thisYear(); ?> </title>
-<style type="text/css">
-body {
-    font-family: Georgia, serif;
-}
-caption.year {
-    font-weight: bold;
-    font-size: 120%;
-    font-color: navy;
-}
-caption.month {
-    font-size: 110%;
-    font-color: navy;
-}
-table.month {
-    border: thin groove #800080
-}
-tr {
-    vertical-align: top;
-}
-th, td {
-    text-align: right;
-    font-size: 70%;
-}
-#prev {
-    float: left;
-    font-size: 70%;
-}
-#next {
-    float: right;
-    font-size: 70%;
-}
-#week_type {
-    float: none;
-    font-size: 70%;
-}
-.weekNumbers {
-    background-color: #e5e5f5;
-    padding-right: 3pt;
-}
-</style>
-</head>
-<body>
-<table>
-<caption class="year">
-<?php echo $Year->thisYear(); ?>
-<div id="next">
-<a href="?year=<?php echo $Year->nextYear(); ?>&week_type=<?php echo $_GET['week_type']; ?>">>></a>
-</div>
-<div id="prev">
-<a href="?year=<?php echo $Year->prevYear(); ?>&week_type=<?php echo $_GET['week_type']; ?>"><<</a>
-</div>
-<div id="week_type">
-<a href="?year=<?php echo $Year->thisYear(); ?>&week_type=n_in_year">Weeks by Year</a> : 
-<a href="?year=<?php echo $Year->thisYear(); ?>&week_type=n_in_month">Weeks by Month</a> 
-</div>
-</caption>
-<?php
-$i = 0;
-while ($Month = $Year->fetch()) {
-
-    switch ($i) {
-        case 0:
-            echo "<tr>\n";
-            break;
-        case 3:
-        case 6:
-        case 9:
-            echo "</tr>\n<tr>\n";
-           break;
-        case 12:
-            echo "</tr>\n";
-            break;
-    }
-
-    echo "<td>\n<table class=\"month\">\n";
-    echo '<caption class="month">'.date('F', $Month->thisMonth(TRUE)).'</caption>';
-    echo '<colgroup><col class="weekNumbers"><col span="7"></colgroup>'."\n";
-    echo "<tr>\n<th>Week</th><th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>\n</tr>";
-    $Month->build();
-    while ($Week = $Month->fetch()) {
-        echo "<tr>\n";
-        echo '<td>'.$Week->thisWeek($_GET['week_type'])."</td>\n";
-        $Week->build();
-
-        while ($Day = $Week->fetch()) {
-            if ($Day->isEmpty()) {
-                echo "<td>&nbsp;</td>\n";
-            } else {
-                echo "<td>".$Day->thisDay()."</td>\n";
-            }
-        }
-    }
-    echo "</table>\n</td>\n";
-
-    $i++;
-}
-?>
-</table>
-<p>Took: <?php echo ((getmicrotime()-$start)); ?></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/22.php b/airtime_mvc/library/pear/Calendar/docs/examples/22.php
deleted file mode 100644
index 089c53606..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/22.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Uri util
-*/
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Util/Uri.php';
-
-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
-
-// Build the month
-$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
-
-echo ( '<p>The current month is '
-        .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-
-$Uri = & new Calendar_Util_Uri('jahr','monat');
-$Uri->setFragments('jahr','monat');
-
-echo "\"Vector\" URIs<pre>";
-echo ( "Previous Uri:\t".htmlentities($Uri->prev($Calendar, 'month'))."\n" );
-echo ( "This Uri:\t".htmlentities($Uri->this($Calendar,  'month'))."\n" );
-echo ( "Next Uri:\t".htmlentities($Uri->next($Calendar, 'month'))."\n" );
-echo "</pre>";
-
-// Switch to scalar URIs
-$Uri->separator = '/'; // Default is &amp;
-$Uri->scalar = true; // Omit variable names
-
-echo "\"Scalar\" URIs<pre>";
-echo ( "Previous Uri:\t".$Uri->prev($Calendar, 'month')."\n" );
-echo ( "This Uri:\t".$Uri->this($Calendar,  'month')."\n" );
-echo ( "Next Uri:\t".$Uri->next($Calendar, 'month')."\n" );
-echo "</pre>";
-
-// Restore the vector URIs
-$Uri->separator = '&amp;';
-$Uri->scalar = false;
-?>
-<p>
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev($Calendar, 'month'));?>">Prev</a> :
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next($Calendar, 'month'));?>">Next</a>
-</p>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/22.phps b/airtime_mvc/library/pear/Calendar/docs/examples/22.phps
deleted file mode 100644
index 089c53606..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/22.phps
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Uri util
-*/
-if (!@include 'Calendar/Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Util/Uri.php';
-
-if (!isset($_GET['jahr'])) $_GET['jahr'] = date('Y');
-if (!isset($_GET['monat'])) $_GET['monat'] = date('m');
-
-// Build the month
-$Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']);
-
-echo ( '<p>The current month is '
-        .$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>');
-
-$Uri = & new Calendar_Util_Uri('jahr','monat');
-$Uri->setFragments('jahr','monat');
-
-echo "\"Vector\" URIs<pre>";
-echo ( "Previous Uri:\t".htmlentities($Uri->prev($Calendar, 'month'))."\n" );
-echo ( "This Uri:\t".htmlentities($Uri->this($Calendar,  'month'))."\n" );
-echo ( "Next Uri:\t".htmlentities($Uri->next($Calendar, 'month'))."\n" );
-echo "</pre>";
-
-// Switch to scalar URIs
-$Uri->separator = '/'; // Default is &amp;
-$Uri->scalar = true; // Omit variable names
-
-echo "\"Scalar\" URIs<pre>";
-echo ( "Previous Uri:\t".$Uri->prev($Calendar, 'month')."\n" );
-echo ( "This Uri:\t".$Uri->this($Calendar,  'month')."\n" );
-echo ( "Next Uri:\t".$Uri->next($Calendar, 'month')."\n" );
-echo "</pre>";
-
-// Restore the vector URIs
-$Uri->separator = '&amp;';
-$Uri->scalar = false;
-?>
-<p>
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->prev($Calendar, 'month'));?>">Prev</a> :
-<a href="<?php echo($_SERVER['PHP_SELF'].'?'.$Uri->next($Calendar, 'month'));?>">Next</a>
-</p>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/23.php b/airtime_mvc/library/pear/Calendar/docs/examples/23.php
deleted file mode 100644
index 3f04b4486..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/23.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Textual util
-*/
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php';
-require_once CALENDAR_ROOT.'Util'.DIRECTORY_SEPARATOR.'Textual.php';
-
-// Could change language like this
-// setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo "<hr>Calling: Calendar_Util_Textual::monthNames('long');<pre>";
-print_r(Calendar_Util_Textual::monthNames('long'));
-echo '</pre>';
-
-echo "<hr>Calling: Calendar_Util_Textual::weekdayNames('two');<pre>";
-print_r(Calendar_Util_Textual::weekdayNames('two'));
-echo '</pre>';
-
-echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
-$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
-
-echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar,'two').'<br />';
-echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar,'short').'<br />';
-echo 'Next month is: '.Calendar_Util_Textual::nextMonthName($Calendar).'<br /><hr />';
-echo 'Previous day is: '.Calendar_Util_Textual::prevDayName($Calendar).'<br />';
-echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar,'short').'<br />';
-echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar,'one').'<br /><hr />';
-
-echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
-$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
-
-?>
-<p>Rendering calendar....</p>
-<table>
-<caption><?php echo Calendar_Util_Textual::thisMonthName($Calendar).' '.$Calendar->thisYear(); ?></caption>
-<tr>
-<?php
-$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar,'short');
-foreach ($dayheaders as $dayheader) {
-    echo '<th>'.$dayheader.'</th>';
-}
-?>
-</tr>
-<?php
-$Calendar->build();
-while ($Day = $Calendar->fetch()) {
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-    if ($Day->isEmpty()) {
-        echo '<td>&nbsp;</td>';
-    } else {
-        echo '<td>'.$Day->thisDay().'</td>';
-    }
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/23.phps b/airtime_mvc/library/pear/Calendar/docs/examples/23.phps
deleted file mode 100644
index 3f04b4486..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/23.phps
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
-* Description: demonstrates using the Textual util
-*/
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php';
-require_once CALENDAR_ROOT.'Util'.DIRECTORY_SEPARATOR.'Textual.php';
-
-// Could change language like this
-// setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo "<hr>Calling: Calendar_Util_Textual::monthNames('long');<pre>";
-print_r(Calendar_Util_Textual::monthNames('long'));
-echo '</pre>';
-
-echo "<hr>Calling: Calendar_Util_Textual::weekdayNames('two');<pre>";
-print_r(Calendar_Util_Textual::weekdayNames('two'));
-echo '</pre>';
-
-echo "<hr>Creating: new Calendar_Day(date('Y'), date('n'), date('d'));<br />";
-$Calendar = new Calendar_Day(date('Y'), date('n'), date('d'));
-
-echo '<hr>Previous month is: '.Calendar_Util_Textual::prevMonthName($Calendar,'two').'<br />';
-echo 'This month is: '.Calendar_Util_Textual::thisMonthName($Calendar,'short').'<br />';
-echo 'Next month is: '.Calendar_Util_Textual::nextMonthName($Calendar).'<br /><hr />';
-echo 'Previous day is: '.Calendar_Util_Textual::prevDayName($Calendar).'<br />';
-echo 'This day is: '.Calendar_Util_Textual::thisDayName($Calendar,'short').'<br />';
-echo 'Next day is: '.Calendar_Util_Textual::nextDayName($Calendar,'one').'<br /><hr />';
-
-echo "Creating: new Calendar_Month_Weekdays(date('Y'), date('n'), 6); - Saturday is first day of week<br />";
-$Calendar = new Calendar_Month_Weekdays(date('Y'), date('n'), 6);
-
-?>
-<p>Rendering calendar....</p>
-<table>
-<caption><?php echo Calendar_Util_Textual::thisMonthName($Calendar).' '.$Calendar->thisYear(); ?></caption>
-<tr>
-<?php
-$dayheaders = Calendar_Util_Textual::orderedWeekdays($Calendar,'short');
-foreach ($dayheaders as $dayheader) {
-    echo '<th>'.$dayheader.'</th>';
-}
-?>
-</tr>
-<?php
-$Calendar->build();
-while ($Day = $Calendar->fetch()) {
-    if ($Day->isFirst()) {
-        echo "<tr>\n";
-    }
-    if ($Day->isEmpty()) {
-        echo '<td>&nbsp;</td>';
-    } else {
-        echo '<td>'.$Day->thisDay().'</td>';
-    }
-    if ($Day->isLast()) {
-        echo "</tr>\n";
-    }
-}
-?>
-</table>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/3.php b/airtime_mvc/library/pear/Calendar/docs/examples/3.php
deleted file mode 100644
index f92dcbbc9..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/3.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
-* Description: Performs same behaviour as 2.php but uses Month::buildWeekDays()
-* and is faster
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build the month
-$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-
-// Construct strings for next/previous links
-$PMonth = $Month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $Month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-</style>
-</head>
-
-<body>
-
-<?php
-$selectedDays = array (
-    new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']),
-    new Calendar_Day($_GET['y'],12,25),
-    );
-
-// Build the days in the month
-$Month->build($selectedDays);
-?>
-<h2>Built with Calendar_Month_Weekday::build()</h2>
-<table class="calendar">
-<caption>
-<?php echo ( date('F Y',$Month->getTimeStamp())); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ( $Day = $Month->fetch() ) {
-
-    // Build a link string for each day
-    $link = $_SERVER['PHP_SELF'].
-                '?y='.$Day->thisYear().
-                '&m='.$Day->thisMonth().
-                '&d='.$Day->thisDay();
-
-    // isFirst() to find start of week
-    if ( $Day->isFirst() )
-        echo ( "<tr>\n" );
-
-    if ( $Day->isSelected() ) {
-       echo ( "<td class=\"selected\">".$Day->thisDay()."</td>\n" );
-    } else if ( $Day->isEmpty() ) {
-        echo ( "<td>&nbsp;</td>\n" );
-    } else {
-        echo ( "<td><a href=\"".$link."\">".$Day->thisDay()."</a></td>\n" );
-    }
-
-    // isLast() to find end of week
-    if ( $Day->isLast() )
-        echo ( "</tr>\n" );
-}
-?>
-<tr>
-<td>
-<a href="<?php echo ($prev);?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo ($next);?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/3.phps b/airtime_mvc/library/pear/Calendar/docs/examples/3.phps
deleted file mode 100644
index f92dcbbc9..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/3.phps
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
-* Description: Performs same behaviour as 2.php but uses Month::buildWeekDays()
-* and is faster
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('m');
-if (!isset($_GET['d'])) $_GET['d'] = date('d');
-
-// Build the month
-$Month = new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-
-// Construct strings for next/previous links
-$PMonth = $Month->prevMonth('object'); // Get previous month as object
-$prev = $_SERVER['PHP_SELF'].'?y='.$PMonth->thisYear().'&m='.$PMonth->thisMonth().'&d='.$PMonth->thisDay();
-$NMonth = $Month->nextMonth('object');
-$next = $_SERVER['PHP_SELF'].'?y='.$NMonth->thisYear().'&m='.$NMonth->thisMonth().'&d='.$NMonth->thisDay();
-?>
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar </title>
-<style text="text/css">
-table {
-    background-color: silver;
-}
-caption {
-    font-family: verdana;
-    font-size: 12px;
-    background-color: while;
-}
-.prevMonth {
-    font-size: 10px;
-    text-align: left;
-}
-.nextMonth {
-    font-size: 10px;
-    text-align: right;
-}
-th {
-    font-family: verdana;
-    font-size: 11px;
-    color: navy;
-    text-align: right;
-}
-td {
-    font-family: verdana;
-    font-size: 11px;
-    text-align: right;
-}
-.selected {
-    background-color: yellow;
-}
-</style>
-</head>
-
-<body>
-
-<?php
-$selectedDays = array (
-    new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']),
-    new Calendar_Day($_GET['y'],12,25),
-    );
-
-// Build the days in the month
-$Month->build($selectedDays);
-?>
-<h2>Built with Calendar_Month_Weekday::build()</h2>
-<table class="calendar">
-<caption>
-<?php echo ( date('F Y',$Month->getTimeStamp())); ?>
-</caption>
-<tr>
-<th>M</th>
-<th>T</th>
-<th>W</th>
-<th>T</th>
-<th>F</th>
-<th>S</th>
-<th>S</th>
-</tr>
-<?php
-while ( $Day = $Month->fetch() ) {
-
-    // Build a link string for each day
-    $link = $_SERVER['PHP_SELF'].
-                '?y='.$Day->thisYear().
-                '&m='.$Day->thisMonth().
-                '&d='.$Day->thisDay();
-
-    // isFirst() to find start of week
-    if ( $Day->isFirst() )
-        echo ( "<tr>\n" );
-
-    if ( $Day->isSelected() ) {
-       echo ( "<td class=\"selected\">".$Day->thisDay()."</td>\n" );
-    } else if ( $Day->isEmpty() ) {
-        echo ( "<td>&nbsp;</td>\n" );
-    } else {
-        echo ( "<td><a href=\"".$link."\">".$Day->thisDay()."</a></td>\n" );
-    }
-
-    // isLast() to find end of week
-    if ( $Day->isLast() )
-        echo ( "</tr>\n" );
-}
-?>
-<tr>
-<td>
-<a href="<?php echo ($prev);?>" class="prevMonth"><< </a>
-</td>
-<td colspan="5">&nbsp;</td>
-<td>
-<a href="<?php echo ($next);?>" class="nextMonth"> >></a>
-</td>
-</tr>
-</table>
-<?php
-echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' );
-?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/4.php b/airtime_mvc/library/pear/Calendar/docs/examples/4.php
deleted file mode 100644
index 034813ee3..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-* Description: shows how to perform validation with PEAR::Calendar
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(' ', microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Second.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-if (!isset($_GET['d'])) $_GET['d'] = date('j');
-if (!isset($_GET['h'])) $_GET['h'] = date('H');
-if (!isset($_GET['i'])) $_GET['i'] = date('i');
-if (!isset($_GET['s'])) $_GET['s'] = date('s');
-
-$Unit = & new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
-
-echo '<p><b>Result:</b> '.$Unit->thisYear().'-'.$Unit->thisMonth().'-'.$Unit->thisDay().
-        ' '.$Unit->thisHour().':'.$Unit->thisMinute().':'.$Unit->thisSecond();
-if ($Unit->isValid()) {
-    echo ' is valid!</p>';
-} else {
-    $V= & $Unit->getValidator();
-    echo ' is invalid:</p>';
-    while ($error = $V->fetch()) {
-        echo $error->toString() .'<br />';
-    }
-}
-?>
-<p>Enter a date / time to validate:</p>
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get">
-Year:   <input type="text" name="y" value="2039"><br />
-Month:  <input type="text" name="m" value="13"><br />
-Day:    <input type="text" name="d" value="32"><br />
-Hour:   <input type="text" name="h" value="24"><br />
-Minute: <input type="text" name="i" value="-1"><br />
-Second: <input type="text" name="s" value="60"><br />
-<input type="submit" value="Validate">
-</form>
-<p><b>Note:</b> Error messages can be controlled with the constants <code>CALENDAR_VALUE_TOOSMALL</code> and <code>CALENDAR_VALUE_TOOLARGE</code> - see <code>Calendar_Validator.php</code></p>
-
-<?php echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>'; ?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/4.phps b/airtime_mvc/library/pear/Calendar/docs/examples/4.phps
deleted file mode 100644
index 034813ee3..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/4.phps
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
-* Description: shows how to perform validation with PEAR::Calendar
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(' ', microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT', '../../');
-}
-require_once CALENDAR_ROOT.'Second.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-if (!isset($_GET['d'])) $_GET['d'] = date('j');
-if (!isset($_GET['h'])) $_GET['h'] = date('H');
-if (!isset($_GET['i'])) $_GET['i'] = date('i');
-if (!isset($_GET['s'])) $_GET['s'] = date('s');
-
-$Unit = & new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
-
-echo '<p><b>Result:</b> '.$Unit->thisYear().'-'.$Unit->thisMonth().'-'.$Unit->thisDay().
-        ' '.$Unit->thisHour().':'.$Unit->thisMinute().':'.$Unit->thisSecond();
-if ($Unit->isValid()) {
-    echo ' is valid!</p>';
-} else {
-    $V= & $Unit->getValidator();
-    echo ' is invalid:</p>';
-    while ($error = $V->fetch()) {
-        echo $error->toString() .'<br />';
-    }
-}
-?>
-<p>Enter a date / time to validate:</p>
-<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get">
-Year:   <input type="text" name="y" value="2039"><br />
-Month:  <input type="text" name="m" value="13"><br />
-Day:    <input type="text" name="d" value="32"><br />
-Hour:   <input type="text" name="h" value="24"><br />
-Minute: <input type="text" name="i" value="-1"><br />
-Second: <input type="text" name="s" value="60"><br />
-<input type="submit" value="Validate">
-</form>
-<p><b>Note:</b> Error messages can be controlled with the constants <code>CALENDAR_VALUE_TOOSMALL</code> and <code>CALENDAR_VALUE_TOOLARGE</code> - see <code>Calendar_Validator.php</code></p>
-
-<?php echo '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>'; ?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/5.php b/airtime_mvc/library/pear/Calendar/docs/examples/5.php
deleted file mode 100644
index ce5ae7e00..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/5.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-* Description: generating elements of a form with PEAR::Calendar, using
-* selections as well as validating the submission
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Year.php';
-require_once CALENDAR_ROOT.'Month.php';
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Hour.php';
-require_once CALENDAR_ROOT.'Minute.php';
-require_once CALENDAR_ROOT.'Second.php';
-
-// Initialize if not set
-if (!isset($_POST['y'])) $_POST['y'] = date('Y');
-if (!isset($_POST['m'])) $_POST['m'] = date('n');
-if (!isset($_POST['d'])) $_POST['d'] = date('j');
-if (!isset($_POST['h'])) $_POST['h'] = date('H');
-if (!isset($_POST['i'])) $_POST['i'] = date('i');
-if (!isset($_POST['s'])) $_POST['s'] = date('s');
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Select and Update </title>
-</head>
-<body>
-<h1>Select and Update</h1>
-<?php
-if ( isset($_POST['update']) ) {
-    $Second = & new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
-    if ( !$Second->isValid() ) {
-        $V= & $Second->getValidator();
-        echo ('<p>Validation failed:</p>' );
-        while ( $error = $V->fetch() ) {
-            echo ( $error->toString() .'<br>' );
-        }
-    } else {
-        echo ('<p>Validation success.</p>' );
-        echo ( '<p>New timestamp is: '.$Second->getTimeStamp().' which could be used to update a database, for example');
-    }
-} else {
-$Year = new Calendar_Year($_POST['y']);
-$Month = new Calendar_Month($_POST['y'],$_POST['m']);
-$Day = new Calendar_Day($_POST['y'],$_POST['m'],$_POST['d']);
-$Hour = new Calendar_Hour($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h']);
-$Minute = new Calendar_Minute($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i']);
-$Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
-?>
-<p><b>Set the alarm clock</p></p>
-<form action="<?php echo ( $_SERVER['PHP_SELF'] ); ?>" method="post">
-Year: <input type="text" name="y" value="<?php echo ( $_POST['y'] ); ?>" size="4">&nbsp;
-Month:<select name="m">
-<?php
-$selection = array($Month);
-$Year->build($selection);
-while ( $Child = & $Year->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisMonth()."\" selected>".$Child->thisMonth()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisMonth()."\">".$Child->thisMonth()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Day:<select name="d">
-<?php
-$selection = array($Day);
-$Month->build($selection);
-while ( $Child = & $Month->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisDay()."\" selected>".$Child->thisDay()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisDay()."\">".$Child->thisDay()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Hour:<select name="h">
-<?php
-$selection = array($Hour);
-$Day->build($selection);
-while ( $Child = & $Day->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisHour()."\" selected>".$Child->thisHour()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisHour()."\">".$Child->thisHour()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Minute:<select name="i">
-<?php
-$selection = array($Minute);
-$Hour->build($selection);
-while ( $Child = & $Hour->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisMinute()."\" selected>".$Child->thisMinute()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisMinute()."\">".$Child->thisMinute()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Second:<select name="s">
-<?php
-$selection = array($Second);
-$Minute->build($selection);
-while ( $Child = & $Minute->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisSecond()."\" selected>".$Child->thisSecond()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisSecond()."\">".$Child->thisSecond()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-<input type="submit" name="update" value="Set Alarm"><br>
-<?php
-}
-?>
-<?php echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' ); ?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/5.phps b/airtime_mvc/library/pear/Calendar/docs/examples/5.phps
deleted file mode 100644
index ce5ae7e00..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/5.phps
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
-* Description: generating elements of a form with PEAR::Calendar, using
-* selections as well as validating the submission
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Year.php';
-require_once CALENDAR_ROOT.'Month.php';
-require_once CALENDAR_ROOT.'Day.php';
-require_once CALENDAR_ROOT.'Hour.php';
-require_once CALENDAR_ROOT.'Minute.php';
-require_once CALENDAR_ROOT.'Second.php';
-
-// Initialize if not set
-if (!isset($_POST['y'])) $_POST['y'] = date('Y');
-if (!isset($_POST['m'])) $_POST['m'] = date('n');
-if (!isset($_POST['d'])) $_POST['d'] = date('j');
-if (!isset($_POST['h'])) $_POST['h'] = date('H');
-if (!isset($_POST['i'])) $_POST['i'] = date('i');
-if (!isset($_POST['s'])) $_POST['s'] = date('s');
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Select and Update </title>
-</head>
-<body>
-<h1>Select and Update</h1>
-<?php
-if ( isset($_POST['update']) ) {
-    $Second = & new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
-    if ( !$Second->isValid() ) {
-        $V= & $Second->getValidator();
-        echo ('<p>Validation failed:</p>' );
-        while ( $error = $V->fetch() ) {
-            echo ( $error->toString() .'<br>' );
-        }
-    } else {
-        echo ('<p>Validation success.</p>' );
-        echo ( '<p>New timestamp is: '.$Second->getTimeStamp().' which could be used to update a database, for example');
-    }
-} else {
-$Year = new Calendar_Year($_POST['y']);
-$Month = new Calendar_Month($_POST['y'],$_POST['m']);
-$Day = new Calendar_Day($_POST['y'],$_POST['m'],$_POST['d']);
-$Hour = new Calendar_Hour($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h']);
-$Minute = new Calendar_Minute($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i']);
-$Second = new Calendar_Second($_POST['y'],$_POST['m'],$_POST['d'],$_POST['h'],$_POST['i'],$_POST['s']);
-?>
-<p><b>Set the alarm clock</p></p>
-<form action="<?php echo ( $_SERVER['PHP_SELF'] ); ?>" method="post">
-Year: <input type="text" name="y" value="<?php echo ( $_POST['y'] ); ?>" size="4">&nbsp;
-Month:<select name="m">
-<?php
-$selection = array($Month);
-$Year->build($selection);
-while ( $Child = & $Year->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisMonth()."\" selected>".$Child->thisMonth()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisMonth()."\">".$Child->thisMonth()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Day:<select name="d">
-<?php
-$selection = array($Day);
-$Month->build($selection);
-while ( $Child = & $Month->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisDay()."\" selected>".$Child->thisDay()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisDay()."\">".$Child->thisDay()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Hour:<select name="h">
-<?php
-$selection = array($Hour);
-$Day->build($selection);
-while ( $Child = & $Day->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisHour()."\" selected>".$Child->thisHour()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisHour()."\">".$Child->thisHour()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Minute:<select name="i">
-<?php
-$selection = array($Minute);
-$Hour->build($selection);
-while ( $Child = & $Hour->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisMinute()."\" selected>".$Child->thisMinute()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisMinute()."\">".$Child->thisMinute()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-Second:<select name="s">
-<?php
-$selection = array($Second);
-$Minute->build($selection);
-while ( $Child = & $Minute->fetch() ) {
-    if ( $Child->isSelected() ) {
-        echo ( "<option value=\"".$Child->thisSecond()."\" selected>".$Child->thisSecond()."\n" );
-    } else {
-        echo ( "<option value=\"".$Child->thisSecond()."\">".$Child->thisSecond()."\n" );
-    }
-}
-?>
-</select>&nbsp;
-<input type="submit" name="update" value="Set Alarm"><br>
-<?php
-}
-?>
-<?php echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' ); ?>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/6.php b/airtime_mvc/library/pear/Calendar/docs/examples/6.php
deleted file mode 100644
index 591c05d7e..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/6.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
-* Description: A "personal planner" with some WML for fun
-* Note this is done the stupid way - a giant if/else for WML or HTML
-* could be greatly simplified with some HTML/WML rendering classes...
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-if (!isset($_GET['d'])) $_GET['d'] = date('j');
-
-$Month = & new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-$Day = & new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-$selection = array($Day);
-
-#-----------------------------------------------------------------------------#
-if ( isset($_GET['mime']) && $_GET['mime']=='wml' ) {
-    header ('Content-Type: text/vnd.wap.wml');
-    echo ( '<?xml version="1.0"?>' );
-?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-<wml>
-<big><strong>Personal Planner Rendered with WML</strong></big>
-<?php
-if ( isset($_GET['viewday']) ) {
-?>
-<p><strong>Viewing <?php echo ( date('l, jS of F, Y',$Day->getTimeStamp()) ); ?></strong></p>
-<p>
-<anchor>
-Back to Month View
-<go href="<?php
-echo ( "?y=".$Day->thisYear()."&amp;m=".
-        $Day->thisMonth()."&amp;d=".$Day->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</p>
-<table>
-<?php
-    $Day->build();
-    while ( $Hour = & $Day->fetch() ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>".date('g a',$Hour->getTimeStamp())."</td><td>Free time!</td>\n" );
-        echo ( "</tr>\n" );
-    }
-?>
-</table>
-<?php
-} else {
-?>
-<p><strong><?php echo ( date('F Y',$Month->getTimeStamp()) ); ?></strong></p>
-<table>
-<tr>
-<td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td><td>S</td>
-</tr>
-<?php
-$Month->build($selection);
-while ( $Day = $Month->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td></td>\n" );
-    } else if ( $Day->isSelected() ) {
-        echo ( "<td><anchor><strong><u>".$Day->thisDay()."</u></strong>\n<go href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;mime=wml\" />\n</anchor></td>\n" );
-    } else {
-        echo ( "<td><anchor>".$Day->thisDay()."\n<go href=\"?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;mime=wml\" /></anchor></td>\n" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "</tr>\n" );
-    }
-}
-?>
-<tr>
-<td>
-<anchor>
-&lt;&lt;
-<go href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->prevMonth()."&amp;d=".$Month->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</td>
-<td></td><td></td><td></td><td></td><td></td>
-<td>
-<anchor>
-&gt;&gt;
-<go href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->nextMonth()."&amp;d=".$Month->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</td>
-</tr>
-</table>
-
-<?php
-}
-?>
-<p><a href="<?php echo ( $_SERVER['PHP_SELF'] ); ?>">Back to HTML</a></p>
-<?php echo ( '<p>Took: '.(getmicrotime()-$start).' seconds</p>' ); ?>
-</wml>
-<?php
-#-----------------------------------------------------------------------------#
-} else {
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> HTML (+WML) Personal Planner </title>
-</head>
-<body>
-<h1>Personal Planner Rendered with HTML</h1>
-<p>To view in WML, click <a href="<?php echo ( $_SERVER['PHP_SELF'] ); ?>?mime=wml">here</a> or place a ?mime=wml at the end of any URL.
-Note that <a href="http://www.opera.com/download">Opera</a> supports WML natively and Mozilla / Firefox has the WMLBrowser
-plugin: <a href="http://wmlbrowser.mozdev.org">wmlbrowser.mozdev.org</a></p>
-<?php
-if ( isset($_GET['viewday']) ) {
-?>
-<p><strong>Viewing <?php echo ( date('l, jS of F, Y',$Day->getTimeStamp()) ); ?></strong></p>
-<p>
-<anchor>
-<a href="<?php
-echo ( "?y=".$Day->thisYear()."&amp;m=".
-        $Day->thisMonth()."&amp;d=".$Day->thisDay());
-?>">Back to Month View</a>
-</p>
-<table>
-<?php
-    $Day->build();
-    while ( $Hour = & $Day->fetch() ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>".date('g a',$Hour->getTimeStamp())."</td><td>Free time!</td>\n" );
-        echo ( "</tr>\n" );
-    }
-?>
-</table>
-<?php
-} else {
-?>
-<p><strong><?php echo ( date('F Y',$Month->getTimeStamp()) ); ?></strong></p>
-<table>
-<tr>
-<td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td><td>S</td>
-</tr>
-<?php
-$Month->build($selection);
-while ( $Day = $Month->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td></td>\n" );
-    } else if ( $Day->isSelected() ) {
-        echo ( "<td><a href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;wml\"><strong><u>".$Day->thisDay()."</u></strong></a></td>\n" );
-    } else {
-        echo ( "<td><a href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "\">".$Day->thisDay()."</a></td>\n" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "</tr>\n" );
-    }
-}
-?>
-<tr>
-<td>
-<a href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->prevMonth()."&amp;d=".$Month->thisDay() );
-?>">
-&lt;&lt;</a>
-</td>
-<td></td><td></td><td></td><td></td><td></td>
-<td>
-<a href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->nextMonth()."&amp;d=".$Month->thisDay() );
-?>">&gt;&gt;</a>
-</td>
-</tr>
-</table>
-
-<?php
-}
-?>
-
-
-<?php echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' ); ?>
-</body>
-</html>
-<?php
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/6.phps b/airtime_mvc/library/pear/Calendar/docs/examples/6.phps
deleted file mode 100644
index 591c05d7e..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/6.phps
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
-* Description: A "personal planner" with some WML for fun
-* Note this is done the stupid way - a giant if/else for WML or HTML
-* could be greatly simplified with some HTML/WML rendering classes...
-*/
-function getmicrotime(){
-    list($usec, $sec) = explode(" ",microtime());
-    return ((float)$usec + (float)$sec);
-}
-$start = getmicrotime();
-
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Month/Weekdays.php';
-require_once CALENDAR_ROOT.'Day.php';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-if (!isset($_GET['d'])) $_GET['d'] = date('j');
-
-$Month = & new Calendar_Month_Weekdays($_GET['y'],$_GET['m']);
-$Day = & new Calendar_Day($_GET['y'],$_GET['m'],$_GET['d']);
-$selection = array($Day);
-
-#-----------------------------------------------------------------------------#
-if ( isset($_GET['mime']) && $_GET['mime']=='wml' ) {
-    header ('Content-Type: text/vnd.wap.wml');
-    echo ( '<?xml version="1.0"?>' );
-?>
-<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-<wml>
-<big><strong>Personal Planner Rendered with WML</strong></big>
-<?php
-if ( isset($_GET['viewday']) ) {
-?>
-<p><strong>Viewing <?php echo ( date('l, jS of F, Y',$Day->getTimeStamp()) ); ?></strong></p>
-<p>
-<anchor>
-Back to Month View
-<go href="<?php
-echo ( "?y=".$Day->thisYear()."&amp;m=".
-        $Day->thisMonth()."&amp;d=".$Day->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</p>
-<table>
-<?php
-    $Day->build();
-    while ( $Hour = & $Day->fetch() ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>".date('g a',$Hour->getTimeStamp())."</td><td>Free time!</td>\n" );
-        echo ( "</tr>\n" );
-    }
-?>
-</table>
-<?php
-} else {
-?>
-<p><strong><?php echo ( date('F Y',$Month->getTimeStamp()) ); ?></strong></p>
-<table>
-<tr>
-<td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td><td>S</td>
-</tr>
-<?php
-$Month->build($selection);
-while ( $Day = $Month->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td></td>\n" );
-    } else if ( $Day->isSelected() ) {
-        echo ( "<td><anchor><strong><u>".$Day->thisDay()."</u></strong>\n<go href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;mime=wml\" />\n</anchor></td>\n" );
-    } else {
-        echo ( "<td><anchor>".$Day->thisDay()."\n<go href=\"?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;mime=wml\" /></anchor></td>\n" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "</tr>\n" );
-    }
-}
-?>
-<tr>
-<td>
-<anchor>
-&lt;&lt;
-<go href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->prevMonth()."&amp;d=".$Month->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</td>
-<td></td><td></td><td></td><td></td><td></td>
-<td>
-<anchor>
-&gt;&gt;
-<go href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->nextMonth()."&amp;d=".$Month->thisDay()."&amp;mime=wml" );
-?>"/>
-</anchor>
-</td>
-</tr>
-</table>
-
-<?php
-}
-?>
-<p><a href="<?php echo ( $_SERVER['PHP_SELF'] ); ?>">Back to HTML</a></p>
-<?php echo ( '<p>Took: '.(getmicrotime()-$start).' seconds</p>' ); ?>
-</wml>
-<?php
-#-----------------------------------------------------------------------------#
-} else {
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> HTML (+WML) Personal Planner </title>
-</head>
-<body>
-<h1>Personal Planner Rendered with HTML</h1>
-<p>To view in WML, click <a href="<?php echo ( $_SERVER['PHP_SELF'] ); ?>?mime=wml">here</a> or place a ?mime=wml at the end of any URL.
-Note that <a href="http://www.opera.com/download">Opera</a> supports WML natively and Mozilla / Firefox has the WMLBrowser
-plugin: <a href="http://wmlbrowser.mozdev.org">wmlbrowser.mozdev.org</a></p>
-<?php
-if ( isset($_GET['viewday']) ) {
-?>
-<p><strong>Viewing <?php echo ( date('l, jS of F, Y',$Day->getTimeStamp()) ); ?></strong></p>
-<p>
-<anchor>
-<a href="<?php
-echo ( "?y=".$Day->thisYear()."&amp;m=".
-        $Day->thisMonth()."&amp;d=".$Day->thisDay());
-?>">Back to Month View</a>
-</p>
-<table>
-<?php
-    $Day->build();
-    while ( $Hour = & $Day->fetch() ) {
-        echo ( "<tr>\n" );
-        echo ( "<td>".date('g a',$Hour->getTimeStamp())."</td><td>Free time!</td>\n" );
-        echo ( "</tr>\n" );
-    }
-?>
-</table>
-<?php
-} else {
-?>
-<p><strong><?php echo ( date('F Y',$Month->getTimeStamp()) ); ?></strong></p>
-<table>
-<tr>
-<td>M</td><td>T</td><td>W</td><td>T</td><td>F</td><td>S</td><td>S</td>
-</tr>
-<?php
-$Month->build($selection);
-while ( $Day = $Month->fetch() ) {
-    if ( $Day->isFirst() ) {
-        echo ( "<tr>\n" );
-    }
-    if ( $Day->isEmpty() ) {
-        echo ( "<td></td>\n" );
-    } else if ( $Day->isSelected() ) {
-        echo ( "<td><a href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "&amp;wml\"><strong><u>".$Day->thisDay()."</u></strong></a></td>\n" );
-    } else {
-        echo ( "<td><a href=\"".$_SERVER['PHP_SELF']."?viewday=true&amp;y=".
-            $Day->thisYear()."&amp;m=".$Day->thisMonth()."&amp;d=".$Day->thisDay().
-            "\">".$Day->thisDay()."</a></td>\n" );
-    }
-    if ( $Day->isLast() ) {
-        echo ( "</tr>\n" );
-    }
-}
-?>
-<tr>
-<td>
-<a href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->prevMonth()."&amp;d=".$Month->thisDay() );
-?>">
-&lt;&lt;</a>
-</td>
-<td></td><td></td><td></td><td></td><td></td>
-<td>
-<a href="<?php
-echo ( "?y=".$Month->thisYear()."&amp;m=".
-        $Month->nextMonth()."&amp;d=".$Month->thisDay() );
-?>">&gt;&gt;</a>
-</td>
-</tr>
-</table>
-
-<?php
-}
-?>
-
-
-<?php echo ( '<p><b>Took: '.(getmicrotime()-$start).' seconds</b></p>' ); ?>
-</body>
-</html>
-<?php
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/7.php b/airtime_mvc/library/pear/Calendar/docs/examples/7.php
deleted file mode 100644
index bdffd956c..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/7.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-* Description: a SOAP Calendar Server
-*/
-if (!@include('SOAP'.DIRECTORY_SEPARATOR.'Server.php')) {
-    die('You must have PEAR::SOAP installed');
-}
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-
-class Calendar_Server
-{
-    var $__dispatch_map = array();
-    var $__typedef      = array();
-
-    function Calendar_Server()
-    {
-        $this->__dispatch_map['getMonth'] =
-            array('in'  => array('year' => 'int', 'month'=>'int'),
-                  'out' => array('month' => '{urn:PEAR_SOAP_Calendar}Month'),
-                  );
-        $this->__typedef['Month'] = array (
-                'monthname' => 'string',
-                'days' => '{urn:PEAR_SOAP_Calendar}MonthDays'
-            );
-        $this->__typedef['MonthDays'] = array (array ('{urn:PEAR_SOAP_Calendar}Day'));
-        $this->__typedef['Day'] = array (
-                'isFirst' => 'int',
-                'isLast'  => 'int',
-                'isEmpty' => 'int',
-                'day'     => 'int' );
-    }
-
-    function __dispatch($methodname)
-    {
-        if (isset($this->__dispatch_map[$methodname]))
-            return $this->__dispatch_map[$methodname];
-        return NULL;
-    }
-
-    function getMonth($year, $month)
-    {
-        require_once(CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php');
-        $Month = & new Calendar_Month_Weekdays($year,$month);
-        if (!$Month->isValid()) {
-            $V = & $Month->getValidator();
-            $errorMsg = '';
-            while ($error = $V->fetch()) {
-                $errorMsg .= $error->toString()."\n";
-            }
-            return new SOAP_Fault($errorMsg, 'Client');
-        } else {
-            $monthname = date('F Y', $Month->getTimeStamp());
-            $days = array();
-            $Month->build();
-            while ($Day = & $Month->fetch()) {
-                $day = array(
-                    'isFirst' => (int)$Day->isFirst(),
-                    'isLast'  => (int)$Day->isLast(),
-                    'isEmpty' => (int)$Day->isEmpty(),
-                    'day'     => (int)$Day->thisDay(),
-                    );
-                $days[] = $day;
-            }
-            return array('monthname' => $monthname, 'days' => $days);
-        }
-    }
-}
-
-$server = new SOAP_Server();
-$server->_auto_translation = true;
-$calendar = new Calendar_Server();
-$server->addObjectMap($calendar, 'urn:PEAR_SOAP_Calendar');
-
-if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') {
-    $server->service($GLOBALS['HTTP_RAW_POST_DATA']);
-} else {
-    require_once 'SOAP'.DIRECTORY_SEPARATOR.'Disco.php';
-    $disco = new SOAP_DISCO_Server($server, "PEAR_SOAP_Calendar");
-    if (isset($_SERVER['QUERY_STRING']) &&
-        strcasecmp($_SERVER['QUERY_STRING'], 'wsdl')==0) {
-        header("Content-type: text/xml");
-        echo $disco->getWSDL();
-    } else {
-        echo 'This is a PEAR::SOAP Calendar Server. For client try <a href="8.php">here</a><br />';
-        echo 'For WSDL try <a href="?wsdl">here</a>';
-    }
-    exit;
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/7.phps b/airtime_mvc/library/pear/Calendar/docs/examples/7.phps
deleted file mode 100644
index bdffd956c..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/7.phps
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
-* Description: a SOAP Calendar Server
-*/
-if (!@include('SOAP'.DIRECTORY_SEPARATOR.'Server.php')) {
-    die('You must have PEAR::SOAP installed');
-}
-
-if (!@include 'Calendar'.DIRECTORY_SEPARATOR.'Calendar.php') {
-    define('CALENDAR_ROOT', '../../');
-}
-
-class Calendar_Server
-{
-    var $__dispatch_map = array();
-    var $__typedef      = array();
-
-    function Calendar_Server()
-    {
-        $this->__dispatch_map['getMonth'] =
-            array('in'  => array('year' => 'int', 'month'=>'int'),
-                  'out' => array('month' => '{urn:PEAR_SOAP_Calendar}Month'),
-                  );
-        $this->__typedef['Month'] = array (
-                'monthname' => 'string',
-                'days' => '{urn:PEAR_SOAP_Calendar}MonthDays'
-            );
-        $this->__typedef['MonthDays'] = array (array ('{urn:PEAR_SOAP_Calendar}Day'));
-        $this->__typedef['Day'] = array (
-                'isFirst' => 'int',
-                'isLast'  => 'int',
-                'isEmpty' => 'int',
-                'day'     => 'int' );
-    }
-
-    function __dispatch($methodname)
-    {
-        if (isset($this->__dispatch_map[$methodname]))
-            return $this->__dispatch_map[$methodname];
-        return NULL;
-    }
-
-    function getMonth($year, $month)
-    {
-        require_once(CALENDAR_ROOT.'Month'.DIRECTORY_SEPARATOR.'Weekdays.php');
-        $Month = & new Calendar_Month_Weekdays($year,$month);
-        if (!$Month->isValid()) {
-            $V = & $Month->getValidator();
-            $errorMsg = '';
-            while ($error = $V->fetch()) {
-                $errorMsg .= $error->toString()."\n";
-            }
-            return new SOAP_Fault($errorMsg, 'Client');
-        } else {
-            $monthname = date('F Y', $Month->getTimeStamp());
-            $days = array();
-            $Month->build();
-            while ($Day = & $Month->fetch()) {
-                $day = array(
-                    'isFirst' => (int)$Day->isFirst(),
-                    'isLast'  => (int)$Day->isLast(),
-                    'isEmpty' => (int)$Day->isEmpty(),
-                    'day'     => (int)$Day->thisDay(),
-                    );
-                $days[] = $day;
-            }
-            return array('monthname' => $monthname, 'days' => $days);
-        }
-    }
-}
-
-$server = new SOAP_Server();
-$server->_auto_translation = true;
-$calendar = new Calendar_Server();
-$server->addObjectMap($calendar, 'urn:PEAR_SOAP_Calendar');
-
-if (strtoupper($_SERVER['REQUEST_METHOD'])=='POST') {
-    $server->service($GLOBALS['HTTP_RAW_POST_DATA']);
-} else {
-    require_once 'SOAP'.DIRECTORY_SEPARATOR.'Disco.php';
-    $disco = new SOAP_DISCO_Server($server, "PEAR_SOAP_Calendar");
-    if (isset($_SERVER['QUERY_STRING']) &&
-        strcasecmp($_SERVER['QUERY_STRING'], 'wsdl')==0) {
-        header("Content-type: text/xml");
-        echo $disco->getWSDL();
-    } else {
-        echo 'This is a PEAR::SOAP Calendar Server. For client try <a href="8.php">here</a><br />';
-        echo 'For WSDL try <a href="?wsdl">here</a>';
-    }
-    exit;
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/8.php b/airtime_mvc/library/pear/Calendar/docs/examples/8.php
deleted file mode 100644
index f84887953..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/8.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Description: client for the SOAP Calendar Server
- */
-if ( version_compare(phpversion(), "5.0.0", ">") ) {
-    die('PHP 5 has problems with PEAR::SOAP Client (8.0RC3)
-        - remove @ before include below to see why');
-}
-
-if (!@include('SOAP'.DIRECTORY_SEPARATOR.'Client.php')) {
-    die('You must have PEAR::SOAP installed');
-}
-
-// Just to save manaul modification...
-$basePath = explode('/', $_SERVER['SCRIPT_NAME']);
-array_pop($basePath);
-$basePath = implode('/', $basePath);
-$url = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-
-$wsdl = new SOAP_WSDL ($url);
-
-echo ( '<pre>'.$wsdl->generateProxyCode().'</pre>' );
-
-$calendarClient = $wsdl->getProxy();
-
-$month = $calendarClient->getMonth((int)$_GET['y'],(int)$_GET['m']);
-
-if ( PEAR::isError($month) ) {
-    die ( $month->toString() );
-}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar over the Wire </title>
-</head>
-<body>
-<h1>Calendar Over the Wire (featuring PEAR::SOAP)</h1>
-<table>
-<caption><b><?php echo ( $month->monthname );?></b></caption>
-<tr>
-<th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>
-</tr>
-<?php
-foreach ( $month->days as $day ) {
-
-    if ( $day->isFirst === 1 )
-        echo ( "<tr>\n" );
-    if ( $day->isEmpty === 1 ) {
-        echo ( "<td></td>" );
-    } else {
-        echo ( "<td>".$day->day."</td>" );
-    }
-    if ( $day->isLast === 1 )
-        echo ( "</tr>\n" );
-}
-?>
-<tr>
-</table>
-<p>Enter Year and Month to View:</p>
-<form action="<?php echo ( $_SERVER['PHP_SELF'] ); ?>" method="get">
-Year: <input type="text" size="4" name="y" value="<?php echo ( $_GET['y'] ); ?>">&nbsp;
-Month: <input type="text" size="2" name="m" value="<?php echo ( $_GET['m'] ); ?>">&nbsp;
-<input type="submit" value="Fetch Calendar">
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/8.phps b/airtime_mvc/library/pear/Calendar/docs/examples/8.phps
deleted file mode 100644
index f84887953..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/8.phps
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Description: client for the SOAP Calendar Server
- */
-if ( version_compare(phpversion(), "5.0.0", ">") ) {
-    die('PHP 5 has problems with PEAR::SOAP Client (8.0RC3)
-        - remove @ before include below to see why');
-}
-
-if (!@include('SOAP'.DIRECTORY_SEPARATOR.'Client.php')) {
-    die('You must have PEAR::SOAP installed');
-}
-
-// Just to save manaul modification...
-$basePath = explode('/', $_SERVER['SCRIPT_NAME']);
-array_pop($basePath);
-$basePath = implode('/', $basePath);
-$url = 'http://'.$_SERVER['SERVER_NAME'].$basePath.'/7.php?wsdl';
-
-if (!isset($_GET['y'])) $_GET['y'] = date('Y');
-if (!isset($_GET['m'])) $_GET['m'] = date('n');
-
-$wsdl = new SOAP_WSDL ($url);
-
-echo ( '<pre>'.$wsdl->generateProxyCode().'</pre>' );
-
-$calendarClient = $wsdl->getProxy();
-
-$month = $calendarClient->getMonth((int)$_GET['y'],(int)$_GET['m']);
-
-if ( PEAR::isError($month) ) {
-    die ( $month->toString() );
-}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> Calendar over the Wire </title>
-</head>
-<body>
-<h1>Calendar Over the Wire (featuring PEAR::SOAP)</h1>
-<table>
-<caption><b><?php echo ( $month->monthname );?></b></caption>
-<tr>
-<th>M</th><th>T</th><th>W</th><th>T</th><th>F</th><th>S</th><th>S</th>
-</tr>
-<?php
-foreach ( $month->days as $day ) {
-
-    if ( $day->isFirst === 1 )
-        echo ( "<tr>\n" );
-    if ( $day->isEmpty === 1 ) {
-        echo ( "<td></td>" );
-    } else {
-        echo ( "<td>".$day->day."</td>" );
-    }
-    if ( $day->isLast === 1 )
-        echo ( "</tr>\n" );
-}
-?>
-<tr>
-</table>
-<p>Enter Year and Month to View:</p>
-<form action="<?php echo ( $_SERVER['PHP_SELF'] ); ?>" method="get">
-Year: <input type="text" size="4" name="y" value="<?php echo ( $_GET['y'] ); ?>">&nbsp;
-Month: <input type="text" size="2" name="m" value="<?php echo ( $_GET['m'] ); ?>">&nbsp;
-<input type="submit" value="Fetch Calendar">
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/9.php b/airtime_mvc/library/pear/Calendar/docs/examples/9.php
deleted file mode 100644
index 4b6a937a4..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/9.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
-* Description: simple example on i18N
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-
-$Day = & new Calendar_Day(2003,10,23);
-
-setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo ( strftime('%A %d %B %Y',$Day->getTimeStamp()));
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/9.phps b/airtime_mvc/library/pear/Calendar/docs/examples/9.phps
deleted file mode 100644
index 4b6a937a4..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/9.phps
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
-* Description: simple example on i18N
-*/
-if ( !@include 'Calendar/Calendar.php' ) {
-    define('CALENDAR_ROOT','../../');
-}
-require_once CALENDAR_ROOT.'Day.php';
-
-$Day = & new Calendar_Day(2003,10,23);
-
-setlocale (LC_TIME, "de_DE"); // Unix based (probably)
-// setlocale (LC_TIME, "ge"); // Windows
-
-echo ( strftime('%A %d %B %Y',$Day->getTimeStamp()));
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/docs/examples/index.html b/airtime_mvc/library/pear/Calendar/docs/examples/index.html
deleted file mode 100644
index a68e996eb..000000000
--- a/airtime_mvc/library/pear/Calendar/docs/examples/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <title>PEAR::Calendar Examples</title>
-  <style type="text/css">
-  body {
-     font-family: georgia, serif;
-  }
-  pre {
-     background-color: silver;
-  }
-  code {
-     color: navy;
-     background-color: #e2e3e4;
-  }
-  </style>
-</head>
-
-<body>
-<h1>PEAR::Calendar Examples</h1>
-<p>$Id: index.html 166574 2004-08-17 09:10:53Z hfuecks $</p>
-<ul>
-<li><a href="1.php">1.php</a> [<a href="1.phps">src</a>] - shows basic usage, passing all the way down from <code>Calendar_Year</code> to <code>Calendar_Second</code> - more of a quick test it's working</li>
-<li><a href="2.php">2.php</a> [<a href="2.phps">src</a>] - shows how to build a tabular month using <code>Calendar_Month_Weeks</code>, <code>Calendar_Week</code>, <code>Calendar_Day</code> as well as selecting some dates.</li>
-<li><a href="3.php">3.php</a> [<a href="3.phps">src</a>] - shows how to build a tabular month using <code>Calendar_Month_Weekdays</code> and <code>Calendar_Day</code>, as well as selecting some dates (this method is faster).</li>
-<li><a href="4.php">4.php</a> [<a href="4.phps">src</a>] - shows how to use PEAR::Calendar for validation.</li>
-<li><a href="5.php">5.php</a> [<a href="5.phps">src</a>] - shows PEAR::Calendar in use to help generate a form.</li>
-<li><a href="6.php">6.php</a> [<a href="6.phps">src</a>] - a month and day "planner" calendar, which can be rendered both as HTML and WML.</li>
-<li><a href="7.php">7.php</a> [<a href="7.phps">src</a>] - a simple SOAP Calendar Server, using PEAR::SOAP and PEAR::Calendar</li>
-<li><a href="8.php">8.php</a> [<a href="8.phps">src</a>] - a WSDL SOAP client for the SOAP Calendar Server</li>
-<li><a href="9.php">9.php</a> [<a href="9.phps">src</a>] - quick example of i18n with <code>setlocale</code> (not working on SF)</li>
-<li><a href="10.php">10.php</a> [<a href="10.phps">src</a>] - an example of extending <code>Calendar_Decorator</code> to modify output</li>
-<li><a href="11.php">11.php</a> [<a href="11.phps">src</a>] - attaching a "payload" (e.g. results of a DB query) to a calendar using <code>Calendar_Decorator</code> to allow the payload to be available inside the main loop.</li>
-<li><a href="12.php">12.php</a> [<a href="12.phps">src</a>] - a complete year with months.</li>
-<li><a href="13.php">13.php</a> [<a href="13.phps">src</a>] - same as 1.php but using <code>Calendar_Engine_PearDate</code>, (see <a href="http://pear.php.net/Date">PEAR::Date</a>).</li>
-<li><a href="14.php">14.php</a> [<a href="14.phps">src</a>] - same as 3.php but using <code>Calendar_Engine_PearDate</code></li>
-<li><a href="15.php">15.php</a> [<a href="15.phps">src</a>] - paging through weeks </li>
-<li><a href="16.php">16.php</a> [<a href="16.phps">src</a>] - example of <code>Calendar_Decorator_Uri</code>. <i>Note</i> you should prefer <code>Calendar_Util_Uri</code> (see below) in most cases, for performance </li>
-<li><a href="17.php">17.php</a> [<a href="17.phps">src</a>] - example of <code>Calendar_Decorator_Textual</code>. <i>Note</i> you should prefer <code>Calendar_Util_Textual</code> (see below) in most cases, for performance</li>
-<li><a href="18.php">18.php</a> [<a href="18.phps">src</a>] - example of <code>Calendar_Decorator_Wrapper</code>.</li>
-<li><a href="19.php">19.php</a> [<a href="19.phps">src</a>] - example of <code>Calendar_Decorator_Weekday</code>.</li>
-<li><a href="20.php">20.php</a> [<a href="20.phps">src</a>] - shows how to attach a "payload" spanning multiple days, with more than one entry per day</li>
-<li><a href="21.php">21.php</a> [<a href="21.phps">src</a>] - same as 12.php but using <code>Calendar_Month_Weeks</code> instead of <code>Calendar_Month_Weekdays</code> to allow the week in the year or week in the month to be displayed.</li>
-<li><a href="22.php">22.php</a> [<a href="22.phps">src</a>] - demonstrates use of <code>Calendar_Util_Uri</code>.</li>
-<li><a href="23.php">23.php</a> [<a href="23.phps">src</a>] - demonstrates use of <code>Calendar_Util_Textual</code>.</li>
-<li><a href="24.php">24.php</a> [<a href="24.phps">src</a>] - <code>Calendar_Decorator_Weekday</code> combined with <code>Calendar_Decorator_Wrapper</code> to decorate days in the month.</li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/README b/airtime_mvc/library/pear/Calendar/tests/README
deleted file mode 100644
index cbae24227..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/README
+++ /dev/null
@@ -1,7 +0,0 @@
-These tests require Simple Test: http://www.lastcraft.com/simple_test.php
-
-Ideally they would use PEAR::PHPUnit but the current version has bugs and
-lacks alot of the functionality (e.g. Mock Objects) which Simple Test
-provides.
-
-Modifying the simple_include.php script for your simple test install dir
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/all_tests.php b/airtime_mvc/library/pear/Calendar/tests/all_tests.php
deleted file mode 100644
index bda396ada..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/all_tests.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// $Id: all_tests.php 166473 2004-08-16 08:55:24Z hfuecks $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-define("TEST_RUNNING", true);
-
-require_once('./calendar_tests.php');
-require_once('./calendar_tabular_tests.php');
-require_once('./validator_tests.php');
-require_once('./calendar_engine_tests.php');
-require_once('./calendar_engine_tests.php');
-require_once('./table_helper_tests.php');
-require_once('./decorator_tests.php');
-require_once('./util_tests.php');
-
-
-class AllTests extends GroupTest {
-    function AllTests() {
-        $this->GroupTest('All PEAR::Calendar Tests');
-        $this->AddTestCase(new CalendarTests());
-        $this->AddTestCase(new CalendarTabularTests());
-        $this->AddTestCase(new ValidatorTests());
-        $this->AddTestCase(new CalendarEngineTests());
-        $this->AddTestCase(new TableHelperTests());
-        $this->AddTestCase(new DecoratorTests());
-        $this->AddTestCase(new UtilTests());
-    }
-}
-
-$test = &new AllTests();
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/calendar_engine_tests.php b/airtime_mvc/library/pear/Calendar/tests/calendar_engine_tests.php
deleted file mode 100644
index f44138189..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/calendar_engine_tests.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// $Id: calendar_engine_tests.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class CalendarEngineTests extends GroupTest {
-    function CalendarEngineTests() {
-        $this->GroupTest('Calendar Engine Tests');
-        $this->addTestFile('peardate_engine_test.php');
-        $this->addTestFile('unixts_engine_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new CalendarEngineTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/calendar_include.php b/airtime_mvc/library/pear/Calendar/tests/calendar_include.php
deleted file mode 100644
index a375eafcf..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/calendar_include.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// $Id: calendar_include.php 166503 2004-08-16 12:56:10Z hfuecks $
-if ( !@include 'Calendar/Calendar.php' ) {
-    @define('CALENDAR_ROOT','../');
-}
-require_once(CALENDAR_ROOT . 'Year.php');
-require_once(CALENDAR_ROOT . 'Month.php');
-require_once(CALENDAR_ROOT . 'Day.php');
-require_once(CALENDAR_ROOT . 'Week.php');
-require_once(CALENDAR_ROOT . 'Hour.php');
-require_once(CALENDAR_ROOT . 'Minute.php');
-require_once(CALENDAR_ROOT . 'Second.php');
-require_once(CALENDAR_ROOT . 'Month.php');
-require_once(CALENDAR_ROOT . 'Decorator.php');
-require_once(CALENDAR_ROOT . 'Month/Weekdays.php');
-require_once(CALENDAR_ROOT . 'Month/Weeks.php');
-require_once(CALENDAR_ROOT . 'Validator.php');
-require_once(CALENDAR_ROOT . 'Engine/Interface.php');
-require_once(CALENDAR_ROOT . 'Engine/UnixTs.php');
-require_once(CALENDAR_ROOT . 'Engine/PearDate.php');
-require_once(CALENDAR_ROOT . 'Table/Helper.php');
-require_once(CALENDAR_ROOT . 'Decorator/Textual.php');
-require_once(CALENDAR_ROOT . 'Decorator/Uri.php');
-require_once(CALENDAR_ROOT . 'Decorator/Weekday.php');
-require_once(CALENDAR_ROOT . 'Decorator/Wrapper.php');
-require_once(CALENDAR_ROOT . 'Util/Uri.php');
-require_once(CALENDAR_ROOT . 'Util/Textual.php');
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/calendar_tabular_tests.php b/airtime_mvc/library/pear/Calendar/tests/calendar_tabular_tests.php
deleted file mode 100644
index 8dbaf4e67..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/calendar_tabular_tests.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// $Id: calendar_tabular_tests.php 198886 2005-10-20 18:59:45Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class CalendarTabularTests extends GroupTest {
-    function CalendarTabularTests() {
-        $this->GroupTest('Calendar Tabular Tests');
-        $this->addTestFile('month_weekdays_test.php');
-        $this->addTestFile('month_weeks_test.php');
-        $this->addTestFile('week_test.php');
-        //$this->addTestFile('week_firstday_0_test.php'); //switch with the above
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new CalendarTabularTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/calendar_test.php b/airtime_mvc/library/pear/Calendar/tests/calendar_test.php
deleted file mode 100644
index 62c6a696c..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/calendar_test.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-// $Id: calendar_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class TestOfCalendar extends UnitTestCase {
-    var $cal;
-    function TestOfCalendar($name='Test of Calendar') {
-        $this->UnitTestCase($name);
-    }
-    function setUp() {
-        $this->cal = new Calendar(2003,10,25,13,32,43);
-    }
-    function tearDown() {
-        unset($this->cal);
-    }
-    function testPrevYear () {
-        $this->assertEqual(2002,$this->cal->prevYear());
-    }
-    function testPrevYear_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2002,
-                'month'  => 1,
-                'day'    => 1,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevYear('array'));
-    }
-    function testThisYear () {
-        $this->assertEqual(2003,$this->cal->thisYear());
-    }
-    function testNextYear () {
-        $this->assertEqual(2004,$this->cal->nextYear());
-    }
-    function testPrevMonth () {
-        $this->assertEqual(9,$this->cal->prevMonth());
-    }
-    function testPrevMonth_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 9,
-                'day'    => 1,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevMonth('array'));
-    }
-    function testThisMonth () {
-        $this->assertEqual(10,$this->cal->thisMonth());
-    }
-    function testNextMonth () {
-        $this->assertEqual(11,$this->cal->nextMonth());
-    }
-    function testPrevDay () {
-        $this->assertEqual(24,$this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 24,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(25,$this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(26,$this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(12,$this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(13,$this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(14,$this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(31,$this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(32,$this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(33,$this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(42,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(43,$this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(44,$this->cal->nextSecond());
-    }
-    function testSetTimeStamp() {
-        $stamp = mktime(13,32,43,10,25,2003);
-        $this->cal->setTimeStamp($stamp);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(13,32,43,10,25,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-    function testIsToday() {
-        $stamp = mktime();
-        $this->cal->setTimestamp($stamp);
-        $this->assertTrue($this->cal->isToday());
-
-        $stamp += 1000000000;
-        $this->cal->setTimestamp($stamp);
-        $this->assertFalse($this->cal->isToday());
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/calendar_tests.php b/airtime_mvc/library/pear/Calendar/tests/calendar_tests.php
deleted file mode 100644
index 09513a307..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/calendar_tests.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// $Id: calendar_tests.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class CalendarTests extends GroupTest {
-    function CalendarTests() {
-        $this->GroupTest('Calendar Tests');
-        $this->addTestFile('calendar_test.php');
-        $this->addTestFile('year_test.php');
-        $this->addTestFile('month_test.php');
-        $this->addTestFile('day_test.php');
-        $this->addTestFile('hour_test.php');
-        $this->addTestFile('minute_test.php');
-        $this->addTestFile('second_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new CalendarTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/day_test.php b/airtime_mvc/library/pear/Calendar/tests/day_test.php
deleted file mode 100644
index a812d4414..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/day_test.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-// $Id: day_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfDay extends TestOfCalendar {
-    function TestOfDay() {
-        $this->UnitTestCase('Test of Day');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Day(2003,10,25);
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 24,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testPrevHour () {
-        $this->assertEqual(23,$this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0,$this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1,$this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59,$this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0,$this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1,$this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0,$this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1,$this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,10,25,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfDayBuild extends TestOfDay {
-    function TestOfDayBuild() {
-        $this->UnitTestCase('Test of Day::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(24,$this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ( $Child = $this->cal->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual(24,$i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Hour.php');
-        $selection = array(new Calendar_Hour(2003,10,25,13));
-        $this->cal->build($selection);
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            if ( $i == 13 )
-                break;
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDay();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfDayBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/decorator_test.php b/airtime_mvc/library/pear/Calendar/tests/decorator_test.php
deleted file mode 100644
index 6c6dd7974..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/decorator_test.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-// $Id: decorator_test.php 300729 2010-06-24 12:05:53Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-Mock::generate('Calendar_Engine_Interface','Mock_Calendar_Engine');
-Mock::generate('Calendar_Second','Mock_Calendar_Second');
-Mock::generate('Calendar_Week','Mock_Calendar_Week');
-Mock::generate('Calendar_Day','Mock_Calendar_Day');
-
-class TestOfDecorator extends UnitTestCase {
-    var $mockengine;
-    var $mockcal;
-    var $decorator;
-    function TestOfDecorator() {
-        $this->UnitTestCase('Test of Calendar_Decorator');
-    }
-    function setUp() {
-        $this->mockengine = new Mock_Calendar_Engine($this);
-        $this->mockcal = new Mock_Calendar_Second($this);
-        $this->mockcal->setReturnValue('prevYear',2002);
-        $this->mockcal->setReturnValue('thisYear',2003);
-        $this->mockcal->setReturnValue('nextYear',2004);
-        $this->mockcal->setReturnValue('prevMonth',9);
-        $this->mockcal->setReturnValue('thisMonth',10);
-        $this->mockcal->setReturnValue('nextMonth',11);
-        $this->mockcal->setReturnValue('prevDay',14);
-        $this->mockcal->setReturnValue('thisDay',15);
-        $this->mockcal->setReturnValue('nextDay',16);
-        $this->mockcal->setReturnValue('prevHour',12);
-        $this->mockcal->setReturnValue('thisHour',13);
-        $this->mockcal->setReturnValue('nextHour',14);
-        $this->mockcal->setReturnValue('prevMinute',29);
-        $this->mockcal->setReturnValue('thisMinute',30);
-        $this->mockcal->setReturnValue('nextMinute',31);
-        $this->mockcal->setReturnValue('prevSecond',44);
-        $this->mockcal->setReturnValue('thisSecond',45);
-        $this->mockcal->setReturnValue('nextSecond',46);
-        $this->mockcal->setReturnValue('getEngine',$this->mockengine);
-        $this->mockcal->setReturnValue('getTimestamp',12345);
-
-    }
-    function tearDown() {
-        unset ( $this->engine );
-        unset ( $this->mockcal );
-    }
-    function testPrevYear() {
-        $this->mockcal->expectOnce('prevYear',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(2002,$Decorator->prevYear());
-    }
-    function testThisYear() {
-        $this->mockcal->expectOnce('thisYear',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(2003,$Decorator->thisYear());
-    }
-    function testNextYear() {
-        $this->mockcal->expectOnce('nextYear',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(2004,$Decorator->nextYear());
-    }
-    function testPrevMonth() {
-        $this->mockcal->expectOnce('prevMonth',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(9,$Decorator->prevMonth());
-    }
-    function testThisMonth() {
-        $this->mockcal->expectOnce('thisMonth',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(10,$Decorator->thisMonth());
-    }
-    function testNextMonth() {
-        $this->mockcal->expectOnce('nextMonth',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(11,$Decorator->nextMonth());
-    }
-    function testPrevWeek() {
-        $mockweek = & new Mock_Calendar_Week($this);
-        $mockweek->setReturnValue('prevWeek',1);
-        $mockweek->expectOnce('prevWeek',array('n_in_month'));
-        $Decorator =& new Calendar_Decorator($mockweek);
-        $this->assertEqual(1,$Decorator->prevWeek());
-    }
-    function testThisWeek() {
-        $mockweek = & new Mock_Calendar_Week($this);
-        $mockweek->setReturnValue('thisWeek',2);
-        $mockweek->expectOnce('thisWeek',array('n_in_month'));
-        $Decorator =& new Calendar_Decorator($mockweek);
-        $this->assertEqual(2,$Decorator->thisWeek());
-    }
-    function testNextWeek() {
-        $mockweek = & new Mock_Calendar_Week($this);
-        $mockweek->setReturnValue('nextWeek',3);
-        $mockweek->expectOnce('nextWeek',array('n_in_month'));
-        $Decorator =& new Calendar_Decorator($mockweek);
-        $this->assertEqual(3,$Decorator->nextWeek());
-    }
-    function testPrevDay() {
-        $this->mockcal->expectOnce('prevDay',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(14,$Decorator->prevDay());
-    }
-    function testThisDay() {
-        $this->mockcal->expectOnce('thisDay',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(15,$Decorator->thisDay());
-    }
-    function testNextDay() {
-        $this->mockcal->expectOnce('nextDay',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(16,$Decorator->nextDay());
-    }
-    function testPrevHour() {
-        $this->mockcal->expectOnce('prevHour',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(12,$Decorator->prevHour());
-    }
-    function testThisHour() {
-        $this->mockcal->expectOnce('thisHour',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(13,$Decorator->thisHour());
-    }
-    function testNextHour() {
-        $this->mockcal->expectOnce('nextHour',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(14,$Decorator->nextHour());
-    }
-    function testPrevMinute() {
-        $this->mockcal->expectOnce('prevMinute',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(29,$Decorator->prevMinute());
-    }
-    function testThisMinute() {
-        $this->mockcal->expectOnce('thisMinute',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(30,$Decorator->thisMinute());
-    }
-    function testNextMinute() {
-        $this->mockcal->expectOnce('nextMinute',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(31,$Decorator->nextMinute());
-    }
-    function testPrevSecond() {
-        $this->mockcal->expectOnce('prevSecond',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(44,$Decorator->prevSecond());
-    }
-    function testThisSecond() {
-        $this->mockcal->expectOnce('thisSecond',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(45,$Decorator->thisSecond());
-    }
-    function testNextSecond() {
-        $this->mockcal->expectOnce('nextSecond',array('int'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(46,$Decorator->nextSecond());
-    }
-    function testGetEngine() {
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertIsA($Decorator->getEngine(),'Mock_Calendar_Engine');
-    }
-    function testSetTimestamp() {
-        $this->mockcal->expectOnce('setTimestamp',array('12345'));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->setTimestamp('12345');
-    }
-    function testGetTimestamp() {
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual(12345,$Decorator->getTimestamp());
-    }
-    function testSetSelected() {
-        $this->mockcal->expectOnce('setSelected',array(true));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->setSelected();
-    }
-    function testIsSelected() {
-        $this->mockcal->setReturnValue('isSelected',true);
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertTrue($Decorator->isSelected());
-    }
-    function testAdjust() {
-        $this->mockcal->expectOnce('adjust',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->adjust();
-    }
-    function testToArray() {
-        $this->mockcal->expectOnce('toArray',array(12345));
-        $testArray = array('foo'=>'bar');
-        $this->mockcal->setReturnValue('toArray',$testArray);
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual($testArray,$Decorator->toArray(12345));
-    }
-    function testReturnValue() {
-        $this->mockcal->expectOnce('returnValue',array('a','b','c','d'));
-        $this->mockcal->setReturnValue('returnValue','foo');
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $this->assertEqual('foo',$Decorator->returnValue('a','b','c','d'));
-    }
-    function testSetFirst() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->expectOnce('setFirst',array(true));
-        $Decorator =& new Calendar_Decorator($mockday);
-        $Decorator->setFirst();
-    }
-    function testSetLast() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->expectOnce('setLast',array(true));
-        $Decorator =& new Calendar_Decorator($mockday);
-        $Decorator->setLast();
-    }
-    function testIsFirst() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->setReturnValue('isFirst',TRUE);
-        $Decorator =& new Calendar_Decorator($mockday);
-        $this->assertTrue($Decorator->isFirst());
-    }
-    function testIsLast() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->setReturnValue('isLast',TRUE);
-        $Decorator =& new Calendar_Decorator($mockday);
-        $this->assertTrue($Decorator->isLast());
-    }
-    function testSetEmpty() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->expectOnce('setEmpty',array(true));
-        $Decorator =& new Calendar_Decorator($mockday);
-        $Decorator->setEmpty();
-    }
-    function testIsEmpty() {
-        $mockday = & new Mock_Calendar_Day($this);
-        $mockday->setReturnValue('isEmpty',TRUE);
-        $Decorator =& new Calendar_Decorator($mockday);
-        $this->assertTrue($Decorator->isEmpty());
-    }
-    function testBuild() {
-        $testArray=array('foo'=>'bar');
-        $this->mockcal->expectOnce('build',array($testArray));
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->build($testArray);
-    }
-    function testFetch() {
-        $this->mockcal->expectOnce('fetch',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->fetch();
-    }
-    function testFetchAll() {
-        $this->mockcal->expectOnce('fetchAll',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->fetchAll();
-    }
-    function testSize() {
-        $this->mockcal->expectOnce('size',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->size();
-    }
-    function testIsValid() {
-        $this->mockcal->expectOnce('isValid',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->isValid();
-    }
-    function testGetValidator() {
-        $this->mockcal->expectOnce('getValidator',array());
-        $Decorator = new Calendar_Decorator($this->mockcal);
-        $Decorator->getValidator();
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/Calendar/tests/decorator_tests.php b/airtime_mvc/library/pear/Calendar/tests/decorator_tests.php
deleted file mode 100644
index 6ebc47b77..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/decorator_tests.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-// $Id: decorator_tests.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class DecoratorTests extends GroupTest {
-    function DecoratorTests() {
-        $this->GroupTest('Decorator Tests');
-        $this->addTestFile('decorator_test.php');
-        $this->addTestFile('decorator_textual_test.php');
-        $this->addTestFile('decorator_uri_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new DecoratorTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/decorator_textual_test.php b/airtime_mvc/library/pear/Calendar/tests/decorator_textual_test.php
deleted file mode 100644
index f9dc737e5..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/decorator_textual_test.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-// $Id: decorator_textual_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./decorator_test.php');
-
-class TestOfDecoratorTextual extends TestOfDecorator {
-    function TestOfDecoratorTextual() {
-        $this->UnitTestCase('Test of Calendar_Decorator_Textual');
-    }
-    function testMonthNamesLong() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $monthNames = array(
-            1=>'January',
-            2=>'February',
-            3=>'March',
-            4=>'April',
-            5=>'May',
-            6=>'June',
-            7=>'July',
-            8=>'August',
-            9=>'September',
-            10=>'October',
-            11=>'November',
-            12=>'December',
-        );
-        $this->assertEqual($monthNames,$Textual->monthNames());
-    }
-    function testMonthNamesShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $monthNames = array(
-            1=>'Jan',
-            2=>'Feb',
-            3=>'Mar',
-            4=>'Apr',
-            5=>'May',
-            6=>'Jun',
-            7=>'Jul',
-            8=>'Aug',
-            9=>'Sep',
-            10=>'Oct',
-            11=>'Nov',
-            12=>'Dec',
-        );
-        $this->assertEqual($monthNames,$Textual->monthNames('short'));
-    }
-    function testMonthNamesTwo() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $monthNames = array(
-            1=>'Ja',
-            2=>'Fe',
-            3=>'Ma',
-            4=>'Ap',
-            5=>'Ma',
-            6=>'Ju',
-            7=>'Ju',
-            8=>'Au',
-            9=>'Se',
-            10=>'Oc',
-            11=>'No',
-            12=>'De',
-        );
-        $this->assertEqual($monthNames,$Textual->monthNames('two'));
-    }
-    function testMonthNamesOne() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $monthNames = array(
-            1=>'J',
-            2=>'F',
-            3=>'M',
-            4=>'A',
-            5=>'M',
-            6=>'J',
-            7=>'J',
-            8=>'A',
-            9=>'S',
-            10=>'O',
-            11=>'N',
-            12=>'D',
-        );
-        $this->assertEqual($monthNames,$Textual->monthNames('one'));
-    }
-    function testWeekdayNamesLong() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $weekdayNames = array(
-            0=>'Sunday',
-            1=>'Monday',
-            2=>'Tuesday',
-            3=>'Wednesday',
-            4=>'Thursday',
-            5=>'Friday',
-            6=>'Saturday',
-        );
-        $this->assertEqual($weekdayNames,$Textual->weekdayNames());
-    }
-    function testWeekdayNamesShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $weekdayNames = array(
-            0=>'Sun',
-            1=>'Mon',
-            2=>'Tue',
-            3=>'Wed',
-            4=>'Thu',
-            5=>'Fri',
-            6=>'Sat',
-        );
-        $this->assertEqual($weekdayNames,$Textual->weekdayNames('short'));
-    }
-    function testWeekdayNamesTwo() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $weekdayNames = array(
-            0=>'Su',
-            1=>'Mo',
-            2=>'Tu',
-            3=>'We',
-            4=>'Th',
-            5=>'Fr',
-            6=>'Sa',
-        );
-        $this->assertEqual($weekdayNames,$Textual->weekdayNames('two'));
-    }
-    function testWeekdayNamesOne() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $weekdayNames = array(
-            0=>'S',
-            1=>'M',
-            2=>'T',
-            3=>'W',
-            4=>'T',
-            5=>'F',
-            6=>'S',
-        );
-        $this->assertEqual($weekdayNames,$Textual->weekdayNames('one'));
-    }
-    function testPrevMonthNameShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $this->assertEqual('Sep',$Textual->prevMonthName('short'));
-    }
-    function testThisMonthNameShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $this->assertEqual('Oct',$Textual->thisMonthName('short'));
-    }
-    function testNextMonthNameShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $this->assertEqual('Nov',$Textual->nextMonthName('short'));
-    }
-    function testThisDayNameShort() {
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $this->assertEqual('Wed',$Textual->thisDayName('short'));
-    }
-    function testOrderedWeekdaysShort() {
-        $weekdayNames = array(
-            0=>'Sun',
-            1=>'Mon',
-            2=>'Tue',
-            3=>'Wed',
-            4=>'Thu',
-            5=>'Fri',
-            6=>'Sat',
-        );
-        $nShifts = CALENDAR_FIRST_DAY_OF_WEEK;
-        while ($nShifts-- > 0) {
-            $day = array_shift($weekdayNames);
-            array_push($weekdayNames, $day);
-        }
-        $Textual = new Calendar_Decorator_Textual($this->mockcal);
-        $this->assertEqual($weekdayNames,$Textual->orderedWeekdays('short'));
-    }
-
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDecoratorTextual();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/decorator_uri_test.php b/airtime_mvc/library/pear/Calendar/tests/decorator_uri_test.php
deleted file mode 100644
index 5a3624cc7..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/decorator_uri_test.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-// $Id: decorator_uri_test.php 162858 2004-07-08 10:18:48Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./decorator_test.php');
-
-class TestOfDecoratorUri extends TestOfDecorator {
-    function TestOfDecoratorUri() {
-        $this->UnitTestCase('Test of Calendar_Decorator_Uri');
-    }
-    function testFragments() {
-        $Uri = new Calendar_Decorator_Uri($this->mockcal);
-        $Uri->setFragments('year','month','day','hour','minute','second');
-        $this->assertEqual('year=&amp;month=&amp;day=&amp;hour=&amp;minute=&amp;second=',$Uri->this('second'));
-    }
-    function testScalarFragments() {
-        $Uri = new Calendar_Decorator_Uri($this->mockcal);
-        $Uri->setFragments('year','month','day','hour','minute','second');
-        $Uri->setScalar();
-        $this->assertEqual('&amp;&amp;&amp;&amp;&amp;',$Uri->this('second'));
-    }
-    function testSetSeperator() {
-        $Uri = new Calendar_Decorator_Uri($this->mockcal);
-        $Uri->setFragments('year','month','day','hour','minute','second');
-        $Uri->setSeparator('/');
-        $this->assertEqual('year=/month=/day=/hour=/minute=/second=',$Uri->this('second'));
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfDecoratorUri();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/helper_test.php b/airtime_mvc/library/pear/Calendar/tests/helper_test.php
deleted file mode 100644
index 0f9702f43..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/helper_test.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-// $Id: helper_test.php 300729 2010-06-24 12:05:53Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-Mock::generate('Calendar_Engine_Interface','Mock_Calendar_Engine');
-Mock::generate('Calendar_Second','Mock_Calendar_Second');
-
-class TestOfTableHelper extends UnitTestCase {
-    var $mockengine;
-    var $mockcal;
-    function TestOfTableHelper() {
-        $this->UnitTestCase('Test of Calendar_Table_Helper');
-    }
-    function setUp() {
-        $this->mockengine = new Mock_Calendar_Engine($this);
-        $this->mockengine->setReturnValue('getMinYears',1970);
-        $this->mockengine->setReturnValue('getMaxYears',2037);
-        $this->mockengine->setReturnValue('getMonthsInYear',12);
-        $this->mockengine->setReturnValue('getDaysInMonth',31);
-        $this->mockengine->setReturnValue('getHoursInDay',24);
-        $this->mockengine->setReturnValue('getMinutesInHour',60);
-        $this->mockengine->setReturnValue('getSecondsInMinute',60);
-        $this->mockengine->setReturnValue('getWeekDays',array(0,1,2,3,4,5,6));
-        $this->mockengine->setReturnValue('getDaysInWeek',7);
-        $this->mockengine->setReturnValue('getFirstDayOfWeek',1);
-        $this->mockengine->setReturnValue('getFirstDayInMonth',3);
-        $this->mockcal = new Mock_Calendar_Second($this);
-        $this->mockcal->setReturnValue('thisYear',2003);
-        $this->mockcal->setReturnValue('thisMonth',10);
-        $this->mockcal->setReturnValue('thisDay',15);
-        $this->mockcal->setReturnValue('thisHour',13);
-        $this->mockcal->setReturnValue('thisMinute',30);
-        $this->mockcal->setReturnValue('thisSecond',45);
-        $this->mockcal->setReturnValue('getEngine',$this->mockengine);
-    }
-    function testGetFirstDay() {
-        for ( $i = 0; $i <= 7; $i++ ) {
-            $Helper = & new Calendar_Table_Helper($this->mockcal,$i);
-            $this->assertEqual($Helper->getFirstDay(),$i);
-        }
-    }
-    function testGetDaysOfWeekMonday() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getDaysOfWeek(),array(1,2,3,4,5,6,0));
-    }
-    function testGetDaysOfWeekSunday() {
-        $Helper = new Calendar_Table_Helper($this->mockcal,0);
-        $this->assertEqual($Helper->getDaysOfWeek(),array(0,1,2,3,4,5,6));
-    }
-    function testGetDaysOfWeekThursday() {
-        $Helper = new Calendar_Table_Helper($this->mockcal,4);
-        $this->assertEqual($Helper->getDaysOfWeek(),array(4,5,6,0,1,2,3));
-    }
-    function testGetNumWeeks() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getNumWeeks(),5);
-    }
-    function testGetNumTableDaysInMonth() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getNumTableDaysInMonth(),35);
-    }
-    function testGetEmptyDaysBefore() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getEmptyDaysBefore(),2);
-    }
-    function testGetEmptyDaysAfter() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getEmptyDaysAfter(),33);
-    }
-    function testGetEmptyDaysAfterOffset() {
-        $Helper = new Calendar_Table_Helper($this->mockcal);
-        $this->assertEqual($Helper->getEmptyDaysAfterOffset(),5);
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfTableHelper();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/hour_test.php b/airtime_mvc/library/pear/Calendar/tests/hour_test.php
deleted file mode 100644
index 9c04a9eb4..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/hour_test.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-// $Id: hour_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfHour extends TestOfCalendar {
-    function TestOfHour() {
-        $this->UnitTestCase('Test of Hour');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Hour(2003,10,25,13);
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 24,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59,$this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0,$this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1,$this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0,$this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1,$this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(13,0,0,10,25,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfHourBuild extends TestOfHour {
-    function TestOfHourBuild() {
-        $this->UnitTestCase('Test of Hour::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(60,$this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ( $Child = $this->cal->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual(60,$i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Minute.php');
-        $selection = array(new Calendar_Minute(2003,10,25,13,32));
-        $this->cal->build($selection);
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            if ( $i == 32 )
-                break;
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfHour();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfHourBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/minute_test.php b/airtime_mvc/library/pear/Calendar/tests/minute_test.php
deleted file mode 100644
index 07a7db242..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/minute_test.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// $Id: minute_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfMinute extends TestOfCalendar {
-    function TestOfMinute() {
-        $this->UnitTestCase('Test of Minute');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Minute(2003,10,25,13,32);
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 24,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0,$this->cal->thisSecond());
-    }
-    function testThisSecond_Timestamp () {
-        $this->assertEqual($this->cal->cE->dateToStamp(
-                2003, 10, 25, 13, 32, 0),
-            $this->cal->thisSecond('timestamp'));
-    }
-    function testNextSecond () {
-        $this->assertEqual(1,$this->cal->nextSecond());
-    }
-    function testNextSecond_Timestamp () {
-        $this->assertEqual($this->cal->cE->dateToStamp(
-                2003, 10, 25, 13, 32, 1),
-            $this->cal->nextSecond('timestamp'));
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(13,32,0,10,25,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfMinuteBuild extends TestOfMinute {
-    function TestOfMinuteBuild() {
-        $this->UnitTestCase('Test of Minute::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(60,$this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ( $Child = $this->cal->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual(60,$i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Second.php');
-        $selection = array(new Calendar_Second(2003,10,25,13,32,43));
-        $this->cal->build($selection);
-        $i = 0;
-        while ( $Child = $this->cal->fetch() ) {
-            if ( $i == 43 )
-                break;
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfMinute();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfMinuteBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/month_test.php b/airtime_mvc/library/pear/Calendar/tests/month_test.php
deleted file mode 100644
index c2238406b..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/month_test.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-// $Id: month_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfMonth extends TestOfCalendar {
-    function TestOfMonth() {
-        $this->UnitTestCase('Test of Month');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Month(2003,10);
-    }
-    function testPrevMonth_Object() {
-        $this->assertEqual(new Calendar_Month(2003, 9), $this->cal->prevMonth('object'));
-    }
-    function testPrevDay () {
-        $this->assertEqual(30,$this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 9,
-                'day'    => 30,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(1,$this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(2,$this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23,$this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0,$this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1,$this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59,$this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0,$this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1,$this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0,$this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1,$this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,10,1,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfMonthBuild extends TestOfMonth {
-    function TestOfMonthBuild() {
-        $this->UnitTestCase('Test of Month::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(31,$this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ( $Child = $this->cal->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual(31,$i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Day.php');
-        $selection = array(new Calendar_Day(2003,10,25));
-        $this->cal->build($selection);
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            if ( $i == 25 )
-                break;
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfMonth();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfMonthBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/month_weekdays_test.php b/airtime_mvc/library/pear/Calendar/tests/month_weekdays_test.php
deleted file mode 100644
index b60005d7e..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/month_weekdays_test.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-// $Id: month_weekdays_test.php 300728 2010-06-24 11:43:56Z quipo $
-
-require_once 'simple_include.php';
-require_once 'calendar_include.php';
-
-require_once './calendar_test.php';
-
-class TestOfMonthWeekdays extends TestOfCalendar {
-    function TestOfMonthWeekdays() {
-        $this->UnitTestCase('Test of Month Weekdays');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Month_Weekdays(2003, 10);
-    }
-    function testPrevDay () {
-        $this->assertEqual(30,$this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 9,
-                'day'    => 30,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(1, $this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(2, $this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23, $this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0, $this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1, $this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59, $this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0, $this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1, $this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59, $this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0, $this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1, $this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0, 0, 0, 10, 1, 2003);
-        $this->assertEqual($stamp, $this->cal->getTimeStamp());
-    }
-}
-
-class TestOfMonthWeekdaysBuild extends TestOfMonthWeekdays {
-    function TestOfMonthWeekdaysBuild() {
-        $this->UnitTestCase('Test of Month_Weekdays::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(35, $this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ($Child = $this->cal->fetch()) {
-            $i++;
-        }
-        $this->assertEqual(35, $i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ($Child = $this->cal->fetch()) {
-            $children[$i] = $Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        include_once CALENDAR_ROOT . 'Day.php';
-        $selection = array(new Calendar_Day(2003, 10, 25));
-        $this->cal->build($selection);
-        $daysInPrevMonth = (0 == CALENDAR_FIRST_DAY_OF_WEEK) ? 3 : 2;
-        $end = 25 + $daysInPrevMonth;
-        $i = 1;
-        while ($Child = $this->cal->fetch()) {
-            if ($i == $end) {
-                break;
-            }
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-        $this->assertEqual(25, $Child->day);
-    }
-    function testEmptyCount() {
-        $this->cal->build();
-        $empty = 0;
-        while ($Child = $this->cal->fetch()) {
-            if ($Child->isEmpty()) {
-                $empty++;
-            }
-        }
-        $this->assertEqual(4, $empty);
-    }
-    function testEmptyCount2() {
-        $this->cal = new Calendar_Month_Weekdays(2010,3);
-        $this->cal->build();
-        $empty = 0;
-        while ($Child = $this->cal->fetch()) {
-            if ($Child->isEmpty()) {
-                $empty++;
-            }
-        }
-        $this->assertEqual(4, $empty);
-    }
-    function testEmptyCount3() {
-        $this->cal = new Calendar_Month_Weekdays(2010,6);
-        $this->cal->build();
-        $empty = 0;
-        while ($Child = $this->cal->fetch()) {
-            if ($Child->isEmpty()) {
-                $empty++;
-            }
-        }
-        $this->assertEqual(5, $empty);
-    }
-    function testEmptyDaysBefore_AfterAdjust() {
-        $this->cal = new Calendar_Month_Weekdays(2004, 0);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 1 : 0;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysBefore());
-    }
-    function testEmptyDaysBefore() {
-        $this->cal = new Calendar_Month_Weekdays(2010, 3);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 1 : 0;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysBefore());
-    }
-    function testEmptyDaysBefore2() {
-        $this->cal = new Calendar_Month_Weekdays(2010, 6);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 2 : 1;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysBefore());
-    }
-    function testEmptyDaysAfter() {
-        $this->cal = new Calendar_Month_Weekdays(2010, 3);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 30 : 31;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysAfter());
-    }
-    function testEmptyDaysAfter2() {
-        $this->cal = new Calendar_Month_Weekdays(2010, 6);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 30 : 31;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysAfter());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfMonthWeekdays();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfMonthWeekdaysBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/month_weeks_test.php b/airtime_mvc/library/pear/Calendar/tests/month_weeks_test.php
deleted file mode 100644
index d8f130294..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/month_weeks_test.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-// $Id: month_weeks_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfMonthWeeks extends TestOfCalendar {
-    function TestOfMonthWeeks() {
-        $this->UnitTestCase('Test of Month Weeks');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Month_Weeks(2003, 10);
-    }
-    function testPrevDay () {
-        $this->assertEqual(30, $this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 9,
-                'day'    => 30,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(1, $this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(2, $this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23, $this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0, $this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1, $this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59, $this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0, $this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1, $this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59, $this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0, $this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1, $this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,10,1,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfMonthWeeksBuild extends TestOfMonthWeeks {
-    function TestOfMonthWeeksBuild() {
-        $this->UnitTestCase('Test of Month_Weeks::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(5,$this->cal->size());
-    }
-
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ($Child = $this->cal->fetch()) {
-            $i++;
-        }
-        $this->assertEqual(5,$i);
-    }
-/* Recusive dependency issue with SimpleTest
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-*/
-    function testSelection() {
-        include_once CALENDAR_ROOT . 'Week.php';
-        $selection = array(new Calendar_Week(2003, 10, 12));
-        $this->cal->build($selection);
-        $i = 1;
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 3 : 2;
-        while ($Child = $this->cal->fetch()) {
-            if ($i == $expected) {
-                //12-10-2003 is in the 2nd week of the month if firstDay is Monday,
-                //in the 3rd if firstDay is Sunday
-                break;
-            }
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-    function testEmptyDaysBefore_AfterAdjust() {
-        $this->cal = new Calendar_Month_Weeks(2004, 0);
-        $this->cal->build();
-        $expected = (CALENDAR_FIRST_DAY_OF_WEEK == 0) ? 1 : 0;
-        $this->assertEqual($expected, $this->cal->tableHelper->getEmptyDaysBefore());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfMonthWeeks();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfMonthWeeksBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/peardate_engine_test.php b/airtime_mvc/library/pear/Calendar/tests/peardate_engine_test.php
deleted file mode 100644
index c32c890d7..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/peardate_engine_test.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-// $Id: peardate_engine_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class TestOfPearDateEngine extends UnitTestCase {
-    var $engine;
-    function TestOfPearDateEngine() {
-        $this->UnitTestCase('Test of Calendar_Engine_PearDate');
-    }
-    function setUp() {
-        $this->engine = new Calendar_Engine_PearDate();
-    }
-    function testGetSecondsInMinute() {
-        $this->assertEqual($this->engine->getSecondsInMinute(),60);
-    }
-    function testGetMinutesInHour() {
-        $this->assertEqual($this->engine->getMinutesInHour(),60);
-    }
-    function testGetHoursInDay() {
-        $this->assertEqual($this->engine->getHoursInDay(),24);
-    }
-    function testGetFirstDayOfWeek() {
-        $this->assertEqual($this->engine->getFirstDayOfWeek(),1);
-    }
-    function testGetWeekDays() {
-        $this->assertEqual($this->engine->getWeekDays(),array(0,1,2,3,4,5,6));
-    }
-    function testGetDaysInWeek() {
-        $this->assertEqual($this->engine->getDaysInWeek(),7);
-    }
-    function testGetWeekNInYear() {
-        $this->assertEqual($this->engine->getWeekNInYear(2003, 11, 3), 45);
-    }
-    function testGetWeekNInMonth() {
-        $this->assertEqual($this->engine->getWeekNInMonth(2003, 11, 3), 2);
-    }
-    function testGetWeeksInMonth0() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 0), 6); //week starts on sunday
-    }
-    function testGetWeeksInMonth1() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 1), 5); //week starts on monday
-    }
-    function testGetWeeksInMonth2() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 2, 6), 4); //week starts on saturday
-    }
-    function testGetWeeksInMonth3() {
-        // Unusual cases that can cause fails (shows up with example 21.php)
-        $this->assertEqual($this->engine->getWeeksInMonth(2004,2,1),5);
-        $this->assertEqual($this->engine->getWeeksInMonth(2004,8,1),6);
-    }
-    function testGetDayOfWeek() {
-        $this->assertEqual($this->engine->getDayOfWeek(2003, 11, 18), 2);
-    }
-    function testGetFirstDayInMonth() {
-        $this->assertEqual($this->engine->getFirstDayInMonth(2003,10),3);
-    }
-    function testGetDaysInMonth() {
-        $this->assertEqual($this->engine->getDaysInMonth(2003,10),31);
-    }
-    function testGetMinYears() {
-        $this->assertEqual($this->engine->getMinYears(),0);
-    }
-    function testGetMaxYears() {
-        $this->assertEqual($this->engine->getMaxYears(),9999);
-    }
-    function testDateToStamp() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->dateToStamp(2003,10,15,13,30,45),$stamp);
-    }
-    function testStampToSecond() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToSecond($stamp),45);
-    }
-    function testStampToMinute() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToMinute($stamp),30);
-    }
-    function testStampToHour() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToHour($stamp),13);
-    }
-    function testStampToDay() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToDay($stamp),15);
-    }
-    function testStampToMonth() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToMonth($stamp),10);
-    }
-    function testStampToYear() {
-        $stamp = '2003-10-15 13:30:45';
-        $this->assertEqual($this->engine->stampToYear($stamp),2003);
-    }
-    function testAdjustDate() {
-        $stamp = '2004-01-01 13:30:45';
-        $y = $this->engine->stampToYear($stamp);
-        $m = $this->engine->stampToMonth($stamp);
-        $d = $this->engine->stampToDay($stamp);
-
-        //the first day of the month should be thursday
-        $this->assertEqual($this->engine->getDayOfWeek($y, $m, $d), 4);
-
-        $m--; // 2004-00-01 => 2003-12-01
-        $this->engine->adjustDate($y, $m, $d, $dummy, $dummy, $dummy);
-
-        $this->assertEqual($y, 2003);
-        $this->assertEqual($m, 12);
-        $this->assertEqual($d, 1);
-
-        // get last day and check if it's wednesday
-        $d = $this->engine->getDaysInMonth($y, $m);
-
-        $this->assertEqual($this->engine->getDayOfWeek($y, $m, $d), 3);
-    }
-    function testIsToday() {
-        $stamp = date('Y-m-d H:i:s');
-        $this->assertTrue($this->engine->isToday($stamp));
-        $stamp = date('Y-m-d H:i:s', time() + 1000000000);
-        $this->assertFalse($this->engine->isToday($stamp));
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfPearDateEngine();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/second_test.php b/airtime_mvc/library/pear/Calendar/tests/second_test.php
deleted file mode 100644
index 78c56565a..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/second_test.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// $Id: second_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfSecond extends TestOfCalendar {
-    function TestOfSecond() {
-        $this->UnitTestCase('Test of Second');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Second(2003,10,25,13,32,43);
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 24,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfSecond();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/simple_include.php b/airtime_mvc/library/pear/Calendar/tests/simple_include.php
deleted file mode 100644
index cd7ad4413..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/simple_include.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// $Id: simple_include.php 159563 2004-05-24 22:25:43Z quipo $
-if (!defined('SIMPLE_TEST')) {
-    define('SIMPLE_TEST', '../../../simpletest/');
-}
-
-require_once(SIMPLE_TEST . 'unit_tester.php');
-require_once(SIMPLE_TEST . 'reporter.php');
-require_once(SIMPLE_TEST . 'mock_objects.php');
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/table_helper_tests.php b/airtime_mvc/library/pear/Calendar/tests/table_helper_tests.php
deleted file mode 100644
index c8abe64eb..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/table_helper_tests.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// $Id: table_helper_tests.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class TableHelperTests extends GroupTest {
-    function TableHelperTests() {
-        $this->GroupTest('Table Helper Tests');
-        $this->addTestFile('helper_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TableHelperTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/unixts_engine_test.php b/airtime_mvc/library/pear/Calendar/tests/unixts_engine_test.php
deleted file mode 100644
index 2d7c11f97..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/unixts_engine_test.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-// $Id: unixts_engine_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class TestOfUnixTsEngine extends UnitTestCase {
-    var $engine;
-    function TestOfUnixTsEngine() {
-        $this->UnitTestCase('Test of Calendar_Engine_UnixTs');
-    }
-    function setUp() {
-        $this->engine = new Calendar_Engine_UnixTs();
-    }
-    function testGetSecondsInMinute() {
-        $this->assertEqual($this->engine->getSecondsInMinute(),60);
-    }
-    function testGetMinutesInHour() {
-        $this->assertEqual($this->engine->getMinutesInHour(),60);
-    }
-    function testGetHoursInDay() {
-        $this->assertEqual($this->engine->getHoursInDay(),24);
-    }
-    function testGetFirstDayOfWeek() {
-        $this->assertEqual($this->engine->getFirstDayOfWeek(),1);
-    }
-    function testGetWeekDays() {
-        $this->assertEqual($this->engine->getWeekDays(),array(0,1,2,3,4,5,6));
-    }
-    function testGetDaysInWeek() {
-        $this->assertEqual($this->engine->getDaysInWeek(),7);
-    }
-    function testGetWeekNInYear() {
-        $this->assertEqual($this->engine->getWeekNInYear(2003, 11, 3), 45);
-    }
-    function testGetWeekNInMonth() {
-        $this->assertEqual($this->engine->getWeekNInMonth(2003, 11, 3), 2);
-    }
-    function testGetWeeksInMonth0() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 0), 6); //week starts on sunday
-    }
-    function testGetWeeksInMonth1() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 11, 1), 5); //week starts on monday
-    }
-    function testGetWeeksInMonth2() {
-        $this->assertEqual($this->engine->getWeeksInMonth(2003, 2, 6), 4); //week starts on saturday
-    }
-    function testGetWeeksInMonth3() {
-        // Unusual cases that can cause fails (shows up with example 21.php)
-        $this->assertEqual($this->engine->getWeeksInMonth(2004,2,1),5);
-        $this->assertEqual($this->engine->getWeeksInMonth(2004,8,1),6);
-    }
-    function testGetDayOfWeek() {
-        $this->assertEqual($this->engine->getDayOfWeek(2003, 11, 18), 2);
-    }
-    function testGetFirstDayInMonth() {
-        $this->assertEqual($this->engine->getFirstDayInMonth(2003,10),3);
-    }
-    function testGetDaysInMonth() {
-        $this->assertEqual($this->engine->getDaysInMonth(2003,10),31);
-    }
-    function testGetMinYears() {
-        $test = strpos(PHP_OS, 'WIN') >= 0 ? 1970 : 1902;
-        $this->assertEqual($this->engine->getMinYears(),$test);
-    }
-    function testGetMaxYears() {
-        $this->assertEqual($this->engine->getMaxYears(),2037);
-    }
-    function testDateToStamp() {
-        $stamp = mktime(0,0,0,10,15,2003);
-        $this->assertEqual($this->engine->dateToStamp(2003,10,15,0,0,0),$stamp);
-    }
-    function testStampToSecond() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToSecond($stamp),45);
-    }
-    function testStampToMinute() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToMinute($stamp),30);
-    }
-    function testStampToHour() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToHour($stamp),13);
-    }
-    function testStampToDay() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToDay($stamp),15);
-    }
-    function testStampToMonth() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToMonth($stamp),10);
-    }
-    function testStampToYear() {
-        $stamp = mktime(13,30,45,10,15,2003);
-        $this->assertEqual($this->engine->stampToYear($stamp),2003);
-    }
-    function testIsToday() {
-        $stamp = mktime();
-        $this->assertTrue($this->engine->isToday($stamp));
-        $stamp += 1000000000;
-        $this->assertFalse($this->engine->isToday($stamp));
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfUnixTsEngine();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/util_tests.php b/airtime_mvc/library/pear/Calendar/tests/util_tests.php
deleted file mode 100644
index ce058ea4b..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/util_tests.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// $Id: util_tests.php 166503 2004-08-16 12:56:10Z hfuecks $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class UtilTests extends GroupTest {
-    function UtilTests() {
-        $this->GroupTest('Util Tests');
-        $this->addTestFile('util_uri_test.php');
-        $this->addTestFile('util_textual_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new UtilTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/util_textual_test.php b/airtime_mvc/library/pear/Calendar/tests/util_textual_test.php
deleted file mode 100644
index e47735dca..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/util_textual_test.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-// $Id: util_textual_test.php 269074 2008-11-15 21:21:42Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./decorator_test.php');
-
-class TestOfUtilTextual extends UnitTestCase {
-    var $mockengine;
-    var $mockcal;
-    function TestOfUtilTextual() {
-        $this->UnitTestCase('Test of Calendar_Util_Textual');
-    }
-    function setUp() {
-        $this->mockengine = new Mock_Calendar_Engine($this);
-        $this->mockcal = new Mock_Calendar_Second($this);
-        $this->mockcal->setReturnValue('prevYear',2002);
-        $this->mockcal->setReturnValue('thisYear',2003);
-        $this->mockcal->setReturnValue('nextYear',2004);
-        $this->mockcal->setReturnValue('prevMonth',9);
-        $this->mockcal->setReturnValue('thisMonth',10);
-        $this->mockcal->setReturnValue('nextMonth',11);
-        $this->mockcal->setReturnValue('prevDay',14);
-        $this->mockcal->setReturnValue('thisDay',15);
-        $this->mockcal->setReturnValue('nextDay',16);
-        $this->mockcal->setReturnValue('prevHour',12);
-        $this->mockcal->setReturnValue('thisHour',13);
-        $this->mockcal->setReturnValue('nextHour',14);
-        $this->mockcal->setReturnValue('prevMinute',29);
-        $this->mockcal->setReturnValue('thisMinute',30);
-        $this->mockcal->setReturnValue('nextMinute',31);
-        $this->mockcal->setReturnValue('prevSecond',44);
-        $this->mockcal->setReturnValue('thisSecond',45);
-        $this->mockcal->setReturnValue('nextSecond',46);
-        $this->mockcal->setReturnValue('getEngine',$this->mockengine);
-        $this->mockcal->setReturnValue('getTimestamp',12345);
-    }
-    function tearDown() {
-        unset ( $this->engine );
-        unset ( $this->mockcal );
-    }    
-    function testMonthNamesLong() {
-        $monthNames = array(
-            1=>'January',
-            2=>'February',
-            3=>'March',
-            4=>'April',
-            5=>'May',
-            6=>'June',
-            7=>'July',
-            8=>'August',
-            9=>'September',
-            10=>'October',
-            11=>'November',
-            12=>'December',
-        );
-        $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames());
-    }
-    function testMonthNamesShort() {
-        $monthNames = array(
-            1=>'Jan',
-            2=>'Feb',
-            3=>'Mar',
-            4=>'Apr',
-            5=>'May',
-            6=>'Jun',
-            7=>'Jul',
-            8=>'Aug',
-            9=>'Sep',
-            10=>'Oct',
-            11=>'Nov',
-            12=>'Dec',
-        );
-        $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('short'));
-    }
-    function testMonthNamesTwo() {
-        $monthNames = array(
-            1=>'Ja',
-            2=>'Fe',
-            3=>'Ma',
-            4=>'Ap',
-            5=>'Ma',
-            6=>'Ju',
-            7=>'Ju',
-            8=>'Au',
-            9=>'Se',
-            10=>'Oc',
-            11=>'No',
-            12=>'De',
-        );
-        $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('two'));
-    }
-    function testMonthNamesOne() {
-        $monthNames = array(
-            1=>'J',
-            2=>'F',
-            3=>'M',
-            4=>'A',
-            5=>'M',
-            6=>'J',
-            7=>'J',
-            8=>'A',
-            9=>'S',
-            10=>'O',
-            11=>'N',
-            12=>'D',
-        );
-        $this->assertEqual($monthNames,Calendar_Util_Textual::monthNames('one'));
-    }
-    function testWeekdayNamesLong() {
-        $weekdayNames = array(
-            0=>'Sunday',
-            1=>'Monday',
-            2=>'Tuesday',
-            3=>'Wednesday',
-            4=>'Thursday',
-            5=>'Friday',
-            6=>'Saturday',
-        );
-        $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames());
-    }
-    function testWeekdayNamesShort() {
-        $weekdayNames = array(
-            0=>'Sun',
-            1=>'Mon',
-            2=>'Tue',
-            3=>'Wed',
-            4=>'Thu',
-            5=>'Fri',
-            6=>'Sat',
-        );
-        $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('short'));
-    }
-    function testWeekdayNamesTwo() {
-        $weekdayNames = array(
-            0=>'Su',
-            1=>'Mo',
-            2=>'Tu',
-            3=>'We',
-            4=>'Th',
-            5=>'Fr',
-            6=>'Sa',
-        );
-        $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('two'));
-    }
-    function testWeekdayNamesOne() {
-        $weekdayNames = array(
-            0=>'S',
-            1=>'M',
-            2=>'T',
-            3=>'W',
-            4=>'T',
-            5=>'F',
-            6=>'S',
-        );
-        $this->assertEqual($weekdayNames,Calendar_Util_Textual::weekdayNames('one'));
-    }
-    function testPrevMonthNameShort() {
-        $this->assertEqual('Sep',Calendar_Util_Textual::prevMonthName($this->mockcal,'short'));
-    }
-    function testThisMonthNameShort() {
-        $this->assertEqual('Oct',Calendar_Util_Textual::thisMonthName($this->mockcal,'short'));
-    }
-    function testNextMonthNameShort() {
-        $this->assertEqual('Nov',Calendar_Util_Textual::nextMonthName($this->mockcal,'short'));
-    }
-    function testThisDayNameShort() {
-        $this->assertEqual('Wed',Calendar_Util_Textual::thisDayName($this->mockcal,'short'));
-    }
-    function testOrderedWeekdaysShort() {
-        $weekdayNames = array(
-            0=>'Sun',
-            1=>'Mon',
-            2=>'Tue',
-            3=>'Wed',
-            4=>'Thu',
-            5=>'Fri',
-            6=>'Sat',
-        );
-        $nShifts = CALENDAR_FIRST_DAY_OF_WEEK;
-        while ($nShifts-- > 0) {
-            $day = array_shift($weekdayNames);
-            array_push($weekdayNames, $day);
-        }
-        $this->assertEqual($weekdayNames,Calendar_Util_Textual::orderedWeekdays($this->mockcal,'short'));
-    }
-
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfUtilTextual();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/util_uri_test.php b/airtime_mvc/library/pear/Calendar/tests/util_uri_test.php
deleted file mode 100644
index 970f26985..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/util_uri_test.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-// $Id: util_uri_test.php 166473 2004-08-16 08:55:24Z hfuecks $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-Mock::generate('Calendar_Day','Mock_Calendar_Day');
-Mock::generate('Calendar_Engine_Interface','Mock_Calendar_Engine');
-
-class TestOfUtilUri extends UnitTestCase {
-
-    var $MockCal;
-    
-    function TestOfUtilUri() {
-        $this->UnitTestCase('Test of Calendar_Util_Uri');
-    }
-    
-    function setUp() {
-        $this->MockCal = & new Mock_Calendar_Day($this);
-        $this->MockCal->setReturnValue('getEngine',new Mock_Calendar_Engine($this));
-    }
-    
-    function testFragments() {
-        $Uri = new Calendar_Util_Uri('y','m','d','h','m','s');
-        $Uri->setFragments('year','month','day','hour','minute','second');
-        $this->assertEqual(
-            'year=&amp;month=&amp;day=&amp;hour=&amp;minute=&amp;second=',
-            $Uri->this($this->MockCal, 'second')
-        );
-    }
-    function testScalarFragments() {
-        $Uri = new Calendar_Util_Uri('year','month','day','hour','minute','second');
-        $Uri->scalar = true;
-        $this->assertEqual(
-            '&amp;&amp;&amp;&amp;&amp;',
-            $Uri->this($this->MockCal, 'second')
-        );
-    }
-    function testSetSeperator() {
-        $Uri = new Calendar_Util_Uri('year','month','day','hour','minute','second');
-        $Uri->separator = '/';
-        $this->assertEqual(
-            'year=/month=/day=/hour=/minute=/second=',
-            $Uri->this($this->MockCal, 'second')
-        );
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfUtilUri();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/validator_error_test.php b/airtime_mvc/library/pear/Calendar/tests/validator_error_test.php
deleted file mode 100644
index ba47092cd..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/validator_error_test.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// $Id: validator_error_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class TestOfValidationError extends UnitTestCase {
-    var $vError;
-    function TestOfValidationError() {
-        $this->UnitTestCase('Test of Validation Error');
-    }
-    function setUp() {
-        $this->vError = new Calendar_Validation_Error('foo',20,'bar');
-    }
-    function testGetUnit() {
-        $this->assertEqual($this->vError->getUnit(),'foo');
-    }
-    function testGetValue() {
-        $this->assertEqual($this->vError->getValue(),20);
-    }
-    function testGetMessage() {
-        $this->assertEqual($this->vError->getMessage(),'bar');
-    }
-    function testToString() {
-        $this->assertEqual($this->vError->toString(),'foo = 20 [bar]');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfValidationError();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/validator_tests.php b/airtime_mvc/library/pear/Calendar/tests/validator_tests.php
deleted file mode 100644
index 9d06b7fff..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/validator_tests.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// $Id: validator_tests.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-class ValidatorTests extends GroupTest {
-    function ValidatorTests() {
-        $this->GroupTest('Validator Tests');
-        $this->addTestFile('validator_unit_test.php');
-        $this->addTestFile('validator_error_test.php');
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new ValidatorTests();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/validator_unit_test.php b/airtime_mvc/library/pear/Calendar/tests/validator_unit_test.php
deleted file mode 100644
index c655bee02..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/validator_unit_test.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-// $Id: validator_unit_test.php 300729 2010-06-24 12:05:53Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-Mock::generate('Calendar_Engine_Interface','Mock_Calendar_Engine');
-Mock::generate('Calendar_Second','Mock_Calendar_Second');
-
-class TestOfValidator extends UnitTestCase {
-    var $mockengine;
-    var $mockcal;
-    function TestOfValidator() {
-        $this->UnitTestCase('Test of Validator');
-    }
-    function setUp() {
-        $this->mockengine = new Mock_Calendar_Engine($this);
-        $this->mockengine->setReturnValue('getMinYears',1970);
-        $this->mockengine->setReturnValue('getMaxYears',2037);
-        $this->mockengine->setReturnValue('getMonthsInYear',12);
-        $this->mockengine->setReturnValue('getDaysInMonth',30);
-        $this->mockengine->setReturnValue('getHoursInDay',24);
-        $this->mockengine->setReturnValue('getMinutesInHour',60);
-        $this->mockengine->setReturnValue('getSecondsInMinute',60);
-        $this->mockcal = new Mock_Calendar_Second($this);
-        $this->mockcal->setReturnValue('getEngine',$this->mockengine);
-    }
-    function tearDown() {
-        unset ($this->mockengine);
-        unset ($this->mocksecond);
-    }
-    function testIsValidYear() {
-        $this->mockcal->setReturnValue('thisYear',2000);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidYear());
-    }
-    function testIsValidYearTooSmall() {
-        $this->mockcal->setReturnValue('thisYear',1969);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidYear());
-    }
-    function testIsValidYearTooLarge() {
-        $this->mockcal->setReturnValue('thisYear',2038);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidYear());
-    }
-    function testIsValidMonth() {
-        $this->mockcal->setReturnValue('thisMonth',10);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidMonth());
-    }
-    function testIsValidMonthTooSmall() {
-        $this->mockcal->setReturnValue('thisMonth',0);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidMonth());
-    }
-    function testIsValidMonthTooLarge() {
-        $this->mockcal->setReturnValue('thisMonth',13);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidMonth());
-    }
-    function testIsValidDay() {
-        $this->mockcal->setReturnValue('thisDay',10);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidDay());
-    }
-    function testIsValidDayTooSmall() {
-        $this->mockcal->setReturnValue('thisDay',0);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidDay());
-    }
-    function testIsValidDayTooLarge() {
-        $this->mockcal->setReturnValue('thisDay',31);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidDay());
-    }
-    function testIsValidHour() {
-        $this->mockcal->setReturnValue('thisHour',10);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidHour());
-    }
-    function testIsValidHourTooSmall() {
-        $this->mockcal->setReturnValue('thisHour',-1);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidHour());
-    }
-    function testIsValidHourTooLarge() {
-        $this->mockcal->setReturnValue('thisHour',24);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidHour());
-    }
-    function testIsValidMinute() {
-        $this->mockcal->setReturnValue('thisMinute',30);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidMinute());
-    }
-    function testIsValidMinuteTooSmall() {
-        $this->mockcal->setReturnValue('thisMinute',-1);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidMinute());
-    }
-    function testIsValidMinuteTooLarge() {
-        $this->mockcal->setReturnValue('thisMinute',60);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidMinute());
-    }
-    function testIsValidSecond() {
-        $this->mockcal->setReturnValue('thisSecond',30);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValidSecond());
-    }
-    function testIsValidSecondTooSmall() {
-        $this->mockcal->setReturnValue('thisSecond',-1);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidSecond());
-    }
-    function testIsValidSecondTooLarge() {
-        $this->mockcal->setReturnValue('thisSecond',60);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValidSecond());
-    }
-    function testIsValid() {
-        $this->mockcal->setReturnValue('thisYear',2000);
-        $this->mockcal->setReturnValue('thisMonth',5);
-        $this->mockcal->setReturnValue('thisDay',15);
-        $this->mockcal->setReturnValue('thisHour',13);
-        $this->mockcal->setReturnValue('thisMinute',30);
-        $this->mockcal->setReturnValue('thisSecond',40);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertTrue($Validator->isValid());
-    }
-    function testIsValidAllWrong() {
-        $this->mockcal->setReturnValue('thisYear',2038);
-        $this->mockcal->setReturnValue('thisMonth',13);
-        $this->mockcal->setReturnValue('thisDay',31);
-        $this->mockcal->day = 31;
-        $this->mockcal->setReturnValue('thisHour',24);
-        $this->mockcal->setReturnValue('thisMinute',60);
-        $this->mockcal->setReturnValue('thisSecond',60);
-        $Validator = new Calendar_Validator($this->mockcal);
-        $this->assertFalse($Validator->isValid());
-        $i = 0;
-        while ( $Validator->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual($i,6);
-    }
-}
-
-class TestOfValidatorLive extends UnitTestCase {
-    function TestOfValidatorLive() {
-        $this->UnitTestCase('Test of Validator Live');
-    }
-    function testYear() {
-        $Unit = new Calendar_Year(2038);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidYear());
-    }
-    function testMonth() {
-        $Unit = new Calendar_Month(2000,13);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidMonth());
-    }
-/*
-    function testWeek() {
-        $Unit = new Calendar_Week(2000,12,7);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidWeek());
-    }
-*/
-    function testDay() {
-        $Unit = new Calendar_Day(2000,12,32);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidDay());
-    }
-    function testHour() {
-        $Unit = new Calendar_Hour(2000,12,20,24);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidHour());
-    }
-    function testMinute() {
-        $Unit = new Calendar_Minute(2000,12,20,23,60);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidMinute());
-    }
-    function testSecond() {
-        $Unit = new Calendar_Second(2000,12,20,23,59,60);
-        $Validator = & $Unit->getValidator();
-        $this->assertFalse($Validator->isValidSecond());
-    }
-    function testAllBad() {
-        $Unit = new Calendar_Second(2000,13,32,24,60,60);
-        $this->assertFalse($Unit->isValid());
-        $Validator = & $Unit->getValidator();
-        $i = 0;
-        while ( $Validator->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual($i,5);
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfValidator();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfValidatorLive();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/week_firstday_0_test.php b/airtime_mvc/library/pear/Calendar/tests/week_firstday_0_test.php
deleted file mode 100644
index 4ba0c48f5..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/week_firstday_0_test.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-// $Id: week_firstday_0_test.php 198885 2005-10-20 18:57:52Z quipo $
-define('CALENDAR_FIRST_DAY_OF_WEEK', 0); //force firstDay = Sunday
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfWeek_firstday_0 extends TestOfCalendar {
-    function TestOfWeek_firstday_0() {
-        $this->UnitTestCase('Test of Week - Week Starting on Sunday');
-    }
-    function setUp() {
-        $this->cal = Calendar_Factory::create('Week', 2003, 10, 9);
-        //print_r($this->cal);
-    }
-    function testPrevDay () {
-        $this->assertEqual(8, $this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 8,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(9, $this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(10, $this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23, $this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0, $this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1, $this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59, $this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0, $this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1, $this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59, $this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0, $this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1, $this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,10,9,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-    function testNewTimeStamp() {
-        $stamp = mktime(0,0,0,7,28,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual('29 2004', date('W Y', $this->cal->prevWeek(true)));
-        $this->assertEqual('30 2004', date('W Y', $this->cal->thisWeek(true)));
-        $this->assertEqual('31 2004', date('W Y', $this->cal->nextWeek(true)));
-    }
-    function testPrevWeekInMonth() {
-        $this->assertEqual(1, $this->cal->prevWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(0, $this->cal->prevWeek());
-    }
-    function testThisWeekInMonth() {
-        $this->assertEqual(2, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,1,1,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,1,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2, $this->cal->thisWeek());
-    }
-    function testNextWeekInMonth() {
-        $this->assertEqual(3, $this->cal->nextWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2, $this->cal->nextWeek());
-    }
-    function testPrevWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->prevWeek('timestamp')), $this->cal->prevWeek('n_in_year'));
-        $stamp = mktime(0,0,0,1,1,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
-    }
-    function testThisWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
-        $stamp = mktime(0,0,0,1,1,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
-    }
-    function testFirstWeekInYear() {
-        $stamp = mktime(0,0,0,1,4,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek('n_in_year'));
-    }
-    function testNextWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
-    }
-    function testPrevWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>9,
-            'day'=>28,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->prevWeek('array'));
-    }
-    function testThisWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>10,
-            'day'=>5,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->thisWeek('array'));
-    }
-    function testNextWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>10,
-            'day'=>12,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->nextWeek('array'));
-    }
-    function testPrevWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003,9,28);
-        $Week = $this->cal->prevWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
-    }
-    function testThisWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003,10,5);
-        $Week = $this->cal->thisWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
-    }
-    function testNextWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003,10,12);
-        $Week = $this->cal->nextWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(),$Week->getTimeStamp());
-    }
-}
-
-class TestOfWeek_firstday_0_Build extends TestOfWeek_firstday_0 {
-    function TestOfWeek_firstday_0_Build() {
-        $this->UnitTestCase('Test of Week::build() - FirstDay = Sunday');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(7, $this->cal->size());
-    }
-
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ($Child = $this->cal->fetch()) {
-            $i++;
-        }
-        $this->assertEqual(7, $i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Day.php');
-        $selection = array(Calendar_Factory::create('Day', 2003, 10, 6));
-        $this->cal->build($selection);
-        $i = 1;
-        while ($Child = $this->cal->fetch()) {
-            if ($i == 2) {
-                break; //06-10-2003 is the 2nd day of the week
-            }
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-    function testSelectionCornerCase() {
-        require_once(CALENDAR_ROOT . 'Day.php');
-        $selectedDays = array(
-            Calendar_Factory::create('Day', 2003, 12, 28),
-            Calendar_Factory::create('Day', 2003, 12, 29),
-            Calendar_Factory::create('Day', 2003, 12, 30),
-            Calendar_Factory::create('Day', 2003, 12, 31),
-            Calendar_Factory::create('Day', 2004, 01, 01),
-            Calendar_Factory::create('Day', 2004, 01, 02),
-            Calendar_Factory::create('Day', 2004, 01, 03)
-        );
-        $this->cal = Calendar_Factory::create('Week', 2003, 12, 31, 0);
-        $this->cal->build($selectedDays);
-        while ($Day = $this->cal->fetch()) {
-            $this->assertTrue($Day->isSelected());
-        }
-        $this->cal = Calendar_Factory::create('Week', 2004, 1, 1, 0);
-        $this->cal->build($selectedDays);
-        while ($Day = $this->cal->fetch()) {
-            $this->assertTrue($Day->isSelected());
-        }
-    }
-}
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfWeek_firstday_0();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfWeek_firstday_0_Build();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/week_test.php b/airtime_mvc/library/pear/Calendar/tests/week_test.php
deleted file mode 100644
index 64db83071..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/week_test.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-// $Id: week_test.php 222080 2006-10-20 14:03:58Z quipo $
-define('CALENDAR_FIRST_DAY_OF_WEEK', 1); //force firstDay = monday
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfWeek extends TestOfCalendar {
-    function TestOfWeek() {
-        $this->UnitTestCase('Test of Week');
-    }
-    function setUp() {
-        $this->cal = Calendar_Factory::create('Week', 2003, 10, 9);
-        //print_r($this->cal);
-    }
-    function testThisYear () {
-        $this->assertEqual(2003, $this->cal->thisYear());
-
-        $stamp = mktime(0,0,0,1,1,2003);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2003, $this->cal->thisYear());
-        
-        $stamp = mktime(0,0,0,12,31,2003);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2004, $this->cal->thisYear());
-
-        $stamp = mktime(0,0,0,1,1,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2004, $this->cal->thisYear());
-        
-        $stamp = mktime(0,0,0,12,31,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2004, $this->cal->thisYear());
-        
-        $stamp = mktime(0,0,0,1,1,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2004, $this->cal->thisYear());
-
-        $stamp = mktime(0,0,0,12,31,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2005, $this->cal->thisYear());
-
-        $stamp = mktime(0,0,0,1,1,2006);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2005, $this->cal->thisYear());
-
-        $stamp = mktime(0,0,0,12,31,2006);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2006, $this->cal->thisYear());
-    }
-    function testPrevDay () {
-        $this->assertEqual(8, $this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2003,
-                'month'  => 10,
-                'day'    => 8,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(9, $this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(10, $this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23, $this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0, $this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1, $this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59, $this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0, $this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1, $this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59, $this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0, $this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1, $this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,10,9,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-    function testNewTimeStamp() {
-        $stamp = mktime(0,0,0,7,28,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual('30 2004', date('W Y', $this->cal->prevWeek(true)));
-        $this->assertEqual('31 2004', date('W Y', $this->cal->thisWeek(true)));
-        $this->assertEqual('32 2004', date('W Y', $this->cal->nextWeek(true)));
-    }
-    function testPrevWeekInMonth() {
-        $this->assertEqual(1, $this->cal->prevWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(0, $this->cal->prevWeek());
-    }
-    function testThisWeekInMonth() {
-        $this->assertEqual(2, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,1,1,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek());
-        $stamp = mktime(0,0,0,1,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2, $this->cal->thisWeek());
-    }
-    function testNextWeekInMonth() {
-        $this->assertEqual(3, $this->cal->nextWeek());
-        $stamp = mktime(0,0,0,2,3,2005);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(2, $this->cal->nextWeek());
-    }
-    function testPrevWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->prevWeek('timestamp')), $this->cal->prevWeek('n_in_year'));
-        $stamp = mktime(0,0,0,1,1,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
-    }
-    function testThisWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
-        $stamp = mktime(0,0,0,1,1,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(date('W', $this->cal->thisWeek('timestamp')), $this->cal->thisWeek('n_in_year'));
-    }
-    function testFirstWeekInYear() {
-        $stamp = mktime(0,0,0,1,4,2004);
-        $this->cal->setTimestamp($stamp);
-        $this->assertEqual(1, $this->cal->thisWeek('n_in_year'));
-    }
-    function testNextWeekInYear() {
-        $this->assertEqual(date('W', $this->cal->nextWeek('timestamp')), $this->cal->nextWeek('n_in_year'));
-    }
-    function testPrevWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>9,
-            'day'=>29,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->prevWeek('array'));
-    }
-    function testThisWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>10,
-            'day'=>6,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->thisWeek('array'));
-    }
-    function testNextWeekArray() {
-        $testArray = array(
-            'year'=>2003,
-            'month'=>10,
-            'day'=>13,
-            'hour'=>0,
-            'minute'=>0,
-            'second'=>0
-            );
-        $this->assertEqual($testArray, $this->cal->nextWeek('array'));
-    }
-    function testPrevWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003, 9, 29); //week starts on monday
-        $Week = $this->cal->prevWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
-    }
-    function testThisWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003, 10, 6); //week starts on monday
-        $Week = $this->cal->thisWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
-    }
-    function testNextWeekObject() {
-        $testWeek = Calendar_Factory::create('Week', 2003, 10, 13); //week starts on monday
-        $Week = $this->cal->nextWeek('object');
-        $this->assertEqual($testWeek->getTimeStamp(), $Week->getTimeStamp());
-    }
-}
-
-class TestOfWeekBuild extends TestOfWeek {
-    function TestOfWeekBuild() {
-        $this->UnitTestCase('Test of Week::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(7, $this->cal->size());
-    }
-
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ($Child = $this->cal->fetch()) {
-            $i++;
-        }
-        $this->assertEqual(7, $i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Day.php');
-        $selection = array(Calendar_Factory::create('Day', 2003, 10, 7));
-        $this->cal->build($selection);
-        $i = 1;
-        while ($Child = $this->cal->fetch()) {
-            if ($i == 2) {
-                break; //07-10-2003 is the 2nd day of the week (starting on monday)
-            }
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-    function testSelectionCornerCase() {
-        require_once(CALENDAR_ROOT . 'Day.php');
-        $selectedDays = array(
-            Calendar_Factory::create('Day', 2003, 12, 29),
-            Calendar_Factory::create('Day', 2003, 12, 30),
-            Calendar_Factory::create('Day', 2003, 12, 31),
-            Calendar_Factory::create('Day', 2004, 01, 01),
-            Calendar_Factory::create('Day', 2004, 01, 02),
-            Calendar_Factory::create('Day', 2004, 01, 03),
-            Calendar_Factory::create('Day', 2004, 01, 04)
-        );
-        $this->cal = Calendar_Factory::create('Week', 2003, 12, 31, 0);
-        $this->cal->build($selectedDays);
-        while ($Day = $this->cal->fetch()) {
-            $this->assertTrue($Day->isSelected());
-        }
-        $this->cal = Calendar_Factory::create('Week', 2004, 1, 1, 0);
-        $this->cal->build($selectedDays);
-        while ($Day = $this->cal->fetch()) {
-            $this->assertTrue($Day->isSelected());
-        }
-    }
-}
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfWeek();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfWeekBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Calendar/tests/year_test.php b/airtime_mvc/library/pear/Calendar/tests/year_test.php
deleted file mode 100644
index bacd1ec8d..000000000
--- a/airtime_mvc/library/pear/Calendar/tests/year_test.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-// $Id: year_test.php 159563 2004-05-24 22:25:43Z quipo $
-
-require_once('simple_include.php');
-require_once('calendar_include.php');
-
-require_once('./calendar_test.php');
-
-class TestOfYear extends TestOfCalendar {
-    function TestOfYear() {
-        $this->UnitTestCase('Test of Year');
-    }
-    function setUp() {
-        $this->cal = new Calendar_Year(2003);
-    }
-    function testPrevYear_Object() {
-        $this->assertEqual(new Calendar_Year(2002), $this->cal->prevYear('object'));
-    }
-    function testThisYear_Object() {
-        $this->assertEqual(new Calendar_Year(2003), $this->cal->thisYear('object'));
-    }
-    function testPrevMonth () {
-        $this->assertEqual(12,$this->cal->prevMonth());
-    }
-    function testPrevMonth_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2002,
-                'month'  => 12,
-                'day'    => 1,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevMonth('array'));
-    }
-    function testThisMonth () {
-        $this->assertEqual(1,$this->cal->thisMonth());
-    }
-    function testNextMonth () {
-        $this->assertEqual(2,$this->cal->nextMonth());
-    }
-    function testPrevDay () {
-        $this->assertEqual(31,$this->cal->prevDay());
-    }
-    function testPrevDay_Array () {
-        $this->assertEqual(
-            array(
-                'year'   => 2002,
-                'month'  => 12,
-                'day'    => 31,
-                'hour'   => 0,
-                'minute' => 0,
-                'second' => 0),
-            $this->cal->prevDay('array'));
-    }
-    function testThisDay () {
-        $this->assertEqual(1,$this->cal->thisDay());
-    }
-    function testNextDay () {
-        $this->assertEqual(2,$this->cal->nextDay());
-    }
-    function testPrevHour () {
-        $this->assertEqual(23,$this->cal->prevHour());
-    }
-    function testThisHour () {
-        $this->assertEqual(0,$this->cal->thisHour());
-    }
-    function testNextHour () {
-        $this->assertEqual(1,$this->cal->nextHour());
-    }
-    function testPrevMinute () {
-        $this->assertEqual(59,$this->cal->prevMinute());
-    }
-    function testThisMinute () {
-        $this->assertEqual(0,$this->cal->thisMinute());
-    }
-    function testNextMinute () {
-        $this->assertEqual(1,$this->cal->nextMinute());
-    }
-    function testPrevSecond () {
-        $this->assertEqual(59,$this->cal->prevSecond());
-    }
-    function testThisSecond () {
-        $this->assertEqual(0,$this->cal->thisSecond());
-    }
-    function testNextSecond () {
-        $this->assertEqual(1,$this->cal->nextSecond());
-    }
-    function testGetTimeStamp() {
-        $stamp = mktime(0,0,0,1,1,2003);
-        $this->assertEqual($stamp,$this->cal->getTimeStamp());
-    }
-}
-
-class TestOfYearBuild extends TestOfYear {
-    function TestOfYearBuild() {
-        $this->UnitTestCase('Test of Year::build()');
-    }
-    function testSize() {
-        $this->cal->build();
-        $this->assertEqual(12,$this->cal->size());
-    }
-    function testFetch() {
-        $this->cal->build();
-        $i=0;
-        while ( $Child = $this->cal->fetch() ) {
-            $i++;
-        }
-        $this->assertEqual(12,$i);
-    }
-    function testFetchAll() {
-        $this->cal->build();
-        $children = array();
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            $children[$i]=$Child;
-            $i++;
-        }
-        $this->assertEqual($children,$this->cal->fetchAll());
-    }
-    function testSelection() {
-        require_once(CALENDAR_ROOT . 'Month.php');
-        $selection = array(new Calendar_Month(2003,10));
-        $this->cal->build($selection);
-        $i = 1;
-        while ( $Child = $this->cal->fetch() ) {
-            if ( $i == 10 )
-                break;
-            $i++;
-        }
-        $this->assertTrue($Child->isSelected());
-    }
-}
-
-if (!defined('TEST_RUNNING')) {
-    define('TEST_RUNNING', true);
-    $test = &new TestOfYear();
-    $test->run(new HtmlReporter());
-    $test = &new TestOfYearBuild();
-    $test->run(new HtmlReporter());
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/Console/Getopt.php b/airtime_mvc/library/pear/Console/Getopt.php
deleted file mode 100644
index bb9d69ca2..000000000
--- a/airtime_mvc/library/pear/Console/Getopt.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Andrei Zmievski <andrei@php.net>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Getopt.php,v 1.4 2007/06/12 14:58:56 cellog Exp $
-
-require_once 'PEAR.php';
-
-/**
- * Command-line options parsing class.
- *
- * @author Andrei Zmievski <andrei@php.net>
- *
- */
-class Console_Getopt {
-    /**
-     * Parses the command-line options.
-     *
-     * The first parameter to this function should be the list of command-line
-     * arguments without the leading reference to the running program.
-     *
-     * The second parameter is a string of allowed short options. Each of the
-     * option letters can be followed by a colon ':' to specify that the option
-     * requires an argument, or a double colon '::' to specify that the option
-     * takes an optional argument.
-     *
-     * The third argument is an optional array of allowed long options. The
-     * leading '--' should not be included in the option name. Options that
-     * require an argument should be followed by '=', and options that take an
-     * option argument should be followed by '=='.
-     *
-     * The return value is an array of two elements: the list of parsed
-     * options and the list of non-option command-line arguments. Each entry in
-     * the list of parsed options is a pair of elements - the first one
-     * specifies the option, and the second one specifies the option argument,
-     * if there was one.
-     *
-     * Long and short options can be mixed.
-     *
-     * Most of the semantics of this function are based on GNU getopt_long().
-     *
-     * @param array  $args           an array of command-line arguments
-     * @param string $short_options  specifies the list of allowed short options
-     * @param array  $long_options   specifies the list of allowed long options
-     *
-     * @return array two-element array containing the list of parsed options and
-     * the non-option arguments
-     *
-     * @access public
-     *
-     */
-    function getopt2($args, $short_options, $long_options = null)
-    {
-        return Console_Getopt::doGetopt(2, $args, $short_options, $long_options);
-    }
-
-    /**
-     * This function expects $args to start with the script name (POSIX-style).
-     * Preserved for backwards compatibility.
-     * @see getopt2()
-     */    
-    function getopt($args, $short_options, $long_options = null)
-    {
-        return Console_Getopt::doGetopt(1, $args, $short_options, $long_options);
-    }
-
-    /**
-     * The actual implementation of the argument parsing code.
-     */
-    function doGetopt($version, $args, $short_options, $long_options = null)
-    {
-        // in case you pass directly readPHPArgv() as the first arg
-        if (PEAR::isError($args)) {
-            return $args;
-        }
-        if (empty($args)) {
-            return array(array(), array());
-        }
-        $opts     = array();
-        $non_opts = array();
-
-        settype($args, 'array');
-
-        if ($long_options) {
-            sort($long_options);
-        }
-
-        /*
-         * Preserve backwards compatibility with callers that relied on
-         * erroneous POSIX fix.
-         */
-        if ($version < 2) {
-            if (isset($args[0]{0}) && $args[0]{0} != '-') {
-                array_shift($args);
-            }
-        }
-
-        reset($args);
-        while (list($i, $arg) = each($args)) {
-
-            /* The special element '--' means explicit end of
-               options. Treat the rest of the arguments as non-options
-               and end the loop. */
-            if ($arg == '--') {
-                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
-                break;
-            }
-
-            if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
-                $non_opts = array_merge($non_opts, array_slice($args, $i));
-                break;
-            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
-                $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
-                if (PEAR::isError($error))
-                    return $error;
-            } elseif ($arg == '-') {
-                // - is stdin
-                $non_opts = array_merge($non_opts, array_slice($args, $i));
-                break;
-            } else {
-                $error = Console_Getopt::_parseShortOption(substr($arg, 1), $short_options, $opts, $args);
-                if (PEAR::isError($error))
-                    return $error;
-            }
-        }
-
-        return array($opts, $non_opts);
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _parseShortOption($arg, $short_options, &$opts, &$args)
-    {
-        for ($i = 0; $i < strlen($arg); $i++) {
-            $opt = $arg{$i};
-            $opt_arg = null;
-
-            /* Try to find the short option in the specifier string. */
-            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':')
-            {
-                return PEAR::raiseError("Console_Getopt: unrecognized option -- $opt");
-            }
-
-            if (strlen($spec) > 1 && $spec{1} == ':') {
-                if (strlen($spec) > 2 && $spec{2} == ':') {
-                    if ($i + 1 < strlen($arg)) {
-                        /* Option takes an optional argument. Use the remainder of
-                           the arg string if there is anything left. */
-                        $opts[] = array($opt, substr($arg, $i + 1));
-                        break;
-                    }
-                } else {
-                    /* Option requires an argument. Use the remainder of the arg
-                       string if there is anything left. */
-                    if ($i + 1 < strlen($arg)) {
-                        $opts[] = array($opt,  substr($arg, $i + 1));
-                        break;
-                    } else if (list(, $opt_arg) = each($args)) {
-                        /* Else use the next argument. */;
-                        if (Console_Getopt::_isShortOpt($opt_arg) || Console_Getopt::_isLongOpt($opt_arg)) {
-                            return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
-                        }
-                    } else {
-                        return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
-                    }
-                }
-            }
-
-            $opts[] = array($opt, $opt_arg);
-        }
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _isShortOpt($arg)
-    {
-        return strlen($arg) == 2 && $arg[0] == '-' && preg_match('/[a-zA-Z]/', $arg[1]);
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _isLongOpt($arg)
-    {
-        return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' &&
-            preg_match('/[a-zA-Z]+$/', substr($arg, 2));
-    }
-
-    /**
-     * @access private
-     *
-     */
-    function _parseLongOption($arg, $long_options, &$opts, &$args)
-    {
-        @list($opt, $opt_arg) = explode('=', $arg, 2);
-        $opt_len = strlen($opt);
-
-        for ($i = 0; $i < count($long_options); $i++) {
-            $long_opt  = $long_options[$i];
-            $opt_start = substr($long_opt, 0, $opt_len);
-            $long_opt_name = str_replace('=', '', $long_opt);
-
-            /* Option doesn't match. Go on to the next one. */
-            if ($long_opt_name != $opt) {
-                continue;
-            }
-
-            $opt_rest  = substr($long_opt, $opt_len);
-
-            /* Check that the options uniquely matches one of the allowed
-               options. */
-            if ($i + 1 < count($long_options)) {
-                $next_option_rest = substr($long_options[$i + 1], $opt_len);
-            } else {
-                $next_option_rest = '';
-            }
-            if ($opt_rest != '' && $opt{0} != '=' &&
-                $i + 1 < count($long_options) &&
-                $opt == substr($long_options[$i+1], 0, $opt_len) &&
-                $next_option_rest != '' &&
-                $next_option_rest{0} != '=') {
-                return PEAR::raiseError("Console_Getopt: option --$opt is ambiguous");
-            }
-
-            if (substr($long_opt, -1) == '=') {
-                if (substr($long_opt, -2) != '==') {
-                    /* Long option requires an argument.
-                       Take the next argument if one wasn't specified. */;
-                    if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) {
-                        return PEAR::raiseError("Console_Getopt: option --$opt requires an argument");
-                    }
-                    if (Console_Getopt::_isShortOpt($opt_arg) || Console_Getopt::_isLongOpt($opt_arg)) {
-                        return PEAR::raiseError("Console_Getopt: option requires an argument --$opt");
-                    }
-                }
-            } else if ($opt_arg) {
-                return PEAR::raiseError("Console_Getopt: option --$opt doesn't allow an argument");
-            }
-
-            $opts[] = array('--' . $opt, $opt_arg);
-            return;
-        }
-
-        return PEAR::raiseError("Console_Getopt: unrecognized option --$opt");
-    }
-
-    /**
-    * Safely read the $argv PHP array across different PHP configurations.
-    * Will take care on register_globals and register_argc_argv ini directives
-    *
-    * @access public
-    * @return mixed the $argv PHP array or PEAR error if not registered
-    */
-    function readPHPArgv()
-    {
-        global $argv;
-        if (!is_array($argv)) {
-            if (!@is_array($_SERVER['argv'])) {
-                if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
-                    return PEAR::raiseError("Console_Getopt: Could not read cmd args (register_argc_argv=Off?)");
-                }
-                return $GLOBALS['HTTP_SERVER_VARS']['argv'];
-            }
-            return $_SERVER['argv'];
-        }
-        return $argv;
-    }
-
-}
-
-?>
diff --git a/airtime_mvc/library/pear/DB.php b/airtime_mvc/library/pear/DB.php
deleted file mode 100644
index a511979e6..000000000
--- a/airtime_mvc/library/pear/DB.php
+++ /dev/null
@@ -1,1489 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Database independent query interface
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DB.php,v 1.88 2007/08/12 05:27:25 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the PEAR class so it can be extended from
- */
-require_once 'PEAR.php';
-
-
-// {{{ constants
-// {{{ error codes
-
-/**#@+
- * One of PEAR DB's portable error codes.
- * @see DB_common::errorCode(), DB::errorMessage()
- *
- * {@internal If you add an error code here, make sure you also add a textual
- * version of it in DB::errorMessage().}}
- */
-
-/**
- * The code returned by many methods upon success
- */
-define('DB_OK', 1);
-
-/**
- * Unkown error
- */
-define('DB_ERROR', -1);
-
-/**
- * Syntax error
- */
-define('DB_ERROR_SYNTAX', -2);
-
-/**
- * Tried to insert a duplicate value into a primary or unique index
- */
-define('DB_ERROR_CONSTRAINT', -3);
-
-/**
- * An identifier in the query refers to a non-existant object
- */
-define('DB_ERROR_NOT_FOUND', -4);
-
-/**
- * Tried to create a duplicate object
- */
-define('DB_ERROR_ALREADY_EXISTS', -5);
-
-/**
- * The current driver does not support the action you attempted
- */
-define('DB_ERROR_UNSUPPORTED', -6);
-
-/**
- * The number of parameters does not match the number of placeholders
- */
-define('DB_ERROR_MISMATCH', -7);
-
-/**
- * A literal submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID', -8);
-
-/**
- * The current DBMS does not support the action you attempted
- */
-define('DB_ERROR_NOT_CAPABLE', -9);
-
-/**
- * A literal submitted was too long so the end of it was removed
- */
-define('DB_ERROR_TRUNCATED', -10);
-
-/**
- * A literal number submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID_NUMBER', -11);
-
-/**
- * A literal date submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID_DATE', -12);
-
-/**
- * Attempt to divide something by zero
- */
-define('DB_ERROR_DIVZERO', -13);
-
-/**
- * A database needs to be selected
- */
-define('DB_ERROR_NODBSELECTED', -14);
-
-/**
- * Could not create the object requested
- */
-define('DB_ERROR_CANNOT_CREATE', -15);
-
-/**
- * Could not drop the database requested because it does not exist
- */
-define('DB_ERROR_CANNOT_DROP', -17);
-
-/**
- * An identifier in the query refers to a non-existant table
- */
-define('DB_ERROR_NOSUCHTABLE', -18);
-
-/**
- * An identifier in the query refers to a non-existant column
- */
-define('DB_ERROR_NOSUCHFIELD', -19);
-
-/**
- * The data submitted to the method was inappropriate
- */
-define('DB_ERROR_NEED_MORE_DATA', -20);
-
-/**
- * The attempt to lock the table failed
- */
-define('DB_ERROR_NOT_LOCKED', -21);
-
-/**
- * The number of columns doesn't match the number of values
- */
-define('DB_ERROR_VALUE_COUNT_ON_ROW', -22);
-
-/**
- * The DSN submitted has problems
- */
-define('DB_ERROR_INVALID_DSN', -23);
-
-/**
- * Could not connect to the database
- */
-define('DB_ERROR_CONNECT_FAILED', -24);
-
-/**
- * The PHP extension needed for this DBMS could not be found
- */
-define('DB_ERROR_EXTENSION_NOT_FOUND',-25);
-
-/**
- * The present user has inadequate permissions to perform the task requestd
- */
-define('DB_ERROR_ACCESS_VIOLATION', -26);
-
-/**
- * The database requested does not exist
- */
-define('DB_ERROR_NOSUCHDB', -27);
-
-/**
- * Tried to insert a null value into a column that doesn't allow nulls
- */
-define('DB_ERROR_CONSTRAINT_NOT_NULL',-29);
-/**#@-*/
-
-
-// }}}
-// {{{ prepared statement-related
-
-
-/**#@+
- * Identifiers for the placeholders used in prepared statements.
- * @see DB_common::prepare()
- */
-
-/**
- * Indicates a scalar (<kbd>?</kbd>) placeholder was used
- *
- * Quote and escape the value as necessary.
- */
-define('DB_PARAM_SCALAR', 1);
-
-/**
- * Indicates an opaque (<kbd>&</kbd>) placeholder was used
- *
- * The value presented is a file name.  Extract the contents of that file
- * and place them in this column.
- */
-define('DB_PARAM_OPAQUE', 2);
-
-/**
- * Indicates a misc (<kbd>!</kbd>) placeholder was used
- *
- * The value should not be quoted or escaped.
- */
-define('DB_PARAM_MISC',   3);
-/**#@-*/
-
-
-// }}}
-// {{{ binary data-related
-
-
-/**#@+
- * The different ways of returning binary data from queries.
- */
-
-/**
- * Sends the fetched data straight through to output
- */
-define('DB_BINMODE_PASSTHRU', 1);
-
-/**
- * Lets you return data as usual
- */
-define('DB_BINMODE_RETURN', 2);
-
-/**
- * Converts the data to hex format before returning it
- *
- * For example the string "123" would become "313233".
- */
-define('DB_BINMODE_CONVERT', 3);
-/**#@-*/
-
-
-// }}}
-// {{{ fetch modes
-
-
-/**#@+
- * Fetch Modes.
- * @see DB_common::setFetchMode()
- */
-
-/**
- * Indicates the current default fetch mode should be used
- * @see DB_common::$fetchmode
- */
-define('DB_FETCHMODE_DEFAULT', 0);
-
-/**
- * Column data indexed by numbers, ordered from 0 and up
- */
-define('DB_FETCHMODE_ORDERED', 1);
-
-/**
- * Column data indexed by column names
- */
-define('DB_FETCHMODE_ASSOC', 2);
-
-/**
- * Column data as object properties
- */
-define('DB_FETCHMODE_OBJECT', 3);
-
-/**
- * For multi-dimensional results, make the column name the first level
- * of the array and put the row number in the second level of the array
- *
- * This is flipped from the normal behavior, which puts the row numbers
- * in the first level of the array and the column names in the second level.
- */
-define('DB_FETCHMODE_FLIPPED', 4);
-/**#@-*/
-
-/**#@+
- * Old fetch modes.  Left here for compatibility.
- */
-define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
-define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
-define('DB_GETMODE_FLIPPED', DB_FETCHMODE_FLIPPED);
-/**#@-*/
-
-
-// }}}
-// {{{ tableInfo() && autoPrepare()-related
-
-
-/**#@+
- * The type of information to return from the tableInfo() method.
- *
- * Bitwised constants, so they can be combined using <kbd>|</kbd>
- * and removed using <kbd>^</kbd>.
- *
- * @see DB_common::tableInfo()
- *
- * {@internal Since the TABLEINFO constants are bitwised, if more of them are
- * added in the future, make sure to adjust DB_TABLEINFO_FULL accordingly.}}
- */
-define('DB_TABLEINFO_ORDER', 1);
-define('DB_TABLEINFO_ORDERTABLE', 2);
-define('DB_TABLEINFO_FULL', 3);
-/**#@-*/
-
-
-/**#@+
- * The type of query to create with the automatic query building methods.
- * @see DB_common::autoPrepare(), DB_common::autoExecute()
- */
-define('DB_AUTOQUERY_INSERT', 1);
-define('DB_AUTOQUERY_UPDATE', 2);
-/**#@-*/
-
-
-// }}}
-// {{{ portability modes
-
-
-/**#@+
- * Portability Modes.
- *
- * Bitwised constants, so they can be combined using <kbd>|</kbd>
- * and removed using <kbd>^</kbd>.
- *
- * @see DB_common::setOption()
- *
- * {@internal Since the PORTABILITY constants are bitwised, if more of them are
- * added in the future, make sure to adjust DB_PORTABILITY_ALL accordingly.}}
- */
-
-/**
- * Turn off all portability features
- */
-define('DB_PORTABILITY_NONE', 0);
-
-/**
- * Convert names of tables and fields to lower case
- * when using the get*(), fetch*() and tableInfo() methods
- */
-define('DB_PORTABILITY_LOWERCASE', 1);
-
-/**
- * Right trim the data output by get*() and fetch*()
- */
-define('DB_PORTABILITY_RTRIM', 2);
-
-/**
- * Force reporting the number of rows deleted
- */
-define('DB_PORTABILITY_DELETE_COUNT', 4);
-
-/**
- * Enable hack that makes numRows() work in Oracle
- */
-define('DB_PORTABILITY_NUMROWS', 8);
-
-/**
- * Makes certain error messages in certain drivers compatible
- * with those from other DBMS's
- *
- * + mysql, mysqli:  change unique/primary key constraints
- *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
- *
- * + odbc(access):  MS's ODBC driver reports 'no such field' as code
- *   07001, which means 'too few parameters.'  When this option is on
- *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
- */
-define('DB_PORTABILITY_ERRORS', 16);
-
-/**
- * Convert null values to empty strings in data output by
- * get*() and fetch*()
- */
-define('DB_PORTABILITY_NULL_TO_EMPTY', 32);
-
-/**
- * Turn on all portability features
- */
-define('DB_PORTABILITY_ALL', 63);
-/**#@-*/
-
-// }}}
-
-
-// }}}
-// {{{ class DB
-
-/**
- * Database independent query interface
- *
- * The main "DB" class is simply a container class with some static
- * methods for creating DB objects as well as some utility functions
- * common to all parts of DB.
- *
- * The object model of DB is as follows (indentation means inheritance):
- * <pre>
- * DB           The main DB class.  This is simply a utility class
- *              with some "static" methods for creating DB objects as
- *              well as common utility functions for other DB classes.
- *
- * DB_common    The base for each DB implementation.  Provides default
- * |            implementations (in OO lingo virtual methods) for
- * |            the actual DB implementations as well as a bunch of
- * |            query utility functions.
- * |
- * +-DB_mysql   The DB implementation for MySQL.  Inherits DB_common.
- *              When calling DB::factory or DB::connect for MySQL
- *              connections, the object returned is an instance of this
- *              class.
- * </pre>
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB
-{
-    // {{{ &factory()
-
-    /**
-     * Create a new DB object for the specified database type but don't
-     * connect to the database
-     *
-     * @param string $type     the database type (eg "mysql")
-     * @param array  $options  an associative array of option names and values
-     *
-     * @return object  a new DB object.  A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function &factory($type, $options = false)
-    {
-        if (!is_array($options)) {
-            $options = array('persistent' => $options);
-        }
-
-        if (isset($options['debug']) && $options['debug'] >= 2) {
-            // expose php errors with sufficient debug level
-            include_once "DB/{$type}.php";
-        } else {
-            @include_once "DB/{$type}.php";
-        }
-
-        $classname = "DB_${type}";
-
-        if (!class_exists($classname)) {
-            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                    "Unable to include the DB/{$type}.php"
-                                    . " file for '$dsn'",
-                                    'DB_Error', true);
-            return $tmp;
-        }
-
-        @$obj = new $classname;
-
-        foreach ($options as $option => $value) {
-            $test = $obj->setOption($option, $value);
-            if (DB::isError($test)) {
-                return $test;
-            }
-        }
-
-        return $obj;
-    }
-
-    // }}}
-    // {{{ &connect()
-
-    /**
-     * Create a new DB object including a connection to the specified database
-     *
-     * Example 1.
-     * <code>
-     * require_once 'DB.php';
-     *
-     * $dsn = 'pgsql://user:password@host/database';
-     * $options = array(
-     *     'debug'       => 2,
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db =& DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param mixed $dsn      the string "data source name" or array in the
-     *                         format returned by DB::parseDSN()
-     * @param array $options  an associative array of option names and values
-     *
-     * @return object  a new DB object.  A DB_Error object on failure.
-     *
-     * @uses DB_dbase::connect(), DB_fbsql::connect(), DB_ibase::connect(),
-     *       DB_ifx::connect(), DB_msql::connect(), DB_mssql::connect(),
-     *       DB_mysql::connect(), DB_mysqli::connect(), DB_oci8::connect(),
-     *       DB_odbc::connect(), DB_pgsql::connect(), DB_sqlite::connect(),
-     *       DB_sybase::connect()
-     *
-     * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
-     */
-    function &connect($dsn, $options = array())
-    {
-        $dsninfo = DB::parseDSN($dsn);
-        $type = $dsninfo['phptype'];
-
-        if (!is_array($options)) {
-            /*
-             * For backwards compatibility.  $options used to be boolean,
-             * indicating whether the connection should be persistent.
-             */
-            $options = array('persistent' => $options);
-        }
-
-        if (isset($options['debug']) && $options['debug'] >= 2) {
-            // expose php errors with sufficient debug level
-            include_once "DB/${type}.php";
-        } else {
-            @include_once "DB/${type}.php";
-        }
-
-        $classname = "DB_${type}";
-        if (!class_exists($classname)) {
-            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                    "Unable to include the DB/{$type}.php"
-                                    . " file for '$dsn'",
-                                    'DB_Error', true);
-            return $tmp;
-        }
-
-        @$obj = new $classname;
-
-        foreach ($options as $option => $value) {
-            $test = $obj->setOption($option, $value);
-            if (DB::isError($test)) {
-                return $test;
-            }
-        }
-
-        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
-        if (DB::isError($err)) {
-            if (is_array($dsn)) {
-                $err->addUserInfo(DB::getDSNString($dsn, true));
-            } else {
-                $err->addUserInfo($dsn);
-            }
-            return $err;
-        }
-
-        return $obj;
-    }
-
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Return the DB API version
-     *
-     * @return string  the DB API version number
-     */
-    function apiVersion()
-    {
-        return '1.7.13';
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Determines if a variable is a DB_Error object
-     *
-     * @param mixed $value  the variable to check
-     *
-     * @return bool  whether $value is DB_Error object
-     */
-    function isError($value)
-    {
-        return is_a($value, 'DB_Error');
-    }
-
-    // }}}
-    // {{{ isConnection()
-
-    /**
-     * Determines if a value is a DB_<driver> object
-     *
-     * @param mixed $value  the value to test
-     *
-     * @return bool  whether $value is a DB_<driver> object
-     */
-    function isConnection($value)
-    {
-        return (is_object($value) &&
-                is_subclass_of($value, 'db_common') &&
-                method_exists($value, 'simpleQuery'));
-    }
-
-    // }}}
-    // {{{ isManip()
-
-    /**
-     * Tell whether a query is a data manipulation or data definition query
-     *
-     * Examples of data manipulation queries are INSERT, UPDATE and DELETE.
-     * Examples of data definition queries are CREATE, DROP, ALTER, GRANT,
-     * REVOKE.
-     *
-     * @param string $query  the query
-     *
-     * @return boolean  whether $query is a data manipulation query
-     */
-    function isManip($query)
-    {
-        $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
-                . 'CREATE|DROP|'
-                . 'LOAD DATA|SELECT .* INTO .* FROM|COPY|'
-                . 'ALTER|GRANT|REVOKE|'
-                . 'LOCK|UNLOCK';
-        if (preg_match('/^\s*"?(' . $manips . ')\s+/i', $query)) {
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Return a textual error message for a DB error code
-     *
-     * @param integer $value  the DB error code
-     *
-     * @return string  the error message or false if the error code was
-     *                  not recognized
-     */
-    function errorMessage($value)
-    {
-        static $errorMessages;
-        if (!isset($errorMessages)) {
-            $errorMessages = array(
-                DB_ERROR                    => 'unknown error',
-                DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
-                DB_ERROR_ALREADY_EXISTS     => 'already exists',
-                DB_ERROR_CANNOT_CREATE      => 'can not create',
-                DB_ERROR_CANNOT_DROP        => 'can not drop',
-                DB_ERROR_CONNECT_FAILED     => 'connect failed',
-                DB_ERROR_CONSTRAINT         => 'constraint violation',
-                DB_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
-                DB_ERROR_DIVZERO            => 'division by zero',
-                DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-                DB_ERROR_INVALID            => 'invalid',
-                DB_ERROR_INVALID_DATE       => 'invalid date or time',
-                DB_ERROR_INVALID_DSN        => 'invalid DSN',
-                DB_ERROR_INVALID_NUMBER     => 'invalid number',
-                DB_ERROR_MISMATCH           => 'mismatch',
-                DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-                DB_ERROR_NODBSELECTED       => 'no database selected',
-                DB_ERROR_NOSUCHDB           => 'no such database',
-                DB_ERROR_NOSUCHFIELD        => 'no such field',
-                DB_ERROR_NOSUCHTABLE        => 'no such table',
-                DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-                DB_ERROR_NOT_FOUND          => 'not found',
-                DB_ERROR_NOT_LOCKED         => 'not locked',
-                DB_ERROR_SYNTAX             => 'syntax error',
-                DB_ERROR_UNSUPPORTED        => 'not supported',
-                DB_ERROR_TRUNCATED          => 'truncated',
-                DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-                DB_OK                       => 'no error',
-            );
-        }
-
-        if (DB::isError($value)) {
-            $value = $value->getCode();
-        }
-
-        return isset($errorMessages[$value]) ? $errorMessages[$value]
-                     : $errorMessages[DB_ERROR];
-    }
-
-    // }}}
-    // {{{ parseDSN()
-
-    /**
-     * Parse a data source name
-     *
-     * Additional keys can be added by appending a URI query string to the
-     * end of the DSN.
-     *
-     * The format of the supplied DSN is in its fullest form:
-     * <code>
-     *  phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
-     * </code>
-     *
-     * Most variations are allowed:
-     * <code>
-     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
-     *  phptype://username:password@hostspec/database_name
-     *  phptype://username:password@hostspec
-     *  phptype://username@hostspec
-     *  phptype://hostspec/database
-     *  phptype://hostspec
-     *  phptype(dbsyntax)
-     *  phptype
-     * </code>
-     *
-     * @param string $dsn Data Source Name to be parsed
-     *
-     * @return array an associative array with the following keys:
-     *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
-     *  + dbsyntax: Database used with regards to SQL syntax etc.
-     *  + protocol: Communication protocol to use (tcp, unix etc.)
-     *  + hostspec: Host specification (hostname[:port])
-     *  + database: Database to use on the DBMS server
-     *  + username: User name for login
-     *  + password: Password for login
-     */
-    function parseDSN($dsn)
-    {
-        $parsed = array(
-            'phptype'  => false,
-            'dbsyntax' => false,
-            'username' => false,
-            'password' => false,
-            'protocol' => false,
-            'hostspec' => false,
-            'port'     => false,
-            'socket'   => false,
-            'database' => false,
-        );
-
-        if (is_array($dsn)) {
-            $dsn = array_merge($parsed, $dsn);
-            if (!$dsn['dbsyntax']) {
-                $dsn['dbsyntax'] = $dsn['phptype'];
-            }
-            return $dsn;
-        }
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        } else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
-        } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (!count($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            } else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            // $dsn => proto(proto_opts)/database
-            $proto       = $match[1];
-            $proto_opts  = $match[2] ? $match[2] : false;
-            $dsn         = $match[3];
-
-        } else {
-            // $dsn => protocol+hostspec/database (old format)
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            } else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if (strpos($proto_opts, ':') !== false) {
-            list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
-        }
-        if ($parsed['protocol'] == 'tcp') {
-            $parsed['hostspec'] = $proto_opts;
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if ($dsn) {
-            if (($pos = strpos($dsn, '?')) === false) {
-                // /database
-                $parsed['database'] = rawurldecode($dsn);
-            } else {
-                // /database?param1=value1&param2=value2
-                $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                } else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) {
-                        // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
-
-    // }}}
-    // {{{ getDSNString()
-
-    /**
-     * Returns the given DSN in a string format suitable for output.
-     *
-     * @param array|string the DSN to parse and format
-     * @param boolean true to hide the password, false to include it
-     * @return string
-     */
-    function getDSNString($dsn, $hidePassword) {
-        /* Calling parseDSN will ensure that we have all the array elements
-         * defined, and means that we deal with strings and array in the same
-         * manner. */
-        $dsnArray = DB::parseDSN($dsn);
-        
-        if ($hidePassword) {
-            $dsnArray['password'] = 'PASSWORD';
-        }
-
-        /* Protocol is special-cased, as using the default "tcp" along with an
-         * Oracle TNS connection string fails. */
-        if (is_string($dsn) && strpos($dsn, 'tcp') === false && $dsnArray['protocol'] == 'tcp') {
-            $dsnArray['protocol'] = false;
-        }
-        
-        // Now we just have to construct the actual string. This is ugly.
-        $dsnString = $dsnArray['phptype'];
-        if ($dsnArray['dbsyntax']) {
-            $dsnString .= '('.$dsnArray['dbsyntax'].')';
-        }
-        $dsnString .= '://'
-                     .$dsnArray['username']
-                     .':'
-                     .$dsnArray['password']
-                     .'@'
-                     .$dsnArray['protocol'];
-        if ($dsnArray['socket']) {
-            $dsnString .= '('.$dsnArray['socket'].')';
-        }
-        if ($dsnArray['protocol'] && $dsnArray['hostspec']) {
-            $dsnString .= '+';
-        }
-        $dsnString .= $dsnArray['hostspec'];
-        if ($dsnArray['port']) {
-            $dsnString .= ':'.$dsnArray['port'];
-        }
-        $dsnString .= '/'.$dsnArray['database'];
-        
-        /* Option handling. Unfortunately, parseDSN simply places options into
-         * the top-level array, so we'll first get rid of the fields defined by
-         * DB and see what's left. */
-        unset($dsnArray['phptype'],
-              $dsnArray['dbsyntax'],
-              $dsnArray['username'],
-              $dsnArray['password'],
-              $dsnArray['protocol'],
-              $dsnArray['socket'],
-              $dsnArray['hostspec'],
-              $dsnArray['port'],
-              $dsnArray['database']
-        );
-        if (count($dsnArray) > 0) {
-            $dsnString .= '?';
-            $i = 0;
-            foreach ($dsnArray as $key => $value) {
-                if (++$i > 1) {
-                    $dsnString .= '&';
-                }
-                $dsnString .= $key.'='.$value;
-            }
-        }
-
-        return $dsnString;
-    }
-    
-    // }}}
-}
-
-// }}}
-// {{{ class DB_Error
-
-/**
- * DB_Error implements a class for reporting portable database error
- * messages
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_Error extends PEAR_Error
-{
-    // {{{ constructor
-
-    /**
-     * DB_Error constructor
-     *
-     * @param mixed $code       DB error code, or string with error message
-     * @param int   $mode       what "error mode" to operate in
-     * @param int   $level      what error level to use for $mode &
-     *                           PEAR_ERROR_TRIGGER
-     * @param mixed $debuginfo  additional debug info, such as the last query
-     *
-     * @see PEAR_Error
-     */
-    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
-                      $level = E_USER_NOTICE, $debuginfo = null)
-    {
-        if (is_int($code)) {
-            $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
-                              $mode, $level, $debuginfo);
-        } else {
-            $this->PEAR_Error("DB Error: $code", DB_ERROR,
-                              $mode, $level, $debuginfo);
-        }
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class DB_result
-
-/**
- * This class implements a wrapper for a DB result set
- *
- * A new instance of this class will be returned by the DB implementation
- * after processing a query that returns data.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_result
-{
-    // {{{ properties
-
-    /**
-     * Should results be freed automatically when there are no more rows?
-     * @var boolean
-     * @see DB_common::$options
-     */
-    var $autofree;
-
-    /**
-     * A reference to the DB_<driver> object
-     * @var object
-     */
-    var $dbh;
-
-    /**
-     * The current default fetch mode
-     * @var integer
-     * @see DB_common::$fetchmode
-     */
-    var $fetchmode;
-
-    /**
-     * The name of the class into which results should be fetched when
-     * DB_FETCHMODE_OBJECT is in effect
-     *
-     * @var string
-     * @see DB_common::$fetchmode_object_class
-     */
-    var $fetchmode_object_class;
-
-    /**
-     * The number of rows to fetch from a limit query
-     * @var integer
-     */
-    var $limit_count = null;
-
-    /**
-     * The row to start fetching from in limit queries
-     * @var integer
-     */
-    var $limit_from = null;
-
-    /**
-     * The execute parameters that created this result
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    var $parameters;
-
-    /**
-     * The query string that created this result
-     *
-     * Copied here incase it changes in $dbh, which is referenced
-     *
-     * @var string
-     * @since Property available since Release 1.7.0
-     */
-    var $query;
-
-    /**
-     * The query result resource id created by PHP
-     * @var resource
-     */
-    var $result;
-
-    /**
-     * The present row being dealt with
-     * @var integer
-     */
-    var $row_counter = null;
-
-    /**
-     * The prepared statement resource id created by PHP in $dbh
-     *
-     * This resource is only available when the result set was created using
-     * a driver's native execute() method, not PEAR DB's emulated one.
-     *
-     * Copied here incase it changes in $dbh, which is referenced
-     *
-     * {@internal  Mainly here because the InterBase/Firebird API is only
-     * able to retrieve data from result sets if the statemnt handle is
-     * still in scope.}}
-     *
-     * @var resource
-     * @since Property available since Release 1.7.0
-     */
-    var $statement;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor sets the object's properties
-     *
-     * @param object   &$dbh     the DB object reference
-     * @param resource $result   the result resource id
-     * @param array    $options  an associative array with result options
-     *
-     * @return void
-     */
-    function DB_result(&$dbh, $result, $options = array())
-    {
-        $this->autofree    = $dbh->options['autofree'];
-        $this->dbh         = &$dbh;
-        $this->fetchmode   = $dbh->fetchmode;
-        $this->fetchmode_object_class = $dbh->fetchmode_object_class;
-        $this->parameters  = $dbh->last_parameters;
-        $this->query       = $dbh->last_query;
-        $this->result      = $result;
-        $this->statement   = empty($dbh->last_stmt) ? null : $dbh->last_stmt;
-        foreach ($options as $key => $value) {
-            $this->setOption($key, $value);
-        }
-    }
-
-    /**
-     * Set options for the DB_result object
-     *
-     * @param string $key    the option to set
-     * @param mixed  $value  the value to set the option to
-     *
-     * @return void
-     */
-    function setOption($key, $value = null)
-    {
-        switch ($key) {
-            case 'limit_from':
-                $this->limit_from = $value;
-                break;
-            case 'limit_count':
-                $this->limit_count = $value;
-        }
-    }
-
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row of data and return it by reference into an array
-     *
-     * The type of array returned can be controlled either by setting this
-     * method's <var>$fetchmode</var> parameter or by changing the default
-     * fetch mode setFetchMode() before calling this method.
-     *
-     * There are two options for standardizing the information returned
-     * from databases, ensuring their values are consistent when changing
-     * DBMS's.  These portability options can be turned on when creating a
-     * new DB object or by using setOption().
-     *
-     *   + <var>DB_PORTABILITY_LOWERCASE</var>
-     *     convert names of fields to lower case
-     *
-     *   + <var>DB_PORTABILITY_RTRIM</var>
-     *     right trim the data
-     *
-     * @param int $fetchmode  the constant indicating how to format the data
-     * @param int $rownum     the row number to fetch (index starts at 0)
-     *
-     * @return mixed  an array or object containing the row's data,
-     *                 NULL when the end of the result set is reached
-     *                 or a DB_Error object on failure.
-     *
-     * @see DB_common::setOption(), DB_common::setFetchMode()
-     */
-    function &fetchRow($fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        if ($fetchmode === DB_FETCHMODE_OBJECT) {
-            $fetchmode = DB_FETCHMODE_ASSOC;
-            $object_class = $this->fetchmode_object_class;
-        }
-        if (is_null($rownum) && $this->limit_from !== null) {
-            if ($this->row_counter === null) {
-                $this->row_counter = $this->limit_from;
-                // Skip rows
-                if ($this->dbh->features['limit'] === false) {
-                    $i = 0;
-                    while ($i++ < $this->limit_from) {
-                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
-                    }
-                }
-            }
-            if ($this->row_counter >= ($this->limit_from + $this->limit_count))
-            {
-                if ($this->autofree) {
-                    $this->free();
-                }
-                $tmp = null;
-                return $tmp;
-            }
-            if ($this->dbh->features['limit'] === 'emulate') {
-                $rownum = $this->row_counter;
-            }
-            $this->row_counter++;
-        }
-        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
-        if ($res === DB_OK) {
-            if (isset($object_class)) {
-                // The default mode is specified in the
-                // DB_common::fetchmode_object_class property
-                if ($object_class == 'stdClass') {
-                    $arr = (object) $arr;
-                } else {
-                    $arr = new $object_class($arr);
-                }
-            }
-            return $arr;
-        }
-        if ($res == null && $this->autofree) {
-            $this->free();
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Fetch a row of data into an array which is passed by reference
-     *
-     * The type of array returned can be controlled either by setting this
-     * method's <var>$fetchmode</var> parameter or by changing the default
-     * fetch mode setFetchMode() before calling this method.
-     *
-     * There are two options for standardizing the information returned
-     * from databases, ensuring their values are consistent when changing
-     * DBMS's.  These portability options can be turned on when creating a
-     * new DB object or by using setOption().
-     *
-     *   + <var>DB_PORTABILITY_LOWERCASE</var>
-     *     convert names of fields to lower case
-     *
-     *   + <var>DB_PORTABILITY_RTRIM</var>
-     *     right trim the data
-     *
-     * @param array &$arr       the variable where the data should be placed
-     * @param int   $fetchmode  the constant indicating how to format the data
-     * @param int   $rownum     the row number to fetch (index starts at 0)
-     *
-     * @return mixed  DB_OK if a row is processed, NULL when the end of the
-     *                 result set is reached or a DB_Error object on failure
-     *
-     * @see DB_common::setOption(), DB_common::setFetchMode()
-     */
-    function fetchInto(&$arr, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        if ($fetchmode === DB_FETCHMODE_OBJECT) {
-            $fetchmode = DB_FETCHMODE_ASSOC;
-            $object_class = $this->fetchmode_object_class;
-        }
-        if (is_null($rownum) && $this->limit_from !== null) {
-            if ($this->row_counter === null) {
-                $this->row_counter = $this->limit_from;
-                // Skip rows
-                if ($this->dbh->features['limit'] === false) {
-                    $i = 0;
-                    while ($i++ < $this->limit_from) {
-                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
-                    }
-                }
-            }
-            if ($this->row_counter >= (
-                    $this->limit_from + $this->limit_count))
-            {
-                if ($this->autofree) {
-                    $this->free();
-                }
-                return null;
-            }
-            if ($this->dbh->features['limit'] === 'emulate') {
-                $rownum = $this->row_counter;
-            }
-
-            $this->row_counter++;
-        }
-        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
-        if ($res === DB_OK) {
-            if (isset($object_class)) {
-                // default mode specified in the
-                // DB_common::fetchmode_object_class property
-                if ($object_class == 'stdClass') {
-                    $arr = (object) $arr;
-                } else {
-                    $arr = new $object_class($arr);
-                }
-            }
-            return DB_OK;
-        }
-        if ($res == null && $this->autofree) {
-            $this->free();
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Get the the number of columns in a result set
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     */
-    function numCols()
-    {
-        return $this->dbh->numCols($this->result);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Get the number of rows in a result set
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function numRows()
-    {
-        if ($this->dbh->features['numrows'] === 'emulate'
-            && $this->dbh->options['portability'] & DB_PORTABILITY_NUMROWS)
-        {
-            if ($this->dbh->features['prepare']) {
-                $res = $this->dbh->query($this->query, $this->parameters);
-            } else {
-                $res = $this->dbh->query($this->query);
-            }
-            if (DB::isError($res)) {
-                return $res;
-            }
-            $i = 0;
-            while ($res->fetchInto($tmp, DB_FETCHMODE_ORDERED)) {
-                $i++;
-            }
-            $count = $i;
-        } else {
-            $count = $this->dbh->numRows($this->result);
-        }
-
-        /* fbsql is checked for here because limit queries are implemented
-         * using a TOP() function, which results in fbsql_num_rows still
-         * returning the total number of rows that would have been returned,
-         * rather than the real number. As a result, we'll just do the limit
-         * calculations for fbsql in the same way as a database with emulated
-         * limits. Unfortunately, we can't just do this in DB_fbsql::numRows()
-         * because that only gets the result resource, rather than the full
-         * DB_Result object. */
-        if (($this->dbh->features['limit'] === 'emulate'
-             && $this->limit_from !== null)
-            || $this->dbh->phptype == 'fbsql') {
-            $limit_count = is_null($this->limit_count) ? $count : $this->limit_count;
-            if ($count < $this->limit_from) {
-                $count = 0;
-            } elseif ($count < ($this->limit_from + $limit_count)) {
-                $count -= $this->limit_from;
-            } else {
-                $count = $limit_count;
-            }
-        }
-
-        return $count;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Get the next result if a batch of queries was executed
-     *
-     * @return bool  true if a new result is available or false if not
-     */
-    function nextResult()
-    {
-        return $this->dbh->nextResult($this->result);
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Frees the resources allocated for this result set
-     *
-     * @return bool  true on success.  A DB_Error object on failure.
-     */
-    function free()
-    {
-        $err = $this->dbh->freeResult($this->result);
-        if (DB::isError($err)) {
-            return $err;
-        }
-        $this->result = false;
-        $this->statement = false;
-        return true;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * @see DB_common::tableInfo()
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function tableInfo($mode = null)
-    {
-        if (is_string($mode)) {
-            return $this->dbh->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-        return $this->dbh->tableInfo($this, $mode);
-    }
-
-    // }}}
-    // {{{ getQuery()
-
-    /**
-     * Determine the query string that created this result
-     *
-     * @return string  the query string
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function getQuery()
-    {
-        return $this->query;
-    }
-
-    // }}}
-    // {{{ getRowCounter()
-
-    /**
-     * Tells which row number is currently being processed
-     *
-     * @return integer  the current row being looked at.  Starts at 1.
-     */
-    function getRowCounter()
-    {
-        return $this->row_counter;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class DB_row
-
-/**
- * PEAR DB Row Object
- *
- * The object contains a row of data from a result set.  Each column's data
- * is placed in a property named for the column.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- * @see        DB_common::setFetchMode()
- */
-class DB_row
-{
-    // {{{ constructor
-
-    /**
-     * The constructor places a row's data into properties of this object
-     *
-     * @param array  the array containing the row's data
-     *
-     * @return void
-     */
-    function DB_row(&$arr)
-    {
-        foreach ($arr as $key => $value) {
-            $this->$key = &$arr[$key];
-        }
-    }
-
-    // }}}
-}
-
-// }}}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/common.php b/airtime_mvc/library/pear/DB/common.php
deleted file mode 100644
index 8d403126f..000000000
--- a/airtime_mvc/library/pear/DB/common.php
+++ /dev/null
@@ -1,2257 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Contains the DB_common base class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: common.php,v 1.143 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the PEAR class so it can be extended from
- */
-require_once 'PEAR.php';
-
-/**
- * DB_common is the base class from which each database driver class extends
- *
- * All common methods are declared here.  If a given DBMS driver contains
- * a particular method, that method will overload the one here.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_common extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * The current default fetch mode
-     * @var integer
-     */
-    var $fetchmode = DB_FETCHMODE_ORDERED;
-
-    /**
-     * The name of the class into which results should be fetched when
-     * DB_FETCHMODE_OBJECT is in effect
-     *
-     * @var string
-     */
-    var $fetchmode_object_class = 'stdClass';
-
-    /**
-     * Was a connection present when the object was serialized()?
-     * @var bool
-     * @see DB_common::__sleep(), DB_common::__wake()
-     */
-    var $was_connected = null;
-
-    /**
-     * The most recently executed query
-     * @var string
-     */
-    var $last_query = '';
-
-    /**
-     * Run-time configuration options
-     *
-     * The 'optimize' option has been deprecated.  Use the 'portability'
-     * option instead.
-     *
-     * @var array
-     * @see DB_common::setOption()
-     */
-    var $options = array(
-        'result_buffering' => 500,
-        'persistent' => false,
-        'ssl' => false,
-        'debug' => 0,
-        'seqname_format' => '%s_seq',
-        'autofree' => false,
-        'portability' => DB_PORTABILITY_NONE,
-        'optimize' => 'performance',  // Deprecated.  Use 'portability'.
-    );
-
-    /**
-     * The parameters from the most recently executed query
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    var $last_parameters = array();
-
-    /**
-     * The elements from each prepared statement
-     * @var array
-     */
-    var $prepare_tokens = array();
-
-    /**
-     * The data types of the various elements in each prepared statement
-     * @var array
-     */
-    var $prepare_types = array();
-
-    /**
-     * The prepared queries
-     * @var array
-     */
-    var $prepared_queries = array();
-
-    /**
-     * Flag indicating that the last query was a manipulation query.
-     * @access protected
-     * @var boolean
-     */
-    var $_last_query_manip = false;
-
-    /**
-     * Flag indicating that the next query <em>must</em> be a manipulation
-     * query.
-     * @access protected
-     * @var boolean
-     */
-    var $_next_query_manip = false;
-
-
-    // }}}
-    // {{{ DB_common
-
-    /**
-     * This constructor calls <kbd>$this->PEAR('DB_Error')</kbd>
-     *
-     * @return void
-     */
-    function DB_common()
-    {
-        $this->PEAR('DB_Error');
-    }
-
-    // }}}
-    // {{{ __sleep()
-
-    /**
-     * Automatically indicates which properties should be saved
-     * when PHP's serialize() function is called
-     *
-     * @return array  the array of properties names that should be saved
-     */
-    function __sleep()
-    {
-        if ($this->connection) {
-            // Don't disconnect(), people use serialize() for many reasons
-            $this->was_connected = true;
-        } else {
-            $this->was_connected = false;
-        }
-        if (isset($this->autocommit)) {
-            return array('autocommit',
-                         'dbsyntax',
-                         'dsn',
-                         'features',
-                         'fetchmode',
-                         'fetchmode_object_class',
-                         'options',
-                         'was_connected',
-                   );
-        } else {
-            return array('dbsyntax',
-                         'dsn',
-                         'features',
-                         'fetchmode',
-                         'fetchmode_object_class',
-                         'options',
-                         'was_connected',
-                   );
-        }
-    }
-
-    // }}}
-    // {{{ __wakeup()
-
-    /**
-     * Automatically reconnects to the database when PHP's unserialize()
-     * function is called
-     *
-     * The reconnection attempt is only performed if the object was connected
-     * at the time PHP's serialize() function was run.
-     *
-     * @return void
-     */
-    function __wakeup()
-    {
-        if ($this->was_connected) {
-            $this->connect($this->dsn, $this->options);
-        }
-    }
-
-    // }}}
-    // {{{ __toString()
-
-    /**
-     * Automatic string conversion for PHP 5
-     *
-     * @return string  a string describing the current PEAR DB object
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function __toString()
-    {
-        $info = strtolower(get_class($this));
-        $info .=  ': (phptype=' . $this->phptype .
-                  ', dbsyntax=' . $this->dbsyntax .
-                  ')';
-        if ($this->connection) {
-            $info .= ' [connected]';
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * DEPRECATED:  String conversion method
-     *
-     * @return string  a string describing the current PEAR DB object
-     *
-     * @deprecated Method deprecated in Release 1.7.0
-     */
-    function toString()
-    {
-        return $this->__toString();
-    }
-
-    // }}}
-    // {{{ quoteString()
-
-    /**
-     * DEPRECATED: Quotes a string so it can be safely used within string
-     * delimiters in a query
-     *
-     * @param string $string  the string to be quoted
-     *
-     * @return string  the quoted string
-     *
-     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function quoteString($string)
-    {
-        $string = $this->quote($string);
-        if ($string{0} == "'") {
-            return substr($string, 1, -1);
-        }
-        return $string;
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * DEPRECATED: Quotes a string so it can be safely used in a query
-     *
-     * @param string $string  the string to quote
-     *
-     * @return string  the quoted string or the string <samp>NULL</samp>
-     *                  if the value submitted is <kbd>null</kbd>.
-     *
-     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated Deprecated in release 1.6.0
-     */
-    function quote($string = null)
-    {
-        return ($string === null) ? 'NULL'
-                                  : "'" . str_replace("'", "''", $string) . "'";
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * Delimiting style depends on which database driver is being used.
-     *
-     * NOTE: just because you CAN use delimited identifiers doesn't mean
-     * you SHOULD use them.  In general, they end up causing way more
-     * problems than they solve.
-     *
-     * Portability is broken by using the following characters inside
-     * delimited identifiers:
-     *   + backtick (<kbd>`</kbd>) -- due to MySQL
-     *   + double quote (<kbd>"</kbd>) -- due to Oracle
-     *   + brackets (<kbd>[</kbd> or <kbd>]</kbd>) -- due to Access
-     *
-     * Delimited identifiers are known to generally work correctly under
-     * the following drivers:
-     *   + mssql
-     *   + mysql
-     *   + mysqli
-     *   + oci8
-     *   + odbc(access)
-     *   + odbc(db2)
-     *   + pgsql
-     *   + sqlite
-     *   + sybase (must execute <kbd>set quoted_identifier on</kbd> sometime
-     *     prior to use)
-     *
-     * InterBase doesn't seem to be able to use delimited identifiers
-     * via PHP 4.  They work fine under PHP 5.
-     *
-     * @param string $str  the identifier name to be quoted
-     *
-     * @return string  the quoted identifier
-     *
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '"' . str_replace('"', '""', $str) . '"';
-    }
-
-    // }}}
-    // {{{ quoteSmart()
-
-    /**
-     * Formats input so it can be safely used in a query
-     *
-     * The output depends on the PHP data type of input and the database
-     * type being used.
-     *
-     * @param mixed $in  the data to be formatted
-     *
-     * @return mixed  the formatted data.  The format depends on the input's
-     *                 PHP type:
-     * <ul>
-     *  <li>
-     *    <kbd>input</kbd> -> <samp>returns</samp>
-     *  </li>
-     *  <li>
-     *    <kbd>null</kbd> -> the string <samp>NULL</samp>
-     *  </li>
-     *  <li>
-     *    <kbd>integer</kbd> or <kbd>double</kbd> -> the unquoted number
-     *  </li>
-     *  <li>
-     *    <kbd>bool</kbd> -> output depends on the driver in use
-     *    Most drivers return integers: <samp>1</samp> if
-     *    <kbd>true</kbd> or <samp>0</samp> if
-     *    <kbd>false</kbd>.
-     *    Some return strings: <samp>TRUE</samp> if
-     *    <kbd>true</kbd> or <samp>FALSE</samp> if
-     *    <kbd>false</kbd>.
-     *    Finally one returns strings: <samp>T</samp> if
-     *    <kbd>true</kbd> or <samp>F</samp> if
-     *    <kbd>false</kbd>. Here is a list of each DBMS,
-     *    the values returned and the suggested column type:
-     *    <ul>
-     *      <li>
-     *        <kbd>dbase</kbd> -> <samp>T/F</samp>
-     *        (<kbd>Logical</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>fbase</kbd> -> <samp>TRUE/FALSE</samp>
-     *        (<kbd>BOOLEAN</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>ibase</kbd> -> <samp>1/0</samp>
-     *        (<kbd>SMALLINT</kbd>) [1]
-     *      </li>
-     *      <li>
-     *        <kbd>ifx</kbd> -> <samp>1/0</samp>
-     *        (<kbd>SMALLINT</kbd>) [1]
-     *      </li>
-     *      <li>
-     *        <kbd>msql</kbd> -> <samp>1/0</samp>
-     *        (<kbd>INTEGER</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>mssql</kbd> -> <samp>1/0</samp>
-     *        (<kbd>BIT</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>mysql</kbd> -> <samp>1/0</samp>
-     *        (<kbd>TINYINT(1)</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>mysqli</kbd> -> <samp>1/0</samp>
-     *        (<kbd>TINYINT(1)</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>oci8</kbd> -> <samp>1/0</samp>
-     *        (<kbd>NUMBER(1)</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>odbc</kbd> -> <samp>1/0</samp>
-     *        (<kbd>SMALLINT</kbd>) [1]
-     *      </li>
-     *      <li>
-     *        <kbd>pgsql</kbd> -> <samp>TRUE/FALSE</samp>
-     *        (<kbd>BOOLEAN</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>sqlite</kbd> -> <samp>1/0</samp>
-     *        (<kbd>INTEGER</kbd>)
-     *      </li>
-     *      <li>
-     *        <kbd>sybase</kbd> -> <samp>1/0</samp>
-     *        (<kbd>TINYINT(1)</kbd>)
-     *      </li>
-     *    </ul>
-     *    [1] Accommodate the lowest common denominator because not all
-     *    versions of have <kbd>BOOLEAN</kbd>.
-     *  </li>
-     *  <li>
-     *    other (including strings and numeric strings) ->
-     *    the data with single quotes escaped by preceeding
-     *    single quotes, backslashes are escaped by preceeding
-     *    backslashes, then the whole string is encapsulated
-     *    between single quotes
-     *  </li>
-     * </ul>
-     *
-     * @see DB_common::escapeSimple()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteSmart($in)
-    {
-        if (is_int($in)) {
-            return $in;
-        } elseif (is_float($in)) {
-            return $this->quoteFloat($in);
-        } elseif (is_bool($in)) {
-            return $this->quoteBoolean($in);
-        } elseif (is_null($in)) {
-            return 'NULL';
-        } else {
-            if ($this->dbsyntax == 'access'
-                && preg_match('/^#.+#$/', $in))
-            {
-                return $this->escapeSimple($in);
-            }
-            return "'" . $this->escapeSimple($in) . "'";
-        }
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteBoolean($boolean) {
-        return $boolean ? '1' : '0';
-    }
-     
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteFloat($float) {
-        return "'".$this->escapeSimple(str_replace(',', '.', strval(floatval($float))))."'";
-    }
-     
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * In SQLite, this makes things safe for inserts/updates, but may
-     * cause problems when performing text comparisons against columns
-     * containing binary data. See the
-     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        return str_replace("'", "''", $str);
-    }
-
-    // }}}
-    // {{{ provides()
-
-    /**
-     * Tells whether the present driver supports a given feature
-     *
-     * @param string $feature  the feature you're curious about
-     *
-     * @return bool  whether this driver supports $feature
-     */
-    function provides($feature)
-    {
-        return $this->features[$feature];
-    }
-
-    // }}}
-    // {{{ setFetchMode()
-
-    /**
-     * Sets the fetch mode that should be used by default for query results
-     *
-     * @param integer $fetchmode    DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC
-     *                               or DB_FETCHMODE_OBJECT
-     * @param string $object_class  the class name of the object to be returned
-     *                               by the fetch methods when the
-     *                               DB_FETCHMODE_OBJECT mode is selected.
-     *                               If no class is specified by default a cast
-     *                               to object from the assoc array row will be
-     *                               done.  There is also the posibility to use
-     *                               and extend the 'DB_row' class.
-     *
-     * @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT
-     */
-    function setFetchMode($fetchmode, $object_class = 'stdClass')
-    {
-        switch ($fetchmode) {
-            case DB_FETCHMODE_OBJECT:
-                $this->fetchmode_object_class = $object_class;
-            case DB_FETCHMODE_ORDERED:
-            case DB_FETCHMODE_ASSOC:
-                $this->fetchmode = $fetchmode;
-                break;
-            default:
-                return $this->raiseError('invalid fetchmode mode');
-        }
-    }
-
-    // }}}
-    // {{{ setOption()
-
-    /**
-     * Sets run-time configuration options for PEAR DB
-     *
-     * Options, their data types, default values and description:
-     * <ul>
-     * <li>
-     * <var>autofree</var> <kbd>boolean</kbd> = <samp>false</samp>
-     *      <br />should results be freed automatically when there are no
-     *            more rows?
-     * </li><li>
-     * <var>result_buffering</var> <kbd>integer</kbd> = <samp>500</samp>
-     *      <br />how many rows of the result set should be buffered?
-     *      <br />In mysql: mysql_unbuffered_query() is used instead of
-     *            mysql_query() if this value is 0.  (Release 1.7.0)
-     *      <br />In oci8: this value is passed to ocisetprefetch().
-     *            (Release 1.7.0)
-     * </li><li>
-     * <var>debug</var> <kbd>integer</kbd> = <samp>0</samp>
-     *      <br />debug level
-     * </li><li>
-     * <var>persistent</var> <kbd>boolean</kbd> = <samp>false</samp>
-     *      <br />should the connection be persistent?
-     * </li><li>
-     * <var>portability</var> <kbd>integer</kbd> = <samp>DB_PORTABILITY_NONE</samp>
-     *      <br />portability mode constant (see below)
-     * </li><li>
-     * <var>seqname_format</var> <kbd>string</kbd> = <samp>%s_seq</samp>
-     *      <br />the sprintf() format string used on sequence names.  This
-     *            format is applied to sequence names passed to
-     *            createSequence(), nextID() and dropSequence().
-     * </li><li>
-     * <var>ssl</var> <kbd>boolean</kbd> = <samp>false</samp>
-     *      <br />use ssl to connect?
-     * </li>
-     * </ul>
-     *
-     * -----------------------------------------
-     *
-     * PORTABILITY MODES
-     *
-     * These modes are bitwised, so they can be combined using <kbd>|</kbd>
-     * and removed using <kbd>^</kbd>.  See the examples section below on how
-     * to do this.
-     *
-     * <samp>DB_PORTABILITY_NONE</samp>
-     * turn off all portability features
-     *
-     * This mode gets automatically turned on if the deprecated
-     * <var>optimize</var> option gets set to <samp>performance</samp>.
-     *
-     *
-     * <samp>DB_PORTABILITY_LOWERCASE</samp>
-     * convert names of tables and fields to lower case when using
-     * <kbd>get*()</kbd>, <kbd>fetch*()</kbd> and <kbd>tableInfo()</kbd>
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option <var>optimize</var> gets set to
-     * <samp>portability</samp>:
-     * + oci8
-     *
-     *
-     * <samp>DB_PORTABILITY_RTRIM</samp>
-     * right trim the data output by <kbd>get*()</kbd> <kbd>fetch*()</kbd>
-     *
-     *
-     * <samp>DB_PORTABILITY_DELETE_COUNT</samp>
-     * force reporting the number of rows deleted
-     *
-     * Some DBMS's don't count the number of rows deleted when performing
-     * simple <kbd>DELETE FROM tablename</kbd> queries.  This portability
-     * mode tricks such DBMS's into telling the count by adding
-     * <samp>WHERE 1=1</samp> to the end of <kbd>DELETE</kbd> queries.
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option <var>optimize</var> gets set to
-     * <samp>portability</samp>:
-     * + fbsql
-     * + mysql
-     * + mysqli
-     * + sqlite
-     *
-     *
-     * <samp>DB_PORTABILITY_NUMROWS</samp>
-     * enable hack that makes <kbd>numRows()</kbd> work in Oracle
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option <var>optimize</var> gets set to
-     * <samp>portability</samp>:
-     * + oci8
-     *
-     *
-     * <samp>DB_PORTABILITY_ERRORS</samp>
-     * makes certain error messages in certain drivers compatible
-     * with those from other DBMS's
-     *
-     * + mysql, mysqli:  change unique/primary key constraints
-     *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
-     *
-     * + odbc(access):  MS's ODBC driver reports 'no such field' as code
-     *   07001, which means 'too few parameters.'  When this option is on
-     *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
-     *   DB_ERROR_MISMATCH -> DB_ERROR_NOSUCHFIELD
-     *
-     * <samp>DB_PORTABILITY_NULL_TO_EMPTY</samp>
-     * convert null values to empty strings in data output by get*() and
-     * fetch*().  Needed because Oracle considers empty strings to be null,
-     * while most other DBMS's know the difference between empty and null.
-     *
-     *
-     * <samp>DB_PORTABILITY_ALL</samp>
-     * turn on all portability features
-     *
-     * -----------------------------------------
-     *
-     * Example 1. Simple setOption() example
-     * <code>
-     * $db->setOption('autofree', true);
-     * </code>
-     *
-     * Example 2. Portability for lowercasing and trimming
-     * <code>
-     * $db->setOption('portability',
-     *                 DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM);
-     * </code>
-     *
-     * Example 3. All portability options except trimming
-     * <code>
-     * $db->setOption('portability',
-     *                 DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM);
-     * </code>
-     *
-     * @param string $option option name
-     * @param mixed  $value value for the option
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::$options
-     */
-    function setOption($option, $value)
-    {
-        if (isset($this->options[$option])) {
-            $this->options[$option] = $value;
-
-            /*
-             * Backwards compatibility check for the deprecated 'optimize'
-             * option.  Done here in case settings change after connecting.
-             */
-            if ($option == 'optimize') {
-                if ($value == 'portability') {
-                    switch ($this->phptype) {
-                        case 'oci8':
-                            $this->options['portability'] =
-                                    DB_PORTABILITY_LOWERCASE |
-                                    DB_PORTABILITY_NUMROWS;
-                            break;
-                        case 'fbsql':
-                        case 'mysql':
-                        case 'mysqli':
-                        case 'sqlite':
-                            $this->options['portability'] =
-                                    DB_PORTABILITY_DELETE_COUNT;
-                            break;
-                    }
-                } else {
-                    $this->options['portability'] = DB_PORTABILITY_NONE;
-                }
-            }
-
-            return DB_OK;
-        }
-        return $this->raiseError("unknown option $option");
-    }
-
-    // }}}
-    // {{{ getOption()
-
-    /**
-     * Returns the value of an option
-     *
-     * @param string $option  the option name you're curious about
-     *
-     * @return mixed  the option's value
-     */
-    function getOption($option)
-    {
-        if (isset($this->options[$option])) {
-            return $this->options[$option];
-        }
-        return $this->raiseError("unknown option $option");
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute()
-     *
-     * Creates a query that can be run multiple times.  Each time it is run,
-     * the placeholders, if any, will be replaced by the contents of
-     * execute()'s $data argument.
-     *
-     * Three types of placeholders can be used:
-     *   + <kbd>?</kbd>  scalar value (i.e. strings, integers).  The system
-     *                   will automatically quote and escape the data.
-     *   + <kbd>!</kbd>  value is inserted 'as is'
-     *   + <kbd>&</kbd>  requires a file name.  The file's contents get
-     *                   inserted into the query (i.e. saving binary
-     *                   data in a db)
-     *
-     * Example 1.
-     * <code>
-     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
-     * $data = array(
-     *     "John's text",
-     *     "'it''s good'",
-     *     'filename.txt'
-     * );
-     * $res = $db->execute($sth, $data);
-     * </code>
-     *
-     * Use backslashes to escape placeholder characters if you don't want
-     * them to be interpreted as placeholders:
-     * <pre>
-     *    "UPDATE foo SET col=? WHERE col='over \& under'"
-     * </pre>
-     *
-     * With some database backends, this is emulated.
-     *
-     * {@internal ibase and oci8 have their own prepare() methods.}}
-     *
-     * @param string $query  the query to be prepared
-     *
-     * @return mixed  DB statement resource on success. A DB_Error object
-     *                 on failure.
-     *
-     * @see DB_common::execute()
-     */
-    function prepare($query)
-    {
-        $tokens   = preg_split('/((?<!\\\)[&?!])/', $query, -1,
-                               PREG_SPLIT_DELIM_CAPTURE);
-        $token     = 0;
-        $types     = array();
-        $newtokens = array();
-
-        foreach ($tokens as $val) {
-            switch ($val) {
-                case '?':
-                    $types[$token++] = DB_PARAM_SCALAR;
-                    break;
-                case '&':
-                    $types[$token++] = DB_PARAM_OPAQUE;
-                    break;
-                case '!':
-                    $types[$token++] = DB_PARAM_MISC;
-                    break;
-                default:
-                    $newtokens[] = preg_replace('/\\\([&?!])/', "\\1", $val);
-            }
-        }
-
-        $this->prepare_tokens[] = &$newtokens;
-        end($this->prepare_tokens);
-
-        $k = key($this->prepare_tokens);
-        $this->prepare_types[$k] = $types;
-        $this->prepared_queries[$k] = implode(' ', $newtokens);
-
-        return $k;
-    }
-
-    // }}}
-    // {{{ autoPrepare()
-
-    /**
-     * Automaticaly generates an insert or update query and pass it to prepare()
-     *
-     * @param string $table         the table name
-     * @param array  $table_fields  the array of field names
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return resource  the query handle
-     *
-     * @uses DB_common::prepare(), DB_common::buildManipSQL()
-     */
-    function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT,
-                         $where = false)
-    {
-        $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
-        if (DB::isError($query)) {
-            return $query;
-        }
-        return $this->prepare($query);
-    }
-
-    // }}}
-    // {{{ autoExecute()
-
-    /**
-     * Automaticaly generates an insert or update query and call prepare()
-     * and execute() with it
-     *
-     * @param string $table         the table name
-     * @param array  $fields_values the associative array where $key is a
-     *                               field name and $value its value
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * @uses DB_common::autoPrepare(), DB_common::execute()
-     */
-    function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT,
-                         $where = false)
-    {
-        $sth = $this->autoPrepare($table, array_keys($fields_values), $mode,
-                                  $where);
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        $ret = $this->execute($sth, array_values($fields_values));
-        $this->freePrepared($sth);
-        return $ret;
-
-    }
-
-    // }}}
-    // {{{ buildManipSQL()
-
-    /**
-     * Produces an SQL query string for autoPrepare()
-     *
-     * Example:
-     * <pre>
-     * buildManipSQL('table_sql', array('field1', 'field2', 'field3'),
-     *               DB_AUTOQUERY_INSERT);
-     * </pre>
-     *
-     * That returns
-     * <samp>
-     * INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
-     * </samp>
-     *
-     * NOTES:
-     *   - This belongs more to a SQL Builder class, but this is a simple
-     *     facility.
-     *   - Be carefull! If you don't give a $where param with an UPDATE
-     *     query, all the records of the table will be updated!
-     *
-     * @param string $table         the table name
-     * @param array  $table_fields  the array of field names
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return string  the sql query for autoPrepare()
-     */
-    function buildManipSQL($table, $table_fields, $mode, $where = false)
-    {
-        if (count($table_fields) == 0) {
-            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-        $first = true;
-        switch ($mode) {
-            case DB_AUTOQUERY_INSERT:
-                $values = '';
-                $names = '';
-                foreach ($table_fields as $value) {
-                    if ($first) {
-                        $first = false;
-                    } else {
-                        $names .= ',';
-                        $values .= ',';
-                    }
-                    $names .= $value;
-                    $values .= '?';
-                }
-                return "INSERT INTO $table ($names) VALUES ($values)";
-            case DB_AUTOQUERY_UPDATE:
-                $set = '';
-                foreach ($table_fields as $value) {
-                    if ($first) {
-                        $first = false;
-                    } else {
-                        $set .= ',';
-                    }
-                    $set .= "$value = ?";
-                }
-                $sql = "UPDATE $table SET $set";
-                if ($where) {
-                    $sql .= " WHERE $where";
-                }
-                return $sql;
-            default:
-                return $this->raiseError(DB_ERROR_SYNTAX);
-        }
-    }
-
-    // }}}
-    // {{{ execute()
-
-    /**
-     * Executes a DB statement prepared with prepare()
-     *
-     * Example 1.
-     * <code>
-     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
-     * $data = array(
-     *     "John's text",
-     *     "'it''s good'",
-     *     'filename.txt'
-     * );
-     * $res = $db->execute($sth, $data);
-     * </code>
-     *
-     * @param resource $stmt  a DB statement resource returned from prepare()
-     * @param mixed    $data  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * {@internal ibase and oci8 have their own execute() methods.}}
-     *
-     * @see DB_common::prepare()
-     */
-    function &execute($stmt, $data = array())
-    {
-        $realquery = $this->executeEmulateQuery($stmt, $data);
-        if (DB::isError($realquery)) {
-            return $realquery;
-        }
-        $result = $this->simpleQuery($realquery);
-
-        if ($result === DB_OK || DB::isError($result)) {
-            return $result;
-        } else {
-            $tmp = new DB_result($this, $result);
-            return $tmp;
-        }
-    }
-
-    // }}}
-    // {{{ executeEmulateQuery()
-
-    /**
-     * Emulates executing prepared statements if the DBMS not support them
-     *
-     * @param resource $stmt  a DB statement resource returned from execute()
-     * @param mixed    $data  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a string containing the real query run when emulating
-     *                 prepare/execute.  A DB_Error object on failure.
-     *
-     * @access protected
-     * @see DB_common::execute()
-     */
-    function executeEmulateQuery($stmt, $data = array())
-    {
-        $stmt = (int)$stmt;
-        $data = (array)$data;
-        $this->last_parameters = $data;
-
-        if (count($this->prepare_types[$stmt]) != count($data)) {
-            $this->last_query = $this->prepared_queries[$stmt];
-            return $this->raiseError(DB_ERROR_MISMATCH);
-        }
-
-        $realquery = $this->prepare_tokens[$stmt][0];
-
-        $i = 0;
-        foreach ($data as $value) {
-            if ($this->prepare_types[$stmt][$i] == DB_PARAM_SCALAR) {
-                $realquery .= $this->quoteSmart($value);
-            } elseif ($this->prepare_types[$stmt][$i] == DB_PARAM_OPAQUE) {
-                $fp = @fopen($value, 'rb');
-                if (!$fp) {
-                    return $this->raiseError(DB_ERROR_ACCESS_VIOLATION);
-                }
-                $realquery .= $this->quoteSmart(fread($fp, filesize($value)));
-                fclose($fp);
-            } else {
-                $realquery .= $value;
-            }
-
-            $realquery .= $this->prepare_tokens[$stmt][++$i];
-        }
-
-        return $realquery;
-    }
-
-    // }}}
-    // {{{ executeMultiple()
-
-    /**
-     * Performs several execute() calls on the same statement handle
-     *
-     * $data must be an array indexed numerically
-     * from 0, one execute call is done for every "row" in the array.
-     *
-     * If an error occurs during execute(), executeMultiple() does not
-     * execute the unfinished rows, but rather returns that error.
-     *
-     * @param resource $stmt  query handle from prepare()
-     * @param array    $data  numeric array containing the
-     *                         data to insert into the query
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::prepare(), DB_common::execute()
-     */
-    function executeMultiple($stmt, $data)
-    {
-        foreach ($data as $value) {
-            $res = $this->execute($stmt, $value);
-            if (DB::isError($res)) {
-                return $res;
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freePrepared()
-
-    /**
-     * Frees the internal resources associated with a prepared query
-     *
-     * @param resource $stmt           the prepared statement's PHP resource
-     * @param bool     $free_resource  should the PHP resource be freed too?
-     *                                  Use false if you need to get data
-     *                                  from the result set later.
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_common::prepare()
-     */
-    function freePrepared($stmt, $free_resource = true)
-    {
-        $stmt = (int)$stmt;
-        if (isset($this->prepare_tokens[$stmt])) {
-            unset($this->prepare_tokens[$stmt]);
-            unset($this->prepare_types[$stmt]);
-            unset($this->prepared_queries[$stmt]);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * It is defined here to ensure all drivers have this method available.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_mysql::modifyQuery(), DB_oci8::modifyQuery(),
-     *      DB_sqlite::modifyQuery()
-     */
-    function modifyQuery($query)
-    {
-        return $query;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * It is defined here to assure that all implementations
-     * have this method defined.
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return $query;
-    }
-
-    // }}}
-    // {{{ query()
-
-    /**
-     * Sends a query to the database server
-     *
-     * The query string can be either a normal statement to be sent directly
-     * to the server OR if <var>$params</var> are passed the query can have
-     * placeholders and it will be passed through prepare() and execute().
-     *
-     * @param string $query   the SQL query or the statement to prepare
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_result, DB_common::prepare(), DB_common::execute()
-     */
-    function &query($query, $params = array())
-    {
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $ret = $this->execute($sth, $params);
-            $this->freePrepared($sth, false);
-            return $ret;
-        } else {
-            $this->last_parameters = array();
-            $result = $this->simpleQuery($query);
-            if ($result === DB_OK || DB::isError($result)) {
-                return $result;
-            } else {
-                $tmp = new DB_result($this, $result);
-                return $tmp;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ limitQuery()
-
-    /**
-     * Generates and executes a LIMIT query
-     *
-     * @param string $query   the query
-     * @param intr   $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     */
-    function &limitQuery($query, $from, $count, $params = array())
-    {
-        $query = $this->modifyLimitQuery($query, $from, $count, $params);
-        if (DB::isError($query)){
-            return $query;
-        }
-        $result = $this->query($query, $params);
-        if (is_a($result, 'DB_result')) {
-            $result->setOption('limit_from', $from);
-            $result->setOption('limit_count', $count);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ getOne()
-
-    /**
-     * Fetches the first column of the first row from a query result
-     *
-     * Takes care of doing the query and freeing the results when finished.
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  the returned value of the query.
-     *                 A DB_Error object on failure.
-     */
-    function &getOne($query, $params = array())
-    {
-        $params = (array)$params;
-        // modifyLimitQuery() would be nice here, but it causes BC issues
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $res = $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res = $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $err = $res->fetchInto($row, DB_FETCHMODE_ORDERED);
-        $res->free();
-
-        if ($err !== DB_OK) {
-            return $err;
-        }
-
-        return $row[0];
-    }
-
-    // }}}
-    // {{{ getRow()
-
-    /**
-     * Fetches the first row of data returned from a query result
-     *
-     * Takes care of doing the query and freeing the results when finished.
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     * @param int $fetchmode  the fetch mode to use
-     *
-     * @return array  the first row of results as an array.
-     *                 A DB_Error object on failure.
-     */
-    function &getRow($query, $params = array(),
-                     $fetchmode = DB_FETCHMODE_DEFAULT)
-    {
-        // compat check, the params and fetchmode parameters used to
-        // have the opposite order
-        if (!is_array($params)) {
-            if (is_array($fetchmode)) {
-                if ($params === null) {
-                    $tmp = DB_FETCHMODE_DEFAULT;
-                } else {
-                    $tmp = $params;
-                }
-                $params = $fetchmode;
-                $fetchmode = $tmp;
-            } elseif ($params !== null) {
-                $fetchmode = $params;
-                $params = array();
-            }
-        }
-        // modifyLimitQuery() would be nice here, but it causes BC issues
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $res = $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res = $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $err = $res->fetchInto($row, $fetchmode);
-
-        $res->free();
-
-        if ($err !== DB_OK) {
-            return $err;
-        }
-
-        return $row;
-    }
-
-    // }}}
-    // {{{ getCol()
-
-    /**
-     * Fetches a single column from a query result and returns it as an
-     * indexed array
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $col     which column to return (integer [column number,
-     *                         starting at 0] or string [column name])
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return array  the results as an array.  A DB_Error object on failure.
-     *
-     * @see DB_common::query()
-     */
-    function &getCol($query, $col = 0, $params = array())
-    {
-        $params = (array)$params;
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res = $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res = $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $fetchmode = is_int($col) ? DB_FETCHMODE_ORDERED : DB_FETCHMODE_ASSOC;
-
-        if (!is_array($row = $res->fetchRow($fetchmode))) {
-            $ret = array();
-        } else {
-            if (!array_key_exists($col, $row)) {
-                $ret = $this->raiseError(DB_ERROR_NOSUCHFIELD);
-            } else {
-                $ret = array($row[$col]);
-                while (is_array($row = $res->fetchRow($fetchmode))) {
-                    $ret[] = $row[$col];
-                }
-            }
-        }
-
-        $res->free();
-
-        if (DB::isError($row)) {
-            $ret = $row;
-        }
-
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getAssoc()
-
-    /**
-     * Fetches an entire query result and returns it as an
-     * associative array using the first column as the key
-     *
-     * If the result set contains more than two columns, the value
-     * will be an array of the values from column 2-n.  If the result
-     * set contains only two columns, the returned value will be a
-     * scalar with the value of the second column (unless forced to an
-     * array with the $force_array parameter).  A DB error code is
-     * returned on errors.  If the result set contains fewer than two
-     * columns, a DB_ERROR_TRUNCATED error is returned.
-     *
-     * For example, if the table "mytable" contains:
-     *
-     * <pre>
-     *  ID      TEXT       DATE
-     * --------------------------------
-     *  1       'one'      944679408
-     *  2       'two'      944679408
-     *  3       'three'    944679408
-     * </pre>
-     *
-     * Then the call getAssoc('SELECT id,text FROM mytable') returns:
-     * <pre>
-     *   array(
-     *     '1' => 'one',
-     *     '2' => 'two',
-     *     '3' => 'three',
-     *   )
-     * </pre>
-     *
-     * ...while the call getAssoc('SELECT id,text,date FROM mytable') returns:
-     * <pre>
-     *   array(
-     *     '1' => array('one', '944679408'),
-     *     '2' => array('two', '944679408'),
-     *     '3' => array('three', '944679408')
-     *   )
-     * </pre>
-     *
-     * If the more than one row occurs with the same value in the
-     * first column, the last row overwrites all previous ones by
-     * default.  Use the $group parameter if you don't want to
-     * overwrite like this.  Example:
-     *
-     * <pre>
-     * getAssoc('SELECT category,id,name FROM mytable', false, null,
-     *          DB_FETCHMODE_ASSOC, true) returns:
-     *
-     *   array(
-     *     '1' => array(array('id' => '4', 'name' => 'number four'),
-     *                  array('id' => '6', 'name' => 'number six')
-     *            ),
-     *     '9' => array(array('id' => '4', 'name' => 'number four'),
-     *                  array('id' => '6', 'name' => 'number six')
-     *            )
-     *   )
-     * </pre>
-     *
-     * Keep in mind that database functions in PHP usually return string
-     * values for results regardless of the database's internal type.
-     *
-     * @param string $query        the SQL query
-     * @param bool   $force_array  used only when the query returns
-     *                              exactly two columns.  If true, the values
-     *                              of the returned array will be one-element
-     *                              arrays instead of scalars.
-     * @param mixed  $params       array, string or numeric data to be used in
-     *                              execution of the statement.  Quantity of
-     *                              items passed must match quantity of
-     *                              placeholders in query:  meaning 1
-     *                              placeholder for non-array parameters or
-     *                              1 placeholder per array element.
-     * @param int   $fetchmode     the fetch mode to use
-     * @param bool  $group         if true, the values of the returned array
-     *                              is wrapped in another array.  If the same
-     *                              key value (in the first column) repeats
-     *                              itself, the values will be appended to
-     *                              this array instead of overwriting the
-     *                              existing values.
-     *
-     * @return array  the associative array containing the query results.
-     *                A DB_Error object on failure.
-     */
-    function &getAssoc($query, $force_array = false, $params = array(),
-                       $fetchmode = DB_FETCHMODE_DEFAULT, $group = false)
-    {
-        $params = (array)$params;
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res = $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res = $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-        if ($fetchmode == DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        $cols = $res->numCols();
-
-        if ($cols < 2) {
-            $tmp = $this->raiseError(DB_ERROR_TRUNCATED);
-            return $tmp;
-        }
-
-        $results = array();
-
-        if ($cols > 2 || $force_array) {
-            // return array values
-            // XXX this part can be optimized
-            if ($fetchmode == DB_FETCHMODE_ASSOC) {
-                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ASSOC))) {
-                    reset($row);
-                    $key = current($row);
-                    unset($row[key($row)]);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            } elseif ($fetchmode == DB_FETCHMODE_OBJECT) {
-                while ($row = $res->fetchRow(DB_FETCHMODE_OBJECT)) {
-                    $arr = get_object_vars($row);
-                    $key = current($arr);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            } else {
-                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
-                    // we shift away the first element to get
-                    // indices running from 0 again
-                    $key = array_shift($row);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            }
-            if (DB::isError($row)) {
-                $results = $row;
-            }
-        } else {
-            // return scalar values
-            while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
-                if ($group) {
-                    $results[$row[0]][] = $row[1];
-                } else {
-                    $results[$row[0]] = $row[1];
-                }
-            }
-            if (DB::isError($row)) {
-                $results = $row;
-            }
-        }
-
-        $res->free();
-
-        return $results;
-    }
-
-    // }}}
-    // {{{ getAll()
-
-    /**
-     * Fetches all of the rows from a query result
-     *
-     * @param string $query      the SQL query
-     * @param mixed  $params     array, string or numeric data to be used in
-     *                            execution of the statement.  Quantity of
-     *                            items passed must match quantity of
-     *                            placeholders in query:  meaning 1
-     *                            placeholder for non-array parameters or
-     *                            1 placeholder per array element.
-     * @param int    $fetchmode  the fetch mode to use:
-     *                            + DB_FETCHMODE_ORDERED
-     *                            + DB_FETCHMODE_ASSOC
-     *                            + DB_FETCHMODE_ORDERED | DB_FETCHMODE_FLIPPED
-     *                            + DB_FETCHMODE_ASSOC | DB_FETCHMODE_FLIPPED
-     *
-     * @return array  the nested array.  A DB_Error object on failure.
-     */
-    function &getAll($query, $params = array(),
-                     $fetchmode = DB_FETCHMODE_DEFAULT)
-    {
-        // compat check, the params and fetchmode parameters used to
-        // have the opposite order
-        if (!is_array($params)) {
-            if (is_array($fetchmode)) {
-                if ($params === null) {
-                    $tmp = DB_FETCHMODE_DEFAULT;
-                } else {
-                    $tmp = $params;
-                }
-                $params = $fetchmode;
-                $fetchmode = $tmp;
-            } elseif ($params !== null) {
-                $fetchmode = $params;
-                $params = array();
-            }
-        }
-
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res = $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res = $this->query($query);
-        }
-
-        if ($res === DB_OK || DB::isError($res)) {
-            return $res;
-        }
-
-        $results = array();
-        while (DB_OK === $res->fetchInto($row, $fetchmode)) {
-            if ($fetchmode & DB_FETCHMODE_FLIPPED) {
-                foreach ($row as $key => $val) {
-                    $results[$key][] = $val;
-                }
-            } else {
-                $results[] = $row;
-            }
-        }
-
-        $res->free();
-
-        if (DB::isError($row)) {
-            $tmp = $this->raiseError($row);
-            return $tmp;
-        }
-        return $results;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Determines the number of rows in a query result
-     *
-     * @param resource $result  the query result idenifier produced by PHP
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function numRows($result)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ getSequenceName()
-
-    /**
-     * Generates the name used inside the database for a sequence
-     *
-     * The createSequence() docblock contains notes about storing sequence
-     * names.
-     *
-     * @param string $sqn  the sequence's public name
-     *
-     * @return string  the sequence's name in the backend
-     *
-     * @access protected
-     * @see DB_common::createSequence(), DB_common::dropSequence(),
-     *      DB_common::nextID(), DB_common::setOption()
-     */
-    function getSequenceName($sqn)
-    {
-        return sprintf($this->getOption('seqname_format'),
-                       preg_replace('/[^a-z0-9_.]/i', '_', $sqn));
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::dropSequence(),
-     *      DB_common::getSequenceName()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * The name of a given sequence is determined by passing the string
-     * provided in the <var>$seq_name</var> argument through PHP's sprintf()
-     * function using the value from the <var>seqname_format</var> option as
-     * the sprintf()'s format argument.
-     *
-     * <var>seqname_format</var> is set via setOption().
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_common::nextID()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_common::nextID()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * Communicates an error and invoke error callbacks, etc
-     *
-     * Basically a wrapper for PEAR::raiseError without the message string.
-     *
-     * @param mixed   integer error code, or a PEAR error object (all
-     *                 other parameters are ignored if this parameter is
-     *                 an object
-     * @param int     error mode, see PEAR_Error docs
-     * @param mixed   if error mode is PEAR_ERROR_TRIGGER, this is the
-     *                 error level (E_USER_NOTICE etc).  If error mode is
-     *                 PEAR_ERROR_CALLBACK, this is the callback function,
-     *                 either as a function name, or as an array of an
-     *                 object and method name.  For other error modes this
-     *                 parameter is ignored.
-     * @param string  extra debug information.  Defaults to the last
-     *                 query and native error code.
-     * @param mixed   native error code, integer or string depending the
-     *                 backend
-     *
-     * @return object  the PEAR_Error object
-     *
-     * @see PEAR_Error
-     */
-    function &raiseError($code = DB_ERROR, $mode = null, $options = null,
-                         $userinfo = null, $nativecode = null)
-    {
-        // The error is yet a DB error object
-        if (is_object($code)) {
-            // because we the static PEAR::raiseError, our global
-            // handler should be used if it is set
-            if ($mode === null && !empty($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            }
-            $tmp = PEAR::raiseError($code, null, $mode, $options,
-                                    null, null, true);
-            return $tmp;
-        }
-
-        if ($userinfo === null) {
-            $userinfo = $this->last_query;
-        }
-
-        if ($nativecode) {
-            $userinfo .= ' [nativecode=' . trim($nativecode) . ']';
-        } else {
-            $userinfo .= ' [DB Error: ' . DB::errorMessage($code) . ']';
-        }
-
-        $tmp = PEAR::raiseError(null, $code, $mode, $options, $userinfo,
-                                'DB_Error', true);
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return mixed  the DBMS' error code.  A DB_Error object on failure.
-     */
-    function errorNative()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Maps native error codes to DB's portable ones
-     *
-     * Uses the <var>$errorcode_map</var> property defined in each driver.
-     *
-     * @param string|int $nativecode  the error code returned by the DBMS
-     *
-     * @return int  the portable DB error code.  Return DB_ERROR if the
-     *               current driver doesn't have a mapping for the
-     *               $nativecode submitted.
-     */
-    function errorCode($nativecode)
-    {
-        if (isset($this->errorcode_map[$nativecode])) {
-            return $this->errorcode_map[$nativecode];
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Maps a DB error code to a textual message
-     *
-     * @param integer $dbcode  the DB error code
-     *
-     * @return string  the error message corresponding to the error code
-     *                  submitted.  FALSE if the error code is unknown.
-     *
-     * @see DB::errorMessage()
-     */
-    function errorMessage($dbcode)
-    {
-        return DB::errorMessage($this->errorcode_map[$dbcode]);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * The format of the resulting array depends on which <var>$mode</var>
-     * you select.  The sample output below is based on this query:
-     * <pre>
-     *    SELECT tblFoo.fldID, tblFoo.fldPhone, tblBar.fldId
-     *    FROM tblFoo
-     *    JOIN tblBar ON tblFoo.fldId = tblBar.fldId
-     * </pre>
-     *
-     * <ul>
-     * <li>
-     *
-     * <kbd>null</kbd> (default)
-     *   <pre>
-     *   [0] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   [1] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldPhone
-     *       [type] => string
-     *       [len] => 20
-     *       [flags] =>
-     *   )
-     *   [2] => Array (
-     *       [table] => tblBar
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   </pre>
-     *
-     * </li><li>
-     *
-     * <kbd>DB_TABLEINFO_ORDER</kbd>
-     *
-     *   <p>In addition to the information found in the default output,
-     *   a notation of the number of columns is provided by the
-     *   <samp>num_fields</samp> element while the <samp>order</samp>
-     *   element provides an array with the column names as the keys and
-     *   their location index number (corresponding to the keys in the
-     *   the default output) as the values.</p>
-     *
-     *   <p>If a result set has identical field names, the last one is
-     *   used.</p>
-     *
-     *   <pre>
-     *   [num_fields] => 3
-     *   [order] => Array (
-     *       [fldId] => 2
-     *       [fldTrans] => 1
-     *   )
-     *   </pre>
-     *
-     * </li><li>
-     *
-     * <kbd>DB_TABLEINFO_ORDERTABLE</kbd>
-     *
-     *   <p>Similar to <kbd>DB_TABLEINFO_ORDER</kbd> but adds more
-     *   dimensions to the array in which the table names are keys and
-     *   the field names are sub-keys.  This is helpful for queries that
-     *   join tables which have identical field names.</p>
-     *
-     *   <pre>
-     *   [num_fields] => 3
-     *   [ordertable] => Array (
-     *       [tblFoo] => Array (
-     *           [fldId] => 0
-     *           [fldPhone] => 1
-     *       )
-     *       [tblBar] => Array (
-     *           [fldId] => 2
-     *       )
-     *   )
-     *   </pre>
-     *
-     * </li>
-     * </ul>
-     *
-     * The <samp>flags</samp> element contains a space separated list
-     * of extra information about the field.  This data is inconsistent
-     * between DBMS's due to the way each DBMS works.
-     *   + <samp>primary_key</samp>
-     *   + <samp>unique_key</samp>
-     *   + <samp>multiple_key</samp>
-     *   + <samp>not_null</samp>
-     *
-     * Most DBMS's only provide the <samp>table</samp> and <samp>flags</samp>
-     * elements if <var>$result</var> is a table name.  The following DBMS's
-     * provide full information from queries:
-     *   + fbsql
-     *   + mysql
-     *
-     * If the 'portability' option has <samp>DB_PORTABILITY_LOWERCASE</samp>
-     * turned on, the names of tables and fields will be lowercased.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                string containing the name of a table.
-     *                                While this also accepts a query result
-     *                                resource identifier, this behavior is
-     *                                deprecated.
-     * @param int  $mode   either unused or one of the tableInfo modes:
-     *                     <kbd>DB_TABLEINFO_ORDERTABLE</kbd>,
-     *                     <kbd>DB_TABLEINFO_ORDER</kbd> or
-     *                     <kbd>DB_TABLEINFO_FULL</kbd> (which does both).
-     *                     These are bitwise, so the first two can be
-     *                     combined using <kbd>|</kbd>.
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        /*
-         * If the DB_<driver> class has a tableInfo() method, that one
-         * overrides this one.  But, if the driver doesn't have one,
-         * this method runs and tells users about that fact.
-         */
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ getTables()
-
-    /**
-     * Lists the tables in the current database
-     *
-     * @return array  the list of tables.  A DB_Error object on failure.
-     *
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function getTables()
-    {
-        return $this->getListOf('tables');
-    }
-
-    // }}}
-    // {{{ getListOf()
-
-    /**
-     * Lists internal database information
-     *
-     * @param string $type  type of information being sought.
-     *                       Common items being sought are:
-     *                       tables, databases, users, views, functions
-     *                       Each DBMS's has its own capabilities.
-     *
-     * @return array  an array listing the items sought.
-     *                 A DB DB_Error object on failure.
-     */
-    function getListOf($type)
-    {
-        $sql = $this->getSpecialQuery($type);
-        if ($sql === null) {
-            $this->last_query = '';
-            return $this->raiseError(DB_ERROR_UNSUPPORTED);
-        } elseif (is_int($sql) || DB::isError($sql)) {
-            // Previous error
-            return $this->raiseError($sql);
-        } elseif (is_array($sql)) {
-            // Already the result
-            return $sql;
-        }
-        // Launch this query
-        return $this->getCol($sql);
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        return $this->raiseError(DB_ERROR_UNSUPPORTED);
-    }
-
-    // }}}
-    // {{{ nextQueryIsManip()
-
-    /**
-     * Sets (or unsets) a flag indicating that the next query will be a
-     * manipulation query, regardless of the usual DB::isManip() heuristics.
-     *
-     * @param boolean true to set the flag overriding the isManip() behaviour,
-     * false to clear it and fall back onto isManip()
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function nextQueryIsManip($manip)
-    {
-        $this->_next_query_manip = $manip;
-    }
-
-    // }}}
-    // {{{ _checkManip()
-
-    /**
-     * Checks if the given query is a manipulation query. This also takes into
-     * account the _next_query_manip flag and sets the _last_query_manip flag
-     * (and resets _next_query_manip) according to the result.
-     *
-     * @param string The query to check.
-     *
-     * @return boolean true if the query is a manipulation query, false
-     * otherwise
-     *
-     * @access protected
-     */
-    function _checkManip($query)
-    {
-        if ($this->_next_query_manip || DB::isManip($query)) {
-            $this->_last_query_manip = true;
-        } else {
-            $this->_last_query_manip = false;
-        }
-        $this->_next_query_manip = false;
-        return $this->_last_query_manip;
-        $manip = $this->_next_query_manip;
-    }
-
-    // }}}
-    // {{{ _rtrimArrayValues()
-
-    /**
-     * Right-trims all strings in an array
-     *
-     * @param array $array  the array to be trimmed (passed by reference)
-     *
-     * @return void
-     *
-     * @access protected
-     */
-    function _rtrimArrayValues(&$array)
-    {
-        foreach ($array as $key => $value) {
-            if (is_string($value)) {
-                $array[$key] = rtrim($value);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _convertNullArrayValuesToEmpty()
-
-    /**
-     * Converts all null values in an array to empty strings
-     *
-     * @param array  $array  the array to be de-nullified (passed by reference)
-     *
-     * @return void
-     *
-     * @access protected
-     */
-    function _convertNullArrayValuesToEmpty(&$array)
-    {
-        foreach ($array as $key => $value) {
-            if (is_null($value)) {
-                $array[$key] = '';
-            }
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/dbase.php b/airtime_mvc/library/pear/DB/dbase.php
deleted file mode 100644
index cdd2e59ef..000000000
--- a/airtime_mvc/library/pear/DB/dbase.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's dbase extension
- * for interacting with dBase databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: dbase.php,v 1.45 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's dbase extension
- * for interacting with dBase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_dbase extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'dbase';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'dbase';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => false,
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => false,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * A means of emulating result resources
-     * @var array
-     */
-    var $res_row = array();
-
-    /**
-     * The quantity of results so far
-     *
-     * For emulating result resources.
-     *
-     * @var integer
-     */
-    var $result = 0;
-
-    /**
-     * Maps dbase data type id's to human readable strings
-     *
-     * The human readable values are based on the output of PHP's
-     * dbase_get_header_info() function.
-     *
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    var $types = array(
-        'C' => 'character',
-        'D' => 'date',
-        'L' => 'boolean',
-        'M' => 'memo',
-        'N' => 'number',
-    );
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_dbase()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database and create it if it doesn't exist
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's dbase driver supports the following extra DSN options:
-     *   + mode    An integer specifying the read/write mode to use
-     *              (0 = read only, 1 = write only, 2 = read/write).
-     *              Available since PEAR DB 1.7.0.
-     *   + fields  An array of arrays that PHP's dbase_create() function needs
-     *              to create a new database.  This information is used if the
-     *              dBase file specified in the "database" segment of the DSN
-     *              does not exist.  For more info, see the PHP manual's
-     *              {@link http://php.net/dbase_create dbase_create()} page.
-     *              Available since PEAR DB 1.7.0.
-     *
-     * Example of how to connect and establish a new dBase file if necessary:
-     * <code>
-     * require_once 'DB.php';
-     *
-     * $dsn = array(
-     *     'phptype'  => 'dbase',
-     *     'database' => '/path/and/name/of/dbase/file',
-     *     'mode'     => 2,
-     *     'fields'   => array(
-     *         array('a', 'N', 5, 0),
-     *         array('b', 'C', 40),
-     *         array('c', 'C', 255),
-     *         array('d', 'C', 20),
-     *     ),
-     * );
-     * $options = array(
-     *     'debug'       => 2,
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db = DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('dbase')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        /*
-         * Turn track_errors on for entire script since $php_errormsg
-         * is the only way to find errors from the dbase extension.
-         */
-        @ini_set('track_errors', 1);
-        $php_errormsg = '';
-
-        if (!file_exists($dsn['database'])) {
-            $this->dsn['mode'] = 2;
-            if (empty($dsn['fields']) || !is_array($dsn['fields'])) {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         'the dbase file does not exist and '
-                                         . 'it could not be created because '
-                                         . 'the "fields" element of the DSN '
-                                         . 'is not properly set');
-            }
-            $this->connection = @dbase_create($dsn['database'],
-                                              $dsn['fields']);
-            if (!$this->connection) {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         'the dbase file does not exist and '
-                                         . 'the attempt to create it failed: '
-                                         . $php_errormsg);
-            }
-        } else {
-            if (!isset($this->dsn['mode'])) {
-                $this->dsn['mode'] = 0;
-            }
-            $this->connection = @dbase_open($dsn['database'],
-                                            $this->dsn['mode']);
-            if (!$this->connection) {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @dbase_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ &query()
-
-    function &query($query = null)
-    {
-        // emulate result resources
-        $this->res_row[(int)$this->result] = 0;
-        $tmp = new DB_result($this, $this->result++);
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum === null) {
-            $rownum = $this->res_row[(int)$result]++;
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @dbase_get_record_with_names($this->connection, $rownum);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @dbase_get_record($this->connection, $rownum);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set.
-     *
-     * This method is a no-op for dbase, as there aren't result resources in
-     * the same sense as most other database backends.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return true;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($foo)
-    {
-        return @dbase_numfields($this->connection);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($foo)
-    {
-        return @dbase_numrecords($this->connection);
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteBoolean($boolean) {
-        return $boolean ? 'T' : 'F';
-    }
-     
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about the current database
-     *
-     * @param mixed $result  THIS IS UNUSED IN DBASE.  The current database
-     *                       is examined regardless of what is provided here.
-     * @param int   $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    function tableInfo($result = null, $mode = null)
-    {
-        if (function_exists('dbase_get_header_info')) {
-            $id = @dbase_get_header_info($this->connection);
-            if (!$id && $php_errormsg) {
-                return $this->raiseError(DB_ERROR,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        } else {
-            /*
-             * This segment for PHP 4 is loosely based on code by
-             * Hadi Rusiah <deegos@yahoo.com> in the comments on
-             * the dBase reference page in the PHP manual.
-             */
-            $db = @fopen($this->dsn['database'], 'r');
-            if (!$db) {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-
-            $id = array();
-            $i  = 0;
-
-            $line = fread($db, 32);
-            while (!feof($db)) {
-                $line = fread($db, 32);
-                if (substr($line, 0, 1) == chr(13)) {
-                    break;
-                } else {
-                    $pos = strpos(substr($line, 0, 10), chr(0));
-                    $pos = ($pos == 0 ? 10 : $pos);
-                    $id[$i] = array(
-                        'name'   => substr($line, 0, $pos),
-                        'type'   => $this->types[substr($line, 11, 1)],
-                        'length' => ord(substr($line, 16, 1)),
-                        'precision' => ord(substr($line, 17, 1)),
-                    );
-                }
-                $i++;
-            }
-
-            fclose($db);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $res   = array();
-        $count = count($id);
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $this->dsn['database'],
-                'name'  => $case_func($id[$i]['name']),
-                'type'  => $id[$i]['type'],
-                'len'   => $id[$i]['length'],
-                'flags' => ''
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/fbsql.php b/airtime_mvc/library/pear/DB/fbsql.php
deleted file mode 100644
index 7749a98fa..000000000
--- a/airtime_mvc/library/pear/DB/fbsql.php
+++ /dev/null
@@ -1,769 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's fbsql extension
- * for interacting with FrontBase databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Frank M. Kromann <frank@frontbase.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: fbsql.php,v 1.88 2007/07/06 05:19:21 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's fbsql extension
- * for interacting with FrontBase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Frank M. Kromann <frank@frontbase.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- * @since      Class functional since Release 1.7.0
- */
-class DB_fbsql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'fbsql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'fbsql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-         22 => DB_ERROR_SYNTAX,
-         85 => DB_ERROR_ALREADY_EXISTS,
-        108 => DB_ERROR_SYNTAX,
-        116 => DB_ERROR_NOSUCHTABLE,
-        124 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        215 => DB_ERROR_NOSUCHFIELD,
-        217 => DB_ERROR_INVALID_NUMBER,
-        226 => DB_ERROR_NOSUCHFIELD,
-        231 => DB_ERROR_INVALID,
-        239 => DB_ERROR_TRUNCATED,
-        251 => DB_ERROR_SYNTAX,
-        266 => DB_ERROR_NOT_FOUND,
-        357 => DB_ERROR_CONSTRAINT_NOT_NULL,
-        358 => DB_ERROR_CONSTRAINT,
-        360 => DB_ERROR_CONSTRAINT,
-        361 => DB_ERROR_CONSTRAINT,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_fbsql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('fbsql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array(
-            $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost',
-            $dsn['username'] ? $dsn['username'] : null,
-            $dsn['password'] ? $dsn['password'] : null,
-        );
-
-        $connect_function = $persistent ? 'fbsql_pconnect' : 'fbsql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     $php_errormsg);
-        }
-
-        if ($dsn['database']) {
-            if (!@fbsql_select_db($dsn['database'], $this->connection)) {
-                return $this->fbsqlRaiseError();
-            }
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @fbsql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @fbsql_query("$query;", $this->connection);
-        if (!$result) {
-            return $this->fbsqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            return DB_OK;
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal fbsql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return @fbsql_next_result($result);
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@fbsql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @fbsql_fetch_array($result, FBSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @fbsql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? fbsql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff=false)
-    {
-        if ($onoff) {
-            $this->query("SET COMMIT TRUE");
-        } else {
-            $this->query("SET COMMIT FALSE");
-        }
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        @fbsql_commit($this->connection);
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        @fbsql_rollback($this->connection);
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @fbsql_num_fields($result);
-        if (!$cols) {
-            return $this->fbsqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @fbsql_num_rows($result);
-        if ($rows === null) {
-            return $this->fbsqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $result = @fbsql_affected_rows($this->connection);
-        } else {
-            $result = 0;
-        }
-        return $result;
-     }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_fbsql::createSequence(), DB_fbsql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query('SELECT UNIQUE FROM ' . $seqname);
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $result;
-                }
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->fbsqlRaiseError();
-        }
-        $result->fetchInto($tmp, DB_FETCHMODE_ORDERED);
-        return $tmp[0];
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_fbsql::nextID(), DB_fbsql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-                            . ' (id INTEGER NOT NULL,'
-                            . ' PRIMARY KEY(id))');
-        if ($res) {
-            $res = $this->query('SET UNIQUE = 0 FOR ' . $seqname);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_fbsql::nextID(), DB_fbsql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name)
-                            . ' RESTRICT');
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if (DB::isManip($query) || $this->_next_query_manip) {
-            return preg_replace('/^([\s(])*SELECT/i',
-                                "\\1SELECT TOP($count)", $query);
-        } else {
-            return preg_replace('/([\s(])*SELECT/i',
-                                "\\1SELECT TOP($from, $count)", $query);
-        }
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteBoolean($boolean) {
-        return $boolean ? 'TRUE' : 'FALSE';
-    }
-     
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteFloat($float) {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-     
-    // }}}
-    // {{{ fbsqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_fbsql::errorNative(), DB_common::errorCode()
-     */
-    function fbsqlRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $errno = $this->errorCode(fbsql_errno($this->connection));
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 @fbsql_error($this->connection));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    function errorNative()
-    {
-        return @fbsql_errno($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @fbsql_list_fields($this->dsn['database'],
-                                     $result, $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->fbsqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @fbsql_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $case_func(@fbsql_field_table($id, $i)),
-                'name'  => $case_func(@fbsql_field_name($id, $i)),
-                'type'  => @fbsql_field_type($id, $i),
-                'len'   => @fbsql_field_len($id, $i),
-                'flags' => @fbsql_field_flags($id, $i),
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @fbsql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT "table_name" FROM information_schema.tables'
-                       . ' t0, information_schema.schemata t1'
-                       . ' WHERE t0.schema_pk=t1.schema_pk AND'
-                       . ' "table_type" = \'BASE TABLE\''
-                       . ' AND "schema_name" = current_schema';
-            case 'views':
-                return 'SELECT "table_name" FROM information_schema.tables'
-                       . ' t0, information_schema.schemata t1'
-                       . ' WHERE t0.schema_pk=t1.schema_pk AND'
-                       . ' "table_type" = \'VIEW\''
-                       . ' AND "schema_name" = current_schema';
-            case 'users':
-                return 'SELECT "user_name" from information_schema.users'; 
-            case 'functions':
-                return 'SELECT "routine_name" FROM'
-                       . ' information_schema.psm_routines'
-                       . ' t0, information_schema.schemata t1'
-                       . ' WHERE t0.schema_pk=t1.schema_pk'
-                       . ' AND "routine_kind"=\'FUNCTION\''
-                       . ' AND "schema_name" = current_schema';
-            case 'procedures':
-                return 'SELECT "routine_name" FROM'
-                       . ' information_schema.psm_routines'
-                       . ' t0, information_schema.schemata t1'
-                       . ' WHERE t0.schema_pk=t1.schema_pk'
-                       . ' AND "routine_kind"=\'PROCEDURE\''
-                       . ' AND "schema_name" = current_schema';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/ibase.php b/airtime_mvc/library/pear/DB/ibase.php
deleted file mode 100644
index 783606425..000000000
--- a/airtime_mvc/library/pear/DB/ibase.php
+++ /dev/null
@@ -1,1082 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's interbase extension
- * for interacting with Interbase and Firebird databases
- *
- * While this class works with PHP 4, PHP's InterBase extension is
- * unstable in PHP 4.  Use PHP 5.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ibase.php,v 1.116 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's interbase extension
- * for interacting with Interbase and Firebird databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * While this class works with PHP 4, PHP's InterBase extension is
- * unstable in PHP 4.  Use PHP 5.
- *
- * NOTICE:  limitQuery() only works for Firebird.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- * @since      Class became stable in Release 1.7.0
- */
-class DB_ibase extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'ibase';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'ibase';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * NOTE: only firebird supports limit.
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => false,
-        'new_link'      => false,
-        'numrows'       => 'emulate',
-        'pconnect'      => true,
-        'prepare'       => true,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        -104 => DB_ERROR_SYNTAX,
-        -150 => DB_ERROR_ACCESS_VIOLATION,
-        -151 => DB_ERROR_ACCESS_VIOLATION,
-        -155 => DB_ERROR_NOSUCHTABLE,
-        -157 => DB_ERROR_NOSUCHFIELD,
-        -158 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        -170 => DB_ERROR_MISMATCH,
-        -171 => DB_ERROR_MISMATCH,
-        -172 => DB_ERROR_INVALID,
-        // -204 =>  // Covers too many errors, need to use regex on msg
-        -205 => DB_ERROR_NOSUCHFIELD,
-        -206 => DB_ERROR_NOSUCHFIELD,
-        -208 => DB_ERROR_INVALID,
-        -219 => DB_ERROR_NOSUCHTABLE,
-        -297 => DB_ERROR_CONSTRAINT,
-        -303 => DB_ERROR_INVALID,
-        -413 => DB_ERROR_INVALID_NUMBER,
-        -530 => DB_ERROR_CONSTRAINT,
-        -551 => DB_ERROR_ACCESS_VIOLATION,
-        -552 => DB_ERROR_ACCESS_VIOLATION,
-        // -607 =>  // Covers too many errors, need to use regex on msg
-        -625 => DB_ERROR_CONSTRAINT_NOT_NULL,
-        -803 => DB_ERROR_CONSTRAINT,
-        -804 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        // -902 =>  // Covers too many errors, need to use regex on msg
-        -904 => DB_ERROR_CONNECT_FAILED,
-        -922 => DB_ERROR_NOSUCHDB,
-        -923 => DB_ERROR_CONNECT_FAILED,
-        -924 => DB_ERROR_CONNECT_FAILED
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     * @access private
-     */
-    var $affected = 0;
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The prepared statement handle from the most recently executed statement
-     *
-     * {@internal  Mainly here because the InterBase/Firebird API is only
-     * able to retrieve data from result sets if the statemnt handle is
-     * still in scope.}}
-     *
-     * @var resource
-     */
-    var $last_stmt;
-
-    /**
-     * Is the given prepared statement a data manipulation query?
-     * @var array
-     * @access private
-     */
-    var $manip_query = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_ibase()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's ibase driver supports the following extra DSN options:
-     *   + buffers    The number of database buffers to allocate for the
-     *                 server-side cache.
-     *   + charset    The default character set for a database.
-     *   + dialect    The default SQL dialect for any statement
-     *                 executed within a connection.  Defaults to the
-     *                 highest one supported by client libraries.
-     *                 Functional only with InterBase 6 and up.
-     *   + role       Functional only with InterBase 5 and up.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('interbase')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-        if ($this->dbsyntax == 'firebird') {
-            $this->features['limit'] = 'alter';
-        }
-
-        $params = array(
-            $dsn['hostspec']
-                    ? ($dsn['hostspec'] . ':' . $dsn['database'])
-                    : $dsn['database'],
-            $dsn['username'] ? $dsn['username'] : null,
-            $dsn['password'] ? $dsn['password'] : null,
-            isset($dsn['charset']) ? $dsn['charset'] : null,
-            isset($dsn['buffers']) ? $dsn['buffers'] : null,
-            isset($dsn['dialect']) ? $dsn['dialect'] : null,
-            isset($dsn['role'])    ? $dsn['role'] : null,
-        );
-
-        $connect_function = $persistent ? 'ibase_pconnect' : 'ibase_connect';
-
-        $this->connection = @call_user_func_array($connect_function, $params);
-        if (!$this->connection) {
-            return $this->ibaseRaiseError(DB_ERROR_CONNECT_FAILED);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @ibase_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @ibase_query($this->connection, $query);
-
-        if (!$result) {
-            return $this->ibaseRaiseError();
-        }
-        if ($this->autocommit && $ismanip) {
-            @ibase_commit($this->connection);
-        }
-        if ($ismanip) {
-            $this->affected = $result;
-            return DB_OK;
-        } else {
-            $this->affected = 0;
-            return $result;
-        }
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * Only works with Firebird.
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if ($this->dsn['dbsyntax'] == 'firebird') {
-            $query = preg_replace('/^([\s(])*SELECT/i',
-                                  "SELECT FIRST $count SKIP $from", $query);
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal ibase result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            return $this->ibaseRaiseError(DB_ERROR_NOT_CAPABLE);
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            if (function_exists('ibase_fetch_assoc')) {
-                $arr = @ibase_fetch_assoc($result);
-            } else {
-                $arr = get_object_vars(ibase_fetch_object($result));
-            }
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @ibase_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? ibase_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ freeQuery()
-
-    function freeQuery($query)
-    {
-        return is_resource($query) ? ibase_free_query($query) : false;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if (is_integer($this->affected)) {
-            return $this->affected;
-        }
-        return $this->ibaseRaiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @ibase_num_fields($result);
-        if (!$cols) {
-            return $this->ibaseRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     *
-     * prepare() requires a generic query as string like <code>
-     *    INSERT INTO numbers VALUES (?, ?, ?)
-     * </code>.  The <kbd>?</kbd> characters are placeholders.
-     *
-     * Three types of placeholders can be used:
-     *   + <kbd>?</kbd>  a quoted scalar value, i.e. strings, integers
-     *   + <kbd>!</kbd>  value is inserted 'as is'
-     *   + <kbd>&</kbd>  requires a file name.  The file's contents get
-     *                     inserted into the query (i.e. saving binary
-     *                     data in a db)
-     *
-     * Use backslashes to escape placeholder characters if you don't want
-     * them to be interpreted as placeholders.  Example: <code>
-     *    "UPDATE foo SET col=? WHERE col='over \& under'"
-     * </code>
-     *
-     * @param string $query query to be prepared
-     * @return mixed DB statement resource on success. DB_Error on failure.
-     */
-    function prepare($query)
-    {
-        $tokens   = preg_split('/((?<!\\\)[&?!])/', $query, -1,
-                               PREG_SPLIT_DELIM_CAPTURE);
-        $token    = 0;
-        $types    = array();
-        $newquery = '';
-
-        foreach ($tokens as $key => $val) {
-            switch ($val) {
-                case '?':
-                    $types[$token++] = DB_PARAM_SCALAR;
-                    break;
-                case '&':
-                    $types[$token++] = DB_PARAM_OPAQUE;
-                    break;
-                case '!':
-                    $types[$token++] = DB_PARAM_MISC;
-                    break;
-                default:
-                    $tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
-                    $newquery .= $tokens[$key] . '?';
-            }
-        }
-
-        $newquery = substr($newquery, 0, -1);
-        $this->last_query = $query;
-        $newquery = $this->modifyQuery($newquery);
-        $stmt = @ibase_prepare($this->connection, $newquery);
-
-        if ($stmt === false) {
-            $stmt = $this->ibaseRaiseError();
-        } else {
-            $this->prepare_types[(int)$stmt] = $types;
-            $this->manip_query[(int)$stmt]   = DB::isManip($query);
-        }
-
-        return $stmt;
-    }
-
-    // }}}
-    // {{{ execute()
-
-    /**
-     * Executes a DB statement prepared with prepare().
-     *
-     * @param resource  $stmt  a DB statement resource returned from prepare()
-     * @param mixed  $data  array, string or numeric data to be used in
-     *                      execution of the statement.  Quantity of items
-     *                      passed must match quantity of placeholders in
-     *                      query:  meaning 1 for non-array items or the
-     *                      quantity of elements in the array.
-     * @return object  a new DB_Result or a DB_Error when fail
-     * @see DB_ibase::prepare()
-     * @access public
-     */
-    function &execute($stmt, $data = array())
-    {
-        $data = (array)$data;
-        $this->last_parameters = $data;
-
-        $types = $this->prepare_types[(int)$stmt];
-        if (count($types) != count($data)) {
-            $tmp = $this->raiseError(DB_ERROR_MISMATCH);
-            return $tmp;
-        }
-
-        $i = 0;
-        foreach ($data as $key => $value) {
-            if ($types[$i] == DB_PARAM_MISC) {
-                /*
-                 * ibase doesn't seem to have the ability to pass a
-                 * parameter along unchanged, so strip off quotes from start
-                 * and end, plus turn two single quotes to one single quote,
-                 * in order to avoid the quotes getting escaped by
-                 * ibase and ending up in the database.
-                 */
-                $data[$key] = preg_replace("/^'(.*)'$/", "\\1", $data[$key]);
-                $data[$key] = str_replace("''", "'", $data[$key]);
-            } elseif ($types[$i] == DB_PARAM_OPAQUE) {
-                $fp = @fopen($data[$key], 'rb');
-                if (!$fp) {
-                    $tmp = $this->raiseError(DB_ERROR_ACCESS_VIOLATION);
-                    return $tmp;
-                }
-                $data[$key] = fread($fp, filesize($data[$key]));
-                fclose($fp);
-            }
-            $i++;
-        }
-
-        array_unshift($data, $stmt);
-
-        $res = call_user_func_array('ibase_execute', $data);
-        if (!$res) {
-            $tmp = $this->ibaseRaiseError();
-            return $tmp;
-        }
-        /* XXX need this?
-        if ($this->autocommit && $this->manip_query[(int)$stmt]) {
-            @ibase_commit($this->connection);
-        }*/
-        $this->last_stmt = $stmt;
-        if ($this->manip_query[(int)$stmt] || $this->_next_query_manip) {
-            $this->_last_query_manip = true;
-            $this->_next_query_manip = false;
-            $tmp = DB_OK;
-        } else {
-            $this->_last_query_manip = false;
-            $tmp = new DB_result($this, $res);
-        }
-        return $tmp;
-    }
-
-    /**
-     * Frees the internal resources associated with a prepared query
-     *
-     * @param resource $stmt           the prepared statement's PHP resource
-     * @param bool     $free_resource  should the PHP resource be freed too?
-     *                                  Use false if you need to get data
-     *                                  from the result set later.
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_ibase::prepare()
-     */
-    function freePrepared($stmt, $free_resource = true)
-    {
-        if (!is_resource($stmt)) {
-            return false;
-        }
-        if ($free_resource) {
-            @ibase_free_query($stmt);
-        }
-        unset($this->prepare_tokens[(int)$stmt]);
-        unset($this->prepare_types[(int)$stmt]);
-        unset($this->manip_query[(int)$stmt]);
-        return true;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        $this->autocommit = $onoff ? 1 : 0;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        return @ibase_commit($this->connection);
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        return @ibase_rollback($this->connection);
-    }
-
-    // }}}
-    // {{{ transactionInit()
-
-    function transactionInit($trans_args = 0)
-    {
-        return $trans_args
-                ? @ibase_trans($trans_args, $this->connection)
-                : @ibase_trans();
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_ibase::createSequence(), DB_ibase::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $sqn = strtoupper($this->getSequenceName($seq_name));
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT GEN_ID(${sqn}, 1) "
-                                   . 'FROM RDB$GENERATORS '
-                                   . "WHERE RDB\$GENERATOR_NAME='${sqn}'");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result)) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $result;
-                }
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        $result->free();
-        return $arr[0];
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_ibase::nextID(), DB_ibase::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $sqn = strtoupper($this->getSequenceName($seq_name));
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $result = $this->query("CREATE GENERATOR ${sqn}");
-        $this->popErrorHandling();
-
-        return $result;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_ibase::nextID(), DB_ibase::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DELETE FROM RDB$GENERATORS '
-                            . "WHERE RDB\$GENERATOR_NAME='"
-                            . strtoupper($this->getSequenceName($seq_name))
-                            . "'");
-    }
-
-    // }}}
-    // {{{ _ibaseFieldFlags()
-
-    /**
-     * Get the column's flags
-     *
-     * Supports "primary_key", "unique_key", "not_null", "default",
-     * "computed" and "blob".
-     *
-     * @param string $field_name  the name of the field
-     * @param string $table_name  the name of the table
-     *
-     * @return string  the flags
-     *
-     * @access private
-     */
-    function _ibaseFieldFlags($field_name, $table_name)
-    {
-        $sql = 'SELECT R.RDB$CONSTRAINT_TYPE CTYPE'
-               .' FROM RDB$INDEX_SEGMENTS I'
-               .'  JOIN RDB$RELATION_CONSTRAINTS R ON I.RDB$INDEX_NAME=R.RDB$INDEX_NAME'
-               .' WHERE I.RDB$FIELD_NAME=\'' . $field_name . '\''
-               .'  AND UPPER(R.RDB$RELATION_NAME)=\'' . strtoupper($table_name) . '\'';
-
-        $result = @ibase_query($this->connection, $sql);
-        if (!$result) {
-            return $this->ibaseRaiseError();
-        }
-
-        $flags = '';
-        if ($obj = @ibase_fetch_object($result)) {
-            @ibase_free_result($result);
-            if (isset($obj->CTYPE)  && trim($obj->CTYPE) == 'PRIMARY KEY') {
-                $flags .= 'primary_key ';
-            }
-            if (isset($obj->CTYPE)  && trim($obj->CTYPE) == 'UNIQUE') {
-                $flags .= 'unique_key ';
-            }
-        }
-
-        $sql = 'SELECT R.RDB$NULL_FLAG AS NFLAG,'
-               .'  R.RDB$DEFAULT_SOURCE AS DSOURCE,'
-               .'  F.RDB$FIELD_TYPE AS FTYPE,'
-               .'  F.RDB$COMPUTED_SOURCE AS CSOURCE'
-               .' FROM RDB$RELATION_FIELDS R '
-               .'  JOIN RDB$FIELDS F ON R.RDB$FIELD_SOURCE=F.RDB$FIELD_NAME'
-               .' WHERE UPPER(R.RDB$RELATION_NAME)=\'' . strtoupper($table_name) . '\''
-               .'  AND R.RDB$FIELD_NAME=\'' . $field_name . '\'';
-
-        $result = @ibase_query($this->connection, $sql);
-        if (!$result) {
-            return $this->ibaseRaiseError();
-        }
-        if ($obj = @ibase_fetch_object($result)) {
-            @ibase_free_result($result);
-            if (isset($obj->NFLAG)) {
-                $flags .= 'not_null ';
-            }
-            if (isset($obj->DSOURCE)) {
-                $flags .= 'default ';
-            }
-            if (isset($obj->CSOURCE)) {
-                $flags .= 'computed ';
-            }
-            if (isset($obj->FTYPE)  && $obj->FTYPE == 261) {
-                $flags .= 'blob ';
-            }
-        }
-
-        return trim($flags);
-    }
-
-    // }}}
-    // {{{ ibaseRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_ibase::errorNative(), DB_ibase::errorCode()
-     */
-    function &ibaseRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $errno = $this->errorCode($this->errorNative());
-        }
-        $tmp = $this->raiseError($errno, null, null, null, @ibase_errmsg());
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code.  NULL if there is no error code.
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function errorNative()
-    {
-        if (function_exists('ibase_errcode')) {
-            return @ibase_errcode();
-        }
-        if (preg_match('/^Dynamic SQL Error SQL error code = ([0-9-]+)/i',
-                       @ibase_errmsg(), $m)) {
-            return (int)$m[1];
-        }
-        return null;
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Maps native error codes to DB's portable ones
-     *
-     * @param int $nativecode  the error code returned by the DBMS
-     *
-     * @return int  the portable DB error code.  Return DB_ERROR if the
-     *               current driver doesn't have a mapping for the
-     *               $nativecode submitted.
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function errorCode($nativecode = null)
-    {
-        if (isset($this->errorcode_map[$nativecode])) {
-            return $this->errorcode_map[$nativecode];
-        }
-
-        static $error_regexps;
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/generator .* is not defined/'
-                    => DB_ERROR_SYNTAX,  // for compat. w ibase_errcode()
-                '/table.*(not exist|not found|unknown)/i'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/table .* already exists/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/unsuccessful metadata update .* failed attempt to store duplicate value/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/unsuccessful metadata update .* not found/i'
-                    => DB_ERROR_NOT_FOUND,
-                '/validation error for column .* value "\*\*\* null/i'
-                    => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/violation of [\w ]+ constraint/i'
-                    => DB_ERROR_CONSTRAINT,
-                '/conversion error from string/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/no permission for/i'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/arithmetic exception, numeric overflow, or string truncation/i'
-                    => DB_ERROR_INVALID,
-                '/feature is not supported/i'
-                    => DB_ERROR_NOT_CAPABLE,
-            );
-        }
-
-        $errormsg = @ibase_errmsg();
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @ibase_query($this->connection,
-                               "SELECT * FROM $result WHERE 1=0");
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->ibaseRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @ibase_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $info = @ibase_field_info($id, $i);
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func($info['name']),
-                'type'  => $info['type'],
-                'len'   => $info['length'],
-                'flags' => ($got_string)
-                            ? $this->_ibaseFieldFlags($info['name'], $result)
-                            : '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @ibase_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT DISTINCT R.RDB$RELATION_NAME FROM '
-                       . 'RDB$RELATION_FIELDS R WHERE R.RDB$SYSTEM_FLAG=0';
-            case 'views':
-                return 'SELECT DISTINCT RDB$VIEW_NAME from RDB$VIEW_RELATIONS';
-            case 'users':
-                return 'SELECT DISTINCT RDB$USER FROM RDB$USER_PRIVILEGES';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/ifx.php b/airtime_mvc/library/pear/DB/ifx.php
deleted file mode 100644
index 98ebecb2d..000000000
--- a/airtime_mvc/library/pear/DB/ifx.php
+++ /dev/null
@@ -1,683 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's ifx extension
- * for interacting with Informix databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ifx.php,v 1.75 2007/07/06 05:19:21 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's ifx extension
- * for interacting with Informix databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * More info on Informix errors can be found at:
- * http://www.informix.com/answers/english/ierrors.htm
- *
- * TODO:
- *   - set needed env Informix vars on connect
- *   - implement native prepare/execute
- *
- * @category   Database
- * @package    DB
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_ifx extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'ifx';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'ifx';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'emulate',
-        'new_link'      => false,
-        'numrows'       => 'emulate',
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        '-201'    => DB_ERROR_SYNTAX,
-        '-206'    => DB_ERROR_NOSUCHTABLE,
-        '-217'    => DB_ERROR_NOSUCHFIELD,
-        '-236'    => DB_ERROR_VALUE_COUNT_ON_ROW,
-        '-239'    => DB_ERROR_CONSTRAINT,
-        '-253'    => DB_ERROR_SYNTAX,
-        '-268'    => DB_ERROR_CONSTRAINT,
-        '-292'    => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-310'    => DB_ERROR_ALREADY_EXISTS,
-        '-316'    => DB_ERROR_ALREADY_EXISTS,
-        '-319'    => DB_ERROR_NOT_FOUND,
-        '-329'    => DB_ERROR_NODBSELECTED,
-        '-346'    => DB_ERROR_CONSTRAINT,
-        '-386'    => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-391'    => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-554'    => DB_ERROR_SYNTAX,
-        '-691'    => DB_ERROR_CONSTRAINT,
-        '-692'    => DB_ERROR_CONSTRAINT,
-        '-703'    => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '-1202'   => DB_ERROR_DIVZERO,
-        '-1204'   => DB_ERROR_INVALID_DATE,
-        '-1205'   => DB_ERROR_INVALID_DATE,
-        '-1206'   => DB_ERROR_INVALID_DATE,
-        '-1209'   => DB_ERROR_INVALID_DATE,
-        '-1210'   => DB_ERROR_INVALID_DATE,
-        '-1212'   => DB_ERROR_INVALID_DATE,
-        '-1213'   => DB_ERROR_INVALID_NUMBER,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     * @access private
-     */
-    var $affected = 0;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_ifx()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('informix') &&
-            !PEAR::loadExtension('Informix'))
-        {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $dbhost = $dsn['hostspec'] ? '@' . $dsn['hostspec'] : '';
-        $dbname = $dsn['database'] ? $dsn['database'] . $dbhost : '';
-        $user = $dsn['username'] ? $dsn['username'] : '';
-        $pw = $dsn['password'] ? $dsn['password'] : '';
-
-        $connect_function = $persistent ? 'ifx_pconnect' : 'ifx_connect';
-
-        $this->connection = @$connect_function($dbname, $user, $pw);
-        if (!is_resource($this->connection)) {
-            return $this->ifxRaiseError(DB_ERROR_CONNECT_FAILED);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @ifx_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $this->affected   = null;
-        if (preg_match('/(SELECT|EXECUTE)/i', $query)) {    //TESTME: Use !DB::isManip()?
-            // the scroll is needed for fetching absolute row numbers
-            // in a select query result
-            $result = @ifx_query($query, $this->connection, IFX_SCROLL);
-        } else {
-            if (!$this->autocommit && $ismanip) {
-                if ($this->transaction_opcount == 0) {
-                    $result = @ifx_query('BEGIN WORK', $this->connection);
-                    if (!$result) {
-                        return $this->ifxRaiseError();
-                    }
-                }
-                $this->transaction_opcount++;
-            }
-            $result = @ifx_query($query, $this->connection);
-        }
-        if (!$result) {
-            return $this->ifxRaiseError();
-        }
-        $this->affected = @ifx_affected_rows($result);
-        // Determine which queries should return data, and which
-        // should return an error code only.
-        if (preg_match('/(SELECT|EXECUTE)/i', $query)) {
-            return $result;
-        }
-        // XXX Testme: free results inside a transaction
-        // may cause to stop it and commit the work?
-
-        // Result has to be freed even with a insert or update
-        @ifx_free_result($result);
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal ifx result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            return $this->affected;
-        } else {
-            return 0;
-        }
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if (($rownum !== null) && ($rownum < 0)) {
-            return null;
-        }
-        if ($rownum === null) {
-            /*
-             * Even though fetch_row() should return the next row  if
-             * $rownum is null, it doesn't in all cases.  Bug 598.
-             */
-            $rownum = 'NEXT';
-        } else {
-            // Index starts at row 1, unlike most DBMS's starting at 0.
-            $rownum++;
-        }
-        if (!$arr = @ifx_fetch_row($result, $rownum)) {
-            return null;
-        }
-        if ($fetchmode !== DB_FETCHMODE_ASSOC) {
-            $i=0;
-            $order = array();
-            foreach ($arr as $val) {
-                $order[$i++] = $val;
-            }
-            $arr = $order;
-        } elseif ($fetchmode == DB_FETCHMODE_ASSOC &&
-                  $this->options['portability'] & DB_PORTABILITY_LOWERCASE)
-        {
-            $arr = array_change_key_case($arr, CASE_LOWER);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        if (!$cols = @ifx_num_fields($result)) {
-            return $this->ifxRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? ifx_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = true)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @ifx_query('COMMIT WORK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->ifxRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @ifx_query('ROLLBACK WORK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->ifxRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ ifxRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_ifx::errorNative(), DB_ifx::errorCode()
-     */
-    function ifxRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $errno = $this->errorCode(ifx_error());
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 $this->errorNative());
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code and message produced by the last query
-     *
-     * @return string  the DBMS' error code and message
-     */
-    function errorNative()
-    {
-        return @ifx_error() . ' ' . @ifx_errormsg();
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Maps native error codes to DB's portable ones.
-     *
-     * Requires that the DB implementation's constructor fills
-     * in the <var>$errorcode_map</var> property.
-     *
-     * @param  string  $nativecode  error code returned by the database
-     * @return int a portable DB error code, or DB_ERROR if this DB
-     * implementation has no mapping for the given error code.
-     */
-    function errorCode($nativecode)
-    {
-        if (ereg('SQLCODE=(.*)]', $nativecode, $match)) {
-            $code = $match[1];
-            if (isset($this->errorcode_map[$code])) {
-                return $this->errorcode_map[$code];
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' if <var>$result</var> is a table name.
-     *
-     * If analyzing a query result and the result has duplicate field names,
-     * an error will be raised saying
-     * <samp>can't distinguish duplicate field names</samp>.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.6.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @ifx_query("SELECT * FROM $result WHERE 1=0",
-                             $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->ifxRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        $flds = @ifx_fieldproperties($id);
-        $count = @ifx_num_fields($id);
-
-        if (count($flds) != $count) {
-            return $this->raiseError("can't distinguish duplicate field names");
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $i   = 0;
-        $res = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        foreach ($flds as $key => $value) {
-            $props = explode(';', $value);
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func($key),
-                'type'  => $props[0],
-                'len'   => $props[1],
-                'flags' => $props[4] == 'N' ? 'not_null' : '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-            $i++;
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @ifx_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT tabname FROM systables WHERE tabid >= 100';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/msql.php b/airtime_mvc/library/pear/DB/msql.php
deleted file mode 100644
index f9c107d34..000000000
--- a/airtime_mvc/library/pear/DB/msql.php
+++ /dev/null
@@ -1,831 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's msql extension
- * for interacting with Mini SQL databases
- *
- * PHP's mSQL extension did weird things with NULL values prior to PHP
- * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
- * those versions.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: msql.php,v 1.64 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's msql extension
- * for interacting with Mini SQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * PHP's mSQL extension did weird things with NULL values prior to PHP
- * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
- * those versions.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- * @since      Class not functional until Release 1.7.0
- */
-class DB_msql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'msql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'msql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'emulate',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * The query result resource created by PHP
-     *
-     * Used to make affectedRows() work.  Only contains the result for
-     * data manipulation queries.  Contains false for other queries.
-     *
-     * @var resource
-     * @access private
-     */
-    var $_result;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_msql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * Example of how to connect:
-     * <code>
-     * require_once 'DB.php';
-     * 
-     * // $dsn = 'msql://hostname/dbname';  // use a TCP connection
-     * $dsn = 'msql:///dbname';             // use a socket
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     * 
-     * $db = DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('msql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array();
-        if ($dsn['hostspec']) {
-            $params[] = $dsn['port']
-                        ? $dsn['hostspec'] . ',' . $dsn['port']
-                        : $dsn['hostspec'];
-        }
-
-        $connect_function = $persistent ? 'msql_pconnect' : 'msql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            if (($err = @msql_error()) != '') {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $err);
-            } else {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        }
-
-        if (!@msql_select_db($dsn['database'], $this->connection)) {
-            return $this->msqlRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @msql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @msql_query($query, $this->connection);
-        if (!$result) {
-            return $this->msqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            $this->_result = $result;
-            return DB_OK;
-        } else {
-            $this->_result = false;
-            return $result;
-        }
-    }
-
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal msql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * PHP's mSQL extension did weird things with NULL values prior to PHP
-     * 4.3.11 and 5.0.4.  Make sure your version of PHP meets or exceeds
-     * those versions.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@msql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @msql_fetch_array($result, MSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @msql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? msql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @msql_num_fields($result);
-        if (!$cols) {
-            return $this->msqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @msql_num_rows($result);
-        if ($rows === false) {
-            return $this->msqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affected()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if (!$this->_result) {
-            return 0;
-        }
-        return msql_affected_rows($this->_result);
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_msql::createSequence(), DB_msql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = false;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT _seq FROM ${seqname}");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = true;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        $result->free();
-        return $arr[0];
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * Also creates a new table to associate the sequence with.  Uses
-     * a separate table to ensure portability with other drivers.
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_msql::nextID(), DB_msql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-                            . ' (id INTEGER NOT NULL)');
-        if (DB::isError($res)) {
-            return $res;
-        }
-        $res = $this->query("CREATE SEQUENCE ON ${seqname}");
-        return $res;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_msql::nextID(), DB_msql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * mSQL does not support delimited identifiers
-     *
-     * @param string $str  the identifier name to be quoted
-     *
-     * @return object  a DB_Error object
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.7.0
-     */
-    function quoteIdentifier($str)
-    {
-        return $this->raiseError(DB_ERROR_UNSUPPORTED);
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteFloat($float) {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-     
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.7.0
-     */
-    function escapeSimple($str)
-    {
-        return addslashes($str);
-    }
-
-    // }}}
-    // {{{ msqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_msql::errorNative(), DB_msql::errorCode()
-     */
-    function msqlRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * @return string  the DBMS' error message
-     */
-    function errorNative()
-    {
-        return @msql_error();
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message
-     *
-     * @param string $errormsg  the error message returned from the database
-     *
-     * @return integer  the error number from a DB_ERROR* constant
-     */
-    function errorCode($errormsg)
-    {
-        static $error_regexps;
-        
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^msql[a-z_]+\(\): /', '', $errormsg);
-
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/^Access to database denied/i'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/^Bad index name/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/^Bad order field/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Bad type for comparison/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Can\'t perform LIKE on/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Can\'t use TEXT fields in LIKE comparison/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Couldn\'t create temporary table/i'
-                    => DB_ERROR_CANNOT_CREATE,
-                '/^Error creating table file/i'
-                    => DB_ERROR_CANNOT_CREATE,
-                '/^Field .* cannot be null$/i'
-                    => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/^Index (field|condition) .* cannot be null$/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Invalid date format/i'
-                    => DB_ERROR_INVALID_DATE,
-                '/^Invalid time format/i'
-                    => DB_ERROR_INVALID,
-                '/^Literal value for .* is wrong type$/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/^No Database Selected/i'
-                    => DB_ERROR_NODBSELECTED,
-                '/^No value specified for field/i'
-                    => DB_ERROR_VALUE_COUNT_ON_ROW,
-                '/^Non unique value for unique index/i'
-                    => DB_ERROR_CONSTRAINT,
-                '/^Out of memory for temporary table/i'
-                    => DB_ERROR_CANNOT_CREATE,
-                '/^Permission denied/i'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/^Reference to un-selected table/i'
-                    => DB_ERROR_SYNTAX,
-                '/^syntax error/i'
-                    => DB_ERROR_SYNTAX,
-                '/^Table .* exists$/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/^Unknown database/i'
-                    => DB_ERROR_NOSUCHDB,
-                '/^Unknown field/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/^Unknown (index|system variable)/i'
-                    => DB_ERROR_NOT_FOUND,
-                '/^Unknown table/i'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/^Unqualified field/i'
-                    => DB_ERROR_SYNTAX,
-            );
-        }
-
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @msql_query("SELECT * FROM $result",
-                              $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @msql_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $tmp = @msql_fetch_field($id);
-
-            $flags = '';
-            if ($tmp->not_null) {
-                $flags .= 'not_null ';
-            }
-            if ($tmp->unique) {
-                $flags .= 'unique_key ';
-            }
-            $flags = trim($flags);
-
-            $res[$i] = array(
-                'table' => $case_func($tmp->table),
-                'name'  => $case_func($tmp->name),
-                'type'  => $tmp->type,
-                'len'   => msql_field_len($id, $i),
-                'flags' => $flags,
-            );
-
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @msql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtain a list of a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return array  the array containing the list of objects requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'databases':
-                $id = @msql_list_dbs($this->connection);
-                break;
-            case 'tables':
-                $id = @msql_list_tables($this->dsn['database'],
-                                        $this->connection);
-                break;
-            default:
-                return null;
-        }
-        if (!$id) {
-            return $this->msqlRaiseError();
-        }
-        $out = array();
-        while ($row = @msql_fetch_row($id)) {
-            $out[] = $row[0];
-        }
-        return $out;
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/mssql.php b/airtime_mvc/library/pear/DB/mssql.php
deleted file mode 100644
index 57e19b0fd..000000000
--- a/airtime_mvc/library/pear/DB/mssql.php
+++ /dev/null
@@ -1,963 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's mssql extension
- * for interacting with Microsoft SQL Server databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: mssql.php,v 1.92 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's mssql extension
- * for interacting with Microsoft SQL Server databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * DB's mssql driver is only for Microsfoft SQL Server databases.
- *
- * If you're connecting to a Sybase database, you MUST specify "sybase"
- * as the "phptype" in the DSN.
- *
- * This class only works correctly if you have compiled PHP using
- * --with-mssql=[dir_to_FreeTDS].
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_mssql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'mssql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'mssql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'emulate',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    // XXX Add here error codes ie: 'S100E' => DB_ERROR_SYNTAX
-    var $errorcode_map = array(
-        102   => DB_ERROR_SYNTAX,
-        110   => DB_ERROR_VALUE_COUNT_ON_ROW,
-        155   => DB_ERROR_NOSUCHFIELD,
-        156   => DB_ERROR_SYNTAX,
-        170   => DB_ERROR_SYNTAX,
-        207   => DB_ERROR_NOSUCHFIELD,
-        208   => DB_ERROR_NOSUCHTABLE,
-        245   => DB_ERROR_INVALID_NUMBER,
-        319   => DB_ERROR_SYNTAX,
-        321   => DB_ERROR_NOSUCHFIELD,
-        325   => DB_ERROR_SYNTAX,
-        336   => DB_ERROR_SYNTAX,
-        515   => DB_ERROR_CONSTRAINT_NOT_NULL,
-        547   => DB_ERROR_CONSTRAINT,
-        1018  => DB_ERROR_SYNTAX,
-        1035  => DB_ERROR_SYNTAX,
-        1913  => DB_ERROR_ALREADY_EXISTS,
-        2209  => DB_ERROR_SYNTAX,
-        2223  => DB_ERROR_SYNTAX,
-        2248  => DB_ERROR_SYNTAX,
-        2256  => DB_ERROR_SYNTAX,
-        2257  => DB_ERROR_SYNTAX,
-        2627  => DB_ERROR_CONSTRAINT,
-        2714  => DB_ERROR_ALREADY_EXISTS,
-        3607  => DB_ERROR_DIVZERO,
-        3701  => DB_ERROR_NOSUCHTABLE,
-        7630  => DB_ERROR_SYNTAX,
-        8134  => DB_ERROR_DIVZERO,
-        9303  => DB_ERROR_SYNTAX,
-        9317  => DB_ERROR_SYNTAX,
-        9318  => DB_ERROR_SYNTAX,
-        9331  => DB_ERROR_SYNTAX,
-        9332  => DB_ERROR_SYNTAX,
-        15253 => DB_ERROR_SYNTAX,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    var $_db = null;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_mssql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('mssql') && !PEAR::loadExtension('sybase')
-            && !PEAR::loadExtension('sybase_ct'))
-        {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array(
-            $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost',
-            $dsn['username'] ? $dsn['username'] : null,
-            $dsn['password'] ? $dsn['password'] : null,
-        );
-        if ($dsn['port']) {
-            $params[0] .= ((substr(PHP_OS, 0, 3) == 'WIN') ? ',' : ':')
-                        . $dsn['port'];
-        }
-
-        $connect_function = $persistent ? 'mssql_pconnect' : 'mssql_connect';
-
-        $this->connection = @call_user_func_array($connect_function, $params);
-
-        if (!$this->connection) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     @mssql_get_last_message());
-        }
-        if ($dsn['database']) {
-            if (!@mssql_select_db($dsn['database'], $this->connection)) {
-                return $this->raiseError(DB_ERROR_NODBSELECTED,
-                                         null, null, null,
-                                         @mssql_get_last_message());
-            }
-            $this->_db = $dsn['database'];
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @mssql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        if (!@mssql_select_db($this->_db, $this->connection)) {
-            return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @mssql_query('BEGIN TRAN', $this->connection);
-                if (!$result) {
-                    return $this->mssqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @mssql_query($query, $this->connection);
-        if (!$result) {
-            return $this->mssqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        return $ismanip ? DB_OK : $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal mssql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return @mssql_next_result($result);
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@mssql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @mssql_fetch_assoc($result);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @mssql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? mssql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @mssql_num_fields($result);
-        if (!$cols) {
-            return $this->mssqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @mssql_num_rows($result);
-        if ($rows === false) {
-            return $this->mssqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @mssql_query('COMMIT TRAN', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mssqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @mssql_query('ROLLBACK TRAN', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mssqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $res = @mssql_query('select @@rowcount', $this->connection);
-            if (!$res) {
-                return $this->mssqlRaiseError();
-            }
-            $ar = @mssql_fetch_row($res);
-            if (!$ar) {
-                $result = 0;
-            } else {
-                @mssql_free_result($res);
-                $result = $ar[0];
-            }
-        } else {
-            $result = 0;
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_mssql::createSequence(), DB_mssql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        if (!@mssql_select_db($this->_db, $this->connection)) {
-            return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (vapor) VALUES (0)");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                ($result->getCode() == DB_ERROR || $result->getCode() == DB_ERROR_NOSUCHTABLE))
-            {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } elseif (!DB::isError($result)) {
-                $result = $this->query("SELECT IDENT_CURRENT('$seqname')");
-                if (DB::isError($result)) {
-                    /* Fallback code for MS SQL Server 7.0, which doesn't have
-                     * IDENT_CURRENT. This is *not* safe for concurrent
-                     * requests, and really, if you're using it, you're in a
-                     * world of hurt. Nevertheless, it's here to ensure BC. See
-                     * bug #181 for the gory details.*/
-                    $result = $this->query("SELECT @@IDENTITY FROM $seqname");
-                }
-                $repeat = 0;
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $result = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        return $result[0];
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_mssql::nextID(), DB_mssql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-                            . $this->getSequenceName($seq_name)
-                            . ' ([id] [int] IDENTITY (1, 1) NOT NULL,'
-                            . ' [vapor] [int] NULL)');
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_mssql::nextID(), DB_mssql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * @param string $str  identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '[' . str_replace(']', ']]', $str) . ']';
-    }
-
-    // }}}
-    // {{{ mssqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_mssql::errorNative(), DB_mssql::errorCode()
-     */
-    function mssqlRaiseError($code = null)
-    {
-        $message = @mssql_get_last_message();
-        if (!$code) {
-            $code = $this->errorNative();
-        }
-        return $this->raiseError($this->errorCode($code, $message),
-                                 null, null, null, "$code - $message");
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    function errorNative()
-    {
-        $res = @mssql_query('select @@ERROR as ErrorCode', $this->connection);
-        if (!$res) {
-            return DB_ERROR;
-        }
-        $row = @mssql_fetch_row($res);
-        return $row[0];
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from mssql's native codes.
-     *
-     * If <var>$nativecode</var> isn't known yet, it will be looked up.
-     *
-     * @param  mixed  $nativecode  mssql error code, if known
-     * @return integer  an error number from a DB error constant
-     * @see errorNative()
-     */
-    function errorCode($nativecode = null, $msg = '')
-    {
-        if (!$nativecode) {
-            $nativecode = $this->errorNative();
-        }
-        if (isset($this->errorcode_map[$nativecode])) {
-            if ($nativecode == 3701
-                && preg_match('/Cannot drop the index/i', $msg))
-            {
-                return DB_ERROR_NOT_FOUND;
-            }
-            return $this->errorcode_map[$nativecode];
-        } else {
-            return DB_ERROR;
-        }
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            if (!@mssql_select_db($this->_db, $this->connection)) {
-                return $this->mssqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $id = @mssql_query("SELECT * FROM $result WHERE 1=0",
-                               $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->mssqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mssql_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            if ($got_string) {
-                $flags = $this->_mssql_field_flags($result,
-                        @mssql_field_name($id, $i));
-                if (DB::isError($flags)) {
-                    return $flags;
-                }
-            } else {
-                $flags = '';
-            }
-
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func(@mssql_field_name($id, $i)),
-                'type'  => @mssql_field_type($id, $i),
-                'len'   => @mssql_field_length($id, $i),
-                'flags' => $flags,
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @mssql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _mssql_field_flags()
-
-    /**
-     * Get a column's flags
-     *
-     * Supports "not_null", "primary_key",
-     * "auto_increment" (mssql identity), "timestamp" (mssql timestamp),
-     * "unique_key" (mssql unique index, unique check or primary_key) and
-     * "multiple_key" (multikey index)
-     *
-     * mssql timestamp is NOT similar to the mysql timestamp so this is maybe
-     * not useful at all - is the behaviour of mysql_field_flags that primary
-     * keys are alway unique? is the interpretation of multiple_key correct?
-     *
-     * @param string $table   the table name
-     * @param string $column  the field name
-     *
-     * @return string  the flags
-     *
-     * @access private
-     * @author Joern Barthel <j_barthel@web.de>
-     */
-    function _mssql_field_flags($table, $column)
-    {
-        static $tableName = null;
-        static $flags = array();
-
-        if ($table != $tableName) {
-
-            $flags = array();
-            $tableName = $table;
-
-            // get unique and primary keys
-            $res = $this->getAll("EXEC SP_HELPINDEX $table", DB_FETCHMODE_ASSOC);
-            if (DB::isError($res)) {
-                return $res;
-            }
-
-            foreach ($res as $val) {
-                $keys = explode(', ', $val['index_keys']);
-
-                if (sizeof($keys) > 1) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'multiple_key');
-                    }
-                }
-
-                if (strpos($val['index_description'], 'primary key')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'primary_key');
-                    }
-                } elseif (strpos($val['index_description'], 'unique')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'unique_key');
-                    }
-                }
-            }
-
-            // get auto_increment, not_null and timestamp
-            $res = $this->getAll("EXEC SP_COLUMNS $table", DB_FETCHMODE_ASSOC);
-            if (DB::isError($res)) {
-                return $res;
-            }
-
-            foreach ($res as $val) {
-                $val = array_change_key_case($val, CASE_LOWER);
-                if ($val['nullable'] == '0') {
-                    $this->_add_flag($flags[$val['column_name']], 'not_null');
-                }
-                if (strpos($val['type_name'], 'identity')) {
-                    $this->_add_flag($flags[$val['column_name']], 'auto_increment');
-                }
-                if (strpos($val['type_name'], 'timestamp')) {
-                    $this->_add_flag($flags[$val['column_name']], 'timestamp');
-                }
-            }
-        }
-
-        if (array_key_exists($column, $flags)) {
-            return(implode(' ', $flags[$column]));
-        }
-        return '';
-    }
-
-    // }}}
-    // {{{ _add_flag()
-
-    /**
-     * Adds a string to the flags array if the flag is not yet in there
-     * - if there is no flag present the array is created
-     *
-     * @param array  &$array  the reference to the flag-array
-     * @param string $value   the flag value
-     *
-     * @return void
-     *
-     * @access private
-     * @author Joern Barthel <j_barthel@web.de>
-     */
-    function _add_flag(&$array, $value)
-    {
-        if (!is_array($array)) {
-            $array = array($value);
-        } elseif (!in_array($value, $array)) {
-            array_push($array, $value);
-        }
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return "SELECT name FROM sysobjects WHERE type = 'U'"
-                       . ' ORDER BY name';
-            case 'views':
-                return "SELECT name FROM sysobjects WHERE type = 'V'";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/mysql.php b/airtime_mvc/library/pear/DB/mysql.php
deleted file mode 100644
index e9b5e70c9..000000000
--- a/airtime_mvc/library/pear/DB/mysql.php
+++ /dev/null
@@ -1,1045 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's mysql extension
- * for interacting with MySQL databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: mysql.php,v 1.126 2007/09/21 13:32:52 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's mysql extension
- * for interacting with MySQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_mysql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'mysql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'mysql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => '4.2.0',
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        1004 => DB_ERROR_CANNOT_CREATE,
-        1005 => DB_ERROR_CANNOT_CREATE,
-        1006 => DB_ERROR_CANNOT_CREATE,
-        1007 => DB_ERROR_ALREADY_EXISTS,
-        1008 => DB_ERROR_CANNOT_DROP,
-        1022 => DB_ERROR_ALREADY_EXISTS,
-        1044 => DB_ERROR_ACCESS_VIOLATION,
-        1046 => DB_ERROR_NODBSELECTED,
-        1048 => DB_ERROR_CONSTRAINT,
-        1049 => DB_ERROR_NOSUCHDB,
-        1050 => DB_ERROR_ALREADY_EXISTS,
-        1051 => DB_ERROR_NOSUCHTABLE,
-        1054 => DB_ERROR_NOSUCHFIELD,
-        1061 => DB_ERROR_ALREADY_EXISTS,
-        1062 => DB_ERROR_ALREADY_EXISTS,
-        1064 => DB_ERROR_SYNTAX,
-        1091 => DB_ERROR_NOT_FOUND,
-        1100 => DB_ERROR_NOT_LOCKED,
-        1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        1142 => DB_ERROR_ACCESS_VIOLATION,
-        1146 => DB_ERROR_NOSUCHTABLE,
-        1216 => DB_ERROR_CONSTRAINT,
-        1217 => DB_ERROR_CONSTRAINT,
-        1356 => DB_ERROR_DIVZERO,
-        1451 => DB_ERROR_CONSTRAINT,
-        1452 => DB_ERROR_CONSTRAINT,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    var $_db = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_mysql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's mysql driver supports the following extra DSN options:
-     *   + new_link      If set to true, causes subsequent calls to connect()
-     *                    to return a new connection link instead of the
-     *                    existing one.  WARNING: this is not portable to
-     *                    other DBMS's. Available since PEAR DB 1.7.0.
-     *   + client_flags  Any combination of MYSQL_CLIENT_* constants.
-     *                    Only used if PHP is at version 4.3.0 or greater.
-     *                    Available since PEAR DB 1.7.0.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('mysql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array();
-        if ($dsn['protocol'] && $dsn['protocol'] == 'unix') {
-            $params[0] = ':' . $dsn['socket'];
-        } else {
-            $params[0] = $dsn['hostspec'] ? $dsn['hostspec']
-                         : 'localhost';
-            if ($dsn['port']) {
-                $params[0] .= ':' . $dsn['port'];
-            }
-        }
-        $params[] = $dsn['username'] ? $dsn['username'] : null;
-        $params[] = $dsn['password'] ? $dsn['password'] : null;
-
-        if (!$persistent) {
-            if (isset($dsn['new_link'])
-                && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
-            {
-                $params[] = true;
-            } else {
-                $params[] = false;
-            }
-        }
-        if (version_compare(phpversion(), '4.3.0', '>=')) {
-            $params[] = isset($dsn['client_flags'])
-                        ? $dsn['client_flags'] : null;
-        }
-
-        $connect_function = $persistent ? 'mysql_pconnect' : 'mysql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            if (($err = @mysql_error()) != '') {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null, 
-                                         $err);
-            } else {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        }
-
-        if ($dsn['database']) {
-            if (!@mysql_select_db($dsn['database'], $this->connection)) {
-                return $this->mysqlRaiseError();
-            }
-            $this->_db = $dsn['database'];
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @mysql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * Generally uses mysql_query().  If you want to use
-     * mysql_unbuffered_query() set the "result_buffering" option to 0 using
-     * setOptions().  This option was added in Release 1.7.0.
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        if ($this->_db) {
-            if (!@mysql_select_db($this->_db, $this->connection)) {
-                return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-        }
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @mysql_query('SET AUTOCOMMIT=0', $this->connection);
-                $result = @mysql_query('BEGIN', $this->connection);
-                if (!$result) {
-                    return $this->mysqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        if (!$this->options['result_buffering']) {
-            $result = @mysql_unbuffered_query($query, $this->connection);
-        } else {
-            $result = @mysql_query($query, $this->connection);
-        }
-        if (!$result) {
-            return $this->mysqlRaiseError();
-        }
-        if (is_resource($result)) {
-            return $result;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal mysql result pointer to the next available result
-     *
-     * This method has not been implemented yet.
-     *
-     * @param a valid sql result resource
-     *
-     * @return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@mysql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @mysql_fetch_array($result, MYSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @mysql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            /*
-             * Even though this DBMS already trims output, we do this because
-             * a field might have intentional whitespace at the end that
-             * gets removed by DB_PORTABILITY_RTRIM under another driver.
-             */
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? mysql_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @mysql_num_fields($result);
-        if (!$cols) {
-            return $this->mysqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @mysql_num_rows($result);
-        if ($rows === null) {
-            return $this->mysqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysql_select_db($this->_db, $this->connection)) {
-                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysql_query('COMMIT', $this->connection);
-            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysql_select_db($this->_db, $this->connection)) {
-                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysql_query('ROLLBACK', $this->connection);
-            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            return @mysql_affected_rows($this->connection);
-        } else {
-            return 0;
-        }
-     }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_mysql::createSequence(), DB_mysql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("UPDATE ${seqname} ".
-                                   'SET id=LAST_INSERT_ID(id+1)');
-            $this->popErrorHandling();
-            if ($result === DB_OK) {
-                // COMMON CASE
-                $id = @mysql_insert_id($this->connection);
-                if ($id != 0) {
-                    return $id;
-                }
-                // EMPTY SEQ TABLE
-                // Sequence table must be empty for some reason, so fill
-                // it and return 1 and obtain a user-level lock
-                $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                if ($result == 0) {
-                    // Failed to get the lock
-                    return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
-                }
-
-                // add the default value
-                $result = $this->query("REPLACE INTO ${seqname} (id) VALUES (0)");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-
-                // Release the lock
-                $result = $this->getOne('SELECT RELEASE_LOCK('
-                                        . "'${seqname}_lock')");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                // We know what the result will be, so no need to try again
-                return 1;
-
-            } elseif ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE)
-            {
-                // ONDEMAND TABLE CREATION
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                } else {
-                    $repeat = 1;
-                }
-
-            } elseif (DB::isError($result) &&
-                      $result->getCode() == DB_ERROR_ALREADY_EXISTS)
-            {
-                // BACKWARDS COMPAT
-                // see _BCsequence() comment
-                $result = $this->_BCsequence($seqname);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                $repeat = 1;
-            }
-        } while ($repeat);
-
-        return $this->raiseError($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_mysql::nextID(), DB_mysql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-                            . ' (id INTEGER UNSIGNED AUTO_INCREMENT NOT NULL,'
-                            . ' PRIMARY KEY(id))');
-        if (DB::isError($res)) {
-            return $res;
-        }
-        // insert yields value 1, nextId call will generate ID 2
-        $res = $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
-        if (DB::isError($res)) {
-            return $res;
-        }
-        // so reset to zero
-        return $this->query("UPDATE ${seqname} SET id = 0");
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_mysql::nextID(), DB_mysql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ _BCsequence()
-
-    /**
-     * Backwards compatibility with old sequence emulation implementation
-     * (clean up the dupes)
-     *
-     * @param string $seqname  the sequence name to clean up
-     *
-     * @return bool  true on success.  A DB_Error object on failure.
-     *
-     * @access private
-     */
-    function _BCsequence($seqname)
-    {
-        // Obtain a user-level lock... this will release any previous
-        // application locks, but unlike LOCK TABLES, it does not abort
-        // the current transaction and is much less frequently used.
-        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        if ($result == 0) {
-            // Failed to get the lock, can't do the conversion, bail
-            // with a DB_ERROR_NOT_LOCKED error
-            return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
-        }
-
-        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
-        if (DB::isError($highest_id)) {
-            return $highest_id;
-        }
-        // This should kill all rows except the highest
-        // We should probably do something if $highest_id isn't
-        // numeric, but I'm at a loss as how to handle that...
-        $result = $this->query('DELETE FROM ' . $seqname
-                               . " WHERE id <> $highest_id");
-        if (DB::isError($result)) {
-            return $result;
-        }
-
-        // If another thread has been waiting for this lock,
-        // it will go thru the above procedure, but will have no
-        // real effect
-        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     * (WARNING: using names that require this is a REALLY BAD IDEA)
-     *
-     * WARNING:  Older versions of MySQL can't handle the backtick
-     * character (<kbd>`</kbd>) in table or column names.
-     *
-     * @param string $str  identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '`' . str_replace('`', '``', $str) . '`';
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($str);
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        if (function_exists('mysql_real_escape_string')) {
-            return @mysql_real_escape_string($str, $this->connection);
-        } else {
-            return @mysql_escape_string($str);
-        }
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * This little hack lets you know how many rows were deleted
-     * when running a "DELETE FROM table" query.  Only implemented
-     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_common::setOption()
-     */
-    function modifyQuery($query)
-    {
-        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
-            // "DELETE FROM table" gives 0 affected rows in MySQL.
-            // This little hack lets you know how many rows were deleted.
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if (DB::isManip($query) || $this->_next_query_manip) {
-            return $query . " LIMIT $count";
-        } else {
-            return $query . " LIMIT $from, $count";
-        }
-    }
-
-    // }}}
-    // {{{ mysqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_mysql::errorNative(), DB_common::errorCode()
-     */
-    function mysqlRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
-                $this->errorcode_map[1022] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT_NOT_NULL;
-                $this->errorcode_map[1062] = DB_ERROR_CONSTRAINT;
-            } else {
-                // Doing this in case mode changes during runtime.
-                $this->errorcode_map[1022] = DB_ERROR_ALREADY_EXISTS;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1062] = DB_ERROR_ALREADY_EXISTS;
-            }
-            $errno = $this->errorCode(mysql_errno($this->connection));
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 @mysql_errno($this->connection) . ' ** ' .
-                                 @mysql_error($this->connection));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    function errorNative()
-    {
-        return @mysql_errno($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            // Fix for bug #11580.
-            if ($this->_db) {
-                if (!@mysql_select_db($this->_db, $this->connection)) {
-                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @mysql_query("SELECT * FROM $result LIMIT 0",
-                               $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->mysqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mysql_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $case_func(@mysql_field_table($id, $i)),
-                'name'  => $case_func(@mysql_field_name($id, $i)),
-                'type'  => @mysql_field_type($id, $i),
-                'len'   => @mysql_field_len($id, $i),
-                'flags' => @mysql_field_flags($id, $i),
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @mysql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SHOW TABLES';
-            case 'users':
-                return 'SELECT DISTINCT User FROM mysql.user';
-            case 'databases':
-                return 'SHOW DATABASES';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/mysqli.php b/airtime_mvc/library/pear/DB/mysqli.php
deleted file mode 100644
index 4449484d7..000000000
--- a/airtime_mvc/library/pear/DB/mysqli.php
+++ /dev/null
@@ -1,1092 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's mysqli extension
- * for interacting with MySQL databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: mysqli.php,v 1.82 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's mysqli extension
- * for interacting with MySQL databases
- *
- * This is for MySQL versions 4.1 and above.  Requires PHP 5.
- *
- * Note that persistent connections no longer exist.
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- * @since      Class functional since Release 1.6.3
- */
-class DB_mysqli extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'mysqli';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'mysqli';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => false,
-        'prepare'       => false,
-        'ssl'           => true,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        1004 => DB_ERROR_CANNOT_CREATE,
-        1005 => DB_ERROR_CANNOT_CREATE,
-        1006 => DB_ERROR_CANNOT_CREATE,
-        1007 => DB_ERROR_ALREADY_EXISTS,
-        1008 => DB_ERROR_CANNOT_DROP,
-        1022 => DB_ERROR_ALREADY_EXISTS,
-        1044 => DB_ERROR_ACCESS_VIOLATION,
-        1046 => DB_ERROR_NODBSELECTED,
-        1048 => DB_ERROR_CONSTRAINT,
-        1049 => DB_ERROR_NOSUCHDB,
-        1050 => DB_ERROR_ALREADY_EXISTS,
-        1051 => DB_ERROR_NOSUCHTABLE,
-        1054 => DB_ERROR_NOSUCHFIELD,
-        1061 => DB_ERROR_ALREADY_EXISTS,
-        1062 => DB_ERROR_ALREADY_EXISTS,
-        1064 => DB_ERROR_SYNTAX,
-        1091 => DB_ERROR_NOT_FOUND,
-        1100 => DB_ERROR_NOT_LOCKED,
-        1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        1142 => DB_ERROR_ACCESS_VIOLATION,
-        1146 => DB_ERROR_NOSUCHTABLE,
-        1216 => DB_ERROR_CONSTRAINT,
-        1217 => DB_ERROR_CONSTRAINT,
-        1356 => DB_ERROR_DIVZERO,
-        1451 => DB_ERROR_CONSTRAINT,
-        1452 => DB_ERROR_CONSTRAINT,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    var $_db = '';
-
-    /**
-     * Array for converting MYSQLI_*_FLAG constants to text values
-     * @var    array
-     * @access public
-     * @since  Property available since Release 1.6.5
-     */
-    var $mysqli_flags = array(
-        MYSQLI_NOT_NULL_FLAG        => 'not_null',
-        MYSQLI_PRI_KEY_FLAG         => 'primary_key',
-        MYSQLI_UNIQUE_KEY_FLAG      => 'unique_key',
-        MYSQLI_MULTIPLE_KEY_FLAG    => 'multiple_key',
-        MYSQLI_BLOB_FLAG            => 'blob',
-        MYSQLI_UNSIGNED_FLAG        => 'unsigned',
-        MYSQLI_ZEROFILL_FLAG        => 'zerofill',
-        MYSQLI_AUTO_INCREMENT_FLAG  => 'auto_increment',
-        MYSQLI_TIMESTAMP_FLAG       => 'timestamp',
-        MYSQLI_SET_FLAG             => 'set',
-        // MYSQLI_NUM_FLAG             => 'numeric',  // unnecessary
-        // MYSQLI_PART_KEY_FLAG        => 'multiple_key',  // duplicatvie
-        MYSQLI_GROUP_FLAG           => 'group_by'
-    );
-
-    /**
-     * Array for converting MYSQLI_TYPE_* constants to text values
-     * @var    array
-     * @access public
-     * @since  Property available since Release 1.6.5
-     */
-    var $mysqli_types = array(
-        MYSQLI_TYPE_DECIMAL     => 'decimal',
-        MYSQLI_TYPE_TINY        => 'tinyint',
-        MYSQLI_TYPE_SHORT       => 'int',
-        MYSQLI_TYPE_LONG        => 'int',
-        MYSQLI_TYPE_FLOAT       => 'float',
-        MYSQLI_TYPE_DOUBLE      => 'double',
-        // MYSQLI_TYPE_NULL        => 'DEFAULT NULL',  // let flags handle it
-        MYSQLI_TYPE_TIMESTAMP   => 'timestamp',
-        MYSQLI_TYPE_LONGLONG    => 'bigint',
-        MYSQLI_TYPE_INT24       => 'mediumint',
-        MYSQLI_TYPE_DATE        => 'date',
-        MYSQLI_TYPE_TIME        => 'time',
-        MYSQLI_TYPE_DATETIME    => 'datetime',
-        MYSQLI_TYPE_YEAR        => 'year',
-        MYSQLI_TYPE_NEWDATE     => 'date',
-        MYSQLI_TYPE_ENUM        => 'enum',
-        MYSQLI_TYPE_SET         => 'set',
-        MYSQLI_TYPE_TINY_BLOB   => 'tinyblob',
-        MYSQLI_TYPE_MEDIUM_BLOB => 'mediumblob',
-        MYSQLI_TYPE_LONG_BLOB   => 'longblob',
-        MYSQLI_TYPE_BLOB        => 'blob',
-        MYSQLI_TYPE_VAR_STRING  => 'varchar',
-        MYSQLI_TYPE_STRING      => 'char',
-        MYSQLI_TYPE_GEOMETRY    => 'geometry',
-        /* These constants are conditionally compiled in ext/mysqli, so we'll
-         * define them by number rather than constant. */
-        16                      => 'bit',
-        246                     => 'decimal',
-    );
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_mysqli()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's mysqli driver supports the following extra DSN options:
-     *   + When the 'ssl' $option passed to DB::connect() is true:
-     *     + key      The path to the key file.
-     *     + cert     The path to the certificate file.
-     *     + ca       The path to the certificate authority file.
-     *     + capath   The path to a directory that contains trusted SSL
-     *                 CA certificates in pem format.
-     *     + cipher   The list of allowable ciphers for SSL encryption.
-     *
-     * Example of how to connect using SSL:
-     * <code>
-     * require_once 'DB.php';
-     * 
-     * $dsn = array(
-     *     'phptype'  => 'mysqli',
-     *     'username' => 'someuser',
-     *     'password' => 'apasswd',
-     *     'hostspec' => 'localhost',
-     *     'database' => 'thedb',
-     *     'key'      => 'client-key.pem',
-     *     'cert'     => 'client-cert.pem',
-     *     'ca'       => 'cacert.pem',
-     *     'capath'   => '/path/to/ca/dir',
-     *     'cipher'   => 'AES',
-     * );
-     * 
-     * $options = array(
-     *     'ssl' => true,
-     * );
-     * 
-     * $db = DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('mysqli')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $ini = ini_get('track_errors');
-        @ini_set('track_errors', 1);
-        $php_errormsg = '';
-
-        if (((int) $this->getOption('ssl')) === 1) {
-            $init = mysqli_init();
-            mysqli_ssl_set(
-                $init,
-                empty($dsn['key'])    ? null : $dsn['key'],
-                empty($dsn['cert'])   ? null : $dsn['cert'],
-                empty($dsn['ca'])     ? null : $dsn['ca'],
-                empty($dsn['capath']) ? null : $dsn['capath'],
-                empty($dsn['cipher']) ? null : $dsn['cipher']
-            );
-            if ($this->connection = @mysqli_real_connect(
-                    $init,
-                    $dsn['hostspec'],
-                    $dsn['username'],
-                    $dsn['password'],
-                    $dsn['database'],
-                    $dsn['port'],
-                    $dsn['socket']))
-            {
-                $this->connection = $init;
-            }
-        } else {
-            $this->connection = @mysqli_connect(
-                $dsn['hostspec'],
-                $dsn['username'],
-                $dsn['password'],
-                $dsn['database'],
-                $dsn['port'],
-                $dsn['socket']
-            );
-        }
-
-        @ini_set('track_errors', $ini);
-
-        if (!$this->connection) {
-            if (($err = @mysqli_connect_error()) != '') {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $err);
-            } else {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        }
-
-        if ($dsn['database']) {
-            $this->_db = $dsn['database'];
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @mysqli_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        if ($this->_db) {
-            if (!@mysqli_select_db($this->connection, $this->_db)) {
-                return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
-            }
-        }
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @mysqli_query($this->connection, 'SET AUTOCOMMIT=0');
-                $result = @mysqli_query($this->connection, 'BEGIN');
-                if (!$result) {
-                    return $this->mysqliRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @mysqli_query($this->connection, $query);
-        if (!$result) {
-            return $this->mysqliRaiseError();
-        }
-        if (is_object($result)) {
-            return $result;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal mysql result pointer to the next available result.
-     *
-     * This method has not been implemented yet.
-     *
-     * @param resource $result a valid sql result resource
-     * @return false
-     * @access public
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@mysqli_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @mysqli_fetch_array($result, MYSQLI_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @mysqli_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            /*
-             * Even though this DBMS already trims output, we do this because
-             * a field might have intentional whitespace at the end that
-             * gets removed by DB_PORTABILITY_RTRIM under another driver.
-             */
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? mysqli_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @mysqli_num_fields($result);
-        if (!$cols) {
-            return $this->mysqliRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @mysqli_num_rows($result);
-        if ($rows === null) {
-            return $this->mysqliRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysqli_select_db($this->connection, $this->_db)) {
-                    return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysqli_query($this->connection, 'COMMIT');
-            $result = @mysqli_query($this->connection, 'SET AUTOCOMMIT=1');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqliRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysqli_select_db($this->connection, $this->_db)) {
-                    return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysqli_query($this->connection, 'ROLLBACK');
-            $result = @mysqli_query($this->connection, 'SET AUTOCOMMIT=1');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqliRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            return @mysqli_affected_rows($this->connection);
-        } else {
-            return 0;
-        }
-     }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_mysqli::createSequence(), DB_mysqli::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query('UPDATE ' . $seqname
-                                   . ' SET id = LAST_INSERT_ID(id + 1)');
-            $this->popErrorHandling();
-            if ($result === DB_OK) {
-                // COMMON CASE
-                $id = @mysqli_insert_id($this->connection);
-                if ($id != 0) {
-                    return $id;
-                }
-
-                // EMPTY SEQ TABLE
-                // Sequence table must be empty for some reason,
-                // so fill it and return 1
-                // Obtain a user-level lock
-                $result = $this->getOne('SELECT GET_LOCK('
-                                        . "'${seqname}_lock', 10)");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                if ($result == 0) {
-                    return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
-                }
-
-                // add the default value
-                $result = $this->query('REPLACE INTO ' . $seqname
-                                       . ' (id) VALUES (0)');
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-
-                // Release the lock
-                $result = $this->getOne('SELECT RELEASE_LOCK('
-                                        . "'${seqname}_lock')");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                // We know what the result will be, so no need to try again
-                return 1;
-
-            } elseif ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE)
-            {
-                // ONDEMAND TABLE CREATION
-                $result = $this->createSequence($seq_name);
-
-                // Since createSequence initializes the ID to be 1,
-                // we do not need to retrieve the ID again (or we will get 2)
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                } else {
-                    // First ID of a newly created sequence is 1
-                    return 1;
-                }
-
-            } elseif (DB::isError($result) &&
-                      $result->getCode() == DB_ERROR_ALREADY_EXISTS)
-            {
-                // BACKWARDS COMPAT
-                // see _BCsequence() comment
-                $result = $this->_BCsequence($seqname);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                $repeat = 1;
-            }
-        } while ($repeat);
-
-        return $this->raiseError($result);
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_mysqli::nextID(), DB_mysqli::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-                            . ' (id INTEGER UNSIGNED AUTO_INCREMENT NOT NULL,'
-                            . ' PRIMARY KEY(id))');
-        if (DB::isError($res)) {
-            return $res;
-        }
-        // insert yields value 1, nextId call will generate ID 2
-        return $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_mysql::nextID(), DB_mysql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ _BCsequence()
-
-    /**
-     * Backwards compatibility with old sequence emulation implementation
-     * (clean up the dupes)
-     *
-     * @param string $seqname  the sequence name to clean up
-     *
-     * @return bool  true on success.  A DB_Error object on failure.
-     *
-     * @access private
-     */
-    function _BCsequence($seqname)
-    {
-        // Obtain a user-level lock... this will release any previous
-        // application locks, but unlike LOCK TABLES, it does not abort
-        // the current transaction and is much less frequently used.
-        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        if ($result == 0) {
-            // Failed to get the lock, can't do the conversion, bail
-            // with a DB_ERROR_NOT_LOCKED error
-            return $this->mysqliRaiseError(DB_ERROR_NOT_LOCKED);
-        }
-
-        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
-        if (DB::isError($highest_id)) {
-            return $highest_id;
-        }
-
-        // This should kill all rows except the highest
-        // We should probably do something if $highest_id isn't
-        // numeric, but I'm at a loss as how to handle that...
-        $result = $this->query('DELETE FROM ' . $seqname
-                               . " WHERE id <> $highest_id");
-        if (DB::isError($result)) {
-            return $result;
-        }
-
-        // If another thread has been waiting for this lock,
-        // it will go thru the above procedure, but will have no
-        // real effect
-        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     * (WARNING: using names that require this is a REALLY BAD IDEA)
-     *
-     * WARNING:  Older versions of MySQL can't handle the backtick
-     * character (<kbd>`</kbd>) in table or column names.
-     *
-     * @param string $str  identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '`' . str_replace('`', '``', $str) . '`';
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        return @mysqli_real_escape_string($this->connection, $str);
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if (DB::isManip($query) || $this->_next_query_manip) {
-            return $query . " LIMIT $count";
-        } else {
-            return $query . " LIMIT $from, $count";
-        }
-    }
-
-    // }}}
-    // {{{ mysqliRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_mysqli::errorNative(), DB_common::errorCode()
-     */
-    function mysqliRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
-                $this->errorcode_map[1022] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT_NOT_NULL;
-                $this->errorcode_map[1062] = DB_ERROR_CONSTRAINT;
-            } else {
-                // Doing this in case mode changes during runtime.
-                $this->errorcode_map[1022] = DB_ERROR_ALREADY_EXISTS;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1062] = DB_ERROR_ALREADY_EXISTS;
-            }
-            $errno = $this->errorCode(mysqli_errno($this->connection));
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 @mysqli_errno($this->connection) . ' ** ' .
-                                 @mysqli_error($this->connection));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    function errorNative()
-    {
-        return @mysqli_errno($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            // Fix for bug #11580.
-            if ($this->_db) {
-                if (!@mysqli_select_db($this->connection, $this->_db)) {
-                    return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @mysqli_query($this->connection,
-                                "SELECT * FROM $result LIMIT 0");
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_a($id, 'mysqli_result')) {
-            return $this->mysqliRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mysqli_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $tmp = @mysqli_fetch_field($id);
-
-            $flags = '';
-            foreach ($this->mysqli_flags as $const => $means) {
-                if ($tmp->flags & $const) {
-                    $flags .= $means . ' ';
-                }
-            }
-            if ($tmp->def) {
-                $flags .= 'default_' . rawurlencode($tmp->def);
-            }
-            $flags = trim($flags);
-
-            $res[$i] = array(
-                'table' => $case_func($tmp->table),
-                'name'  => $case_func($tmp->name),
-                'type'  => isset($this->mysqli_types[$tmp->type])
-                                    ? $this->mysqli_types[$tmp->type]
-                                    : 'unknown',
-                // http://bugs.php.net/?id=36579
-                'len'   => $tmp->length,
-                'flags' => $flags,
-            );
-
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @mysqli_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SHOW TABLES';
-            case 'users':
-                return 'SELECT DISTINCT User FROM mysql.user';
-            case 'databases':
-                return 'SHOW DATABASES';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/oci8.php b/airtime_mvc/library/pear/DB/oci8.php
deleted file mode 100644
index 3dfee116e..000000000
--- a/airtime_mvc/library/pear/DB/oci8.php
+++ /dev/null
@@ -1,1156 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's oci8 extension
- * for interacting with Oracle databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     James L. Pine <jlp@valinux.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: oci8.php,v 1.115 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's oci8 extension
- * for interacting with Oracle databases
- *
- * Definitely works with versions 8 and 9 of Oracle.
- *
- * These methods overload the ones declared in DB_common.
- *
- * Be aware...  OCIError() only appears to return anything when given a
- * statement, so functions return the generic DB_ERROR instead of more
- * useful errors that have to do with feedback from the database.
- *
- * @category   Database
- * @package    DB
- * @author     James L. Pine <jlp@valinux.com>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_oci8 extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'oci8';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'oci8';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => '5.0.0',
-        'numrows'       => 'subquery',
-        'pconnect'      => true,
-        'prepare'       => true,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        1     => DB_ERROR_CONSTRAINT,
-        900   => DB_ERROR_SYNTAX,
-        904   => DB_ERROR_NOSUCHFIELD,
-        913   => DB_ERROR_VALUE_COUNT_ON_ROW,
-        921   => DB_ERROR_SYNTAX,
-        923   => DB_ERROR_SYNTAX,
-        942   => DB_ERROR_NOSUCHTABLE,
-        955   => DB_ERROR_ALREADY_EXISTS,
-        1400  => DB_ERROR_CONSTRAINT_NOT_NULL,
-        1401  => DB_ERROR_INVALID,
-        1407  => DB_ERROR_CONSTRAINT_NOT_NULL,
-        1418  => DB_ERROR_NOT_FOUND,
-        1476  => DB_ERROR_DIVZERO,
-        1722  => DB_ERROR_INVALID_NUMBER,
-        2289  => DB_ERROR_NOSUCHTABLE,
-        2291  => DB_ERROR_CONSTRAINT,
-        2292  => DB_ERROR_CONSTRAINT,
-        2449  => DB_ERROR_CONSTRAINT,
-        12899 => DB_ERROR_INVALID,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * Stores the $data passed to execute() in the oci8 driver
-     *
-     * Gets reset to array() when simpleQuery() is run.
-     *
-     * Needed in case user wants to call numRows() after prepare/execute
-     * was used.
-     *
-     * @var array
-     * @access private
-     */
-    var $_data = array();
-
-    /**
-     * The result or statement handle from the most recently executed query
-     * @var resource
-     */
-    var $last_stmt;
-
-    /**
-     * Is the given prepared statement a data manipulation query?
-     * @var array
-     * @access private
-     */
-    var $manip_query = array();
-
-    /**
-     * Store of prepared SQL queries.
-     * @var array
-     * @access private
-     */
-    var $_prepared_queries = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_oci8()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * If PHP is at version 5.0.0 or greater:
-     *   + Generally, oci_connect() or oci_pconnect() are used.
-     *   + But if the new_link DSN option is set to true, oci_new_connect()
-     *     is used.
-     *
-     * When using PHP version 4.x, OCILogon() or OCIPLogon() are used.
-     *
-     * PEAR DB's oci8 driver supports the following extra DSN options:
-     *   + charset       The character set to be used on the connection.
-     *                    Only used if PHP is at version 5.0.0 or greater
-     *                    and the Oracle server is at 9.2 or greater.
-     *                    Available since PEAR DB 1.7.0.
-     *   + new_link      If set to true, causes subsequent calls to
-     *                    connect() to return a new connection link
-     *                    instead of the existing one.  WARNING: this is
-     *                    not portable to other DBMS's.
-     *                    Available since PEAR DB 1.7.0.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('oci8')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        // Backwards compatibility with DB < 1.7.0
-        if (empty($dsn['database']) && !empty($dsn['hostspec'])) {
-            $db = $dsn['hostspec'];
-        } else {
-            $db = $dsn['database'];
-        }
-
-        if (function_exists('oci_connect')) {
-            if (isset($dsn['new_link'])
-                && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
-            {
-                $connect_function = 'oci_new_connect';
-            } else {
-                $connect_function = $persistent ? 'oci_pconnect'
-                                    : 'oci_connect';
-            }
-            if (isset($this->dsn['port']) && $this->dsn['port']) {
-                $db = '//'.$db.':'.$this->dsn['port'];
-            }
-
-            $char = empty($dsn['charset']) ? null : $dsn['charset'];
-            $this->connection = @$connect_function($dsn['username'],
-                                                   $dsn['password'],
-                                                   $db,
-                                                   $char);
-            $error = OCIError();
-            if (!empty($error) && $error['code'] == 12541) {
-                // Couldn't find TNS listener.  Try direct connection.
-                $this->connection = @$connect_function($dsn['username'],
-                                                       $dsn['password'],
-                                                       null,
-                                                       $char);
-            }
-        } else {
-            $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon';
-            if ($db) {
-                $this->connection = @$connect_function($dsn['username'],
-                                                       $dsn['password'],
-                                                       $db);
-            } elseif ($dsn['username'] || $dsn['password']) {
-                $this->connection = @$connect_function($dsn['username'],
-                                                       $dsn['password']);
-            }
-        }
-
-        if (!$this->connection) {
-            $error = OCIError();
-            $error = (is_array($error)) ? $error['message'] : null;
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     $error);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        if (function_exists('oci_close')) {
-            $ret = @oci_close($this->connection);
-        } else {
-            $ret = @OCILogOff($this->connection);
-        }
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * To determine how many rows of a result set get buffered using
-     * ocisetprefetch(), see the "result_buffering" option in setOptions().
-     * This option was added in Release 1.7.0.
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $this->_data = array();
-        $this->last_parameters = array();
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @OCIParse($this->connection, $query);
-        if (!$result) {
-            return $this->oci8RaiseError();
-        }
-        if ($this->autocommit) {
-            $success = @OCIExecute($result,OCI_COMMIT_ON_SUCCESS);
-        } else {
-            $success = @OCIExecute($result,OCI_DEFAULT);
-        }
-        if (!$success) {
-            return $this->oci8RaiseError($result);
-        }
-        $this->last_stmt = $result;
-        if ($this->_checkManip($query)) {
-            return DB_OK;
-        } else {
-            @ocisetprefetch($result, $this->options['result_buffering']);
-            return $result;
-        }
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal oracle result pointer to the next available result
-     *
-     * @param a valid oci8 result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $moredata = @OCIFetchInto($result,$arr,OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE &&
-                $moredata)
-            {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $moredata = OCIFetchInto($result,$arr,OCI_RETURN_NULLS+OCI_RETURN_LOBS);
-        }
-        if (!$moredata) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? OCIFreeStatement($result) : false;
-    }
-
-    /**
-     * Frees the internal resources associated with a prepared query
-     *
-     * @param resource $stmt           the prepared statement's resource
-     * @param bool     $free_resource  should the PHP resource be freed too?
-     *                                  Use false if you need to get data
-     *                                  from the result set later.
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_oci8::prepare()
-     */
-    function freePrepared($stmt, $free_resource = true)
-    {
-        if (!is_resource($stmt)) {
-            return false;
-        }
-        if ($free_resource) {
-            @ocifreestatement($stmt);
-        }
-        if (isset($this->prepare_types[(int)$stmt])) {
-            unset($this->prepare_types[(int)$stmt]);
-            unset($this->manip_query[(int)$stmt]);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * Only works if the DB_PORTABILITY_NUMROWS portability option
-     * is turned on.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows(), DB_common::setOption()
-     */
-    function numRows($result)
-    {
-        // emulate numRows for Oracle.  yuck.
-        if ($this->options['portability'] & DB_PORTABILITY_NUMROWS &&
-            $result === $this->last_stmt)
-        {
-            $countquery = 'SELECT COUNT(*) FROM ('.$this->last_query.')';
-            $save_query = $this->last_query;
-            $save_stmt = $this->last_stmt;
-
-            $count = $this->query($countquery);
-
-            // Restore the last query and statement.
-            $this->last_query = $save_query;
-            $this->last_stmt = $save_stmt;
-            
-            if (DB::isError($count) ||
-                DB::isError($row = $count->fetchRow(DB_FETCHMODE_ORDERED)))
-            {
-                return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-            }
-
-            return $row[0];
-        }
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @OCINumCols($result);
-        if (!$cols) {
-            return $this->oci8RaiseError($result);
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute().
-     *
-     * With oci8, this is emulated.
-     *
-     * prepare() requires a generic query as string like <code>
-     *    INSERT INTO numbers VALUES (?, ?, ?)
-     * </code>.  The <kbd>?</kbd> characters are placeholders.
-     *
-     * Three types of placeholders can be used:
-     *   + <kbd>?</kbd>  a quoted scalar value, i.e. strings, integers
-     *   + <kbd>!</kbd>  value is inserted 'as is'
-     *   + <kbd>&</kbd>  requires a file name.  The file's contents get
-     *                     inserted into the query (i.e. saving binary
-     *                     data in a db)
-     *
-     * Use backslashes to escape placeholder characters if you don't want
-     * them to be interpreted as placeholders.  Example: <code>
-     *    "UPDATE foo SET col=? WHERE col='over \& under'"
-     * </code>
-     *
-     * @param string $query  the query to be prepared
-     *
-     * @return mixed  DB statement resource on success. DB_Error on failure.
-     *
-     * @see DB_oci8::execute()
-     */
-    function prepare($query)
-    {
-        $tokens   = preg_split('/((?<!\\\)[&?!])/', $query, -1,
-                               PREG_SPLIT_DELIM_CAPTURE);
-        $binds    = count($tokens) - 1;
-        $token    = 0;
-        $types    = array();
-        $newquery = '';
-
-        foreach ($tokens as $key => $val) {
-            switch ($val) {
-                case '?':
-                    $types[$token++] = DB_PARAM_SCALAR;
-                    unset($tokens[$key]);
-                    break;
-                case '&':
-                    $types[$token++] = DB_PARAM_OPAQUE;
-                    unset($tokens[$key]);
-                    break;
-                case '!':
-                    $types[$token++] = DB_PARAM_MISC;
-                    unset($tokens[$key]);
-                    break;
-                default:
-                    $tokens[$key] = preg_replace('/\\\([&?!])/', "\\1", $val);
-                    if ($key != $binds) {
-                        $newquery .= $tokens[$key] . ':bind' . $token;
-                    } else {
-                        $newquery .= $tokens[$key];
-                    }
-            }
-        }
-
-        $this->last_query = $query;
-        $newquery = $this->modifyQuery($newquery);
-        if (!$stmt = @OCIParse($this->connection, $newquery)) {
-            return $this->oci8RaiseError();
-        }
-        $this->prepare_types[(int)$stmt] = $types;
-        $this->manip_query[(int)$stmt] = DB::isManip($query);
-        $this->_prepared_queries[(int)$stmt] = $newquery;
-        return $stmt;
-    }
-
-    // }}}
-    // {{{ execute()
-
-    /**
-     * Executes a DB statement prepared with prepare().
-     *
-     * To determine how many rows of a result set get buffered using
-     * ocisetprefetch(), see the "result_buffering" option in setOptions().
-     * This option was added in Release 1.7.0.
-     *
-     * @param resource  $stmt  a DB statement resource returned from prepare()
-     * @param mixed  $data  array, string or numeric data to be used in
-     *                      execution of the statement.  Quantity of items
-     *                      passed must match quantity of placeholders in
-     *                      query:  meaning 1 for non-array items or the
-     *                      quantity of elements in the array.
-     *
-     * @return mixed  returns an oic8 result resource for successful SELECT
-     *                queries, DB_OK for other successful queries.
-     *                A DB error object is returned on failure.
-     *
-     * @see DB_oci8::prepare()
-     */
-    function &execute($stmt, $data = array())
-    {
-        $data = (array)$data;
-        $this->last_parameters = $data;
-        $this->last_query = $this->_prepared_queries[(int)$stmt];
-        $this->_data = $data;
-
-        $types = $this->prepare_types[(int)$stmt];
-        if (count($types) != count($data)) {
-            $tmp = $this->raiseError(DB_ERROR_MISMATCH);
-            return $tmp;
-        }
-
-        $i = 0;
-        foreach ($data as $key => $value) {
-            if ($types[$i] == DB_PARAM_MISC) {
-                /*
-                 * Oracle doesn't seem to have the ability to pass a
-                 * parameter along unchanged, so strip off quotes from start
-                 * and end, plus turn two single quotes to one single quote,
-                 * in order to avoid the quotes getting escaped by
-                 * Oracle and ending up in the database.
-                 */
-                $data[$key] = preg_replace("/^'(.*)'$/", "\\1", $data[$key]);
-                $data[$key] = str_replace("''", "'", $data[$key]);
-            } elseif ($types[$i] == DB_PARAM_OPAQUE) {
-                $fp = @fopen($data[$key], 'rb');
-                if (!$fp) {
-                    $tmp = $this->raiseError(DB_ERROR_ACCESS_VIOLATION);
-                    return $tmp;
-                }
-                $data[$key] = fread($fp, filesize($data[$key]));
-                fclose($fp);
-            } elseif ($types[$i] == DB_PARAM_SCALAR) {
-                // Floats have to be converted to a locale-neutral
-                // representation.
-                if (is_float($data[$key])) {
-                    $data[$key] = $this->quoteFloat($data[$key]);
-                }
-            }
-            if (!@OCIBindByName($stmt, ':bind' . $i, $data[$key], -1)) {
-                $tmp = $this->oci8RaiseError($stmt);
-                return $tmp;
-            }
-            $this->last_query = str_replace(':bind'.$i, $this->quoteSmart($data[$key]), $this->last_query);
-            $i++;
-        }
-        if ($this->autocommit) {
-            $success = @OCIExecute($stmt, OCI_COMMIT_ON_SUCCESS);
-        } else {
-            $success = @OCIExecute($stmt, OCI_DEFAULT);
-        }
-        if (!$success) {
-            $tmp = $this->oci8RaiseError($stmt);
-            return $tmp;
-        }
-        $this->last_stmt = $stmt;
-        if ($this->manip_query[(int)$stmt] || $this->_next_query_manip) {
-            $this->_last_query_manip = true;
-            $this->_next_query_manip = false;
-            $tmp = DB_OK;
-        } else {
-            $this->_last_query_manip = false;
-            @ocisetprefetch($stmt, $this->options['result_buffering']);
-            $tmp = new DB_result($this, $stmt);
-        }
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        $this->autocommit = (bool)$onoff;;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        $result = @OCICommit($this->connection);
-        if (!$result) {
-            return $this->oci8RaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        $result = @OCIRollback($this->connection);
-        if (!$result) {
-            return $this->oci8RaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->last_stmt === false) {
-            return $this->oci8RaiseError();
-        }
-        $result = @OCIRowCount($this->last_stmt);
-        if ($result === false) {
-            return $this->oci8RaiseError($this->last_stmt);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * "SELECT 2+2" must be "SELECT 2+2 FROM dual" in Oracle.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     */
-    function modifyQuery($query)
-    {
-        if (preg_match('/^\s*SELECT/i', $query) &&
-            !preg_match('/\sFROM\s/i', $query)) {
-            $query .= ' FROM dual';
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        // Let Oracle return the name of the columns instead of
-        // coding a "home" SQL parser
-
-        if (count($params)) {
-            $result = $this->prepare("SELECT * FROM ($query) "
-                                     . 'WHERE NULL = NULL');
-            $tmp = $this->execute($result, $params);
-        } else {
-            $q_fields = "SELECT * FROM ($query) WHERE NULL = NULL";
-
-            if (!$result = @OCIParse($this->connection, $q_fields)) {
-                $this->last_query = $q_fields;
-                return $this->oci8RaiseError();
-            }
-            if (!@OCIExecute($result, OCI_DEFAULT)) {
-                $this->last_query = $q_fields;
-                return $this->oci8RaiseError($result);
-            }
-        }
-
-        $ncols = OCINumCols($result);
-        $cols  = array();
-        for ( $i = 1; $i <= $ncols; $i++ ) {
-            $cols[] = '"' . OCIColumnName($result, $i) . '"';
-        }
-        $fields = implode(', ', $cols);
-        // XXX Test that (tip by John Lim)
-        //if (preg_match('/^\s*SELECT\s+/is', $query, $match)) {
-        //    // Introduce the FIRST_ROWS Oracle query optimizer
-        //    $query = substr($query, strlen($match[0]), strlen($query));
-        //    $query = "SELECT /* +FIRST_ROWS */ " . $query;
-        //}
-
-        // Construct the query
-        // more at: http://marc.theaimsgroup.com/?l=php-db&m=99831958101212&w=2
-        // Perhaps this could be optimized with the use of Unions
-        $query = "SELECT $fields FROM".
-                 "  (SELECT rownum as linenum, $fields FROM".
-                 "      ($query)".
-                 '  WHERE rownum <= '. ($from + $count) .
-                 ') WHERE linenum >= ' . ++$from;
-        return $query;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_oci8::createSequence(), DB_oci8::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = 0;
-        do {
-            $this->expectError(DB_ERROR_NOSUCHTABLE);
-            $result = $this->query("SELECT ${seqname}.nextval FROM dual");
-            $this->popExpect();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        return $arr[0];
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_oci8::nextID(), DB_oci8::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->query('CREATE SEQUENCE '
-                            . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_oci8::nextID(), DB_oci8::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP SEQUENCE '
-                            . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ oci8RaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_oci8::errorNative(), DB_oci8::errorCode()
-     */
-    function oci8RaiseError($errno = null)
-    {
-        if ($errno === null) {
-            $error = @OCIError($this->connection);
-            return $this->raiseError($this->errorCode($error['code']),
-                                     null, null, null, $error['message']);
-        } elseif (is_resource($errno)) {
-            $error = @OCIError($errno);
-            return $this->raiseError($this->errorCode($error['code']),
-                                     null, null, null, $error['message']);
-        }
-        return $this->raiseError($this->errorCode($errno));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code.  FALSE if the code could not be
-     *               determined
-     */
-    function errorNative()
-    {
-        if (is_resource($this->last_stmt)) {
-            $error = @OCIError($this->last_stmt);
-        } else {
-            $error = @OCIError($this->connection);
-        }
-        if (is_array($error)) {
-            return $error['code'];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * NOTE: flags won't contain index information.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $res = array();
-
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $result = strtoupper($result);
-            $q_fields = 'SELECT column_name, data_type, data_length, '
-                        . 'nullable '
-                        . 'FROM user_tab_columns '
-                        . "WHERE table_name='$result' ORDER BY column_id";
-
-            $this->last_query = $q_fields;
-
-            if (!$stmt = @OCIParse($this->connection, $q_fields)) {
-                return $this->oci8RaiseError(DB_ERROR_NEED_MORE_DATA);
-            }
-            if (!@OCIExecute($stmt, OCI_DEFAULT)) {
-                return $this->oci8RaiseError($stmt);
-            }
-            
-            $i = 0;
-            while (@OCIFetch($stmt)) {
-                $res[$i] = array(
-                    'table' => $case_func($result),
-                    'name'  => $case_func(@OCIResult($stmt, 1)),
-                    'type'  => @OCIResult($stmt, 2),
-                    'len'   => @OCIResult($stmt, 3),
-                    'flags' => (@OCIResult($stmt, 4) == 'N') ? 'not_null' : '',
-                );
-                if ($mode & DB_TABLEINFO_ORDER) {
-                    $res['order'][$res[$i]['name']] = $i;
-                }
-                if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                    $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-                }
-                $i++;
-            }
-
-            if ($mode) {
-                $res['num_fields'] = $i;
-            }
-            @OCIFreeStatement($stmt);
-
-        } else {
-            if (isset($result->result)) {
-                /*
-                 * Probably received a result object.
-                 * Extract the result resource identifier.
-                 */
-                $result = $result->result;
-            }
-
-            $res = array();
-
-            if ($result === $this->last_stmt) {
-                $count = @OCINumCols($result);
-                if ($mode) {
-                    $res['num_fields'] = $count;
-                }
-                for ($i = 0; $i < $count; $i++) {
-                    $res[$i] = array(
-                        'table' => '',
-                        'name'  => $case_func(@OCIColumnName($result, $i+1)),
-                        'type'  => @OCIColumnType($result, $i+1),
-                        'len'   => @OCIColumnSize($result, $i+1),
-                        'flags' => '',
-                    );
-                    if ($mode & DB_TABLEINFO_ORDER) {
-                        $res['order'][$res[$i]['name']] = $i;
-                    }
-                    if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                        $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-                    }
-                }
-            } else {
-                return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-            }
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT table_name FROM user_tables';
-            case 'synonyms':
-                return 'SELECT synonym_name FROM user_synonyms';
-            case 'views':
-                return 'SELECT view_name FROM user_views';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteFloat($float) {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-     
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/odbc.php b/airtime_mvc/library/pear/DB/odbc.php
deleted file mode 100644
index fecc548d8..000000000
--- a/airtime_mvc/library/pear/DB/odbc.php
+++ /dev/null
@@ -1,883 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's odbc extension
- * for interacting with databases via ODBC connections
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: odbc.php,v 1.81 2007/07/06 05:19:21 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's odbc extension
- * for interacting with databases via ODBC connections
- *
- * These methods overload the ones declared in DB_common.
- *
- * More info on ODBC errors could be found here:
- * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/trblsql/tr_err_odbc_5stz.asp
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_odbc extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'odbc';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'sql92';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * NOTE: The feature set of the following drivers are different than
-     * the default:
-     *   + solid: 'transactions' = true
-     *   + navision: 'limit' = false
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'emulate',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        '01004' => DB_ERROR_TRUNCATED,
-        '07001' => DB_ERROR_MISMATCH,
-        '21S01' => DB_ERROR_VALUE_COUNT_ON_ROW,
-        '21S02' => DB_ERROR_MISMATCH,
-        '22001' => DB_ERROR_INVALID,
-        '22003' => DB_ERROR_INVALID_NUMBER,
-        '22005' => DB_ERROR_INVALID_NUMBER,
-        '22008' => DB_ERROR_INVALID_DATE,
-        '22012' => DB_ERROR_DIVZERO,
-        '23000' => DB_ERROR_CONSTRAINT,
-        '23502' => DB_ERROR_CONSTRAINT_NOT_NULL,
-        '23503' => DB_ERROR_CONSTRAINT,
-        '23504' => DB_ERROR_CONSTRAINT,
-        '23505' => DB_ERROR_CONSTRAINT,
-        '24000' => DB_ERROR_INVALID,
-        '34000' => DB_ERROR_INVALID,
-        '37000' => DB_ERROR_SYNTAX,
-        '42000' => DB_ERROR_SYNTAX,
-        '42601' => DB_ERROR_SYNTAX,
-        'IM001' => DB_ERROR_UNSUPPORTED,
-        'S0000' => DB_ERROR_NOSUCHTABLE,
-        'S0001' => DB_ERROR_ALREADY_EXISTS,
-        'S0002' => DB_ERROR_NOSUCHTABLE,
-        'S0011' => DB_ERROR_ALREADY_EXISTS,
-        'S0012' => DB_ERROR_NOT_FOUND,
-        'S0021' => DB_ERROR_ALREADY_EXISTS,
-        'S0022' => DB_ERROR_NOSUCHFIELD,
-        'S1009' => DB_ERROR_INVALID,
-        'S1090' => DB_ERROR_INVALID,
-        'S1C00' => DB_ERROR_NOT_CAPABLE,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     * @access private
-     */
-    var $affected = 0;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_odbc()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's odbc driver supports the following extra DSN options:
-     *   + cursor  The type of cursor to be used for this connection.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('odbc')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-        switch ($this->dbsyntax) {
-            case 'access':
-            case 'db2':
-            case 'solid':
-                $this->features['transactions'] = true;
-                break;
-            case 'navision':
-                $this->features['limit'] = false;
-        }
-
-        /*
-         * This is hear for backwards compatibility. Should have been using
-         * 'database' all along, but prior to 1.6.0RC3 'hostspec' was used.
-         */
-        if ($dsn['database']) {
-            $odbcdsn = $dsn['database'];
-        } elseif ($dsn['hostspec']) {
-            $odbcdsn = $dsn['hostspec'];
-        } else {
-            $odbcdsn = 'localhost';
-        }
-
-        $connect_function = $persistent ? 'odbc_pconnect' : 'odbc_connect';
-
-        if (empty($dsn['cursor'])) {
-            $this->connection = @$connect_function($odbcdsn, $dsn['username'],
-                                                   $dsn['password']);
-        } else {
-            $this->connection = @$connect_function($odbcdsn, $dsn['username'],
-                                                   $dsn['password'],
-                                                   $dsn['cursor']);
-        }
-
-        if (!is_resource($this->connection)) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     $this->errorNative());
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $err = @odbc_close($this->connection);
-        $this->connection = null;
-        return $err;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        $result = @odbc_exec($this->connection, $query);
-        if (!$result) {
-            return $this->odbcRaiseError(); // XXX ERRORMSG
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($this->_checkManip($query)) {
-            $this->affected = $result; // For affectedRows()
-            return DB_OK;
-        }
-        $this->affected = 0;
-        return $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal odbc result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return @odbc_next_result($result);
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        $arr = array();
-        if ($rownum !== null) {
-            $rownum++; // ODBC first row is 1
-            if (version_compare(phpversion(), '4.2.0', 'ge')) {
-                $cols = @odbc_fetch_into($result, $arr, $rownum);
-            } else {
-                $cols = @odbc_fetch_into($result, $rownum, $arr);
-            }
-        } else {
-            $cols = @odbc_fetch_into($result, $arr);
-        }
-        if (!$cols) {
-            return null;
-        }
-        if ($fetchmode !== DB_FETCHMODE_ORDERED) {
-            for ($i = 0; $i < count($arr); $i++) {
-                $colName = @odbc_field_name($result, $i+1);
-                $a[$colName] = $arr[$i];
-            }
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-                $a = array_change_key_case($a, CASE_LOWER);
-            }
-            $arr = $a;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? odbc_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @odbc_num_fields($result);
-        if (!$cols) {
-            return $this->odbcRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if (empty($this->affected)) {  // In case of SELECT stms
-            return 0;
-        }
-        $nrows = @odbc_num_rows($this->affected);
-        if ($nrows == -1) {
-            return $this->odbcRaiseError();
-        }
-        return $nrows;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * Not all ODBC drivers support this functionality.  If they don't
-     * a DB_Error object for DB_ERROR_UNSUPPORTED is returned.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $nrows = @odbc_num_rows($result);
-        if ($nrows == -1) {
-            return $this->odbcRaiseError(DB_ERROR_UNSUPPORTED);
-        }
-        if ($nrows === false) {
-            return $this->odbcRaiseError();
-        }
-        return $nrows;
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * Use 'mssql' as the dbsyntax in the DB DSN only if you've unchecked
-     * "Use ANSI quoted identifiers" when setting up the ODBC data source.
-     *
-     * @param string $str  identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        switch ($this->dsn['dbsyntax']) {
-            case 'access':
-                return '[' . $str . ']';
-            case 'mssql':
-            case 'sybase':
-                return '[' . str_replace(']', ']]', $str) . ']';
-            case 'mysql':
-            case 'mysqli':
-                return '`' . $str . '`';
-            default:
-                return '"' . str_replace('"', '""', $str) . '"';
-        }
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     * @internal
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($str);
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_odbc::createSequence(), DB_odbc::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("update ${seqname} set id = id + 1");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = 1;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                $result = $this->query("insert into ${seqname} (id) values(0)");
-            } else {
-                $repeat = 0;
-            }
-        } while ($repeat);
-
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-
-        $result = $this->query("select id from ${seqname}");
-        if (DB::isError($result)) {
-            return $result;
-        }
-
-        $row = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        if (DB::isError($row || !$row)) {
-            return $row;
-        }
-
-        return $row[0];
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_odbc::nextID(), DB_odbc::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-                            . $this->getSequenceName($seq_name)
-                            . ' (id integer NOT NULL,'
-                            . ' PRIMARY KEY(id))');
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_odbc::nextID(), DB_odbc::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        if (!@odbc_autocommit($this->connection, $onoff)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if (!@odbc_commit($this->connection)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if (!@odbc_rollback($this->connection)) {
-            return $this->odbcRaiseError();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ odbcRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_odbc::errorNative(), DB_common::errorCode()
-     */
-    function odbcRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            switch ($this->dbsyntax) {
-                case 'access':
-                    if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
-                        $this->errorcode_map['07001'] = DB_ERROR_NOSUCHFIELD;
-                    } else {
-                        // Doing this in case mode changes during runtime.
-                        $this->errorcode_map['07001'] = DB_ERROR_MISMATCH;
-                    }
-
-                    $native_code = odbc_error($this->connection);
-
-                    // S1000 is for "General Error."  Let's be more specific.
-                    if ($native_code == 'S1000') {
-                        $errormsg = odbc_errormsg($this->connection);
-                        static $error_regexps;
-                        if (!isset($error_regexps)) {
-                            $error_regexps = array(
-                                '/includes related records.$/i'  => DB_ERROR_CONSTRAINT,
-                                '/cannot contain a Null value/i' => DB_ERROR_CONSTRAINT_NOT_NULL,
-                            );
-                        }
-                        foreach ($error_regexps as $regexp => $code) {
-                            if (preg_match($regexp, $errormsg)) {
-                                return $this->raiseError($code,
-                                        null, null, null,
-                                        $native_code . ' ' . $errormsg);
-                            }
-                        }
-                        $errno = DB_ERROR;
-                    } else {
-                        $errno = $this->errorCode($native_code);
-                    }
-                    break;
-                default:
-                    $errno = $this->errorCode(odbc_error($this->connection));
-            }
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 $this->errorNative());
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code and message produced by the last query
-     *
-     * @return string  the DBMS' error code and message
-     */
-    function errorNative()
-    {
-        if (!is_resource($this->connection)) {
-            return @odbc_error() . ' ' . @odbc_errormsg();
-        }
-        return @odbc_error($this->connection) . ' ' . @odbc_errormsg($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @odbc_exec($this->connection, "SELECT * FROM $result");
-            if (!$id) {
-                return $this->odbcRaiseError();
-            }
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->odbcRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @odbc_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $col = $i + 1;
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func(@odbc_field_name($id, $col)),
-                'type'  => @odbc_field_type($id, $col),
-                'len'   => @odbc_field_len($id, $col),
-                'flags' => '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @odbc_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * Thanks to symbol1@gmail.com and Philippe.Jausions@11abacus.com.
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the list of objects requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     * @since Method available since Release 1.7.0
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'databases':
-                if (!function_exists('odbc_data_source')) {
-                    return null;
-                }
-                $res = @odbc_data_source($this->connection, SQL_FETCH_FIRST);
-                if (is_array($res)) {
-                    $out = array($res['server']);
-                    while($res = @odbc_data_source($this->connection,
-                                                   SQL_FETCH_NEXT))
-                    {
-                        $out[] = $res['server'];
-                    }
-                    return $out;
-                } else {
-                    return $this->odbcRaiseError();
-                }
-                break;
-            case 'tables':
-            case 'schema.tables':
-                $keep = 'TABLE';
-                break;
-            case 'views':
-                $keep = 'VIEW';
-                break;
-            default:
-                return null;
-        }
-
-        /*
-         * Removing non-conforming items in the while loop rather than
-         * in the odbc_tables() call because some backends choke on this:
-         *     odbc_tables($this->connection, '', '', '', 'TABLE')
-         */
-        $res  = @odbc_tables($this->connection);
-        if (!$res) {
-            return $this->odbcRaiseError();
-        }
-        $out = array();
-        while ($row = odbc_fetch_array($res)) {
-            if ($row['TABLE_TYPE'] != $keep) {
-                continue;
-            }
-            if ($type == 'schema.tables') {
-                $out[] = $row['TABLE_SCHEM'] . '.' . $row['TABLE_NAME'];
-            } else {
-                $out[] = $row['TABLE_NAME'];
-            }
-        }
-        return $out;
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/pgsql.php b/airtime_mvc/library/pear/DB/pgsql.php
deleted file mode 100644
index 039888faf..000000000
--- a/airtime_mvc/library/pear/DB/pgsql.php
+++ /dev/null
@@ -1,1116 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's pgsql extension
- * for interacting with PostgreSQL databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Rui Hirokawa <hirokawa@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: pgsql.php,v 1.138 2007/09/21 13:40:41 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's pgsql extension
- * for interacting with PostgreSQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Rui Hirokawa <hirokawa@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_pgsql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'pgsql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'pgsql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => '4.3.0',
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => true,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     */
-    var $affected = 0;
-
-    /**
-     * The current row being looked at in fetchInto()
-     * @var array
-     * @access private
-     */
-    var $row = array();
-
-    /**
-     * The number of rows in a given result set
-     * @var array
-     * @access private
-     */
-    var $_num_rows = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_pgsql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's pgsql driver supports the following extra DSN options:
-     *   + connect_timeout  How many seconds to wait for a connection to
-     *                       be established.  Available since PEAR DB 1.7.0.
-     *   + new_link         If set to true, causes subsequent calls to
-     *                       connect() to return a new connection link
-     *                       instead of the existing one.  WARNING: this is
-     *                       not portable to other DBMS's.  Available only
-     *                       if PHP is >= 4.3.0 and PEAR DB is >= 1.7.0.
-     *   + options          Command line options to be sent to the server.
-     *                       Available since PEAR DB 1.6.4.
-     *   + service          Specifies a service name in pg_service.conf that
-     *                       holds additional connection parameters.
-     *                       Available since PEAR DB 1.7.0.
-     *   + sslmode          How should SSL be used when connecting?  Values:
-     *                       disable, allow, prefer or require.
-     *                       Available since PEAR DB 1.7.0.
-     *   + tty              This was used to specify where to send server
-     *                       debug output.  Available since PEAR DB 1.6.4.
-     *
-     * Example of connecting to a new link via a socket:
-     * <code>
-     * require_once 'DB.php';
-     * 
-     * $dsn = 'pgsql://user:pass@unix(/tmp)/dbname?new_link=true';
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     * 
-     * $db = DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     *
-     * @link http://www.postgresql.org/docs/current/static/libpq.html#LIBPQ-CONNECT
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('pgsql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $protocol = $dsn['protocol'] ? $dsn['protocol'] : 'tcp';
-
-        $params = array('');
-        if ($protocol == 'tcp') {
-            if ($dsn['hostspec']) {
-                $params[0] .= 'host=' . $dsn['hostspec'];
-            }
-            if ($dsn['port']) {
-                $params[0] .= ' port=' . $dsn['port'];
-            }
-        } elseif ($protocol == 'unix') {
-            // Allow for pg socket in non-standard locations.
-            if ($dsn['socket']) {
-                $params[0] .= 'host=' . $dsn['socket'];
-            }
-            if ($dsn['port']) {
-                $params[0] .= ' port=' . $dsn['port'];
-            }
-        }
-        if ($dsn['database']) {
-            $params[0] .= ' dbname=\'' . addslashes($dsn['database']) . '\'';
-        }
-        if ($dsn['username']) {
-            $params[0] .= ' user=\'' . addslashes($dsn['username']) . '\'';
-        }
-        if ($dsn['password']) {
-            $params[0] .= ' password=\'' . addslashes($dsn['password']) . '\'';
-        }
-        if (!empty($dsn['options'])) {
-            $params[0] .= ' options=' . $dsn['options'];
-        }
-        if (!empty($dsn['tty'])) {
-            $params[0] .= ' tty=' . $dsn['tty'];
-        }
-        if (!empty($dsn['connect_timeout'])) {
-            $params[0] .= ' connect_timeout=' . $dsn['connect_timeout'];
-        }
-        if (!empty($dsn['sslmode'])) {
-            $params[0] .= ' sslmode=' . $dsn['sslmode'];
-        }
-        if (!empty($dsn['service'])) {
-            $params[0] .= ' service=' . $dsn['service'];
-        }
-
-        if (isset($dsn['new_link'])
-            && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
-        {
-            if (version_compare(phpversion(), '4.3.0', '>=')) {
-                $params[] = PGSQL_CONNECT_FORCE_NEW;
-            }
-        }
-
-        $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            @ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            @ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     $php_errormsg);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @pg_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @pg_exec($this->connection, 'begin;');
-                if (!$result) {
-                    return $this->pgsqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @pg_exec($this->connection, $query);
-        if (!$result) {
-            return $this->pgsqlRaiseError();
-        }
-
-        /*
-         * Determine whether queries produce affected rows, result or nothing.
-         *
-         * This logic was introduced in version 1.1 of the file by ssb,
-         * though the regex has been modified slightly since then.
-         *
-         * PostgreSQL commands:
-         * ABORT, ALTER, BEGIN, CLOSE, CLUSTER, COMMIT, COPY,
-         * CREATE, DECLARE, DELETE, DROP TABLE, EXPLAIN, FETCH,
-         * GRANT, INSERT, LISTEN, LOAD, LOCK, MOVE, NOTIFY, RESET,
-         * REVOKE, ROLLBACK, SELECT, SELECT INTO, SET, SHOW,
-         * UNLISTEN, UPDATE, VACUUM
-         */
-        if ($ismanip) {
-            $this->affected = @pg_affected_rows($result);
-            return DB_OK;
-        } elseif (preg_match('/^\s*\(*\s*(SELECT|EXPLAIN|FETCH|SHOW)\s/si',
-                             $query))
-        {
-            $this->row[(int)$result] = 0; // reset the row counter.
-            $numrows = $this->numRows($result);
-            if (is_object($numrows)) {
-                return $numrows;
-            }
-            $this->_num_rows[(int)$result] = $numrows;
-            $this->affected = 0;
-            return $result;
-        } else {
-            $this->affected = 0;
-            return DB_OK;
-        }
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal pgsql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        $result_int = (int)$result;
-        $rownum = ($rownum !== null) ? $rownum : $this->row[$result_int];
-        if ($rownum >= $this->_num_rows[$result_int]) {
-            return null;
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @pg_fetch_array($result, $rownum, PGSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @pg_fetch_row($result, $rownum);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        $this->row[$result_int] = ++$rownum;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        if (is_resource($result)) {
-            unset($this->row[(int)$result]);
-            unset($this->_num_rows[(int)$result]);
-            $this->affected = 0;
-            return @pg_freeresult($result);
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     * @internal
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($str);
-    }
-
-    // }}}
-    // {{{ quoteBoolean()
-
-    /**
-     * Formats a boolean value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param boolean the boolean value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteBoolean($boolean) {
-        return $boolean ? 'TRUE' : 'FALSE';
-    }
-     
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * {@internal PostgreSQL treats a backslash as an escape character,
-     * so they are escaped as well.
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        if (function_exists('pg_escape_string')) {
-            /* This fixes an undocumented BC break in PHP 5.2.0 which changed
-             * the prototype of pg_escape_string. I'm not thrilled about having
-             * to sniff the PHP version, quite frankly, but it's the only way
-             * to deal with the problem. Revision 1.331.2.13.2.10 on
-             * php-src/ext/pgsql/pgsql.c (PHP_5_2 branch) is to blame, for the
-             * record. */
-            if (version_compare(PHP_VERSION, '5.2.0', '>=')) {
-                return pg_escape_string($this->connection, $str);
-            } else {
-                return pg_escape_string($str);
-            }
-        } else {
-            return str_replace("'", "''", str_replace('\\', '\\\\', $str));
-        }
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @pg_numfields($result);
-        if (!$cols) {
-            return $this->pgsqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @pg_numrows($result);
-        if ($rows === null) {
-            return $this->pgsqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            // (disabled) hack to shut up error messages from libpq.a
-            //@fclose(@fopen("php://stderr", "w"));
-            $result = @pg_exec($this->connection, 'end;');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->pgsqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @pg_exec($this->connection, 'abort;');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->pgsqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        return $this->affected;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_pgsql::createSequence(), DB_pgsql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = false;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("SELECT NEXTVAL('${seqname}')");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = true;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        $result->free();
-        return $arr[0];
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_pgsql::nextID(), DB_pgsql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $result = $this->query("CREATE SEQUENCE ${seqname}");
-        return $result;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_pgsql::nextID(), DB_pgsql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP SEQUENCE '
-                            . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return "$query LIMIT $count OFFSET $from";
-    }
-
-    // }}}
-    // {{{ pgsqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_pgsql::errorNative(), DB_pgsql::errorCode()
-     */
-    function pgsqlRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if (!$native) {
-            $native = 'Database connection has been lost.';
-            $errno = DB_ERROR_CONNECT_FAILED;
-        }
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * {@internal Error messages are used instead of error codes 
-     * in order to support older versions of PostgreSQL.}}
-     *
-     * @return string  the DBMS' error message
-     */
-    function errorNative()
-    {
-        return @pg_errormessage($this->connection);
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message.
-     *
-     * @param  string  $errormsg  error message returned from the database
-     * @return integer  an error number from a DB error constant
-     */
-    function errorCode($errormsg)
-    {
-        static $error_regexps;
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/column .* (of relation .*)?does not exist/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/(relation|sequence|table).*does not exist|class .* not found/i'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/index .* does not exist/'
-                    => DB_ERROR_NOT_FOUND,
-                '/relation .* already exists/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/(divide|division) by zero$/i'
-                    => DB_ERROR_DIVZERO,
-                '/pg_atoi: error in .*: can\'t parse /i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/invalid input syntax for( type)? (integer|numeric)/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/value .* is out of range for type \w*int/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/integer out of range/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/value too long for type character/i'
-                    => DB_ERROR_INVALID,
-                '/attribute .* not found|relation .* does not have attribute/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/column .* specified in USING clause does not exist in (left|right) table/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/parser: parse error at or near/i'
-                    => DB_ERROR_SYNTAX,
-                '/syntax error at/'
-                    => DB_ERROR_SYNTAX,
-                '/column reference .* is ambiguous/i'
-                    => DB_ERROR_SYNTAX,
-                '/permission denied/'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/violates not-null constraint/'
-                    => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/violates [\w ]+ constraint/'
-                    => DB_ERROR_CONSTRAINT,
-                '/referential integrity violation/'
-                    => DB_ERROR_CONSTRAINT,
-                '/more expressions than target columns/i'
-                    => DB_ERROR_VALUE_COUNT_ON_ROW,
-            );
-        }
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @pg_exec($this->connection, "SELECT * FROM $result LIMIT 0");
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->pgsqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @pg_numfields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func(@pg_fieldname($id, $i)),
-                'type'  => @pg_fieldtype($id, $i),
-                'len'   => @pg_fieldsize($id, $i),
-                'flags' => $got_string
-                           ? $this->_pgFieldFlags($id, $i, $result)
-                           : '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @pg_freeresult($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _pgFieldFlags()
-
-    /**
-     * Get a column's flags
-     *
-     * Supports "not_null", "default_value", "primary_key", "unique_key"
-     * and "multiple_key".  The default value is passed through
-     * rawurlencode() in case there are spaces in it.
-     *
-     * @param int $resource   the PostgreSQL result identifier
-     * @param int $num_field  the field number
-     *
-     * @return string  the flags
-     *
-     * @access private
-     */
-    function _pgFieldFlags($resource, $num_field, $table_name)
-    {
-        $field_name = @pg_fieldname($resource, $num_field);
-
-        // Check if there's a schema in $table_name and update things
-        // accordingly.
-        $from = 'pg_attribute f, pg_class tab, pg_type typ';
-        if (strpos($table_name, '.') !== false) {
-            $from .= ', pg_namespace nsp';
-            list($schema, $table) = explode('.', $table_name);
-            $tableWhere = "tab.relname = '$table' AND tab.relnamespace = nsp.oid AND nsp.nspname = '$schema'";
-        } else {
-            $tableWhere = "tab.relname = '$table_name'";
-        }
-
-        $result = @pg_exec($this->connection, "SELECT f.attnotnull, f.atthasdef
-                                FROM $from
-                                WHERE tab.relname = typ.typname
-                                AND typ.typrelid = f.attrelid
-                                AND f.attname = '$field_name'
-                                AND $tableWhere");
-        if (@pg_numrows($result) > 0) {
-            $row = @pg_fetch_row($result, 0);
-            $flags  = ($row[0] == 't') ? 'not_null ' : '';
-
-            if ($row[1] == 't') {
-                $result = @pg_exec($this->connection, "SELECT a.adsrc
-                                    FROM $from, pg_attrdef a
-                                    WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid
-                                    AND f.attrelid = a.adrelid AND f.attname = '$field_name'
-                                    AND $tableWhere AND f.attnum = a.adnum");
-                $row = @pg_fetch_row($result, 0);
-                $num = preg_replace("/'(.*)'::\w+/", "\\1", $row[0]);
-                $flags .= 'default_' . rawurlencode($num) . ' ';
-            }
-        } else {
-            $flags = '';
-        }
-        $result = @pg_exec($this->connection, "SELECT i.indisunique, i.indisprimary, i.indkey
-                                FROM $from, pg_index i
-                                WHERE tab.relname = typ.typname
-                                AND typ.typrelid = f.attrelid
-                                AND f.attrelid = i.indrelid
-                                AND f.attname = '$field_name'
-                                AND $tableWhere");
-        $count = @pg_numrows($result);
-
-        for ($i = 0; $i < $count ; $i++) {
-            $row = @pg_fetch_row($result, $i);
-            $keys = explode(' ', $row[2]);
-
-            if (in_array($num_field + 1, $keys)) {
-                $flags .= ($row[0] == 't' && $row[1] == 'f') ? 'unique_key ' : '';
-                $flags .= ($row[1] == 't') ? 'primary_key ' : '';
-                if (count($keys) > 1)
-                    $flags .= 'multiple_key ';
-            }
-        }
-
-        return trim($flags);
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT c.relname AS "Name"'
-                        . ' FROM pg_class c, pg_user u'
-                        . ' WHERE c.relowner = u.usesysid'
-                        . " AND c.relkind = 'r'"
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_views'
-                        . '  WHERE viewname = c.relname)'
-                        . " AND c.relname !~ '^(pg_|sql_)'"
-                        . ' UNION'
-                        . ' SELECT c.relname AS "Name"'
-                        . ' FROM pg_class c'
-                        . " WHERE c.relkind = 'r'"
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_views'
-                        . '  WHERE viewname = c.relname)'
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_user'
-                        . '  WHERE usesysid = c.relowner)'
-                        . " AND c.relname !~ '^pg_'";
-            case 'schema.tables':
-                return "SELECT schemaname || '.' || tablename"
-                        . ' AS "Name"'
-                        . ' FROM pg_catalog.pg_tables'
-                        . ' WHERE schemaname NOT IN'
-                        . " ('pg_catalog', 'information_schema', 'pg_toast')";
-            case 'schema.views':
-                return "SELECT schemaname || '.' || viewname from pg_views WHERE schemaname"
-                        . " NOT IN ('information_schema', 'pg_catalog')";
-            case 'views':
-                // Table cols: viewname | viewowner | definition
-                return 'SELECT viewname from pg_views WHERE schemaname'
-                        . " NOT IN ('information_schema', 'pg_catalog')";
-            case 'users':
-                // cols: usename |usesysid|usecreatedb|usetrace|usesuper|usecatupd|passwd  |valuntil
-                return 'SELECT usename FROM pg_user';
-            case 'databases':
-                return 'SELECT datname FROM pg_database';
-            case 'functions':
-            case 'procedures':
-                return 'SELECT proname FROM pg_proc WHERE proowner <> 1';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/sqlite.php b/airtime_mvc/library/pear/DB/sqlite.php
deleted file mode 100644
index bf2acec5a..000000000
--- a/airtime_mvc/library/pear/DB/sqlite.php
+++ /dev/null
@@ -1,959 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's sqlite extension
- * for interacting with SQLite databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Urs Gehrig <urs@circle.ch>
- * @author     Mika Tuupola <tuupola@appelsiini.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
- * @version    CVS: $Id: sqlite.php,v 1.117 2007/09/21 14:23:28 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's sqlite extension
- * for interacting with SQLite databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * NOTICE:  This driver needs PHP's track_errors ini setting to be on.
- * It is automatically turned on when connecting to the database.
- * Make sure your scripts don't turn it off.
- *
- * @category   Database
- * @package    DB
- * @author     Urs Gehrig <urs@circle.ch>
- * @author     Mika Tuupola <tuupola@appelsiini.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_sqlite extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'sqlite';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'sqlite';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => false,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     *
-     * {@internal  Error codes according to sqlite_exec.  See the online
-     * manual at http://sqlite.org/c_interface.html for info.
-     * This error handling based on sqlite_exec is not yet implemented.}}
-     *
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * SQLite data types
-     *
-     * @link http://www.sqlite.org/datatypes.html
-     *
-     * @var array
-     */
-    var $keywords = array (
-        'BLOB'      => '',
-        'BOOLEAN'   => '',
-        'CHARACTER' => '',
-        'CLOB'      => '',
-        'FLOAT'     => '',
-        'INTEGER'   => '',
-        'KEY'       => '',
-        'NATIONAL'  => '',
-        'NUMERIC'   => '',
-        'NVARCHAR'  => '',
-        'PRIMARY'   => '',
-        'TEXT'      => '',
-        'TIMESTAMP' => '',
-        'UNIQUE'    => '',
-        'VARCHAR'   => '',
-        'VARYING'   => '',
-    );
-
-    /**
-     * The most recent error message from $php_errormsg
-     * @var string
-     * @access private
-     */
-    var $_lasterror = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_sqlite()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's sqlite driver supports the following extra DSN options:
-     *   + mode  The permissions for the database file, in four digit
-     *            chmod octal format (eg "0600").
-     *
-     * Example of connecting to a database in read-only mode:
-     * <code>
-     * require_once 'DB.php';
-     * 
-     * $dsn = 'sqlite:///path/and/name/of/db/file?mode=0400';
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     * 
-     * $db = DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * </code>
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('sqlite')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        if (!$dsn['database']) {
-            return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
-        }
-
-        if ($dsn['database'] !== ':memory:') {
-            if (!file_exists($dsn['database'])) {
-                if (!touch($dsn['database'])) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-                if (!isset($dsn['mode']) ||
-                    !is_numeric($dsn['mode']))
-                {
-                    $mode = 0644;
-                } else {
-                    $mode = octdec($dsn['mode']);
-                }
-                if (!chmod($dsn['database'], $mode)) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-                if (!file_exists($dsn['database'])) {
-                    return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
-                }
-            }
-            if (!is_file($dsn['database'])) {
-                return $this->sqliteRaiseError(DB_ERROR_INVALID);
-            }
-            if (!is_readable($dsn['database'])) {
-                return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
-            }
-        }
-
-        $connect_function = $persistent ? 'sqlite_popen' : 'sqlite_open';
-
-        // track_errors must remain on for simpleQuery()
-        @ini_set('track_errors', 1);
-        $php_errormsg = '';
-
-        if (!$this->connection = @$connect_function($dsn['database'])) {
-            return $this->raiseError(DB_ERROR_NODBSELECTED,
-                                     null, null, null,
-                                     $php_errormsg);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @sqlite_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * NOTICE:  This method needs PHP's track_errors ini setting to be on.
-     * It is automatically turned on when connecting to the database.
-     * Make sure your scripts don't turn it off.
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-
-        $php_errormsg = '';
-
-        $result = @sqlite_query($query, $this->connection);
-        $this->_lasterror = $php_errormsg ? $php_errormsg : '';
-
-        $this->result = $result;
-        if (!$this->result) {
-            return $this->sqliteRaiseError(null);
-        }
-
-        // sqlite_query() seems to allways return a resource
-        // so cant use that. Using $ismanip instead
-        if (!$ismanip) {
-            $numRows = $this->numRows($result);
-            if (is_object($numRows)) {
-                // we've got PEAR_Error
-                return $numRows;
-            }
-            return $result;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal sqlite result pointer to the next available result
-     *
-     * @param resource $result  the valid sqlite result resource
-     *
-     * @return bool  true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@sqlite_seek($this->result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @sqlite_fetch_array($result, SQLITE_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-
-            /* Remove extraneous " characters from the fields in the result.
-             * Fixes bug #11716. */
-            if (is_array($arr) && count($arr) > 0) {
-                $strippedArr = array();
-                foreach ($arr as $field => $value) {
-                    $strippedArr[trim($field, '"')] = $value;
-                }
-                $arr = $strippedArr;
-            }
-        } else {
-            $arr = @sqlite_fetch_array($result, SQLITE_NUM);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            /*
-             * Even though this DBMS already trims output, we do this because
-             * a field might have intentional whitespace at the end that
-             * gets removed by DB_PORTABILITY_RTRIM under another driver.
-             */
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult(&$result)
-    {
-        // XXX No native free?
-        if (!is_resource($result)) {
-            return false;
-        }
-        $result = null;
-        return true;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @sqlite_num_fields($result);
-        if (!$cols) {
-            return $this->sqliteRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @sqlite_num_rows($result);
-        if ($rows === null) {
-            return $this->sqliteRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affected()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        return @sqlite_changes($this->connection);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_sqlite::nextID(), DB_sqlite::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_sqlite::nextID(), DB_sqlite::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $query   = 'CREATE TABLE ' . $seqname .
-                   ' (id INTEGER UNSIGNED PRIMARY KEY) ';
-        $result  = $this->query($query);
-        if (DB::isError($result)) {
-            return($result);
-        }
-        $query   = "CREATE TRIGGER ${seqname}_cleanup AFTER INSERT ON $seqname
-                    BEGIN
-                        DELETE FROM $seqname WHERE id<LAST_INSERT_ROWID();
-                    END ";
-        $result  = $this->query($query);
-        if (DB::isError($result)) {
-            return($result);
-        }
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_sqlite::createSequence(), DB_sqlite::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (id) VALUES (NULL)");
-            $this->popErrorHandling();
-            if ($result === DB_OK) {
-                $id = @sqlite_last_insert_rowid($this->connection);
-                if ($id != 0) {
-                    return $id;
-                }
-            } elseif ($ondemand && DB::isError($result) &&
-                      $result->getCode() == DB_ERROR_NOSUCHTABLE)
-            {
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                } else {
-                    $repeat = 1;
-                }
-            }
-        } while ($repeat);
-
-        return $this->raiseError($result);
-    }
-
-    // }}}
-    // {{{ getDbFileStats()
-
-    /**
-     * Get the file stats for the current database
-     *
-     * Possible arguments are dev, ino, mode, nlink, uid, gid, rdev, size,
-     * atime, mtime, ctime, blksize, blocks or a numeric key between
-     * 0 and 12.
-     *
-     * @param string $arg  the array key for stats()
-     *
-     * @return mixed  an array on an unspecified key, integer on a passed
-     *                arg and false at a stats error
-     */
-    function getDbFileStats($arg = '')
-    {
-        $stats = stat($this->dsn['database']);
-        if ($stats == false) {
-            return false;
-        }
-        if (is_array($stats)) {
-            if (is_numeric($arg)) {
-                if (((int)$arg <= 12) & ((int)$arg >= 0)) {
-                    return false;
-                }
-                return $stats[$arg ];
-            }
-            if (array_key_exists(trim($arg), $stats)) {
-                return $stats[$arg ];
-            }
-        }
-        return $stats;
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * In SQLite, this makes things safe for inserts/updates, but may
-     * cause problems when performing text comparisons against columns
-     * containing binary data. See the
-     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @since Method available since Release 1.6.1
-     * @see DB_common::escapeSimple()
-     */
-    function escapeSimple($str)
-    {
-        return @sqlite_escape_string($str);
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return "$query LIMIT $count OFFSET $from";
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * This little hack lets you know how many rows were deleted
-     * when running a "DELETE FROM table" query.  Only implemented
-     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_common::setOption()
-     */
-    function modifyQuery($query)
-    {
-        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ sqliteRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_sqlite::errorNative(), DB_sqlite::errorCode()
-     */
-    function sqliteRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-
-        $errorcode = @sqlite_last_error($this->connection);
-        $userinfo = "$errorcode ** $this->last_query";
-
-        return $this->raiseError($errno, null, null, $userinfo, $native);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * {@internal This is used to retrieve more meaningfull error messages
-     * because sqlite_last_error() does not provide adequate info.}}
-     *
-     * @return string  the DBMS' error message
-     */
-    function errorNative()
-    {
-        return $this->_lasterror;
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message
-     *
-     * @param string $errormsg  the error message returned from the database
-     *
-     * @return integer  the DB error number
-     */
-    function errorCode($errormsg)
-    {
-        static $error_regexps;
-        
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^sqlite[a-z_]+\(\): /', '', $errormsg);
-        
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/^no such table:/' => DB_ERROR_NOSUCHTABLE,
-                '/^no such index:/' => DB_ERROR_NOT_FOUND,
-                '/^(table|index) .* already exists$/' => DB_ERROR_ALREADY_EXISTS,
-                '/PRIMARY KEY must be unique/i' => DB_ERROR_CONSTRAINT,
-                '/is not unique/' => DB_ERROR_CONSTRAINT,
-                '/columns .* are not unique/i' => DB_ERROR_CONSTRAINT,
-                '/uniqueness constraint failed/' => DB_ERROR_CONSTRAINT,
-                '/may not be NULL/' => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/^no such column:/' => DB_ERROR_NOSUCHFIELD,
-                '/column not present in both tables/i' => DB_ERROR_NOSUCHFIELD,
-                '/^near ".*": syntax error$/' => DB_ERROR_SYNTAX,
-                '/[0-9]+ values for [0-9]+ columns/i' => DB_ERROR_VALUE_COUNT_ON_ROW,
-            );
-        }
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table
-     *
-     * @param string         $result  a string containing the name of a table
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.7.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @sqlite_array_query($this->connection,
-                                      "PRAGMA table_info('$result');",
-                                      SQLITE_ASSOC);
-            $got_string = true;
-        } else {
-            $this->last_query = '';
-            return $this->raiseError(DB_ERROR_NOT_CAPABLE, null, null, null,
-                                     'This DBMS can not obtain tableInfo' .
-                                     ' from result sets');
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = count($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            if (strpos($id[$i]['type'], '(') !== false) {
-                $bits = explode('(', $id[$i]['type']);
-                $type = $bits[0];
-                $len  = rtrim($bits[1],')');
-            } else {
-                $type = $id[$i]['type'];
-                $len  = 0;
-            }
-
-            $flags = '';
-            if ($id[$i]['pk']) {
-                $flags .= 'primary_key ';
-            }
-            if ($id[$i]['notnull']) {
-                $flags .= 'not_null ';
-            }
-            if ($id[$i]['dflt_value'] !== null) {
-                $flags .= 'default_' . rawurlencode($id[$i]['dflt_value']);
-            }
-            $flags = trim($flags);
-
-            $res[$i] = array(
-                'table' => $case_func($result),
-                'name'  => $case_func($id[$i]['name']),
-                'type'  => $type,
-                'len'   => $len,
-                'flags' => $flags,
-            );
-
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     * @param array  $args  SQLITE DRIVER ONLY: a private array of arguments
-     *                       used by the getSpecialQuery().  Do not use
-     *                       this directly.
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type, $args = array())
-    {
-        if (!is_array($args)) {
-            return $this->raiseError('no key specified', null, null, null,
-                                     'Argument has to be an array.');
-        }
-
-        switch ($type) {
-            case 'master':
-                return 'SELECT * FROM sqlite_master;';
-            case 'tables':
-                return "SELECT name FROM sqlite_master WHERE type='table' "
-                       . 'UNION ALL SELECT name FROM sqlite_temp_master '
-                       . "WHERE type='table' ORDER BY name;";
-            case 'schema':
-                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
-                       . 'UNION ALL SELECT * FROM sqlite_temp_master) '
-                       . "WHERE type!='meta' "
-                       . 'ORDER BY tbl_name, type DESC, name;';
-            case 'schemax':
-            case 'schema_x':
-                /*
-                 * Use like:
-                 * $res = $db->query($db->getSpecialQuery('schema_x',
-                 *                   array('table' => 'table3')));
-                 */
-                return 'SELECT sql FROM (SELECT * FROM sqlite_master '
-                       . 'UNION ALL SELECT * FROM sqlite_temp_master) '
-                       . "WHERE tbl_name LIKE '{$args['table']}' "
-                       . "AND type!='meta' "
-                       . 'ORDER BY type DESC, name;';
-            case 'alter':
-                /*
-                 * SQLite does not support ALTER TABLE; this is a helper query
-                 * to handle this. 'table' represents the table name, 'rows'
-                 * the news rows to create, 'save' the row(s) to keep _with_
-                 * the data.
-                 *
-                 * Use like:
-                 * $args = array(
-                 *     'table' => $table,
-                 *     'rows'  => "id INTEGER PRIMARY KEY, firstname TEXT, surname TEXT, datetime TEXT",
-                 *     'save'  => "NULL, titel, content, datetime"
-                 * );
-                 * $res = $db->query( $db->getSpecialQuery('alter', $args));
-                 */
-                $rows = strtr($args['rows'], $this->keywords);
-
-                $q = array(
-                    'BEGIN TRANSACTION',
-                    "CREATE TEMPORARY TABLE {$args['table']}_backup ({$args['rows']})",
-                    "INSERT INTO {$args['table']}_backup SELECT {$args['save']} FROM {$args['table']}",
-                    "DROP TABLE {$args['table']}",
-                    "CREATE TABLE {$args['table']} ({$args['rows']})",
-                    "INSERT INTO {$args['table']} SELECT {$rows} FROM {$args['table']}_backup",
-                    "DROP TABLE {$args['table']}_backup",
-                    'COMMIT',
-                );
-
-                /*
-                 * This is a dirty hack, since the above query will not get
-                 * executed with a single query call so here the query method
-                 * will be called directly and return a select instead.
-                 */
-                foreach ($q as $query) {
-                    $this->query($query);
-                }
-                return "SELECT * FROM {$args['table']};";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/storage.php b/airtime_mvc/library/pear/DB/storage.php
deleted file mode 100644
index 30762e87e..000000000
--- a/airtime_mvc/library/pear/DB/storage.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Provides an object interface to a table row
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <stig@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: storage.php,v 1.24 2007/08/12 05:27:25 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB class so it can be extended from
- */
-require_once 'DB.php';
-
-/**
- * Provides an object interface to a table row
- *
- * It lets you add, delete and change rows using objects rather than SQL
- * statements.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken <stig@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_storage extends PEAR
-{
-    // {{{ properties
-
-    /** the name of the table (or view, if the backend database supports
-        updates in views) we hold data from */
-    var $_table = null;
-
-    /** which column(s) in the table contains primary keys, can be a
-        string for single-column primary keys, or an array of strings
-        for multiple-column primary keys */
-    var $_keycolumn = null;
-
-    /** DB connection handle used for all transactions */
-    var $_dbh = null;
-
-    /** an assoc with the names of database fields stored as properties
-        in this object */
-    var $_properties = array();
-
-    /** an assoc with the names of the properties in this object that
-        have been changed since they were fetched from the database */
-    var $_changes = array();
-
-    /** flag that decides if data in this object can be changed.
-        objects that don't have their table's key column in their
-        property lists will be flagged as read-only. */
-    var $_readonly = false;
-
-    /** function or method that implements a validator for fields that
-        are set, this validator function returns true if the field is
-        valid, false if not */
-    var $_validator = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     *
-     * @param $table string the name of the database table
-     *
-     * @param $keycolumn mixed string with name of key column, or array of
-     * strings if the table has a primary key of more than one column
-     *
-     * @param $dbh object database connection object
-     *
-     * @param $validator mixed function or method used to validate
-     * each new value, called with three parameters: the name of the
-     * field/column that is changing, a reference to the new value and
-     * a reference to this object
-     *
-     */
-    function DB_storage($table, $keycolumn, &$dbh, $validator = null)
-    {
-        $this->PEAR('DB_Error');
-        $this->_table = $table;
-        $this->_keycolumn = $keycolumn;
-        $this->_dbh = $dbh;
-        $this->_readonly = false;
-        $this->_validator = $validator;
-    }
-
-    // }}}
-    // {{{ _makeWhere()
-
-    /**
-     * Utility method to build a "WHERE" clause to locate ourselves in
-     * the table.
-     *
-     * XXX future improvement: use rowids?
-     *
-     * @access private
-     */
-    function _makeWhere($keyval = null)
-    {
-        if (is_array($this->_keycolumn)) {
-            if ($keyval === null) {
-                for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                    $keyval[] = $this->{$this->_keycolumn[$i]};
-                }
-            }
-            $whereclause = '';
-            for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                if ($i > 0) {
-                    $whereclause .= ' AND ';
-                }
-                $whereclause .= $this->_keycolumn[$i];
-                if (is_null($keyval[$i])) {
-                    // there's not much point in having a NULL key,
-                    // but we support it anyway
-                    $whereclause .= ' IS NULL';
-                } else {
-                    $whereclause .= ' = ' . $this->_dbh->quote($keyval[$i]);
-                }
-            }
-        } else {
-            if ($keyval === null) {
-                $keyval = @$this->{$this->_keycolumn};
-            }
-            $whereclause = $this->_keycolumn;
-            if (is_null($keyval)) {
-                // there's not much point in having a NULL key,
-                // but we support it anyway
-                $whereclause .= ' IS NULL';
-            } else {
-                $whereclause .= ' = ' . $this->_dbh->quote($keyval);
-            }
-        }
-        return $whereclause;
-    }
-
-    // }}}
-    // {{{ setup()
-
-    /**
-     * Method used to initialize a DB_storage object from the
-     * configured table.
-     *
-     * @param $keyval mixed the key[s] of the row to fetch (string or array)
-     *
-     * @return int DB_OK on success, a DB error if not
-     */
-    function setup($keyval)
-    {
-        $whereclause = $this->_makeWhere($keyval);
-        $query = 'SELECT * FROM ' . $this->_table . ' WHERE ' . $whereclause;
-        $sth = $this->_dbh->query($query);
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        $row = $sth->fetchRow(DB_FETCHMODE_ASSOC);
-        if (DB::isError($row)) {
-            return $row;
-        }
-        if (!$row) {
-            return $this->raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                     $query, null, true);
-        }
-        foreach ($row as $key => $value) {
-            $this->_properties[$key] = true;
-            $this->$key = $value;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ insert()
-
-    /**
-     * Create a new (empty) row in the configured table for this
-     * object.
-     */
-    function insert($newpk)
-    {
-        if (is_array($this->_keycolumn)) {
-            $primarykey = $this->_keycolumn;
-        } else {
-            $primarykey = array($this->_keycolumn);
-        }
-        settype($newpk, "array");
-        for ($i = 0; $i < sizeof($primarykey); $i++) {
-            $pkvals[] = $this->_dbh->quote($newpk[$i]);
-        }
-
-        $sth = $this->_dbh->query("INSERT INTO $this->_table (" .
-                                  implode(",", $primarykey) . ") VALUES(" .
-                                  implode(",", $pkvals) . ")");
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        if (sizeof($newpk) == 1) {
-            $newpk = $newpk[0];
-        }
-        $this->setup($newpk);
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Output a simple description of this DB_storage object.
-     * @return string object description
-     */
-    function toString()
-    {
-        $info = strtolower(get_class($this));
-        $info .= " (table=";
-        $info .= $this->_table;
-        $info .= ", keycolumn=";
-        if (is_array($this->_keycolumn)) {
-            $info .= "(" . implode(",", $this->_keycolumn) . ")";
-        } else {
-            $info .= $this->_keycolumn;
-        }
-        $info .= ", dbh=";
-        if (is_object($this->_dbh)) {
-            $info .= $this->_dbh->toString();
-        } else {
-            $info .= "null";
-        }
-        $info .= ")";
-        if (sizeof($this->_properties)) {
-            $info .= " [loaded, key=";
-            $keyname = $this->_keycolumn;
-            if (is_array($keyname)) {
-                $info .= "(";
-                for ($i = 0; $i < sizeof($keyname); $i++) {
-                    if ($i > 0) {
-                        $info .= ",";
-                    }
-                    $info .= $this->$keyname[$i];
-                }
-                $info .= ")";
-            } else {
-                $info .= $this->$keyname;
-            }
-            $info .= "]";
-        }
-        if (sizeof($this->_changes)) {
-            $info .= " [modified]";
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ dump()
-
-    /**
-     * Dump the contents of this object to "standard output".
-     */
-    function dump()
-    {
-        foreach ($this->_properties as $prop => $foo) {
-            print "$prop = ";
-            print htmlentities($this->$prop);
-            print "<br />\n";
-        }
-    }
-
-    // }}}
-    // {{{ &create()
-
-    /**
-     * Static method used to create new DB storage objects.
-     * @param $data assoc. array where the keys are the names
-     *              of properties/columns
-     * @return object a new instance of DB_storage or a subclass of it
-     */
-    function &create($table, &$data)
-    {
-        $classname = strtolower(get_class($this));
-        $obj = new $classname($table);
-        foreach ($data as $name => $value) {
-            $obj->_properties[$name] = true;
-            $obj->$name = &$value;
-        }
-        return $obj;
-    }
-
-    // }}}
-    // {{{ loadFromQuery()
-
-    /**
-     * Loads data into this object from the given query.  If this
-     * object already contains table data, changes will be saved and
-     * the object re-initialized first.
-     *
-     * @param $query SQL query
-     *
-     * @param $params parameter list in case you want to use
-     * prepare/execute mode
-     *
-     * @return int DB_OK on success, DB_WARNING_READ_ONLY if the
-     * returned object is read-only (because the object's specified
-     * key column was not found among the columns returned by $query),
-     * or another DB error code in case of errors.
-     */
-// XXX commented out for now
-/*
-    function loadFromQuery($query, $params = null)
-    {
-        if (sizeof($this->_properties)) {
-            if (sizeof($this->_changes)) {
-                $this->store();
-                $this->_changes = array();
-            }
-            $this->_properties = array();
-        }
-        $rowdata = $this->_dbh->getRow($query, DB_FETCHMODE_ASSOC, $params);
-        if (DB::isError($rowdata)) {
-            return $rowdata;
-        }
-        reset($rowdata);
-        $found_keycolumn = false;
-        while (list($key, $value) = each($rowdata)) {
-            if ($key == $this->_keycolumn) {
-                $found_keycolumn = true;
-            }
-            $this->_properties[$key] = true;
-            $this->$key = &$value;
-            unset($value); // have to unset, or all properties will
-                           // refer to the same value
-        }
-        if (!$found_keycolumn) {
-            $this->_readonly = true;
-            return DB_WARNING_READ_ONLY;
-        }
-        return DB_OK;
-    }
- */
-
-    // }}}
-    // {{{ set()
-
-    /**
-     * Modify an attriute value.
-     */
-    function set($property, $newvalue)
-    {
-        // only change if $property is known and object is not
-        // read-only
-        if ($this->_readonly) {
-            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
-                                     null, null, null, true);
-        }
-        if (@isset($this->_properties[$property])) {
-            if (empty($this->_validator)) {
-                $valid = true;
-            } else {
-                $valid = @call_user_func($this->_validator,
-                                         $this->_table,
-                                         $property,
-                                         $newvalue,
-                                         $this->$property,
-                                         $this);
-            }
-            if ($valid) {
-                $this->$property = $newvalue;
-                if (empty($this->_changes[$property])) {
-                    $this->_changes[$property] = 0;
-                } else {
-                    $this->_changes[$property]++;
-                }
-            } else {
-                return $this->raiseError(null, DB_ERROR_INVALID, null,
-                                         null, "invalid field: $property",
-                                         null, true);
-            }
-            return true;
-        }
-        return $this->raiseError(null, DB_ERROR_NOSUCHFIELD, null,
-                                 null, "unknown field: $property",
-                                 null, true);
-    }
-
-    // }}}
-    // {{{ &get()
-
-    /**
-     * Fetch an attribute value.
-     *
-     * @param string attribute name
-     *
-     * @return attribute contents, or null if the attribute name is
-     * unknown
-     */
-    function &get($property)
-    {
-        // only return if $property is known
-        if (isset($this->_properties[$property])) {
-            return $this->$property;
-        }
-        $tmp = null;
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ _DB_storage()
-
-    /**
-     * Destructor, calls DB_storage::store() if there are changes
-     * that are to be kept.
-     */
-    function _DB_storage()
-    {
-        if (sizeof($this->_changes)) {
-            $this->store();
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        $this->_table = null;
-    }
-
-    // }}}
-    // {{{ store()
-
-    /**
-     * Stores changes to this object in the database.
-     *
-     * @return DB_OK or a DB error
-     */
-    function store()
-    {
-        $params = array();
-        $vars = array();
-        foreach ($this->_changes as $name => $foo) {
-            $params[] = &$this->$name;
-            $vars[] = $name . ' = ?';
-        }
-        if ($vars) {
-            $query = 'UPDATE ' . $this->_table . ' SET ' .
-                implode(', ', $vars) . ' WHERE ' .
-                $this->_makeWhere();
-            $stmt = $this->_dbh->prepare($query);
-            $res = $this->_dbh->execute($stmt, $params);
-            if (DB::isError($res)) {
-                return $res;
-            }
-            $this->_changes = array();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ remove()
-
-    /**
-     * Remove the row represented by this object from the database.
-     *
-     * @return mixed DB_OK or a DB error
-     */
-    function remove()
-    {
-        if ($this->_readonly) {
-            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
-                                     null, null, null, true);
-        }
-        $query = 'DELETE FROM ' . $this->_table .' WHERE '.
-            $this->_makeWhere();
-        $res = $this->_dbh->query($query);
-        if (DB::isError($res)) {
-            return $res;
-        }
-        foreach ($this->_properties as $prop => $foo) {
-            unset($this->$prop);
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        return DB_OK;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/DB/sybase.php b/airtime_mvc/library/pear/DB/sybase.php
deleted file mode 100644
index bb79c78c2..000000000
--- a/airtime_mvc/library/pear/DB/sybase.php
+++ /dev/null
@@ -1,942 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * The PEAR DB driver for PHP's sybase extension
- * for interacting with Sybase databases
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: sybase.php,v 1.87 2007/09/21 13:40:42 aharvey Exp $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's sybase extension
- * for interacting with Sybase databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * WARNING:  This driver may fail with multiple connections under the
- * same user/pass/host and different databases.
- *
- * @category   Database
- * @package    DB
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Antônio Carlos Venâncio Júnior <floripa@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2007 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.13
- * @link       http://pear.php.net/package/DB
- */
-class DB_sybase extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'sybase';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'sybase';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'emulate',
-        'new_link'      => false,
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    var $_db = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
-     *
-     * @return void
-     */
-    function DB_sybase()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's sybase driver supports the following extra DSN options:
-     *   + appname       The application name to use on this connection.
-     *                   Available since PEAR DB 1.7.0.
-     *   + charset       The character set to use on this connection.
-     *                   Available since PEAR DB 1.7.0.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('sybase') &&
-            !PEAR::loadExtension('sybase_ct'))
-        {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $dsn['hostspec'] = $dsn['hostspec'] ? $dsn['hostspec'] : 'localhost';
-        $dsn['password'] = !empty($dsn['password']) ? $dsn['password'] : false;
-        $dsn['charset'] = isset($dsn['charset']) ? $dsn['charset'] : false;
-        $dsn['appname'] = isset($dsn['appname']) ? $dsn['appname'] : false;
-
-        $connect_function = $persistent ? 'sybase_pconnect' : 'sybase_connect';
-
-        if ($dsn['username']) {
-            $this->connection = @$connect_function($dsn['hostspec'],
-                                                   $dsn['username'],
-                                                   $dsn['password'],
-                                                   $dsn['charset'],
-                                                   $dsn['appname']);
-        } else {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     'The DSN did not contain a username.');
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     @sybase_get_last_message());
-        }
-
-        if ($dsn['database']) {
-            if (!@sybase_select_db($dsn['database'], $this->connection)) {
-                return $this->raiseError(DB_ERROR_NODBSELECTED,
-                                         null, null, null,
-                                         @sybase_get_last_message());
-            }
-            $this->_db = $dsn['database'];
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @sybase_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = $this->_checkManip($query);
-        $this->last_query = $query;
-        if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-            return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @sybase_query('BEGIN TRANSACTION', $this->connection);
-                if (!$result) {
-                    return $this->sybaseRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @sybase_query($query, $this->connection);
-        if (!$result) {
-            return $this->sybaseRaiseError();
-        }
-        if (is_resource($result)) {
-            return $result;
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        return $ismanip ? DB_OK : $result;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal sybase result pointer to the next available result
-     *
-     * @param a valid sybase result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@sybase_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            if (function_exists('sybase_fetch_assoc')) {
-                $arr = @sybase_fetch_assoc($result);
-            } else {
-                if ($arr = @sybase_fetch_array($result)) {
-                    foreach ($arr as $key => $value) {
-                        if (is_int($key)) {
-                            unset($arr[$key]);
-                        }
-                    }
-                }
-            }
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @sybase_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return is_resource($result) ? sybase_free_result($result) : false;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @sybase_num_fields($result);
-        if (!$cols) {
-            return $this->sybaseRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @sybase_num_rows($result);
-        if ($rows === false) {
-            return $this->sybaseRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if ($this->_last_query_manip) {
-            $result = @sybase_affected_rows($this->connection);
-        } else {
-            $result = 0;
-        }
-        return $result;
-     }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_sybase::createSequence(), DB_sybase::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-            return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-        }
-        $repeat = 0;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("INSERT INTO $seqname (vapor) VALUES (0)");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                ($result->getCode() == DB_ERROR || $result->getCode() == DB_ERROR_NOSUCHTABLE))
-            {
-                $repeat = 1;
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } elseif (!DB::isError($result)) {
-                $result = $this->query("SELECT @@IDENTITY FROM $seqname");
-                $repeat = 0;
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $result = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        return $result[0];
-    }
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_sybase::nextID(), DB_sybase::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->query('CREATE TABLE '
-                            . $this->getSequenceName($seq_name)
-                            . ' (id numeric(10, 0) IDENTITY NOT NULL,'
-                            . ' vapor int NULL)');
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_sybase::nextID(), DB_sybase::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ quoteFloat()
-
-    /**
-     * Formats a float value for use within a query in a locale-independent
-     * manner.
-     *
-     * @param float the float value to be quoted.
-     * @return string the quoted string.
-     * @see DB_common::quoteSmart()
-     * @since Method available since release 1.7.8.
-     */
-    function quoteFloat($float) {
-        return $this->escapeSimple(str_replace(',', '.', strval(floatval($float))));
-    }
-     
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @sybase_query('COMMIT', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->sybaseRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $result = @sybase_query('ROLLBACK', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->sybaseRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ sybaseRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_sybase::errorNative(), DB_sybase::errorCode()
-     */
-    function sybaseRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * @return string  the DBMS' error message
-     */
-    function errorNative()
-    {
-        return @sybase_get_last_message();
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message.
-     *
-     * @param  string  $errormsg  error message returned from the database
-     * @return integer  an error number from a DB error constant
-     */
-    function errorCode($errormsg)
-    {
-        static $error_regexps;
-        
-        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
-        // this hack to work around it, per bug #9599.
-        $errormsg = preg_replace('/^sybase[a-z_]+\(\): /', '', $errormsg);
-        
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/Incorrect syntax near/'
-                    => DB_ERROR_SYNTAX,
-                '/^Unclosed quote before the character string [\"\'].*[\"\']\./'
-                    => DB_ERROR_SYNTAX,
-                '/Implicit conversion (from datatype|of NUMERIC value)/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/Cannot drop the table [\"\'].+[\"\'], because it doesn\'t exist in the system catalogs\./'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/Only the owner of object [\"\'].+[\"\'] or a user with System Administrator \(SA\) role can run this command\./'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/^.+ permission denied on object .+, database .+, owner .+/'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/^.* permission denied, database .+, owner .+/'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/[^.*] not found\./'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/There is already an object named/'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/Invalid column name/'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/does not allow null values/'
-                    => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/Command has been aborted/'
-                    => DB_ERROR_CONSTRAINT,
-                '/^Cannot drop the index .* because it doesn\'t exist/i'
-                    => DB_ERROR_NOT_FOUND,
-                '/^There is already an index/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/^There are fewer columns in the INSERT statement than values specified/i'
-                    => DB_ERROR_VALUE_COUNT_ON_ROW,
-                '/Divide by zero/i'
-                    => DB_ERROR_DIVZERO,
-            );
-        }
-
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
-     * is a table name.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     * @since Method available since Release 1.6.0
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            if ($this->_db && !@sybase_select_db($this->_db, $this->connection)) {
-                return $this->sybaseRaiseError(DB_ERROR_NODBSELECTED);
-            }
-            $id = @sybase_query("SELECT * FROM $result WHERE 1=0",
-                                $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->sybaseRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @sybase_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $f = @sybase_fetch_field($id, $i);
-            // column_source is often blank
-            $res[$i] = array(
-                'table' => $got_string
-                           ? $case_func($result)
-                           : $case_func($f->column_source),
-                'name'  => $case_func($f->name),
-                'type'  => $f->type,
-                'len'   => $f->max_length,
-                'flags' => '',
-            );
-            if ($res[$i]['table']) {
-                $res[$i]['flags'] = $this->_sybase_field_flags(
-                        $res[$i]['table'], $res[$i]['name']);
-            }
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @sybase_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _sybase_field_flags()
-
-    /**
-     * Get the flags for a field
-     *
-     * Currently supports:
-     *  + <samp>unique_key</samp>    (unique index, unique check or primary_key)
-     *  + <samp>multiple_key</samp>  (multi-key index)
-     *
-     * @param string  $table   the table name
-     * @param string  $column  the field name
-     *
-     * @return string  space delimited string of flags.  Empty string if none.
-     *
-     * @access private
-     */
-    function _sybase_field_flags($table, $column)
-    {
-        static $tableName = null;
-        static $flags = array();
-
-        if ($table != $tableName) {
-            $flags = array();
-            $tableName = $table;
-
-            /* We're running sp_helpindex directly because it doesn't exist in
-             * older versions of ASE -- unfortunately, we can't just use
-             * DB::isError() because the user may be using callback error
-             * handling. */
-            $res = @sybase_query("sp_helpindex $table", $this->connection);
-
-            if ($res === false || $res === true) {
-                // Fake a valid response for BC reasons.
-                return '';
-            }
-
-            while (($val = sybase_fetch_assoc($res)) !== false) {
-                if (!isset($val['index_keys'])) {
-                    /* No useful information returned. Break and be done with
-                     * it, which preserves the pre-1.7.9 behaviour. */
-                    break;
-                }
-
-                $keys = explode(', ', trim($val['index_keys']));
-
-                if (sizeof($keys) > 1) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'multiple_key');
-                    }
-                }
-
-                if (strpos($val['index_description'], 'unique')) {
-                    foreach ($keys as $key) {
-                        $this->_add_flag($flags[$key], 'unique_key');
-                    }
-                }
-            }
-
-            sybase_free_result($res);
-
-        }
-
-        if (array_key_exists($column, $flags)) {
-            return(implode(' ', $flags[$column]));
-        }
-
-        return '';
-    }
-
-    // }}}
-    // {{{ _add_flag()
-
-    /**
-     * Adds a string to the flags array if the flag is not yet in there
-     * - if there is no flag present the array is created
-     *
-     * @param array  $array  reference of flags array to add a value to
-     * @param mixed  $value  value to add to the flag array
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _add_flag(&$array, $value)
-    {
-        if (!is_array($array)) {
-            $array = array($value);
-        } elseif (!in_array($value, $array)) {
-            array_push($array, $value);
-        }
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return "SELECT name FROM sysobjects WHERE type = 'U'"
-                       . ' ORDER BY name';
-            case 'views':
-                return "SELECT name FROM sysobjects WHERE type = 'V'";
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/File.php b/airtime_mvc/library/pear/File.php
deleted file mode 100644
index d3c311116..000000000
--- a/airtime_mvc/library/pear/File.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * File
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    File
- * @package     File
- * @author      Richard Heyes <richard@php.net>
- * @author      Tal Peer <tal@php.net>
- * @author      Michael Wallner <mike@php.net>
- * @copyright   2002-2005 The Authors
- * @license     http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version     CVS: $Id: File.php,v 1.38 2007/03/24 16:38:56 dufuz Exp $
- * @link        http://pear.php.net/package/File
- */
-
-/**
- * Requires PEAR
- */
-require_once 'PEAR.php';
-
-/**
- * The default number of bytes for reading
- */
-if (!defined('FILE_DEFAULT_READSIZE')) {
-    define('FILE_DEFAULT_READSIZE', 1024, true);
-}
-
-/**
- * The maximum number of bytes for reading lines
- */
-if (!defined('FILE_MAX_LINE_READSIZE')) {
-    define('FILE_MAX_LINE_READSIZE', 40960, true);
-}
-
-/**
- * Whether file locks should block
- */
-if (!defined('FILE_LOCKS_BLOCK')) {
-    define('FILE_LOCKS_BLOCK', true, true);
-}
-
-/**
- * Mode to use for reading from files
- */
-define('FILE_MODE_READ', 'rb', true);
-
-/**
- * Mode to use for truncating files, then writing
- */
-define('FILE_MODE_WRITE', 'wb', true);
-
-/**
- * Mode to use for appending to files
- */
-define('FILE_MODE_APPEND', 'ab', true);
-
-/**
- * Use this when a shared (read) lock is required
- */
-define('FILE_LOCK_SHARED', LOCK_SH | (FILE_LOCKS_BLOCK ? 0 : LOCK_NB), true);
-
-/**
- * Use this when an exclusive (write) lock is required
- */
-define('FILE_LOCK_EXCLUSIVE', LOCK_EX | (FILE_LOCKS_BLOCK ? 0 : LOCK_NB), true);
-
-/**
- * Class for handling files
- *
- * A class with common functions for writing,
- * reading and handling files and directories
- *
- * @author  Richard Heyes <richard@php.net>
- * @author  Tal Peer <tal@php.net>
- * @author  Michael Wallner <mike@php.net>
- * @access  public
- * @package File
- *
- * @static
- */
-class File extends PEAR
-{
-    /**
-     * Destructor
-     *
-     * Unlocks any locked file pointers and closes all filepointers
-     *
-     * @access private
-     */
-    function _File()
-    {
-        File::closeAll();
-    }
-
-    /**
-     * Handles file pointers. If a file pointer needs to be opened,
-     * it will be. If it already exists (based on filename and mode)
-     * then the existing one will be returned.
-     *
-     * @access  private
-     * @param   string  $filename Filename to be used
-     * @param   string  $mode Mode to open the file in
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error on error or file pointer resource on success
-     */
-    function _getFilePointer($filename, $mode, $lock = false)
-    {
-        $filePointers = &PEAR::getStaticProperty('File', 'filePointers');
-
-        // Win32 is case-insensitive
-        if (OS_WINDOWS) {
-            $filename = strtolower($filename);
-        }
-
-        // check if file pointer already exists
-        if (!isset($filePointers[$filename][$mode]) ||
-            !is_resource($filePointers[$filename][$mode])) {
-
-            // check if we can open the file in the desired mode
-            switch ($mode)
-            {
-                case FILE_MODE_READ:
-                    if (!preg_match('/^.+(?<!file):\/\//i', $filename) &&
-                        !file_exists($filename)) {
-                        return PEAR::raiseError("File does not exist: $filename");
-                    }
-                break;
-
-                case FILE_MODE_APPEND:
-                case FILE_MODE_WRITE:
-                    if (file_exists($filename)) {
-                        if (!is_writable($filename)) {
-                            return PEAR::raiseError("File is not writable: $filename");
-                        }
-                    } elseif (!is_writable($dir = dirname($filename))) {
-                        return PEAR::raiseError("Cannot create file in directory: $dir");
-                    }
-                break;
-
-                default:
-                    return PEAR::raiseError("Invalid access mode: $mode");
-            }
-
-            // open file
-            $filePointers[$filename][$mode] = @fopen($filename, $mode);
-            if (!is_resource($filePointers[$filename][$mode])) {
-                return PEAR::raiseError('Failed to open file: ' . $filename);
-            }
-        }
-
-        // lock file
-        if ($lock) {
-            $lock = $mode == FILE_MODE_READ ? FILE_LOCK_SHARED : FILE_LOCK_EXCLUSIVE;
-            $locks = &PEAR::getStaticProperty('File', 'locks');
-            if (@flock($filePointers[$filename][$mode], $lock)) {
-                $locks[] = &$filePointers[$filename][$mode];
-            } elseif (FILE_LOCKS_BLOCK) {
-                return PEAR::raiseError("File already locked: $filename");
-            } else {
-                return PEAR::raiseError("Could not lock file: $filename");
-            }
-        }
-
-        return $filePointers[$filename][$mode];
-    }
-
-    /**
-     * Reads an entire file and returns it.
-     * Uses file_get_contents if available.
-     *
-     * @access  public
-     * @param   string  $filename Name of file to read from
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error if an error has occured or a string with the contents of the the file
-     */
-    function readAll($filename, $lock = false)
-    {
-        if (false === $file = @file_get_contents($filename)) {
-            return PEAR::raiseError("Cannot read file: $filename");
-        }
-        return $file;
-    }
-
-    /**
-     * Returns a specified number of bytes of a file.
-     * Defaults to FILE_DEFAULT_READSIZE.  If $size is 0, all file will be read.
-     *
-     * @access  public
-     * @param   string  $filename Name of file to read from
-     * @param   integer $size Bytes to read
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error on error or a string which contains the data read
-     *                  Will also return false upon EOF
-     */
-    function read($filename, $size = FILE_DEFAULT_READSIZE, $lock = false)
-    {
-        static $filePointers;
-
-        if ($size == 0) {
-            return File::readAll($filename, $lock);
-        }
-
-        if (!isset($filePointers[$filename]) ||
-            !is_resource($filePointers[$filename])) {
-            $fp = File::_getFilePointer($filename, FILE_MODE_READ, $lock);
-            if (PEAR::isError($fp)) {
-                return $fp;
-            }
-
-            $filePointers[$filename] = $fp;
-        } else {
-            $fp = $filePointers[$filename];
-        }
-
-        return !feof($fp) ? fread($fp, $size) : false;
-    }
-
-    /**
-     * Writes the given data to the given filename.
-     * Defaults to no lock, append mode.
-     *
-     * @access  public
-     * @param   string  $filename Name of file to write to
-     * @param   string  $data Data to write to file
-     * @param   string  $mode Mode to open file in
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error on error or number of bytes written to file.
-     */
-    function write($filename, $data, $mode = FILE_MODE_APPEND, $lock = false)
-    {
-        $fp = File::_getFilePointer($filename, $mode, $lock);
-        if (PEAR::isError($fp)) {
-            return $fp;
-        }
-
-        if (false === $bytes = @fwrite($fp, $data, strlen($data))) {
-            return PEAR::raiseError("Cannot write data: '$data' to file: '$filename'");
-        }
-
-        return $bytes;
-    }
-
-    /**
-     * Reads and returns a single character from given filename
-     *
-     * @access  public
-     * @param   string  $filename Name of file to read from
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error on error or one character of the specified file
-     */
-    function readChar($filename, $lock = false)
-    {
-        return File::read($filename, 1, $lock);
-    }
-
-    /**
-     * Writes a single character to a file
-     *
-     * @access  public
-     * @param   string  $filename Name of file to write to
-     * @param   string  $char Character to write
-     * @param   string  $mode Mode to use when writing
-     * @param   mixed   $lock Type of lock to use
-     * @return  mixed   PEAR_Error on error, or 1 on success
-     */
-    function writeChar($filename, $char, $mode = FILE_MODE_APPEND, $lock = false)
-    {
-        $fp = File::_getFilePointer($filename, $mode, $lock);
-        if (PEAR::isError($fp)) {
-            return $fp;
-        }
-
-        if (false === @fwrite($fp, $char, 1)) {
-            return PEAR::raiseError("Cannot write data: '$data' to file: '$filename'");
-        }
-
-        return 1;
-    }
-
-    /**
-     * Returns a line of the file (without trailing CRLF).
-     * Maximum read line length is FILE_MAX_LINE_READSIZE.
-     *
-     * @access  public
-     * @param   string  $filename Name of file to read from
-     * @param   boolean $lock Whether file should be locked
-     * @return  mixed   PEAR_Error on error or a string containing the line read from file
-     */
-    function readLine($filename, $lock = false)
-    {
-        static $filePointers; // Used to prevent unnecessary calls to _getFilePointer()
-
-        if (!isset($filePointers[$filename]) ||
-            !is_resource($filePointers[$filename])) {
-            $fp = File::_getFilePointer($filename, FILE_MODE_READ, $lock);
-            if (PEAR::isError($fp)) {
-                return $fp;
-            }
-
-            $filePointers[$filename] = $fp;
-        } else {
-            $fp = $filePointers[$filename];
-        }
-
-        if (feof($fp)) {
-            return false;
-        }
-
-        return rtrim(fgets($fp, FILE_MAX_LINE_READSIZE), "\r\n");
-    }
-
-    /**
-     * Writes a single line, appending a LF (by default)
-     *
-     * @access  public
-     * @param   string  $filename Name of file to write to
-     * @param   string  $line Line of data to be written to file
-     * @param   string  $mode Write mode, can be either FILE_MODE_WRITE or FILE_MODE_APPEND
-     * @param   string  $crlf The CRLF your system is using. UNIX = \n Windows = \r\n Mac = \r
-     * @param   mixed   $lock Whether to lock the file
-     * @return  mixed   PEAR_Error on error or number of bytes written to file (including appended crlf)
-     */
-    function writeLine($filename, $line, $mode = FILE_MODE_APPEND, $crlf = "\n", $lock = false)
-    {
-        $fp = File::_getFilePointer($filename, $mode, $lock);
-        if (PEAR::isError($fp)) {
-            return $fp;
-        }
-
-        if (false === $bytes = fwrite($fp, $line . $crlf)) {
-            return PEAR::raiseError("Cannot write data: '$data' to file: '$file'");
-        }
-
-        return $bytes;
-    }
-
-    /**
-     * This rewinds a filepointer to the start of a file
-     *
-     * @access  public
-     * @param   string  $filename The filename
-     * @param   string  $mode Mode the file was opened in
-     * @return  mixed   PEAR Error on error, true on success
-     */
-    function rewind($filename, $mode)
-    {
-        $fp = File::_getFilePointer($filename, $mode);
-        if (PEAR::isError($fp)) {
-            return $fp;
-        }
-
-        if (!@rewind($fp)) {
-            return PEAR::raiseError("Cannot rewind file: $filename");
-        }
-
-        return true;
-    }
-
-    /**
-     * Closes all open file pointers
-     *
-     * @access  public
-     * @return  void
-     */
-    function closeAll()
-    {
-        $locks = &PEAR::getStaticProperty('File', 'locks');
-        $filePointers = &PEAR::getStaticProperty('File', 'filePointers');
-
-        // unlock files
-        for ($i = 0, $c = count($locks); $i < $c; $i++) {
-            is_resource($locks[$i]) and @flock($locks[$i], LOCK_UN);
-        }
-
-        // close files
-        if (!empty($filePointers)) {
-            foreach ($filePointers as $fname => $modes) {
-                foreach (array_keys($modes) as $mode) {
-                    if (is_resource($filePointers[$fname][$mode])) {
-                        @fclose($filePointers[$fname][$mode]);
-                    }
-                    unset($filePointers[$fname][$mode]);
-                }
-            }
-        }
-    }
-
-    /**
-     * This closes an open file pointer
-     *
-     * @access  public
-     * @param   string  $filename The filename that was opened
-     * @param   string  $mode Mode the file was opened in
-     * @return  mixed   PEAR Error on error, true otherwise
-     */
-    function close($filename, $mode)
-    {
-        $filePointers = &PEAR::getStaticProperty('File', 'filePointers');
-
-        if (OS_WINDOWS) {
-            $filename = strToLower($filename);
-        }
-
-        if (!isset($filePointers[$filename][$mode])) {
-            return true;
-        }
-
-        $fp = $filePointers[$filename][$mode];
-        unset($filePointers[$filename][$mode]);
-
-        if (is_resource($fp)) {
-            // unlock file
-            @flock($fp, LOCK_UN);
-            // close file
-            if (!@fclose($fp)) {
-                return PEAR::raiseError("Cannot close file: $filename");
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * This unlocks a locked file pointer.
-     *
-     * @access  public
-     * @param   string  $filename The filename that was opened
-     * @param   string  $mode Mode the file was opened in
-     * @return  mixed   PEAR Error on error, true otherwise
-     */
-    function unlock($filename, $mode)
-    {
-        $fp = File::_getFilePointer($filename, $mode);
-        if (PEAR::isError($fp)) {
-            return $fp;
-        }
-
-        if (!@flock($fp, LOCK_UN)) {
-            return PEAR::raiseError("Cacnnot unlock file: $filename");
-        }
-
-        return true;
-    }
-
-    /**
-     * @deprecated
-     */
-    function stripTrailingSeparators($path, $separator = DIRECTORY_SEPARATOR)
-    {
-        if ($path === $separator) {
-            return $path;
-        }
-        return rtrim($path, $separator);
-    }
-
-    /**
-     * @deprecated
-     */
-    function stripLeadingSeparators($path, $separator = DIRECTORY_SEPARATOR)
-    {
-        if ($path === $separator) {
-            return $path;
-        }
-        return ltrim($path, $separator);
-    }
-
-    /**
-     * @deprecated Use File_Util::buildPath() instead.
-     */
-    function buildPath($parts, $separator = DIRECTORY_SEPARATOR)
-    {
-        require_once 'File/Util.php';
-        return File_Util::buildPath($parts, $separator);
-    }
-
-    /**
-     * @deprecated Use File_Util::skipRoot() instead.
-     */
-    function skipRoot($path)
-    {
-        require_once 'File/Util.php';
-        return File_Util::skipRoot($path);
-    }
-
-    /**
-     * @deprecated Use File_Util::tmpDir() instead.
-     */
-    function getTempDir()
-    {
-        require_once 'File/Util.php';
-        return File_Util::tmpDir();
-    }
-
-    /**
-     * @deprecated Use File_Util::tmpFile() instead.
-     */
-    function getTempFile($dirname = null)
-    {
-        require_once 'File/Util.php';
-        return File_Util::tmpFile($dirname);
-    }
-
-    /**
-     * @deprecated Use File_Util::isAbsolute() instead.
-     */
-    function isAbsolute($path)
-    {
-        require_once 'File/Util.php';
-        return File_Util::isAbsolute($path);
-    }
-
-    /**
-     * @deprecated Use File_Util::relativePath() instead.
-     */
-    function relativePath($path, $root, $separator = DIRECTORY_SEPARATOR)
-    {
-        require_once 'File/Util.php';
-        return File_Util::relativePath($path, $root, $separator);
-    }
-
-    /**
-     * @deprecated Use File_Util::realpath() instead.
-     */
-    function realpath($path, $separator = DIRECTORY_SEPARATOR)
-    {
-        require_once 'File/Util.php';
-        return File_Util::realpath($path, $separator);
-    }
-}
-
-PEAR::registerShutdownFunc(array('File', '_File'));
-
-?>
diff --git a/airtime_mvc/library/pear/File/CSV.php b/airtime_mvc/library/pear/File/CSV.php
deleted file mode 100644
index a4c5141c9..000000000
--- a/airtime_mvc/library/pear/File/CSV.php
+++ /dev/null
@@ -1,628 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * File::CSV
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    File
- * @package     File
- * @author      Tomas V.V.Cox <cox@idecnet.com>
- * @author      Helgi Þormar <dufuz@php.net>
- * @copyright   2004-2005 The Authors
- * @license     http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version     CVS: $Id: CSV.php,v 1.41 2007/05/20 12:25:14 dufuz Exp $
- * @link        http://pear.php.net/package/File
- */
-
-require_once 'PEAR.php';
-require_once 'File.php';
-
-/**
-* File class for handling CSV files (Comma Separated Values), a common format
-* for exchanging data.
-*
-* TODO:
-*  - Usage example and Doc
-*  - Use getPointer() in discoverFormat
-*  - Add a line counter for being able to output better error reports
-*  - Store the last error in GLOBALS and add File_CSV::getLastError()
-*
-* Wish:
-*  - Other methods like readAll(), writeAll(), numFields(), numRows()
-*  - Try to detect if a CSV has header or not in discoverFormat() (not possible with CSV)
-*
-* Known Bugs:
-* (they has been analyzed but for the moment the impact in the speed for
-*  properly handle this uncommon cases is too high and won't be supported)
-*  - A field which is composed only by a single quoted separator (ie -> ;";";)
-*    is not handled properly
-*  - When there is exactly one field minus than the expected number and there
-*    is a field with a separator inside, the parser will throw the "wrong count" error
-*
-* Info about CSV and links to other sources
-* http://www.shaftek.org/publications/drafts/mime-csv/draft-shafranovich-mime-csv-00.html#appendix
-*
-* @author Tomas V.V.Cox <cox@idecnet.com>
-* @author Helgi Þormar <dufuz@php.net>
-* @package File
-*/
-class File_CSV
-{
-    /**
-    * This raiseError method works in a different way. It will always return
-    * false (an error occurred) but it will call PEAR::raiseError() before
-    * it. If no default PEAR global handler is set, will trigger an error.
-    *
-    * @param string $error The error message
-    * @return bool always false
-    */
-    function raiseError($error)
-    {
-        // If a default PEAR Error handler is not set trigger the error
-        // XXX Add a PEAR::isSetHandler() method?
-        if ($GLOBALS['_PEAR_default_error_mode'] == PEAR_ERROR_RETURN) {
-            PEAR::raiseError($error, null, PEAR_ERROR_TRIGGER, E_USER_WARNING);
-        } else {
-            PEAR::raiseError($error);
-        }
-        return false;
-    }
-
-    /**
-    * Checks the configuration given by the user
-    *
-    * @access private
-    * @param string &$error The error will be written here if any
-    * @param array  &$conf  The configuration assoc array
-    * @return string error    Returns a error message
-    */
-    function _conf(&$error, &$conf)
-    {
-        // check conf
-        if (!is_array($conf)) {
-            return $error = 'Invalid configuration';
-        }
-
-        if (!isset($conf['fields']) || !(int)$conf['fields']) {
-            return $error = 'The number of fields must be numeric (the "fields" key)';
-        }
-
-        if (isset($conf['sep'])) {
-            if (strlen($conf['sep']) != 1) {
-                return $error = 'Separator can only be one char';
-            }
-        } elseif ($conf['fields'] > 1) {
-            return $error = 'Missing separator (the "sep" key)';
-        }
-
-        if (isset($conf['quote'])) {
-            if (strlen($conf['quote']) != 1) {
-                return $error = 'The quote char must be one char (the "quote" key)';
-            }
-        } else {
-            $conf['quote'] = null;
-        }
-
-        if (!isset($conf['crlf'])) {
-            $conf['crlf'] = "\n";
-        }
-
-        if (!isset($conf['eol2unix'])) {
-            $conf['eol2unix'] = true;
-        }
-    }
-
-    /**
-    * Return or create the file descriptor associated with a file
-    *
-    * @param string $file The name of the file
-    * @param array  &$conf The configuration
-    * @param string $mode The open node (ex: FILE_MODE_READ or FILE_MODE_WRITE)
-    * @param boolean $reset if passed as true and resource for the file exists
-    *                       than the file pointer will be moved to the beginning
-    *
-    * @return mixed A file resource or false
-    */
-    function getPointer($file, &$conf, $mode = FILE_MODE_READ, $reset = false)
-    {
-        static $resources = array();
-        static $config;
-        if (isset($resources[$file][$mode])) {
-            $conf = $config;
-            if ($reset) {
-                fseek($resources[$file][$mode], 0);
-            }
-            return $resources[$file][$mode];
-        }
-        File_CSV::_conf($error, $conf);
-        if ($error) {
-            return File_CSV::raiseError($error);
-        }
-        $config = $conf;
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $fp = File::_getFilePointer($file, $mode);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($fp)) {
-            return File_CSV::raiseError($fp);
-        }
-        $resources[$file][$mode] = $fp;
-        return $fp;
-    }
-
-    /**
-    * Unquote data
-    *
-    * @param string $field The data to unquote
-    * @param string $quote The quote char
-    * @return string the unquoted data
-    */
-    function unquote($field, $quote)
-    {
-        // Trim first the string.
-        $field = trim($field);
-        $quote = trim($quote);
-
-        // Incase null fields (form: ;;)
-        if (!strlen($field)) {
-            return $field;
-        }
-
-        // excel compat
-        if ($field[0] == '=' && $field[1] == '"') {
-            $field = str_replace('="', '"', $field);
-        }
-
-        $field_len = strlen($field);
-        if ($quote && $field[0] == $quote && $field[$field_len - 1] == $quote) {
-            // Get rid of escaping quotes
-            $new = $prev = $c = '';
-            for ($i = 0; $i < $field_len; ++$i) {
-                $prev = $c;
-                $c = $field[$i];
-                // Deal with escaping quotes
-                if ($c == $quote && $prev == $quote) {
-                    $c = '';
-                }
-
-                $new .= $c;
-            }
-            $field = substr($new, 1, -1);
-        }
-
-        return $field;
-    }
-
-    /**
-    * Reads a row of data as an array from a CSV file. It's able to
-    * read memo fields with multiline data.
-    *
-    * @param string $file   The filename where to write the data
-    * @param array  &$conf   The configuration of the dest CSV
-    *
-    * @return mixed Array with the data read or false on error/no more data
-    */
-    function readQuoted($file, &$conf)
-    {
-        if (!$fp = File_CSV::getPointer($file, $conf, FILE_MODE_READ)) {
-            return false;
-        }
-
-        $buff = $old = $prev = $c = '';
-        $ret  = array();
-        $i = 1;
-        $in_quote = false;
-        $quote = $conf['quote'];
-        $f     = $conf['fields'];
-        $sep   = $conf['sep'];
-        while (false !== $ch = fgetc($fp)) {
-            $old  = $prev;
-            $prev = $c;
-            $c    = $ch;
-
-            // Common case
-            if ($c != $quote && $c != $sep && $c != "\n" && $c != "\r") {
-                $buff .= $c;
-                continue;
-            }
-
-            // Start quote.
-            if (
-                $in_quote === false &&
-                $quote && $c == $quote &&
-                (
-                 $prev == $sep || $prev == "\n" || $prev === null ||
-                 $prev == "\r" || $prev == '' || $prev == ' '
-                 || $prev == '=' //excel compat
-                )
-            ) {
-                $in_quote = true;
-                // excel compat, removing the = part but only if we are in a quote
-                if ($prev == '=') {
-                    $buff{strlen($buff) - 1} = '';
-                }
-            }
-
-            if ($in_quote) {
-
-                // When does the quote end, make sure it's not double quoted
-                if ($c == $sep && $prev == $quote && $old != $quote) {
-                    $in_quote = false;
-                } elseif ($c == $sep && $buff == $quote.$quote) {
-                    // In case we are dealing with double quote but empty value
-                    $in_quote = false;
-                } elseif ($c == "\n" || $c == "\r") {
-                    $sub = ($prev == "\r") ? 2 : 1;
-                    $buff_len = strlen($buff);
-                    if (
-                        $buff_len >= $sub &&
-                        $buff[$buff_len - $sub] == $quote
-                    ) {
-                        $in_quote = false;
-                    }
-                }
-            }
-
-            if (!$in_quote && ($c == $sep || $c == "\n" || $c == "\r") && $prev != '') {
-                // More fields than expected
-                if ($c == $sep && (count($ret) + 1) == $f) {
-                    // Seek the pointer into linebreak character.
-                    while (true) {
-                        $c = fgetc($fp);
-                        if  ($c == "\n" || $c == "\r" || $c == '') {
-                            break;
-                        }
-                    }
-
-                    // Insert last field value.
-                    $ret[] = File_CSV::unquote($buff, $quote);
-                    return $ret;
-                }
-
-                // Less fields than expected
-                if (($c == "\n" || $c == "\r") && $i != $f) {
-                    // Insert last field value.
-                    $ret[] = File_CSV::unquote($buff, $quote);
-                    if (count($ret) == 1 && empty($ret[0])) {
-                        return array();
-                    }
-
-                    // Pair the array elements to fields count. - inserting empty values
-                    $ret_count = count($ret);
-                    $sum = ($f - 1) - ($ret_count - 1);
-                    $data = array_merge($ret, array_fill($ret_count, $sum, ''));
-                    return $data;
-                }
-
-                if ($prev == "\r") {
-                    $buff = substr($buff, 0, -1);
-                }
-
-                // Convert EOL character to Unix EOL (LF).
-                if ($conf['eol2unix']) {
-                    $buff = preg_replace('/(\r\n|\r)$/', "\n", $buff);
-                }
-
-                $ret[] = File_CSV::unquote($buff, $quote);
-                if (count($ret) == $f) {
-                    return $ret;
-                }
-                $buff = '';
-                ++$i;
-                continue;
-            }
-            $buff .= $c;
-        }
-
-        /* If it's the end of the file and we still have something in buffer
-         * then we process it since files can have no CL/FR at the end
-         */
-        $feof = feof($fp);
-        if ($feof && !in_array($buff, array("\r", "\n", "\r\n")) && strlen($buff) > 0) {
-            $ret[] = File_CSV::unquote($buff, $quote);
-            if (count($ret) == $f) {
-                return $ret;
-            }
-        }
-
-        return !$feof ? $ret : false;
-    }
-
-    /**
-    * Reads a "row" from a CSV file and return it as an array
-    *
-    * @param string $file The CSV file
-    * @param array  &$conf The configuration of the dest CSV
-    *
-    * @return mixed Array or false
-    */
-    function read($file, &$conf)
-    {
-        static $headers = array();
-        if (!$fp = File_CSV::getPointer($file, $conf, FILE_MODE_READ)) {
-            return false;
-        }
-
-        // The size is limited to 4K
-        if (!$line = fgets($fp, 4096)) {
-            return false;
-        }
-
-        $fields = $conf['fields'] == 1 ? array($line) : explode($conf['sep'], $line);
-
-        $nl = array("\n", "\r", "\r\n");
-        if (in_array($fields[count($fields) - 1], $nl)) {
-            array_pop($fields);
-        }
-
-        $field_count = count($fields);
-        $last =& $fields[$field_count - 1];
-        $len = strlen($last);
-        if (
-            $field_count != $conf['fields'] ||
-            $conf['quote'] &&
-            (
-             $len !== 0 && $last[$len - 1] == "\n"
-             &&
-                (
-                    ($last[0] == $conf['quote']
-                    && $last[strlen(rtrim($last)) - 1] != $conf['quote'])
-                    ||
-                    // excel support
-                    ($last[0] == '=' && $last[1] == $conf['quote'])
-                    ||
-                    // if the row has spaces before the quote
-                    preg_match('|^\s+'.preg_quote($conf['quote']) .'|Ums', $last, $match)
-                )
-            )
-            // XXX perhaps there is a separator inside a quoted field
-            //preg_match("|{$conf['quote']}.*{$conf['sep']}.*{$conf['quote']}|U", $line)
-        ) {
-            fseek($fp, -1 * strlen($line), SEEK_CUR);
-            return File_CSV::readQuoted($file, $conf);
-        } else {
-            foreach ($fields as $k => $v) {
-                $fields[$k] = File_CSV::unquote($v, $conf['quote']);
-            }
-        }
-
-        if (isset($conf['header']) && empty($headers)) {
-            // read the first row and assign to $headers
-            $headers = $fields;
-            return $headers;
-        }
-
-        if ($field_count != $conf['fields']) {
-            File_CSV::raiseError("Read wrong fields number count: '". $field_count .
-                                  "' expected ".$conf['fields']);
-            return true;
-        }
-
-        if (!empty($headers)) {
-            $tmp = array();
-            foreach ($fields as $k => $v) {
-                $tmp[$headers[$k]] = $v;
-            }
-            $fields = $tmp;
-        }
-
-        return $fields;
-    }
-
-    /**
-    * Internal use only, will be removed in the future
-    *
-    * @param string $str The string to debug
-    * @access private
-    */
-    function _dbgBuff($str)
-    {
-        if (strpos($str, "\r") !== false) {
-            $str = str_replace("\r", "_r_", $str);
-        }
-        if (strpos($str, "\n") !== false) {
-            $str = str_replace("\n", "_n_", $str);
-        }
-        if (strpos($str, "\t") !== false) {
-            $str = str_replace("\t", "_t_", $str);
-        }
-        if ($str === null) {
-            $str = '_NULL_';
-        }
-        if ($str === '') {
-            $str = 'Empty string';
-        }
-        echo "buff: ($str)\n";
-    }
-
-    /**
-    * Writes a struc (array) in a file as CSV
-    *
-    * @param string $file   The filename where to write the data
-    * @param array  $fields Ordered array with the data
-    * @param array  &$conf   The configuration of the dest CSV
-    *
-    * @return bool True on success false otherwise
-    */
-    function write($file, $fields, &$conf)
-    {
-        if (!$fp = File_CSV::getPointer($file, $conf, FILE_MODE_WRITE)) {
-            return false;
-        }
-
-        $field_count = count($fields);
-        if ($field_count != $conf['fields']) {
-            File_CSV::raiseError("Wrong fields number count: '". $field_count .
-                                  "' expected ".$conf['fields']);
-            return true;
-        }
-
-        $write = '';
-        for ($i = 0; $i < $field_count; ++$i) {
-            // only quote if the field contains a sep
-            if (!is_numeric($fields[$i]) && $conf['quote']
-                && isset($conf['sep']) && strpos($fields[$i], $conf['sep'])
-            ) {
-                $write .= $conf['quote'] . $fields[$i] . $conf['quote'];
-            } else {
-                $write .= $fields[$i];
-            }
-
-            $write .= ($i < ($field_count - 1)) ? $conf['sep']: $conf['crlf'];
-        }
-
-        if (!fwrite($fp, $write, strlen($write))) {
-            return File_CSV::raiseError('Can not write to file');
-        }
-
-        return true;
-    }
-
-    /**
-    * Discover the format of a CSV file (the number of fields, the separator
-    * and if it quote string fields)
-    *
-    * @param string the CSV file name
-    * @param array extra separators that should be checked for.
-    * @return mixed Assoc array or false
-    */
-    function discoverFormat($file, $extraSeps = array())
-    {
-        if (!$fp = @fopen($file, 'rb')) {
-            return File_CSV::raiseError("Could not open file: $file");
-        }
-
-        // Set auto detect line ending for Mac EOL support
-        $oldini = ini_get('auto_detect_line_endings');
-        if ($oldini != '1') {
-            ini_set('auto_detect_line_endings', '1');
-        }
-
-        // Take the first 30 lines and store the number of ocurrences
-        // for each separator in each line
-        $lines = '';
-        for ($i = 0; $i < 30 && $line = fgets($fp, 4096); $i++) {
-            $lines .= $line;
-        }
-        fclose($fp);
-
-        if ($oldini != '1') {
-            ini_set('auto_detect_line_endings', $oldini);
-        }
-
-        $seps = array("\t", ';', ':', ',');
-        $seps = array_merge($seps, $extraSeps);
-        $matches = array();
-        $quotes = '"\'';
-        
-	    $lines = str_replace('""', '', $lines);
-        while ($lines != ($newLines = preg_replace('|((["\'])[^"]*(\2))|', '\2_\2', $lines))){
-            $lines = $newLines;
-        }
-
-        $eol   = strpos($lines, "\r") ? "\r" : "\n";
-        $lines = explode($eol, $lines);
-        foreach ($lines as $line) {
-            $orgLine = $line;
-            foreach ($seps as $sep) {
-                $line = preg_replace("|^[^$quotes$sep]*$sep*([$quotes][^$quotes]*[$quotes])|sm", '_', $orgLine);
-                // Find all seps that are within qoutes
-                ///FIXME ... counts legitimit lines as bad ones
-
-                 // In case there's a whitespace infront the field
-                $regex = '|\s*?';
-                 // Match the first quote (optional), also optionally match = since it's excel stuff
-                $regex.= "(?:\=?[$quotes])";
-                $regex.= '(.*';
-                // Don't match a sep if we are inside a quote
-                // also don't accept the sep if it has a quote on the either side
-                ///FIXME has to be possible if we are inside a quote! (tests fail because of this)
-                $regex.= "(?:[^$quotes])$sep(?:[^$quotes])";
-                $regex.= '.*)';
-                // Close quote (if it's present) and the sep (optional, could be end of line)
-                $regex.= "(?:[$quotes](?:$sep?))|Ums";
-                preg_match_all($regex, $line, $match);
-                // Finding all seps, within quotes or not
-                $sep_count = substr_count($line, $sep);
-                // Real count
-                $matches[$sep][] = $sep_count - count($match[0]);
-            }
-        }
-
-        $final = array();
-        // Group the results by amount of equal ocurrences
-        foreach ($matches as $sep => $res) {
-            $times = array();
-            $times[0] = 0;
-            foreach ($res as $k => $num) {
-                if ($num > 0) {
-                    $times[$num] = (isset($times[$num])) ? $times[$num] + 1 : 1;
-                }
-            }
-            arsort($times);
-
-            // Use max fields count.
-            $fields[$sep] = max(array_flip($times));
-            $amount[$sep] = $times[key($times)];
-        }
-
-        arsort($amount);
-        $sep = key($amount);
-
-        $conf['fields'] = $fields[$sep] + 1;
-        $conf['sep']    = $sep;
-
-        // Test if there are fields with quotes around in the first 30 lines
-        $quote  = null;
-
-        $string = implode('', $lines);
-        foreach (array('"', '\'') as $q) {
-            if (preg_match_all("|$sep(?:\s*?)(\=?[$q]).*([$q])$sep|Us", $string, $match)) {
-                if ($match[1][0] == $match[2][0]) {
-                    $quote = $match[1][0];
-                    break;
-                }
-            }
-
-            if (
-                preg_match_all("|^(\=?[$q]).*([$q])$sep{0,1}|Ums", $string, $match)
-                || preg_match_all("|(\=?[$q]).*([$q])$sep\s$|Ums", $string, $match)
-            ) {
-                if ($match[1][0] == $match[2][0]) {
-                    $quote = $match[1][0];
-                    break;
-                }
-            }
-        }
-
-        $conf['quote'] = $quote;
-        return $conf;
-    }
-
-    /**
-     * Front to call getPointer and moving the resource to the
-     * beginning of the file
-     * Reset it if you like.
-     *
-     * @param string $file The name of the file
-     * @param array  &$conf The configuration
-     * @param string $mode The open node (ex: FILE_MODE_READ or FILE_MODE_WRITE)
-     *
-     * @return boolean true on success false on failure
-     */
-    function resetPointer($file, &$conf, $mode)
-    {
-        if (!File_CSV::getPointer($file, $conf, $mode, true)) {
-            return false;
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/File/Find.php b/airtime_mvc/library/pear/File/Find.php
deleted file mode 100644
index df99baa22..000000000
--- a/airtime_mvc/library/pear/File/Find.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2005 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Sterling Hughes <sterling@php.net>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Find.php,v 1.27 2006/06/30 14:06:16 techtonik Exp $
-//
-
-require_once 'PEAR.php';
-
-define('FILE_FIND_VERSION', '@package_version@');
-
-// to debug uncomment this string
-// define('FILE_FIND_DEBUG', '');
-
-/**
-*  Commonly needed functions searching directory trees
-*
-* @access public
-* @version $Id: Find.php,v 1.27 2006/06/30 14:06:16 techtonik Exp $
-* @package File
-* @author Sterling Hughes <sterling@php.net>
-*/
-class File_Find
-{
-    /**
-     * internal dir-list
-     * @var array
-     */
-    var $_dirs = array();
-
-    /**
-     * directory separator
-     * @var string
-     */
-    var $dirsep = "/";
-
-    /**
-     * found files
-     * @var array
-     */
-    var $files = array();
-
-    /**
-     * found dirs
-     * @var array
-     */
-    var $directories = array();
-
-    /**
-     * Search specified directory to find matches for specified pattern
-     *
-     * @param string $pattern a string containing the pattern to search
-     * the directory for.
-     *
-     * @param string $dirpath a string containing the directory path
-     * to search.
-     *
-     * @param string $pattern_type a string containing the type of
-     * pattern matching functions to use (can either be 'php',
-     * 'perl' or 'shell').
-     *
-     * @return array containing all of the files and directories
-     * matching the pattern or null if no matches
-     *
-     * @author Sterling Hughes <sterling@php.net>
-     * @access public
-     * @static
-     */
-    function &glob($pattern, $dirpath, $pattern_type = 'php')
-    {
-        $dh = @opendir($dirpath);
-
-        if (!$dh) {
-            $pe = PEAR::raiseError("Cannot open directory $dirpath");
-            return $pe;
-        }
-
-        $match_function = File_Find::_determineRegex($pattern, $pattern_type);
-        $matches = array();
-
-        // empty string cannot be specified for 'php' and 'perl' pattern
-        if ($pattern || ($pattern_type != 'php' && $pattern_type != 'perl')) {
-            while (false !== ($entry = @readdir($dh))) {
-                if ($match_function($pattern, $entry) &&
-                    $entry != '.' && $entry != '..') {
-                    $matches[] = $entry;
-                }
-            }
-        }
-
-        @closedir($dh);
-
-        if (0 == count($matches)) {
-            $matches = null;
-        }
-
-        return $matches ;
-    }
-
-    /**
-     * Map the directory tree given by the directory_path parameter.
-     *
-     * @param string $directory contains the directory path that you
-     * want to map.
-     *
-     * @return array a two element array, the first element containing a list
-     * of all the directories, the second element containing a list of all the
-     * files.
-     *
-     * @author Sterling Hughes <sterling@php.net>
-     * @access public
-     */
-    function &maptree($directory)
-    {
-
-        /* if called statically */
-        if (!isset($this)  || !is_a($this, "File_Find")) {
-            $obj = &new File_Find();
-            return $obj->maptree($directory);
-        }
-      
-        /* clear the results just in case */
-        $this->files       = array();
-        $this->directories = array();
-
-        /* strip out trailing slashes */
-        $directory = preg_replace('![\\\\/]+$!', '', $directory);
-
-        $this->_dirs = array($directory);
-
-        while (count($this->_dirs)) {
-            $dir = array_pop($this->_dirs);
-            File_Find::_build($dir, $this->dirsep);
-            array_push($this->directories, $dir);
-        }
-
-        $retval = array($this->directories, $this->files);
-        return $retval;
-
-    }
-
-    /**
-     * Map the directory tree given by the directory parameter.
-     *
-     * @param string $directory contains the directory path that you
-     * want to map.
-     * @param integer $maxrecursion maximun number of folders to recursive 
-     * map
-     *
-     * @return array a multidimensional array containing all subdirectories
-     * and their files. For example:
-     *
-     * Array
-     * (
-     *    [0] => file_1.php
-     *    [1] => file_2.php
-     *    [subdirname] => Array
-     *       (
-     *          [0] => file_1.php
-     *       )
-     * )
-     *
-     * @author Mika Tuupola <tuupola@appelsiini.net>
-     * @access public
-     * @static
-     */
-    function &mapTreeMultiple($directory, $maxrecursion = 0, $count = 0)
-    {   
-        $retval = array();
-
-        $count++;
-
-        /* strip trailing slashes */
-        $directory = preg_replace('![\\\\/]+$!', '', $directory);
-        
-        if (is_readable($directory)) {
-            $dh = opendir($directory);
-            while (false !== ($entry = @readdir($dh))) {
-                if ($entry != '.' && $entry != '..') {
-                     array_push($retval, $entry);
-                }
-            }
-            closedir($dh);
-        }
-     
-        while (list($key, $val) = each($retval)) {
-            $path = $directory . "/" . $val;
-      
-            if (!is_array($val) && is_dir($path)) {
-                unset($retval[$key]);
-                if ($maxrecursion == 0 || $count < $maxrecursion) {
-                    $retval[$val] = &File_Find::mapTreeMultiple($path, 
-                                    $maxrecursion, $count);
-                }
-            }
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Search the specified directory tree with the specified pattern.  Return
-     * an array containing all matching files (no directories included).
-     *
-     * @param string $pattern the pattern to match every file with.
-     *
-     * @param string $directory the directory tree to search in.
-     *
-     * @param string $type the type of regular expression support to use, either
-     * 'php', 'perl' or 'shell'.
-     *
-     * @param bool $fullpath whether the regex should be matched against the
-     * full path or only against the filename
-     *
-     * @param string $match can be either 'files', 'dirs' or 'both' to specify
-     * the kind of list to return
-     *
-     * @return array a list of files matching the pattern parameter in the the
-     * directory path specified by the directory parameter
-     *
-     * @author Sterling Hughes <sterling@php.net>
-     * @access public
-     * @static
-     */
-    function &search($pattern, $directory, $type = 'php', $fullpath = true, $match = 'files')
-    {
-
-        $matches = array();
-        list ($directories,$files)  = File_Find::maptree($directory);
-        switch($match) {
-            case 'directories': 
-                $data = $directories; 
-                break;
-            case 'both': 
-                $data = array_merge($directories, $files); 
-                break;
-            case 'files':
-            default:
-                $data = $files;
-        }
-        unset($files, $directories);
-
-        $match_function = File_Find::_determineRegex($pattern, $type);
-
-        reset($data);
-        // check if empty string given (ok for 'shell' method, but bad for others)
-        if ($pattern || ($type != 'php' && $type != 'perl')) {
-            while (list(,$entry) = each($data)) {
-                if ($match_function($pattern, 
-                                    $fullpath ? $entry : basename($entry))) {
-                    $matches[] = $entry;
-                } 
-            }
-        }
-
-        return $matches;
-    }
-
-    /**
-     * Determine whether or not a variable is a PEAR error
-     *
-     * @param object PEAR_Error $var the variable to test.
-     *
-     * @return boolean returns true if the variable is a PEAR error, otherwise
-     * it returns false.
-     * @access public
-     */
-    function isError(&$var)
-    {
-        return PEAR::isError($var);
-    }
-
-    /**
-     * internal function to build singular directory trees, used by
-     * File_Find::maptree()
-     *
-     * @param string $directory name of the directory to read
-     * @param string $separator directory separator
-     * @return void
-     */
-    function _build($directory, $separator = "/")
-    {
-
-        $dh = @opendir($directory);
-
-        if (!$dh) {
-            $pe = PEAR::raiseError("Cannot open directory");
-            return $pe;
-        }
-
-        while (false !== ($entry = @readdir($dh))) {
-            if ($entry != '.' && $entry != '..') {
-
-                $entry = $directory.$separator.$entry;
-
-                if (is_dir($entry)) {
-                    array_push($this->_dirs, $entry);
-                } else {
-                    array_push($this->files, $entry);
-                }
-            }
-        }
-
-        @closedir($dh);
-    }
-
-    /**
-     * internal function to determine the type of regular expression to
-     * use, implemented by File_Find::glob() and File_Find::search()
-     *
-     * @param string $type given RegExp type
-     * @return string kind of function ( "eregi", "ereg" or "preg_match") ;
-     *
-     */
-    function _determineRegex($pattern, $type)
-    {
-        if (!strcasecmp($type, 'shell')) {
-            $match_function = 'File_Find_match_shell';
-        } else if (!strcasecmp($type, 'perl')) {
-            $match_function = 'preg_match';
-        } else if (!strcasecmp(substr($pattern, -2), '/i')) {
-            $match_function = 'eregi';
-        } else {
-            $match_function = 'ereg';
-        }
-        return $match_function;
-    }
-
-}
-
-/**
-* Package method to match via 'shell' pattern. Provided in global
-* scope, because it should be called like 'preg_match' and 'eregi'
-* and can be easily copied into other packages
-*
-* @author techtonik <techtonik@php.net>
-* @return mixed bool on success and PEAR_Error on failure
-*/ 
-function File_Find_match_shell($pattern, $filename)
-{
-    // {{{ convert pattern to positive and negative regexps
-        $positive = $pattern;
-        $negation = substr_count($pattern, "|");
-
-        if ($negation > 1) {
-            PEAR::raiseError("Mask string contains errors!");
-            return FALSE;
-        } elseif ($negation) {
-            list($positive, $negative) = explode("|", $pattern);
-            if (strlen($negative) == 0) {
-                PEAR::raiseError("File-mask string contains errors!");
-                return FALSE;
-            }
-        }
-
-       $positive = _File_Find_match_shell_get_pattern($positive);
-       if ($negation) {
-           $negative = _File_Find_match_shell_get_pattern($negative);
-       }
-    // }}} convert end 
-
-
-    if (defined("FILE_FIND_DEBUG")) {
-        print("Method: $type\nPattern: $pattern\n Converted pattern:");
-        print_r($positive);
-        if (isset($negative)) print_r($negative);
-    }
-
-    if (!preg_match($positive, $filename)) {
-        return FALSE;
-    } else {
-        if (isset($negative) 
-              && preg_match($negative, $filename)) {
-            return FALSE;
-        } else {
-            return TRUE;
-        }
-    }
-}
-
-/**
-* function used by File_Find_match_shell to convert 'shell' mask
-* into pcre regexp. Some of the rules (see testcases for more): 
-*  escaping all special chars and replacing 
-*    . with \.
-*    * with .*
-*    ? with .{1}
-*    also adding ^ and $ as the pattern matches whole filename
-*
-* @author techtonik <techtonik@php.net>
-* @return string pcre regexp for preg_match
-*/ 
-function _File_Find_match_shell_get_pattern($mask) {
-    // get array of several masks (if any) delimited by comma
-    // do not touch commas in char class
-    $premasks = preg_split("|(\[[^\]]+\])|", $mask, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nPremask: ");
-        print_r($premasks);
-    }
-    $pi = 0;
-    foreach($premasks as $pm) {
-        if (!isset($masks[$pi])) $masks[$pi] = "";
-        if ($pm{0} == '[' && $pm{strlen($pm)-1} == ']') {
-            // strip commas from character class
-            $masks[$pi] .= str_replace(",", "", $pm);
-        } else {
-            $tarr = explode(",", $pm);
-            if (sizeof($tarr) == 1) {
-                $masks[$pi] .= $pm;
-            } else {
-                foreach ($tarr as $te) {
-                    $masks[$pi++] .= $te;
-                    $masks[$pi] = "";
-                }
-                unset($masks[$pi--]);
-            }
-        }
-    }
-
-    // if empty string given return *.* pattern
-    if (strlen($mask) == 0) return "!^.*$!";
-
-    // convert to preg regexp
-    $regexmask = implode("|", $masks);
-    if (defined("FILE_FIND_DEBUG")) {
-        print("regexMask step one(implode): $regexmask");
-    }
-    $regexmask = addcslashes($regexmask, '^$}!{)(\/.+');
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nregexMask step two(addcslashes): $regexmask");
-    }
-    $regexmask = preg_replace("!(\*|\?)!", ".$1", $regexmask);
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nregexMask step three(* ? -> .* .?): $regexmask");
-    }
-    // a special case '*.' at the end means that there is no extension
-    $regexmask = preg_replace("!\.\*\\\.(\||$)!", "[^\.]*$1", $regexmask);
-    // it is impossible to have dot at the end of filename
-    $regexmask = preg_replace("!\\\.(\||$)!", "$1", $regexmask);
-    // and .* at the end also means that there could be nothing at all
-    //   (i.e. no dot at the end also)
-    $regexmask = preg_replace("!\\\.\.\*(\||$)!", "(\\\\..*)?$1", $regexmask);
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nregexMask step two and half(*.$ \\..*$ .$ -> [^.]*$ .?.* $): $regexmask");
-    }
-    // if no extension supplied - add .* to match partially from filename start
-    if (strpos($regexmask, "\\.") === FALSE) $regexmask .= ".*";
-
-    // file mask match whole name - adding restrictions
-    $regexmask = preg_replace("!(\|)!", '^'."$1".'$', $regexmask);
-    $regexmask = '^'.$regexmask.'$';
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nregexMask step three(^ and $ to match whole name): $regexmask");
-    }
-    // wrap regex into ! since all ! are already escaped
-    $regexmask = "!$regexmask!i";
-    if (defined("FILE_FIND_DEBUG")) {
-        print("\nWrapped regex: $regexmask\n");
-    }
-    return $regexmask;
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/File/Util.php b/airtime_mvc/library/pear/File/Util.php
deleted file mode 100644
index 92de5bed0..000000000
--- a/airtime_mvc/library/pear/File/Util.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * File::Util
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    File
- * @package     File
- * @author      Michael Wallner <mike@php.net>
- * @copyright   2004-2005 Michael Wallner
- * @license     http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version     CVS: $Id: Util.php,v 1.25 2007/02/20 14:19:08 mike Exp $
- * @link        http://pear.php.net/package/File
- */
-
-/**#@+
- * Sorting Constants
- */
-define('FILE_SORT_NONE',    0);
-define('FILE_SORT_REVERSE', 1);
-define('FILE_SORT_NAME',    2);
-define('FILE_SORT_SIZE',    4);
-define('FILE_SORT_DATE',    8);
-define('FILE_SORT_RANDOM',  16);
-/**#@-*/
-
-/**#@+
- * Listing Constants
- */
-define('FILE_LIST_FILES',   1);
-define('FILE_LIST_DIRS',    2);
-define('FILE_LIST_DOTS',    4);
-define('FILE_LIST_ALL',     FILE_LIST_FILES | FILE_LIST_DIRS | FILE_LIST_DOTS);
-/**#@-*/
-
-/**
- * @ignore
- */
-define('FILE_WIN32', defined('OS_WINDOWS') ? OS_WINDOWS : !strncasecmp(PHP_OS, 'win', 3));
-
-/**
- * File_Util
- *
- * File and directory utility functions.
- *
- * @access  public
- * @static
- */
-class File_Util
-{
-    /**
-     * Returns a string path built from the array $pathParts. Where a join
-     * occurs multiple separators are removed. Joins using the optional
-     * separator, defaulting to the PHP DIRECTORY_SEPARATOR constant.
-     *
-     * @static
-     * @access  public
-     * @param   array   $parts Array containing the parts to be joined
-     * @param   string  $separator The directory seperator
-     */
-    function buildPath($parts, $separator = DIRECTORY_SEPARATOR)
-    {
-        $qs = '/^'. preg_quote($separator, '/') .'+$/';
-        for ($i = 0, $c = count($parts); $i < $c; $i++) {
-            if (!strlen($parts[$i]) || preg_match($qs, $parts[$i])) {
-                unset($parts[$i]);
-            } elseif (0 == $i) {
-                $parts[$i] = rtrim($parts[$i], $separator);
-            } elseif ($c - 1 == $i) {
-                $parts[$i] = ltrim($parts[$i], $separator);
-            } else {
-                $parts[$i] = trim($parts[$i], $separator);
-            }
-        }
-        return implode($separator, $parts);
-    }
-
-    /**
-     * Returns a path without leading / or C:\. If this is not
-     * present the path is returned as is.
-     *
-     * @static
-     * @access  public
-     * @param   string  $path The path to be processed
-     * @return  string  The processed path or the path as is
-     */
-    function skipRoot($path)
-    {
-        if (File_Util::isAbsolute($path)) {
-            if (FILE_WIN32) {
-                return substr($path, $path{3} == '\\' ? 4 : 3);
-            }
-            return ltrim($path, '/');
-        }
-        return $path;
-    }
-
-    /**
-     * Returns the temp directory according to either the TMP, TMPDIR, or
-     * TEMP env variables. If these are not set it will also check for the
-     * existence of /tmp, %WINDIR%\temp
-     *
-     * @static
-     * @access  public
-     * @return  string  The system tmp directory
-     */
-    function tmpDir()
-    {
-        if (FILE_WIN32) {
-            if (isset($_ENV['TEMP'])) {
-                return $_ENV['TEMP'];
-            }
-            if (isset($_ENV['TMP'])) {
-                return $_ENV['TMP'];
-            }
-            if (isset($_ENV['windir'])) {
-                return $_ENV['windir'] . '\\temp';
-            }
-            if (isset($_ENV['SystemRoot'])) {
-                return $_ENV['SystemRoot'] . '\\temp';
-            }
-            if (isset($_SERVER['TEMP'])) {
-                return $_SERVER['TEMP'];
-            }
-            if (isset($_SERVER['TMP'])) {
-                return $_SERVER['TMP'];
-            }
-            if (isset($_SERVER['windir'])) {
-                return $_SERVER['windir'] . '\\temp';
-            }
-            if (isset($_SERVER['SystemRoot'])) {
-                return $_SERVER['SystemRoot'] . '\\temp';
-            }
-            return '\temp';
-        }
-        if (isset($_ENV['TMPDIR'])) {
-            return $_ENV['TMPDIR'];
-        }
-        if (isset($_SERVER['TMPDIR'])) {
-            return $_SERVER['TMPDIR'];
-        }
-        return '/tmp';
-    }
-
-    /**
-     * Returns a temporary filename using tempnam() and File::tmpDir().
-     *
-     * @static
-     * @access  public
-     * @param   string  $dirname Optional directory name for the tmp file
-     * @return  string  Filename and path of the tmp file
-     */
-    function tmpFile($dirname = null)
-    {
-        if (!isset($dirname)) {
-            $dirname = File_Util::tmpDir();
-        }
-        return tempnam($dirname, 'temp.');
-    }
-
-    /**
-     * Returns boolean based on whether given path is absolute or not.
-     *
-     * @static
-     * @access  public
-     * @param   string  $path Given path
-     * @return  boolean True if the path is absolute, false if it is not
-     */
-    function isAbsolute($path)
-    {
-        if (preg_match('/(?:\/|\\\)\.\.(?=\/|$)/', $path)) {
-            return false;
-        }
-        if (FILE_WIN32) {
-            return preg_match('/^[a-zA-Z]:(\\\|\/)/', $path);
-        }
-        return ($path{0} == '/') || ($path{0} == '~');
-    }
-
-    /**
-     * Checks for a file's existence, taking the current include path 
-     * into consideration
-     * 
-     * This method can be called statically
-     * (e.g., File_Util::isIncludable('config.php'))
-     *
-     * @param string $file
-     * @param string $sep the directory separator (optional)
-     * @return string the includable path
-     * @access public
-     * @static     
-     */
-    function isIncludable($file, $sep = DIRECTORY_SEPARATOR)
-    {
-        foreach ((array) explode(PATH_SEPARATOR, ini_get('include_path')) as $path) {
-            if (file_exists($path .= $sep . $file)) {
-                return $path;
-            }
-        }
-        if (file_exists($file)) {
-            return $file;
-        }
-        return NULL;
-    }
-    
-    /**
-     * Get path relative to another path
-     *
-     * @static
-     * @access  public
-     * @return  string
-     * @param   string  $path
-     * @param   string  $root
-     * @param   string  $separator
-     */
-    function relativePath($path, $root, $separator = DIRECTORY_SEPARATOR)
-    {
-        $path = File_Util::realpath($path, $separator);
-        $root = File_Util::realpath($root, $separator);
-        $dirs = explode($separator, $path);
-        $comp = explode($separator, $root);
-
-        if (FILE_WIN32) {
-            if (strcasecmp($dirs[0], $comp[0])) {
-                return $path;
-            }
-            unset($dirs[0], $comp[0]);
-        }
-
-        foreach ($comp as $i => $part) {
-            if (isset($dirs[$i]) && $part == $dirs[$i]) {
-                unset($dirs[$i], $comp[$i]);
-            } else {
-                break;
-            }
-        }
-
-        return str_repeat('..' . $separator, count($comp)) . implode($separator, $dirs);
-    }
-
-    /**
-     * Get real path (works with non-existant paths)
-     *
-     * @static
-     * @access  public
-     * @return  string
-     * @param   string  $path
-     * @param   string  $separator
-     */
-    function realPath($path, $separator = DIRECTORY_SEPARATOR)
-    {
-        if (!strlen($path)) {
-            return $separator;
-        }
-
-        $drive = '';
-        if (FILE_WIN32) {
-            $path = preg_replace('/[\\\\\/]/', $separator, $path);
-            if (preg_match('/([a-zA-Z]\:)(.*)/', $path, $matches)) {
-                $drive = $matches[1];
-                $path  = $matches[2];
-            } else {
-                $cwd   = getcwd();
-                $drive = substr($cwd, 0, 2);
-                if ($path{0} !== $separator{0}) {
-                    $path  = substr($cwd, 3) . $separator . $path;
-                }
-            }
-        } elseif ($path{0} !== $separator) {
-            $path = getcwd() . $separator . $path;
-        }
-
-        $dirStack = array();
-        foreach (explode($separator, $path) as $dir) {
-            if (strlen($dir) && $dir !== '.') {
-                if ($dir == '..') {
-                    array_pop($dirStack);
-                } else {
-                    $dirStack[] = $dir;
-                }
-            }
-        }
-
-        return $drive . $separator . implode($separator, $dirStack);
-    }
-
-    /**
-     * Check whether path is in root path
-     *
-     * @static
-     * @access  public
-     * @return  bool
-     * @param   string  $path
-     * @param   string  $root
-     */
-    function pathInRoot($path, $root)
-    {
-        static $realPaths = array();
-
-        if (!isset($realPaths[$root])) {
-            $realPaths[$root] = File_Util::realPath($root);
-        }
-
-        return false !== strstr(File_Util::realPath($path), $realPaths[$root]);
-    }
-
-    /**
-     * List Directory
-     *
-     * The final argument, $cb, is a callback that either evaluates to true or
-     * false and performs a filter operation, or it can also modify the
-     * directory/file names returned.  To achieve the latter effect use as
-     * follows:
-     *
-     * <code>
-     * <?php
-     * function uc(&$filename) {
-     *     $filename = strtoupper($filename);
-     *     return true;
-     * }
-     * $entries = File_Util::listDir('.', FILE_LIST_ALL, FILE_SORT_NONE, 'uc');
-     * foreach ($entries as $e) {
-     *     echo $e->name, "\n";
-     * }
-     * ?>
-     * </code>
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   string  $path
-     * @param   int     $list
-     * @param   int     $sort
-     * @param   mixed   $cb
-     */
-    function listDir($path, $list = FILE_LIST_ALL, $sort = FILE_SORT_NONE, $cb = null)
-    {
-        if (!strlen($path) || !is_dir($path)) {
-            return null;
-        }
-
-        $entries = array();
-        for ($dir = dir($path); false !== $entry = $dir->read(); ) {
-            if ($list & FILE_LIST_DOTS || $entry{0} !== '.') {
-                $isRef = ($entry === '.' || $entry === '..');
-                $isDir = $isRef || is_dir($path .'/'. $entry);
-                if (    ((!$isDir && $list & FILE_LIST_FILES)   ||
-                         ($isDir  && $list & FILE_LIST_DIRS))   &&
-                        (!is_callable($cb) ||
-                            call_user_func_array($cb, array(&$entry)))) {
-                    $entries[] = (object) array(
-                        'name'  => $entry,
-                        'size'  => $isDir ? null : filesize($path .'/'. $entry),
-                        'date'  => filemtime($path .'/'. $entry),
-                    );
-                }
-            }
-        }
-        $dir->close();
-
-        if ($sort) {
-            $entries = File_Util::sortFiles($entries, $sort);
-        }
-
-        return $entries;
-    }
-
-    /**
-     * Sort Files
-     *
-     * @static
-     * @access  public
-     * @return  array
-     * @param   array   $files
-     * @param   int     $sort
-     */
-    function sortFiles($files, $sort)
-    {
-        if (!$files) {
-            return array();
-        }
-
-        if (!$sort) {
-            return $files;
-        }
-
-        if ($sort === 1) {
-            return array_reverse($files);
-        }
-
-        if ($sort & FILE_SORT_RANDOM) {
-            shuffle($files);
-            return $files;
-        }
-
-        $names = array();
-        $sizes = array();
-        $dates = array();
-
-        if ($sort & FILE_SORT_NAME) {
-            $r = &$names;
-        } elseif ($sort & FILE_SORT_DATE) {
-            $r = &$dates;
-        } elseif ($sort & FILE_SORT_SIZE) {
-            $r = &$sizes;
-        } else {
-            asort($files, SORT_REGULAR);
-            return $files;
-        }
-
-        $sortFlags = array(
-            FILE_SORT_NAME => SORT_STRING,
-            FILE_SORT_DATE => SORT_NUMERIC,
-            FILE_SORT_SIZE => SORT_NUMERIC,
-        );
-
-        foreach ($files as $file) {
-            $names[] = $file->name;
-            $sizes[] = $file->size;
-            $dates[] = $file->date;
-        }
-
-        if ($sort & FILE_SORT_REVERSE) {
-            arsort($r, $sortFlags[$sort & ~1]);
-        } else {
-            asort($r, $sortFlags[$sort]);
-        }
-
-        $result = array();
-        foreach ($r as $i => $f) {
-            $result[] = $files[$i];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Switch File Extension
-     *
-     * @static
-     * @access  public
-     * @return  string|array
-     * @param   string|array    $filename
-     * @param   string          $to new file extension
-     * @param   string          $from change only files with this extension
-     * @param   bool            $reverse change only files not having $from extension
-     */
-    function switchExt($filename, $to, $from = null, $reverse = false)
-    {
-        if (is_array($filename)) {
-            foreach ($filename as $key => $file) {
-                $filename[$key] = File_Util::switchExt($file, $to, $from);
-            }
-            return $filename;
-        }
-
-        if ($len = strlen($from)) {
-            $ext = substr($filename, -$len - 1);
-            $cfn = FILE_WIN32 ? 'strcasecmp' : 'strcmp';
-            if (!$reverse == $cfn($ext, '.'. $from)) {
-                return $filename;
-            }
-            return substr($filename, 0, -$len - 1) .'.'. $to;
-        }
-
-        if ($pos = strpos($filename, '.')) {
-            return substr($filename, 0, $pos) .'.'. $to;
-        }
-
-        return $filename .'.'. $to;
-    }
-}
-
-?>
diff --git a/airtime_mvc/library/pear/HTML/Common.php b/airtime_mvc/library/pear/HTML/Common.php
deleted file mode 100644
index 2dab2fe58..000000000
--- a/airtime_mvc/library/pear/HTML/Common.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Base class for all HTML classes
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- * 
- * @category    HTML
- * @package     HTML_Common
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Common.php,v 1.15 2009/04/03 15:26:22 avb Exp $
- * @link        http://pear.php.net/package/HTML_Common/
- */ 
-
-/**
- * Base class for all HTML classes
- *
- * @category    HTML
- * @package     HTML_Common
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @version     Release: 1.2.5
- * @abstract
- */
-class HTML_Common
-{
-    /**
-     * Associative array of attributes
-     * @var     array
-     * @access  private
-     */
-    var $_attributes = array();
-
-    /**
-     * Tab offset of the tag
-     * @var     int
-     * @access  private
-     */
-    var $_tabOffset = 0;
-
-    /**
-     * Tab string
-     * @var       string
-     * @since     1.7
-     * @access    private
-     */
-    var $_tab = "\11";
-
-    /**
-     * Contains the line end string
-     * @var       string
-     * @since     1.7
-     * @access    private
-     */
-    var $_lineEnd = "\12";
-
-    /**
-     * HTML comment on the object
-     * @var       string
-     * @since     1.5
-     * @access    private
-     */
-    var $_comment = '';
-
-    /**
-     * Class constructor
-     * @param    mixed   $attributes     Associative array of table tag attributes
-     *                                   or HTML attributes name="value" pairs
-     * @param    int     $tabOffset      Indent offset in tabs
-     * @access   public
-     */
-    function HTML_Common($attributes = null, $tabOffset = 0)
-    {
-        $this->setAttributes($attributes);
-        $this->setTabOffset($tabOffset);
-    } // end constructor
-
-    /**
-     * Returns the current API version
-     * @access   public
-     * @returns  double
-     */
-    function apiVersion()
-    {
-        return 1.7;
-    } // end func apiVersion
-
-    /**
-     * Returns the lineEnd
-     *
-     * @since     1.7
-     * @access    private
-     * @return    string
-     */
-    function _getLineEnd()
-    {
-        return $this->_lineEnd;
-    } // end func getLineEnd
-
-    /**
-     * Returns a string containing the unit for indenting HTML
-     *
-     * @since     1.7
-     * @access    private
-     * @return    string
-     */
-    function _getTab()
-    {
-        return $this->_tab;
-    } // end func _getTab
-
-    /**
-     * Returns a string containing the offset for the whole HTML code
-     *
-     * @return    string
-     * @access   private
-     */
-    function _getTabs()
-    {
-        return str_repeat($this->_getTab(), $this->_tabOffset);
-    } // end func _getTabs
-
-    /**
-     * Returns an HTML formatted attribute string
-     * @param    array   $attributes
-     * @return   string
-     * @access   private
-     */
-    function _getAttrString($attributes)
-    {
-        $strAttr = '';
-
-        if (is_array($attributes)) {
-            $charset = HTML_Common::charset();
-            foreach ($attributes as $key => $value) {
-                $strAttr .= ' ' . $key . '="' . htmlspecialchars($value, ENT_COMPAT, $charset) . '"';
-            }
-        }
-        return $strAttr;
-    } // end func _getAttrString
-
-    /**
-     * Returns a valid atrributes array from either a string or array
-     * @param    mixed   $attributes     Either a typical HTML attribute string or an associative array
-     * @access   private
-     * @return   array
-     */
-    function _parseAttributes($attributes)
-    {
-        if (is_array($attributes)) {
-            $ret = array();
-            foreach ($attributes as $key => $value) {
-                if (is_int($key)) {
-                    $key = $value = strtolower($value);
-                } else {
-                    $key = strtolower($key);
-                }
-                $ret[$key] = $value;
-            }
-            return $ret;
-
-        } elseif (is_string($attributes)) {
-            $preg = "/(([A-Za-z_:]|[^\\x00-\\x7F])([A-Za-z0-9_:.-]|[^\\x00-\\x7F])*)" .
-                "([ \\n\\t\\r]+)?(=([ \\n\\t\\r]+)?(\"[^\"]*\"|'[^']*'|[^ \\n\\t\\r]*))?/";
-            if (preg_match_all($preg, $attributes, $regs)) {
-                for ($counter=0; $counter<count($regs[1]); $counter++) {
-                    $name  = $regs[1][$counter];
-                    $check = $regs[0][$counter];
-                    $value = $regs[7][$counter];
-                    if (trim($name) == trim($check)) {
-                        $arrAttr[strtolower(trim($name))] = strtolower(trim($name));
-                    } else {
-                        if (substr($value, 0, 1) == "\"" || substr($value, 0, 1) == "'") {
-                            $arrAttr[strtolower(trim($name))] = substr($value, 1, -1);
-                        } else {
-                            $arrAttr[strtolower(trim($name))] = trim($value);
-                        }
-                    }
-                }
-                return $arrAttr;
-            }
-        }
-    } // end func _parseAttributes
-
-    /**
-     * Returns the array key for the given non-name-value pair attribute
-     *
-     * @param     string    $attr         Attribute
-     * @param     array     $attributes   Array of attribute
-     * @since     1.0
-     * @access    private
-     * @return    bool
-     */
-    function _getAttrKey($attr, $attributes)
-    {
-        if (isset($attributes[strtolower($attr)])) {
-            return true;
-        } else {
-            return null;
-        }
-    } //end func _getAttrKey
-
-    /**
-     * Updates the attributes in $attr1 with the values in $attr2 without changing the other existing attributes
-     * @param    array   $attr1      Original attributes array
-     * @param    array   $attr2      New attributes array
-     * @access   private
-     */
-    function _updateAttrArray(&$attr1, $attr2)
-    {
-        if (!is_array($attr2)) {
-            return false;
-        }
-        foreach ($attr2 as $key => $value) {
-            $attr1[$key] = $value;
-        }
-    } // end func _updateAtrrArray
-
-    /**
-     * Removes the given attribute from the given array
-     *
-     * @param     string    $attr           Attribute name
-     * @param     array     $attributes     Attribute array
-     * @since     1.4
-     * @access    private
-     * @return    void
-     */
-    function _removeAttr($attr, &$attributes)
-    {
-        $attr = strtolower($attr);
-        if (isset($attributes[$attr])) {
-            unset($attributes[$attr]);
-        }
-    } //end func _removeAttr
-
-    /**
-     * Returns the value of the given attribute
-     *
-     * @param     string    $attr   Attribute name
-     * @since     1.5
-     * @access    public
-     * @return    string|null   returns null if an attribute does not exist
-     */
-    function getAttribute($attr)
-    {
-        $attr = strtolower($attr);
-        if (isset($this->_attributes[$attr])) {
-            return $this->_attributes[$attr];
-        }
-        return null;
-    } //end func getAttribute
-
-    /**
-     * Sets the value of the attribute
-     *
-     * @param   string  Attribute name
-     * @param   string  Attribute value (will be set to $name if omitted)
-     * @access  public
-     */
-    function setAttribute($name, $value = null)
-    {
-        $name = strtolower($name);
-        if (is_null($value)) {
-            $value = $name;
-        }
-        $this->_attributes[$name] = $value;
-    } // end func setAttribute
-
-    /**
-     * Sets the HTML attributes
-     * @param    mixed   $attributes     Either a typical HTML attribute string or an associative array
-     * @access   public
-     */
-    function setAttributes($attributes)
-    {
-        $this->_attributes = $this->_parseAttributes($attributes);
-    } // end func setAttributes
-
-    /**
-     * Returns the assoc array (default) or string of attributes
-     *
-     * @param     bool    Whether to return the attributes as string
-     * @since     1.6
-     * @access    public
-     * @return    mixed   attributes
-     */
-    function getAttributes($asString = false)
-    {
-        if ($asString) {
-            return $this->_getAttrString($this->_attributes);
-        } else {
-            return $this->_attributes;
-        }
-    } //end func getAttributes
-
-    /**
-     * Updates the passed attributes without changing the other existing attributes
-     * @param    mixed   $attributes     Either a typical HTML attribute string or an associative array
-     * @access   public
-     */
-    function updateAttributes($attributes)
-    {
-        $this->_updateAttrArray($this->_attributes, $this->_parseAttributes($attributes));
-    } // end func updateAttributes
-
-    /**
-     * Removes an attribute
-     *
-     * @param     string    $attr   Attribute name
-     * @since     1.4
-     * @access    public
-     * @return    void
-     */
-    function removeAttribute($attr)
-    {
-        $this->_removeAttr($attr, $this->_attributes);
-    } //end func removeAttribute
-
-    /**
-     * Sets the line end style to Windows, Mac, Unix or a custom string.
-     *
-     * @param   string  $style  "win", "mac", "unix" or custom string.
-     * @since   1.7
-     * @access  public
-     * @return  void
-     */
-    function setLineEnd($style)
-    {
-        switch ($style) {
-            case 'win':
-                $this->_lineEnd = "\15\12";
-                break;
-            case 'unix':
-                $this->_lineEnd = "\12";
-                break;
-            case 'mac':
-                $this->_lineEnd = "\15";
-                break;
-            default:
-                $this->_lineEnd = $style;
-        }
-    } // end func setLineEnd
-
-    /**
-     * Sets the tab offset
-     *
-     * @param    int     $offset
-     * @access   public
-     */
-    function setTabOffset($offset)
-    {
-        $this->_tabOffset = $offset;
-    } // end func setTabOffset
-
-    /**
-     * Returns the tabOffset
-     *
-     * @since     1.5
-     * @access    public
-     * @return    int
-     */
-    function getTabOffset()
-    {
-        return $this->_tabOffset;
-    } //end func getTabOffset
-
-    /**
-     * Sets the string used to indent HTML
-     *
-     * @since     1.7
-     * @param     string    $string     String used to indent ("\11", "\t", '  ', etc.).
-     * @access    public
-     * @return    void
-     */
-    function setTab($string)
-    {
-        $this->_tab = $string;
-    } // end func setTab
-
-    /**
-     * Sets the HTML comment to be displayed at the beginning of the HTML string
-     *
-     * @param     string
-     * @since     1.4
-     * @access    public
-     * @return    void
-     */
-    function setComment($comment)
-    {
-        $this->_comment = $comment;
-    } // end func setHtmlComment
-
-    /**
-     * Returns the HTML comment
-     *
-     * @since     1.5
-     * @access    public
-     * @return    string
-     */
-    function getComment()
-    {
-        return $this->_comment;
-    } //end func getComment
-
-    /**
-     * Abstract method.  Must be extended to return the objects HTML
-     *
-     * @access    public
-     * @return    string
-     * @abstract
-     */
-    function toHtml()
-    {
-        return '';
-    } // end func toHtml
-
-    /**
-     * Displays the HTML to the screen
-     *
-     * @access    public
-     */
-    function display()
-    {
-        print $this->toHtml();
-    } // end func display
-
-    /**
-     * Sets the charset to use by htmlspecialchars() function
-     *
-     * Since this parameter is expected to be global, the function is designed
-     * to be called statically:
-     * <code>
-     * HTML_Common::charset('utf-8');
-     * </code>
-     * or
-     * <code>
-     * $charset = HTML_Common::charset();
-     * </code>
-     *
-     * @param   string  New charset to use. Omit if just getting the 
-     *                  current value. Consult the htmlspecialchars() docs 
-     *                  for a list of supported character sets.
-     * @return  string  Current charset
-     * @access  public
-     * @static
-     */
-    function charset($newCharset = null)
-    {
-        static $charset = 'ISO-8859-1';
-
-        if (!is_null($newCharset)) {
-            $charset = $newCharset;
-        }
-        return $charset;
-    } // end func charset
-} // end class HTML_Common
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm.php b/airtime_mvc/library/pear/HTML/QuickForm.php
deleted file mode 100644
index 203c97f57..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm.php
+++ /dev/null
@@ -1,2065 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Create, validate and process HTML forms
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: QuickForm.php,v 1.166 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * PEAR and PEAR_Error classes, for error handling
- */
-require_once 'PEAR.php';
-/**
- * Base class for all HTML classes
- */
-require_once 'HTML/Common.php';
-
-/**
- * Element types known to HTML_QuickForm
- * @see HTML_QuickForm::registerElementType(), HTML_QuickForm::getRegisteredTypes(),
- *      HTML_QuickForm::isTypeRegistered()
- * @global array $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES']
- */ 
-$GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'] = 
-        array(
-            'group'         =>array('HTML/QuickForm/group.php','HTML_QuickForm_group'),
-            'hidden'        =>array('HTML/QuickForm/hidden.php','HTML_QuickForm_hidden'),
-            'reset'         =>array('HTML/QuickForm/reset.php','HTML_QuickForm_reset'),
-            'checkbox'      =>array('HTML/QuickForm/checkbox.php','HTML_QuickForm_checkbox'),
-            'file'          =>array('HTML/QuickForm/file.php','HTML_QuickForm_file'),
-            'image'         =>array('HTML/QuickForm/image.php','HTML_QuickForm_image'),
-            'password'      =>array('HTML/QuickForm/password.php','HTML_QuickForm_password'),
-            'radio'         =>array('HTML/QuickForm/radio.php','HTML_QuickForm_radio'),
-            'button'        =>array('HTML/QuickForm/button.php','HTML_QuickForm_button'),
-            'submit'        =>array('HTML/QuickForm/submit.php','HTML_QuickForm_submit'),
-            'select'        =>array('HTML/QuickForm/select.php','HTML_QuickForm_select'),
-            'hiddenselect'  =>array('HTML/QuickForm/hiddenselect.php','HTML_QuickForm_hiddenselect'),
-            'text'          =>array('HTML/QuickForm/text.php','HTML_QuickForm_text'),
-            'textarea'      =>array('HTML/QuickForm/textarea.php','HTML_QuickForm_textarea'),
-            'link'          =>array('HTML/QuickForm/link.php','HTML_QuickForm_link'),
-            'advcheckbox'   =>array('HTML/QuickForm/advcheckbox.php','HTML_QuickForm_advcheckbox'),
-            'date'          =>array('HTML/QuickForm/date.php','HTML_QuickForm_date'),
-            'static'        =>array('HTML/QuickForm/static.php','HTML_QuickForm_static'),
-            'header'        =>array('HTML/QuickForm/header.php', 'HTML_QuickForm_header'),
-            'html'          =>array('HTML/QuickForm/html.php', 'HTML_QuickForm_html'),
-            'hierselect'    =>array('HTML/QuickForm/hierselect.php', 'HTML_QuickForm_hierselect'),
-            'autocomplete'  =>array('HTML/QuickForm/autocomplete.php', 'HTML_QuickForm_autocomplete'),
-            'xbutton'       =>array('HTML/QuickForm/xbutton.php','HTML_QuickForm_xbutton')
-        );
-
-/**
- * Validation rules known to HTML_QuickForm 
- * @see HTML_QuickForm::registerRule(), HTML_QuickForm::getRegisteredRules(),
- *      HTML_QuickForm::isRuleRegistered()
- * @global array $GLOBALS['_HTML_QuickForm_registered_rules']
- */
-$GLOBALS['_HTML_QuickForm_registered_rules'] = array(
-    'required'      => array('html_quickform_rule_required', 'HTML/QuickForm/Rule/Required.php'),
-    'maxlength'     => array('html_quickform_rule_range',    'HTML/QuickForm/Rule/Range.php'),
-    'minlength'     => array('html_quickform_rule_range',    'HTML/QuickForm/Rule/Range.php'),
-    'rangelength'   => array('html_quickform_rule_range',    'HTML/QuickForm/Rule/Range.php'),
-    'email'         => array('html_quickform_rule_email',    'HTML/QuickForm/Rule/Email.php'),
-    'regex'         => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'lettersonly'   => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'alphanumeric'  => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'numeric'       => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'nopunctuation' => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'nonzero'       => array('html_quickform_rule_regex',    'HTML/QuickForm/Rule/Regex.php'),
-    'callback'      => array('html_quickform_rule_callback', 'HTML/QuickForm/Rule/Callback.php'),
-    'compare'       => array('html_quickform_rule_compare',  'HTML/QuickForm/Rule/Compare.php')
-);
-
-// {{{ error codes
-
-/**#@+
- * Error codes for HTML_QuickForm
- *
- * Codes are mapped to textual messages by errorMessage() method, if you add a 
- * new code be sure to add a new message for it to errorMessage()
- *
- * @see HTML_QuickForm::errorMessage()
- */ 
-define('QUICKFORM_OK',                      1);
-define('QUICKFORM_ERROR',                  -1);
-define('QUICKFORM_INVALID_RULE',           -2);
-define('QUICKFORM_NONEXIST_ELEMENT',       -3);
-define('QUICKFORM_INVALID_FILTER',         -4);
-define('QUICKFORM_UNREGISTERED_ELEMENT',   -5);
-define('QUICKFORM_INVALID_ELEMENT_NAME',   -6);
-define('QUICKFORM_INVALID_PROCESS',        -7);
-define('QUICKFORM_DEPRECATED',             -8);
-define('QUICKFORM_INVALID_DATASOURCE',     -9);
-/**#@-*/
-
-// }}}
-
-/**
- * Create, validate and process HTML forms
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- */
-class HTML_QuickForm extends HTML_Common
-{
-    // {{{ properties
-
-    /**
-     * Array containing the form fields
-     * @since     1.0
-     * @var  array
-     * @access   private
-     */
-    var $_elements = array();
-
-    /**
-     * Array containing element name to index map
-     * @since     1.1
-     * @var  array
-     * @access   private
-     */
-    var $_elementIndex = array();
-
-    /**
-     * Array containing indexes of duplicate elements
-     * @since     2.10
-     * @var  array
-     * @access   private
-     */
-    var $_duplicateIndex = array();
-
-    /**
-     * Array containing required field IDs
-     * @since     1.0
-     * @var  array
-     * @access   private
-     */ 
-    var $_required = array();
-
-    /**
-     * Prefix message in javascript alert if error
-     * @since     1.0
-     * @var  string
-     * @access   public
-     */ 
-    var $_jsPrefix = 'Invalid information entered.';
-
-    /**
-     * Postfix message in javascript alert if error
-     * @since     1.0
-     * @var  string
-     * @access   public
-     */ 
-    var $_jsPostfix = 'Please correct these fields.';
-
-    /**
-     * Datasource object implementing the informal
-     * datasource protocol
-     * @since     3.3
-     * @var  object
-     * @access   private
-     */
-    var $_datasource;
-
-    /**
-     * Array of default form values
-     * @since     2.0
-     * @var  array
-     * @access   private
-     */
-    var $_defaultValues = array();
-
-    /**
-     * Array of constant form values
-     * @since     2.0
-     * @var  array
-     * @access   private
-     */
-    var $_constantValues = array();
-
-    /**
-     * Array of submitted form values
-     * @since     1.0
-     * @var  array
-     * @access   private
-     */
-    var $_submitValues = array();
-
-    /**
-     * Array of submitted form files
-     * @since     1.0
-     * @var  integer
-     * @access   public
-     */
-    var $_submitFiles = array();
-
-    /**
-     * Value for maxfilesize hidden element if form contains file input
-     * @since     1.0
-     * @var  integer
-     * @access   public
-     */
-    var $_maxFileSize = 1048576; // 1 Mb = 1048576
-
-    /**
-     * Flag to know if all fields are frozen
-     * @since     1.0
-     * @var  boolean
-     * @access   private
-     */
-    var $_freezeAll = false;
-
-    /**
-     * Array containing the form rules
-     * @since     1.0
-     * @var  array
-     * @access   private
-     */
-    var $_rules = array();
-
-    /**
-     * Form rules, global variety
-     * @var     array
-     * @access  private
-     */
-    var $_formRules = array();
-
-    /**
-     * Array containing the validation errors
-     * @since     1.0
-     * @var  array
-     * @access   private
-     */
-    var $_errors = array();
-
-    /**
-     * Note for required fields in the form
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_requiredNote = '<span style="font-size:80%; color:#ff0000;">*</span><span style="font-size:80%;"> denotes required field</span>';
-
-    /**
-     * Whether the form was submitted
-     * @var       boolean
-     * @access    private
-     */
-    var $_flagSubmitted = false;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * @param    string      $formName          Form's name.
-     * @param    string      $method            (optional)Form's method defaults to 'POST'
-     * @param    string      $action            (optional)Form's action
-     * @param    string      $target            (optional)Form's target defaults to '_self'
-     * @param    mixed       $attributes        (optional)Extra attributes for <form> tag
-     * @param    bool        $trackSubmit       (optional)Whether to track if the form was submitted by adding a special hidden field
-     * @access   public
-     */
-    function HTML_QuickForm($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false)
-    {
-        HTML_Common::HTML_Common($attributes);
-        $method = (strtoupper($method) == 'GET') ? 'get' : 'post';
-        $action = ($action == '') ? $_SERVER['PHP_SELF'] : $action;
-        $target = empty($target) ? array() : array('target' => $target);
-        $attributes = array('action'=>$action, 'method'=>$method, 'name'=>$formName, 'id'=>$formName) + $target;
-        $this->updateAttributes($attributes);
-        if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) {
-            if (1 == get_magic_quotes_gpc()) {
-                $this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST);
-                foreach ($_FILES as $keyFirst => $valFirst) {
-                    foreach ($valFirst as $keySecond => $valSecond) {
-                        if ('name' == $keySecond) {
-                            $this->_submitFiles[$keyFirst][$keySecond] = $this->_recursiveFilter('stripslashes', $valSecond);
-                        } else {
-                            $this->_submitFiles[$keyFirst][$keySecond] = $valSecond;
-                        }
-                    }
-                }
-            } else {
-                $this->_submitValues = 'get' == $method? $_GET: $_POST;
-                $this->_submitFiles  = $_FILES;
-            }
-            $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0;
-        }
-        if ($trackSubmit) {
-            unset($this->_submitValues['_qf__' . $formName]);
-            $this->addElement('hidden', '_qf__' . $formName, null);
-        }
-        if (preg_match('/^([0-9]+)([a-zA-Z]*)$/', ini_get('upload_max_filesize'), $matches)) {
-            // see http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
-            switch (strtoupper($matches['2'])) {
-                case 'G':
-                    $this->_maxFileSize = $matches['1'] * 1073741824;
-                    break;
-                case 'M':
-                    $this->_maxFileSize = $matches['1'] * 1048576;
-                    break;
-                case 'K':
-                    $this->_maxFileSize = $matches['1'] * 1024;
-                    break;
-                default:
-                    $this->_maxFileSize = $matches['1'];
-            }
-        }    
-    } // end constructor
-
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Returns the current API version
-     *
-     * @since     1.0
-     * @access    public
-     * @return    float
-     */
-    function apiVersion()
-    {
-        return 3.2;
-    } // end func apiVersion
-
-    // }}}
-    // {{{ registerElementType()
-
-    /**
-     * Registers a new element type
-     *
-     * @param     string    $typeName   Name of element type
-     * @param     string    $include    Include path for element type
-     * @param     string    $className  Element class name
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function registerElementType($typeName, $include, $className)
-    {
-        $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][strtolower($typeName)] = array($include, $className);
-    } // end func registerElementType
-
-    // }}}
-    // {{{ registerRule()
-
-    /**
-     * Registers a new validation rule
-     *
-     * @param     string    $ruleName   Name of validation rule
-     * @param     string    $type       Either: 'regex', 'function' or 'rule' for an HTML_QuickForm_Rule object
-     * @param     string    $data1      Name of function, regular expression or HTML_QuickForm_Rule classname
-     * @param     string    $data2      Object parent of above function or HTML_QuickForm_Rule file path
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function registerRule($ruleName, $type, $data1, $data2 = null)
-    {
-        include_once('HTML/QuickForm/RuleRegistry.php');
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
-        $registry->registerRule($ruleName, $type, $data1, $data2);
-    } // end func registerRule
-
-    // }}}
-    // {{{ elementExists()
-
-    /**
-     * Returns true if element is in the form
-     *
-     * @param     string   $element         form name of element to check
-     * @since     1.0
-     * @access    public
-     * @return    boolean
-     */
-    function elementExists($element=null)
-    {
-        return isset($this->_elementIndex[$element]);
-    } // end func elementExists
-
-    // }}}
-    // {{{ setDatasource()
-
-    /**
-     * Sets a datasource object for this form object
-     *
-     * Datasource default and constant values will feed the QuickForm object if
-     * the datasource implements defaultValues() and constantValues() methods.
-     *
-     * @param     object   $datasource          datasource object implementing the informal datasource protocol
-     * @param     mixed    $defaultsFilter      string or array of filter(s) to apply to default values
-     * @param     mixed    $constantsFilter     string or array of filter(s) to apply to constants values
-     * @since     3.3
-     * @access    public
-     * @return    void
-     * @throws    HTML_QuickForm_Error
-     */
-    function setDatasource(&$datasource, $defaultsFilter = null, $constantsFilter = null)
-    {
-        if (is_object($datasource)) {
-            $this->_datasource =& $datasource;
-            if (is_callable(array($datasource, 'defaultValues'))) {
-                $this->setDefaults($datasource->defaultValues($this), $defaultsFilter);
-            }
-            if (is_callable(array($datasource, 'constantValues'))) {
-                $this->setConstants($datasource->constantValues($this), $constantsFilter);
-            }
-        } else {
-            return PEAR::raiseError(null, QUICKFORM_INVALID_DATASOURCE, null, E_USER_WARNING, "Datasource is not an object in QuickForm::setDatasource()", 'HTML_QuickForm_Error', true);
-        }
-    } // end func setDatasource
-
-    // }}}
-    // {{{ setDefaults()
-
-    /**
-     * Initializes default form values
-     *
-     * @param     array    $defaultValues       values used to fill the form
-     * @param     mixed    $filter              (optional) filter(s) to apply to all default values
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    HTML_QuickForm_Error
-     */
-    function setDefaults($defaultValues = null, $filter = null)
-    {
-        if (is_array($defaultValues)) {
-            if (isset($filter)) {
-                if (is_array($filter) && (2 != count($filter) || !is_callable($filter))) {
-                    foreach ($filter as $val) {
-                        if (!is_callable($val)) {
-                            return PEAR::raiseError(null, QUICKFORM_INVALID_FILTER, null, E_USER_WARNING, "Callback function does not exist in QuickForm::setDefaults()", 'HTML_QuickForm_Error', true);
-                        } else {
-                            $defaultValues = $this->_recursiveFilter($val, $defaultValues);
-                        }
-                    }
-                } elseif (!is_callable($filter)) {
-                    return PEAR::raiseError(null, QUICKFORM_INVALID_FILTER, null, E_USER_WARNING, "Callback function does not exist in QuickForm::setDefaults()", 'HTML_QuickForm_Error', true);
-                } else {
-                    $defaultValues = $this->_recursiveFilter($filter, $defaultValues);
-                }
-            }
-            $this->_defaultValues = HTML_QuickForm::arrayMerge($this->_defaultValues, $defaultValues);
-            foreach (array_keys($this->_elements) as $key) {
-                $this->_elements[$key]->onQuickFormEvent('updateValue', null, $this);
-            }
-        }
-    } // end func setDefaults
-
-    // }}}
-    // {{{ setConstants()
-
-    /**
-     * Initializes constant form values.
-     * These values won't get overridden by POST or GET vars
-     *
-     * @param     array   $constantValues        values used to fill the form    
-     * @param     mixed    $filter              (optional) filter(s) to apply to all default values    
-     *
-     * @since     2.0
-     * @access    public
-     * @return    void
-     * @throws    HTML_QuickForm_Error
-     */
-    function setConstants($constantValues = null, $filter = null)
-    {
-        if (is_array($constantValues)) {
-            if (isset($filter)) {
-                if (is_array($filter) && (2 != count($filter) || !is_callable($filter))) {
-                    foreach ($filter as $val) {
-                        if (!is_callable($val)) {
-                            return PEAR::raiseError(null, QUICKFORM_INVALID_FILTER, null, E_USER_WARNING, "Callback function does not exist in QuickForm::setConstants()", 'HTML_QuickForm_Error', true);
-                        } else {
-                            $constantValues = $this->_recursiveFilter($val, $constantValues);
-                        }
-                    }
-                } elseif (!is_callable($filter)) {
-                    return PEAR::raiseError(null, QUICKFORM_INVALID_FILTER, null, E_USER_WARNING, "Callback function does not exist in QuickForm::setConstants()", 'HTML_QuickForm_Error', true);
-                } else {
-                    $constantValues = $this->_recursiveFilter($filter, $constantValues);
-                }
-            }
-            $this->_constantValues = HTML_QuickForm::arrayMerge($this->_constantValues, $constantValues);
-            foreach (array_keys($this->_elements) as $key) {
-                $this->_elements[$key]->onQuickFormEvent('updateValue', null, $this);
-            }
-        }
-    } // end func setConstants
-
-    // }}}
-    // {{{ setMaxFileSize()
-
-    /**
-     * Sets the value of MAX_FILE_SIZE hidden element
-     *
-     * @param     int    $bytes    Size in bytes
-     * @since     3.0
-     * @access    public
-     * @return    void
-     */
-    function setMaxFileSize($bytes = 0)
-    {
-        if ($bytes > 0) {
-            $this->_maxFileSize = $bytes;
-        }
-        if (!$this->elementExists('MAX_FILE_SIZE')) {
-            $this->addElement('hidden', 'MAX_FILE_SIZE', $this->_maxFileSize);
-        } else {
-            $el =& $this->getElement('MAX_FILE_SIZE');
-            $el->updateAttributes(array('value' => $this->_maxFileSize));
-        }
-    } // end func setMaxFileSize
-
-    // }}}
-    // {{{ getMaxFileSize()
-
-    /**
-     * Returns the value of MAX_FILE_SIZE hidden element
-     *
-     * @since     3.0
-     * @access    public
-     * @return    int   max file size in bytes
-     */
-    function getMaxFileSize()
-    {
-        return $this->_maxFileSize;
-    } // end func getMaxFileSize
-
-    // }}}
-    // {{{ &createElement()
-
-    /**
-     * Creates a new form element of the given type.
-     * 
-     * This method accepts variable number of parameters, their 
-     * meaning and count depending on $elementType
-     *
-     * @param     string     $elementType    type of element to add (text, textarea, file...)
-     * @since     1.0
-     * @access    public
-     * @return    HTML_QuickForm_Element
-     * @throws    HTML_QuickForm_Error
-     */
-    function &createElement($elementType)
-    {
-        $args    =  func_get_args();
-        $element =& HTML_QuickForm::_loadElement('createElement', $elementType, array_slice($args, 1));
-        return $element;
-    } // end func createElement
-
-    // }}}
-    // {{{ _loadElement()
-
-    /**
-     * Returns a form element of the given type
-     *
-     * @param     string   $event   event to send to newly created element ('createElement' or 'addElement')
-     * @param     string   $type    element type
-     * @param     array    $args    arguments for event
-     * @since     2.0
-     * @access    private
-     * @return    HTML_QuickForm_Element
-     * @throws    HTML_QuickForm_Error
-     */
-    function &_loadElement($event, $type, $args)
-    {
-        $type = strtolower($type);
-        if (!HTML_QuickForm::isTypeRegistered($type)) {
-            $error = PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, "Element '$type' does not exist in HTML_QuickForm::_loadElement()", 'HTML_QuickForm_Error', true);
-            return $error;
-        }
-        $className = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][1];
-        $includeFile = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][0];
-        include_once($includeFile);
-        $elementObject =& new $className();
-        for ($i = 0; $i < 5; $i++) {
-            if (!isset($args[$i])) {
-                $args[$i] = null;
-            }
-        }
-        $err = $elementObject->onQuickFormEvent($event, $args, $this);
-        if ($err !== true) {
-            return $err;
-        }
-        return $elementObject;
-    } // end func _loadElement
-
-    // }}}
-    // {{{ addElement()
-
-    /**
-     * Adds an element into the form
-     * 
-     * If $element is a string representing element type, then this 
-     * method accepts variable number of parameters, their meaning 
-     * and count depending on $element
-     *
-     * @param    mixed      $element        element object or type of element to add (text, textarea, file...)
-     * @since    1.0
-     * @return   HTML_QuickForm_Element     a reference to newly added element
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function &addElement($element)
-    {
-        if (is_object($element) && is_subclass_of($element, 'html_quickform_element')) {
-           $elementObject = &$element;
-           $elementObject->onQuickFormEvent('updateValue', null, $this);
-        } else {
-            $args = func_get_args();
-            $elementObject =& $this->_loadElement('addElement', $element, array_slice($args, 1));
-            if (PEAR::isError($elementObject)) {
-                return $elementObject;
-            }
-        }
-        $elementName = $elementObject->getName();
-
-        // Add the element if it is not an incompatible duplicate
-        if (!empty($elementName) && isset($this->_elementIndex[$elementName])) {
-            if ($this->_elements[$this->_elementIndex[$elementName]]->getType() ==
-                $elementObject->getType()) {
-                $this->_elements[] =& $elementObject;
-                $elKeys = array_keys($this->_elements);
-                $this->_duplicateIndex[$elementName][] = end($elKeys);
-            } else {
-                $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, "Element '$elementName' already exists in HTML_QuickForm::addElement()", 'HTML_QuickForm_Error', true);
-                return $error;
-            }
-        } else {
-            $this->_elements[] =& $elementObject;
-            $elKeys = array_keys($this->_elements);
-            $this->_elementIndex[$elementName] = end($elKeys);
-        }
-        if ($this->_freezeAll) {
-            $elementObject->freeze();
-        }
-
-        return $elementObject;
-    } // end func addElement
-    
-    // }}}
-    // {{{ insertElementBefore()
-
-   /**
-    * Inserts a new element right before the other element
-    *
-    * Warning: it is not possible to check whether the $element is already
-    * added to the form, therefore if you want to move the existing form
-    * element to a new position, you'll have to use removeElement():
-    * $form->insertElementBefore($form->removeElement('foo', false), 'bar');
-    *
-    * @access   public
-    * @since    3.2.4
-    * @param    HTML_QuickForm_element  Element to insert
-    * @param    string                  Name of the element before which the new
-    *                                   one is inserted
-    * @return   HTML_QuickForm_element  reference to inserted element
-    * @throws   HTML_QuickForm_Error
-    */
-    function &insertElementBefore(&$element, $nameAfter)
-    {
-        if (!empty($this->_duplicateIndex[$nameAfter])) {
-            $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, 'Several elements named "' . $nameAfter . '" exist in HTML_QuickForm::insertElementBefore().', 'HTML_QuickForm_Error', true);
-            return $error;
-        } elseif (!$this->elementExists($nameAfter)) {
-            $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$nameAfter' does not exist in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true);
-            return $error;
-        }
-        $elementName = $element->getName();
-        $targetIdx   = $this->_elementIndex[$nameAfter];
-        $duplicate   = false;
-        // Like in addElement(), check that it's not an incompatible duplicate
-        if (!empty($elementName) && isset($this->_elementIndex[$elementName])) {
-            if ($this->_elements[$this->_elementIndex[$elementName]]->getType() != $element->getType()) {
-                $error = PEAR::raiseError(null, QUICKFORM_INVALID_ELEMENT_NAME, null, E_USER_WARNING, "Element '$elementName' already exists in HTML_QuickForm::insertElementBefore()", 'HTML_QuickForm_Error', true);
-                return $error;
-            }
-            $duplicate = true;
-        }
-        // Move all the elements after added back one place, reindex _elementIndex and/or _duplicateIndex
-        $elKeys = array_keys($this->_elements);
-        for ($i = end($elKeys); $i >= $targetIdx; $i--) {
-            if (isset($this->_elements[$i])) {
-                $currentName = $this->_elements[$i]->getName();
-                $this->_elements[$i + 1] =& $this->_elements[$i];
-                if ($this->_elementIndex[$currentName] == $i) {
-                    $this->_elementIndex[$currentName] = $i + 1;
-                } else {
-                    $dupIdx = array_search($i, $this->_duplicateIndex[$currentName]);
-                    $this->_duplicateIndex[$currentName][$dupIdx] = $i + 1;
-                }
-                unset($this->_elements[$i]);
-            }
-        }
-        // Put the element in place finally
-        $this->_elements[$targetIdx] =& $element;
-        if (!$duplicate) {
-            $this->_elementIndex[$elementName] = $targetIdx;
-        } else {
-            $this->_duplicateIndex[$elementName][] = $targetIdx;
-        }
-        $element->onQuickFormEvent('updateValue', null, $this);
-        if ($this->_freezeAll) {
-            $element->freeze();
-        }
-        // If not done, the elements will appear in reverse order
-        ksort($this->_elements);
-        return $element;
-    }
-
-    // }}}
-    // {{{ addGroup()
-
-    /**
-     * Adds an element group
-     * @param    array      $elements       array of elements composing the group
-     * @param    string     $name           (optional)group name
-     * @param    string     $groupLabel     (optional)group label
-     * @param    string     $separator      (optional)string to separate elements
-     * @param    string     $appendName     (optional)specify whether the group name should be
-     *                                      used in the form element name ex: group[element]
-     * @return   HTML_QuickForm_group       reference to a newly added group
-     * @since    2.8
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function &addGroup($elements, $name=null, $groupLabel='', $separator=null, $appendName = true)
-    {
-        static $anonGroups = 1;
-
-        if (0 == strlen($name)) {
-            $name       = 'qf_group_' . $anonGroups++;
-            $appendName = false;
-        }
-        $group =& $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName);
-        return $group;
-    } // end func addGroup
-    
-    // }}}
-    // {{{ &getElement()
-
-    /**
-     * Returns a reference to the element
-     *
-     * @param     string     $element    Element name
-     * @since     2.0
-     * @access    public
-     * @return    HTML_QuickForm_element    reference to element
-     * @throws    HTML_QuickForm_Error
-     */
-    function &getElement($element)
-    {
-        if (isset($this->_elementIndex[$element])) {
-            return $this->_elements[$this->_elementIndex[$element]];
-        } else {
-            $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$element' does not exist in HTML_QuickForm::getElement()", 'HTML_QuickForm_Error', true);
-            return $error;
-        }
-    } // end func getElement
-
-    // }}}
-    // {{{ &getElementValue()
-
-    /**
-     * Returns the element's raw value
-     * 
-     * This returns the value as submitted by the form (not filtered) 
-     * or set via setDefaults() or setConstants()
-     *
-     * @param     string     $element    Element name
-     * @since     2.0
-     * @access    public
-     * @return    mixed     element value
-     * @throws    HTML_QuickForm_Error
-     */
-    function &getElementValue($element)
-    {
-        if (!isset($this->_elementIndex[$element])) {
-            $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$element' does not exist in HTML_QuickForm::getElementValue()", 'HTML_QuickForm_Error', true);
-            return $error;
-        }
-        $value = $this->_elements[$this->_elementIndex[$element]]->getValue();
-        if (isset($this->_duplicateIndex[$element])) {
-            foreach ($this->_duplicateIndex[$element] as $index) {
-                if (null !== ($v = $this->_elements[$index]->getValue())) {
-                    if (is_array($value)) {
-                        $value[] = $v;
-                    } else {
-                        $value = (null === $value)? $v: array($value, $v);
-                    }
-                }
-            }
-        }
-        return $value;
-    } // end func getElementValue
-
-    // }}}
-    // {{{ getSubmitValue()
-
-    /**
-     * Returns the elements value after submit and filter
-     *
-     * @param     string     Element name
-     * @since     2.0
-     * @access    public
-     * @return    mixed     submitted element value or null if not set
-     */    
-    function getSubmitValue($elementName)
-    {
-        $value = null;
-        if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) {
-            $value = isset($this->_submitValues[$elementName])? $this->_submitValues[$elementName]: array();
-            if (is_array($value) && isset($this->_submitFiles[$elementName])) {
-                foreach ($this->_submitFiles[$elementName] as $k => $v) {
-                    $value = HTML_QuickForm::arrayMerge($value, $this->_reindexFiles($this->_submitFiles[$elementName][$k], $k));
-                }
-            }
-
-        } elseif ('file' == $this->getElementType($elementName)) {
-            return $this->getElementValue($elementName);
-
-        } elseif (false !== ($pos = strpos($elementName, '['))) {
-            $base = str_replace(
-                        array('\\', '\''), array('\\\\', '\\\''), 
-                        substr($elementName, 0, $pos)
-                    );
-            $idx  = "['" . str_replace(
-                        array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), 
-                        substr($elementName, $pos + 1, -1)
-                    ) . "']";
-            if (isset($this->_submitValues[$base])) {
-                $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;");
-            }
-
-            if ((is_array($value) || null === $value) && isset($this->_submitFiles[$base])) {
-                $props = array('name', 'type', 'size', 'tmp_name', 'error');
-                $code  = "if (!isset(\$this->_submitFiles['{$base}']['name']{$idx})) {\n" .
-                         "    return null;\n" .
-                         "} else {\n" .
-                         "    \$v = array();\n";
-                foreach ($props as $prop) {
-                    $code .= "    \$v = HTML_QuickForm::arrayMerge(\$v, \$this->_reindexFiles(\$this->_submitFiles['{$base}']['{$prop}']{$idx}, '{$prop}'));\n";
-                }
-                $fileValue = eval($code . "    return \$v;\n}\n");
-                if (null !== $fileValue) {
-                    $value = null === $value? $fileValue: HTML_QuickForm::arrayMerge($value, $fileValue);
-                }
-            }
-        }
-        
-        // This is only supposed to work for groups with appendName = false
-        if (null === $value && 'group' == $this->getElementType($elementName)) {
-            $group    =& $this->getElement($elementName);
-            $elements =& $group->getElements();
-            foreach (array_keys($elements) as $key) {
-                $name = $group->getElementName($key);
-                // prevent endless recursion in case of radios and such
-                if ($name != $elementName) {
-                    if (null !== ($v = $this->getSubmitValue($name))) {
-                        $value[$name] = $v;
-                    }
-                }
-            }
-        }
-        return $value;
-    } // end func getSubmitValue
-
-    // }}}
-    // {{{ _reindexFiles()
-
-   /**
-    * A helper function to change the indexes in $_FILES array
-    *
-    * @param  mixed   Some value from the $_FILES array
-    * @param  string  The key from the $_FILES array that should be appended
-    * @return array
-    */
-    function _reindexFiles($value, $key)
-    {
-        if (!is_array($value)) {
-            return array($key => $value);
-        } else {
-            $ret = array();
-            foreach ($value as $k => $v) {
-                $ret[$k] = $this->_reindexFiles($v, $key);
-            }
-            return $ret;
-        }
-    }
-
-    // }}}
-    // {{{ getElementError()
-
-    /**
-     * Returns error corresponding to validated element
-     *
-     * @param     string    $element        Name of form element to check
-     * @since     1.0
-     * @access    public
-     * @return    string    error message corresponding to checked element
-     */
-    function getElementError($element)
-    {
-        if (isset($this->_errors[$element])) {
-            return $this->_errors[$element];
-        }
-    } // end func getElementError
-    
-    // }}}
-    // {{{ setElementError()
-
-    /**
-     * Set error message for a form element
-     *
-     * @param     string    $element    Name of form element to set error for
-     * @param     string    $message    Error message, if empty then removes the current error message
-     * @since     1.0       
-     * @access    public
-     * @return    void
-     */
-    function setElementError($element, $message = null)
-    {
-        if (!empty($message)) {
-            $this->_errors[$element] = $message;
-        } else {
-            unset($this->_errors[$element]);
-        }
-    } // end func setElementError
-         
-     // }}}
-     // {{{ getElementType()
-
-     /**
-      * Returns the type of the given element
-      *
-      * @param      string    $element    Name of form element
-      * @since      1.1
-      * @access     public
-      * @return     string    Type of the element, false if the element is not found
-      */
-     function getElementType($element)
-     {
-         if (isset($this->_elementIndex[$element])) {
-             return $this->_elements[$this->_elementIndex[$element]]->getType();
-         }
-         return false;
-     } // end func getElementType
-
-     // }}}
-     // {{{ updateElementAttr()
-
-    /**
-     * Updates Attributes for one or more elements
-     *
-     * @param      mixed    $elements   Array of element names/objects or string of elements to be updated
-     * @param      mixed    $attrs      Array or sting of html attributes
-     * @since      2.10
-     * @access     public
-     * @return     void
-     */
-    function updateElementAttr($elements, $attrs)
-    {
-        if (is_string($elements)) {
-            $elements = split('[ ]?,[ ]?', $elements);
-        }
-        foreach (array_keys($elements) as $key) {
-            if (is_object($elements[$key]) && is_a($elements[$key], 'HTML_QuickForm_element')) {
-                $elements[$key]->updateAttributes($attrs);
-            } elseif (isset($this->_elementIndex[$elements[$key]])) {
-                $this->_elements[$this->_elementIndex[$elements[$key]]]->updateAttributes($attrs);
-                if (isset($this->_duplicateIndex[$elements[$key]])) {
-                    foreach ($this->_duplicateIndex[$elements[$key]] as $index) {
-                        $this->_elements[$index]->updateAttributes($attrs);
-                    }
-                }
-            }
-        }
-    } // end func updateElementAttr
-
-    // }}}
-    // {{{ removeElement()
-
-    /**
-     * Removes an element
-     *
-     * The method "unlinks" an element from the form, returning the reference
-     * to the element object. If several elements named $elementName exist, 
-     * it removes the first one, leaving the others intact.
-     * 
-     * @param string    $elementName The element name
-     * @param boolean   $removeRules True if rules for this element are to be removed too                     
-     * @access public
-     * @since 2.0
-     * @return HTML_QuickForm_element    a reference to the removed element
-     * @throws HTML_QuickForm_Error
-     */
-    function &removeElement($elementName, $removeRules = true)
-    {
-        if (!isset($this->_elementIndex[$elementName])) {
-            $error = PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$elementName' does not exist in HTML_QuickForm::removeElement()", 'HTML_QuickForm_Error', true);
-            return $error;
-        }
-        $el =& $this->_elements[$this->_elementIndex[$elementName]];
-        unset($this->_elements[$this->_elementIndex[$elementName]]);
-        if (empty($this->_duplicateIndex[$elementName])) {
-            unset($this->_elementIndex[$elementName]);
-        } else {
-            $this->_elementIndex[$elementName] = array_shift($this->_duplicateIndex[$elementName]);
-        }
-        if ($removeRules) {
-            $this->_required = array_diff($this->_required, array($elementName));
-            unset($this->_rules[$elementName], $this->_errors[$elementName]);
-            if ('group' == $el->getType()) {
-                foreach (array_keys($el->getElements()) as $key) {
-                    unset($this->_rules[$el->getElementName($key)]);
-                }
-            }
-        }
-        return $el;
-    } // end func removeElement
-
-    // }}}
-    // {{{ addRule()
-
-    /**
-     * Adds a validation rule for the given field
-     *
-     * If the element is in fact a group, it will be considered as a whole.
-     * To validate grouped elements as separated entities, 
-     * use addGroupRule instead of addRule.
-     *
-     * @param    string     $element       Form element name
-     * @param    string     $message       Message to display for invalid data
-     * @param    string     $type          Rule type, use getRegisteredRules() to get types
-     * @param    string     $format        (optional)Required for extra rule data
-     * @param    string     $validation    (optional)Where to perform validation: "server", "client"
-     * @param    boolean    $reset         Client-side validation: reset the form element to its original value if there is an error?
-     * @param    boolean    $force         Force the rule to be applied, even if the target form element does not exist
-     * @since    1.0
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function addRule($element, $message, $type, $format=null, $validation='server', $reset = false, $force = false)
-    {
-        if (!$force) {
-            if (!is_array($element) && !$this->elementExists($element)) {
-                return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$element' does not exist in HTML_QuickForm::addRule()", 'HTML_QuickForm_Error', true);
-            } elseif (is_array($element)) {
-                foreach ($element as $el) {
-                    if (!$this->elementExists($el)) {
-                        return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$el' does not exist in HTML_QuickForm::addRule()", 'HTML_QuickForm_Error', true);
-                    }
-                }
-            }
-        }
-        if (false === ($newName = $this->isRuleRegistered($type, true))) {
-            return PEAR::raiseError(null, QUICKFORM_INVALID_RULE, null, E_USER_WARNING, "Rule '$type' is not registered in HTML_QuickForm::addRule()", 'HTML_QuickForm_Error', true);
-        } elseif (is_string($newName)) {
-            $type = $newName;
-        }
-        if (is_array($element)) {
-            $dependent = $element;
-            $element   = array_shift($dependent);
-        } else {
-            $dependent = null;
-        }
-        if ($type == 'required' || $type == 'uploadedfile') {
-            $this->_required[] = $element;
-        }
-        if (!isset($this->_rules[$element])) {
-            $this->_rules[$element] = array();
-        }
-        if ($validation == 'client') {
-            $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
-        }
-        $this->_rules[$element][] = array(
-            'type'        => $type,
-            'format'      => $format,
-            'message'     => $message,
-            'validation'  => $validation,
-            'reset'       => $reset,
-            'dependent'   => $dependent
-        );
-    } // end func addRule
-
-    // }}}
-    // {{{ addGroupRule()
-
-    /**
-     * Adds a validation rule for the given group of elements
-     *
-     * Only groups with a name can be assigned a validation rule
-     * Use addGroupRule when you need to validate elements inside the group.
-     * Use addRule if you need to validate the group as a whole. In this case,
-     * the same rule will be applied to all elements in the group.
-     * Use addRule if you need to validate the group against a function.
-     *
-     * @param    string     $group         Form group name
-     * @param    mixed      $arg1          Array for multiple elements or error message string for one element
-     * @param    string     $type          (optional)Rule type use getRegisteredRules() to get types
-     * @param    string     $format        (optional)Required for extra rule data
-     * @param    int        $howmany       (optional)How many valid elements should be in the group
-     * @param    string     $validation    (optional)Where to perform validation: "server", "client"
-     * @param    bool       $reset         Client-side: whether to reset the element's value to its original state if validation failed.
-     * @since    2.5
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false)
-    {
-        if (!$this->elementExists($group)) {
-            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Group '$group' does not exist in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true);
-        }
-
-        $groupObj =& $this->getElement($group);
-        if (is_array($arg1)) {
-            $required = 0;
-            foreach ($arg1 as $elementIndex => $rules) {
-                $elementName = $groupObj->getElementName($elementIndex);
-                foreach ($rules as $rule) {
-                    $format = (isset($rule[2])) ? $rule[2] : null;
-                    $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server';
-                    $reset = isset($rule[4]) && $rule[4];
-                    $type = $rule[1];
-                    if (false === ($newName = $this->isRuleRegistered($type, true))) {
-                        return PEAR::raiseError(null, QUICKFORM_INVALID_RULE, null, E_USER_WARNING, "Rule '$type' is not registered in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true);
-                    } elseif (is_string($newName)) {
-                        $type = $newName;
-                    }
-
-                    $this->_rules[$elementName][] = array(
-                                                        'type'        => $type,
-                                                        'format'      => $format, 
-                                                        'message'     => $rule[0],
-                                                        'validation'  => $validation,
-                                                        'reset'       => $reset,
-                                                        'group'       => $group);
-
-                    if ('required' == $type || 'uploadedfile' == $type) {
-                        $groupObj->_required[] = $elementName;
-                        $this->_required[] = $elementName;
-                        $required++;
-                    }
-                    if ('client' == $validation) {
-                        $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
-                    }
-                }
-            }
-            if ($required > 0 && count($groupObj->getElements()) == $required) {
-                $this->_required[] = $group;
-            }
-        } elseif (is_string($arg1)) {
-            if (false === ($newName = $this->isRuleRegistered($type, true))) {
-                return PEAR::raiseError(null, QUICKFORM_INVALID_RULE, null, E_USER_WARNING, "Rule '$type' is not registered in HTML_QuickForm::addGroupRule()", 'HTML_QuickForm_Error', true);
-            } elseif (is_string($newName)) {
-                $type = $newName;
-            }
-
-            // addGroupRule() should also handle <select multiple>
-            if (is_a($groupObj, 'html_quickform_group')) {
-                // Radios need to be handled differently when required
-                if ($type == 'required' && $groupObj->getGroupType() == 'radio') {
-                    $howmany = ($howmany == 0) ? 1 : $howmany;
-                } else {
-                    $howmany = ($howmany == 0) ? count($groupObj->getElements()) : $howmany;
-                }
-            }
-
-            $this->_rules[$group][] = array('type'       => $type,
-                                            'format'     => $format, 
-                                            'message'    => $arg1,
-                                            'validation' => $validation,
-                                            'howmany'    => $howmany,
-                                            'reset'      => $reset);
-            if ($type == 'required') {
-                $this->_required[] = $group;
-            }
-            if ($validation == 'client') {
-                $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_attributes['id'] . '; } catch(e) { return true; } return myValidator(this);'));
-            }
-        }
-    } // end func addGroupRule
-
-    // }}}
-    // {{{ addFormRule()
-
-   /**
-    * Adds a global validation rule 
-    * 
-    * This should be used when for a rule involving several fields or if
-    * you want to use some completely custom validation for your form.
-    * The rule function/method should return true in case of successful 
-    * validation and array('element name' => 'error') when there were errors.
-    * 
-    * @access   public
-    * @param    mixed   Callback, either function name or array(&$object, 'method')
-    * @throws   HTML_QuickForm_Error
-    */
-    function addFormRule($rule)
-    {
-        if (!is_callable($rule)) {
-            return PEAR::raiseError(null, QUICKFORM_INVALID_RULE, null, E_USER_WARNING, 'Callback function does not exist in HTML_QuickForm::addFormRule()', 'HTML_QuickForm_Error', true);
-        }
-        $this->_formRules[] = $rule;
-    }
-    
-    // }}}
-    // {{{ applyFilter()
-
-    /**
-     * Applies a data filter for the given field(s)
-     *
-     * @param    mixed     $element       Form element name or array of such names
-     * @param    mixed     $filter        Callback, either function name or array(&$object, 'method')
-     * @since    2.0
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function applyFilter($element, $filter)
-    {
-        if (!is_callable($filter)) {
-            return PEAR::raiseError(null, QUICKFORM_INVALID_FILTER, null, E_USER_WARNING, "Callback function does not exist in QuickForm::applyFilter()", 'HTML_QuickForm_Error', true);
-        }
-        if ($element == '__ALL__') {
-            $this->_submitValues = $this->_recursiveFilter($filter, $this->_submitValues);
-        } else {
-            if (!is_array($element)) {
-                $element = array($element);
-            }
-            foreach ($element as $elName) {
-                $value = $this->getSubmitValue($elName);
-                if (null !== $value) {
-                    if (false === strpos($elName, '[')) {
-                        $this->_submitValues[$elName] = $this->_recursiveFilter($filter, $value);
-                    } else {
-                        $idx  = "['" . str_replace(
-                                    array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), 
-                                    $elName
-                                ) . "']";
-                        eval("\$this->_submitValues{$idx} = \$this->_recursiveFilter(\$filter, \$value);");
-                    }
-                }
-            }
-        }
-    } // end func applyFilter
-
-    // }}}
-    // {{{ _recursiveFilter()
-
-    /**
-     * Recursively apply a filter function
-     *
-     * @param     string   $filter    filter to apply
-     * @param     mixed    $value     submitted values
-     * @since     2.0
-     * @access    private
-     * @return    cleaned values
-     */
-    function _recursiveFilter($filter, $value)
-    {
-        if (is_array($value)) {
-            $cleanValues = array();
-            foreach ($value as $k => $v) {
-                $cleanValues[$k] = $this->_recursiveFilter($filter, $v);
-            }
-            return $cleanValues;
-        } else {
-            return call_user_func($filter, $value);
-        }
-    } // end func _recursiveFilter
-
-    // }}}
-    // {{{ arrayMerge()
-
-   /**
-    * Merges two arrays
-    *
-    * Merges two array like the PHP function array_merge but recursively.
-    * The main difference is that existing keys will not be renumbered
-    * if they are integers.
-    *
-    * @access   public
-    * @param    array   $a  original array
-    * @param    array   $b  array which will be merged into first one
-    * @return   array   merged array
-    */
-    function arrayMerge($a, $b)
-    {
-        foreach ($b as $k => $v) {
-            if (is_array($v)) {
-                if (isset($a[$k]) && !is_array($a[$k])) {
-                    $a[$k] = $v;
-                } else {
-                    if (!isset($a[$k])) {
-                        $a[$k] = array();
-                    }
-                    $a[$k] = HTML_QuickForm::arrayMerge($a[$k], $v);
-                }
-            } else {
-                $a[$k] = $v;
-            }
-        }
-        return $a;
-    } // end func arrayMerge
-
-    // }}}
-    // {{{ isTypeRegistered()
-
-    /**
-     * Returns whether or not the form element type is supported
-     *
-     * @param     string   $type     Form element type
-     * @since     1.0
-     * @access    public
-     * @return    boolean
-     */
-    function isTypeRegistered($type)
-    {
-        return isset($GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][strtolower($type)]);
-    } // end func isTypeRegistered
-
-    // }}}
-    // {{{ getRegisteredTypes()
-
-    /**
-     * Returns an array of registered element types
-     *
-     * @since     1.0
-     * @access    public
-     * @return    array
-     */
-    function getRegisteredTypes()
-    {
-        return array_keys($GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES']);
-    } // end func getRegisteredTypes
-
-    // }}}
-    // {{{ isRuleRegistered()
-
-    /**
-     * Returns whether or not the given rule is supported
-     *
-     * @param     string   $name    Validation rule name
-     * @param     bool     Whether to automatically register subclasses of HTML_QuickForm_Rule
-     * @since     1.0
-     * @access    public
-     * @return    mixed    true if previously registered, false if not, new rule name if auto-registering worked
-     */
-    function isRuleRegistered($name, $autoRegister = false)
-    {
-        if (is_scalar($name) && isset($GLOBALS['_HTML_QuickForm_registered_rules'][$name])) {
-            return true;
-        } elseif (!$autoRegister) {
-            return false;
-        }
-        // automatically register the rule if requested
-        include_once 'HTML/QuickForm/RuleRegistry.php';
-        $ruleName = false;
-        if (is_object($name) && is_a($name, 'html_quickform_rule')) {
-            $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name));
-        } elseif (is_string($name) && class_exists($name)) {
-            $parent = strtolower($name);
-            do {
-                if ('html_quickform_rule' == strtolower($parent)) {
-                    $ruleName = strtolower($name);
-                    break;
-                }
-            } while ($parent = get_parent_class($parent));
-        }
-        if ($ruleName) {
-            $registry =& HTML_QuickForm_RuleRegistry::singleton();
-            $registry->registerRule($ruleName, null, $name);
-        }
-        return $ruleName;
-    } // end func isRuleRegistered
-
-    // }}}
-    // {{{ getRegisteredRules()
-
-    /**
-     * Returns an array of registered validation rules
-     *
-     * @since     1.0
-     * @access    public
-     * @return    array
-     */
-    function getRegisteredRules()
-    {
-        return array_keys($GLOBALS['_HTML_QuickForm_registered_rules']);
-    } // end func getRegisteredRules
-
-    // }}}
-    // {{{ isElementRequired()
-
-    /**
-     * Returns whether or not the form element is required
-     *
-     * @param     string   $element     Form element name
-     * @since     1.0
-     * @access    public
-     * @return    boolean
-     */
-    function isElementRequired($element)
-    {
-        return in_array($element, $this->_required, true);
-    } // end func isElementRequired
-
-    // }}}
-    // {{{ isElementFrozen()
-
-    /**
-     * Returns whether or not the form element is frozen
-     *
-     * @param     string   $element     Form element name
-     * @since     1.0
-     * @access    public
-     * @return    boolean
-     */
-    function isElementFrozen($element)
-    {
-         if (isset($this->_elementIndex[$element])) {
-             return $this->_elements[$this->_elementIndex[$element]]->isFrozen();
-         }
-         return false;
-    } // end func isElementFrozen
-
-    // }}}
-    // {{{ setJsWarnings()
-
-    /**
-     * Sets JavaScript warning messages
-     *
-     * @param     string   $pref        Prefix warning
-     * @param     string   $post        Postfix warning
-     * @since     1.1
-     * @access    public
-     * @return    void
-     */
-    function setJsWarnings($pref, $post)
-    {
-        $this->_jsPrefix = $pref;
-        $this->_jsPostfix = $post;
-    } // end func setJsWarnings
-    
-    // }}}
-    // {{{ setRequiredNote()
-
-    /**
-     * Sets required-note
-     *
-     * @param     string   $note        Message indicating some elements are required
-     * @since     1.1
-     * @access    public
-     * @return    void
-     */
-    function setRequiredNote($note)
-    {
-        $this->_requiredNote = $note;
-    } // end func setRequiredNote
-
-    // }}}
-    // {{{ getRequiredNote()
-
-    /**
-     * Returns the required note
-     *
-     * @since     2.0
-     * @access    public
-     * @return    string
-     */
-    function getRequiredNote()
-    {
-        return $this->_requiredNote;
-    } // end func getRequiredNote
-
-    // }}}
-    // {{{ validate()
-
-    /**
-     * Performs the server side validation
-     * @access    public
-     * @since     1.0
-     * @return    boolean   true if no error found
-     * @throws    HTML_QuickForm_Error
-     */
-    function validate()
-    {
-        if (count($this->_rules) == 0 && count($this->_formRules) == 0 && 
-            $this->isSubmitted()) {
-            return (0 == count($this->_errors));
-        } elseif (!$this->isSubmitted()) {
-            return false;
-        }
-
-        include_once('HTML/QuickForm/RuleRegistry.php');
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
-
-        foreach ($this->_rules as $target => $rules) {
-            $submitValue = $this->getSubmitValue($target);
-
-            foreach ($rules as $rule) {
-                if ((isset($rule['group']) && isset($this->_errors[$rule['group']])) ||
-                     isset($this->_errors[$target])) {
-                    continue 2;
-                }
-                // If element is not required and is empty, we shouldn't validate it
-                if (!$this->isElementRequired($target)) {
-                    if (!isset($submitValue) || '' == $submitValue) {
-                        continue 2;
-                    // Fix for bug #3501: we shouldn't validate not uploaded files, either.
-                    // Unfortunately, we can't just use $element->isUploadedFile() since
-                    // the element in question can be buried in group. Thus this hack.
-                    // See also bug #12014, we should only consider a file that has
-                    // status UPLOAD_ERR_NO_FILE as not uploaded, in all other cases
-                    // validation should be performed, so that e.g. 'maxfilesize' rule
-                    // will display an error if status is UPLOAD_ERR_INI_SIZE 
-                    // or UPLOAD_ERR_FORM_SIZE
-                    } elseif (is_array($submitValue)) {
-                        if (false === ($pos = strpos($target, '['))) {
-                            $isUpload = !empty($this->_submitFiles[$target]);
-                        } else {
-                            $base = str_replace(
-                                        array('\\', '\''), array('\\\\', '\\\''),
-                                        substr($target, 0, $pos) 
-                                    ); 
-                            $idx  = "['" . str_replace(
-                                        array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), 
-                                        substr($target, $pos + 1, -1)
-                                    ) . "']";
-                            eval("\$isUpload = isset(\$this->_submitFiles['{$base}']['name']{$idx});");
-                        }
-                        if ($isUpload && (!isset($submitValue['error']) || UPLOAD_ERR_NO_FILE == $submitValue['error'])) {
-                            continue 2;
-                        }
-                    }
-                }
-                if (isset($rule['dependent']) && is_array($rule['dependent'])) {
-                    $values = array($submitValue);
-                    foreach ($rule['dependent'] as $elName) {
-                        $values[] = $this->getSubmitValue($elName);
-                    }
-                    $result = $registry->validate($rule['type'], $values, $rule['format'], true);
-                } elseif (is_array($submitValue) && !isset($rule['howmany'])) {
-                    $result = $registry->validate($rule['type'], $submitValue, $rule['format'], true);
-                } else {
-                    $result = $registry->validate($rule['type'], $submitValue, $rule['format'], false);
-                }
-
-                if (!$result || (!empty($rule['howmany']) && $rule['howmany'] > (int)$result)) {
-                    if (isset($rule['group'])) {
-                        $this->_errors[$rule['group']] = $rule['message'];
-                    } else {
-                        $this->_errors[$target] = $rule['message'];
-                    }
-                }
-            }
-        }
-
-        // process the global rules now
-        foreach ($this->_formRules as $rule) {
-            if (true !== ($res = call_user_func($rule, $this->_submitValues, $this->_submitFiles))) {
-                if (is_array($res)) {
-                    $this->_errors += $res;
-                } else {
-                    return PEAR::raiseError(null, QUICKFORM_ERROR, null, E_USER_WARNING, 'Form rule callback returned invalid value in HTML_QuickForm::validate()', 'HTML_QuickForm_Error', true);
-                }
-            }
-        }
-
-        return (0 == count($this->_errors));
-    } // end func validate
-
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Displays elements without HTML input tags
-     *
-     * @param    mixed   $elementList       array or string of element(s) to be frozen
-     * @since     1.0
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     */
-    function freeze($elementList=null)
-    {
-        if (!isset($elementList)) {
-            $this->_freezeAll = true;
-            $elementList = array();
-        } else {
-            if (!is_array($elementList)) {
-                $elementList = preg_split('/[ ]*,[ ]*/', $elementList);
-            }
-            $elementList = array_flip($elementList);
-        }
-
-        foreach (array_keys($this->_elements) as $key) {
-            $name = $this->_elements[$key]->getName();
-            if ($this->_freezeAll || isset($elementList[$name])) {
-                $this->_elements[$key]->freeze();
-                unset($elementList[$name]);
-            }
-        }
-
-        if (!empty($elementList)) {
-            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Nonexistant element(s): '" . implode("', '", array_keys($elementList)) . "' in HTML_QuickForm::freeze()", 'HTML_QuickForm_Error', true);
-        }
-        return true;
-    } // end func freeze
-        
-    // }}}
-    // {{{ isFrozen()
-
-    /**
-     * Returns whether or not the whole form is frozen
-     *
-     * @since     3.0
-     * @access    public
-     * @return    boolean
-     */
-    function isFrozen()
-    {
-         return $this->_freezeAll;
-    } // end func isFrozen
-
-    // }}}
-    // {{{ process()
-
-    /**
-     * Performs the form data processing
-     *
-     * @param    mixed     $callback        Callback, either function name or array(&$object, 'method')
-     * @param    bool      $mergeFiles      Whether uploaded files should be processed too
-     * @since    1.0
-     * @access   public
-     * @throws   HTML_QuickForm_Error
-     * @return   mixed     Whatever value the $callback function returns
-     */
-    function process($callback, $mergeFiles = true)
-    {
-        if (!is_callable($callback)) {
-            return PEAR::raiseError(null, QUICKFORM_INVALID_PROCESS, null, E_USER_WARNING, "Callback function does not exist in QuickForm::process()", 'HTML_QuickForm_Error', true);
-        }
-        $values = ($mergeFiles === true) ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles) : $this->_submitValues;
-        return call_user_func($callback, $values);
-    } // end func process
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param object     An HTML_QuickForm_Renderer object
-    * @since 3.0
-    * @access public
-    * @return void
-    */
-    function accept(&$renderer)
-    {
-        $renderer->startForm($this);
-        foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
-            $elementName = $element->getName();
-            $required    = ($this->isElementRequired($elementName) && !$element->isFrozen());
-            $error       = $this->getElementError($elementName);
-            $element->accept($renderer, $required, $error);
-        }
-        $renderer->finishForm($this);
-    } // end func accept
-
-    // }}}
-    // {{{ defaultRenderer()
-
-   /**
-    * Returns a reference to default renderer object
-    *
-    * @access public
-    * @since 3.0
-    * @return object a default renderer object
-    */
-    function &defaultRenderer()
-    {
-        if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) {
-            include_once('HTML/QuickForm/Renderer/Default.php');
-            $GLOBALS['_HTML_QuickForm_default_renderer'] =& new HTML_QuickForm_Renderer_Default();
-        }
-        return $GLOBALS['_HTML_QuickForm_default_renderer'];
-    } // end func defaultRenderer
-
-    // }}}
-    // {{{ toHtml ()
-
-    /**
-     * Returns an HTML version of the form
-     *
-     * @param string $in_data (optional) Any extra data to insert right
-     *               before form is rendered.  Useful when using templates.
-     *
-     * @return   string     Html version of the form
-     * @since     1.0
-     * @access   public
-     */
-    function toHtml ($in_data = null)
-    {
-        if (!is_null($in_data)) {
-            $this->addElement('html', $in_data);
-        }
-        $renderer =& $this->defaultRenderer();
-        $this->accept($renderer);
-        return $renderer->toHtml();
-    } // end func toHtml
-
-    // }}}
-    // {{{ getValidationScript()
-
-    /**
-     * Returns the client side validation script
-     *
-     * @since     2.0
-     * @access    public
-     * @return    string    Javascript to perform validation, empty string if no 'client' rules were added
-     */
-    function getValidationScript()
-    {
-        if (empty($this->_rules) || empty($this->_attributes['onsubmit'])) {
-            return '';
-        }
-
-        include_once('HTML/QuickForm/RuleRegistry.php');
-        $registry =& HTML_QuickForm_RuleRegistry::singleton();
-        $test = array();
-        $js_escape = array(
-            "\r"    => '\r',
-            "\n"    => '\n',
-            "\t"    => '\t',
-            "'"     => "\\'",
-            '"'     => '\"',
-            '\\'    => '\\\\'
-        );
-
-        foreach ($this->_rules as $elementName => $rules) {
-            foreach ($rules as $rule) {
-                if ('client' == $rule['validation']) {
-                    unset($element);
-
-                    $dependent  = isset($rule['dependent']) && is_array($rule['dependent']);
-                    $rule['message'] = strtr($rule['message'], $js_escape);
-
-                    if (isset($rule['group'])) {
-                        $group    =& $this->getElement($rule['group']);
-                        // No JavaScript validation for frozen elements
-                        if ($group->isFrozen()) {
-                            continue 2;
-                        }
-                        $elements =& $group->getElements();
-                        foreach (array_keys($elements) as $key) {
-                            if ($elementName == $group->getElementName($key)) {
-                                $element =& $elements[$key];
-                                break;
-                            }
-                        }
-                    } elseif ($dependent) {
-                        $element   =  array();
-                        $element[] =& $this->getElement($elementName);
-                        foreach ($rule['dependent'] as $elName) {
-                            $element[] =& $this->getElement($elName);
-                        }
-                    } else {
-                        $element =& $this->getElement($elementName);
-                    }
-                    // No JavaScript validation for frozen elements
-                    if (is_object($element) && $element->isFrozen()) {
-                        continue 2;
-                    } elseif (is_array($element)) {
-                        foreach (array_keys($element) as $key) {
-                            if ($element[$key]->isFrozen()) {
-                                continue 3;
-                            }
-                        }
-                    }
-
-                    $test[] = $registry->getValidationScript($element, $elementName, $rule);
-                }
-            }
-        }
-        if (count($test) > 0) {
-            return
-                "\n<script type=\"text/javascript\">\n" .
-                "//<![CDATA[\n" . 
-                "function validate_" . $this->_attributes['id'] . "(frm) {\n" .
-                "  var value = '';\n" .
-                "  var errFlag = new Array();\n" .
-                "  var _qfGroups = {};\n" .
-                "  _qfMsg = '';\n\n" .
-                join("\n", $test) .
-                "\n  if (_qfMsg != '') {\n" .
-                "    _qfMsg = '" . strtr($this->_jsPrefix, $js_escape) . "' + _qfMsg;\n" .
-                "    _qfMsg = _qfMsg + '\\n" . strtr($this->_jsPostfix, $js_escape) . "';\n" .
-                "    alert(_qfMsg);\n" .
-                "    return false;\n" .
-                "  }\n" .
-                "  return true;\n" .
-                "}\n" .
-                "//]]>\n" .
-                "</script>";
-        }
-        return '';
-    } // end func getValidationScript
-
-    // }}}
-    // {{{ getSubmitValues()
-
-    /**
-     * Returns the values submitted by the form
-     *
-     * @since     2.0
-     * @access    public
-     * @param     bool      Whether uploaded files should be returned too
-     * @return    array
-     */
-    function getSubmitValues($mergeFiles = false)
-    {
-        return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues;
-    } // end func getSubmitValues
-
-    // }}}
-    // {{{ toArray()
-
-    /**
-     * Returns the form's contents in an array.
-     *
-     * The description of the array structure is in HTML_QuickForm_Renderer_Array docs
-     * 
-     * @since     2.0
-     * @access    public
-     * @param     bool      Whether to collect hidden elements (passed to the Renderer's constructor)
-     * @return    array of form contents
-     */
-    function toArray($collectHidden = false)
-    {
-        include_once 'HTML/QuickForm/Renderer/Array.php';
-        $renderer =& new HTML_QuickForm_Renderer_Array($collectHidden);
-        $this->accept($renderer);
-        return $renderer->toArray();
-     } // end func toArray
-
-    // }}}
-    // {{{ exportValue()
-
-    /**
-     * Returns a 'safe' element's value
-     * 
-     * This method first tries to find a cleaned-up submitted value,
-     * it will return a value set by setValue()/setDefaults()/setConstants()
-     * if submitted value does not exist for the given element.
-     *
-     * @param  string   Name of an element
-     * @access public
-     * @return mixed
-     * @throws HTML_QuickForm_Error
-     */
-    function exportValue($element)
-    {
-        if (!isset($this->_elementIndex[$element])) {
-            return PEAR::raiseError(null, QUICKFORM_NONEXIST_ELEMENT, null, E_USER_WARNING, "Element '$element' does not exist in HTML_QuickForm::getElementValue()", 'HTML_QuickForm_Error', true);
-        }
-        $value = $this->_elements[$this->_elementIndex[$element]]->exportValue($this->_submitValues, false);
-        if (isset($this->_duplicateIndex[$element])) {
-            foreach ($this->_duplicateIndex[$element] as $index) {
-                if (null !== ($v = $this->_elements[$index]->exportValue($this->_submitValues, false))) {
-                    if (is_array($value)) {
-                        $value[] = $v;
-                    } else {
-                        $value = (null === $value)? $v: array($value, $v);
-                    }
-                }
-            }
-        }
-        return $value;
-    }
-
-    // }}}
-    // {{{ exportValues()
-
-    /**
-     * Returns 'safe' elements' values
-     *
-     * Unlike getSubmitValues(), this will return only the values 
-     * corresponding to the elements present in the form.
-     * 
-     * @param   mixed   Array/string of element names, whose values we want. If not set then return all elements.
-     * @access  public
-     * @return  array   An assoc array of elements' values
-     * @throws  HTML_QuickForm_Error
-     */
-    function exportValues($elementList = null)
-    {
-        $values = array();
-        if (null === $elementList) {
-            // iterate over all elements, calling their exportValue() methods
-            foreach (array_keys($this->_elements) as $key) {
-                $value = $this->_elements[$key]->exportValue($this->_submitValues, true);
-                if (is_array($value)) {
-                    // This shit throws a bogus warning in PHP 4.3.x
-                    $values = HTML_QuickForm::arrayMerge($values, $value);
-                }
-            }
-        } else {
-            if (!is_array($elementList)) {
-                $elementList = array_map('trim', explode(',', $elementList));
-            }
-            foreach ($elementList as $elementName) {
-                $value = $this->exportValue($elementName);
-                if (PEAR::isError($value)) {
-                    return $value;
-                }
-                $values[$elementName] = $value;
-            }
-        }
-        return $values;
-    }
-
-    // }}}
-    // {{{ isSubmitted()
-
-   /**
-    * Tells whether the form was already submitted
-    *
-    * This is useful since the _submitFiles and _submitValues arrays
-    * may be completely empty after the trackSubmit value is removed.
-    *
-    * @access public
-    * @return bool
-    */
-    function isSubmitted()
-    {
-        return $this->_flagSubmitted;
-    }
-
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a result from a QuickForm method is an error (an instance of HTML_QuickForm_Error)
-     *
-     * @access public
-     * @param mixed     result code
-     * @return bool     whether $value is an error
-     * @static
-     */
-    function isError($value)
-    {
-        return (is_object($value) && is_a($value, 'html_quickform_error'));
-    } // end func isError
-
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Return a textual error message for an QuickForm error code
-     *
-     * @access  public
-     * @param   int     error code
-     * @return  string  error message
-     * @static
-     */
-    function errorMessage($value)
-    {
-        // make the variable static so that it only has to do the defining on the first call
-        static $errorMessages;
-
-        // define the varies error messages
-        if (!isset($errorMessages)) {
-            $errorMessages = array(
-                QUICKFORM_OK                    => 'no error',
-                QUICKFORM_ERROR                 => 'unknown error',
-                QUICKFORM_INVALID_RULE          => 'the rule does not exist as a registered rule',
-                QUICKFORM_NONEXIST_ELEMENT      => 'nonexistent html element',
-                QUICKFORM_INVALID_FILTER        => 'invalid filter',
-                QUICKFORM_UNREGISTERED_ELEMENT  => 'unregistered element',
-                QUICKFORM_INVALID_ELEMENT_NAME  => 'element already exists',
-                QUICKFORM_INVALID_PROCESS       => 'process callback does not exist',
-                QUICKFORM_DEPRECATED            => 'method is deprecated',
-                QUICKFORM_INVALID_DATASOURCE    => 'datasource is not an object'
-            );
-        }
-
-        // If this is an error object, then grab the corresponding error code
-        if (HTML_QuickForm::isError($value)) {
-            $value = $value->getCode();
-        }
-
-        // return the textual error message corresponding to the code
-        return isset($errorMessages[$value]) ? $errorMessages[$value] : $errorMessages[QUICKFORM_ERROR];
-    } // end func errorMessage
-
-    // }}}
-} // end class HTML_QuickForm
-
-/**
- * Class for errors thrown by HTML_QuickForm package
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- */
-class HTML_QuickForm_Error extends PEAR_Error {
-
-    // {{{ properties
-
-    /**
-    * Prefix for all error messages
-    * @var string
-    */
-    var $error_message_prefix = 'QuickForm Error: ';
-
-    // }}}
-    // {{{ constructor
-
-    /**
-    * Creates a quickform error object, extending the PEAR_Error class
-    *
-    * @param int   $code the error code
-    * @param int   $mode the reaction to the error, either return, die or trigger/callback
-    * @param int   $level intensity of the error (PHP error code)
-    * @param mixed $debuginfo any information that can inform user as to nature of the error
-    */
-    function HTML_QuickForm_Error($code = QUICKFORM_ERROR, $mode = PEAR_ERROR_RETURN,
-                         $level = E_USER_NOTICE, $debuginfo = null)
-    {
-        if (is_int($code)) {
-            $this->PEAR_Error(HTML_QuickForm::errorMessage($code), $code, $mode, $level, $debuginfo);
-        } else {
-            $this->PEAR_Error("Invalid error code: $code", QUICKFORM_ERROR, $mode, $level, $debuginfo);
-        }
-    }
-
-    // }}}
-} // end class HTML_QuickForm_Error
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer.php
deleted file mode 100644
index 1ead694fd..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * An abstract base class for QuickForm renderers
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id$
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- * 
- * The class implements a Visitor design pattern
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.0
- * @abstract
- */
-class HTML_QuickForm_Renderer
-{
-   /**
-    * Constructor
-    *
-    * @access public
-    */
-    function HTML_QuickForm_Renderer()
-    {
-    } // end constructor
-
-   /**
-    * Called when visiting a form, before processing any form elements
-    *
-    * @param    HTML_QuickForm  a form being visited
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function startForm(&$form)
-    {
-        return;
-    } // end func startForm
-
-   /**
-    * Called when visiting a form, after processing all form elements
-    * 
-    * @param    HTML_QuickForm  a form being visited
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function finishForm(&$form)
-    {
-        return;
-    } // end func finishForm
-
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   a header element being visited
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function renderHeader(&$header)
-    {
-        return;
-    } // end func renderHeader
-
-   /**
-    * Called when visiting an element
-    *
-    * @param    HTML_QuickForm_element  form element being visited
-    * @param    bool                    Whether an element is required
-    * @param    string                  An error message associated with an element
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function renderElement(&$element, $required, $error)
-    {
-        return;
-    } // end func renderElement
-
-   /**
-    * Called when visiting a hidden element
-    * 
-    * @param    HTML_QuickForm_element  a hidden element being visited
-    * @access   public
-    * @return   void
-    * @abstract 
-    */
-    function renderHidden(&$element)
-    {
-        return;
-    } // end func renderHidden
-
-   /**
-    * Called when visiting a raw HTML/text pseudo-element
-    * 
-    * Only implemented in Default renderer. Usage of 'html' elements is 
-    * discouraged, templates should be used instead.
-    *
-    * @param    HTML_QuickForm_html     a 'raw html' element being visited
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function renderHtml(&$data)
-    {
-        return;
-    } // end func renderHtml
-
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param    HTML_QuickForm_group    A group being visited
-    * @param    bool                    Whether a group is required
-    * @param    string                  An error message associated with a group
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function startGroup(&$group, $required, $error)
-    {
-        return;
-    } // end func startGroup
-
-   /**
-    * Called when visiting a group, after processing all group elements
-    *
-    * @param    HTML_QuickForm_group    A group being visited
-    * @access   public
-    * @return   void 
-    * @abstract
-    */
-    function finishGroup(&$group)
-    {
-        return;
-    } // end func finishGroup
-} // end class HTML_QuickForm_Renderer
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Array.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Array.php
deleted file mode 100644
index 47d69b753..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Array.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an array of form contents
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Thomas Schulz <ths@4bconsult.de>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Array.php,v 1.11 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- */
-require_once 'HTML/QuickForm/Renderer.php';
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an array of form contents
- *
- * Based on old HTML_QuickForm::toArray() code.
- *
- * The form array structure is the following:
- * <pre>
- * array(
- *   'frozen'           => 'whether the form is frozen',
- *   'javascript'       => 'javascript for client-side validation',
- *   'attributes'       => 'attributes for <form> tag',
- *   'requirednote      => 'note about the required elements',
- *   // if we set the option to collect hidden elements
- *   'hidden'           => 'collected html of all hidden elements',
- *   // if there were some validation errors:
- *   'errors' => array(
- *     '1st element name' => 'Error for the 1st element',
- *     ...
- *     'nth element name' => 'Error for the nth element'
- *   ),
- *   // if there are no headers in the form:
- *   'elements' => array(
- *     element_1,
- *     ...
- *     element_N
- *   )
- *   // if there are headers in the form:
- *   'sections' => array(
- *     array(
- *       'header'   => 'Header text for the first header',
- *       'name'     => 'Header name for the first header',
- *       'elements' => array(
- *          element_1,
- *          ...
- *          element_K1
- *       )
- *     ),
- *     ...
- *     array(
- *       'header'   => 'Header text for the Mth header',
- *       'name'     => 'Header name for the Mth header',
- *       'elements' => array(
- *          element_1,
- *          ...
- *          element_KM
- *       )
- *     )
- *   )
- * );
- * </pre>
- *
- * where element_i is an array of the form:
- * <pre>
- * array(
- *   'name'      => 'element name',
- *   'value'     => 'element value',
- *   'type'      => 'type of the element',
- *   'frozen'    => 'whether element is frozen',
- *   'label'     => 'label for the element',
- *   'required'  => 'whether element is required',
- *   'error'     => 'error associated with the element',
- *   'style'     => 'some information about element style (e.g. for Smarty)',
- *   // if element is not a group
- *   'html'      => 'HTML for the element'
- *   // if element is a group
- *   'separator' => 'separator for group elements',
- *   'elements'  => array(
- *     element_1,
- *     ...
- *     element_N
- *   )
- * );
- * </pre>
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Thomas Schulz <ths@4bconsult.de>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer
-{
-   /**#@+
-    * @access private
-    */
-   /**
-    * An array being generated
-    * @var array
-    */
-    var $_ary;
-
-   /**
-    * Number of sections in the form (i.e. number of headers in it)
-    * @var integer
-    */
-    var $_sectionCount;
-
-   /**
-    * Current section number
-    * @var integer
-    */
-    var $_currentSection;
-
-   /**
-    * Array representing current group
-    * @var array
-    */
-    var $_currentGroup = null;
-
-   /**
-    * Additional style information for different elements
-    * @var array
-    */
-    var $_elementStyles = array();
-
-   /**
-    * true: collect all hidden elements into string; false: process them as usual form elements
-    * @var bool
-    */
-    var $_collectHidden = false;
-
-   /**
-    * true:  render an array of labels to many labels, $key 0 named 'label', the rest "label_$key"
-    * false: leave labels as defined
-    * @var bool
-    */
-    var $_staticLabels = false;
-   /**#@-*/
-
-   /**
-    * Constructor
-    *
-    * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
-    * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
-    * @access public
-    */
-    function HTML_QuickForm_Renderer_Array($collectHidden = false, $staticLabels = false)
-    {
-        $this->HTML_QuickForm_Renderer();
-        $this->_collectHidden = $collectHidden;
-        $this->_staticLabels  = $staticLabels;
-    } // end constructor
-
-
-   /**
-    * Returns the resultant array
-    *
-    * @access public
-    * @return array
-    */
-    function toArray()
-    {
-        return $this->_ary;
-    }
-
-
-    function startForm(&$form)
-    {
-        $this->_ary = array(
-            'frozen'            => $form->isFrozen(),
-            'javascript'        => $form->getValidationScript(),
-            'attributes'        => $form->getAttributes(true),
-            'requirednote'      => $form->getRequiredNote(),
-            'errors'            => array()
-        );
-        if ($this->_collectHidden) {
-            $this->_ary['hidden'] = '';
-        }
-        $this->_elementIdx     = 1;
-        $this->_currentSection = null;
-        $this->_sectionCount   = 0;
-    } // end func startForm
-
-
-    function renderHeader(&$header)
-    {
-        $this->_ary['sections'][$this->_sectionCount] = array(
-            'header' => $header->toHtml(),
-            'name'   => $header->getName()
-        );
-        $this->_currentSection = $this->_sectionCount++;
-    } // end func renderHeader
-
-
-    function renderElement(&$element, $required, $error)
-    {
-        $elAry = $this->_elementToArray($element, $required, $error);
-        if (!empty($error)) {
-            $this->_ary['errors'][$elAry['name']] = $error;
-        }
-        $this->_storeArray($elAry);
-    } // end func renderElement
-
-
-    function renderHidden(&$element)
-    {
-        if ($this->_collectHidden) {
-            $this->_ary['hidden'] .= $element->toHtml() . "\n";
-        } else {
-            $this->renderElement($element, false, null);
-        }
-    } // end func renderHidden
-
-
-    function startGroup(&$group, $required, $error)
-    {
-        $this->_currentGroup = $this->_elementToArray($group, $required, $error);
-        if (!empty($error)) {
-            $this->_ary['errors'][$this->_currentGroup['name']] = $error;
-        }
-    } // end func startGroup
-
-
-    function finishGroup(&$group)
-    {
-        $this->_storeArray($this->_currentGroup);
-        $this->_currentGroup = null;
-    } // end func finishGroup
-
-
-   /**
-    * Creates an array representing an element
-    *
-    * @access private
-    * @param  HTML_QuickForm_element    element being processed
-    * @param  bool                      Whether an element is required
-    * @param  string                    Error associated with the element
-    * @return array
-    */
-    function _elementToArray(&$element, $required, $error)
-    {
-        $ret = array(
-            'name'      => $element->getName(),
-            'value'     => $element->getValue(),
-            'type'      => $element->getType(),
-            'frozen'    => $element->isFrozen(),
-            'required'  => $required,
-            'error'     => $error
-        );
-        // render label(s)
-        $labels = $element->getLabel();
-        if (is_array($labels) && $this->_staticLabels) {
-            foreach($labels as $key => $label) {
-                $key = is_int($key)? $key + 1: $key;
-                if (1 === $key) {
-                    $ret['label'] = $label;
-                } else {
-                    $ret['label_' . $key] = $label;
-                }
-            }
-        } else {
-            $ret['label'] = $labels;
-        }
-
-        // set the style for the element
-        if (isset($this->_elementStyles[$ret['name']])) {
-            $ret['style'] = $this->_elementStyles[$ret['name']];
-        }
-        if ('group' == $ret['type']) {
-            $ret['separator'] = $element->_separator;
-            $ret['elements']  = array();
-        } else {
-            $ret['html']      = $element->toHtml();
-        }
-        return $ret;
-    }
-
-
-   /**
-    * Stores an array representation of an element in the form array
-    *
-    * @access private
-    * @param array  Array representation of an element
-    * @return void
-    */
-    function _storeArray($elAry)
-    {
-        // where should we put this element...
-        if (is_array($this->_currentGroup) && ('group' != $elAry['type'])) {
-            $this->_currentGroup['elements'][] = $elAry;
-        } elseif (isset($this->_currentSection)) {
-            $this->_ary['sections'][$this->_currentSection]['elements'][] = $elAry;
-        } else {
-            $this->_ary['elements'][] = $elAry;
-        }
-    }
-
-
-   /**
-    * Sets a style to use for element rendering
-    *
-    * @param mixed      element name or array ('element name' => 'style name')
-    * @param string     style name if $elementName is not an array
-    * @access public
-    * @return void
-    */
-    function setElementStyle($elementName, $styleName = null)
-    {
-        if (is_array($elementName)) {
-            $this->_elementStyles = array_merge($this->_elementStyles, $elementName);
-        } else {
-            $this->_elementStyles[$elementName] = $styleName;
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ArraySmarty.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ArraySmarty.php
deleted file mode 100644
index 4fe94ea74..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ArraySmarty.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A static renderer for HTML_QuickForm, makes an array of form content
- * useful for a Smarty template
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Thomas Schulz <ths@4bconsult.de>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: ArraySmarty.php,v 1.14 2009/04/06 12:02:08 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an array of form contents
- */ 
-require_once 'HTML/QuickForm/Renderer/Array.php';
-
-/**
- * A static renderer for HTML_QuickForm, makes an array of form content
- * useful for a Smarty template
- *
- * Based on old HTML_QuickForm::toArray() code and ITStatic renderer.
- *
- * The form array structure is the following:
- * <pre>
- * Array (
- *  [frozen]       => whether the complete form is frozen'
- *  [javascript]   => javascript for client-side validation
- *  [attributes]   => attributes for <form> tag
- *  [hidden]       => html of all hidden elements
- *  [requirednote] => note about the required elements
- *  [errors] => Array
- *      (
- *          [1st_element_name] => Error for the 1st element
- *          ...
- *          [nth_element_name] => Error for the nth element
- *      )
- *
- *  [header] => Array
- *      (
- *          [1st_header_name] => Header text for the 1st header
- *          ...
- *          [nth_header_name] => Header text for the nth header
- *      )
- *
- *  [1st_element_name] => Array for the 1st element
- *  ...
- *  [nth_element_name] => Array for the nth element
- * </pre>
- *
- * where an element array has the form:
- * <pre>
- *      (
- *          [name]      => element name
- *          [value]     => element value,
- *          [type]      => type of the element
- *          [frozen]    => whether element is frozen
- *          [label]     => label for the element
- *          [required]  => whether element is required
- * // if element is not a group:
- *          [html]      => HTML for the element
- * // if element is a group:
- *          [separator] => separator for group elements
- *          [1st_gitem_name] => Array for the 1st element in group
- *          ...
- *          [nth_gitem_name] => Array for the nth element in group
- *      )
- * )
- * </pre>
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Thomas Schulz <ths@4bconsult.de>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_Renderer_ArraySmarty extends HTML_QuickForm_Renderer_Array
-{
-   /**#@+
-    * @access private
-    */
-   /**
-    * The Smarty template engine instance
-    * @var object
-    */
-    var $_tpl = null;
-
-   /**
-    * Current element index
-    * @var integer
-    */
-    var $_elementIdx = 0;
-
-    /**
-    * The current element index inside a group
-    * @var integer
-    */
-    var $_groupElementIdx = 0;
-
-   /**
-    * How to handle the required tag for required fields
-    * @var string
-    * @see      setRequiredTemplate()
-    */
-    var $_required = '';
-
-   /**
-    * How to handle error messages in form validation
-    * @var string
-    * @see      setErrorTemplate()
-    */
-    var $_error = '';
-   /**#@-*/
-
-   /**
-    * Constructor
-    *
-    * @param  Smarty  reference to the Smarty template engine instance
-    * @param  bool    true: render an array of labels to many labels, $key 0 to 'label' and the oterh to "label_$key"
-    * @param  bool    true: collect all hidden elements into string; false: process them as usual form elements
-    * @access public
-    */
-    function HTML_QuickForm_Renderer_ArraySmarty(&$tpl, $staticLabels = false, $collectHidden = true)
-    {
-        $this->HTML_QuickForm_Renderer_Array($collectHidden, $staticLabels);
-        $this->_tpl =& $tpl;
-    } // end constructor
-
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
-    function renderHeader(&$header)
-    {
-        if ($name = $header->getName()) {
-            $this->_ary['header'][$name] = $header->toHtml();
-        } else {
-            $this->_ary['header'][$this->_sectionCount] = $header->toHtml();
-        }
-        $this->_currentSection = $this->_sectionCount++;
-    } // end func renderHeader
-
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @param    bool                    Whether a group is required
-    * @param    string                  An error message associated with a group
-    * @access   public
-    * @return   void
-    */
-    function startGroup(&$group, $required, $error)
-    {
-        parent::startGroup($group, $required, $error);
-        $this->_groupElementIdx = 1;
-    } // end func startGroup
-
-   /**
-    * Creates an array representing an element containing
-    * the key for storing this
-    *
-    * @access private
-    * @param  HTML_QuickForm_element    form element being visited
-    * @param  bool                      Whether an element is required
-    * @param  string                    Error associated with the element
-    * @return array
-    */
-    function _elementToArray(&$element, $required, $error)
-    {
-        $ret = parent::_elementToArray($element, $required, $error);
-
-        if ('group' == $ret['type']) {
-            $ret['html'] = $element->toHtml();
-            // we don't need the elements, see the array structure
-            unset($ret['elements']);
-        }
-        if (($required || $error) && !empty($this->_required)){
-            $this->_renderRequired($ret['label'], $ret['html'], $required, $error);
-        }
-        if ($error && !empty($this->_error)) {
-            $this->_renderError($ret['label'], $ret['html'], $error);
-            $ret['error'] = $error;
-        }
-        // create keys for elements grouped by native group or name
-        if (strstr($ret['name'], '[') or $this->_currentGroup) {
-            // Fix for bug #8123: escape backslashes and quotes to prevent errors 
-            // in eval(). The code below seems to handle the case where element
-            // name has unbalanced square brackets. Dunno whether we really
-            // need this after the fix for #8123, but I'm wary of making big
-            // changes to this code.  
-            preg_match('/([^]]*)\\[([^]]*)\\]/', $ret['name'], $matches);
-            if (isset($matches[1])) {
-                $sKeysSub = substr_replace($ret['name'], '', 0, strlen($matches[1]));
-                $sKeysSub = str_replace(
-                    array('\\',   '\'',   '['  ,   ']', '[\'\']'),
-                    array('\\\\', '\\\'', '[\'', '\']', '[]'    ),
-                    $sKeysSub
-                );
-                $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $matches[1]) . '\']' . $sKeysSub;
-            } else {
-                $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']) . '\']';
-            }
-            // special handling for elements in native groups
-            if ($this->_currentGroup) {
-                // skip unnamed group items unless radios: no name -> no static access
-                // identification: have the same key string as the parent group
-                if ($this->_currentGroup['keys'] == $sKeys and 'radio' != $ret['type']) {
-                    return false;
-                }
-                // reduce string of keys by remove leading group keys
-                if (0 === strpos($sKeys, $this->_currentGroup['keys'])) {
-                    $sKeys = substr_replace($sKeys, '', 0, strlen($this->_currentGroup['keys']));
-                }
-            }
-        // element without a name
-        } elseif ($ret['name'] == '') {
-            $sKeys = '[\'element_' . $this->_elementIdx . '\']';
-        // other elements
-        } else {
-            $sKeys = '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['name']) . '\']';
-        }
-        // for radios: add extra key from value
-        if ('radio' == $ret['type'] and substr($sKeys, -2) != '[]') {
-            $sKeys .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret['value']) . '\']';
-        }
-        $this->_elementIdx++;
-        $ret['keys'] = $sKeys;
-        return $ret;
-    } // end func _elementToArray
-
-   /**
-    * Stores an array representation of an element in the form array
-    *
-    * @access private
-    * @param array  Array representation of an element
-    * @return void
-    */
-    function _storeArray($elAry)
-    {
-        if ($elAry) {
-            $sKeys = $elAry['keys'];
-            unset($elAry['keys']);
-            // where should we put this element...
-            if (is_array($this->_currentGroup) && ('group' != $elAry['type'])) {
-                $toEval = '$this->_currentGroup' . $sKeys . ' = $elAry;';
-            } else {
-                $toEval = '$this->_ary' . $sKeys . ' = $elAry;';
-            }
-            eval($toEval);
-        }
-        return;
-    }
-
-   /**
-    * Called when an element is required
-    *
-    * This method will add the required tag to the element label and/or the element html
-    * such as defined with the method setRequiredTemplate.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    boolean     The element required
-    * @param    string      The element error
-    * @see      setRequiredTemplate()
-    * @access   private
-    * @return   void
-    */
-    function _renderRequired(&$label, &$html, &$required, &$error)
-    {
-        $this->_tpl->assign(array(
-            'label'    => $label,
-            'html'     => $html,
-            'required' => $required,
-            'error'    => $error
-        ));
-        if (!empty($label) && strpos($this->_required, $this->_tpl->left_delimiter . '$label') !== false) {
-            $label = $this->_tplFetch($this->_required);
-        }
-        if (!empty($html) && strpos($this->_required, $this->_tpl->left_delimiter . '$html') !== false) {
-            $html = $this->_tplFetch($this->_required);
-        }
-        $this->_tpl->clear_assign(array('label', 'html', 'required'));
-    } // end func _renderRequired
-
-   /**
-    * Called when an element has a validation error
-    *
-    * This method will add the error message to the element label or the element html
-    * such as defined with the method setErrorTemplate. If the error placeholder is not found
-    * in the template, the error will be displayed in the form error block.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    string      The element error
-    * @see      setErrorTemplate()
-    * @access   private
-    * @return   void
-    */
-    function _renderError(&$label, &$html, &$error)
-    {
-        $this->_tpl->assign(array('label' => '', 'html' => '', 'error' => $error));
-        $error = $this->_tplFetch($this->_error);
-        $this->_tpl->assign(array('label' => $label, 'html'  => $html));
-
-        if (!empty($label) && strpos($this->_error, $this->_tpl->left_delimiter . '$label') !== false) {
-            $label = $this->_tplFetch($this->_error);
-        } elseif (!empty($html) && strpos($this->_error, $this->_tpl->left_delimiter . '$html') !== false) {
-            $html = $this->_tplFetch($this->_error);
-        }
-        $this->_tpl->clear_assign(array('label', 'html', 'error'));
-    } // end func _renderError
-
-   /**
-    * Process an template sourced in a string with Smarty
-    *
-    * Smarty has no core function to render	a template given as a string.
-    * So we use the smarty eval plugin function	to do this.
-    *
-    * @param    string      The template source
-    * @access   private
-    * @return   void
-    */
-    function _tplFetch($tplSource)
-    {
-        if (!function_exists('smarty_function_eval')) {
-            require SMARTY_DIR . '/plugins/function.eval.php';
-        }
-        return smarty_function_eval(array('var' => $tplSource), $this->_tpl);
-    }// end func _tplFetch
-
-   /**
-    * Sets the way required elements are rendered
-    *
-    * You can use {$label} or {$html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * required tag. They will be replaced accordingly with the right value.	You
-    * can use the full smarty syntax here, especially a custom modifier for I18N.
-    * For example:
-    * {if $required}<span style="color: red;">*</span>{/if}{$label|translate}
-    * will put a red star in front of the label if the element is required and
-    * translate the label.
-    *
-    *
-    * @param    string      The required element template
-    * @access   public
-    * @return   void
-    */
-    function setRequiredTemplate($template)
-    {
-        $this->_required = $template;
-    } // end func setRequiredTemplate
-
-   /**
-    * Sets the way elements with validation errors are rendered
-    *
-    * You can use {$label} or {$html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * error message. They will be replaced accordingly with the right value.
-    * The error message will replace the {$error} placeholder.
-    * For example:
-    * {if $error}<span style="color: red;">{$error}</span>{/if}<br />{$html}
-    * will put the error message in red on top of the element html.
-    *
-    * If you want all error messages to be output in the main error block, use
-    * the {$form.errors} part of the rendered array that collects all raw error
-    * messages.
-    *
-    * If you want to place all error messages manually, do not specify {$html}
-    * nor {$label}.
-    *
-    * Groups can have special layouts. With this kind of groups, you have to
-    * place the formated error message manually. In this case, use {$form.group.error}
-    * where you want the formated error message to appear in the form.
-    *
-    * @param    string      The element error template
-    * @access   public
-    * @return   void
-    */
-    function setErrorTemplate($template)
-    {
-        $this->_error = $template;
-    } // end func setErrorTemplate
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Default.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Default.php
deleted file mode 100644
index 2997ee6c1..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Default.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A concrete renderer for HTML_QuickForm, based on QuickForm 2.x built-in one
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id$
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- */
-require_once 'HTML/QuickForm/Renderer.php';
-
-/**
- * A concrete renderer for HTML_QuickForm, based on QuickForm 2.x built-in one
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
-{
-   /**
-    * The HTML of the form  
-    * @var      string
-    * @access   private
-    */
-    var $_html;
-
-   /**
-    * Header Template string
-    * @var      string
-    * @access   private
-    */
-    var $_headerTemplate = 
-        "\n\t<tr>\n\t\t<td style=\"white-space: nowrap; background-color: #CCCCCC;\" align=\"left\" valign=\"top\" colspan=\"2\"><b>{header}</b></td>\n\t</tr>";
-
-   /**
-    * Element template string
-    * @var      string
-    * @access   private
-    */
-    var $_elementTemplate = 
-        "\n\t<tr>\n\t\t<td align=\"right\" valign=\"top\"><!-- BEGIN required --><span style=\"color: #ff0000\">*</span><!-- END required --><b>{label}</b></td>\n\t\t<td valign=\"top\" align=\"left\"><!-- BEGIN error --><span style=\"color: #ff0000\">{error}</span><br /><!-- END error -->\t{element}</td>\n\t</tr>";
-
-   /**
-    * Form template string
-    * @var      string
-    * @access   private
-    */
-    var $_formTemplate = 
-        "\n<form{attributes}>\n<div>\n{hidden}<table border=\"0\">\n{content}\n</table>\n</div>\n</form>";
-
-   /**
-    * Required Note template string
-    * @var      string
-    * @access   private
-    */
-    var $_requiredNoteTemplate = 
-        "\n\t<tr>\n\t\t<td></td>\n\t<td align=\"left\" valign=\"top\">{requiredNote}</td>\n\t</tr>";
-
-   /**
-    * Array containing the templates for customised elements
-    * @var      array
-    * @access   private
-    */
-    var $_templates = array();
-
-   /**
-    * Array containing the templates for group wraps.
-    * 
-    * These templates are wrapped around group elements and groups' own
-    * templates wrap around them. This is set by setGroupTemplate().
-    * 
-    * @var      array
-    * @access   private
-    */
-    var $_groupWraps = array();
-
-   /**
-    * Array containing the templates for elements within groups
-    * @var      array
-    * @access   private
-    */
-    var $_groupTemplates = array();
-
-   /**
-    * True if we are inside a group 
-    * @var      bool
-    * @access   private
-    */
-    var $_inGroup = false;
-
-   /**
-    * Array with HTML generated for group elements
-    * @var      array
-    * @access   private
-    */
-    var $_groupElements = array();
-
-   /**
-    * Template for an element inside a group
-    * @var      string
-    * @access   private
-    */
-    var $_groupElementTemplate = '';
-
-   /**
-    * HTML that wraps around the group elements
-    * @var      string
-    * @access   private
-    */
-    var $_groupWrap = '';
-
-   /**
-    * HTML for the current group
-    * @var      string
-    * @access   private
-    */
-    var $_groupTemplate = '';
-    
-   /**
-    * Collected HTML of the hidden fields
-    * @var      string
-    * @access   private
-    */
-    var $_hiddenHtml = '';
-
-   /**
-    * Constructor
-    *
-    * @access public
-    */
-    function HTML_QuickForm_Renderer_Default()
-    {
-        $this->HTML_QuickForm_Renderer();
-    } // end constructor
-
-   /**
-    * returns the HTML generated for the form
-    *
-    * @access public
-    * @return string
-    */
-    function toHtml()
-    {
-        // _hiddenHtml is cleared in finishForm(), so this only matters when
-        // finishForm() was not called (e.g. group::toHtml(), bug #3511)
-        return $this->_hiddenHtml . $this->_html;
-    } // end func toHtml
-    
-   /**
-    * Called when visiting a form, before processing any form elements
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
-    function startForm(&$form)
-    {
-        $this->_html = '';
-        $this->_hiddenHtml = '';
-    } // end func startForm
-
-   /**
-    * Called when visiting a form, after processing all form elements
-    * Adds required note, form attributes, validation javascript and form content.
-    * 
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
-    function finishForm(&$form)
-    {
-        // add a required note, if one is needed
-        if (!empty($form->_required) && !$form->_freezeAll) {
-            $this->_html .= str_replace('{requiredNote}', $form->getRequiredNote(), $this->_requiredNoteTemplate);
-        }
-        // add form attributes and content
-        $html = str_replace('{attributes}', $form->getAttributes(true), $this->_formTemplate);
-        if (strpos($this->_formTemplate, '{hidden}')) {
-            $html = str_replace('{hidden}', $this->_hiddenHtml, $html);
-        } else {
-            $this->_html .= $this->_hiddenHtml;
-        }
-        $this->_hiddenHtml = '';
-        $this->_html = str_replace('{content}', $this->_html, $html);
-        // add a validation script
-        if ('' != ($script = $form->getValidationScript())) {
-            $this->_html = $script . "\n" . $this->_html;
-        }
-    } // end func finishForm
-      
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
-    function renderHeader(&$header)
-    {
-        $name = $header->getName();
-        if (!empty($name) && isset($this->_templates[$name])) {
-            $this->_html .= str_replace('{header}', $header->toHtml(), $this->_templates[$name]);
-        } else {
-            $this->_html .= str_replace('{header}', $header->toHtml(), $this->_headerTemplate);
-        }
-    } // end func renderHeader
-
-   /**
-    * Helper method for renderElement
-    *
-    * @param    string      Element name
-    * @param    mixed       Element label (if using an array of labels, you should set the appropriate template)
-    * @param    bool        Whether an element is required
-    * @param    string      Error message associated with the element
-    * @access   private
-    * @see      renderElement()
-    * @return   string      Html for element
-    */
-    function _prepareTemplate($name, $label, $required, $error)
-    {
-        if (is_array($label)) {
-            $nameLabel = array_shift($label);
-        } else {
-            $nameLabel = $label;
-        }
-        if (isset($this->_templates[$name])) {
-            $html = str_replace('{label}', $nameLabel, $this->_templates[$name]);
-        } else {
-            $html = str_replace('{label}', $nameLabel, $this->_elementTemplate);
-        }
-        if ($required) {
-            $html = str_replace('<!-- BEGIN required -->', '', $html);
-            $html = str_replace('<!-- END required -->', '', $html);
-        } else {
-            $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->.*<!-- END required -->([ \t\n\r]*)?/isU", '', $html);
-        }
-        if (isset($error)) {
-            $html = str_replace('{error}', $error, $html);
-            $html = str_replace('<!-- BEGIN error -->', '', $html);
-            $html = str_replace('<!-- END error -->', '', $html);
-        } else {
-            $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN error -->.*<!-- END error -->([ \t\n\r]*)?/isU", '', $html);
-        }
-        if (is_array($label)) {
-            foreach($label as $key => $text) {
-                $key  = is_int($key)? $key + 2: $key;
-                $html = str_replace("{label_{$key}}", $text, $html);
-                $html = str_replace("<!-- BEGIN label_{$key} -->", '', $html);
-                $html = str_replace("<!-- END label_{$key} -->", '', $html);
-            }
-        }
-        if (strpos($html, '{label_')) {
-            $html = preg_replace('/\s*<!-- BEGIN label_(\S+) -->.*<!-- END label_\1 -->\s*/is', '', $html);
-        }
-        return $html;
-    } // end func _prepareTemplate
-
-   /**
-    * Renders an element Html
-    * Called when visiting an element
-    *
-    * @param HTML_QuickForm_element form element being visited
-    * @param bool                   Whether an element is required
-    * @param string                 An error message associated with an element
-    * @access public
-    * @return void
-    */
-    function renderElement(&$element, $required, $error)
-    {
-        if (!$this->_inGroup) {
-            $html = $this->_prepareTemplate($element->getName(), $element->getLabel(), $required, $error);
-            $this->_html .= str_replace('{element}', $element->toHtml(), $html);
-
-        } elseif (!empty($this->_groupElementTemplate)) {
-            $html = str_replace('{label}', $element->getLabel(), $this->_groupElementTemplate);
-            if ($required) {
-                $html = str_replace('<!-- BEGIN required -->', '', $html);
-                $html = str_replace('<!-- END required -->', '', $html);
-            } else {
-                $html = preg_replace("/([ \t\n\r]*)?<!-- BEGIN required -->.*<!-- END required -->([ \t\n\r]*)?/isU", '', $html);
-            }
-            $this->_groupElements[] = str_replace('{element}', $element->toHtml(), $html);
-
-        } else {
-            $this->_groupElements[] = $element->toHtml();
-        }
-    } // end func renderElement
-   
-   /**
-    * Renders an hidden element
-    * Called when visiting a hidden element
-    * 
-    * @param HTML_QuickForm_element     form element being visited
-    * @access public
-    * @return void
-    */
-    function renderHidden(&$element)
-    {
-        $this->_hiddenHtml .= $element->toHtml() . "\n";
-    } // end func renderHidden
-
-   /**
-    * Called when visiting a raw HTML/text pseudo-element
-    * 
-    * @param  HTML_QuickForm_html   element being visited
-    * @access public
-    * @return void
-    */
-    function renderHtml(&$data)
-    {
-        $this->_html .= $data->toHtml();
-    } // end func renderHtml
-
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param HTML_QuickForm_group   group being visited
-    * @param bool       Whether a group is required
-    * @param string     An error message associated with a group
-    * @access public
-    * @return void
-    */
-    function startGroup(&$group, $required, $error)
-    {
-        $name = $group->getName();
-        $this->_groupTemplate        = $this->_prepareTemplate($name, $group->getLabel(), $required, $error);
-        $this->_groupElementTemplate = empty($this->_groupTemplates[$name])? '': $this->_groupTemplates[$name];
-        $this->_groupWrap            = empty($this->_groupWraps[$name])? '': $this->_groupWraps[$name];
-        $this->_groupElements        = array();
-        $this->_inGroup              = true;
-    } // end func startGroup
-
-   /**
-    * Called when visiting a group, after processing all group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @access   public
-    * @return   void
-    */
-    function finishGroup(&$group)
-    {
-        $separator = $group->_separator;
-        if (is_array($separator)) {
-            $count = count($separator);
-            $html  = '';
-            for ($i = 0; $i < count($this->_groupElements); $i++) {
-                $html .= (0 == $i? '': $separator[($i - 1) % $count]) . $this->_groupElements[$i];
-            }
-        } else {
-            if (is_null($separator)) {
-                $separator = '&nbsp;';
-            }
-            $html = implode((string)$separator, $this->_groupElements);
-        }
-        if (!empty($this->_groupWrap)) {
-            $html = str_replace('{content}', $html, $this->_groupWrap);
-        }
-        $this->_html   .= str_replace('{element}', $html, $this->_groupTemplate);
-        $this->_inGroup = false;
-    } // end func finishGroup
-
-    /**
-     * Sets element template 
-     *
-     * @param       string      The HTML surrounding an element 
-     * @param       string      (optional) Name of the element to apply template for
-     * @access      public
-     * @return      void
-     */
-    function setElementTemplate($html, $element = null)
-    {
-        if (is_null($element)) {
-            $this->_elementTemplate = $html;
-        } else {
-            $this->_templates[$element] = $html;
-        }
-    } // end func setElementTemplate
-
-
-    /**
-     * Sets template for a group wrapper 
-     * 
-     * This template is contained within a group-as-element template 
-     * set via setTemplate() and contains group's element templates, set
-     * via setGroupElementTemplate()
-     *
-     * @param       string      The HTML surrounding group elements
-     * @param       string      Name of the group to apply template for
-     * @access      public
-     * @return      void
-     */
-    function setGroupTemplate($html, $group)
-    {
-        $this->_groupWraps[$group] = $html;
-    } // end func setGroupTemplate
-
-    /**
-     * Sets element template for elements within a group
-     *
-     * @param       string      The HTML surrounding an element 
-     * @param       string      Name of the group to apply template for
-     * @access      public
-     * @return      void
-     */
-    function setGroupElementTemplate($html, $group)
-    {
-        $this->_groupTemplates[$group] = $html;
-    } // end func setGroupElementTemplate
-
-    /**
-     * Sets header template
-     *
-     * @param       string      The HTML surrounding the header 
-     * @access      public
-     * @return      void
-     */
-    function setHeaderTemplate($html)
-    {
-        $this->_headerTemplate = $html;
-    } // end func setHeaderTemplate
-
-    /**
-     * Sets form template 
-     *
-     * @param     string    The HTML surrounding the form tags 
-     * @access    public
-     * @return    void
-     */
-    function setFormTemplate($html)
-    {
-        $this->_formTemplate = $html;
-    } // end func setFormTemplate
-
-    /**
-     * Sets the note indicating required fields template
-     *
-     * @param       string      The HTML surrounding the required note 
-     * @access      public
-     * @return      void
-     */
-    function setRequiredNoteTemplate($html)
-    {
-        $this->_requiredNoteTemplate = $html;
-    } // end func setRequiredNoteTemplate
-
-    /**
-     * Clears all the HTML out of the templates that surround notes, elements, etc.
-     * Useful when you want to use addData() to create a completely custom form look
-     *
-     * @access  public
-     * @return  void
-     */
-    function clearAllTemplates()
-    {
-        $this->setElementTemplate('{element}');
-        $this->setFormTemplate("\n\t<form{attributes}>{content}\n\t</form>\n");
-        $this->setRequiredNoteTemplate('');
-        $this->_templates = array();
-    } // end func clearAllTemplates
-} // end class HTML_QuickForm_Renderer_Default
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITDynamic.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITDynamic.php
deleted file mode 100644
index 80edd9b51..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITDynamic.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A concrete renderer for HTML_QuickForm, using Integrated Templates.
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: ITDynamic.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- */
-require_once 'HTML/QuickForm/Renderer.php';
-
-/**
- * A concrete renderer for HTML_QuickForm, using Integrated Templates.
- * 
- * This is a "dynamic" renderer, which means that concrete form look 
- * is defined at runtime. This also means that you can define 
- * <b>one</b> template file for <b>all</b> your forms. That template
- * should contain a block for every element 'look' appearing in your 
- * forms and also some special blocks (consult the examples). If a
- * special block is not set for an element, the renderer falls back to
- * a default one.
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_Renderer_ITDynamic extends HTML_QuickForm_Renderer
-{
-   /**#@+
-    * @access private
-    */
-   /**
-    * A template class (HTML_Template_ITX or HTML_Template_Sigma) instance
-    * @var HTML_Template_ITX|HTML_Template_Sigma
-    */
-    var $_tpl = null;
-
-   /**
-    * The errors that were not shown near concrete fields go here
-    * @var array
-    */
-    var $_errors = array();
-
-   /**
-    * Show the block with required note?
-    * @var bool
-    */
-    var $_showRequired = false;
-
-   /**
-    * A separator for group elements
-    * @var mixed
-    */
-    var $_groupSeparator = null;
-
-   /**
-    * The current element index inside a group
-    * @var integer
-    */
-    var $_groupElementIdx = 0;
-
-   /**
-    * Blocks to use for different elements  
-    * @var array
-    */
-    var $_elementBlocks = array();
-
-   /**
-    * Block to use for headers
-    * @var string
-    */
-    var $_headerBlock = null;
-   /**#@-*/
-
-
-   /**
-    * Constructor
-    *
-    * @param HTML_Template_ITX|HTML_Template_Sigma     Template object to use
-    */
-    function HTML_QuickForm_Renderer_ITDynamic(&$tpl)
-    {
-        $this->HTML_QuickForm_Renderer();
-        $this->_tpl =& $tpl;
-        $this->_tpl->setCurrentBlock('qf_main_loop');
-    }
-
-
-    function finishForm(&$form)
-    {
-        // display errors above form
-        if (!empty($this->_errors) && $this->_tpl->blockExists('qf_error_loop')) {
-            foreach ($this->_errors as $error) {
-                $this->_tpl->setVariable('qf_error', $error);
-                $this->_tpl->parse('qf_error_loop');
-            }
-        }
-        // show required note
-        if ($this->_showRequired) {
-            $this->_tpl->setVariable('qf_required_note', $form->getRequiredNote());
-        }
-        // assign form attributes
-        $this->_tpl->setVariable('qf_attributes', $form->getAttributes(true));
-        // assign javascript validation rules
-        $this->_tpl->setVariable('qf_javascript', $form->getValidationScript());
-    }
-      
-
-    function renderHeader(&$header)
-    {
-        $blockName = $this->_matchBlock($header);
-        if ('qf_header' == $blockName && isset($this->_headerBlock)) {
-            $blockName = $this->_headerBlock;
-        }
-        $this->_tpl->setVariable('qf_header', $header->toHtml());
-        $this->_tpl->parse($blockName);
-        $this->_tpl->parse('qf_main_loop');
-    }
-
-
-    function renderElement(&$element, $required, $error)
-    {
-        $blockName = $this->_matchBlock($element);
-        // are we inside a group?
-        if ('qf_main_loop' != $this->_tpl->currentBlock) {
-            if (0 != $this->_groupElementIdx && $this->_tpl->placeholderExists('qf_separator', $blockName)) {
-                if (is_array($this->_groupSeparator)) {
-                    $this->_tpl->setVariable('qf_separator', $this->_groupSeparator[($this->_groupElementIdx - 1) % count($this->_groupSeparator)]);
-                } else {
-                    $this->_tpl->setVariable('qf_separator', (string)$this->_groupSeparator);
-                }
-            }
-            $this->_groupElementIdx++;
-
-        } elseif(!empty($error)) {
-            // show the error message or keep it for later use
-            if ($this->_tpl->blockExists($blockName . '_error')) {
-                $this->_tpl->setVariable('qf_error', $error);
-            } else {
-                $this->_errors[] = $error;
-            }
-        }
-        // show an '*' near the required element
-        if ($required) {
-            $this->_showRequired = true;
-            if ($this->_tpl->blockExists($blockName . '_required')) {
-                $this->_tpl->touchBlock($blockName . '_required');
-            }
-        }
-        // Prepare multiple labels
-        $labels = $element->getLabel();
-        if (is_array($labels)) {
-            $mainLabel = array_shift($labels);
-        } else {
-            $mainLabel = $labels;
-        }
-        // render the element itself with its main label
-        $this->_tpl->setVariable('qf_element', $element->toHtml());
-        if ($this->_tpl->placeholderExists('qf_label', $blockName)) {
-            $this->_tpl->setVariable('qf_label', $mainLabel);
-        }
-        // render extra labels, if any
-        if (is_array($labels)) {
-            foreach($labels as $key => $label) {
-                $key = is_int($key)? $key + 2: $key;
-                if ($this->_tpl->blockExists($blockName . '_label_' . $key)) {
-                    $this->_tpl->setVariable('qf_label_' . $key, $label);
-                }
-            }
-        }
-        $this->_tpl->parse($blockName);
-        $this->_tpl->parseCurrentBlock();
-    }
-   
-
-    function renderHidden(&$element)
-    {
-        $this->_tpl->setVariable('qf_hidden', $element->toHtml());
-        $this->_tpl->parse('qf_hidden_loop');
-    }
-
-
-    function startGroup(&$group, $required, $error)
-    {
-        $blockName = $this->_matchBlock($group);
-        $this->_tpl->setCurrentBlock($blockName . '_loop');
-        $this->_groupElementIdx = 0;
-        $this->_groupSeparator  = is_null($group->_separator)? '&nbsp;': $group->_separator;
-        // show an '*' near the required element
-        if ($required) {
-            $this->_showRequired = true;
-            if ($this->_tpl->blockExists($blockName . '_required')) {
-                $this->_tpl->touchBlock($blockName . '_required');
-            }
-        }
-        // show the error message or keep it for later use
-        if (!empty($error)) {
-            if ($this->_tpl->blockExists($blockName . '_error')) {
-                $this->_tpl->setVariable('qf_error', $error);
-            } else {
-                $this->_errors[] = $error;
-            }
-        }
-        $this->_tpl->setVariable('qf_group_label', $group->getLabel());
-    }
-
-
-    function finishGroup(&$group)
-    {
-        $this->_tpl->parse($this->_matchBlock($group));
-        $this->_tpl->setCurrentBlock('qf_main_loop');
-        $this->_tpl->parseCurrentBlock();
-    }
-
-
-   /**
-    * Returns the name of a block to use for element rendering
-    * 
-    * If a name was not explicitly set via setElementBlock(), it tries
-    * the names '{prefix}_{element type}' and '{prefix}_{element}', where
-    * prefix is either 'qf' or the name of the current group's block
-    * 
-    * @param HTML_QuickForm_element     form element being rendered
-    * @access private
-    * @return string    block name
-    */
-    function _matchBlock(&$element)
-    {
-        $name = $element->getName();
-        $type = $element->getType();
-        if (isset($this->_elementBlocks[$name]) && $this->_tpl->blockExists($this->_elementBlocks[$name])) {
-            if (('group' == $type) || ($this->_elementBlocks[$name] . '_loop' != $this->_tpl->currentBlock)) {
-                return $this->_elementBlocks[$name];
-            }
-        }
-        if ('group' != $type && 'qf_main_loop' != $this->_tpl->currentBlock) {
-            $prefix = substr($this->_tpl->currentBlock, 0, -5); // omit '_loop' postfix
-        } else {
-            $prefix = 'qf';
-        }
-        if ($this->_tpl->blockExists($prefix . '_' . $type)) {
-            return $prefix . '_' . $type;
-        } elseif ($this->_tpl->blockExists($prefix . '_' . $name)) {
-            return $prefix . '_' . $name;
-        } else {
-            return $prefix . '_element';
-        }
-    }
-
-
-   /**
-    * Sets the block to use for element rendering
-    * 
-    * @param mixed      element name or array ('element name' => 'block name')
-    * @param string     block name if $elementName is not an array
-    * @access public
-    * @return void
-    */
-    function setElementBlock($elementName, $blockName = null)
-    {
-        if (is_array($elementName)) {
-            $this->_elementBlocks = array_merge($this->_elementBlocks, $elementName);
-        } else {
-            $this->_elementBlocks[$elementName] = $blockName;
-        }
-    }
-
-
-   /**
-    * Sets the name of a block to use for header rendering
-    *
-    * @param string     block name
-    * @access public
-    * @return void
-    */
-    function setHeaderBlock($blockName)
-    {
-        $this->_headerBlock = $blockName;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITStatic.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITStatic.php
deleted file mode 100644
index 4c9ee9d21..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ITStatic.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A static renderer for HTML_QuickForm compatible 
- * with HTML_Template_IT and HTML_Template_Sigma.
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: ITStatic.php,v 1.9 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- */
-require_once 'HTML/QuickForm/Renderer.php';
-
-/**
- * A static renderer for HTML_QuickForm compatible 
- * with HTML_Template_IT and HTML_Template_Sigma.
- *
- * As opposed to the dynamic renderer, this renderer needs
- * every elements and labels in the form to be specified by
- * placeholders at the position you want them to be displayed.
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_Renderer_ITStatic extends HTML_QuickForm_Renderer
-{
-   /**#@+
-    * @access private
-    */
-   /**
-    * An HTML_Template_IT or some other API compatible Template instance
-    * @var object
-    */
-    var $_tpl = null;
-
-   /**
-    * Rendered form name
-    * @var string
-    */
-    var $_formName = 'form';
-
-   /**
-    * The errors that were not shown near concrete fields go here
-    * @var array
-    */
-    var $_errors = array();
-
-   /**
-    * Show the block with required note?
-    * @var bool
-    */
-    var $_showRequired = false;
-
-   /**
-    * Which group are we currently parsing ?
-    * @var string
-    */
-    var $_inGroup;
-
-   /**
-    * Index of the element in its group
-    * @var int
-    */
-    var $_elementIndex = 0;
-
-   /**
-    * If elements have been added with the same name
-    * @var array
-    */
-    var $_duplicateElements = array();
-
-   /**
-    * How to handle the required tag for required fields
-    * @var string
-    */
-    var $_required = '{label}<font size="1" color="red">*</font>';
-
-   /**
-    * How to handle error messages in form validation
-    * @var string
-    */
-    var $_error = '<font color="red">{error}</font><br />{html}';
-
-   /**
-    * Collected HTML for hidden elements, if needed  
-    * @var string
-    */
-    var $_hidden = '';
-   /**#@-*/
-
-   /**
-    * Constructor
-    *
-    * @param HTML_Template_IT|HTML_Template_Sigma   Template object to use
-    */
-    function HTML_QuickForm_Renderer_ITStatic(&$tpl)
-    {
-        $this->HTML_QuickForm_Renderer();
-        $this->_tpl =& $tpl;
-    } // end constructor
-
-   /**
-    * Called when visiting a form, before processing any form elements
-    *
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
-    function startForm(&$form)
-    {
-        $this->_formName = $form->getAttribute('id');
-
-        if (count($form->_duplicateIndex) > 0) {
-            // Take care of duplicate elements
-            foreach ($form->_duplicateIndex as $elementName => $indexes) {
-                $this->_duplicateElements[$elementName] = 0;
-            }
-        }
-    } // end func startForm
-
-   /**
-    * Called when visiting a form, after processing all form elements
-    * 
-    * @param    HTML_QuickForm  form object being visited
-    * @access   public
-    * @return   void
-    */
-    function finishForm(&$form)
-    {
-        // display errors above form
-        if (!empty($this->_errors) && $this->_tpl->blockExists($this->_formName.'_error_loop')) {
-            foreach ($this->_errors as $error) {
-                $this->_tpl->setVariable($this->_formName.'_error', $error);
-                $this->_tpl->parse($this->_formName.'_error_loop');
-            }
-        }
-        // show required note
-        if ($this->_showRequired) {
-            $this->_tpl->setVariable($this->_formName.'_required_note', $form->getRequiredNote());
-        }
-        // add hidden elements, if collected
-        if (!empty($this->_hidden)) {
-            $this->_tpl->setVariable($this->_formName . '_hidden', $this->_hidden);
-        }
-        // assign form attributes
-        $this->_tpl->setVariable($this->_formName.'_attributes', $form->getAttributes(true));
-        // assign javascript validation rules
-        $this->_tpl->setVariable($this->_formName.'_javascript', $form->getValidationScript());
-    } // end func finishForm
-
-   /**
-    * Called when visiting a header element
-    *
-    * @param    HTML_QuickForm_header   header element being visited
-    * @access   public
-    * @return   void
-    */
-    function renderHeader(&$header)
-    {
-        $name = $header->getName();
-        $varName = $this->_formName.'_header';
-
-        // Find placeHolder
-        if (!empty($name) && $this->_tpl->placeHolderExists($this->_formName.'_header_'.$name)) {
-            $varName = $this->_formName.'_header_'.$name;
-        }
-        $this->_tpl->setVariable($varName, $header->toHtml());
-    } // end func renderHeader
-
-   /**
-    * Called when visiting an element
-    *
-    * @param    HTML_QuickForm_element  form element being visited
-    * @param    bool                    Whether an element is required
-    * @param    string                  An error message associated with an element
-    * @access   public
-    * @return   void
-    */
-    function renderElement(&$element, $required, $error)
-    {
-        $name = $element->getName();
-
-        // are we inside a group?
-        if (!empty($this->_inGroup)) {
-            $varName = $this->_formName.'_'.str_replace(array('[', ']'), '_', $name);
-            if (substr($varName, -2) == '__') {
-                // element name is of type : group[]
-                $varName = $this->_inGroup.'_'.$this->_elementIndex.'_';
-                $this->_elementIndex++;
-            }
-            if ($varName != $this->_inGroup) {
-                $varName .= '_' == substr($varName, -1)? '': '_';
-                // element name is of type : group[name]
-                $label = $element->getLabel();
-                $html = $element->toHtml();
-
-                if ($required && !$element->isFrozen()) {
-                    $this->_renderRequired($label, $html);
-                    $this->_showRequired = true;
-                }
-                if (!empty($label)) {
-                    if (is_array($label)) {
-                        foreach ($label as $key => $value) {
-                            $this->_tpl->setVariable($varName.'label_'.$key, $value);
-                        }
-                    } else {
-                        $this->_tpl->setVariable($varName.'label', $label);
-                    }
-                }
-                $this->_tpl->setVariable($varName.'html', $html);
-            }
-
-        } else {
-
-            $name = str_replace(array('[', ']'), array('_', ''), $name);
-
-            if (isset($this->_duplicateElements[$name])) {
-                // Element is a duplicate
-                $varName = $this->_formName.'_'.$name.'_'.$this->_duplicateElements[$name];
-                $this->_duplicateElements[$name]++;
-            } else {
-                $varName = $this->_formName.'_'.$name;
-            }
-
-            $label = $element->getLabel();
-            $html = $element->toHtml();
-
-            if ($required) {
-                $this->_showRequired = true;
-                $this->_renderRequired($label, $html);
-            }
-            if (!empty($error)) {
-                $this->_renderError($label, $html, $error);
-            }
-            if (is_array($label)) {
-                foreach ($label as $key => $value) {
-                    $this->_tpl->setVariable($varName.'_label_'.$key, $value);
-                }
-            } else {
-                $this->_tpl->setVariable($varName.'_label', $label);
-            }
-            $this->_tpl->setVariable($varName.'_html', $html);
-        }
-    } // end func renderElement
-
-   /**
-    * Called when visiting a hidden element
-    * 
-    * @param    HTML_QuickForm_element  hidden element being visited
-    * @access   public
-    * @return   void
-    */
-    function renderHidden(&$element)
-    {
-        if ($this->_tpl->placeholderExists($this->_formName . '_hidden')) {
-            $this->_hidden .= $element->toHtml();
-        } else {
-            $name = $element->getName();
-            $name = str_replace(array('[', ']'), array('_', ''), $name);
-            $this->_tpl->setVariable($this->_formName.'_'.$name.'_html', $element->toHtml());
-        }
-    } // end func renderHidden
-
-   /**
-    * Called when visiting a group, before processing any group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @param    bool                    Whether a group is required
-    * @param    string                  An error message associated with a group
-    * @access   public
-    * @return   void
-    */
-    function startGroup(&$group, $required, $error)
-    {
-        $name = $group->getName();
-        $varName = $this->_formName.'_'.$name;
-
-        $this->_elementIndex = 0;
-
-        $html = $this->_tpl->placeholderExists($varName.'_html') ? $group->toHtml() : '';
-        $label = $group->getLabel();
-
-        if ($required) {
-            $this->_renderRequired($label, $html);
-        }
-        if (!empty($error)) {
-            $this->_renderError($label, $html, $error);
-        }
-        if (!empty($html)) {
-            $this->_tpl->setVariable($varName.'_html', $html);
-        } else {
-            // Uses error blocks to set the special groups layout error
-            // <!-- BEGIN form_group_error -->{form_group_error}<!-- END form_group_error -->
-            if (!empty($error)) {
-                if ($this->_tpl->placeholderExists($varName.'_error')) {
-                    if ($this->_tpl->blockExists($this->_formName . '_error_block')) {
-                        $this->_tpl->setVariable($this->_formName . '_error', $error);
-                        $error = $this->_getTplBlock($this->_formName . '_error_block');
-                    } elseif (strpos($this->_error, '{html}') !== false || strpos($this->_error, '{label}') !== false) {
-                        $error = str_replace('{error}', $error, $this->_error);
-                    }
-                }
-                $this->_tpl->setVariable($varName . '_error', $error);
-                array_pop($this->_errors);
-            }
-        }
-        if (is_array($label)) {
-            foreach ($label as $key => $value) {
-                $this->_tpl->setVariable($varName.'_label_'.$key, $value);
-            }
-        } else {
-            $this->_tpl->setVariable($varName.'_label', $label);
-        }
-        $this->_inGroup = $varName;
-    } // end func startGroup
-
-   /**
-    * Called when visiting a group, after processing all group elements
-    *
-    * @param    HTML_QuickForm_group    group being visited
-    * @access   public
-    * @return   void
-    */
-    function finishGroup(&$group)
-    {
-        $this->_inGroup = '';
-    } // end func finishGroup
-
-   /**
-    * Sets the way required elements are rendered
-    *
-    * You can use {label} or {html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * required tag. They will be replaced accordingly with the right value.
-    * For example:
-    * <font color="red">*</font>{label}
-    * will put a red star in front of the label if the element is required.
-    *
-    * @param    string      The required element template
-    * @access   public
-    * @return   void
-    */
-    function setRequiredTemplate($template)
-    {
-        $this->_required = $template;
-    } // end func setRequiredTemplate
-
-   /**
-    * Sets the way elements with validation errors are rendered
-    *
-    * You can use {label} or {html} placeholders to let the renderer know where
-    * where the element label or the element html are positionned according to the
-    * error message. They will be replaced accordingly with the right value.
-    * The error message will replace the {error} place holder.
-    * For example:
-    * <font color="red">{error}</font><br />{html}
-    * will put the error message in red on top of the element html.
-    *
-    * If you want all error messages to be output in the main error block, do not specify
-    * {html} nor {label}.
-    *
-    * Groups can have special layouts. With this kind of groups, the renderer will need
-    * to know where to place the error message. In this case, use error blocks like:
-    * <!-- BEGIN form_group_error -->{form_group_error}<!-- END form_group_error -->
-    * where you want the error message to appear in the form.
-    *
-    * @param    string      The element error template
-    * @access   public
-    * @return   void
-    */
-    function setErrorTemplate($template)
-    {
-        $this->_error = $template;
-    } // end func setErrorTemplate
-
-   /**
-    * Called when an element is required
-    *
-    * This method will add the required tag to the element label and/or the element html
-    * such as defined with the method setRequiredTemplate
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @see      setRequiredTemplate()
-    * @access   private
-    * @return   void
-    */
-    function _renderRequired(&$label, &$html)
-    {
-        if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_required_block')) {
-            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName . '_label', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_label', is_array($label)? $label[0]: $label);
-                if (is_array($label)) {
-                    $label[0] = $this->_getTplBlock($tplBlock);
-                } else {
-                    $label    = $this->_getTplBlock($tplBlock);
-                }
-            }
-            if (!empty($html) && $this->_tpl->placeholderExists($this->_formName . '_html', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_html', $html);
-                $html = $this->_getTplBlock($tplBlock);
-            }
-        } else {
-            if (!empty($label) && strpos($this->_required, '{label}') !== false) {
-                if (is_array($label)) {
-                    $label[0] = str_replace('{label}', $label[0], $this->_required);
-                } else {
-                    $label = str_replace('{label}', $label, $this->_required);
-                }
-            }
-            if (!empty($html) && strpos($this->_required, '{html}') !== false) {
-                $html = str_replace('{html}', $html, $this->_required);
-            }
-        }
-    } // end func _renderRequired
-
-   /**
-    * Called when an element has a validation error
-    *
-    * This method will add the error message to the element label or the element html
-    * such as defined with the method setErrorTemplate. If the error placeholder is not found
-    * in the template, the error will be displayed in the form error block.
-    *
-    * @param    string      The element label
-    * @param    string      The element html rendering
-    * @param    string      The element error
-    * @see      setErrorTemplate()
-    * @access   private
-    * @return   void
-    */
-    function _renderError(&$label, &$html, $error)
-    {
-        if ($this->_tpl->blockExists($tplBlock = $this->_formName . '_error_block')) {
-            $this->_tpl->setVariable($this->_formName . '_error', $error);
-            if (!empty($label) && $this->_tpl->placeholderExists($this->_formName . '_label', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_label', is_array($label)? $label[0]: $label);
-                if (is_array($label)) {
-                    $label[0] = $this->_getTplBlock($tplBlock);
-                } else {
-                    $label    = $this->_getTplBlock($tplBlock);
-                }
-            } elseif (!empty($html) && $this->_tpl->placeholderExists($this->_formName . '_html', $tplBlock)) {
-                $this->_tpl->setVariable($this->_formName . '_html', $html);
-                $html = $this->_getTplBlock($tplBlock);
-            }
-            // clean up after ourselves
-            $this->_tpl->setVariable($this->_formName . '_error', null);
-        } elseif (!empty($label) && strpos($this->_error, '{label}') !== false) {
-            if (is_array($label)) {
-                $label[0] = str_replace(array('{label}', '{error}'), array($label[0], $error), $this->_error);
-            } else {
-                $label = str_replace(array('{label}', '{error}'), array($label, $error), $this->_error);
-            }
-        } elseif (!empty($html) && strpos($this->_error, '{html}') !== false) {
-            $html = str_replace(array('{html}', '{error}'), array($html, $error), $this->_error);
-        } else {
-            $this->_errors[] = $error;
-        }
-    }// end func _renderError
-
-
-   /**
-    * Returns the block's contents
-    *
-    * The method is needed because ITX and Sigma implement clearing
-    * the block contents on get() a bit differently
-    *
-    * @param    string  Block name
-    * @return   string  Block contents
-    */
-    function _getTplBlock($block)
-    {
-        $this->_tpl->parse($block);
-        if (is_a($this->_tpl, 'html_template_sigma')) {
-            $ret = $this->_tpl->get($block, true);
-        } else {
-            $oldClear = $this->_tpl->clearCache;
-            $this->_tpl->clearCache = true;
-            $ret = $this->_tpl->get($block);
-            $this->_tpl->clearCache = $oldClear;
-        }
-        return $ret;
-    }
-} // end class HTML_QuickForm_Renderer_ITStatic
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Object.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Object.php
deleted file mode 100644
index d1b9250fc..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/Object.php
+++ /dev/null
@@ -1,461 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an object from form contents
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Object.php,v 1.6 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * An abstract base class for QuickForm renderers
- */
-require_once 'HTML/QuickForm/Renderer.php';
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an object from form contents
- *
- * Based on HTML_Quickform_Renderer_Array code
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @version     Release: 3.2.11
- * @since       3.1.1
- */
-class HTML_QuickForm_Renderer_Object extends HTML_QuickForm_Renderer
-{
-   /**#@+
-    * @access private
-    */
-    /**
-     * The object being generated
-     * @var QuickformForm
-     */
-    var $_obj= null;
-
-    /**
-     * Number of sections in the form (i.e. number of headers in it)
-     * @var integer $_sectionCount
-     */
-    var $_sectionCount;
-
-    /**
-    * Current section number
-    * @var integer $_currentSection
-    */
-    var $_currentSection;
-
-    /**
-    * Object representing current group
-    * @var object $_currentGroup
-    */
-    var $_currentGroup = null;
-
-    /**
-     * Class of Element Objects
-     * @var object $_elementType
-     */
-    var $_elementType = 'QuickFormElement';
-
-    /**
-    * Additional style information for different elements  
-    * @var array $_elementStyles
-    */
-    var $_elementStyles = array();
-
-    /**
-    * true: collect all hidden elements into string; false: process them as usual form elements
-    * @var bool $_collectHidden
-    */
-    var $_collectHidden = false;
-   /**#@-*/
-
-
-    /**
-     * Constructor
-     *
-     * @param bool    true: collect all hidden elements
-     * @access public
-     */
-    function HTML_QuickForm_Renderer_Object($collecthidden = false) 
-    {
-        $this->HTML_QuickForm_Renderer();
-        $this->_collectHidden = $collecthidden;
-        $this->_obj = new QuickformForm;
-    }
-
-    /**
-     * Return the rendered Object
-     * @access public
-     */
-    function toObject() 
-    {
-        return $this->_obj;
-    }
-
-    /**
-     * Set the class of the form elements.  Defaults to QuickformElement.
-     * @param string   Name of element class
-     * @access public
-     */
-    function setElementType($type)
-    {
-        $this->_elementType = $type;
-    }
-
-    function startForm(&$form) 
-    {
-        $this->_obj->frozen = $form->isFrozen();
-        $this->_obj->javascript = $form->getValidationScript();
-        $this->_obj->attributes = $form->getAttributes(true);
-        $this->_obj->requirednote = $form->getRequiredNote();
-        $this->_obj->errors = new StdClass;
-
-        if($this->_collectHidden) {
-            $this->_obj->hidden = '';
-        }
-        $this->_elementIdx = 1;
-        $this->_currentSection = null;
-        $this->_sectionCount = 0;
-    } // end func startForm
-
-    function renderHeader(&$header) 
-    {
-        $hobj = new StdClass;
-        $hobj->header = $header->toHtml();
-        $this->_obj->sections[$this->_sectionCount] = $hobj;
-        $this->_currentSection = $this->_sectionCount++;
-    }
-
-    function renderElement(&$element, $required, $error) 
-    {
-        $elObj = $this->_elementToObject($element, $required, $error);
-        if(!empty($error)) {
-            $name = $elObj->name;
-            $this->_obj->errors->$name = $error;
-        }
-        $this->_storeObject($elObj);
-    } // end func renderElement
-
-    function renderHidden(&$element)
-    {
-        if($this->_collectHidden) {
-            $this->_obj->hidden .= $element->toHtml() . "\n";
-        } else {
-            $this->renderElement($element, false, null);
-        }
-    } //end func renderHidden
-
-    function startGroup(&$group, $required, $error) 
-    {
-        $this->_currentGroup = $this->_elementToObject($group, $required, $error);
-        if(!empty($error)) {
-            $name = $this->_currentGroup->name;
-            $this->_obj->errors->$name = $error;
-        }
-    } // end func startGroup
-
-    function finishGroup(&$group) 
-    {
-        $this->_storeObject($this->_currentGroup);
-        $this->_currentGroup = null;
-    } // end func finishGroup
-
-    /**
-     * Creates an object representing an element
-     *
-     * @access private
-     * @param HTML_QuickForm_element    form element being rendered
-     * @param required bool         Whether an element is required
-     * @param error string    Error associated with the element
-     * @return object
-     */
-    function _elementToObject(&$element, $required, $error) 
-    {
-        if($this->_elementType) {
-            $ret = new $this->_elementType;
-        }
-        $ret->name = $element->getName();
-        $ret->value = $element->getValue();
-        $ret->type = $element->getType();
-        $ret->frozen = $element->isFrozen();
-        $labels = $element->getLabel();
-        if (is_array($labels)) {
-            $ret->label = array_shift($labels);
-            foreach ($labels as $key => $label) {
-                $key = is_int($key)? $key + 2: $key;
-                $ret->{'label_' . $key} = $label;
-            }
-        } else {
-            $ret->label = $labels;
-        }
-        $ret->required = $required;
-        $ret->error = $error;
-
-        if(isset($this->_elementStyles[$ret->name])) {
-            $ret->style = $this->_elementStyles[$ret->name];
-            $ret->styleTemplate = "styles/". $ret->style .".html";
-        }
-        if($ret->type == 'group') {
-            $ret->separator = $element->_separator;
-            $ret->elements = array();
-        } else {
-            $ret->html = $element->toHtml();
-        }
-        return $ret;
-    }
-
-    /** 
-     * Stores an object representation of an element in the form array
-     *
-     * @access private
-     * @param QuickformElement     Object representation of an element
-     * @return void
-     */
-    function _storeObject($elObj) 
-    {
-        $name = $elObj->name;
-        if(is_object($this->_currentGroup) && $elObj->type != 'group') {
-            $this->_currentGroup->elements[] = $elObj;
-        } elseif (isset($this->_currentSection)) {
-            $this->_obj->sections[$this->_currentSection]->elements[] = $elObj;
-        } else {
-            $this->_obj->elements[] = $elObj;
-        }
-    }
-
-    function setElementStyle($elementName, $styleName = null)
-    {
-        if(is_array($elementName)) {
-            $this->_elementStyles = array_merge($this->_elementStyles, $elementName);
-        } else {
-            $this->_elementStyles[$elementName] = $styleName;
-        }
-    }
-
-} // end class HTML_QuickForm_Renderer_Object
-
-
-
-/**
- * Convenience class for the form object passed to outputObject()
- * 
- * Eg.
- * <pre>  
- * {form.outputJavaScript():h}
- * {form.outputHeader():h}
- *   <table>
- *     <tr>
- *       <td>{form.name.label:h}</td><td>{form.name.html:h}</td>
- *     </tr>
- *   </table>
- * </form>
- * </pre>
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @version     Release: 3.2.11
- * @since       3.1.1
- */
-class QuickformForm
-{
-   /**
-    * Whether the form has been frozen
-    * @var boolean $frozen
-    */
-    var $frozen;
-
-   /**
-    * Javascript for client-side validation
-    * @var string $javascript
-    */
-    var $javascript;
-
-   /**
-    * Attributes for form tag
-    * @var string $attributes
-    */
-    var $attributes;
-
-   /**
-    * Note about required elements
-    * @var string $requirednote
-    */
-    var $requirednote;
-
-   /**
-    * Collected html of all hidden variables
-    * @var string $hidden
-    */
-    var $hidden;
-
-   /**
-    * Set if there were validation errors.  
-    * StdClass object with element names for keys and their
-    * error messages as values
-    * @var object $errors
-    */
-    var $errors;
-
-   /**
-    * Array of QuickformElementObject elements.  If there are headers in the form
-    * this will be empty and the elements will be in the 
-    * separate sections
-    * @var array $elements
-    */
-    var $elements;
-
-   /**
-    * Array of sections contained in the document
-    * @var array $sections
-    */
-    var $sections;
-
-   /**
-    * Output &lt;form&gt; header
-    * {form.outputHeader():h} 
-    * @return string    &lt;form attributes&gt;
-    */
-    function outputHeader()
-    {
-        return "<form " . $this->attributes . ">\n";
-    }
-
-   /**
-    * Output form javascript
-    * {form.outputJavaScript():h}
-    * @return string    Javascript
-    */
-    function outputJavaScript()
-    {
-        return $this->javascript;
-    }
-} // end class QuickformForm
-
-
-/**
- * Convenience class describing a form element.
- *
- * The properties defined here will be available from 
- * your flexy templates by referencing
- * {form.zip.label:h}, {form.zip.html:h}, etc.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @version     Release: 3.2.11
- * @since       3.1.1
- */
-class QuickformElement
-{
-    /**
-     * Element name
-     * @var string $name
-     */
-    var $name;
-
-    /**
-     * Element value
-     * @var mixed $value
-     */
-    var $value;
-
-    /**
-     * Type of element
-     * @var string $type
-     */
-    var $type;
-
-    /**
-     * Whether the element is frozen
-     * @var boolean $frozen
-     */
-    var $frozen;
-
-    /**
-     * Label for the element
-     * @var string $label
-     */
-    var $label;
-
-    /**
-     * Whether element is required
-     * @var boolean $required
-     */
-    var $required;
-
-    /**
-     * Error associated with the element
-     * @var string $error
-     */
-    var $error;
-
-    /**
-     * Some information about element style
-     * @var string $style
-     */
-    var $style;
-
-    /**
-     * HTML for the element
-     * @var string $html
-     */
-    var $html;
-
-    /**
-     * If element is a group, the group separator
-     * @var mixed $separator
-     */
-    var $separator;
-
-    /**
-     * If element is a group, an array of subelements
-     * @var array $elements
-     */
-    var $elements;
-
-    function isType($type)
-    {
-        return ($this->type == $type);
-    }
-
-    function notFrozen()
-    {
-        return !$this->frozen;
-    }
-
-    function isButton()
-    {
-        return ($this->type == "submit" || $this->type == "reset");
-    }
-
-
-   /**
-    * XXX: why does it use Flexy when all other stuff here does not depend on it?
-    */
-    function outputStyle()
-    {
-        ob_start();
-        HTML_Template_Flexy::staticQuickTemplate('styles/' . $this->style . '.html', $this);
-        $ret = ob_get_contents();
-        ob_end_clean();
-        return $ret;
-    }
-} // end class QuickformElement
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ObjectFlexy.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ObjectFlexy.php
deleted file mode 100644
index 7b81756ba..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/ObjectFlexy.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * QuickForm renderer for Flexy template engine, static version.
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: ObjectFlexy.php,v 1.10 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * A concrete renderer for HTML_QuickForm, makes an object from form contents
- */ 
-require_once 'HTML/QuickForm/Renderer/Object.php';
-
-/**
- * QuickForm renderer for Flexy template engine, static version.
- * 
- * A static renderer for HTML_Quickform.  Makes a QuickFormFlexyObject
- * from the form content suitable for use with a Flexy template
- *
- * Usage:
- * <code>
- * $form =& new HTML_QuickForm('form', 'POST');
- * $template =& new HTML_Template_Flexy();
- * $renderer =& new HTML_QuickForm_Renderer_ObjectFlexy(&$template);
- * $renderer->setHtmlTemplate("html.html");
- * $renderer->setLabelTemplate("label.html");
- * $form->accept($renderer);
- * $view = new StdClass;
- * $view->form = $renderer->toObject();
- * $template->compile("mytemplate.html");
- * </code>
- *
- * Based on the code for HTML_QuickForm_Renderer_ArraySmarty
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Ron McClain <ron@humaniq.com>
- * @version     Release: 3.2.11
- * @since       3.1.1
- */
-class HTML_QuickForm_Renderer_ObjectFlexy extends HTML_QuickForm_Renderer_Object
-{
-   /**#@+
-    * @access private
-    */
-    /**
-     * HTML_Template_Flexy instance
-     * @var object $_flexy
-     */
-    var $_flexy;
-
-    /**
-     * Current element index
-     * @var integer $_elementIdx
-     */
-    var $_elementIdx;
-
-    /**
-     * The current element index inside a group
-     * @var integer $_groupElementIdx
-     */
-    var $_groupElementIdx = 0;
-
-    /**
-     * Name of template file for form html
-     * @var string $_html
-     * @see     setRequiredTemplate()
-     */
-    var $_html = '';
-
-    /**
-     * Name of template file for form labels
-     * @var string $label
-     * @see        setErrorTemplate()
-     */
-    var $label = '';
-
-    /**
-     * Class of the element objects, so you can add your own
-     * element methods
-     * @var string $_elementType
-     */
-    var $_elementType = 'QuickformFlexyElement';
-   /**#@-*/
-
-    /**
-     * Constructor
-     *
-     * @param HTML_Template_Flexy   template object to use
-     * @public
-     */
-    function HTML_QuickForm_Renderer_ObjectFlexy(&$flexy)
-    {
-        $this->HTML_QuickForm_Renderer_Object(true);
-        $this->_obj = new QuickformFlexyForm();
-        $this->_flexy =& $flexy;
-    } // end constructor
-
-    function renderHeader(&$header)
-    {
-        if($name = $header->getName()) {
-            $this->_obj->header->$name = $header->toHtml();
-        } else {
-            $this->_obj->header[$this->_sectionCount] = $header->toHtml();
-        }
-        $this->_currentSection = $this->_sectionCount++;
-    } // end func renderHeader
-
-    function startGroup(&$group, $required, $error)
-    {
-        parent::startGroup($group, $required, $error);
-        $this->_groupElementIdx = 1;
-    } //end func startGroup
-
-    /**
-     * Creates an object representing an element containing
-     * the key for storing this
-     *
-     * @access private
-     * @param HTML_QuickForm_element    form element being rendered
-     * @param bool        Whether an element is required
-     * @param string    Error associated with the element
-     * @return object
-     */
-    function _elementToObject(&$element, $required, $error)
-    {
-        $ret = parent::_elementToObject($element, $required, $error);
-        if($ret->type == 'group') {
-            $ret->html = $element->toHtml();
-            unset($ret->elements);
-        }
-        if(!empty($this->_label)) {
-            $this->_renderLabel($ret);
-        }
-
-        if(!empty($this->_html)) {
-            $this->_renderHtml($ret);
-            $ret->error = $error;
-        }
-
-        // Create an element key from the name
-        if (false !== ($pos = strpos($ret->name, '[')) || is_object($this->_currentGroup)) {
-            if (!$pos) {
-                $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
-            } else {
-                $keys = '->{\'' . str_replace(
-                            array('\\', '\'', '[', ']'), array('\\\\', '\\\'', '\'}->{\'', ''), 
-                            $ret->name
-                        ) . '\'}';
-            }
-            // special handling for elements in native groups
-            if (is_object($this->_currentGroup)) {
-                // skip unnamed group items unless radios: no name -> no static access
-                // identification: have the same key string as the parent group
-                if ($this->_currentGroup->keys == $keys && 'radio' != $ret->type) {
-                    return false;
-                }
-                // reduce string of keys by remove leading group keys
-                if (0 === strpos($keys, $this->_currentGroup->keys)) {
-                    $keys = substr_replace($keys, '', 0, strlen($this->_currentGroup->keys));
-                }
-            }
-        } elseif (0 == strlen($ret->name)) {
-            $keys = '->{\'element_' . $this->_elementIdx . '\'}';
-        } else {
-            $keys = '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->name) . '\'}';
-        }
-        // for radios: add extra key from value
-        if ('radio' == $ret->type && '[]' != substr($keys, -2)) {
-            $keys .= '->{\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $ret->value) . '\'}';
-        }
-        $ret->keys = $keys;
-        $this->_elementIdx++;
-        return $ret;
-    }
-
-    /**
-     * Stores an object representation of an element in the 
-     * QuickformFormObject instance
-     *
-     * @access private
-     * @param QuickformElement  Object representation of an element
-     * @return void
-     */
-    function _storeObject($elObj) 
-    {
-        if ($elObj) {
-            $keys = $elObj->keys;
-            unset($elObj->keys);
-            if(is_object($this->_currentGroup) && ('group' != $elObj->type)) {
-                $code = '$this->_currentGroup' . $keys . ' = $elObj;';
-            } else {
-                $code = '$this->_obj' . $keys . ' = $elObj;';
-            }
-            eval($code);
-        }
-    }
-
-    /**
-     * Set the filename of the template to render html elements.
-     * In your template, {html} is replaced by the unmodified html.
-     * If the element is required, {required} will be true.
-     * Eg.
-     * <pre>
-     * {if:error}
-     *   <font color="red" size="1">{error:h}</font><br />
-     * {end:}
-     * {html:h}
-     * </pre>
-     *
-     * @access public
-     * @param string   Filename of template
-     * @return void
-     */
-    function setHtmlTemplate($template)
-    {
-        $this->_html = $template;
-    } 
-
-    /**
-     * Set the filename of the template to render form labels
-     * In your template, {label} is replaced by the unmodified label.
-     * {error} will be set to the error, if any.  {required} will
-     * be true if this is a required field
-     * Eg.
-     * <pre>
-     * {if:required}
-     * <font color="orange" size="1">*</font>
-     * {end:}
-     * {label:h}
-     * </pre>
-     *
-     * @access public
-     * @param string   Filename of template
-     * @return void
-     */
-    function setLabelTemplate($template) 
-    {
-        $this->_label = $template;
-    }
-
-    function _renderLabel(&$ret)
-    {
-        $this->_flexy->compile($this->_label);
-        $ret->label = $this->_flexy->bufferedOutputObject($ret);
-    }
-
-    function _renderHtml(&$ret)
-    {
-        $this->_flexy->compile($this->_html);
-        $ret->html = $this->_flexy->bufferedOutputObject($ret);
-    }
-} // end class HTML_QuickForm_Renderer_ObjectFlexy
-
-/**
- * Adds nothing to QuickformForm, left for backwards compatibility
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @ignore
- */
-class QuickformFlexyForm extends QuickformForm
-{
-}
-
-/**
- * Adds nothing to QuickformElement, left for backwards compatibility
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @ignore
- */
-class QuickformFlexyElement extends QuickformElement
-{
-}
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/QuickHtml.php b/airtime_mvc/library/pear/HTML/QuickForm/Renderer/QuickHtml.php
deleted file mode 100644
index 4a473874a..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Renderer/QuickHtml.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A renderer that makes it quick and easy to create customized forms.
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Jason Rust <jrust@rustyparts.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: QuickHtml.php,v 1.3 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * A concrete renderer for HTML_QuickForm, based on QuickForm 2.x built-in one
- */ 
-require_once 'HTML/QuickForm/Renderer/Default.php';
-
-/**
- * A renderer that makes it quick and easy to create customized forms.
- *
- * This renderer has three main distinctives: an easy way to create
- * custom-looking forms, the ability to separate the creation of form
- * elements from their display, and being able to use QuickForm in
- * widget-based template systems.  See the online docs for more info.
- * For a usage example see: docs/renderers/QuickHtml_example.php
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Jason Rust <jrust@rustyparts.com>
- * @version     Release: 3.2.11
- * @since       3.1.1
- */
-class HTML_QuickForm_Renderer_QuickHtml extends HTML_QuickForm_Renderer_Default {
-    // {{{ properties
-
-    /**
-     * The array of rendered elements
-     * @var array
-     */
-    var $renderedElements = array();
-
-    // }}}
-    // {{{ constructor
-    
-    /**
-     * Constructor
-     *
-     * @access public
-     * @return void
-     */
-    function HTML_QuickForm_Renderer_QuickHtml()
-    {
-        $this->HTML_QuickForm_Renderer_Default();
-        // The default templates aren't used for this renderer
-        $this->clearAllTemplates();
-    } // end constructor
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * returns the HTML generated for the form
-     *
-     * @param string $data (optional) Any extra data to put before the end of the form
-     *
-     * @access public
-     * @return string
-     */
-    function toHtml($data = '')
-    {
-        // Render any elements that haven't been rendered explicitly by elementToHtml()
-        foreach (array_keys($this->renderedElements) as $key) {
-            if (!$this->renderedElements[$key]['rendered']) {
-                $this->renderedElements[$key]['rendered'] = true;
-                $data .= $this->renderedElements[$key]['html'] . "\n";
-            }
-        }
-
-        // Insert the extra data and form elements at the end of the form
-        $this->_html = str_replace('</form>', $data . "\n</form>", $this->_html);
-        return $this->_html;
-    } // end func toHtml
-
-    // }}}
-    // {{{ elementToHtml()
-
-    /**
-     * Gets the html for an element and marks it as rendered.
-     *
-     * @param string $elementName The element name
-     * @param string $elementValue (optional) The value of the element.  This is only useful
-     *               for elements that have the same name (i.e. radio and checkbox), but
-     *               different values
-     *
-     * @access public
-     * @return string The html for the QuickForm element
-     * @throws HTML_QuickForm_Error
-     */
-    function elementToHtml($elementName, $elementValue = null)
-    {
-        $elementKey = null;
-        // Find the key for the element
-        foreach ($this->renderedElements as $key => $data) {
-            if ($data['name'] == $elementName && 
-                // See if the value must match as well
-                (is_null($elementValue) ||
-                 $data['value'] == $elementValue)) {
-                $elementKey = $key;
-                break;
-            }
-        }
-
-        if (is_null($elementKey)) {
-            $msg = is_null($elementValue) ? "Element $elementName does not exist." : 
-                "Element $elementName with value of $elementValue does not exist.";
-            return PEAR::raiseError(null, QUICKFORM_UNREGISTERED_ELEMENT, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
-        } else {
-            if ($this->renderedElements[$elementKey]['rendered']) {
-                $msg = is_null($elementValue) ? "Element $elementName has already been rendered." : 
-                    "Element $elementName with value of $elementValue has already been rendered.";
-                return PEAR::raiseError(null, QUICKFORM_ERROR, null, E_USER_WARNING, $msg, 'HTML_QuickForm_Error', true);
-            } else {
-                $this->renderedElements[$elementKey]['rendered'] = true;
-                return $this->renderedElements[$elementKey]['html'];
-            }
-        }
-    } // end func elementToHtml
-
-    // }}}
-    // {{{ renderElement()
-
-    /**
-     * Gets the html for an element and adds it to the array by calling
-     * parent::renderElement()
-     *
-     * @param HTML_QuickForm_element    form element being visited
-     * @param bool                      Whether an element is required
-     * @param string                    An error message associated with an element
-     *
-     * @access public
-     * @return mixed HTML string of element if $immediateRender is set, else we just add the
-     *               html to the global _html string 
-     */
-    function renderElement(&$element, $required, $error)
-    {
-        $this->_html = '';
-        parent::renderElement($element, $required, $error);
-        if (!$this->_inGroup) {
-            $this->renderedElements[] = array(
-                    'name' => $element->getName(), 
-                    'value' => $element->getValue(), 
-                    'html' => $this->_html, 
-                    'rendered' => false);
-        }
-        $this->_html = '';
-    } // end func renderElement
-
-    // }}}
-    // {{{ renderHidden()
-
-    /**
-     * Gets the html for a hidden element and adds it to the array.
-     * 
-     * @param HTML_QuickForm_element    hidden form element being visited
-     * @access public
-     * @return void
-     */
-    function renderHidden(&$element)
-    {
-        $this->renderedElements[] = array(
-                'name' => $element->getName(), 
-                'value' => $element->getValue(), 
-                'html' => $element->toHtml(), 
-                'rendered' => false);
-    } // end func renderHidden
-    
-    // }}}
-    // {{{ finishGroup()
-
-    /**
-     * Gets the html for the group element and adds it to the array by calling
-     * parent::finishGroup()
-     *
-     * @param    HTML_QuickForm_group   group being visited
-     * @access   public
-     * @return   void
-     */
-    function finishGroup(&$group)
-    {
-        $this->_html = '';
-        parent::finishGroup($group);
-        $this->renderedElements[] = array(
-                'name' => $group->getName(), 
-                'value' => $group->getValue(), 
-                'html' => $this->_html, 
-                'rendered' => false);
-        $this->_html = '';
-    } // end func finishGroup
-
-    // }}}
-} // end class HTML_QuickForm_Renderer_QuickHtml
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule.php
deleted file mode 100644
index f792cba1f..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Abstract base class for QuickForm validation rules 
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Rule.php,v 1.4 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- * @abstract
- */
-class HTML_QuickForm_Rule
-{
-   /**
-    * Name of the rule to use in validate method
-    *
-    * This property is used in more global rules like Callback and Regex
-    * to determine which callback and which regex is to be used for validation
-    *
-    * @var  string
-    * @access   public
-    */
-    var $name;
-
-   /**
-    * Validates a value
-    * 
-    * @access public
-    * @abstract
-    */
-    function validate($value)
-    {
-        return true;
-    }
-
-   /**
-    * Sets the rule name
-    *
-    * @param  string    rule name
-    * @access public
-    */
-    function setName($ruleName)
-    {
-        $this->name = $ruleName;
-    }
-
-    /**
-     * Returns the javascript test (the test should return true if the value is INVALID)
-     *
-     * @param     mixed     Options for the rule
-     * @access    public
-     * @return    array     first element is code to setup validation, second is the check itself
-     * @abstract
-     */
-    function getValidationScript($options = null)
-    {
-        return array('', '');
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Callback.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Callback.php
deleted file mode 100644
index 940008985..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Callback.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Validates values using callback functions or methods
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Callback.php,v 1.9 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Validates values using callback functions or methods
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Callback extends HTML_QuickForm_Rule
-{
-    /**
-     * Array of callbacks
-     *
-     * Array is in the format:
-     * $_data['rulename'] = array('functionname', 'classname');
-     * If the callback is not a method, then the class name is not set.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_data = array();
-
-   /**
-    * Whether to use BC mode for specific rules
-    * 
-    * Previous versions of QF passed element's name as a first parameter
-    * to validation functions, but not to validation methods. This behaviour
-    * is emulated if you are using 'function' as rule type when registering.
-    * 
-    * @var array
-    * @access private
-    */
-    var $_BCMode = array();
-
-    /**
-     * Validates a value using a callback
-     *
-     * @param     string    $value      Value to be checked
-     * @param     mixed     $options    Options for callback
-     * @access    public
-     * @return    boolean   true if value is valid
-     */
-    function validate($value, $options = null)
-    {
-        if (isset($this->_data[$this->name])) {
-            $callback = $this->_data[$this->name];
-            if (isset($callback[1])) {
-                return call_user_func(array($callback[1], $callback[0]), $value, $options);
-            } elseif ($this->_BCMode[$this->name]) {
-                return $callback[0]('', $value, $options);
-            } else {
-                return $callback[0]($value, $options);
-            }
-        } elseif (is_callable($options)) {
-            return call_user_func($options, $value);
-        } else {
-            return true;
-        }
-    } // end func validate
-
-    /**
-     * Adds new callbacks to the callbacks list
-     *
-     * @param     string    $name       Name of rule
-     * @param     string    $callback   Name of function or method
-     * @param     string    $class      Name of class containing the method
-     * @param     bool      $BCMode     Backwards compatibility mode 
-     * @access    public
-     */
-    function addData($name, $callback, $class = null, $BCMode = false)
-    {
-        if (!empty($class)) {
-            $this->_data[$name] = array($callback, $class);
-        } else {
-            $this->_data[$name] = array($callback);
-        }
-        $this->_BCMode[$name] = $BCMode;
-    } // end func addData
-
-
-    function getValidationScript($options = null)
-    {
-        if (isset($this->_data[$this->name])) {
-            $callback = $this->_data[$this->name][0];
-            $params   = ($this->_BCMode[$this->name]? "'', {jsVar}": '{jsVar}') .
-                        (isset($options)? ", '{$options}'": '');
-        } else {
-            $callback = is_array($options)? $options[1]: $options;
-            $params   = '{jsVar}';
-        }
-        return array('', "{jsVar} != '' && !{$callback}({$params})");
-    } // end func getValidationScript
-
-} // end class HTML_QuickForm_Rule_Callback
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Compare.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Compare.php
deleted file mode 100644
index 86b4a4503..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Compare.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Rule to compare two form fields
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Compare.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Rule to compare two form fields
- * 
- * The most common usage for this is to ensure that the password 
- * confirmation field matches the password field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Compare extends HTML_QuickForm_Rule
-{
-   /**
-    * Possible operators to use
-    * @var array
-    * @access private
-    */
-    var $_operators = array(
-        'eq'  => '===',
-        'neq' => '!==',
-        'gt'  => '>',
-        'gte' => '>=',
-        'lt'  => '<',
-        'lte' => '<=',
-        '=='  => '===',
-        '!='  => '!=='
-    );
-
-
-   /**
-    * Returns the operator to use for comparing the values
-    * 
-    * @access private
-    * @param  string     operator name
-    * @return string     operator to use for validation
-    */
-    function _findOperator($name)
-    {
-        if (empty($name)) {
-            return '===';
-        } elseif (isset($this->_operators[$name])) {
-            return $this->_operators[$name];
-        } elseif (in_array($name, $this->_operators)) {
-            return $name;
-        } else {
-            return '===';
-        }
-    }
-
-
-    function validate($values, $operator = null)
-    {
-        $operator = $this->_findOperator($operator);
-        if ('===' != $operator && '!==' != $operator) {
-            $compareFn = create_function('$a, $b', 'return floatval($a) ' . $operator . ' floatval($b);');
-        } else {
-            $compareFn = create_function('$a, $b', 'return strval($a) ' . $operator . ' strval($b);');
-        }
-        
-        return $compareFn($values[0], $values[1]);
-    }
-
-
-    function getValidationScript($operator = null)
-    {
-        $operator = $this->_findOperator($operator);
-        if ('===' != $operator && '!==' != $operator) {
-            $check = "!(Number({jsVar}[0]) {$operator} Number({jsVar}[1]))";
-        } else {
-            $check = "!(String({jsVar}[0]) {$operator} String({jsVar}[1]))";
-        }
-        return array('', "'' != {jsVar}[0] && {$check}");
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Email.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Email.php
deleted file mode 100644
index a0e07e0cd..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Email.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Email validation rule
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Email.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Email validation rule
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Email extends HTML_QuickForm_Rule
-{
-    var $regex = '/^((\"[^\"\f\n\r\t\v\b]+\")|([\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+(\.[\w\!\#\$\%\&\'\*\+\-\~\/\^\`\|\{\}]+)*))@((\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/';
-
-    /**
-     * Validates an email address
-     *
-     * @param     string    $email          Email address
-     * @param     boolean   $checkDomain    True if dns check should be performed
-     * @access    public
-     * @return    boolean   true if email is valid
-     */
-    function validate($email, $checkDomain = false)
-    {
-        // Fix for bug #10799: add 'D' modifier to regex
-        if (preg_match($this->regex . 'D', $email)) {
-            if ($checkDomain && function_exists('checkdnsrr')) {
-                $tokens = explode('@', $email);
-                if (checkdnsrr($tokens[1], 'MX') || checkdnsrr($tokens[1], 'A')) {
-                    return true;
-                }
-                return false;
-            }
-            return true;
-        }
-        return false;
-    } // end func validate
-
-
-    function getValidationScript($options = null)
-    {
-        return array("  var regex = " . $this->regex . ";\n", "{jsVar} != '' && !regex.test({jsVar})");
-    } // end func getValidationScript
-
-} // end class HTML_QuickForm_Rule_Email
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Range.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Range.php
deleted file mode 100644
index 041c2b934..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Range.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Checks that the length of value is within range
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Range.php,v 1.8 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Checks that the length of value is within range
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Range extends HTML_QuickForm_Rule
-{
-    /**
-     * Validates a value using a range comparison
-     *
-     * @param     string    $value      Value to be checked
-     * @param     mixed     $options    Int for length, array for range
-     * @access    public
-     * @return    boolean   true if value is valid
-     */
-    function validate($value, $options)
-    {
-        $length = strlen($value);
-        switch ($this->name) {
-            case 'minlength': return ($length >= $options);
-            case 'maxlength': return ($length <= $options);
-            default:          return ($length >= $options[0] && $length <= $options[1]);
-        }
-    } // end func validate
-
-
-    function getValidationScript($options = null)
-    {
-        switch ($this->name) {
-            case 'minlength': 
-                $test = '{jsVar}.length < '.$options;
-                break;
-            case 'maxlength': 
-                $test = '{jsVar}.length > '.$options;
-                break;
-            default: 
-                $test = '({jsVar}.length < '.$options[0].' || {jsVar}.length > '.$options[1].')';
-        }
-        return array('', "{jsVar} != '' && {$test}");
-    } // end func getValidationScript
-
-} // end class HTML_QuickForm_Rule_Range
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Regex.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Regex.php
deleted file mode 100644
index 402213dec..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Regex.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Validates values using regular expressions
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Regex.php,v 1.6 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Validates values using regular expressions
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Regex extends HTML_QuickForm_Rule
-{
-    /**
-     * Array of regular expressions
-     *
-     * Array is in the format:
-     * $_data['rulename'] = 'pattern';
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_data = array(
-                    'lettersonly'   => '/^[a-zA-Z]+$/',
-                    'alphanumeric'  => '/^[a-zA-Z0-9]+$/',
-                    'numeric'       => '/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/',
-                    'nopunctuation' => '/^[^().\/\*\^\?#!@$%+=,\"\'><~\[\]{}]+$/',
-                    'nonzero'       => '/^-?[1-9][0-9]*/'
-                    );
-
-    /**
-     * Validates a value using a regular expression
-     *
-     * @param     string    $value      Value to be checked
-     * @param     string    $regex      Regular expression
-     * @access    public
-     * @return    boolean   true if value is valid
-     */
-    function validate($value, $regex = null)
-    {
-        // Fix for bug #10799: add 'D' modifier to regex
-        if (isset($this->_data[$this->name])) {
-            if (!preg_match($this->_data[$this->name] . 'D', $value)) {
-                return false;
-            }
-        } else {
-            if (!preg_match($regex . 'D', $value)) {
-                return false;
-            }
-        }
-        return true;
-    } // end func validate
-
-    /**
-     * Adds new regular expressions to the list
-     *
-     * @param     string    $name       Name of rule
-     * @param     string    $pattern    Regular expression pattern
-     * @access    public
-     */
-    function addData($name, $pattern)
-    {
-        $this->_data[$name] = $pattern;
-    } // end func addData
-
-
-    function getValidationScript($options = null)
-    {
-        $regex = isset($this->_data[$this->name]) ? $this->_data[$this->name] : $options;
-
-        // bug #12376, converting unicode escapes and stripping 'u' modifier
-        if ($pos = strpos($regex, 'u', strrpos($regex, '/'))) {
-            $regex = substr($regex, 0, $pos) . substr($regex, $pos + 1);
-            $regex = preg_replace('/(?<!\\\\)(?>\\\\\\\\)*\\\\x{([a-fA-F0-9]+)}/', '\\u$1', $regex);
-        }
-
-        return array("  var regex = " . $regex . ";\n", "{jsVar} != '' && !regex.test({jsVar})");
-    } // end func getValidationScript
-
-} // end class HTML_QuickForm_Rule_Regex
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Required.php b/airtime_mvc/library/pear/HTML/QuickForm/Rule/Required.php
deleted file mode 100644
index 518cd352b..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/Rule/Required.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Required elements validation
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: Required.php,v 1.6 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Abstract base class for QuickForm validation rules 
- */
-require_once 'HTML/QuickForm/Rule.php';
-
-/**
- * Required elements validation
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_Rule_Required extends HTML_QuickForm_Rule
-{
-    /**
-     * Checks if an element is empty
-     *
-     * @param     string    $value      Value to check
-     * @param     mixed     $options    Not used yet
-     * @access    public
-     * @return    boolean   true if value is not empty
-     */
-    function validate($value, $options = null)
-    {
-        if ((string)$value == '') {
-            return false;
-        }
-        return true;
-    } // end func validate
-
-
-    function getValidationScript($options = null)
-    {
-        return array('', "{jsVar} == ''");
-    } // end func getValidationScript
-
-} // end class HTML_QuickForm_Rule_Required
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/RuleRegistry.php b/airtime_mvc/library/pear/HTML/QuickForm/RuleRegistry.php
deleted file mode 100644
index d87740d4d..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/RuleRegistry.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Registers rule objects and uses them for validation
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: RuleRegistry.php,v 1.19 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Registers rule objects and uses them for validation
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_RuleRegistry
-{
-    /**
-     * Array containing references to used rules
-     * @var     array
-     * @access  private
-     */
-    var $_rules = array();
-
-
-    /**
-     * Returns a singleton of HTML_QuickForm_RuleRegistry
-     *
-     * Usually, only one RuleRegistry object is needed, this is the reason
-     * why it is recommended to use this method to get the validation object. 
-     *
-     * @access    public
-     * @static
-     * @return    HTML_QuickForm_RuleRegistry
-     */
-    function &singleton()
-    {
-        static $obj;
-        if (!isset($obj)) {
-            $obj = new HTML_QuickForm_RuleRegistry();
-        }
-        return $obj;
-    } // end func singleton
-
-    /**
-     * Registers a new validation rule
-     *
-     * In order to use a custom rule in your form, you need to register it
-     * first. For regular expressions, one can directly use the 'regex' type
-     * rule in addRule(), this is faster than registering the rule.
-     *
-     * Functions and methods can be registered. Use the 'function' type.
-     * When registering a method, specify the class name as second parameter.
-     *
-     * You can also register an HTML_QuickForm_Rule subclass with its own
-     * validate() method.
-     *
-     * @param     string    $ruleName   Name of validation rule
-     * @param     string    $type       Either: 'regex', 'function' or null
-     * @param     string    $data1      Name of function, regular expression or
-     *                                  HTML_QuickForm_Rule object class name
-     * @param     string    $data2      Object parent of above function or HTML_QuickForm_Rule file path
-     * @access    public
-     * @return    void
-     */
-    function registerRule($ruleName, $type, $data1, $data2 = null)
-    {
-        $type = strtolower($type);
-        if ($type == 'regex') {
-            // Regular expression
-            $rule =& $this->getRule('regex');
-            $rule->addData($ruleName, $data1);
-            $GLOBALS['_HTML_QuickForm_registered_rules'][$ruleName] = $GLOBALS['_HTML_QuickForm_registered_rules']['regex'];
-
-        } elseif ($type == 'function' || $type == 'callback') {
-            // Callback function
-            $rule =& $this->getRule('callback');
-            $rule->addData($ruleName, $data1, $data2, 'function' == $type);
-            $GLOBALS['_HTML_QuickForm_registered_rules'][$ruleName] = $GLOBALS['_HTML_QuickForm_registered_rules']['callback'];
-
-        } elseif (is_object($data1)) {
-            // An instance of HTML_QuickForm_Rule
-            $this->_rules[strtolower(get_class($data1))] = $data1;
-            $GLOBALS['_HTML_QuickForm_registered_rules'][$ruleName] = array(strtolower(get_class($data1)), null);
-
-        } else {
-            // Rule class name
-            $GLOBALS['_HTML_QuickForm_registered_rules'][$ruleName] = array(strtolower($data1), $data2);
-        }
-    } // end func registerRule
-
-    /**
-     * Returns a reference to the requested rule object
-     *
-     * @param     string   $ruleName        Name of the requested rule
-     * @access    public
-     * @return    HTML_QuickForm_Rule
-     */
-    function &getRule($ruleName)
-    {
-        list($class, $path) = $GLOBALS['_HTML_QuickForm_registered_rules'][$ruleName];
-
-        if (!isset($this->_rules[$class])) {
-            if (!empty($path)) {
-                include_once($path);
-            }
-            $this->_rules[$class] =& new $class();
-        }
-        $this->_rules[$class]->setName($ruleName);
-        return $this->_rules[$class];
-    } // end func getRule
-
-    /**
-     * Performs validation on the given values
-     *
-     * @param     string   $ruleName        Name of the rule to be used
-     * @param     mixed    $values          Can be a scalar or an array of values 
-     *                                      to be validated
-     * @param     mixed    $options         Options used by the rule
-     * @param     mixed    $multiple        Whether to validate an array of values altogether
-     * @access    public
-     * @return    mixed    true if no error found, int of valid values (when an array of values is given) or false if error
-     */
-    function validate($ruleName, $values, $options = null, $multiple = false)
-    {
-        $rule =& $this->getRule($ruleName);
-
-        if (is_array($values) && !$multiple) {
-            $result = 0;
-            foreach ($values as $value) {
-                if ($rule->validate($value, $options) === true) {
-                    $result++;
-                }
-            }
-            return ($result == 0) ? false : $result;
-        } else {
-            return $rule->validate($values, $options);
-        }
-    } // end func validate
-
-    /**
-     * Returns the validation test in javascript code
-     *
-     * @param     array|HTML_QuickForm_element  Element(s) the rule applies to
-     * @param     string                        Element name, in case $element is 
-     *                                          not an array
-     * @param     array                         Rule data
-     * @access    public
-     * @return    string    JavaScript for the rule
-     */
-    function getValidationScript(&$element, $elementName, $ruleData)
-    {
-        $reset =  (isset($ruleData['reset'])) ? $ruleData['reset'] : false;
-        $rule  =& $this->getRule($ruleData['type']);
-        if (!is_array($element)) {
-            list($jsValue, $jsReset) = $this->_getJsValue($element, $elementName, $reset, null);
-        } else {
-            $jsValue = "  value = new Array();\n";
-            $jsReset = '';
-            for ($i = 0; $i < count($element); $i++) {
-                list($tmp_value, $tmp_reset) = $this->_getJsValue($element[$i], $element[$i]->getName(), $reset, $i);
-                $jsValue .= "\n" . $tmp_value;
-                $jsReset .= $tmp_reset;
-            }
-        }
-        $jsField = isset($ruleData['group'])? $ruleData['group']: $elementName;
-        list ($jsPrefix, $jsCheck) = $rule->getValidationScript($ruleData['format']);
-        if (!isset($ruleData['howmany'])) {
-            $js = $jsValue . "\n" . $jsPrefix . 
-                  "  if (" . str_replace('{jsVar}', 'value', $jsCheck) . " && !errFlag['{$jsField}']) {\n" .
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
-                  "  }\n";
-        } else {
-            $js = $jsValue . "\n" . $jsPrefix . 
-                  "  var res = 0;\n" .
-                  "  for (var i = 0; i < value.length; i++) {\n" .
-                  "    if (!(" . str_replace('{jsVar}', 'value[i]', $jsCheck) . ")) {\n" .
-                  "      res++;\n" .
-                  "    }\n" .
-                  "  }\n" . 
-                  "  if (res < {$ruleData['howmany']} && !errFlag['{$jsField}']) {\n" . 
-                  "    errFlag['{$jsField}'] = true;\n" .
-                  "    _qfMsg = _qfMsg + '\\n - {$ruleData['message']}';\n" .
-                  $jsReset .
-                  "  }\n";
-        }
-        return $js;
-    } // end func getValidationScript
-
-
-   /**
-    * Returns JavaScript to get and to reset the element's value 
-    * 
-    * @access private
-    * @param  HTML_QuickForm_element    element being processed
-    * @param  string                    element's name
-    * @param  bool                      whether to generate JavaScript to reset 
-    *                                   the value
-    * @param  integer                   value's index in the array (only used for
-    *                                   multielement rules)
-    * @return array     first item is value javascript, second is reset
-    */
-    function _getJsValue(&$element, $elementName, $reset = false, $index = null)
-    {
-        $jsIndex = isset($index)? '[' . $index . ']': '';
-        $tmp_reset = $reset? "    var field = frm.elements['$elementName'];\n": '';
-        if (is_a($element, 'html_quickform_group')) {
-            $value = "  _qfGroups['{$elementName}'] = {";
-            $elements =& $element->getElements();
-            for ($i = 0, $count = count($elements); $i < $count; $i++) {
-                $append = ($elements[$i]->getType() == 'select' && $elements[$i]->getMultiple())? '[]': '';
-                $value .= "'" . $element->getElementName($i) . $append . "': true" .
-                          ($i < $count - 1? ', ': '');
-            }
-            $value .=
-                "};\n" .
-                "  value{$jsIndex} = new Array();\n" .
-                "  var valueIdx = 0;\n" .
-                "  for (var i = 0; i < frm.elements.length; i++) {\n" .
-                "    var _element = frm.elements[i];\n" .
-                "    if (_element.name in _qfGroups['{$elementName}']) {\n" . 
-                "      switch (_element.type) {\n" .
-                "        case 'checkbox':\n" .
-                "        case 'radio':\n" .
-                "          if (_element.checked) {\n" .
-                "            value{$jsIndex}[valueIdx++] = _element.value;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        case 'select-one':\n" .
-                "          if (-1 != _element.selectedIndex) {\n" .
-                "            value{$jsIndex}[valueIdx++] = _element.options[_element.selectedIndex].value;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        case 'select-multiple':\n" .
-                "          var tmpVal = new Array();\n" .
-                "          var tmpIdx = 0;\n" .
-                "          for (var j = 0; j < _element.options.length; j++) {\n" .
-                "            if (_element.options[j].selected) {\n" .
-                "              tmpVal[tmpIdx++] = _element.options[j].value;\n" .
-                "            }\n" .
-                "          }\n" .
-                "          if (tmpIdx > 0) {\n" .
-                "            value{$jsIndex}[valueIdx++] = tmpVal;\n" .
-                "          }\n" .
-                "          break;\n" .
-                "        default:\n" .
-                "          value{$jsIndex}[valueIdx++] = _element.value;\n" .
-                "      }\n" .
-                "    }\n" .
-                "  }\n";
-            if ($reset) {
-                $tmp_reset =
-                    "    for (var i = 0; i < frm.elements.length; i++) {\n" .
-                    "      var _element = frm.elements[i];\n" .
-                    "      if (_element.name in _qfGroups['{$elementName}']) {\n" . 
-                    "        switch (_element.type) {\n" .
-                    "          case 'checkbox':\n" .
-                    "          case 'radio':\n" .
-                    "            _element.checked = _element.defaultChecked;\n" .
-                    "            break;\n" .
-                    "          case 'select-one':\n" .
-                    "          case 'select-multiple':\n" .
-                    "            for (var j = 0; j < _element.options.length; j++) {\n" .
-                    "              _element.options[j].selected = _element.options[j].defaultSelected;\n" .
-                    "            }\n" .
-                    "            break;\n" .
-                    "          default:\n" .
-                    "            _element.value = _element.defaultValue;\n" .
-                    "        }\n" .
-                    "      }\n" .
-                    "    }\n";
-            }
-
-        } elseif ($element->getType() == 'select') {
-            if ($element->getMultiple()) {
-                $elementName .= '[]';
-                $value =
-                    "  value{$jsIndex} = new Array();\n" .
-                    "  var valueIdx = 0;\n" .
-                    "  for (var i = 0; i < frm.elements['{$elementName}'].options.length; i++) {\n" . 
-                    "    if (frm.elements['{$elementName}'].options[i].selected) {\n" .
-                    "      value{$jsIndex}[valueIdx++] = frm.elements['{$elementName}'].options[i].value;\n" .
-                    "    }\n" .
-                    "  }\n";
-            } else {
-                $value = "  value{$jsIndex} = frm.elements['{$elementName}'].selectedIndex == -1? '': frm.elements['{$elementName}'].options[frm.elements['{$elementName}'].selectedIndex].value;\n";
-            }
-            if ($reset) {
-                $tmp_reset .= 
-                    "    for (var i = 0; i < field.options.length; i++) {\n" .
-                    "      field.options[i].selected = field.options[i].defaultSelected;\n" .
-                    "    }\n";
-            }
-
-        } elseif ($element->getType() == 'checkbox') {
-            if (is_a($element, 'html_quickform_advcheckbox')) {
-                $value = "  value{$jsIndex} = frm.elements['$elementName'][1].checked? frm.elements['$elementName'][1].value: frm.elements['$elementName'][0].value;\n";
-                $tmp_reset .= $reset ? "    field[1].checked = field[1].defaultChecked;\n" : '';
-            } else {
-                $value = "  value{$jsIndex} = frm.elements['$elementName'].checked? '1': '';\n";
-                $tmp_reset .= $reset ? "    field.checked = field.defaultChecked;\n" : '';
-            }
-
-        } elseif ($element->getType() == 'radio') {
-            $value = "  value{$jsIndex} = '';\n" .
-                     // Fix for bug #5644
-                     "  var els = 'length' in frm.elements['$elementName']? frm.elements['$elementName']: [ frm.elements['$elementName'] ];\n" .
-                     "  for (var i = 0; i < els.length; i++) {\n" .
-                     "    if (els[i].checked) {\n" .
-                     "      value{$jsIndex} = els[i].value;\n" .
-                     "    }\n" .
-                     "  }";
-            if ($reset) {
-                $tmp_reset .= "    for (var i = 0; i < field.length; i++) {\n" .
-                              "      field[i].checked = field[i].defaultChecked;\n" .
-                              "    }";
-            }
-
-        } else {
-            $value = "  value{$jsIndex} = frm.elements['$elementName'].value;";
-            $tmp_reset .= ($reset) ? "    field.value = field.defaultValue;\n" : '';
-        }
-        return array($value, $tmp_reset);
-    }
-} // end class HTML_QuickForm_RuleRegistry
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/advcheckbox.php b/airtime_mvc/library/pear/HTML/QuickForm/advcheckbox.php
deleted file mode 100644
index 19e225592..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/advcheckbox.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for an advanced checkbox type field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Jason Rust <jrust@php.net>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: advcheckbox.php,v 1.18 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for a checkbox type field
- */
-require_once 'HTML/QuickForm/checkbox.php';
-
-/**
- * HTML class for an advanced checkbox type field
- *
- * Basically this fixes a problem that HTML has had
- * where checkboxes can only pass a single value (the
- * value of the checkbox when checked).  A value for when
- * the checkbox is not checked cannot be passed, and 
- * furthermore the checkbox variable doesn't even exist if
- * the checkbox was submitted unchecked.
- *
- * It works by prepending a hidden field with the same name and
- * another "unchecked" value to the checbox. If the checkbox is
- * checked, PHP overwrites the value of the hidden field with
- * its value. 
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Jason Rust <jrust@php.net>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       2.0
- */
-class HTML_QuickForm_advcheckbox extends HTML_QuickForm_checkbox
-{
-    // {{{ properties
-
-    /**
-     * The values passed by the hidden elment
-     *
-     * @var array
-     * @access private
-     */
-    var $_values = null;
-
-    /**
-     * The default value
-     *
-     * @var boolean
-     * @access private
-     */
-    var $_currentValue = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field label 
-     * @param     string    $text           (optional)Text to put after the checkbox
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @param     mixed     $values         (optional)Values to pass if checked or not checked 
-     *
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_advcheckbox($elementName=null, $elementLabel=null, $text=null, $attributes=null, $values=null)
-    {
-        $this->HTML_QuickForm_checkbox($elementName, $elementLabel, $text, $attributes);
-        $this->setValues($values);
-    } //end constructor
-    
-    // }}}
-    // {{{ getPrivateName()
-
-    /**
-     * Gets the private name for the element
-     *
-     * @param   string  $elementName The element name to make private
-     *
-     * @access public
-     * @return string
-     *
-     * @deprecated          Deprecated since 3.2.6, both generated elements have the same name
-     */
-    function getPrivateName($elementName)
-    {
-        return '__'.$elementName;
-    }
-
-    // }}}
-    // {{{ getOnclickJs()
-
-    /**
-     * Create the javascript for the onclick event which will
-     * set the value of the hidden field
-     *
-     * @param     string    $elementName    The element name
-     *
-     * @access public
-     * @return string
-     *
-     * @deprecated          Deprecated since 3.2.6, this element no longer uses any javascript
-     */
-    function getOnclickJs($elementName)
-    {
-        $onclickJs = 'if (this.checked) { this.form[\''.$elementName.'\'].value=\''.addcslashes($this->_values[1], '\'').'\'; }';
-        $onclickJs .= 'else { this.form[\''.$elementName.'\'].value=\''.addcslashes($this->_values[0], '\'').'\'; }';
-        return $onclickJs;
-    }
-
-    // }}}
-    // {{{ setValues()
-
-    /**
-     * Sets the values used by the hidden element
-     *
-     * @param   mixed   $values The values, either a string or an array
-     *
-     * @access public
-     * @return void
-     */
-    function setValues($values)
-    {
-        if (empty($values)) {
-            // give it default checkbox behavior
-            $this->_values = array('', 1);
-        } elseif (is_scalar($values)) {
-            // if it's string, then assume the value to 
-            // be passed is for when the element is checked
-            $this->_values = array('', $values);
-        } else {
-            $this->_values = $values;
-        }
-        $this->updateAttributes(array('value' => $this->_values[1]));
-        $this->setChecked($this->_currentValue == $this->_values[1]);
-    }
-
-    // }}}
-    // {{{ setValue()
-
-   /**
-    * Sets the element's value
-    * 
-    * @param    mixed   Element's value
-    * @access   public
-    */
-    function setValue($value)
-    {
-        $this->setChecked(isset($this->_values[1]) && $value == $this->_values[1]);
-        $this->_currentValue = $value;
-    }
-
-    // }}}
-    // {{{ getValue()
-
-   /**
-    * Returns the element's value
-    *
-    * @access   public
-    * @return   mixed
-    */
-    function getValue()
-    {
-        if (is_array($this->_values)) {
-            return $this->_values[$this->getChecked()? 1: 0];
-        } else {
-            return null;
-        }
-    }
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the checkbox element in HTML
-     * and the additional hidden element in HTML
-     * 
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if ($this->_flagFrozen) {
-            return parent::toHtml();
-        } else {
-            return '<input' . $this->_getAttrString(array(
-                        'type'  => 'hidden', 
-                        'name'  => $this->getName(), 
-                        'value' => $this->_values[0]
-                   )) . ' />' . parent::toHtml();
-            
-        }
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-   /**
-    * Unlike checkbox, this has to append a hidden input in both
-    * checked and non-checked states
-    */
-    function getFrozenHtml()
-    {
-        return ($this->getChecked()? '<tt>[x]</tt>': '<tt>[ ]</tt>') .
-               $this->_getPersistantData();
-    }
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                // constant values override both default and submitted ones
-                // default values are overriden by submitted
-                $value = $this->_findValue($caller->_constantValues);
-                if (null === $value) {
-                    $value = $this->_findValue($caller->_submitValues);
-                    if (null === $value) {
-                        $value = $this->_findValue($caller->_defaultValues);
-                    }
-                }
-                if (null !== $value) {
-                    $this->setValue($value);
-                }
-                break;
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
-        }
-        return true;
-    } // end func onQuickFormLoad
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * This element has a value even if it is not checked, thus we override
-    * checkbox's behaviour here
-    */
-    function exportValue(&$submitValues, $assoc)
-    {
-        $value = $this->_findValue($submitValues);
-        if (null === $value) {
-            $value = $this->getValue();
-        } elseif (is_array($this->_values) && ($value != $this->_values[0]) && ($value != $this->_values[1])) {
-            $value = null;
-        }
-        return $this->_prepareValue($value, $assoc);
-    }
-    // }}}
-} //end class HTML_QuickForm_advcheckbox
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/autocomplete.php b/airtime_mvc/library/pear/HTML/QuickForm/autocomplete.php
deleted file mode 100644
index 7a0d8cbbe..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/autocomplete.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for an autocomplete element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Matteo Di Giovinazzo <matteodg@infinito.it>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: autocomplete.php,v 1.8 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for a text field
- */ 
-require_once 'HTML/QuickForm/text.php';
-
-/**
- * HTML class for an autocomplete element
- * 
- * Creates an HTML input text element that
- * at every keypressed javascript event checks in an array of options
- * if there's a match and autocompletes the text in case of match.
- *
- * For the JavaScript code thanks to Martin Honnen and Nicholas C. Zakas
- * See {@link http://www.faqts.com/knowledge_base/view.phtml/aid/13562} and
- * {@link http://www.sitepoint.com/article/1220} 
- * 
- * Example:
- * <code>
- * $autocomplete =& $form->addElement('autocomplete', 'fruit', 'Favourite fruit:');
- * $options = array("Apple", "Orange", "Pear", "Strawberry");
- * $autocomplete->setOptions($options);
- * </code>
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Matteo Di Giovinazzo <matteodg@infinito.it>
- * @version     Release: 3.2.11
- * @since       3.2
- */
-class HTML_QuickForm_autocomplete extends HTML_QuickForm_text
-{
-    // {{{ properties
-
-    /**
-     * Options for the autocomplete input text element
-     *
-     * @var       array
-     * @access    private
-     */
-    var $_options = array();
-
-    /**
-     * "One-time" javascript (containing functions), see bug #4611
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_js = '';
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     *
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field label in form
-     * @param     array     $options        (optional)Autocomplete options
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string
-     *                                      or an associative array. Date format is passed along the attributes.
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_autocomplete($elementName = null, $elementLabel = null, $options = null, $attributes = null)
-    {
-        $this->HTML_QuickForm_text($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_type = 'autocomplete';
-        if (isset($options)) {
-            $this->setOptions($options);
-        }
-    } //end constructor
-
-    // }}}
-    // {{{ setOptions()
-
-    /**
-     * Sets the options for the autocomplete input text element
-     *
-     * @param     array    $options    Array of options for the autocomplete input text element
-     * @access    public
-     * @return    void
-     */
-    function setOptions($options)
-    {
-        $this->_options = array_values($options);
-    } // end func setOptions
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns Html for the autocomplete input text element
-     *
-     * @access      public
-     * @return      string
-     */
-    function toHtml()
-    {
-        // prevent problems with grouped elements
-        $arrayName = str_replace(array('[', ']'), array('__', ''), $this->getName()) . '_values';
-
-        $this->updateAttributes(array(
-            'onkeypress' => 'return autocomplete(this, event, ' . $arrayName . ');'
-        ));
-        if ($this->_flagFrozen) {
-            $js = '';
-        } else {
-            $js = "<script type=\"text/javascript\">\n//<![CDATA[\n";
-            if (!defined('HTML_QUICKFORM_AUTOCOMPLETE_EXISTS')) {
-                $this->_js .= <<<EOS
-
-/* begin javascript for autocomplete */
-function setSelectionRange(input, selectionStart, selectionEnd) {
-    if (input.setSelectionRange) {
-        input.setSelectionRange(selectionStart, selectionEnd);
-    }
-    else if (input.createTextRange) {
-        var range = input.createTextRange();
-        range.collapse(true);
-        range.moveEnd("character", selectionEnd);
-        range.moveStart("character", selectionStart);
-        range.select();
-    }
-    input.focus();
-}
-
-function setCaretToPosition(input, position) {
-    setSelectionRange(input, position, position);
-}
-
-function replaceSelection (input, replaceString) {
-	var len = replaceString.length;
-    if (input.setSelectionRange) {
-        var selectionStart = input.selectionStart;
-        var selectionEnd = input.selectionEnd;
-
-        input.value = input.value.substring(0, selectionStart) + replaceString + input.value.substring(selectionEnd);
-		input.selectionStart  = selectionStart + len;
-		input.selectionEnd  = selectionStart + len;
-    }
-    else if (document.selection) {
-        var range = document.selection.createRange();
-		var saved_range = range.duplicate();
-
-        if (range.parentElement() == input) {
-            range.text = replaceString;
-			range.moveEnd("character", saved_range.selectionStart + len);
-			range.moveStart("character", saved_range.selectionStart + len);
-			range.select();
-        }
-    }
-    input.focus();
-}
-
-
-function autocompleteMatch (text, values) {
-    for (var i = 0; i < values.length; i++) {
-        if (values[i].toUpperCase().indexOf(text.toUpperCase()) == 0) {
-            return values[i];
-        }
-    }
-
-    return null;
-}
-
-function autocomplete(textbox, event, values) {
-    if (textbox.setSelectionRange || textbox.createTextRange) {
-        switch (event.keyCode) {
-            case 38:    // up arrow
-            case 40:    // down arrow
-            case 37:    // left arrow
-            case 39:    // right arrow
-            case 33:    // page up
-            case 34:    // page down
-            case 36:    // home
-            case 35:    // end
-            case 13:    // enter
-            case 9:     // tab
-            case 27:    // esc
-            case 16:    // shift
-            case 17:    // ctrl
-            case 18:    // alt
-            case 20:    // caps lock
-            case 8:     // backspace
-            case 46:    // delete
-                return true;
-                break;
-
-            default:
-                var c = String.fromCharCode(
-                    (event.charCode == undefined) ? event.keyCode : event.charCode
-                );
-                replaceSelection(textbox, c);
-                sMatch = autocompleteMatch(textbox.value, values);
-                var len = textbox.value.length;
-				
-                if (sMatch != null) {
-                    textbox.value = sMatch;
-                    setSelectionRange(textbox, len, textbox.value.length);
-                }
-                return false;
-        }
-    }
-    else {
-        return true;
-    }
-}
-/* end javascript for autocomplete */
-
-EOS;
-                define('HTML_QUICKFORM_AUTOCOMPLETE_EXISTS', true);
-            }
-            $jsEscape = array(
-                "\r"    => '\r',
-                "\n"    => '\n',
-                "\t"    => '\t',
-                "'"     => "\\'",
-                '"'     => '\"',
-                '\\'    => '\\\\'
-            );
-
-            $js .= $this->_js;
-            $js .= 'var ' . $arrayName . " = new Array();\n";
-            for ($i = 0; $i < count($this->_options); $i++) {
-                $js .= $arrayName . '[' . $i . "] = '" . strtr($this->_options[$i], $jsEscape) . "';\n";
-            }
-            $js .= "//]]>\n</script>";
-        }
-        return $js . parent::toHtml();
-    }// end func toHtml
-
-    // }}}
-} // end class HTML_QuickForm_autocomplete
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/button.php b/airtime_mvc/library/pear/HTML/QuickForm/button.php
deleted file mode 100644
index 812c7391e..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/button.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for an <input type="button" /> elements
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: button.php,v 1.6 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for an <input type="button" /> elements
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_button extends HTML_QuickForm_input
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $value          (optional)Input field value
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_button($elementName=null, $value=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
-        $this->_persistantFreeze = false;
-        $this->setValue($value);
-        $this->setType('button');
-    } //end constructor
-    
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
- 
-} //end class HTML_QuickForm_button
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/checkbox.php b/airtime_mvc/library/pear/HTML/QuickForm/checkbox.php
deleted file mode 100644
index 36d8e7764..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/checkbox.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a checkbox type field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: checkbox.php,v 1.23 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a checkbox type field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_checkbox extends HTML_QuickForm_input
-{
-    // {{{ properties
-
-    /**
-     * Checkbox display text
-     * @var       string
-     * @since     1.1
-     * @access    private
-     */
-    var $_text = '';
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field value
-     * @param     string    $text           (optional)Checkbox display text
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_checkbox($elementName=null, $elementLabel=null, $text='', $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_text = $text;
-        $this->setType('checkbox');
-        $this->updateAttributes(array('value'=>1));
-        $this->_generateId();
-    } //end constructor
-    
-    // }}}
-    // {{{ setChecked()
-
-    /**
-     * Sets whether a checkbox is checked
-     * 
-     * @param     bool    $checked  Whether the field is checked or not
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setChecked($checked)
-    {
-        if (!$checked) {
-            $this->removeAttribute('checked');
-        } else {
-            $this->updateAttributes(array('checked'=>'checked'));
-        }
-    } //end func setChecked
-
-    // }}}
-    // {{{ getChecked()
-
-    /**
-     * Returns whether a checkbox is checked
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    bool
-     */
-    function getChecked()
-    {
-        return (bool)$this->getAttribute('checked');
-    } //end func getChecked
-    
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the checkbox element in HTML
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if (0 == strlen($this->_text)) {
-            $label = '';
-        } elseif ($this->_flagFrozen) {
-            $label = $this->_text;
-        } else {
-            $label = '<label for="' . $this->getAttribute('id') . '">' . $this->_text . '</label>';
-        }
-        return HTML_QuickForm_input::toHtml() . $label;
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        if ($this->getChecked()) {
-            return '<tt>[x]</tt>' .
-                   $this->_getPersistantData();
-        } else {
-            return '<tt>[ ]</tt>';
-        }
-    } //end func getFrozenHtml
-
-    // }}}
-    // {{{ setText()
-
-    /**
-     * Sets the checkbox text
-     * 
-     * @param     string    $text  
-     * @since     1.1
-     * @access    public
-     * @return    void
-     */
-    function setText($text)
-    {
-        $this->_text = $text;
-    } //end func setText
-
-    // }}}
-    // {{{ getText()
-
-    /**
-     * Returns the checkbox text 
-     * 
-     * @since     1.1
-     * @access    public
-     * @return    string
-     */
-    function getText()
-    {
-        return $this->_text;
-    } //end func getText
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets the value of the form element
-     *
-     * @param     string    $value      Default value of the form element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        return $this->setChecked($value);
-    } // end func setValue
-
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the form element
-     *
-     * @since     1.0
-     * @access    public
-     * @return    bool
-     */
-    function getValue()
-    {
-        return $this->getChecked();
-    } // end func getValue
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                // constant values override both default and submitted ones
-                // default values are overriden by submitted
-                $value = $this->_findValue($caller->_constantValues);
-                if (null === $value) {
-                    // if no boxes were checked, then there is no value in the array
-                    // yet we don't want to display default value in this case
-                    if ($caller->isSubmitted()) {
-                        $value = $this->_findValue($caller->_submitValues);
-                    } else {
-                        $value = $this->_findValue($caller->_defaultValues);
-                    }
-                }
-                if (null !== $value || $caller->isSubmitted()) {
-                    $this->setChecked($value);
-                }
-                break;
-            case 'setGroupValue':
-                $this->setChecked($arg);
-                break;
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * Return true if the checkbox is checked, null if it is not checked (getValue() returns false)
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $value = $this->_findValue($submitValues);
-        if (null === $value) {
-            $value = $this->getChecked()? true: null;
-        }
-        return $this->_prepareValue($value, $assoc);
-    }
-    
-    // }}}
-} //end class HTML_QuickForm_checkbox
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/date.php b/airtime_mvc/library/pear/HTML/QuickForm/date.php
deleted file mode 100644
index 94c8d69e4..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/date.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Class for a group of elements used to input dates (and times).
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: date.php,v 1.62 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Class for a group of form elements
- */
-require_once 'HTML/QuickForm/group.php';
-/**
- * Class for <select></select> elements
- */
-require_once 'HTML/QuickForm/select.php';
-
-/**
- * Class for a group of elements used to input dates (and times).
- * 
- * Inspired by original 'date' element but reimplemented as a subclass
- * of HTML_QuickForm_group
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.1
- */
-class HTML_QuickForm_date extends HTML_QuickForm_group
-{
-    // {{{ properties
-
-   /**
-    * Various options to control the element's display.
-    * 
-    * @access   private
-    * @var      array
-    */
-    var $_options = array(
-        'language'         => 'en',
-        'format'           => 'dMY',
-        'minYear'          => 2001,
-        'maxYear'          => 2010,
-        'addEmptyOption'   => false,
-        'emptyOptionValue' => '',
-        'emptyOptionText'  => '&nbsp;',
-        'optionIncrement'  => array('i' => 1, 's' => 1)
-    );
-
-   /**
-    * These complement separators, they are appended to the resultant HTML
-    * @access   private
-    * @var      array
-    */
-    var $_wrap = array('', '');
-
-   /**
-    * Options in different languages
-    * 
-    * Note to potential translators: to avoid encoding problems please send
-    * your translations with "weird" letters encoded as HTML Unicode entities
-    * 
-    * @access   private
-    * @var      array
-    */
-    var $_locale = array(
-        'en'    => array (
-            'weekdays_short'=> array ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'),
-            'weekdays_long' => array ('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
-            'months_long'   => array ('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December')
-        ),
-        'de'    => array (
-            'weekdays_short'=> array ('So', 'Mon', 'Di', 'Mi', 'Do', 'Fr', 'Sa'),
-            'weekdays_long' => array ('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'),
-            'months_short'  => array ('Jan', 'Feb', 'M&#xe4;rz', 'April', 'Mai', 'Juni', 'Juli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dez'),
-            'months_long'   => array ('Januar', 'Februar', 'M&#xe4;rz', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember')
-        ),
-        'fr'    => array (
-            'weekdays_short'=> array ('Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'),
-            'weekdays_long' => array ('Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'),
-            'months_short'  => array ('Jan', 'F&#xe9;v', 'Mar', 'Avr', 'Mai', 'Juin', 'Juil', 'Ao&#xfb;t', 'Sep', 'Oct', 'Nov', 'D&#xe9;c'),
-            'months_long'   => array ('Janvier', 'F&#xe9;vrier', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Ao&#xfb;t', 'Septembre', 'Octobre', 'Novembre', 'D&#xe9;cembre')
-        ),
-        'hu'    => array (
-            'weekdays_short'=> array ('V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'),
-            'weekdays_long' => array ('vas&#xe1;rnap', 'h&#xe9;tf&#x151;', 'kedd', 'szerda', 'cs&#xfc;t&#xf6;rt&#xf6;k', 'p&#xe9;ntek', 'szombat'),
-            'months_short'  => array ('jan', 'feb', 'm&#xe1;rc', '&#xe1;pr', 'm&#xe1;j', 'j&#xfa;n', 'j&#xfa;l', 'aug', 'szept', 'okt', 'nov', 'dec'),
-            'months_long'   => array ('janu&#xe1;r', 'febru&#xe1;r', 'm&#xe1;rcius', '&#xe1;prilis', 'm&#xe1;jus', 'j&#xfa;nius', 'j&#xfa;lius', 'augusztus', 'szeptember', 'okt&#xf3;ber', 'november', 'december')
-        ),
-        'pl'    => array (
-            'weekdays_short'=> array ('Nie', 'Pn', 'Wt', '&#x15a;r', 'Czw', 'Pt', 'Sob'),
-            'weekdays_long' => array ('Niedziela', 'Poniedzia&#x142;ek', 'Wtorek', '&#x15a;roda', 'Czwartek', 'Pi&#x105;tek', 'Sobota'),
-            'months_short'  => array ('Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze', 'Lip', 'Sie', 'Wrz', 'Pa&#x17a;', 'Lis', 'Gru'),
-            'months_long'   => array ('Stycze&#x144;', 'Luty', 'Marzec', 'Kwiecie&#x144;', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpie&#x144;', 'Wrzesie&#x144;', 'Pa&#x17a;dziernik', 'Listopad', 'Grudzie&#x144;')
-        ),
-        'sl'    => array (
-            'weekdays_short'=> array ('Ned', 'Pon', 'Tor', 'Sre', 'Cet', 'Pet', 'Sob'),
-            'weekdays_long' => array ('Nedelja', 'Ponedeljek', 'Torek', 'Sreda', 'Cetrtek', 'Petek', 'Sobota'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januar', 'Februar', 'Marec', 'April', 'Maj', 'Junij', 'Julij', 'Avgust', 'September', 'Oktober', 'November', 'December')
-        ),
-        'ru'    => array (
-            'weekdays_short'=> array ('&#x412;&#x441;', '&#x41f;&#x43d;', '&#x412;&#x442;', '&#x421;&#x440;', '&#x427;&#x442;', '&#x41f;&#x442;', '&#x421;&#x431;'),
-            'weekdays_long' => array ('&#x412;&#x43e;&#x441;&#x43a;&#x440;&#x435;&#x441;&#x435;&#x43d;&#x44c;&#x435;', '&#x41f;&#x43e;&#x43d;&#x435;&#x434;&#x435;&#x43b;&#x44c;&#x43d;&#x438;&#x43a;', '&#x412;&#x442;&#x43e;&#x440;&#x43d;&#x438;&#x43a;', '&#x421;&#x440;&#x435;&#x434;&#x430;', '&#x427;&#x435;&#x442;&#x432;&#x435;&#x440;&#x433;', '&#x41f;&#x44f;&#x442;&#x43d;&#x438;&#x446;&#x430;', '&#x421;&#x443;&#x431;&#x431;&#x43e;&#x442;&#x430;'),
-            'months_short'  => array ('&#x42f;&#x43d;&#x432;', '&#x424;&#x435;&#x432;', '&#x41c;&#x430;&#x440;', '&#x410;&#x43f;&#x440;', '&#x41c;&#x430;&#x439;', '&#x418;&#x44e;&#x43d;', '&#x418;&#x44e;&#x43b;', '&#x410;&#x432;&#x433;', '&#x421;&#x435;&#x43d;', '&#x41e;&#x43a;&#x442;', '&#x41d;&#x43e;&#x44f;', '&#x414;&#x435;&#x43a;'),
-            'months_long'   => array ('&#x42f;&#x43d;&#x432;&#x430;&#x440;&#x44c;', '&#x424;&#x435;&#x432;&#x440;&#x430;&#x43b;&#x44c;', '&#x41c;&#x430;&#x440;&#x442;', '&#x410;&#x43f;&#x440;&#x435;&#x43b;&#x44c;', '&#x41c;&#x430;&#x439;', '&#x418;&#x44e;&#x43d;&#x44c;', '&#x418;&#x44e;&#x43b;&#x44c;', '&#x410;&#x432;&#x433;&#x443;&#x441;&#x442;', '&#x421;&#x435;&#x43d;&#x442;&#x44f;&#x431;&#x440;&#x44c;', '&#x41e;&#x43a;&#x442;&#x44f;&#x431;&#x440;&#x44c;', '&#x41d;&#x43e;&#x44f;&#x431;&#x440;&#x44c;', '&#x414;&#x435;&#x43a;&#x430;&#x431;&#x440;&#x44c;')
-        ),
-        'es'    => array (
-            'weekdays_short'=> array ('Dom', 'Lun', 'Mar', 'Mi&#xe9;', 'Jue', 'Vie', 'S&#xe1;b'),
-            'weekdays_long' => array ('Domingo', 'Lunes', 'Martes', 'Mi&#xe9;rcoles', 'Jueves', 'Viernes', 'S&#xe1;bado'),
-            'months_short'  => array ('Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'),
-            'months_long'   => array ('Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre')
-        ),
-        'da'    => array (
-            'weekdays_short'=> array ('S&#xf8;n', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'L&#xf8;r'),
-            'weekdays_long' => array ('S&#xf8;ndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'L&#xf8;rdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December')
-        ),
-        'is'    => array (
-            'weekdays_short'=> array ('Sun', 'M&#xe1;n', '&#xde;ri', 'Mi&#xf0;', 'Fim', 'F&#xf6;s', 'Lau'),
-            'weekdays_long' => array ('Sunnudagur', 'M&#xe1;nudagur', '&#xde;ri&#xf0;judagur', 'Mi&#xf0;vikudagur', 'Fimmtudagur', 'F&#xf6;studagur', 'Laugardagur'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Ma&#xed;', 'J&#xfa;n', 'J&#xfa;l', '&#xc1;g&#xfa;', 'Sep', 'Okt', 'N&#xf3;v', 'Des'),
-            'months_long'   => array ('Jan&#xfa;ar', 'Febr&#xfa;ar', 'Mars', 'Apr&#xed;l', 'Ma&#xed;', 'J&#xfa;n&#xed;', 'J&#xfa;l&#xed;', '&#xc1;g&#xfa;st', 'September', 'Okt&#xf3;ber', 'N&#xf3;vember', 'Desember')
-        ),
-        'it'    => array (
-            'weekdays_short'=> array ('Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'),
-            'weekdays_long' => array ('Domenica', 'Luned&#xec;', 'Marted&#xec;', 'Mercoled&#xec;', 'Gioved&#xec;', 'Venerd&#xec;', 'Sabato'),
-            'months_short'  => array ('Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'),
-            'months_long'   => array ('Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre')
-        ),
-        'sk'    => array (
-            'weekdays_short'=> array ('Ned', 'Pon', 'Uto', 'Str', '&#x8a;tv', 'Pia', 'Sob'),
-            'weekdays_long' => array ('Nede&#x17e;a', 'Pondelok', 'Utorok', 'Streda', '&#x8a;tvrtok', 'Piatok', 'Sobota'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'M&#xe1;j', 'J&#xfa;n', 'J&#xfa;l', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Janu&#xe1;r', 'Febru&#xe1;r', 'Marec', 'Apr&#xed;l', 'M&#xe1;j', 'J&#xfa;n', 'J&#xfa;l', 'August', 'September', 'Okt&#xf3;ber', 'November', 'December')
-        ),
-        'cs'    => array (
-            'weekdays_short'=> array ('Ne', 'Po', '&#xda;t', 'St', '&#x10c;t', 'P&#xe1;', 'So'),
-            'weekdays_long' => array ('Ned&#x11b;le', 'Pond&#x11b;l&#xed;', '&#xda;ter&#xfd;', 'St&#x159;eda', '&#x10c;tvrtek', 'P&#xe1;tek', 'Sobota'),
-            'months_short'  => array ('Led', '&#xda;no', 'B&#x159;e', 'Dub', 'Kv&#x11b;', '&#x10c;en', '&#x10c;ec', 'Srp', 'Z&#xe1;&#x159;', '&#x158;&#xed;j', 'Lis', 'Pro'),
-            'months_long'   => array ('Leden', '&#xda;nor', 'B&#x159;ezen', 'Duben', 'Kv&#x11b;ten', '&#x10c;erven', '&#x10c;ervenec', 'Srpen', 'Z&#xe1;&#x159;&#xed;', '&#x158;&#xed;jen', 'Listopad', 'Prosinec')
-        ),
-        'hy'    => array (
-            'weekdays_short'=> array ('&#x53f;&#x580;&#x56f;', '&#x535;&#x580;&#x56f;', '&#x535;&#x580;&#x584;', '&#x549;&#x580;&#x584;', '&#x540;&#x576;&#x563;', '&#x548;&#x582;&#x580;', '&#x547;&#x562;&#x569;'),
-            'weekdays_long' => array ('&#x53f;&#x56b;&#x580;&#x561;&#x56f;&#x56b;', '&#x535;&#x580;&#x56f;&#x578;&#x582;&#x577;&#x561;&#x562;&#x569;&#x56b;', '&#x535;&#x580;&#x565;&#x584;&#x577;&#x561;&#x562;&#x569;&#x56b;', '&#x549;&#x578;&#x580;&#x565;&#x584;&#x577;&#x561;&#x562;&#x569;&#x56b;', '&#x540;&#x56b;&#x576;&#x563;&#x577;&#x561;&#x562;&#x569;&#x56b;', '&#x548;&#x582;&#x580;&#x562;&#x561;&#x569;', '&#x547;&#x561;&#x562;&#x561;&#x569;'),
-            'months_short'  => array ('&#x540;&#x576;&#x57e;', '&#x553;&#x57f;&#x580;', '&#x544;&#x580;&#x57f;', '&#x531;&#x57a;&#x580;', '&#x544;&#x575;&#x57d;', '&#x540;&#x576;&#x57d;', '&#x540;&#x56c;&#x57d;', '&#x555;&#x563;&#x57d;', '&#x54d;&#x57a;&#x57f;', '&#x540;&#x56f;&#x57f;', '&#x546;&#x575;&#x574;', '&#x534;&#x56f;&#x57f;'),
-            'months_long'   => array ('&#x540;&#x578;&#x582;&#x576;&#x57e;&#x561;&#x580;', '&#x553;&#x565;&#x57f;&#x580;&#x57e;&#x561;&#x580;', '&#x544;&#x561;&#x580;&#x57f;', '&#x531;&#x57a;&#x580;&#x56b;&#x56c;', '&#x544;&#x561;&#x575;&#x56b;&#x57d;', '&#x540;&#x578;&#x582;&#x576;&#x56b;&#x57d;', '&#x540;&#x578;&#x582;&#x56c;&#x56b;&#x57d;', '&#x555;&#x563;&#x578;&#x57d;&#x57f;&#x578;&#x57d;', '&#x54d;&#x565;&#x57a;&#x57f;&#x565;&#x574;&#x562;&#x565;&#x580;', '&#x540;&#x578;&#x56f;&#x57f;&#x565;&#x574;&#x562;&#x565;&#x580;', '&#x546;&#x578;&#x575;&#x565;&#x574;&#x562;&#x565;&#x580;', '&#x534;&#x565;&#x56f;&#x57f;&#x565;&#x574;&#x562;&#x565;&#x580;')
-        ),
-        'nl'    => array (
-            'weekdays_short'=> array ('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'),
-            'weekdays_long' => array ('Zondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrijdag', 'Zaterdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januari', 'Februari', 'Maart', 'April', 'Mei', 'Juni', 'Juli', 'Augustus', 'September', 'Oktober', 'November', 'December')
-        ),
-        'et'    => array (
-            'weekdays_short'=> array ('P', 'E', 'T', 'K', 'N', 'R', 'L'),
-            'weekdays_long' => array ('P&#xfc;hap&#xe4;ev', 'Esmasp&#xe4;ev', 'Teisip&#xe4;ev', 'Kolmap&#xe4;ev', 'Neljap&#xe4;ev', 'Reede', 'Laup&#xe4;ev'),
-            'months_short'  => array ('Jaan', 'Veebr', 'M&#xe4;rts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'Aug', 'Sept', 'Okt', 'Nov', 'Dets'),
-            'months_long'   => array ('Jaanuar', 'Veebruar', 'M&#xe4;rts', 'Aprill', 'Mai', 'Juuni', 'Juuli', 'August', 'September', 'Oktoober', 'November', 'Detsember')
-        ),
-        'tr'    => array (
-            'weekdays_short'=> array ('Paz', 'Pzt', 'Sal', '&#xc7;ar', 'Per', 'Cum', 'Cts'),
-            'weekdays_long' => array ('Pazar', 'Pazartesi', 'Sal&#x131;', '&#xc7;ar&#x15f;amba', 'Per&#x15f;embe', 'Cuma', 'Cumartesi'),
-            'months_short'  => array ('Ock', '&#x15e;bt', 'Mrt', 'Nsn', 'Mys', 'Hzrn', 'Tmmz', 'A&#x11f;st', 'Eyl', 'Ekm', 'Ksm', 'Arlk'),
-            'months_long'   => array ('Ocak', '&#x15e;ubat', 'Mart', 'Nisan', 'May&#x131;s', 'Haziran', 'Temmuz', 'A&#x11f;ustos', 'Eyl&#xfc;l', 'Ekim', 'Kas&#x131;m', 'Aral&#x131;k')
-        ),
-        'no'    => array (
-            'weekdays_short'=> array ('S&#xf8;n', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'L&#xf8;r'),
-            'weekdays_long' => array ('S&#xf8;ndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'L&#xf8;rdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'),
-            'months_long'   => array ('Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember')
-        ),
-        'eo'    => array (
-            'weekdays_short'=> array ('Dim', 'Lun', 'Mar', 'Mer', '&#x134;a&#x16D;', 'Ven', 'Sab'),
-            'weekdays_long' => array ('Diman&#x109;o', 'Lundo', 'Mardo', 'Merkredo', '&#x134;a&#x16D;do', 'Vendredo', 'Sabato'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'A&#x16D;g', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januaro', 'Februaro', 'Marto', 'Aprilo', 'Majo', 'Junio', 'Julio', 'A&#x16D;gusto', 'Septembro', 'Oktobro', 'Novembro', 'Decembro')
-        ),
-        'ua'    => array (
-            'weekdays_short'=> array('&#x41d;&#x434;&#x43b;', '&#x41f;&#x43d;&#x434;', '&#x412;&#x442;&#x440;', '&#x421;&#x440;&#x434;', '&#x427;&#x442;&#x432;', '&#x41f;&#x442;&#x43d;', '&#x421;&#x431;&#x442;'),
-            'weekdays_long' => array('&#x41d;&#x435;&#x434;&#x456;&#x43b;&#x44f;', '&#x41f;&#x43e;&#x43d;&#x435;&#x434;&#x456;&#x43b;&#x43e;&#x43a;', '&#x412;&#x456;&#x432;&#x442;&#x43e;&#x440;&#x43e;&#x43a;', '&#x421;&#x435;&#x440;&#x435;&#x434;&#x430;', '&#x427;&#x435;&#x442;&#x432;&#x435;&#x440;', '&#x41f;\'&#x44f;&#x442;&#x43d;&#x438;&#x446;&#x44f;', '&#x421;&#x443;&#x431;&#x43e;&#x442;&#x430;'),
-            'months_short'  => array('&#x421;&#x456;&#x447;', '&#x41b;&#x44e;&#x442;', '&#x411;&#x435;&#x440;', '&#x41a;&#x432;&#x456;', '&#x422;&#x440;&#x430;', '&#x427;&#x435;&#x440;', '&#x41b;&#x438;&#x43f;', '&#x421;&#x435;&#x440;', '&#x412;&#x435;&#x440;', '&#x416;&#x43e;&#x432;', '&#x41b;&#x438;&#x441;', '&#x413;&#x440;&#x443;'),
-            'months_long'   => array('&#x421;&#x456;&#x447;&#x435;&#x43d;&#x44c;', '&#x41b;&#x44e;&#x442;&#x438;&#x439;', '&#x411;&#x435;&#x440;&#x435;&#x437;&#x435;&#x43d;&#x44c;', '&#x41a;&#x432;&#x456;&#x442;&#x435;&#x43d;&#x44c;', '&#x422;&#x440;&#x430;&#x432;&#x435;&#x43d;&#x44c;', '&#x427;&#x435;&#x440;&#x432;&#x435;&#x43d;&#x44c;', '&#x41b;&#x438;&#x43f;&#x435;&#x43d;&#x44c;', '&#x421;&#x435;&#x440;&#x43f;&#x435;&#x43d;&#x44c;', '&#x412;&#x435;&#x440;&#x435;&#x441;&#x435;&#x43d;&#x44c;', '&#x416;&#x43e;&#x432;&#x442;&#x435;&#x43d;&#x44c;', '&#x41b;&#x438;&#x441;&#x442;&#x43e;&#x43f;&#x430;&#x434;', '&#x413;&#x440;&#x443;&#x434;&#x435;&#x43d;&#x44c;')
-        ),
-        'ro'    => array (
-            'weekdays_short'=> array ('Dum', 'Lun', 'Mar', 'Mie', 'Joi', 'Vin', 'Sam'),
-            'weekdays_long' => array ('Duminica', 'Luni', 'Marti', 'Miercuri', 'Joi', 'Vineri', 'Sambata'),
-            'months_short'  => array ('Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun', 'Iul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'),
-            'months_long'   => array ('Ianuarie', 'Februarie', 'Martie', 'Aprilie', 'Mai', 'Iunie', 'Iulie', 'August', 'Septembrie', 'Octombrie', 'Noiembrie', 'Decembrie')
-        ),
-        'he'    => array (
-            'weekdays_short'=> array ('&#1512;&#1488;&#1513;&#1493;&#1503;', '&#1513;&#1504;&#1497;', '&#1513;&#1500;&#1497;&#1513;&#1497;', '&#1512;&#1489;&#1497;&#1506;&#1497;', '&#1495;&#1502;&#1497;&#1513;&#1497;', '&#1513;&#1497;&#1513;&#1497;', '&#1513;&#1489;&#1514;'),
-            'weekdays_long' => array ('&#1497;&#1493;&#1501; &#1512;&#1488;&#1513;&#1493;&#1503;', '&#1497;&#1493;&#1501; &#1513;&#1504;&#1497;', '&#1497;&#1493;&#1501; &#1513;&#1500;&#1497;&#1513;&#1497;', '&#1497;&#1493;&#1501; &#1512;&#1489;&#1497;&#1506;&#1497;', '&#1497;&#1493;&#1501; &#1495;&#1502;&#1497;&#1513;&#1497;', '&#1497;&#1493;&#1501; &#1513;&#1497;&#1513;&#1497;', '&#1513;&#1489;&#1514;'),
-            'months_short'  => array ('&#1497;&#1504;&#1493;&#1488;&#1512;', '&#1508;&#1489;&#1512;&#1493;&#1488;&#1512;', '&#1502;&#1512;&#1509;', '&#1488;&#1508;&#1512;&#1497;&#1500;', '&#1502;&#1488;&#1497;', '&#1497;&#1493;&#1504;&#1497;', '&#1497;&#1493;&#1500;&#1497;', '&#1488;&#1493;&#1490;&#1493;&#1505;&#1496;', '&#1505;&#1508;&#1496;&#1502;&#1489;&#1512;', '&#1488;&#1493;&#1511;&#1496;&#1493;&#1489;&#1512;', '&#1504;&#1493;&#1489;&#1502;&#1489;&#1512;', '&#1491;&#1510;&#1502;&#1489;&#1512;'),
-            'months_long'   => array ('&#1497;&#1504;&#1493;&#1488;&#1512;', '&#1508;&#1489;&#1512;&#1493;&#1488;&#1512;', '&#1502;&#1512;&#1509;', '&#1488;&#1508;&#1512;&#1497;&#1500;', '&#1502;&#1488;&#1497;', '&#1497;&#1493;&#1504;&#1497;', '&#1497;&#1493;&#1500;&#1497;', '&#1488;&#1493;&#1490;&#1493;&#1505;&#1496;', '&#1505;&#1508;&#1496;&#1502;&#1489;&#1512;', '&#1488;&#1493;&#1511;&#1496;&#1493;&#1489;&#1512;', '&#1504;&#1493;&#1489;&#1502;&#1489;&#1512;', '&#1491;&#1510;&#1502;&#1489;&#1512;')
-        ),
-        'sv'    => array (
-            'weekdays_short'=> array ('S&#xf6;n', 'M&#xe5;n', 'Tis', 'Ons', 'Tor', 'Fre', 'L&#xf6;r'),
-            'weekdays_long' => array ('S&#xf6;ndag', 'M&#xe5;ndag', 'Tisdag', 'Onsdag', 'Torsdag', 'Fredag', 'L&#xf6;rdag'),
-            'months_short'  => array ('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec'),
-            'months_long'   => array ('Januari', 'Februari', 'Mars', 'April', 'Maj', 'Juni', 'Juli', 'Augusti', 'September', 'Oktober', 'November', 'December')
-        ),
-        'pt'    => array (
-            'weekdays_short'=> array ('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'S&aacute;b'),
-            'weekdays_long' => array ('Domingo', 'Segunda-feira', 'Ter&ccedil;a-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'S&aacute;bado'),
-            'months_short'  => array ('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
-            'months_long'   => array ('Janeiro', 'Fevereiro', 'Mar&ccedil;o', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
-        ),
-        'tw'    => array (
-            'weekdays_short'=> array ('&#36913;&#26085;','&#36913;&#19968;', '&#36913;&#20108;','&#36913;&#19977;', '&#36913;&#22235;','&#36913;&#20116;', '&#36913;&#20845;'),
-            'weekdays_long' => array ('&#26143;&#26399;&#26085;', '&#26143;&#26399;&#19968;', '&#26143;&#26399;&#20108;', '&#26143;&#26399;&#19977;', '&#26143;&#26399;&#22235;', '&#26143;&#26399;&#20116;', '&#26143;&#26399;&#20845;'),
-            'months_short'  => array ('&#19968;&#26376;', '&#20108;&#26376;', '&#19977;&#26376;', '&#22235;&#26376;', '&#20116;&#26376;', '&#20845;&#26376;', '&#19971;&#26376;', '&#20843;&#26376;', '&#20061;&#26376;', '&#21313;&#26376;', '&#21313;&#19968;&#26376;', '&#21313;&#20108;&#26376;'),
-            'months_long'   => array ('&#19968;&#26376;', '&#20108;&#26376;', '&#19977;&#26376;', '&#22235;&#26376;', '&#20116;&#26376;', '&#20845;&#26376;', '&#19971;&#26376;', '&#20843;&#26376;', '&#20061;&#26376;', '&#21313;&#26376;', '&#21313;&#19968;&#26376;', '&#21313;&#20108;&#26376;')
-        ),
-        'pt-br' => array (
-            'weekdays_short'=> array ('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'S&aacute;b'),
-            'weekdays_long' => array ('Domingo', 'Segunda', 'Ter&ccedil;a', 'Quarta', 'Quinta', 'Sexta', 'S&aacute;bado'),
-            'months_short'  => array ('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'),
-            'months_long'   => array ('Janeiro', 'Fevereiro', 'Mar&ccedil;o', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro')
-        )
-    );
-
-    // }}}
-    // {{{ constructor
-
-   /**
-    * Class constructor
-    * 
-    * The following keys may appear in $options array:
-    * - 'language': date language
-    * - 'format': Format of the date, based on PHP's date() function.
-    *   The following characters are currently recognised in format string:
-    *   <pre>  
-    *       D => Short names of days
-    *       l => Long names of days
-    *       d => Day numbers
-    *       M => Short names of months
-    *       F => Long names of months
-    *       m => Month numbers
-    *       Y => Four digit year
-    *       y => Two digit year
-    *       h => 12 hour format
-    *       H => 23 hour  format
-    *       i => Minutes
-    *       s => Seconds
-    *       a => am/pm
-    *       A => AM/PM
-    *   </pre>
-    * - 'minYear': Minimum year in year select
-    * - 'maxYear': Maximum year in year select
-    * - 'addEmptyOption': Should an empty option be added to the top of
-    *    each select box?
-    * - 'emptyOptionValue': The value passed by the empty option.
-    * - 'emptyOptionText': The text displayed for the empty option.
-    * - 'optionIncrement': Step to increase the option values by (works for 'i' and 's')
-    *
-    * @access   public
-    * @param    string  Element's name
-    * @param    mixed   Label(s) for an element
-    * @param    array   Options to control the element's display
-    * @param    mixed   Either a typical HTML attribute string or an associative array
-    */
-    function HTML_QuickForm_date($elementName = null, $elementLabel = null, $options = array(), $attributes = null)
-    {
-        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_appendName = true;
-        $this->_type = 'date';
-        // set the options, do not bother setting bogus ones
-        if (is_array($options)) {
-            foreach ($options as $name => $value) {
-                if ('language' == $name) {
-                    $this->_options['language'] = isset($this->_locale[$value])? $value: 'en';
-                } elseif (isset($this->_options[$name])) {
-                    if (is_array($value) && is_array($this->_options[$name])) {
-                        $this->_options[$name] = @array_merge($this->_options[$name], $value);
-                    } else {
-                        $this->_options[$name] = $value;
-                    }
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _createElements()
-
-    function _createElements()
-    {
-        $this->_separator = $this->_elements = array();
-        $separator =  '';
-        $locale    =& $this->_locale[$this->_options['language']];
-        $backslash =  false;
-        for ($i = 0, $length = strlen($this->_options['format']); $i < $length; $i++) {
-            $sign = $this->_options['format']{$i};
-            if ($backslash) {
-                $backslash  = false;
-                $separator .= $sign;
-            } else {
-                $loadSelect = true;
-                switch ($sign) {
-                    case 'D':
-                        // Sunday is 0 like with 'w' in date()
-                        $options = $locale['weekdays_short'];
-                        break;
-                    case 'l':
-                        $options = $locale['weekdays_long'];
-                        break;
-                    case 'd':
-                        $options = $this->_createOptionList(1, 31);
-                        break;
-                    case 'M':
-                        $options = $locale['months_short'];
-                        array_unshift($options , '');
-                        unset($options[0]);
-                        break;
-                    case 'm':
-                        $options = $this->_createOptionList(1, 12);
-                        break;
-                    case 'F':
-                        $options = $locale['months_long'];
-                        array_unshift($options , '');
-                        unset($options[0]);
-                        break;
-                    case 'Y':
-                        $options = $this->_createOptionList(
-                            $this->_options['minYear'],
-                            $this->_options['maxYear'], 
-                            $this->_options['minYear'] > $this->_options['maxYear']? -1: 1
-                        );
-                        break;
-                    case 'y':
-                        $options = $this->_createOptionList(
-                            $this->_options['minYear'],
-                            $this->_options['maxYear'],
-                            $this->_options['minYear'] > $this->_options['maxYear']? -1: 1
-                        );
-                        array_walk($options, create_function('&$v,$k','$v = substr($v,-2);')); 
-                        break;
-                    case 'h':
-                        $options = $this->_createOptionList(1, 12);
-                        break;
-                    case 'g':
-                        $options = $this->_createOptionList(1, 12);
-                        array_walk($options, create_function('&$v,$k', '$v = intval($v);'));
-                        break;
-                    case 'H':
-                        $options = $this->_createOptionList(0, 23);
-                        break;
-                    case 'i':
-                        $options = $this->_createOptionList(0, 59, $this->_options['optionIncrement']['i']);
-                        break;
-                    case 's':
-                        $options = $this->_createOptionList(0, 59, $this->_options['optionIncrement']['s']);
-                        break;
-                    case 'a':
-                        $options = array('am' => 'am', 'pm' => 'pm');
-                        break;
-                    case 'A':
-                        $options = array('AM' => 'AM', 'PM' => 'PM');
-                        break;
-                    case 'W':
-                        $options = $this->_createOptionList(1, 53);
-                        break;
-                    case '\\':
-                        $backslash  = true;
-                        $loadSelect = false;
-                        break;
-                    default:
-                        $separator .= (' ' == $sign? '&nbsp;': $sign);
-                        $loadSelect = false;
-                }
-    
-                if ($loadSelect) {
-                    if (0 < count($this->_elements)) {
-                        $this->_separator[] = $separator;
-                    } else {
-                        $this->_wrap[0] = $separator;
-                    }
-                    $separator = '';
-                    // Should we add an empty option to the top of the select?
-                    if (!is_array($this->_options['addEmptyOption']) && $this->_options['addEmptyOption'] || 
-                        is_array($this->_options['addEmptyOption']) && !empty($this->_options['addEmptyOption'][$sign])) {
-
-                        // Using '+' array operator to preserve the keys
-                        if (is_array($this->_options['emptyOptionText']) && !empty($this->_options['emptyOptionText'][$sign])) {
-                            $options = array($this->_options['emptyOptionValue'] => $this->_options['emptyOptionText'][$sign]) + $options;
-                        } else {
-                            $options = array($this->_options['emptyOptionValue'] => $this->_options['emptyOptionText']) + $options;
-                        }
-                    }
-                    $this->_elements[] =& new HTML_QuickForm_select($sign, null, $options, $this->getAttributes());
-                }
-            }
-        }
-        $this->_wrap[1] = $separator . ($backslash? '\\': '');
-    }
-
-    // }}}
-    // {{{ _createOptionList()
-
-   /**
-    * Creates an option list containing the numbers from the start number to the end, inclusive
-    *
-    * @param    int     The start number
-    * @param    int     The end number
-    * @param    int     Increment by this value
-    * @access   private
-    * @return   array   An array of numeric options.
-    */
-    function _createOptionList($start, $end, $step = 1)
-    {
-        for ($i = $start, $options = array(); $start > $end? $i >= $end: $i <= $end; $i += $step) {
-            $options[$i] = sprintf('%02d', $i);
-        }
-        return $options;
-    }
-
-    // }}}
-    // {{{ _trimLeadingZeros()
-
-   /**
-    * Trims leading zeros from the (numeric) string
-    *
-    * @param    string  A numeric string, possibly with leading zeros
-    * @return   string  String with leading zeros removed
-    */
-    function _trimLeadingZeros($str)
-    {
-        if (0 == strcmp($str, $this->_options['emptyOptionValue'])) {
-            return $str;
-        }
-        $trimmed = ltrim($str, '0');
-        return strlen($trimmed)? $trimmed: '0';
-    }
-
-    // }}}
-    // {{{ setValue()
-
-    function setValue($value)
-    {
-        if (empty($value)) {
-            $value = array();
-        } elseif (is_scalar($value)) {
-            if (!is_numeric($value)) {
-                $value = strtotime($value);
-            }
-            // might be a unix epoch, then we fill all possible values
-            $arr = explode('-', date('w-j-n-Y-g-G-i-s-a-A-W', (int)$value));
-            $value = array(
-                'D' => $arr[0],
-                'l' => $arr[0],
-                'd' => $arr[1],
-                'M' => $arr[2],
-                'm' => $arr[2],
-                'F' => $arr[2],
-                'Y' => $arr[3],
-                'y' => $arr[3],
-                'h' => $arr[4],
-                'g' => $arr[4],
-                'H' => $arr[5],
-                'i' => $this->_trimLeadingZeros($arr[6]),
-                's' => $this->_trimLeadingZeros($arr[7]),
-                'a' => $arr[8],
-                'A' => $arr[9],
-                'W' => $this->_trimLeadingZeros($arr[10])
-            );
-        } else {
-            $value = array_map(array($this, '_trimLeadingZeros'), $value);
-        }
-        parent::setValue($value);
-    }
-
-    // }}}
-    // {{{ toHtml()
-
-    function toHtml()
-    {
-        include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
-        $renderer->setElementTemplate('{element}');
-        parent::accept($renderer);
-        return $this->_wrap[0] . $renderer->toHtml() . $this->_wrap[1];
-    }
-
-    // }}}
-    // {{{ accept()
-
-    function accept(&$renderer, $required = false, $error = null)
-    {
-        $renderer->renderElement($this, $required, $error);
-    }
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        if ('updateValue' == $event) {
-            // we need to call setValue(), 'cause the default/constant value
-            // may be in fact a timestamp, not an array
-            return HTML_QuickForm_element::onQuickFormEvent($event, $arg, $caller);
-        } else {
-            return parent::onQuickFormEvent($event, $arg, $caller);
-        }
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/element.php b/airtime_mvc/library/pear/HTML/QuickForm/element.php
deleted file mode 100644
index 9309612cc..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/element.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Base class for form elements
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: element.php,v 1.37 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for all HTML classes
- */
-require_once 'HTML/Common.php';
-
-/**
- * Base class for form elements
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       1.0
- * @abstract
- */
-class HTML_QuickForm_element extends HTML_Common
-{
-    // {{{ properties
-
-    /**
-     * Label of the field
-     * @var       string
-     * @since     1.3
-     * @access    private
-     */
-    var $_label = '';
-
-    /**
-     * Form element type
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_type = '';
-
-    /**
-     * Flag to tell if element is frozen
-     * @var       boolean
-     * @since     1.0
-     * @access    private
-     */
-    var $_flagFrozen = false;
-
-    /**
-     * Does the element support persistant data when frozen
-     * @var       boolean
-     * @since     1.3
-     * @access    private
-     */
-    var $_persistantFreeze = false;
-    
-    // }}}
-    // {{{ constructor
-    
-    /**
-     * Class constructor
-     * 
-     * @param    string     Name of the element
-     * @param    mixed      Label(s) for the element
-     * @param    mixed      Associative array of tag attributes or HTML attributes name="value" pairs
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_element($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        HTML_Common::HTML_Common($attributes);
-        if (isset($elementName)) {
-            $this->setName($elementName);
-        }
-        if (isset($elementLabel)) {
-            $this->setLabel($elementLabel);
-        }
-    } //end constructor
-    
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Returns the current API version
-     *
-     * @since     1.0
-     * @access    public
-     * @return    float
-     */
-    function apiVersion()
-    {
-        return 3.2;
-    } // end func apiVersion
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Returns element type
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getType()
-    {
-        return $this->_type;
-    } // end func getType
-
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the input field name
-     * 
-     * @param     string    $name   Input field name attribute
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        // interface method
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        // interface method
-    } //end func getName
-    
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets the value of the form element
-     *
-     * @param     string    $value      Default value of the form element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        // interface
-    } // end func setValue
-
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the form element
-     *
-     * @since     1.0
-     * @access    public
-     * @return    mixed
-     */
-    function getValue()
-    {
-        // interface
-        return null;
-    } // end func getValue
-    
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        $this->_flagFrozen = true;
-    } //end func freeze
-
-    // }}}
-    // {{{ unfreeze()
-
-   /**
-    * Unfreezes the element so that it becomes editable
-    *
-    * @access public
-    * @return void
-    * @since  3.2.4
-    */
-    function unfreeze()
-    {
-        $this->_flagFrozen = false;
-    }
-
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        $value = $this->getValue();
-        return (strlen($value)? htmlspecialchars($value): '&nbsp;') .
-               $this->_getPersistantData();
-    } //end func getFrozenHtml
-    
-    // }}}
-    // {{{ _getPersistantData()
-
-   /**
-    * Used by getFrozenHtml() to pass the element's value if _persistantFreeze is on
-    * 
-    * @access private
-    * @return string
-    */
-    function _getPersistantData()
-    {
-        if (!$this->_persistantFreeze) {
-            return '';
-        } else {
-            $id = $this->getAttribute('id');
-            return '<input' . $this->_getAttrString(array(
-                       'type'  => 'hidden',
-                       'name'  => $this->getName(),
-                       'value' => $this->getValue()
-                   ) + (isset($id)? array('id' => $id): array())) . ' />';
-        }
-    }
-
-    // }}}
-    // {{{ isFrozen()
-
-    /**
-     * Returns whether or not the element is frozen
-     *
-     * @since     1.3
-     * @access    public
-     * @return    bool
-     */
-    function isFrozen()
-    {
-        return $this->_flagFrozen;
-    } // end func isFrozen
-
-    // }}}
-    // {{{ setPersistantFreeze()
-
-    /**
-     * Sets wether an element value should be kept in an hidden field
-     * when the element is frozen or not
-     * 
-     * @param     bool    $persistant   True if persistant value
-     * @since     2.0
-     * @access    public
-     * @return    void
-     */
-    function setPersistantFreeze($persistant=false)
-    {
-        $this->_persistantFreeze = $persistant;
-    } //end func setPersistantFreeze
-
-    // }}}
-    // {{{ setLabel()
-
-    /**
-     * Sets display text for the element
-     * 
-     * @param     string    $label  Display text for the element
-     * @since     1.3
-     * @access    public
-     * @return    void
-     */
-    function setLabel($label)
-    {
-        $this->_label = $label;
-    } //end func setLabel
-
-    // }}}
-    // {{{ getLabel()
-
-    /**
-     * Returns display text for the element
-     * 
-     * @since     1.3
-     * @access    public
-     * @return    string
-     */
-    function getLabel()
-    {
-        return $this->_label;
-    } //end func getLabel
-
-    // }}}
-    // {{{ _findValue()
-
-    /**
-     * Tries to find the element value from the values array
-     * 
-     * @since     2.7
-     * @access    private
-     * @return    mixed
-     */
-    function _findValue(&$values)
-    {
-        if (empty($values)) {
-            return null;
-        }
-        $elementName = $this->getName();
-        if (isset($values[$elementName])) {
-            return $values[$elementName];
-        } elseif (strpos($elementName, '[')) {
-            $myVar = "['" . str_replace(
-                         array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), 
-                         $elementName
-                     ) . "']";
-            return eval("return (isset(\$values$myVar)) ? \$values$myVar : null;");
-        } else {
-            return null;
-        }
-    } //end func _findValue
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'createElement':
-                $className = get_class($this);
-                $this->$className($arg[0], $arg[1], $arg[2], $arg[3], $arg[4]);
-                break;
-            case 'addElement':
-                $this->onQuickFormEvent('createElement', $arg, $caller);
-                $this->onQuickFormEvent('updateValue', null, $caller);
-                break;
-            case 'updateValue':
-                // constant values override both default and submitted ones
-                // default values are overriden by submitted
-                $value = $this->_findValue($caller->_constantValues);
-                if (null === $value) {
-                    $value = $this->_findValue($caller->_submitValues);
-                    if (null === $value) {
-                        $value = $this->_findValue($caller->_defaultValues);
-                    }
-                }
-                if (null !== $value) {
-                    $this->setValue($value);
-                }
-                break;
-            case 'setGroupValue':
-                $this->setValue($arg);
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @param bool                       Whether an element is required
-    * @param string                     An error message associated with an element
-    * @access public
-    * @return void 
-    */
-    function accept(&$renderer, $required=false, $error=null)
-    {
-        $renderer->renderElement($this, $required, $error);
-    } // end func accept
-
-    // }}}
-    // {{{ _generateId()
-
-   /**
-    * Automatically generates and assigns an 'id' attribute for the element.
-    * 
-    * Currently used to ensure that labels work on radio buttons and
-    * checkboxes. Per idea of Alexander Radivanovich.
-    *
-    * @access private
-    * @return void 
-    */
-    function _generateId()
-    {
-        static $idx = 1;
-
-        if (!$this->getAttribute('id')) {
-            $this->updateAttributes(array('id' => 'qf_' . substr(md5(microtime() . $idx++), 0, 6)));
-        }
-    } // end func _generateId
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * Returns a 'safe' element's value
-    *
-    * @param  array   array of submitted values to search
-    * @param  bool    whether to return the value as associative array
-    * @access public
-    * @return mixed
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $value = $this->_findValue($submitValues);
-        if (null === $value) {
-            $value = $this->getValue();
-        }
-        return $this->_prepareValue($value, $assoc);
-    }
-    
-    // }}}
-    // {{{ _prepareValue()
-
-   /**
-    * Used by exportValue() to prepare the value for returning
-    *
-    * @param  mixed   the value found in exportValue()
-    * @param  bool    whether to return the value as associative array
-    * @access private
-    * @return mixed
-    */
-    function _prepareValue($value, $assoc)
-    {
-        if (null === $value) {
-            return null;
-        } elseif (!$assoc) {
-            return $value;
-        } else {
-            $name = $this->getName();
-            if (!strpos($name, '[')) {
-                return array($name => $value);
-            } else {
-                $valueAry = array();
-                $myIndex  = "['" . str_replace(
-                                array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), 
-                                $name
-                            ) . "']";
-                eval("\$valueAry$myIndex = \$value;");
-                return $valueAry;
-            }
-        }
-    }
-    
-    // }}}
-} // end class HTML_QuickForm_element
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/file.php b/airtime_mvc/library/pear/HTML/QuickForm/file.php
deleted file mode 100644
index 4e4db1229..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/file.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a file upload field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: file.php,v 1.25 2009/04/04 21:34:02 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-// register file-related rules
-if (class_exists('HTML_QuickForm')) {
-    HTML_QuickForm::registerRule('uploadedfile', 'callback', '_ruleIsUploadedFile', 'HTML_QuickForm_file');
-    HTML_QuickForm::registerRule('maxfilesize', 'callback', '_ruleCheckMaxFileSize', 'HTML_QuickForm_file');
-    HTML_QuickForm::registerRule('mimetype', 'callback', '_ruleCheckMimeType', 'HTML_QuickForm_file');
-    HTML_QuickForm::registerRule('filename', 'callback', '_ruleCheckFileName', 'HTML_QuickForm_file');
-}
-
-/**
- * HTML class for a file upload field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_file extends HTML_QuickForm_input
-{
-    // {{{ properties
-
-   /**
-    * Uploaded file data, from $_FILES
-    * @var array
-    */
-    var $_value = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    Input field name attribute
-     * @param     string    Input field label
-     * @param     mixed     (optional)Either a typical HTML attribute string 
-     *                      or an associative array
-     * @since     1.0
-     * @access    public
-     */
-    function HTML_QuickForm_file($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
-        $this->setType('file');
-    } //end constructor
-    
-    // }}}
-    // {{{ setSize()
-
-    /**
-     * Sets size of file element
-     * 
-     * @param     int    Size of file element
-     * @since     1.0
-     * @access    public
-     */
-    function setSize($size)
-    {
-        $this->updateAttributes(array('size' => $size));
-    } //end func setSize
-    
-    // }}}
-    // {{{ getSize()
-
-    /**
-     * Returns size of file element
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    int
-     */
-    function getSize()
-    {
-        return $this->getAttribute('size');
-    } //end func getSize
-
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    bool
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets value for file element.
-     * 
-     * Actually this does nothing. The function is defined here to override
-     * HTML_Quickform_input's behaviour of setting the 'value' attribute. As
-     * no sane user-agent uses <input type="file">'s value for anything 
-     * (because of security implications) we implement file's value as a 
-     * read-only property with a special meaning.
-     * 
-     * @param     mixed    Value for file element
-     * @since     3.0
-     * @access    public
-     */
-    function setValue($value)
-    {
-        return null;
-    } //end func setValue
-    
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns information about the uploaded file
-     *
-     * @since     3.0
-     * @access    public
-     * @return    array
-     */
-    function getValue()
-    {
-        return $this->_value;
-    } // end func getValue
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    Name of event
-     * @param     mixed     event arguments
-     * @param     object    calling object
-     * @since     1.0
-     * @access    public
-     * @return    bool
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                if ($caller->getAttribute('method') == 'get') {
-                    return PEAR::raiseError('Cannot add a file upload field to a GET method form');
-                }
-                $this->_value = $this->_findValue();
-                $caller->updateAttributes(array('enctype' => 'multipart/form-data'));
-                $caller->setMaxFileSize();
-                break;
-            case 'addElement':
-                $this->onQuickFormEvent('createElement', $arg, $caller);
-                return $this->onQuickFormEvent('updateValue', null, $caller);
-                break;
-            case 'createElement':
-                $className = get_class($this);
-                $this->$className($arg[0], $arg[1], $arg[2]);
-                break;
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ moveUploadedFile()
-
-    /**
-     * Moves an uploaded file into the destination 
-     * 
-     * @param    string  Destination directory path
-     * @param    string  New file name
-     * @access   public
-     * @return   bool    Whether the file was moved successfully
-     */
-    function moveUploadedFile($dest, $fileName = '')
-    {
-        if ($dest != ''  && substr($dest, -1) != '/') {
-            $dest .= '/';
-        }
-        $fileName = ($fileName != '') ? $fileName : basename($this->_value['name']);
-        return move_uploaded_file($this->_value['tmp_name'], $dest . $fileName); 
-    } // end func moveUploadedFile
-    
-    // }}}
-    // {{{ isUploadedFile()
-
-    /**
-     * Checks if the element contains an uploaded file
-     *
-     * @access    public
-     * @return    bool      true if file has been uploaded, false otherwise
-     */
-    function isUploadedFile()
-    {
-        return $this->_ruleIsUploadedFile($this->_value);
-    } // end func isUploadedFile
-
-    // }}}
-    // {{{ _ruleIsUploadedFile()
-
-    /**
-     * Checks if the given element contains an uploaded file
-     *
-     * @param     array     Uploaded file info (from $_FILES)
-     * @access    private
-     * @return    bool      true if file has been uploaded, false otherwise
-     */
-    function _ruleIsUploadedFile($elementValue)
-    {
-        if ((isset($elementValue['error']) && $elementValue['error'] == 0) ||
-            (!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) {
-            return is_uploaded_file($elementValue['tmp_name']);
-        } else {
-            return false;
-        }
-    } // end func _ruleIsUploadedFile
-    
-    // }}}
-    // {{{ _ruleCheckMaxFileSize()
-
-    /**
-     * Checks that the file does not exceed the max file size
-     *
-     * @param     array     Uploaded file info (from $_FILES)
-     * @param     int       Max file size
-     * @access    private
-     * @return    bool      true if filesize is lower than maxsize, false otherwise
-     */
-    function _ruleCheckMaxFileSize($elementValue, $maxSize)
-    {
-        if (!empty($elementValue['error']) && 
-            (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])) {
-            return false;
-        }
-        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-            return true;
-        }
-        return ($maxSize >= @filesize($elementValue['tmp_name']));
-    } // end func _ruleCheckMaxFileSize
-
-    // }}}
-    // {{{ _ruleCheckMimeType()
-
-    /**
-     * Checks if the given element contains an uploaded file of the right mime type
-     *
-     * @param     array     Uploaded file info (from $_FILES)
-     * @param     mixed     Mime Type (can be an array of allowed types)
-     * @access    private
-     * @return    bool      true if mimetype is correct, false otherwise
-     */
-    function _ruleCheckMimeType($elementValue, $mimeType)
-    {
-        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-            return true;
-        }
-        if (is_array($mimeType)) {
-            return in_array($elementValue['type'], $mimeType);
-        }
-        return $elementValue['type'] == $mimeType;
-    } // end func _ruleCheckMimeType
-
-    // }}}
-    // {{{ _ruleCheckFileName()
-
-    /**
-     * Checks if the given element contains an uploaded file of the filename regex
-     *
-     * @param     array     Uploaded file info (from $_FILES)
-     * @param     string    Regular expression
-     * @access    private
-     * @return    bool      true if name matches regex, false otherwise
-     */
-    function _ruleCheckFileName($elementValue, $regex)
-    {
-        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-            return true;
-        }
-        return (bool)preg_match($regex, $elementValue['name']);
-    } // end func _ruleCheckFileName
-    
-    // }}}
-    // {{{ _findValue()
-
-   /**
-    * Tries to find the element value from the values array
-    * 
-    * Needs to be redefined here as $_FILES is populated differently from 
-    * other arrays when element name is of the form foo[bar]
-    * 
-    * @access    private
-    * @return    mixed
-    */
-    function _findValue()
-    {
-        if (empty($_FILES)) {
-            return null;
-        }
-        $elementName = $this->getName();
-        if (isset($_FILES[$elementName])) {
-            return $_FILES[$elementName];
-        } elseif (false !== ($pos = strpos($elementName, '['))) {
-            $base  = str_replace(
-                        array('\\', '\''), array('\\\\', '\\\''),
-                        substr($elementName, 0, $pos)
-                    ); 
-            $idx   = "['" . str_replace(
-                        array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"),
-                        substr($elementName, $pos + 1, -1)
-                     ) . "']";
-            $props = array('name', 'type', 'size', 'tmp_name', 'error');
-            $code  = "if (!isset(\$_FILES['{$base}']['name']{$idx})) {\n" .
-                     "    return null;\n" .
-                     "} else {\n" .
-                     "    \$value = array();\n";
-            foreach ($props as $prop) {
-                $code .= "    \$value['{$prop}'] = \$_FILES['{$base}']['{$prop}']{$idx};\n";
-            }
-            return eval($code . "    return \$value;\n}\n");
-        } else {
-            return null;
-        }
-    }
-
-    // }}}
-} // end class HTML_QuickForm_file
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/group.php b/airtime_mvc/library/pear/HTML/QuickForm/group.php
deleted file mode 100644
index c857c5db6..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/group.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a form element group
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: group.php,v 1.40 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * HTML class for a form element group
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_group extends HTML_QuickForm_element
-{
-    // {{{ properties
-        
-    /**
-     * Name of the element
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_name = '';
-
-    /**
-     * Array of grouped elements
-     * @var       array
-     * @since     1.0
-     * @access    private
-     */
-    var $_elements = array();
-
-    /**
-     * String to separate elements
-     * @var       mixed
-     * @since     2.5
-     * @access    private
-     */
-    var $_separator = null;
-
-    /**
-     * Required elements in this group
-     * @var       array
-     * @since     2.5
-     * @access    private
-     */
-    var $_required = array();
-
-   /**
-    * Whether to change elements' names to $groupName[$elementName] or leave them as is 
-    * @var      bool
-    * @since    3.0
-    * @access   private
-    */
-    var $_appendName = true;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Group name
-     * @param     array     $elementLabel   (optional)Group label
-     * @param     array     $elements       (optional)Group elements
-     * @param     mixed     $separator      (optional)Use a string for one separator,
-     *                                      use an array to alternate the separators.
-     * @param     bool      $appendName     (optional)whether to change elements' names to
-     *                                      the form $groupName[$elementName] or leave 
-     *                                      them as is.
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_group($elementName=null, $elementLabel=null, $elements=null, $separator=null, $appendName = true)
-    {
-        $this->HTML_QuickForm_element($elementName, $elementLabel);
-        $this->_type = 'group';
-        if (isset($elements) && is_array($elements)) {
-            $this->setElements($elements);
-        }
-        if (isset($separator)) {
-            $this->_separator = $separator;
-        }
-        if (isset($appendName)) {
-            $this->_appendName = $appendName;
-        }
-    } //end constructor
-    
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the group name
-     * 
-     * @param     string    $name   Group name
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        $this->_name = $name;
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the group name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        return $this->_name;
-    } //end func getName
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets values for group's elements
-     * 
-     * @param     mixed    Values for group's elements
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        $this->_createElementsIfNotExist();
-        foreach (array_keys($this->_elements) as $key) {
-            if (!$this->_appendName) {
-                $v = $this->_elements[$key]->_findValue($value);
-                if (null !== $v) {
-                    $this->_elements[$key]->onQuickFormEvent('setGroupValue', $v, $this);
-                }
-
-            } else {
-                $elementName = $this->_elements[$key]->getName();
-                $index       = strlen($elementName) ? $elementName : $key;
-                if (is_array($value)) {
-                    if (isset($value[$index])) {
-                        $this->_elements[$key]->onQuickFormEvent('setGroupValue', $value[$index], $this);
-                    }
-                } elseif (isset($value)) {
-                    $this->_elements[$key]->onQuickFormEvent('setGroupValue', $value, $this);
-                }
-            }
-        }
-    } //end func setValue
-    
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the group
-     *
-     * @since     1.0
-     * @access    public
-     * @return    mixed
-     */
-    function getValue()
-    {
-        $value = null;
-        foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
-            switch ($element->getType()) {
-                case 'radio': 
-                    $v = $element->getChecked()? $element->getValue(): null;
-                    break;
-                case 'checkbox': 
-                    $v = $element->getChecked()? true: null;
-                    break;
-                default:
-                    $v = $element->getValue();
-            }
-            if (null !== $v) {
-                $elementName = $element->getName();
-                if (is_null($elementName)) {
-                    $value = $v;
-                } else {
-                    if (!is_array($value)) {
-                        $value = is_null($value)? array(): array($value);
-                    }
-                    if ('' === $elementName) {
-                        $value[] = $v;
-                    } else {
-                        $value[$elementName] = $v;
-                    }
-                }
-            }
-        }
-        return $value;
-    } // end func getValue
-
-    // }}}
-    // {{{ setElements()
-
-    /**
-     * Sets the grouped elements
-     *
-     * @param     array     $elements   Array of elements
-     * @since     1.1
-     * @access    public
-     * @return    void
-     */
-    function setElements($elements)
-    {
-        $this->_elements = array_values($elements);
-        if ($this->_flagFrozen) {
-            $this->freeze();
-        }
-    } // end func setElements
-
-    // }}}
-    // {{{ getElements()
-
-    /**
-     * Gets the grouped elements
-     *
-     * @since     2.4
-     * @access    public
-     * @return    array
-     */
-    function &getElements()
-    {
-        $this->_createElementsIfNotExist();
-        return $this->_elements;
-    } // end func getElements
-
-    // }}}
-    // {{{ getGroupType()
-
-    /**
-     * Gets the group type based on its elements
-     * Will return 'mixed' if elements contained in the group
-     * are of different types.
-     *
-     * @access    public
-     * @return    string    group elements type
-     */
-    function getGroupType()
-    {
-        $this->_createElementsIfNotExist();
-        $prevType = '';
-        foreach (array_keys($this->_elements) as $key) {
-            $type = $this->_elements[$key]->getType();
-            if ($type != $prevType && $prevType != '') {
-                return 'mixed';
-            }
-            $prevType = $type;
-        }
-        return $type;
-    } // end func getGroupType
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns Html for the group
-     * 
-     * @since       1.0
-     * @access      public
-     * @return      string
-     */
-    function toHtml()
-    {
-        include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
-        $renderer->setElementTemplate('{element}');
-        $this->accept($renderer);
-        return $renderer->toHtml();
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getElementName()
-
-    /**
-     * Returns the element name inside the group such as found in the html form
-     * 
-     * @param     mixed     $index  Element name or element index in the group
-     * @since     3.0
-     * @access    public
-     * @return    mixed     string with element name, false if not found
-     */
-    function getElementName($index)
-    {
-        $this->_createElementsIfNotExist();
-        $elementName = false;
-        if (is_int($index) && isset($this->_elements[$index])) {
-            $elementName = $this->_elements[$index]->getName();
-            if (isset($elementName) && $elementName == '') {
-                $elementName = $index;
-            }
-            if ($this->_appendName) {
-                if (is_null($elementName)) {
-                    $elementName = $this->getName();
-                } else {
-                    $elementName = $this->getName().'['.$elementName.']';
-                }
-            }
-
-        } elseif (is_string($index)) {
-            foreach (array_keys($this->_elements) as $key) {
-                $elementName = $this->_elements[$key]->getName();
-                if ($index == $elementName) {
-                    if ($this->_appendName) {
-                        $elementName = $this->getName().'['.$elementName.']';
-                    }
-                    break;
-                } elseif ($this->_appendName && $this->getName().'['.$elementName.']' == $index) {
-                    break;
-                }
-            }
-        }
-        return $elementName;
-    } //end func getElementName
-
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @since     1.3
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        $flags = array();
-        $this->_createElementsIfNotExist();
-        foreach (array_keys($this->_elements) as $key) {
-            if (false === ($flags[$key] = $this->_elements[$key]->isFrozen())) {
-                $this->_elements[$key]->freeze();
-            }
-        }
-        $html = $this->toHtml();
-        foreach (array_keys($this->_elements) as $key) {
-            if (!$flags[$key]) {
-                $this->_elements[$key]->unfreeze();
-            }
-        }
-        return $html;
-    } //end func getFrozenHtml
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                $this->_createElementsIfNotExist();
-                foreach (array_keys($this->_elements) as $key) {
-                    if ($this->_appendName) {
-                        $elementName = $this->_elements[$key]->getName();
-                        if (is_null($elementName)) {
-                            $this->_elements[$key]->setName($this->getName());
-                        } elseif ('' === $elementName) {
-                            $this->_elements[$key]->setName($this->getName() . '[' . $key . ']');
-                        } else {
-                            $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']');
-                        }
-                    }
-                    $this->_elements[$key]->onQuickFormEvent('updateValue', $arg, $caller);
-                    if ($this->_appendName) {
-                        $this->_elements[$key]->setName($elementName);
-                    }
-                }
-                break;
-
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @param bool                       Whether a group is required
-    * @param string                     An error message associated with a group
-    * @access public
-    * @return void 
-    */
-    function accept(&$renderer, $required = false, $error = null)
-    {
-        $this->_createElementsIfNotExist();
-        $renderer->startGroup($this, $required, $error);
-        $name = $this->getName();
-        foreach (array_keys($this->_elements) as $key) {
-            $element =& $this->_elements[$key];
-            
-            if ($this->_appendName) {
-                $elementName = $element->getName();
-                if (isset($elementName)) {
-                    $element->setName($name . '['. (strlen($elementName)? $elementName: $key) .']');
-                } else {
-                    $element->setName($name);
-                }
-            }
-
-            $required = !$element->isFrozen() && in_array($element->getName(), $this->_required);
-
-            $element->accept($renderer, $required);
-
-            // restore the element's name
-            if ($this->_appendName) {
-                $element->setName($elementName);
-            }
-        }
-        $renderer->finishGroup($this);
-    } // end func accept
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * As usual, to get the group's value we access its elements and call
-    * their exportValue() methods
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $value = null;
-        foreach (array_keys($this->_elements) as $key) {
-            $elementName = $this->_elements[$key]->getName();
-            if ($this->_appendName) {
-                if (is_null($elementName)) {
-                    $this->_elements[$key]->setName($this->getName());
-                } elseif ('' === $elementName) {
-                    $this->_elements[$key]->setName($this->getName() . '[' . $key . ']');
-                } else {
-                    $this->_elements[$key]->setName($this->getName() . '[' . $elementName . ']');
-                }
-            }
-            $v = $this->_elements[$key]->exportValue($submitValues, $assoc);
-            if ($this->_appendName) {
-                $this->_elements[$key]->setName($elementName);
-            }
-            if (null !== $v) {
-                // Make $value an array, we will use it like one
-                if (null === $value) {
-                    $value = array();
-                }
-                if ($assoc) {
-                    // just like HTML_QuickForm::exportValues()
-                    $value = HTML_QuickForm::arrayMerge($value, $v);
-                } else {
-                    // just like getValue(), but should work OK every time here
-                    if (is_null($elementName)) {
-                        $value = $v;
-                    } elseif ('' === $elementName) {
-                        $value[] = $v;
-                    } else {
-                        $value[$elementName] = $v;
-                    }
-                }
-            }
-        }
-        // do not pass the value through _prepareValue, we took care of this already
-        return $value;
-    }
-
-    // }}}
-    // {{{ _createElements()
-
-   /**
-    * Creates the group's elements.
-    * 
-    * This should be overriden by child classes that need to create their 
-    * elements. The method will be called automatically when needed, calling
-    * it from the constructor is discouraged as the constructor is usually
-    * called _twice_ on element creation, first time with _no_ parameters.
-    * 
-    * @access private
-    * @abstract
-    */
-    function _createElements()
-    {
-        // abstract
-    }
-
-    // }}}
-    // {{{ _createElementsIfNotExist()
-
-   /**
-    * A wrapper around _createElements()
-    *
-    * This method calls _createElements() if the group's _elements array
-    * is empty. It also performs some updates, e.g. freezes the created
-    * elements if the group is already frozen.
-    *
-    * @access private
-    */
-    function _createElementsIfNotExist()
-    {
-        if (empty($this->_elements)) {
-            $this->_createElements();
-            if ($this->_flagFrozen) {
-                $this->freeze();
-            }
-        }
-    }
-
-    // }}}
-    // {{{ freeze()
-
-    function freeze()
-    {
-        parent::freeze();
-        foreach (array_keys($this->_elements) as $key) {
-            $this->_elements[$key]->freeze();
-        }
-    }
-
-    // }}}
-    // {{{ unfreeze()
-
-    function unfreeze()
-    {
-        parent::unfreeze();
-        foreach (array_keys($this->_elements) as $key) {
-            $this->_elements[$key]->unfreeze();
-        }
-    }
-
-    // }}}
-    // {{{ setPersistantFreeze()
-
-    function setPersistantFreeze($persistant = false)
-    {
-        parent::setPersistantFreeze($persistant);
-        foreach (array_keys($this->_elements) as $key) {
-            $this->_elements[$key]->setPersistantFreeze($persistant);
-        }
-    }
-
-    // }}}
-} //end class HTML_QuickForm_group
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/header.php b/airtime_mvc/library/pear/HTML/QuickForm/header.php
deleted file mode 100644
index 7a30ae259..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/header.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A pseudo-element used for adding headers to form
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: header.php,v 1.3 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for static data
- */ 
-require_once 'HTML/QuickForm/static.php';
-
-/**
- * A pseudo-element used for adding headers to form  
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.0
- */
-class HTML_QuickForm_header extends HTML_QuickForm_static
-{
-    // {{{ constructor
-
-   /**
-    * Class constructor
-    * 
-    * @param string $elementName    Header name
-    * @param string $text           Header text
-    * @access public
-    * @return void
-    */
-    function HTML_QuickForm_header($elementName = null, $text = null)
-    {
-        $this->HTML_QuickForm_static($elementName, null, $text);
-        $this->_type = 'header';
-    }
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @access public
-    * @return void 
-    */
-    function accept(&$renderer)
-    {
-        $renderer->renderHeader($this);
-    } // end func accept
-
-    // }}}
-
-} //end class HTML_QuickForm_header
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/hidden.php b/airtime_mvc/library/pear/HTML/QuickForm/hidden.php
deleted file mode 100644
index 8ff593856..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/hidden.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a hidden type element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: hidden.php,v 1.12 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a hidden type element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_hidden extends HTML_QuickForm_input
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $value          (optional)Input field value
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_hidden($elementName=null, $value='', $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
-        $this->setType('hidden');
-        $this->setValue($value);
-    } //end constructor
-        
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @access public
-    * @return void 
-    */
-    function accept(&$renderer)
-    {
-        $renderer->renderHidden($this);
-    } // end func accept
-
-    // }}}
-
-} //end class HTML_QuickForm_hidden
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/hiddenselect.php b/airtime_mvc/library/pear/HTML/QuickForm/hiddenselect.php
deleted file mode 100644
index ac415386f..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/hiddenselect.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Hidden select pseudo-element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Isaac Shepard <ishepard@bsiweb.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: hiddenselect.php,v 1.7 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Class for <select></select> elements
- */
-require_once 'HTML/QuickForm/select.php';
-
-/**
- * Hidden select pseudo-element
- *
- * This class takes the same arguments as a select element, but instead
- * of creating a select ring it creates hidden elements for all values
- * already selected with setDefault or setConstant.  This is useful if
- * you have a select ring that you don't want visible, but you need all
- * selected values to be passed.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Isaac Shepard <ishepard@bsiweb.com>
- * @version     Release: 3.2.11
- * @since       2.1
- */
-class HTML_QuickForm_hiddenselect extends HTML_QuickForm_select
-{
-    // {{{ constructor
-        
-    /**
-     * Class constructor
-     * 
-     * @param     string    Select name attribute
-     * @param     mixed     Label(s) for the select (not used)
-     * @param     mixed     Data to be used to populate options
-     * @param     mixed     Either a typical HTML attribute string or an associative array (not used)
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_hiddenselect($elementName=null, $elementLabel=null, $options=null, $attributes=null)
-    {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_type = 'hiddenselect';
-        if (isset($options)) {
-            $this->load($options);
-        }
-    } //end constructor
-    
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the SELECT in HTML
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function toHtml()
-    {
-        if (empty($this->_values)) {
-            return '';
-        }
-
-        $tabs    = $this->_getTabs();
-        $name    = $this->getPrivateName();
-        $strHtml = '';
-
-        foreach ($this->_values as $key => $val) {
-            for ($i = 0, $optCount = count($this->_options); $i < $optCount; $i++) {
-                if ($val == $this->_options[$i]['attr']['value']) {
-                    $strHtml .= $tabs . '<input' . $this->_getAttrString(array(
-                        'type'  => 'hidden',
-                        'name'  => $name,
-                        'value' => $val
-                    )) . " />\n" ;
-                }
-            }
-        }
-
-        return $strHtml;
-    } //end func toHtml
-    
-    // }}}
-    // {{{ accept()
-
-   /**
-    * This is essentially a hidden element and should be rendered as one  
-    */
-    function accept(&$renderer)
-    {
-        $renderer->renderHidden($this);
-    }
-
-    // }}}
-} //end class HTML_QuickForm_hiddenselect
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/hierselect.php b/airtime_mvc/library/pear/HTML/QuickForm/hierselect.php
deleted file mode 100644
index 856491cf5..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/hierselect.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Hierarchical select element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Herim Vasquez <vasquezh@iro.umontreal.ca>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: hierselect.php,v 1.20 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Class for a group of form elements
- */
-require_once 'HTML/QuickForm/group.php';
-/**
- * Class for <select></select> elements
- */
-require_once 'HTML/QuickForm/select.php';
-
-/**
- * Hierarchical select element
- * 
- * Class to dynamically create two or more HTML Select elements
- * The first select changes the content of the second select and so on.
- * This element is considered as a group. Selects will be named
- * groupName[0], groupName[1], groupName[2]...
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Herim Vasquez <vasquezh@iro.umontreal.ca>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.1
- */
-class HTML_QuickForm_hierselect extends HTML_QuickForm_group
-{   
-    // {{{ properties
-
-    /**
-     * Options for all the select elements
-     *
-     * @see       setOptions()
-     * @var       array
-     * @access    private
-     */
-    var $_options = array();
-    
-    /**
-     * Number of select elements on this group
-     *
-     * @var       int
-     * @access    private
-     */
-    var $_nbElements = 0;
-
-    /**
-     * The javascript used to set and change the options
-     *
-     * @var       string
-     * @access    private
-     */
-    var $_js = '';
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field label in form
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array. Date format is passed along the attributes.
-     * @param     mixed     $separator      (optional)Use a string for one separator,
-     *                                      use an array to alternate the separators.
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null)
-    {
-        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        if (isset($separator)) {
-            $this->_separator = $separator;
-        }
-        $this->_type = 'hierselect';
-        $this->_appendName = true;
-    } //end constructor
-
-    // }}}
-    // {{{ setOptions()
-
-    /**
-     * Initialize the array structure containing the options for each select element.
-     * Call the functions that actually do the magic.
-     *
-     * Format is a bit more complex than for a simple select as we need to know 
-     * which options are related to the ones in the previous select:
-     *
-     * Ex:
-     * <code>
-     * // first select
-     * $select1[0] = 'Pop';
-     * $select1[1] = 'Classical';
-     * $select1[2] = 'Funeral doom';
-     *
-     * // second select
-     * $select2[0][0] = 'Red Hot Chil Peppers';
-     * $select2[0][1] = 'The Pixies';
-     * $select2[1][0] = 'Wagner';
-     * $select2[1][1] = 'Strauss';
-     * $select2[2][0] = 'Pantheist';
-     * $select2[2][1] = 'Skepticism';
-     *
-     * // If only need two selects 
-     * //     - and using the deprecated functions
-     * $sel =& $form->addElement('hierselect', 'cds', 'Choose CD:');
-     * $sel->setMainOptions($select1);
-     * $sel->setSecOptions($select2);
-     *
-     * //     - and using the new setOptions function
-     * $sel =& $form->addElement('hierselect', 'cds', 'Choose CD:');
-     * $sel->setOptions(array($select1, $select2));
-     *
-     * // If you have a third select with prices for the cds
-     * $select3[0][0][0] = '15.00$';
-     * $select3[0][0][1] = '17.00$';
-     * // etc
-     *
-     * // You can now use
-     * $sel =& $form->addElement('hierselect', 'cds', 'Choose CD:');
-     * $sel->setOptions(array($select1, $select2, $select3));
-     * </code>
-     * 
-     * @param     array    $options    Array of options defining each element
-     * @access    public
-     * @return    void
-     */
-    function setOptions($options)
-    {
-        $this->_options = $options;
-
-        if (empty($this->_elements)) {
-            $this->_nbElements = count($this->_options);
-            $this->_createElements();
-        } else {
-            // setDefaults has probably been called before this function
-            // check if all elements have been created
-            $totalNbElements = count($this->_options);
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
-                $this->_nbElements++;
-            }
-        }
-        
-        $this->_setOptions();
-    } // end func setMainOptions
-
-    // }}}
-    // {{{ setMainOptions()
-    
-    /**
-     * Sets the options for the first select element. Deprecated. setOptions() should be used.
-     *
-     * @param     array     $array    Options for the first select element
-     *
-     * @access    public
-     * @deprecated          Deprecated since release 3.2.2
-     * @return    void
-     */
-    function setMainOptions($array)
-    {
-        $this->_options[0] = $array;
-
-        if (empty($this->_elements)) {
-            $this->_nbElements = 2;
-            $this->_createElements();
-        }
-    } // end func setMainOptions
-    
-    // }}}
-    // {{{ setSecOptions()
-    
-    /**
-     * Sets the options for the second select element. Deprecated. setOptions() should be used.
-     * The main _options array is initialized and the _setOptions function is called.
-     *
-     * @param     array     $array    Options for the second select element
-     *
-     * @access    public
-     * @deprecated          Deprecated since release 3.2.2
-     * @return    void
-     */
-    function setSecOptions($array)
-    {
-        $this->_options[1] = $array;
-
-        if (empty($this->_elements)) {
-            $this->_nbElements = 2;
-            $this->_createElements();
-        } else {
-            // setDefaults has probably been called before this function
-            // check if all elements have been created
-            $totalNbElements = 2;
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
-                $this->_nbElements++;
-            }
-        }
-        
-        $this->_setOptions();
-    } // end func setSecOptions
-    
-    // }}}
-    // {{{ _setOptions()
-    
-    /**
-     * Sets the options for each select element
-     *
-     * @access    private
-     * @return    void
-     */
-    function _setOptions()
-    {
-        $toLoad = '';
-        foreach (array_keys($this->_elements) AS $key) {
-            $array = eval("return isset(\$this->_options[{$key}]{$toLoad})? \$this->_options[{$key}]{$toLoad}: null;");
-            if (is_array($array)) {
-                $select =& $this->_elements[$key];
-                $select->_options = array();
-                $select->loadArray($array);
-
-                $value  = is_array($v = $select->getValue()) ? $v[0] : key($array);
-                $toLoad .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $value) . '\']';
-            }
-        }
-    } // end func _setOptions
-    
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets values for group's elements
-     * 
-     * @param     array     $value    An array of 2 or more values, for the first,
-     *                                the second, the third etc. select
-     *
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        // fix for bug #6766. Hope this doesn't break anything more 
-        // after bug #7961. Forgot that _nbElements was used in
-        // _createElements() called in several places... 
-        $this->_nbElements = max($this->_nbElements, count($value));
-        parent::setValue($value);
-        $this->_setOptions();
-    } // end func setValue
-    
-    // }}}
-    // {{{ _createElements()
-
-    /**
-     * Creates all the elements for the group
-     * 
-     * @access    private
-     * @return    void
-     */
-    function _createElements()
-    {
-        for ($i = 0; $i < $this->_nbElements; $i++) {
-            $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
-        }
-    } // end func _createElements
-
-    // }}}
-    // {{{ toHtml()
-
-    function toHtml()
-    {
-        $this->_js = '';
-        if (!$this->_flagFrozen) {
-            // set the onchange attribute for each element except last
-            $keys     = array_keys($this->_elements);
-            $onChange = array();
-            for ($i = 0; $i < count($keys) - 1; $i++) {
-                $select =& $this->_elements[$keys[$i]];
-                $onChange[$i] = $select->getAttribute('onchange');
-                $select->updateAttributes(
-                    array('onchange' => '_hs_swapOptions(this.form, \'' . $this->_escapeString($this->getName()) . '\', ' . $keys[$i] . ');' . $onChange[$i])
-                );
-            }
-            
-            // create the js function to call
-            if (!defined('HTML_QUICKFORM_HIERSELECT_EXISTS')) {
-                $this->_js .= <<<JAVASCRIPT
-function _hs_findOptions(ary, keys)
-{
-    if (ary == undefined) {
-        return {};
-    }
-    var key = keys.shift();
-    if (!key in ary) {
-        return {};
-    } else if (0 == keys.length) {
-        return ary[key];
-    } else {
-        return _hs_findOptions(ary[key], keys);
-    }
-}
-
-function _hs_findSelect(form, groupName, selectIndex)
-{
-    if (groupName+'['+ selectIndex +']' in form) {
-        return form[groupName+'['+ selectIndex +']']; 
-    } else {
-        return form[groupName+'['+ selectIndex +'][]']; 
-    }
-}
-
-function _hs_unescapeEntities(str)
-{
-    var div = document.createElement('div');
-    div.innerHTML = str;
-    return div.childNodes[0] ? div.childNodes[0].nodeValue : '';
-}
-
-function _hs_replaceOptions(ctl, optionList)
-{
-    var j = 0;
-    ctl.options.length = 0;
-    for (i in optionList) {
-        var optionText = (-1 == String(optionList[i]).indexOf('&'))? optionList[i]: _hs_unescapeEntities(optionList[i]);
-        ctl.options[j++] = new Option(optionText, i, false, false);
-    }
-}
-
-function _hs_setValue(ctl, value)
-{
-    var testValue = {};
-    if (value instanceof Array) {
-        for (var i = 0; i < value.length; i++) {
-            testValue[value[i]] = true;
-        }
-    } else {
-        testValue[value] = true;
-    }
-    for (var i = 0; i < ctl.options.length; i++) {
-        if (ctl.options[i].value in testValue) {
-            ctl.options[i].selected = true;
-        }
-    }
-}
-
-function _hs_swapOptions(form, groupName, selectIndex)
-{
-    var hsValue = [];
-    for (var i = 0; i <= selectIndex; i++) {
-        hsValue[i] = _hs_findSelect(form, groupName, i).value;
-    }
-
-    _hs_replaceOptions(_hs_findSelect(form, groupName, selectIndex + 1), 
-                       _hs_findOptions(_hs_options[groupName][selectIndex], hsValue));
-    if (selectIndex + 1 < _hs_options[groupName].length) {
-        _hs_swapOptions(form, groupName, selectIndex + 1);
-    }
-}
-
-function _hs_onReset(form, groupNames)
-{
-    for (var i = 0; i < groupNames.length; i++) {
-        try {
-            for (var j = 0; j <= _hs_options[groupNames[i]].length; j++) {
-                _hs_setValue(_hs_findSelect(form, groupNames[i], j), _hs_defaults[groupNames[i]][j]);
-                if (j < _hs_options[groupNames[i]].length) {
-                    _hs_replaceOptions(_hs_findSelect(form, groupNames[i], j + 1), 
-                                       _hs_findOptions(_hs_options[groupNames[i]][j], _hs_defaults[groupNames[i]].slice(0, j + 1)));
-                }
-            }
-        } catch (e) {
-            if (!(e instanceof TypeError)) {
-                throw e;
-            }
-        }
-    }
-}
-
-function _hs_setupOnReset(form, groupNames)
-{
-    setTimeout(function() { _hs_onReset(form, groupNames); }, 25);
-}
-
-function _hs_onReload()
-{
-    var ctl;
-    for (var i = 0; i < document.forms.length; i++) {
-        for (var j in _hs_defaults) {
-            if (ctl = _hs_findSelect(document.forms[i], j, 0)) {
-                for (var k = 0; k < _hs_defaults[j].length; k++) {
-                    _hs_setValue(_hs_findSelect(document.forms[i], j, k), _hs_defaults[j][k]);
-                }
-            }
-        }
-    }
-
-    if (_hs_prevOnload) {
-        _hs_prevOnload();
-    }
-}
-
-var _hs_prevOnload = null;
-if (window.onload) {
-    _hs_prevOnload = window.onload;
-}
-window.onload = _hs_onReload;
-
-var _hs_options = {};
-var _hs_defaults = {};
-
-JAVASCRIPT;
-                define('HTML_QUICKFORM_HIERSELECT_EXISTS', true);
-            }
-            // option lists
-            $jsParts = array();
-            for ($i = 1; $i < $this->_nbElements; $i++) {
-                $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]);
-            }
-            $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" .
-                          implode(",\n", $jsParts) .
-                          "\n];\n";
-            // default value; if we don't actually have any values yet just use
-            // the first option (for single selects) or empty array (for multiple)
-            $values = array();
-            foreach (array_keys($this->_elements) as $key) {
-                if (is_array($v = $this->_elements[$key]->getValue())) {
-                    $values[] = count($v) > 1? $v: $v[0];
-                } else {
-                    // XXX: accessing the supposedly private _options array
-                    $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0])?
-                                array():
-                                $this->_elements[$key]->_options[0]['attr']['value'];
-                }
-            }
-            $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " .
-                          $this->_convertArrayToJavascript($values, false) . ";\n";
-        }
-        include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
-        $renderer->setElementTemplate('{element}');
-        parent::accept($renderer);
-
-        if (!empty($onChange)) {
-            $keys     = array_keys($this->_elements);
-            for ($i = 0; $i < count($keys) - 1; $i++) {
-                $this->_elements[$keys[$i]]->updateAttributes(array('onchange' => $onChange[$i]));
-            }
-        }
-        return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") .
-               $renderer->toHtml();
-    } // end func toHtml
-
-    // }}}
-    // {{{ accept()
-
-    function accept(&$renderer, $required = false, $error = null)
-    {
-        $renderer->renderElement($this, $required, $error);
-    } // end func accept
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        if ('updateValue' == $event) {
-            // we need to call setValue() so that the secondary option
-            // matches the main option
-            return HTML_QuickForm_element::onQuickFormEvent($event, $arg, $caller);
-        } else {
-            $ret = parent::onQuickFormEvent($event, $arg, $caller);
-            // add onreset handler to form to properly reset hierselect (see bug #2970)
-            if ('addElement' == $event) {
-                $onReset = $caller->getAttribute('onreset');
-                if (strlen($onReset)) {
-                    if (strpos($onReset, '_hs_setupOnReset')) {
-                        $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "', ", $onReset)));
-                    } else {
-                        $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
-                    }
-                } else {
-                    $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
-                }
-            }
-            return $ret;
-        }
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ _convertArrayToJavascript()
-
-   /**
-    * Converts PHP array to its Javascript analog
-    *
-    * @access private
-    * @param  array     PHP array to convert
-    * @param  bool      Generate Javascript object literal (default, works like PHP's associative array) or array literal
-    * @return string    Javascript representation of the value
-    */
-    function _convertArrayToJavascript($array, $assoc = true)
-    {
-        if (!is_array($array)) {
-            return $this->_convertScalarToJavascript($array);
-        } else {
-            $items = array();
-            foreach ($array as $key => $val) {
-                $item = $assoc? "'" . $this->_escapeString($key) . "': ": '';
-                if (is_array($val)) {
-                    $item .= $this->_convertArrayToJavascript($val, $assoc);
-                } else {
-                    $item .= $this->_convertScalarToJavascript($val);
-                }
-                $items[] = $item;
-            }
-        }
-        $js = implode(', ', $items);
-        return $assoc? '{ ' . $js . ' }': '[' . $js . ']';
-    }
-    
-    // }}}
-    // {{{ _convertScalarToJavascript()
-
-   /**
-    * Converts PHP's scalar value to its Javascript analog
-    *
-    * @access private
-    * @param  mixed     PHP value to convert
-    * @return string    Javascript representation of the value
-    */
-    function _convertScalarToJavascript($val)
-    {
-        if (is_bool($val)) {
-            return $val ? 'true' : 'false';
-        } elseif (is_int($val) || is_double($val)) {
-            return $val;
-        } elseif (is_string($val)) {
-            return "'" . $this->_escapeString($val) . "'";
-        } elseif (is_null($val)) {
-            return 'null';
-        } else {
-            // don't bother
-            return '{}';
-        }
-    }
-
-    // }}}
-    // {{{ _escapeString()
-
-   /**
-    * Quotes the string so that it can be used in Javascript string constants   
-    *
-    * @access private
-    * @param  string
-    * @return string
-    */
-    function _escapeString($str)
-    {
-        return strtr($str,array(
-            "\r"    => '\r',
-            "\n"    => '\n',
-            "\t"    => '\t',
-            "'"     => "\\'",
-            '"'     => '\"',
-            '\\'    => '\\\\'
-        ));
-    }
-
-    // }}}
-} // end class HTML_QuickForm_hierselect
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/html.php b/airtime_mvc/library/pear/HTML/QuickForm/html.php
deleted file mode 100644
index 60c9ec166..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/html.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * A pseudo-element used for adding raw HTML to form
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: html.php,v 1.3 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for static data
- */
-require_once 'HTML/QuickForm/static.php';
-
-/**
- * A pseudo-element used for adding raw HTML to form
- * 
- * Intended for use with the default renderer only, template-based
- * ones may (and probably will) completely ignore this
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.0
- * @deprecated  Please use the templates rather than add raw HTML via this element
- */
-class HTML_QuickForm_html extends HTML_QuickForm_static
-{
-    // {{{ constructor
-
-   /**
-    * Class constructor
-    * 
-    * @param string $text   raw HTML to add
-    * @access public
-    * @return void
-    */
-    function HTML_QuickForm_html($text = null)
-    {
-        $this->HTML_QuickForm_static(null, null, $text);
-        $this->_type = 'html';
-    }
-
-    // }}}
-    // {{{ accept()
-
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object (only works with Default renderer!)
-    * @access public
-    * @return void 
-    */
-    function accept(&$renderer)
-    {
-        $renderer->renderHtml($this);
-    } // end func accept
-
-    // }}}
-
-} //end class HTML_QuickForm_html
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/image.php b/airtime_mvc/library/pear/HTML/QuickForm/image.php
deleted file mode 100644
index 429442445..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/image.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for an <input type="image" /> element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: image.php,v 1.6 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for an <input type="image" /> element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_image extends HTML_QuickForm_input
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Element name attribute
-     * @param     string    $src            (optional)Image source
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_image($elementName=null, $src='', $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
-        $this->setType('image');
-        $this->setSource($src);
-    } // end class constructor
-
-    // }}}
-    // {{{ setSource()
-
-    /**
-     * Sets source for image element
-     * 
-     * @param     string    $src  source for image element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setSource($src)
-    {
-        $this->updateAttributes(array('src' => $src));
-    } // end func setSource
-
-    // }}}
-    // {{{ setBorder()
-
-    /**
-     * Sets border size for image element
-     * 
-     * @param     string    $border  border for image element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setBorder($border)
-    {
-        $this->updateAttributes(array('border' => $border));
-    } // end func setBorder
-
-    // }}}
-    // {{{ setAlign()
-
-    /**
-     * Sets alignment for image element
-     * 
-     * @param     string    $align  alignment for image element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setAlign($align)
-    {
-        $this->updateAttributes(array('align' => $align));
-    } // end func setAlign
-
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
-
-} // end class HTML_QuickForm_image
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/input.php b/airtime_mvc/library/pear/HTML/QuickForm/input.php
deleted file mode 100644
index 473d8cb2b..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/input.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Base class for <input /> form elements
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: input.php,v 1.10 2009/04/04 21:34:03 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * Base class for <input /> form elements
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- * @abstract
- */
-class HTML_QuickForm_input extends HTML_QuickForm_element
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param    string     Input field name attribute
-     * @param    mixed      Label(s) for the input field
-     * @param    mixed      Either a typical HTML attribute string or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_input($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-    } //end constructor
-
-    // }}}
-    // {{{ setType()
-
-    /**
-     * Sets the element type
-     *
-     * @param     string    $type   Element type
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setType($type)
-    {
-        $this->_type = $type;
-        $this->updateAttributes(array('type'=>$type));
-    } // end func setType
-    
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the input field name
-     * 
-     * @param     string    $name   Input field name attribute
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        $this->updateAttributes(array('name'=>$name));
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        return $this->getAttribute('name');
-    } //end func getName
-    
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets the value of the form element
-     *
-     * @param     string    $value      Default value of the form element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        $this->updateAttributes(array('value'=>$value));
-    } // end func setValue
-
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the form element
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getValue()
-    {
-        return $this->getAttribute('value');
-    } // end func getValue
-    
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the input field in HTML
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if ($this->_flagFrozen) {
-            return $this->getFrozenHtml();
-        } else {
-            return $this->_getTabs() . '<input' . $this->_getAttrString($this->_attributes) . ' />';
-        }
-    } //end func toHtml
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        // do not use submit values for button-type elements
-        $type = $this->getType();
-        if (('updateValue' != $event) ||
-            ('submit' != $type && 'reset' != $type && 'image' != $type && 'button' != $type)) {
-            parent::onQuickFormEvent($event, $arg, $caller);
-        } else {
-            $value = $this->_findValue($caller->_constantValues);
-            if (null === $value) {
-                $value = $this->_findValue($caller->_defaultValues);
-            }
-            if (null !== $value) {
-                $this->setValue($value);
-            }
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * We don't need values from button-type elements (except submit) and files
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $type = $this->getType();
-        if ('reset' == $type || 'image' == $type || 'button' == $type || 'file' == $type) {
-            return null;
-        } else {
-            return parent::exportValue($submitValues, $assoc);
-        }
-    }
-    
-    // }}}
-} // end class HTML_QuickForm_element
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/link.php b/airtime_mvc/library/pear/HTML/QuickForm/link.php
deleted file mode 100644
index 0b7ace40c..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/link.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a link type field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: link.php,v 1.4 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for static data
- */ 
-require_once 'HTML/QuickForm/static.php';
-
-/**
- * HTML class for a link type field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       2.0
- */
-class HTML_QuickForm_link extends HTML_QuickForm_static
-{
-    // {{{ properties
-
-    /**
-     * Link display text
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_text = "";
-
-    // }}}
-    // {{{ constructor
-    
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementLabel   (optional)Link label
-     * @param     string    $href           (optional)Link href
-     * @param     string    $text           (optional)Link display text
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function HTML_QuickForm_link($elementName=null, $elementLabel=null, $href=null, $text=null, $attributes=null)
-    {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = false;
-        $this->_type = 'link';
-        $this->setHref($href);
-        $this->_text = $text;
-    } //end constructor
-    
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the input field name
-     * 
-     * @param     string    $name   Input field name attribute
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function setName($name)
-    {
-        $this->updateAttributes(array('name'=>$name));
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function getName()
-    {
-        return $this->getAttribute('name');
-    } //end func getName
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets value for textarea element
-     * 
-     * @param     string    $value  Value for password element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function setValue($value)
-    {
-        return;
-    } //end func setValue
-    
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the form element
-     *
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function getValue()
-    {
-        return;
-    } // end func getValue
-
-    
-    // }}}
-    // {{{ setHref()
-
-    /**
-     * Sets the links href
-     *
-     * @param     string    $href
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function setHref($href)
-    {
-        $this->updateAttributes(array('href'=>$href));
-    } // end func setHref
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the textarea element in HTML
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function toHtml()
-    {
-        $tabs = $this->_getTabs();
-        $html = "$tabs<a".$this->_getAttrString($this->_attributes).">";
-        $html .= $this->_text;
-        $html .= "</a>";
-        return $html;
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags (in this case, value is changed to a mask)
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function getFrozenHtml()
-    {
-        return;
-    } //end func getFrozenHtml
-
-    // }}}
-
-} //end class HTML_QuickForm_textarea
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/password.php b/airtime_mvc/library/pear/HTML/QuickForm/password.php
deleted file mode 100644
index 5e0197819..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/password.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a password type field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: password.php,v 1.8 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a password type field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_password extends HTML_QuickForm_input
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field label
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function HTML_QuickForm_password($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
-        $this->setType('password');
-    } //end constructor
-    
-    // }}}
-    // {{{ setSize()
-
-    /**
-     * Sets size of password element
-     * 
-     * @param     string    $size  Size of password field
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setSize($size)
-    {
-        $this->updateAttributes(array('size'=>$size));
-    } //end func setSize
-
-    // }}}
-    // {{{ setMaxlength()
-
-    /**
-     * Sets maxlength of password element
-     * 
-     * @param     string    $maxlength  Maximum length of password field
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setMaxlength($maxlength)
-    {
-        $this->updateAttributes(array('maxlength'=>$maxlength));
-    } //end func setMaxlength
-        
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags (in this case, value is changed to a mask)
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function getFrozenHtml()
-    {
-        $value = $this->getValue();
-        return ('' != $value? '**********': '&nbsp;') .
-               $this->_getPersistantData();
-    } //end func getFrozenHtml
-
-    // }}}
-
-} //end class HTML_QuickForm_password
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/radio.php b/airtime_mvc/library/pear/HTML/QuickForm/radio.php
deleted file mode 100644
index c244871fd..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/radio.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a radio type element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: radio.php,v 1.20 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a radio type element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_radio extends HTML_QuickForm_input
-{
-    // {{{ properties
-
-    /**
-     * Radio display text
-     * @var       string
-     * @since     1.1
-     * @access    private
-     */
-    var $_text = '';
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    Input field name attribute
-     * @param     mixed     Label(s) for a field
-     * @param     string    Text to display near the radio
-     * @param     string    Input field value
-     * @param     mixed     Either a typical HTML attribute string or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_radio($elementName=null, $elementLabel=null, $text=null, $value=null, $attributes=null)
-    {
-        $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        $this->_persistantFreeze = true;
-        $this->setType('radio');
-        $this->_text = $text;
-        $this->_generateId();
-    } //end constructor
-    
-    // }}}
-    // {{{ setChecked()
-
-    /**
-     * Sets whether radio button is checked
-     * 
-     * @param     bool    $checked  Whether the field is checked or not
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setChecked($checked)
-    {
-        if (!$checked) {
-            $this->removeAttribute('checked');
-        } else {
-            $this->updateAttributes(array('checked'=>'checked'));
-        }
-    } //end func setChecked
-
-    // }}}
-    // {{{ getChecked()
-
-    /**
-     * Returns whether radio button is checked
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getChecked()
-    {
-        return $this->getAttribute('checked');
-    } //end func getChecked
-        
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the radio element in HTML
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if (0 == strlen($this->_text)) {
-            $label = '';
-        } elseif ($this->_flagFrozen) {
-            $label = $this->_text;
-        } else {
-            $label = '<label for="' . $this->getAttribute('id') . '">' . $this->_text . '</label>';
-        }
-        return HTML_QuickForm_input::toHtml() . $label;
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        if ($this->getChecked()) {
-            return '<tt>(x)</tt>' .
-                   $this->_getPersistantData();
-        } else {
-            return '<tt>( )</tt>';
-        }
-    } //end func getFrozenHtml
-
-    // }}}
-    // {{{ setText()
-
-    /**
-     * Sets the radio text
-     * 
-     * @param     string    $text  Text to display near the radio button
-     * @since     1.1
-     * @access    public
-     * @return    void
-     */
-    function setText($text)
-    {
-        $this->_text = $text;
-    } //end func setText
-
-    // }}}
-    // {{{ getText()
-
-    /**
-     * Returns the radio text 
-     * 
-     * @since     1.1
-     * @access    public
-     * @return    string
-     */
-    function getText()
-    {
-        return $this->_text;
-    } //end func getText
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                // constant values override both default and submitted ones
-                // default values are overriden by submitted
-                $value = $this->_findValue($caller->_constantValues);
-                if (null === $value) {
-                    $value = $this->_findValue($caller->_submitValues);
-                    if (null === $value) {
-                        $value = $this->_findValue($caller->_defaultValues);
-                    }
-                }
-                if (!is_null($value) && $value == $this->getValue()) {
-                    $this->setChecked(true);
-                } else {
-                    $this->setChecked(false);
-                }
-                break;
-            case 'setGroupValue':
-                if ($arg == $this->getValue()) {
-                    $this->setChecked(true);
-                } else {
-                    $this->setChecked(false);
-                }
-                break;
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
-        }
-        return true;
-    } // end func onQuickFormLoad
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * Returns the value attribute if the radio is checked, null if it is not
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $value = $this->_findValue($submitValues);
-        if (null === $value) {
-            $value = $this->getChecked()? $this->getValue(): null;
-        } elseif ($value != $this->getValue()) {
-            $value = null;
-        }
-        return $this->_prepareValue($value, $assoc);
-    }
-    
-    // }}}
-} //end class HTML_QuickForm_radio
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/reset.php b/airtime_mvc/library/pear/HTML/QuickForm/reset.php
deleted file mode 100644
index d784d159a..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/reset.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a reset type element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: reset.php,v 1.6 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a reset type element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_reset extends HTML_QuickForm_input
-{
-    // {{{ constructor
-    
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $value          (optional)Input field value
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_reset($elementName=null, $value=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
-        $this->setValue($value);
-        $this->setType('reset');
-    } //end constructor
-
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
-
-} //end class HTML_QuickForm_reset
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/select.php b/airtime_mvc/library/pear/HTML/QuickForm/select.php
deleted file mode 100644
index 60a577857..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/select.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Class to dynamically create an HTML SELECT
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: select.php,v 1.34 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * Class to dynamically create an HTML SELECT
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_select extends HTML_QuickForm_element {
-    
-    // {{{ properties
-
-    /**
-     * Contains the select options
-     *
-     * @var       array
-     * @since     1.0
-     * @access    private
-     */
-    var $_options = array();
-    
-    /**
-     * Default values of the SELECT
-     * 
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_values = null;
-
-    // }}}
-    // {{{ constructor
-        
-    /**
-     * Class constructor
-     * 
-     * @param     string    Select name attribute
-     * @param     mixed     Label(s) for the select
-     * @param     mixed     Data to be used to populate options
-     * @param     mixed     Either a typical HTML attribute string or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_select($elementName=null, $elementLabel=null, $options=null, $attributes=null)
-    {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_type = 'select';
-        if (isset($options)) {
-            $this->load($options);
-        }
-    } //end constructor
-    
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Returns the current API version 
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    double
-     */
-    function apiVersion()
-    {
-        return 2.3;
-    } //end func apiVersion
-
-    // }}}
-    // {{{ setSelected()
-
-    /**
-     * Sets the default values of the select box
-     * 
-     * @param     mixed    $values  Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setSelected($values)
-    {
-        if (is_string($values) && $this->getMultiple()) {
-            $values = split("[ ]?,[ ]?", $values);
-        }
-        if (is_array($values)) {
-            $this->_values = array_values($values);
-        } else {
-            $this->_values = array($values);
-        }
-    } //end func setSelected
-    
-    // }}}
-    // {{{ getSelected()
-
-    /**
-     * Returns an array of the selected values
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    array of selected values
-     */
-    function getSelected()
-    {
-        return $this->_values;
-    } // end func getSelected
-
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the input field name
-     * 
-     * @param     string    $name   Input field name attribute
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        $this->updateAttributes(array('name' => $name));
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        return $this->getAttribute('name');
-    } //end func getName
-
-    // }}}
-    // {{{ getPrivateName()
-
-    /**
-     * Returns the element name (possibly with brackets appended)
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getPrivateName()
-    {
-        if ($this->getAttribute('multiple')) {
-            return $this->getName() . '[]';
-        } else {
-            return $this->getName();
-        }
-    } //end func getPrivateName
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets the value of the form element
-     *
-     * @param     mixed    $values  Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        $this->setSelected($value);
-    } // end func setValue
-
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns an array of the selected values
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    array of selected values
-     */
-    function getValue()
-    {
-        return $this->_values;
-    } // end func getValue
-
-    // }}}
-    // {{{ setSize()
-
-    /**
-     * Sets the select field size, only applies to 'multiple' selects
-     * 
-     * @param     int    $size  Size of select  field
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setSize($size)
-    {
-        $this->updateAttributes(array('size' => $size));
-    } //end func setSize
-    
-    // }}}
-    // {{{ getSize()
-
-    /**
-     * Returns the select field size
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    int
-     */
-    function getSize()
-    {
-        return $this->getAttribute('size');
-    } //end func getSize
-
-    // }}}
-    // {{{ setMultiple()
-
-    /**
-     * Sets the select mutiple attribute
-     * 
-     * @param     bool    $multiple  Whether the select supports multi-selections
-     * @since     1.2
-     * @access    public
-     * @return    void
-     */
-    function setMultiple($multiple)
-    {
-        if ($multiple) {
-            $this->updateAttributes(array('multiple' => 'multiple'));
-        } else {
-            $this->removeAttribute('multiple');
-        }
-    } //end func setMultiple
-    
-    // }}}
-    // {{{ getMultiple()
-
-    /**
-     * Returns the select mutiple attribute
-     * 
-     * @since     1.2
-     * @access    public
-     * @return    bool    true if multiple select, false otherwise
-     */
-    function getMultiple()
-    {
-        return (bool)$this->getAttribute('multiple');
-    } //end func getMultiple
-
-    // }}}
-    // {{{ addOption()
-
-    /**
-     * Adds a new OPTION to the SELECT
-     *
-     * @param     string    $text       Display text for the OPTION
-     * @param     string    $value      Value for the OPTION
-     * @param     mixed     $attributes Either a typical HTML attribute string 
-     *                                  or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function addOption($text, $value, $attributes=null)
-    {
-        if (null === $attributes) {
-            $attributes = array('value' => (string)$value);
-        } else {
-            $attributes = $this->_parseAttributes($attributes);
-            if (isset($attributes['selected'])) {
-                // the 'selected' attribute will be set in toHtml()
-                $this->_removeAttr('selected', $attributes);
-                if (is_null($this->_values)) {
-                    $this->_values = array($value);
-                } elseif (!in_array($value, $this->_values)) {
-                    $this->_values[] = $value;
-                }
-            }
-            $this->_updateAttrArray($attributes, array('value' => (string)$value));
-        }
-        $this->_options[] = array('text' => $text, 'attr' => $attributes);
-    } // end func addOption
-    
-    // }}}
-    // {{{ loadArray()
-
-    /**
-     * Loads the options from an associative array
-     * 
-     * @param     array    $arr     Associative array of options
-     * @param     mixed    $values  (optional) Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function loadArray($arr, $values=null)
-    {
-        if (!is_array($arr)) {
-            return PEAR::raiseError('Argument 1 of HTML_Select::loadArray is not a valid array');
-        }
-        if (isset($values)) {
-            $this->setSelected($values);
-        }
-        foreach ($arr as $key => $val) {
-            // Warning: new API since release 2.3
-            $this->addOption($val, $key);
-        }
-        return true;
-    } // end func loadArray
-
-    // }}}
-    // {{{ loadDbResult()
-
-    /**
-     * Loads the options from DB_result object
-     * 
-     * If no column names are specified the first two columns of the result are
-     * used as the text and value columns respectively
-     * @param     object    $result     DB_result object 
-     * @param     string    $textCol    (optional) Name of column to display as the OPTION text 
-     * @param     string    $valueCol   (optional) Name of column to use as the OPTION value 
-     * @param     mixed     $values     (optional) Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function loadDbResult(&$result, $textCol=null, $valueCol=null, $values=null)
-    {
-        if (!is_object($result) || !is_a($result, 'db_result')) {
-            return PEAR::raiseError('Argument 1 of HTML_Select::loadDbResult is not a valid DB_result');
-        }
-        if (isset($values)) {
-            $this->setValue($values);
-        }
-        $fetchMode = ($textCol && $valueCol) ? DB_FETCHMODE_ASSOC : DB_FETCHMODE_ORDERED;
-        while (is_array($row = $result->fetchRow($fetchMode)) ) {
-            if ($fetchMode == DB_FETCHMODE_ASSOC) {
-                $this->addOption($row[$textCol], $row[$valueCol]);
-            } else {
-                $this->addOption($row[0], $row[1]);
-            }
-        }
-        return true;
-    } // end func loadDbResult
-    
-    // }}}
-    // {{{ loadQuery()
-
-    /**
-     * Queries a database and loads the options from the results
-     *
-     * @param     mixed     $conn       Either an existing DB connection or a valid dsn 
-     * @param     string    $sql        SQL query string
-     * @param     string    $textCol    (optional) Name of column to display as the OPTION text 
-     * @param     string    $valueCol   (optional) Name of column to use as the OPTION value 
-     * @param     mixed     $values     (optional) Array or comma delimited string of selected values
-     * @since     1.1
-     * @access    public
-     * @return    void
-     * @throws    PEAR_Error
-     */
-    function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null)
-    {
-        if (is_string($conn)) {
-            require_once('DB.php');
-            $dbConn = &DB::connect($conn, true);
-            if (DB::isError($dbConn)) {
-                return $dbConn;
-            }
-        } elseif (is_subclass_of($conn, "db_common")) {
-            $dbConn = &$conn;
-        } else {
-            return PEAR::raiseError('Argument 1 of HTML_Select::loadQuery is not a valid type');
-        }
-        $result = $dbConn->query($sql);
-        if (DB::isError($result)) {
-            return $result;
-        }
-        $this->loadDbResult($result, $textCol, $valueCol, $values);
-        $result->free();
-        if (is_string($conn)) {
-            $dbConn->disconnect();
-        }
-        return true;
-    } // end func loadQuery
-
-    // }}}
-    // {{{ load()
-
-    /**
-     * Loads options from different types of data sources
-     *
-     * This method is a simulated overloaded method.  The arguments, other than the
-     * first are optional and only mean something depending on the type of the first argument.
-     * If the first argument is an array then all arguments are passed in order to loadArray.
-     * If the first argument is a db_result then all arguments are passed in order to loadDbResult.
-     * If the first argument is a string or a DB connection then all arguments are 
-     * passed in order to loadQuery.
-     * @param     mixed     $options     Options source currently supports assoc array or DB_result
-     * @param     mixed     $param1     (optional) See function detail
-     * @param     mixed     $param2     (optional) See function detail
-     * @param     mixed     $param3     (optional) See function detail
-     * @param     mixed     $param4     (optional) See function detail
-     * @since     1.1
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null)
-    {
-        switch (true) {
-            case is_array($options):
-                return $this->loadArray($options, $param1);
-                break;
-            case (is_a($options, 'db_result')):
-                return $this->loadDbResult($options, $param1, $param2, $param3);
-                break;
-            case (is_string($options) && !empty($options) || is_subclass_of($options, "db_common")):
-                return $this->loadQuery($options, $param1, $param2, $param3, $param4);
-                break;
-        }
-    } // end func load
-    
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the SELECT in HTML
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if ($this->_flagFrozen) {
-            return $this->getFrozenHtml();
-        } else {
-            $tabs    = $this->_getTabs();
-            $strHtml = '';
-
-            if ($this->getComment() != '') {
-                $strHtml .= $tabs . '<!-- ' . $this->getComment() . " //-->\n";
-            }
-
-            if (!$this->getMultiple()) {
-                $attrString = $this->_getAttrString($this->_attributes);
-            } else {
-                $myName = $this->getName();
-                $this->setName($myName . '[]');
-                $attrString = $this->_getAttrString($this->_attributes);
-                $this->setName($myName);
-            }
-            $strHtml .= $tabs . '<select' . $attrString . ">\n";
-
-            $strValues = is_array($this->_values)? array_map('strval', $this->_values): array();
-            foreach ($this->_options as $option) {
-                if (!empty($strValues) && in_array($option['attr']['value'], $strValues, true)) {
-                    $option['attr']['selected'] = 'selected';
-                }
-                $strHtml .= $tabs . "\t<option" . $this->_getAttrString($option['attr']) . '>' .
-                            $option['text'] . "</option>\n";
-            }
-
-            return $strHtml . $tabs . '</select>';
-        }
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        $value = array();
-        if (is_array($this->_values)) {
-            foreach ($this->_values as $key => $val) {
-                for ($i = 0, $optCount = count($this->_options); $i < $optCount; $i++) {
-                    if (0 == strcmp($val, $this->_options[$i]['attr']['value'])) {
-                        $value[$key] = $this->_options[$i]['text'];
-                        break;
-                    }
-                }
-            }
-        }
-        $html = empty($value)? '&nbsp;': join('<br />', $value);
-        if ($this->_persistantFreeze) {
-            $name = $this->getPrivateName();
-            // Only use id attribute if doing single hidden input
-            if (1 == count($value)) {
-                $id     = $this->getAttribute('id');
-                $idAttr = isset($id)? array('id' => $id): array();
-            } else {
-                $idAttr = array();
-            }
-            foreach ($value as $key => $item) {
-                $html .= '<input' . $this->_getAttrString(array(
-                             'type'  => 'hidden',
-                             'name'  => $name,
-                             'value' => $this->_values[$key]
-                         ) + $idAttr) . ' />';
-            }
-        }
-        return $html;
-    } //end func getFrozenHtml
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * We check the options and return only the values that _could_ have been
-    * selected. We also return a scalar value if select is not "multiple"
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        $value = $this->_findValue($submitValues);
-        if (is_null($value)) {
-            $value = $this->getValue();
-        } elseif(!is_array($value)) {
-            $value = array($value);
-        }
-        if (is_array($value) && !empty($this->_options)) {
-            $cleanValue = null;
-            foreach ($value as $v) {
-                for ($i = 0, $optCount = count($this->_options); $i < $optCount; $i++) {
-                    if (0 == strcmp($v, $this->_options[$i]['attr']['value'])) {
-                        $cleanValue[] = $v;
-                        break;
-                    }
-                }
-            }
-        } else {
-            $cleanValue = $value;
-        }
-        if (is_array($cleanValue) && !$this->getMultiple()) {
-            return $this->_prepareValue($cleanValue[0], $assoc);
-        } else {
-            return $this->_prepareValue($cleanValue, $assoc);
-        }
-    }
-    
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        if ('updateValue' == $event) {
-            $value = $this->_findValue($caller->_constantValues);
-            if (null === $value) {
-                $value = $this->_findValue($caller->_submitValues);
-                // Fix for bug #4465 & #5269
-                // XXX: should we push this to element::onQuickFormEvent()?
-                if (null === $value && (!$caller->isSubmitted() || !$this->getMultiple())) {
-                    $value = $this->_findValue($caller->_defaultValues);
-                }
-            }
-            if (null !== $value) {
-                $this->setValue($value);
-            }
-            return true;
-        } else {
-            return parent::onQuickFormEvent($event, $arg, $caller);
-        }
-    }
-
-    // }}}
-} //end class HTML_QuickForm_select
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/static.php b/airtime_mvc/library/pear/HTML/QuickForm/static.php
deleted file mode 100644
index 096b61204..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/static.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for static data
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Wojciech Gdela <eltehaem@poczta.onet.pl>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: static.php,v 1.8 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * HTML class for static data
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Wojciech Gdela <eltehaem@poczta.onet.pl>
- * @version     Release: 3.2.11
- * @since       2.7
- */
-class HTML_QuickForm_static extends HTML_QuickForm_element {
-    
-    // {{{ properties
-
-    /**
-     * Display text
-     * @var       string
-     * @access    private
-     */
-    var $_text = null;
-
-    // }}}
-    // {{{ constructor
-    
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementLabel   (optional)Label
-     * @param     string    $text           (optional)Display text
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_static($elementName=null, $elementLabel=null, $text=null)
-    {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel);
-        $this->_persistantFreeze = false;
-        $this->_type = 'static';
-        $this->_text = $text;
-    } //end constructor
-    
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the element name
-     * 
-     * @param     string    $name   Element name
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        $this->updateAttributes(array('name'=>$name));
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        return $this->getAttribute('name');
-    } //end func getName
-
-    // }}}
-    // {{{ setText()
-
-    /**
-     * Sets the text
-     *
-     * @param     string    $text
-     * @access    public
-     * @return    void
-     */
-    function setText($text)
-    {
-        $this->_text = $text;
-    } // end func setText
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets the text (uses the standard setValue call to emulate a form element.
-     *
-     * @param     string    $text
-     * @access    public
-     * @return    void
-     */
-    function setValue($text)
-    {
-        $this->setText($text);
-    } // end func setValue
-
-    // }}}    
-    // {{{ toHtml()
-
-    /**
-     * Returns the static text element in HTML
-     * 
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        return $this->_getTabs() . $this->_text;
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags
-     * 
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        return $this->toHtml();
-    } //end func getFrozenHtml
-
-    // }}}
-    // {{{ onQuickFormEvent()
-
-    /**
-     * Called by HTML_QuickForm whenever form event is made on this element
-     *
-     * @param     string    $event  Name of event
-     * @param     mixed     $arg    event arguments
-     * @param     object    &$caller calling object
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        switch ($event) {
-            case 'updateValue':
-                // do NOT use submitted values for static elements
-                $value = $this->_findValue($caller->_constantValues);
-                if (null === $value) {
-                    $value = $this->_findValue($caller->_defaultValues);
-                }
-                if (null !== $value) {
-                    $this->setValue($value);
-                }
-                break;
-            default:
-                parent::onQuickFormEvent($event, $arg, $caller);
-        }
-        return true;
-    } // end func onQuickFormEvent
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * We override this here because we don't want any values from static elements
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        return null;
-    }
-    
-    // }}}
-} //end class HTML_QuickForm_static
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/submit.php b/airtime_mvc/library/pear/HTML/QuickForm/submit.php
deleted file mode 100644
index 2c12d73f7..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/submit.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a submit type element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: submit.php,v 1.6 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a submit type element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_submit extends HTML_QuickForm_input
-{
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    Input field name attribute
-     * @param     string    Input field value
-     * @param     mixed     Either a typical HTML attribute string or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_submit($elementName=null, $value=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, null, $attributes);
-        $this->setValue($value);
-        $this->setType('submit');
-    } //end constructor
-    
-    // }}}
-    // {{{ freeze()
-
-    /**
-     * Freeze the element so that only its value is returned
-     * 
-     * @access    public
-     * @return    void
-     */
-    function freeze()
-    {
-        return false;
-    } //end func freeze
-
-    // }}}
-    // {{{ exportValue()
-
-   /**
-    * Only return the value if it is found within $submitValues (i.e. if
-    * this particular submit button was clicked)
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        return $this->_prepareValue($this->_findValue($submitValues), $assoc);
-    }
-
-    // }}}
-} //end class HTML_QuickForm_submit
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/text.php b/airtime_mvc/library/pear/HTML/QuickForm/text.php
deleted file mode 100644
index 7c0f90842..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/text.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a text field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: text.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- */
-require_once 'HTML/QuickForm/input.php';
-
-/**
- * HTML class for a text field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_text extends HTML_QuickForm_input
-{
-                
-    // {{{ constructor
-
-    /**
-     * Class constructor
-     * 
-     * @param     string    $elementName    (optional)Input field name attribute
-     * @param     string    $elementLabel   (optional)Input field label
-     * @param     mixed     $attributes     (optional)Either a typical HTML attribute string 
-     *                                      or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_text($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        HTML_QuickForm_input::HTML_QuickForm_input($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->setType('text');
-    } //end constructor
-        
-    // }}}
-    // {{{ setSize()
-
-    /**
-     * Sets size of text field
-     * 
-     * @param     string    $size  Size of text field
-     * @since     1.3
-     * @access    public
-     * @return    void
-     */
-    function setSize($size)
-    {
-        $this->updateAttributes(array('size'=>$size));
-    } //end func setSize
-
-    // }}}
-    // {{{ setMaxlength()
-
-    /**
-     * Sets maxlength of text field
-     * 
-     * @param     string    $maxlength  Maximum length of text field
-     * @since     1.3
-     * @access    public
-     * @return    void
-     */
-    function setMaxlength($maxlength)
-    {
-        $this->updateAttributes(array('maxlength'=>$maxlength));
-    } //end func setMaxlength
-
-    // }}}
-    
-} //end class HTML_QuickForm_text
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/textarea.php b/airtime_mvc/library/pear/HTML/QuickForm/textarea.php
deleted file mode 100644
index 873b1d47f..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/textarea.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTML class for a textarea type field
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: textarea.php,v 1.13 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * HTML class for a textarea type field
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @version     Release: 3.2.11
- * @since       1.0
- */
-class HTML_QuickForm_textarea extends HTML_QuickForm_element
-{
-    // {{{ properties
-
-    /**
-     * Field value
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_value = null;
-
-    // }}}
-    // {{{ constructor
-        
-    /**
-     * Class constructor
-     * 
-     * @param     string    Input field name attribute
-     * @param     mixed     Label(s) for a field
-     * @param     mixed     Either a typical HTML attribute string or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function HTML_QuickForm_textarea($elementName=null, $elementLabel=null, $attributes=null)
-    {
-        HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
-        $this->_persistantFreeze = true;
-        $this->_type = 'textarea';
-    } //end constructor
-    
-    // }}}
-    // {{{ setName()
-
-    /**
-     * Sets the input field name
-     * 
-     * @param     string    $name   Input field name attribute
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setName($name)
-    {
-        $this->updateAttributes(array('name'=>$name));
-    } //end func setName
-    
-    // }}}
-    // {{{ getName()
-
-    /**
-     * Returns the element name
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getName()
-    {
-        return $this->getAttribute('name');
-    } //end func getName
-
-    // }}}
-    // {{{ setValue()
-
-    /**
-     * Sets value for textarea element
-     * 
-     * @param     string    $value  Value for textarea element
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setValue($value)
-    {
-        $this->_value = $value;
-    } //end func setValue
-    
-    // }}}
-    // {{{ getValue()
-
-    /**
-     * Returns the value of the form element
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getValue()
-    {
-        return $this->_value;
-    } // end func getValue
-
-    // }}}
-    // {{{ setWrap()
-
-    /**
-     * Sets wrap type for textarea element
-     * 
-     * @param     string    $wrap  Wrap type
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setWrap($wrap)
-    {
-        $this->updateAttributes(array('wrap' => $wrap));
-    } //end func setWrap
-    
-    // }}}
-    // {{{ setRows()
-
-    /**
-     * Sets height in rows for textarea element
-     * 
-     * @param     string    $rows  Height expressed in rows
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */
-    function setRows($rows)
-    {
-        $this->updateAttributes(array('rows' => $rows));
-    } //end func setRows
-
-    // }}}
-    // {{{ setCols()
-
-    /**
-     * Sets width in cols for textarea element
-     * 
-     * @param     string    $cols  Width expressed in cols
-     * @since     1.0
-     * @access    public
-     * @return    void
-     */ 
-    function setCols($cols)
-    {
-        $this->updateAttributes(array('cols' => $cols));
-    } //end func setCols
-
-    // }}}
-    // {{{ toHtml()
-
-    /**
-     * Returns the textarea element in HTML
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function toHtml()
-    {
-        if ($this->_flagFrozen) {
-            return $this->getFrozenHtml();
-        } else {
-            return $this->_getTabs() .
-                   '<textarea' . $this->_getAttrString($this->_attributes) . '>' .
-                   // because we wrap the form later we don't want the text indented
-                   preg_replace("/(\r\n|\n|\r)/", '&#010;', htmlspecialchars($this->_value)) .
-                   '</textarea>';
-        }
-    } //end func toHtml
-    
-    // }}}
-    // {{{ getFrozenHtml()
-
-    /**
-     * Returns the value of field without HTML tags (in this case, value is changed to a mask)
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
-    function getFrozenHtml()
-    {
-        $value = htmlspecialchars($this->getValue());
-        if ($this->getAttribute('wrap') == 'off') {
-            $html = $this->_getTabs() . '<pre>' . $value."</pre>\n";
-        } else {
-            $html = nl2br($value)."\n";
-        }
-        return $html . $this->_getPersistantData();
-    } //end func getFrozenHtml
-
-    // }}}
-
-} //end class HTML_QuickForm_textarea
-?>
diff --git a/airtime_mvc/library/pear/HTML/QuickForm/xbutton.php b/airtime_mvc/library/pear/HTML/QuickForm/xbutton.php
deleted file mode 100644
index 9e5c639aa..000000000
--- a/airtime_mvc/library/pear/HTML/QuickForm/xbutton.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Class for HTML 4.0 <button> element
- * 
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2001-2009 The PHP Group
- * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- * @version     CVS: $Id: xbutton.php,v 1.3 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- */ 
-require_once 'HTML/QuickForm/element.php';
-
-/**
- * Class for HTML 4.0 <button> element
- * 
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 3.2.11
- * @since       3.2.3
- */
-class HTML_QuickForm_xbutton extends HTML_QuickForm_element
-{
-   /**
-    * Contents of the <button> tag
-    * @var      string
-    * @access   private
-    */
-    var $_content; 
-
-   /**
-    * Class constructor
-    * 
-    * @param    string  Button name
-    * @param    string  Button content (HTML to add between <button></button> tags)
-    * @param    mixed   Either a typical HTML attribute string or an associative array
-    * @access   public
-    */
-    function HTML_QuickForm_xbutton($elementName = null, $elementContent = null, $attributes = null)
-    {
-        $this->HTML_QuickForm_element($elementName, null, $attributes);
-        $this->setContent($elementContent);
-        $this->setPersistantFreeze(false);
-        $this->_type = 'xbutton';
-    }
-
-
-    function toHtml()
-    {
-        return '<button' . $this->getAttributes(true) . '>' . $this->_content . '</button>';
-    }
-
-
-    function getFrozenHtml()
-    {
-        return $this->toHtml();
-    }
-
-
-    function freeze()
-    {
-        return false;
-    }
-
-
-    function setName($name)
-    {
-        $this->updateAttributes(array(
-            'name' => $name 
-        ));
-    }
-
-
-    function getName()
-    {
-        return $this->getAttribute('name');
-    }
-
-
-    function setValue($value)
-    {
-        $this->updateAttributes(array(
-            'value' => $value
-        ));
-    }
-
-
-    function getValue()
-    {
-        return $this->getAttribute('value');
-    }
-
-
-   /**
-    * Sets the contents of the button element
-    *
-    * @param    string  Button content (HTML to add between <button></button> tags)
-    */
-    function setContent($content)
-    {
-        $this->_content = $content;
-    }
-
-
-    function onQuickFormEvent($event, $arg, &$caller)
-    {
-        if ('updateValue' != $event) {
-            return parent::onQuickFormEvent($event, $arg, $caller);
-        } else {
-            $value = $this->_findValue($caller->_constantValues);
-            if (null === $value) {
-                $value = $this->_findValue($caller->_defaultValues);
-            }
-            if (null !== $value) {
-                $this->setValue($value);
-            }
-        }
-        return true;
-    }
-
-
-   /**
-    * Returns a 'safe' element's value
-    * 
-    * The value is only returned if the button's type is "submit" and if this
-    * particlular button was clicked
-    */
-    function exportValue(&$submitValues, $assoc = false)
-    {
-        if ('submit' == $this->getAttribute('type')) {
-            return $this->_prepareValue($this->_findValue($submitValues), $assoc);
-        } else {
-            return null;
-        }
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/OS/Guess.php b/airtime_mvc/library/pear/OS/Guess.php
deleted file mode 100644
index e557ae414..000000000
--- a/airtime_mvc/library/pear/OS/Guess.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * The OS_Guess class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Gregory Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Guess.php 278521 2009-04-09 22:24:12Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since PEAR 0.1
- */
-
-// {{{ uname examples
-
-// php_uname() without args returns the same as 'uname -a', or a PHP-custom
-// string for Windows.
-// PHP versions prior to 4.3 return the uname of the host where PHP was built,
-// as of 4.3 it returns the uname of the host running the PHP code.
-//
-// PC RedHat Linux 7.1:
-// Linux host.example.com 2.4.2-2 #1 Sun Apr 8 20:41:30 EDT 2001 i686 unknown
-//
-// PC Debian Potato:
-// Linux host 2.4.17 #2 SMP Tue Feb 12 15:10:04 CET 2002 i686 unknown
-//
-// PC FreeBSD 3.3:
-// FreeBSD host.example.com 3.3-STABLE FreeBSD 3.3-STABLE #0: Mon Feb 21 00:42:31 CET 2000     root@example.com:/usr/src/sys/compile/CONFIG  i386
-//
-// PC FreeBSD 4.3:
-// FreeBSD host.example.com 4.3-RELEASE FreeBSD 4.3-RELEASE #1: Mon Jun 25 11:19:43 EDT 2001     root@example.com:/usr/src/sys/compile/CONFIG  i386
-//
-// PC FreeBSD 4.5:
-// FreeBSD host.example.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Feb  6 23:59:23 CET 2002     root@example.com:/usr/src/sys/compile/CONFIG  i386
-//
-// PC FreeBSD 4.5 w/uname from GNU shellutils:
-// FreeBSD host.example.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Feb  i386 unknown
-//
-// HP 9000/712 HP-UX 10:
-// HP-UX iq B.10.10 A 9000/712 2008429113 two-user license
-//
-// HP 9000/712 HP-UX 10 w/uname from GNU shellutils:
-// HP-UX host B.10.10 A 9000/712 unknown
-//
-// IBM RS6000/550 AIX 4.3:
-// AIX host 3 4 000003531C00
-//
-// AIX 4.3 w/uname from GNU shellutils:
-// AIX host 3 4 000003531C00 unknown
-//
-// SGI Onyx IRIX 6.5 w/uname from GNU shellutils:
-// IRIX64 host 6.5 01091820 IP19 mips
-//
-// SGI Onyx IRIX 6.5:
-// IRIX64 host 6.5 01091820 IP19
-//
-// SparcStation 20 Solaris 8 w/uname from GNU shellutils:
-// SunOS host.example.com 5.8 Generic_108528-12 sun4m sparc
-//
-// SparcStation 20 Solaris 8:
-// SunOS host.example.com 5.8 Generic_108528-12 sun4m sparc SUNW,SPARCstation-20
-//
-// Mac OS X (Darwin)
-// Darwin home-eden.local 7.5.0 Darwin Kernel Version 7.5.0: Thu Aug  5 19:26:16 PDT 2004; root:xnu/xnu-517.7.21.obj~3/RELEASE_PPC  Power Macintosh
-//
-// Mac OS X early versions
-//
-
-// }}}
-
-/* TODO:
- * - define endianness, to allow matchSignature("bigend") etc.
- */
-
-/**
- * Retrieves information about the current operating system
- *
- * This class uses php_uname() to grok information about the current OS
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Gregory Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class OS_Guess
-{
-    var $sysname;
-    var $nodename;
-    var $cpu;
-    var $release;
-    var $extra;
-
-    function OS_Guess($uname = null)
-    {
-        list($this->sysname,
-             $this->release,
-             $this->cpu,
-             $this->extra,
-             $this->nodename) = $this->parseSignature($uname);
-    }
-
-    function parseSignature($uname = null)
-    {
-        static $sysmap = array(
-            'HP-UX' => 'hpux',
-            'IRIX64' => 'irix',
-        );
-        static $cpumap = array(
-            'i586' => 'i386',
-            'i686' => 'i386',
-            'ppc' => 'powerpc',
-        );
-        if ($uname === null) {
-            $uname = php_uname();
-        }
-        $parts = preg_split('/\s+/', trim($uname));
-        $n = count($parts);
-
-        $release  = $machine = $cpu = '';
-        $sysname  = $parts[0];
-        $nodename = $parts[1];
-        $cpu      = $parts[$n-1];
-        $extra = '';
-        if ($cpu == 'unknown') {
-            $cpu = $parts[$n - 2];
-        }
-
-        switch ($sysname) {
-            case 'AIX' :
-                $release = "$parts[3].$parts[2]";
-                break;
-            case 'Windows' :
-                switch ($parts[1]) {
-                    case '95/98':
-                        $release = '9x';
-                        break;
-                    default:
-                        $release = $parts[1];
-                        break;
-                }
-                $cpu = 'i386';
-                break;
-            case 'Linux' :
-                $extra = $this->_detectGlibcVersion();
-                // use only the first two digits from the kernel version
-                $release = preg_replace('/^([0-9]+\.[0-9]+).*/', '\1', $parts[2]);
-                break;
-            case 'Mac' :
-                $sysname = 'darwin';
-                $nodename = $parts[2];
-                $release = $parts[3];
-                if ($cpu == 'Macintosh') {
-                    if ($parts[$n - 2] == 'Power') {
-                        $cpu = 'powerpc';
-                    }
-                }
-                break;
-            case 'Darwin' :
-                if ($cpu == 'Macintosh') {
-                    if ($parts[$n - 2] == 'Power') {
-                        $cpu = 'powerpc';
-                    }
-                }
-                $release = preg_replace('/^([0-9]+\.[0-9]+).*/', '\1', $parts[2]);
-                break;
-            default:
-                $release = preg_replace('/-.*/', '', $parts[2]);
-                break;
-        }
-
-        if (isset($sysmap[$sysname])) {
-            $sysname = $sysmap[$sysname];
-        } else {
-            $sysname = strtolower($sysname);
-        }
-        if (isset($cpumap[$cpu])) {
-            $cpu = $cpumap[$cpu];
-        }
-        return array($sysname, $release, $cpu, $extra, $nodename);
-    }
-
-    function _detectGlibcVersion()
-    {
-        static $glibc = false;
-        if ($glibc !== false) {
-            return $glibc; // no need to run this multiple times
-        }
-        $major = $minor = 0;
-        include_once "System.php";
-        // Use glibc's <features.h> header file to
-        // get major and minor version number:
-        if (@file_exists('/usr/include/features.h') &&
-              @is_readable('/usr/include/features.h')) {
-            if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) {
-                $features_file = fopen('/usr/include/features.h', 'rb');
-                while (!feof($features_file)) {
-                    $line = fgets($features_file, 8192);
-                    if (!$line || (strpos($line, '#define') === false)) {
-                        continue;
-                    }
-                    if (strpos($line, '__GLIBC__')) {
-                        // major version number #define __GLIBC__ version
-                        $line = preg_split('/\s+/', $line);
-                        $glibc_major = trim($line[2]);
-                        if (isset($glibc_minor)) {
-                            break;
-                        }
-                        continue;
-                    }
-
-                    if (strpos($line, '__GLIBC_MINOR__'))  {
-                        // got the minor version number
-                        // #define __GLIBC_MINOR__ version
-                        $line = preg_split('/\s+/', $line);
-                        $glibc_minor = trim($line[2]);
-                        if (isset($glibc_major)) {
-                            break;
-                        }
-                        continue;
-                    }
-                }
-                fclose($features_file);
-                if (!isset($glibc_major) || !isset($glibc_minor)) {
-                    return $glibc = '';
-                }
-                return $glibc = 'glibc' . trim($glibc_major) . "." . trim($glibc_minor) ;
-            } // no cpp
-
-            $tmpfile = System::mktemp("glibctest");
-            $fp = fopen($tmpfile, "w");
-            fwrite($fp, "#include <features.h>\n__GLIBC__ __GLIBC_MINOR__\n");
-            fclose($fp);
-            $cpp = popen("/usr/bin/cpp $tmpfile", "r");
-            while ($line = fgets($cpp, 1024)) {
-                if ($line{0} == '#' || trim($line) == '') {
-                    continue;
-                }
-
-                if (list($major, $minor) = explode(' ', trim($line))) {
-                    break;
-                }
-            }
-            pclose($cpp);
-            unlink($tmpfile);
-        } // features.h
-
-        if (!($major && $minor) && @is_link('/lib/libc.so.6')) {
-            // Let's try reading the libc.so.6 symlink
-            if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) {
-                list($major, $minor) = explode('.', $matches[1]);
-            }
-        }
-
-        if (!($major && $minor)) {
-            return $glibc = '';
-        }
-
-        return $glibc = "glibc{$major}.{$minor}";
-    }
-
-    function getSignature()
-    {
-        if (empty($this->extra)) {
-            return "{$this->sysname}-{$this->release}-{$this->cpu}";
-        }
-        return "{$this->sysname}-{$this->release}-{$this->cpu}-{$this->extra}";
-    }
-
-    function getSysname()
-    {
-        return $this->sysname;
-    }
-
-    function getNodename()
-    {
-        return $this->nodename;
-    }
-
-    function getCpu()
-    {
-        return $this->cpu;
-    }
-
-    function getRelease()
-    {
-        return $this->release;
-    }
-
-    function getExtra()
-    {
-        return $this->extra;
-    }
-
-    function matchSignature($match)
-    {
-        $fragments = is_array($match) ? $match : explode('-', $match);
-        $n = count($fragments);
-        $matches = 0;
-        if ($n > 0) {
-            $matches += $this->_matchFragment($fragments[0], $this->sysname);
-        }
-        if ($n > 1) {
-            $matches += $this->_matchFragment($fragments[1], $this->release);
-        }
-        if ($n > 2) {
-            $matches += $this->_matchFragment($fragments[2], $this->cpu);
-        }
-        if ($n > 3) {
-            $matches += $this->_matchFragment($fragments[3], $this->extra);
-        }
-        return ($matches == $n);
-    }
-
-    function _matchFragment($fragment, $value)
-    {
-        if (strcspn($fragment, '*?') < strlen($fragment)) {
-            $reg = '/^' . str_replace(array('*', '?', '/'), array('.*', '.', '\\/'), $fragment) . '\\z/';
-            return preg_match($reg, $value);
-        }
-        return ($fragment == '*' || !strcasecmp($fragment, $value));
-    }
-
-}
-/*
- * Local Variables:
- * indent-tabs-mode: nil
- * c-basic-offset: 4
- * End:
- */
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR.php b/airtime_mvc/library/pear/PEAR.php
deleted file mode 100644
index 03a4b37ff..000000000
--- a/airtime_mvc/library/pear/PEAR.php
+++ /dev/null
@@ -1,1063 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2010 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PEAR.php 299159 2010-05-08 22:32:52Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (!is_a($data, 'PEAR_Error')) {
-            return false;
-        }
-
-        if (is_null($code)) {
-            return true;
-        } elseif (is_string($code)) {
-            return $data->getMessage() == $code;
-        }
-
-        return $data->getCode() == $code;
-    }
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return count($this->_expected_errors);
-    }
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-        foreach ($this->_expected_errors as $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-
-        return $deleted;
-    }
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here; we walk through it trying
-            // to unset all values
-            foreach ($error_code as $key => $error) {
-                $deleted =  $this->_checkDelExpect($error) ? true : false;
-            }
-
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            }
-
-            return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        }
-
-        // $error_code is empty
-        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-    }
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (
-            isset($this) &&
-            isset($this->_expected_errors) &&
-            count($this->_expected_errors) > 0 &&
-            count($exp = end($this->_expected_errors))
-        ) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))
-            ) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-        }
-
-        return $a;
-    }
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::raiseError
-     */
-    function &throwError($message = null, $code = null, $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-
-        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-        return $a;
-    }
-
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (extension_loaded($ext)) {
-            return true;
-        }
-
-        // if either returns true dl() will produce a FATAL error, stop that
-        if (
-            function_exists('dl') === false ||
-            ini_get('enable_dl') != 1 ||
-            ini_get('safe_mode') == 1
-        ) {
-            return false;
-        }
-
-        if (OS_WINDOWS) {
-            $suffix = '.dll';
-        } elseif (PHP_OS == 'HP-UX') {
-            $suffix = '.sl';
-        } elseif (PHP_OS == 'AIX') {
-            $suffix = '.a';
-        } elseif (PHP_OS == 'OSX') {
-            $suffix = '.bundle';
-        } else {
-            $suffix = '.so';
-        }
-
-        return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-    }
-}
-
-if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
-}
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
-
-        if ($destructLifoExists) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (
-        isset($GLOBALS['_PEAR_shutdown_funcs']) &&
-        is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
-        !empty($GLOBALS['_PEAR_shutdown_funcs'])
-    ) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Gregory Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
-
-        if (!$skiptrace) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-
-            $this->level = $options;
-            $this->callback = null;
-        }
-
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-
-            printf($format, $this->getMessage());
-        }
-
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-
-        if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
-            call_user_func($this->callback, $this);
-        }
-
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode()
-    {
-        return $this->mode;
-    }
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback()
-    {
-        return $this->callback;
-    }
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    function __toString()
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString()
-    {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/airtime_mvc/library/pear/PEAR/Autoloader.php b/airtime_mvc/library/pear/PEAR/Autoloader.php
deleted file mode 100644
index 817d1ff84..000000000
--- a/airtime_mvc/library/pear/PEAR/Autoloader.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Class auto-loader
- *
- * PHP versions 4
-
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Autoloader.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-if (!extension_loaded("overload")) {
-    // die hard without ext/overload
-    die("Rebuild PHP with the `overload' extension to use PEAR_Autoloader");
-}
-
-/**
- * Include for PEAR_Error and PEAR classes
- */
-require_once "PEAR.php";
-
-/**
- * This class is for objects where you want to separate the code for
- * some methods into separate classes.  This is useful if you have a
- * class with not-frequently-used methods that contain lots of code
- * that you would like to avoid always parsing.
- *
- * The PEAR_Autoloader class provides autoloading and aggregation.
- * The autoloading lets you set up in which classes the separated
- * methods are found.  Aggregation is the technique used to import new
- * methods, an instance of each class providing separated methods is
- * stored and called every time the aggregated method is called.
- *
- * @category   pear
- * @package    PEAR
- * @author Stig Bakken <ssb@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-class PEAR_Autoloader extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Map of methods and classes where they are defined
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_autoload_map = array();
-
-    /**
-     * Map of methods and aggregate objects
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_method_map = array();
-
-    // }}}
-    // {{{ addAutoload()
-
-    /**
-     * Add one or more autoload entries.
-     *
-     * @param string $method     which method to autoload
-     *
-     * @param string $classname  (optional) which class to find the method in.
-     *                           If the $method parameter is an array, this
-     *                           parameter may be omitted (and will be ignored
-     *                           if not), and the $method parameter will be
-     *                           treated as an associative array with method
-     *                           names as keys and class names as values.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAutoload($method, $classname = null)
-    {
-        if (is_array($method)) {
-            array_walk($method, create_function('$a,&$b', '$b = strtolower($b);'));
-            $this->_autoload_map = array_merge($this->_autoload_map, $method);
-        } else {
-            $this->_autoload_map[strtolower($method)] = $classname;
-        }
-    }
-
-    // }}}
-    // {{{ removeAutoload()
-
-    /**
-     * Remove an autoload entry.
-     *
-     * @param string $method  which method to remove the autoload entry for
-     *
-     * @return bool TRUE if an entry was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAutoload($method)
-    {
-        $method = strtolower($method);
-        $ok = isset($this->_autoload_map[$method]);
-        unset($this->_autoload_map[$method]);
-        return $ok;
-    }
-
-    // }}}
-    // {{{ addAggregateObject()
-
-    /**
-     * Add an aggregate object to this object.  If the specified class
-     * is not defined, loading it will be attempted following PEAR's
-     * file naming scheme.  All the methods in the class will be
-     * aggregated, except private ones (name starting with an
-     * underscore) and constructors.
-     *
-     * @param string $classname  what class to instantiate for the object.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAggregateObject($classname)
-    {
-        $classname = strtolower($classname);
-        if (!class_exists($classname)) {
-            $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
-            include_once $include_file;
-        }
-        $obj =& new $classname;
-        $methods = get_class_methods($classname);
-        foreach ($methods as $method) {
-            // don't import priviate methods and constructors
-            if ($method{0} != '_' && $method != $classname) {
-                $this->_method_map[$method] = $obj;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ removeAggregateObject()
-
-    /**
-     * Remove an aggregate object.
-     *
-     * @param string $classname  the class of the object to remove
-     *
-     * @return bool  TRUE if an object was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAggregateObject($classname)
-    {
-        $ok = false;
-        $classname = strtolower($classname);
-        reset($this->_method_map);
-        while (list($method, $obj) = each($this->_method_map)) {
-            if (is_a($obj, $classname)) {
-                unset($this->_method_map[$method]);
-                $ok = true;
-            }
-        }
-        return $ok;
-    }
-
-    // }}}
-    // {{{ __call()
-
-    /**
-     * Overloaded object call handler, called each time an
-     * undefined/aggregated method is invoked.  This method repeats
-     * the call in the right aggregate object and passes on the return
-     * value.
-     *
-     * @param string $method  which method that was called
-     *
-     * @param string $args    An array of the parameters passed in the
-     *                        original call
-     *
-     * @return mixed  The return value from the aggregated method, or a PEAR
-     *                error if the called method was unknown.
-     */
-    function __call($method, $args, &$retval)
-    {
-        $method = strtolower($method);
-        if (empty($this->_method_map[$method]) && isset($this->_autoload_map[$method])) {
-            $this->addAggregateObject($this->_autoload_map[$method]);
-        }
-        if (isset($this->_method_map[$method])) {
-            $retval = call_user_func_array(array($this->_method_map[$method], $method), $args);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-overload("PEAR_Autoloader");
-
-?>
diff --git a/airtime_mvc/library/pear/PEAR/Builder.php b/airtime_mvc/library/pear/PEAR/Builder.php
deleted file mode 100644
index b194fd050..000000000
--- a/airtime_mvc/library/pear/PEAR/Builder.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-/**
- * PEAR_Builder for building PHP extensions (PECL packages)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Builder.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- *
- * TODO: log output parameters in PECL command line
- * TODO: msdev path in configuration
- */
-
-/**
- * Needed for extending PEAR_Builder
- */
-require_once 'PEAR/Common.php';
-require_once 'PEAR/PackageFile.php';
-
-/**
- * Class to handle building (compiling) extensions.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since PHP 4.0.2
- * @see        http://pear.php.net/manual/en/core.ppm.pear-builder.php
- */
-class PEAR_Builder extends PEAR_Common
-{
-    var $php_api_version = 0;
-    var $zend_module_api_no = 0;
-    var $zend_extension_api_no = 0;
-
-    var $extensions_built = array();
-
-    /**
-     * @var string Used for reporting when it is not possible to pass function
-     *             via extra parameter, e.g. log, msdevCallback
-     */
-    var $current_callback = null;
-
-    // used for msdev builds
-    var $_lastline = null;
-    var $_firstline = null;
-
-    /**
-     * PEAR_Builder constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Builder(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-    }
-
-    /**
-     * Build an extension from source on windows.
-     * requires msdev
-     */
-    function _build_win32($descfile, $callback = null)
-    {
-        if (is_object($descfile)) {
-            $pkg = $descfile;
-            $descfile = $pkg->getPackageFile();
-        } else {
-            $pf = &new PEAR_PackageFile($this->config, $this->debug);
-            $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pkg)) {
-                return $pkg;
-            }
-        }
-        $dir = dirname($descfile);
-        $old_cwd = getcwd();
-
-        if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-
-        // packages that were in a .tar have the packagefile in this directory
-        $vdir = $pkg->getPackage() . '-' . $pkg->getVersion();
-        if (file_exists($dir) && is_dir($vdir)) {
-            if (!chdir($vdir)) {
-                return $this->raiseError("could not chdir to " . realpath($vdir));
-            }
-
-            $dir = getcwd();
-        }
-
-        $this->log(2, "building in $dir");
-
-        $dsp = $pkg->getPackage().'.dsp';
-        if (!file_exists("$dir/$dsp")) {
-            return $this->raiseError("The DSP $dsp does not exist.");
-        }
-        // XXX TODO: make release build type configurable
-        $command = 'msdev '.$dsp.' /MAKE "'.$pkg->getPackage(). ' - Release"';
-
-        $err = $this->_runCommand($command, array(&$this, 'msdevCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        // figure out the build platform and type
-        $platform = 'Win32';
-        $buildtype = 'Release';
-        if (preg_match('/.*?'.$pkg->getPackage().'\s-\s(\w+)\s(.*?)-+/i',$this->_firstline,$matches)) {
-            $platform = $matches[1];
-            $buildtype = $matches[2];
-        }
-
-        if (preg_match('/(.*)?\s-\s(\d+).*?(\d+)/', $this->_lastline, $matches)) {
-            if ($matches[2]) {
-                // there were errors in the build
-                return $this->raiseError("There were errors during compilation.");
-            }
-            $out = $matches[1];
-        } else {
-            return $this->raiseError("Did not understand the completion status returned from msdev.exe.");
-        }
-
-        // msdev doesn't tell us the output directory :/
-        // open the dsp, find /out and use that directory
-        $dsptext = join(file($dsp),'');
-
-        // this regex depends on the build platform and type having been
-        // correctly identified above.
-        $regex ='/.*?!IF\s+"\$\(CFG\)"\s+==\s+("'.
-                    $pkg->getPackage().'\s-\s'.
-                    $platform.'\s'.
-                    $buildtype.'").*?'.
-                    '\/out:"(.*?)"/is';
-
-        if ($dsptext && preg_match($regex, $dsptext, $matches)) {
-            // what we get back is a relative path to the output file itself.
-            $outfile = realpath($matches[2]);
-        } else {
-            return $this->raiseError("Could not retrieve output information from $dsp.");
-        }
-        // realpath returns false if the file doesn't exist
-        if ($outfile && copy($outfile, "$dir/$out")) {
-            $outfile = "$dir/$out";
-        }
-
-        $built_files[] = array(
-            'file' => "$outfile",
-            'php_api' => $this->php_api_version,
-            'zend_mod_api' => $this->zend_module_api_no,
-            'zend_ext_api' => $this->zend_extension_api_no,
-            );
-
-        return $built_files;
-    }
-    // }}}
-
-    // {{{ msdevCallback()
-    function msdevCallback($what, $data)
-    {
-        if (!$this->_firstline)
-            $this->_firstline = $data;
-        $this->_lastline = $data;
-        call_user_func($this->current_callback, $what, $data);
-    }
-
-    /**
-     * @param string
-     * @param string
-     * @param array
-     * @access private
-     */
-    function _harvestInstDir($dest_prefix, $dirname, &$built_files)
-    {
-        $d = opendir($dirname);
-        if (!$d)
-            return false;
-
-        $ret = true;
-        while (($ent = readdir($d)) !== false) {
-            if ($ent{0} == '.')
-                continue;
-
-            $full = $dirname . DIRECTORY_SEPARATOR . $ent;
-            if (is_dir($full)) {
-                if (!$this->_harvestInstDir(
-                        $dest_prefix . DIRECTORY_SEPARATOR . $ent,
-                        $full, $built_files)) {
-                    $ret = false;
-                    break;
-                }
-            } else {
-                $dest = $dest_prefix . DIRECTORY_SEPARATOR . $ent;
-                $built_files[] = array(
-                        'file' => $full,
-                        'dest' => $dest,
-                        'php_api' => $this->php_api_version,
-                        'zend_mod_api' => $this->zend_module_api_no,
-                        'zend_ext_api' => $this->zend_extension_api_no,
-                        );
-            }
-        }
-        closedir($d);
-        return $ret;
-    }
-
-    /**
-     * Build an extension from source.  Runs "phpize" in the source
-     * directory, but compiles in a temporary directory
-     * (/var/tmp/pear-build-USER/PACKAGE-VERSION).
-     *
-     * @param string|PEAR_PackageFile_v* $descfile path to XML package description file, or
-     *               a PEAR_PackageFile object
-     *
-     * @param mixed $callback callback function used to report output,
-     * see PEAR_Builder::_runCommand for details
-     *
-     * @return array an array of associative arrays with built files,
-     * format:
-     * array( array( 'file' => '/path/to/ext.so',
-     *               'php_api' => YYYYMMDD,
-     *               'zend_mod_api' => YYYYMMDD,
-     *               'zend_ext_api' => YYYYMMDD ),
-     *        ... )
-     *
-     * @access public
-     *
-     * @see PEAR_Builder::_runCommand
-     */
-    function build($descfile, $callback = null)
-    {
-        if (preg_match('/(\\/|\\\\|^)([^\\/\\\\]+)?php(.+)?$/',
-                       $this->config->get('php_bin'), $matches)) {
-            if (isset($matches[2]) && strlen($matches[2]) &&
-                trim($matches[2]) != trim($this->config->get('php_prefix'))) {
-                $this->log(0, 'WARNING: php_bin ' . $this->config->get('php_bin') .
-                           ' appears to have a prefix ' . $matches[2] . ', but' .
-                           ' config variable php_prefix does not match');
-            }
-            if (isset($matches[3]) && strlen($matches[3]) &&
-                trim($matches[3]) != trim($this->config->get('php_suffix'))) {
-                $this->log(0, 'WARNING: php_bin ' . $this->config->get('php_bin') .
-                           ' appears to have a suffix ' . $matches[3] . ', but' .
-                           ' config variable php_suffix does not match');
-            }
-        }
-
-
-        $this->current_callback = $callback;
-        if (PEAR_OS == "Windows") {
-            return $this->_build_win32($descfile, $callback);
-        }
-        if (PEAR_OS != 'Unix') {
-            return $this->raiseError("building extensions not supported on this platform");
-        }
-        if (is_object($descfile)) {
-            $pkg = $descfile;
-            $descfile = $pkg->getPackageFile();
-            if (is_a($pkg, 'PEAR_PackageFile_v1')) {
-                $dir = dirname($descfile);
-            } else {
-                $dir = $pkg->_config->get('temp_dir') . '/' . $pkg->getName();
-                // automatically delete at session end
-                $this->addTempFile($dir);
-            }
-        } else {
-            $pf = &new PEAR_PackageFile($this->config);
-            $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pkg)) {
-                return $pkg;
-            }
-            $dir = dirname($descfile);
-        }
-        $old_cwd = getcwd();
-        if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
-            return $this->raiseError("could not chdir to $dir");
-        }
-        $vdir = $pkg->getPackage() . '-' . $pkg->getVersion();
-        if (is_dir($vdir)) {
-            chdir($vdir);
-        }
-        $dir = getcwd();
-        $this->log(2, "building in $dir");
-        putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
-        $err = $this->_runCommand($this->config->get('php_prefix')
-                                . "phpize" .
-                                $this->config->get('php_suffix'),
-                                array(&$this, 'phpizeCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        if (!$err) {
-            return $this->raiseError("`phpize' failed");
-        }
-
-        // {{{ start of interactive part
-        $configure_command = "$dir/configure";
-        $configure_options = $pkg->getConfigureOptions();
-        if ($configure_options) {
-            foreach ($configure_options as $o) {
-                $default = array_key_exists('default', $o) ? $o['default'] : null;
-                list($r) = $this->ui->userDialog('build',
-                                                 array($o['prompt']),
-                                                 array('text'),
-                                                 array($default));
-                if (substr($o['name'], 0, 5) == 'with-' &&
-                    ($r == 'yes' || $r == 'autodetect')) {
-                    $configure_command .= " --$o[name]";
-                } else {
-                    $configure_command .= " --$o[name]=".trim($r);
-                }
-            }
-        }
-        // }}} end of interactive part
-
-        // FIXME make configurable
-        if(!$user=getenv('USER')){
-            $user='defaultuser';
-        }
-        $build_basedir = "/var/tmp/pear-build-$user";
-        $build_dir = "$build_basedir/$vdir";
-        $inst_dir = "$build_basedir/install-$vdir";
-        $this->log(1, "building in $build_dir");
-        if (is_dir($build_dir)) {
-            System::rm(array('-rf', $build_dir));
-        }
-        if (!System::mkDir(array('-p', $build_dir))) {
-            return $this->raiseError("could not create build dir: $build_dir");
-        }
-        $this->addTempFile($build_dir);
-        if (!System::mkDir(array('-p', $inst_dir))) {
-            return $this->raiseError("could not create temporary install dir: $inst_dir");
-        }
-        $this->addTempFile($inst_dir);
-
-        if (getenv('MAKE')) {
-            $make_command = getenv('MAKE');
-        } else {
-            $make_command = 'make';
-        }
-        $to_run = array(
-            $configure_command,
-            $make_command,
-            "$make_command INSTALL_ROOT=\"$inst_dir\" install",
-            "find \"$inst_dir\" | xargs ls -dils"
-            );
-        if (!file_exists($build_dir) || !is_dir($build_dir) || !chdir($build_dir)) {
-            return $this->raiseError("could not chdir to $build_dir");
-        }
-        putenv('PHP_PEAR_VERSION=1.9.1');
-        foreach ($to_run as $cmd) {
-            $err = $this->_runCommand($cmd, $callback);
-            if (PEAR::isError($err)) {
-                chdir($old_cwd);
-                return $err;
-            }
-            if (!$err) {
-                chdir($old_cwd);
-                return $this->raiseError("`$cmd' failed");
-            }
-        }
-        if (!($dp = opendir("modules"))) {
-            chdir($old_cwd);
-            return $this->raiseError("no `modules' directory found");
-        }
-        $built_files = array();
-        $prefix = exec($this->config->get('php_prefix')
-                        . "php-config" .
-                       $this->config->get('php_suffix') . " --prefix");
-        $this->_harvestInstDir($prefix, $inst_dir . DIRECTORY_SEPARATOR . $prefix, $built_files);
-        chdir($old_cwd);
-        return $built_files;
-    }
-
-    /**
-     * Message callback function used when running the "phpize"
-     * program.  Extracts the API numbers used.  Ignores other message
-     * types than "cmdoutput".
-     *
-     * @param string $what the type of message
-     * @param mixed $data the message
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function phpizeCallback($what, $data)
-    {
-        if ($what != 'cmdoutput') {
-            return;
-        }
-        $this->log(1, rtrim($data));
-        if (preg_match('/You should update your .aclocal.m4/', $data)) {
-            return;
-        }
-        $matches = array();
-        if (preg_match('/^\s+(\S[^:]+):\s+(\d{8})/', $data, $matches)) {
-            $member = preg_replace('/[^a-z]/', '_', strtolower($matches[1]));
-            $apino = (int)$matches[2];
-            if (isset($this->$member)) {
-                $this->$member = $apino;
-                //$msg = sprintf("%-22s : %d", $matches[1], $apino);
-                //$this->log(1, $msg);
-            }
-        }
-    }
-
-    /**
-     * Run an external command, using a message callback to report
-     * output.  The command will be run through popen and output is
-     * reported for every line with a "cmdoutput" message with the
-     * line string, including newlines, as payload.
-     *
-     * @param string $command the command to run
-     *
-     * @param mixed $callback (optional) function to use as message
-     * callback
-     *
-     * @return bool whether the command was successful (exit code 0
-     * means success, any other means failure)
-     *
-     * @access private
-     */
-    function _runCommand($command, $callback = null)
-    {
-        $this->log(1, "running: $command");
-        $pp = popen("$command 2>&1", "r");
-        if (!$pp) {
-            return $this->raiseError("failed to run `$command'");
-        }
-        if ($callback && $callback[0]->debug == 1) {
-            $olddbg = $callback[0]->debug;
-            $callback[0]->debug = 2;
-        }
-
-        while ($line = fgets($pp, 1024)) {
-            if ($callback) {
-                call_user_func($callback, 'cmdoutput', $line);
-            } else {
-                $this->log(2, rtrim($line));
-            }
-        }
-        if ($callback && isset($olddbg)) {
-            $callback[0]->debug = $olddbg;
-        }
-
-        $exitcode = is_resource($pp) ? pclose($pp) : -1;
-        return ($exitcode == 0);
-    }
-
-    function log($level, $msg)
-    {
-        if ($this->current_callback) {
-            if ($this->debug >= $level) {
-                call_user_func($this->current_callback, 'output', $msg);
-            }
-            return;
-        }
-        return PEAR_Common::log($level, $msg);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/ChannelFile.php b/airtime_mvc/library/pear/PEAR/ChannelFile.php
deleted file mode 100644
index 4000c88bb..000000000
--- a/airtime_mvc/library/pear/PEAR/ChannelFile.php
+++ /dev/null
@@ -1,1559 +0,0 @@
-<?php
-/**
- * PEAR_ChannelFile, the channel handling class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ChannelFile.php 286951 2009-08-09 14:41:22Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR/ErrorStack.php';
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/Common.php';
-
-/**
- * Error code if the channel.xml <channel> tag does not contain a valid version
- */
-define('PEAR_CHANNELFILE_ERROR_NO_VERSION', 1);
-/**
- * Error code if the channel.xml <channel> tag version is not supported (version 1.0 is the only supported version,
- * currently
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_VERSION', 2);
-
-/**
- * Error code if parsing is attempted with no xml extension
- */
-define('PEAR_CHANNELFILE_ERROR_NO_XML_EXT', 3);
-
-/**
- * Error code if creating the xml parser resource fails
- */
-define('PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER', 4);
-
-/**
- * Error code used for all sax xml parsing errors
- */
-define('PEAR_CHANNELFILE_ERROR_PARSER_ERROR', 5);
-
-/**#@+
- * Validation errors
- */
-/**
- * Error code when channel name is missing
- */
-define('PEAR_CHANNELFILE_ERROR_NO_NAME', 6);
-/**
- * Error code when channel name is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_NAME', 7);
-/**
- * Error code when channel summary is missing
- */
-define('PEAR_CHANNELFILE_ERROR_NO_SUMMARY', 8);
-/**
- * Error code when channel summary is multi-line
- */
-define('PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY', 9);
-/**
- * Error code when channel server is missing for protocol
- */
-define('PEAR_CHANNELFILE_ERROR_NO_HOST', 10);
-/**
- * Error code when channel server is invalid for protocol
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_HOST', 11);
-/**
- * Error code when a mirror name is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_MIRROR', 21);
-/**
- * Error code when a mirror type is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_MIRRORTYPE', 22);
-/**
- * Error code when an attempt is made to generate xml, but the parsed content is invalid
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID', 23);
-/**
- * Error code when an empty package name validate regex is passed in
- */
-define('PEAR_CHANNELFILE_ERROR_EMPTY_REGEX', 24);
-/**
- * Error code when a <function> tag has no version
- */
-define('PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION', 25);
-/**
- * Error code when a <function> tag has no name
- */
-define('PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME', 26);
-/**
- * Error code when a <validatepackage> tag has no name
- */
-define('PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME', 27);
-/**
- * Error code when a <validatepackage> tag has no version attribute
- */
-define('PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION', 28);
-/**
- * Error code when a mirror does not exist but is called for in one of the set*
- * methods.
- */
-define('PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND', 32);
-/**
- * Error code when a server port is not numeric
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_PORT', 33);
-/**
- * Error code when <static> contains no version attribute
- */
-define('PEAR_CHANNELFILE_ERROR_NO_STATICVERSION', 34);
-/**
- * Error code when <baseurl> contains no type attribute in a <rest> protocol definition
- */
-define('PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE', 35);
-/**
- * Error code when a mirror is defined and the channel.xml represents the __uri pseudo-channel
- */
-define('PEAR_CHANNELFILE_URI_CANT_MIRROR', 36);
-/**
- * Error code when ssl attribute is present and is not "yes"
- */
-define('PEAR_CHANNELFILE_ERROR_INVALID_SSL', 37);
-/**#@-*/
-
-/**
- * Mirror types allowed.  Currently only internet servers are recognized.
- */
-$GLOBALS['_PEAR_CHANNELS_MIRROR_TYPES'] =  array('server');
-
-
-/**
- * The Channel handling class
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_ChannelFile
-{
-    /**
-     * @access private
-     * @var PEAR_ErrorStack
-     * @access private
-     */
-    var $_stack;
-
-    /**
-     * Supported channel.xml versions, for parsing
-     * @var array
-     * @access private
-     */
-    var $_supportedVersions = array('1.0');
-
-    /**
-     * Parsed channel information
-     * @var array
-     * @access private
-     */
-    var $_channelInfo;
-
-    /**
-     * index into the subchannels array, used for parsing xml
-     * @var int
-     * @access private
-     */
-    var $_subchannelIndex;
-
-    /**
-     * index into the mirrors array, used for parsing xml
-     * @var int
-     * @access private
-     */
-    var $_mirrorIndex;
-
-    /**
-     * Flag used to determine the validity of parsed content
-     * @var boolean
-     * @access private
-     */
-    var $_isValid = false;
-
-    function PEAR_ChannelFile()
-    {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
-        $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
-        $this->_isValid = false;
-    }
-
-    /**
-     * @return array
-     * @access protected
-     */
-    function _getErrorMessage()
-    {
-        return
-            array(
-                PEAR_CHANNELFILE_ERROR_INVALID_VERSION =>
-                    'While parsing channel.xml, an invalid version number "%version% was passed in, expecting one of %versions%',
-                PEAR_CHANNELFILE_ERROR_NO_VERSION =>
-                    'No version number found in <channel> tag',
-                PEAR_CHANNELFILE_ERROR_NO_XML_EXT =>
-                    '%error%',
-                PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER =>
-                    'Unable to create XML parser',
-                PEAR_CHANNELFILE_ERROR_PARSER_ERROR =>
-                    '%error%',
-                PEAR_CHANNELFILE_ERROR_NO_NAME =>
-                    'Missing channel name',
-                PEAR_CHANNELFILE_ERROR_INVALID_NAME =>
-                    'Invalid channel %tag% "%name%"',
-                PEAR_CHANNELFILE_ERROR_NO_SUMMARY =>
-                    'Missing channel summary',
-                PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY =>
-                    'Channel summary should be on one line, but is multi-line',
-                PEAR_CHANNELFILE_ERROR_NO_HOST =>
-                    'Missing channel server for %type% server',
-                PEAR_CHANNELFILE_ERROR_INVALID_HOST =>
-                    'Server name "%server%" is invalid for %type% server',
-                PEAR_CHANNELFILE_ERROR_INVALID_MIRROR =>
-                    'Invalid mirror name "%name%", mirror type %type%',
-                PEAR_CHANNELFILE_ERROR_INVALID_MIRRORTYPE =>
-                    'Invalid mirror type "%type%"',
-                PEAR_CHANNELFILE_ERROR_INVALID =>
-                    'Cannot generate xml, contents are invalid',
-                PEAR_CHANNELFILE_ERROR_EMPTY_REGEX =>
-                    'packagenameregex cannot be empty',
-                PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION =>
-                    '%parent% %protocol% function has no version',
-                PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME =>
-                    '%parent% %protocol% function has no name',
-                PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE =>
-                    '%parent% rest baseurl has no type',
-                PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME =>
-                    'Validation package has no name in <validatepackage> tag',
-                PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION =>
-                    'Validation package "%package%" has no version',
-                PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND =>
-                    'Mirror "%mirror%" does not exist',
-                PEAR_CHANNELFILE_ERROR_INVALID_PORT =>
-                    'Port "%port%" must be numeric',
-                PEAR_CHANNELFILE_ERROR_NO_STATICVERSION =>
-                    '<static> tag must contain version attribute',
-                PEAR_CHANNELFILE_URI_CANT_MIRROR =>
-                    'The __uri pseudo-channel cannot have mirrors',
-                PEAR_CHANNELFILE_ERROR_INVALID_SSL =>
-                    '%server% has invalid ssl attribute "%ssl%" can only be yes or not present',
-            );
-    }
-
-    /**
-     * @param string contents of package.xml file
-     * @return bool success of parsing
-     */
-    function fromXmlString($data)
-    {
-        if (preg_match('/<channel\s+version="([0-9]+\.[0-9]+)"/', $data, $channelversion)) {
-            if (!in_array($channelversion[1], $this->_supportedVersions)) {
-                $this->_stack->push(PEAR_CHANNELFILE_ERROR_INVALID_VERSION, 'error',
-                    array('version' => $channelversion[1]));
-                return false;
-            }
-            $parser = new PEAR_XMLParser;
-            $result = $parser->parse($data);
-            if ($result !== true) {
-                if ($result->getCode() == 1) {
-                    $this->_stack->push(PEAR_CHANNELFILE_ERROR_NO_XML_EXT, 'error',
-                        array('error' => $result->getMessage()));
-                } else {
-                    $this->_stack->push(PEAR_CHANNELFILE_ERROR_CANT_MAKE_PARSER, 'error');
-                }
-                return false;
-            }
-            $this->_channelInfo = $parser->getData();
-            return true;
-        } else {
-            $this->_stack->push(PEAR_CHANNELFILE_ERROR_NO_VERSION, 'error', array('xml' => $data));
-            return false;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    function toArray()
-    {
-        if (!$this->_isValid && !$this->validate()) {
-            return false;
-        }
-        return $this->_channelInfo;
-    }
-
-    /**
-     * @param array
-     * @static
-     * @return PEAR_ChannelFile|false false if invalid
-     */
-    function &fromArray($data, $compatibility = false, $stackClass = 'PEAR_ErrorStack')
-    {
-        $a = new PEAR_ChannelFile($compatibility, $stackClass);
-        $a->_fromArray($data);
-        if (!$a->validate()) {
-            $a = false;
-            return $a;
-        }
-        return $a;
-    }
-
-    /**
-     * Unlike {@link fromArray()} this does not do any validation
-     * @param array
-     * @static
-     * @return PEAR_ChannelFile
-     */
-    function &fromArrayWithErrors($data, $compatibility = false,
-                                  $stackClass = 'PEAR_ErrorStack')
-    {
-        $a = new PEAR_ChannelFile($compatibility, $stackClass);
-        $a->_fromArray($data);
-        return $a;
-    }
-
-    /**
-     * @param array
-     * @access private
-     */
-    function _fromArray($data)
-    {
-        $this->_channelInfo = $data;
-    }
-
-    /**
-     * Wrapper to {@link PEAR_ErrorStack::getErrors()}
-     * @param boolean determines whether to purge the error stack after retrieving
-     * @return array
-     */
-    function getErrors($purge = false)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    /**
-     * Unindent given string (?)
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Parse a channel.xml file.  Expects the name of
-     * a channel xml file as input.
-     *
-     * @param string  $descfile  name of channel xml file
-     * @return bool success of parsing
-     */
-    function fromXmlFile($descfile)
-    {
-        if (!file_exists($descfile) || !is_file($descfile) || !is_readable($descfile) ||
-             (!$fp = fopen($descfile, 'r'))) {
-            require_once 'PEAR.php';
-            return PEAR::raiseError("Unable to open $descfile");
-        }
-
-        // read the whole thing so we only get one cdata callback
-        // for each block of cdata
-        fclose($fp);
-        $data = file_get_contents($descfile);
-        return $this->fromXmlString($data);
-    }
-
-    /**
-     * Parse channel information from different sources
-     *
-     * This method is able to extract information about a channel
-     * from an .xml file or a string
-     *
-     * @access public
-     * @param  string Filename of the source or the source itself
-     * @return bool
-     */
-    function fromAny($info)
-    {
-        if (is_string($info) && file_exists($info) && strlen($info) < 255) {
-            $tmp = substr($info, -4);
-            if ($tmp == '.xml') {
-                $info = $this->fromXmlFile($info);
-            } else {
-                $fp = fopen($info, "r");
-                $test = fread($fp, 5);
-                fclose($fp);
-                if ($test == "<?xml") {
-                    $info = $this->fromXmlFile($info);
-                }
-            }
-            if (PEAR::isError($info)) {
-                require_once 'PEAR.php';
-                return PEAR::raiseError($info);
-            }
-        }
-        if (is_string($info)) {
-            $info = $this->fromXmlString($info);
-        }
-        return $info;
-    }
-
-    /**
-     * Return an XML document based on previous parsing and modifications
-     *
-     * @return string XML data
-     *
-     * @access public
-     */
-    function toXml()
-    {
-        if (!$this->_isValid && !$this->validate()) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID);
-            return false;
-        }
-        if (!isset($this->_channelInfo['attribs']['version'])) {
-            $this->_channelInfo['attribs']['version'] = '1.0';
-        }
-        $channelInfo = $this->_channelInfo;
-        $ret = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n";
-        $ret .= "<channel version=\"" .
-            $channelInfo['attribs']['version'] . "\" xmlns=\"http://pear.php.net/channel-1.0\"
-  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
-  xsi:schemaLocation=\"http://pear.php.net/dtd/channel-"
-            . $channelInfo['attribs']['version'] . " http://pear.php.net/dtd/channel-" .
-            $channelInfo['attribs']['version'] . ".xsd\">
- <name>$channelInfo[name]</name>
- <summary>" . htmlspecialchars($channelInfo['summary'])."</summary>
-";
-        if (isset($channelInfo['suggestedalias'])) {
-            $ret .= ' <suggestedalias>' . $channelInfo['suggestedalias'] . "</suggestedalias>\n";
-        }
-        if (isset($channelInfo['validatepackage'])) {
-            $ret .= ' <validatepackage version="' .
-                $channelInfo['validatepackage']['attribs']['version']. '">' .
-                htmlspecialchars($channelInfo['validatepackage']['_content']) .
-                "</validatepackage>\n";
-        }
-        $ret .= " <servers>\n";
-        $ret .= '  <primary';
-        if (isset($channelInfo['servers']['primary']['attribs']['ssl'])) {
-            $ret .= ' ssl="' . $channelInfo['servers']['primary']['attribs']['ssl'] . '"';
-        }
-        if (isset($channelInfo['servers']['primary']['attribs']['port'])) {
-            $ret .= ' port="' . $channelInfo['servers']['primary']['attribs']['port'] . '"';
-        }
-        $ret .= ">\n";
-        if (isset($channelInfo['servers']['primary']['rest'])) {
-            $ret .= $this->_makeRestXml($channelInfo['servers']['primary']['rest'], '   ');
-        }
-        $ret .= "  </primary>\n";
-        if (isset($channelInfo['servers']['mirror'])) {
-            $ret .= $this->_makeMirrorsXml($channelInfo);
-        }
-        $ret .= " </servers>\n";
-        $ret .= "</channel>";
-        return str_replace("\r", "\n", str_replace("\r\n", "\n", $ret));
-    }
-
-    /**
-     * Generate the <rest> tag
-     * @access private
-     */
-    function _makeRestXml($info, $indent)
-    {
-        $ret = $indent . "<rest>\n";
-        if (isset($info['baseurl']) && !isset($info['baseurl'][0])) {
-            $info['baseurl'] = array($info['baseurl']);
-        }
-
-        if (isset($info['baseurl'])) {
-            foreach ($info['baseurl'] as $url) {
-                $ret .= "$indent <baseurl type=\"" . $url['attribs']['type'] . "\"";
-                $ret .= ">" . $url['_content'] . "</baseurl>\n";
-            }
-        }
-        $ret .= $indent . "</rest>\n";
-        return $ret;
-    }
-
-    /**
-     * Generate the <mirrors> tag
-     * @access private
-     */
-    function _makeMirrorsXml($channelInfo)
-    {
-        $ret = "";
-        if (!isset($channelInfo['servers']['mirror'][0])) {
-            $channelInfo['servers']['mirror'] = array($channelInfo['servers']['mirror']);
-        }
-        foreach ($channelInfo['servers']['mirror'] as $mirror) {
-            $ret .= '  <mirror host="' . $mirror['attribs']['host'] . '"';
-            if (isset($mirror['attribs']['port'])) {
-                $ret .= ' port="' . $mirror['attribs']['port'] . '"';
-            }
-            if (isset($mirror['attribs']['ssl'])) {
-                $ret .= ' ssl="' . $mirror['attribs']['ssl'] . '"';
-            }
-            $ret .= ">\n";
-            if (isset($mirror['rest'])) {
-                if (isset($mirror['rest'])) {
-                    $ret .= $this->_makeRestXml($mirror['rest'], '   ');
-                }
-                $ret .= "  </mirror>\n";
-            } else {
-                $ret .= "/>\n";
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Generate the <functions> tag
-     * @access private
-     */
-    function _makeFunctionsXml($functions, $indent, $rest = false)
-    {
-        $ret = '';
-        if (!isset($functions[0])) {
-            $functions = array($functions);
-        }
-        foreach ($functions as $function) {
-            $ret .= "$indent<function version=\"" . $function['attribs']['version'] . "\"";
-            if ($rest) {
-                $ret .= ' uri="' . $function['attribs']['uri'] . '"';
-            }
-            $ret .= ">" . $function['_content'] . "</function>\n";
-        }
-        return $ret;
-    }
-
-    /**
-     * Validation error.  Also marks the object contents as invalid
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateError($code, $params = array())
-    {
-        $this->_stack->push($code, 'error', $params);
-        $this->_isValid = false;
-    }
-
-    /**
-     * Validation warning.  Does not mark the object contents invalid.
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateWarning($code, $params = array())
-    {
-        $this->_stack->push($code, 'warning', $params);
-    }
-
-    /**
-     * Validate parsed file.
-     *
-     * @access public
-     * @return boolean
-     */
-    function validate()
-    {
-        $this->_isValid = true;
-        $info = $this->_channelInfo;
-        if (empty($info['name'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_NAME);
-        } elseif (!$this->validChannelServer($info['name'])) {
-            if ($info['name'] != '__uri') {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME, array('tag' => 'name',
-                    'name' => $info['name']));
-            }
-        }
-        if (empty($info['summary'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SUMMARY);
-        } elseif (strpos(trim($info['summary']), "\n") !== false) {
-            $this->_validateWarning(PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $info['summary']));
-        }
-        if (isset($info['suggestedalias'])) {
-            if (!$this->validChannelServer($info['suggestedalias'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                    array('tag' => 'suggestedalias', 'name' =>$info['suggestedalias']));
-            }
-        }
-        if (isset($info['localalias'])) {
-            if (!$this->validChannelServer($info['localalias'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                    array('tag' => 'localalias', 'name' =>$info['localalias']));
-            }
-        }
-        if (isset($info['validatepackage'])) {
-            if (!isset($info['validatepackage']['_content'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_NOVALIDATE_NAME);
-            }
-            if (!isset($info['validatepackage']['attribs']['version'])) {
-                $content = isset($info['validatepackage']['_content']) ?
-                    $info['validatepackage']['_content'] :
-                    null;
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_NOVALIDATE_VERSION,
-                    array('package' => $content));
-            }
-        }
-
-        if (isset($info['servers']['primary']['attribs'], $info['servers']['primary']['attribs']['port']) &&
-              !is_numeric($info['servers']['primary']['attribs']['port'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_PORT,
-                array('port' => $info['servers']['primary']['attribs']['port']));
-        }
-
-        if (isset($info['servers']['primary']['attribs'], $info['servers']['primary']['attribs']['ssl']) &&
-              $info['servers']['primary']['attribs']['ssl'] != 'yes') {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_SSL,
-                array('ssl' => $info['servers']['primary']['attribs']['ssl'],
-                    'server' => $info['name']));
-        }
-
-        if (isset($info['servers']['primary']['rest']) &&
-              isset($info['servers']['primary']['rest']['baseurl'])) {
-            $this->_validateFunctions('rest', $info['servers']['primary']['rest']['baseurl']);
-        }
-        if (isset($info['servers']['mirror'])) {
-            if ($this->_channelInfo['name'] == '__uri') {
-                $this->_validateError(PEAR_CHANNELFILE_URI_CANT_MIRROR);
-            }
-            if (!isset($info['servers']['mirror'][0])) {
-                $info['servers']['mirror'] = array($info['servers']['mirror']);
-            }
-            foreach ($info['servers']['mirror'] as $mirror) {
-                if (!isset($mirror['attribs']['host'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_HOST,
-                      array('type' => 'mirror'));
-                } elseif (!$this->validChannelServer($mirror['attribs']['host'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_HOST,
-                        array('server' => $mirror['attribs']['host'], 'type' => 'mirror'));
-                }
-                if (isset($mirror['attribs']['ssl']) && $mirror['attribs']['ssl'] != 'yes') {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_SSL,
-                        array('ssl' => $info['ssl'], 'server' => $mirror['attribs']['host']));
-                }
-                if (isset($mirror['rest'])) {
-                    $this->_validateFunctions('rest', $mirror['rest']['baseurl'],
-                        $mirror['attribs']['host']);
-                }
-            }
-        }
-        return $this->_isValid;
-    }
-
-    /**
-     * @param string  rest - protocol name this function applies to
-     * @param array the functions
-     * @param string the name of the parent element (mirror name, for instance)
-     */
-    function _validateFunctions($protocol, $functions, $parent = '')
-    {
-        if (!isset($functions[0])) {
-            $functions = array($functions);
-        }
-
-        foreach ($functions as $function) {
-            if (!isset($function['_content']) || empty($function['_content'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONNAME,
-                    array('parent' => $parent, 'protocol' => $protocol));
-            }
-
-            if ($protocol == 'rest') {
-                if (!isset($function['attribs']['type']) ||
-                      empty($function['attribs']['type'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NOBASEURLTYPE,
-                        array('parent' => $parent, 'protocol' => $protocol));
-                }
-            } else {
-                if (!isset($function['attribs']['version']) ||
-                      empty($function['attribs']['version'])) {
-                    $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_FUNCTIONVERSION,
-                        array('parent' => $parent, 'protocol' => $protocol));
-                }
-            }
-        }
-    }
-
-    /**
-     * Test whether a string contains a valid channel server.
-     * @param string $ver the package version to test
-     * @return bool
-     */
-    function validChannelServer($server)
-    {
-        if ($server == '__uri') {
-            return true;
-        }
-        return (bool) preg_match(PEAR_CHANNELS_SERVER_PREG, $server);
-    }
-
-    /**
-     * @return string|false
-     */
-    function getName()
-    {
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        }
-
-        return false;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getServer()
-    {
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        }
-
-        return false;
-    }
-
-    /**
-     * @return int|80 port number to connect to
-     */
-    function getPort($mirror = false)
-    {
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                if (isset($mir['attribs']['port'])) {
-                    return $mir['attribs']['port'];
-                }
-
-                if ($this->getSSL($mirror)) {
-                    return 443;
-                }
-
-                return 80;
-            }
-
-            return false;
-        }
-
-        if (isset($this->_channelInfo['servers']['primary']['attribs']['port'])) {
-            return $this->_channelInfo['servers']['primary']['attribs']['port'];
-        }
-
-        if ($this->getSSL()) {
-            return 443;
-        }
-
-        return 80;
-    }
-
-    /**
-     * @return bool Determines whether secure sockets layer (SSL) is used to connect to this channel
-     */
-    function getSSL($mirror = false)
-    {
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                if (isset($mir['attribs']['ssl'])) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            return false;
-        }
-
-        if (isset($this->_channelInfo['servers']['primary']['attribs']['ssl'])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getSummary()
-    {
-        if (isset($this->_channelInfo['summary'])) {
-            return $this->_channelInfo['summary'];
-        }
-
-        return false;
-    }
-
-    /**
-     * @param string protocol type
-     * @param string Mirror name
-     * @return array|false
-     */
-    function getFunctions($protocol, $mirror = false)
-    {
-        if ($this->getName() == '__uri') {
-            return false;
-        }
-
-        $function = $protocol == 'rest' ? 'baseurl' : 'function';
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                if (isset($mir[$protocol][$function])) {
-                    return $mir[$protocol][$function];
-                }
-            }
-
-            return false;
-        }
-
-        if (isset($this->_channelInfo['servers']['primary'][$protocol][$function])) {
-            return $this->_channelInfo['servers']['primary'][$protocol][$function];
-        }
-
-        return false;
-    }
-
-    /**
-     * @param string Protocol type
-     * @param string Function name (null to return the
-     *               first protocol of the type requested)
-     * @param string Mirror name, if any
-     * @return array
-     */
-     function getFunction($type, $name = null, $mirror = false)
-     {
-        $protocols = $this->getFunctions($type, $mirror);
-        if (!$protocols) {
-            return false;
-        }
-
-        foreach ($protocols as $protocol) {
-            if ($name === null) {
-                return $protocol;
-            }
-
-            if ($protocol['_content'] != $name) {
-                continue;
-            }
-
-            return $protocol;
-        }
-
-        return false;
-     }
-
-    /**
-     * @param string protocol type
-     * @param string protocol name
-     * @param string version
-     * @param string mirror name
-     * @return boolean
-     */
-    function supports($type, $name = null, $mirror = false, $version = '1.0')
-    {
-        $protocols = $this->getFunctions($type, $mirror);
-        if (!$protocols) {
-            return false;
-        }
-
-        foreach ($protocols as $protocol) {
-            if ($protocol['attribs']['version'] != $version) {
-                continue;
-            }
-
-            if ($name === null) {
-                return true;
-            }
-
-            if ($protocol['_content'] != $name) {
-                continue;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determines whether a channel supports Representational State Transfer (REST) protocols
-     * for retrieving channel information
-     * @param string
-     * @return bool
-     */
-    function supportsREST($mirror = false)
-    {
-        if ($mirror == $this->_channelInfo['name']) {
-            $mirror = false;
-        }
-
-        if ($mirror) {
-            if ($mir = $this->getMirror($mirror)) {
-                return isset($mir['rest']);
-            }
-
-            return false;
-        }
-
-        return isset($this->_channelInfo['servers']['primary']['rest']);
-    }
-
-    /**
-     * Get the URL to access a base resource.
-     *
-     * Hyperlinks in the returned xml will be used to retrieve the proper information
-     * needed.  This allows extreme extensibility and flexibility in implementation
-     * @param string Resource Type to retrieve
-     */
-    function getBaseURL($resourceType, $mirror = false)
-    {
-        if ($mirror == $this->_channelInfo['name']) {
-            $mirror = false;
-        }
-
-        if ($mirror) {
-            $mir = $this->getMirror($mirror);
-            if (!$mir) {
-                return false;
-            }
-
-            $rest = $mir['rest'];
-        } else {
-            $rest = $this->_channelInfo['servers']['primary']['rest'];
-        }
-
-        if (!isset($rest['baseurl'][0])) {
-            $rest['baseurl'] = array($rest['baseurl']);
-        }
-
-        foreach ($rest['baseurl'] as $baseurl) {
-            if (strtolower($baseurl['attribs']['type']) == strtolower($resourceType)) {
-                return $baseurl['_content'];
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Since REST does not implement RPC, provide this as a logical wrapper around
-     * resetFunctions for REST
-     * @param string|false mirror name, if any
-     */
-    function resetREST($mirror = false)
-    {
-        return $this->resetFunctions('rest', $mirror);
-    }
-
-    /**
-     * Empty all protocol definitions
-     * @param string protocol type
-     * @param string|false mirror name, if any
-     */
-    function resetFunctions($type, $mirror = false)
-    {
-        if ($mirror) {
-            if (isset($this->_channelInfo['servers']['mirror'])) {
-                $mirrors = $this->_channelInfo['servers']['mirror'];
-                if (!isset($mirrors[0])) {
-                    $mirrors = array($mirrors);
-                }
-
-                foreach ($mirrors as $i => $mir) {
-                    if ($mir['attribs']['host'] == $mirror) {
-                        if (isset($this->_channelInfo['servers']['mirror'][$i][$type])) {
-                            unset($this->_channelInfo['servers']['mirror'][$i][$type]);
-                        }
-
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
-            return false;
-        }
-
-        if (isset($this->_channelInfo['servers']['primary'][$type])) {
-            unset($this->_channelInfo['servers']['primary'][$type]);
-        }
-
-        return true;
-    }
-
-    /**
-     * Set a channel's protocols to the protocols supported by pearweb
-     */
-    function setDefaultPEARProtocols($version = '1.0', $mirror = false)
-    {
-        switch ($version) {
-            case '1.0' :
-                $this->resetREST($mirror);
-
-                if (!isset($this->_channelInfo['servers'])) {
-                    $this->_channelInfo['servers'] = array('primary' =>
-                        array('rest' => array()));
-                } elseif (!isset($this->_channelInfo['servers']['primary'])) {
-                    $this->_channelInfo['servers']['primary'] = array('rest' => array());
-                }
-
-                return true;
-            break;
-            default :
-                return false;
-            break;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    function getMirrors()
-    {
-        if (isset($this->_channelInfo['servers']['mirror'])) {
-            $mirrors = $this->_channelInfo['servers']['mirror'];
-            if (!isset($mirrors[0])) {
-                $mirrors = array($mirrors);
-            }
-
-            return $mirrors;
-        }
-
-        return array();
-    }
-
-    /**
-     * Get the unserialized XML representing a mirror
-     * @return array|false
-     */
-    function getMirror($server)
-    {
-        foreach ($this->getMirrors() as $mirror) {
-            if ($mirror['attribs']['host'] == $server) {
-                return $mirror;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param string
-     * @return string|false
-     * @error PEAR_CHANNELFILE_ERROR_NO_NAME
-     * @error PEAR_CHANNELFILE_ERROR_INVALID_NAME
-     */
-    function setName($name)
-    {
-        return $this->setServer($name);
-    }
-
-    /**
-     * Set the socket number (port) that is used to connect to this channel
-     * @param integer
-     * @param string|false name of the mirror server, or false for the primary
-     */
-    function setPort($port, $mirror = false)
-    {
-        if ($mirror) {
-            if (!isset($this->_channelInfo['servers']['mirror'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            }
-
-            if (isset($this->_channelInfo['servers']['mirror'][0])) {
-                foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                    if ($mirror == $mir['attribs']['host']) {
-                        $this->_channelInfo['servers']['mirror'][$i]['attribs']['port'] = $port;
-                        return true;
-                    }
-                }
-
-                return false;
-            } elseif ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                $this->_channelInfo['servers']['mirror']['attribs']['port'] = $port;
-                $this->_isValid = false;
-                return true;
-            }
-        }
-
-        $this->_channelInfo['servers']['primary']['attribs']['port'] = $port;
-        $this->_isValid = false;
-        return true;
-    }
-
-    /**
-     * Set the socket number (port) that is used to connect to this channel
-     * @param bool Determines whether to turn on SSL support or turn it off
-     * @param string|false name of the mirror server, or false for the primary
-     */
-    function setSSL($ssl = true, $mirror = false)
-    {
-        if ($mirror) {
-            if (!isset($this->_channelInfo['servers']['mirror'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            }
-
-            if (isset($this->_channelInfo['servers']['mirror'][0])) {
-                foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                    if ($mirror == $mir['attribs']['host']) {
-                        if (!$ssl) {
-                            if (isset($this->_channelInfo['servers']['mirror'][$i]
-                                  ['attribs']['ssl'])) {
-                                unset($this->_channelInfo['servers']['mirror'][$i]['attribs']['ssl']);
-                            }
-                        } else {
-                            $this->_channelInfo['servers']['mirror'][$i]['attribs']['ssl'] = 'yes';
-                        }
-
-                        return true;
-                    }
-                }
-
-                return false;
-            } elseif ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                if (!$ssl) {
-                    if (isset($this->_channelInfo['servers']['mirror']['attribs']['ssl'])) {
-                        unset($this->_channelInfo['servers']['mirror']['attribs']['ssl']);
-                    }
-                } else {
-                    $this->_channelInfo['servers']['mirror']['attribs']['ssl'] = 'yes';
-                }
-
-                $this->_isValid = false;
-                return true;
-            }
-        }
-
-        if ($ssl) {
-            $this->_channelInfo['servers']['primary']['attribs']['ssl'] = 'yes';
-        } else {
-            if (isset($this->_channelInfo['servers']['primary']['attribs']['ssl'])) {
-                unset($this->_channelInfo['servers']['primary']['attribs']['ssl']);
-            }
-        }
-
-        $this->_isValid = false;
-        return true;
-    }
-
-    /**
-     * @param string
-     * @return string|false
-     * @error PEAR_CHANNELFILE_ERROR_NO_SERVER
-     * @error PEAR_CHANNELFILE_ERROR_INVALID_SERVER
-     */
-    function setServer($server, $mirror = false)
-    {
-        if (empty($server)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SERVER);
-            return false;
-        } elseif (!$this->validChannelServer($server)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                array('tag' => 'name', 'name' => $server));
-            return false;
-        }
-
-        if ($mirror) {
-            $found = false;
-            foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                if ($mirror == $mir['attribs']['host']) {
-                    $found = true;
-                    break;
-                }
-            }
-
-            if (!$found) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            }
-
-            $this->_channelInfo['mirror'][$i]['attribs']['host'] = $server;
-            return true;
-        }
-
-        $this->_channelInfo['name'] = $server;
-        return true;
-    }
-
-    /**
-     * @param string
-     * @return boolean success
-     * @error PEAR_CHANNELFILE_ERROR_NO_SUMMARY
-     * @warning PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY
-     */
-    function setSummary($summary)
-    {
-        if (empty($summary)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_NO_SUMMARY);
-            return false;
-        } elseif (strpos(trim($summary), "\n") !== false) {
-            $this->_validateWarning(PEAR_CHANNELFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $summary));
-        }
-
-        $this->_channelInfo['summary'] = $summary;
-        return true;
-    }
-
-    /**
-     * @param string
-     * @param boolean determines whether the alias is in channel.xml or local
-     * @return boolean success
-     */
-    function setAlias($alias, $local = false)
-    {
-        if (!$this->validChannelServer($alias)) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_INVALID_NAME,
-                array('tag' => 'suggestedalias', 'name' => $alias));
-            return false;
-        }
-
-        if ($local) {
-            $this->_channelInfo['localalias'] = $alias;
-        } else {
-            $this->_channelInfo['suggestedalias'] = $alias;
-        }
-
-        return true;
-    }
-
-    /**
-     * @return string
-     */
-    function getAlias()
-    {
-        if (isset($this->_channelInfo['localalias'])) {
-            return $this->_channelInfo['localalias'];
-        }
-        if (isset($this->_channelInfo['suggestedalias'])) {
-            return $this->_channelInfo['suggestedalias'];
-        }
-        if (isset($this->_channelInfo['name'])) {
-            return $this->_channelInfo['name'];
-        }
-        return '';
-    }
-
-    /**
-     * Set the package validation object if it differs from PEAR's default
-     * The class must be includeable via changing _ in the classname to path separator,
-     * but no checking of this is made.
-     * @param string|false pass in false to reset to the default packagename regex
-     * @return boolean success
-     */
-    function setValidationPackage($validateclass, $version)
-    {
-        if (empty($validateclass)) {
-            unset($this->_channelInfo['validatepackage']);
-        }
-        $this->_channelInfo['validatepackage'] = array('_content' => $validateclass);
-        $this->_channelInfo['validatepackage']['attribs'] = array('version' => $version);
-    }
-
-    /**
-     * Add a protocol to the provides section
-     * @param string protocol type
-     * @param string protocol version
-     * @param string protocol name, if any
-     * @param string mirror name, if this is a mirror's protocol
-     * @return bool
-     */
-    function addFunction($type, $version, $name = '', $mirror = false)
-    {
-        if ($mirror) {
-            return $this->addMirrorFunction($mirror, $type, $version, $name);
-        }
-
-        $set = array('attribs' => array('version' => $version), '_content' => $name);
-        if (!isset($this->_channelInfo['servers']['primary'][$type]['function'])) {
-            if (!isset($this->_channelInfo['servers'])) {
-                $this->_channelInfo['servers'] = array('primary' =>
-                    array($type => array()));
-            } elseif (!isset($this->_channelInfo['servers']['primary'])) {
-                $this->_channelInfo['servers']['primary'] = array($type => array());
-            }
-
-            $this->_channelInfo['servers']['primary'][$type]['function'] = $set;
-            $this->_isValid = false;
-            return true;
-        } elseif (!isset($this->_channelInfo['servers']['primary'][$type]['function'][0])) {
-            $this->_channelInfo['servers']['primary'][$type]['function'] = array(
-                $this->_channelInfo['servers']['primary'][$type]['function']);
-        }
-
-        $this->_channelInfo['servers']['primary'][$type]['function'][] = $set;
-        return true;
-    }
-    /**
-     * Add a protocol to a mirror's provides section
-     * @param string mirror name (server)
-     * @param string protocol type
-     * @param string protocol version
-     * @param string protocol name, if any
-     */
-    function addMirrorFunction($mirror, $type, $version, $name = '')
-    {
-        if (!isset($this->_channelInfo['servers']['mirror'])) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                array('mirror' => $mirror));
-            return false;
-        }
-
-        $setmirror = false;
-        if (isset($this->_channelInfo['servers']['mirror'][0])) {
-            foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                if ($mirror == $mir['attribs']['host']) {
-                    $setmirror = &$this->_channelInfo['servers']['mirror'][$i];
-                    break;
-                }
-            }
-        } else {
-            if ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                $setmirror = &$this->_channelInfo['servers']['mirror'];
-            }
-        }
-
-        if (!$setmirror) {
-            $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                array('mirror' => $mirror));
-            return false;
-        }
-
-        $set = array('attribs' => array('version' => $version), '_content' => $name);
-        if (!isset($setmirror[$type]['function'])) {
-            $setmirror[$type]['function'] = $set;
-            $this->_isValid = false;
-            return true;
-        } elseif (!isset($setmirror[$type]['function'][0])) {
-            $setmirror[$type]['function'] = array($setmirror[$type]['function']);
-        }
-
-        $setmirror[$type]['function'][] = $set;
-        $this->_isValid = false;
-        return true;
-    }
-
-    /**
-     * @param string Resource Type this url links to
-     * @param string URL
-     * @param string|false mirror name, if this is not a primary server REST base URL
-     */
-    function setBaseURL($resourceType, $url, $mirror = false)
-    {
-        if ($mirror) {
-            if (!isset($this->_channelInfo['servers']['mirror'])) {
-                $this->_validateError(PEAR_CHANNELFILE_ERROR_MIRROR_NOT_FOUND,
-                    array('mirror' => $mirror));
-                return false;
-            }
-
-            $setmirror = false;
-            if (isset($this->_channelInfo['servers']['mirror'][0])) {
-                foreach ($this->_channelInfo['servers']['mirror'] as $i => $mir) {
-                    if ($mirror == $mir['attribs']['host']) {
-                        $setmirror = &$this->_channelInfo['servers']['mirror'][$i];
-                        break;
-                    }
-                }
-            } else {
-                if ($this->_channelInfo['servers']['mirror']['attribs']['host'] == $mirror) {
-                    $setmirror = &$this->_channelInfo['servers']['mirror'];
-                }
-            }
-        } else {
-            $setmirror = &$this->_channelInfo['servers']['primary'];
-        }
-
-        $set = array('attribs' => array('type' => $resourceType), '_content' => $url);
-        if (!isset($setmirror['rest'])) {
-            $setmirror['rest'] = array();
-        }
-
-        if (!isset($setmirror['rest']['baseurl'])) {
-            $setmirror['rest']['baseurl'] = $set;
-            $this->_isValid = false;
-            return true;
-        } elseif (!isset($setmirror['rest']['baseurl'][0])) {
-            $setmirror['rest']['baseurl'] = array($setmirror['rest']['baseurl']);
-        }
-
-        foreach ($setmirror['rest']['baseurl'] as $i => $url) {
-            if ($url['attribs']['type'] == $resourceType) {
-                $this->_isValid = false;
-                $setmirror['rest']['baseurl'][$i] = $set;
-                return true;
-            }
-        }
-
-        $setmirror['rest']['baseurl'][] = $set;
-        $this->_isValid = false;
-        return true;
-    }
-
-    /**
-     * @param string mirror server
-     * @param int mirror http port
-     * @return boolean
-     */
-    function addMirror($server, $port = null)
-    {
-        if ($this->_channelInfo['name'] == '__uri') {
-            return false; // the __uri channel cannot have mirrors by definition
-        }
-
-        $set = array('attribs' => array('host' => $server));
-        if (is_numeric($port)) {
-            $set['attribs']['port'] = $port;
-        }
-
-        if (!isset($this->_channelInfo['servers']['mirror'])) {
-            $this->_channelInfo['servers']['mirror'] = $set;
-            return true;
-        }
-
-        if (!isset($this->_channelInfo['servers']['mirror'][0])) {
-            $this->_channelInfo['servers']['mirror'] =
-                array($this->_channelInfo['servers']['mirror']);
-        }
-
-        $this->_channelInfo['servers']['mirror'][] = $set;
-        return true;
-    }
-
-    /**
-     * Retrieve the name of the validation package for this channel
-     * @return string|false
-     */
-    function getValidationPackage()
-    {
-        if (!$this->_isValid && !$this->validate()) {
-            return false;
-        }
-
-        if (!isset($this->_channelInfo['validatepackage'])) {
-            return array('attribs' => array('version' => 'default'),
-                '_content' => 'PEAR_Validate');
-        }
-
-        return $this->_channelInfo['validatepackage'];
-    }
-
-    /**
-     * Retrieve the object that can be used for custom validation
-     * @param string|false the name of the package to validate.  If the package is
-     *                     the channel validation package, PEAR_Validate is returned
-     * @return PEAR_Validate|false false is returned if the validation package
-     *         cannot be located
-     */
-    function &getValidationObject($package = false)
-    {
-        if (!class_exists('PEAR_Validate')) {
-            require_once 'PEAR/Validate.php';
-        }
-
-        if (!$this->_isValid) {
-            if (!$this->validate()) {
-                $a = false;
-                return $a;
-            }
-        }
-
-        if (isset($this->_channelInfo['validatepackage'])) {
-            if ($package == $this->_channelInfo['validatepackage']) {
-                // channel validation packages are always validated by PEAR_Validate
-                $val = &new PEAR_Validate;
-                return $val;
-            }
-
-            if (!class_exists(str_replace('.', '_',
-                  $this->_channelInfo['validatepackage']['_content']))) {
-                if ($this->isIncludeable(str_replace('_', '/',
-                      $this->_channelInfo['validatepackage']['_content']) . '.php')) {
-                    include_once str_replace('_', '/',
-                        $this->_channelInfo['validatepackage']['_content']) . '.php';
-                    $vclass = str_replace('.', '_',
-                        $this->_channelInfo['validatepackage']['_content']);
-                    $val = &new $vclass;
-                } else {
-                    $a = false;
-                    return $a;
-                }
-            } else {
-                $vclass = str_replace('.', '_',
-                    $this->_channelInfo['validatepackage']['_content']);
-                $val = &new $vclass;
-            }
-        } else {
-            $val = &new PEAR_Validate;
-        }
-
-        return $val;
-    }
-
-    function isIncludeable($path)
-    {
-        $possibilities = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($possibilities as $dir) {
-            if (file_exists($dir . DIRECTORY_SEPARATOR . $path)
-                  && is_readable($dir . DIRECTORY_SEPARATOR . $path)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This function is used by the channel updater and retrieves a value set by
-     * the registry, or the current time if it has not been set
-     * @return string
-     */
-    function lastModified()
-    {
-        if (isset($this->_channelInfo['_lastmodified'])) {
-            return $this->_channelInfo['_lastmodified'];
-        }
-
-        return time();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/ChannelFile/Parser.php b/airtime_mvc/library/pear/PEAR/ChannelFile/Parser.php
deleted file mode 100644
index 14ff45411..000000000
--- a/airtime_mvc/library/pear/PEAR/ChannelFile/Parser.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * PEAR_ChannelFile_Parser for parsing channel.xml
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Parser.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base xml parser class
- */
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/ChannelFile.php';
-/**
- * Parser for channel.xml
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_ChannelFile_Parser extends PEAR_XMLParser
-{
-    var $_config;
-    var $_logger;
-    var $_registry;
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    function parse($data, $file)
-    {
-        if (PEAR::isError($err = parent::parse($data, $file))) {
-            return $err;
-        }
-
-        $ret = new PEAR_ChannelFile;
-        $ret->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $ret->setLogger($this->_logger);
-        }
-
-        $ret->fromArray($this->_unserializedData);
-        // make sure the filelist is in the easy to read format needed
-        $ret->flattenFilelist();
-        $ret->setPackagefile($file, $archive);
-        return $ret;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command.php b/airtime_mvc/library/pear/PEAR/Command.php
deleted file mode 100644
index 26ec17eea..000000000
--- a/airtime_mvc/library/pear/PEAR/Command.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-/**
- * PEAR_Command, command pattern class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Command.php 286494 2009-07-29 06:57:11Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Frontend.php';
-require_once 'PEAR/XMLParser.php';
-
-/**
- * List of commands and what classes they are implemented in.
- * @var array command => implementing class
- */
-$GLOBALS['_PEAR_Command_commandlist'] = array();
-
-/**
- * List of commands and their descriptions
- * @var array command => description
- */
-$GLOBALS['_PEAR_Command_commanddesc'] = array();
-
-/**
- * List of shortcuts to common commands.
- * @var array shortcut => command
- */
-$GLOBALS['_PEAR_Command_shortcuts'] = array();
-
-/**
- * Array of command objects
- * @var array class => object
- */
-$GLOBALS['_PEAR_Command_objects'] = array();
-
-/**
- * PEAR command class, a simple factory class for administrative
- * commands.
- *
- * How to implement command classes:
- *
- * - The class must be called PEAR_Command_Nnn, installed in the
- *   "PEAR/Common" subdir, with a method called getCommands() that
- *   returns an array of the commands implemented by the class (see
- *   PEAR/Command/Install.php for an example).
- *
- * - The class must implement a run() function that is called with three
- *   params:
- *
- *    (string) command name
- *    (array)  assoc array with options, freely defined by each
- *             command, for example:
- *             array('force' => true)
- *    (array)  list of the other parameters
- *
- *   The run() function returns a PEAR_CommandResponse object.  Use
- *   these methods to get information:
- *
- *    int getStatus()   Returns PEAR_COMMAND_(SUCCESS|FAILURE|PARTIAL)
- *                      *_PARTIAL means that you need to issue at least
- *                      one more command to complete the operation
- *                      (used for example for validation steps).
- *
- *    string getMessage()  Returns a message for the user.  Remember,
- *                         no HTML or other interface-specific markup.
- *
- *   If something unexpected happens, run() returns a PEAR error.
- *
- * - DON'T OUTPUT ANYTHING! Return text for output instead.
- *
- * - DON'T USE HTML! The text you return will be used from both Gtk,
- *   web and command-line interfaces, so for now, keep everything to
- *   plain text.
- *
- * - DON'T USE EXIT OR DIE! Always use pear errors.  From static
- *   classes do PEAR::raiseError(), from other classes do
- *   $this->raiseError().
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command
-{
-    // {{{ factory()
-
-    /**
-     * Get the right object for executing a command.
-     *
-     * @param string $command The name of the command
-     * @param object $config  Instance of PEAR_Config object
-     *
-     * @return object the command object or a PEAR error
-     *
-     * @access public
-     * @static
-     */
-    function &factory($command, &$config)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            $a = PEAR::raiseError("unknown command `$command'");
-            return $a;
-        }
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        if (!class_exists($class)) {
-            require_once $GLOBALS['_PEAR_Command_objects'][$class];
-        }
-        if (!class_exists($class)) {
-            $a = PEAR::raiseError("unknown command `$command'");
-            return $a;
-        }
-        $ui =& PEAR_Command::getFrontendObject();
-        $obj = &new $class($ui, $config);
-        return $obj;
-    }
-
-    // }}}
-    // {{{ & getObject()
-    function &getObject($command)
-    {
-        $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
-        if (!class_exists($class)) {
-            require_once $GLOBALS['_PEAR_Command_objects'][$class];
-        }
-        if (!class_exists($class)) {
-            return PEAR::raiseError("unknown command `$command'");
-        }
-        $ui =& PEAR_Command::getFrontendObject();
-        $config = &PEAR_Config::singleton();
-        $obj = &new $class($ui, $config);
-        return $obj;
-    }
-
-    // }}}
-    // {{{ & getFrontendObject()
-
-    /**
-     * Get instance of frontend object.
-     *
-     * @return object|PEAR_Error
-     * @static
-     */
-    function &getFrontendObject()
-    {
-        $a = &PEAR_Frontend::singleton();
-        return $a;
-    }
-
-    // }}}
-    // {{{ & setFrontendClass()
-
-    /**
-     * Load current frontend class.
-     *
-     * @param string $uiclass Name of class implementing the frontend
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function &setFrontendClass($uiclass)
-    {
-        $a = &PEAR_Frontend::setFrontendClass($uiclass);
-        return $a;
-    }
-
-    // }}}
-    // {{{ setFrontendType()
-
-    /**
-     * Set current frontend.
-     *
-     * @param string $uitype Name of the frontend type (for example "CLI")
-     *
-     * @return object the frontend object, or a PEAR error
-     * @static
-     */
-    function setFrontendType($uitype)
-    {
-        $uiclass = 'PEAR_Frontend_' . $uitype;
-        return PEAR_Command::setFrontendClass($uiclass);
-    }
-
-    // }}}
-    // {{{ registerCommands()
-
-    /**
-     * Scan through the Command directory looking for classes
-     * and see what commands they implement.
-     *
-     * @param bool   (optional) if FALSE (default), the new list of
-     *               commands should replace the current one.  If TRUE,
-     *               new entries will be merged with old.
-     *
-     * @param string (optional) where (what directory) to look for
-     *               classes, defaults to the Command subdirectory of
-     *               the directory from where this file (__FILE__) is
-     *               included.
-     *
-     * @return bool TRUE on success, a PEAR error on failure
-     *
-     * @access public
-     * @static
-     */
-    function registerCommands($merge = false, $dir = null)
-    {
-        $parser = new PEAR_XMLParser;
-        if ($dir === null) {
-            $dir = dirname(__FILE__) . '/Command';
-        }
-        if (!is_dir($dir)) {
-            return PEAR::raiseError("registerCommands: opendir($dir) '$dir' does not exist or is not a directory");
-        }
-        $dp = @opendir($dir);
-        if (empty($dp)) {
-            return PEAR::raiseError("registerCommands: opendir($dir) failed");
-        }
-        if (!$merge) {
-            $GLOBALS['_PEAR_Command_commandlist'] = array();
-        }
-
-        while ($file = readdir($dp)) {
-            if ($file{0} == '.' || substr($file, -4) != '.xml') {
-                continue;
-            }
-
-            $f = substr($file, 0, -4);
-            $class = "PEAR_Command_" . $f;
-            // List of commands
-            if (empty($GLOBALS['_PEAR_Command_objects'][$class])) {
-                $GLOBALS['_PEAR_Command_objects'][$class] = "$dir/" . $f . '.php';
-            }
-
-            $parser->parse(file_get_contents("$dir/$file"));
-            $implements = $parser->getData();
-            foreach ($implements as $command => $desc) {
-                if ($command == 'attribs') {
-                    continue;
-                }
-
-                if (isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-                    return PEAR::raiseError('Command "' . $command . '" already registered in ' .
-                        'class "' . $GLOBALS['_PEAR_Command_commandlist'][$command] . '"');
-                }
-
-                $GLOBALS['_PEAR_Command_commandlist'][$command] = $class;
-                $GLOBALS['_PEAR_Command_commanddesc'][$command] = $desc['summary'];
-                if (isset($desc['shortcut'])) {
-                    $shortcut = $desc['shortcut'];
-                    if (isset($GLOBALS['_PEAR_Command_shortcuts'][$shortcut])) {
-                        return PEAR::raiseError('Command shortcut "' . $shortcut . '" already ' .
-                            'registered to command "' . $command . '" in class "' .
-                            $GLOBALS['_PEAR_Command_commandlist'][$command] . '"');
-                    }
-                    $GLOBALS['_PEAR_Command_shortcuts'][$shortcut] = $command;
-                }
-
-                if (isset($desc['options']) && $desc['options']) {
-                    foreach ($desc['options'] as $oname => $option) {
-                        if (isset($option['shortopt']) && strlen($option['shortopt']) > 1) {
-                            return PEAR::raiseError('Option "' . $oname . '" short option "' .
-                                $option['shortopt'] . '" must be ' .
-                                'only 1 character in Command "' . $command . '" in class "' .
-                                $class . '"');
-                        }
-                    }
-                }
-            }
-        }
-
-        ksort($GLOBALS['_PEAR_Command_shortcuts']);
-        ksort($GLOBALS['_PEAR_Command_commandlist']);
-        @closedir($dp);
-        return true;
-    }
-
-    // }}}
-    // {{{ getCommands()
-
-    /**
-     * Get the list of currently supported commands, and what
-     * classes implement them.
-     *
-     * @return array command => implementing class
-     *
-     * @access public
-     * @static
-     */
-    function getCommands()
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_commandlist'];
-    }
-
-    // }}}
-    // {{{ getShortcuts()
-
-    /**
-     * Get the list of command shortcuts.
-     *
-     * @return array shortcut => command
-     *
-     * @access public
-     * @static
-     */
-    function getShortcuts()
-    {
-        if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
-            PEAR_Command::registerCommands();
-        }
-        return $GLOBALS['_PEAR_Command_shortcuts'];
-    }
-
-    // }}}
-    // {{{ getGetoptArgs()
-
-    /**
-     * Compiles arguments for getopt.
-     *
-     * @param string $command     command to get optstring for
-     * @param string $short_args  (reference) short getopt format
-     * @param array  $long_args   (reference) long getopt format
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
-            PEAR_Command::registerCommands();
-        }
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (!isset($GLOBALS['_PEAR_Command_commandlist'][$command])) {
-            return null;
-        }
-        $obj = &PEAR_Command::getObject($command);
-        return $obj->getGetoptArgs($command, $short_args, $long_args);
-    }
-
-    // }}}
-    // {{{ getDescription()
-
-    /**
-     * Get description for a command.
-     *
-     * @param  string $command Name of the command
-     *
-     * @return string command description
-     *
-     * @access public
-     * @static
-     */
-    function getDescription($command)
-    {
-        if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
-            return null;
-        }
-        return $GLOBALS['_PEAR_Command_commanddesc'][$command];
-    }
-
-    // }}}
-    // {{{ getHelp()
-
-    /**
-     * Get help for command.
-     *
-     * @param string $command Name of the command to return help for
-     *
-     * @access public
-     * @static
-     */
-    function getHelp($command)
-    {
-        $cmds = PEAR_Command::getCommands();
-        if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
-            $command = $GLOBALS['_PEAR_Command_shortcuts'][$command];
-        }
-        if (isset($cmds[$command])) {
-            $obj = &PEAR_Command::getObject($command);
-            return $obj->getHelp($command);
-        }
-        return false;
-    }
-    // }}}
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Auth.php b/airtime_mvc/library/pear/PEAR/Command/Auth.php
deleted file mode 100644
index 8ae829804..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Auth.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * PEAR_Command_Auth (login, logout commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Auth.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- * @deprecated since 1.8.0alpha1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Channels.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- * @deprecated since 1.8.0alpha1
- */
-class PEAR_Command_Auth extends PEAR_Command_Channels
-{
-    var $commands = array(
-        'login' => array(
-            'summary' => 'Connects and authenticates to remote server [Deprecated in favor of channel-login]',
-            'shortcut' => 'li',
-            'function' => 'doLogin',
-            'options' => array(),
-            'doc' => '<channel name>
-WARNING: This function is deprecated in favor of using channel-login
-
-Log in to a remote channel server.  If <channel name> is not supplied,
-the default channel is used. To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.',
-            ),
-        'logout' => array(
-            'summary' => 'Logs out from the remote server [Deprecated in favor of channel-logout]',
-            'shortcut' => 'lo',
-            'function' => 'doLogout',
-            'options' => array(),
-            'doc' => '
-WARNING: This function is deprecated in favor of using channel-logout
-
-Logs out from the remote server.  This command does not actually
-connect to the remote server, it only deletes the stored username and
-password from your user configuration.',
-            )
-
-        );
-
-    /**
-     * PEAR_Command_Auth constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Auth(&$ui, &$config)
-    {
-        parent::PEAR_Command_Channels($ui, $config);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Auth.xml b/airtime_mvc/library/pear/PEAR/Command/Auth.xml
deleted file mode 100644
index 590193d14..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Auth.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<commands version="1.0">
- <login>
-  <summary>Connects and authenticates to remote server [Deprecated in favor of channel-login]</summary>
-  <function>doLogin</function>
-  <shortcut>li</shortcut>
-  <options />
-  <doc>&lt;channel name&gt;
-WARNING: This function is deprecated in favor of using channel-login
-
-Log in to a remote channel server.  If &lt;channel name&gt; is not supplied,
-the default channel is used. To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.</doc>
- </login>
- <logout>
-  <summary>Logs out from the remote server [Deprecated in favor of channel-logout]</summary>
-  <function>doLogout</function>
-  <shortcut>lo</shortcut>
-  <options />
-  <doc>
-WARNING: This function is deprecated in favor of using channel-logout
-
-Logs out from the remote server.  This command does not actually
-connect to the remote server, it only deletes the stored username and
-password from your user configuration.</doc>
- </logout>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Build.php b/airtime_mvc/library/pear/PEAR/Command/Build.php
deleted file mode 100644
index 2f38c5bf3..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Build.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * PEAR_Command_Auth (build command)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Build.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for building extensions.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Build extends PEAR_Command_Common
-{
-    var $commands = array(
-        'build' => array(
-            'summary' => 'Build an Extension From C Source',
-            'function' => 'doBuild',
-            'shortcut' => 'b',
-            'options' => array(),
-            'doc' => '[package.xml]
-Builds one or more extensions contained in a package.'
-            ),
-        );
-
-    /**
-     * PEAR_Command_Build constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Build(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function doBuild($command, $options, $params)
-    {
-        require_once 'PEAR/Builder.php';
-        if (sizeof($params) < 1) {
-            $params[0] = 'package.xml';
-        }
-
-        $builder = &new PEAR_Builder($this->ui);
-        $this->debug = $this->config->get('verbose');
-        $err = $builder->build($params[0], array(&$this, 'buildCallback'));
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        return true;
-    }
-
-    function buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Build.xml b/airtime_mvc/library/pear/PEAR/Command/Build.xml
deleted file mode 100644
index ec4e6f554..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<commands version="1.0">
- <build>
-  <summary>Build an Extension From C Source</summary>
-  <function>doBuild</function>
-  <shortcut>b</shortcut>
-  <options />
-  <doc>[package.xml]
-Builds one or more extensions contained in a package.</doc>
- </build>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Channels.php b/airtime_mvc/library/pear/PEAR/Command/Channels.php
deleted file mode 100644
index b0cc2e807..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Channels.php
+++ /dev/null
@@ -1,883 +0,0 @@
-<?php
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
- * PEAR_Command_Channels (list-channels, update-channels, channel-delete, channel-add,
- * channel-update, channel-info, channel-alias, channel-discover commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Channels.php 287561 2009-08-21 22:42:58Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-define('PEAR_COMMAND_CHANNELS_CHANNEL_EXISTS', -500);
-
-/**
- * PEAR commands for managing channels.
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Command_Channels extends PEAR_Command_Common
-{
-    var $commands = array(
-        'list-channels' => array(
-            'summary' => 'List Available Channels',
-            'function' => 'doList',
-            'shortcut' => 'lc',
-            'options' => array(),
-            'doc' => '
-List all available channels for installation.
-',
-            ),
-        'update-channels' => array(
-            'summary' => 'Update the Channel List',
-            'function' => 'doUpdateAll',
-            'shortcut' => 'uc',
-            'options' => array(),
-            'doc' => '
-List all installed packages in all channels.
-'
-            ),
-        'channel-delete' => array(
-            'summary' => 'Remove a Channel From the List',
-            'function' => 'doDelete',
-            'shortcut' => 'cde',
-            'options' => array(),
-            'doc' => '<channel name>
-Delete a channel from the registry.  You may not
-remove any channel that has installed packages.
-'
-            ),
-        'channel-add' => array(
-            'summary' => 'Add a Channel',
-            'function' => 'doAdd',
-            'shortcut' => 'ca',
-            'options' => array(),
-            'doc' => '<channel.xml>
-Add a private channel to the channel list.  Note that all
-public channels should be synced using "update-channels".
-Parameter may be either a local file or remote URL to a
-channel.xml.
-'
-            ),
-        'channel-update' => array(
-            'summary' => 'Update an Existing Channel',
-            'function' => 'doUpdate',
-            'shortcut' => 'cu',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'will force download of new channel.xml if an existing channel name is used',
-                    ),
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'arg' => 'CHANNEL',
-                    'doc' => 'will force download of new channel.xml if an existing channel name is used',
-                    ),
-),
-            'doc' => '[<channel.xml>|<channel name>]
-Update a channel in the channel list directly.  Note that all
-public channels can be synced using "update-channels".
-Parameter may be a local or remote channel.xml, or the name of
-an existing channel.
-'
-            ),
-        'channel-info' => array(
-            'summary' => 'Retrieve Information on a Channel',
-            'function' => 'doInfo',
-            'shortcut' => 'ci',
-            'options' => array(),
-            'doc' => '<package>
-List the files in an installed package.
-'
-            ),
-        'channel-alias' => array(
-            'summary' => 'Specify an alias to a channel name',
-            'function' => 'doAlias',
-            'shortcut' => 'cha',
-            'options' => array(),
-            'doc' => '<channel> <alias>
-Specify a specific alias to use for a channel name.
-The alias may not be an existing channel name or
-alias.
-'
-            ),
-        'channel-discover' => array(
-            'summary' => 'Initialize a Channel from its server',
-            'function' => 'doDiscover',
-            'shortcut' => 'di',
-            'options' => array(),
-            'doc' => '[<channel.xml>|<channel name>]
-Initialize a channel from its server and create a local channel.xml.
-If <channel name> is in the format "<username>:<password>@<channel>" then
-<username> and <password> will be set as the login username/password for
-<channel>. Use caution when passing the username/password in this way, as
-it may allow other users on your computer to briefly view your username/
-password via the system\'s process list.
-'
-            ),
-        'channel-login' => array(
-            'summary' => 'Connects and authenticates to remote channel server',
-            'shortcut' => 'cli',
-            'function' => 'doLogin',
-            'options' => array(),
-            'doc' => '<channel name>
-Log in to a remote channel server.  If <channel name> is not supplied,
-the default channel is used. To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.',
-            ),
-        'channel-logout' => array(
-            'summary' => 'Logs out from the remote channel server',
-            'shortcut' => 'clo',
-            'function' => 'doLogout',
-            'options' => array(),
-            'doc' => '<channel name>
-Logs out from a remote channel server.  If <channel name> is not supplied,
-the default channel is used. This command does not actually connect to the
-remote server, it only deletes the stored username and password from your user
-configuration.',
-            ),
-        );
-
-    /**
-     * PEAR_Command_Registry constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Channels(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function _sortChannels($a, $b)
-    {
-        return strnatcasecmp($a->getName(), $b->getName());
-    }
-
-    function doList($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $registered = $reg->getChannels();
-        usort($registered, array(&$this, '_sortchannels'));
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Registered Channels:',
-            'border' => true,
-            'headline' => array('Channel', 'Alias', 'Summary')
-            );
-        foreach ($registered as $channel) {
-            $data['data'][] = array($channel->getName(),
-                                    $channel->getAlias(),
-                                    $channel->getSummary());
-        }
-
-        if (count($registered) === 0) {
-            $data = '(no registered channels)';
-        }
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    function doUpdateAll($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $channels = $reg->getChannels();
-
-        $success = true;
-        foreach ($channels as $channel) {
-            if ($channel->getName() != '__uri') {
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $err = $this->doUpdate('channel-update',
-                                          $options,
-                                          array($channel->getName()));
-                if (PEAR::isError($err)) {
-                    $this->ui->outputData($err->getMessage(), $command);
-                    $success = false;
-                } else {
-                    $success &= $err;
-                }
-            }
-        }
-        return $success;
-    }
-
-    function doInfo($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError("No channel specified");
-        }
-
-        $reg     = &$this->config->getRegistry();
-        $channel = strtolower($params[0]);
-        if ($reg->channelExists($channel)) {
-            $chan = $reg->getChannel($channel);
-            if (PEAR::isError($chan)) {
-                return $this->raiseError($chan);
-            }
-        } else {
-            if (strpos($channel, '://')) {
-                $downloader = &$this->getDownloader();
-                $tmpdir = $this->config->get('temp_dir');
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $loc = $downloader->downloadHttp($channel, $this->ui, $tmpdir);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($loc)) {
-                    return $this->raiseError('Cannot open "' . $channel .
-                        '" (' . $loc->getMessage() . ')');
-                } else {
-                    $contents = implode('', file($loc));
-                }
-            } else {
-                if (!file_exists($params[0])) {
-                    return $this->raiseError('Unknown channel "' . $channel . '"');
-                }
-
-                $fp = fopen($params[0], 'r');
-                if (!$fp) {
-                    return $this->raiseError('Cannot open "' . $params[0] . '"');
-                }
-
-                $contents = '';
-                while (!feof($fp)) {
-                    $contents .= fread($fp, 1024);
-                }
-                fclose($fp);
-            }
-
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $chan = new PEAR_ChannelFile;
-            $chan->fromXmlString($contents);
-            $chan->validate();
-            if ($errs = $chan->getErrors(true)) {
-                foreach ($errs as $err) {
-                    $this->ui->outputData($err['level'] . ': ' . $err['message']);
-                }
-                return $this->raiseError('Channel file "' . $params[0] . '" is not valid');
-            }
-        }
-
-        if (!$chan) {
-            return $this->raiseError('Serious error: Channel "' . $params[0] .
-                '" has a corrupted registry entry');
-        }
-
-        $channel = $chan->getName();
-        $caption = 'Channel ' . $channel . ' Information:';
-        $data1 = array(
-            'caption' => $caption,
-            'border' => true);
-        $data1['data']['server'] = array('Name and Server', $chan->getName());
-        if ($chan->getAlias() != $chan->getName()) {
-            $data1['data']['alias'] = array('Alias', $chan->getAlias());
-        }
-
-        $data1['data']['summary'] = array('Summary', $chan->getSummary());
-        $validate = $chan->getValidationPackage();
-        $data1['data']['vpackage'] = array('Validation Package Name', $validate['_content']);
-        $data1['data']['vpackageversion'] =
-            array('Validation Package Version', $validate['attribs']['version']);
-        $d = array();
-        $d['main'] = $data1;
-
-        $data['data'] = array();
-        $data['caption'] = 'Server Capabilities';
-        $data['headline'] = array('Type', 'Version/REST type', 'Function Name/REST base');
-        if ($chan->supportsREST()) {
-            if ($chan->supportsREST()) {
-                $funcs = $chan->getFunctions('rest');
-                if (!isset($funcs[0])) {
-                    $funcs = array($funcs);
-                }
-                foreach ($funcs as $protocol) {
-                    $data['data'][] = array('rest', $protocol['attribs']['type'],
-                        $protocol['_content']);
-                }
-            }
-        } else {
-            $data['data'][] = array('No supported protocols');
-        }
-
-        $d['protocols'] = $data;
-        $data['data'] = array();
-        $mirrors = $chan->getMirrors();
-        if ($mirrors) {
-            $data['caption'] = 'Channel ' . $channel . ' Mirrors:';
-            unset($data['headline']);
-            foreach ($mirrors as $mirror) {
-                $data['data'][] = array($mirror['attribs']['host']);
-                $d['mirrors'] = $data;
-            }
-
-            foreach ($mirrors as $i => $mirror) {
-                $data['data'] = array();
-                $data['caption'] = 'Mirror ' . $mirror['attribs']['host'] . ' Capabilities';
-                $data['headline'] = array('Type', 'Version/REST type', 'Function Name/REST base');
-                if ($chan->supportsREST($mirror['attribs']['host'])) {
-                    if ($chan->supportsREST($mirror['attribs']['host'])) {
-                        $funcs = $chan->getFunctions('rest', $mirror['attribs']['host']);
-                        if (!isset($funcs[0])) {
-                            $funcs = array($funcs);
-                        }
-
-                        foreach ($funcs as $protocol) {
-                            $data['data'][] = array('rest', $protocol['attribs']['type'],
-                                $protocol['_content']);
-                        }
-                    }
-                } else {
-                    $data['data'][] = array('No supported protocols');
-                }
-                $d['mirrorprotocols' . $i] = $data;
-            }
-        }
-        $this->ui->outputData($d, 'channel-info');
-    }
-
-    // }}}
-
-    function doDelete($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError('channel-delete: no channel specified');
-        }
-
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($params[0])) {
-            return $this->raiseError('channel-delete: channel "' . $params[0] . '" does not exist');
-        }
-
-        $channel = $reg->channelName($params[0]);
-        if ($channel == 'pear.php.net') {
-            return $this->raiseError('Cannot delete the pear.php.net channel');
-        }
-
-        if ($channel == 'pecl.php.net') {
-            return $this->raiseError('Cannot delete the pecl.php.net channel');
-        }
-
-        if ($channel == 'doc.php.net') {
-            return $this->raiseError('Cannot delete the doc.php.net channel');
-        }
-
-        if ($channel == '__uri') {
-            return $this->raiseError('Cannot delete the __uri pseudo-channel');
-        }
-
-        if (PEAR::isError($err = $reg->listPackages($channel))) {
-            return $err;
-        }
-
-        if (count($err)) {
-            return $this->raiseError('Channel "' . $channel .
-                '" has installed packages, cannot delete');
-        }
-
-        if (!$reg->deleteChannel($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" deletion failed');
-        } else {
-            $this->config->deleteChannel($channel);
-            $this->ui->outputData('Channel "' . $channel . '" deleted', $command);
-        }
-    }
-
-    function doAdd($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError('channel-add: no channel file specified');
-        }
-
-        if (strpos($params[0], '://')) {
-            $downloader = &$this->getDownloader();
-            $tmpdir = $this->config->get('temp_dir');
-            if (!file_exists($tmpdir)) {
-                require_once 'System.php';
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $err = System::mkdir(array('-p', $tmpdir));
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($err)) {
-                    return $this->raiseError('channel-add: temp_dir does not exist: "' .
-                        $tmpdir .
-                        '" - You can change this location with "pear config-set temp_dir"');
-                }
-            }
-
-            if (!is_writable($tmpdir)) {
-                return $this->raiseError('channel-add: temp_dir is not writable: "' .
-                    $tmpdir .
-                    '" - You can change this location with "pear config-set temp_dir"');
-            }
-
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $loc = $downloader->downloadHttp($params[0], $this->ui, $tmpdir, null, false);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($loc)) {
-                return $this->raiseError('channel-add: Cannot open "' . $params[0] .
-                    '" (' . $loc->getMessage() . ')');
-            }
-
-            list($loc, $lastmodified) = $loc;
-            $contents = implode('', file($loc));
-        } else {
-            $lastmodified = $fp = false;
-            if (file_exists($params[0])) {
-                $fp = fopen($params[0], 'r');
-            }
-
-            if (!$fp) {
-                return $this->raiseError('channel-add: cannot open "' . $params[0] . '"');
-            }
-
-            $contents = '';
-            while (!feof($fp)) {
-                $contents .= fread($fp, 1024);
-            }
-            fclose($fp);
-        }
-
-        if (!class_exists('PEAR_ChannelFile')) {
-            require_once 'PEAR/ChannelFile.php';
-        }
-
-        $channel = new PEAR_ChannelFile;
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $result = $channel->fromXmlString($contents);
-        PEAR::staticPopErrorHandling();
-        if (!$result) {
-            $exit = false;
-            if (count($errors = $channel->getErrors(true))) {
-                foreach ($errors as $error) {
-                    $this->ui->outputData(ucfirst($error['level'] . ': ' . $error['message']));
-                    if (!$exit) {
-                        $exit = $error['level'] == 'error' ? true : false;
-                    }
-                }
-                if ($exit) {
-                    return $this->raiseError('channel-add: invalid channel.xml file');
-                }
-            }
-        }
-
-        $reg = &$this->config->getRegistry();
-        if ($reg->channelExists($channel->getName())) {
-            return $this->raiseError('channel-add: Channel "' . $channel->getName() .
-                '" exists, use channel-update to update entry', PEAR_COMMAND_CHANNELS_CHANNEL_EXISTS);
-        }
-
-        $ret = $reg->addChannel($channel, $lastmodified);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-
-        if (!$ret) {
-            return $this->raiseError('channel-add: adding Channel "' . $channel->getName() .
-                '" to registry failed');
-        }
-
-        $this->config->setChannels($reg->listChannels());
-        $this->config->writeConfigFile();
-        $this->ui->outputData('Adding Channel "' . $channel->getName() . '" succeeded', $command);
-    }
-
-    function doUpdate($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError("No channel file specified");
-        }
-
-        $tmpdir = $this->config->get('temp_dir');
-        if (!file_exists($tmpdir)) {
-            require_once 'System.php';
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $err = System::mkdir(array('-p', $tmpdir));
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($err)) {
-                return $this->raiseError('channel-add: temp_dir does not exist: "' .
-                    $tmpdir .
-                    '" - You can change this location with "pear config-set temp_dir"');
-            }
-        }
-
-        if (!is_writable($tmpdir)) {
-            return $this->raiseError('channel-add: temp_dir is not writable: "' .
-                $tmpdir .
-                '" - You can change this location with "pear config-set temp_dir"');
-        }
-
-        $reg = &$this->config->getRegistry();
-        $lastmodified = false;
-        if ((!file_exists($params[0]) || is_dir($params[0]))
-              && $reg->channelExists(strtolower($params[0]))) {
-            $c = $reg->getChannel(strtolower($params[0]));
-            if (PEAR::isError($c)) {
-                return $this->raiseError($c);
-            }
-
-            $this->ui->outputData("Updating channel \"$params[0]\"", $command);
-            $dl = &$this->getDownloader(array());
-            // if force is specified, use a timestamp of "1" to force retrieval
-            $lastmodified = isset($options['force']) ? false : $c->lastModified();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $contents = $dl->downloadHttp('http://' . $c->getName() . '/channel.xml',
-                $this->ui, $tmpdir, null, $lastmodified);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($contents)) {
-                // Attempt to fall back to https
-                $this->ui->outputData("Channel \"$params[0]\" is not responding over http://, failed with message: " . $contents->getMessage());
-                $this->ui->outputData("Trying channel \"$params[0]\" over https:// instead");
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $contents = $dl->downloadHttp('https://' . $c->getName() . '/channel.xml',
-                    $this->ui, $tmpdir, null, $lastmodified);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($contents)) {
-                    return $this->raiseError('Cannot retrieve channel.xml for channel "' .
-                        $c->getName() . '" (' . $contents->getMessage() . ')');
-                }
-            }
-
-            list($contents, $lastmodified) = $contents;
-            if (!$contents) {
-                $this->ui->outputData("Channel \"$params[0]\" is up to date");
-                return;
-            }
-
-            $contents = implode('', file($contents));
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $channel = new PEAR_ChannelFile;
-            $channel->fromXmlString($contents);
-            if (!$channel->getErrors()) {
-                // security check: is the downloaded file for the channel we got it from?
-                if (strtolower($channel->getName()) != strtolower($c->getName())) {
-                    if (!isset($options['force'])) {
-                        return $this->raiseError('ERROR: downloaded channel definition file' .
-                            ' for channel "' . $channel->getName() . '" from channel "' .
-                            strtolower($c->getName()) . '"');
-                    }
-
-                    $this->ui->log(0, 'WARNING: downloaded channel definition file' .
-                        ' for channel "' . $channel->getName() . '" from channel "' .
-                        strtolower($c->getName()) . '"');
-                }
-            }
-        } else {
-            if (strpos($params[0], '://')) {
-                $dl = &$this->getDownloader();
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $loc = $dl->downloadHttp($params[0],
-                    $this->ui, $tmpdir, null, $lastmodified);
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($loc)) {
-                    return $this->raiseError("Cannot open " . $params[0] .
-                         ' (' . $loc->getMessage() . ')');
-                }
-
-                list($loc, $lastmodified) = $loc;
-                $contents = implode('', file($loc));
-            } else {
-                $fp = false;
-                if (file_exists($params[0])) {
-                    $fp = fopen($params[0], 'r');
-                }
-
-                if (!$fp) {
-                    return $this->raiseError("Cannot open " . $params[0]);
-                }
-
-                $contents = '';
-                while (!feof($fp)) {
-                    $contents .= fread($fp, 1024);
-                }
-                fclose($fp);
-            }
-
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $channel = new PEAR_ChannelFile;
-            $channel->fromXmlString($contents);
-        }
-
-        $exit = false;
-        if (count($errors = $channel->getErrors(true))) {
-            foreach ($errors as $error) {
-                $this->ui->outputData(ucfirst($error['level'] . ': ' . $error['message']));
-                if (!$exit) {
-                    $exit = $error['level'] == 'error' ? true : false;
-                }
-            }
-            if ($exit) {
-                return $this->raiseError('Invalid channel.xml file');
-            }
-        }
-
-        if (!$reg->channelExists($channel->getName())) {
-            return $this->raiseError('Error: Channel "' . $channel->getName() .
-                '" does not exist, use channel-add to add an entry');
-        }
-
-        $ret = $reg->updateChannel($channel, $lastmodified);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-
-        if (!$ret) {
-            return $this->raiseError('Updating Channel "' . $channel->getName() .
-                '" in registry failed');
-        }
-
-        $this->config->setChannels($reg->listChannels());
-        $this->config->writeConfigFile();
-        $this->ui->outputData('Update of Channel "' . $channel->getName() . '" succeeded');
-    }
-
-    function &getDownloader()
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = new PEAR_Downloader($this->ui, array(), $this->config);
-        return $a;
-    }
-
-    function doAlias($command, $options, $params)
-    {
-        if (count($params) === 1) {
-            return $this->raiseError('No channel alias specified');
-        }
-
-        if (count($params) !== 2 || (!empty($params[1]) && $params[1]{0} == '-')) {
-            return $this->raiseError(
-                'Invalid format, correct is: channel-alias channel alias');
-        }
-
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($params[0], true)) {
-            $extra = '';
-            if ($reg->isAlias($params[0])) {
-                $extra = ' (use "channel-alias ' . $reg->channelName($params[0]) . ' ' .
-                    strtolower($params[1]) . '")';
-            }
-
-            return $this->raiseError('"' . $params[0] . '" is not a valid channel' . $extra);
-        }
-
-        if ($reg->isAlias($params[1])) {
-            return $this->raiseError('Channel "' . $reg->channelName($params[1]) . '" is ' .
-                'already aliased to "' . strtolower($params[1]) . '", cannot re-alias');
-        }
-
-        $chan = &$reg->getChannel($params[0]);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError('Corrupt registry?  Error retrieving channel "' . $params[0] .
-                '" information (' . $chan->getMessage() . ')');
-        }
-
-        // make it a local alias
-        if (!$chan->setAlias(strtolower($params[1]), true)) {
-            return $this->raiseError('Alias "' . strtolower($params[1]) .
-                '" is not a valid channel alias');
-        }
-
-        $reg->updateChannel($chan);
-        $this->ui->outputData('Channel "' . $chan->getName() . '" aliased successfully to "' .
-            strtolower($params[1]) . '"');
-    }
-
-    /**
-     * The channel-discover command
-     *
-     * @param string $command command name
-     * @param array  $options option_name => value
-     * @param array  $params  list of additional parameters.
-     *               $params[0] should contain a string with either:
-     *               - <channel name> or
-     *               - <username>:<password>@<channel name>
-     * @return null|PEAR_Error
-     */
-    function doDiscover($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError("No channel server specified");
-        }
-
-        // Look for the possible input format "<username>:<password>@<channel>"
-        if (preg_match('/^(.+):(.+)@(.+)\\z/', $params[0], $matches)) {
-            $username = $matches[1];
-            $password = $matches[2];
-            $channel  = $matches[3];
-        } else {
-            $channel = $params[0];
-        }
-
-        $reg = &$this->config->getRegistry();
-        if ($reg->channelExists($channel)) {
-            if (!$reg->isAlias($channel)) {
-                return $this->raiseError("Channel \"$channel\" is already initialized", PEAR_COMMAND_CHANNELS_CHANNEL_EXISTS);
-            }
-
-            return $this->raiseError("A channel alias named \"$channel\" " .
-                'already exists, aliasing channel "' . $reg->channelName($channel)
-                . '"');
-        }
-
-        $this->pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->doAdd($command, $options, array('http://' . $channel . '/channel.xml'));
-        $this->popErrorHandling();
-        if (PEAR::isError($err)) {
-            if ($err->getCode() === PEAR_COMMAND_CHANNELS_CHANNEL_EXISTS) {
-                return $this->raiseError("Discovery of channel \"$channel\" failed (" .
-                    $err->getMessage() . ')');
-            }
-            // Attempt fetch via https
-            $this->ui->outputData("Discovering channel $channel over http:// failed with message: " . $err->getMessage());
-            $this->ui->outputData("Trying to discover channel $channel over https:// instead");
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $this->doAdd($command, $options, array('https://' . $channel . '/channel.xml'));
-            $this->popErrorHandling();
-            if (PEAR::isError($err)) {
-                return $this->raiseError("Discovery of channel \"$channel\" failed (" .
-                    $err->getMessage() . ')');
-            }
-        }
-
-        // Store username/password if they were given
-        // Arguably we should do a logintest on the channel here, but since
-        // that's awkward on a REST-based channel (even "pear login" doesn't
-        // do it for those), and XML-RPC is deprecated, it's fairly pointless.
-        if (isset($username)) {
-            $this->config->set('username', $username, 'user', $channel);
-            $this->config->set('password', $password, 'user', $channel);
-            $this->config->store();
-            $this->ui->outputData("Stored login for channel \"$channel\" using username \"$username\"", $command);
-        }
-
-        $this->ui->outputData("Discovery of channel \"$channel\" succeeded", $command);
-    }
-
-    /**
-     * Execute the 'login' command.
-     *
-     * @param string $command command name
-     * @param array $options option_name => value
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogin($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-
-        // If a parameter is supplied, use that as the channel to log in to
-        $channel = isset($params[0]) ? $params[0] : $this->config->get('default_channel');
-
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-
-        $server   = $this->config->get('preferred_mirror', null, $channel);
-        $username = $this->config->get('username',         null, $channel);
-        if (empty($username)) {
-            $username = isset($_ENV['USER']) ? $_ENV['USER'] : null;
-        }
-        $this->ui->outputData("Logging in to $server.", $command);
-
-        list($username, $password) = $this->ui->userDialog(
-            $command,
-            array('Username', 'Password'),
-            array('text',     'password'),
-            array($username,  '')
-            );
-        $username = trim($username);
-        $password = trim($password);
-
-        $ourfile = $this->config->getConfFile('user');
-        if (!$ourfile) {
-            $ourfile = $this->config->getConfFile('system');
-        }
-
-        $this->config->set('username', $username, 'user', $channel);
-        $this->config->set('password', $password, 'user', $channel);
-
-        if ($chan->supportsREST()) {
-            $ok = true;
-        }
-
-        if ($ok !== true) {
-            return $this->raiseError('Login failed!');
-        }
-
-        $this->ui->outputData("Logged in.", $command);
-        // avoid changing any temporary settings changed with -d
-        $ourconfig = new PEAR_Config($ourfile, $ourfile);
-        $ourconfig->set('username', $username, 'user', $channel);
-        $ourconfig->set('password', $password, 'user', $channel);
-        $ourconfig->store();
-
-        return true;
-    }
-
-    /**
-     * Execute the 'logout' command.
-     *
-     * @param string $command command name
-     * @param array $options option_name => value
-     * @param array $params list of additional parameters
-     *
-     * @return bool TRUE on success or
-     * a PEAR error on failure
-     *
-     * @access public
-     */
-    function doLogout($command, $options, $params)
-    {
-        $reg     = &$this->config->getRegistry();
-
-        // If a parameter is supplied, use that as the channel to log in to
-        $channel = isset($params[0]) ? $params[0] : $this->config->get('default_channel');
-
-        $chan    = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-
-        $server = $this->config->get('preferred_mirror', null, $channel);
-        $this->ui->outputData("Logging out from $server.", $command);
-        $this->config->remove('username', 'user', $channel);
-        $this->config->remove('password', 'user', $channel);
-        $this->config->store();
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Channels.xml b/airtime_mvc/library/pear/PEAR/Command/Channels.xml
deleted file mode 100644
index 47b72066a..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Channels.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<commands version="1.0">
- <list-channels>
-  <summary>List Available Channels</summary>
-  <function>doList</function>
-  <shortcut>lc</shortcut>
-  <options />
-  <doc>
-List all available channels for installation.
-</doc>
- </list-channels>
- <update-channels>
-  <summary>Update the Channel List</summary>
-  <function>doUpdateAll</function>
-  <shortcut>uc</shortcut>
-  <options />
-  <doc>
-List all installed packages in all channels.
-</doc>
- </update-channels>
- <channel-delete>
-  <summary>Remove a Channel From the List</summary>
-  <function>doDelete</function>
-  <shortcut>cde</shortcut>
-  <options />
-  <doc>&lt;channel name&gt;
-Delete a channel from the registry.  You may not
-remove any channel that has installed packages.
-</doc>
- </channel-delete>
- <channel-add>
-  <summary>Add a Channel</summary>
-  <function>doAdd</function>
-  <shortcut>ca</shortcut>
-  <options />
-  <doc>&lt;channel.xml&gt;
-Add a private channel to the channel list.  Note that all
-public channels should be synced using &quot;update-channels&quot;.
-Parameter may be either a local file or remote URL to a
-channel.xml.
-</doc>
- </channel-add>
- <channel-update>
-  <summary>Update an Existing Channel</summary>
-  <function>doUpdate</function>
-  <shortcut>cu</shortcut>
-  <options>
-   <force>
-    <shortopt>f</shortopt>
-    <doc>will force download of new channel.xml if an existing channel name is used</doc>
-   </force>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>will force download of new channel.xml if an existing channel name is used</doc>
-    <arg>CHANNEL</arg>
-   </channel>
-  </options>
-  <doc>[&lt;channel.xml&gt;|&lt;channel name&gt;]
-Update a channel in the channel list directly.  Note that all
-public channels can be synced using &quot;update-channels&quot;.
-Parameter may be a local or remote channel.xml, or the name of
-an existing channel.
-</doc>
- </channel-update>
- <channel-info>
-  <summary>Retrieve Information on a Channel</summary>
-  <function>doInfo</function>
-  <shortcut>ci</shortcut>
-  <options />
-  <doc>&lt;package&gt;
-List the files in an installed package.
-</doc>
- </channel-info>
- <channel-alias>
-  <summary>Specify an alias to a channel name</summary>
-  <function>doAlias</function>
-  <shortcut>cha</shortcut>
-  <options />
-  <doc>&lt;channel&gt; &lt;alias&gt;
-Specify a specific alias to use for a channel name.
-The alias may not be an existing channel name or
-alias.
-</doc>
- </channel-alias>
- <channel-discover>
-  <summary>Initialize a Channel from its server</summary>
-  <function>doDiscover</function>
-  <shortcut>di</shortcut>
-  <options />
-  <doc>[&lt;channel.xml&gt;|&lt;channel name&gt;]
-Initialize a channel from its server and create a local channel.xml.
-If &lt;channel name&gt; is in the format &quot;&lt;username&gt;:&lt;password&gt;@&lt;channel&gt;&quot; then
-&lt;username&gt; and &lt;password&gt; will be set as the login username/password for
-&lt;channel&gt;. Use caution when passing the username/password in this way, as
-it may allow other users on your computer to briefly view your username/
-password via the system&#039;s process list.
-</doc>
- </channel-discover>
- <channel-login>
-  <summary>Connects and authenticates to remote channel server</summary>
-  <function>doLogin</function>
-  <shortcut>cli</shortcut>
-  <options />
-  <doc>&lt;channel name&gt;
-Log in to a remote channel server.  If &lt;channel name&gt; is not supplied,
-the default channel is used. To use remote functions in the installer
-that require any kind of privileges, you need to log in first.  The
-username and password you enter here will be stored in your per-user
-PEAR configuration (~/.pearrc on Unix-like systems).  After logging
-in, your username and password will be sent along in subsequent
-operations on the remote server.</doc>
- </channel-login>
- <channel-logout>
-  <summary>Logs out from the remote channel server</summary>
-  <function>doLogout</function>
-  <shortcut>clo</shortcut>
-  <options />
-  <doc>&lt;channel name&gt;
-Logs out from a remote channel server.  If &lt;channel name&gt; is not supplied,
-the default channel is used. This command does not actually connect to the
-remote server, it only deletes the stored username and password from your user
-configuration.</doc>
- </channel-logout>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Common.php b/airtime_mvc/library/pear/PEAR/Command/Common.php
deleted file mode 100644
index 1c3911fcf..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Common.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
- * PEAR_Command_Common base class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR.php';
-
-/**
- * PEAR commands base class
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Common extends PEAR
-{
-    /**
-     * PEAR_Config object used to pass user system and configuration
-     * on when executing commands
-     *
-     * @var PEAR_Config
-     */
-    var $config;
-    /**
-     * @var PEAR_Registry
-     * @access protected
-     */
-    var $_registry;
-
-    /**
-     * User Interface object, for all interaction with the user.
-     * @var object
-     */
-    var $ui;
-
-    var $_deps_rel_trans = array(
-                                 'lt' => '<',
-                                 'le' => '<=',
-                                 'eq' => '=',
-                                 'ne' => '!=',
-                                 'gt' => '>',
-                                 'ge' => '>=',
-                                 'has' => '=='
-                                 );
-
-    var $_deps_type_trans = array(
-                                  'pkg' => 'package',
-                                  'ext' => 'extension',
-                                  'php' => 'PHP',
-                                  'prog' => 'external program',
-                                  'ldlib' => 'external library for linking',
-                                  'rtlib' => 'external runtime library',
-                                  'os' => 'operating system',
-                                  'websrv' => 'web server',
-                                  'sapi' => 'SAPI backend'
-                                  );
-
-    /**
-     * PEAR_Command_Common constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Common(&$ui, &$config)
-    {
-        parent::PEAR();
-        $this->config = &$config;
-        $this->ui = &$ui;
-    }
-
-    /**
-     * Return a list of all the commands defined by this class.
-     * @return array list of commands
-     * @access public
-     */
-    function getCommands()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            $ret[$command] = $this->commands[$command]['summary'];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return a list of all the command shortcuts defined by this class.
-     * @return array shortcut => command
-     * @access public
-     */
-    function getShortcuts()
-    {
-        $ret = array();
-        foreach (array_keys($this->commands) as $command) {
-            if (isset($this->commands[$command]['shortcut'])) {
-                $ret[$this->commands[$command]['shortcut']] = $command;
-            }
-        }
-
-        return $ret;
-    }
-
-    function getOptions($command)
-    {
-        $shortcuts = $this->getShortcuts();
-        if (isset($shortcuts[$command])) {
-            $command = $shortcuts[$command];
-        }
-
-        if (isset($this->commands[$command]) &&
-              isset($this->commands[$command]['options'])) {
-            return $this->commands[$command]['options'];
-        }
-
-        return null;
-    }
-
-    function getGetoptArgs($command, &$short_args, &$long_args)
-    {
-        $short_args = '';
-        $long_args = array();
-        if (empty($this->commands[$command]) || empty($this->commands[$command]['options'])) {
-            return;
-        }
-
-        reset($this->commands[$command]['options']);
-        while (list($option, $info) = each($this->commands[$command]['options'])) {
-            $larg = $sarg = '';
-            if (isset($info['arg'])) {
-                if ($info['arg']{0} == '(') {
-                    $larg = '==';
-                    $sarg = '::';
-                    $arg = substr($info['arg'], 1, -1);
-                } else {
-                    $larg = '=';
-                    $sarg = ':';
-                    $arg = $info['arg'];
-                }
-            }
-
-            if (isset($info['shortopt'])) {
-                $short_args .= $info['shortopt'] . $sarg;
-            }
-
-            $long_args[] = $option . $larg;
-        }
-    }
-
-    /**
-    * Returns the help message for the given command
-    *
-    * @param string $command The command
-    * @return mixed A fail string if the command does not have help or
-    *               a two elements array containing [0]=>help string,
-    *               [1]=> help string for the accepted cmd args
-    */
-    function getHelp($command)
-    {
-        $config = &PEAR_Config::singleton();
-        if (!isset($this->commands[$command])) {
-            return "No such command \"$command\"";
-        }
-
-        $help = null;
-        if (isset($this->commands[$command]['doc'])) {
-            $help = $this->commands[$command]['doc'];
-        }
-
-        if (empty($help)) {
-            // XXX (cox) Fallback to summary if there is no doc (show both?)
-            if (!isset($this->commands[$command]['summary'])) {
-                return "No help for command \"$command\"";
-            }
-            $help = $this->commands[$command]['summary'];
-        }
-
-        if (preg_match_all('/{config\s+([^\}]+)}/e', $help, $matches)) {
-            foreach($matches[0] as $k => $v) {
-                $help = preg_replace("/$v/", $config->get($matches[1][$k]), $help);
-            }
-        }
-
-        return array($help, $this->getHelpArgs($command));
-    }
-
-    /**
-     * Returns the help for the accepted arguments of a command
-     *
-     * @param  string $command
-     * @return string The help string
-     */
-    function getHelpArgs($command)
-    {
-        if (isset($this->commands[$command]['options']) &&
-            count($this->commands[$command]['options']))
-        {
-            $help = "Options:\n";
-            foreach ($this->commands[$command]['options'] as $k => $v) {
-                if (isset($v['arg'])) {
-                    if ($v['arg'][0] == '(') {
-                        $arg = substr($v['arg'], 1, -1);
-                        $sapp = " [$arg]";
-                        $lapp = "[=$arg]";
-                    } else {
-                        $sapp = " $v[arg]";
-                        $lapp = "=$v[arg]";
-                    }
-                } else {
-                    $sapp = $lapp = "";
-                }
-
-                if (isset($v['shortopt'])) {
-                    $s = $v['shortopt'];
-                    $help .= "  -$s$sapp, --$k$lapp\n";
-                } else {
-                    $help .= "  --$k$lapp\n";
-                }
-
-                $p = "        ";
-                $doc = rtrim(str_replace("\n", "\n$p", $v['doc']));
-                $help .= "        $doc\n";
-            }
-
-            return $help;
-        }
-
-        return null;
-    }
-
-    function run($command, $options, $params)
-    {
-        if (empty($this->commands[$command]['function'])) {
-            // look for shortcuts
-            foreach (array_keys($this->commands) as $cmd) {
-                if (isset($this->commands[$cmd]['shortcut']) && $this->commands[$cmd]['shortcut'] == $command) {
-                    if (empty($this->commands[$cmd]['function'])) {
-                        return $this->raiseError("unknown command `$command'");
-                    } else {
-                        $func = $this->commands[$cmd]['function'];
-                    }
-                    $command = $cmd;
-
-                    //$command = $this->commands[$cmd]['function'];
-                    break;
-                }
-            }
-        } else {
-            $func = $this->commands[$command]['function'];
-        }
-
-        return $this->$func($command, $options, $params);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Config.php b/airtime_mvc/library/pear/PEAR/Command/Config.php
deleted file mode 100644
index 28d7ccc2a..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Config.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-/**
- * PEAR_Command_Config (config-show, config-get, config-set, config-help, config-create commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Config.php 287554 2009-08-21 21:16:25Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for managing configuration data.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Config extends PEAR_Command_Common
-{
-    var $commands = array(
-        'config-show' => array(
-            'summary' => 'Show All Settings',
-            'function' => 'doConfigShow',
-            'shortcut' => 'csh',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => '[layer]
-Displays all configuration values.  An optional argument
-may be used to tell which configuration layer to display.  Valid
-configuration layers are "user", "system" and "default". To display
-configurations for different channels, set the default_channel
-configuration variable and run config-show again.
-',
-            ),
-        'config-get' => array(
-            'summary' => 'Show One Setting',
-            'function' => 'doConfigGet',
-            'shortcut' => 'cg',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => '<parameter> [layer]
-Displays the value of one configuration parameter.  The
-first argument is the name of the parameter, an optional second argument
-may be used to tell which configuration layer to look in.  Valid configuration
-layers are "user", "system" and "default".  If no layer is specified, a value
-will be picked from the first layer that defines the parameter, in the order
-just specified.  The configuration value will be retrieved for the channel
-specified by the default_channel configuration variable.
-',
-            ),
-        'config-set' => array(
-            'summary' => 'Change Setting',
-            'function' => 'doConfigSet',
-            'shortcut' => 'cs',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'show configuration variables for another channel',
-                    'arg' => 'CHAN',
-                    ),
-),
-            'doc' => '<parameter> <value> [layer]
-Sets the value of one configuration parameter.  The first argument is
-the name of the parameter, the second argument is the new value.  Some
-parameters are subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional
-third argument may be used to specify in which layer to set the
-configuration parameter.  The default layer is "user".  The
-configuration value will be set for the current channel, which
-is controlled by the default_channel configuration variable.
-',
-            ),
-        'config-help' => array(
-            'summary' => 'Show Information About Setting',
-            'function' => 'doConfigHelp',
-            'shortcut' => 'ch',
-            'options' => array(),
-            'doc' => '[parameter]
-Displays help for a configuration parameter.  Without arguments it
-displays help for all configuration parameters.
-',
-           ),
-        'config-create' => array(
-            'summary' => 'Create a Default configuration file',
-            'function' => 'doConfigCreate',
-            'shortcut' => 'coc',
-            'options' => array(
-                'windows' => array(
-                    'shortopt' => 'w',
-                    'doc' => 'create a config file for a windows install',
-                    ),
-            ),
-            'doc' => '<root path> <filename>
-Create a default configuration file with all directory configuration
-variables set to subdirectories of <root path>, and save it as <filename>.
-This is useful especially for creating a configuration file for a remote
-PEAR installation (using the --remoteconfig option of install, upgrade,
-and uninstall).
-',
-            ),
-        );
-
-    /**
-     * PEAR_Command_Config constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Config(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function doConfigShow($command, $options, $params)
-    {
-        $layer = null;
-        if (is_array($params)) {
-            $layer = isset($params[0]) ? $params[0] : null;
-        }
-
-        // $params[0] -> the layer
-        if ($error = $this->_checkLayer($layer)) {
-            return $this->raiseError("config-show:$error");
-        }
-
-        $keys = $this->config->getKeys();
-        sort($keys);
-        $channel = isset($options['channel']) ? $options['channel'] :
-            $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-
-        $channel = $reg->channelName($channel);
-        $data = array('caption' => 'Configuration (channel ' . $channel . '):');
-        foreach ($keys as $key) {
-            $type = $this->config->getType($key);
-            $value = $this->config->get($key, $layer, $channel);
-            if ($type == 'password' && $value) {
-                $value = '********';
-            }
-
-            if ($value === false) {
-                $value = 'false';
-            } elseif ($value === true) {
-                $value = 'true';
-            }
-
-            $data['data'][$this->config->getGroup($key)][] = array($this->config->getPrompt($key) , $key, $value);
-        }
-
-        foreach ($this->config->getLayers() as $layer) {
-            $data['data']['Config Files'][] = array(ucfirst($layer) . ' Configuration File', 'Filename' , $this->config->getConfFile($layer));
-        }
-
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    function doConfigGet($command, $options, $params)
-    {
-        $args_cnt = is_array($params) ? count($params) : 0;
-        switch ($args_cnt) {
-            case 1:
-                $config_key = $params[0];
-                $layer = null;
-                break;
-            case 2:
-                $config_key = $params[0];
-                $layer = $params[1];
-                if ($error = $this->_checkLayer($layer)) {
-                    return $this->raiseError("config-get:$error");
-                }
-                break;
-            case 0:
-            default:
-                return $this->raiseError("config-get expects 1 or 2 parameters");
-        }
-
-        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-
-        $this->ui->outputData($this->config->get($config_key, $layer, $channel), $command);
-        return true;
-    }
-
-    function doConfigSet($command, $options, $params)
-    {
-        // $param[0] -> a parameter to set
-        // $param[1] -> the value for the parameter
-        // $param[2] -> the layer
-        $failmsg = '';
-        if (count($params) < 2 || count($params) > 3) {
-            $failmsg .= "config-set expects 2 or 3 parameters";
-            return PEAR::raiseError($failmsg);
-        }
-
-        if (isset($params[2]) && ($error = $this->_checkLayer($params[2]))) {
-            $failmsg .= $error;
-            return PEAR::raiseError("config-set:$failmsg");
-        }
-
-        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-
-        $channel = $reg->channelName($channel);
-        if ($params[0] == 'default_channel' && !$reg->channelExists($params[1])) {
-            return $this->raiseError('Channel "' . $params[1] . '" does not exist');
-        }
-
-        if ($params[0] == 'preferred_mirror'
-            && (
-                !$reg->mirrorExists($channel, $params[1]) &&
-                (!$reg->channelExists($params[1]) || $channel != $params[1])
-            )
-        ) {
-            $msg  = 'Channel Mirror "' . $params[1] . '" does not exist';
-            $msg .= ' in your registry for channel "' . $channel . '".';
-            $msg .= "\n" . 'Attempt to run "pear channel-update ' . $channel .'"';
-            $msg .= ' if you believe this mirror should exist as you may';
-            $msg .= ' have outdated channel information.';
-            return $this->raiseError($msg);
-        }
-
-        if (count($params) == 2) {
-            array_push($params, 'user');
-            $layer = 'user';
-        } else {
-            $layer = $params[2];
-        }
-
-        array_push($params, $channel);
-        if (!call_user_func_array(array(&$this->config, 'set'), $params)) {
-            array_pop($params);
-            $failmsg = "config-set (" . implode(", ", $params) . ") failed, channel $channel";
-        } else {
-            $this->config->store($layer);
-        }
-
-        if ($failmsg) {
-            return $this->raiseError($failmsg);
-        }
-
-        $this->ui->outputData('config-set succeeded', $command);
-        return true;
-    }
-
-    function doConfigHelp($command, $options, $params)
-    {
-        if (empty($params)) {
-            $params = $this->config->getKeys();
-        }
-
-        $data['caption']  = "Config help" . ((count($params) == 1) ? " for $params[0]" : '');
-        $data['headline'] = array('Name', 'Type', 'Description');
-        $data['border']   = true;
-        foreach ($params as $name) {
-            $type = $this->config->getType($name);
-            $docs = $this->config->getDocs($name);
-            if ($type == 'set') {
-                $docs = rtrim($docs) . "\nValid set: " .
-                    implode(' ', $this->config->getSetValues($name));
-            }
-
-            $data['data'][] = array($name, $type, $docs);
-        }
-
-        $this->ui->outputData($data, $command);
-    }
-
-    function doConfigCreate($command, $options, $params)
-    {
-        if (count($params) != 2) {
-            return PEAR::raiseError('config-create: must have 2 parameters, root path and ' .
-                'filename to save as');
-        }
-
-        $root = $params[0];
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        $root = preg_replace(array('!\\\\+!', '!/+!', "!$ds2+!"),
-                             array('/', '/', '/'),
-                            $root);
-        if ($root{0} != '/') {
-            if (!isset($options['windows'])) {
-                return PEAR::raiseError('Root directory must be an absolute path beginning ' .
-                    'with "/", was: "' . $root . '"');
-            }
-
-            if (!preg_match('/^[A-Za-z]:/', $root)) {
-                return PEAR::raiseError('Root directory must be an absolute path beginning ' .
-                    'with "\\" or "C:\\", was: "' . $root . '"');
-            }
-        }
-
-        $windows = isset($options['windows']);
-        if ($windows) {
-            $root = str_replace('/', '\\', $root);
-        }
-
-        if (!file_exists($params[1]) && !@touch($params[1])) {
-            return PEAR::raiseError('Could not create "' . $params[1] . '"');
-        }
-
-        $params[1] = realpath($params[1]);
-        $config = &new PEAR_Config($params[1], '#no#system#config#', false, false);
-        if ($root{strlen($root) - 1} == '/') {
-            $root = substr($root, 0, strlen($root) - 1);
-        }
-
-        $config->noRegistry();
-        $config->set('php_dir', $windows ? "$root\\pear\\php" : "$root/pear/php", 'user');
-        $config->set('data_dir', $windows ? "$root\\pear\\data" : "$root/pear/data");
-        $config->set('www_dir', $windows ? "$root\\pear\\www" : "$root/pear/www");
-        $config->set('cfg_dir', $windows ? "$root\\pear\\cfg" : "$root/pear/cfg");
-        $config->set('ext_dir', $windows ? "$root\\pear\\ext" : "$root/pear/ext");
-        $config->set('doc_dir', $windows ? "$root\\pear\\docs" : "$root/pear/docs");
-        $config->set('test_dir', $windows ? "$root\\pear\\tests" : "$root/pear/tests");
-        $config->set('cache_dir', $windows ? "$root\\pear\\cache" : "$root/pear/cache");
-        $config->set('download_dir', $windows ? "$root\\pear\\download" : "$root/pear/download");
-        $config->set('temp_dir', $windows ? "$root\\pear\\temp" : "$root/pear/temp");
-        $config->set('bin_dir', $windows ? "$root\\pear" : "$root/pear");
-        $config->writeConfigFile();
-        $this->_showConfig($config);
-        $this->ui->outputData('Successfully created default configuration file "' . $params[1] . '"',
-            $command);
-    }
-
-    function _showConfig(&$config)
-    {
-        $params = array('user');
-        $keys = $config->getKeys();
-        sort($keys);
-        $channel = 'pear.php.net';
-        $data = array('caption' => 'Configuration (channel ' . $channel . '):');
-        foreach ($keys as $key) {
-            $type = $config->getType($key);
-            $value = $config->get($key, 'user', $channel);
-            if ($type == 'password' && $value) {
-                $value = '********';
-            }
-
-            if ($value === false) {
-                $value = 'false';
-            } elseif ($value === true) {
-                $value = 'true';
-            }
-            $data['data'][$config->getGroup($key)][] =
-                array($config->getPrompt($key) , $key, $value);
-        }
-
-        foreach ($config->getLayers() as $layer) {
-            $data['data']['Config Files'][] =
-                array(ucfirst($layer) . ' Configuration File', 'Filename' ,
-                    $config->getConfFile($layer));
-        }
-
-        $this->ui->outputData($data, 'config-show');
-        return true;
-    }
-
-    /**
-     * Checks if a layer is defined or not
-     *
-     * @param string $layer The layer to search for
-     * @return mixed False on no error or the error message
-     */
-    function _checkLayer($layer = null)
-    {
-        if (!empty($layer) && $layer != 'default') {
-            $layers = $this->config->getLayers();
-            if (!in_array($layer, $layers)) {
-                return " only the layers: \"" . implode('" or "', $layers) . "\" are supported";
-            }
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Config.xml b/airtime_mvc/library/pear/PEAR/Command/Config.xml
deleted file mode 100644
index f64a925f5..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Config.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<commands version="1.0">
- <config-show>
-  <summary>Show All Settings</summary>
-  <function>doConfigShow</function>
-  <shortcut>csh</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>show configuration variables for another channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-  </options>
-  <doc>[layer]
-Displays all configuration values.  An optional argument
-may be used to tell which configuration layer to display.  Valid
-configuration layers are &quot;user&quot;, &quot;system&quot; and &quot;default&quot;. To display
-configurations for different channels, set the default_channel
-configuration variable and run config-show again.
-</doc>
- </config-show>
- <config-get>
-  <summary>Show One Setting</summary>
-  <function>doConfigGet</function>
-  <shortcut>cg</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>show configuration variables for another channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-  </options>
-  <doc>&lt;parameter&gt; [layer]
-Displays the value of one configuration parameter.  The
-first argument is the name of the parameter, an optional second argument
-may be used to tell which configuration layer to look in.  Valid configuration
-layers are &quot;user&quot;, &quot;system&quot; and &quot;default&quot;.  If no layer is specified, a value
-will be picked from the first layer that defines the parameter, in the order
-just specified.  The configuration value will be retrieved for the channel
-specified by the default_channel configuration variable.
-</doc>
- </config-get>
- <config-set>
-  <summary>Change Setting</summary>
-  <function>doConfigSet</function>
-  <shortcut>cs</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>show configuration variables for another channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-  </options>
-  <doc>&lt;parameter&gt; &lt;value&gt; [layer]
-Sets the value of one configuration parameter.  The first argument is
-the name of the parameter, the second argument is the new value.  Some
-parameters are subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional
-third argument may be used to specify in which layer to set the
-configuration parameter.  The default layer is &quot;user&quot;.  The
-configuration value will be set for the current channel, which
-is controlled by the default_channel configuration variable.
-</doc>
- </config-set>
- <config-help>
-  <summary>Show Information About Setting</summary>
-  <function>doConfigHelp</function>
-  <shortcut>ch</shortcut>
-  <options />
-  <doc>[parameter]
-Displays help for a configuration parameter.  Without arguments it
-displays help for all configuration parameters.
-</doc>
- </config-help>
- <config-create>
-  <summary>Create a Default configuration file</summary>
-  <function>doConfigCreate</function>
-  <shortcut>coc</shortcut>
-  <options>
-   <windows>
-    <shortopt>w</shortopt>
-    <doc>create a config file for a windows install</doc>
-   </windows>
-  </options>
-  <doc>&lt;root path&gt; &lt;filename&gt;
-Create a default configuration file with all directory configuration
-variables set to subdirectories of &lt;root path&gt;, and save it as &lt;filename&gt;.
-This is useful especially for creating a configuration file for a remote
-PEAR installation (using the --remoteconfig option of install, upgrade,
-and uninstall).
-</doc>
- </config-create>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Install.php b/airtime_mvc/library/pear/PEAR/Command/Install.php
deleted file mode 100644
index 474dbf2f4..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Install.php
+++ /dev/null
@@ -1,1266 +0,0 @@
-<?php
-/**
- * PEAR_Command_Install (install, upgrade, upgrade-all, uninstall, bundle, run-scripts commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Install.php 287477 2009-08-19 14:19:43Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for installation or deinstallation/upgrading of
- * packages.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Install extends PEAR_Command_Common
-{
-    // {{{ properties
-
-    var $commands = array(
-        'install' => array(
-            'summary' => 'Install Package',
-            'function' => 'doInstall',
-            'shortcut' => 'i',
-            'options' => array(
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'will overwrite newer installed packages',
-                    ),
-                'loose' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, install anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as installed',
-                    ),
-                'soft' => array(
-                    'shortopt' => 's',
-                    'doc' => 'soft install, fail silently, or upgrade if already installed',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT), use packagingroot for RPM',
-                    ),
-                'packagingroot' => array(
-                    'shortopt' => 'P',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when packaging files, like RPM packaging',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to download any urls or contact channels',
-                    ),
-                'pretend' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Only list the packages that would be downloaded',
-                    ),
-                ),
-            'doc' => '[channel/]<package> ...
-Installs one or more PEAR packages.  You can specify a package to
-install in four ways:
-
-"Package-1.0.tgz" : installs from a local file
-
-"http://example.com/Package-1.0.tgz" : installs from
-anywhere on the net.
-
-"package.xml" : installs the package described in
-package.xml.  Useful for testing, or for wrapping a PEAR package in
-another package manager such as RPM.
-
-"Package[-version/state][.tar]" : queries your default channel\'s server
-({config master_server}) and downloads the newest package with
-the preferred quality/state ({config preferred_state}).
-
-To retrieve Package version 1.1, use "Package-1.1," to retrieve
-Package state beta, use "Package-beta."  To retrieve an uncompressed
-file, append .tar (make sure there is no file by the same name first)
-
-To download a package from another channel, prefix with the channel name like
-"channel/Package"
-
-More than one package may be specified at once.  It is ok to mix these
-four ways of specifying packages.
-'),
-        'upgrade' => array(
-            'summary' => 'Upgrade Package',
-            'function' => 'doInstall',
-            'shortcut' => 'up',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'upgrade packages from a specific channel',
-                    'arg' => 'CHAN',
-                    ),
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'overwrite newer installed packages',
-                    ),
-                'loose' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'alldeps' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'install all required and optional dependencies',
-                    ),
-                'onlyreqdeps' => array(
-                    'shortopt' => 'o',
-                    'doc' => 'install all required dependencies',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to download any urls or contact channels',
-                    ),
-                'pretend' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Only list the packages that would be downloaded',
-                    ),
-                ),
-            'doc' => '<package> ...
-Upgrades one or more PEAR packages.  See documentation for the
-"install" command for ways to specify a package.
-
-When upgrading, your package will be updated if the provided new
-package has a higher version number (use the -f option if you need to
-upgrade anyway).
-
-More than one package may be specified at once.
-'),
-        'upgrade-all' => array(
-            'summary' => 'Upgrade All Packages [Deprecated in favor of calling upgrade with no parameters]',
-            'function' => 'doUpgradeAll',
-            'shortcut' => 'ua',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'upgrade packages from a specific channel',
-                    'arg' => 'CHAN',
-                    ),
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, upgrade anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not install files, only register the package as upgraded',
-                    ),
-                'nobuild' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'don\'t build C extensions',
-                    ),
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'request uncompressed files when downloading',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT), use packagingroot for RPM',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'loose' => array(
-                    'doc' => 'do not check for recommended dependency version',
-                    ),
-                ),
-            'doc' => '
-WARNING: This function is deprecated in favor of using the upgrade command with no params
-
-Upgrades all packages that have a newer release available.  Upgrades are
-done only if there is a release available of the state specified in
-"preferred_state" (currently {config preferred_state}), or a state considered
-more stable.
-'),
-        'uninstall' => array(
-            'summary' => 'Un-install Package',
-            'function' => 'doUninstall',
-            'shortcut' => 'un',
-            'options' => array(
-                'nodeps' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'ignore dependencies, uninstall anyway',
-                    ),
-                'register-only' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'do not remove files, only register the packages as not installed',
-                    ),
-                'installroot' => array(
-                    'shortopt' => 'R',
-                    'arg' => 'DIR',
-                    'doc' => 'root directory used when installing files (ala PHP\'s INSTALL_ROOT)',
-                    ),
-                'ignore-errors' => array(
-                    'doc' => 'force install even if there were errors',
-                    ),
-                'offline' => array(
-                    'shortopt' => 'O',
-                    'doc' => 'do not attempt to uninstall remotely',
-                    ),
-                ),
-            'doc' => '[channel/]<package> ...
-Uninstalls one or more PEAR packages.  More than one package may be
-specified at once.  Prefix with channel name to uninstall from a
-channel not in your default channel ({config default_channel})
-'),
-        'bundle' => array(
-            'summary' => 'Unpacks a Pecl Package',
-            'function' => 'doBundle',
-            'shortcut' => 'bun',
-            'options' => array(
-                'destination' => array(
-                   'shortopt' => 'd',
-                    'arg' => 'DIR',
-                    'doc' => 'Optional destination directory for unpacking (defaults to current path or "ext" if exists)',
-                    ),
-                'force' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'Force the unpacking even if there were errors in the package',
-                ),
-            ),
-            'doc' => '<package>
-Unpacks a Pecl Package into the selected location. It will download the
-package if needed.
-'),
-        'run-scripts' => array(
-            'summary' => 'Run Post-Install Scripts bundled with a package',
-            'function' => 'doRunScripts',
-            'shortcut' => 'rs',
-            'options' => array(
-            ),
-            'doc' => '<package>
-Run post-installation scripts in package <package>, if any exist.
-'),
-    );
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Command_Install constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Install(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    // }}}
-
-    /**
-     * For unit testing purposes
-     */
-    function &getDownloader(&$ui, $options, &$config)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = &new PEAR_Downloader($ui, $options, $config);
-        return $a;
-    }
-
-    /**
-     * For unit testing purposes
-     */
-    function &getInstaller(&$ui)
-    {
-        if (!class_exists('PEAR_Installer')) {
-            require_once 'PEAR/Installer.php';
-        }
-        $a = &new PEAR_Installer($ui);
-        return $a;
-    }
-
-    function enableExtension($binaries, $type)
-    {
-        if (!($phpini = $this->config->get('php_ini', null, 'pear.php.net'))) {
-            return PEAR::raiseError('configuration option "php_ini" is not set to php.ini location');
-        }
-        $ini = $this->_parseIni($phpini);
-        if (PEAR::isError($ini)) {
-            return $ini;
-        }
-        $line = 0;
-        if ($type == 'extsrc' || $type == 'extbin') {
-            $search = 'extensions';
-            $enable = 'extension';
-        } else {
-            $search = 'zend_extensions';
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $info = ob_get_contents();
-            ob_end_clean();
-            $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-            $enable = 'zend_extension' . $debug . $ts;
-        }
-        foreach ($ini[$search] as $line => $extension) {
-            if (in_array($extension, $binaries, true) || in_array(
-                  $ini['extension_dir'] . DIRECTORY_SEPARATOR . $extension, $binaries, true)) {
-                // already enabled - assume if one is, all are
-                return true;
-            }
-        }
-        if ($line) {
-            $newini = array_slice($ini['all'], 0, $line);
-        } else {
-            $newini = array();
-        }
-        foreach ($binaries as $binary) {
-            if ($ini['extension_dir']) {
-                $binary = basename($binary);
-            }
-            $newini[] = $enable . '="' . $binary . '"' . (OS_UNIX ? "\n" : "\r\n");
-        }
-        $newini = array_merge($newini, array_slice($ini['all'], $line));
-        $fp = @fopen($phpini, 'wb');
-        if (!$fp) {
-            return PEAR::raiseError('cannot open php.ini "' . $phpini . '" for writing');
-        }
-        foreach ($newini as $line) {
-            fwrite($fp, $line);
-        }
-        fclose($fp);
-        return true;
-    }
-
-    function disableExtension($binaries, $type)
-    {
-        if (!($phpini = $this->config->get('php_ini', null, 'pear.php.net'))) {
-            return PEAR::raiseError('configuration option "php_ini" is not set to php.ini location');
-        }
-        $ini = $this->_parseIni($phpini);
-        if (PEAR::isError($ini)) {
-            return $ini;
-        }
-        $line = 0;
-        if ($type == 'extsrc' || $type == 'extbin') {
-            $search = 'extensions';
-            $enable = 'extension';
-        } else {
-            $search = 'zend_extensions';
-            ob_start();
-            phpinfo(INFO_GENERAL);
-            $info = ob_get_contents();
-            ob_end_clean();
-            $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-            $enable = 'zend_extension' . $debug . $ts;
-        }
-        $found = false;
-        foreach ($ini[$search] as $line => $extension) {
-            if (in_array($extension, $binaries, true) || in_array(
-                  $ini['extension_dir'] . DIRECTORY_SEPARATOR . $extension, $binaries, true)) {
-                $found = true;
-                break;
-            }
-        }
-        if (!$found) {
-            // not enabled
-            return true;
-        }
-        $fp = @fopen($phpini, 'wb');
-        if (!$fp) {
-            return PEAR::raiseError('cannot open php.ini "' . $phpini . '" for writing');
-        }
-        if ($line) {
-            $newini = array_slice($ini['all'], 0, $line);
-            // delete the enable line
-            $newini = array_merge($newini, array_slice($ini['all'], $line + 1));
-        } else {
-            $newini = array_slice($ini['all'], 1);
-        }
-        foreach ($newini as $line) {
-            fwrite($fp, $line);
-        }
-        fclose($fp);
-        return true;
-    }
-
-    function _parseIni($filename)
-    {
-        if (!file_exists($filename)) {
-            return PEAR::raiseError('php.ini "' . $filename . '" does not exist');
-        }
-
-        if (filesize($filename) > 300000) {
-            return PEAR::raiseError('php.ini "' . $filename . '" is too large, aborting');
-        }
-
-        ob_start();
-        phpinfo(INFO_GENERAL);
-        $info = ob_get_contents();
-        ob_end_clean();
-        $debug = function_exists('leak') ? '_debug' : '';
-        $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
-        $zend_extension_line = 'zend_extension' . $debug . $ts;
-        $all = @file($filename);
-        if (!$all) {
-            return PEAR::raiseError('php.ini "' . $filename .'" could not be read');
-        }
-        $zend_extensions = $extensions = array();
-        // assume this is right, but pull from the php.ini if it is found
-        $extension_dir = ini_get('extension_dir');
-        foreach ($all as $linenum => $line) {
-            $line = trim($line);
-            if (!$line) {
-                continue;
-            }
-            if ($line[0] == ';') {
-                continue;
-            }
-            if (strtolower(substr($line, 0, 13)) == 'extension_dir') {
-                $line = trim(substr($line, 13));
-                if ($line[0] == '=') {
-                    $x = trim(substr($line, 1));
-                    $x = explode(';', $x);
-                    $extension_dir = str_replace('"', '', array_shift($x));
-                    continue;
-                }
-            }
-            if (strtolower(substr($line, 0, 9)) == 'extension') {
-                $line = trim(substr($line, 9));
-                if ($line[0] == '=') {
-                    $x = trim(substr($line, 1));
-                    $x = explode(';', $x);
-                    $extensions[$linenum] = str_replace('"', '', array_shift($x));
-                    continue;
-                }
-            }
-            if (strtolower(substr($line, 0, strlen($zend_extension_line))) ==
-                  $zend_extension_line) {
-                $line = trim(substr($line, strlen($zend_extension_line)));
-                if ($line[0] == '=') {
-                    $x = trim(substr($line, 1));
-                    $x = explode(';', $x);
-                    $zend_extensions[$linenum] = str_replace('"', '', array_shift($x));
-                    continue;
-                }
-            }
-        }
-        return array(
-            'extensions' => $extensions,
-            'zend_extensions' => $zend_extensions,
-            'extension_dir' => $extension_dir,
-            'all' => $all,
-        );
-    }
-
-    // {{{ doInstall()
-
-    function doInstall($command, $options, $params)
-    {
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-
-        if (isset($options['installroot']) && isset($options['packagingroot'])) {
-            return $this->raiseError('ERROR: cannot use both --installroot and --packagingroot');
-        }
-
-        $reg = &$this->config->getRegistry();
-        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
-        if (!$reg->channelExists($channel)) {
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-
-        if (empty($this->installer)) {
-            $this->installer = &$this->getInstaller($this->ui);
-        }
-
-        if ($command == 'upgrade' || $command == 'upgrade-all') {
-            // If people run the upgrade command but pass nothing, emulate a upgrade-all
-            if ($command == 'upgrade' && empty($params)) {
-                return $this->doUpgradeAll($command, $options, $params);
-            }
-            $options['upgrade'] = true;
-        } else {
-            $packages = $params;
-        }
-
-        $instreg = &$reg; // instreg used to check if package is installed
-        if (isset($options['packagingroot']) && !isset($options['upgrade'])) {
-            $packrootphp_dir = $this->installer->_prependPath(
-                $this->config->get('php_dir', null, 'pear.php.net'),
-                $options['packagingroot']);
-            $instreg = new PEAR_Registry($packrootphp_dir); // other instreg!
-
-            if ($this->config->get('verbose') > 2) {
-                $this->ui->outputData('using package root: ' . $options['packagingroot']);
-            }
-        }
-
-        $abstractpackages = $otherpackages = array();
-        // parse params
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-
-        foreach ($params as $param) {
-            if (strpos($param, 'http://') === 0) {
-                $otherpackages[] = $param;
-                continue;
-            }
-
-            if (strpos($param, 'channel://') === false && @file_exists($param)) {
-                if (isset($options['force'])) {
-                    $otherpackages[] = $param;
-                    continue;
-                }
-
-                $pkg = new PEAR_PackageFile($this->config);
-                $pf  = $pkg->fromAnyFile($param, PEAR_VALIDATE_DOWNLOADING);
-                if (PEAR::isError($pf)) {
-                    $otherpackages[] = $param;
-                    continue;
-                }
-
-                $exists   = $reg->packageExists($pf->getPackage(), $pf->getChannel());
-                $pversion = $reg->packageInfo($pf->getPackage(), 'version', $pf->getChannel());
-                $version_compare = version_compare($pf->getVersion(), $pversion, '<=');
-                if ($exists && $version_compare) {
-                    if ($this->config->get('verbose')) {
-                        $this->ui->outputData('Ignoring installed package ' .
-                            $reg->parsedPackageNameToString(
-                            array('package' => $pf->getPackage(),
-                                  'channel' => $pf->getChannel()), true));
-                    }
-                    continue;
-                }
-                $otherpackages[] = $param;
-                continue;
-            }
-
-            $e = $reg->parsePackageName($param, $channel);
-            if (PEAR::isError($e)) {
-                $otherpackages[] = $param;
-            } else {
-                $abstractpackages[] = $e;
-            }
-        }
-        PEAR::staticPopErrorHandling();
-
-        // if there are any local package .tgz or remote static url, we can't
-        // filter.  The filter only works for abstract packages
-        if (count($abstractpackages) && !isset($options['force'])) {
-            // when not being forced, only do necessary upgrades/installs
-            if (isset($options['upgrade'])) {
-                $abstractpackages = $this->_filterUptodatePackages($abstractpackages, $command);
-            } else {
-                $count = count($abstractpackages);
-                foreach ($abstractpackages as $i => $package) {
-                    if (isset($package['group'])) {
-                        // do not filter out install groups
-                        continue;
-                    }
-
-                    if ($instreg->packageExists($package['package'], $package['channel'])) {
-                        if ($count > 1) {
-                            if ($this->config->get('verbose')) {
-                                $this->ui->outputData('Ignoring installed package ' .
-                                    $reg->parsedPackageNameToString($package, true));
-                            }
-                            unset($abstractpackages[$i]);
-                        } elseif ($count === 1) {
-                            // Lets try to upgrade it since it's already installed
-                            $options['upgrade'] = true;
-                        }
-                    }
-                }
-            }
-            $abstractpackages =
-                array_map(array($reg, 'parsedPackageNameToString'), $abstractpackages);
-        } elseif (count($abstractpackages)) {
-            $abstractpackages =
-                array_map(array($reg, 'parsedPackageNameToString'), $abstractpackages);
-        }
-
-        $packages = array_merge($abstractpackages, $otherpackages);
-        if (!count($packages)) {
-            $c = '';
-            if (isset($options['channel'])){
-                $c .= ' in channel "' . $options['channel'] . '"';
-            }
-            $this->ui->outputData('Nothing to ' . $command . $c);
-            return true;
-        }
-
-        $this->downloader = &$this->getDownloader($this->ui, $options, $this->config);
-        $errors = $downloaded = $binaries = array();
-        $downloaded = &$this->downloader->download($packages);
-        if (PEAR::isError($downloaded)) {
-            return $this->raiseError($downloaded);
-        }
-
-        $errors = $this->downloader->getErrorMsgs();
-        if (count($errors)) {
-            $err = array();
-            $err['data'] = array();
-            foreach ($errors as $error) {
-                if ($error !== null) {
-                    $err['data'][] = array($error);
-                }
-            }
-
-            if (!empty($err['data'])) {
-                $err['headline'] = 'Install Errors';
-                $this->ui->outputData($err);
-            }
-
-            if (!count($downloaded)) {
-                return $this->raiseError("$command failed");
-            }
-        }
-
-        $data = array(
-            'headline' => 'Packages that would be Installed'
-        );
-
-        if (isset($options['pretend'])) {
-            foreach ($downloaded as $package) {
-                $data['data'][] = array($reg->parsedPackageNameToString($package->getParsedPackage()));
-            }
-            $this->ui->outputData($data, 'pretend');
-            return true;
-        }
-
-        $this->installer->setOptions($options);
-        $this->installer->sortPackagesForInstall($downloaded);
-        if (PEAR::isError($err = $this->installer->setDownloadedPackages($downloaded))) {
-            $this->raiseError($err->getMessage());
-            return true;
-        }
-
-        $binaries = $extrainfo = array();
-        foreach ($downloaded as $param) {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $info = $this->installer->install($param, $options);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($info)) {
-                $oldinfo = $info;
-                $pkg = &$param->getPackageFile();
-                if ($info->getCode() != PEAR_INSTALLER_NOBINARY) {
-                    if (!($info = $pkg->installBinary($this->installer))) {
-                        $this->ui->outputData('ERROR: ' .$oldinfo->getMessage());
-                        continue;
-                    }
-
-                    // we just installed a different package than requested,
-                    // let's change the param and info so that the rest of this works
-                    $param = $info[0];
-                    $info  = $info[1];
-                }
-            }
-
-            if (!is_array($info)) {
-                return $this->raiseError("$command failed");
-            }
-
-            if ($param->getPackageType() == 'extsrc' ||
-                  $param->getPackageType() == 'extbin' ||
-                  $param->getPackageType() == 'zendextsrc' ||
-                  $param->getPackageType() == 'zendextbin') {
-                $pkg = &$param->getPackageFile();
-                if ($instbin = $pkg->getInstalledBinary()) {
-                    $instpkg = &$instreg->getPackage($instbin, $pkg->getChannel());
-                } else {
-                    $instpkg = &$instreg->getPackage($pkg->getPackage(), $pkg->getChannel());
-                }
-
-                foreach ($instpkg->getFilelist() as $name => $atts) {
-                    $pinfo = pathinfo($atts['installed_as']);
-                    if (!isset($pinfo['extension']) ||
-                          in_array($pinfo['extension'], array('c', 'h'))) {
-                        continue; // make sure we don't match php_blah.h
-                    }
-
-                    if ((strpos($pinfo['basename'], 'php_') === 0 &&
-                          $pinfo['extension'] == 'dll') ||
-                          // most unices
-                          $pinfo['extension'] == 'so' ||
-                          // hp-ux
-                          $pinfo['extension'] == 'sl') {
-                        $binaries[] = array($atts['installed_as'], $pinfo);
-                        break;
-                    }
-                }
-
-                if (count($binaries)) {
-                    foreach ($binaries as $pinfo) {
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        $ret = $this->enableExtension(array($pinfo[0]), $param->getPackageType());
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($ret)) {
-                            $extrainfo[] = $ret->getMessage();
-                            if ($param->getPackageType() == 'extsrc' ||
-                                  $param->getPackageType() == 'extbin') {
-                                $exttype = 'extension';
-                            } else {
-                                ob_start();
-                                phpinfo(INFO_GENERAL);
-                                $info = ob_get_contents();
-                                ob_end_clean();
-                                $debug = function_exists('leak') ? '_debug' : '';
-                                $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-                                $exttype = 'zend_extension' . $debug . $ts;
-                            }
-                            $extrainfo[] = 'You should add "' . $exttype . '=' .
-                                $pinfo[1]['basename'] . '" to php.ini';
-                        } else {
-                            $extrainfo[] = 'Extension ' . $instpkg->getProvidesExtension() .
-                                ' enabled in php.ini';
-                        }
-                    }
-                }
-            }
-
-            if ($this->config->get('verbose') > 0) {
-                $chan = $param->getChannel();
-                $label = $reg->parsedPackageNameToString(
-                    array(
-                        'channel' => $chan,
-                        'package' => $param->getPackage(),
-                        'version' => $param->getVersion(),
-                    ));
-                $out = array('data' => "$command ok: $label");
-                if (isset($info['release_warnings'])) {
-                    $out['release_warnings'] = $info['release_warnings'];
-                }
-                $this->ui->outputData($out, $command);
-
-                if (!isset($options['register-only']) && !isset($options['offline'])) {
-                    if ($this->config->isDefinedLayer('ftp')) {
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        $info = $this->installer->ftpInstall($param);
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($info)) {
-                            $this->ui->outputData($info->getMessage());
-                            $this->ui->outputData("remote install failed: $label");
-                        } else {
-                            $this->ui->outputData("remote install ok: $label");
-                        }
-                    }
-                }
-            }
-
-            $deps = $param->getDeps();
-            if ($deps) {
-                if (isset($deps['group'])) {
-                    $groups = $deps['group'];
-                    if (!isset($groups[0])) {
-                        $groups = array($groups);
-                    }
-
-                    foreach ($groups as $group) {
-                        if ($group['attribs']['name'] == 'default') {
-                            // default group is always installed, unless the user
-                            // explicitly chooses to install another group
-                            continue;
-                        }
-                        $extrainfo[] = $param->getPackage() . ': Optional feature ' .
-                            $group['attribs']['name'] . ' available (' .
-                            $group['attribs']['hint'] . ')';
-                    }
-
-                    $extrainfo[] = $param->getPackage() .
-                        ': To install optional features use "pear install ' .
-                        $reg->parsedPackageNameToString(
-                            array('package' => $param->getPackage(),
-                                  'channel' => $param->getChannel()), true) .
-                              '#featurename"';
-                }
-            }
-
-            $pkg = &$instreg->getPackage($param->getPackage(), $param->getChannel());
-            // $pkg may be NULL if install is a 'fake' install via --packagingroot
-            if (is_object($pkg)) {
-                $pkg->setConfig($this->config);
-                if ($list = $pkg->listPostinstallScripts()) {
-                    $pn = $reg->parsedPackageNameToString(array('channel' =>
-                       $param->getChannel(), 'package' => $param->getPackage()), true);
-                    $extrainfo[] = $pn . ' has post-install scripts:';
-                    foreach ($list as $file) {
-                        $extrainfo[] = $file;
-                    }
-                    $extrainfo[] = $param->getPackage() .
-                        ': Use "pear run-scripts ' . $pn . '" to finish setup.';
-                    $extrainfo[] = 'DO NOT RUN SCRIPTS FROM UNTRUSTED SOURCES';
-                }
-            }
-        }
-
-        if (count($extrainfo)) {
-            foreach ($extrainfo as $info) {
-                $this->ui->outputData($info);
-            }
-        }
-
-        return true;
-    }
-
-    // }}}
-    // {{{ doUpgradeAll()
-
-    function doUpgradeAll($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $upgrade = array();
-
-        if (isset($options['channel'])) {
-            $channels = array($options['channel']);
-        } else {
-            $channels = $reg->listChannels();
-        }
-
-        foreach ($channels as $channel) {
-            if ($channel == '__uri') {
-                continue;
-            }
-
-            // parse name with channel
-            foreach ($reg->listPackages($channel) as $name) {
-                $upgrade[] = $reg->parsedPackageNameToString(array(
-                        'channel' => $channel,
-                        'package' => $name
-                    ));
-            }
-        }
-
-        $err = $this->doInstall($command, $options, $upgrade);
-        if (PEAR::isError($err)) {
-            $this->ui->outputData($err->getMessage(), $command);
-        }
-   }
-
-    // }}}
-    // {{{ doUninstall()
-
-    function doUninstall($command, $options, $params)
-    {
-        if (count($params) < 1) {
-            return $this->raiseError("Please supply the package(s) you want to uninstall");
-        }
-
-        if (empty($this->installer)) {
-            $this->installer = &$this->getInstaller($this->ui);
-        }
-
-        if (isset($options['remoteconfig'])) {
-            $e = $this->config->readFTPConfigFile($options['remoteconfig']);
-            if (!PEAR::isError($e)) {
-                $this->installer->setConfig($this->config);
-            }
-        }
-
-        $reg = &$this->config->getRegistry();
-        $newparams = array();
-        $binaries = array();
-        $badparams = array();
-        foreach ($params as $pkg) {
-            $channel = $this->config->get('default_channel');
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $parsed = $reg->parsePackageName($pkg, $channel);
-            PEAR::staticPopErrorHandling();
-            if (!$parsed || PEAR::isError($parsed)) {
-                $badparams[] = $pkg;
-                continue;
-            }
-            $package = $parsed['package'];
-            $channel = $parsed['channel'];
-            $info = &$reg->getPackage($package, $channel);
-            if ($info === null &&
-                 ($channel == 'pear.php.net' || $channel == 'pecl.php.net')) {
-                // make sure this isn't a package that has flipped from pear to pecl but
-                // used a package.xml 1.0
-                $testc = ($channel == 'pear.php.net') ? 'pecl.php.net' : 'pear.php.net';
-                $info = &$reg->getPackage($package, $testc);
-                if ($info !== null) {
-                    $channel = $testc;
-                }
-            }
-            if ($info === null) {
-                $badparams[] = $pkg;
-            } else {
-                $newparams[] = &$info;
-                // check for binary packages (this is an alias for those packages if so)
-                if ($installedbinary = $info->getInstalledBinary()) {
-                    $this->ui->log('adding binary package ' .
-                        $reg->parsedPackageNameToString(array('channel' => $channel,
-                            'package' => $installedbinary), true));
-                    $newparams[] = &$reg->getPackage($installedbinary, $channel);
-                }
-                // add the contents of a dependency group to the list of installed packages
-                if (isset($parsed['group'])) {
-                    $group = $info->getDependencyGroup($parsed['group']);
-                    if ($group) {
-                        $installed = $reg->getInstalledGroup($group);
-                        if ($installed) {
-                            foreach ($installed as $i => $p) {
-                                $newparams[] = &$installed[$i];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $err = $this->installer->sortPackagesForUninstall($newparams);
-        if (PEAR::isError($err)) {
-            $this->ui->outputData($err->getMessage(), $command);
-            return true;
-        }
-        $params = $newparams;
-        // twist this to use it to check on whether dependent packages are also being uninstalled
-        // for circular dependencies like subpackages
-        $this->installer->setUninstallPackages($newparams);
-        $params = array_merge($params, $badparams);
-        $binaries = array();
-        foreach ($params as $pkg) {
-            $this->installer->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($err = $this->installer->uninstall($pkg, $options)) {
-                $this->installer->popErrorHandling();
-                if (PEAR::isError($err)) {
-                    $this->ui->outputData($err->getMessage(), $command);
-                    continue;
-                }
-                if ($pkg->getPackageType() == 'extsrc' ||
-                      $pkg->getPackageType() == 'extbin' ||
-                      $pkg->getPackageType() == 'zendextsrc' ||
-                      $pkg->getPackageType() == 'zendextbin') {
-                    if ($instbin = $pkg->getInstalledBinary()) {
-                        continue; // this will be uninstalled later
-                    }
-
-                    foreach ($pkg->getFilelist() as $name => $atts) {
-                        $pinfo = pathinfo($atts['installed_as']);
-                        if (!isset($pinfo['extension']) ||
-                              in_array($pinfo['extension'], array('c', 'h'))) {
-                            continue; // make sure we don't match php_blah.h
-                        }
-                        if ((strpos($pinfo['basename'], 'php_') === 0 &&
-                              $pinfo['extension'] == 'dll') ||
-                              // most unices
-                              $pinfo['extension'] == 'so' ||
-                              // hp-ux
-                              $pinfo['extension'] == 'sl') {
-                            $binaries[] = array($atts['installed_as'], $pinfo);
-                            break;
-                        }
-                    }
-                    if (count($binaries)) {
-                        foreach ($binaries as $pinfo) {
-                            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                            $ret = $this->disableExtension(array($pinfo[0]), $pkg->getPackageType());
-                            PEAR::staticPopErrorHandling();
-                            if (PEAR::isError($ret)) {
-                                $extrainfo[] = $ret->getMessage();
-                                if ($pkg->getPackageType() == 'extsrc' ||
-                                      $pkg->getPackageType() == 'extbin') {
-                                    $exttype = 'extension';
-                                } else {
-                                    ob_start();
-                                    phpinfo(INFO_GENERAL);
-                                    $info = ob_get_contents();
-                                    ob_end_clean();
-                                    $debug = function_exists('leak') ? '_debug' : '';
-                                    $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-                                    $exttype = 'zend_extension' . $debug . $ts;
-                                }
-                                $this->ui->outputData('Unable to remove "' . $exttype . '=' .
-                                    $pinfo[1]['basename'] . '" from php.ini', $command);
-                            } else {
-                                $this->ui->outputData('Extension ' . $pkg->getProvidesExtension() .
-                                    ' disabled in php.ini', $command);
-                            }
-                        }
-                    }
-                }
-                $savepkg = $pkg;
-                if ($this->config->get('verbose') > 0) {
-                    if (is_object($pkg)) {
-                        $pkg = $reg->parsedPackageNameToString($pkg);
-                    }
-                    $this->ui->outputData("uninstall ok: $pkg", $command);
-                }
-                if (!isset($options['offline']) && is_object($savepkg) &&
-                      defined('PEAR_REMOTEINSTALL_OK')) {
-                    if ($this->config->isDefinedLayer('ftp')) {
-                        $this->installer->pushErrorHandling(PEAR_ERROR_RETURN);
-                        $info = $this->installer->ftpUninstall($savepkg);
-                        $this->installer->popErrorHandling();
-                        if (PEAR::isError($info)) {
-                            $this->ui->outputData($info->getMessage());
-                            $this->ui->outputData("remote uninstall failed: $pkg");
-                        } else {
-                            $this->ui->outputData("remote uninstall ok: $pkg");
-                        }
-                    }
-                }
-            } else {
-                $this->installer->popErrorHandling();
-                if (!is_object($pkg)) {
-                    return $this->raiseError("uninstall failed: $pkg");
-                }
-                $pkg = $reg->parsedPackageNameToString($pkg);
-            }
-        }
-
-        return true;
-    }
-
-    // }}}
-
-
-    // }}}
-    // {{{ doBundle()
-    /*
-    (cox) It just downloads and untars the package, does not do
-            any check that the PEAR_Installer::_installFile() does.
-    */
-
-    function doBundle($command, $options, $params)
-    {
-        $opts = array(
-            'force'        => true,
-            'nodeps'       => true,
-            'soft'         => true,
-            'downloadonly' => true
-        );
-        $downloader = &$this->getDownloader($this->ui, $opts, $this->config);
-        $reg = &$this->config->getRegistry();
-        if (count($params) < 1) {
-            return $this->raiseError("Please supply the package you want to bundle");
-        }
-
-        if (isset($options['destination'])) {
-            if (!is_dir($options['destination'])) {
-                System::mkdir('-p ' . $options['destination']);
-            }
-            $dest = realpath($options['destination']);
-        } else {
-            $pwd  = getcwd();
-            $dir  = $pwd . DIRECTORY_SEPARATOR . 'ext';
-            $dest = is_dir($dir) ? $dir : $pwd;
-        }
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $downloader->setDownloadDir($dest);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($err)) {
-            return PEAR::raiseError('download directory "' . $dest .
-                '" is not writeable.');
-        }
-        $result = &$downloader->download(array($params[0]));
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-        if (!isset($result[0])) {
-            return $this->raiseError('unable to unpack ' . $params[0]);
-        }
-        $pkgfile = &$result[0]->getPackageFile();
-        $pkgname = $pkgfile->getName();
-        $pkgversion = $pkgfile->getVersion();
-
-        // Unpacking -------------------------------------------------
-        $dest .= DIRECTORY_SEPARATOR . $pkgname;
-        $orig = $pkgname . '-' . $pkgversion;
-
-        $tar = &new Archive_Tar($pkgfile->getArchiveFile());
-        if (!$tar->extractModify($dest, $orig)) {
-            return $this->raiseError('unable to unpack ' . $pkgfile->getArchiveFile());
-        }
-        $this->ui->outputData("Package ready at '$dest'");
-    // }}}
-    }
-
-    // }}}
-
-    function doRunScripts($command, $options, $params)
-    {
-        if (!isset($params[0])) {
-            return $this->raiseError('run-scripts expects 1 parameter: a package name');
-        }
-
-        $reg = &$this->config->getRegistry();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($parsed)) {
-            return $this->raiseError($parsed);
-        }
-
-        $package = &$reg->getPackage($parsed['package'], $parsed['channel']);
-        if (!is_object($package)) {
-            return $this->raiseError('Could not retrieve package "' . $params[0] . '" from registry');
-        }
-
-        $package->setConfig($this->config);
-        $package->runPostinstallScripts();
-        $this->ui->outputData('Install scripts complete', $command);
-        return true;
-    }
-
-    /**
-     * Given a list of packages, filter out those ones that are already up to date
-     *
-     * @param $packages: packages, in parsed array format !
-     * @return list of packages that can be upgraded
-     */
-    function _filterUptodatePackages($packages, $command)
-    {
-        $reg = &$this->config->getRegistry();
-        $latestReleases = array();
-
-        $ret = array();
-        foreach ($packages as $package) {
-            if (isset($package['group'])) {
-                $ret[] = $package;
-                continue;
-            }
-
-            $channel = $package['channel'];
-            $name    = $package['package'];
-            if (!$reg->packageExists($name, $channel)) {
-                $ret[] = $package;
-                continue;
-            }
-
-            if (!isset($latestReleases[$channel])) {
-                // fill in cache for this channel
-                $chan = &$reg->getChannel($channel);
-                if (PEAR::isError($chan)) {
-                    return $this->raiseError($chan);
-                }
-
-                $base2 = false;
-                $preferred_mirror = $this->config->get('preferred_mirror', null, $channel);
-                if ($chan->supportsREST($preferred_mirror) &&
-                    (
-                       //($base2 = $chan->getBaseURL('REST1.4', $preferred_mirror)) ||
-                       ($base  = $chan->getBaseURL('REST1.0', $preferred_mirror))
-                    )
-                ) {
-                    $dorest = true;
-                }
-
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                if (!isset($package['state'])) {
-                    $state = $this->config->get('preferred_state', null, $channel);
-                } else {
-                    $state = $package['state'];
-                }
-
-                if ($dorest) {
-                    if ($base2) {
-                        $rest = &$this->config->getREST('1.4', array());
-                        $base = $base2;
-                    } else {
-                        $rest = &$this->config->getREST('1.0', array());
-                    }
-
-                    $installed = array_flip($reg->listPackages($channel));
-                    $latest    = $rest->listLatestUpgrades($base, $state, $installed, $channel, $reg);
-                }
-
-                PEAR::staticPopErrorHandling();
-                if (PEAR::isError($latest)) {
-                    $this->ui->outputData('Error getting channel info from ' . $channel .
-                        ': ' . $latest->getMessage());
-                    continue;
-                }
-
-                $latestReleases[$channel] = array_change_key_case($latest);
-            }
-
-            // check package for latest release
-            $name_lower = strtolower($name);
-            if (isset($latestReleases[$channel][$name_lower])) {
-                // if not set, up to date
-                $inst_version    = $reg->packageInfo($name, 'version', $channel);
-                $channel_version = $latestReleases[$channel][$name_lower]['version'];
-                if (version_compare($channel_version, $inst_version, 'le')) {
-                    // installed version is up-to-date
-                    continue;
-                }
-
-                // maintain BC
-                if ($command == 'upgrade-all') {
-                    $this->ui->outputData(array('data' => 'Will upgrade ' .
-                        $reg->parsedPackageNameToString($package)), $command);
-                }
-                $ret[] = $package;
-            }
-        }
-
-        return $ret;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Install.xml b/airtime_mvc/library/pear/PEAR/Command/Install.xml
deleted file mode 100644
index 1b1e933c2..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Install.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<commands version="1.0">
- <install>
-  <summary>Install Package</summary>
-  <function>doInstall</function>
-  <shortcut>i</shortcut>
-  <options>
-   <force>
-    <shortopt>f</shortopt>
-    <doc>will overwrite newer installed packages</doc>
-   </force>
-   <loose>
-    <shortopt>l</shortopt>
-    <doc>do not check for recommended dependency version</doc>
-   </loose>
-   <nodeps>
-    <shortopt>n</shortopt>
-    <doc>ignore dependencies, install anyway</doc>
-   </nodeps>
-   <register-only>
-    <shortopt>r</shortopt>
-    <doc>do not install files, only register the package as installed</doc>
-   </register-only>
-   <soft>
-    <shortopt>s</shortopt>
-    <doc>soft install, fail silently, or upgrade if already installed</doc>
-   </soft>
-   <nobuild>
-    <shortopt>B</shortopt>
-    <doc>don&#039;t build C extensions</doc>
-   </nobuild>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>request uncompressed files when downloading</doc>
-   </nocompress>
-   <installroot>
-    <shortopt>R</shortopt>
-    <doc>root directory used when installing files (ala PHP&#039;s INSTALL_ROOT), use packagingroot for RPM</doc>
-    <arg>DIR</arg>
-   </installroot>
-   <packagingroot>
-    <shortopt>P</shortopt>
-    <doc>root directory used when packaging files, like RPM packaging</doc>
-    <arg>DIR</arg>
-   </packagingroot>
-   <ignore-errors>
-    <shortopt></shortopt>
-    <doc>force install even if there were errors</doc>
-   </ignore-errors>
-   <alldeps>
-    <shortopt>a</shortopt>
-    <doc>install all required and optional dependencies</doc>
-   </alldeps>
-   <onlyreqdeps>
-    <shortopt>o</shortopt>
-    <doc>install all required dependencies</doc>
-   </onlyreqdeps>
-   <offline>
-    <shortopt>O</shortopt>
-    <doc>do not attempt to download any urls or contact channels</doc>
-   </offline>
-   <pretend>
-    <shortopt>p</shortopt>
-    <doc>Only list the packages that would be downloaded</doc>
-   </pretend>
-  </options>
-  <doc>[channel/]&lt;package&gt; ...
-Installs one or more PEAR packages.  You can specify a package to
-install in four ways:
-
-&quot;Package-1.0.tgz&quot; : installs from a local file
-
-&quot;http://example.com/Package-1.0.tgz&quot; : installs from
-anywhere on the net.
-
-&quot;package.xml&quot; : installs the package described in
-package.xml.  Useful for testing, or for wrapping a PEAR package in
-another package manager such as RPM.
-
-&quot;Package[-version/state][.tar]&quot; : queries your default channel&#039;s server
-({config master_server}) and downloads the newest package with
-the preferred quality/state ({config preferred_state}).
-
-To retrieve Package version 1.1, use &quot;Package-1.1,&quot; to retrieve
-Package state beta, use &quot;Package-beta.&quot;  To retrieve an uncompressed
-file, append .tar (make sure there is no file by the same name first)
-
-To download a package from another channel, prefix with the channel name like
-&quot;channel/Package&quot;
-
-More than one package may be specified at once.  It is ok to mix these
-four ways of specifying packages.
-</doc>
- </install>
- <upgrade>
-  <summary>Upgrade Package</summary>
-  <function>doInstall</function>
-  <shortcut>up</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>upgrade packages from a specific channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-   <force>
-    <shortopt>f</shortopt>
-    <doc>overwrite newer installed packages</doc>
-   </force>
-   <loose>
-    <shortopt>l</shortopt>
-    <doc>do not check for recommended dependency version</doc>
-   </loose>
-   <nodeps>
-    <shortopt>n</shortopt>
-    <doc>ignore dependencies, upgrade anyway</doc>
-   </nodeps>
-   <register-only>
-    <shortopt>r</shortopt>
-    <doc>do not install files, only register the package as upgraded</doc>
-   </register-only>
-   <nobuild>
-    <shortopt>B</shortopt>
-    <doc>don&#039;t build C extensions</doc>
-   </nobuild>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>request uncompressed files when downloading</doc>
-   </nocompress>
-   <installroot>
-    <shortopt>R</shortopt>
-    <doc>root directory used when installing files (ala PHP&#039;s INSTALL_ROOT)</doc>
-    <arg>DIR</arg>
-   </installroot>
-   <ignore-errors>
-    <shortopt></shortopt>
-    <doc>force install even if there were errors</doc>
-   </ignore-errors>
-   <alldeps>
-    <shortopt>a</shortopt>
-    <doc>install all required and optional dependencies</doc>
-   </alldeps>
-   <onlyreqdeps>
-    <shortopt>o</shortopt>
-    <doc>install all required dependencies</doc>
-   </onlyreqdeps>
-   <offline>
-    <shortopt>O</shortopt>
-    <doc>do not attempt to download any urls or contact channels</doc>
-   </offline>
-   <pretend>
-    <shortopt>p</shortopt>
-    <doc>Only list the packages that would be downloaded</doc>
-   </pretend>
-  </options>
-  <doc>&lt;package&gt; ...
-Upgrades one or more PEAR packages.  See documentation for the
-&quot;install&quot; command for ways to specify a package.
-
-When upgrading, your package will be updated if the provided new
-package has a higher version number (use the -f option if you need to
-upgrade anyway).
-
-More than one package may be specified at once.
-</doc>
- </upgrade>
- <upgrade-all>
-  <summary>Upgrade All Packages [Deprecated in favor of calling upgrade with no parameters]</summary>
-  <function>doUpgradeAll</function>
-  <shortcut>ua</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>upgrade packages from a specific channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-   <nodeps>
-    <shortopt>n</shortopt>
-    <doc>ignore dependencies, upgrade anyway</doc>
-   </nodeps>
-   <register-only>
-    <shortopt>r</shortopt>
-    <doc>do not install files, only register the package as upgraded</doc>
-   </register-only>
-   <nobuild>
-    <shortopt>B</shortopt>
-    <doc>don&#039;t build C extensions</doc>
-   </nobuild>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>request uncompressed files when downloading</doc>
-   </nocompress>
-   <installroot>
-    <shortopt>R</shortopt>
-    <doc>root directory used when installing files (ala PHP&#039;s INSTALL_ROOT), use packagingroot for RPM</doc>
-    <arg>DIR</arg>
-   </installroot>
-   <ignore-errors>
-    <shortopt></shortopt>
-    <doc>force install even if there were errors</doc>
-   </ignore-errors>
-   <loose>
-    <shortopt></shortopt>
-    <doc>do not check for recommended dependency version</doc>
-   </loose>
-  </options>
-  <doc>
-WARNING: This function is deprecated in favor of using the upgrade command with no params
-
-Upgrades all packages that have a newer release available.  Upgrades are
-done only if there is a release available of the state specified in
-&quot;preferred_state&quot; (currently {config preferred_state}), or a state considered
-more stable.
-</doc>
- </upgrade-all>
- <uninstall>
-  <summary>Un-install Package</summary>
-  <function>doUninstall</function>
-  <shortcut>un</shortcut>
-  <options>
-   <nodeps>
-    <shortopt>n</shortopt>
-    <doc>ignore dependencies, uninstall anyway</doc>
-   </nodeps>
-   <register-only>
-    <shortopt>r</shortopt>
-    <doc>do not remove files, only register the packages as not installed</doc>
-   </register-only>
-   <installroot>
-    <shortopt>R</shortopt>
-    <doc>root directory used when installing files (ala PHP&#039;s INSTALL_ROOT)</doc>
-    <arg>DIR</arg>
-   </installroot>
-   <ignore-errors>
-    <shortopt></shortopt>
-    <doc>force install even if there were errors</doc>
-   </ignore-errors>
-   <offline>
-    <shortopt>O</shortopt>
-    <doc>do not attempt to uninstall remotely</doc>
-   </offline>
-  </options>
-  <doc>[channel/]&lt;package&gt; ...
-Uninstalls one or more PEAR packages.  More than one package may be
-specified at once.  Prefix with channel name to uninstall from a
-channel not in your default channel ({config default_channel})
-</doc>
- </uninstall>
- <bundle>
-  <summary>Unpacks a Pecl Package</summary>
-  <function>doBundle</function>
-  <shortcut>bun</shortcut>
-  <options>
-   <destination>
-    <shortopt>d</shortopt>
-    <doc>Optional destination directory for unpacking (defaults to current path or &quot;ext&quot; if exists)</doc>
-    <arg>DIR</arg>
-   </destination>
-   <force>
-    <shortopt>f</shortopt>
-    <doc>Force the unpacking even if there were errors in the package</doc>
-   </force>
-  </options>
-  <doc>&lt;package&gt;
-Unpacks a Pecl Package into the selected location. It will download the
-package if needed.
-</doc>
- </bundle>
- <run-scripts>
-  <summary>Run Post-Install Scripts bundled with a package</summary>
-  <function>doRunScripts</function>
-  <shortcut>rs</shortcut>
-  <options />
-  <doc>&lt;package&gt;
-Run post-installation scripts in package &lt;package&gt;, if any exist.
-</doc>
- </run-scripts>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Mirror.php b/airtime_mvc/library/pear/PEAR/Command/Mirror.php
deleted file mode 100644
index e20cb3491..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Mirror.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * PEAR_Command_Mirror (download-all command)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Alexander Merz <alexmerz@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Mirror.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.2.0
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for providing file mirrors
- *
- * @category   pear
- * @package    PEAR
- * @author     Alexander Merz <alexmerz@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.2.0
- */
-class PEAR_Command_Mirror extends PEAR_Command_Common
-{
-    var $commands = array(
-        'download-all' => array(
-            'summary' => 'Downloads each available package from the default channel',
-            'function' => 'doDownloadAll',
-            'shortcut' => 'da',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    ),
-                ),
-            'doc' => '
-Requests a list of available packages from the default channel ({config default_channel})
-and downloads them to current working directory.  Note: only
-packages within preferred_state ({config preferred_state}) will be downloaded'
-            ),
-        );
-
-    /**
-     * PEAR_Command_Mirror constructor.
-     *
-     * @access public
-     * @param object PEAR_Frontend a reference to an frontend
-     * @param object PEAR_Config a reference to the configuration data
-     */
-    function PEAR_Command_Mirror(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    /**
-     * For unit-testing
-     */
-    function &factory($a)
-    {
-        $a = &PEAR_Command::factory($a, $this->config);
-        return $a;
-    }
-
-    /**
-    * retrieves a list of avaible Packages from master server
-    * and downloads them
-    *
-    * @access public
-    * @param string $command the command
-    * @param array $options the command options before the command
-    * @param array $params the stuff after the command name
-    * @return bool true if succesful
-    * @throw PEAR_Error
-    */
-    function doDownloadAll($command, $options, $params)
-    {
-        $savechannel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        $channel = isset($options['channel']) ? $options['channel'] :
-            $this->config->get('default_channel');
-        if (!$reg->channelExists($channel)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError('Channel "' . $channel . '" does not exist');
-        }
-        $this->config->set('default_channel', $channel);
-
-        $this->ui->outputData('Using Channel ' . $this->config->get('default_channel'));
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $this->raiseError($chan);
-        }
-
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $remoteInfo = array_flip($rest->listPackages($base, $channel));
-        }
-
-        if (PEAR::isError($remoteInfo)) {
-            return $remoteInfo;
-        }
-
-        $cmd = &$this->factory("download");
-        if (PEAR::isError($cmd)) {
-            return $cmd;
-        }
-
-        $this->ui->outputData('Using Preferred State of ' .
-            $this->config->get('preferred_state'));
-        $this->ui->outputData('Gathering release information, please wait...');
-
-        /**
-         * Error handling not necessary, because already done by
-         * the download command
-         */
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $cmd->run('download', array('downloadonly' => true), array_keys($remoteInfo));
-        PEAR::staticPopErrorHandling();
-        $this->config->set('default_channel', $savechannel);
-        if (PEAR::isError($err)) {
-            $this->ui->outputData($err->getMessage());
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Mirror.xml b/airtime_mvc/library/pear/PEAR/Command/Mirror.xml
deleted file mode 100644
index fe8be9d03..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Mirror.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<commands version="1.0">
- <download-all>
-  <summary>Downloads each available package from the default channel</summary>
-  <function>doDownloadAll</function>
-  <shortcut>da</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>specify a channel other than the default channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-  </options>
-  <doc>
-Requests a list of available packages from the default channel ({config default_channel})
-and downloads them to current working directory.  Note: only
-packages within preferred_state ({config preferred_state}) will be downloaded</doc>
- </download-all>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Package.php b/airtime_mvc/library/pear/PEAR/Command/Package.php
deleted file mode 100644
index f3ee5f95c..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Package.php
+++ /dev/null
@@ -1,1119 +0,0 @@
-<?php
-/**
- * PEAR_Command_Package (package, package-validate, cvsdiff, cvstag, package-dependencies,
- * sign, makerpm, convert commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Package.php 288113 2009-09-06 21:11:55Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-
-class PEAR_Command_Package extends PEAR_Command_Common
-{
-    var $commands = array(
-        'package' => array(
-            'summary' => 'Build Package',
-            'function' => 'doPackage',
-            'shortcut' => 'p',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'Do not gzip the package file'
-                    ),
-                'showname' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Print the name of the packaged file.',
-                    ),
-                ),
-            'doc' => '[descfile] [descfile2]
-Creates a PEAR package from its description file (usually called
-package.xml).  If a second packagefile is passed in, then
-the packager will check to make sure that one is a package.xml
-version 1.0, and the other is a package.xml version 2.0.  The
-package.xml version 1.0 will be saved as "package.xml" in the archive,
-and the other as "package2.xml" in the archive"
-'
-            ),
-        'package-validate' => array(
-            'summary' => 'Validate Package Consistency',
-            'function' => 'doPackageValidate',
-            'shortcut' => 'pv',
-            'options' => array(),
-            'doc' => '
-',
-            ),
-        'cvsdiff' => array(
-            'summary' => 'Run a "cvs diff" for all files in a package',
-            'function' => 'doCvsDiff',
-            'shortcut' => 'cd',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'date' => array(
-                    'shortopt' => 'D',
-                    'doc' => 'Diff against revision of DATE',
-                    'arg' => 'DATE',
-                    ),
-                'release' => array(
-                    'shortopt' => 'R',
-                    'doc' => 'Diff against tag for package release REL',
-                    'arg' => 'REL',
-                    ),
-                'revision' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Diff against revision REV',
-                    'arg' => 'REV',
-                    ),
-                'context' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'Generate context diff',
-                    ),
-                'unified' => array(
-                    'shortopt' => 'u',
-                    'doc' => 'Generate unified diff',
-                    ),
-                'ignore-case' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'Ignore case, consider upper- and lower-case letters equivalent',
-                    ),
-                'ignore-whitespace' => array(
-                    'shortopt' => 'b',
-                    'doc' => 'Ignore changes in amount of white space',
-                    ),
-                'ignore-blank-lines' => array(
-                    'shortopt' => 'B',
-                    'doc' => 'Ignore changes that insert or delete blank lines',
-                    ),
-                'brief' => array(
-                    'doc' => 'Report only whether the files differ, no details',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => '<package.xml>
-Compares all the files in a package.  Without any options, this
-command will compare the current code with the last checked-in code.
-Using the -r or -R option you may compare the current code with that
-of a specific release.
-',
-            ),
-         'svntag' => array(
-             'summary' => 'Set SVN Release Tag',
-             'function' => 'doSvnTag',
-             'shortcut' => 'sv',
-             'options' => array(
-                 'quiet' => array(
-                     'shortopt' => 'q',
-                     'doc' => 'Be quiet',
-                     ),
-                 'slide' => array(
-                     'shortopt' => 'F',
-                     'doc' => 'Move (slide) tag if it exists',
-                     ),
-                 'delete' => array(
-                     'shortopt' => 'd',
-                     'doc' => 'Remove tag',
-                     ),
-                 'dry-run' => array(
-                     'shortopt' => 'n',
-                     'doc' => 'Don\'t do anything, just pretend',
-                     ),
-                 ),
-             'doc' => '<package.xml> [files...]
- Sets a SVN tag on all files in a package.  Use this command after you have
- packaged a distribution tarball with the "package" command to tag what
- revisions of what files were in that release.  If need to fix something
- after running cvstag once, but before the tarball is released to the public,
- use the "slide" option to move the release tag.
-
- to include files (such as a second package.xml, or tests not included in the
- release), pass them as additional parameters.
- ',
-             ),
-        'cvstag' => array(
-            'summary' => 'Set CVS Release Tag',
-            'function' => 'doCvsTag',
-            'shortcut' => 'ct',
-            'options' => array(
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Be quiet',
-                    ),
-                'reallyquiet' => array(
-                    'shortopt' => 'Q',
-                    'doc' => 'Be really quiet',
-                    ),
-                'slide' => array(
-                    'shortopt' => 'F',
-                    'doc' => 'Move (slide) tag if it exists',
-                    ),
-                'delete' => array(
-                    'shortopt' => 'd',
-                    'doc' => 'Remove tag',
-                    ),
-                'dry-run' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Don\'t do anything, just pretend',
-                    ),
-                ),
-            'doc' => '<package.xml> [files...]
-Sets a CVS tag on all files in a package.  Use this command after you have
-packaged a distribution tarball with the "package" command to tag what
-revisions of what files were in that release.  If need to fix something
-after running cvstag once, but before the tarball is released to the public,
-use the "slide" option to move the release tag.
-
-to include files (such as a second package.xml, or tests not included in the
-release), pass them as additional parameters.
-',
-            ),
-        'package-dependencies' => array(
-            'summary' => 'Show package dependencies',
-            'function' => 'doPackageDependencies',
-            'shortcut' => 'pd',
-            'options' => array(),
-            'doc' => '<package-file> or <package.xml> or <install-package-name>
-List all dependencies the package has.
-Can take a tgz / tar file, package.xml or a package name of an installed package.'
-            ),
-        'sign' => array(
-            'summary' => 'Sign a package distribution file',
-            'function' => 'doSign',
-            'shortcut' => 'si',
-            'options' => array(
-                'verbose' => array(
-                    'shortopt' => 'v',
-                    'doc' => 'Display GnuPG output',
-                    ),
-            ),
-            'doc' => '<package-file>
-Signs a package distribution (.tar or .tgz) file with GnuPG.',
-            ),
-        'makerpm' => array(
-            'summary' => 'Builds an RPM spec file from a PEAR package',
-            'function' => 'doMakeRPM',
-            'shortcut' => 'rpm',
-            'options' => array(
-                'spec-template' => array(
-                    'shortopt' => 't',
-                    'arg' => 'FILE',
-                    'doc' => 'Use FILE as RPM spec file template'
-                    ),
-                'rpm-pkgname' => array(
-                    'shortopt' => 'p',
-                    'arg' => 'FORMAT',
-                    'doc' => 'Use FORMAT as format string for RPM package name, %s is replaced
-by the PEAR package name, defaults to "PEAR::%s".',
-                    ),
-                ),
-            'doc' => '<package-file>
-
-Creates an RPM .spec file for wrapping a PEAR package inside an RPM
-package.  Intended to be used from the SPECS directory, with the PEAR
-package tarball in the SOURCES directory:
-
-$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Geo-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
-...
-Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
-',
-            ),
-        'convert' => array(
-            'summary' => 'Convert a package.xml 1.0 to package.xml 2.0 format',
-            'function' => 'doConvert',
-            'shortcut' => 'c2',
-            'options' => array(
-                'flat' => array(
-                    'shortopt' => 'f',
-                    'doc' => 'do not beautify the filelist.',
-                    ),
-                ),
-            'doc' => '[descfile] [descfile2]
-Converts a package.xml in 1.0 format into a package.xml
-in 2.0 format.  The new file will be named package2.xml by default,
-and package.xml will be used as the old file by default.
-This is not the most intelligent conversion, and should only be
-used for automated conversion or learning the format.
-'
-            ),
-        );
-
-    var $output;
-
-    /**
-     * PEAR_Command_Package constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Package(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function _displayValidationResults($err, $warn, $strict = false)
-    {
-        foreach ($err as $e) {
-            $this->output .= "Error: $e\n";
-        }
-        foreach ($warn as $w) {
-            $this->output .= "Warning: $w\n";
-        }
-        $this->output .= sprintf('Validation: %d error(s), %d warning(s)'."\n",
-                                       sizeof($err), sizeof($warn));
-        if ($strict && count($err) > 0) {
-            $this->output .= "Fix these errors and try again.";
-            return false;
-        }
-        return true;
-    }
-
-    function &getPackager()
-    {
-        if (!class_exists('PEAR_Packager')) {
-            require_once 'PEAR/Packager.php';
-        }
-        $a = &new PEAR_Packager;
-        return $a;
-    }
-
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
-    {
-        if (!class_exists('PEAR_Common')) {
-            require_once 'PEAR/Common.php';
-        }
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
-        $common = new PEAR_Common;
-        $common->ui = $this->ui;
-        $a->setLogger($common);
-        return $a;
-    }
-
-    function doPackage($command, $options, $params)
-    {
-        $this->output = '';
-        $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
-        $pkg2 = isset($params[1]) ? $params[1] : null;
-        if (!$pkg2 && !isset($params[0]) && file_exists('package2.xml')) {
-            $pkg2 = 'package2.xml';
-        }
-
-        $packager = &$this->getPackager();
-        $compress = empty($options['nocompress']) ? true : false;
-        $result   = $packager->package($pkginfofile, $compress, $pkg2);
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result);
-        }
-
-        // Don't want output, only the package file name just created
-        if (isset($options['showname'])) {
-            $this->output = $result;
-        }
-
-        if ($this->output) {
-            $this->ui->outputData($this->output, $command);
-        }
-
-        return true;
-    }
-
-    function doPackageValidate($command, $options, $params)
-    {
-        $this->output = '';
-        if (count($params) < 1) {
-            $params[0] = 'package.xml';
-        }
-
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $obj->rawReturn();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            $info = $obj->fromPackageFile($params[0], PEAR_VALIDATE_NORMAL);
-        } else {
-            $archive = $info->getArchiveFile();
-            $tar = &new Archive_Tar($archive);
-            $tar->extract(dirname($info->getPackageFile()));
-            $info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
-                $info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
-                basename($info->getPackageFile()));
-        }
-
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $valid = false;
-        if ($info->getPackagexmlVersion() == '2.0') {
-            if ($valid = $info->validate(PEAR_VALIDATE_NORMAL)) {
-                $info->flattenFileList();
-                $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
-            }
-        } else {
-            $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
-        }
-
-        $err = $warn = array();
-        if ($errors = $info->getValidationWarnings()) {
-            foreach ($errors as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-
-        $this->_displayValidationResults($err, $warn);
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    function doSvnTag($command, $options, $params)
-    {
-        $this->output = '';
-        $_cmd = $command;
-        if (count($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-
-        $packageFile = realpath($params[0]);
-        $dir = dirname($packageFile);
-        $dir = substr($dir, strrpos($dir, '/') + 1);
-        $obj  = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($packageFile, PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $err = $warn = array();
-        if (!$info->validate()) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('SVN tag failed');
-        }
-
-        $version    = $info->getVersion();
-        $package    = $info->getName();
-        $svntag     = "$package-$version";
-
-        if (isset($options['delete'])) {
-            return $this->_svnRemoveTag($version, $package, $svntag, $packageFile, $options);
-        }
-
-        $path = $this->_svnFindPath($packageFile);
-
-        // Check if there are any modified files
-        $fp = popen('svn st --xml ' . dirname($packageFile), "r");
-        $out = '';
-        while ($line = fgets($fp, 1024)) {
-            $out .= rtrim($line)."\n";
-        }
-        pclose($fp);
-
-        if (!isset($options['quiet']) && strpos($out, 'item="modified"')) {
-            $params = array(array(
-                'name' => 'modified',
-                'type' => 'yesno',
-                'default' => 'no',
-                'prompt' => 'You have files in your SVN checkout (' . $path['from']  . ') that have been modified but not commited, do you still want to tag ' . $version . '?',
-            ));
-            $answers = $this->ui->confirmDialog($params);
-
-            if (!in_array($answers['modified'], array('y', 'yes', 'on', '1'))) {
-                return true;
-            }
-        }
-
-        if (isset($options['slide'])) {
-            $this->_svnRemoveTag($version, $package, $svntag, $packageFile, $options);
-        }
-
-        // Check if tag already exists
-        $releaseTag = $path['local']['base'] . 'tags/' . $svntag;
-        $existsCommand = 'svn ls ' . $path['base'] . 'tags/';
-
-        $fp = popen($existsCommand, "r");
-        $out = '';
-        while ($line = fgets($fp, 1024)) {
-            $out .= rtrim($line)."\n";
-        }
-        pclose($fp);
-
-        if (in_array($svntag . '/', explode("\n", $out))) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('SVN tag ' . $svntag . ' for ' . $package . ' already exists.');
-        } elseif (file_exists($path['local']['base'] . 'tags') === false) {
-            return $this->raiseError('Can not locate the tags directory at ' . $path['local']['base'] . 'tags');
-        } elseif (is_writeable($path['local']['base'] . 'tags') === false) {
-            return $this->raiseError('Can not write to the tag directory at ' . $path['local']['base'] . 'tags');
-        } else {
-            $makeCommand = 'svn mkdir ' . $releaseTag;
-            $this->output .= "+ $makeCommand\n";
-            if (empty($options['dry-run'])) {
-                // We need to create the tag dir.
-                $fp = popen($makeCommand, "r");
-                $out = '';
-                while ($line = fgets($fp, 1024)) {
-                    $out .= rtrim($line)."\n";
-                }
-                pclose($fp);
-                $this->output .= "$out\n";
-            }
-        }
-
-        $command = 'svn';
-        if (isset($options['quiet'])) {
-            $command .= ' -q';
-        }
-
-        $command .= ' copy --parents ';
-
-        $dir   = dirname($packageFile);
-        $dir   = substr($dir, strrpos($dir, '/') + 1);
-        $files = array_keys($info->getFilelist());
-
-        array_shift($params);
-        if (count($params)) {
-            // add in additional files to be tagged (package files and such)
-            $files = array_merge($files, $params);
-        }
-
-        $commands = array();
-        foreach ($files as $file) {
-            if (!file_exists($file)) {
-                $file = $dir . DIRECTORY_SEPARATOR . $file;
-            }
-            $commands[] = $command . ' ' . escapeshellarg($file) . ' ' .
-                          escapeshellarg($releaseTag . DIRECTORY_SEPARATOR . $file);
-        }
-
-        $this->output .= implode("\n", $commands) . "\n";
-        if (empty($options['dry-run'])) {
-            foreach ($commands as $command) {
-                $fp = popen($command, "r");
-                while ($line = fgets($fp, 1024)) {
-                    $this->output .= rtrim($line)."\n";
-                }
-                pclose($fp);
-            }
-        }
-
-        $command = 'svn ci -m "Tagging the ' . $version  . ' release" ' . $releaseTag . "\n";
-        $this->output .= "+ $command\n";
-        if (empty($options['dry-run'])) {
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-
-        $this->ui->outputData($this->output, $_cmd);
-        return true;
-    }
-
-    function _svnFindPath($file)
-    {
-        $xml = '';
-        $command = "svn info --xml $file";
-        $fp = popen($command, "r");
-        while ($line = fgets($fp, 1024)) {
-            $xml .= rtrim($line)."\n";
-        }
-        pclose($fp);
-        $url_tag = strpos($xml, '<url>');
-        $url = substr($xml, $url_tag + 5, strpos($xml, '</url>', $url_tag + 5) - ($url_tag + 5));
-
-        $path = array();
-        $path['from'] = substr($url, 0, strrpos($url, '/'));
-        $path['base'] = substr($path['from'], 0, strrpos($path['from'], '/') + 1);
-
-        // Figure out the local paths
-        $pos = strpos($file, '/trunk/');
-        if ($pos === false) {
-            $pos = strpos($file, '/branches/');
-        }
-        $path['local']['base'] = substr($file, 0, $pos + 1);
-
-        return $path;
-    }
-
-    function _svnRemoveTag($version, $package, $tag, $packageFile, $options)
-    {
-        $command = 'svn';
-
-        if (isset($options['quiet'])) {
-            $command .= ' -q';
-        }
-
-        $command .= ' remove';
-        $command .= ' -m "Removing tag for the ' . $version  . ' release."';
-
-        $path = $this->_svnFindPath($packageFile);
-        $command .= ' ' . $path['base'] . 'tags/' . $tag;
-
-
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $command\n";
-        }
-
-        $this->output .= "+ $command\n";
-        if (empty($options['dry-run'])) {
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    function doCvsTag($command, $options, $params)
-    {
-        $this->output = '';
-        $_cmd = $command;
-        if (count($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-
-        $packageFile = realpath($params[0]);
-        $obj  = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($packageFile, PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $err = $warn = array();
-        if (!$info->validate()) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('CVS tag failed');
-        }
-
-        $version    = $info->getVersion();
-        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
-        $cvstag     = "RELEASE_$cvsversion";
-        $files      = array_keys($info->getFilelist());
-        $command = 'cvs';
-        if (isset($options['quiet'])) {
-            $command .= ' -q';
-        }
-
-        if (isset($options['reallyquiet'])) {
-            $command .= ' -Q';
-        }
-
-        $command .= ' tag';
-        if (isset($options['slide'])) {
-            $command .= ' -F';
-        }
-
-        if (isset($options['delete'])) {
-            $command .= ' -d';
-        }
-
-        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
-        array_shift($params);
-        if (count($params)) {
-            // add in additional files to be tagged
-            $files = array_merge($files, $params);
-        }
-
-        $dir = dirname($packageFile);
-        $dir = substr($dir, strrpos($dir, '/') + 1);
-        foreach ($files as $file) {
-            if (!file_exists($file)) {
-                $file = $dir . DIRECTORY_SEPARATOR . $file;
-            }
-            $command .= ' ' . escapeshellarg($file);
-        }
-
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $command\n";
-        }
-
-        $this->output .= "+ $command\n";
-        if (empty($options['dry-run'])) {
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-
-        $this->ui->outputData($this->output, $_cmd);
-        return true;
-    }
-
-    function doCvsDiff($command, $options, $params)
-    {
-        $this->output = '';
-        if (sizeof($params) < 1) {
-            $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
-        }
-
-        $file = realpath($params[0]);
-        $obj  = &$this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromAnyFile($file, PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $err = $warn = array();
-        if (!$info->validate()) {
-            foreach ($info->getValidationWarnings() as $error) {
-                if ($error['level'] == 'warning') {
-                    $warn[] = $error['message'];
-                } else {
-                    $err[] = $error['message'];
-                }
-            }
-        }
-
-        if (!$this->_displayValidationResults($err, $warn, true)) {
-            $this->ui->outputData($this->output, $command);
-            return $this->raiseError('CVS diff failed');
-        }
-
-        $info1 = $info->getFilelist();
-        $files = $info1;
-        $cmd = "cvs";
-        if (isset($options['quiet'])) {
-            $cmd .= ' -q';
-            unset($options['quiet']);
-        }
-
-        if (isset($options['reallyquiet'])) {
-            $cmd .= ' -Q';
-            unset($options['reallyquiet']);
-        }
-
-        if (isset($options['release'])) {
-            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
-            $cvstag = "RELEASE_$cvsversion";
-            $options['revision'] = $cvstag;
-            unset($options['release']);
-        }
-
-        $execute = true;
-        if (isset($options['dry-run'])) {
-            $execute = false;
-            unset($options['dry-run']);
-        }
-
-        $cmd .= ' diff';
-        // the rest of the options are passed right on to "cvs diff"
-        foreach ($options as $option => $optarg) {
-            $arg = $short = false;
-            if (isset($this->commands[$command]['options'][$option])) {
-                $arg = $this->commands[$command]['options'][$option]['arg'];
-                $short = $this->commands[$command]['options'][$option]['shortopt'];
-            }
-            $cmd .= $short ? " -$short" : " --$option";
-            if ($arg && $optarg) {
-                $cmd .= ($short ? '' : '=') . escapeshellarg($optarg);
-            }
-        }
-
-        foreach ($files as $file) {
-            $cmd .= ' ' . escapeshellarg($file['name']);
-        }
-
-        if ($this->config->get('verbose') > 1) {
-            $this->output .= "+ $cmd\n";
-        }
-
-        if ($execute) {
-            $fp = popen($cmd, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
-            }
-            pclose($fp);
-        }
-
-        $this->ui->outputData($this->output, $command);
-        return true;
-    }
-
-    function doPackageDependencies($command, $options, $params)
-    {
-        // $params[0] -> the PEAR package to list its information
-        if (count($params) !== 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        if (is_file($params[0]) || strpos($params[0], '.xml') > 0) {
-           $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-        } else {
-            $reg  = $this->config->getRegistry();
-            $info = $obj->fromArray($reg->packageInfo($params[0]));
-        }
-
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $deps = $info->getDeps();
-        if (is_array($deps)) {
-            if ($info->getPackagexmlVersion() == '1.0') {
-                $data = array(
-                    'caption' => 'Dependencies for pear/' . $info->getPackage(),
-                    'border' => true,
-                    'headline' => array("Required?", "Type", "Name", "Relation", "Version"),
-                    );
-
-                foreach ($deps as $d) {
-                    if (isset($d['optional'])) {
-                        if ($d['optional'] == 'yes') {
-                            $req = 'No';
-                        } else {
-                            $req = 'Yes';
-                        }
-                    } else {
-                        $req = 'Yes';
-                    }
-
-                    if (isset($this->_deps_rel_trans[$d['rel']])) {
-                        $rel = $this->_deps_rel_trans[$d['rel']];
-                    } else {
-                        $rel = $d['rel'];
-                    }
-
-                    if (isset($this->_deps_type_trans[$d['type']])) {
-                        $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                    } else {
-                        $type = $d['type'];
-                    }
-
-                    if (isset($d['name'])) {
-                        $name = $d['name'];
-                    } else {
-                        $name = '';
-                    }
-
-                    if (isset($d['version'])) {
-                        $version = $d['version'];
-                    } else {
-                        $version = '';
-                    }
-
-                    $data['data'][] = array($req, $type, $name, $rel, $version);
-                }
-            } else { // package.xml 2.0 dependencies display
-                require_once 'PEAR/Dependency2.php';
-                $deps = $info->getDependencies();
-                $reg = &$this->config->getRegistry();
-                if (is_array($deps)) {
-                    $d = new PEAR_Dependency2($this->config, array(), '');
-                    $data = array(
-                        'caption' => 'Dependencies for ' . $info->getPackage(),
-                        'border' => true,
-                        'headline' => array("Required?", "Type", "Name", 'Versioning', 'Group'),
-                        );
-                    foreach ($deps as $type => $subd) {
-                        $req = ($type == 'required') ? 'Yes' : 'No';
-                        if ($type == 'group') {
-                            $group = $subd['attribs']['name'];
-                        } else {
-                            $group = '';
-                        }
-
-                        if (!isset($subd[0])) {
-                            $subd = array($subd);
-                        }
-
-                        foreach ($subd as $groupa) {
-                            foreach ($groupa as $deptype => $depinfo) {
-                                if ($deptype == 'attribs') {
-                                    continue;
-                                }
-
-                                if ($deptype == 'pearinstaller') {
-                                    $deptype = 'pear Installer';
-                                }
-
-                                if (!isset($depinfo[0])) {
-                                    $depinfo = array($depinfo);
-                                }
-
-                                foreach ($depinfo as $inf) {
-                                    $name = '';
-                                    if (isset($inf['channel'])) {
-                                        $alias = $reg->channelAlias($inf['channel']);
-                                        if (!$alias) {
-                                            $alias = '(channel?) ' .$inf['channel'];
-                                        }
-                                        $name = $alias . '/';
-
-                                    }
-                                    if (isset($inf['name'])) {
-                                        $name .= $inf['name'];
-                                    } elseif (isset($inf['pattern'])) {
-                                        $name .= $inf['pattern'];
-                                    } else {
-                                        $name .= '';
-                                    }
-
-                                    if (isset($inf['uri'])) {
-                                        $name .= ' [' . $inf['uri'] .  ']';
-                                    }
-
-                                    if (isset($inf['conflicts'])) {
-                                        $ver = 'conflicts';
-                                    } else {
-                                        $ver = $d->_getExtraString($inf);
-                                    }
-
-                                    $data['data'][] = array($req, ucfirst($deptype), $name,
-                                        $ver, $group);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            $this->ui->outputData($data, $command);
-            return true;
-        }
-
-        // Fallback
-        $this->ui->outputData("This package does not have any dependencies.", $command);
-    }
-
-    function doSign($command, $options, $params)
-    {
-        // should move most of this code into PEAR_Packager
-        // so it'll be easy to implement "pear package --sign"
-        if (count($params) !== 1) {
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
-        }
-
-        require_once 'System.php';
-        require_once 'Archive/Tar.php';
-
-        if (!file_exists($params[0])) {
-            return $this->raiseError("file does not exist: $params[0]");
-        }
-
-        $obj = $this->getPackageFile($this->config, $this->_debug);
-        $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pearsign');
-        if (!$tar->extractList('package2.xml package.xml package.sig', $tmpdir)) {
-            return $this->raiseError("failed to extract tar file");
-        }
-
-        if (file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("package already signed");
-        }
-
-        $packagexml = 'package.xml';
-        if (file_exists("$tmpdir/package2.xml")) {
-            $packagexml = 'package2.xml';
-        }
-
-        if (file_exists("$tmpdir/package.sig")) {
-            unlink("$tmpdir/package.sig");
-        }
-
-        if (!file_exists("$tmpdir/$packagexml")) {
-            return $this->raiseError("Extracted file $tmpdir/$packagexml not found.");
-        }
-
-        $input = $this->ui->userDialog($command,
-                                       array('GnuPG Passphrase'),
-                                       array('password'));
-        if (!isset($input[0])) {
-            //use empty passphrase
-            $input[0] = '';
-        }
-
-        $devnull = (isset($options['verbose'])) ? '' : ' 2>/dev/null';
-        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/$packagexml" . $devnull, "w");
-        if (!$gpg) {
-            return $this->raiseError("gpg command failed");
-        }
-
-        fwrite($gpg, "$input[0]\n");
-        if (pclose($gpg) || !file_exists("$tmpdir/package.sig")) {
-            return $this->raiseError("gpg sign failed");
-        }
-
-        if (!$tar->addModify("$tmpdir/package.sig", '', $tmpdir)) {
-            return $this->raiseError('failed adding signature to file');
-        }
-
-        $this->ui->outputData("Package signed.", $command);
-        return true;
-    }
-
-    /**
-     * For unit testing purposes
-     */
-    function &getInstaller(&$ui)
-    {
-        if (!class_exists('PEAR_Installer')) {
-            require_once 'PEAR/Installer.php';
-        }
-        $a = &new PEAR_Installer($ui);
-        return $a;
-    }
-
-    /**
-     * For unit testing purposes
-     */
-    function &getCommandPackaging(&$ui, &$config)
-    {
-        if (!class_exists('PEAR_Command_Packaging')) {
-            if ($fp = @fopen('PEAR/Command/Packaging.php', 'r', true)) {
-                fclose($fp);
-                include_once 'PEAR/Command/Packaging.php';
-            }
-        }
-
-        if (class_exists('PEAR_Command_Packaging')) {
-            $a = &new PEAR_Command_Packaging($ui, $config);
-        } else {
-            $a = null;
-        }
-
-        return $a;
-    }
-
-    function doMakeRPM($command, $options, $params)
-    {
-
-        // Check to see if PEAR_Command_Packaging is installed, and
-        // transparently switch to use the "make-rpm-spec" command from it
-        // instead, if it does. Otherwise, continue to use the old version
-        // of "makerpm" supplied with this package (PEAR).
-        $packaging_cmd = $this->getCommandPackaging($this->ui, $this->config);
-        if ($packaging_cmd !== null) {
-            $this->ui->outputData('PEAR_Command_Packaging is installed; using '.
-                'newer "make-rpm-spec" command instead');
-            return $packaging_cmd->run('make-rpm-spec', $options, $params);
-        }
-
-        $this->ui->outputData('WARNING: "pear makerpm" is no longer available; an '.
-          'improved version is available via "pear make-rpm-spec", which '.
-          'is available by installing PEAR_Command_Packaging');
-        return true;
-    }
-
-    function doConvert($command, $options, $params)
-    {
-        $packagexml    = isset($params[0]) ? $params[0] : 'package.xml';
-        $newpackagexml = isset($params[1]) ? $params[1] : dirname($packagexml) .
-            DIRECTORY_SEPARATOR . 'package2.xml';
-        $pkg = &$this->getPackageFile($this->config, $this->_debug);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pf = $pkg->fromPackageFile($packagexml, PEAR_VALIDATE_NORMAL);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            if (is_array($pf->getUserInfo())) {
-                foreach ($pf->getUserInfo() as $warning) {
-                    $this->ui->outputData($warning['message']);
-                }
-            }
-            return $this->raiseError($pf);
-        }
-
-        if (is_a($pf, 'PEAR_PackageFile_v2')) {
-            $this->ui->outputData($packagexml . ' is already a package.xml version 2.0');
-            return true;
-        }
-
-        $gen   = &$pf->getDefaultGenerator();
-        $newpf = &$gen->toV2();
-        $newpf->setPackagefile($newpackagexml);
-        $gen = &$newpf->getDefaultGenerator();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $state = (isset($options['flat']) ? PEAR_VALIDATE_PACKAGING : PEAR_VALIDATE_NORMAL);
-        $saved = $gen->toPackageFile(dirname($newpackagexml), $state, basename($newpackagexml));
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($saved)) {
-            if (is_array($saved->getUserInfo())) {
-                foreach ($saved->getUserInfo() as $warning) {
-                    $this->ui->outputData($warning['message']);
-                }
-            }
-
-            $this->ui->outputData($saved->getMessage());
-            return true;
-        }
-
-        $this->ui->outputData('Wrote new version 2.0 package.xml to "' . $saved . '"');
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Package.xml b/airtime_mvc/library/pear/PEAR/Command/Package.xml
deleted file mode 100644
index 9f093ef62..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Package.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<commands version="1.0">
- <package>
-  <summary>Build Package</summary>
-  <function>doPackage</function>
-  <shortcut>p</shortcut>
-  <options>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>Do not gzip the package file</doc>
-   </nocompress>
-   <showname>
-    <shortopt>n</shortopt>
-    <doc>Print the name of the packaged file.</doc>
-   </showname>
-  </options>
-  <doc>[descfile] [descfile2]
-Creates a PEAR package from its description file (usually called
-package.xml).  If a second packagefile is passed in, then
-the packager will check to make sure that one is a package.xml
-version 1.0, and the other is a package.xml version 2.0.  The
-package.xml version 1.0 will be saved as &quot;package.xml&quot; in the archive,
-and the other as &quot;package2.xml&quot; in the archive&quot;
-</doc>
- </package>
- <package-validate>
-  <summary>Validate Package Consistency</summary>
-  <function>doPackageValidate</function>
-  <shortcut>pv</shortcut>
-  <options />
-  <doc>
-</doc>
- </package-validate>
- <cvsdiff>
-  <summary>Run a &quot;cvs diff&quot; for all files in a package</summary>
-  <function>doCvsDiff</function>
-  <shortcut>cd</shortcut>
-  <options>
-   <quiet>
-    <shortopt>q</shortopt>
-    <doc>Be quiet</doc>
-   </quiet>
-   <reallyquiet>
-    <shortopt>Q</shortopt>
-    <doc>Be really quiet</doc>
-   </reallyquiet>
-   <date>
-    <shortopt>D</shortopt>
-    <doc>Diff against revision of DATE</doc>
-    <arg>DATE</arg>
-   </date>
-   <release>
-    <shortopt>R</shortopt>
-    <doc>Diff against tag for package release REL</doc>
-    <arg>REL</arg>
-   </release>
-   <revision>
-    <shortopt>r</shortopt>
-    <doc>Diff against revision REV</doc>
-    <arg>REV</arg>
-   </revision>
-   <context>
-    <shortopt>c</shortopt>
-    <doc>Generate context diff</doc>
-   </context>
-   <unified>
-    <shortopt>u</shortopt>
-    <doc>Generate unified diff</doc>
-   </unified>
-   <ignore-case>
-    <shortopt>i</shortopt>
-    <doc>Ignore case, consider upper- and lower-case letters equivalent</doc>
-   </ignore-case>
-   <ignore-whitespace>
-    <shortopt>b</shortopt>
-    <doc>Ignore changes in amount of white space</doc>
-   </ignore-whitespace>
-   <ignore-blank-lines>
-    <shortopt>B</shortopt>
-    <doc>Ignore changes that insert or delete blank lines</doc>
-   </ignore-blank-lines>
-   <brief>
-    <shortopt></shortopt>
-    <doc>Report only whether the files differ, no details</doc>
-   </brief>
-   <dry-run>
-    <shortopt>n</shortopt>
-    <doc>Don&#039;t do anything, just pretend</doc>
-   </dry-run>
-  </options>
-  <doc>&lt;package.xml&gt;
-Compares all the files in a package.  Without any options, this
-command will compare the current code with the last checked-in code.
-Using the -r or -R option you may compare the current code with that
-of a specific release.
-</doc>
- </cvsdiff>
- <svntag>
-  <summary>Set SVN Release Tag</summary>
-  <function>doSvnTag</function>
-  <shortcut>sv</shortcut>
-  <options>
-   <quiet>
-    <shortopt>q</shortopt>
-    <doc>Be quiet</doc>
-   </quiet>
-   <slide>
-    <shortopt>F</shortopt>
-    <doc>Move (slide) tag if it exists</doc>
-   </slide>
-   <delete>
-    <shortopt>d</shortopt>
-    <doc>Remove tag</doc>
-   </delete>
-   <dry-run>
-    <shortopt>n</shortopt>
-    <doc>Don&#039;t do anything, just pretend</doc>
-   </dry-run>
-  </options>
-  <doc>&lt;package.xml&gt; [files...]
- Sets a SVN tag on all files in a package.  Use this command after you have
- packaged a distribution tarball with the &quot;package&quot; command to tag what
- revisions of what files were in that release.  If need to fix something
- after running cvstag once, but before the tarball is released to the public,
- use the &quot;slide&quot; option to move the release tag.
-
- to include files (such as a second package.xml, or tests not included in the
- release), pass them as additional parameters.
- </doc>
- </svntag>
- <cvstag>
-  <summary>Set CVS Release Tag</summary>
-  <function>doCvsTag</function>
-  <shortcut>ct</shortcut>
-  <options>
-   <quiet>
-    <shortopt>q</shortopt>
-    <doc>Be quiet</doc>
-   </quiet>
-   <reallyquiet>
-    <shortopt>Q</shortopt>
-    <doc>Be really quiet</doc>
-   </reallyquiet>
-   <slide>
-    <shortopt>F</shortopt>
-    <doc>Move (slide) tag if it exists</doc>
-   </slide>
-   <delete>
-    <shortopt>d</shortopt>
-    <doc>Remove tag</doc>
-   </delete>
-   <dry-run>
-    <shortopt>n</shortopt>
-    <doc>Don&#039;t do anything, just pretend</doc>
-   </dry-run>
-  </options>
-  <doc>&lt;package.xml&gt; [files...]
-Sets a CVS tag on all files in a package.  Use this command after you have
-packaged a distribution tarball with the &quot;package&quot; command to tag what
-revisions of what files were in that release.  If need to fix something
-after running cvstag once, but before the tarball is released to the public,
-use the &quot;slide&quot; option to move the release tag.
-
-to include files (such as a second package.xml, or tests not included in the
-release), pass them as additional parameters.
-</doc>
- </cvstag>
- <package-dependencies>
-  <summary>Show package dependencies</summary>
-  <function>doPackageDependencies</function>
-  <shortcut>pd</shortcut>
-  <options />
-  <doc>&lt;package-file&gt; or &lt;package.xml&gt; or &lt;install-package-name&gt;
-List all dependencies the package has.
-Can take a tgz / tar file, package.xml or a package name of an installed package.</doc>
- </package-dependencies>
- <sign>
-  <summary>Sign a package distribution file</summary>
-  <function>doSign</function>
-  <shortcut>si</shortcut>
-  <options>
-   <verbose>
-    <shortopt>v</shortopt>
-    <doc>Display GnuPG output</doc>
-   </verbose>
-  </options>
-  <doc>&lt;package-file&gt;
-Signs a package distribution (.tar or .tgz) file with GnuPG.</doc>
- </sign>
- <makerpm>
-  <summary>Builds an RPM spec file from a PEAR package</summary>
-  <function>doMakeRPM</function>
-  <shortcut>rpm</shortcut>
-  <options>
-   <spec-template>
-    <shortopt>t</shortopt>
-    <doc>Use FILE as RPM spec file template</doc>
-    <arg>FILE</arg>
-   </spec-template>
-   <rpm-pkgname>
-    <shortopt>p</shortopt>
-    <doc>Use FORMAT as format string for RPM package name, %s is replaced
-by the PEAR package name, defaults to &quot;PEAR::%s&quot;.</doc>
-    <arg>FORMAT</arg>
-   </rpm-pkgname>
-  </options>
-  <doc>&lt;package-file&gt;
-
-Creates an RPM .spec file for wrapping a PEAR package inside an RPM
-package.  Intended to be used from the SPECS directory, with the PEAR
-package tarball in the SOURCES directory:
-
-$ pear makerpm ../SOURCES/Net_Socket-1.0.tgz
-Wrote RPM spec file PEAR::Net_Geo-1.0.spec
-$ rpm -bb PEAR::Net_Socket-1.0.spec
-...
-Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm
-</doc>
- </makerpm>
- <convert>
-  <summary>Convert a package.xml 1.0 to package.xml 2.0 format</summary>
-  <function>doConvert</function>
-  <shortcut>c2</shortcut>
-  <options>
-   <flat>
-    <shortopt>f</shortopt>
-    <doc>do not beautify the filelist.</doc>
-   </flat>
-  </options>
-  <doc>[descfile] [descfile2]
-Converts a package.xml in 1.0 format into a package.xml
-in 2.0 format.  The new file will be named package2.xml by default,
-and package.xml will be used as the old file by default.
-This is not the most intelligent conversion, and should only be
-used for automated conversion or learning the format.
-</doc>
- </convert>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Pickle.php b/airtime_mvc/library/pear/PEAR/Command/Pickle.php
deleted file mode 100644
index 2252a9d8a..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Pickle.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
- * PEAR_Command_Pickle (pickle command)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2005-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Pickle.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2005-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.1
- */
-
-class PEAR_Command_Pickle extends PEAR_Command_Common
-{
-    var $commands = array(
-        'pickle' => array(
-            'summary' => 'Build PECL Package',
-            'function' => 'doPackage',
-            'shortcut' => 'pi',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'Do not gzip the package file'
-                    ),
-                'showname' => array(
-                    'shortopt' => 'n',
-                    'doc' => 'Print the name of the packaged file.',
-                    ),
-                ),
-            'doc' => '[descfile]
-Creates a PECL package from its package2.xml file.
-
-An automatic conversion will be made to a package.xml 1.0 and written out to
-disk in the current directory as "package.xml".  Note that
-only simple package.xml 2.0 will be converted.  package.xml 2.0 with:
-
- - dependency types other than required/optional PECL package/ext/php/pearinstaller
- - more than one extsrcrelease or zendextsrcrelease
- - zendextbinrelease, extbinrelease, phprelease, or bundle release type
- - dependency groups
- - ignore tags in release filelist
- - tasks other than replace
- - custom roles
-
-will cause pickle to fail, and output an error message.  If your package2.xml
-uses any of these features, you are best off using PEAR_PackageFileManager to
-generate both package.xml.
-'
-            ),
-        );
-
-    /**
-     * PEAR_Command_Package constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Pickle(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    /**
-     * For unit-testing ease
-     *
-     * @return PEAR_Packager
-     */
-    function &getPackager()
-    {
-        if (!class_exists('PEAR_Packager')) {
-            require_once 'PEAR/Packager.php';
-        }
-
-        $a = &new PEAR_Packager;
-        return $a;
-    }
-
-    /**
-     * For unit-testing ease
-     *
-     * @param PEAR_Config $config
-     * @param bool $debug
-     * @param string|null $tmpdir
-     * @return PEAR_PackageFile
-     */
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
-    {
-        if (!class_exists('PEAR_Common')) {
-            require_once 'PEAR/Common.php';
-        }
-
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
-        $common = new PEAR_Common;
-        $common->ui = $this->ui;
-        $a->setLogger($common);
-        return $a;
-    }
-
-    function doPackage($command, $options, $params)
-    {
-        $this->output = '';
-        $pkginfofile = isset($params[0]) ? $params[0] : 'package2.xml';
-        $packager = &$this->getPackager();
-        if (PEAR::isError($err = $this->_convertPackage($pkginfofile))) {
-            return $err;
-        }
-
-        $compress = empty($options['nocompress']) ? true : false;
-        $result = $packager->package($pkginfofile, $compress, 'package.xml');
-        if (PEAR::isError($result)) {
-            return $this->raiseError($result);
-        }
-
-        // Don't want output, only the package file name just created
-        if (isset($options['showname'])) {
-            $this->ui->outputData($result, $command);
-        }
-
-        return true;
-    }
-
-    function _convertPackage($packagexml)
-    {
-        $pkg = &$this->getPackageFile($this->config);
-        $pf2 = &$pkg->fromPackageFile($packagexml, PEAR_VALIDATE_NORMAL);
-        if (!is_a($pf2, 'PEAR_PackageFile_v2')) {
-            return $this->raiseError('Cannot process "' .
-                $packagexml . '", is not a package.xml 2.0');
-        }
-
-        require_once 'PEAR/PackageFile/v1.php';
-        $pf = new PEAR_PackageFile_v1;
-        $pf->setConfig($this->config);
-        if ($pf2->getPackageType() != 'extsrc' && $pf2->getPackageType() != 'zendextsrc') {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", is not an extension source package.  Using a PEAR_PackageFileManager-based ' .
-            'script is an option');
-        }
-
-        if (is_array($pf2->getUsesRole())) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains custom roles.  Using a PEAR_PackageFileManager-based script or ' .
-            'the convert command is an option');
-        }
-
-        if (is_array($pf2->getUsesTask())) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains custom tasks.  Using a PEAR_PackageFileManager-based script or ' .
-            'the convert command is an option');
-        }
-
-        $deps = $pf2->getDependencies();
-        if (isset($deps['group'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains dependency groups.  Using a PEAR_PackageFileManager-based script ' .
-            'or the convert command is an option');
-        }
-
-        if (isset($deps['required']['subpackage']) ||
-              isset($deps['optional']['subpackage'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains subpackage dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-
-        if (isset($deps['required']['os'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains os dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-
-        if (isset($deps['required']['arch'])) {
-            return $this->raiseError('Cannot safely convert "' . $packagexml .
-            '", contains arch dependencies.  Using a PEAR_PackageFileManager-based  '.
-            'script is an option');
-        }
-
-        $pf->setPackage($pf2->getPackage());
-        $pf->setSummary($pf2->getSummary());
-        $pf->setDescription($pf2->getDescription());
-        foreach ($pf2->getMaintainers() as $maintainer) {
-            $pf->addMaintainer($maintainer['role'], $maintainer['handle'],
-                $maintainer['name'], $maintainer['email']);
-        }
-
-        $pf->setVersion($pf2->getVersion());
-        $pf->setDate($pf2->getDate());
-        $pf->setLicense($pf2->getLicense());
-        $pf->setState($pf2->getState());
-        $pf->setNotes($pf2->getNotes());
-        $pf->addPhpDep($deps['required']['php']['min'], 'ge');
-        if (isset($deps['required']['php']['max'])) {
-            $pf->addPhpDep($deps['required']['php']['max'], 'le');
-        }
-
-        if (isset($deps['required']['package'])) {
-            if (!isset($deps['required']['package'][0])) {
-                $deps['required']['package'] = array($deps['required']['package']);
-            }
-
-            foreach ($deps['required']['package'] as $dep) {
-                if (!isset($dep['channel'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains uri-based dependency on a package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if ($dep['channel'] != 'pear.php.net'
-                    && $dep['channel'] != 'pecl.php.net'
-                    && $dep['channel'] != 'doc.php.net') {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains dependency on a non-standard channel package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if (isset($dep['conflicts'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains conflicts dependency.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-
-                if (isset($dep['min'])) {
-                    $pf->addPackageDep($dep['name'], $dep['min'], 'ge');
-                }
-
-                if (isset($dep['max'])) {
-                    $pf->addPackageDep($dep['name'], $dep['max'], 'le');
-                }
-            }
-        }
-
-        if (isset($deps['required']['extension'])) {
-            if (!isset($deps['required']['extension'][0])) {
-                $deps['required']['extension'] = array($deps['required']['extension']);
-            }
-
-            foreach ($deps['required']['extension'] as $dep) {
-                if (isset($dep['conflicts'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains conflicts dependency.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-
-                if (isset($dep['min'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['min'], 'ge');
-                }
-
-                if (isset($dep['max'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['max'], 'le');
-                }
-            }
-        }
-
-        if (isset($deps['optional']['package'])) {
-            if (!isset($deps['optional']['package'][0])) {
-                $deps['optional']['package'] = array($deps['optional']['package']);
-            }
-
-            foreach ($deps['optional']['package'] as $dep) {
-                if (!isset($dep['channel'])) {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains uri-based dependency on a package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if ($dep['channel'] != 'pear.php.net'
-                    && $dep['channel'] != 'pecl.php.net'
-                    && $dep['channel'] != 'doc.php.net') {
-                    return $this->raiseError('Cannot safely convert "' . $packagexml . '"' .
-                    ' contains dependency on a non-standard channel package.  Using a ' .
-                    'PEAR_PackageFileManager-based script is an option');
-                }
-
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-
-                if (isset($dep['min'])) {
-                    $pf->addPackageDep($dep['name'], $dep['min'], 'ge', 'yes');
-                }
-
-                if (isset($dep['max'])) {
-                    $pf->addPackageDep($dep['name'], $dep['max'], 'le', 'yes');
-                }
-            }
-        }
-
-        if (isset($deps['optional']['extension'])) {
-            if (!isset($deps['optional']['extension'][0])) {
-                $deps['optional']['extension'] = array($deps['optional']['extension']);
-            }
-
-            foreach ($deps['optional']['extension'] as $dep) {
-                if (isset($dep['exclude'])) {
-                    $this->ui->outputData('WARNING: exclude tags are ignored in conversion');
-                }
-
-                if (isset($dep['min'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['min'], 'ge', 'yes');
-                }
-
-                if (isset($dep['max'])) {
-                    $pf->addExtensionDep($dep['name'], $dep['max'], 'le', 'yes');
-                }
-            }
-        }
-
-        $contents = $pf2->getContents();
-        $release  = $pf2->getReleases();
-        if (isset($releases[0])) {
-            return $this->raiseError('Cannot safely process "' . $packagexml . '" contains '
-            . 'multiple extsrcrelease/zendextsrcrelease tags.  Using a PEAR_PackageFileManager-based script ' .
-            'or the convert command is an option');
-        }
-
-        if ($configoptions = $pf2->getConfigureOptions()) {
-            foreach ($configoptions as $option) {
-                $default = isset($option['default']) ? $option['default'] : false;
-                $pf->addConfigureOption($option['name'], $option['prompt'], $default);
-            }
-        }
-
-        if (isset($release['filelist']['ignore'])) {
-            return $this->raiseError('Cannot safely process "' . $packagexml . '" contains '
-            . 'ignore tags.  Using a PEAR_PackageFileManager-based script or the convert' .
-            ' command is an option');
-        }
-
-        if (isset($release['filelist']['install']) &&
-              !isset($release['filelist']['install'][0])) {
-            $release['filelist']['install'] = array($release['filelist']['install']);
-        }
-
-        if (isset($contents['dir']['attribs']['baseinstalldir'])) {
-            $baseinstalldir = $contents['dir']['attribs']['baseinstalldir'];
-        } else {
-            $baseinstalldir = false;
-        }
-
-        if (!isset($contents['dir']['file'][0])) {
-            $contents['dir']['file'] = array($contents['dir']['file']);
-        }
-
-        foreach ($contents['dir']['file'] as $file) {
-            if ($baseinstalldir && !isset($file['attribs']['baseinstalldir'])) {
-                $file['attribs']['baseinstalldir'] = $baseinstalldir;
-            }
-
-            $processFile = $file;
-            unset($processFile['attribs']);
-            if (count($processFile)) {
-                foreach ($processFile as $name => $task) {
-                    if ($name != $pf2->getTasksNs() . ':replace') {
-                        return $this->raiseError('Cannot safely process "' . $packagexml .
-                        '" contains tasks other than replace.  Using a ' .
-                        'PEAR_PackageFileManager-based script is an option.');
-                    }
-                    $file['attribs']['replace'][] = $task;
-                }
-            }
-
-            if (!in_array($file['attribs']['role'], PEAR_Common::getFileRoles())) {
-                return $this->raiseError('Cannot safely convert "' . $packagexml .
-                '", contains custom roles.  Using a PEAR_PackageFileManager-based script ' .
-                'or the convert command is an option');
-            }
-
-            if (isset($release['filelist']['install'])) {
-                foreach ($release['filelist']['install'] as $installas) {
-                    if ($installas['attribs']['name'] == $file['attribs']['name']) {
-                        $file['attribs']['install-as'] = $installas['attribs']['as'];
-                    }
-                }
-            }
-
-            $pf->addFile('/', $file['attribs']['name'], $file['attribs']);
-        }
-
-        if ($pf2->getChangeLog()) {
-            $this->ui->outputData('WARNING: changelog is not translated to package.xml ' .
-                '1.0, use PEAR_PackageFileManager-based script if you need changelog-' .
-                'translation for package.xml 1.0');
-        }
-
-        $gen = &$pf->getDefaultGenerator();
-        $gen->toPackageFile('.');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Pickle.xml b/airtime_mvc/library/pear/PEAR/Command/Pickle.xml
deleted file mode 100644
index 721ecea99..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Pickle.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<commands version="1.0">
- <pickle>
-  <summary>Build PECL Package</summary>
-  <function>doPackage</function>
-  <shortcut>pi</shortcut>
-  <options>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>Do not gzip the package file</doc>
-   </nocompress>
-   <showname>
-    <shortopt>n</shortopt>
-    <doc>Print the name of the packaged file.</doc>
-   </showname>
-  </options>
-  <doc>[descfile]
-Creates a PECL package from its package2.xml file.
-
-An automatic conversion will be made to a package.xml 1.0 and written out to
-disk in the current directory as &quot;package.xml&quot;.  Note that
-only simple package.xml 2.0 will be converted.  package.xml 2.0 with:
-
- - dependency types other than required/optional PECL package/ext/php/pearinstaller
- - more than one extsrcrelease or zendextsrcrelease
- - zendextbinrelease, extbinrelease, phprelease, or bundle release type
- - dependency groups
- - ignore tags in release filelist
- - tasks other than replace
- - custom roles
-
-will cause pickle to fail, and output an error message.  If your package2.xml
-uses any of these features, you are best off using PEAR_PackageFileManager to
-generate both package.xml.
-</doc>
- </pickle>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Registry.php b/airtime_mvc/library/pear/PEAR/Command/Registry.php
deleted file mode 100644
index c56319f2d..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Registry.php
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?php
-/**
- * PEAR_Command_Registry (list, list-files, shell-test, info commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Registry.php 299146 2010-05-08 16:26:13Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for registry manipulation
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Registry extends PEAR_Command_Common
-{
-    var $commands = array(
-        'list' => array(
-            'summary' => 'List Installed Packages In The Default Channel',
-            'function' => 'doList',
-            'shortcut' => 'l',
-            'options' => array(
-                'channel' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'list installed packages from this channel',
-                    'arg' => 'CHAN',
-                    ),
-                'allchannels' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'list installed packages from all channels',
-                    ),
-                'channelinfo' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'output fully channel-aware data, even on failure',
-                    ),
-                ),
-            'doc' => '<package>
-If invoked without parameters, this command lists the PEAR packages
-installed in your php_dir ({config php_dir}).  With a parameter, it
-lists the files in a package.
-',
-            ),
-        'list-files' => array(
-            'summary' => 'List Files In Installed Package',
-            'function' => 'doFileList',
-            'shortcut' => 'fl',
-            'options' => array(),
-            'doc' => '<package>
-List the files in an installed package.
-'
-            ),
-        'shell-test' => array(
-            'summary' => 'Shell Script Test',
-            'function' => 'doShellTest',
-            'shortcut' => 'st',
-            'options' => array(),
-            'doc' => '<package> [[relation] version]
-Tests if a package is installed in the system. Will exit(1) if it is not.
-   <relation>   The version comparison operator. One of:
-                <, lt, <=, le, >, gt, >=, ge, ==, =, eq, !=, <>, ne
-   <version>    The version to compare with
-'),
-        'info' => array(
-            'summary'  => 'Display information about a package',
-            'function' => 'doInfo',
-            'shortcut' => 'in',
-            'options'  => array(),
-            'doc'      => '<package>
-Displays information about a package. The package argument may be a
-local package file, an URL to a package file, or the name of an
-installed package.'
-            )
-        );
-
-    /**
-     * PEAR_Command_Registry constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Registry(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function _sortinfo($a, $b)
-    {
-        $apackage = isset($a['package']) ? $a['package'] : $a['name'];
-        $bpackage = isset($b['package']) ? $b['package'] : $b['name'];
-        return strcmp($apackage, $bpackage);
-    }
-
-    function doList($command, $options, $params)
-    {
-        $reg = &$this->config->getRegistry();
-        $channelinfo = isset($options['channelinfo']);
-        if (isset($options['allchannels']) && !$channelinfo) {
-            return $this->doListAll($command, array(), $params);
-        }
-
-        if (isset($options['allchannels']) && $channelinfo) {
-            // allchannels with $channelinfo
-            unset($options['allchannels']);
-            $channels = $reg->getChannels();
-            $errors = array();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            foreach ($channels as $channel) {
-                $options['channel'] = $channel->getName();
-                $ret = $this->doList($command, $options, $params);
-
-                if (PEAR::isError($ret)) {
-                    $errors[] = $ret;
-                }
-            }
-
-            PEAR::staticPopErrorHandling();
-            if (count($errors)) {
-                // for now, only give first error
-                return PEAR::raiseError($errors[0]);
-            }
-
-            return true;
-        }
-
-        if (count($params) === 1) {
-            return $this->doFileList($command, $options, $params);
-        }
-
-        if (isset($options['channel'])) {
-            if (!$reg->channelExists($options['channel'])) {
-                return $this->raiseError('Channel "' . $options['channel'] .'" does not exist');
-            }
-
-            $channel = $reg->channelName($options['channel']);
-        } else {
-            $channel = $this->config->get('default_channel');
-        }
-
-        $installed = $reg->packageInfo(null, null, $channel);
-        usort($installed, array(&$this, '_sortinfo'));
-
-        $data = array(
-            'caption' => 'Installed packages, channel ' .
-                $channel . ':',
-            'border' => true,
-            'headline' => array('Package', 'Version', 'State'),
-            'channel' => $channel,
-            );
-        if ($channelinfo) {
-            $data['headline'] = array('Channel', 'Package', 'Version', 'State');
-        }
-
-        if (count($installed) && !isset($data['data'])) {
-            $data['data'] = array();
-        }
-
-        foreach ($installed as $package) {
-            $pobj = $reg->getPackage(isset($package['package']) ?
-                                        $package['package'] : $package['name'], $channel);
-            if ($channelinfo) {
-                $packageinfo = array($pobj->getChannel(), $pobj->getPackage(), $pobj->getVersion(),
-                                    $pobj->getState() ? $pobj->getState() : null);
-            } else {
-                $packageinfo = array($pobj->getPackage(), $pobj->getVersion(),
-                                    $pobj->getState() ? $pobj->getState() : null);
-            }
-            $data['data'][] = $packageinfo;
-        }
-
-        if (count($installed) === 0) {
-            if (!$channelinfo) {
-                $data = '(no packages installed from channel ' . $channel . ')';
-            } else {
-                $data = array(
-                    'caption' => 'Installed packages, channel ' .
-                        $channel . ':',
-                    'border' => true,
-                    'channel' => $channel,
-                    'data' => array(array('(no packages installed)')),
-                );
-            }
-        }
-
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    function doListAll($command, $options, $params)
-    {
-        // This duplicate code is deprecated over
-        // list --channelinfo, which gives identical
-        // output for list and list --allchannels.
-        $reg = &$this->config->getRegistry();
-        $installed = $reg->packageInfo(null, null, null);
-        foreach ($installed as $channel => $packages) {
-            usort($packages, array($this, '_sortinfo'));
-            $data = array(
-                'caption'  => 'Installed packages, channel ' . $channel . ':',
-                'border'   => true,
-                'headline' => array('Package', 'Version', 'State'),
-                'channel'  => $channel
-            );
-
-            foreach ($packages as $package) {
-                $p = isset($package['package']) ? $package['package'] : $package['name'];
-                $pobj = $reg->getPackage($p, $channel);
-                $data['data'][] = array($pobj->getPackage(), $pobj->getVersion(),
-                                        $pobj->getState() ? $pobj->getState() : null);
-            }
-
-            // Adds a blank line after each section
-            $data['data'][] = array();
-
-            if (count($packages) === 0) {
-                $data = array(
-                    'caption' => 'Installed packages, channel ' . $channel . ':',
-                    'border' => true,
-                    'data' => array(array('(no packages installed)'), array()),
-                    'channel' => $channel
-                    );
-            }
-            $this->ui->outputData($data, $command);
-        }
-        return true;
-    }
-
-    function doFileList($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError('list-files expects 1 parameter');
-        }
-
-        $reg = &$this->config->getRegistry();
-        $fp = false;
-        if (!is_dir($params[0]) && (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))) {
-            if ($fp) {
-                fclose($fp);
-            }
-
-            if (!class_exists('PEAR_PackageFile')) {
-                require_once 'PEAR/PackageFile.php';
-            }
-
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $info = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            $headings = array('Package File', 'Install Path');
-            $installed = false;
-        } else {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($parsed)) {
-                return $this->raiseError($parsed);
-            }
-
-            $info = &$reg->getPackage($parsed['package'], $parsed['channel']);
-            $headings = array('Type', 'Install Path');
-            $installed = true;
-        }
-
-        if (PEAR::isError($info)) {
-            return $this->raiseError($info);
-        }
-
-        if ($info === null) {
-            return $this->raiseError("`$params[0]' not installed");
-        }
-
-        $list = ($info->getPackagexmlVersion() == '1.0' || $installed) ?
-            $info->getFilelist() : $info->getContents();
-        if ($installed) {
-            $caption = 'Installed Files For ' . $params[0];
-        } else {
-            $caption = 'Contents of ' . basename($params[0]);
-        }
-
-        $data = array(
-            'caption' => $caption,
-            'border' => true,
-            'headline' => $headings);
-        if ($info->getPackagexmlVersion() == '1.0' || $installed) {
-            foreach ($list as $file => $att) {
-                if ($installed) {
-                    if (empty($att['installed_as'])) {
-                        continue;
-                    }
-                    $data['data'][] = array($att['role'], $att['installed_as']);
-                } else {
-                    if (isset($att['baseinstalldir']) && !in_array($att['role'],
-                          array('test', 'data', 'doc'))) {
-                        $dest = $att['baseinstalldir'] . DIRECTORY_SEPARATOR .
-                            $file;
-                    } else {
-                        $dest = $file;
-                    }
-                    switch ($att['role']) {
-                        case 'test':
-                        case 'data':
-                        case 'doc':
-                            $role = $att['role'];
-                            if ($role == 'test') {
-                                $role .= 's';
-                            }
-                            $dest = $this->config->get($role . '_dir') . DIRECTORY_SEPARATOR .
-                                $info->getPackage() . DIRECTORY_SEPARATOR . $dest;
-                            break;
-                        case 'php':
-                        default:
-                            $dest = $this->config->get('php_dir') . DIRECTORY_SEPARATOR .
-                                $dest;
-                    }
-                    $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-                    $dest = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    $dest);
-                    $file = preg_replace('!/+!', '/', $file);
-                    $data['data'][] = array($file, $dest);
-                }
-            }
-        } else { // package.xml 2.0, not installed
-            if (!isset($list['dir']['file'][0])) {
-                $list['dir']['file'] = array($list['dir']['file']);
-            }
-
-            foreach ($list['dir']['file'] as $att) {
-                $att = $att['attribs'];
-                $file = $att['name'];
-                $role = &PEAR_Installer_Role::factory($info, $att['role'], $this->config);
-                $role->setup($this, $info, $att, $file);
-                if (!$role->isInstallable()) {
-                    $dest = '(not installable)';
-                } else {
-                    $dest = $role->processInstallation($info, $att, $file, '');
-                    if (PEAR::isError($dest)) {
-                        $dest = '(Unknown role "' . $att['role'] . ')';
-                    } else {
-                        list(,, $dest) = $dest;
-                    }
-                }
-                $data['data'][] = array($file, $dest);
-            }
-        }
-
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    function doShellTest($command, $options, $params)
-    {
-        if (count($params) < 1) {
-            return PEAR::raiseError('ERROR, usage: pear shell-test packagename [[relation] version]');
-        }
-
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $reg = &$this->config->getRegistry();
-        $info = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-        if (PEAR::isError($info)) {
-            exit(1); // invalid package name
-        }
-
-        $package = $info['package'];
-        $channel = $info['channel'];
-        // "pear shell-test Foo"
-        if (!$reg->packageExists($package, $channel)) {
-            if ($channel == 'pecl.php.net') {
-                if ($reg->packageExists($package, 'pear.php.net')) {
-                    $channel = 'pear.php.net'; // magically change channels for extensions
-                }
-            }
-        }
-
-        if (count($params) === 1) {
-            if (!$reg->packageExists($package, $channel)) {
-                exit(1);
-            }
-            // "pear shell-test Foo 1.0"
-        } elseif (count($params) === 2) {
-            $v = $reg->packageInfo($package, 'version', $channel);
-            if (!$v || !version_compare("$v", "{$params[1]}", "ge")) {
-                exit(1);
-            }
-            // "pear shell-test Foo ge 1.0"
-        } elseif (count($params) === 3) {
-            $v = $reg->packageInfo($package, 'version', $channel);
-            if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) {
-                exit(1);
-            }
-        } else {
-            PEAR::staticPopErrorHandling();
-            $this->raiseError("$command: expects 1 to 3 parameters");
-            exit(1);
-        }
-    }
-
-    function doInfo($command, $options, $params)
-    {
-        if (count($params) !== 1) {
-            return $this->raiseError('pear info expects 1 parameter');
-        }
-
-        $info = $fp = false;
-        $reg = &$this->config->getRegistry();
-        if (is_file($params[0]) && !is_dir($params[0]) &&
-            (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))
-        ) {
-            if ($fp) {
-                fclose($fp);
-            }
-
-            if (!class_exists('PEAR_PackageFile')) {
-                require_once 'PEAR/PackageFile.php';
-            }
-
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $obj = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($obj)) {
-                $uinfo = $obj->getUserInfo();
-                if (is_array($uinfo)) {
-                    foreach ($uinfo as $message) {
-                        if (is_array($message)) {
-                            $message = $message['message'];
-                        }
-                        $this->ui->outputData($message);
-                    }
-                }
-
-                return $this->raiseError($obj);
-            }
-
-            if ($obj->getPackagexmlVersion() != '1.0') {
-                return $this->_doInfo2($command, $options, $params, $obj, false);
-            }
-
-            $info = $obj->toArray();
-        } else {
-            $parsed = $reg->parsePackageName($params[0], $this->config->get('default_channel'));
-            if (PEAR::isError($parsed)) {
-                return $this->raiseError($parsed);
-            }
-
-            $package = $parsed['package'];
-            $channel = $parsed['channel'];
-            $info = $reg->packageInfo($package, null, $channel);
-            if (isset($info['old'])) {
-                $obj = $reg->getPackage($package, $channel);
-                return $this->_doInfo2($command, $options, $params, $obj, true);
-            }
-        }
-
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-
-        if (empty($info)) {
-            $this->raiseError("No information found for `$params[0]'");
-            return;
-        }
-
-        unset($info['filelist']);
-        unset($info['dirtree']);
-        unset($info['changelog']);
-        if (isset($info['xsdversion'])) {
-            $info['package.xml version'] = $info['xsdversion'];
-            unset($info['xsdversion']);
-        }
-
-        if (isset($info['packagerversion'])) {
-            $info['packaged with PEAR version'] = $info['packagerversion'];
-            unset($info['packagerversion']);
-        }
-
-        $keys = array_keys($info);
-        $longtext = array('description', 'summary');
-        foreach ($keys as $key) {
-            if (is_array($info[$key])) {
-                switch ($key) {
-                    case 'maintainers': {
-                        $i = 0;
-                        $mstr = '';
-                        foreach ($info[$key] as $m) {
-                            if ($i++ > 0) {
-                                $mstr .= "\n";
-                            }
-                            $mstr .= $m['name'] . " <";
-                            if (isset($m['email'])) {
-                                $mstr .= $m['email'];
-                            } else {
-                                $mstr .= $m['handle'] . '@php.net';
-                            }
-                            $mstr .= "> ($m[role])";
-                        }
-                        $info[$key] = $mstr;
-                        break;
-                    }
-                    case 'release_deps': {
-                        $i = 0;
-                        $dstr = '';
-                        foreach ($info[$key] as $d) {
-                            if (isset($this->_deps_rel_trans[$d['rel']])) {
-                                $rel = $this->_deps_rel_trans[$d['rel']];
-                            } else {
-                                $rel = $d['rel'];
-                            }
-                            if (isset($this->_deps_type_trans[$d['type']])) {
-                                $type = ucfirst($this->_deps_type_trans[$d['type']]);
-                            } else {
-                                $type = $d['type'];
-                            }
-                            if (isset($d['name'])) {
-                                $name = $d['name'] . ' ';
-                            } else {
-                                $name = '';
-                            }
-                            if (isset($d['version'])) {
-                                $version = $d['version'] . ' ';
-                            } else {
-                                $version = '';
-                            }
-                            if (isset($d['optional']) && $d['optional'] == 'yes') {
-                                $optional = ' (optional)';
-                            } else {
-                                $optional = '';
-                            }
-                            $dstr .= "$type $name$rel $version$optional\n";
-                        }
-                        $info[$key] = $dstr;
-                        break;
-                    }
-                    case 'provides' : {
-                        $debug = $this->config->get('verbose');
-                        if ($debug < 2) {
-                            $pstr = 'Classes: ';
-                        } else {
-                            $pstr = '';
-                        }
-                        $i = 0;
-                        foreach ($info[$key] as $p) {
-                            if ($debug < 2 && $p['type'] != "class") {
-                                continue;
-                            }
-                            // Only print classes when verbosity mode is < 2
-                            if ($debug < 2) {
-                                if ($i++ > 0) {
-                                    $pstr .= ", ";
-                                }
-                                $pstr .= $p['name'];
-                            } else {
-                                if ($i++ > 0) {
-                                    $pstr .= "\n";
-                                }
-                                $pstr .= ucfirst($p['type']) . " " . $p['name'];
-                                if (isset($p['explicit']) && $p['explicit'] == 1) {
-                                    $pstr .= " (explicit)";
-                                }
-                            }
-                        }
-                        $info[$key] = $pstr;
-                        break;
-                    }
-                    case 'configure_options' : {
-                        foreach ($info[$key] as $i => $p) {
-                            $info[$key][$i] = array_map(null, array_keys($p), array_values($p));
-                            $info[$key][$i] = array_map(create_function('$a',
-                                'return join(" = ",$a);'), $info[$key][$i]);
-                            $info[$key][$i] = implode(', ', $info[$key][$i]);
-                        }
-                        $info[$key] = implode("\n", $info[$key]);
-                        break;
-                    }
-                    default: {
-                        $info[$key] = implode(", ", $info[$key]);
-                        break;
-                    }
-                }
-            }
-
-            if ($key == '_lastmodified') {
-                $hdate = date('Y-m-d', $info[$key]);
-                unset($info[$key]);
-                $info['Last Modified'] = $hdate;
-            } elseif ($key == '_lastversion') {
-                $info['Previous Installed Version'] = $info[$key] ? $info[$key] : '- None -';
-                unset($info[$key]);
-            } else {
-                $info[$key] = trim($info[$key]);
-                if (in_array($key, $longtext)) {
-                    $info[$key] = preg_replace('/  +/', ' ', $info[$key]);
-                }
-            }
-        }
-
-        $caption = 'About ' . $info['package'] . '-' . $info['version'];
-        $data = array(
-            'caption' => $caption,
-            'border' => true);
-        foreach ($info as $key => $value) {
-            $key = ucwords(trim(str_replace('_', ' ', $key)));
-            $data['data'][] = array($key, $value);
-        }
-        $data['raw'] = $info;
-
-        $this->ui->outputData($data, 'package-info');
-    }
-
-    /**
-     * @access private
-     */
-    function _doInfo2($command, $options, $params, &$obj, $installed)
-    {
-        $reg = &$this->config->getRegistry();
-        $caption = 'About ' . $obj->getChannel() . '/' .$obj->getPackage() . '-' .
-            $obj->getVersion();
-        $data = array(
-            'caption' => $caption,
-            'border' => true);
-        switch ($obj->getPackageType()) {
-            case 'php' :
-                $release = 'PEAR-style PHP-based Package';
-            break;
-            case 'extsrc' :
-                $release = 'PECL-style PHP extension (source code)';
-            break;
-            case 'zendextsrc' :
-                $release = 'PECL-style Zend extension (source code)';
-            break;
-            case 'extbin' :
-                $release = 'PECL-style PHP extension (binary)';
-            break;
-            case 'zendextbin' :
-                $release = 'PECL-style Zend extension (binary)';
-            break;
-            case 'bundle' :
-                $release = 'Package bundle (collection of packages)';
-            break;
-        }
-        $extends = $obj->getExtends();
-        $extends = $extends ?
-            $obj->getPackage() . ' (extends ' . $extends . ')' : $obj->getPackage();
-        if ($src = $obj->getSourcePackage()) {
-            $extends .= ' (source package ' . $src['channel'] . '/' . $src['package'] . ')';
-        }
-
-        $info = array(
-            'Release Type' => $release,
-            'Name' => $extends,
-            'Channel' => $obj->getChannel(),
-            'Summary' => preg_replace('/  +/', ' ', $obj->getSummary()),
-            'Description' => preg_replace('/  +/', ' ', $obj->getDescription()),
-            );
-        $info['Maintainers'] = '';
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            $leads = $obj->{"get{$role}s"}();
-            if (!$leads) {
-                continue;
-            }
-
-            if (isset($leads['active'])) {
-                $leads = array($leads);
-            }
-
-            foreach ($leads as $lead) {
-                if (!empty($info['Maintainers'])) {
-                    $info['Maintainers'] .= "\n";
-                }
-
-                $active = $lead['active'] == 'no' ? ', inactive' : '';
-                $info['Maintainers'] .= $lead['name'] . ' <';
-                $info['Maintainers'] .= $lead['email'] . "> ($role$active)";
-            }
-        }
-
-        $info['Release Date'] = $obj->getDate();
-        if ($time = $obj->getTime()) {
-            $info['Release Date'] .= ' ' . $time;
-        }
-
-        $info['Release Version'] = $obj->getVersion() . ' (' . $obj->getState() . ')';
-        $info['API Version'] = $obj->getVersion('api') . ' (' . $obj->getState('api') . ')';
-        $info['License'] = $obj->getLicense();
-        $uri = $obj->getLicenseLocation();
-        if ($uri) {
-            if (isset($uri['uri'])) {
-                $info['License'] .= ' (' . $uri['uri'] . ')';
-            } else {
-                $extra = $obj->getInstalledLocation($info['filesource']);
-                if ($extra) {
-                    $info['License'] .= ' (' . $uri['filesource'] . ')';
-                }
-            }
-        }
-
-        $info['Release Notes'] = $obj->getNotes();
-        if ($compat = $obj->getCompatible()) {
-            if (!isset($compat[0])) {
-                $compat = array($compat);
-            }
-
-            $info['Compatible with'] = '';
-            foreach ($compat as $package) {
-                $info['Compatible with'] .= $package['channel'] . '/' . $package['name'] .
-                    "\nVersions >= " . $package['min'] . ', <= ' . $package['max'];
-                if (isset($package['exclude'])) {
-                    if (is_array($package['exclude'])) {
-                        $package['exclude'] = implode(', ', $package['exclude']);
-                    }
-
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= $package['channel'] . '/' .
-                        $package['name'] . "\nVersions " . $package['exclude'];
-                }
-            }
-        }
-
-        $usesrole = $obj->getUsesrole();
-        if ($usesrole) {
-            if (!isset($usesrole[0])) {
-                $usesrole = array($usesrole);
-            }
-
-            foreach ($usesrole as $roledata) {
-                if (isset($info['Uses Custom Roles'])) {
-                    $info['Uses Custom Roles'] .= "\n";
-                } else {
-                    $info['Uses Custom Roles'] = '';
-                }
-
-                if (isset($roledata['package'])) {
-                    $rolepackage = $reg->parsedPackageNameToString($roledata, true);
-                } else {
-                    $rolepackage = $roledata['uri'];
-                }
-                $info['Uses Custom Roles'] .= $roledata['role'] . ' (' . $rolepackage . ')';
-            }
-        }
-
-        $usestask = $obj->getUsestask();
-        if ($usestask) {
-            if (!isset($usestask[0])) {
-                $usestask = array($usestask);
-            }
-
-            foreach ($usestask as $taskdata) {
-                if (isset($info['Uses Custom Tasks'])) {
-                    $info['Uses Custom Tasks'] .= "\n";
-                } else {
-                    $info['Uses Custom Tasks'] = '';
-                }
-
-                if (isset($taskdata['package'])) {
-                    $taskpackage = $reg->parsedPackageNameToString($taskdata, true);
-                } else {
-                    $taskpackage = $taskdata['uri'];
-                }
-                $info['Uses Custom Tasks'] .= $taskdata['task'] . ' (' . $taskpackage . ')';
-            }
-        }
-
-        $deps = $obj->getDependencies();
-        $info['Required Dependencies'] = 'PHP version ' . $deps['required']['php']['min'];
-        if (isset($deps['required']['php']['max'])) {
-            $info['Required Dependencies'] .= '-' . $deps['required']['php']['max'] . "\n";
-        } else {
-            $info['Required Dependencies'] .= "\n";
-        }
-
-        if (isset($deps['required']['php']['exclude'])) {
-            if (!isset($info['Not Compatible with'])) {
-                $info['Not Compatible with'] = '';
-            } else {
-                $info['Not Compatible with'] .= "\n";
-            }
-
-            if (is_array($deps['required']['php']['exclude'])) {
-                $deps['required']['php']['exclude'] =
-                    implode(', ', $deps['required']['php']['exclude']);
-            }
-            $info['Not Compatible with'] .= "PHP versions\n  " .
-                $deps['required']['php']['exclude'];
-        }
-
-        $info['Required Dependencies'] .= 'PEAR installer version';
-        if (isset($deps['required']['pearinstaller']['max'])) {
-            $info['Required Dependencies'] .= 's ' .
-                $deps['required']['pearinstaller']['min'] . '-' .
-                $deps['required']['pearinstaller']['max'];
-        } else {
-            $info['Required Dependencies'] .= ' ' .
-                $deps['required']['pearinstaller']['min'] . ' or newer';
-        }
-
-        if (isset($deps['required']['pearinstaller']['exclude'])) {
-            if (!isset($info['Not Compatible with'])) {
-                $info['Not Compatible with'] = '';
-            } else {
-                $info['Not Compatible with'] .= "\n";
-            }
-
-            if (is_array($deps['required']['pearinstaller']['exclude'])) {
-                $deps['required']['pearinstaller']['exclude'] =
-                    implode(', ', $deps['required']['pearinstaller']['exclude']);
-            }
-            $info['Not Compatible with'] .= "PEAR installer\n  Versions " .
-                $deps['required']['pearinstaller']['exclude'];
-        }
-
-        foreach (array('Package', 'Extension') as $type) {
-            $index = strtolower($type);
-            if (isset($deps['required'][$index])) {
-                if (isset($deps['required'][$index]['name'])) {
-                    $deps['required'][$index] = array($deps['required'][$index]);
-                }
-
-                foreach ($deps['required'][$index] as $package) {
-                    if (isset($package['conflicts'])) {
-                        $infoindex = 'Not Compatible with';
-                        if (!isset($info['Not Compatible with'])) {
-                            $info['Not Compatible with'] = '';
-                        } else {
-                            $info['Not Compatible with'] .= "\n";
-                        }
-                    } else {
-                        $infoindex = 'Required Dependencies';
-                        $info[$infoindex] .= "\n";
-                    }
-
-                    if ($index == 'extension') {
-                        $name = $package['name'];
-                    } else {
-                        if (isset($package['channel'])) {
-                            $name = $package['channel'] . '/' . $package['name'];
-                        } else {
-                            $name = '__uri/' . $package['name'] . ' (static URI)';
-                        }
-                    }
-
-                    $info[$infoindex] .= "$type $name";
-                    if (isset($package['uri'])) {
-                        $info[$infoindex] .= "\n  Download URI: $package[uri]";
-                        continue;
-                    }
-
-                    if (isset($package['max']) && isset($package['min'])) {
-                        $info[$infoindex] .= " \n  Versions " .
-                            $package['min'] . '-' . $package['max'];
-                    } elseif (isset($package['min'])) {
-                        $info[$infoindex] .= " \n  Version " .
-                            $package['min'] . ' or newer';
-                    } elseif (isset($package['max'])) {
-                        $info[$infoindex] .= " \n  Version " .
-                            $package['max'] . ' or older';
-                    }
-
-                    if (isset($package['recommended'])) {
-                        $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
-                    }
-
-                    if (isset($package['exclude'])) {
-                        if (!isset($info['Not Compatible with'])) {
-                            $info['Not Compatible with'] = '';
-                        } else {
-                            $info['Not Compatible with'] .= "\n";
-                        }
-
-                        if (is_array($package['exclude'])) {
-                            $package['exclude'] = implode(', ', $package['exclude']);
-                        }
-
-                        $package['package'] = $package['name']; // for parsedPackageNameToString
-                         if (isset($package['conflicts'])) {
-                            $info['Not Compatible with'] .= '=> except ';
-                        }
-                       $info['Not Compatible with'] .= 'Package ' .
-                            $reg->parsedPackageNameToString($package, true);
-                        $info['Not Compatible with'] .= "\n  Versions " . $package['exclude'];
-                    }
-                }
-            }
-        }
-
-        if (isset($deps['required']['os'])) {
-            if (isset($deps['required']['os']['name'])) {
-                $dep['required']['os']['name'] = array($dep['required']['os']['name']);
-            }
-
-            foreach ($dep['required']['os'] as $os) {
-                if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= "$os[name] Operating System";
-                } else {
-                    $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "$os[name] Operating System";
-                }
-            }
-        }
-
-        if (isset($deps['required']['arch'])) {
-            if (isset($deps['required']['arch']['pattern'])) {
-                $dep['required']['arch']['pattern'] = array($dep['required']['os']['pattern']);
-            }
-
-            foreach ($dep['required']['arch'] as $os) {
-                if (isset($os['conflicts']) && $os['conflicts'] == 'yes') {
-                    if (!isset($info['Not Compatible with'])) {
-                        $info['Not Compatible with'] = '';
-                    } else {
-                        $info['Not Compatible with'] .= "\n";
-                    }
-                    $info['Not Compatible with'] .= "OS/Arch matching pattern '/$os[pattern]/'";
-                } else {
-                    $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "OS/Arch matching pattern '/$os[pattern]/'";
-                }
-            }
-        }
-
-        if (isset($deps['optional'])) {
-            foreach (array('Package', 'Extension') as $type) {
-                $index = strtolower($type);
-                if (isset($deps['optional'][$index])) {
-                    if (isset($deps['optional'][$index]['name'])) {
-                        $deps['optional'][$index] = array($deps['optional'][$index]);
-                    }
-
-                    foreach ($deps['optional'][$index] as $package) {
-                        if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                            $infoindex = 'Not Compatible with';
-                            if (!isset($info['Not Compatible with'])) {
-                                $info['Not Compatible with'] = '';
-                            } else {
-                                $info['Not Compatible with'] .= "\n";
-                            }
-                        } else {
-                            $infoindex = 'Optional Dependencies';
-                            if (!isset($info['Optional Dependencies'])) {
-                                $info['Optional Dependencies'] = '';
-                            } else {
-                                $info['Optional Dependencies'] .= "\n";
-                            }
-                        }
-
-                        if ($index == 'extension') {
-                            $name = $package['name'];
-                        } else {
-                            if (isset($package['channel'])) {
-                                $name = $package['channel'] . '/' . $package['name'];
-                            } else {
-                                $name = '__uri/' . $package['name'] . ' (static URI)';
-                            }
-                        }
-
-                        $info[$infoindex] .= "$type $name";
-                        if (isset($package['uri'])) {
-                            $info[$infoindex] .= "\n  Download URI: $package[uri]";
-                            continue;
-                        }
-
-                        if ($infoindex == 'Not Compatible with') {
-                            // conflicts is only used to say that all versions conflict
-                            continue;
-                        }
-
-                        if (isset($package['max']) && isset($package['min'])) {
-                            $info[$infoindex] .= " \n  Versions " .
-                                $package['min'] . '-' . $package['max'];
-                        } elseif (isset($package['min'])) {
-                            $info[$infoindex] .= " \n  Version " .
-                                $package['min'] . ' or newer';
-                        } elseif (isset($package['max'])) {
-                            $info[$infoindex] .= " \n  Version " .
-                                $package['min'] . ' or older';
-                        }
-
-                        if (isset($package['recommended'])) {
-                            $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
-                        }
-
-                        if (isset($package['exclude'])) {
-                            if (!isset($info['Not Compatible with'])) {
-                                $info['Not Compatible with'] = '';
-                            } else {
-                                $info['Not Compatible with'] .= "\n";
-                            }
-
-                            if (is_array($package['exclude'])) {
-                                $package['exclude'] = implode(', ', $package['exclude']);
-                            }
-
-                            $info['Not Compatible with'] .= "Package $package\n  Versions " .
-                                $package['exclude'];
-                        }
-                    }
-                }
-            }
-        }
-
-        if (isset($deps['group'])) {
-            if (!isset($deps['group'][0])) {
-                $deps['group'] = array($deps['group']);
-            }
-
-            foreach ($deps['group'] as $group) {
-                $info['Dependency Group ' . $group['attribs']['name']] = $group['attribs']['hint'];
-                $groupindex = $group['attribs']['name'] . ' Contents';
-                $info[$groupindex] = '';
-                foreach (array('Package', 'Extension') as $type) {
-                    $index = strtolower($type);
-                    if (isset($group[$index])) {
-                        if (isset($group[$index]['name'])) {
-                            $group[$index] = array($group[$index]);
-                        }
-
-                        foreach ($group[$index] as $package) {
-                            if (!empty($info[$groupindex])) {
-                                $info[$groupindex] .= "\n";
-                            }
-
-                            if ($index == 'extension') {
-                                $name = $package['name'];
-                            } else {
-                                if (isset($package['channel'])) {
-                                    $name = $package['channel'] . '/' . $package['name'];
-                                } else {
-                                    $name = '__uri/' . $package['name'] . ' (static URI)';
-                                }
-                            }
-
-                            if (isset($package['uri'])) {
-                                if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                                    $info[$groupindex] .= "Not Compatible with $type $name";
-                                } else {
-                                    $info[$groupindex] .= "$type $name";
-                                }
-
-                                $info[$groupindex] .= "\n  Download URI: $package[uri]";
-                                continue;
-                            }
-
-                            if (isset($package['conflicts']) && $package['conflicts'] == 'yes') {
-                                $info[$groupindex] .= "Not Compatible with $type $name";
-                                continue;
-                            }
-
-                            $info[$groupindex] .= "$type $name";
-                            if (isset($package['max']) && isset($package['min'])) {
-                                $info[$groupindex] .= " \n  Versions " .
-                                    $package['min'] . '-' . $package['max'];
-                            } elseif (isset($package['min'])) {
-                                $info[$groupindex] .= " \n  Version " .
-                                    $package['min'] . ' or newer';
-                            } elseif (isset($package['max'])) {
-                                $info[$groupindex] .= " \n  Version " .
-                                    $package['min'] . ' or older';
-                            }
-
-                            if (isset($package['recommended'])) {
-                                $info[$groupindex] .= "\n  Recommended version: $package[recommended]";
-                            }
-
-                            if (isset($package['exclude'])) {
-                                if (!isset($info['Not Compatible with'])) {
-                                    $info['Not Compatible with'] = '';
-                                } else {
-                                    $info[$groupindex] .= "Not Compatible with\n";
-                                }
-
-                                if (is_array($package['exclude'])) {
-                                    $package['exclude'] = implode(', ', $package['exclude']);
-                                }
-                                $info[$groupindex] .= "  Package $package\n  Versions " .
-                                    $package['exclude'];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if ($obj->getPackageType() == 'bundle') {
-            $info['Bundled Packages'] = '';
-            foreach ($obj->getBundledPackages() as $package) {
-                if (!empty($info['Bundled Packages'])) {
-                    $info['Bundled Packages'] .= "\n";
-                }
-
-                if (isset($package['uri'])) {
-                    $info['Bundled Packages'] .= '__uri/' . $package['name'];
-                    $info['Bundled Packages'] .= "\n  (URI: $package[uri]";
-                } else {
-                    $info['Bundled Packages'] .= $package['channel'] . '/' . $package['name'];
-                }
-            }
-        }
-
-        $info['package.xml version'] = '2.0';
-        if ($installed) {
-            if ($obj->getLastModified()) {
-                $info['Last Modified'] = date('Y-m-d H:i', $obj->getLastModified());
-            }
-
-            $v = $obj->getLastInstalledVersion();
-            $info['Previous Installed Version'] = $v ? $v : '- None -';
-        }
-
-        foreach ($info as $key => $value) {
-            $data['data'][] = array($key, $value);
-        }
-
-        $data['raw'] = $obj->getArray(); // no validation needed
-        $this->ui->outputData($data, 'package-info');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Registry.xml b/airtime_mvc/library/pear/PEAR/Command/Registry.xml
deleted file mode 100644
index 9f4e21496..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Registry.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<commands version="1.0">
- <list>
-  <summary>List Installed Packages In The Default Channel</summary>
-  <function>doList</function>
-  <shortcut>l</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>list installed packages from this channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-   <allchannels>
-    <shortopt>a</shortopt>
-    <doc>list installed packages from all channels</doc>
-   </allchannels>
-   <channelinfo>
-    <shortopt>i</shortopt>
-    <doc>output fully channel-aware data, even on failure</doc>
-   </channelinfo>
-  </options>
-  <doc>&lt;package&gt;
-If invoked without parameters, this command lists the PEAR packages
-installed in your php_dir ({config php_dir}).  With a parameter, it
-lists the files in a package.
-</doc>
- </list>
- <list-files>
-  <summary>List Files In Installed Package</summary>
-  <function>doFileList</function>
-  <shortcut>fl</shortcut>
-  <options />
-  <doc>&lt;package&gt;
-List the files in an installed package.
-</doc>
- </list-files>
- <shell-test>
-  <summary>Shell Script Test</summary>
-  <function>doShellTest</function>
-  <shortcut>st</shortcut>
-  <options />
-  <doc>&lt;package&gt; [[relation] version]
-Tests if a package is installed in the system. Will exit(1) if it is not.
-   &lt;relation&gt;   The version comparison operator. One of:
-                &lt;, lt, &lt;=, le, &gt;, gt, &gt;=, ge, ==, =, eq, !=, &lt;&gt;, ne
-   &lt;version&gt;    The version to compare with
-</doc>
- </shell-test>
- <info>
-  <summary>Display information about a package</summary>
-  <function>doInfo</function>
-  <shortcut>in</shortcut>
-  <options />
-  <doc>&lt;package&gt;
-Displays information about a package. The package argument may be a
-local package file, an URL to a package file, or the name of an
-installed package.</doc>
- </info>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Remote.php b/airtime_mvc/library/pear/PEAR/Command/Remote.php
deleted file mode 100644
index 0bb848034..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Remote.php
+++ /dev/null
@@ -1,809 +0,0 @@
-<?php
-/**
- * PEAR_Command_Remote (remote-info, list-upgrades, remote-list, search, list-all, download,
- * clear-cache commands)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Remote.php 287477 2009-08-19 14:19:43Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-require_once 'PEAR/REST.php';
-
-/**
- * PEAR commands for remote server querying
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Command_Remote extends PEAR_Command_Common
-{
-    var $commands = array(
-        'remote-info' => array(
-            'summary' => 'Information About Remote Packages',
-            'function' => 'doRemoteInfo',
-            'shortcut' => 'ri',
-            'options' => array(),
-            'doc' => '<package>
-Get details on a package from the server.',
-            ),
-        'list-upgrades' => array(
-            'summary' => 'List Available Upgrades',
-            'function' => 'doListUpgrades',
-            'shortcut' => 'lu',
-            'options' => array(
-                'channelinfo' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'output fully channel-aware data, even on failure',
-                    ),
-            ),
-            'doc' => '[preferred_state]
-List releases on the server of packages you have installed where
-a newer version is available with the same release state (stable etc.)
-or the state passed as the second parameter.'
-            ),
-        'remote-list' => array(
-            'summary' => 'List Remote Packages',
-            'function' => 'doRemoteList',
-            'shortcut' => 'rl',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    )
-                ),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'search' => array(
-            'summary' => 'Search remote package database',
-            'function' => 'doSearch',
-            'shortcut' => 'sp',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    ),
-                'allchannels' => array(
-                    'shortopt' => 'a',
-                    'doc' => 'search packages from all known channels',
-                    ),
-                'channelinfo' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'output fully channel-aware data, even on failure',
-                    ),
-                ),
-            'doc' => '[packagename] [packageinfo]
-Lists all packages which match the search parameters.  The first
-parameter is a fragment of a packagename.  The default channel
-will be used unless explicitly overridden.  The second parameter
-will be used to match any portion of the summary/description',
-            ),
-        'list-all' => array(
-            'summary' => 'List All Packages',
-            'function' => 'doListAll',
-            'shortcut' => 'la',
-            'options' => array(
-                'channel' =>
-                    array(
-                    'shortopt' => 'c',
-                    'doc' => 'specify a channel other than the default channel',
-                    'arg' => 'CHAN',
-                    ),
-                'channelinfo' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'output fully channel-aware data, even on failure',
-                    ),
-                ),
-            'doc' => '
-Lists the packages available on the configured server along with the
-latest stable release of each package.',
-            ),
-        'download' => array(
-            'summary' => 'Download Package',
-            'function' => 'doDownload',
-            'shortcut' => 'd',
-            'options' => array(
-                'nocompress' => array(
-                    'shortopt' => 'Z',
-                    'doc' => 'download an uncompressed (.tar) file',
-                    ),
-                ),
-            'doc' => '<package>...
-Download package tarballs.  The files will be named as suggested by the
-server, for example if you download the DB package and the latest stable
-version of DB is 1.6.5, the downloaded file will be DB-1.6.5.tgz.',
-            ),
-        'clear-cache' => array(
-            'summary' => 'Clear Web Services Cache',
-            'function' => 'doClearCache',
-            'shortcut' => 'cc',
-            'options' => array(),
-            'doc' => '
-Clear the XML-RPC/REST cache.  See also the cache_ttl configuration
-parameter.
-',
-            ),
-        );
-
-    /**
-     * PEAR_Command_Remote constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Remote(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function _checkChannelForStatus($channel, $chan)
-    {
-        if (PEAR::isError($chan)) {
-            $this->raiseError($chan);
-        }
-        if (!is_a($chan, 'PEAR_ChannelFile')) {
-            return $this->raiseError('Internal corruption error: invalid channel "' .
-                $channel . '"');
-        }
-        $rest = new PEAR_REST($this->config);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $mirror = $this->config->get('preferred_mirror', null,
-                                     $channel);
-        $a = $rest->downloadHttp('http://' . $channel .
-            '/channel.xml', $chan->lastModified());
-        PEAR::staticPopErrorHandling();
-        if (!PEAR::isError($a) && $a) {
-            $this->ui->outputData('WARNING: channel "' . $channel . '" has ' .
-                'updated its protocols, use "' . PEAR_RUNTYPE . ' channel-update ' . $channel .
-                '" to update');
-        }
-    }
-
-    function doRemoteInfo($command, $options, $params)
-    {
-        if (sizeof($params) != 1) {
-            return $this->raiseError("$command expects one param: the remote package name");
-        }
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        $package = $params[0];
-        $parsed = $reg->parsePackageName($package, $channel);
-        if (PEAR::isError($parsed)) {
-            return $this->raiseError('Invalid package name "' . $package . '"');
-        }
-
-        $channel = $parsed['channel'];
-        $this->config->set('default_channel', $channel);
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-
-        $mirror = $this->config->get('preferred_mirror');
-        if ($chan->supportsREST($mirror) && $base = $chan->getBaseURL('REST1.0', $mirror)) {
-            $rest = &$this->config->getREST('1.0', array());
-            $info = $rest->packageInfo($base, $parsed['package'], $channel);
-        }
-
-        if (!isset($info)) {
-            return $this->raiseError('No supported protocol was found');
-        }
-
-        if (PEAR::isError($info)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($info);
-        }
-
-        if (!isset($info['name'])) {
-            return $this->raiseError('No remote package "' . $package . '" was found');
-        }
-
-        $installed = $reg->packageInfo($info['name'], null, $channel);
-        $info['installed'] = $installed['version'] ? $installed['version'] : '- no -';
-        if (is_array($info['installed'])) {
-            $info['installed'] = $info['installed']['release'];
-        }
-
-        $this->ui->outputData($info, $command);
-        $this->config->set('default_channel', $savechannel);
-
-        return true;
-    }
-
-    function doRemoteList($command, $options, $params)
-    {
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (isset($options['channel'])) {
-            $channel = $options['channel'];
-            if (!$reg->channelExists($channel)) {
-                return $this->raiseError('Channel "' . $channel . '" does not exist');
-            }
-
-            $this->config->set('default_channel', $channel);
-        }
-
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable') {
-            $list_options = true;
-        }
-
-        $available = array();
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.1', $this->config->get('preferred_mirror'))
-        ) {
-            // use faster list-all if available
-            $rest = &$this->config->getREST('1.1', array());
-            $available = $rest->listAll($base, $list_options, true, false, false, $chan->getName());
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, $list_options, true, false, false, $chan->getName());
-        }
-
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($available);
-        }
-
-        $i = $j = 0;
-        $data = array(
-            'caption' => 'Channel ' . $channel . ' Available packages:',
-            'border' => true,
-            'headline' => array('Package', 'Version'),
-            'channel' => $channel
-            );
-
-        if (count($available) == 0) {
-            $data = '(no packages available yet)';
-        } else {
-            foreach ($available as $name => $info) {
-                $version = (isset($info['stable']) && $info['stable']) ? $info['stable'] : '-n/a-';
-                $data['data'][] = array($name, $version);
-            }
-        }
-        $this->ui->outputData($data, $command);
-        $this->config->set('default_channel', $savechannel);
-        return true;
-    }
-
-    function doListAll($command, $options, $params)
-    {
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        if (isset($options['channel'])) {
-            $channel = $options['channel'];
-            if (!$reg->channelExists($channel)) {
-                return $this->raiseError("Channel \"$channel\" does not exist");
-            }
-
-            $this->config->set('default_channel', $channel);
-        }
-
-        $list_options = false;
-        if ($this->config->get('preferred_state') == 'stable') {
-            $list_options = true;
-        }
-
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.1', $this->config->get('preferred_mirror'))) {
-            // use faster list-all if available
-            $rest = &$this->config->getREST('1.1', array());
-            $available = $rest->listAll($base, $list_options, false, false, false, $chan->getName());
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, $list_options, false, false, false, $chan->getName());
-        }
-
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "' . $available->getMessage() . '")');
-        }
-
-        $data = array(
-            'caption' => 'All packages [Channel ' . $channel . ']:',
-            'border' => true,
-            'headline' => array('Package', 'Latest', 'Local'),
-            'channel' => $channel,
-            );
-
-        if (isset($options['channelinfo'])) {
-            // add full channelinfo
-            $data['caption'] = 'Channel ' . $channel . ' All packages:';
-            $data['headline'] = array('Channel', 'Package', 'Latest', 'Local',
-                'Description', 'Dependencies');
-        }
-        $local_pkgs = $reg->listPackages($channel);
-
-        foreach ($available as $name => $info) {
-            $installed = $reg->packageInfo($name, null, $channel);
-            if (is_array($installed['version'])) {
-                $installed['version'] = $installed['version']['release'];
-            }
-            $desc = $info['summary'];
-            if (isset($params[$name])) {
-                $desc .= "\n\n".$info['description'];
-            }
-            if (isset($options['mode']))
-            {
-                if ($options['mode'] == 'installed' && !isset($installed['version'])) {
-                    continue;
-                }
-                if ($options['mode'] == 'notinstalled' && isset($installed['version'])) {
-                    continue;
-                }
-                if ($options['mode'] == 'upgrades'
-                      && (!isset($installed['version']) || version_compare($installed['version'],
-                      $info['stable'], '>='))) {
-                    continue;
-                }
-            }
-            $pos = array_search(strtolower($name), $local_pkgs);
-            if ($pos !== false) {
-                unset($local_pkgs[$pos]);
-            }
-
-            if (isset($info['stable']) && !$info['stable']) {
-                $info['stable'] = null;
-            }
-
-            if (isset($options['channelinfo'])) {
-                // add full channelinfo
-                if ($info['stable'] === $info['unstable']) {
-                    $state = $info['state'];
-                } else {
-                    $state = 'stable';
-                }
-                $latest = $info['stable'].' ('.$state.')';
-                $local = '';
-                if (isset($installed['version'])) {
-                    $inst_state = $reg->packageInfo($name, 'release_state', $channel);
-                    $local = $installed['version'].' ('.$inst_state.')';
-                }
-
-                $packageinfo = array(
-                    $channel,
-                    $name,
-                    $latest,
-                    $local,
-                    isset($desc) ? $desc : null,
-                    isset($info['deps']) ? $info['deps'] : null,
-                );
-            } else {
-                $packageinfo = array(
-                    $reg->channelAlias($channel) . '/' . $name,
-                    isset($info['stable']) ? $info['stable'] : null,
-                    isset($installed['version']) ? $installed['version'] : null,
-                    isset($desc) ? $desc : null,
-                    isset($info['deps']) ? $info['deps'] : null,
-                );
-            }
-            $data['data'][$info['category']][] = $packageinfo;
-        }
-
-        if (isset($options['mode']) && in_array($options['mode'], array('notinstalled', 'upgrades'))) {
-            $this->config->set('default_channel', $savechannel);
-            $this->ui->outputData($data, $command);
-            return true;
-        }
-
-        foreach ($local_pkgs as $name) {
-            $info = &$reg->getPackage($name, $channel);
-            $data['data']['Local'][] = array(
-                $reg->channelAlias($channel) . '/' . $info->getPackage(),
-                '',
-                $info->getVersion(),
-                $info->getSummary(),
-                $info->getDeps()
-                );
-        }
-
-        $this->config->set('default_channel', $savechannel);
-        $this->ui->outputData($data, $command);
-        return true;
-    }
-
-    function doSearch($command, $options, $params)
-    {
-        if ((!isset($params[0]) || empty($params[0]))
-            && (!isset($params[1]) || empty($params[1])))
-        {
-            return $this->raiseError('no valid search string supplied');
-        }
-
-        $channelinfo = isset($options['channelinfo']);
-        $reg = &$this->config->getRegistry();
-        if (isset($options['allchannels'])) {
-            // search all channels
-            unset($options['allchannels']);
-            $channels = $reg->getChannels();
-            $errors = array();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            foreach ($channels as $channel) {
-                if ($channel->getName() != '__uri') {
-                    $options['channel'] = $channel->getName();
-                    $ret = $this->doSearch($command, $options, $params);
-                    if (PEAR::isError($ret)) {
-                        $errors[] = $ret;
-                    }
-                }
-            }
-
-            PEAR::staticPopErrorHandling();
-            if (count($errors) !== 0) {
-                // for now, only give first error
-                return PEAR::raiseError($errors[0]);
-            }
-
-            return true;
-        }
-
-        $savechannel = $channel = $this->config->get('default_channel');
-        $package = strtolower($params[0]);
-        $summary = isset($params[1]) ? $params[1] : false;
-        if (isset($options['channel'])) {
-            $reg = &$this->config->getRegistry();
-            $channel = $options['channel'];
-            if (!$reg->channelExists($channel)) {
-                return $this->raiseError('Channel "' . $channel . '" does not exist');
-            }
-
-            $this->config->set('default_channel', $channel);
-        }
-
-        $chan = $reg->getChannel($channel);
-        if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-            return $e;
-        }
-
-        if ($chan->supportsREST($this->config->get('preferred_mirror')) &&
-              $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) {
-            $rest = &$this->config->getREST('1.0', array());
-            $available = $rest->listAll($base, false, false, $package, $summary, $chan->getName());
-        }
-
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($available);
-        }
-
-        if (!$available && !$channelinfo) {
-            // clean exit when not found, no error !
-            $data = 'no packages found that match pattern "' . $package . '", for channel '.$channel.'.';
-            $this->ui->outputData($data);
-            $this->config->set('default_channel', $channel);
-            return true;
-        }
-
-        if ($channelinfo) {
-            $data = array(
-                'caption' => 'Matched packages, channel ' . $channel . ':',
-                'border' => true,
-                'headline' => array('Channel', 'Package', 'Stable/(Latest)', 'Local'),
-                'channel' => $channel
-                );
-        } else {
-            $data = array(
-                'caption' => 'Matched packages, channel ' . $channel . ':',
-                'border' => true,
-                'headline' => array('Package', 'Stable/(Latest)', 'Local'),
-                'channel' => $channel
-                );
-        }
-
-        if (!$available && $channelinfo) {
-            unset($data['headline']);
-            $data['data'] = 'No packages found that match pattern "' . $package . '".';
-            $available = array();
-        }
-
-        foreach ($available as $name => $info) {
-            $installed = $reg->packageInfo($name, null, $channel);
-            $desc = $info['summary'];
-            if (isset($params[$name]))
-                $desc .= "\n\n".$info['description'];
-
-            if (!isset($info['stable']) || !$info['stable']) {
-                $version_remote = 'none';
-            } else {
-                if ($info['unstable']) {
-                    $version_remote = $info['unstable'];
-                } else {
-                    $version_remote = $info['stable'];
-                }
-                $version_remote .= ' ('.$info['state'].')';
-            }
-            $version = is_array($installed['version']) ? $installed['version']['release'] :
-                $installed['version'];
-            if ($channelinfo) {
-                $packageinfo = array(
-                    $channel,
-                    $name,
-                    $version_remote,
-                    $version,
-                    $desc,
-                );
-            } else {
-                $packageinfo = array(
-                    $name,
-                    $version_remote,
-                    $version,
-                    $desc,
-                );
-            }
-            $data['data'][$info['category']][] = $packageinfo;
-        }
-
-        $this->ui->outputData($data, $command);
-        $this->config->set('default_channel', $channel);
-        return true;
-    }
-
-    function &getDownloader($options)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        $a = &new PEAR_Downloader($this->ui, $options, $this->config);
-        return $a;
-    }
-
-    function doDownload($command, $options, $params)
-    {
-        // make certain that dependencies are ignored
-        $options['downloadonly'] = 1;
-
-        // eliminate error messages for preferred_state-related errors
-        /* TODO: Should be an option, but until now download does respect
-           prefered state */
-        /* $options['ignorepreferred_state'] = 1; */
-        // eliminate error messages for preferred_state-related errors
-
-        $downloader = &$this->getDownloader($options);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $e = $downloader->setDownloadDir(getcwd());
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($e)) {
-            return $this->raiseError('Current directory is not writeable, cannot download');
-        }
-
-        $errors = array();
-        $downloaded = array();
-        $err = $downloader->download($params);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        $errors = $downloader->getErrorMsgs();
-        if (count($errors)) {
-            foreach ($errors as $error) {
-                if ($error !== null) {
-                    $this->ui->outputData($error);
-                }
-            }
-
-            return $this->raiseError("$command failed");
-        }
-
-        $downloaded = $downloader->getDownloadedPackages();
-        foreach ($downloaded as $pkg) {
-            $this->ui->outputData("File $pkg[file] downloaded", $command);
-        }
-
-        return true;
-    }
-
-    function downloadCallback($msg, $params = null)
-    {
-        if ($msg == 'done') {
-            $this->bytes_downloaded = $params;
-        }
-    }
-
-    function doListUpgrades($command, $options, $params)
-    {
-        require_once 'PEAR/Common.php';
-        if (isset($params[0]) && !is_array(PEAR_Common::betterStates($params[0]))) {
-            return $this->raiseError($params[0] . ' is not a valid state (stable/beta/alpha/devel/etc.) try "pear help list-upgrades"');
-        }
-
-        $savechannel = $channel = $this->config->get('default_channel');
-        $reg = &$this->config->getRegistry();
-        foreach ($reg->listChannels() as $channel) {
-            $inst = array_flip($reg->listPackages($channel));
-            if (!count($inst)) {
-                continue;
-            }
-
-            if ($channel == '__uri') {
-                continue;
-            }
-
-            $this->config->set('default_channel', $channel);
-            $state = empty($params[0]) ? $this->config->get('preferred_state') : $params[0];
-
-            $caption = $channel . ' Available Upgrades';
-            $chan = $reg->getChannel($channel);
-            if (PEAR::isError($e = $this->_checkChannelForStatus($channel, $chan))) {
-                return $e;
-            }
-
-            $latest = array();
-            $base2  = false;
-            $preferred_mirror = $this->config->get('preferred_mirror');
-            if ($chan->supportsREST($preferred_mirror) &&
-                (
-                   //($base2 = $chan->getBaseURL('REST1.4', $preferred_mirror)) ||
-                   ($base  = $chan->getBaseURL('REST1.0', $preferred_mirror))
-                )
-
-            ) {
-                if ($base2) {
-                    $rest = &$this->config->getREST('1.4', array());
-                    $base = $base2;
-                } else {
-                    $rest = &$this->config->getREST('1.0', array());
-                }
-
-                if (empty($state) || $state == 'any') {
-                    $state = false;
-                } else {
-                    $caption .= ' (' . implode(', ', PEAR_Common::betterStates($state, true)) . ')';
-                }
-
-                PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                $latest = $rest->listLatestUpgrades($base, $state, $inst, $channel, $reg);
-                PEAR::staticPopErrorHandling();
-            }
-
-            if (PEAR::isError($latest)) {
-                $this->ui->outputData($latest->getMessage());
-                continue;
-            }
-
-            $caption .= ':';
-            if (PEAR::isError($latest)) {
-                $this->config->set('default_channel', $savechannel);
-                return $latest;
-            }
-
-            $data = array(
-                'caption' => $caption,
-                'border' => 1,
-                'headline' => array('Channel', 'Package', 'Local', 'Remote', 'Size'),
-                'channel' => $channel
-                );
-
-            foreach ((array)$latest as $pkg => $info) {
-                $package = strtolower($pkg);
-                if (!isset($inst[$package])) {
-                    // skip packages we don't have installed
-                    continue;
-                }
-
-                extract($info);
-                $inst_version = $reg->packageInfo($package, 'version', $channel);
-                $inst_state   = $reg->packageInfo($package, 'release_state', $channel);
-                if (version_compare("$version", "$inst_version", "le")) {
-                    // installed version is up-to-date
-                    continue;
-                }
-
-                if ($filesize >= 20480) {
-                    $filesize += 1024 - ($filesize % 1024);
-                    $fs = sprintf("%dkB", $filesize / 1024);
-                } elseif ($filesize > 0) {
-                    $filesize += 103 - ($filesize % 103);
-                    $fs = sprintf("%.1fkB", $filesize / 1024.0);
-                } else {
-                    $fs = "  -"; // XXX center instead
-                }
-
-                $data['data'][] = array($channel, $pkg, "$inst_version ($inst_state)", "$version ($state)", $fs);
-            }
-
-            if (isset($options['channelinfo'])) {
-                if (empty($data['data'])) {
-                    unset($data['headline']);
-                    if (count($inst) == 0) {
-                        $data['data'] = '(no packages installed)';
-                    } else {
-                        $data['data'] = '(no upgrades available)';
-                    }
-                }
-                $this->ui->outputData($data, $command);
-            } else {
-                if (empty($data['data'])) {
-                    $this->ui->outputData('Channel ' . $channel . ': No upgrades available');
-                } else {
-                    $this->ui->outputData($data, $command);
-                }
-            }
-        }
-
-        $this->config->set('default_channel', $savechannel);
-        return true;
-    }
-
-    function doClearCache($command, $options, $params)
-    {
-        $cache_dir = $this->config->get('cache_dir');
-        $verbose   = $this->config->get('verbose');
-        $output = '';
-        if (!file_exists($cache_dir) || !is_dir($cache_dir)) {
-            return $this->raiseError("$cache_dir does not exist or is not a directory");
-        }
-
-        if (!($dp = @opendir($cache_dir))) {
-            return $this->raiseError("opendir($cache_dir) failed: $php_errormsg");
-        }
-
-        if ($verbose >= 1) {
-            $output .= "reading directory $cache_dir\n";
-        }
-        $num = 0;
-        while ($ent = readdir($dp)) {
-            if (preg_match('/rest.cache(file|id)\\z/', $ent)) {
-                $path = $cache_dir . DIRECTORY_SEPARATOR . $ent;
-                if (file_exists($path)) {
-                    $ok = @unlink($path);
-                } else {
-                    $ok = false;
-                    $php_errormsg = '';
-                }
-
-                if ($ok) {
-                    if ($verbose >= 2) {
-                        $output .= "deleted $path\n";
-                    }
-                    $num++;
-                } elseif ($verbose >= 1) {
-                    $output .= "failed to delete $path $php_errormsg\n";
-                }
-            }
-        }
-
-        closedir($dp);
-        if ($verbose >= 1) {
-            $output .= "$num cache entries cleared\n";
-        }
-
-        $this->ui->outputData(rtrim($output), $command);
-        return $num;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Remote.xml b/airtime_mvc/library/pear/PEAR/Command/Remote.xml
deleted file mode 100644
index b4f6100c7..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Remote.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<commands version="1.0">
- <remote-info>
-  <summary>Information About Remote Packages</summary>
-  <function>doRemoteInfo</function>
-  <shortcut>ri</shortcut>
-  <options />
-  <doc>&lt;package&gt;
-Get details on a package from the server.</doc>
- </remote-info>
- <list-upgrades>
-  <summary>List Available Upgrades</summary>
-  <function>doListUpgrades</function>
-  <shortcut>lu</shortcut>
-  <options>
-   <channelinfo>
-    <shortopt>i</shortopt>
-    <doc>output fully channel-aware data, even on failure</doc>
-   </channelinfo>
-  </options>
-  <doc>[preferred_state]
-List releases on the server of packages you have installed where
-a newer version is available with the same release state (stable etc.)
-or the state passed as the second parameter.</doc>
- </list-upgrades>
- <remote-list>
-  <summary>List Remote Packages</summary>
-  <function>doRemoteList</function>
-  <shortcut>rl</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>specify a channel other than the default channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-  </options>
-  <doc>
-Lists the packages available on the configured server along with the
-latest stable release of each package.</doc>
- </remote-list>
- <search>
-  <summary>Search remote package database</summary>
-  <function>doSearch</function>
-  <shortcut>sp</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>specify a channel other than the default channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-   <allchannels>
-    <shortopt>a</shortopt>
-    <doc>search packages from all known channels</doc>
-   </allchannels>
-   <channelinfo>
-    <shortopt>i</shortopt>
-    <doc>output fully channel-aware data, even on failure</doc>
-   </channelinfo>
-  </options>
-  <doc>[packagename] [packageinfo]
-Lists all packages which match the search parameters.  The first
-parameter is a fragment of a packagename.  The default channel
-will be used unless explicitly overridden.  The second parameter
-will be used to match any portion of the summary/description</doc>
- </search>
- <list-all>
-  <summary>List All Packages</summary>
-  <function>doListAll</function>
-  <shortcut>la</shortcut>
-  <options>
-   <channel>
-    <shortopt>c</shortopt>
-    <doc>specify a channel other than the default channel</doc>
-    <arg>CHAN</arg>
-   </channel>
-   <channelinfo>
-    <shortopt>i</shortopt>
-    <doc>output fully channel-aware data, even on failure</doc>
-   </channelinfo>
-  </options>
-  <doc>
-Lists the packages available on the configured server along with the
-latest stable release of each package.</doc>
- </list-all>
- <download>
-  <summary>Download Package</summary>
-  <function>doDownload</function>
-  <shortcut>d</shortcut>
-  <options>
-   <nocompress>
-    <shortopt>Z</shortopt>
-    <doc>download an uncompressed (.tar) file</doc>
-   </nocompress>
-  </options>
-  <doc>&lt;package&gt;...
-Download package tarballs.  The files will be named as suggested by the
-server, for example if you download the DB package and the latest stable
-version of DB is 1.6.5, the downloaded file will be DB-1.6.5.tgz.</doc>
- </download>
- <clear-cache>
-  <summary>Clear Web Services Cache</summary>
-  <function>doClearCache</function>
-  <shortcut>cc</shortcut>
-  <options />
-  <doc>
-Clear the XML-RPC/REST cache.  See also the cache_ttl configuration
-parameter.
-</doc>
- </clear-cache>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Test.php b/airtime_mvc/library/pear/PEAR/Command/Test.php
deleted file mode 100644
index 0df8cb4ef..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Test.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/**
- * PEAR_Command_Test (run-tests)
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Test.php 279072 2009-04-20 19:57:41Z cellog $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Command/Common.php';
-
-/**
- * PEAR commands for login/logout
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-
-class PEAR_Command_Test extends PEAR_Command_Common
-{
-    var $commands = array(
-        'run-tests' => array(
-            'summary' => 'Run Regression Tests',
-            'function' => 'doRunTests',
-            'shortcut' => 'rt',
-            'options' => array(
-                'recur' => array(
-                    'shortopt' => 'r',
-                    'doc' => 'Run tests in child directories, recursively.  4 dirs deep maximum',
-                ),
-                'ini' => array(
-                    'shortopt' => 'i',
-                    'doc' => 'actual string of settings to pass to php in format " -d setting=blah"',
-                    'arg' => 'SETTINGS'
-                ),
-                'realtimelog' => array(
-                    'shortopt' => 'l',
-                    'doc' => 'Log test runs/results as they are run',
-                ),
-                'quiet' => array(
-                    'shortopt' => 'q',
-                    'doc' => 'Only display detail for failed tests',
-                ),
-                'simple' => array(
-                    'shortopt' => 's',
-                    'doc' => 'Display simple output for all tests',
-                ),
-                'package' => array(
-                    'shortopt' => 'p',
-                    'doc' => 'Treat parameters as installed packages from which to run tests',
-                ),
-                'phpunit' => array(
-                    'shortopt' => 'u',
-                    'doc' => 'Search parameters for AllTests.php, and use that to run phpunit-based tests
-If none is found, all .phpt tests will be tried instead.',
-                ),
-                'tapoutput' => array(
-                    'shortopt' => 't',
-                    'doc' => 'Output run-tests.log in TAP-compliant format',
-                ),
-                'cgi' => array(
-                    'shortopt' => 'c',
-                    'doc' => 'CGI php executable (needed for tests with POST/GET section)',
-                    'arg' => 'PHPCGI',
-                ),
-                'coverage' => array(
-                    'shortopt' => 'x',
-                    'doc'      => 'Generate a code coverage report (requires Xdebug 2.0.0+)',
-                ),
-            ),
-            'doc' => '[testfile|dir ...]
-Run regression tests with PHP\'s regression testing script (run-tests.php).',
-            ),
-        );
-
-    var $output;
-
-    /**
-     * PEAR_Command_Test constructor.
-     *
-     * @access public
-     */
-    function PEAR_Command_Test(&$ui, &$config)
-    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-
-    function doRunTests($command, $options, $params)
-    {
-        if (isset($options['phpunit']) && isset($options['tapoutput'])) {
-            return $this->raiseError('ERROR: cannot use both --phpunit and --tapoutput at the same time');
-        }
-
-        require_once 'PEAR/Common.php';
-        require_once 'System.php';
-        $log = new PEAR_Common;
-        $log->ui = &$this->ui; // slightly hacky, but it will work
-        $tests = array();
-        $depth = isset($options['recur']) ? 14 : 1;
-
-        if (!count($params)) {
-            $params[] = '.';
-        }
-
-        if (isset($options['package'])) {
-            $oldparams = $params;
-            $params = array();
-            $reg = &$this->config->getRegistry();
-            foreach ($oldparams as $param) {
-                $pname = $reg->parsePackageName($param, $this->config->get('default_channel'));
-                if (PEAR::isError($pname)) {
-                    return $this->raiseError($pname);
-                }
-
-                $package = &$reg->getPackage($pname['package'], $pname['channel']);
-                if (!$package) {
-                    return PEAR::raiseError('Unknown package "' .
-                        $reg->parsedPackageNameToString($pname) . '"');
-                }
-
-                $filelist = $package->getFilelist();
-                foreach ($filelist as $name => $atts) {
-                    if (isset($atts['role']) && $atts['role'] != 'test') {
-                        continue;
-                    }
-
-                    if (isset($options['phpunit']) && preg_match('/AllTests\.php\\z/i', $name)) {
-                        $params[] = $atts['installed_as'];
-                        continue;
-                    } elseif (!preg_match('/\.phpt\\z/', $name)) {
-                        continue;
-                    }
-                    $params[] = $atts['installed_as'];
-                }
-            }
-        }
-
-        foreach ($params as $p) {
-            if (is_dir($p)) {
-                if (isset($options['phpunit'])) {
-                    $dir = System::find(array($p, '-type', 'f',
-                                                '-maxdepth', $depth,
-                                                '-name', 'AllTests.php'));
-                    if (count($dir)) {
-                        foreach ($dir as $p) {
-                            $p = realpath($p);
-                            if (!count($tests) ||
-                                  (count($tests) && strlen($p) < strlen($tests[0]))) {
-                                // this is in a higher-level directory, use this one instead.
-                                $tests = array($p);
-                            }
-                        }
-                    }
-                    continue;
-                }
-
-                $args  = array($p, '-type', 'f', '-name', '*.phpt');
-            } else {
-                if (isset($options['phpunit'])) {
-                    if (preg_match('/AllTests\.php\\z/i', $p)) {
-                        $p = realpath($p);
-                        if (!count($tests) ||
-                              (count($tests) && strlen($p) < strlen($tests[0]))) {
-                            // this is in a higher-level directory, use this one instead.
-                            $tests = array($p);
-                        }
-                    }
-                    continue;
-                }
-
-                if (file_exists($p) && preg_match('/\.phpt$/', $p)) {
-                    $tests[] = $p;
-                    continue;
-                }
-
-                if (!preg_match('/\.phpt\\z/', $p)) {
-                    $p .= '.phpt';
-                }
-
-                $args  = array(dirname($p), '-type', 'f', '-name', $p);
-            }
-
-            if (!isset($options['recur'])) {
-                $args[] = '-maxdepth';
-                $args[] = 1;
-            }
-
-            $dir   = System::find($args);
-            $tests = array_merge($tests, $dir);
-        }
-
-        $ini_settings = '';
-        if (isset($options['ini'])) {
-            $ini_settings .= $options['ini'];
-        }
-
-        if (isset($_ENV['TEST_PHP_INCLUDE_PATH'])) {
-            $ini_settings .= " -d include_path={$_ENV['TEST_PHP_INCLUDE_PATH']}";
-        }
-
-        if ($ini_settings) {
-            $this->ui->outputData('Using INI settings: "' . $ini_settings . '"');
-        }
-
-        $skipped = $passed = $failed = array();
-        $tests_count = count($tests);
-        $this->ui->outputData('Running ' . $tests_count . ' tests', $command);
-        $start = time();
-        if (isset($options['realtimelog']) && file_exists('run-tests.log')) {
-            unlink('run-tests.log');
-        }
-
-        if (isset($options['tapoutput'])) {
-            $tap = '1..' . $tests_count . "\n";
-        }
-
-        require_once 'PEAR/RunTest.php';
-        $run = new PEAR_RunTest($log, $options);
-        $run->tests_count = $tests_count;
-
-        if (isset($options['coverage']) && extension_loaded('xdebug')){
-            $run->xdebug_loaded = true;
-        } else {
-            $run->xdebug_loaded = false;
-        }
-
-        $j = $i = 1;
-        foreach ($tests as $t) {
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "Running test [$i / $tests_count] $t...");
-                    fclose($fp);
-                }
-            }
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            if (isset($options['phpunit'])) {
-                $result = $run->runPHPUnit($t, $ini_settings);
-            } else {
-                $result = $run->run($t, $ini_settings, $j);
-            }
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($result)) {
-                $this->ui->log($result->getMessage());
-                continue;
-            }
-
-            if (isset($options['tapoutput'])) {
-                $tap .= $result[0] . ' ' . $i . $result[1] . "\n";
-                continue;
-            }
-
-            if (isset($options['realtimelog'])) {
-                $fp = @fopen('run-tests.log', 'a');
-                if ($fp) {
-                    fwrite($fp, "$result\n");
-                    fclose($fp);
-                }
-            }
-
-            if ($result == 'FAILED') {
-                $failed[] = $t;
-            }
-            if ($result == 'PASSED') {
-                $passed[] = $t;
-            }
-            if ($result == 'SKIPPED') {
-                $skipped[] = $t;
-            }
-
-            $j++;
-        }
-
-        $total = date('i:s', time() - $start);
-        if (isset($options['tapoutput'])) {
-            $fp = @fopen('run-tests.log', 'w');
-            if ($fp) {
-                fwrite($fp, $tap, strlen($tap));
-                fclose($fp);
-                $this->ui->outputData('wrote TAP-format log to "' .realpath('run-tests.log') .
-                    '"', $command);
-            }
-        } else {
-            if (count($failed)) {
-                $output = "TOTAL TIME: $total\n";
-                $output .= count($passed) . " PASSED TESTS\n";
-                $output .= count($skipped) . " SKIPPED TESTS\n";
-                $output .= count($failed) . " FAILED TESTS:\n";
-                foreach ($failed as $failure) {
-                    $output .= $failure . "\n";
-                }
-
-                $mode = isset($options['realtimelog']) ? 'a' : 'w';
-                $fp   = @fopen('run-tests.log', $mode);
-
-                if ($fp) {
-                    fwrite($fp, $output, strlen($output));
-                    fclose($fp);
-                    $this->ui->outputData('wrote log to "' . realpath('run-tests.log') . '"', $command);
-                }
-            } elseif (file_exists('run-tests.log') && !is_dir('run-tests.log')) {
-                @unlink('run-tests.log');
-            }
-        }
-        $this->ui->outputData('TOTAL TIME: ' . $total);
-        $this->ui->outputData(count($passed) . ' PASSED TESTS', $command);
-        $this->ui->outputData(count($skipped) . ' SKIPPED TESTS', $command);
-        if (count($failed)) {
-            $this->ui->outputData(count($failed) . ' FAILED TESTS:', $command);
-            foreach ($failed as $failure) {
-                $this->ui->outputData($failure, $command);
-            }
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Command/Test.xml b/airtime_mvc/library/pear/PEAR/Command/Test.xml
deleted file mode 100644
index bbe9fcccc..000000000
--- a/airtime_mvc/library/pear/PEAR/Command/Test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<commands version="1.0">
- <run-tests>
-  <summary>Run Regression Tests</summary>
-  <function>doRunTests</function>
-  <shortcut>rt</shortcut>
-  <options>
-   <recur>
-    <shortopt>r</shortopt>
-    <doc>Run tests in child directories, recursively.  4 dirs deep maximum</doc>
-   </recur>
-   <ini>
-    <shortopt>i</shortopt>
-    <doc>actual string of settings to pass to php in format &quot; -d setting=blah&quot;</doc>
-    <arg>SETTINGS</arg>
-   </ini>
-   <realtimelog>
-    <shortopt>l</shortopt>
-    <doc>Log test runs/results as they are run</doc>
-   </realtimelog>
-   <quiet>
-    <shortopt>q</shortopt>
-    <doc>Only display detail for failed tests</doc>
-   </quiet>
-   <simple>
-    <shortopt>s</shortopt>
-    <doc>Display simple output for all tests</doc>
-   </simple>
-   <package>
-    <shortopt>p</shortopt>
-    <doc>Treat parameters as installed packages from which to run tests</doc>
-   </package>
-   <phpunit>
-    <shortopt>u</shortopt>
-    <doc>Search parameters for AllTests.php, and use that to run phpunit-based tests
-If none is found, all .phpt tests will be tried instead.</doc>
-   </phpunit>
-   <tapoutput>
-    <shortopt>t</shortopt>
-    <doc>Output run-tests.log in TAP-compliant format</doc>
-   </tapoutput>
-   <cgi>
-    <shortopt>c</shortopt>
-    <doc>CGI php executable (needed for tests with POST/GET section)</doc>
-    <arg>PHPCGI</arg>
-   </cgi>
-   <coverage>
-    <shortopt>x</shortopt>
-    <doc>Generate a code coverage report (requires Xdebug 2.0.0+)</doc>
-   </coverage>
-  </options>
-  <doc>[testfile|dir ...]
-Run regression tests with PHP&#039;s regression testing script (run-tests.php).</doc>
- </run-tests>
-</commands>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Common.php b/airtime_mvc/library/pear/PEAR/Common.php
deleted file mode 100644
index 7eaf5d14c..000000000
--- a/airtime_mvc/library/pear/PEAR/Common.php
+++ /dev/null
@@ -1,837 +0,0 @@
-<?php
-/**
- * PEAR_Common, the base class for the PEAR Installer
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 282969 2009-06-28 23:09:27Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1.0
- * @deprecated File deprecated since Release 1.4.0a1
- */
-
-/**
- * Include error handling
- */
-require_once 'PEAR.php';
-
-/**
- * PEAR_Common error when an invalid PHP file is passed to PEAR_Common::analyzeSourceCode()
- */
-define('PEAR_COMMON_ERROR_INVALIDPHP', 1);
-define('_PEAR_COMMON_PACKAGE_NAME_PREG', '[A-Za-z][a-zA-Z0-9_]+');
-define('PEAR_COMMON_PACKAGE_NAME_PREG', '/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '\\z/');
-
-// this should allow: 1, 1.0, 1.0RC1, 1.0dev, 1.0dev123234234234, 1.0a1, 1.0b1, 1.0pl1
-define('_PEAR_COMMON_PACKAGE_VERSION_PREG', '\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?');
-define('PEAR_COMMON_PACKAGE_VERSION_PREG', '/^' . _PEAR_COMMON_PACKAGE_VERSION_PREG . '\\z/i');
-
-// XXX far from perfect :-)
-define('_PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '(' . _PEAR_COMMON_PACKAGE_NAME_PREG .
-    ')(-([.0-9a-zA-Z]+))?');
-define('PEAR_COMMON_PACKAGE_DOWNLOAD_PREG', '/^' . _PEAR_COMMON_PACKAGE_DOWNLOAD_PREG .
-    '\\z/');
-
-define('_PEAR_CHANNELS_NAME_PREG', '[A-Za-z][a-zA-Z0-9\.]+');
-define('PEAR_CHANNELS_NAME_PREG', '/^' . _PEAR_CHANNELS_NAME_PREG . '\\z/');
-
-// this should allow any dns or IP address, plus a path - NO UNDERSCORES ALLOWED
-define('_PEAR_CHANNELS_SERVER_PREG', '[a-zA-Z0-9\-]+(?:\.[a-zA-Z0-9\-]+)*(\/[a-zA-Z0-9\-]+)*');
-define('PEAR_CHANNELS_SERVER_PREG', '/^' . _PEAR_CHANNELS_SERVER_PREG . '\\z/i');
-
-define('_PEAR_CHANNELS_PACKAGE_PREG',  '(' ._PEAR_CHANNELS_SERVER_PREG . ')\/('
-         . _PEAR_COMMON_PACKAGE_NAME_PREG . ')');
-define('PEAR_CHANNELS_PACKAGE_PREG', '/^' . _PEAR_CHANNELS_PACKAGE_PREG . '\\z/i');
-
-define('_PEAR_COMMON_CHANNEL_DOWNLOAD_PREG', '(' . _PEAR_CHANNELS_NAME_PREG . ')::('
-    . _PEAR_COMMON_PACKAGE_NAME_PREG . ')(-([.0-9a-zA-Z]+))?');
-define('PEAR_COMMON_CHANNEL_DOWNLOAD_PREG', '/^' . _PEAR_COMMON_CHANNEL_DOWNLOAD_PREG . '\\z/');
-
-/**
- * List of temporary files and directories registered by
- * PEAR_Common::addTempFile().
- * @var array
- */
-$GLOBALS['_PEAR_Common_tempfiles'] = array();
-
-/**
- * Valid maintainer roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_maintainer_roles'] = array('lead','developer','contributor','helper');
-
-/**
- * Valid release states
- * @var array
- */
-$GLOBALS['_PEAR_Common_release_states'] = array('alpha','beta','stable','snapshot','devel');
-
-/**
- * Valid dependency types
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_types'] = array('pkg','ext','php','prog','ldlib','rtlib','os','websrv','sapi');
-
-/**
- * Valid dependency relations
- * @var array
- */
-$GLOBALS['_PEAR_Common_dependency_relations'] = array('has','eq','lt','le','gt','ge','not', 'ne');
-
-/**
- * Valid file roles
- * @var array
- */
-$GLOBALS['_PEAR_Common_file_roles'] = array('php','ext','test','doc','data','src','script');
-
-/**
- * Valid replacement types
- * @var array
- */
-$GLOBALS['_PEAR_Common_replacement_types'] = array('php-const', 'pear-config', 'package-info');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_provide_types'] = array('ext', 'prog', 'class', 'function', 'feature', 'api');
-
-/**
- * Valid "provide" types
- * @var array
- */
-$GLOBALS['_PEAR_Common_script_phases'] = array('pre-install', 'post-install', 'pre-uninstall', 'post-uninstall', 'pre-build', 'post-build', 'pre-configure', 'post-configure', 'pre-setup', 'post-setup');
-
-/**
- * Class providing common functionality for PEAR administration classes.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- * @deprecated This class will disappear, and its components will be spread
- *             into smaller classes, like the AT&T breakup, as of Release 1.4.0a1
- */
-class PEAR_Common extends PEAR
-{
-    /**
-     * User Interface object (PEAR_Frontend_* class).  If null,
-     * the log() method uses print.
-     * @var object
-     */
-    var $ui = null;
-
-    /**
-     * Configuration object (PEAR_Config).
-     * @var PEAR_Config
-     */
-    var $config = null;
-
-    /** stack of elements, gives some sort of XML context */
-    var $element_stack = array();
-
-    /** name of currently parsed XML element */
-    var $current_element;
-
-    /** array of attributes of the currently parsed XML element */
-    var $current_attributes = array();
-
-    /** assoc with information about a package */
-    var $pkginfo = array();
-
-    var $current_path = null;
-
-    /**
-     * Flag variable used to mark a valid package file
-     * @var boolean
-     * @access private
-     */
-    var $_validPackageFile;
-
-    /**
-     * PEAR_Common constructor
-     *
-     * @access public
-     */
-    function PEAR_Common()
-    {
-        parent::PEAR();
-        $this->config = &PEAR_Config::singleton();
-        $this->debug = $this->config->get('verbose');
-    }
-
-    /**
-     * PEAR_Common destructor
-     *
-     * @access private
-     */
-    function _PEAR_Common()
-    {
-        // doesn't work due to bug #14744
-        //$tempfiles = $this->_tempfiles;
-        $tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
-        while ($file = array_shift($tempfiles)) {
-            if (@is_dir($file)) {
-                if (!class_exists('System')) {
-                    require_once 'System.php';
-                }
-
-                System::rm(array('-rf', $file));
-            } elseif (file_exists($file)) {
-                unlink($file);
-            }
-        }
-    }
-
-    /**
-     * Register a temporary file or directory.  When the destructor is
-     * executed, all registered temporary files and directories are
-     * removed.
-     *
-     * @param string  $file  name of file or directory
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addTempFile($file)
-    {
-        if (!class_exists('PEAR_Frontend')) {
-            require_once 'PEAR/Frontend.php';
-        }
-        PEAR_Frontend::addTempFile($file);
-    }
-
-    /**
-     * Wrapper to System::mkDir(), creates a directory as well as
-     * any necessary parent directories.
-     *
-     * @param string  $dir  directory name
-     *
-     * @return bool TRUE on success, or a PEAR error
-     *
-     * @access public
-     */
-    function mkDirHier($dir)
-    {
-        // Only used in Installer - move it there ?
-        $this->log(2, "+ create dir $dir");
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-        return System::mkDir(array('-p', $dir));
-    }
-
-    /**
-     * Logging method.
-     *
-     * @param int    $level  log level (0 is quiet, higher is noisier)
-     * @param string $msg    message to write to the log
-     *
-     * @return void
-     *
-     * @access public
-     * @static
-     */
-    function log($level, $msg, $append_crlf = true)
-    {
-        if ($this->debug >= $level) {
-            if (!class_exists('PEAR_Frontend')) {
-                require_once 'PEAR/Frontend.php';
-            }
-
-            $ui = &PEAR_Frontend::singleton();
-            if (is_a($ui, 'PEAR_Frontend')) {
-                $ui->log($msg, $append_crlf);
-            } else {
-                print "$msg\n";
-            }
-        }
-    }
-
-    /**
-     * Create and register a temporary directory.
-     *
-     * @param string $tmpdir (optional) Directory to use as tmpdir.
-     *                       Will use system defaults (for example
-     *                       /tmp or c:\windows\temp) if not specified
-     *
-     * @return string name of created directory
-     *
-     * @access public
-     */
-    function mkTempDir($tmpdir = '')
-    {
-        $topt = $tmpdir ? array('-t', $tmpdir) : array();
-        $topt = array_merge($topt, array('-d', 'pear'));
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-
-        if (!$tmpdir = System::mktemp($topt)) {
-            return false;
-        }
-
-        $this->addTempFile($tmpdir);
-        return $tmpdir;
-    }
-
-    /**
-     * Set object that represents the frontend to be used.
-     *
-     * @param  object Reference of the frontend object
-     * @return void
-     * @access public
-     */
-    function setFrontendObject(&$ui)
-    {
-        $this->ui = &$ui;
-    }
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-
-    /**
-     * Get the valid roles for a PEAR package maintainer
-     *
-     * @return array
-     * @static
-     */
-    function getUserRoles()
-    {
-        return $GLOBALS['_PEAR_Common_maintainer_roles'];
-    }
-
-    /**
-     * Get the valid package release states of packages
-     *
-     * @return array
-     * @static
-     */
-    function getReleaseStates()
-    {
-        return $GLOBALS['_PEAR_Common_release_states'];
-    }
-
-    /**
-     * Get the implemented dependency types (php, ext, pkg etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyTypes()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_types'];
-    }
-
-    /**
-     * Get the implemented dependency relations (has, lt, ge etc.)
-     *
-     * @return array
-     * @static
-     */
-    function getDependencyRelations()
-    {
-        return $GLOBALS['_PEAR_Common_dependency_relations'];
-    }
-
-    /**
-     * Get the implemented file roles
-     *
-     * @return array
-     * @static
-     */
-    function getFileRoles()
-    {
-        return $GLOBALS['_PEAR_Common_file_roles'];
-    }
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getReplacementTypes()
-    {
-        return $GLOBALS['_PEAR_Common_replacement_types'];
-    }
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getProvideTypes()
-    {
-        return $GLOBALS['_PEAR_Common_provide_types'];
-    }
-
-    /**
-     * Get the implemented file replacement types in
-     *
-     * @return array
-     * @static
-     */
-    function getScriptPhases()
-    {
-        return $GLOBALS['_PEAR_Common_script_phases'];
-    }
-
-    /**
-     * Test whether a string contains a valid package name.
-     *
-     * @param string $name the package name to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageName($name)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_NAME_PREG, $name);
-    }
-
-    /**
-     * Test whether a string contains a valid package version.
-     *
-     * @param string $ver the package version to test
-     *
-     * @return bool
-     *
-     * @access public
-     */
-    function validPackageVersion($ver)
-    {
-        return (bool)preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
-    }
-
-    /**
-     * @param string $path relative or absolute include path
-     * @return boolean
-     * @static
-     */
-    function isIncludeable($path)
-    {
-        if (file_exists($path) && is_readable($path)) {
-            return true;
-        }
-
-        $ipath = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($ipath as $include) {
-            $test = realpath($include . DIRECTORY_SEPARATOR . $path);
-            if (file_exists($test) && is_readable($test)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    function _postProcessChecks($pf)
-    {
-        if (!PEAR::isError($pf)) {
-            return $this->_postProcessValidPackagexml($pf);
-        }
-
-        $errs = $pf->getUserinfo();
-        if (is_array($errs)) {
-            foreach ($errs as $error) {
-                $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-            }
-        }
-
-        return $pf;
-    }
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a gzipped tar file as input.
-     *
-     * @param string  $file  name of .tgz file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromTgzFile() instead
-     *
-     */
-    function infoFromTgzFile($file)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromTgzFile($file, PEAR_VALIDATE_NORMAL);
-        return $this->_postProcessChecks($pf);
-    }
-
-    /**
-     * Returns information about a package file.  Expects the name of
-     * a package xml file as input.
-     *
-     * @param string  $descfile  name of package xml file
-     *
-     * @return array  array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromPackageFile() instead
-     *
-     */
-    function infoFromDescriptionFile($descfile)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
-        return $this->_postProcessChecks($pf);
-    }
-
-    /**
-     * Returns information about a package file.  Expects the contents
-     * of a package xml file as input.
-     *
-     * @param string  $data  contents of package.xml file
-     *
-     * @return array   array with package information
-     *
-     * @access public
-     * @deprecated use PEAR_PackageFile->fromXmlstring() instead
-     *
-     */
-    function infoFromString($data)
-    {
-        $packagefile = &new PEAR_PackageFile($this->config);
-        $pf = &$packagefile->fromXmlString($data, PEAR_VALIDATE_NORMAL, false);
-        return $this->_postProcessChecks($pf);
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return array
-     */
-    function _postProcessValidPackagexml(&$pf)
-    {
-        if (!is_a($pf, 'PEAR_PackageFile_v2')) {
-            $this->pkginfo = $pf->toArray();
-            return $this->pkginfo;
-        }
-
-        // sort of make this into a package.xml 1.0-style array
-        // changelog is not converted to old format.
-        $arr = $pf->toArray(true);
-        $arr = array_merge($arr, $arr['old']);
-        unset($arr['old'], $arr['xsdversion'], $arr['contents'], $arr['compatible'],
-              $arr['channel'], $arr['uri'], $arr['dependencies'], $arr['phprelease'],
-              $arr['extsrcrelease'], $arr['zendextsrcrelease'], $arr['extbinrelease'],
-              $arr['zendextbinrelease'], $arr['bundle'], $arr['lead'], $arr['developer'],
-              $arr['helper'], $arr['contributor']);
-        $arr['filelist'] = $pf->getFilelist();
-        $this->pkginfo = $arr;
-        return $arr;
-    }
-
-    /**
-     * Returns package information from different sources
-     *
-     * This method is able to extract information about a package
-     * from a .tgz archive or from a XML package definition file.
-     *
-     * @access public
-     * @param  string Filename of the source ('package.xml', '<package>.tgz')
-     * @return string
-     * @deprecated use PEAR_PackageFile->fromAnyFile() instead
-     */
-    function infoFromAny($info)
-    {
-        if (is_string($info) && file_exists($info)) {
-            $packagefile = &new PEAR_PackageFile($this->config);
-            $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
-            if (PEAR::isError($pf)) {
-                $errs = $pf->getUserinfo();
-                if (is_array($errs)) {
-                    foreach ($errs as $error) {
-                        $e = $this->raiseError($error['message'], $error['code'], null, null, $error);
-                    }
-                }
-
-                return $pf;
-            }
-
-            return $this->_postProcessValidPackagexml($pf);
-        }
-
-        return $info;
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @param array  $pkginfo  package info
-     *
-     * @return string XML data
-     *
-     * @access public
-     * @deprecated use a PEAR_PackageFile_v* object's generator instead
-     */
-    function xmlFromInfo($pkginfo)
-    {
-        $config      = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        $pf = &$packagefile->fromArray($pkginfo);
-        $gen = &$pf->getDefaultGenerator();
-        return $gen->toXml(PEAR_VALIDATE_PACKAGING);
-    }
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @param  string $info Filename of the package archive or of the
-     *                package definition file
-     * @param  array $errors Array that will contain the errors
-     * @param  array $warnings Array that will contain the warnings
-     * @param  string $dir_prefix (optional) directory where source files
-     *                may be found, or empty if they are not available
-     * @access public
-     * @return boolean
-     * @deprecated use the validation of PEAR_PackageFile objects
-     */
-    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
-    {
-        $config      = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        if (strpos($info, '<?xml') !== false) {
-            $pf = &$packagefile->fromXmlString($info, PEAR_VALIDATE_NORMAL, '');
-        } else {
-            $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
-        }
-
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    if ($error['level'] == 'error') {
-                        $errors[] = $error['message'];
-                    } else {
-                        $warnings[] = $error['message'];
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access public
-     *
-     */
-    function buildProvidesArray($srcinfo)
-    {
-        $file = basename($srcinfo['source_file']);
-        $pn = '';
-        if (isset($this->_packageName)) {
-            $pn = $this->_packageName;
-        }
-
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $this->pkginfo['provides'][$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($this->pkginfo['provides'][$key])) {
-                    continue;
-                }
-
-                $this->pkginfo['provides'][$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($this->pkginfo['provides'][$key])) {
-                continue;
-            }
-
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-
-            $this->pkginfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-    }
-
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @return mixed
-     * @access public
-     */
-    function analyzeSourceCode($file)
-    {
-        if (!class_exists('PEAR_PackageFile_v2_Validator')) {
-            require_once 'PEAR/PackageFile/v2/Validator.php';
-        }
-
-        $a = new PEAR_PackageFile_v2_Validator;
-        return $a->analyzeSourceCode($file);
-    }
-
-    function detectDependencies($any, $status_callback = null)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-
-        if (PEAR::isError($info = $this->infoFromAny($any))) {
-            return $this->raiseError($info);
-        }
-
-        if (!is_array($info)) {
-            return false;
-        }
-
-        $deps = array();
-        $used_c = $decl_c = $decl_f = $decl_m = array();
-        foreach ($info['filelist'] as $file => $fa) {
-            $tmp = $this->analyzeSourceCode($file);
-            $used_c = @array_merge($used_c, $tmp['used_classes']);
-            $decl_c = @array_merge($decl_c, $tmp['declared_classes']);
-            $decl_f = @array_merge($decl_f, $tmp['declared_functions']);
-            $decl_m = @array_merge($decl_m, $tmp['declared_methods']);
-            $inheri = @array_merge($inheri, $tmp['inheritance']);
-        }
-
-        $used_c = array_unique($used_c);
-        $decl_c = array_unique($decl_c);
-        $undecl_c = array_diff($used_c, $decl_c);
-
-        return array('used_classes' => $used_c,
-                     'declared_classes' => $decl_c,
-                     'declared_methods' => $decl_m,
-                     'declared_functions' => $decl_f,
-                     'undeclared_classes' => $undecl_c,
-                     'inheritance' => $inheri,
-                     );
-    }
-
-    /**
-     * Download a file through HTTP.  Considers suggested file name in
-     * Content-disposition: header and can run a callback function for
-     * different events.  The callback will be called with two
-     * parameters: the callback type, and parameters.  The implemented
-     * callback types are:
-     *
-     *  'setup'       called at the very beginning, parameter is a UI object
-     *                that should be used for all output
-     *  'message'     the parameter is a string with an informational message
-     *  'saveas'      may be used to save with a different file name, the
-     *                parameter is the filename that is about to be used.
-     *                If a 'saveas' callback returns a non-empty string,
-     *                that file name will be used as the filename instead.
-     *                Note that $save_dir will not be affected by this, only
-     *                the basename of the file.
-     *  'start'       download is starting, parameter is number of bytes
-     *                that are expected, or -1 if unknown
-     *  'bytesread'   parameter is the number of bytes read so far
-     *  'done'        download is complete, parameter is the total number
-     *                of bytes read
-     *  'connfailed'  if the TCP connection fails, this callback is called
-     *                with array(host,port,errno,errmsg)
-     *  'writefailed' if writing to disk fails, this callback is called
-     *                with array(destfile,errmsg)
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param object  $ui        PEAR_Frontend_* instance
-     * @param object  $config    PEAR_Config instance
-     * @param string  $save_dir  (optional) directory to save file in
-     * @param mixed   $callback  (optional) function/method to call for status
-     *                           updates
-     *
-     * @return string  Returns the full path of the downloaded file or a PEAR
-     *                 error on failure.  If the error is caused by
-     *                 socket-related errors, the error object will
-     *                 have the fsockopen error code available through
-     *                 getCode().
-     *
-     * @access public
-     * @deprecated in favor of PEAR_Downloader::downloadHttp()
-     */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
-    {
-        if (!class_exists('PEAR_Downloader')) {
-            require_once 'PEAR/Downloader.php';
-        }
-        return PEAR_Downloader::downloadHttp($url, $ui, $save_dir, $callback);
-    }
-}
-
-require_once 'PEAR/Config.php';
-require_once 'PEAR/PackageFile.php';
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Config.php b/airtime_mvc/library/pear/PEAR/Config.php
deleted file mode 100644
index 64abd4367..000000000
--- a/airtime_mvc/library/pear/PEAR/Config.php
+++ /dev/null
@@ -1,2097 +0,0 @@
-<?php
-/**
- * PEAR_Config, customized configuration handling for the PEAR Installer
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Config.php 286480 2009-07-29 02:50:02Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Required for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Registry.php';
-require_once 'PEAR/Installer/Role.php';
-require_once 'System.php';
-
-/**
- * Last created PEAR_Config instance.
- * @var object
- */
-$GLOBALS['_PEAR_Config_instance'] = null;
-if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) {
-    $PEAR_INSTALL_DIR = PHP_LIBDIR . DIRECTORY_SEPARATOR . 'pear';
-} else {
-    $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR;
-}
-
-// Below we define constants with default values for all configuration
-// parameters except username/password.  All of them can have their
-// defaults set through environment variables.  The reason we use the
-// PHP_ prefix is for some security, PHP protects environment
-// variables starting with PHP_*.
-
-// default channel and preferred mirror is based on whether we are invoked through
-// the "pear" or the "pecl" command
-if (!defined('PEAR_RUNTYPE')) {
-    define('PEAR_RUNTYPE', 'pear');
-}
-
-if (PEAR_RUNTYPE == 'pear') {
-    define('PEAR_CONFIG_DEFAULT_CHANNEL', 'pear.php.net');
-} else {
-    define('PEAR_CONFIG_DEFAULT_CHANNEL', 'pecl.php.net');
-}
-
-if (getenv('PHP_PEAR_SYSCONF_DIR')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('PHP_PEAR_SYSCONF_DIR'));
-} elseif (getenv('SystemRoot')) {
-    define('PEAR_CONFIG_SYSCONFDIR', getenv('SystemRoot'));
-} else {
-    define('PEAR_CONFIG_SYSCONFDIR', PHP_SYSCONFDIR);
-}
-
-// Default for master_server
-if (getenv('PHP_PEAR_MASTER_SERVER')) {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', getenv('PHP_PEAR_MASTER_SERVER'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_MASTER_SERVER', 'pear.php.net');
-}
-
-// Default for http_proxy
-if (getenv('PHP_PEAR_HTTP_PROXY')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('PHP_PEAR_HTTP_PROXY'));
-} elseif (getenv('http_proxy')) {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', getenv('http_proxy'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_HTTP_PROXY', '');
-}
-
-// Default for php_dir
-if (getenv('PHP_PEAR_INSTALL_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
-} else {
-    if (@file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-    }
-}
-
-// Default for ext_dir
-if (getenv('PHP_PEAR_EXTENSION_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
-} else {
-    if (ini_get('extension_dir')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', ini_get('extension_dir'));
-    } elseif (defined('PEAR_EXTENSION_DIR') &&
-              file_exists(PEAR_EXTENSION_DIR) && is_dir(PEAR_EXTENSION_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PEAR_EXTENSION_DIR);
-    } elseif (defined('PHP_EXTENSION_DIR')) {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', PHP_EXTENSION_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_EXT_DIR', '.');
-    }
-}
-
-// Default for doc_dir
-if (getenv('PHP_PEAR_DOC_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
-}
-
-// Default for bin_dir
-if (getenv('PHP_PEAR_BIN_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', getenv('PHP_PEAR_BIN_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_BIN_DIR', PHP_BINDIR);
-}
-
-// Default for data_dir
-if (getenv('PHP_PEAR_DATA_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
-}
-
-// Default for cfg_dir
-if (getenv('PHP_PEAR_CFG_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_CFG_DIR', getenv('PHP_PEAR_CFG_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CFG_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'cfg');
-}
-
-// Default for www_dir
-if (getenv('PHP_PEAR_WWW_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_WWW_DIR', getenv('PHP_PEAR_WWW_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_WWW_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'www');
-}
-
-// Default for test_dir
-if (getenv('PHP_PEAR_TEST_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
-}
-
-// Default for temp_dir
-if (getenv('PHP_PEAR_TEMP_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_TEMP_DIR', getenv('PHP_PEAR_TEMP_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_TEMP_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'temp');
-}
-
-// Default for cache_dir
-if (getenv('PHP_PEAR_CACHE_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'cache');
-}
-
-// Default for download_dir
-if (getenv('PHP_PEAR_DOWNLOAD_DIR')) {
-    define('PEAR_CONFIG_DEFAULT_DOWNLOAD_DIR', getenv('PHP_PEAR_DOWNLOAD_DIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_DOWNLOAD_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'download');
-}
-
-// Default for php_bin
-if (getenv('PHP_PEAR_PHP_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', getenv('PHP_PEAR_PHP_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PHP_BIN', PEAR_CONFIG_DEFAULT_BIN_DIR.
-           DIRECTORY_SEPARATOR.'php'.(OS_WINDOWS ? '.exe' : ''));
-}
-
-// Default for verbose
-if (getenv('PHP_PEAR_VERBOSE')) {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', getenv('PHP_PEAR_VERBOSE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_VERBOSE', 1);
-}
-
-// Default for preferred_state
-if (getenv('PHP_PEAR_PREFERRED_STATE')) {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', getenv('PHP_PEAR_PREFERRED_STATE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_PREFERRED_STATE', 'stable');
-}
-
-// Default for umask
-if (getenv('PHP_PEAR_UMASK')) {
-    define('PEAR_CONFIG_DEFAULT_UMASK', getenv('PHP_PEAR_UMASK'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_UMASK', decoct(umask()));
-}
-
-// Default for cache_ttl
-if (getenv('PHP_PEAR_CACHE_TTL')) {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', getenv('PHP_PEAR_CACHE_TTL'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 3600);
-}
-
-// Default for sig_type
-if (getenv('PHP_PEAR_SIG_TYPE')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', getenv('PHP_PEAR_SIG_TYPE'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_TYPE', 'gpg');
-}
-
-// Default for sig_bin
-if (getenv('PHP_PEAR_SIG_BIN')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
-           System::which(
-               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
-}
-
-// Default for sig_keydir
-if (getenv('PHP_PEAR_SIG_KEYDIR')) {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR', getenv('PHP_PEAR_SIG_KEYDIR'));
-} else {
-    define('PEAR_CONFIG_DEFAULT_SIG_KEYDIR',
-           PEAR_CONFIG_SYSCONFDIR . DIRECTORY_SEPARATOR . 'pearkeys');
-}
-
-/**
- * This is a class for storing configuration data, keeping track of
- * which are system-defined, user-defined or defaulted.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Config extends PEAR
-{
-    /**
-     * Array of config files used.
-     *
-     * @var array layer => config file
-     */
-    var $files = array(
-        'system' => '',
-        'user' => '',
-        );
-
-    var $layers = array();
-
-    /**
-     * Configuration data, two-dimensional array where the first
-     * dimension is the config layer ('user', 'system' and 'default'),
-     * and the second dimension is keyname => value.
-     *
-     * The order in the first dimension is important!  Earlier
-     * layers will shadow later ones when a config value is
-     * requested (if a 'user' value exists, it will be returned first,
-     * then 'system' and finally 'default').
-     *
-     * @var array layer => array(keyname => value, ...)
-     */
-    var $configuration = array(
-        'user' => array(),
-        'system' => array(),
-        'default' => array(),
-        );
-
-    /**
-     * Configuration values that can be set for a channel
-     *
-     * All other configuration values can only have a global value
-     * @var array
-     * @access private
-     */
-    var $_channelConfigInfo = array(
-        'php_dir', 'ext_dir', 'doc_dir', 'bin_dir', 'data_dir', 'cfg_dir',
-        'test_dir', 'www_dir', 'php_bin', 'php_prefix', 'php_suffix', 'username',
-        'password', 'verbose', 'preferred_state', 'umask', 'preferred_mirror', 'php_ini'
-        );
-
-    /**
-     * Channels that can be accessed
-     * @see setChannels()
-     * @var array
-     * @access private
-     */
-    var $_channels = array('pear.php.net', 'pecl.php.net', '__uri');
-
-    /**
-     * This variable is used to control the directory values returned
-     * @see setInstallRoot();
-     * @var string|false
-     * @access private
-     */
-    var $_installRoot = false;
-
-    /**
-     * If requested, this will always refer to the registry
-     * contained in php_dir
-     * @var PEAR_Registry
-     */
-    var $_registry = array();
-
-    /**
-     * @var array
-     * @access private
-     */
-    var $_regInitialized = array();
-
-    /**
-     * @var bool
-     * @access private
-     */
-    var $_noRegistry = false;
-
-    /**
-     * amount of errors found while parsing config
-     * @var integer
-     * @access private
-     */
-    var $_errorsFound = 0;
-    var $_lastError = null;
-
-    /**
-     * Information about the configuration data.  Stores the type,
-     * default value and a documentation string for each configuration
-     * value.
-     *
-     * @var array layer => array(infotype => value, ...)
-     */
-    var $configuration_info = array(
-        // Channels/Internet Access
-        'default_channel' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_CHANNEL,
-            'doc' => 'the default channel to use for all non explicit commands',
-            'prompt' => 'Default Channel',
-            'group' => 'Internet Access',
-            ),
-        'preferred_mirror' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_CHANNEL,
-            'doc' => 'the default server or mirror to use for channel actions',
-            'prompt' => 'Default Channel Mirror',
-            'group' => 'Internet Access',
-            ),
-        'remote_config' => array(
-            'type' => 'password',
-            'default' => '',
-            'doc' => 'ftp url of remote configuration file to use for synchronized install',
-            'prompt' => 'Remote Configuration File',
-            'group' => 'Internet Access',
-            ),
-        'auto_discover' => array(
-            'type' => 'integer',
-            'default' => 0,
-            'doc' => 'whether to automatically discover new channels',
-            'prompt' => 'Auto-discover new Channels',
-            'group' => 'Internet Access',
-            ),
-        // Internet Access
-        'master_server' => array(
-            'type' => 'string',
-            'default' => 'pear.php.net',
-            'doc' => 'name of the main PEAR server [NOT USED IN THIS VERSION]',
-            'prompt' => 'PEAR server [DEPRECATED]',
-            'group' => 'Internet Access',
-            ),
-        'http_proxy' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_HTTP_PROXY,
-            'doc' => 'HTTP proxy (host:port) to use when downloading packages',
-            'prompt' => 'HTTP Proxy Server Address',
-            'group' => 'Internet Access',
-            ),
-        // File Locations
-        'php_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_DIR,
-            'doc' => 'directory where .php files are installed',
-            'prompt' => 'PEAR directory',
-            'group' => 'File Locations',
-            ),
-        'ext_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_EXT_DIR,
-            'doc' => 'directory where loadable extensions are installed',
-            'prompt' => 'PHP extension directory',
-            'group' => 'File Locations',
-            ),
-        'doc_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DOC_DIR,
-            'doc' => 'directory where documentation is installed',
-            'prompt' => 'PEAR documentation directory',
-            'group' => 'File Locations',
-            ),
-        'bin_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_BIN_DIR,
-            'doc' => 'directory where executables are installed',
-            'prompt' => 'PEAR executables directory',
-            'group' => 'File Locations',
-            ),
-        'data_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DATA_DIR,
-            'doc' => 'directory where data files are installed',
-            'prompt' => 'PEAR data directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'cfg_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_CFG_DIR,
-            'doc' => 'directory where modifiable configuration files are installed',
-            'prompt' => 'PEAR configuration file directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'www_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_WWW_DIR,
-            'doc' => 'directory where www frontend files (html/js) are installed',
-            'prompt' => 'PEAR www files directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'test_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
-            'doc' => 'directory where regression tests are installed',
-            'prompt' => 'PEAR test directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'cache_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_DIR,
-            'doc' => 'directory which is used for web service cache',
-            'prompt' => 'PEAR Installer cache directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'temp_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_TEMP_DIR,
-            'doc' => 'directory which is used for all temp files',
-            'prompt' => 'PEAR Installer temp directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'download_dir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_DOWNLOAD_DIR,
-            'doc' => 'directory which is used for all downloaded files',
-            'prompt' => 'PEAR Installer download directory',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_bin' => array(
-            'type' => 'file',
-            'default' => PEAR_CONFIG_DEFAULT_PHP_BIN,
-            'doc' => 'PHP CLI/CGI binary for executing scripts',
-            'prompt' => 'PHP CLI/CGI binary',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_prefix' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => '--program-prefix for php_bin\'s ./configure, used for pecl installs',
-            'prompt' => '--program-prefix passed to PHP\'s ./configure',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_suffix' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => '--program-suffix for php_bin\'s ./configure, used for pecl installs',
-            'prompt' => '--program-suffix passed to PHP\'s ./configure',
-            'group' => 'File Locations (Advanced)',
-            ),
-        'php_ini' => array(
-            'type' => 'file',
-            'default' => '',
-            'doc' => 'location of php.ini in which to enable PECL extensions on install',
-            'prompt' => 'php.ini location',
-            'group' => 'File Locations (Advanced)',
-            ),
-        // Maintainers
-        'username' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account name',
-            'prompt' => 'PEAR username (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        'password' => array(
-            'type' => 'password',
-            'default' => '',
-            'doc' => '(maintainers) your PEAR account password',
-            'prompt' => 'PEAR password (for maintainers)',
-            'group' => 'Maintainers',
-            ),
-        // Advanced
-        'verbose' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_VERBOSE,
-            'doc' => 'verbosity level
-0: really quiet
-1: somewhat quiet
-2: verbose
-3: debug',
-            'prompt' => 'Debug Log Level',
-            'group' => 'Advanced',
-            ),
-        'preferred_state' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_PREFERRED_STATE,
-            'doc' => 'the installer will prefer releases with this state when installing packages without a version or state specified',
-            'valid_set' => array(
-                'stable', 'beta', 'alpha', 'devel', 'snapshot'),
-            'prompt' => 'Preferred Package State',
-            'group' => 'Advanced',
-            ),
-        'umask' => array(
-            'type' => 'mask',
-            'default' => PEAR_CONFIG_DEFAULT_UMASK,
-            'doc' => 'umask used when creating files (Unix-like systems only)',
-            'prompt' => 'Unix file mask',
-            'group' => 'Advanced',
-            ),
-        'cache_ttl' => array(
-            'type' => 'integer',
-            'default' => PEAR_CONFIG_DEFAULT_CACHE_TTL,
-            'doc' => 'amount of secs where the local cache is used and not updated',
-            'prompt' => 'Cache TimeToLive',
-            'group' => 'Advanced',
-            ),
-        'sig_type' => array(
-            'type' => 'set',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_TYPE,
-            'doc' => 'which package signature mechanism to use',
-            'valid_set' => array('gpg'),
-            'prompt' => 'Package Signature Type',
-            'group' => 'Maintainers',
-            ),
-        'sig_bin' => array(
-            'type' => 'string',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_BIN,
-            'doc' => 'which package signature mechanism to use',
-            'prompt' => 'Signature Handling Program',
-            'group' => 'Maintainers',
-            ),
-        'sig_keyid' => array(
-            'type' => 'string',
-            'default' => '',
-            'doc' => 'which key to use for signing with',
-            'prompt' => 'Signature Key Id',
-            'group' => 'Maintainers',
-            ),
-        'sig_keydir' => array(
-            'type' => 'directory',
-            'default' => PEAR_CONFIG_DEFAULT_SIG_KEYDIR,
-            'doc' => 'directory where signature keys are located',
-            'prompt' => 'Signature Key Directory',
-            'group' => 'Maintainers',
-            ),
-        // __channels is reserved - used for channel-specific configuration
-        );
-
-    /**
-     * Constructor.
-     *
-     * @param string file to read user-defined options from
-     * @param string file to read system-wide defaults from
-     * @param bool   determines whether a registry object "follows"
-     *               the value of php_dir (is automatically created
-     *               and moved when php_dir is changed)
-     * @param bool   if true, fails if configuration files cannot be loaded
-     *
-     * @access public
-     *
-     * @see PEAR_Config::singleton
-     */
-    function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
-                         $strict = true)
-    {
-        $this->PEAR();
-        PEAR_Installer_Role::initializeConfig($this);
-        $sl = DIRECTORY_SEPARATOR;
-        if (empty($user_file)) {
-            if (OS_WINDOWS) {
-                $user_file = PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.ini';
-            } else {
-                $user_file = getenv('HOME') . $sl . '.pearrc';
-            }
-        }
-
-        if (empty($system_file)) {
-            $system_file = PEAR_CONFIG_SYSCONFDIR . $sl;
-            if (OS_WINDOWS) {
-                $system_file .= 'pearsys.ini';
-            } else {
-                $system_file .= 'pear.conf';
-            }
-        }
-
-        $this->layers = array_keys($this->configuration);
-        $this->files['user']   = $user_file;
-        $this->files['system'] = $system_file;
-        if ($user_file && file_exists($user_file)) {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $this->readConfigFile($user_file, 'user', $strict);
-            $this->popErrorHandling();
-            if ($this->_errorsFound > 0) {
-                return;
-            }
-        }
-
-        if ($system_file && @file_exists($system_file)) {
-            $this->mergeConfigFile($system_file, false, 'system', $strict);
-            if ($this->_errorsFound > 0) {
-                return;
-            }
-
-        }
-
-        if (!$ftp_file) {
-            $ftp_file = $this->get('remote_config');
-        }
-
-        if ($ftp_file && defined('PEAR_REMOTEINSTALL_OK')) {
-            $this->readFTPConfigFile($ftp_file);
-        }
-
-        foreach ($this->configuration_info as $key => $info) {
-            $this->configuration['default'][$key] = $info['default'];
-        }
-
-        $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
-        $this->_registry['default']->setConfig($this, false);
-        $this->_regInitialized['default'] = false;
-        //$GLOBALS['_PEAR_Config_instance'] = &$this;
-    }
-
-    /**
-     * Return the default locations of user and system configuration files
-     * @static
-     */
-    function getDefaultConfigFiles()
-    {
-        $sl = DIRECTORY_SEPARATOR;
-        if (OS_WINDOWS) {
-            return array(
-                'user'   => PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.ini',
-                'system' =>  PEAR_CONFIG_SYSCONFDIR . $sl . 'pearsys.ini'
-            );
-        }
-
-        return array(
-            'user'   => getenv('HOME') . $sl . '.pearrc',
-            'system' => PEAR_CONFIG_SYSCONFDIR . $sl . 'pear.conf'
-        );
-    }
-
-    /**
-     * Static singleton method.  If you want to keep only one instance
-     * of this class in use, this method will give you a reference to
-     * the last created PEAR_Config object if one exists, or create a
-     * new object.
-     *
-     * @param string (optional) file to read user-defined options from
-     * @param string (optional) file to read system-wide defaults from
-     *
-     * @return object an existing or new PEAR_Config instance
-     *
-     * @access public
-     *
-     * @see PEAR_Config::PEAR_Config
-     */
-    function &singleton($user_file = '', $system_file = '', $strict = true)
-    {
-        if (is_object($GLOBALS['_PEAR_Config_instance'])) {
-            return $GLOBALS['_PEAR_Config_instance'];
-        }
-
-        $t_conf = &new PEAR_Config($user_file, $system_file, false, $strict);
-        if ($t_conf->_errorsFound > 0) {
-             return $t_conf->lastError;
-        }
-
-        $GLOBALS['_PEAR_Config_instance'] = &$t_conf;
-        return $GLOBALS['_PEAR_Config_instance'];
-    }
-
-    /**
-     * Determine whether any configuration files have been detected, and whether a
-     * registry object can be retrieved from this configuration.
-     * @return bool
-     * @since PEAR 1.4.0a1
-     */
-    function validConfiguration()
-    {
-        if ($this->isDefinedLayer('user') || $this->isDefinedLayer('system')) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Reads configuration data from a file.  All existing values in
-     * the config layer are discarded and replaced with data from the
-     * file.
-     * @param string file to read from, if NULL or not specified, the
-     *               last-used file for the same layer (second param) is used
-     * @param string config layer to insert data into ('user' or 'system')
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function readConfigFile($file = null, $layer = 'user', $strict = true)
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config layer `$layer'");
-        }
-
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-
-        $data = $this->_readConfigDataFrom($file);
-        if (PEAR::isError($data)) {
-            if (!$strict) {
-                return true;
-            }
-
-            $this->_errorsFound++;
-            $this->lastError = $data;
-
-            return $data;
-        }
-
-        $this->files[$layer] = $file;
-        $this->_decodeInput($data);
-        $this->configuration[$layer] = $data;
-        $this->_setupChannels();
-        if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-            $this->_registry[$layer]->setConfig($this, false);
-            $this->_regInitialized[$layer] = false;
-        } else {
-            unset($this->_registry[$layer]);
-        }
-        return true;
-    }
-
-    /**
-     * @param string url to the remote config file, like ftp://www.example.com/pear/config.ini
-     * @return true|PEAR_Error
-     */
-    function readFTPConfigFile($path)
-    {
-        do { // poor man's try
-            if (!class_exists('PEAR_FTP')) {
-                if (!class_exists('PEAR_Common')) {
-                    require_once 'PEAR/Common.php';
-                }
-                if (PEAR_Common::isIncludeable('PEAR/FTP.php')) {
-                    require_once 'PEAR/FTP.php';
-                }
-            }
-
-            if (!class_exists('PEAR_FTP')) {
-                return PEAR::raiseError('PEAR_RemoteInstaller must be installed to use remote config');
-            }
-
-            $this->_ftp = &new PEAR_FTP;
-            $this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);
-            $e = $this->_ftp->init($path);
-            if (PEAR::isError($e)) {
-                $this->_ftp->popErrorHandling();
-                return $e;
-            }
-
-            $tmp = System::mktemp('-d');
-            PEAR_Common::addTempFile($tmp);
-            $e = $this->_ftp->get(basename($path), $tmp . DIRECTORY_SEPARATOR .
-                'pear.ini', false, FTP_BINARY);
-            if (PEAR::isError($e)) {
-                $this->_ftp->popErrorHandling();
-                return $e;
-            }
-
-            PEAR_Common::addTempFile($tmp . DIRECTORY_SEPARATOR . 'pear.ini');
-            $this->_ftp->disconnect();
-            $this->_ftp->popErrorHandling();
-            $this->files['ftp'] = $tmp . DIRECTORY_SEPARATOR . 'pear.ini';
-            $e = $this->readConfigFile(null, 'ftp');
-            if (PEAR::isError($e)) {
-                return $e;
-            }
-
-            $fail = array();
-            foreach ($this->configuration_info as $key => $val) {
-                if (in_array($this->getGroup($key),
-                      array('File Locations', 'File Locations (Advanced)')) &&
-                      $this->getType($key) == 'directory') {
-                    // any directory configs must be set for this to work
-                    if (!isset($this->configuration['ftp'][$key])) {
-                        $fail[] = $key;
-                    }
-                }
-            }
-
-            if (!count($fail)) {
-                return true;
-            }
-
-            $fail = '"' . implode('", "', $fail) . '"';
-            unset($this->files['ftp']);
-            unset($this->configuration['ftp']);
-            return PEAR::raiseError('ERROR: Ftp configuration file must set all ' .
-                'directory configuration variables.  These variables were not set: ' .
-                $fail);
-        } while (false); // poor man's catch
-        unset($this->files['ftp']);
-        return PEAR::raiseError('no remote host specified');
-    }
-
-    /**
-     * Reads the existing configurations and creates the _channels array from it
-     */
-    function _setupChannels()
-    {
-        $set = array_flip(array_values($this->_channels));
-        foreach ($this->configuration as $layer => $data) {
-            $i = 1000;
-            if (isset($data['__channels']) && is_array($data['__channels'])) {
-                foreach ($data['__channels'] as $channel => $info) {
-                    $set[$channel] = $i++;
-                }
-            }
-        }
-        $this->_channels = array_values(array_flip($set));
-        $this->setChannels($this->_channels);
-    }
-
-    function deleteChannel($channel)
-    {
-        $ch = strtolower($channel);
-        foreach ($this->configuration as $layer => $data) {
-            if (isset($data['__channels']) && isset($data['__channels'][$ch])) {
-                unset($this->configuration[$layer]['__channels'][$ch]);
-            }
-        }
-
-        $this->_channels = array_flip($this->_channels);
-        unset($this->_channels[$ch]);
-        $this->_channels = array_flip($this->_channels);
-    }
-
-    /**
-     * Merges data into a config layer from a file.  Does the same
-     * thing as readConfigFile, except it does not replace all
-     * existing values in the config layer.
-     * @param string file to read from
-     * @param bool whether to overwrite existing data (default TRUE)
-     * @param string config layer to insert data into ('user' or 'system')
-     * @param string if true, errors are returned if file opening fails
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function mergeConfigFile($file, $override = true, $layer = 'user', $strict = true)
-    {
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config layer `$layer'");
-        }
-
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-
-        $data = $this->_readConfigDataFrom($file);
-        if (PEAR::isError($data)) {
-            if (!$strict) {
-                return true;
-            }
-
-            $this->_errorsFound++;
-            $this->lastError = $data;
-
-            return $data;
-        }
-
-        $this->_decodeInput($data);
-        if ($override) {
-            $this->configuration[$layer] =
-                PEAR_Config::arrayMergeRecursive($this->configuration[$layer], $data);
-        } else {
-            $this->configuration[$layer] =
-                PEAR_Config::arrayMergeRecursive($data, $this->configuration[$layer]);
-        }
-
-        $this->_setupChannels();
-        if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-            $this->_registry[$layer]->setConfig($this, false);
-            $this->_regInitialized[$layer] = false;
-        } else {
-            unset($this->_registry[$layer]);
-        }
-        return true;
-    }
-
-    /**
-     * @param array
-     * @param array
-     * @return array
-     * @static
-     */
-    function arrayMergeRecursive($arr2, $arr1)
-    {
-        $ret = array();
-        foreach ($arr2 as $key => $data) {
-            if (!isset($arr1[$key])) {
-                $ret[$key] = $data;
-                unset($arr1[$key]);
-                continue;
-            }
-            if (is_array($data)) {
-                if (!is_array($arr1[$key])) {
-                    $ret[$key] = $arr1[$key];
-                    unset($arr1[$key]);
-                    continue;
-                }
-                $ret[$key] = PEAR_Config::arrayMergeRecursive($arr1[$key], $arr2[$key]);
-                unset($arr1[$key]);
-            }
-        }
-
-        return array_merge($ret, $arr1);
-    }
-
-    /**
-     * Writes data into a config layer from a file.
-     *
-     * @param string|null file to read from, or null for default
-     * @param string config layer to insert data into ('user' or
-     *               'system')
-     * @param string|null data to write to config file or null for internal data [DEPRECATED]
-     * @return bool TRUE on success or a PEAR error on failure
-     */
-    function writeConfigFile($file = null, $layer = 'user', $data = null)
-    {
-        $this->_lazyChannelSetup($layer);
-        if ($layer == 'both' || $layer == 'all') {
-            foreach ($this->files as $type => $file) {
-                $err = $this->writeConfigFile($file, $type, $data);
-                if (PEAR::isError($err)) {
-                    return $err;
-                }
-            }
-            return true;
-        }
-
-        if (empty($this->files[$layer])) {
-            return $this->raiseError("unknown config file type `$layer'");
-        }
-
-        if ($file === null) {
-            $file = $this->files[$layer];
-        }
-
-        $data = ($data === null) ? $this->configuration[$layer] : $data;
-        $this->_encodeOutput($data);
-        $opt = array('-p', dirname($file));
-        if (!@System::mkDir($opt)) {
-            return $this->raiseError("could not create directory: " . dirname($file));
-        }
-
-        if (file_exists($file) && is_file($file) && !is_writeable($file)) {
-            return $this->raiseError("no write access to $file!");
-        }
-
-        $fp = @fopen($file, "w");
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::writeConfigFile fopen('$file','w') failed ($php_errormsg)");
-        }
-
-        $contents = "#PEAR_Config 0.9\n" . serialize($data);
-        if (!@fwrite($fp, $contents)) {
-            return $this->raiseError("PEAR_Config::writeConfigFile: fwrite failed ($php_errormsg)");
-        }
-        return true;
-    }
-
-    /**
-     * Reads configuration data from a file and returns the parsed data
-     * in an array.
-     *
-     * @param string file to read from
-     * @return array configuration data or a PEAR error on failure
-     * @access private
-     */
-    function _readConfigDataFrom($file)
-    {
-        $fp = false;
-        if (file_exists($file)) {
-            $fp = @fopen($file, "r");
-        }
-
-        if (!$fp) {
-            return $this->raiseError("PEAR_Config::readConfigFile fopen('$file','r') failed");
-        }
-
-        $size = filesize($file);
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        fclose($fp);
-        $contents = file_get_contents($file);
-        if (empty($contents)) {
-            return $this->raiseError('Configuration file "' . $file . '" is empty');
-        }
-
-        set_magic_quotes_runtime($rt);
-
-        $version = false;
-        if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
-            $version = $matches[1];
-            $contents = substr($contents, strlen($matches[0]));
-        } else {
-            // Museum config file
-            if (substr($contents,0,2) == 'a:') {
-                $version = '0.1';
-            }
-        }
-
-        if ($version && version_compare("$version", '1', '<')) {
-            // no '@', it is possible that unserialize
-            // raises a notice but it seems to block IO to
-            // STDOUT if a '@' is used and a notice is raise
-            $data = unserialize($contents);
-
-            if (!is_array($data) && !$data) {
-                if ($contents == serialize(false)) {
-                    $data = array();
-                } else {
-                    $err = $this->raiseError("PEAR_Config: bad data in $file");
-                    return $err;
-                }
-            }
-            if (!is_array($data)) {
-                if (strlen(trim($contents)) > 0) {
-                    $error = "PEAR_Config: bad data in $file";
-                    $err = $this->raiseError($error);
-                    return $err;
-                }
-
-                $data = array();
-            }
-        // add parsing of newer formats here...
-        } else {
-            $err = $this->raiseError("$file: unknown version `$version'");
-            return $err;
-        }
-
-        return $data;
-    }
-
-    /**
-    * Gets the file used for storing the config for a layer
-    *
-    * @param string $layer 'user' or 'system'
-    */
-    function getConfFile($layer)
-    {
-        return $this->files[$layer];
-    }
-
-    /**
-     * @param string Configuration class name, used for detecting duplicate calls
-     * @param array information on a role as parsed from its xml file
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _addConfigVars($class, $vars)
-    {
-        static $called = array();
-        if (isset($called[$class])) {
-            return;
-        }
-
-        $called[$class] = 1;
-        if (count($vars) > 3) {
-            return $this->raiseError('Roles can only define 3 new config variables or less');
-        }
-
-        foreach ($vars as $name => $var) {
-            if (!is_array($var)) {
-                return $this->raiseError('Configuration information must be an array');
-            }
-
-            if (!isset($var['type'])) {
-                return $this->raiseError('Configuration information must contain a type');
-            } elseif (!in_array($var['type'],
-                    array('string', 'mask', 'password', 'directory', 'file', 'set'))) {
-                  return $this->raiseError(
-                      'Configuration type must be one of directory, file, string, ' .
-                      'mask, set, or password');
-            }
-            if (!isset($var['default'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a default value ("default" index)');
-            }
-
-            if (is_array($var['default'])) {
-                $real_default = '';
-                foreach ($var['default'] as $config_var => $val) {
-                    if (strpos($config_var, 'text') === 0) {
-                        $real_default .= $val;
-                    } elseif (strpos($config_var, 'constant') === 0) {
-                        if (!defined($val)) {
-                            return $this->raiseError(
-                                'Unknown constant "' . $val . '" requested in ' .
-                                'default value for configuration variable "' .
-                                $name . '"');
-                        }
-
-                        $real_default .= constant($val);
-                    } elseif (isset($this->configuration_info[$config_var])) {
-                        $real_default .=
-                            $this->configuration_info[$config_var]['default'];
-                    } else {
-                        return $this->raiseError(
-                            'Unknown request for "' . $config_var . '" value in ' .
-                            'default value for configuration variable "' .
-                            $name . '"');
-                    }
-                }
-                $var['default'] = $real_default;
-            }
-
-            if ($var['type'] == 'integer') {
-                $var['default'] = (integer) $var['default'];
-            }
-
-            if (!isset($var['doc'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a summary ("doc" index)');
-            }
-
-            if (!isset($var['prompt'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a simple prompt ("prompt" index)');
-            }
-
-            if (!isset($var['group'])) {
-                return $this->raiseError(
-                    'Configuration information must contain a simple group ("group" index)');
-            }
-
-            if (isset($this->configuration_info[$name])) {
-                return $this->raiseError('Configuration variable "' . $name .
-                    '" already exists');
-            }
-
-            $this->configuration_info[$name] = $var;
-            // fix bug #7351: setting custom config variable in a channel fails
-            $this->_channelConfigInfo[] = $name;
-        }
-
-        return true;
-    }
-
-    /**
-     * Encodes/scrambles configuration data before writing to files.
-     * Currently, 'password' values will be base64-encoded as to avoid
-     * that people spot cleartext passwords by accident.
-     *
-     * @param array (reference) array to encode values in
-     * @return bool TRUE on success
-     * @access private
-     */
-    function _encodeOutput(&$data)
-    {
-        foreach ($data as $key => $value) {
-            if ($key == '__channels') {
-                foreach ($data['__channels'] as $channel => $blah) {
-                    $this->_encodeOutput($data['__channels'][$channel]);
-                }
-            }
-
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                // we base64-encode passwords so they are at least
-                // not shown in plain by accident
-                case 'password': {
-                    $data[$key] = base64_encode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = octdec($data[$key]);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Decodes/unscrambles configuration data after reading from files.
-     *
-     * @param array (reference) array to encode values in
-     * @return bool TRUE on success
-     * @access private
-     *
-     * @see PEAR_Config::_encodeOutput
-     */
-    function _decodeInput(&$data)
-    {
-        if (!is_array($data)) {
-            return true;
-        }
-
-        foreach ($data as $key => $value) {
-            if ($key == '__channels') {
-                foreach ($data['__channels'] as $channel => $blah) {
-                    $this->_decodeInput($data['__channels'][$channel]);
-                }
-            }
-
-            if (!isset($this->configuration_info[$key])) {
-                continue;
-            }
-
-            $type = $this->configuration_info[$key]['type'];
-            switch ($type) {
-                case 'password': {
-                    $data[$key] = base64_decode($data[$key]);
-                    break;
-                }
-                case 'mask': {
-                    $data[$key] = decoct($data[$key]);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieve the default channel.
-     *
-     * On startup, channels are not initialized, so if the default channel is not
-     * pear.php.net, then initialize the config.
-     * @param string registry layer
-     * @return string|false
-     */
-    function getDefaultChannel($layer = null)
-    {
-        $ret = false;
-        if ($layer === null) {
-            foreach ($this->layers as $layer) {
-                if (isset($this->configuration[$layer]['default_channel'])) {
-                    $ret = $this->configuration[$layer]['default_channel'];
-                    break;
-                }
-            }
-        } elseif (isset($this->configuration[$layer]['default_channel'])) {
-            $ret = $this->configuration[$layer]['default_channel'];
-        }
-
-        if ($ret == 'pear.php.net' && defined('PEAR_RUNTYPE') && PEAR_RUNTYPE == 'pecl') {
-            $ret = 'pecl.php.net';
-        }
-
-        if ($ret) {
-            if ($ret != 'pear.php.net') {
-                $this->_lazyChannelSetup();
-            }
-
-            return $ret;
-        }
-
-        return PEAR_CONFIG_DEFAULT_CHANNEL;
-    }
-
-    /**
-     * Returns a configuration value, prioritizing layers as per the
-     * layers property.
-     *
-     * @param string config key
-     * @return mixed the config value, or NULL if not found
-     * @access public
-     */
-    function get($key, $layer = null, $channel = false)
-    {
-        if (!isset($this->configuration_info[$key])) {
-            return null;
-        }
-
-        if ($key == '__channels') {
-            return null;
-        }
-
-        if ($key == 'default_channel') {
-            return $this->getDefaultChannel($layer);
-        }
-
-        if (!$channel) {
-            $channel = $this->getDefaultChannel();
-        } elseif ($channel != 'pear.php.net') {
-            $this->_lazyChannelSetup();
-        }
-        $channel = strtolower($channel);
-
-        $test = (in_array($key, $this->_channelConfigInfo)) ?
-            $this->_getChannelValue($key, $layer, $channel) :
-            null;
-        if ($test !== null) {
-            if ($this->_installRoot) {
-                if (in_array($this->getGroup($key),
-                      array('File Locations', 'File Locations (Advanced)')) &&
-                      $this->getType($key) == 'directory') {
-                    return $this->_prependPath($test, $this->_installRoot);
-                }
-            }
-            return $test;
-        }
-
-        if ($layer === null) {
-            foreach ($this->layers as $layer) {
-                if (isset($this->configuration[$layer][$key])) {
-                    $test = $this->configuration[$layer][$key];
-                    if ($this->_installRoot) {
-                        if (in_array($this->getGroup($key),
-                              array('File Locations', 'File Locations (Advanced)')) &&
-                              $this->getType($key) == 'directory') {
-                            return $this->_prependPath($test, $this->_installRoot);
-                        }
-                    }
-
-                    if ($key == 'preferred_mirror') {
-                        $reg = &$this->getRegistry();
-                        if (is_object($reg)) {
-                            $chan = &$reg->getChannel($channel);
-                            if (PEAR::isError($chan)) {
-                                return $channel;
-                            }
-
-                            if (!$chan->getMirror($test) && $chan->getName() != $test) {
-                                return $channel; // mirror does not exist
-                            }
-                        }
-                    }
-                    return $test;
-                }
-            }
-        } elseif (isset($this->configuration[$layer][$key])) {
-            $test = $this->configuration[$layer][$key];
-            if ($this->_installRoot) {
-                if (in_array($this->getGroup($key),
-                      array('File Locations', 'File Locations (Advanced)')) &&
-                      $this->getType($key) == 'directory') {
-                    return $this->_prependPath($test, $this->_installRoot);
-                }
-            }
-
-            if ($key == 'preferred_mirror') {
-                $reg = &$this->getRegistry();
-                if (is_object($reg)) {
-                    $chan = &$reg->getChannel($channel);
-                    if (PEAR::isError($chan)) {
-                        return $channel;
-                    }
-
-                    if (!$chan->getMirror($test) && $chan->getName() != $test) {
-                        return $channel; // mirror does not exist
-                    }
-                }
-            }
-
-            return $test;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns a channel-specific configuration value, prioritizing layers as per the
-     * layers property.
-     *
-     * @param string config key
-     * @return mixed the config value, or NULL if not found
-     * @access private
-     */
-    function _getChannelValue($key, $layer, $channel)
-    {
-        if ($key == '__channels' || $channel == 'pear.php.net') {
-            return null;
-        }
-
-        $ret = null;
-        if ($layer === null) {
-            foreach ($this->layers as $ilayer) {
-                if (isset($this->configuration[$ilayer]['__channels'][$channel][$key])) {
-                    $ret = $this->configuration[$ilayer]['__channels'][$channel][$key];
-                    break;
-                }
-            }
-        } elseif (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-            $ret = $this->configuration[$layer]['__channels'][$channel][$key];
-        }
-
-        if ($key != 'preferred_mirror') {
-            return $ret;
-        }
-
-
-        if ($ret !== null) {
-            $reg = &$this->getRegistry($layer);
-            if (is_object($reg)) {
-                $chan = &$reg->getChannel($channel);
-                if (PEAR::isError($chan)) {
-                    return $channel;
-                }
-
-                if (!$chan->getMirror($ret) && $chan->getName() != $ret) {
-                    return $channel; // mirror does not exist
-                }
-            }
-
-            return $ret;
-        }
-
-        if ($channel != $this->getDefaultChannel($layer)) {
-            return $channel; // we must use the channel name as the preferred mirror
-                             // if the user has not chosen an alternate
-        }
-
-        return $this->getDefaultChannel($layer);
-    }
-
-    /**
-     * Set a config value in a specific layer (defaults to 'user').
-     * Enforces the types defined in the configuration_info array.  An
-     * integer config variable will be cast to int, and a set config
-     * variable will be validated against its legal values.
-     *
-     * @param string config key
-     * @param string config value
-     * @param string (optional) config layer
-     * @param string channel to set this value for, or null for global value
-     * @return bool TRUE on success, FALSE on failure
-     */
-    function set($key, $value, $layer = 'user', $channel = false)
-    {
-        if ($key == '__channels') {
-            return false;
-        }
-
-        if (!isset($this->configuration[$layer])) {
-            return false;
-        }
-
-        if ($key == 'default_channel') {
-            // can only set this value globally
-            $channel = 'pear.php.net';
-            if ($value != 'pear.php.net') {
-                $this->_lazyChannelSetup($layer);
-            }
-        }
-
-        if ($key == 'preferred_mirror') {
-            if ($channel == '__uri') {
-                return false; // can't set the __uri pseudo-channel's mirror
-            }
-
-            $reg = &$this->getRegistry($layer);
-            if (is_object($reg)) {
-                $chan = &$reg->getChannel($channel ? $channel : 'pear.php.net');
-                if (PEAR::isError($chan)) {
-                    return false;
-                }
-
-                if (!$chan->getMirror($value) && $chan->getName() != $value) {
-                    return false; // mirror does not exist
-                }
-            }
-        }
-
-        if (!isset($this->configuration_info[$key])) {
-            return false;
-        }
-
-        extract($this->configuration_info[$key]);
-        switch ($type) {
-            case 'integer':
-                $value = (int)$value;
-                break;
-            case 'set': {
-                // If a valid_set is specified, require the value to
-                // be in the set.  If there is no valid_set, accept
-                // any value.
-                if ($valid_set) {
-                    reset($valid_set);
-                    if ((key($valid_set) === 0 && !in_array($value, $valid_set)) ||
-                        (key($valid_set) !== 0 && empty($valid_set[$value])))
-                    {
-                        return false;
-                    }
-                }
-                break;
-            }
-        }
-
-        if (!$channel) {
-            $channel = $this->get('default_channel', null, 'pear.php.net');
-        }
-
-        if (!in_array($channel, $this->_channels)) {
-            $this->_lazyChannelSetup($layer);
-            $reg = &$this->getRegistry($layer);
-            if ($reg) {
-                $channel = $reg->channelName($channel);
-            }
-
-            if (!in_array($channel, $this->_channels)) {
-                return false;
-            }
-        }
-
-        if ($channel != 'pear.php.net') {
-            if (in_array($key, $this->_channelConfigInfo)) {
-                $this->configuration[$layer]['__channels'][$channel][$key] = $value;
-                return true;
-            }
-
-            return false;
-        }
-
-        if ($key == 'default_channel') {
-            if (!isset($reg)) {
-                $reg = &$this->getRegistry($layer);
-                if (!$reg) {
-                    $reg = &$this->getRegistry();
-                }
-            }
-
-            if ($reg) {
-                $value = $reg->channelName($value);
-            }
-
-            if (!$value) {
-                return false;
-            }
-        }
-
-        $this->configuration[$layer][$key] = $value;
-        if ($key == 'php_dir' && !$this->_noRegistry) {
-            if (!isset($this->_registry[$layer]) ||
-                  $value != $this->_registry[$layer]->install_dir) {
-                $this->_registry[$layer] = &new PEAR_Registry($value);
-                $this->_regInitialized[$layer] = false;
-                $this->_registry[$layer]->setConfig($this, false);
-            }
-        }
-
-        return true;
-    }
-
-    function _lazyChannelSetup($uselayer = false)
-    {
-        if ($this->_noRegistry) {
-            return;
-        }
-
-        $merge = false;
-        foreach ($this->_registry as $layer => $p) {
-            if ($uselayer && $uselayer != $layer) {
-                continue;
-            }
-
-            if (!$this->_regInitialized[$layer]) {
-                if ($layer == 'default' && isset($this->_registry['user']) ||
-                      isset($this->_registry['system'])) {
-                    // only use the default registry if there are no alternatives
-                    continue;
-                }
-
-                if (!is_object($this->_registry[$layer])) {
-                    if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
-                        $this->_registry[$layer] = &new PEAR_Registry($phpdir);
-                        $this->_registry[$layer]->setConfig($this, false);
-                        $this->_regInitialized[$layer] = false;
-                    } else {
-                        unset($this->_registry[$layer]);
-                        return;
-                    }
-                }
-
-                $this->setChannels($this->_registry[$layer]->listChannels(), $merge);
-                $this->_regInitialized[$layer] = true;
-                $merge = true;
-            }
-        }
-    }
-
-    /**
-     * Set the list of channels.
-     *
-     * This should be set via a call to {@link PEAR_Registry::listChannels()}
-     * @param array
-     * @param bool
-     * @return bool success of operation
-     */
-    function setChannels($channels, $merge = false)
-    {
-        if (!is_array($channels)) {
-            return false;
-        }
-
-        if ($merge) {
-            $this->_channels = array_merge($this->_channels, $channels);
-        } else {
-            $this->_channels = $channels;
-        }
-
-        foreach ($channels as $channel) {
-            $channel = strtolower($channel);
-            if ($channel == 'pear.php.net') {
-                continue;
-            }
-
-            foreach ($this->layers as $layer) {
-                if (!isset($this->configuration[$layer]['__channels'])) {
-                    $this->configuration[$layer]['__channels'] = array();
-                }
-                if (!isset($this->configuration[$layer]['__channels'][$channel])
-                      || !is_array($this->configuration[$layer]['__channels'][$channel])) {
-                    $this->configuration[$layer]['__channels'][$channel] = array();
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the type of a config value.
-     *
-     * @param string  config key
-     *
-     * @return string type, one of "string", "integer", "file",
-     * "directory", "set" or "password".
-     *
-     * @access public
-     *
-     */
-    function getType($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['type'];
-        }
-        return false;
-    }
-
-    /**
-     * Get the documentation for a config value.
-     *
-     * @param string  config key
-     * @return string documentation string
-     *
-     * @access public
-     *
-     */
-    function getDocs($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['doc'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the short documentation for a config value.
-     *
-     * @param string  config key
-     * @return string short documentation string
-     *
-     * @access public
-     *
-     */
-    function getPrompt($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['prompt'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the parameter group for a config key.
-     *
-     * @param string  config key
-     * @return string parameter group
-     *
-     * @access public
-     *
-     */
-    function getGroup($key)
-    {
-        if (isset($this->configuration_info[$key])) {
-            return $this->configuration_info[$key]['group'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the list of parameter groups.
-     *
-     * @return array list of parameter groups
-     *
-     * @access public
-     *
-     */
-    function getGroups()
-    {
-        $tmp = array();
-        foreach ($this->configuration_info as $key => $info) {
-            $tmp[$info['group']] = 1;
-        }
-
-        return array_keys($tmp);
-    }
-
-    /**
-     * Get the list of the parameters in a group.
-     *
-     * @param string $group parameter group
-     * @return array list of parameters in $group
-     *
-     * @access public
-     *
-     */
-    function getGroupKeys($group)
-    {
-        $keys = array();
-        foreach ($this->configuration_info as $key => $info) {
-            if ($info['group'] == $group) {
-                $keys[] = $key;
-            }
-        }
-
-        return $keys;
-    }
-
-    /**
-     * Get the list of allowed set values for a config value.  Returns
-     * NULL for config values that are not sets.
-     *
-     * @param string  config key
-     * @return array enumerated array of set values, or NULL if the
-     *               config key is unknown or not a set
-     *
-     * @access public
-     *
-     */
-    function getSetValues($key)
-    {
-        if (isset($this->configuration_info[$key]) &&
-            isset($this->configuration_info[$key]['type']) &&
-            $this->configuration_info[$key]['type'] == 'set')
-        {
-            $valid_set = $this->configuration_info[$key]['valid_set'];
-            reset($valid_set);
-            if (key($valid_set) === 0) {
-                return $valid_set;
-            }
-
-            return array_keys($valid_set);
-        }
-
-        return null;
-    }
-
-    /**
-     * Get all the current config keys.
-     *
-     * @return array simple array of config keys
-     *
-     * @access public
-     */
-    function getKeys()
-    {
-        $keys = array();
-        foreach ($this->layers as $layer) {
-            $test = $this->configuration[$layer];
-            if (isset($test['__channels'])) {
-                foreach ($test['__channels'] as $channel => $configs) {
-                    $keys = array_merge($keys, $configs);
-                }
-            }
-
-            unset($test['__channels']);
-            $keys = array_merge($keys, $test);
-
-        }
-        return array_keys($keys);
-    }
-
-    /**
-     * Remove the a config key from a specific config layer.
-     *
-     * @param string config key
-     * @param string (optional) config layer
-     * @param string (optional) channel (defaults to default channel)
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function remove($key, $layer = 'user', $channel = null)
-    {
-        if ($channel === null) {
-            $channel = $this->getDefaultChannel();
-        }
-
-        if ($channel !== 'pear.php.net') {
-            if (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-                unset($this->configuration[$layer]['__channels'][$channel][$key]);
-                return true;
-            }
-        }
-
-        if (isset($this->configuration[$layer][$key])) {
-            unset($this->configuration[$layer][$key]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Temporarily remove an entire config layer.  USE WITH CARE!
-     *
-     * @param string config key
-     * @param string (optional) config layer
-     * @return bool TRUE on success, FALSE on failure
-     *
-     * @access public
-     */
-    function removeLayer($layer)
-    {
-        if (isset($this->configuration[$layer])) {
-            $this->configuration[$layer] = array();
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Stores configuration data in a layer.
-     *
-     * @param string config layer to store
-     * @return bool TRUE on success, or PEAR error on failure
-     *
-     * @access public
-     */
-    function store($layer = 'user', $data = null)
-    {
-        return $this->writeConfigFile(null, $layer, $data);
-    }
-
-    /**
-     * Tells what config layer that gets to define a key.
-     *
-     * @param string config key
-     * @param boolean return the defining channel
-     *
-     * @return string|array the config layer, or an empty string if not found.
-     *
-     *         if $returnchannel, the return is an array array('layer' => layername,
-     *         'channel' => channelname), or an empty string if not found
-     *
-     * @access public
-     */
-    function definedBy($key, $returnchannel = false)
-    {
-        foreach ($this->layers as $layer) {
-            $channel = $this->getDefaultChannel();
-            if ($channel !== 'pear.php.net') {
-                if (isset($this->configuration[$layer]['__channels'][$channel][$key])) {
-                    if ($returnchannel) {
-                        return array('layer' => $layer, 'channel' => $channel);
-                    }
-                    return $layer;
-                }
-            }
-
-            if (isset($this->configuration[$layer][$key])) {
-                if ($returnchannel) {
-                    return array('layer' => $layer, 'channel' => 'pear.php.net');
-                }
-                return $layer;
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Tells whether a given key exists as a config value.
-     *
-     * @param string config key
-     * @return bool whether <config key> exists in this object
-     *
-     * @access public
-     */
-    function isDefined($key)
-    {
-        foreach ($this->layers as $layer) {
-            if (isset($this->configuration[$layer][$key])) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Tells whether a given config layer exists.
-     *
-     * @param string config layer
-     * @return bool whether <config layer> exists in this object
-     *
-     * @access public
-     */
-    function isDefinedLayer($layer)
-    {
-        return isset($this->configuration[$layer]);
-    }
-
-    /**
-     * Returns the layers defined (except the 'default' one)
-     *
-     * @return array of the defined layers
-     */
-    function getLayers()
-    {
-        $cf = $this->configuration;
-        unset($cf['default']);
-        return array_keys($cf);
-    }
-
-    function apiVersion()
-    {
-        return '1.1';
-    }
-
-    /**
-     * @return PEAR_Registry
-     */
-    function &getRegistry($use = null)
-    {
-        $layer = $use === null ? 'user' : $use;
-        if (isset($this->_registry[$layer])) {
-            return $this->_registry[$layer];
-        } elseif ($use === null && isset($this->_registry['system'])) {
-            return $this->_registry['system'];
-        } elseif ($use === null && isset($this->_registry['default'])) {
-            return $this->_registry['default'];
-        } elseif ($use) {
-            $a = false;
-            return $a;
-        }
-
-        // only go here if null was passed in
-        echo "CRITICAL ERROR: Registry could not be initialized from any value";
-        exit(1);
-    }
-
-    /**
-     * This is to allow customization like the use of installroot
-     * @param PEAR_Registry
-     * @return bool
-     */
-    function setRegistry(&$reg, $layer = 'user')
-    {
-        if ($this->_noRegistry) {
-            return false;
-        }
-
-        if (!in_array($layer, array('user', 'system'))) {
-            return false;
-        }
-
-        $this->_registry[$layer] = &$reg;
-        if (is_object($reg)) {
-            $this->_registry[$layer]->setConfig($this, false);
-        }
-
-        return true;
-    }
-
-    function noRegistry()
-    {
-        $this->_noRegistry = true;
-    }
-
-    /**
-     * @return PEAR_REST
-     */
-    function &getREST($version, $options = array())
-    {
-        $version = str_replace('.', '', $version);
-        if (!class_exists($class = 'PEAR_REST_' . $version)) {
-            require_once 'PEAR/REST/' . $version . '.php';
-        }
-
-        $remote = &new $class($this, $options);
-        return $remote;
-    }
-
-    /**
-     * The ftp server is set in {@link readFTPConfigFile()}.  It exists only if a
-     * remote configuration file has been specified
-     * @return PEAR_FTP|false
-     */
-    function &getFTP()
-    {
-        if (isset($this->_ftp)) {
-            return $this->_ftp;
-        }
-
-        $a = false;
-        return $a;
-    }
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                if (preg_match('/^[a-z]:/i', $prepend)) {
-                    $prepend = substr($prepend, 2);
-                } elseif ($prepend{0} != '\\') {
-                    $prepend = "\\$prepend";
-                }
-                $path = substr($path, 0, 2) . $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-
-    /**
-     * @param string|false installation directory to prepend to all _dir variables, or false to
-     *                     disable
-     */
-    function setInstallRoot($root)
-    {
-        if (substr($root, -1) == DIRECTORY_SEPARATOR) {
-            $root = substr($root, 0, -1);
-        }
-        $old = $this->_installRoot;
-        $this->_installRoot = $root;
-        if (($old != $root) && !$this->_noRegistry) {
-            foreach (array_keys($this->_registry) as $layer) {
-                if ($layer == 'ftp' || !isset($this->_registry[$layer])) {
-                    continue;
-                }
-                $this->_registry[$layer] =
-                    &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
-                $this->_registry[$layer]->setConfig($this, false);
-                $this->_regInitialized[$layer] = false;
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/pear/PEAR/Dependency2.php b/airtime_mvc/library/pear/PEAR/Dependency2.php
deleted file mode 100644
index 115a5578c..000000000
--- a/airtime_mvc/library/pear/PEAR/Dependency2.php
+++ /dev/null
@@ -1,1358 +0,0 @@
-<?php
-/**
- * PEAR_Dependency2, advanced dependency validation
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Dependency2.php 286494 2009-07-29 06:57:11Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Required for the PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-
-/**
- * Dependency check for PEAR packages
- *
- * This class handles both version 1.0 and 2.0 dependencies
- * WARNING: *any* changes to this class must be duplicated in the
- * test_PEAR_Dependency2 class found in tests/PEAR_Dependency2/setup.php.inc,
- * or unit tests will not actually validate the changes
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Dependency2
-{
-    /**
-     * One of the PEAR_VALIDATE_* states
-     * @see PEAR_VALIDATE_NORMAL
-     * @var integer
-     */
-    var $_state;
-
-    /**
-     * Command-line options to install/upgrade/uninstall commands
-     * @param array
-     */
-    var $_options;
-
-    /**
-     * @var OS_Guess
-     */
-    var $_os;
-
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-
-    /**
-     * @var PEAR_DependencyDB
-     */
-    var $_dependencydb;
-
-    /**
-     * Output of PEAR_Registry::parsedPackageName()
-     * @var array
-     */
-    var $_currentPackage;
-
-    /**
-     * @param PEAR_Config
-     * @param array installation options
-     * @param array format of PEAR_Registry::parsedPackageName()
-     * @param int installation state (one of PEAR_VALIDATE_*)
-     */
-    function PEAR_Dependency2(&$config, $installoptions, $package,
-                              $state = PEAR_VALIDATE_INSTALLING)
-    {
-        $this->_config = &$config;
-        if (!class_exists('PEAR_DependencyDB')) {
-            require_once 'PEAR/DependencyDB.php';
-        }
-
-        if (isset($installoptions['packagingroot'])) {
-            // make sure depdb is in the right location
-            $config->setInstallRoot($installoptions['packagingroot']);
-        }
-
-        $this->_registry = &$config->getRegistry();
-        $this->_dependencydb = &PEAR_DependencyDB::singleton($config);
-        if (isset($installoptions['packagingroot'])) {
-            $config->setInstallRoot(false);
-        }
-
-        $this->_options = $installoptions;
-        $this->_state = $state;
-        if (!class_exists('OS_Guess')) {
-            require_once 'OS/Guess.php';
-        }
-
-        $this->_os = new OS_Guess;
-        $this->_currentPackage = $package;
-    }
-
-    function _getExtraString($dep)
-    {
-        $extra = ' (';
-        if (isset($dep['uri'])) {
-            return '';
-        }
-
-        if (isset($dep['recommended'])) {
-            $extra .= 'recommended version ' . $dep['recommended'];
-        } else {
-            if (isset($dep['min'])) {
-                $extra .= 'version >= ' . $dep['min'];
-            }
-
-            if (isset($dep['max'])) {
-                if ($extra != ' (') {
-                    $extra .= ', ';
-                }
-                $extra .= 'version <= ' . $dep['max'];
-            }
-
-            if (isset($dep['exclude'])) {
-                if (!is_array($dep['exclude'])) {
-                    $dep['exclude'] = array($dep['exclude']);
-                }
-
-                if ($extra != ' (') {
-                    $extra .= ', ';
-                }
-
-                $extra .= 'excluded versions: ';
-                foreach ($dep['exclude'] as $i => $exclude) {
-                    if ($i) {
-                        $extra .= ', ';
-                    }
-                    $extra .= $exclude;
-                }
-            }
-        }
-
-        $extra .= ')';
-        if ($extra == ' ()') {
-            $extra = '';
-        }
-
-        return $extra;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getPHP_OS()
-    {
-        return PHP_OS;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getsysname()
-    {
-        return $this->_os->getSysname();
-    }
-
-    /**
-     * Specify a dependency on an OS.  Use arch for detailed os/processor information
-     *
-     * There are two generic OS dependencies that will be the most common, unix and windows.
-     * Other options are linux, freebsd, darwin (OS X), sunos, irix, hpux, aix
-     */
-    function validateOsDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING && $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-
-        if ($dep['name'] == '*') {
-            return true;
-        }
-
-        $not = isset($dep['conflicts']) ? true : false;
-        switch (strtolower($dep['name'])) {
-            case 'windows' :
-                if ($not) {
-                    if (strtolower(substr($this->getPHP_OS(), 0, 3)) == 'win') {
-                        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                            return $this->raiseError("Cannot install %s on Windows");
-                        }
-
-                        return $this->warning("warning: Cannot install %s on Windows");
-                    }
-                } else {
-                    if (strtolower(substr($this->getPHP_OS(), 0, 3)) != 'win') {
-                        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                            return $this->raiseError("Can only install %s on Windows");
-                        }
-
-                        return $this->warning("warning: Can only install %s on Windows");
-                    }
-                }
-            break;
-            case 'unix' :
-                $unices = array('linux', 'freebsd', 'darwin', 'sunos', 'irix', 'hpux', 'aix');
-                if ($not) {
-                    if (in_array($this->getSysname(), $unices)) {
-                        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                            return $this->raiseError("Cannot install %s on any Unix system");
-                        }
-
-                        return $this->warning( "warning: Cannot install %s on any Unix system");
-                    }
-                } else {
-                    if (!in_array($this->getSysname(), $unices)) {
-                        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                            return $this->raiseError("Can only install %s on a Unix system");
-                        }
-
-                        return $this->warning("warning: Can only install %s on a Unix system");
-                    }
-                }
-            break;
-            default :
-                if ($not) {
-                    if (strtolower($dep['name']) == strtolower($this->getSysname())) {
-                        if (!isset($this->_options['nodeps']) &&
-                              !isset($this->_options['force'])) {
-                            return $this->raiseError('Cannot install %s on ' . $dep['name'] .
-                                ' operating system');
-                        }
-
-                        return $this->warning('warning: Cannot install %s on ' .
-                            $dep['name'] . ' operating system');
-                    }
-                } else {
-                    if (strtolower($dep['name']) != strtolower($this->getSysname())) {
-                        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                            return $this->raiseError('Cannot install %s on ' .
-                                $this->getSysname() .
-                                ' operating system, can only install on ' . $dep['name']);
-                        }
-
-                        return $this->warning('warning: Cannot install %s on ' .
-                            $this->getSysname() .
-                            ' operating system, can only install on ' . $dep['name']);
-                    }
-                }
-        }
-        return true;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function matchSignature($pattern)
-    {
-        return $this->_os->matchSignature($pattern);
-    }
-
-    /**
-     * Specify a complex dependency on an OS/processor/kernel version,
-     * Use OS for simple operating system dependency.
-     *
-     * This is the only dependency that accepts an eregable pattern.  The pattern
-     * will be matched against the php_uname() output parsed by OS_Guess
-     */
-    function validateArchDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING) {
-            return true;
-        }
-
-        $not = isset($dep['conflicts']) ? true : false;
-        if (!$this->matchSignature($dep['pattern'])) {
-            if (!$not) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s Architecture dependency failed, does not ' .
-                        'match "' . $dep['pattern'] . '"');
-                }
-
-                return $this->warning('warning: %s Architecture dependency failed, does ' .
-                    'not match "' . $dep['pattern'] . '"');
-            }
-
-            return true;
-        }
-
-        if ($not) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s Architecture dependency failed, required "' .
-                    $dep['pattern'] . '"');
-            }
-
-            return $this->warning('warning: %s Architecture dependency failed, ' .
-                'required "' . $dep['pattern'] . '"');
-        }
-
-        return true;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function extension_loaded($name)
-    {
-        return extension_loaded($name);
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function phpversion($name = null)
-    {
-        if ($name !== null) {
-            return phpversion($name);
-        }
-
-        return phpversion();
-    }
-
-    function validateExtensionDependency($dep, $required = true)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-
-        $loaded = $this->extension_loaded($dep['name']);
-        $extra  = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-
-        if (!isset($dep['min']) && !isset($dep['max']) &&
-            !isset($dep['recommended']) && !isset($dep['exclude'])
-        ) {
-            if ($loaded) {
-                if (isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra);
-                    }
-
-                    return $this->warning('warning: %s conflicts with PHP extension "' .
-                        $dep['name'] . '"' . $extra);
-                }
-
-                return true;
-            }
-
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP extension "' .
-                        $dep['name'] . '"' . $extra);
-                }
-
-                return $this->warning('warning: %s requires PHP extension "' .
-                    $dep['name'] . '"' . $extra);
-            }
-
-            return $this->warning('%s can optionally use PHP extension "' .
-                $dep['name'] . '"' . $extra);
-        }
-
-        if (!$loaded) {
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-
-            if (!$required) {
-                return $this->warning('%s can optionally use PHP extension "' .
-                    $dep['name'] . '"' . $extra);
-            }
-
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires PHP extension "' . $dep['name'] .
-                    '"' . $extra);
-            }
-
-            return $this->warning('warning: %s requires PHP extension "' . $dep['name'] .
-                    '"' . $extra);
-        }
-
-        $version = (string) $this->phpversion($dep['name']);
-        if (empty($version)) {
-            $version = '0';
-        }
-
-        $fail = false;
-        if (isset($dep['min']) && !version_compare($version, $dep['min'], '>=')) {
-            $fail = true;
-        }
-
-        if (isset($dep['max']) && !version_compare($version, $dep['max'], '<=')) {
-            $fail = true;
-        }
-
-        if ($fail && !isset($dep['conflicts'])) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires PHP extension "' . $dep['name'] .
-                    '"' . $extra . ', installed version is ' . $version);
-            }
-
-            return $this->warning('warning: %s requires PHP extension "' . $dep['name'] .
-                '"' . $extra . ', installed version is ' . $version);
-        } elseif ((isset($dep['min']) || isset($dep['max'])) && !$fail && isset($dep['conflicts'])) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s conflicts with PHP extension "' .
-                    $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-            }
-
-            return $this->warning('warning: %s conflicts with PHP extension "' .
-                $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-        }
-
-        if (isset($dep['exclude'])) {
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==')) {
-                    if (isset($dep['conflicts'])) {
-                        continue;
-                    }
-
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PHP extension "' .
-                            $dep['name'] . '" version ' .
-                            $exclude);
-                    }
-
-                    return $this->warning('warning: %s is not compatible with PHP extension "' .
-                        $dep['name'] . '" version ' .
-                        $exclude);
-                } elseif (version_compare($version, $exclude, '!=') && isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with PHP extension "' .
-                            $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-                    }
-
-                    return $this->warning('warning: %s conflicts with PHP extension "' .
-                        $dep['name'] . '"' . $extra . ', installed version is ' . $version);
-                }
-            }
-        }
-
-        if (isset($dep['recommended'])) {
-            if (version_compare($version, $dep['recommended'], '==')) {
-                return true;
-            }
-
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s dependency: PHP extension ' . $dep['name'] .
-                    ' version "' . $version . '"' .
-                    ' is not the recommended version "' . $dep['recommended'] .
-                    '", but may be compatible, use --force to install');
-            }
-
-            return $this->warning('warning: %s dependency: PHP extension ' .
-                $dep['name'] . ' version "' . $version . '"' .
-                ' is not the recommended version "' . $dep['recommended'].'"');
-        }
-
-        return true;
-    }
-
-    function validatePhpDependency($dep)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-
-        $version = $this->phpversion();
-        $extra   = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-
-        if (isset($dep['min'])) {
-            if (!version_compare($version, $dep['min'], '>=')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                }
-
-                return $this->warning('warning: %s requires PHP' .
-                    $extra . ', installed version is ' . $version);
-            }
-        }
-
-        if (isset($dep['max'])) {
-            if (!version_compare($version, $dep['max'], '<=')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PHP' .
-                        $extra . ', installed version is ' . $version);
-                }
-
-                return $this->warning('warning: %s requires PHP' .
-                    $extra . ', installed version is ' . $version);
-            }
-        }
-
-        if (isset($dep['exclude'])) {
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==')) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PHP version ' .
-                            $exclude);
-                    }
-
-                    return $this->warning(
-                        'warning: %s is not compatible with PHP version ' .
-                        $exclude);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * This makes unit-testing a heck of a lot easier
-     */
-    function getPEARVersion()
-    {
-        return '1.9.1';
-    }
-
-    function validatePearinstallerDependency($dep)
-    {
-        $pearversion = $this->getPEARVersion();
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-        }
-
-        if (version_compare($pearversion, $dep['min'], '<')) {
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires PEAR Installer' . $extra .
-                    ', installed version is ' . $pearversion);
-            }
-
-            return $this->warning('warning: %s requires PEAR Installer' . $extra .
-                ', installed version is ' . $pearversion);
-        }
-
-        if (isset($dep['max'])) {
-            if (version_compare($pearversion, $dep['max'], '>')) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires PEAR Installer' . $extra .
-                        ', installed version is ' . $pearversion);
-                }
-
-                return $this->warning('warning: %s requires PEAR Installer' . $extra .
-                    ', installed version is ' . $pearversion);
-            }
-        }
-
-        if (isset($dep['exclude'])) {
-            if (!isset($dep['exclude'][0])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($exclude, $pearversion, '==')) {
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s is not compatible with PEAR Installer ' .
-                            'version ' . $exclude);
-                    }
-
-                    return $this->warning('warning: %s is not compatible with PEAR ' .
-                        'Installer version ' . $exclude);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    function validateSubpackageDependency($dep, $required, $params)
-    {
-        return $this->validatePackageDependency($dep, $required, $params);
-    }
-
-    /**
-     * @param array dependency information (2.0 format)
-     * @param boolean whether this is a required dependency
-     * @param array a list of downloaded packages to be installed, if any
-     * @param boolean if true, then deps on pear.php.net that fail will also check
-     *                against pecl.php.net packages to accomodate extensions that have
-     *                moved to pecl.php.net from pear.php.net
-     */
-    function validatePackageDependency($dep, $required, $params, $depv1 = false)
-    {
-        if ($this->_state != PEAR_VALIDATE_INSTALLING &&
-              $this->_state != PEAR_VALIDATE_DOWNLOADING) {
-            return true;
-        }
-
-        if (isset($dep['providesextension'])) {
-            if ($this->extension_loaded($dep['providesextension'])) {
-                $save = $dep;
-                $subdep = $dep;
-                $subdep['name'] = $subdep['providesextension'];
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $ret = $this->validateExtensionDependency($subdep, $required);
-                PEAR::popErrorHandling();
-                if (!PEAR::isError($ret)) {
-                    return true;
-                }
-            }
-        }
-
-        if ($this->_state == PEAR_VALIDATE_INSTALLING) {
-            return $this->_validatePackageInstall($dep, $required, $depv1);
-        }
-
-        if ($this->_state == PEAR_VALIDATE_DOWNLOADING) {
-            return $this->_validatePackageDownload($dep, $required, $params, $depv1);
-        }
-    }
-
-    function _validatePackageDownload($dep, $required, $params, $depv1 = false)
-    {
-        $dep['package'] = $dep['name'];
-        if (isset($dep['uri'])) {
-            $dep['channel'] = '__uri';
-        }
-
-        $depname = $this->_registry->parsedPackageNameToString($dep, true);
-        $found = false;
-        foreach ($params as $param) {
-            if ($param->isEqual(
-                  array('package' => $dep['name'],
-                        'channel' => $dep['channel']))) {
-                $found = true;
-                break;
-            }
-
-            if ($depv1 && $dep['channel'] == 'pear.php.net') {
-                if ($param->isEqual(
-                  array('package' => $dep['name'],
-                        'channel' => 'pecl.php.net'))) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-
-        if (!$found && isset($dep['providesextension'])) {
-            foreach ($params as $param) {
-                if ($param->isExtension($dep['providesextension'])) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-
-        if ($found) {
-            $version = $param->getVersion();
-            $installed = false;
-            $downloaded = true;
-        } else {
-            if ($this->_registry->packageExists($dep['name'], $dep['channel'])) {
-                $installed = true;
-                $downloaded = false;
-                $version = $this->_registry->packageinfo($dep['name'], 'version',
-                    $dep['channel']);
-            } else {
-                if ($dep['channel'] == 'pecl.php.net' && $this->_registry->packageExists($dep['name'],
-                      'pear.php.net')) {
-                    $installed = true;
-                    $downloaded = false;
-                    $version = $this->_registry->packageinfo($dep['name'], 'version',
-                        'pear.php.net');
-                } else {
-                    $version = 'not installed or downloaded';
-                    $installed = false;
-                    $downloaded = false;
-                }
-            }
-        }
-
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude']) && !is_array($dep['exclude'])) {
-            $dep['exclude'] = array($dep['exclude']);
-        }
-
-        if (!isset($dep['min']) && !isset($dep['max']) &&
-              !isset($dep['recommended']) && !isset($dep['exclude'])
-        ) {
-            if ($installed || $downloaded) {
-                $installed = $installed ? 'installed' : 'downloaded';
-                if (isset($dep['conflicts'])) {
-                    $rest = '';
-                    if ($version) {
-                        $rest = ", $installed version is " . $version;
-                    }
-
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with package "' . $depname . '"' . $extra . $rest);
-                    }
-
-                    return $this->warning('warning: %s conflicts with package "' . $depname . '"' . $extra . $rest);
-                }
-
-                return true;
-            }
-
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires package "' . $depname . '"' . $extra);
-                }
-
-                return $this->warning('warning: %s requires package "' . $depname . '"' . $extra);
-            }
-
-            return $this->warning('%s can optionally use package "' . $depname . '"' . $extra);
-        }
-
-        if (!$installed && !$downloaded) {
-            if (isset($dep['conflicts'])) {
-                return true;
-            }
-
-            if ($required) {
-                if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                    return $this->raiseError('%s requires package "' . $depname . '"' . $extra);
-                }
-
-                return $this->warning('warning: %s requires package "' . $depname . '"' . $extra);
-            }
-
-            return $this->warning('%s can optionally use package "' . $depname . '"' . $extra);
-        }
-
-        $fail = false;
-        if (isset($dep['min']) && version_compare($version, $dep['min'], '<')) {
-            $fail = true;
-        }
-
-        if (isset($dep['max']) && version_compare($version, $dep['max'], '>')) {
-            $fail = true;
-        }
-
-        if ($fail && !isset($dep['conflicts'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            $dep['package'] = $dep['name'];
-            $dep = $this->_registry->parsedPackageNameToString($dep, true);
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s requires package "' . $depname . '"' .
-                    $extra . ", $installed version is " . $version);
-            }
-
-            return $this->warning('warning: %s requires package "' . $depname . '"' .
-                $extra . ", $installed version is " . $version);
-        } elseif ((isset($dep['min']) || isset($dep['max'])) && !$fail &&
-              isset($dep['conflicts']) && !isset($dep['exclude'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('%s conflicts with package "' . $depname . '"' . $extra .
-                    ", $installed version is " . $version);
-            }
-
-            return $this->warning('warning: %s conflicts with package "' . $depname . '"' .
-                $extra . ", $installed version is " . $version);
-        }
-
-        if (isset($dep['exclude'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            foreach ($dep['exclude'] as $exclude) {
-                if (version_compare($version, $exclude, '==') && !isset($dep['conflicts'])) {
-                    if (!isset($this->_options['nodeps']) &&
-                          !isset($this->_options['force'])
-                    ) {
-                        return $this->raiseError('%s is not compatible with ' .
-                            $installed . ' package "' .
-                            $depname . '" version ' .
-                            $exclude);
-                    }
-
-                    return $this->warning('warning: %s is not compatible with ' .
-                        $installed . ' package "' .
-                        $depname . '" version ' .
-                        $exclude);
-                } elseif (version_compare($version, $exclude, '!=') && isset($dep['conflicts'])) {
-                    $installed = $installed ? 'installed' : 'downloaded';
-                    if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                        return $this->raiseError('%s conflicts with package "' . $depname . '"' .
-                            $extra . ", $installed version is " . $version);
-                    }
-
-                    return $this->warning('warning: %s conflicts with package "' . $depname . '"' .
-                        $extra . ", $installed version is " . $version);
-                }
-            }
-        }
-
-        if (isset($dep['recommended'])) {
-            $installed = $installed ? 'installed' : 'downloaded';
-            if (version_compare($version, $dep['recommended'], '==')) {
-                return true;
-            }
-
-            if (!$found && $installed) {
-                $param = $this->_registry->getPackage($dep['name'], $dep['channel']);
-            }
-
-            if ($param) {
-                $found = false;
-                foreach ($params as $parent) {
-                    if ($parent->isEqual($this->_currentPackage)) {
-                        $found = true;
-                        break;
-                    }
-                }
-
-                if ($found) {
-                    if ($param->isCompatible($parent)) {
-                        return true;
-                    }
-                } else { // this is for validPackage() calls
-                    $parent = $this->_registry->getPackage($this->_currentPackage['package'],
-                        $this->_currentPackage['channel']);
-                    if ($parent !== null && $param->isCompatible($parent)) {
-                        return true;
-                    }
-                }
-            }
-
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force']) &&
-                  !isset($this->_options['loose'])
-            ) {
-                return $this->raiseError('%s dependency package "' . $depname .
-                    '" ' . $installed . ' version ' . $version .
-                    ' is not the recommended version ' . $dep['recommended'] .
-                    ', but may be compatible, use --force to install');
-            }
-
-            return $this->warning('warning: %s dependency package "' . $depname .
-                '" ' . $installed . ' version ' . $version .
-                ' is not the recommended version ' . $dep['recommended']);
-        }
-
-        return true;
-    }
-
-    function _validatePackageInstall($dep, $required, $depv1 = false)
-    {
-        return $this->_validatePackageDownload($dep, $required, array(), $depv1);
-    }
-
-    /**
-     * Verify that uninstalling packages passed in to command line is OK.
-     *
-     * @param PEAR_Installer $dl
-     * @return PEAR_Error|true
-     */
-    function validatePackageUninstall(&$dl)
-    {
-        if (PEAR::isError($this->_dependencydb)) {
-            return $this->_dependencydb;
-        }
-
-        $params = array();
-        // construct an array of "downloaded" packages to fool the package dependency checker
-        // into using these to validate uninstalls of circular dependencies
-        $downloaded = &$dl->getUninstallPackages();
-        foreach ($downloaded as $i => $pf) {
-            if (!class_exists('PEAR_Downloader_Package')) {
-                require_once 'PEAR/Downloader/Package.php';
-            }
-            $dp = &new PEAR_Downloader_Package($dl);
-            $dp->setPackageFile($downloaded[$i]);
-            $params[$i] = &$dp;
-        }
-
-        // check cache
-        $memyselfandI = strtolower($this->_currentPackage['channel']) . '/' .
-            strtolower($this->_currentPackage['package']);
-        if (isset($dl->___uninstall_package_cache)) {
-            $badpackages = $dl->___uninstall_package_cache;
-            if (isset($badpackages[$memyselfandI]['warnings'])) {
-                foreach ($badpackages[$memyselfandI]['warnings'] as $warning) {
-                    $dl->log(0, $warning[0]);
-                }
-            }
-
-            if (isset($badpackages[$memyselfandI]['errors'])) {
-                foreach ($badpackages[$memyselfandI]['errors'] as $error) {
-                    if (is_array($error)) {
-                        $dl->log(0, $error[0]);
-                    } else {
-                        $dl->log(0, $error->getMessage());
-                    }
-                }
-
-                if (isset($this->_options['nodeps']) || isset($this->_options['force'])) {
-                    return $this->warning(
-                        'warning: %s should not be uninstalled, other installed packages depend ' .
-                        'on this package');
-                }
-
-                return $this->raiseError(
-                    '%s cannot be uninstalled, other installed packages depend on this package');
-            }
-
-            return true;
-        }
-
-        // first, list the immediate parents of each package to be uninstalled
-        $perpackagelist = array();
-        $allparents = array();
-        foreach ($params as $i => $param) {
-            $a = array(
-                'channel' => strtolower($param->getChannel()),
-                'package' => strtolower($param->getPackage())
-            );
-
-            $deps = $this->_dependencydb->getDependentPackages($a);
-            if ($deps) {
-                foreach ($deps as $d) {
-                    $pardeps = $this->_dependencydb->getDependencies($d);
-                    foreach ($pardeps as $dep) {
-                        if (strtolower($dep['dep']['channel']) == $a['channel'] &&
-                              strtolower($dep['dep']['name']) == $a['package']) {
-                            if (!isset($perpackagelist[$a['channel'] . '/' . $a['package']])) {
-                                $perpackagelist[$a['channel'] . '/' . $a['package']] = array();
-                            }
-                            $perpackagelist[$a['channel'] . '/' . $a['package']][]
-                                = array($d['channel'] . '/' . $d['package'], $dep);
-                            if (!isset($allparents[$d['channel'] . '/' . $d['package']])) {
-                                $allparents[$d['channel'] . '/' . $d['package']] = array();
-                            }
-                            if (!isset($allparents[$d['channel'] . '/' . $d['package']][$a['channel'] . '/' . $a['package']])) {
-                                $allparents[$d['channel'] . '/' . $d['package']][$a['channel'] . '/' . $a['package']] = array();
-                            }
-                            $allparents[$d['channel'] . '/' . $d['package']]
-                                       [$a['channel'] . '/' . $a['package']][]
-                                = array($d, $dep);
-                        }
-                    }
-                }
-            }
-        }
-
-        // next, remove any packages from the parents list that are not installed
-        $remove = array();
-        foreach ($allparents as $parent => $d1) {
-            foreach ($d1 as $d) {
-                if ($this->_registry->packageExists($d[0][0]['package'], $d[0][0]['channel'])) {
-                    continue;
-                }
-                $remove[$parent] = true;
-            }
-        }
-
-        // next remove any packages from the parents list that are not passed in for
-        // uninstallation
-        foreach ($allparents as $parent => $d1) {
-            foreach ($d1 as $d) {
-                foreach ($params as $param) {
-                    if (strtolower($param->getChannel()) == $d[0][0]['channel'] &&
-                          strtolower($param->getPackage()) == $d[0][0]['package']) {
-                        // found it
-                        continue 3;
-                    }
-                }
-                $remove[$parent] = true;
-            }
-        }
-
-        // remove all packages whose dependencies fail
-        // save which ones failed for error reporting
-        $badchildren = array();
-        do {
-            $fail = false;
-            foreach ($remove as $package => $unused) {
-                if (!isset($allparents[$package])) {
-                    continue;
-                }
-
-                foreach ($allparents[$package] as $kid => $d1) {
-                    foreach ($d1 as $depinfo) {
-                        if ($depinfo[1]['type'] != 'optional') {
-                            if (isset($badchildren[$kid])) {
-                                continue;
-                            }
-                            $badchildren[$kid] = true;
-                            $remove[$kid] = true;
-                            $fail = true;
-                            continue 2;
-                        }
-                    }
-                }
-                if ($fail) {
-                    // start over, we removed some children
-                    continue 2;
-                }
-            }
-        } while ($fail);
-
-        // next, construct the list of packages that can't be uninstalled
-        $badpackages = array();
-        $save = $this->_currentPackage;
-        foreach ($perpackagelist as $package => $packagedeps) {
-            foreach ($packagedeps as $parent) {
-                if (!isset($remove[$parent[0]])) {
-                    continue;
-                }
-
-                $packagename = $this->_registry->parsePackageName($parent[0]);
-                $packagename['channel'] = $this->_registry->channelAlias($packagename['channel']);
-                $pa = $this->_registry->getPackage($packagename['package'], $packagename['channel']);
-                $packagename['package'] = $pa->getPackage();
-                $this->_currentPackage = $packagename;
-                // parent is not present in uninstall list, make sure we can actually
-                // uninstall it (parent dep is optional)
-                $parentname['channel'] = $this->_registry->channelAlias($parent[1]['dep']['channel']);
-                $pa = $this->_registry->getPackage($parent[1]['dep']['name'], $parent[1]['dep']['channel']);
-                $parentname['package'] = $pa->getPackage();
-                $parent[1]['dep']['package'] = $parentname['package'];
-                $parent[1]['dep']['channel'] = $parentname['channel'];
-                if ($parent[1]['type'] == 'optional') {
-                    $test = $this->_validatePackageUninstall($parent[1]['dep'], false, $dl);
-                    if ($test !== true) {
-                        $badpackages[$package]['warnings'][] = $test;
-                    }
-                } else {
-                    $test = $this->_validatePackageUninstall($parent[1]['dep'], true, $dl);
-                    if ($test !== true) {
-                        $badpackages[$package]['errors'][] = $test;
-                    }
-                }
-            }
-        }
-
-        $this->_currentPackage          = $save;
-        $dl->___uninstall_package_cache = $badpackages;
-        if (isset($badpackages[$memyselfandI])) {
-            if (isset($badpackages[$memyselfandI]['warnings'])) {
-                foreach ($badpackages[$memyselfandI]['warnings'] as $warning) {
-                    $dl->log(0, $warning[0]);
-                }
-            }
-
-            if (isset($badpackages[$memyselfandI]['errors'])) {
-                foreach ($badpackages[$memyselfandI]['errors'] as $error) {
-                    if (is_array($error)) {
-                        $dl->log(0, $error[0]);
-                    } else {
-                        $dl->log(0, $error->getMessage());
-                    }
-                }
-
-                if (isset($this->_options['nodeps']) || isset($this->_options['force'])) {
-                    return $this->warning(
-                        'warning: %s should not be uninstalled, other installed packages depend ' .
-                        'on this package');
-                }
-
-                return $this->raiseError(
-                    '%s cannot be uninstalled, other installed packages depend on this package');
-            }
-        }
-
-        return true;
-    }
-
-    function _validatePackageUninstall($dep, $required, $dl)
-    {
-        $depname = $this->_registry->parsedPackageNameToString($dep, true);
-        $version = $this->_registry->packageinfo($dep['package'], 'version', $dep['channel']);
-        if (!$version) {
-            return true;
-        }
-
-        $extra = $this->_getExtraString($dep);
-        if (isset($dep['exclude']) && !is_array($dep['exclude'])) {
-            $dep['exclude'] = array($dep['exclude']);
-        }
-
-        if (isset($dep['conflicts'])) {
-            return true; // uninstall OK - these packages conflict (probably installed with --force)
-        }
-
-        if (!isset($dep['min']) && !isset($dep['max'])) {
-            if (!$required) {
-                return $this->warning('"' . $depname . '" can be optionally used by ' .
-                        'installed package %s' . $extra);
-            }
-
-            if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-                return $this->raiseError('"' . $depname . '" is required by ' .
-                    'installed package %s' . $extra);
-            }
-
-            return $this->warning('warning: "' . $depname . '" is required by ' .
-                'installed package %s' . $extra);
-        }
-
-        $fail = false;
-        if (isset($dep['min']) && version_compare($version, $dep['min'], '>=')) {
-            $fail = true;
-        }
-
-        if (isset($dep['max']) && version_compare($version, $dep['max'], '<=')) {
-            $fail = true;
-        }
-
-        // we re-use this variable, preserve the original value
-        $saverequired = $required;
-        if (!$required) {
-            return $this->warning($depname . $extra . ' can be optionally used by installed package' .
-                    ' "%s"');
-        }
-
-        if (!isset($this->_options['nodeps']) && !isset($this->_options['force'])) {
-            return $this->raiseError($depname . $extra . ' is required by installed package' .
-                ' "%s"');
-        }
-
-        return $this->raiseError('warning: ' . $depname . $extra .
-            ' is required by installed package "%s"');
-    }
-
-    /**
-     * validate a downloaded package against installed packages
-     *
-     * As of PEAR 1.4.3, this will only validate
-     *
-     * @param array|PEAR_Downloader_Package|PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     *              $pkg package identifier (either
-     *                   array('package' => blah, 'channel' => blah) or an array with
-     *                   index 'info' referencing an object)
-     * @param PEAR_Downloader $dl
-     * @param array $params full list of packages to install
-     * @return true|PEAR_Error
-     */
-    function validatePackage($pkg, &$dl, $params = array())
-    {
-        if (is_array($pkg) && isset($pkg['info'])) {
-            $deps = $this->_dependencydb->getDependentPackageDependencies($pkg['info']);
-        } else {
-            $deps = $this->_dependencydb->getDependentPackageDependencies($pkg);
-        }
-
-        $fail = false;
-        if ($deps) {
-            if (!class_exists('PEAR_Downloader_Package')) {
-                require_once 'PEAR/Downloader/Package.php';
-            }
-
-            $dp = &new PEAR_Downloader_Package($dl);
-            if (is_object($pkg)) {
-                $dp->setPackageFile($pkg);
-            } else {
-                $dp->setDownloadURL($pkg);
-            }
-
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            foreach ($deps as $channel => $info) {
-                foreach ($info as $package => $ds) {
-                    foreach ($params as $packd) {
-                        if (strtolower($packd->getPackage()) == strtolower($package) &&
-                              $packd->getChannel() == $channel) {
-                            $dl->log(3, 'skipping installed package check of "' .
-                                        $this->_registry->parsedPackageNameToString(
-                                            array('channel' => $channel, 'package' => $package),
-                                            true) .
-                                        '", version "' . $packd->getVersion() . '" will be ' .
-                                        'downloaded and installed');
-                            continue 2; // jump to next package
-                        }
-                    }
-
-                    foreach ($ds as $d) {
-                        $checker = &new PEAR_Dependency2($this->_config, $this->_options,
-                            array('channel' => $channel, 'package' => $package), $this->_state);
-                        $dep = $d['dep'];
-                        $required = $d['type'] == 'required';
-                        $ret = $checker->_validatePackageDownload($dep, $required, array(&$dp));
-                        if (is_array($ret)) {
-                            $dl->log(0, $ret[0]);
-                        } elseif (PEAR::isError($ret)) {
-                            $dl->log(0, $ret->getMessage());
-                            $fail = true;
-                        }
-                    }
-                }
-            }
-            PEAR::popErrorHandling();
-        }
-
-        if ($fail) {
-            return $this->raiseError(
-                '%s cannot be installed, conflicts with installed packages');
-        }
-
-        return true;
-    }
-
-    /**
-     * validate a package.xml 1.0 dependency
-     */
-    function validateDependency1($dep, $params = array())
-    {
-        if (!isset($dep['optional'])) {
-            $dep['optional'] = 'no';
-        }
-
-        list($newdep, $type) = $this->normalizeDep($dep);
-        if (!$newdep) {
-            return $this->raiseError("Invalid Dependency");
-        }
-
-        if (method_exists($this, "validate{$type}Dependency")) {
-            return $this->{"validate{$type}Dependency"}($newdep, $dep['optional'] == 'no',
-                $params, true);
-        }
-    }
-
-    /**
-     * Convert a 1.0 dep into a 2.0 dep
-     */
-    function normalizeDep($dep)
-    {
-        $types = array(
-            'pkg' => 'Package',
-            'ext' => 'Extension',
-            'os' => 'Os',
-            'php' => 'Php'
-        );
-
-        if (!isset($types[$dep['type']])) {
-            return array(false, false);
-        }
-
-        $type = $types[$dep['type']];
-
-        $newdep = array();
-        switch ($type) {
-            case 'Package' :
-                $newdep['channel'] = 'pear.php.net';
-            case 'Extension' :
-            case 'Os' :
-                $newdep['name'] = $dep['name'];
-            break;
-        }
-
-        $dep['rel'] = PEAR_Dependency2::signOperator($dep['rel']);
-        switch ($dep['rel']) {
-            case 'has' :
-                return array($newdep, $type);
-            break;
-            case 'not' :
-                $newdep['conflicts'] = true;
-            break;
-            case '>=' :
-            case '>' :
-                $newdep['min'] = $dep['version'];
-                if ($dep['rel'] == '>') {
-                    $newdep['exclude'] = $dep['version'];
-                }
-            break;
-            case '<=' :
-            case '<' :
-                $newdep['max'] = $dep['version'];
-                if ($dep['rel'] == '<') {
-                    $newdep['exclude'] = $dep['version'];
-                }
-            break;
-            case 'ne' :
-            case '!=' :
-                $newdep['min'] = '0';
-                $newdep['max'] = '100000';
-                $newdep['exclude'] = $dep['version'];
-            break;
-            case '==' :
-                $newdep['min'] = $dep['version'];
-                $newdep['max'] = $dep['version'];
-            break;
-        }
-        if ($type == 'Php') {
-            if (!isset($newdep['min'])) {
-                $newdep['min'] = '4.4.0';
-            }
-
-            if (!isset($newdep['max'])) {
-                $newdep['max'] = '6.0.0';
-            }
-        }
-        return array($newdep, $type);
-    }
-
-    /**
-     * Converts text comparing operators to them sign equivalents
-     *
-     * Example: 'ge' to '>='
-     *
-     * @access public
-     * @param  string Operator
-     * @return string Sign equivalent
-     */
-    function signOperator($operator)
-    {
-        switch($operator) {
-            case 'lt': return '<';
-            case 'le': return '<=';
-            case 'gt': return '>';
-            case 'ge': return '>=';
-            case 'eq': return '==';
-            case 'ne': return '!=';
-            default:
-                return $operator;
-        }
-    }
-
-    function raiseError($msg)
-    {
-        if (isset($this->_options['ignore-errors'])) {
-            return $this->warning($msg);
-        }
-
-        return PEAR::raiseError(sprintf($msg, $this->_registry->parsedPackageNameToString(
-            $this->_currentPackage, true)));
-    }
-
-    function warning($msg)
-    {
-        return array(sprintf($msg, $this->_registry->parsedPackageNameToString(
-            $this->_currentPackage, true)));
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/DependencyDB.php b/airtime_mvc/library/pear/PEAR/DependencyDB.php
deleted file mode 100644
index d85d26009..000000000
--- a/airtime_mvc/library/pear/PEAR/DependencyDB.php
+++ /dev/null
@@ -1,769 +0,0 @@
-<?php
-/**
- * PEAR_DependencyDB, advanced installed packages dependency database
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: DependencyDB.php 286686 2009-08-02 17:38:57Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Needed for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-$GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'] = array();
-/**
- * Track dependency relationships between installed packages
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Tomas V.V.Cox <cox@idec.net.com>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_DependencyDB
-{
-    // {{{ properties
-
-    /**
-     * This is initialized by {@link setConfig()}
-     * @var PEAR_Config
-     * @access private
-     */
-    var $_config;
-    /**
-     * This is initialized by {@link setConfig()}
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-    /**
-     * Filename of the dependency DB (usually .depdb)
-     * @var string
-     * @access private
-     */
-    var $_depdb = false;
-    /**
-     * File name of the lockfile (usually .depdblock)
-     * @var string
-     * @access private
-     */
-    var $_lockfile = false;
-    /**
-     * Open file resource for locking the lockfile
-     * @var resource|false
-     * @access private
-     */
-    var $_lockFp = false;
-    /**
-     * API version of this class, used to validate a file on-disk
-     * @var string
-     * @access private
-     */
-    var $_version = '1.0';
-    /**
-     * Cached dependency database file
-     * @var array|null
-     * @access private
-     */
-    var $_cache;
-
-    // }}}
-    // {{{ & singleton()
-
-    /**
-     * Get a raw dependency database.  Calls setConfig() and assertDepsDB()
-     * @param PEAR_Config
-     * @param string|false full path to the dependency database, or false to use default
-     * @return PEAR_DependencyDB|PEAR_Error
-     * @static
-     */
-    function &singleton(&$config, $depdb = false)
-    {
-        $phpdir = $config->get('php_dir', null, 'pear.php.net');
-        if (!isset($GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'][$phpdir])) {
-            $a = new PEAR_DependencyDB;
-            $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'][$phpdir] = &$a;
-            $a->setConfig($config, $depdb);
-            $e = $a->assertDepsDB();
-            if (PEAR::isError($e)) {
-                return $e;
-            }
-        }
-
-        return $GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'][$phpdir];
-    }
-
-    /**
-     * Set up the registry/location of dependency DB
-     * @param PEAR_Config|false
-     * @param string|false full path to the dependency database, or false to use default
-     */
-    function setConfig(&$config, $depdb = false)
-    {
-        if (!$config) {
-            $this->_config = &PEAR_Config::singleton();
-        } else {
-            $this->_config = &$config;
-        }
-
-        $this->_registry = &$this->_config->getRegistry();
-        if (!$depdb) {
-            $this->_depdb = $this->_config->get('php_dir', null, 'pear.php.net') .
-                DIRECTORY_SEPARATOR . '.depdb';
-        } else {
-            $this->_depdb = $depdb;
-        }
-
-        $this->_lockfile = dirname($this->_depdb) . DIRECTORY_SEPARATOR . '.depdblock';
-    }
-    // }}}
-
-    function hasWriteAccess()
-    {
-        if (!file_exists($this->_depdb)) {
-            $dir = $this->_depdb;
-            while ($dir && $dir != '.') {
-                $dir = dirname($dir); // cd ..
-                if ($dir != '.' && file_exists($dir)) {
-                    if (is_writeable($dir)) {
-                        return true;
-                    }
-
-                    return false;
-                }
-            }
-
-            return false;
-        }
-
-        return is_writeable($this->_depdb);
-    }
-
-    // {{{ assertDepsDB()
-
-    /**
-     * Create the dependency database, if it doesn't exist.  Error if the database is
-     * newer than the code reading it.
-     * @return void|PEAR_Error
-     */
-    function assertDepsDB()
-    {
-        if (!is_file($this->_depdb)) {
-            $this->rebuildDB();
-            return;
-        }
-
-        $depdb = $this->_getDepDB();
-        // Datatype format has been changed, rebuild the Deps DB
-        if ($depdb['_version'] < $this->_version) {
-            $this->rebuildDB();
-        }
-
-        if ($depdb['_version']{0} > $this->_version{0}) {
-            return PEAR::raiseError('Dependency database is version ' .
-                $depdb['_version'] . ', and we are version ' .
-                $this->_version . ', cannot continue');
-        }
-    }
-
-    /**
-     * Get a list of installed packages that depend on this package
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependentPackages(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-
-        if (isset($data['packages'][$channel][$package])) {
-            return $data['packages'][$channel][$package];
-        }
-
-        return false;
-    }
-
-    /**
-     * Get a list of the actual dependencies of installed packages that depend on
-     * a package.
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependentPackageDependencies(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-
-        $depend = $this->getDependentPackages($pkg);
-        if (!$depend) {
-            return false;
-        }
-
-        $dependencies = array();
-        foreach ($depend as $info) {
-            $temp = $this->getDependencies($info);
-            foreach ($temp as $dep) {
-                if (
-                    isset($dep['dep'], $dep['dep']['channel'], $dep['dep']['name']) &&
-                    strtolower($dep['dep']['channel']) == $channel &&
-                    strtolower($dep['dep']['name']) == $package
-                ) {
-                    if (!isset($dependencies[$info['channel']])) {
-                        $dependencies[$info['channel']] = array();
-                    }
-
-                    if (!isset($dependencies[$info['channel']][$info['package']])) {
-                        $dependencies[$info['channel']][$info['package']] = array();
-                    }
-                    $dependencies[$info['channel']][$info['package']][] = $dep;
-                }
-            }
-        }
-
-        return $dependencies;
-    }
-
-    /**
-     * Get a list of dependencies of this installed package
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array
-     * @return array|false
-     */
-    function getDependencies(&$pkg)
-    {
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-
-        $data = $this->_getDepDB();
-        if (isset($data['dependencies'][$channel][$package])) {
-            return $data['dependencies'][$channel][$package];
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine whether $parent depends on $child, near or deep
-     * @param array|PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     * @param array|PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     */
-    function dependsOn($parent, $child)
-    {
-        $c = array();
-        $this->_getDepDB();
-        return $this->_dependsOn($parent, $child, $c);
-    }
-
-    function _dependsOn($parent, $child, &$checked)
-    {
-        if (is_object($parent)) {
-            $channel = strtolower($parent->getChannel());
-            $package = strtolower($parent->getPackage());
-        } else {
-            $channel = strtolower($parent['channel']);
-            $package = strtolower($parent['package']);
-        }
-
-        if (is_object($child)) {
-            $depchannel = strtolower($child->getChannel());
-            $deppackage = strtolower($child->getPackage());
-        } else {
-            $depchannel = strtolower($child['channel']);
-            $deppackage = strtolower($child['package']);
-        }
-
-        if (isset($checked[$channel][$package][$depchannel][$deppackage])) {
-            return false; // avoid endless recursion
-        }
-
-        $checked[$channel][$package][$depchannel][$deppackage] = true;
-        if (!isset($this->_cache['dependencies'][$channel][$package])) {
-            return false;
-        }
-
-        foreach ($this->_cache['dependencies'][$channel][$package] as $info) {
-            if (isset($info['dep']['uri'])) {
-                if (is_object($child)) {
-                    if ($info['dep']['uri'] == $child->getURI()) {
-                        return true;
-                    }
-                } elseif (isset($child['uri'])) {
-                    if ($info['dep']['uri'] == $child['uri']) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            if (strtolower($info['dep']['channel']) == $depchannel &&
-                  strtolower($info['dep']['name']) == $deppackage) {
-                return true;
-            }
-        }
-
-        foreach ($this->_cache['dependencies'][$channel][$package] as $info) {
-            if (isset($info['dep']['uri'])) {
-                if ($this->_dependsOn(array(
-                        'uri' => $info['dep']['uri'],
-                        'package' => $info['dep']['name']), $child, $checked)) {
-                    return true;
-                }
-            } else {
-                if ($this->_dependsOn(array(
-                        'channel' => $info['dep']['channel'],
-                        'package' => $info['dep']['name']), $child, $checked)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Register dependencies of a package that is being installed or upgraded
-     * @param PEAR_PackageFile_v2|PEAR_PackageFile_v2
-     */
-    function installPackage(&$package)
-    {
-        $data = $this->_getDepDB();
-        unset($this->_cache);
-        $this->_setPackageDeps($data, $package);
-        $this->_writeDepDB($data);
-    }
-
-    /**
-     * Remove dependencies of a package that is being uninstalled, or upgraded.
-     *
-     * Upgraded packages first uninstall, then install
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2|array If an array, then it must have
-     *        indices 'channel' and 'package'
-     */
-    function uninstallPackage(&$pkg)
-    {
-        $data = $this->_getDepDB();
-        unset($this->_cache);
-        if (is_object($pkg)) {
-            $channel = strtolower($pkg->getChannel());
-            $package = strtolower($pkg->getPackage());
-        } else {
-            $channel = strtolower($pkg['channel']);
-            $package = strtolower($pkg['package']);
-        }
-
-        if (!isset($data['dependencies'][$channel][$package])) {
-            return true;
-        }
-
-        foreach ($data['dependencies'][$channel][$package] as $dep) {
-            $found      = false;
-            $depchannel = isset($dep['dep']['uri']) ? '__uri' : strtolower($dep['dep']['channel']);
-            $depname    = strtolower($dep['dep']['name']);
-            if (isset($data['packages'][$depchannel][$depname])) {
-                foreach ($data['packages'][$depchannel][$depname] as $i => $info) {
-                    if ($info['channel'] == $channel && $info['package'] == $package) {
-                        $found = true;
-                        break;
-                    }
-                }
-            }
-
-            if ($found) {
-                unset($data['packages'][$depchannel][$depname][$i]);
-                if (!count($data['packages'][$depchannel][$depname])) {
-                    unset($data['packages'][$depchannel][$depname]);
-                    if (!count($data['packages'][$depchannel])) {
-                        unset($data['packages'][$depchannel]);
-                    }
-                } else {
-                    $data['packages'][$depchannel][$depname] =
-                        array_values($data['packages'][$depchannel][$depname]);
-                }
-            }
-        }
-
-        unset($data['dependencies'][$channel][$package]);
-        if (!count($data['dependencies'][$channel])) {
-            unset($data['dependencies'][$channel]);
-        }
-
-        if (!count($data['dependencies'])) {
-            unset($data['dependencies']);
-        }
-
-        if (!count($data['packages'])) {
-            unset($data['packages']);
-        }
-
-        $this->_writeDepDB($data);
-    }
-
-    /**
-     * Rebuild the dependency DB by reading registry entries.
-     * @return true|PEAR_Error
-     */
-    function rebuildDB()
-    {
-        $depdb = array('_version' => $this->_version);
-        if (!$this->hasWriteAccess()) {
-            // allow startup for read-only with older Registry
-            return $depdb;
-        }
-
-        $packages = $this->_registry->listAllPackages();
-        if (PEAR::isError($packages)) {
-            return $packages;
-        }
-
-        foreach ($packages as $channel => $ps) {
-            foreach ($ps as $package) {
-                $package = $this->_registry->getPackage($package, $channel);
-                if (PEAR::isError($package)) {
-                    return $package;
-                }
-                $this->_setPackageDeps($depdb, $package);
-            }
-        }
-
-        $error = $this->_writeDepDB($depdb);
-        if (PEAR::isError($error)) {
-            return $error;
-        }
-
-        $this->_cache = $depdb;
-        return true;
-    }
-
-    /**
-     * Register usage of the dependency DB to prevent race conditions
-     * @param int one of the LOCK_* constants
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _lock($mode = LOCK_EX)
-    {
-        if (stristr(php_uname(), 'Windows 9')) {
-            return true;
-        }
-
-        if ($mode != LOCK_UN && is_resource($this->_lockFp)) {
-            // XXX does not check type of lock (LOCK_SH/LOCK_EX)
-            return true;
-        }
-
-        $open_mode = 'w';
-        // XXX People reported problems with LOCK_SH and 'w'
-        if ($mode === LOCK_SH) {
-            if (!file_exists($this->_lockfile)) {
-                touch($this->_lockfile);
-            } elseif (!is_file($this->_lockfile)) {
-                return PEAR::raiseError('could not create Dependency lock file, ' .
-                    'it exists and is not a regular file');
-            }
-            $open_mode = 'r';
-        }
-
-        if (!is_resource($this->_lockFp)) {
-            $this->_lockFp = @fopen($this->_lockfile, $open_mode);
-        }
-
-        if (!is_resource($this->_lockFp)) {
-            return PEAR::raiseError("could not create Dependency lock file" .
-                                     (isset($php_errormsg) ? ": " . $php_errormsg : ""));
-        }
-
-        if (!(int)flock($this->_lockFp, $mode)) {
-            switch ($mode) {
-                case LOCK_SH: $str = 'shared';    break;
-                case LOCK_EX: $str = 'exclusive'; break;
-                case LOCK_UN: $str = 'unlock';    break;
-                default:      $str = 'unknown';   break;
-            }
-
-            return PEAR::raiseError("could not acquire $str lock ($this->_lockfile)");
-        }
-
-        return true;
-    }
-
-    /**
-     * Release usage of dependency DB
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _unlock()
-    {
-        $ret = $this->_lock(LOCK_UN);
-        if (is_resource($this->_lockFp)) {
-            fclose($this->_lockFp);
-        }
-        $this->_lockFp = null;
-        return $ret;
-    }
-
-    /**
-     * Load the dependency database from disk, or return the cache
-     * @return array|PEAR_Error
-     */
-    function _getDepDB()
-    {
-        if (!$this->hasWriteAccess()) {
-            return array('_version' => $this->_version);
-        }
-
-        if (isset($this->_cache)) {
-            return $this->_cache;
-        }
-
-        if (!$fp = fopen($this->_depdb, 'r')) {
-            $err = PEAR::raiseError("Could not open dependencies file `".$this->_depdb."'");
-            return $err;
-        }
-
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        fclose($fp);
-        $data = unserialize(file_get_contents($this->_depdb));
-        set_magic_quotes_runtime($rt);
-        $this->_cache = $data;
-        return $data;
-    }
-
-    /**
-     * Write out the dependency database to disk
-     * @param array the database
-     * @return true|PEAR_Error
-     * @access private
-     */
-    function _writeDepDB(&$deps)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-
-        if (!$fp = fopen($this->_depdb, 'wb')) {
-            $this->_unlock();
-            return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
-        }
-
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        fwrite($fp, serialize($deps));
-        set_magic_quotes_runtime($rt);
-        fclose($fp);
-        $this->_unlock();
-        $this->_cache = $deps;
-        return true;
-    }
-
-    /**
-     * Register all dependencies from a package in the dependencies database, in essence
-     * "installing" the package's dependency information
-     * @param array the database
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @access private
-     */
-    function _setPackageDeps(&$data, &$pkg)
-    {
-        $pkg->setConfig($this->_config);
-        if ($pkg->getPackagexmlVersion() == '1.0') {
-            $gen = &$pkg->getDefaultGenerator();
-            $deps = $gen->dependenciesToV2();
-        } else {
-            $deps = $pkg->getDeps(true);
-        }
-
-        if (!$deps) {
-            return;
-        }
-
-        if (!is_array($data)) {
-            $data = array();
-        }
-
-        if (!isset($data['dependencies'])) {
-            $data['dependencies'] = array();
-        }
-
-        $channel = strtolower($pkg->getChannel());
-        $package = strtolower($pkg->getPackage());
-
-        if (!isset($data['dependencies'][$channel])) {
-            $data['dependencies'][$channel] = array();
-        }
-
-        $data['dependencies'][$channel][$package] = array();
-        if (isset($deps['required']['package'])) {
-            if (!isset($deps['required']['package'][0])) {
-                $deps['required']['package'] = array($deps['required']['package']);
-            }
-
-            foreach ($deps['required']['package'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'required');
-            }
-        }
-
-        if (isset($deps['optional']['package'])) {
-            if (!isset($deps['optional']['package'][0])) {
-                $deps['optional']['package'] = array($deps['optional']['package']);
-            }
-
-            foreach ($deps['optional']['package'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'optional');
-            }
-        }
-
-        if (isset($deps['required']['subpackage'])) {
-            if (!isset($deps['required']['subpackage'][0])) {
-                $deps['required']['subpackage'] = array($deps['required']['subpackage']);
-            }
-
-            foreach ($deps['required']['subpackage'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'required');
-            }
-        }
-
-        if (isset($deps['optional']['subpackage'])) {
-            if (!isset($deps['optional']['subpackage'][0])) {
-                $deps['optional']['subpackage'] = array($deps['optional']['subpackage']);
-            }
-
-            foreach ($deps['optional']['subpackage'] as $dep) {
-                $this->_registerDep($data, $pkg, $dep, 'optional');
-            }
-        }
-
-        if (isset($deps['group'])) {
-            if (!isset($deps['group'][0])) {
-                $deps['group'] = array($deps['group']);
-            }
-
-            foreach ($deps['group'] as $group) {
-                if (isset($group['package'])) {
-                    if (!isset($group['package'][0])) {
-                        $group['package'] = array($group['package']);
-                    }
-
-                    foreach ($group['package'] as $dep) {
-                        $this->_registerDep($data, $pkg, $dep, 'optional',
-                            $group['attribs']['name']);
-                    }
-                }
-
-                if (isset($group['subpackage'])) {
-                    if (!isset($group['subpackage'][0])) {
-                        $group['subpackage'] = array($group['subpackage']);
-                    }
-
-                    foreach ($group['subpackage'] as $dep) {
-                        $this->_registerDep($data, $pkg, $dep, 'optional',
-                            $group['attribs']['name']);
-                    }
-                }
-            }
-        }
-
-        if ($data['dependencies'][$channel][$package] == array()) {
-            unset($data['dependencies'][$channel][$package]);
-            if (!count($data['dependencies'][$channel])) {
-                unset($data['dependencies'][$channel]);
-            }
-        }
-    }
-
-    /**
-     * @param array the database
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param array the specific dependency
-     * @param required|optional whether this is a required or an optional dep
-     * @param string|false dependency group this dependency is from, or false for ordinary dep
-     */
-    function _registerDep(&$data, &$pkg, $dep, $type, $group = false)
-    {
-        $info = array(
-            'dep'   => $dep,
-            'type'  => $type,
-            'group' => $group
-        );
-
-        $dep  = array_map('strtolower', $dep);
-        $depchannel = isset($dep['channel']) ? $dep['channel'] : '__uri';
-        if (!isset($data['dependencies'])) {
-            $data['dependencies'] = array();
-        }
-
-        $channel = strtolower($pkg->getChannel());
-        $package = strtolower($pkg->getPackage());
-
-        if (!isset($data['dependencies'][$channel])) {
-            $data['dependencies'][$channel] = array();
-        }
-
-        if (!isset($data['dependencies'][$channel][$package])) {
-            $data['dependencies'][$channel][$package] = array();
-        }
-
-        $data['dependencies'][$channel][$package][] = $info;
-        if (isset($data['packages'][$depchannel][$dep['name']])) {
-            $found = false;
-            foreach ($data['packages'][$depchannel][$dep['name']] as $i => $p) {
-                if ($p['channel'] == $channel && $p['package'] == $package) {
-                    $found = true;
-                    break;
-                }
-            }
-        } else {
-            if (!isset($data['packages'])) {
-                $data['packages'] = array();
-            }
-
-            if (!isset($data['packages'][$depchannel])) {
-                $data['packages'][$depchannel] = array();
-            }
-
-            if (!isset($data['packages'][$depchannel][$dep['name']])) {
-                $data['packages'][$depchannel][$dep['name']] = array();
-            }
-
-            $found = false;
-        }
-
-        if (!$found) {
-            $data['packages'][$depchannel][$dep['name']][] = array(
-                'channel' => $channel,
-                'package' => $package
-            );
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Downloader.php b/airtime_mvc/library/pear/PEAR/Downloader.php
deleted file mode 100644
index 298a5f403..000000000
--- a/airtime_mvc/library/pear/PEAR/Downloader.php
+++ /dev/null
@@ -1,1762 +0,0 @@
-<?php
-/**
- * PEAR_Downloader, the PEAR Installer's download utility class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Martin Jansen <mj@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Downloader.php 296767 2010-03-25 00:58:33Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.0
- */
-
-/**
- * Needed for constants, extending
- */
-require_once 'PEAR/Common.php';
-
-define('PEAR_INSTALLER_OK',       1);
-define('PEAR_INSTALLER_FAILED',   0);
-define('PEAR_INSTALLER_SKIPPED', -1);
-define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
-
-/**
- * Administration class used to download anything from the internet (PEAR Packages,
- * static URLs, xml files)
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Martin Jansen <mj@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.0
- */
-class PEAR_Downloader extends PEAR_Common
-{
-    /**
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    /**
-     * Preferred Installation State (snapshot, devel, alpha, beta, stable)
-     * @var string|null
-     * @access private
-     */
-    var $_preferredState;
-
-    /**
-     * Options from command-line passed to Install.
-     *
-     * Recognized options:<br />
-     *  - onlyreqdeps   : install all required dependencies as well
-     *  - alldeps       : install all dependencies, including optional
-     *  - installroot   : base relative path to install files in
-     *  - force         : force a download even if warnings would prevent it
-     *  - nocompress    : download uncompressed tarballs
-     * @see PEAR_Command_Install
-     * @access private
-     * @var array
-     */
-    var $_options;
-
-    /**
-     * Downloaded Packages after a call to download().
-     *
-     * Format of each entry:
-     *
-     * <code>
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * </code>
-     * @access private
-     * @var array
-     */
-    var $_downloadedPackages = array();
-
-    /**
-     * Packages slated for download.
-     *
-     * This is used to prevent downloading a package more than once should it be a dependency
-     * for two packages to be installed.
-     * Format of each entry:
-     *
-     * <pre>
-     * array('package_name1' => parsed package.xml, 'package_name2' => parsed package.xml,
-     * );
-     * </pre>
-     * @access private
-     * @var array
-     */
-    var $_toDownload = array();
-
-    /**
-     * Array of every package installed, with names lower-cased.
-     *
-     * Format:
-     * <code>
-     * array('package1' => 0, 'package2' => 1, );
-     * </code>
-     * @var array
-     */
-    var $_installed = array();
-
-    /**
-     * @var array
-     * @access private
-     */
-    var $_errorStack = array();
-
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_internalDownload = false;
-
-    /**
-     * Temporary variable used in sorting packages by dependency in {@link sortPkgDeps()}
-     * @var array
-     * @access private
-     */
-    var $_packageSortTree;
-
-    /**
-     * Temporary directory, or configuration value where downloads will occur
-     * @var string
-     */
-    var $_downloadDir;
-
-    /**
-     * @param PEAR_Frontend_*
-     * @param array
-     * @param PEAR_Config
-     */
-    function PEAR_Downloader(&$ui, $options, &$config)
-    {
-        parent::PEAR_Common();
-        $this->_options = $options;
-        $this->config = &$config;
-        $this->_preferredState = $this->config->get('preferred_state');
-        $this->ui = &$ui;
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-
-        if (isset($this->_options['installroot'])) {
-            $this->config->setInstallRoot($this->_options['installroot']);
-        }
-        $this->_registry = &$config->getRegistry();
-
-        if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
-            $this->_installed = $this->_registry->listAllPackages();
-            foreach ($this->_installed as $key => $unused) {
-                if (!count($unused)) {
-                    continue;
-                }
-                $strtolower = create_function('$a','return strtolower($a);');
-                array_walk($this->_installed[$key], $strtolower);
-            }
-        }
-    }
-
-    /**
-     * Attempt to discover a channel's remote capabilities from
-     * its server name
-     * @param string
-     * @return boolean
-     */
-    function discover($channel)
-    {
-        $this->log(1, 'Attempting to discover channel "' . $channel . '"...');
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $callback = $this->ui ? array(&$this, '_downloadCallback') : null;
-        if (!class_exists('System')) {
-            require_once 'System.php';
-        }
-
-        $tmp = System::mktemp(array('-d'));
-        $a   = $this->downloadHttp('http://' . $channel . '/channel.xml', $this->ui, $tmp, $callback, false);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($a)) {
-            // Attempt to fallback to https automatically.
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $this->log(1, 'Attempting fallback to https instead of http on channel "' . $channel . '"...');
-            $a = $this->downloadHttp('https://' . $channel . '/channel.xml', $this->ui, $tmp, $callback, false);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($a)) {
-                return false;
-            }
-        }
-
-        list($a, $lastmodified) = $a;
-        if (!class_exists('PEAR_ChannelFile')) {
-            require_once 'PEAR/ChannelFile.php';
-        }
-
-        $b = new PEAR_ChannelFile;
-        if ($b->fromXmlFile($a)) {
-            unlink($a);
-            if ($this->config->get('auto_discover')) {
-                $this->_registry->addChannel($b, $lastmodified);
-                $alias = $b->getName();
-                if ($b->getName() == $this->_registry->channelName($b->getAlias())) {
-                    $alias = $b->getAlias();
-                }
-
-                $this->log(1, 'Auto-discovered channel "' . $channel .
-                    '", alias "' . $alias . '", adding to registry');
-            }
-
-            return true;
-        }
-
-        unlink($a);
-        return false;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Downloader
-     * @return PEAR_Downloader_Package
-     */
-    function &newDownloaderPackage(&$t)
-    {
-        if (!class_exists('PEAR_Downloader_Package')) {
-            require_once 'PEAR/Downloader/Package.php';
-        }
-        $a = &new PEAR_Downloader_Package($t);
-        return $a;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param array
-     * @param array
-     * @param int
-     */
-    function &getDependency2Object(&$c, $i, $p, $s)
-    {
-        if (!class_exists('PEAR_Dependency2')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-        $z = &new PEAR_Dependency2($c, $i, $p, $s);
-        return $z;
-    }
-
-    function &download($params)
-    {
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-
-        $channelschecked = array();
-        // convert all parameters into PEAR_Downloader_Package objects
-        foreach ($params as $i => $param) {
-            $params[$i] = &$this->newDownloaderPackage($this);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $params[$i]->initialize($param);
-            PEAR::staticPopErrorHandling();
-            if (!$err) {
-                // skip parameters that were missed by preferred_state
-                continue;
-            }
-
-            if (PEAR::isError($err)) {
-                if (!isset($this->_options['soft']) && $err->getMessage() !== '') {
-                    $this->log(0, $err->getMessage());
-                }
-
-                $params[$i] = false;
-                if (is_object($param)) {
-                    $param = $param->getChannel() . '/' . $param->getPackage();
-                }
-
-                if (!isset($this->_options['soft'])) {
-                    $this->log(2, 'Package "' . $param . '" is not valid');
-                }
-
-                // Message logged above in a specific verbose mode, passing null to not show up on CLI
-                $this->pushError(null, PEAR_INSTALLER_SKIPPED);
-            } else {
-                do {
-                    if ($params[$i] && $params[$i]->getType() == 'local') {
-                        // bug #7090 skip channel.xml check for local packages
-                        break;
-                    }
-
-                    if ($params[$i] && !isset($channelschecked[$params[$i]->getChannel()]) &&
-                          !isset($this->_options['offline'])
-                    ) {
-                        $channelschecked[$params[$i]->getChannel()] = true;
-                        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-                        if (!class_exists('System')) {
-                            require_once 'System.php';
-                        }
-
-                        $curchannel = &$this->_registry->getChannel($params[$i]->getChannel());
-                        if (PEAR::isError($curchannel)) {
-                            PEAR::staticPopErrorHandling();
-                            return $this->raiseError($curchannel);
-                        }
-
-                        if (PEAR::isError($dir = $this->getDownloadDir())) {
-                            PEAR::staticPopErrorHandling();
-                            break;
-                        }
-
-                        $mirror = $this->config->get('preferred_mirror', null, $params[$i]->getChannel());
-                        $url    = 'http://' . $mirror . '/channel.xml';
-                        $a = $this->downloadHttp($url, $this->ui, $dir, null, $curchannel->lastModified());
-
-                        PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($a) || !$a) {
-                            // Attempt fallback to https automatically
-                            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                            $a = $this->downloadHttp('https://' . $mirror .
-                                '/channel.xml', $this->ui, $dir, null, $curchannel->lastModified());
-
-                            PEAR::staticPopErrorHandling();
-                            if (PEAR::isError($a) || !$a) {
-                                break;
-                            }
-                        }
-                        $this->log(0, 'WARNING: channel "' . $params[$i]->getChannel() . '" has ' .
-                            'updated its protocols, use "' . PEAR_RUNTYPE . ' channel-update ' . $params[$i]->getChannel() .
-                            '" to update');
-                    }
-                } while (false);
-
-                if ($params[$i] && !isset($this->_options['downloadonly'])) {
-                    if (isset($this->_options['packagingroot'])) {
-                        $checkdir = $this->_prependPath(
-                            $this->config->get('php_dir', null, $params[$i]->getChannel()),
-                            $this->_options['packagingroot']);
-                    } else {
-                        $checkdir = $this->config->get('php_dir',
-                            null, $params[$i]->getChannel());
-                    }
-
-                    while ($checkdir && $checkdir != '/' && !file_exists($checkdir)) {
-                        $checkdir = dirname($checkdir);
-                    }
-
-                    if ($checkdir == '.') {
-                        $checkdir = '/';
-                    }
-
-                    if (!is_writeable($checkdir)) {
-                        return PEAR::raiseError('Cannot install, php_dir for channel "' .
-                            $params[$i]->getChannel() . '" is not writeable by the current user');
-                    }
-                }
-            }
-        }
-
-        unset($channelschecked);
-        PEAR_Downloader_Package::removeDuplicates($params);
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-
-        if (!isset($this->_options['nodeps']) && !isset($this->_options['offline'])) {
-            $reverify = true;
-            while ($reverify) {
-                $reverify = false;
-                foreach ($params as $i => $param) {
-                    //PHP Bug 40768 / PEAR Bug #10944
-                    //Nested foreaches fail in PHP 5.2.1
-                    key($params);
-                    $ret = $params[$i]->detectDependencies($params);
-                    if (PEAR::isError($ret)) {
-                        $reverify = true;
-                        $params[$i] = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $ret->getMessage());
-                        }
-                        continue 2;
-                    }
-                }
-            }
-        }
-
-        if (isset($this->_options['offline'])) {
-            $this->log(3, 'Skipping dependency download check, --offline specified');
-        }
-
-        if (!count($params)) {
-            $a = array();
-            return $a;
-        }
-
-        while (PEAR_Downloader_Package::mergeDependencies($params));
-        PEAR_Downloader_Package::removeDuplicates($params, true);
-        $errorparams = array();
-        if (PEAR_Downloader_Package::detectStupidDuplicates($params, $errorparams)) {
-            if (count($errorparams)) {
-                foreach ($errorparams as $param) {
-                    $name = $this->_registry->parsedPackageNameToString($param->getParsedPackage());
-                    $this->pushError('Duplicate package ' . $name . ' found', PEAR_INSTALLER_FAILED);
-                }
-                $a = array();
-                return $a;
-            }
-        }
-
-        PEAR_Downloader_Package::removeInstalled($params);
-        if (!count($params)) {
-            $this->pushError('No valid packages found', PEAR_INSTALLER_FAILED);
-            $a = array();
-            return $a;
-        }
-
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->analyzeDependencies($params);
-        PEAR::popErrorHandling();
-        if (!count($params)) {
-            $this->pushError('No valid packages found', PEAR_INSTALLER_FAILED);
-            $a = array();
-            return $a;
-        }
-
-        $ret = array();
-        $newparams = array();
-        if (isset($this->_options['pretend'])) {
-            return $params;
-        }
-
-        $somefailed = false;
-        foreach ($params as $i => $package) {
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $pf = &$params[$i]->download();
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($pf)) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(1, $pf->getMessage());
-                    $this->log(0, 'Error: cannot download "' .
-                        $this->_registry->parsedPackageNameToString($package->getParsedPackage(),
-                            true) .
-                        '"');
-                }
-                $somefailed = true;
-                continue;
-            }
-
-            $newparams[] = &$params[$i];
-            $ret[] = array(
-                'file' => $pf->getArchiveFile(),
-                'info' => &$pf,
-                'pkg'  => $pf->getPackage()
-            );
-        }
-
-        if ($somefailed) {
-            // remove params that did not download successfully
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $this->analyzeDependencies($newparams, true);
-            PEAR::popErrorHandling();
-            if (!count($newparams)) {
-                $this->pushError('Download failed', PEAR_INSTALLER_FAILED);
-                $a = array();
-                return $a;
-            }
-        }
-
-        $this->_downloadedPackages = $ret;
-        return $newparams;
-    }
-
-    /**
-     * @param array all packages to be installed
-     */
-    function analyzeDependencies(&$params, $force = false)
-    {
-        $hasfailed = $failed = false;
-        if (isset($this->_options['downloadonly'])) {
-            return;
-        }
-
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $redo  = true;
-        $reset = false;
-        while ($redo) {
-            $redo = false;
-            foreach ($params as $i => $param) {
-                $deps = $param->getDeps();
-                if (!$deps) {
-                    $depchecker = &$this->getDependency2Object($this->config, $this->getOptions(),
-                        $param->getParsedPackage(), PEAR_VALIDATE_DOWNLOADING);
-                    $send = $param->getPackageFile();
-
-                    $installcheck = $depchecker->validatePackage($send, $this, $params);
-                    if (PEAR::isError($installcheck)) {
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $installcheck->getMessage());
-                        }
-                        $hasfailed  = true;
-                        $params[$i] = false;
-                        $reset      = true;
-                        $redo       = true;
-                        $failed     = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        continue 2;
-                    }
-                    continue;
-                }
-
-                if (!$reset && $param->alreadyValidated() && !$force) {
-                    continue;
-                }
-
-                if (count($deps)) {
-                    $depchecker = &$this->getDependency2Object($this->config, $this->getOptions(),
-                        $param->getParsedPackage(), PEAR_VALIDATE_DOWNLOADING);
-                    $send = $param->getPackageFile();
-                    if ($send === null) {
-                        $send = $param->getDownloadURL();
-                    }
-
-                    $installcheck = $depchecker->validatePackage($send, $this, $params);
-                    if (PEAR::isError($installcheck)) {
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(0, $installcheck->getMessage());
-                        }
-                        $hasfailed  = true;
-                        $params[$i] = false;
-                        $reset      = true;
-                        $redo       = true;
-                        $failed     = false;
-                        PEAR_Downloader_Package::removeDuplicates($params);
-                        continue 2;
-                    }
-
-                    $failed = false;
-                    if (isset($deps['required'])) {
-                        foreach ($deps['required'] as $type => $dep) {
-                            // note: Dependency2 will never return a PEAR_Error if ignore-errors
-                            // is specified, so soft is needed to turn off logging
-                            if (!isset($dep[0])) {
-                                if (PEAR::isError($e = $depchecker->{"validate{$type}Dependency"}($dep,
-                                      true, $params))) {
-                                    $failed = true;
-                                    if (!isset($this->_options['soft'])) {
-                                        $this->log(0, $e->getMessage());
-                                    }
-                                } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                    if (!isset($this->_options['soft'])) {
-                                        $this->log(0, $e[0]);
-                                    }
-                                }
-                            } else {
-                                foreach ($dep as $d) {
-                                    if (PEAR::isError($e =
-                                          $depchecker->{"validate{$type}Dependency"}($d,
-                                          true, $params))) {
-                                        $failed = true;
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e->getMessage());
-                                        }
-                                    } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e[0]);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        if (isset($deps['optional'])) {
-                            foreach ($deps['optional'] as $type => $dep) {
-                                if (!isset($dep[0])) {
-                                    if (PEAR::isError($e =
-                                          $depchecker->{"validate{$type}Dependency"}($dep,
-                                          false, $params))) {
-                                        $failed = true;
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e->getMessage());
-                                        }
-                                    } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                        if (!isset($this->_options['soft'])) {
-                                            $this->log(0, $e[0]);
-                                        }
-                                    }
-                                } else {
-                                    foreach ($dep as $d) {
-                                        if (PEAR::isError($e =
-                                              $depchecker->{"validate{$type}Dependency"}($d,
-                                              false, $params))) {
-                                            $failed = true;
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e->getMessage());
-                                            }
-                                        } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e[0]);
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        $groupname = $param->getGroup();
-                        if (isset($deps['group']) && $groupname) {
-                            if (!isset($deps['group'][0])) {
-                                $deps['group'] = array($deps['group']);
-                            }
-
-                            $found = false;
-                            foreach ($deps['group'] as $group) {
-                                if ($group['attribs']['name'] == $groupname) {
-                                    $found = true;
-                                    break;
-                                }
-                            }
-
-                            if ($found) {
-                                unset($group['attribs']);
-                                foreach ($group as $type => $dep) {
-                                    if (!isset($dep[0])) {
-                                        if (PEAR::isError($e =
-                                              $depchecker->{"validate{$type}Dependency"}($dep,
-                                              false, $params))) {
-                                            $failed = true;
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e->getMessage());
-                                            }
-                                        } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                            if (!isset($this->_options['soft'])) {
-                                                $this->log(0, $e[0]);
-                                            }
-                                        }
-                                    } else {
-                                        foreach ($dep as $d) {
-                                            if (PEAR::isError($e =
-                                                  $depchecker->{"validate{$type}Dependency"}($d,
-                                                  false, $params))) {
-                                                $failed = true;
-                                                if (!isset($this->_options['soft'])) {
-                                                    $this->log(0, $e->getMessage());
-                                                }
-                                            } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                                if (!isset($this->_options['soft'])) {
-                                                    $this->log(0, $e[0]);
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        foreach ($deps as $dep) {
-                            if (PEAR::isError($e = $depchecker->validateDependency1($dep, $params))) {
-                                $failed = true;
-                                if (!isset($this->_options['soft'])) {
-                                    $this->log(0, $e->getMessage());
-                                }
-                            } elseif (is_array($e) && !$param->alreadyValidated()) {
-                                if (!isset($this->_options['soft'])) {
-                                    $this->log(0, $e[0]);
-                                }
-                            }
-                        }
-                    }
-                    $params[$i]->setValidated();
-                }
-
-                if ($failed) {
-                    $hasfailed  = true;
-                    $params[$i] = false;
-                    $reset      = true;
-                    $redo       = true;
-                    $failed     = false;
-                    PEAR_Downloader_Package::removeDuplicates($params);
-                    continue 2;
-                }
-            }
-        }
-        PEAR::staticPopErrorHandling();
-        if ($hasfailed && (isset($this->_options['ignore-errors']) ||
-              isset($this->_options['nodeps']))) {
-            // this is probably not needed, but just in case
-            if (!isset($this->_options['soft'])) {
-                $this->log(0, 'WARNING: dependencies failed');
-            }
-        }
-    }
-
-    /**
-     * Retrieve the directory that downloads will happen in
-     * @access private
-     * @return string
-     */
-    function getDownloadDir()
-    {
-        if (isset($this->_downloadDir)) {
-            return $this->_downloadDir;
-        }
-        $downloaddir = $this->config->get('download_dir');
-        if (empty($downloaddir) || (is_dir($downloaddir) && !is_writable($downloaddir))) {
-            if  (is_dir($downloaddir) && !is_writable($downloaddir)) {
-                $this->log(0, 'WARNING: configuration download directory "' . $downloaddir .
-                    '" is not writeable.  Change download_dir config variable to ' .
-                    'a writeable dir to avoid this warning');
-            }
-            if (!class_exists('System')) {
-                require_once 'System.php';
-            }
-            if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
-                return $downloaddir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $downloaddir);
-        }
-        if (!is_writable($downloaddir)) {
-            if (PEAR::isError(System::mkdir(array('-p', $downloaddir))) ||
-                  !is_writable($downloaddir)) {
-                return PEAR::raiseError('download directory "' . $downloaddir .
-                    '" is not writeable.  Change download_dir config variable to ' .
-                    'a writeable dir');
-            }
-        }
-        return $this->_downloadDir = $downloaddir;
-    }
-
-    function setDownloadDir($dir)
-    {
-        if (!@is_writable($dir)) {
-            if (PEAR::isError(System::mkdir(array('-p', $dir)))) {
-                return PEAR::raiseError('download directory "' . $dir .
-                    '" is not writeable.  Change download_dir config variable to ' .
-                    'a writeable dir');
-            }
-        }
-        $this->_downloadDir = $dir;
-    }
-
-    function configSet($key, $value, $layer = 'user', $channel = false)
-    {
-        $this->config->set($key, $value, $layer, $channel);
-        $this->_preferredState = $this->config->get('preferred_state', null, $channel);
-        if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
-            $this->_preferredState = null;
-        }
-    }
-
-    function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    // }}}
-    // {{{ setOptions()
-    function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param int
-     * @param string
-     */
-    function &getPackagefileObject(&$c, $d, $t = false)
-    {
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($c, $d, $t);
-        return $a;
-    }
-
-    /**
-     * @param array output of {@link parsePackageName()}
-     * @access private
-     */
-    function _getPackageDownloadUrl($parr)
-    {
-        $curchannel = $this->config->get('default_channel');
-        $this->configSet('default_channel', $parr['channel']);
-        // getDownloadURL returns an array.  On error, it only contains information
-        // on the latest release as array(version, info).  On success it contains
-        // array(version, info, download url string)
-        $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state');
-        if (!$this->_registry->channelExists($parr['channel'])) {
-            do {
-                if ($this->config->get('auto_discover') && $this->discover($parr['channel'])) {
-                    break;
-                }
-
-                $this->configSet('default_channel', $curchannel);
-                return PEAR::raiseError('Unknown remote channel: ' . $parr['channel']);
-            } while (false);
-        }
-
-        $chan = &$this->_registry->getChannel($parr['channel']);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $version   = $this->_registry->packageInfo($parr['package'], 'version', $parr['channel']);
-        $stability = $this->_registry->packageInfo($parr['package'], 'stability', $parr['channel']);
-        // package is installed - use the installed release stability level
-        if (!isset($parr['state']) && $stability !== null) {
-            $state = $stability['release'];
-        }
-        PEAR::staticPopErrorHandling();
-        $base2 = false;
-
-        $preferred_mirror = $this->config->get('preferred_mirror');
-        if (!$chan->supportsREST($preferred_mirror) ||
-              (
-               !($base2 = $chan->getBaseURL('REST1.3', $preferred_mirror))
-               &&
-               !($base = $chan->getBaseURL('REST1.0', $preferred_mirror))
-              )
-        ) {
-            return $this->raiseError($parr['channel'] . ' is using a unsupported protocol - This should never happen.');
-        }
-
-        if ($base2) {
-            $rest = &$this->config->getREST('1.3', $this->_options);
-            $base = $base2;
-        } else {
-            $rest = &$this->config->getREST('1.0', $this->_options);
-        }
-
-        $downloadVersion = false;
-        if (!isset($parr['version']) && !isset($parr['state']) && $version
-              && !PEAR::isError($version)
-              && !isset($this->_options['downloadonly'])
-        ) {
-            $downloadVersion = $version;
-        }
-
-        $url = $rest->getDownloadURL($base, $parr, $state, $downloadVersion, $chan->getName());
-        if (PEAR::isError($url)) {
-            $this->configSet('default_channel', $curchannel);
-            return $url;
-        }
-
-        if ($parr['channel'] != $curchannel) {
-            $this->configSet('default_channel', $curchannel);
-        }
-
-        if (!is_array($url)) {
-            return $url;
-        }
-
-        $url['raw'] = false; // no checking is necessary for REST
-        if (!is_array($url['info'])) {
-            return PEAR::raiseError('Invalid remote dependencies retrieved from REST - ' .
-                'this should never happen');
-        }
-
-        if (!isset($this->_options['force']) &&
-              !isset($this->_options['downloadonly']) &&
-              $version &&
-              !PEAR::isError($version) &&
-              !isset($parr['group'])
-        ) {
-            if (version_compare($version, $url['version'], '=')) {
-                return PEAR::raiseError($this->_registry->parsedPackageNameToString(
-                    $parr, true) . ' is already installed and is the same as the ' .
-                    'released version ' . $url['version'], -976);
-            }
-
-            if (version_compare($version, $url['version'], '>')) {
-                return PEAR::raiseError($this->_registry->parsedPackageNameToString(
-                    $parr, true) . ' is already installed and is newer than detected ' .
-                    'released version ' . $url['version'], -976);
-            }
-        }
-
-        if (isset($url['info']['required']) || $url['compatible']) {
-            require_once 'PEAR/PackageFile/v2.php';
-            $pf = new PEAR_PackageFile_v2;
-            $pf->setRawChannel($parr['channel']);
-            if ($url['compatible']) {
-                $pf->setRawCompatible($url['compatible']);
-            }
-        } else {
-            require_once 'PEAR/PackageFile/v1.php';
-            $pf = new PEAR_PackageFile_v1;
-        }
-
-        $pf->setRawPackage($url['package']);
-        $pf->setDeps($url['info']);
-        if ($url['compatible']) {
-            $pf->setCompatible($url['compatible']);
-        }
-
-        $pf->setRawState($url['stability']);
-        $url['info'] = &$pf;
-        if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-            $ext = '.tar';
-        } else {
-            $ext = '.tgz';
-        }
-
-        if (is_array($url) && isset($url['url'])) {
-            $url['url'] .= $ext;
-        }
-
-        return $url;
-    }
-
-    /**
-     * @param array dependency array
-     * @access private
-     */
-    function _getDepPackageDownloadUrl($dep, $parr)
-    {
-        $xsdversion = isset($dep['rel']) ? '1.0' : '2.0';
-        $curchannel = $this->config->get('default_channel');
-        if (isset($dep['uri'])) {
-            $xsdversion = '2.0';
-            $chan = &$this->_registry->getChannel('__uri');
-            if (PEAR::isError($chan)) {
-                return $chan;
-            }
-
-            $version = $this->_registry->packageInfo($dep['name'], 'version', '__uri');
-            $this->configSet('default_channel', '__uri');
-        } else {
-            if (isset($dep['channel'])) {
-                $remotechannel = $dep['channel'];
-            } else {
-                $remotechannel = 'pear.php.net';
-            }
-
-            if (!$this->_registry->channelExists($remotechannel)) {
-                do {
-                    if ($this->config->get('auto_discover')) {
-                        if ($this->discover($remotechannel)) {
-                            break;
-                        }
-                    }
-                    return PEAR::raiseError('Unknown remote channel: ' . $remotechannel);
-                } while (false);
-            }
-
-            $chan = &$this->_registry->getChannel($remotechannel);
-            if (PEAR::isError($chan)) {
-                return $chan;
-            }
-
-            $version = $this->_registry->packageInfo($dep['name'], 'version', $remotechannel);
-            $this->configSet('default_channel', $remotechannel);
-        }
-
-        $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state');
-        if (isset($parr['state']) && isset($parr['version'])) {
-            unset($parr['state']);
-        }
-
-        if (isset($dep['uri'])) {
-            $info = &$this->newDownloaderPackage($this);
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $info->initialize($dep);
-            PEAR::staticPopErrorHandling();
-            if (!$err) {
-                // skip parameters that were missed by preferred_state
-                return PEAR::raiseError('Cannot initialize dependency');
-            }
-
-            if (PEAR::isError($err)) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(0, $err->getMessage());
-                }
-
-                if (is_object($info)) {
-                    $param = $info->getChannel() . '/' . $info->getPackage();
-                }
-                return PEAR::raiseError('Package "' . $param . '" is not valid');
-            }
-            return $info;
-        } elseif ($chan->supportsREST($this->config->get('preferred_mirror'))
-              && $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))
-        ) {
-            $rest = &$this->config->getREST('1.0', $this->_options);
-            $url = $rest->getDepDownloadURL($base, $xsdversion, $dep, $parr,
-                    $state, $version, $chan->getName());
-            if (PEAR::isError($url)) {
-                return $url;
-            }
-
-            if ($parr['channel'] != $curchannel) {
-                $this->configSet('default_channel', $curchannel);
-            }
-
-            if (!is_array($url)) {
-                return $url;
-            }
-
-            $url['raw'] = false; // no checking is necessary for REST
-            if (!is_array($url['info'])) {
-                return PEAR::raiseError('Invalid remote dependencies retrieved from REST - ' .
-                    'this should never happen');
-            }
-
-            if (isset($url['info']['required'])) {
-                if (!class_exists('PEAR_PackageFile_v2')) {
-                    require_once 'PEAR/PackageFile/v2.php';
-                }
-                $pf = new PEAR_PackageFile_v2;
-                $pf->setRawChannel($remotechannel);
-            } else {
-                if (!class_exists('PEAR_PackageFile_v1')) {
-                    require_once 'PEAR/PackageFile/v1.php';
-                }
-                $pf = new PEAR_PackageFile_v1;
-
-            }
-            $pf->setRawPackage($url['package']);
-            $pf->setDeps($url['info']);
-            if ($url['compatible']) {
-                $pf->setCompatible($url['compatible']);
-            }
-
-            $pf->setRawState($url['stability']);
-            $url['info'] = &$pf;
-            if (!extension_loaded("zlib") || isset($this->_options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-
-            if (is_array($url) && isset($url['url'])) {
-                $url['url'] .= $ext;
-            }
-
-            return $url;
-        }
-
-        return $this->raiseError($parr['channel'] . ' is using a unsupported protocol - This should never happen.');
-    }
-
-    /**
-     * @deprecated in favor of _getPackageDownloadUrl
-     */
-    function getPackageDownloadUrl($package, $version = null, $channel = false)
-    {
-        if ($version) {
-            $package .= "-$version";
-        }
-        if ($this === null || $this->_registry === null) {
-            $package = "http://pear.php.net/get/$package";
-        } else {
-            $chan = $this->_registry->getChannel($channel);
-            if (PEAR::isError($chan)) {
-                return '';
-            }
-            $package = "http://" . $chan->getServer() . "/get/$package";
-        }
-        if (!extension_loaded("zlib")) {
-            $package .= '?uncompress=yes';
-        }
-        return $package;
-    }
-
-    /**
-     * Retrieve a list of downloaded packages after a call to {@link download()}.
-     *
-     * Also resets the list of downloaded packages.
-     * @return array
-     */
-    function getDownloadedPackages()
-    {
-        $ret = $this->_downloadedPackages;
-        $this->_downloadedPackages = array();
-        $this->_toDownload = array();
-        return $ret;
-    }
-
-    function _downloadCallback($msg, $params = null)
-    {
-        switch ($msg) {
-            case 'saveas':
-                $this->log(1, "downloading $params ...");
-                break;
-            case 'done':
-                $this->log(1, '...done: ' . number_format($params, 0, '', ',') . ' bytes');
-                break;
-            case 'bytesread':
-                static $bytes;
-                if (empty($bytes)) {
-                    $bytes = 0;
-                }
-                if (!($bytes % 10240)) {
-                    $this->log(1, '.', false);
-                }
-                $bytes += $params;
-                break;
-            case 'start':
-                if($params[1] == -1) {
-                    $length = "Unknown size";
-                } else {
-                    $length = number_format($params[1], 0, '', ',')." bytes";
-                }
-                $this->log(1, "Starting to download {$params[0]} ($length)");
-                break;
-        }
-        if (method_exists($this->ui, '_downloadCallback'))
-            $this->ui->_downloadCallback($msg, $params);
-    }
-
-    function _prependPath($path, $prepend)
-    {
-        if (strlen($prepend) > 0) {
-            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-                if (preg_match('/^[a-z]:/i', $prepend)) {
-                    $prepend = substr($prepend, 2);
-                } elseif ($prepend{0} != '\\') {
-                    $prepend = "\\$prepend";
-                }
-                $path = substr($path, 0, 2) . $prepend . substr($path, 2);
-            } else {
-                $path = $prepend . $path;
-            }
-        }
-        return $path;
-    }
-
-    /**
-     * @param string
-     * @param integer
-     */
-    function pushError($errmsg, $code = -1)
-    {
-        array_push($this->_errorStack, array($errmsg, $code));
-    }
-
-    function getErrorMsgs()
-    {
-        $msgs = array();
-        $errs = $this->_errorStack;
-        foreach ($errs as $err) {
-            $msgs[] = $err[0];
-        }
-        $this->_errorStack = array();
-        return $msgs;
-    }
-
-    /**
-     * for BC
-     *
-     * @deprecated
-     */
-    function sortPkgDeps(&$packages, $uninstall = false)
-    {
-        $uninstall ?
-            $this->sortPackagesForUninstall($packages) :
-            $this->sortPackagesForInstall($packages);
-    }
-
-    /**
-     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
-     *
-     * This uses the topological sort method from graph theory, and the
-     * Structures_Graph package to properly sort dependencies for installation.
-     * @param array an array of downloaded PEAR_Downloader_Packages
-     * @return array array of array(packagefilename, package.xml contents)
-     */
-    function sortPackagesForInstall(&$packages)
-    {
-        require_once 'Structures/Graph.php';
-        require_once 'Structures/Graph/Node.php';
-        require_once 'Structures/Graph/Manipulator/TopologicalSorter.php';
-        $depgraph = new Structures_Graph(true);
-        $nodes = array();
-        $reg = &$this->config->getRegistry();
-        foreach ($packages as $i => $package) {
-            $pname = $reg->parsedPackageNameToString(
-                array(
-                    'channel' => $package->getChannel(),
-                    'package' => strtolower($package->getPackage()),
-                ));
-            $nodes[$pname] = new Structures_Graph_Node;
-            $nodes[$pname]->setData($packages[$i]);
-            $depgraph->addNode($nodes[$pname]);
-        }
-
-        $deplinks = array();
-        foreach ($nodes as $package => $node) {
-            $pf = &$node->getData();
-            $pdeps = $pf->getDeps(true);
-            if (!$pdeps) {
-                continue;
-            }
-
-            if ($pf->getPackagexmlVersion() == '1.0') {
-                foreach ($pdeps as $dep) {
-                    if ($dep['type'] != 'pkg' ||
-                          (isset($dep['optional']) && $dep['optional'] == 'yes')) {
-                        continue;
-                    }
-
-                    $dname = $reg->parsedPackageNameToString(
-                          array(
-                              'channel' => 'pear.php.net',
-                              'package' => strtolower($dep['name']),
-                          ));
-
-                    if (isset($nodes[$dname])) {
-                        if (!isset($deplinks[$dname])) {
-                            $deplinks[$dname] = array();
-                        }
-
-                        $deplinks[$dname][$package] = 1;
-                        // dependency is in installed packages
-                        continue;
-                    }
-
-                    $dname = $reg->parsedPackageNameToString(
-                          array(
-                              'channel' => 'pecl.php.net',
-                              'package' => strtolower($dep['name']),
-                          ));
-
-                    if (isset($nodes[$dname])) {
-                        if (!isset($deplinks[$dname])) {
-                            $deplinks[$dname] = array();
-                        }
-
-                        $deplinks[$dname][$package] = 1;
-                        // dependency is in installed packages
-                        continue;
-                    }
-                }
-            } else {
-                // the only ordering we care about is:
-                // 1) subpackages must be installed before packages that depend on them
-                // 2) required deps must be installed before packages that depend on them
-                if (isset($pdeps['required']['subpackage'])) {
-                    $t = $pdeps['required']['subpackage'];
-                    if (!isset($t[0])) {
-                        $t = array($t);
-                    }
-
-                    $this->_setupGraph($t, $reg, $deplinks, $nodes, $package);
-                }
-
-                if (isset($pdeps['group'])) {
-                    if (!isset($pdeps['group'][0])) {
-                        $pdeps['group'] = array($pdeps['group']);
-                    }
-
-                    foreach ($pdeps['group'] as $group) {
-                        if (isset($group['subpackage'])) {
-                            $t = $group['subpackage'];
-                            if (!isset($t[0])) {
-                                $t = array($t);
-                            }
-
-                            $this->_setupGraph($t, $reg, $deplinks, $nodes, $package);
-                        }
-                    }
-                }
-
-                if (isset($pdeps['optional']['subpackage'])) {
-                    $t = $pdeps['optional']['subpackage'];
-                    if (!isset($t[0])) {
-                        $t = array($t);
-                    }
-
-                    $this->_setupGraph($t, $reg, $deplinks, $nodes, $package);
-                }
-
-                if (isset($pdeps['required']['package'])) {
-                    $t = $pdeps['required']['package'];
-                    if (!isset($t[0])) {
-                        $t = array($t);
-                    }
-
-                    $this->_setupGraph($t, $reg, $deplinks, $nodes, $package);
-                }
-
-                if (isset($pdeps['group'])) {
-                    if (!isset($pdeps['group'][0])) {
-                        $pdeps['group'] = array($pdeps['group']);
-                    }
-
-                    foreach ($pdeps['group'] as $group) {
-                        if (isset($group['package'])) {
-                            $t = $group['package'];
-                            if (!isset($t[0])) {
-                                $t = array($t);
-                            }
-
-                            $this->_setupGraph($t, $reg, $deplinks, $nodes, $package);
-                        }
-                    }
-                }
-            }
-        }
-
-        $this->_detectDepCycle($deplinks);
-        foreach ($deplinks as $dependent => $parents) {
-            foreach ($parents as $parent => $unused) {
-                $nodes[$dependent]->connectTo($nodes[$parent]);
-            }
-        }
-
-        $installOrder = Structures_Graph_Manipulator_TopologicalSorter::sort($depgraph);
-        $ret = array();
-        for ($i = 0, $count = count($installOrder); $i < $count; $i++) {
-            foreach ($installOrder[$i] as $index => $sortedpackage) {
-                $data = &$installOrder[$i][$index]->getData();
-                $ret[] = &$nodes[$reg->parsedPackageNameToString(
-                          array(
-                              'channel' => $data->getChannel(),
-                              'package' => strtolower($data->getPackage()),
-                          ))]->getData();
-            }
-        }
-
-        $packages = $ret;
-        return;
-    }
-
-    /**
-     * Detect recursive links between dependencies and break the cycles
-     *
-     * @param array
-     * @access private
-     */
-    function _detectDepCycle(&$deplinks)
-    {
-        do {
-            $keepgoing = false;
-            foreach ($deplinks as $dep => $parents) {
-                foreach ($parents as $parent => $unused) {
-                    // reset the parent cycle detector
-                    $this->_testCycle(null, null, null);
-                    if ($this->_testCycle($dep, $deplinks, $parent)) {
-                        $keepgoing = true;
-                        unset($deplinks[$dep][$parent]);
-                        if (count($deplinks[$dep]) == 0) {
-                            unset($deplinks[$dep]);
-                        }
-
-                        continue 3;
-                    }
-                }
-            }
-        } while ($keepgoing);
-    }
-
-    function _testCycle($test, $deplinks, $dep)
-    {
-        static $visited = array();
-        if ($test === null) {
-            $visited = array();
-            return;
-        }
-
-        // this happens when a parent has a dep cycle on another dependency
-        // but the child is not part of the cycle
-        if (isset($visited[$dep])) {
-            return false;
-        }
-
-        $visited[$dep] = 1;
-        if ($test == $dep) {
-            return true;
-        }
-
-        if (isset($deplinks[$dep])) {
-            if (in_array($test, array_keys($deplinks[$dep]), true)) {
-                return true;
-            }
-
-            foreach ($deplinks[$dep] as $parent => $unused) {
-                if ($this->_testCycle($test, $deplinks, $parent)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Set up the dependency for installation parsing
-     *
-     * @param array $t dependency information
-     * @param PEAR_Registry $reg
-     * @param array $deplinks list of dependency links already established
-     * @param array $nodes all existing package nodes
-     * @param string $package parent package name
-     * @access private
-     */
-    function _setupGraph($t, $reg, &$deplinks, &$nodes, $package)
-    {
-        foreach ($t as $dep) {
-            $depchannel = !isset($dep['channel']) ? '__uri': $dep['channel'];
-            $dname = $reg->parsedPackageNameToString(
-                  array(
-                      'channel' => $depchannel,
-                      'package' => strtolower($dep['name']),
-                  ));
-
-            if (isset($nodes[$dname])) {
-                if (!isset($deplinks[$dname])) {
-                    $deplinks[$dname] = array();
-                }
-                $deplinks[$dname][$package] = 1;
-            }
-        }
-    }
-
-    function _dependsOn($a, $b)
-    {
-        return $this->_checkDepTree(strtolower($a->getChannel()), strtolower($a->getPackage()), $b);
-    }
-
-    function _checkDepTree($channel, $package, $b, $checked = array())
-    {
-        $checked[$channel][$package] = true;
-        if (!isset($this->_depTree[$channel][$package])) {
-            return false;
-        }
-
-        if (isset($this->_depTree[$channel][$package][strtolower($b->getChannel())]
-              [strtolower($b->getPackage())])) {
-            return true;
-        }
-
-        foreach ($this->_depTree[$channel][$package] as $ch => $packages) {
-            foreach ($packages as $pa => $true) {
-                if ($this->_checkDepTree($ch, $pa, $b, $checked)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    function _sortInstall($a, $b)
-    {
-        if (!$a->getDeps() && !$b->getDeps()) {
-            return 0; // neither package has dependencies, order is insignificant
-        }
-        if ($a->getDeps() && !$b->getDeps()) {
-            return 1; // $a must be installed after $b because $a has dependencies
-        }
-        if (!$a->getDeps() && $b->getDeps()) {
-            return -1; // $b must be installed after $a because $b has dependencies
-        }
-        // both packages have dependencies
-        if ($this->_dependsOn($a, $b)) {
-            return 1;
-        }
-        if ($this->_dependsOn($b, $a)) {
-            return -1;
-        }
-        return 0;
-    }
-
-    /**
-     * Download a file through HTTP.  Considers suggested file name in
-     * Content-disposition: header and can run a callback function for
-     * different events.  The callback will be called with two
-     * parameters: the callback type, and parameters.  The implemented
-     * callback types are:
-     *
-     *  'setup'       called at the very beginning, parameter is a UI object
-     *                that should be used for all output
-     *  'message'     the parameter is a string with an informational message
-     *  'saveas'      may be used to save with a different file name, the
-     *                parameter is the filename that is about to be used.
-     *                If a 'saveas' callback returns a non-empty string,
-     *                that file name will be used as the filename instead.
-     *                Note that $save_dir will not be affected by this, only
-     *                the basename of the file.
-     *  'start'       download is starting, parameter is number of bytes
-     *                that are expected, or -1 if unknown
-     *  'bytesread'   parameter is the number of bytes read so far
-     *  'done'        download is complete, parameter is the total number
-     *                of bytes read
-     *  'connfailed'  if the TCP/SSL connection fails, this callback is called
-     *                with array(host,port,errno,errmsg)
-     *  'writefailed' if writing to disk fails, this callback is called
-     *                with array(destfile,errmsg)
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param object  $ui        PEAR_Frontend_* instance
-     * @param object  $config    PEAR_Config instance
-     * @param string  $save_dir  directory to save file in
-     * @param mixed   $callback  function/method to call for status
-     *                           updates
-     * @param false|string|array $lastmodified header values to check against for caching
-     *                           use false to return the header values from this download
-     * @param false|array $accept Accept headers to send
-     * @param false|string $channel Channel to use for retrieving authentication
-     * @return string|array  Returns the full path of the downloaded file or a PEAR
-     *                       error on failure.  If the error is caused by
-     *                       socket-related errors, the error object will
-     *                       have the fsockopen error code available through
-     *                       getCode().  If caching is requested, then return the header
-     *                       values.
-     *
-     * @access public
-     */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
-                          $accept = false, $channel = false)
-    {
-        static $redirect = 0;
-        // always reset , so we are clean case of error
-        $wasredirect = $redirect;
-        $redirect = 0;
-        if ($callback) {
-            call_user_func($callback, 'setup', array(&$ui));
-        }
-
-        $info = parse_url($url);
-        if (!isset($info['scheme']) || !in_array($info['scheme'], array('http', 'https'))) {
-            return PEAR::raiseError('Cannot download non-http URL "' . $url . '"');
-        }
-
-        if (!isset($info['host'])) {
-            return PEAR::raiseError('Cannot download from non-URL "' . $url . '"');
-        }
-
-        $host = isset($info['host']) ? $info['host'] : null;
-        $port = isset($info['port']) ? $info['port'] : null;
-        $path = isset($info['path']) ? $info['path'] : null;
-
-        if (isset($this)) {
-            $config = &$this->config;
-        } else {
-            $config = &PEAR_Config::singleton();
-        }
-
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($config->get('http_proxy') &&
-              $proxy = parse_url($config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-
-            if ($callback) {
-                call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
-            }
-        }
-
-        if (empty($port)) {
-            $port = (isset($info['scheme']) && $info['scheme'] == 'https') ? 443 : 80;
-        }
-
-        $scheme = (isset($info['scheme']) && $info['scheme'] == 'https') ? 'https' : 'http';
-
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($proxy_host, $proxy_port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", $errno);
-            }
-
-            if ($lastmodified === false || $lastmodified) {
-                $request  = "GET $url HTTP/1.1\r\n";
-                $request .= "Host: $host\r\n";
-            } else {
-                $request  = "GET $url HTTP/1.0\r\n";
-                $request .= "Host: $host\r\n";
-            }
-        } else {
-            $network_host = $host;
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $network_host = 'ssl://' . $host;
-            }
-
-            $fp = @fsockopen($network_host, $port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($host, $port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
-
-            if ($lastmodified === false || $lastmodified) {
-                $request = "GET $path HTTP/1.1\r\n";
-                $request .= "Host: $host\r\n";
-            } else {
-                $request = "GET $path HTTP/1.0\r\n";
-                $request .= "Host: $host\r\n";
-            }
-        }
-
-        $ifmodifiedsince = '';
-        if (is_array($lastmodified)) {
-            if (isset($lastmodified['Last-Modified'])) {
-                $ifmodifiedsince = 'If-Modified-Since: ' . $lastmodified['Last-Modified'] . "\r\n";
-            }
-
-            if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
-            }
-        } else {
-            $ifmodifiedsince = ($lastmodified ? "If-Modified-Since: $lastmodified\r\n" : '');
-        }
-
-        $request .= $ifmodifiedsince .
-            "User-Agent: PEAR/1.9.1/PHP/" . PHP_VERSION . "\r\n";
-
-        if (isset($this)) { // only pass in authentication for non-static calls
-            $username = $config->get('username', null, $channel);
-            $password = $config->get('password', null, $channel);
-            if ($username && $password) {
-                $tmp = base64_encode("$username:$password");
-                $request .= "Authorization: Basic $tmp\r\n";
-            }
-        }
-
-        if ($proxy_host != '' && $proxy_user != '') {
-            $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
-        }
-
-        if ($accept) {
-            $request .= 'Accept: ' . implode(', ', $accept) . "\r\n";
-        }
-
-        $request .= "Connection: close\r\n";
-        $request .= "\r\n";
-        fwrite($fp, $request);
-        $headers = array();
-        $reply = 0;
-        while (trim($line = fgets($fp, 1024))) {
-            if (preg_match('/^([^:]+):\s+(.*)\s*\\z/', $line, $matches)) {
-                $headers[strtolower($matches[1])] = trim($matches[2]);
-            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
-                $reply = (int)$matches[1];
-                if ($reply == 304 && ($lastmodified || ($lastmodified === false))) {
-                    return false;
-                }
-
-                if (!in_array($reply, array(200, 301, 302, 303, 305, 307))) {
-                    return PEAR::raiseError("File $scheme://$host:$port$path not valid (received: $line)");
-                }
-            }
-        }
-
-        if ($reply != 200) {
-            if (!isset($headers['location'])) {
-                return PEAR::raiseError("File $scheme://$host:$port$path not valid (redirected but no location)");
-            }
-
-            if ($wasredirect > 4) {
-                return PEAR::raiseError("File $scheme://$host:$port$path not valid (redirection looped more than 5 times)");
-            }
-
-            $redirect = $wasredirect + 1;
-            return $this->downloadHttp($headers['location'],
-                    $ui, $save_dir, $callback, $lastmodified, $accept);
-        }
-
-        if (isset($headers['content-disposition']) &&
-            preg_match('/\sfilename=\"([^;]*\S)\"\s*(;|\\z)/', $headers['content-disposition'], $matches)) {
-            $save_as = basename($matches[1]);
-        } else {
-            $save_as = basename($url);
-        }
-
-        if ($callback) {
-            $tmp = call_user_func($callback, 'saveas', $save_as);
-            if ($tmp) {
-                $save_as = $tmp;
-            }
-        }
-
-        $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as;
-        if (!$wp = @fopen($dest_file, 'wb')) {
-            fclose($fp);
-            if ($callback) {
-                call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-            }
-            return PEAR::raiseError("could not open $dest_file for writing");
-        }
-
-        $length = isset($headers['content-length']) ? $headers['content-length'] : -1;
-
-        $bytes = 0;
-        if ($callback) {
-            call_user_func($callback, 'start', array(basename($dest_file), $length));
-        }
-
-        while ($data = fread($fp, 1024)) {
-            $bytes += strlen($data);
-            if ($callback) {
-                call_user_func($callback, 'bytesread', $bytes);
-            }
-            if (!@fwrite($wp, $data)) {
-                fclose($fp);
-                if ($callback) {
-                    call_user_func($callback, 'writefailed', array($dest_file, $php_errormsg));
-                }
-                return PEAR::raiseError("$dest_file: write failed ($php_errormsg)");
-            }
-        }
-
-        fclose($fp);
-        fclose($wp);
-        if ($callback) {
-            call_user_func($callback, 'done', $bytes);
-        }
-
-        if ($lastmodified === false || $lastmodified) {
-            if (isset($headers['etag'])) {
-                $lastmodified = array('ETag' => $headers['etag']);
-            }
-
-            if (isset($headers['last-modified'])) {
-                if (is_array($lastmodified)) {
-                    $lastmodified['Last-Modified'] = $headers['last-modified'];
-                } else {
-                    $lastmodified = $headers['last-modified'];
-                }
-            }
-            return array($dest_file, $lastmodified, $headers);
-        }
-        return $dest_file;
-    }
-}
-// }}}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Downloader/Package.php b/airtime_mvc/library/pear/PEAR/Downloader/Package.php
deleted file mode 100644
index 726753e8e..000000000
--- a/airtime_mvc/library/pear/PEAR/Downloader/Package.php
+++ /dev/null
@@ -1,2004 +0,0 @@
-<?php
-/**
- * PEAR_Downloader_Package
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Package.php 287560 2009-08-21 22:36:18Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Error code when parameter initialization fails because no releases
- * exist within preferred_state, but releases do exist
- */
-define('PEAR_DOWNLOADER_PACKAGE_STATE', -1003);
-/**
- * Error code when parameter initialization fails because no releases
- * exist that will work with the existing PHP version
- */
-define('PEAR_DOWNLOADER_PACKAGE_PHPVERSION', -1004);
-
-/**
- * Coordinates download parameters and manages their dependencies
- * prior to downloading them.
- *
- * Input can come from three sources:
- *
- * - local files (archives or package.xml)
- * - remote files (downloadable urls)
- * - abstract package names
- *
- * The first two elements are handled cleanly by PEAR_PackageFile, but the third requires
- * accessing pearweb's xml-rpc interface to determine necessary dependencies, and the
- * format returned of dependencies is slightly different from that used in package.xml.
- *
- * This class hides the differences between these elements, and makes automatic
- * dependency resolution a piece of cake.  It also manages conflicts when
- * two classes depend on incompatible dependencies, or differing versions of the same
- * package dependency.  In addition, download will not be attempted if the php version is
- * not supported, PEAR installer version is not supported, or non-PECL extensions are not
- * installed.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Downloader_Package
-{
-    /**
-     * @var PEAR_Downloader
-     */
-    var $_downloader;
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-    /**
-     * Used to implement packagingroot properly
-     * @var PEAR_Registry
-     */
-    var $_installRegistry;
-    /**
-     * @var PEAR_PackageFile_v1|PEAR_PackageFile|v2
-     */
-    var $_packagefile;
-    /**
-     * @var array
-     */
-    var $_parsedname;
-    /**
-     * @var array
-     */
-    var $_downloadURL;
-    /**
-     * @var array
-     */
-    var $_downloadDeps = array();
-    /**
-     * @var boolean
-     */
-    var $_valid = false;
-    /**
-     * @var boolean
-     */
-    var $_analyzed = false;
-    /**
-     * if this or a parent package was invoked with Package-state, this is set to the
-     * state variable.
-     *
-     * This allows temporary reassignment of preferred_state for a parent package and all of
-     * its dependencies.
-     * @var string|false
-     */
-    var $_explicitState = false;
-    /**
-     * If this package is invoked with Package#group, this variable will be true
-     */
-    var $_explicitGroup = false;
-    /**
-     * Package type local|url
-     * @var string
-     */
-    var $_type;
-    /**
-     * Contents of package.xml, if downloaded from a remote channel
-     * @var string|false
-     * @access private
-     */
-    var $_rawpackagefile;
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_validated = false;
-
-    /**
-     * @param PEAR_Downloader
-     */
-    function PEAR_Downloader_Package(&$downloader)
-    {
-        $this->_downloader = &$downloader;
-        $this->_config = &$this->_downloader->config;
-        $this->_registry = &$this->_config->getRegistry();
-        $options = $downloader->getOptions();
-        if (isset($options['packagingroot'])) {
-            $this->_config->setInstallRoot($options['packagingroot']);
-            $this->_installRegistry = &$this->_config->getRegistry();
-            $this->_config->setInstallRoot(false);
-        } else {
-            $this->_installRegistry = &$this->_registry;
-        }
-        $this->_valid = $this->_analyzed = false;
-    }
-
-    /**
-     * Parse the input and determine whether this is a local file, a remote uri, or an
-     * abstract package name.
-     *
-     * This is the heart of the PEAR_Downloader_Package(), and is used in
-     * {@link PEAR_Downloader::download()}
-     * @param string
-     * @return bool|PEAR_Error
-     */
-    function initialize($param)
-    {
-        $origErr = $this->_fromFile($param);
-        if ($this->_valid) {
-            return true;
-        }
-
-        $options = $this->_downloader->getOptions();
-        if (isset($options['offline'])) {
-            if (PEAR::isError($origErr) && !isset($options['soft'])) {
-                foreach ($origErr->getUserInfo() as $userInfo) {
-                    if (isset($userInfo['message'])) {
-                        $this->_downloader->log(0, $userInfo['message']);
-                    }
-                }
-
-                $this->_downloader->log(0, $origErr->getMessage());
-            }
-
-            return PEAR::raiseError('Cannot download non-local package "' . $param . '"');
-        }
-
-        $err = $this->_fromUrl($param);
-        if (PEAR::isError($err) || !$this->_valid) {
-            if ($this->_type == 'url') {
-                if (PEAR::isError($err) && !isset($options['soft'])) {
-                    $this->_downloader->log(0, $err->getMessage());
-                }
-
-                return PEAR::raiseError("Invalid or missing remote package file");
-            }
-
-            $err = $this->_fromString($param);
-            if (PEAR::isError($err) || !$this->_valid) {
-                if (PEAR::isError($err) && $err->getCode() == PEAR_DOWNLOADER_PACKAGE_STATE) {
-                    return false; // instruct the downloader to silently skip
-                }
-
-                if (isset($this->_type) && $this->_type == 'local' && PEAR::isError($origErr)) {
-                    if (is_array($origErr->getUserInfo())) {
-                        foreach ($origErr->getUserInfo() as $err) {
-                            if (is_array($err)) {
-                                $err = $err['message'];
-                            }
-
-                            if (!isset($options['soft'])) {
-                                $this->_downloader->log(0, $err);
-                            }
-                        }
-                    }
-
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $origErr->getMessage());
-                    }
-
-                    if (is_array($param)) {
-                        $param = $this->_registry->parsedPackageNameToString($param, true);
-                    }
-
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(2, "Cannot initialize '$param', invalid or missing package file");
-                    }
-
-                    // Passing no message back - already logged above
-                    return PEAR::raiseError();
-                }
-
-                if (PEAR::isError($err) && !isset($options['soft'])) {
-                    $this->_downloader->log(0, $err->getMessage());
-                }
-
-                if (is_array($param)) {
-                    $param = $this->_registry->parsedPackageNameToString($param, true);
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(2, "Cannot initialize '$param', invalid or missing package file");
-                }
-
-                // Passing no message back - already logged above
-                return PEAR::raiseError();
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieve any non-local packages
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|PEAR_Error
-     */
-    function &download()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile;
-        }
-
-        if (isset($this->_downloadURL['url'])) {
-            $this->_isvalid = false;
-            $info = $this->getParsedPackage();
-            foreach ($info as $i => $p) {
-                $info[$i] = strtolower($p);
-            }
-
-            $err = $this->_fromUrl($this->_downloadURL['url'],
-                $this->_registry->parsedPackageNameToString($this->_parsedname, true));
-            $newinfo = $this->getParsedPackage();
-            foreach ($newinfo as $i => $p) {
-                $newinfo[$i] = strtolower($p);
-            }
-
-            if ($info != $newinfo) {
-                do {
-                    if ($info['channel'] == 'pecl.php.net' && $newinfo['channel'] == 'pear.php.net') {
-                        $info['channel'] = 'pear.php.net';
-                        if ($info == $newinfo) {
-                            // skip the channel check if a pecl package says it's a PEAR package
-                            break;
-                        }
-                    }
-                    if ($info['channel'] == 'pear.php.net' && $newinfo['channel'] == 'pecl.php.net') {
-                        $info['channel'] = 'pecl.php.net';
-                        if ($info == $newinfo) {
-                            // skip the channel check if a pecl package says it's a PEAR package
-                            break;
-                        }
-                    }
-
-                    return PEAR::raiseError('CRITICAL ERROR: We are ' .
-                        $this->_registry->parsedPackageNameToString($info) . ', but the file ' .
-                        'downloaded claims to be ' .
-                        $this->_registry->parsedPackageNameToString($this->getParsedPackage()));
-                } while (false);
-            }
-
-            if (PEAR::isError($err) || !$this->_valid) {
-                return $err;
-            }
-        }
-
-        $this->_type = 'local';
-        return $this->_packagefile;
-    }
-
-    function &getPackageFile()
-    {
-        return $this->_packagefile;
-    }
-
-    function &getDownloader()
-    {
-        return $this->_downloader;
-    }
-
-    function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Like {@link initialize()}, but operates on a dependency
-     */
-    function fromDepURL($dep)
-    {
-        $this->_downloadURL = $dep;
-        if (isset($dep['uri'])) {
-            $options = $this->_downloader->getOptions();
-            if (!extension_loaded("zlib") || isset($options['nocompress'])) {
-                $ext = '.tar';
-            } else {
-                $ext = '.tgz';
-            }
-
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $err = $this->_fromUrl($dep['uri'] . $ext);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($err)) {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $err->getMessage());
-                }
-
-                return PEAR::raiseError('Invalid uri dependency "' . $dep['uri'] . $ext . '", ' .
-                    'cannot download');
-            }
-        } else {
-            $this->_parsedname =
-                array(
-                    'package' => $dep['info']->getPackage(),
-                    'channel' => $dep['info']->getChannel(),
-                    'version' => $dep['version']
-                );
-            if (!isset($dep['nodefault'])) {
-                $this->_parsedname['group'] = 'default'; // download the default dependency group
-                $this->_explicitGroup = false;
-            }
-
-            $this->_rawpackagefile = $dep['raw'];
-        }
-    }
-
-    function detectDependencies($params)
-    {
-        $options = $this->_downloader->getOptions();
-        if (isset($options['downloadonly'])) {
-            return;
-        }
-
-        if (isset($options['offline'])) {
-            $this->_downloader->log(3, 'Skipping dependency download check, --offline specified');
-            return;
-        }
-
-        $pname = $this->getParsedPackage();
-        if (!$pname) {
-            return;
-        }
-
-        $deps = $this->getDeps();
-        if (!$deps) {
-            return;
-        }
-
-        if (isset($deps['required'])) { // package.xml 2.0
-            return $this->_detect2($deps, $pname, $options, $params);
-        }
-
-        return $this->_detect1($deps, $pname, $options, $params);
-    }
-
-    function setValidated()
-    {
-        $this->_validated = true;
-    }
-
-    function alreadyValidated()
-    {
-        return $this->_validated;
-    }
-
-    /**
-     * Remove packages to be downloaded that are already installed
-     * @param array of PEAR_Downloader_Package objects
-     * @static
-     */
-    function removeInstalled(&$params)
-    {
-        if (!isset($params[0])) {
-            return;
-        }
-
-        $options = $params[0]->_downloader->getOptions();
-        if (!isset($options['downloadonly'])) {
-            foreach ($params as $i => $param) {
-                $package = $param->getPackage();
-                $channel = $param->getChannel();
-                // remove self if already installed with this version
-                // this does not need any pecl magic - we only remove exact matches
-                if ($param->_installRegistry->packageExists($package, $channel)) {
-                    $packageVersion = $param->_installRegistry->packageInfo($package, 'version', $channel);
-                    if (version_compare($packageVersion, $param->getVersion(), '==')) {
-                        if (!isset($options['force'])) {
-                            $info = $param->getParsedPackage();
-                            unset($info['version']);
-                            unset($info['state']);
-                            if (!isset($options['soft'])) {
-                                $param->_downloader->log(1, 'Skipping package "' .
-                                    $param->getShortName() .
-                                    '", already installed as version ' . $packageVersion);
-                            }
-                            $params[$i] = false;
-                        }
-                    } elseif (!isset($options['force']) && !isset($options['upgrade']) &&
-                          !isset($options['soft'])) {
-                        $info = $param->getParsedPackage();
-                        $param->_downloader->log(1, 'Skipping package "' .
-                            $param->getShortName() .
-                            '", already installed as version ' . $packageVersion);
-                        $params[$i] = false;
-                    }
-                }
-            }
-        }
-
-        PEAR_Downloader_Package::removeDuplicates($params);
-    }
-
-    function _detect2($deps, $pname, $options, $params)
-    {
-        $this->_downloadDeps = array();
-        $groupnotfound = false;
-        foreach (array('package', 'subpackage') as $packagetype) {
-            // get required dependency group
-            if (isset($deps['required'][$packagetype])) {
-                if (isset($deps['required'][$packagetype][0])) {
-                    foreach ($deps['required'][$packagetype] as $dep) {
-                        if (isset($dep['conflicts'])) {
-                            // skip any package that this package conflicts with
-                            continue;
-                        }
-                        $ret = $this->_detect2Dep($dep, $pname, 'required', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        } elseif (PEAR::isError($ret) && !isset($options['soft'])) {
-                            $this->_downloader->log(0, $ret->getMessage());
-                        }
-                    }
-                } else {
-                    $dep = $deps['required'][$packagetype];
-                    if (!isset($dep['conflicts'])) {
-                        // skip any package that this package conflicts with
-                        $ret = $this->_detect2Dep($dep, $pname, 'required', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        } elseif (PEAR::isError($ret) && !isset($options['soft'])) {
-                            $this->_downloader->log(0, $ret->getMessage());
-                        }
-                    }
-                }
-            }
-
-            // get optional dependency group, if any
-            if (isset($deps['optional'][$packagetype])) {
-                $skipnames = array();
-                if (!isset($deps['optional'][$packagetype][0])) {
-                    $deps['optional'][$packagetype] = array($deps['optional'][$packagetype]);
-                }
-
-                foreach ($deps['optional'][$packagetype] as $dep) {
-                    $skip = false;
-                    if (!isset($options['alldeps'])) {
-                        $dep['package'] = $dep['name'];
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                              $this->_registry->parsedPackageNameToString($this->getParsedPackage(),
-                                    true) . '" optional dependency "' .
-                                $this->_registry->parsedPackageNameToString(array('package' =>
-                                    $dep['name'], 'channel' => 'pear.php.net'), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString($dep, true);
-                        $skip = true;
-                        unset($dep['package']);
-                    }
-
-                    $ret = $this->_detect2Dep($dep, $pname, 'optional', $params);
-                    if (PEAR::isError($ret) && !isset($options['soft'])) {
-                        $this->_downloader->log(0, $ret->getMessage());
-                    }
-
-                    if (!$ret) {
-                        $dep['package'] = $dep['name'];
-                        $skip = count($skipnames) ?
-                            $skipnames[count($skipnames) - 1] : '';
-                        if ($skip ==
-                              $this->_registry->parsedPackageNameToString($dep, true)) {
-                            array_pop($skipnames);
-                        }
-                    }
-
-                    if (!$skip && is_array($ret)) {
-                        $this->_downloadDeps[] = $ret;
-                    }
-                }
-
-                if (count($skipnames)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(1, 'Did not download optional dependencies: ' .
-                            implode(', ', $skipnames) .
-                            ', use --alldeps to download automatically');
-                    }
-                }
-            }
-
-            // get requested dependency group, if any
-            $groupname = $this->getGroup();
-            $explicit  = $this->_explicitGroup;
-            if (!$groupname) {
-                if (!$this->canDefault()) {
-                    continue;
-                }
-
-                $groupname = 'default'; // try the default dependency group
-            }
-
-            if ($groupnotfound) {
-                continue;
-            }
-
-            if (isset($deps['group'])) {
-                if (isset($deps['group']['attribs'])) {
-                    if (strtolower($deps['group']['attribs']['name']) == strtolower($groupname)) {
-                        $group = $deps['group'];
-                    } elseif ($explicit) {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, 'Warning: package "' .
-                                $this->_registry->parsedPackageNameToString($pname, true) .
-                                '" has no dependency ' . 'group named "' . $groupname . '"');
-                        }
-
-                        $groupnotfound = true;
-                        continue;
-                    }
-                } else {
-                    $found = false;
-                    foreach ($deps['group'] as $group) {
-                        if (strtolower($group['attribs']['name']) == strtolower($groupname)) {
-                            $found = true;
-                            break;
-                        }
-                    }
-
-                    if (!$found) {
-                        if ($explicit) {
-                            if (!isset($options['soft'])) {
-                                $this->_downloader->log(0, 'Warning: package "' .
-                                    $this->_registry->parsedPackageNameToString($pname, true) .
-                                    '" has no dependency ' . 'group named "' . $groupname . '"');
-                            }
-                        }
-
-                        $groupnotfound = true;
-                        continue;
-                    }
-                }
-            }
-
-            if (isset($group) && isset($group[$packagetype])) {
-                if (isset($group[$packagetype][0])) {
-                    foreach ($group[$packagetype] as $dep) {
-                        $ret = $this->_detect2Dep($dep, $pname, 'dependency group "' .
-                            $group['attribs']['name'] . '"', $params);
-                        if (is_array($ret)) {
-                            $this->_downloadDeps[] = $ret;
-                        } elseif (PEAR::isError($ret) && !isset($options['soft'])) {
-                            $this->_downloader->log(0, $ret->getMessage());
-                        }
-                    }
-                } else {
-                    $ret = $this->_detect2Dep($group[$packagetype], $pname,
-                        'dependency group "' .
-                        $group['attribs']['name'] . '"', $params);
-                    if (is_array($ret)) {
-                        $this->_downloadDeps[] = $ret;
-                    } elseif (PEAR::isError($ret) && !isset($options['soft'])) {
-                        $this->_downloader->log(0, $ret->getMessage());
-                    }
-                }
-            }
-        }
-    }
-
-    function _detect2Dep($dep, $pname, $group, $params)
-    {
-        if (isset($dep['conflicts'])) {
-            return true;
-        }
-
-        $options = $this->_downloader->getOptions();
-        if (isset($dep['uri'])) {
-            return array('uri' => $dep['uri'], 'dep' => $dep);;
-        }
-
-        $testdep = $dep;
-        $testdep['package'] = $dep['name'];
-        if (PEAR_Downloader_Package::willDownload($testdep, $params)) {
-            $dep['package'] = $dep['name'];
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group .
-                    ' dependency "' .
-                    $this->_registry->parsedPackageNameToString($dep, true) .
-                    '", will be installed');
-            }
-            return false;
-        }
-
-        $options = $this->_downloader->getOptions();
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        if ($this->_explicitState) {
-            $pname['state'] = $this->_explicitState;
-        }
-
-        $url = $this->_downloader->_getDepPackageDownloadUrl($dep, $pname);
-        if (PEAR::isError($url)) {
-            PEAR::popErrorHandling();
-            return $url;
-        }
-
-        $dep['package'] = $dep['name'];
-        $ret = $this->_analyzeDownloadURL($url, 'dependency', $dep, $params, $group == 'optional' &&
-            !isset($options['alldeps']), true);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($ret)) {
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(0, $ret->getMessage());
-            }
-
-            return false;
-        }
-
-        // check to see if a dep is already installed and is the same or newer
-        if (!isset($dep['min']) && !isset($dep['max']) && !isset($dep['recommended'])) {
-            $oper = 'has';
-        } else {
-            $oper = 'gt';
-        }
-
-        // do not try to move this before getDepPackageDownloadURL
-        // we can't determine whether upgrade is necessary until we know what
-        // version would be downloaded
-        if (!isset($options['force']) && $this->isInstalled($ret, $oper)) {
-            $version = $this->_installRegistry->packageInfo($dep['name'], 'version', $dep['channel']);
-            $dep['package'] = $dep['name'];
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(3, $this->getShortName() . ': Skipping ' . $group .
-                    ' dependency "' .
-                $this->_registry->parsedPackageNameToString($dep, true) .
-                    '" version ' . $url['version'] . ', already installed as version ' .
-                    $version);
-            }
-
-            return false;
-        }
-
-        if (isset($dep['nodefault'])) {
-            $ret['nodefault'] = true;
-        }
-
-        return $ret;
-    }
-
-    function _detect1($deps, $pname, $options, $params)
-    {
-        $this->_downloadDeps = array();
-        $skipnames = array();
-        foreach ($deps as $dep) {
-            $nodownload = false;
-            if (isset ($dep['type']) && $dep['type'] === 'pkg') {
-                $dep['channel'] = 'pear.php.net';
-                $dep['package'] = $dep['name'];
-                switch ($dep['rel']) {
-                    case 'not' :
-                        continue 2;
-                    case 'ge' :
-                    case 'eq' :
-                    case 'gt' :
-                    case 'has' :
-                        $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                            'required' :
-                            'optional';
-                        if (PEAR_Downloader_Package::willDownload($dep, $params)) {
-                            $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group
-                                . ' dependency "' .
-                                $this->_registry->parsedPackageNameToString($dep, true) .
-                                '", will be installed');
-                            continue 2;
-                        }
-                        $fakedp = new PEAR_PackageFile_v1;
-                        $fakedp->setPackage($dep['name']);
-                        // skip internet check if we are not upgrading (bug #5810)
-                        if (!isset($options['upgrade']) && $this->isInstalled(
-                              $fakedp, $dep['rel'])) {
-                            $this->_downloader->log(2, $this->getShortName() . ': Skipping ' . $group
-                                . ' dependency "' .
-                                $this->_registry->parsedPackageNameToString($dep, true) .
-                                '", is already installed');
-                            continue 2;
-                        }
-                }
-
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if ($this->_explicitState) {
-                    $pname['state'] = $this->_explicitState;
-                }
-
-                $url = $this->_downloader->_getDepPackageDownloadUrl($dep, $pname);
-                $chan = 'pear.php.net';
-                if (PEAR::isError($url)) {
-                    // check to see if this is a pecl package that has jumped
-                    // from pear.php.net to pecl.php.net channel
-                    if (!class_exists('PEAR_Dependency2')) {
-                        require_once 'PEAR/Dependency2.php';
-                    }
-
-                    $newdep = PEAR_Dependency2::normalizeDep($dep);
-                    $newdep = $newdep[0];
-                    $newdep['channel'] = 'pecl.php.net';
-                    $chan = 'pecl.php.net';
-                    $url = $this->_downloader->_getDepPackageDownloadUrl($newdep, $pname);
-                    $obj = &$this->_installRegistry->getPackage($dep['name']);
-                    if (PEAR::isError($url)) {
-                        PEAR::popErrorHandling();
-                        if ($obj !== null && $this->isInstalled($obj, $dep['rel'])) {
-                            $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                                'required' :
-                                'optional';
-                            $dep['package'] = $dep['name'];
-                            if (!isset($options['soft'])) {
-                                $this->_downloader->log(3, $this->getShortName() .
-                                    ': Skipping ' . $group . ' dependency "' .
-                                    $this->_registry->parsedPackageNameToString($dep, true) .
-                                    '", already installed as version ' . $obj->getVersion());
-                            }
-                            $skip = count($skipnames) ?
-                                $skipnames[count($skipnames) - 1] : '';
-                            if ($skip ==
-                                  $this->_registry->parsedPackageNameToString($dep, true)) {
-                                array_pop($skipnames);
-                            }
-                            continue;
-                        } else {
-                            if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                                $this->_downloader->log(2, $this->getShortName() .
-                                    ': Skipping optional dependency "' .
-                                    $this->_registry->parsedPackageNameToString($dep, true) .
-                                    '", no releases exist');
-                                continue;
-                            } else {
-                                return $url;
-                            }
-                        }
-                    }
-                }
-
-                PEAR::popErrorHandling();
-                if (!isset($options['alldeps'])) {
-                    if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                                $this->getShortName() .
-                                '" optional dependency "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $chan, 'package' =>
-                                    $dep['name']), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString(
-                                array('channel' => $chan, 'package' =>
-                                $dep['name']), true);
-                        $nodownload = true;
-                    }
-                }
-
-                if (!isset($options['alldeps']) && !isset($options['onlyreqdeps'])) {
-                    if (!isset($dep['optional']) || $dep['optional'] == 'no') {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(3, 'Notice: package "' .
-                                $this->getShortName() .
-                                '" required dependency "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $chan, 'package' =>
-                                    $dep['name']), true) .
-                                '" will not be automatically downloaded');
-                        }
-                        $skipnames[] = $this->_registry->parsedPackageNameToString(
-                                array('channel' => $chan, 'package' =>
-                                $dep['name']), true);
-                        $nodownload = true;
-                    }
-                }
-
-                // check to see if a dep is already installed
-                // do not try to move this before getDepPackageDownloadURL
-                // we can't determine whether upgrade is necessary until we know what
-                // version would be downloaded
-                if (!isset($options['force']) && $this->isInstalled(
-                        $url, $dep['rel'])) {
-                    $group = (!isset($dep['optional']) || $dep['optional'] == 'no') ?
-                        'required' :
-                        'optional';
-                    $dep['package'] = $dep['name'];
-                    if (isset($newdep)) {
-                        $version = $this->_installRegistry->packageInfo($newdep['name'], 'version', $newdep['channel']);
-                    } else {
-                        $version = $this->_installRegistry->packageInfo($dep['name'], 'version');
-                    }
-
-                    $dep['version'] = $url['version'];
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(3, $this->getShortName() . ': Skipping ' . $group .
-                            ' dependency "' .
-                            $this->_registry->parsedPackageNameToString($dep, true) .
-                            '", already installed as version ' . $version);
-                    }
-
-                    $skip = count($skipnames) ?
-                        $skipnames[count($skipnames) - 1] : '';
-                    if ($skip ==
-                          $this->_registry->parsedPackageNameToString($dep, true)) {
-                        array_pop($skipnames);
-                    }
-
-                    continue;
-                }
-
-                if ($nodownload) {
-                    continue;
-                }
-
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if (isset($newdep)) {
-                    $dep = $newdep;
-                }
-
-                $dep['package'] = $dep['name'];
-                $ret = $this->_analyzeDownloadURL($url, 'dependency', $dep, $params,
-                    isset($dep['optional']) && $dep['optional'] == 'yes' &&
-                    !isset($options['alldeps']), true);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($ret)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $ret->getMessage());
-                    }
-                    continue;
-                }
-
-                $this->_downloadDeps[] = $ret;
-            }
-        }
-
-        if (count($skipnames)) {
-            if (!isset($options['soft'])) {
-                $this->_downloader->log(1, 'Did not download dependencies: ' .
-                    implode(', ', $skipnames) .
-                    ', use --alldeps or --onlyreqdeps to download automatically');
-            }
-        }
-    }
-
-    function setDownloadURL($pkg)
-    {
-        $this->_downloadURL = $pkg;
-    }
-
-    /**
-     * Set the package.xml object for this downloaded package
-     *
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2 $pkg
-     */
-    function setPackageFile(&$pkg)
-    {
-        $this->_packagefile = &$pkg;
-    }
-
-    function getShortName()
-    {
-        return $this->_registry->parsedPackageNameToString(array('channel' => $this->getChannel(),
-            'package' => $this->getPackage()), true);
-    }
-
-    function getParsedPackage()
-    {
-        if (isset($this->_packagefile) || isset($this->_parsedname)) {
-            return array('channel' => $this->getChannel(),
-                'package' => $this->getPackage(),
-                'version' => $this->getVersion());
-        }
-
-        return false;
-    }
-
-    function getDownloadURL()
-    {
-        return $this->_downloadURL;
-    }
-
-    function canDefault()
-    {
-        if (isset($this->_downloadURL) && isset($this->_downloadURL['nodefault'])) {
-            return false;
-        }
-
-        return true;
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackage();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackage();
-        }
-
-        return false;
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function isSubpackage(&$pf)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isSubpackage($pf);
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->isSubpackage($pf);
-        }
-
-        return false;
-    }
-
-    function getPackageType()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackageType();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackageType();
-        }
-
-        return false;
-    }
-
-    function isBundle()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackageType() == 'bundle';
-        }
-
-        return false;
-    }
-
-    function getPackageXmlVersion()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getPackagexmlVersion();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getPackagexmlVersion();
-        }
-
-        return '1.0';
-    }
-
-    function getChannel()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getChannel();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getChannel();
-        }
-
-        return false;
-    }
-
-    function getURI()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getURI();
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getURI();
-        }
-
-        return false;
-    }
-
-    function getVersion()
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->getVersion();
-        } elseif (isset($this->_downloadURL['version'])) {
-            return $this->_downloadURL['version'];
-        }
-
-        return false;
-    }
-
-    function isCompatible($pf)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isCompatible($pf);
-        } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->isCompatible($pf);
-        }
-
-        return true;
-    }
-
-    function setGroup($group)
-    {
-        $this->_parsedname['group'] = $group;
-    }
-
-    function getGroup()
-    {
-        if (isset($this->_parsedname['group'])) {
-            return $this->_parsedname['group'];
-        }
-
-        return '';
-    }
-
-    function isExtension($name)
-    {
-        if (isset($this->_packagefile)) {
-            return $this->_packagefile->isExtension($name);
-        } elseif (isset($this->_downloadURL['info'])) {
-            if ($this->_downloadURL['info']->getPackagexmlVersion() == '2.0') {
-                return $this->_downloadURL['info']->getProvidesExtension() == $name;
-            }
-
-            return false;
-        }
-
-        return false;
-    }
-
-    function getDeps()
-    {
-        if (isset($this->_packagefile)) {
-            $ver = $this->_packagefile->getPackagexmlVersion();
-            if (version_compare($ver, '2.0', '>=')) {
-                return $this->_packagefile->getDeps(true);
-            }
-
-            return $this->_packagefile->getDeps();
-        } elseif (isset($this->_downloadURL['info'])) {
-            $ver = $this->_downloadURL['info']->getPackagexmlVersion();
-            if (version_compare($ver, '2.0', '>=')) {
-                return $this->_downloadURL['info']->getDeps(true);
-            }
-
-            return $this->_downloadURL['info']->getDeps();
-        }
-
-        return array();
-    }
-
-    /**
-     * @param array Parsed array from {@link PEAR_Registry::parsePackageName()} or a dependency
-     *                     returned from getDepDownloadURL()
-     */
-    function isEqual($param)
-    {
-        if (is_object($param)) {
-            $channel = $param->getChannel();
-            $package = $param->getPackage();
-            if ($param->getURI()) {
-                $param = array(
-                    'channel' => $param->getChannel(),
-                    'package' => $param->getPackage(),
-                    'version' => $param->getVersion(),
-                    'uri' => $param->getURI(),
-                );
-            } else {
-                $param = array(
-                    'channel' => $param->getChannel(),
-                    'package' => $param->getPackage(),
-                    'version' => $param->getVersion(),
-                );
-            }
-        } else {
-            if (isset($param['uri'])) {
-                if ($this->getChannel() != '__uri') {
-                    return false;
-                }
-                return $param['uri'] == $this->getURI();
-            }
-
-            $package = isset($param['package']) ? $param['package'] : $param['info']->getPackage();
-            $channel = isset($param['channel']) ? $param['channel'] : $param['info']->getChannel();
-            if (isset($param['rel'])) {
-                if (!class_exists('PEAR_Dependency2')) {
-                    require_once 'PEAR/Dependency2.php';
-                }
-
-                $newdep = PEAR_Dependency2::normalizeDep($param);
-                $newdep = $newdep[0];
-            } elseif (isset($param['min'])) {
-                $newdep = $param;
-            }
-        }
-
-        if (isset($newdep)) {
-            if (!isset($newdep['min'])) {
-                $newdep['min'] = '0';
-            }
-
-            if (!isset($newdep['max'])) {
-                $newdep['max'] = '100000000000000000000';
-            }
-
-            // use magic to support pecl packages suddenly jumping to the pecl channel
-            // we need to support both dependency possibilities
-            if ($channel == 'pear.php.net' && $this->getChannel() == 'pecl.php.net') {
-                if ($package == $this->getPackage()) {
-                    $channel = 'pecl.php.net';
-                }
-            }
-            if ($channel == 'pecl.php.net' && $this->getChannel() == 'pear.php.net') {
-                if ($package == $this->getPackage()) {
-                    $channel = 'pear.php.net';
-                }
-            }
-
-            return (strtolower($package) == strtolower($this->getPackage()) &&
-                $channel == $this->getChannel() &&
-                version_compare($newdep['min'], $this->getVersion(), '<=') &&
-                version_compare($newdep['max'], $this->getVersion(), '>='));
-        }
-
-        // use magic to support pecl packages suddenly jumping to the pecl channel
-        if ($channel == 'pecl.php.net' && $this->getChannel() == 'pear.php.net') {
-            if (strtolower($package) == strtolower($this->getPackage())) {
-                $channel = 'pear.php.net';
-            }
-        }
-
-        if (isset($param['version'])) {
-            return (strtolower($package) == strtolower($this->getPackage()) &&
-                $channel == $this->getChannel() &&
-                $param['version'] == $this->getVersion());
-        }
-
-        return strtolower($package) == strtolower($this->getPackage()) &&
-            $channel == $this->getChannel();
-    }
-
-    function isInstalled($dep, $oper = '==')
-    {
-        if (!$dep) {
-            return false;
-        }
-
-        if ($oper != 'ge' && $oper != 'gt' && $oper != 'has' && $oper != '==') {
-            return false;
-        }
-
-        if (is_object($dep)) {
-            $package = $dep->getPackage();
-            $channel = $dep->getChannel();
-            if ($dep->getURI()) {
-                $dep = array(
-                    'uri' => $dep->getURI(),
-                    'version' => $dep->getVersion(),
-                );
-            } else {
-                $dep = array(
-                    'version' => $dep->getVersion(),
-                );
-            }
-        } else {
-            if (isset($dep['uri'])) {
-                $channel = '__uri';
-                $package = $dep['dep']['name'];
-            } else {
-                $channel = $dep['info']->getChannel();
-                $package = $dep['info']->getPackage();
-            }
-        }
-
-        $options = $this->_downloader->getOptions();
-        $test    = $this->_installRegistry->packageExists($package, $channel);
-        if (!$test && $channel == 'pecl.php.net') {
-            // do magic to allow upgrading from old pecl packages to new ones
-            $test = $this->_installRegistry->packageExists($package, 'pear.php.net');
-            $channel = 'pear.php.net';
-        }
-
-        if ($test) {
-            if (isset($dep['uri'])) {
-                if ($this->_installRegistry->packageInfo($package, 'uri', '__uri') == $dep['uri']) {
-                    return true;
-                }
-            }
-
-            if (isset($options['upgrade'])) {
-                $packageVersion = $this->_installRegistry->packageInfo($package, 'version', $channel);
-                if (version_compare($packageVersion, $dep['version'], '>=')) {
-                    return true;
-                }
-
-                return false;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Detect duplicate package names with differing versions
-     *
-     * If a user requests to install Date 1.4.6 and Date 1.4.7,
-     * for instance, this is a logic error.  This method
-     * detects this situation.
-     *
-     * @param array $params array of PEAR_Downloader_Package objects
-     * @param array $errorparams empty array
-     * @return array array of stupid duplicated packages in PEAR_Downloader_Package obejcts
-     */
-    function detectStupidDuplicates($params, &$errorparams)
-    {
-        $existing = array();
-        foreach ($params as $i => $param) {
-            $package = $param->getPackage();
-            $channel = $param->getChannel();
-            $group   = $param->getGroup();
-            if (!isset($existing[$channel . '/' . $package])) {
-                $existing[$channel . '/' . $package] = array();
-            }
-
-            if (!isset($existing[$channel . '/' . $package][$group])) {
-                $existing[$channel . '/' . $package][$group] = array();
-            }
-
-            $existing[$channel . '/' . $package][$group][] = $i;
-        }
-
-        $indices = array();
-        foreach ($existing as $package => $groups) {
-            foreach ($groups as $group => $dupes) {
-                if (count($dupes) > 1) {
-                    $indices = $indices + $dupes;
-                }
-            }
-        }
-
-        $indices = array_unique($indices);
-        foreach ($indices as $index) {
-            $errorparams[] = $params[$index];
-        }
-
-        return count($errorparams);
-    }
-
-    /**
-     * @param array
-     * @param bool ignore install groups - for final removal of dupe packages
-     * @static
-     */
-    function removeDuplicates(&$params, $ignoreGroups = false)
-    {
-        $pnames = array();
-        foreach ($params as $i => $param) {
-            if (!$param) {
-                continue;
-            }
-
-            if ($param->getPackage()) {
-                $group = $ignoreGroups ? '' : $param->getGroup();
-                $pnames[$i] = $param->getChannel() . '/' .
-                    $param->getPackage() . '-' . $param->getVersion() . '#' . $group;
-            }
-        }
-
-        $pnames = array_unique($pnames);
-        $unset  = array_diff(array_keys($params), array_keys($pnames));
-        $testp  = array_flip($pnames);
-        foreach ($params as $i => $param) {
-            if (!$param) {
-                $unset[] = $i;
-                continue;
-            }
-
-            if (!is_a($param, 'PEAR_Downloader_Package')) {
-                $unset[] = $i;
-                continue;
-            }
-
-            $group = $ignoreGroups ? '' : $param->getGroup();
-            if (!isset($testp[$param->getChannel() . '/' . $param->getPackage() . '-' .
-                  $param->getVersion() . '#' . $group])) {
-                $unset[] = $i;
-            }
-        }
-
-        foreach ($unset as $i) {
-            unset($params[$i]);
-        }
-
-        $ret = array();
-        foreach ($params as $i => $param) {
-            $ret[] = &$params[$i];
-        }
-
-        $params = array();
-        foreach ($ret as $i => $param) {
-            $params[] = &$ret[$i];
-        }
-    }
-
-    function explicitState()
-    {
-        return $this->_explicitState;
-    }
-
-    function setExplicitState($s)
-    {
-        $this->_explicitState = $s;
-    }
-
-    /**
-     * @static
-     */
-    function mergeDependencies(&$params)
-    {
-        $bundles = $newparams = array();
-        foreach ($params as $i => $param) {
-            if (!$param->isBundle()) {
-                continue;
-            }
-
-            $bundles[] = $i;
-            $pf = &$param->getPackageFile();
-            $newdeps = array();
-            $contents = $pf->getBundledPackages();
-            if (!is_array($contents)) {
-                $contents = array($contents);
-            }
-
-            foreach ($contents as $file) {
-                $filecontents = $pf->getFileContents($file);
-                $dl = &$param->getDownloader();
-                $options = $dl->getOptions();
-                if (PEAR::isError($dir = $dl->getDownloadDir())) {
-                    return $dir;
-                }
-
-                $fp = @fopen($dir . DIRECTORY_SEPARATOR . $file, 'wb');
-                if (!$fp) {
-                    continue;
-                }
-
-                fwrite($fp, $filecontents, strlen($filecontents));
-                fclose($fp);
-                if ($s = $params[$i]->explicitState()) {
-                    $obj->setExplicitState($s);
-                }
-
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                if (PEAR::isError($dir = $dl->getDownloadDir())) {
-                    PEAR::popErrorHandling();
-                    return $dir;
-                }
-
-                $e = $obj->_fromFile($a = $dir . DIRECTORY_SEPARATOR . $file);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $dl->log(0, $e->getMessage());
-                    }
-                    continue;
-                }
-
-                $j = &$obj;
-                if (!PEAR_Downloader_Package::willDownload($j,
-                      array_merge($params, $newparams)) && !$param->isInstalled($j)) {
-                    $newparams[] = &$j;
-                }
-            }
-        }
-
-        foreach ($bundles as $i) {
-            unset($params[$i]); // remove bundles - only their contents matter for installation
-        }
-
-        PEAR_Downloader_Package::removeDuplicates($params); // strip any unset indices
-        if (count($newparams)) { // add in bundled packages for install
-            foreach ($newparams as $i => $unused) {
-                $params[] = &$newparams[$i];
-            }
-            $newparams = array();
-        }
-
-        foreach ($params as $i => $param) {
-            $newdeps = array();
-            foreach ($param->_downloadDeps as $dep) {
-                $merge = array_merge($params, $newparams);
-                if (!PEAR_Downloader_Package::willDownload($dep, $merge)
-                    && !$param->isInstalled($dep)
-                ) {
-                    $newdeps[] = $dep;
-                } else {
-                    //var_dump($dep);
-                    // detect versioning conflicts here
-                }
-            }
-
-            // convert the dependencies into PEAR_Downloader_Package objects for the next time around
-            $params[$i]->_downloadDeps = array();
-            foreach ($newdeps as $dep) {
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
-                if ($s = $params[$i]->explicitState()) {
-                    $obj->setExplicitState($s);
-                }
-
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $e = $obj->fromDepURL($dep);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $obj->_downloader->log(0, $e->getMessage());
-                    }
-                    continue;
-                }
-
-                $e = $obj->detectDependencies($params);
-                if (PEAR::isError($e)) {
-                    if (!isset($options['soft'])) {
-                        $obj->_downloader->log(0, $e->getMessage());
-                    }
-                }
-
-                $j = &$obj;
-                $newparams[] = &$j;
-            }
-        }
-
-        if (count($newparams)) {
-            foreach ($newparams as $i => $unused) {
-                $params[] = &$newparams[$i];
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * @static
-     */
-    function willDownload($param, $params)
-    {
-        if (!is_array($params)) {
-            return false;
-        }
-
-        foreach ($params as $obj) {
-            if ($obj->isEqual($param)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param int
-     * @param string
-     */
-    function &getPackagefileObject(&$c, $d, $t = false)
-    {
-        $a = &new PEAR_PackageFile($c, $d, $t);
-        return $a;
-    }
-
-
-    /**
-     * This will retrieve from a local file if possible, and parse out
-     * a group name as well.  The original parameter will be modified to reflect this.
-     * @param string|array can be a parsed package name as well
-     * @access private
-     */
-    function _fromFile(&$param)
-    {
-        $saveparam = $param;
-        if (is_string($param)) {
-            if (!@file_exists($param)) {
-                $test = explode('#', $param);
-                $group = array_pop($test);
-                if (@file_exists(implode('#', $test))) {
-                    $this->setGroup($group);
-                    $param = implode('#', $test);
-                    $this->_explicitGroup = true;
-                }
-            }
-
-            if (@is_file($param)) {
-                $this->_type = 'local';
-                $options = $this->_downloader->getOptions();
-                if (isset($options['downloadonly'])) {
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug);
-                } else {
-                    if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                        return $dir;
-                    }
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug, $dir);
-                }
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $pf = &$pkg->fromAnyFile($param, PEAR_VALIDATE_INSTALLING);
-                PEAR::popErrorHandling();
-                if (PEAR::isError($pf)) {
-                    $this->_valid = false;
-                    $param = $saveparam;
-                    return $pf;
-                }
-                $this->_packagefile = &$pf;
-                if (!$this->getGroup()) {
-                    $this->setGroup('default'); // install the default dependency group
-                }
-                return $this->_valid = true;
-            }
-        }
-        $param = $saveparam;
-        return $this->_valid = false;
-    }
-
-    function _fromUrl($param, $saveparam = '')
-    {
-        if (!is_array($param) && (preg_match('#^(http|https|ftp)://#', $param))) {
-            $options = $this->_downloader->getOptions();
-            $this->_type = 'url';
-            $callback = $this->_downloader->ui ?
-                array(&$this->_downloader, '_downloadCallback') : null;
-            $this->_downloader->pushErrorHandling(PEAR_ERROR_RETURN);
-            if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                $this->_downloader->popErrorHandling();
-                return $dir;
-            }
-
-            $this->_downloader->log(3, 'Downloading "' . $param . '"');
-            $file = $this->_downloader->downloadHttp($param, $this->_downloader->ui,
-                $dir, $callback, null, false, $this->getChannel());
-            $this->_downloader->popErrorHandling();
-            if (PEAR::isError($file)) {
-                if (!empty($saveparam)) {
-                    $saveparam = ", cannot download \"$saveparam\"";
-                }
-                $err = PEAR::raiseError('Could not download from "' . $param .
-                    '"' . $saveparam . ' (' . $file->getMessage() . ')');
-                    return $err;
-            }
-
-            if ($this->_rawpackagefile) {
-                require_once 'Archive/Tar.php';
-                $tar = &new Archive_Tar($file);
-                $packagexml = $tar->extractInString('package2.xml');
-                if (!$packagexml) {
-                    $packagexml = $tar->extractInString('package.xml');
-                }
-
-                if (str_replace(array("\n", "\r"), array('',''), $packagexml) !=
-                      str_replace(array("\n", "\r"), array('',''), $this->_rawpackagefile)) {
-                    if ($this->getChannel() != 'pear.php.net') {
-                        return PEAR::raiseError('CRITICAL ERROR: package.xml downloaded does ' .
-                            'not match value returned from xml-rpc');
-                    }
-
-                    // be more lax for the existing PEAR packages that have not-ok
-                    // characters in their package.xml
-                    $this->_downloader->log(0, 'CRITICAL WARNING: The "' .
-                        $this->getPackage() . '" package has invalid characters in its ' .
-                        'package.xml.  The next version of PEAR may not be able to install ' .
-                        'this package for security reasons.  Please open a bug report at ' .
-                        'http://pear.php.net/package/' . $this->getPackage() . '/bugs');
-                }
-            }
-
-            // whew, download worked!
-            if (isset($options['downloadonly'])) {
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug);
-            } else {
-                $dir = $this->_downloader->getDownloadDir();
-                if (PEAR::isError($dir)) {
-                    return $dir;
-                }
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug, $dir);
-            }
-
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $pf = &$pkg->fromAnyFile($file, PEAR_VALIDATE_INSTALLING);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($pf)) {
-                if (is_array($pf->getUserInfo())) {
-                    foreach ($pf->getUserInfo() as $err) {
-                        if (is_array($err)) {
-                            $err = $err['message'];
-                        }
-
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, "Validation Error: $err");
-                        }
-                    }
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $pf->getMessage());
-                }
-
-                ///FIXME need to pass back some error code that we can use to match with to cancel all further operations
-                /// At least stop all deps of this package from being installed
-                $out = $saveparam ? $saveparam : $param;
-                $err = PEAR::raiseError('Download of "' . $out . '" succeeded, but it is not a valid package archive');
-                $this->_valid = false;
-                return $err;
-            }
-
-            $this->_packagefile = &$pf;
-            $this->setGroup('default'); // install the default dependency group
-            return $this->_valid = true;
-        }
-
-        return $this->_valid = false;
-    }
-
-    /**
-     *
-     * @param string|array pass in an array of format
-     *                     array(
-     *                      'package' => 'pname',
-     *                     ['channel' => 'channame',]
-     *                     ['version' => 'version',]
-     *                     ['state' => 'state',])
-     *                     or a string of format [channame/]pname[-version|-state]
-     */
-    function _fromString($param)
-    {
-        $options = $this->_downloader->getOptions();
-        $channel = $this->_config->get('default_channel');
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $pname = $this->_registry->parsePackageName($param, $channel);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($pname)) {
-            if ($pname->getCode() == 'invalid') {
-                $this->_valid = false;
-                return false;
-            }
-
-            if ($pname->getCode() == 'channel') {
-                $parsed = $pname->getUserInfo();
-                if ($this->_downloader->discover($parsed['channel'])) {
-                    if ($this->_config->get('auto_discover')) {
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        $pname = $this->_registry->parsePackageName($param, $channel);
-                        PEAR::popErrorHandling();
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->_downloader->log(0, 'Channel "' . $parsed['channel'] .
-                                '" is not initialized, use ' .
-                                '"pear channel-discover ' . $parsed['channel'] . '" to initialize' .
-                                'or pear config-set auto_discover 1');
-                        }
-                    }
-                }
-
-                if (PEAR::isError($pname)) {
-                    if (!isset($options['soft'])) {
-                        $this->_downloader->log(0, $pname->getMessage());
-                    }
-
-                    if (is_array($param)) {
-                        $param = $this->_registry->parsedPackageNameToString($param);
-                    }
-
-                    $err = PEAR::raiseError('invalid package name/package file "' . $param . '"');
-                    $this->_valid = false;
-                    return $err;
-                }
-            } else {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(0, $pname->getMessage());
-                }
-
-                $err = PEAR::raiseError('invalid package name/package file "' . $param . '"');
-                $this->_valid = false;
-                return $err;
-            }
-        }
-
-        if (!isset($this->_type)) {
-            $this->_type = 'rest';
-        }
-
-        $this->_parsedname    = $pname;
-        $this->_explicitState = isset($pname['state']) ? $pname['state'] : false;
-        $this->_explicitGroup = isset($pname['group']) ? true : false;
-
-        $info = $this->_downloader->_getPackageDownloadUrl($pname);
-        if (PEAR::isError($info)) {
-            if ($info->getCode() != -976 && $pname['channel'] == 'pear.php.net') {
-                // try pecl
-                $pname['channel'] = 'pecl.php.net';
-                if ($test = $this->_downloader->_getPackageDownloadUrl($pname)) {
-                    if (!PEAR::isError($test)) {
-                        $info = PEAR::raiseError($info->getMessage() . ' - package ' .
-                            $this->_registry->parsedPackageNameToString($pname, true) .
-                            ' can be installed with "pecl install ' . $pname['package'] .
-                            '"');
-                    } else {
-                        $pname['channel'] = 'pear.php.net';
-                    }
-                } else {
-                    $pname['channel'] = 'pear.php.net';
-                }
-            }
-
-            return $info;
-        }
-
-        $this->_rawpackagefile = $info['raw'];
-        $ret = $this->_analyzeDownloadURL($info, $param, $pname);
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-
-        if ($ret) {
-            $this->_downloadURL = $ret;
-            return $this->_valid = (bool) $ret;
-        }
-    }
-
-    /**
-     * @param array output of package.getDownloadURL
-     * @param string|array|object information for detecting packages to be downloaded, and
-     *                            for errors
-     * @param array name information of the package
-     * @param array|null packages to be downloaded
-     * @param bool is this an optional dependency?
-     * @param bool is this any kind of dependency?
-     * @access private
-     */
-    function _analyzeDownloadURL($info, $param, $pname, $params = null, $optional = false,
-                                 $isdependency = false)
-    {
-        if (!is_string($param) && PEAR_Downloader_Package::willDownload($param, $params)) {
-            return false;
-        }
-
-        if ($info === false) {
-            $saveparam = !is_string($param) ? ", cannot download \"$param\"" : '';
-
-            // no releases exist
-            return PEAR::raiseError('No releases for package "' .
-                $this->_registry->parsedPackageNameToString($pname, true) . '" exist' . $saveparam);
-        }
-
-        if (strtolower($info['info']->getChannel()) != strtolower($pname['channel'])) {
-            $err = false;
-            if ($pname['channel'] == 'pecl.php.net') {
-                if ($info['info']->getChannel() != 'pear.php.net') {
-                    $err = true;
-                }
-            } elseif ($info['info']->getChannel() == 'pecl.php.net') {
-                if ($pname['channel'] != 'pear.php.net') {
-                    $err = true;
-                }
-            } else {
-                $err = true;
-            }
-
-            if ($err) {
-                return PEAR::raiseError('SECURITY ERROR: package in channel "' . $pname['channel'] .
-                    '" retrieved another channel\'s name for download! ("' .
-                    $info['info']->getChannel() . '")');
-            }
-        }
-
-        $preferred_state = $this->_config->get('preferred_state');
-        if (!isset($info['url'])) {
-            $package_version = $this->_registry->packageInfo($info['info']->getPackage(),
-            'version', $info['info']->getChannel());
-            if ($this->isInstalled($info)) {
-                if ($isdependency && version_compare($info['version'], $package_version, '<=')) {
-                    // ignore bogus errors of "failed to download dependency"
-                    // if it is already installed and the one that would be
-                    // downloaded is older or the same version (Bug #7219)
-                    return false;
-                }
-            }
-
-            if ($info['version'] === $package_version) {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(1, 'WARNING: failed to download ' . $pname['channel'] .
-                        '/' . $pname['package'] . '-' . $package_version. ', additionally the suggested version' .
-                        ' (' . $package_version . ') is the same as the locally installed one.');
-                }
-
-                return false;
-            }
-
-            if (version_compare($info['version'], $package_version, '<=')) {
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(1, 'WARNING: failed to download ' . $pname['channel'] .
-                        '/' . $pname['package'] . '-' . $package_version . ', additionally the suggested version' .
-                        ' (' . $info['version'] . ') is a lower version than the locally installed one (' . $package_version . ').');
-                }
-
-                return false;
-            }
-
-            $instead =  ', will instead download version ' . $info['version'] .
-                        ', stability "' . $info['info']->getState() . '"';
-            // releases exist, but we failed to get any
-            if (isset($this->_downloader->_options['force'])) {
-                if (isset($pname['version'])) {
-                    $vs = ', version "' . $pname['version'] . '"';
-                } elseif (isset($pname['state'])) {
-                    $vs = ', stability "' . $pname['state'] . '"';
-                } elseif ($param == 'dependency') {
-                    if (!class_exists('PEAR_Common')) {
-                        require_once 'PEAR/Common.php';
-                    }
-
-                    if (!in_array($info['info']->getState(),
-                          PEAR_Common::betterStates($preferred_state, true))) {
-                        if ($optional) {
-                            // don't spit out confusing error message
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = ' within preferred state "' . $preferred_state .
-                            '"';
-                    } else {
-                        if (!class_exists('PEAR_Dependency2')) {
-                            require_once 'PEAR/Dependency2.php';
-                        }
-
-                        if ($optional) {
-                            // don't spit out confusing error message
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = PEAR_Dependency2::_getExtraString($pname);
-                        $instead = '';
-                    }
-                } else {
-                    $vs = ' within preferred state "' . $preferred_state . '"';
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->_downloader->log(1, 'WARNING: failed to download ' . $pname['channel'] .
-                        '/' . $pname['package'] . $vs . $instead);
-                }
-
-                // download the latest release
-                return $this->_downloader->_getPackageDownloadUrl(
-                    array('package' => $pname['package'],
-                          'channel' => $pname['channel'],
-                          'version' => $info['version']));
-            } else {
-                if (isset($info['php']) && $info['php']) {
-                    $err = PEAR::raiseError('Failed to download ' .
-                        $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'],
-                                  'package' => $pname['package']),
-                                true) .
-                        ', latest release is version ' . $info['php']['v'] .
-                        ', but it requires PHP version "' .
-                        $info['php']['m'] . '", use "' .
-                        $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package'],
-                            'version' => $info['php']['v'])) . '" to install',
-                            PEAR_DOWNLOADER_PACKAGE_PHPVERSION);
-                    return $err;
-                }
-
-                // construct helpful error message
-                if (isset($pname['version'])) {
-                    $vs = ', version "' . $pname['version'] . '"';
-                } elseif (isset($pname['state'])) {
-                    $vs = ', stability "' . $pname['state'] . '"';
-                } elseif ($param == 'dependency') {
-                    if (!class_exists('PEAR_Common')) {
-                        require_once 'PEAR/Common.php';
-                    }
-
-                    if (!in_array($info['info']->getState(),
-                          PEAR_Common::betterStates($preferred_state, true))) {
-                        if ($optional) {
-                            // don't spit out confusing error message, and don't die on
-                            // optional dep failure!
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = ' within preferred state "' . $preferred_state . '"';
-                    } else {
-                        if (!class_exists('PEAR_Dependency2')) {
-                            require_once 'PEAR/Dependency2.php';
-                        }
-
-                        if ($optional) {
-                            // don't spit out confusing error message, and don't die on
-                            // optional dep failure!
-                            return $this->_downloader->_getPackageDownloadUrl(
-                                array('package' => $pname['package'],
-                                      'channel' => $pname['channel'],
-                                      'version' => $info['version']));
-                        }
-                        $vs = PEAR_Dependency2::_getExtraString($pname);
-                    }
-                } else {
-                    $vs = ' within preferred state "' . $this->_downloader->config->get('preferred_state') . '"';
-                }
-
-                $options = $this->_downloader->getOptions();
-                // this is only set by the "download-all" command
-                if (isset($options['ignorepreferred_state'])) {
-                    $err = PEAR::raiseError(
-                        'Failed to download ' . $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package']),
-                                true)
-                         . $vs .
-                        ', latest release is version ' . $info['version'] .
-                        ', stability "' . $info['info']->getState() . '", use "' .
-                        $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package'],
-                            'version' => $info['version'])) . '" to install',
-                            PEAR_DOWNLOADER_PACKAGE_STATE);
-                    return $err;
-                }
-
-                // Checks if the user has a package installed already and checks the release against
-                // the state against the installed package, this allows upgrades for packages
-                // with lower stability than the preferred_state
-                $stability = $this->_registry->packageInfo($pname['package'], 'stability', $pname['channel']);
-                if (!$this->isInstalled($info)
-                    || !in_array($info['info']->getState(), PEAR_Common::betterStates($stability['release'], true))
-                ) {
-                    $err = PEAR::raiseError(
-                        'Failed to download ' . $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package']),
-                                true)
-                         . $vs .
-                        ', latest release is version ' . $info['version'] .
-                        ', stability "' . $info['info']->getState() . '", use "' .
-                        $this->_registry->parsedPackageNameToString(
-                            array('channel' => $pname['channel'], 'package' => $pname['package'],
-                            'version' => $info['version'])) . '" to install');
-                    return $err;
-                }
-            }
-        }
-
-        if (isset($info['deprecated']) && $info['deprecated']) {
-            $this->_downloader->log(0,
-                'WARNING: "' .
-                    $this->_registry->parsedPackageNameToString(
-                            array('channel' => $info['info']->getChannel(),
-                                  'package' => $info['info']->getPackage()), true) .
-                '" is deprecated in favor of "' .
-                    $this->_registry->parsedPackageNameToString($info['deprecated'], true) .
-                '"');
-        }
-
-        return $info;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/ErrorStack.php b/airtime_mvc/library/pear/PEAR/ErrorStack.php
deleted file mode 100644
index fd6af2063..000000000
--- a/airtime_mvc/library/pear/PEAR/ErrorStack.php
+++ /dev/null
@@ -1,985 +0,0 @@
-<?php
-/**
- * Error Stack Implementation
- * 
- * This is an incredibly simple implementation of a very complex error handling
- * facility.  It contains the ability
- * to track multiple errors from multiple packages simultaneously.  In addition,
- * it can track errors of many levels, save data along with the error, context
- * information such as the exact file, line number, class and function that
- * generated the error, and if necessary, it can raise a traditional PEAR_Error.
- * It has built-in support for PEAR::Log, to log errors as they occur
- * 
- * Since version 0.2alpha, it is also possible to selectively ignore errors,
- * through the use of an error callback, see {@link pushCallback()}
- * 
- * Since version 0.3alpha, it is possible to specify the exception class
- * returned from {@link push()}
- *
- * Since version PEAR1.3.2, ErrorStack no longer instantiates an exception class.  This can
- * still be done quite handily in an error callback or by manipulating the returned array
- * @category   Debugging
- * @package    PEAR_ErrorStack
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2004-2008 Greg Beaver
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR_ErrorStack
- */
-
-/**
- * Singleton storage
- * 
- * Format:
- * <pre>
- * array(
- *  'package1' => PEAR_ErrorStack object,
- *  'package2' => PEAR_ErrorStack object,
- *  ...
- * )
- * </pre>
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_SINGLETON']
- */
-$GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] = array();
-
-/**
- * Global error callback (default)
- * 
- * This is only used if set to non-false.  * is the default callback for
- * all packages, whereas specific packages may set a default callback
- * for all instances, regardless of whether they are a singleton or not.
- *
- * To exclude non-singletons, only set the local callback for the singleton
- * @see PEAR_ErrorStack::setDefaultCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'] = array(
-    '*' => false,
-);
-
-/**
- * Global Log object (default)
- * 
- * This is only used if set to non-false.  Use to set a default log object for
- * all stacks, regardless of instantiation order or location
- * @see PEAR_ErrorStack::setDefaultLogger()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = false;
-
-/**
- * Global Overriding Callback
- * 
- * This callback will override any error callbacks that specific loggers have set.
- * Use with EXTREME caution
- * @see PEAR_ErrorStack::staticPushCallback()
- * @access private
- * @global array $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']
- */
-$GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-
-/**#@+
- * One of four possible return values from the error Callback
- * @see PEAR_ErrorStack::_errorCallback()
- */
-/**
- * If this is returned, then the error will be both pushed onto the stack
- * and logged.
- */
-define('PEAR_ERRORSTACK_PUSHANDLOG', 1);
-/**
- * If this is returned, then the error will only be pushed onto the stack,
- * and not logged.
- */
-define('PEAR_ERRORSTACK_PUSH', 2);
-/**
- * If this is returned, then the error will only be logged, but not pushed
- * onto the error stack.
- */
-define('PEAR_ERRORSTACK_LOG', 3);
-/**
- * If this is returned, then the error is completely ignored.
- */
-define('PEAR_ERRORSTACK_IGNORE', 4);
-/**
- * If this is returned, then the error is logged and die() is called.
- */
-define('PEAR_ERRORSTACK_DIE', 5);
-/**#@-*/
-
-/**
- * Error code for an attempt to instantiate a non-class as a PEAR_ErrorStack in
- * the singleton method.
- */
-define('PEAR_ERRORSTACK_ERR_NONCLASS', 1);
-
-/**
- * Error code for an attempt to pass an object into {@link PEAR_ErrorStack::getMessage()}
- * that has no __toString() method
- */
-define('PEAR_ERRORSTACK_ERR_OBJTOSTRING', 2);
-/**
- * Error Stack Implementation
- *
- * Usage:
- * <code>
- * // global error stack
- * $global_stack = &PEAR_ErrorStack::singleton('MyPackage');
- * // local error stack
- * $local_stack = new PEAR_ErrorStack('MyPackage');
- * </code>
- * @author     Greg Beaver <cellog@php.net>
- * @version    1.9.1
- * @package    PEAR_ErrorStack
- * @category   Debugging
- * @copyright  2004-2008 Greg Beaver
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR_ErrorStack
- */
-class PEAR_ErrorStack {
-    /**
-     * Errors are stored in the order that they are pushed on the stack.
-     * @since 0.4alpha Errors are no longer organized by error level.
-     * This renders pop() nearly unusable, and levels could be more easily
-     * handled in a callback anyway
-     * @var array
-     * @access private
-     */
-    var $_errors = array();
-
-    /**
-     * Storage of errors by level.
-     *
-     * Allows easy retrieval and deletion of only errors from a particular level
-     * @since PEAR 1.4.0dev
-     * @var array
-     * @access private
-     */
-    var $_errorsByLevel = array();
-
-    /**
-     * Package name this error stack represents
-     * @var string
-     * @access protected
-     */
-    var $_package;
-    
-    /**
-     * Determines whether a PEAR_Error is thrown upon every error addition
-     * @var boolean
-     * @access private
-     */
-    var $_compat = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * message from the error code, otherwise the message passed in will be
-     * used
-     * @var false|string|array
-     * @access private
-     */
-    var $_msgCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be used to generate the error
-     * context for an error.  For PHP-related errors, this will be a file
-     * and line number as retrieved from debug_backtrace(), but can be
-     * customized for other purposes.  The error might actually be in a separate
-     * configuration file, or in a database query.
-     * @var false|string|array
-     * @access protected
-     */
-    var $_contextCallback = false;
-    
-    /**
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one an PEAR_ERRORSTACK_* constant
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @var false|string|array
-     * @access protected
-     */
-    var $_errorCallback = array();
-    
-    /**
-     * PEAR::Log object for logging errors
-     * @var false|Log
-     * @access protected
-     */
-    var $_logger = false;
-    
-    /**
-     * Error messages - designed to be overridden
-     * @var array
-     * @abstract
-     */
-    var $_errorMsgs = array();
-    
-    /**
-     * Set up a new error stack
-     * 
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     */
-    function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false)
-    {
-        $this->_package = $package;
-        $this->setMessageCallback($msgCallback);
-        $this->setContextCallback($contextCallback);
-        $this->_compat = $throwPEAR_Error;
-    }
-    
-    /**
-     * Return a single error stack for this package.
-     * 
-     * Note that all parameters are ignored if the stack for package $package
-     * has already been instantiated
-     * @param string   $package name of the package this error stack represents
-     * @param callback $msgCallback callback used for error message generation
-     * @param callback $contextCallback callback used for context generation,
-     *                 defaults to {@link getFileLine()}
-     * @param boolean  $throwPEAR_Error
-     * @param string   $stackClass class to instantiate
-     * @static
-     * @return PEAR_ErrorStack
-     */
-    function &singleton($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
-    {
-        if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
-        }
-        if (!class_exists($stackClass)) {
-            if (function_exists('debug_backtrace')) {
-                $trace = debug_backtrace();
-            }
-            PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_NONCLASS,
-                'exception', array('stackclass' => $stackClass),
-                'stack class "%stackclass%" is not a valid class name (should be like PEAR_ErrorStack)',
-                false, $trace);
-        }
-        $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package] =
-            new $stackClass($package, $msgCallback, $contextCallback, $throwPEAR_Error);
-
-        return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
-    }
-
-    /**
-     * Internal error handler for PEAR_ErrorStack class
-     * 
-     * Dies if the error is an exception (and would have died anyway)
-     * @access private
-     */
-    function _handleError($err)
-    {
-        if ($err['level'] == 'exception') {
-            $message = $err['message'];
-            if (isset($_SERVER['REQUEST_URI'])) {
-                echo '<br />';
-            } else {
-                echo "\n";
-            }
-            var_dump($err['context']);
-            die($message);
-        }
-    }
-    
-    /**
-     * Set up a PEAR::Log object for all error stacks that don't have one
-     * @param Log $log 
-     * @static
-     */
-    function setDefaultLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-        } elseif (is_callable($log)) {
-            $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-	}
-    }
-    
-    /**
-     * Set up a PEAR::Log object for this error stack
-     * @param Log $log 
-     */
-    function setLogger(&$log)
-    {
-        if (is_object($log) && method_exists($log, 'log') ) {
-            $this->_logger = &$log;
-        } elseif (is_callable($log)) {
-            $this->_logger = &$log;
-        }
-    }
-    
-    /**
-     * Set an error code => error message mapping callback
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for any instance
-     * @param array|string Callback function/method
-     */
-    function setMessageCallback($msgCallback)
-    {
-        if (!$msgCallback) {
-            $this->_msgCallback = array(&$this, 'getErrorMessage');
-        } else {
-            if (is_callable($msgCallback)) {
-                $this->_msgCallback = $msgCallback;
-            }
-        }
-    }
-    
-    /**
-     * Get an error code => error message mapping callback
-     * 
-     * This method returns the current callback that can be used to generate error
-     * messages
-     * @return array|string|false Callback function/method or false if none
-     */
-    function getMessageCallback()
-    {
-        return $this->_msgCallback;
-    }
-    
-    /**
-     * Sets a default callback to be used by all error stacks
-     * 
-     * This method sets the callback that can be used to generate error
-     * messages for a singleton
-     * @param array|string Callback function/method
-     * @param string Package name, or false for all packages
-     * @static
-     */
-    function setDefaultCallback($callback = false, $package = false)
-    {
-        if (!is_callable($callback)) {
-            $callback = false;
-        }
-        $package = $package ? $package : '*';
-        $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$package] = $callback;
-    }
-    
-    /**
-     * Set a callback that generates context information (location of error) for an error stack
-     * 
-     * This method sets the callback that can be used to generate context
-     * information for an error.  Passing in NULL will disable context generation
-     * and remove the expensive call to debug_backtrace()
-     * @param array|string|null Callback function/method
-     */
-    function setContextCallback($contextCallback)
-    {
-        if ($contextCallback === null) {
-            return $this->_contextCallback = false;
-        }
-        if (!$contextCallback) {
-            $this->_contextCallback = array(&$this, 'getFileLine');
-        } else {
-            if (is_callable($contextCallback)) {
-                $this->_contextCallback = $contextCallback;
-            }
-        }
-    }
-    
-    /**
-     * Set an error Callback
-     * If set to a valid callback, this will be called every time an error
-     * is pushed onto the stack.  The return value will be used to determine
-     * whether to allow an error to be pushed or logged.
-     * 
-     * The return value must be one of the ERRORSTACK_* constants.
-     * 
-     * This functionality can be used to emulate PEAR's pushErrorHandling, and
-     * the PEAR_ERROR_CALLBACK mode, without affecting the integrity of
-     * the error stack or logging
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see popCallback()
-     * @param string|array $cb
-     */
-    function pushCallback($cb)
-    {
-        array_push($this->_errorCallback, $cb);
-    }
-    
-    /**
-     * Remove a callback from the error callback stack
-     * @see pushCallback()
-     * @return array|string|false
-     */
-    function popCallback()
-    {
-        if (!count($this->_errorCallback)) {
-            return false;
-        }
-        return array_pop($this->_errorCallback);
-    }
-    
-    /**
-     * Set a temporary overriding error callback for every package error stack
-     *
-     * Use this to temporarily disable all existing callbacks (can be used
-     * to emulate the @ operator, for instance)
-     * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
-     * @see staticPopCallback(), pushCallback()
-     * @param string|array $cb
-     * @static
-     */
-    function staticPushCallback($cb)
-    {
-        array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
-    }
-    
-    /**
-     * Remove a temporary overriding error callback
-     * @see staticPushCallback()
-     * @return array|string|false
-     * @static
-     */
-    function staticPopCallback()
-    {
-        $ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
-        if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
-            $GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'] = array();
-        }
-        return $ret;
-    }
-    
-    /**
-     * Add an error to the stack
-     * 
-     * If the message generator exists, it is called with 2 parameters.
-     *  - the current Error Stack object
-     *  - an array that is in the same format as an error.  Available indices
-     *    are 'code', 'package', 'time', 'params', 'level', and 'context'
-     * 
-     * Next, if the error should contain context information, this is
-     * handled by the context grabbing method.
-     * Finally, the error is pushed onto the proper error stack
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
-     * thrown.  If a PEAR_Error is returned, the userinfo
-     * property is set to the following array:
-     * 
-     * <code>
-     * array(
-     *    'code' => $code,
-     *    'params' => $params,
-     *    'package' => $this->_package,
-     *    'level' => $level,
-     *    'time' => time(),
-     *    'context' => $context,
-     *    'message' => $msg,
-     * //['repackage' => $err] repackaged error array/Exception class
-     * );
-     * </code>
-     * 
-     * Normally, the previous array is returned.
-     */
-    function push($code, $level = 'error', $params = array(), $msg = false,
-                  $repackage = false, $backtrace = false)
-    {
-        $context = false;
-        // grab error context
-        if ($this->_contextCallback) {
-            if (!$backtrace) {
-                $backtrace = debug_backtrace();
-            }
-            $context = call_user_func($this->_contextCallback, $code, $params, $backtrace);
-        }
-        
-        // save error
-        $time = explode(' ', microtime());
-        $time = $time[1] + $time[0];
-        $err = array(
-                'code' => $code,
-                'params' => $params,
-                'package' => $this->_package,
-                'level' => $level,
-                'time' => $time,
-                'context' => $context,
-                'message' => $msg,
-               );
-
-        if ($repackage) {
-            $err['repackage'] = $repackage;
-        }
-
-        // set up the error message, if necessary
-        if ($this->_msgCallback) {
-            $msg = call_user_func_array($this->_msgCallback,
-                                        array(&$this, $err));
-            $err['message'] = $msg;
-        }        
-        $push = $log = true;
-        $die = false;
-        // try the overriding callback first
-        $callback = $this->staticPopCallback();
-        if ($callback) {
-            $this->staticPushCallback($callback);
-        }
-        if (!is_callable($callback)) {
-            // try the local callback next
-            $callback = $this->popCallback();
-            if (is_callable($callback)) {
-                $this->pushCallback($callback);
-            } else {
-                // try the default callback
-                $callback = isset($GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package]) ?
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK'][$this->_package] :
-                    $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_CALLBACK']['*'];
-            }
-        }
-        if (is_callable($callback)) {
-            switch(call_user_func($callback, $err)){
-            	case PEAR_ERRORSTACK_IGNORE: 
-            		return $err;
-        		break;
-            	case PEAR_ERRORSTACK_PUSH: 
-            		$log = false;
-        		break;
-            	case PEAR_ERRORSTACK_LOG: 
-            		$push = false;
-        		break;
-            	case PEAR_ERRORSTACK_DIE: 
-            		$die = true;
-        		break;
-                // anything else returned has the same effect as pushandlog
-            }
-        }
-        if ($push) {
-            array_unshift($this->_errors, $err);
-            if (!isset($this->_errorsByLevel[$err['level']])) {
-                $this->_errorsByLevel[$err['level']] = array();
-            }
-            $this->_errorsByLevel[$err['level']][] = &$this->_errors[0];
-        }
-        if ($log) {
-            if ($this->_logger || $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER']) {
-                $this->_log($err);
-            }
-        }
-        if ($die) {
-            die();
-        }
-        if ($this->_compat && $push) {
-            return $this->raiseError($msg, $code, null, null, $err);
-        }
-        return $err;
-    }
-    
-    /**
-     * Static version of {@link push()}
-     * 
-     * @param string $package   Package name this error belongs to
-     * @param int    $code      Package-specific error code
-     * @param string $level     Error level.  This is NOT spell-checked
-     * @param array  $params    associative array of error parameters
-     * @param string $msg       Error message, or a portion of it if the message
-     *                          is to be generated
-     * @param array  $repackage If this error re-packages an error pushed by
-     *                          another package, place the array returned from
-     *                          {@link pop()} in this parameter
-     * @param array  $backtrace Protected parameter: use this to pass in the
-     *                          {@link debug_backtrace()} that should be used
-     *                          to find error context
-     * @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
-     *                          thrown.  see docs for {@link push()}
-     * @static
-     */
-    function staticPush($package, $code, $level = 'error', $params = array(),
-                        $msg = false, $repackage = false, $backtrace = false)
-    {
-        $s = &PEAR_ErrorStack::singleton($package);
-        if ($s->_contextCallback) {
-            if (!$backtrace) {
-                if (function_exists('debug_backtrace')) {
-                    $backtrace = debug_backtrace();
-                }
-            }
-        }
-        return $s->push($code, $level, $params, $msg, $repackage, $backtrace);
-    }
-    
-    /**
-     * Log an error using PEAR::Log
-     * @param array $err Error array
-     * @param array $levels Error level => Log constant map
-     * @access protected
-     */
-    function _log($err)
-    {
-        if ($this->_logger) {
-            $logger = &$this->_logger;
-        } else {
-            $logger = &$GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'];
-        }
-        if (is_a($logger, 'Log')) {
-            $levels = array(
-                'exception' => PEAR_LOG_CRIT,
-                'alert' => PEAR_LOG_ALERT,
-                'critical' => PEAR_LOG_CRIT,
-                'error' => PEAR_LOG_ERR,
-                'warning' => PEAR_LOG_WARNING,
-                'notice' => PEAR_LOG_NOTICE,
-                'info' => PEAR_LOG_INFO,
-                'debug' => PEAR_LOG_DEBUG);
-            if (isset($levels[$err['level']])) {
-                $level = $levels[$err['level']];
-            } else {
-                $level = PEAR_LOG_INFO;
-            }
-            $logger->log($err['message'], $level, $err);
-        } else { // support non-standard logs
-            call_user_func($logger, $err);
-        }
-    }
-
-    
-    /**
-     * Pop an error off of the error stack
-     * 
-     * @return false|array
-     * @since 0.4alpha it is no longer possible to specify a specific error
-     * level to return - the last error pushed will be returned, instead
-     */
-    function pop()
-    {
-        $err = @array_shift($this->_errors);
-        if (!is_null($err)) {
-            @array_pop($this->_errorsByLevel[$err['level']]);
-            if (!count($this->_errorsByLevel[$err['level']])) {
-                unset($this->_errorsByLevel[$err['level']]);
-            }
-        }
-        return $err;
-    }
-
-    /**
-     * Pop an error off of the error stack, static method
-     *
-     * @param string package name
-     * @return boolean
-     * @since PEAR1.5.0a1
-     */
-    function staticPop($package)
-    {
-        if ($package) {
-            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-                return false;
-            }
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->pop();
-        }
-    }
-
-    /**
-     * Determine whether there are any errors on the stack
-     * @param string|array Level name.  Use to determine if any errors
-     * of level (string), or levels (array) have been pushed
-     * @return boolean
-     */
-    function hasErrors($level = false)
-    {
-        if ($level) {
-            return isset($this->_errorsByLevel[$level]);
-        }
-        return count($this->_errors);
-    }
-    
-    /**
-     * Retrieve all errors since last purge
-     * 
-     * @param boolean set in order to empty the error stack
-     * @param string level name, to return only errors of a particular severity
-     * @return array
-     */
-    function getErrors($purge = false, $level = false)
-    {
-        if (!$purge) {
-            if ($level) {
-                if (!isset($this->_errorsByLevel[$level])) {
-                    return array();
-                } else {
-                    return $this->_errorsByLevel[$level];
-                }
-            } else {
-                return $this->_errors;
-            }
-        }
-        if ($level) {
-            $ret = $this->_errorsByLevel[$level];
-            foreach ($this->_errorsByLevel[$level] as $i => $unused) {
-                // entries are references to the $_errors array
-                $this->_errorsByLevel[$level][$i] = false;
-            }
-            // array_filter removes all entries === false
-            $this->_errors = array_filter($this->_errors);
-            unset($this->_errorsByLevel[$level]);
-            return $ret;
-        }
-        $ret = $this->_errors;
-        $this->_errors = array();
-        $this->_errorsByLevel = array();
-        return $ret;
-    }
-    
-    /**
-     * Determine whether there are any errors on a single error stack, or on any error stack
-     *
-     * The optional parameter can be used to test the existence of any errors without the need of
-     * singleton instantiation
-     * @param string|false Package name to check for errors
-     * @param string Level name to check for a particular severity
-     * @return boolean
-     * @static
-     */
-    function staticHasErrors($package = false, $level = false)
-    {
-        if ($package) {
-            if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
-                return false;
-            }
-            return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->hasErrors($level);
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            if ($obj->hasErrors($level)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Get a list of all errors since last purge, organized by package
-     * @since PEAR 1.4.0dev BC break! $level is now in the place $merge used to be
-     * @param boolean $purge Set to purge the error stack of existing errors
-     * @param string  $level Set to a level name in order to retrieve only errors of a particular level
-     * @param boolean $merge Set to return a flat array, not organized by package
-     * @param array   $sortfunc Function used to sort a merged array - default
-     *        sorts by time, and should be good for most cases
-     * @static
-     * @return array 
-     */
-    function staticGetErrors($purge = false, $level = false, $merge = false,
-                             $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
-    {
-        $ret = array();
-        if (!is_callable($sortfunc)) {
-            $sortfunc = array('PEAR_ErrorStack', '_sortErrors');
-        }
-        foreach ($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'] as $package => $obj) {
-            $test = $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package]->getErrors($purge, $level);
-            if ($test) {
-                if ($merge) {
-                    $ret = array_merge($ret, $test);
-                } else {
-                    $ret[$package] = $test;
-                }
-            }
-        }
-        if ($merge) {
-            usort($ret, $sortfunc);
-        }
-        return $ret;
-    }
-    
-    /**
-     * Error sorting function, sorts by time
-     * @access private
-     */
-    function _sortErrors($a, $b)
-    {
-        if ($a['time'] == $b['time']) {
-            return 0;
-        }
-        if ($a['time'] < $b['time']) {
-            return 1;
-        }
-        return -1;
-    }
-
-    /**
-     * Standard file/line number/function/class context callback
-     *
-     * This function uses a backtrace generated from {@link debug_backtrace()}
-     * and so will not work at all in PHP < 4.3.0.  The frame should
-     * reference the frame that contains the source of the error.
-     * @return array|false either array('file' => file, 'line' => line,
-     *         'function' => function name, 'class' => class name) or
-     *         if this doesn't work, then false
-     * @param unused
-     * @param integer backtrace frame.
-     * @param array Results of debug_backtrace()
-     * @static
-     */
-    function getFileLine($code, $params, $backtrace = null)
-    {
-        if ($backtrace === null) {
-            return false;
-        }
-        $frame = 0;
-        $functionframe = 1;
-        if (!isset($backtrace[1])) {
-            $functionframe = 0;
-        } else {
-            while (isset($backtrace[$functionframe]['function']) &&
-                  $backtrace[$functionframe]['function'] == 'eval' &&
-                  isset($backtrace[$functionframe + 1])) {
-                $functionframe++;
-            }
-        }
-        if (isset($backtrace[$frame])) {
-            if (!isset($backtrace[$frame]['file'])) {
-                $frame++;
-            }
-            $funcbacktrace = $backtrace[$functionframe];
-            $filebacktrace = $backtrace[$frame];
-            $ret = array('file' => $filebacktrace['file'],
-                         'line' => $filebacktrace['line']);
-            // rearrange for eval'd code or create function errors
-            if (strpos($filebacktrace['file'], '(') && 
-            	  preg_match(';^(.*?)\((\d+)\) : (.*?)\\z;', $filebacktrace['file'],
-                  $matches)) {
-                $ret['file'] = $matches[1];
-                $ret['line'] = $matches[2] + 0;
-            }
-            if (isset($funcbacktrace['function']) && isset($backtrace[1])) {
-                if ($funcbacktrace['function'] != 'eval') {
-                    if ($funcbacktrace['function'] == '__lambda_func') {
-                        $ret['function'] = 'create_function() code';
-                    } else {
-                        $ret['function'] = $funcbacktrace['function'];
-                    }
-                }
-            }
-            if (isset($funcbacktrace['class']) && isset($backtrace[1])) {
-                $ret['class'] = $funcbacktrace['class'];
-            }
-            return $ret;
-        }
-        return false;
-    }
-    
-    /**
-     * Standard error message generation callback
-     * 
-     * This method may also be called by a custom error message generator
-     * to fill in template values from the params array, simply
-     * set the third parameter to the error message template string to use
-     * 
-     * The special variable %__msg% is reserved: use it only to specify
-     * where a message passed in by the user should be placed in the template,
-     * like so:
-     * 
-     * Error message: %msg% - internal error
-     * 
-     * If the message passed like so:
-     * 
-     * <code>
-     * $stack->push(ERROR_CODE, 'error', array(), 'server error 500');
-     * </code>
-     * 
-     * The returned error message will be "Error message: server error 500 -
-     * internal error"
-     * @param PEAR_ErrorStack
-     * @param array
-     * @param string|false Pre-generated error message template
-     * @static
-     * @return string
-     */
-    function getErrorMessage(&$stack, $err, $template = false)
-    {
-        if ($template) {
-            $mainmsg = $template;
-        } else {
-            $mainmsg = $stack->getErrorMessageTemplate($err['code']);
-        }
-        $mainmsg = str_replace('%__msg%', $err['message'], $mainmsg);
-        if (is_array($err['params']) && count($err['params'])) {
-            foreach ($err['params'] as $name => $val) {
-                if (is_array($val)) {
-                    // @ is needed in case $val is a multi-dimensional array
-                    $val = @implode(', ', $val);
-                }
-                if (is_object($val)) {
-                    if (method_exists($val, '__toString')) {
-                        $val = $val->__toString();
-                    } else {
-                        PEAR_ErrorStack::staticPush('PEAR_ErrorStack', PEAR_ERRORSTACK_ERR_OBJTOSTRING,
-                            'warning', array('obj' => get_class($val)),
-                            'object %obj% passed into getErrorMessage, but has no __toString() method');
-                        $val = 'Object';
-                    }
-                }
-                $mainmsg = str_replace('%' . $name . '%', $val, $mainmsg);
-            }
-        }
-        return $mainmsg;
-    }
-    
-    /**
-     * Standard Error Message Template generator from code
-     * @return string
-     */
-    function getErrorMessageTemplate($code)
-    {
-        if (!isset($this->_errorMsgs[$code])) {
-            return '%__msg%';
-        }
-        return $this->_errorMsgs[$code];
-    }
-    
-    /**
-     * Set the Error Message Template array
-     * 
-     * The array format must be:
-     * <pre>
-     * array(error code => 'message template',...)
-     * </pre>
-     * 
-     * Error message parameters passed into {@link push()} will be used as input
-     * for the error message.  If the template is 'message %foo% was %bar%', and the
-     * parameters are array('foo' => 'one', 'bar' => 'six'), the error message returned will
-     * be 'message one was six'
-     * @return string
-     */
-    function setErrorMessageTemplate($template)
-    {
-        $this->_errorMsgs = $template;
-    }
-    
-    
-    /**
-     * emulate PEAR::raiseError()
-     * 
-     * @return PEAR_Error
-     */
-    function raiseError()
-    {
-        require_once 'PEAR.php';
-        $args = func_get_args();
-        return call_user_func_array(array('PEAR', 'raiseError'), $args);
-    }
-}
-$stack = &PEAR_ErrorStack::singleton('PEAR_ErrorStack');
-$stack->pushCallback(array('PEAR_ErrorStack', '_handleError'));
-?>
diff --git a/airtime_mvc/library/pear/PEAR/Exception.php b/airtime_mvc/library/pear/PEAR/Exception.php
deleted file mode 100644
index 77743ef21..000000000
--- a/airtime_mvc/library/pear/PEAR/Exception.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 foldmethod=marker: */
-/**
- * PEAR_Exception
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Hans Lellelid <hans@velum.net>
- * @author     Bertrand Mansion <bmansion@mamasam.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Exception.php 296939 2010-03-27 16:24:43Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.3
- */
-
-
-/**
- * Base PEAR_Exception Class
- *
- * 1) Features:
- *
- * - Nestable exceptions (throw new PEAR_Exception($msg, $prev_exception))
- * - Definable triggers, shot when exceptions occur
- * - Pretty and informative error messages
- * - Added more context info available (like class, method or cause)
- * - cause can be a PEAR_Exception or an array of mixed
- *   PEAR_Exceptions/PEAR_ErrorStack warnings
- * - callbacks for specific exception classes and their children
- *
- * 2) Ideas:
- *
- * - Maybe a way to define a 'template' for the output
- *
- * 3) Inherited properties from PHP Exception Class:
- *
- * protected $message
- * protected $code
- * protected $line
- * protected $file
- * private   $trace
- *
- * 4) Inherited methods from PHP Exception Class:
- *
- * __clone
- * __construct
- * getMessage
- * getCode
- * getFile
- * getLine
- * getTraceSafe
- * getTraceSafeAsString
- * __toString
- *
- * 5) Usage example
- *
- * <code>
- *  require_once 'PEAR/Exception.php';
- *
- *  class Test {
- *     function foo() {
- *         throw new PEAR_Exception('Error Message', ERROR_CODE);
- *     }
- *  }
- *
- *  function myLogger($pear_exception) {
- *     echo $pear_exception->getMessage();
- *  }
- *  // each time a exception is thrown the 'myLogger' will be called
- *  // (its use is completely optional)
- *  PEAR_Exception::addObserver('myLogger');
- *  $test = new Test;
- *  try {
- *     $test->foo();
- *  } catch (PEAR_Exception $e) {
- *     print $e;
- *  }
- * </code>
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Hans Lellelid <hans@velum.net>
- * @author     Bertrand Mansion <bmansion@mamasam.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.3
- *
- */
-class PEAR_Exception extends Exception
-{
-    const OBSERVER_PRINT = -2;
-    const OBSERVER_TRIGGER = -4;
-    const OBSERVER_DIE = -8;
-    protected $cause;
-    private static $_observers = array();
-    private static $_uniqueid = 0;
-    private $_trace;
-
-    /**
-     * Supported signatures:
-     *  - PEAR_Exception(string $message);
-     *  - PEAR_Exception(string $message, int $code);
-     *  - PEAR_Exception(string $message, Exception $cause);
-     *  - PEAR_Exception(string $message, Exception $cause, int $code);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause);
-     *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
-     *  - PEAR_Exception(string $message, array $causes);
-     *  - PEAR_Exception(string $message, array $causes, int $code);
-     * @param string exception message
-     * @param int|Exception|PEAR_Error|array|null exception cause
-     * @param int|null exception code or null
-     */
-    public function __construct($message, $p2 = null, $p3 = null)
-    {
-        if (is_int($p2)) {
-            $code = $p2;
-            $this->cause = null;
-        } elseif (is_object($p2) || is_array($p2)) {
-            // using is_object allows both Exception and PEAR_Error
-            if (is_object($p2) && !($p2 instanceof Exception)) {
-                if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
-                        'array, or PEAR_Error');
-                }
-            }
-            $code = $p3;
-            if (is_array($p2) && isset($p2['message'])) {
-                // fix potential problem of passing in a single warning
-                $p2 = array($p2);
-            }
-            $this->cause = $p2;
-        } else {
-            $code = null;
-            $this->cause = null;
-        }
-        parent::__construct($message, $code);
-        $this->signal();
-    }
-
-    /**
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
-     *                         - A PEAR_Exception::OBSERVER_* constant
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
-     *                           mixed $options)
-     * @param string $label    The name of the observer. Use this if you want
-     *                         to remove it later with removeObserver()
-     */
-    public static function addObserver($callback, $label = 'default')
-    {
-        self::$_observers[$label] = $callback;
-    }
-
-    public static function removeObserver($label = 'default')
-    {
-        unset(self::$_observers[$label]);
-    }
-
-    /**
-     * @return int unique identifier for an observer
-     */
-    public static function getUniqueId()
-    {
-        return self::$_uniqueid++;
-    }
-
-    private function signal()
-    {
-        foreach (self::$_observers as $func) {
-            if (is_callable($func)) {
-                call_user_func($func, $this);
-                continue;
-            }
-            settype($func, 'array');
-            switch ($func[0]) {
-                case self::OBSERVER_PRINT :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    printf($f, $this->getMessage());
-                    break;
-                case self::OBSERVER_TRIGGER :
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
-                    trigger_error($this->getMessage(), $f);
-                    break;
-                case self::OBSERVER_DIE :
-                    $f = (isset($func[1])) ? $func[1] : '%s';
-                    die(printf($f, $this->getMessage()));
-                    break;
-                default:
-                    trigger_error('invalid observer type', E_USER_WARNING);
-            }
-        }
-    }
-
-    /**
-     * Return specific error information that can be used for more detailed
-     * error messages or translation.
-     *
-     * This method may be overridden in child exception classes in order
-     * to add functionality not present in PEAR_Exception and is a placeholder
-     * to define API
-     *
-     * The returned array must be an associative array of parameter => value like so:
-     * <pre>
-     * array('name' => $name, 'context' => array(...))
-     * </pre>
-     * @return array
-     */
-    public function getErrorData()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the exception that caused this exception to be thrown
-     * @access public
-     * @return Exception|array The context of the exception
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
-
-    /**
-     * Function must be public to call on caused exceptions
-     * @param array
-     */
-    public function getCauseMessage(&$causes)
-    {
-        $trace = $this->getTraceSafe();
-        $cause = array('class'   => get_class($this),
-                       'message' => $this->message,
-                       'file' => 'unknown',
-                       'line' => 'unknown');
-        if (isset($trace[0])) {
-            if (isset($trace[0]['file'])) {
-                $cause['file'] = $trace[0]['file'];
-                $cause['line'] = $trace[0]['line'];
-            }
-        }
-        $causes[] = $cause;
-        if ($this->cause instanceof PEAR_Exception) {
-            $this->cause->getCauseMessage($causes);
-        } elseif ($this->cause instanceof Exception) {
-            $causes[] = array('class'   => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => $this->cause->getFile(),
-                              'line' => $this->cause->getLine());
-        } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
-            $causes[] = array('class' => get_class($this->cause),
-                              'message' => $this->cause->getMessage(),
-                              'file' => 'unknown',
-                              'line' => 'unknown');
-        } elseif (is_array($this->cause)) {
-            foreach ($this->cause as $cause) {
-                if ($cause instanceof PEAR_Exception) {
-                    $cause->getCauseMessage($causes);
-                } elseif ($cause instanceof Exception) {
-                    $causes[] = array('class'   => get_class($cause),
-                                   'message' => $cause->getMessage(),
-                                   'file' => $cause->getFile(),
-                                   'line' => $cause->getLine());
-                } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
-                    $causes[] = array('class' => get_class($cause),
-                                      'message' => $cause->getMessage(),
-                                      'file' => 'unknown',
-                                      'line' => 'unknown');
-                } elseif (is_array($cause) && isset($cause['message'])) {
-                    // PEAR_ErrorStack warning
-                    $causes[] = array(
-                        'class' => $cause['package'],
-                        'message' => $cause['message'],
-                        'file' => isset($cause['context']['file']) ?
-                                            $cause['context']['file'] :
-                                            'unknown',
-                        'line' => isset($cause['context']['line']) ?
-                                            $cause['context']['line'] :
-                                            'unknown',
-                    );
-                }
-            }
-        }
-    }
-
-    public function getTraceSafe()
-    {
-        if (!isset($this->_trace)) {
-            $this->_trace = $this->getTrace();
-            if (empty($this->_trace)) {
-                $backtrace = debug_backtrace();
-                $this->_trace = array($backtrace[count($backtrace)-1]);
-            }
-        }
-        return $this->_trace;
-    }
-
-    public function getErrorClass()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['class'];
-    }
-
-    public function getErrorMethod()
-    {
-        $trace = $this->getTraceSafe();
-        return $trace[0]['function'];
-    }
-
-    public function __toString()
-    {
-        if (isset($_SERVER['REQUEST_URI'])) {
-            return $this->toHtml();
-        }
-        return $this->toText();
-    }
-
-    public function toHtml()
-    {
-        $trace = $this->getTraceSafe();
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
-        foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" style="background: #ff9999">'
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
-               . 'on line <b>' . $cause['line'] . '</b>'
-               . "</td></tr>\n";
-        }
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
-               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
-
-        foreach ($trace as $k => $v) {
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
-                   . '<td>';
-            if (!empty($v['class'])) {
-                $html .= $v['class'] . $v['type'];
-            }
-            $html .= $v['function'];
-            $args = array();
-            if (!empty($v['args'])) {
-                foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
-                        $arg = (string)$arg;
-                        $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '&hellip;';
-                        $args[] = "'" . $str . "'";
-                    }
-                }
-            }
-            $html .= '(' . implode(', ',$args) . ')'
-                   . '</td>'
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
-                   . '</td></tr>' . "\n";
-        }
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
-               . '<td>{main}</td>'
-               . '<td>&nbsp;</td></tr>' . "\n"
-               . '</table>';
-        return $html;
-    }
-
-    public function toText()
-    {
-        $causes = array();
-        $this->getCauseMessage($causes);
-        $causeMsg = '';
-        foreach ($causes as $i => $cause) {
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
-                   . $cause['message'] . ' in ' . $cause['file']
-                   . ' on line ' . $cause['line'] . "\n";
-        }
-        return $causeMsg . $this->getTraceAsString();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/FixPHP5PEARWarnings.php b/airtime_mvc/library/pear/PEAR/FixPHP5PEARWarnings.php
deleted file mode 100644
index be5dc3ce7..000000000
--- a/airtime_mvc/library/pear/PEAR/FixPHP5PEARWarnings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-if ($skipmsg) {
-    $a = &new $ec($code, $mode, $options, $userinfo);
-} else {
-    $a = &new $ec($message, $code, $mode, $options, $userinfo);
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Frontend.php b/airtime_mvc/library/pear/PEAR/Frontend.php
deleted file mode 100644
index e8d54bc41..000000000
--- a/airtime_mvc/library/pear/PEAR/Frontend.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * PEAR_Frontend, the singleton-based frontend for user input/output
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Frontend.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Include error handling
- */
-//require_once 'PEAR.php';
-
-/**
- * Which user interface class is being used.
- * @var string class name
- */
-$GLOBALS['_PEAR_FRONTEND_CLASS'] = 'PEAR_Frontend_CLI';
-
-/**
- * Instance of $_PEAR_Command_uiclass.
- * @var object
- */
-$GLOBALS['_PEAR_FRONTEND_SINGLETON'] = null;
-
-/**
- * Singleton-based frontend for PEAR user input/output
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Frontend extends PEAR
-{
-    /**
-     * Retrieve the frontend object
-     * @return PEAR_Frontend_CLI|PEAR_Frontend_Web|PEAR_Frontend_Gtk
-     * @static
-     */
-    function &singleton($type = null)
-    {
-        if ($type === null) {
-            if (!isset($GLOBALS['_PEAR_FRONTEND_SINGLETON'])) {
-                $a = false;
-                return $a;
-            }
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        }
-
-        $a = PEAR_Frontend::setFrontendClass($type);
-        return $a;
-    }
-
-    /**
-     * Set the frontend class that will be used by calls to {@link singleton()}
-     *
-     * Frontends are expected to conform to the PEAR naming standard of
-     * _ => DIRECTORY_SEPARATOR (PEAR_Frontend_CLI is in PEAR/Frontend/CLI.php)
-     * @param string $uiclass full class name
-     * @return PEAR_Frontend
-     * @static
-     */
-    function &setFrontendClass($uiclass)
-    {
-        if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
-              is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], $uiclass)) {
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        }
-
-        if (!class_exists($uiclass)) {
-            $file = str_replace('_', '/', $uiclass) . '.php';
-            if (PEAR_Frontend::isIncludeable($file)) {
-                include_once $file;
-            }
-        }
-
-        if (class_exists($uiclass)) {
-            $obj = &new $uiclass;
-            // quick test to see if this class implements a few of the most
-            // important frontend methods
-            if (is_a($obj, 'PEAR_Frontend')) {
-                $GLOBALS['_PEAR_FRONTEND_SINGLETON'] = &$obj;
-                $GLOBALS['_PEAR_FRONTEND_CLASS'] = $uiclass;
-                return $obj;
-            }
-
-            $err = PEAR::raiseError("not a frontend class: $uiclass");
-            return $err;
-        }
-
-        $err = PEAR::raiseError("no such class: $uiclass");
-        return $err;
-    }
-
-    /**
-     * Set the frontend class that will be used by calls to {@link singleton()}
-     *
-     * Frontends are expected to be a descendant of PEAR_Frontend
-     * @param PEAR_Frontend
-     * @return PEAR_Frontend
-     * @static
-     */
-    function &setFrontendObject($uiobject)
-    {
-        if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
-              is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], get_class($uiobject))) {
-            return $GLOBALS['_PEAR_FRONTEND_SINGLETON'];
-        }
-
-        if (!is_a($uiobject, 'PEAR_Frontend')) {
-            $err = PEAR::raiseError('not a valid frontend class: (' .
-                get_class($uiobject) . ')');
-            return $err;
-        }
-
-        $GLOBALS['_PEAR_FRONTEND_SINGLETON'] = &$uiobject;
-        $GLOBALS['_PEAR_FRONTEND_CLASS'] = get_class($uiobject);
-        return $uiobject;
-    }
-
-    /**
-     * @param string $path relative or absolute include path
-     * @return boolean
-     * @static
-     */
-    function isIncludeable($path)
-    {
-        if (file_exists($path) && is_readable($path)) {
-            return true;
-        }
-
-        $fp = @fopen($path, 'r', true);
-        if ($fp) {
-            fclose($fp);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param PEAR_Config
-     */
-    function setConfig(&$config)
-    {
-    }
-
-    /**
-     * This can be overridden to allow session-based temporary file management
-     *
-     * By default, all files are deleted at the end of a session.  The web installer
-     * needs to be able to sustain a list over many sessions in order to support
-     * user interaction with install scripts
-     */
-    function addTempFile($file)
-    {
-        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
-    }
-
-    /**
-     * Log an action
-     *
-     * @param string $msg the message to log
-     * @param boolean $append_crlf
-     * @return boolean true
-     * @abstract
-     */
-    function log($msg, $append_crlf = true)
-    {
-    }
-
-    /**
-     * Run a post-installation script
-     *
-     * @param array $scripts array of post-install scripts
-     * @abstract
-     */
-    function runPostinstallScripts(&$scripts)
-    {
-    }
-
-    /**
-     * Display human-friendly output formatted depending on the
-     * $command parameter.
-     *
-     * This should be able to handle basic output data with no command
-     * @param mixed  $data    data structure containing the information to display
-     * @param string $command command from which this method was called
-     * @abstract
-     */
-    function outputData($data, $command = '_default')
-    {
-    }
-
-    /**
-     * Display a modal form dialog and return the given input
-     *
-     * A frontend that requires multiple requests to retrieve and process
-     * data must take these needs into account, and implement the request
-     * handling code.
-     * @param string $command  command from which this method was called
-     * @param array  $prompts  associative array. keys are the input field names
-     *                         and values are the description
-     * @param array  $types    array of input field types (text, password,
-     *                         etc.) keys have to be the same like in $prompts
-     * @param array  $defaults array of default values. again keys have
-     *                         to be the same like in $prompts.  Do not depend
-     *                         on a default value being set.
-     * @return array input sent by the user
-     * @abstract
-     */
-    function userDialog($command, $prompts, $types = array(), $defaults = array())
-    {
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Frontend/CLI.php b/airtime_mvc/library/pear/PEAR/Frontend/CLI.php
deleted file mode 100644
index 62453cf34..000000000
--- a/airtime_mvc/library/pear/PEAR/Frontend/CLI.php
+++ /dev/null
@@ -1,736 +0,0 @@
-<?php
-/**
- * PEAR_Frontend_CLI
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: CLI.php 296938 2010-03-27 16:16:25Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-/**
- * base class
- */
-require_once 'PEAR/Frontend.php';
-
-/**
- * Command-line Frontend for the PEAR Installer
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Frontend_CLI extends PEAR_Frontend
-{
-    /**
-     * What type of user interface this frontend is for.
-     * @var string
-     * @access public
-     */
-    var $type = 'CLI';
-    var $lp = ''; // line prefix
-
-    var $params = array();
-    var $term = array(
-        'bold'   => '',
-        'normal' => '',
-    );
-
-    function PEAR_Frontend_CLI()
-    {
-        parent::PEAR();
-        $term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
-        if (function_exists('posix_isatty') && !posix_isatty(1)) {
-            // output is being redirected to a file or through a pipe
-        } elseif ($term) {
-            if (preg_match('/^(xterm|vt220|linux)/', $term)) {
-                $this->term['bold']   = sprintf("%c%c%c%c", 27, 91, 49, 109);
-                $this->term['normal'] = sprintf("%c%c%c", 27, 91, 109);
-            } elseif (preg_match('/^vt100/', $term)) {
-                $this->term['bold']   = sprintf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0);
-                $this->term['normal'] = sprintf("%c%c%c%c%c", 27, 91, 109, 0, 0);
-            }
-        } elseif (OS_WINDOWS) {
-            // XXX add ANSI codes here
-        }
-    }
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayError($e)
-    {
-        return $this->_displayLine($e->getMessage());
-    }
-
-    /**
-     * @param object PEAR_Error object
-     */
-    function displayFatalError($eobj)
-    {
-        $this->displayError($eobj);
-        if (class_exists('PEAR_Config')) {
-            $config = &PEAR_Config::singleton();
-            if ($config->get('verbose') > 5) {
-                if (function_exists('debug_print_backtrace')) {
-                    debug_print_backtrace();
-                    exit(1);
-                }
-
-                $raised = false;
-                foreach (debug_backtrace() as $i => $frame) {
-                    if (!$raised) {
-                        if (isset($frame['class'])
-                            && strtolower($frame['class']) == 'pear'
-                            && strtolower($frame['function']) == 'raiseerror'
-                        ) {
-                            $raised = true;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    $frame['class']    = !isset($frame['class'])    ? '' : $frame['class'];
-                    $frame['type']     = !isset($frame['type'])     ? '' : $frame['type'];
-                    $frame['function'] = !isset($frame['function']) ? '' : $frame['function'];
-                    $frame['line']     = !isset($frame['line'])     ? '' : $frame['line'];
-                    $this->_displayLine("#$i: $frame[class]$frame[type]$frame[function] $frame[line]");
-                }
-            }
-        }
-
-        exit(1);
-    }
-
-    /**
-     * Instruct the runInstallScript method to skip a paramgroup that matches the
-     * id value passed in.
-     *
-     * This method is useful for dynamically configuring which sections of a post-install script
-     * will be run based on the user's setup, which is very useful for making flexible
-     * post-install scripts without losing the cross-Frontend ability to retrieve user input
-     * @param string
-     */
-    function skipParamgroup($id)
-    {
-        $this->_skipSections[$id] = true;
-    }
-
-    function runPostinstallScripts(&$scripts)
-    {
-        foreach ($scripts as $i => $script) {
-            $this->runInstallScript($scripts[$i]->_params, $scripts[$i]->_obj);
-        }
-    }
-
-    /**
-     * @param array $xml contents of postinstallscript tag
-     * @param object $script post-installation script
-     * @param string install|upgrade
-     */
-    function runInstallScript($xml, &$script)
-    {
-        $this->_skipSections = array();
-        if (!is_array($xml) || !isset($xml['paramgroup'])) {
-            $script->run(array(), '_default');
-            return;
-        }
-
-        $completedPhases = array();
-        if (!isset($xml['paramgroup'][0])) {
-            $xml['paramgroup'] = array($xml['paramgroup']);
-        }
-
-        foreach ($xml['paramgroup'] as $group) {
-            if (isset($this->_skipSections[$group['id']])) {
-                // the post-install script chose to skip this section dynamically
-                continue;
-            }
-
-            if (isset($group['name'])) {
-                $paramname = explode('::', $group['name']);
-                if ($lastgroup['id'] != $paramname[0]) {
-                    continue;
-                }
-
-                $group['name'] = $paramname[1];
-                if (!isset($answers)) {
-                    return;
-                }
-
-                if (isset($answers[$group['name']])) {
-                    switch ($group['conditiontype']) {
-                        case '=' :
-                            if ($answers[$group['name']] != $group['value']) {
-                                continue 2;
-                            }
-                        break;
-                        case '!=' :
-                            if ($answers[$group['name']] == $group['value']) {
-                                continue 2;
-                            }
-                        break;
-                        case 'preg_match' :
-                            if (!@preg_match('/' . $group['value'] . '/',
-                                  $answers[$group['name']])) {
-                                continue 2;
-                            }
-                        break;
-                        default :
-                        return;
-                    }
-                }
-            }
-
-            $lastgroup = $group;
-            if (isset($group['instructions'])) {
-                $this->_display($group['instructions']);
-            }
-
-            if (!isset($group['param'][0])) {
-                $group['param'] = array($group['param']);
-            }
-
-            if (isset($group['param'])) {
-                if (method_exists($script, 'postProcessPrompts')) {
-                    $prompts = $script->postProcessPrompts($group['param'], $group['id']);
-                    if (!is_array($prompts) || count($prompts) != count($group['param'])) {
-                        $this->outputData('postinstall', 'Error: post-install script did not ' .
-                            'return proper post-processed prompts');
-                        $prompts = $group['param'];
-                    } else {
-                        foreach ($prompts as $i => $var) {
-                            if (!is_array($var) || !isset($var['prompt']) ||
-                                  !isset($var['name']) ||
-                                  ($var['name'] != $group['param'][$i]['name']) ||
-                                  ($var['type'] != $group['param'][$i]['type'])
-                            ) {
-                                $this->outputData('postinstall', 'Error: post-install script ' .
-                                    'modified the variables or prompts, severe security risk. ' .
-                                    'Will instead use the defaults from the package.xml');
-                                $prompts = $group['param'];
-                            }
-                        }
-                    }
-
-                    $answers = $this->confirmDialog($prompts);
-                } else {
-                    $answers = $this->confirmDialog($group['param']);
-                }
-            }
-
-            if ((isset($answers) && $answers) || !isset($group['param'])) {
-                if (!isset($answers)) {
-                    $answers = array();
-                }
-
-                array_unshift($completedPhases, $group['id']);
-                if (!$script->run($answers, $group['id'])) {
-                    $script->run($completedPhases, '_undoOnError');
-                    return;
-                }
-            } else {
-                $script->run($completedPhases, '_undoOnError');
-                return;
-            }
-        }
-    }
-
-    /**
-     * Ask for user input, confirm the answers and continue until the user is satisfied
-     * @param array an array of arrays, format array('name' => 'paramname', 'prompt' =>
-     *              'text to display', 'type' => 'string'[, default => 'default value'])
-     * @return array
-     */
-    function confirmDialog($params)
-    {
-        $answers = $prompts = $types = array();
-        foreach ($params as $param) {
-            $prompts[$param['name']] = $param['prompt'];
-            $types[$param['name']]   = $param['type'];
-            $answers[$param['name']] = isset($param['default']) ? $param['default'] : '';
-        }
-
-        $tried = false;
-        do {
-            if ($tried) {
-                $i = 1;
-                foreach ($answers as $var => $value) {
-                    if (!strlen($value)) {
-                        echo $this->bold("* Enter an answer for #" . $i . ": ({$prompts[$var]})\n");
-                    }
-                    $i++;
-                }
-            }
-
-            $answers = $this->userDialog('', $prompts, $types, $answers);
-            $tried   = true;
-        } while (is_array($answers) && count(array_filter($answers)) != count($prompts));
-
-        return $answers;
-    }
-
-    function userDialog($command, $prompts, $types = array(), $defaults = array(), $screensize = 20)
-    {
-        if (!is_array($prompts)) {
-            return array();
-        }
-
-        $testprompts = array_keys($prompts);
-        $result      = $defaults;
-
-        reset($prompts);
-        if (count($prompts) === 1) {
-            foreach ($prompts as $key => $prompt) {
-                $type    = $types[$key];
-                $default = @$defaults[$key];
-                print "$prompt ";
-                if ($default) {
-                    print "[$default] ";
-                }
-                print ": ";
-
-                $line         = fgets(STDIN, 2048);
-                $result[$key] =  ($default && trim($line) == '') ? $default : trim($line);
-            }
-
-            return $result;
-        }
-
-        $first_run = true;
-        while (true) {
-            $descLength = max(array_map('strlen', $prompts));
-            $descFormat = "%-{$descLength}s";
-            $last       = count($prompts);
-
-            $i = 0;
-            foreach ($prompts as $n => $var) {
-                $res = isset($result[$n]) ? $result[$n] : null;
-                printf("%2d. $descFormat : %s\n", ++$i, $prompts[$n], $res);
-            }
-            print "\n1-$last, 'all', 'abort', or Enter to continue: ";
-
-            $tmp = trim(fgets(STDIN, 1024));
-            if (empty($tmp)) {
-                break;
-            }
-
-            if ($tmp == 'abort') {
-                return false;
-            }
-
-            if (isset($testprompts[(int)$tmp - 1])) {
-                $var     = $testprompts[(int)$tmp - 1];
-                $desc    = $prompts[$var];
-                $current = @$result[$var];
-                print "$desc [$current] : ";
-                $tmp = trim(fgets(STDIN, 1024));
-                if ($tmp !== '') {
-                    $result[$var] = $tmp;
-                }
-            } elseif ($tmp == 'all') {
-                foreach ($prompts as $var => $desc) {
-                    $current = $result[$var];
-                    print "$desc [$current] : ";
-                    $tmp = trim(fgets(STDIN, 1024));
-                    if (trim($tmp) !== '') {
-                        $result[$var] = trim($tmp);
-                    }
-                }
-            }
-
-            $first_run = false;
-        }
-
-        return $result;
-    }
-
-    function userConfirm($prompt, $default = 'yes')
-    {
-        trigger_error("PEAR_Frontend_CLI::userConfirm not yet converted", E_USER_ERROR);
-        static $positives = array('y', 'yes', 'on', '1');
-        static $negatives = array('n', 'no', 'off', '0');
-        print "$this->lp$prompt [$default] : ";
-        $fp = fopen("php://stdin", "r");
-        $line = fgets($fp, 2048);
-        fclose($fp);
-        $answer = strtolower(trim($line));
-        if (empty($answer)) {
-            $answer = $default;
-        }
-        if (in_array($answer, $positives)) {
-            return true;
-        }
-        if (in_array($answer, $negatives)) {
-            return false;
-        }
-        if (in_array($default, $positives)) {
-            return true;
-        }
-        return false;
-    }
-
-    function outputData($data, $command = '_default')
-    {
-        switch ($command) {
-            case 'channel-info':
-                foreach ($data as $type => $section) {
-                    if ($type == 'main') {
-                        $section['data'] = array_values($section['data']);
-                    }
-
-                    $this->outputData($section);
-                }
-                break;
-            case 'install':
-            case 'upgrade':
-            case 'upgrade-all':
-                if (isset($data['release_warnings'])) {
-                    $this->_displayLine('');
-                    $this->_startTable(array(
-                        'border' => false,
-                        'caption' => 'Release Warnings'
-                    ));
-                    $this->_tableRow(array($data['release_warnings']), null, array(1 => array('wrap' => 55)));
-                    $this->_endTable();
-                    $this->_displayLine('');
-                }
-
-                $this->_displayLine($data['data']);
-                break;
-            case 'search':
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                }
-
-                $this->_endTable();
-                break;
-            case 'list-all':
-                if (!isset($data['data'])) {
-                      $this->_displayLine('No packages in channel');
-                      break;
-                }
-
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
-                }
-
-                foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        unset($pkg[4], $pkg[5]);
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
-                    }
-                }
-
-                $this->_endTable();
-                break;
-            case 'config-show':
-                $data['border'] = false;
-                $opts = array(
-                    0 => array('wrap' => 30),
-                    1 => array('wrap' => 20),
-                    2 => array('wrap' => 35)
-                );
-
-                $this->_startTable($data);
-                if (isset($data['headline']) && is_array($data['headline'])) {
-                    $this->_tableRow($data['headline'], array('bold' => true), $opts);
-                }
-
-                foreach ($data['data'] as $group) {
-                    foreach ($group as $value) {
-                        if ($value[2] == '') {
-                            $value[2] = "<not set>";
-                        }
-
-                        $this->_tableRow($value, null, $opts);
-                    }
-                }
-
-                $this->_endTable();
-                break;
-            case 'remote-info':
-                $d = $data;
-                $data = array(
-                    'caption' => 'Package details:',
-                    'border'  => false,
-                    'data'    => array(
-                        array("Latest",      $data['stable']),
-                        array("Installed",   $data['installed']),
-                        array("Package",     $data['name']),
-                        array("License",     $data['license']),
-                        array("Category",    $data['category']),
-                        array("Summary",     $data['summary']),
-                        array("Description", $data['description']),
-                    ),
-                );
-
-                if (isset($d['deprecated']) && $d['deprecated']) {
-                    $conf = &PEAR_Config::singleton();
-                    $reg = $conf->getRegistry();
-                    $name = $reg->parsedPackageNameToString($d['deprecated'], true);
-                    $data['data'][] = array('Deprecated! use', $name);
-                }
-            default: {
-                if (is_array($data)) {
-                    $this->_startTable($data);
-                    $count = count($data['data'][0]);
-                    if ($count == 2) {
-                        $opts = array(0 => array('wrap' => 25),
-                                      1 => array('wrap' => 48)
-                        );
-                    } elseif ($count == 3) {
-                        $opts = array(0 => array('wrap' => 30),
-                                      1 => array('wrap' => 20),
-                                      2 => array('wrap' => 35)
-                        );
-                    } else {
-                        $opts = null;
-                    }
-                    if (isset($data['headline']) && is_array($data['headline'])) {
-                        $this->_tableRow($data['headline'],
-                                         array('bold' => true),
-                                         $opts);
-                    }
-
-                    if (is_array($data['data'])) {
-                        foreach($data['data'] as $row) {
-                            $this->_tableRow($row, null, $opts);
-                        }
-                    } else {
-                        $this->_tableRow(array($data['data']), null, $opts);
-                     }
-                    $this->_endTable();
-                } else {
-                    $this->_displayLine($data);
-                }
-            }
-        }
-    }
-
-    function log($text, $append_crlf = true)
-    {
-        if ($append_crlf) {
-            return $this->_displayLine($text);
-        }
-
-        return $this->_display($text);
-    }
-
-    function bold($text)
-    {
-        if (empty($this->term['bold'])) {
-            return strtoupper($text);
-        }
-
-        return $this->term['bold'] . $text . $this->term['normal'];
-    }
-
-    function _displayHeading($title)
-    {
-        print $this->lp.$this->bold($title)."\n";
-        print $this->lp.str_repeat("=", strlen($title))."\n";
-    }
-
-    function _startTable($params = array())
-    {
-        $params['table_data'] = array();
-        $params['widest']     = array();  // indexed by column
-        $params['highest']    = array(); // indexed by row
-        $params['ncols']      = 0;
-        $this->params         = $params;
-    }
-
-    function _tableRow($columns, $rowparams = array(), $colparams = array())
-    {
-        $highest = 1;
-        for ($i = 0; $i < count($columns); $i++) {
-            $col = &$columns[$i];
-            if (isset($colparams[$i]) && !empty($colparams[$i]['wrap'])) {
-                $col = wordwrap($col, $colparams[$i]['wrap']);
-            }
-
-            if (strpos($col, "\n") !== false) {
-                $multiline = explode("\n", $col);
-                $w = 0;
-                foreach ($multiline as $n => $line) {
-                    $len = strlen($line);
-                    if ($len > $w) {
-                        $w = $len;
-                    }
-                }
-                $lines = count($multiline);
-            } else {
-                $w = strlen($col);
-            }
-
-            if (isset($this->params['widest'][$i])) {
-                if ($w > $this->params['widest'][$i]) {
-                    $this->params['widest'][$i] = $w;
-                }
-            } else {
-                $this->params['widest'][$i] = $w;
-            }
-
-            $tmp = count_chars($columns[$i], 1);
-            // handle unix, mac and windows formats
-            $lines = (isset($tmp[10]) ? $tmp[10] : (isset($tmp[13]) ? $tmp[13] : 0)) + 1;
-            if ($lines > $highest) {
-                $highest = $lines;
-            }
-        }
-
-        if (count($columns) > $this->params['ncols']) {
-            $this->params['ncols'] = count($columns);
-        }
-
-        $new_row = array(
-            'data'      => $columns,
-            'height'    => $highest,
-            'rowparams' => $rowparams,
-            'colparams' => $colparams,
-        );
-        $this->params['table_data'][] = $new_row;
-    }
-
-    function _endTable()
-    {
-        extract($this->params);
-        if (!empty($caption)) {
-            $this->_displayHeading($caption);
-        }
-
-        if (count($table_data) === 0) {
-            return;
-        }
-
-        if (!isset($width)) {
-            $width = $widest;
-        } else {
-            for ($i = 0; $i < $ncols; $i++) {
-                if (!isset($width[$i])) {
-                    $width[$i] = $widest[$i];
-                }
-            }
-        }
-
-        $border = false;
-        if (empty($border)) {
-            $cellstart  = '';
-            $cellend    = ' ';
-            $rowend     = '';
-            $padrowend  = false;
-            $borderline = '';
-        } else {
-            $cellstart  = '| ';
-            $cellend    = ' ';
-            $rowend     = '|';
-            $padrowend  = true;
-            $borderline = '+';
-            foreach ($width as $w) {
-                $borderline .= str_repeat('-', $w + strlen($cellstart) + strlen($cellend) - 1);
-                $borderline .= '+';
-            }
-        }
-
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-
-        for ($i = 0; $i < count($table_data); $i++) {
-            extract($table_data[$i]);
-            if (!is_array($rowparams)) {
-                $rowparams = array();
-            }
-
-            if (!is_array($colparams)) {
-                $colparams = array();
-            }
-
-            $rowlines = array();
-            if ($height > 1) {
-                for ($c = 0; $c < count($data); $c++) {
-                    $rowlines[$c] = preg_split('/(\r?\n|\r)/', $data[$c]);
-                    if (count($rowlines[$c]) < $height) {
-                        $rowlines[$c] = array_pad($rowlines[$c], $height, '');
-                    }
-                }
-            } else {
-                for ($c = 0; $c < count($data); $c++) {
-                    $rowlines[$c] = array($data[$c]);
-                }
-            }
-
-            for ($r = 0; $r < $height; $r++) {
-                $rowtext = '';
-                for ($c = 0; $c < count($data); $c++) {
-                    if (isset($colparams[$c])) {
-                        $attribs = array_merge($rowparams, $colparams);
-                    } else {
-                        $attribs = $rowparams;
-                    }
-
-                    $w = isset($width[$c]) ? $width[$c] : 0;
-                    //$cell = $data[$c];
-                    $cell = $rowlines[$c][$r];
-                    $l = strlen($cell);
-                    if ($l > $w) {
-                        $cell = substr($cell, 0, $w);
-                    }
-
-                    if (isset($attribs['bold'])) {
-                        $cell = $this->bold($cell);
-                    }
-
-                    if ($l < $w) {
-                        // not using str_pad here because we may
-                        // add bold escape characters to $cell
-                        $cell .= str_repeat(' ', $w - $l);
-                    }
-
-                    $rowtext .= $cellstart . $cell . $cellend;
-                }
-
-                if (!$border) {
-                    $rowtext = rtrim($rowtext);
-                }
-
-                $rowtext .= $rowend;
-                $this->_displayLine($rowtext);
-            }
-        }
-
-        if ($borderline) {
-            $this->_displayLine($borderline);
-        }
-    }
-
-    function _displayLine($text)
-    {
-        print "$this->lp$text\n";
-    }
-
-    function _display($text)
-    {
-        print $text;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer.php b/airtime_mvc/library/pear/PEAR/Installer.php
deleted file mode 100644
index 71ada0e6c..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer.php
+++ /dev/null
@@ -1,1823 +0,0 @@
-<?php
-/**
- * PEAR_Installer
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Installer.php 287446 2009-08-18 11:45:05Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * Used for installation groups in package.xml 2.0 and platform exceptions
- */
-require_once 'OS/Guess.php';
-require_once 'PEAR/Downloader.php';
-
-define('PEAR_INSTALLER_NOBINARY', -240);
-/**
- * Administration class used to install PEAR packages and maintain the
- * installed package database.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Martin Jansen <mj@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Installer extends PEAR_Downloader
-{
-    // {{{ properties
-
-    /** name of the package directory, for example Foo-1.0
-     * @var string
-     */
-    var $pkgdir;
-
-    /** directory where PHP code files go
-     * @var string
-     */
-    var $phpdir;
-
-    /** directory where PHP extension files go
-     * @var string
-     */
-    var $extdir;
-
-    /** directory where documentation goes
-     * @var string
-     */
-    var $docdir;
-
-    /** installation root directory (ala PHP's INSTALL_ROOT or
-     * automake's DESTDIR
-     * @var string
-     */
-    var $installroot = '';
-
-    /** debug level
-     * @var int
-     */
-    var $debug = 1;
-
-    /** temporary directory
-     * @var string
-     */
-    var $tmpdir;
-
-    /**
-     * PEAR_Registry object used by the installer
-     * @var PEAR_Registry
-     */
-    var $registry;
-
-    /**
-     * array of PEAR_Downloader_Packages
-     * @var array
-     */
-    var $_downloadedPackages;
-
-    /** List of file transactions queued for an install/upgrade/uninstall.
-     *
-     *  Format:
-     *    array(
-     *      0 => array("rename => array("from-file", "to-file")),
-     *      1 => array("delete" => array("file-to-delete")),
-     *      ...
-     *    )
-     *
-     * @var array
-     */
-    var $file_operations = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * PEAR_Installer constructor.
-     *
-     * @param object $ui user interface object (instance of PEAR_Frontend_*)
-     *
-     * @access public
-     */
-    function PEAR_Installer(&$ui)
-    {
-        parent::PEAR_Common();
-        $this->setFrontendObject($ui);
-        $this->debug = $this->config->get('verbose');
-    }
-
-    function setOptions($options)
-    {
-        $this->_options = $options;
-    }
-
-    function setConfig(&$config)
-    {
-        $this->config    = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    // }}}
-
-    function _removeBackups($files)
-    {
-        foreach ($files as $path) {
-            $this->addFileOperation('removebackup', array($path));
-        }
-    }
-
-    // {{{ _deletePackageFiles()
-
-    /**
-     * Delete a package's installed files, does not remove empty directories.
-     *
-     * @param string package name
-     * @param string channel name
-     * @param bool if true, then files are backed up first
-     * @return bool TRUE on success, or a PEAR error on failure
-     * @access protected
-     */
-    function _deletePackageFiles($package, $channel = false, $backup = false)
-    {
-        if (!$channel) {
-            $channel = 'pear.php.net';
-        }
-
-        if (!strlen($package)) {
-            return $this->raiseError("No package to uninstall given");
-        }
-
-        if (strtolower($package) == 'pear' && $channel == 'pear.php.net') {
-            // to avoid race conditions, include all possible needed files
-            require_once 'PEAR/Task/Common.php';
-            require_once 'PEAR/Task/Replace.php';
-            require_once 'PEAR/Task/Unixeol.php';
-            require_once 'PEAR/Task/Windowseol.php';
-            require_once 'PEAR/PackageFile/v1.php';
-            require_once 'PEAR/PackageFile/v2.php';
-            require_once 'PEAR/PackageFile/Generator/v1.php';
-            require_once 'PEAR/PackageFile/Generator/v2.php';
-        }
-
-        $filelist = $this->_registry->packageInfo($package, 'filelist', $channel);
-        if ($filelist == null) {
-            return $this->raiseError("$channel/$package not installed");
-        }
-
-        $ret = array();
-        foreach ($filelist as $file => $props) {
-            if (empty($props['installed_as'])) {
-                continue;
-            }
-
-            $path = $props['installed_as'];
-            if ($backup) {
-                $this->addFileOperation('backup', array($path));
-                $ret[] = $path;
-            }
-
-            $this->addFileOperation('delete', array($path));
-        }
-
-        if ($backup) {
-            return $ret;
-        }
-
-        return true;
-    }
-
-    // }}}
-    // {{{ _installFile()
-
-    /**
-     * @param string filename
-     * @param array attributes from <file> tag in package.xml
-     * @param string path to install the file in
-     * @param array options from command-line
-     * @access private
-     */
-    function _installFile($file, $atts, $tmp_path, $options)
-    {
-        // {{{ return if this file is meant for another platform
-        static $os;
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-
-        if (isset($atts['platform'])) {
-            if (empty($os)) {
-                $os = new OS_Guess();
-            }
-
-            if (strlen($atts['platform']) && $atts['platform']{0} == '!') {
-                $negate   = true;
-                $platform = substr($atts['platform'], 1);
-            } else {
-                $negate    = false;
-                $platform = $atts['platform'];
-            }
-
-            if ((bool) $os->matchSignature($platform) === $negate) {
-                $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
-                return PEAR_INSTALLER_SKIPPED;
-            }
-        }
-        // }}}
-
-        $channel = $this->pkginfo->getChannel();
-        // {{{ assemble the destination paths
-        switch ($atts['role']) {
-            case 'src':
-            case 'extsrc':
-                $this->source_files++;
-                return;
-            case 'doc':
-            case 'data':
-            case 'test':
-                $dest_dir = $this->config->get($atts['role'] . '_dir', null, $channel) .
-                            DIRECTORY_SEPARATOR . $this->pkginfo->getPackage();
-                unset($atts['baseinstalldir']);
-                break;
-            case 'ext':
-            case 'php':
-                $dest_dir = $this->config->get($atts['role'] . '_dir', null, $channel);
-                break;
-            case 'script':
-                $dest_dir = $this->config->get('bin_dir', null, $channel);
-                break;
-            default:
-                return $this->raiseError("Invalid role `$atts[role]' for file $file");
-        }
-
-        $save_destdir = $dest_dir;
-        if (!empty($atts['baseinstalldir'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-        }
-
-        if (dirname($file) != '.' && empty($atts['install-as'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
-        }
-
-        if (empty($atts['install-as'])) {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
-        } else {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
-        }
-        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
-
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        list($dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    array($dest_file, $orig_file));
-        $final_dest_file = $installed_as = $dest_file;
-        if (isset($this->_options['packagingroot'])) {
-            $installedas_dest_dir  = dirname($final_dest_file);
-            $installedas_dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-            $final_dest_file = $this->_prependPath($final_dest_file, $this->_options['packagingroot']);
-        } else {
-            $installedas_dest_dir  = dirname($final_dest_file);
-            $installedas_dest_file = $installedas_dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        }
-
-        $dest_dir  = dirname($final_dest_file);
-        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        if (preg_match('~/\.\.(/|\\z)|^\.\./~', str_replace('\\', '/', $dest_file))) {
-            return $this->raiseError("SECURITY ERROR: file $file (installed to $dest_file) contains parent directory reference ..", PEAR_INSTALLER_FAILED);
-        }
-        // }}}
-
-        if (empty($this->_options['register-only']) &&
-              (!file_exists($dest_dir) || !is_dir($dest_dir))) {
-            if (!$this->mkDirHier($dest_dir)) {
-                return $this->raiseError("failed to mkdir $dest_dir",
-                                         PEAR_INSTALLER_FAILED);
-            }
-            $this->log(3, "+ mkdir $dest_dir");
-        }
-
-        // pretty much nothing happens if we are only registering the install
-        if (empty($this->_options['register-only'])) {
-            if (empty($atts['replacements'])) {
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                if (!@copy($orig_file, $dest_file)) {
-                    return $this->raiseError("failed to write $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                $this->log(3, "+ cp $orig_file $dest_file");
-                if (isset($atts['md5sum'])) {
-                    $md5sum = md5_file($dest_file);
-                }
-            } else {
-                // {{{ file with replacements
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                $contents = file_get_contents($orig_file);
-                if ($contents === false) {
-                    $contents = '';
-                }
-
-                if (isset($atts['md5sum'])) {
-                    $md5sum = md5($contents);
-                }
-
-                $subst_from = $subst_to = array();
-                foreach ($atts['replacements'] as $a) {
-                    $to = '';
-                    if ($a['type'] == 'php-const') {
-                        if (preg_match('/^[a-z0-9_]+\\z/i', $a['to'])) {
-                            eval("\$to = $a[to];");
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid php-const replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    } elseif ($a['type'] == 'pear-config') {
-                        if ($a['to'] == 'master_server') {
-                            $chan = $this->_registry->getChannel($channel);
-                            if (!PEAR::isError($chan)) {
-                                $to = $chan->getServer();
-                            } else {
-                                $to = $this->config->get($a['to'], null, $channel);
-                            }
-                        } else {
-                            $to = $this->config->get($a['to'], null, $channel);
-                        }
-                        if (is_null($to)) {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid pear-config replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    } elseif ($a['type'] == 'package-info') {
-                        if ($t = $this->pkginfo->packageInfo($a['to'])) {
-                            $to = $t;
-                        } else {
-                            if (!isset($options['soft'])) {
-                                $this->log(0, "invalid package-info replacement: $a[to]");
-                            }
-                            continue;
-                        }
-                    }
-                    if (!is_null($to)) {
-                        $subst_from[] = $a['from'];
-                        $subst_to[] = $to;
-                    }
-                }
-
-                $this->log(3, "doing ".sizeof($subst_from)." substitution(s) for $final_dest_file");
-                if (sizeof($subst_from)) {
-                    $contents = str_replace($subst_from, $subst_to, $contents);
-                }
-
-                $wp = @fopen($dest_file, "wb");
-                if (!is_resource($wp)) {
-                    return $this->raiseError("failed to create $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                if (@fwrite($wp, $contents) === false) {
-                    return $this->raiseError("failed writing to $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                fclose($wp);
-                // }}}
-            }
-
-            // {{{ check the md5
-            if (isset($md5sum)) {
-                if (strtolower($md5sum) === strtolower($atts['md5sum'])) {
-                    $this->log(2, "md5sum ok: $final_dest_file");
-                } else {
-                    if (empty($options['force'])) {
-                        // delete the file
-                        if (file_exists($dest_file)) {
-                            unlink($dest_file);
-                        }
-
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError("bad md5sum for file $final_dest_file",
-                                                 PEAR_INSTALLER_FAILED);
-                        }
-
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    }
-                }
-            }
-            // }}}
-            // {{{ set file permissions
-            if (!OS_WINDOWS) {
-                if ($atts['role'] == 'script') {
-                    $mode = 0777 & ~(int)octdec($this->config->get('umask'));
-                    $this->log(3, "+ chmod +x $dest_file");
-                } else {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                }
-
-                if ($atts['role'] != 'src') {
-                    $this->addFileOperation("chmod", array($mode, $dest_file));
-                    if (!@chmod($dest_file, $mode)) {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "failed to change mode of $dest_file: $php_errormsg");
-                        }
-                    }
-                }
-            }
-            // }}}
-
-            if ($atts['role'] == 'src') {
-                rename($dest_file, $final_dest_file);
-                $this->log(2, "renamed source file $dest_file to $final_dest_file");
-            } else {
-                $this->addFileOperation("rename", array($dest_file, $final_dest_file,
-                    $atts['role'] == 'ext'));
-            }
-        }
-
-        // Store the full path where the file was installed for easy unistall
-        if ($atts['role'] != 'script') {
-            $loc = $this->config->get($atts['role'] . '_dir');
-        } else {
-            $loc = $this->config->get('bin_dir');
-        }
-
-        if ($atts['role'] != 'src') {
-            $this->addFileOperation("installed_as", array($file, $installed_as,
-                                    $loc,
-                                    dirname(substr($installedas_dest_file, strlen($loc)))));
-        }
-
-        //$this->log(2, "installed: $dest_file");
-        return PEAR_INSTALLER_OK;
-    }
-
-    // }}}
-    // {{{ _installFile2()
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string filename
-     * @param array attributes from <file> tag in package.xml
-     * @param string path to install the file in
-     * @param array options from command-line
-     * @access private
-     */
-    function _installFile2(&$pkg, $file, &$real_atts, $tmp_path, $options)
-    {
-        $atts = $real_atts;
-        if (!isset($this->_registry)) {
-            $this->_registry = &$this->config->getRegistry();
-        }
-
-        $channel = $pkg->getChannel();
-        // {{{ assemble the destination paths
-        if (!in_array($atts['attribs']['role'],
-              PEAR_Installer_Role::getValidRoles($pkg->getPackageType()))) {
-            return $this->raiseError('Invalid role `' . $atts['attribs']['role'] .
-                    "' for file $file");
-        }
-
-        $role = &PEAR_Installer_Role::factory($pkg, $atts['attribs']['role'], $this->config);
-        $err  = $role->setup($this, $pkg, $atts['attribs'], $file);
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        if (!$role->isInstallable()) {
-            return;
-        }
-
-        $info = $role->processInstallation($pkg, $atts['attribs'], $file, $tmp_path);
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-
-        list($save_destdir, $dest_dir, $dest_file, $orig_file) = $info;
-        if (preg_match('~/\.\.(/|\\z)|^\.\./~', str_replace('\\', '/', $dest_file))) {
-            return $this->raiseError("SECURITY ERROR: file $file (installed to $dest_file) contains parent directory reference ..", PEAR_INSTALLER_FAILED);
-        }
-
-        $final_dest_file = $installed_as = $dest_file;
-        if (isset($this->_options['packagingroot'])) {
-            $final_dest_file = $this->_prependPath($final_dest_file,
-                $this->_options['packagingroot']);
-        }
-
-        $dest_dir  = dirname($final_dest_file);
-        $dest_file = $dest_dir . DIRECTORY_SEPARATOR . '.tmp' . basename($final_dest_file);
-        // }}}
-
-        if (empty($this->_options['register-only'])) {
-            if (!file_exists($dest_dir) || !is_dir($dest_dir)) {
-                if (!$this->mkDirHier($dest_dir)) {
-                    return $this->raiseError("failed to mkdir $dest_dir",
-                                             PEAR_INSTALLER_FAILED);
-                }
-                $this->log(3, "+ mkdir $dest_dir");
-            }
-        }
-
-        $attribs = $atts['attribs'];
-        unset($atts['attribs']);
-        // pretty much nothing happens if we are only registering the install
-        if (empty($this->_options['register-only'])) {
-            if (!count($atts)) { // no tasks
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                if (!@copy($orig_file, $dest_file)) {
-                    return $this->raiseError("failed to write $dest_file: $php_errormsg",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                $this->log(3, "+ cp $orig_file $dest_file");
-                if (isset($attribs['md5sum'])) {
-                    $md5sum = md5_file($dest_file);
-                }
-            } else { // file with tasks
-                if (!file_exists($orig_file)) {
-                    return $this->raiseError("file $orig_file does not exist",
-                                             PEAR_INSTALLER_FAILED);
-                }
-
-                $contents = file_get_contents($orig_file);
-                if ($contents === false) {
-                    $contents = '';
-                }
-
-                if (isset($attribs['md5sum'])) {
-                    $md5sum = md5($contents);
-                }
-
-                foreach ($atts as $tag => $raw) {
-                    $tag = str_replace(array($pkg->getTasksNs() . ':', '-'), array('', '_'), $tag);
-                    $task = "PEAR_Task_$tag";
-                    $task = &new $task($this->config, $this, PEAR_TASK_INSTALL);
-                    if (!$task->isScript()) { // scripts are only handled after installation
-                        $task->init($raw, $attribs, $pkg->getLastInstalledVersion());
-                        $res = $task->startSession($pkg, $contents, $final_dest_file);
-                        if ($res === false) {
-                            continue; // skip this file
-                        }
-
-                        if (PEAR::isError($res)) {
-                            return $res;
-                        }
-
-                        $contents = $res; // save changes
-                    }
-
-                    $wp = @fopen($dest_file, "wb");
-                    if (!is_resource($wp)) {
-                        return $this->raiseError("failed to create $dest_file: $php_errormsg",
-                                                 PEAR_INSTALLER_FAILED);
-                    }
-
-                    if (fwrite($wp, $contents) === false) {
-                        return $this->raiseError("failed writing to $dest_file: $php_errormsg",
-                                                 PEAR_INSTALLER_FAILED);
-                    }
-
-                    fclose($wp);
-                }
-            }
-
-            // {{{ check the md5
-            if (isset($md5sum)) {
-                // Make sure the original md5 sum matches with expected
-                if (strtolower($md5sum) === strtolower($attribs['md5sum'])) {
-                    $this->log(2, "md5sum ok: $final_dest_file");
-
-                    if (isset($contents)) {
-                        // set md5 sum based on $content in case any tasks were run.
-                        $real_atts['attribs']['md5sum'] = md5($contents);
-                    }
-                } else {
-                    if (empty($options['force'])) {
-                        // delete the file
-                        if (file_exists($dest_file)) {
-                            unlink($dest_file);
-                        }
-
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError("bad md5sum for file $final_dest_file",
-                                                     PEAR_INSTALLER_FAILED);
-                        }
-
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    } else {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "warning : bad md5sum for file $final_dest_file");
-                        }
-                    }
-                }
-            } else {
-                $real_atts['attribs']['md5sum'] = md5_file($dest_file);
-            }
-
-            // }}}
-            // {{{ set file permissions
-            if (!OS_WINDOWS) {
-                if ($role->isExecutable()) {
-                    $mode = 0777 & ~(int)octdec($this->config->get('umask'));
-                    $this->log(3, "+ chmod +x $dest_file");
-                } else {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                }
-
-                if ($attribs['role'] != 'src') {
-                    $this->addFileOperation("chmod", array($mode, $dest_file));
-                    if (!@chmod($dest_file, $mode)) {
-                        if (!isset($options['soft'])) {
-                            $this->log(0, "failed to change mode of $dest_file: $php_errormsg");
-                        }
-                    }
-                }
-            }
-            // }}}
-
-            if ($attribs['role'] == 'src') {
-                rename($dest_file, $final_dest_file);
-                $this->log(2, "renamed source file $dest_file to $final_dest_file");
-            } else {
-                $this->addFileOperation("rename", array($dest_file, $final_dest_file, $role->isExtension()));
-            }
-        }
-
-        // Store the full path where the file was installed for easy uninstall
-        if ($attribs['role'] != 'src') {
-            $loc = $this->config->get($role->getLocationConfig(), null, $channel);
-            $this->addFileOperation('installed_as', array($file, $installed_as,
-                                $loc,
-                                dirname(substr($installed_as, strlen($loc)))));
-        }
-
-        //$this->log(2, "installed: $dest_file");
-        return PEAR_INSTALLER_OK;
-    }
-
-    // }}}
-    // {{{ addFileOperation()
-
-    /**
-     * Add a file operation to the current file transaction.
-     *
-     * @see startFileTransaction()
-     * @param string $type This can be one of:
-     *    - rename:  rename a file ($data has 3 values)
-     *    - backup:  backup an existing file ($data has 1 value)
-     *    - removebackup:  clean up backups created during install ($data has 1 value)
-     *    - chmod:   change permissions on a file ($data has 2 values)
-     *    - delete:  delete a file ($data has 1 value)
-     *    - rmdir:   delete a directory if empty ($data has 1 value)
-     *    - installed_as: mark a file as installed ($data has 4 values).
-     * @param array $data For all file operations, this array must contain the
-     *    full path to the file or directory that is being operated on.  For
-     *    the rename command, the first parameter must be the file to rename,
-     *    the second its new name, the third whether this is a PHP extension.
-     *
-     *    The installed_as operation contains 4 elements in this order:
-     *    1. Filename as listed in the filelist element from package.xml
-     *    2. Full path to the installed file
-     *    3. Full path from the php_dir configuration variable used in this
-     *       installation
-     *    4. Relative path from the php_dir that this file is installed in
-     */
-    function addFileOperation($type, $data)
-    {
-        if (!is_array($data)) {
-            return $this->raiseError('Internal Error: $data in addFileOperation'
-                . ' must be an array, was ' . gettype($data));
-        }
-
-        if ($type == 'chmod') {
-            $octmode = decoct($data[0]);
-            $this->log(3, "adding to transaction: $type $octmode $data[1]");
-        } else {
-            $this->log(3, "adding to transaction: $type " . implode(" ", $data));
-        }
-        $this->file_operations[] = array($type, $data);
-    }
-
-    // }}}
-    // {{{ startFileTransaction()
-
-    function startFileTransaction($rollback_in_case = false)
-    {
-        if (count($this->file_operations) && $rollback_in_case) {
-            $this->rollbackFileTransaction();
-        }
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ commitFileTransaction()
-
-    function commitFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "about to commit $n file operations");
-        // {{{ first, check permissions and such manually
-        $errors = array();
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'rename':
-                    if (!file_exists($data[0])) {
-                        $errors[] = "cannot rename file $data[0], doesn't exist";
-                    }
-
-                    // check that dest dir. is writable
-                    if (!is_writable(dirname($data[1]))) {
-                        $errors[] = "permission denied ($type): $data[1]";
-                    }
-                    break;
-                case 'chmod':
-                    // check that file is writable
-                    if (!is_writable($data[1])) {
-                        $errors[] = "permission denied ($type): $data[1] " . decoct($data[0]);
-                    }
-                    break;
-                case 'delete':
-                    if (!file_exists($data[0])) {
-                        $this->log(2, "warning: file $data[0] doesn't exist, can't be deleted");
-                    }
-                    // check that directory is writable
-                    if (file_exists($data[0])) {
-                        if (!is_writable(dirname($data[0]))) {
-                            $errors[] = "permission denied ($type): $data[0]";
-                        } else {
-                            // make sure the file to be deleted can be opened for writing
-                            $fp = false;
-                            if (!is_dir($data[0]) &&
-                                  (!is_writable($data[0]) || !($fp = @fopen($data[0], 'a')))) {
-                                $errors[] = "permission denied ($type): $data[0]";
-                            } elseif ($fp) {
-                                fclose($fp);
-                            }
-                        }
-                    }
-                    break;
-            }
-
-        }
-        // }}}
-        $m = count($errors);
-        if ($m > 0) {
-            foreach ($errors as $error) {
-                if (!isset($this->_options['soft'])) {
-                    $this->log(1, $error);
-                }
-            }
-
-            if (!isset($this->_options['ignore-errors'])) {
-                return false;
-            }
-        }
-
-        $this->_dirtree = array();
-        // {{{ really commit the transaction
-        foreach ($this->file_operations as $i => $tr) {
-            if (!$tr) {
-                // support removal of non-existing backups
-                continue;
-            }
-
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'backup':
-                    if (!file_exists($data[0])) {
-                        $this->file_operations[$i] = false;
-                        break;
-                    }
-
-                    if (!@copy($data[0], $data[0] . '.bak')) {
-                        $this->log(1, 'Could not copy ' . $data[0] . ' to ' . $data[0] .
-                            '.bak ' . $php_errormsg);
-                        return false;
-                    }
-                    $this->log(3, "+ backup $data[0] to $data[0].bak");
-                    break;
-                case 'removebackup':
-                    if (file_exists($data[0] . '.bak') && is_writable($data[0] . '.bak')) {
-                        unlink($data[0] . '.bak');
-                        $this->log(3, "+ rm backup of $data[0] ($data[0].bak)");
-                    }
-                    break;
-                case 'rename':
-                    $test = file_exists($data[1]) ? @unlink($data[1]) : null;
-                    if (!$test && file_exists($data[1])) {
-                        if ($data[2]) {
-                            $extra = ', this extension must be installed manually.  Rename to "' .
-                                basename($data[1]) . '"';
-                        } else {
-                            $extra = '';
-                        }
-
-                        if (!isset($this->_options['soft'])) {
-                            $this->log(1, 'Could not delete ' . $data[1] . ', cannot rename ' .
-                                $data[0] . $extra);
-                        }
-
-                        if (!isset($this->_options['ignore-errors'])) {
-                            return false;
-                        }
-                    }
-
-                    // permissions issues with rename - copy() is far superior
-                    $perms = @fileperms($data[0]);
-                    if (!@copy($data[0], $data[1])) {
-                        $this->log(1, 'Could not rename ' . $data[0] . ' to ' . $data[1] .
-                            ' ' . $php_errormsg);
-                        return false;
-                    }
-
-                    // copy over permissions, otherwise they are lost
-                    @chmod($data[1], $perms);
-                    @unlink($data[0]);
-                    $this->log(3, "+ mv $data[0] $data[1]");
-                    break;
-                case 'chmod':
-                    if (!@chmod($data[1], $data[0])) {
-                        $this->log(1, 'Could not chmod ' . $data[1] . ' to ' .
-                            decoct($data[0]) . ' ' . $php_errormsg);
-                        return false;
-                    }
-
-                    $octmode = decoct($data[0]);
-                    $this->log(3, "+ chmod $octmode $data[1]");
-                    break;
-                case 'delete':
-                    if (file_exists($data[0])) {
-                        if (!@unlink($data[0])) {
-                            $this->log(1, 'Could not delete ' . $data[0] . ' ' .
-                                $php_errormsg);
-                            return false;
-                        }
-                        $this->log(3, "+ rm $data[0]");
-                    }
-                    break;
-                case 'rmdir':
-                    if (file_exists($data[0])) {
-                        do {
-                            $testme = opendir($data[0]);
-                            while (false !== ($entry = readdir($testme))) {
-                                if ($entry == '.' || $entry == '..') {
-                                    continue;
-                                }
-                                closedir($testme);
-                                break 2; // this directory is not empty and can't be
-                                         // deleted
-                            }
-
-                            closedir($testme);
-                            if (!@rmdir($data[0])) {
-                                $this->log(1, 'Could not rmdir ' . $data[0] . ' ' .
-                                    $php_errormsg);
-                                return false;
-                            }
-                            $this->log(3, "+ rmdir $data[0]");
-                        } while (false);
-                    }
-                    break;
-                case 'installed_as':
-                    $this->pkginfo->setInstalledAs($data[0], $data[1]);
-                    if (!isset($this->_dirtree[dirname($data[1])])) {
-                        $this->_dirtree[dirname($data[1])] = true;
-                        $this->pkginfo->setDirtree(dirname($data[1]));
-
-                        while(!empty($data[3]) && dirname($data[3]) != $data[3] &&
-                                $data[3] != '/' && $data[3] != '\\') {
-                            $this->pkginfo->setDirtree($pp =
-                                $this->_prependPath($data[3], $data[2]));
-                            $this->_dirtree[$pp] = true;
-                            $data[3] = dirname($data[3]);
-                        }
-                    }
-                    break;
-            }
-        }
-        // }}}
-        $this->log(2, "successfully committed $n file operations");
-        $this->file_operations = array();
-        return true;
-    }
-
-    // }}}
-    // {{{ rollbackFileTransaction()
-
-    function rollbackFileTransaction()
-    {
-        $n = count($this->file_operations);
-        $this->log(2, "rolling back $n file operations");
-        foreach ($this->file_operations as $tr) {
-            list($type, $data) = $tr;
-            switch ($type) {
-                case 'backup':
-                    if (file_exists($data[0] . '.bak')) {
-                        if (file_exists($data[0] && is_writable($data[0]))) {
-                            unlink($data[0]);
-                        }
-                        @copy($data[0] . '.bak', $data[0]);
-                        $this->log(3, "+ restore $data[0] from $data[0].bak");
-                    }
-                    break;
-                case 'removebackup':
-                    if (file_exists($data[0] . '.bak') && is_writable($data[0] . '.bak')) {
-                        unlink($data[0] . '.bak');
-                        $this->log(3, "+ rm backup of $data[0] ($data[0].bak)");
-                    }
-                    break;
-                case 'rename':
-                    @unlink($data[0]);
-                    $this->log(3, "+ rm $data[0]");
-                    break;
-                case 'mkdir':
-                    @rmdir($data[0]);
-                    $this->log(3, "+ rmdir $data[0]");
-                    break;
-                case 'chmod':
-                    break;
-                case 'delete':
-                    break;
-                case 'installed_as':
-                    $this->pkginfo->setInstalledAs($data[0], false);
-                    break;
-            }
-        }
-        $this->pkginfo->resetDirtree();
-        $this->file_operations = array();
-    }
-
-    // }}}
-    // {{{ mkDirHier($dir)
-
-    function mkDirHier($dir)
-    {
-        $this->addFileOperation('mkdir', array($dir));
-        return parent::mkDirHier($dir);
-    }
-
-    // }}}
-    // {{{ download()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * @param array a mixed list of package names, local files, or package.xml
-     * @param PEAR_Config
-     * @param array options from the command line
-     * @param array this is the array that will be populated with packages to
-     *              install.  Format of each entry:
-     *
-     * <code>
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * </code>
-     * @param array this will be populated with any error messages
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @deprecated in favor of PEAR_Downloader
-     */
-    function download($packages, $options, &$config, &$installpackages,
-                      &$errors, $installed = false, $willinstall = false, $state = false)
-    {
-        // trickiness: initialize here
-        parent::PEAR_Downloader($this->ui, $options, $config);
-        $ret             = parent::download($packages);
-        $errors          = $this->getErrorMsgs();
-        $installpackages = $this->getDownloadedPackages();
-        trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
-                      "in favor of PEAR_Downloader class", E_USER_WARNING);
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _parsePackageXml()
-
-    function _parsePackageXml(&$descfile, &$tmpdir)
-    {
-        if (substr($descfile, -4) == '.xml') {
-            $tmpdir = false;
-        } else {
-            // {{{ Decompress pack in tmp dir -------------------------------------
-
-            // To allow relative package file names
-            $descfile = realpath($descfile);
-
-            if (PEAR::isError($tmpdir = System::mktemp('-d'))) {
-                return $tmpdir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $tmpdir);
-            // }}}
-        }
-
-        // Parse xml file -----------------------------------------------
-        $pkg = new PEAR_PackageFile($this->config, $this->debug, $tmpdir);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $p = &$pkg->fromAnyFile($descfile, PEAR_VALIDATE_INSTALLING);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($p)) {
-            if (is_array($p->getUserInfo())) {
-                foreach ($p->getUserInfo() as $err) {
-                    $loglevel = $err['level'] == 'error' ? 0 : 1;
-                    if (!isset($this->_options['soft'])) {
-                        $this->log($loglevel, ucfirst($err['level']) . ': ' . $err['message']);
-                    }
-                }
-            }
-            return $this->raiseError('Installation failed: invalid package file');
-        }
-
-        $descfile = $p->getPackageFile();
-        return $p;
-    }
-
-    // }}}
-    /**
-     * Set the list of PEAR_Downloader_Package objects to allow more sane
-     * dependency validation
-     * @param array
-     */
-    function setDownloadedPackages(&$pkgs)
-    {
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $err = $this->analyzeDependencies($pkgs);
-        PEAR::popErrorHandling();
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-        $this->_downloadedPackages = &$pkgs;
-    }
-
-    /**
-     * Set the list of PEAR_Downloader_Package objects to allow more sane
-     * dependency validation
-     * @param array
-     */
-    function setUninstallPackages(&$pkgs)
-    {
-        $this->_downloadedPackages = &$pkgs;
-    }
-
-    function getInstallPackages()
-    {
-        return $this->_downloadedPackages;
-    }
-
-    // {{{ install()
-
-    /**
-     * Installs the files within the package file specified.
-     *
-     * @param string|PEAR_Downloader_Package $pkgfile path to the package file,
-     *        or a pre-initialized packagefile object
-     * @param array $options
-     * recognized options:
-     * - installroot   : optional prefix directory for installation
-     * - force         : force installation
-     * - register-only : update registry but don't install files
-     * - upgrade       : upgrade existing install
-     * - soft          : fail silently
-     * - nodeps        : ignore dependency conflicts/missing dependencies
-     * - alldeps       : install all dependencies
-     * - onlyreqdeps   : install only required dependencies
-     *
-     * @return array|PEAR_Error package info if successful
-     */
-    function install($pkgfile, $options = array())
-    {
-        $this->_options = $options;
-        $this->_registry = &$this->config->getRegistry();
-        if (is_object($pkgfile)) {
-            $dlpkg    = &$pkgfile;
-            $pkg      = $pkgfile->getPackageFile();
-            $pkgfile  = $pkg->getArchiveFile();
-            $descfile = $pkg->getPackageFile();
-            $tmpdir   = dirname($descfile);
-        } else {
-            $descfile = $pkgfile;
-            $tmpdir   = '';
-            $pkg      = $this->_parsePackageXml($descfile, $tmpdir);
-            if (PEAR::isError($pkg)) {
-                return $pkg;
-            }
-        }
-
-        if (realpath($descfile) != realpath($pkgfile)) {
-            $tar = new Archive_Tar($pkgfile);
-            if (!$tar->extract($tmpdir)) {
-                return $this->raiseError("unable to unpack $pkgfile");
-            }
-        }
-
-        $pkgname = $pkg->getName();
-        $channel = $pkg->getChannel();
-        if (isset($this->_options['packagingroot'])) {
-            $regdir = $this->_prependPath(
-                $this->config->get('php_dir', null, 'pear.php.net'),
-                $this->_options['packagingroot']);
-
-            $packrootphp_dir = $this->_prependPath(
-                $this->config->get('php_dir', null, $channel),
-                $this->_options['packagingroot']);
-        }
-
-        if (isset($options['installroot'])) {
-            $this->config->setInstallRoot($options['installroot']);
-            $this->_registry = &$this->config->getRegistry();
-            $installregistry = &$this->_registry;
-            $this->installroot = ''; // all done automagically now
-            $php_dir = $this->config->get('php_dir', null, $channel);
-        } else {
-            $this->config->setInstallRoot(false);
-            $this->_registry = &$this->config->getRegistry();
-            if (isset($this->_options['packagingroot'])) {
-                $installregistry = &new PEAR_Registry($regdir);
-                if (!$installregistry->channelExists($channel, true)) {
-                    // we need to fake a channel-discover of this channel
-                    $chanobj = $this->_registry->getChannel($channel, true);
-                    $installregistry->addChannel($chanobj);
-                }
-                $php_dir = $packrootphp_dir;
-            } else {
-                $installregistry = &$this->_registry;
-                $php_dir = $this->config->get('php_dir', null, $channel);
-            }
-            $this->installroot = '';
-        }
-
-        // {{{ checks to do when not in "force" mode
-        if (empty($options['force']) &&
-              (file_exists($this->config->get('php_dir')) &&
-               is_dir($this->config->get('php_dir')))) {
-            $testp = $channel == 'pear.php.net' ? $pkgname : array($channel, $pkgname);
-            $instfilelist = $pkg->getInstallationFileList(true);
-            if (PEAR::isError($instfilelist)) {
-                return $instfilelist;
-            }
-
-            // ensure we have the most accurate registry
-            $installregistry->flushFileMap();
-            $test = $installregistry->checkFileMap($instfilelist, $testp, '1.1');
-            if (PEAR::isError($test)) {
-                return $test;
-            }
-
-            if (sizeof($test)) {
-                $pkgs = $this->getInstallPackages();
-                $found = false;
-                foreach ($pkgs as $param) {
-                    if ($pkg->isSubpackageOf($param)) {
-                        $found = true;
-                        break;
-                    }
-                }
-
-                if ($found) {
-                    // subpackages can conflict with earlier versions of parent packages
-                    $parentreg = $installregistry->packageInfo($param->getPackage(), null, $param->getChannel());
-                    $tmp = $test;
-                    foreach ($tmp as $file => $info) {
-                        if (is_array($info)) {
-                            if (strtolower($info[1]) == strtolower($param->getPackage()) &&
-                                  strtolower($info[0]) == strtolower($param->getChannel())
-                            ) {
-                                if (isset($parentreg['filelist'][$file])) {
-                                    unset($parentreg['filelist'][$file]);
-                                } else{
-                                    $pos     = strpos($file, '/');
-                                    $basedir = substr($file, 0, $pos);
-                                    $file2   = substr($file, $pos + 1);
-                                    if (isset($parentreg['filelist'][$file2]['baseinstalldir'])
-                                        && $parentreg['filelist'][$file2]['baseinstalldir'] === $basedir
-                                    ) {
-                                        unset($parentreg['filelist'][$file2]);
-                                    }
-                                }
-
-                                unset($test[$file]);
-                            }
-                        } else {
-                            if (strtolower($param->getChannel()) != 'pear.php.net') {
-                                continue;
-                            }
-
-                            if (strtolower($info) == strtolower($param->getPackage())) {
-                                if (isset($parentreg['filelist'][$file])) {
-                                    unset($parentreg['filelist'][$file]);
-                                } else{
-                                    $pos     = strpos($file, '/');
-                                    $basedir = substr($file, 0, $pos);
-                                    $file2   = substr($file, $pos + 1);
-                                    if (isset($parentreg['filelist'][$file2]['baseinstalldir'])
-                                        && $parentreg['filelist'][$file2]['baseinstalldir'] === $basedir
-                                    ) {
-                                        unset($parentreg['filelist'][$file2]);
-                                    }
-                                }
-
-                                unset($test[$file]);
-                            }
-                        }
-                    }
-
-                    $pfk = &new PEAR_PackageFile($this->config);
-                    $parentpkg = &$pfk->fromArray($parentreg);
-                    $installregistry->updatePackage2($parentpkg);
-                }
-
-                if ($param->getChannel() == 'pecl.php.net' && isset($options['upgrade'])) {
-                    $tmp = $test;
-                    foreach ($tmp as $file => $info) {
-                        if (is_string($info)) {
-                            // pear.php.net packages are always stored as strings
-                            if (strtolower($info) == strtolower($param->getPackage())) {
-                                // upgrading existing package
-                                unset($test[$file]);
-                            }
-                        }
-                    }
-                }
-
-                if (count($test)) {
-                    $msg = "$channel/$pkgname: conflicting files found:\n";
-                    $longest = max(array_map("strlen", array_keys($test)));
-                    $fmt = "%${longest}s (%s)\n";
-                    foreach ($test as $file => $info) {
-                        if (!is_array($info)) {
-                            $info = array('pear.php.net', $info);
-                        }
-                        $info = $info[0] . '/' . $info[1];
-                        $msg .= sprintf($fmt, $file, $info);
-                    }
-
-                    if (!isset($options['ignore-errors'])) {
-                        return $this->raiseError($msg);
-                    }
-
-                    if (!isset($options['soft'])) {
-                        $this->log(0, "WARNING: $msg");
-                    }
-                }
-            }
-        }
-        // }}}
-
-        $this->startFileTransaction();
-
-        if (empty($options['upgrade']) && empty($options['soft'])) {
-            // checks to do only when installing new packages
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-
-            if (empty($options['force']) && $test) {
-                return $this->raiseError("$channel/$pkgname is already installed");
-            }
-        } else {
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-
-            if ($test) {
-                $v1 = $installregistry->packageInfo($pkgname, 'version', $usechannel);
-                $v2 = $pkg->getVersion();
-                $cmp = version_compare("$v1", "$v2", 'gt');
-                if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
-                    return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
-                }
-
-                if (empty($options['register-only'])) {
-                    // when upgrading, remove old release's files first:
-                    if (PEAR::isError($err = $this->_deletePackageFiles($pkgname, $usechannel,
-                          true))) {
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError($err);
-                        }
-
-                        if (!isset($options['soft'])) {
-                            $this->log(0, 'WARNING: ' . $err->getMessage());
-                        }
-                    } else {
-                        $backedup = $err;
-                    }
-                }
-            }
-        }
-
-        // {{{ Copy files to dest dir ---------------------------------------
-
-        // info from the package it self we want to access from _installFile
-        $this->pkginfo = &$pkg;
-        // used to determine whether we should build any C code
-        $this->source_files = 0;
-
-        $savechannel = $this->config->get('default_channel');
-        if (empty($options['register-only']) && !is_dir($php_dir)) {
-            if (PEAR::isError(System::mkdir(array('-p'), $php_dir))) {
-                return $this->raiseError("no installation destination directory '$php_dir'\n");
-            }
-        }
-
-        $tmp_path = dirname($descfile);
-        if (substr($pkgfile, -4) != '.xml') {
-            $tmp_path .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkg->getVersion();
-        }
-
-        $this->configSet('default_channel', $channel);
-        // {{{ install files
-
-        $ver = $pkg->getPackagexmlVersion();
-        if (version_compare($ver, '2.0', '>=')) {
-            $filelist = $pkg->getInstallationFilelist();
-        } else {
-            $filelist = $pkg->getFileList();
-        }
-
-        if (PEAR::isError($filelist)) {
-            return $filelist;
-        }
-
-        $p = &$installregistry->getPackage($pkgname, $channel);
-        $dirtree = (empty($options['register-only']) && $p) ? $p->getDirTree() : false;
-
-        $pkg->resetFilelist();
-        $pkg->setLastInstalledVersion($installregistry->packageInfo($pkg->getPackage(),
-            'version', $pkg->getChannel()));
-        foreach ($filelist as $file => $atts) {
-            $this->expectError(PEAR_INSTALLER_FAILED);
-            if ($pkg->getPackagexmlVersion() == '1.0') {
-                $res = $this->_installFile($file, $atts, $tmp_path, $options);
-            } else {
-                $res = $this->_installFile2($pkg, $file, $atts, $tmp_path, $options);
-            }
-            $this->popExpect();
-
-            if (PEAR::isError($res)) {
-                if (empty($options['ignore-errors'])) {
-                    $this->rollbackFileTransaction();
-                    if ($res->getMessage() == "file does not exist") {
-                        $this->raiseError("file $file in package.xml does not exist");
-                    }
-
-                    return $this->raiseError($res);
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->log(0, "Warning: " . $res->getMessage());
-                }
-            }
-
-            $real = isset($atts['attribs']) ? $atts['attribs'] : $atts;
-            if ($res == PEAR_INSTALLER_OK && $real['role'] != 'src') {
-                // Register files that were installed
-                $pkg->installedFile($file, $atts);
-            }
-        }
-        // }}}
-
-        // {{{ compile and install source files
-        if ($this->source_files > 0 && empty($options['nobuild'])) {
-            if (PEAR::isError($err =
-                  $this->_compileSourceFiles($savechannel, $pkg))) {
-                return $err;
-            }
-        }
-        // }}}
-
-        if (isset($backedup)) {
-            $this->_removeBackups($backedup);
-        }
-
-        if (!$this->commitFileTransaction()) {
-            $this->rollbackFileTransaction();
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError("commit failed", PEAR_INSTALLER_FAILED);
-        }
-        // }}}
-
-        $ret          = false;
-        $installphase = 'install';
-        $oldversion   = false;
-        // {{{ Register that the package is installed -----------------------
-        if (empty($options['upgrade'])) {
-            // if 'force' is used, replace the info in registry
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-
-            if (!empty($options['force']) && $test) {
-                $oldversion = $installregistry->packageInfo($pkgname, 'version', $usechannel);
-                $installregistry->deletePackage($pkgname, $usechannel);
-            }
-            $ret = $installregistry->addPackage2($pkg);
-        } else {
-            if ($dirtree) {
-                $this->startFileTransaction();
-                // attempt to delete empty directories
-                uksort($dirtree, array($this, '_sortDirs'));
-                foreach($dirtree as $dir => $notused) {
-                    $this->addFileOperation('rmdir', array($dir));
-                }
-                $this->commitFileTransaction();
-            }
-
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-
-            // new: upgrade installs a package if it isn't installed
-            if (!$test) {
-                $ret = $installregistry->addPackage2($pkg);
-            } else {
-                if ($usechannel != $channel) {
-                    $installregistry->deletePackage($pkgname, $usechannel);
-                    $ret = $installregistry->addPackage2($pkg);
-                } else {
-                    $ret = $installregistry->updatePackage2($pkg);
-                }
-                $installphase = 'upgrade';
-            }
-        }
-
-        if (!$ret) {
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError("Adding package $channel/$pkgname to registry failed");
-        }
-        // }}}
-
-        $this->configSet('default_channel', $savechannel);
-        if (class_exists('PEAR_Task_Common')) { // this is auto-included if any tasks exist
-            if (PEAR_Task_Common::hasPostinstallTasks()) {
-                PEAR_Task_Common::runPostinstallTasks($installphase);
-            }
-        }
-
-        return $pkg->toArray(true);
-    }
-
-    // }}}
-
-    // {{{ _compileSourceFiles()
-    /**
-     * @param string
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function _compileSourceFiles($savechannel, &$filelist)
-    {
-        require_once 'PEAR/Builder.php';
-        $this->log(1, "$this->source_files source files, building");
-        $bob = &new PEAR_Builder($this->ui);
-        $bob->debug = $this->debug;
-        $built = $bob->build($filelist, array(&$this, '_buildCallback'));
-        if (PEAR::isError($built)) {
-            $this->rollbackFileTransaction();
-            $this->configSet('default_channel', $savechannel);
-            return $built;
-        }
-
-        $this->log(1, "\nBuild process completed successfully");
-        foreach ($built as $ext) {
-            $bn = basename($ext['file']);
-            list($_ext_name, $_ext_suff) = explode('.', $bn);
-            if ($_ext_suff == '.so' || $_ext_suff == '.dll') {
-                if (extension_loaded($_ext_name)) {
-                    $this->raiseError("Extension '$_ext_name' already loaded. " .
-                                      'Please unload it in your php.ini file ' .
-                                      'prior to install or upgrade');
-                }
-                $role = 'ext';
-            } else {
-                $role = 'src';
-            }
-
-            $dest = $ext['dest'];
-            $packagingroot = '';
-            if (isset($this->_options['packagingroot'])) {
-                $packagingroot = $this->_options['packagingroot'];
-            }
-
-            $copyto = $this->_prependPath($dest, $packagingroot);
-            $extra  = $copyto != $dest ? " as '$copyto'" : '';
-            $this->log(1, "Installing '$dest'$extra");
-
-            $copydir = dirname($copyto);
-            // pretty much nothing happens if we are only registering the install
-            if (empty($this->_options['register-only'])) {
-                if (!file_exists($copydir) || !is_dir($copydir)) {
-                    if (!$this->mkDirHier($copydir)) {
-                        return $this->raiseError("failed to mkdir $copydir",
-                            PEAR_INSTALLER_FAILED);
-                    }
-
-                    $this->log(3, "+ mkdir $copydir");
-                }
-
-                if (!@copy($ext['file'], $copyto)) {
-                    return $this->raiseError("failed to write $copyto ($php_errormsg)", PEAR_INSTALLER_FAILED);
-                }
-
-                $this->log(3, "+ cp $ext[file] $copyto");
-                $this->addFileOperation('rename', array($ext['file'], $copyto));
-                if (!OS_WINDOWS) {
-                    $mode = 0666 & ~(int)octdec($this->config->get('umask'));
-                    $this->addFileOperation('chmod', array($mode, $copyto));
-                    if (!@chmod($copyto, $mode)) {
-                        $this->log(0, "failed to change mode of $copyto ($php_errormsg)");
-                    }
-                }
-            }
-
-
-            $data = array(
-                'role'         => $role,
-                'name'         => $bn,
-                'installed_as' => $dest,
-                'php_api'      => $ext['php_api'],
-                'zend_mod_api' => $ext['zend_mod_api'],
-                'zend_ext_api' => $ext['zend_ext_api'],
-            );
-
-            if ($filelist->getPackageXmlVersion() == '1.0') {
-                $filelist->installedFile($bn, $data);
-            } else {
-                $filelist->installedFile($bn, array('attribs' => $data));
-            }
-        }
-    }
-
-    // }}}
-    function &getUninstallPackages()
-    {
-        return $this->_downloadedPackages;
-    }
-    // {{{ uninstall()
-
-    /**
-     * Uninstall a package
-     *
-     * This method removes all files installed by the application, and then
-     * removes any empty directories.
-     * @param string package name
-     * @param array Command-line options.  Possibilities include:
-     *
-     *              - installroot: base installation dir, if not the default
-     *              - register-only : update registry but don't remove files
-     *              - nodeps: do not process dependencies of other packages to ensure
-     *                        uninstallation does not break things
-     */
-    function uninstall($package, $options = array())
-    {
-        $installRoot = isset($options['installroot']) ? $options['installroot'] : '';
-        $this->config->setInstallRoot($installRoot);
-
-        $this->installroot = '';
-        $this->_registry = &$this->config->getRegistry();
-        if (is_object($package)) {
-            $channel = $package->getChannel();
-            $pkg     = $package;
-            $package = $pkg->getPackage();
-        } else {
-            $pkg = false;
-            $info = $this->_registry->parsePackageName($package,
-                $this->config->get('default_channel'));
-            $channel = $info['channel'];
-            $package = $info['package'];
-        }
-
-        $savechannel = $this->config->get('default_channel');
-        $this->configSet('default_channel', $channel);
-        if (!is_object($pkg)) {
-            $pkg = $this->_registry->getPackage($package, $channel);
-        }
-
-        if (!$pkg) {
-            $this->configSet('default_channel', $savechannel);
-            return $this->raiseError($this->_registry->parsedPackageNameToString(
-                array(
-                    'channel' => $channel,
-                    'package' => $package
-                ), true) . ' not installed');
-        }
-
-        if ($pkg->getInstalledBinary()) {
-            // this is just an alias for a binary package
-            return $this->_registry->deletePackage($package, $channel);
-        }
-
-        $filelist = $pkg->getFilelist();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        if (!class_exists('PEAR_Dependency2')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-
-        $depchecker = &new PEAR_Dependency2($this->config, $options,
-            array('channel' => $channel, 'package' => $package),
-            PEAR_VALIDATE_UNINSTALLING);
-        $e = $depchecker->validatePackageUninstall($this);
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($e)) {
-            if (!isset($options['ignore-errors'])) {
-                return $this->raiseError($e);
-            }
-
-            if (!isset($options['soft'])) {
-                $this->log(0, 'WARNING: ' . $e->getMessage());
-            }
-        } elseif (is_array($e)) {
-            if (!isset($options['soft'])) {
-                $this->log(0, $e[0]);
-            }
-        }
-
-        $this->pkginfo = &$pkg;
-        // pretty much nothing happens if we are only registering the uninstall
-        if (empty($options['register-only'])) {
-            // {{{ Delete the files
-            $this->startFileTransaction();
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            if (PEAR::isError($err = $this->_deletePackageFiles($package, $channel))) {
-                PEAR::popErrorHandling();
-                $this->rollbackFileTransaction();
-                $this->configSet('default_channel', $savechannel);
-                if (!isset($options['ignore-errors'])) {
-                    return $this->raiseError($err);
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->log(0, 'WARNING: ' . $err->getMessage());
-                }
-            } else {
-                PEAR::popErrorHandling();
-            }
-
-            if (!$this->commitFileTransaction()) {
-                $this->rollbackFileTransaction();
-                if (!isset($options['ignore-errors'])) {
-                    return $this->raiseError("uninstall failed");
-                }
-
-                if (!isset($options['soft'])) {
-                    $this->log(0, 'WARNING: uninstall failed');
-                }
-            } else {
-                $this->startFileTransaction();
-                $dirtree = $pkg->getDirTree();
-                if ($dirtree === false) {
-                    $this->configSet('default_channel', $savechannel);
-                    return $this->_registry->deletePackage($package, $channel);
-                }
-
-                // attempt to delete empty directories
-                uksort($dirtree, array($this, '_sortDirs'));
-                foreach($dirtree as $dir => $notused) {
-                    $this->addFileOperation('rmdir', array($dir));
-                }
-
-                if (!$this->commitFileTransaction()) {
-                    $this->rollbackFileTransaction();
-                    if (!isset($options['ignore-errors'])) {
-                        return $this->raiseError("uninstall failed");
-                    }
-
-                    if (!isset($options['soft'])) {
-                        $this->log(0, 'WARNING: uninstall failed');
-                    }
-                }
-            }
-            // }}}
-        }
-
-        $this->configSet('default_channel', $savechannel);
-        // Register that the package is no longer installed
-        return $this->_registry->deletePackage($package, $channel);
-    }
-
-    /**
-     * Sort a list of arrays of array(downloaded packagefilename) by dependency.
-     *
-     * It also removes duplicate dependencies
-     * @param array an array of PEAR_PackageFile_v[1/2] objects
-     * @return array|PEAR_Error array of array(packagefilename, package.xml contents)
-     */
-    function sortPackagesForUninstall(&$packages)
-    {
-        $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->config);
-        if (PEAR::isError($this->_dependencyDB)) {
-            return $this->_dependencyDB;
-        }
-        usort($packages, array(&$this, '_sortUninstall'));
-    }
-
-    function _sortUninstall($a, $b)
-    {
-        if (!$a->getDeps() && !$b->getDeps()) {
-            return 0; // neither package has dependencies, order is insignificant
-        }
-        if ($a->getDeps() && !$b->getDeps()) {
-            return -1; // $a must be installed after $b because $a has dependencies
-        }
-        if (!$a->getDeps() && $b->getDeps()) {
-            return 1; // $b must be installed after $a because $b has dependencies
-        }
-        // both packages have dependencies
-        if ($this->_dependencyDB->dependsOn($a, $b)) {
-            return -1;
-        }
-        if ($this->_dependencyDB->dependsOn($b, $a)) {
-            return 1;
-        }
-        return 0;
-    }
-
-    // }}}
-    // {{{ _sortDirs()
-    function _sortDirs($a, $b)
-    {
-        if (strnatcmp($a, $b) == -1) return 1;
-        if (strnatcmp($a, $b) == 1) return -1;
-        return 0;
-    }
-
-    // }}}
-
-    // {{{ _buildCallback()
-
-    function _buildCallback($what, $data)
-    {
-        if (($what == 'cmdoutput' && $this->debug > 1) ||
-            ($what == 'output' && $this->debug > 0)) {
-            $this->ui->outputData(rtrim($data), 'build');
-        }
-    }
-
-    // }}}
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role.php b/airtime_mvc/library/pear/PEAR/Installer/Role.php
deleted file mode 100644
index 1d4e7dc1c..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Role.php 278552 2009-04-10 19:42:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * base class for installer roles
- */
-require_once 'PEAR/Installer/Role/Common.php';
-require_once 'PEAR/XMLParser.php';
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role
-{
-    /**
-     * Set up any additional configuration variables that file roles require
-     *
-     * Never call this directly, it is called by the PEAR_Config constructor
-     * @param PEAR_Config
-     * @access private
-     * @static
-     */
-    function initializeConfig(&$config)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $class => $info) {
-            if (!$info['config_vars']) {
-                continue;
-            }
-
-            $config->_addConfigVars($class, $info['config_vars']);
-        }
-    }
-
-    /**
-     * @param PEAR_PackageFile_v2
-     * @param string role name
-     * @param PEAR_Config
-     * @return PEAR_Installer_Role_Common
-     * @static
-     */
-    function &factory($pkg, $role, &$config)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        if (!in_array($role, PEAR_Installer_Role::getValidRoles($pkg->getPackageType()))) {
-            $a = false;
-            return $a;
-        }
-
-        $a = 'PEAR_Installer_Role_' . ucfirst($role);
-        if (!class_exists($a)) {
-            require_once str_replace('_', '/', $a) . '.php';
-        }
-
-        $b = new $a($config);
-        return $b;
-    }
-
-    /**
-     * Get a list of file roles that are valid for the particular release type.
-     *
-     * For instance, src files serve no purpose in regular php releases.
-     * @param string
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getValidRoles($release, $clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        static $ret = array();
-        if ($clear) {
-            $ret = array();
-        }
-
-        if (isset($ret[$release])) {
-            return $ret[$release];
-        }
-
-        $ret[$release] = array();
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-            if (in_array($release, $okreleases['releasetypes'])) {
-                $ret[$release][] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-            }
-        }
-
-        return $ret[$release];
-    }
-
-    /**
-     * Get a list of roles that require their files to be installed
-     *
-     * Most roles must be installed, but src and package roles, for instance
-     * are pseudo-roles.  src files are compiled into a new extension.  Package
-     * roles are actually fully bundled releases of a package
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getInstallableRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-
-        if (isset($ret)) {
-            return $ret;
-        }
-
-        $ret = array();
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-            if ($okreleases['installable']) {
-                $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return an array of roles that are affected by the baseinstalldir attribute
-     *
-     * Most roles ignore this attribute, and instead install directly into:
-     * PackageName/filepath
-     * so a tests file tests/file.phpt is installed into PackageName/tests/filepath.php
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getBaseinstallRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-
-        if (isset($ret)) {
-            return $ret;
-        }
-
-        $ret = array();
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-            if ($okreleases['honorsbaseinstall']) {
-                $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return an array of file roles that should be analyzed for PHP content at package time,
-     * like the "php" role.
-     * @param bool clear cache
-     * @return array
-     * @static
-     */
-    function getPhpRoles($clear = false)
-    {
-        if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
-            PEAR_Installer_Role::registerRoles();
-        }
-
-        static $ret;
-        if ($clear) {
-            unset($ret);
-        }
-
-        if (isset($ret)) {
-            return $ret;
-        }
-
-        $ret = array();
-        foreach ($GLOBALS['_PEAR_INSTALLER_ROLES'] as $role => $okreleases) {
-            if ($okreleases['phpfile']) {
-                $ret[] = strtolower(str_replace('PEAR_Installer_Role_', '', $role));
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Scan through the Command directory looking for classes
-     * and see what commands they implement.
-     * @param string which directory to look for classes, defaults to
-     *               the Installer/Roles subdirectory of
-     *               the directory from where this file (__FILE__) is
-     *               included.
-     *
-     * @return bool TRUE on success, a PEAR error on failure
-     * @access public
-     * @static
-     */
-    function registerRoles($dir = null)
-    {
-        $GLOBALS['_PEAR_INSTALLER_ROLES'] = array();
-        $parser = new PEAR_XMLParser;
-        if ($dir === null) {
-            $dir = dirname(__FILE__) . '/Role';
-        }
-
-        if (!file_exists($dir) || !is_dir($dir)) {
-            return PEAR::raiseError("registerRoles: opendir($dir) failed: does not exist/is not directory");
-        }
-
-        $dp = @opendir($dir);
-        if (empty($dp)) {
-            return PEAR::raiseError("registerRoles: opendir($dir) failed: $php_errmsg");
-        }
-
-        while ($entry = readdir($dp)) {
-            if ($entry{0} == '.' || substr($entry, -4) != '.xml') {
-                continue;
-            }
-
-            $class = "PEAR_Installer_Role_".substr($entry, 0, -4);
-            // List of roles
-            if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'][$class])) {
-                $file = "$dir/$entry";
-                $parser->parse(file_get_contents($file));
-                $data = $parser->getData();
-                if (!is_array($data['releasetypes'])) {
-                    $data['releasetypes'] = array($data['releasetypes']);
-                }
-
-                $GLOBALS['_PEAR_INSTALLER_ROLES'][$class] = $data;
-            }
-        }
-
-        closedir($dp);
-        ksort($GLOBALS['_PEAR_INSTALLER_ROLES']);
-        PEAR_Installer_Role::getBaseinstallRoles(true);
-        PEAR_Installer_Role::getInstallableRoles(true);
-        PEAR_Installer_Role::getPhpRoles(true);
-        PEAR_Installer_Role::getValidRoles('****', true);
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.php
deleted file mode 100644
index d484cd107..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Cfg
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2007-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Cfg.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.7.0
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2007-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.7.0
- */
-class PEAR_Installer_Role_Cfg extends PEAR_Installer_Role_Common
-{
-    /**
-     * @var PEAR_Installer
-     */
-    var $installer;
-
-    /**
-     * the md5 of the original file
-     *
-     * @var unknown_type
-     */
-    var $md5 = null;
-
-    /**
-     * Do any unusual setup here
-     * @param PEAR_Installer
-     * @param PEAR_PackageFile_v2
-     * @param array file attributes
-     * @param string file name
-     */
-    function setup(&$installer, $pkg, $atts, $file)
-    {
-        $this->installer = &$installer;
-        $reg = &$this->installer->config->getRegistry();
-        $package = $reg->getPackage($pkg->getPackage(), $pkg->getChannel());
-        if ($package) {
-            $filelist = $package->getFilelist();
-            if (isset($filelist[$file]) && isset($filelist[$file]['md5sum'])) {
-                $this->md5 = $filelist[$file]['md5sum'];
-            }
-        }
-    }
-
-    function processInstallation($pkg, $atts, $file, $tmp_path, $layer = null)
-    {
-        $test = parent::processInstallation($pkg, $atts, $file, $tmp_path, $layer);
-        if (@file_exists($test[2]) && @file_exists($test[3])) {
-            $md5 = md5_file($test[2]);
-            // configuration has already been installed, check for mods
-            if ($md5 !== $this->md5 && $md5 !== md5_file($test[3])) {
-                // configuration has been modified, so save our version as
-                // configfile-version
-                $old = $test[2];
-                $test[2] .= '.new-' . $pkg->getVersion();
-                // backup original and re-install it
-                PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                $tmpcfg = $this->config->get('temp_dir');
-                $newloc = System::mkdir(array('-p', $tmpcfg));
-                if (!$newloc) {
-                    // try temp_dir
-                    $newloc = System::mktemp(array('-d'));
-                    if (!$newloc || PEAR::isError($newloc)) {
-                        PEAR::popErrorHandling();
-                        return PEAR::raiseError('Could not save existing configuration file '.
-                            $old . ', unable to install.  Please set temp_dir ' .
-                            'configuration variable to a writeable location and try again');
-                    }
-                } else {
-                    $newloc = $tmpcfg;
-                }
-
-                $temp_file = $newloc . DIRECTORY_SEPARATOR . uniqid('savefile');
-                if (!@copy($old, $temp_file)) {
-                    PEAR::popErrorHandling();
-                    return PEAR::raiseError('Could not save existing configuration file '.
-                        $old . ', unable to install.  Please set temp_dir ' .
-                        'configuration variable to a writeable location and try again');
-                }
-
-                PEAR::popErrorHandling();
-                $this->installer->log(0, "WARNING: configuration file $old is being installed as $test[2], you should manually merge in changes to the existing configuration file");
-                $this->installer->addFileOperation('rename', array($temp_file, $old, false));
-                $this->installer->addFileOperation('delete', array($temp_file));
-            }
-        }
-
-        return $test;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.xml
deleted file mode 100644
index 7a415dc46..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Cfg.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>cfg_dir</locationconfig>
- <honorsbaseinstall />
- <unusualbaseinstall>1</unusualbaseinstall>
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Common.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Common.php
deleted file mode 100644
index 57668ea0d..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Common.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Base class for all installation roles.
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class for all installation roles.
- *
- * This class allows extensibility of file roles.  Packages with complex
- * customization can now provide custom file roles along with the possibility of
- * adding configuration values to match.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Common
-{
-    /**
-     * @var PEAR_Config
-     * @access protected
-     */
-    var $config;
-
-    /**
-     * @param PEAR_Config
-     */
-    function PEAR_Installer_Role_Common(&$config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Retrieve configuration information about a file role from its XML info
-     *
-     * @param string $role Role Classname, as in "PEAR_Installer_Role_Data"
-     * @return array
-     */
-    function getInfo($role)
-    {
-        if (empty($GLOBALS['_PEAR_INSTALLER_ROLES'][$role])) {
-            return PEAR::raiseError('Unknown Role class: "' . $role . '"');
-        }
-        return $GLOBALS['_PEAR_INSTALLER_ROLES'][$role];
-    }
-
-    /**
-     * This is called for each file to set up the directories and files
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param array attributes from the <file> tag
-     * @param string file name
-     * @return array an array consisting of:
-     *
-     *    1 the original, pre-baseinstalldir installation directory
-     *    2 the final installation directory
-     *    3 the full path to the final location of the file
-     *    4 the location of the pre-installation file
-     */
-    function processInstallation($pkg, $atts, $file, $tmp_path, $layer = null)
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        if (!$roleInfo['locationconfig']) {
-            return false;
-        }
-        if ($roleInfo['honorsbaseinstall']) {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'], $layer,
-                $pkg->getChannel());
-            if (!empty($atts['baseinstalldir'])) {
-                $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-            }
-        } elseif ($roleInfo['unusualbaseinstall']) {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'],
-                    $layer, $pkg->getChannel()) . DIRECTORY_SEPARATOR . $pkg->getPackage();
-            if (!empty($atts['baseinstalldir'])) {
-                $dest_dir .= DIRECTORY_SEPARATOR . $atts['baseinstalldir'];
-            }
-        } else {
-            $dest_dir = $save_destdir = $this->config->get($roleInfo['locationconfig'],
-                    $layer, $pkg->getChannel()) . DIRECTORY_SEPARATOR . $pkg->getPackage();
-        }
-        if (dirname($file) != '.' && empty($atts['install-as'])) {
-            $dest_dir .= DIRECTORY_SEPARATOR . dirname($file);
-        }
-        if (empty($atts['install-as'])) {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . basename($file);
-        } else {
-            $dest_file = $dest_dir . DIRECTORY_SEPARATOR . $atts['install-as'];
-        }
-        $orig_file = $tmp_path . DIRECTORY_SEPARATOR . $file;
-
-        // Clean up the DIRECTORY_SEPARATOR mess
-        $ds2 = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR;
-        
-        list($dest_dir, $dest_file, $orig_file) = preg_replace(array('!\\\\+!', '!/!', "!$ds2+!"),
-                                                    array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR,
-                                                          DIRECTORY_SEPARATOR),
-                                                    array($dest_dir, $dest_file, $orig_file));
-        return array($save_destdir, $dest_dir, $dest_file, $orig_file);
-    }
-
-    /**
-     * Get the name of the configuration variable that specifies the location of this file
-     * @return string|false
-     */
-    function getLocationConfig()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['locationconfig'];
-    }
-
-    /**
-     * Do any unusual setup here
-     * @param PEAR_Installer
-     * @param PEAR_PackageFile_v2
-     * @param array file attributes
-     * @param string file name
-     */
-    function setup(&$installer, $pkg, $atts, $file)
-    {
-    }
-
-    function isExecutable()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['executable'];
-    }
-
-    function isInstallable()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['installable'];
-    }
-
-    function isExtension()
-    {
-        $roleInfo = PEAR_Installer_Role_Common::getInfo('PEAR_Installer_Role_' . 
-            ucfirst(str_replace('pear_installer_role_', '', strtolower(get_class($this)))));
-        if (PEAR::isError($roleInfo)) {
-            return $roleInfo;
-        }
-        return $roleInfo['phpextension'];
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Data.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Data.php
deleted file mode 100644
index b4f2bb834..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Data.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Data
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Data.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Data extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Data.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Data.xml
deleted file mode 100644
index eae63720d..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Data.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>data_dir</locationconfig>
- <honorsbaseinstall />
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.php
deleted file mode 100644
index 279638440..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Doc
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Doc.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Doc extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.xml
deleted file mode 100644
index 173afba01..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Doc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>doc_dir</locationconfig>
- <honorsbaseinstall />
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.php
deleted file mode 100644
index ab4e3a476..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Ext
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Ext.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Ext extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.xml
deleted file mode 100644
index e2940fe1f..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Ext.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<role version="1.0">
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>ext_dir</locationconfig>
- <honorsbaseinstall>1</honorsbaseinstall>
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension>1</phpextension>
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Php.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Php.php
deleted file mode 100644
index afd2bbecc..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Php.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Php
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Php.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Php extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Php.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Php.xml
deleted file mode 100644
index 6b9a0e67a..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Php.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>php_dir</locationconfig>
- <honorsbaseinstall>1</honorsbaseinstall>
- <unusualbaseinstall />
- <phpfile>1</phpfile>
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Script.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Script.php
deleted file mode 100644
index 1a988b543..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Script.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Script
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Script.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Script extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Script.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Script.xml
deleted file mode 100644
index e732cf2af..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Script.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>bin_dir</locationconfig>
- <honorsbaseinstall>1</honorsbaseinstall>
- <unusualbaseinstall />
- <phpfile />
- <executable>1</executable>
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Src.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Src.php
deleted file mode 100644
index 7cea536f6..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Src.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Src
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Src.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Src extends PEAR_Installer_Role_Common
-{
-    function setup(&$installer, $pkg, $atts, $file)
-    {
-        $installer->source_files++;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Src.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Src.xml
deleted file mode 100644
index 103483402..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Src.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<role version="1.0">
- <releasetypes>extsrc</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <installable>1</installable>
- <locationconfig>temp_dir</locationconfig>
- <honorsbaseinstall />
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Test.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Test.php
deleted file mode 100644
index f1c47fa50..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Test
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Test.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Installer_Role_Test extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Test.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Test.xml
deleted file mode 100644
index 51d5b894e..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>test_dir</locationconfig>
- <honorsbaseinstall />
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Www.php b/airtime_mvc/library/pear/PEAR/Installer/Role/Www.php
deleted file mode 100644
index d74351807..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Www.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * PEAR_Installer_Role_Www
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2007-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Www.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.7.0
- */
-
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  2007-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.7.0
- */
-class PEAR_Installer_Role_Www extends PEAR_Installer_Role_Common {}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Installer/Role/Www.xml b/airtime_mvc/library/pear/PEAR/Installer/Role/Www.xml
deleted file mode 100644
index 7598be388..000000000
--- a/airtime_mvc/library/pear/PEAR/Installer/Role/Www.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<role version="1.0">
- <releasetypes>php</releasetypes>
- <releasetypes>extsrc</releasetypes>
- <releasetypes>extbin</releasetypes>
- <releasetypes>zendextsrc</releasetypes>
- <releasetypes>zendextbin</releasetypes>
- <installable>1</installable>
- <locationconfig>www_dir</locationconfig>
- <honorsbaseinstall>1</honorsbaseinstall>
- <unusualbaseinstall />
- <phpfile />
- <executable />
- <phpextension />
- <config_vars />
-</role>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile.php b/airtime_mvc/library/pear/PEAR/PackageFile.php
deleted file mode 100644
index 5ce38245d..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile.php
+++ /dev/null
@@ -1,501 +0,0 @@
-<?php
-/**
- * PEAR_PackageFile, package.xml parsing utility class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PackageFile.php 286670 2009-08-02 14:16:06Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * needed for PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-/**
- * Error code if the package.xml <package> tag does not contain a valid version
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_PACKAGEVERSION', 1);
-/**
- * Error code if the package.xml <package> tag version is not supported (version 1.0 and 1.1 are the only supported versions,
- * currently
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_PACKAGEVERSION', 2);
-/**
- * Abstraction for the package.xml package description file
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile
-{
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-    var $_debug;
-    /**
-     * Temp directory for uncompressing tgz files.
-     * @var string|false
-     */
-    var $_tmpdir;
-    var $_logger = false;
-    /**
-     * @var boolean
-     */
-    var $_rawReturn = false;
-
-    /**
-     *
-     * @param   PEAR_Config $config
-     * @param   ?   $debug
-     * @param   string @tmpdir Optional temporary directory for uncompressing
-     *          files
-     */
-    function PEAR_PackageFile(&$config, $debug = false, $tmpdir = false)
-    {
-        $this->_config = $config;
-        $this->_debug = $debug;
-        $this->_tmpdir = $tmpdir;
-    }
-
-    /**
-     * Turn off validation - return a parsed package.xml without checking it
-     *
-     * This is used by the package-validate command
-     */
-    function rawReturn()
-    {
-        $this->_rawReturn = true;
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_Parser_v* of a given version.
-     * @param   int $version
-     * @return  PEAR_PackageFile_Parser_v1|PEAR_PackageFile_Parser_v1
-     */
-    function &parserFactory($version)
-    {
-        if (!in_array($version{0}, array('1', '2'))) {
-            $a = false;
-            return $a;
-        }
-
-        include_once 'PEAR/PackageFile/Parser/v' . $version{0} . '.php';
-        $version = $version{0};
-        $class = "PEAR_PackageFile_Parser_v$version";
-        $a = new $class;
-        return $a;
-    }
-
-    /**
-     * For simpler unit-testing
-     * @return string
-     */
-    function getClassPrefix()
-    {
-        return 'PEAR_PackageFile_v';
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* of a given version.
-     * @param   int $version
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v1
-     */
-    function &factory($version)
-    {
-        if (!in_array($version{0}, array('1', '2'))) {
-            $a = false;
-            return $a;
-        }
-
-        include_once 'PEAR/PackageFile/v' . $version{0} . '.php';
-        $version = $version{0};
-        $class = $this->getClassPrefix() . $version;
-        $a = new $class;
-        return $a;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from its toArray() method
-     *
-     * WARNING: no validation is performed, the array is assumed to be valid,
-     * always parse from xml if you want validation.
-     * @param   array $arr
-     * @return PEAR_PackageFileManager_v1|PEAR_PackageFileManager_v2
-     * @uses    factory() to construct the returned object.
-     */
-    function &fromArray($arr)
-    {
-        if (isset($arr['xsdversion'])) {
-            $obj = &$this->factory($arr['xsdversion']);
-            if ($this->_logger) {
-                $obj->setLogger($this->_logger);
-            }
-
-            $obj->setConfig($this->_config);
-            $obj->fromArray($arr);
-            return $obj;
-        }
-
-        if (isset($arr['package']['attribs']['version'])) {
-            $obj = &$this->factory($arr['package']['attribs']['version']);
-        } else {
-            $obj = &$this->factory('1.0');
-        }
-
-        if ($this->_logger) {
-            $obj->setLogger($this->_logger);
-        }
-
-        $obj->setConfig($this->_config);
-        $obj->fromArray($arr);
-        return $obj;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from an XML string.
-     * @access  public
-     * @param   string $data contents of package.xml file
-     * @param   int $state package state (one of PEAR_VALIDATE_* constants)
-     * @param   string $file full path to the package.xml file (and the files
-     *          it references)
-     * @param   string $archive optional name of the archive that the XML was
-     *          extracted from, if any
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    parserFactory() to construct a parser to load the package.
-     */
-    function &fromXmlString($data, $state, $file, $archive = false)
-    {
-        if (preg_match('/<package[^>]+version="([0-9]+\.[0-9]+)"/', $data, $packageversion)) {
-            if (!in_array($packageversion[1], array('1.0', '2.0', '2.1'))) {
-                return PEAR::raiseError('package.xml version "' . $packageversion[1] .
-                    '" is not supported, only 1.0, 2.0, and 2.1 are supported.');
-            }
-
-            $object = &$this->parserFactory($packageversion[1]);
-            if ($this->_logger) {
-                $object->setLogger($this->_logger);
-            }
-
-            $object->setConfig($this->_config);
-            $pf = $object->parse($data, $file, $archive);
-            if (PEAR::isError($pf)) {
-                return $pf;
-            }
-
-            if ($this->_rawReturn) {
-                return $pf;
-            }
-
-            if (!$pf->validate($state)) {;
-                if ($this->_config->get('verbose') > 0
-                    && $this->_logger && $pf->getValidationWarnings(false)
-                ) {
-                    foreach ($pf->getValidationWarnings(false) as $warning) {
-                        $this->_logger->log(0, 'ERROR: ' . $warning['message']);
-                    }
-                }
-
-                $a = PEAR::raiseError('Parsing of package.xml from file "' . $file . '" failed',
-                    2, null, null, $pf->getValidationWarnings());
-                return $a;
-            }
-
-            if ($this->_logger && $pf->getValidationWarnings(false)) {
-                foreach ($pf->getValidationWarnings() as $warning) {
-                    $this->_logger->log(0, 'WARNING: ' . $warning['message']);
-                }
-            }
-
-            if (method_exists($pf, 'flattenFilelist')) {
-                $pf->flattenFilelist(); // for v2
-            }
-
-            return $pf;
-        } elseif (preg_match('/<package[^>]+version="([^"]+)"/', $data, $packageversion)) {
-            $a = PEAR::raiseError('package.xml file "' . $file .
-                '" has unsupported package.xml <package> version "' . $packageversion[1] . '"');
-            return $a;
-        } else {
-            if (!class_exists('PEAR_ErrorStack')) {
-                require_once 'PEAR/ErrorStack.php';
-            }
-
-            PEAR_ErrorStack::staticPush('PEAR_PackageFile',
-                PEAR_PACKAGEFILE_ERROR_NO_PACKAGEVERSION,
-                'warning', array('xml' => $data), 'package.xml "' . $file .
-                    '" has no package.xml <package> version');
-            $object = &$this->parserFactory('1.0');
-            $object->setConfig($this->_config);
-            $pf = $object->parse($data, $file, $archive);
-            if (PEAR::isError($pf)) {
-                return $pf;
-            }
-
-            if ($this->_rawReturn) {
-                return $pf;
-            }
-
-            if (!$pf->validate($state)) {
-                $a = PEAR::raiseError('Parsing of package.xml from file "' . $file . '" failed',
-                    2, null, null, $pf->getValidationWarnings());
-                return $a;
-            }
-
-            if ($this->_logger && $pf->getValidationWarnings(false)) {
-                foreach ($pf->getValidationWarnings() as $warning) {
-                    $this->_logger->log(0, 'WARNING: ' . $warning['message']);
-                }
-            }
-
-            if (method_exists($pf, 'flattenFilelist')) {
-                $pf->flattenFilelist(); // for v2
-            }
-
-            return $pf;
-        }
-    }
-
-    /**
-     * Register a temporary file or directory.  When the destructor is
-     * executed, all registered temporary files and directories are
-     * removed.
-     *
-     * @param string  $file  name of file or directory
-     * @return  void
-     */
-    function addTempFile($file)
-    {
-        $GLOBALS['_PEAR_Common_tempfiles'][] = $file;
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from a compresed Tar or Tgz file.
-     * @access  public
-     * @param string contents of package.xml file
-     * @param int package state (one of PEAR_VALIDATE_* constants)
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @using   Archive_Tar to extract the files
-     * @using   fromPackageFile() to load the package after the package.xml
-     *          file is extracted.
-     */
-    function &fromTgzFile($file, $state)
-    {
-        if (!class_exists('Archive_Tar')) {
-            require_once 'Archive/Tar.php';
-        }
-
-        $tar = new Archive_Tar($file);
-        if ($this->_debug <= 1) {
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-        }
-
-        $content = $tar->listContent();
-        if ($this->_debug <= 1) {
-            $tar->popErrorHandling();
-        }
-
-        if (!is_array($content)) {
-            if (is_string($file) && strlen($file < 255) &&
-                  (!file_exists($file) || !@is_file($file))) {
-                $ret = PEAR::raiseError("could not open file \"$file\"");
-                return $ret;
-            }
-
-            $file = realpath($file);
-            $ret = PEAR::raiseError("Could not get contents of package \"$file\"".
-                                     '. Invalid tgz file.');
-            return $ret;
-        }
-
-        if (!count($content) && !@is_file($file)) {
-            $ret = PEAR::raiseError("could not open file \"$file\"");
-            return $ret;
-        }
-
-        $xml      = null;
-        $origfile = $file;
-        foreach ($content as $file) {
-            $name = $file['filename'];
-            if ($name == 'package2.xml') { // allow a .tgz to distribute both versions
-                $xml = $name;
-                break;
-            }
-
-            if ($name == 'package.xml') {
-                $xml = $name;
-                break;
-            } elseif (preg_match('/package.xml$/', $name, $match)) {
-                $xml = $name;
-                break;
-            }
-        }
-
-        if ($this->_tmpdir) {
-            $tmpdir = $this->_tmpdir;
-        } else {
-            $tmpdir = System::mkTemp(array('-t', $this->_config->get('temp_dir'), '-d', 'pear'));
-            if ($tmpdir === false) {
-                $ret = PEAR::raiseError("there was a problem with getting the configured temp directory");
-                return $ret;
-            }
-
-            PEAR_PackageFile::addTempFile($tmpdir);
-        }
-
-        $this->_extractErrors();
-        PEAR::staticPushErrorHandling(PEAR_ERROR_CALLBACK, array($this, '_extractErrors'));
-        if (!$xml || !$tar->extractList(array($xml), $tmpdir)) {
-            $extra = implode("\n", $this->_extractErrors());
-            if ($extra) {
-                $extra = ' ' . $extra;
-            }
-
-            PEAR::staticPopErrorHandling();
-            $ret = PEAR::raiseError('could not extract the package.xml file from "' .
-                $origfile . '"' . $extra);
-            return $ret;
-        }
-
-        PEAR::staticPopErrorHandling();
-        $ret = &PEAR_PackageFile::fromPackageFile("$tmpdir/$xml", $state, $origfile);
-        return $ret;
-    }
-
-    /**
-     * helper for extracting Archive_Tar errors
-     * @var array
-     * @access private
-     */
-    var $_extractErrors = array();
-
-    /**
-     * helper callback for extracting Archive_Tar errors
-     *
-     * @param PEAR_Error|null $err
-     * @return array
-     * @access private
-     */
-    function _extractErrors($err = null)
-    {
-        static $errors = array();
-        if ($err === null) {
-            $e = $errors;
-            $errors = array();
-            return $e;
-        }
-        $errors[] = $err->getMessage();
-    }
-
-    /**
-     * Create a PEAR_PackageFile_v* from a package.xml file.
-     *
-     * @access public
-     * @param   string  $descfile  name of package xml file
-     * @param   int     $state package state (one of PEAR_VALIDATE_* constants)
-     * @param   string|false $archive name of the archive this package.xml came
-     *          from, if any
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    PEAR_PackageFile::fromXmlString to create the oject after the
-     *          XML is loaded from the package.xml file.
-     */
-    function &fromPackageFile($descfile, $state, $archive = false)
-    {
-        $fp = false;
-        if (is_string($descfile) && strlen($descfile) < 255 &&
-             (
-              !file_exists($descfile) || !is_file($descfile) || !is_readable($descfile)
-              || (!$fp = @fopen($descfile, 'r'))
-             )
-        ) {
-            $a = PEAR::raiseError("Unable to open $descfile");
-            return $a;
-        }
-
-        // read the whole thing so we only get one cdata callback
-        // for each block of cdata
-        fclose($fp);
-        $data = file_get_contents($descfile);
-        $ret = &PEAR_PackageFile::fromXmlString($data, $state, $descfile, $archive);
-        return $ret;
-    }
-
-
-    /**
-     * Create a PEAR_PackageFile_v* from a .tgz archive or package.xml file.
-     *
-     * This method is able to extract information about a package from a .tgz
-     * archive or from a XML package definition file.
-     *
-     * @access public
-     * @param   string  $info file name
-     * @param   int     $state package state (one of PEAR_VALIDATE_* constants)
-     * @return  PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @uses    fromPackageFile() if the file appears to be XML
-     * @uses    fromTgzFile() to load all non-XML files
-     */
-    function &fromAnyFile($info, $state)
-    {
-        if (is_dir($info)) {
-            $dir_name = realpath($info);
-            if (file_exists($dir_name . '/package.xml')) {
-                $info = PEAR_PackageFile::fromPackageFile($dir_name .  '/package.xml', $state);
-            } elseif (file_exists($dir_name .  '/package2.xml')) {
-                $info = PEAR_PackageFile::fromPackageFile($dir_name .  '/package2.xml', $state);
-            } else {
-                $info = PEAR::raiseError("No package definition found in '$info' directory");
-            }
-
-            return $info;
-        }
-
-        $fp = false;
-        if (is_string($info) && strlen($info) < 255 &&
-             (file_exists($info) || ($fp = @fopen($info, 'r')))
-        ) {
-
-            if ($fp) {
-                fclose($fp);
-            }
-
-            $tmp = substr($info, -4);
-            if ($tmp == '.xml') {
-                $info = &PEAR_PackageFile::fromPackageFile($info, $state);
-            } elseif ($tmp == '.tar' || $tmp == '.tgz') {
-                $info = &PEAR_PackageFile::fromTgzFile($info, $state);
-            } else {
-                $fp   = fopen($info, 'r');
-                $test = fread($fp, 5);
-                fclose($fp);
-                if ($test == '<?xml') {
-                    $info = &PEAR_PackageFile::fromPackageFile($info, $state);
-                } else {
-                    $info = &PEAR_PackageFile::fromTgzFile($info, $state);
-                }
-            }
-
-            return $info;
-        }
-
-        $info = PEAR::raiseError("Cannot open '$info' for parsing");
-        return $info;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v1.php b/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v1.php
deleted file mode 100644
index f2abd2a57..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v1.php
+++ /dev/null
@@ -1,1284 +0,0 @@
-<?php
-/**
- * package.xml generation class, package.xml version 1.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 286494 2009-07-29 06:57:11Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * needed for PEAR_VALIDATE_* constants
- */
-require_once 'PEAR/Validate.php';
-require_once 'System.php';
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * This class converts a PEAR_PackageFile_v1 object into any output format.
- *
- * Supported output formats include array, XML string, and a PEAR_PackageFile_v2
- * object, for converting package.xml 1.0 into package.xml 2.0 with no sweat.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Generator_v1
-{
-    /**
-     * @var PEAR_PackageFile_v1
-     */
-    var $_packagefile;
-    function PEAR_PackageFile_Generator_v1(&$packagefile)
-    {
-        $this->_packagefile = &$packagefile;
-    }
-
-    function getPackagerVersion()
-    {
-        return '1.9.1';
-    }
-
-    /**
-     * @param PEAR_Packager
-     * @param bool if true, a .tgz is written, otherwise a .tar is written
-     * @param string|null directory in which to save the .tgz
-     * @return string|PEAR_Error location of package or error object
-     */
-    function toTgz(&$packager, $compress = true, $where = null)
-    {
-        require_once 'Archive/Tar.php';
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: "' . $where . '" could' .
-                ' not be created');
-        }
-        if (file_exists($where . DIRECTORY_SEPARATOR . 'package.xml') &&
-              !is_file($where . DIRECTORY_SEPARATOR . 'package.xml')) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: unable to save package.xml as' .
-                ' "' . $where . DIRECTORY_SEPARATOR . 'package.xml"');
-        }
-        if (!$this->_packagefile->validate(PEAR_VALIDATE_PACKAGING)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: invalid package file');
-        }
-        $pkginfo = $this->_packagefile->getArray();
-        $ext = $compress ? '.tgz' : '.tar';
-        $pkgver = $pkginfo['package'] . '-' . $pkginfo['version'];
-        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
-        if (file_exists(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext) &&
-              !is_file(getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: cannot create tgz file "' .
-                getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext . '"');
-        }
-        if ($pkgfile = $this->_packagefile->getPackageFile()) {
-            $pkgdir = dirname(realpath($pkgfile));
-            $pkgfile = basename($pkgfile);
-        } else {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: package file object must ' .
-                'be created from a real file');
-        }
-        // {{{ Create the package file list
-        $filelist = array();
-        $i = 0;
-
-        foreach ($this->_packagefile->getFilelist() as $fname => $atts) {
-            $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-            if (!file_exists($file)) {
-                return PEAR::raiseError("File does not exist: $fname");
-            } else {
-                $filelist[$i++] = $file;
-                if (!isset($atts['md5sum'])) {
-                    $this->_packagefile->setFileAttribute($fname, 'md5sum', md5_file($file));
-                }
-                $packager->log(2, "Adding file $fname");
-            }
-        }
-        // }}}
-        $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
-        if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
-            $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
-            // ----- Creates with the package.xml file
-            $ok = $tar->createModify(array($packagexml), '', $where);
-            if (PEAR::isError($ok)) {
-                return $ok;
-            } elseif (!$ok) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: tarball creation failed');
-            }
-            // ----- Add the content of the package
-            if (!$tar->addModify($filelist, $pkgver, $pkgdir)) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toTgz: tarball creation failed');
-            }
-            return $dest_package;
-        }
-    }
-
-    /**
-     * @param string|null directory to place the package.xml in, or null for a temporary dir
-     * @param int one of the PEAR_VALIDATE_* constants
-     * @param string name of the generated file
-     * @param bool if true, then no analysis will be performed on role="php" files
-     * @return string|PEAR_Error path to the created file on success
-     */
-    function toPackageFile($where = null, $state = PEAR_VALIDATE_NORMAL, $name = 'package.xml',
-                           $nofilechecking = false)
-    {
-        if (!$this->_packagefile->validate($state, $nofilechecking)) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: invalid package.xml',
-                null, null, null, $this->_packagefile->getValidationWarnings());
-        }
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: "' . $where . '" could' .
-                ' not be created');
-        }
-        $newpkgfile = $where . DIRECTORY_SEPARATOR . $name;
-        $np = @fopen($newpkgfile, 'wb');
-        if (!$np) {
-            return PEAR::raiseError('PEAR_Packagefile_v1::toPackageFile: unable to save ' .
-               "$name as $newpkgfile");
-        }
-        fwrite($np, $this->toXml($state, true));
-        fclose($np);
-        return $newpkgfile;
-    }
-
-    /**
-     * fix both XML encoding to be UTF8, and replace standard XML entities < > " & '
-     *
-     * @param string $string
-     * @return string
-     * @access private
-     */
-    function _fixXmlEncoding($string)
-    {
-        if (version_compare(phpversion(), '5.0.0', 'lt')) {
-            $string = utf8_encode($string);
-        }
-        return strtr($string, array(
-                                          '&'  => '&amp;',
-                                          '>'  => '&gt;',
-                                          '<'  => '&lt;',
-                                          '"'  => '&quot;',
-                                          '\'' => '&apos;' ));
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @return string XML data
-     */
-    function toXml($state = PEAR_VALIDATE_NORMAL, $nofilevalidation = false)
-    {
-        $this->_packagefile->setDate(date('Y-m-d'));
-        if (!$this->_packagefile->validate($state, $nofilevalidation)) {
-            return false;
-        }
-        $pkginfo = $this->_packagefile->getArray();
-        static $maint_map = array(
-            "handle" => "user",
-            "name" => "name",
-            "email" => "email",
-            "role" => "role",
-            );
-        $ret = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
-        $ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
-        $ret .= "<package version=\"1.0\" packagerversion=\"1.9.1\">\n" .
-" <name>$pkginfo[package]</name>";
-        if (isset($pkginfo['extends'])) {
-            $ret .= "\n<extends>$pkginfo[extends]</extends>";
-        }
-        $ret .=
- "\n <summary>".$this->_fixXmlEncoding($pkginfo['summary'])."</summary>\n" .
-" <description>".trim($this->_fixXmlEncoding($pkginfo['description']))."\n </description>\n" .
-" <maintainers>\n";
-        foreach ($pkginfo['maintainers'] as $maint) {
-            $ret .= "  <maintainer>\n";
-            foreach ($maint_map as $idx => $elm) {
-                $ret .= "   <$elm>";
-                $ret .= $this->_fixXmlEncoding($maint[$idx]);
-                $ret .= "</$elm>\n";
-            }
-            $ret .= "  </maintainer>\n";
-        }
-        $ret .= "  </maintainers>\n";
-        $ret .= $this->_makeReleaseXml($pkginfo, false, $state);
-        if (isset($pkginfo['changelog']) && count($pkginfo['changelog']) > 0) {
-            $ret .= " <changelog>\n";
-            foreach ($pkginfo['changelog'] as $oldrelease) {
-                $ret .= $this->_makeReleaseXml($oldrelease, true);
-            }
-            $ret .= " </changelog>\n";
-        }
-        $ret .= "</package>\n";
-        return $ret;
-    }
-
-    // }}}
-    // {{{ _makeReleaseXml()
-
-    /**
-     * Generate part of an XML description with release information.
-     *
-     * @param array  $pkginfo    array with release information
-     * @param bool   $changelog  whether the result will be in a changelog element
-     *
-     * @return string XML data
-     *
-     * @access private
-     */
-    function _makeReleaseXml($pkginfo, $changelog = false, $state = PEAR_VALIDATE_NORMAL)
-    {
-        // XXX QUOTE ENTITIES IN PCDATA, OR EMBED IN CDATA BLOCKS!!
-        $indent = $changelog ? "  " : "";
-        $ret = "$indent <release>\n";
-        if (!empty($pkginfo['version'])) {
-            $ret .= "$indent  <version>$pkginfo[version]</version>\n";
-        }
-        if (!empty($pkginfo['release_date'])) {
-            $ret .= "$indent  <date>$pkginfo[release_date]</date>\n";
-        }
-        if (!empty($pkginfo['release_license'])) {
-            $ret .= "$indent  <license>$pkginfo[release_license]</license>\n";
-        }
-        if (!empty($pkginfo['release_state'])) {
-            $ret .= "$indent  <state>$pkginfo[release_state]</state>\n";
-        }
-        if (!empty($pkginfo['release_notes'])) {
-            $ret .= "$indent  <notes>".trim($this->_fixXmlEncoding($pkginfo['release_notes']))
-            ."\n$indent  </notes>\n";
-        }
-        if (!empty($pkginfo['release_warnings'])) {
-            $ret .= "$indent  <warnings>".$this->_fixXmlEncoding($pkginfo['release_warnings'])."</warnings>\n";
-        }
-        if (isset($pkginfo['release_deps']) && sizeof($pkginfo['release_deps']) > 0) {
-            $ret .= "$indent  <deps>\n";
-            foreach ($pkginfo['release_deps'] as $dep) {
-                $ret .= "$indent   <dep type=\"$dep[type]\" rel=\"$dep[rel]\"";
-                if (isset($dep['version'])) {
-                    $ret .= " version=\"$dep[version]\"";
-                }
-                if (isset($dep['optional'])) {
-                    $ret .= " optional=\"$dep[optional]\"";
-                }
-                if (isset($dep['name'])) {
-                    $ret .= ">$dep[name]</dep>\n";
-                } else {
-                    $ret .= "/>\n";
-                }
-            }
-            $ret .= "$indent  </deps>\n";
-        }
-        if (isset($pkginfo['configure_options'])) {
-            $ret .= "$indent  <configureoptions>\n";
-            foreach ($pkginfo['configure_options'] as $c) {
-                $ret .= "$indent   <configureoption name=\"".
-                    $this->_fixXmlEncoding($c['name']) . "\"";
-                if (isset($c['default'])) {
-                    $ret .= " default=\"" . $this->_fixXmlEncoding($c['default']) . "\"";
-                }
-                $ret .= " prompt=\"" . $this->_fixXmlEncoding($c['prompt']) . "\"";
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent  </configureoptions>\n";
-        }
-        if (isset($pkginfo['provides'])) {
-            foreach ($pkginfo['provides'] as $key => $what) {
-                $ret .= "$indent  <provides type=\"$what[type]\" ";
-                $ret .= "name=\"$what[name]\" ";
-                if (isset($what['extends'])) {
-                    $ret .= "extends=\"$what[extends]\" ";
-                }
-                $ret .= "/>\n";
-            }
-        }
-        if (isset($pkginfo['filelist'])) {
-            $ret .= "$indent  <filelist>\n";
-            if ($state ^ PEAR_VALIDATE_PACKAGING) {
-                $ret .= $this->recursiveXmlFilelist($pkginfo['filelist']);
-            } else {
-                foreach ($pkginfo['filelist'] as $file => $fa) {
-                    if (!isset($fa['role'])) {
-                        $fa['role'] = '';
-                    }
-                    $ret .= "$indent   <file role=\"$fa[role]\"";
-                    if (isset($fa['baseinstalldir'])) {
-                        $ret .= ' baseinstalldir="' .
-                            $this->_fixXmlEncoding($fa['baseinstalldir']) . '"';
-                    }
-                    if (isset($fa['md5sum'])) {
-                        $ret .= " md5sum=\"$fa[md5sum]\"";
-                    }
-                    if (isset($fa['platform'])) {
-                        $ret .= " platform=\"$fa[platform]\"";
-                    }
-                    if (!empty($fa['install-as'])) {
-                        $ret .= ' install-as="' .
-                            $this->_fixXmlEncoding($fa['install-as']) . '"';
-                    }
-                    $ret .= ' name="' . $this->_fixXmlEncoding($file) . '"';
-                    if (empty($fa['replacements'])) {
-                        $ret .= "/>\n";
-                    } else {
-                        $ret .= ">\n";
-                        foreach ($fa['replacements'] as $r) {
-                            $ret .= "$indent    <replace";
-                            foreach ($r as $k => $v) {
-                                $ret .= " $k=\"" . $this->_fixXmlEncoding($v) .'"';
-                            }
-                            $ret .= "/>\n";
-                        }
-                        $ret .= "$indent   </file>\n";
-                    }
-                }
-            }
-            $ret .= "$indent  </filelist>\n";
-        }
-        $ret .= "$indent </release>\n";
-        return $ret;
-    }
-
-    /**
-     * @param array
-     * @access protected
-     */
-    function recursiveXmlFilelist($list)
-    {
-        $this->_dirs = array();
-        foreach ($list as $file => $attributes) {
-            $this->_addDir($this->_dirs, explode('/', dirname($file)), $file, $attributes);
-        }
-        return $this->_formatDir($this->_dirs);
-    }
-
-    /**
-     * @param array
-     * @param array
-     * @param string|null
-     * @param array|null
-     * @access private
-     */
-    function _addDir(&$dirs, $dir, $file = null, $attributes = null)
-    {
-        if ($dir == array() || $dir == array('.')) {
-            $dirs['files'][basename($file)] = $attributes;
-            return;
-        }
-        $curdir = array_shift($dir);
-        if (!isset($dirs['dirs'][$curdir])) {
-            $dirs['dirs'][$curdir] = array();
-        }
-        $this->_addDir($dirs['dirs'][$curdir], $dir, $file, $attributes);
-    }
-
-    /**
-     * @param array
-     * @param string
-     * @param string
-     * @access private
-     */
-    function _formatDir($dirs, $indent = '', $curdir = '')
-    {
-        $ret = '';
-        if (!count($dirs)) {
-            return '';
-        }
-        if (isset($dirs['dirs'])) {
-            uksort($dirs['dirs'], 'strnatcasecmp');
-            foreach ($dirs['dirs'] as $dir => $contents) {
-                $usedir = "$curdir/$dir";
-                $ret .= "$indent   <dir name=\"$dir\">\n";
-                $ret .= $this->_formatDir($contents, "$indent ", $usedir);
-                $ret .= "$indent   </dir> <!-- $usedir -->\n";
-            }
-        }
-        if (isset($dirs['files'])) {
-            uksort($dirs['files'], 'strnatcasecmp');
-            foreach ($dirs['files'] as $file => $attribs) {
-                $ret .= $this->_formatFile($file, $attribs, $indent);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * @param string
-     * @param array
-     * @param string
-     * @access private
-     */
-    function _formatFile($file, $attributes, $indent)
-    {
-        $ret = "$indent   <file role=\"$attributes[role]\"";
-        if (isset($attributes['baseinstalldir'])) {
-            $ret .= ' baseinstalldir="' .
-                $this->_fixXmlEncoding($attributes['baseinstalldir']) . '"';
-        }
-        if (isset($attributes['md5sum'])) {
-            $ret .= " md5sum=\"$attributes[md5sum]\"";
-        }
-        if (isset($attributes['platform'])) {
-            $ret .= " platform=\"$attributes[platform]\"";
-        }
-        if (!empty($attributes['install-as'])) {
-            $ret .= ' install-as="' .
-                $this->_fixXmlEncoding($attributes['install-as']) . '"';
-        }
-        $ret .= ' name="' . $this->_fixXmlEncoding($file) . '"';
-        if (empty($attributes['replacements'])) {
-            $ret .= "/>\n";
-        } else {
-            $ret .= ">\n";
-            foreach ($attributes['replacements'] as $r) {
-                $ret .= "$indent    <replace";
-                foreach ($r as $k => $v) {
-                    $ret .= " $k=\"" . $this->_fixXmlEncoding($v) .'"';
-                }
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent   </file>\n";
-        }
-        return $ret;
-    }
-
-    // {{{ _unIndent()
-
-    /**
-     * Unindent given string (?)
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @return array
-     */
-    function dependenciesToV2()
-    {
-        $arr = array();
-        $this->_convertDependencies2_0($arr);
-        return $arr['dependencies'];
-    }
-
-    /**
-     * Convert a package.xml version 1.0 into version 2.0
-     *
-     * Note that this does a basic conversion, to allow more advanced
-     * features like bundles and multiple releases
-     * @param string the classname to instantiate and return.  This must be
-     *               PEAR_PackageFile_v2 or a descendant
-     * @param boolean if true, only valid, deterministic package.xml 1.0 as defined by the
-     *                strictest parameters will be converted
-     * @return PEAR_PackageFile_v2|PEAR_Error
-     */
-    function &toV2($class = 'PEAR_PackageFile_v2', $strict = false)
-    {
-        if ($strict) {
-            if (!$this->_packagefile->validate()) {
-                $a = PEAR::raiseError('invalid package.xml version 1.0 cannot be converted' .
-                    ' to version 2.0', null, null, null,
-                    $this->_packagefile->getValidationWarnings(true));
-                return $a;
-            }
-        }
-
-        $arr = array(
-            'attribs' => array(
-                             'version' => '2.0',
-                             'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-                             'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                             'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                             'xsi:schemaLocation' => "http://pear.php.net/dtd/tasks-1.0\n" .
-"http://pear.php.net/dtd/tasks-1.0.xsd\n" .
-"http://pear.php.net/dtd/package-2.0\n" .
-'http://pear.php.net/dtd/package-2.0.xsd',
-                         ),
-            'name' => $this->_packagefile->getPackage(),
-            'channel' => 'pear.php.net',
-        );
-        $arr['summary'] = $this->_packagefile->getSummary();
-        $arr['description'] = $this->_packagefile->getDescription();
-        $maintainers = $this->_packagefile->getMaintainers();
-        foreach ($maintainers as $maintainer) {
-            if ($maintainer['role'] != 'lead') {
-                continue;
-            }
-            $new = array(
-                'name' => $maintainer['name'],
-                'user' => $maintainer['handle'],
-                'email' => $maintainer['email'],
-                'active' => 'yes',
-            );
-            $arr['lead'][] = $new;
-        }
-
-        if (!isset($arr['lead'])) { // some people... you know?
-            $arr['lead'] = array(
-                'name' => 'unknown',
-                'user' => 'unknown',
-                'email' => 'noleadmaintainer@example.com',
-                'active' => 'no',
-            );
-        }
-
-        if (count($arr['lead']) == 1) {
-            $arr['lead'] = $arr['lead'][0];
-        }
-
-        foreach ($maintainers as $maintainer) {
-            if ($maintainer['role'] == 'lead') {
-                continue;
-            }
-            $new = array(
-                'name' => $maintainer['name'],
-                'user' => $maintainer['handle'],
-                'email' => $maintainer['email'],
-                'active' => 'yes',
-            );
-            $arr[$maintainer['role']][] = $new;
-        }
-
-        if (isset($arr['developer']) && count($arr['developer']) == 1) {
-            $arr['developer'] = $arr['developer'][0];
-        }
-
-        if (isset($arr['contributor']) && count($arr['contributor']) == 1) {
-            $arr['contributor'] = $arr['contributor'][0];
-        }
-
-        if (isset($arr['helper']) && count($arr['helper']) == 1) {
-            $arr['helper'] = $arr['helper'][0];
-        }
-
-        $arr['date'] = $this->_packagefile->getDate();
-        $arr['version'] =
-            array(
-                'release' => $this->_packagefile->getVersion(),
-                'api' => $this->_packagefile->getVersion(),
-            );
-        $arr['stability'] =
-            array(
-                'release' => $this->_packagefile->getState(),
-                'api' => $this->_packagefile->getState(),
-            );
-        $licensemap =
-            array(
-                'php' => 'http://www.php.net/license',
-                'php license' => 'http://www.php.net/license',
-                'lgpl' => 'http://www.gnu.org/copyleft/lesser.html',
-                'bsd' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'bsd style' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'bsd-style' => 'http://www.opensource.org/licenses/bsd-license.php',
-                'mit' => 'http://www.opensource.org/licenses/mit-license.php',
-                'gpl' => 'http://www.gnu.org/copyleft/gpl.html',
-                'apache' => 'http://www.opensource.org/licenses/apache2.0.php'
-            );
-
-        if (isset($licensemap[strtolower($this->_packagefile->getLicense())])) {
-            $arr['license'] = array(
-                'attribs' => array('uri' =>
-                    $licensemap[strtolower($this->_packagefile->getLicense())]),
-                '_content' => $this->_packagefile->getLicense()
-                );
-        } else {
-            // don't use bogus uri
-            $arr['license'] = $this->_packagefile->getLicense();
-        }
-
-        $arr['notes'] = $this->_packagefile->getNotes();
-        $temp = array();
-        $arr['contents'] = $this->_convertFilelist2_0($temp);
-        $this->_convertDependencies2_0($arr);
-        $release = ($this->_packagefile->getConfigureOptions() || $this->_isExtension) ?
-            'extsrcrelease' : 'phprelease';
-        if ($release == 'extsrcrelease') {
-            $arr['channel'] = 'pecl.php.net';
-            $arr['providesextension'] = $arr['name']; // assumption
-        }
-
-        $arr[$release] = array();
-        if ($this->_packagefile->getConfigureOptions()) {
-            $arr[$release]['configureoption'] = $this->_packagefile->getConfigureOptions();
-            foreach ($arr[$release]['configureoption'] as $i => $opt) {
-                $arr[$release]['configureoption'][$i] = array('attribs' => $opt);
-            }
-            if (count($arr[$release]['configureoption']) == 1) {
-                $arr[$release]['configureoption'] = $arr[$release]['configureoption'][0];
-            }
-        }
-
-        $this->_convertRelease2_0($arr[$release], $temp);
-        if ($release == 'extsrcrelease' && count($arr[$release]) > 1) {
-            // multiple extsrcrelease tags added in PEAR 1.4.1
-            $arr['dependencies']['required']['pearinstaller']['min'] = '1.4.1';
-        }
-
-        if ($cl = $this->_packagefile->getChangelog()) {
-            foreach ($cl as $release) {
-                $rel = array();
-                $rel['version'] =
-                    array(
-                        'release' => $release['version'],
-                        'api' => $release['version'],
-                    );
-                if (!isset($release['release_state'])) {
-                    $release['release_state'] = 'stable';
-                }
-
-                $rel['stability'] =
-                    array(
-                        'release' => $release['release_state'],
-                        'api' => $release['release_state'],
-                    );
-                if (isset($release['release_date'])) {
-                    $rel['date'] = $release['release_date'];
-                } else {
-                    $rel['date'] = date('Y-m-d');
-                }
-
-                if (isset($release['release_license'])) {
-                    if (isset($licensemap[strtolower($release['release_license'])])) {
-                        $uri = $licensemap[strtolower($release['release_license'])];
-                    } else {
-                        $uri = 'http://www.example.com';
-                    }
-                    $rel['license'] = array(
-                            'attribs' => array('uri' => $uri),
-                            '_content' => $release['release_license']
-                        );
-                } else {
-                    $rel['license'] = $arr['license'];
-                }
-
-                if (!isset($release['release_notes'])) {
-                    $release['release_notes'] = 'no release notes';
-                }
-
-                $rel['notes'] = $release['release_notes'];
-                $arr['changelog']['release'][] = $rel;
-            }
-        }
-
-        $ret = new $class;
-        $ret->setConfig($this->_packagefile->_config);
-        if (isset($this->_packagefile->_logger) && is_object($this->_packagefile->_logger)) {
-            $ret->setLogger($this->_packagefile->_logger);
-        }
-
-        $ret->fromArray($arr);
-        return $ret;
-    }
-
-    /**
-     * @param array
-     * @param bool
-     * @access private
-     */
-    function _convertDependencies2_0(&$release, $internal = false)
-    {
-        $peardep = array('pearinstaller' =>
-            array('min' => '1.4.0b1')); // this is a lot safer
-        $required = $optional = array();
-        $release['dependencies'] = array('required' => array());
-        if ($this->_packagefile->hasDeps()) {
-            foreach ($this->_packagefile->getDeps() as $dep) {
-                if (!isset($dep['optional']) || $dep['optional'] == 'no') {
-                    $required[] = $dep;
-                } else {
-                    $optional[] = $dep;
-                }
-            }
-            foreach (array('required', 'optional') as $arr) {
-                $deps = array();
-                foreach ($$arr as $dep) {
-                    // organize deps by dependency type and name
-                    if (!isset($deps[$dep['type']])) {
-                        $deps[$dep['type']] = array();
-                    }
-                    if (isset($dep['name'])) {
-                        $deps[$dep['type']][$dep['name']][] = $dep;
-                    } else {
-                        $deps[$dep['type']][] = $dep;
-                    }
-                }
-                do {
-                    if (isset($deps['php'])) {
-                        $php = array();
-                        if (count($deps['php']) > 1) {
-                            $php = $this->_processPhpDeps($deps['php']);
-                        } else {
-                            if (!isset($deps['php'][0])) {
-                                list($key, $blah) = each ($deps['php']); // stupid buggy versions
-                                $deps['php'] = array($blah[0]);
-                            }
-                            $php = $this->_processDep($deps['php'][0]);
-                            if (!$php) {
-                                break; // poor mans throw
-                            }
-                        }
-                        $release['dependencies'][$arr]['php'] = $php;
-                    }
-                } while (false);
-                do {
-                    if (isset($deps['pkg'])) {
-                        $pkg = array();
-                        $pkg = $this->_processMultipleDepsName($deps['pkg']);
-                        if (!$pkg) {
-                            break; // poor mans throw
-                        }
-                        $release['dependencies'][$arr]['package'] = $pkg;
-                    }
-                } while (false);
-                do {
-                    if (isset($deps['ext'])) {
-                        $pkg = array();
-                        $pkg = $this->_processMultipleDepsName($deps['ext']);
-                        $release['dependencies'][$arr]['extension'] = $pkg;
-                    }
-                } while (false);
-                // skip sapi - it's not supported so nobody will have used it
-                // skip os - it's not supported in 1.0
-            }
-        }
-        if (isset($release['dependencies']['required'])) {
-            $release['dependencies']['required'] =
-                array_merge($peardep, $release['dependencies']['required']);
-        } else {
-            $release['dependencies']['required'] = $peardep;
-        }
-        if (!isset($release['dependencies']['required']['php'])) {
-            $release['dependencies']['required']['php'] =
-                array('min' => '4.0.0');
-        }
-        $order = array();
-        $bewm = $release['dependencies']['required'];
-        $order['php'] = $bewm['php'];
-        $order['pearinstaller'] = $bewm['pearinstaller'];
-        isset($bewm['package']) ? $order['package'] = $bewm['package'] :0;
-        isset($bewm['extension']) ? $order['extension'] = $bewm['extension'] :0;
-        $release['dependencies']['required'] = $order;
-    }
-
-    /**
-     * @param array
-     * @access private
-     */
-    function _convertFilelist2_0(&$package)
-    {
-        $ret = array('dir' =>
-                    array(
-                        'attribs' => array('name' => '/'),
-                        'file' => array()
-                        )
-                    );
-        $package['platform'] =
-        $package['install-as'] = array();
-        $this->_isExtension = false;
-        foreach ($this->_packagefile->getFilelist() as $name => $file) {
-            $file['name'] = $name;
-            if (isset($file['role']) && $file['role'] == 'src') {
-                $this->_isExtension = true;
-            }
-            if (isset($file['replacements'])) {
-                $repl = $file['replacements'];
-                unset($file['replacements']);
-            } else {
-                unset($repl);
-            }
-            if (isset($file['install-as'])) {
-                $package['install-as'][$name] = $file['install-as'];
-                unset($file['install-as']);
-            }
-            if (isset($file['platform'])) {
-                $package['platform'][$name] = $file['platform'];
-                unset($file['platform']);
-            }
-            $file = array('attribs' => $file);
-            if (isset($repl)) {
-                foreach ($repl as $replace ) {
-                    $file['tasks:replace'][] = array('attribs' => $replace);
-                }
-                if (count($repl) == 1) {
-                    $file['tasks:replace'] = $file['tasks:replace'][0];
-                }
-            }
-            $ret['dir']['file'][] = $file;
-        }
-        return $ret;
-    }
-
-    /**
-     * Post-process special files with install-as/platform attributes and
-     * make the release tag.
-     *
-     * This complex method follows this work-flow to create the release tags:
-     *
-     * <pre>
-     * - if any install-as/platform exist, create a generic release and fill it with
-     *   o <install as=..> tags for <file name=... install-as=...>
-     *   o <install as=..> tags for <file name=... platform=!... install-as=..>
-     *   o <ignore> tags for <file name=... platform=...>
-     *   o <ignore> tags for <file name=... platform=... install-as=..>
-     * - create a release for each platform encountered and fill with
-     *   o <install as..> tags for <file name=... install-as=...>
-     *   o <install as..> tags for <file name=... platform=this platform install-as=..>
-     *   o <install as..> tags for <file name=... platform=!other platform install-as=..>
-     *   o <ignore> tags for <file name=... platform=!this platform>
-     *   o <ignore> tags for <file name=... platform=other platform>
-     *   o <ignore> tags for <file name=... platform=other platform install-as=..>
-     *   o <ignore> tags for <file name=... platform=!this platform install-as=..>
-     * </pre>
-     *
-     * It does this by accessing the $package parameter, which contains an array with
-     * indices:
-     *
-     *  - platform: mapping of file => OS the file should be installed on
-     *  - install-as: mapping of file => installed name
-     *  - osmap: mapping of OS => list of files that should be installed
-     *    on that OS
-     *  - notosmap: mapping of OS => list of files that should not be
-     *    installed on that OS
-     *
-     * @param array
-     * @param array
-     * @access private
-     */
-    function _convertRelease2_0(&$release, $package)
-    {
-        //- if any install-as/platform exist, create a generic release and fill it with
-        if (count($package['platform']) || count($package['install-as'])) {
-            $generic = array();
-            $genericIgnore = array();
-            foreach ($package['install-as'] as $file => $as) {
-                //o <install as=..> tags for <file name=... install-as=...>
-                if (!isset($package['platform'][$file])) {
-                    $generic[] = $file;
-                    continue;
-                }
-                //o <install as=..> tags for <file name=... platform=!... install-as=..>
-                if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} == '!') {
-                    $generic[] = $file;
-                    continue;
-                }
-                //o <ignore> tags for <file name=... platform=... install-as=..>
-                if (isset($package['platform'][$file]) &&
-                      $package['platform'][$file]{0} != '!') {
-                    $genericIgnore[] = $file;
-                    continue;
-                }
-            }
-            foreach ($package['platform'] as $file => $platform) {
-                if (isset($package['install-as'][$file])) {
-                    continue;
-                }
-                if ($platform{0} != '!') {
-                    //o <ignore> tags for <file name=... platform=...>
-                    $genericIgnore[] = $file;
-                }
-            }
-            if (count($package['platform'])) {
-                $oses = $notplatform = $platform = array();
-                foreach ($package['platform'] as $file => $os) {
-                    // get a list of oses
-                    if ($os{0} == '!') {
-                        if (isset($oses[substr($os, 1)])) {
-                            continue;
-                        }
-                        $oses[substr($os, 1)] = count($oses);
-                    } else {
-                        if (isset($oses[$os])) {
-                            continue;
-                        }
-                        $oses[$os] = count($oses);
-                    }
-                }
-                //- create a release for each platform encountered and fill with
-                foreach ($oses as $os => $releaseNum) {
-                    $release[$releaseNum]['installconditions']['os']['name'] = $os;
-                    $release[$releaseNum]['filelist'] = array('install' => array(),
-                        'ignore' => array());
-                    foreach ($package['install-as'] as $file => $as) {
-                        //o <install as=..> tags for <file name=... install-as=...>
-                        if (!isset($package['platform'][$file])) {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o <install as..> tags for
-                        //  <file name=... platform=this platform install-as=..>
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] == $os) {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o <install as..> tags for
-                        //  <file name=... platform=!other platform install-as=..>
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] != "!$os" &&
-                              $package['platform'][$file]{0} == '!') {
-                            $release[$releaseNum]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $as,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o <ignore> tags for
-                        //  <file name=... platform=!this platform install-as=..>
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file] == "!$os") {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o <ignore> tags for
-                        //  <file name=... platform=other platform install-as=..>
-                        if (isset($package['platform'][$file]) &&
-                              $package['platform'][$file]{0} != '!' &&
-                              $package['platform'][$file] != $os) {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                    }
-                    foreach ($package['platform'] as $file => $platform) {
-                        if (isset($package['install-as'][$file])) {
-                            continue;
-                        }
-                        //o <ignore> tags for <file name=... platform=!this platform>
-                        if ($platform == "!$os") {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                            continue;
-                        }
-                        //o <ignore> tags for <file name=... platform=other platform>
-                        if ($platform{0} != '!' && $platform != $os) {
-                            $release[$releaseNum]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    ),
-                                );
-                        }
-                    }
-                    if (!count($release[$releaseNum]['filelist']['install'])) {
-                        unset($release[$releaseNum]['filelist']['install']);
-                    }
-                    if (!count($release[$releaseNum]['filelist']['ignore'])) {
-                        unset($release[$releaseNum]['filelist']['ignore']);
-                    }
-                }
-                if (count($generic) || count($genericIgnore)) {
-                    $release[count($oses)] = array();
-                    if (count($generic)) {
-                        foreach ($generic as $file) {
-                            if (isset($package['install-as'][$file])) {
-                                $installas = $package['install-as'][$file];
-                            } else {
-                                $installas = $file;
-                            }
-                            $release[count($oses)]['filelist']['install'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                        'as' => $installas,
-                                    )
-                                );
-                        }
-                    }
-                    if (count($genericIgnore)) {
-                        foreach ($genericIgnore as $file) {
-                            $release[count($oses)]['filelist']['ignore'][] =
-                                array(
-                                    'attribs' => array(
-                                        'name' => $file,
-                                    )
-                                );
-                        }
-                    }
-                }
-                // cleanup
-                foreach ($release as $i => $rel) {
-                    if (isset($rel['filelist']['install']) &&
-                          count($rel['filelist']['install']) == 1) {
-                        $release[$i]['filelist']['install'] =
-                            $release[$i]['filelist']['install'][0];
-                    }
-                    if (isset($rel['filelist']['ignore']) &&
-                          count($rel['filelist']['ignore']) == 1) {
-                        $release[$i]['filelist']['ignore'] =
-                            $release[$i]['filelist']['ignore'][0];
-                    }
-                }
-                if (count($release) == 1) {
-                    $release = $release[0];
-                }
-            } else {
-                // no platform atts, but some install-as atts
-                foreach ($package['install-as'] as $file => $value) {
-                    $release['filelist']['install'][] =
-                        array(
-                            'attribs' => array(
-                                'name' => $file,
-                                'as' => $value
-                            )
-                        );
-                }
-                if (count($release['filelist']['install']) == 1) {
-                    $release['filelist']['install'] = $release['filelist']['install'][0];
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _processDep($dep)
-    {
-        if ($dep['type'] == 'php') {
-            if ($dep['rel'] == 'has') {
-                // come on - everyone has php!
-                return false;
-            }
-        }
-        $php = array();
-        if ($dep['type'] != 'php') {
-            $php['name'] = $dep['name'];
-            if ($dep['type'] == 'pkg') {
-                $php['channel'] = 'pear.php.net';
-            }
-        }
-        switch ($dep['rel']) {
-            case 'gt' :
-                $php['min'] = $dep['version'];
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'ge' :
-                if (!isset($dep['version'])) {
-                    if ($dep['type'] == 'php') {
-                        if (isset($dep['name'])) {
-                            $dep['version'] = $dep['name'];
-                        }
-                    }
-                }
-                $php['min'] = $dep['version'];
-            break;
-            case 'lt' :
-                $php['max'] = $dep['version'];
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'le' :
-                $php['max'] = $dep['version'];
-            break;
-            case 'eq' :
-                $php['min'] = $dep['version'];
-                $php['max'] = $dep['version'];
-            break;
-            case 'ne' :
-                $php['exclude'] = $dep['version'];
-            break;
-            case 'not' :
-                $php['conflicts'] = 'yes';
-            break;
-        }
-        return $php;
-    }
-
-    /**
-     * @param array
-     * @return array
-     */
-    function _processPhpDeps($deps)
-    {
-        $test = array();
-        foreach ($deps as $dep) {
-            $test[] = $this->_processDep($dep);
-        }
-        $min = array();
-        $max = array();
-        foreach ($test as $dep) {
-            if (!$dep) {
-                continue;
-            }
-            if (isset($dep['min'])) {
-                $min[$dep['min']] = count($min);
-            }
-            if (isset($dep['max'])) {
-                $max[$dep['max']] = count($max);
-            }
-        }
-        if (count($min) > 0) {
-            uksort($min, 'version_compare');
-        }
-        if (count($max) > 0) {
-            uksort($max, 'version_compare');
-        }
-        if (count($min)) {
-            // get the highest minimum
-            $min = array_pop($a = array_flip($min));
-        } else {
-            $min = false;
-        }
-        if (count($max)) {
-            // get the lowest maximum
-            $max = array_shift($a = array_flip($max));
-        } else {
-            $max = false;
-        }
-        if ($min) {
-            $php['min'] = $min;
-        }
-        if ($max) {
-            $php['max'] = $max;
-        }
-        $exclude = array();
-        foreach ($test as $dep) {
-            if (!isset($dep['exclude'])) {
-                continue;
-            }
-            $exclude[] = $dep['exclude'];
-        }
-        if (count($exclude)) {
-            $php['exclude'] = $exclude;
-        }
-        return $php;
-    }
-
-    /**
-     * process multiple dependencies that have a name, like package deps
-     * @param array
-     * @return array
-     * @access private
-     */
-    function _processMultipleDepsName($deps)
-    {
-        $ret = $tests = array();
-        foreach ($deps as $name => $dep) {
-            foreach ($dep as $d) {
-                $tests[$name][] = $this->_processDep($d);
-            }
-        }
-
-        foreach ($tests as $name => $test) {
-            $max = $min = $php = array();
-            $php['name'] = $name;
-            foreach ($test as $dep) {
-                if (!$dep) {
-                    continue;
-                }
-                if (isset($dep['channel'])) {
-                    $php['channel'] = 'pear.php.net';
-                }
-                if (isset($dep['conflicts']) && $dep['conflicts'] == 'yes') {
-                    $php['conflicts'] = 'yes';
-                }
-                if (isset($dep['min'])) {
-                    $min[$dep['min']] = count($min);
-                }
-                if (isset($dep['max'])) {
-                    $max[$dep['max']] = count($max);
-                }
-            }
-            if (count($min) > 0) {
-                uksort($min, 'version_compare');
-            }
-            if (count($max) > 0) {
-                uksort($max, 'version_compare');
-            }
-            if (count($min)) {
-                // get the highest minimum
-                $min = array_pop($a = array_flip($min));
-            } else {
-                $min = false;
-            }
-            if (count($max)) {
-                // get the lowest maximum
-                $max = array_shift($a = array_flip($max));
-            } else {
-                $max = false;
-            }
-            if ($min) {
-                $php['min'] = $min;
-            }
-            if ($max) {
-                $php['max'] = $max;
-            }
-            $exclude = array();
-            foreach ($test as $dep) {
-                if (!isset($dep['exclude'])) {
-                    continue;
-                }
-                $exclude[] = $dep['exclude'];
-            }
-            if (count($exclude)) {
-                $php['exclude'] = $exclude;
-            }
-            $ret[] = $php;
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v2.php b/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v2.php
deleted file mode 100644
index 5df7d2838..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/Generator/v2.php
+++ /dev/null
@@ -1,893 +0,0 @@
-<?php
-/**
- * package.xml generation class, package.xml version 2.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Stephan Schmidt (original XML_Serializer code)
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 278907 2009-04-17 21:10:04Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * file/dir manipulation routines
- */
-require_once 'System.php';
-require_once 'XML/Util.php';
-
-/**
- * This class converts a PEAR_PackageFile_v2 object into any output format.
- *
- * Supported output formats include array, XML string (using S. Schmidt's
- * XML_Serializer, slightly customized)
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Stephan Schmidt (original XML_Serializer code)
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Generator_v2
-{
-   /**
-    * default options for the serialization
-    * @access private
-    * @var array $_defaultOptions
-    */
-    var $_defaultOptions = array(
-        'indent'             => ' ',                    // string used for indentation
-        'linebreak'          => "\n",                  // string used for newlines
-        'typeHints'          => false,                 // automatically add type hin attributes
-        'addDecl'            => true,                 // add an XML declaration
-        'defaultTagName'     => 'XML_Serializer_Tag',  // tag used for indexed arrays or invalid names
-        'classAsTagName'     => false,                 // use classname for objects in indexed arrays
-        'keyAttribute'       => '_originalKey',        // attribute where original key is stored
-        'typeAttribute'      => '_type',               // attribute for type (only if typeHints => true)
-        'classAttribute'     => '_class',              // attribute for class of objects (only if typeHints => true)
-        'scalarAsAttributes' => false,                 // scalar values (strings, ints,..) will be serialized as attribute
-        'prependAttributes'  => '',                    // prepend string for attributes
-        'indentAttributes'   => false,                 // indent the attributes, if set to '_auto', it will indent attributes so they all start at the same column
-        'mode'               => 'simplexml',             // use 'simplexml' to use parent name as tagname if transforming an indexed array
-        'addDoctype'         => false,                 // add a doctype declaration
-        'doctype'            => null,                  // supply a string or an array with id and uri ({@see XML_Util::getDoctypeDeclaration()}
-        'rootName'           => 'package',                  // name of the root tag
-        'rootAttributes'     => array(
-            'version' => '2.0',
-            'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-            'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-            'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-            'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-http://pear.php.net/dtd/tasks-1.0.xsd
-http://pear.php.net/dtd/package-2.0
-http://pear.php.net/dtd/package-2.0.xsd',
-        ),               // attributes of the root tag
-        'attributesArray'    => 'attribs',                  // all values in this key will be treated as attributes
-        'contentName'        => '_content',                   // this value will be used directly as content, instead of creating a new tag, may only be used in conjuction with attributesArray
-        'beautifyFilelist'   => false,
-        'encoding' => 'UTF-8',
-    );
-
-   /**
-    * options for the serialization
-    * @access private
-    * @var array $options
-    */
-    var $options = array();
-
-   /**
-    * current tag depth
-    * @var integer $_tagDepth
-    */
-    var $_tagDepth = 0;
-
-   /**
-    * serilialized representation of the data
-    * @var string $_serializedData
-    */
-    var $_serializedData = null;
-    /**
-     * @var PEAR_PackageFile_v2
-     */
-    var $_packagefile;
-    /**
-     * @param PEAR_PackageFile_v2
-     */
-    function PEAR_PackageFile_Generator_v2(&$packagefile)
-    {
-        $this->_packagefile = &$packagefile;
-        if (isset($this->_packagefile->encoding)) {
-            $this->_defaultOptions['encoding'] = $this->_packagefile->encoding;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    function getPackagerVersion()
-    {
-        return '1.9.1';
-    }
-
-    /**
-     * @param PEAR_Packager
-     * @param bool generate a .tgz or a .tar
-     * @param string|null temporary directory to package in
-     */
-    function toTgz(&$packager, $compress = true, $where = null)
-    {
-        $a = null;
-        return $this->toTgz2($packager, $a, $compress, $where);
-    }
-
-    /**
-     * Package up both a package.xml and package2.xml for the same release
-     * @param PEAR_Packager
-     * @param PEAR_PackageFile_v1
-     * @param bool generate a .tgz or a .tar
-     * @param string|null temporary directory to package in
-     */
-    function toTgz2(&$packager, &$pf1, $compress = true, $where = null)
-    {
-        require_once 'Archive/Tar.php';
-        if (!$this->_packagefile->isEquivalent($pf1)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: "' .
-                basename($pf1->getPackageFile()) .
-                '" is not equivalent to "' . basename($this->_packagefile->getPackageFile())
-                . '"');
-        }
-
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: "' . $where . '" could' .
-                ' not be created');
-        }
-
-        $file = $where . DIRECTORY_SEPARATOR . 'package.xml';
-        if (file_exists($file) && !is_file($file)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: unable to save package.xml as' .
-                ' "' . $file  .'"');
-        }
-
-        if (!$this->_packagefile->validate(PEAR_VALIDATE_PACKAGING)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: invalid package.xml');
-        }
-
-        $ext = $compress ? '.tgz' : '.tar';
-        $pkgver = $this->_packagefile->getPackage() . '-' . $this->_packagefile->getVersion();
-        $dest_package = getcwd() . DIRECTORY_SEPARATOR . $pkgver . $ext;
-        if (file_exists($dest_package) && !is_file($dest_package)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: cannot create tgz file "' .
-                $dest_package . '"');
-        }
-
-        $pkgfile = $this->_packagefile->getPackageFile();
-        if (!$pkgfile) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toTgz: package file object must ' .
-                'be created from a real file');
-        }
-
-        $pkgdir  = dirname(realpath($pkgfile));
-        $pkgfile = basename($pkgfile);
-
-        // {{{ Create the package file list
-        $filelist = array();
-        $i = 0;
-        $this->_packagefile->flattenFilelist();
-        $contents = $this->_packagefile->getContents();
-        if (isset($contents['bundledpackage'])) { // bundles of packages
-            $contents = $contents['bundledpackage'];
-            if (!isset($contents[0])) {
-                $contents = array($contents);
-            }
-
-            $packageDir = $where;
-            foreach ($contents as $i => $package) {
-                $fname = $package;
-                $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-                if (!file_exists($file)) {
-                    return $packager->raiseError("File does not exist: $fname");
-                }
-
-                $tfile = $packageDir . DIRECTORY_SEPARATOR . $fname;
-                System::mkdir(array('-p', dirname($tfile)));
-                copy($file, $tfile);
-                $filelist[$i++] = $tfile;
-                $packager->log(2, "Adding package $fname");
-            }
-        } else { // normal packages
-            $contents = $contents['dir']['file'];
-            if (!isset($contents[0])) {
-                $contents = array($contents);
-            }
-
-            $packageDir = $where;
-            foreach ($contents as $i => $file) {
-                $fname = $file['attribs']['name'];
-                $atts = $file['attribs'];
-                $orig = $file;
-                $file = $pkgdir . DIRECTORY_SEPARATOR . $fname;
-                if (!file_exists($file)) {
-                    return $packager->raiseError("File does not exist: $fname");
-                }
-
-                $origperms = fileperms($file);
-                $tfile = $packageDir . DIRECTORY_SEPARATOR . $fname;
-                unset($orig['attribs']);
-                if (count($orig)) { // file with tasks
-                    // run any package-time tasks
-                    $contents = file_get_contents($file);
-                    foreach ($orig as $tag => $raw) {
-                        $tag = str_replace(
-                            array($this->_packagefile->getTasksNs() . ':', '-'),
-                            array('', '_'), $tag);
-                        $task = "PEAR_Task_$tag";
-                        $task = &new $task($this->_packagefile->_config,
-                            $this->_packagefile->_logger,
-                            PEAR_TASK_PACKAGE);
-                        $task->init($raw, $atts, null);
-                        $res = $task->startSession($this->_packagefile, $contents, $tfile);
-                        if (!$res) {
-                            continue; // skip this task
-                        }
-
-                        if (PEAR::isError($res)) {
-                            return $res;
-                        }
-
-                        $contents = $res; // save changes
-                        System::mkdir(array('-p', dirname($tfile)));
-                        $wp = fopen($tfile, "wb");
-                        fwrite($wp, $contents);
-                        fclose($wp);
-                    }
-                }
-
-                if (!file_exists($tfile)) {
-                    System::mkdir(array('-p', dirname($tfile)));
-                    copy($file, $tfile);
-                }
-
-                chmod($tfile, $origperms);
-                $filelist[$i++] = $tfile;
-                $this->_packagefile->setFileAttribute($fname, 'md5sum', md5_file($tfile), $i - 1);
-                $packager->log(2, "Adding file $fname");
-            }
-        }
-            // }}}
-
-        $name       = $pf1 !== null ? 'package2.xml' : 'package.xml';
-        $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
-        if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
-            $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
-            // ----- Creates with the package.xml file
-            $ok = $tar->createModify(array($packagexml), '', $where);
-            if (PEAR::isError($ok)) {
-                return $packager->raiseError($ok);
-            } elseif (!$ok) {
-                return $packager->raiseError('PEAR_Packagefile_v2::toTgz(): adding ' . $name .
-                    ' failed');
-            }
-
-            // ----- Add the content of the package
-            if (!$tar->addModify($filelist, $pkgver, $where)) {
-                return $packager->raiseError(
-                    'PEAR_Packagefile_v2::toTgz(): tarball creation failed');
-            }
-
-            // add the package.xml version 1.0
-            if ($pf1 !== null) {
-                $pfgen = &$pf1->getDefaultGenerator();
-                $packagexml1 = $pfgen->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
-                if (!$tar->addModify(array($packagexml1), '', $where)) {
-                    return $packager->raiseError(
-                        'PEAR_Packagefile_v2::toTgz(): adding package.xml failed');
-                }
-            }
-
-            return $dest_package;
-        }
-    }
-
-    function toPackageFile($where = null, $state = PEAR_VALIDATE_NORMAL, $name = 'package.xml')
-    {
-        if (!$this->_packagefile->validate($state)) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: invalid package.xml',
-                null, null, null, $this->_packagefile->getValidationWarnings());
-        }
-
-        if ($where === null) {
-            if (!($where = System::mktemp(array('-d')))) {
-                return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: mktemp failed');
-            }
-        } elseif (!@System::mkDir(array('-p', $where))) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: "' . $where . '" could' .
-                ' not be created');
-        }
-
-        $newpkgfile = $where . DIRECTORY_SEPARATOR . $name;
-        $np = @fopen($newpkgfile, 'wb');
-        if (!$np) {
-            return PEAR::raiseError('PEAR_Packagefile_v2::toPackageFile: unable to save ' .
-               "$name as $newpkgfile");
-        }
-        fwrite($np, $this->toXml($state));
-        fclose($np);
-        return $newpkgfile;
-    }
-
-    function &toV2()
-    {
-        return $this->_packagefile;
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @return string XML data
-     */
-    function toXml($state = PEAR_VALIDATE_NORMAL, $options = array())
-    {
-        $this->_packagefile->setDate(date('Y-m-d'));
-        $this->_packagefile->setTime(date('H:i:s'));
-        if (!$this->_packagefile->validate($state)) {
-            return false;
-        }
-
-        if (is_array($options)) {
-            $this->options = array_merge($this->_defaultOptions, $options);
-        } else {
-            $this->options = $this->_defaultOptions;
-        }
-
-        $arr = $this->_packagefile->getArray();
-        if (isset($arr['filelist'])) {
-            unset($arr['filelist']);
-        }
-
-        if (isset($arr['_lastversion'])) {
-            unset($arr['_lastversion']);
-        }
-
-        // Fix the notes a little bit
-        if (isset($arr['notes'])) {
-            // This trims out the indenting, needs fixing
-            $arr['notes'] = "\n" . trim($arr['notes']) . "\n";
-        }
-
-        if (isset($arr['changelog']) && !empty($arr['changelog'])) {
-            // Fix for inconsistency how the array is filled depending on the changelog release amount
-            if (!isset($arr['changelog']['release'][0])) {
-                $release = $arr['changelog']['release'];
-                unset($arr['changelog']['release']);
-
-                $arr['changelog']['release']    = array();
-                $arr['changelog']['release'][0] = $release;
-            }
-
-            foreach (array_keys($arr['changelog']['release']) as $key) {
-                $c =& $arr['changelog']['release'][$key];
-                if (isset($c['notes'])) {
-                    // This trims out the indenting, needs fixing
-                    $c['notes'] = "\n" . trim($c['notes']) . "\n";
-                }
-            }
-        }
-
-        if ($state ^ PEAR_VALIDATE_PACKAGING && !isset($arr['bundle'])) {
-            $use = $this->_recursiveXmlFilelist($arr['contents']['dir']['file']);
-            unset($arr['contents']['dir']['file']);
-            if (isset($use['dir'])) {
-                $arr['contents']['dir']['dir'] = $use['dir'];
-            }
-            if (isset($use['file'])) {
-                $arr['contents']['dir']['file'] = $use['file'];
-            }
-            $this->options['beautifyFilelist'] = true;
-        }
-
-        $arr['attribs']['packagerversion'] = '1.9.1';
-        if ($this->serialize($arr, $options)) {
-            return $this->_serializedData . "\n";
-        }
-
-        return false;
-    }
-
-
-    function _recursiveXmlFilelist($list)
-    {
-        $dirs = array();
-        if (isset($list['attribs'])) {
-            $file = $list['attribs']['name'];
-            unset($list['attribs']['name']);
-            $attributes = $list['attribs'];
-            $this->_addDir($dirs, explode('/', dirname($file)), $file, $attributes);
-        } else {
-            foreach ($list as $a) {
-                $file = $a['attribs']['name'];
-                $attributes = $a['attribs'];
-                unset($a['attribs']);
-                $this->_addDir($dirs, explode('/', dirname($file)), $file, $attributes, $a);
-            }
-        }
-        $this->_formatDir($dirs);
-        $this->_deFormat($dirs);
-        return $dirs;
-    }
-
-    function _addDir(&$dirs, $dir, $file = null, $attributes = null, $tasks = null)
-    {
-        if (!$tasks) {
-            $tasks = array();
-        }
-        if ($dir == array() || $dir == array('.')) {
-            $dirs['file'][basename($file)] = $tasks;
-            $attributes['name'] = basename($file);
-            $dirs['file'][basename($file)]['attribs'] = $attributes;
-            return;
-        }
-        $curdir = array_shift($dir);
-        if (!isset($dirs['dir'][$curdir])) {
-            $dirs['dir'][$curdir] = array();
-        }
-        $this->_addDir($dirs['dir'][$curdir], $dir, $file, $attributes, $tasks);
-    }
-
-    function _formatDir(&$dirs)
-    {
-        if (!count($dirs)) {
-            return array();
-        }
-        $newdirs = array();
-        if (isset($dirs['dir'])) {
-            $newdirs['dir'] = $dirs['dir'];
-        }
-        if (isset($dirs['file'])) {
-            $newdirs['file'] = $dirs['file'];
-        }
-        $dirs = $newdirs;
-        if (isset($dirs['dir'])) {
-            uksort($dirs['dir'], 'strnatcasecmp');
-            foreach ($dirs['dir'] as $dir => $contents) {
-                $this->_formatDir($dirs['dir'][$dir]);
-            }
-        }
-        if (isset($dirs['file'])) {
-            uksort($dirs['file'], 'strnatcasecmp');
-        };
-    }
-
-    function _deFormat(&$dirs)
-    {
-        if (!count($dirs)) {
-            return array();
-        }
-        $newdirs = array();
-        if (isset($dirs['dir'])) {
-            foreach ($dirs['dir'] as $dir => $contents) {
-                $newdir = array();
-                $newdir['attribs']['name'] = $dir;
-                $this->_deFormat($contents);
-                foreach ($contents as $tag => $val) {
-                    $newdir[$tag] = $val;
-                }
-                $newdirs['dir'][] = $newdir;
-            }
-            if (count($newdirs['dir']) == 1) {
-                $newdirs['dir'] = $newdirs['dir'][0];
-            }
-        }
-        if (isset($dirs['file'])) {
-            foreach ($dirs['file'] as $name => $file) {
-                $newdirs['file'][] = $file;
-            }
-            if (count($newdirs['file']) == 1) {
-                $newdirs['file'] = $newdirs['file'][0];
-            }
-        }
-        $dirs = $newdirs;
-    }
-
-    /**
-    * reset all options to default options
-    *
-    * @access   public
-    * @see      setOption(), XML_Unserializer()
-    */
-    function resetOptions()
-    {
-        $this->options = $this->_defaultOptions;
-    }
-
-   /**
-    * set an option
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Serializer()
-    */
-    function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-
-   /**
-    * sets several options at once
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Unserializer(), setOption()
-    */
-    function setOptions($options)
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-   /**
-    * serialize data
-    *
-    * @access   public
-    * @param    mixed    $data data to serialize
-    * @return   boolean  true on success, pear error on failure
-    */
-    function serialize($data, $options = null)
-    {
-        // if options have been specified, use them instead
-        // of the previously defined ones
-        if (is_array($options)) {
-            $optionsBak = $this->options;
-            if (isset($options['overrideOptions']) && $options['overrideOptions'] == true) {
-                $this->options = array_merge($this->_defaultOptions, $options);
-            } else {
-                $this->options = array_merge($this->options, $options);
-            }
-        } else {
-            $optionsBak = null;
-        }
-
-        //  start depth is zero
-        $this->_tagDepth = 0;
-        $this->_serializedData = '';
-        // serialize an array
-        if (is_array($data)) {
-            $tagName = isset($this->options['rootName']) ? $this->options['rootName'] : 'array';
-            $this->_serializedData .= $this->_serializeArray($data, $tagName, $this->options['rootAttributes']);
-        }
-
-        // add doctype declaration
-        if ($this->options['addDoctype'] === true) {
-            $this->_serializedData = XML_Util::getDoctypeDeclaration($tagName, $this->options['doctype'])
-                                   . $this->options['linebreak']
-                                   . $this->_serializedData;
-        }
-
-        //  build xml declaration
-        if ($this->options['addDecl']) {
-            $atts = array();
-            $encoding = isset($this->options['encoding']) ? $this->options['encoding'] : null;
-            $this->_serializedData = XML_Util::getXMLDeclaration('1.0', $encoding)
-                                   . $this->options['linebreak']
-                                   . $this->_serializedData;
-        }
-
-
-        if ($optionsBak !== null) {
-            $this->options = $optionsBak;
-        }
-
-        return  true;
-    }
-
-   /**
-    * get the result of the serialization
-    *
-    * @access public
-    * @return string serialized XML
-    */
-    function getSerializedData()
-    {
-        if ($this->_serializedData === null) {
-            return  $this->raiseError('No serialized data available. Use XML_Serializer::serialize() first.', XML_SERIALIZER_ERROR_NO_SERIALIZATION);
-        }
-        return $this->_serializedData;
-    }
-
-   /**
-    * serialize any value
-    *
-    * This method checks for the type of the value and calls the appropriate method
-    *
-    * @access private
-    * @param  mixed     $value
-    * @param  string    $tagName
-    * @param  array     $attributes
-    * @return string
-    */
-    function _serializeValue($value, $tagName = null, $attributes = array())
-    {
-        if (is_array($value)) {
-            $xml = $this->_serializeArray($value, $tagName, $attributes);
-        } elseif (is_object($value)) {
-            $xml = $this->_serializeObject($value, $tagName);
-        } else {
-            $tag = array(
-                          'qname'      => $tagName,
-                          'attributes' => $attributes,
-                          'content'    => $value
-                        );
-            $xml = $this->_createXMLTag($tag);
-        }
-        return $xml;
-    }
-
-   /**
-    * serialize an array
-    *
-    * @access   private
-    * @param    array   $array       array to serialize
-    * @param    string  $tagName     name of the root tag
-    * @param    array   $attributes  attributes for the root tag
-    * @return   string  $string      serialized data
-    * @uses     XML_Util::isValidName() to check, whether key has to be substituted
-    */
-    function _serializeArray(&$array, $tagName = null, $attributes = array())
-    {
-        $_content = null;
-
-        /**
-         * check for special attributes
-         */
-        if ($this->options['attributesArray'] !== null) {
-            if (isset($array[$this->options['attributesArray']])) {
-                $attributes = $array[$this->options['attributesArray']];
-                unset($array[$this->options['attributesArray']]);
-            }
-            /**
-             * check for special content
-             */
-            if ($this->options['contentName'] !== null) {
-                if (isset($array[$this->options['contentName']])) {
-                    $_content = $array[$this->options['contentName']];
-                    unset($array[$this->options['contentName']]);
-                }
-            }
-        }
-
-        /*
-        * if mode is set to simpleXML, check whether
-        * the array is associative or indexed
-        */
-        if (is_array($array) && $this->options['mode'] == 'simplexml') {
-            $indexed = true;
-            if (!count($array)) {
-                $indexed = false;
-            }
-            foreach ($array as $key => $val) {
-                if (!is_int($key)) {
-                    $indexed = false;
-                    break;
-                }
-            }
-
-            if ($indexed && $this->options['mode'] == 'simplexml') {
-                $string = '';
-                foreach ($array as $key => $val) {
-                    if ($this->options['beautifyFilelist'] && $tagName == 'dir') {
-                        if (!isset($this->_curdir)) {
-                            $this->_curdir = '';
-                        }
-                        $savedir = $this->_curdir;
-                        if (isset($val['attribs'])) {
-                            if ($val['attribs']['name'] == '/') {
-                                $this->_curdir = '/';
-                            } else {
-                                if ($this->_curdir == '/') {
-                                    $this->_curdir = '';
-                                }
-                                $this->_curdir .= '/' . $val['attribs']['name'];
-                            }
-                        }
-                    }
-                    $string .= $this->_serializeValue( $val, $tagName, $attributes);
-                    if ($this->options['beautifyFilelist'] && $tagName == 'dir') {
-                        $string .= ' <!-- ' . $this->_curdir . ' -->';
-                        if (empty($savedir)) {
-                            unset($this->_curdir);
-                        } else {
-                            $this->_curdir = $savedir;
-                        }
-                    }
-
-                    $string .= $this->options['linebreak'];
-                    // do indentation
-                    if ($this->options['indent'] !== null && $this->_tagDepth > 0) {
-                        $string .= str_repeat($this->options['indent'], $this->_tagDepth);
-                    }
-                }
-                return rtrim($string);
-            }
-        }
-
-        if ($this->options['scalarAsAttributes'] === true) {
-            foreach ($array as $key => $value) {
-                if (is_scalar($value) && (XML_Util::isValidName($key) === true)) {
-                    unset($array[$key]);
-                    $attributes[$this->options['prependAttributes'].$key] = $value;
-                }
-            }
-        }
-
-        // check for empty array => create empty tag
-        if (empty($array)) {
-            $tag = array(
-                            'qname'      => $tagName,
-                            'content'    => $_content,
-                            'attributes' => $attributes
-                        );
-
-        } else {
-            $this->_tagDepth++;
-            $tmp = $this->options['linebreak'];
-            foreach ($array as $key => $value) {
-                // do indentation
-                if ($this->options['indent'] !== null && $this->_tagDepth > 0) {
-                    $tmp .= str_repeat($this->options['indent'], $this->_tagDepth);
-                }
-
-                // copy key
-                $origKey = $key;
-                // key cannot be used as tagname => use default tag
-                $valid = XML_Util::isValidName($key);
-                if (PEAR::isError($valid)) {
-                    if ($this->options['classAsTagName'] && is_object($value)) {
-                        $key = get_class($value);
-                    } else {
-                        $key = $this->options['defaultTagName'];
-                    }
-                }
-                $atts = array();
-                if ($this->options['typeHints'] === true) {
-                    $atts[$this->options['typeAttribute']] = gettype($value);
-                    if ($key !== $origKey) {
-                        $atts[$this->options['keyAttribute']] = (string)$origKey;
-                    }
-
-                }
-                if ($this->options['beautifyFilelist'] && $key == 'dir') {
-                    if (!isset($this->_curdir)) {
-                        $this->_curdir = '';
-                    }
-                    $savedir = $this->_curdir;
-                    if (isset($value['attribs'])) {
-                        if ($value['attribs']['name'] == '/') {
-                            $this->_curdir = '/';
-                        } else {
-                            $this->_curdir .= '/' . $value['attribs']['name'];
-                        }
-                    }
-                }
-
-                if (is_string($value) && $value && ($value{strlen($value) - 1} == "\n")) {
-                    $value .= str_repeat($this->options['indent'], $this->_tagDepth);
-                }
-                $tmp .= $this->_createXMLTag(array(
-                                                    'qname'      => $key,
-                                                    'attributes' => $atts,
-                                                    'content'    => $value )
-                                            );
-                if ($this->options['beautifyFilelist'] && $key == 'dir') {
-                    if (isset($value['attribs'])) {
-                        $tmp .= ' <!-- ' . $this->_curdir . ' -->';
-                        if (empty($savedir)) {
-                            unset($this->_curdir);
-                        } else {
-                            $this->_curdir = $savedir;
-                        }
-                    }
-                }
-                $tmp .= $this->options['linebreak'];
-            }
-
-            $this->_tagDepth--;
-            if ($this->options['indent']!==null && $this->_tagDepth>0) {
-                $tmp .= str_repeat($this->options['indent'], $this->_tagDepth);
-            }
-
-            if (trim($tmp) === '') {
-                $tmp = null;
-            }
-
-            $tag = array(
-                'qname'      => $tagName,
-                'content'    => $tmp,
-                'attributes' => $attributes
-            );
-        }
-        if ($this->options['typeHints'] === true) {
-            if (!isset($tag['attributes'][$this->options['typeAttribute']])) {
-                $tag['attributes'][$this->options['typeAttribute']] = 'array';
-            }
-        }
-
-        $string = $this->_createXMLTag($tag, false);
-        return $string;
-    }
-
-   /**
-    * create a tag from an array
-    * this method awaits an array in the following format
-    * array(
-    *       'qname'        => $tagName,
-    *       'attributes'   => array(),
-    *       'content'      => $content,      // optional
-    *       'namespace'    => $namespace     // optional
-    *       'namespaceUri' => $namespaceUri  // optional
-    *   )
-    *
-    * @access   private
-    * @param    array   $tag tag definition
-    * @param    boolean $replaceEntities whether to replace XML entities in content or not
-    * @return   string  $string XML tag
-    */
-    function _createXMLTag($tag, $replaceEntities = true)
-    {
-        if ($this->options['indentAttributes'] !== false) {
-            $multiline = true;
-            $indent    = str_repeat($this->options['indent'], $this->_tagDepth);
-
-            if ($this->options['indentAttributes'] == '_auto') {
-                $indent .= str_repeat(' ', (strlen($tag['qname'])+2));
-
-            } else {
-                $indent .= $this->options['indentAttributes'];
-            }
-        } else {
-            $indent = $multiline = false;
-        }
-
-        if (is_array($tag['content'])) {
-            if (empty($tag['content'])) {
-                $tag['content'] = '';
-            }
-        } elseif(is_scalar($tag['content']) && (string)$tag['content'] == '') {
-            $tag['content'] = '';
-        }
-
-        if (is_scalar($tag['content']) || is_null($tag['content'])) {
-            if ($this->options['encoding'] == 'UTF-8' &&
-                  version_compare(phpversion(), '5.0.0', 'lt')
-            ) {
-                $tag['content'] = utf8_encode($tag['content']);
-            }
-
-            if ($replaceEntities === true) {
-                $replaceEntities = XML_UTIL_ENTITIES_XML;
-            }
-
-            $tag = XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, $indent, $this->options['linebreak']);
-        } elseif (is_array($tag['content'])) {
-            $tag = $this->_serializeArray($tag['content'], $tag['qname'], $tag['attributes']);
-        } elseif (is_object($tag['content'])) {
-            $tag = $this->_serializeObject($tag['content'], $tag['qname'], $tag['attributes']);
-        } elseif (is_resource($tag['content'])) {
-            settype($tag['content'], 'string');
-            $tag = XML_Util::createTagFromArray($tag, $replaceEntities);
-        }
-        return  $tag;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v1.php b/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v1.php
deleted file mode 100644
index 294d2a764..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v1.php
+++ /dev/null
@@ -1,459 +0,0 @@
-<?php
-/**
- * package.xml parsing class, package.xml version 1.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * package.xml abstraction class
- */
-require_once 'PEAR/PackageFile/v1.php';
-/**
- * Parser for package.xml version 1.0
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: @PEAR-VER@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Parser_v1
-{
-    var $_registry;
-    var $_config;
-    var $_logger;
-    /**
-     * BC hack to allow PEAR_Common::infoFromString() to sort of
-     * work with the version 2.0 format - there's no filelist though
-     * @param PEAR_PackageFile_v2
-     */
-    function fromV2($packagefile)
-    {
-        $info = $packagefile->getArray(true);
-        $ret = new PEAR_PackageFile_v1;
-        $ret->fromArray($info['old']);
-    }
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-
-    /**
-     * @param string contents of package.xml file, version 1.0
-     * @return bool success of parsing
-     */
-    function &parse($data, $file, $archive = false)
-    {
-        if (!extension_loaded('xml')) {
-            return PEAR::raiseError('Cannot create xml parser for parsing package.xml, no xml extension');
-        }
-        $xp = xml_parser_create();
-        if (!$xp) {
-            $a = &PEAR::raiseError('Cannot create xml parser for parsing package.xml');
-            return $a;
-        }
-        xml_set_object($xp, $this);
-        xml_set_element_handler($xp, '_element_start_1_0', '_element_end_1_0');
-        xml_set_character_data_handler($xp, '_pkginfo_cdata_1_0');
-        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
-
-        $this->element_stack = array();
-        $this->_packageInfo = array('provides' => array());
-        $this->current_element = false;
-        unset($this->dir_install);
-        $this->_packageInfo['filelist'] = array();
-        $this->filelist =& $this->_packageInfo['filelist'];
-        $this->dir_names = array();
-        $this->in_changelog = false;
-        $this->d_i = 0;
-        $this->cdata = '';
-        $this->_isValid = true;
-
-        if (!xml_parse($xp, $data, 1)) {
-            $code = xml_get_error_code($xp);
-            $line = xml_get_current_line_number($xp);
-            xml_parser_free($xp);
-            $a = &PEAR::raiseError(sprintf("XML error: %s at line %d",
-                           $str = xml_error_string($code), $line), 2);
-            return $a;
-        }
-
-        xml_parser_free($xp);
-
-        $pf = new PEAR_PackageFile_v1;
-        $pf->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $pf->setLogger($this->_logger);
-        }
-        $pf->setPackagefile($file, $archive);
-        $pf->fromArray($this->_packageInfo);
-        return $pf;
-    }
-    // {{{ _unIndent()
-
-    /**
-     * Unindent given string
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            } elseif (trim(substr($line, 0, $indent_len))) {
-                $data .= ltrim($line);
-            }
-        }
-        return $data;
-    }
-
-    // Support for package DTD v1.0:
-    // {{{ _element_start_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_start_1_0($xp, $name, $attribs)
-    {
-        array_push($this->element_stack, $name);
-        $this->current_element = $name;
-        $spos = sizeof($this->element_stack) - 2;
-        $this->prev_element = ($spos >= 0) ? $this->element_stack[$spos] : '';
-        $this->current_attributes = $attribs;
-        $this->cdata = '';
-        switch ($name) {
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if (array_key_exists('name', $attribs) && $attribs['name'] != '/') {
-                    $attribs['name'] = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                        $attribs['name']);
-                    if (strrpos($attribs['name'], '/') === strlen($attribs['name']) - 1) {
-                        $attribs['name'] = substr($attribs['name'], 0,
-                            strlen($attribs['name']) - 1);
-                    }
-                    if (strpos($attribs['name'], '/') === 0) {
-                        $attribs['name'] = substr($attribs['name'], 1);
-                    }
-                    $this->dir_names[] = $attribs['name'];
-                }
-                if (isset($attribs['baseinstalldir'])) {
-                    $this->dir_install = $attribs['baseinstalldir'];
-                }
-                if (isset($attribs['role'])) {
-                    $this->dir_role = $attribs['role'];
-                }
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if (isset($attribs['name'])) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . '/';
-                        }
-                    }
-                    $path .= preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                        $attribs['name']);
-                    unset($attribs['name']);
-                    $this->current_path = $path;
-                    $this->filelist[$path] = $attribs;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'replace':
-                if (!$this->in_changelog) {
-                    $this->filelist[$this->current_path]['replacements'][] = $attribs;
-                }
-                break;
-            case 'maintainers':
-                $this->_packageInfo['maintainers'] = array();
-                $this->m_i = 0; // maintainers array index
-                break;
-            case 'maintainer':
-                // compatibility check
-                if (!isset($this->_packageInfo['maintainers'])) {
-                    $this->_packageInfo['maintainers'] = array();
-                    $this->m_i = 0;
-                }
-                $this->_packageInfo['maintainers'][$this->m_i] = array();
-                $this->current_maintainer =& $this->_packageInfo['maintainers'][$this->m_i];
-                break;
-            case 'changelog':
-                $this->_packageInfo['changelog'] = array();
-                $this->c_i = 0; // changelog array index
-                $this->in_changelog = true;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->_packageInfo['changelog'][$this->c_i] = array();
-                    $this->current_release = &$this->_packageInfo['changelog'][$this->c_i];
-                } else {
-                    $this->current_release = &$this->_packageInfo;
-                }
-                break;
-            case 'deps':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['release_deps'] = array();
-                }
-                break;
-            case 'dep':
-                // dependencies array index
-                if (!$this->in_changelog) {
-                    $this->d_i++;
-                    isset($attribs['type']) ? ($attribs['type'] = strtolower($attribs['type'])) : false;
-                    $this->_packageInfo['release_deps'][$this->d_i] = $attribs;
-                }
-                break;
-            case 'configureoptions':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['configure_options'] = array();
-                }
-                break;
-            case 'configureoption':
-                if (!$this->in_changelog) {
-                    $this->_packageInfo['configure_options'][] = $attribs;
-                }
-                break;
-            case 'provides':
-                if (empty($attribs['type']) || empty($attribs['name'])) {
-                    break;
-                }
-                $attribs['explicit'] = true;
-                $this->_packageInfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
-                break;
-            case 'package' :
-                if (isset($attribs['version'])) {
-                    $this->_packageInfo['xsdversion'] = trim($attribs['version']);
-                } else {
-                    $this->_packageInfo['xsdversion'] = '1.0';
-                }
-                if (isset($attribs['packagerversion'])) {
-                    $this->_packageInfo['packagerversion'] = $attribs['packagerversion'];
-                }
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ _element_end_1_0()
-
-    /**
-     * XML parser callback for ending elements.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  name of ending element
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _element_end_1_0($xp, $name)
-    {
-        $data = trim($this->cdata);
-        switch ($name) {
-            case 'name':
-                switch ($this->prev_element) {
-                    case 'package':
-                        $this->_packageInfo['package'] = $data;
-                        break;
-                    case 'maintainer':
-                        $this->current_maintainer['name'] = $data;
-                        break;
-                }
-                break;
-            case 'extends' :
-                $this->_packageInfo['extends'] = $data;
-                break;
-            case 'summary':
-                $this->_packageInfo['summary'] = $data;
-                break;
-            case 'description':
-                $data = $this->_unIndent($this->cdata);
-                $this->_packageInfo['description'] = $data;
-                break;
-            case 'user':
-                $this->current_maintainer['handle'] = $data;
-                break;
-            case 'email':
-                $this->current_maintainer['email'] = $data;
-                break;
-            case 'role':
-                $this->current_maintainer['role'] = $data;
-                break;
-            case 'version':
-                if ($this->in_changelog) {
-                    $this->current_release['version'] = $data;
-                } else {
-                    $this->_packageInfo['version'] = $data;
-                }
-                break;
-            case 'date':
-                if ($this->in_changelog) {
-                    $this->current_release['release_date'] = $data;
-                } else {
-                    $this->_packageInfo['release_date'] = $data;
-                }
-                break;
-            case 'notes':
-                // try to "de-indent" release notes in case someone
-                // has been over-indenting their xml ;-)
-                // Trim only on the right side
-                $data = rtrim($this->_unIndent($this->cdata));
-                if ($this->in_changelog) {
-                    $this->current_release['release_notes'] = $data;
-                } else {
-                    $this->_packageInfo['release_notes'] = $data;
-                }
-                break;
-            case 'warnings':
-                if ($this->in_changelog) {
-                    $this->current_release['release_warnings'] = $data;
-                } else {
-                    $this->_packageInfo['release_warnings'] = $data;
-                }
-                break;
-            case 'state':
-                if ($this->in_changelog) {
-                    $this->current_release['release_state'] = $data;
-                } else {
-                    $this->_packageInfo['release_state'] = $data;
-                }
-                break;
-            case 'license':
-                if ($this->in_changelog) {
-                    $this->current_release['release_license'] = $data;
-                } else {
-                    $this->_packageInfo['release_license'] = $data;
-                }
-                break;
-            case 'dep':
-                if ($data && !$this->in_changelog) {
-                    $this->_packageInfo['release_deps'][$this->d_i]['name'] = $data;
-                }
-                break;
-            case 'dir':
-                if ($this->in_changelog) {
-                    break;
-                }
-                array_pop($this->dir_names);
-                break;
-            case 'file':
-                if ($this->in_changelog) {
-                    break;
-                }
-                if ($data) {
-                    $path = '';
-                    if (count($this->dir_names)) {
-                        foreach ($this->dir_names as $dir) {
-                            $path .= $dir . '/';
-                        }
-                    }
-                    $path .= $data;
-                    $this->filelist[$path] = $this->current_attributes;
-                    // Set the baseinstalldir only if the file don't have this attrib
-                    if (!isset($this->filelist[$path]['baseinstalldir']) &&
-                        isset($this->dir_install))
-                    {
-                        $this->filelist[$path]['baseinstalldir'] = $this->dir_install;
-                    }
-                    // Set the Role
-                    if (!isset($this->filelist[$path]['role']) && isset($this->dir_role)) {
-                        $this->filelist[$path]['role'] = $this->dir_role;
-                    }
-                }
-                break;
-            case 'maintainer':
-                if (empty($this->_packageInfo['maintainers'][$this->m_i]['role'])) {
-                    $this->_packageInfo['maintainers'][$this->m_i]['role'] = 'lead';
-                }
-                $this->m_i++;
-                break;
-            case 'release':
-                if ($this->in_changelog) {
-                    $this->c_i++;
-                }
-                break;
-            case 'changelog':
-                $this->in_changelog = false;
-                break;
-        }
-        array_pop($this->element_stack);
-        $spos = sizeof($this->element_stack) - 1;
-        $this->current_element = ($spos > 0) ? $this->element_stack[$spos] : '';
-        $this->cdata = '';
-    }
-
-    // }}}
-    // {{{ _pkginfo_cdata_1_0()
-
-    /**
-     * XML parser callback for character data.  Used for version 1.0
-     * packages.
-     *
-     * @param resource  $xp    XML parser resource
-     * @param string    $name  character data
-     *
-     * @return void
-     *
-     * @access private
-     */
-    function _pkginfo_cdata_1_0($xp, $data)
-    {
-        if (isset($this->cdata)) {
-            $this->cdata .= $data;
-        }
-    }
-
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v2.php b/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v2.php
deleted file mode 100644
index 989923402..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/Parser/v2.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * package.xml parsing class, package.xml version 2.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * base xml parser class
- */
-require_once 'PEAR/XMLParser.php';
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * Parser for package.xml version 2.0
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: @PEAR-VER@
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_Parser_v2 extends PEAR_XMLParser
-{
-    var $_config;
-    var $_logger;
-    var $_registry;
-
-    function setConfig(&$c)
-    {
-        $this->_config = &$c;
-        $this->_registry = &$c->getRegistry();
-    }
-
-    function setLogger(&$l)
-    {
-        $this->_logger = &$l;
-    }
-    /**
-     * Unindent given string
-     *
-     * @param string $str The string that has to be unindented.
-     * @return string
-     * @access private
-     */
-    function _unIndent($str)
-    {
-        // remove leading newlines
-        $str = preg_replace('/^[\r\n]+/', '', $str);
-        // find whitespace at the beginning of the first line
-        $indent_len = strspn($str, " \t");
-        $indent = substr($str, 0, $indent_len);
-        $data = '';
-        // remove the same amount of whitespace from following lines
-        foreach (explode("\n", $str) as $line) {
-            if (substr($line, 0, $indent_len) == $indent) {
-                $data .= substr($line, $indent_len) . "\n";
-            } else {
-                $data .= $line . "\n";
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * post-process data
-     *
-     * @param string $data
-     * @param string $element element name
-     */
-    function postProcess($data, $element)
-    {
-        if ($element == 'notes') {
-            return trim($this->_unIndent($data));
-        }
-        return trim($data);
-    }
-
-    /**
-     * @param string
-     * @param string file name of the package.xml
-     * @param string|false name of the archive this package.xml came from, if any
-     * @param string class name to instantiate and return.  This must be PEAR_PackageFile_v2 or
-     *               a subclass
-     * @return PEAR_PackageFile_v2
-     */
-    function &parse($data, $file, $archive = false, $class = 'PEAR_PackageFile_v2')
-    {
-        if (PEAR::isError($err = parent::parse($data, $file))) {
-            return $err;
-        }
-
-        $ret = new $class;
-        $ret->encoding = $this->encoding;
-        $ret->setConfig($this->_config);
-        if (isset($this->_logger)) {
-            $ret->setLogger($this->_logger);
-        }
-
-        $ret->fromArray($this->_unserializedData);
-        $ret->setPackagefile($file, $archive);
-        return $ret;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/v1.php b/airtime_mvc/library/pear/PEAR/PackageFile/v1.php
deleted file mode 100644
index 6f0837060..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/v1.php
+++ /dev/null
@@ -1,1612 +0,0 @@
-<?php
-/**
- * PEAR_PackageFile_v1, package.xml version 1.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * For error handling
- */
-require_once 'PEAR/ErrorStack.php';
-
-/**
- * Error code if parsing is attempted with no xml extension
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_XML_EXT', 3);
-
-/**
- * Error code if creating the xml parser resource fails
- */
-define('PEAR_PACKAGEFILE_ERROR_CANT_MAKE_PARSER', 4);
-
-/**
- * Error code used for all sax xml parsing errors
- */
-define('PEAR_PACKAGEFILE_ERROR_PARSER_ERROR', 5);
-
-/**
- * Error code used when there is no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_NAME', 6);
-
-/**
- * Error code when a package name is not valid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_NAME', 7);
-
-/**
- * Error code used when no summary is parsed
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_SUMMARY', 8);
-
-/**
- * Error code for summaries that are more than 1 line
- */
-define('PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY', 9);
-
-/**
- * Error code used when no description is present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION', 10);
-
-/**
- * Error code used when no license is present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_LICENSE', 11);
-
-/**
- * Error code used when a <version> version number is not present
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_VERSION', 12);
-
-/**
- * Error code used when a <version> version number is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_VERSION', 13);
-
-/**
- * Error code when release state is missing
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_STATE', 14);
-
-/**
- * Error code when release state is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_STATE', 15);
-
-/**
- * Error code when release state is missing
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DATE', 16);
-
-/**
- * Error code when release state is invalid
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DATE', 17);
-
-/**
- * Error code when no release notes are found
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_NOTES', 18);
-
-/**
- * Error code when no maintainers are found
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS', 19);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE', 20);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE', 21);
-
-/**
- * Error code when a maintainer has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME', 22);
-
-/**
- * Error code when a maintainer has no email
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL', 23);
-
-/**
- * Error code when a maintainer has no handle
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_MAINTROLE', 24);
-
-/**
- * Error code when a dependency is not a PHP dependency, but has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPNAME', 25);
-
-/**
- * Error code when a dependency has no type (pkg, php, etc.)
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE', 26);
-
-/**
- * Error code when a dependency has no relation (lt, ge, has, etc.)
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPREL', 27);
-
-/**
- * Error code when a dependency is not a 'has' relation, but has no version
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION', 28);
-
-/**
- * Error code when a dependency has an invalid relation
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPREL', 29);
-
-/**
- * Error code when a dependency has an invalid type
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPTYPE', 30);
-
-/**
- * Error code when a dependency has an invalid optional option
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL', 31);
-
-/**
- * Error code when a dependency is a pkg dependency, and has an invalid package name
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_DEPNAME', 32);
-
-/**
- * Error code when a dependency has a channel="foo" attribute, and foo is not a registered channel
- */
-define('PEAR_PACKAGEFILE_ERROR_UNKNOWN_DEPCHANNEL', 33);
-
-/**
- * Error code when rel="has" and version attribute is present.
- */
-define('PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED', 34);
-
-/**
- * Error code when type="php" and dependency name is present
- */
-define('PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED', 35);
-
-/**
- * Error code when a configure option has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_CONFNAME', 36);
-
-/**
- * Error code when a configure option has no name
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT', 37);
-
-/**
- * Error code when a file in the filelist has an invalid role
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE', 38);
-
-/**
- * Error code when a file in the filelist has no role
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_FILEROLE', 39);
-
-/**
- * Error code when analyzing a php source file that has parse errors
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE', 40);
-
-/**
- * Error code when analyzing a php source file reveals a source element
- * without a package name prefix
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX', 41);
-
-/**
- * Error code when an unknown channel is specified
- */
-define('PEAR_PACKAGEFILE_ERROR_UNKNOWN_CHANNEL', 42);
-
-/**
- * Error code when no files are found in the filelist
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_FILES', 43);
-
-/**
- * Error code when a file is not valid php according to _analyzeSourceCode()
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_FILE', 44);
-
-/**
- * Error code when the channel validator returns an error or warning
- */
-define('PEAR_PACKAGEFILE_ERROR_CHANNELVAL', 45);
-
-/**
- * Error code when a php5 package is packaged in php4 (analysis doesn't work)
- */
-define('PEAR_PACKAGEFILE_ERROR_PHP5', 46);
-
-/**
- * Error code when a file is listed in package.xml but does not exist
- */
-define('PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND', 47);
-
-/**
- * Error code when a <dep type="php" rel="not"... is encountered (use rel="ne")
- */
-define('PEAR_PACKAGEFILE_PHP_NO_NOT', 48);
-
-/**
- * Error code when a package.xml contains non-ISO-8859-1 characters
- */
-define('PEAR_PACKAGEFILE_ERROR_NON_ISO_CHARS', 49);
-
-/**
- * Error code when a dependency is not a 'has' relation, but has no version
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_DEPPHPVERSION', 50);
-
-/**
- * Error code when a package has no lead developer
- */
-define('PEAR_PACKAGEFILE_ERROR_NO_LEAD', 51);
-
-/**
- * Error code when a filename begins with "."
- */
-define('PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME', 52);
-/**
- * package.xml encapsulator
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_v1
-{
-    /**
-     * @access private
-     * @var PEAR_ErrorStack
-     * @access private
-     */
-    var $_stack;
-
-    /**
-     * A registry object, used to access the package name validation regex for non-standard channels
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    /**
-     * An object that contains a log method that matches PEAR_Common::log's signature
-     * @var object
-     * @access private
-     */
-    var $_logger;
-
-    /**
-     * Parsed package information
-     * @var array
-     * @access private
-     */
-    var $_packageInfo;
-
-    /**
-     * path to package.xml
-     * @var string
-     * @access private
-     */
-    var $_packageFile;
-
-    /**
-     * path to package .tgz or false if this is a local/extracted package.xml
-     * @var string
-     * @access private
-     */
-    var $_archiveFile;
-
-    /**
-     * @var int
-     * @access private
-     */
-    var $_isValid = 0;
-
-    /**
-     * Determines whether this packagefile was initialized only with partial package info
-     *
-     * If this package file was constructed via parsing REST, it will only contain
-     *
-     * - package name
-     * - channel name
-     * - dependencies 
-     * @var boolean
-     * @access private
-     */
-    var $_incomplete = true;
-
-    /**
-     * @param bool determines whether to return a PEAR_Error object, or use the PEAR_ErrorStack
-     * @param string Name of Error Stack class to use.
-     */
-    function PEAR_PackageFile_v1()
-    {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
-        $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
-        $this->_isValid = 0;
-    }
-
-    function installBinary($installer)
-    {
-        return false;
-    }
-
-    function isExtension($name)
-    {
-        return false;
-    }
-
-    function setConfig(&$config)
-    {
-        $this->_config = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    function setRequestedGroup()
-    {
-        // placeholder
-    }
-
-    /**
-     * For saving in the registry.
-     *
-     * Set the last version that was installed
-     * @param string
-     */
-    function setLastInstalledVersion($version)
-    {
-        $this->_packageInfo['_lastversion'] = $version;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getLastInstalledVersion()
-    {
-        if (isset($this->_packageInfo['_lastversion'])) {
-            return $this->_packageInfo['_lastversion'];
-        }
-        return false;
-    }
-
-    function getInstalledBinary()
-    {
-        return false;
-    }
-
-    function listPostinstallScripts()
-    {
-        return false;
-    }
-
-    function initPostinstallScripts()
-    {
-        return false;
-    }
-
-    function setLogger(&$logger)
-    {
-        if ($logger && (!is_object($logger) || !method_exists($logger, 'log'))) {
-            return PEAR::raiseError('Logger must be compatible with PEAR_Common::log');
-        }
-        $this->_logger = &$logger;
-    }
-
-    function setPackagefile($file, $archive = false)
-    {
-        $this->_packageFile = $file;
-        $this->_archiveFile = $archive ? $archive : $file;
-    }
-
-    function getPackageFile()
-    {
-        return isset($this->_packageFile) ? $this->_packageFile : false;
-    }
-
-    function getPackageType()
-    {
-        return 'php';
-    }
-
-    function getArchiveFile()
-    {
-        return $this->_archiveFile;
-    }
-
-    function packageInfo($field)
-    {
-        if (!is_string($field) || empty($field) ||
-            !isset($this->_packageInfo[$field])) {
-            return false;
-        }
-        return $this->_packageInfo[$field];
-    }
-
-    function setDirtree($path)
-    {
-        if (!isset($this->_packageInfo['dirtree'])) {
-            $this->_packageInfo['dirtree'] = array();
-        }
-        $this->_packageInfo['dirtree'][$path] = true;
-    }
-
-    function getDirtree()
-    {
-        if (isset($this->_packageInfo['dirtree']) && count($this->_packageInfo['dirtree'])) {
-            return $this->_packageInfo['dirtree'];
-        }
-        return false;
-    }
-
-    function resetDirtree()
-    {
-        unset($this->_packageInfo['dirtree']);
-    }
-
-    function fromArray($pinfo)
-    {
-        $this->_incomplete = false;
-        $this->_packageInfo = $pinfo;
-    }
-
-    function isIncomplete()
-    {
-        return $this->_incomplete;
-    }
-
-    function getChannel()
-    {
-        return 'pear.php.net';
-    }
-
-    function getUri()
-    {
-        return false;
-    }
-
-    function getTime()
-    {
-        return false;
-    }
-
-    function getExtends()
-    {
-        if (isset($this->_packageInfo['extends'])) {
-            return $this->_packageInfo['extends'];
-        }
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    function toArray()
-    {
-        if (!$this->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        return $this->getArray();
-    }
-
-    function getArray()
-    {
-        return $this->_packageInfo;
-    }
-
-    function getName()
-    {
-        return $this->getPackage();
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packageInfo['package'])) {
-            return $this->_packageInfo['package'];
-        }
-        return false;
-    }
-
-    /**
-     * WARNING - don't use this unless you know what you are doing
-     */
-    function setRawPackage($package)
-    {
-        $this->_packageInfo['package'] = $package;
-    }
-
-    function setPackage($package)
-    {
-        $this->_packageInfo['package'] = $package;
-        $this->_isValid = false;
-    }
-
-    function getVersion()
-    {
-        if (isset($this->_packageInfo['version'])) {
-            return $this->_packageInfo['version'];
-        }
-        return false;
-    }
-
-    function setVersion($version)
-    {
-        $this->_packageInfo['version'] = $version;
-        $this->_isValid = false;
-    }
-
-    function clearMaintainers()
-    {
-        unset($this->_packageInfo['maintainers']);
-    }
-
-    function getMaintainers()
-    {
-        if (isset($this->_packageInfo['maintainers'])) {
-            return $this->_packageInfo['maintainers'];
-        }
-        return false;
-    }
-
-    /**
-     * Adds a new maintainer - no checking of duplicates is performed, use
-     * updatemaintainer for that purpose.
-     */
-    function addMaintainer($role, $handle, $name, $email)
-    {
-        $this->_packageInfo['maintainers'][] =
-            array('handle' => $handle, 'role' => $role, 'email' => $email, 'name' => $name);
-        $this->_isValid = false;
-    }
-
-    function updateMaintainer($role, $handle, $name, $email)
-    {
-        $found = false;
-        if (!isset($this->_packageInfo['maintainers']) ||
-              !is_array($this->_packageInfo['maintainers'])) {
-            return $this->addMaintainer($role, $handle, $name, $email);
-        }
-        foreach ($this->_packageInfo['maintainers'] as $i => $maintainer) {
-            if ($maintainer['handle'] == $handle) {
-                $found = $i;
-                break;
-            }
-        }
-        if ($found !== false) {
-            unset($this->_packageInfo['maintainers'][$found]);
-            $this->_packageInfo['maintainers'] =
-                array_values($this->_packageInfo['maintainers']);
-        }
-        $this->addMaintainer($role, $handle, $name, $email);
-    }
-
-    function deleteMaintainer($handle)
-    {
-        $found = false;
-        foreach ($this->_packageInfo['maintainers'] as $i => $maintainer) {
-            if ($maintainer['handle'] == $handle) {
-                $found = $i;
-                break;
-            }
-        }
-        if ($found !== false) {
-            unset($this->_packageInfo['maintainers'][$found]);
-            $this->_packageInfo['maintainers'] =
-                array_values($this->_packageInfo['maintainers']);
-            return true;
-        }
-        return false;
-    }
-
-    function getState()
-    {
-        if (isset($this->_packageInfo['release_state'])) {
-            return $this->_packageInfo['release_state'];
-        }
-        return false;
-    }
-
-    function setRawState($state)
-    {
-        $this->_packageInfo['release_state'] = $state;
-    }
-
-    function setState($state)
-    {
-        $this->_packageInfo['release_state'] = $state;
-        $this->_isValid = false;
-    }
-
-    function getDate()
-    {
-        if (isset($this->_packageInfo['release_date'])) {
-            return $this->_packageInfo['release_date'];
-        }
-        return false;
-    }
-
-    function setDate($date)
-    {
-        $this->_packageInfo['release_date'] = $date;
-        $this->_isValid = false;
-    }
-
-    function getLicense()
-    {
-        if (isset($this->_packageInfo['release_license'])) {
-            return $this->_packageInfo['release_license'];
-        }
-        return false;
-    }
-
-    function setLicense($date)
-    {
-        $this->_packageInfo['release_license'] = $date;
-        $this->_isValid = false;
-    }
-
-    function getSummary()
-    {
-        if (isset($this->_packageInfo['summary'])) {
-            return $this->_packageInfo['summary'];
-        }
-        return false;
-    }
-
-    function setSummary($summary)
-    {
-        $this->_packageInfo['summary'] = $summary;
-        $this->_isValid = false;
-    }
-
-    function getDescription()
-    {
-        if (isset($this->_packageInfo['description'])) {
-            return $this->_packageInfo['description'];
-        }
-        return false;
-    }
-
-    function setDescription($desc)
-    {
-        $this->_packageInfo['description'] = $desc;
-        $this->_isValid = false;
-    }
-
-    function getNotes()
-    {
-        if (isset($this->_packageInfo['release_notes'])) {
-            return $this->_packageInfo['release_notes'];
-        }
-        return false;
-    }
-
-    function setNotes($notes)
-    {
-        $this->_packageInfo['release_notes'] = $notes;
-        $this->_isValid = false;
-    }
-
-    function getDeps()
-    {
-        if (isset($this->_packageInfo['release_deps'])) {
-            return $this->_packageInfo['release_deps'];
-        }
-        return false;
-    }
-
-    /**
-     * Reset dependencies prior to adding new ones
-     */
-    function clearDeps()
-    {
-        unset($this->_packageInfo['release_deps']);
-    }
-
-    function addPhpDep($version, $rel)
-    {
-        $this->_isValid = false;
-        $this->_packageInfo['release_deps'][] =
-            array('type' => 'php',
-                  'rel' => $rel,
-                  'version' => $version);
-    }
-
-    function addPackageDep($name, $version, $rel, $optional = 'no')
-    {
-        $this->_isValid = false;
-        $dep =
-            array('type' => 'pkg',
-                  'name' => $name,
-                  'rel' => $rel,
-                  'optional' => $optional);
-        if ($rel != 'has' && $rel != 'not') {
-            $dep['version'] = $version;
-        }
-        $this->_packageInfo['release_deps'][] = $dep;
-    }
-
-    function addExtensionDep($name, $version, $rel, $optional = 'no')
-    {
-        $this->_isValid = false;
-        $this->_packageInfo['release_deps'][] =
-            array('type' => 'ext',
-                  'name' => $name,
-                  'rel' => $rel,
-                  'version' => $version,
-                  'optional' => $optional);
-    }
-
-    /**
-     * WARNING - do not use this function directly unless you know what you're doing
-     */
-    function setDeps($deps)
-    {
-        $this->_packageInfo['release_deps'] = $deps;
-    }
-
-    function hasDeps()
-    {
-        return isset($this->_packageInfo['release_deps']) &&
-            count($this->_packageInfo['release_deps']);
-    }
-
-    function getDependencyGroup($group)
-    {
-        return false;
-    }
-
-    function isCompatible($pf)
-    {
-        return false;
-    }
-
-    function isSubpackageOf($p)
-    {
-        return $p->isSubpackage($this);
-    }
-
-    function isSubpackage($p)
-    {
-        return false;
-    }
-
-    function dependsOn($package, $channel)
-    {
-        if (strtolower($channel) != 'pear.php.net') {
-            return false;
-        }
-        if (!($deps = $this->getDeps())) {
-            return false;
-        }
-        foreach ($deps as $dep) {
-            if ($dep['type'] != 'pkg') {
-                continue;
-            }
-            if (strtolower($dep['name']) == strtolower($package)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function getConfigureOptions()
-    {
-        if (isset($this->_packageInfo['configure_options'])) {
-            return $this->_packageInfo['configure_options'];
-        }
-        return false;
-    }
-
-    function hasConfigureOptions()
-    {
-        return isset($this->_packageInfo['configure_options']) &&
-            count($this->_packageInfo['configure_options']);
-    }
-
-    function addConfigureOption($name, $prompt, $default = false)
-    {
-        $o = array('name' => $name, 'prompt' => $prompt);
-        if ($default !== false) {
-            $o['default'] = $default;
-        }
-        if (!isset($this->_packageInfo['configure_options'])) {
-            $this->_packageInfo['configure_options'] = array();
-        }
-        $this->_packageInfo['configure_options'][] = $o;
-    }
-
-    function clearConfigureOptions()
-    {
-        unset($this->_packageInfo['configure_options']);
-    }
-
-    function getProvides()
-    {
-        if (isset($this->_packageInfo['provides'])) {
-            return $this->_packageInfo['provides'];
-        }
-        return false;
-    }
-
-    function getProvidesExtension()
-    {
-        return false;
-    }
-
-    function addFile($dir, $file, $attrs)
-    {
-        $dir = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'), $dir);
-        if ($dir == '/' || $dir == '') {
-            $dir = '';
-        } else {
-            $dir .= '/';
-        }
-        $file = $dir . $file;
-        $file = preg_replace('![\\/]+!', '/', $file);
-        $this->_packageInfo['filelist'][$file] = $attrs;
-    }
-
-    function getInstallationFilelist()
-    {
-        return $this->getFilelist();
-    }
-
-    function getFilelist()
-    {
-        if (isset($this->_packageInfo['filelist'])) {
-            return $this->_packageInfo['filelist'];
-        }
-        return false;
-    }
-
-    function setFileAttribute($file, $attr, $value)
-    {
-        $this->_packageInfo['filelist'][$file][$attr] = $value;
-    }
-
-    function resetFilelist()
-    {
-        $this->_packageInfo['filelist'] = array();
-    }
-
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts;
-        }
-    }
-
-    function getChangelog()
-    {
-        if (isset($this->_packageInfo['changelog'])) {
-            return $this->_packageInfo['changelog'];
-        }
-        return false;
-    }
-
-    function getPackagexmlVersion()
-    {
-        return '1.0';
-    }
-
-    /**
-     * Wrapper to {@link PEAR_ErrorStack::getErrors()}
-     * @param boolean determines whether to purge the error stack after retrieving
-     * @return array
-     */
-    function getValidationWarnings($purge = true)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    // }}}
-    /**
-     * Validation error.  Also marks the object contents as invalid
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateError($code, $params = array())
-    {
-        $this->_stack->push($code, 'error', $params, false, false, debug_backtrace());
-        $this->_isValid = false;
-    }
-
-    /**
-     * Validation warning.  Does not mark the object contents invalid.
-     * @param error code
-     * @param array error information
-     * @access private
-     */
-    function _validateWarning($code, $params = array())
-    {
-        $this->_stack->push($code, 'warning', $params, false, false, debug_backtrace());
-    }
-
-    /**
-     * @param integer error code
-     * @access protected
-     */
-    function _getErrorMessage()
-    {
-        return array(
-                PEAR_PACKAGEFILE_ERROR_NO_NAME =>
-                    'Missing Package Name',
-                PEAR_PACKAGEFILE_ERROR_NO_SUMMARY =>
-                    'No summary found',
-                PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY =>
-                    'Summary should be on one line',
-                PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION =>
-                    'Missing description',
-                PEAR_PACKAGEFILE_ERROR_NO_LICENSE =>
-                    'Missing license',
-                PEAR_PACKAGEFILE_ERROR_NO_VERSION =>
-                    'No release version found',
-                PEAR_PACKAGEFILE_ERROR_NO_STATE =>
-                    'No release state found',
-                PEAR_PACKAGEFILE_ERROR_NO_DATE =>
-                    'No release date found',
-                PEAR_PACKAGEFILE_ERROR_NO_NOTES =>
-                    'No release notes found',
-                PEAR_PACKAGEFILE_ERROR_NO_LEAD =>
-                    'Package must have at least one lead maintainer',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS =>
-                    'No maintainers found, at least one must be defined',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE =>
-                    'Maintainer %index% has no handle (user ID at channel server)',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE =>
-                    'Maintainer %index% has no role',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME =>
-                    'Maintainer %index% has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL =>
-                    'Maintainer %index% has no email',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPNAME =>
-                    'Dependency %index% is not a php dependency, and has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPREL =>
-                    'Dependency %index% has no relation (rel)',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE =>
-                    'Dependency %index% has no type',
-                PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED =>
-                    'PHP Dependency %index% has a name attribute of "%name%" which will be' .
-                        ' ignored!',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION =>
-                    'Dependency %index% is not a rel="has" or rel="not" dependency, ' .
-                        'and has no version',
-                PEAR_PACKAGEFILE_ERROR_NO_DEPPHPVERSION =>
-                    'Dependency %index% is a type="php" dependency, ' .
-                        'and has no version',
-                PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED =>
-                    'Dependency %index% is a rel="%rel%" dependency, versioning is ignored',
-                PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL =>
-                    'Dependency %index% has invalid optional value "%opt%", should be yes or no',
-                PEAR_PACKAGEFILE_PHP_NO_NOT =>
-                    'Dependency %index%: php dependencies cannot use "not" rel, use "ne"' .
-                        ' to exclude specific versions',
-                PEAR_PACKAGEFILE_ERROR_NO_CONFNAME =>
-                    'Configure Option %index% has no name',
-                PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT =>
-                    'Configure Option %index% has no prompt',
-                PEAR_PACKAGEFILE_ERROR_NO_FILES =>
-                    'No files in <filelist> section of package.xml',
-                PEAR_PACKAGEFILE_ERROR_NO_FILEROLE =>
-                    'File "%file%" has no role, expecting one of "%roles%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE =>
-                    'File "%file%" has invalid role "%role%", expecting one of "%roles%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME =>
-                    'File "%file%" cannot start with ".", cannot package or install',
-                PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE =>
-                    'Parser error: invalid PHP found in file "%file%"',
-                PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX =>
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"',
-                PEAR_PACKAGEFILE_ERROR_INVALID_FILE =>
-                    'Parser error: invalid PHP file "%file%"',
-                PEAR_PACKAGEFILE_ERROR_CHANNELVAL =>
-                    'Channel validator error: field "%field%" - %reason%',
-                PEAR_PACKAGEFILE_ERROR_PHP5 =>
-                    'Error, PHP5 token encountered in %file%, analysis should be in PHP5',
-                PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND =>
-                    'File "%file%" in package.xml does not exist',
-                PEAR_PACKAGEFILE_ERROR_NON_ISO_CHARS =>
-                    'Package.xml contains non-ISO-8859-1 characters, and may not validate',
-            );
-    }
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @access public
-     * @return boolean
-     */
-    function validate($state = PEAR_VALIDATE_NORMAL, $nofilechecking = false)
-    {
-        if (($this->_isValid & $state) == $state) {
-            return true;
-        }
-        $this->_isValid = true;
-        $info = $this->_packageInfo;
-        if (empty($info['package'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_NAME);
-            $this->_packageName = $pn = 'unknown';
-        } else {
-            $this->_packageName = $pn = $info['package'];
-        }
-
-        if (empty($info['summary'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_SUMMARY);
-        } elseif (strpos(trim($info['summary']), "\n") !== false) {
-            $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_MULTILINE_SUMMARY,
-                array('summary' => $info['summary']));
-        }
-        if (empty($info['description'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DESCRIPTION);
-        }
-        if (empty($info['release_license'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_LICENSE);
-        }
-        if (empty($info['version'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_VERSION);
-        }
-        if (empty($info['release_state'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_STATE);
-        }
-        if (empty($info['release_date'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DATE);
-        }
-        if (empty($info['release_notes'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_NOTES);
-        }
-        if (empty($info['maintainers'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTAINERS);
-        } else {
-            $haslead = false;
-            $i = 1;
-            foreach ($info['maintainers'] as $m) {
-                if (empty($m['handle'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTHANDLE,
-                        array('index' => $i));
-                }
-                if (empty($m['role'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTROLE,
-                        array('index' => $i, 'roles' => PEAR_Common::getUserRoles()));
-                } elseif ($m['role'] == 'lead') {
-                    $haslead = true;
-                }
-                if (empty($m['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTNAME,
-                        array('index' => $i));
-                }
-                if (empty($m['email'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_MAINTEMAIL,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-            if (!$haslead) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_LEAD);
-            }
-        }
-        if (!empty($info['release_deps'])) {
-            $i = 1;
-            foreach ($info['release_deps'] as $d) {
-                if (!isset($d['type']) || empty($d['type'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPTYPE,
-                        array('index' => $i, 'types' => PEAR_Common::getDependencyTypes()));
-                    continue;
-                }
-                if (!isset($d['rel']) || empty($d['rel'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPREL,
-                        array('index' => $i, 'rels' => PEAR_Common::getDependencyRelations()));
-                    continue;
-                }
-                if (!empty($d['optional'])) {
-                    if (!in_array($d['optional'], array('yes', 'no'))) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_DEPOPTIONAL,
-                            array('index' => $i, 'opt' => $d['optional']));
-                    }
-                }
-                if ($d['rel'] != 'has' && $d['rel'] != 'not' && empty($d['version'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPVERSION,
-                        array('index' => $i));
-                } elseif (($d['rel'] == 'has' || $d['rel'] == 'not') && !empty($d['version'])) {
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_DEPVERSION_IGNORED,
-                        array('index' => $i, 'rel' => $d['rel']));
-                }
-                if ($d['type'] == 'php' && !empty($d['name'])) {
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_DEPNAME_IGNORED,
-                        array('index' => $i, 'name' => $d['name']));
-                } elseif ($d['type'] != 'php' && empty($d['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPNAME,
-                        array('index' => $i));
-                }
-                if ($d['type'] == 'php' && empty($d['version'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_DEPPHPVERSION,
-                        array('index' => $i));
-                }
-                if (($d['rel'] == 'not') && ($d['type'] == 'php')) {
-                    $this->_validateError(PEAR_PACKAGEFILE_PHP_NO_NOT,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-        }
-        if (!empty($info['configure_options'])) {
-            $i = 1;
-            foreach ($info['configure_options'] as $c) {
-                if (empty($c['name'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_CONFNAME,
-                        array('index' => $i));
-                }
-                if (empty($c['prompt'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_CONFPROMPT,
-                        array('index' => $i));
-                }
-                $i++;
-            }
-        }
-        if (empty($info['filelist'])) {
-            $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_FILES);
-            $errors[] = 'no files';
-        } else {
-            foreach ($info['filelist'] as $file => $fa) {
-                if (empty($fa['role'])) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_NO_FILEROLE,
-                        array('file' => $file, 'roles' => PEAR_Common::getFileRoles()));
-                    continue;
-                } elseif (!in_array($fa['role'], PEAR_Common::getFileRoles())) {
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILEROLE,
-                        array('file' => $file, 'role' => $fa['role'], 'roles' => PEAR_Common::getFileRoles()));
-                }
-                if (preg_match('~/\.\.?(/|\\z)|^\.\.?/~', str_replace('\\', '/', $file))) {
-                    // file contains .. parent directory or . cur directory references
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME,
-                        array('file' => $file));
-                }
-                if (isset($fa['install-as']) &&
-                      preg_match('~/\.\.?(/|\\z)|^\.\.?/~', 
-                                 str_replace('\\', '/', $fa['install-as']))) {
-                    // install-as contains .. parent directory or . cur directory references
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME,
-                        array('file' => $file . ' [installed as ' . $fa['install-as'] . ']'));
-                }
-                if (isset($fa['baseinstalldir']) &&
-                      preg_match('~/\.\.?(/|\\z)|^\.\.?/~', 
-                                 str_replace('\\', '/', $fa['baseinstalldir']))) {
-                    // install-as contains .. parent directory or . cur directory references
-                    $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_FILENAME,
-                        array('file' => $file . ' [baseinstalldir ' . $fa['baseinstalldir'] . ']'));
-                }
-            }
-        }
-        if (isset($this->_registry) && $this->_isValid) {
-            $chan = $this->_registry->getChannel('pear.php.net');
-            if (PEAR::isError($chan)) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $chan->getMessage());
-                return $this->_isValid = 0;
-            }
-            $validator = $chan->getValidationObject();
-            $validator->setPackageFile($this);
-            $validator->validate($state);
-            $failures = $validator->getFailures();
-            foreach ($failures['errors'] as $error) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $error);
-            }
-            foreach ($failures['warnings'] as $warning) {
-                $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_CHANNELVAL, $warning);
-            }
-        }
-        if ($this->_isValid && $state == PEAR_VALIDATE_PACKAGING && !$nofilechecking) {
-            if ($this->_analyzePhpFiles()) {
-                $this->_isValid = true;
-            }
-        }
-        if ($this->_isValid) {
-            return $this->_isValid = $state;
-        }
-        return $this->_isValid = 0;
-    }
-
-    function _analyzePhpFiles()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!isset($this->_packageFile)) {
-            return false;
-        }
-        $dir_prefix = dirname($this->_packageFile);
-        $common = new PEAR_Common;
-        $log = isset($this->_logger) ? array(&$this->_logger, 'log') :
-            array($common, 'log');
-        $info = $this->getFilelist();
-        foreach ($info as $file => $fa) {
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $file)) {
-                $this->_validateError(PEAR_PACKAGEFILE_ERROR_FILE_NOTFOUND,
-                    array('file' => realpath($dir_prefix) . DIRECTORY_SEPARATOR . $file));
-                continue;
-            }
-            if ($fa['role'] == 'php' && $dir_prefix) {
-                call_user_func_array($log, array(1, "Analyzing $file"));
-                $srcinfo = $this->_analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                if ($srcinfo) {
-                    $this->_buildProvidesArray($srcinfo);
-                }
-            }
-        }
-        $this->_packageName = $pn = $this->getPackage();
-        $pnl = strlen($pn);
-        if (isset($this->_packageInfo['provides'])) {
-            foreach ((array) $this->_packageInfo['provides'] as $key => $what) {
-                if (isset($what['explicit'])) {
-                    // skip conformance checks if the provides entry is
-                    // specified in the package.xml file
-                    continue;
-                }
-                extract($what);
-                if ($type == 'class') {
-                    if (!strncasecmp($name, $pn, $pnl)) {
-                        continue;
-                    }
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX,
-                        array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn));
-                } elseif ($type == 'function') {
-                    if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
-                        continue;
-                    }
-                    $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_NO_PNAME_PREFIX,
-                        array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn));
-                }
-            }
-        }
-        return $this->_isValid;
-    }
-
-    /**
-     * Get the default xml generator object
-     *
-     * @return PEAR_PackageFile_Generator_v1
-     */
-    function &getDefaultGenerator()
-    {
-        if (!class_exists('PEAR_PackageFile_Generator_v1')) {
-            require_once 'PEAR/PackageFile/Generator/v1.php';
-        }
-        $a = &new PEAR_PackageFile_Generator_v1($this);
-        return $a;
-    }
-
-    /**
-     * Get the contents of a file listed within the package.xml
-     * @param string
-     * @return string
-     */
-    function getFileContents($file)
-    {
-        if ($this->_archiveFile == $this->_packageFile) { // unpacked
-            $dir = dirname($this->_packageFile);
-            $file = $dir . DIRECTORY_SEPARATOR . $file;
-            $file = str_replace(array('/', '\\'),
-                array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), $file);
-            if (file_exists($file) && is_readable($file)) {
-                return implode('', file($file));
-            }
-        } else { // tgz
-            if (!class_exists('Archive_Tar')) {
-                require_once 'Archive/Tar.php';
-            }
-            $tar = &new Archive_Tar($this->_archiveFile);
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($file != 'package.xml' && $file != 'package2.xml') {
-                $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
-            }
-            $file = $tar->extractInString($file);
-            $tar->popErrorHandling();
-            if (PEAR::isError($file)) {
-                return PEAR::raiseError("Cannot locate file '$file' in archive");
-            }
-            return $file;
-        }
-    }
-
-    // {{{ analyzeSourceCode()
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @return mixed
-     * @access private
-     */
-    function _analyzeSourceCode($file)
-    {
-        if (!function_exists("token_get_all")) {
-            return false;
-        }
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-        if (!$fp = @fopen($file, "r")) {
-            return false;
-        }
-        fclose($fp);
-        $contents = file_get_contents($file);
-        $tokens = token_get_all($contents);
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-            if ($inquote) {
-                if ($token != '"' && $token != T_END_HEREDOC) {
-                    continue;
-                } else {
-                    $inquote = false;
-                    continue;
-                }
-            }
-            switch ($token) {
-                case T_WHITESPACE :
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                case T_START_HEREDOC:
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE,
-                            array('file' => $file));
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw') 
-                                 )) {
-                            $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_PHP5,
-                                array($file));
-                        }
-                    }
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        $this->_validateError(PEAR_PACKAGEFILE_ERROR_INVALID_PHPFILE,
-                            array('file' => $file));
-                        return false;
-                    }
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-                    continue 2;
-            }
-        }
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-            );
-    }
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access private
-     *
-     */
-    function _buildProvidesArray($srcinfo)
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        $file = basename($srcinfo['source_file']);
-        $pn = $this->getPackage();
-        $pnl = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($this->_packageInfo['provides'][$key])) {
-                continue;
-            }
-            $this->_packageInfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $this->_packageInfo['provides'][$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($this->_packageInfo['provides'][$key])) {
-                    continue;
-                }
-                $this->_packageInfo['provides'][$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($this->_packageInfo['provides'][$key])) {
-                continue;
-            }
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-            $this->_packageInfo['provides'][$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-    }
-
-    // }}}
-}
-?>
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/v2.php b/airtime_mvc/library/pear/PEAR/PackageFile/v2.php
deleted file mode 100644
index 0092168de..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/v2.php
+++ /dev/null
@@ -1,2045 +0,0 @@
-<?php
-/**
- * PEAR_PackageFile_v2, package.xml version 2.0
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * For error handling
- */
-require_once 'PEAR/ErrorStack.php';
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_PackageFile_v2
-{
-
-    /**
-     * Parsed package information
-     * @var array
-     * @access private
-     */
-    var $_packageInfo = array();
-
-    /**
-     * path to package .tgz or false if this is a local/extracted package.xml
-     * @var string|false
-     * @access private
-     */
-    var $_archiveFile;
-
-    /**
-     * path to package .xml or false if this is an abstract parsed-from-string xml
-     * @var string|false
-     * @access private
-     */
-    var $_packageFile;
-
-    /**
-     * This is used by file analysis routines to log progress information
-     * @var PEAR_Common
-     * @access protected
-     */
-    var $_logger;
-
-    /**
-     * This is set to the highest validation level that has been validated
-     *
-     * If the package.xml is invalid or unknown, this is set to 0.  If
-     * normal validation has occurred, this is set to PEAR_VALIDATE_NORMAL.  If
-     * downloading/installation validation has occurred it is set to PEAR_VALIDATE_DOWNLOADING
-     * or INSTALLING, and so on up to PEAR_VALIDATE_PACKAGING.  This allows validation
-     * "caching" to occur, which is particularly important for package validation, so
-     * that PHP files are not validated twice
-     * @var int
-     * @access private
-     */
-    var $_isValid = 0;
-
-    /**
-     * True if the filelist has been validated
-     * @param bool
-     */
-    var $_filesValid = false;
-
-    /**
-     * @var PEAR_Registry
-     * @access protected
-     */
-    var $_registry;
-
-    /**
-     * @var PEAR_Config
-     * @access protected
-     */
-    var $_config;
-
-    /**
-     * Optional Dependency group requested for installation
-     * @var string
-     * @access private
-     */
-    var $_requestedGroup = false;
-
-    /**
-     * @var PEAR_ErrorStack
-     * @access protected
-     */
-    var $_stack;
-
-    /**
-     * Namespace prefix used for tasks in this package.xml - use tasks: whenever possible
-     */
-    var $_tasksNs;
-
-    /**
-     * Determines whether this packagefile was initialized only with partial package info
-     *
-     * If this package file was constructed via parsing REST, it will only contain
-     *
-     * - package name
-     * - channel name
-     * - dependencies
-     * @var boolean
-     * @access private
-     */
-    var $_incomplete = true;
-
-    /**
-     * @var PEAR_PackageFile_v2_Validator
-     */
-    var $_v2Validator;
-
-    /**
-     * The constructor merely sets up the private error stack
-     */
-    function PEAR_PackageFile_v2()
-    {
-        $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v2', false, null);
-        $this->_isValid = false;
-    }
-
-    /**
-     * To make unit-testing easier
-     * @param PEAR_Frontend_*
-     * @param array options
-     * @param PEAR_Config
-     * @return PEAR_Downloader
-     * @access protected
-     */
-    function &getPEARDownloader(&$i, $o, &$c)
-    {
-        $z = &new PEAR_Downloader($i, $o, $c);
-        return $z;
-    }
-
-    /**
-     * To make unit-testing easier
-     * @param PEAR_Config
-     * @param array options
-     * @param array package name as returned from {@link PEAR_Registry::parsePackageName()}
-     * @param int PEAR_VALIDATE_* constant
-     * @return PEAR_Dependency2
-     * @access protected
-     */
-    function &getPEARDependency2(&$c, $o, $p, $s = PEAR_VALIDATE_INSTALLING)
-    {
-        if (!class_exists('PEAR_Dependency2')) {
-            require_once 'PEAR/Dependency2.php';
-        }
-        $z = &new PEAR_Dependency2($c, $o, $p, $s);
-        return $z;
-    }
-
-    function getInstalledBinary()
-    {
-        return isset($this->_packageInfo['#binarypackage']) ? $this->_packageInfo['#binarypackage'] :
-            false;
-    }
-
-    /**
-     * Installation of source package has failed, attempt to download and install the
-     * binary version of this package.
-     * @param PEAR_Installer
-     * @return array|false
-     */
-    function installBinary(&$installer)
-    {
-        if (!OS_WINDOWS) {
-            $a = false;
-            return $a;
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $releasetype = $this->getPackageType() . 'release';
-            if (!is_array($installer->getInstallPackages())) {
-                $a = false;
-                return $a;
-            }
-            foreach ($installer->getInstallPackages() as $p) {
-                if ($p->isExtension($this->_packageInfo['providesextension'])) {
-                    if ($p->getPackageType() != 'extsrc' && $p->getPackageType() != 'zendextsrc') {
-                        $a = false;
-                        return $a; // the user probably downloaded it separately
-                    }
-                }
-            }
-            if (isset($this->_packageInfo[$releasetype]['binarypackage'])) {
-                $installer->log(0, 'Attempting to download binary version of extension "' .
-                    $this->_packageInfo['providesextension'] . '"');
-                $params = $this->_packageInfo[$releasetype]['binarypackage'];
-                if (!is_array($params) || !isset($params[0])) {
-                    $params = array($params);
-                }
-                if (isset($this->_packageInfo['channel'])) {
-                    foreach ($params as $i => $param) {
-                        $params[$i] = array('channel' => $this->_packageInfo['channel'],
-                            'package' => $param, 'version' => $this->getVersion());
-                    }
-                }
-                $dl = &$this->getPEARDownloader($installer->ui, $installer->getOptions(),
-                    $installer->config);
-                $verbose = $dl->config->get('verbose');
-                $dl->config->set('verbose', -1);
-                foreach ($params as $param) {
-                    PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                    $ret = $dl->download(array($param));
-                    PEAR::popErrorHandling();
-                    if (is_array($ret) && count($ret)) {
-                        break;
-                    }
-                }
-                $dl->config->set('verbose', $verbose);
-                if (is_array($ret)) {
-                    if (count($ret) == 1) {
-                        $pf = $ret[0]->getPackageFile();
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        $err = $installer->install($ret[0]);
-                        PEAR::popErrorHandling();
-                        if (is_array($err)) {
-                            $this->_packageInfo['#binarypackage'] = $ret[0]->getPackage();
-                            // "install" self, so all dependencies will work transparently
-                            $this->_registry->addPackage2($this);
-                            $installer->log(0, 'Download and install of binary extension "' .
-                                $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $pf->getChannel(),
-                                          'package' => $pf->getPackage()), true) . '" successful');
-                            $a = array($ret[0], $err);
-                            return $a;
-                        }
-                        $installer->log(0, 'Download and install of binary extension "' .
-                            $this->_registry->parsedPackageNameToString(
-                                    array('channel' => $pf->getChannel(),
-                                          'package' => $pf->getPackage()), true) . '" failed');
-                    }
-                }
-            }
-        }
-        $a = false;
-        return $a;
-    }
-
-    /**
-     * @return string|false Extension name
-     */
-    function getProvidesExtension()
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            if (isset($this->_packageInfo['providesextension'])) {
-                return $this->_packageInfo['providesextension'];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string Extension name
-     * @return bool
-     */
-    function isExtension($extension)
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            return $this->_packageInfo['providesextension'] == $extension;
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether every part of the package.xml 1.0 is represented in
-     * this package.xml 2.0
-     * @param PEAR_PackageFile_v1
-     * @return bool
-     */
-    function isEquivalent($pf1)
-    {
-        if (!$pf1) {
-            return true;
-        }
-        if ($this->getPackageType() == 'bundle') {
-            return false;
-        }
-        $this->_stack->getErrors(true);
-        if (!$pf1->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        $pass = true;
-        if ($pf1->getPackage() != $this->getPackage()) {
-            $this->_differentPackage($pf1->getPackage());
-            $pass = false;
-        }
-        if ($pf1->getVersion() != $this->getVersion()) {
-            $this->_differentVersion($pf1->getVersion());
-            $pass = false;
-        }
-        if (trim($pf1->getSummary()) != $this->getSummary()) {
-            $this->_differentSummary($pf1->getSummary());
-            $pass = false;
-        }
-        if (preg_replace('/\s+/', '', $pf1->getDescription()) !=
-              preg_replace('/\s+/', '', $this->getDescription())) {
-            $this->_differentDescription($pf1->getDescription());
-            $pass = false;
-        }
-        if ($pf1->getState() != $this->getState()) {
-            $this->_differentState($pf1->getState());
-            $pass = false;
-        }
-        if (!strstr(preg_replace('/\s+/', '', $this->getNotes()),
-              preg_replace('/\s+/', '', $pf1->getNotes()))) {
-            $this->_differentNotes($pf1->getNotes());
-            $pass = false;
-        }
-        $mymaintainers = $this->getMaintainers();
-        $yourmaintainers = $pf1->getMaintainers();
-        for ($i1 = 0; $i1 < count($yourmaintainers); $i1++) {
-            $reset = false;
-            for ($i2 = 0; $i2 < count($mymaintainers); $i2++) {
-                if ($mymaintainers[$i2]['handle'] == $yourmaintainers[$i1]['handle']) {
-                    if ($mymaintainers[$i2]['role'] != $yourmaintainers[$i1]['role']) {
-                        $this->_differentRole($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['role'], $mymaintainers[$i2]['role']);
-                        $pass = false;
-                    }
-                    if ($mymaintainers[$i2]['email'] != $yourmaintainers[$i1]['email']) {
-                        $this->_differentEmail($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['email'], $mymaintainers[$i2]['email']);
-                        $pass = false;
-                    }
-                    if ($mymaintainers[$i2]['name'] != $yourmaintainers[$i1]['name']) {
-                        $this->_differentName($mymaintainers[$i2]['handle'],
-                            $yourmaintainers[$i1]['name'], $mymaintainers[$i2]['name']);
-                        $pass = false;
-                    }
-                    unset($mymaintainers[$i2]);
-                    $mymaintainers = array_values($mymaintainers);
-                    unset($yourmaintainers[$i1]);
-                    $yourmaintainers = array_values($yourmaintainers);
-                    $reset = true;
-                    break;
-                }
-            }
-            if ($reset) {
-                $i1 = -1;
-            }
-        }
-        $this->_unmatchedMaintainers($mymaintainers, $yourmaintainers);
-        $filelist = $this->getFilelist();
-        foreach ($pf1->getFilelist() as $file => $atts) {
-            if (!isset($filelist[$file])) {
-                $this->_missingFile($file);
-                $pass = false;
-            }
-        }
-        return $pass;
-    }
-
-    function _differentPackage($package)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('package' => $package,
-            'self' => $this->getPackage()),
-            'package.xml 1.0 package "%package%" does not match "%self%"');
-    }
-
-    function _differentVersion($version)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('version' => $version,
-            'self' => $this->getVersion()),
-            'package.xml 1.0 version "%version%" does not match "%self%"');
-    }
-
-    function _differentState($state)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('state' => $state,
-            'self' => $this->getState()),
-            'package.xml 1.0 state "%state%" does not match "%self%"');
-    }
-
-    function _differentRole($handle, $role, $selfrole)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'role' => $role, 'self' => $selfrole),
-            'package.xml 1.0 maintainer "%handle%" role "%role%" does not match "%self%"');
-    }
-
-    function _differentEmail($handle, $email, $selfemail)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'email' => $email, 'self' => $selfemail),
-            'package.xml 1.0 maintainer "%handle%" email "%email%" does not match "%self%"');
-    }
-
-    function _differentName($handle, $name, $selfname)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('handle' => $handle,
-            'name' => $name, 'self' => $selfname),
-            'package.xml 1.0 maintainer "%handle%" name "%name%" does not match "%self%"');
-    }
-
-    function _unmatchedMaintainers($my, $yours)
-    {
-        if ($my) {
-            array_walk($my, create_function('&$i, $k', '$i = $i["handle"];'));
-            $this->_stack->push(__FUNCTION__, 'error', array('handles' => $my),
-                'package.xml 2.0 has unmatched extra maintainers "%handles%"');
-        }
-        if ($yours) {
-            array_walk($yours, create_function('&$i, $k', '$i = $i["handle"];'));
-            $this->_stack->push(__FUNCTION__, 'error', array('handles' => $yours),
-                'package.xml 1.0 has unmatched extra maintainers "%handles%"');
-        }
-    }
-
-    function _differentNotes($notes)
-    {
-        $truncnotes = strlen($notes) < 25 ? $notes : substr($notes, 0, 24) . '...';
-        $truncmynotes = strlen($this->getNotes()) < 25 ? $this->getNotes() :
-            substr($this->getNotes(), 0, 24) . '...';
-        $this->_stack->push(__FUNCTION__, 'error', array('notes' => $truncnotes,
-            'self' => $truncmynotes),
-            'package.xml 1.0 release notes "%notes%" do not match "%self%"');
-    }
-
-    function _differentSummary($summary)
-    {
-        $truncsummary = strlen($summary) < 25 ? $summary : substr($summary, 0, 24) . '...';
-        $truncmysummary = strlen($this->getsummary()) < 25 ? $this->getSummary() :
-            substr($this->getsummary(), 0, 24) . '...';
-        $this->_stack->push(__FUNCTION__, 'error', array('summary' => $truncsummary,
-            'self' => $truncmysummary),
-            'package.xml 1.0 summary "%summary%" does not match "%self%"');
-    }
-
-    function _differentDescription($description)
-    {
-        $truncdescription = trim(strlen($description) < 25 ? $description : substr($description, 0, 24) . '...');
-        $truncmydescription = trim(strlen($this->getDescription()) < 25 ? $this->getDescription() :
-            substr($this->getdescription(), 0, 24) . '...');
-        $this->_stack->push(__FUNCTION__, 'error', array('description' => $truncdescription,
-            'self' => $truncmydescription),
-            'package.xml 1.0 description "%description%" does not match "%self%"');
-    }
-
-    function _missingFile($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'package.xml 1.0 file "%file%" is not present in <contents>');
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawState($state)
-    {
-        if (!isset($this->_packageInfo['stability'])) {
-            $this->_packageInfo['stability'] = array();
-        }
-        $this->_packageInfo['stability']['release'] = $state;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawCompatible($compatible)
-    {
-        $this->_packageInfo['compatible'] = $compatible;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawPackage($package)
-    {
-        $this->_packageInfo['name'] = $package;
-    }
-
-    /**
-     * WARNING - do not use this function unless you know what you're doing
-     */
-    function setRawChannel($channel)
-    {
-        $this->_packageInfo['channel'] = $channel;
-    }
-
-    function setRequestedGroup($group)
-    {
-        $this->_requestedGroup = $group;
-    }
-
-    function getRequestedGroup()
-    {
-        if (isset($this->_requestedGroup)) {
-            return $this->_requestedGroup;
-        }
-        return false;
-    }
-
-    /**
-     * For saving in the registry.
-     *
-     * Set the last version that was installed
-     * @param string
-     */
-    function setLastInstalledVersion($version)
-    {
-        $this->_packageInfo['_lastversion'] = $version;
-    }
-
-    /**
-     * @return string|false
-     */
-    function getLastInstalledVersion()
-    {
-        if (isset($this->_packageInfo['_lastversion'])) {
-            return $this->_packageInfo['_lastversion'];
-        }
-        return false;
-    }
-
-    /**
-     * Determines whether this package.xml has post-install scripts or not
-     * @return array|false
-     */
-    function listPostinstallScripts()
-    {
-        $filelist = $this->getFilelist();
-        $contents = $this->getContents();
-        $contents = $contents['dir']['file'];
-        if (!is_array($contents) || !isset($contents[0])) {
-            $contents = array($contents);
-        }
-        $taskfiles = array();
-        foreach ($contents as $file) {
-            $atts = $file['attribs'];
-            unset($file['attribs']);
-            if (count($file)) {
-                $taskfiles[$atts['name']] = $file;
-            }
-        }
-        $common = new PEAR_Common;
-        $common->debug = $this->_config->get('verbose');
-        $this->_scripts = array();
-        $ret = array();
-        foreach ($taskfiles as $name => $tasks) {
-            if (!isset($filelist[$name])) {
-                // ignored files will not be in the filelist
-                continue;
-            }
-            $atts = $filelist[$name];
-            foreach ($tasks as $tag => $raw) {
-                $task = $this->getTask($tag);
-                $task = &new $task($this->_config, $common, PEAR_TASK_INSTALL);
-                if ($task->isScript()) {
-                    $ret[] = $filelist[$name]['installed_as'];
-                }
-            }
-        }
-        if (count($ret)) {
-            return $ret;
-        }
-        return false;
-    }
-
-    /**
-     * Initialize post-install scripts for running
-     *
-     * This method can be used to detect post-install scripts, as the return value
-     * indicates whether any exist
-     * @return bool
-     */
-    function initPostinstallScripts()
-    {
-        $filelist = $this->getFilelist();
-        $contents = $this->getContents();
-        $contents = $contents['dir']['file'];
-        if (!is_array($contents) || !isset($contents[0])) {
-            $contents = array($contents);
-        }
-        $taskfiles = array();
-        foreach ($contents as $file) {
-            $atts = $file['attribs'];
-            unset($file['attribs']);
-            if (count($file)) {
-                $taskfiles[$atts['name']] = $file;
-            }
-        }
-        $common = new PEAR_Common;
-        $common->debug = $this->_config->get('verbose');
-        $this->_scripts = array();
-        foreach ($taskfiles as $name => $tasks) {
-            if (!isset($filelist[$name])) {
-                // file was not installed due to installconditions
-                continue;
-            }
-            $atts = $filelist[$name];
-            foreach ($tasks as $tag => $raw) {
-                $taskname = $this->getTask($tag);
-                $task = &new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
-                if (!$task->isScript()) {
-                    continue; // scripts are only handled after installation
-                }
-                $lastversion = isset($this->_packageInfo['_lastversion']) ?
-                    $this->_packageInfo['_lastversion'] : null;
-                $task->init($raw, $atts, $lastversion);
-                $res = $task->startSession($this, $atts['installed_as']);
-                if (!$res) {
-                    continue; // skip this file
-                }
-                if (PEAR::isError($res)) {
-                    return $res;
-                }
-                $assign = &$task;
-                $this->_scripts[] = &$assign;
-            }
-        }
-        if (count($this->_scripts)) {
-            return true;
-        }
-        return false;
-    }
-
-    function runPostinstallScripts()
-    {
-        if ($this->initPostinstallScripts()) {
-            $ui = &PEAR_Frontend::singleton();
-            if ($ui) {
-                $ui->runPostinstallScripts($this->_scripts, $this);
-            }
-        }
-    }
-
-
-    /**
-     * Convert a recursive set of <dir> and <file> tags into a single <dir> tag with
-     * <file> tags.
-     */
-    function flattenFilelist()
-    {
-        if (isset($this->_packageInfo['bundle'])) {
-            return;
-        }
-        $filelist = array();
-        if (isset($this->_packageInfo['contents']['dir']['dir'])) {
-            $this->_getFlattenedFilelist($filelist, $this->_packageInfo['contents']['dir']);
-            if (!isset($filelist[1])) {
-                $filelist = $filelist[0];
-            }
-            $this->_packageInfo['contents']['dir']['file'] = $filelist;
-            unset($this->_packageInfo['contents']['dir']['dir']);
-        } else {
-            // else already flattened but check for baseinstalldir propagation
-            if (isset($this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'])) {
-                if (isset($this->_packageInfo['contents']['dir']['file'][0])) {
-                    foreach ($this->_packageInfo['contents']['dir']['file'] as $i => $file) {
-                        if (isset($file['attribs']['baseinstalldir'])) {
-                            continue;
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$i]['attribs']['baseinstalldir']
-                            = $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'];
-                    }
-                } else {
-                    if (!isset($this->_packageInfo['contents']['dir']['file']['attribs']['baseinstalldir'])) {
-                       $this->_packageInfo['contents']['dir']['file']['attribs']['baseinstalldir']
-                            = $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'];
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param array the final flattened file list
-     * @param array the current directory being processed
-     * @param string|false any recursively inherited baeinstalldir attribute
-     * @param string private recursion variable
-     * @return array
-     * @access protected
-     */
-    function _getFlattenedFilelist(&$files, $dir, $baseinstall = false, $path = '')
-    {
-        if (isset($dir['attribs']) && isset($dir['attribs']['baseinstalldir'])) {
-            $baseinstall = $dir['attribs']['baseinstalldir'];
-        }
-        if (isset($dir['dir'])) {
-            if (!isset($dir['dir'][0])) {
-                $dir['dir'] = array($dir['dir']);
-            }
-            foreach ($dir['dir'] as $subdir) {
-                if (!isset($subdir['attribs']) || !isset($subdir['attribs']['name'])) {
-                    $name = '*unknown*';
-                } else {
-                    $name = $subdir['attribs']['name'];
-                }
-                $newpath = empty($path) ? $name :
-                    $path . '/' . $name;
-                $this->_getFlattenedFilelist($files, $subdir,
-                    $baseinstall, $newpath);
-            }
-        }
-        if (isset($dir['file'])) {
-            if (!isset($dir['file'][0])) {
-                $dir['file'] = array($dir['file']);
-            }
-            foreach ($dir['file'] as $file) {
-                $attrs = $file['attribs'];
-                $name = $attrs['name'];
-                if ($baseinstall && !isset($attrs['baseinstalldir'])) {
-                    $attrs['baseinstalldir'] = $baseinstall;
-                }
-                $attrs['name'] = empty($path) ? $name : $path . '/' . $name;
-                $attrs['name'] = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'),
-                    $attrs['name']);
-                $file['attribs'] = $attrs;
-                $files[] = $file;
-            }
-        }
-    }
-
-    function setConfig(&$config)
-    {
-        $this->_config = &$config;
-        $this->_registry = &$config->getRegistry();
-    }
-
-    function setLogger(&$logger)
-    {
-        if (!is_object($logger) || !method_exists($logger, 'log')) {
-            return PEAR::raiseError('Logger must be compatible with PEAR_Common::log');
-        }
-        $this->_logger = &$logger;
-    }
-
-    /**
-     * WARNING - do not use this function directly unless you know what you're doing
-     */
-    function setDeps($deps)
-    {
-        $this->_packageInfo['dependencies'] = $deps;
-    }
-
-    /**
-     * WARNING - do not use this function directly unless you know what you're doing
-     */
-    function setCompatible($compat)
-    {
-        $this->_packageInfo['compatible'] = $compat;
-    }
-
-    function setPackagefile($file, $archive = false)
-    {
-        $this->_packageFile = $file;
-        $this->_archiveFile = $archive ? $archive : $file;
-    }
-
-    /**
-     * Wrapper to {@link PEAR_ErrorStack::getErrors()}
-     * @param boolean determines whether to purge the error stack after retrieving
-     * @return array
-     */
-    function getValidationWarnings($purge = true)
-    {
-        return $this->_stack->getErrors($purge);
-    }
-
-    function getPackageFile()
-    {
-        return $this->_packageFile;
-    }
-
-    function getArchiveFile()
-    {
-        return $this->_archiveFile;
-    }
-
-
-    /**
-     * Directly set the array that defines this packagefile
-     *
-     * WARNING: no validation.  This should only be performed by internal methods
-     * inside PEAR or by inputting an array saved from an existing PEAR_PackageFile_v2
-     * @param array
-     */
-    function fromArray($pinfo)
-    {
-        unset($pinfo['old']);
-        unset($pinfo['xsdversion']);
-        $this->_incomplete = false;
-        $this->_packageInfo = $pinfo;
-    }
-
-    function isIncomplete()
-    {
-        return $this->_incomplete;
-    }
-
-    /**
-     * @return array
-     */
-    function toArray($forreg = false)
-    {
-        if (!$this->validate(PEAR_VALIDATE_NORMAL)) {
-            return false;
-        }
-        return $this->getArray($forreg);
-    }
-
-    function getArray($forReg = false)
-    {
-        if ($forReg) {
-            $arr = $this->_packageInfo;
-            $arr['old'] = array();
-            $arr['old']['version'] = $this->getVersion();
-            $arr['old']['release_date'] = $this->getDate();
-            $arr['old']['release_state'] = $this->getState();
-            $arr['old']['release_license'] = $this->getLicense();
-            $arr['old']['release_notes'] = $this->getNotes();
-            $arr['old']['release_deps'] = $this->getDeps();
-            $arr['old']['maintainers'] = $this->getMaintainers();
-            $arr['xsdversion'] = '2.0';
-            return $arr;
-        } else {
-            $info = $this->_packageInfo;
-            unset($info['dirtree']);
-            if (isset($info['_lastversion'])) {
-                unset($info['_lastversion']);
-            }
-            if (isset($info['#binarypackage'])) {
-                unset($info['#binarypackage']);
-            }
-            return $info;
-        }
-    }
-
-    function packageInfo($field)
-    {
-        $arr = $this->getArray(true);
-        if ($field == 'state') {
-            return $arr['stability']['release'];
-        }
-        if ($field == 'api-version') {
-            return $arr['version']['api'];
-        }
-        if ($field == 'api-state') {
-            return $arr['stability']['api'];
-        }
-        if (isset($arr['old'][$field])) {
-            if (!is_string($arr['old'][$field])) {
-                return null;
-            }
-            return $arr['old'][$field];
-        }
-        if (isset($arr[$field])) {
-            if (!is_string($arr[$field])) {
-                return null;
-            }
-            return $arr[$field];
-        }
-        return null;
-    }
-
-    function getName()
-    {
-        return $this->getPackage();
-    }
-
-    function getPackage()
-    {
-        if (isset($this->_packageInfo['name'])) {
-            return $this->_packageInfo['name'];
-        }
-        return false;
-    }
-
-    function getChannel()
-    {
-        if (isset($this->_packageInfo['uri'])) {
-            return '__uri';
-        }
-        if (isset($this->_packageInfo['channel'])) {
-            return strtolower($this->_packageInfo['channel']);
-        }
-        return false;
-    }
-
-    function getUri()
-    {
-        if (isset($this->_packageInfo['uri'])) {
-            return $this->_packageInfo['uri'];
-        }
-        return false;
-    }
-
-    function getExtends()
-    {
-        if (isset($this->_packageInfo['extends'])) {
-            return $this->_packageInfo['extends'];
-        }
-        return false;
-    }
-
-    function getSummary()
-    {
-        if (isset($this->_packageInfo['summary'])) {
-            return $this->_packageInfo['summary'];
-        }
-        return false;
-    }
-
-    function getDescription()
-    {
-        if (isset($this->_packageInfo['description'])) {
-            return $this->_packageInfo['description'];
-        }
-        return false;
-    }
-
-    function getMaintainers($raw = false)
-    {
-        if (!isset($this->_packageInfo['lead'])) {
-            return false;
-        }
-        if ($raw) {
-            $ret = array('lead' => $this->_packageInfo['lead']);
-            (isset($this->_packageInfo['developer'])) ?
-                $ret['developer'] = $this->_packageInfo['developer'] :null;
-            (isset($this->_packageInfo['contributor'])) ?
-                $ret['contributor'] = $this->_packageInfo['contributor'] :null;
-            (isset($this->_packageInfo['helper'])) ?
-                $ret['helper'] = $this->_packageInfo['helper'] :null;
-            return $ret;
-        } else {
-            $ret = array();
-            $leads = isset($this->_packageInfo['lead'][0]) ? $this->_packageInfo['lead'] :
-                array($this->_packageInfo['lead']);
-            foreach ($leads as $lead) {
-                $s = $lead;
-                $s['handle'] = $s['user'];
-                unset($s['user']);
-                $s['role'] = 'lead';
-                $ret[] = $s;
-            }
-            if (isset($this->_packageInfo['developer'])) {
-                $leads = isset($this->_packageInfo['developer'][0]) ?
-                    $this->_packageInfo['developer'] :
-                    array($this->_packageInfo['developer']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'developer';
-                    $ret[] = $s;
-                }
-            }
-            if (isset($this->_packageInfo['contributor'])) {
-                $leads = isset($this->_packageInfo['contributor'][0]) ?
-                    $this->_packageInfo['contributor'] :
-                    array($this->_packageInfo['contributor']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'contributor';
-                    $ret[] = $s;
-                }
-            }
-            if (isset($this->_packageInfo['helper'])) {
-                $leads = isset($this->_packageInfo['helper'][0]) ?
-                    $this->_packageInfo['helper'] :
-                    array($this->_packageInfo['helper']);
-                foreach ($leads as $maintainer) {
-                    $s = $maintainer;
-                    $s['handle'] = $s['user'];
-                    unset($s['user']);
-                    $s['role'] = 'helper';
-                    $ret[] = $s;
-                }
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-    function getLeads()
-    {
-        if (isset($this->_packageInfo['lead'])) {
-            return $this->_packageInfo['lead'];
-        }
-        return false;
-    }
-
-    function getDevelopers()
-    {
-        if (isset($this->_packageInfo['developer'])) {
-            return $this->_packageInfo['developer'];
-        }
-        return false;
-    }
-
-    function getContributors()
-    {
-        if (isset($this->_packageInfo['contributor'])) {
-            return $this->_packageInfo['contributor'];
-        }
-        return false;
-    }
-
-    function getHelpers()
-    {
-        if (isset($this->_packageInfo['helper'])) {
-            return $this->_packageInfo['helper'];
-        }
-        return false;
-    }
-
-    function setDate($date)
-    {
-        if (!isset($this->_packageInfo['date'])) {
-            // ensure that the extends tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('time', 'version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease', 'zendextsrcrelease',
-                    'zendextbinrelease', 'bundle', 'changelog'), array(), 'date');
-        }
-        $this->_packageInfo['date'] = $date;
-        $this->_isValid = 0;
-    }
-
-    function setTime($time)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['time'])) {
-            // ensure that the time tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                    array('version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease', 'zendextsrcrelease',
-                    'zendextbinrelease', 'bundle', 'changelog'), $time, 'time');
-        }
-        $this->_packageInfo['time'] = $time;
-    }
-
-    function getDate()
-    {
-        if (isset($this->_packageInfo['date'])) {
-            return $this->_packageInfo['date'];
-        }
-        return false;
-    }
-
-    function getTime()
-    {
-        if (isset($this->_packageInfo['time'])) {
-            return $this->_packageInfo['time'];
-        }
-        return false;
-    }
-
-    /**
-     * @param package|api version category to return
-     */
-    function getVersion($key = 'release')
-    {
-        if (isset($this->_packageInfo['version'][$key])) {
-            return $this->_packageInfo['version'][$key];
-        }
-        return false;
-    }
-
-    function getStability()
-    {
-        if (isset($this->_packageInfo['stability'])) {
-            return $this->_packageInfo['stability'];
-        }
-        return false;
-    }
-
-    function getState($key = 'release')
-    {
-        if (isset($this->_packageInfo['stability'][$key])) {
-            return $this->_packageInfo['stability'][$key];
-        }
-        return false;
-    }
-
-    function getLicense($raw = false)
-    {
-        if (isset($this->_packageInfo['license'])) {
-            if ($raw) {
-                return $this->_packageInfo['license'];
-            }
-            if (is_array($this->_packageInfo['license'])) {
-                return $this->_packageInfo['license']['_content'];
-            } else {
-                return $this->_packageInfo['license'];
-            }
-        }
-        return false;
-    }
-
-    function getLicenseLocation()
-    {
-        if (!isset($this->_packageInfo['license']) || !is_array($this->_packageInfo['license'])) {
-            return false;
-        }
-        return $this->_packageInfo['license']['attribs'];
-    }
-
-    function getNotes()
-    {
-        if (isset($this->_packageInfo['notes'])) {
-            return $this->_packageInfo['notes'];
-        }
-        return false;
-    }
-
-    /**
-     * Return the <usesrole> tag contents, if any
-     * @return array|false
-     */
-    function getUsesrole()
-    {
-        if (isset($this->_packageInfo['usesrole'])) {
-            return $this->_packageInfo['usesrole'];
-        }
-        return false;
-    }
-
-    /**
-     * Return the <usestask> tag contents, if any
-     * @return array|false
-     */
-    function getUsestask()
-    {
-        if (isset($this->_packageInfo['usestask'])) {
-            return $this->_packageInfo['usestask'];
-        }
-        return false;
-    }
-
-    /**
-     * This should only be used to retrieve filenames and install attributes
-     */
-    function getFilelist($preserve = false)
-    {
-        if (isset($this->_packageInfo['filelist']) && !$preserve) {
-            return $this->_packageInfo['filelist'];
-        }
-        $this->flattenFilelist();
-        if ($contents = $this->getContents()) {
-            $ret = array();
-            if (!isset($contents['dir'])) {
-                return false;
-            }
-            if (!isset($contents['dir']['file'][0])) {
-                $contents['dir']['file'] = array($contents['dir']['file']);
-            }
-            foreach ($contents['dir']['file'] as $file) {
-                $name = $file['attribs']['name'];
-                if (!$preserve) {
-                    $file = $file['attribs'];
-                }
-                $ret[$name] = $file;
-            }
-            if (!$preserve) {
-                $this->_packageInfo['filelist'] = $ret;
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-    /**
-     * Return configure options array, if any
-     *
-     * @return array|false
-     */
-    function getConfigureOptions()
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-
-        $releases = $this->getReleases();
-        if (isset($releases[0])) {
-            $releases = $releases[0];
-        }
-
-        if (isset($releases['configureoption'])) {
-            if (!isset($releases['configureoption'][0])) {
-                $releases['configureoption'] = array($releases['configureoption']);
-            }
-
-            for ($i = 0; $i < count($releases['configureoption']); $i++) {
-                $releases['configureoption'][$i] = $releases['configureoption'][$i]['attribs'];
-            }
-
-            return $releases['configureoption'];
-        }
-
-        return false;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function resetFilelist()
-    {
-        $this->_packageInfo['filelist'] = array();
-    }
-
-    /**
-     * Retrieve a list of files that should be installed on this computer
-     * @return array
-     */
-    function getInstallationFilelist($forfilecheck = false)
-    {
-        $contents = $this->getFilelist(true);
-        if (isset($contents['dir']['attribs']['baseinstalldir'])) {
-            $base = $contents['dir']['attribs']['baseinstalldir'];
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            return PEAR::raiseError(
-                'Exception: bundles should be handled in download code only');
-        }
-        $release = $this->getReleases();
-        if ($release) {
-            if (!isset($release[0])) {
-                if (!isset($release['installconditions']) && !isset($release['filelist'])) {
-                    if ($forfilecheck) {
-                        return $this->getFilelist();
-                    }
-                    return $contents;
-                }
-                $release = array($release);
-            }
-            $depchecker = &$this->getPEARDependency2($this->_config, array(),
-                array('channel' => $this->getChannel(), 'package' => $this->getPackage()),
-                PEAR_VALIDATE_INSTALLING);
-            foreach ($release as $instance) {
-                if (isset($instance['installconditions'])) {
-                    $installconditions = $instance['installconditions'];
-                    if (is_array($installconditions)) {
-                        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                        foreach ($installconditions as $type => $conditions) {
-                            if (!isset($conditions[0])) {
-                                $conditions = array($conditions);
-                            }
-                            foreach ($conditions as $condition) {
-                                $ret = $depchecker->{"validate{$type}Dependency"}($condition);
-                                if (PEAR::isError($ret)) {
-                                    PEAR::popErrorHandling();
-                                    continue 3; // skip this release
-                                }
-                            }
-                        }
-                        PEAR::popErrorHandling();
-                    }
-                }
-                // this is the release to use
-                if (isset($instance['filelist'])) {
-                    // ignore files
-                    if (isset($instance['filelist']['ignore'])) {
-                        $ignore = isset($instance['filelist']['ignore'][0]) ?
-                            $instance['filelist']['ignore'] :
-                            array($instance['filelist']['ignore']);
-                        foreach ($ignore as $ig) {
-                            unset ($contents[$ig['attribs']['name']]);
-                        }
-                    }
-                    // install files as this name
-                    if (isset($instance['filelist']['install'])) {
-                        $installas = isset($instance['filelist']['install'][0]) ?
-                            $instance['filelist']['install'] :
-                            array($instance['filelist']['install']);
-                        foreach ($installas as $as) {
-                            $contents[$as['attribs']['name']]['attribs']['install-as'] =
-                                $as['attribs']['as'];
-                        }
-                    }
-                }
-                if ($forfilecheck) {
-                    foreach ($contents as $file => $attrs) {
-                        $contents[$file] = $attrs['attribs'];
-                    }
-                }
-                return $contents;
-            }
-        } else { // simple release - no installconditions or install-as
-            if ($forfilecheck) {
-                return $this->getFilelist();
-            }
-            return $contents;
-        }
-        // no releases matched
-        return PEAR::raiseError('No releases in package.xml matched the existing operating ' .
-            'system, extensions installed, or architecture, cannot install');
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     * @param string file name
-     * @param string installed path
-     */
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    function getInstalledLocation($file)
-    {
-        if (isset($this->_packageInfo['filelist'][$file]['installed_as'])) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'];
-        }
-        return false;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts['attribs']);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts['attribs'];
-        }
-    }
-
-    /**
-     * Retrieve the contents tag
-     */
-    function getContents()
-    {
-        if (isset($this->_packageInfo['contents'])) {
-            return $this->_packageInfo['contents'];
-        }
-        return false;
-    }
-
-    /**
-     * @param string full path to file
-     * @param string attribute name
-     * @param string attribute value
-     * @param int risky but fast - use this to choose a file based on its position in the list
-     *            of files.  Index is zero-based like PHP arrays.
-     * @return bool success of operation
-     */
-    function setFileAttribute($filename, $attr, $value, $index = false)
-    {
-        $this->_isValid = 0;
-        if (in_array($attr, array('role', 'name', 'baseinstalldir'))) {
-            $this->_filesValid = false;
-        }
-        if ($index !== false &&
-              isset($this->_packageInfo['contents']['dir']['file'][$index]['attribs'])) {
-            $this->_packageInfo['contents']['dir']['file'][$index]['attribs'][$attr] = $value;
-            return true;
-        }
-        if (!isset($this->_packageInfo['contents']['dir']['file'])) {
-            return false;
-        }
-        $files = $this->_packageInfo['contents']['dir']['file'];
-        if (!isset($files[0])) {
-            $files = array($files);
-            $ind = false;
-        } else {
-            $ind = true;
-        }
-        foreach ($files as $i => $file) {
-            if (isset($file['attribs'])) {
-                if ($file['attribs']['name'] == $filename) {
-                    if ($ind) {
-                        $this->_packageInfo['contents']['dir']['file'][$i]['attribs'][$attr] = $value;
-                    } else {
-                        $this->_packageInfo['contents']['dir']['file']['attribs'][$attr] = $value;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function setDirtree($path)
-    {
-        if (!isset($this->_packageInfo['dirtree'])) {
-            $this->_packageInfo['dirtree'] = array();
-        }
-        $this->_packageInfo['dirtree'][$path] = true;
-    }
-
-    function getDirtree()
-    {
-        if (isset($this->_packageInfo['dirtree']) && count($this->_packageInfo['dirtree'])) {
-            return $this->_packageInfo['dirtree'];
-        }
-        return false;
-    }
-
-    function resetDirtree()
-    {
-        unset($this->_packageInfo['dirtree']);
-    }
-
-    /**
-     * Determines whether this package claims it is compatible with the version of
-     * the package that has a recommended version dependency
-     * @param PEAR_PackageFile_v2|PEAR_PackageFile_v1|PEAR_Downloader_Package
-     * @return boolean
-     */
-    function isCompatible($pf)
-    {
-        if (!isset($this->_packageInfo['compatible'])) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['channel'])) {
-            return false;
-        }
-        $me = $pf->getVersion();
-        $compatible = $this->_packageInfo['compatible'];
-        if (!isset($compatible[0])) {
-            $compatible = array($compatible);
-        }
-        $found = false;
-        foreach ($compatible as $info) {
-            if (strtolower($info['name']) == strtolower($pf->getPackage())) {
-                if (strtolower($info['channel']) == strtolower($pf->getChannel())) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-        if (!$found) {
-            return false;
-        }
-        if (isset($info['exclude'])) {
-            if (!isset($info['exclude'][0])) {
-                $info['exclude'] = array($info['exclude']);
-            }
-            foreach ($info['exclude'] as $exclude) {
-                if (version_compare($me, $exclude, '==')) {
-                    return false;
-                }
-            }
-        }
-        if (version_compare($me, $info['min'], '>=') && version_compare($me, $info['max'], '<=')) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @return array|false
-     */
-    function getCompatible()
-    {
-        if (isset($this->_packageInfo['compatible'])) {
-            return $this->_packageInfo['compatible'];
-        }
-        return false;
-    }
-
-    function getDependencies()
-    {
-        if (isset($this->_packageInfo['dependencies'])) {
-            return $this->_packageInfo['dependencies'];
-        }
-        return false;
-    }
-
-    function isSubpackageOf($p)
-    {
-        return $p->isSubpackage($this);
-    }
-
-    /**
-     * Determines whether the passed in package is a subpackage of this package.
-     *
-     * No version checking is done, only name verification.
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     */
-    function isSubpackage($p)
-    {
-        $sub = array();
-        if (isset($this->_packageInfo['dependencies']['required']['subpackage'])) {
-            $sub = $this->_packageInfo['dependencies']['required']['subpackage'];
-            if (!isset($sub[0])) {
-                $sub = array($sub);
-            }
-        }
-        if (isset($this->_packageInfo['dependencies']['optional']['subpackage'])) {
-            $sub1 = $this->_packageInfo['dependencies']['optional']['subpackage'];
-            if (!isset($sub1[0])) {
-                $sub1 = array($sub1);
-            }
-            $sub = array_merge($sub, $sub1);
-        }
-        if (isset($this->_packageInfo['dependencies']['group'])) {
-            $group = $this->_packageInfo['dependencies']['group'];
-            if (!isset($group[0])) {
-                $group = array($group);
-            }
-            foreach ($group as $deps) {
-                if (isset($deps['subpackage'])) {
-                    $sub2 = $deps['subpackage'];
-                    if (!isset($sub2[0])) {
-                        $sub2 = array($sub2);
-                    }
-                    $sub = array_merge($sub, $sub2);
-                }
-            }
-        }
-        foreach ($sub as $dep) {
-            if (strtolower($dep['name']) == strtolower($p->getPackage())) {
-                if (isset($dep['channel'])) {
-                    if (strtolower($dep['channel']) == strtolower($p->getChannel())) {
-                        return true;
-                    }
-                } else {
-                    if ($dep['uri'] == $p->getURI()) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    function dependsOn($package, $channel)
-    {
-        if (!($deps = $this->getDependencies())) {
-            return false;
-        }
-        foreach (array('package', 'subpackage') as $type) {
-            foreach (array('required', 'optional') as $needed) {
-                if (isset($deps[$needed][$type])) {
-                    if (!isset($deps[$needed][$type][0])) {
-                        $deps[$needed][$type] = array($deps[$needed][$type]);
-                    }
-                    foreach ($deps[$needed][$type] as $dep) {
-                        $depchannel = isset($dep['channel']) ? $dep['channel'] : '__uri';
-                        if (strtolower($dep['name']) == strtolower($package) &&
-                              $depchannel == $channel) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            if (isset($deps['group'])) {
-                if (!isset($deps['group'][0])) {
-                    $dep['group'] = array($deps['group']);
-                }
-                foreach ($deps['group'] as $group) {
-                    if (isset($group[$type])) {
-                        if (!is_array($group[$type])) {
-                            $group[$type] = array($group[$type]);
-                        }
-                        foreach ($group[$type] as $dep) {
-                            $depchannel = isset($dep['channel']) ? $dep['channel'] : '__uri';
-                            if (strtolower($dep['name']) == strtolower($package) &&
-                                  $depchannel == $channel) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the contents of a dependency group
-     * @param string
-     * @return array|false
-     */
-    function getDependencyGroup($name)
-    {
-        $name = strtolower($name);
-        if (!isset($this->_packageInfo['dependencies']['group'])) {
-            return false;
-        }
-        $groups = $this->_packageInfo['dependencies']['group'];
-        if (!isset($groups[0])) {
-            $groups = array($groups);
-        }
-        foreach ($groups as $group) {
-            if (strtolower($group['attribs']['name']) == $name) {
-                return $group;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Retrieve a partial package.xml 1.0 representation of dependencies
-     *
-     * a very limited representation of dependencies is returned by this method.
-     * The <exclude> tag for excluding certain versions of a dependency is
-     * completely ignored.  In addition, dependency groups are ignored, with the
-     * assumption that all dependencies in dependency groups are also listed in
-     * the optional group that work with all dependency groups
-     * @param boolean return package.xml 2.0 <dependencies> tag
-     * @return array|false
-     */
-    function getDeps($raw = false, $nopearinstaller = false)
-    {
-        if (isset($this->_packageInfo['dependencies'])) {
-            if ($raw) {
-                return $this->_packageInfo['dependencies'];
-            }
-            $ret = array();
-            $map = array(
-                'php' => 'php',
-                'package' => 'pkg',
-                'subpackage' => 'pkg',
-                'extension' => 'ext',
-                'os' => 'os',
-                'pearinstaller' => 'pkg',
-                );
-            foreach (array('required', 'optional') as $type) {
-                $optional = ($type == 'optional') ? 'yes' : 'no';
-                if (!isset($this->_packageInfo['dependencies'][$type])
-                    || empty($this->_packageInfo['dependencies'][$type])) {
-                    continue;
-                }
-                foreach ($this->_packageInfo['dependencies'][$type] as $dtype => $deps) {
-                    if ($dtype == 'pearinstaller' && $nopearinstaller) {
-                        continue;
-                    }
-                    if (!isset($deps[0])) {
-                        $deps = array($deps);
-                    }
-                    foreach ($deps as $dep) {
-                        if (!isset($map[$dtype])) {
-                            // no support for arch type
-                            continue;
-                        }
-                        if ($dtype == 'pearinstaller') {
-                            $dep['name'] = 'PEAR';
-                            $dep['channel'] = 'pear.php.net';
-                        }
-                        $s = array('type' => $map[$dtype]);
-                        if (isset($dep['channel'])) {
-                            $s['channel'] = $dep['channel'];
-                        }
-                        if (isset($dep['uri'])) {
-                            $s['uri'] = $dep['uri'];
-                        }
-                        if (isset($dep['name'])) {
-                            $s['name'] = $dep['name'];
-                        }
-                        if (isset($dep['conflicts'])) {
-                            $s['rel'] = 'not';
-                        } else {
-                            if (!isset($dep['min']) &&
-                                  !isset($dep['max'])) {
-                                $s['rel'] = 'has';
-                                $s['optional'] = $optional;
-                            } elseif (isset($dep['min']) &&
-                                  isset($dep['max'])) {
-                                $s['rel'] = 'ge';
-                                $s1 = $s;
-                                $s1['rel'] = 'le';
-                                $s['version'] = $dep['min'];
-                                $s1['version'] = $dep['max'];
-                                if (isset($dep['channel'])) {
-                                    $s1['channel'] = $dep['channel'];
-                                }
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                    $s1['name'] = $dep['name'];
-                                }
-                                $s['optional'] = $optional;
-                                $s1['optional'] = $optional;
-                                $ret[] = $s1;
-                            } elseif (isset($dep['min'])) {
-                                if (isset($dep['exclude']) &&
-                                      $dep['exclude'] == $dep['min']) {
-                                    $s['rel'] = 'gt';
-                                } else {
-                                    $s['rel'] = 'ge';
-                                }
-                                $s['version'] = $dep['min'];
-                                $s['optional'] = $optional;
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                }
-                            } elseif (isset($dep['max'])) {
-                                if (isset($dep['exclude']) &&
-                                      $dep['exclude'] == $dep['max']) {
-                                    $s['rel'] = 'lt';
-                                } else {
-                                    $s['rel'] = 'le';
-                                }
-                                $s['version'] = $dep['max'];
-                                $s['optional'] = $optional;
-                                if ($dtype != 'php') {
-                                    $s['name'] = $dep['name'];
-                                }
-                            }
-                        }
-                        $ret[] = $s;
-                    }
-                }
-            }
-            if (count($ret)) {
-                return $ret;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return php|extsrc|extbin|zendextsrc|zendextbin|bundle|false
-     */
-    function getPackageType()
-    {
-        if (isset($this->_packageInfo['phprelease'])) {
-            return 'php';
-        }
-        if (isset($this->_packageInfo['extsrcrelease'])) {
-            return 'extsrc';
-        }
-        if (isset($this->_packageInfo['extbinrelease'])) {
-            return 'extbin';
-        }
-        if (isset($this->_packageInfo['zendextsrcrelease'])) {
-            return 'zendextsrc';
-        }
-        if (isset($this->_packageInfo['zendextbinrelease'])) {
-            return 'zendextbin';
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            return 'bundle';
-        }
-        return false;
-    }
-
-    /**
-     * @return array|false
-     */
-    function getReleases()
-    {
-        $type = $this->getPackageType();
-        if ($type != 'bundle') {
-            $type .= 'release';
-        }
-        if ($this->getPackageType() && isset($this->_packageInfo[$type])) {
-            return $this->_packageInfo[$type];
-        }
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    function getChangelog()
-    {
-        if (isset($this->_packageInfo['changelog'])) {
-            return $this->_packageInfo['changelog'];
-        }
-        return false;
-    }
-
-    function hasDeps()
-    {
-        return isset($this->_packageInfo['dependencies']);
-    }
-
-    function getPackagexmlVersion()
-    {
-        if (isset($this->_packageInfo['zendextsrcrelease'])) {
-            return '2.1';
-        }
-        if (isset($this->_packageInfo['zendextbinrelease'])) {
-            return '2.1';
-        }
-        return '2.0';
-    }
-
-    /**
-     * @return array|false
-     */
-    function getSourcePackage()
-    {
-        if (isset($this->_packageInfo['extbinrelease']) ||
-              isset($this->_packageInfo['zendextbinrelease'])) {
-            return array('channel' => $this->_packageInfo['srcchannel'],
-                         'package' => $this->_packageInfo['srcpackage']);
-        }
-        return false;
-    }
-
-    function getBundledPackages()
-    {
-        if (isset($this->_packageInfo['bundle'])) {
-            return $this->_packageInfo['contents']['bundledpackage'];
-        }
-        return false;
-    }
-
-    function getLastModified()
-    {
-        if (isset($this->_packageInfo['_lastmodified'])) {
-            return $this->_packageInfo['_lastmodified'];
-        }
-        return false;
-    }
-
-    /**
-     * Get the contents of a file listed within the package.xml
-     * @param string
-     * @return string
-     */
-    function getFileContents($file)
-    {
-        if ($this->_archiveFile == $this->_packageFile) { // unpacked
-            $dir = dirname($this->_packageFile);
-            $file = $dir . DIRECTORY_SEPARATOR . $file;
-            $file = str_replace(array('/', '\\'),
-                array(DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR), $file);
-            if (file_exists($file) && is_readable($file)) {
-                return implode('', file($file));
-            }
-        } else { // tgz
-            $tar = &new Archive_Tar($this->_archiveFile);
-            $tar->pushErrorHandling(PEAR_ERROR_RETURN);
-            if ($file != 'package.xml' && $file != 'package2.xml') {
-                $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
-            }
-            $file = $tar->extractInString($file);
-            $tar->popErrorHandling();
-            if (PEAR::isError($file)) {
-                return PEAR::raiseError("Cannot locate file '$file' in archive");
-            }
-            return $file;
-        }
-    }
-
-    function &getRW()
-    {
-        if (!class_exists('PEAR_PackageFile_v2_rw')) {
-            require_once 'PEAR/PackageFile/v2/rw.php';
-        }
-        $a = new PEAR_PackageFile_v2_rw;
-        foreach (get_object_vars($this) as $name => $unused) {
-            if (!isset($this->$name)) {
-                continue;
-            }
-            if ($name == '_config' || $name == '_logger'|| $name == '_registry' ||
-                  $name == '_stack') {
-                $a->$name = &$this->$name;
-            } else {
-                $a->$name = $this->$name;
-            }
-        }
-        return $a;
-    }
-
-    function &getDefaultGenerator()
-    {
-        if (!class_exists('PEAR_PackageFile_Generator_v2')) {
-            require_once 'PEAR/PackageFile/Generator/v2.php';
-        }
-        $a = &new PEAR_PackageFile_Generator_v2($this);
-        return $a;
-    }
-
-    function analyzeSourceCode($file, $string = false)
-    {
-        if (!isset($this->_v2Validator) ||
-              !is_a($this->_v2Validator, 'PEAR_PackageFile_v2_Validator')) {
-            if (!class_exists('PEAR_PackageFile_v2_Validator')) {
-                require_once 'PEAR/PackageFile/v2/Validator.php';
-            }
-            $this->_v2Validator = new PEAR_PackageFile_v2_Validator;
-        }
-        return $this->_v2Validator->analyzeSourceCode($file, $string);
-    }
-
-    function validate($state = PEAR_VALIDATE_NORMAL)
-    {
-        if (!isset($this->_packageInfo) || !is_array($this->_packageInfo)) {
-            return false;
-        }
-        if (!isset($this->_v2Validator) ||
-              !is_a($this->_v2Validator, 'PEAR_PackageFile_v2_Validator')) {
-            if (!class_exists('PEAR_PackageFile_v2_Validator')) {
-                require_once 'PEAR/PackageFile/v2/Validator.php';
-            }
-            $this->_v2Validator = new PEAR_PackageFile_v2_Validator;
-        }
-        if (isset($this->_packageInfo['xsdversion'])) {
-            unset($this->_packageInfo['xsdversion']);
-        }
-        return $this->_v2Validator->validate($this, $state);
-    }
-
-    function getTasksNs()
-    {
-        if (!isset($this->_tasksNs)) {
-            if (isset($this->_packageInfo['attribs'])) {
-                foreach ($this->_packageInfo['attribs'] as $name => $value) {
-                    if ($value == 'http://pear.php.net/dtd/tasks-1.0') {
-                        $this->_tasksNs = str_replace('xmlns:', '', $name);
-                        break;
-                    }
-                }
-            }
-        }
-        return $this->_tasksNs;
-    }
-
-    /**
-     * Determine whether a task name is a valid task.  Custom tasks may be defined
-     * using subdirectories by putting a "-" in the name, as in <tasks:mycustom-task>
-     *
-     * Note that this method will auto-load the task class file and test for the existence
-     * of the name with "-" replaced by "_" as in PEAR/Task/mycustom/task.php makes class
-     * PEAR_Task_mycustom_task
-     * @param string
-     * @return boolean
-     */
-    function getTask($task)
-    {
-        $this->getTasksNs();
-        // transform all '-' to '/' and 'tasks:' to '' so tasks:replace becomes replace
-        $task = str_replace(array($this->_tasksNs . ':', '-'), array('', ' '), $task);
-        $taskfile = str_replace(' ', '/', ucwords($task));
-        $task = str_replace(array(' ', '/'), '_', ucwords($task));
-        if (class_exists("PEAR_Task_$task")) {
-            return "PEAR_Task_$task";
-        }
-        $fp = @fopen("PEAR/Task/$taskfile.php", 'r', true);
-        if ($fp) {
-            fclose($fp);
-            require_once "PEAR/Task/$taskfile.php";
-            return "PEAR_Task_$task";
-        }
-        return false;
-    }
-
-    /**
-     * Key-friendly array_splice
-     * @param tagname to splice a value in before
-     * @param mixed the value to splice in
-     * @param string the new tag name
-     */
-    function _ksplice($array, $key, $value, $newkey)
-    {
-        $offset = array_search($key, array_keys($array));
-        $after = array_slice($array, $offset);
-        $before = array_slice($array, 0, $offset);
-        $before[$newkey] = $value;
-        return array_merge($before, $after);
-    }
-
-    /**
-     * @param array a list of possible keys, in the order they may occur
-     * @param mixed contents of the new package.xml tag
-     * @param string tag name
-     * @access private
-     */
-    function _insertBefore($array, $keys, $contents, $newkey)
-    {
-        foreach ($keys as $key) {
-            if (isset($array[$key])) {
-                return $array = $this->_ksplice($array, $key, $contents, $newkey);
-            }
-        }
-        $array[$newkey] = $contents;
-        return $array;
-    }
-
-    /**
-     * @param subsection of {@link $_packageInfo}
-     * @param array|string tag contents
-     * @param array format:
-     * <pre>
-     * array(
-     *   tagname => array(list of tag names that follow this one),
-     *   childtagname => array(list of child tag names that follow this one),
-     * )
-     * </pre>
-     *
-     * This allows construction of nested tags
-     * @access private
-     */
-    function _mergeTag($manip, $contents, $order)
-    {
-        if (count($order)) {
-            foreach ($order as $tag => $curorder) {
-                if (!isset($manip[$tag])) {
-                    // ensure that the tag is set up
-                    $manip = $this->_insertBefore($manip, $curorder, array(), $tag);
-                }
-                if (count($order) > 1) {
-                    $manip[$tag] = $this->_mergeTag($manip[$tag], $contents, array_slice($order, 1));
-                    return $manip;
-                }
-            }
-        } else {
-            return $manip;
-        }
-        if (is_array($manip[$tag]) && !empty($manip[$tag]) && isset($manip[$tag][0])) {
-            $manip[$tag][] = $contents;
-        } else {
-            if (!count($manip[$tag])) {
-                $manip[$tag] = $contents;
-            } else {
-                $manip[$tag] = array($manip[$tag]);
-                $manip[$tag][] = $contents;
-            }
-        }
-        return $manip;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/v2/Validator.php b/airtime_mvc/library/pear/PEAR/PackageFile/v2/Validator.php
deleted file mode 100644
index cd9c3e2eb..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/v2/Validator.php
+++ /dev/null
@@ -1,2154 +0,0 @@
-<?php
-/**
- * PEAR_PackageFile_v2, package.xml version 2.0, read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Validator.php 277885 2009-03-27 19:29:31Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a8
- */
-/**
- * Private validation class used by PEAR_PackageFile_v2 - do not use directly, its
- * sole purpose is to split up the PEAR/PackageFile/v2.php file to make it smaller
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a8
- * @access private
- */
-class PEAR_PackageFile_v2_Validator
-{
-    /**
-     * @var array
-     */
-    var $_packageInfo;
-    /**
-     * @var PEAR_PackageFile_v2
-     */
-    var $_pf;
-    /**
-     * @var PEAR_ErrorStack
-     */
-    var $_stack;
-    /**
-     * @var int
-     */
-    var $_isValid = 0;
-    /**
-     * @var int
-     */
-    var $_filesValid = 0;
-    /**
-     * @var int
-     */
-    var $_curState = 0;
-    /**
-     * @param PEAR_PackageFile_v2
-     * @param int
-     */
-    function validate(&$pf, $state = PEAR_VALIDATE_NORMAL)
-    {
-        $this->_pf = &$pf;
-        $this->_curState = $state;
-        $this->_packageInfo = $this->_pf->getArray();
-        $this->_isValid = $this->_pf->_isValid;
-        $this->_filesValid = $this->_pf->_filesValid;
-        $this->_stack = &$pf->_stack;
-        $this->_stack->getErrors(true);
-        if (($this->_isValid & $state) == $state) {
-            return true;
-        }
-        if (!isset($this->_packageInfo) || !is_array($this->_packageInfo)) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['attribs']['version']) ||
-              ($this->_packageInfo['attribs']['version'] != '2.0' &&
-               $this->_packageInfo['attribs']['version'] != '2.1')
-        ) {
-            $this->_noPackageVersion();
-        }
-        $structure =
-        array(
-            'name',
-            'channel|uri',
-            '*extends', // can't be multiple, but this works fine
-            'summary',
-            'description',
-            '+lead', // these all need content checks
-            '*developer',
-            '*contributor',
-            '*helper',
-            'date',
-            '*time',
-            'version',
-            'stability',
-            'license->?uri->?filesource',
-            'notes',
-            'contents', //special validation needed
-            '*compatible',
-            'dependencies', //special validation needed
-            '*usesrole',
-            '*usestask', // reserve these for 1.4.0a1 to implement
-                         // this will allow a package.xml to gracefully say it
-                         // needs a certain package installed in order to implement a role or task
-            '*providesextension',
-            '*srcpackage|*srcuri',
-            '+phprelease|+extsrcrelease|+extbinrelease|' .
-                '+zendextsrcrelease|+zendextbinrelease|bundle', //special validation needed
-            '*changelog',
-        );
-        $test = $this->_packageInfo;
-        if (isset($test['dependencies']) &&
-              isset($test['dependencies']['required']) &&
-              isset($test['dependencies']['required']['pearinstaller']) &&
-              isset($test['dependencies']['required']['pearinstaller']['min']) &&
-              version_compare('1.9.1',
-                $test['dependencies']['required']['pearinstaller']['min'], '<')
-        ) {
-            $this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']);
-            return false;
-        }
-        // ignore post-installation array fields
-        if (array_key_exists('filelist', $test)) {
-            unset($test['filelist']);
-        }
-        if (array_key_exists('_lastmodified', $test)) {
-            unset($test['_lastmodified']);
-        }
-        if (array_key_exists('#binarypackage', $test)) {
-            unset($test['#binarypackage']);
-        }
-        if (array_key_exists('old', $test)) {
-            unset($test['old']);
-        }
-        if (array_key_exists('_lastversion', $test)) {
-            unset($test['_lastversion']);
-        }
-        if (!$this->_stupidSchemaValidate($structure, $test, '<package>')) {
-            return false;
-        }
-        if (empty($this->_packageInfo['name'])) {
-            $this->_tagCannotBeEmpty('name');
-        }
-        $test = isset($this->_packageInfo['uri']) ? 'uri' :'channel';
-        if (empty($this->_packageInfo[$test])) {
-            $this->_tagCannotBeEmpty($test);
-        }
-        if (is_array($this->_packageInfo['license']) &&
-              (!isset($this->_packageInfo['license']['_content']) ||
-              empty($this->_packageInfo['license']['_content']))) {
-            $this->_tagCannotBeEmpty('license');
-        } elseif (empty($this->_packageInfo['license'])) {
-            $this->_tagCannotBeEmpty('license');
-        }
-        if (empty($this->_packageInfo['summary'])) {
-            $this->_tagCannotBeEmpty('summary');
-        }
-        if (empty($this->_packageInfo['description'])) {
-            $this->_tagCannotBeEmpty('description');
-        }
-        if (empty($this->_packageInfo['date'])) {
-            $this->_tagCannotBeEmpty('date');
-        }
-        if (empty($this->_packageInfo['notes'])) {
-            $this->_tagCannotBeEmpty('notes');
-        }
-        if (isset($this->_packageInfo['time']) && empty($this->_packageInfo['time'])) {
-            $this->_tagCannotBeEmpty('time');
-        }
-        if (isset($this->_packageInfo['dependencies'])) {
-            $this->_validateDependencies();
-        }
-        if (isset($this->_packageInfo['compatible'])) {
-            $this->_validateCompatible();
-        }
-        if (!isset($this->_packageInfo['bundle'])) {
-            if (empty($this->_packageInfo['contents'])) {
-                $this->_tagCannotBeEmpty('contents');
-            }
-            if (!isset($this->_packageInfo['contents']['dir'])) {
-                $this->_filelistMustContainDir('contents');
-                return false;
-            }
-            if (isset($this->_packageInfo['contents']['file'])) {
-                $this->_filelistCannotContainFile('contents');
-                return false;
-            }
-        }
-        $this->_validateMaintainers();
-        $this->_validateStabilityVersion();
-        $fail = false;
-        if (array_key_exists('usesrole', $this->_packageInfo)) {
-            $roles = $this->_packageInfo['usesrole'];
-            if (!is_array($roles) || !isset($roles[0])) {
-                $roles = array($roles);
-            }
-            foreach ($roles as $role) {
-                if (!isset($role['role'])) {
-                    $this->_usesroletaskMustHaveRoleTask('usesrole', 'role');
-                    $fail = true;
-                } else {
-                    if (!isset($role['channel'])) {
-                        if (!isset($role['uri'])) {
-                            $this->_usesroletaskMustHaveChannelOrUri($role['role'], 'usesrole');
-                            $fail = true;
-                        }
-                    } elseif (!isset($role['package'])) {
-                        $this->_usesroletaskMustHavePackage($role['role'], 'usesrole');
-                        $fail = true;
-                    }
-                }
-            }
-        }
-        if (array_key_exists('usestask', $this->_packageInfo)) {
-            $roles = $this->_packageInfo['usestask'];
-            if (!is_array($roles) || !isset($roles[0])) {
-                $roles = array($roles);
-            }
-            foreach ($roles as $role) {
-                if (!isset($role['task'])) {
-                    $this->_usesroletaskMustHaveRoleTask('usestask', 'task');
-                    $fail = true;
-                } else {
-                    if (!isset($role['channel'])) {
-                        if (!isset($role['uri'])) {
-                            $this->_usesroletaskMustHaveChannelOrUri($role['task'], 'usestask');
-                            $fail = true;
-                        }
-                    } elseif (!isset($role['package'])) {
-                        $this->_usesroletaskMustHavePackage($role['task'], 'usestask');
-                        $fail = true;
-                    }
-                }
-            }
-        }
-
-        if ($fail) {
-            return false;
-        }
-
-        $list = $this->_packageInfo['contents'];
-        if (isset($list['dir']) && is_array($list['dir']) && isset($list['dir'][0])) {
-            $this->_multipleToplevelDirNotAllowed();
-            return $this->_isValid = 0;
-        }
-
-        $this->_validateFilelist();
-        $this->_validateRelease();
-        if (!$this->_stack->hasErrors()) {
-            $chan = $this->_pf->_registry->getChannel($this->_pf->getChannel(), true);
-            if (PEAR::isError($chan)) {
-                $this->_unknownChannel($this->_pf->getChannel());
-            } else {
-                $valpack = $chan->getValidationPackage();
-                // for channel validator packages, always use the default PEAR validator.
-                // otherwise, they can't be installed or packaged
-                $validator = $chan->getValidationObject($this->_pf->getPackage());
-                if (!$validator) {
-                    $this->_stack->push(__FUNCTION__, 'error',
-                        array_merge(
-                            array('channel' => $chan->getName(),
-                                  'package' => $this->_pf->getPackage()),
-                              $valpack
-                            ),
-                        'package "%channel%/%package%" cannot be properly validated without ' .
-                        'validation package "%channel%/%name%-%version%"');
-                    return $this->_isValid = 0;
-                }
-                $validator->setPackageFile($this->_pf);
-                $validator->validate($state);
-                $failures = $validator->getFailures();
-                foreach ($failures['errors'] as $error) {
-                    $this->_stack->push(__FUNCTION__, 'error', $error,
-                        'Channel validator error: field "%field%" - %reason%');
-                }
-                foreach ($failures['warnings'] as $warning) {
-                    $this->_stack->push(__FUNCTION__, 'warning', $warning,
-                        'Channel validator warning: field "%field%" - %reason%');
-                }
-            }
-        }
-
-        $this->_pf->_isValid = $this->_isValid = !$this->_stack->hasErrors('error');
-        if ($this->_isValid && $state == PEAR_VALIDATE_PACKAGING && !$this->_filesValid) {
-            if ($this->_pf->getPackageType() == 'bundle') {
-                if ($this->_analyzeBundledPackages()) {
-                    $this->_filesValid = $this->_pf->_filesValid = true;
-                } else {
-                    $this->_pf->_isValid = $this->_isValid = 0;
-                }
-            } else {
-                if (!$this->_analyzePhpFiles()) {
-                    $this->_pf->_isValid = $this->_isValid = 0;
-                } else {
-                    $this->_filesValid = $this->_pf->_filesValid = true;
-                }
-            }
-        }
-
-        if ($this->_isValid) {
-            return $this->_pf->_isValid = $this->_isValid = $state;
-        }
-
-        return $this->_pf->_isValid = $this->_isValid = 0;
-    }
-
-    function _stupidSchemaValidate($structure, $xml, $root)
-    {
-        if (!is_array($xml)) {
-            $xml = array();
-        }
-        $keys = array_keys($xml);
-        reset($keys);
-        $key = current($keys);
-        while ($key == 'attribs' || $key == '_contents') {
-            $key = next($keys);
-        }
-        $unfoundtags = $optionaltags = array();
-        $ret = true;
-        $mismatch = false;
-        foreach ($structure as $struc) {
-            if ($key) {
-                $tag = $xml[$key];
-            }
-            $test = $this->_processStructure($struc);
-            if (isset($test['choices'])) {
-                $loose = true;
-                foreach ($test['choices'] as $choice) {
-                    if ($key == $choice['tag']) {
-                        $key = next($keys);
-                        while ($key == 'attribs' || $key == '_contents') {
-                            $key = next($keys);
-                        }
-                        $unfoundtags = $optionaltags = array();
-                        $mismatch = false;
-                        if ($key && $key != $choice['tag'] && isset($choice['multiple'])) {
-                            $unfoundtags[] = $choice['tag'];
-                            $optionaltags[] = $choice['tag'];
-                            if ($key) {
-                                $mismatch = true;
-                            }
-                        }
-                        $ret &= $this->_processAttribs($choice, $tag, $root);
-                        continue 2;
-                    } else {
-                        $unfoundtags[] = $choice['tag'];
-                        $mismatch = true;
-                    }
-                    if (!isset($choice['multiple']) || $choice['multiple'] != '*') {
-                        $loose = false;
-                    } else {
-                        $optionaltags[] = $choice['tag'];
-                    }
-                }
-                if (!$loose) {
-                    $this->_invalidTagOrder($unfoundtags, $key, $root);
-                    return false;
-                }
-            } else {
-                if ($key != $test['tag']) {
-                    if (isset($test['multiple']) && $test['multiple'] != '*') {
-                        $unfoundtags[] = $test['tag'];
-                        $this->_invalidTagOrder($unfoundtags, $key, $root);
-                        return false;
-                    } else {
-                        if ($key) {
-                            $mismatch = true;
-                        }
-                        $unfoundtags[] = $test['tag'];
-                        $optionaltags[] = $test['tag'];
-                    }
-                    if (!isset($test['multiple'])) {
-                        $this->_invalidTagOrder($unfoundtags, $key, $root);
-                        return false;
-                    }
-                    continue;
-                } else {
-                    $unfoundtags = $optionaltags = array();
-                    $mismatch = false;
-                }
-                $key = next($keys);
-                while ($key == 'attribs' || $key == '_contents') {
-                    $key = next($keys);
-                }
-                if ($key && $key != $test['tag'] && isset($test['multiple'])) {
-                    $unfoundtags[] = $test['tag'];
-                    $optionaltags[] = $test['tag'];
-                    $mismatch = true;
-                }
-                $ret &= $this->_processAttribs($test, $tag, $root);
-                continue;
-            }
-        }
-        if (!$mismatch && count($optionaltags)) {
-            // don't error out on any optional tags
-            $unfoundtags = array_diff($unfoundtags, $optionaltags);
-        }
-        if (count($unfoundtags)) {
-            $this->_invalidTagOrder($unfoundtags, $key, $root);
-        } elseif ($key) {
-            // unknown tags
-            $this->_invalidTagOrder('*no tags allowed here*', $key, $root);
-            while ($key = next($keys)) {
-                $this->_invalidTagOrder('*no tags allowed here*', $key, $root);
-            }
-        }
-        return $ret;
-    }
-
-    function _processAttribs($choice, $tag, $context)
-    {
-        if (isset($choice['attribs'])) {
-            if (!is_array($tag)) {
-                $tag = array($tag);
-            }
-            $tags = $tag;
-            if (!isset($tags[0])) {
-                $tags = array($tags);
-            }
-            $ret = true;
-            foreach ($tags as $i => $tag) {
-                if (!is_array($tag) || !isset($tag['attribs'])) {
-                    foreach ($choice['attribs'] as $attrib) {
-                        if ($attrib{0} != '?') {
-                            $ret &= $this->_tagHasNoAttribs($choice['tag'],
-                                $context);
-                            continue 2;
-                        }
-                    }
-                }
-                foreach ($choice['attribs'] as $attrib) {
-                    if ($attrib{0} != '?') {
-                        if (!isset($tag['attribs'][$attrib])) {
-                            $ret &= $this->_tagMissingAttribute($choice['tag'],
-                                $attrib, $context);
-                        }
-                    }
-                }
-            }
-            return $ret;
-        }
-        return true;
-    }
-
-    function _processStructure($key)
-    {
-        $ret = array();
-        if (count($pieces = explode('|', $key)) > 1) {
-            $ret['choices'] = array();
-            foreach ($pieces as $piece) {
-                $ret['choices'][] = $this->_processStructure($piece);
-            }
-            return $ret;
-        }
-        $multi = $key{0};
-        if ($multi == '+' || $multi == '*') {
-            $ret['multiple'] = $key{0};
-            $key = substr($key, 1);
-        }
-        if (count($attrs = explode('->', $key)) > 1) {
-            $ret['tag'] = array_shift($attrs);
-            $ret['attribs'] = $attrs;
-        } else {
-            $ret['tag'] = $key;
-        }
-        return $ret;
-    }
-
-    function _validateStabilityVersion()
-    {
-        $structure = array('release', 'api');
-        $a = $this->_stupidSchemaValidate($structure, $this->_packageInfo['version'], '<version>');
-        $a &= $this->_stupidSchemaValidate($structure, $this->_packageInfo['stability'], '<stability>');
-        if ($a) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $this->_packageInfo['version']['release'])) {
-                $this->_invalidVersion('release', $this->_packageInfo['version']['release']);
-            }
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $this->_packageInfo['version']['api'])) {
-                $this->_invalidVersion('api', $this->_packageInfo['version']['api']);
-            }
-            if (!in_array($this->_packageInfo['stability']['release'],
-                  array('snapshot', 'devel', 'alpha', 'beta', 'stable'))) {
-                $this->_invalidState('release', $this->_packageInfo['stability']['release']);
-            }
-            if (!in_array($this->_packageInfo['stability']['api'],
-                  array('devel', 'alpha', 'beta', 'stable'))) {
-                $this->_invalidState('api', $this->_packageInfo['stability']['api']);
-            }
-        }
-    }
-
-    function _validateMaintainers()
-    {
-        $structure =
-            array(
-                'name',
-                'user',
-                'email',
-                'active',
-            );
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $type) {
-            if (!isset($this->_packageInfo[$type])) {
-                continue;
-            }
-            if (isset($this->_packageInfo[$type][0])) {
-                foreach ($this->_packageInfo[$type] as $lead) {
-                    $this->_stupidSchemaValidate($structure, $lead, '<' . $type . '>');
-                }
-            } else {
-                $this->_stupidSchemaValidate($structure, $this->_packageInfo[$type],
-                    '<' . $type . '>');
-            }
-        }
-    }
-
-    function _validatePhpDep($dep, $installcondition = false)
-    {
-        $structure = array(
-            'min',
-            '*max',
-            '*exclude',
-        );
-        $type = $installcondition ? '<installcondition><php>' : '<dependencies><required><php>';
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?\\z/',
-                  $dep['min'])) {
-                $this->_invalidVersion($type . '<min>', $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?\\z/',
-                  $dep['max'])) {
-                $this->_invalidVersion($type . '<max>', $dep['max']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match(
-                     '/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?(?:-[a-zA-Z0-9]+)?\\z/',
-                     $exclude)) {
-                    $this->_invalidVersion($type . '<exclude>', $exclude);
-                }
-            }
-        }
-    }
-
-    function _validatePearinstallerDep($dep)
-    {
-        $structure = array(
-            'min',
-            '*max',
-            '*recommended',
-            '*exclude',
-        );
-        $this->_stupidSchemaValidate($structure, $dep, '<dependencies><required><pearinstaller>');
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['min'])) {
-                $this->_invalidVersion('<dependencies><required><pearinstaller><min>',
-                    $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['max'])) {
-                $this->_invalidVersion('<dependencies><required><pearinstaller><max>',
-                    $dep['max']);
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['recommended'])) {
-                $this->_invalidVersion('<dependencies><required><pearinstaller><recommended>',
-                    $dep['recommended']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                      $exclude)) {
-                    $this->_invalidVersion('<dependencies><required><pearinstaller><exclude>',
-                        $exclude);
-                }
-            }
-        }
-    }
-
-    function _validatePackageDep($dep, $group, $type = '<package>')
-    {
-        if (isset($dep['uri'])) {
-            if (isset($dep['conflicts'])) {
-                $structure = array(
-                    'name',
-                    'uri',
-                    'conflicts',
-                    '*providesextension',
-                );
-            } else {
-                $structure = array(
-                    'name',
-                    'uri',
-                    '*providesextension',
-                );
-            }
-        } else {
-            if (isset($dep['conflicts'])) {
-                $structure = array(
-                    'name',
-                    'channel',
-                    '*min',
-                    '*max',
-                    '*exclude',
-                    'conflicts',
-                    '*providesextension',
-                );
-            } else {
-                $structure = array(
-                    'name',
-                    'channel',
-                    '*min',
-                    '*max',
-                    '*recommended',
-                    '*exclude',
-                    '*nodefault',
-                    '*providesextension',
-                );
-            }
-        }
-        if (isset($dep['name'])) {
-            $type .= '<name>' . $dep['name'] . '</name>';
-        }
-        $this->_stupidSchemaValidate($structure, $dep, '<dependencies>' . $group . $type);
-        if (isset($dep['uri']) && (isset($dep['min']) || isset($dep['max']) ||
-              isset($dep['recommended']) || isset($dep['exclude']))) {
-            $this->_uriDepsCannotHaveVersioning('<dependencies>' . $group . $type);
-        }
-        if (isset($dep['channel']) && strtolower($dep['channel']) == '__uri') {
-            $this->_DepchannelCannotBeUri('<dependencies>' . $group . $type);
-        }
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['min'])) {
-                $this->_invalidVersion('<dependencies>' . $group . $type . '<min>', $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['max'])) {
-                $this->_invalidVersion('<dependencies>' . $group . $type . '<max>', $dep['max']);
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['recommended'])) {
-                $this->_invalidVersion('<dependencies>' . $group . $type . '<recommended>',
-                    $dep['recommended']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                      $exclude)) {
-                    $this->_invalidVersion('<dependencies>' . $group . $type . '<exclude>',
-                        $exclude);
-                }
-            }
-        }
-    }
-
-    function _validateSubpackageDep($dep, $group)
-    {
-        $this->_validatePackageDep($dep, $group, '<subpackage>');
-        if (isset($dep['providesextension'])) {
-            $this->_subpackageCannotProvideExtension(isset($dep['name']) ? $dep['name'] : '');
-        }
-        if (isset($dep['conflicts'])) {
-            $this->_subpackagesCannotConflict(isset($dep['name']) ? $dep['name'] : '');
-        }
-    }
-
-    function _validateExtensionDep($dep, $group = false, $installcondition = false)
-    {
-        if (isset($dep['conflicts'])) {
-            $structure = array(
-                'name',
-                '*min',
-                '*max',
-                '*exclude',
-                'conflicts',
-            );
-        } else {
-            $structure = array(
-                'name',
-                '*min',
-                '*max',
-                '*recommended',
-                '*exclude',
-            );
-        }
-        if ($installcondition) {
-            $type = '<installcondition><extension>';
-        } else {
-            $type = '<dependencies>' . $group . '<extension>';
-        }
-        if (isset($dep['name'])) {
-            $type .= '<name>' . $dep['name'] . '</name>';
-        }
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-        if (isset($dep['min'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['min'])) {
-                $this->_invalidVersion(substr($type, 1) . '<min', $dep['min']);
-            }
-        }
-        if (isset($dep['max'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['max'])) {
-                $this->_invalidVersion(substr($type, 1) . '<max', $dep['max']);
-            }
-        }
-        if (isset($dep['recommended'])) {
-            if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                  $dep['recommended'])) {
-                $this->_invalidVersion(substr($type, 1) . '<recommended', $dep['recommended']);
-            }
-        }
-        if (isset($dep['exclude'])) {
-            if (!is_array($dep['exclude'])) {
-                $dep['exclude'] = array($dep['exclude']);
-            }
-            foreach ($dep['exclude'] as $exclude) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                      $exclude)) {
-                    $this->_invalidVersion(substr($type, 1) . '<exclude', $exclude);
-                }
-            }
-        }
-    }
-
-    function _validateOsDep($dep, $installcondition = false)
-    {
-        $structure = array(
-            'name',
-            '*conflicts',
-        );
-        $type = $installcondition ? '<installcondition><os>' : '<dependencies><required><os>';
-        if ($this->_stupidSchemaValidate($structure, $dep, $type)) {
-            if ($dep['name'] == '*') {
-                if (array_key_exists('conflicts', $dep)) {
-                    $this->_cannotConflictWithAllOs($type);
-                }
-            }
-        }
-    }
-
-    function _validateArchDep($dep, $installcondition = false)
-    {
-        $structure = array(
-            'pattern',
-            '*conflicts',
-        );
-        $type = $installcondition ? '<installcondition><arch>' : '<dependencies><required><arch>';
-        $this->_stupidSchemaValidate($structure, $dep, $type);
-    }
-
-    function _validateInstallConditions($cond, $release)
-    {
-        $structure = array(
-            '*php',
-            '*extension',
-            '*os',
-            '*arch',
-        );
-        if (!$this->_stupidSchemaValidate($structure,
-              $cond, $release)) {
-            return false;
-        }
-        foreach (array('php', 'extension', 'os', 'arch') as $type) {
-            if (isset($cond[$type])) {
-                $iter = $cond[$type];
-                if (!is_array($iter) || !isset($iter[0])) {
-                    $iter = array($iter);
-                }
-                foreach ($iter as $package) {
-                    if ($type == 'extension') {
-                        $this->{"_validate{$type}Dep"}($package, false, true);
-                    } else {
-                        $this->{"_validate{$type}Dep"}($package, true);
-                    }
-                }
-            }
-        }
-    }
-
-    function _validateDependencies()
-    {
-        $structure = array(
-            'required',
-            '*optional',
-            '*group->name->hint'
-        );
-        if (!$this->_stupidSchemaValidate($structure,
-              $this->_packageInfo['dependencies'], '<dependencies>')) {
-            return false;
-        }
-        foreach (array('required', 'optional') as $simpledep) {
-            if (isset($this->_packageInfo['dependencies'][$simpledep])) {
-                if ($simpledep == 'optional') {
-                    $structure = array(
-                        '*package',
-                        '*subpackage',
-                        '*extension',
-                    );
-                } else {
-                    $structure = array(
-                        'php',
-                        'pearinstaller',
-                        '*package',
-                        '*subpackage',
-                        '*extension',
-                        '*os',
-                        '*arch',
-                    );
-                }
-                if ($this->_stupidSchemaValidate($structure,
-                      $this->_packageInfo['dependencies'][$simpledep],
-                      "<dependencies><$simpledep>")) {
-                    foreach (array('package', 'subpackage', 'extension') as $type) {
-                        if (isset($this->_packageInfo['dependencies'][$simpledep][$type])) {
-                            $iter = $this->_packageInfo['dependencies'][$simpledep][$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                if ($type != 'extension') {
-                                    if (isset($package['uri'])) {
-                                        if (isset($package['channel'])) {
-                                            $this->_UrlOrChannel($type,
-                                                $package['name']);
-                                        }
-                                    } else {
-                                        if (!isset($package['channel'])) {
-                                            $this->_NoChannel($type, $package['name']);
-                                        }
-                                    }
-                                }
-                                $this->{"_validate{$type}Dep"}($package, "<$simpledep>");
-                            }
-                        }
-                    }
-                    if ($simpledep == 'optional') {
-                        continue;
-                    }
-                    foreach (array('php', 'pearinstaller', 'os', 'arch') as $type) {
-                        if (isset($this->_packageInfo['dependencies'][$simpledep][$type])) {
-                            $iter = $this->_packageInfo['dependencies'][$simpledep][$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                $this->{"_validate{$type}Dep"}($package);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (isset($this->_packageInfo['dependencies']['group'])) {
-            $groups = $this->_packageInfo['dependencies']['group'];
-            if (!isset($groups[0])) {
-                $groups = array($groups);
-            }
-            $structure = array(
-                '*package',
-                '*subpackage',
-                '*extension',
-            );
-            foreach ($groups as $group) {
-                if ($this->_stupidSchemaValidate($structure, $group, '<group>')) {
-                    if (!PEAR_Validate::validGroupName($group['attribs']['name'])) {
-                        $this->_invalidDepGroupName($group['attribs']['name']);
-                    }
-                    foreach (array('package', 'subpackage', 'extension') as $type) {
-                        if (isset($group[$type])) {
-                            $iter = $group[$type];
-                            if (!isset($iter[0])) {
-                                $iter = array($iter);
-                            }
-                            foreach ($iter as $package) {
-                                if ($type != 'extension') {
-                                    if (isset($package['uri'])) {
-                                        if (isset($package['channel'])) {
-                                            $this->_UrlOrChannelGroup($type,
-                                                $package['name'],
-                                                $group['name']);
-                                        }
-                                    } else {
-                                        if (!isset($package['channel'])) {
-                                            $this->_NoChannelGroup($type,
-                                                $package['name'],
-                                                $group['name']);
-                                        }
-                                    }
-                                }
-                                $this->{"_validate{$type}Dep"}($package, '<group name="' .
-                                    $group['attribs']['name'] . '">');
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    function _validateCompatible()
-    {
-        $compat = $this->_packageInfo['compatible'];
-        if (!isset($compat[0])) {
-            $compat = array($compat);
-        }
-        $required = array('name', 'channel', 'min', 'max', '*exclude');
-        foreach ($compat as $package) {
-            $type = '<compatible>';
-            if (is_array($package) && array_key_exists('name', $package)) {
-                $type .= '<name>' . $package['name'] . '</name>';
-            }
-            $this->_stupidSchemaValidate($required, $package, $type);
-            if (is_array($package) && array_key_exists('min', $package)) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                      $package['min'])) {
-                    $this->_invalidVersion(substr($type, 1) . '<min', $package['min']);
-                }
-            }
-            if (is_array($package) && array_key_exists('max', $package)) {
-                if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                      $package['max'])) {
-                    $this->_invalidVersion(substr($type, 1) . '<max', $package['max']);
-                }
-            }
-            if (is_array($package) && array_key_exists('exclude', $package)) {
-                if (!is_array($package['exclude'])) {
-                    $package['exclude'] = array($package['exclude']);
-                }
-                foreach ($package['exclude'] as $exclude) {
-                    if (!preg_match('/^\d+(?:\.\d+)*(?:[a-zA-Z]+\d*)?\\z/',
-                          $exclude)) {
-                        $this->_invalidVersion(substr($type, 1) . '<exclude', $exclude);
-                    }
-                }
-            }
-        }
-    }
-
-    function _validateBundle($list)
-    {
-        if (!is_array($list) || !isset($list['bundledpackage'])) {
-            return $this->_NoBundledPackages();
-        }
-        if (!is_array($list['bundledpackage']) || !isset($list['bundledpackage'][0])) {
-            return $this->_AtLeast2BundledPackages();
-        }
-        foreach ($list['bundledpackage'] as $package) {
-            if (!is_string($package)) {
-                $this->_bundledPackagesMustBeFilename();
-            }
-        }
-    }
-
-    function _validateFilelist($list = false, $allowignore = false, $dirs = '')
-    {
-        $iscontents = false;
-        if (!$list) {
-            $iscontents = true;
-            $list = $this->_packageInfo['contents'];
-            if (isset($this->_packageInfo['bundle'])) {
-                return $this->_validateBundle($list);
-            }
-        }
-        if ($allowignore) {
-            $struc = array(
-                '*install->name->as',
-                '*ignore->name'
-            );
-        } else {
-            $struc = array(
-                '*dir->name->?baseinstalldir',
-                '*file->name->role->?baseinstalldir->?md5sum'
-            );
-            if (isset($list['dir']) && isset($list['file'])) {
-                // stave off validation errors without requiring a set order.
-                $_old = $list;
-                if (isset($list['attribs'])) {
-                    $list = array('attribs' => $_old['attribs']);
-                }
-                $list['dir'] = $_old['dir'];
-                $list['file'] = $_old['file'];
-            }
-        }
-        if (!isset($list['attribs']) || !isset($list['attribs']['name'])) {
-            $unknown = $allowignore ? '<filelist>' : '<dir name="*unknown*">';
-            $dirname = $iscontents ? '<contents>' : $unknown;
-        } else {
-            $dirname = '<dir name="' . $list['attribs']['name'] . '">';
-            if (preg_match('~/\.\.?(/|\\z)|^\.\.?/~',
-                          str_replace('\\', '/', $list['attribs']['name']))) {
-                // file contains .. parent directory or . cur directory
-                $this->_invalidDirName($list['attribs']['name']);
-            }
-        }
-        $res = $this->_stupidSchemaValidate($struc, $list, $dirname);
-        if ($allowignore && $res) {
-            $ignored_or_installed = array();
-            $this->_pf->getFilelist();
-            $fcontents = $this->_pf->getContents();
-            $filelist = array();
-            if (!isset($fcontents['dir']['file'][0])) {
-                $fcontents['dir']['file'] = array($fcontents['dir']['file']);
-            }
-            foreach ($fcontents['dir']['file'] as $file) {
-                $filelist[$file['attribs']['name']] = true;
-            }
-            if (isset($list['install'])) {
-                if (!isset($list['install'][0])) {
-                    $list['install'] = array($list['install']);
-                }
-                foreach ($list['install'] as $file) {
-                    if (!isset($filelist[$file['attribs']['name']])) {
-                        $this->_notInContents($file['attribs']['name'], 'install');
-                        continue;
-                    }
-                    if (array_key_exists($file['attribs']['name'], $ignored_or_installed)) {
-                        $this->_multipleInstallAs($file['attribs']['name']);
-                    }
-                    if (!isset($ignored_or_installed[$file['attribs']['name']])) {
-                        $ignored_or_installed[$file['attribs']['name']] = array();
-                    }
-                    $ignored_or_installed[$file['attribs']['name']][] = 1;
-                    if (preg_match('~/\.\.?(/|\\z)|^\.\.?/~',
-                                  str_replace('\\', '/', $file['attribs']['as']))) {
-                        // file contains .. parent directory or . cur directory references
-                        $this->_invalidFileInstallAs($file['attribs']['name'],
-                            $file['attribs']['as']);
-                    }
-                }
-            }
-            if (isset($list['ignore'])) {
-                if (!isset($list['ignore'][0])) {
-                    $list['ignore'] = array($list['ignore']);
-                }
-                foreach ($list['ignore'] as $file) {
-                    if (!isset($filelist[$file['attribs']['name']])) {
-                        $this->_notInContents($file['attribs']['name'], 'ignore');
-                        continue;
-                    }
-                    if (array_key_exists($file['attribs']['name'], $ignored_or_installed)) {
-                        $this->_ignoreAndInstallAs($file['attribs']['name']);
-                    }
-                }
-            }
-        }
-        if (!$allowignore && isset($list['file'])) {
-            if (is_string($list['file'])) {
-                $this->_oldStyleFileNotAllowed();
-                return false;
-            }
-            if (!isset($list['file'][0])) {
-                // single file
-                $list['file'] = array($list['file']);
-            }
-            foreach ($list['file'] as $i => $file)
-            {
-                if (isset($file['attribs']) && isset($file['attribs']['name'])) {
-                    if ($file['attribs']['name']{0} == '.' &&
-                          $file['attribs']['name']{1} == '/') {
-                        // name is something like "./doc/whatever.txt"
-                        $this->_invalidFileName($file['attribs']['name'], $dirname);
-                    }
-                    if (preg_match('~/\.\.?(/|\\z)|^\.\.?/~',
-                                  str_replace('\\', '/', $file['attribs']['name']))) {
-                        // file contains .. parent directory or . cur directory
-                        $this->_invalidFileName($file['attribs']['name'], $dirname);
-                    }
-                }
-                if (isset($file['attribs']) && isset($file['attribs']['role'])) {
-                    if (!$this->_validateRole($file['attribs']['role'])) {
-                        if (isset($this->_packageInfo['usesrole'])) {
-                            $roles = $this->_packageInfo['usesrole'];
-                            if (!isset($roles[0])) {
-                                $roles = array($roles);
-                            }
-                            foreach ($roles as $role) {
-                                if ($role['role'] = $file['attribs']['role']) {
-                                    $msg = 'This package contains role "%role%" and requires ' .
-                                        'package "%package%" to be used';
-                                    if (isset($role['uri'])) {
-                                        $params = array('role' => $role['role'],
-                                            'package' => $role['uri']);
-                                    } else {
-                                        $params = array('role' => $role['role'],
-                                            'package' => $this->_pf->_registry->
-                                            parsedPackageNameToString(array('package' =>
-                                                $role['package'], 'channel' => $role['channel']),
-                                                true));
-                                    }
-                                    $this->_stack->push('_mustInstallRole', 'error', $params, $msg);
-                                }
-                            }
-                        }
-                        $this->_invalidFileRole($file['attribs']['name'],
-                            $dirname, $file['attribs']['role']);
-                    }
-                }
-                if (!isset($file['attribs'])) {
-                    continue;
-                }
-                $save = $file['attribs'];
-                if ($dirs) {
-                    $save['name'] = $dirs . '/' . $save['name'];
-                }
-                unset($file['attribs']);
-                if (count($file) && $this->_curState != PEAR_VALIDATE_DOWNLOADING) { // has tasks
-                    foreach ($file as $task => $value) {
-                        if ($tagClass = $this->_pf->getTask($task)) {
-                            if (!is_array($value) || !isset($value[0])) {
-                                $value = array($value);
-                            }
-                            foreach ($value as $v) {
-                                $ret = call_user_func(array($tagClass, 'validateXml'),
-                                    $this->_pf, $v, $this->_pf->_config, $save);
-                                if (is_array($ret)) {
-                                    $this->_invalidTask($task, $ret, isset($save['name']) ?
-                                        $save['name'] : '');
-                                }
-                            }
-                        } else {
-                            if (isset($this->_packageInfo['usestask'])) {
-                                $roles = $this->_packageInfo['usestask'];
-                                if (!isset($roles[0])) {
-                                    $roles = array($roles);
-                                }
-                                foreach ($roles as $role) {
-                                    if ($role['task'] = $task) {
-                                        $msg = 'This package contains task "%task%" and requires ' .
-                                            'package "%package%" to be used';
-                                        if (isset($role['uri'])) {
-                                            $params = array('task' => $role['task'],
-                                                'package' => $role['uri']);
-                                        } else {
-                                            $params = array('task' => $role['task'],
-                                                'package' => $this->_pf->_registry->
-                                                parsedPackageNameToString(array('package' =>
-                                                    $role['package'], 'channel' => $role['channel']),
-                                                    true));
-                                        }
-                                        $this->_stack->push('_mustInstallTask', 'error',
-                                            $params, $msg);
-                                    }
-                                }
-                            }
-                            $this->_unknownTask($task, $save['name']);
-                        }
-                    }
-                }
-            }
-        }
-        if (isset($list['ignore'])) {
-            if (!$allowignore) {
-                $this->_ignoreNotAllowed('ignore');
-            }
-        }
-        if (isset($list['install'])) {
-            if (!$allowignore) {
-                $this->_ignoreNotAllowed('install');
-            }
-        }
-        if (isset($list['file'])) {
-            if ($allowignore) {
-                $this->_fileNotAllowed('file');
-            }
-        }
-        if (isset($list['dir'])) {
-            if ($allowignore) {
-                $this->_fileNotAllowed('dir');
-            } else {
-                if (!isset($list['dir'][0])) {
-                    $list['dir'] = array($list['dir']);
-                }
-                foreach ($list['dir'] as $dir) {
-                    if (isset($dir['attribs']) && isset($dir['attribs']['name'])) {
-                        if ($dir['attribs']['name'] == '/' ||
-                              !isset($this->_packageInfo['contents']['dir']['dir'])) {
-                            // always use nothing if the filelist has already been flattened
-                            $newdirs = '';
-                        } elseif ($dirs == '') {
-                            $newdirs = $dir['attribs']['name'];
-                        } else {
-                            $newdirs = $dirs . '/' . $dir['attribs']['name'];
-                        }
-                    } else {
-                        $newdirs = $dirs;
-                    }
-                    $this->_validateFilelist($dir, $allowignore, $newdirs);
-                }
-            }
-        }
-    }
-
-    function _validateRelease()
-    {
-        if (isset($this->_packageInfo['phprelease'])) {
-            $release = 'phprelease';
-            if (isset($this->_packageInfo['providesextension'])) {
-                $this->_cannotProvideExtension($release);
-            }
-            if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                $this->_cannotHaveSrcpackage($release);
-            }
-            $releases = $this->_packageInfo['phprelease'];
-            if (!is_array($releases)) {
-                return true;
-            }
-            if (!isset($releases[0])) {
-                $releases = array($releases);
-            }
-            foreach ($releases as $rel) {
-                $this->_stupidSchemaValidate(array(
-                    '*installconditions',
-                    '*filelist',
-                ), $rel, '<phprelease>');
-            }
-        }
-        foreach (array('', 'zend') as $prefix) {
-            $releasetype = $prefix . 'extsrcrelease';
-            if (isset($this->_packageInfo[$releasetype])) {
-                $release = $releasetype;
-                if (!isset($this->_packageInfo['providesextension'])) {
-                    $this->_mustProvideExtension($release);
-                }
-                if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                    $this->_cannotHaveSrcpackage($release);
-                }
-                $releases = $this->_packageInfo[$releasetype];
-                if (!is_array($releases)) {
-                    return true;
-                }
-                if (!isset($releases[0])) {
-                    $releases = array($releases);
-                }
-                foreach ($releases as $rel) {
-                    $this->_stupidSchemaValidate(array(
-                        '*installconditions',
-                        '*configureoption->name->prompt->?default',
-                        '*binarypackage',
-                        '*filelist',
-                    ), $rel, '<' . $releasetype . '>');
-                    if (isset($rel['binarypackage'])) {
-                        if (!is_array($rel['binarypackage']) || !isset($rel['binarypackage'][0])) {
-                            $rel['binarypackage'] = array($rel['binarypackage']);
-                        }
-                        foreach ($rel['binarypackage'] as $bin) {
-                            if (!is_string($bin)) {
-                                $this->_binaryPackageMustBePackagename();
-                            }
-                        }
-                    }
-                }
-            }
-            $releasetype = 'extbinrelease';
-            if (isset($this->_packageInfo[$releasetype])) {
-                $release = $releasetype;
-                if (!isset($this->_packageInfo['providesextension'])) {
-                    $this->_mustProvideExtension($release);
-                }
-                if (isset($this->_packageInfo['channel']) &&
-                      !isset($this->_packageInfo['srcpackage'])) {
-                    $this->_mustSrcPackage($release);
-                }
-                if (isset($this->_packageInfo['uri']) && !isset($this->_packageInfo['srcuri'])) {
-                    $this->_mustSrcuri($release);
-                }
-                $releases = $this->_packageInfo[$releasetype];
-                if (!is_array($releases)) {
-                    return true;
-                }
-                if (!isset($releases[0])) {
-                    $releases = array($releases);
-                }
-                foreach ($releases as $rel) {
-                    $this->_stupidSchemaValidate(array(
-                        '*installconditions',
-                        '*filelist',
-                    ), $rel, '<' . $releasetype . '>');
-                }
-            }
-        }
-        if (isset($this->_packageInfo['bundle'])) {
-            $release = 'bundle';
-            if (isset($this->_packageInfo['providesextension'])) {
-                $this->_cannotProvideExtension($release);
-            }
-            if (isset($this->_packageInfo['srcpackage']) || isset($this->_packageInfo['srcuri'])) {
-                $this->_cannotHaveSrcpackage($release);
-            }
-            $releases = $this->_packageInfo['bundle'];
-            if (!is_array($releases) || !isset($releases[0])) {
-                $releases = array($releases);
-            }
-            foreach ($releases as $rel) {
-                $this->_stupidSchemaValidate(array(
-                    '*installconditions',
-                    '*filelist',
-                ), $rel, '<bundle>');
-            }
-        }
-        foreach ($releases as $rel) {
-            if (is_array($rel) && array_key_exists('installconditions', $rel)) {
-                $this->_validateInstallConditions($rel['installconditions'],
-                    "<$release><installconditions>");
-            }
-            if (is_array($rel) && array_key_exists('filelist', $rel)) {
-                if ($rel['filelist']) {
-
-                    $this->_validateFilelist($rel['filelist'], true);
-                }
-            }
-        }
-    }
-
-    /**
-     * This is here to allow role extension through plugins
-     * @param string
-     */
-    function _validateRole($role)
-    {
-        return in_array($role, PEAR_Installer_Role::getValidRoles($this->_pf->getPackageType()));
-    }
-
-    function _pearVersionTooLow($version)
-    {
-        $this->_stack->push(__FUNCTION__, 'error',
-            array('version' => $version),
-            'This package.xml requires PEAR version %version% to parse properly, we are ' .
-            'version 1.9.1');
-    }
-
-    function _invalidTagOrder($oktags, $actual, $root)
-    {
-        $this->_stack->push(__FUNCTION__, 'error',
-            array('oktags' => $oktags, 'actual' => $actual, 'root' => $root),
-            'Invalid tag order in %root%, found <%actual%> expected one of "%oktags%"');
-    }
-
-    function _ignoreNotAllowed($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '<%type%> is not allowed inside global <contents>, only inside ' .
-            '<phprelease>/<extbinrelease>/<zendextbinrelease>, use <dir> and <file> only');
-    }
-
-    function _fileNotAllowed($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '<%type%> is not allowed inside release <filelist>, only inside ' .
-            '<contents>, use <ignore> and <install> only');
-    }
-
-    function _oldStyleFileNotAllowed()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'Old-style <file>name</file> is not allowed.  Use' .
-            '<file name="name" role="role"/>');
-    }
-
-    function _tagMissingAttribute($tag, $attr, $context)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag,
-            'attribute' => $attr, 'context' => $context),
-            'tag <%tag%> in context "%context%" has no attribute "%attribute%"');
-    }
-
-    function _tagHasNoAttribs($tag, $context)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag,
-            'context' => $context),
-            'tag <%tag%> has no attributes in context "%context%"');
-    }
-
-    function _invalidInternalStructure()
-    {
-        $this->_stack->push(__FUNCTION__, 'exception', array(),
-            'internal array was not generated by compatible parser, or extreme parser error, cannot continue');
-    }
-
-    function _invalidFileRole($file, $dir, $role)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'file' => $file, 'dir' => $dir, 'role' => $role,
-            'roles' => PEAR_Installer_Role::getValidRoles($this->_pf->getPackageType())),
-            'File "%file%" in directory "%dir%" has invalid role "%role%", should be one of %roles%');
-    }
-
-    function _invalidFileName($file, $dir)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'file' => $file),
-            'File "%file%" in directory "%dir%" cannot begin with "./" or contain ".."');
-    }
-
-    function _invalidFileInstallAs($file, $as)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'file' => $file, 'as' => $as),
-            'File "%file%" <install as="%as%"/> cannot contain "./" or contain ".."');
-    }
-
-    function _invalidDirName($dir)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(
-            'dir' => $file),
-            'Directory "%dir%" cannot begin with "./" or contain ".."');
-    }
-
-    function _filelistCannotContainFile($filelist)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $filelist),
-            '<%tag%> can only contain <dir>, contains <file>.  Use ' .
-            '<dir name="/"> as the first dir element');
-    }
-
-    function _filelistMustContainDir($filelist)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $filelist),
-            '<%tag%> must contain <dir>.  Use <dir name="/"> as the ' .
-            'first dir element');
-    }
-
-    function _tagCannotBeEmpty($tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag),
-            '<%tag%> cannot be empty (<%tag%/>)');
-    }
-
-    function _UrlOrChannel($type, $name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name),
-            'Required dependency <%type%> "%name%" can have either url OR ' .
-            'channel attributes, and not both');
-    }
-
-    function _NoChannel($type, $name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name),
-            'Required dependency <%type%> "%name%" must have either url OR ' .
-            'channel attributes');
-    }
-
-    function _UrlOrChannelGroup($type, $name, $group)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name, 'group' => $group),
-            'Group "%group%" dependency <%type%> "%name%" can have either url OR ' .
-            'channel attributes, and not both');
-    }
-
-    function _NoChannelGroup($type, $name, $group)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type,
-            'name' => $name, 'group' => $group),
-            'Group "%group%" dependency <%type%> "%name%" must have either url OR ' .
-            'channel attributes');
-    }
-
-    function _unknownChannel($channel)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('channel' => $channel),
-            'Unknown channel "%channel%"');
-    }
-
-    function _noPackageVersion()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'package.xml <package> tag has no version attribute, or version is not 2.0');
-    }
-
-    function _NoBundledPackages()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'No <bundledpackage> tag was found in <contents>, required for bundle packages');
-    }
-
-    function _AtLeast2BundledPackages()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'At least 2 packages must be bundled in a bundle package');
-    }
-
-    function _ChannelOrUri($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Bundled package "%name%" can have either a uri or a channel, not both');
-    }
-
-    function _noChildTag($child, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('child' => $child, 'tag' => $tag),
-            'Tag <%tag%> is missing child tag <%child%>');
-    }
-
-    function _invalidVersion($type, $value)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type, 'value' => $value),
-            'Version type <%type%> is not a valid version (%value%)');
-    }
-
-    function _invalidState($type, $value)
-    {
-        $states = array('stable', 'beta', 'alpha', 'devel');
-        if ($type != 'api') {
-            $states[] = 'snapshot';
-        }
-        if (strtolower($value) == 'rc') {
-            $this->_stack->push(__FUNCTION__, 'error',
-                array('version' => $this->_packageInfo['version']['release']),
-                'RC is not a state, it is a version postfix, try %version%RC1, stability beta');
-        }
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type, 'value' => $value,
-            'types' => $states),
-            'Stability type <%type%> is not a valid stability (%value%), must be one of ' .
-            '%types%');
-    }
-
-    function _invalidTask($task, $ret, $file)
-    {
-        switch ($ret[0]) {
-            case PEAR_TASK_ERROR_MISSING_ATTRIB :
-                $info = array('attrib' => $ret[1], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> is missing attribute "%attrib%" in file %file%';
-            break;
-            case PEAR_TASK_ERROR_NOATTRIBS :
-                $info = array('task' => $task, 'file' => $file);
-                $msg = 'task <%task%> has no attributes in file %file%';
-            break;
-            case PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE :
-                $info = array('attrib' => $ret[1], 'values' => $ret[3],
-                    'was' => $ret[2], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> attribute "%attrib%" has the wrong value "%was%" '.
-                    'in file %file%, expecting one of "%values%"';
-            break;
-            case PEAR_TASK_ERROR_INVALID :
-                $info = array('reason' => $ret[1], 'task' => $task, 'file' => $file);
-                $msg = 'task <%task%> in file %file% is invalid because of "%reason%"';
-            break;
-        }
-        $this->_stack->push(__FUNCTION__, 'error', $info, $msg);
-    }
-
-    function _unknownTask($task, $file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('task' => $task, 'file' => $file),
-            'Unknown task "%task%" passed in file <file name="%file%">');
-    }
-
-    function _subpackageCannotProvideExtension($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Subpackage dependency "%name%" cannot use <providesextension>, ' .
-            'only package dependencies can use this tag');
-    }
-
-    function _subpackagesCannotConflict($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Subpackage dependency "%name%" cannot use <conflicts/>, ' .
-            'only package dependencies can use this tag');
-    }
-
-    function _cannotProvideExtension($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages cannot use <providesextension>, only extbinrelease, extsrcrelease, zendextsrcrelease, and zendextbinrelease can provide a PHP extension');
-    }
-
-    function _mustProvideExtension($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages must use <providesextension> to indicate which PHP extension is provided');
-    }
-
-    function _cannotHaveSrcpackage($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<%release%> packages cannot specify a source code package, only extension binaries may use the <srcpackage> tag');
-    }
-
-    function _mustSrcPackage($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<extbinrelease>/<zendextbinrelease> packages must specify a source code package with <srcpackage>');
-    }
-
-    function _mustSrcuri($release)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('release' => $release),
-            '<extbinrelease>/<zendextbinrelease> packages must specify a source code package with <srcuri>');
-    }
-
-    function _uriDepsCannotHaveVersioning($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: dependencies with a <uri> tag cannot have any versioning information');
-    }
-
-    function _conflictingDepsCannotHaveVersioning($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: conflicting dependencies cannot have versioning info, use <exclude> to ' .
-            'exclude specific versions of a dependency');
-    }
-
-    function _DepchannelCannotBeUri($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('type' => $type),
-            '%type%: channel cannot be __uri, this is a pseudo-channel reserved for uri ' .
-            'dependencies only');
-    }
-
-    function _bundledPackagesMustBeFilename()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            '<bundledpackage> tags must contain only the filename of a package release ' .
-            'in the bundle');
-    }
-
-    function _binaryPackageMustBePackagename()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            '<binarypackage> tags must contain the name of a package that is ' .
-            'a compiled version of this extsrc/zendextsrc package');
-    }
-
-    function _fileNotFound($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'File "%file%" in package.xml does not exist');
-    }
-
-    function _notInContents($file, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file, 'tag' => $tag),
-            '<%tag% name="%file%"> is invalid, file is not in <contents>');
-    }
-
-    function _cannotValidateNoPathSet()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'Cannot validate files, no path to package file is set (use setPackageFile())');
-    }
-
-    function _usesroletaskMustHaveChannelOrUri($role, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('role' => $role, 'tag' => $tag),
-            '<%tag%> for role "%role%" must contain either <uri>, or <channel> and <package>');
-    }
-
-    function _usesroletaskMustHavePackage($role, $tag)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('role' => $role, 'tag' => $tag),
-            '<%tag%> for role "%role%" must contain <package>');
-    }
-
-    function _usesroletaskMustHaveRoleTask($tag, $type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag, 'type' => $type),
-            '<%tag%> must contain <%type%> defining the %type% to be used');
-    }
-
-    function _cannotConflictWithAllOs($type)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag),
-            '%tag% cannot conflict with all OSes');
-    }
-
-    function _invalidDepGroupName($name)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('name' => $name),
-            'Invalid dependency group name "%name%"');
-    }
-
-    function _multipleToplevelDirNotAllowed()
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array(),
-            'Multiple top-level <dir> tags are not allowed.  Enclose them ' .
-                'in a <dir name="/">');
-    }
-
-    function _multipleInstallAs($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'Only one <install> tag is allowed for file "%file%"');
-    }
-
-    function _ignoreAndInstallAs($file)
-    {
-        $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-            'Cannot have both <ignore> and <install> tags for file "%file%"');
-    }
-
-    function _analyzeBundledPackages()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!$this->_pf->getPackageType() == 'bundle') {
-            return false;
-        }
-        if (!isset($this->_pf->_packageFile)) {
-            return false;
-        }
-        $dir_prefix = dirname($this->_pf->_packageFile);
-        $common = new PEAR_Common;
-        $log = isset($this->_pf->_logger) ? array(&$this->_pf->_logger, 'log') :
-            array($common, 'log');
-        $info = $this->_pf->getContents();
-        $info = $info['bundledpackage'];
-        if (!is_array($info)) {
-            $info = array($info);
-        }
-        $pkg = &new PEAR_PackageFile($this->_pf->_config);
-        foreach ($info as $package) {
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $package)) {
-                $this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $package);
-                $this->_isValid = 0;
-                continue;
-            }
-            call_user_func_array($log, array(1, "Analyzing bundled package $package"));
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $ret = $pkg->fromAnyFile($dir_prefix . DIRECTORY_SEPARATOR . $package,
-                PEAR_VALIDATE_NORMAL);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($ret)) {
-                call_user_func_array($log, array(0, "ERROR: package $package is not a valid " .
-                    'package'));
-                $inf = $ret->getUserInfo();
-                if (is_array($inf)) {
-                    foreach ($inf as $err) {
-                        call_user_func_array($log, array(1, $err['message']));
-                    }
-                }
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function _analyzePhpFiles()
-    {
-        if (!$this->_isValid) {
-            return false;
-        }
-        if (!isset($this->_pf->_packageFile)) {
-            $this->_cannotValidateNoPathSet();
-            return false;
-        }
-        $dir_prefix = dirname($this->_pf->_packageFile);
-        $common = new PEAR_Common;
-        $log = isset($this->_pf->_logger) ? array(&$this->_pf->_logger, 'log') :
-            array(&$common, 'log');
-        $info = $this->_pf->getContents();
-        if (!$info || !isset($info['dir']['file'])) {
-            $this->_tagCannotBeEmpty('contents><dir');
-            return false;
-        }
-        $info = $info['dir']['file'];
-        if (isset($info['attribs'])) {
-            $info = array($info);
-        }
-        $provides = array();
-        foreach ($info as $fa) {
-            $fa = $fa['attribs'];
-            $file = $fa['name'];
-            if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $file)) {
-                $this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                $this->_isValid = 0;
-                continue;
-            }
-            if (in_array($fa['role'], PEAR_Installer_Role::getPhpRoles()) && $dir_prefix) {
-                call_user_func_array($log, array(1, "Analyzing $file"));
-                $srcinfo = $this->analyzeSourceCode($dir_prefix . DIRECTORY_SEPARATOR . $file);
-                if ($srcinfo) {
-                    $provides = array_merge($provides, $this->_buildProvidesArray($srcinfo));
-                }
-            }
-        }
-        $this->_packageName = $pn = $this->_pf->getPackage();
-        $pnl = strlen($pn);
-        foreach ($provides as $key => $what) {
-            if (isset($what['explicit']) || !$what) {
-                // skip conformance checks if the provides entry is
-                // specified in the package.xml file
-                continue;
-            }
-            extract($what);
-            if ($type == 'class') {
-                if (!strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $this->_stack->push(__FUNCTION__, 'warning',
-                    array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn),
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"');
-            } elseif ($type == 'function') {
-                if (strstr($name, '::') || !strncasecmp($name, $pn, $pnl)) {
-                    continue;
-                }
-                $this->_stack->push(__FUNCTION__, 'warning',
-                    array('file' => $file, 'type' => $type, 'name' => $name, 'package' => $pn),
-                    'in %file%: %type% "%name%" not prefixed with package name "%package%"');
-            }
-        }
-        return $this->_isValid;
-    }
-
-    /**
-     * Analyze the source code of the given PHP file
-     *
-     * @param  string Filename of the PHP file
-     * @param  boolean whether to analyze $file as the file contents
-     * @return mixed
-     */
-    function analyzeSourceCode($file, $string = false)
-    {
-        if (!function_exists("token_get_all")) {
-            $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-                'Parser error: token_get_all() function must exist to analyze source code, PHP may have been compiled with --disable-tokenizer');
-            return false;
-        }
-
-        if (!defined('T_DOC_COMMENT')) {
-            define('T_DOC_COMMENT', T_COMMENT);
-        }
-
-        if (!defined('T_INTERFACE')) {
-            define('T_INTERFACE', -1);
-        }
-
-        if (!defined('T_IMPLEMENTS')) {
-            define('T_IMPLEMENTS', -1);
-        }
-
-        if ($string) {
-            $contents = $file;
-        } else {
-            if (!$fp = @fopen($file, "r")) {
-                return false;
-            }
-            fclose($fp);
-            $contents = file_get_contents($file);
-        }
-
-        // Silence this function so we can catch PHP Warnings and show our own custom message
-        $tokens = @token_get_all($contents);
-        if (isset($php_errormsg)) {
-            if (isset($this->_stack)) {
-                $pn = $this->_pf->getPackage();
-                $this->_stack->push(__FUNCTION__, 'warning',
-                        array('file' => $file, 'package' => $pn),
-                        'in %file%: Could not process file for unkown reasons,' .
-                        ' possibly a PHP parse error in %file% from %package%');
-            }
-        }
-/*
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            @list($token, $data) = $tokens[$i];
-            if (is_string($token)) {
-                var_dump($token);
-            } else {
-                print token_name($token) . ' ';
-                var_dump(rtrim($data));
-            }
-        }
-*/
-        $look_for = 0;
-        $paren_level = 0;
-        $bracket_level = 0;
-        $brace_level = 0;
-        $lastphpdoc = '';
-        $current_class = '';
-        $current_interface = '';
-        $current_class_level = -1;
-        $current_function = '';
-        $current_function_level = -1;
-        $declared_classes = array();
-        $declared_interfaces = array();
-        $declared_functions = array();
-        $declared_methods = array();
-        $used_classes = array();
-        $used_functions = array();
-        $extends = array();
-        $implements = array();
-        $nodeps = array();
-        $inquote = false;
-        $interface = false;
-        for ($i = 0; $i < sizeof($tokens); $i++) {
-            if (is_array($tokens[$i])) {
-                list($token, $data) = $tokens[$i];
-            } else {
-                $token = $tokens[$i];
-                $data = '';
-            }
-
-            if ($inquote) {
-                if ($token != '"' && $token != T_END_HEREDOC) {
-                    continue;
-                } else {
-                    $inquote = false;
-                    continue;
-                }
-            }
-
-            switch ($token) {
-                case T_WHITESPACE :
-                    continue;
-                case ';':
-                    if ($interface) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    break;
-                case '"':
-                case T_START_HEREDOC:
-                    $inquote = true;
-                    break;
-                case T_CURLY_OPEN:
-                case T_DOLLAR_OPEN_CURLY_BRACES:
-                case '{': $brace_level++; continue 2;
-                case '}':
-                    $brace_level--;
-                    if ($current_class_level == $brace_level) {
-                        $current_class = '';
-                        $current_class_level = -1;
-                    }
-                    if ($current_function_level == $brace_level) {
-                        $current_function = '';
-                        $current_function_level = -1;
-                    }
-                    continue 2;
-                case '[': $bracket_level++; continue 2;
-                case ']': $bracket_level--; continue 2;
-                case '(': $paren_level++;   continue 2;
-                case ')': $paren_level--;   continue 2;
-                case T_INTERFACE:
-                    $interface = true;
-                case T_CLASS:
-                    if (($current_class_level != -1) || ($current_function_level != -1)) {
-                        if (isset($this->_stack)) {
-                            $this->_stack->push(__FUNCTION__, 'error', array('file' => $file),
-                            'Parser error: invalid PHP found in file "%file%"');
-                        } else {
-                            PEAR::raiseError("Parser error: invalid PHP found in file \"$file\"",
-                                PEAR_COMMON_ERROR_INVALIDPHP);
-                        }
-
-                        return false;
-                    }
-                case T_FUNCTION:
-                case T_NEW:
-                case T_EXTENDS:
-                case T_IMPLEMENTS:
-                    $look_for = $token;
-                    continue 2;
-                case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw')
-                                 )
-                        ) {
-                            if (isset($this->_stack)) {
-                                $this->_stack->push(__FUNCTION__, 'warning', array(
-                                    'file' => $file),
-                                    'Error, PHP5 token encountered in %file%,' .
-                                    ' analysis should be in PHP5');
-                            } else {
-                                PEAR::raiseError('Error: PHP5 token encountered in ' . $file .
-                                    'packaging should be done in PHP 5');
-                                return false;
-                            }
-                        }
-                    }
-
-                    if ($look_for == T_CLASS) {
-                        $current_class = $data;
-                        $current_class_level = $brace_level;
-                        $declared_classes[] = $current_class;
-                    } elseif ($look_for == T_INTERFACE) {
-                        $current_interface = $data;
-                        $current_class_level = $brace_level;
-                        $declared_interfaces[] = $current_interface;
-                    } elseif ($look_for == T_IMPLEMENTS) {
-                        $implements[$current_class] = $data;
-                    } elseif ($look_for == T_EXTENDS) {
-                        $extends[$current_class] = $data;
-                    } elseif ($look_for == T_FUNCTION) {
-                        if ($current_class) {
-                            $current_function = "$current_class::$data";
-                            $declared_methods[$current_class][] = $data;
-                        } elseif ($current_interface) {
-                            $current_function = "$current_interface::$data";
-                            $declared_methods[$current_interface][] = $data;
-                        } else {
-                            $current_function = $data;
-                            $declared_functions[] = $current_function;
-                        }
-
-                        $current_function_level = $brace_level;
-                        $m = array();
-                    } elseif ($look_for == T_NEW) {
-                        $used_classes[$data] = true;
-                    }
-
-                    $look_for = 0;
-                    continue 2;
-                case T_VARIABLE:
-                    $look_for = 0;
-                    continue 2;
-                case T_DOC_COMMENT:
-                case T_COMMENT:
-                    if (preg_match('!^/\*\*\s!', $data)) {
-                        $lastphpdoc = $data;
-                        if (preg_match_all('/@nodep\s+(\S+)/', $lastphpdoc, $m)) {
-                            $nodeps = array_merge($nodeps, $m[1]);
-                        }
-                    }
-                    continue 2;
-                case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
-                        if (isset($this->_stack)) {
-                            $this->_stack->push(__FUNCTION__, 'warning', array('file' => $file),
-                                'Parser error: invalid PHP found in file "%file%"');
-                        } else {
-                            PEAR::raiseError("Parser error: invalid PHP found in file \"$file\"",
-                                PEAR_COMMON_ERROR_INVALIDPHP);
-                        }
-
-                        return false;
-                    }
-
-                    $class = $tokens[$i - 1][1];
-                    if (strtolower($class) != 'parent') {
-                        $used_classes[$class] = true;
-                    }
-
-                    continue 2;
-            }
-        }
-
-        return array(
-            "source_file" => $file,
-            "declared_classes" => $declared_classes,
-            "declared_interfaces" => $declared_interfaces,
-            "declared_methods" => $declared_methods,
-            "declared_functions" => $declared_functions,
-            "used_classes" => array_diff(array_keys($used_classes), $nodeps),
-            "inheritance" => $extends,
-            "implements" => $implements,
-        );
-    }
-
-    /**
-     * Build a "provides" array from data returned by
-     * analyzeSourceCode().  The format of the built array is like
-     * this:
-     *
-     *  array(
-     *    'class;MyClass' => 'array('type' => 'class', 'name' => 'MyClass'),
-     *    ...
-     *  )
-     *
-     *
-     * @param array $srcinfo array with information about a source file
-     * as returned by the analyzeSourceCode() method.
-     *
-     * @return void
-     *
-     * @access private
-     *
-     */
-    function _buildProvidesArray($srcinfo)
-    {
-        if (!$this->_isValid) {
-            return array();
-        }
-
-        $providesret = array();
-        $file        = basename($srcinfo['source_file']);
-        $pn          = isset($this->_pf) ? $this->_pf->getPackage() : '';
-        $pnl         = strlen($pn);
-        foreach ($srcinfo['declared_classes'] as $class) {
-            $key = "class;$class";
-            if (isset($providesret[$key])) {
-                continue;
-            }
-
-            $providesret[$key] =
-                array('file'=> $file, 'type' => 'class', 'name' => $class);
-            if (isset($srcinfo['inheritance'][$class])) {
-                $providesret[$key]['extends'] =
-                    $srcinfo['inheritance'][$class];
-            }
-        }
-
-        foreach ($srcinfo['declared_methods'] as $class => $methods) {
-            foreach ($methods as $method) {
-                $function = "$class::$method";
-                $key = "function;$function";
-                if ($method{0} == '_' || !strcasecmp($method, $class) ||
-                    isset($providesret[$key])) {
-                    continue;
-                }
-
-                $providesret[$key] =
-                    array('file'=> $file, 'type' => 'function', 'name' => $function);
-            }
-        }
-
-        foreach ($srcinfo['declared_functions'] as $function) {
-            $key = "function;$function";
-            if ($function{0} == '_' || isset($providesret[$key])) {
-                continue;
-            }
-
-            if (!strstr($function, '::') && strncasecmp($function, $pn, $pnl)) {
-                $warnings[] = "in1 " . $file . ": function \"$function\" not prefixed with package name \"$pn\"";
-            }
-
-            $providesret[$key] =
-                array('file'=> $file, 'type' => 'function', 'name' => $function);
-        }
-
-        return $providesret;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/PackageFile/v2/rw.php b/airtime_mvc/library/pear/PEAR/PackageFile/v2/rw.php
deleted file mode 100644
index d0a6d1fe7..000000000
--- a/airtime_mvc/library/pear/PEAR/PackageFile/v2/rw.php
+++ /dev/null
@@ -1,1604 +0,0 @@
-<?php
-/**
- * PEAR_PackageFile_v2, package.xml version 2.0, read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a8
- */
-/**
- * For base class
- */
-require_once 'PEAR/PackageFile/v2.php';
-/**
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a8
- */
-class PEAR_PackageFile_v2_rw extends PEAR_PackageFile_v2
-{
-    /**
-     * @param string Extension name
-     * @return bool success of operation
-     */
-    function setProvidesExtension($extension)
-    {
-        if (in_array($this->getPackageType(),
-              array('extsrc', 'extbin', 'zendextsrc', 'zendextbin'))) {
-            if (!isset($this->_packageInfo['providesextension'])) {
-                // ensure that the channel tag is set up in the right location
-                $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                    array('usesrole', 'usestask', 'srcpackage', 'srcuri', 'phprelease',
-                    'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                    'bundle', 'changelog'),
-                    $extension, 'providesextension');
-            }
-            $this->_packageInfo['providesextension'] = $extension;
-            return true;
-        }
-        return false;
-    }
-
-    function setPackage($package)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['attribs'])) {
-            $this->_packageInfo = array_merge(array('attribs' => array(
-                                 'version' => '2.0',
-                                 'xmlns' => 'http://pear.php.net/dtd/package-2.0',
-                                 'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                                 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                                 'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd',
-                             )), $this->_packageInfo);
-        }
-        if (!isset($this->_packageInfo['name'])) {
-            return $this->_packageInfo = array_merge(array('name' => $package),
-                $this->_packageInfo);
-        }
-        $this->_packageInfo['name'] = $package;
-    }
-
-    /**
-     * set this as a package.xml version 2.1
-     * @access private
-     */
-    function _setPackageVersion2_1()
-    {
-        $info = array(
-                                 'version' => '2.1',
-                                 'xmlns' => 'http://pear.php.net/dtd/package-2.1',
-                                 'xmlns:tasks' => 'http://pear.php.net/dtd/tasks-1.0',
-                                 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                                 'xsi:schemaLocation' => 'http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.1
-    http://pear.php.net/dtd/package-2.1.xsd',
-                             );
-        if (!isset($this->_packageInfo['attribs'])) {
-            $this->_packageInfo = array_merge(array('attribs' => $info), $this->_packageInfo);
-        } else {
-            $this->_packageInfo['attribs'] = $info;
-        }
-    }
-
-    function setUri($uri)
-    {
-        unset($this->_packageInfo['channel']);
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['uri'])) {
-            // ensure that the uri tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('extends', 'summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $uri, 'uri');
-        }
-        $this->_packageInfo['uri'] = $uri;
-    }
-
-    function setChannel($channel)
-    {
-        unset($this->_packageInfo['uri']);
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['channel'])) {
-            // ensure that the channel tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('extends', 'summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $channel, 'channel');
-        }
-        $this->_packageInfo['channel'] = $channel;
-    }
-
-    function setExtends($extends)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['extends'])) {
-            // ensure that the extends tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('summary', 'description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $extends, 'extends');
-        }
-        $this->_packageInfo['extends'] = $extends;
-    }
-
-    function setSummary($summary)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['summary'])) {
-            // ensure that the summary tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('description', 'lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $summary, 'summary');
-        }
-        $this->_packageInfo['summary'] = $summary;
-    }
-
-    function setDescription($desc)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['description'])) {
-            // ensure that the description tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('lead',
-                'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                'stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $desc, 'description');
-        }
-        $this->_packageInfo['description'] = $desc;
-    }
-
-    /**
-     * Adds a new maintainer - no checking of duplicates is performed, use
-     * updatemaintainer for that purpose.
-     */
-    function addMaintainer($role, $handle, $name, $email, $active = 'yes')
-    {
-        if (!in_array($role, array('lead', 'developer', 'contributor', 'helper'))) {
-            return false;
-        }
-        if (isset($this->_packageInfo[$role])) {
-            if (!isset($this->_packageInfo[$role][0])) {
-                $this->_packageInfo[$role] = array($this->_packageInfo[$role]);
-            }
-            $this->_packageInfo[$role][] =
-                array(
-                    'name' => $name,
-                    'user' => $handle,
-                    'email' => $email,
-                    'active' => $active,
-                );
-        } else {
-            $testarr = array('lead',
-                    'developer', 'contributor', 'helper', 'date', 'time', 'version',
-                    'stability', 'license', 'notes', 'contents', 'compatible',
-                    'dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                    'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog');
-            foreach (array('lead', 'developer', 'contributor', 'helper') as $testrole) {
-                array_shift($testarr);
-                if ($role == $testrole) {
-                    break;
-                }
-            }
-            if (!isset($this->_packageInfo[$role])) {
-                // ensure that the extends tag is set up in the right location
-                $this->_packageInfo = $this->_insertBefore($this->_packageInfo, $testarr,
-                    array(), $role);
-            }
-            $this->_packageInfo[$role] =
-                array(
-                    'name' => $name,
-                    'user' => $handle,
-                    'email' => $email,
-                    'active' => $active,
-                );
-        }
-        $this->_isValid = 0;
-    }
-
-    function updateMaintainer($newrole, $handle, $name, $email, $active = 'yes')
-    {
-        $found = false;
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            if (!isset($this->_packageInfo[$role])) {
-                continue;
-            }
-            $info = $this->_packageInfo[$role];
-            if (!isset($info[0])) {
-                if ($info['user'] == $handle) {
-                    $found = true;
-                    break;
-                }
-            }
-            foreach ($info as $i => $maintainer) {
-                if ($maintainer['user'] == $handle) {
-                    $found = $i;
-                    break 2;
-                }
-            }
-        }
-        if ($found === false) {
-            return $this->addMaintainer($newrole, $handle, $name, $email, $active);
-        }
-        if ($found !== false) {
-            if ($found === true) {
-                unset($this->_packageInfo[$role]);
-            } else {
-                unset($this->_packageInfo[$role][$found]);
-                $this->_packageInfo[$role] = array_values($this->_packageInfo[$role]);
-            }
-        }
-        $this->addMaintainer($newrole, $handle, $name, $email, $active);
-        $this->_isValid = 0;
-    }
-
-    function deleteMaintainer($handle)
-    {
-        $found = false;
-        foreach (array('lead', 'developer', 'contributor', 'helper') as $role) {
-            if (!isset($this->_packageInfo[$role])) {
-                continue;
-            }
-            if (!isset($this->_packageInfo[$role][0])) {
-                $this->_packageInfo[$role] = array($this->_packageInfo[$role]);
-            }
-            foreach ($this->_packageInfo[$role] as $i => $maintainer) {
-                if ($maintainer['user'] == $handle) {
-                    $found = $i;
-                    break;
-                }
-            }
-            if ($found !== false) {
-                unset($this->_packageInfo[$role][$found]);
-                if (!count($this->_packageInfo[$role]) && $role == 'lead') {
-                    $this->_isValid = 0;
-                }
-                if (!count($this->_packageInfo[$role])) {
-                    unset($this->_packageInfo[$role]);
-                    return true;
-                }
-                $this->_packageInfo[$role] =
-                    array_values($this->_packageInfo[$role]);
-                if (count($this->_packageInfo[$role]) == 1) {
-                    $this->_packageInfo[$role] = $this->_packageInfo[$role][0];
-                }
-                return true;
-            }
-            if (count($this->_packageInfo[$role]) == 1) {
-                $this->_packageInfo[$role] = $this->_packageInfo[$role][0];
-            }
-        }
-        return false;
-    }
-
-    function setReleaseVersion($version)
-    {
-        if (isset($this->_packageInfo['version']) &&
-              isset($this->_packageInfo['version']['release'])) {
-            unset($this->_packageInfo['version']['release']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $version, array(
-            'version' => array('stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'release' => array('api')));
-        $this->_isValid = 0;
-    }
-
-    function setAPIVersion($version)
-    {
-        if (isset($this->_packageInfo['version']) &&
-              isset($this->_packageInfo['version']['api'])) {
-            unset($this->_packageInfo['version']['api']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $version, array(
-            'version' => array('stability', 'license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'api' => array()));
-        $this->_isValid = 0;
-    }
-
-    /**
-     * snapshot|devel|alpha|beta|stable
-     */
-    function setReleaseStability($state)
-    {
-        if (isset($this->_packageInfo['stability']) &&
-              isset($this->_packageInfo['stability']['release'])) {
-            unset($this->_packageInfo['stability']['release']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $state, array(
-            'stability' => array('license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'release' => array('api')));
-        $this->_isValid = 0;
-    }
-
-    /**
-     * @param devel|alpha|beta|stable
-     */
-    function setAPIStability($state)
-    {
-        if (isset($this->_packageInfo['stability']) &&
-              isset($this->_packageInfo['stability']['api'])) {
-            unset($this->_packageInfo['stability']['api']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $state, array(
-            'stability' => array('license', 'notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'),
-            'api' => array()));
-        $this->_isValid = 0;
-    }
-
-    function setLicense($license, $uri = false, $filesource = false)
-    {
-        if (!isset($this->_packageInfo['license'])) {
-            // ensure that the license tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('notes', 'contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), 0, 'license');
-        }
-        if ($uri || $filesource) {
-            $attribs = array();
-            if ($uri) {
-                $attribs['uri'] = $uri;
-            }
-            $uri = true; // for test below
-            if ($filesource) {
-                $attribs['filesource'] = $filesource;
-            }
-        }
-        $license = $uri ? array('attribs' => $attribs, '_content' => $license) : $license;
-        $this->_packageInfo['license'] = $license;
-        $this->_isValid = 0;
-    }
-
-    function setNotes($notes)
-    {
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['notes'])) {
-            // ensure that the notes tag is set up in the right location
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('contents', 'compatible',
-                'dependencies', 'providesextension', 'usesrole', 'usestask', 'srcpackage', 'srcuri',
-                'phprelease', 'extsrcrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'extbinrelease', 'bundle', 'changelog'), $notes, 'notes');
-        }
-        $this->_packageInfo['notes'] = $notes;
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     * @param string file name
-     * @param string installed path
-     */
-    function setInstalledAs($file, $path)
-    {
-        if ($path) {
-            return $this->_packageInfo['filelist'][$file]['installed_as'] = $path;
-        }
-        unset($this->_packageInfo['filelist'][$file]['installed_as']);
-    }
-
-    /**
-     * This is only used at install-time, after all serialization
-     * is over.
-     */
-    function installedFile($file, $atts)
-    {
-        if (isset($this->_packageInfo['filelist'][$file])) {
-            $this->_packageInfo['filelist'][$file] =
-                array_merge($this->_packageInfo['filelist'][$file], $atts['attribs']);
-        } else {
-            $this->_packageInfo['filelist'][$file] = $atts['attribs'];
-        }
-    }
-
-    /**
-     * Reset the listing of package contents
-     * @param string base installation dir for the whole package, if any
-     */
-    function clearContents($baseinstall = false)
-    {
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        if (!isset($this->_packageInfo['contents'])) {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('compatible',
-                    'dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                    'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                    'bundle', 'changelog'), array(), 'contents');
-        }
-        if ($this->getPackageType() != 'bundle') {
-            $this->_packageInfo['contents'] =
-                array('dir' => array('attribs' => array('name' => '/')));
-            if ($baseinstall) {
-                $this->_packageInfo['contents']['dir']['attribs']['baseinstalldir'] = $baseinstall;
-            }
-        } else {
-            $this->_packageInfo['contents'] = array('bundledpackage' => array());
-        }
-    }
-
-    /**
-     * @param string relative path of the bundled package.
-     */
-    function addBundledPackage($path)
-    {
-        if ($this->getPackageType() != 'bundle') {
-            return false;
-        }
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $path, array(
-                'contents' => array('compatible', 'dependencies', 'providesextension',
-                'usesrole', 'usestask', 'srcpackage', 'srcuri', 'phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'),
-                'bundledpackage' => array()));
-    }
-
-    /**
-     * @param string file name
-     * @param PEAR_Task_Common a read/write task
-     */
-    function addTaskToFile($filename, $task)
-    {
-        if (!method_exists($task, 'getXml')) {
-            return false;
-        }
-        if (!method_exists($task, 'getName')) {
-            return false;
-        }
-        if (!method_exists($task, 'validate')) {
-            return false;
-        }
-        if (!$task->validate()) {
-            return false;
-        }
-        if (!isset($this->_packageInfo['contents']['dir']['file'])) {
-            return false;
-        }
-        $this->getTasksNs(); // discover the tasks namespace if not done already
-        $files = $this->_packageInfo['contents']['dir']['file'];
-        if (!isset($files[0])) {
-            $files = array($files);
-            $ind = false;
-        } else {
-            $ind = true;
-        }
-        foreach ($files as $i => $file) {
-            if (isset($file['attribs'])) {
-                if ($file['attribs']['name'] == $filename) {
-                    if ($ind) {
-                        $t = isset($this->_packageInfo['contents']['dir']['file'][$i]
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()]) ?
-                              $this->_packageInfo['contents']['dir']['file'][$i]
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()] : false;
-                        if ($t && !isset($t[0])) {
-                            $this->_packageInfo['contents']['dir']['file'][$i]
-                                [$this->_tasksNs . ':' . $task->getName()] = array($t);
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$i][$this->_tasksNs .
-                            ':' . $task->getName()][] = $task->getXml();
-                    } else {
-                        $t = isset($this->_packageInfo['contents']['dir']['file']
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()]) ? $this->_packageInfo['contents']['dir']['file']
-                              ['attribs'][$this->_tasksNs .
-                              ':' . $task->getName()] : false;
-                        if ($t && !isset($t[0])) {
-                            $this->_packageInfo['contents']['dir']['file']
-                                [$this->_tasksNs . ':' . $task->getName()] = array($t);
-                        }
-                        $this->_packageInfo['contents']['dir']['file'][$this->_tasksNs .
-                            ':' . $task->getName()][] = $task->getXml();
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string path to the file
-     * @param string filename
-     * @param array extra attributes
-     */
-    function addFile($dir, $file, $attrs)
-    {
-        if ($this->getPackageType() == 'bundle') {
-            return false;
-        }
-        $this->_filesValid = false;
-        $this->_isValid = 0;
-        $dir = preg_replace(array('!\\\\+!', '!/+!'), array('/', '/'), $dir);
-        if ($dir == '/' || $dir == '') {
-            $dir = '';
-        } else {
-            $dir .= '/';
-        }
-        $attrs['name'] = $dir . $file;
-        if (!isset($this->_packageInfo['contents'])) {
-            // ensure that the contents tag is set up
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo,
-                array('compatible', 'dependencies', 'providesextension', 'usesrole', 'usestask',
-                'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease',
-                'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'), array(), 'contents');
-        }
-        if (isset($this->_packageInfo['contents']['dir']['file'])) {
-            if (!isset($this->_packageInfo['contents']['dir']['file'][0])) {
-                $this->_packageInfo['contents']['dir']['file'] =
-                    array($this->_packageInfo['contents']['dir']['file']);
-            }
-            $this->_packageInfo['contents']['dir']['file'][]['attribs'] = $attrs;
-        } else {
-            $this->_packageInfo['contents']['dir']['file']['attribs'] = $attrs;
-        }
-    }
-
-    /**
-     * @param string Dependent package name
-     * @param string Dependent package's channel name
-     * @param string minimum version of specified package that this release is guaranteed to be
-     *               compatible with
-     * @param string maximum version of specified package that this release is guaranteed to be
-     *               compatible with
-     * @param string versions of specified package that this release is not compatible with
-     */
-    function addCompatiblePackage($name, $channel, $min, $max, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $set = array(
-            'name' => $name,
-            'channel' => $channel,
-            'min' => $min,
-            'max' => $max,
-        );
-        if ($exclude) {
-            $set['exclude'] = $exclude;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'compatible' => array('dependencies', 'providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Removes the <usesrole> tag entirely
-     */
-    function resetUsesrole()
-    {
-        if (isset($this->_packageInfo['usesrole'])) {
-            unset($this->_packageInfo['usesrole']);
-        }
-    }
-
-    /**
-     * @param string
-     * @param string package name or uri
-     * @param string channel name if non-uri
-     */
-    function addUsesrole($role, $packageOrUri, $channel = false) {
-        $set = array('role' => $role);
-        if ($channel) {
-            $set['package'] = $packageOrUri;
-            $set['channel'] = $channel;
-        } else {
-            $set['uri'] = $packageOrUri;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'usesrole' => array('usestask', 'srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Removes the <usestask> tag entirely
-     */
-    function resetUsestask()
-    {
-        if (isset($this->_packageInfo['usestask'])) {
-            unset($this->_packageInfo['usestask']);
-        }
-    }
-
-
-    /**
-     * @param string
-     * @param string package name or uri
-     * @param string channel name if non-uri
-     */
-    function addUsestask($task, $packageOrUri, $channel = false) {
-        $set = array('task' => $task);
-        if ($channel) {
-            $set['package'] = $packageOrUri;
-            $set['channel'] = $channel;
-        } else {
-            $set['uri'] = $packageOrUri;
-        }
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $set, array(
-                'usestask' => array('srcpackage', 'srcuri',
-                    'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')
-            ));
-    }
-
-    /**
-     * Remove all compatible tags
-     */
-    function clearCompatible()
-    {
-        unset($this->_packageInfo['compatible']);
-    }
-
-    /**
-     * Reset dependencies prior to adding new ones
-     */
-    function clearDeps()
-    {
-        if (!isset($this->_packageInfo['dependencies'])) {
-            $this->_packageInfo = $this->_mergeTag($this->_packageInfo, array(),
-                array(
-                    'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                        'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                        'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog')));
-        }
-        $this->_packageInfo['dependencies'] = array();
-    }
-
-    /**
-     * @param string minimum PHP version allowed
-     * @param string maximum PHP version allowed
-     * @param array $exclude incompatible PHP versions
-     */
-    function setPhpDep($min, $max = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'min' => $min,
-            );
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($exclude) {
-            if (count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if (isset($this->_packageInfo['dependencies']['required']['php'])) {
-            $this->_stack->push(__FUNCTION__, 'warning', array('dep' =>
-            $this->_packageInfo['dependencies']['required']['php']),
-                'warning: PHP dependency already exists, overwriting');
-            unset($this->_packageInfo['dependencies']['required']['php']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'php' => array('pearinstaller', 'package', 'subpackage', 'extension', 'os', 'arch')
-            ));
-        return true;
-    }
-
-    /**
-     * @param string minimum allowed PEAR installer version
-     * @param string maximum allowed PEAR installer version
-     * @param string recommended PEAR installer version
-     * @param array incompatible version of the PEAR installer
-     */
-    function setPearinstallerDep($min, $max = false, $recommended = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'min' => $min,
-            );
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($recommended) {
-            $dep['recommended'] = $recommended;
-        }
-        if ($exclude) {
-            if (count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if (isset($this->_packageInfo['dependencies']['required']['pearinstaller'])) {
-            $this->_stack->push(__FUNCTION__, 'warning', array('dep' =>
-            $this->_packageInfo['dependencies']['required']['pearinstaller']),
-                'warning: PEAR Installer dependency already exists, overwriting');
-            unset($this->_packageInfo['dependencies']['required']['pearinstaller']);
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'pearinstaller' => array('package', 'subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * Mark a package as conflicting with this package
-     * @param string package name
-     * @param string package channel
-     * @param string extension this package provides, if any
-     * @param string|false minimum version required
-     * @param string|false maximum version allowed
-     * @param array|false versions to exclude from installation
-     */
-    function addConflictingPackageDepWithChannel($name, $channel,
-                $providesextension = false, $min = false, $max = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, false,
-            $exclude, $providesextension, false, true);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * Mark a package as conflicting with this package
-     * @param string package name
-     * @param string package channel
-     * @param string extension this package provides, if any
-     */
-    function addConflictingPackageDepWithUri($name, $uri, $providesextension = false)
-    {
-        $this->_isValid = 0;
-        $dep =
-            array(
-                'name' => $name,
-                'uri' => $uri,
-                'conflicts' => '',
-            );
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    function addDependencyGroup($name, $hint)
-    {
-        $this->_isValid = 0;
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo,
-            array('attribs' => array('name' => $name, 'hint' => $hint)),
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'group' => array(),
-            ));
-    }
-
-    /**
-     * @param string package name
-     * @param string|false channel name, false if this is a uri
-     * @param string|false uri name, false if this is a channel
-     * @param string|false minimum version required
-     * @param string|false maximum version allowed
-     * @param string|false recommended installation version
-     * @param array|false versions to exclude from installation
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @param bool if true, tells the installer to negate this dependency (conflicts)
-     * @return array
-     * @access private
-     */
-    function _constructDep($name, $channel, $uri, $min, $max, $recommended, $exclude,
-                           $providesextension = false, $nodefault = false,
-                           $conflicts = false)
-    {
-        $dep =
-            array(
-                'name' => $name,
-            );
-        if ($channel) {
-            $dep['channel'] = $channel;
-        } elseif ($uri) {
-            $dep['uri'] = $uri;
-        }
-        if ($min) {
-            $dep['min'] = $min;
-        }
-        if ($max) {
-            $dep['max'] = $max;
-        }
-        if ($recommended) {
-            $dep['recommended'] = $recommended;
-        }
-        if ($exclude) {
-            if (is_array($exclude) && count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        if ($nodefault) {
-            $dep['nodefault'] = '';
-        }
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
-        return $dep;
-    }
-
-    /**
-     * @param package|subpackage
-     * @param string group name
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array|false optional excluded versions
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @return bool false if the dependency group has not been initialized with
-     *              {@link addDependencyGroup()}, or a subpackage is added with
-     *              a providesextension
-     */
-    function addGroupPackageDepWithChannel($type, $groupname, $name, $channel, $min = false,
-                                      $max = false, $recommended = false, $exclude = false,
-                                      $providesextension = false, $nodefault = false)
-    {
-        if ($type == 'subpackage' && $providesextension) {
-            return false; // subpackages must be php packages
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $providesextension, $nodefault);
-        return $this->_addGroupDependency($type, $dep, $groupname);
-    }
-
-    /**
-     * @param package|subpackage
-     * @param string group name
-     * @param string package name
-     * @param string package uri
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @return bool false if the dependency group has not been initialized with
-     *              {@link addDependencyGroup()}
-     */
-    function addGroupPackageDepWithURI($type, $groupname, $name, $uri, $providesextension = false,
-                                       $nodefault = false)
-    {
-        if ($type == 'subpackage' && $providesextension) {
-            return false; // subpackages must be php packages
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false,
-            $providesextension, $nodefault);
-        return $this->_addGroupDependency($type, $dep, $groupname);
-    }
-
-    /**
-     * @param string group name (must be pre-existing)
-     * @param string extension name
-     * @param string minimum version allowed
-     * @param string maximum version allowed
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addGroupExtensionDep($groupname, $name, $min = false, $max = false,
-                                         $recommended = false, $exclude = false)
-    {
-        $this->_isValid = 0;
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        return $this->_addGroupDependency('extension', $dep, $groupname);
-    }
-
-    /**
-     * @param package|subpackage|extension
-     * @param array dependency contents
-     * @param string name of the dependency group to add this to
-     * @return boolean
-     * @access private
-     */
-    function _addGroupDependency($type, $dep, $groupname)
-    {
-        $arr = array('subpackage', 'extension');
-        if ($type != 'package') {
-            array_shift($arr);
-        }
-        if ($type == 'extension') {
-            array_shift($arr);
-        }
-        if (!isset($this->_packageInfo['dependencies']['group'])) {
-            return false;
-        } else {
-            if (!isset($this->_packageInfo['dependencies']['group'][0])) {
-                if ($this->_packageInfo['dependencies']['group']['attribs']['name'] == $groupname) {
-                    $this->_packageInfo['dependencies']['group'] = $this->_mergeTag(
-                        $this->_packageInfo['dependencies']['group'], $dep,
-                        array(
-                            $type => $arr
-                        ));
-                    $this->_isValid = 0;
-                    return true;
-                } else {
-                    return false;
-                }
-            } else {
-                foreach ($this->_packageInfo['dependencies']['group'] as $i => $group) {
-                    if ($group['attribs']['name'] == $groupname) {
-                    $this->_packageInfo['dependencies']['group'][$i] = $this->_mergeTag(
-                        $this->_packageInfo['dependencies']['group'][$i], $dep,
-                        array(
-                            $type => $arr
-                        ));
-                        $this->_isValid = 0;
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-    }
-
-    /**
-     * @param optional|required
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     * @param array|false optional excluded versions
-     */
-    function addPackageDepWithChannel($type, $name, $channel, $min = false, $max = false,
-                                      $recommended = false, $exclude = false,
-                                      $providesextension = false, $nodefault = false)
-    {
-        if (!in_array($type, array('optional', 'required'), true)) {
-            $type = 'required';
-        }
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $providesextension, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required
-     * @param string name of the package
-     * @param string uri of the package
-     * @param string extension this package provides, if any
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addPackageDepWithUri($type, $name, $uri, $providesextension = false,
-                                  $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false,
-            $providesextension, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'package' => array('subpackage', 'extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string package name
-     * @param string package channel
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addSubpackageDepWithChannel($type, $name, $channel, $min = false, $max = false,
-                                         $recommended = false, $exclude = false,
-                                         $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, $channel, false, $min, $max, $recommended, $exclude,
-            $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'subpackage' => array('extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string package name
-     * @param string package uri for download
-     * @param bool if true, tells the installer to ignore the default optional dependency group
-     *             when installing this package
-     */
-    function addSubpackageDepWithUri($type, $name, $uri, $nodefault = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, $uri, false, false, false, false, $nodefault);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'subpackage' => array('extension', 'os', 'arch')
-            ));
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string extension name
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addExtensionDep($type, $name, $min = false, $max = false, $recommended = false,
-                             $exclude = false)
-    {
-        $this->_isValid = 0;
-        $arr = array('optional', 'group');
-        if ($type != 'required') {
-            array_shift($arr);
-        }
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                $type => $arr,
-                'extension' => array('os', 'arch')
-            ));
-    }
-
-    /**
-     * @param string Operating system name
-     * @param boolean true if this package cannot be installed on this OS
-     */
-    function addOsDep($name, $conflicts = false)
-    {
-        $this->_isValid = 0;
-        $dep = array('name' => $name);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'os' => array('arch')
-            ));
-    }
-
-    /**
-     * @param string Architecture matching pattern
-     * @param boolean true if this package cannot be installed on this architecture
-     */
-    function addArchDep($pattern, $conflicts = false)
-    {
-        $this->_isValid = 0;
-        $dep = array('pattern' => $pattern);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
-            array(
-                'dependencies' => array('providesextension', 'usesrole', 'usestask',
-                    'srcpackage', 'srcuri', 'phprelease', 'extsrcrelease', 'extbinrelease',
-                    'zendextsrcrelease', 'zendextbinrelease', 'bundle', 'changelog'),
-                'required' => array('optional', 'group'),
-                'arch' => array()
-            ));
-    }
-
-    /**
-     * Set the kind of package, and erase all release tags
-     *
-     * - a php package is a PEAR-style package
-     * - an extbin package is a PECL-style extension binary
-     * - an extsrc package is a PECL-style source for a binary
-     * - an zendextbin package is a PECL-style zend extension binary
-     * - an zendextsrc package is a PECL-style source for a zend extension binary
-     * - a bundle package is a collection of other pre-packaged packages
-     * @param php|extbin|extsrc|zendextsrc|zendextbin|bundle
-     * @return bool success
-     */
-    function setPackageType($type)
-    {
-        $this->_isValid = 0;
-        if (!in_array($type, array('php', 'extbin', 'extsrc', 'zendextsrc',
-                                   'zendextbin', 'bundle'))) {
-            return false;
-        }
-
-        if (in_array($type, array('zendextsrc', 'zendextbin'))) {
-            $this->_setPackageVersion2_1();
-        }
-
-        if ($type != 'bundle') {
-            $type .= 'release';
-        }
-
-        foreach (array('phprelease', 'extbinrelease', 'extsrcrelease',
-                       'zendextsrcrelease', 'zendextbinrelease', 'bundle') as $test) {
-            unset($this->_packageInfo[$test]);
-        }
-
-        if (!isset($this->_packageInfo[$type])) {
-            // ensure that the release tag is set up
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('changelog'),
-                array(), $type);
-        }
-
-        $this->_packageInfo[$type] = array();
-        return true;
-    }
-
-    /**
-     * @return bool true if package type is set up
-     */
-    function addRelease()
-    {
-        if ($type = $this->getPackageType()) {
-            if ($type != 'bundle') {
-                $type .= 'release';
-            }
-            $this->_packageInfo = $this->_mergeTag($this->_packageInfo, array(),
-                array($type => array('changelog')));
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the current release tag in order to add to it
-     * @param bool returns only releases that have installcondition if true
-     * @return array|null
-     */
-    function &_getCurrentRelease($strict = true)
-    {
-        if ($p = $this->getPackageType()) {
-            if ($strict) {
-                if ($p == 'extsrc' || $p == 'zendextsrc') {
-                    $a = null;
-                    return $a;
-                }
-            }
-            if ($p != 'bundle') {
-                $p .= 'release';
-            }
-            if (isset($this->_packageInfo[$p][0])) {
-                return $this->_packageInfo[$p][count($this->_packageInfo[$p]) - 1];
-            } else {
-                return $this->_packageInfo[$p];
-            }
-        } else {
-            $a = null;
-            return $a;
-        }
-    }
-
-    /**
-     * Add a file to the current release that should be installed under a different name
-     * @param string <contents> path to file
-     * @param string name the file should be installed as
-     */
-    function addInstallAs($path, $as)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, array('attribs' => array('name' => $path, 'as' => $as)),
-            array(
-                'filelist' => array(),
-                'install' => array('ignore')
-            ));
-    }
-
-    /**
-     * Add a file to the current release that should be ignored
-     * @param string <contents> path to file
-     * @return bool success of operation
-     */
-    function addIgnore($path)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, array('attribs' => array('name' => $path)),
-            array(
-                'filelist' => array(),
-                'ignore' => array()
-            ));
-    }
-
-    /**
-     * Add an extension binary package for this extension source code release
-     *
-     * Note that the package must be from the same channel as the extension source package
-     * @param string
-     */
-    function addBinarypackage($package)
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-        $r = &$this->_getCurrentRelease(false);
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, $package,
-            array(
-                'binarypackage' => array('filelist'),
-            ));
-    }
-
-    /**
-     * Add a configureoption to an extension source package
-     * @param string
-     * @param string
-     * @param string
-     */
-    function addConfigureOption($name, $prompt, $default = null)
-    {
-        if ($this->getPackageType() != 'extsrc' && $this->getPackageType() != 'zendextsrc') {
-            return false;
-        }
-
-        $r = &$this->_getCurrentRelease(false);
-        if ($r === null) {
-            return false;
-        }
-
-        $opt = array('attribs' => array('name' => $name, 'prompt' => $prompt));
-        if ($default !== null) {
-            $opt['attribs']['default'] = $default;
-        }
-
-        $this->_isValid = 0;
-        $r = $this->_mergeTag($r, $opt,
-            array(
-                'configureoption' => array('binarypackage', 'filelist'),
-            ));
-    }
-
-    /**
-     * Set an installation condition based on php version for the current release set
-     * @param string minimum version
-     * @param string maximum version
-     * @param false|array incompatible versions of PHP
-     */
-    function setPhpInstallCondition($min, $max, $exclude = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['php'])) {
-            unset($r['installconditions']['php']);
-        }
-        $dep = array('min' => $min, 'max' => $max);
-        if ($exclude) {
-            if (is_array($exclude) && count($exclude) == 1) {
-                $exclude = $exclude[0];
-            }
-            $dep['exclude'] = $exclude;
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'php' => array('extension', 'os', 'arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'php' => array('extension', 'os', 'arch')
-                ));
-        }
-    }
-
-    /**
-     * @param optional|required optional, required
-     * @param string extension name
-     * @param string minimum version
-     * @param string maximum version
-     * @param string recommended version
-     * @param array incompatible versions
-     */
-    function addExtensionInstallCondition($name, $min = false, $max = false, $recommended = false,
-                                          $exclude = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        $dep = $this->_constructDep($name, false, false, $min, $max, $recommended, $exclude);
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'extension' => array('os', 'arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'extension' => array('os', 'arch')
-                ));
-        }
-    }
-
-    /**
-     * Set an installation condition based on operating system for the current release set
-     * @param string OS name
-     * @param bool whether this OS is incompatible with the current release
-     */
-    function setOsInstallCondition($name, $conflicts = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['os'])) {
-            unset($r['installconditions']['os']);
-        }
-        $dep = array('name' => $name);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'os' => array('arch')
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'os' => array('arch')
-                ));
-        }
-    }
-
-    /**
-     * Set an installation condition based on architecture for the current release set
-     * @param string architecture pattern
-     * @param bool whether this arch is incompatible with the current release
-     */
-    function setArchInstallCondition($pattern, $conflicts = false)
-    {
-        $r = &$this->_getCurrentRelease();
-        if ($r === null) {
-            return false;
-        }
-        $this->_isValid = 0;
-        if (isset($r['installconditions']['arch'])) {
-            unset($r['installconditions']['arch']);
-        }
-        $dep = array('pattern' => $pattern);
-        if ($conflicts) {
-            $dep['conflicts'] = '';
-        }
-        if ($this->getPackageType() == 'extsrc' || $this->getPackageType() == 'zendextsrc') {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('configureoption', 'binarypackage',
-                        'filelist'),
-                    'arch' => array()
-                ));
-        } else {
-            $r = $this->_mergeTag($r, $dep,
-                array(
-                    'installconditions' => array('filelist'),
-                    'arch' => array()
-                ));
-        }
-    }
-
-    /**
-     * For extension binary releases, this is used to specify either the
-     * static URI to a source package, or the package name and channel of the extsrc/zendextsrc
-     * package it is based on.
-     * @param string Package name, or full URI to source package (extsrc/zendextsrc type)
-     */
-    function setSourcePackage($packageOrUri)
-    {
-        $this->_isValid = 0;
-        if (isset($this->_packageInfo['channel'])) {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'),
-                $packageOrUri, 'srcpackage');
-        } else {
-            $this->_packageInfo = $this->_insertBefore($this->_packageInfo, array('phprelease',
-                'extsrcrelease', 'extbinrelease', 'zendextsrcrelease', 'zendextbinrelease',
-                'bundle', 'changelog'), $packageOrUri, 'srcuri');
-        }
-    }
-
-    /**
-     * Generate a valid change log entry from the current package.xml
-     * @param string|false
-     */
-    function generateChangeLogEntry($notes = false)
-    {
-        return array(
-            'version' =>
-                array(
-                    'release' => $this->getVersion('release'),
-                    'api' => $this->getVersion('api'),
-                    ),
-            'stability' =>
-                $this->getStability(),
-            'date' => $this->getDate(),
-            'license' => $this->getLicense(true),
-            'notes' => $notes ? $notes : $this->getNotes()
-            );
-    }
-
-    /**
-     * @param string release version to set change log notes for
-     * @param array output of {@link generateChangeLogEntry()}
-     */
-    function setChangelogEntry($releaseversion, $contents)
-    {
-        if (!isset($this->_packageInfo['changelog'])) {
-            $this->_packageInfo['changelog']['release'] = $contents;
-            return;
-        }
-        if (!isset($this->_packageInfo['changelog']['release'][0])) {
-            if ($this->_packageInfo['changelog']['release']['version']['release'] == $releaseversion) {
-                $this->_packageInfo['changelog']['release'] = array(
-                    $this->_packageInfo['changelog']['release']);
-            } else {
-                $this->_packageInfo['changelog']['release'] = array(
-                    $this->_packageInfo['changelog']['release']);
-                return $this->_packageInfo['changelog']['release'][] = $contents;
-            }
-        }
-        foreach($this->_packageInfo['changelog']['release'] as $index => $changelog) {
-            if (isset($changelog['version']) &&
-                  strnatcasecmp($changelog['version']['release'], $releaseversion) == 0) {
-                $curlog = $index;
-            }
-        }
-        if (isset($curlog)) {
-            $this->_packageInfo['changelog']['release'][$curlog] = $contents;
-        } else {
-            $this->_packageInfo['changelog']['release'][] = $contents;
-        }
-    }
-
-    /**
-     * Remove the changelog entirely
-     */
-    function clearChangeLog()
-    {
-        unset($this->_packageInfo['changelog']);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Packager.php b/airtime_mvc/library/pear/PEAR/Packager.php
deleted file mode 100644
index dcc3da417..000000000
--- a/airtime_mvc/library/pear/PEAR/Packager.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * PEAR_Packager for generating releases
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Packager.php 286809 2009-08-04 15:10:26Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR/Common.php';
-require_once 'PEAR/PackageFile.php';
-require_once 'System.php';
-
-/**
- * Administration class used to make a PEAR release tarball.
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Packager extends PEAR_Common
-{
-    /**
-     * @var PEAR_Registry
-     */
-    var $_registry;
-
-    function package($pkgfile = null, $compress = true, $pkg2 = null)
-    {
-        // {{{ validate supplied package.xml file
-        if (empty($pkgfile)) {
-            $pkgfile = 'package.xml';
-        }
-
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pkg  = &new PEAR_PackageFile($this->config, $this->debug);
-        $pf   = &$pkg->fromPackageFile($pkgfile, PEAR_VALIDATE_NORMAL);
-        $main = &$pf;
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            if (is_array($pf->getUserInfo())) {
-                foreach ($pf->getUserInfo() as $error) {
-                    $this->log(0, 'Error: ' . $error['message']);
-                }
-            }
-
-            $this->log(0, $pf->getMessage());
-            return $this->raiseError("Cannot package, errors in package file");
-        }
-
-        foreach ($pf->getValidationWarnings() as $warning) {
-            $this->log(1, 'Warning: ' . $warning['message']);
-        }
-
-        // }}}
-        if ($pkg2) {
-            $this->log(0, 'Attempting to process the second package file');
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $pf2 = &$pkg->fromPackageFile($pkg2, PEAR_VALIDATE_NORMAL);
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($pf2)) {
-                if (is_array($pf2->getUserInfo())) {
-                    foreach ($pf2->getUserInfo() as $error) {
-                        $this->log(0, 'Error: ' . $error['message']);
-                    }
-                }
-                $this->log(0, $pf2->getMessage());
-                return $this->raiseError("Cannot package, errors in second package file");
-            }
-
-            foreach ($pf2->getValidationWarnings() as $warning) {
-                $this->log(1, 'Warning: ' . $warning['message']);
-            }
-
-            if ($pf2->getPackagexmlVersion() == '2.0' ||
-                  $pf2->getPackagexmlVersion() == '2.1'
-            ) {
-                $main  = &$pf2;
-                $other = &$pf;
-            } else {
-                $main  = &$pf;
-                $other = &$pf2;
-            }
-
-            if ($main->getPackagexmlVersion() != '2.0' &&
-                  $main->getPackagexmlVersion() != '2.1') {
-                return PEAR::raiseError('Error: cannot package two package.xml version 1.0, can ' .
-                    'only package together a package.xml 1.0 and package.xml 2.0');
-            }
-
-            if ($other->getPackagexmlVersion() != '1.0') {
-                return PEAR::raiseError('Error: cannot package two package.xml version 2.0, can ' .
-                    'only package together a package.xml 1.0 and package.xml 2.0');
-            }
-        }
-
-        $main->setLogger($this);
-        if (!$main->validate(PEAR_VALIDATE_PACKAGING)) {
-            foreach ($main->getValidationWarnings() as $warning) {
-                $this->log(0, 'Error: ' . $warning['message']);
-            }
-            return $this->raiseError("Cannot package, errors in package");
-        }
-
-        foreach ($main->getValidationWarnings() as $warning) {
-            $this->log(1, 'Warning: ' . $warning['message']);
-        }
-
-        if ($pkg2) {
-            $other->setLogger($this);
-            $a = false;
-            if (!$other->validate(PEAR_VALIDATE_NORMAL) || $a = !$main->isEquivalent($other)) {
-                foreach ($other->getValidationWarnings() as $warning) {
-                    $this->log(0, 'Error: ' . $warning['message']);
-                }
-
-                foreach ($main->getValidationWarnings() as $warning) {
-                    $this->log(0, 'Error: ' . $warning['message']);
-                }
-
-                if ($a) {
-                    return $this->raiseError('The two package.xml files are not equivalent!');
-                }
-
-                return $this->raiseError("Cannot package, errors in package");
-            }
-
-            foreach ($other->getValidationWarnings() as $warning) {
-                $this->log(1, 'Warning: ' . $warning['message']);
-            }
-
-            $gen = &$main->getDefaultGenerator();
-            $tgzfile = $gen->toTgz2($this, $other, $compress);
-            if (PEAR::isError($tgzfile)) {
-                return $tgzfile;
-            }
-
-            $dest_package = basename($tgzfile);
-            $pkgdir       = dirname($pkgfile);
-
-            // TAR the Package -------------------------------------------
-            $this->log(1, "Package $dest_package done");
-            if (file_exists("$pkgdir/CVS/Root")) {
-                $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pf->getVersion());
-                $cvstag = "RELEASE_$cvsversion";
-                $this->log(1, 'Tag the released code with "pear cvstag ' .
-                    $main->getPackageFile() . '"');
-                $this->log(1, "(or set the CVS tag $cvstag by hand)");
-            } elseif (file_exists("$pkgdir/.svn")) {
-                $svnversion = preg_replace('/[^a-z0-9]/i', '.', $pf->getVersion());
-                $svntag = $pf->getName() . "-$svnversion";
-                $this->log(1, 'Tag the released code with "pear svntag ' .
-                    $main->getPackageFile() . '"');
-                $this->log(1, "(or set the SVN tag $svntag by hand)");
-            }
-        } else { // this branch is executed for single packagefile packaging
-            $gen = &$pf->getDefaultGenerator();
-            $tgzfile = $gen->toTgz($this, $compress);
-            if (PEAR::isError($tgzfile)) {
-                $this->log(0, $tgzfile->getMessage());
-                return $this->raiseError("Cannot package, errors in package");
-            }
-
-            $dest_package = basename($tgzfile);
-            $pkgdir       = dirname($pkgfile);
-
-            // TAR the Package -------------------------------------------
-            $this->log(1, "Package $dest_package done");
-            if (file_exists("$pkgdir/CVS/Root")) {
-                $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $pf->getVersion());
-                $cvstag = "RELEASE_$cvsversion";
-                $this->log(1, "Tag the released code with `pear cvstag $pkgfile'");
-                $this->log(1, "(or set the CVS tag $cvstag by hand)");
-            } elseif (file_exists("$pkgdir/.svn")) {
-                $svnversion = preg_replace('/[^a-z0-9]/i', '.', $pf->getVersion());
-                $svntag = $pf->getName() . "-$svnversion";
-                $this->log(1, "Tag the released code with `pear svntag $pkgfile'");
-                $this->log(1, "(or set the SVN tag $svntag by hand)");
-            }
-        }
-
-        return $dest_package;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/REST.php b/airtime_mvc/library/pear/PEAR/REST.php
deleted file mode 100644
index 516d1bf5b..000000000
--- a/airtime_mvc/library/pear/PEAR/REST.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-/**
- * PEAR_REST
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: REST.php 296767 2010-03-25 00:58:33Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * For downloading xml files
- */
-require_once 'PEAR.php';
-require_once 'PEAR/XMLParser.php';
-
-/**
- * Intelligently retrieve data, following hyperlinks if necessary, and re-directing
- * as well
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_REST
-{
-    var $config;
-    var $_options;
-
-    function PEAR_REST(&$config, $options = array())
-    {
-        $this->config   = &$config;
-        $this->_options = $options;
-    }
-
-    /**
-     * Retrieve REST data, but always retrieve the local cache if it is available.
-     *
-     * This is useful for elements that should never change, such as information on a particular
-     * release
-     * @param string full URL to this resource
-     * @param array|false contents of the accept-encoding header
-     * @param boolean     if true, xml will be returned as a string, otherwise, xml will be
-     *                    parsed using PEAR_XMLParser
-     * @return string|array
-     */
-    function retrieveCacheFirst($url, $accept = false, $forcestring = false, $channel = false)
-    {
-        $cachefile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cachefile';
-
-        if (file_exists($cachefile)) {
-            return unserialize(implode('', file($cachefile)));
-        }
-
-        return $this->retrieveData($url, $accept, $forcestring, $channel);
-    }
-
-    /**
-     * Retrieve a remote REST resource
-     * @param string full URL to this resource
-     * @param array|false contents of the accept-encoding header
-     * @param boolean     if true, xml will be returned as a string, otherwise, xml will be
-     *                    parsed using PEAR_XMLParser
-     * @return string|array
-     */
-    function retrieveData($url, $accept = false, $forcestring = false, $channel = false)
-    {
-        $cacheId = $this->getCacheId($url);
-        if ($ret = $this->useLocalCache($url, $cacheId)) {
-            return $ret;
-        }
-
-        $file = $trieddownload = false;
-        if (!isset($this->_options['offline'])) {
-            $trieddownload = true;
-            $file = $this->downloadHttp($url, $cacheId ? $cacheId['lastChange'] : false, $accept, $channel);
-        }
-
-        if (PEAR::isError($file)) {
-            if ($file->getCode() !== -9276) {
-                return $file;
-            }
-
-            $trieddownload = false;
-            $file = false; // use local copy if available on socket connect error
-        }
-
-        if (!$file) {
-            $ret = $this->getCache($url);
-            if (!PEAR::isError($ret) && $trieddownload) {
-                // reset the age of the cache if the server says it was unmodified
-                $this->saveCache($url, $ret, null, true, $cacheId);
-            }
-
-            return $ret;
-        }
-
-        if (is_array($file)) {
-            $headers      = $file[2];
-            $lastmodified = $file[1];
-            $content      = $file[0];
-        } else {
-            $headers      = array();
-            $lastmodified = false;
-            $content      = $file;
-        }
-
-        if ($forcestring) {
-            $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-            return $content;
-        }
-
-        if (isset($headers['content-type'])) {
-            switch ($headers['content-type']) {
-                case 'text/xml' :
-                case 'application/xml' :
-                case 'text/plain' :
-                    if ($headers['content-type'] === 'text/plain') {
-                        $check = substr($content, 0, 5);
-                        if ($check !== '<?xml') {
-                            break;
-                        }
-                    }
-
-                    $parser = new PEAR_XMLParser;
-                    PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-                    $err = $parser->parse($content);
-                    PEAR::popErrorHandling();
-                    if (PEAR::isError($err)) {
-                        return PEAR::raiseError('Invalid xml downloaded from "' . $url . '": ' .
-                            $err->getMessage());
-                    }
-                    $content = $parser->getData();
-                case 'text/html' :
-                default :
-                    // use it as a string
-            }
-        } else {
-            // assume XML
-            $parser = new PEAR_XMLParser;
-            $parser->parse($content);
-            $content = $parser->getData();
-        }
-
-        $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-        return $content;
-    }
-
-    function useLocalCache($url, $cacheid = null)
-    {
-        if ($cacheid === null) {
-            $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-                md5($url) . 'rest.cacheid';
-            if (!file_exists($cacheidfile)) {
-                return false;
-            }
-
-            $cacheid = unserialize(implode('', file($cacheidfile)));
-        }
-
-        $cachettl = $this->config->get('cache_ttl');
-        // If cache is newer than $cachettl seconds, we use the cache!
-        if (time() - $cacheid['age'] < $cachettl) {
-            return $this->getCache($url);
-        }
-
-        return false;
-    }
-
-    function getCacheId($url)
-    {
-        $cacheidfile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cacheid';
-
-        if (!file_exists($cacheidfile)) {
-            return false;
-        }
-
-        $ret = unserialize(implode('', file($cacheidfile)));
-        return $ret;
-    }
-
-    function getCache($url)
-    {
-        $cachefile = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR .
-            md5($url) . 'rest.cachefile';
-
-        if (!file_exists($cachefile)) {
-            return PEAR::raiseError('No cached content available for "' . $url . '"');
-        }
-
-        return unserialize(implode('', file($cachefile)));
-    }
-
-    /**
-     * @param string full URL to REST resource
-     * @param string original contents of the REST resource
-     * @param array  HTTP Last-Modified and ETag headers
-     * @param bool   if true, then the cache id file should be regenerated to
-     *               trigger a new time-to-live value
-     */
-    function saveCache($url, $contents, $lastmodified, $nochange = false, $cacheid = null)
-    {
-        $cachedir    = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR . md5($url);
-        $cacheidfile = $cachedir . 'rest.cacheid';
-        $cachefile   = $cachedir . 'rest.cachefile';
-
-        if ($cacheid === null && $nochange) {
-            $cacheid = unserialize(implode('', file($cacheidfile)));
-        }
-
-        $fp = @fopen($cacheidfile, 'wb');
-        if (!$fp) {
-            $cache_dir = $this->config->get('cache_dir');
-            if (is_dir($cache_dir)) {
-                return false;
-            }
-
-            System::mkdir(array('-p', $cache_dir));
-            $fp = @fopen($cacheidfile, 'wb');
-            if (!$fp) {
-                return false;
-            }
-        }
-
-        if ($nochange) {
-            fwrite($fp, serialize(array(
-                'age'        => time(),
-                'lastChange' => $cacheid['lastChange'],
-                ))
-            );
-
-            fclose($fp);
-            return true;
-        }
-
-        fwrite($fp, serialize(array(
-            'age'        => time(),
-            'lastChange' => $lastmodified,
-            ))
-        );
-
-        fclose($fp);
-        $fp = @fopen($cachefile, 'wb');
-        if (!$fp) {
-            if (file_exists($cacheidfile)) {
-                @unlink($cacheidfile);
-            }
-
-            return false;
-        }
-
-        fwrite($fp, serialize($contents));
-        fclose($fp);
-        return true;
-    }
-
-    /**
-     * Efficiently Download a file through HTTP.  Returns downloaded file as a string in-memory
-     * This is best used for small files
-     *
-     * If an HTTP proxy has been configured (http_proxy PEAR_Config
-     * setting), the proxy will be used.
-     *
-     * @param string  $url       the URL to download
-     * @param string  $save_dir  directory to save file in
-     * @param false|string|array $lastmodified header values to check against for caching
-     *                           use false to return the header values from this download
-     * @param false|array $accept Accept headers to send
-     * @return string|array  Returns the contents of the downloaded file or a PEAR
-     *                       error on failure.  If the error is caused by
-     *                       socket-related errors, the error object will
-     *                       have the fsockopen error code available through
-     *                       getCode().  If caching is requested, then return the header
-     *                       values.
-     *
-     * @access public
-     */
-    function downloadHttp($url, $lastmodified = null, $accept = false, $channel = false)
-    {
-        static $redirect = 0;
-        // always reset , so we are clean case of error
-        $wasredirect = $redirect;
-        $redirect = 0;
-
-        $info = parse_url($url);
-        if (!isset($info['scheme']) || !in_array($info['scheme'], array('http', 'https'))) {
-            return PEAR::raiseError('Cannot download non-http URL "' . $url . '"');
-        }
-
-        if (!isset($info['host'])) {
-            return PEAR::raiseError('Cannot download from non-URL "' . $url . '"');
-        }
-
-        $host   = isset($info['host']) ? $info['host'] : null;
-        $port   = isset($info['port']) ? $info['port'] : null;
-        $path   = isset($info['path']) ? $info['path'] : null;
-        $schema = (isset($info['scheme']) && $info['scheme'] == 'https') ? 'https' : 'http';
-
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($this->config->get('http_proxy')&&
-              $proxy = parse_url($this->config->get('http_proxy'))
-        ) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if ($schema === 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-
-            $proxy_port   = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user   = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass   = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-            $proxy_schema = (isset($proxy['scheme']) && $proxy['scheme'] == 'https') ? 'https' : 'http';
-        }
-
-        if (empty($port)) {
-            $port = (isset($info['scheme']) && $info['scheme'] == 'https')  ? 443 : 80;
-        }
-
-        if (isset($proxy['host'])) {
-            $request = "GET $url HTTP/1.1\r\n";
-        } else {
-            $request = "GET $path HTTP/1.1\r\n";
-        }
-
-        $request .= "Host: $host\r\n";
-        $ifmodifiedsince = '';
-        if (is_array($lastmodified)) {
-            if (isset($lastmodified['Last-Modified'])) {
-                $ifmodifiedsince = 'If-Modified-Since: ' . $lastmodified['Last-Modified'] . "\r\n";
-            }
-
-            if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
-            }
-        } else {
-            $ifmodifiedsince = ($lastmodified ? "If-Modified-Since: $lastmodified\r\n" : '');
-        }
-
-        $request .= $ifmodifiedsince .
-            "User-Agent: PEAR/1.9.1/PHP/" . PHP_VERSION . "\r\n";
-
-        $username = $this->config->get('username', null, $channel);
-        $password = $this->config->get('password', null, $channel);
-
-        if ($username && $password) {
-            $tmp = base64_encode("$username:$password");
-            $request .= "Authorization: Basic $tmp\r\n";
-        }
-
-        if ($proxy_host != '' && $proxy_user != '') {
-            $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
-        }
-
-        if ($accept) {
-            $request .= 'Accept: ' . implode(', ', $accept) . "\r\n";
-        }
-
-        $request .= "Accept-Encoding:\r\n";
-        $request .= "Connection: close\r\n";
-        $request .= "\r\n";
-
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr, 15);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", -9276);
-            }
-        } else {
-            if ($schema === 'https') {
-                $host = 'ssl://' . $host;
-            }
-
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
-        }
-
-        fwrite($fp, $request);
-
-        $headers = array();
-        $reply   = 0;
-        while ($line = trim(fgets($fp, 1024))) {
-            if (preg_match('/^([^:]+):\s+(.*)\s*\\z/', $line, $matches)) {
-                $headers[strtolower($matches[1])] = trim($matches[2]);
-            } elseif (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
-                $reply = (int)$matches[1];
-                if ($reply == 304 && ($lastmodified || ($lastmodified === false))) {
-                    return false;
-                }
-
-                if (!in_array($reply, array(200, 301, 302, 303, 305, 307))) {
-                    return PEAR::raiseError("File $schema://$host:$port$path not valid (received: $line)");
-                }
-            }
-        }
-
-        if ($reply != 200) {
-            if (!isset($headers['location'])) {
-                return PEAR::raiseError("File $schema://$host:$port$path not valid (redirected but no location)");
-            }
-
-            if ($wasredirect > 4) {
-                return PEAR::raiseError("File $schema://$host:$port$path not valid (redirection looped more than 5 times)");
-            }
-
-            $redirect = $wasredirect + 1;
-            return $this->downloadHttp($headers['location'], $lastmodified, $accept, $channel);
-        }
-
-        $length = isset($headers['content-length']) ? $headers['content-length'] : -1;
-
-        $data = '';
-        while ($chunk = @fread($fp, 8192)) {
-            $data .= $chunk;
-        }
-        fclose($fp);
-
-        if ($lastmodified === false || $lastmodified) {
-            if (isset($headers['etag'])) {
-                $lastmodified = array('ETag' => $headers['etag']);
-            }
-
-            if (isset($headers['last-modified'])) {
-                if (is_array($lastmodified)) {
-                    $lastmodified['Last-Modified'] = $headers['last-modified'];
-                } else {
-                    $lastmodified = $headers['last-modified'];
-                }
-            }
-
-            return array($data, $lastmodified, $headers);
-        }
-
-        return $data;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/REST/10.php b/airtime_mvc/library/pear/PEAR/REST/10.php
deleted file mode 100644
index b1b39412d..000000000
--- a/airtime_mvc/library/pear/PEAR/REST/10.php
+++ /dev/null
@@ -1,867 +0,0 @@
-<?php
-/**
- * PEAR_REST_10
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 10.php 287558 2009-08-21 22:21:28Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a12
- */
-
-/**
- * For downloading REST xml/txt files
- */
-require_once 'PEAR/REST.php';
-
-/**
- * Implement REST 1.0
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a12
- */
-class PEAR_REST_10
-{
-    /**
-     * @var PEAR_REST
-     */
-    var $_rest;
-    function PEAR_REST_10($config, $options = array())
-    {
-        $this->_rest = &new PEAR_REST($config, $options);
-    }
-
-    /**
-     * Retrieve information about a remote package to be downloaded from a REST server
-     *
-     * @param string $base The uri to prepend to all REST calls
-     * @param array $packageinfo an array of format:
-     * <pre>
-     *  array(
-     *   'package' => 'packagename',
-     *   'channel' => 'channelname',
-     *  ['state' => 'alpha' (or valid state),]
-     *  -or-
-     *  ['version' => '1.whatever']
-     * </pre>
-     * @param string $prefstate Current preferred_state config variable value
-     * @param bool $installed the installed version of this package to compare against
-     * @return array|false|PEAR_Error see {@link _returnDownloadURL()}
-     */
-    function getDownloadURL($base, $packageinfo, $prefstate, $installed, $channel = false)
-    {
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-
-        $channel  = $packageinfo['channel'];
-        $package  = $packageinfo['package'];
-        $state    = isset($packageinfo['state'])   ? $packageinfo['state']   : null;
-        $version  = isset($packageinfo['version']) ? $packageinfo['version'] : null;
-        $restFile = $base . 'r/' . strtolower($package) . '/allreleases.xml';
-
-        $info = $this->_rest->retrieveData($restFile, false, false, $channel);
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('No releases available for package "' .
-                $channel . '/' . $package . '"');
-        }
-
-        if (!isset($info['r'])) {
-            return false;
-        }
-
-        $release = $found = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-
-            if (isset($state)) {
-                // try our preferred state first
-                if ($release['s'] == $state) {
-                    $found = true;
-                    break;
-                }
-                // see if there is something newer and more stable
-                // bug #7221
-                if (in_array($release['s'], $this->betterStates($state), true)) {
-                    $found = true;
-                    break;
-                }
-            } elseif (isset($version)) {
-                if ($release['v'] == $version) {
-                    $found = true;
-                    break;
-                }
-            } else {
-                if (in_array($release['s'], $states)) {
-                    $found = true;
-                    break;
-                }
-            }
-        }
-
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found, false, $channel);
-    }
-
-    function getDepDownloadURL($base, $xsdversion, $dependency, $deppackage,
-                               $prefstate = 'stable', $installed = false, $channel = false)
-    {
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-
-        $channel  = $dependency['channel'];
-        $package  = $dependency['name'];
-        $state    = isset($dependency['state'])   ? $dependency['state']   : null;
-        $version  = isset($dependency['version']) ? $dependency['version'] : null;
-        $restFile = $base . 'r/' . strtolower($package) . '/allreleases.xml';
-
-        $info = $this->_rest->retrieveData($restFile, false, false, $channel);
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('Package "' . $deppackage['channel'] . '/' . $deppackage['package']
-                . '" dependency "' . $channel . '/' . $package . '" has no releases');
-        }
-
-        if (!is_array($info) || !isset($info['r'])) {
-            return false;
-        }
-
-        $exclude = array();
-        $min = $max = $recommended = false;
-        if ($xsdversion == '1.0') {
-            switch ($dependency['rel']) {
-                case 'ge' :
-                    $min = $dependency['version'];
-                break;
-                case 'gt' :
-                    $min = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'eq' :
-                    $recommended = $dependency['version'];
-                break;
-                case 'lt' :
-                    $max = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'le' :
-                    $max = $dependency['version'];
-                break;
-                case 'ne' :
-                    $exclude = array($dependency['version']);
-                break;
-            }
-        } else {
-            $min = isset($dependency['min']) ? $dependency['min'] : false;
-            $max = isset($dependency['max']) ? $dependency['max'] : false;
-            $recommended = isset($dependency['recommended']) ?
-                $dependency['recommended'] : false;
-            if (isset($dependency['exclude'])) {
-                if (!isset($dependency['exclude'][0])) {
-                    $exclude = array($dependency['exclude']);
-                }
-            }
-        }
-        $release = $found = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-            if (in_array($release['v'], $exclude)) { // skip excluded versions
-                continue;
-            }
-            // allow newer releases to say "I'm OK with the dependent package"
-            if ($xsdversion == '2.0' && isset($release['co'])) {
-                if (!is_array($release['co']) || !isset($release['co'][0])) {
-                    $release['co'] = array($release['co']);
-                }
-                foreach ($release['co'] as $entry) {
-                    if (isset($entry['x']) && !is_array($entry['x'])) {
-                        $entry['x'] = array($entry['x']);
-                    } elseif (!isset($entry['x'])) {
-                        $entry['x'] = array();
-                    }
-                    if ($entry['c'] == $deppackage['channel'] &&
-                          strtolower($entry['p']) == strtolower($deppackage['package']) &&
-                          version_compare($deppackage['version'], $entry['min'], '>=') &&
-                          version_compare($deppackage['version'], $entry['max'], '<=') &&
-                          !in_array($release['v'], $entry['x'])) {
-                        $recommended = $release['v'];
-                        break;
-                    }
-                }
-            }
-            if ($recommended) {
-                if ($release['v'] != $recommended) { // if we want a specific
-                    // version, then skip all others
-                    continue;
-                } else {
-                    if (!in_array($release['s'], $states)) {
-                        // the stability is too low, but we must return the
-                        // recommended version if possible
-                        return $this->_returnDownloadURL($base, $package, $release, $info, true, false, $channel);
-                    }
-                }
-            }
-            if ($min && version_compare($release['v'], $min, 'lt')) { // skip too old versions
-                continue;
-            }
-            if ($max && version_compare($release['v'], $max, 'gt')) { // skip too new versions
-                continue;
-            }
-            if ($installed && version_compare($release['v'], $installed, '<')) {
-                continue;
-            }
-            if (in_array($release['s'], $states)) { // if in the preferred state...
-                $found = true; // ... then use it
-                break;
-            }
-        }
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found, false, $channel);
-    }
-
-    /**
-     * Take raw data and return the array needed for processing a download URL
-     *
-     * @param string $base REST base uri
-     * @param string $package Package name
-     * @param array $release an array of format array('v' => version, 's' => state)
-     *                       describing the release to download
-     * @param array $info list of all releases as defined by allreleases.xml
-     * @param bool|null $found determines whether the release was found or this is the next
-     *                    best alternative.  If null, then versions were skipped because
-     *                    of PHP dependency
-     * @return array|PEAR_Error
-     * @access private
-     */
-    function _returnDownloadURL($base, $package, $release, $info, $found, $phpversion = false, $channel = false)
-    {
-        if (!$found) {
-            $release = $info['r'][0];
-        }
-
-        $packageLower = strtolower($package);
-        $pinfo = $this->_rest->retrieveCacheFirst($base . 'p/' . $packageLower . '/' .
-            'info.xml', false, false, $channel);
-        if (PEAR::isError($pinfo)) {
-            return PEAR::raiseError('Package "' . $package .
-                '" does not have REST info xml available');
-        }
-
-        $releaseinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . $packageLower . '/' .
-            $release['v'] . '.xml', false, false, $channel);
-        if (PEAR::isError($releaseinfo)) {
-            return PEAR::raiseError('Package "' . $package . '" Version "' . $release['v'] .
-                '" does not have REST xml available');
-        }
-
-        $packagexml = $this->_rest->retrieveCacheFirst($base . 'r/' . $packageLower . '/' .
-            'deps.' . $release['v'] . '.txt', false, true, $channel);
-        if (PEAR::isError($packagexml)) {
-            return PEAR::raiseError('Package "' . $package . '" Version "' . $release['v'] .
-                '" does not have REST dependency information available');
-        }
-
-        $packagexml = unserialize($packagexml);
-        if (!$packagexml) {
-            $packagexml = array();
-        }
-
-        $allinfo = $this->_rest->retrieveData($base . 'r/' . $packageLower .
-            '/allreleases.xml', false, false, $channel);
-        if (!is_array($allinfo['r']) || !isset($allinfo['r'][0])) {
-            $allinfo['r'] = array($allinfo['r']);
-        }
-
-        $compatible = false;
-        foreach ($allinfo['r'] as $release) {
-            if ($release['v'] != $releaseinfo['v']) {
-                continue;
-            }
-
-            if (!isset($release['co'])) {
-                break;
-            }
-
-            $compatible = array();
-            if (!is_array($release['co']) || !isset($release['co'][0])) {
-                $release['co'] = array($release['co']);
-            }
-
-            foreach ($release['co'] as $entry) {
-                $comp = array();
-                $comp['name']    = $entry['p'];
-                $comp['channel'] = $entry['c'];
-                $comp['min']     = $entry['min'];
-                $comp['max']     = $entry['max'];
-                if (isset($entry['x']) && !is_array($entry['x'])) {
-                    $comp['exclude'] = $entry['x'];
-                }
-
-                $compatible[] = $comp;
-            }
-
-            if (count($compatible) == 1) {
-                $compatible = $compatible[0];
-            }
-
-            break;
-        }
-
-        $deprecated = false;
-        if (isset($pinfo['dc']) && isset($pinfo['dp'])) {
-            if (is_array($pinfo['dp'])) {
-                $deprecated = array('channel' => (string) $pinfo['dc'],
-                                    'package' => trim($pinfo['dp']['_content']));
-            } else {
-                $deprecated = array('channel' => (string) $pinfo['dc'],
-                                    'package' => trim($pinfo['dp']));
-            }
-        }
-
-        $return = array(
-            'version'    => $releaseinfo['v'],
-            'info'       => $packagexml,
-            'package'    => $releaseinfo['p']['_content'],
-            'stability'  => $releaseinfo['st'],
-            'compatible' => $compatible,
-            'deprecated' => $deprecated,
-        );
-
-        if ($found) {
-            $return['url'] = $releaseinfo['g'];
-            return $return;
-        }
-
-        $return['php'] = $phpversion;
-        return $return;
-    }
-
-    function listPackages($base, $channel = false)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return array();
-        }
-
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-
-        return $packagelist['p'];
-    }
-
-    /**
-     * List all categories of a REST server
-     *
-     * @param string $base base URL of the server
-     * @return array of categorynames
-     */
-    function listCategories($base, $channel = false)
-    {
-        $categories = array();
-
-        // c/categories.xml does not exist;
-        // check for every package its category manually
-        // This is SLOOOWWWW : ///
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            $ret = array();
-            return $ret;
-        }
-
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        foreach ($packagelist['p'] as $package) {
-                $inf = $this->_rest->retrieveData($base . 'p/' . strtolower($package) . '/info.xml', false, false, $channel);
-                if (PEAR::isError($inf)) {
-                    PEAR::popErrorHandling();
-                    return $inf;
-                }
-                $cat = $inf['ca']['_content'];
-                if (!isset($categories[$cat])) {
-                    $categories[$cat] = $inf['ca'];
-                }
-        }
-
-        return array_values($categories);
-    }
-
-    /**
-     * List a category of a REST server
-     *
-     * @param string $base base URL of the server
-     * @param string $category name of the category
-     * @param boolean $info also download full package info
-     * @return array of packagenames
-     */
-    function listCategory($base, $category, $info = false, $channel = false)
-    {
-        // gives '404 Not Found' error when category doesn't exist
-        $packagelist = $this->_rest->retrieveData($base.'c/'.urlencode($category).'/packages.xml', false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return array();
-        }
-
-        if (!is_array($packagelist['p']) ||
-            !isset($packagelist['p'][0])) { // only 1 pkg
-            $packagelist = array($packagelist['p']);
-        } else {
-            $packagelist = $packagelist['p'];
-        }
-
-        if ($info == true) {
-            // get individual package info
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            foreach ($packagelist as $i => $packageitem) {
-                $url = sprintf('%s'.'r/%s/latest.txt',
-                        $base,
-                        strtolower($packageitem['_content']));
-                $version = $this->_rest->retrieveData($url, false, false, $channel);
-                if (PEAR::isError($version)) {
-                    break; // skipit
-                }
-                $url = sprintf('%s'.'r/%s/%s.xml',
-                        $base,
-                        strtolower($packageitem['_content']),
-                        $version);
-                $info = $this->_rest->retrieveData($url, false, false, $channel);
-                if (PEAR::isError($info)) {
-                    break; // skipit
-                }
-                $packagelist[$i]['info'] = $info;
-            }
-            PEAR::popErrorHandling();
-        }
-
-        return $packagelist;
-    }
-
-
-    function listAll($base, $dostable, $basic = true, $searchpackage = false, $searchsummary = false, $channel = false)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-        if ($this->_rest->config->get('verbose') > 0) {
-            $ui = &PEAR_Frontend::singleton();
-            $ui->log('Retrieving data...0%', true);
-        }
-        $ret = array();
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return $ret;
-        }
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-
-        // only search-packagename = quicksearch !
-        if ($searchpackage && (!$searchsummary || empty($searchpackage))) {
-            $newpackagelist = array();
-            foreach ($packagelist['p'] as $package) {
-                if (!empty($searchpackage) && stristr($package, $searchpackage) !== false) {
-                    $newpackagelist[] = $package;
-                }
-            }
-            $packagelist['p'] = $newpackagelist;
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $next = .1;
-        foreach ($packagelist['p'] as $progress => $package) {
-            if ($this->_rest->config->get('verbose') > 0) {
-                if ($progress / count($packagelist['p']) >= $next) {
-                    if ($next == .5) {
-                        $ui->log('50%', false);
-                    } else {
-                        $ui->log('.', false);
-                    }
-                    $next += .1;
-                }
-            }
-
-            if ($basic) { // remote-list command
-                if ($dostable) {
-                    $latest = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                        '/stable.txt', false, false, $channel);
-                } else {
-                    $latest = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                        '/latest.txt', false, false, $channel);
-                }
-                if (PEAR::isError($latest)) {
-                    $latest = false;
-                }
-                $info = array('stable' => $latest);
-            } else { // list-all command
-                $inf = $this->_rest->retrieveData($base . 'p/' . strtolower($package) . '/info.xml', false, false, $channel);
-                if (PEAR::isError($inf)) {
-                    PEAR::popErrorHandling();
-                    return $inf;
-                }
-                if ($searchpackage) {
-                    $found = (!empty($searchpackage) && stristr($package, $searchpackage) !== false);
-                    if (!$found && !(isset($searchsummary) && !empty($searchsummary)
-                        && (stristr($inf['s'], $searchsummary) !== false
-                            || stristr($inf['d'], $searchsummary) !== false)))
-                    {
-                        continue;
-                    };
-                }
-                $releases = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                    '/allreleases.xml', false, false, $channel);
-                if (PEAR::isError($releases)) {
-                    continue;
-                }
-                if (!isset($releases['r'][0])) {
-                    $releases['r'] = array($releases['r']);
-                }
-                unset($latest);
-                unset($unstable);
-                unset($stable);
-                unset($state);
-                foreach ($releases['r'] as $release) {
-                    if (!isset($latest)) {
-                        if ($dostable && $release['s'] == 'stable') {
-                            $latest = $release['v'];
-                            $state = 'stable';
-                        }
-                        if (!$dostable) {
-                            $latest = $release['v'];
-                            $state = $release['s'];
-                        }
-                    }
-                    if (!isset($stable) && $release['s'] == 'stable') {
-                        $stable = $release['v'];
-                        if (!isset($unstable)) {
-                            $unstable = $stable;
-                        }
-                    }
-                    if (!isset($unstable) && $release['s'] != 'stable') {
-                        $latest = $unstable = $release['v'];
-                        $state = $release['s'];
-                    }
-                    if (isset($latest) && !isset($state)) {
-                        $state = $release['s'];
-                    }
-                    if (isset($latest) && isset($stable) && isset($unstable)) {
-                        break;
-                    }
-                }
-                $deps = array();
-                if (!isset($unstable)) {
-                    $unstable = false;
-                    $state = 'stable';
-                    if (isset($stable)) {
-                        $latest = $unstable = $stable;
-                    }
-                } else {
-                    $latest = $unstable;
-                }
-                if (!isset($latest)) {
-                    $latest = false;
-                }
-                if ($latest) {
-                    $d = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/deps.' .
-                        $latest . '.txt', false, false, $channel);
-                    if (!PEAR::isError($d)) {
-                        $d = unserialize($d);
-                        if ($d) {
-                            if (isset($d['required'])) {
-                                if (!class_exists('PEAR_PackageFile_v2')) {
-                                    require_once 'PEAR/PackageFile/v2.php';
-                                }
-                                if (!isset($pf)) {
-                                    $pf = new PEAR_PackageFile_v2;
-                                }
-                                $pf->setDeps($d);
-                                $tdeps = $pf->getDeps();
-                            } else {
-                                $tdeps = $d;
-                            }
-                            foreach ($tdeps as $dep) {
-                                if ($dep['type'] !== 'pkg') {
-                                    continue;
-                                }
-                                $deps[] = $dep;
-                            }
-                        }
-                    }
-                }
-                if (!isset($stable)) {
-                    $stable = '-n/a-';
-                }
-                if (!$searchpackage) {
-                    $info = array('stable' => $latest, 'summary' => $inf['s'], 'description' =>
-                        $inf['d'], 'deps' => $deps, 'category' => $inf['ca']['_content'],
-                        'unstable' => $unstable, 'state' => $state);
-                } else {
-                    $info = array('stable' => $stable, 'summary' => $inf['s'], 'description' =>
-                        $inf['d'], 'deps' => $deps, 'category' => $inf['ca']['_content'],
-                        'unstable' => $unstable, 'state' => $state);
-                }
-            }
-            $ret[$package] = $info;
-        }
-        PEAR::popErrorHandling();
-        return $ret;
-    }
-
-    function listLatestUpgrades($base, $pref_state, $installed, $channel, &$reg)
-    {
-        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-
-        $ret = array();
-        if (!is_array($packagelist) || !isset($packagelist['p'])) {
-            return $ret;
-        }
-
-        if (!is_array($packagelist['p'])) {
-            $packagelist['p'] = array($packagelist['p']);
-        }
-
-        foreach ($packagelist['p'] as $package) {
-            if (!isset($installed[strtolower($package)])) {
-                continue;
-            }
-
-            $inst_version = $reg->packageInfo($package, 'version', $channel);
-            $inst_state   = $reg->packageInfo($package, 'release_state', $channel);
-            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-            $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-                '/allreleases.xml', false, false, $channel);
-            PEAR::popErrorHandling();
-            if (PEAR::isError($info)) {
-                continue; // no remote releases
-            }
-
-            if (!isset($info['r'])) {
-                continue;
-            }
-
-            $release = $found = false;
-            if (!is_array($info['r']) || !isset($info['r'][0])) {
-                $info['r'] = array($info['r']);
-            }
-
-            // $info['r'] is sorted by version number
-            usort($info['r'], array($this, '_sortReleasesByVersionNumber'));
-            foreach ($info['r'] as $release) {
-                if ($inst_version && version_compare($release['v'], $inst_version, '<=')) {
-                    // not newer than the one installed
-                    break;
-                }
-
-                // new version > installed version
-                if (!$pref_state) {
-                    // every state is a good state
-                    $found = true;
-                    break;
-                } else {
-                    $new_state = $release['s'];
-                    // if new state >= installed state: go
-                    if (in_array($new_state, $this->betterStates($inst_state, true))) {
-                        $found = true;
-                        break;
-                    } else {
-                        // only allow to lower the state of package,
-                        // if new state >= preferred state: go
-                        if (in_array($new_state, $this->betterStates($pref_state, true))) {
-                            $found = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (!$found) {
-                continue;
-            }
-
-            $relinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' .
-                $release['v'] . '.xml', false, false, $channel);
-            if (PEAR::isError($relinfo)) {
-                return $relinfo;
-            }
-
-            $ret[$package] = array(
-                'version'  => $release['v'],
-                'state'    => $release['s'],
-                'filesize' => $relinfo['f'],
-            );
-        }
-
-        return $ret;
-    }
-
-    function packageInfo($base, $package, $channel = false)
-    {
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $pinfo = $this->_rest->retrieveData($base . 'p/' . strtolower($package) . '/info.xml', false, false, $channel);
-        if (PEAR::isError($pinfo)) {
-            PEAR::popErrorHandling();
-            return PEAR::raiseError('Unknown package: "' . $package . '" in channel "' . $channel . '"' . "\n". 'Debug: ' .
-                $pinfo->getMessage());
-        }
-
-        $releases = array();
-        $allreleases = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
-            '/allreleases.xml', false, false, $channel);
-        if (!PEAR::isError($allreleases)) {
-            if (!class_exists('PEAR_PackageFile_v2')) {
-                require_once 'PEAR/PackageFile/v2.php';
-            }
-
-            if (!is_array($allreleases['r']) || !isset($allreleases['r'][0])) {
-                $allreleases['r'] = array($allreleases['r']);
-            }
-
-            $pf = new PEAR_PackageFile_v2;
-            foreach ($allreleases['r'] as $release) {
-                $ds = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/deps.' .
-                    $release['v'] . '.txt', false, false, $channel);
-                if (PEAR::isError($ds)) {
-                    continue;
-                }
-
-                if (!isset($latest)) {
-                    $latest = $release['v'];
-                }
-
-                $pf->setDeps(unserialize($ds));
-                $ds = $pf->getDeps();
-                $info = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package)
-                    . '/' . $release['v'] . '.xml', false, false, $channel);
-
-                if (PEAR::isError($info)) {
-                    continue;
-                }
-
-                $releases[$release['v']] = array(
-                    'doneby' => $info['m'],
-                    'license' => $info['l'],
-                    'summary' => $info['s'],
-                    'description' => $info['d'],
-                    'releasedate' => $info['da'],
-                    'releasenotes' => $info['n'],
-                    'state' => $release['s'],
-                    'deps' => $ds ? $ds : array(),
-                );
-            }
-        } else {
-            $latest = '';
-        }
-
-        PEAR::popErrorHandling();
-        if (isset($pinfo['dc']) && isset($pinfo['dp'])) {
-            if (is_array($pinfo['dp'])) {
-                $deprecated = array('channel' => (string) $pinfo['dc'],
-                                    'package' => trim($pinfo['dp']['_content']));
-            } else {
-                $deprecated = array('channel' => (string) $pinfo['dc'],
-                                    'package' => trim($pinfo['dp']));
-            }
-        } else {
-            $deprecated = false;
-        }
-
-        if (!isset($latest)) {
-            $latest = '';
-        }
-
-        return array(
-            'name' => $pinfo['n'],
-            'channel' => $pinfo['c'],
-            'category' => $pinfo['ca']['_content'],
-            'stable' => $latest,
-            'license' => $pinfo['l'],
-            'summary' => $pinfo['s'],
-            'description' => $pinfo['d'],
-            'releases' => $releases,
-            'deprecated' => $deprecated,
-            );
-    }
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-
-        if ($include) {
-            $i--;
-        }
-
-        return array_slice($states, $i + 1);
-    }
-
-    /**
-     * Sort releases by version number
-     *
-     * @access private
-     */
-    function _sortReleasesByVersionNumber($a, $b)
-    {
-        if (version_compare($a['v'], $b['v'], '=')) {
-            return 0;
-        }
-
-        if (version_compare($a['v'], $b['v'], '>')) {
-            return -1;
-        }
-
-        if (version_compare($a['v'], $b['v'], '<')) {
-            return 1;
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/REST/11.php b/airtime_mvc/library/pear/PEAR/REST/11.php
deleted file mode 100644
index 19910e633..000000000
--- a/airtime_mvc/library/pear/PEAR/REST/11.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * PEAR_REST_11 - implement faster list-all/remote-list command
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 11.php 286670 2009-08-02 14:16:06Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.3
- */
-
-/**
- * For downloading REST xml/txt files
- */
-require_once 'PEAR/REST.php';
-
-/**
- * Implement REST 1.1
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.3
- */
-class PEAR_REST_11
-{
-    /**
-     * @var PEAR_REST
-     */
-    var $_rest;
-
-    function PEAR_REST_11($config, $options = array())
-    {
-        $this->_rest = &new PEAR_REST($config, $options);
-    }
-
-    function listAll($base, $dostable, $basic = true, $searchpackage = false, $searchsummary = false, $channel = false)
-    {
-        $categorylist = $this->_rest->retrieveData($base . 'c/categories.xml', false, false, $channel);
-        if (PEAR::isError($categorylist)) {
-            return $categorylist;
-        }
-
-        $ret = array();
-        if (!is_array($categorylist['c']) || !isset($categorylist['c'][0])) {
-            $categorylist['c'] = array($categorylist['c']);
-        }
-
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-
-        foreach ($categorylist['c'] as $progress => $category) {
-            $category = $category['_content'];
-            $packagesinfo = $this->_rest->retrieveData($base .
-                'c/' . urlencode($category) . '/packagesinfo.xml', false, false, $channel);
-
-            if (PEAR::isError($packagesinfo)) {
-                continue;
-            }
-
-            if (!is_array($packagesinfo) || !isset($packagesinfo['pi'])) {
-                continue;
-            }
-
-            if (!is_array($packagesinfo['pi']) || !isset($packagesinfo['pi'][0])) {
-                $packagesinfo['pi'] = array($packagesinfo['pi']);
-            }
-
-            foreach ($packagesinfo['pi'] as $packageinfo) {
-                if (empty($packageinfo)) {
-                    continue;
-                }
-
-                $info     = $packageinfo['p'];
-                $package  = $info['n'];
-                $releases = isset($packageinfo['a']) ? $packageinfo['a'] : false;
-                unset($latest);
-                unset($unstable);
-                unset($stable);
-                unset($state);
-
-                if ($releases) {
-                    if (!isset($releases['r'][0])) {
-                        $releases['r'] = array($releases['r']);
-                    }
-
-                    foreach ($releases['r'] as $release) {
-                        if (!isset($latest)) {
-                            if ($dostable && $release['s'] == 'stable') {
-                                $latest = $release['v'];
-                                $state = 'stable';
-                            }
-                            if (!$dostable) {
-                                $latest = $release['v'];
-                                $state = $release['s'];
-                            }
-                        }
-
-                        if (!isset($stable) && $release['s'] == 'stable') {
-                            $stable = $release['v'];
-                            if (!isset($unstable)) {
-                                $unstable = $stable;
-                            }
-                        }
-
-                        if (!isset($unstable) && $release['s'] != 'stable') {
-                            $unstable = $release['v'];
-                            $state = $release['s'];
-                        }
-
-                        if (isset($latest) && !isset($state)) {
-                            $state = $release['s'];
-                        }
-
-                        if (isset($latest) && isset($stable) && isset($unstable)) {
-                            break;
-                        }
-                    }
-                }
-
-                if ($basic) { // remote-list command
-                    if (!isset($latest)) {
-                        $latest = false;
-                    }
-
-                    if ($dostable) {
-                        // $state is not set if there are no releases
-                        if (isset($state) && $state == 'stable') {
-                            $ret[$package] = array('stable' => $latest);
-                        } else {
-                            $ret[$package] = array('stable' => '-n/a-');
-                        }
-                    } else {
-                        $ret[$package] = array('stable' => $latest);
-                    }
-
-                    continue;
-                }
-
-                // list-all command
-                if (!isset($unstable)) {
-                    $unstable = false;
-                    $state = 'stable';
-                    if (isset($stable)) {
-                        $latest = $unstable = $stable;
-                    }
-                } else {
-                    $latest = $unstable;
-                }
-
-                if (!isset($latest)) {
-                    $latest = false;
-                }
-
-                $deps = array();
-                if ($latest && isset($packageinfo['deps'])) {
-                    if (!is_array($packageinfo['deps']) ||
-                          !isset($packageinfo['deps'][0])
-                    ) {
-                        $packageinfo['deps'] = array($packageinfo['deps']);
-                    }
-
-                    $d = false;
-                    foreach ($packageinfo['deps'] as $dep) {
-                        if ($dep['v'] == $latest) {
-                            $d = unserialize($dep['d']);
-                        }
-                    }
-
-                    if ($d) {
-                        if (isset($d['required'])) {
-                            if (!class_exists('PEAR_PackageFile_v2')) {
-                                require_once 'PEAR/PackageFile/v2.php';
-                            }
-
-                            if (!isset($pf)) {
-                                $pf = new PEAR_PackageFile_v2;
-                            }
-
-                            $pf->setDeps($d);
-                            $tdeps = $pf->getDeps();
-                        } else {
-                            $tdeps = $d;
-                        }
-
-                        foreach ($tdeps as $dep) {
-                            if ($dep['type'] !== 'pkg') {
-                                continue;
-                            }
-
-                            $deps[] = $dep;
-                        }
-                    }
-                }
-
-                $info = array(
-                    'stable'      => $latest,
-                    'summary'     => $info['s'],
-                    'description' => $info['d'],
-                    'deps'        => $deps,
-                    'category'    => $info['ca']['_content'],
-                    'unstable'    => $unstable,
-                    'state'       => $state
-                );
-                $ret[$package] = $info;
-            }
-        }
-
-        PEAR::popErrorHandling();
-        return $ret;
-    }
-
-    /**
-     * List all categories of a REST server
-     *
-     * @param string $base base URL of the server
-     * @return array of categorynames
-     */
-    function listCategories($base, $channel = false)
-    {
-        $categorylist = $this->_rest->retrieveData($base . 'c/categories.xml', false, false, $channel);
-        if (PEAR::isError($categorylist)) {
-            return $categorylist;
-        }
-
-        if (!is_array($categorylist) || !isset($categorylist['c'])) {
-            return array();
-        }
-
-        if (isset($categorylist['c']['_content'])) {
-            // only 1 category
-            $categorylist['c'] = array($categorylist['c']);
-        }
-
-        return $categorylist['c'];
-    }
-
-    /**
-     * List packages in a category of a REST server
-     *
-     * @param string $base base URL of the server
-     * @param string $category name of the category
-     * @param boolean $info also download full package info
-     * @return array of packagenames
-     */
-    function listCategory($base, $category, $info = false, $channel = false)
-    {
-        if ($info == false) {
-            $url = '%s'.'c/%s/packages.xml';
-        } else {
-            $url = '%s'.'c/%s/packagesinfo.xml';
-        }
-        $url = sprintf($url,
-                    $base,
-                    urlencode($category));
-
-        // gives '404 Not Found' error when category doesn't exist
-        $packagelist = $this->_rest->retrieveData($url, false, false, $channel);
-        if (PEAR::isError($packagelist)) {
-            return $packagelist;
-        }
-        if (!is_array($packagelist)) {
-            return array();
-        }
-
-        if ($info == false) {
-            if (!isset($packagelist['p'])) {
-                return array();
-            }
-            if (!is_array($packagelist['p']) ||
-                !isset($packagelist['p'][0])) { // only 1 pkg
-                $packagelist = array($packagelist['p']);
-            } else {
-                $packagelist = $packagelist['p'];
-            }
-            return $packagelist;
-        }
-
-        // info == true
-        if (!isset($packagelist['pi'])) {
-            return array();
-        }
-
-        if (!is_array($packagelist['pi']) ||
-            !isset($packagelist['pi'][0])) { // only 1 pkg
-            $packagelist_pre = array($packagelist['pi']);
-        } else {
-            $packagelist_pre = $packagelist['pi'];
-        }
-
-        $packagelist = array();
-        foreach ($packagelist_pre as $i => $item) {
-            // compatibility with r/<latest.txt>.xml
-            if (isset($item['a']['r'][0])) {
-                // multiple releases
-                $item['p']['v'] = $item['a']['r'][0]['v'];
-                $item['p']['st'] = $item['a']['r'][0]['s'];
-            } elseif (isset($item['a'])) {
-                // first and only release
-                $item['p']['v'] = $item['a']['r']['v'];
-                $item['p']['st'] = $item['a']['r']['s'];
-            }
-
-            $packagelist[$i] = array('attribs' => $item['p']['r'],
-                                     '_content' => $item['p']['n'],
-                                     'info' => $item['p']);
-        }
-
-        return $packagelist;
-    }
-
-    /**
-     * Return an array containing all of the states that are more stable than
-     * or equal to the passed in state
-     *
-     * @param string Release state
-     * @param boolean Determines whether to include $state in the list
-     * @return false|array False if $state is not a valid release state
-     */
-    function betterStates($state, $include = false)
-    {
-        static $states = array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-        $i = array_search($state, $states);
-        if ($i === false) {
-            return false;
-        }
-        if ($include) {
-            $i--;
-        }
-        return array_slice($states, $i + 1);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/REST/13.php b/airtime_mvc/library/pear/PEAR/REST/13.php
deleted file mode 100644
index b6e6a86b5..000000000
--- a/airtime_mvc/library/pear/PEAR/REST/13.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * PEAR_REST_13
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 13.php 287110 2009-08-11 18:51:15Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a12
- */
-
-/**
- * For downloading REST xml/txt files
- */
-require_once 'PEAR/REST.php';
-require_once 'PEAR/REST/10.php';
-
-/**
- * Implement REST 1.3
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a12
- */
-class PEAR_REST_13 extends PEAR_REST_10
-{
-    /**
-     * Retrieve information about a remote package to be downloaded from a REST server
-     *
-     * This is smart enough to resolve the minimum PHP version dependency prior to download
-     * @param string $base The uri to prepend to all REST calls
-     * @param array $packageinfo an array of format:
-     * <pre>
-     *  array(
-     *   'package' => 'packagename',
-     *   'channel' => 'channelname',
-     *  ['state' => 'alpha' (or valid state),]
-     *  -or-
-     *  ['version' => '1.whatever']
-     * </pre>
-     * @param string $prefstate Current preferred_state config variable value
-     * @param bool $installed the installed version of this package to compare against
-     * @return array|false|PEAR_Error see {@link _returnDownloadURL()}
-     */
-    function getDownloadURL($base, $packageinfo, $prefstate, $installed, $channel = false)
-    {
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-
-        $channel  = $packageinfo['channel'];
-        $package  = $packageinfo['package'];
-        $state    = isset($packageinfo['state'])   ? $packageinfo['state']   : null;
-        $version  = isset($packageinfo['version']) ? $packageinfo['version'] : null;
-        $restFile = $base . 'r/' . strtolower($package) . '/allreleases2.xml';
-
-        $info = $this->_rest->retrieveData($restFile, false, false, $channel);
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('No releases available for package "' .
-                $channel . '/' . $package . '"');
-        }
-
-        if (!isset($info['r'])) {
-            return false;
-        }
-
-        $release = $found = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-
-        $skippedphp = false;
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-
-            if (isset($state)) {
-                // try our preferred state first
-                if ($release['s'] == $state) {
-                    if (!isset($version) && version_compare($release['m'], phpversion(), '>')) {
-                        // skip releases that require a PHP version newer than our PHP version
-                        $skippedphp = $release;
-                        continue;
-                    }
-                    $found = true;
-                    break;
-                }
-
-                // see if there is something newer and more stable
-                // bug #7221
-                if (in_array($release['s'], $this->betterStates($state), true)) {
-                    if (!isset($version) && version_compare($release['m'], phpversion(), '>')) {
-                        // skip releases that require a PHP version newer than our PHP version
-                        $skippedphp = $release;
-                        continue;
-                    }
-                    $found = true;
-                    break;
-                }
-            } elseif (isset($version)) {
-                if ($release['v'] == $version) {
-                    if (!isset($this->_rest->_options['force']) &&
-                          !isset($version) &&
-                          version_compare($release['m'], phpversion(), '>')) {
-                        // skip releases that require a PHP version newer than our PHP version
-                        $skippedphp = $release;
-                        continue;
-                    }
-                    $found = true;
-                    break;
-                }
-            } else {
-                if (in_array($release['s'], $states)) {
-                    if (version_compare($release['m'], phpversion(), '>')) {
-                        // skip releases that require a PHP version newer than our PHP version
-                        $skippedphp = $release;
-                        continue;
-                    }
-                    $found = true;
-                    break;
-                }
-            }
-        }
-
-        if (!$found && $skippedphp) {
-            $found = null;
-        }
-
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found, $skippedphp, $channel);
-    }
-
-    function getDepDownloadURL($base, $xsdversion, $dependency, $deppackage,
-                               $prefstate = 'stable', $installed = false, $channel = false)
-    {
-        $states = $this->betterStates($prefstate, true);
-        if (!$states) {
-            return PEAR::raiseError('"' . $prefstate . '" is not a valid state');
-        }
-
-        $channel  = $dependency['channel'];
-        $package  = $dependency['name'];
-        $state    = isset($dependency['state'])   ? $dependency['state']   : null;
-        $version  = isset($dependency['version']) ? $dependency['version'] : null;
-        $restFile = $base . 'r/' . strtolower($package) .'/allreleases2.xml';
-
-        $info = $this->_rest->retrieveData($restFile, false, false, $channel);
-        if (PEAR::isError($info)) {
-            return PEAR::raiseError('Package "' . $deppackage['channel'] . '/' . $deppackage['package']
-                . '" dependency "' . $channel . '/' . $package . '" has no releases');
-        }
-
-        if (!is_array($info) || !isset($info['r'])) {
-            return false;
-        }
-
-        $exclude = array();
-        $min = $max = $recommended = false;
-        if ($xsdversion == '1.0') {
-            $pinfo['package'] = $dependency['name'];
-            $pinfo['channel'] = 'pear.php.net'; // this is always true - don't change this
-            switch ($dependency['rel']) {
-                case 'ge' :
-                    $min = $dependency['version'];
-                break;
-                case 'gt' :
-                    $min = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'eq' :
-                    $recommended = $dependency['version'];
-                break;
-                case 'lt' :
-                    $max = $dependency['version'];
-                    $exclude = array($dependency['version']);
-                break;
-                case 'le' :
-                    $max = $dependency['version'];
-                break;
-                case 'ne' :
-                    $exclude = array($dependency['version']);
-                break;
-            }
-        } else {
-            $pinfo['package'] = $dependency['name'];
-            $min = isset($dependency['min']) ? $dependency['min'] : false;
-            $max = isset($dependency['max']) ? $dependency['max'] : false;
-            $recommended = isset($dependency['recommended']) ?
-                $dependency['recommended'] : false;
-            if (isset($dependency['exclude'])) {
-                if (!isset($dependency['exclude'][0])) {
-                    $exclude = array($dependency['exclude']);
-                }
-            }
-        }
-
-        $skippedphp = $found = $release = false;
-        if (!is_array($info['r']) || !isset($info['r'][0])) {
-            $info['r'] = array($info['r']);
-        }
-
-        foreach ($info['r'] as $release) {
-            if (!isset($this->_rest->_options['force']) && ($installed &&
-                  version_compare($release['v'], $installed, '<'))) {
-                continue;
-            }
-
-            if (in_array($release['v'], $exclude)) { // skip excluded versions
-                continue;
-            }
-
-            // allow newer releases to say "I'm OK with the dependent package"
-            if ($xsdversion == '2.0' && isset($release['co'])) {
-                if (!is_array($release['co']) || !isset($release['co'][0])) {
-                    $release['co'] = array($release['co']);
-                }
-
-                foreach ($release['co'] as $entry) {
-                    if (isset($entry['x']) && !is_array($entry['x'])) {
-                        $entry['x'] = array($entry['x']);
-                    } elseif (!isset($entry['x'])) {
-                        $entry['x'] = array();
-                    }
-
-                    if ($entry['c'] == $deppackage['channel'] &&
-                          strtolower($entry['p']) == strtolower($deppackage['package']) &&
-                          version_compare($deppackage['version'], $entry['min'], '>=') &&
-                          version_compare($deppackage['version'], $entry['max'], '<=') &&
-                          !in_array($release['v'], $entry['x'])) {
-                        if (version_compare($release['m'], phpversion(), '>')) {
-                            // skip dependency releases that require a PHP version
-                            // newer than our PHP version
-                            $skippedphp = $release;
-                            continue;
-                        }
-
-                        $recommended = $release['v'];
-                        break;
-                    }
-                }
-            }
-
-            if ($recommended) {
-                if ($release['v'] != $recommended) { // if we want a specific
-                    // version, then skip all others
-                    continue;
-                }
-
-                if (!in_array($release['s'], $states)) {
-                    // the stability is too low, but we must return the
-                    // recommended version if possible
-                    return $this->_returnDownloadURL($base, $package, $release, $info, true, false, $channel);
-                }
-            }
-
-            if ($min && version_compare($release['v'], $min, 'lt')) { // skip too old versions
-                continue;
-            }
-
-            if ($max && version_compare($release['v'], $max, 'gt')) { // skip too new versions
-                continue;
-            }
-
-            if ($installed && version_compare($release['v'], $installed, '<')) {
-                continue;
-            }
-
-            if (in_array($release['s'], $states)) { // if in the preferred state...
-                if (version_compare($release['m'], phpversion(), '>')) {
-                    // skip dependency releases that require a PHP version
-                    // newer than our PHP version
-                    $skippedphp = $release;
-                    continue;
-                }
-
-                $found = true; // ... then use it
-                break;
-            }
-        }
-
-        if (!$found && $skippedphp) {
-            $found = null;
-        }
-
-        return $this->_returnDownloadURL($base, $package, $release, $info, $found, $skippedphp, $channel);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Registry.php b/airtime_mvc/library/pear/PEAR/Registry.php
deleted file mode 100644
index 4dd0734a9..000000000
--- a/airtime_mvc/library/pear/PEAR/Registry.php
+++ /dev/null
@@ -1,2395 +0,0 @@
-<?php
-/**
- * PEAR_Registry
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Registry.php 287555 2009-08-21 21:27:27Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * for PEAR_Error
- */
-require_once 'PEAR.php';
-require_once 'PEAR/DependencyDB.php';
-
-define('PEAR_REGISTRY_ERROR_LOCK',         -2);
-define('PEAR_REGISTRY_ERROR_FORMAT',       -3);
-define('PEAR_REGISTRY_ERROR_FILE',         -4);
-define('PEAR_REGISTRY_ERROR_CONFLICT',     -5);
-define('PEAR_REGISTRY_ERROR_CHANNEL_FILE', -6);
-
-/**
- * Administration class used to maintain the installed package database.
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V. V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Registry extends PEAR
-{
-    /**
-     * File containing all channel information.
-     * @var string
-     */
-    var $channels = '';
-
-    /** Directory where registry files are stored.
-     * @var string
-     */
-    var $statedir = '';
-
-    /** File where the file map is stored
-     * @var string
-     */
-    var $filemap = '';
-
-    /** Directory where registry files for channels are stored.
-     * @var string
-     */
-    var $channelsdir = '';
-
-    /** Name of file used for locking the registry
-     * @var string
-     */
-    var $lockfile = '';
-
-    /** File descriptor used during locking
-     * @var resource
-     */
-    var $lock_fp = null;
-
-    /** Mode used during locking
-     * @var int
-     */
-    var $lock_mode = 0; // XXX UNUSED
-
-    /** Cache of package information.  Structure:
-     * array(
-     *   'package' => array('id' => ... ),
-     *   ... )
-     * @var array
-     */
-    var $pkginfo_cache = array();
-
-    /** Cache of file map.  Structure:
-     * array( '/path/to/file' => 'package', ... )
-     * @var array
-     */
-    var $filemap_cache = array();
-
-    /**
-     * @var false|PEAR_ChannelFile
-     */
-    var $_pearChannel;
-
-    /**
-     * @var false|PEAR_ChannelFile
-     */
-    var $_peclChannel;
-
-    /**
-     * @var false|PEAR_ChannelFile
-     */
-    var $_docChannel;
-
-    /**
-     * @var PEAR_DependencyDB
-     */
-    var $_dependencyDB;
-
-    /**
-     * @var PEAR_Config
-     */
-    var $_config;
-
-    /**
-     * PEAR_Registry constructor.
-     *
-     * @param string (optional) PEAR install directory (for .php files)
-     * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PEAR channel, if
-     *        default values are not desired.  Only used the very first time a PEAR
-     *        repository is initialized
-     * @param PEAR_ChannelFile PEAR_ChannelFile object representing the PECL channel, if
-     *        default values are not desired.  Only used the very first time a PEAR
-     *        repository is initialized
-     *
-     * @access public
-     */
-    function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
-                           $pecl_channel = false)
-    {
-        parent::PEAR();
-        $this->setInstallDir($pear_install_dir);
-        $this->_pearChannel = $pear_channel;
-        $this->_peclChannel = $pecl_channel;
-        $this->_config      = false;
-    }
-
-    function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR)
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        $this->install_dir = $pear_install_dir;
-        $this->channelsdir = $pear_install_dir.$ds.'.channels';
-        $this->statedir    = $pear_install_dir.$ds.'.registry';
-        $this->filemap     = $pear_install_dir.$ds.'.filemap';
-        $this->lockfile    = $pear_install_dir.$ds.'.lock';
-    }
-
-    function hasWriteAccess()
-    {
-        if (!file_exists($this->install_dir)) {
-            $dir = $this->install_dir;
-            while ($dir && $dir != '.') {
-                $olddir = $dir;
-                $dir    = dirname($dir);
-                if ($dir != '.' && file_exists($dir)) {
-                    if (is_writeable($dir)) {
-                        return true;
-                    }
-
-                    return false;
-                }
-
-                if ($dir == $olddir) { // this can happen in safe mode
-                    return @is_writable($dir);
-                }
-            }
-
-            return false;
-        }
-
-        return is_writeable($this->install_dir);
-    }
-
-    function setConfig(&$config, $resetInstallDir = true)
-    {
-        $this->_config = &$config;
-        if ($resetInstallDir) {
-            $this->setInstallDir($config->get('php_dir'));
-        }
-    }
-
-    function _initializeChannelDirs()
-    {
-        static $running = false;
-        if (!$running) {
-            $running = true;
-            $ds = DIRECTORY_SEPARATOR;
-            if (!is_dir($this->channelsdir) ||
-                  !file_exists($this->channelsdir . $ds . 'pear.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'pecl.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'doc.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-                    $pear_channel = $this->_pearChannel;
-                    if (!is_a($pear_channel, 'PEAR_ChannelFile') || !$pear_channel->validate()) {
-                        if (!class_exists('PEAR_ChannelFile')) {
-                            require_once 'PEAR/ChannelFile.php';
-                        }
-
-                        $pear_channel = new PEAR_ChannelFile;
-                        $pear_channel->setAlias('pear');
-                        $pear_channel->setServer('pear.php.net');
-                        $pear_channel->setSummary('PHP Extension and Application Repository');
-                        $pear_channel->setDefaultPEARProtocols();
-                        $pear_channel->setBaseURL('REST1.0', 'http://pear.php.net/rest/');
-                        $pear_channel->setBaseURL('REST1.1', 'http://pear.php.net/rest/');
-                        $pear_channel->setBaseURL('REST1.3', 'http://pear.php.net/rest/');
-                        //$pear_channel->setBaseURL('REST1.4', 'http://pear.php.net/rest/');
-                    } else {
-                        $pear_channel->setServer('pear.php.net');
-                        $pear_channel->setAlias('pear');
-                    }
-
-                    $pear_channel->validate();
-                    $this->_addChannel($pear_channel);
-                }
-
-                if (!file_exists($this->channelsdir . $ds . 'pecl.php.net.reg')) {
-                    $pecl_channel = $this->_peclChannel;
-                    if (!is_a($pecl_channel, 'PEAR_ChannelFile') || !$pecl_channel->validate()) {
-                        if (!class_exists('PEAR_ChannelFile')) {
-                            require_once 'PEAR/ChannelFile.php';
-                        }
-
-                        $pecl_channel = new PEAR_ChannelFile;
-                        $pecl_channel->setAlias('pecl');
-                        $pecl_channel->setServer('pecl.php.net');
-                        $pecl_channel->setSummary('PHP Extension Community Library');
-                        $pecl_channel->setDefaultPEARProtocols();
-                        $pecl_channel->setBaseURL('REST1.0', 'http://pecl.php.net/rest/');
-                        $pecl_channel->setBaseURL('REST1.1', 'http://pecl.php.net/rest/');
-                        $pecl_channel->setValidationPackage('PEAR_Validator_PECL', '1.0');
-                    } else {
-                        $pecl_channel->setServer('pecl.php.net');
-                        $pecl_channel->setAlias('pecl');
-                    }
-
-                    $pecl_channel->validate();
-                    $this->_addChannel($pecl_channel);
-                }
-
-                if (!file_exists($this->channelsdir . $ds . 'doc.php.net.reg')) {
-                    $doc_channel = $this->_docChannel;
-                    if (!is_a($doc_channel, 'PEAR_ChannelFile') || !$doc_channel->validate()) {
-                        if (!class_exists('PEAR_ChannelFile')) {
-                            require_once 'PEAR/ChannelFile.php';
-                        }
-
-                        $doc_channel = new PEAR_ChannelFile;
-                        $doc_channel->setAlias('phpdocs');
-                        $doc_channel->setServer('doc.php.net');
-                        $doc_channel->setSummary('PHP Documentation Team');
-                        $doc_channel->setDefaultPEARProtocols();
-                        $doc_channel->setBaseURL('REST1.0', 'http://doc.php.net/rest/');
-                        $doc_channel->setBaseURL('REST1.1', 'http://doc.php.net/rest/');
-                        $doc_channel->setBaseURL('REST1.3', 'http://doc.php.net/rest/');
-                    } else {
-                        $doc_channel->setServer('doc.php.net');
-                        $doc_channel->setAlias('doc');
-                    }
-
-                    $doc_channel->validate();
-                    $this->_addChannel($doc_channel);
-                }
-
-                if (!file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                    if (!class_exists('PEAR_ChannelFile')) {
-                        require_once 'PEAR/ChannelFile.php';
-                    }
-
-                    $private = new PEAR_ChannelFile;
-                    $private->setName('__uri');
-                    $private->setDefaultPEARProtocols();
-                    $private->setBaseURL('REST1.0', '****');
-                    $private->setSummary('Pseudo-channel for static packages');
-                    $this->_addChannel($private);
-                }
-                $this->_rebuildFileMap();
-            }
-
-            $running = false;
-        }
-    }
-
-    function _initializeDirs()
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        // XXX Compatibility code should be removed in the future
-        // rename all registry files if any to lowercase
-        if (!OS_WINDOWS && file_exists($this->statedir) && is_dir($this->statedir) &&
-              $handle = opendir($this->statedir)) {
-            $dest = $this->statedir . $ds;
-            while (false !== ($file = readdir($handle))) {
-                if (preg_match('/^.*[A-Z].*\.reg\\z/', $file)) {
-                    rename($dest . $file, $dest . strtolower($file));
-                }
-            }
-            closedir($handle);
-        }
-
-        $this->_initializeChannelDirs();
-        if (!file_exists($this->filemap)) {
-            $this->_rebuildFileMap();
-        }
-        $this->_initializeDepDB();
-    }
-
-    function _initializeDepDB()
-    {
-        if (!isset($this->_dependencyDB)) {
-            static $initializing = false;
-            if (!$initializing) {
-                $initializing = true;
-                if (!$this->_config) { // never used?
-                    $file = OS_WINDOWS ? 'pear.ini' : '.pearrc';
-                    $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
-                        $file);
-                    $this->_config->setRegistry($this);
-                    $this->_config->set('php_dir', $this->install_dir);
-                }
-
-                $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
-                if (PEAR::isError($this->_dependencyDB)) {
-                    // attempt to recover by removing the dep db
-                    if (file_exists($this->_config->get('php_dir', null, 'pear.php.net') .
-                        DIRECTORY_SEPARATOR . '.depdb')) {
-                        @unlink($this->_config->get('php_dir', null, 'pear.php.net') .
-                            DIRECTORY_SEPARATOR . '.depdb');
-                    }
-
-                    $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
-                    if (PEAR::isError($this->_dependencyDB)) {
-                        echo $this->_dependencyDB->getMessage();
-                        echo 'Unrecoverable error';
-                        exit(1);
-                    }
-                }
-
-                $initializing = false;
-            }
-        }
-    }
-
-    /**
-     * PEAR_Registry destructor.  Makes sure no locks are forgotten.
-     *
-     * @access private
-     */
-    function _PEAR_Registry()
-    {
-        parent::_PEAR();
-        if (is_resource($this->lock_fp)) {
-            $this->_unlock();
-        }
-    }
-
-    /**
-     * Make sure the directory where we keep registry files exists.
-     *
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertStateDir($channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_assertChannelStateDir($channel);
-        }
-
-        static $init = false;
-        if (!file_exists($this->statedir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->statedir))) {
-                return $this->raiseError("could not create directory '{$this->statedir}'");
-            }
-            $init = true;
-        } elseif (!is_dir($this->statedir)) {
-            return $this->raiseError('Cannot create directory ' . $this->statedir . ', ' .
-                'it already exists and is not a directory');
-        }
-
-        $ds = DIRECTORY_SEPARATOR;
-        if (!file_exists($this->channelsdir)) {
-            if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'pecl.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . 'doc.php.net.reg') ||
-                  !file_exists($this->channelsdir . $ds . '__uri.reg')) {
-                $init = true;
-            }
-        } elseif (!is_dir($this->channelsdir)) {
-            return $this->raiseError('Cannot create directory ' . $this->channelsdir . ', ' .
-                'it already exists and is not a directory');
-        }
-
-        if ($init) {
-            static $running = false;
-            if (!$running) {
-                $running = true;
-                $this->_initializeDirs();
-                $running = false;
-                $init = false;
-            }
-        } else {
-            $this->_initializeDepDB();
-        }
-
-        return true;
-    }
-
-    /**
-     * Make sure the directory where we keep registry files exists for a non-standard channel.
-     *
-     * @param string channel name
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertChannelStateDir($channel)
-    {
-        $ds = DIRECTORY_SEPARATOR;
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            if (!file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-                $this->_initializeChannelDirs();
-            }
-            return $this->_assertStateDir($channel);
-        }
-
-        $channelDir = $this->_channelDirectoryName($channel);
-        if (!is_dir($this->channelsdir) ||
-              !file_exists($this->channelsdir . $ds . 'pear.php.net.reg')) {
-            $this->_initializeChannelDirs();
-        }
-
-        if (!file_exists($channelDir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $channelDir))) {
-                return $this->raiseError("could not create directory '" . $channelDir .
-                    "'");
-            }
-        } elseif (!is_dir($channelDir)) {
-            return $this->raiseError("could not create directory '" . $channelDir .
-                "', already exists and is not a directory");
-        }
-
-        return true;
-    }
-
-    /**
-     * Make sure the directory where we keep registry files for channels exists
-     *
-     * @return bool TRUE if directory exists, FALSE if it could not be
-     * created
-     *
-     * @access private
-     */
-    function _assertChannelDir()
-    {
-        if (!file_exists($this->channelsdir)) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->channelsdir))) {
-                return $this->raiseError("could not create directory '{$this->channelsdir}'");
-            }
-        } elseif (!is_dir($this->channelsdir)) {
-            return $this->raiseError("could not create directory '{$this->channelsdir}" .
-                "', it already exists and is not a directory");
-        }
-
-        if (!file_exists($this->channelsdir . DIRECTORY_SEPARATOR . '.alias')) {
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-
-            require_once 'System.php';
-            if (!System::mkdir(array('-p', $this->channelsdir . DIRECTORY_SEPARATOR . '.alias'))) {
-                return $this->raiseError("could not create directory '{$this->channelsdir}/.alias'");
-            }
-        } elseif (!is_dir($this->channelsdir . DIRECTORY_SEPARATOR . '.alias')) {
-            return $this->raiseError("could not create directory '{$this->channelsdir}" .
-                "/.alias', it already exists and is not a directory");
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the name of the file where data for a given package is stored.
-     *
-     * @param string channel name, or false if this is a PEAR package
-     * @param string package name
-     *
-     * @return string registry file name
-     *
-     * @access public
-     */
-    function _packageFileName($package, $channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_channelDirectoryName($channel) . DIRECTORY_SEPARATOR .
-                strtolower($package) . '.reg';
-        }
-
-        return $this->statedir . DIRECTORY_SEPARATOR . strtolower($package) . '.reg';
-    }
-
-    /**
-     * Get the name of the file where data for a given channel is stored.
-     * @param string channel name
-     * @return string registry file name
-     */
-    function _channelFileName($channel, $noaliases = false)
-    {
-        if (!$noaliases) {
-            if (file_exists($this->_getChannelAliasFileName($channel))) {
-                $channel = implode('', file($this->_getChannelAliasFileName($channel)));
-            }
-        }
-        return $this->channelsdir . DIRECTORY_SEPARATOR . str_replace('/', '_',
-            strtolower($channel)) . '.reg';
-    }
-
-    /**
-     * @param string
-     * @return string
-     */
-    function _getChannelAliasFileName($alias)
-    {
-        return $this->channelsdir . DIRECTORY_SEPARATOR . '.alias' .
-              DIRECTORY_SEPARATOR . str_replace('/', '_', strtolower($alias)) . '.txt';
-    }
-
-    /**
-     * Get the name of a channel from its alias
-     */
-    function _getChannelFromAlias($channel)
-    {
-        if (!$this->_channelExists($channel)) {
-            if ($channel == 'pear.php.net') {
-                return 'pear.php.net';
-            }
-
-            if ($channel == 'pecl.php.net') {
-                return 'pecl.php.net';
-            }
-
-            if ($channel == 'doc.php.net') {
-                return 'doc.php.net';
-            }
-
-            if ($channel == '__uri') {
-                return '__uri';
-            }
-
-            return false;
-        }
-
-        $channel = strtolower($channel);
-        if (file_exists($this->_getChannelAliasFileName($channel))) {
-            // translate an alias to an actual channel
-            return implode('', file($this->_getChannelAliasFileName($channel)));
-        }
-
-        return $channel;
-    }
-
-    /**
-     * Get the alias of a channel from its alias or its name
-     */
-    function _getAlias($channel)
-    {
-        if (!$this->_channelExists($channel)) {
-            if ($channel == 'pear.php.net') {
-                return 'pear';
-            }
-
-            if ($channel == 'pecl.php.net') {
-                return 'pecl';
-            }
-
-            if ($channel == 'doc.php.net') {
-                return 'phpdocs';
-            }
-
-            return false;
-        }
-
-        $channel = $this->_getChannel($channel);
-        if (PEAR::isError($channel)) {
-            return $channel;
-        }
-
-        return $channel->getAlias();
-    }
-
-    /**
-     * Get the name of the file where data for a given package is stored.
-     *
-     * @param string channel name, or false if this is a PEAR package
-     * @param string package name
-     *
-     * @return string registry file name
-     *
-     * @access public
-     */
-    function _channelDirectoryName($channel)
-    {
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            return $this->statedir;
-        }
-
-        $ch = $this->_getChannelFromAlias($channel);
-        if (!$ch) {
-            $ch = $channel;
-        }
-
-        return $this->statedir . DIRECTORY_SEPARATOR . strtolower('.channel.' .
-            str_replace('/', '_', $ch));
-    }
-
-    function _openPackageFile($package, $mode, $channel = false)
-    {
-        if (!$this->_assertStateDir($channel)) {
-            return null;
-        }
-
-        if (!in_array($mode, array('r', 'rb')) && !$this->hasWriteAccess()) {
-            return null;
-        }
-
-        $file = $this->_packageFileName($package, $channel);
-        if (!file_exists($file) && $mode == 'r' || $mode == 'rb') {
-            return null;
-        }
-
-        $fp = @fopen($file, $mode);
-        if (!$fp) {
-            return null;
-        }
-
-        return $fp;
-    }
-
-    function _closePackageFile($fp)
-    {
-        fclose($fp);
-    }
-
-    function _openChannelFile($channel, $mode)
-    {
-        if (!$this->_assertChannelDir()) {
-            return null;
-        }
-
-        if (!in_array($mode, array('r', 'rb')) && !$this->hasWriteAccess()) {
-            return null;
-        }
-
-        $file = $this->_channelFileName($channel);
-        if (!file_exists($file) && $mode == 'r' || $mode == 'rb') {
-            return null;
-        }
-
-        $fp = @fopen($file, $mode);
-        if (!$fp) {
-            return null;
-        }
-
-        return $fp;
-    }
-
-    function _closeChannelFile($fp)
-    {
-        fclose($fp);
-    }
-
-    function _rebuildFileMap()
-    {
-        if (!class_exists('PEAR_Installer_Role')) {
-            require_once 'PEAR/Installer/Role.php';
-        }
-
-        $channels = $this->_listAllPackages();
-        $files = array();
-        foreach ($channels as $channel => $packages) {
-            foreach ($packages as $package) {
-                $version = $this->_packageInfo($package, 'version', $channel);
-                $filelist = $this->_packageInfo($package, 'filelist', $channel);
-                if (!is_array($filelist)) {
-                    continue;
-                }
-
-                foreach ($filelist as $name => $attrs) {
-                    if (isset($attrs['attribs'])) {
-                        $attrs = $attrs['attribs'];
-                    }
-
-                    // it is possible for conflicting packages in different channels to
-                    // conflict with data files/doc files
-                    if ($name == 'dirtree') {
-                        continue;
-                    }
-
-                    if (isset($attrs['role']) && !in_array($attrs['role'],
-                          PEAR_Installer_Role::getInstallableRoles())) {
-                        // these are not installed
-                        continue;
-                    }
-
-                    if (isset($attrs['role']) && !in_array($attrs['role'],
-                          PEAR_Installer_Role::getBaseinstallRoles())) {
-                        $attrs['baseinstalldir'] = $package;
-                    }
-
-                    if (isset($attrs['baseinstalldir'])) {
-                        $file = $attrs['baseinstalldir'].DIRECTORY_SEPARATOR.$name;
-                    } else {
-                        $file = $name;
-                    }
-
-                    $file = preg_replace(',^/+,', '', $file);
-                    if ($channel != 'pear.php.net') {
-                        if (!isset($files[$attrs['role']])) {
-                            $files[$attrs['role']] = array();
-                        }
-                        $files[$attrs['role']][$file] = array(strtolower($channel),
-                            strtolower($package));
-                    } else {
-                        if (!isset($files[$attrs['role']])) {
-                            $files[$attrs['role']] = array();
-                        }
-                        $files[$attrs['role']][$file] = strtolower($package);
-                    }
-                }
-            }
-        }
-
-
-        $this->_assertStateDir();
-        if (!$this->hasWriteAccess()) {
-            return false;
-        }
-
-        $fp = @fopen($this->filemap, 'wb');
-        if (!$fp) {
-            return false;
-        }
-
-        $this->filemap_cache = $files;
-        fwrite($fp, serialize($files));
-        fclose($fp);
-        return true;
-    }
-
-    function _readFileMap()
-    {
-        if (!file_exists($this->filemap)) {
-            return array();
-        }
-
-        $fp = @fopen($this->filemap, 'r');
-        if (!$fp) {
-            return $this->raiseError('PEAR_Registry: could not open filemap "' . $this->filemap . '"', PEAR_REGISTRY_ERROR_FILE, null, null, $php_errormsg);
-        }
-
-        clearstatcache();
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        $fsize = filesize($this->filemap);
-        fclose($fp);
-        $data = file_get_contents($this->filemap);
-        set_magic_quotes_runtime($rt);
-        $tmp = unserialize($data);
-        if (!$tmp && $fsize > 7) {
-            return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
-        }
-
-        $this->filemap_cache = $tmp;
-        return true;
-    }
-
-    /**
-     * Lock the registry.
-     *
-     * @param integer lock mode, one of LOCK_EX, LOCK_SH or LOCK_UN.
-     *                See flock manual for more information.
-     *
-     * @return bool TRUE on success, FALSE if locking failed, or a
-     *              PEAR error if some other error occurs (such as the
-     *              lock file not being writable).
-     *
-     * @access private
-     */
-    function _lock($mode = LOCK_EX)
-    {
-        if (stristr(php_uname(), 'Windows 9')) {
-            return true;
-        }
-
-        if ($mode != LOCK_UN && is_resource($this->lock_fp)) {
-            // XXX does not check type of lock (LOCK_SH/LOCK_EX)
-            return true;
-        }
-
-        if (!$this->_assertStateDir()) {
-            if ($mode == LOCK_EX) {
-                return $this->raiseError('Registry directory is not writeable by the current user');
-            }
-
-            return true;
-        }
-
-        $open_mode = 'w';
-        // XXX People reported problems with LOCK_SH and 'w'
-        if ($mode === LOCK_SH || $mode === LOCK_UN) {
-            if (!file_exists($this->lockfile)) {
-                touch($this->lockfile);
-            }
-            $open_mode = 'r';
-        }
-
-        if (!is_resource($this->lock_fp)) {
-            $this->lock_fp = @fopen($this->lockfile, $open_mode);
-        }
-
-        if (!is_resource($this->lock_fp)) {
-            $this->lock_fp = null;
-            return $this->raiseError("could not create lock file" .
-                                     (isset($php_errormsg) ? ": " . $php_errormsg : ""));
-        }
-
-        if (!(int)flock($this->lock_fp, $mode)) {
-            switch ($mode) {
-                case LOCK_SH: $str = 'shared';    break;
-                case LOCK_EX: $str = 'exclusive'; break;
-                case LOCK_UN: $str = 'unlock';    break;
-                default:      $str = 'unknown';   break;
-            }
-
-            //is resource at this point, close it on error.
-            fclose($this->lock_fp);
-            $this->lock_fp = null;
-            return $this->raiseError("could not acquire $str lock ($this->lockfile)",
-                                     PEAR_REGISTRY_ERROR_LOCK);
-        }
-
-        return true;
-    }
-
-    function _unlock()
-    {
-        $ret = $this->_lock(LOCK_UN);
-        if (is_resource($this->lock_fp)) {
-            fclose($this->lock_fp);
-        }
-
-        $this->lock_fp = null;
-        return $ret;
-    }
-
-    function _packageExists($package, $channel = false)
-    {
-        return file_exists($this->_packageFileName($package, $channel));
-    }
-
-    /**
-     * Determine whether a channel exists in the registry
-     *
-     * @param string Channel name
-     * @param bool if true, then aliases will be ignored
-     * @return boolean
-     */
-    function _channelExists($channel, $noaliases = false)
-    {
-        $a = file_exists($this->_channelFileName($channel, $noaliases));
-        if (!$a && $channel == 'pear.php.net') {
-            return true;
-        }
-
-        if (!$a && $channel == 'pecl.php.net') {
-            return true;
-        }
-
-        if (!$a && $channel == 'doc.php.net') {
-            return true;
-        }
-
-        return $a;
-    }
-
-    /**
-     * Determine whether a mirror exists within the deafult channel in the registry
-     *
-     * @param string Channel name
-     * @param string Mirror name
-     *
-     * @return boolean
-     */
-    function _mirrorExists($channel, $mirror)
-    {
-        $data = $this->_channelInfo($channel);
-        if (!isset($data['servers']['mirror'])) {
-            return false;
-        }
-
-        foreach ($data['servers']['mirror'] as $m) {
-            if ($m['attribs']['host'] == $mirror) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param PEAR_ChannelFile Channel object
-     * @param donotuse
-     * @param string Last-Modified HTTP tag from remote request
-     * @return boolean|PEAR_Error True on creation, false if it already exists
-     */
-    function _addChannel($channel, $update = false, $lastmodified = false)
-    {
-        if (!is_a($channel, 'PEAR_ChannelFile')) {
-            return false;
-        }
-
-        if (!$channel->validate()) {
-            return false;
-        }
-
-        if (file_exists($this->_channelFileName($channel->getName()))) {
-            if (!$update) {
-                return false;
-            }
-
-            $checker = $this->_getChannel($channel->getName());
-            if (PEAR::isError($checker)) {
-                return $checker;
-            }
-
-            if ($channel->getAlias() != $checker->getAlias()) {
-                if (file_exists($this->_getChannelAliasFileName($checker->getAlias()))) {
-                    @unlink($this->_getChannelAliasFileName($checker->getAlias()));
-                }
-            }
-        } else {
-            if ($update && !in_array($channel->getName(), array('pear.php.net', 'pecl.php.net', 'doc.php.net'))) {
-                return false;
-            }
-        }
-
-        $ret = $this->_assertChannelDir();
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-
-        $ret = $this->_assertChannelStateDir($channel->getName());
-        if (PEAR::isError($ret)) {
-            return $ret;
-        }
-
-        if ($channel->getAlias() != $channel->getName()) {
-            if (file_exists($this->_getChannelAliasFileName($channel->getAlias())) &&
-                  $this->_getChannelFromAlias($channel->getAlias()) != $channel->getName()) {
-                $channel->setAlias($channel->getName());
-            }
-
-            if (!$this->hasWriteAccess()) {
-                return false;
-            }
-
-            $fp = @fopen($this->_getChannelAliasFileName($channel->getAlias()), 'w');
-            if (!$fp) {
-                return false;
-            }
-
-            fwrite($fp, $channel->getName());
-            fclose($fp);
-        }
-
-        if (!$this->hasWriteAccess()) {
-            return false;
-        }
-
-        $fp = @fopen($this->_channelFileName($channel->getName()), 'wb');
-        if (!$fp) {
-            return false;
-        }
-
-        $info = $channel->toArray();
-        if ($lastmodified) {
-            $info['_lastmodified'] = $lastmodified;
-        } else {
-            $info['_lastmodified'] = date('r');
-        }
-
-        fwrite($fp, serialize($info));
-        fclose($fp);
-        return true;
-    }
-
-    /**
-     * Deletion fails if there are any packages installed from the channel
-     * @param string|PEAR_ChannelFile channel name
-     * @return boolean|PEAR_Error True on deletion, false if it doesn't exist
-     */
-    function _deleteChannel($channel)
-    {
-        if (!is_string($channel)) {
-            if (!is_a($channel, 'PEAR_ChannelFile')) {
-                return false;
-            }
-
-            if (!$channel->validate()) {
-                return false;
-            }
-            $channel = $channel->getName();
-        }
-
-        if ($this->_getChannelFromAlias($channel) == '__uri') {
-            return false;
-        }
-
-        if ($this->_getChannelFromAlias($channel) == 'pecl.php.net') {
-            return false;
-        }
-
-        if ($this->_getChannelFromAlias($channel) == 'doc.php.net') {
-            return false;
-        }
-
-        if (!$this->_channelExists($channel)) {
-            return false;
-        }
-
-        if (!$channel || $this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            return false;
-        }
-
-        $channel = $this->_getChannelFromAlias($channel);
-        if ($channel == 'pear.php.net') {
-            return false;
-        }
-
-        $test = $this->_listChannelPackages($channel);
-        if (count($test)) {
-            return false;
-        }
-
-        $test = @rmdir($this->_channelDirectoryName($channel));
-        if (!$test) {
-            return false;
-        }
-
-        $file = $this->_getChannelAliasFileName($this->_getAlias($channel));
-        if (file_exists($file)) {
-            $test = @unlink($file);
-            if (!$test) {
-                return false;
-            }
-        }
-
-        $file = $this->_channelFileName($channel);
-        $ret = true;
-        if (file_exists($file)) {
-            $ret = @unlink($file);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Determine whether a channel exists in the registry
-     * @param string Channel Alias
-     * @return boolean
-     */
-    function _isChannelAlias($alias)
-    {
-        return file_exists($this->_getChannelAliasFileName($alias));
-    }
-
-    /**
-     * @param string|null
-     * @param string|null
-     * @param string|null
-     * @return array|null
-     * @access private
-     */
-    function _packageInfo($package = null, $key = null, $channel = 'pear.php.net')
-    {
-        if ($package === null) {
-            if ($channel === null) {
-                $channels = $this->_listChannels();
-                $ret = array();
-                foreach ($channels as $channel) {
-                    $channel = strtolower($channel);
-                    $ret[$channel] = array();
-                    $packages = $this->_listPackages($channel);
-                    foreach ($packages as $package) {
-                        $ret[$channel][] = $this->_packageInfo($package, null, $channel);
-                    }
-                }
-
-                return $ret;
-            }
-
-            $ps = $this->_listPackages($channel);
-            if (!count($ps)) {
-                return array();
-            }
-            return array_map(array(&$this, '_packageInfo'),
-                             $ps, array_fill(0, count($ps), null),
-                             array_fill(0, count($ps), $channel));
-        }
-
-        $fp = $this->_openPackageFile($package, 'r', $channel);
-        if ($fp === null) {
-            return null;
-        }
-
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        $this->_closePackageFile($fp);
-        $data = file_get_contents($this->_packageFileName($package, $channel));
-        set_magic_quotes_runtime($rt);
-        $data = unserialize($data);
-        if ($key === null) {
-            return $data;
-        }
-
-        // compatibility for package.xml version 2.0
-        if (isset($data['old'][$key])) {
-            return $data['old'][$key];
-        }
-
-        if (isset($data[$key])) {
-            return $data[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * @param string Channel name
-     * @param bool whether to strictly retrieve info of channels, not just aliases
-     * @return array|null
-     */
-    function _channelInfo($channel, $noaliases = false)
-    {
-        if (!$this->_channelExists($channel, $noaliases)) {
-            return null;
-        }
-
-        $fp = $this->_openChannelFile($channel, 'r');
-        if ($fp === null) {
-            return null;
-        }
-
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
-        clearstatcache();
-        $this->_closeChannelFile($fp);
-        $data = file_get_contents($this->_channelFileName($channel));
-        set_magic_quotes_runtime($rt);
-        $data = unserialize($data);
-        return $data;
-    }
-
-    function _listChannels()
-    {
-        $channellist = array();
-        if (!file_exists($this->channelsdir) || !is_dir($this->channelsdir)) {
-            return array('pear.php.net', 'pecl.php.net', 'doc.php.net', '__uri');
-        }
-
-        $dp = opendir($this->channelsdir);
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-
-            if ($ent == '__uri.reg') {
-                $channellist[] = '__uri';
-                continue;
-            }
-
-            $channellist[] = str_replace('_', '/', substr($ent, 0, -4));
-        }
-
-        closedir($dp);
-        if (!in_array('pear.php.net', $channellist)) {
-            $channellist[] = 'pear.php.net';
-        }
-
-        if (!in_array('pecl.php.net', $channellist)) {
-            $channellist[] = 'pecl.php.net';
-        }
-
-        if (!in_array('doc.php.net', $channellist)) {
-            $channellist[] = 'doc.php.net';
-        }
-
-
-        if (!in_array('__uri', $channellist)) {
-            $channellist[] = '__uri';
-        }
-
-        natsort($channellist);
-        return $channellist;
-    }
-
-    function _listPackages($channel = false)
-    {
-        if ($channel && $this->_getChannelFromAlias($channel) != 'pear.php.net') {
-            return $this->_listChannelPackages($channel);
-        }
-
-        if (!file_exists($this->statedir) || !is_dir($this->statedir)) {
-            return array();
-        }
-
-        $pkglist = array();
-        $dp = opendir($this->statedir);
-        if (!$dp) {
-            return $pkglist;
-        }
-
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-
-            $pkglist[] = substr($ent, 0, -4);
-        }
-        closedir($dp);
-        return $pkglist;
-    }
-
-    function _listChannelPackages($channel)
-    {
-        $pkglist = array();
-        if (!file_exists($this->_channelDirectoryName($channel)) ||
-              !is_dir($this->_channelDirectoryName($channel))) {
-            return array();
-        }
-
-        $dp = opendir($this->_channelDirectoryName($channel));
-        if (!$dp) {
-            return $pkglist;
-        }
-
-        while ($ent = readdir($dp)) {
-            if ($ent{0} == '.' || substr($ent, -4) != '.reg') {
-                continue;
-            }
-            $pkglist[] = substr($ent, 0, -4);
-        }
-
-        closedir($dp);
-        return $pkglist;
-    }
-
-    function _listAllPackages()
-    {
-        $ret = array();
-        foreach ($this->_listChannels() as $channel) {
-            $ret[$channel] = $this->_listPackages($channel);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Add an installed package to the registry
-     * @param string package name
-     * @param array package info (parsed by PEAR_Common::infoFrom*() methods)
-     * @return bool success of saving
-     * @access private
-     */
-    function _addPackage($package, $info)
-    {
-        if ($this->_packageExists($package)) {
-            return false;
-        }
-
-        $fp = $this->_openPackageFile($package, 'wb');
-        if ($fp === null) {
-            return false;
-        }
-
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        if (isset($info['filelist'])) {
-            $this->_rebuildFileMap();
-        }
-
-        return true;
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     * @access private
-     */
-    function _addPackage2($info)
-    {
-        if (!is_a($info, 'PEAR_PackageFile_v1') && !is_a($info, 'PEAR_PackageFile_v2')) {
-            return false;
-        }
-
-        if (!$info->validate()) {
-            if (class_exists('PEAR_Common')) {
-                $ui = PEAR_Frontend::singleton();
-                if ($ui) {
-                    foreach ($info->getValidationWarnings() as $err) {
-                        $ui->log($err['message'], true);
-                    }
-                }
-            }
-            return false;
-        }
-
-        $channel = $info->getChannel();
-        $package = $info->getPackage();
-        $save = $info;
-        if ($this->_packageExists($package, $channel)) {
-            return false;
-        }
-
-        if (!$this->_channelExists($channel, true)) {
-            return false;
-        }
-
-        $info = $info->toArray(true);
-        if (!$info) {
-            return false;
-        }
-
-        $fp = $this->_openPackageFile($package, 'wb', $channel);
-        if ($fp === null) {
-            return false;
-        }
-
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        $this->_rebuildFileMap();
-        return true;
-    }
-
-    /**
-     * @param string Package name
-     * @param array parsed package.xml 1.0
-     * @param bool this parameter is only here for BC.  Don't use it.
-     * @access private
-     */
-    function _updatePackage($package, $info, $merge = true)
-    {
-        $oldinfo = $this->_packageInfo($package);
-        if (empty($oldinfo)) {
-            return false;
-        }
-
-        $fp = $this->_openPackageFile($package, 'w');
-        if ($fp === null) {
-            return false;
-        }
-
-        if (is_object($info)) {
-            $info = $info->toArray();
-        }
-        $info['_lastmodified'] = time();
-
-        $newinfo = $info;
-        if ($merge) {
-            $info = array_merge($oldinfo, $info);
-        } else {
-            $diff = $info;
-        }
-
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        if (isset($newinfo['filelist'])) {
-            $this->_rebuildFileMap();
-        }
-
-        return true;
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @return bool
-     * @access private
-     */
-    function _updatePackage2($info)
-    {
-        if (!$this->_packageExists($info->getPackage(), $info->getChannel())) {
-            return false;
-        }
-
-        $fp = $this->_openPackageFile($info->getPackage(), 'w', $info->getChannel());
-        if ($fp === null) {
-            return false;
-        }
-
-        $save = $info;
-        $info = $save->getArray(true);
-        $info['_lastmodified'] = time();
-        fwrite($fp, serialize($info));
-        $this->_closePackageFile($fp);
-        $this->_rebuildFileMap();
-        return true;
-    }
-
-    /**
-     * @param string Package name
-     * @param string Channel name
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|null
-     * @access private
-     */
-    function &_getPackage($package, $channel = 'pear.php.net')
-    {
-        $info = $this->_packageInfo($package, null, $channel);
-        if ($info === null) {
-            return $info;
-        }
-
-        $a = $this->_config;
-        if (!$a) {
-            $this->_config = &new PEAR_Config;
-            $this->_config->set('php_dir', $this->statedir);
-        }
-
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-
-        $pkg = &new PEAR_PackageFile($this->_config);
-        $pf = &$pkg->fromArray($info);
-        return $pf;
-    }
-
-    /**
-     * @param string channel name
-     * @param bool whether to strictly retrieve channel names
-     * @return PEAR_ChannelFile|PEAR_Error
-     * @access private
-     */
-    function &_getChannel($channel, $noaliases = false)
-    {
-        $ch = false;
-        if ($this->_channelExists($channel, $noaliases)) {
-            $chinfo = $this->_channelInfo($channel, $noaliases);
-            if ($chinfo) {
-                if (!class_exists('PEAR_ChannelFile')) {
-                    require_once 'PEAR/ChannelFile.php';
-                }
-
-                $ch = &PEAR_ChannelFile::fromArrayWithErrors($chinfo);
-            }
-        }
-
-        if ($ch) {
-            if ($ch->validate()) {
-                return $ch;
-            }
-
-            foreach ($ch->getErrors(true) as $err) {
-                $message = $err['message'] . "\n";
-            }
-
-            $ch = PEAR::raiseError($message);
-            return $ch;
-        }
-
-        if ($this->_getChannelFromAlias($channel) == 'pear.php.net') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $pear_channel = new PEAR_ChannelFile;
-            $pear_channel->setServer('pear.php.net');
-            $pear_channel->setAlias('pear');
-            $pear_channel->setSummary('PHP Extension and Application Repository');
-            $pear_channel->setDefaultPEARProtocols();
-            $pear_channel->setBaseURL('REST1.0', 'http://pear.php.net/rest/');
-            $pear_channel->setBaseURL('REST1.1', 'http://pear.php.net/rest/');
-            $pear_channel->setBaseURL('REST1.3', 'http://pear.php.net/rest/');
-            return $pear_channel;
-        }
-
-        if ($this->_getChannelFromAlias($channel) == 'pecl.php.net') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-            $pear_channel = new PEAR_ChannelFile;
-            $pear_channel->setServer('pecl.php.net');
-            $pear_channel->setAlias('pecl');
-            $pear_channel->setSummary('PHP Extension Community Library');
-            $pear_channel->setDefaultPEARProtocols();
-            $pear_channel->setBaseURL('REST1.0', 'http://pecl.php.net/rest/');
-            $pear_channel->setBaseURL('REST1.1', 'http://pecl.php.net/rest/');
-            $pear_channel->setValidationPackage('PEAR_Validator_PECL', '1.0');
-            return $pear_channel;
-        }
-
-        if ($this->_getChannelFromAlias($channel) == 'doc.php.net') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $doc_channel = new PEAR_ChannelFile;
-            $doc_channel->setServer('doc.php.net');
-            $doc_channel->setAlias('phpdocs');
-            $doc_channel->setSummary('PHP Documentation Team');
-            $doc_channel->setDefaultPEARProtocols();
-            $doc_channel->setBaseURL('REST1.0', 'http://doc.php.net/rest/');
-            $doc_channel->setBaseURL('REST1.1', 'http://doc.php.net/rest/');
-            $doc_channel->setBaseURL('REST1.3', 'http://doc.php.net/rest/');
-            return $doc_channel;
-        }
-
-
-        if ($this->_getChannelFromAlias($channel) == '__uri') {
-            // the registry is not properly set up, so use defaults
-            if (!class_exists('PEAR_ChannelFile')) {
-                require_once 'PEAR/ChannelFile.php';
-            }
-
-            $private = new PEAR_ChannelFile;
-            $private->setName('__uri');
-            $private->setDefaultPEARProtocols();
-            $private->setBaseURL('REST1.0', '****');
-            $private->setSummary('Pseudo-channel for static packages');
-            return $private;
-        }
-
-        return $ch;
-    }
-
-    /**
-     * @param string Package name
-     * @param string Channel name
-     * @return bool
-     */
-    function packageExists($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageExists($package, $channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ channelExists()
-
-    /**
-     * @param string channel name
-     * @param bool if true, then aliases will be ignored
-     * @return bool
-     */
-    function channelExists($channel, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_channelExists($channel, $noaliases);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    /**
-     * @param string channel name mirror is in
-     * @param string mirror name
-     *
-     * @return bool
-     */
-    function mirrorExists($channel, $mirror)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-
-        $ret = $this->_mirrorExists($channel, $mirror);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // {{{ isAlias()
-
-    /**
-     * Determines whether the parameter is an alias of a channel
-     * @param string
-     * @return bool
-     */
-    function isAlias($alias)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_isChannelAlias($alias);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ packageInfo()
-
-    /**
-     * @param string|null
-     * @param string|null
-     * @param string
-     * @return array|null
-     */
-    function packageInfo($package = null, $key = null, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_packageInfo($package, $key, $channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ channelInfo()
-
-    /**
-     * Retrieve a raw array of channel data.
-     *
-     * Do not use this, instead use {@link getChannel()} for normal
-     * operations.  Array structure is undefined in this method
-     * @param string channel name
-     * @param bool whether to strictly retrieve information only on non-aliases
-     * @return array|null|PEAR_Error
-     */
-    function channelInfo($channel = null, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_channelInfo($channel, $noaliases);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-
-    /**
-     * @param string
-     */
-    function channelName($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_getChannelFromAlias($channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    /**
-     * @param string
-     */
-    function channelAlias($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_getAlias($channel);
-        $this->_unlock();
-        return $ret;
-    }
-    // {{{ listPackages()
-
-    function listPackages($channel = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listPackages($channel);
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ listAllPackages()
-
-    function listAllPackages()
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listAllPackages();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ listChannel()
-
-    function listChannels()
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = $this->_listChannels();
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addPackage()
-
-    /**
-     * Add an installed package to the registry
-     * @param string|PEAR_PackageFile_v1|PEAR_PackageFile_v2 package name or object
-     *               that will be passed to {@link addPackage2()}
-     * @param array package info (parsed by PEAR_Common::infoFrom*() methods)
-     * @return bool success of saving
-     */
-    function addPackage($package, $info)
-    {
-        if (is_object($info)) {
-            return $this->addPackage2($info);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_addPackage($package, $info);
-        $this->_unlock();
-        if ($ret) {
-            if (!class_exists('PEAR_PackageFile_v1')) {
-                require_once 'PEAR/PackageFile/v1.php';
-            }
-            $pf = new PEAR_PackageFile_v1;
-            $pf->setConfig($this->_config);
-            $pf->fromArray($info);
-            $this->_dependencyDB->uninstallPackage($pf);
-            $this->_dependencyDB->installPackage($pf);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addPackage2()
-
-    function addPackage2($info)
-    {
-        if (!is_object($info)) {
-            return $this->addPackage($info['package'], $info);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_addPackage2($info);
-        $this->_unlock();
-        if ($ret) {
-            $this->_dependencyDB->uninstallPackage($info);
-            $this->_dependencyDB->installPackage($info);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updateChannel()
-
-    /**
-     * For future expandibility purposes, separate this
-     * @param PEAR_ChannelFile
-     */
-    function updateChannel($channel, $lastmodified = null)
-    {
-        if ($channel->getName() == '__uri') {
-            return false;
-        }
-        return $this->addChannel($channel, $lastmodified, true);
-    }
-
-    // }}}
-    // {{{ deleteChannel()
-
-    /**
-     * Deletion fails if there are any packages installed from the channel
-     * @param string|PEAR_ChannelFile channel name
-     * @return boolean|PEAR_Error True on deletion, false if it doesn't exist
-     */
-    function deleteChannel($channel)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-
-        $ret = $this->_deleteChannel($channel);
-        $this->_unlock();
-        if ($ret && is_a($this->_config, 'PEAR_Config')) {
-            $this->_config->setChannels($this->listChannels());
-        }
-
-        return $ret;
-    }
-
-    // }}}
-    // {{{ addChannel()
-
-    /**
-     * @param PEAR_ChannelFile Channel object
-     * @param string Last-Modified header from HTTP for caching
-     * @return boolean|PEAR_Error True on creation, false if it already exists
-     */
-    function addChannel($channel, $lastmodified = false, $update = false)
-    {
-        if (!is_a($channel, 'PEAR_ChannelFile') || !$channel->validate()) {
-            return false;
-        }
-
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-
-        $ret = $this->_addChannel($channel, $update, $lastmodified);
-        $this->_unlock();
-        if (!$update && $ret && is_a($this->_config, 'PEAR_Config')) {
-            $this->_config->setChannels($this->listChannels());
-        }
-
-        return $ret;
-    }
-
-    // }}}
-    // {{{ deletePackage()
-
-    function deletePackage($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-
-        $file = $this->_packageFileName($package, $channel);
-        $ret  = file_exists($file) ? @unlink($file) : false;
-        $this->_rebuildFileMap();
-        $this->_unlock();
-        $p = array('channel' => $channel, 'package' => $package);
-        $this->_dependencyDB->uninstallPackage($p);
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updatePackage()
-
-    function updatePackage($package, $info, $merge = true)
-    {
-        if (is_object($info)) {
-            return $this->updatePackage2($info, $merge);
-        }
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-        $ret = $this->_updatePackage($package, $info, $merge);
-        $this->_unlock();
-        if ($ret) {
-            if (!class_exists('PEAR_PackageFile_v1')) {
-                require_once 'PEAR/PackageFile/v1.php';
-            }
-            $pf = new PEAR_PackageFile_v1;
-            $pf->setConfig($this->_config);
-            $pf->fromArray($this->packageInfo($package));
-            $this->_dependencyDB->uninstallPackage($pf);
-            $this->_dependencyDB->installPackage($pf);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ updatePackage2()
-
-    function updatePackage2($info)
-    {
-
-        if (!is_object($info)) {
-            return $this->updatePackage($info['package'], $info, $merge);
-        }
-
-        if (!$info->validate(PEAR_VALIDATE_DOWNLOADING)) {
-            return false;
-        }
-
-        if (PEAR::isError($e = $this->_lock(LOCK_EX))) {
-            return $e;
-        }
-
-        $ret = $this->_updatePackage2($info);
-        $this->_unlock();
-        if ($ret) {
-            $this->_dependencyDB->uninstallPackage($info);
-            $this->_dependencyDB->installPackage($info);
-        }
-
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getChannel()
-    /**
-     * @param string channel name
-     * @param bool whether to strictly return raw channels (no aliases)
-     * @return PEAR_ChannelFile|PEAR_Error
-     */
-    function &getChannel($channel, $noaliases = false)
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $ret = &$this->_getChannel($channel, $noaliases);
-        $this->_unlock();
-        if (!$ret) {
-            return PEAR::raiseError('Unknown channel: ' . $channel);
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getPackage()
-    /**
-     * @param string package name
-     * @param string channel name
-     * @return PEAR_PackageFile_v1|PEAR_PackageFile_v2|null
-     */
-    function &getPackage($package, $channel = 'pear.php.net')
-    {
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        $pf = &$this->_getPackage($package, $channel);
-        $this->_unlock();
-        return $pf;
-    }
-
-    // }}}
-
-    /**
-     * Get PEAR_PackageFile_v[1/2] objects representing the contents of
-     * a dependency group that are installed.
-     *
-     * This is used at uninstall-time
-     * @param array
-     * @return array|false
-     */
-    function getInstalledGroup($group)
-    {
-        $ret = array();
-        if (isset($group['package'])) {
-            if (!isset($group['package'][0])) {
-                $group['package'] = array($group['package']);
-            }
-            foreach ($group['package'] as $package) {
-                $depchannel = isset($package['channel']) ? $package['channel'] : '__uri';
-                $p = &$this->getPackage($package['name'], $depchannel);
-                if ($p) {
-                    $save = &$p;
-                    $ret[] = &$save;
-                }
-            }
-        }
-        if (isset($group['subpackage'])) {
-            if (!isset($group['subpackage'][0])) {
-                $group['subpackage'] = array($group['subpackage']);
-            }
-            foreach ($group['subpackage'] as $package) {
-                $depchannel = isset($package['channel']) ? $package['channel'] : '__uri';
-                $p = &$this->getPackage($package['name'], $depchannel);
-                if ($p) {
-                    $save = &$p;
-                    $ret[] = &$save;
-                }
-            }
-        }
-        if (!count($ret)) {
-            return false;
-        }
-        return $ret;
-    }
-
-    // {{{ getChannelValidator()
-    /**
-     * @param string channel name
-     * @return PEAR_Validate|false
-     */
-    function &getChannelValidator($channel)
-    {
-        $chan = $this->getChannel($channel);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-        $val = $chan->getValidationObject();
-        return $val;
-    }
-    // }}}
-    // {{{ getChannels()
-    /**
-     * @param string channel name
-     * @return array an array of PEAR_ChannelFile objects representing every installed channel
-     */
-    function &getChannels()
-    {
-        $ret = array();
-        if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-            return $e;
-        }
-        foreach ($this->_listChannels() as $channel) {
-            $e = &$this->_getChannel($channel);
-            if (!$e || PEAR::isError($e)) {
-                continue;
-            }
-            $ret[] = $e;
-        }
-        $this->_unlock();
-        return $ret;
-    }
-
-    // }}}
-    // {{{ checkFileMap()
-
-    /**
-     * Test whether a file or set of files belongs to a package.
-     *
-     * If an array is passed in
-     * @param string|array file path, absolute or relative to the pear
-     *                     install dir
-     * @param string|array name of PEAR package or array('package' => name, 'channel' =>
-     *                     channel) of a package that will be ignored
-     * @param string API version - 1.1 will exclude any files belonging to a package
-     * @param array private recursion variable
-     * @return array|false which package and channel the file belongs to, or an empty
-     *                     string if the file does not belong to an installed package,
-     *                     or belongs to the second parameter's package
-     */
-    function checkFileMap($path, $package = false, $api = '1.0', $attrs = false)
-    {
-        if (is_array($path)) {
-            static $notempty;
-            if (empty($notempty)) {
-                if (!class_exists('PEAR_Installer_Role')) {
-                    require_once 'PEAR/Installer/Role.php';
-                }
-                $notempty = create_function('$a','return !empty($a);');
-            }
-            $package = is_array($package) ? array(strtolower($package[0]), strtolower($package[1]))
-                : strtolower($package);
-            $pkgs = array();
-            foreach ($path as $name => $attrs) {
-                if (is_array($attrs)) {
-                    if (isset($attrs['install-as'])) {
-                        $name = $attrs['install-as'];
-                    }
-                    if (!in_array($attrs['role'], PEAR_Installer_Role::getInstallableRoles())) {
-                        // these are not installed
-                        continue;
-                    }
-                    if (!in_array($attrs['role'], PEAR_Installer_Role::getBaseinstallRoles())) {
-                        $attrs['baseinstalldir'] = is_array($package) ? $package[1] : $package;
-                    }
-                    if (isset($attrs['baseinstalldir'])) {
-                        $name = $attrs['baseinstalldir'] . DIRECTORY_SEPARATOR . $name;
-                    }
-                }
-                $pkgs[$name] = $this->checkFileMap($name, $package, $api, $attrs);
-                if (PEAR::isError($pkgs[$name])) {
-                    return $pkgs[$name];
-                }
-            }
-            return array_filter($pkgs, $notempty);
-        }
-        if (empty($this->filemap_cache)) {
-            if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
-                return $e;
-            }
-            $err = $this->_readFileMap();
-            $this->_unlock();
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-        }
-        if (!$attrs) {
-            $attrs = array('role' => 'php'); // any old call would be for PHP role only
-        }
-        if (isset($this->filemap_cache[$attrs['role']][$path])) {
-            if ($api >= '1.1' && $this->filemap_cache[$attrs['role']][$path] == $package) {
-                return false;
-            }
-            return $this->filemap_cache[$attrs['role']][$path];
-        }
-        $l = strlen($this->install_dir);
-        if (substr($path, 0, $l) == $this->install_dir) {
-            $path = preg_replace('!^'.DIRECTORY_SEPARATOR.'+!', '', substr($path, $l));
-        }
-        if (isset($this->filemap_cache[$attrs['role']][$path])) {
-            if ($api >= '1.1' && $this->filemap_cache[$attrs['role']][$path] == $package) {
-                return false;
-            }
-            return $this->filemap_cache[$attrs['role']][$path];
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ flush()
-    /**
-     * Force a reload of the filemap
-     * @since 1.5.0RC3
-     */
-    function flushFileMap()
-    {
-        $this->filemap_cache = null;
-        clearstatcache(); // ensure that the next read gets the full, current filemap
-    }
-
-    // }}}
-    // {{{ apiVersion()
-    /**
-     * Get the expected API version.  Channels API is version 1.1, as it is backwards
-     * compatible with 1.0
-     * @return string
-     */
-    function apiVersion()
-    {
-        return '1.1';
-    }
-    // }}}
-
-
-    /**
-     * Parse a package name, or validate a parsed package name array
-     * @param string|array pass in an array of format
-     *                     array(
-     *                      'package' => 'pname',
-     *                     ['channel' => 'channame',]
-     *                     ['version' => 'version',]
-     *                     ['state' => 'state',]
-     *                     ['group' => 'groupname'])
-     *                     or a string of format
-     *                     [channel://][channame/]pname[-version|-state][/group=groupname]
-     * @return array|PEAR_Error
-     */
-    function parsePackageName($param, $defaultchannel = 'pear.php.net')
-    {
-        $saveparam = $param;
-        if (is_array($param)) {
-            // convert to string for error messages
-            $saveparam = $this->parsedPackageNameToString($param);
-            // process the array
-            if (!isset($param['package'])) {
-                return PEAR::raiseError('parsePackageName(): array $param ' .
-                    'must contain a valid package name in index "param"',
-                    'package', null, null, $param);
-            }
-            if (!isset($param['uri'])) {
-                if (!isset($param['channel'])) {
-                    $param['channel'] = $defaultchannel;
-                }
-            } else {
-                $param['channel'] = '__uri';
-            }
-        } else {
-            $components = @parse_url((string) $param);
-            if (isset($components['scheme'])) {
-                if ($components['scheme'] == 'http') {
-                    // uri package
-                    $param = array('uri' => $param, 'channel' => '__uri');
-                } elseif($components['scheme'] != 'channel') {
-                    return PEAR::raiseError('parsePackageName(): only channel:// uris may ' .
-                        'be downloaded, not "' . $param . '"', 'invalid', null, null, $param);
-                }
-            }
-            if (!isset($components['path'])) {
-                return PEAR::raiseError('parsePackageName(): array $param ' .
-                    'must contain a valid package name in "' . $param . '"',
-                    'package', null, null, $param);
-            }
-            if (isset($components['host'])) {
-                // remove the leading "/"
-                $components['path'] = substr($components['path'], 1);
-            }
-            if (!isset($components['scheme'])) {
-                if (strpos($components['path'], '/') !== false) {
-                    if ($components['path']{0} == '/') {
-                        return PEAR::raiseError('parsePackageName(): this is not ' .
-                            'a package name, it begins with "/" in "' . $param . '"',
-                            'invalid', null, null, $param);
-                    }
-                    $parts = explode('/', $components['path']);
-                    $components['host'] = array_shift($parts);
-                    if (count($parts) > 1) {
-                        $components['path'] = array_pop($parts);
-                        $components['host'] .= '/' . implode('/', $parts);
-                    } else {
-                        $components['path'] = implode('/', $parts);
-                    }
-                } else {
-                    $components['host'] = $defaultchannel;
-                }
-            } else {
-                if (strpos($components['path'], '/')) {
-                    $parts = explode('/', $components['path']);
-                    $components['path'] = array_pop($parts);
-                    $components['host'] .= '/' . implode('/', $parts);
-                }
-            }
-
-            if (is_array($param)) {
-                $param['package'] = $components['path'];
-            } else {
-                $param = array(
-                    'package' => $components['path']
-                    );
-                if (isset($components['host'])) {
-                    $param['channel'] = $components['host'];
-                }
-            }
-            if (isset($components['fragment'])) {
-                $param['group'] = $components['fragment'];
-            }
-            if (isset($components['user'])) {
-                $param['user'] = $components['user'];
-            }
-            if (isset($components['pass'])) {
-                $param['pass'] = $components['pass'];
-            }
-            if (isset($components['query'])) {
-                parse_str($components['query'], $param['opts']);
-            }
-            // check for extension
-            $pathinfo = pathinfo($param['package']);
-            if (isset($pathinfo['extension']) &&
-                  in_array(strtolower($pathinfo['extension']), array('tgz', 'tar'))) {
-                $param['extension'] = $pathinfo['extension'];
-                $param['package'] = substr($pathinfo['basename'], 0,
-                    strlen($pathinfo['basename']) - 4);
-            }
-            // check for version
-            if (strpos($param['package'], '-')) {
-                $test = explode('-', $param['package']);
-                if (count($test) != 2) {
-                    return PEAR::raiseError('parsePackageName(): only one version/state ' .
-                        'delimiter "-" is allowed in "' . $saveparam . '"',
-                        'version', null, null, $param);
-                }
-                list($param['package'], $param['version']) = $test;
-            }
-        }
-        // validation
-        $info = $this->channelExists($param['channel']);
-        if (PEAR::isError($info)) {
-            return $info;
-        }
-        if (!$info) {
-            return PEAR::raiseError('unknown channel "' . $param['channel'] .
-                '" in "' . $saveparam . '"', 'channel', null, null, $param);
-        }
-        $chan = $this->getChannel($param['channel']);
-        if (PEAR::isError($chan)) {
-            return $chan;
-        }
-        if (!$chan) {
-            return PEAR::raiseError("Exception: corrupt registry, could not " .
-                "retrieve channel " . $param['channel'] . " information",
-                'registry', null, null, $param);
-        }
-        $param['channel'] = $chan->getName();
-        $validate = $chan->getValidationObject();
-        $vpackage = $chan->getValidationPackage();
-        // validate package name
-        if (!$validate->validPackageName($param['package'], $vpackage['_content'])) {
-            return PEAR::raiseError('parsePackageName(): invalid package name "' .
-                $param['package'] . '" in "' . $saveparam . '"',
-                'package', null, null, $param);
-        }
-        if (isset($param['group'])) {
-            if (!PEAR_Validate::validGroupName($param['group'])) {
-                return PEAR::raiseError('parsePackageName(): dependency group "' . $param['group'] .
-                    '" is not a valid group name in "' . $saveparam . '"', 'group', null, null,
-                    $param);
-            }
-        }
-        if (isset($param['state'])) {
-            if (!in_array(strtolower($param['state']), $validate->getValidStates())) {
-                return PEAR::raiseError('parsePackageName(): state "' . $param['state']
-                    . '" is not a valid state in "' . $saveparam . '"',
-                    'state', null, null, $param);
-            }
-        }
-        if (isset($param['version'])) {
-            if (isset($param['state'])) {
-                return PEAR::raiseError('parsePackageName(): cannot contain both ' .
-                    'a version and a stability (state) in "' . $saveparam . '"',
-                    'version/state', null, null, $param);
-            }
-            // check whether version is actually a state
-            if (in_array(strtolower($param['version']), $validate->getValidStates())) {
-                $param['state'] = strtolower($param['version']);
-                unset($param['version']);
-            } else {
-                if (!$validate->validVersion($param['version'])) {
-                    return PEAR::raiseError('parsePackageName(): "' . $param['version'] .
-                        '" is neither a valid version nor a valid state in "' .
-                        $saveparam . '"', 'version/state', null, null, $param);
-                }
-            }
-        }
-        return $param;
-    }
-
-    /**
-     * @param array
-     * @return string
-     */
-    function parsedPackageNameToString($parsed, $brief = false)
-    {
-        if (is_string($parsed)) {
-            return $parsed;
-        }
-        if (is_object($parsed)) {
-            $p = $parsed;
-            $parsed = array(
-                'package' => $p->getPackage(),
-                'channel' => $p->getChannel(),
-                'version' => $p->getVersion(),
-            );
-        }
-        if (isset($parsed['uri'])) {
-            return $parsed['uri'];
-        }
-        if ($brief) {
-            if ($channel = $this->channelAlias($parsed['channel'])) {
-                return $channel . '/' . $parsed['package'];
-            }
-        }
-        $upass = '';
-        if (isset($parsed['user'])) {
-            $upass = $parsed['user'];
-            if (isset($parsed['pass'])) {
-                $upass .= ':' . $parsed['pass'];
-            }
-            $upass = "$upass@";
-        }
-        $ret = 'channel://' . $upass . $parsed['channel'] . '/' . $parsed['package'];
-        if (isset($parsed['version']) || isset($parsed['state'])) {
-            $ver = isset($parsed['version']) ? $parsed['version'] : '';
-            $ver .= isset($parsed['state']) ? $parsed['state'] : '';
-            $ret .= '-' . $ver;
-        }
-        if (isset($parsed['extension'])) {
-            $ret .= '.' . $parsed['extension'];
-        }
-        if (isset($parsed['opts'])) {
-            $ret .= '?';
-            foreach ($parsed['opts'] as $name => $value) {
-                $parsed['opts'][$name] = "$name=$value";
-            }
-            $ret .= implode('&', $parsed['opts']);
-        }
-        if (isset($parsed['group'])) {
-            $ret .= '#' . $parsed['group'];
-        }
-        return $ret;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/RunTest.php b/airtime_mvc/library/pear/PEAR/RunTest.php
deleted file mode 100644
index 6db03527f..000000000
--- a/airtime_mvc/library/pear/PEAR/RunTest.php
+++ /dev/null
@@ -1,962 +0,0 @@
-<?php
-/**
- * PEAR_RunTest
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: RunTest.php 297621 2010-04-07 15:09:33Z sebastian $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.3.3
- */
-
-/**
- * for error handling
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-define('DETAILED', 1);
-putenv("PHP_PEAR_RUNTESTS=1");
-
-/**
- * Simplified version of PHP's test suite
- *
- * Try it with:
- *
- * $ php -r 'include "../PEAR/RunTest.php"; $t=new PEAR_RunTest; $o=$t->run("./pear_system.phpt");print_r($o);'
- *
- *
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.3.3
- */
-class PEAR_RunTest
-{
-    var $_headers = array();
-    var $_logger;
-    var $_options;
-    var $_php;
-    var $tests_count;
-    var $xdebug_loaded;
-    /**
-     * Saved value of php executable, used to reset $_php when we
-     * have a test that uses cgi
-     *
-     * @var unknown_type
-     */
-    var $_savephp;
-    var $ini_overwrites = array(
-        'output_handler=',
-        'open_basedir=',
-        'safe_mode=0',
-        'disable_functions=',
-        'output_buffering=Off',
-        'display_errors=1',
-        'log_errors=0',
-        'html_errors=0',
-        'track_errors=1',
-        'report_memleaks=0',
-        'report_zend_debug=0',
-        'docref_root=',
-        'docref_ext=.html',
-        'error_prepend_string=',
-        'error_append_string=',
-        'auto_prepend_file=',
-        'auto_append_file=',
-        'magic_quotes_runtime=0',
-        'xdebug.default_enable=0',
-        'allow_url_fopen=1',
-    );
-
-    /**
-     * An object that supports the PEAR_Common->log() signature, or null
-     * @param PEAR_Common|null
-     */
-    function PEAR_RunTest($logger = null, $options = array())
-    {
-        if (!defined('E_DEPRECATED')) {
-            define('E_DEPRECATED', 0);
-        }
-        if (!defined('E_STRICT')) {
-            define('E_STRICT', 0);
-        }
-        $this->ini_overwrites[] = 'error_reporting=' . (E_ALL & ~(E_DEPRECATED | E_STRICT));
-        if (is_null($logger)) {
-            require_once 'PEAR/Common.php';
-            $logger = new PEAR_Common;
-        }
-        $this->_logger  = $logger;
-        $this->_options = $options;
-
-        $conf = &PEAR_Config::singleton();
-        $this->_php = $conf->get('php_bin');
-    }
-
-    /**
-     * Taken from php-src/run-tests.php
-     *
-     * @param string $commandline command name
-     * @param array $env
-     * @param string $stdin standard input to pass to the command
-     * @return unknown
-     */
-    function system_with_timeout($commandline, $env = null, $stdin = null)
-    {
-        $data = '';
-        if (version_compare(phpversion(), '5.0.0', '<')) {
-            $proc = proc_open($commandline, array(
-                0 => array('pipe', 'r'),
-                1 => array('pipe', 'w'),
-                2 => array('pipe', 'w')
-                ), $pipes);
-        } else {
-            $proc = proc_open($commandline, array(
-                0 => array('pipe', 'r'),
-                1 => array('pipe', 'w'),
-                2 => array('pipe', 'w')
-                ), $pipes, null, $env, array('suppress_errors' => true));
-        }
-
-        if (!$proc) {
-            return false;
-        }
-
-        if (is_string($stdin)) {
-            fwrite($pipes[0], $stdin);
-        }
-        fclose($pipes[0]);
-
-        while (true) {
-            /* hide errors from interrupted syscalls */
-            $r = $pipes;
-            $e = $w = null;
-            $n = @stream_select($r, $w, $e, 60);
-
-            if ($n === 0) {
-                /* timed out */
-                $data .= "\n ** ERROR: process timed out **\n";
-                proc_terminate($proc);
-                return array(1234567890, $data);
-            } else if ($n > 0) {
-                $line = fread($pipes[1], 8192);
-                if (strlen($line) == 0) {
-                    /* EOF */
-                    break;
-                }
-                $data .= $line;
-            }
-        }
-        if (function_exists('proc_get_status')) {
-            $stat = proc_get_status($proc);
-            if ($stat['signaled']) {
-                $data .= "\nTermsig=".$stat['stopsig'];
-            }
-        }
-        $code = proc_close($proc);
-        if (function_exists('proc_get_status')) {
-            $code = $stat['exitcode'];
-        }
-        return array($code, $data);
-    }
-
-    /**
-     * Turns a PHP INI string into an array
-     *
-     * Turns -d "include_path=/foo/bar" into this:
-     * array(
-     *   'include_path' => array(
-     *          'operator' => '-d',
-     *          'value'    => '/foo/bar',
-     *   )
-     * )
-     * Works both with quotes and without
-     *
-     * @param string an PHP INI string, -d "include_path=/foo/bar"
-     * @return array
-     */
-    function iniString2array($ini_string)
-    {
-        if (!$ini_string) {
-            return array();
-        }
-        $split = preg_split('/[\s]|=/', $ini_string, -1, PREG_SPLIT_NO_EMPTY);
-        $key   = $split[1][0] == '"'                     ? substr($split[1], 1)     : $split[1];
-        $value = $split[2][strlen($split[2]) - 1] == '"' ? substr($split[2], 0, -1) : $split[2];
-        // FIXME review if this is really the struct to go with
-        $array = array($key => array('operator' => $split[0], 'value' => $value));
-        return $array;
-    }
-
-    function settings2array($settings, $ini_settings)
-    {
-        foreach ($settings as $setting) {
-            if (strpos($setting, '=') !== false) {
-                $setting = explode('=', $setting, 2);
-                $name  = trim(strtolower($setting[0]));
-                $value = trim($setting[1]);
-                $ini_settings[$name] = $value;
-            }
-        }
-        return $ini_settings;
-    }
-
-    function settings2params($ini_settings)
-    {
-        $settings = '';
-        foreach ($ini_settings as $name => $value) {
-            if (is_array($value)) {
-                $operator = $value['operator'];
-                $value    = $value['value'];
-            } else {
-                $operator = '-d';
-            }
-            $value = addslashes($value);
-            $settings .= " $operator \"$name=$value\"";
-        }
-        return $settings;
-    }
-
-    function _preparePhpBin($php, $file, $ini_settings)
-    {
-        $file = escapeshellarg($file);
-        // This was fixed in php 5.3 and is not needed after that
-        if (OS_WINDOWS && version_compare(PHP_VERSION, '5.3', '<')) {
-            $cmd = '"'.escapeshellarg($php).' '.$ini_settings.' -f ' . $file .'"';
-        } else {
-            $cmd = $php . $ini_settings . ' -f ' . $file;
-        }
-
-        return $cmd;
-    }
-
-    function runPHPUnit($file, $ini_settings = '')
-    {
-        if (!file_exists($file) && file_exists(getcwd() . DIRECTORY_SEPARATOR . $file)) {
-            $file = realpath(getcwd() . DIRECTORY_SEPARATOR . $file);
-        } elseif (file_exists($file)) {
-            $file = realpath($file);
-        }
-
-        $cmd = $this->_preparePhpBin($this->_php, $file, $ini_settings);
-        if (isset($this->_logger)) {
-            $this->_logger->log(2, 'Running command "' . $cmd . '"');
-        }
-
-        $savedir = getcwd(); // in case the test moves us around
-        chdir(dirname($file));
-        echo `$cmd`;
-        chdir($savedir);
-        return 'PASSED'; // we have no way of knowing this information so assume passing
-    }
-
-    /**
-     * Runs an individual test case.
-     *
-     * @param string       The filename of the test
-     * @param array|string INI settings to be applied to the test run
-     * @param integer      Number what the current running test is of the
-     *                     whole test suite being runned.
-     *
-     * @return string|object Returns PASSED, WARNED, FAILED depending on how the
-     *                       test came out.
-     *                       PEAR Error when the tester it self fails
-     */
-    function run($file, $ini_settings = array(), $test_number = 1)
-    {
-        if (isset($this->_savephp)) {
-            $this->_php = $this->_savephp;
-            unset($this->_savephp);
-        }
-        if (empty($this->_options['cgi'])) {
-            // try to see if php-cgi is in the path
-            $res = $this->system_with_timeout('php-cgi -v');
-            if (false !== $res && !(is_array($res) && $res === array(127, ''))) {
-                $this->_options['cgi'] = 'php-cgi';
-            }
-        }
-        if (1 < $len = strlen($this->tests_count)) {
-            $test_number = str_pad($test_number, $len, ' ', STR_PAD_LEFT);
-            $test_nr = "[$test_number/$this->tests_count] ";
-        } else {
-            $test_nr = '';
-        }
-
-        $file = realpath($file);
-        $section_text = $this->_readFile($file);
-        if (PEAR::isError($section_text)) {
-            return $section_text;
-        }
-
-        if (isset($section_text['POST_RAW']) && isset($section_text['UPLOAD'])) {
-            return PEAR::raiseError("Cannot contain both POST_RAW and UPLOAD in test file: $file");
-        }
-
-        $cwd = getcwd();
-
-        $pass_options = '';
-        if (!empty($this->_options['ini'])) {
-            $pass_options = $this->_options['ini'];
-        }
-
-        if (is_string($ini_settings)) {
-            $ini_settings = $this->iniString2array($ini_settings);
-        }
-
-        $ini_settings = $this->settings2array($this->ini_overwrites, $ini_settings);
-        if ($section_text['INI']) {
-            if (strpos($section_text['INI'], '{PWD}') !== false) {
-                $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
-            }
-            $ini = preg_split( "/[\n\r]+/", $section_text['INI']);
-            $ini_settings = $this->settings2array($ini, $ini_settings);
-        }
-        $ini_settings = $this->settings2params($ini_settings);
-        $shortname = str_replace($cwd . DIRECTORY_SEPARATOR, '', $file);
-
-        $tested = trim($section_text['TEST']);
-        $tested.= !isset($this->_options['simple']) ? "[$shortname]" : ' ';
-
-        if (!empty($section_text['POST']) || !empty($section_text['POST_RAW']) ||
-              !empty($section_text['UPLOAD']) || !empty($section_text['GET']) ||
-              !empty($section_text['COOKIE']) || !empty($section_text['EXPECTHEADERS'])) {
-            if (empty($this->_options['cgi'])) {
-                if (!isset($this->_options['quiet'])) {
-                    $this->_logger->log(0, "SKIP $test_nr$tested (reason: --cgi option needed for this test, type 'pear help run-tests')");
-                }
-                if (isset($this->_options['tapoutput'])) {
-                    return array('ok', ' # skip --cgi option needed for this test, "pear help run-tests" for info');
-                }
-                return 'SKIPPED';
-            }
-            $this->_savephp = $this->_php;
-            $this->_php = $this->_options['cgi'];
-        }
-
-        $temp_dir = realpath(dirname($file));
-        $main_file_name = basename($file, 'phpt');
-        $diff_filename     = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'diff';
-        $log_filename      = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'log';
-        $exp_filename      = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'exp';
-        $output_filename   = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'out';
-        $memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'mem';
-        $temp_file         = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'php';
-        $temp_skipif       = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'skip.php';
-        $temp_clean        = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name.'clean.php';
-        $tmp_post          = $temp_dir . DIRECTORY_SEPARATOR . uniqid('phpt.');
-
-        // unlink old test results
-        $this->_cleanupOldFiles($file);
-
-        // Check if test should be skipped.
-        $res  = $this->_runSkipIf($section_text, $temp_skipif, $tested, $ini_settings);
-        if (count($res) != 2) {
-            return $res;
-        }
-        $info = $res['info'];
-        $warn = $res['warn'];
-
-        // We've satisfied the preconditions - run the test!
-        if (isset($this->_options['coverage']) && $this->xdebug_loaded) {
-            $xdebug_file = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'xdebug';
-            $text = "\n" . 'function coverage_shutdown() {' .
-                    "\n" . '    $xdebug = var_export(xdebug_get_code_coverage(), true);';
-            if (!function_exists('file_put_contents')) {
-                $text .= "\n" . '    $fh = fopen(\'' . $xdebug_file . '\', "wb");' .
-                        "\n" . '    if ($fh !== false) {' .
-                        "\n" . '        fwrite($fh, $xdebug);' .
-                        "\n" . '        fclose($fh);' .
-                        "\n" . '    }';
-            } else {
-                $text .= "\n" . '    file_put_contents(\'' . $xdebug_file . '\', $xdebug);';
-            }
-
-            $text .= "\n" . 'xdebug_stop_code_coverage();' .
-                "\n" . '} // end coverage_shutdown()' .
-                "\n" . 'register_shutdown_function("coverage_shutdown");';
-            $text .= "\n" . 'xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);' . "\n?>";
-
-            // Workaround for http://pear.php.net/bugs/bug.php?id=17292
-            $lines     = explode("\n", $section_text['FILE']);
-            $numLines  = count($lines);
-            $namespace = '';
-
-            for ($i = 0; $i < $numLines; $i++) {
-                $lines[$i] = trim($lines[$i]);
-
-                if ($lines[$i] == '<?' || $lines[$i] == '<?php') {
-                    unset($lines[$i]);
-                }
-
-                if (substr($lines[$i], 0, 9) == 'namespace') {
-                    $namespace = $lines[$i] . "\n";
-                    unset($lines[$i]);
-                    break;
-                }
-            }
-
-            $this->save_text($temp_file, "<?php\n" . $namespace . join("\n", $lines));
-        } else {
-            $this->save_text($temp_file, $section_text['FILE']);
-        }
-
-        $args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
-        $cmd = $this->_preparePhpBin($this->_php, $temp_file, $ini_settings);
-        $cmd.= "$args 2>&1";
-        if (isset($this->_logger)) {
-            $this->_logger->log(2, 'Running command "' . $cmd . '"');
-        }
-
-        // Reset environment from any previous test.
-        $env = $this->_resetEnv($section_text, $temp_file);
-
-        $section_text = $this->_processUpload($section_text, $file);
-        if (PEAR::isError($section_text)) {
-            return $section_text;
-        }
-
-        if (array_key_exists('POST_RAW', $section_text) && !empty($section_text['POST_RAW'])) {
-            $post = trim($section_text['POST_RAW']);
-            $raw_lines = explode("\n", $post);
-
-            $request = '';
-            $started = false;
-            foreach ($raw_lines as $i => $line) {
-                if (empty($env['CONTENT_TYPE']) &&
-                    preg_match('/^Content-Type:(.*)/i', $line, $res)) {
-                    $env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[1]));
-                    continue;
-                }
-                if ($started) {
-                    $request .= "\n";
-                }
-                $started = true;
-                $request .= $line;
-            }
-
-            $env['CONTENT_LENGTH'] = strlen($request);
-            $env['REQUEST_METHOD'] = 'POST';
-
-            $this->save_text($tmp_post, $request);
-            $cmd = "$this->_php$pass_options$ini_settings \"$temp_file\" 2>&1 < $tmp_post";
-        } elseif (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
-            $post = trim($section_text['POST']);
-            $this->save_text($tmp_post, $post);
-            $content_length = strlen($post);
-
-            $env['REQUEST_METHOD'] = 'POST';
-            $env['CONTENT_TYPE']   = 'application/x-www-form-urlencoded';
-            $env['CONTENT_LENGTH'] = $content_length;
-
-            $cmd = "$this->_php$pass_options$ini_settings \"$temp_file\" 2>&1 < $tmp_post";
-        } else {
-            $env['REQUEST_METHOD'] = 'GET';
-            $env['CONTENT_TYPE']   = '';
-            $env['CONTENT_LENGTH'] = '';
-        }
-
-        if (OS_WINDOWS && isset($section_text['RETURNS'])) {
-            ob_start();
-            system($cmd, $return_value);
-            $out = ob_get_contents();
-            ob_end_clean();
-            $section_text['RETURNS'] = (int) trim($section_text['RETURNS']);
-            $returnfail = ($return_value != $section_text['RETURNS']);
-        } else {
-            $returnfail = false;
-            $stdin = isset($section_text['STDIN']) ? $section_text['STDIN'] : null;
-            $out = $this->system_with_timeout($cmd, $env, $stdin);
-            $return_value = $out[0];
-            $out = $out[1];
-        }
-
-        $output = preg_replace('/\r\n/', "\n", trim($out));
-
-        if (isset($tmp_post) && realpath($tmp_post) && file_exists($tmp_post)) {
-            @unlink(realpath($tmp_post));
-        }
-        chdir($cwd); // in case the test moves us around
-
-        $this->_testCleanup($section_text, $temp_clean);
-
-        /* when using CGI, strip the headers from the output */
-        $output = $this->_stripHeadersCGI($output);
-
-        if (isset($section_text['EXPECTHEADERS'])) {
-            $testheaders = $this->_processHeaders($section_text['EXPECTHEADERS']);
-            $missing = array_diff_assoc($testheaders, $this->_headers);
-            $changed = '';
-            foreach ($missing as $header => $value) {
-                if (isset($this->_headers[$header])) {
-                    $changed .= "-$header: $value\n+$header: ";
-                    $changed .= $this->_headers[$header];
-                } else {
-                    $changed .= "-$header: $value\n";
-                }
-            }
-            if ($missing) {
-                // tack on failed headers to output:
-                $output .= "\n====EXPECTHEADERS FAILURE====:\n$changed";
-            }
-        }
-        // Does the output match what is expected?
-        do {
-            if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
-                if (isset($section_text['EXPECTF'])) {
-                    $wanted = trim($section_text['EXPECTF']);
-                } else {
-                    $wanted = trim($section_text['EXPECTREGEX']);
-                }
-                $wanted_re = preg_replace('/\r\n/', "\n", $wanted);
-                if (isset($section_text['EXPECTF'])) {
-                    $wanted_re = preg_quote($wanted_re, '/');
-                    // Stick to basics
-                    $wanted_re = str_replace("%s", ".+?", $wanted_re); //not greedy
-                    $wanted_re = str_replace("%i", "[+\-]?[0-9]+", $wanted_re);
-                    $wanted_re = str_replace("%d", "[0-9]+", $wanted_re);
-                    $wanted_re = str_replace("%x", "[0-9a-fA-F]+", $wanted_re);
-                    $wanted_re = str_replace("%f", "[+\-]?\.?[0-9]+\.?[0-9]*(E-?[0-9]+)?", $wanted_re);
-                    $wanted_re = str_replace("%c", ".", $wanted_re);
-                    // %f allows two points "-.0.0" but that is the best *simple* expression
-                }
-
-    /* DEBUG YOUR REGEX HERE
-            var_dump($wanted_re);
-            print(str_repeat('=', 80) . "\n");
-            var_dump($output);
-    */
-                if (!$returnfail && preg_match("/^$wanted_re\$/s", $output)) {
-                    if (file_exists($temp_file)) {
-                        unlink($temp_file);
-                    }
-                    if (array_key_exists('FAIL', $section_text)) {
-                        break;
-                    }
-                    if (!isset($this->_options['quiet'])) {
-                        $this->_logger->log(0, "PASS $test_nr$tested$info");
-                    }
-                    if (isset($this->_options['tapoutput'])) {
-                        return array('ok', ' - ' . $tested);
-                    }
-                    return 'PASSED';
-                }
-            } else {
-                if (isset($section_text['EXPECTFILE'])) {
-                    $f = $temp_dir . '/' . trim($section_text['EXPECTFILE']);
-                    if (!($fp = @fopen($f, 'rb'))) {
-                        return PEAR::raiseError('--EXPECTFILE-- section file ' .
-                            $f . ' not found');
-                    }
-                    fclose($fp);
-                    $section_text['EXPECT'] = file_get_contents($f);
-                }
-
-                if (isset($section_text['EXPECT'])) {
-                    $wanted = preg_replace('/\r\n/', "\n", trim($section_text['EXPECT']));
-                } else {
-                    $wanted = '';
-                }
-
-                // compare and leave on success
-                if (!$returnfail && 0 == strcmp($output, $wanted)) {
-                    if (file_exists($temp_file)) {
-                        unlink($temp_file);
-                    }
-                    if (array_key_exists('FAIL', $section_text)) {
-                        break;
-                    }
-                    if (!isset($this->_options['quiet'])) {
-                        $this->_logger->log(0, "PASS $test_nr$tested$info");
-                    }
-                    if (isset($this->_options['tapoutput'])) {
-                        return array('ok', ' - ' . $tested);
-                    }
-                    return 'PASSED';
-                }
-            }
-        } while (false);
-
-        if (array_key_exists('FAIL', $section_text)) {
-            // we expect a particular failure
-            // this is only used for testing PEAR_RunTest
-            $expectf  = isset($section_text['EXPECTF']) ? $wanted_re : null;
-            $faildiff = $this->generate_diff($wanted, $output, null, $expectf);
-            $faildiff = preg_replace('/\r/', '', $faildiff);
-            $wanted   = preg_replace('/\r/', '', trim($section_text['FAIL']));
-            if ($faildiff == $wanted) {
-                if (!isset($this->_options['quiet'])) {
-                    $this->_logger->log(0, "PASS $test_nr$tested$info");
-                }
-                if (isset($this->_options['tapoutput'])) {
-                    return array('ok', ' - ' . $tested);
-                }
-                return 'PASSED';
-            }
-            unset($section_text['EXPECTF']);
-            $output = $faildiff;
-            if (isset($section_text['RETURNS'])) {
-                return PEAR::raiseError('Cannot have both RETURNS and FAIL in the same test: ' .
-                    $file);
-            }
-        }
-
-        // Test failed so we need to report details.
-        $txt = $warn ? 'WARN ' : 'FAIL ';
-        $this->_logger->log(0, $txt . $test_nr . $tested . $info);
-
-        // write .exp
-        $res = $this->_writeLog($exp_filename, $wanted);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-
-        // write .out
-        $res = $this->_writeLog($output_filename, $output);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-
-        // write .diff
-        $returns = isset($section_text['RETURNS']) ?
-                        array(trim($section_text['RETURNS']), $return_value) : null;
-        $expectf = isset($section_text['EXPECTF']) ? $wanted_re : null;
-        $data = $this->generate_diff($wanted, $output, $returns, $expectf);
-        $res  = $this->_writeLog($diff_filename, $data);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-
-        // write .log
-        $data = "
----- EXPECTED OUTPUT
-$wanted
----- ACTUAL OUTPUT
-$output
----- FAILED
-";
-
-        if ($returnfail) {
-            $data .= "
----- EXPECTED RETURN
-$section_text[RETURNS]
----- ACTUAL RETURN
-$return_value
-";
-        }
-
-        $res = $this->_writeLog($log_filename, $data);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-
-        if (isset($this->_options['tapoutput'])) {
-            $wanted = explode("\n", $wanted);
-            $wanted = "# Expected output:\n#\n#" . implode("\n#", $wanted);
-            $output = explode("\n", $output);
-            $output = "#\n#\n# Actual output:\n#\n#" . implode("\n#", $output);
-            return array($wanted . $output . 'not ok', ' - ' . $tested);
-        }
-        return $warn ? 'WARNED' : 'FAILED';
-    }
-
-    function generate_diff($wanted, $output, $rvalue, $wanted_re)
-    {
-        $w  = explode("\n", $wanted);
-        $o  = explode("\n", $output);
-        $wr = explode("\n", $wanted_re);
-        $w1 = array_diff_assoc($w, $o);
-        $o1 = array_diff_assoc($o, $w);
-        $o2 = $w2 = array();
-        foreach ($w1 as $idx => $val) {
-            if (!$wanted_re || !isset($wr[$idx]) || !isset($o1[$idx]) ||
-                  !preg_match('/^' . $wr[$idx] . '\\z/', $o1[$idx])) {
-                $w2[sprintf("%03d<", $idx)] = sprintf("%03d- ", $idx + 1) . $val;
-            }
-        }
-        foreach ($o1 as $idx => $val) {
-            if (!$wanted_re || !isset($wr[$idx]) ||
-                  !preg_match('/^' . $wr[$idx] . '\\z/', $val)) {
-                $o2[sprintf("%03d>", $idx)] = sprintf("%03d+ ", $idx + 1) . $val;
-            }
-        }
-        $diff = array_merge($w2, $o2);
-        ksort($diff);
-        $extra = $rvalue ? "##EXPECTED: $rvalue[0]\r\n##RETURNED: $rvalue[1]" : '';
-        return implode("\r\n", $diff) . $extra;
-    }
-
-    //  Write the given text to a temporary file, and return the filename.
-    function save_text($filename, $text)
-    {
-        if (!$fp = fopen($filename, 'w')) {
-            return PEAR::raiseError("Cannot open file '" . $filename . "' (save_text)");
-        }
-        fwrite($fp, $text);
-        fclose($fp);
-    if (1 < DETAILED) echo "
-FILE $filename {{{
-$text
-}}}
-";
-    }
-
-    function _cleanupOldFiles($file)
-    {
-        $temp_dir = realpath(dirname($file));
-        $mainFileName = basename($file, 'phpt');
-        $diff_filename     = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'diff';
-        $log_filename      = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'log';
-        $exp_filename      = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'exp';
-        $output_filename   = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'out';
-        $memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'mem';
-        $temp_file         = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'php';
-        $temp_skipif       = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'skip.php';
-        $temp_clean        = $temp_dir . DIRECTORY_SEPARATOR . $mainFileName.'clean.php';
-        $tmp_post          = $temp_dir . DIRECTORY_SEPARATOR . uniqid('phpt.');
-
-        // unlink old test results
-        @unlink($diff_filename);
-        @unlink($log_filename);
-        @unlink($exp_filename);
-        @unlink($output_filename);
-        @unlink($memcheck_filename);
-        @unlink($temp_file);
-        @unlink($temp_skipif);
-        @unlink($tmp_post);
-        @unlink($temp_clean);
-    }
-
-    function _runSkipIf($section_text, $temp_skipif, $tested, $ini_settings)
-    {
-        $info = '';
-        $warn = false;
-        if (array_key_exists('SKIPIF', $section_text) && trim($section_text['SKIPIF'])) {
-            $this->save_text($temp_skipif, $section_text['SKIPIF']);
-            $output = $this->system_with_timeout("$this->_php$ini_settings -f \"$temp_skipif\"");
-            $output = $output[1];
-            $loutput = ltrim($output);
-            unlink($temp_skipif);
-            if (!strncasecmp('skip', $loutput, 4)) {
-                $skipreason = "SKIP $tested";
-                if (preg_match('/^\s*skip\s*(.+)\s*/i', $output, $m)) {
-                    $skipreason .= '(reason: ' . $m[1] . ')';
-                }
-                if (!isset($this->_options['quiet'])) {
-                    $this->_logger->log(0, $skipreason);
-                }
-                if (isset($this->_options['tapoutput'])) {
-                    return array('ok', ' # skip ' . $reason);
-                }
-                return 'SKIPPED';
-            }
-
-            if (!strncasecmp('info', $loutput, 4)
-                && preg_match('/^\s*info\s*(.+)\s*/i', $output, $m)) {
-                $info = " (info: $m[1])";
-            }
-
-            if (!strncasecmp('warn', $loutput, 4)
-                && preg_match('/^\s*warn\s*(.+)\s*/i', $output, $m)) {
-                $warn = true; /* only if there is a reason */
-                $info = " (warn: $m[1])";
-            }
-        }
-
-        return array('warn' => $warn, 'info' => $info);
-    }
-
-    function _stripHeadersCGI($output)
-    {
-        $this->headers = array();
-        if (!empty($this->_options['cgi']) &&
-              $this->_php == $this->_options['cgi'] &&
-              preg_match("/^(.*?)(?:\n\n(.*)|\\z)/s", $output, $match)) {
-            $output = isset($match[2]) ? trim($match[2]) : '';
-            $this->_headers = $this->_processHeaders($match[1]);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Return an array that can be used with array_diff() to compare headers
-     *
-     * @param string $text
-     */
-    function _processHeaders($text)
-    {
-        $headers = array();
-        $rh = preg_split("/[\n\r]+/", $text);
-        foreach ($rh as $line) {
-            if (strpos($line, ':')!== false) {
-                $line = explode(':', $line, 2);
-                $headers[trim($line[0])] = trim($line[1]);
-            }
-        }
-        return $headers;
-    }
-
-    function _readFile($file)
-    {
-        // Load the sections of the test file.
-        $section_text = array(
-            'TEST'   => '(unnamed test)',
-            'SKIPIF' => '',
-            'GET'    => '',
-            'COOKIE' => '',
-            'POST'   => '',
-            'ARGS'   => '',
-            'INI'    => '',
-            'CLEAN'  => '',
-        );
-
-        if (!is_file($file) || !$fp = fopen($file, "r")) {
-            return PEAR::raiseError("Cannot open test file: $file");
-        }
-
-        $section = '';
-        while (!feof($fp)) {
-            $line = fgets($fp);
-
-            // Match the beginning of a section.
-            if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
-                $section = $r[1];
-                $section_text[$section] = '';
-                continue;
-            } elseif (empty($section)) {
-                fclose($fp);
-                return PEAR::raiseError("Invalid sections formats in test file: $file");
-            }
-
-            // Add to the section text.
-            $section_text[$section] .= $line;
-        }
-        fclose($fp);
-
-        return $section_text;
-    }
-
-    function _writeLog($logname, $data)
-    {
-        if (!$log = fopen($logname, 'w')) {
-            return PEAR::raiseError("Cannot create test log - $logname");
-        }
-        fwrite($log, $data);
-        fclose($log);
-    }
-
-    function _resetEnv($section_text, $temp_file)
-    {
-        $env = $_ENV;
-        $env['REDIRECT_STATUS'] = '';
-        $env['QUERY_STRING']    = '';
-        $env['PATH_TRANSLATED'] = '';
-        $env['SCRIPT_FILENAME'] = '';
-        $env['REQUEST_METHOD']  = '';
-        $env['CONTENT_TYPE']    = '';
-        $env['CONTENT_LENGTH']  = '';
-        if (!empty($section_text['ENV'])) {
-            if (strpos($section_text['ENV'], '{PWD}') !== false) {
-                $section_text['ENV'] = str_replace('{PWD}', dirname($temp_file), $section_text['ENV']);
-            }
-            foreach (explode("\n", trim($section_text['ENV'])) as $e) {
-                $e = explode('=', trim($e), 2);
-                if (!empty($e[0]) && isset($e[1])) {
-                    $env[$e[0]] = $e[1];
-                }
-            }
-        }
-        if (array_key_exists('GET', $section_text)) {
-            $env['QUERY_STRING'] = trim($section_text['GET']);
-        } else {
-            $env['QUERY_STRING'] = '';
-        }
-        if (array_key_exists('COOKIE', $section_text)) {
-            $env['HTTP_COOKIE'] = trim($section_text['COOKIE']);
-        } else {
-            $env['HTTP_COOKIE'] = '';
-        }
-        $env['REDIRECT_STATUS'] = '1';
-        $env['PATH_TRANSLATED'] = $temp_file;
-        $env['SCRIPT_FILENAME'] = $temp_file;
-
-        return $env;
-    }
-
-    function _processUpload($section_text, $file)
-    {
-        if (array_key_exists('UPLOAD', $section_text) && !empty($section_text['UPLOAD'])) {
-            $upload_files = trim($section_text['UPLOAD']);
-            $upload_files = explode("\n", $upload_files);
-
-            $request = "Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737\n" .
-                       "-----------------------------20896060251896012921717172737\n";
-            foreach ($upload_files as $fileinfo) {
-                $fileinfo = explode('=', $fileinfo);
-                if (count($fileinfo) != 2) {
-                    return PEAR::raiseError("Invalid UPLOAD section in test file: $file");
-                }
-                if (!realpath(dirname($file) . '/' . $fileinfo[1])) {
-                    return PEAR::raiseError("File for upload does not exist: $fileinfo[1] " .
-                        "in test file: $file");
-                }
-                $file_contents = file_get_contents(dirname($file) . '/' . $fileinfo[1]);
-                $fileinfo[1] = basename($fileinfo[1]);
-                $request .= "Content-Disposition: form-data; name=\"$fileinfo[0]\"; filename=\"$fileinfo[1]\"\n";
-                $request .= "Content-Type: text/plain\n\n";
-                $request .= $file_contents . "\n" .
-                    "-----------------------------20896060251896012921717172737\n";
-            }
-
-            if (array_key_exists('POST', $section_text) && !empty($section_text['POST'])) {
-                // encode POST raw
-                $post = trim($section_text['POST']);
-                $post = explode('&', $post);
-                foreach ($post as $i => $post_info) {
-                    $post_info = explode('=', $post_info);
-                    if (count($post_info) != 2) {
-                        return PEAR::raiseError("Invalid POST data in test file: $file");
-                    }
-                    $post_info[0] = rawurldecode($post_info[0]);
-                    $post_info[1] = rawurldecode($post_info[1]);
-                    $post[$i] = $post_info;
-                }
-                foreach ($post as $post_info) {
-                    $request .= "Content-Disposition: form-data; name=\"$post_info[0]\"\n\n";
-                    $request .= $post_info[1] . "\n" .
-                        "-----------------------------20896060251896012921717172737\n";
-                }
-                unset($section_text['POST']);
-            }
-            $section_text['POST_RAW'] = $request;
-        }
-
-        return $section_text;
-    }
-
-    function _testCleanup($section_text, $temp_clean)
-    {
-        if ($section_text['CLEAN']) {
-            // perform test cleanup
-            $this->save_text($temp_clean, $section_text['CLEAN']);
-            $output = $this->system_with_timeout("$this->_php $temp_clean  2>&1");
-            if (strlen($output[1])) {
-                echo "BORKED --CLEAN-- section! output:\n", $output[1];
-            }
-            if (file_exists($temp_clean)) {
-                unlink($temp_clean);
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/pear/PEAR/Task/Common.php b/airtime_mvc/library/pear/PEAR/Task/Common.php
deleted file mode 100644
index 6a8b9f28c..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Common.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * PEAR_Task_Common, base class for installer tasks
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**#@+
- * Error codes for task validation routines
- */
-define('PEAR_TASK_ERROR_NOATTRIBS', 1);
-define('PEAR_TASK_ERROR_MISSING_ATTRIB', 2);
-define('PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE', 3);
-define('PEAR_TASK_ERROR_INVALID', 4);
-/**#@-*/
-define('PEAR_TASK_PACKAGE', 1);
-define('PEAR_TASK_INSTALL', 2);
-define('PEAR_TASK_PACKAGEANDINSTALL', 3);
-/**
- * A task is an operation that manipulates the contents of a file.
- *
- * Simple tasks operate on 1 file.  Multiple tasks are executed after all files have been
- * processed and installed, and are designed to operate on all files containing the task.
- * The Post-install script task simply takes advantage of the fact that it will be run
- * after installation, replace is a simple task.
- *
- * Combining tasks is possible, but ordering is significant.
- *
- * <file name="test.php" role="php">
- *  <tasks:replace from="@data-dir@" to="data_dir" type="pear-config"/>
- *  <tasks:postinstallscript/>
- * </file>
- *
- * This will first replace any instance of @data-dir@ in the test.php file
- * with the path to the current data directory.  Then, it will include the
- * test.php file and run the script it contains to configure the package post-installation.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- * @abstract
- */
-class PEAR_Task_Common
-{
-    /**
-     * Valid types for this version are 'simple' and 'multiple'
-     *
-     * - simple tasks operate on the contents of a file and write out changes to disk
-     * - multiple tasks operate on the contents of many files and write out the
-     *   changes directly to disk
-     *
-     * Child task classes must override this property.
-     * @access protected
-     */
-    var $type = 'simple';
-    /**
-     * Determines which install phase this task is executed under
-     */
-    var $phase = PEAR_TASK_INSTALL;
-    /**
-     * @access protected
-     */
-    var $config;
-    /**
-     * @access protected
-     */
-    var $registry;
-    /**
-     * @access protected
-     */
-    var $logger;
-    /**
-     * @access protected
-     */
-    var $installphase;
-    /**
-     * @param PEAR_Config
-     * @param PEAR_Common
-     */
-    function PEAR_Task_Common(&$config, &$logger, $phase)
-    {
-        $this->config = &$config;
-        $this->registry = &$config->getRegistry();
-        $this->logger = &$logger;
-        $this->installphase = $phase;
-        if ($this->type == 'multiple') {
-            $GLOBALS['_PEAR_TASK_POSTINSTANCES'][get_class($this)][] = &$this;
-        }
-    }
-
-    /**
-     * Validate the basic contents of a task tag.
-     * @param PEAR_PackageFile_v2
-     * @param array
-     * @param PEAR_Config
-     * @param array the entire parsed <file> tag
-     * @return true|array On error, return an array in format:
-     *    array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
-     *
-     *    For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
-     *    For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and an array
-     *    of legal values in
-     * @static
-     * @abstract
-     */
-    function validateXml($pkg, $xml, $config, $fileXml)
-    {
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the <file> tag containing this task
-     * @param string|null last installed version of this package
-     * @abstract
-     */
-    function init($xml, $fileAttributes, $lastVersion)
-    {
-    }
-
-    /**
-     * Begin a task processing session.  All multiple tasks will be processed after each file
-     * has been successfully installed, all simple tasks should perform their task here and
-     * return any errors using the custom throwError() method to allow forward compatibility
-     *
-     * This method MUST NOT write out any changes to disk
-     * @param PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     * @abstract
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-    }
-
-    /**
-     * This method is used to process each of the tasks for a particular multiple class
-     * type.  Simple tasks need not implement this method.
-     * @param array an array of tasks
-     * @access protected
-     * @static
-     * @abstract
-     */
-    function run($tasks)
-    {
-    }
-
-    /**
-     * @static
-     * @final
-     */
-    function hasPostinstallTasks()
-    {
-        return isset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
-    }
-
-    /**
-     * @static
-     * @final
-     */
-     function runPostinstallTasks()
-     {
-         foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
-             $err = call_user_func(array($class, 'run'),
-                  $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]);
-             if ($err) {
-                 return PEAR_Task_Common::throwError($err);
-             }
-         }
-         unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
-    }
-
-    /**
-     * Determines whether a role is a script
-     * @return bool
-     */
-    function isScript()
-    {
-        return $this->type == 'script';
-    }
-
-    function throwError($msg, $code = -1)
-    {
-        include_once 'PEAR.php';
-        return PEAR::raiseError($msg, $code);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Postinstallscript.php b/airtime_mvc/library/pear/PEAR/Task/Postinstallscript.php
deleted file mode 100644
index d1376b140..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Postinstallscript.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * <tasks:postinstallscript>
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Postinstallscript.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the postinstallscript file task.
- *
- * Note that post-install scripts are handled separately from installation, by the
- * "pear run-scripts" command
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Postinstallscript extends PEAR_Task_Common
-{
-    var $type = 'script';
-    var $_class;
-    var $_params;
-    var $_obj;
-    /**
-     *
-     * @var PEAR_PackageFile_v2
-     */
-    var $_pkg;
-    var $_contents;
-    var $phase = PEAR_TASK_INSTALL;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     *
-     * This also attempts to validate the script to make sure it meets the criteria
-     * for a post-install script
-     * @param PEAR_PackageFile_v2
-     * @param array The XML contents of the <postinstallscript> tag
-     * @param PEAR_Config
-     * @param array the entire parsed <file> tag
-     * @static
-     */
-    function validateXml($pkg, $xml, $config, $fileXml)
-    {
-        if ($fileXml['role'] != 'php') {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-            $fileXml['name'] . '" must be role="php"');
-        }
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $file = $pkg->getFileContents($fileXml['name']);
-        if (PEAR::isError($file)) {
-            PEAR::popErrorHandling();
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" is not valid: ' .
-                $file->getMessage());
-        } elseif ($file === null) {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" could not be retrieved for processing!');
-        } else {
-            $analysis = $pkg->analyzeSourceCode($file, true);
-            if (!$analysis) {
-                PEAR::popErrorHandling();
-                $warnings = '';
-                foreach ($pkg->getValidationWarnings() as $warn) {
-                    $warnings .= $warn['message'] . "\n";
-                }
-                return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "' .
-                    $fileXml['name'] . '" failed: ' . $warnings);
-            }
-            if (count($analysis['declared_classes']) != 1) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare exactly 1 class');
-            }
-            $class = $analysis['declared_classes'][0];
-            if ($class != str_replace(array('/', '.php'), array('_', ''),
-                  $fileXml['name']) . '_postinstall') {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" class "' . $class . '" must be named "' .
-                    str_replace(array('/', '.php'), array('_', ''),
-                    $fileXml['name']) . '_postinstall"');
-            }
-            if (!isset($analysis['declared_methods'][$class])) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
-            }
-            $methods = array('init' => 0, 'run' => 1);
-            foreach ($analysis['declared_methods'][$class] as $method) {
-                if (isset($methods[$method])) {
-                    unset($methods[$method]);
-                }
-            }
-            if (count($methods)) {
-                PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
-            }
-        }
-        PEAR::popErrorHandling();
-        $definedparams = array();
-        $tasksNamespace = $pkg->getTasksNs() . ':';
-        if (!isset($xml[$tasksNamespace . 'paramgroup']) && isset($xml['paramgroup'])) {
-            // in order to support the older betas, which did not expect internal tags
-            // to also use the namespace
-            $tasksNamespace = '';
-        }
-        if (isset($xml[$tasksNamespace . 'paramgroup'])) {
-            $params = $xml[$tasksNamespace . 'paramgroup'];
-            if (!is_array($params) || !isset($params[0])) {
-                $params = array($params);
-            }
-            foreach ($params as $param) {
-                if (!isset($param[$tasksNamespace . 'id'])) {
-                    return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                        $fileXml['name'] . '" <paramgroup> must have ' .
-                        'an ' . $tasksNamespace . 'id> tag');
-                }
-                if (isset($param[$tasksNamespace . 'name'])) {
-                    if (!in_array($param[$tasksNamespace . 'name'], $definedparams)) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" parameter "' . $param[$tasksNamespace . 'name'] .
-                            '" has not been previously defined');
-                    }
-                    if (!isset($param[$tasksNamespace . 'conditiontype'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
-                    }
-                    if (!in_array($param[$tasksNamespace . 'conditiontype'],
-                          array('=', '!=', 'preg_match'))) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
-                    }
-                    if (!isset($param[$tasksNamespace . 'value'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'value> tag containing expected parameter value');
-                    }
-                }
-                if (isset($param[$tasksNamespace . 'instructions'])) {
-                    if (!is_string($param[$tasksNamespace . 'instructions'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" ' . $tasksNamespace . 'instructions> must be simple text');
-                    }
-                }
-                if (!isset($param[$tasksNamespace . 'param'])) {
-                    continue; // <param> is no longer required
-                }
-                $subparams = $param[$tasksNamespace . 'param'];
-                if (!is_array($subparams) || !isset($subparams[0])) {
-                    $subparams = array($subparams);
-                }
-                foreach ($subparams as $subparam) {
-                    if (!isset($subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter for ' .
-                            $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] . '" must have ' .
-                            'a ' . $tasksNamespace . 'name> tag');
-                    }
-                    if (!preg_match('/[a-zA-Z0-9]+/',
-                          $subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" is not a valid name.  Must contain only alphanumeric characters');
-                    }
-                    if (!isset($subparam[$tasksNamespace . 'prompt'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'prompt> tag');
-                    }
-                    if (!isset($subparam[$tasksNamespace . 'type'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'type> tag');
-                    }
-                    $definedparams[] = $param[$tasksNamespace . 'id'] . '::' .
-                    $subparam[$tasksNamespace . 'name'];
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the <file> tag containing this task
-     * @param string|null last installed version of this package, if any (useful for upgrades)
-     */
-    function init($xml, $fileattribs, $lastversion)
-    {
-        $this->_class = str_replace('/', '_', $fileattribs['name']);
-        $this->_filename = $fileattribs['name'];
-        $this->_class = str_replace ('.php', '', $this->_class) . '_postinstall';
-        $this->_params = $xml;
-        $this->_lastversion = $lastversion;
-    }
-
-    /**
-     * Strip the tasks: namespace from internal params
-     *
-     * @access private
-     */
-    function _stripNamespace($params = null)
-    {
-        if ($params === null) {
-            $params = array();
-            if (!is_array($this->_params)) {
-                return;
-            }
-            foreach ($this->_params as $i => $param) {
-                if (is_array($param)) {
-                    $param = $this->_stripNamespace($param);
-                }
-                $params[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
-            }
-            $this->_params = $params;
-        } else {
-            $newparams = array();
-            foreach ($params as $i => $param) {
-                if (is_array($param)) {
-                    $param = $this->_stripNamespace($param);
-                }
-                $newparams[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
-            }
-            return $newparams;
-        }
-    }
-
-    /**
-     * Unlike other tasks, the installed file name is passed in instead of the file contents,
-     * because this task is handled post-installation
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file name
-     * @return bool|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError)
-     */
-    function startSession($pkg, $contents)
-    {
-        if ($this->installphase != PEAR_TASK_INSTALL) {
-            return false;
-        }
-        // remove the tasks: namespace if present
-        $this->_pkg = $pkg;
-        $this->_stripNamespace();
-        $this->logger->log(0, 'Including external post-installation script "' .
-            $contents . '" - any errors are in this script');
-        include_once $contents;
-        if (class_exists($this->_class)) {
-            $this->logger->log(0, 'Inclusion succeeded');
-        } else {
-            return $this->throwError('init of post-install script class "' . $this->_class
-                . '" failed');
-        }
-        $this->_obj = new $this->_class;
-        $this->logger->log(1, 'running post-install script "' . $this->_class . '->init()"');
-        PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
-        $res = $this->_obj->init($this->config, $pkg, $this->_lastversion);
-        PEAR::popErrorHandling();
-        if ($res) {
-            $this->logger->log(0, 'init succeeded');
-        } else {
-            return $this->throwError('init of post-install script "' . $this->_class .
-                '->init()" failed');
-        }
-        $this->_contents = $contents;
-        return true;
-    }
-
-    /**
-     * No longer used
-     * @see PEAR_PackageFile_v2::runPostinstallScripts()
-     * @param array an array of tasks
-     * @param string install or upgrade
-     * @access protected
-     * @static
-     */
-    function run()
-    {
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Postinstallscript/rw.php b/airtime_mvc/library/pear/PEAR/Task/Postinstallscript/rw.php
deleted file mode 100644
index 330dcbd64..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Postinstallscript/rw.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * <tasks:postinstallscript> - read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Postinstallscript.php';
-/**
- * Abstracts the postinstallscript file task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
-{
-    /**
-     * parent package file object
-     *
-     * @var PEAR_PackageFile_v2_rw
-     */
-    var $_pkg;
-    /**
-     * Enter description here...
-     *
-     * @param PEAR_PackageFile_v2_rw $pkg
-     * @param PEAR_Config $config
-     * @param PEAR_Frontend $logger
-     * @param array $fileXml
-     * @return PEAR_Task_Postinstallscript_rw
-     */
-    function PEAR_Task_Postinstallscript_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
-    }
-
-    function getName()
-    {
-        return 'postinstallscript';
-    }
-
-    /**
-     * add a simple <paramgroup> to the post-install script
-     *
-     * Order is significant, so call this method in the same
-     * sequence the users should see the paramgroups.  The $params
-     * parameter should either be the result of a call to {@link getParam()}
-     * or an array of calls to getParam().
-     *
-     * Use {@link addConditionTypeGroup()} to add a <paramgroup> containing
-     * a <conditiontype> tag
-     * @param string $id <paramgroup> id as seen by the script
-     * @param array|false $params array of getParam() calls, or false for no params
-     * @param string|false $instructions
-     */
-    function addParamGroup($id, $params = false, $instructions = false)
-    {
-        if ($params && isset($params[0]) && !isset($params[1])) {
-            $params = $params[0];
-        }
-        $stuff =
-            array(
-                $this->_pkg->getTasksNs() . ':id' => $id,
-            );
-        if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
-        }
-        if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
-        }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
-    }
-
-    /**
-     * add a complex <paramgroup> to the post-install script with conditions
-     *
-     * This inserts a <paramgroup> with
-     *
-     * Order is significant, so call this method in the same
-     * sequence the users should see the paramgroups.  The $params
-     * parameter should either be the result of a call to {@link getParam()}
-     * or an array of calls to getParam().
-     *
-     * Use {@link addParamGroup()} to add a simple <paramgroup>
-     *
-     * @param string $id <paramgroup> id as seen by the script
-     * @param string $oldgroup <paramgroup> id of the section referenced by
-     *                         <conditiontype>
-     * @param string $param name of the <param> from the older section referenced
-     *                      by <contitiontype>
-     * @param string $value value to match of the parameter
-     * @param string $conditiontype one of '=', '!=', 'preg_match'
-     * @param array|false $params array of getParam() calls, or false for no params
-     * @param string|false $instructions
-     */
-    function addConditionTypeGroup($id, $oldgroup, $param, $value, $conditiontype = '=',
-                                   $params = false, $instructions = false)
-    {
-        if ($params && isset($params[0]) && !isset($params[1])) {
-            $params = $params[0];
-        }
-        $stuff = array(
-            $this->_pkg->getTasksNs() . ':id' => $id,
-        );
-        if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
-        }
-        $stuff[$this->_pkg->getTasksNs() . ':name'] = $oldgroup . '::' . $param;
-        $stuff[$this->_pkg->getTasksNs() . ':conditiontype'] = $conditiontype;
-        $stuff[$this->_pkg->getTasksNs() . ':value'] = $value;
-        if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
-        }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
-    }
-
-    function getXml()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Use to set up a param tag for use in creating a paramgroup
-     * @static
-     */
-    function getParam($name, $prompt, $type = 'string', $default = null)
-    {
-        if ($default !== null) {
-            return
-            array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
-                $this->_pkg->getTasksNs() . ':default' => $default
-            );
-        }
-        return
-            array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
-            );
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Replace.php b/airtime_mvc/library/pear/PEAR/Task/Replace.php
deleted file mode 100644
index 83cb2a3fb..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Replace.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * <tasks:replace>
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Replace.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the replace file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Replace extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGEANDINSTALL;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, $config, $fileXml)
-    {
-        if (!isset($xml['attribs'])) {
-            return array(PEAR_TASK_ERROR_NOATTRIBS);
-        }
-        if (!isset($xml['attribs']['type'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'type');
-        }
-        if (!isset($xml['attribs']['to'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'to');
-        }
-        if (!isset($xml['attribs']['from'])) {
-            return array(PEAR_TASK_ERROR_MISSING_ATTRIB, 'from');
-        }
-        if ($xml['attribs']['type'] == 'pear-config') {
-            if (!in_array($xml['attribs']['to'], $config->getKeys())) {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    $config->getKeys());
-            }
-        } elseif ($xml['attribs']['type'] == 'php-const') {
-            if (defined($xml['attribs']['to'])) {
-                return true;
-            } else {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    array('valid PHP constant'));
-            }
-        } elseif ($xml['attribs']['type'] == 'package-info') {
-            if (in_array($xml['attribs']['to'],
-                array('name', 'summary', 'channel', 'notes', 'extends', 'description',
-                    'release_notes', 'license', 'release-license', 'license-uri',
-                    'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'))) {
-                return true;
-            } else {
-                return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    array('name', 'summary', 'channel', 'notes', 'extends', 'description',
-                    'release_notes', 'license', 'release-license', 'license-uri',
-                    'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'));
-            }
-        } else {
-            return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'type', $xml['attribs']['type'],
-                array('pear-config', 'package-info', 'php-const'));
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-        $this->_replacements = isset($xml['attribs']) ? array($xml) : $xml;
-    }
-
-    /**
-     * Do a package.xml 1.0 replacement, with additional package-info fields available
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $subst_from = $subst_to = array();
-        foreach ($this->_replacements as $a) {
-            $a = $a['attribs'];
-            $to = '';
-            if ($a['type'] == 'pear-config') {
-                if ($this->installphase == PEAR_TASK_PACKAGE) {
-                    return false;
-                }
-                if ($a['to'] == 'master_server') {
-                    $chan = $this->registry->getChannel($pkg->getChannel());
-                    if (!PEAR::isError($chan)) {
-                        $to = $chan->getServer();
-                    } else {
-                        $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
-                        return false;
-                    }
-                } else {
-                    if ($this->config->isDefinedLayer('ftp')) {
-                        // try the remote config file first
-                        $to = $this->config->get($a['to'], 'ftp', $pkg->getChannel());
-                        if (is_null($to)) {
-                            // then default to local
-                            $to = $this->config->get($a['to'], null, $pkg->getChannel());
-                        }
-                    } else {
-                        $to = $this->config->get($a['to'], null, $pkg->getChannel());
-                    }
-                }
-                if (is_null($to)) {
-                    $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
-                    return false;
-                }
-            } elseif ($a['type'] == 'php-const') {
-                if ($this->installphase == PEAR_TASK_PACKAGE) {
-                    return false;
-                }
-                if (defined($a['to'])) {
-                    $to = constant($a['to']);
-                } else {
-                    $this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
-                    return false;
-                }
-            } else {
-                if ($t = $pkg->packageInfo($a['to'])) {
-                    $to = $t;
-                } else {
-                    $this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
-                    return false;
-                }
-            }
-            if (!is_null($to)) {
-                $subst_from[] = $a['from'];
-                $subst_to[] = $to;
-            }
-        }
-        $this->logger->log(3, "doing " . sizeof($subst_from) .
-            " substitution(s) for $dest");
-        if (sizeof($subst_from)) {
-            $contents = str_replace($subst_from, $subst_to, $contents);
-        }
-        return $contents;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Replace/rw.php b/airtime_mvc/library/pear/PEAR/Task/Replace/rw.php
deleted file mode 100644
index 7bdcecd3b..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Replace/rw.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * <tasks:replace> - read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Replace.php';
-/**
- * Abstracts the replace task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Replace_rw extends PEAR_Task_Replace
-{
-    function PEAR_Task_Replace_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
-    }
-
-    function setInfo($from, $to, $type)
-    {
-        $this->_params = array('attribs' => array('from' => $from, 'to' => $to, 'type' => $type));
-    }
-
-    function getName()
-    {
-        return 'replace';
-    }
-
-    function getXml()
-    {
-        return $this->_params;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Unixeol.php b/airtime_mvc/library/pear/PEAR/Task/Unixeol.php
deleted file mode 100644
index d5a016756..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Unixeol.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * <tasks:unixeol>
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Unixeol.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the unix line endings file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Unixeol extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, $config, $fileXml)
-    {
-        if ($xml != '') {
-            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-    }
-
-    /**
-     * Replace all line endings with line endings customized for the current OS
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $this->logger->log(3, "replacing all line endings with \\n in $dest");
-        return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Unixeol/rw.php b/airtime_mvc/library/pear/PEAR/Task/Unixeol/rw.php
deleted file mode 100644
index 073d3b533..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Unixeol/rw.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * <tasks:unixeol> - read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Unixeol.php';
-/**
- * Abstracts the unixeol task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Unixeol_rw extends PEAR_Task_Unixeol
-{
-    function PEAR_Task_Unixeol_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return true;
-    }
-
-    function getName()
-    {
-        return 'unixeol';
-    }
-
-    function getXml()
-    {
-        return '';
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Windowseol.php b/airtime_mvc/library/pear/PEAR/Task/Windowseol.php
deleted file mode 100644
index 0a900759b..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Windowseol.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * <tasks:windowseol>
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Windowseol.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Common.php';
-/**
- * Implements the windows line endsings file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Task_Windowseol extends PEAR_Task_Common
-{
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
-
-    /**
-     * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
-     */
-    function validateXml($pkg, $xml, $config, $fileXml)
-    {
-        if ($xml != '') {
-            return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
-        }
-        return true;
-    }
-
-    /**
-     * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param unused
-     */
-    function init($xml, $attribs)
-    {
-    }
-
-    /**
-     * Replace all line endings with windows line endings
-     *
-     * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
-     */
-    function startSession($pkg, $contents, $dest)
-    {
-        $this->logger->log(3, "replacing all line endings with \\r\\n in $dest");
-        return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents);
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Task/Windowseol/rw.php b/airtime_mvc/library/pear/PEAR/Task/Windowseol/rw.php
deleted file mode 100644
index 6e36d7635..000000000
--- a/airtime_mvc/library/pear/PEAR/Task/Windowseol/rw.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * <tasks:windowseol> - read/write version
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
- */
-/**
- * Base class
- */
-require_once 'PEAR/Task/Windowseol.php';
-/**
- * Abstracts the windowseol task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
- */
-class PEAR_Task_Windowseol_rw extends PEAR_Task_Windowseol
-{
-    function PEAR_Task_Windowseol_rw(&$pkg, &$config, &$logger, $fileXml)
-    {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
-        $this->_contents = $fileXml;
-        $this->_pkg = &$pkg;
-        $this->_params = array();
-    }
-
-    function validate()
-    {
-        return true;
-    }
-
-    function getName()
-    {
-        return 'windowseol';
-    }
-
-    function getXml()
-    {
-        return '';
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Validate.php b/airtime_mvc/library/pear/PEAR/Validate.php
deleted file mode 100644
index f1d2afa90..000000000
--- a/airtime_mvc/library/pear/PEAR/Validate.php
+++ /dev/null
@@ -1,629 +0,0 @@
-<?php
-/**
- * PEAR_Validate
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Validate.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-/**#@+
- * Constants for install stage
- */
-define('PEAR_VALIDATE_INSTALLING', 1);
-define('PEAR_VALIDATE_UNINSTALLING', 2); // this is not bit-mapped like the others
-define('PEAR_VALIDATE_NORMAL', 3);
-define('PEAR_VALIDATE_DOWNLOADING', 4); // this is not bit-mapped like the others
-define('PEAR_VALIDATE_PACKAGING', 7);
-/**#@-*/
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Validator/PECL.php';
-
-/**
- * Validation class for package.xml - channel-level advanced validation
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
- */
-class PEAR_Validate
-{
-    var $packageregex = _PEAR_COMMON_PACKAGE_NAME_PREG;
-    /**
-     * @var PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    var $_packagexml;
-    /**
-     * @var int one of the PEAR_VALIDATE_* constants
-     */
-    var $_state = PEAR_VALIDATE_NORMAL;
-    /**
-     * Format: ('error' => array('field' => name, 'reason' => reason), 'warning' => same)
-     * @var array
-     * @access private
-     */
-    var $_failures = array('error' => array(), 'warning' => array());
-
-    /**
-     * Override this method to handle validation of normal package names
-     * @param string
-     * @return bool
-     * @access protected
-     */
-    function _validPackageName($name)
-    {
-        return (bool) preg_match('/^' . $this->packageregex . '\\z/', $name);
-    }
-
-    /**
-     * @param string package name to validate
-     * @param string name of channel-specific validation package
-     * @final
-     */
-    function validPackageName($name, $validatepackagename = false)
-    {
-        if ($validatepackagename) {
-            if (strtolower($name) == strtolower($validatepackagename)) {
-                return (bool) preg_match('/^[a-zA-Z0-9_]+(?:\.[a-zA-Z0-9_]+)*\\z/', $name);
-            }
-        }
-        return $this->_validPackageName($name);
-    }
-
-    /**
-     * This validates a bundle name, and bundle names must conform
-     * to the PEAR naming convention, so the method is final and static.
-     * @param string
-     * @final
-     * @static
-     */
-    function validGroupName($name)
-    {
-        return (bool) preg_match('/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '\\z/', $name);
-    }
-
-    /**
-     * Determine whether $state represents a valid stability level
-     * @param string
-     * @return bool
-     * @static
-     * @final
-     */
-    function validState($state)
-    {
-        return in_array($state, array('snapshot', 'devel', 'alpha', 'beta', 'stable'));
-    }
-
-    /**
-     * Get a list of valid stability levels
-     * @return array
-     * @static
-     * @final
-     */
-    function getValidStates()
-    {
-        return array('snapshot', 'devel', 'alpha', 'beta', 'stable');
-    }
-
-    /**
-     * Determine whether a version is a properly formatted version number that can be used
-     * by version_compare
-     * @param string
-     * @return bool
-     * @static
-     * @final
-     */
-    function validVersion($ver)
-    {
-        return (bool) preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
-    }
-
-    /**
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     */
-    function setPackageFile(&$pf)
-    {
-        $this->_packagexml = &$pf;
-    }
-
-    /**
-     * @access private
-     */
-    function _addFailure($field, $reason)
-    {
-        $this->_failures['errors'][] = array('field' => $field, 'reason' => $reason);
-    }
-
-    /**
-     * @access private
-     */
-    function _addWarning($field, $reason)
-    {
-        $this->_failures['warnings'][] = array('field' => $field, 'reason' => $reason);
-    }
-
-    function getFailures()
-    {
-        $failures = $this->_failures;
-        $this->_failures = array('warnings' => array(), 'errors' => array());
-        return $failures;
-    }
-
-    /**
-     * @param int one of the PEAR_VALIDATE_* constants
-     */
-    function validate($state = null)
-    {
-        if (!isset($this->_packagexml)) {
-            return false;
-        }
-        if ($state !== null) {
-            $this->_state = $state;
-        }
-        $this->_failures = array('warnings' => array(), 'errors' => array());
-        $this->validatePackageName();
-        $this->validateVersion();
-        $this->validateMaintainers();
-        $this->validateDate();
-        $this->validateSummary();
-        $this->validateDescription();
-        $this->validateLicense();
-        $this->validateNotes();
-        if ($this->_packagexml->getPackagexmlVersion() == '1.0') {
-            $this->validateState();
-            $this->validateFilelist();
-        } elseif ($this->_packagexml->getPackagexmlVersion() == '2.0' ||
-                  $this->_packagexml->getPackagexmlVersion() == '2.1') {
-            $this->validateTime();
-            $this->validateStability();
-            $this->validateDeps();
-            $this->validateMainFilelist();
-            $this->validateReleaseFilelist();
-            //$this->validateGlobalTasks();
-            $this->validateChangelog();
-        }
-        return !((bool) count($this->_failures['errors']));
-    }
-
-    /**
-     * @access protected
-     */
-    function validatePackageName()
-    {
-        if ($this->_state == PEAR_VALIDATE_PACKAGING ||
-              $this->_state == PEAR_VALIDATE_NORMAL) {
-            if (($this->_packagexml->getPackagexmlVersion() == '2.0' ||
-                 $this->_packagexml->getPackagexmlVersion() == '2.1') &&
-                  $this->_packagexml->getExtends()) {
-                $version = $this->_packagexml->getVersion() . '';
-                $name = $this->_packagexml->getPackage();
-                $test = array_shift($a = explode('.', $version));
-                if ($test == '0') {
-                    return true;
-                }
-                $vlen = strlen($test);
-                $majver = substr($name, strlen($name) - $vlen);
-                while ($majver && !is_numeric($majver{0})) {
-                    $majver = substr($majver, 1);
-                }
-                if ($majver != $test) {
-                    $this->_addWarning('package', "package $name extends package " .
-                        $this->_packagexml->getExtends() . ' and so the name should ' .
-                        'have a postfix equal to the major version like "' .
-                        $this->_packagexml->getExtends() . $test . '"');
-                    return true;
-                } elseif (substr($name, 0, strlen($name) - $vlen) !=
-                            $this->_packagexml->getExtends()) {
-                    $this->_addWarning('package', "package $name extends package " .
-                        $this->_packagexml->getExtends() . ' and so the name must ' .
-                        'be an extension like "' . $this->_packagexml->getExtends() .
-                        $test . '"');
-                    return true;
-                }
-            }
-        }
-        if (!$this->validPackageName($this->_packagexml->getPackage())) {
-            $this->_addFailure('name', 'package name "' .
-                $this->_packagexml->getPackage() . '" is invalid');
-            return false;
-        }
-    }
-
-    /**
-     * @access protected
-     */
-    function validateVersion()
-    {
-        if ($this->_state != PEAR_VALIDATE_PACKAGING) {
-            if (!$this->validVersion($this->_packagexml->getVersion())) {
-                $this->_addFailure('version',
-                    'Invalid version number "' . $this->_packagexml->getVersion() . '"');
-            }
-            return false;
-        }
-        $version = $this->_packagexml->getVersion();
-        $versioncomponents = explode('.', $version);
-        if (count($versioncomponents) != 3) {
-            $this->_addWarning('version',
-                'A version number should have 3 decimals (x.y.z)');
-            return true;
-        }
-        $name = $this->_packagexml->getPackage();
-        // version must be based upon state
-        switch ($this->_packagexml->getState()) {
-            case 'snapshot' :
-                return true;
-            case 'devel' :
-                if ($versioncomponents[0] . 'a' == '0a') {
-                    return true;
-                }
-                if ($versioncomponents[0] == 0) {
-                    $versioncomponents[0] = '0';
-                    $this->_addWarning('version',
-                        'version "' . $version . '" should be "' .
-                        implode('.' ,$versioncomponents) . '"');
-                } else {
-                    $this->_addWarning('version',
-                        'packages with devel stability must be < version 1.0.0');
-                }
-                return true;
-            break;
-            case 'alpha' :
-            case 'beta' :
-                // check for a package that extends a package,
-                // like Foo and Foo2
-                if ($this->_state == PEAR_VALIDATE_PACKAGING) {
-                    if (substr($versioncomponents[2], 1, 2) == 'rc') {
-                        $this->_addFailure('version', 'Release Candidate versions ' .
-                            'must have capital RC, not lower-case rc');
-                        return false;
-                    }
-                }
-                if (!$this->_packagexml->getExtends()) {
-                    if ($versioncomponents[0] == '1') {
-                        if ($versioncomponents[2]{0} == '0') {
-                            if ($versioncomponents[2] == '0') {
-                                // version 1.*.0000
-                                $this->_addWarning('version',
-                                    'version 1.' . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return true;
-                            } elseif (strlen($versioncomponents[2]) > 1) {
-                                // version 1.*.0RC1 or 1.*.0beta24 etc.
-                                return true;
-                            } else {
-                                // version 1.*.0
-                                $this->_addWarning('version',
-                                    'version 1.' . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return true;
-                            }
-                        } else {
-                            $this->_addWarning('version',
-                                'bugfix versions (1.3.x where x > 0) probably should ' .
-                                'not be alpha or beta');
-                            return true;
-                        }
-                    } elseif ($versioncomponents[0] != '0') {
-                        $this->_addWarning('version',
-                            'major versions greater than 1 are not allowed for packages ' .
-                            'without an <extends> tag or an identical postfix (foo2 v2.0.0)');
-                        return true;
-                    }
-                    if ($versioncomponents[0] . 'a' == '0a') {
-                        return true;
-                    }
-                    if ($versioncomponents[0] == 0) {
-                        $versioncomponents[0] = '0';
-                        $this->_addWarning('version',
-                            'version "' . $version . '" should be "' .
-                            implode('.' ,$versioncomponents) . '"');
-                    }
-                } else {
-                    $vlen = strlen($versioncomponents[0] . '');
-                    $majver = substr($name, strlen($name) - $vlen);
-                    while ($majver && !is_numeric($majver{0})) {
-                        $majver = substr($majver, 1);
-                    }
-                    if (($versioncomponents[0] != 0) && $majver != $versioncomponents[0]) {
-                        $this->_addWarning('version', 'first version number "' .
-                            $versioncomponents[0] . '" must match the postfix of ' .
-                            'package name "' . $name . '" (' .
-                            $majver . ')');
-                        return true;
-                    }
-                    if ($versioncomponents[0] == $majver) {
-                        if ($versioncomponents[2]{0} == '0') {
-                            if ($versioncomponents[2] == '0') {
-                                // version 2.*.0000
-                                $this->_addWarning('version',
-                                    "version $majver." . $versioncomponents[1] .
-                                        '.0 probably should not be alpha or beta');
-                                return false;
-                            } elseif (strlen($versioncomponents[2]) > 1) {
-                                // version 2.*.0RC1 or 2.*.0beta24 etc.
-                                return true;
-                            } else {
-                                // version 2.*.0
-                                $this->_addWarning('version',
-                                    "version $majver." . $versioncomponents[1] .
-                                        '.0 cannot be alpha or beta');
-                                return true;
-                            }
-                        } else {
-                            $this->_addWarning('version',
-                                "bugfix versions ($majver.x.y where y > 0) should " .
-                                'not be alpha or beta');
-                            return true;
-                        }
-                    } elseif ($versioncomponents[0] != '0') {
-                        $this->_addWarning('version',
-                            "only versions 0.x.y and $majver.x.y are allowed for alpha/beta releases");
-                        return true;
-                    }
-                    if ($versioncomponents[0] . 'a' == '0a') {
-                        return true;
-                    }
-                    if ($versioncomponents[0] == 0) {
-                        $versioncomponents[0] = '0';
-                        $this->_addWarning('version',
-                            'version "' . $version . '" should be "' .
-                            implode('.' ,$versioncomponents) . '"');
-                    }
-                }
-                return true;
-            break;
-            case 'stable' :
-                if ($versioncomponents[0] == '0') {
-                    $this->_addWarning('version', 'versions less than 1.0.0 cannot ' .
-                    'be stable');
-                    return true;
-                }
-                if (!is_numeric($versioncomponents[2])) {
-                    if (preg_match('/\d+(rc|a|alpha|b|beta)\d*/i',
-                          $versioncomponents[2])) {
-                        $this->_addWarning('version', 'version "' . $version . '" or any ' .
-                            'RC/beta/alpha version cannot be stable');
-                        return true;
-                    }
-                }
-                // check for a package that extends a package,
-                // like Foo and Foo2
-                if ($this->_packagexml->getExtends()) {
-                    $vlen = strlen($versioncomponents[0] . '');
-                    $majver = substr($name, strlen($name) - $vlen);
-                    while ($majver && !is_numeric($majver{0})) {
-                        $majver = substr($majver, 1);
-                    }
-                    if (($versioncomponents[0] != 0) && $majver != $versioncomponents[0]) {
-                        $this->_addWarning('version', 'first version number "' .
-                            $versioncomponents[0] . '" must match the postfix of ' .
-                            'package name "' . $name . '" (' .
-                            $majver . ')');
-                        return true;
-                    }
-                } elseif ($versioncomponents[0] > 1) {
-                    $this->_addWarning('version', 'major version x in x.y.z may not be greater than ' .
-                        '1 for any package that does not have an <extends> tag');
-                }
-                return true;
-            break;
-            default :
-                return false;
-            break;
-        }
-    }
-
-    /**
-     * @access protected
-     */
-    function validateMaintainers()
-    {
-        // maintainers can only be truly validated server-side for most channels
-        // but allow this customization for those who wish it
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDate()
-    {
-        if ($this->_state == PEAR_VALIDATE_NORMAL ||
-              $this->_state == PEAR_VALIDATE_PACKAGING) {
-
-            if (!preg_match('/(\d\d\d\d)\-(\d\d)\-(\d\d)/',
-                  $this->_packagexml->getDate(), $res) ||
-                  count($res) < 4
-                  || !checkdate($res[2], $res[3], $res[1])
-                ) {
-                $this->_addFailure('date', 'invalid release date "' .
-                    $this->_packagexml->getDate() . '"');
-                return false;
-            }
-
-            if ($this->_state == PEAR_VALIDATE_PACKAGING &&
-                  $this->_packagexml->getDate() != date('Y-m-d')) {
-                $this->_addWarning('date', 'Release Date "' .
-                    $this->_packagexml->getDate() . '" is not today');
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateTime()
-    {
-        if (!$this->_packagexml->getTime()) {
-            // default of no time value set
-            return true;
-        }
-
-        // packager automatically sets time, so only validate if pear validate is called
-        if ($this->_state = PEAR_VALIDATE_NORMAL) {
-            if (!preg_match('/\d\d:\d\d:\d\d/',
-                  $this->_packagexml->getTime())) {
-                $this->_addFailure('time', 'invalid release time "' .
-                    $this->_packagexml->getTime() . '"');
-                return false;
-            }
-
-            $result = preg_match('|\d{2}\:\d{2}\:\d{2}|', $this->_packagexml->getTime(), $matches);
-            if ($result === false || empty($matches)) {
-                $this->_addFailure('time', 'invalid release time "' .
-                    $this->_packagexml->getTime() . '"');
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateState()
-    {
-        // this is the closest to "final" php4 can get
-        if (!PEAR_Validate::validState($this->_packagexml->getState())) {
-            if (strtolower($this->_packagexml->getState() == 'rc')) {
-                $this->_addFailure('state', 'RC is not a state, it is a version ' .
-                    'postfix, use ' . $this->_packagexml->getVersion() . 'RC1, state beta');
-            }
-            $this->_addFailure('state', 'invalid release state "' .
-                $this->_packagexml->getState() . '", must be one of: ' .
-                implode(', ', PEAR_Validate::getValidStates()));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateStability()
-    {
-        $ret = true;
-        $packagestability = $this->_packagexml->getState();
-        $apistability = $this->_packagexml->getState('api');
-        if (!PEAR_Validate::validState($packagestability)) {
-            $this->_addFailure('state', 'invalid release stability "' .
-                $this->_packagexml->getState() . '", must be one of: ' .
-                implode(', ', PEAR_Validate::getValidStates()));
-            $ret = false;
-        }
-        $apistates = PEAR_Validate::getValidStates();
-        array_shift($apistates); // snapshot is not allowed
-        if (!in_array($apistability, $apistates)) {
-            $this->_addFailure('state', 'invalid API stability "' .
-                $this->_packagexml->getState('api') . '", must be one of: ' .
-                implode(', ', $apistates));
-            $ret = false;
-        }
-        return $ret;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateSummary()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDescription()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateLicense()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateNotes()
-    {
-        return true;
-    }
-
-    /**
-     * for package.xml 2.0 only - channels can't use package.xml 1.0
-     * @access protected
-     */
-    function validateDependencies()
-    {
-        return true;
-    }
-
-    /**
-     * for package.xml 1.0 only
-     * @access private
-     */
-    function _validateFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * for package.xml 2.0 only
-     * @access protected
-     */
-    function validateMainFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * for package.xml 2.0 only
-     * @access protected
-     */
-    function validateReleaseFilelist()
-    {
-        return true; // placeholder for now
-    }
-
-    /**
-     * @access protected
-     */
-    function validateChangelog()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateFilelist()
-    {
-        return true;
-    }
-
-    /**
-     * @access protected
-     */
-    function validateDeps()
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/Validator/PECL.php b/airtime_mvc/library/pear/PEAR/Validator/PECL.php
deleted file mode 100644
index f9757f978..000000000
--- a/airtime_mvc/library/pear/PEAR/Validator/PECL.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Channel Validator for the pecl.php.net channel
- *
- * PHP 4 and PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PECL.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a5
- */
-/**
- * This is the parent class for all validators
- */
-require_once 'PEAR/Validate.php';
-/**
- * Channel Validator for the pecl.php.net channel
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.1
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a5
- */
-class PEAR_Validator_PECL extends PEAR_Validate
-{
-    function validateVersion()
-    {
-        if ($this->_state == PEAR_VALIDATE_PACKAGING) {
-            $version = $this->_packagexml->getVersion();
-            $versioncomponents = explode('.', $version);
-            $last = array_pop($versioncomponents);
-            if (substr($last, 1, 2) == 'rc') {
-                $this->_addFailure('version', 'Release Candidate versions must have ' .
-                'upper-case RC, not lower-case rc');
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function validatePackageName()
-    {
-        $ret = parent::validatePackageName();
-        if ($this->_packagexml->getPackageType() == 'extsrc' ||
-              $this->_packagexml->getPackageType() == 'zendextsrc') {
-            if (strtolower($this->_packagexml->getPackage()) !=
-                  strtolower($this->_packagexml->getProvidesExtension())) {
-                $this->_addWarning('providesextension', 'package name "' .
-                    $this->_packagexml->getPackage() . '" is different from extension name "' .
-                    $this->_packagexml->getProvidesExtension() . '"');
-            }
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR/XMLParser.php b/airtime_mvc/library/pear/PEAR/XMLParser.php
deleted file mode 100644
index 0a3b88580..000000000
--- a/airtime_mvc/library/pear/PEAR/XMLParser.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * PEAR_XMLParser
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @author     Stephan Schmidt (original XML_Unserializer code)
- * @copyright  1997-2009 The Authors
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version    CVS: $Id: XMLParser.php 282970 2009-06-28 23:10:07Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-/**
- * Parser for any xml file
- * @category  pear
- * @package   PEAR
- * @author    Greg Beaver <cellog@php.net>
- * @author    Stephan Schmidt (original XML_Unserializer code)
- * @copyright 1997-2009 The Authors
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.9.1
- * @link      http://pear.php.net/package/PEAR
- * @since     Class available since Release 1.4.0a1
- */
-class PEAR_XMLParser
-{
-    /**
-     * unserilialized data
-     * @var string $_serializedData
-     */
-    var $_unserializedData = null;
-
-    /**
-     * name of the root tag
-     * @var string $_root
-     */
-    var $_root = null;
-
-    /**
-     * stack for all data that is found
-     * @var array    $_dataStack
-     */
-    var $_dataStack = array();
-
-    /**
-     * stack for all values that are generated
-     * @var array    $_valStack
-     */
-    var $_valStack = array();
-
-    /**
-     * current tag depth
-     * @var int    $_depth
-     */
-    var $_depth = 0;
-
-    /**
-     * The XML encoding to use
-     * @var string $encoding
-     */
-    var $encoding = 'ISO-8859-1';
-
-    /**
-     * @return array
-     */
-    function getData()
-    {
-        return $this->_unserializedData;
-    }
-
-    /**
-     * @param string xml content
-     * @return true|PEAR_Error
-     */
-    function parse($data)
-    {
-        if (!extension_loaded('xml')) {
-            include_once 'PEAR.php';
-            return PEAR::raiseError("XML Extension not found", 1);
-        }
-        $this->_dataStack =  $this->_valStack = array();
-        $this->_depth = 0;
-
-        if (
-            strpos($data, 'encoding="UTF-8"')
-            || strpos($data, 'encoding="utf-8"')
-            || strpos($data, "encoding='UTF-8'")
-            || strpos($data, "encoding='utf-8'")
-        ) {
-            $this->encoding = 'UTF-8';
-        }
-
-        if (version_compare(phpversion(), '5.0.0', 'lt') && $this->encoding == 'UTF-8') {
-            $data = utf8_decode($data);
-            $this->encoding = 'ISO-8859-1';
-        }
-
-        $xp = xml_parser_create($this->encoding);
-        xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_object($xp, $this);
-        xml_set_element_handler($xp, 'startHandler', 'endHandler');
-        xml_set_character_data_handler($xp, 'cdataHandler');
-        if (!xml_parse($xp, $data)) {
-            $msg = xml_error_string(xml_get_error_code($xp));
-            $line = xml_get_current_line_number($xp);
-            xml_parser_free($xp);
-            include_once 'PEAR.php';
-            return PEAR::raiseError("XML Error: '$msg' on line '$line'", 2);
-        }
-        xml_parser_free($xp);
-        return true;
-    }
-
-    /**
-     * Start element handler for XML parser
-     *
-     * @access private
-     * @param  object $parser  XML parser object
-     * @param  string $element XML element
-     * @param  array  $attribs attributes of XML tag
-     * @return void
-     */
-    function startHandler($parser, $element, $attribs)
-    {
-        $this->_depth++;
-        $this->_dataStack[$this->_depth] = null;
-
-        $val = array(
-            'name'         => $element,
-            'value'        => null,
-            'type'         => 'string',
-            'childrenKeys' => array(),
-            'aggregKeys'   => array()
-       );
-
-        if (count($attribs) > 0) {
-            $val['children'] = array();
-            $val['type'] = 'array';
-            $val['children']['attribs'] = $attribs;
-        }
-
-        array_push($this->_valStack, $val);
-    }
-
-    /**
-     * post-process data
-     *
-     * @param string $data
-     * @param string $element element name
-     */
-    function postProcess($data, $element)
-    {
-        return trim($data);
-    }
-
-    /**
-     * End element handler for XML parser
-     *
-     * @access private
-     * @param  object XML parser object
-     * @param  string
-     * @return void
-     */
-    function endHandler($parser, $element)
-    {
-        $value = array_pop($this->_valStack);
-        $data  = $this->postProcess($this->_dataStack[$this->_depth], $element);
-
-        // adjust type of the value
-        switch (strtolower($value['type'])) {
-            // unserialize an array
-            case 'array':
-                if ($data !== '') {
-                    $value['children']['_content'] = $data;
-                }
-
-                $value['value'] = isset($value['children']) ? $value['children'] : array();
-                break;
-
-            /*
-             * unserialize a null value
-             */
-            case 'null':
-                $data = null;
-                break;
-
-            /*
-             * unserialize any scalar value
-             */
-            default:
-                settype($data, $value['type']);
-                $value['value'] = $data;
-                break;
-        }
-
-        $parent = array_pop($this->_valStack);
-        if ($parent === null) {
-            $this->_unserializedData = &$value['value'];
-            $this->_root = &$value['name'];
-            return true;
-        }
-
-        // parent has to be an array
-        if (!isset($parent['children']) || !is_array($parent['children'])) {
-            $parent['children'] = array();
-            if ($parent['type'] != 'array') {
-                $parent['type'] = 'array';
-            }
-        }
-
-        if (!empty($value['name'])) {
-            // there already has been a tag with this name
-            if (in_array($value['name'], $parent['childrenKeys'])) {
-                // no aggregate has been created for this tag
-                if (!in_array($value['name'], $parent['aggregKeys'])) {
-                    if (isset($parent['children'][$value['name']])) {
-                        $parent['children'][$value['name']] = array($parent['children'][$value['name']]);
-                    } else {
-                        $parent['children'][$value['name']] = array();
-                    }
-                    array_push($parent['aggregKeys'], $value['name']);
-                }
-                array_push($parent['children'][$value['name']], $value['value']);
-            } else {
-                $parent['children'][$value['name']] = &$value['value'];
-                array_push($parent['childrenKeys'], $value['name']);
-            }
-        } else {
-            array_push($parent['children'],$value['value']);
-        }
-        array_push($this->_valStack, $parent);
-
-        $this->_depth--;
-    }
-
-    /**
-     * Handler for character data
-     *
-     * @access private
-     * @param  object XML parser object
-     * @param  string CDATA
-     * @return void
-     */
-    function cdataHandler($parser, $cdata)
-    {
-        $this->_dataStack[$this->_depth] .= $cdata;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PEAR5.php b/airtime_mvc/library/pear/PEAR5.php
deleted file mode 100644
index 428606780..000000000
--- a/airtime_mvc/library/pear/PEAR5.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/PHPUnit.php b/airtime_mvc/library/pear/PHPUnit.php
deleted file mode 100644
index 579831abb..000000000
--- a/airtime_mvc/library/pear/PHPUnit.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: PHPUnit.php,v 1.17 2005/11/10 09:47:11 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/TestCase.php';
-require_once 'PHPUnit/TestResult.php';
-require_once 'PHPUnit/TestSuite.php';
-
-/**
- * PHPUnit runs a TestSuite and returns a TestResult object.
- *
- * Here is an example:
- *
- * <code>
- * <?php
- * require_once 'PHPUnit.php';
- *
- * class MathTest extends PHPUnit_TestCase {
- *     var $fValue1;
- *     var $fValue2;
- *
- *     function MathTest($name) {
- *       $this->PHPUnit_TestCase($name);
- *     }
- *
- *     function setUp() {
- *       $this->fValue1 = 2;
- *       $this->fValue2 = 3;
- *     }
- *
- *     function testAdd() {
- *       $this->assertTrue($this->fValue1 + $this->fValue2 == 5);
- *     }
- * }
- *
- * $suite = new PHPUnit_TestSuite();
- * $suite->addTest(new MathTest('testAdd'));
- *
- * $result = PHPUnit::run($suite);
- * print $result->toHTML();
- * ?>
- * </code>
- *
- * Alternatively, you can pass a class name to the PHPUnit_TestSuite()
- * constructor and let it automatically add all methods of that class
- * that start with 'test' to the suite:
- *
- * <code>
- * <?php
- * $suite  = new PHPUnit_TestSuite('MathTest');
- * $result = PHPUnit::run($suite);
- * print $result->toHTML();
- * ?>
- * </code>
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit {
-    /**
-     * Runs a test(suite).
-     *
-     * @param  mixed
-     * @return PHPUnit_TestResult
-     * @access public
-     */
-    function &run(&$suite) {
-        $result = new PHPUnit_TestResult();
-        $suite->run($result);
-
-        return $result;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/Assert.php b/airtime_mvc/library/pear/PHPUnit/Assert.php
deleted file mode 100644
index 6895e4d35..000000000
--- a/airtime_mvc/library/pear/PHPUnit/Assert.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: Assert.php,v 1.29 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-/**
- * A set of assert methods.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_Assert {
-    /**
-     * @var    boolean
-     * @access private
-     */
-    var $_looselyTyped = FALSE;
-
-    /**
-     * Asserts that a haystack contains a needle.
-     *
-     * @param  mixed
-     * @param  mixed
-     * @param  string
-     * @access public
-     * @since  Method available since Release 1.1.0
-     */
-    function assertContains($needle, $haystack, $message = '') {
-        if (is_string($needle) && is_string($haystack)) {
-            $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message);
-        }
-
-        else if (is_array($haystack) && !is_object($needle)) {
-            $this->assertTrue(in_array($needle, $haystack), $message);
-        }
-
-        else {
-            $this->fail('Unsupported parameter passed to assertContains().');
-        }
-    }
-
-    /**
-     * Asserts that a haystack does not contain a needle.
-     *
-     * @param  mixed
-     * @param  mixed
-     * @param  string
-     * @access public
-     * @since  Method available since Release 1.1.0
-     */
-    function assertNotContains($needle, $haystack, $message = '') {
-        if (is_string($needle) && is_string($haystack)) {
-            $this->assertFalse(strpos($haystack, $needle) !== FALSE, $message);
-        }
-
-        else if (is_array($haystack) && !is_object($needle)) {
-            $this->assertFalse(in_array($needle, $haystack), $message);
-        }
-
-        else {
-            $this->fail('Unsupported parameter passed to assertNotContains().');
-        }
-    }
-
-    /**
-     * Asserts that two variables are equal.
-     *
-     * @param  mixed
-     * @param  mixed
-     * @param  string
-     * @param  mixed
-     * @access public
-     */
-    function assertEquals($expected, $actual, $message = '', $delta = 0) {
-        if ((is_array($actual)  && is_array($expected)) ||
-            (is_object($actual) && is_object($expected))) {
-            if (is_array($actual) && is_array($expected)) {
-                ksort($actual);
-                ksort($expected);
-            }
-
-            if ($this->_looselyTyped) {
-                $actual   = $this->_convertToString($actual);
-                $expected = $this->_convertToString($expected);
-            }
-
-            $actual   = serialize($actual);
-            $expected = serialize($expected);
-
-            $message = sprintf(
-              '%sexpected %s, actual %s',
-
-              !empty($message) ? $message . ' ' : '',
-              $expected,
-              $actual
-            );
-
-            if ($actual !== $expected) {
-                return $this->fail($message);
-            }
-        }
-
-        elseif (is_numeric($actual) && is_numeric($expected)) {
-            $message = sprintf(
-              '%sexpected %s%s, actual %s',
-
-              !empty($message) ? $message . ' ' : '',
-              $expected,
-              ($delta != 0) ? ('+/- ' . $delta) : '',
-              $actual
-            );
-
-            if (!($actual >= ($expected - $delta) && $actual <= ($expected + $delta))) {
-                return $this->fail($message);
-            }
-        }
-
-        else {
-            $message = sprintf(
-              '%sexpected %s, actual %s',
-
-              !empty($message) ? $message . ' ' : '',
-              $expected,
-              $actual
-            );
-
-            if ($actual !== $expected) {
-                return $this->fail($message);
-            }
-        }
-    }
-
-    /**
-     * Asserts that two variables reference the same object.
-     * This requires the Zend Engine 2 to work.
-     *
-     * @param  object
-     * @param  object
-     * @param  string
-     * @access public
-     * @deprecated
-     */
-    function assertSame($expected, $actual, $message = '') {
-        if (!version_compare(phpversion(), '5.0.0', '>=')) {
-            $this->fail('assertSame() only works with PHP >= 5.0.0.');
-        }
-
-        if ((is_object($expected) || is_null($expected)) &&
-            (is_object($actual)   || is_null($actual))) {
-            $message = sprintf(
-              '%sexpected two variables to reference the same object',
-
-              !empty($message) ? $message . ' ' : ''
-            );
-
-            if ($expected !== $actual) {
-                return $this->fail($message);
-            }
-        } else {
-            $this->fail('Unsupported parameter passed to assertSame().');
-        }
-    }
-
-    /**
-     * Asserts that two variables do not reference the same object.
-     * This requires the Zend Engine 2 to work.
-     *
-     * @param  object
-     * @param  object
-     * @param  string
-     * @access public
-     * @deprecated
-     */
-    function assertNotSame($expected, $actual, $message = '') {
-        if (!version_compare(phpversion(), '5.0.0', '>=')) {
-            $this->fail('assertNotSame() only works with PHP >= 5.0.0.');
-        }
-
-        if ((is_object($expected) || is_null($expected)) &&
-            (is_object($actual)   || is_null($actual))) {
-            $message = sprintf(
-              '%sexpected two variables to reference different objects',
-
-              !empty($message) ? $message . ' ' : ''
-            );
-
-            if ($expected === $actual) {
-                return $this->fail($message);
-            }
-        } else {
-            $this->fail('Unsupported parameter passed to assertNotSame().');
-        }
-    }
-
-    /**
-     * Asserts that a variable is not NULL.
-     *
-     * @param  mixed
-     * @param  string
-     * @access public
-     */
-    function assertNotNull($actual, $message = '') {
-        $message = sprintf(
-          '%sexpected NOT NULL, actual NULL',
-
-          !empty($message) ? $message . ' ' : ''
-        );
-
-        if (is_null($actual)) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a variable is NULL.
-     *
-     * @param  mixed
-     * @param  string
-     * @access public
-     */
-    function assertNull($actual, $message = '') {
-        $message = sprintf(
-          '%sexpected NULL, actual NOT NULL',
-
-          !empty($message) ? $message . ' ' : ''
-        );
-
-        if (!is_null($actual)) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a condition is true.
-     *
-     * @param  boolean
-     * @param  string
-     * @access public
-     */
-    function assertTrue($condition, $message = '') {
-        $message = sprintf(
-          '%sexpected TRUE, actual FALSE',
-
-          !empty($message) ? $message . ' ' : ''
-        );
-
-        if (!$condition) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a condition is false.
-     *
-     * @param  boolean
-     * @param  string
-     * @access public
-     */
-    function assertFalse($condition, $message = '') {
-        $message = sprintf(
-          '%sexpected FALSE, actual TRUE',
-
-          !empty($message) ? $message . ' ' : ''
-        );
-
-        if ($condition) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a string matches a given regular expression.
-     *
-     * @param  string
-     * @param  string
-     * @param  string
-     * @access public
-     */
-    function assertRegExp($pattern, $string, $message = '') {
-        $message = sprintf(
-          '%s"%s" does not match pattern "%s"',
-
-          !empty($message) ? $message . ' ' : '',
-          $string,
-          $pattern
-        );
-
-        if (!preg_match($pattern, $string)) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a string does not match a given regular expression.
-     *
-     * @param  string
-     * @param  string
-     * @param  string
-     * @access public
-     * @since  Method available since Release 1.1.0
-     */
-    function assertNotRegExp($pattern, $string, $message = '') {
-        $message = sprintf(
-          '%s"%s" matches pattern "%s"',
-
-          !empty($message) ? $message . ' ' : '',
-          $string,
-          $pattern
-        );
-
-        if (preg_match($pattern, $string)) {
-            return $this->fail($message);
-        }
-    }
-
-    /**
-     * Asserts that a variable is of a given type.
-     *
-     * @param  string          $expected
-     * @param  mixed           $actual
-     * @param  optional string $message
-     * @access public
-     */
-    function assertType($expected, $actual, $message = '') {
-        return $this->assertEquals(
-          $expected,
-          gettype($actual),
-          $message
-        );
-    }
-
-    /**
-     * Converts a value to a string.
-     *
-     * @param  mixed   $value
-     * @access private
-     */
-    function _convertToString($value) {
-        foreach ($value as $k => $v) {
-            if (is_array($v)) {
-                $value[$k] = $this->_convertToString($value[$k]);
-            } else {
-                settype($value[$k], 'string');
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param  boolean $looselyTyped
-     * @access public
-     */
-    function setLooselyTyped($looselyTyped) {
-        if (is_bool($looselyTyped)) {
-            $this->_looselyTyped = $looselyTyped;
-        }
-    }
-
-    /**
-     * Fails a test with the given message.
-     *
-     * @param  string
-     * @access protected
-     * @abstract
-     */
-    function fail($message = '') { /* abstract */ }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/GUI/Gtk.php b/airtime_mvc/library/pear/PHPUnit/GUI/Gtk.php
deleted file mode 100644
index 3649dc2db..000000000
--- a/airtime_mvc/library/pear/PHPUnit/GUI/Gtk.php
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Scott Mattocks <scott@crisscott.com>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: Gtk.php,v 1.6 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.2.0
- */
-
-if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
-}
-
-/**
- * GTK GUI interface for PHPUnit.
- *
- * This class is a PHP port of junit.awtui.testrunner. Documentation
- * for junit.awtui.testrunner can be found at
- * http://junit.sourceforge.net
- *
- * Due to the limitations of PHP4 and PHP-Gtk, this class can not
- * duplicate all of the functionality of the JUnit GUI. Some of the
- * things this class cannot do include:
- * - Reloading the class for each run
- * - Stopping the test in progress
- *
- * To use simply intantiate the class and call main()
- * $gtk =& new PHPUnit_GUI_Gtk;
- * $gtk->main();
- *
- * Once the window has finished loading, you can enter the name of
- * a class that has been loaded (include/require some where in your
- * code, or you can pass the name of the file containing the class.
- *
- * You can also load classes using the SetupDecorator class.
- * require_once 'PHPUnit/GUI/SetupDecorator.php';
- * require_once 'PHPUnit/GUI/Gtk.php';
- * $gui = new PHPUnit_GUI_SetupDecorator(new PHPUnit_GUI_Gtk());
- * $gui->getSuitesFromDir('/path/to/test','.*\.php$',array('index.php','sql.php'));
- * $gui->show();
- *
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Scott Mattocks <scott@crisscott.com>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.2.0
- * @todo       Allow file drop. (Gtk_FileDrop)
- */
-class PHPUnit_GUI_Gtk {
-
-    /**
-     * The main gtk window
-     * @var object
-     */
-    var $gui;
-    /**
-     * The text entry that contains the name of the
-     * file that holds the test(s)/suite(s).
-     * @var object
-     */
-    var $suiteField;
-    /**
-     * The label that shows the number of tests that
-     * were run.
-     * @var object
-     */
-    var $numberOfRuns;
-    /**
-     * The label that shows the number of errors that
-     * were encountered.
-     * @var object
-     */
-    var $numberOfErrors;
-    /**
-     * The label that shows the number of failures
-     * that were encountered.
-     * @var object
-     */
-    var $numberOfFailures;
-    /**
-     * The label for reporting user messages.
-     * @var object
-     */
-    var $statusLine;
-    /**
-     * The text area for reporting messages from successful
-     * test runs. (not necessarily successful tests)
-     * @var object
-     */
-    var $reportArea;
-    /**
-     * The text area for reporting errors encountered when
-     * running tests.
-     * @var object
-     */
-    var $dumpArea;
-    /**
-     * The progress bar indicator. Shows the percentage of
-     * passed tests.
-     * @var object
-     */
-    var $progress;
-    /**
-     * A checkbox for the user to indicate whether or not they
-     * would like to see results from all tests or just failures.
-     * @object
-     */
-    var $showPassed;
-
-    /**
-     * Constructor.
-     *
-     * The constructor checks for the gtk extension and loads it
-     * if needed. Then it creates the GUI. The GUI is not shown
-     * nor is the main gtk loop started until main() is called.
-     *
-     * @access public
-     * @param  none
-     * @return void
-     */
-    function PHPUnit_GUI_Gtk()
-    {
-        // Check for php-gtk extension.
-        if (!extension_loaded('gtk')) {
-            dl( 'php_gtk.' . PHP_SHLIB_SUFFIX);
-        }
-
-        // Create the interface but don't start the loop
-        $this->_createUI();
-    }
-    /**
-     * Start the main gtk loop.
-     *
-     * main() first sets the default state of the showPassed
-     * check box. Next all widgets that are part of the GUI
-     * are shown. Finally the main gtk loop is started.
-     *
-     * @access public
-     * @param  boolean $showPassed
-     * @return void
-     */
-    function main($showPassed = true)
-    {
-        $this->showPassed->set_active($showPassed);
-        $this->gui->show_all();
-
-        gtk::main();
-    }
-    /**
-     * Create the user interface.
-     *
-     * The user interface is pretty simple. It consists of a
-     * menu, text entry, run button, some labels, a progress
-     * indicator, and a couple of areas for notification of
-     * any messages.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createUI()
-    {
-        // Create a window.
-        $window =& new GtkWindow;
-        $window->set_title('PHPUnit Gtk');
-        $window->set_usize(400, -1);
-
-        // Create the main box.
-        $mainBox =& new GtkVBox;
-        $window->add($mainBox);
-
-        // Start with the menu.
-        $mainBox->pack_start($this->_createMenu());
-
-        // Then add the suite field entry.
-        $mainBox->pack_start($this->_createSuiteEntry());
-
-        // Then add the report labels.
-        $mainBox->pack_start($this->_createReportLabels());
-
-        // Next add the progress bar.
-        $mainBox->pack_start($this->_createProgressBar());
-
-        // Then add the report area and the dump area.
-        $mainBox->pack_start($this->_createReportAreas());
-
-        // Finish off with the status line.
-        $mainBox->pack_start($this->_createStatusLine());
-
-        // Connect the destroy signal.
-        $window->connect_object('destroy', array('gtk', 'main_quit'));
-
-        // Assign the member.
-        $this->gui =& $window;
-    }
-    /**
-     * Create the menu.
-     *
-     * The menu is very simple. It an exit menu item, which exits
-     * the application, and an about menu item, which shows some
-     * basic information about the application itself.
-     *
-     * @access private
-     * @param  none
-     * @return &object The GtkMenuBar
-     */
-    function &_createMenu()
-    {
-        // Create the menu bar.
-        $menuBar =& new GtkMenuBar;
-
-        // Create the main (only) menu item.
-        $phpHeader =& new GtkMenuItem('PHPUnit');
-
-        // Add the menu item to the menu bar.
-        $menuBar->append($phpHeader);
-
-        // Create the PHPUnit menu.
-        $phpMenu =& new GtkMenu;
-
-        // Add the menu items
-        $about =& new GtkMenuItem('About...');
-        $about->connect('activate', array(&$this, 'about'));
-        $phpMenu->append($about);
-
-        $exit =& new GtkMenuItem('Exit');
-        $exit->connect_object('activate', array('gtk', 'main_quit'));
-        $phpMenu->append($exit);
-
-        // Complete the menu.
-        $phpHeader->set_submenu($phpMenu);
-
-        return $menuBar;
-    }
-    /**
-     * Create the suite entry and related widgets.
-     *
-     * The suite entry has some supporting components such as a
-     * label, the show passed check box and the run button. All
-     * of these items are packed into two nested boxes.
-     *
-     * @access private
-     * @param  none
-     * @return &object A box that contains all of the suite entry pieces.
-     */
-    function &_createSuiteEntry()
-    {
-        // Create the outermost box.
-        $outerBox         =& new GtkVBox;
-
-        // Create the suite label, box, and field.
-        $suiteLabel       =& new GtkLabel('Test class name:');
-        $suiteBox         =& new GtkHBox;
-        $this->suiteField =& new GtkEntry;
-        $this->suiteField->set_text($suiteName != NULL ? $suiteName : '');
-
-        // Create the button the user will use to start the test.
-        $runButton =& new GtkButton('Run');
-        $runButton->connect_object('clicked', array(&$this, 'run'));
-
-        // Create the check box that lets the user show only failures.
-        $this->showPassed =& new GtkCheckButton('Show passed tests');
-
-        // Add the components to their respective boxes.
-        $suiteLabel->set_alignment(0, 0);
-        $outerBox->pack_start($suiteLabel);
-        $outerBox->pack_start($suiteBox);
-        $outerBox->pack_start($this->showPassed);
-
-        $suiteBox->pack_start($this->suiteField);
-        $suiteBox->pack_start($runButton);
-
-        return $outerBox;
-    }
-
-    /**
-     * Create the labels that tell the user what has happened.
-     *
-     * There are three labels, one each for total runs, errors and
-     * failures. There is also one label for each of these that
-     * describes what the label is. It could be done with one label
-     * instead of two but that would make updates much harder.
-     *
-     * @access private
-     * @param  none
-     * @return &object A box containing the labels.
-     */
-    function &_createReportLabels()
-    {
-        // Create a box to hold everything.
-        $labelBox         =& new GtkHBox;
-
-        // Create the non-updated labels.
-        $numberOfRuns     =& new GtkLabel('Runs:');
-        $numberOfErrors   =& new GtkLabel('Errors:');
-        $numberOfFailures =& new GtkLabel('Failures:');
-
-        // Create the labels that will be updated.
-        // These are asssigned to members to make it easier to
-        // set their values later.
-        $this->numberOfRuns     =& new GtkLabel(0);
-        $this->numberOfErrors   =& new GtkLabel(0);
-        $this->numberOfFailures =& new GtkLabel(0);
-
-        // Pack everything in.
-        $labelBox->pack_start($numberOfRuns);
-        $labelBox->pack_start($this->numberOfRuns);
-        $labelBox->pack_start($numberOfErrors);
-        $labelBox->pack_start($this->numberOfErrors);
-        $labelBox->pack_start($numberOfFailures);
-        $labelBox->pack_start($this->numberOfFailures);
-
-        return $labelBox;
-    }
-
-    /**
-     * Create the success/failure indicator.
-     *
-     * A GtkProgressBar is used to visually indicate how many
-     * tests were successful compared to how many were not. The
-     * progress bar shows the percentage of success and will
-     * change from green to red if there are any failures.
-     *
-     * @access private
-     * @param  none
-     * @return &object The progress bar
-     */
-    function &_createProgressBar()
-    {
-        // Create the progress bar.
-        $this->progress =& new GtkProgressBar(new GtkAdjustment(0, 0, 1, .1, 1, 0));
-
-        // Set the progress bar to print the percentage.
-        $this->progress->set_show_text(true);
-
-        return $this->progress;
-    }
-
-    /**
-     * Create the report text areas.
-     *
-     * The report area consists of one text area for failures, one
-     * text area for errors and one label for identification purposes.
-     * All three widgets are packed into a box.
-     *
-     * @access private
-     * @param  none
-     * @return &object The box containing the report areas.
-     */
-    function &_createReportAreas()
-    {
-        // Create the containing box.
-        $reportBox =& new GtkVBox;
-
-        // Create the identification label
-        $reportLabel =& new GtkLabel('Errors and Failures:');
-        $reportLabel->set_alignment(0, 0);
-
-        // Create the scrolled windows for the text areas.
-        $reportScroll =& new GtkScrolledWindow;
-        $dumpScroll   =& new GtkScrolledWindow;
-
-        // Make the scroll areas big enough.
-        $reportScroll->set_usize(-1, 150);
-        $dumpScroll->set_usize(-1, 150);
-
-        // Only show the vertical scroll bar when needed.
-        // Never show the horizontal scroll bar.
-        $reportScroll->set_policy(GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-        $dumpScroll->set_policy(GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-        // Create the text areas.
-        $this->reportArea =& new GtkText;
-        $this->dumpArea =& new GtkText;
-
-        // Don't let words get broken.
-        $this->reportArea->set_word_wrap(true);
-        $this->dumpArea->set_word_wrap(true);
-
-        // Pack everything in.
-        $reportBox->pack_start($reportLabel);
-        $reportScroll->add($this->reportArea);
-        $reportBox->pack_start($reportScroll);
-        $dumpScroll->add($this->dumpArea);
-        $reportBox->pack_start($dumpScroll);
-
-        return $reportBox;
-    }
-
-    /**
-     * Create a status label.
-     *
-     * A status line at the bottom of the application is used
-     * to notify the user of non-test related messages such as
-     * failures loading a test suite.
-     *
-     * @access private
-     * @param  none
-     * @return &object The status label.
-     */
-    function &_createStatusLine()
-    {
-        // Create the status label.
-        $this->statusLine =& new GtkLabel('');
-        $this->statusLine->set_alignment(0, 0);
-
-        return $this->statusLine;
-    }
-
-    /**
-     * Show a popup with information about the application.
-     *
-     * The popup should show information about the version,
-     * the author, the license, where to get the latest
-     * version and a short description.
-     *
-     * @access public
-     * @param  none
-     * @return void
-     */
-    function about()
-    {
-        // Create the new window.
-        $about =& new GtkWindow;
-        $about->set_title('About PHPUnit GUI Gtk');
-        $about->set_usize(250, -1);
-
-        // Put two vboxes in the hbox.
-        $vBox =& new GtkVBox;
-        $about->add($vBox);
-
-        // Create the labels.
-        $version     =& new GtkLabel(" Version: 1.0");
-        $license     =& new GtkLabel(" License: PHP License v3.0");
-        $where       =& new GtkLabel(" Download from: http://pear.php.net/PHPUnit/");
-        $unitAuth    =& new GtkLabel(" PHPUnit Author: Sebastian Bergman");
-        $gtkAuth     =& new GtkLabel(" Gtk GUI Author: Scott Mattocks");
-
-        // Align everything to the left
-        $where->set_alignment(0, .5);
-        $version->set_alignment(0, .5);
-        $license->set_alignment(0, .5);
-        $gtkAuth->set_alignment(0, .5);
-        $unitAuth->set_alignment(0, .5);
-
-        // Pack everything into the vBox;
-        $vBox->pack_start($version);
-        $vBox->pack_start($license);
-        $vBox->pack_start($where);
-        $vBox->pack_start($unitAuth);
-        $vBox->pack_start($gtkAuth);
-
-        // Connect the destroy signal.
-        $about->connect('destroy', array('gtk', 'true'));
-
-        // Show the goods.
-        $about->show_all();
-    }
-
-    /**
-     * Load the test suite.
-     *
-     * This method tries to load test suite based on the user
-     * info. If the user passes the name of a tests suite, it
-     * is instantiated and a new object is returned. If the
-     * user passes a file that contains a test suite, the class
-     * is instantiated and a new object is returned. If the user
-     * passes a file that contains a test case, the test case is
-     * passed to a new test suite and the new suite object is
-     * returned.
-     *
-     * @access public
-     * @param  string  The file that contains a test case/suite or the classname.
-     * @return &object The new test suite.
-     */
-    function &loadTest(&$file)
-    {
-        // Check to see if a class name was given.
-        if (is_a($file, 'PHPUnit_TestSuite')) {
-            return $file;
-        } elseif (class_exists($file)) {
-            require_once 'PHPUnit/TestSuite.php';
-            return new PHPUnit_TestSuite($file);
-        }
-
-        // Check that the file exists.
-        if (!@is_readable($file)) {
-            $this->_showStatus('Cannot find file: ' . $file);
-            return false;
-        }
-
-        $this->_showStatus('Loading test suite...');
-
-        // Instantiate the class.
-        // If the path is /path/to/test/TestClass.php
-        // the class name should be test_TestClass
-        require_once $file;
-        $className = str_replace(DIRECTORY_SEPARATOR, '_', $file);
-        $className = substr($className, 0, strpos($className, '.'));
-
-        require_once 'PHPUnit/TestSuite.php';
-        return new PHPUnit_TestSuite($className);
-    }
-
-    /**
-     * Run the test suite.
-     *
-     * This method runs the test suite and updates the messages
-     * for the user. When finished it changes the status line
-     * to 'Test Complete'
-     *
-     * @access public
-     * @param  none
-     * @return void
-     */
-    function runTest()
-    {
-        // Notify the user that the test is running.
-        $this->_showStatus('Running Test...');
-
-        // Run the test.
-        $result = PHPUnit::run($this->suite);
-
-        // Update the labels.
-        $this->_setLabelValue($this->numberOfRuns,     $result->runCount());
-        $this->_setLabelValue($this->numberOfErrors,   $result->errorCount());
-        $this->_setLabelValue($this->numberOfFailures, $result->failureCount());
-
-        // Update the progress bar.
-        $this->_updateProgress($result->runCount(),
-                               $result->errorCount(),
-                               $result->failureCount()
-                               );
-
-        // Show the errors.
-        $this->_showFailures($result->errors(), $this->dumpArea);
-
-        // Show the messages from the tests.
-        if ($this->showPassed->get_active()) {
-            // Show failures and success.
-            $this->_showAll($result, $this->reportArea);
-        } else {
-            // Show only failures.
-            $this->_showFailures($result->failures(), $this->reportArea);
-        }
-
-        // Update the status message.
-        $this->_showStatus('Test complete');
-    }
-
-    /**
-     * Set the text of a label.
-     *
-     * Change the text of a given label.
-     *
-     * @access private
-     * @param  widget  &$label The label whose value is to be changed.
-     * @param  string  $value  The new text of the label.
-     * @return void
-     */
-    function _setLabelValue(&$label, $value)
-    {
-        $label->set_text($value);
-    }
-
-    /**
-     * The main work of the application.
-     *
-     * Load the test suite and then execute the tests.
-     *
-     * @access public
-     * @param  none
-     * @return void
-     */
-    function run()
-    {
-        // Load the test suite.
-        $this->suite =& $this->loadTest($this->suiteField->get_text());
-
-        // Check to make sure the suite was loaded properly.
-        if (!is_object($this->suite)) {
-            // Raise an error.
-            $this->_showStatus('Could not load test suite.');
-            return false;
-        }
-
-        // Run the tests.
-        $this->runTest();
-    }
-
-    /**
-     * Update the status message.
-     *
-     * @access private
-     * @param  string  $status The new message.
-     * @return void
-     */
-    function _showStatus($status)
-    {
-        $this->statusLine->set_text($status);
-    }
-
-    /**
-     * Alias for main()
-     *
-     * @see main
-     */
-    function show($showPassed = true)
-    {
-        $this->main($showPassed);
-    }
-
-    /**
-     * Add a suite to the tests.
-     *
-     * This method is require by SetupDecorator. It adds a
-     * suite to the the current set of suites.
-     *
-     * @access public
-     * @param  object $testSuite The suite to add.
-     * @return void
-     */
-    function addSuites($testSuite)
-    {
-        if (!is_array($testSuite)) {
-            settype($testSuite, 'array');
-        }
-
-        foreach ($testSuite as $suite) {
-
-            if (is_a($this->suite, 'PHPUnit_TestSuite')) {
-                $this->suite->addTestSuite($suite->getName());
-            } else {
-                $this->suite =& $this->loadTest($suite);
-            }
-
-            // Set the suite field.
-            $text = $this->suiteField->get_text();
-            if (empty($text)) {
-                $this->suiteField->set_text($this->suite->getName());
-            }
-        }
-    }
-
-    /**
-     * Show all test messages.
-     *
-     * @access private
-     * @param  object  The TestResult from the test suite.
-     * @return void
-     */
-    function _showAll(&$result)
-    {
-        // Clear the area first.
-        $this->reportArea->delete_text(0, -1);
-        $this->reportArea->insert_text($result->toString(), 0);
-    }
-
-    /**
-     * Show failure/error messages in the given text area.
-     *
-     * @access private
-     * @param  object  &$results The results of the test.
-     * @param  widget  &$area    The area to show the results in.
-     */
-    function _showFailures(&$results, &$area)
-    {
-        $area->delete_text(0, -1);
-        foreach (array_reverse($results, true) as $result) {
-            $area->insert_text($result->toString(), 0);
-        }
-    }
-
-    /**
-     * Update the progress indicator.
-     *
-     * @access private
-     * @param  integer $runs
-     * @param  integer $errors
-     * @param  integer $failures
-     * @return void
-     */
-    function _updateProgress($runs, $errors, $failures)
-    {
-        $percentage = 1 - (($errors + $failures) / $runs);
-        $this->progress->set_percentage($percentage);
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/GUI/HTML.php b/airtime_mvc/library/pear/PHPUnit/GUI/HTML.php
deleted file mode 100644
index f2816ef4c..000000000
--- a/airtime_mvc/library/pear/PHPUnit/GUI/HTML.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Wolfram Kriesing <wolfram@kriesing.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: HTML.php,v 1.19 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-/**
- * HTML GUI.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Wolfram Kriesing <wolfram@kriesing.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_GUI_HTML
-{
-    var $_suites = array();
-
-    /**
-    * the current implementation of PHPUnit is designed
-    * this way that adding a suite to another suite only
-    * grabs all the tests and adds them to the suite, so you
-    * have no chance to find out which test goes with which suite
-    * therefore you can simply pass an array of suites to this constructor here
-    *
-    * @param  array   The suites to be tested. If not given, then you might
-    *                 be using the SetupDecorator, which detects them automatically
-    *                 when calling getSuitesFromDir()
-    */
-    function PHPUnit_GUI_HTML($suites = array())
-    {
-        if (!is_array($suites)) {
-            $this->_suites = array($suites);
-        } else {
-            $this->_suites = $suites;
-        }
-    }
-
-    /**
-    * Add suites to the GUI
-    *
-    * @param  object  this should be an instance of PHPUnit_TestSuite
-    */
-    function addSuites($suites)
-    {
-        $this->_suites = array_merge($this->_suites,$suites);
-    }
-
-    /**
-    * this prints the HTML code straight out
-    *
-    */
-    function show()
-    {
-        $request    = $_REQUEST;
-        $showPassed = FALSE;
-        $submitted  = @$request['submitted'];
-
-        if ($submitted) {
-            $showPassed = @$request['showOK'] ? TRUE : FALSE;
-        }
-
-        $suiteResults = array();
-
-        foreach ($this->_suites as $aSuite) {
-            $aSuiteResult = array();
-
-            // remove the first directory's name from the test-suite name, since it
-            // mostly is something like 'tests' or alike
-            $removablePrefix = explode('_',$aSuite->getName());
-            $aSuiteResult['name'] = str_replace($removablePrefix[0].'_', '', $aSuite->getName());
-
-            if ($submitted && isset($request[$aSuiteResult['name']])) {
-                $result = PHPUnit::run($aSuite);
-
-                $aSuiteResult['counts']['run'] = $result->runCount();
-                $aSuiteResult['counts']['error'] = $result->errorCount();
-                $aSuiteResult['counts']['failure'] = $result->failureCount();
-
-                $aSuiteResult['results'] = $this->_prepareResult($result,$showPassed);
-
-                $per = 100/$result->runCount();
-                $failed = ($per*$result->errorCount())+($per*$result->failureCount());
-                $aSuiteResult['percent'] = round(100-$failed,2);
-            } else {
-                $aSuiteResult['addInfo'] = 'NOT EXECUTED';
-            }
-
-            $suiteResults[] = $aSuiteResult;
-        }
-
-        $final['name'] = 'OVERALL RESULT';
-        $final['counts'] = array();
-        $final['percent'] = 0;
-        $numExecutedTests = 0;
-
-        foreach ($suiteResults as $aSuiteResult) {
-            if (sizeof(@$aSuiteResult['counts'])) {
-                foreach ($aSuiteResult['counts'] as $key=>$aCount) {
-                    if (!isset($final['counts'][$key])) {
-                        $final['counts'][$key] = 0;
-                    }
-
-                    $final['counts'][$key] += $aCount;
-                }
-            }
-        }
-
-        if (isset($final['counts']['run'])) {
-            $per = 100/$final['counts']['run'];
-            $failed = ($per*$final['counts']['error'])+($per*$final['counts']['failure']);
-            $final['percent'] = round(100-$failed,2);
-        } else {
-            $final['percent'] = 0;
-        }
-
-        array_unshift($suiteResults,$final);
-
-        include 'PHPUnit/GUI/HTML.tpl';
-    }
-
-    function _prepareResult($result,$showPassed)
-    {
-        $ret = array();
-        $failures = $result->failures();
-
-        foreach($failures as $aFailure) {
-            $ret['failures'][] = $this->_prepareFailure($aFailure);
-        }
-
-        $errors = $result->errors();
-
-        foreach($errors as $aError) {
-            $ret['errors'][] = $this->_prepareErrors($aError);
-        }
-
-        if ($showPassed) {
-            $passed = $result->passedTests();
-
-            foreach($passed as $aPassed) {
-                $ret['passed'][] = $this->_preparePassedTests($aPassed);
-            }
-        }
-
-        return $ret;
-    }
-
-    function _prepareFailure($failure)
-    {
-        $test = $failure->failedTest();
-        $ret['testName'] = $test->getName();
-        $exception = $failure->thrownException();
-
-        // a serialized string starts with a 'character:decimal:{'
-        // if so we try to unserialize it
-        // this piece of the regular expression is for detecting a serialized
-        // type like 'a:3:' for an array with three element or an object i.e. 'O:12:"class":3'
-        $serialized = '(\w:\d+:(?:"[^"]+":\d+:)?\{.*\})';
-
-        // Spaces might make a diff, so we shall show them properly (since a
-        // user agent ignores them).
-        if (preg_match('/^(.*)expected ' . $serialized . ', actual ' . $serialized . '$/sU', $exception, $matches)) {
-            ob_start();
-            print_r(unserialize($matches[2]));
-            $ret['expected'] = htmlspecialchars($matches[1]) . "<pre>" . htmlspecialchars(rtrim(ob_get_contents())) . "</pre>";
-            // Improved compatibility, ob_clean() would be PHP >= 4.2.0 only.
-            ob_end_clean();
-
-            ob_start();
-            print_r(unserialize($matches[3]));
-            $ret['actual'] = htmlspecialchars($matches[1]) . "<pre>" . htmlspecialchars(rtrim(ob_get_contents())) . "</pre>";
-            ob_end_clean();
-        }
-
-        else if (preg_match('/^(.*)expected (.*), actual (.*)$/sU', $exception, $matches)) {
-            $ret['expected'] = nl2br(str_replace(" ", "&nbsp;", htmlspecialchars($matches[1] . $matches[2])));
-            $ret['actual'] = nl2br(str_replace(" ", "&nbsp;", htmlspecialchars($matches[1] . $matches[3])));
-        } else {
-            $ret['message'] = nl2br(str_replace(" ", "&nbsp;", htmlspecialchars($exception)));
-        }
-
-        return $ret;
-    }
-
-    function _preparePassedTests($passed)
-    {
-        $ret['testName'] = $passed->getName();
-        return $ret;
-    }
-
-    function _prepareError($error)
-    {
-        $ret['testName'] = $error->getName();
-        $ret['message'] = $error->toString();
-        return $ret;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/GUI/HTML.tpl b/airtime_mvc/library/pear/PHPUnit/GUI/HTML.tpl
deleted file mode 100644
index edf7f2539..000000000
--- a/airtime_mvc/library/pear/PHPUnit/GUI/HTML.tpl
+++ /dev/null
@@ -1,156 +0,0 @@
-<html>
-    <head>
-        <STYLE type="text/css">
-
-            body, td {
-                background-color: lightgrey;
-            }
-
-            table.outline, outlineFailure {
-                background-color: black;
-                border-width: 1px;
-            }
-
-            td {
-                padding: 2px;
-            }
-
-            th {
-                text-align: left;
-                color: white;
-                background-color: black;
-            }
-
-            .success {
-                background-color: lightgreen;
-            }
-
-            .failure {
-                background-color: orange;
-            }
-            .info {
-                padding: 2px;
-                color: orange;
-            }
-
-        </STYLE>
-    </head>
-    <body>
-        <form action="<?php echo $_SERVER['PHP_SELF'] ?>" method="post" name="optionsForm">
-            <table align="center" class="outline" width="70%">
-                <tr>
-                    <th colspan="10">
-                        Options
-                    </th>
-                </tr>
-                <tr>
-                    <td colspan="10">
-                        <input type="checkbox" onClick="unCheckAll()" name="allChecked">
-                        (un)check all
-                        &nbsp; &nbsp;
-                        show OK <input type="checkbox" name="showOK" <?php echo @$request['showOK']?'checked':''?>>
-                        &nbsp; &nbsp;
-                        <input type="submit" name="submitted" value="run tests">
-                    </td>
-                </tr>
-
-                <?php foreach($suiteResults as $aResult): ?>
-                    <tr>
-                        <th colspan="10">
-                            <input type="checkbox" name="<?php echo $aResult['name'] ?>" <?php echo @$request[$aResult['name']]?'checked':'' ?>>
-                            <?php echo $aResult['name'] ?>
-                            &nbsp;
-                            <?php if (isset($aResult['addInfo'])): ?>
-                                <font class="info"><?php echo @$aResult['addInfo'] ?></font>
-                            <?php endif ?>
-                        </th>
-                    </tr>
-
-                    <?php if(@$aResult['percent']): ?>
-                        <tr>
-                            <td colspan="10" nowrap="nowrap">
-                                <table style="width:100%; padding:2px;" cellspacing="0" cellspan="0" cellpadding="0">
-                                    <tr>
-                                        <td width="<?php echo $aResult['percent'] ?>%" class="success" align="center" style="padding:0;">
-                                            <?php echo $aResult['percent']?$aResult['percent'].'%':'' ?>
-                                        </td>
-                                        <td width="<?php echo 100-$aResult['percent'] ?>%" class="failure" align="center" style="padding:0;">
-                                            <?php echo (100-$aResult['percent'])?(100-$aResult['percent'].'%'):'' ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    <?php endif ?>
-
-                    <?php if(@$aResult['counts']): ?>
-                        <tr>
-                            <td colspan="10">
-                                <?php foreach($aResult['counts'] as $aCount=>$value): ?>
-                                    <?php echo $aCount ?>s = <?php echo $value ?> &nbsp; &nbsp; &nbsp; &nbsp;
-                                <?php endforeach ?>
-                            </td>
-                        </tr>
-                    <?php endif ?>
-
-                    <?php if(isset($aResult['results']['failures']) && sizeof($aResult['results']['failures']))
-                        foreach($aResult['results']['failures'] as $aFailure): ?>
-                        <tr>
-                            <td class="failure"><?php echo $aFailure['testName'] ?></td>
-                            <td class="failure">
-                                <?php if(isset($aFailure['message']) && $aFailure['message']): ?>
-                                    <?php echo $aFailure['message'] ?>
-                                <?php else: ?>
-                                    <table class="outlineFailure">
-                                        <tr>
-                                            <td>expected</td>
-                                            <td><?php echo $aFailure['expected'] ?></td>
-                                        </tr>
-                                        <tr>
-                                            <td>actual</td>
-                                            <td><?php echo $aFailure['actual'] ?></td>
-                                        </tr>
-                                    </table>
-                                <?php endif ?>
-                            </td>
-                        </tr>
-                    <?php endforeach ?>
-
-                    <?php if(isset($aResult['results']['errors']) && sizeof($aResult['results']['errors']))
-                        foreach($aResult['results']['errors'] as $aError): ?>
-                        <tr>
-                            <td class="failure"><?php echo $aError['testName'] ?></td>
-                            <td class="failure">
-                                <?php echo $aError['message'] ?>
-                            </td>
-                        </tr>
-                    <?php endforeach ?>
-
-                    <?php if(isset($aResult['results']['passed']) && sizeof($aResult['results']['passed']))
-                        foreach($aResult['results']['passed'] as $aPassed): ?>
-                        <tr>
-                            <td class="success"><?php echo $aPassed['testName'] ?></td>
-                            <td class="success"><b>OK</b></td>
-                        </tr>
-                    <?php endforeach ?>
-
-                <?php endforeach ?>
-            </table>
-        </form>
-
-        <script>
-            var allSuiteNames = new Array();
-            <?php foreach($suiteResults as $aResult): ?>
-                allSuiteNames[allSuiteNames.length] = "<?php echo $aResult['name'] ?>";
-            <?php endforeach ?>
-            function unCheckAll()
-            {
-                _checked = document.optionsForm.allChecked.checked;
-                for (i=0;i<allSuiteNames.length;i++) {
-                    document.optionsForm[allSuiteNames[i]].checked = _checked;
-                }
-            }
-        </script>
-
-    </body>
-</html>
diff --git a/airtime_mvc/library/pear/PHPUnit/GUI/SetupDecorator.php b/airtime_mvc/library/pear/PHPUnit/GUI/SetupDecorator.php
deleted file mode 100644
index 8c871fa43..000000000
--- a/airtime_mvc/library/pear/PHPUnit/GUI/SetupDecorator.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Wolfram Kriesing <wolfram@kriesing.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: SetupDecorator.php,v 1.15 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-/**
- * This decorator actually just adds the functionality to read the
- * test-suite classes from a given directory and instanciate them
- * automatically, use it as given in the example below.
- *
- * <code>
- * <?php
- * $gui = new PHPUnit_GUI_SetupDecorator(new PHPUnit_GUI_HTML());
- * $gui->getSuitesFromDir('/path/to/dir/tests','.*\.php$',array('index.php','sql.php'));
- * $gui->show();
- * ?>
- * </code>
- *
- * The example calls this class and tells it to:
- *
- *   - find all file under the directory /path/to/dir/tests
- *   - for files, which end with '.php' (this is a piece of a regexp, that's why the . is escaped)
- *   - and to exclude the files 'index.php' and 'sql.php'
- *   - and include all the files that are left in the tests.
- *
- * Given that the path (the first parameter) ends with 'tests' it will be assumed
- * that the classes are named tests_* where * is the directory plus the filename,
- * according to PEAR standards.
- *
- * So that:
- *
- *   - 'testMe.php' in the dir 'tests' bill be assumed to contain a class tests_testMe
- *   - '/moretests/aTest.php' should contain a class 'tests_moretests_aTest'
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Wolfram Kriesing <wolfram@kriesing.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_GUI_SetupDecorator
-{
-    /**
-    *
-    *
-    */
-    function PHPUnit_GUI_SetupDecorator(&$gui)
-    {
-        $this->_gui = &$gui;
-    }
-
-    /**
-    *   just forwarding the action to the decorated class.
-    *
-    */
-    function show($showPassed=TRUE)
-    {
-        $this->_gui->show($showPassed);
-    }
-
-    /**
-    * Setup test suites that can be found in the given directory
-    * Using the second parameter you can also choose a subsets of the files found
-    * in the given directory. I.e. only all the files that contain '_UnitTest_',
-    * in order to do this simply call it like this:
-    * <code>getSuitesFromDir($dir,'.*_UnitTest_.*')</code>.
-    * There you can already see that the pattern is built for the use within a regular expression.
-    *
-    * @param  string  the directory where to search for test-suite files
-    * @param  string  the pattern (a regexp) by which to find the files
-    * @param  array   an array of file names that shall be excluded
-    */
-    function getSuitesFromDir($dir, $filenamePattern = '', $exclude = array())
-    {
-        if ($dir{strlen($dir)-1} == DIRECTORY_SEPARATOR) {
-            $dir = substr($dir, 0, -1);
-        }
-
-        $files = $this->_getFiles(realpath($dir), $filenamePattern, $exclude, realpath($dir . '/..'));
-        asort($files);
-
-        foreach ($files as $className => $aFile) {
-            include_once($aFile);
-
-            if (class_exists($className)) {
-                $suites[] =& new PHPUnit_TestSuite($className);
-            } else {
-                trigger_error("$className could not be found in $dir$aFile!");
-            }
-        }
-
-        $this->_gui->addSuites($suites);
-    }
-
-    /**
-    * This method searches recursively through the directories
-    * to find all the files that shall be added to the be visible.
-    *
-    * @param  string  the path where find the files
-    * @param  srting  the string pattern by which to find the files
-    * @param  string  the file names to be excluded
-    * @param  string  the root directory, which serves as the prefix to the fully qualified filename
-    * @access private
-    */
-    function _getFiles($dir, $filenamePattern, $exclude, $rootDir)
-    {
-        $files = array();
-
-        if ($dp = opendir($dir)) {
-            while (FALSE !== ($file = readdir($dp))) {
-                $filename = $dir . DIRECTORY_SEPARATOR . $file;
-                $match    = TRUE;
-
-                if ($filenamePattern && !preg_match("~$filenamePattern~", $file)) {
-                    $match = FALSE;
-                }
-
-                if (sizeof($exclude)) {
-                    foreach ($exclude as $aExclude) {
-                        if (strpos($file, $aExclude) !== FALSE) {
-                            $match = FALSE;
-                            break;
-                        }
-                    }
-                }
-
-                if (is_file($filename) && $match) {
-                    $tmp = str_replace($rootDir, '', $filename);
-
-                    if (strpos($tmp, DIRECTORY_SEPARATOR) === 0) {
-                        $tmp = substr($tmp, 1);
-                    }
-
-                    if (strpos($tmp, '/') === 0) {
-                        $tmp = substr($tmp, 1);
-                    }
-
-                    $className = str_replace(DIRECTORY_SEPARATOR, '_', $tmp);
-                    $className = basename($className, '.php');
-
-                    $files[$className] = $filename;
-                }
-
-                if ($file != '.' && $file != '..' && is_dir($filename)) {
-                    $files = array_merge($files, $this->_getFiles($filename, $filenamePattern, $exclude, $rootDir));
-                }
-            }
-
-            closedir($dp);
-        }
-
-        return $files;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/RepeatedTest.php b/airtime_mvc/library/pear/PHPUnit/RepeatedTest.php
deleted file mode 100644
index e014eb5ae..000000000
--- a/airtime_mvc/library/pear/PHPUnit/RepeatedTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: RepeatedTest.php,v 1.13 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/TestDecorator.php';
-
-/**
- * A Decorator that runs a test repeatedly.
- *
- * Here is an example:
- *
- * <code>
- * <?php
- * require_once 'PHPUnit.php';
- * require_once 'PHPUnit/RepeatedTest.php';
- *
- * class MathTest extends PHPUnit_TestCase {
- *     var $fValue1;
- *     var $fValue2;
- *
- *     function MathTest($name) {
- *         $this->PHPUnit_TestCase($name);
- *     }
- *
- *     function setUp() {
- *         $this->fValue1 = 2;
- *         $this->fValue2 = 3;
- *     }
- *
- *     function testAdd() {
- *         $this->assertTrue($this->fValue1 + $this->fValue2 == 5);
- *     }
- * }
- *
- * $suite = new PHPUnit_TestSuite;
- *
- * $suite->addTest(
- *   new PHPUnit_RepeatedTest(
- *     new MathTest('testAdd'),
- *     10
- *   )
- * );
- *
- * $result = PHPUnit::run($suite);
- * print $result->toString();
- * ?>
- * </code>
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_RepeatedTest extends PHPUnit_TestDecorator {
-    /**
-     * @var    integer
-     * @access private
-     */
-    var $_timesRepeat = 1;
-
-    /**
-     * Constructor.
-     *
-     * @param  object
-     * @param  integer
-     * @access public
-     */
-    function PHPUnit_RepeatedTest(&$test, $timesRepeat = 1) {
-        $this->PHPUnit_TestDecorator($test);
-        $this->_timesRepeat = $timesRepeat;
-    }
-
-    /**
-     * Counts the number of test cases that
-     * will be run by this test.
-     *
-     * @return integer
-     * @access public
-     */
-    function countTestCases() {
-        return $this->_timesRepeat * $this->_test->countTestCases();
-    }
-
-    /**
-     * Runs the decorated test and collects the
-     * result in a TestResult.
-     *
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function run(&$result) {
-        for ($i = 0; $i < $this->_timesRepeat; $i++) {
-            $this->_test->run($result);
-        }
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/Skeleton.php b/airtime_mvc/library/pear/PHPUnit/Skeleton.php
deleted file mode 100644
index e316373e0..000000000
--- a/airtime_mvc/library/pear/PHPUnit/Skeleton.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Scott Mattocks <scott@crisscott.com>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: Skeleton.php,v 1.8 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Class for creating a PHPUnit_TestCase skeleton file.
- *
- * This class will take a classname as a parameter on construction and will
- * create a PHP file that contains the skeleton of a PHPUnit_TestCase
- * subclass. The test case will contain a test foreach method of the class.
- * Methods of the parent class will, by default, be excluded from the test
- * class. Passing and optional construction parameter will include them.
- *
- * Example
- *
- *   <?php
- *   require_once 'PHPUnit/Skeleton.php';
- *   $ps = new PHPUnit_Skeleton('PHPUnit_Skeleton', 'PHPUnit/Skeleton.php');
- *
- *   // Generate the test class.
- *   // Default settings will not include any parent class methods, but
- *   // will include private methods.
- *   $ps->createTestClass();
- *
- *   // Write the new test class to file.
- *   // By default, code to run the test will be included.
- *   $ps->writeTestClass();
- *   ?>
- *
- * Now open the skeleton class and fill in the details.
- * If you run the test as is, all tests will fail and
- * you will see plenty of undefined constant errors.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Scott Mattocks <scott@crisscott.com>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.1.0
- */
-class PHPUnit_Skeleton {
-    /**
-     * Path to the class file to create a skeleton for.
-     * @var string
-     */
-    var $classPath;
-
-    /**
-     * The name of the class
-     * @var string
-     */
-    var $className;
-
-    /**
-     * Path to the configuration file needed by class to test.
-     * @var string
-     */
-    var $configFile;
-
-    /**
-     * Whether or not to include the methods of the parent class when testing.
-     * @var boolean
-     */
-    var $includeParents;
-
-    /**
-     * Whether or not to test private methods.
-     * @var boolean
-     */
-    var $includePrivate;
-
-    /**
-     * The test class that will be created.
-     * @var string
-     */
-    var $testClass;
-
-    /**
-     * Constructor. Sets the class members and check that the class
-     * to test is accessible.
-     *
-     * @access public
-     * @param  string  $className
-     * @param  string  $classPath
-     * @param  boolean $includeParents Wheter to include the parent's methods in the test.
-     * @return void
-     */
-    function PHPUnit_Skeleton($className, $classPath, $includeParents = FALSE, $includePrivate = TRUE) {
-        // Set up the members.
-        if (@is_readable($classPath)) {
-            $this->className = $className;
-            $this->classPath = $classPath;
-        } else {
-            $this->_handleErrors($classPath . ' is not readable. Cannot create test class.');
-        }
-
-        // Do we want to include parent methods?
-        $this->includeParents = $includeParents;
-
-        // Do we want to allow private methods?
-        $this->includePrivate = $includePrivate;
-    }
-
-    /**
-     * The class to test may require a special config file before it can be
-     * instantiated. This method lets you set that file.
-     *
-     * @access public
-     * @param  string $configPath
-     * @return void
-     */
-    function setConfigFile($configFile) {
-        // Check that the file is readable
-        if (@is_readable($configFile)) {
-            $this->configFile = $configFile;
-        } else {
-            $this->_handleErrors($configFile . ' is not readable. Cannot create test class.');
-        }
-    }
-
-    /**
-     * Create the code that will be the skeleton of the test case.
-     *
-     * The test case must have a clss definition, one var, a constructor
-     * setUp, tearDown, and methods. Optionally and by default the code
-     * to run the test is added when the class is written to file.
-     *
-     * @access public
-     * @param  none
-     * @return void
-     */
-    function createTestClass() {
-        // Instantiate the object.
-        if (isset($this->configFile)) {
-            require_once $this->configFile;
-        }
-
-        require_once $this->classPath;
-
-        // Get the methods.
-        $classMethods = get_class_methods($this->className);
-
-        // Remove the parent methods if needed.
-        if (!$this->includeParents) {
-            $parentMethods = get_class_methods(get_parent_class($this->className));
-
-            if (count($parentMethods)) {
-                $classMethods = array_diff($classMethods, $parentMethods);
-            }
-        }
-
-        // Create the class definition, constructor, setUp and tearDown.
-        $this->_createDefinition();
-        $this->_createConstructor();
-        $this->_createSetUpTearDown();
-
-        if (count($classMethods)) {
-            // Foreach method create a test case.
-            foreach ($classMethods as $method) {
-                // Unless it is the constructor.
-                if (strcasecmp($this->className, $method) !== 0) {
-                  // Check for private methods.
-                  if (!$this->includePrivate && strpos($method, '_') === 0) {
-                      continue;
-                  } else {
-                      $this->_createMethod($method);
-                  }
-                }
-            }
-        }
-
-        // Finis off the class.
-        $this->_finishClass();
-    }
-
-    /**
-     * Create the class definition.
-     *
-     * The definition consist of a header comment, require statment
-     * for getting the PHPUnit file, the actual class definition,
-     * and the definition of the class member variable.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createDefinition() {
-        // Create header comment.
-        $this->testClass =
-          "/**\n" .
-          " * PHPUnit test case for " . $this->className . "\n" .
-          " * \n" .
-          " * The method skeletons below need to be filled in with \n" .
-          " * real data so that the tests will run correctly. Replace \n" .
-          " * all EXPECTED_VAL and PARAM strings with real data. \n" .
-          " * \n" .
-          " * Created with PHPUnit_Skeleton on " . date('Y-m-d') . "\n" .
-          " */\n";
-
-        // Add the require statements.
-        $this->testClass .= "require_once 'PHPUnit.php';\n";
-
-        // Add the class definition and variable definition.
-        $this->testClass .=
-          "class " . $this->className . "Test extends PHPUnit_TestCase {\n\n" .
-          "    var \$" . $this->className . ";\n\n";
-    }
-
-    /**
-     * Create the class constructor. (PHP4 style)
-     *
-     * The constructor simply calls the PHPUnit_TestCase method.
-     * This code is taken from the PHPUnit documentation.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createConstructor() {
-        // Create the test class constructor.
-        $this->testClass.=
-          "    function " . $this->className . "Test(\$name)\n" .
-          "    {\n" .
-          "        \$this->PHPUnit_TestCase(\$name);\n" .
-          "    }\n\n";
-    }
-
-    /**
-     * Create setUp and tearDown methods.
-     *
-     * The setUp method creates the instance of the object to test.
-     * The tearDown method releases the instance.
-     * This code is taken from the PHPUnit documentation.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createSetUpTearDown() {
-        // Create the setUp method.
-        $this->testClass .=
-          "    function setUp()\n" .
-          "    {\n";
-
-        if (isset($this->configFile)) {
-            $this->testClass .=
-            "        require_once '" . $this->configFile . "';\n";
-        }
-
-        $this->testClass .=
-          "        require_once '" . $this->classPath . "';\n" .
-          "        \$this->" . $this->className . " =& new " . $this->className . "(PARAM);\n" .
-          "    }\n\n";
-
-        // Create the tearDown method.
-        $this->testClass .=
-          "    function tearDown()\n" .
-          "    {\n" .
-          "        unset(\$this->" . $this->className . ");\n" .
-          "    }\n\n";
-    }
-
-    /**
-     * Create a basic skeleton for test methods.
-     *
-     * This code is taken from the PHPUnit documentation.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createMethod($methodName) {
-        // Create a test method.
-        $this->testClass .=
-          "    function test" . $methodName . "()\n" .
-          "    {\n" .
-          "        \$result   = \$this->" . $this->className . "->" . $methodName . "(PARAM);\n" .
-          "        \$expected = EXPECTED_VAL;\n" .
-          "        \$this->assertEquals(\$expected, \$result);\n" .
-          "    }\n\n";
-    }
-
-    /**
-     * Add the closing brace needed for a proper class definition.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _finishClass() {
-        // Close off the class.
-        $this->testClass.= "}\n";
-    }
-
-    /**
-     * Create the code that will actually run the test.
-     *
-     * This code is added by default so that the test can be run
-     * just by running the file. To have it not added pass false
-     * as the second parameter to the writeTestClass method.
-     * This code is taken from the PHPUnit documentation.
-     *
-     * All of the code needed for the new class is stored in the
-     * testClass member.
-     *
-     * @access private
-     * @param  none
-     * @return void
-     */
-    function _createTest() {
-        // Create a call to the test.
-        $test =
-          "// Running the test.\n" .
-          "\$suite  = new PHPUnit_TestSuite('" . $this->className . "Test');\n" .
-          "\$result = PHPUnit::run(\$suite);\n" .
-          "echo \$result->toString();\n";
-
-        return $test;
-    }
-
-    /**
-     * Write the test class to file.
-     *
-     * This will write the test class created using the createTestClass
-     * method to a file called <className>Test.php. By default the file
-     * is written to the current directory and will have code to run
-     * the test appended to the bottom of the file.
-     *
-     * @access public
-     * @param  string  $destination The directory to write the file to.
-     * @param  boolean $addTest     Wheter to add the test running code.
-     * @return void
-     */
-    function writeTestClass($destination = './', $addTest = TRUE) {
-        // Check for something to write to file.
-        if (!isset($this->testClass)) {
-            $this->_handleErrors('Noting to write.', PHPUS_WARNING);
-            return;
-        }
-
-        // Open the destination file.
-        $fp = fopen($destination . $this->className . 'Test.php', 'w');
-        fwrite($fp, "<?php\n");
-
-        // Write the test class.
-        fwrite($fp, $this->testClass);
-
-        // Add the call to test the class in the file if we were asked to.
-        if ($addTest) {
-            fwrite($fp, $this->_createTest());
-        }
-
-        // Close the file.
-        fwrite($fp, "?>\n");
-        fclose($fp);
-    }
-
-    /**
-     * Error handler.
-     *
-     * This method should be rewritten to use the prefered error
-     * handling method. (PEAR_ErrorStack)
-     *
-     * @access private
-     * @param  string  $message The error message.
-     * @param  integer $type    An indication of the severity of the error.
-     * @return void             Code may cause PHP to exit.
-     */
-    function _handleErrors($message, $type = E_USER_ERROR) {
-        // For now just echo the message.
-        echo $message;
-
-        // Check to see if we should quit.
-        if ($type == E_USER_ERROR) {
-            exit;
-        }
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestCase.php b/airtime_mvc/library/pear/PHPUnit/TestCase.php
deleted file mode 100644
index 78a23aa8c..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestCase.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestCase.php,v 1.21 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/Assert.php';
-require_once 'PHPUnit/TestResult.php';
-
-/**
- * A TestCase defines the fixture to run multiple tests.
- *
- * To define a TestCase
- *
- *   1) Implement a subclass of PHPUnit_TestCase.
- *   2) Define instance variables that store the state of the fixture.
- *   3) Initialize the fixture state by overriding setUp().
- *   4) Clean-up after a test by overriding tearDown().
- *
- * Each test runs in its own fixture so there can be no side effects
- * among test runs.
- *
- * Here is an example:
- *
- * <code>
- * <?php
- * class MathTest extends PHPUnit_TestCase {
- *     var $fValue1;
- *     var $fValue2;
- *
- *     function MathTest($name) {
- *         $this->PHPUnit_TestCase($name);
- *     }
- *
- *     function setUp() {
- *         $this->fValue1 = 2;
- *         $this->fValue2 = 3;
- *     }
- * }
- * ?>
- * </code>
- *
- * For each test implement a method which interacts with the fixture.
- * Verify the expected results with assertions specified by calling
- * assert with a boolean.
- *
- * <code>
- * <?php
- * function testPass() {
- *     $this->assertTrue($this->fValue1 + $this->fValue2 == 5);
- * }
- * ?>
- * </code>
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestCase extends PHPUnit_Assert {
-    /**
-     * @var    boolean
-     * @access private
-     */
-    var $_failed = FALSE;
-
-    /**
-     * The name of the test case.
-     *
-     * @var    string
-     * @access private
-     */
-    var $_name = '';
-
-    /**
-     * PHPUnit_TestResult object
-     *
-     * @var    object
-     * @access private
-     */
-    var $_result;
-
-    /**
-     * Constructs a test case with the given name.
-     *
-     * @param  string
-     * @access public
-     */
-    function PHPUnit_TestCase($name = FALSE) {
-        if ($name !== FALSE) {
-            $this->setName($name);
-        }
-    }
-
-    /**
-     * Counts the number of test cases executed by run(TestResult result).
-     *
-     * @return integer
-     * @access public
-     */
-    function countTestCases() {
-        return 1;
-    }
-
-    /**
-     * Gets the name of a TestCase.
-     *
-     * @return string
-     * @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     * Runs the test case and collects the results in a given TestResult object.
-     *
-     * @param  object
-     * @return object
-     * @access public
-     */
-    function run(&$result) {
-        $this->_result = &$result;
-        $this->_result->run($this);
-
-        return $this->_result;
-    }
-
-    /**
-     * Runs the bare test sequence.
-     *
-     * @access public
-     */
-    function runBare() {
-        $this->setUp();
-        $this->runTest();
-        $this->tearDown();
-        $this->pass();
-    }
-
-    /**
-     * Override to run the test and assert its state.
-     *
-     * @access protected
-     */
-    function runTest() {
-        call_user_func(
-          array(
-            &$this,
-            $this->_name
-          )
-        );
-    }
-
-    /**
-     * Sets the name of a TestCase.
-     *
-     * @param  string
-     * @access public
-     */
-    function setName($name) {
-        $this->_name = $name;
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     * @access public
-     */
-    function toString() {
-        return '';
-    }
-
-    /**
-     * Creates a default TestResult object.
-     *
-     * @return object
-     * @access protected
-     */
-    function &createResult() {
-        return new PHPUnit_TestResult;
-    }
-
-    /**
-     * Fails a test with the given message.
-     *
-     * @param  string
-     * @access protected
-     */
-    function fail($message = '') {
-        if (function_exists('debug_backtrace')) {
-            $trace = debug_backtrace();
-
-            if (isset($trace['1']['file'])) {
-                $message = sprintf(
-                  "%s in %s:%s",
-
-                  $message,
-                  $trace['1']['file'],
-                  $trace['1']['line']
-                );
-            }
-        }
-
-        $this->_result->addFailure($this, $message);
-        $this->_failed = TRUE;
-    }
-
-    /**
-     * Passes a test.
-     *
-     * @access protected
-     */
-    function pass() {
-        if (!$this->_failed) {
-            $this->_result->addPassedTest($this);
-        }
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     * @abstract
-     */
-    function setUp() { /* abstract */ }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     * @abstract
-     */
-    function tearDown() { /* abstract */ }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestDecorator.php b/airtime_mvc/library/pear/PHPUnit/TestDecorator.php
deleted file mode 100644
index 41332103c..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestDecorator.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestDecorator.php,v 1.17 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/TestCase.php';
-require_once 'PHPUnit/TestSuite.php';
-
-if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
-}
-
-/**
- * A Decorator for Tests.
- *
- * Use TestDecorator as the base class for defining new
- * test decorators. Test decorator subclasses can be introduced
- * to add behaviour before or after a test is run.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestDecorator {
-    /**
-     * The Test to be decorated.
-     *
-     * @var    object
-     * @access protected
-     */
-    var $_test = NULL;
-
-    /**
-     * Constructor.
-     *
-     * @param  object
-     * @access public
-     */
-    function PHPUnit_TestDecorator(&$test) {
-        if (is_object($test) &&
-            (is_a($test, 'PHPUnit_TestCase') ||
-             is_a($test, 'PHPUnit_TestSuite'))) {
-
-            $this->_test = &$test;
-        }
-    }
-
-    /**
-     * Runs the test and collects the
-     * result in a TestResult.
-     *
-     * @param  object
-     * @access public
-     */
-    function basicRun(&$result) {
-        $this->_test->run($result);
-    }
-
-    /**
-     * Counts the number of test cases that
-     * will be run by this test.
-     *
-     * @return integer
-     * @access public
-     */
-    function countTestCases() {
-        return $this->_test->countTestCases();
-    }
-
-    /**
-     * Returns the test to be run.
-     *
-     * @return object
-     * @access public
-     */
-    function &getTest() {
-        return $this->_test;
-    }
-
-    /**
-     * Runs the decorated test and collects the
-     * result in a TestResult.
-     *
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function run(&$result) { /* abstract */ }
-
-    /**
-     * Returns a string representation of the test.
-     *
-     * @return string
-     * @access public
-     */
-    function toString() {
-        return $this->_test->toString();
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestFailure.php b/airtime_mvc/library/pear/PHPUnit/TestFailure.php
deleted file mode 100644
index 7839e4465..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestFailure.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestFailure.php,v 1.13 2005/11/10 09:47:14 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-/**
- * A TestFailure collects a failed test together with the caught exception.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestFailure {
-    /**
-     * @var    object
-     * @access private
-     */
-    var $_failedTest;
-
-    /**
-     * @var    string
-     * @access private
-     */
-    var $_thrownException;
-
-    /**
-     * Constructs a TestFailure with the given test and exception.
-     *
-     * @param  object
-     * @param  string
-     * @access public
-     */
-    function PHPUnit_TestFailure(&$failedTest, &$thrownException) {
-        $this->_failedTest      = &$failedTest;
-        $this->_thrownException = &$thrownException;
-    }
-
-    /**
-     * Gets the failed test.
-     *
-     * @return object
-     * @access public
-     */
-    function &failedTest() {
-        return $this->_failedTest;
-    }
-
-    /**
-     * Gets the thrown exception.
-     *
-     * @return object
-     * @access public
-     */
-    function &thrownException() {
-        return $this->_thrownException;
-    }
-
-    /**
-     * Returns a short description of the failure.
-     *
-     * @return string
-     * @access public
-     */
-    function toString() {
-        return sprintf(
-          "TestCase %s->%s() failed: %s\n",
-
-          get_class($this->_failedTest),
-          $this->_failedTest->getName(),
-          $this->_thrownException
-        );
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestListener.php b/airtime_mvc/library/pear/PHPUnit/TestListener.php
deleted file mode 100644
index 9cff52cb2..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestListener.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestListener.php,v 1.12 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-/**
- * A Listener for test progress.
- *
- * Here is an example:
- *
- * <code>
- * <?php
- * require_once 'PHPUnit.php';
- * require_once 'PHPUnit/TestListener.php';
- *
- * class MathTest extends PHPUnit_TestCase {
- *     var $fValue1;
- *     var $fValue2;
- *
- *     function MathTest($name) {
- *         $this->PHPUnit_TestCase($name);
- *     }
- *
- *     function setUp() {
- *         $this->fValue1 = 2;
- *         $this->fValue2 = 3;
- *     }
- *
- *     function testAdd() {
- *         $this->assertTrue($this->fValue1 + $this->fValue2 == 4);
- *     }
- * }
- *
- * class MyListener extends PHPUnit_TestListener {
- *     function addError(&$test, &$t) {
- *         print "MyListener::addError() called.\n";
- *     }
- *
- *     function addFailure(&$test, &$t) {
- *         print "MyListener::addFailure() called.\n";
- *     }
- *
- *     function endTest(&$test) {
- *         print "MyListener::endTest() called.\n";
- *     }
- *
- *     function startTest(&$test) {
- *         print "MyListener::startTest() called.\n";
- *     }
- * }
- *
- * $suite = new PHPUnit_TestSuite;
- * $suite->addTest(new MathTest('testAdd'));
- *
- * $result = new PHPUnit_TestResult;
- * $result->addListener(new MyListener);
- *
- * $suite->run($result);
- * print $result->toString();
- * ?>
- * </code>
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestListener {
-    /**
-     * An error occurred.
-     *
-     * @param  object
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function addError(&$test, &$t) { /*abstract */ }
-
-    /**
-     * A failure occurred.
-     *
-     * @param  object
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function addFailure(&$test, &$t) { /*abstract */ }
-
-    /**
-     * A test ended.
-     *
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function endTest(&$test) { /*abstract */ }
-
-    /**
-     * A test started.
-     *
-     * @param  object
-     * @access public
-     * @abstract
-     */
-    function startTest(&$test) { /*abstract */ }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestResult.php b/airtime_mvc/library/pear/PHPUnit/TestResult.php
deleted file mode 100644
index eb42121e1..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestResult.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestResult.php,v 1.18 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/TestFailure.php';
-require_once 'PHPUnit/TestListener.php';
-
-if (!function_exists('is_a')) {
-    require_once 'PHP/Compat/Function/is_a.php';
-}
-
-/**
- * A TestResult collects the results of executing a test case.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestResult {
-    /**
-     * @var    array
-     * @access protected
-     */
-    var $_errors = array();
-
-    /**
-     * @var    array
-     * @access protected
-     */
-    var $_failures = array();
-
-     /**
-     * @var    array
-     * @access protected
-     */
-    var $_listeners = array();
-
-    /**
-     * @var    array
-     * @access protected
-     */
-    var $_passedTests = array();
-
-    /**
-     * @var    integer
-     * @access protected
-     */
-    var $_runTests = 0;
-
-    /**
-     * @var    boolean
-     * @access private
-     */
-    var $_stop = FALSE;
-
-    /**
-     * Adds an error to the list of errors.
-     * The passed in exception caused the error.
-     *
-     * @param  object
-     * @param  object
-     * @access public
-     */
-    function addError(&$test, &$t) {
-        $this->_errors[] = new PHPUnit_TestFailure($test, $t);
-
-        for ($i = 0; $i < sizeof($this->_listeners); $i++) {
-            $this->_listeners[$i]->addError($test, $t);
-        }
-    }
-
-    /**
-     * Adds a failure to the list of failures.
-     * The passed in exception caused the failure.
-     *
-     * @param  object
-     * @param  object
-     * @access public
-     */
-    function addFailure(&$test, &$t) {
-        $this->_failures[] = new PHPUnit_TestFailure($test, $t);
-
-        for ($i = 0; $i < sizeof($this->_listeners); $i++) {
-            $this->_listeners[$i]->addFailure($test, $t);
-        }
-    }
-
-    /**
-     * Registers a TestListener.
-     *
-     * @param  object
-     * @access public
-     */
-    function addListener(&$listener) {
-        if (is_object($listener) &&
-            is_a($listener, 'PHPUnit_TestListener')) {
-            $this->_listeners[] = &$listener;
-        }
-    }
-
-    /**
-     * Adds a passed test to the list of passed tests.
-     *
-     * @param  object
-     * @access public
-     */
-    function addPassedTest(&$test) {
-        $this->_passedTests[] = &$test;
-    }
-
-    /**
-     * Informs the result that a test was completed.
-     *
-     * @param  object
-     * @access public
-     */
-    function endTest(&$test) {
-        for ($i = 0; $i < sizeof($this->_listeners); $i++) {
-            $this->_listeners[$i]->endTest($test);
-        }
-    }
-
-    /**
-     * Gets the number of detected errors.
-     *
-     * @return integer
-     * @access public
-     */
-    function errorCount() {
-        return sizeof($this->_errors);
-    }
-
-    /**
-     * Returns an Enumeration for the errors.
-     *
-     * @return array
-     * @access public
-     */
-    function &errors() {
-        return $this->_errors;
-    }
-
-    /**
-     * Gets the number of detected failures.
-     *
-     * @return integer
-     * @access public
-     */
-    function failureCount() {
-        return sizeof($this->_failures);
-    }
-
-    /**
-     * Returns an Enumeration for the failures.
-     *
-     * @return array
-     * @access public
-     */
-    function &failures() {
-        return $this->_failures;
-    }
-
-    /**
-     * Returns an Enumeration for the passed tests.
-     *
-     * @return array
-     * @access public
-     */
-    function &passedTests() {
-        return $this->_passedTests;
-    }
-
-    /**
-     * Unregisters a TestListener.
-     * This requires the Zend Engine 2 (to work properly).
-     *
-     * @param  object
-     * @access public
-     */
-    function removeListener(&$listener) {
-        for ($i = 0; $i < sizeof($this->_listeners); $i++) {
-            if ($this->_listeners[$i] === $listener) {
-                unset($this->_listeners[$i]);
-            }
-        }
-    }
-
-    /**
-     * Runs a TestCase.
-     *
-     * @param  object
-     * @access public
-     */
-    function run(&$test) {
-        $this->startTest($test);
-        $this->_runTests++;
-        $test->runBare();
-        $this->endTest($test);
-    }
-
-    /**
-     * Gets the number of run tests.
-     *
-     * @return integer
-     * @access public
-     */
-    function runCount() {
-        return $this->_runTests;
-    }
-
-    /**
-     * Checks whether the test run should stop.
-     *
-     * @access public
-     */
-    function shouldStop() {
-        return $this->_stop;
-    }
-
-    /**
-     * Informs the result that a test will be started.
-     *
-     * @param  object
-     * @access public
-     */
-    function startTest(&$test) {
-        for ($i = 0; $i < sizeof($this->_listeners); $i++) {
-            $this->_listeners[$i]->startTest($test);
-        }
-    }
-
-    /**
-     * Marks that the test run should stop.
-     *
-     * @access public
-     */
-    function stop() {
-        $this->_stop = TRUE;
-    }
-
-    /**
-     * Returns a HTML representation of the test result.
-     *
-     * @return string
-     * @access public
-     */
-    function toHTML() {
-        return '<pre>' . htmlspecialchars($this->toString()) . '</pre>';
-    }
-
-    /**
-     * Returns a text representation of the test result.
-     *
-     * @return string
-     * @access public
-     */
-    function toString() {
-        $result = '';
-
-        foreach ($this->_passedTests as $passedTest) {
-            $result .= sprintf(
-              "TestCase %s->%s() passed\n",
-
-              get_class($passedTest),
-              $passedTest->getName()
-            );
-        }
-
-        foreach ($this->_failures as $failedTest) {
-            $result .= $failedTest->toString();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns whether the entire test was successful or not.
-     *
-     * @return boolean
-     * @access public
-     */
-    function wasSuccessful() {
-        if (empty($this->_errors) && empty($this->_failures)) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/PHPUnit/TestSuite.php b/airtime_mvc/library/pear/PHPUnit/TestSuite.php
deleted file mode 100644
index c0e069eec..000000000
--- a/airtime_mvc/library/pear/PHPUnit/TestSuite.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 4
- *
- * Copyright (c) 2002-2005, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: TestSuite.php,v 1.17 2005/11/10 09:47:15 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit
- * @since      File available since Release 1.0.0
- */
-
-require_once 'PHPUnit/TestCase.php';
-
-/**
- * A TestSuite is a Composite of Tests. It runs a collection of test cases.
- *
- * Here is an example using the dynamic test definition.
- *
- * <code>
- * <?php
- * $suite = new PHPUnit_TestSuite();
- * $suite->addTest(new MathTest('testPass'));
- * ?>
- * </code>
- *
- * Alternatively, a TestSuite can extract the tests to be run automatically.
- * To do so you pass the classname of your TestCase class to the TestSuite
- * constructor.
- *
- * <code>
- * <?php
- * $suite = new TestSuite('classname');
- * ?>
- * </code>
- *
- * This constructor creates a suite with all the methods starting with
- * "test" that take no arguments.
- *
- * @category   Testing
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2005 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_TestSuite {
-    /**
-     * The name of the test suite.
-     *
-     * @var    string
-     * @access private
-     */
-    var $_name = '';
-
-    /**
-     * The tests in the test suite.
-     *
-     * @var    array
-     * @access private
-     */
-    var $_tests = array();
-
-    /**
-     * Constructs a TestSuite.
-     *
-     * @param  mixed
-     * @access public
-     */
-    function PHPUnit_TestSuite($test = FALSE) {
-        if ($test !== FALSE) {
-            $this->setName($test);
-            $this->addTestSuite($test);
-        }
-    }
-
-    /**
-     * Adds a test to the suite.
-     *
-     * @param  object
-     * @access public
-     */
-    function addTest(&$test) {
-        $this->_tests[] = &$test;
-    }
-
-    /**
-     * Adds the tests from the given class to the suite.
-     *
-     * @param  string
-     * @access public
-     */
-    function addTestSuite($testClass) {
-        if (class_exists($testClass)) {
-            $methods       = get_class_methods($testClass);
-            $parentClasses = array(strtolower($testClass));
-            $parentClass   = $testClass;
-
-            while(is_string($parentClass = get_parent_class($parentClass))) {
-                $parentClasses[] = $parentClass;
-            }
-
-            foreach ($methods as $method) {
-                if (substr($method, 0, 4) == 'test' &&
-                    !in_array($method, $parentClasses)) {
-                    $this->addTest(new $testClass($method));
-                }
-            }
-        }
-    }
-
-    /**
-     * Counts the number of test cases that will be run by this test.
-     *
-     * @return integer
-     * @access public
-     */
-    function countTestCases() {
-        $count = 0;
-
-        foreach ($this->_tests as $test) {
-            $count += $test->countTestCases();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Returns the name of the suite.
-     *
-     * @return string
-     * @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     * Runs the tests and collects their result in a TestResult.
-     *
-     * @param  object
-     * @access public
-     */
-    function run(&$result) {
-        for ($i = 0; $i < sizeof($this->_tests) && !$result->shouldStop(); $i++) {
-            $this->_tests[$i]->run($result);
-        }
-    }
-
-    /**
-     * Runs a test.
-     *
-     * @param  object
-     * @param  object
-     * @access public
-     */
-    function runTest(&$test, &$result) {
-        $test->run($result);
-    }
-
-    /**
-     * Sets the name of the suite.
-     *
-     * @param  string
-     * @access public
-     */
-    function setName($name) {
-        $this->_name = $name;
-    }
-
-    /**
-     * Returns the test at the given index.
-     *
-     * @param  integer
-     * @return object
-     * @access public
-     */
-    function &testAt($index) {
-        if (isset($this->_tests[$index])) {
-            return $this->_tests[$index];
-        } else {
-            return FALSE;
-        }
-    }
-
-    /**
-     * Returns the number of tests in this suite.
-     *
-     * @return integer
-     * @access public
-     */
-    function testCount() {
-        return sizeof($this->_tests);
-    }
-
-    /**
-     * Returns the tests as an enumeration.
-     *
-     * @return array
-     * @access public
-     */
-    function &tests() {
-        return $this->_tests;
-    }
-
-    /**
-     * Returns a string representation of the test suite.
-     *
-     * @return string
-     * @access public
-     */
-    function toString() {
-        return '';
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>
diff --git a/airtime_mvc/library/pear/System.php b/airtime_mvc/library/pear/System.php
deleted file mode 100644
index af5718217..000000000
--- a/airtime_mvc/library/pear/System.php
+++ /dev/null
@@ -1,621 +0,0 @@
-<?php
-/**
- * File/Directory manipulation
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    System
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: System.php 276386 2009-02-24 23:52:56Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * base class
- */
-require_once 'PEAR.php';
-require_once 'Console/Getopt.php';
-
-$GLOBALS['_System_temp_files'] = array();
-
-/**
-* System offers cross plattform compatible system functions
-*
-* Static functions for different operations. Should work under
-* Unix and Windows. The names and usage has been taken from its respectively
-* GNU commands. The functions will return (bool) false on error and will
-* trigger the error with the PHP trigger_error() function (you can silence
-* the error by prefixing a '@' sign after the function call, but this
-* is not recommended practice.  Instead use an error handler with
-* {@link set_error_handler()}).
-*
-* Documentation on this class you can find in:
-* http://pear.php.net/manual/
-*
-* Example usage:
-* if (!@System::rm('-r file1 dir1')) {
-*    print "could not delete file1 or dir1";
-* }
-*
-* In case you need to to pass file names with spaces,
-* pass the params as an array:
-*
-* System::rm(array('-r', $file1, $dir1));
-*
-* @category   pear
-* @package    System
-* @author     Tomas V.V. Cox <cox@idecnet.com>
-* @copyright  1997-2006 The PHP Group
-* @license    http://opensource.org/licenses/bsd-license.php New BSD License
-* @version    Release: 1.9.1
-* @link       http://pear.php.net/package/PEAR
-* @since      Class available since Release 0.1
-* @static
-*/
-class System
-{
-    /**
-     * returns the commandline arguments of a function
-     *
-     * @param    string  $argv           the commandline
-     * @param    string  $short_options  the allowed option short-tags
-     * @param    string  $long_options   the allowed option long-tags
-     * @return   array   the given options and there values
-     * @static
-     * @access private
-     */
-    function _parseArgs($argv, $short_options, $long_options = null)
-    {
-        if (!is_array($argv) && $argv !== null) {
-            $argv = preg_split('/\s+/', $argv, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        return Console_Getopt::getopt2($argv, $short_options);
-    }
-
-    /**
-     * Output errors with PHP trigger_error(). You can silence the errors
-     * with prefixing a "@" sign to the function call: @System::mkdir(..);
-     *
-     * @param mixed $error a PEAR error or a string with the error message
-     * @return bool false
-     * @static
-     * @access private
-     */
-    function raiseError($error)
-    {
-        if (PEAR::isError($error)) {
-            $error = $error->getMessage();
-        }
-        trigger_error($error, E_USER_WARNING);
-        return false;
-    }
-
-    /**
-     * Creates a nested array representing the structure of a directory
-     *
-     * System::_dirToStruct('dir1', 0) =>
-     *   Array
-     *    (
-     *    [dirs] => Array
-     *        (
-     *            [0] => dir1
-     *        )
-     *
-     *    [files] => Array
-     *        (
-     *            [0] => dir1/file2
-     *            [1] => dir1/file3
-     *        )
-     *    )
-     * @param    string  $sPath      Name of the directory
-     * @param    integer $maxinst    max. deep of the lookup
-     * @param    integer $aktinst    starting deep of the lookup
-     * @param    bool    $silent     if true, do not emit errors.
-     * @return   array   the structure of the dir
-     * @static
-     * @access   private
-     */
-    function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        if (($dir = @opendir($sPath)) === false) {
-            if (!$silent) {
-                System::raiseError("Could not open dir $sPath");
-            }
-            return $struct; // XXX could not open error
-        }
-
-        $struct['dirs'][] = $sPath = realpath($sPath); // XXX don't add if '.' or '..' ?
-        $list = array();
-        while (false !== ($file = readdir($dir))) {
-            if ($file != '.' && $file != '..') {
-                $list[] = $file;
-            }
-        }
-
-        closedir($dir);
-        natsort($list);
-        if ($aktinst < $maxinst || $maxinst == 0) {
-            foreach ($list as $val) {
-                $path = $sPath . DIRECTORY_SEPARATOR . $val;
-                if (is_dir($path) && !is_link($path)) {
-                    $tmp    = System::_dirToStruct($path, $maxinst, $aktinst+1, $silent);
-                    $struct = array_merge_recursive($struct, $tmp);
-                } else {
-                    $struct['files'][] = $path;
-                }
-            }
-        }
-
-        return $struct;
-    }
-
-    /**
-     * Creates a nested array representing the structure of a directory and files
-     *
-     * @param    array $files Array listing files and dirs
-     * @return   array
-     * @static
-     * @see System::_dirToStruct()
-     */
-    function _multipleToStruct($files)
-    {
-        $struct = array('dirs' => array(), 'files' => array());
-        settype($files, 'array');
-        foreach ($files as $file) {
-            if (is_dir($file) && !is_link($file)) {
-                $tmp    = System::_dirToStruct($file, 0);
-                $struct = array_merge_recursive($tmp, $struct);
-            } else {
-                if (!in_array($file, $struct['files'])) {
-                    $struct['files'][] = $file;
-                }
-            }
-        }
-        return $struct;
-    }
-
-    /**
-     * The rm command for removing files.
-     * Supports multiple files and dirs and also recursive deletes
-     *
-     * @param    string  $args   the arguments for rm
-     * @return   mixed   PEAR_Error or true for success
-     * @static
-     * @access   public
-     */
-    function rm($args)
-    {
-        $opts = System::_parseArgs($args, 'rf'); // "f" does nothing but I like it :-)
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-        foreach ($opts[0] as $opt) {
-            if ($opt[0] == 'r') {
-                $do_recursive = true;
-            }
-        }
-        $ret = true;
-        if (isset($do_recursive)) {
-            $struct = System::_multipleToStruct($opts[1]);
-            foreach ($struct['files'] as $file) {
-                if (!@unlink($file)) {
-                    $ret = false;
-                }
-            }
-
-            rsort($struct['dirs']);
-            foreach ($struct['dirs'] as $dir) {
-                if (!@rmdir($dir)) {
-                    $ret = false;
-                }
-            }
-        } else {
-            foreach ($opts[1] as $file) {
-                $delete = (is_dir($file)) ? 'rmdir' : 'unlink';
-                if (!@$delete($file)) {
-                    $ret = false;
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Make directories.
-     *
-     * The -p option will create parent directories
-     * @param    string  $args    the name of the director(y|ies) to create
-     * @return   bool    True for success
-     * @static
-     * @access   public
-     */
-    function mkDir($args)
-    {
-        $opts = System::_parseArgs($args, 'pm:');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-
-        $mode = 0777; // default mode
-        foreach ($opts[0] as $opt) {
-            if ($opt[0] == 'p') {
-                $create_parents = true;
-            } elseif ($opt[0] == 'm') {
-                // if the mode is clearly an octal number (starts with 0)
-                // convert it to decimal
-                if (strlen($opt[1]) && $opt[1]{0} == '0') {
-                    $opt[1] = octdec($opt[1]);
-                } else {
-                    // convert to int
-                    $opt[1] += 0;
-                }
-                $mode = $opt[1];
-            }
-        }
-
-        $ret = true;
-        if (isset($create_parents)) {
-            foreach ($opts[1] as $dir) {
-                $dirstack = array();
-                while ((!file_exists($dir) || !is_dir($dir)) &&
-                        $dir != DIRECTORY_SEPARATOR) {
-                    array_unshift($dirstack, $dir);
-                    $dir = dirname($dir);
-                }
-
-                while ($newdir = array_shift($dirstack)) {
-                    if (!is_writeable(dirname($newdir))) {
-                        $ret = false;
-                        break;
-                    }
-
-                    if (!mkdir($newdir, $mode)) {
-                        $ret = false;
-                    }
-                }
-            }
-        } else {
-            foreach($opts[1] as $dir) {
-                if ((@file_exists($dir) || !is_dir($dir)) && !mkdir($dir, $mode)) {
-                    $ret = false;
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Concatenate files
-     *
-     * Usage:
-     * 1) $var = System::cat('sample.txt test.txt');
-     * 2) System::cat('sample.txt test.txt > final.txt');
-     * 3) System::cat('sample.txt test.txt >> final.txt');
-     *
-     * Note: as the class use fopen, urls should work also (test that)
-     *
-     * @param    string  $args   the arguments
-     * @return   boolean true on success
-     * @static
-     * @access   public
-     */
-    function &cat($args)
-    {
-        $ret = null;
-        $files = array();
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
-        }
-
-        $count_args = count($args);
-        for ($i = 0; $i < $count_args; $i++) {
-            if ($args[$i] == '>') {
-                $mode = 'wb';
-                $outputfile = $args[$i+1];
-                break;
-            } elseif ($args[$i] == '>>') {
-                $mode = 'ab+';
-                $outputfile = $args[$i+1];
-                break;
-            } else {
-                $files[] = $args[$i];
-            }
-        }
-        $outputfd = false;
-        if (isset($mode)) {
-            if (!$outputfd = fopen($outputfile, $mode)) {
-                $err = System::raiseError("Could not open $outputfile");
-                return $err;
-            }
-            $ret = true;
-        }
-        foreach ($files as $file) {
-            if (!$fd = fopen($file, 'r')) {
-                System::raiseError("Could not open $file");
-                continue;
-            }
-            while ($cont = fread($fd, 2048)) {
-                if (is_resource($outputfd)) {
-                    fwrite($outputfd, $cont);
-                } else {
-                    $ret .= $cont;
-                }
-            }
-            fclose($fd);
-        }
-        if (is_resource($outputfd)) {
-            fclose($outputfd);
-        }
-        return $ret;
-    }
-
-    /**
-     * Creates temporary files or directories. This function will remove
-     * the created files when the scripts finish its execution.
-     *
-     * Usage:
-     *   1) $tempfile = System::mktemp("prefix");
-     *   2) $tempdir  = System::mktemp("-d prefix");
-     *   3) $tempfile = System::mktemp();
-     *   4) $tempfile = System::mktemp("-t /var/tmp prefix");
-     *
-     * prefix -> The string that will be prepended to the temp name
-     *           (defaults to "tmp").
-     * -d     -> A temporary dir will be created instead of a file.
-     * -t     -> The target dir where the temporary (file|dir) will be created. If
-     *           this param is missing by default the env vars TMP on Windows or
-     *           TMPDIR in Unix will be used. If these vars are also missing
-     *           c:\windows\temp or /tmp will be used.
-     *
-     * @param   string  $args  The arguments
-     * @return  mixed   the full path of the created (file|dir) or false
-     * @see System::tmpdir()
-     * @static
-     * @access  public
-     */
-    function mktemp($args = null)
-    {
-        static $first_time = true;
-        $opts = System::_parseArgs($args, 't:d');
-        if (PEAR::isError($opts)) {
-            return System::raiseError($opts);
-        }
-
-        foreach ($opts[0] as $opt) {
-            if ($opt[0] == 'd') {
-                $tmp_is_dir = true;
-            } elseif ($opt[0] == 't') {
-                $tmpdir = $opt[1];
-            }
-        }
-
-        $prefix = (isset($opts[1][0])) ? $opts[1][0] : 'tmp';
-        if (!isset($tmpdir)) {
-            $tmpdir = System::tmpdir();
-        }
-
-        if (!System::mkDir(array('-p', $tmpdir))) {
-            return false;
-        }
-
-        $tmp = tempnam($tmpdir, $prefix);
-        if (isset($tmp_is_dir)) {
-            unlink($tmp); // be careful possible race condition here
-            if (!mkdir($tmp, 0700)) {
-                return System::raiseError("Unable to create temporary directory $tmpdir");
-            }
-        }
-
-        $GLOBALS['_System_temp_files'][] = $tmp;
-        if (isset($tmp_is_dir)) {
-            //$GLOBALS['_System_temp_files'][] = dirname($tmp);
-        }
-
-        if ($first_time) {
-            PEAR::registerShutdownFunc(array('System', '_removeTmpFiles'));
-            $first_time = false;
-        }
-
-        return $tmp;
-    }
-
-    /**
-     * Remove temporary files created my mkTemp. This function is executed
-     * at script shutdown time
-     *
-     * @static
-     * @access private
-     */
-    function _removeTmpFiles()
-    {
-        if (count($GLOBALS['_System_temp_files'])) {
-            $delete = $GLOBALS['_System_temp_files'];
-            array_unshift($delete, '-r');
-            System::rm($delete);
-            $GLOBALS['_System_temp_files'] = array();
-        }
-    }
-
-    /**
-     * Get the path of the temporal directory set in the system
-     * by looking in its environments variables.
-     * Note: php.ini-recommended removes the "E" from the variables_order setting,
-     * making unavaible the $_ENV array, that s why we do tests with _ENV
-     *
-     * @static
-     * @return string The temporary directory on the system
-     */
-    function tmpdir()
-    {
-        if (OS_WINDOWS) {
-            if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['TEMP']) ? $_ENV['TEMP'] : getenv('TEMP')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['USERPROFILE']) ? $_ENV['USERPROFILE'] : getenv('USERPROFILE')) {
-                return $var;
-            }
-            if ($var = isset($_ENV['windir']) ? $_ENV['windir'] : getenv('windir')) {
-                return $var;
-            }
-            return getenv('SystemRoot') . '\temp';
-        }
-        if ($var = isset($_ENV['TMPDIR']) ? $_ENV['TMPDIR'] : getenv('TMPDIR')) {
-            return $var;
-        }
-        return realpath('/tmp');
-    }
-
-    /**
-     * The "which" command (show the full path of a command)
-     *
-     * @param string $program The command to search for
-     * @param mixed  $fallback Value to return if $program is not found
-     *
-     * @return mixed A string with the full path or false if not found
-     * @static
-     * @author Stig Bakken <ssb@php.net>
-     */
-    function which($program, $fallback = false)
-    {
-        // enforce API
-        if (!is_string($program) || '' == $program) {
-            return $fallback;
-        }
-
-        // full path given
-        if (basename($program) != $program) {
-            $path_elements[] = dirname($program);
-            $program = basename($program);
-        } else {
-            // Honor safe mode
-            if (!ini_get('safe_mode') || !$path = ini_get('safe_mode_exec_dir')) {
-                $path = getenv('PATH');
-                if (!$path) {
-                    $path = getenv('Path'); // some OSes are just stupid enough to do this
-                }
-            }
-            $path_elements = explode(PATH_SEPARATOR, $path);
-        }
-
-        if (OS_WINDOWS) {
-            $exe_suffixes = getenv('PATHEXT')
-                                ? explode(PATH_SEPARATOR, getenv('PATHEXT'))
-                                : array('.exe','.bat','.cmd','.com');
-            // allow passing a command.exe param
-            if (strpos($program, '.') !== false) {
-                array_unshift($exe_suffixes, '');
-            }
-            // is_executable() is not available on windows for PHP4
-            $pear_is_executable = (function_exists('is_executable')) ? 'is_executable' : 'is_file';
-        } else {
-            $exe_suffixes = array('');
-            $pear_is_executable = 'is_executable';
-        }
-
-        foreach ($exe_suffixes as $suff) {
-            foreach ($path_elements as $dir) {
-                $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
-                if (@$pear_is_executable($file)) {
-                    return $file;
-                }
-            }
-        }
-        return $fallback;
-    }
-
-    /**
-     * The "find" command
-     *
-     * Usage:
-     *
-     * System::find($dir);
-     * System::find("$dir -type d");
-     * System::find("$dir -type f");
-     * System::find("$dir -name *.php");
-     * System::find("$dir -name *.php -name *.htm*");
-     * System::find("$dir -maxdepth 1");
-     *
-     * Params implmented:
-     * $dir            -> Start the search at this directory
-     * -type d         -> return only directories
-     * -type f         -> return only files
-     * -maxdepth <n>   -> max depth of recursion
-     * -name <pattern> -> search pattern (bash style). Multiple -name param allowed
-     *
-     * @param  mixed Either array or string with the command line
-     * @return array Array of found files
-     * @static
-     *
-     */
-    function find($args)
-    {
-        if (!is_array($args)) {
-            $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);
-        }
-        $dir = realpath(array_shift($args));
-        if (!$dir) {
-            return array();
-        }
-        $patterns = array();
-        $depth = 0;
-        $do_files = $do_dirs = true;
-        $args_count = count($args);
-        for ($i = 0; $i < $args_count; $i++) {
-            switch ($args[$i]) {
-                case '-type':
-                    if (in_array($args[$i+1], array('d', 'f'))) {
-                        if ($args[$i+1] == 'd') {
-                            $do_files = false;
-                        } else {
-                            $do_dirs = false;
-                        }
-                    }
-                    $i++;
-                    break;
-                case '-name':
-                    $name = preg_quote($args[$i+1], '#');
-                    // our magic characters ? and * have just been escaped,
-                    // so now we change the escaped versions to PCRE operators
-                    $name = strtr($name, array('\?' => '.', '\*' => '.*'));
-                    $patterns[] = '('.$name.')';
-                    $i++;
-                    break;
-                case '-maxdepth':
-                    $depth = $args[$i+1];
-                    break;
-            }
-        }
-        $path = System::_dirToStruct($dir, $depth, 0, true);
-        if ($do_files && $do_dirs) {
-            $files = array_merge($path['files'], $path['dirs']);
-        } elseif ($do_dirs) {
-            $files = $path['dirs'];
-        } else {
-            $files = $path['files'];
-        }
-        if (count($patterns)) {
-            $dsq = preg_quote(DIRECTORY_SEPARATOR, '#');
-            $pattern = '#(^|'.$dsq.')'.implode('|', $patterns).'($|'.$dsq.')#';
-            $ret = array();
-            $files_count = count($files);
-            for ($i = 0; $i < $files_count; $i++) {
-                // only search in the part of the file below the current directory
-                $filepart = basename($files[$i]);
-                if (preg_match($pattern, $filepart)) {
-                    $ret[] = $files[$i];
-                }
-            }
-            return $ret;
-        }
-        return $files;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/pear/VERSIONS.txt b/airtime_mvc/library/pear/VERSIONS.txt
deleted file mode 100644
index 175e400e2..000000000
--- a/airtime_mvc/library/pear/VERSIONS.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Last updated:
- - 2010-09-13: PHPUnit added
- - 2010-08-17: Updated everything to latest version
- - 2007-02-13: Update DB from 1.7.6 to 1.7.9
-
-* Archive_Tar-1.3.7
-* Calendar-0.5.5(beta)
-* Console_Getopt-1.2.3
-* DB-1.7.13
-* File-1.3.0
-* File_Find-1.3.0
-* HTML_Common-1.2.5
-* HTML_Quickform-3.2.11
-* PEAR-1.9.1
-* XML_Beautifier-1.2.0
-* XML_Parser-1.3.2
-* XML_RPC-1.5.4
-* XML_Serializer-0.20.0(beta)
-* XML_Util-1.2.1
-* PHPUnit 1.3.2
diff --git a/airtime_mvc/library/pear/XML/Beautifier.php b/airtime_mvc/library/pear/XML/Beautifier.php
deleted file mode 100644
index 86e48b0c1..000000000
--- a/airtime_mvc/library/pear/XML/Beautifier.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Beautifier
- *
- * XML Beautifier package
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Beautifier.php,v 1.15 2008/08/24 19:44:14 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-
-
-/**
- * define include path constant
- */
-if (!defined('XML_BEAUTIFIER_INCLUDE_PATH')) {
-    define('XML_BEAUTIFIER_INCLUDE_PATH', 'XML/Beautifier');
-}
-
-/**
- * element is empty
- */
-define('XML_BEAUTIFIER_EMPTY', 0);
-
-/**
- * CData
- */
-define('XML_BEAUTIFIER_CDATA', 1);
-
-/**
- * XML element
- */
-define('XML_BEAUTIFIER_ELEMENT', 2);
-
-/**
- * processing instruction
- */
-define('XML_BEAUTIFIER_PI', 4);
-
-/**
- * entity
- */
-define('XML_BEAUTIFIER_ENTITY', 8);
-
-/**
- * comment
- */
-define('XML_BEAUTIFIER_COMMENT', 16);
-
-/**
- * XML declaration
- */
-define('XML_BEAUTIFIER_XML_DECLARATION', 32);
-
-/**
- * doctype declaration
- */
-define('XML_BEAUTIFIER_DT_DECLARATION', 64);
-
-/**
- * cdata section
- */
-define('XML_BEAUTIFIER_CDATA_SECTION', 128);
-
-/**
- * default
- */
-define('XML_BEAUTIFIER_DEFAULT', 256);
-
-/**
- * overwrite the original file
- */
-define('XML_BEAUTIFIER_OVERWRITE', -1);
-
-/**
- * could not write to output file
- */
-define('XML_BEAUTIFIER_ERROR_NO_OUTPUT_FILE', 151);
-
-/**
- * could not load renderer
- */
-define('XML_BEAUTIFIER_ERROR_UNKNOWN_RENDERER', 152);
-
-/**
- * XML_Beautifier is a class that adds linebreaks and
- * indentation to your XML files. It can be used on XML
- * that looks ugly (e.g. any generated XML) to transform it 
- * to a nicely looking XML that can be read by humans.
- *
- * It removes unnecessary whitespace and adds indentation
- * depending on the nesting level.
- *
- * It is able to treat tags, data, processing instructions
- * comments, external entities and the XML prologue.
- *
- * XML_Beautifier is using XML_Beautifier_Tokenizer to parse an XML
- * document with a SAX based parser and builds tokens of tags, comments,
- * entities, data, etc.
- * These tokens will be serialized and indented by a renderer 
- * with your indent string.
- *
- * Example 1: Formatting a file
- * <code>
- * require_once 'XML/Beautifier.php';
- * $fmt = new XML_Beautifier();
- * $result = $fmt->formatFile('oldFile.xml', 'newFile.xml');
- * </code>
- *
- * Example 2: Formatting a string
- * <code>
- * require_once 'XML/Beautifier.php';
- * $xml = '<root><foo   bar = "pear"/></root>';
- * $fmt = new XML_Beautifier();
- * $result = $fmt->formatString($xml);
- * </code>
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.0
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-class XML_Beautifier
-{
-    /**
-     * default options for the output format
-     * @var    array
-     * @access private
-     */
-     var $_defaultOptions = array(
-         "removeLineBreaks"   => true,
-         "removeLeadingSpace" => true,       // not implemented, yet
-         "indent"             => "    ",
-         "linebreak"          => "\n",
-         "caseFolding"        => false,
-         "caseFoldingTo"      => "uppercase",
-         "normalizeComments"  => false,
-         "maxCommentLine"     => -1,
-         "multilineTags"      => false
-      );
-
-    /**
-     * options for the output format
-     * @var    array
-     * @access private
-     */
-     var $_options = array();
-    
-    /**
-     * Constructor
-     *
-     * This is only used to specify the options of the
-     * beautifying process.
-     *
-     * @param array $options options that override default options
-     *
-     * @access public
-     */   
-    function XML_Beautifier($options = array())
-    {
-        $this->_options = array_merge($this->_defaultOptions, $options);
-        $this->folding  = false;
-    }
-
-    /**
-     * reset all options to default options
-     *
-     * @return void
-     * @access public
-     * @see setOption(), XML_Beautifier(), setOptions()
-     */
-    function resetOptions()
-    {
-        $this->_options = $this->_defaultOptions;
-    }
-
-    /**
-     * set an option
-     *
-     * You can use this method if you do not want 
-     * to set all options in the constructor
-     *
-     * @param string $name  option name
-     * @param mixed  $value option value
-     *
-     * @return void
-     * @access public
-     * @see resetOptions(), XML_Beautifier(), setOptions()
-     */
-    function setOption($name, $value)
-    {
-        $this->_options[$name] = $value;
-    }
-    
-    /**
-     * set several options at once
-     *
-     * You can use this method if you do not want 
-     * to set all options in the constructor
-     *
-     * @param array $options an options array
-     *
-     * @return void
-     * @access   public
-     * @see      resetOptions(), XML_Beautifier()
-     */
-    function setOptions($options)
-    {
-        $this->_options = array_merge($this->_options, $options);
-    }
-
-    /**
-     * format a file or URL
-     *
-     * @param string $file     filename
-     * @param mixed  $newFile  filename for beautified XML file 
-     *                         (if none is given, the XML string 
-     *                         will be returned).
-     *                         if you want overwrite the original file, 
-     *                         use XML_BEAUTIFIER_OVERWRITE
-     * @param string $renderer Renderer to use, 
-     *                         default is the plain xml renderer
-     *
-     * @return mixed XML string of no file should be written, 
-     *               true if file could be written
-     * @access public
-     * @throws PEAR_Error
-     * @uses _loadRenderer() to load the desired renderer
-     * @todo PEAR CS - should require_once be include_once?
-     */   
-    function formatFile($file, $newFile = null, $renderer = "Plain")
-    {
-        if ($newFile == XML_BEAUTIFIER_OVERWRITE) {
-            $newFile = $file;
-        }
-
-        /**
-         * Split the document into tokens
-         * using the XML_Tokenizer
-         */
-        require_once XML_BEAUTIFIER_INCLUDE_PATH . '/Tokenizer.php';
-        $tokenizer = new XML_Beautifier_Tokenizer();
-        
-        $tokens = $tokenizer->tokenize($file, true);
-
-        if (PEAR::isError($tokens)) {
-            return $tokens;
-        }
-        
-        $renderer = $this->_loadRenderer($renderer, $this->_options);
-
-        if (PEAR::isError($renderer)) {
-            return $renderer;
-        }
-        
-        $xml = $renderer->serialize($tokens);
-        
-        if ($newFile == null) {
-            return $xml;
-        }
-        
-        $fp = @fopen($newFile, "w");
-        if (!$fp) {
-            return PEAR::raiseError("Could not write to output file", 
-                XML_BEAUTIFIER_ERROR_NO_OUTPUT_FILE);
-        }
-        
-        flock($fp, LOCK_EX);
-        fwrite($fp, $xml);
-        flock($fp, LOCK_UN);
-        fclose($fp);
-        return true;
-    }
-
-    /**
-     * format an XML string
-     *
-     * @param string $string   XML
-     * @param string $renderer the renderer type
-     *
-     * @return string formatted XML string
-     * @access public
-     * @throws PEAR_Error
-     * @todo PEAR CS - should require_once be include_once?
-     */   
-    function formatString($string, $renderer = "Plain")
-    {
-        /**
-         * Split the document into tokens
-         * using the XML_Tokenizer
-         */
-        require_once XML_BEAUTIFIER_INCLUDE_PATH . '/Tokenizer.php';
-        $tokenizer = new XML_Beautifier_Tokenizer();
-        
-        $tokens = $tokenizer->tokenize($string, false);
-
-        if (PEAR::isError($tokens)) {
-            return $tokens;
-        }
-
-        $renderer = $this->_loadRenderer($renderer, $this->_options);
-
-        if (PEAR::isError($renderer)) {
-            return $renderer;
-        }
-        
-        $xml = $renderer->serialize($tokens);
-        
-        return $xml;
-    }
-
-    /**
-     * load a renderer
-     *
-     * Renderers are used to serialize the XML tokens back 
-     * to an XML string.
-     *
-     * Renderers are located in the XML/Beautifier/Renderer directory.
-     *
-     * NOTE:  the "@" error suppression is used in this method
-     *
-     * @param string $name    name of the renderer
-     * @param array  $options options for the renderer
-     *
-     * @return object renderer
-     * @access private
-     * @throws PEAR_Error
-     */
-    function &_loadRenderer($name, $options = array())
-    {
-        $file  = XML_BEAUTIFIER_INCLUDE_PATH . "/Renderer/$name.php";
-        $class = "XML_Beautifier_Renderer_$name";
-
-        @include_once $file;
-        if (!class_exists($class)) {
-            return PEAR::raiseError("Could not load renderer.", 
-                XML_BEAUTIFIER_ERROR_UNKNOWN_RENDERER);
-        }
-
-        $renderer = &new $class($options);
-        
-        return $renderer;        
-    }
-    
-    /**
-     * return API version
-     *
-     * @access   public
-     * @static
-     * @return   string  $version API version
-     */
-    function apiVersion()
-    {
-        return "1.0";
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Beautifier/Renderer.php b/airtime_mvc/library/pear/XML/Beautifier/Renderer.php
deleted file mode 100644
index 213748524..000000000
--- a/airtime_mvc/library/pear/XML/Beautifier/Renderer.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Beautifier/Renderer
- *
- * XML Beautifier's Rendere
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Renderer.php,v 1.6 2008/08/24 19:44:14 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-
-/**
- * Renderer base class for XML_Beautifier
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.0
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-class XML_Beautifier_Renderer
-{
-    /**
-     * options
-     * @var array
-     */
-    var $_options = array();
-
-    /**
-     * create a new renderer
-     *
-     * @param array $options for the serialization
-     *
-     * @access   public
-     */
-    function XML_Beautifier_Renderer($options = array())
-    {
-        $this->_options = $options;
-    }
-    
-    /**
-     * Serialize the XML tokens
-     *
-     * @param array $tokens XML tokens
-     *
-     * @return string XML document
-     * @access public
-     * @abstract
-     */
-    function serialize($tokens)
-    {
-        return  '';
-    }
-
-    /**
-     * normalize the XML tree
-     *
-     * When normalizing an XML tree, adjacent data sections
-     * are combined to one data section.
-     *
-     * @param array $tokens XML tree as returned by the tokenizer
-     *
-     * @return array XML tree
-     * @access public
-     */
-    function normalize($tokens)
-    {
-        $tmp = array();
-        foreach ($tokens as $token) {
-            array_push($tmp, $this->_normalizeToken($token));
-        }
-        return $tmp;
-    }
-
-    /**
-     * normalize one element in the XML tree
-     *
-     * This method will combine all data sections of an element.
-     *
-     * @param array $token token array
-     *
-     * @return array $struct
-     * @access private
-     */
-    function _normalizeToken($token)
-    {
-        if ((isset($token["children"])) 
-            && !is_array($token["children"]) 
-            || empty($token["children"])
-        ) {
-            return $token;
-        }
-
-        $children          = $token["children"];
-        $token["children"] = array();
-        $cnt               = count($children);
-        $currentMode       = 0;
-        for ($i = 0; $i < $cnt; $i++ ) {
-            // no data section
-            if ($children[$i]["type"] != XML_BEAUTIFIER_CDATA 
-                && $children[$i]["type"] != XML_BEAUTIFIER_CDATA_SECTION
-            ) {
-                $children[$i] = $this->_normalizeToken($children[$i]);
-
-                $currentMode = 0;
-                array_push($token["children"], $children[$i]);
-                continue;
-            }
-
-            /*
-             * remove whitespace
-             */
-            if ($this->_options['removeLineBreaks'] == true) {
-                $children[$i]['data'] = trim($children[$i]['data']);
-                if ($children[$i]['data'] == '') {
-                    continue;
-                }
-            }
-
-            if ($currentMode == $children[$i]["type"]) {
-                $tmp = array_pop($token["children"]);
-
-                if ($children[$i]['data'] != '') {
-                    if ($tmp['data'] != '' 
-                        && $this->_options['removeLineBreaks'] == true
-                    ) {
-                        $tmp['data'] .= ' ';
-                    }
-                    $tmp["data"] .= $children[$i]["data"];
-                }
-                array_push($token["children"], $tmp);
-            } else {
-                array_push($token["children"], $children[$i]);
-            }
-
-            $currentMode = $children[$i]["type"];
-        }
-        return $token;
-    }
-
-    /**
-     * indent a text block consisting of several lines
-     *
-     * @param string  $text  textblock
-     * @param integer $depth depth to indent
-     * @param boolean $trim  trim the lines
-     *
-     * @return string indented text block
-     * @access private
-     */
-    function _indentTextBlock($text, $depth, $trim = false)
-    {
-        $indent = $this->_getIndentString($depth);
-        $tmp    = explode("\n", $text);
-        $cnt    = count($tmp);
-        $xml    = '';
-        for ($i = 0; $i < $cnt; $i++ ) {
-            if ($trim) {
-                $tmp[$i] = trim($tmp[$i]);
-            }
-            if ($tmp[$i] == '') {
-                continue;
-            }
-            $xml .= $indent.$tmp[$i].$this->_options["linebreak"];
-        }
-        return $xml;
-    }
-    
-    /**
-     * get the string that is used for indentation in a specific depth
-     *
-     * This depends on the option 'indent'.
-     *
-     * @param integer $depth nesting level
-     *
-     * @return string indent string
-     * @access private
-     */
-    function _getIndentString($depth)
-    {
-        if ($depth > 0) {
-            return str_repeat($this->_options["indent"], $depth);
-        }
-        return "";
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Beautifier/Renderer/Plain.php b/airtime_mvc/library/pear/XML/Beautifier/Renderer/Plain.php
deleted file mode 100644
index 11c1931a9..000000000
--- a/airtime_mvc/library/pear/XML/Beautifier/Renderer/Plain.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Beautifier
- *
- * XML Beautifier's Plain Renderer 
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Plain.php,v 1.7 2008/08/24 19:44:14 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-
-/**
- * XML_Util is needed to create the tags
- */
-require_once 'XML/Util.php';
-
-/**
- * Renderer base class
- */
-require_once XML_BEAUTIFIER_INCLUDE_PATH . '/Renderer.php';
-
-/**
- * Basic XML Renderer for XML Beautifier
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.0
- * @link      http://pear.php.net/package/XML_Beautifier
- * @todo      option to specify inline tags
- * @todo      option to specify treatment of whitespace in data sections
- */
-class XML_Beautifier_Renderer_Plain extends XML_Beautifier_Renderer
-{
-    /**
-     * Serialize the XML tokens
-     *
-     * @param array $tokens XML tokens
-     *
-     * @return string XML document
-     * @access public
-     */
-    function serialize($tokens)
-    {
-        $tokens = $this->normalize($tokens);
-        
-        $xml = '';
-        $cnt = count($tokens);
-        for ($i = 0; $i < $cnt; $i++) {
-            $xml .= $this->_serializeToken($tokens[$i]);
-        }
-        return $xml;
-    }
-
-    /**
-     * serialize a token
-     *
-     * This method does the actual beautifying.
-     *
-     * @param array $token structure that should be serialized
-     *
-     * @return mixed
-     * @access private 
-     * @todo split this method into smaller methods
-     */
-    function _serializeToken($token)
-    {
-        switch ($token["type"]) {
-
-        /*
-         * serialize XML Element
-         */
-        case XML_BEAUTIFIER_ELEMENT:
-            $indent = $this->_getIndentString($token["depth"]);
-
-            // adjust tag case
-            if ($this->_options["caseFolding"] === true) {
-                switch ($this->_options["caseFoldingTo"]) {
-                case "uppercase":
-                    $token["tagname"] = strtoupper($token["tagname"]);
-                    $token["attribs"] = 
-                        array_change_key_case($token["attribs"], CASE_UPPER);
-                    break;
-                case "lowercase":
-                    $token["tagname"] = strtolower($token["tagname"]);
-                    $token["attribs"] = 
-                        array_change_key_case($token["attribs"], CASE_LOWER);
-                    break;
-                }
-            }
-                
-            if ($this->_options["multilineTags"] == true) {
-                $attIndent = $indent . str_repeat(" ", 
-                    (2+strlen($token["tagname"])));
-            } else {
-                $attIndent = null;
-            }
-
-            // check for children
-            switch ($token["contains"]) {
-                    
-            // contains only CData or is empty
-            case XML_BEAUTIFIER_CDATA:
-            case XML_BEAUTIFIER_EMPTY:
-                if (sizeof($token["children"]) >= 1) {
-                    $data = $token["children"][0]["data"];
-                } else {
-                    $data = '';
-                }
-
-                if (strstr($data, "\n")) {
-                    $data = "\n" 
-                        . $this->_indentTextBlock($data, $token['depth']+1, true);
-                } 
-
-                $xml = $indent 
-                    . XML_Util::createTag($token["tagname"], 
-                    $token["attribs"], $data, null, XML_UTIL_REPLACE_ENTITIES, 
-                    $this->_options["multilineTags"], $attIndent)
-                    . $this->_options["linebreak"];
-                break;
-                // contains mixed content
-            default:
-                $xml = $indent . XML_Util::createStartElement($token["tagname"], 
-                    $token["attribs"], null, $this->_options["multilineTags"], 
-                    $attIndent) . $this->_options["linebreak"];
-                        
-                $cnt = count($token["children"]);
-                for ($i = 0; $i < $cnt; $i++) {
-                    $xml .= $this->_serializeToken($token["children"][$i]);
-                }
-                $xml .= $indent . XML_Util::createEndElement($token["tagname"])
-                    . $this->_options["linebreak"];
-                break;
-            break;
-            }
-            break;
-            
-        /*
-         * serialize CData
-         */
-        case XML_BEAUTIFIER_CDATA:
-            if ($token["depth"] > 0) {
-                $xml = str_repeat($this->_options["indent"], $token["depth"]);
-            } else {
-                $xml = "";
-            }
-
-            $xml .= XML_Util::replaceEntities($token["data"]) 
-                . $this->_options["linebreak"];
-            break;      
-
-        /*
-         * serialize CData section
-         */
-        case XML_BEAUTIFIER_CDATA_SECTION:
-            if ($token["depth"] > 0) {
-                $xml = str_repeat($this->_options["indent"], $token["depth"]);
-            } else {
-                $xml = "";
-            }
-
-            $xml .= '<![CDATA['.$token["data"].']]>' . $this->_options["linebreak"];
-            break;      
-
-        /*
-         * serialize entity
-         */
-        case XML_BEAUTIFIER_ENTITY:
-            if ($token["depth"] > 0) {
-                $xml = str_repeat($this->_options["indent"], $token["depth"]);
-            } else {
-                $xml = "";
-            }
-            $xml .= "&".$token["name"].";".$this->_options["linebreak"];
-            break;      
-
-
-        /*
-         * serialize Processing instruction
-         */
-        case XML_BEAUTIFIER_PI:
-            $indent = $this->_getIndentString($token["depth"]);
-
-            $xml = $indent."<?".$token["target"].$this->_options["linebreak"]
-                . $this->_indentTextBlock(rtrim($token["data"]), $token["depth"])
-                . $indent."?>".$this->_options["linebreak"];
-            break;      
-
-        /*
-         * comments
-         */
-        case XML_BEAUTIFIER_COMMENT:
-            $lines = count(explode("\n", $token["data"]));
-                
-            /*
-             * normalize comment, i.e. combine it to one
-             * line and remove whitespace
-             */
-            if ($this->_options["normalizeComments"] && $lines > 1) {
-                $comment = preg_replace("/\s\s+/s", " ", 
-                    str_replace("\n", " ", $token["data"]));
-                $lines   = 1;
-            } else {
-                $comment = $token["data"];
-            }
-    
-            /*
-             * check for the maximum length of one line
-             */
-            if ($this->_options["maxCommentLine"] > 0) {
-                if ($lines > 1) {
-                    $commentLines = explode("\n", $comment);
-                } else {
-                    $commentLines = array($comment);
-                }
-    
-                $comment = "";
-                for ($i = 0; $i < $lines; $i++) {
-                    if (strlen($commentLines[$i]) 
-                        <= $this->_options["maxCommentLine"]
-                    ) {
-                        $comment .= $commentLines[$i];
-                        continue;
-                    }
-                    $comment .= wordwrap($commentLines[$i], 
-                        $this->_options["maxCommentLine"]);
-                    if ($i != ($lines-1)) {
-                        $comment .= "\n";
-                    }
-                }
-                    $lines = count(explode("\n", $comment));
-            }
-
-            $indent = $this->_getIndentString($token["depth"]);
-
-            if ($lines > 1) {
-                $xml = $indent . "<!--" . $this->_options["linebreak"]
-                    . $this->_indentTextBlock($comment, $token["depth"]+1, true)
-                    . $indent . "-->" . $this->_options["linebreak"];
-            } else {
-                $xml = $indent . sprintf("<!-- %s -->", trim($comment)) 
-                    . $this->_options["linebreak"];
-            }
-            break;      
-
-        /*
-         * xml declaration
-         */
-        case XML_BEAUTIFIER_XML_DECLARATION:
-            $indent = $this->_getIndentString($token["depth"]);
-            $xml    = $indent . XML_Util::getXMLDeclaration($token["version"], 
-                $token["encoding"], $token["standalone"]);
-            break;      
-
-        /*
-         * xml declaration
-         */
-        case XML_BEAUTIFIER_DT_DECLARATION:
-            $xml = $token["data"];
-            break;      
-
-        /*
-         * all other elements
-         */
-        case XML_BEAUTIFIER_DEFAULT:
-        default:
-            $xml = XML_Util::replaceEntities($token["data"]);
-            break;      
-        }
-        return $xml;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Beautifier/Tokenizer.php b/airtime_mvc/library/pear/XML/Beautifier/Tokenizer.php
deleted file mode 100644
index 6e7ce2730..000000000
--- a/airtime_mvc/library/pear/XML/Beautifier/Tokenizer.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Beautifier/Tokenizer
- *
- * XML Beautifier package's Tokenizer
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Tokenizer.php,v 1.10 2008/08/24 19:44:14 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Beautifier
- */
-
-/**
- * XML_Parser is needed to parse the document
- */
-require_once 'XML/Parser.php';
- 
-/**
- * Tokenizer for XML_Beautifier
- *
- * This class breaks an XML document in seperate tokens
- * that will be rendered by an XML_Beautifier renderer.
- *
- * @category  XML
- * @package   XML_Beautifier
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.0
- * @link      http://pear.php.net/package/XML_Beautifier
- * @todo      tokenize DTD
- * @todo      check for xml:space attribute
- */
-class XML_Beautifier_Tokenizer extends XML_Parser
-{
-    /**
-     * current depth
-     * @var    integer
-     * @access private
-     */
-    var $_depth = 0;
-
-    /**
-     * stack for all found elements
-     * @var    array
-     * @access private
-     */
-    var $_struct = array();
-
-    /**
-     * current parsing mode
-     * @var    string
-     * @access private  
-     */
-    var $_mode = "xml";
-    
-    /**
-     * indicates, whether parser is in cdata section
-     * @var    boolean
-     * @access private  
-     */
-    var $_inCDataSection = false;
-
-    /**
-     * Tokenize a document
-     *
-     * @param string  $document filename or XML document
-     * @param boolean $isFile   flag to indicate whether 
-     *                          the first parameter is a file
-     *
-     * @return mixed
-     */
-    function tokenize($document, $isFile = true)
-    {
-        $this->folding = false;
-        $this->XML_Parser();
-        $this->_resetVars();
-        
-        if ($isFile === true) {
-            $this->setInputFile($document);
-            $result = $this->parse();
-        } else {
-            $result = $this->parseString($document);
-        }
-        
-        if ($this->isError($result)) {
-            return $result;
-        }
-
-        return $this->_struct;
-    }
-    
-    /**
-     * Start element handler for XML parser
-     *
-     * @param object $parser  XML parser object
-     * @param string $element XML element
-     * @param array  $attribs attributes of XML tag
-     *
-     * @return void
-     * @access protected
-     */
-    function startHandler($parser, $element, $attribs)
-    {
-        $struct = array(
-            "type"     => XML_BEAUTIFIER_ELEMENT,
-            "tagname"  => $element,
-            "attribs"  => $attribs,
-            "contains" => XML_BEAUTIFIER_EMPTY,
-            "depth"    => $this->_depth++,
-            "children" => array()
-        );
-
-        array_push($this->_struct, $struct);
-    }
-
-    /**
-     * End element handler for XML parser
-     *
-     * @param object $parser  XML parser object
-     * @param string $element element
-     *
-     * @return void
-     * @access protected
-     */
-    function endHandler($parser, $element)
-    {
-        $struct = array_pop($this->_struct);
-        if ($struct["depth"] > 0) { 
-            $parent = array_pop($this->_struct);
-            array_push($parent["children"], $struct);
-            $parent["contains"] = $parent["contains"] | XML_BEAUTIFIER_ELEMENT;
-            array_push($this->_struct, $parent);
-        } else {
-            array_push($this->_struct, $struct);
-        }
-        $this->_depth--;
-    }
-
-    /**
-     * Handler for character data
-     *
-     * @param object $parser XML parser object
-     * @param string $cdata  CDATA
-     *
-     * @return void
-     * @access protected
-     */
-    function cdataHandler($parser, $cdata)
-    {
-        if ((string)$cdata === '') {
-            return true;
-        }
-
-        if ($this->_inCDataSection === true) {
-            $type = XML_BEAUTIFIER_CDATA_SECTION;
-        } else {
-            $type = XML_BEAUTIFIER_CDATA;
-        }
-
-        $struct = array(
-            "type"  => $type,
-            "data"  => $cdata,
-            "depth" => $this->_depth
-        );
-
-        $this->_appendToParent($struct);
-    }
-
-    /**
-     * Handler for processing instructions
-     *
-     * @param object $parser XML parser object
-     * @param string $target target
-     * @param string $data   data
-     *
-     * @return void
-     * @access protected
-     */
-    function piHandler($parser, $target, $data)
-    {
-        $struct = array(
-            "type"    => XML_BEAUTIFIER_PI,
-            "target"  => $target,
-            "data"    => $data,
-            "depth"   => $this->_depth
-        );
-
-        $this->_appendToParent($struct);
-    }
-    
-    /**
-     * Handler for external entities
-     *
-     * @param object $parser            XML parser object
-     * @param string $open_entity_names entity name
-     * @param string $base              ?? (unused?)
-     * @param string $system_id         ?? (unused?)
-     * @param string $public_id         ?? (unused?)
-     *
-     * @return bool
-     * @access protected
-     * @todo revisit parameter signature... doesn't seem to be correct
-     * @todo PEAR CS - need to shorten arg list for 85-char rule
-     */
-    function entityrefHandler($parser, $open_entity_names, $base, $system_id, $public_id)
-    {
-        $struct = array(
-            "type"    => XML_BEAUTIFIER_ENTITY,
-            "name"    => $open_entity_names,
-            "depth"   => $this->_depth
-        );
-
-        $this->_appendToParent($struct);
-        return true;
-    }
-
-    /**
-     * Handler for all other stuff
-     *
-     * @param object $parser XML parser object
-     * @param string $data   data
-     *
-     * @return void
-     * @access protected
-     */
-    function defaultHandler($parser, $data)
-    {
-        switch ($this->_mode) {
-        case "xml":
-            $this->_handleXMLDefault($data);
-            break;
-        case "doctype":
-            $this->_handleDoctype($data);
-            break;
-        }
-    }
-
-    /**
-     * handler for all data inside the doctype declaration
-     *
-     * @param string $data data
-     *
-     * @return void
-     * @access private
-     * @todo improve doctype parsing to split the declaration into seperate tokens
-     */
-    function _handleDoctype($data)
-    {
-        if (eregi(">", $data)) {
-            $last = $this->_getLastToken();
-            if ($last["data"] == "]" ) {
-                $this->_mode = "xml";
-            }
-        }
-
-        $struct = array(
-            "type"    => XML_BEAUTIFIER_DT_DECLARATION,
-            "data"    => $data,
-            "depth"   => $this->_depth
-        );
-        $this->_appendToParent($struct);
-    }
-    
-    /**
-     * handler for all default XML data
-     *
-     * @param string $data data
-     *
-     * @return bool
-     * @access private
-     */    
-    function _handleXMLDefault($data)
-    {
-        if (strncmp("<!--", $data, 4) == 0) {
-
-            /*
-             * handle comment
-             */
-            $regs = array();
-            eregi("<!--(.+)-->", $data, $regs);
-            $comment = trim($regs[1]);
-            
-            $struct = array(
-                "type"    => XML_BEAUTIFIER_COMMENT,
-                "data"    => $comment,
-                "depth"   => $this->_depth
-            );
-
-        } elseif ($data == "<![CDATA[") {
-            /*
-             * handle start of cdata section
-             */
-            $this->_inCDataSection = true;
-            $struct                = null;
-
-        } elseif ($data == "]]>") {
-            /*
-             * handle end of cdata section
-             */
-            $this->_inCDataSection = false;
-            $struct                = null;
-
-        } elseif (strncmp("<?", $data, 2) == 0) {
-            /*
-             * handle XML declaration
-             */
-            preg_match_all('/([a-zA-Z_]+)="((?:\\\.|[^"\\\])*)"/', $data, $match);
-            $cnt     = count($match[1]);
-            $attribs = array();
-            for ($i = 0; $i < $cnt; $i++) {
-                $attribs[$match[1][$i]] = $match[2][$i];
-            }
-
-            if (!isset($attribs["version"])) {
-                $attribs["version"] = "1.0";
-            }
-            if (!isset($attribs["encoding"])) {
-                $attribs["encoding"] = "UTF-8";
-            }
-            if (!isset($attribs["standalone"])) {
-                $attribs["standalone"] = true;
-            } else {
-                if ($attribs["standalone"] === 'yes') {
-                    $attribs["standalone"] = true;
-                } else {
-                    $attribs["standalone"] = false;
-                }
-            }
-            
-            $struct = array(
-                "type"       => XML_BEAUTIFIER_XML_DECLARATION,
-                "version"    => $attribs["version"],
-                "encoding"   => $attribs["encoding"],
-                "standalone" => $attribs["standalone"],
-                "depth"      => $this->_depth
-            );
-
-        } elseif (eregi("^<!DOCTYPE", $data)) {
-            $this->_mode = "doctype";
-            $struct      = array(
-                "type"    => XML_BEAUTIFIER_DT_DECLARATION,
-                "data"    => $data,
-                "depth"   => $this->_depth
-            );
-
-        } else {
-            /*
-             * handle all other data
-             */
-            $struct = array(
-                "type"    => XML_BEAUTIFIER_DEFAULT,
-                "data"    => $data,
-                "depth"   => $this->_depth
-            );
-        }
-        
-        if (!is_null($struct)) {
-            $this->_appendToParent($struct);
-        }
-        return true;
-    }
-    
-    /**
-     * append a struct to the last struct on the stack
-     *
-     * @param array $struct structure to append
-     *
-     * @return bool
-     * @access private
-     */
-    function _appendToParent($struct)
-    {
-        if ($this->_depth > 0) {
-            $parent = array_pop($this->_struct);
-            array_push($parent["children"], $struct);
-            $parent["contains"] = $parent["contains"] | $struct["type"];
-            array_push($this->_struct, $parent);
-            return true;
-        }
-        array_push($this->_struct, $struct);
-    }
-
-    /**
-     * get the last token
-     *
-     * @access   private
-     * @return   array
-     */
-    function _getLastToken()
-    {
-        $parent = array_pop($this->_struct);
-        if (isset($parent["children"]) && is_array($parent["children"])) {
-            $last = array_pop($parent["children"]);
-            array_push($parent["children"], $last);
-        } else {
-            $last = $parent;
-        }
-        array_push($this->_struct, $parent);
-           
-        return $last;
-    }
-    
-    /**
-     * reset all used object properties
-     *
-     * This method is called before parsing a new document
-     *
-     * @return void
-     * @access private
-     */
-    function _resetVars()
-    {
-        $this->_depth          = 0;
-        $this->_struct         = array();
-        $this->_mode           = "xml";
-        $this->_inCDataSection = false;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Parser.php b/airtime_mvc/library/pear/XML/Parser.php
deleted file mode 100644
index ec145ba5a..000000000
--- a/airtime_mvc/library/pear/XML/Parser.php
+++ /dev/null
@@ -1,768 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Parser
- *
- * XML Parser package
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2002-2008 The PHP Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Parser
- * @author    Stig Bakken <ssb@fast.no>
- * @author    Tomas V.V.Cox <cox@idecnet.com>
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2002-2008 The PHP Group
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Parser.php,v 1.30 2008/09/16 16:06:22 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Parser
- */
-
-/**
- * uses PEAR's error handling
- */
-require_once 'PEAR.php';
-
-/**
- * resource could not be created
- */
-define('XML_PARSER_ERROR_NO_RESOURCE', 200);
-
-/**
- * unsupported mode
- */
-define('XML_PARSER_ERROR_UNSUPPORTED_MODE', 201);
-
-/**
- * invalid encoding was given
- */
-define('XML_PARSER_ERROR_INVALID_ENCODING', 202);
-
-/**
- * specified file could not be read
- */
-define('XML_PARSER_ERROR_FILE_NOT_READABLE', 203);
-
-/**
- * invalid input
- */
-define('XML_PARSER_ERROR_INVALID_INPUT', 204);
-
-/**
- * remote file cannot be retrieved in safe mode
- */
-define('XML_PARSER_ERROR_REMOTE', 205);
-
-/**
- * XML Parser class.
- *
- * This is an XML parser based on PHP's "xml" extension,
- * based on the bundled expat library.
- *
- * Notes:
- * - It requires PHP 4.0.4pl1 or greater
- * - From revision 1.17, the function names used by the 'func' mode
- *   are in the format "xmltag_$elem", for example: use "xmltag_name"
- *   to handle the <name></name> tags of your xml file.
- *          - different parsing modes
- *
- * @category  XML
- * @package   XML_Parser
- * @author    Stig Bakken <ssb@fast.no>
- * @author    Tomas V.V.Cox <cox@idecnet.com>
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2002-2008 The PHP Group
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/XML_Parser
- * @todo      create XML_Parser_Namespace to parse documents with namespaces
- * @todo      create XML_Parser_Pull
- * @todo      Tests that need to be made:
- *            - mixing character encodings
- *            - a test using all expat handlers
- *            - options (folding, output charset)
- */
-class XML_Parser extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * XML parser handle
-     *
-     * @var  resource
-     * @see  xml_parser_create()
-     */
-    var $parser;
-
-    /**
-     * File handle if parsing from a file
-     *
-     * @var  resource
-     */
-    var $fp;
-
-    /**
-     * Whether to do case folding
-     *
-     * If set to true, all tag and attribute names will
-     * be converted to UPPER CASE.
-     *
-     * @var  boolean
-     */
-    var $folding = true;
-
-    /**
-     * Mode of operation, one of "event" or "func"
-     *
-     * @var  string
-     */
-    var $mode;
-
-    /**
-     * Mapping from expat handler function to class method.
-     *
-     * @var  array
-     */
-    var $handler = array(
-        'character_data_handler'            => 'cdataHandler',
-        'default_handler'                   => 'defaultHandler',
-        'processing_instruction_handler'    => 'piHandler',
-        'unparsed_entity_decl_handler'      => 'unparsedHandler',
-        'notation_decl_handler'             => 'notationHandler',
-        'external_entity_ref_handler'       => 'entityrefHandler'
-    );
-
-    /**
-     * source encoding
-     *
-     * @var string
-     */
-    var $srcenc;
-
-    /**
-     * target encoding
-     *
-     * @var string
-     */
-    var $tgtenc;
-
-    /**
-     * handler object
-     *
-     * @var object
-     */
-    var $_handlerObj;
-
-    /**
-     * valid encodings
-     *
-     * @var array
-     */
-    var $_validEncodings = array('ISO-8859-1', 'UTF-8', 'US-ASCII');
-
-    // }}}
-    // {{{ php4 constructor
-
-    /**
-     * Creates an XML parser.
-     *
-     * This is needed for PHP4 compatibility, it will
-     * call the constructor, when a new instance is created.
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       startelement/endelement-type events, "func"
-     *                       to have it call functions named after elements
-     * @param string $tgtenc a valid target encoding
-     */
-    function XML_Parser($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        XML_Parser::__construct($srcenc, $mode, $tgtenc);
-    }
-    // }}}
-    // {{{ php5 constructor
-
-    /**
-     * PHP5 constructor
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       startelement/endelement-type events, "func"
-     *                       to have it call functions named after elements
-     * @param string $tgtenc a valid target encoding
-     */
-    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        $this->PEAR('XML_Parser_Error');
-
-        $this->mode   = $mode;
-        $this->srcenc = $srcenc;
-        $this->tgtenc = $tgtenc;
-    }
-    // }}}
-
-    /**
-     * Sets the mode of the parser.
-     *
-     * Possible modes are:
-     * - func
-     * - event
-     *
-     * You can set the mode using the second parameter
-     * in the constructor.
-     *
-     * This method is only needed, when switching to a new
-     * mode at a later point.
-     *
-     * @param string $mode mode, either 'func' or 'event'
-     *
-     * @return boolean|object  true on success, PEAR_Error otherwise
-     * @access public
-     */
-    function setMode($mode)
-    {
-        if ($mode != 'func' && $mode != 'event') {
-            $this->raiseError('Unsupported mode given', 
-                XML_PARSER_ERROR_UNSUPPORTED_MODE);
-        }
-
-        $this->mode = $mode;
-        return true;
-    }
-
-    /**
-     * Sets the object, that will handle the XML events
-     *
-     * This allows you to create a handler object independent of the
-     * parser object that you are using and easily switch the underlying
-     * parser.
-     *
-     * If no object will be set, XML_Parser assumes that you
-     * extend this class and handle the events in $this.
-     *
-     * @param object &$obj object to handle the events
-     *
-     * @return boolean will always return true
-     * @access public
-     * @since v1.2.0beta3
-     */
-    function setHandlerObj(&$obj)
-    {
-        $this->_handlerObj = &$obj;
-        return true;
-    }
-
-    /**
-     * Init the element handlers
-     *
-     * @return mixed
-     * @access private
-     */
-    function _initHandlers()
-    {
-        if (!is_resource($this->parser)) {
-            return false;
-        }
-
-        if (!is_object($this->_handlerObj)) {
-            $this->_handlerObj = &$this;
-        }
-        switch ($this->mode) {
-
-        case 'func':
-            xml_set_object($this->parser, $this->_handlerObj);
-            xml_set_element_handler($this->parser, 
-                array(&$this, 'funcStartHandler'), array(&$this, 'funcEndHandler'));
-            break;
-
-        case 'event':
-            xml_set_object($this->parser, $this->_handlerObj);
-            xml_set_element_handler($this->parser, 'startHandler', 'endHandler');
-            break;
-        default:
-            return $this->raiseError('Unsupported mode given', 
-                XML_PARSER_ERROR_UNSUPPORTED_MODE);
-            break;
-        }
-
-        /**
-         * set additional handlers for character data, entities, etc.
-         */
-        foreach ($this->handler as $xml_func => $method) {
-            if (method_exists($this->_handlerObj, $method)) {
-                $xml_func = 'xml_set_' . $xml_func;
-                $xml_func($this->parser, $method);
-            }
-        }
-    }
-
-    // {{{ _create()
-
-    /**
-     * create the XML parser resource
-     *
-     * Has been moved from the constructor to avoid
-     * problems with object references.
-     *
-     * Furthermore it allows us returning an error
-     * if something fails.
-     *
-     * NOTE: uses '@' error suppresion in this method
-     *
-     * @return bool|PEAR_Error true on success, PEAR_Error otherwise
-     * @access private
-     * @see xml_parser_create
-     */
-    function _create()
-    {
-        if ($this->srcenc === null) {
-            $xp = @xml_parser_create();
-        } else {
-            $xp = @xml_parser_create($this->srcenc);
-        }
-        if (is_resource($xp)) {
-            if ($this->tgtenc !== null) {
-                if (!@xml_parser_set_option($xp, XML_OPTION_TARGET_ENCODING, 
-                    $this->tgtenc)
-                ) {
-                    return $this->raiseError('invalid target encoding', 
-                        XML_PARSER_ERROR_INVALID_ENCODING);
-                }
-            }
-            $this->parser = $xp;
-            $result       = $this->_initHandlers($this->mode);
-            if ($this->isError($result)) {
-                return $result;
-            }
-            xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
-            return true;
-        }
-        if (!in_array(strtoupper($this->srcenc), $this->_validEncodings)) {
-            return $this->raiseError('invalid source encoding', 
-                XML_PARSER_ERROR_INVALID_ENCODING);
-        }
-        return $this->raiseError('Unable to create XML parser resource.', 
-            XML_PARSER_ERROR_NO_RESOURCE);
-    }
-
-    // }}}
-    // {{{ reset()
-
-    /**
-     * Reset the parser.
-     *
-     * This allows you to use one parser instance
-     * to parse multiple XML documents.
-     *
-     * @access   public
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     */
-    function reset()
-    {
-        $result = $this->_create();
-        if ($this->isError($result)) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ setInputFile()
-
-    /**
-     * Sets the input xml file to be parsed
-     *
-     * @param string $file Filename (full path)
-     *
-     * @return resource fopen handle of the given file
-     * @access public
-     * @throws XML_Parser_Error
-     * @see setInput(), setInputString(), parse()
-     */
-    function setInputFile($file)
-    {
-        /**
-         * check, if file is a remote file
-         */
-        if (eregi('^(http|ftp)://', substr($file, 0, 10))) {
-            if (!ini_get('allow_url_fopen')) {
-                return $this->
-                raiseError('Remote files cannot be parsed, as safe mode is enabled.',
-                XML_PARSER_ERROR_REMOTE);
-            }
-        }
-
-        $fp = @fopen($file, 'rb');
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return $fp;
-        }
-        return $this->raiseError('File could not be opened.', 
-            XML_PARSER_ERROR_FILE_NOT_READABLE);
-    }
-
-    // }}}
-    // {{{ setInputString()
-
-    /**
-     * XML_Parser::setInputString()
-     *
-     * Sets the xml input from a string
-     *
-     * @param string $data a string containing the XML document
-     *
-     * @return null
-     */
-    function setInputString($data)
-    {
-        $this->fp = $data;
-        return null;
-    }
-
-    // }}}
-    // {{{ setInput()
-
-    /**
-     * Sets the file handle to use with parse().
-     *
-     * You should use setInputFile() or setInputString() if you
-     * pass a string
-     *
-     * @param mixed $fp Can be either a resource returned from fopen(),
-     *                  a URL, a local filename or a string.
-     *
-     * @return mixed
-     * @access public
-     * @see parse()
-     * @uses setInputString(), setInputFile()
-     */
-    function setInput($fp)
-    {
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return true;
-        } elseif (eregi('^[a-z]+://', substr($fp, 0, 10))) {
-            // see if it's an absolute URL (has a scheme at the beginning)
-            return $this->setInputFile($fp);
-        } elseif (file_exists($fp)) {
-            // see if it's a local file
-            return $this->setInputFile($fp);
-        } else {
-            // it must be a string
-            $this->fp = $fp;
-            return true;
-        }
-
-        return $this->raiseError('Illegal input format', 
-            XML_PARSER_ERROR_INVALID_INPUT);
-    }
-
-    // }}}
-    // {{{ parse()
-
-    /**
-     * Central parsing function.
-     *
-     * @return bool|PEAR_Error returns true on success, or a PEAR_Error otherwise
-     * @access public
-     */
-    function parse()
-    {
-        /**
-         * reset the parser
-         */
-        $result = $this->reset();
-        if ($this->isError($result)) {
-            return $result;
-        }
-        // if $this->fp was fopened previously
-        if (is_resource($this->fp)) {
-
-            while ($data = fread($this->fp, 4096)) {
-                if (!$this->_parseString($data, feof($this->fp))) {
-                    $error = &$this->raiseError();
-                    $this->free();
-                    return $error;
-                }
-            }
-        } else {
-            // otherwise, $this->fp must be a string
-            if (!$this->_parseString($this->fp, true)) {
-                $error = &$this->raiseError();
-                $this->free();
-                return $error;
-            }
-        }
-        $this->free();
-
-        return true;
-    }
-
-    /**
-     * XML_Parser::_parseString()
-     *
-     * @param string $data data
-     * @param bool   $eof  end-of-file flag
-     *
-     * @return bool
-     * @access private
-     * @see parseString()
-     **/
-    function _parseString($data, $eof = false)
-    {
-        return xml_parse($this->parser, $data, $eof);
-    }
-
-    // }}}
-    // {{{ parseString()
-
-    /**
-     * XML_Parser::parseString()
-     *
-     * Parses a string.
-     *
-     * @param string  $data XML data
-     * @param boolean $eof  If set and TRUE, data is the last piece 
-     *                      of data sent in this parser
-     *
-     * @return bool|PEAR_Error true on success or a PEAR Error
-     * @throws XML_Parser_Error
-     * @see _parseString()
-     */
-    function parseString($data, $eof = false)
-    {
-        if (!isset($this->parser) || !is_resource($this->parser)) {
-            $this->reset();
-        }
-
-        if (!$this->_parseString($data, $eof)) {
-            $error = &$this->raiseError();
-            $this->free();
-            return $error;
-        }
-
-        if ($eof === true) {
-            $this->free();
-        }
-        return true;
-    }
-
-    /**
-     * XML_Parser::free()
-     *
-     * Free the internal resources associated with the parser
-     *
-     * @return null
-     **/
-    function free()
-    {
-        if (isset($this->parser) && is_resource($this->parser)) {
-            xml_parser_free($this->parser);
-            unset( $this->parser );
-        }
-        if (isset($this->fp) && is_resource($this->fp)) {
-            fclose($this->fp);
-        }
-        unset($this->fp);
-        return null;
-    }
-
-    /**
-     * XML_Parser::raiseError()
-     *
-     * Throws a XML_Parser_Error
-     *
-     * @param string  $msg   the error message
-     * @param integer $ecode the error message code
-     *
-     * @return XML_Parser_Error reference to the error object
-     **/
-    function &raiseError($msg = null, $ecode = 0)
-    {
-        $msg = !is_null($msg) ? $msg : $this->parser;
-        $err = &new XML_Parser_Error($msg, $ecode);
-        return parent::raiseError($err);
-    }
-
-    // }}}
-    // {{{ funcStartHandler()
-
-    /**
-     * derives and calls the Start Handler function
-     *
-     * @param mixed $xp      ??
-     * @param mixed $elem    ??
-     * @param mixed $attribs ??
-     *
-     * @return void
-     */
-    function funcStartHandler($xp, $elem, $attribs)
-    {
-        $func = 'xmltag_' . $elem;
-        $func = str_replace(array('.', '-', ':'), '_', $func);
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem, $attribs);
-        } elseif (method_exists($this->_handlerObj, 'xmltag')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag'), 
-                $xp, $elem, $attribs);
-        }
-    }
-
-    // }}}
-    // {{{ funcEndHandler()
-
-    /**
-     * derives and calls the End Handler function
-     *
-     * @param mixed $xp   ??
-     * @param mixed $elem ??
-     *
-     * @return void
-     */
-    function funcEndHandler($xp, $elem)
-    {
-        $func = 'xmltag_' . $elem . '_';
-        $func = str_replace(array('.', '-', ':'), '_', $func);
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem);
-        } elseif (method_exists($this->_handlerObj, 'xmltag_')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag_'), $xp, $elem);
-        }
-    }
-
-    // }}}
-    // {{{ startHandler()
-
-    /**
-     * abstract method signature for Start Handler
-     *
-     * @param mixed $xp       ??
-     * @param mixed $elem     ??
-     * @param mixed &$attribs ??
-     *
-     * @return null
-     * @abstract
-     */
-    function startHandler($xp, $elem, &$attribs)
-    {
-        return null;
-    }
-
-    // }}}
-    // {{{ endHandler()
-
-    /**
-     * abstract method signature for End Handler
-     *
-     * @param mixed $xp   ??
-     * @param mixed $elem ??
-     *
-     * @return null
-     * @abstract
-     */
-    function endHandler($xp, $elem)
-    {
-        return null;
-    }
-
-
-    // }}}me
-}
-
-/**
- * error class, replaces PEAR_Error
- *
- * An instance of this class will be returned
- * if an error occurs inside XML_Parser.
- *
- * There are three advantages over using the standard PEAR_Error:
- * - All messages will be prefixed
- * - check for XML_Parser error, using is_a( $error, 'XML_Parser_Error' )
- * - messages can be generated from the xml_parser resource
- *
- * @category  XML
- * @package   XML_Parser
- * @author    Stig Bakken <ssb@fast.no>
- * @author    Tomas V.V.Cox <cox@idecnet.com>
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2002-2008 The PHP Group
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/XML_Parser
- * @see       PEAR_Error
- */
-class XML_Parser_Error extends PEAR_Error
-{
-    // {{{ properties
-
-    /**
-    * prefix for all messages
-    *
-    * @var      string
-    */
-    var $error_message_prefix = 'XML_Parser: ';
-
-    // }}}
-    // {{{ constructor()
-    /**
-    * construct a new error instance
-    *
-    * You may either pass a message or an xml_parser resource as first
-    * parameter. If a resource has been passed, the last error that
-    * happened will be retrieved and returned.
-    *
-    * @param string|resource $msgorparser message or parser resource
-    * @param integer         $code        error code
-    * @param integer         $mode        error handling
-    * @param integer         $level       error level
-    *
-    * @access   public
-    * @todo PEAR CS - can't meet 85char line limit without arg refactoring
-    */
-    function XML_Parser_Error($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
-    {
-        if (is_resource($msgorparser)) {
-            $code        = xml_get_error_code($msgorparser);
-            $msgorparser = sprintf('%s at XML input line %d:%d',
-                xml_error_string($code),
-                xml_get_current_line_number($msgorparser),
-                xml_get_current_column_number($msgorparser));
-        }
-        $this->PEAR_Error($msgorparser, $code, $mode, $level);
-    }
-    // }}}
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Parser/Simple.php b/airtime_mvc/library/pear/XML/Parser/Simple.php
deleted file mode 100644
index 2ba9fb513..000000000
--- a/airtime_mvc/library/pear/XML/Parser/Simple.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Parser
- *
- * XML Parser's Simple parser class 
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2002-2008 The PHP Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Parser
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2004-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Simple.php,v 1.7 2008/08/24 21:48:21 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Parser
- */
-
-/**
- * built on XML_Parser
- */
-require_once 'XML/Parser.php';
-
-/**
- * Simple XML parser class.
- *
- * This class is a simplified version of XML_Parser.
- * In most XML applications the real action is executed,
- * when a closing tag is found.
- *
- * XML_Parser_Simple allows you to just implement one callback
- * for each tag that will receive the tag with its attributes
- * and CData.
- *
- * <code>
- * require_once '../Parser/Simple.php';
- *
- * class myParser extends XML_Parser_Simple
- * {
- *     function myParser()
- *     {
- *        $this->XML_Parser_Simple();
- *      }
- * 
- *    function handleElement($name, $attribs, $data)
- *     {
- *         printf('handle %s<br>', $name);
- *     }
- * }
- * 
- * $p = &new myParser();
- * 
- * $result = $p->setInputFile('myDoc.xml');
- * $result = $p->parse();
- * </code>
- *
- * @category  XML
- * @package   XML_Parser
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2004-2008 The PHP Group
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/XML_Parser
- */
-class XML_Parser_Simple extends XML_Parser
-{
-    /**
-     * element stack
-     *
-     * @access   private
-     * @var      array
-     */
-    var $_elStack = array();
-
-    /**
-     * all character data
-     *
-     * @access   private
-     * @var      array
-     */
-    var $_data = array();
-
-    /**
-     * element depth
-     *
-     * @access   private
-     * @var      integer
-     */
-    var $_depth = 0;
-
-    /**
-     * Mapping from expat handler function to class method.
-     *
-     * @var  array
-     */
-    var $handler = array(
-        'default_handler'                   => 'defaultHandler',
-        'processing_instruction_handler'    => 'piHandler',
-        'unparsed_entity_decl_handler'      => 'unparsedHandler',
-        'notation_decl_handler'             => 'notationHandler',
-        'external_entity_ref_handler'       => 'entityrefHandler'
-    );
-    
-    /**
-     * Creates an XML parser.
-     *
-     * This is needed for PHP4 compatibility, it will
-     * call the constructor, when a new instance is created.
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       handleElement(), "func" to have it call functions
-     *                       named after elements (handleElement_$name())
-     * @param string $tgtenc a valid target encoding
-     */
-    function XML_Parser_Simple($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        $this->XML_Parser($srcenc, $mode, $tgtenc);
-    }
-
-    /**
-     * inits the handlers
-     *
-     * @return mixed
-     * @access private
-     */
-    function _initHandlers()
-    {
-        if (!is_object($this->_handlerObj)) {
-            $this->_handlerObj = &$this;
-        }
-
-        if ($this->mode != 'func' && $this->mode != 'event') {
-            return $this->raiseError('Unsupported mode given', 
-                XML_PARSER_ERROR_UNSUPPORTED_MODE);
-        }
-        xml_set_object($this->parser, $this->_handlerObj);
-
-        xml_set_element_handler($this->parser, array(&$this, 'startHandler'), 
-            array(&$this, 'endHandler'));
-        xml_set_character_data_handler($this->parser, array(&$this, 'cdataHandler'));
-        
-        /**
-         * set additional handlers for character data, entities, etc.
-         */
-        foreach ($this->handler as $xml_func => $method) {
-            if (method_exists($this->_handlerObj, $method)) {
-                $xml_func = 'xml_set_' . $xml_func;
-                $xml_func($this->parser, $method);
-            }
-        }
-    }
-
-    /**
-     * Reset the parser.
-     *
-     * This allows you to use one parser instance
-     * to parse multiple XML documents.
-     *
-     * @access   public
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     */
-    function reset()
-    {
-        $this->_elStack = array();
-        $this->_data    = array();
-        $this->_depth   = 0;
-        
-        $result = $this->_create();
-        if ($this->isError($result)) {
-            return $result;
-        }
-        return true;
-    }
-
-    /**
-     * start handler
-     *
-     * Pushes attributes and tagname onto a stack
-     *
-     * @param resource $xp       xml parser resource
-     * @param string   $elem     element name
-     * @param array    &$attribs attributes
-     *
-     * @return mixed
-     * @access private
-     * @final
-     */
-    function startHandler($xp, $elem, &$attribs)
-    {
-        array_push($this->_elStack, array(
-            'name'    => $elem,
-            'attribs' => $attribs
-        ));
-        $this->_depth++;
-        $this->_data[$this->_depth] = '';
-    }
-
-    /**
-     * end handler
-     *
-     * Pulls attributes and tagname from a stack
-     *
-     * @param resource $xp   xml parser resource
-     * @param string   $elem element name
-     *
-     * @return mixed
-     * @access private
-     * @final
-     */
-    function endHandler($xp, $elem)
-    {
-        $el   = array_pop($this->_elStack);
-        $data = $this->_data[$this->_depth];
-        $this->_depth--;
-
-        switch ($this->mode) {
-        case 'event':
-            $this->_handlerObj->handleElement($el['name'], $el['attribs'], $data);
-            break;
-        case 'func':
-            $func = 'handleElement_' . $elem;
-            if (strchr($func, '.')) {
-                $func = str_replace('.', '_', $func);
-            }
-            if (method_exists($this->_handlerObj, $func)) {
-                call_user_func(array(&$this->_handlerObj, $func), 
-                    $el['name'], $el['attribs'], $data);
-            }
-            break;
-        }
-    }
-
-    /**
-     * handle character data
-     *
-     * @param resource $xp   xml parser resource
-     * @param string   $data data
-     *
-     * @return void
-     * @access private
-     * @final
-     */
-    function cdataHandler($xp, $data)
-    {
-        $this->_data[$this->_depth] .= $data;
-    }
-
-    /**
-     * handle a tag
-     *
-     * Implement this in your parser 
-     *
-     * @param string $name    element name
-     * @param array  $attribs attributes
-     * @param string $data    character data
-     *
-     * @return void
-     * @access public
-     * @abstract
-     */
-    function handleElement($name, $attribs, $data)
-    {
-    }
-
-    /**
-     * get the current tag depth
-     *
-     * The root tag is in depth 0.
-     *
-     * @access   public
-     * @return   integer
-     */
-    function getCurrentDepth()
-    {
-        return $this->_depth;
-    }
-
-    /**
-     * add some string to the current ddata.
-     *
-     * This is commonly needed, when a document is parsed recursively.
-     *
-     * @param string $data data to add
-     *
-     * @return void
-     * @access public
-     */
-    function addToData($data)
-    {
-        $this->_data[$this->_depth] .= $data;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/RPC.php b/airtime_mvc/library/pear/XML/RPC.php
deleted file mode 100644
index 463d947fb..000000000
--- a/airtime_mvc/library/pear/XML/RPC.php
+++ /dev/null
@@ -1,2053 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP implementation of the XML-RPC protocol
- *
- * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
- * It has support for HTTP transport, proxies and authentication.
- *
- * PHP versions 4 and 5
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    SVN: $Id: RPC.php 300961 2010-07-03 02:17:34Z danielc $
- * @link       http://pear.php.net/package/XML_RPC
- */
-
-
-if (!function_exists('xml_parser_create')) {
-    include_once 'PEAR.php';
-    PEAR::loadExtension('xml');
-}
-
-/**#@+
- * Error constants
- */
-/**
- * Parameter values don't match parameter types
- */
-define('XML_RPC_ERROR_INVALID_TYPE', 101);
-/**
- * Parameter declared to be numeric but the values are not
- */
-define('XML_RPC_ERROR_NON_NUMERIC_FOUND', 102);
-/**
- * Communication error
- */
-define('XML_RPC_ERROR_CONNECTION_FAILED', 103);
-/**
- * The array or struct has already been started
- */
-define('XML_RPC_ERROR_ALREADY_INITIALIZED', 104);
-/**
- * Incorrect parameters submitted
- */
-define('XML_RPC_ERROR_INCORRECT_PARAMS', 105);
-/**
- * Programming error by developer
- */
-define('XML_RPC_ERROR_PROGRAMMING', 106);
-/**#@-*/
-
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_I4']
- */
-$GLOBALS['XML_RPC_I4'] = 'i4';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Int']
- */
-$GLOBALS['XML_RPC_Int'] = 'int';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Boolean']
- */
-$GLOBALS['XML_RPC_Boolean'] = 'boolean';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Double']
- */
-$GLOBALS['XML_RPC_Double'] = 'double';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_String']
- */
-$GLOBALS['XML_RPC_String'] = 'string';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_DateTime']
- */
-$GLOBALS['XML_RPC_DateTime'] = 'dateTime.iso8601';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Base64']
- */
-$GLOBALS['XML_RPC_Base64'] = 'base64';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Array']
- */
-$GLOBALS['XML_RPC_Array'] = 'array';
-
-/**
- * Data types
- * @global string $GLOBALS['XML_RPC_Struct']
- */
-$GLOBALS['XML_RPC_Struct'] = 'struct';
-
-
-/**
- * Data type meta-types
- * @global array $GLOBALS['XML_RPC_Types']
- */
-$GLOBALS['XML_RPC_Types'] = array(
-    $GLOBALS['XML_RPC_I4']       => 1,
-    $GLOBALS['XML_RPC_Int']      => 1,
-    $GLOBALS['XML_RPC_Boolean']  => 1,
-    $GLOBALS['XML_RPC_String']   => 1,
-    $GLOBALS['XML_RPC_Double']   => 1,
-    $GLOBALS['XML_RPC_DateTime'] => 1,
-    $GLOBALS['XML_RPC_Base64']   => 1,
-    $GLOBALS['XML_RPC_Array']    => 2,
-    $GLOBALS['XML_RPC_Struct']   => 3,
-);
-
-
-/**
- * Error message numbers
- * @global array $GLOBALS['XML_RPC_err']
- */
-$GLOBALS['XML_RPC_err'] = array(
-    'unknown_method'      => 1,
-    'invalid_return'      => 2,
-    'incorrect_params'    => 3,
-    'introspect_unknown'  => 4,
-    'http_error'          => 5,
-    'not_response_object' => 6,
-    'invalid_request'     => 7,
-);
-
-/**
- * Error message strings
- * @global array $GLOBALS['XML_RPC_str']
- */
-$GLOBALS['XML_RPC_str'] = array(
-    'unknown_method'      => 'Unknown method',
-    'invalid_return'      => 'Invalid return payload: enable debugging to examine incoming payload',
-    'incorrect_params'    => 'Incorrect parameters passed to method',
-    'introspect_unknown'  => 'Can\'t introspect: method unknown',
-    'http_error'          => 'Didn\'t receive 200 OK from remote server.',
-    'not_response_object' => 'The requested method didn\'t return an XML_RPC_Response object.',
-    'invalid_request'     => 'Invalid request payload',
-);
-
-
-/**
- * Default XML encoding (ISO-8859-1, UTF-8 or US-ASCII)
- * @global string $GLOBALS['XML_RPC_defencoding']
- */
-$GLOBALS['XML_RPC_defencoding'] = 'UTF-8';
-
-/**
- * User error codes start at 800
- * @global int $GLOBALS['XML_RPC_erruser']
- */
-$GLOBALS['XML_RPC_erruser'] = 800;
-
-/**
- * XML parse error codes start at 100
- * @global int $GLOBALS['XML_RPC_errxml']
- */
-$GLOBALS['XML_RPC_errxml'] = 100;
-
-
-/**
- * Compose backslashes for escaping regexp
- * @global string $GLOBALS['XML_RPC_backslash']
- */
-$GLOBALS['XML_RPC_backslash'] = chr(92) . chr(92);
-
-
-/**
- * Should we automatically base64 encode strings that contain characters
- * which can cause PHP's SAX-based XML parser to break?
- * @global boolean $GLOBALS['XML_RPC_auto_base64']
- */
-$GLOBALS['XML_RPC_auto_base64'] = false;
-
-
-/**
- * Valid parents of XML elements
- * @global array $GLOBALS['XML_RPC_valid_parents']
- */
-$GLOBALS['XML_RPC_valid_parents'] = array(
-    'BOOLEAN' => array('VALUE'),
-    'I4' => array('VALUE'),
-    'INT' => array('VALUE'),
-    'STRING' => array('VALUE'),
-    'DOUBLE' => array('VALUE'),
-    'DATETIME.ISO8601' => array('VALUE'),
-    'BASE64' => array('VALUE'),
-    'ARRAY' => array('VALUE'),
-    'STRUCT' => array('VALUE'),
-    'PARAM' => array('PARAMS'),
-    'METHODNAME' => array('METHODCALL'),
-    'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
-    'MEMBER' => array('STRUCT'),
-    'NAME' => array('MEMBER'),
-    'DATA' => array('ARRAY'),
-    'FAULT' => array('METHODRESPONSE'),
-    'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
-);
-
-
-/**
- * Stores state during parsing
- *
- * quick explanation of components:
- *   + ac     = accumulates values
- *   + qt     = decides if quotes are needed for evaluation
- *   + cm     = denotes struct or array (comma needed)
- *   + isf    = indicates a fault
- *   + lv     = indicates "looking for a value": implements the logic
- *               to allow values with no types to be strings
- *   + params = stores parameters in method calls
- *   + method = stores method name
- *
- * @global array $GLOBALS['XML_RPC_xh']
- */
-$GLOBALS['XML_RPC_xh'] = array();
-
-
-/**
- * Start element handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_se($parser_resource, $name, $attrs)
-{
-    global $XML_RPC_xh, $XML_RPC_valid_parents;
-
-    $parser = (int) $parser_resource;
-
-    // if invalid xmlrpc already detected, skip all processing
-    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
-        return;
-    }
-
-    // check for correct element nesting
-    // top level element can only be of 2 types
-    if (count($XML_RPC_xh[$parser]['stack']) == 0) {
-        if ($name != 'METHODRESPONSE' && $name != 'METHODCALL') {
-            $XML_RPC_xh[$parser]['isf'] = 2;
-            $XML_RPC_xh[$parser]['isf_reason'] = 'missing top level xmlrpc element';
-            return;
-        }
-    } else {
-        // not top level element: see if parent is OK
-        if (!in_array($XML_RPC_xh[$parser]['stack'][0], $XML_RPC_valid_parents[$name])) {
-            $name = preg_replace('@[^a-zA-Z0-9._-]@', '', $name);
-            $XML_RPC_xh[$parser]['isf'] = 2;
-            $XML_RPC_xh[$parser]['isf_reason'] = "xmlrpc element $name cannot be child of {$XML_RPC_xh[$parser]['stack'][0]}";
-            return;
-        }
-    }
-
-    switch ($name) {
-    case 'STRUCT':
-        $XML_RPC_xh[$parser]['cm']++;
-
-        // turn quoting off
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array();
-        $cur_val['value'] = array();
-        $cur_val['members'] = 1;
-        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        break;
-
-    case 'ARRAY':
-        $XML_RPC_xh[$parser]['cm']++;
-
-        // turn quoting off
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array();
-        $cur_val['value'] = array();
-        $cur_val['members'] = 0;
-        array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        break;
-
-    case 'NAME':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        break;
-
-    case 'FAULT':
-        $XML_RPC_xh[$parser]['isf'] = 1;
-        break;
-
-    case 'PARAM':
-        $XML_RPC_xh[$parser]['valuestack'] = array();
-        break;
-
-    case 'VALUE':
-        $XML_RPC_xh[$parser]['lv'] = 1;
-        $XML_RPC_xh[$parser]['vt'] = $GLOBALS['XML_RPC_String'];
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        // look for a value: if this is still 1 by the
-        // time we reach the first data segment then the type is string
-        // by implication and we need to add in a quote
-        break;
-
-    case 'I4':
-    case 'INT':
-    case 'STRING':
-    case 'BOOLEAN':
-    case 'DOUBLE':
-    case 'DATETIME.ISO8601':
-    case 'BASE64':
-        $XML_RPC_xh[$parser]['ac'] = ''; // reset the accumulator
-
-        if ($name == 'DATETIME.ISO8601' || $name == 'STRING') {
-            $XML_RPC_xh[$parser]['qt'] = 1;
-
-            if ($name == 'DATETIME.ISO8601') {
-                $XML_RPC_xh[$parser]['vt'] = $GLOBALS['XML_RPC_DateTime'];
-            }
-
-        } elseif ($name == 'BASE64') {
-            $XML_RPC_xh[$parser]['qt'] = 2;
-        } else {
-            // No quoting is required here -- but
-            // at the end of the element we must check
-            // for data format errors.
-            $XML_RPC_xh[$parser]['qt'] = 0;
-        }
-        break;
-
-    case 'MEMBER':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        break;
-
-    case 'DATA':
-    case 'METHODCALL':
-    case 'METHODNAME':
-    case 'METHODRESPONSE':
-    case 'PARAMS':
-        // valid elements that add little to processing
-        break;
-    }
-
-
-    // Save current element to stack
-    array_unshift($XML_RPC_xh[$parser]['stack'], $name);
-
-    if ($name != 'VALUE') {
-        $XML_RPC_xh[$parser]['lv'] = 0;
-    }
-}
-
-/**
- * End element handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_ee($parser_resource, $name)
-{
-    global $XML_RPC_xh;
-
-    $parser = (int) $parser_resource;
-
-    if ($XML_RPC_xh[$parser]['isf'] >= 2) {
-        return;
-    }
-
-    // push this element from stack
-    // NB: if XML validates, correct opening/closing is guaranteed and
-    // we do not have to check for $name == $curr_elem.
-    // we also checked for proper nesting at start of elements...
-    $curr_elem = array_shift($XML_RPC_xh[$parser]['stack']);
-
-    switch ($name) {
-    case 'STRUCT':
-    case 'ARRAY':
-    $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-    $XML_RPC_xh[$parser]['value'] = $cur_val['value'];
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-        $XML_RPC_xh[$parser]['cm']--;
-        break;
-
-    case 'NAME':
-    $XML_RPC_xh[$parser]['valuestack'][0]['name'] = $XML_RPC_xh[$parser]['ac'];
-        break;
-
-    case 'BOOLEAN':
-        // special case here: we translate boolean 1 or 0 into PHP
-        // constants true or false
-        if ($XML_RPC_xh[$parser]['ac'] == '1') {
-            $XML_RPC_xh[$parser]['ac'] = 'true';
-        } else {
-            $XML_RPC_xh[$parser]['ac'] = 'false';
-        }
-
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-        // Drop through intentionally.
-
-    case 'I4':
-    case 'INT':
-    case 'STRING':
-    case 'DOUBLE':
-    case 'DATETIME.ISO8601':
-    case 'BASE64':
-        if ($XML_RPC_xh[$parser]['qt'] == 1) {
-            // we use double quotes rather than single so backslashification works OK
-            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-        } elseif ($XML_RPC_xh[$parser]['qt'] == 2) {
-            $XML_RPC_xh[$parser]['value'] = base64_decode($XML_RPC_xh[$parser]['ac']);
-        } elseif ($name == 'BOOLEAN') {
-            $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-        } else {
-            // we have an I4, INT or a DOUBLE
-            // we must check that only 0123456789-.<space> are characters here
-            if (!preg_match("@^[+-]?[0123456789 \t\.]+$@", $XML_RPC_xh[$parser]['ac'])) {
-                XML_RPC_Base::raiseError('Non-numeric value received in INT or DOUBLE',
-                                         XML_RPC_ERROR_NON_NUMERIC_FOUND);
-                $XML_RPC_xh[$parser]['value'] = XML_RPC_ERROR_NON_NUMERIC_FOUND;
-            } else {
-                // it's ok, add it on
-                $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-            }
-        }
-
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        $XML_RPC_xh[$parser]['lv'] = 3; // indicate we've found a value
-        break;
-
-    case 'VALUE':
-        if ($XML_RPC_xh[$parser]['vt'] == $GLOBALS['XML_RPC_String']) {
-            if (strlen($XML_RPC_xh[$parser]['ac']) > 0) {
-                $XML_RPC_xh[$parser]['value'] = $XML_RPC_xh[$parser]['ac'];
-            } elseif ($XML_RPC_xh[$parser]['lv'] == 1) {
-                // The <value> element was empty.
-                $XML_RPC_xh[$parser]['value'] = '';
-            }
-        }
-
-        $temp = new XML_RPC_Value($XML_RPC_xh[$parser]['value'], $XML_RPC_xh[$parser]['vt']);
-
-        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-        if (is_array($cur_val)) {
-            if ($cur_val['members']==0) {
-                $cur_val['value'][] = $temp;
-            } else {
-                $XML_RPC_xh[$parser]['value'] = $temp;
-            }
-            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        } else {
-            $XML_RPC_xh[$parser]['value'] = $temp;
-        }
-        break;
-
-    case 'MEMBER':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-
-        $cur_val = array_shift($XML_RPC_xh[$parser]['valuestack']);
-        if (is_array($cur_val)) {
-            if ($cur_val['members']==1) {
-                $cur_val['value'][$cur_val['name']] = $XML_RPC_xh[$parser]['value'];
-            }
-            array_unshift($XML_RPC_xh[$parser]['valuestack'], $cur_val);
-        }
-        break;
-
-    case 'DATA':
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = 0;
-        break;
-
-    case 'PARAM':
-        $XML_RPC_xh[$parser]['params'][] = $XML_RPC_xh[$parser]['value'];
-        break;
-
-    case 'METHODNAME':
-    case 'RPCMETHODNAME':
-        $XML_RPC_xh[$parser]['method'] = preg_replace("@^[\n\r\t ]+@", '',
-                                                      $XML_RPC_xh[$parser]['ac']);
-        break;
-    }
-
-    // if it's a valid type name, set the type
-    if (isset($GLOBALS['XML_RPC_Types'][strtolower($name)])) {
-        $XML_RPC_xh[$parser]['vt'] = strtolower($name);
-    }
-}
-
-/**
- * Character data handler for the XML parser
- *
- * @return void
- */
-function XML_RPC_cd($parser_resource, $data)
-{
-    global $XML_RPC_xh, $XML_RPC_backslash;
-
-    $parser = (int) $parser_resource;
-
-    if ($XML_RPC_xh[$parser]['lv'] != 3) {
-        // "lookforvalue==3" means that we've found an entire value
-        // and should discard any further character data
-
-        if ($XML_RPC_xh[$parser]['lv'] == 1) {
-            // if we've found text and we're just in a <value> then
-            // turn quoting on, as this will be a string
-            $XML_RPC_xh[$parser]['qt'] = 1;
-            // and say we've found a value
-            $XML_RPC_xh[$parser]['lv'] = 2;
-        }
-
-        // replace characters that eval would
-        // do special things with
-        if (!isset($XML_RPC_xh[$parser]['ac'])) {
-            $XML_RPC_xh[$parser]['ac'] = '';
-        }
-        $XML_RPC_xh[$parser]['ac'] .= $data;
-    }
-}
-
-/**
- * The common methods and properties for all of the XML_RPC classes
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Base {
-
-    /**
-     * PEAR Error handling
-     *
-     * @return object  PEAR_Error object
-     */
-    function raiseError($msg, $code)
-    {
-        include_once 'PEAR.php';
-        if (is_object(@$this)) {
-            return PEAR::raiseError(get_class($this) . ': ' . $msg, $code);
-        } else {
-            return PEAR::raiseError('XML_RPC: ' . $msg, $code);
-        }
-    }
-
-    /**
-     * Tell whether something is a PEAR_Error object
-     *
-     * @param mixed $value  the item to check
-     *
-     * @return bool  whether $value is a PEAR_Error object or not
-     *
-     * @access public
-     */
-    function isError($value)
-    {
-        return is_a($value, 'PEAR_Error');
-    }
-}
-
-/**
- * The methods and properties for submitting XML RPC requests
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Client extends XML_RPC_Base {
-
-    /**
-     * The path and name of the RPC server script you want the request to go to
-     * @var string
-     */
-    var $path = '';
-
-    /**
-     * The name of the remote server to connect to
-     * @var string
-     */
-    var $server = '';
-
-    /**
-     * The protocol to use in contacting the remote server
-     * @var string
-     */
-    var $protocol = 'http://';
-
-    /**
-     * The port for connecting to the remote server
-     *
-     * The default is 80 for http:// connections
-     * and 443 for https:// and ssl:// connections.
-     *
-     * @var integer
-     */
-    var $port = 80;
-
-    /**
-     * A user name for accessing the RPC server
-     * @var string
-     * @see XML_RPC_Client::setCredentials()
-     */
-    var $username = '';
-
-    /**
-     * A password for accessing the RPC server
-     * @var string
-     * @see XML_RPC_Client::setCredentials()
-     */
-    var $password = '';
-
-    /**
-     * The name of the proxy server to use, if any
-     * @var string
-     */
-    var $proxy = '';
-
-    /**
-     * The protocol to use in contacting the proxy server, if any
-     * @var string
-     */
-    var $proxy_protocol = 'http://';
-
-    /**
-     * The port for connecting to the proxy server
-     *
-     * The default is 8080 for http:// connections
-     * and 443 for https:// and ssl:// connections.
-     *
-     * @var integer
-     */
-    var $proxy_port = 8080;
-
-    /**
-     * A user name for accessing the proxy server
-     * @var string
-     */
-    var $proxy_user = '';
-
-    /**
-     * A password for accessing the proxy server
-     * @var string
-     */
-    var $proxy_pass = '';
-
-    /**
-     * The error number, if any
-     * @var integer
-     */
-    var $errno = 0;
-
-    /**
-     * The error message, if any
-     * @var string
-     */
-    var $errstr = '';
-
-    /**
-     * The current debug mode (1 = on, 0 = off)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The HTTP headers for the current request.
-     * @var string
-     */
-    var $headers = '';
-
-
-    /**
-     * Sets the object's properties
-     *
-     * @param string  $path        the path and name of the RPC server script
-     *                              you want the request to go to
-     * @param string  $server      the URL of the remote server to connect to.
-     *                              If this parameter doesn't specify a
-     *                              protocol and $port is 443, ssl:// is
-     *                              assumed.
-     * @param integer $port        a port for connecting to the remote server.
-     *                              Defaults to 80 for http:// connections and
-     *                              443 for https:// and ssl:// connections.
-     * @param string  $proxy       the URL of the proxy server to use, if any.
-     *                              If this parameter doesn't specify a
-     *                              protocol and $port is 443, ssl:// is
-     *                              assumed.
-     * @param integer $proxy_port  a port for connecting to the remote server.
-     *                              Defaults to 8080 for http:// connections and
-     *                              443 for https:// and ssl:// connections.
-     * @param string  $proxy_user  a user name for accessing the proxy server
-     * @param string  $proxy_pass  a password for accessing the proxy server
-     *
-     * @return void
-     */
-    function XML_RPC_Client($path, $server, $port = 0,
-                            $proxy = '', $proxy_port = 0,
-                            $proxy_user = '', $proxy_pass = '')
-    {
-        $this->path       = $path;
-        $this->proxy_user = $proxy_user;
-        $this->proxy_pass = $proxy_pass;
-
-        preg_match('@^(http://|https://|ssl://)?(.*)$@', $server, $match);
-        if ($match[1] == '') {
-            if ($port == 443) {
-                $this->server   = $match[2];
-                $this->protocol = 'ssl://';
-                $this->port     = 443;
-            } else {
-                $this->server = $match[2];
-                if ($port) {
-                    $this->port = $port;
-                }
-            }
-        } elseif ($match[1] == 'http://') {
-            $this->server = $match[2];
-            if ($port) {
-                $this->port = $port;
-            }
-        } else {
-            $this->server   = $match[2];
-            $this->protocol = 'ssl://';
-            if ($port) {
-                $this->port = $port;
-            } else {
-                $this->port = 443;
-            }
-        }
-
-        if ($proxy) {
-            preg_match('@^(http://|https://|ssl://)?(.*)$@', $proxy, $match);
-            if ($match[1] == '') {
-                if ($proxy_port == 443) {
-                    $this->proxy          = $match[2];
-                    $this->proxy_protocol = 'ssl://';
-                    $this->proxy_port     = 443;
-                } else {
-                    $this->proxy = $match[2];
-                    if ($proxy_port) {
-                        $this->proxy_port = $proxy_port;
-                    }
-                }
-            } elseif ($match[1] == 'http://') {
-                $this->proxy = $match[2];
-                if ($proxy_port) {
-                    $this->proxy_port = $proxy_port;
-                }
-            } else {
-                $this->proxy          = $match[2];
-                $this->proxy_protocol = 'ssl://';
-                if ($proxy_port) {
-                    $this->proxy_port = $proxy_port;
-                } else {
-                    $this->proxy_port = 443;
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the current debug mode
-     *
-     * @param int $in  where 1 = on, 0 = off
-     *
-     * @return void
-     */
-    function setDebug($in)
-    {
-        if ($in) {
-            $this->debug = 1;
-        } else {
-            $this->debug = 0;
-        }
-    }
-
-    /**
-     * Sets whether strings that contain characters which may cause PHP's
-     * SAX-based XML parser to break should be automatically base64 encoded
-     *
-     * This is is a workaround for systems that don't have PHP's mbstring
-     * extension available.
-     *
-     * @param int $in  where 1 = on, 0 = off
-     *
-     * @return void
-     */
-    function setAutoBase64($in)
-    {
-        if ($in) {
-            $GLOBALS['XML_RPC_auto_base64'] = true;
-        } else {
-            $GLOBALS['XML_RPC_auto_base64'] = false;
-        }
-    }
-
-    /**
-     * Set username and password properties for connecting to the RPC server
-     *
-     * @param string $u  the user name
-     * @param string $p  the password
-     *
-     * @return void
-     *
-     * @see XML_RPC_Client::$username, XML_RPC_Client::$password
-     */
-    function setCredentials($u, $p)
-    {
-        $this->username = $u;
-        $this->password = $p;
-    }
-
-    /**
-     * Transmit the RPC request via HTTP 1.0 protocol
-     *
-     * @param object $msg       the XML_RPC_Message object
-     * @param int    $timeout   how many seconds to wait for the request
-     *
-     * @return object  an XML_RPC_Response object.  0 is returned if any
-     *                  problems happen.
-     *
-     * @see XML_RPC_Message, XML_RPC_Client::XML_RPC_Client(),
-     *      XML_RPC_Client::setCredentials()
-     */
-    function send($msg, $timeout = 0)
-    {
-        if (!is_a($msg, 'XML_RPC_Message')) {
-            $this->errstr = 'send()\'s $msg parameter must be an'
-                          . ' XML_RPC_Message object.';
-            $this->raiseError($this->errstr, XML_RPC_ERROR_PROGRAMMING);
-            return 0;
-        }
-        $msg->debug = $this->debug;
-        return $this->sendPayloadHTTP10($msg, $this->server, $this->port,
-                                        $timeout, $this->username,
-                                        $this->password);
-    }
-
-    /**
-     * Transmit the RPC request via HTTP 1.0 protocol
-     *
-     * Requests should be sent using XML_RPC_Client send() rather than
-     * calling this method directly.
-     *
-     * @param object $msg       the XML_RPC_Message object
-     * @param string $server    the server to send the request to
-     * @param int    $port      the server port send the request to
-     * @param int    $timeout   how many seconds to wait for the request
-     *                           before giving up
-     * @param string $username  a user name for accessing the RPC server
-     * @param string $password  a password for accessing the RPC server
-     *
-     * @return object  an XML_RPC_Response object.  0 is returned if any
-     *                  problems happen.
-     *
-     * @access protected
-     * @see XML_RPC_Client::send()
-     */
-    function sendPayloadHTTP10($msg, $server, $port, $timeout = 0,
-                               $username = '', $password = '')
-    {
-        // Pre-emptive BC hacks for fools calling sendPayloadHTTP10() directly
-        if ($username != $this->username) {
-            $this->setCredentials($username, $password);
-        }
-
-        // Only create the payload if it was not created previously
-        if (empty($msg->payload)) {
-            $msg->createPayload();
-        }
-        $this->createHeaders($msg);
-
-        $op  = $this->headers . "\r\n\r\n";
-        $op .= $msg->payload;
-
-        if ($this->debug) {
-            print "\n<pre>---SENT---\n";
-            print $op;
-            print "\n---END---</pre>\n";
-        }
-
-        /*
-         * If we're using a proxy open a socket to the proxy server
-         * instead to the xml-rpc server
-         */
-        if ($this->proxy) {
-            if ($this->proxy_protocol == 'http://') {
-                $protocol = '';
-            } else {
-                $protocol = $this->proxy_protocol;
-            }
-            if ($timeout > 0) {
-                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
-                                 $this->errno, $this->errstr, $timeout);
-            } else {
-                $fp = @fsockopen($protocol . $this->proxy, $this->proxy_port,
-                                 $this->errno, $this->errstr);
-            }
-        } else {
-            if ($this->protocol == 'http://') {
-                $protocol = '';
-            } else {
-                $protocol = $this->protocol;
-            }
-            if ($timeout > 0) {
-                $fp = @fsockopen($protocol . $server, $port,
-                                 $this->errno, $this->errstr, $timeout);
-            } else {
-                $fp = @fsockopen($protocol . $server, $port,
-                                 $this->errno, $this->errstr);
-            }
-        }
-
-        /*
-         * Just raising the error without returning it is strange,
-         * but keep it here for backwards compatibility.
-         */
-        if (!$fp && $this->proxy) {
-            $this->raiseError('Connection to proxy server '
-                              . $this->proxy . ':' . $this->proxy_port
-                              . ' failed. ' . $this->errstr,
-                              XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        } elseif (!$fp) {
-            $this->raiseError('Connection to RPC server '
-                              . $server . ':' . $port
-                              . ' failed. ' . $this->errstr,
-                              XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        }
-
-        if ($timeout) {
-            /*
-             * Using socket_set_timeout() because stream_set_timeout()
-             * was introduced in 4.3.0, but we need to support 4.2.0.
-             */
-            socket_set_timeout($fp, $timeout);
-        }
-
-        if (!fputs($fp, $op, strlen($op))) {
-            $this->errstr = 'Write error';
-            return 0;
-        }
-        $resp = $msg->parseResponseFile($fp);
-
-        $meta = socket_get_status($fp);
-        if ($meta['timed_out']) {
-            fclose($fp);
-            $this->errstr = 'RPC server did not send response before timeout.';
-            $this->raiseError($this->errstr, XML_RPC_ERROR_CONNECTION_FAILED);
-            return 0;
-        }
-
-        fclose($fp);
-        return $resp;
-    }
-
-    /**
-     * Determines the HTTP headers and puts it in the $headers property
-     *
-     * @param object $msg       the XML_RPC_Message object
-     *
-     * @return boolean  TRUE if okay, FALSE if the message payload isn't set.
-     *
-     * @access protected
-     */
-    function createHeaders($msg)
-    {
-        if (empty($msg->payload)) {
-            return false;
-        }
-        if ($this->proxy) {
-            $this->headers = 'POST ' . $this->protocol . $this->server;
-            if ($this->proxy_port) {
-                $this->headers .= ':' . $this->port;
-            }
-        } else {
-           $this->headers = 'POST ';
-        }
-        $this->headers .= $this->path. " HTTP/1.0\r\n";
-
-        $this->headers .= "User-Agent: PEAR XML_RPC\r\n";
-        $this->headers .= 'Host: ' . $this->server . "\r\n";
-
-        if ($this->proxy && $this->proxy_user) {
-            $this->headers .= 'Proxy-Authorization: Basic '
-                     . base64_encode("$this->proxy_user:$this->proxy_pass")
-                     . "\r\n";
-        }
-
-        // thanks to Grant Rauscher <grant7@firstworld.net> for this
-        if ($this->username) {
-            $this->headers .= 'Authorization: Basic '
-                     . base64_encode("$this->username:$this->password")
-                     . "\r\n";
-        }
-
-        $this->headers .= "Content-Type: text/xml\r\n";
-        $this->headers .= 'Content-Length: ' . strlen($msg->payload);
-        return true;
-    }
-}
-
-/**
- * The methods and properties for interpreting responses to XML RPC requests
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Response extends XML_RPC_Base
-{
-    var $xv;
-    var $fn;
-    var $fs;
-    var $hdrs;
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Response($val, $fcode = 0, $fstr = '')
-    {
-        if ($fcode != 0) {
-            $this->fn = $fcode;
-            $this->fs = htmlspecialchars($fstr);
-        } else {
-            $this->xv = $val;
-        }
-    }
-
-    /**
-     * @return int  the error code
-     */
-    function faultCode()
-    {
-        if (isset($this->fn)) {
-            return $this->fn;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * @return string  the error string
-     */
-    function faultString()
-    {
-        return $this->fs;
-    }
-
-    /**
-     * @return mixed  the value
-     */
-    function value()
-    {
-        return $this->xv;
-    }
-
-    /**
-     * @return string  the error message in XML format
-     */
-    function serialize()
-    {
-        $rs = "<methodResponse>\n";
-        if ($this->fn) {
-            $rs .= "<fault>
-  <value>
-    <struct>
-      <member>
-        <name>faultCode</name>
-        <value><int>" . $this->fn . "</int></value>
-      </member>
-      <member>
-        <name>faultString</name>
-        <value><string>" . $this->fs . "</string></value>
-      </member>
-    </struct>
-  </value>
-</fault>";
-        } else {
-            $rs .= "<params>\n<param>\n" . $this->xv->serialize() .
-        "</param>\n</params>";
-        }
-        $rs .= "\n</methodResponse>";
-        return $rs;
-    }
-}
-
-/**
- * The methods and properties for composing XML RPC messages
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Message extends XML_RPC_Base
-{
-    /**
-     * Should the payload's content be passed through mb_convert_encoding()?
-     *
-     * @see XML_RPC_Message::setConvertPayloadEncoding()
-     * @since Property available since Release 1.5.1
-     * @var boolean
-     */
-    var $convert_payload_encoding = false;
-
-    /**
-     * The current debug mode (1 = on, 0 = off)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The encoding to be used for outgoing messages
-     *
-     * Defaults to the value of <var>$GLOBALS['XML_RPC_defencoding']</var>
-     *
-     * @var string
-     * @see XML_RPC_Message::setSendEncoding(),
-     *      $GLOBALS['XML_RPC_defencoding'], XML_RPC_Message::xml_header()
-     */
-    var $send_encoding = '';
-
-    /**
-     * The method presently being evaluated
-     * @var string
-     */
-    var $methodname = '';
-
-    /**
-     * @var array
-     */
-    var $params = array();
-
-    /**
-     * The XML message being generated
-     * @var string
-     */
-    var $payload = '';
-
-    /**
-     * Should extra line breaks be removed from the payload?
-     * @since Property available since Release 1.4.6
-     * @var boolean
-     */
-    var $remove_extra_lines = true;
-
-    /**
-     * The XML response from the remote server
-     * @since Property available since Release 1.4.6
-     * @var string
-     */
-    var $response_payload = '';
-
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Message($meth, $pars = 0)
-    {
-        $this->methodname = $meth;
-        if (is_array($pars) && sizeof($pars) > 0) {
-            for ($i = 0; $i < sizeof($pars); $i++) {
-                $this->addParam($pars[$i]);
-            }
-        }
-    }
-
-    /**
-     * Produces the XML declaration including the encoding attribute
-     *
-     * The encoding is determined by this class' <var>$send_encoding</var>
-     * property.  If the <var>$send_encoding</var> property is not set, use
-     * <var>$GLOBALS['XML_RPC_defencoding']</var>.
-     *
-     * @return string  the XML declaration and <methodCall> element
-     *
-     * @see XML_RPC_Message::setSendEncoding(),
-     *      XML_RPC_Message::$send_encoding, $GLOBALS['XML_RPC_defencoding']
-     */
-    function xml_header()
-    {
-        global $XML_RPC_defencoding;
-
-        if (!$this->send_encoding) {
-            $this->send_encoding = $XML_RPC_defencoding;
-        }
-        return '<?xml version="1.0" encoding="' . $this->send_encoding . '"?>'
-               . "\n<methodCall>\n";
-    }
-
-    /**
-     * @return string  the closing </methodCall> tag
-     */
-    function xml_footer()
-    {
-        return "</methodCall>\n";
-    }
-
-    /**
-     * Fills the XML_RPC_Message::$payload property
-     *
-     * Part of the process makes sure all line endings are in DOS format
-     * (CRLF), which is probably required by specifications.
-     *
-     * If XML_RPC_Message::setConvertPayloadEncoding() was set to true,
-     * the payload gets passed through mb_convert_encoding()
-     * to ensure the payload matches the encoding set in the
-     * XML declaration.  The encoding type can be manually set via
-     * XML_RPC_Message::setSendEncoding().
-     *
-     * @return void
-     *
-     * @uses XML_RPC_Message::xml_header(), XML_RPC_Message::xml_footer()
-     * @see XML_RPC_Message::setSendEncoding(), $GLOBALS['XML_RPC_defencoding'],
-     *      XML_RPC_Message::setConvertPayloadEncoding()
-     */
-    function createPayload()
-    {
-        $this->payload = $this->xml_header();
-        $this->payload .= '<methodName>' . $this->methodname . "</methodName>\n";
-        $this->payload .= "<params>\n";
-        for ($i = 0; $i < sizeof($this->params); $i++) {
-            $p = $this->params[$i];
-            $this->payload .= "<param>\n" . $p->serialize() . "</param>\n";
-        }
-        $this->payload .= "</params>\n";
-        $this->payload .= $this->xml_footer();
-        if ($this->remove_extra_lines) {
-            $this->payload = preg_replace("@[\r\n]+@", "\r\n", $this->payload);
-        } else {
-            $this->payload = preg_replace("@\r\n|\n|\r|\n\r@", "\r\n", $this->payload);
-        }
-        if ($this->convert_payload_encoding) {
-            $this->payload = mb_convert_encoding($this->payload, $this->send_encoding);
-        }
-    }
-
-    /**
-     * @return string  the name of the method
-     */
-    function method($meth = '')
-    {
-        if ($meth != '') {
-            $this->methodname = $meth;
-        }
-        return $this->methodname;
-    }
-
-    /**
-     * @return string  the payload
-     */
-    function serialize()
-    {
-        $this->createPayload();
-        return $this->payload;
-    }
-
-    /**
-     * @return void
-     */
-    function addParam($par)
-    {
-        $this->params[] = $par;
-    }
-
-    /**
-     * Obtains an XML_RPC_Value object for the given parameter
-     *
-     * @param int $i  the index number of the parameter to obtain
-     *
-     * @return object  the XML_RPC_Value object.
-     *                  If the parameter doesn't exist, an XML_RPC_Response object.
-     *
-     * @since Returns XML_RPC_Response object on error since Release 1.3.0
-     */
-    function getParam($i)
-    {
-        global $XML_RPC_err, $XML_RPC_str;
-
-        if (isset($this->params[$i])) {
-            return $this->params[$i];
-        } else {
-            $this->raiseError('The submitted request did not contain this parameter',
-                              XML_RPC_ERROR_INCORRECT_PARAMS);
-            return new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
-                                        $XML_RPC_str['incorrect_params']);
-        }
-    }
-
-    /**
-     * @return int  the number of parameters
-     */
-    function getNumParams()
-    {
-        return sizeof($this->params);
-    }
-
-    /**
-     * Sets whether the payload's content gets passed through
-     * mb_convert_encoding()
-     *
-     * Returns PEAR_ERROR object if mb_convert_encoding() isn't available.
-     *
-     * @param int $in  where 1 = on, 0 = off
-     *
-     * @return void
-     *
-     * @see XML_RPC_Message::setSendEncoding()
-     * @since Method available since Release 1.5.1
-     */
-    function setConvertPayloadEncoding($in)
-    {
-        if ($in && !function_exists('mb_convert_encoding')) {
-            return $this->raiseError('mb_convert_encoding() is not available',
-                              XML_RPC_ERROR_PROGRAMMING);
-        }
-        $this->convert_payload_encoding = $in;
-    }
-
-    /**
-     * Sets the XML declaration's encoding attribute
-     *
-     * @param string $type  the encoding type (ISO-8859-1, UTF-8 or US-ASCII)
-     *
-     * @return void
-     *
-     * @see XML_RPC_Message::setConvertPayloadEncoding(), XML_RPC_Message::xml_header()
-     * @since Method available since Release 1.2.0
-     */
-    function setSendEncoding($type)
-    {
-        $this->send_encoding = $type;
-    }
-
-    /**
-     * Determine the XML's encoding via the encoding attribute
-     * in the XML declaration
-     *
-     * If the encoding parameter is not set or is not ISO-8859-1, UTF-8
-     * or US-ASCII, $XML_RPC_defencoding will be returned.
-     *
-     * @param string $data  the XML that will be parsed
-     *
-     * @return string  the encoding to be used
-     *
-     * @link   http://php.net/xml_parser_create
-     * @since  Method available since Release 1.2.0
-     */
-    function getEncoding($data)
-    {
-        global $XML_RPC_defencoding;
-
-        if (preg_match('@<\?xml[^>]*\s*encoding\s*=\s*[\'"]([^"\']*)[\'"]@',
-                       $data, $match))
-        {
-            $match[1] = trim(strtoupper($match[1]));
-            switch ($match[1]) {
-                case 'ISO-8859-1':
-                case 'UTF-8':
-                case 'US-ASCII':
-                    return $match[1];
-                    break;
-
-                default:
-                    return $XML_RPC_defencoding;
-            }
-        } else {
-            return $XML_RPC_defencoding;
-        }
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     */
-    function parseResponseFile($fp)
-    {
-        $ipd = '';
-        while ($data = @fread($fp, 8192)) {
-            $ipd .= $data;
-        }
-        return $this->parseResponse($ipd);
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     */
-    function parseResponse($data = '')
-    {
-        global $XML_RPC_xh, $XML_RPC_err, $XML_RPC_str, $XML_RPC_defencoding;
-
-        $encoding = $this->getEncoding($data);
-        $parser_resource = xml_parser_create($encoding);
-        $parser = (int) $parser_resource;
-
-        $XML_RPC_xh = array();
-        $XML_RPC_xh[$parser] = array();
-
-        $XML_RPC_xh[$parser]['cm'] = 0;
-        $XML_RPC_xh[$parser]['isf'] = 0;
-        $XML_RPC_xh[$parser]['ac'] = '';
-        $XML_RPC_xh[$parser]['qt'] = '';
-        $XML_RPC_xh[$parser]['stack'] = array();
-        $XML_RPC_xh[$parser]['valuestack'] = array();
-
-        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
-        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
-        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
-
-        $hdrfnd = 0;
-        if ($this->debug) {
-            print "\n<pre>---GOT---\n";
-            print isset($_SERVER['SERVER_PROTOCOL']) ? htmlspecialchars($data) : $data;
-            print "\n---END---</pre>\n";
-        }
-
-        // See if response is a 200 or a 100 then a 200, else raise error.
-        // But only do this if we're using the HTTP protocol.
-        if (preg_match('@^HTTP@', $data) &&
-            !preg_match('@^HTTP/[0-9\.]+ 200 @', $data) &&
-            !preg_match('@^HTTP/[0-9\.]+ 10[0-9]([A-Z ]+)?[\r\n]+HTTP/[0-9\.]+ 200@', $data))
-        {
-                $errstr = substr($data, 0, strpos($data, "\n") - 1);
-                error_log('HTTP error, got response: ' . $errstr);
-                $r = new XML_RPC_Response(0, $XML_RPC_err['http_error'],
-                                          $XML_RPC_str['http_error'] . ' (' .
-                                          $errstr . ')');
-                xml_parser_free($parser_resource);
-                return $r;
-        }
-
-        // gotta get rid of headers here
-        if (!$hdrfnd && ($brpos = strpos($data,"\r\n\r\n"))) {
-            $XML_RPC_xh[$parser]['ha'] = substr($data, 0, $brpos);
-            $data = substr($data, $brpos + 4);
-            $hdrfnd = 1;
-        }
-
-        /*
-         * be tolerant of junk after methodResponse
-         * (e.g. javascript automatically inserted by free hosts)
-         * thanks to Luca Mariano <luca.mariano@email.it>
-         */
-        $data = substr($data, 0, strpos($data, "</methodResponse>") + 17);
-        $this->response_payload = $data;
-
-        if (!xml_parse($parser_resource, $data, sizeof($data))) {
-            // thanks to Peter Kocks <peter.kocks@baygate.com>
-            if (xml_get_current_line_number($parser_resource) == 1) {
-                $errstr = 'XML error at line 1, check URL';
-            } else {
-                $errstr = sprintf('XML error: %s at line %d',
-                                  xml_error_string(xml_get_error_code($parser_resource)),
-                                  xml_get_current_line_number($parser_resource));
-            }
-            error_log($errstr);
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return']);
-            xml_parser_free($parser_resource);
-            return $r;
-        }
-
-        xml_parser_free($parser_resource);
-
-        if ($this->debug) {
-            print "\n<pre>---PARSED---\n";
-            var_dump($XML_RPC_xh[$parser]['value']);
-            print "---END---</pre>\n";
-        }
-
-        if ($XML_RPC_xh[$parser]['isf'] > 1) {
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return'].' '.$XML_RPC_xh[$parser]['isf_reason']);
-        } elseif (!is_object($XML_RPC_xh[$parser]['value'])) {
-            // then something odd has happened
-            // and it's time to generate a client side error
-            // indicating something odd went on
-            $r = new XML_RPC_Response(0, $XML_RPC_err['invalid_return'],
-                                      $XML_RPC_str['invalid_return']);
-        } else {
-            $v = $XML_RPC_xh[$parser]['value'];
-            if ($XML_RPC_xh[$parser]['isf']) {
-                $f = $v->structmem('faultCode');
-                $fs = $v->structmem('faultString');
-                $r = new XML_RPC_Response($v, $f->scalarval(),
-                                          $fs->scalarval());
-            } else {
-                $r = new XML_RPC_Response($v);
-            }
-        }
-        $r->hdrs = preg_split("@\r?\n@", $XML_RPC_xh[$parser]['ha'][1]);
-        return $r;
-    }
-}
-
-/**
- * The methods and properties that represent data in XML RPC format
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Value extends XML_RPC_Base
-{
-    var $me = array();
-    var $mytype = 0;
-
-    /**
-     * @return void
-     */
-    function XML_RPC_Value($val = -1, $type = '')
-    {
-        $this->me = array();
-        $this->mytype = 0;
-        if ($val != -1 || $type != '') {
-            if ($type == '') {
-                $type = 'string';
-            }
-            if (!array_key_exists($type, $GLOBALS['XML_RPC_Types'])) {
-                // XXX
-                // need some way to report this error
-            } elseif ($GLOBALS['XML_RPC_Types'][$type] == 1) {
-                $this->addScalar($val, $type);
-            } elseif ($GLOBALS['XML_RPC_Types'][$type] == 2) {
-                $this->addArray($val);
-            } elseif ($GLOBALS['XML_RPC_Types'][$type] == 3) {
-                $this->addStruct($val);
-            }
-        }
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addScalar($val, $type = 'string')
-    {
-        if ($this->mytype == 1) {
-            $this->raiseError('Scalar can have only one value',
-                              XML_RPC_ERROR_INVALID_TYPE);
-            return 0;
-        }
-        $typeof = $GLOBALS['XML_RPC_Types'][$type];
-        if ($typeof != 1) {
-            $this->raiseError("Not a scalar type (${typeof})",
-                              XML_RPC_ERROR_INVALID_TYPE);
-            return 0;
-        }
-
-        if ($type == $GLOBALS['XML_RPC_Boolean']) {
-            if (strcasecmp($val, 'true') == 0
-                || $val == 1
-                || ($val == true && strcasecmp($val, 'false')))
-            {
-                $val = 1;
-            } else {
-                $val = 0;
-            }
-        }
-
-        if ($this->mytype == 2) {
-            // we're adding to an array here
-            $ar = $this->me['array'];
-            $ar[] = new XML_RPC_Value($val, $type);
-            $this->me['array'] = $ar;
-        } else {
-            // a scalar, so set the value and remember we're scalar
-            $this->me[$type] = $val;
-            $this->mytype = $typeof;
-        }
-        return 1;
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addArray($vals)
-    {
-        if ($this->mytype != 0) {
-            $this->raiseError(
-                    'Already initialized as a [' . $this->kindOf() . ']',
-                    XML_RPC_ERROR_ALREADY_INITIALIZED);
-            return 0;
-        }
-        $this->mytype = $GLOBALS['XML_RPC_Types']['array'];
-        $this->me['array'] = $vals;
-        return 1;
-    }
-
-    /**
-     * @return int  returns 1 if successful or 0 if there are problems
-     */
-    function addStruct($vals)
-    {
-        if ($this->mytype != 0) {
-            $this->raiseError(
-                    'Already initialized as a [' . $this->kindOf() . ']',
-                    XML_RPC_ERROR_ALREADY_INITIALIZED);
-            return 0;
-        }
-        $this->mytype = $GLOBALS['XML_RPC_Types']['struct'];
-        $this->me['struct'] = $vals;
-        return 1;
-    }
-
-    /**
-     * @return void
-     */
-    function dump($ar)
-    {
-        reset($ar);
-        foreach ($ar as $key => $val) {
-            echo "$key => $val<br />";
-            if ($key == 'array') {
-                foreach ($val as $key2 => $val2) {
-                    echo "-- $key2 => $val2<br />";
-                }
-            }
-        }
-    }
-
-    /**
-     * @return string  the data type of the current value
-     */
-    function kindOf()
-    {
-        switch ($this->mytype) {
-        case 3:
-            return 'struct';
-
-        case 2:
-            return 'array';
-
-        case 1:
-            return 'scalar';
-
-        default:
-            return 'undef';
-        }
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serializedata($typ, $val)
-    {
-        $rs = '';
-        if (!array_key_exists($typ, $GLOBALS['XML_RPC_Types'])) {
-            // XXX
-            // need some way to report this error
-            return;
-        }
-        switch ($GLOBALS['XML_RPC_Types'][$typ]) {
-        case 3:
-            // struct
-            $rs .= "<struct>\n";
-            reset($val);
-            foreach ($val as $key2 => $val2) {
-                $rs .= "<member><name>" . htmlspecialchars($key2) . "</name>\n";
-                $rs .= $this->serializeval($val2);
-                $rs .= "</member>\n";
-            }
-            $rs .= '</struct>';
-            break;
-
-        case 2:
-            // array
-            $rs .= "<array>\n<data>\n";
-            foreach ($val as $value) {
-                $rs .= $this->serializeval($value);
-            }
-            $rs .= "</data>\n</array>";
-            break;
-
-        case 1:
-            switch ($typ) {
-            case $GLOBALS['XML_RPC_Base64']:
-                $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
-                break;
-            case $GLOBALS['XML_RPC_Boolean']:
-                $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
-                break;
-            case $GLOBALS['XML_RPC_String']:
-                $rs .= "<${typ}>" . htmlspecialchars($val). "</${typ}>";
-                break;
-            default:
-                $rs .= "<${typ}>${val}</${typ}>";
-            }
-        }
-        return $rs;
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serialize()
-    {
-        return $this->serializeval($this);
-    }
-
-    /**
-     * @return string  the data in XML format
-     */
-    function serializeval($o)
-    {
-        if (!is_object($o) || empty($o->me) || !is_array($o->me)) {
-            return '';
-        }
-        $ar = $o->me;
-        reset($ar);
-        list($typ, $val) = each($ar);
-        return '<value>' .  $this->serializedata($typ, $val) .  "</value>\n";
-    }
-
-    /**
-     * @return mixed  the contents of the element requested
-     */
-    function structmem($m)
-    {
-        return $this->me['struct'][$m];
-    }
-
-    /**
-     * @return void
-     */
-    function structreset()
-    {
-        reset($this->me['struct']);
-    }
-
-    /**
-     * @return  the key/value pair of the struct's current element
-     */
-    function structeach()
-    {
-        return each($this->me['struct']);
-    }
-
-    /**
-     * @return mixed  the current value
-     */
-    function getval()
-    {
-        // UNSTABLE
-
-        reset($this->me);
-        $b = current($this->me);
-
-        // contributed by I Sofer, 2001-03-24
-        // add support for nested arrays to scalarval
-        // i've created a new method here, so as to
-        // preserve back compatibility
-
-        if (is_array($b)) {
-            foreach ($b as $id => $cont) {
-                $b[$id] = $cont->scalarval();
-            }
-        }
-
-        // add support for structures directly encoding php objects
-        if (is_object($b)) {
-            $t = get_object_vars($b);
-            foreach ($t as $id => $cont) {
-                $t[$id] = $cont->scalarval();
-            }
-            foreach ($t as $id => $cont) {
-                $b->$id = $cont;
-            }
-        }
-
-        // end contrib
-        return $b;
-    }
-
-    /**
-     * @return mixed  the current element's scalar value.  If the value is
-     *                 not scalar, FALSE is returned.
-     */
-    function scalarval()
-    {
-        reset($this->me);
-        $v = current($this->me);
-        if (!is_scalar($v)) {
-            $v = false;
-        }
-        return $v;
-    }
-
-    /**
-     * @return string
-     */
-    function scalartyp()
-    {
-        reset($this->me);
-        $a = key($this->me);
-        if ($a == $GLOBALS['XML_RPC_I4']) {
-            $a = $GLOBALS['XML_RPC_Int'];
-        }
-        return $a;
-    }
-
-    /**
-     * @return mixed  the struct's current element
-     */
-    function arraymem($m)
-    {
-        return $this->me['array'][$m];
-    }
-
-    /**
-     * @return int  the number of elements in the array
-     */
-    function arraysize()
-    {
-        reset($this->me);
-        list($a, $b) = each($this->me);
-        return sizeof($b);
-    }
-
-    /**
-     * Determines if the item submitted is an XML_RPC_Value object
-     *
-     * @param mixed $val  the variable to be evaluated
-     *
-     * @return bool  TRUE if the item is an XML_RPC_Value object
-     *
-     * @static
-     * @since Method available since Release 1.3.0
-     */
-    function isValue($val)
-    {
-        return (strtolower(get_class($val)) == 'xml_rpc_value');
-    }
-}
-
-/**
- * Return an ISO8601 encoded string
- *
- * While timezones ought to be supported, the XML-RPC spec says:
- *
- * "Don't assume a timezone. It should be specified by the server in its
- * documentation what assumptions it makes about timezones."
- *
- * This routine always assumes localtime unless $utc is set to 1, in which
- * case UTC is assumed and an adjustment for locale is made when encoding.
- *
- * @return string  the formatted date
- */
-function XML_RPC_iso8601_encode($timet, $utc = 0)
-{
-    if (!$utc) {
-        $t = strftime('%Y%m%dT%H:%M:%S', $timet);
-    } else {
-        if (function_exists('gmstrftime')) {
-            // gmstrftime doesn't exist in some versions
-            // of PHP
-            $t = gmstrftime('%Y%m%dT%H:%M:%S', $timet);
-        } else {
-            $t = strftime('%Y%m%dT%H:%M:%S', $timet - date('Z'));
-        }
-    }
-    return $t;
-}
-
-/**
- * Convert a datetime string into a Unix timestamp
- *
- * While timezones ought to be supported, the XML-RPC spec says:
- *
- * "Don't assume a timezone. It should be specified by the server in its
- * documentation what assumptions it makes about timezones."
- *
- * This routine always assumes localtime unless $utc is set to 1, in which
- * case UTC is assumed and an adjustment for locale is made when encoding.
- *
- * @return int  the unix timestamp of the date submitted
- */
-function XML_RPC_iso8601_decode($idate, $utc = 0)
-{
-    $t = 0;
-    if (preg_match('@([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})@', $idate, $regs)) {
-        if ($utc) {
-            $t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-        } else {
-            $t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-        }
-    }
-    return $t;
-}
-
-/**
- * Converts an XML_RPC_Value object into native PHP types
- *
- * @param object $XML_RPC_val  the XML_RPC_Value object to decode
- *
- * @return mixed  the PHP values
- */
-function XML_RPC_decode($XML_RPC_val)
-{
-    $kind = $XML_RPC_val->kindOf();
-
-    if ($kind == 'scalar') {
-        return $XML_RPC_val->scalarval();
-
-    } elseif ($kind == 'array') {
-        $size = $XML_RPC_val->arraysize();
-        $arr = array();
-        for ($i = 0; $i < $size; $i++) {
-            $arr[] = XML_RPC_decode($XML_RPC_val->arraymem($i));
-        }
-        return $arr;
-
-    } elseif ($kind == 'struct') {
-        $XML_RPC_val->structreset();
-        $arr = array();
-        while (list($key, $value) = $XML_RPC_val->structeach()) {
-            $arr[$key] = XML_RPC_decode($value);
-        }
-        return $arr;
-    }
-}
-
-/**
- * Converts native PHP types into an XML_RPC_Value object
- *
- * @param mixed $php_val  the PHP value or variable you want encoded
- *
- * @return object  the XML_RPC_Value object
- */
-function XML_RPC_encode($php_val)
-{
-    $type = gettype($php_val);
-    $XML_RPC_val = new XML_RPC_Value;
-
-    switch ($type) {
-    case 'array':
-        if (empty($php_val)) {
-            $XML_RPC_val->addArray($php_val);
-            break;
-        }
-        $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));
-        if (empty($tmp)) {
-           $arr = array();
-           foreach ($php_val as $k => $v) {
-               $arr[$k] = XML_RPC_encode($v);
-           }
-           $XML_RPC_val->addArray($arr);
-           break;
-        }
-        // fall though if it's not an enumerated array
-
-    case 'object':
-        $arr = array();
-        foreach ($php_val as $k => $v) {
-            $arr[$k] = XML_RPC_encode($v);
-        }
-        $XML_RPC_val->addStruct($arr);
-        break;
-
-    case 'integer':
-        $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_Int']);
-        break;
-
-    case 'double':
-        $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_Double']);
-        break;
-
-    case 'string':
-    case 'NULL':
-        if (preg_match('@^[0-9]{8}\T{1}[0-9]{2}\:[0-9]{2}\:[0-9]{2}$@', $php_val)) {
-            $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_DateTime']);
-        } elseif ($GLOBALS['XML_RPC_auto_base64']
-                  && preg_match("@[^ -~\t\r\n]@", $php_val))
-        {
-            // Characters other than alpha-numeric, punctuation, SP, TAB,
-            // LF and CR break the XML parser, encode value via Base 64.
-            $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_Base64']);
-        } else {
-            $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_String']);
-        }
-        break;
-
-    case 'boolean':
-        // Add support for encoding/decoding of booleans, since they
-        // are supported in PHP
-        // by <G_Giunta_2001-02-29>
-        $XML_RPC_val->addScalar($php_val, $GLOBALS['XML_RPC_Boolean']);
-        break;
-
-    case 'unknown type':
-    default:
-        $XML_RPC_val = false;
-    }
-    return $XML_RPC_val;
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/XML/RPC/Dump.php b/airtime_mvc/library/pear/XML/RPC/Dump.php
deleted file mode 100644
index 9de00eb76..000000000
--- a/airtime_mvc/library/pear/XML/RPC/Dump.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Function and class to dump XML_RPC_Value objects in a nice way
- *
- * Should be helpful as a normal var_dump(..) displays all internals which
- * doesn't really give you an overview due to too much information.
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Christian Weiske <cweiske@php.net>
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    SVN: $Id: Dump.php 300962 2010-07-03 02:24:24Z danielc $
- * @link       http://pear.php.net/package/XML_RPC
- */
-
-
-/**
- * Pull in the XML_RPC class
- */
-require_once 'XML/RPC.php';
-
-
-/**
- * Generates the dump of the XML_RPC_Value and echoes it
- *
- * @param object $value  the XML_RPC_Value object to dump
- *
- * @return void
- */
-function XML_RPC_Dump($value)
-{
-    $dumper = new XML_RPC_Dump();
-    echo $dumper->generateDump($value);
-}
-
-
-/**
- * Class which generates a dump of a XML_RPC_Value object
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Christian Weiske <cweiske@php.net>
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Dump
-{
-    /**
-     * The indentation array cache
-     * @var array
-     */
-    var $arIndent      = array();
-
-    /**
-     * The spaces used for indenting the XML
-     * @var string
-     */
-    var $strBaseIndent = '    ';
-
-    /**
-     * Returns the dump in XML format without printing it out
-     *
-     * @param object $value   the XML_RPC_Value object to dump
-     * @param int    $nLevel  the level of indentation
-     *
-     * @return string  the dump
-     */
-    function generateDump($value, $nLevel = 0)
-    {
-        if (!is_object($value) || strtolower(get_class($value)) != 'xml_rpc_value') {
-            require_once 'PEAR.php';
-            PEAR::raiseError('Tried to dump non-XML_RPC_Value variable' . "\r\n",
-                             0, PEAR_ERROR_PRINT);
-            if (is_object($value)) {
-                $strType = get_class($value);
-            } else {
-                $strType = gettype($value);
-            }
-            return $this->getIndent($nLevel) . 'NOT A XML_RPC_Value: '
-                   . $strType . "\r\n";
-        }
-
-        switch ($value->kindOf()) {
-        case 'struct':
-            $ret = $this->genStruct($value, $nLevel);
-            break;
-        case 'array':
-            $ret = $this->genArray($value, $nLevel);
-            break;
-        case 'scalar':
-            $ret = $this->genScalar($value->scalarval(), $nLevel);
-            break;
-        default:
-            require_once 'PEAR.php';
-            PEAR::raiseError('Illegal type "' . $value->kindOf()
-                             . '" in XML_RPC_Value' . "\r\n", 0,
-                             PEAR_ERROR_PRINT);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Returns the scalar value dump
-     *
-     * @param object $value   the scalar XML_RPC_Value object to dump
-     * @param int    $nLevel  the level of indentation
-     *
-     * @return string  Dumped version of the scalar value
-     */
-    function genScalar($value, $nLevel)
-    {
-        if (gettype($value) == 'object') {
-            $strClass = ' ' . get_class($value);
-        } else {
-            $strClass = '';
-        }
-        return $this->getIndent($nLevel) . gettype($value) . $strClass
-               . ' ' . $value . "\r\n";
-    }
-
-    /**
-     * Returns the dump of a struct
-     *
-     * @param object $value   the struct XML_RPC_Value object to dump
-     * @param int    $nLevel  the level of indentation
-     *
-     * @return string  Dumped version of the scalar value
-     */
-    function genStruct($value, $nLevel)
-    {
-        $value->structreset();
-        $strOutput = $this->getIndent($nLevel) . 'struct' . "\r\n";
-        while (list($key, $keyval) = $value->structeach()) {
-            $strOutput .= $this->getIndent($nLevel + 1) . $key . "\r\n";
-            $strOutput .= $this->generateDump($keyval, $nLevel + 2);
-        }
-        return $strOutput;
-    }
-
-    /**
-     * Returns the dump of an array
-     *
-     * @param object $value   the array XML_RPC_Value object to dump
-     * @param int    $nLevel  the level of indentation
-     *
-     * @return string  Dumped version of the scalar value
-     */
-    function genArray($value, $nLevel)
-    {
-        $nSize     = $value->arraysize();
-        $strOutput = $this->getIndent($nLevel) . 'array' . "\r\n";
-        for($nA = 0; $nA < $nSize; $nA++) {
-            $strOutput .= $this->getIndent($nLevel + 1) . $nA . "\r\n";
-            $strOutput .= $this->generateDump($value->arraymem($nA),
-                                              $nLevel + 2);
-        }
-        return $strOutput;
-    }
-
-    /**
-     * Returns the indent for a specific level and caches it for faster use
-     *
-     * @param int $nLevel  the level
-     *
-     * @return string  the indented string
-     */
-    function getIndent($nLevel)
-    {
-        if (!isset($this->arIndent[$nLevel])) {
-            $this->arIndent[$nLevel] = str_repeat($this->strBaseIndent, $nLevel);
-        }
-        return $this->arIndent[$nLevel];
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/XML/RPC/Server.php b/airtime_mvc/library/pear/XML/RPC/Server.php
deleted file mode 100644
index 22673b399..000000000
--- a/airtime_mvc/library/pear/XML/RPC/Server.php
+++ /dev/null
@@ -1,672 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Server commands for our PHP implementation of the XML-RPC protocol
- *
- * This is a PEAR-ified version of Useful inc's XML-RPC for PHP.
- * It has support for HTTP transport, proxies and authentication.
- *
- * PHP versions 4 and 5
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    SVN: $Id: Server.php 300961 2010-07-03 02:17:34Z danielc $
- * @link       http://pear.php.net/package/XML_RPC
- */
-
-
-/**
- * Pull in the XML_RPC class
- */
-require_once 'XML/RPC.php';
-
-
-/**
- * signature for system.listMethods: return = array,
- * parameters = a string or nothing
- * @global array $GLOBALS['XML_RPC_Server_listMethods_sig']
- */
-$GLOBALS['XML_RPC_Server_listMethods_sig'] = array(
-    array($GLOBALS['XML_RPC_Array'],
-          $GLOBALS['XML_RPC_String']
-    ),
-    array($GLOBALS['XML_RPC_Array'])
-);
-
-/**
- * docstring for system.listMethods
- * @global string $GLOBALS['XML_RPC_Server_listMethods_doc']
- */
-$GLOBALS['XML_RPC_Server_listMethods_doc'] = 'This method lists all the'
-        . ' methods that the XML-RPC server knows how to dispatch';
-
-/**
- * signature for system.methodSignature: return = array,
- * parameters = string
- * @global array $GLOBALS['XML_RPC_Server_methodSignature_sig']
- */
-$GLOBALS['XML_RPC_Server_methodSignature_sig'] = array(
-    array($GLOBALS['XML_RPC_Array'],
-          $GLOBALS['XML_RPC_String']
-    )
-);
-
-/**
- * docstring for system.methodSignature
- * @global string $GLOBALS['XML_RPC_Server_methodSignature_doc']
- */
-$GLOBALS['XML_RPC_Server_methodSignature_doc'] = 'Returns an array of known'
-        . ' signatures (an array of arrays) for the method name passed. If'
-        . ' no signatures are known, returns a none-array (test for type !='
-        . ' array to detect missing signature)';
-
-/**
- * signature for system.methodHelp: return = string,
- * parameters = string
- * @global array $GLOBALS['XML_RPC_Server_methodHelp_sig']
- */
-$GLOBALS['XML_RPC_Server_methodHelp_sig'] = array(
-    array($GLOBALS['XML_RPC_String'],
-          $GLOBALS['XML_RPC_String']
-    )
-);
-
-/**
- * docstring for methodHelp
- * @global string $GLOBALS['XML_RPC_Server_methodHelp_doc']
- */
-$GLOBALS['XML_RPC_Server_methodHelp_doc'] = 'Returns help text if defined'
-        . ' for the method passed, otherwise returns an empty string';
-
-/**
- * dispatch map for the automatically declared XML-RPC methods.
- * @global array $GLOBALS['XML_RPC_Server_dmap']
- */
-$GLOBALS['XML_RPC_Server_dmap'] = array(
-    'system.listMethods' => array(
-        'function'  => 'XML_RPC_Server_listMethods',
-        'signature' => $GLOBALS['XML_RPC_Server_listMethods_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_listMethods_doc']
-    ),
-    'system.methodHelp' => array(
-        'function'  => 'XML_RPC_Server_methodHelp',
-        'signature' => $GLOBALS['XML_RPC_Server_methodHelp_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_methodHelp_doc']
-    ),
-    'system.methodSignature' => array(
-        'function'  => 'XML_RPC_Server_methodSignature',
-        'signature' => $GLOBALS['XML_RPC_Server_methodSignature_sig'],
-        'docstring' => $GLOBALS['XML_RPC_Server_methodSignature_doc']
-    )
-);
-
-/**
- * @global string $GLOBALS['XML_RPC_Server_debuginfo']
- */
-$GLOBALS['XML_RPC_Server_debuginfo'] = '';
-
-
-/**
- * Lists all the methods that the XML-RPC server knows how to dispatch
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_listMethods($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $v = new XML_RPC_Value();
-    $outAr = array();
-    foreach ($server->dmap as $key => $val) {
-        $outAr[] = new XML_RPC_Value($key, 'string');
-    }
-    foreach ($XML_RPC_Server_dmap as $key => $val) {
-        $outAr[] = new XML_RPC_Value($key, 'string');
-    }
-    $v->addArray($outAr);
-    return new XML_RPC_Response($v);
-}
-
-/**
- * Returns an array of known signatures (an array of arrays)
- * for the given method
- *
- * If no signatures are known, returns a none-array
- * (test for type != array to detect missing signature)
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_methodSignature($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $methName = $m->getParam(0);
-    $methName = $methName->scalarval();
-    if (strpos($methName, 'system.') === 0) {
-        $dmap = $XML_RPC_Server_dmap;
-        $sysCall = 1;
-    } else {
-        $dmap = $server->dmap;
-        $sysCall = 0;
-    }
-    //  print "<!-- ${methName} -->\n";
-    if (isset($dmap[$methName])) {
-        if ($dmap[$methName]['signature']) {
-            $sigs = array();
-            $thesigs = $dmap[$methName]['signature'];
-            for ($i = 0; $i < sizeof($thesigs); $i++) {
-                $cursig = array();
-                $inSig = $thesigs[$i];
-                for ($j = 0; $j < sizeof($inSig); $j++) {
-                    $cursig[] = new XML_RPC_Value($inSig[$j], 'string');
-                }
-                $sigs[] = new XML_RPC_Value($cursig, 'array');
-            }
-            $r = new XML_RPC_Response(new XML_RPC_Value($sigs, 'array'));
-        } else {
-            $r = new XML_RPC_Response(new XML_RPC_Value('undef', 'string'));
-        }
-    } else {
-        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
-                                  $XML_RPC_str['introspect_unknown']);
-    }
-    return $r;
-}
-
-/**
- * Returns help text if defined for the method passed, otherwise returns
- * an empty string
- *
- * @return object  a new XML_RPC_Response object
- */
-function XML_RPC_Server_methodHelp($server, $m)
-{
-    global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
-
-    $methName = $m->getParam(0);
-    $methName = $methName->scalarval();
-    if (strpos($methName, 'system.') === 0) {
-        $dmap = $XML_RPC_Server_dmap;
-        $sysCall = 1;
-    } else {
-        $dmap = $server->dmap;
-        $sysCall = 0;
-    }
-
-    if (isset($dmap[$methName])) {
-        if ($dmap[$methName]['docstring']) {
-            $r = new XML_RPC_Response(new XML_RPC_Value($dmap[$methName]['docstring']),
-                                                        'string');
-        } else {
-            $r = new XML_RPC_Response(new XML_RPC_Value('', 'string'));
-        }
-    } else {
-        $r = new XML_RPC_Response(0, $XML_RPC_err['introspect_unknown'],
-                                     $XML_RPC_str['introspect_unknown']);
-    }
-    return $r;
-}
-
-/**
- * @return void
- */
-function XML_RPC_Server_debugmsg($m)
-{
-    global $XML_RPC_Server_debuginfo;
-    $XML_RPC_Server_debuginfo = $XML_RPC_Server_debuginfo . $m . "\n";
-}
-
-
-/**
- * A server for receiving and replying to XML RPC requests
- *
- * <code>
- * $server = new XML_RPC_Server(
- *     array(
- *         'isan8' =>
- *             array(
- *                 'function' => 'is_8',
- *                 'signature' =>
- *                      array(
- *                          array('boolean', 'int'),
- *                          array('boolean', 'int', 'boolean'),
- *                          array('boolean', 'string'),
- *                          array('boolean', 'string', 'boolean'),
- *                      ),
- *                 'docstring' => 'Is the value an 8?'
- *             ),
- *     ),
- *     1,
- *     0
- * ); 
- * </code>
- *
- * @category   Web Services
- * @package    XML_RPC
- * @author     Edd Dumbill <edd@usefulinc.com>
- * @author     Stig Bakken <stig@php.net>
- * @author     Martin Jansen <mj@php.net>
- * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1999-2001 Edd Dumbill, 2001-2010 The PHP Group
- * @license    http://www.php.net/license/3_01.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/XML_RPC
- */
-class XML_RPC_Server
-{
-    /**
-     * Should the payload's content be passed through mb_convert_encoding()?
-     *
-     * @see XML_RPC_Server::setConvertPayloadEncoding()
-     * @since Property available since Release 1.5.1
-     * @var boolean
-     */
-    var $convert_payload_encoding = false;
-
-    /**
-     * The dispatch map, listing the methods this server provides.
-     * @var array
-     */
-    var $dmap = array();
-
-    /**
-     * The present response's encoding
-     * @var string
-     * @see XML_RPC_Message::getEncoding()
-     */
-    var $encoding = '';
-
-    /**
-     * Debug mode (0 = off, 1 = on)
-     * @var integer
-     */
-    var $debug = 0;
-
-    /**
-     * The response's HTTP headers
-     * @var string
-     */
-    var $server_headers = '';
-
-    /**
-     * The response's XML payload
-     * @var string
-     */
-    var $server_payload = '';
-
-
-    /**
-     * Constructor for the XML_RPC_Server class
-     *
-     * @param array $dispMap   the dispatch map. An associative array
-     *                          explaining each function. The keys of the main
-     *                          array are the procedure names used by the
-     *                          clients. The value is another associative array
-     *                          that contains up to three elements:
-     *                            + The 'function' element's value is the name
-     *                              of the function or method that gets called.
-     *                              To define a class' method: 'class::method'.
-     *                            + The 'signature' element (optional) is an
-     *                              array describing the return values and
-     *                              parameters
-     *                            + The 'docstring' element (optional) is a
-     *                              string describing what the method does
-     * @param int $serviceNow  should the HTTP response be sent now?
-     *                          (1 = yes, 0 = no)
-     * @param int $debug       should debug output be displayed?
-     *                          (1 = yes, 0 = no)
-     *
-     * @return void
-     */
-    function XML_RPC_Server($dispMap, $serviceNow = 1, $debug = 0)
-    {
-        global $HTTP_RAW_POST_DATA;
-
-        if ($debug) {
-            $this->debug = 1;
-        } else {
-            $this->debug = 0;
-        }
-
-        $this->dmap = $dispMap;
-
-        if ($serviceNow) {
-            $this->service();
-        } else {
-            $this->createServerPayload();
-            $this->createServerHeaders();
-        }
-    }
-
-    /**
-     * @return string  the debug information if debug debug mode is on
-     */
-    function serializeDebug()
-    {
-        global $XML_RPC_Server_debuginfo, $HTTP_RAW_POST_DATA;
-
-        if ($this->debug) {
-            XML_RPC_Server_debugmsg('vvv POST DATA RECEIVED BY SERVER vvv' . "\n"
-                                    . $HTTP_RAW_POST_DATA
-                                    . "\n" . '^^^ END POST DATA ^^^');
-        }
-
-        if ($XML_RPC_Server_debuginfo != '') {
-            return "<!-- PEAR XML_RPC SERVER DEBUG INFO:\n\n"
-                   . str_replace('--', '- - ', $XML_RPC_Server_debuginfo)
-                   . "-->\n";
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Sets whether the payload's content gets passed through
-     * mb_convert_encoding()
-     *
-     * Returns PEAR_ERROR object if mb_convert_encoding() isn't available.
-     *
-     * @param int $in  where 1 = on, 0 = off
-     *
-     * @return void
-     *
-     * @see XML_RPC_Message::getEncoding()
-     * @since Method available since Release 1.5.1
-     */
-    function setConvertPayloadEncoding($in)
-    {
-        if ($in && !function_exists('mb_convert_encoding')) {
-            return $this->raiseError('mb_convert_encoding() is not available',
-                              XML_RPC_ERROR_PROGRAMMING);
-        }
-        $this->convert_payload_encoding = $in;
-    }
-
-    /**
-     * Sends the response
-     *
-     * The encoding and content-type are determined by
-     * XML_RPC_Message::getEncoding()
-     *
-     * @return void
-     *
-     * @uses XML_RPC_Server::createServerPayload(),
-     *       XML_RPC_Server::createServerHeaders()
-     */
-    function service()
-    {
-        if (!$this->server_payload) {
-            $this->createServerPayload();
-        }
-        if (!$this->server_headers) {
-            $this->createServerHeaders();
-        }
-
-        /*
-         * $server_headers needs to remain a string for compatibility with
-         * old scripts using this package, but PHP 4.4.2 no longer allows
-         * line breaks in header() calls.  So, we split each header into
-         * an individual call.  The initial replace handles the off chance
-         * that someone composed a single header with multiple lines, which
-         * the RFCs allow.
-         */
-        $this->server_headers = preg_replace("@[\r\n]+[ \t]+@",
-                                ' ', trim($this->server_headers));
-        $headers = preg_split("@[\r\n]+@", $this->server_headers);
-        foreach ($headers as $header)
-        {
-            header($header);
-        }
-
-        print $this->server_payload;
-    }
-
-    /**
-     * Generates the payload and puts it in the $server_payload property
-     *
-     * If XML_RPC_Server::setConvertPayloadEncoding() was set to true,
-     * the payload gets passed through mb_convert_encoding()
-     * to ensure the payload matches the encoding set in the
-     * XML declaration.  The encoding type can be manually set via
-     * XML_RPC_Message::setSendEncoding().
-     *
-     * @return void
-     *
-     * @uses XML_RPC_Server::parseRequest(), XML_RPC_Server::$encoding,
-     *       XML_RPC_Response::serialize(), XML_RPC_Server::serializeDebug()
-     * @see  XML_RPC_Server::setConvertPayloadEncoding()
-     */
-    function createServerPayload()
-    {
-        $r = $this->parseRequest();
-        $this->server_payload = '<?xml version="1.0" encoding="'
-                              . $this->encoding . '"?>' . "\n"
-                              . $this->serializeDebug()
-                              . $r->serialize();
-        if ($this->convert_payload_encoding) {
-            $this->server_payload = mb_convert_encoding($this->server_payload,
-                                                        $this->encoding);
-        }
-    }
-
-    /**
-     * Determines the HTTP headers and puts them in the $server_headers
-     * property
-     *
-     * @return boolean  TRUE if okay, FALSE if $server_payload isn't set.
-     *
-     * @uses XML_RPC_Server::createServerPayload(),
-     *       XML_RPC_Server::$server_headers
-     */
-    function createServerHeaders()
-    {
-        if (!$this->server_payload) {
-            return false;
-        }
-        $this->server_headers = 'Content-Length: '
-                              . strlen($this->server_payload) . "\r\n"
-                              . 'Content-Type: text/xml;'
-                              . ' charset=' . $this->encoding;
-        return true;
-    }
-
-    /**
-     * @return array
-     */
-    function verifySignature($in, $sig)
-    {
-        for ($i = 0; $i < sizeof($sig); $i++) {
-            // check each possible signature in turn
-            $cursig = $sig[$i];
-            if (sizeof($cursig) == $in->getNumParams() + 1) {
-                $itsOK = 1;
-                for ($n = 0; $n < $in->getNumParams(); $n++) {
-                    $p = $in->getParam($n);
-                    // print "<!-- $p -->\n";
-                    if ($p->kindOf() == 'scalar') {
-                        $pt = $p->scalartyp();
-                    } else {
-                        $pt = $p->kindOf();
-                    }
-                    // $n+1 as first type of sig is return type
-                    if ($pt != $cursig[$n+1]) {
-                        $itsOK = 0;
-                        $pno = $n+1;
-                        $wanted = $cursig[$n+1];
-                        $got = $pt;
-                        break;
-                    }
-                }
-                if ($itsOK) {
-                    return array(1);
-                }
-            }
-        }
-        if (isset($wanted)) {
-            return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");
-        } else {
-            $allowed = array();
-            foreach ($sig as $val) {
-                end($val);
-                $allowed[] = key($val);
-            }
-            $allowed = array_unique($allowed);
-            $last = count($allowed) - 1;
-            if ($last > 0) {
-                $allowed[$last] = 'or ' . $allowed[$last];
-            }
-            return array(0,
-                         'Signature permits ' . implode(', ', $allowed)
-                                . ' parameters but the request had '
-                                . $in->getNumParams());
-        }
-    }
-
-    /**
-     * @return object  a new XML_RPC_Response object
-     *
-     * @uses XML_RPC_Message::getEncoding(), XML_RPC_Server::$encoding
-     */
-    function parseRequest($data = '')
-    {
-        global $XML_RPC_xh, $HTTP_RAW_POST_DATA,
-                $XML_RPC_err, $XML_RPC_str, $XML_RPC_errxml,
-                $XML_RPC_defencoding, $XML_RPC_Server_dmap;
-
-        if ($data == '') {
-            $data = $HTTP_RAW_POST_DATA;
-        }
-
-        $this->encoding = XML_RPC_Message::getEncoding($data);
-        $parser_resource = xml_parser_create($this->encoding);
-        $parser = (int) $parser_resource;
-
-        $XML_RPC_xh[$parser] = array();
-        $XML_RPC_xh[$parser]['cm']     = 0;
-        $XML_RPC_xh[$parser]['isf']    = 0;
-        $XML_RPC_xh[$parser]['params'] = array();
-        $XML_RPC_xh[$parser]['method'] = '';
-        $XML_RPC_xh[$parser]['stack'] = array();	
-        $XML_RPC_xh[$parser]['valuestack'] = array();	
-
-        $plist = '';
-
-        // decompose incoming XML into request structure
-
-        xml_parser_set_option($parser_resource, XML_OPTION_CASE_FOLDING, true);
-        xml_set_element_handler($parser_resource, 'XML_RPC_se', 'XML_RPC_ee');
-        xml_set_character_data_handler($parser_resource, 'XML_RPC_cd');
-        if (!xml_parse($parser_resource, $data, 1)) {
-            // return XML error as a faultCode
-            $r = new XML_RPC_Response(0,
-                                      $XML_RPC_errxml+xml_get_error_code($parser_resource),
-                                      sprintf('XML error: %s at line %d',
-                                              xml_error_string(xml_get_error_code($parser_resource)),
-                                              xml_get_current_line_number($parser_resource)));
-            xml_parser_free($parser_resource);
-        } elseif ($XML_RPC_xh[$parser]['isf']>1) {
-            $r = new XML_RPC_Response(0,
-                                      $XML_RPC_err['invalid_request'],
-                                      $XML_RPC_str['invalid_request']
-                                      . ': '
-                                      . $XML_RPC_xh[$parser]['isf_reason']);
-            xml_parser_free($parser_resource);
-        } else {
-            xml_parser_free($parser_resource);
-            $m = new XML_RPC_Message($XML_RPC_xh[$parser]['method']);
-            // now add parameters in
-            for ($i = 0; $i < sizeof($XML_RPC_xh[$parser]['params']); $i++) {
-                // print '<!-- ' . $XML_RPC_xh[$parser]['params'][$i]. "-->\n";
-                $plist .= "$i - " . var_export($XML_RPC_xh[$parser]['params'][$i], true) . " \n";
-                $m->addParam($XML_RPC_xh[$parser]['params'][$i]);
-            }
-
-            if ($this->debug) {
-                XML_RPC_Server_debugmsg($plist);
-            }
-
-            // now to deal with the method
-            $methName = $XML_RPC_xh[$parser]['method'];
-            if (strpos($methName, 'system.') === 0) {
-                $dmap = $XML_RPC_Server_dmap;
-                $sysCall = 1;
-            } else {
-                $dmap = $this->dmap;
-                $sysCall = 0;
-            }
-
-            if (isset($dmap[$methName]['function'])
-                && is_string($dmap[$methName]['function'])
-                && strpos($dmap[$methName]['function'], '::') !== false)
-            {
-                $dmap[$methName]['function'] =
-                        explode('::', $dmap[$methName]['function']);
-            }
-
-            if (isset($dmap[$methName]['function'])
-                && is_callable($dmap[$methName]['function']))
-            {
-                // dispatch if exists
-                if (isset($dmap[$methName]['signature'])) {
-                    $sr = $this->verifySignature($m,
-                                                 $dmap[$methName]['signature'] );
-                }
-                if (!isset($dmap[$methName]['signature']) || $sr[0]) {
-                    // if no signature or correct signature
-                    if ($sysCall) {
-                        $r = call_user_func($dmap[$methName]['function'], $this, $m);
-                    } else {
-                        $r = call_user_func($dmap[$methName]['function'], $m);
-                    }
-                    if (!is_a($r, 'XML_RPC_Response')) {
-                        $r = new XML_RPC_Response(0, $XML_RPC_err['not_response_object'],
-                                                  $XML_RPC_str['not_response_object']);
-                    }
-                } else {
-                    $r = new XML_RPC_Response(0, $XML_RPC_err['incorrect_params'],
-                                              $XML_RPC_str['incorrect_params']
-                                              . ': ' . $sr[1]);
-                }
-            } else {
-                // else prepare error response
-                $r = new XML_RPC_Response(0, $XML_RPC_err['unknown_method'],
-                                          $XML_RPC_str['unknown_method']);
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * Echos back the input packet as a string value
-     *
-     * @return void
-     *
-     * Useful for debugging.
-     */
-    function echoInput()
-    {
-        global $HTTP_RAW_POST_DATA;
-
-        $r = new XML_RPC_Response(0);
-        $r->xv = new XML_RPC_Value("'Aha said I: '" . $HTTP_RAW_POST_DATA, 'string');
-        print $r->serialize();
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/airtime_mvc/library/pear/XML/Serializer.php b/airtime_mvc/library/pear/XML/Serializer.php
deleted file mode 100644
index 30442c7fb..000000000
--- a/airtime_mvc/library/pear/XML/Serializer.php
+++ /dev/null
@@ -1,1255 +0,0 @@
-<?PHP
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Serializer
- *
- * Creates XML documents from PHP data structures like arrays, objects or scalars.
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Serializer
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Serializer.php,v 1.61 2009/06/12 02:11:44 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Serializer
- * @see       XML_Unserializer
- */
-
-/**
- * uses PEAR error management
- */
-require_once 'PEAR.php';
-
-/**
- * uses XML_Util to create XML tags
- */
-require_once 'XML/Util.php';
-
-/**
- * option: string used for indentation
- *
- * Possible values:
- * - any string (default is any string)
- */
-define('XML_SERIALIZER_OPTION_INDENT', 'indent');
-
-/**
- * option: string used for linebreaks
- *
- * Possible values:
- * - any string (default is \n)
- */
-define('XML_SERIALIZER_OPTION_LINEBREAKS', 'linebreak');
-
-/**
- * option: enable type hints
- *
- * Possible values:
- * - true
- * - false
- */
-define('XML_SERIALIZER_OPTION_TYPEHINTS', 'typeHints');
-
-/**
- * option: add an XML declaration
- *
- * Possible values:
- * - true
- * - false
- */
-define('XML_SERIALIZER_OPTION_XML_DECL_ENABLED', 'addDecl');
-
-/**
- * option: encoding of the document
- *
- * Possible values:
- * - any valid encoding
- * - null (default)
- */
-define('XML_SERIALIZER_OPTION_XML_ENCODING', 'encoding');
-
-/**
- * option: default name for tags
- *
- * Possible values:
- * - any string (XML_Serializer_Tag is default)
- */
-define('XML_SERIALIZER_OPTION_DEFAULT_TAG', 'defaultTagName');
-
-/**
- * option: use classname for objects in indexed arrays
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME', 'classAsTagName');
-
-/**
- * option: attribute where original key is stored
- *
- * Possible values:
- * - any string (default is _originalKey)
- */
-define('XML_SERIALIZER_OPTION_ATTRIBUTE_KEY', 'keyAttribute');
-
-/**
- * option: attribute for type (only if typeHints => true)
- *
- * Possible values:
- * - any string (default is _type)
- */
-define('XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE', 'typeAttribute');
-
-/**
- * option: attribute for class (only if typeHints => true)
- *
- * Possible values:
- * - any string (default is _class)
- */
-define('XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS', 'classAttribute');
-
-/**
- * option: scalar values (strings, ints,..) will be serialized as attribute
- *
- * Possible values:
- * - true
- * - false (default)
- * - array which sets this option on a per-tag basis
- */
-define('XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES', 'scalarAsAttributes');
-
-/**
- * option: prepend string for attributes
- *
- * Possible values:
- * - any string (default is any string)
- */
-define('XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES', 'prependAttributes');
-
-/**
- * option: indent the attributes, if set to '_auto',
- * it will indent attributes so they all start at the same column
- *
- * Possible values:
- * - true
- * - false (default)
- * - '_auto'
- */
-define('XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES', 'indentAttributes');
-
-/**
- * option: use 'simplexml' to use parent name as tagname
- * if transforming an indexed array
- *
- * Possible values:
- * - XML_SERIALIZER_MODE_DEFAULT (default)
- * - XML_SERIALIZER_MODE_SIMPLEXML
- */
-define('XML_SERIALIZER_OPTION_MODE', 'mode');
-
-/**
- * option: add a doctype declaration
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_SERIALIZER_OPTION_DOCTYPE_ENABLED', 'addDoctype');
-
-/**
- * option: supply a string or an array with id and uri
- * ({@see XML_Util::getDoctypeDeclaration()}
- *
- * Possible values:
- * - string
- * - array
- */
-define('XML_SERIALIZER_OPTION_DOCTYPE', 'doctype');
-
-/**
- * option: name of the root tag
- *
- * Possible values:
- * - string
- * - null (default)
- */
-define('XML_SERIALIZER_OPTION_ROOT_NAME', 'rootName');
-
-/**
- * option: attributes of the root tag
- *
- * Possible values:
- * - array
- */
-define('XML_SERIALIZER_OPTION_ROOT_ATTRIBS', 'rootAttributes');
-
-/**
- * option: all values in this key will be treated as attributes
- *
- * Possible values:
- * - string
- */
-define('XML_SERIALIZER_OPTION_ATTRIBUTES_KEY', 'attributesArray');
-
-/**
- * option: this value will be used directly as content,
- * instead of creating a new tag, may only be used
- * in conjuction with attributesArray
- *
- * Possible values:
- * - string
- * - null (default)
- */
-define('XML_SERIALIZER_OPTION_CONTENT_KEY', 'contentName');
-
-/**
- * option: this value will be used in a comment, instead of creating a new tag
- *
- * Possible values:
- * - string
- * - null (default)
- */
-define('XML_SERIALIZER_OPTION_COMMENT_KEY', 'commentName');
-
-/**
- * option: tag names that will be changed
- *
- * Possible values:
- * - array
- */
-define('XML_SERIALIZER_OPTION_TAGMAP', 'tagMap');
-
-/**
- * option: function that will be applied before serializing
- *
- * Possible values:
- * - any valid PHP callback
- */
-define('XML_SERIALIZER_OPTION_ENCODE_FUNC', 'encodeFunction');
-
-/**
- * option: namespace to use for the document
- *
- * Possible values:
- * - string
- * - null (default)
- */
-define('XML_SERIALIZER_OPTION_NAMESPACE', 'namespace');
-
-/**
- * option: type of entities to replace
- *
- * Possible values:
- * - XML_SERIALIZER_ENTITIES_NONE
- * - XML_SERIALIZER_ENTITIES_XML (default)
- * - XML_SERIALIZER_ENTITIES_XML_REQUIRED
- * - XML_SERIALIZER_ENTITIES_HTML
- */
-define('XML_SERIALIZER_OPTION_ENTITIES', 'replaceEntities');
-
-/**
- * option: whether to return the result of the serialization from serialize()
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_SERIALIZER_OPTION_RETURN_RESULT', 'returnResult');
-
-/**
- * option: whether to ignore properties that are set to null
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_SERIALIZER_OPTION_IGNORE_NULL', 'ignoreNull');
-
-/**
- * option: whether to use cdata sections for character data
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_SERIALIZER_OPTION_CDATA_SECTIONS', 'cdata');
-
-/**
- * option: whether a boolean FALSE value should become a string
- *
- * Possible values:
- * - true
- * - false (default)
- *
- * @since 0.20.0
- */
-define('XML_SERIALIZER_OPTION_FALSE_AS_STRING', 'falseAsString');
-
-/**
- * default mode
- */
-define('XML_SERIALIZER_MODE_DEFAULT', 'default');
-
-/**
- * SimpleXML mode
- *
- * When serializing indexed arrays, the key of the parent value is used as a tagname.
- */
-define('XML_SERIALIZER_MODE_SIMPLEXML', 'simplexml');
-
-/**
- * error code for no serialization done
- */
-define('XML_SERIALIZER_ERROR_NO_SERIALIZATION', 51);
-
-/**
- * do not replace entitites
- */
-define('XML_SERIALIZER_ENTITIES_NONE', XML_UTIL_ENTITIES_NONE);
-
-/**
- * replace all XML entitites
- * This setting will replace <, >, ", ' and &
- */
-define('XML_SERIALIZER_ENTITIES_XML', XML_UTIL_ENTITIES_XML);
-
-/**
- * replace only required XML entitites
- * This setting will replace <, " and &
- */
-define('XML_SERIALIZER_ENTITIES_XML_REQUIRED', XML_UTIL_ENTITIES_XML_REQUIRED);
-
-/**
- * replace HTML entitites
- * @link    http://www.php.net/htmlentities
- */
-define('XML_SERIALIZER_ENTITIES_HTML', XML_UTIL_ENTITIES_HTML);
-
-/**
- * Creates XML documents from PHP data structures like arrays, objects or scalars.
- *
- * This class can be used in two modes:
- *
- *  1. Create an XML document from an array or object that is processed by other
- *    applications. That means you can create an RDF document from an array in the
- *    following format:
- *    <code>
- *    $data = array(
- *        'channel' => array(
- *            'title' => 'Example RDF channel',
- *            'link'  => 'http://www.php-tools.de',
- *            'image' => array(
- *                'title' => 'Example image',
- *                'url'   => 'http://www.php-tools.de/image.gif',
- *                'link'  => 'http://www.php-tools.de'
- *            ),
- *            array(
- *                'title' => 'Example item',
- *                'link'  => 'http://example.com'
- *            ),
- *            array(
- *                'title' => 'Another Example item',
- *                'link'  => 'http://example.org'
- *            )
- *        )
- *    );
- *    </code>
- *
- *    To create an RDF document from this array, do the following:
- *
- *    <code>
- *    require_once 'XML/Serializer.php';
- *    $options = array(
- *       XML_SERIALIZER_OPTION_INDENT      => "\t",     // indent with tabs
- *       XML_SERIALIZER_OPTION_LINEBREAKS  => "\n",     // use UNIX line breaks
- *       XML_SERIALIZER_OPTION_ROOT_NAME   => 'rdf:RDF',// root tag
- *       XML_SERIALIZER_OPTION_DEFAULT_TAG => 'item'    // tag for values
- *                                                      // with numeric keys
- *    );
- *    $serializer = new XML_Serializer($options);
- *    $rdf        = $serializer->serialize($data);
- *    </code>
- *
- *    You will get a complete XML document that can be processed like any RDF document.
- *
- * 2. This class can be used to serialize any data structure in a way that it can
- *    later be unserialized again.  XML_Serializer will store the type of the value
- *    and additional meta information in attributes of the surrounding tag. This
- *    meta information can later be used to restore the original data structure
- *    in PHP. If you want XML_Serializer to add meta information to the tags, add
- *    <code>
- *      XML_SERIALIZER_OPTION_TYPEHINTS => true
- *    </code>
- *    to the options array in the constructor.
- *
- * @category  XML
- * @package   XML_Serializer
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 0.20.0
- * @link      http://pear.php.net/package/XML_Serializer
- * @see       XML_Unserializer
- * @todo      replace extending PEAR class with instead using a PEAR_Error object
- */
-class XML_Serializer extends PEAR
-{
-    /**
-     * List of all available options
-     *
-     * @access private
-     * @var    array
-     */
-    var $_knownOptions = array(
-        XML_SERIALIZER_OPTION_INDENT,
-        XML_SERIALIZER_OPTION_LINEBREAKS,
-        XML_SERIALIZER_OPTION_TYPEHINTS,
-        XML_SERIALIZER_OPTION_XML_DECL_ENABLED,
-        XML_SERIALIZER_OPTION_XML_ENCODING,
-        XML_SERIALIZER_OPTION_DEFAULT_TAG,
-        XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME,
-        XML_SERIALIZER_OPTION_ATTRIBUTE_KEY,
-        XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE,
-        XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS,
-        XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES,
-        XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES,
-        XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES,
-        XML_SERIALIZER_OPTION_MODE,
-        XML_SERIALIZER_OPTION_DOCTYPE_ENABLED,
-        XML_SERIALIZER_OPTION_DOCTYPE,
-        XML_SERIALIZER_OPTION_ROOT_NAME,
-        XML_SERIALIZER_OPTION_ROOT_ATTRIBS,
-        XML_SERIALIZER_OPTION_ATTRIBUTES_KEY,
-        XML_SERIALIZER_OPTION_CONTENT_KEY,
-        XML_SERIALIZER_OPTION_COMMENT_KEY,
-        XML_SERIALIZER_OPTION_TAGMAP,
-        XML_SERIALIZER_OPTION_ENCODE_FUNC,
-        XML_SERIALIZER_OPTION_NAMESPACE,
-        XML_SERIALIZER_OPTION_ENTITIES,
-        XML_SERIALIZER_OPTION_RETURN_RESULT,
-        XML_SERIALIZER_OPTION_IGNORE_NULL,
-        XML_SERIALIZER_OPTION_CDATA_SECTIONS,
-    );
-
-    /**
-     * Default options for the serialization
-     *
-     * @access private
-     * @var    array
-     */
-    var $_defaultOptions = array(
-
-        // string used for indentation
-        XML_SERIALIZER_OPTION_INDENT => '',
-
-        // string used for newlines
-        XML_SERIALIZER_OPTION_LINEBREAKS => "\n",
-
-        // automatically add type hin attributes
-        XML_SERIALIZER_OPTION_TYPEHINTS => false,
-
-        // add an XML declaration
-        XML_SERIALIZER_OPTION_XML_DECL_ENABLED => false,
-
-        // encoding specified in the XML declaration
-        XML_SERIALIZER_OPTION_XML_ENCODING => null,
-
-        // tag used for indexed arrays or invalid names
-        XML_SERIALIZER_OPTION_DEFAULT_TAG => 'XML_Serializer_Tag',
-
-        // use classname for objects in indexed arrays
-        XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME => false,
-
-        // attribute where original key is stored
-        XML_SERIALIZER_OPTION_ATTRIBUTE_KEY => '_originalKey',
-
-        // attribute for type (only if typeHints => true)
-        XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE => '_type',
-
-        // attribute for class of objects (only if typeHints => true)
-        XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS => '_class',
-
-        // scalar values (strings, ints,..) will be serialized as attribute
-        XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES => false,
-
-        // prepend string for attributes
-        XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES => '',
-
-        // indent the attributes, if set to '_auto',
-        // it will indent attributes so they all start at the same column
-        XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES => false,
-
-        // use XML_SERIALIZER_MODE_SIMPLEXML to use parent name as tagname
-        // if transforming an indexed array
-        XML_SERIALIZER_OPTION_MODE => XML_SERIALIZER_MODE_DEFAULT,
-
-        // add a doctype declaration
-        XML_SERIALIZER_OPTION_DOCTYPE_ENABLED => false,
-
-        // supply a string or an array with id and uri
-        // ({@see XML_Util::getDoctypeDeclaration()}
-        XML_SERIALIZER_OPTION_DOCTYPE => null,
-
-        // name of the root tag
-        XML_SERIALIZER_OPTION_ROOT_NAME => null,
-
-        // attributes of the root tag
-        XML_SERIALIZER_OPTION_ROOT_ATTRIBS => array(),
-
-        // all values in this key will be treated as attributes
-        XML_SERIALIZER_OPTION_ATTRIBUTES_KEY => null,
-
-        // this value will be used directly as content,
-        // instead of creating a new tag, may only be used
-        // in conjuction with attributesArray
-        XML_SERIALIZER_OPTION_CONTENT_KEY => null,
-
-        // this value will be used directly as comment,
-        // instead of creating a new tag, may only be used
-        // in conjuction with attributesArray
-        XML_SERIALIZER_OPTION_COMMENT_KEY => null,
-
-        // tag names that will be changed
-        XML_SERIALIZER_OPTION_TAGMAP => array(),
-
-        // function that will be applied before serializing
-        XML_SERIALIZER_OPTION_ENCODE_FUNC => null,
-
-        // namespace to use
-        XML_SERIALIZER_OPTION_NAMESPACE => null,
-
-        // type of entities to replace,
-        XML_SERIALIZER_OPTION_ENTITIES => XML_SERIALIZER_ENTITIES_XML,
-
-        // serialize() returns the result of the serialization instead of true
-        XML_SERIALIZER_OPTION_RETURN_RESULT => false,
-
-        // ignore properties that are set to null
-        XML_SERIALIZER_OPTION_IGNORE_NULL => false,
-
-        // Whether to use cdata sections for plain character data
-        XML_SERIALIZER_OPTION_CDATA_SECTIONS => false,
-
-        // Whether to convert a boolean FALSE into a string
-        XML_SERIALIZER_OPTION_FALSE_AS_STRING => false,
-    );
-
-    /**
-     * Options for the serialization
-     *
-     * @access public
-     * @var    array
-     */
-    var $options = array();
-
-    /**
-     * Current tag depth
-     *
-     * @access private
-     * @var    integer
-     */
-    var $_tagDepth = 0;
-
-    /**
-     * Serialized representation of the data
-     *
-     * @access private
-     * @var    string
-     */
-    var $_serializedData = null;
-
-    /**
-     * Constructor
-     *
-     * @param mixed $options array containing options for the serialization
-     *
-     * @access public
-     */
-    function XML_Serializer( $options = null )
-    {
-        $this->PEAR();
-        if (is_array($options)) {
-            $this->options = array_merge($this->_defaultOptions, $options);
-        } else {
-            $this->options = $this->_defaultOptions;
-        }
-    }
-
-    /**
-     * Return the package version number
-     *
-     * @access public
-     * @static
-     * @return string the version number of XML_Serializer
-     */
-    function apiVersion()
-    {
-        return '0.20.0';
-    }
-
-    /**
-     * Reset all options to default options
-     *
-     * @return void
-     * @access public
-     */
-    function resetOptions()
-    {
-        $this->options = $this->_defaultOptions;
-    }
-
-    /**
-     * Set an option
-     *
-     * You can use this method if you do not want
-     * to set all options in the constructor.
-     *
-     * @param string $name  option name
-     * @param mixed  $value option value
-     *
-     * @return void
-     * @access public
-     */
-    function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-
-    /**
-     * Sets several options at once
-     *
-     * You can use this method if you do not want
-     * to set all options in the constructor.
-     *
-     * @param array $options options array
-     *
-     * @return void
-     * @access public
-     */
-    function setOptions($options)
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-    /**
-     * serialize data
-     *
-     * @param mixed $data    data to serialize
-     * @param array $options options array
-     *
-     * @return boolean true on success, pear error on failure
-     * @access public
-     * @uses XML_Util::getDoctypeDeclaration()
-     * @uses XML_Util::getXMLDeclaration()
-     * @internal uses error suppression "@settype()"
-     */
-    function serialize($data, $options = null)
-    {
-        // if options have been specified, use them instead
-        // of the previously defined ones
-        if (is_array($options)) {
-            $optionsBak = $this->options;
-            if (isset($options['overrideOptions'])
-                && $options['overrideOptions'] == true
-            ) {
-                $this->options = array_merge($this->_defaultOptions, $options);
-            } else {
-                $this->options = array_merge($this->options, $options);
-            }
-        } else {
-            $optionsBak = null;
-        }
-
-        //  start depth is zero
-        $this->_tagDepth = 0;
-
-        $rootAttributes = $this->options[XML_SERIALIZER_OPTION_ROOT_ATTRIBS];
-        if (isset($this->options[XML_SERIALIZER_OPTION_NAMESPACE])
-            && is_array($this->options[XML_SERIALIZER_OPTION_NAMESPACE])
-        ) {
-            $rootAttributes['xmlns:'
-                . $this->options[XML_SERIALIZER_OPTION_NAMESPACE][0]] =
-                $this->options[XML_SERIALIZER_OPTION_NAMESPACE][1];
-        }
-
-        $this->_serializedData = '';
-        // serialize an array
-        if (is_array($data)) {
-            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
-                $tagName = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
-            } else {
-                $tagName = 'array';
-            }
-
-            $this->_serializedData .=
-                $this->_serializeArray($data, $tagName, $rootAttributes);
-        } elseif (is_object($data)) {
-            // serialize an object
-            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
-                $tagName = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
-            } else {
-                $tagName = get_class($data);
-            }
-            $this->_serializedData .=
-                $this->_serializeObject($data, $tagName, $rootAttributes);
-        } else {
-            $tag = array();
-            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
-                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
-            } else {
-                $tag['qname'] = gettype($data);
-            }
-            $tagName = $tag['qname'];
-            if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
-                $rootAttributes[$this->
-                    options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] = gettype($data);
-            }
-
-            if (!is_bool($data)) {
-                $tag['content'] = $data;
-            } elseif ($data === false) {
-                if ($this->options[XML_SERIALIZER_OPTION_FALSE_AS_STRING] === true) {
-                    $tag['content'] = '0';
-                } else {
-                    $tag['content'] = '';
-                }
-            } else {
-                $tag['content'] = $data;
-            }
-
-            @settype($data, 'string');
-            $tag['attributes']     = $rootAttributes;
-            $this->_serializedData = $this->_createXMLTag($tag);
-        }
-
-        // add doctype declaration
-        if ($this->options[XML_SERIALIZER_OPTION_DOCTYPE_ENABLED] === true) {
-            $this->_serializedData =
-                XML_Util::getDoctypeDeclaration($tagName,
-                $this->options[XML_SERIALIZER_OPTION_DOCTYPE])
-                . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]
-                . $this->_serializedData;
-        }
-
-        //  build xml declaration
-        if ($this->options[XML_SERIALIZER_OPTION_XML_DECL_ENABLED]) {
-            $atts                  = array();
-            $this->_serializedData = XML_Util::getXMLDeclaration('1.0',
-                $this->options[XML_SERIALIZER_OPTION_XML_ENCODING])
-                . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]
-                . $this->_serializedData;
-        }
-
-        if ($this->options[XML_SERIALIZER_OPTION_RETURN_RESULT] === true) {
-            $result = $this->_serializedData;
-        } else {
-            $result = true;
-        }
-
-        if ($optionsBak !== null) {
-            $this->options = $optionsBak;
-        }
-
-        return $result;
-    }
-
-    /**
-     * get the result of the serialization
-     *
-     * @access public
-     * @return string serialized XML
-     */
-    function getSerializedData()
-    {
-        if ($this->_serializedData == null) {
-            return $this->raiseError('No serialized data available. '
-                . 'Use XML_Serializer::serialize() first.',
-                XML_SERIALIZER_ERROR_NO_SERIALIZATION);
-        }
-        return $this->_serializedData;
-    }
-
-    /**
-     * serialize any value
-     *
-     * This method checks for the type of the value and calls the appropriate method
-     *
-     * @param mixed  $value      tag value
-     * @param string $tagName    tag name
-     * @param array  $attributes attributes
-     *
-     * @return string
-     * @access private
-     */
-    function _serializeValue($value, $tagName = null, $attributes = array())
-    {
-        if (is_array($value)) {
-            $xml = $this->_serializeArray($value, $tagName, $attributes);
-        } elseif (is_object($value)) {
-            $xml = $this->_serializeObject($value, $tagName);
-        } else {
-            $tag = array(
-                          'qname'      => $tagName,
-                          'attributes' => $attributes,
-                          'content'    => $value
-                        );
-            $xml = $this->_createXMLTag($tag);
-        }
-        return $xml;
-    }
-
-    /**
-     * serialize an array
-     *
-     * @param array  &$array     array to serialize
-     * @param string $tagName    name of the root tag
-     * @param array  $attributes attributes for the root tag
-     *
-     * @return string $string serialized data
-     * @access private
-     * @uses XML_Util::isValidName() to check, whether key has to be substituted
-     * @uses XML_Util::replaceEntities()
-     * @uses XML_Util::createComment()
-     * @uses PEAR::popExpect()
-     * @uses PEAR::expectError()
-     */
-    function _serializeArray(&$array, $tagName = null, $attributes = array())
-    {
-        $_content = null;
-        $_comment = null;
-
-        // check for comment
-        if ($this->options[XML_SERIALIZER_OPTION_COMMENT_KEY] !== null) {
-            if (isset($array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]])
-            ) {
-                $_comment =
-                    $array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]];
-                unset($array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]]);
-            }
-        }
-
-        /**
-         * check for special attributes
-         */
-        if ($this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY] !== null) {
-            if (isset($array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]])
-            ) {
-                $attributes =
-                    $array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]];
-                unset($array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]]);
-            }
-            /**
-             * check for special content
-             */
-            if ($this->options[XML_SERIALIZER_OPTION_CONTENT_KEY] !== null) {
-                if (isset($array[$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]])
-                ) {
-                    $_content =
-                        XML_Util::replaceEntities($array
-                        [$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]]);
-                    unset($array[$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]]);
-                }
-            }
-        }
-
-        if ($this->options[XML_SERIALIZER_OPTION_IGNORE_NULL] === true) {
-            foreach (array_keys($array) as $key) {
-                if (is_null($array[$key])) {
-                    unset($array[$key]);
-                }
-            }
-        }
-
-        /*
-        * if mode is set to simpleXML, check whether
-        * the array is associative or indexed
-        */
-        if (is_array($array) && !empty($array)
-            && $this->options[XML_SERIALIZER_OPTION_MODE]
-            == XML_SERIALIZER_MODE_SIMPLEXML
-        ) {
-            $indexed = true;
-            foreach ($array as $key => $val) {
-                if (!is_int($key)) {
-                    $indexed = false;
-                    break;
-                }
-            }
-
-            if ($indexed
-                && $this->options[XML_SERIALIZER_OPTION_MODE]
-                == XML_SERIALIZER_MODE_SIMPLEXML
-            ) {
-                $string = '';
-                foreach ($array as $key => $val) {
-                    $string .= $this->_serializeValue($val, $tagName, $attributes);
-
-                    $string .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
-                    // do indentation
-                    if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
-                        && $this->_tagDepth>0
-                    ) {
-                        $string .=
-                            str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
-                            $this->_tagDepth);
-                    }
-                }
-                return rtrim($string);
-            }
-        }
-
-        $scalarAsAttributes = false;
-        if (is_array($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES])
-            && isset($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES]
-            [$tagName])
-        ) {
-            $scalarAsAttributes =
-                $this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES][$tagName];
-        } elseif ($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES] === true
-        ) {
-            $scalarAsAttributes = true;
-        }
-
-        if ($scalarAsAttributes === true) {
-            $this->expectError('*');
-            foreach ($array as $key => $value) {
-                if (is_scalar($value) && (XML_Util::isValidName($key) === true)) {
-                    unset($array[$key]);
-                    $attributes[$this->options
-                        [XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES].$key] = $value;
-                }
-            }
-            $this->popExpect();
-        } elseif (is_array($scalarAsAttributes)) {
-            $this->expectError('*');
-            foreach ($scalarAsAttributes as $key) {
-                if (!isset($array[$key])) {
-                    continue;
-                }
-                $value = $array[$key];
-                if (is_scalar($value) && (XML_Util::isValidName($key) === true)) {
-                    unset($array[$key]);
-                    $attributes[$this->options
-                        [XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES].$key] = $value;
-                }
-            }
-            $this->popExpect();
-        }
-
-        // check for empty array => create empty tag
-        if (empty($array)) {
-            $tag = array(
-                            'qname'      => $tagName,
-                            'content'    => $_content,
-                            'attributes' => $attributes
-                        );
-        } else {
-            $this->_tagDepth++;
-            $tmp = $_content . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
-            foreach ($array as $key => $value) {
-                // do indentation
-                if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
-                    && $this->_tagDepth>0
-                ) {
-                    $tmp .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
-                        $this->_tagDepth);
-                }
-
-                // copy key
-                $origKey = $key;
-                $this->expectError('*');
-                // key cannot be used as tagname => use default tag
-                $valid = XML_Util::isValidName($key);
-                $this->popExpect();
-                if (PEAR::isError($valid)) {
-                    if ($this->options[XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME]
-                        && is_object($value)
-                    ) {
-                        $key = get_class($value);
-                    } else {
-                        $key = $this->_getDefaultTagname($tagName);
-                    }
-                }
-
-                // once we've established the true $key, is there a tagmap for it?
-                if (isset($this->options[XML_SERIALIZER_OPTION_TAGMAP][$key])) {
-                    $key = $this->options[XML_SERIALIZER_OPTION_TAGMAP][$key];
-                }
-
-                $atts = array();
-                if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
-                    $atts[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] =
-                        gettype($value);
-                    if ($key !== $origKey) {
-                        $atts[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_KEY]] =
-                            (string)$origKey;
-                    }
-                }
-
-                $tmp .= $this->_createXMLTag(array(
-                    'qname'      => $key,
-                    'attributes' => $atts,
-                    'content'    => $value
-                ));
-                $tmp .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
-            }
-
-            $this->_tagDepth--;
-            if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
-                && $this->_tagDepth>0
-            ) {
-                $tmp .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
-                    $this->_tagDepth);
-            }
-
-            if (trim($tmp) === '') {
-                $tmp = null;
-            }
-
-            $tag = array(
-                          'qname'      => $tagName,
-                          'content'    => $tmp,
-                          'attributes' => $attributes
-                        );
-        }
-        if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
-            if (!isset($tag['attributes']
-                [$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]])
-            ) {
-                $tag['attributes']
-                    [$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] = 'array';
-            }
-        }
-
-        $string = '';
-        if (!is_null($_comment)) {
-            $string .= XML_Util::createComment($_comment);
-            $string .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
-            if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
-                && $this->_tagDepth>0
-            ) {
-                $string .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
-                    $this->_tagDepth);
-            }
-        }
-        $string .= $this->_createXMLTag($tag, false);
-        return $string;
-    }
-
-    /**
-     * get the name of the default tag.
-     *
-     * The name of the parent tag needs to be passed as the
-     * default name can depend on the context.
-     *
-     * @param string $parent name of the parent tag
-     *
-     * @return string default tag name
-     */
-    function _getDefaultTagname($parent)
-    {
-        if (is_string($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG])) {
-            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG];
-        }
-        if (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG][$parent])) {
-            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG][$parent];
-        } elseif (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]
-            ['#default'])
-        ) {
-            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]['#default'];
-        } elseif (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]
-            ['__default'])
-        ) {
-            // keep this for BC
-            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]['__default'];
-        }
-        return 'XML_Serializer_Tag';
-    }
-
-    /**
-     * serialize an object
-     *
-     * @param object &$object    object to serialize
-     * @param string $tagName    tag name
-     * @param array  $attributes attributes
-     *
-     * @return string $string serialized data
-     * @access private
-     */
-    function _serializeObject(&$object, $tagName = null, $attributes = array())
-    {
-        // check for magic function
-        if (method_exists($object, '__sleep')) {
-            $propNames = $object->__sleep();
-            if (is_array($propNames)) {
-                $properties = array();
-                foreach ($propNames as $propName) {
-                    $properties[$propName] = $object->$propName;
-                }
-            } else {
-                $properties = get_object_vars($object);
-            }
-        } else {
-            $properties = get_object_vars($object);
-        }
-
-        if (empty($tagName)) {
-            $tagName = get_class($object);
-        }
-
-        // typehints activated?
-        if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
-            $attributes[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]]  =
-                'object';
-            $attributes[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS]] =
-                get_class($object);
-        }
-        $string = $this->_serializeArray($properties, $tagName, $attributes);
-        return $string;
-    }
-
-    /**
-     * create a tag from an array
-     * this method awaits an array in the following format
-     * array(
-     *       'qname'        => $tagName,
-     *       'attributes'   => array(),
-     *       'content'      => $content,      // optional
-     *       'namespace'    => $namespace     // optional
-     *       'namespaceUri' => $namespaceUri  // optional
-     *   )
-     *
-     * @param array   $tag       tag definition
-     * @param boolean $firstCall whether or not this is the first call
-     *
-     * @return string $string XML tag
-     * @access private
-     */
-    function _createXMLTag($tag, $firstCall = true)
-    {
-        // build fully qualified tag name
-        if ($this->options[XML_SERIALIZER_OPTION_NAMESPACE] !== null) {
-            if (is_array($this->options[XML_SERIALIZER_OPTION_NAMESPACE])) {
-                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_NAMESPACE][0]
-                    . ':' . $tag['qname'];
-            } else {
-                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_NAMESPACE]
-                    . ':' . $tag['qname'];
-            }
-        }
-
-        // attribute indentation
-        if ($this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES] !== false) {
-            $multiline = true;
-            $indent    = str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
-                $this->_tagDepth);
-
-            if ($this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES] == '_auto') {
-                $indent .= str_repeat(' ', (strlen($tag['qname'])+2));
-
-            } else {
-                $indent .= $this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES];
-            }
-        } else {
-            $multiline = false;
-            $indent    = false;
-        }
-
-        if (is_array($tag['content'])) {
-            if (empty($tag['content'])) {
-                $tag['content'] =   '';
-            }
-} elseif (XML_SERIALIZER_OPTION_FALSE_AS_STRING && $tag['content'] === false) {
-$tag['content'] = '0';
-        } elseif (is_scalar($tag['content']) && (string)$tag['content'] == '') {
-            $tag['content'] =   '';
-        }
-
-        // replace XML entities
-        if ($firstCall === true) {
-            if ($this->options[XML_SERIALIZER_OPTION_CDATA_SECTIONS] === true) {
-                $replaceEntities = XML_UTIL_CDATA_SECTION;
-            } else {
-                $replaceEntities = $this->options[XML_SERIALIZER_OPTION_ENTITIES];
-            }
-        } else {
-            // this is a nested call, so value is already encoded
-            // and must not be encoded again
-            $replaceEntities = XML_SERIALIZER_ENTITIES_NONE;
-            // but attributes need to be encoded anyways
-            // (done here because the rest of the code assumes the same encoding
-            // can be used both for attributes and content)
-            foreach ($tag['attributes'] as $k => $v) {
-                $v = XML_Util::replaceEntities($v,
-                    $this->options[XML_SERIALIZER_OPTION_ENTITIES]);
-
-                $tag['attributes'][$k] = $v;
-            }
-        }
-        if (is_scalar($tag['content']) || is_null($tag['content'])) {
-            if ($this->options[XML_SERIALIZER_OPTION_ENCODE_FUNC]) {
-                if ($firstCall === true) {
-                    $tag['content'] = call_user_func($this->
-                        options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['content']);
-                }
-                $tag['attributes'] = array_map($this->
-                    options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['attributes']);
-            }
-            $tag = XML_Util::createTagFromArray($tag, $replaceEntities, $multiline,
-                $indent, $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]);
-        } elseif (is_array($tag['content'])) {
-            $tag = $this->_serializeArray($tag['content'], $tag['qname'],
-                $tag['attributes']);
-        } elseif (is_object($tag['content'])) {
-            $tag = $this->_serializeObject($tag['content'], $tag['qname'],
-                $tag['attributes']);
-        } elseif (is_resource($tag['content'])) {
-            settype($tag['content'], 'string');
-            if ($this->options[XML_SERIALIZER_OPTION_ENCODE_FUNC]) {
-                if ($replaceEntities === true) {
-                    $tag['content'] = call_user_func($this->
-                        options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['content']);
-                }
-                $tag['attributes'] = array_map($this->
-                    options[XML_SERIALIZER_OPTION_ENCODE_FUNC],
-                    $tag['attributes']);
-            }
-            $tag = XML_Util::createTagFromArray($tag, $replaceEntities);
-        }
-        return  $tag;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Unserializer.php b/airtime_mvc/library/pear/XML/Unserializer.php
deleted file mode 100644
index 5f9fb3ff0..000000000
--- a/airtime_mvc/library/pear/XML/Unserializer.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?PHP
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Unserializer
- *
- * Parses any XML document into PHP data structures.
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Serializer
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Unserializer.php,v 1.42 2009/02/09 14:49:52 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Serializer
- * @see       XML_Unserializer
- */
-
-/**
- * uses PEAR error managemt
- */
-require_once 'PEAR.php';
-
-/**
- * uses XML_Parser to unserialize document
- */
-require_once 'XML/Parser.php';
-
-/**
- * option: Convert nested tags to array or object
- *
- * Possible values:
- * - array
- * - object
- * - associative array to define this option per tag name
- */
-define('XML_UNSERIALIZER_OPTION_COMPLEXTYPE', 'complexType');
-
-/**
- * option: Name of the attribute that stores the original key
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY', 'keyAttribute');
-
-/**
- * option: Name of the attribute that stores the type
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE', 'typeAttribute');
-
-/**
- * option: Name of the attribute that stores the class name
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS', 'classAttribute');
-
-/**
- * option: Whether to use the tag name as a class name
- *
- * Possible values:
- * - true or false
- */
-define('XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME', 'tagAsClass');
-
-/**
- * option: Name of the default class
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_DEFAULT_CLASS', 'defaultClass');
-
-/**
- * option: Whether to parse attributes
- *
- * Possible values:
- * - true or false
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE', 'parseAttributes');
-
-/**
- * option: Key of the array to store attributes (if any)
- *
- * Possible values:
- * - any string
- * - false (disabled)
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY', 'attributesArray');
-
-/**
- * option: string to prepend attribute name (if any)
- *
- * Possible values:
- * - any string
- * - false (disabled)
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND', 'prependAttributes');
-
-/**
- * option: key to store the content,
- * if XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE is used
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_CONTENT_KEY', 'contentName');
-
-/**
- * option: map tag names
- *
- * Possible values:
- * - associative array
- */
-define('XML_UNSERIALIZER_OPTION_TAG_MAP', 'tagMap');
-
-/**
- * option: list of tags that will always be enumerated
- *
- * Possible values:
- * - indexed array
- */
-define('XML_UNSERIALIZER_OPTION_FORCE_ENUM', 'forceEnum');
-
-/**
- * option: Encoding of the XML document
- *
- * Possible values:
- * - UTF-8
- * - ISO-8859-1
- */
-define('XML_UNSERIALIZER_OPTION_ENCODING_SOURCE', 'encoding');
-
-/**
- * option: Desired target encoding of the data
- *
- * Possible values:
- * - UTF-8
- * - ISO-8859-1
- */
-define('XML_UNSERIALIZER_OPTION_ENCODING_TARGET', 'targetEncoding');
-
-/**
- * option: Callback that will be applied to textual data
- *
- * Possible values:
- * - any valid PHP callback
- */
-define('XML_UNSERIALIZER_OPTION_DECODE_FUNC', 'decodeFunction');
-
-/**
- * option: whether to return the result of the unserialization from unserialize()
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_UNSERIALIZER_OPTION_RETURN_RESULT', 'returnResult');
-
-/**
- * option: set the whitespace behaviour
- *
- * Possible values:
- * - XML_UNSERIALIZER_WHITESPACE_KEEP
- * - XML_UNSERIALIZER_WHITESPACE_TRIM
- * - XML_UNSERIALIZER_WHITESPACE_NORMALIZE
- */
-define('XML_UNSERIALIZER_OPTION_WHITESPACE', 'whitespace');
-
-/**
- * Keep all whitespace
- */
-define('XML_UNSERIALIZER_WHITESPACE_KEEP', 'keep');
-
-/**
- * remove whitespace from start and end of the data
- */
-define('XML_UNSERIALIZER_WHITESPACE_TRIM', 'trim');
-
-/**
- * normalize whitespace
- */
-define('XML_UNSERIALIZER_WHITESPACE_NORMALIZE', 'normalize');
-
-/**
- * option: whether to ovverride all options that have been set before
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS', 'overrideOptions');
-
-/**
- * option: list of tags, that will not be used as keys
- */
-define('XML_UNSERIALIZER_OPTION_IGNORE_KEYS', 'ignoreKeys');
-
-/**
- * option: whether to use type guessing for scalar values
- */
-define('XML_UNSERIALIZER_OPTION_GUESS_TYPES', 'guessTypes');
-
-/**
- * error code for no serialization done
- */
-define('XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION', 151);
-
-/**
- * XML_Unserializer
- *
- * class to unserialize XML documents that have been created with
- * XML_Serializer. To unserialize an XML document you have to add
- * type hints to the XML_Serializer options.
- *
- * If no type hints are available, XML_Unserializer will guess how
- * the tags should be treated, that means complex structures will be
- * arrays and tags with only CData in them will be strings.
- *
- * <code>
- * require_once 'XML/Unserializer.php';
- *
- * //  be careful to always use the ampersand in front of the new operator
- * $unserializer = &new XML_Unserializer();
- *
- * $unserializer->unserialize($xml);
- *
- * $data = $unserializer->getUnserializedData();
- * <code>
- *
- * @category  XML
- * @package   XML_Serializer
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 0.20.0
- * @link      http://pear.php.net/package/XML_Serializer
- * @see       XML_Serializer
- */
-class XML_Unserializer extends PEAR
-{
-    /**
-     * list of all available options
-     *
-     * @access private
-     * @var    array
-     */
-    var $_knownOptions = array(
-                                XML_UNSERIALIZER_OPTION_COMPLEXTYPE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS,
-                                XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME,
-                                XML_UNSERIALIZER_OPTION_DEFAULT_CLASS,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND,
-                                XML_UNSERIALIZER_OPTION_CONTENT_KEY,
-                                XML_UNSERIALIZER_OPTION_TAG_MAP,
-                                XML_UNSERIALIZER_OPTION_FORCE_ENUM,
-                                XML_UNSERIALIZER_OPTION_ENCODING_SOURCE,
-                                XML_UNSERIALIZER_OPTION_ENCODING_TARGET,
-                                XML_UNSERIALIZER_OPTION_DECODE_FUNC,
-                                XML_UNSERIALIZER_OPTION_RETURN_RESULT,
-                                XML_UNSERIALIZER_OPTION_WHITESPACE,
-                                XML_UNSERIALIZER_OPTION_IGNORE_KEYS,
-                                XML_UNSERIALIZER_OPTION_GUESS_TYPES
-                              );
-    /**
-     * default options for the serialization
-     *
-     * @access private
-     * @var    array
-     */
-    var $_defaultOptions = array(
-        // complex types will be converted to arrays, if no type hint is given
-        XML_UNSERIALIZER_OPTION_COMPLEXTYPE => 'array',
-
-        // get array key/property name from this attribute
-        XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY => '_originalKey',
-
-        // get type from this attribute
-        XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE => '_type',
-
-        // get class from this attribute (if not given, use tag name)
-        XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS => '_class',
-
-        // use the tagname as the classname
-        XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME => true,
-
-        // name of the class that is used to create objects
-        XML_UNSERIALIZER_OPTION_DEFAULT_CLASS => 'stdClass',
-
-        // parse the attributes of the tag into an array
-        XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE => false,
-
-        // parse them into sperate array (specify name of array here)
-        XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY => false,
-
-        // prepend attribute names with this string
-        XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND => '',
-
-        // put cdata found in a tag that has been converted
-        // to a complex type in this key
-        XML_UNSERIALIZER_OPTION_CONTENT_KEY => '_content',
-
-        // use this to map tagnames
-        XML_UNSERIALIZER_OPTION_TAG_MAP => array(),
-
-        // these tags will always be an indexed array
-        XML_UNSERIALIZER_OPTION_FORCE_ENUM => array(),
-
-        // specify the encoding character of the document to parse
-        XML_UNSERIALIZER_OPTION_ENCODING_SOURCE => null,
-
-        // specify the target encoding
-        XML_UNSERIALIZER_OPTION_ENCODING_TARGET => null,
-
-        // function used to decode data
-        XML_UNSERIALIZER_OPTION_DECODE_FUNC => null,
-
-        // unserialize() returns the result of the unserialization instead of true
-        XML_UNSERIALIZER_OPTION_RETURN_RESULT => false,
-
-        // remove whitespace around data
-        XML_UNSERIALIZER_OPTION_WHITESPACE => XML_UNSERIALIZER_WHITESPACE_TRIM,
-
-        // List of tags that will automatically be added to the parent,
-        // instead of adding a new key
-        XML_UNSERIALIZER_OPTION_IGNORE_KEYS => array(),
-
-        // Whether to use type guessing
-        XML_UNSERIALIZER_OPTION_GUESS_TYPES => false
-    );
-
-    /**
-     * current options for the serialization
-     *
-     * @access public
-     * @var    array
-     */
-    var $options = array();
-
-    /**
-     * unserialized data
-     *
-     * @access private
-     * @var    string
-     */
-    var $_unserializedData = null;
-
-    /**
-     * name of the root tag
-     *
-     * @access private
-     * @var    string
-     */
-    var $_root = null;
-
-    /**
-     * stack for all data that is found
-     *
-     * @access private
-     * @var    array
-     */
-    var $_dataStack = array();
-
-    /**
-     * stack for all values that are generated
-     *
-     * @access private
-     * @var    array
-     */
-    var $_valStack = array();
-
-    /**
-     * current tag depth
-     *
-     * @access private
-     * @var    int
-     */
-    var $_depth = 0;
-
-    /**
-     * XML_Parser instance
-     *
-     * @access   private
-     * @var      object XML_Parser
-     */
-    var $_parser = null;
-
-    /**
-     * constructor
-     *
-     * @param mixed $options array containing options for the unserialization
-     *
-     * @access public
-     */
-    function XML_Unserializer($options = null)
-    {
-        if (is_array($options)) {
-            $this->options = array_merge($this->_defaultOptions, $options);
-        } else {
-            $this->options = $this->_defaultOptions;
-        }
-    }
-
-    /**
-     * return API version
-     *
-     * @access   public
-     * @return string  $version API version
-     * @static
-     */
-    function apiVersion()
-    {
-        return '0.20.0';
-    }
-
-    /**
-     * reset all options to default options
-     *
-     * @return void
-     * @access public
-     * @see setOption(), XML_Unserializer(), setOptions()
-     */
-    function resetOptions()
-    {
-        $this->options = $this->_defaultOptions;
-    }
-
-    /**
-     * set an option
-     *
-     * You can use this method if you do not want
-     * to set all options in the constructor
-     *
-     * @param string $name  name of option
-     * @param mixed  $value value of option
-     *
-     * @return void
-     * @access public
-     * @see resetOption(), XML_Unserializer(), setOptions()
-     */
-    function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-
-    /**
-     * sets several options at once
-     *
-     * You can use this method if you do not want
-     * to set all options in the constructor
-     *
-     * @param array $options options array
-     *
-     * @return void
-     * @access public
-     * @see resetOption(), XML_Unserializer(), setOption()
-     */
-    function setOptions($options)
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-    /**
-     * unserialize data
-     *
-     * @param mixed   $data    data to unserialize (string, filename or resource)
-     * @param boolean $isFile  data should be treated as a file
-     * @param array   $options options that will override
-     *                         the global options for this call
-     *
-     * @return boolean $success
-     * @access public
-     */
-    function unserialize($data, $isFile = false, $options = null)
-    {
-        $this->_unserializedData = null;
-        $this->_root             = null;
-
-        // if options have been specified, use them instead
-        // of the previously defined ones
-        if (is_array($options)) {
-            $optionsBak = $this->options;
-            if (isset($options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS])
-                && $options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS] == true
-            ) {
-                $this->options = array_merge($this->_defaultOptions, $options);
-            } else {
-                $this->options = array_merge($this->options, $options);
-            }
-        } else {
-            $optionsBak = null;
-        }
-
-        $this->_valStack  = array();
-        $this->_dataStack = array();
-        $this->_depth     = 0;
-
-        $this->_createParser();
-
-        if (is_string($data)) {
-            if ($isFile) {
-                $result = $this->_parser->setInputFile($data);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $this->_parser->parse();
-            } else {
-                $result = $this->_parser->parseString($data, true);
-            }
-        } else {
-            $this->_parser->setInput($data);
-            $result = $this->_parser->parse();
-        }
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_RETURN_RESULT] === true) {
-            $return = $this->_unserializedData;
-        } else {
-            $return = true;
-        }
-
-        if ($optionsBak !== null) {
-            $this->options = $optionsBak;
-        }
-
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return $return;
-    }
-
-    /**
-     * get the result of the serialization
-     *
-     * @access public
-     * @return string  $serializedData
-     */
-    function getUnserializedData()
-    {
-        if ($this->_root === null) {
-            return $this->raiseError('No unserialized data available. '
-                . 'Use XML_Unserializer::unserialize() first.',
-                XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
-        }
-        return $this->_unserializedData;
-    }
-
-    /**
-     * get the name of the root tag
-     *
-     * @access public
-     * @return string  $rootName
-     */
-    function getRootName()
-    {
-        if ($this->_root === null) {
-            return $this->raiseError('No unserialized data available. '
-                . 'Use XML_Unserializer::unserialize() first.',
-                XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
-        }
-        return $this->_root;
-    }
-
-    /**
-     * Start element handler for XML parser
-     *
-     * @param object $parser  XML parser object
-     * @param string $element XML element
-     * @param array  $attribs attributes of XML tag
-     *
-     * @return void
-     * @access private
-     */
-    function startHandler($parser, $element, $attribs)
-    {
-        if (isset($attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]])
-        ) {
-            $type = $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]];
-
-            $guessType = false;
-        } else {
-            $type = 'string';
-            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
-                $guessType = true;
-            } else {
-                $guessType = false;
-            }
-        }
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
-            $attribs = array_map($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC],
-                $attribs);
-        }
-
-        $this->_depth++;
-        $this->_dataStack[$this->_depth] = null;
-
-        if (is_array($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP])
-            && isset($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element])
-        ) {
-            $element = $this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element];
-        }
-
-        $val = array(
-                     'name'         => $element,
-                     'value'        => null,
-                     'type'         => $type,
-                     'guessType'    => $guessType,
-                     'childrenKeys' => array(),
-                     'aggregKeys'   => array()
-                    );
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE] == true
-            && (count($attribs) > 0)
-        ) {
-            $val['children'] = array();
-            $val['type']     = $this->_getComplexType($element);
-            $val['class']    = $element;
-
-            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
-                $attribs = $this->_guessAndSetTypes($attribs);
-            }
-            if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY] != false
-            ) {
-                $val['children'][$this->
-                    options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY]] = $attribs;
-            } else {
-                foreach ($attribs as $attrib => $value) {
-                    $val['children'][$this->
-                        options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND]
-                        . $attrib] = $value;
-                }
-            }
-        }
-
-        $keyAttr = false;
-
-        if (is_string($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
-            $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY];
-        } elseif (is_array($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
-            if (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
-                [$element])
-            ) {
-                $keyAttr =
-                    $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY][$element];
-            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
-                ['#default'])
-            ) {
-                $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
-                ['#default'];
-            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
-                ['__default'])
-            ) {
-                // keep this for BC
-                $keyAttr =
-                    $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
-                    ['__default'];
-            }
-        }
-
-        if ($keyAttr !== false && isset($attribs[$keyAttr])) {
-            $val['name'] = $attribs[$keyAttr];
-        }
-
-        if (isset($attribs[$this->
-            options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]])
-        ) {
-            $val['class'] =
-                $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]];
-        }
-
-        array_push($this->_valStack, $val);
-    }
-
-    /**
-     * Try to guess the type of several values and
-     * set them accordingly
-     *
-     * @param array $array array containing the values
-     *
-     * @return array array, containing the values with their correct types
-     * @access private
-     */
-    function _guessAndSetTypes($array)
-    {
-        foreach ($array as $key => $value) {
-            $array[$key] = $this->_guessAndSetType($value);
-        }
-        return $array;
-    }
-
-    /**
-     * Try to guess the type of a value and
-     * set it accordingly
-     *
-     * @param string $value character data
-     *
-     * @return mixed value with the best matching type
-     * @access private
-     */
-    function _guessAndSetType($value)
-    {
-        if ($value === 'true') {
-            return true;
-        }
-        if ($value === 'false') {
-            return false;
-        }
-        if ($value === 'NULL') {
-            return null;
-        }
-        if (preg_match('/^[-+]?[0-9]{1,}\\z/', $value)) {
-            return intval($value);
-        }
-        if (preg_match('/^[-+]?[0-9]{1,}\.[0-9]{1,}\\z/', $value)) {
-            return doubleval($value);
-        }
-        return (string)$value;
-    }
-
-    /**
-     * End element handler for XML parser
-     *
-     * @param object $parser  XML parser object
-     * @param string $element element
-     *
-     * @return void
-     * @access private
-     */
-    function endHandler($parser, $element)
-    {
-        $value = array_pop($this->_valStack);
-        switch ($this->options[XML_UNSERIALIZER_OPTION_WHITESPACE]) {
-        case XML_UNSERIALIZER_WHITESPACE_KEEP:
-            $data = $this->_dataStack[$this->_depth];
-            break;
-        case XML_UNSERIALIZER_WHITESPACE_NORMALIZE:
-            $data = trim(preg_replace('/\s\s+/m', ' ',
-                $this->_dataStack[$this->_depth]));
-            break;
-        case XML_UNSERIALIZER_WHITESPACE_TRIM:
-        default:
-            $data = trim($this->_dataStack[$this->_depth]);
-            break;
-        }
-
-        // adjust type of the value
-        switch(strtolower($value['type'])) {
-
-        // unserialize an object
-        case 'object':
-            if (isset($value['class'])) {
-                $classname = $value['class'];
-            } else {
-                $classname = '';
-            }
-            // instantiate the class
-            if ($this->options[XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME] === true
-                && class_exists($classname)
-            ) {
-                $value['value'] = &new $classname;
-            } else {
-                $value['value'] =
-                    &new $this->options[XML_UNSERIALIZER_OPTION_DEFAULT_CLASS];
-            }
-            if (trim($data) !== '') {
-                if ($value['guessType'] === true) {
-                    $data = $this->_guessAndSetType($data);
-                }
-                $value['children'][$this->
-                    options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
-            }
-
-            // set properties
-            foreach ($value['children'] as $prop => $propVal) {
-                // check whether there is a special method to set this property
-                $setMethod = 'set'.$prop;
-                if (method_exists($value['value'], $setMethod)) {
-                    call_user_func(array(&$value['value'], $setMethod), $propVal);
-                } else {
-                    $value['value']->$prop = $propVal;
-                }
-            }
-            //  check for magic function
-            if (method_exists($value['value'], '__wakeup')) {
-                $value['value']->__wakeup();
-            }
-            break;
-
-        // unserialize an array
-        case 'array':
-            if (trim($data) !== '') {
-                if ($value['guessType'] === true) {
-                    $data = $this->_guessAndSetType($data);
-                }
-                $value['children'][$this->
-                    options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
-            }
-            if (isset($value['children'])) {
-                $value['value'] = $value['children'];
-            } else {
-                $value['value'] = array();
-            }
-            break;
-
-        // unserialize a null value
-        case 'null':
-            $data = null;
-            break;
-
-        // unserialize a resource => this is not possible :-(
-        case 'resource':
-            $value['value'] = $data;
-            break;
-
-        // unserialize any scalar value
-        default:
-            if ($value['guessType'] === true) {
-                $data = $this->_guessAndSetType($data);
-            } else {
-                settype($data, $value['type']);
-            }
-
-            $value['value'] = $data;
-            break;
-        }
-        $parent = array_pop($this->_valStack);
-        if ($parent === null) {
-            $this->_unserializedData = &$value['value'];
-            $this->_root             = &$value['name'];
-            return true;
-        } else {
-            // parent has to be an array
-            if (!isset($parent['children']) || !is_array($parent['children'])) {
-                $parent['children'] = array();
-                if (!in_array($parent['type'], array('array', 'object'))) {
-                    $parent['type'] = $this->_getComplexType($parent['name']);
-                    if ($parent['type'] == 'object') {
-                        $parent['class'] = $parent['name'];
-                    }
-                }
-            }
-
-            if (in_array($element,
-                $this->options[XML_UNSERIALIZER_OPTION_IGNORE_KEYS])
-            ) {
-                $ignoreKey = true;
-            } else {
-                $ignoreKey = false;
-            }
-
-            if (!empty($value['name']) && $ignoreKey === false) {
-                // there already has been a tag with this name
-                if (in_array($value['name'], $parent['childrenKeys'])
-                    || in_array($value['name'],
-                    $this->options[XML_UNSERIALIZER_OPTION_FORCE_ENUM])
-                ) {
-                    // no aggregate has been created for this tag
-                    if (!in_array($value['name'], $parent['aggregKeys'])) {
-                        if (isset($parent['children'][$value['name']])) {
-                            $parent['children'][$value['name']] =
-                                array($parent['children'][$value['name']]);
-                        } else {
-                            $parent['children'][$value['name']] = array();
-                        }
-                        array_push($parent['aggregKeys'], $value['name']);
-                    }
-                    array_push($parent['children'][$value['name']], $value['value']);
-                } else {
-                    $parent['children'][$value['name']] = &$value['value'];
-                    array_push($parent['childrenKeys'], $value['name']);
-                }
-            } else {
-                array_push($parent['children'], $value['value']);
-            }
-            array_push($this->_valStack, $parent);
-        }
-
-        $this->_depth--;
-    }
-
-    /**
-     * Handler for character data
-     *
-     * @param object $parser XML parser object
-     * @param string $cdata  CDATA
-     *
-     * @return void
-     * @access private
-     */
-    function cdataHandler($parser, $cdata)
-    {
-        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
-            $cdata = call_user_func($this->
-                options[XML_UNSERIALIZER_OPTION_DECODE_FUNC], $cdata);
-        }
-        $this->_dataStack[$this->_depth] .= $cdata;
-    }
-
-    /**
-     * get the complex type, that should be used for a specified tag
-     *
-     * @param string $tagname name of the tag
-     *
-     * @return string complex type ('array' or 'object')
-     * @access private
-     */
-    function _getComplexType($tagname)
-    {
-        if (is_string($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE])) {
-            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE];
-        }
-        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname])) {
-            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname];
-        }
-        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'])) {
-            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'];
-        }
-        return 'array';
-    }
-
-    /**
-     * create the XML_Parser instance
-     *
-     * @return boolean
-     * @access private
-     */
-    function _createParser()
-    {
-        if (is_object($this->_parser)) {
-            $this->_parser->free();
-            unset($this->_parser);
-        }
-        $this->_parser = &new XML_Parser($this->
-            options[XML_UNSERIALIZER_OPTION_ENCODING_SOURCE],
-            'event', $this->options[XML_UNSERIALIZER_OPTION_ENCODING_TARGET]);
-
-        $this->_parser->folding = false;
-        $this->_parser->setHandlerObj($this);
-        return true;
-    }
-}
-?>
diff --git a/airtime_mvc/library/pear/XML/Util.php b/airtime_mvc/library/pear/XML/Util.php
deleted file mode 100644
index f5927b16c..000000000
--- a/airtime_mvc/library/pear/XML/Util.php
+++ /dev/null
@@ -1,911 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Util
- *
- * XML Utilities package
- * 
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Util
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Util.php,v 1.38 2008/11/13 00:03:38 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Util
- */
-
-/**
- * error code for invalid chars in XML name
- */
-define('XML_UTIL_ERROR_INVALID_CHARS', 51);
-
-/**
- * error code for invalid chars in XML name
- */
-define('XML_UTIL_ERROR_INVALID_START', 52);
-
-/**
- * error code for non-scalar tag content
- */
-define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
-
-/**
- * error code for missing tag name
- */
-define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
-
-/**
- * replace XML entities
- */
-define('XML_UTIL_REPLACE_ENTITIES', 1);
-
-/**
- * embedd content in a CData Section
- */
-define('XML_UTIL_CDATA_SECTION', 5);
-
-/**
- * do not replace entitites
- */
-define('XML_UTIL_ENTITIES_NONE', 0);
-
-/**
- * replace all XML entitites
- * This setting will replace <, >, ", ' and &
- */
-define('XML_UTIL_ENTITIES_XML', 1);
-
-/**
- * replace only required XML entitites
- * This setting will replace <, " and &
- */
-define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
-
-/**
- * replace HTML entitites
- * @link http://www.php.net/htmlentities
- */
-define('XML_UTIL_ENTITIES_HTML', 3);
-
-/**
- * Collapse all empty tags.
- */
-define('XML_UTIL_COLLAPSE_ALL', 1);
-
-/**
- * Collapse only empty XHTML tags that have no end tag.
- */
-define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
-
-/**
- * utility class for working with XML documents
- *
-
- * @category  XML
- * @package   XML_Util
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.1
- * @link      http://pear.php.net/package/XML_Util
- */
-class XML_Util
-{
-    /**
-     * return API version
-     *
-     * @return string $version API version
-     * @access public
-     * @static
-     */
-    function apiVersion()
-    {
-        return '1.1';
-    }
-
-    /**
-     * replace XML entities
-     *
-     * With the optional second parameter, you may select, which
-     * entities should be replaced.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // replace XML entites:
-     * $string = XML_Util::replaceEntities('This string contains < & >.');
-     * </code>
-     *
-     * With the optional third parameter, you may pass the character encoding
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // replace XML entites in UTF-8:
-     * $string = XML_Util::replaceEntities(
-     *     'This string contains < & > as well as ä, ö, ß, à and ê',
-     *     XML_UTIL_ENTITIES_HTML,
-     *     'UTF-8'
-     * );
-     * </code>
-     *
-     * @param string $string          string where XML special chars 
-     *                                should be replaced
-     * @param int    $replaceEntities setting for entities in attribute values 
-     *                                (one of XML_UTIL_ENTITIES_XML, 
-     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                                XML_UTIL_ENTITIES_HTML)
-     * @param string $encoding        encoding value (if any)...
-     *                                must be a valid encoding as determined
-     *                                by the htmlentities() function
-     *
-     * @return string string with replaced chars
-     * @access public
-     * @static
-     * @see reverseEntities()
-     */
-    function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1')
-    {
-        switch ($replaceEntities) {
-        case XML_UTIL_ENTITIES_XML:
-            return strtr($string, array(
-                '&'  => '&amp;',
-                '>'  => '&gt;',
-                '<'  => '&lt;',
-                '"'  => '&quot;',
-                '\'' => '&apos;' ));
-            break;
-        case XML_UTIL_ENTITIES_XML_REQUIRED:
-            return strtr($string, array(
-                '&' => '&amp;',
-                '<' => '&lt;',
-                '"' => '&quot;' ));
-            break;
-        case XML_UTIL_ENTITIES_HTML:
-            return htmlentities($string, ENT_COMPAT, $encoding);
-            break;
-        }
-        return $string;
-    }
-
-    /**
-     * reverse XML entities
-     *
-     * With the optional second parameter, you may select, which
-     * entities should be reversed.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // reverse XML entites:
-     * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
-     * </code>
-     *
-     * With the optional third parameter, you may pass the character encoding
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // reverse XML entites in UTF-8:
-     * $string = XML_Util::reverseEntities(
-     *     'This string contains &lt; &amp; &gt; as well as'
-     *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
-     *     XML_UTIL_ENTITIES_HTML,
-     *     'UTF-8'
-     * );
-     * </code>
-     *
-     * @param string $string          string where XML special chars 
-     *                                should be replaced
-     * @param int    $replaceEntities setting for entities in attribute values 
-     *                                (one of XML_UTIL_ENTITIES_XML, 
-     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                                XML_UTIL_ENTITIES_HTML)
-     * @param string $encoding        encoding value (if any)...
-     *                                must be a valid encoding as determined
-     *                                by the html_entity_decode() function
-     *
-     * @return string string with replaced chars
-     * @access public
-     * @static
-     * @see replaceEntities()
-     */
-    function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1')
-    {
-        switch ($replaceEntities) {
-        case XML_UTIL_ENTITIES_XML:
-            return strtr($string, array(
-                '&amp;'  => '&',
-                '&gt;'   => '>',
-                '&lt;'   => '<',
-                '&quot;' => '"',
-                '&apos;' => '\'' ));
-            break;
-        case XML_UTIL_ENTITIES_XML_REQUIRED:
-            return strtr($string, array(
-                '&amp;'  => '&',
-                '&lt;'   => '<',
-                '&quot;' => '"' ));
-            break;
-        case XML_UTIL_ENTITIES_HTML:
-            return html_entity_decode($string, ENT_COMPAT, $encoding);
-            break;
-        }
-        return $string;
-    }
-
-    /**
-     * build an xml declaration
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // get an XML declaration:
-     * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
-     * </code>
-     *
-     * @param string $version    xml version
-     * @param string $encoding   character encoding
-     * @param bool   $standalone document is standalone (or not)
-     *
-     * @return string xml declaration
-     * @access public
-     * @static
-     * @uses attributesToString() to serialize the attributes of the XML declaration
-     */
-    function getXMLDeclaration($version = '1.0', $encoding = null, 
-        $standalone = null)
-    {
-        $attributes = array(
-            'version' => $version,
-        );
-        // add encoding
-        if ($encoding !== null) {
-            $attributes['encoding'] = $encoding;
-        }
-        // add standalone, if specified
-        if ($standalone !== null) {
-            $attributes['standalone'] = $standalone ? 'yes' : 'no';
-        }
-
-        return sprintf('<?xml%s?>', 
-            XML_Util::attributesToString($attributes, false));
-    }
-
-    /**
-     * build a document type declaration
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // get a doctype declaration:
-     * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
-     * </code>
-     *
-     * @param string $root        name of the root tag
-     * @param string $uri         uri of the doctype definition 
-     *                            (or array with uri and public id)
-     * @param string $internalDtd internal dtd entries
-     *
-     * @return string doctype declaration
-     * @access public
-     * @static
-     * @since 0.2
-     */
-    function getDocTypeDeclaration($root, $uri = null, $internalDtd = null)
-    {
-        if (is_array($uri)) {
-            $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
-        } elseif (!empty($uri)) {
-            $ref = sprintf(' SYSTEM "%s"', $uri);
-        } else {
-            $ref = '';
-        }
-
-        if (empty($internalDtd)) {
-            return sprintf('<!DOCTYPE %s%s>', $root, $ref);
-        } else {
-            return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
-        }
-    }
-
-    /**
-     * create string representation of an attribute list
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // build an attribute string
-     * $att = array(
-     *              'foo'   =>  'bar',
-     *              'argh'  =>  'tomato'
-     *            );
-     *
-     * $attList = XML_Util::attributesToString($att);
-     * </code>
-     *
-     * @param array      $attributes attribute array
-     * @param bool|array $sort       sort attribute list alphabetically, 
-     *                               may also be an assoc array containing 
-     *                               the keys 'sort', 'multiline', 'indent', 
-     *                               'linebreak' and 'entities'
-     * @param bool       $multiline  use linebreaks, if more than 
-     *                               one attribute is given
-     * @param string     $indent     string used for indentation of 
-     *                               multiline attributes
-     * @param string     $linebreak  string used for linebreaks of 
-     *                               multiline attributes
-     * @param int        $entities   setting for entities in attribute values 
-     *                               (one of XML_UTIL_ENTITIES_NONE, 
-     *                               XML_UTIL_ENTITIES_XML, 
-     *                               XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                               XML_UTIL_ENTITIES_HTML)
-     *
-     * @return string string representation of the attributes
-     * @access public
-     * @static
-     * @uses replaceEntities() to replace XML entities in attribute values
-     * @todo allow sort also to be an options array
-     */
-    function attributesToString($attributes, $sort = true, $multiline = false, 
-        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML)
-    {
-        /*
-         * second parameter may be an array
-         */
-        if (is_array($sort)) {
-            if (isset($sort['multiline'])) {
-                $multiline = $sort['multiline'];
-            }
-            if (isset($sort['indent'])) {
-                $indent = $sort['indent'];
-            }
-            if (isset($sort['linebreak'])) {
-                $multiline = $sort['linebreak'];
-            }
-            if (isset($sort['entities'])) {
-                $entities = $sort['entities'];
-            }
-            if (isset($sort['sort'])) {
-                $sort = $sort['sort'];
-            } else {
-                $sort = true;
-            }
-        }
-        $string = '';
-        if (is_array($attributes) && !empty($attributes)) {
-            if ($sort) {
-                ksort($attributes);
-            }
-            if ( !$multiline || count($attributes) == 1) {
-                foreach ($attributes as $key => $value) {
-                    if ($entities != XML_UTIL_ENTITIES_NONE) {
-                        if ($entities === XML_UTIL_CDATA_SECTION) {
-                            $entities = XML_UTIL_ENTITIES_XML;
-                        }
-                        $value = XML_Util::replaceEntities($value, $entities);
-                    }
-                    $string .= ' ' . $key . '="' . $value . '"';
-                }
-            } else {
-                $first = true;
-                foreach ($attributes as $key => $value) {
-                    if ($entities != XML_UTIL_ENTITIES_NONE) {
-                        $value = XML_Util::replaceEntities($value, $entities);
-                    }
-                    if ($first) {
-                        $string .= ' ' . $key . '="' . $value . '"';
-                        $first   = false;
-                    } else {
-                        $string .= $linebreak . $indent . $key . '="' . $value . '"';
-                    }
-                }
-            }
-        }
-        return $string;
-    }
-
-    /**
-     * Collapses empty tags.
-     *
-     * @param string $xml  XML
-     * @param int    $mode Whether to collapse all empty tags (XML_UTIL_COLLAPSE_ALL)
-     *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
-     *
-     * @return string XML
-     * @access public
-     * @static
-     * @todo PEAR CS - unable to avoid "space after open parens" error
-     *       in the IF branch
-     */
-    function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL) 
-    {
-        if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
-            return preg_replace(
-                '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
-                . 'param)([^>]*)><\/\\1>/s',
-                '<\\1\\2 />',
-                $xml);
-        } else {
-            return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
-        }
-    }
-
-    /**
-     * create a tag
-     *
-     * This method will call XML_Util::createTagFromArray(), which
-     * is more flexible.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML tag:
-     * $tag = XML_Util::createTag('myNs:myTag', 
-     *     array('foo' => 'bar'), 
-     *     'This is inside the tag', 
-     *     'http://www.w3c.org/myNs#');
-     * </code>
-     *
-     * @param string $qname           qualified tagname (including namespace)
-     * @param array  $attributes      array containg attributes
-     * @param mixed  $content         the content
-     * @param string $namespaceUri    URI of the namespace
-     * @param int    $replaceEntities whether to replace XML special chars in 
-     *                                content, embedd it in a CData section 
-     *                                or none of both
-     * @param bool   $multiline       whether to create a multiline tag where 
-     *                                each attribute gets written to a single line
-     * @param string $indent          string used to indent attributes 
-     *                                (_auto indents attributes so they start 
-     *                                at the same column)
-     * @param string $linebreak       string used for linebreaks
-     * @param bool   $sortAttributes  Whether to sort the attributes or not
-     *
-     * @return string XML tag
-     * @access public
-     * @static
-     * @see createTagFromArray()
-     * @uses createTagFromArray() to create the tag
-     */
-    function createTag($qname, $attributes = array(), $content = null, 
-        $namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES, 
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        $tag = array(
-            'qname'      => $qname,
-            'attributes' => $attributes
-        );
-
-        // add tag content
-        if ($content !== null) {
-            $tag['content'] = $content;
-        }
-
-        // add namespace Uri
-        if ($namespaceUri !== null) {
-            $tag['namespaceUri'] = $namespaceUri;
-        }
-
-        return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, 
-            $indent, $linebreak, $sortAttributes);
-    }
-
-    /**
-     * create a tag from an array
-     * this method awaits an array in the following format
-     * <pre>
-     * array(
-     *     // qualified name of the tag
-     *     'qname' => $qname        
-     *
-     *     // namespace prefix (optional, if qname is specified or no namespace)
-     *     'namespace' => $namespace    
-     *
-     *     // local part of the tagname (optional, if qname is specified)
-     *     'localpart' => $localpart,   
-     *
-     *     // array containing all attributes (optional)
-     *     'attributes' => array(),      
-     *
-     *     // tag content (optional)
-     *     'content' => $content,     
-     *
-     *     // namespaceUri for the given namespace (optional)
-     *     'namespaceUri' => $namespaceUri 
-     * )
-     * </pre>
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * $tag = array(
-     *     'qname'        => 'foo:bar',
-     *     'namespaceUri' => 'http://foo.com',
-     *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
-     *     'content'      => 'I\'m inside the tag',
-     * );
-     * // creating a tag with qualified name and namespaceUri
-     * $string = XML_Util::createTagFromArray($tag);
-     * </code>
-     *
-     * @param array  $tag             tag definition
-     * @param int    $replaceEntities whether to replace XML special chars in 
-     *                                content, embedd it in a CData section 
-     *                                or none of both
-     * @param bool   $multiline       whether to create a multiline tag where each 
-     *                                attribute gets written to a single line
-     * @param string $indent          string used to indent attributes 
-     *                                (_auto indents attributes so they start 
-     *                                at the same column)
-     * @param string $linebreak       string used for linebreaks
-     * @param bool   $sortAttributes  Whether to sort the attributes or not
-     *
-     * @return string XML tag
-     * @access public
-     * @static
-     * @see createTag()
-     * @uses attributesToString() to serialize the attributes of the tag
-     * @uses splitQualifiedName() to get local part and namespace of a qualified name
-     * @uses createCDataSection()
-     * @uses raiseError()
-     */
-    function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        if (isset($tag['content']) && !is_scalar($tag['content'])) {
-            return XML_Util::raiseError('Supplied non-scalar value as tag content',
-            XML_UTIL_ERROR_NON_SCALAR_CONTENT);
-        }
-
-        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
-            return XML_Util::raiseError('You must either supply a qualified name '
-                . '(qname) or local tag name (localPart).', 
-                XML_UTIL_ERROR_NO_TAG_NAME);
-        }
-
-        // if no attributes hav been set, use empty attributes
-        if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
-            $tag['attributes'] = array();
-        }
-
-        if (isset($tag['namespaces'])) {
-            foreach ($tag['namespaces'] as $ns => $uri) {
-                $tag['attributes']['xmlns:' . $ns] = $uri;
-            }
-        }
-
-        if (!isset($tag['qname'])) {
-            // qualified name is not given
-
-            // check for namespace
-            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-                $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
-            } else {
-                $tag['qname'] = $tag['localPart'];
-            }
-        } elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
-            // namespace URI is set, but no namespace
-
-            $parts = XML_Util::splitQualifiedName($tag['qname']);
-
-            $tag['localPart'] = $parts['localPart'];
-            if (isset($parts['namespace'])) {
-                $tag['namespace'] = $parts['namespace'];
-            }
-        }
-
-        if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
-            // is a namespace given
-            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-                $tag['attributes']['xmlns:' . $tag['namespace']] =
-                    $tag['namespaceUri'];
-            } else {
-                // define this Uri as the default namespace
-                $tag['attributes']['xmlns'] = $tag['namespaceUri'];
-            }
-        }
-
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === '_auto') {
-                $indent = str_repeat(' ', (strlen($tag['qname'])+2));
-            }
-        }
-
-        // create attribute list
-        $attList = XML_Util::attributesToString($tag['attributes'], 
-            $sortAttributes, $multiline, $indent, $linebreak, $replaceEntities);
-        if (!isset($tag['content']) || (string)$tag['content'] == '') {
-            $tag = sprintf('<%s%s />', $tag['qname'], $attList);
-        } else {
-            switch ($replaceEntities) {
-            case XML_UTIL_ENTITIES_NONE:
-                break;
-            case XML_UTIL_CDATA_SECTION:
-                $tag['content'] = XML_Util::createCDataSection($tag['content']);
-                break;
-            default:
-                $tag['content'] = XML_Util::replaceEntities($tag['content'], 
-                    $replaceEntities);
-                break;
-            }
-            $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
-                $tag['qname']);
-        }
-        return $tag;
-    }
-
-    /**
-     * create a start element
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createStartElement('myNs:myTag', 
-     *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
-     * </code>
-     *
-     * @param string $qname          qualified tagname (including namespace)
-     * @param array  $attributes     array containg attributes
-     * @param string $namespaceUri   URI of the namespace
-     * @param bool   $multiline      whether to create a multiline tag where each 
-     *                               attribute gets written to a single line
-     * @param string $indent         string used to indent attributes (_auto indents
-     *                               attributes so they start at the same column)
-     * @param string $linebreak      string used for linebreaks
-     * @param bool   $sortAttributes Whether to sort the attributes or not
-     *
-     * @return string XML start element
-     * @access public
-     * @static
-     * @see createEndElement(), createTag()
-     */
-    function createStartElement($qname, $attributes = array(), $namespaceUri = null,
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        // if no attributes hav been set, use empty attributes
-        if (!isset($attributes) || !is_array($attributes)) {
-            $attributes = array();
-        }
-
-        if ($namespaceUri != null) {
-            $parts = XML_Util::splitQualifiedName($qname);
-        }
-
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === '_auto') {
-                $indent = str_repeat(' ', (strlen($qname)+2));
-            }
-        }
-
-        if ($namespaceUri != null) {
-            // is a namespace given
-            if (isset($parts['namespace']) && !empty($parts['namespace'])) {
-                $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
-            } else {
-                // define this Uri as the default namespace
-                $attributes['xmlns'] = $namespaceUri;
-            }
-        }
-
-        // create attribute list
-        $attList = XML_Util::attributesToString($attributes, $sortAttributes, 
-            $multiline, $indent, $linebreak);
-        $element = sprintf('<%s%s>', $qname, $attList);
-        return  $element;
-    }
-
-    /**
-     * create an end element
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createEndElement('myNs:myTag');
-     * </code>
-     *
-     * @param string $qname qualified tagname (including namespace)
-     *
-     * @return string XML end element
-     * @access public
-     * @static
-     * @see createStartElement(), createTag()
-     */
-    function createEndElement($qname)
-    {
-        $element = sprintf('</%s>', $qname);
-        return $element;
-    }
-
-    /**
-     * create an XML comment
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createComment('I am a comment');
-     * </code>
-     *
-     * @param string $content content of the comment
-     *
-     * @return string XML comment
-     * @access public
-     * @static
-     */
-    function createComment($content)
-    {
-        $comment = sprintf('<!-- %s -->', $content);
-        return $comment;
-    }
-
-    /**
-     * create a CData section
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create a CData section
-     * $tag = XML_Util::createCDataSection('I am content.');
-     * </code>
-     *
-     * @param string $data data of the CData section
-     *
-     * @return string CData section with content
-     * @access public
-     * @static
-     */
-    function createCDataSection($data)
-    {
-        return sprintf('<![CDATA[%s]]>', 
-            preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
-
-    }
-
-    /**
-     * split qualified name and return namespace and local part
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // split qualified tag
-     * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
-     * </code>
-     * the returned array will contain two elements:
-     * <pre>
-     * array(
-     *     'namespace' => 'xslt',
-     *     'localPart' => 'stylesheet'
-     * );
-     * </pre>
-     *
-     * @param string $qname     qualified tag name
-     * @param string $defaultNs default namespace (optional)
-     *
-     * @return array array containing namespace and local part
-     * @access public
-     * @static
-     */
-    function splitQualifiedName($qname, $defaultNs = null)
-    {
-        if (strstr($qname, ':')) {
-            $tmp = explode(':', $qname);
-            return array(
-                'namespace' => $tmp[0],
-                'localPart' => $tmp[1]
-            );
-        }
-        return array(
-            'namespace' => $defaultNs,
-            'localPart' => $qname
-        );
-    }
-
-    /**
-     * check, whether string is valid XML name
-     *
-     * <p>XML names are used for tagname, attribute names and various
-     * other, lesser known entities.</p>
-     * <p>An XML name may only consist of alphanumeric characters,
-     * dashes, undescores and periods, and has to start with a letter
-     * or an underscore.</p>
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // verify tag name
-     * $result = XML_Util::isValidName('invalidTag?');
-     * if (is_a($result, 'PEAR_Error')) {
-     *    print 'Invalid XML name: ' . $result->getMessage();
-     * }
-     * </code>
-     *
-     * @param string $string string that should be checked
-     *
-     * @return mixed true, if string is a valid XML name, PEAR error otherwise
-     * @access public
-     * @static
-     * @todo support for other charsets
-     * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
-     */
-    function isValidName($string)
-    {
-        // check for invalid chars
-        if (!preg_match('/^[[:alpha:]_]$/', $string{0})) {
-            return XML_Util::raiseError('XML names may only start with letter '
-                . 'or underscore', XML_UTIL_ERROR_INVALID_START);
-        }
-
-        // check for invalid chars
-        if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?$/',
-            $string)
-        ) {
-            return XML_Util::raiseError('XML names may only contain alphanumeric '
-                . 'chars, period, hyphen, colon and underscores', 
-                XML_UTIL_ERROR_INVALID_CHARS);
-        }
-        // XML name is valid
-        return true;
-    }
-
-    /**
-     * replacement for XML_Util::raiseError
-     *
-     * Avoids the necessity to always require
-     * PEAR.php
-     *
-     * @param string $msg  error message
-     * @param int    $code error code
-     *
-     * @return PEAR_Error
-     * @access public
-     * @static
-     * @todo PEAR CS - should this use include_once instead?
-     */
-    function raiseError($msg, $code)
-    {
-        require_once 'PEAR.php';
-        return PEAR::raiseError($msg, $code);
-    }
-}
-?>
diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 25b1ba1b6..6fa293271 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -52,10 +52,7 @@ $CC_CONFIG = array(
     'soundcloud-connection-wait' => $values['soundcloud']['time_between_retries'],
 
     "rootDir" => __DIR__."/../..",
-    'pearPath'      =>  dirname(__FILE__).'/../../library/pear',
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend',
-    'phingPath'      =>  dirname(__FILE__).'/../../library/phing',
-
+    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
 );
 
 AirtimeInstall::DbConnect(true);
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index aa82ca0b2..4ecbed071 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -35,9 +35,7 @@ $CC_CONFIG = array(
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
     "rootDir" => __DIR__."/../..",
-    'pearPath'      =>  dirname(__FILE__).'/../../library/pear',
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend',
-    'phingPath'      =>  dirname(__FILE__).'/../../library/phing'
+    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
 );
 
 $CC_CONFIG = LoadConfig($CC_CONFIG);
@@ -68,8 +66,7 @@ $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
 // Add libs to the PHP path
 $old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
-					.PATH_SEPARATOR.$CC_CONFIG['zendPath']
+set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
 					.PATH_SEPARATOR.$old_include_path);
 
 function LoadConfig($CC_CONFIG) {
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 888fb04d4..fa5e9541e 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -36,9 +36,7 @@ $CC_CONFIG = array(
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
     "rootDir" => __DIR__."/../..",
-    'pearPath'      =>  dirname(__FILE__).'/../../library/pear',
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend',
-    'phingPath'      =>  dirname(__FILE__).'/../../library/phing'
+    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
 );
 
 $CC_CONFIG = LoadConfig($CC_CONFIG);
@@ -69,8 +67,7 @@ $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
 // Add libs to the PHP path
 $old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
-					.PATH_SEPARATOR.$CC_CONFIG['zendPath']
+set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
 					.PATH_SEPARATOR.$old_include_path);
 
 function LoadConfig($CC_CONFIG) {
diff --git a/install_minimal/upgrades/airtime-1.9.0/conf.php b/install_minimal/upgrades/airtime-1.9.0/conf.php
index 0653af60b..51b884511 100644
--- a/install_minimal/upgrades/airtime-1.9.0/conf.php
+++ b/install_minimal/upgrades/airtime-1.9.0/conf.php
@@ -18,9 +18,7 @@ $CC_CONFIG = array(
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
     "rootDir" => __DIR__."/../..",
-    'pearPath'      =>  dirname(__FILE__).'/../../../airtime_mvc/library/pear',
-    'zendPath'      =>  dirname(__FILE__).'/../../../airtime_mvc/library/Zend',
-    'phingPath'      =>  dirname(__FILE__).'/../../../airtime_mvc/library/phing'
+    'zendPath'      =>  dirname(__FILE__).'/../../../airtime_mvc/library/Zend'
 );
 
 $CC_CONFIG = Config::loadConfig($CC_CONFIG);
@@ -51,8 +49,7 @@ $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
 // Add libs to the PHP path
 $old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
-					.PATH_SEPARATOR.$CC_CONFIG['zendPath']
+set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
 					.PATH_SEPARATOR.$old_include_path);
 
 class Config {

From 5dcb033c8446c869b89b0237af3eda1cd1bdfbc3 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Mon, 6 Feb 2012 20:19:25 -0500
Subject: [PATCH 27/29] CC-3297: Depend on zendframework and php-pear as
 external packages

-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
---
 airtime_mvc/application/configs/conf.php      |    9 +-
 airtime_mvc/library/Zend/Acl.php              | 1164 ----
 .../library/Zend/Acl/Assert/Interface.php     |   64 -
 airtime_mvc/library/Zend/Acl/Exception.php    |   36 -
 airtime_mvc/library/Zend/Acl/Resource.php     |   75 -
 .../library/Zend/Acl/Resource/Interface.php   |   37 -
 airtime_mvc/library/Zend/Acl/Role.php         |   75 -
 .../library/Zend/Acl/Role/Interface.php       |   37 -
 .../library/Zend/Acl/Role/Registry.php        |  271 -
 .../Zend/Acl/Role/Registry/Exception.php      |   36 -
 airtime_mvc/library/Zend/Amf/Adobe/Auth.php   |  133 -
 .../library/Zend/Amf/Adobe/DbInspector.php    |  103 -
 .../library/Zend/Amf/Adobe/Introspector.php   |  313 -
 .../library/Zend/Amf/Auth/Abstract.php        |   42 -
 airtime_mvc/library/Zend/Amf/Constants.php    |   87 -
 airtime_mvc/library/Zend/Amf/Exception.php    |   34 -
 .../Zend/Amf/Parse/Amf0/Deserializer.php      |  306 -
 .../Zend/Amf/Parse/Amf0/Serializer.php        |  349 -
 .../Zend/Amf/Parse/Amf3/Deserializer.php      |  424 --
 .../Zend/Amf/Parse/Amf3/Serializer.php        |  507 --
 .../library/Zend/Amf/Parse/Deserializer.php   |   65 -
 .../library/Zend/Amf/Parse/InputStream.php    |   39 -
 .../library/Zend/Amf/Parse/OutputStream.php   |   49 -
 .../Zend/Amf/Parse/Resource/MysqlResult.php   |   70 -
 .../Zend/Amf/Parse/Resource/MysqliResult.php  |  128 -
 .../Zend/Amf/Parse/Resource/Stream.php        |   42 -
 .../library/Zend/Amf/Parse/Serializer.php     |   59 -
 .../library/Zend/Amf/Parse/TypeLoader.php     |  231 -
 airtime_mvc/library/Zend/Amf/Request.php      |  251 -
 airtime_mvc/library/Zend/Amf/Request/Http.php |   80 -
 airtime_mvc/library/Zend/Amf/Response.php     |  194 -
 .../library/Zend/Amf/Response/Http.php        |   50 -
 airtime_mvc/library/Zend/Amf/Server.php       |  933 ---
 .../library/Zend/Amf/Server/Exception.php     |   37 -
 .../library/Zend/Amf/Util/BinaryStream.php    |  285 -
 .../library/Zend/Amf/Value/ByteArray.php      |   58 -
 .../library/Zend/Amf/Value/MessageBody.php    |  182 -
 .../library/Zend/Amf/Value/MessageHeader.php  |   81 -
 .../Amf/Value/Messaging/AbstractMessage.php   |   92 -
 .../Value/Messaging/AcknowledgeMessage.php    |   60 -
 .../Amf/Value/Messaging/ArrayCollection.php   |   35 -
 .../Zend/Amf/Value/Messaging/AsyncMessage.php |   43 -
 .../Amf/Value/Messaging/CommandMessage.php    |  119 -
 .../Zend/Amf/Value/Messaging/ErrorMessage.php |   67 -
 .../Amf/Value/Messaging/RemotingMessage.php   |   73 -
 .../library/Zend/Amf/Value/TraitsInfo.php     |  154 -
 airtime_mvc/library/Zend/Application.php      |  405 --
 .../Zend/Application/Bootstrap/Bootstrap.php  |  156 -
 .../Bootstrap/BootstrapAbstract.php           |  768 ---
 .../Application/Bootstrap/Bootstrapper.php    |   94 -
 .../Zend/Application/Bootstrap/Exception.php  |   38 -
 .../Bootstrap/ResourceBootstrapper.php        |   95 -
 .../library/Zend/Application/Exception.php    |   38 -
 .../Zend/Application/Module/Autoloader.php    |   94 -
 .../Zend/Application/Module/Bootstrap.php     |  128 -
 .../Application/Resource/Cachemanager.php     |   73 -
 .../library/Zend/Application/Resource/Db.php  |  161 -
 .../Zend/Application/Resource/Dojo.php        |   76 -
 .../Zend/Application/Resource/Exception.php   |   35 -
 .../Application/Resource/Frontcontroller.php  |  157 -
 .../Zend/Application/Resource/Layout.php      |   70 -
 .../Zend/Application/Resource/Locale.php      |   89 -
 .../library/Zend/Application/Resource/Log.php |   78 -
 .../Zend/Application/Resource/Mail.php        |  146 -
 .../Zend/Application/Resource/Modules.php     |  138 -
 .../Zend/Application/Resource/Multidb.php     |  168 -
 .../Zend/Application/Resource/Navigation.php  |  123 -
 .../Zend/Application/Resource/Resource.php    |   80 -
 .../Application/Resource/ResourceAbstract.php |  159 -
 .../Zend/Application/Resource/Router.php      |   87 -
 .../Zend/Application/Resource/Session.php     |  118 -
 .../Zend/Application/Resource/Translate.php   |  105 -
 .../Zend/Application/Resource/View.php        |   78 -
 airtime_mvc/library/Zend/Auth.php             |  169 -
 .../library/Zend/Auth/Adapter/DbTable.php     |  487 --
 .../library/Zend/Auth/Adapter/Digest.php      |  230 -
 .../library/Zend/Auth/Adapter/Exception.php   |   38 -
 .../library/Zend/Auth/Adapter/Http.php        |  847 ---
 .../Auth/Adapter/Http/Resolver/Exception.php  |   40 -
 .../Zend/Auth/Adapter/Http/Resolver/File.php  |  167 -
 .../Auth/Adapter/Http/Resolver/Interface.php  |   47 -
 .../library/Zend/Auth/Adapter/InfoCard.php    |  261 -
 .../library/Zend/Auth/Adapter/Interface.php   |   46 -
 .../library/Zend/Auth/Adapter/Ldap.php        |  526 --
 .../library/Zend/Auth/Adapter/OpenId.php      |  284 -
 airtime_mvc/library/Zend/Auth/Exception.php   |   36 -
 airtime_mvc/library/Zend/Auth/Result.php      |  148 -
 .../library/Zend/Auth/Storage/Exception.php   |   38 -
 .../library/Zend/Auth/Storage/Interface.php   |   66 -
 .../Zend/Auth/Storage/NonPersistent.php       |   95 -
 .../library/Zend/Auth/Storage/Session.php     |  150 -
 airtime_mvc/library/Zend/Barcode.php          |  352 -
 .../library/Zend/Barcode/Exception.php        |   63 -
 .../library/Zend/Barcode/Object/Code25.php    |  143 -
 .../Zend/Barcode/Object/Code25interleaved.php |  179 -
 .../library/Zend/Barcode/Object/Code39.php    |  177 -
 .../library/Zend/Barcode/Object/Ean13.php     |  224 -
 .../library/Zend/Barcode/Object/Ean2.php      |   65 -
 .../library/Zend/Barcode/Object/Ean5.php      |  147 -
 .../library/Zend/Barcode/Object/Ean8.php      |  174 -
 .../library/Zend/Barcode/Object/Error.php     |  100 -
 .../library/Zend/Barcode/Object/Exception.php |   35 -
 .../library/Zend/Barcode/Object/Identcode.php |   95 -
 .../library/Zend/Barcode/Object/Itf14.php     |   49 -
 .../library/Zend/Barcode/Object/Leitcode.php  |   64 -
 .../Zend/Barcode/Object/ObjectAbstract.php    | 1281 ----
 .../library/Zend/Barcode/Object/Planet.php    |   62 -
 .../library/Zend/Barcode/Object/Postnet.php   |  136 -
 .../library/Zend/Barcode/Object/Royalmail.php |  163 -
 .../library/Zend/Barcode/Object/Upca.php      |  171 -
 .../library/Zend/Barcode/Object/Upce.php      |  227 -
 .../Zend/Barcode/Renderer/Exception.php       |   35 -
 .../library/Zend/Barcode/Renderer/Image.php   |  470 --
 .../library/Zend/Barcode/Renderer/Pdf.php     |  242 -
 .../Barcode/Renderer/RendererAbstract.php     |  540 --
 airtime_mvc/library/Zend/Cache.php            |  245 -
 airtime_mvc/library/Zend/Cache/Backend.php    |  266 -
 .../library/Zend/Cache/Backend/Apc.php        |  355 -
 .../library/Zend/Cache/Backend/BlackHole.php  |  250 -
 .../Zend/Cache/Backend/ExtendedInterface.php  |  126 -
 .../library/Zend/Cache/Backend/File.php       | 1006 ---
 .../library/Zend/Cache/Backend/Interface.php  |   99 -
 .../library/Zend/Cache/Backend/Memcached.php  |  504 --
 .../library/Zend/Cache/Backend/Sqlite.php     |  679 --
 .../library/Zend/Cache/Backend/Static.php     |  558 --
 .../library/Zend/Cache/Backend/Test.php       |  410 --
 .../library/Zend/Cache/Backend/TwoLevels.php  |  506 --
 .../library/Zend/Cache/Backend/Xcache.php     |  216 -
 .../Zend/Cache/Backend/ZendPlatform.php       |  317 -
 .../library/Zend/Cache/Backend/ZendServer.php |  207 -
 .../Zend/Cache/Backend/ZendServer/Disk.php    |  100 -
 .../Zend/Cache/Backend/ZendServer/ShMem.php   |  100 -
 airtime_mvc/library/Zend/Cache/Core.php       |  756 ---
 airtime_mvc/library/Zend/Cache/Exception.php  |   32 -
 .../library/Zend/Cache/Frontend/Capture.php   |   87 -
 .../library/Zend/Cache/Frontend/Class.php     |  244 -
 .../library/Zend/Cache/Frontend/File.php      |  209 -
 .../library/Zend/Cache/Frontend/Function.php  |  132 -
 .../library/Zend/Cache/Frontend/Output.php    |  106 -
 .../library/Zend/Cache/Frontend/Page.php      |  402 --
 airtime_mvc/library/Zend/Cache/Manager.php    |  283 -
 airtime_mvc/library/Zend/Captcha/Adapter.php  |   76 -
 airtime_mvc/library/Zend/Captcha/Base.php     |  176 -
 airtime_mvc/library/Zend/Captcha/Dumb.php     |   52 -
 .../library/Zend/Captcha/Exception.php        |   37 -
 airtime_mvc/library/Zend/Captcha/Figlet.php   |   85 -
 airtime_mvc/library/Zend/Captcha/Image.php    |  600 --
 .../library/Zend/Captcha/ReCaptcha.php        |  266 -
 airtime_mvc/library/Zend/Captcha/Word.php     |  396 --
 .../library/Zend/CodeGenerator/Abstract.php   |  147 -
 .../library/Zend/CodeGenerator/Exception.php  |   35 -
 .../Zend/CodeGenerator/Php/Abstract.php       |   97 -
 .../library/Zend/CodeGenerator/Php/Body.php   |   73 -
 .../library/Zend/CodeGenerator/Php/Class.php  |  513 --
 .../Zend/CodeGenerator/Php/Docblock.php       |  220 -
 .../Zend/CodeGenerator/Php/Docblock/Tag.php   |  184 -
 .../Php/Docblock/Tag/License.php              |   98 -
 .../CodeGenerator/Php/Docblock/Tag/Param.php  |  128 -
 .../CodeGenerator/Php/Docblock/Tag/Return.php |   98 -
 .../Zend/CodeGenerator/Php/Exception.php      |   37 -
 .../library/Zend/CodeGenerator/Php/File.php   |  465 --
 .../CodeGenerator/Php/Member/Abstract.php     |  222 -
 .../CodeGenerator/Php/Member/Container.php    |   55 -
 .../library/Zend/CodeGenerator/Php/Method.php |  234 -
 .../Zend/CodeGenerator/Php/Parameter.php      |  250 -
 .../Php/Parameter/DefaultValue.php            |   60 -
 .../Zend/CodeGenerator/Php/Property.php       |  179 -
 .../Php/Property/DefaultValue.php             |  323 -
 airtime_mvc/library/Zend/Config.php           |  484 --
 airtime_mvc/library/Zend/Config/Exception.php |   33 -
 airtime_mvc/library/Zend/Config/Ini.php       |  308 -
 airtime_mvc/library/Zend/Config/Writer.php    |  101 -
 .../library/Zend/Config/Writer/Array.php      |   55 -
 .../Zend/Config/Writer/FileAbstract.php       |  134 -
 .../library/Zend/Config/Writer/Ini.php        |  163 -
 .../library/Zend/Config/Writer/Xml.php        |  127 -
 airtime_mvc/library/Zend/Config/Xml.php       |  286 -
 airtime_mvc/library/Zend/Console/Getopt.php   |  969 ---
 .../library/Zend/Console/Getopt/Exception.php |   66 -
 .../library/Zend/Controller/Action.php        |  688 --
 .../Zend/Controller/Action/Exception.php      |   38 -
 .../Controller/Action/Helper/Abstract.php     |  154 -
 .../Controller/Action/Helper/ActionStack.php  |  138 -
 .../Controller/Action/Helper/AjaxContext.php  |   77 -
 .../Action/Helper/AutoComplete/Abstract.php   |  149 -
 .../Action/Helper/AutoCompleteDojo.php        |   87 -
 .../Helper/AutoCompleteScriptaculous.php      |   82 -
 .../Zend/Controller/Action/Helper/Cache.php   |  279 -
 .../Action/Helper/ContextSwitch.php           | 1394 ----
 .../Action/Helper/FlashMessenger.php          |  266 -
 .../Zend/Controller/Action/Helper/Json.php    |  130 -
 .../Controller/Action/Helper/Redirector.php   |  531 --
 .../Zend/Controller/Action/Helper/Url.php     |  117 -
 .../Controller/Action/Helper/ViewRenderer.php |  989 ---
 .../Zend/Controller/Action/HelperBroker.php   |  381 --
 .../Action/HelperBroker/PriorityStack.php     |  280 -
 .../Zend/Controller/Action/Interface.php      |   69 -
 .../Zend/Controller/Dispatcher/Abstract.php   |  440 --
 .../Zend/Controller/Dispatcher/Exception.php  |   37 -
 .../Zend/Controller/Dispatcher/Interface.php  |  206 -
 .../Zend/Controller/Dispatcher/Standard.php   |  493 --
 .../library/Zend/Controller/Exception.php     |   35 -
 airtime_mvc/library/Zend/Controller/Front.php |  994 ---
 .../Zend/Controller/Plugin/Abstract.php       |  151 -
 .../Zend/Controller/Plugin/ActionStack.php    |  280 -
 .../library/Zend/Controller/Plugin/Broker.php |  363 -
 .../Zend/Controller/Plugin/ErrorHandler.php   |  289 -
 .../Zend/Controller/Plugin/PutHandler.php     |   60 -
 .../Zend/Controller/Request/Abstract.php      |  356 -
 .../Zend/Controller/Request/Apache404.php     |   82 -
 .../Zend/Controller/Request/Exception.php     |   37 -
 .../library/Zend/Controller/Request/Http.php  | 1053 ---
 .../Zend/Controller/Request/HttpTestCase.php  |  276 -
 .../Zend/Controller/Request/Simple.php        |   55 -
 .../Zend/Controller/Response/Abstract.php     |  794 ---
 .../library/Zend/Controller/Response/Cli.php  |   68 -
 .../Zend/Controller/Response/Exception.php    |   36 -
 .../library/Zend/Controller/Response/Http.php |   38 -
 .../Zend/Controller/Response/HttpTestCase.php |  130 -
 .../Zend/Controller/Router/Abstract.php       |  170 -
 .../Zend/Controller/Router/Exception.php      |   36 -
 .../Zend/Controller/Router/Interface.php      |  124 -
 .../Zend/Controller/Router/Rewrite.php        |  528 --
 .../library/Zend/Controller/Router/Route.php  |  559 --
 .../Zend/Controller/Router/Route/Abstract.php |  117 -
 .../Zend/Controller/Router/Route/Chain.php    |  169 -
 .../Zend/Controller/Router/Route/Hostname.php |  342 -
 .../Controller/Router/Route/Interface.php     |   37 -
 .../Zend/Controller/Router/Route/Module.php   |  289 -
 .../Zend/Controller/Router/Route/Regex.php    |  269 -
 .../Zend/Controller/Router/Route/Static.php   |  125 -
 airtime_mvc/library/Zend/Crypt.php            |  167 -
 .../library/Zend/Crypt/DiffieHellman.php      |  380 --
 .../Zend/Crypt/DiffieHellman/Exception.php    |   36 -
 airtime_mvc/library/Zend/Crypt/Exception.php  |   35 -
 airtime_mvc/library/Zend/Crypt/Hmac.php       |  181 -
 .../library/Zend/Crypt/Hmac/Exception.php     |   36 -
 airtime_mvc/library/Zend/Crypt/Math.php       |  102 -
 .../library/Zend/Crypt/Math/BigInteger.php    |  117 -
 .../Zend/Crypt/Math/BigInteger/Bcmath.php     |  203 -
 .../Zend/Crypt/Math/BigInteger/Exception.php  |   36 -
 .../Zend/Crypt/Math/BigInteger/Gmp.php        |  196 -
 .../Zend/Crypt/Math/BigInteger/Interface.php  |   51 -
 .../library/Zend/Crypt/Math/Exception.php     |   36 -
 airtime_mvc/library/Zend/Crypt/Rsa.php        |  298 -
 airtime_mvc/library/Zend/Crypt/Rsa/Key.php    |   95 -
 .../library/Zend/Crypt/Rsa/Key/Private.php    |   75 -
 .../library/Zend/Crypt/Rsa/Key/Public.php     |   74 -
 airtime_mvc/library/Zend/Currency.php         |  890 ---
 .../Zend/Currency/CurrencyInterface.php       |   39 -
 .../library/Zend/Currency/Exception.php       |   37 -
 airtime_mvc/library/Zend/Date.php             | 4950 --------------
 airtime_mvc/library/Zend/Date/Cities.php      |  322 -
 airtime_mvc/library/Zend/Date/DateObject.php  | 1060 ---
 airtime_mvc/library/Zend/Date/Exception.php   |   49 -
 airtime_mvc/library/Zend/Db.php               |  281 -
 .../library/Zend/Db/Adapter/Abstract.php      | 1252 ----
 airtime_mvc/library/Zend/Db/Adapter/Db2.php   |  832 ---
 .../library/Zend/Db/Adapter/Db2/Exception.php |   45 -
 .../library/Zend/Db/Adapter/Exception.php     |   57 -
 .../library/Zend/Db/Adapter/Mysqli.php        |  549 --
 .../Zend/Db/Adapter/Mysqli/Exception.php      |   40 -
 .../library/Zend/Db/Adapter/Oracle.php        |  682 --
 .../Zend/Db/Adapter/Oracle/Exception.php      |   60 -
 .../library/Zend/Db/Adapter/Pdo/Abstract.php  |  401 --
 .../library/Zend/Db/Adapter/Pdo/Ibm.php       |  360 -
 .../library/Zend/Db/Adapter/Pdo/Ibm/Db2.php   |  228 -
 .../library/Zend/Db/Adapter/Pdo/Ibm/Ids.php   |  301 -
 .../library/Zend/Db/Adapter/Pdo/Mssql.php     |  423 --
 .../library/Zend/Db/Adapter/Pdo/Mysql.php     |  257 -
 .../library/Zend/Db/Adapter/Pdo/Oci.php       |  378 --
 .../library/Zend/Db/Adapter/Pdo/Pgsql.php     |  330 -
 .../library/Zend/Db/Adapter/Pdo/Sqlite.php    |  297 -
 .../library/Zend/Db/Adapter/Sqlsrv.php        |  668 --
 .../Zend/Db/Adapter/Sqlsrv/Exception.php      |   63 -
 airtime_mvc/library/Zend/Db/Exception.php     |   35 -
 airtime_mvc/library/Zend/Db/Expr.php          |   77 -
 airtime_mvc/library/Zend/Db/Profiler.php      |  471 --
 .../library/Zend/Db/Profiler/Exception.php    |   40 -
 .../library/Zend/Db/Profiler/Firebug.php      |  161 -
 .../library/Zend/Db/Profiler/Query.php        |  199 -
 airtime_mvc/library/Zend/Db/Select.php        | 1351 ----
 .../library/Zend/Db/Select/Exception.php      |   39 -
 airtime_mvc/library/Zend/Db/Statement.php     |  485 --
 airtime_mvc/library/Zend/Db/Statement/Db2.php |  360 -
 .../Zend/Db/Statement/Db2/Exception.php       |   58 -
 .../library/Zend/Db/Statement/Exception.php   |   56 -
 .../library/Zend/Db/Statement/Interface.php   |  203 -
 .../library/Zend/Db/Statement/Mysqli.php      |  362 -
 .../Zend/Db/Statement/Mysqli/Exception.php    |   38 -
 .../library/Zend/Db/Statement/Oracle.php      |  577 --
 .../Zend/Db/Statement/Oracle/Exception.php    |   59 -
 airtime_mvc/library/Zend/Db/Statement/Pdo.php |  439 --
 .../library/Zend/Db/Statement/Pdo/Ibm.php     |   94 -
 .../library/Zend/Db/Statement/Pdo/Oci.php     |   91 -
 .../library/Zend/Db/Statement/Sqlsrv.php      |  411 --
 .../Zend/Db/Statement/Sqlsrv/Exception.php    |   61 -
 airtime_mvc/library/Zend/Db/Table.php         |   79 -
 .../library/Zend/Db/Table/Abstract.php        | 1510 -----
 .../library/Zend/Db/Table/Definition.php      |  131 -
 .../library/Zend/Db/Table/Exception.php       |   38 -
 airtime_mvc/library/Zend/Db/Table/Row.php     |   42 -
 .../library/Zend/Db/Table/Row/Abstract.php    | 1198 ----
 .../library/Zend/Db/Table/Row/Exception.php   |   38 -
 airtime_mvc/library/Zend/Db/Table/Rowset.php  |   43 -
 .../library/Zend/Db/Table/Rowset/Abstract.php |  419 --
 .../Zend/Db/Table/Rowset/Exception.php        |   37 -
 airtime_mvc/library/Zend/Db/Table/Select.php  |  224 -
 .../Zend/Db/Table/Select/Exception.php        |   39 -
 airtime_mvc/library/Zend/Debug.php            |  108 -
 airtime_mvc/library/Zend/Dojo.php             |   87 -
 airtime_mvc/library/Zend/Dojo/BuildLayer.php  |  536 --
 airtime_mvc/library/Zend/Dojo/Data.php        |  563 --
 airtime_mvc/library/Zend/Dojo/Exception.php   |   35 -
 airtime_mvc/library/Zend/Dojo/Form.php        |   89 -
 .../Form/Decorator/AccordionContainer.php     |   43 -
 .../Dojo/Form/Decorator/AccordionPane.php     |   43 -
 .../Dojo/Form/Decorator/BorderContainer.php   |   43 -
 .../Zend/Dojo/Form/Decorator/ContentPane.php  |   43 -
 .../Dojo/Form/Decorator/DijitContainer.php    |  200 -
 .../Zend/Dojo/Form/Decorator/DijitElement.php |  193 -
 .../Zend/Dojo/Form/Decorator/DijitForm.php    |   61 -
 .../Dojo/Form/Decorator/SplitContainer.php    |   43 -
 .../Dojo/Form/Decorator/StackContainer.php    |   44 -
 .../Zend/Dojo/Form/Decorator/TabContainer.php |   43 -
 .../library/Zend/Dojo/Form/DisplayGroup.php   |   68 -
 .../library/Zend/Dojo/Form/Element/Button.php |  121 -
 .../Zend/Dojo/Form/Element/CheckBox.php       |  206 -
 .../Zend/Dojo/Form/Element/ComboBox.php       |  186 -
 .../Dojo/Form/Element/CurrencyTextBox.php     |  120 -
 .../Zend/Dojo/Form/Element/DateTextBox.php    |  214 -
 .../library/Zend/Dojo/Form/Element/Dijit.php  |  189 -
 .../Zend/Dojo/Form/Element/DijitMulti.php     |  304 -
 .../library/Zend/Dojo/Form/Element/Editor.php |  599 --
 .../Dojo/Form/Element/FilteringSelect.php     |   48 -
 .../Dojo/Form/Element/HorizontalSlider.php    |  208 -
 .../Zend/Dojo/Form/Element/NumberSpinner.php  |  245 -
 .../Zend/Dojo/Form/Element/NumberTextBox.php  |  173 -
 .../Dojo/Form/Element/PasswordTextBox.php     |   42 -
 .../Zend/Dojo/Form/Element/RadioButton.php    |   42 -
 .../Zend/Dojo/Form/Element/SimpleTextarea.php |   43 -
 .../library/Zend/Dojo/Form/Element/Slider.php |  199 -
 .../Zend/Dojo/Form/Element/SubmitButton.php   |   42 -
 .../Zend/Dojo/Form/Element/TextBox.php        |  164 -
 .../Zend/Dojo/Form/Element/Textarea.php       |   42 -
 .../Zend/Dojo/Form/Element/TimeTextBox.php    |  152 -
 .../Dojo/Form/Element/ValidationTextBox.php   |  218 -
 .../Zend/Dojo/Form/Element/VerticalSlider.php |  208 -
 .../library/Zend/Dojo/Form/SubForm.php        |   94 -
 .../library/Zend/Dojo/View/Exception.php      |   37 -
 .../Dojo/View/Helper/AccordionContainer.php   |   66 -
 .../Zend/Dojo/View/Helper/AccordionPane.php   |   66 -
 .../Zend/Dojo/View/Helper/BorderContainer.php |   79 -
 .../library/Zend/Dojo/View/Helper/Button.php  |   68 -
 .../Zend/Dojo/View/Helper/CheckBox.php        |  100 -
 .../Zend/Dojo/View/Helper/ComboBox.php        |  151 -
 .../Zend/Dojo/View/Helper/ContentPane.php     |   66 -
 .../Zend/Dojo/View/Helper/CurrencyTextBox.php |   68 -
 .../Zend/Dojo/View/Helper/CustomDijit.php     |  112 -
 .../Zend/Dojo/View/Helper/DateTextBox.php     |   68 -
 .../library/Zend/Dojo/View/Helper/Dijit.php   |  344 -
 .../Zend/Dojo/View/Helper/DijitContainer.php  |   92 -
 .../library/Zend/Dojo/View/Helper/Dojo.php    |  176 -
 .../Zend/Dojo/View/Helper/Dojo/Container.php  | 1199 ----
 .../library/Zend/Dojo/View/Helper/Editor.php  |  187 -
 .../Zend/Dojo/View/Helper/FilteringSelect.php |   63 -
 .../library/Zend/Dojo/View/Helper/Form.php    |   96 -
 .../Dojo/View/Helper/HorizontalSlider.php     |   62 -
 .../Zend/Dojo/View/Helper/NumberSpinner.php   |   90 -
 .../Zend/Dojo/View/Helper/NumberTextBox.php   |   68 -
 .../Zend/Dojo/View/Helper/PasswordTextBox.php |   56 -
 .../Zend/Dojo/View/Helper/RadioButton.php     |   89 -
 .../Zend/Dojo/View/Helper/SimpleTextarea.php  |   78 -
 .../library/Zend/Dojo/View/Helper/Slider.php  |  251 -
 .../Zend/Dojo/View/Helper/SplitContainer.php  |   66 -
 .../Zend/Dojo/View/Helper/StackContainer.php  |   66 -
 .../Zend/Dojo/View/Helper/SubmitButton.php    |   67 -
 .../Zend/Dojo/View/Helper/TabContainer.php    |   66 -
 .../library/Zend/Dojo/View/Helper/TextBox.php |   68 -
 .../Zend/Dojo/View/Helper/Textarea.php        |   80 -
 .../Zend/Dojo/View/Helper/TimeTextBox.php     |   68 -
 .../Dojo/View/Helper/ValidationTextBox.php    |   68 -
 .../Zend/Dojo/View/Helper/VerticalSlider.php  |   62 -
 airtime_mvc/library/Zend/Dom/Exception.php    |   35 -
 airtime_mvc/library/Zend/Dom/Query.php        |  247 -
 .../library/Zend/Dom/Query/Css2Xpath.php      |  142 -
 airtime_mvc/library/Zend/Dom/Query/Result.php |  183 -
 airtime_mvc/library/Zend/Exception.php        |   95 -
 airtime_mvc/library/Zend/Feed.php             |  411 --
 airtime_mvc/library/Zend/Feed/Abstract.php    |  259 -
 airtime_mvc/library/Zend/Feed/Atom.php        |  390 --
 airtime_mvc/library/Zend/Feed/Builder.php     |  398 --
 .../library/Zend/Feed/Builder/Entry.php       |  297 -
 .../library/Zend/Feed/Builder/Exception.php   |   40 -
 .../library/Zend/Feed/Builder/Header.php      |  423 --
 .../Zend/Feed/Builder/Header/Itunes.php       |  288 -
 .../library/Zend/Feed/Builder/Interface.php   |   52 -
 airtime_mvc/library/Zend/Feed/Element.php     |  437 --
 .../library/Zend/Feed/Entry/Abstract.php      |  124 -
 airtime_mvc/library/Zend/Feed/Entry/Atom.php  |  280 -
 airtime_mvc/library/Zend/Feed/Entry/Rss.php   |  122 -
 airtime_mvc/library/Zend/Feed/Exception.php   |   42 -
 .../library/Zend/Feed/Pubsubhubbub.php        |  152 -
 .../Feed/Pubsubhubbub/CallbackAbstract.php    |  307 -
 .../Feed/Pubsubhubbub/CallbackInterface.php   |   68 -
 .../Zend/Feed/Pubsubhubbub/Exception.php      |   33 -
 .../Zend/Feed/Pubsubhubbub/HttpResponse.php   |  233 -
 .../Feed/Pubsubhubbub/Model/ModelAbstract.php |   64 -
 .../Feed/Pubsubhubbub/Model/Subscription.php  |  131 -
 .../Model/SubscriptionInterface.php           |   64 -
 .../Zend/Feed/Pubsubhubbub/Publisher.php      |  417 --
 .../Zend/Feed/Pubsubhubbub/Subscriber.php     |  856 ---
 .../Feed/Pubsubhubbub/Subscriber/Callback.php |  328 -
 airtime_mvc/library/Zend/Feed/Reader.php      |  719 --
 .../library/Zend/Feed/Reader/Collection.php   |   33 -
 .../Zend/Feed/Reader/Collection/Author.php    |   51 -
 .../Zend/Feed/Reader/Collection/Category.php  |   57 -
 .../Reader/Collection/CollectionAbstract.php  |   41 -
 .../library/Zend/Feed/Reader/Entry/Atom.php   |  400 --
 .../library/Zend/Feed/Reader/Entry/Rss.php    |  665 --
 .../Zend/Feed/Reader/EntryAbstract.php        |  238 -
 .../Zend/Feed/Reader/EntryInterface.php       |  143 -
 .../Zend/Feed/Reader/Extension/Atom/Entry.php |  665 --
 .../Zend/Feed/Reader/Extension/Atom/Feed.php  |  544 --
 .../Feed/Reader/Extension/Content/Entry.php   |   64 -
 .../Extension/CreativeCommons/Entry.php       |   97 -
 .../Reader/Extension/CreativeCommons/Feed.php |   89 -
 .../Reader/Extension/DublinCore/Entry.php     |  266 -
 .../Feed/Reader/Extension/DublinCore/Feed.php |  309 -
 .../Feed/Reader/Extension/EntryAbstract.php   |  200 -
 .../Feed/Reader/Extension/FeedAbstract.php    |  189 -
 .../Feed/Reader/Extension/Podcast/Entry.php   |  202 -
 .../Feed/Reader/Extension/Podcast/Feed.php    |  293 -
 .../Feed/Reader/Extension/Slash/Entry.php     |  144 -
 .../Reader/Extension/Syndication/Feed.php     |  168 -
 .../Feed/Reader/Extension/Thread/Entry.php    |   91 -
 .../Reader/Extension/WellFormedWeb/Entry.php  |   73 -
 .../library/Zend/Feed/Reader/Feed/Atom.php    |  389 --
 .../Zend/Feed/Reader/Feed/Atom/Source.php     |  102 -
 .../library/Zend/Feed/Reader/Feed/Rss.php     |  623 --
 .../library/Zend/Feed/Reader/FeedAbstract.php |  291 -
 .../Zend/Feed/Reader/FeedInterface.php        |  122 -
 .../library/Zend/Feed/Reader/FeedSet.php      |  148 -
 airtime_mvc/library/Zend/Feed/Rss.php         |  529 --
 airtime_mvc/library/Zend/Feed/Writer.php      |  267 -
 .../library/Zend/Feed/Writer/Deleted.php      |  202 -
 .../library/Zend/Feed/Writer/Entry.php        |  771 ---
 .../Exception/InvalidMethodException.php      |   41 -
 .../Writer/Extension/Atom/Renderer/Feed.php   |  123 -
 .../Extension/Content/Renderer/Entry.php      |   92 -
 .../Extension/DublinCore/Renderer/Entry.php   |   96 -
 .../Extension/DublinCore/Renderer/Feed.php    |   96 -
 .../Feed/Writer/Extension/ITunes/Entry.php    |  242 -
 .../Feed/Writer/Extension/ITunes/Feed.php     |  361 -
 .../Extension/ITunes/Renderer/Entry.php       |  216 -
 .../Writer/Extension/ITunes/Renderer/Feed.php |  320 -
 .../Writer/Extension/RendererAbstract.php     |  179 -
 .../Writer/Extension/RendererInterface.php    |   59 -
 .../Writer/Extension/Slash/Renderer/Entry.php |   91 -
 .../Extension/Threading/Renderer/Entry.php    |  145 -
 .../WellFormedWeb/Renderer/Entry.php          |   96 -
 airtime_mvc/library/Zend/Feed/Writer/Feed.php |  281 -
 .../Zend/Feed/Writer/Feed/FeedAbstract.php    |  716 --
 .../Zend/Feed/Writer/Renderer/Entry/Atom.php  |  405 --
 .../Writer/Renderer/Entry/Atom/Deleted.php    |  121 -
 .../Zend/Feed/Writer/Renderer/Entry/Rss.php   |  315 -
 .../Zend/Feed/Writer/Renderer/Feed/Atom.php   |  129 -
 .../Renderer/Feed/Atom/AtomAbstract.php       |  408 --
 .../Feed/Writer/Renderer/Feed/Atom/Source.php |  110 -
 .../Zend/Feed/Writer/Renderer/Feed/Rss.php    |  374 --
 .../Feed/Writer/Renderer/RendererAbstract.php |  250 -
 .../Writer/Renderer/RendererInterface.php     |  111 -
 .../library/Zend/Feed/Writer/Source.php       |   33 -
 airtime_mvc/library/Zend/File/Transfer.php    |  125 -
 .../Zend/File/Transfer/Adapter/Abstract.php   | 1556 -----
 .../Zend/File/Transfer/Adapter/Http.php       |  483 --
 .../library/Zend/File/Transfer/Exception.php  |   55 -
 airtime_mvc/library/Zend/Filter.php           |  239 -
 airtime_mvc/library/Zend/Filter/Alnum.php     |  146 -
 airtime_mvc/library/Zend/Filter/Alpha.php     |  146 -
 airtime_mvc/library/Zend/Filter/BaseName.php  |   50 -
 airtime_mvc/library/Zend/Filter/Boolean.php   |  375 --
 airtime_mvc/library/Zend/Filter/Callback.php  |  152 -
 airtime_mvc/library/Zend/Filter/Compress.php  |  197 -
 .../library/Zend/Filter/Compress/Bz2.php      |  188 -
 .../Zend/Filter/Compress/CompressAbstract.php |   89 -
 .../Filter/Compress/CompressInterface.php     |   54 -
 .../library/Zend/Filter/Compress/Gz.php       |  228 -
 .../library/Zend/Filter/Compress/Lzf.php      |   91 -
 .../library/Zend/Filter/Compress/Rar.php      |  252 -
 .../library/Zend/Filter/Compress/Tar.php      |  245 -
 .../library/Zend/Filter/Compress/Zip.php      |  355 -
 .../library/Zend/Filter/Decompress.php        |   49 -
 airtime_mvc/library/Zend/Filter/Decrypt.php   |   49 -
 airtime_mvc/library/Zend/Filter/Digits.php    |   82 -
 airtime_mvc/library/Zend/Filter/Dir.php       |   50 -
 airtime_mvc/library/Zend/Filter/Encrypt.php   |  138 -
 .../library/Zend/Filter/Encrypt/Interface.php |   47 -
 .../library/Zend/Filter/Encrypt/Mcrypt.php    |  312 -
 .../library/Zend/Filter/Encrypt/Openssl.php   |  353 -
 airtime_mvc/library/Zend/Filter/Exception.php |   37 -
 .../library/Zend/Filter/File/Decrypt.php      |  106 -
 .../library/Zend/Filter/File/Encrypt.php      |  106 -
 .../library/Zend/Filter/File/LowerCase.php    |   84 -
 .../library/Zend/Filter/File/Rename.php       |  304 -
 .../library/Zend/Filter/File/UpperCase.php    |   84 -
 .../library/Zend/Filter/HtmlEntities.php      |  202 -
 airtime_mvc/library/Zend/Filter/Inflector.php |  527 --
 airtime_mvc/library/Zend/Filter/Input.php     | 1126 ----
 airtime_mvc/library/Zend/Filter/Int.php       |   50 -
 airtime_mvc/library/Zend/Filter/Interface.php |   40 -
 .../Zend/Filter/LocalizedToNormalized.php     |  112 -
 .../Zend/Filter/NormalizedToLocalized.php     |  111 -
 airtime_mvc/library/Zend/Filter/Null.php      |  183 -
 .../library/Zend/Filter/PregReplace.php       |  174 -
 airtime_mvc/library/Zend/Filter/RealPath.php  |  134 -
 .../library/Zend/Filter/StringToLower.php     |  117 -
 .../library/Zend/Filter/StringToUpper.php     |  117 -
 .../library/Zend/Filter/StringTrim.php        |  124 -
 .../library/Zend/Filter/StripNewlines.php     |   48 -
 airtime_mvc/library/Zend/Filter/StripTags.php |  344 -
 .../Zend/Filter/Word/CamelCaseToDash.php      |   44 -
 .../Zend/Filter/Word/CamelCaseToSeparator.php |   49 -
 .../Filter/Word/CamelCaseToUnderscore.php     |   44 -
 .../Zend/Filter/Word/DashToCamelCase.php      |   44 -
 .../Zend/Filter/Word/DashToSeparator.php      |   42 -
 .../Zend/Filter/Word/DashToUnderscore.php     |   45 -
 .../Zend/Filter/Word/Separator/Abstract.php   |   76 -
 .../Zend/Filter/Word/SeparatorToCamelCase.php |   52 -
 .../Zend/Filter/Word/SeparatorToDash.php      |   46 -
 .../Zend/Filter/Word/SeparatorToSeparator.php |  129 -
 .../Filter/Word/UnderscoreToCamelCase.php     |   44 -
 .../Zend/Filter/Word/UnderscoreToDash.php     |   45 -
 .../Filter/Word/UnderscoreToSeparator.php     |   45 -
 airtime_mvc/library/Zend/Form.php             | 3135 ---------
 .../library/Zend/Form/Decorator/Abstract.php  |  254 -
 .../library/Zend/Form/Decorator/Callback.php  |  128 -
 .../library/Zend/Form/Decorator/Captcha.php   |   72 -
 .../Zend/Form/Decorator/Captcha/Word.php      |   78 -
 .../Zend/Form/Decorator/Description.php       |  199 -
 .../Zend/Form/Decorator/DtDdWrapper.php       |   63 -
 .../library/Zend/Form/Decorator/Errors.php    |   69 -
 .../library/Zend/Form/Decorator/Exception.php |   37 -
 .../library/Zend/Form/Decorator/Fieldset.php  |  155 -
 .../library/Zend/Form/Decorator/File.php      |  142 -
 .../library/Zend/Form/Decorator/Form.php      |  134 -
 .../Zend/Form/Decorator/FormElements.php      |  126 -
 .../Zend/Form/Decorator/FormErrors.php        |  397 --
 .../library/Zend/Form/Decorator/HtmlTag.php   |  251 -
 .../library/Zend/Form/Decorator/Image.php     |  154 -
 .../library/Zend/Form/Decorator/Interface.php |  123 -
 .../library/Zend/Form/Decorator/Label.php     |  332 -
 .../Form/Decorator/Marker/File/Interface.php  |   33 -
 .../Zend/Form/Decorator/PrepareElements.php   |   90 -
 .../library/Zend/Form/Decorator/Tooltip.php   |   58 -
 .../Zend/Form/Decorator/ViewHelper.php        |  256 -
 .../Zend/Form/Decorator/ViewScript.php        |  144 -
 .../library/Zend/Form/DisplayGroup.php        | 1126 ----
 airtime_mvc/library/Zend/Form/Element.php     | 2219 ------
 .../library/Zend/Form/Element/Button.php      |   42 -
 .../library/Zend/Form/Element/Captcha.php     |  305 -
 .../library/Zend/Form/Element/Checkbox.php    |  203 -
 .../library/Zend/Form/Element/Exception.php   |   37 -
 .../library/Zend/Form/Element/File.php        |  911 ---
 .../library/Zend/Form/Element/Hash.php        |  259 -
 .../library/Zend/Form/Element/Hidden.php      |   42 -
 .../library/Zend/Form/Element/Image.php       |  131 -
 .../library/Zend/Form/Element/Multi.php       |  318 -
 .../Zend/Form/Element/MultiCheckbox.php       |   52 -
 .../library/Zend/Form/Element/Multiselect.php |   54 -
 .../library/Zend/Form/Element/Password.php    |   88 -
 .../library/Zend/Form/Element/Radio.php       |   57 -
 .../library/Zend/Form/Element/Reset.php       |   42 -
 .../library/Zend/Form/Element/Select.php      |   42 -
 .../library/Zend/Form/Element/Submit.php      |  126 -
 .../library/Zend/Form/Element/Text.php        |   42 -
 .../library/Zend/Form/Element/Textarea.php    |   42 -
 .../library/Zend/Form/Element/Xhtml.php       |   37 -
 airtime_mvc/library/Zend/Form/Exception.php   |   35 -
 airtime_mvc/library/Zend/Form/SubForm.php     |   60 -
 airtime_mvc/library/Zend/Gdata.php            |  241 -
 airtime_mvc/library/Zend/Gdata/App.php        | 1211 ----
 .../library/Zend/Gdata/App/AuthException.php  |   41 -
 .../Zend/Gdata/App/BadMethodCallException.php |   42 -
 airtime_mvc/library/Zend/Gdata/App/Base.php   |  572 --
 .../Zend/Gdata/App/BaseMediaSource.php        |  179 -
 .../Gdata/App/CaptchaRequiredException.php    |   94 -
 airtime_mvc/library/Zend/Gdata/App/Entry.php  |  389 --
 .../library/Zend/Gdata/App/Exception.php      |   43 -
 .../library/Zend/Gdata/App/Extension.php      |   40 -
 .../Zend/Gdata/App/Extension/Author.php       |   43 -
 .../Zend/Gdata/App/Extension/Category.php     |  140 -
 .../Zend/Gdata/App/Extension/Content.php      |   88 -
 .../Zend/Gdata/App/Extension/Contributor.php  |   43 -
 .../Zend/Gdata/App/Extension/Control.php      |   98 -
 .../Zend/Gdata/App/Extension/Draft.php        |   50 -
 .../Zend/Gdata/App/Extension/Edited.php       |   49 -
 .../Zend/Gdata/App/Extension/Element.php      |   58 -
 .../Zend/Gdata/App/Extension/Email.php        |   49 -
 .../Zend/Gdata/App/Extension/Generator.php    |  115 -
 .../library/Zend/Gdata/App/Extension/Icon.php |   49 -
 .../library/Zend/Gdata/App/Extension/Id.php   |   49 -
 .../library/Zend/Gdata/App/Extension/Link.php |  219 -
 .../library/Zend/Gdata/App/Extension/Logo.php |   49 -
 .../library/Zend/Gdata/App/Extension/Name.php |   48 -
 .../Zend/Gdata/App/Extension/Person.php       |  163 -
 .../Zend/Gdata/App/Extension/Published.php    |   49 -
 .../Zend/Gdata/App/Extension/Rights.php       |   49 -
 .../Zend/Gdata/App/Extension/Source.php       |   46 -
 .../Zend/Gdata/App/Extension/Subtitle.php     |   43 -
 .../Zend/Gdata/App/Extension/Summary.php      |   43 -
 .../library/Zend/Gdata/App/Extension/Text.php |   90 -
 .../Zend/Gdata/App/Extension/Title.php        |   43 -
 .../Zend/Gdata/App/Extension/Updated.php      |   49 -
 .../library/Zend/Gdata/App/Extension/Uri.php  |   49 -
 airtime_mvc/library/Zend/Gdata/App/Feed.php   |  352 -
 .../Zend/Gdata/App/FeedEntryParent.php        |  681 --
 .../Zend/Gdata/App/FeedSourceParent.php       |  267 -
 .../library/Zend/Gdata/App/HttpException.php  |  121 -
 .../library/Zend/Gdata/App/IOException.php    |   43 -
 .../Gdata/App/InvalidArgumentException.php    |   42 -
 .../App/LoggingHttpClientAdapterSocket.php    |  119 -
 .../library/Zend/Gdata/App/MediaEntry.php     |  119 -
 .../Zend/Gdata/App/MediaFileSource.php        |  146 -
 .../library/Zend/Gdata/App/MediaSource.php    |   73 -
 airtime_mvc/library/Zend/Gdata/App/Util.php   |  112 -
 .../Zend/Gdata/App/VersionException.php       |   42 -
 airtime_mvc/library/Zend/Gdata/AuthSub.php    |  246 -
 airtime_mvc/library/Zend/Gdata/Books.php      |  204 -
 .../Zend/Gdata/Books/CollectionEntry.php      |   56 -
 .../Zend/Gdata/Books/CollectionFeed.php       |   62 -
 .../Gdata/Books/Extension/AnnotationLink.php  |   63 -
 .../Gdata/Books/Extension/BooksCategory.php   |   59 -
 .../Zend/Gdata/Books/Extension/BooksLink.php  |   61 -
 .../Gdata/Books/Extension/Embeddability.php   |  122 -
 .../Zend/Gdata/Books/Extension/InfoLink.php   |   59 -
 .../Gdata/Books/Extension/PreviewLink.php     |   60 -
 .../Zend/Gdata/Books/Extension/Review.php     |  152 -
 .../Gdata/Books/Extension/ThumbnailLink.php   |   60 -
 .../Gdata/Books/Extension/Viewability.php     |  123 -
 .../library/Zend/Gdata/Books/VolumeEntry.php  |  687 --
 .../library/Zend/Gdata/Books/VolumeFeed.php   |   62 -
 .../library/Zend/Gdata/Books/VolumeQuery.php  |  112 -
 airtime_mvc/library/Zend/Gdata/Calendar.php   |  169 -
 .../Zend/Gdata/Calendar/EventEntry.php        |  164 -
 .../library/Zend/Gdata/Calendar/EventFeed.php |  106 -
 .../Zend/Gdata/Calendar/EventQuery.php        |  491 --
 .../Gdata/Calendar/Extension/AccessLevel.php  |  125 -
 .../Zend/Gdata/Calendar/Extension/Color.php   |  125 -
 .../Zend/Gdata/Calendar/Extension/Hidden.php  |  134 -
 .../Zend/Gdata/Calendar/Extension/Link.php    |  125 -
 .../Gdata/Calendar/Extension/QuickAdd.php     |  132 -
 .../Gdata/Calendar/Extension/Selected.php     |  133 -
 .../Extension/SendEventNotifications.php      |  132 -
 .../Gdata/Calendar/Extension/Timezone.php     |  124 -
 .../Gdata/Calendar/Extension/WebContent.php   |  177 -
 .../library/Zend/Gdata/Calendar/ListEntry.php |  246 -
 .../library/Zend/Gdata/Calendar/ListFeed.php  |  106 -
 .../library/Zend/Gdata/ClientLogin.php        |  182 -
 airtime_mvc/library/Zend/Gdata/Docs.php       |  303 -
 .../Zend/Gdata/Docs/DocumentListEntry.php     |   54 -
 .../Zend/Gdata/Docs/DocumentListFeed.php      |   68 -
 airtime_mvc/library/Zend/Gdata/Docs/Query.php |  222 -
 airtime_mvc/library/Zend/Gdata/DublinCore.php |   65 -
 .../Gdata/DublinCore/Extension/Creator.php    |   58 -
 .../Zend/Gdata/DublinCore/Extension/Date.php  |   60 -
 .../DublinCore/Extension/Description.php      |   58 -
 .../Gdata/DublinCore/Extension/Format.php     |   58 -
 .../Gdata/DublinCore/Extension/Identifier.php |   58 -
 .../Gdata/DublinCore/Extension/Language.php   |   58 -
 .../Gdata/DublinCore/Extension/Publisher.php  |   58 -
 .../Gdata/DublinCore/Extension/Rights.php     |   58 -
 .../Gdata/DublinCore/Extension/Subject.php    |   58 -
 .../Zend/Gdata/DublinCore/Extension/Title.php |   58 -
 airtime_mvc/library/Zend/Gdata/Entry.php      |  132 -
 airtime_mvc/library/Zend/Gdata/Exif.php       |   65 -
 airtime_mvc/library/Zend/Gdata/Exif/Entry.php |  145 -
 .../Zend/Gdata/Exif/Extension/Distance.php    |   61 -
 .../Zend/Gdata/Exif/Extension/Exposure.php    |   61 -
 .../Zend/Gdata/Exif/Extension/FStop.php       |   61 -
 .../Zend/Gdata/Exif/Extension/Flash.php       |   61 -
 .../Zend/Gdata/Exif/Extension/FocalLength.php |   61 -
 .../Gdata/Exif/Extension/ImageUniqueId.php    |   61 -
 .../library/Zend/Gdata/Exif/Extension/Iso.php |   61 -
 .../Zend/Gdata/Exif/Extension/Make.php        |   61 -
 .../Zend/Gdata/Exif/Extension/Model.php       |   61 -
 .../Zend/Gdata/Exif/Extension/Tags.php        |  549 --
 .../Zend/Gdata/Exif/Extension/Time.php        |   61 -
 airtime_mvc/library/Zend/Gdata/Exif/Feed.php  |   70 -
 airtime_mvc/library/Zend/Gdata/Extension.php  |   58 -
 .../Zend/Gdata/Extension/AttendeeStatus.php   |  123 -
 .../Zend/Gdata/Extension/AttendeeType.php     |  123 -
 .../library/Zend/Gdata/Extension/Comments.php |  117 -
 .../Zend/Gdata/Extension/EntryLink.php        |  167 -
 .../Zend/Gdata/Extension/EventStatus.php      |  101 -
 .../Zend/Gdata/Extension/ExtendedProperty.php |  106 -
 .../library/Zend/Gdata/Extension/FeedLink.php |  175 -
 .../Extension/OpenSearchItemsPerPage.php      |   50 -
 .../Gdata/Extension/OpenSearchStartIndex.php  |   50 -
 .../Extension/OpenSearchTotalResults.php      |   50 -
 .../Zend/Gdata/Extension/OriginalEvent.php    |  142 -
 .../library/Zend/Gdata/Extension/Rating.php   |  240 -
 .../Zend/Gdata/Extension/Recurrence.php       |   49 -
 .../Gdata/Extension/RecurrenceException.php   |  215 -
 .../library/Zend/Gdata/Extension/Reminder.php |  171 -
 .../Zend/Gdata/Extension/Transparency.php     |  123 -
 .../Zend/Gdata/Extension/Visibility.php       |  123 -
 .../library/Zend/Gdata/Extension/When.php     |  169 -
 .../library/Zend/Gdata/Extension/Where.php    |  171 -
 .../library/Zend/Gdata/Extension/Who.php      |  299 -
 airtime_mvc/library/Zend/Gdata/Feed.php       |  251 -
 airtime_mvc/library/Zend/Gdata/Gapps.php      | 1097 ---
 .../Zend/Gdata/Gapps/EmailListEntry.php       |  214 -
 .../Zend/Gdata/Gapps/EmailListFeed.php        |   53 -
 .../Zend/Gdata/Gapps/EmailListQuery.php       |  187 -
 .../Gdata/Gapps/EmailListRecipientEntry.php   |  146 -
 .../Gdata/Gapps/EmailListRecipientFeed.php    |   53 -
 .../Gdata/Gapps/EmailListRecipientQuery.php   |  153 -
 .../library/Zend/Gdata/Gapps/Error.php        |  233 -
 .../Zend/Gdata/Gapps/Extension/EmailList.php  |  144 -
 .../Zend/Gdata/Gapps/Extension/Login.php      |  485 --
 .../Zend/Gdata/Gapps/Extension/Name.php       |  181 -
 .../Zend/Gdata/Gapps/Extension/Nickname.php   |  142 -
 .../Zend/Gdata/Gapps/Extension/Quota.php      |  142 -
 .../Zend/Gdata/Gapps/NicknameEntry.php        |  189 -
 .../library/Zend/Gdata/Gapps/NicknameFeed.php |   53 -
 .../Zend/Gdata/Gapps/NicknameQuery.php        |  186 -
 .../library/Zend/Gdata/Gapps/Query.php        |  123 -
 .../Zend/Gdata/Gapps/ServiceException.php     |  208 -
 .../library/Zend/Gdata/Gapps/UserEntry.php    |  295 -
 .../library/Zend/Gdata/Gapps/UserFeed.php     |   53 -
 .../library/Zend/Gdata/Gapps/UserQuery.php    |  147 -
 airtime_mvc/library/Zend/Gdata/Gbase.php      |  209 -
 .../library/Zend/Gdata/Gbase/Entry.php        |  151 -
 .../Gdata/Gbase/Extension/BaseAttribute.php   |  115 -
 airtime_mvc/library/Zend/Gdata/Gbase/Feed.php |   60 -
 .../library/Zend/Gdata/Gbase/ItemEntry.php    |  161 -
 .../library/Zend/Gdata/Gbase/ItemFeed.php     |   48 -
 .../library/Zend/Gdata/Gbase/ItemQuery.php    |  101 -
 .../library/Zend/Gdata/Gbase/Query.php        |  268 -
 .../library/Zend/Gdata/Gbase/SnippetEntry.php |   48 -
 .../library/Zend/Gdata/Gbase/SnippetFeed.php  |   48 -
 .../library/Zend/Gdata/Gbase/SnippetQuery.php |   74 -
 airtime_mvc/library/Zend/Gdata/Geo.php        |   70 -
 airtime_mvc/library/Zend/Gdata/Geo/Entry.php  |   97 -
 .../Zend/Gdata/Geo/Extension/GeoRssWhere.php  |  135 -
 .../Zend/Gdata/Geo/Extension/GmlPoint.php     |  136 -
 .../Zend/Gdata/Geo/Extension/GmlPos.php       |   61 -
 airtime_mvc/library/Zend/Gdata/Geo/Feed.php   |   64 -
 airtime_mvc/library/Zend/Gdata/Health.php     |  274 -
 .../Zend/Gdata/Health/Extension/Ccr.php       |  124 -
 .../Zend/Gdata/Health/ProfileEntry.php        |  135 -
 .../library/Zend/Gdata/Health/ProfileFeed.php |   67 -
 .../Zend/Gdata/Health/ProfileListEntry.php    |  100 -
 .../Zend/Gdata/Health/ProfileListFeed.php     |   53 -
 .../library/Zend/Gdata/Health/Query.php       |  285 -
 .../Zend/Gdata/HttpAdapterStreamingProxy.php  |  127 -
 .../Zend/Gdata/HttpAdapterStreamingSocket.php |  111 -
 airtime_mvc/library/Zend/Gdata/HttpClient.php |  352 -
 .../library/Zend/Gdata/Kind/EventEntry.php    |  428 --
 airtime_mvc/library/Zend/Gdata/Media.php      |   65 -
 .../library/Zend/Gdata/Media/Entry.php        |  134 -
 .../Gdata/Media/Extension/MediaCategory.php   |  148 -
 .../Gdata/Media/Extension/MediaContent.php    |  522 --
 .../Gdata/Media/Extension/MediaCopyright.php  |  116 -
 .../Gdata/Media/Extension/MediaCredit.php     |  149 -
 .../Media/Extension/MediaDescription.php      |  116 -
 .../Zend/Gdata/Media/Extension/MediaGroup.php |  566 --
 .../Zend/Gdata/Media/Extension/MediaHash.php  |  115 -
 .../Gdata/Media/Extension/MediaKeywords.php   |   52 -
 .../Gdata/Media/Extension/MediaPlayer.php     |  178 -
 .../Gdata/Media/Extension/MediaRating.php     |  118 -
 .../Media/Extension/MediaRestriction.php      |  149 -
 .../Zend/Gdata/Media/Extension/MediaText.php  |  211 -
 .../Gdata/Media/Extension/MediaThumbnail.php  |  210 -
 .../Zend/Gdata/Media/Extension/MediaTitle.php |  118 -
 airtime_mvc/library/Zend/Gdata/Media/Feed.php |   70 -
 .../library/Zend/Gdata/MediaMimeStream.php    |  190 -
 .../library/Zend/Gdata/MimeBodyString.php     |   92 -
 airtime_mvc/library/Zend/Gdata/MimeFile.php   |   66 -
 airtime_mvc/library/Zend/Gdata/Photos.php     |  576 --
 .../library/Zend/Gdata/Photos/AlbumEntry.php  |  610 --
 .../library/Zend/Gdata/Photos/AlbumFeed.php   |  509 --
 .../library/Zend/Gdata/Photos/AlbumQuery.php  |  149 -
 .../Zend/Gdata/Photos/CommentEntry.php        |  195 -
 .../Zend/Gdata/Photos/Extension/Access.php    |   63 -
 .../Zend/Gdata/Photos/Extension/AlbumId.php   |   63 -
 .../Zend/Gdata/Photos/Extension/BytesUsed.php |   62 -
 .../Zend/Gdata/Photos/Extension/Checksum.php  |   63 -
 .../Zend/Gdata/Photos/Extension/Client.php    |   63 -
 .../Gdata/Photos/Extension/CommentCount.php   |   63 -
 .../Photos/Extension/CommentingEnabled.php    |   64 -
 .../Zend/Gdata/Photos/Extension/Height.php    |   62 -
 .../Zend/Gdata/Photos/Extension/Id.php        |   62 -
 .../Zend/Gdata/Photos/Extension/Location.php  |   62 -
 .../Photos/Extension/MaxPhotosPerAlbum.php    |   63 -
 .../Zend/Gdata/Photos/Extension/Name.php      |   62 -
 .../Zend/Gdata/Photos/Extension/Nickname.php  |   62 -
 .../Zend/Gdata/Photos/Extension/NumPhotos.php |   62 -
 .../Photos/Extension/NumPhotosRemaining.php   |   62 -
 .../Zend/Gdata/Photos/Extension/PhotoId.php   |   61 -
 .../Zend/Gdata/Photos/Extension/Position.php  |   62 -
 .../Gdata/Photos/Extension/QuotaCurrent.php   |   62 -
 .../Gdata/Photos/Extension/QuotaLimit.php     |   63 -
 .../Zend/Gdata/Photos/Extension/Rotation.php  |   63 -
 .../Zend/Gdata/Photos/Extension/Size.php      |   62 -
 .../Zend/Gdata/Photos/Extension/Thumbnail.php |   62 -
 .../Zend/Gdata/Photos/Extension/Timestamp.php |   63 -
 .../Zend/Gdata/Photos/Extension/User.php      |   62 -
 .../Zend/Gdata/Photos/Extension/Version.php   |   63 -
 .../Zend/Gdata/Photos/Extension/Weight.php    |   63 -
 .../Zend/Gdata/Photos/Extension/Width.php     |   62 -
 .../library/Zend/Gdata/Photos/PhotoEntry.php  |  691 --
 .../library/Zend/Gdata/Photos/PhotoFeed.php   |  559 --
 .../library/Zend/Gdata/Photos/PhotoQuery.php  |   98 -
 .../library/Zend/Gdata/Photos/TagEntry.php    |  140 -
 .../library/Zend/Gdata/Photos/UserEntry.php   |  366 -
 .../library/Zend/Gdata/Photos/UserFeed.php    |  247 -
 .../library/Zend/Gdata/Photos/UserQuery.php   |  355 -
 airtime_mvc/library/Zend/Gdata/Query.php      |  418 --
 .../library/Zend/Gdata/Spreadsheets.php       |  445 --
 .../Zend/Gdata/Spreadsheets/CellEntry.php     |  103 -
 .../Zend/Gdata/Spreadsheets/CellFeed.php      |  158 -
 .../Zend/Gdata/Spreadsheets/CellQuery.php     |  417 --
 .../Zend/Gdata/Spreadsheets/DocumentQuery.php |  288 -
 .../Gdata/Spreadsheets/Extension/Cell.php     |  201 -
 .../Gdata/Spreadsheets/Extension/ColCount.php |   59 -
 .../Gdata/Spreadsheets/Extension/Custom.php   |  100 -
 .../Gdata/Spreadsheets/Extension/RowCount.php |   60 -
 .../Zend/Gdata/Spreadsheets/ListEntry.php     |  208 -
 .../Zend/Gdata/Spreadsheets/ListFeed.php      |   64 -
 .../Zend/Gdata/Spreadsheets/ListQuery.php     |  305 -
 .../Gdata/Spreadsheets/SpreadsheetEntry.php   |   64 -
 .../Gdata/Spreadsheets/SpreadsheetFeed.php    |   64 -
 .../Gdata/Spreadsheets/WorksheetEntry.php     |  187 -
 .../Zend/Gdata/Spreadsheets/WorksheetFeed.php |   64 -
 airtime_mvc/library/Zend/Gdata/YouTube.php    |  874 ---
 .../Zend/Gdata/YouTube/ActivityEntry.php      |  232 -
 .../Zend/Gdata/YouTube/ActivityFeed.php       |   66 -
 .../Zend/Gdata/YouTube/CommentEntry.php       |   59 -
 .../Zend/Gdata/YouTube/CommentFeed.php        |   66 -
 .../Zend/Gdata/YouTube/ContactEntry.php       |  136 -
 .../Zend/Gdata/YouTube/ContactFeed.php        |   68 -
 .../Zend/Gdata/YouTube/Extension/AboutMe.php  |   51 -
 .../Zend/Gdata/YouTube/Extension/Age.php      |   51 -
 .../Zend/Gdata/YouTube/Extension/Books.php    |   51 -
 .../Zend/Gdata/YouTube/Extension/Company.php  |   51 -
 .../Zend/Gdata/YouTube/Extension/Control.php  |  133 -
 .../Gdata/YouTube/Extension/CountHint.php     |   51 -
 .../Gdata/YouTube/Extension/Description.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/Duration.php |  126 -
 .../Gdata/YouTube/Extension/FirstName.php     |   51 -
 .../Zend/Gdata/YouTube/Extension/Gender.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/Hobbies.php  |   51 -
 .../Zend/Gdata/YouTube/Extension/Hometown.php |   51 -
 .../Zend/Gdata/YouTube/Extension/LastName.php |   51 -
 .../Zend/Gdata/YouTube/Extension/Link.php     |  133 -
 .../Zend/Gdata/YouTube/Extension/Location.php |   51 -
 .../Gdata/YouTube/Extension/MediaContent.php  |  120 -
 .../Gdata/YouTube/Extension/MediaCredit.php   |  189 -
 .../Gdata/YouTube/Extension/MediaGroup.php    |  336 -
 .../Gdata/YouTube/Extension/MediaRating.php   |  150 -
 .../Zend/Gdata/YouTube/Extension/Movies.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/Music.php    |   51 -
 .../Zend/Gdata/YouTube/Extension/NoEmbed.php  |   54 -
 .../Gdata/YouTube/Extension/Occupation.php    |   51 -
 .../Gdata/YouTube/Extension/PlaylistId.php    |   51 -
 .../Gdata/YouTube/Extension/PlaylistTitle.php |   51 -
 .../Zend/Gdata/YouTube/Extension/Position.php |   90 -
 .../Zend/Gdata/YouTube/Extension/Private.php  |   81 -
 .../Gdata/YouTube/Extension/QueryString.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/Racy.php     |  124 -
 .../Zend/Gdata/YouTube/Extension/Recorded.php |   51 -
 .../Gdata/YouTube/Extension/Relationship.php  |   51 -
 .../Gdata/YouTube/Extension/ReleaseDate.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/School.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/State.php    |  193 -
 .../Gdata/YouTube/Extension/Statistics.php    |  309 -
 .../Zend/Gdata/YouTube/Extension/Status.php   |   51 -
 .../Zend/Gdata/YouTube/Extension/Token.php    |   70 -
 .../Zend/Gdata/YouTube/Extension/Uploaded.php |   51 -
 .../Zend/Gdata/YouTube/Extension/Username.php |   51 -
 .../Zend/Gdata/YouTube/Extension/VideoId.php  |   51 -
 .../library/Zend/Gdata/YouTube/InboxEntry.php |  281 -
 .../library/Zend/Gdata/YouTube/InboxFeed.php  |   68 -
 .../library/Zend/Gdata/YouTube/MediaEntry.php |   81 -
 .../Zend/Gdata/YouTube/PlaylistListEntry.php  |  300 -
 .../Zend/Gdata/YouTube/PlaylistListFeed.php   |   68 -
 .../Zend/Gdata/YouTube/PlaylistVideoEntry.php |  132 -
 .../Zend/Gdata/YouTube/PlaylistVideoFeed.php  |   68 -
 .../Zend/Gdata/YouTube/SubscriptionEntry.php  |  446 --
 .../Zend/Gdata/YouTube/SubscriptionFeed.php   |   68 -
 .../Zend/Gdata/YouTube/UserProfileEntry.php   | 1041 ---
 .../library/Zend/Gdata/YouTube/VideoEntry.php | 1095 ---
 .../library/Zend/Gdata/YouTube/VideoFeed.php  |   65 -
 .../library/Zend/Gdata/YouTube/VideoQuery.php |  540 --
 airtime_mvc/library/Zend/Http/Client.php      | 1459 ----
 .../library/Zend/Http/Client/Adapter/Curl.php |  501 --
 .../Zend/Http/Client/Adapter/Exception.php    |   38 -
 .../Zend/Http/Client/Adapter/Interface.php    |   78 -
 .../Zend/Http/Client/Adapter/Proxy.php        |  272 -
 .../Zend/Http/Client/Adapter/Socket.php       |  535 --
 .../Zend/Http/Client/Adapter/Stream.php       |   46 -
 .../library/Zend/Http/Client/Adapter/Test.php |  238 -
 .../library/Zend/Http/Client/Exception.php    |   36 -
 airtime_mvc/library/Zend/Http/Cookie.php      |  424 --
 airtime_mvc/library/Zend/Http/CookieJar.php   |  403 --
 airtime_mvc/library/Zend/Http/Exception.php   |   36 -
 airtime_mvc/library/Zend/Http/Response.php    |  664 --
 .../library/Zend/Http/Response/Stream.php     |  235 -
 airtime_mvc/library/Zend/InfoCard.php         |  497 --
 .../library/Zend/InfoCard/Adapter/Default.php |   79 -
 .../Zend/InfoCard/Adapter/Exception.php       |   37 -
 .../Zend/InfoCard/Adapter/Interface.php       |   64 -
 airtime_mvc/library/Zend/InfoCard/Cipher.php  |   99 -
 .../Zend/InfoCard/Cipher/Exception.php        |   38 -
 .../InfoCard/Cipher/Pki/Adapter/Abstract.php  |   88 -
 .../Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php  |  120 -
 .../Zend/InfoCard/Cipher/Pki/Interface.php    |   33 -
 .../InfoCard/Cipher/Pki/Rsa/Interface.php     |   50 -
 .../Cipher/Symmetric/Adapter/Abstract.php     |   38 -
 .../Cipher/Symmetric/Adapter/Aes128cbc.php    |   40 -
 .../Cipher/Symmetric/Adapter/Aes256cbc.php    |  111 -
 .../Cipher/Symmetric/Aes128cbc/Interface.php  |   38 -
 .../Cipher/Symmetric/Aes256cbc/Interface.php  |   33 -
 .../InfoCard/Cipher/Symmetric/Interface.php   |   32 -
 airtime_mvc/library/Zend/InfoCard/Claims.php  |  307 -
 .../library/Zend/InfoCard/Exception.php       |   43 -
 .../library/Zend/InfoCard/Xml/Assertion.php   |   88 -
 .../Zend/InfoCard/Xml/Assertion/Interface.php |   69 -
 .../Zend/InfoCard/Xml/Assertion/Saml.php      |  284 -
 .../library/Zend/InfoCard/Xml/Element.php     |  107 -
 .../Zend/InfoCard/Xml/Element/Interface.php   |   44 -
 .../Zend/InfoCard/Xml/EncryptedData.php       |   75 -
 .../InfoCard/Xml/EncryptedData/Abstract.php   |   92 -
 .../InfoCard/Xml/EncryptedData/XmlEnc.php     |   64 -
 .../Zend/InfoCard/Xml/EncryptedKey.php        |  174 -
 .../library/Zend/InfoCard/Xml/Exception.php   |   37 -
 .../library/Zend/InfoCard/Xml/KeyInfo.php     |   90 -
 .../Zend/InfoCard/Xml/KeyInfo/Abstract.php    |   37 -
 .../Zend/InfoCard/Xml/KeyInfo/Default.php     |   64 -
 .../Zend/InfoCard/Xml/KeyInfo/Interface.php   |   38 -
 .../Zend/InfoCard/Xml/KeyInfo/XmlDSig.php     |   76 -
 .../library/Zend/InfoCard/Xml/Security.php    |  305 -
 .../Zend/InfoCard/Xml/Security/Exception.php  |   37 -
 .../Zend/InfoCard/Xml/Security/Transform.php  |  116 -
 .../Security/Transform/EnvelopedSignature.php |   60 -
 .../Xml/Security/Transform/Exception.php      |   37 -
 .../Xml/Security/Transform/Interface.php      |   43 -
 .../Xml/Security/Transform/XmlExcC14N.php     |   59 -
 .../InfoCard/Xml/SecurityTokenReference.php   |  173 -
 airtime_mvc/library/Zend/Json.php             |  406 --
 airtime_mvc/library/Zend/Json/Decoder.php     |  578 --
 airtime_mvc/library/Zend/Json/Encoder.php     |  574 --
 airtime_mvc/library/Zend/Json/Exception.php   |   37 -
 airtime_mvc/library/Zend/Json/Expr.php        |   80 -
 airtime_mvc/library/Zend/Json/Server.php      |  537 --
 .../library/Zend/Json/Server/Cache.php        |  102 -
 .../library/Zend/Json/Server/Error.php        |  198 -
 .../library/Zend/Json/Server/Exception.php    |   36 -
 .../library/Zend/Json/Server/Request.php      |  289 -
 .../library/Zend/Json/Server/Request/Http.php |   66 -
 .../library/Zend/Json/Server/Response.php     |  250 -
 .../Zend/Json/Server/Response/Http.php        |   81 -
 airtime_mvc/library/Zend/Json/Server/Smd.php  |  480 --
 .../library/Zend/Json/Server/Smd/Service.php  |  473 --
 airtime_mvc/library/Zend/Layout.php           |  798 ---
 .../Controller/Action/Helper/Layout.php       |  186 -
 .../Zend/Layout/Controller/Plugin/Layout.php  |  156 -
 airtime_mvc/library/Zend/Layout/Exception.php |   35 -
 airtime_mvc/library/Zend/Ldap.php             | 1564 -----
 airtime_mvc/library/Zend/Ldap/Attribute.php   |  423 --
 airtime_mvc/library/Zend/Ldap/Collection.php  |  239 -
 .../Zend/Ldap/Collection/Iterator/Default.php |  310 -
 airtime_mvc/library/Zend/Ldap/Converter.php   |   71 -
 airtime_mvc/library/Zend/Ldap/Dn.php          |  794 ---
 airtime_mvc/library/Zend/Ldap/Exception.php   |  173 -
 airtime_mvc/library/Zend/Ldap/Filter.php      |  265 -
 .../library/Zend/Ldap/Filter/Abstract.php     |  157 -
 airtime_mvc/library/Zend/Ldap/Filter/And.php  |   48 -
 .../library/Zend/Ldap/Filter/Exception.php    |   37 -
 .../library/Zend/Ldap/Filter/Logical.php      |  107 -
 airtime_mvc/library/Zend/Ldap/Filter/Mask.php |   66 -
 airtime_mvc/library/Zend/Ldap/Filter/Not.php  |   75 -
 airtime_mvc/library/Zend/Ldap/Filter/Or.php   |   48 -
 .../library/Zend/Ldap/Filter/String.php       |   65 -
 .../library/Zend/Ldap/Ldif/Encoder.php        |  304 -
 airtime_mvc/library/Zend/Ldap/Node.php        | 1101 ---
 .../library/Zend/Ldap/Node/Abstract.php       |  485 --
 .../Zend/Ldap/Node/ChildrenIterator.php       |  209 -
 .../library/Zend/Ldap/Node/Collection.php     |   67 -
 .../library/Zend/Ldap/Node/RootDse.php        |  158 -
 .../Ldap/Node/RootDse/ActiveDirectory.php     |  247 -
 .../Zend/Ldap/Node/RootDse/OpenLdap.php       |  102 -
 .../Zend/Ldap/Node/RootDse/eDirectory.php     |  160 -
 airtime_mvc/library/Zend/Ldap/Node/Schema.php |  120 -
 .../Zend/Ldap/Node/Schema/ActiveDirectory.php |  103 -
 .../Schema/AttributeType/ActiveDirectory.php  |  104 -
 .../Node/Schema/AttributeType/Interface.php   |   75 -
 .../Node/Schema/AttributeType/OpenLdap.php    |  129 -
 .../library/Zend/Ldap/Node/Schema/Item.php    |  163 -
 .../Schema/ObjectClass/ActiveDirectory.php    |  115 -
 .../Node/Schema/ObjectClass/Interface.php     |   83 -
 .../Ldap/Node/Schema/ObjectClass/OpenLdap.php |  175 -
 .../Zend/Ldap/Node/Schema/OpenLdap.php        |  502 --
 airtime_mvc/library/Zend/Loader.php           |  321 -
 .../library/Zend/Loader/Autoloader.php        |  584 --
 .../Zend/Loader/Autoloader/Interface.php      |   34 -
 .../Zend/Loader/Autoloader/Resource.php       |  460 --
 airtime_mvc/library/Zend/Loader/Exception.php |   35 -
 .../library/Zend/Loader/PluginLoader.php      |  484 --
 .../Zend/Loader/PluginLoader/Exception.php    |   39 -
 .../Zend/Loader/PluginLoader/Interface.php    |   75 -
 airtime_mvc/library/Zend/Locale.php           | 1016 ---
 airtime_mvc/library/Zend/Locale/Data.php      | 1476 ----
 .../library/Zend/Locale/Data/Translation.php  |  285 -
 airtime_mvc/library/Zend/Locale/Data/aa.xml   |  220 -
 .../library/Zend/Locale/Data/aa_DJ.xml        |   25 -
 .../library/Zend/Locale/Data/aa_ER.xml        |   10 -
 .../library/Zend/Locale/Data/aa_ER_SAAHO.xml  |   38 -
 .../library/Zend/Locale/Data/aa_ET.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/af.xml   |  821 ---
 .../library/Zend/Locale/Data/af_NA.xml        |   74 -
 .../library/Zend/Locale/Data/af_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ak.xml   |  189 -
 .../library/Zend/Locale/Data/ak_GH.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/am.xml   | 1409 ----
 .../library/Zend/Locale/Data/am_ET.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ar.xml   | 3118 ---------
 .../library/Zend/Locale/Data/ar_AE.xml        |   14 -
 .../library/Zend/Locale/Data/ar_BH.xml        |   14 -
 .../library/Zend/Locale/Data/ar_DZ.xml        |   43 -
 .../library/Zend/Locale/Data/ar_EG.xml        |    9 -
 .../library/Zend/Locale/Data/ar_IQ.xml        |   14 -
 .../library/Zend/Locale/Data/ar_JO.xml        |   65 -
 .../library/Zend/Locale/Data/ar_KW.xml        |   14 -
 .../library/Zend/Locale/Data/ar_LB.xml        |   66 -
 .../library/Zend/Locale/Data/ar_LY.xml        |   14 -
 .../library/Zend/Locale/Data/ar_MA.xml        |   46 -
 .../library/Zend/Locale/Data/ar_OM.xml        |   14 -
 .../library/Zend/Locale/Data/ar_QA.xml        |   49 -
 .../library/Zend/Locale/Data/ar_SA.xml        |   49 -
 .../library/Zend/Locale/Data/ar_SD.xml        |   14 -
 .../library/Zend/Locale/Data/ar_SY.xml        |   81 -
 .../library/Zend/Locale/Data/ar_TN.xml        |   74 -
 .../library/Zend/Locale/Data/ar_YE.xml        |   49 -
 airtime_mvc/library/Zend/Locale/Data/as.xml   |  274 -
 .../library/Zend/Locale/Data/as_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/az.xml   | 2715 --------
 .../library/Zend/Locale/Data/az_AZ.xml        |   10 -
 .../library/Zend/Locale/Data/az_Cyrl.xml      |   84 -
 .../library/Zend/Locale/Data/az_Cyrl_AZ.xml   |   10 -
 .../library/Zend/Locale/Data/az_Latn.xml      |    9 -
 .../library/Zend/Locale/Data/az_Latn_AZ.xml   |   10 -
 airtime_mvc/library/Zend/Locale/Data/be.xml   | 1090 ---
 .../library/Zend/Locale/Data/be_BY.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/bg.xml   | 3960 -----------
 .../library/Zend/Locale/Data/bg_BG.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/bn.xml   | 2834 --------
 .../library/Zend/Locale/Data/bn_BD.xml        |    9 -
 .../library/Zend/Locale/Data/bn_IN.xml        |   35 -
 airtime_mvc/library/Zend/Locale/Data/bo.xml   |  440 --
 .../library/Zend/Locale/Data/bo_CN.xml        |    9 -
 .../library/Zend/Locale/Data/bo_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/bs.xml   |  329 -
 .../library/Zend/Locale/Data/bs_BA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/byn.xml  |  501 --
 .../library/Zend/Locale/Data/byn_ER.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ca.xml   | 3252 ---------
 .../library/Zend/Locale/Data/ca_ES.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/cch.xml  |  188 -
 .../library/Zend/Locale/Data/cch_NG.xml       |    9 -
 .../library/Zend/Locale/Data/characters.xml   |  489 --
 airtime_mvc/library/Zend/Locale/Data/cop.xml  |  197 -
 airtime_mvc/library/Zend/Locale/Data/cs.xml   | 2439 -------
 .../library/Zend/Locale/Data/cs_CZ.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/cy.xml   |  782 ---
 .../library/Zend/Locale/Data/cy_GB.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/da.xml   | 3129 ---------
 .../library/Zend/Locale/Data/da_DK.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/de.xml   | 2948 --------
 .../library/Zend/Locale/Data/de_AT.xml        |   69 -
 .../library/Zend/Locale/Data/de_BE.xml        |  114 -
 .../library/Zend/Locale/Data/de_CH.xml        |   64 -
 .../library/Zend/Locale/Data/de_DE.xml        |    9 -
 .../library/Zend/Locale/Data/de_LI.xml        |   22 -
 .../library/Zend/Locale/Data/de_LU.xml        |   18 -
 airtime_mvc/library/Zend/Locale/Data/dv.xml   |  225 -
 .../library/Zend/Locale/Data/dv_MV.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/dz.xml   |  406 --
 .../library/Zend/Locale/Data/dz_BT.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ee.xml   |  192 -
 .../library/Zend/Locale/Data/ee_GH.xml        |    9 -
 .../library/Zend/Locale/Data/ee_TG.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/el.xml   | 4123 ------------
 .../library/Zend/Locale/Data/el_CY.xml        |   19 -
 .../library/Zend/Locale/Data/el_GR.xml        |    9 -
 .../library/Zend/Locale/Data/el_POLYTON.xml   |  541 --
 airtime_mvc/library/Zend/Locale/Data/en.xml   | 4107 ------------
 .../library/Zend/Locale/Data/en_AS.xml        |    9 -
 .../library/Zend/Locale/Data/en_AU.xml        |  160 -
 .../library/Zend/Locale/Data/en_BE.xml        |  158 -
 .../library/Zend/Locale/Data/en_BW.xml        |  130 -
 .../library/Zend/Locale/Data/en_BZ.xml        |  160 -
 .../library/Zend/Locale/Data/en_CA.xml        |  126 -
 .../library/Zend/Locale/Data/en_Dsrt.xml      | 1024 ---
 .../library/Zend/Locale/Data/en_Dsrt_US.xml   |   10 -
 .../library/Zend/Locale/Data/en_GB.xml        |  169 -
 .../library/Zend/Locale/Data/en_GU.xml        |    9 -
 .../library/Zend/Locale/Data/en_HK.xml        |   54 -
 .../library/Zend/Locale/Data/en_IE.xml        |  149 -
 .../library/Zend/Locale/Data/en_IN.xml        |  145 -
 .../library/Zend/Locale/Data/en_JM.xml        |   26 -
 .../library/Zend/Locale/Data/en_MH.xml        |    9 -
 .../library/Zend/Locale/Data/en_MP.xml        |    9 -
 .../library/Zend/Locale/Data/en_MT.xml        |  154 -
 .../library/Zend/Locale/Data/en_NA.xml        |   26 -
 .../library/Zend/Locale/Data/en_NZ.xml        |  157 -
 .../library/Zend/Locale/Data/en_PH.xml        |   16 -
 .../library/Zend/Locale/Data/en_PK.xml        |  153 -
 .../library/Zend/Locale/Data/en_SG.xml        |   47 -
 .../library/Zend/Locale/Data/en_Shaw.xml      |  185 -
 .../library/Zend/Locale/Data/en_TT.xml        |   26 -
 .../library/Zend/Locale/Data/en_UM.xml        |    9 -
 .../library/Zend/Locale/Data/en_US.xml        |    9 -
 .../library/Zend/Locale/Data/en_US_POSIX.xml  |   44 -
 .../library/Zend/Locale/Data/en_VI.xml        |    9 -
 .../library/Zend/Locale/Data/en_ZA.xml        |  152 -
 .../library/Zend/Locale/Data/en_ZW.xml        |  144 -
 airtime_mvc/library/Zend/Locale/Data/eo.xml   |  632 --
 airtime_mvc/library/Zend/Locale/Data/es.xml   | 3714 ----------
 .../library/Zend/Locale/Data/es_AR.xml        |  129 -
 .../library/Zend/Locale/Data/es_BO.xml        |    9 -
 .../library/Zend/Locale/Data/es_CL.xml        |  159 -
 .../library/Zend/Locale/Data/es_CO.xml        |  127 -
 .../library/Zend/Locale/Data/es_CR.xml        |    9 -
 .../library/Zend/Locale/Data/es_DO.xml        |   15 -
 .../library/Zend/Locale/Data/es_EC.xml        |  122 -
 .../library/Zend/Locale/Data/es_ES.xml        |    9 -
 .../library/Zend/Locale/Data/es_GT.xml        |  114 -
 .../library/Zend/Locale/Data/es_HN.xml        |  114 -
 .../library/Zend/Locale/Data/es_MX.xml        |   20 -
 .../library/Zend/Locale/Data/es_NI.xml        |   15 -
 .../library/Zend/Locale/Data/es_PA.xml        |  109 -
 .../library/Zend/Locale/Data/es_PE.xml        |  111 -
 .../library/Zend/Locale/Data/es_PR.xml        |  114 -
 .../library/Zend/Locale/Data/es_PY.xml        |   18 -
 .../library/Zend/Locale/Data/es_SV.xml        |   15 -
 .../library/Zend/Locale/Data/es_US.xml        |  147 -
 .../library/Zend/Locale/Data/es_UY.xml        |   23 -
 .../library/Zend/Locale/Data/es_VE.xml        |   18 -
 airtime_mvc/library/Zend/Locale/Data/et.xml   | 1983 ------
 .../library/Zend/Locale/Data/et_EE.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/eu.xml   | 1003 ---
 .../library/Zend/Locale/Data/eu_ES.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/fa.xml   | 3309 ---------
 .../library/Zend/Locale/Data/fa_AF.xml        |  304 -
 .../library/Zend/Locale/Data/fa_IR.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/fi.xml   | 3828 -----------
 .../library/Zend/Locale/Data/fi_FI.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/fil.xml  | 1009 ---
 .../library/Zend/Locale/Data/fil_PH.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/fo.xml   |  794 ---
 .../library/Zend/Locale/Data/fo_FO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/fr.xml   | 5457 ---------------
 .../library/Zend/Locale/Data/fr_BE.xml        |  103 -
 .../library/Zend/Locale/Data/fr_CA.xml        |  151 -
 .../library/Zend/Locale/Data/fr_CH.xml        |  124 -
 .../library/Zend/Locale/Data/fr_FR.xml        |    9 -
 .../library/Zend/Locale/Data/fr_LU.xml        |   22 -
 .../library/Zend/Locale/Data/fr_MC.xml        |    9 -
 .../library/Zend/Locale/Data/fr_SN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/fur.xml  | 1221 ----
 .../library/Zend/Locale/Data/fur_IT.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ga.xml   | 1501 -----
 .../library/Zend/Locale/Data/ga_IE.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/gaa.xml  |  193 -
 .../library/Zend/Locale/Data/gaa_GH.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/gez.xml  |  503 --
 .../library/Zend/Locale/Data/gez_ER.xml       |    9 -
 .../library/Zend/Locale/Data/gez_ET.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/gl.xml   | 1361 ----
 .../library/Zend/Locale/Data/gl_ES.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/gsw.xml  | 2918 --------
 .../library/Zend/Locale/Data/gsw_CH.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/gu.xml   | 1160 ----
 .../library/Zend/Locale/Data/gu_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/gv.xml   |  200 -
 .../library/Zend/Locale/Data/gv_GB.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ha.xml   |  370 -
 .../library/Zend/Locale/Data/ha_Arab.xml      |   94 -
 .../library/Zend/Locale/Data/ha_Arab_NG.xml   |   10 -
 .../library/Zend/Locale/Data/ha_Arab_SD.xml   |   10 -
 .../library/Zend/Locale/Data/ha_GH.xml        |   10 -
 .../library/Zend/Locale/Data/ha_Latn.xml      |    9 -
 .../library/Zend/Locale/Data/ha_Latn_GH.xml   |   10 -
 .../library/Zend/Locale/Data/ha_Latn_NE.xml   |   10 -
 .../library/Zend/Locale/Data/ha_Latn_NG.xml   |   10 -
 .../library/Zend/Locale/Data/ha_NE.xml        |   10 -
 .../library/Zend/Locale/Data/ha_NG.xml        |   10 -
 .../library/Zend/Locale/Data/ha_SD.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/haw.xml  |  218 -
 .../library/Zend/Locale/Data/haw_US.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/he.xml   | 2757 --------
 .../library/Zend/Locale/Data/he_IL.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/hi.xml   | 3343 ---------
 .../library/Zend/Locale/Data/hi_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/hr.xml   | 3703 ----------
 .../library/Zend/Locale/Data/hr_HR.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/hu.xml   | 3745 -----------
 .../library/Zend/Locale/Data/hu_HU.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/hy.xml   |  593 --
 .../library/Zend/Locale/Data/hy_AM.xml        |    9 -
 .../Zend/Locale/Data/hy_AM_REVISED.xml        |   39 -
 airtime_mvc/library/Zend/Locale/Data/ia.xml   |  552 --
 airtime_mvc/library/Zend/Locale/Data/id.xml   | 1334 ----
 .../library/Zend/Locale/Data/id_ID.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ig.xml   |  191 -
 .../library/Zend/Locale/Data/ig_NG.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ii.xml   |  254 -
 .../library/Zend/Locale/Data/ii_CN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/in.xml   |    9 -
 airtime_mvc/library/Zend/Locale/Data/is.xml   | 2179 ------
 .../library/Zend/Locale/Data/is_IS.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/it.xml   | 3002 ---------
 .../library/Zend/Locale/Data/it_CH.xml        |  116 -
 .../library/Zend/Locale/Data/it_IT.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/iu.xml   |  181 -
 airtime_mvc/library/Zend/Locale/Data/iw.xml   |    9 -
 airtime_mvc/library/Zend/Locale/Data/ja.xml   | 3798 -----------
 .../library/Zend/Locale/Data/ja_JP.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ka.xml   | 2157 ------
 .../library/Zend/Locale/Data/ka_GE.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/kaj.xml  |  188 -
 .../library/Zend/Locale/Data/kaj_NG.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/kam.xml  |  187 -
 .../library/Zend/Locale/Data/kam_KE.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/kcg.xml  |  188 -
 .../library/Zend/Locale/Data/kcg_NG.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/kfo.xml  |  188 -
 .../library/Zend/Locale/Data/kfo_CI.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/kk.xml   |  388 --
 .../library/Zend/Locale/Data/kk_Cyrl.xml      |    9 -
 .../library/Zend/Locale/Data/kk_Cyrl_KZ.xml   |   10 -
 .../library/Zend/Locale/Data/kk_KZ.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/kl.xml   |  207 -
 .../library/Zend/Locale/Data/kl_GL.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/km.xml   |  667 --
 .../library/Zend/Locale/Data/km_KH.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/kn.xml   | 1157 ----
 .../library/Zend/Locale/Data/kn_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ko.xml   | 3848 -----------
 .../library/Zend/Locale/Data/ko_KR.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/kok.xml  |  363 -
 .../library/Zend/Locale/Data/kok_IN.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/kpe.xml  |  183 -
 .../library/Zend/Locale/Data/kpe_GN.xml       |   16 -
 .../library/Zend/Locale/Data/kpe_LR.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ku.xml   |  158 -
 .../library/Zend/Locale/Data/ku_Arab.xml      |    9 -
 .../library/Zend/Locale/Data/ku_Arab_IQ.xml   |   10 -
 .../library/Zend/Locale/Data/ku_Arab_IR.xml   |   10 -
 .../library/Zend/Locale/Data/ku_Arab_SY.xml   |   10 -
 .../library/Zend/Locale/Data/ku_IQ.xml        |   10 -
 .../library/Zend/Locale/Data/ku_IR.xml        |   10 -
 .../library/Zend/Locale/Data/ku_Latn.xml      |  189 -
 .../library/Zend/Locale/Data/ku_Latn_TR.xml   |   10 -
 .../library/Zend/Locale/Data/ku_SY.xml        |   10 -
 .../library/Zend/Locale/Data/ku_TR.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/kw.xml   |  200 -
 .../library/Zend/Locale/Data/kw_GB.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ky.xml   |  275 -
 .../library/Zend/Locale/Data/ky_KG.xml        |    9 -
 .../Zend/Locale/Data/likelySubtags.xml        |  462 --
 airtime_mvc/library/Zend/Locale/Data/ln.xml   |  485 --
 .../library/Zend/Locale/Data/ln_CD.xml        |    9 -
 .../library/Zend/Locale/Data/ln_CG.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/lo.xml   |  623 --
 .../library/Zend/Locale/Data/lo_LA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/lt.xml   | 3327 ---------
 .../library/Zend/Locale/Data/lt_LT.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/lv.xml   | 2986 ---------
 .../library/Zend/Locale/Data/lv_LV.xml        |    9 -
 .../library/Zend/Locale/Data/metazoneInfo.xml | 1403 ----
 airtime_mvc/library/Zend/Locale/Data/mk.xml   | 2321 -------
 .../library/Zend/Locale/Data/mk_MK.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ml.xml   | 4423 ------------
 .../library/Zend/Locale/Data/ml_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/mn.xml   |  315 -
 .../library/Zend/Locale/Data/mn_CN.xml        |   10 -
 .../library/Zend/Locale/Data/mn_Cyrl.xml      |    9 -
 .../library/Zend/Locale/Data/mn_Cyrl_MN.xml   |   10 -
 .../library/Zend/Locale/Data/mn_MN.xml        |   10 -
 .../library/Zend/Locale/Data/mn_Mong.xml      |   16 -
 .../library/Zend/Locale/Data/mn_Mong_CN.xml   |   10 -
 airtime_mvc/library/Zend/Locale/Data/mo.xml   |    9 -
 airtime_mvc/library/Zend/Locale/Data/mr.xml   | 1191 ----
 .../library/Zend/Locale/Data/mr_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ms.xml   |  557 --
 .../library/Zend/Locale/Data/ms_BN.xml        |  134 -
 .../library/Zend/Locale/Data/ms_MY.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/mt.xml   | 1140 ----
 .../library/Zend/Locale/Data/mt_MT.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/my.xml   | 1580 -----
 .../library/Zend/Locale/Data/my_MM.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/nb.xml   | 3081 ---------
 .../library/Zend/Locale/Data/nb_NO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/nds.xml  | 1148 ----
 .../library/Zend/Locale/Data/nds_DE.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ne.xml   | 1383 ----
 .../library/Zend/Locale/Data/ne_IN.xml        |    9 -
 .../library/Zend/Locale/Data/ne_NP.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/nl.xml   | 3797 -----------
 .../library/Zend/Locale/Data/nl_BE.xml        |   80 -
 .../library/Zend/Locale/Data/nl_NL.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/nn.xml   | 2824 --------
 .../library/Zend/Locale/Data/nn_NO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/no.xml   |    9 -
 airtime_mvc/library/Zend/Locale/Data/nr.xml   |  226 -
 .../library/Zend/Locale/Data/nr_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/nso.xml  |  228 -
 .../library/Zend/Locale/Data/nso_ZA.xml       |    9 -
 .../Zend/Locale/Data/numberingSystems.xml     |   41 -
 airtime_mvc/library/Zend/Locale/Data/ny.xml   |  188 -
 .../library/Zend/Locale/Data/ny_MW.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/oc.xml   |  279 -
 .../library/Zend/Locale/Data/oc_FR.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/om.xml   |  327 -
 .../library/Zend/Locale/Data/om_ET.xml        |    9 -
 .../library/Zend/Locale/Data/om_KE.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/or.xml   | 1141 ----
 .../library/Zend/Locale/Data/or_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/pa.xml   |  309 -
 .../library/Zend/Locale/Data/pa_Arab.xml      |  133 -
 .../library/Zend/Locale/Data/pa_Arab_PK.xml   |   10 -
 .../library/Zend/Locale/Data/pa_Guru.xml      |    9 -
 .../library/Zend/Locale/Data/pa_Guru_IN.xml   |   10 -
 .../library/Zend/Locale/Data/pa_IN.xml        |   10 -
 .../library/Zend/Locale/Data/pa_PK.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/pl.xml   | 3095 ---------
 .../library/Zend/Locale/Data/pl_PL.xml        |    9 -
 .../Zend/Locale/Data/postalCodeData.xml       |  165 -
 airtime_mvc/library/Zend/Locale/Data/ps.xml   |  416 --
 .../library/Zend/Locale/Data/ps_AF.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/pt.xml   | 4337 ------------
 .../library/Zend/Locale/Data/pt_BR.xml        |    9 -
 .../library/Zend/Locale/Data/pt_PT.xml        | 1865 ------
 airtime_mvc/library/Zend/Locale/Data/ro.xml   | 2478 -------
 .../library/Zend/Locale/Data/ro_MD.xml        |    9 -
 .../library/Zend/Locale/Data/ro_RO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/root.xml | 3178 ---------
 airtime_mvc/library/Zend/Locale/Data/ru.xml   | 3949 -----------
 .../library/Zend/Locale/Data/ru_RU.xml        |    9 -
 .../library/Zend/Locale/Data/ru_UA.xml        |  116 -
 airtime_mvc/library/Zend/Locale/Data/rw.xml   |  305 -
 .../library/Zend/Locale/Data/rw_RW.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sa.xml   |  150 -
 .../library/Zend/Locale/Data/sa_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/se.xml   |  740 --
 .../library/Zend/Locale/Data/se_FI.xml        |  246 -
 .../library/Zend/Locale/Data/se_NO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sh.xml   |    9 -
 .../library/Zend/Locale/Data/sh_BA.xml        |   10 -
 .../library/Zend/Locale/Data/sh_CS.xml        |   10 -
 .../library/Zend/Locale/Data/sh_YU.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/si.xml   |  241 -
 .../library/Zend/Locale/Data/si_LK.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sid.xml  |  248 -
 .../library/Zend/Locale/Data/sid_ET.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/sk.xml   | 1899 ------
 .../library/Zend/Locale/Data/sk_SK.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sl.xml   | 2543 -------
 .../library/Zend/Locale/Data/sl_SI.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/so.xml   |  559 --
 .../library/Zend/Locale/Data/so_DJ.xml        |    9 -
 .../library/Zend/Locale/Data/so_ET.xml        |    9 -
 .../library/Zend/Locale/Data/so_KE.xml        |    9 -
 .../library/Zend/Locale/Data/so_SO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sq.xml   |  656 --
 .../library/Zend/Locale/Data/sq_AL.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sr.xml   | 5948 -----------------
 .../library/Zend/Locale/Data/sr_BA.xml        |   10 -
 .../library/Zend/Locale/Data/sr_CS.xml        |   10 -
 .../library/Zend/Locale/Data/sr_Cyrl.xml      |    9 -
 .../library/Zend/Locale/Data/sr_Cyrl_BA.xml   |  103 -
 .../library/Zend/Locale/Data/sr_Cyrl_CS.xml   |   11 -
 .../library/Zend/Locale/Data/sr_Cyrl_ME.xml   |   10 -
 .../library/Zend/Locale/Data/sr_Cyrl_RS.xml   |   10 -
 .../library/Zend/Locale/Data/sr_Cyrl_YU.xml   |   11 -
 .../library/Zend/Locale/Data/sr_Latn.xml      | 5378 ---------------
 .../library/Zend/Locale/Data/sr_Latn_BA.xml   |   10 -
 .../library/Zend/Locale/Data/sr_Latn_CS.xml   |   11 -
 .../library/Zend/Locale/Data/sr_Latn_ME.xml   |   54 -
 .../library/Zend/Locale/Data/sr_Latn_RS.xml   |   10 -
 .../library/Zend/Locale/Data/sr_Latn_YU.xml   |   11 -
 .../library/Zend/Locale/Data/sr_ME.xml        |   10 -
 .../library/Zend/Locale/Data/sr_RS.xml        |   10 -
 .../library/Zend/Locale/Data/sr_YU.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/ss.xml   |  230 -
 .../library/Zend/Locale/Data/ss_SZ.xml        |   10 -
 .../library/Zend/Locale/Data/ss_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/st.xml   |  320 -
 .../library/Zend/Locale/Data/st_LS.xml        |   16 -
 .../library/Zend/Locale/Data/st_ZA.xml        |    9 -
 .../Zend/Locale/Data/supplementalData.xml     | 5359 ---------------
 airtime_mvc/library/Zend/Locale/Data/sv.xml   | 4722 -------------
 .../library/Zend/Locale/Data/sv_FI.xml        |   47 -
 .../library/Zend/Locale/Data/sv_SE.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/sw.xml   |  399 --
 .../library/Zend/Locale/Data/sw_KE.xml        |   18 -
 .../library/Zend/Locale/Data/sw_TZ.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/syr.xml  |  128 -
 .../library/Zend/Locale/Data/syr_SY.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ta.xml   | 1190 ----
 .../library/Zend/Locale/Data/ta_IN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/te.xml   | 1154 ----
 .../library/Zend/Locale/Data/te_IN.xml        |    9 -
 .../Zend/Locale/Data/telephoneCodeData.xml    |  746 ---
 airtime_mvc/library/Zend/Locale/Data/tg.xml   |  220 -
 .../library/Zend/Locale/Data/tg_Cyrl.xml      |    9 -
 .../library/Zend/Locale/Data/tg_Cyrl_TJ.xml   |   10 -
 .../library/Zend/Locale/Data/tg_TJ.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/th.xml   | 4437 ------------
 .../library/Zend/Locale/Data/th_TH.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ti.xml   |  325 -
 .../library/Zend/Locale/Data/ti_ER.xml        |  123 -
 .../library/Zend/Locale/Data/ti_ET.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/tig.xml  |  500 --
 .../library/Zend/Locale/Data/tig_ER.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/tl.xml   |    9 -
 airtime_mvc/library/Zend/Locale/Data/tn.xml   |  307 -
 .../library/Zend/Locale/Data/tn_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/to.xml   |  611 --
 .../library/Zend/Locale/Data/to_TO.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/tr.xml   | 3770 -----------
 .../library/Zend/Locale/Data/tr_TR.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/trv.xml  |  561 --
 .../library/Zend/Locale/Data/trv_TW.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/ts.xml   |  172 -
 .../library/Zend/Locale/Data/ts_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/tt.xml   |  104 -
 .../library/Zend/Locale/Data/tt_RU.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ug.xml   |   35 -
 .../library/Zend/Locale/Data/ug_Arab.xml      |    9 -
 .../library/Zend/Locale/Data/ug_Arab_CN.xml   |   10 -
 .../library/Zend/Locale/Data/ug_CN.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/uk.xml   | 3813 -----------
 .../library/Zend/Locale/Data/uk_UA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/ur.xml   | 1020 ---
 .../library/Zend/Locale/Data/ur_IN.xml        |   32 -
 .../library/Zend/Locale/Data/ur_PK.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/uz.xml   |  234 -
 .../library/Zend/Locale/Data/uz_AF.xml        |   10 -
 .../library/Zend/Locale/Data/uz_Arab.xml      |  166 -
 .../library/Zend/Locale/Data/uz_Arab_AF.xml   |   10 -
 .../library/Zend/Locale/Data/uz_Cyrl.xml      |    9 -
 .../library/Zend/Locale/Data/uz_Cyrl_UZ.xml   |   10 -
 .../library/Zend/Locale/Data/uz_Latn.xml      |  169 -
 .../library/Zend/Locale/Data/uz_Latn_UZ.xml   |   10 -
 .../library/Zend/Locale/Data/uz_UZ.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/ve.xml   |  193 -
 .../library/Zend/Locale/Data/ve_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/vi.xml   | 1055 ---
 .../library/Zend/Locale/Data/vi_VN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/wal.xml  |  348 -
 .../library/Zend/Locale/Data/wal_ET.xml       |    9 -
 airtime_mvc/library/Zend/Locale/Data/wo.xml   |   36 -
 .../library/Zend/Locale/Data/wo_Latn.xml      |    9 -
 .../library/Zend/Locale/Data/wo_Latn_SN.xml   |   10 -
 .../library/Zend/Locale/Data/wo_SN.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/xh.xml   |  260 -
 .../library/Zend/Locale/Data/xh_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/yo.xml   |  229 -
 .../library/Zend/Locale/Data/yo_NG.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Data/zh.xml   | 4248 ------------
 .../library/Zend/Locale/Data/zh_CN.xml        |   10 -
 .../library/Zend/Locale/Data/zh_HK.xml        |   10 -
 .../library/Zend/Locale/Data/zh_Hans.xml      |    9 -
 .../library/Zend/Locale/Data/zh_Hans_CN.xml   |   10 -
 .../library/Zend/Locale/Data/zh_Hans_HK.xml   |   17 -
 .../library/Zend/Locale/Data/zh_Hans_MO.xml   |   10 -
 .../library/Zend/Locale/Data/zh_Hans_SG.xml   |   87 -
 .../library/Zend/Locale/Data/zh_Hant.xml      | 3784 -----------
 .../library/Zend/Locale/Data/zh_Hant_HK.xml   |  190 -
 .../library/Zend/Locale/Data/zh_Hant_MO.xml   |  116 -
 .../library/Zend/Locale/Data/zh_Hant_TW.xml   |   10 -
 .../library/Zend/Locale/Data/zh_MO.xml        |   10 -
 .../library/Zend/Locale/Data/zh_SG.xml        |   10 -
 .../library/Zend/Locale/Data/zh_TW.xml        |   10 -
 airtime_mvc/library/Zend/Locale/Data/zu.xml   |  328 -
 .../library/Zend/Locale/Data/zu_ZA.xml        |    9 -
 airtime_mvc/library/Zend/Locale/Exception.php |   37 -
 airtime_mvc/library/Zend/Locale/Format.php    | 1241 ----
 airtime_mvc/library/Zend/Locale/Math.php      |  355 -
 .../library/Zend/Locale/Math/Exception.php    |   53 -
 .../library/Zend/Locale/Math/PhpMath.php      |  247 -
 airtime_mvc/library/Zend/Log.php              |  425 --
 airtime_mvc/library/Zend/Log/Exception.php    |   33 -
 .../library/Zend/Log/FactoryInterface.php     |   38 -
 .../library/Zend/Log/Filter/Abstract.php      |   60 -
 .../library/Zend/Log/Filter/Interface.php     |   40 -
 .../library/Zend/Log/Filter/Message.php       |   85 -
 .../library/Zend/Log/Filter/Priority.php      |  101 -
 .../library/Zend/Log/Filter/Suppress.php      |   77 -
 .../library/Zend/Log/Formatter/Firebug.php    |   50 -
 .../library/Zend/Log/Formatter/Interface.php  |   41 -
 .../library/Zend/Log/Formatter/Simple.php     |   85 -
 .../library/Zend/Log/Formatter/Xml.php        |  121 -
 .../library/Zend/Log/Writer/Abstract.php      |  129 -
 airtime_mvc/library/Zend/Log/Writer/Db.php    |  139 -
 .../library/Zend/Log/Writer/Firebug.php       |  200 -
 airtime_mvc/library/Zend/Log/Writer/Mail.php  |  307 -
 airtime_mvc/library/Zend/Log/Writer/Mock.php  |   78 -
 airtime_mvc/library/Zend/Log/Writer/Null.php  |   57 -
 .../library/Zend/Log/Writer/Stream.php        |  135 -
 .../library/Zend/Log/Writer/Syslog.php        |  187 -
 .../library/Zend/Log/Writer/ZendMonitor.php   |  111 -
 airtime_mvc/library/Zend/Mail.php             | 1261 ----
 airtime_mvc/library/Zend/Mail/Exception.php   |   37 -
 airtime_mvc/library/Zend/Mail/Message.php     |  112 -
 .../library/Zend/Mail/Message/File.php        |   96 -
 .../library/Zend/Mail/Message/Interface.php   |   55 -
 airtime_mvc/library/Zend/Mail/Part.php        |  520 --
 airtime_mvc/library/Zend/Mail/Part/File.php   |  198 -
 .../library/Zend/Mail/Part/Interface.php      |  136 -
 .../library/Zend/Mail/Protocol/Abstract.php   |  413 --
 .../library/Zend/Mail/Protocol/Exception.php  |   39 -
 .../library/Zend/Mail/Protocol/Imap.php       |  838 ---
 .../library/Zend/Mail/Protocol/Pop3.php       |  472 --
 .../library/Zend/Mail/Protocol/Smtp.php       |  443 --
 .../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php  |  108 -
 .../Zend/Mail/Protocol/Smtp/Auth/Login.php    |   98 -
 .../Zend/Mail/Protocol/Smtp/Auth/Plain.php    |   96 -
 airtime_mvc/library/Zend/Mail/Storage.php     |   39 -
 .../library/Zend/Mail/Storage/Abstract.php    |  366 -
 .../library/Zend/Mail/Storage/Exception.php   |   39 -
 .../library/Zend/Mail/Storage/Folder.php      |  236 -
 .../Zend/Mail/Storage/Folder/Interface.php    |   60 -
 .../Zend/Mail/Storage/Folder/Maildir.php      |  265 -
 .../library/Zend/Mail/Storage/Folder/Mbox.php |  264 -
 .../library/Zend/Mail/Storage/Imap.php        |  644 --
 .../library/Zend/Mail/Storage/Maildir.php     |  475 --
 .../library/Zend/Mail/Storage/Mbox.php        |  447 --
 .../library/Zend/Mail/Storage/Pop3.php        |  328 -
 .../Zend/Mail/Storage/Writable/Interface.php  |  108 -
 .../Zend/Mail/Storage/Writable/Maildir.php    | 1049 ---
 .../library/Zend/Mail/Transport/Abstract.php  |  350 -
 .../library/Zend/Mail/Transport/Exception.php |   39 -
 .../library/Zend/Mail/Transport/Sendmail.php  |  220 -
 .../library/Zend/Mail/Transport/Smtp.php      |  243 -
 airtime_mvc/library/Zend/Markup.php           |  134 -
 airtime_mvc/library/Zend/Markup/Exception.php |   38 -
 .../library/Zend/Markup/Parser/Bbcode.php     |  504 --
 .../library/Zend/Markup/Parser/Exception.php  |   40 -
 .../Zend/Markup/Parser/ParserInterface.php    |   67 -
 .../library/Zend/Markup/Parser/Textile.php    |  570 --
 .../Zend/Markup/Renderer/Exception.php        |   40 -
 .../library/Zend/Markup/Renderer/Html.php     |  521 --
 .../Zend/Markup/Renderer/Html/Code.php        |   53 -
 .../Markup/Renderer/Html/HtmlAbstract.php     |   69 -
 .../library/Zend/Markup/Renderer/Html/Img.php |   84 -
 .../Zend/Markup/Renderer/Html/List.php        |  103 -
 .../library/Zend/Markup/Renderer/Html/Url.php |   77 -
 .../Zend/Markup/Renderer/RendererAbstract.php |  707 --
 .../Renderer/TokenConverterInterface.php      |   44 -
 airtime_mvc/library/Zend/Markup/Token.php     |  306 -
 airtime_mvc/library/Zend/Markup/TokenList.php |  124 -
 airtime_mvc/library/Zend/Measure/Abstract.php |  418 --
 .../library/Zend/Measure/Acceleration.php     |   91 -
 airtime_mvc/library/Zend/Measure/Angle.php    |   78 -
 airtime_mvc/library/Zend/Measure/Area.php     |  310 -
 airtime_mvc/library/Zend/Measure/Binary.php   |  122 -
 .../library/Zend/Measure/Capacitance.php      |   98 -
 .../library/Zend/Measure/Cooking/Volume.php   |  190 -
 .../library/Zend/Measure/Cooking/Weight.php   |   70 -
 airtime_mvc/library/Zend/Measure/Current.php  |  102 -
 airtime_mvc/library/Zend/Measure/Density.php  |  206 -
 airtime_mvc/library/Zend/Measure/Energy.php   |  252 -
 .../library/Zend/Measure/Exception.php        |   37 -
 .../library/Zend/Measure/Flow/Mass.php        |  122 -
 .../library/Zend/Measure/Flow/Mole.php        |   90 -
 .../library/Zend/Measure/Flow/Volume.php      |  402 --
 airtime_mvc/library/Zend/Measure/Force.php    |  126 -
 .../library/Zend/Measure/Frequency.php        |   86 -
 .../library/Zend/Measure/Illumination.php     |   72 -
 airtime_mvc/library/Zend/Measure/Length.php   |  674 --
 .../library/Zend/Measure/Lightness.php        |   80 -
 airtime_mvc/library/Zend/Measure/Number.php   |  420 --
 airtime_mvc/library/Zend/Measure/Power.php    |  188 -
 airtime_mvc/library/Zend/Measure/Pressure.php |  250 -
 airtime_mvc/library/Zend/Measure/Speed.php    |  190 -
 .../library/Zend/Measure/Temperature.php      |   60 -
 airtime_mvc/library/Zend/Measure/Time.php     |  117 -
 airtime_mvc/library/Zend/Measure/Torque.php   |   82 -
 .../Zend/Measure/Viscosity/Dynamic.php        |  120 -
 .../Zend/Measure/Viscosity/Kinematic.php      |  106 -
 airtime_mvc/library/Zend/Measure/Volume.php   |  213 -
 airtime_mvc/library/Zend/Measure/Weight.php   |  480 --
 airtime_mvc/library/Zend/Memory.php           |   82 -
 .../library/Zend/Memory/AccessController.php  |  149 -
 airtime_mvc/library/Zend/Memory/Container.php |   35 -
 .../Zend/Memory/Container/Interface.php       |   66 -
 .../library/Zend/Memory/Container/Locked.php  |  113 -
 .../library/Zend/Memory/Container/Movable.php |  297 -
 airtime_mvc/library/Zend/Memory/Exception.php |   35 -
 airtime_mvc/library/Zend/Memory/Manager.php   |  463 --
 airtime_mvc/library/Zend/Memory/Value.php     |  177 -
 airtime_mvc/library/Zend/Mime.php             |  365 -
 airtime_mvc/library/Zend/Mime/Decode.php      |  244 -
 airtime_mvc/library/Zend/Mime/Exception.php   |   37 -
 airtime_mvc/library/Zend/Mime/Message.php     |  286 -
 airtime_mvc/library/Zend/Mime/Part.php        |  217 -
 airtime_mvc/library/Zend/Navigation.php       |   54 -
 .../library/Zend/Navigation/Container.php     |  503 --
 .../library/Zend/Navigation/Exception.php     |   38 -
 airtime_mvc/library/Zend/Navigation/Page.php  | 1119 ----
 .../library/Zend/Navigation/Page/Mvc.php      |  440 --
 .../library/Zend/Navigation/Page/Uri.php      |  100 -
 airtime_mvc/library/Zend/Oauth.php            |   89 -
 airtime_mvc/library/Zend/Oauth/Client.php     |  210 -
 airtime_mvc/library/Zend/Oauth/Config.php     |  658 --
 .../Zend/Oauth/Config/ConfigInterface.php     |   75 -
 airtime_mvc/library/Zend/Oauth/Consumer.php   |  272 -
 airtime_mvc/library/Zend/Oauth/Exception.php  |   32 -
 airtime_mvc/library/Zend/Oauth/Http.php       |  266 -
 .../library/Zend/Oauth/Http/AccessToken.php   |  189 -
 .../library/Zend/Oauth/Http/RequestToken.php  |  162 -
 .../Zend/Oauth/Http/UserAuthorization.php     |   78 -
 .../library/Zend/Oauth/Http/Utility.php       |  217 -
 .../library/Zend/Oauth/Signature/Hmac.php     |   54 -
 .../Zend/Oauth/Signature/Plaintext.php        |   49 -
 .../library/Zend/Oauth/Signature/Rsa.php      |   65 -
 .../Oauth/Signature/SignatureAbstract.php     |  183 -
 airtime_mvc/library/Zend/Oauth/Token.php      |  285 -
 .../library/Zend/Oauth/Token/Access.php       |   99 -
 .../Zend/Oauth/Token/AuthorizedRequest.php    |  102 -
 .../library/Zend/Oauth/Token/Request.php      |   50 -
 airtime_mvc/library/Zend/OpenId.php           |  753 ---
 airtime_mvc/library/Zend/OpenId/Consumer.php  |  958 ---
 .../library/Zend/OpenId/Consumer/Storage.php  |  132 -
 .../Zend/OpenId/Consumer/Storage/File.php     |  507 --
 airtime_mvc/library/Zend/OpenId/Exception.php |   58 -
 airtime_mvc/library/Zend/OpenId/Extension.php |  137 -
 .../library/Zend/OpenId/Extension/Sreg.php    |  300 -
 airtime_mvc/library/Zend/OpenId/Provider.php  |  781 ---
 .../library/Zend/OpenId/Provider/Storage.php  |  106 -
 .../Zend/OpenId/Provider/Storage/File.php     |  442 --
 .../library/Zend/OpenId/Provider/User.php     |   57 -
 .../Zend/OpenId/Provider/User/Session.php     |  104 -
 airtime_mvc/library/Zend/Paginator.php        | 1113 ---
 .../library/Zend/Paginator/Adapter/Array.php  |   81 -
 .../Zend/Paginator/Adapter/DbSelect.php       |  262 -
 .../Zend/Paginator/Adapter/DbTableSelect.php  |   48 -
 .../Zend/Paginator/Adapter/Interface.php      |   47 -
 .../Zend/Paginator/Adapter/Iterator.php       |  102 -
 .../library/Zend/Paginator/Adapter/Null.php   |   80 -
 .../Zend/Paginator/AdapterAggregate.php       |   40 -
 .../library/Zend/Paginator/Exception.php      |   35 -
 .../Zend/Paginator/ScrollingStyle/All.php     |   50 -
 .../Zend/Paginator/ScrollingStyle/Elastic.php |   63 -
 .../Paginator/ScrollingStyle/Interface.php    |   38 -
 .../Zend/Paginator/ScrollingStyle/Jumping.php |   63 -
 .../Zend/Paginator/ScrollingStyle/Sliding.php |   78 -
 .../Paginator/SerializableLimitIterator.php   |   83 -
 airtime_mvc/library/Zend/Pdf.php              | 1404 ----
 airtime_mvc/library/Zend/Pdf/Action.php       |  404 --
 airtime_mvc/library/Zend/Pdf/Action/GoTo.php  |  116 -
 .../library/Zend/Pdf/Action/GoTo3DView.php    |   39 -
 airtime_mvc/library/Zend/Pdf/Action/GoToE.php |   38 -
 airtime_mvc/library/Zend/Pdf/Action/GoToR.php |   38 -
 airtime_mvc/library/Zend/Pdf/Action/Hide.php  |   39 -
 .../library/Zend/Pdf/Action/ImportData.php    |   39 -
 .../library/Zend/Pdf/Action/JavaScript.php    |   39 -
 .../library/Zend/Pdf/Action/Launch.php        |   38 -
 airtime_mvc/library/Zend/Pdf/Action/Movie.php |   38 -
 airtime_mvc/library/Zend/Pdf/Action/Named.php |   39 -
 .../library/Zend/Pdf/Action/Rendition.php     |   39 -
 .../library/Zend/Pdf/Action/ResetForm.php     |   39 -
 .../library/Zend/Pdf/Action/SetOCGState.php   |   39 -
 airtime_mvc/library/Zend/Pdf/Action/Sound.php |   39 -
 .../library/Zend/Pdf/Action/SubmitForm.php    |   39 -
 .../library/Zend/Pdf/Action/Thread.php        |   38 -
 airtime_mvc/library/Zend/Pdf/Action/Trans.php |   39 -
 airtime_mvc/library/Zend/Pdf/Action/URI.php   |  167 -
 .../library/Zend/Pdf/Action/Unknown.php       |   38 -
 airtime_mvc/library/Zend/Pdf/Annotation.php   |  230 -
 .../Zend/Pdf/Annotation/FileAttachment.php    |  101 -
 .../library/Zend/Pdf/Annotation/Link.php      |  162 -
 .../library/Zend/Pdf/Annotation/Markup.php    |  141 -
 .../library/Zend/Pdf/Annotation/Text.php      |   95 -
 airtime_mvc/library/Zend/Pdf/Cmap.php         |  336 -
 .../library/Zend/Pdf/Cmap/ByteEncoding.php    |  447 --
 .../Zend/Pdf/Cmap/ByteEncoding/Static.php     |   62 -
 .../library/Zend/Pdf/Cmap/SegmentToDelta.php  |  407 --
 .../library/Zend/Pdf/Cmap/TrimmedTable.php    |  231 -
 airtime_mvc/library/Zend/Pdf/Color.php        |   53 -
 airtime_mvc/library/Zend/Pdf/Color/Cmyk.php   |  126 -
 .../library/Zend/Pdf/Color/GrayScale.php      |   84 -
 airtime_mvc/library/Zend/Pdf/Color/Html.php   |  412 --
 airtime_mvc/library/Zend/Pdf/Color/Rgb.php    |  114 -
 airtime_mvc/library/Zend/Pdf/Destination.php  |  113 -
 .../library/Zend/Pdf/Destination/Explicit.php |  122 -
 .../library/Zend/Pdf/Destination/Fit.php      |   75 -
 .../Zend/Pdf/Destination/FitBoundingBox.php   |   75 -
 .../FitBoundingBoxHorizontally.php            |   98 -
 .../Destination/FitBoundingBoxVertically.php  |   98 -
 .../Zend/Pdf/Destination/FitHorizontally.php  |   98 -
 .../Zend/Pdf/Destination/FitRectangle.php     |  171 -
 .../Zend/Pdf/Destination/FitVertically.php    |   98 -
 .../library/Zend/Pdf/Destination/Named.php    |  101 -
 .../library/Zend/Pdf/Destination/Unknown.php  |   37 -
 .../library/Zend/Pdf/Destination/Zoom.php     |  177 -
 airtime_mvc/library/Zend/Pdf/Element.php      |  158 -
 .../library/Zend/Pdf/Element/Array.php        |  148 -
 .../library/Zend/Pdf/Element/Boolean.php      |   83 -
 .../library/Zend/Pdf/Element/Dictionary.php   |  189 -
 airtime_mvc/library/Zend/Pdf/Element/Name.php |  161 -
 airtime_mvc/library/Zend/Pdf/Element/Null.php |   75 -
 .../library/Zend/Pdf/Element/Numeric.php      |   95 -
 .../library/Zend/Pdf/Element/Object.php       |  250 -
 .../Zend/Pdf/Element/Object/Stream.php        |  422 --
 .../library/Zend/Pdf/Element/Reference.php    |  277 -
 .../Zend/Pdf/Element/Reference/Context.php    |   83 -
 .../Zend/Pdf/Element/Reference/Table.php      |  198 -
 .../library/Zend/Pdf/Element/Stream.php       |  117 -
 .../library/Zend/Pdf/Element/String.php       |  263 -
 .../Zend/Pdf/Element/String/Binary.php        |   98 -
 .../library/Zend/Pdf/ElementFactory.php       |  436 --
 .../Zend/Pdf/ElementFactory/Interface.php     |  151 -
 .../library/Zend/Pdf/ElementFactory/Proxy.php |  224 -
 airtime_mvc/library/Zend/Pdf/Exception.php    |  343 -
 airtime_mvc/library/Zend/Pdf/FileParser.php   |  485 --
 .../library/Zend/Pdf/FileParser/Font.php      |  217 -
 .../Zend/Pdf/FileParser/Font/OpenType.php     | 1126 ----
 .../Pdf/FileParser/Font/OpenType/TrueType.php |   90 -
 .../library/Zend/Pdf/FileParser/Image.php     |   63 -
 .../library/Zend/Pdf/FileParser/Image/Png.php |  329 -
 .../library/Zend/Pdf/FileParserDataSource.php |  204 -
 .../Zend/Pdf/FileParserDataSource/File.php    |  198 -
 .../Zend/Pdf/FileParserDataSource/String.php  |  128 -
 .../library/Zend/Pdf/Filter/Ascii85.php       |  181 -
 .../library/Zend/Pdf/Filter/AsciiHex.php      |  135 -
 .../library/Zend/Pdf/Filter/Compression.php   |  391 --
 .../Zend/Pdf/Filter/Compression/Flate.php     |  102 -
 .../Zend/Pdf/Filter/Compression/Lzw.php       |   95 -
 .../library/Zend/Pdf/Filter/Interface.php     |   50 -
 .../library/Zend/Pdf/Filter/RunLength.php     |  124 -
 airtime_mvc/library/Zend/Pdf/Font.php         |  732 --
 airtime_mvc/library/Zend/Pdf/Image.php        |  247 -
 airtime_mvc/library/Zend/Pdf/NameTree.php     |  154 -
 airtime_mvc/library/Zend/Pdf/Outline.php      |  373 --
 .../library/Zend/Pdf/Outline/Created.php      |  315 -
 .../library/Zend/Pdf/Outline/Loaded.php       |  462 --
 airtime_mvc/library/Zend/Pdf/Page.php         | 1781 -----
 airtime_mvc/library/Zend/Pdf/Parser.php       |  464 --
 .../RecursivelyIteratableObjectsContainer.php |   45 -
 airtime_mvc/library/Zend/Pdf/Resource.php     |  101 -
 .../library/Zend/Pdf/Resource/Font.php        |  530 --
 .../Zend/Pdf/Resource/Font/CidFont.php        |  490 --
 .../Pdf/Resource/Font/CidFont/TrueType.php    |   88 -
 .../Zend/Pdf/Resource/Font/Extracted.php      |  274 -
 .../Zend/Pdf/Resource/Font/FontDescriptor.php |  204 -
 .../library/Zend/Pdf/Resource/Font/Simple.php |  283 -
 .../Zend/Pdf/Resource/Font/Simple/Parsed.php  |  105 -
 .../Resource/Font/Simple/Parsed/TrueType.php  |   67 -
 .../Pdf/Resource/Font/Simple/Standard.php     |   82 -
 .../Resource/Font/Simple/Standard/Courier.php |  295 -
 .../Font/Simple/Standard/CourierBold.php      |  296 -
 .../Simple/Standard/CourierBoldOblique.php    |  297 -
 .../Font/Simple/Standard/CourierOblique.php   |  297 -
 .../Font/Simple/Standard/Helvetica.php        |  305 -
 .../Font/Simple/Standard/HelveticaBold.php    |  305 -
 .../Simple/Standard/HelveticaBoldOblique.php  |  308 -
 .../Font/Simple/Standard/HelveticaOblique.php |  307 -
 .../Resource/Font/Simple/Standard/Symbol.php  |  465 --
 .../Font/Simple/Standard/TimesBold.php        |  304 -
 .../Font/Simple/Standard/TimesBoldItalic.php  |  305 -
 .../Font/Simple/Standard/TimesItalic.php      |  305 -
 .../Font/Simple/Standard/TimesRoman.php       |  305 -
 .../Font/Simple/Standard/ZapfDingbats.php     |  491 --
 .../library/Zend/Pdf/Resource/Font/Type0.php  |  257 -
 .../library/Zend/Pdf/Resource/Image.php       |   77 -
 .../library/Zend/Pdf/Resource/Image/Jpeg.php  |  141 -
 .../library/Zend/Pdf/Resource/Image/Png.php   |  374 --
 .../library/Zend/Pdf/Resource/Image/Tiff.php  |  442 --
 .../Zend/Pdf/Resource/ImageFactory.php        |   71 -
 airtime_mvc/library/Zend/Pdf/StringParser.php |  724 --
 airtime_mvc/library/Zend/Pdf/Style.php        |  295 -
 airtime_mvc/library/Zend/Pdf/Target.php       |   76 -
 airtime_mvc/library/Zend/Pdf/Trailer.php      |  126 -
 .../library/Zend/Pdf/Trailer/Generator.php    |   77 -
 .../library/Zend/Pdf/Trailer/Keeper.php       |  143 -
 .../library/Zend/Pdf/UpdateInfoContainer.php  |  131 -
 airtime_mvc/library/Zend/ProgressBar.php      |  209 -
 .../library/Zend/ProgressBar/Adapter.php      |  113 -
 .../Zend/ProgressBar/Adapter/Console.php      |  534 --
 .../Zend/ProgressBar/Adapter/Exception.php    |   38 -
 .../Zend/ProgressBar/Adapter/JsPull.php       |  117 -
 .../Zend/ProgressBar/Adapter/JsPush.php       |  148 -
 .../library/Zend/ProgressBar/Exception.php    |   38 -
 airtime_mvc/library/Zend/Queue.php            |  569 --
 .../library/Zend/Queue/Adapter/Activemq.php   |  336 -
 .../Zend/Queue/Adapter/AdapterAbstract.php    |  191 -
 .../Zend/Queue/Adapter/AdapterInterface.php   |  174 -
 .../library/Zend/Queue/Adapter/Array.php      |  355 -
 airtime_mvc/library/Zend/Queue/Adapter/Db.php |  536 --
 .../library/Zend/Queue/Adapter/Db/Message.php |   51 -
 .../library/Zend/Queue/Adapter/Db/Queue.php   |   51 -
 .../library/Zend/Queue/Adapter/Db/mysql.sql   |   75 -
 .../Zend/Queue/Adapter/Db/postgresql.sql      |   49 -
 .../Zend/Queue/Adapter/Db/queue_sqlite.sql    |   40 -
 .../library/Zend/Queue/Adapter/Memcacheq.php  |  428 --
 .../library/Zend/Queue/Adapter/Null.php       |  174 -
 .../Zend/Queue/Adapter/PlatformJobQueue.php   |  343 -
 airtime_mvc/library/Zend/Queue/Exception.php  |   35 -
 airtime_mvc/library/Zend/Queue/Message.php    |  230 -
 .../library/Zend/Queue/Message/Iterator.php   |  285 -
 .../Zend/Queue/Message/PlatformJob.php        |  194 -
 .../library/Zend/Queue/Stomp/Client.php       |  173 -
 .../Zend/Queue/Stomp/Client/Connection.php    |  280 -
 .../Stomp/Client/ConnectionInterface.php      |  103 -
 .../library/Zend/Queue/Stomp/Frame.php        |  363 -
 .../Zend/Queue/Stomp/FrameInterface.php       |  154 -
 airtime_mvc/library/Zend/Reflection/Class.php |  247 -
 .../library/Zend/Reflection/Docblock.php      |  294 -
 .../library/Zend/Reflection/Docblock/Tag.php  |  145 -
 .../Zend/Reflection/Docblock/Tag/Param.php    |   93 -
 .../Zend/Reflection/Docblock/Tag/Return.php   |   72 -
 .../library/Zend/Reflection/Exception.php     |   36 -
 .../library/Zend/Reflection/Extension.php     |   85 -
 airtime_mvc/library/Zend/Reflection/File.php  |  412 --
 .../library/Zend/Reflection/Function.php      |  129 -
 .../library/Zend/Reflection/Method.php        |  168 -
 .../library/Zend/Reflection/Parameter.php     |  123 -
 .../library/Zend/Reflection/Property.php      |   68 -
 airtime_mvc/library/Zend/Registry.php         |  209 -
 airtime_mvc/library/Zend/Rest/Client.php      |  258 -
 .../library/Zend/Rest/Client/Exception.php    |   40 -
 .../library/Zend/Rest/Client/Result.php       |  236 -
 .../Zend/Rest/Client/Result/Exception.php     |   36 -
 airtime_mvc/library/Zend/Rest/Controller.php  |   70 -
 airtime_mvc/library/Zend/Rest/Exception.php   |   37 -
 airtime_mvc/library/Zend/Rest/Route.php       |  401 --
 airtime_mvc/library/Zend/Rest/Server.php      |  616 --
 .../library/Zend/Rest/Server/Exception.php    |   41 -
 airtime_mvc/library/Zend/Search/Exception.php |   37 -
 airtime_mvc/library/Zend/Search/Lucene.php    | 1577 -----
 .../Zend/Search/Lucene/Analysis/Analyzer.php  |  175 -
 .../Lucene/Analysis/Analyzer/Common.php       |   92 -
 .../Lucene/Analysis/Analyzer/Common/Text.php  |   96 -
 .../Analyzer/Common/Text/CaseInsensitive.php  |   47 -
 .../Analysis/Analyzer/Common/TextNum.php      |   95 -
 .../Common/TextNum/CaseInsensitive.php        |   47 -
 .../Lucene/Analysis/Analyzer/Common/Utf8.php  |  126 -
 .../Analyzer/Common/Utf8/CaseInsensitive.php  |   49 -
 .../Analysis/Analyzer/Common/Utf8Num.php      |  126 -
 .../Common/Utf8Num/CaseInsensitive.php        |   49 -
 .../Zend/Search/Lucene/Analysis/Token.php     |  154 -
 .../Search/Lucene/Analysis/TokenFilter.php    |   47 -
 .../Lucene/Analysis/TokenFilter/LowerCase.php |   58 -
 .../Analysis/TokenFilter/LowerCaseUtf8.php    |   70 -
 .../Analysis/TokenFilter/ShortWords.php       |   69 -
 .../Lucene/Analysis/TokenFilter/StopWords.php |  101 -
 .../library/Zend/Search/Lucene/Document.php   |  131 -
 .../Zend/Search/Lucene/Document/Docx.php      |  151 -
 .../Zend/Search/Lucene/Document/Exception.php |   37 -
 .../Zend/Search/Lucene/Document/Html.php      |  460 --
 .../Zend/Search/Lucene/Document/OpenXml.php   |  129 -
 .../Zend/Search/Lucene/Document/Pptx.php      |  200 -
 .../Zend/Search/Lucene/Document/Xlsx.php      |  263 -
 .../library/Zend/Search/Lucene/Exception.php  |   37 -
 .../library/Zend/Search/Lucene/FSM.php        |  443 --
 .../library/Zend/Search/Lucene/FSMAction.php  |   66 -
 .../library/Zend/Search/Lucene/Field.php      |  226 -
 .../Search/Lucene/Index/DictionaryLoader.php  |  268 -
 .../Zend/Search/Lucene/Index/DocsFilter.php   |   59 -
 .../Zend/Search/Lucene/Index/FieldInfo.php    |   50 -
 .../Zend/Search/Lucene/Index/SegmentInfo.php  | 2130 ------
 .../Search/Lucene/Index/SegmentMerger.php     |  271 -
 .../Search/Lucene/Index/SegmentWriter.php     |  634 --
 .../Index/SegmentWriter/DocumentWriter.php    |  230 -
 .../Index/SegmentWriter/StreamWriter.php      |   94 -
 .../library/Zend/Search/Lucene/Index/Term.php |  144 -
 .../Zend/Search/Lucene/Index/TermInfo.php     |   80 -
 .../Lucene/Index/TermsPriorityQueue.php       |   49 -
 .../Lucene/Index/TermsStream/Interface.php    |   66 -
 .../Zend/Search/Lucene/Index/Writer.php       |  841 ---
 .../library/Zend/Search/Lucene/Interface.php  |  417 --
 .../Zend/Search/Lucene/LockManager.php        |  236 -
 .../Zend/Search/Lucene/MultiSearcher.php      |  973 ---
 .../Zend/Search/Lucene/PriorityQueue.php      |  171 -
 .../library/Zend/Search/Lucene/Proxy.php      |  612 --
 .../Search/BooleanExpressionRecognizer.php    |  278 -
 .../Lucene/Search/Highlighter/Default.php     |   94 -
 .../Lucene/Search/Highlighter/Interface.php   |   53 -
 .../Zend/Search/Lucene/Search/Query.php       |  233 -
 .../Search/Lucene/Search/Query/Boolean.php    |  815 ---
 .../Zend/Search/Lucene/Search/Query/Empty.php |  138 -
 .../Zend/Search/Lucene/Search/Query/Fuzzy.php |  493 --
 .../Lucene/Search/Query/Insignificant.php     |  139 -
 .../Search/Lucene/Search/Query/MultiTerm.php  |  668 --
 .../Search/Lucene/Search/Query/Phrase.php     |  576 --
 .../Lucene/Search/Query/Preprocessing.php     |  127 -
 .../Search/Query/Preprocessing/Fuzzy.php      |  287 -
 .../Search/Query/Preprocessing/Phrase.php     |  270 -
 .../Search/Query/Preprocessing/Term.php       |  341 -
 .../Zend/Search/Lucene/Search/Query/Range.php |  377 --
 .../Zend/Search/Lucene/Search/Query/Term.php  |  228 -
 .../Search/Lucene/Search/Query/Wildcard.php   |  362 -
 .../Zend/Search/Lucene/Search/QueryEntry.php  |   67 -
 .../Lucene/Search/QueryEntry/Phrase.php       |  116 -
 .../Lucene/Search/QueryEntry/Subquery.php     |   77 -
 .../Search/Lucene/Search/QueryEntry/Term.php  |  130 -
 .../Zend/Search/Lucene/Search/QueryHit.php    |  110 -
 .../Zend/Search/Lucene/Search/QueryLexer.php  |  510 --
 .../Zend/Search/Lucene/Search/QueryParser.php |  635 --
 .../Lucene/Search/QueryParserContext.php      |  401 --
 .../Lucene/Search/QueryParserException.php    |   41 -
 .../Zend/Search/Lucene/Search/QueryToken.php  |  225 -
 .../Zend/Search/Lucene/Search/Similarity.php  |  551 --
 .../Lucene/Search/Similarity/Default.php      |  110 -
 .../Zend/Search/Lucene/Search/Weight.php      |   85 -
 .../Search/Lucene/Search/Weight/Boolean.php   |  137 -
 .../Search/Lucene/Search/Weight/Empty.php     |   57 -
 .../Search/Lucene/Search/Weight/MultiTerm.php |  139 -
 .../Search/Lucene/Search/Weight/Phrase.php    |  108 -
 .../Zend/Search/Lucene/Search/Weight/Term.php |  125 -
 .../Zend/Search/Lucene/Storage/Directory.php  |  136 -
 .../Lucene/Storage/Directory/Filesystem.php   |  362 -
 .../Zend/Search/Lucene/Storage/File.php       |  473 --
 .../Search/Lucene/Storage/File/Filesystem.php |  220 -
 .../Search/Lucene/Storage/File/Memory.php     |  601 --
 .../Lucene/TermStreamsPriorityQueue.php       |  176 -
 airtime_mvc/library/Zend/Serializer.php       |  188 -
 .../Serializer/Adapter/AdapterAbstract.php    |  112 -
 .../Serializer/Adapter/AdapterInterface.php   |   92 -
 .../library/Zend/Serializer/Adapter/Amf0.php  |   88 -
 .../library/Zend/Serializer/Adapter/Amf3.php  |   87 -
 .../Zend/Serializer/Adapter/Igbinary.php      |   98 -
 .../library/Zend/Serializer/Adapter/Json.php  |   93 -
 .../Zend/Serializer/Adapter/PhpCode.php       |   67 -
 .../Zend/Serializer/Adapter/PhpSerialize.php  |   94 -
 .../Zend/Serializer/Adapter/PythonPickle.php  | 1494 -----
 .../library/Zend/Serializer/Adapter/Wddx.php  |  118 -
 .../library/Zend/Serializer/Exception.php     |   33 -
 airtime_mvc/library/Zend/Server/Abstract.php  |  242 -
 airtime_mvc/library/Zend/Server/Cache.php     |  147 -
 .../library/Zend/Server/Definition.php        |  267 -
 airtime_mvc/library/Zend/Server/Exception.php |   35 -
 airtime_mvc/library/Zend/Server/Interface.php |  118 -
 .../library/Zend/Server/Method/Callback.php   |  205 -
 .../library/Zend/Server/Method/Definition.php |  293 -
 .../library/Zend/Server/Method/Parameter.php  |  214 -
 .../library/Zend/Server/Method/Prototype.php  |  208 -
 .../library/Zend/Server/Reflection.php        |  111 -
 .../library/Zend/Server/Reflection/Class.php  |  198 -
 .../Zend/Server/Reflection/Exception.php      |   38 -
 .../Zend/Server/Reflection/Function.php       |   39 -
 .../Server/Reflection/Function/Abstract.php   |  502 --
 .../library/Zend/Server/Reflection/Method.php |  110 -
 .../library/Zend/Server/Reflection/Node.php   |  201 -
 .../Zend/Server/Reflection/Parameter.php      |  161 -
 .../Zend/Server/Reflection/Prototype.php      |  103 -
 .../Zend/Server/Reflection/ReturnValue.php    |  110 -
 airtime_mvc/library/Zend/Service/Abstract.php |   71 -
 airtime_mvc/library/Zend/Service/Akismet.php  |  387 --
 airtime_mvc/library/Zend/Service/Amazon.php   |  323 -
 .../library/Zend/Service/Amazon/Abstract.php  |  119 -
 .../Zend/Service/Amazon/Accessories.php       |   58 -
 .../Zend/Service/Amazon/CustomerReview.php    |   86 -
 .../library/Zend/Service/Amazon/Ec2.php       |   87 -
 .../Zend/Service/Amazon/Ec2/Abstract.php      |  277 -
 .../Service/Amazon/Ec2/Availabilityzones.php  |   76 -
 .../Zend/Service/Amazon/Ec2/CloudWatch.php    |  357 -
 .../library/Zend/Service/Amazon/Ec2/Ebs.php   |  342 -
 .../Zend/Service/Amazon/Ec2/Elasticip.php     |  158 -
 .../Zend/Service/Amazon/Ec2/Exception.php     |   51 -
 .../library/Zend/Service/Amazon/Ec2/Image.php |  333 -
 .../Zend/Service/Amazon/Ec2/Instance.php      |  529 --
 .../Service/Amazon/Ec2/Instance/Reserved.php  |  143 -
 .../Service/Amazon/Ec2/Instance/Windows.php   |  195 -
 .../Zend/Service/Amazon/Ec2/Keypair.php       |  137 -
 .../Zend/Service/Amazon/Ec2/Region.php        |   77 -
 .../Zend/Service/Amazon/Ec2/Response.php      |  163 -
 .../Service/Amazon/Ec2/Securitygroups.php     |  301 -
 .../Zend/Service/Amazon/EditorialReview.php   |   58 -
 .../library/Zend/Service/Amazon/Exception.php |   35 -
 .../library/Zend/Service/Amazon/Image.php     |   69 -
 .../library/Zend/Service/Amazon/Item.php      |  261 -
 .../Zend/Service/Amazon/ListmaniaList.php     |   58 -
 .../library/Zend/Service/Amazon/Offer.php     |  111 -
 .../library/Zend/Service/Amazon/OfferSet.php  |  118 -
 .../library/Zend/Service/Amazon/Query.php     |   98 -
 .../library/Zend/Service/Amazon/ResultSet.php |  170 -
 .../library/Zend/Service/Amazon/S3.php        |  900 ---
 .../Zend/Service/Amazon/S3/Exception.php      |   37 -
 .../library/Zend/Service/Amazon/S3/Stream.php |  497 --
 .../Zend/Service/Amazon/SimilarProduct.php    |   61 -
 .../library/Zend/Service/Amazon/Sqs.php       |  444 --
 .../Zend/Service/Amazon/Sqs/Exception.php     |   38 -
 .../library/Zend/Service/Audioscrobbler.php   |  681 --
 .../library/Zend/Service/Delicious.php        |  616 --
 .../Zend/Service/Delicious/Exception.php      |   39 -
 .../library/Zend/Service/Delicious/Post.php   |  292 -
 .../Zend/Service/Delicious/PostList.php       |  300 -
 .../Zend/Service/Delicious/SimplePost.php     |  123 -
 .../DeveloperGarden/BaseUserService.php       |  399 --
 .../BaseUserService/AccountBalance.php        |   62 -
 .../DeveloperGarden/Client/ClientAbstract.php |  430 --
 .../DeveloperGarden/Client/Exception.php      |   38 -
 .../Service/DeveloperGarden/Client/Soap.php   |  340 -
 .../DeveloperGarden/ConferenceCall.php        |  872 ---
 .../ConferenceCall/ConferenceAccount.php      |   62 -
 .../ConferenceCall/ConferenceDetail.php       |  129 -
 .../ConferenceCall/ConferenceSchedule.php     |  262 -
 .../ConferenceCall/Exception.php              |   38 -
 .../ConferenceCall/Participant.php            |   84 -
 .../ConferenceCall/ParticipantDetail.php      |  195 -
 .../ConferenceCall/ParticipantStatus.php      |  103 -
 .../Service/DeveloperGarden/Credential.php    |  186 -
 .../Service/DeveloperGarden/Exception.php     |   38 -
 .../Service/DeveloperGarden/IpLocation.php    |  120 -
 .../DeveloperGarden/IpLocation/IpAddress.php  |  130 -
 .../Service/DeveloperGarden/LocalSearch.php   |  105 -
 .../DeveloperGarden/LocalSearch/Exception.php |   38 -
 .../LocalSearch/SearchParameters.php          |  536 --
 .../BaseUserService/ChangeQuotaPool.php       |  103 -
 .../BaseUserService/GetAccountBalance.php     |   72 -
 .../BaseUserService/GetQuotaInformation.php   |   72 -
 ...ddConferenceTemplateParticipantRequest.php |   91 -
 .../CommitConferenceRequest.php               |   69 -
 .../CreateConferenceRequest.php               |  136 -
 .../CreateConferenceTemplateRequest.php       |  113 -
 .../GetConferenceListRequest.php              |  104 -
 .../GetConferenceStatusRequest.php            |  106 -
 .../GetConferenceTemplateListRequest.php      |   69 -
 ...etConferenceTemplateParticipantRequest.php |   90 -
 .../GetConferenceTemplateRequest.php          |   69 -
 .../GetParticipantStatusRequest.php           |   90 -
 .../GetRunningConferenceRequest.php           |   69 -
 .../ConferenceCall/NewParticipantRequest.php  |   91 -
 .../RemoveConferenceRequest.php               |   69 -
 ...veConferenceTemplateParticipantRequest.php |   90 -
 .../RemoveConferenceTemplateRequest.php       |   69 -
 .../RemoveParticipantRequest.php              |   90 -
 .../UpdateConferenceRequest.php               |  158 -
 ...teConferenceTemplateParticipantRequest.php |  113 -
 .../UpdateConferenceTemplateRequest.php       |  113 -
 .../UpdateParticipantRequest.php              |  138 -
 .../DeveloperGarden/Request/Exception.php     |   39 -
 .../Request/IpLocation/LocateIPRequest.php    |  114 -
 .../LocalSearch/LocalSearchRequest.php        |  113 -
 .../Request/RequestAbstract.php               |   72 -
 .../Request/SendSms/SendFlashSMS.php          |   46 -
 .../Request/SendSms/SendSMS.php               |   46 -
 .../Request/SendSms/SendSmsAbstract.php       |  281 -
 .../SmsValidation/GetValidatedNumbers.php     |   39 -
 .../Request/SmsValidation/Invalidate.php      |   80 -
 .../SmsValidation/SendValidationKeyword.php   |   39 -
 .../Request/SmsValidation/Validate.php        |  110 -
 .../Request/VoiceButler/CallStatus.php        |  100 -
 .../Request/VoiceButler/NewCall.php           |  238 -
 .../Request/VoiceButler/NewCallSequenced.php  |   92 -
 .../Request/VoiceButler/TearDownCall.php      |   78 -
 .../VoiceButler/VoiceButlerAbstract.php       |   39 -
 .../DeveloperGarden/Response/BaseType.php     |  140 -
 .../ChangeQuotaPoolResponse.php               |   39 -
 .../GetAccountBalanceResponse.php             |   39 -
 .../GetQuotaInformationResponse.php           |   90 -
 ...dConferenceTemplateParticipantResponse.php |   45 -
 ...ferenceTemplateParticipantResponseType.php |   55 -
 .../ConferenceCall/CCSResponseType.php        |   39 -
 .../CommitConferenceResponse.php              |   46 -
 .../ConferenceCall/ConferenceCallAbstract.php |   75 -
 .../CreateConferenceResponse.php              |   45 -
 .../CreateConferenceResponseType.php          |   55 -
 .../CreateConferenceTemplateResponse.php      |   45 -
 .../CreateConferenceTemplateResponseType.php  |   55 -
 .../GetConferenceListResponse.php             |   45 -
 .../GetConferenceListResponseType.php         |   55 -
 .../GetConferenceStatusResponse.php           |   45 -
 .../GetConferenceStatusResponseType.php       |  148 -
 .../GetConferenceTemplateListResponse.php     |   45 -
 .../GetConferenceTemplateListResponseType.php |   55 -
 ...tConferenceTemplateParticipantResponse.php |   45 -
 ...ferenceTemplateParticipantResponseType.php |   55 -
 .../GetConferenceTemplateResponse.php         |   45 -
 .../GetConferenceTemplateResponseType.php     |   97 -
 .../GetParticipantStatusResponse.php          |   45 -
 .../GetParticipantStatusResponseType.php      |   55 -
 .../GetRunningConferenceResponse.php          |   45 -
 .../GetRunningConferenceResponseType.php      |   55 -
 .../ConferenceCall/NewParticipantResponse.php |   45 -
 .../NewParticipantResponseType.php            |   55 -
 .../RemoveConferenceResponse.php              |   46 -
 ...eConferenceTemplateParticipantResponse.php |   46 -
 .../RemoveConferenceTemplateResponse.php      |   46 -
 .../RemoveParticipantResponse.php             |   46 -
 .../UpdateConferenceResponse.php              |   46 -
 ...eConferenceTemplateParticipantResponse.php |   46 -
 .../UpdateConferenceTemplateResponse.php      |   46 -
 .../UpdateParticipantResponse.php             |   46 -
 .../DeveloperGarden/Response/Exception.php    |   39 -
 .../Response/IpLocation/CityType.php          |   77 -
 .../IpLocation/GeoCoordinatesType.php         |   66 -
 .../IpLocation/IPAddressLocationType.php      |  141 -
 .../Response/IpLocation/LocateIPResponse.php  |   98 -
 .../IpLocation/LocateIPResponseType.php       |   46 -
 .../Response/IpLocation/RegionType.php        |   80 -
 .../LocalSearch/LocalSearchResponse.php       |   89 -
 .../LocalSearch/LocalSearchResponseType.php   |   44 -
 .../Response/ResponseAbstract.php             |  111 -
 .../SecurityTokenServer/Exception.php         |   39 -
 .../SecurityTokenServer/GetTokensResponse.php |   94 -
 .../SecurityTokenServer/Interface.php         |   40 -
 .../SecurityTokenResponse.php                 |  116 -
 .../Response/SendSms/SendFlashSMSResponse.php |   39 -
 .../Response/SendSms/SendSMSResponse.php      |   39 -
 .../Response/SendSms/SendSmsAbstract.php      |  119 -
 .../GetValidatedNumbersResponse.php           |   55 -
 .../SmsValidation/InvalidateResponse.php      |   39 -
 .../SendValidationKeywordResponse.php         |   39 -
 .../SmsValidation/ValidateResponse.php        |   39 -
 .../SmsValidation/ValidatedNumber.php         |   64 -
 .../VoiceButler/CallStatus2Response.php       |   88 -
 .../VoiceButler/CallStatusResponse.php        |  154 -
 .../Response/VoiceButler/NewCallResponse.php  |   60 -
 .../VoiceButler/NewCallSequencedResponse.php  |   39 -
 .../VoiceButler/TearDownCallResponse.php      |   50 -
 .../VoiceButler/VoiceButlerAbstract.php       |  128 -
 .../DeveloperGarden/SecurityTokenServer.php   |  127 -
 .../SecurityTokenServer/Cache.php             |  207 -
 .../Zend/Service/DeveloperGarden/SendSms.php  |  156 -
 .../Service/DeveloperGarden/SmsValidation.php |  193 -
 .../Service/DeveloperGarden/VoiceCall.php     |  226 -
 .../DeveloperGarden/Wsdl/IPLocation.wsdl      |   84 -
 .../DeveloperGarden/Wsdl/IPLocation.xsd       |   69 -
 .../Wsdl/ODGBaseUserService.wsdl              |  104 -
 .../Wsdl/ODGBaseUserService.xsd               |   72 -
 .../DeveloperGarden/Wsdl/SmsService.wsdl      |  122 -
 .../Wsdl/SmsValidationUserService.wsdl        |  169 -
 .../DeveloperGarden/Wsdl/TokenService.wsdl    |  353 -
 .../Wsdl/VoiceButlerService.wsdl              |  164 -
 .../Wsdl/VoiceButlerService.xsd               |  264 -
 .../Service/DeveloperGarden/Wsdl/ccsPort.wsdl |  463 --
 .../Service/DeveloperGarden/Wsdl/ccsPort.xsd  |  736 --
 .../DeveloperGarden/Wsdl/localsearch.wsdl     |   83 -
 .../DeveloperGarden/Wsdl/localsearch.xsd      |   31 -
 .../library/Zend/Service/Exception.php        |   37 -
 airtime_mvc/library/Zend/Service/Flickr.php   |  627 --
 .../library/Zend/Service/Flickr/Image.php     |   76 -
 .../library/Zend/Service/Flickr/Result.php    |  195 -
 .../library/Zend/Service/Flickr/ResultSet.php |  188 -
 airtime_mvc/library/Zend/Service/LiveDocx.php |  415 --
 .../Zend/Service/LiveDocx/Exception.php       |   39 -
 .../Zend/Service/LiveDocx/MailMerge.php       |  978 ---
 airtime_mvc/library/Zend/Service/Nirvanix.php |  107 -
 .../Zend/Service/Nirvanix/Exception.php       |   36 -
 .../Zend/Service/Nirvanix/Namespace/Base.php  |  172 -
 .../Zend/Service/Nirvanix/Namespace/Imfs.php  |  105 -
 .../Zend/Service/Nirvanix/Response.php        |  123 -
 .../library/Zend/Service/ReCaptcha.php        |  506 --
 .../Zend/Service/ReCaptcha/Exception.php      |   36 -
 .../Zend/Service/ReCaptcha/MailHide.php       |  351 -
 .../Service/ReCaptcha/MailHide/Exception.php  |   36 -
 .../Zend/Service/ReCaptcha/Response.php       |  159 -
 airtime_mvc/library/Zend/Service/Simpy.php    |  433 --
 .../library/Zend/Service/Simpy/Link.php       |  215 -
 .../library/Zend/Service/Simpy/LinkQuery.php  |  200 -
 .../library/Zend/Service/Simpy/LinkSet.php    |   83 -
 .../library/Zend/Service/Simpy/Note.php       |  215 -
 .../library/Zend/Service/Simpy/NoteSet.php    |   83 -
 .../library/Zend/Service/Simpy/Tag.php        |   81 -
 .../library/Zend/Service/Simpy/TagSet.php     |   83 -
 .../library/Zend/Service/Simpy/Watchlist.php  |  191 -
 .../Zend/Service/Simpy/WatchlistFilter.php    |   81 -
 .../Zend/Service/Simpy/WatchlistFilterSet.php |   77 -
 .../Zend/Service/Simpy/WatchlistSet.php       |   82 -
 .../library/Zend/Service/SlideShare.php       |  619 --
 .../Zend/Service/SlideShare/Exception.php     |   38 -
 .../Zend/Service/SlideShare/SlideShow.php     |  437 --
 .../library/Zend/Service/StrikeIron.php       |   92 -
 .../library/Zend/Service/StrikeIron/Base.php  |  274 -
 .../Zend/Service/StrikeIron/Decorator.php     |  143 -
 .../Zend/Service/StrikeIron/Exception.php     |   36 -
 .../Service/StrikeIron/SalesUseTaxBasic.php   |   45 -
 .../StrikeIron/USAddressVerification.php      |   45 -
 .../Zend/Service/StrikeIron/ZipCodeInfo.php   |   45 -
 .../library/Zend/Service/Technorati.php       | 1028 ---
 .../Zend/Service/Technorati/Author.php        |  242 -
 .../Service/Technorati/BlogInfoResult.php     |  161 -
 .../Zend/Service/Technorati/CosmosResult.php  |  152 -
 .../Service/Technorati/CosmosResultSet.php    |  176 -
 .../Service/Technorati/DailyCountsResult.php  |   93 -
 .../Technorati/DailyCountsResultSet.php       |  125 -
 .../Zend/Service/Technorati/Exception.php     |   39 -
 .../Zend/Service/Technorati/GetInfoResult.php |  103 -
 .../Zend/Service/Technorati/KeyInfoResult.php |  118 -
 .../Zend/Service/Technorati/Result.php        |  121 -
 .../Zend/Service/Technorati/ResultSet.php     |  289 -
 .../Zend/Service/Technorati/SearchResult.php  |  150 -
 .../Service/Technorati/SearchResultSet.php    |   79 -
 .../Zend/Service/Technorati/TagResult.php     |  171 -
 .../Zend/Service/Technorati/TagResultSet.php  |  110 -
 .../Zend/Service/Technorati/TagsResult.php    |   93 -
 .../Zend/Service/Technorati/TagsResultSet.php |   67 -
 .../library/Zend/Service/Technorati/Utils.php |  136 -
 .../Zend/Service/Technorati/Weblog.php        |  486 --
 airtime_mvc/library/Zend/Service/Twitter.php  |  979 ---
 .../Zend/Service/Twitter/Exception.php        |   37 -
 .../library/Zend/Service/Twitter/Search.php   |  167 -
 .../Credentials/CredentialsAbstract.php       |  197 -
 .../Credentials/SharedAccessSignature.php     |  305 -
 .../WindowsAzure/Credentials/SharedKey.php    |  154 -
 .../Credentials/SharedKeyLite.php             |  123 -
 .../Zend/Service/WindowsAzure/Exception.php   |   35 -
 .../WindowsAzure/RetryPolicy/Exception.php    |   36 -
 .../WindowsAzure/RetryPolicy/NoRetry.php      |   58 -
 .../WindowsAzure/RetryPolicy/RetryN.php       |   92 -
 .../RetryPolicy/RetryPolicyAbstract.php       |   77 -
 .../Service/WindowsAzure/SessionHandler.php   |  217 -
 .../Zend/Service/WindowsAzure/Storage.php     |  504 --
 .../Service/WindowsAzure/Storage/Batch.php    |  248 -
 .../Storage/BatchStorageAbstract.php          |  193 -
 .../Service/WindowsAzure/Storage/Blob.php     | 1401 ----
 .../WindowsAzure/Storage/Blob/Stream.php      |  565 --
 .../WindowsAzure/Storage/BlobContainer.php    |   95 -
 .../WindowsAzure/Storage/BlobInstance.php     |  116 -
 .../Storage/DynamicTableEntity.php            |  200 -
 .../Service/WindowsAzure/Storage/Queue.php    |  547 --
 .../WindowsAzure/Storage/QueueInstance.php    |   91 -
 .../WindowsAzure/Storage/QueueMessage.php     |  101 -
 .../WindowsAzure/Storage/SignedIdentifier.php |   94 -
 .../Service/WindowsAzure/Storage/Table.php    |  816 ---
 .../WindowsAzure/Storage/TableEntity.php      |  323 -
 .../WindowsAzure/Storage/TableEntityQuery.php |  326 -
 .../WindowsAzure/Storage/TableInstance.php    |   95 -
 airtime_mvc/library/Zend/Service/Yahoo.php    |  956 ---
 .../library/Zend/Service/Yahoo/Image.php      |   71 -
 .../Zend/Service/Yahoo/ImageResult.php        |  111 -
 .../Zend/Service/Yahoo/ImageResultSet.php     |   63 -
 .../Zend/Service/Yahoo/InlinkDataResult.php   |   58 -
 .../Service/Yahoo/InlinkDataResultSet.php     |   62 -
 .../Zend/Service/Yahoo/LocalResult.php        |  124 -
 .../Zend/Service/Yahoo/LocalResultSet.php     |   84 -
 .../library/Zend/Service/Yahoo/NewsResult.php |  112 -
 .../Zend/Service/Yahoo/NewsResultSet.php      |   63 -
 .../Zend/Service/Yahoo/PageDataResult.php     |   58 -
 .../Zend/Service/Yahoo/PageDataResultSet.php  |   62 -
 .../library/Zend/Service/Yahoo/Result.php     |  126 -
 .../library/Zend/Service/Yahoo/ResultSet.php  |  195 -
 .../Zend/Service/Yahoo/VideoResult.php        |  132 -
 .../Zend/Service/Yahoo/VideoResultSet.php     |   63 -
 .../library/Zend/Service/Yahoo/WebResult.php  |  109 -
 .../Zend/Service/Yahoo/WebResultSet.php       |   63 -
 airtime_mvc/library/Zend/Session.php          |  880 ---
 airtime_mvc/library/Zend/Session/Abstract.php |  185 -
 .../library/Zend/Session/Exception.php        |   74 -
 .../library/Zend/Session/Namespace.php        |  529 --
 .../Zend/Session/SaveHandler/DbTable.php      |  591 --
 .../Zend/Session/SaveHandler/Exception.php    |   37 -
 .../Zend/Session/SaveHandler/Interface.php    |   81 -
 .../Zend/Session/Validator/Abstract.php       |   69 -
 .../Zend/Session/Validator/HttpUserAgent.php  |   66 -
 .../Zend/Session/Validator/Interface.php      |   52 -
 .../library/Zend/Soap/AutoDiscover.php        |  548 --
 .../Zend/Soap/AutoDiscover/Exception.php      |   34 -
 airtime_mvc/library/Zend/Soap/Client.php      | 1196 ----
 .../library/Zend/Soap/Client/Common.php       |   76 -
 .../library/Zend/Soap/Client/DotNet.php       |   95 -
 .../library/Zend/Soap/Client/Exception.php    |   35 -
 .../library/Zend/Soap/Client/Local.php        |   93 -
 airtime_mvc/library/Zend/Soap/Server.php      |  959 ---
 .../library/Zend/Soap/Server/Exception.php    |   37 -
 airtime_mvc/library/Zend/Soap/Wsdl.php        |  666 --
 .../library/Zend/Soap/Wsdl/Exception.php      |   37 -
 .../Zend/Soap/Wsdl/Strategy/Abstract.php      |   66 -
 .../Zend/Soap/Wsdl/Strategy/AnyType.php       |   59 -
 .../Soap/Wsdl/Strategy/ArrayOfTypeComplex.php |  146 -
 .../Wsdl/Strategy/ArrayOfTypeSequence.php     |  155 -
 .../Zend/Soap/Wsdl/Strategy/Composite.php     |  188 -
 .../Soap/Wsdl/Strategy/DefaultComplexType.php |   83 -
 .../Zend/Soap/Wsdl/Strategy/Interface.php     |   48 -
 airtime_mvc/library/Zend/Tag/Cloud.php        |  410 --
 .../Zend/Tag/Cloud/Decorator/Cloud.php        |   88 -
 .../Zend/Tag/Cloud/Decorator/Exception.php    |   39 -
 .../Zend/Tag/Cloud/Decorator/HtmlCloud.php    |  155 -
 .../Zend/Tag/Cloud/Decorator/HtmlTag.php      |  306 -
 .../library/Zend/Tag/Cloud/Decorator/Tag.php  |   88 -
 .../library/Zend/Tag/Cloud/Exception.php      |   38 -
 airtime_mvc/library/Zend/Tag/Exception.php    |   38 -
 airtime_mvc/library/Zend/Tag/Item.php         |  220 -
 airtime_mvc/library/Zend/Tag/ItemList.php     |  238 -
 airtime_mvc/library/Zend/Tag/Taggable.php     |   60 -
 airtime_mvc/library/Zend/Test/DbAdapter.php   |  345 -
 airtime_mvc/library/Zend/Test/DbStatement.php |  404 --
 .../Zend/Test/PHPUnit/Constraint/DomQuery.php |  405 --
 .../Test/PHPUnit/Constraint/Exception.php     |   38 -
 .../Zend/Test/PHPUnit/Constraint/Redirect.php |  282 -
 .../PHPUnit/Constraint/ResponseHeader.php     |  400 --
 .../Zend/Test/PHPUnit/ControllerTestCase.php  | 1155 ----
 .../Zend/Test/PHPUnit/DatabaseTestCase.php    |  151 -
 .../Zend/Test/PHPUnit/Db/Connection.php       |  149 -
 .../Zend/Test/PHPUnit/Db/DataSet/DbRowset.php |   78 -
 .../Zend/Test/PHPUnit/Db/DataSet/DbTable.php  |  125 -
 .../PHPUnit/Db/DataSet/DbTableDataSet.php     |  103 -
 .../Test/PHPUnit/Db/DataSet/QueryDataSet.php  |   90 -
 .../Test/PHPUnit/Db/DataSet/QueryTable.php    |   91 -
 .../Zend/Test/PHPUnit/Db/Exception.php        |   40 -
 .../Zend/Test/PHPUnit/Db/Metadata/Generic.php |  167 -
 .../Test/PHPUnit/Db/Operation/DeleteAll.php   |   81 -
 .../Zend/Test/PHPUnit/Db/Operation/Insert.php |  104 -
 .../Test/PHPUnit/Db/Operation/Truncate.php    |  130 -
 .../Zend/Test/PHPUnit/Db/SimpleTester.php     |   95 -
 airtime_mvc/library/Zend/Text/Exception.php   |   38 -
 airtime_mvc/library/Zend/Text/Figlet.php      | 1232 ----
 .../library/Zend/Text/Figlet/Exception.php    |   38 -
 .../Zend/Text/Figlet/zend-framework.flf       |  753 ---
 airtime_mvc/library/Zend/Text/MultiByte.php   |  153 -
 airtime_mvc/library/Zend/Text/Table.php       |  532 --
 .../library/Zend/Text/Table/Column.php        |  243 -
 .../Zend/Text/Table/Decorator/Ascii.php       |  147 -
 .../Zend/Text/Table/Decorator/Interface.php   |  108 -
 .../Zend/Text/Table/Decorator/Unicode.php     |  176 -
 .../library/Zend/Text/Table/Exception.php     |   38 -
 airtime_mvc/library/Zend/Text/Table/Row.php   |  215 -
 airtime_mvc/library/Zend/TimeSync.php         |  304 -
 .../library/Zend/TimeSync/Exception.php       |   64 -
 airtime_mvc/library/Zend/TimeSync/Ntp.php     |  431 --
 .../library/Zend/TimeSync/Protocol.php        |  148 -
 airtime_mvc/library/Zend/TimeSync/Sntp.php    |  119 -
 .../Zend/Tool/Framework/Action/Base.php       |   95 -
 .../Zend/Tool/Framework/Action/Exception.php  |   37 -
 .../Zend/Tool/Framework/Action/Interface.php  |   32 -
 .../Zend/Tool/Framework/Action/Repository.php |  138 -
 .../Zend/Tool/Framework/Client/Abstract.php   |  333 -
 .../Zend/Tool/Framework/Client/Config.php     |  244 -
 .../Zend/Tool/Framework/Client/Console.php    |  307 -
 .../Client/Console/ArgumentParser.php         |  532 --
 .../Framework/Client/Console/HelpSystem.php   |  378 --
 .../Framework/Client/Console/Manifest.php     |  209 -
 .../Console/ResponseDecorator/AlignCenter.php |   66 -
 .../Console/ResponseDecorator/Blockize.php    |   69 -
 .../Console/ResponseDecorator/Colorizer.php   |   92 -
 .../Console/ResponseDecorator/Indention.php   |   56 -
 .../Zend/Tool/Framework/Client/Exception.php  |   36 -
 .../Client/Interactive/InputHandler.php       |   74 -
 .../Client/Interactive/InputInterface.php     |   41 -
 .../Client/Interactive/InputRequest.php       |   54 -
 .../Client/Interactive/InputResponse.php      |   52 -
 .../Client/Interactive/OutputInterface.php    |   33 -
 .../Zend/Tool/Framework/Client/Manifest.php   |  206 -
 .../Zend/Tool/Framework/Client/Request.php    |  299 -
 .../Zend/Tool/Framework/Client/Response.php   |  223 -
 .../Response/ContentDecorator/Interface.php   |   35 -
 .../Response/ContentDecorator/Separator.php   |   93 -
 .../Zend/Tool/Framework/Client/Storage.php    |  117 -
 .../Client/Storage/AdapterInterface.php       |   42 -
 .../Framework/Client/Storage/Directory.php    |   73 -
 .../library/Zend/Tool/Framework/Exception.php |   36 -
 .../Zend/Tool/Framework/Loader/Abstract.php   |  156 -
 .../Tool/Framework/Loader/BasicLoader.php     |  157 -
 .../Framework/Loader/IncludePathLoader.php    |  139 -
 .../RecursiveFilterIterator.php               |   91 -
 .../Zend/Tool/Framework/Loader/Interface.php  |   42 -
 .../Framework/Manifest/ActionManifestable.php |   47 -
 .../Tool/Framework/Manifest/Exception.php     |   37 -
 .../Tool/Framework/Manifest/Indexable.php     |   42 -
 .../Tool/Framework/Manifest/Interface.php     |   82 -
 .../Manifest/MetadataManifestable.php         |   47 -
 .../Manifest/ProviderManifestable.php         |   47 -
 .../Tool/Framework/Manifest/Repository.php    |  313 -
 .../Tool/Framework/Metadata/Attributable.php  |   32 -
 .../Zend/Tool/Framework/Metadata/Basic.php    |  227 -
 .../Zend/Tool/Framework/Metadata/Dynamic.php  |  219 -
 .../Tool/Framework/Metadata/Interface.php     |   52 -
 .../Zend/Tool/Framework/Metadata/Tool.php     |  218 -
 .../Zend/Tool/Framework/Provider/Abstract.php |   68 -
 .../Provider/DocblockManifestable.php         |   30 -
 .../Tool/Framework/Provider/Exception.php     |   37 -
 .../Tool/Framework/Provider/Interactable.php  |   30 -
 .../Tool/Framework/Provider/Interface.php     |   31 -
 .../Tool/Framework/Provider/Pretendable.php   |   31 -
 .../Tool/Framework/Provider/Repository.php    |  265 -
 .../Tool/Framework/Provider/Signature.php     |  391 --
 .../library/Zend/Tool/Framework/Registry.php  |  419 --
 .../Framework/Registry/EnabledInterface.php   |   40 -
 .../Tool/Framework/Registry/Exception.php     |   33 -
 .../Tool/Framework/Registry/Interface.php     |  137 -
 .../Tool/Framework/System/Action/Create.php   |   44 -
 .../Tool/Framework/System/Action/Delete.php   |   44 -
 .../Zend/Tool/Framework/System/Manifest.php   |   63 -
 .../Tool/Framework/System/Provider/Config.php |  311 -
 .../Framework/System/Provider/Manifest.php    |  114 -
 .../Framework/System/Provider/Phpinfo.php     |   38 -
 .../Framework/System/Provider/Version.php     |  111 -
 .../Tool/Project/Context/Content/Engine.php   |  106 -
 .../Context/Content/Engine/CodeGenerator.php  |   98 -
 .../Project/Context/Content/Engine/Phtml.php  |   89 -
 .../Zend/Tool/Project/Context/Exception.php   |   33 -
 .../Project/Context/Filesystem/Abstract.php   |  165 -
 .../Project/Context/Filesystem/Directory.php  |   87 -
 .../Tool/Project/Context/Filesystem/File.php  |  174 -
 .../Zend/Tool/Project/Context/Interface.php   |   38 -
 .../Zend/Tool/Project/Context/Repository.php  |  189 -
 .../Tool/Project/Context/System/Interface.php |   37 -
 .../Context/System/NotOverwritable.php        |   37 -
 .../Context/System/ProjectDirectory.php       |  128 -
 .../Context/System/ProjectProfileFile.php     |  118 -
 .../System/ProjectProvidersDirectory.php      |   97 -
 .../Context/System/TopLevelRestrictable.php   |   37 -
 .../Project/Context/Zf/AbstractClassFile.php  |   78 -
 .../Tool/Project/Context/Zf/ActionMethod.php  |  224 -
 .../Tool/Project/Context/Zf/ApisDirectory.php |   57 -
 .../Context/Zf/ApplicationConfigFile.php      |  283 -
 .../Context/Zf/ApplicationDirectory.php       |   81 -
 .../Tool/Project/Context/Zf/BootstrapFile.php |  119 -
 .../Project/Context/Zf/CacheDirectory.php     |   57 -
 .../Tool/Project/Context/Zf/ConfigFile.php    |   67 -
 .../Project/Context/Zf/ConfigsDirectory.php   |   57 -
 .../Project/Context/Zf/ControllerFile.php     |  214 -
 .../Context/Zf/ControllersDirectory.php       |   57 -
 .../Tool/Project/Context/Zf/DataDirectory.php |   57 -
 .../Project/Context/Zf/DbTableDirectory.php   |   57 -
 .../Tool/Project/Context/Zf/DbTableFile.php   |   92 -
 .../Tool/Project/Context/Zf/DocsDirectory.php |   61 -
 .../Zend/Tool/Project/Context/Zf/FormFile.php |  108 -
 .../Project/Context/Zf/FormsDirectory.php     |   57 -
 .../Tool/Project/Context/Zf/HtaccessFile.php  |   77 -
 .../Project/Context/Zf/LayoutScriptFile.php   |  109 -
 .../Context/Zf/LayoutScriptsDirectory.php     |   57 -
 .../Project/Context/Zf/LayoutsDirectory.php   |   57 -
 .../Project/Context/Zf/LibraryDirectory.php   |   57 -
 .../Project/Context/Zf/LocalesDirectory.php   |   57 -
 .../Tool/Project/Context/Zf/LogsDirectory.php |   57 -
 .../Tool/Project/Context/Zf/ModelFile.php     |  102 -
 .../Project/Context/Zf/ModelsDirectory.php    |   57 -
 .../Project/Context/Zf/ModuleDirectory.php    |   97 -
 .../Project/Context/Zf/ModulesDirectory.php   |   57 -
 .../Context/Zf/ProjectProviderFile.php        |  152 -
 .../Project/Context/Zf/PublicDirectory.php    |   57 -
 .../Context/Zf/PublicImagesDirectory.php      |   57 -
 .../Project/Context/Zf/PublicIndexFile.php    |   95 -
 .../Context/Zf/PublicScriptsDirectory.php     |   57 -
 .../Context/Zf/PublicStylesheetsDirectory.php |   57 -
 .../Context/Zf/SearchIndexesDirectory.php     |   57 -
 .../Project/Context/Zf/SessionsDirectory.php  |   57 -
 .../Project/Context/Zf/TemporaryDirectory.php |   57 -
 .../Zf/TestApplicationBootstrapFile.php       |   57 -
 .../Zf/TestApplicationControllerDirectory.php |   57 -
 .../Zf/TestApplicationControllerFile.php      |  107 -
 .../Context/Zf/TestApplicationDirectory.php   |   57 -
 .../Context/Zf/TestLibraryBootstrapFile.php   |   57 -
 .../Context/Zf/TestLibraryDirectory.php       |   57 -
 .../Project/Context/Zf/TestLibraryFile.php    |  107 -
 .../Zf/TestLibraryNamespaceDirectory.php      |   88 -
 .../Context/Zf/TestPHPUnitConfigFile.php      |   57 -
 .../Project/Context/Zf/TestsDirectory.php     |   57 -
 .../Project/Context/Zf/UploadsDirectory.php   |   57 -
 .../Zf/ViewControllerScriptsDirectory.php     |   95 -
 .../Context/Zf/ViewFiltersDirectory.php       |   57 -
 .../Context/Zf/ViewHelpersDirectory.php       |   57 -
 .../Project/Context/Zf/ViewScriptFile.php     |  212 -
 .../Context/Zf/ViewScriptsDirectory.php       |   57 -
 .../Project/Context/Zf/ViewsDirectory.php     |   57 -
 .../Context/Zf/ZfStandardLibraryDirectory.php |  104 -
 .../library/Zend/Tool/Project/Exception.php   |   37 -
 .../library/Zend/Tool/Project/Profile.php     |  237 -
 .../Zend/Tool/Project/Profile/Exception.php   |   37 -
 .../Project/Profile/FileParser/Interface.php  |   54 -
 .../Tool/Project/Profile/FileParser/Xml.php   |  240 -
 .../Profile/Iterator/ContextFilter.php        |  211 -
 .../Iterator/EnabledResourceFilter.php        |   43 -
 .../Zend/Tool/Project/Profile/Resource.php    |  262 -
 .../Project/Profile/Resource/Container.php    |  421 --
 .../Profile/Resource/SearchConstraints.php    |  117 -
 .../Zend/Tool/Project/Provider/Abstract.php   |  241 -
 .../Zend/Tool/Project/Provider/Action.php     |  214 -
 .../Tool/Project/Provider/Application.php     |   87 -
 .../Zend/Tool/Project/Provider/Controller.php |  200 -
 .../Zend/Tool/Project/Provider/DbAdapter.php  |  139 -
 .../Zend/Tool/Project/Provider/DbTable.php    |  220 -
 .../Zend/Tool/Project/Provider/Exception.php  |   37 -
 .../Zend/Tool/Project/Provider/Form.php       |  156 -
 .../Zend/Tool/Project/Provider/Layout.php     |  109 -
 .../Zend/Tool/Project/Provider/Manifest.php   |   70 -
 .../Zend/Tool/Project/Provider/Model.php      |  173 -
 .../Zend/Tool/Project/Provider/Module.php     |  172 -
 .../Zend/Tool/Project/Provider/Profile.php    |   54 -
 .../Zend/Tool/Project/Provider/Project.php    |  239 -
 .../Tool/Project/Provider/ProjectProvider.php |   97 -
 .../Zend/Tool/Project/Provider/Test.php       |  174 -
 .../Zend/Tool/Project/Provider/View.php       |  118 -
 airtime_mvc/library/Zend/Translate.php        |  219 -
 .../library/Zend/Translate/Adapter.php        |  868 ---
 .../library/Zend/Translate/Adapter/Array.php  |   81 -
 .../library/Zend/Translate/Adapter/Csv.php    |  121 -
 .../Zend/Translate/Adapter/Gettext.php        |  165 -
 .../library/Zend/Translate/Adapter/Ini.php    |   74 -
 .../library/Zend/Translate/Adapter/Qt.php     |  160 -
 .../library/Zend/Translate/Adapter/Tbx.php    |  165 -
 .../library/Zend/Translate/Adapter/Tmx.php    |  233 -
 .../library/Zend/Translate/Adapter/Xliff.php  |  229 -
 .../library/Zend/Translate/Adapter/XmlTm.php  |  139 -
 .../library/Zend/Translate/Exception.php      |   37 -
 airtime_mvc/library/Zend/Translate/Plural.php |  224 -
 .../library/Zend/Translate/Translate.php      |  180 -
 airtime_mvc/library/Zend/Uri.php              |  189 -
 airtime_mvc/library/Zend/Uri/Exception.php    |   37 -
 airtime_mvc/library/Zend/Uri/Http.php         |  769 ---
 airtime_mvc/library/Zend/Validate.php         |  290 -
 .../library/Zend/Validate/Abstract.php        |  436 --
 airtime_mvc/library/Zend/Validate/Alnum.php   |  150 -
 airtime_mvc/library/Zend/Validate/Alpha.php   |  150 -
 airtime_mvc/library/Zend/Validate/Barcode.php |  217 -
 .../Zend/Validate/Barcode/AdapterAbstract.php |  315 -
 .../Validate/Barcode/AdapterInterface.php     |   68 -
 .../library/Zend/Validate/Barcode/Code25.php  |   64 -
 .../Validate/Barcode/Code25interleaved.php    |   64 -
 .../library/Zend/Validate/Barcode/Code39.php  |  100 -
 .../Zend/Validate/Barcode/Code39ext.php       |   58 -
 .../library/Zend/Validate/Barcode/Code93.php  |  120 -
 .../Zend/Validate/Barcode/Code93ext.php       |   58 -
 .../library/Zend/Validate/Barcode/Ean12.php   |   52 -
 .../library/Zend/Validate/Barcode/Ean13.php   |   52 -
 .../library/Zend/Validate/Barcode/Ean14.php   |   52 -
 .../library/Zend/Validate/Barcode/Ean18.php   |   52 -
 .../library/Zend/Validate/Barcode/Ean2.php    |   58 -
 .../library/Zend/Validate/Barcode/Ean5.php    |   58 -
 .../library/Zend/Validate/Barcode/Ean8.php    |   69 -
 .../library/Zend/Validate/Barcode/Gtin12.php  |   52 -
 .../library/Zend/Validate/Barcode/Gtin13.php  |   52 -
 .../library/Zend/Validate/Barcode/Gtin14.php  |   52 -
 .../Zend/Validate/Barcode/Identcode.php       |   52 -
 .../Zend/Validate/Barcode/Intelligentmail.php |   58 -
 .../library/Zend/Validate/Barcode/Issn.php    |  119 -
 .../library/Zend/Validate/Barcode/Itf14.php   |   52 -
 .../Zend/Validate/Barcode/Leitcode.php        |   52 -
 .../library/Zend/Validate/Barcode/Planet.php  |   52 -
 .../library/Zend/Validate/Barcode/Postnet.php |   52 -
 .../Zend/Validate/Barcode/Royalmail.php       |  121 -
 .../library/Zend/Validate/Barcode/Sscc.php    |   52 -
 .../library/Zend/Validate/Barcode/Upca.php    |   52 -
 .../library/Zend/Validate/Barcode/Upce.php    |   69 -
 airtime_mvc/library/Zend/Validate/Between.php |  224 -
 .../library/Zend/Validate/Callback.php        |  174 -
 airtime_mvc/library/Zend/Validate/Ccnum.php   |  112 -
 .../library/Zend/Validate/CreditCard.php      |  317 -
 airtime_mvc/library/Zend/Validate/Date.php    |  259 -
 .../library/Zend/Validate/Db/Abstract.php     |  298 -
 .../Zend/Validate/Db/NoRecordExists.php       |   51 -
 .../library/Zend/Validate/Db/RecordExists.php |   51 -
 airtime_mvc/library/Zend/Validate/Digits.php  |   91 -
 .../library/Zend/Validate/EmailAddress.php    |  560 --
 .../library/Zend/Validate/Exception.php       |   34 -
 .../library/Zend/Validate/File/Count.php      |  284 -
 .../library/Zend/Validate/File/Crc32.php      |  179 -
 .../Zend/Validate/File/ExcludeExtension.php   |   94 -
 .../Zend/Validate/File/ExcludeMimeType.php    |  109 -
 .../library/Zend/Validate/File/Exists.php     |  203 -
 .../library/Zend/Validate/File/Extension.php  |  232 -
 .../library/Zend/Validate/File/FilesSize.php  |  164 -
 .../library/Zend/Validate/File/Hash.php       |  194 -
 .../library/Zend/Validate/File/ImageSize.php  |  364 -
 .../Zend/Validate/File/IsCompressed.php       |  149 -
 .../library/Zend/Validate/File/IsImage.php    |  173 -
 .../library/Zend/Validate/File/Md5.php        |  183 -
 .../library/Zend/Validate/File/MimeType.php   |  393 --
 .../library/Zend/Validate/File/NotExists.php  |   84 -
 .../library/Zend/Validate/File/Sha1.php       |  181 -
 .../library/Zend/Validate/File/Size.php       |  404 --
 .../library/Zend/Validate/File/Upload.php     |  245 -
 .../library/Zend/Validate/File/WordCount.php  |  101 -
 airtime_mvc/library/Zend/Validate/Float.php   |  134 -
 .../library/Zend/Validate/GreaterThan.php     |  124 -
 airtime_mvc/library/Zend/Validate/Hex.php     |   72 -
 .../library/Zend/Validate/Hostname.php        |  740 --
 .../library/Zend/Validate/Hostname/Biz.php    | 2917 --------
 .../library/Zend/Validate/Hostname/Cn.php     | 2199 ------
 .../library/Zend/Validate/Hostname/Com.php    |  198 -
 .../library/Zend/Validate/Hostname/Jp.php     |  739 --
 airtime_mvc/library/Zend/Validate/Iban.php    |  223 -
 .../library/Zend/Validate/Identical.php       |  133 -
 airtime_mvc/library/Zend/Validate/InArray.php |  204 -
 airtime_mvc/library/Zend/Validate/Int.php     |  148 -
 .../library/Zend/Validate/Interface.php       |   54 -
 airtime_mvc/library/Zend/Validate/Ip.php      |  191 -
 airtime_mvc/library/Zend/Validate/Isbn.php    |  273 -
 .../library/Zend/Validate/LessThan.php        |  122 -
 .../library/Zend/Validate/NotEmpty.php        |  237 -
 .../library/Zend/Validate/PostCode.php        |  210 -
 airtime_mvc/library/Zend/Validate/Regex.php   |  147 -
 .../Zend/Validate/Sitemap/Changefreq.php      |   95 -
 .../library/Zend/Validate/Sitemap/Lastmod.php |   88 -
 .../library/Zend/Validate/Sitemap/Loc.php     |   87 -
 .../Zend/Validate/Sitemap/Priority.php        |   82 -
 .../library/Zend/Validate/StringLength.php    |  253 -
 airtime_mvc/library/Zend/Version.php          |   53 -
 airtime_mvc/library/Zend/View.php             |  111 -
 airtime_mvc/library/Zend/View/Abstract.php    | 1188 ----
 airtime_mvc/library/Zend/View/Exception.php   |   51 -
 .../library/Zend/View/Helper/Abstract.php     |   64 -
 .../library/Zend/View/Helper/Action.php       |  164 -
 .../library/Zend/View/Helper/BaseUrl.php      |  116 -
 .../library/Zend/View/Helper/Currency.php     |  119 -
 .../library/Zend/View/Helper/Cycle.php        |  226 -
 .../library/Zend/View/Helper/DeclareVars.php  |   95 -
 .../library/Zend/View/Helper/Doctype.php      |  209 -
 .../library/Zend/View/Helper/Fieldset.php     |   79 -
 airtime_mvc/library/Zend/View/Helper/Form.php |   71 -
 .../library/Zend/View/Helper/FormButton.php   |  105 -
 .../library/Zend/View/Helper/FormCheckbox.php |  163 -
 .../library/Zend/View/Helper/FormElement.php  |  204 -
 .../library/Zend/View/Helper/FormErrors.php   |  157 -
 .../library/Zend/View/Helper/FormFile.php     |   81 -
 .../library/Zend/View/Helper/FormHidden.php   |   66 -
 .../library/Zend/View/Helper/FormImage.php    |  101 -
 .../library/Zend/View/Helper/FormLabel.php    |   72 -
 .../Zend/View/Helper/FormMultiCheckbox.php    |   74 -
 .../library/Zend/View/Helper/FormNote.php     |   61 -
 .../library/Zend/View/Helper/FormPassword.php |   95 -
 .../library/Zend/View/Helper/FormRadio.php    |  183 -
 .../library/Zend/View/Helper/FormReset.php    |   88 -
 .../library/Zend/View/Helper/FormSelect.php   |  178 -
 .../library/Zend/View/Helper/FormSubmit.php   |   84 -
 .../library/Zend/View/Helper/FormText.php     |   84 -
 .../library/Zend/View/Helper/FormTextarea.php |  104 -
 .../library/Zend/View/Helper/HeadLink.php     |  437 --
 .../library/Zend/View/Helper/HeadMeta.php     |  412 --
 .../library/Zend/View/Helper/HeadScript.php   |  495 --
 .../library/Zend/View/Helper/HeadStyle.php    |  419 --
 .../library/Zend/View/Helper/HeadTitle.php    |  181 -
 .../library/Zend/View/Helper/HtmlElement.php  |  141 -
 .../library/Zend/View/Helper/HtmlFlash.php    |   60 -
 .../library/Zend/View/Helper/HtmlList.php     |   90 -
 .../library/Zend/View/Helper/HtmlObject.php   |   80 -
 .../library/Zend/View/Helper/HtmlPage.php     |   75 -
 .../Zend/View/Helper/HtmlQuicktime.php        |   82 -
 .../library/Zend/View/Helper/InlineScript.php |   61 -
 .../library/Zend/View/Helper/Interface.php    |   46 -
 airtime_mvc/library/Zend/View/Helper/Json.php |   80 -
 .../library/Zend/View/Helper/Layout.php       |   81 -
 .../library/Zend/View/Helper/Navigation.php   |  338 -
 .../View/Helper/Navigation/Breadcrumbs.php    |  331 -
 .../Zend/View/Helper/Navigation/Helper.php    |  212 -
 .../View/Helper/Navigation/HelperAbstract.php |  855 ---
 .../Zend/View/Helper/Navigation/Links.php     |  783 ---
 .../Zend/View/Helper/Navigation/Menu.php      |  647 --
 .../Zend/View/Helper/Navigation/Sitemap.php   |  483 --
 .../Zend/View/Helper/PaginationControl.php    |  145 -
 .../library/Zend/View/Helper/Partial.php      |  149 -
 .../Zend/View/Helper/Partial/Exception.php    |   39 -
 .../library/Zend/View/Helper/PartialLoop.php  |   98 -
 .../library/Zend/View/Helper/Placeholder.php  |   87 -
 .../View/Helper/Placeholder/Container.php     |   36 -
 .../Helper/Placeholder/Container/Abstract.php |  378 --
 .../Placeholder/Container/Exception.php       |   39 -
 .../Placeholder/Container/Standalone.php      |  324 -
 .../Zend/View/Helper/Placeholder/Registry.php |  188 -
 .../Helper/Placeholder/Registry/Exception.php |   39 -
 .../Zend/View/Helper/RenderToPlaceholder.php  |   53 -
 .../library/Zend/View/Helper/ServerUrl.php    |  144 -
 .../library/Zend/View/Helper/Translate.php    |  180 -
 airtime_mvc/library/Zend/View/Helper/Url.php  |   51 -
 airtime_mvc/library/Zend/View/Interface.php   |  137 -
 airtime_mvc/library/Zend/View/Stream.php      |  183 -
 .../Zend/Wildfire/Channel/HttpHeaders.php     |  339 -
 .../Zend/Wildfire/Channel/Interface.php       |   38 -
 .../library/Zend/Wildfire/Exception.php       |   35 -
 .../library/Zend/Wildfire/Plugin/FirePhp.php  |  800 ---
 .../Zend/Wildfire/Plugin/FirePhp/Message.php  |  246 -
 .../Wildfire/Plugin/FirePhp/TableMessage.php  |  165 -
 .../Zend/Wildfire/Plugin/Interface.php        |   48 -
 .../Zend/Wildfire/Protocol/JsonStream.php     |  235 -
 airtime_mvc/library/Zend/XmlRpc/Client.php    |  386 --
 .../library/Zend/XmlRpc/Client/Exception.php  |   40 -
 .../Zend/XmlRpc/Client/FaultException.php     |   38 -
 .../Zend/XmlRpc/Client/HttpException.php      |   41 -
 .../XmlRpc/Client/IntrospectException.php     |   40 -
 .../XmlRpc/Client/ServerIntrospection.php     |  166 -
 .../Zend/XmlRpc/Client/ServerProxy.php        |   95 -
 airtime_mvc/library/Zend/XmlRpc/Exception.php |   37 -
 airtime_mvc/library/Zend/XmlRpc/Fault.php     |  307 -
 .../Zend/XmlRpc/Generator/DomDocument.php     |  101 -
 .../XmlRpc/Generator/GeneratorAbstract.php    |  150 -
 .../Zend/XmlRpc/Generator/XmlWriter.php       |   92 -
 airtime_mvc/library/Zend/XmlRpc/Request.php   |  439 --
 .../library/Zend/XmlRpc/Request/Http.php      |  124 -
 .../library/Zend/XmlRpc/Request/Stdin.php     |   84 -
 airtime_mvc/library/Zend/XmlRpc/Response.php  |  248 -
 .../library/Zend/XmlRpc/Response/Http.php     |   51 -
 airtime_mvc/library/Zend/XmlRpc/Server.php    |  615 --
 .../library/Zend/XmlRpc/Server/Cache.php      |   46 -
 .../library/Zend/XmlRpc/Server/Exception.php  |   42 -
 .../library/Zend/XmlRpc/Server/Fault.php      |  201 -
 .../library/Zend/XmlRpc/Server/System.php     |  162 -
 airtime_mvc/library/Zend/XmlRpc/Value.php     |  485 --
 .../library/Zend/XmlRpc/Value/Array.php       |   75 -
 .../library/Zend/XmlRpc/Value/Base64.php      |   68 -
 .../library/Zend/XmlRpc/Value/BigInteger.php  |   65 -
 .../library/Zend/XmlRpc/Value/Boolean.php     |   63 -
 .../library/Zend/XmlRpc/Value/Collection.php  |   73 -
 .../library/Zend/XmlRpc/Value/DateTime.php    |   91 -
 .../library/Zend/XmlRpc/Value/Double.php      |   62 -
 .../library/Zend/XmlRpc/Value/Exception.php   |   39 -
 .../library/Zend/XmlRpc/Value/Integer.php     |   65 -
 airtime_mvc/library/Zend/XmlRpc/Value/Nil.php |   60 -
 .../library/Zend/XmlRpc/Value/Scalar.php      |   55 -
 .../library/Zend/XmlRpc/Value/String.php      |   60 -
 .../library/Zend/XmlRpc/Value/Struct.php      |   76 -
 airtime_mvc/public/index.php                  |    3 -
 install_full/ubuntu/airtime-full-install      |   12 +
 .../ubuntu/airtime-full-install-nginx         |   10 +
 .../airtime-1.8.0/airtime-upgrade.php         |    3 +-
 .../airtime-1.8.1/airtime-upgrade.php         |    8 +-
 .../airtime-1.8.2/airtime-upgrade.php         |    8 +-
 .../upgrades/airtime-1.9.0/conf.php           |    8 +-
 2717 files changed, 27 insertions(+), 676351 deletions(-)
 delete mode 100644 airtime_mvc/library/Zend/Acl.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Assert/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Resource.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Resource/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Role.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Role/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Role/Registry.php
 delete mode 100644 airtime_mvc/library/Zend/Acl/Role/Registry/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Adobe/Auth.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Adobe/DbInspector.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Adobe/Introspector.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Auth/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Constants.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Amf0/Deserializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Amf0/Serializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Amf3/Deserializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Amf3/Serializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Deserializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/InputStream.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/OutputStream.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Resource/MysqlResult.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Resource/MysqliResult.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Resource/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/Serializer.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Parse/TypeLoader.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Request.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Request/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Response/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Server.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Util/BinaryStream.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/ByteArray.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/MessageBody.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/MessageHeader.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/AbstractMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/ArrayCollection.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/AsyncMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/CommandMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/ErrorMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/Messaging/RemotingMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Amf/Value/TraitsInfo.php
 delete mode 100644 airtime_mvc/library/Zend/Application.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Bootstrap/Bootstrap.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Bootstrap/BootstrapAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Bootstrap/Bootstrapper.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Bootstrap/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Bootstrap/ResourceBootstrapper.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Module/Autoloader.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Module/Bootstrap.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Cachemanager.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Db.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Dojo.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Frontcontroller.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Locale.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Log.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Mail.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Modules.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Multidb.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Navigation.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Resource.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/ResourceAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Router.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Session.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/Translate.php
 delete mode 100644 airtime_mvc/library/Zend/Application/Resource/View.php
 delete mode 100644 airtime_mvc/library/Zend/Auth.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/DbTable.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Digest.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/File.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/InfoCard.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/Ldap.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Adapter/OpenId.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Storage/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Storage/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Storage/NonPersistent.php
 delete mode 100644 airtime_mvc/library/Zend/Auth/Storage/Session.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Code25.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Code25interleaved.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Code39.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Ean13.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Ean2.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Ean5.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Ean8.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Error.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Identcode.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Itf14.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Leitcode.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/ObjectAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Planet.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Postnet.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Royalmail.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Upca.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Object/Upce.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Renderer/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Renderer/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Renderer/Pdf.php
 delete mode 100644 airtime_mvc/library/Zend/Barcode/Renderer/RendererAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Apc.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/BlackHole.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/ExtendedInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/File.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Memcached.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Sqlite.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Static.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Test.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/TwoLevels.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/Xcache.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/ZendPlatform.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/ZendServer.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/ZendServer/Disk.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Backend/ZendServer/ShMem.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Core.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/Capture.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/Class.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/File.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/Function.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/Output.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Frontend/Page.php
 delete mode 100644 airtime_mvc/library/Zend/Cache/Manager.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Adapter.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Base.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Dumb.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Figlet.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/ReCaptcha.php
 delete mode 100644 airtime_mvc/library/Zend/Captcha/Word.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Body.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Class.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Docblock.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/File.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Member/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Member/Container.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Method.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Parameter.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Property.php
 delete mode 100644 airtime_mvc/library/Zend/CodeGenerator/Php/Property/DefaultValue.php
 delete mode 100644 airtime_mvc/library/Zend/Config.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Ini.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Writer.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Writer/Array.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Writer/FileAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Writer/Ini.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Writer/Xml.php
 delete mode 100644 airtime_mvc/library/Zend/Config/Xml.php
 delete mode 100644 airtime_mvc/library/Zend/Console/Getopt.php
 delete mode 100644 airtime_mvc/library/Zend/Console/Getopt/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/ActionStack.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/AjaxContext.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/ContextSwitch.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/FlashMessenger.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/Json.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/Redirector.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/Url.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Helper/ViewRenderer.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/HelperBroker.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/HelperBroker/PriorityStack.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Action/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Dispatcher/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Dispatcher/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Dispatcher/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Dispatcher/Standard.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Front.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Plugin/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Plugin/ActionStack.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Plugin/Broker.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Plugin/ErrorHandler.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Plugin/PutHandler.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/Apache404.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/HttpTestCase.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Request/Simple.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Response/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Response/Cli.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Response/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Response/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Response/HttpTestCase.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Rewrite.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Chain.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Hostname.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Module.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Regex.php
 delete mode 100644 airtime_mvc/library/Zend/Controller/Router/Route/Static.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/DiffieHellman.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/DiffieHellman/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Hmac.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Hmac/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/BigInteger.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/BigInteger/Bcmath.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/BigInteger/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/BigInteger/Gmp.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/BigInteger/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Math/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Rsa.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Rsa/Key.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Rsa/Key/Private.php
 delete mode 100644 airtime_mvc/library/Zend/Crypt/Rsa/Key/Public.php
 delete mode 100644 airtime_mvc/library/Zend/Currency.php
 delete mode 100644 airtime_mvc/library/Zend/Currency/CurrencyInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Currency/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Date.php
 delete mode 100644 airtime_mvc/library/Zend/Date/Cities.php
 delete mode 100644 airtime_mvc/library/Zend/Date/DateObject.php
 delete mode 100644 airtime_mvc/library/Zend/Date/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Db2.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Db2/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Mysqli.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Mysqli/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Oracle.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Oracle/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Mssql.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Mysql.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Oci.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Pgsql.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Pdo/Sqlite.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Sqlsrv.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Adapter/Sqlsrv/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Expr.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Profiler.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Profiler/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Profiler/Firebug.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Profiler/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Select.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Select/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Db2.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Db2/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Mysqli.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Mysqli/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Oracle.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Oracle/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Pdo.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Pdo/Ibm.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Pdo/Oci.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Sqlsrv.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Statement/Sqlsrv/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Definition.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Row.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Row/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Row/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Rowset.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Rowset/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Rowset/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Select.php
 delete mode 100644 airtime_mvc/library/Zend/Db/Table/Select/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Debug.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/BuildLayer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Data.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionPane.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/BorderContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/ContentPane.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitElement.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitForm.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/SplitContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/StackContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Decorator/TabContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/DisplayGroup.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/Button.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/CheckBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/ComboBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/DateTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/Dijit.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/DijitMulti.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/Editor.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/FilteringSelect.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/HorizontalSlider.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/NumberSpinner.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/NumberTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/PasswordTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/RadioButton.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/SimpleTextarea.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/Slider.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/SubmitButton.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/TextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/Textarea.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/TimeTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/ValidationTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/Element/VerticalSlider.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/Form/SubForm.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/AccordionContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/AccordionPane.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/BorderContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Button.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/CheckBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/ComboBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/ContentPane.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/CustomDijit.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/DateTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Dijit.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/DijitContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Dojo.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Dojo/Container.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Editor.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/FilteringSelect.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Form.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/HorizontalSlider.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/NumberSpinner.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/NumberTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/PasswordTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/RadioButton.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/SimpleTextarea.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Slider.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/SplitContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/StackContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/SubmitButton.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/TabContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/TextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/Textarea.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/TimeTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/ValidationTextBox.php
 delete mode 100644 airtime_mvc/library/Zend/Dojo/View/Helper/VerticalSlider.php
 delete mode 100644 airtime_mvc/library/Zend/Dom/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Dom/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Dom/Query/Css2Xpath.php
 delete mode 100644 airtime_mvc/library/Zend/Dom/Query/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder/Header.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder/Header/Itunes.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Builder/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Element.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Entry/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Entry/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Entry/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/HttpResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Publisher.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Collection.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Collection/Author.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Collection/Category.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Collection/CollectionAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Entry/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Entry/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/EntryAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/EntryInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Content/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/EntryAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/FeedAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Slash/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/Thread/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Feed/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Feed/Atom/Source.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/Feed/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/FeedAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/FeedInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Reader/FeedSet.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Deleted.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Exception/InvalidMethodException.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/RendererAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/RendererInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Feed/FeedAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Feed/Writer/Source.php
 delete mode 100644 airtime_mvc/library/Zend/File/Transfer.php
 delete mode 100644 airtime_mvc/library/Zend/File/Transfer/Adapter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/File/Transfer/Adapter/Http.php
 delete mode 100644 airtime_mvc/library/Zend/File/Transfer/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Filter.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Alnum.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Alpha.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/BaseName.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Boolean.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Callback.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Bz2.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/CompressAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/CompressInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Gz.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Lzf.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Rar.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Tar.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Compress/Zip.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Decompress.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Decrypt.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Digits.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Dir.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Encrypt.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Encrypt/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Encrypt/Mcrypt.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Encrypt/Openssl.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/File/Decrypt.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/File/Encrypt.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/File/LowerCase.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/File/Rename.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/File/UpperCase.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/HtmlEntities.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Inflector.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Input.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Int.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/LocalizedToNormalized.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/NormalizedToLocalized.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Null.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/PregReplace.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/RealPath.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/StringToLower.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/StringToUpper.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/StringTrim.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/StripNewlines.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/StripTags.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/CamelCaseToDash.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/CamelCaseToSeparator.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/CamelCaseToUnderscore.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/DashToCamelCase.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/DashToSeparator.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/DashToUnderscore.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/Separator/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/SeparatorToCamelCase.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/SeparatorToDash.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/SeparatorToSeparator.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/UnderscoreToCamelCase.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/UnderscoreToDash.php
 delete mode 100644 airtime_mvc/library/Zend/Filter/Word/UnderscoreToSeparator.php
 delete mode 100644 airtime_mvc/library/Zend/Form.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Callback.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Captcha.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Captcha/Word.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Description.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/DtDdWrapper.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Errors.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Fieldset.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/File.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Form.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/FormElements.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/FormErrors.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/HtmlTag.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Label.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Marker/File/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/PrepareElements.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/Tooltip.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/ViewHelper.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Decorator/ViewScript.php
 delete mode 100644 airtime_mvc/library/Zend/Form/DisplayGroup.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Button.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Captcha.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Checkbox.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/File.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Hash.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Hidden.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Multi.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/MultiCheckbox.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Multiselect.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Password.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Radio.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Reset.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Select.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Submit.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Text.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Textarea.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Element/Xhtml.php
 delete mode 100644 airtime_mvc/library/Zend/Form/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Form/SubForm.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/AuthException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/BadMethodCallException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Base.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/BaseMediaSource.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/CaptchaRequiredException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Author.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Category.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Content.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Contributor.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Control.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Draft.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Edited.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Element.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Email.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Generator.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Icon.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Id.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Link.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Logo.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Name.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Person.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Published.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Rights.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Source.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Subtitle.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Summary.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Text.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Title.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Updated.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Extension/Uri.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/FeedEntryParent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/FeedSourceParent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/HttpException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/IOException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/InvalidArgumentException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/MediaEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/MediaFileSource.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/MediaSource.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/Util.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/App/VersionException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/AuthSub.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/CollectionEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/CollectionFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/AnnotationLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/BooksCategory.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/BooksLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/Embeddability.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/InfoLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/PreviewLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/Review.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/ThumbnailLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/Extension/Viewability.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/VolumeEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/VolumeFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Books/VolumeQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/EventEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/EventFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/EventQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/AccessLevel.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/Color.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/Hidden.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/Link.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/QuickAdd.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/Selected.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/Timezone.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/Extension/WebContent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/ListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Calendar/ListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/ClientLogin.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Docs.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Docs/DocumentListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Docs/DocumentListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Docs/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Creator.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Date.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Description.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Format.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Identifier.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Language.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Publisher.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Rights.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Subject.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Title.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Distance.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Exposure.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/FStop.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Flash.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/FocalLength.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Iso.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Make.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Model.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Tags.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Extension/Time.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Exif/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/AttendeeStatus.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/AttendeeType.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Comments.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/EntryLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/EventStatus.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/ExtendedProperty.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/FeedLink.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/OpenSearchStartIndex.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/OpenSearchTotalResults.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/OriginalEvent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Rating.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Recurrence.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/RecurrenceException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Reminder.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Transparency.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Visibility.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/When.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Where.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Extension/Who.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Error.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Extension/EmailList.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Extension/Login.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Extension/Name.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Extension/Nickname.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Extension/Quota.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/NicknameEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/NicknameFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/NicknameQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/ServiceException.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/UserEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/UserFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gapps/UserQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/ItemEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/ItemFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/ItemQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/SnippetEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/SnippetFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Gbase/SnippetQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPoint.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPos.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Geo/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/Extension/Ccr.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/ProfileEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/ProfileFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/ProfileListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/ProfileListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Health/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingProxy.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingSocket.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/HttpClient.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Kind/EventEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Entry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCategory.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaContent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCopyright.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCredit.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaDescription.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaGroup.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaHash.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaKeywords.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaPlayer.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRating.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRestriction.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaText.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Extension/MediaTitle.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Media/Feed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/MediaMimeStream.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/MimeBodyString.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/MimeFile.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/AlbumEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/AlbumFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/AlbumQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/CommentEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Access.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/AlbumId.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/BytesUsed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Checksum.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentCount.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Height.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Id.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Location.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Name.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Nickname.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotos.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/PhotoId.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Position.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaLimit.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Rotation.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Size.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Thumbnail.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Timestamp.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/User.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Version.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Weight.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/Extension/Width.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/PhotoEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/PhotoFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/PhotoQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/TagEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/UserEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/UserFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Photos/UserQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/CellEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/CellFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/CellQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Cell.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Custom.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/ListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/ListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/ListQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/ActivityEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/ActivityFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/CommentEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/CommentFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/ContactEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/ContactFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/AboutMe.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Age.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Books.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Company.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Control.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/CountHint.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Description.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Duration.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/FirstName.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Gender.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hobbies.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hometown.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/LastName.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Link.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Location.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaContent.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaCredit.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaGroup.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaRating.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Movies.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Music.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/NoEmbed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Occupation.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistId.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Position.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Private.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/QueryString.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Racy.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Recorded.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Relationship.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/School.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/State.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Statistics.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Status.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Token.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Uploaded.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/Username.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/Extension/VideoId.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/InboxEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/InboxFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/MediaEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/UserProfileEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/VideoEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/VideoFeed.php
 delete mode 100644 airtime_mvc/library/Zend/Gdata/YouTube/VideoQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Curl.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Proxy.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Socket.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Adapter/Test.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Cookie.php
 delete mode 100644 airtime_mvc/library/Zend/Http/CookieJar.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Http/Response/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Adapter/Default.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Adapter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Adapter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Claims.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Assertion.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Saml.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Element.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Element/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/EncryptedKey.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Default.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php
 delete mode 100644 airtime_mvc/library/Zend/InfoCard/Xml/SecurityTokenReference.php
 delete mode 100644 airtime_mvc/library/Zend/Json.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Decoder.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Encoder.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Expr.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Error.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Request.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Request/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Response/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Smd.php
 delete mode 100644 airtime_mvc/library/Zend/Json/Server/Smd/Service.php
 delete mode 100644 airtime_mvc/library/Zend/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/Layout/Controller/Action/Helper/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/Layout/Controller/Plugin/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/Layout/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Attribute.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Collection.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Collection/Iterator/Default.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Converter.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Dn.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/And.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Logical.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Mask.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Not.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/Or.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Filter/String.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Ldif/Encoder.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/ChildrenIterator.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Collection.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/RootDse.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/RootDse/OpenLdap.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/RootDse/eDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/Item.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
 delete mode 100644 airtime_mvc/library/Zend/Ldap/Node/Schema/OpenLdap.php
 delete mode 100644 airtime_mvc/library/Zend/Loader.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/Autoloader.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/Autoloader/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/Autoloader/Resource.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/PluginLoader.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/PluginLoader/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Loader/PluginLoader/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Locale.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/Translation.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/aa.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/aa_DJ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/aa_ER.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/aa_ER_SAAHO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/aa_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/af.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/af_NA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/af_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ak.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ak_GH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/am.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/am_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_AE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_BH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_DZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_EG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_IQ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_JO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_KW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_LB.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_LY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_MA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_OM.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_QA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_SA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_SD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_SY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_TN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ar_YE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/as.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/as_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az_AZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az_Cyrl_AZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/az_Latn_AZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/be.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/be_BY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bg.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bg_BG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bn_BD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bn_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bo_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bo_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bs.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/bs_BA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/byn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/byn_ER.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ca.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ca_ES.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cch.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cch_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/characters.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cop.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cs.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cs_CZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cy.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/cy_GB.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/da.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/da_DK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_AT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_BE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_CH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_DE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_LI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/de_LU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/dv.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/dv_MV.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/dz.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/dz_BT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ee.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ee_GH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ee_TG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/el.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/el_CY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/el_GR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/el_POLYTON.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_AS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_AU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_BE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_BW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_BZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_CA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_Dsrt.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_Dsrt_US.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_GB.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_GU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_HK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_IE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_JM.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_MH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_MP.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_MT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_NA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_NZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_PH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_PK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_SG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_Shaw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_TT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_UM.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_US.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_US_POSIX.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_VI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/en_ZW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/eo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_AR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_BO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_CL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_CO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_CR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_DO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_EC.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_ES.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_GT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_HN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_MX.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_NI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_PA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_PE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_PR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_PY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_SV.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_US.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_UY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/es_VE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/et.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/et_EE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/eu.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/eu_ES.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fa.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fa_AF.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fa_IR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fi.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fi_FI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fil.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fil_PH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fo_FO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_BE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_CA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_CH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_FR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_LU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_MC.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fr_SN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fur.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/fur_IT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ga.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ga_IE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gaa.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gaa_GH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gez.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gez_ER.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gez_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gl_ES.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gsw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gsw_CH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gu.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gu_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gv.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/gv_GB.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Arab.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Arab_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Arab_SD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_GH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Latn_GH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Latn_NE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_Latn_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_NE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ha_SD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/haw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/haw_US.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/he.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/he_IL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hi.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hi_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hr_HR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hu.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hu_HU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hy.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hy_AM.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/hy_AM_REVISED.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ia.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/id.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/id_ID.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ig.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ig_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ii.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ii_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/in.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/is.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/is_IS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/it.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/it_CH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/it_IT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/iu.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/iw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ja.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ja_JP.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ka.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ka_GE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kaj.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kaj_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kam.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kam_KE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kcg.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kcg_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kfo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kfo_CI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kk.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kk_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kk_Cyrl_KZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kk_KZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kl_GL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/km.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/km_KH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kn_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ko.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ko_KR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kok.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kok_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kpe.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kpe_GN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kpe_LR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Arab.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Arab_IQ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Arab_IR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Arab_SY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_IQ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_IR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_Latn_TR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_SY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ku_TR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/kw_GB.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ky.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ky_KG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/likelySubtags.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ln.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ln_CD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ln_CG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lo_LA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lt.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lt_LT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lv.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/lv_LV.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/metazoneInfo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mk.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mk_MK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ml.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ml_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_Cyrl_MN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_MN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_Mong.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mn_Mong_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mr_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ms.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ms_BN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ms_MY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mt.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/mt_MT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/my.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/my_MM.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nb.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nb_NO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nds.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nds_DE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ne.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ne_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ne_NP.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nl_BE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nl_NL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nn_NO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/no.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nr_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nso.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/nso_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/numberingSystems.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ny.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ny_MW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/oc.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/oc_FR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/om.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/om_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/om_KE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/or.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/or_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_Arab.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_Arab_PK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_Guru.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_Guru_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pa_PK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pl_PL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/postalCodeData.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ps.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ps_AF.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pt.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pt_BR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/pt_PT.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ro.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ro_MD.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ro_RO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/root.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ru.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ru_RU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ru_UA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/rw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/rw_RW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sa.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sa_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/se.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/se_FI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/se_NO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sh.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sh_BA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sh_CS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sh_YU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/si.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/si_LK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sid.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sid_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sk.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sk_SK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sl_SI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/so.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/so_DJ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/so_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/so_KE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/so_SO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sq.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sq_AL.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_BA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_CS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_BA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_CS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_ME.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_RS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_YU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn_BA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn_CS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn_ME.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn_RS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_Latn_YU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_ME.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_RS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sr_YU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ss.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ss_SZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ss_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/st.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/st_LS.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/st_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/supplementalData.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sv.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sv_FI.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sv_SE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sw.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sw_KE.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/sw_TZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/syr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/syr_SY.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ta.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ta_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/te.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/te_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/telephoneCodeData.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tg.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tg_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tg_Cyrl_TJ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tg_TJ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/th.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/th_TH.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ti.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ti_ER.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ti_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tig.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tig_ER.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tn_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/to.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/to_TO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tr.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tr_TR.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/trv.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/trv_TW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ts.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ts_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tt.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/tt_RU.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ug.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ug_Arab.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ug_Arab_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ug_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uk.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uk_UA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ur.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ur_IN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ur_PK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_AF.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Arab.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Arab_AF.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Cyrl.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Cyrl_UZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_Latn_UZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/uz_UZ.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ve.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/ve_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/vi.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/vi_VN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wal.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wal_ET.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wo_Latn.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wo_Latn_SN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/wo_SN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/xh.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/xh_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/yo.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/yo_NG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_HK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hans.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hans_CN.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hans_HK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hans_MO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hans_SG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hant.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hant_HK.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hant_MO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_Hant_TW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_MO.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_SG.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zh_TW.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zu.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Data/zu_ZA.xml
 delete mode 100644 airtime_mvc/library/Zend/Locale/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Format.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Math.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Math/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Locale/Math/PhpMath.php
 delete mode 100644 airtime_mvc/library/Zend/Log.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Log/FactoryInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Filter/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Filter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Filter/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Filter/Priority.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Filter/Suppress.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Formatter/Firebug.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Formatter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Formatter/Simple.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Formatter/Xml.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Db.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Firebug.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Mail.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Mock.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Null.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/Syslog.php
 delete mode 100644 airtime_mvc/library/Zend/Log/Writer/ZendMonitor.php
 delete mode 100644 airtime_mvc/library/Zend/Mail.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Message/File.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Message/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Part.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Part/File.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Part/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Imap.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Pop3.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Smtp.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Folder.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Folder/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Folder/Maildir.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Folder/Mbox.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Imap.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Maildir.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Mbox.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Pop3.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Writable/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Storage/Writable/Maildir.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Transport/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Transport/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Transport/Sendmail.php
 delete mode 100644 airtime_mvc/library/Zend/Mail/Transport/Smtp.php
 delete mode 100644 airtime_mvc/library/Zend/Markup.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Parser/Bbcode.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Parser/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Parser/ParserInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Parser/Textile.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html/Code.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html/HtmlAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html/Img.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html/List.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/Html/Url.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/RendererAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Renderer/TokenConverterInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/Token.php
 delete mode 100644 airtime_mvc/library/Zend/Markup/TokenList.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Acceleration.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Angle.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Area.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Binary.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Capacitance.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Cooking/Volume.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Cooking/Weight.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Current.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Density.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Energy.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Flow/Mass.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Flow/Mole.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Flow/Volume.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Force.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Frequency.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Illumination.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Length.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Lightness.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Number.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Power.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Pressure.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Speed.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Temperature.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Time.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Torque.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Viscosity/Dynamic.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Viscosity/Kinematic.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Volume.php
 delete mode 100644 airtime_mvc/library/Zend/Measure/Weight.php
 delete mode 100644 airtime_mvc/library/Zend/Memory.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/AccessController.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Container.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Container/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Container/Locked.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Container/Movable.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Manager.php
 delete mode 100644 airtime_mvc/library/Zend/Memory/Value.php
 delete mode 100644 airtime_mvc/library/Zend/Mime.php
 delete mode 100644 airtime_mvc/library/Zend/Mime/Decode.php
 delete mode 100644 airtime_mvc/library/Zend/Mime/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Mime/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Mime/Part.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation/Container.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation/Page.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation/Page/Mvc.php
 delete mode 100644 airtime_mvc/library/Zend/Navigation/Page/Uri.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Config.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Config/ConfigInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Consumer.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Http/AccessToken.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Http/RequestToken.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Http/UserAuthorization.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Http/Utility.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Signature/Hmac.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Signature/Plaintext.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Signature/Rsa.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Signature/SignatureAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Token.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Token/Access.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Token/AuthorizedRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Oauth/Token/Request.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Consumer.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Consumer/Storage.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Consumer/Storage/File.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Extension.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Extension/Sreg.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Provider.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Provider/Storage.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Provider/Storage/File.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Provider/User.php
 delete mode 100644 airtime_mvc/library/Zend/OpenId/Provider/User/Session.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/Array.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/DbSelect.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/DbTableSelect.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/Iterator.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Adapter/Null.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/AdapterAggregate.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/ScrollingStyle/All.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/ScrollingStyle/Elastic.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/ScrollingStyle/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/ScrollingStyle/Jumping.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/ScrollingStyle/Sliding.php
 delete mode 100644 airtime_mvc/library/Zend/Paginator/SerializableLimitIterator.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/GoTo.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/GoTo3DView.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/GoToE.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/GoToR.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Hide.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/ImportData.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/JavaScript.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Launch.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Movie.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Named.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Rendition.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/ResetForm.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/SetOCGState.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Sound.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/SubmitForm.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Thread.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Trans.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/URI.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Action/Unknown.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Annotation.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Annotation/FileAttachment.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Annotation/Link.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Annotation/Markup.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Annotation/Text.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Cmap.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding/Static.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Cmap/SegmentToDelta.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Cmap/TrimmedTable.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Color.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Color/Cmyk.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Color/GrayScale.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Color/Html.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Color/Rgb.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/Explicit.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/Fit.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBox.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitHorizontally.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitRectangle.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/FitVertically.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/Named.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/Unknown.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Destination/Zoom.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Array.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Boolean.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Dictionary.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Name.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Null.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Numeric.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Object.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Object/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Reference.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Reference/Context.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Reference/Table.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/String.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Element/String/Binary.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/ElementFactory.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/ElementFactory/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/ElementFactory/Proxy.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser/Font.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParser/Image/Png.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParserDataSource.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParserDataSource/File.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/FileParserDataSource/String.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/Ascii85.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/AsciiHex.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/Compression.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/Compression/Flate.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/Compression/Lzw.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Filter/RunLength.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Font.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/NameTree.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Outline.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Outline/Created.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Outline/Loaded.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Page.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Parser.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Extracted.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/FontDescriptor.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Font/Type0.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Image/Jpeg.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Image/Png.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/Image/Tiff.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Resource/ImageFactory.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/StringParser.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Style.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Target.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Trailer.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Trailer/Generator.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/Trailer/Keeper.php
 delete mode 100644 airtime_mvc/library/Zend/Pdf/UpdateInfoContainer.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Adapter.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Adapter/Console.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Adapter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Adapter/JsPull.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Adapter/JsPush.php
 delete mode 100644 airtime_mvc/library/Zend/ProgressBar/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Queue.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Activemq.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/AdapterAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/AdapterInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Array.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db/Queue.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db/mysql.sql
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db/postgresql.sql
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Db/queue_sqlite.sql
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Memcacheq.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/Null.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Adapter/PlatformJobQueue.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Message/Iterator.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Message/PlatformJob.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Stomp/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Stomp/Client/Connection.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Stomp/Client/ConnectionInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Stomp/Frame.php
 delete mode 100644 airtime_mvc/library/Zend/Queue/Stomp/FrameInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Class.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Docblock.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Docblock/Tag.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Docblock/Tag/Param.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Docblock/Tag/Return.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Extension.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/File.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Function.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Method.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Parameter.php
 delete mode 100644 airtime_mvc/library/Zend/Reflection/Property.php
 delete mode 100644 airtime_mvc/library/Zend/Registry.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Client/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Client/Result/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Controller.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Route.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Server.php
 delete mode 100644 airtime_mvc/library/Zend/Rest/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/Token.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/Docx.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/Html.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/OpenXml.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/Pptx.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Document/Xlsx.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/FSM.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/FSMAction.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Field.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/DictionaryLoader.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/DocsFilter.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/FieldInfo.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/SegmentInfo.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/SegmentMerger.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/Term.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/TermInfo.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/TermsStream/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Index/Writer.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/LockManager.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/MultiSearcher.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/PriorityQueue.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Proxy.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Default.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Boolean.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Empty.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Insignificant.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Phrase.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Range.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Term.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Query/Wildcard.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryHit.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryLexer.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryParser.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserContext.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserException.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/QueryToken.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Similarity.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Similarity/Default.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Boolean.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Empty.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Phrase.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Term.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Storage/Directory.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Storage/File.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Storage/File/Filesystem.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/Storage/File/Memory.php
 delete mode 100644 airtime_mvc/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/AdapterAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/AdapterInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/Amf0.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/Amf3.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/Igbinary.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/Json.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/PhpCode.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/PhpSerialize.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/PythonPickle.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Adapter/Wddx.php
 delete mode 100644 airtime_mvc/library/Zend/Serializer/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Definition.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Method/Callback.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Method/Definition.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Method/Parameter.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Method/Prototype.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Class.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Function.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Function/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Method.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Node.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Parameter.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/Prototype.php
 delete mode 100644 airtime_mvc/library/Zend/Server/Reflection/ReturnValue.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Akismet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Accessories.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/CustomerReview.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Availabilityzones.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/CloudWatch.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Ebs.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Elasticip.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Windows.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Keypair.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Region.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Ec2/Securitygroups.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/EditorialReview.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Item.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/ListmaniaList.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Offer.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/OfferSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Query.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/ResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/S3.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/S3/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/S3/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/SimilarProduct.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Sqs.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Amazon/Sqs/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Audioscrobbler.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Delicious.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Delicious/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Delicious/Post.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Delicious/PostList.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Delicious/SimplePost.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Soap.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Credential.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/SendSms.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/SmsValidation.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/VoiceCall.php
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl
 delete mode 100644 airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd
 delete mode 100644 airtime_mvc/library/Zend/Service/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Flickr.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Flickr/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Flickr/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Flickr/ResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/LiveDocx.php
 delete mode 100644 airtime_mvc/library/Zend/Service/LiveDocx/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/LiveDocx/MailMerge.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Nirvanix.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Nirvanix/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Base.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Imfs.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Nirvanix/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Service/ReCaptcha.php
 delete mode 100644 airtime_mvc/library/Zend/Service/ReCaptcha/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/ReCaptcha/MailHide.php
 delete mode 100644 airtime_mvc/library/Zend/Service/ReCaptcha/MailHide/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/ReCaptcha/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/Link.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/LinkQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/LinkSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/Note.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/NoteSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/Tag.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/TagSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/Watchlist.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/WatchlistFilter.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/WatchlistFilterSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Simpy/WatchlistSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/SlideShare.php
 delete mode 100644 airtime_mvc/library/Zend/Service/SlideShare/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/SlideShare/SlideShow.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/Base.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/Decorator.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/USAddressVerification.php
 delete mode 100644 airtime_mvc/library/Zend/Service/StrikeIron/ZipCodeInfo.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/Author.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/BlogInfoResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/CosmosResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/CosmosResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/DailyCountsResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/DailyCountsResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/GetInfoResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/KeyInfoResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/ResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/SearchResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/SearchResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/TagResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/TagResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/TagsResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/TagsResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/Utils.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Technorati/Weblog.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Twitter.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Twitter/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Twitter/Search.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/SessionHandler.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Batch.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Queue.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Table.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/Image.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/ImageResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/ImageResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/LocalResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/LocalResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/NewsResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/NewsResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/PageDataResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/PageDataResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/Result.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/ResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/VideoResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/VideoResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/WebResult.php
 delete mode 100644 airtime_mvc/library/Zend/Service/Yahoo/WebResultSet.php
 delete mode 100644 airtime_mvc/library/Zend/Session.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Namespace.php
 delete mode 100644 airtime_mvc/library/Zend/Session/SaveHandler/DbTable.php
 delete mode 100644 airtime_mvc/library/Zend/Session/SaveHandler/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Session/SaveHandler/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Validator/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Validator/HttpUserAgent.php
 delete mode 100644 airtime_mvc/library/Zend/Session/Validator/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/AutoDiscover.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/AutoDiscover/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Client.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Client/Common.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Client/DotNet.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Client/Local.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Server.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/AnyType.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Composite.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
 delete mode 100644 airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Decorator/Cloud.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Decorator/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Decorator/Tag.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Cloud/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Item.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/ItemList.php
 delete mode 100644 airtime_mvc/library/Zend/Tag/Taggable.php
 delete mode 100644 airtime_mvc/library/Zend/Test/DbAdapter.php
 delete mode 100644 airtime_mvc/library/Zend/Test/DbStatement.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Redirect.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/ControllerTestCase.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/DatabaseTestCase.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Connection.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
 delete mode 100644 airtime_mvc/library/Zend/Test/PHPUnit/Db/SimpleTester.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Figlet.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Figlet/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Figlet/zend-framework.flf
 delete mode 100644 airtime_mvc/library/Zend/Text/MultiByte.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Column.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Decorator/Ascii.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Decorator/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Decorator/Unicode.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Text/Table/Row.php
 delete mode 100644 airtime_mvc/library/Zend/TimeSync.php
 delete mode 100644 airtime_mvc/library/Zend/TimeSync/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/TimeSync/Ntp.php
 delete mode 100644 airtime_mvc/library/Zend/TimeSync/Protocol.php
 delete mode 100644 airtime_mvc/library/Zend/TimeSync/Sntp.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Action/Base.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Action/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Action/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Action/Repository.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Config.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/HelpSystem.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/Manifest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Manifest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Request.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Response.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Storage.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Client/Storage/Directory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Loader/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Loader/BasicLoader.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Loader/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/ActionManifestable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/Indexable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Manifest/Repository.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Metadata/Attributable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Metadata/Basic.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Metadata/Dynamic.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Metadata/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Metadata/Tool.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/DocblockManifestable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Interactable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Pretendable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Repository.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Provider/Signature.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Registry.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Registry/EnabledInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Registry/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/Registry/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Action/Create.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Action/Delete.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Manifest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Provider/Config.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Provider/Manifest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Provider/Phpinfo.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Framework/System/Provider/Version.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Directory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/File.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Repository.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/NotOverwritable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ActionMethod.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllerFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/DataDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Xml.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Resource.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Resource/Container.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Action.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Application.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Controller.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/DbAdapter.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/DbTable.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Form.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Manifest.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Model.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Module.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Profile.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Project.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/ProjectProvider.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/Test.php
 delete mode 100644 airtime_mvc/library/Zend/Tool/Project/Provider/View.php
 delete mode 100644 airtime_mvc/library/Zend/Translate.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Array.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Csv.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Gettext.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Ini.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Qt.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Tbx.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Tmx.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/Xliff.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Adapter/XmlTm.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Plural.php
 delete mode 100644 airtime_mvc/library/Zend/Translate/Translate.php
 delete mode 100644 airtime_mvc/library/Zend/Uri.php
 delete mode 100644 airtime_mvc/library/Zend/Uri/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Uri/Http.php
 delete mode 100644 airtime_mvc/library/Zend/Validate.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Alnum.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Alpha.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/AdapterAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/AdapterInterface.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code25.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code25interleaved.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code39.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code39ext.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code93.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Code93ext.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean12.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean13.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean14.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean18.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean2.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean5.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Ean8.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Gtin12.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Gtin13.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Gtin14.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Identcode.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Intelligentmail.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Issn.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Itf14.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Leitcode.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Planet.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Postnet.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Royalmail.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Sscc.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Upca.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Barcode/Upce.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Between.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Callback.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Ccnum.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/CreditCard.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Date.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Db/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Db/NoRecordExists.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Db/RecordExists.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Digits.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/EmailAddress.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Count.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Crc32.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/ExcludeExtension.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/ExcludeMimeType.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Exists.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Extension.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/FilesSize.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Hash.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/ImageSize.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/IsCompressed.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/IsImage.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Md5.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/MimeType.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/NotExists.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Sha1.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Size.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/Upload.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/File/WordCount.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Float.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/GreaterThan.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hex.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hostname.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hostname/Biz.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hostname/Cn.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hostname/Com.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Hostname/Jp.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Iban.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Identical.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/InArray.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Int.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Ip.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Isbn.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/LessThan.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/NotEmpty.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/PostCode.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Regex.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Sitemap/Changefreq.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Sitemap/Lastmod.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Sitemap/Loc.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/Sitemap/Priority.php
 delete mode 100644 airtime_mvc/library/Zend/Validate/StringLength.php
 delete mode 100644 airtime_mvc/library/Zend/Version.php
 delete mode 100644 airtime_mvc/library/Zend/View.php
 delete mode 100644 airtime_mvc/library/Zend/View/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/View/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Action.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/BaseUrl.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Currency.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Cycle.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/DeclareVars.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Doctype.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Fieldset.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Form.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormButton.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormCheckbox.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormElement.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormErrors.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormFile.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormHidden.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormImage.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormLabel.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormMultiCheckbox.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormNote.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormPassword.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormRadio.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormReset.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormSelect.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormSubmit.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormText.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/FormTextarea.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HeadLink.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HeadMeta.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HeadScript.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HeadStyle.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HeadTitle.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlElement.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlFlash.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlList.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlObject.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlPage.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/HtmlQuicktime.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/InlineScript.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Json.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Layout.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/Breadcrumbs.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/Helper.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/HelperAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/Links.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/Menu.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Navigation/Sitemap.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/PaginationControl.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Partial.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Partial/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/PartialLoop.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Container.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Abstract.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Standalone.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Registry.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Placeholder/Registry/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/RenderToPlaceholder.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/ServerUrl.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Translate.php
 delete mode 100644 airtime_mvc/library/Zend/View/Helper/Url.php
 delete mode 100644 airtime_mvc/library/Zend/View/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/View/Stream.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Channel/HttpHeaders.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Channel/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/Message.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Plugin/Interface.php
 delete mode 100644 airtime_mvc/library/Zend/Wildfire/Protocol/JsonStream.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/FaultException.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/HttpException.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/IntrospectException.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/ServerIntrospection.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Client/ServerProxy.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Fault.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Generator/DomDocument.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Generator/XmlWriter.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Request.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Request/Http.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Request/Stdin.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Response.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Response/Http.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Server.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Server/Cache.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Server/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Server/Fault.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Server/System.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Array.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Base64.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/BigInteger.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Boolean.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Collection.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/DateTime.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Double.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Exception.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Integer.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Nil.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Scalar.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/String.php
 delete mode 100644 airtime_mvc/library/Zend/XmlRpc/Value/Struct.php

diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index 17c79db9b..dc3e03a2b 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -17,8 +17,7 @@ $CC_CONFIG = array(
     'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
-    "rootDir" => __DIR__."/../..",
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
+    "rootDir" => __DIR__."/../.."
 );
 
 
@@ -49,12 +48,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id';
 $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id';
 $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
-// Add libs to the PHP path
-$old_include_path = get_include_path();
-set_include_path('.'
-                .PATH_SEPARATOR.$CC_CONFIG['zendPath']
-                .PATH_SEPARATOR.$old_include_path);
-
 class Config {
     public static function loadConfig($p_path) {
         global $CC_CONFIG;
diff --git a/airtime_mvc/library/Zend/Acl.php b/airtime_mvc/library/Zend/Acl.php
deleted file mode 100644
index 3a0b8b313..000000000
--- a/airtime_mvc/library/Zend/Acl.php
+++ /dev/null
@@ -1,1164 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Acl.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl_Resource_Interface
- */
-require_once 'Zend/Acl/Resource/Interface.php';
-
-
-/**
- * @see Zend_Acl_Role_Registry
- */
-require_once 'Zend/Acl/Role/Registry.php';
-
-
-/**
- * @see Zend_Acl_Assert_Interface
- */
-require_once 'Zend/Acl/Assert/Interface.php';
-
-
-/**
- * @see Zend_Acl_Role
- */
-require_once 'Zend/Acl/Role.php';
-
-
-/**
- * @see Zend_Acl_Resource
- */
-require_once 'Zend/Acl/Resource.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl
-{
-    /**
-     * Rule type: allow
-     */
-    const TYPE_ALLOW = 'TYPE_ALLOW';
-
-    /**
-     * Rule type: deny
-     */
-    const TYPE_DENY  = 'TYPE_DENY';
-
-    /**
-     * Rule operation: add
-     */
-    const OP_ADD = 'OP_ADD';
-
-    /**
-     * Rule operation: remove
-     */
-    const OP_REMOVE = 'OP_REMOVE';
-
-    /**
-     * Role registry
-     *
-     * @var Zend_Acl_Role_Registry
-     */
-    protected $_roleRegistry = null;
-
-    /**
-     * Resource tree
-     *
-     * @var array
-     */
-    protected $_resources = array();
-
-    /**
-     * @var Zend_Acl_Role_Interface
-     */
-    protected $_isAllowedRole     = null;
-
-    /**
-     * @var Zend_Acl_Resource_Interface
-     */
-    protected $_isAllowedResource = null;
-
-    /**
-     * @var String
-     */
-    protected $_isAllowedPrivilege = null;
-
-    /**
-     * ACL rules; whitelist (deny everything to all) by default
-     *
-     * @var array
-     */
-    protected $_rules = array(
-        'allResources' => array(
-            'allRoles' => array(
-                'allPrivileges' => array(
-                    'type'   => self::TYPE_DENY,
-                    'assert' => null
-                    ),
-                'byPrivilegeId' => array()
-                ),
-            'byRoleId' => array()
-            ),
-        'byResourceId' => array()
-        );
-
-    /**
-     * Adds a Role having an identifier unique to the registry
-     *
-     * The $parents parameter may be a reference to, or the string identifier for,
-     * a Role existing in the registry, or $parents may be passed as an array of
-     * these - mixing string identifiers and objects is ok - to indicate the Roles
-     * from which the newly added Role will directly inherit.
-     *
-     * In order to resolve potential ambiguities with conflicting rules inherited
-     * from different parents, the most recently added parent takes precedence over
-     * parents that were previously added. In other words, the first parent added
-     * will have the least priority, and the last parent added will have the
-     * highest priority.
-     *
-     * @param  Zend_Acl_Role_Interface              $role
-     * @param  Zend_Acl_Role_Interface|string|array $parents
-     * @uses   Zend_Acl_Role_Registry::add()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function addRole($role, $parents = null)
-    {
-        if (is_string($role)) {
-            $role = new Zend_Acl_Role($role);
-        }
-
-        if (!$role instanceof Zend_Acl_Role_Interface) {
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface');
-        }
-
-
-        $this->_getRoleRegistry()->add($role, $parents);
-
-        return $this;
-    }
-
-    /**
-     * Returns the identified Role
-     *
-     * The $role parameter can either be a Role or Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @uses   Zend_Acl_Role_Registry::get()
-     * @return Zend_Acl_Role_Interface
-     */
-    public function getRole($role)
-    {
-        return $this->_getRoleRegistry()->get($role);
-    }
-
-    /**
-     * Returns true if and only if the Role exists in the registry
-     *
-     * The $role parameter can either be a Role or a Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @uses   Zend_Acl_Role_Registry::has()
-     * @return boolean
-     */
-    public function hasRole($role)
-    {
-        return $this->_getRoleRegistry()->has($role);
-    }
-
-    /**
-     * Returns true if and only if $role inherits from $inherit
-     *
-     * Both parameters may be either a Role or a Role identifier. If
-     * $onlyParents is true, then $role must inherit directly from
-     * $inherit in order to return true. By default, this method looks
-     * through the entire inheritance DAG to determine whether $role
-     * inherits from $inherit through its ancestor Roles.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @param  Zend_Acl_Role_Interface|string $inherit
-     * @param  boolean                        $onlyParents
-     * @uses   Zend_Acl_Role_Registry::inherits()
-     * @return boolean
-     */
-    public function inheritsRole($role, $inherit, $onlyParents = false)
-    {
-        return $this->_getRoleRegistry()->inherits($role, $inherit, $onlyParents);
-    }
-
-    /**
-     * Removes the Role from the registry
-     *
-     * The $role parameter can either be a Role or a Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @uses   Zend_Acl_Role_Registry::remove()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function removeRole($role)
-    {
-        $this->_getRoleRegistry()->remove($role);
-
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = $role;
-        }
-
-        foreach ($this->_rules['allResources']['byRoleId'] as $roleIdCurrent => $rules) {
-            if ($roleId === $roleIdCurrent) {
-                unset($this->_rules['allResources']['byRoleId'][$roleIdCurrent]);
-            }
-        }
-        foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $visitor) {
-            if (array_key_exists('byRoleId', $visitor)) {
-                foreach ($visitor['byRoleId'] as $roleIdCurrent => $rules) {
-                    if ($roleId === $roleIdCurrent) {
-                        unset($this->_rules['byResourceId'][$resourceIdCurrent]['byRoleId'][$roleIdCurrent]);
-                    }
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Removes all Roles from the registry
-     *
-     * @uses   Zend_Acl_Role_Registry::removeAll()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function removeRoleAll()
-    {
-        $this->_getRoleRegistry()->removeAll();
-
-        foreach ($this->_rules['allResources']['byRoleId'] as $roleIdCurrent => $rules) {
-            unset($this->_rules['allResources']['byRoleId'][$roleIdCurrent]);
-        }
-        foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $visitor) {
-            foreach ($visitor['byRoleId'] as $roleIdCurrent => $rules) {
-                unset($this->_rules['byResourceId'][$resourceIdCurrent]['byRoleId'][$roleIdCurrent]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a Resource having an identifier unique to the ACL
-     *
-     * The $parent parameter may be a reference to, or the string identifier for,
-     * the existing Resource from which the newly added Resource will inherit.
-     *
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @param  Zend_Acl_Resource_Interface|string $parent
-     * @throws Zend_Acl_Exception
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function addResource($resource, $parent = null)
-    {
-        if (is_string($resource)) {
-            $resource = new Zend_Acl_Resource($resource);
-        }
-
-        if (!$resource instanceof Zend_Acl_Resource_Interface) {
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface');
-        }
-
-        $resourceId = $resource->getResourceId();
-
-        if ($this->has($resourceId)) {
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL");
-        }
-
-        $resourceParent = null;
-
-        if (null !== $parent) {
-            try {
-                if ($parent instanceof Zend_Acl_Resource_Interface) {
-                    $resourceParentId = $parent->getResourceId();
-                } else {
-                    $resourceParentId = $parent;
-                }
-                $resourceParent = $this->get($resourceParentId);
-            } catch (Zend_Acl_Exception $e) {
-                throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e);
-            }
-            $this->_resources[$resourceParentId]['children'][$resourceId] = $resource;
-        }
-
-        $this->_resources[$resourceId] = array(
-            'instance' => $resource,
-            'parent'   => $resourceParent,
-            'children' => array()
-            );
-
-        return $this;
-    }
-
-    /**
-     * Adds a Resource having an identifier unique to the ACL
-     *
-     * The $parent parameter may be a reference to, or the string identifier for,
-     * the existing Resource from which the newly added Resource will inherit.
-     *
-     * @deprecated in version 1.9.1 and will be available till 2.0.  New code
-     *             should use addResource() instead.
-     *
-     * @param  Zend_Acl_Resource_Interface        $resource
-     * @param  Zend_Acl_Resource_Interface|string $parent
-     * @throws Zend_Acl_Exception
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function add(Zend_Acl_Resource_Interface $resource, $parent = null)
-    {
-        return $this->addResource($resource, $parent);
-    }
-
-    /**
-     * Returns the identified Resource
-     *
-     * The $resource parameter can either be a Resource or a Resource identifier.
-     *
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @throws Zend_Acl_Exception
-     * @return Zend_Acl_Resource_Interface
-     */
-    public function get($resource)
-    {
-        if ($resource instanceof Zend_Acl_Resource_Interface) {
-            $resourceId = $resource->getResourceId();
-        } else {
-            $resourceId = (string) $resource;
-        }
-
-        if (!$this->has($resource)) {
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception("Resource '$resourceId' not found");
-        }
-
-        return $this->_resources[$resourceId]['instance'];
-    }
-
-    /**
-     * Returns true if and only if the Resource exists in the ACL
-     *
-     * The $resource parameter can either be a Resource or a Resource identifier.
-     *
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @return boolean
-     */
-    public function has($resource)
-    {
-        if ($resource instanceof Zend_Acl_Resource_Interface) {
-            $resourceId = $resource->getResourceId();
-        } else {
-            $resourceId = (string) $resource;
-        }
-
-        return isset($this->_resources[$resourceId]);
-    }
-
-    /**
-     * Returns true if and only if $resource inherits from $inherit
-     *
-     * Both parameters may be either a Resource or a Resource identifier. If
-     * $onlyParent is true, then $resource must inherit directly from
-     * $inherit in order to return true. By default, this method looks
-     * through the entire inheritance tree to determine whether $resource
-     * inherits from $inherit through its ancestor Resources.
-     *
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @param  Zend_Acl_Resource_Interface|string $inherit
-     * @param  boolean                            $onlyParent
-     * @throws Zend_Acl_Resource_Registry_Exception
-     * @return boolean
-     */
-    public function inherits($resource, $inherit, $onlyParent = false)
-    {
-        try {
-            $resourceId     = $this->get($resource)->getResourceId();
-            $inheritId = $this->get($inherit)->getResourceId();
-        } catch (Zend_Acl_Exception $e) {
-            throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        if (null !== $this->_resources[$resourceId]['parent']) {
-            $parentId = $this->_resources[$resourceId]['parent']->getResourceId();
-            if ($inheritId === $parentId) {
-                return true;
-            } else if ($onlyParent) {
-                return false;
-            }
-        } else {
-            return false;
-        }
-
-        while (null !== $this->_resources[$parentId]['parent']) {
-            $parentId = $this->_resources[$parentId]['parent']->getResourceId();
-            if ($inheritId === $parentId) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes a Resource and all of its children
-     *
-     * The $resource parameter can either be a Resource or a Resource identifier.
-     *
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @throws Zend_Acl_Exception
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function remove($resource)
-    {
-        try {
-            $resourceId = $this->get($resource)->getResourceId();
-        } catch (Zend_Acl_Exception $e) {
-            throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $resourcesRemoved = array($resourceId);
-        if (null !== ($resourceParent = $this->_resources[$resourceId]['parent'])) {
-            unset($this->_resources[$resourceParent->getResourceId()]['children'][$resourceId]);
-        }
-        foreach ($this->_resources[$resourceId]['children'] as $childId => $child) {
-            $this->remove($childId);
-            $resourcesRemoved[] = $childId;
-        }
-
-        foreach ($resourcesRemoved as $resourceIdRemoved) {
-            foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $rules) {
-                if ($resourceIdRemoved === $resourceIdCurrent) {
-                    unset($this->_rules['byResourceId'][$resourceIdCurrent]);
-                }
-            }
-        }
-
-        unset($this->_resources[$resourceId]);
-
-        return $this;
-    }
-
-    /**
-     * Removes all Resources
-     *
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function removeAll()
-    {
-        foreach ($this->_resources as $resourceId => $resource) {
-            foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $rules) {
-                if ($resourceId === $resourceIdCurrent) {
-                    unset($this->_rules['byResourceId'][$resourceIdCurrent]);
-                }
-            }
-        }
-
-        $this->_resources = array();
-
-        return $this;
-    }
-
-    /**
-     * Adds an "allow" rule to the ACL
-     *
-     * @param  Zend_Acl_Role_Interface|string|array     $roles
-     * @param  Zend_Acl_Resource_Interface|string|array $resources
-     * @param  string|array                             $privileges
-     * @param  Zend_Acl_Assert_Interface                $assert
-     * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function allow($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
-    {
-        return $this->setRule(self::OP_ADD, self::TYPE_ALLOW, $roles, $resources, $privileges, $assert);
-    }
-
-    /**
-     * Adds a "deny" rule to the ACL
-     *
-     * @param  Zend_Acl_Role_Interface|string|array     $roles
-     * @param  Zend_Acl_Resource_Interface|string|array $resources
-     * @param  string|array                             $privileges
-     * @param  Zend_Acl_Assert_Interface                $assert
-     * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function deny($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
-    {
-        return $this->setRule(self::OP_ADD, self::TYPE_DENY, $roles, $resources, $privileges, $assert);
-    }
-
-    /**
-     * Removes "allow" permissions from the ACL
-     *
-     * @param  Zend_Acl_Role_Interface|string|array     $roles
-     * @param  Zend_Acl_Resource_Interface|string|array $resources
-     * @param  string|array                             $privileges
-     * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function removeAllow($roles = null, $resources = null, $privileges = null)
-    {
-        return $this->setRule(self::OP_REMOVE, self::TYPE_ALLOW, $roles, $resources, $privileges);
-    }
-
-    /**
-     * Removes "deny" restrictions from the ACL
-     *
-     * @param  Zend_Acl_Role_Interface|string|array     $roles
-     * @param  Zend_Acl_Resource_Interface|string|array $resources
-     * @param  string|array                             $privileges
-     * @uses   Zend_Acl::setRule()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function removeDeny($roles = null, $resources = null, $privileges = null)
-    {
-        return $this->setRule(self::OP_REMOVE, self::TYPE_DENY, $roles, $resources, $privileges);
-    }
-
-    /**
-     * Performs operations on ACL rules
-     *
-     * The $operation parameter may be either OP_ADD or OP_REMOVE, depending on whether the
-     * user wants to add or remove a rule, respectively:
-     *
-     * OP_ADD specifics:
-     *
-     *      A rule is added that would allow one or more Roles access to [certain $privileges
-     *      upon] the specified Resource(s).
-     *
-     * OP_REMOVE specifics:
-     *
-     *      The rule is removed only in the context of the given Roles, Resources, and privileges.
-     *      Existing rules to which the remove operation does not apply would remain in the
-     *      ACL.
-     *
-     * The $type parameter may be either TYPE_ALLOW or TYPE_DENY, depending on whether the
-     * rule is intended to allow or deny permission, respectively.
-     *
-     * The $roles and $resources parameters may be references to, or the string identifiers for,
-     * existing Resources/Roles, or they may be passed as arrays of these - mixing string identifiers
-     * and objects is ok - to indicate the Resources and Roles to which the rule applies. If either
-     * $roles or $resources is null, then the rule applies to all Roles or all Resources, respectively.
-     * Both may be null in order to work with the default rule of the ACL.
-     *
-     * The $privileges parameter may be used to further specify that the rule applies only
-     * to certain privileges upon the Resource(s) in question. This may be specified to be a single
-     * privilege with a string, and multiple privileges may be specified as an array of strings.
-     *
-     * If $assert is provided, then its assert() method must return true in order for
-     * the rule to apply. If $assert is provided with $roles, $resources, and $privileges all
-     * equal to null, then a rule having a type of:
-     *
-     *      TYPE_ALLOW will imply a type of TYPE_DENY, and
-     *
-     *      TYPE_DENY will imply a type of TYPE_ALLOW
-     *
-     * when the rule's assertion fails. This is because the ACL needs to provide expected
-     * behavior when an assertion upon the default ACL rule fails.
-     *
-     * @param  string                                   $operation
-     * @param  string                                   $type
-     * @param  Zend_Acl_Role_Interface|string|array     $roles
-     * @param  Zend_Acl_Resource_Interface|string|array $resources
-     * @param  string|array                             $privileges
-     * @param  Zend_Acl_Assert_Interface                $assert
-     * @throws Zend_Acl_Exception
-     * @uses   Zend_Acl_Role_Registry::get()
-     * @uses   Zend_Acl::get()
-     * @return Zend_Acl Provides a fluent interface
-     */
-    public function setRule($operation, $type, $roles = null, $resources = null, $privileges = null,
-                            Zend_Acl_Assert_Interface $assert = null)
-    {
-        // ensure that the rule type is valid; normalize input to uppercase
-        $type = strtoupper($type);
-        if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) {
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '"
-                                       . self::TYPE_DENY . "'");
-        }
-
-        // ensure that all specified Roles exist; normalize input to array of Role objects or null
-        if (!is_array($roles)) {
-            $roles = array($roles);
-        } else if (0 === count($roles)) {
-            $roles = array(null);
-        }
-        $rolesTemp = $roles;
-        $roles = array();
-        foreach ($rolesTemp as $role) {
-            if (null !== $role) {
-                $roles[] = $this->_getRoleRegistry()->get($role);
-            } else {
-                $roles[] = null;
-            }
-        }
-        unset($rolesTemp);
-
-        // ensure that all specified Resources exist; normalize input to array of Resource objects or null
-        if (!is_array($resources)) {
-            $resources = array($resources);
-        } else if (0 === count($resources)) {
-            $resources = array(null);
-        }
-        $resourcesTemp = $resources;
-        $resources = array();
-        foreach ($resourcesTemp as $resource) {
-            if (null !== $resource) {
-                $resources[] = $this->get($resource);
-            } else {
-                $resources[] = null;
-            }
-        }
-        unset($resourcesTemp);
-
-        // normalize privileges to array
-        if (null === $privileges) {
-            $privileges = array();
-        } else if (!is_array($privileges)) {
-            $privileges = array($privileges);
-        }
-
-        switch ($operation) {
-
-            // add to the rules
-            case self::OP_ADD:
-                foreach ($resources as $resource) {
-                    foreach ($roles as $role) {
-                        $rules =& $this->_getRules($resource, $role, true);
-                        if (0 === count($privileges)) {
-                            $rules['allPrivileges']['type']   = $type;
-                            $rules['allPrivileges']['assert'] = $assert;
-                            if (!isset($rules['byPrivilegeId'])) {
-                                $rules['byPrivilegeId'] = array();
-                            }
-                        } else {
-                            foreach ($privileges as $privilege) {
-                                $rules['byPrivilegeId'][$privilege]['type']   = $type;
-                                $rules['byPrivilegeId'][$privilege]['assert'] = $assert;
-                            }
-                        }
-                    }
-                }
-                break;
-
-            // remove from the rules
-            case self::OP_REMOVE:
-                foreach ($resources as $resource) {
-                    foreach ($roles as $role) {
-                        $rules =& $this->_getRules($resource, $role);
-                        if (null === $rules) {
-                            continue;
-                        }
-                        if (0 === count($privileges)) {
-                            if (null === $resource && null === $role) {
-                                if ($type === $rules['allPrivileges']['type']) {
-                                    $rules = array(
-                                        'allPrivileges' => array(
-                                            'type'   => self::TYPE_DENY,
-                                            'assert' => null
-                                            ),
-                                        'byPrivilegeId' => array()
-                                        );
-                                }
-                                continue;
-                            }
-
-                            if (isset($rules['allPrivileges']['type']) &&
-                                $type === $rules['allPrivileges']['type'])
-                            {
-                                unset($rules['allPrivileges']);
-                            }
-                        } else {
-                            foreach ($privileges as $privilege) {
-                                if (isset($rules['byPrivilegeId'][$privilege]) &&
-                                    $type === $rules['byPrivilegeId'][$privilege]['type'])
-                                {
-                                    unset($rules['byPrivilegeId'][$privilege]);
-                                }
-                            }
-                        }
-                    }
-                }
-                break;
-
-            default:
-                require_once 'Zend/Acl/Exception.php';
-                throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '"
-                                           . self::OP_REMOVE . "'");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns true if and only if the Role has access to the Resource
-     *
-     * The $role and $resource parameters may be references to, or the string identifiers for,
-     * an existing Resource and Role combination.
-     *
-     * If either $role or $resource is null, then the query applies to all Roles or all Resources,
-     * respectively. Both may be null to query whether the ACL has a "blacklist" rule
-     * (allow everything to all). By default, Zend_Acl creates a "whitelist" rule (deny
-     * everything to all), and this method would return false unless this default has
-     * been overridden (i.e., by executing $acl->allow()).
-     *
-     * If a $privilege is not provided, then this method returns false if and only if the
-     * Role is denied access to at least one privilege upon the Resource. In other words, this
-     * method returns true if and only if the Role is allowed all privileges on the Resource.
-     *
-     * This method checks Role inheritance using a depth-first traversal of the Role registry.
-     * The highest priority parent (i.e., the parent most recently added) is checked first,
-     * and its respective parents are checked similarly before the lower-priority parents of
-     * the Role are checked.
-     *
-     * @param  Zend_Acl_Role_Interface|string     $role
-     * @param  Zend_Acl_Resource_Interface|string $resource
-     * @param  string                             $privilege
-     * @uses   Zend_Acl::get()
-     * @uses   Zend_Acl_Role_Registry::get()
-     * @return boolean
-     */
-    public function isAllowed($role = null, $resource = null, $privilege = null)
-    {
-        // reset role & resource to null
-        $this->_isAllowedRole = null;
-        $this->_isAllowedResource = null;
-        $this->_isAllowedPrivilege = null;
-
-        if (null !== $role) {
-            // keep track of originally called role
-            $this->_isAllowedRole = $role;
-            $role = $this->_getRoleRegistry()->get($role);
-            if (!$this->_isAllowedRole instanceof Zend_Acl_Role_Interface) {
-                $this->_isAllowedRole = $role;
-            }
-        }
-
-        if (null !== $resource) {
-            // keep track of originally called resource
-            $this->_isAllowedResource = $resource;
-            $resource = $this->get($resource);
-            if (!$this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) {
-                $this->_isAllowedResource = $resource;
-            }
-        }
-
-        if (null === $privilege) {
-            // query on all privileges
-            do {
-                // depth-first search on $role if it is not 'allRoles' pseudo-parent
-                if (null !== $role && null !== ($result = $this->_roleDFSAllPrivileges($role, $resource, $privilege))) {
-                    return $result;
-                }
-
-                // look for rule on 'allRoles' psuedo-parent
-                if (null !== ($rules = $this->_getRules($resource, null))) {
-                    foreach ($rules['byPrivilegeId'] as $privilege => $rule) {
-                        if (self::TYPE_DENY === ($ruleTypeOnePrivilege = $this->_getRuleType($resource, null, $privilege))) {
-                            return false;
-                        }
-                    }
-                    if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
-                        return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
-                    }
-                }
-
-                // try next Resource
-                $resource = $this->_resources[$resource->getResourceId()]['parent'];
-
-            } while (true); // loop terminates at 'allResources' pseudo-parent
-        } else {
-            $this->_isAllowedPrivilege = $privilege;
-            // query on one privilege
-            do {
-                // depth-first search on $role if it is not 'allRoles' pseudo-parent
-                if (null !== $role && null !== ($result = $this->_roleDFSOnePrivilege($role, $resource, $privilege))) {
-                    return $result;
-                }
-
-                // look for rule on 'allRoles' pseudo-parent
-                if (null !== ($ruleType = $this->_getRuleType($resource, null, $privilege))) {
-                    return self::TYPE_ALLOW === $ruleType;
-                } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
-                    return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
-                }
-
-                // try next Resource
-                $resource = $this->_resources[$resource->getResourceId()]['parent'];
-
-            } while (true); // loop terminates at 'allResources' pseudo-parent
-        }
-    }
-
-    /**
-     * Returns the Role registry for this ACL
-     *
-     * If no Role registry has been created yet, a new default Role registry
-     * is created and returned.
-     *
-     * @return Zend_Acl_Role_Registry
-     */
-    protected function _getRoleRegistry()
-    {
-        if (null === $this->_roleRegistry) {
-            $this->_roleRegistry = new Zend_Acl_Role_Registry();
-        }
-        return $this->_roleRegistry;
-    }
-
-    /**
-     * Performs a depth-first search of the Role DAG, starting at $role, in order to find a rule
-     * allowing/denying $role access to all privileges upon $resource
-     *
-     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
-     * then this method returns false. If no applicable rule is found, then this method returns null.
-     *
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @return boolean|null
-     */
-    protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null)
-    {
-        $dfs = array(
-            'visited' => array(),
-            'stack'   => array()
-            );
-
-        if (null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
-            return $result;
-        }
-
-        while (null !== ($role = array_pop($dfs['stack']))) {
-            if (!isset($dfs['visited'][$role->getRoleId()])) {
-                if (null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
-                    return $result;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Visits an $role in order to look for a rule allowing/denying $role access to all privileges upon $resource
-     *
-     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
-     * then this method returns false. If no applicable rule is found, then this method returns null.
-     *
-     * This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
-     *
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  array                  $dfs
-     * @return boolean|null
-     * @throws Zend_Acl_Exception
-     */
-    protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
-                                                 &$dfs = null)
-    {
-        if (null === $dfs) {
-            /**
-             * @see Zend_Acl_Exception
-             */
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('$dfs parameter may not be null');
-        }
-
-        if (null !== ($rules = $this->_getRules($resource, $role))) {
-            foreach ($rules['byPrivilegeId'] as $privilege => $rule) {
-                if (self::TYPE_DENY === ($ruleTypeOnePrivilege = $this->_getRuleType($resource, $role, $privilege))) {
-                    return false;
-                }
-            }
-            if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
-                return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
-            }
-        }
-
-        $dfs['visited'][$role->getRoleId()] = true;
-        foreach ($this->_getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
-            $dfs['stack'][] = $roleParent;
-        }
-
-        return null;
-    }
-
-    /**
-     * Performs a depth-first search of the Role DAG, starting at $role, in order to find a rule
-     * allowing/denying $role access to a $privilege upon $resource
-     *
-     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
-     * then this method returns false. If no applicable rule is found, then this method returns null.
-     *
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  string                      $privilege
-     * @return boolean|null
-     * @throws Zend_Acl_Exception
-     */
-    protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
-                                            $privilege = null)
-    {
-        if (null === $privilege) {
-            /**
-             * @see Zend_Acl_Exception
-             */
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('$privilege parameter may not be null');
-        }
-
-        $dfs = array(
-            'visited' => array(),
-            'stack'   => array()
-            );
-
-        if (null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
-            return $result;
-        }
-
-        while (null !== ($role = array_pop($dfs['stack']))) {
-            if (!isset($dfs['visited'][$role->getRoleId()])) {
-                if (null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
-                    return $result;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Visits an $role in order to look for a rule allowing/denying $role access to a $privilege upon $resource
-     *
-     * This method returns true if a rule is found and allows access. If a rule exists and denies access,
-     * then this method returns false. If no applicable rule is found, then this method returns null.
-     *
-     * This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
-     *
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  string                      $privilege
-     * @param  array                       $dfs
-     * @return boolean|null
-     * @throws Zend_Acl_Exception
-     */
-    protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
-                                                $privilege = null, &$dfs = null)
-    {
-        if (null === $privilege) {
-            /**
-             * @see Zend_Acl_Exception
-             */
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('$privilege parameter may not be null');
-        }
-
-        if (null === $dfs) {
-            /**
-             * @see Zend_Acl_Exception
-             */
-            require_once 'Zend/Acl/Exception.php';
-            throw new Zend_Acl_Exception('$dfs parameter may not be null');
-        }
-
-        if (null !== ($ruleTypeOnePrivilege = $this->_getRuleType($resource, $role, $privilege))) {
-            return self::TYPE_ALLOW === $ruleTypeOnePrivilege;
-        } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
-            return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
-        }
-
-        $dfs['visited'][$role->getRoleId()] = true;
-        foreach ($this->_getRoleRegistry()->getParents($role) as $roleParentId => $roleParent) {
-            $dfs['stack'][] = $roleParent;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the rule type associated with the specified Resource, Role, and privilege
-     * combination.
-     *
-     * If a rule does not exist or its attached assertion fails, which means that
-     * the rule is not applicable, then this method returns null. Otherwise, the
-     * rule type applies and is returned as either TYPE_ALLOW or TYPE_DENY.
-     *
-     * If $resource or $role is null, then this means that the rule must apply to
-     * all Resources or Roles, respectively.
-     *
-     * If $privilege is null, then the rule must apply to all privileges.
-     *
-     * If all three parameters are null, then the default ACL rule type is returned,
-     * based on whether its assertion method passes.
-     *
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  string                      $privilege
-     * @return string|null
-     */
-    protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
-                                    $privilege = null)
-    {
-        // get the rules for the $resource and $role
-        if (null === ($rules = $this->_getRules($resource, $role))) {
-            return null;
-        }
-
-        // follow $privilege
-        if (null === $privilege) {
-            if (isset($rules['allPrivileges'])) {
-                $rule = $rules['allPrivileges'];
-            } else {
-                return null;
-            }
-        } else if (!isset($rules['byPrivilegeId'][$privilege])) {
-            return null;
-        } else {
-            $rule = $rules['byPrivilegeId'][$privilege];
-        }
-
-        // check assertion first
-        if ($rule['assert']) {
-            $assertion = $rule['assert'];
-            $assertionValue = $assertion->assert(
-                $this,
-                ($this->_isAllowedRole instanceof Zend_Acl_Role_Interface) ? $this->_isAllowedRole : $role,
-                ($this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) ? $this->_isAllowedResource : $resource,
-                $this->_isAllowedPrivilege
-                );
-        }
-
-        if (null === $rule['assert'] || $assertionValue) {
-            return $rule['type'];
-        } else if (null !== $resource || null !== $role || null !== $privilege) {
-            return null;
-        } else if (self::TYPE_ALLOW === $rule['type']) {
-            return self::TYPE_DENY;
-        } else {
-            return self::TYPE_ALLOW;
-        }
-    }
-
-    /**
-     * Returns the rules associated with a Resource and a Role, or null if no such rules exist
-     *
-     * If either $resource or $role is null, this means that the rules returned are for all Resources or all Roles,
-     * respectively. Both can be null to return the default rule set for all Resources and all Roles.
-     *
-     * If the $create parameter is true, then a rule set is first created and then returned to the caller.
-     *
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  boolean                     $create
-     * @return array|null
-     */
-    protected function &_getRules(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
-                                  $create = false)
-    {
-        // create a reference to null
-        $null = null;
-        $nullRef =& $null;
-
-        // follow $resource
-        do {
-            if (null === $resource) {
-                $visitor =& $this->_rules['allResources'];
-                break;
-            }
-            $resourceId = $resource->getResourceId();
-            if (!isset($this->_rules['byResourceId'][$resourceId])) {
-                if (!$create) {
-                    return $nullRef;
-                }
-                $this->_rules['byResourceId'][$resourceId] = array();
-            }
-            $visitor =& $this->_rules['byResourceId'][$resourceId];
-        } while (false);
-
-
-        // follow $role
-        if (null === $role) {
-            if (!isset($visitor['allRoles'])) {
-                if (!$create) {
-                    return $nullRef;
-                }
-                $visitor['allRoles']['byPrivilegeId'] = array();
-            }
-            return $visitor['allRoles'];
-        }
-        $roleId = $role->getRoleId();
-        if (!isset($visitor['byRoleId'][$roleId])) {
-            if (!$create) {
-                return $nullRef;
-            }
-            $visitor['byRoleId'][$roleId]['byPrivilegeId'] = array();
-        }
-        return $visitor['byRoleId'][$roleId];
-    }
-
-
-    /**
-     * @return array of registered roles (Deprecated)
-     * @deprecated Deprecated since version 1.10 (December 2009)
-     */
-    public function getRegisteredRoles()
-    {
-        trigger_error('The method getRegisteredRoles() was deprecated as of '
-                    . 'version 1.0, and may be removed. You\'re encouraged '
-                    . 'to use getRoles() instead.');
-
-        return $this->_getRoleRegistry()->getRoles();
-    }
-
-    /**
-     * @return array of registered roles
-     */
-    public function getRoles()
-    {
-        return array_keys($this->_getRoleRegistry()->getRoles());
-    }
-
-    /**
-     * @return array of registered resources
-     */
-    public function getResources()
-    {
-        return array_keys($this->_resources);
-    }
-    
-}
-    
diff --git a/airtime_mvc/library/Zend/Acl/Assert/Interface.php b/airtime_mvc/library/Zend/Acl/Assert/Interface.php
deleted file mode 100644
index e456798cd..000000000
--- a/airtime_mvc/library/Zend/Acl/Assert/Interface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl
- */
-require_once 'Zend/Acl.php';
-
-
-/**
- * @see Zend_Acl_Role_Interface
- */
-require_once 'Zend/Acl/Role/Interface.php';
-
-
-/**
- * @see Zend_Acl_Resource_Interface
- */
-require_once 'Zend/Acl/Resource/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Acl_Assert_Interface
-{
-    /**
-     * Returns true if and only if the assertion conditions are met
-     *
-     * This method is passed the ACL, Role, Resource, and privilege to which the authorization query applies. If the
-     * $role, $resource, or $privilege parameters are null, it means that the query applies to all Roles, Resources, or
-     * privileges, respectively.
-     *
-     * @param  Zend_Acl                    $acl
-     * @param  Zend_Acl_Role_Interface     $role
-     * @param  Zend_Acl_Resource_Interface $resource
-     * @param  string                      $privilege
-     * @return boolean
-     */
-    public function assert(Zend_Acl $acl, Zend_Acl_Role_Interface $role = null, Zend_Acl_Resource_Interface $resource = null,
-                           $privilege = null);
-}
diff --git a/airtime_mvc/library/Zend/Acl/Exception.php b/airtime_mvc/library/Zend/Acl/Exception.php
deleted file mode 100644
index cb784af0e..000000000
--- a/airtime_mvc/library/Zend/Acl/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Acl/Resource.php b/airtime_mvc/library/Zend/Acl/Resource.php
deleted file mode 100644
index b11464232..000000000
--- a/airtime_mvc/library/Zend/Acl/Resource.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl_Resource_Interface
- */
-require_once 'Zend/Acl/Resource/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
-{
-    /**
-     * Unique id of Resource
-     *
-     * @var string
-     */
-    protected $_resourceId;
-
-    /**
-     * Sets the Resource identifier
-     *
-     * @param  string $resourceId
-     * @return void
-     */
-    public function __construct($resourceId)
-    {
-        $this->_resourceId = (string) $resourceId;
-    }
-
-    /**
-     * Defined by Zend_Acl_Resource_Interface; returns the Resource identifier
-     *
-     * @return string
-     */
-    public function getResourceId()
-    {
-        return $this->_resourceId;
-    }
-
-    /**
-     * Defined by Zend_Acl_Resource_Interface; returns the Resource identifier
-     * Proxies to getResourceId()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getResourceId();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Acl/Resource/Interface.php b/airtime_mvc/library/Zend/Acl/Resource/Interface.php
deleted file mode 100644
index 9720594d6..000000000
--- a/airtime_mvc/library/Zend/Acl/Resource/Interface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Acl_Resource_Interface
-{
-    /**
-     * Returns the string identifier of the Resource
-     *
-     * @return string
-     */
-    public function getResourceId();
-}
diff --git a/airtime_mvc/library/Zend/Acl/Role.php b/airtime_mvc/library/Zend/Acl/Role.php
deleted file mode 100644
index fbd99202f..000000000
--- a/airtime_mvc/library/Zend/Acl/Role.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Role.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl_Role_Interface
- */
-require_once 'Zend/Acl/Role/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl_Role implements Zend_Acl_Role_Interface
-{
-    /**
-     * Unique id of Role
-     *
-     * @var string
-     */
-    protected $_roleId;
-
-    /**
-     * Sets the Role identifier
-     *
-     * @param  string $id
-     * @return void
-     */
-    public function __construct($roleId)
-    {
-        $this->_roleId = (string) $roleId;
-    }
-
-    /**
-     * Defined by Zend_Acl_Role_Interface; returns the Role identifier
-     *
-     * @return string
-     */
-    public function getRoleId()
-    {
-        return $this->_roleId;
-    }
-
-    /**
-     * Defined by Zend_Acl_Role_Interface; returns the Role identifier
-     * Proxies to getRoleId()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getRoleId();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Acl/Role/Interface.php b/airtime_mvc/library/Zend/Acl/Role/Interface.php
deleted file mode 100644
index 65d6d84ff..000000000
--- a/airtime_mvc/library/Zend/Acl/Role/Interface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Acl_Role_Interface
-{
-    /**
-     * Returns the string identifier of the Role
-     *
-     * @return string
-     */
-    public function getRoleId();
-}
diff --git a/airtime_mvc/library/Zend/Acl/Role/Registry.php b/airtime_mvc/library/Zend/Acl/Role/Registry.php
deleted file mode 100644
index 67c57f232..000000000
--- a/airtime_mvc/library/Zend/Acl/Role/Registry.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl_Role_Interface
- */
-require_once 'Zend/Acl/Role/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl_Role_Registry
-{
-    /**
-     * Internal Role registry data storage
-     *
-     * @var array
-     */
-    protected $_roles = array();
-
-    /**
-     * Adds a Role having an identifier unique to the registry
-     *
-     * The $parents parameter may be a reference to, or the string identifier for,
-     * a Role existing in the registry, or $parents may be passed as an array of
-     * these - mixing string identifiers and objects is ok - to indicate the Roles
-     * from which the newly added Role will directly inherit.
-     *
-     * In order to resolve potential ambiguities with conflicting rules inherited
-     * from different parents, the most recently added parent takes precedence over
-     * parents that were previously added. In other words, the first parent added
-     * will have the least priority, and the last parent added will have the
-     * highest priority.
-     *
-     * @param  Zend_Acl_Role_Interface              $role
-     * @param  Zend_Acl_Role_Interface|string|array $parents
-     * @throws Zend_Acl_Role_Registry_Exception
-     * @return Zend_Acl_Role_Registry Provides a fluent interface
-     */
-    public function add(Zend_Acl_Role_Interface $role, $parents = null)
-    {
-        $roleId = $role->getRoleId();
-
-        if ($this->has($roleId)) {
-            /**
-             * @see Zend_Acl_Role_Registry_Exception
-             */
-            require_once 'Zend/Acl/Role/Registry/Exception.php';
-            throw new Zend_Acl_Role_Registry_Exception("Role id '$roleId' already exists in the registry");
-        }
-
-        $roleParents = array();
-
-        if (null !== $parents) {
-            if (!is_array($parents)) {
-                $parents = array($parents);
-            }
-            /**
-             * @see Zend_Acl_Role_Registry_Exception
-             */
-            require_once 'Zend/Acl/Role/Registry/Exception.php';
-            foreach ($parents as $parent) {
-                try {
-                    if ($parent instanceof Zend_Acl_Role_Interface) {
-                        $roleParentId = $parent->getRoleId();
-                    } else {
-                        $roleParentId = $parent;
-                    }
-                    $roleParent = $this->get($roleParentId);
-                } catch (Zend_Acl_Role_Registry_Exception $e) {
-                    throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", 0, $e);
-                }
-                $roleParents[$roleParentId] = $roleParent;
-                $this->_roles[$roleParentId]['children'][$roleId] = $role;
-            }
-        }
-
-        $this->_roles[$roleId] = array(
-            'instance' => $role,
-            'parents'  => $roleParents,
-            'children' => array()
-            );
-
-        return $this;
-    }
-
-    /**
-     * Returns the identified Role
-     *
-     * The $role parameter can either be a Role or a Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @throws Zend_Acl_Role_Registry_Exception
-     * @return Zend_Acl_Role_Interface
-     */
-    public function get($role)
-    {
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = (string) $role;
-        }
-
-        if (!$this->has($role)) {
-            /**
-             * @see Zend_Acl_Role_Registry_Exception
-             */
-            require_once 'Zend/Acl/Role/Registry/Exception.php';
-            throw new Zend_Acl_Role_Registry_Exception("Role '$roleId' not found");
-        }
-
-        return $this->_roles[$roleId]['instance'];
-    }
-
-    /**
-     * Returns true if and only if the Role exists in the registry
-     *
-     * The $role parameter can either be a Role or a Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @return boolean
-     */
-    public function has($role)
-    {
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = (string) $role;
-        }
-
-        return isset($this->_roles[$roleId]);
-    }
-
-    /**
-     * Returns an array of an existing Role's parents
-     *
-     * The array keys are the identifiers of the parent Roles, and the values are
-     * the parent Role instances. The parent Roles are ordered in this array by
-     * ascending priority. The highest priority parent Role, last in the array,
-     * corresponds with the parent Role most recently added.
-     *
-     * If the Role does not have any parents, then an empty array is returned.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @uses   Zend_Acl_Role_Registry::get()
-     * @return array
-     */
-    public function getParents($role)
-    {
-        $roleId = $this->get($role)->getRoleId();
-
-        return $this->_roles[$roleId]['parents'];
-    }
-
-    /**
-     * Returns true if and only if $role inherits from $inherit
-     *
-     * Both parameters may be either a Role or a Role identifier. If
-     * $onlyParents is true, then $role must inherit directly from
-     * $inherit in order to return true. By default, this method looks
-     * through the entire inheritance DAG to determine whether $role
-     * inherits from $inherit through its ancestor Roles.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @param  Zend_Acl_Role_Interface|string $inherit
-     * @param  boolean                        $onlyParents
-     * @throws Zend_Acl_Role_Registry_Exception
-     * @return boolean
-     */
-    public function inherits($role, $inherit, $onlyParents = false)
-    {
-        /**
-         * @see Zend_Acl_Role_Registry_Exception
-         */
-        require_once 'Zend/Acl/Role/Registry/Exception.php';
-        try {
-            $roleId     = $this->get($role)->getRoleId();
-            $inheritId = $this->get($inherit)->getRoleId();
-        } catch (Zend_Acl_Role_Registry_Exception $e) {
-            throw new Zend_Acl_Role_Registry_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $inherits = isset($this->_roles[$roleId]['parents'][$inheritId]);
-
-        if ($inherits || $onlyParents) {
-            return $inherits;
-        }
-
-        foreach ($this->_roles[$roleId]['parents'] as $parentId => $parent) {
-            if ($this->inherits($parentId, $inheritId)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes the Role from the registry
-     *
-     * The $role parameter can either be a Role or a Role identifier.
-     *
-     * @param  Zend_Acl_Role_Interface|string $role
-     * @throws Zend_Acl_Role_Registry_Exception
-     * @return Zend_Acl_Role_Registry Provides a fluent interface
-     */
-    public function remove($role)
-    {
-        /**
-         * @see Zend_Acl_Role_Registry_Exception
-         */
-        require_once 'Zend/Acl/Role/Registry/Exception.php';
-        try {
-            $roleId = $this->get($role)->getRoleId();
-        } catch (Zend_Acl_Role_Registry_Exception $e) {
-            throw new Zend_Acl_Role_Registry_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        foreach ($this->_roles[$roleId]['children'] as $childId => $child) {
-            unset($this->_roles[$childId]['parents'][$roleId]);
-        }
-        foreach ($this->_roles[$roleId]['parents'] as $parentId => $parent) {
-            unset($this->_roles[$parentId]['children'][$roleId]);
-        }
-
-        unset($this->_roles[$roleId]);
-
-        return $this;
-    }
-
-    /**
-     * Removes all Roles from the registry
-     *
-     * @return Zend_Acl_Role_Registry Provides a fluent interface
-     */
-    public function removeAll()
-    {
-        $this->_roles = array();
-
-        return $this;
-    }
-
-    public function getRoles()
-    {
-        return $this->_roles;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Acl/Role/Registry/Exception.php b/airtime_mvc/library/Zend/Acl/Role/Registry/Exception.php
deleted file mode 100644
index c900fd301..000000000
--- a/airtime_mvc/library/Zend/Acl/Role/Registry/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Acl_Exception
- */
-require_once 'Zend/Acl/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Amf/Adobe/Auth.php b/airtime_mvc/library/Zend/Amf/Adobe/Auth.php
deleted file mode 100644
index 56669fd30..000000000
--- a/airtime_mvc/library/Zend/Amf/Adobe/Auth.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Auth_Abstract */
-require_once 'Zend/Amf/Auth/Abstract.php';
-
-/** @see Zend_Acl */
-require_once 'Zend/Acl.php';
-
-/** @see Zend_Auth_Result */
-require_once 'Zend/Auth/Result.php';
-
-/**
- * This class implements authentication against XML file with roles for Flex Builder.
- *
- * @package    Zend_Amf
- * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
-{
-
-    /**
-     * ACL for authorization
-     *
-     * @var Zend_Acl
-     */
-    protected $_acl;
-
-    /**
-     * Username/password array
-     *
-     * @var array
-     */
-    protected $_users = array();
-
-    /**
-     * Create auth adapter
-     *
-     * @param string $rolefile File containing XML with users and roles
-     */
-    public function __construct($rolefile)
-    {
-        $this->_acl = new Zend_Acl();
-        $xml = simplexml_load_file($rolefile);
-/*
-Roles file format:
- <roles>
-   <role id=�admin�>
-        <user name=�user1� password=�pwd�/>
-    </role>
-   <role id=�hr�>
-        <user name=�user2� password=�pwd2�/>
-    </role>
-</roles>
-*/
-        foreach($xml->role as $role) {
-            $this->_acl->addRole(new Zend_Acl_Role((string)$role["id"]));
-            foreach($role->user as $user) {
-                $this->_users[(string)$user["name"]] = array("password" => (string)$user["password"],
-                                                             "role" => (string)$role["id"]);
-            }
-        }
-    }
-
-    /**
-     * Get ACL with roles from XML file
-     *
-     * @return Zend_Acl
-     */
-    public function getAcl()
-    {
-        return $this->_acl;
-    }
-
-    /**
-     * Perform authentication
-     *
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result
-     * @see Zend_Auth_Adapter_Interface#authenticate()
-     */
-    public function authenticate()
-    {
-        if (empty($this->_username) ||
-            empty($this->_password)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('Username/password should be set');
-        }
-
-        if(!isset($this->_users[$this->_username])) {
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND,
-                null,
-                array('Username not found')
-                );
-        }
-
-        $user = $this->_users[$this->_username];
-        if($user["password"] != $this->_password) {
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID,
-                null,
-                array('Authentication failed')
-                );
-        }
-
-        $id = new stdClass();
-        $id->role = $user["role"];
-        $id->name = $this->_username;
-        return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $id);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Adobe/DbInspector.php b/airtime_mvc/library/Zend/Amf/Adobe/DbInspector.php
deleted file mode 100644
index 82c3c8d65..000000000
--- a/airtime_mvc/library/Zend/Amf/Adobe/DbInspector.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbInspector.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class implements authentication against XML file with roles for Flex Builder.
- *
- * @package    Zend_Amf
- * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Adobe_DbInspector
-{
-
-    /**
-     * Connect to the database
-     *
-     * @param string $dbType Database adapter type for Zend_Db
-     * @param array|object $dbDescription Adapter-specific connection settings
-     * @return Zend_Db_Adapter_Abstract
-     * @see Zend_Db::factory()
-     */
-    protected function _connect($dbType, $dbDescription)
-    {
-        if(is_object($dbDescription)) {
-            $dbDescription = get_object_vars($dbDescription);
-        }
-        return Zend_Db::factory($dbType, $dbDescription);
-    }
-
-    /**
-     * Describe database object.
-     *
-     * Usage example:
-     * $inspector->describeTable('Pdo_Mysql',
-     *     array(
-     *         'host'     => '127.0.0.1',
-     *         'username' => 'webuser',
-     *         'password' => 'xxxxxxxx',
-     *         'dbname'   => 'test'
-     *     ),
-     *     'mytable'
-     * );
-     *
-     * @param string $dbType Database adapter type for Zend_Db
-     * @param array|object $dbDescription Adapter-specific connection settings
-     * @param string $tableName Table name
-     * @return array Table description
-     * @see Zend_Db::describeTable()
-     * @see Zend_Db::factory()
-     */
-    public function describeTable($dbType, $dbDescription, $tableName)
-    {
-        $db = $this->_connect($dbType, $dbDescription);
-        return $db->describeTable($tableName);
-    }
-
-    /**
-     * Test database connection
-     *
-     * @param string $dbType Database adapter type for Zend_Db
-     * @param array|object $dbDescription Adapter-specific connection settings
-     * @return bool
-     * @see Zend_Db::factory()
-     */
-    public function connect($dbType, $dbDescription)
-    {
-        $db = $this->_connect($dbType, $dbDescription);
-        $db->listTables();
-        return true;
-    }
-
-    /**
-     * Get the list of database tables
-     *
-     * @param string $dbType Database adapter type for Zend_Db
-     * @param array|object $dbDescription Adapter-specific connection settings
-     * @return array List of the tables
-     */
-    public function getTables($dbType, $dbDescription)
-    {
-        $db = $this->_connect($dbType, $dbDescription);
-        return $db->listTables();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Adobe/Introspector.php b/airtime_mvc/library/Zend/Amf/Adobe/Introspector.php
deleted file mode 100644
index 0e0268970..000000000
--- a/airtime_mvc/library/Zend/Amf/Adobe/Introspector.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Introspector.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Parse_TypeLoader */
-require_once 'Zend/Amf/Parse/TypeLoader.php';
-
-/** @see Zend_Reflection_Class */
-require_once 'Zend/Reflection/Class.php';
-
-/** @see Zend_Server_Reflection */
-require_once 'Zend/Server/Reflection.php';
-
-/**
- * This class implements a service for generating AMF service descriptions as XML.
- *
- * @package    Zend_Amf
- * @subpackage Adobe
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Adobe_Introspector
-{
-    /**
-     * Options used:
-     * - server: instance of Zend_Amf_Server to use
-     * - directories: directories where class files may be looked up
-     *
-     * @var array Introspector options
-     */
-    protected $_options;
-
-    /**
-     * @var DOMElement DOM element to store types
-     */
-    protected $_types;
-
-    /**
-     * @var array Map of the known types
-     */
-    protected $_typesMap = array();
-
-    /**
-     * @var DOMDocument XML document to store data
-     */
-    protected $_xml;
-
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->_xml = new DOMDocument('1.0', 'utf-8');
-    }
-
-    /**
-     * Create XML definition on an AMF service class
-     *
-     * @param  string $serviceClass Service class name
-     * @param  array $options invocation options
-     * @return string XML with service class introspection
-     */
-    public function introspect($serviceClass, $options = array())
-    {
-        $this->_options = $options;
-
-        if (strpbrk($serviceClass, '\\/<>')) {
-            return $this->_returnError('Invalid service name');
-        }
-
-        // Transform com.foo.Bar into com_foo_Bar
-        $serviceClass = str_replace('.' , '_', $serviceClass);
-
-        // Introspect!
-        if (!class_exists($serviceClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($serviceClass, $this->_getServicePath());
-        }
-
-        $serv = $this->_xml->createElement('service-description');
-        $serv->setAttribute('xmlns', 'http://ns.adobe.com/flex/service-description/2008');
-
-        $this->_types = $this->_xml->createElement('types');
-        $this->_ops   = $this->_xml->createElement('operations');
-
-        $r = Zend_Server_Reflection::reflectClass($serviceClass);
-        $this->_addService($r, $this->_ops);
-
-        $serv->appendChild($this->_types);
-        $serv->appendChild($this->_ops);
-        $this->_xml->appendChild($serv);
-
-        return $this->_xml->saveXML();
-    }
-
-    /**
-     * Authentication handler
-     *
-     * @param  Zend_Acl $acl
-     * @return unknown_type
-     */
-    public function initAcl(Zend_Acl $acl)
-    {
-        return false; // we do not need auth for this class
-    }
-
-    /**
-     * Generate map of public class attributes
-     *
-     * @param  string $typename type name
-     * @param  DOMElement $typexml target XML element
-     * @return void
-     */
-    protected function _addClassAttributes($typename, DOMElement $typexml)
-    {
-        // Do not try to autoload here because _phpTypeToAS should
-        // have already attempted to load this class
-        if (!class_exists($typename, false)) {
-            return;
-        }
-
-        $rc = new Zend_Reflection_Class($typename);
-        foreach ($rc->getProperties() as $prop) {
-            if (!$prop->isPublic()) {
-                continue;
-            }
-
-            $propxml = $this->_xml->createElement('property');
-            $propxml->setAttribute('name', $prop->getName());
-
-            $type = $this->_registerType($this->_getPropertyType($prop));
-            $propxml->setAttribute('type', $type);
-
-            $typexml->appendChild($propxml);
-        }
-    }
-
-    /**
-     * Build XML service description from reflection class
-     *
-     * @param  Zend_Server_Reflection_Class $refclass
-     * @param  DOMElement $target target XML element
-     * @return void
-     */
-    protected function _addService(Zend_Server_Reflection_Class $refclass, DOMElement $target)
-    {
-        foreach ($refclass->getMethods() as $method) {
-            if (!$method->isPublic()
-                || $method->isConstructor()
-                || ('__' == substr($method->name, 0, 2))
-            ) {
-                continue;
-            }
-
-            foreach ($method->getPrototypes() as $proto) {
-                $op = $this->_xml->createElement('operation');
-                $op->setAttribute('name', $method->getName());
-
-                $rettype = $this->_registerType($proto->getReturnType());
-                $op->setAttribute('returnType', $rettype);
-
-                foreach ($proto->getParameters() as $param) {
-                    $arg = $this->_xml->createElement('argument');
-                    $arg->setAttribute('name', $param->getName());
-
-                    $type = $param->getType();
-                    if ($type == 'mixed' && ($pclass = $param->getClass())) {
-                        $type = $pclass->getName();
-                    }
-
-                    $ptype = $this->_registerType($type);
-                    $arg->setAttribute('type', $ptype);
-
-                    if($param->isDefaultValueAvailable()) {
-                        $arg->setAttribute('defaultvalue', $param->getDefaultValue());
-                    }
-
-                    $op->appendChild($arg);
-                }
-
-                $target->appendChild($op);
-            }
-        }
-    }
-
-    /**
-     * Extract type of the property from DocBlock
-     *
-     * @param  Zend_Reflection_Property $prop reflection property object
-     * @return string Property type
-     */
-    protected function _getPropertyType(Zend_Reflection_Property $prop)
-    {
-        $docBlock = $prop->getDocComment();
-
-        if (!$docBlock) {
-            return 'Unknown';
-        }
-
-        if (!$docBlock->hasTag('var')) {
-            return 'Unknown';
-        }
-
-        $tag = $docBlock->getTag('var');
-        return trim($tag->getDescription());
-    }
-
-    /**
-     * Get the array of service directories
-     *
-     * @return array Service class directories
-     */
-    protected function _getServicePath()
-    {
-        if (isset($this->_options['server'])) {
-            return $this->_options['server']->getDirectory();
-        }
-
-        if (isset($this->_options['directories'])) {
-            return $this->_options['directories'];
-        }
-
-        return array();
-    }
-
-    /**
-     * Map from PHP type name to AS type name
-     *
-     * @param  string $typename PHP type name
-     * @return string AS type name
-     */
-    protected function _phpTypeToAS($typename)
-    {
-        if (class_exists($typename)) {
-            $vars = get_class_vars($typename);
-
-            if (isset($vars['_explicitType'])) {
-                return $vars['_explicitType'];
-            }
-        }
-
-        if (false !== ($asname = Zend_Amf_Parse_TypeLoader::getMappedClassName($typename))) {
-            return $asname;
-        }
-
-        return $typename;
-    }
-
-    /**
-     * Register new type on the system
-     *
-     * @param  string $typename type name
-     * @return string New type name
-     */
-    protected function _registerType($typename)
-    {
-        // Known type - return its AS name
-        if (isset($this->_typesMap[$typename])) {
-            return $this->_typesMap[$typename];
-        }
-
-        // Standard types
-        if (in_array($typename, array('void', 'null', 'mixed', 'unknown_type'))) {
-            return 'Unknown';
-        }
-
-        if (in_array($typename, array('int', 'integer', 'bool', 'boolean', 'float', 'string', 'object', 'Unknown', 'stdClass', 'array'))) {
-            return $typename;
-        }
-
-        // Resolve and store AS name
-        $asTypeName = $this->_phpTypeToAS($typename);
-        $this->_typesMap[$typename] = $asTypeName;
-
-        // Create element for the name
-        $typeEl = $this->_xml->createElement('type');
-        $typeEl->setAttribute('name', $asTypeName);
-        $this->_addClassAttributes($typename, $typeEl);
-        $this->_types->appendChild($typeEl);
-
-        return $asTypeName;
-    }
-
-   /**
-     * Return error with error message
-     *
-     * @param  string $msg Error message
-     * @return string
-     */
-    protected function _returnError($msg)
-    {
-        return 'ERROR: $msg';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Auth/Abstract.php b/airtime_mvc/library/Zend/Amf/Auth/Abstract.php
deleted file mode 100644
index 227e8301f..000000000
--- a/airtime_mvc/library/Zend/Amf/Auth/Abstract.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Auth_Adapter_Interface */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-/**
- * Base abstract class for AMF authentication implementation
- *
- * @package    Zend_Amf
- * @subpackage Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface
-{
-    protected $_username;
-    protected $_password;
-
-    public function setCredentials($username, $password) {
-        $this->_username = $username;
-        $this->_password = $password;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Constants.php b/airtime_mvc/library/Zend/Amf/Constants.php
deleted file mode 100644
index f3bc4ee9c..000000000
--- a/airtime_mvc/library/Zend/Amf/Constants.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Constants.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The following constants are used throughout serialization and
- * deserialization to detect the AMF marker and encoding types.
- *
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-final class Zend_Amf_Constants
-{
-    const AMF0_NUMBER            = 0x00;
-    const AMF0_BOOLEAN           = 0x01;
-    const AMF0_STRING            = 0x02;
-    const AMF0_OBJECT            = 0x03;
-    const AMF0_MOVIECLIP         = 0x04;
-    const AMF0_NULL              = 0x05;
-    const AMF0_UNDEFINED         = 0x06;
-    const AMF0_REFERENCE         = 0x07;
-    const AMF0_MIXEDARRAY        = 0x08;
-    const AMF0_OBJECTTERM        = 0x09;
-    const AMF0_ARRAY             = 0x0a;
-    const AMF0_DATE              = 0x0b;
-    const AMF0_LONGSTRING        = 0x0c;
-    const AMF0_UNSUPPORTED       = 0x0e;
-    const AMF0_XML               = 0x0f;
-    const AMF0_TYPEDOBJECT       = 0x10;
-    const AMF0_AMF3              = 0x11;
-    const AMF0_OBJECT_ENCODING   = 0x00;
-
-    const AMF3_UNDEFINED         = 0x00;
-    const AMF3_NULL              = 0x01;
-    const AMF3_BOOLEAN_FALSE     = 0x02;
-    const AMF3_BOOLEAN_TRUE      = 0x03;
-    const AMF3_INTEGER           = 0x04;
-    const AMF3_NUMBER            = 0x05;
-    const AMF3_STRING            = 0x06;
-    const AMF3_XML               = 0x07;
-    const AMF3_DATE              = 0x08;
-    const AMF3_ARRAY             = 0x09;
-    const AMF3_OBJECT            = 0x0A;
-    const AMF3_XMLSTRING         = 0x0B;
-    const AMF3_BYTEARRAY         = 0x0C;
-    const AMF3_OBJECT_ENCODING   = 0x03;
-
-    // Object encodings for AMF3 object types
-    const ET_PROPLIST            = 0x00;
-    const ET_EXTERNAL            = 0x01;
-    const ET_DYNAMIC             = 0x02;
-    const ET_PROXY               = 0x03;
-
-    const FMS_OBJECT_ENCODING    = 0x01;
-
-    /**
-     * Special content length value that indicates "unknown" content length
-     * per AMF Specification
-     */
-    const UNKNOWN_CONTENT_LENGTH = -1;
-    const URL_APPEND_HEADER      = 'AppendToGatewayUrl';
-    const RESULT_METHOD          = '/onResult';
-    const STATUS_METHOD          = '/onStatus';
-    const CREDENTIALS_HEADER     = 'Credentials';
-    const PERSISTENT_HEADER      = 'RequestPersistentHeader';
-    const DESCRIBE_HEADER        = 'DescribeService';
-
-    const GUEST_ROLE             = 'anonymous';
-}
diff --git a/airtime_mvc/library/Zend/Amf/Exception.php b/airtime_mvc/library/Zend/Amf/Exception.php
deleted file mode 100644
index 7476501d9..000000000
--- a/airtime_mvc/library/Zend/Amf/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Amf0/Deserializer.php b/airtime_mvc/library/Zend/Amf/Parse/Amf0/Deserializer.php
deleted file mode 100644
index 5ffadcb33..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Amf0/Deserializer.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/** Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** @see Zend_Amf_Parse_Deserializer */
-require_once 'Zend/Amf/Parse/Deserializer.php';
-
-/**
- * Read an AMF0 input stream and convert it into PHP data types
- *
- * @todo       Implement Typed Object Class Mapping
- * @todo       Class could be implemented as Factory Class with each data type it's own class
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
-{
-    /**
-     * An array of objects used for recursively deserializing an object.
-     * @var array
-     */
-    protected $_reference = array();
-
-    /**
-     * If AMF3 serialization occurs, update to AMF0 0x03
-     *
-     * @var int
-     */
-    protected $_objectEncoding = Zend_Amf_Constants::AMF0_OBJECT_ENCODING;
-
-    /**
-     * Read AMF markers and dispatch for deserialization
-     *
-     * Checks for AMF marker types and calls the appropriate methods
-     * for deserializing those marker types. Markers are the data type of
-     * the following value.
-     *
-     * @param  integer $typeMarker
-     * @return mixed whatever the data type is of the marker in php
-     * @throws Zend_Amf_Exception for invalid type
-     */
-    public function readTypeMarker($typeMarker = null)
-    {
-        if ($typeMarker === null) {
-            $typeMarker = $this->_stream->readByte();
-        }
-
-        switch($typeMarker) {
-            // number
-            case Zend_Amf_Constants::AMF0_NUMBER:
-                return $this->_stream->readDouble();
-
-            // boolean
-            case Zend_Amf_Constants::AMF0_BOOLEAN:
-                return (boolean) $this->_stream->readByte();
-
-            // string
-            case Zend_Amf_Constants::AMF0_STRING:
-                return $this->_stream->readUTF();
-
-            // object
-            case Zend_Amf_Constants::AMF0_OBJECT:
-                return $this->readObject();
-
-            // null
-            case Zend_Amf_Constants::AMF0_NULL:
-                return null;
-
-            // undefined
-            case Zend_Amf_Constants::AMF0_UNDEFINED:
-                return null;
-
-            // Circular references are returned here
-            case Zend_Amf_Constants::AMF0_REFERENCE:
-                return $this->readReference();
-
-            // mixed array with numeric and string keys
-            case Zend_Amf_Constants::AMF0_MIXEDARRAY:
-                return $this->readMixedArray();
-
-            // array
-            case Zend_Amf_Constants::AMF0_ARRAY:
-                return $this->readArray();
-
-            // date
-            case Zend_Amf_Constants::AMF0_DATE:
-                return $this->readDate();
-
-            // longString  strlen(string) > 2^16
-            case Zend_Amf_Constants::AMF0_LONGSTRING:
-                return $this->_stream->readLongUTF();
-
-            //internal AS object,  not supported
-            case Zend_Amf_Constants::AMF0_UNSUPPORTED:
-                return null;
-
-            // XML
-            case Zend_Amf_Constants::AMF0_XML:
-                return $this->readXmlString();
-
-            // typed object ie Custom Class
-            case Zend_Amf_Constants::AMF0_TYPEDOBJECT:
-                return $this->readTypedObject();
-
-            //AMF3-specific
-            case Zend_Amf_Constants::AMF0_AMF3:
-                return $this->readAmf3TypeMarker();
-
-            default:
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Unsupported marker type: ' . $typeMarker);
-        }
-    }
-
-    /**
-     * Read AMF objects and convert to PHP objects
-     *
-     * Read the name value pair objects form the php message and convert them to
-     * a php object class.
-     *
-     * Called when the marker type is 3.
-     *
-     * @param  array|null $object
-     * @return object
-     */
-    public function readObject($object = null)
-    {
-        if ($object === null) {
-            $object = array();
-        }
-
-        while (true) {
-            $key        = $this->_stream->readUTF();
-            $typeMarker = $this->_stream->readByte();
-            if ($typeMarker != Zend_Amf_Constants::AMF0_OBJECTTERM ){
-                //Recursivly call readTypeMarker to get the types of properties in the object
-                $object[$key] = $this->readTypeMarker($typeMarker);
-            } else {
-                //encountered AMF object terminator
-                break;
-            }
-        }
-        $this->_reference[] = $object;
-        return (object) $object;
-    }
-
-    /**
-     * Read reference objects
-     *
-     * Used to gain access to the private array of reference objects.
-     * Called when marker type is 7.
-     *
-     * @return object
-     * @throws Zend_Amf_Exception for invalid reference keys
-     */
-    public function readReference()
-    {
-        $key = $this->_stream->readInt();
-        if (!array_key_exists($key, $this->_reference)) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Invalid reference key: '. $key);
-        }
-        return $this->_reference[$key];
-    }
-
-    /**
-     * Reads an array with numeric and string indexes.
-     *
-     * Called when marker type is 8
-     *
-     * @todo   As of Flash Player 9 there is not support for mixed typed arrays
-     *         so we handle this as an object. With the introduction of vectors
-     *         in Flash Player 10 this may need to be reconsidered.
-     * @return array
-     */
-    public function readMixedArray()
-    {
-        $length = $this->_stream->readLong();
-        return $this->readObject();
-    }
-
-    /**
-     * Converts numerically indexed actiosncript arrays into php arrays.
-     *
-     * Called when marker type is 10
-     *
-     * @return array
-     */
-    public function readArray()
-    {
-        $length = $this->_stream->readLong();
-        $array = array();
-        while ($length--) {
-            $array[] = $this->readTypeMarker();
-        }
-        return $array;
-    }
-
-    /**
-     * Convert AS Date to Zend_Date
-     *
-     * @return Zend_Date
-     */
-    public function readDate()
-    {
-        // get the unix time stamp. Not sure why ActionScript does not use
-        // milliseconds
-        $timestamp = floor($this->_stream->readDouble() / 1000);
-
-        // The timezone offset is never returned to the server; it is always 0,
-        // so read and ignore.
-        $offset = $this->_stream->readInt();
-
-        require_once 'Zend/Date.php';
-        $date   = new Zend_Date($timestamp);
-        return $date;
-    }
-
-    /**
-     * Convert XML to SimpleXml
-     * If user wants DomDocument they can use dom_import_simplexml
-     *
-     * @return SimpleXml Object
-     */
-    public function readXmlString()
-    {
-        $string = $this->_stream->readLongUTF();
-        return simplexml_load_string($string);
-    }
-
-    /**
-     * Read Class that is to be mapped to a server class.
-     *
-     * Commonly used for Value Objects on the server
-     *
-     * @todo   implement Typed Class mapping
-     * @return object|array
-     * @throws Zend_Amf_Exception if unable to load type
-     */
-    public function readTypedObject()
-    {
-         require_once 'Zend/Amf/Parse/TypeLoader.php';
-        // get the remote class name
-        $className = $this->_stream->readUTF();
-        $loader = Zend_Amf_Parse_TypeLoader::loadType($className);
-        $returnObject = new $loader();
-        $properties = get_object_vars($this->readObject());
-        foreach($properties as $key=>$value) {
-            if($key) {
-                $returnObject->$key = $value;
-            }
-        }
-        if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) {
-            $returnObject = get_object_vars($returnObject);
-        }
-        return $returnObject;
-    }
-
-    /**
-     * AMF3 data type encountered load AMF3 Deserializer to handle
-     * type markers.
-     *
-     * @return string
-     */
-    public function readAmf3TypeMarker()
-    {
-        require_once 'Zend/Amf/Parse/Amf3/Deserializer.php';
-        $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($this->_stream);
-        $this->_objectEncoding = Zend_Amf_Constants::AMF3_OBJECT_ENCODING;
-        return $deserializer->readTypeMarker();
-    }
-
-    /**
-     * Return the object encoding to check if an AMF3 object
-     * is going to be return.
-     *
-     * @return int
-     */
-    public function getObjectEncoding()
-    {
-        return $this->_objectEncoding;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Amf0/Serializer.php b/airtime_mvc/library/Zend/Amf/Parse/Amf0/Serializer.php
deleted file mode 100644
index aea853da1..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Amf0/Serializer.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/** Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** @see Zend_Amf_Parse_Serializer */
-require_once 'Zend/Amf/Parse/Serializer.php';
-
-/**
- * Serializer PHP misc types back to there corresponding AMF0 Type Marker.
- *
- * @uses       Zend_Amf_Parse_Serializer
- * @package    Zend_Amf
- * @subpackage Parse_Amf0
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
-{
-    /**
-     * @var string Name of the class to be returned
-     */
-    protected $_className = '';
-
-    /**
-     * An array of reference objects
-     * @var array
-     */
-    protected $_referenceObjects = array();
-
-    /**
-     * Determine type and serialize accordingly
-     *
-     * Checks to see if the type was declared and then either
-     * auto negotiates the type or relies on the user defined markerType to
-     * serialize the data into amf
-     *
-     * @param  misc $data
-     * @param  misc $markerType
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     * @throws Zend_Amf_Exception for unrecognized types or data
-     */
-    public function writeTypeMarker($data, $markerType = null)
-    {
-        if (null !== $markerType) {
-            //try to reference the given object
-            if( !$this->writeObjectReference($data, $markerType) ) {
-
-                // Write the Type Marker to denote the following action script data type
-                $this->_stream->writeByte($markerType);
-                switch($markerType) {
-                    case Zend_Amf_Constants::AMF0_NUMBER:
-                        $this->_stream->writeDouble($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_BOOLEAN:
-                        $this->_stream->writeByte($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_STRING:
-                        $this->_stream->writeUTF($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_OBJECT:
-                        $this->writeObject($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_NULL:
-                        break;
-                    case Zend_Amf_Constants::AMF0_REFERENCE:
-                        $this->_stream->writeInt($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_MIXEDARRAY:
-                        // Write length of numeric keys as zero.
-                        $this->_stream->writeLong(0);
-                        $this->writeObject($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_ARRAY:
-                        $this->writeArray($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_DATE:
-                        $this->writeDate($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_LONGSTRING:
-                        $this->_stream->writeLongUTF($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_TYPEDOBJECT:
-                        $this->writeTypedObject($data);
-                        break;
-                    case Zend_Amf_Constants::AMF0_AMF3:
-                        $this->writeAmf3TypeMarker($data);
-                        break;
-                    default:
-                        require_once 'Zend/Amf/Exception.php';
-                        throw new Zend_Amf_Exception("Unknown Type Marker: " . $markerType);
-                }
-            }
-        } else {
-            if(is_resource($data)) {
-                $data = Zend_Amf_Parse_TypeLoader::handleResource($data);
-            }
-            switch (true) {
-                case (is_int($data) || is_float($data)):
-                    $markerType = Zend_Amf_Constants::AMF0_NUMBER;
-                    break;
-                case (is_bool($data)):
-                    $markerType = Zend_Amf_Constants::AMF0_BOOLEAN;
-                    break;
-                case (is_string($data) && (strlen($data) > 65536)):
-                    $markerType = Zend_Amf_Constants::AMF0_LONGSTRING;
-                    break;
-                case (is_string($data)):
-                    $markerType = Zend_Amf_Constants::AMF0_STRING;
-                    break;
-                case (is_object($data)):
-                    if (($data instanceof DateTime) || ($data instanceof Zend_Date)) {
-                        $markerType = Zend_Amf_Constants::AMF0_DATE;
-                    } else {
-
-                        if($className = $this->getClassName($data)){
-                            //Object is a Typed object set classname
-                            $markerType = Zend_Amf_Constants::AMF0_TYPEDOBJECT;
-                            $this->_className = $className;
-                        } else {
-                            // Object is a generic classname
-                            $markerType = Zend_Amf_Constants::AMF0_OBJECT;
-                        }
-                        break;
-                    }
-                    break;
-                case (null === $data):
-                    $markerType = Zend_Amf_Constants::AMF0_NULL;
-                    break;
-                case (is_array($data)):
-                    // check if it is an associative array
-                    $i = 0;
-                    foreach (array_keys($data) as $key) {
-                        // check if it contains non-integer keys
-                        if (!is_numeric($key) || intval($key) != $key) {
-                            $markerType = Zend_Amf_Constants::AMF0_OBJECT;
-                            break;
-                            // check if it is a sparse indexed array
-                         } else if ($key != $i) {
-                             $markerType = Zend_Amf_Constants::AMF0_MIXEDARRAY;
-                             break;
-                         }
-                         $i++;
-                    }
-                    // Dealing with a standard numeric array
-                    if(!$markerType){
-                        $markerType = Zend_Amf_Constants::AMF0_ARRAY;
-                        break;
-                    }
-                    break;
-                default:
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data));
-            }
-
-            $this->writeTypeMarker($data, $markerType);
-        }
-        return $this;
-    }
-
-    /**
-     * Check if the given object is in the reference table, write the reference if it exists,
-     * otherwise add the object to the reference table
-     *
-     * @param mixed $object object to check for reference
-     * @param $markerType AMF type of the object to write
-     * @return Boolean true, if the reference was written, false otherwise
-     */
-    protected function writeObjectReference($object, $markerType){
-        if( $markerType == Zend_Amf_Constants::AMF0_OBJECT ||
-            $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY ||
-            $markerType == Zend_Amf_Constants::AMF0_ARRAY ||
-            $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT ) {
-
-            $ref = array_search($object, $this->_referenceObjects,true);
-            //handle object reference
-            if($ref !== false){
-                $this->writeTypeMarker($ref,Zend_Amf_Constants::AMF0_REFERENCE);
-                return true;
-            }
-
-            $this->_referenceObjects[] = $object;
-        }
-
-        return false;
-    }
-
-    /**
-     * Write a PHP array with string or mixed keys.
-     *
-     * @param object $data
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     */
-    public function writeObject($object)
-    {
-        // Loop each element and write the name of the property.
-        foreach ($object as $key => $value) {
-            // skip variables starting with an _ private transient
-            if( $key[0] == "_") continue;
-            $this->_stream->writeUTF($key);
-            $this->writeTypeMarker($value);
-        }
-
-        // Write the end object flag
-        $this->_stream->writeInt(0);
-        $this->_stream->writeByte(Zend_Amf_Constants::AMF0_OBJECTTERM);
-        return $this;
-    }
-
-    /**
-     * Write a standard numeric array to the output stream. If a mixed array
-     * is encountered call writeTypeMarker with mixed array.
-     *
-     * @param array $array
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     */
-    public function writeArray($array)
-    {
-        $length = count($array);
-        if (!$length < 0) {
-            // write the length of the array
-            $this->_stream->writeLong(0);
-        } else {
-            // Write the length of the numeric array
-            $this->_stream->writeLong($length);
-            for ($i=0; $i<$length; $i++) {
-                $value = isset($array[$i]) ? $array[$i] : null;
-                $this->writeTypeMarker($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Convert the DateTime into an AMF Date
-     *
-     * @param  DateTime|Zend_Date $data
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     */
-    public function writeDate($data)
-    {
-        if ($data instanceof DateTime) {
-            $dateString = $data->format('U');
-        } elseif ($data instanceof Zend_Date) {
-            $dateString = $data->toString('U');
-        } else {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Invalid date specified; must be a DateTime or Zend_Date object');
-        }
-        $dateString *= 1000;
-
-        // Make the conversion and remove milliseconds.
-        $this->_stream->writeDouble($dateString);
-
-        // Flash does not respect timezone but requires it.
-        $this->_stream->writeInt(0);
-
-        return $this;
-    }
-
-    /**
-     * Write a class mapped object to the output stream.
-     *
-     * @param  object $data
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     */
-    public function writeTypedObject($data)
-    {
-        $this->_stream->writeUTF($this->_className);
-        $this->writeObject($data);
-        return $this;
-    }
-
-    /**
-     * Encountered and AMF3 Type Marker use AMF3 serializer. Once AMF3 is
-     * encountered it will not return to AMf0.
-     *
-     * @param  string $data
-     * @return Zend_Amf_Parse_Amf0_Serializer
-     */
-    public function writeAmf3TypeMarker($data)
-    {
-        require_once 'Zend/Amf/Parse/Amf3/Serializer.php';
-        $serializer = new Zend_Amf_Parse_Amf3_Serializer($this->_stream);
-        $serializer->writeTypeMarker($data);
-        return $this;
-    }
-
-    /**
-     * Find if the class name is a class mapped name and return the
-     * respective classname if it is.
-     *
-     * @param object $object
-     * @return false|string $className
-     */
-    protected function getClassName($object)
-    {
-        require_once 'Zend/Amf/Parse/TypeLoader.php';
-        //Check to see if the object is a typed object and we need to change
-        $className = '';
-        switch (true) {
-            // the return class mapped name back to actionscript class name.
-            case Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object)):
-                $className = Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object));
-                break;
-                // Check to see if the user has defined an explicit Action Script type.
-            case isset($object->_explicitType):
-                $className = $object->_explicitType;
-                break;
-                // Check if user has defined a method for accessing the Action Script type
-            case method_exists($object, 'getASClassName'):
-                $className = $object->getASClassName();
-                break;
-                // No return class name is set make it a generic object
-            case ($object instanceof stdClass):
-                $className = '';
-                break;
-        // By default, use object's class name
-            default:
-        $className = get_class($object);
-                break;
-        }
-        if(!$className == '') {
-            return $className;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Amf3/Deserializer.php b/airtime_mvc/library/Zend/Amf/Parse/Amf3/Deserializer.php
deleted file mode 100644
index e974173f8..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Amf3/Deserializer.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/** Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** Zend_Amf_Parse_Deserializer */
-require_once 'Zend/Amf/Parse/Deserializer.php';
-
-/** Zend_Amf_Parse_TypeLoader */
-require_once 'Zend/Amf/Parse/TypeLoader.php';
-
-/**
- * Read an AMF3 input stream and convert it into PHP data types.
- *
- * @todo       readObject to handle Typed Objects
- * @todo       readXMLStrimg to be implemented.
- * @todo       Class could be implemented as Factory Class with each data type it's own class.
- * @package    Zend_Amf
- * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
-{
-    /**
-     * Total number of objects in the referenceObject array
-     * @var int
-     */
-    protected $_objectCount;
-
-    /**
-     * An array of reference objects per amf body
-     * @var array
-     */
-    protected $_referenceObjects = array();
-
-    /**
-     * An array of reference strings per amf body
-     * @var array
-     */
-    protected $_referenceStrings = array();
-
-    /**
-     * An array of reference class definitions per body
-     * @var array
-     */
-    protected $_referenceDefinitions = array();
-
-    /**
-     * Read AMF markers and dispatch for deserialization
-     *
-     * Checks for AMF marker types and calls the appropriate methods
-     * for deserializing those marker types. markers are the data type of
-     * the following value.
-     *
-     * @param  integer $typeMarker
-     * @return mixed Whatever the corresponding PHP data type is
-     * @throws Zend_Amf_Exception for unidentified marker type
-     */
-    public function readTypeMarker($typeMarker = null)
-    {
-        if(null === $typeMarker) {
-            $typeMarker = $this->_stream->readByte();
-        }
-
-        switch($typeMarker) {
-            case Zend_Amf_Constants::AMF3_UNDEFINED:
-                 return null;
-            case Zend_Amf_Constants::AMF3_NULL:
-                 return null;
-            case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE:
-                 return false;
-            case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE:
-                 return true;
-            case Zend_Amf_Constants::AMF3_INTEGER:
-                 return $this->readInteger();
-            case Zend_Amf_Constants::AMF3_NUMBER:
-                 return $this->_stream->readDouble();
-            case Zend_Amf_Constants::AMF3_STRING:
-                 return $this->readString();
-            case Zend_Amf_Constants::AMF3_DATE:
-                 return $this->readDate();
-            case Zend_Amf_Constants::AMF3_ARRAY:
-                 return $this->readArray();
-            case Zend_Amf_Constants::AMF3_OBJECT:
-                 return $this->readObject();
-            case Zend_Amf_Constants::AMF3_XML:
-            case Zend_Amf_Constants::AMF3_XMLSTRING:
-                 return $this->readXmlString();
-            case Zend_Amf_Constants::AMF3_BYTEARRAY:
-                 return $this->readString();
-            default:
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Unsupported type marker: ' . $typeMarker);
-        }
-    }
-
-    /**
-     * Read and deserialize an integer
-     *
-     * AMF 3 represents smaller integers with fewer bytes using the most
-     * significant bit of each byte. The worst case uses 32-bits
-     * to represent a 29-bit number, which is what we would have
-     * done with no compression.
-     * - 0x00000000 - 0x0000007F : 0xxxxxxx
-     * - 0x00000080 - 0x00003FFF : 1xxxxxxx 0xxxxxxx
-     * - 0x00004000 - 0x001FFFFF : 1xxxxxxx 1xxxxxxx 0xxxxxxx
-     * - 0x00200000 - 0x3FFFFFFF : 1xxxxxxx 1xxxxxxx 1xxxxxxx xxxxxxxx
-     * - 0x40000000 - 0xFFFFFFFF : throw range exception
-     *
-     * 0x04 -> integer type code, followed by up to 4 bytes of data.
-     *
-     * Parsing integers on OSFlash for the AMF3 integer data format:
-     * @link http://osflash.org/amf3/parsing_integers
-     * @return int|float
-     */
-    public function readInteger()
-    {
-        $count        = 1;
-        $intReference = $this->_stream->readByte();
-        $result       = 0;
-        while ((($intReference & 0x80) != 0) && $count < 4) {
-            $result       <<= 7;
-            $result        |= ($intReference & 0x7f);
-            $intReference   = $this->_stream->readByte();
-            $count++;
-        }
-        if ($count < 4) {
-            $result <<= 7;
-            $result  |= $intReference;
-        } else {
-            // Use all 8 bits from the 4th byte
-            $result <<= 8;
-            $result  |= $intReference;
-
-            // Check if the integer should be negative
-            if (($result & 0x10000000) != 0) {
-                //and extend the sign bit
-                $result |= ~0xFFFFFFF;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Read and deserialize a string
-     *
-     * Strings can be sent as a reference to a previously
-     * occurring String by using an index to the implicit string reference table.
-     * Strings are encoding using UTF-8 - however the header may either
-     * describe a string literal or a string reference.
-     *
-     * - string = 0x06 string-data
-     * - string-data = integer-data [ modified-utf-8 ]
-     * - modified-utf-8 = *OCTET
-     *
-     * @return String
-     */
-    public function readString()
-    {
-        $stringReference = $this->readInteger();
-
-        //Check if this is a reference string
-        if (($stringReference & 0x01) == 0) {
-            // reference string
-            $stringReference = $stringReference >> 1;
-            if ($stringReference >= count($this->_referenceStrings)) {
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Undefined string reference: ' . $stringReference);
-            }
-            // reference string found
-            return $this->_referenceStrings[$stringReference];
-        }
-
-        $length = $stringReference >> 1;
-        if ($length) {
-            $string = $this->_stream->readBytes($length);
-            $this->_referenceStrings[] = $string;
-        } else {
-            $string = "";
-        }
-        return $string;
-    }
-
-    /**
-     * Read and deserialize a date
-     *
-     * Data is the number of milliseconds elapsed since the epoch
-     * of midnight, 1st Jan 1970 in the UTC time zone.
-     * Local time zone information is not sent to flash.
-     *
-     * - date = 0x08 integer-data [ number-data ]
-     *
-     * @return Zend_Date
-     */
-    public function readDate()
-    {
-        $dateReference = $this->readInteger();
-        if (($dateReference & 0x01) == 0) {
-            $dateReference = $dateReference >> 1;
-            if ($dateReference>=count($this->_referenceObjects)) {
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Undefined date reference: ' . $dateReference);
-            }
-            return $this->_referenceObjects[$dateReference];
-        }
-
-        $timestamp = floor($this->_stream->readDouble() / 1000);
-
-        require_once 'Zend/Date.php';
-        $dateTime  = new Zend_Date((int) $timestamp);
-        $this->_referenceObjects[] = $dateTime;
-        return $dateTime;
-    }
-
-    /**
-     * Read amf array to PHP array
-     *
-     * - array = 0x09 integer-data ( [ 1OCTET *amf3-data ] | [OCTET *amf3-data 1] | [ OCTET *amf-data ] )
-     *
-     * @return array
-     */
-    public function readArray()
-    {
-        $arrayReference = $this->readInteger();
-        if (($arrayReference & 0x01)==0){
-            $arrayReference = $arrayReference >> 1;
-            if ($arrayReference>=count($this->_referenceObjects)) {
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Unknow array reference: ' . $arrayReference);
-            }
-            return $this->_referenceObjects[$arrayReference];
-        }
-
-        // Create a holder for the array in the reference list
-        $data = array();
-        $this->_referenceObjects[] =& $data;
-        $key = $this->readString();
-
-        // Iterating for string based keys.
-        while ($key != '') {
-            $data[$key] = $this->readTypeMarker();
-            $key = $this->readString();
-        }
-
-        $arrayReference = $arrayReference >>1;
-
-        //We have a dense array
-        for ($i=0; $i < $arrayReference; $i++) {
-            $data[] = $this->readTypeMarker();
-        }
-
-        return $data;
-    }
-
-    /**
-     * Read an object from the AMF stream and convert it into a PHP object
-     *
-     * @todo   Rather than using an array of traitsInfo create Zend_Amf_Value_TraitsInfo
-     * @return object|array
-     */
-    public function readObject()
-    {
-        $traitsInfo   = $this->readInteger();
-        $storedObject = ($traitsInfo & 0x01)==0;
-        $traitsInfo   = $traitsInfo >> 1;
-
-        // Check if the Object is in the stored Objects reference table
-        if ($storedObject) {
-            $ref = $traitsInfo;
-            if (!isset($this->_referenceObjects[$ref])) {
-                require_once 'Zend/Amf/Exception.php';
-                throw new Zend_Amf_Exception('Unknown Object reference: ' . $ref);
-            }
-            $returnObject = $this->_referenceObjects[$ref];
-        } else {
-            // Check if the Object is in the stored Definitions reference table
-            $storedClass = ($traitsInfo & 0x01) == 0;
-            $traitsInfo  = $traitsInfo >> 1;
-            if ($storedClass) {
-                $ref = $traitsInfo;
-                if (!isset($this->_referenceDefinitions[$ref])) {
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Unknows Definition reference: '. $ref);
-                }
-                // Populate the reference attributes
-                $className     = $this->_referenceDefinitions[$ref]['className'];
-                $encoding      = $this->_referenceDefinitions[$ref]['encoding'];
-                $propertyNames = $this->_referenceDefinitions[$ref]['propertyNames'];
-            } else {
-                // The class was not in the reference tables. Start reading rawdata to build traits.
-                // Create a traits table. Zend_Amf_Value_TraitsInfo would be ideal
-                $className     = $this->readString();
-                $encoding      = $traitsInfo & 0x03;
-                $propertyNames = array();
-                $traitsInfo    = $traitsInfo >> 2;
-            }
-
-            // We now have the object traits defined in variables. Time to go to work:
-            if (!$className) {
-                // No class name generic object
-                $returnObject = new stdClass();
-            } else {
-                // Defined object
-                // Typed object lookup against registered classname maps
-                if ($loader = Zend_Amf_Parse_TypeLoader::loadType($className)) {
-                    $returnObject = new $loader();
-                } else {
-                    //user defined typed object
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Typed object not found: '. $className . ' ');
-                }
-            }
-
-            // Add the Object to the reference table
-            $this->_referenceObjects[] = $returnObject;
-
-            $properties = array(); // clear value
-            // Check encoding types for additional processing.
-            switch ($encoding) {
-                case (Zend_Amf_Constants::ET_EXTERNAL):
-                    // Externalizable object such as {ArrayCollection} and {ObjectProxy}
-                    if (!$storedClass) {
-                        $this->_referenceDefinitions[] = array(
-                            'className'     => $className,
-                            'encoding'      => $encoding,
-                            'propertyNames' => $propertyNames,
-                        );
-                    }
-                    $returnObject->externalizedData = $this->readTypeMarker();
-                    break;
-                case (Zend_Amf_Constants::ET_DYNAMIC):
-                    // used for Name-value encoding
-                    if (!$storedClass) {
-                        $this->_referenceDefinitions[] = array(
-                            'className'     => $className,
-                            'encoding'      => $encoding,
-                            'propertyNames' => $propertyNames,
-                        );
-                    }
-                    // not a reference object read name value properties from byte stream
-                    do {
-                        $property = $this->readString();
-                        if ($property != "") {
-                            $propertyNames[]       = $property;
-                            $properties[$property] = $this->readTypeMarker();
-                        }
-                    } while ($property !="");
-                    break;
-                default:
-                    // basic property list object.
-                    if (!$storedClass) {
-                        $count = $traitsInfo; // Number of properties in the list
-                        for($i=0; $i< $count; $i++) {
-                            $propertyNames[] = $this->readString();
-                        }
-                        // Add a reference to the class.
-                        $this->_referenceDefinitions[] = array(
-                            'className'     => $className,
-                            'encoding'      => $encoding,
-                            'propertyNames' => $propertyNames,
-                        );
-                    }
-                    foreach ($propertyNames as $property) {
-                        $properties[$property] = $this->readTypeMarker();
-                    }
-                    break;
-            }
-
-            // Add properties back to the return object.
-            foreach($properties as $key=>$value) {
-                if($key) {
-                    $returnObject->$key = $value;
-                }
-            }
-
-
-        }
-
-        if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) {
-            if(isset($returnObject->externalizedData)) {
-                $returnObject = $returnObject->externalizedData;
-            } else {
-                $returnObject = get_object_vars($returnObject);
-            }
-        }
-
-        return $returnObject;
-    }
-
-    /**
-     * Convert XML to SimpleXml
-     * If user wants DomDocument they can use dom_import_simplexml
-     *
-     * @return SimpleXml Object
-     */
-    public function readXmlString()
-    {
-        $xmlReference = $this->readInteger();
-        $length = $xmlReference >> 1;
-        $string = $this->_stream->readBytes($length);
-        return simplexml_load_string($string);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Amf3/Serializer.php b/airtime_mvc/library/Zend/Amf/Parse/Amf3/Serializer.php
deleted file mode 100644
index 031ce7c4f..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Amf3/Serializer.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 20392 2010-01-18 18:34:23Z stas $
- */
-
-/** Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** Zend_Amf_Parse_Serializer */
-require_once 'Zend/Amf/Parse/Serializer.php';
-
-/** Zend_Amf_Parse_TypeLoader */
-require_once 'Zend/Amf/Parse/TypeLoader.php';
-
-/**
- * Detect PHP object type and convert it to a corresponding AMF3 object type
- *
- * @package    Zend_Amf
- * @subpackage Parse_Amf3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
-{
-    /**
-     * An array of reference objects per amf body
-     * @var array
-     */
-    protected $_referenceObjects = array();
-
-    /**
-     * An array of reference strings per amf body
-     * @var array
-     */
-    protected $_referenceStrings = array();
-
-    /**
-     * An array of reference class definitions, indexed by classname
-     * @var array
-     */
-    protected $_referenceDefinitions = array();
-
-    /**
-     * Serialize PHP types to AMF3 and write to stream
-     *
-     * Checks to see if the type was declared and then either
-     * auto negotiates the type or use the user defined markerType to
-     * serialize the data from php back to AMF3
-     *
-     * @param  mixed $content
-     * @param  int $markerType
-     * @return void
-     */
-    public function writeTypeMarker($data, $markerType=null)
-    {
-        if (null !== $markerType) {
-            // Write the Type Marker to denote the following action script data type
-            $this->_stream->writeByte($markerType);
-
-            switch ($markerType) {
-                case Zend_Amf_Constants::AMF3_NULL:
-                    break;
-                case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE:
-                    break;
-                case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE:
-                    break;
-                case Zend_Amf_Constants::AMF3_INTEGER:
-                    $this->writeInteger($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_NUMBER:
-                    $this->_stream->writeDouble($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_STRING:
-                    $this->writeString($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_DATE:
-                    $this->writeDate($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_ARRAY:
-                    $this->writeArray($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_OBJECT:
-                    $this->writeObject($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_BYTEARRAY:
-                    $this->writeByteArray($data);
-                    break;
-                case Zend_Amf_Constants::AMF3_XMLSTRING;
-                    $this->writeXml($data);
-                    break;
-                default:
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Unknown Type Marker: ' . $markerType);
-            }
-        } else {
-            // Detect Type Marker
-            if(is_resource($data)) {
-                $data = Zend_Amf_Parse_TypeLoader::handleResource($data);
-            }
-             switch (true) {
-                case (null === $data):
-                    $markerType = Zend_Amf_Constants::AMF3_NULL;
-                    break;
-                case (is_bool($data)):
-                    if ($data){
-                        $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_TRUE;
-                    } else {
-                        $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_FALSE;
-                    }
-                    break;
-                case (is_int($data)):
-                    if (($data > 0xFFFFFFF) || ($data < -268435456)) {
-                        $markerType = Zend_Amf_Constants::AMF3_NUMBER;
-                    } else {
-                        $markerType = Zend_Amf_Constants::AMF3_INTEGER;
-                    }
-                    break;
-                case (is_float($data)):
-                    $markerType = Zend_Amf_Constants::AMF3_NUMBER;
-                    break;
-                case (is_string($data)):
-                    $markerType = Zend_Amf_Constants::AMF3_STRING;
-                    break;
-                case (is_array($data)):
-                    $markerType = Zend_Amf_Constants::AMF3_ARRAY;
-                    break;
-                case (is_object($data)):
-                    // Handle object types.
-                    if (($data instanceof DateTime) || ($data instanceof Zend_Date)) {
-                        $markerType = Zend_Amf_Constants::AMF3_DATE;
-                    } else if ($data instanceof Zend_Amf_Value_ByteArray) {
-                        $markerType = Zend_Amf_Constants::AMF3_BYTEARRAY;
-                    } else if (($data instanceof DOMDocument) || ($data instanceof SimpleXMLElement)) {
-                        $markerType = Zend_Amf_Constants::AMF3_XMLSTRING;
-                    } else {
-                        $markerType = Zend_Amf_Constants::AMF3_OBJECT;
-                    }
-                    break;
-                default:
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data));
-             }
-            $this->writeTypeMarker($data, $markerType);
-        }
-    }
-
-    /**
-     * Write an AMF3 integer
-     *
-     * @param int|float $data
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeInteger($int)
-    {
-        if (($int & 0xffffff80) == 0) {
-            $this->_stream->writeByte($int & 0x7f);
-            return $this;
-        }
-
-        if (($int & 0xffffc000) == 0 ) {
-            $this->_stream->writeByte(($int >> 7 ) | 0x80);
-            $this->_stream->writeByte($int & 0x7f);
-            return $this;
-        }
-
-        if (($int & 0xffe00000) == 0) {
-            $this->_stream->writeByte(($int >> 14 ) | 0x80);
-            $this->_stream->writeByte(($int >> 7 ) | 0x80);
-            $this->_stream->writeByte($int & 0x7f);
-            return $this;
-        }
-
-        $this->_stream->writeByte(($int >> 22 ) | 0x80);
-        $this->_stream->writeByte(($int >> 15 ) | 0x80);
-        $this->_stream->writeByte(($int >> 8 ) | 0x80);
-        $this->_stream->writeByte($int & 0xff);
-        return $this;
-    }
-
-    /**
-     * Send string to output stream, without trying to reference it.
-     * The string is prepended with strlen($string) << 1 | 0x01
-     *
-     * @param  string $string
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    protected function writeBinaryString($string){
-        $ref = strlen($string) << 1 | 0x01;
-        $this->writeInteger($ref);
-        $this->_stream->writeBytes($string);
-
-        return $this;
-    }
-
-    /**
-     * Send string to output stream
-     *
-     * @param  string $string
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeString($string)
-    {
-        $len = strlen($string);
-        if(!$len){
-            $this->writeInteger(0x01);
-            return $this;
-        }
-
-        $ref = array_search($string, $this->_referenceStrings, true);
-        if($ref === false){
-            $this->_referenceStrings[] = $string;
-            $this->writeBinaryString($string);
-        } else {
-            $ref <<= 1;
-            $this->writeInteger($ref);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Send ByteArray to output stream
-     *
-     * @param  string|Zend_Amf_Value_ByteArray  $data
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeByteArray($data){
-        if($this->writeObjectReference($data)){
-            return $this;
-        }
-
-        if(is_string($data)) {
-            //nothing to do
-        } else if ($data instanceof Zend_Amf_Value_ByteArray) {
-            $data = $data->getData();
-        } else {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray');
-        }
-
-        $this->writeBinaryString($data);
-
-        return $this;
-    }
-
-    /**
-     * Send xml to output stream
-     *
-     * @param  DOMDocument|SimpleXMLElement  $xml
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeXml($xml)
-    {
-        if($this->writeObjectReference($xml)){
-            return $this;
-        }
-
-        if(is_string($xml)) {
-            //nothing to do
-        } else if ($xml instanceof DOMDocument) {
-            $xml = $xml->saveXml();
-        } else if ($xml instanceof SimpleXMLElement) {
-            $xml = $xml->asXML();
-        } else {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement');
-        }
-
-        $this->writeBinaryString($xml);
-
-        return $this;
-    }
-
-    /**
-     * Convert DateTime/Zend_Date to AMF date
-     *
-     * @param  DateTime|Zend_Date $date
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeDate($date)
-    {
-        if($this->writeObjectReference($date)){
-            return $this;
-        }
-
-        if ($date instanceof DateTime) {
-            $dateString = $date->format('U') * 1000;
-        } elseif ($date instanceof Zend_Date) {
-            $dateString = $date->toString('U') * 1000;
-        } else {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Invalid date specified; must be a string DateTime or Zend_Date object');
-        }
-
-        $this->writeInteger(0x01);
-        // write time to stream minus milliseconds
-        $this->_stream->writeDouble($dateString);
-        return $this;
-    }
-
-    /**
-     * Write a PHP array back to the amf output stream
-     *
-     * @param array $array
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeArray(array $array)
-    {
-	// arrays aren't reference here but still counted
-        $this->_referenceObjects[] = $array;
-
-        // have to seperate mixed from numberic keys.
-        $numeric = array();
-        $string  = array();
-        foreach ($array as $key => $value) {
-            if (is_int($key)) {
-                $numeric[] = $value;
-            } else {
-                $string[$key] = $value;
-            }
-        }
-
-        // write the preamble id of the array
-        $length = count($numeric);
-        $id     = ($length << 1) | 0x01;
-        $this->writeInteger($id);
-
-        //Write the mixed type array to the output stream
-        foreach($string as $key => $value) {
-            $this->writeString($key)
-                 ->writeTypeMarker($value);
-        }
-        $this->writeString('');
-
-        // Write the numeric array to ouput stream
-        foreach($numeric as $value) {
-            $this->writeTypeMarker($value);
-        }
-        return $this;
-    }
-
-    /**
-     * Check if the given object is in the reference table, write the reference if it exists,
-     * otherwise add the object to the reference table
-     *
-     * @param mixed $object object to check for reference
-     * @return Boolean true, if the reference was written, false otherwise
-     */
-    protected function writeObjectReference($object)
-    {
-        $ref = array_search($object, $this->_referenceObjects,true);
-        //quickly handle object references
-        if($ref !== false){
-            $ref <<= 1;
-            $this->writeInteger($ref);
-            return true;
-        }
-        $this->_referenceObjects[] = $object;
-        return false;
-    }
-
-    /**
-     * Write object to ouput stream
-     *
-     * @param  mixed $data
-     * @return Zend_Amf_Parse_Amf3_Serializer
-     */
-    public function writeObject($object)
-    {
-        if($this->writeObjectReference($object)){
-            return $this;
-        }
-
-        $className = '';
-
-        //Check to see if the object is a typed object and we need to change
-        switch (true) {
-             // the return class mapped name back to actionscript class name.
-            case ($className = Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object))):
-                break;
-
-            // Check to see if the user has defined an explicit Action Script type.
-            case isset($object->_explicitType):
-                $className = $object->_explicitType;
-                break;
-
-            // Check if user has defined a method for accessing the Action Script type
-            case method_exists($object, 'getASClassName'):
-                $className = $object->getASClassName();
-                break;
-
-            // No return class name is set make it a generic object
-            case ($object instanceof stdClass):
-                $className = '';
-                break;
-
-            // By default, use object's class name
-            default:
-                $className = get_class($object);
-                break;
-        }
-
-        $writeTraits = true;
-
-        //check to see, if we have a corresponding definition
-        if(array_key_exists($className, $this->_referenceDefinitions)){
-            $traitsInfo    = $this->_referenceDefinitions[$className]['id'];
-            $encoding      = $this->_referenceDefinitions[$className]['encoding'];
-            $propertyNames = $this->_referenceDefinitions[$className]['propertyNames'];
-
-            $traitsInfo = ($traitsInfo << 2) | 0x01;
-
-            $writeTraits = false;
-        } else {
-            $propertyNames = array();
-
-            if($className == ''){
-                //if there is no className, we interpret the class as dynamic without any sealed members
-                $encoding = Zend_Amf_Constants::ET_DYNAMIC;
-            } else {
-                $encoding = Zend_Amf_Constants::ET_PROPLIST;
-
-                foreach($object as $key => $value) {
-                    if( $key[0] != "_") {
-                        $propertyNames[] = $key;
-                    }
-                }
-            }
-
-            $this->_referenceDefinitions[$className] = array(
-                        'id'            => count($this->_referenceDefinitions),
-                        'encoding'      => $encoding,
-                        'propertyNames' => $propertyNames,
-                    );
-
-            $traitsInfo = Zend_Amf_Constants::AMF3_OBJECT_ENCODING;
-            $traitsInfo |= $encoding << 2;
-            $traitsInfo |= (count($propertyNames) << 4);
-        }
-
-        $this->writeInteger($traitsInfo);
-
-        if($writeTraits){
-            $this->writeString($className);
-            foreach ($propertyNames as $value) {
-                $this->writeString($value);
-            }
-        }
-
-        try {
-            switch($encoding) {
-                case Zend_Amf_Constants::ET_PROPLIST:
-                    //Write the sealed values to the output stream.
-                    foreach ($propertyNames as $key) {
-                        $this->writeTypeMarker($object->$key);
-                    }
-                    break;
-                case Zend_Amf_Constants::ET_DYNAMIC:
-                    //Write the sealed values to the output stream.
-                    foreach ($propertyNames as $key) {
-                        $this->writeTypeMarker($object->$key);
-                    }
-
-                    //Write remaining properties
-                    foreach($object as $key => $value){
-                        if(!in_array($key,$propertyNames) && $key[0] != "_"){
-                            $this->writeString($key);
-                            $this->writeTypeMarker($value);
-                        }
-                    }
-
-                    //Write an empty string to end the dynamic part
-                    $this->writeString('');
-                    break;
-                case Zend_Amf_Constants::ET_EXTERNAL:
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('External Object Encoding not implemented');
-                    break;
-                default:
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding);
-            }
-        } catch (Exception $e) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e);
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Deserializer.php b/airtime_mvc/library/Zend/Amf/Parse/Deserializer.php
deleted file mode 100644
index 4f697bb1f..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Deserializer.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract cass that all deserializer must implement.
- *
- * Logic for deserialization of the AMF envelop is based on resources supplied
- * by Adobe Blaze DS. For and example of deserialization please review the BlazeDS
- * source tree.
- *
- * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Amf_Parse_Deserializer
-{
-    /**
-     * The raw string that represents the AMF request.
-     *
-     * @var Zend_Amf_Parse_InputStream
-     */
-    protected $_stream;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Amf_Parse_InputStream $stream
-     * @return void
-     */
-    public function __construct(Zend_Amf_Parse_InputStream $stream)
-    {
-        $this->_stream = $stream;
-    }
-
-    /**
-     * Checks for AMF marker types and calls the appropriate methods
-     * for deserializing those marker types. Markers are the data type of
-     * the following value.
-     *
-     * @param  int $typeMarker
-     * @return mixed Whatever the data type is of the marker in php
-     */
-    public abstract function readTypeMarker($markerType = null);
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/InputStream.php b/airtime_mvc/library/Zend/Amf/Parse/InputStream.php
deleted file mode 100644
index 03dff2f6b..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/InputStream.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputStream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Util_BinaryStream */
-require_once 'Zend/Amf/Util/BinaryStream.php';
-
-/**
- * InputStream is used to iterate at a binary level through the AMF request.
- *
- * InputStream extends BinaryStream as eventually BinaryStream could be placed
- * outside of Zend_Amf in order to allow other packages to use the class.
- *
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream
-{
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/OutputStream.php b/airtime_mvc/library/Zend/Amf/Parse/OutputStream.php
deleted file mode 100644
index b8b64989f..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/OutputStream.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OutputStream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Util_BinaryStream */
-require_once 'Zend/Amf/Util/BinaryStream.php';
-
-/**
- * Iterate at a binary level through the AMF response
- *
- * OutputStream extends BinaryStream as eventually BinaryStream could be placed
- * outside of Zend_Amf in order to allow other packages to use the class.
- *
- * @uses       Zend_Amf_Util_BinaryStream
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqlResult.php b/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqlResult.php
deleted file mode 100644
index 199b7d7bb..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqlResult.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MysqlResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class will convert mysql result resource to array suitable for passing
- * to the external entities.
- *
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Resource_MysqlResult
-{
-    /**
-     * @var array List of Mysql types with PHP counterparts
-     *
-     * Key => Value is Mysql type (exact string) => PHP type
-     */
-    static public $fieldTypes = array(
-        "int" => "int",
-        "timestamp" => "int",
-        "year" => "int",
-        "real" => "float",
-    );
-    /**
-     * Parse resource into array
-     *
-     * @param resource $resource
-     * @return array
-     */
-    public function parse($resource) {
-        $result = array();
-        $fieldcnt = mysql_num_fields($resource);
-        $fields_transform = array();
-        for($i=0;$i<$fieldcnt;$i++) {
-            $type = mysql_field_type($resource, $i);
-            if(isset(self::$fieldTypes[$type])) {
-                $fields_transform[mysql_field_name($resource, $i)] = self::$fieldTypes[$type];
-            }
-        }
-
-        while($row = mysql_fetch_object($resource)) {
-            foreach($fields_transform as $fieldname => $fieldtype) {
-               settype($row->$fieldname, $fieldtype);
-            }
-            $result[] = $row;
-        }
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqliResult.php b/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqliResult.php
deleted file mode 100644
index dc99849fd..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Resource/MysqliResult.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MysqliResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class will convert mysql result resource to array suitable for passing
- * to the external entities.
- *
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Resource_MysqliResult
-{
-
-    /**
-     * mapping taken from http://forums.mysql.com/read.php?52,255868,255895#msg-255895
-     */
-    static public $mysqli_type = array(
-        0 => "MYSQLI_TYPE_DECIMAL",
-        1 => "MYSQLI_TYPE_TINYINT",
-        2 => "MYSQLI_TYPE_SMALLINT",
-        3 => "MYSQLI_TYPE_INTEGER",
-        4 => "MYSQLI_TYPE_FLOAT",
-        5 => "MYSQLI_TYPE_DOUBLE",
-        7 => "MYSQLI_TYPE_TIMESTAMP",
-        8 => "MYSQLI_TYPE_BIGINT",
-        9 => "MYSQLI_TYPE_MEDIUMINT",
-        10 => "MYSQLI_TYPE_DATE",
-        11 => "MYSQLI_TYPE_TIME",
-        12 => "MYSQLI_TYPE_DATETIME",
-        13 => "MYSQLI_TYPE_YEAR",
-        14 => "MYSQLI_TYPE_DATE",
-        16 => "MYSQLI_TYPE_BIT",
-        246 => "MYSQLI_TYPE_DECIMAL",
-        247 => "MYSQLI_TYPE_ENUM",
-        248 => "MYSQLI_TYPE_SET",
-        249 => "MYSQLI_TYPE_TINYBLOB",
-        250 => "MYSQLI_TYPE_MEDIUMBLOB",
-        251 => "MYSQLI_TYPE_LONGBLOB",
-        252 => "MYSQLI_TYPE_BLOB",
-        253 => "MYSQLI_TYPE_VARCHAR",
-        254 => "MYSQLI_TYPE_CHAR",
-        255 => "MYSQLI_TYPE_GEOMETRY",
-    );
-
-    // Build an associative array for a type look up
-    static $mysqli_to_php = array(
-        "MYSQLI_TYPE_DECIMAL"     => 'float',
-        "MYSQLI_TYPE_NEWDECIMAL"  => 'float',
-        "MYSQLI_TYPE_BIT"         => 'integer',
-        "MYSQLI_TYPE_TINYINT"     => 'integer',
-        "MYSQLI_TYPE_SMALLINT"    => 'integer',
-        "MYSQLI_TYPE_MEDIUMINT"   => 'integer',
-        "MYSQLI_TYPE_BIGINT"      => 'integer',
-        "MYSQLI_TYPE_INTEGER"     => 'integer',
-        "MYSQLI_TYPE_FLOAT"       => 'float',
-        "MYSQLI_TYPE_DOUBLE"      => 'float',
-        "MYSQLI_TYPE_NULL"        => 'null',
-        "MYSQLI_TYPE_TIMESTAMP"   => 'string',
-        "MYSQLI_TYPE_INT24"       => 'integer',
-        "MYSQLI_TYPE_DATE"        => 'string',
-        "MYSQLI_TYPE_TIME"        => 'string',
-        "MYSQLI_TYPE_DATETIME"    => 'string',
-        "MYSQLI_TYPE_YEAR"        => 'string',
-        "MYSQLI_TYPE_NEWDATE"     => 'string',
-        "MYSQLI_TYPE_ENUM"        => 'string',
-        "MYSQLI_TYPE_SET"         => 'string',
-        "MYSQLI_TYPE_TINYBLOB"    => 'object',
-        "MYSQLI_TYPE_MEDIUMBLOB"  => 'object',
-        "MYSQLI_TYPE_LONGBLOB"    => 'object',
-        "MYSQLI_TYPE_BLOB"        => 'object',
-        "MYSQLI_TYPE_CHAR"        => 'string',
-        "MYSQLI_TYPE_VARCHAR"     => 'string',
-        "MYSQLI_TYPE_GEOMETRY"    => 'object',
-        "MYSQLI_TYPE_BIT"         => 'integer',
-    );
-
-    /**
-     * Parse resource into array
-     *
-     * @param resource $resource
-     * @return array
-     */
-    public function parse($resource) {
-
-        $result = array();
-        $fieldcnt = mysqli_num_fields($resource);
-
-
-        $fields_transform = array();
-
-        for($i=0;$i<$fieldcnt;$i++) {
-            $finfo = mysqli_fetch_field_direct($resource, $i);
-
-            if(isset(self::$mysqli_type[$finfo->type])) {
-                $fields_transform[$finfo->name] = self::$mysqli_to_php[self::$mysqli_type[$finfo->type]];
-            }
-        }
-
-        while($row = mysqli_fetch_assoc($resource)) {
-            foreach($fields_transform as $fieldname => $fieldtype) {
-               settype($row[$fieldname], $fieldtype);
-            }
-            $result[] = $row;
-        }
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Resource/Stream.php b/airtime_mvc/library/Zend/Amf/Parse/Resource/Stream.php
deleted file mode 100644
index 2e116c410..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Resource/Stream.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class will convert stream resource to string by just reading it
- *
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Parse_Resource_Stream
-{
-    /**
-     * Parse resource into string
-     *
-     * @param resource $resource Stream resource
-     * @return array
-     */
-    public function parse($resource) {
-        return stream_get_contents($resource);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/Serializer.php b/airtime_mvc/library/Zend/Amf/Parse/Serializer.php
deleted file mode 100644
index eb29c4134..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/Serializer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/**
- * Base abstract class for all AMF serializers.
- *
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Amf_Parse_Serializer
-{
-    /**
-     * Reference to the current output stream being constructed
-     *
-     * @var string
-     */
-    protected $_stream;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Amf_Parse_OutputStream $stream
-     * @return void
-     */
-    public function __construct(Zend_Amf_Parse_OutputStream $stream)
-    {
-        $this->_stream = $stream;
-    }
-
-    /**
-     * Find the PHP object type and convert it into an AMF object type
-     *
-     * @param  mixed $content
-     * @param  int $markerType
-     * @return void
-     */
-    public abstract function writeTypeMarker($content, $markerType=null);
-}
diff --git a/airtime_mvc/library/Zend/Amf/Parse/TypeLoader.php b/airtime_mvc/library/Zend/Amf/Parse/TypeLoader.php
deleted file mode 100644
index 85aab3212..000000000
--- a/airtime_mvc/library/Zend/Amf/Parse/TypeLoader.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TypeLoader.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Amf_Value_Messaging_AcknowledgeMessage
- */
-require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
-/**
- * @see Zend_Amf_Value_Messaging_AsyncMessage
- */
-require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
-/**
- * @see Zend_Amf_Value_Messaging_CommandMessage
- */
-require_once 'Zend/Amf/Value/Messaging/CommandMessage.php';
-/**
- * @see Zend_Amf_Value_Messaging_ErrorMessage
- */
-require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php';
-/**
- * @see Zend_Amf_Value_Messaging_RemotingMessage
- */
-require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
-
-/**
- * Loads a local class and executes the instantiation of that class.
- *
- * @todo       PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
- * @package    Zend_Amf
- * @subpackage Parse
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-final class Zend_Amf_Parse_TypeLoader
-{
-    /**
-     * @var string callback class
-     */
-    public static $callbackClass;
-
-    /**
-     * @var array AMF class map
-     */
-    public static $classMap = array (
-        'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage',
-        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_AsyncMessage',
-        'flex.messaging.messages.CommandMessage'     => 'Zend_Amf_Value_Messaging_CommandMessage',
-        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_ErrorMessage',
-        'flex.messaging.messages.RemotingMessage'    => 'Zend_Amf_Value_Messaging_RemotingMessage',
-        'flex.messaging.io.ArrayCollection'          => 'Zend_Amf_Value_Messaging_ArrayCollection',
-    );
-
-    /**
-     * @var array Default class map
-     */
-    protected static $_defaultClassMap = array(
-        'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage',
-        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_AsyncMessage',
-        'flex.messaging.messages.CommandMessage'     => 'Zend_Amf_Value_Messaging_CommandMessage',
-        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_ErrorMessage',
-        'flex.messaging.messages.RemotingMessage'    => 'Zend_Amf_Value_Messaging_RemotingMessage',
-        'flex.messaging.io.ArrayCollection'          => 'Zend_Amf_Value_Messaging_ArrayCollection',
-    );
-
-    /**
-     * @var Zend_Loader_PluginLoader_Interface
-     */
-    protected static $_resourceLoader = null;
-
-
-    /**
-     * Load the mapped class type into a callback.
-     *
-     * @param  string $className
-     * @return object|false
-     */
-    public static function loadType($className)
-    {
-        $class    = self::getMappedClassName($className);
-        if(!$class) {
-            $class = str_replace('.', '_', $className);
-        }
-        if (!class_exists($class)) {
-            return "stdClass";
-        }
-        return $class;
-    }
-
-    /**
-     * Looks up the supplied call name to its mapped class name
-     *
-     * @param  string $className
-     * @return string
-     */
-    public static function getMappedClassName($className)
-    {
-        $mappedName = array_search($className, self::$classMap);
-
-        if ($mappedName) {
-            return $mappedName;
-        }
-
-        $mappedName = array_search($className, array_flip(self::$classMap));
-
-        if ($mappedName) {
-            return $mappedName;
-        }
-
-        return false;
-    }
-
-    /**
-     * Map PHP class names to ActionScript class names
-     *
-     * Allows users to map the class names of there action script classes
-     * to the equivelent php class name. Used in deserialization to load a class
-     * and serialiation to set the class name of the returned object.
-     *
-     * @param  string $asClassName
-     * @param  string $phpClassName
-     * @return void
-     */
-    public static function setMapping($asClassName, $phpClassName)
-    {
-        self::$classMap[$asClassName] = $phpClassName;
-    }
-
-    /**
-     * Reset type map
-     *
-     * @return void
-     */
-    public static function resetMap()
-    {
-        self::$classMap = self::$_defaultClassMap;
-    }
-
-    /**
-     * Set loader for resource type handlers
-     *
-     * @param Zend_Loader_PluginLoader_Interface $loader
-     */
-    public static function setResourceLoader(Zend_Loader_PluginLoader_Interface $loader)
-    {
-        self::$_resourceLoader = $loader;
-    }
-
-    /**
-     * Add directory to the list of places where to look for resource handlers
-     *
-     * @param string $prefix
-     * @param string $dir
-     */
-    public static function addResourceDirectory($prefix, $dir)
-    {
-        if(self::$_resourceLoader) {
-            self::$_resourceLoader->addPrefixPath($prefix, $dir);
-        }
-    }
-
-    /**
-     * Get plugin class that handles this resource
-     *
-     * @param resource $resource Resource type
-     * @return string Class name
-     */
-    public static function getResourceParser($resource)
-    {
-        if(self::$_resourceLoader) {
-            $type = preg_replace("/[^A-Za-z0-9_]/", " ", get_resource_type($resource));
-            $type = str_replace(" ","", ucwords($type));
-            return self::$_resourceLoader->load($type);
-        }
-        return false;
-    }
-
-    /**
-     * Convert resource to a serializable object
-     *
-     * @param resource $resource
-     * @return mixed
-     */
-    public static function handleResource($resource)
-    {
-        if(!self::$_resourceLoader) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set');
-        }
-        try {
-            while(is_resource($resource)) {
-                $resclass = self::getResourceParser($resource);
-                if(!$resclass) {
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource));
-                }
-                $parser = new $resclass();
-                if(is_callable(array($parser, 'parse'))) {
-                    $resource = $parser->parse($resource);
-                } else {
-                    require_once 'Zend/Amf/Exception.php';
-                    throw new Zend_Amf_Exception("Could not call parse() method on class $resclass");
-                }
-            }
-            return $resource;
-        } catch(Zend_Amf_Exception $e) {
-            throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e);
-        } catch(Exception $e) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Request.php b/airtime_mvc/library/Zend/Amf/Request.php
deleted file mode 100644
index 23e58bf24..000000000
--- a/airtime_mvc/library/Zend/Amf/Request.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Parse_InputStream */
-require_once 'Zend/Amf/Parse/InputStream.php';
-
-/** @see Zend_Amf_Parse_Amf0_Deserializer */
-require_once 'Zend/Amf/Parse/Amf0/Deserializer.php';
-
-/** @see Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** @see Zend_Amf_Value_MessageHeader */
-require_once 'Zend/Amf/Value/MessageHeader.php';
-
-/** @see Zend_Amf_Value_MessageBody */
-require_once 'Zend/Amf/Value/MessageBody.php';
-
-/**
- * Handle the incoming AMF request by deserializing the data to php object
- * types and storing the data for Zend_Amf_Server to handle for processing.
- *
- * @todo       Currently not checking if the object needs to be Type Mapped to a server object.
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Request
-{
-    /**
-     * @var int AMF client type (AMF0, AMF3)
-     */
-    protected $_clientType = 0; // default AMF0
-
-    /**
-     * @var array Message bodies
-     */
-    protected $_bodies = array();
-
-    /**
-     * @var array Message headers
-     */
-    protected $_headers = array();
-
-    /**
-     * @var int Message encoding to use for objects in response
-     */
-    protected $_objectEncoding = 0;
-
-    /**
-     * @var Zend_Amf_Parse_InputStream
-     */
-    protected $_inputStream;
-
-    /**
-     * @var Zend_Amf_Parse_AMF0_Deserializer
-     */
-    protected $_deserializer;
-
-    /**
-     * Time of the request
-     * @var  mixed
-     */
-    protected $_time;
-
-    /**
-     * Prepare the AMF InputStream for parsing.
-     *
-     * @param  string $request
-     * @return Zend_Amf_Request
-     */
-    public function initialize($request)
-    {
-        $this->_inputStream  = new Zend_Amf_Parse_InputStream($request);
-        $this->_deserializer = new Zend_Amf_Parse_Amf0_Deserializer($this->_inputStream);
-        $this->readMessage($this->_inputStream);
-        return $this;
-    }
-
-    /**
-     * Takes the raw AMF input stream and converts it into valid PHP objects
-     *
-     * @param  Zend_Amf_Parse_InputStream
-     * @return Zend_Amf_Request
-     */
-    public function readMessage(Zend_Amf_Parse_InputStream $stream)
-    {
-        $clientVersion = $stream->readUnsignedShort();
-        if (($clientVersion != Zend_Amf_Constants::AMF0_OBJECT_ENCODING)
-            && ($clientVersion != Zend_Amf_Constants::AMF3_OBJECT_ENCODING)
-            && ($clientVersion != Zend_Amf_Constants::FMS_OBJECT_ENCODING)
-        ) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Unknown Player Version ' . $clientVersion);
-        }
-
-        $this->_bodies  = array();
-        $this->_headers = array();
-        $headerCount    = $stream->readInt();
-
-        // Iterate through the AMF envelope header
-        while ($headerCount--) {
-            $this->_headers[] = $this->readHeader();
-        }
-
-        // Iterate through the AMF envelope body
-        $bodyCount = $stream->readInt();
-        while ($bodyCount--) {
-            $this->_bodies[] = $this->readBody();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Deserialize a message header from the input stream.
-     *
-     * A message header is structured as:
-     * - NAME String
-     * - MUST UNDERSTAND Boolean
-     * - LENGTH Int
-     * - DATA Object
-     *
-     * @return Zend_Amf_Value_MessageHeader
-     */
-    public function readHeader()
-    {
-        $name     = $this->_inputStream->readUTF();
-        $mustRead = (bool)$this->_inputStream->readByte();
-        $length   = $this->_inputStream->readLong();
-
-        try {
-            $data = $this->_deserializer->readTypeMarker();
-        } catch (Exception $e) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Unable to parse ' . $name . ' header data: ' . $e->getMessage() . ' '. $e->getLine(), 0, $e);
-        }
-
-        $header = new Zend_Amf_Value_MessageHeader($name, $mustRead, $data, $length);
-        return $header;
-    }
-
-    /**
-     * Deserialize a message body from the input stream
-     *
-     * @return Zend_Amf_Value_MessageBody
-     */
-    public function readBody()
-    {
-        $targetURI   = $this->_inputStream->readUTF();
-        $responseURI = $this->_inputStream->readUTF();
-        $length      = $this->_inputStream->readLong();
-
-        try {
-            $data = $this->_deserializer->readTypeMarker();
-        } catch (Exception $e) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Unable to parse ' . $targetURI . ' body data ' . $e->getMessage(), 0, $e);
-        }
-
-        // Check for AMF3 objectEncoding
-        if ($this->_deserializer->getObjectEncoding() == Zend_Amf_Constants::AMF3_OBJECT_ENCODING) {
-            /*
-             * When and AMF3 message is sent to the server it is nested inside
-             * an AMF0 array called Content. The following code gets the object
-             * out of the content array and sets it as the message data.
-             */
-            if(is_array($data) && $data[0] instanceof Zend_Amf_Value_Messaging_AbstractMessage){
-                $data = $data[0];
-            }
-
-            // set the encoding so we return our message in AMF3
-            $this->_objectEncoding = Zend_Amf_Constants::AMF3_OBJECT_ENCODING;
-        }
-
-        $body = new Zend_Amf_Value_MessageBody($targetURI, $responseURI, $data);
-        return $body;
-    }
-
-    /**
-     * Return an array of the body objects that were found in the amf request.
-     *
-     * @return array {target, response, length, content}
-     */
-    public function getAmfBodies()
-    {
-        return $this->_bodies;
-    }
-
-    /**
-     * Accessor to private array of message bodies.
-     *
-     * @param  Zend_Amf_Value_MessageBody $message
-     * @return Zend_Amf_Request
-     */
-    public function addAmfBody(Zend_Amf_Value_MessageBody $message)
-    {
-        $this->_bodies[] = $message;
-        return $this;
-    }
-
-    /**
-     * Return an array of headers that were found in the amf request.
-     *
-     * @return array {operation, mustUnderstand, length, param}
-     */
-    public function getAmfHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Return the either 0 or 3 for respect AMF version
-     *
-     * @return int
-     */
-    public function getObjectEncoding()
-    {
-        return $this->_objectEncoding;
-    }
-
-    /**
-     * Set the object response encoding
-     *
-     * @param  mixed $int
-     * @return Zend_Amf_Request
-     */
-    public function setObjectEncoding($int)
-    {
-        $this->_objectEncoding = $int;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Request/Http.php b/airtime_mvc/library/Zend/Amf/Request/Http.php
deleted file mode 100644
index 48fb5413a..000000000
--- a/airtime_mvc/library/Zend/Amf/Request/Http.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Request */
-require_once 'Zend/Amf/Request.php';
-
-/**
- * AMF Request object -- Request via HTTP
- *
- * Extends {@link Zend_Amf_Request} to accept a request via HTTP. Request is
- * built at construction time using a raw POST; if no data is available, the
- * request is declared a fault.
- *
- * @package    Zend_Amf
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Request_Http extends Zend_Amf_Request
-{
-    /**
-     * Raw AMF request
-     * @var string
-     */
-    protected $_rawRequest;
-
-    /**
-     * Constructor
-     *
-     * Attempts to read from php://input to get raw POST request; if an error
-     * occurs in doing so, or if the AMF body is invalid, the request is declared a
-     * fault.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        // php://input allows you to read raw POST data. It is a less memory
-        // intensive alternative to $HTTP_RAW_POST_DATA and does not need any
-        // special php.ini directives
-        $amfRequest = file_get_contents('php://input');
-
-        // Check to make sure that we have data on the input stream.
-        if ($amfRequest != '') {
-            $this->_rawRequest = $amfRequest;
-            $this->initialize($amfRequest);
-        } else {
-            echo '<p>Zend Amf Endpoint</p>' ;
-        }
-    }
-
-    /**
-     * Retrieve raw AMF Request
-     *
-     * @return string
-     */
-    public function getRawRequest()
-    {
-        return $this->_rawRequest;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Response.php b/airtime_mvc/library/Zend/Amf/Response.php
deleted file mode 100644
index be77a91ca..000000000
--- a/airtime_mvc/library/Zend/Amf/Response.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** @see Zend_Amf_Parse_OutputStream */
-require_once 'Zend/Amf/Parse/OutputStream.php';
-
-/** @see Zend_Amf_Parse_Amf0_Serializer */
-require_once 'Zend/Amf/Parse/Amf0/Serializer.php';
-
-/**
- * Handles converting the PHP object ready for response back into AMF
- *
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Response
-{
-    /**
-     * @var int Object encoding for response
-     */
-    protected $_objectEncoding = 0;
-
-    /**
-     * Array of Zend_Amf_Value_MessageBody objects
-     * @var array
-     */
-    protected $_bodies = array();
-
-    /**
-     * Array of Zend_Amf_Value_MessageHeader objects
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * @var Zend_Amf_Parse_OutputStream
-     */
-    protected $_outputStream;
-
-    /**
-     * Instantiate new output stream and start serialization
-     *
-     * @return Zend_Amf_Response
-     */
-    public function finalize()
-    {
-        $this->_outputStream = new Zend_Amf_Parse_OutputStream();
-        $this->writeMessage($this->_outputStream);
-        return $this;
-    }
-
-    /**
-     * Serialize the PHP data types back into Actionscript and
-     * create and AMF stream.
-     *
-     * @param  Zend_Amf_Parse_OutputStream $stream
-     * @return Zend_Amf_Response
-     */
-    public function writeMessage(Zend_Amf_Parse_OutputStream $stream)
-    {
-        $objectEncoding = $this->_objectEncoding;
-
-        //Write encoding to start of stream. Preamble byte is written of two byte Unsigned Short
-        $stream->writeByte(0x00);
-        $stream->writeByte($objectEncoding);
-
-        // Loop through the AMF Headers that need to be returned.
-        $headerCount = count($this->_headers);
-        $stream->writeInt($headerCount);
-        foreach ($this->getAmfHeaders() as $header) {
-            $serializer = new Zend_Amf_Parse_Amf0_Serializer($stream);
-            $stream->writeUTF($header->name);
-            $stream->writeByte($header->mustRead);
-            $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH);
-            $serializer->writeTypeMarker($header->data);
-        }
-
-        // loop through the AMF bodies that need to be returned.
-        $bodyCount = count($this->_bodies);
-        $stream->writeInt($bodyCount);
-        foreach ($this->_bodies as $body) {
-            $serializer = new Zend_Amf_Parse_Amf0_Serializer($stream);
-            $stream->writeUTF($body->getTargetURI());
-            $stream->writeUTF($body->getResponseURI());
-            $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH);
-            if($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) {
-                $serializer->writeTypeMarker($body->getData());
-            } else {
-                // Content is AMF3
-                $serializer->writeTypeMarker($body->getData(),Zend_Amf_Constants::AMF0_AMF3);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the output stream content
-     *
-     * @return string The contents of the output stream
-     */
-    public function getResponse()
-    {
-        return $this->_outputStream->getStream();
-    }
-
-    /**
-     * Return the output stream content
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getResponse();
-    }
-
-    /**
-     * Add an AMF body to be sent to the Flash Player
-     *
-     * @param  Zend_Amf_Value_MessageBody $body
-     * @return Zend_Amf_Response
-     */
-    public function addAmfBody(Zend_Amf_Value_MessageBody $body)
-    {
-        $this->_bodies[] = $body;
-        return $this;
-    }
-
-    /**
-     * Return an array of AMF bodies to be serialized
-     *
-     * @return array
-     */
-    public function getAmfBodies()
-    {
-        return $this->_bodies;
-    }
-
-    /**
-     * Add an AMF Header to be sent back to the flash player
-     *
-     * @param  Zend_Amf_Value_MessageHeader $header
-     * @return Zend_Amf_Response
-     */
-    public function addAmfHeader(Zend_Amf_Value_MessageHeader $header)
-    {
-        $this->_headers[] = $header;
-        return $this;
-    }
-
-    /**
-     * Retrieve attached AMF message headers
-     *
-     * @return array Array of Zend_Amf_Value_MessageHeader objects
-     */
-    public function getAmfHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Set the AMF encoding that will be used for serialization
-     *
-     * @param  int $encoding
-     * @return Zend_Amf_Response
-     */
-    public function setObjectEncoding($encoding)
-    {
-        $this->_objectEncoding = $encoding;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Response/Http.php b/airtime_mvc/library/Zend/Amf/Response/Http.php
deleted file mode 100644
index c6e306daf..000000000
--- a/airtime_mvc/library/Zend/Amf/Response/Http.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Response */
-require_once 'Zend/Amf/Response.php';
-
-/**
- * Creates the proper http headers and send the serialized AMF stream to standard out.
- *
- * @package    Zend_Amf
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Response_Http extends Zend_Amf_Response
-{
-    /**
-     * Create the application response header for AMF and sends the serialized AMF string
-     *
-     * @return string
-     */
-    public function getResponse()
-    {
-        if (!headers_sent()) {
-            header('Cache-Control: cache, must-revalidate');
-            header('Pragma: public');
-            header('Content-Type: application/x-amf');
-        }
-        return parent::getResponse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Server.php b/airtime_mvc/library/Zend/Amf/Server.php
deleted file mode 100644
index 3cf4c6bb2..000000000
--- a/airtime_mvc/library/Zend/Amf/Server.php
+++ /dev/null
@@ -1,933 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Server.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/** @see Zend_Server_Interface */
-require_once 'Zend/Server/Interface.php';
-
-/** @see Zend_Server_Reflection */
-require_once 'Zend/Server/Reflection.php';
-
-/** @see Zend_Amf_Constants */
-require_once 'Zend/Amf/Constants.php';
-
-/** @see Zend_Amf_Value_MessageBody */
-require_once 'Zend/Amf/Value/MessageBody.php';
-
-/** @see Zend_Amf_Value_MessageHeader */
-require_once 'Zend/Amf/Value/MessageHeader.php';
-
-/** @see Zend_Amf_Value_Messaging_CommandMessage */
-require_once 'Zend/Amf/Value/Messaging/CommandMessage.php';
-
-/** @see Zend_Loader_PluginLoader */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/** @see Zend_Amf_Parse_TypeLoader */
-require_once 'Zend/Amf/Parse/TypeLoader.php';
-
-/** @see Zend_Auth */
-require_once 'Zend/Auth.php';
-/**
- * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to
- * Zend Framework
- *
- * @todo       Make the reflection methods cache and autoload.
- * @package    Zend_Amf
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Server implements Zend_Server_Interface
-{
-    /**
-     * Array of dispatchables
-     * @var array
-     */
-    protected $_methods = array();
-
-    /**
-     * Array of classes that can be called without being explicitly loaded
-     *
-     * Keys are class names.
-     *
-     * @var array
-     */
-    protected $_classAllowed = array();
-
-    /**
-     * Loader for classes in added directories
-     * @var Zend_Loader_PluginLoader
-     */
-    protected $_loader;
-
-    /**
-     * @var bool Production flag; whether or not to return exception messages
-     */
-    protected $_production = true;
-
-    /**
-     * Request processed
-     * @var null|Zend_Amf_Request
-     */
-    protected $_request = null;
-
-    /**
-     * Class to use for responses
-     * @var null|Zend_Amf_Response
-     */
-    protected $_response;
-
-    /**
-     * Dispatch table of name => method pairs
-     * @var array
-     */
-    protected $_table = array();
-
-    /**
-     *
-     * @var bool session flag; whether or not to add a session to each response.
-     */
-    protected $_session = false;
-
-    /**
-     * Namespace allows all AMF calls to not clobber other php session variables
-     * @var Zend_Session_NameSpace default session namespace zend_amf
-     */
-    protected $_sesionNamespace = 'zend_amf';
-
-    /**
-     * Set the default session.name if php_
-     * @var string
-     */
-    protected $_sessionName = 'PHPSESSID';
-
-    /**
-     * Authentication handler object
-     *
-     * @var Zend_Amf_Auth_Abstract
-     */
-    protected $_auth;
-    /**
-     * ACL handler object
-     *
-     * @var Zend_Acl
-     */
-    protected $_acl;
-    /**
-     * The server constructor
-     */
-    public function __construct()
-    {
-        Zend_Amf_Parse_TypeLoader::setResourceLoader(new Zend_Loader_PluginLoader(array("Zend_Amf_Parse_Resource" => "Zend/Amf/Parse/Resource")));
-    }
-
-    /**
-     * Set authentication adapter
-     *
-     * @param  Zend_Amf_Auth_Abstract $auth
-     * @return Zend_Amf_Server
-     */
-    public function setAuth(Zend_Amf_Auth_Abstract $auth)
-    {
-        $this->_auth = $auth;
-        return $this;
-    }
-   /**
-     * Get authentication adapter
-     *
-     * @return Zend_Amf_Auth_Abstract
-     */
-    public function getAuth()
-    {
-        return $this->_auth;
-    }
-
-    /**
-     * Set ACL adapter
-     *
-     * @param  Zend_Acl $acl
-     * @return Zend_Amf_Server
-     */
-    public function setAcl(Zend_Acl $acl)
-    {
-        $this->_acl = $acl;
-        return $this;
-    }
-   /**
-     * Get ACL adapter
-     *
-     * @return Zend_Acl
-     */
-    public function getAcl()
-    {
-        return $this->_acl;
-    }
-
-    /**
-     * Set production flag
-     *
-     * @param  bool $flag
-     * @return Zend_Amf_Server
-     */
-    public function setProduction($flag)
-    {
-        $this->_production = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Whether or not the server is in production
-     *
-     * @return bool
-     */
-    public function isProduction()
-    {
-        return $this->_production;
-    }
-
-    /**
-     * @param namespace of all incoming sessions defaults to Zend_Amf
-     * @return Zend_Amf_Server
-     */
-    public function setSession($namespace = 'Zend_Amf')
-    {
-        require_once 'Zend/Session.php';
-        $this->_session = true;
-        $this->_sesionNamespace = new Zend_Session_Namespace($namespace);
-        return $this;
-    }
-
-    /**
-     * Whether of not the server is using sessions
-     * @return bool
-     */
-    public function isSession()
-    {
-        return $this->_session;
-    }
-
-    /**
-     * Check if the ACL allows accessing the function or method
-     *
-     * @param string|object $object Object or class being accessed
-     * @param string $function Function or method being accessed
-     * @return unknown_type
-     */
-    protected function _checkAcl($object, $function)
-    {
-        if(!$this->_acl) {
-            return true;
-        }
-        if($object) {
-            $class = is_object($object)?get_class($object):$object;
-            if(!$this->_acl->has($class)) {
-                require_once 'Zend/Acl/Resource.php';
-                $this->_acl->add(new Zend_Acl_Resource($class));
-            }
-            $call = array($object, "initAcl");
-            if(is_callable($call) && !call_user_func($call, $this->_acl)) {
-                // if initAcl returns false, no ACL check
-                return true;
-            }
-        } else {
-            $class = null;
-        }
-
-        $auth = Zend_Auth::getInstance();
-        if($auth->hasIdentity()) {
-            $role = $auth->getIdentity()->role;
-        } else {
-            if($this->_acl->hasRole(Zend_Amf_Constants::GUEST_ROLE)) {
-                $role = Zend_Amf_Constants::GUEST_ROLE;
-            } else {
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception("Unauthenticated access not allowed");
-            }
-        }
-        if($this->_acl->isAllowed($role, $class, $function)) {
-            return true;
-        } else {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception("Access not allowed");
-        }
-    }
-
-    /**
-     * Get PluginLoader for the Server
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    protected function getLoader()
-    {
-        if(empty($this->_loader)) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            $this->_loader = new Zend_Loader_PluginLoader();
-        }
-        return $this->_loader;
-    }
-
-    /**
-     * Loads a remote class or method and executes the function and returns
-     * the result
-     *
-     * @param  string $method Is the method to execute
-     * @param  mixed $param values for the method
-     * @return mixed $response the result of executing the method
-     * @throws Zend_Amf_Server_Exception
-     */
-    protected function _dispatch($method, $params = null, $source = null)
-    {
-        if($source) {
-            if(($mapped = Zend_Amf_Parse_TypeLoader::getMappedClassName($source)) !== false) {
-                $source = $mapped;
-            }
-        }
-        $qualifiedName = empty($source) ? $method : $source.".".$method;
-
-        if (!isset($this->_table[$qualifiedName])) {
-            // if source is null a method that was not defined was called.
-            if ($source) {
-                $className = str_replace(".", "_", $source);
-                if(class_exists($className, false) && !isset($this->_classAllowed[$className])) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()');
-                }
-                try {
-                    $this->getLoader()->load($className);
-                } catch (Exception $e) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e);
-                }
-                // Add the new loaded class to the server.
-                $this->setClass($className, $source);
-            } else {
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist');
-            }
-        }
-
-        $info = $this->_table[$qualifiedName];
-        $argv = $info->getInvokeArguments();
-
-        if (0 < count($argv)) {
-            $params = array_merge($params, $argv);
-        }
-
-        if ($info instanceof Zend_Server_Reflection_Function) {
-            $func = $info->getName();
-            $this->_checkAcl(null, $func);
-            $return = call_user_func_array($func, $params);
-        } elseif ($info instanceof Zend_Server_Reflection_Method) {
-            // Get class
-            $class = $info->getDeclaringClass()->getName();
-            if ('static' == $info->isStatic()) {
-                // for some reason, invokeArgs() does not work the same as
-                // invoke(), and expects the first argument to be an object.
-                // So, using a callback if the method is static.
-                $this->_checkAcl($class, $info->getName());
-                $return = call_user_func_array(array($class, $info->getName()), $params);
-            } else {
-                // Object methods
-                try {
-                    $object = $info->getDeclaringClass()->newInstance();
-                } catch (Exception $e) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $info->getName() . ': '.$e->getMessage(), 621, $e);
-                }
-                $this->_checkAcl($object, $info->getName());
-                $return = $info->invokeArgs($object, $params);
-            }
-        } else {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Method missing implementation ' . get_class($info));
-        }
-
-        return $return;
-    }
-
-    /**
-     * Handles each of the 11 different command message types.
-     *
-     * A command message is a flex.messaging.messages.CommandMessage
-     *
-     * @see    Zend_Amf_Value_Messaging_CommandMessage
-     * @param  Zend_Amf_Value_Messaging_CommandMessage $message
-     * @return Zend_Amf_Value_Messaging_AcknowledgeMessage
-     */
-    protected function _loadCommandMessage(Zend_Amf_Value_Messaging_CommandMessage $message)
-    {
-        require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
-        switch($message->operation) {
-            case Zend_Amf_Value_Messaging_CommandMessage::DISCONNECT_OPERATION :
-            case Zend_Amf_Value_Messaging_CommandMessage::CLIENT_PING_OPERATION :
-                $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
-                break;
-            case Zend_Amf_Value_Messaging_CommandMessage::LOGIN_OPERATION :
-                $data = explode(':', base64_decode($message->body));
-                $userid = $data[0];
-                $password = isset($data[1])?$data[1]:"";
-                if(empty($userid)) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Login failed: username not supplied');
-                }
-                if(!$this->_handleAuth($userid, $password)) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Authentication failed');
-                }
-                $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
-                break;
-           case Zend_Amf_Value_Messaging_CommandMessage::LOGOUT_OPERATION :
-                if($this->_auth) {
-                    Zend_Auth::getInstance()->clearIdentity();
-                }
-                $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
-                break;
-            default :
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception('CommandMessage::' . $message->operation . ' not implemented');
-                break;
-        }
-        return $return;
-    }
-
-    /**
-     * Create appropriate error message
-     *
-     * @param int $objectEncoding Current AMF encoding
-     * @param string $message Message that was being processed when error happened
-     * @param string $description Error description
-     * @param mixed $detail Detailed data about the error
-     * @param int $code Error code
-     * @param int $line Error line
-     * @return Zend_Amf_Value_Messaging_ErrorMessage|array
-     */
-    protected function _errorMessage($objectEncoding, $message, $description, $detail, $code, $line)
-    {
-        $return = null;
-        switch ($objectEncoding) {
-            case Zend_Amf_Constants::AMF0_OBJECT_ENCODING :
-                return array (
-                        'description' => ($this->isProduction ()) ? '' : $description,
-                        'detail' => ($this->isProduction ()) ? '' : $detail,
-                        'line' => ($this->isProduction ()) ? 0 : $line,
-                        'code' => $code
-                );
-            case Zend_Amf_Constants::AMF3_OBJECT_ENCODING :
-                require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php';
-                $return = new Zend_Amf_Value_Messaging_ErrorMessage ( $message );
-                $return->faultString = $this->isProduction () ? '' : $description;
-                $return->faultCode = $code;
-                $return->faultDetail = $this->isProduction () ? '' : $detail;
-                break;
-        }
-        return $return;
-    }
-
-    /**
-     * Handle AMF authentication
-     *
-     * @param string $userid
-     * @param string $password
-     * @return boolean
-     */
-    protected function _handleAuth( $userid,  $password)
-    {
-        if (!$this->_auth) {
-            return true;
-        }
-        $this->_auth->setCredentials($userid, $password);
-        $auth = Zend_Auth::getInstance();
-        $result = $auth->authenticate($this->_auth);
-        if ($result->isValid()) {
-            if (!$this->isSession()) {
-                $this->setSession();
-            }
-            return true;
-        } else {
-            // authentication failed, good bye
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception(
-                "Authentication failed: " . join("\n",
-                    $result->getMessages()), $result->getCode());
-        }
-
-    }
-
-    /**
-     * Takes the deserialized AMF request and performs any operations.
-     *
-     * @todo   should implement and SPL observer pattern for custom AMF headers
-     * @todo   DescribeService support
-     * @param  Zend_Amf_Request $request
-     * @return Zend_Amf_Response
-     * @throws Zend_Amf_server_Exception|Exception
-     */
-    protected function _handle(Zend_Amf_Request $request)
-    {
-        // Get the object encoding of the request.
-        $objectEncoding = $request->getObjectEncoding();
-
-        // create a response object to place the output from the services.
-        $response = $this->getResponse();
-
-        // set response encoding
-        $response->setObjectEncoding($objectEncoding);
-
-        $responseBody = $request->getAmfBodies();
-
-        $handleAuth = false;
-        if ($this->_auth) {
-            $headers = $request->getAmfHeaders();
-            if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) &&
-                isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) {
-                $handleAuth = true;
-            }
-        }
-
-        // Iterate through each of the service calls in the AMF request
-        foreach($responseBody as $body)
-        {
-            try {
-                if ($handleAuth) {
-                    if ($this->_handleAuth(
-                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid,
-                        $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) {
-                        // use RequestPersistentHeader to clear credentials
-                        $response->addAmfHeader(
-                            new Zend_Amf_Value_MessageHeader(
-                                Zend_Amf_Constants::PERSISTENT_HEADER,
-                                false,
-                                new Zend_Amf_Value_MessageHeader(
-                                    Zend_Amf_Constants::CREDENTIALS_HEADER,
-                                    false, null)));
-                        $handleAuth = false;
-                    }
-                }
-
-                if ($objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) {
-                    // AMF0 Object Encoding
-                    $targetURI = $body->getTargetURI();
-                    $message = '';
-
-                    // Split the target string into its values.
-                    $source = substr($targetURI, 0, strrpos($targetURI, '.'));
-
-                    if ($source) {
-                        // Break off method name from namespace into source
-                        $method = substr(strrchr($targetURI, '.'), 1);
-                        $return = $this->_dispatch($method, $body->getData(), $source);
-                    } else {
-                        // Just have a method name.
-                        $return = $this->_dispatch($targetURI, $body->getData());
-                    }
-                } else {
-                    // AMF3 read message type
-                    $message = $body->getData();
-                    if ($message instanceof Zend_Amf_Value_Messaging_CommandMessage) {
-                        // async call with command message
-                        $return = $this->_loadCommandMessage($message);
-                    } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) {
-                        require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
-                        $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message);
-                        $return->body = $this->_dispatch($message->operation, $message->body, $message->source);
-                    } else {
-                        // Amf3 message sent with netConnection
-                        $targetURI = $body->getTargetURI();
-
-                        // Split the target string into its values.
-                        $source = substr($targetURI, 0, strrpos($targetURI, '.'));
-
-                        if ($source) {
-                            // Break off method name from namespace into source
-                            $method = substr(strrchr($targetURI, '.'), 1);
-                            $return = $this->_dispatch($method, $body->getData(), $source);
-                        } else {
-                            // Just have a method name.
-                            $return = $this->_dispatch($targetURI, $body->getData());
-                        }
-                    }
-                }
-                $responseType = Zend_AMF_Constants::RESULT_METHOD;
-            } catch (Exception $e) {
-                $return = $this->_errorMessage($objectEncoding, $message,
-                    $e->getMessage(), $e->getTraceAsString(),$e->getCode(),  $e->getLine());
-                $responseType = Zend_AMF_Constants::STATUS_METHOD;
-            }
-
-            $responseURI = $body->getResponseURI() . $responseType;
-            $newBody     = new Zend_Amf_Value_MessageBody($responseURI, null, $return);
-            $response->addAmfBody($newBody);
-        }
-        // Add a session header to the body if session is requested.
-        if($this->isSession()) {
-           $currentID = session_id();
-           $joint = "?";
-           if(isset($_SERVER['QUERY_STRING'])) {
-               if(!strpos($_SERVER['QUERY_STRING'], $currentID) !== FALSE) {
-                   if(strrpos($_SERVER['QUERY_STRING'], "?") !== FALSE) {
-                       $joint = "&";
-                   }
-               }
-           }
-
-            // create a new AMF message header with the session id as a variable.
-            $sessionValue = $joint . $this->_sessionName . "=" . $currentID;
-            $sessionHeader = new Zend_Amf_Value_MessageHeader(Zend_Amf_Constants::URL_APPEND_HEADER, false, $sessionValue);
-            $response->addAmfHeader($sessionHeader);
-        }
-
-        // serialize the response and return serialized body.
-        $response->finalize();
-    }
-
-    /**
-     * Handle an AMF call from the gateway.
-     *
-     * @param  null|Zend_Amf_Request $request Optional
-     * @return Zend_Amf_Response
-     */
-    public function handle($request = null)
-    {
-        // Check if request was passed otherwise get it from the server
-        if (is_null($request) || !$request instanceof Zend_Amf_Request) {
-            $request = $this->getRequest();
-        } else {
-            $this->setRequest($request);
-        }
-        if ($this->isSession()) {
-             // Check if a session is being sent from the amf call
-             if (isset($_COOKIE[$this->_sessionName])) {
-                 session_id($_COOKIE[$this->_sessionName]);
-             }
-        }
-
-        // Check for errors that may have happend in deserialization of Request.
-        try {
-            // Take converted PHP objects and handle service call.
-            // Serialize to Zend_Amf_response for output stream
-            $this->_handle($request);
-            $response = $this->getResponse();
-        } catch (Exception $e) {
-            // Handle any errors in the serialization and service  calls.
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Handle error: ' . $e->getMessage() . ' ' . $e->getLine(), 0, $e);
-        }
-
-        // Return the Amf serialized output string
-        return $response;
-    }
-
-    /**
-     * Set request object
-     *
-     * @param  string|Zend_Amf_Request $request
-     * @return Zend_Amf_Server
-     */
-    public function setRequest($request)
-    {
-        if (is_string($request) && class_exists($request)) {
-            $request = new $request();
-            if (!$request instanceof Zend_Amf_Request) {
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception('Invalid request class');
-            }
-        } elseif (!$request instanceof Zend_Amf_Request) {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Invalid request object');
-        }
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * Return currently registered request object
-     *
-     * @return null|Zend_Amf_Request
-     */
-    public function getRequest()
-    {
-        if (null === $this->_request) {
-            require_once 'Zend/Amf/Request/Http.php';
-            $this->setRequest(new Zend_Amf_Request_Http());
-        }
-
-        return $this->_request;
-    }
-
-    /**
-     * Public access method to private Zend_Amf_Server_Response reference
-     *
-     * @param  string|Zend_Amf_Server_Response $response
-     * @return Zend_Amf_Server
-     */
-    public function setResponse($response)
-    {
-        if (is_string($response) && class_exists($response)) {
-            $response = new $response();
-            if (!$response instanceof Zend_Amf_Response) {
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception('Invalid response class');
-            }
-        } elseif (!$response instanceof Zend_Amf_Response) {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Invalid response object');
-        }
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * get a reference to the Zend_Amf_response instance
-     *
-     * @return Zend_Amf_Server_Response
-     */
-    public function getResponse()
-    {
-        if (null === ($response = $this->_response)) {
-            require_once 'Zend/Amf/Response/Http.php';
-            $this->setResponse(new Zend_Amf_Response_Http());
-        }
-        return $this->_response;
-    }
-
-    /**
-     * Attach a class or object to the server
-     *
-     * Class may be either a class name or an instantiated object. Reflection
-     * is done on the class or object to determine the available public
-     * methods, and each is attached to the server as and available method. If
-     * a $namespace has been provided, that namespace is used to prefix
-     * AMF service call.
-     *
-     * @param  string|object $class
-     * @param  string $namespace Optional
-     * @param  mixed $arg Optional arguments to pass to a method
-     * @return Zend_Amf_Server
-     * @throws Zend_Amf_Server_Exception on invalid input
-     */
-    public function setClass($class, $namespace = '', $argv = null)
-    {
-        if (is_string($class) && !class_exists($class)){
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Invalid method or class');
-        } elseif (!is_string($class) && !is_object($class)) {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object');
-        }
-
-        $argv = null;
-        if (2 < func_num_args()) {
-            $argv = array_slice(func_get_args(), 2);
-        }
-
-        // Use the class name as the name space by default.
-
-        if ($namespace == '') {
-            $namespace = is_object($class) ? get_class($class) : $class;
-        }
-
-        $this->_classAllowed[is_object($class) ? get_class($class) : $class] = true;
-
-        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
-        $this->_buildDispatchTable();
-
-        return $this;
-    }
-
-    /**
-     * Attach a function to the server
-     *
-     * Additional arguments to pass to the function at dispatch may be passed;
-     * any arguments following the namespace will be aggregated and passed at
-     * dispatch time.
-     *
-     * @param  string|array $function Valid callback
-     * @param  string $namespace Optional namespace prefix
-     * @return Zend_Amf_Server
-     * @throws Zend_Amf_Server_Exception
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        if (!is_string($function) && !is_array($function)) {
-            require_once 'Zend/Amf/Server/Exception.php';
-            throw new Zend_Amf_Server_Exception('Unable to attach function');
-        }
-
-        $argv = null;
-        if (2 < func_num_args()) {
-            $argv = array_slice(func_get_args(), 2);
-        }
-
-        $function = (array) $function;
-        foreach ($function as $func) {
-            if (!is_string($func) || !function_exists($func)) {
-                require_once 'Zend/Amf/Server/Exception.php';
-                throw new Zend_Amf_Server_Exception('Unable to attach function');
-            }
-            $this->_methods[] = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace);
-        }
-
-        $this->_buildDispatchTable();
-        return $this;
-    }
-
-
-    /**
-     * Creates an array of directories in which services can reside.
-     * TODO: add support for prefixes?
-     *
-     * @param string $dir
-     */
-    public function addDirectory($dir)
-    {
-        $this->getLoader()->addPrefixPath("", $dir);
-    }
-
-    /**
-     * Returns an array of directories that can hold services.
-     *
-     * @return array
-     */
-    public function getDirectory()
-    {
-        return $this->getLoader()->getPaths("");
-    }
-
-    /**
-     * (Re)Build the dispatch table
-     *
-     * The dispatch table consists of a an array of method name =>
-     * Zend_Server_Reflection_Function_Abstract pairs
-     *
-     * @return void
-     */
-    protected function _buildDispatchTable()
-    {
-        $table = array();
-        foreach ($this->_methods as $key => $dispatchable) {
-            if ($dispatchable instanceof Zend_Server_Reflection_Function_Abstract) {
-                $ns   = $dispatchable->getNamespace();
-                $name = $dispatchable->getName();
-                $name = empty($ns) ? $name : $ns . '.' . $name;
-
-                if (isset($table[$name])) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name);
-                }
-                $table[$name] = $dispatchable;
-                continue;
-            }
-
-            if ($dispatchable instanceof Zend_Server_Reflection_Class) {
-                foreach ($dispatchable->getMethods() as $method) {
-                    $ns   = $method->getNamespace();
-                    $name = $method->getName();
-                    $name = empty($ns) ? $name : $ns . '.' . $name;
-
-                    if (isset($table[$name])) {
-                        require_once 'Zend/Amf/Server/Exception.php';
-                        throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name);
-                    }
-                    $table[$name] = $method;
-                    continue;
-                }
-            }
-        }
-        $this->_table = $table;
-    }
-
-
-
-    /**
-     * Raise a server fault
-     *
-     * Unimplemented
-     *
-     * @param  string|Exception $fault
-     * @return void
-     */
-    public function fault($fault = null, $code = 404)
-    {
-    }
-
-    /**
-     * Returns a list of registered methods
-     *
-     * Returns an array of dispatchables (Zend_Server_Reflection_Function,
-     * _Method, and _Class items).
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Set server persistence
-     *
-     * Unimplemented
-     *
-     * @param  mixed $mode
-     * @return void
-     */
-    public function setPersistence($mode)
-    {
-    }
-
-    /**
-     * Load server definition
-     *
-     * Unimplemented
-     *
-     * @param  array $definition
-     * @return void
-     */
-    public function loadFunctions($definition)
-    {
-    }
-
-    /**
-     * Map ActionScript classes to PHP classes
-     *
-     * @param  string $asClass
-     * @param  string $phpClass
-     * @return Zend_Amf_Server
-     */
-    public function setClassMap($asClass, $phpClass)
-    {
-        require_once 'Zend/Amf/Parse/TypeLoader.php';
-        Zend_Amf_Parse_TypeLoader::setMapping($asClass, $phpClass);
-        return $this;
-    }
-
-    /**
-     * List all available methods
-     *
-     * Returns an array of method names.
-     *
-     * @return array
-     */
-    public function listMethods()
-    {
-        return array_keys($this->_table);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Server/Exception.php b/airtime_mvc/library/Zend/Amf/Server/Exception.php
deleted file mode 100644
index c970707b2..000000000
--- a/airtime_mvc/library/Zend/Amf/Server/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Exception */
-require_once 'Zend/Amf/Exception.php';
-
-/**
- * Zend_Amf_Server_Exception
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Server_Exception extends Zend_Amf_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Amf/Util/BinaryStream.php b/airtime_mvc/library/Zend/Amf/Util/BinaryStream.php
deleted file mode 100644
index faa532af4..000000000
--- a/airtime_mvc/library/Zend/Amf/Util/BinaryStream.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Util
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BinaryStream.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
- */
-
-/**
- * Utility class to walk through a data stream byte by byte with conventional names
- *
- * @package    Zend_Amf
- * @subpackage Util
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Util_BinaryStream
-{
-    /**
-     * @var string Byte stream
-     */
-    protected $_stream;
-
-    /**
-     * @var int Length of stream
-     */
-    protected $_streamLength;
-
-    /**
-     * @var bool BigEndian encoding?
-     */
-    protected $_bigEndian;
-
-    /**
-     * @var int Current position in stream
-     */
-    protected $_needle;
-
-    /**
-     * Constructor
-     *
-     * Create a reference to a byte stream that is going to be parsed or created
-     * by the methods in the class. Detect if the class should use big or
-     * little Endian encoding.
-     *
-     * @param  string $stream use '' if creating a new stream or pass a string if reading.
-     * @return void
-     */
-    public function __construct($stream)
-    {
-        if (!is_string($stream)) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Inputdata is not of type String');
-        }
-
-        $this->_stream       = $stream;
-        $this->_needle       = 0;
-        $this->_streamLength = strlen($stream);
-        $this->_bigEndian    = (pack('l', 1) === "\x00\x00\x00\x01");
-    }
-
-    /**
-     * Returns the current stream
-     *
-     * @return string
-     */
-    public function getStream()
-    {
-        return $this->_stream;
-    }
-
-    /**
-     * Read the number of bytes in a row for the length supplied.
-     *
-     * @todo   Should check that there are enough bytes left in the stream we are about to read.
-     * @param  int $length
-     * @return string
-     * @throws Zend_Amf_Exception for buffer underrun
-     */
-    public function readBytes($length)
-    {
-        if (($length + $this->_needle) > $this->_streamLength) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
-        }
-        $bytes = substr($this->_stream, $this->_needle, $length);
-        $this->_needle+= $length;
-        return $bytes;
-    }
-
-    /**
-     * Write any length of bytes to the stream
-     *
-     * Usually a string.
-     *
-     * @param  string $bytes
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeBytes($bytes)
-    {
-        $this->_stream.= $bytes;
-        return $this;
-    }
-
-    /**
-     * Reads a signed byte
-     *
-     * @return int Value is in the range of -128 to 127.
-     */
-    public function readByte()
-    {
-        if (($this->_needle + 1) > $this->_streamLength) {
-            require_once 'Zend/Amf/Exception.php';
-            throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
-        }
-
-        return ord($this->_stream{$this->_needle++});
-    }
-
-    /**
-     * Writes the passed string into a signed byte on the stream.
-     *
-     * @param  string $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeByte($stream)
-    {
-        $this->_stream.= pack('c', $stream);
-        return $this;
-    }
-
-    /**
-     * Reads a signed 32-bit integer from the data stream.
-     *
-     * @return int Value is in the range of -2147483648 to 2147483647
-     */
-    public function readInt()
-    {
-        return ($this->readByte() << 8) + $this->readByte();
-    }
-
-    /**
-     * Write an the integer to the output stream as a 32 bit signed integer
-     *
-     * @param  int $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeInt($stream)
-    {
-        $this->_stream.= pack('n', $stream);
-        return $this;
-    }
-
-    /**
-     * Reads a UTF-8 string from the data stream
-     *
-     * @return string A UTF-8 string produced by the byte representation of characters
-     */
-    public function readUtf()
-    {
-        $length = $this->readInt();
-        return $this->readBytes($length);
-    }
-
-    /**
-     * Wite a UTF-8 string to the outputstream
-     *
-     * @param  string $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeUtf($stream)
-    {
-        $this->writeInt(strlen($stream));
-        $this->_stream.= $stream;
-        return $this;
-    }
-
-
-    /**
-     * Read a long UTF string
-     *
-     * @return string
-     */
-    public function readLongUtf()
-    {
-        $length = $this->readLong();
-        return $this->readBytes($length);
-    }
-
-    /**
-     * Write a long UTF string to the buffer
-     *
-     * @param  string $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeLongUtf($stream)
-    {
-        $this->writeLong(strlen($stream));
-        $this->_stream.= $stream;
-    }
-
-    /**
-     * Read a long numeric value
-     *
-     * @return double
-     */
-    public function readLong()
-    {
-        return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
-    }
-
-    /**
-     * Write long numeric value to output stream
-     *
-     * @param  int|string $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeLong($stream)
-    {
-        $this->_stream.= pack('N', $stream);
-        return $this;
-    }
-
-    /**
-     * Read a 16 bit unsigned short.
-     *
-     * @todo   This could use the unpack() w/ S,n, or v
-     * @return double
-     */
-    public function readUnsignedShort()
-    {
-        $byte1 = $this->readByte();
-        $byte2 = $this->readByte();
-        return (($byte1 << 8) | $byte2);
-    }
-
-    /**
-     * Reads an IEEE 754 double-precision floating point number from the data stream.
-     *
-     * @return double Floating point number
-     */
-    public function readDouble()
-    {
-        $bytes = substr($this->_stream, $this->_needle, 8);
-        $this->_needle+= 8;
-
-        if (!$this->_bigEndian) {
-            $bytes = strrev($bytes);
-        }
-
-        $double = unpack('dflt', $bytes);
-        return $double['flt'];
-    }
-
-    /**
-     * Writes an IEEE 754 double-precision floating point number from the data stream.
-     *
-     * @param  string|double $stream
-     * @return Zend_Amf_Util_BinaryStream
-     */
-    public function writeDouble($stream)
-    {
-        $stream = pack('d', $stream);
-        if (!$this->_bigEndian) {
-            $stream = strrev($stream);
-        }
-        $this->_stream.= $stream;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/ByteArray.php b/airtime_mvc/library/Zend/Amf/Value/ByteArray.php
deleted file mode 100644
index f6e9de74b..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/ByteArray.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ByteArray.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Wrapper class to store an AMF3 flash.utils.ByteArray
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_ByteArray
-{
-    /**
-     * @var string ByteString Data
-     */
-    protected $_data = '';
-
-    /**
-     * Create a ByteArray
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function __construct($data)
-    {
-        $this->_data = $data;
-    }
-
-    /**
-     * Return the byte stream
-     *
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/MessageBody.php b/airtime_mvc/library/Zend/Amf/Value/MessageBody.php
deleted file mode 100644
index e366291d4..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/MessageBody.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MessageBody.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * An AMF Message contains information about the actual individual
- * transaction that is to be performed. It specifies the remote
- * operation that is to be performed; a local (client) operation
- * to be invoked upon success; and, the data to be used in the
- * operation.
- * <p/>
- * This Message structure defines how a local client would
- * invoke a method/operation on a remote server. Additionally,
- * the response from the Server is structured identically.
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_MessageBody
-{
-    /**
-     * A string describing which operation, function, or method
-     * is to be remotley invoked.
-     * @var string
-     */
-    protected $_targetUri = "";
-
-    /**
-     * Universal Resource Identifier that uniquely targets the originator's
-     * Object that should receive the server's response. The server will
-     * use this path specification to target the "OnResult()" or "onStatus()"
-     * handlers within the client. For Flash, it specifies an ActionScript
-     * Object path only. The NetResponse object pointed to by the Response Uri
-     * contains the connection state information. Passing/specifying this
-     * provides a convenient mechanism for the client/server to share access
-     * to an object that is managing the state of the shared connection.
-     *
-     * Since the server will use this field in the event of an error,
-     * this field is required even if a successful server request would
-     * not be expected to return a value to the client.
-     *
-     * @var string
-     */
-    protected $_responseUri = "";
-
-    /**
-     * Contains the actual data associated with the operation. It contains
-     * the client's parameter data that is passed to the server's operation/method.
-     * When serializing a root level data type or a parameter list array, no
-     * name field is included. That is, the data is anonomously represented
-     * as "Type Marker"/"Value" pairs. When serializing member data, the data is
-     * represented as a series of "Name"/"Type"/"Value" combinations.
-     *
-     * For server generated responses, it may contain any ActionScript
-     * data/objects that the server was expected to provide.
-     *
-     * @var string
-     */
-    protected $_data;
-
-    /**
-     * Constructor
-     *
-     * @param  string $targetUri
-     * @param  string $responseUri
-     * @param  string $data
-     * @return void
-     */
-    public function __construct($targetUri, $responseUri, $data)
-    {
-        $this->setTargetUri($targetUri);
-        $this->setResponseUri($responseUri);
-        $this->setData($data);
-    }
-
-    /**
-     * Retrieve target Uri
-     *
-     * @return string
-     */
-    public function getTargetUri()
-    {
-        return $this->_targetUri;
-    }
-
-    /**
-     * Set target Uri
-     *
-     * @param  string $targetUri
-     * @return Zend_Amf_Value_MessageBody
-     */
-    public function setTargetUri($targetUri)
-    {
-        if (null === $targetUri) {
-            $targetUri = '';
-        }
-        $this->_targetUri = (string) $targetUri;
-        return $this;
-    }
-
-    /**
-     * Get target Uri
-     *
-     * @return string
-     */
-    public function getResponseUri()
-    {
-        return $this->_responseUri;
-    }
-
-    /**
-     * Set response Uri
-     *
-     * @param  string $responseUri
-     * @return Zend_Amf_Value_MessageBody
-     */
-    public function setResponseUri($responseUri)
-    {
-        if (null === $responseUri) {
-            $responseUri = '';
-        }
-        $this->_responseUri = $responseUri;
-        return $this;
-    }
-
-    /**
-     * Retrieve response data
-     *
-     * @return string
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Set response data
-     *
-     * @param  mixed $data
-     * @return Zend_Amf_Value_MessageBody
-     */
-    public function setData($data)
-    {
-        $this->_data = $data;
-        return $this;
-    }
-
-    /**
-     * Set reply method
-     *
-     * @param  string $methodName
-     * @return Zend_Amf_Value_MessageBody
-     */
-    public function setReplyMethod($methodName)
-    {
-        if (!preg_match('#^[/?]#', $methodName)) {
-            $this->_targetUri = rtrim($this->_targetUri, '/') . '/';
-        }
-        $this->_targetUri = $this->_targetUri . $methodName;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/MessageHeader.php b/airtime_mvc/library/Zend/Amf/Value/MessageHeader.php
deleted file mode 100644
index 124b2b3bd..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/MessageHeader.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MessageHeader.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Message Headers provide context for the processing of the
- * the AMF Packet and all subsequent Messages.
- *
- * Multiple Message Headers may be included within an AMF Packet.
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_MessageHeader
-{
-    /**
-     * Name of the header
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Flag if the data has to be parsed on return
-     *
-     * @var boolean
-     */
-    public $mustRead;
-
-    /**
-     * Length of the data field
-     *
-     * @var int
-     */
-    public $length;
-
-    /**
-     * Data sent with the header name
-     *
-     * @var mixed
-     */
-    public $data;
-
-    /**
-     * Used to create and store AMF Header data.
-     *
-     * @param String $name
-     * @param Boolean $mustRead
-     * @param misc $content
-     * @param integer $length
-     */
-    public function __construct($name, $mustRead, $data, $length=null)
-    {
-        $this->name     = $name;
-        $this->mustRead = (bool) $mustRead;
-        $this->data     = $data;
-        if (null !== $length) {
-            $this->length = (int) $length;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/AbstractMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/AbstractMessage.php
deleted file mode 100644
index 1974405a5..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/AbstractMessage.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AbstractMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This is the default Implementation of Message, which provides
- * a convenient base for behavior and association of common endpoints
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_AbstractMessage
-{
-    /**
-     * @var string Client identifier
-     */
-    public $clientId;
-
-    /**
-     * @var string Destination
-     */
-    public $destination;
-
-    /**
-     * @var string Message identifier
-     */
-    public $messageId;
-
-    /**
-     * @var int Message timestamp
-     */
-    public $timestamp;
-
-    /**
-     * @var int Message TTL
-     */
-    public $timeToLive;
-
-    /**
-     * @var object Message headers
-     */
-    public $headers;
-
-    /**
-     * @var string Message body
-     */
-    public $body;
-
-    /**
-     * generate a unique id
-     *
-     * Format is: ########-####-####-####-############
-     * Where # is an uppercase letter or number
-     * example: 6D9DC7EC-A273-83A9-ABE3-00005FD752D6
-     *
-     * @return string
-     */
-    public function generateId()
-    {
-        return sprintf(
-            '%08X-%04X-%04X-%02X%02X-%012X',
-            mt_rand(),
-            mt_rand(0, 65535),
-            bindec(substr_replace(
-                sprintf('%016b', mt_rand(0, 65535)), '0100', 11, 4)
-            ),
-            bindec(substr_replace(sprintf('%08b', mt_rand(0, 255)), '01', 5, 2)),
-            mt_rand(0, 255),
-            mt_rand()
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
deleted file mode 100644
index 5b96f2541..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AcknowledgeMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Value_Messaging_AsyncMessage */
-require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
-
-/**
- * This is the type of message returned by the MessageBroker
- * to endpoints after the broker has routed an endpoint's message
- * to a service.
- *
- * flex.messaging.messages.AcknowledgeMessage
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage
-{
-    /**
-     * Create a new Acknowledge Message
-     *
-     * @param unknown_type $message
-     */
-    public function __construct($message)
-    {
-        $this->clientId    = $this->generateId();
-        $this->destination = null;
-        $this->messageId   = $this->generateId();
-        $this->timestamp   = time().'00';
-        $this->timeToLive  = 0;
-        $this->headers     = new STDClass();
-        $this->body        = null;
-
-        // correleate the two messages
-        if ($message && isset($message->messageId)) {
-            $this->correlationId = $message->messageId;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/ArrayCollection.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/ArrayCollection.php
deleted file mode 100644
index a862c67c0..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/ArrayCollection.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ArrayCollection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Type encapsulating Flex ArrayCollection
- *
- * Corresponds to flex.messaging.io.ArrayCollection
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_ArrayCollection
-{
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/AsyncMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/AsyncMessage.php
deleted file mode 100644
index 0e02f2ee1..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/AsyncMessage.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AsyncMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Amf_Value_Messaging_AbstractMessage */
-require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
-
-/**
- * This type of message contains information necessary to perform
- * point-to-point or publish-subscribe messaging.
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage
-{
-    /**
-     * The message id to be responded to.
-     * @var String
-     */
-    public $correlationId;
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/CommandMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/CommandMessage.php
deleted file mode 100644
index e926a5e31..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/CommandMessage.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommandMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Amf_Value_Messaging_AsyncMessage
- */
-require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
-
-/**
- * A message that represents an infrastructure command passed between
- * client and server. Subscribe/unsubscribe operations result in
- * CommandMessage transmissions, as do polling operations.
- *
- * Corresponds to flex.messaging.messages.CommandMessage
- *
- * Note: THESE VALUES MUST BE THE SAME ON CLIENT AND SERVER
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage
-{
-    /**
-     *  This operation is used to subscribe to a remote destination.
-     */
-    const SUBSCRIBE_OPERATION = 0;
-
-    /**
-     * This operation is used to unsubscribe from a remote destination.
-     */
-    const UNSUSBSCRIBE_OPERATION = 1;
-
-    /**
-     * This operation is used to poll a remote destination for pending,
-     * undelivered messages.
-     */
-    const POLL_OPERATION = 2;
-
-    /**
-     * This operation is used by a remote destination to sync missed or cached messages
-     * back to a client as a result of a client issued poll command.
-     */
-    const CLIENT_SYNC_OPERATION = 4;
-
-    /**
-     * This operation is used to test connectivity over the current channel to
-     * the remote endpoint.
-     */
-    const CLIENT_PING_OPERATION = 5;
-
-    /**
-     * This operation is used to request a list of failover endpoint URIs
-     * for the remote destination based on cluster membership.
-     */
-    const CLUSTER_REQUEST_OPERATION = 7;
-
-    /**
-     * This operation is used to send credentials to the endpoint so that
-     * the user can be logged in over the current channel.
-     * The credentials need to be Base64 encoded and stored in the <code>body</code>
-     * of the message.
-     */
-    const LOGIN_OPERATION = 8;
-
-    /**
-     * This operation is used to log the user out of the current channel, and
-     * will invalidate the server session if the channel is HTTP based.
-     */
-    const LOGOUT_OPERATION = 9;
-
-    /**
-     * This operation is used to indicate that the client's subscription to a
-     * remote destination has been invalidated.
-     */
-    const SESSION_INVALIDATE_OPERATION = 10;
-
-    /**
-     * This operation is used by the MultiTopicConsumer to subscribe/unsubscribe
-     * from multiple subtopics/selectors in the same message.
-     */
-    const MULTI_SUBSCRIBE_OPERATION = 11;
-
-    /**
-     * This operation is used to indicate that a channel has disconnected
-     */
-    const DISCONNECT_OPERATION = 12;
-
-    /**
-     * This is the default operation for new CommandMessage instances.
-     */
-    const UNKNOWN_OPERATION = 10000;
-
-    /**
-     * The operation to execute for messages of this type
-     * @var int
-     */
-    public $operation = self::UNKNOWN_OPERATION;
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/ErrorMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/ErrorMessage.php
deleted file mode 100644
index 93da0e929..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/ErrorMessage.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ErrorMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */
-require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
-
-/**
- * Creates the error message to report to flex the issue with the call
- *
- * Corresponds to flex.messaging.messages.ErrorMessage
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage
-{
-    /**
-     * Additional data with error
-     * @var object
-     */
-    public $extendedData = null;
-
-    /**
-     * Error code number
-     * @var string
-     */
-    public $faultCode;
-
-    /**
-     * Description as to the cause of the error
-     * @var string
-     */
-    public $faultDetail;
-
-    /**
-     * Short description of error
-     * @var string
-     */
-    public $faultString = '';
-
-    /**
-     * root cause of error
-     * @var object
-     */
-    public $rootCause = null;
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/Messaging/RemotingMessage.php b/airtime_mvc/library/Zend/Amf/Value/Messaging/RemotingMessage.php
deleted file mode 100644
index e13915cde..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/Messaging/RemotingMessage.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemotingMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Amf_Value_Messaging_AbstractMessage */
-require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
-
-/**
- * This type of message contains information needed to perform
- * a Remoting invocation.
- *
- * Corresponds to flex.messaging.messages.RemotingMessage
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage
-{
-
-    /**
-     * The name of the service to be called including package name
-     * @var String
-     */
-    public $source;
-
-    /**
-     * The name of the method to be called
-     * @var string
-     */
-    public $operation;
-
-    /**
-     * The arguments to call the mathod with
-     * @var array
-     */
-    public $parameters;
-
-    /**
-     * Create a new Remoting Message
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->clientId    = $this->generateId();
-        $this->destination = null;
-        $this->messageId   = $this->generateId();
-        $this->timestamp   = time().'00';
-        $this->timeToLive  = 0;
-        $this->headers     = new stdClass();
-        $this->body        = null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Amf/Value/TraitsInfo.php b/airtime_mvc/library/Zend/Amf/Value/TraitsInfo.php
deleted file mode 100644
index ecd6efab5..000000000
--- a/airtime_mvc/library/Zend/Amf/Value/TraitsInfo.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TraitsInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Amf_Value_TraitsInfo
- *
- * @package    Zend_Amf
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Amf_Value_TraitsInfo
-{
-    /**
-     * @var string Class name
-     */
-    protected $_className;
-
-    /**
-     * @var bool Whether or not this is a dynamic class
-     */
-    protected $_dynamic;
-
-    /**
-     * @var bool Whether or not the class is externalizable
-     */
-    protected $_externalizable;
-
-    /**
-     * @var array Class properties
-     */
-    protected $_properties;
-
-    /**
-     * Used to keep track of all class traits of an AMF3 object
-     *
-     * @param  string $className
-     * @param  boolean $dynamic
-     * @param  boolean $externalizable
-     * @param  boolean $properties
-     * @return void
-     */
-    public function __construct($className, $dynamic=false, $externalizable=false, $properties=null)
-    {
-        $this->_className      = $className;
-        $this->_dynamic        = $dynamic;
-        $this->_externalizable = $externalizable;
-        $this->_properties     = $properties;
-    }
-
-    /**
-     * Test if the class is a dynamic class
-     *
-     * @return boolean
-     */
-    public function isDynamic()
-    {
-        return $this->_dynamic;
-    }
-
-    /**
-     * Test if class is externalizable
-     *
-     * @return boolean
-     */
-    public function isExternalizable()
-    {
-        return $this->_externalizable;
-    }
-
-    /**
-     * Return the number of properties in the class
-     *
-     * @return int
-     */
-    public function length()
-    {
-        return count($this->_properties);
-    }
-
-    /**
-     * Return the class name
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->_className;
-    }
-
-    /**
-     * Add an additional property
-     *
-     * @param  string $name
-     * @return Zend_Amf_Value_TraitsInfo
-     */
-    public function addProperty($name)
-    {
-        $this->_properties[] = $name;
-        return $this;
-    }
-
-    /**
-     * Add all properties of the class.
-     *
-     * @param  array $props
-     * @return Zend_Amf_Value_TraitsInfo
-     */
-    public function addAllProperties(array $props)
-    {
-        $this->_properties = $props;
-        return $this;
-    }
-
-    /**
-     * Get the property at a given index
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getProperty($index)
-    {
-        return $this->_properties[(int) $index];
-    }
-
-    /**
-     * Return all properties of the class.
-     *
-     * @return array
-     */
-    public function getAllProperties()
-    {
-        return $this->_properties;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application.php b/airtime_mvc/library/Zend/Application.php
deleted file mode 100644
index 35739a3fc..000000000
--- a/airtime_mvc/library/Zend/Application.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Application.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Application
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application
-{
-    /**
-     * Autoloader to use
-     *
-     * @var Zend_Loader_Autoloader
-     */
-    protected $_autoloader;
-
-    /**
-     * Bootstrap
-     *
-     * @var Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    protected $_bootstrap;
-
-    /**
-     * Application environment
-     *
-     * @var string
-     */
-    protected $_environment;
-
-    /**
-     * Flattened (lowercase) option keys
-     *
-     * @var array
-     */
-    protected $_optionKeys = array();
-
-    /**
-     * Options for Zend_Application
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Constructor
-     *
-     * Initialize application. Potentially initializes include_paths, PHP
-     * settings, and bootstrap class.
-     *
-     * @param  string                   $environment
-     * @param  string|array|Zend_Config $options String path to configuration file, or array/Zend_Config of configuration options
-     * @throws Zend_Application_Exception When invalid options are provided
-     * @return void
-     */
-    public function __construct($environment, $options = null)
-    {
-        $this->_environment = (string) $environment;
-
-        require_once 'Zend/Loader/Autoloader.php';
-        $this->_autoloader = Zend_Loader_Autoloader::getInstance();
-
-        if (null !== $options) {
-            if (is_string($options)) {
-                $options = $this->_loadConfig($options);
-            } elseif ($options instanceof Zend_Config) {
-                $options = $options->toArray();
-            } elseif (!is_array($options)) {
-                throw new Zend_Application_Exception('Invalid options provided; must be location of config file, a config object, or an array');
-            }
-
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Retrieve current environment
-     *
-     * @return string
-     */
-    public function getEnvironment()
-    {
-        return $this->_environment;
-    }
-
-    /**
-     * Retrieve autoloader instance
-     *
-     * @return Zend_Loader_Autoloader
-     */
-    public function getAutoloader()
-    {
-        return $this->_autoloader;
-    }
-
-    /**
-     * Set application options
-     *
-     * @param  array $options
-     * @throws Zend_Application_Exception When no bootstrap path is provided
-     * @throws Zend_Application_Exception When invalid bootstrap information are provided
-     * @return Zend_Application
-     */
-    public function setOptions(array $options)
-    {
-        if (!empty($options['config'])) {
-            if (is_array($options['config'])) {
-                $_options = array();
-                foreach ($options['config'] as $tmp) {
-                    $_options = $this->mergeOptions($_options, $this->_loadConfig($tmp));
-                }
-                $options = $this->mergeOptions($_options, $options);
-            } else {
-                $options = $this->mergeOptions($this->_loadConfig($options['config']), $options);
-            }
-        }
-
-        $this->_options = $options;
-
-        $options = array_change_key_case($options, CASE_LOWER);
-
-        $this->_optionKeys = array_keys($options);
-
-        if (!empty($options['phpsettings'])) {
-            $this->setPhpSettings($options['phpsettings']);
-        }
-
-        if (!empty($options['includepaths'])) {
-            $this->setIncludePaths($options['includepaths']);
-        }
-
-        if (!empty($options['autoloadernamespaces'])) {
-            $this->setAutoloaderNamespaces($options['autoloadernamespaces']);
-        }
-
-        if (!empty($options['autoloaderzfpath'])) {
-            $autoloader = $this->getAutoloader();
-            if (method_exists($autoloader, 'setZfPath')) {
-                $zfPath    = $options['autoloaderzfpath'];
-                $zfVersion = !empty($options['autoloaderzfversion'])
-                           ? $options['autoloaderzfversion']
-                           : 'latest';
-                $autoloader->setZfPath($zfPath, $zfVersion);
-            }
-        }
-
-        if (!empty($options['bootstrap'])) {
-            $bootstrap = $options['bootstrap'];
-
-            if (is_string($bootstrap)) {
-                $this->setBootstrap($bootstrap);
-            } elseif (is_array($bootstrap)) {
-                if (empty($bootstrap['path'])) {
-                    throw new Zend_Application_Exception('No bootstrap path provided');
-                }
-
-                $path  = $bootstrap['path'];
-                $class = null;
-
-                if (!empty($bootstrap['class'])) {
-                    $class = $bootstrap['class'];
-                }
-
-                $this->setBootstrap($path, $class);
-            } else {
-                throw new Zend_Application_Exception('Invalid bootstrap information provided');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve application options (for caching)
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Is an option present?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasOption($key)
-    {
-        return in_array(strtolower($key), $this->_optionKeys);
-    }
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getOption($key)
-    {
-        if ($this->hasOption($key)) {
-            $options = $this->getOptions();
-            $options = array_change_key_case($options, CASE_LOWER);
-            return $options[strtolower($key)];
-        }
-        return null;
-    }
-
-    /**
-     * Merge options recursively
-     *
-     * @param  array $array1
-     * @param  mixed $array2
-     * @return array
-     */
-    public function mergeOptions(array $array1, $array2 = null)
-    {
-        if (is_array($array2)) {
-            foreach ($array2 as $key => $val) {
-                if (is_array($array2[$key])) {
-                    $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key])
-                                  : $array2[$key];
-                } else {
-                    $array1[$key] = $val;
-                }
-            }
-        }
-        return $array1;
-    }
-
-    /**
-     * Set PHP configuration settings
-     *
-     * @param  array $settings
-     * @param  string $prefix Key prefix to prepend to array values (used to map . separated INI values)
-     * @return Zend_Application
-     */
-    public function setPhpSettings(array $settings, $prefix = '')
-    {
-        foreach ($settings as $key => $value) {
-            $key = empty($prefix) ? $key : $prefix . $key;
-            if (is_scalar($value)) {
-                ini_set($key, $value);
-            } elseif (is_array($value)) {
-                $this->setPhpSettings($value, $key . '.');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set include path
-     *
-     * @param  array $paths
-     * @return Zend_Application
-     */
-    public function setIncludePaths(array $paths)
-    {
-        $path = implode(PATH_SEPARATOR, $paths);
-        set_include_path($path . PATH_SEPARATOR . get_include_path());
-        return $this;
-    }
-
-    /**
-     * Set autoloader namespaces
-     *
-     * @param  array $namespaces
-     * @return Zend_Application
-     */
-    public function setAutoloaderNamespaces(array $namespaces)
-    {
-        $autoloader = $this->getAutoloader();
-
-        foreach ($namespaces as $namespace) {
-            $autoloader->registerNamespace($namespace);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set bootstrap path/class
-     *
-     * @param  string $path
-     * @param  string $class
-     * @return Zend_Application
-     */
-    public function setBootstrap($path, $class = null)
-    {
-        // setOptions() can potentially send a null value; specify default
-        // here
-        if (null === $class) {
-            $class = 'Bootstrap';
-        }
-
-        if (!class_exists($class, false)) {
-            require_once $path;
-            if (!class_exists($class, false)) {
-                throw new Zend_Application_Exception('Bootstrap class not found');
-            }
-        }
-        $this->_bootstrap = new $class($this);
-
-        if (!$this->_bootstrap instanceof Zend_Application_Bootstrap_Bootstrapper) {
-            throw new Zend_Application_Exception('Bootstrap class does not implement Zend_Application_Bootstrap_Bootstrapper');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get bootstrap object
-     *
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    public function getBootstrap()
-    {
-        if (null === $this->_bootstrap) {
-            $this->_bootstrap = new Zend_Application_Bootstrap_Bootstrap($this);
-        }
-        return $this->_bootstrap;
-    }
-
-    /**
-     * Bootstrap application
-     *
-     * @param  null|string|array $resource
-     * @return Zend_Application
-     */
-    public function bootstrap($resource = null)
-    {
-        $this->getBootstrap()->bootstrap($resource);
-        return $this;
-    }
-
-    /**
-     * Run the application
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $this->getBootstrap()->run();
-    }
-
-    /**
-     * Load configuration file of options
-     *
-     * @param  string $file
-     * @throws Zend_Application_Exception When invalid configuration file is provided
-     * @return array
-     */
-    protected function _loadConfig($file)
-    {
-        $environment = $this->getEnvironment();
-        $suffix      = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-
-        switch ($suffix) {
-            case 'ini':
-                $config = new Zend_Config_Ini($file, $environment);
-                break;
-
-            case 'xml':
-                $config = new Zend_Config_Xml($file, $environment);
-                break;
-
-            case 'php':
-            case 'inc':
-                $config = include $file;
-                if (!is_array($config)) {
-                    throw new Zend_Application_Exception('Invalid configuration file provided; PHP file does not return array value');
-                }
-                return $config;
-                break;
-
-            default:
-                throw new Zend_Application_Exception('Invalid configuration file provided; unknown config type');
-        }
-
-        return $config->toArray();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrap.php b/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrap.php
deleted file mode 100644
index b51ef29bd..000000000
--- a/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrap.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Bootstrap.php 20886 2010-02-03 19:36:06Z matthew $
- */
-
-/**
- * Concrete base class for bootstrap classes
- *
- * Registers and utilizes Zend_Controller_Front by default.
- *
- * @uses       Zend_Application_Bootstrap_Bootstrap
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Bootstrap_Bootstrap
-    extends Zend_Application_Bootstrap_BootstrapAbstract
-{
-    /**
-     * Application resource namespace
-     * @var false|string
-     */
-    protected $_appNamespace = false;
-
-    /**
-     * Application resource autoloader
-     * @var Zend_Loader_Autoloader_Resource
-     */
-    protected $_resourceLoader;
-
-    /**
-     * Constructor
-     *
-     * Ensure FrontController resource is registered
-     *
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return void
-     */
-    public function __construct($application)
-    {
-        parent::__construct($application);
-
-        if ($application->hasOption('resourceloader')) {
-            $this->setOptions(array(
-                'resourceloader' => $application->getOption('resourceloader')
-            ));
-        }
-        $this->getResourceLoader();
-
-        if (!$this->hasPluginResource('FrontController')) {
-            $this->registerPluginResource('FrontController');
-        }
-    }
-
-    /**
-     * Run the application
-     *
-     * Checks to see that we have a default controller directory. If not, an
-     * exception is thrown.
-     *
-     * If so, it registers the bootstrap with the 'bootstrap' parameter of
-     * the front controller, and dispatches the front controller.
-     *
-     * @return mixed
-     * @throws Zend_Application_Bootstrap_Exception
-     */
-    public function run()
-    {
-        $front   = $this->getResource('FrontController');
-        $default = $front->getDefaultModule();
-        if (null === $front->getControllerDirectory($default)) {
-            throw new Zend_Application_Bootstrap_Exception(
-                'No default controller directory registered with front controller'
-            );
-        }
-
-        $front->setParam('bootstrap', $this);
-        $response = $front->dispatch();
-        if ($front->returnResponse()) {
-            return $response;
-        }
-    }
-
-    /**
-     * Set module resource loader
-     *
-     * @param  Zend_Loader_Autoloader_Resource $loader
-     * @return Zend_Application_Module_Bootstrap
-     */
-    public function setResourceLoader(Zend_Loader_Autoloader_Resource $loader)
-    {
-        $this->_resourceLoader = $loader;
-        return $this;
-    }
-
-    /**
-     * Retrieve module resource loader
-     *
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function getResourceLoader()
-    {
-        if ((null === $this->_resourceLoader)
-            && (false !== ($namespace = $this->getAppNamespace()))
-        ) {
-            $r    = new ReflectionClass($this);
-            $path = $r->getFileName();
-            $this->setResourceLoader(new Zend_Application_Module_Autoloader(array(
-                'namespace' => $namespace,
-                'basePath'  => dirname($path),
-            )));
-        }
-        return $this->_resourceLoader;
-    }
-
-    /**
-     * Get application namespace (used for module autoloading)
-     *
-     * @return string
-     */
-    public function getAppNamespace()
-    {
-        return $this->_appNamespace;
-    }
-
-    /**
-     * Set application namespace (for module autoloading)
-     *
-     * @param  string
-     * @return Zend_Application_Bootstrap_Bootstrap
-     */
-    public function setAppNamespace($value)
-    {
-        $this->_appNamespace = (string) $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Bootstrap/BootstrapAbstract.php b/airtime_mvc/library/Zend/Application/Bootstrap/BootstrapAbstract.php
deleted file mode 100644
index 18172aab2..000000000
--- a/airtime_mvc/library/Zend/Application/Bootstrap/BootstrapAbstract.php
+++ /dev/null
@@ -1,768 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BootstrapAbstract.php 20988 2010-02-08 16:44:44Z matthew $
- */
-
-/**
- * Abstract base class for bootstrap classes
- *
- * @uses       Zend_Application_Bootstrap_Bootstrapper
- * @uses       Zend_Application_Bootstrap_ResourceBootstrapper
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Application_Bootstrap_BootstrapAbstract
-    implements Zend_Application_Bootstrap_Bootstrapper,
-               Zend_Application_Bootstrap_ResourceBootstrapper
-{
-    /**
-     * @var Zend_Application|Zend_Application_Bootstrap_Bootstrapper
-     */
-    protected $_application;
-
-    /**
-     * @var array Internal resource methods (resource/method pairs)
-     */
-    protected $_classResources;
-
-    /**
-     * @var object Resource container
-     */
-    protected $_container;
-
-    /**
-     * @var string
-     */
-    protected $_environment;
-
-    /**
-     * Flattened (lowercase) option keys used for lookups
-     *
-     * @var array
-     */
-    protected $_optionKeys = array();
-
-    /**
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * @var Zend_Loader_PluginLoader_Interface
-     */
-    protected $_pluginLoader;
-
-    /**
-     * @var array Class-based resource plugins
-     */
-    protected $_pluginResources = array();
-
-    /**
-     * @var array Initializers that have been run
-     */
-    protected $_run = array();
-
-    /**
-     * @var array Initializers that have been started but not yet completed (circular dependency detection)
-     */
-    protected $_started = array();
-
-    /**
-     * Constructor
-     *
-     * Sets application object, initializes options, and prepares list of
-     * initializer methods.
-     *
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return void
-     * @throws Zend_Application_Bootstrap_Exception When invalid applicaiton is provided
-     */
-    public function __construct($application)
-    {
-        $this->setApplication($application);
-        $options = $application->getOptions();
-        $this->setOptions($options);
-    }
-
-    /**
-     * Set class state
-     *
-     * @param  array $options
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    public function setOptions(array $options)
-    {
-        $this->_options = $this->mergeOptions($this->_options, $options);
-
-        $options = array_change_key_case($options, CASE_LOWER);
-        $this->_optionKeys = array_merge($this->_optionKeys, array_keys($options));
-
-        $methods = get_class_methods($this);
-        foreach ($methods as $key => $method) {
-            $methods[$key] = strtolower($method);
-        }
-
-        if (array_key_exists('pluginpaths', $options)) {
-            $pluginLoader = $this->getPluginLoader();
-
-            foreach ($options['pluginpaths'] as $prefix => $path) {
-                $pluginLoader->addPrefixPath($prefix, $path);
-            }
-            unset($options['pluginpaths']);
-        }
-
-        foreach ($options as $key => $value) {
-            $method = 'set' . strtolower($key);
-
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            } elseif ('resources' == $key) {
-                foreach ($value as $resource => $resourceOptions) {
-                    $this->registerPluginResource($resource, $resourceOptions);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get current options from bootstrap
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Is an option present?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasOption($key)
-    {
-        return in_array($key, $this->_optionKeys);
-    }
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getOption($key)
-    {
-        if ($this->hasOption($key)) {
-            $options = $this->getOptions();
-            $options = array_change_key_case($options, CASE_LOWER);
-            return $options[strtolower($key)];
-        }
-        return null;
-    }
-
-    /**
-     * Merge options recursively
-     *
-     * @param  array $array1
-     * @param  mixed $array2
-     * @return array
-     */
-    public function mergeOptions(array $array1, $array2 = null)
-    {
-        if (is_array($array2)) {
-            foreach ($array2 as $key => $val) {
-                if (is_array($array2[$key])) {
-                    $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key])
-                                  : $array2[$key];
-                } else {
-                    $array1[$key] = $val;
-                }
-            }
-        }
-        return $array1;
-    }
-
-    /**
-     * Get class resources (as resource/method pairs)
-     *
-     * Uses get_class_methods() by default, reflection on prior to 5.2.6,
-     * as a bug prevents the usage of get_class_methods() there.
-     *
-     * @return array
-     */
-    public function getClassResources()
-    {
-        if (null === $this->_classResources) {
-            if (version_compare(PHP_VERSION, '5.2.6') === -1) {
-                $class        = new ReflectionObject($this);
-                $classMethods = $class->getMethods();
-                $methodNames  = array();
-
-                foreach ($classMethods as $method) {
-                    $methodNames[] = $method->getName();
-                }
-            } else {
-                $methodNames = get_class_methods($this);
-            }
-
-            $this->_classResources = array();
-            foreach ($methodNames as $method) {
-                if (5 < strlen($method) && '_init' === substr($method, 0, 5)) {
-                    $this->_classResources[strtolower(substr($method, 5))] = $method;
-                }
-            }
-        }
-
-        return $this->_classResources;
-    }
-
-    /**
-     * Get class resource names
-     *
-     * @return array
-     */
-    public function getClassResourceNames()
-    {
-        $resources = $this->getClassResources();
-        return array_keys($resources);
-    }
-
-    /**
-     * Register a new resource plugin
-     *
-     * @param  string|Zend_Application_Resource_Resource $resource
-     * @param  mixed  $options
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     * @throws Zend_Application_Bootstrap_Exception When invalid resource is provided
-     */
-    public function registerPluginResource($resource, $options = null)
-    {
-        if ($resource instanceof Zend_Application_Resource_Resource) {
-            $resource->setBootstrap($this);
-            $pluginName = $this->_resolvePluginResourceName($resource);
-            $this->_pluginResources[$pluginName] = $resource;
-            return $this;
-        }
-
-        if (!is_string($resource)) {
-            throw new Zend_Application_Bootstrap_Exception('Invalid resource provided to ' . __METHOD__);
-        }
-
-        $this->_pluginResources[$resource] = $options;
-        return $this;
-    }
-
-    /**
-     * Unregister a resource from the bootstrap
-     *
-     * @param  string|Zend_Application_Resource_Resource $resource
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     * @throws Zend_Application_Bootstrap_Exception When unknown resource type is provided
-     */
-    public function unregisterPluginResource($resource)
-    {
-        if ($resource instanceof Zend_Application_Resource_Resource) {
-            if ($index = array_search($resource, $this->_pluginResources, true)) {
-                unset($this->_pluginResources[$index]);
-            }
-            return $this;
-        }
-
-        if (!is_string($resource)) {
-            throw new Zend_Application_Bootstrap_Exception('Unknown resource type provided to ' . __METHOD__);
-        }
-
-        $resource = strtolower($resource);
-        if (array_key_exists($resource, $this->_pluginResources)) {
-            unset($this->_pluginResources[$resource]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Is the requested plugin resource registered?
-     *
-     * @param  string $resource
-     * @return bool
-     */
-    public function hasPluginResource($resource)
-    {
-        return (null !== $this->getPluginResource($resource));
-    }
-
-    /**
-     * Get a registered plugin resource
-     *
-     * @param  string $resourceName
-     * @return Zend_Application_Resource_Resource
-     */
-    public function getPluginResource($resource)
-    {
-        if (array_key_exists(strtolower($resource), $this->_pluginResources)) {
-            $resource = strtolower($resource);
-            if (!$this->_pluginResources[$resource] instanceof Zend_Application_Resource_Resource) {
-                $resourceName = $this->_loadPluginResource($resource, $this->_pluginResources[$resource]);
-                if (!$resourceName) {
-                    throw new Zend_Application_Bootstrap_Exception(sprintf('Unable to resolve plugin "%s"; no corresponding plugin with that name', $resource));
-                }
-                $resource = $resourceName;
-            }
-            return $this->_pluginResources[$resource];
-        }
-
-        foreach ($this->_pluginResources as $plugin => $spec) {
-            if ($spec instanceof Zend_Application_Resource_Resource) {
-                $pluginName = $this->_resolvePluginResourceName($spec);
-                if (0 === strcasecmp($resource, $pluginName)) {
-                    unset($this->_pluginResources[$plugin]);
-                    $this->_pluginResources[$pluginName] = $spec;
-                    return $spec;
-                }
-                continue;
-            }
-
-            if (false !== $pluginName = $this->_loadPluginResource($plugin, $spec)) {
-                if (0 === strcasecmp($resource, $pluginName)) {
-                    return $this->_pluginResources[$pluginName];
-                }
-            }
-
-            if (class_exists($plugin)) { //@SEE ZF-7550
-                $spec = (array) $spec;
-                $spec['bootstrap'] = $this;
-                $instance = new $plugin($spec);
-                $pluginName = $this->_resolvePluginResourceName($instance);
-                unset($this->_pluginResources[$plugin]);
-                $this->_pluginResources[$pluginName] = $instance;
-
-                if (0 === strcasecmp($resource, $pluginName)) {
-                    return $instance;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve all plugin resources
-     *
-     * @return array
-     */
-    public function getPluginResources()
-    {
-        foreach (array_keys($this->_pluginResources) as $resource) {
-            $this->getPluginResource($resource);
-        }
-        return $this->_pluginResources;
-    }
-
-    /**
-     * Retrieve plugin resource names
-     *
-     * @return array
-     */
-    public function getPluginResourceNames()
-    {
-        $this->getPluginResources();
-        return array_keys($this->_pluginResources);
-    }
-
-    /**
-     * Set plugin loader for loading resources
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader)
-    {
-        $this->_pluginLoader = $loader;
-        return $this;
-    }
-
-    /**
-     * Get the plugin loader for resources
-     *
-     * @return Zend_Loader_PluginLoader_Interface
-     */
-    public function getPluginLoader()
-    {
-        if ($this->_pluginLoader === null) {
-            $options = array(
-                'Zend_Application_Resource' => 'Zend/Application/Resource'
-            );
-
-            $this->_pluginLoader = new Zend_Loader_PluginLoader($options);
-        }
-
-        return $this->_pluginLoader;
-    }
-
-    /**
-     * Set application/parent bootstrap
-     *
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    public function setApplication($application)
-    {
-        if (($application instanceof Zend_Application)
-            || ($application instanceof Zend_Application_Bootstrap_Bootstrapper)
-        ) {
-            if ($application === $this) {
-                throw new Zend_Application_Bootstrap_Exception('Cannot set application to same object; creates recursion');
-            }
-            $this->_application = $application;
-        } else {
-            throw new Zend_Application_Bootstrap_Exception('Invalid application provided to bootstrap constructor (received "' . get_class($application) . '" instance)');
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve parent application instance
-     *
-     * @return Zend_Application|Zend_Application_Bootstrap_Bootstrapper
-     */
-    public function getApplication()
-    {
-        return $this->_application;
-    }
-
-    /**
-     * Retrieve application environment
-     *
-     * @return string
-     */
-    public function getEnvironment()
-    {
-        if (null === $this->_environment) {
-            $this->_environment = $this->getApplication()->getEnvironment();
-        }
-        return $this->_environment;
-    }
-
-    /**
-     * Set resource container
-     *
-     * By default, if a resource callback has a non-null return value, this
-     * value will be stored in a container using the resource name as the
-     * key.
-     *
-     * Containers must be objects, and must allow setting public properties.
-     *
-     * @param  object $container
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     */
-    public function setContainer($container)
-    {
-        if (!is_object($container)) {
-            throw new Zend_Application_Bootstrap_Exception('Resource containers must be objects');
-        }
-        $this->_container = $container;
-        return $this;
-    }
-
-    /**
-     * Retrieve resource container
-     *
-     * @return object
-     */
-    public function getContainer()
-    {
-        if (null === $this->_container) {
-            $this->setContainer(new Zend_Registry());
-        }
-        return $this->_container;
-    }
-
-    /**
-     * Determine if a resource has been stored in the container
-     *
-     * During bootstrap resource initialization, you may return a value. If
-     * you do, it will be stored in the {@link setContainer() container}.
-     * You can use this method to determine if a value was stored.
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasResource($name)
-    {
-        $resource  = strtolower($name);
-        $container = $this->getContainer();
-        return isset($container->{$resource});
-    }
-
-    /**
-     * Retrieve a resource from the container
-     *
-     * During bootstrap resource initialization, you may return a value. If
-     * you do, it will be stored in the {@link setContainer() container}.
-     * You can use this method to retrieve that value.
-     *
-     * If no value was returned, this will return a null value.
-     *
-     * @param  string $name
-     * @return null|mixed
-     */
-    public function getResource($name)
-    {
-        $resource  = strtolower($name);
-        $container = $this->getContainer();
-        if ($this->hasResource($resource)) {
-            return $container->{$resource};
-        }
-        return null;
-    }
-
-    /**
-     * Implement PHP's magic to retrieve a ressource
-     * in the bootstrap
-     *
-     * @param string $prop
-     * @return null|mixed
-     */
-    public function __get($prop)
-    {
-        return $this->getResource($prop);
-    }
-
-    /**
-     * Implement PHP's magic to ask for the
-     * existence of a ressource in the bootstrap
-     *
-     * @param string $prop
-     * @return bool
-     */
-    public function __isset($prop)
-    {
-        return $this->hasResource($prop);
-    }
-
-    /**
-     * Bootstrap individual, all, or multiple resources
-     *
-     * Marked as final to prevent issues when subclassing and naming the
-     * child class 'Bootstrap' (in which case, overriding this method
-     * would result in it being treated as a constructor).
-     *
-     * If you need to override this functionality, override the
-     * {@link _bootstrap()} method.
-     *
-     * @param  null|string|array $resource
-     * @return Zend_Application_Bootstrap_BootstrapAbstract
-     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed
-     */
-    final public function bootstrap($resource = null)
-    {
-        $this->_bootstrap($resource);
-        return $this;
-    }
-
-    /**
-     * Overloading: intercept calls to bootstrap<resourcename>() methods
-     *
-     * @param  string $method
-     * @param  array  $args
-     * @return void
-     * @throws Zend_Application_Bootstrap_Exception On invalid method name
-     */
-    public function __call($method, $args)
-    {
-        if (9 < strlen($method) && 'bootstrap' === substr($method, 0, 9)) {
-            $resource = substr($method, 9);
-            return $this->bootstrap($resource);
-        }
-
-        throw new Zend_Application_Bootstrap_Exception('Invalid method "' . $method . '"');
-    }
-
-    /**
-     * Bootstrap implementation
-     *
-     * This method may be overridden to provide custom bootstrapping logic.
-     * It is the sole method called by {@link bootstrap()}.
-     *
-     * @param  null|string|array $resource
-     * @return void
-     * @throws Zend_Application_Bootstrap_Exception When invalid argument was passed
-     */
-    protected function _bootstrap($resource = null)
-    {
-        if (null === $resource) {
-            foreach ($this->getClassResourceNames() as $resource) {
-                $this->_executeResource($resource);
-            }
-
-            foreach ($this->getPluginResourceNames() as $resource) {
-                $this->_executeResource($resource);
-            }
-        } elseif (is_string($resource)) {
-            $this->_executeResource($resource);
-        } elseif (is_array($resource)) {
-            foreach ($resource as $r) {
-                $this->_executeResource($r);
-            }
-        } else {
-            throw new Zend_Application_Bootstrap_Exception('Invalid argument passed to ' . __METHOD__);
-        }
-    }
-
-    /**
-     * Execute a resource
-     *
-     * Checks to see if the resource has already been run. If not, it searches
-     * first to see if a local method matches the resource, and executes that.
-     * If not, it checks to see if a plugin resource matches, and executes that
-     * if found.
-     *
-     * Finally, if not found, it throws an exception.
-     *
-     * @param  string $resource
-     * @return void
-     * @throws Zend_Application_Bootstrap_Exception When resource not found
-     */
-    protected function _executeResource($resource)
-    {
-        $resourceName = strtolower($resource);
-
-        if (in_array($resourceName, $this->_run)) {
-            return;
-        }
-
-        if (isset($this->_started[$resourceName]) && $this->_started[$resourceName]) {
-            throw new Zend_Application_Bootstrap_Exception('Circular resource dependency detected');
-        }
-
-        $classResources = $this->getClassResources();
-        if (array_key_exists($resourceName, $classResources)) {
-            $this->_started[$resourceName] = true;
-            $method = $classResources[$resourceName];
-            $return = $this->$method();
-            unset($this->_started[$resourceName]);
-            $this->_markRun($resourceName);
-
-            if (null !== $return) {
-                $this->getContainer()->{$resourceName} = $return;
-            }
-
-            return;
-        }
-
-        if ($this->hasPluginResource($resource)) {
-            $this->_started[$resourceName] = true;
-            $plugin = $this->getPluginResource($resource);
-            $return = $plugin->init();
-            unset($this->_started[$resourceName]);
-            $this->_markRun($resourceName);
-
-            if (null !== $return) {
-                $this->getContainer()->{$resourceName} = $return;
-            }
-
-            return;
-        }
-
-        throw new Zend_Application_Bootstrap_Exception('Resource matching "' . $resource . '" not found');
-    }
-
-    /**
-     * Load a plugin resource
-     *
-     * @param  string $resource
-     * @param  array|object|null $options
-     * @return string|false
-     */
-    protected function _loadPluginResource($resource, $options)
-    {
-        $options   = (array) $options;
-        $options['bootstrap'] = $this;
-        $className = $this->getPluginLoader()->load(strtolower($resource), false);
-
-        if (!$className) {
-            return false;
-        }
-
-        $instance = new $className($options);
-
-        unset($this->_pluginResources[$resource]);
-
-        if (isset($instance->_explicitType)) {
-            $resource = $instance->_explicitType;
-        }
-        $resource = strtolower($resource);
-        $this->_pluginResources[$resource] = $instance;
-
-        return $resource;
-    }
-
-    /**
-     * Mark a resource as having run
-     *
-     * @param  string $resource
-     * @return void
-     */
-    protected function _markRun($resource)
-    {
-        if (!in_array($resource, $this->_run)) {
-            $this->_run[] = $resource;
-        }
-    }
-
-    /**
-     * Resolve a plugin resource name
-     *
-     * Uses, in order of preference
-     * - $_explicitType property of resource
-     * - Short name of resource (if a matching prefix path is found)
-     * - class name (if none of the above are true)
-     *
-     * The name is then cast to lowercase.
-     *
-     * @param  Zend_Application_Resource_Resource $resource
-     * @return string
-     */
-    protected function _resolvePluginResourceName($resource)
-    {
-        if (isset($resource->_explicitType)) {
-            $pluginName = $resource->_explicitType;
-        } else  {
-            $className  = get_class($resource);
-            $pluginName = $className;
-            $loader     = $this->getPluginLoader();
-            foreach ($loader->getPaths() as $prefix => $paths) {
-                if (0 === strpos($className, $prefix)) {
-                    $pluginName = substr($className, strlen($prefix));
-                    $pluginName = trim($pluginName, '_');
-                    break;
-                }
-            }
-        }
-        $pluginName = strtolower($pluginName);
-        return $pluginName;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrapper.php b/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrapper.php
deleted file mode 100644
index 09e077e4f..000000000
--- a/airtime_mvc/library/Zend/Application/Bootstrap/Bootstrapper.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Bootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for bootstrap classes
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Application_Bootstrap_Bootstrapper
-{
-    /**
-     * Constructor
-     *
-     * @param  Zend_Application $application
-     * @return void
-     */
-    public function __construct($application);
-
-    /**
-     * Set bootstrap options
-     *
-     * @param  array $options
-     * @return Zend_Application_Bootstrap_Bootstrapper
-     */
-    public function setOptions(array $options);
-
-    /**
-     * Retrieve application object
-     *
-     * @return Zend_Application|Zend_Application_Bootstrap_Bootstrapper
-     */
-    public function getApplication();
-
-    /**
-     * Retrieve application environment
-     *
-     * @return string
-     */
-    public function getEnvironment();
-
-    /**
-     * Retrieve list of class resource initializers (_init* methods). Returns
-     * as resource/method pairs.
-     *
-     * @return array
-     */
-    public function getClassResources();
-
-    /**
-     * Retrieve list of class resource initializer names (resource names only,
-     * no method names)
-     *
-     * @return array
-     */
-    public function getClassResourceNames();
-
-    /**
-     * Bootstrap application or individual resource
-     *
-     * @param  null|string $resource
-     * @return mixed
-     */
-    public function bootstrap($resource = null);
-
-    /**
-     * Run the application
-     *
-     * @return void
-     */
-    public function run();
-}
diff --git a/airtime_mvc/library/Zend/Application/Bootstrap/Exception.php b/airtime_mvc/library/Zend/Application/Bootstrap/Exception.php
deleted file mode 100644
index 14a5e1527..000000000
--- a/airtime_mvc/library/Zend/Application/Bootstrap/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Application_Exception
- */
-require_once 'Zend/Application/Exception.php';
-
-/**
- * Exception class for Zend_Application
- *
- * @category  Zend
- * @package   Zend_Application
- * @uses      Zend_Application_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Bootstrap_Exception extends Zend_Application_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Application/Bootstrap/ResourceBootstrapper.php b/airtime_mvc/library/Zend/Application/Bootstrap/ResourceBootstrapper.php
deleted file mode 100644
index 80d233302..000000000
--- a/airtime_mvc/library/Zend/Application/Bootstrap/ResourceBootstrapper.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResourceBootstrapper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for bootstrap classes that utilize resource plugins
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Bootstrap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Application_Bootstrap_ResourceBootstrapper
-{
-    /**
-     * Register a resource with the bootstrap
-     *
-     * @param  string|Zend_Application_Resource_Resource $resource
-     * @param  null|array|Zend_Config                     $options
-     * @return Zend_Application_Bootstrap_ResourceBootstrapper
-     */
-    public function registerPluginResource($resource, $options = null);
-
-    /**
-     * Unregister a resource from the bootstrap
-     *
-     * @param  string|Zend_Application_Resource_Resource $resource
-     * @return Zend_Application_Bootstrap_ResourceBootstrapper
-     */
-    public function unregisterPluginResource($resource);
-
-    /**
-     * Is the requested resource registered?
-     *
-     * @param  string $resource
-     * @return bool
-     */
-    public function hasPluginResource($resource);
-
-    /**
-     * Retrieve resource
-     *
-     * @param  string $resource
-     * @return Zend_Application_Resource_Resource
-     */
-    public function getPluginResource($resource);
-
-    /**
-     * Get all resources
-     *
-     * @return array
-     */
-    public function getPluginResources();
-
-    /**
-     * Get just resource names
-     *
-     * @return array
-     */
-    public function getPluginResourceNames();
-
-    /**
-     * Set plugin loader to use to fetch resources
-     *
-     * @param  Zend_Loader_PluginLoader_Interface Zend_Loader_PluginLoader
-     * @return Zend_Application_Bootstrap_ResourceBootstrapper
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader);
-
-    /**
-     * Retrieve plugin loader for resources
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader();
-}
diff --git a/airtime_mvc/library/Zend/Application/Exception.php b/airtime_mvc/library/Zend/Application/Exception.php
deleted file mode 100644
index df5e69085..000000000
--- a/airtime_mvc/library/Zend/Application/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Application
- *
- * @uses      Zend_Exception
- * @category  Zend
- * @package   Zend_Application
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Application/Module/Autoloader.php b/airtime_mvc/library/Zend/Application/Module/Autoloader.php
deleted file mode 100644
index 8c2c2b6c5..000000000
--- a/airtime_mvc/library/Zend/Application/Module/Autoloader.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Module
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Autoloader.php 20250 2010-01-12 22:15:20Z dasprid $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Loader_Autoloader_Resource */
-require_once 'Zend/Loader/Autoloader/Resource.php';
-
-/**
- * Resource loader for application module classes
- *
- * @uses       Zend_Loader_Autoloader_Resource
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Module
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource
-{
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        parent::__construct($options);
-        $this->initDefaultResourceTypes();
-    }
-
-    /**
-     * Initialize default resource types for module resource classes
-     *
-     * @return void
-     */
-    public function initDefaultResourceTypes()
-    {
-        $basePath = $this->getBasePath();
-        $this->addResourceTypes(array(
-            'dbtable' => array(
-                'namespace' => 'Model_DbTable',
-                'path'      => 'models/DbTable',
-            ),
-            'mappers' => array(
-                'namespace' => 'Model_Mapper',
-                'path'      => 'models/mappers',
-            ),
-            'form'    => array(
-                'namespace' => 'Form',
-                'path'      => 'forms',
-            ),
-            'model'   => array(
-                'namespace' => 'Model',
-                'path'      => 'models',
-            ),
-            'plugin'  => array(
-                'namespace' => 'Plugin',
-                'path'      => 'plugins',
-            ),
-            'service' => array(
-                'namespace' => 'Service',
-                'path'      => 'services',
-            ),
-            'viewhelper' => array(
-                'namespace' => 'View_Helper',
-                'path'      => 'views/helpers',
-            ),
-            'viewfilter' => array(
-                'namespace' => 'View_Filter',
-                'path'      => 'views/filters',
-            ),
-        ));
-        $this->setDefaultResourceType('model');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Module/Bootstrap.php b/airtime_mvc/library/Zend/Application/Module/Bootstrap.php
deleted file mode 100644
index a02546558..000000000
--- a/airtime_mvc/library/Zend/Application/Module/Bootstrap.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Module
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Bootstrap.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Application_Bootstrap_Bootstrap
- */
-require_once 'Zend/Application/Bootstrap/Bootstrap.php';
-
-/**
- * Base bootstrap class for modules
- *
- * @uses       Zend_Loader_Autoloader_Resource
- * @uses       Zend_Application_Bootstrap_Bootstrap
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Module
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Application_Module_Bootstrap
-    extends Zend_Application_Bootstrap_Bootstrap
-{
-    /**
-     * Set this explicitly to reduce impact of determining module name
-     * @var string
-     */
-    protected $_moduleName;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return void
-     */
-    public function __construct($application)
-    {
-        $this->setApplication($application);
-
-        // Use same plugin loader as parent bootstrap
-        if ($application instanceof Zend_Application_Bootstrap_ResourceBootstrapper) {
-            $this->setPluginLoader($application->getPluginLoader());
-        }
-
-        $key = strtolower($this->getModuleName());
-        if ($application->hasOption($key)) {
-            // Don't run via setOptions() to prevent duplicate initialization
-            $this->setOptions($application->getOption($key));
-        }
-
-        if ($application->hasOption('resourceloader')) {
-            $this->setOptions(array(
-                'resourceloader' => $application->getOption('resourceloader')
-            ));
-        }
-        $this->initResourceLoader();
-
-        // ZF-6545: ensure front controller resource is loaded
-        if (!$this->hasPluginResource('FrontController')) {
-            $this->registerPluginResource('FrontController');
-        }
-
-        // ZF-6545: prevent recursive registration of modules
-        if ($this->hasPluginResource('modules')) {
-            $this->unregisterPluginResource('modules');
-        }
-    }
-
-    /**
-     * Ensure resource loader is loaded
-     *
-     * @return void
-     */
-    public function initResourceLoader()
-    {
-        $this->getResourceLoader();
-    }
-
-    /**
-     * Get default application namespace
-     *
-     * Proxies to {@link getModuleName()}, and returns the current module 
-     * name
-     * 
-     * @return string
-     */
-    public function getAppNamespace()
-    {
-        return $this->getModuleName();
-    }
-
-    /**
-     * Retrieve module name
-     *
-     * @return string
-     */
-    public function getModuleName()
-    {
-        if (empty($this->_moduleName)) {
-            $class = get_class($this);
-            if (preg_match('/^([a-z][a-z0-9]*)_/i', $class, $matches)) {
-                $prefix = $matches[1];
-            } else {
-                $prefix = $class;
-            }
-            $this->_moduleName = $prefix;
-        }
-        return $this->_moduleName;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Cachemanager.php b/airtime_mvc/library/Zend/Application/Resource/Cachemanager.php
deleted file mode 100644
index 7444b3d2a..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Cachemanager.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-/**
- * Cache Manager resource
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Cache_Manager
-     */
-    protected $_manager = null;
-
-    /**
-     * Initialize Cache_Manager
-     *
-     * @return Zend_Cache_Manager
-     */
-    public function init()
-    {
-        return $this->getCacheManager();
-    }
-
-    /**
-     * Retrieve Zend_Cache_Manager instance
-     *
-     * @return Zend_Cache_Manager
-     */
-    public function getCacheManager()
-    {
-        if (null === $this->_manager) {
-            $this->_manager = new Zend_Cache_Manager;
-            
-            $options = $this->getOptions();
-            foreach ($options as $key => $value) {
-                if ($this->_manager->hasCacheTemplate($key)) {
-                    $this->_manager->setTemplateOptions($key, $value);
-                } else {
-                    $this->_manager->setCacheTemplate($key, $value);
-                }
-            }
-        }
-        
-        return $this->_manager;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Db.php b/airtime_mvc/library/Zend/Application/Resource/Db.php
deleted file mode 100644
index 348b5e81e..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Db.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-/**
- * Resource for creating database adapter
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * Adapter to use
-     *
-     * @var string
-     */
-    protected $_adapter = null;
-
-    /**
-     * @var Zend_Db_Adapter_Interface
-     */
-    protected $_db;
-
-    /**
-     * Parameters to use
-     *
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Wether to register the created adapter as default table adapter
-     *
-     * @var boolean
-     */
-    protected $_isDefaultTableAdapter = true;
-
-    /**
-     * Set the adapter
-     *
-     * @param  $adapter string
-     * @return Zend_Application_Resource_Db
-     */
-    public function setAdapter($adapter)
-    {
-        $this->_adapter = $adapter;
-        return $this;
-    }
-
-    /**
-     * Adapter type to use
-     *
-     * @return string
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Set the adapter params
-     *
-     * @param  $adapter string
-     * @return Zend_Application_Resource_Db
-     */
-    public function setParams(array $params)
-    {
-        $this->_params = $params;
-        return $this;
-    }
-
-    /**
-     * Adapter parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Set whether to use this as default table adapter
-     *
-     * @param  boolean $defaultTableAdapter
-     * @return Zend_Application_Resource_Db
-     */
-    public function setIsDefaultTableAdapter($isDefaultTableAdapter)
-    {
-        $this->_isDefaultTableAdapter = $isDefaultTableAdapter;
-        return $this;
-    }
-
-    /**
-     * Is this adapter the default table adapter?
-     *
-     * @return void
-     */
-    public function isDefaultTableAdapter()
-    {
-        return $this->_isDefaultTableAdapter;
-    }
-
-    /**
-     * Retrieve initialized DB connection
-     *
-     * @return null|Zend_Db_Adapter_Interface
-     */
-    public function getDbAdapter()
-    {
-        if ((null === $this->_db)
-            && (null !== ($adapter = $this->getAdapter()))
-        ) {
-            $this->_db = Zend_Db::factory($adapter, $this->getParams());
-        }
-        return $this->_db;
-    }
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Db_Adapter_Abstract|null
-     */
-    public function init()
-    {
-        if (null !== ($db = $this->getDbAdapter())) {
-            if ($this->isDefaultTableAdapter()) {
-                Zend_Db_Table::setDefaultAdapter($db);
-            }
-            return $db;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Dojo.php b/airtime_mvc/library/Zend/Application/Resource/Dojo.php
deleted file mode 100644
index a54bb3db5..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Dojo.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Layout.php 17687 2009-08-20 12:55:34Z thomas $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for settings Dojo options
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Dojo
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Dojo_View_Helper_Dojo_Container
-     */
-    protected $_dojo;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function init()
-    {
-        return $this->getDojo();
-    }
-
-    /**
-     * Retrieve Dojo View Helper
-     *
-     * @return Zend_Dojo_View_Dojo_Container
-     */
-    public function getDojo()
-    {
-        if (null === $this->_dojo) {
-            $this->getBootstrap()->bootstrap('view');
-            $view = $this->getBootstrap()->view;
-
-            Zend_Dojo::enableView($view);
-            $view->dojo()->setOptions($this->getOptions());
-
-            $this->_dojo = $view->dojo();
-        }
-
-        return $this->_dojo;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Exception.php b/airtime_mvc/library/Zend/Application/Resource/Exception.php
deleted file mode 100644
index 91b9d2465..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Exception class for Zend_Application
- *
- * @uses       Zend_Application_Exception
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Exception extends Zend_Application_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Frontcontroller.php b/airtime_mvc/library/Zend/Application/Resource/Frontcontroller.php
deleted file mode 100644
index 0cad5c32d..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Frontcontroller.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Frontcontroller.php 20886 2010-02-03 19:36:06Z matthew $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Front Controller resource
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Controller_Front
-     */
-    protected $_front;
-
-    /**
-     * Initialize Front Controller
-     *
-     * @return Zend_Controller_Front
-     */
-    public function init()
-    {
-        $front = $this->getFrontController();
-
-        foreach ($this->getOptions() as $key => $value) {
-            switch (strtolower($key)) {
-                case 'controllerdirectory':
-                    if (is_string($value)) {
-                        $front->setControllerDirectory($value);
-                    } elseif (is_array($value)) {
-                        foreach ($value as $module => $directory) {
-                            $front->addControllerDirectory($directory, $module);
-                        }
-                    }
-                    break;
-
-                case 'modulecontrollerdirectoryname':
-                    $front->setModuleControllerDirectoryName($value);
-                    break;
-
-                case 'moduledirectory':
-                    $front->addModuleDirectory($value);
-                    break;
-
-                case 'defaultcontrollername':
-                    $front->setDefaultControllerName($value);
-                    break;
-
-                case 'defaultaction':
-                    $front->setDefaultAction($value);
-                    break;
-
-                case 'defaultmodule':
-                    $front->setDefaultModule($value);
-                    break;
-
-                case 'baseurl':
-                    if (!empty($value)) {
-                        $front->setBaseUrl($value);
-                    }
-                    break;
-
-                case 'params':
-                    $front->setParams($value);
-                    break;
-
-                case 'plugins':
-                    foreach ((array) $value as $pluginClass) {
-                    	$stackIndex = null;
-                    	if(is_array($pluginClass)) {
-                    	    $pluginClass = array_change_key_case($pluginClass, CASE_LOWER);
-                            if(isset($pluginClass['class']))
-                            {
-                                if(isset($pluginClass['stackindex'])) {
-                                    $stackIndex = $pluginClass['stackindex'];
-                                }
-
-                                $pluginClass = $pluginClass['class'];
-                            }
-                        }
-
-                        $plugin = new $pluginClass();
-                        $front->registerPlugin($plugin, $stackIndex);
-                    }
-                    break;
-
-                case 'returnresponse':
-                    $front->returnResponse((bool) $value);
-                    break;
-
-                case 'throwexceptions':
-                    $front->throwExceptions((bool) $value);
-                    break;
-
-                case 'actionhelperpaths':
-                    if (is_array($value)) {
-                        foreach ($value as $helperPrefix => $helperPath) {
-                            Zend_Controller_Action_HelperBroker::addPath($helperPath, $helperPrefix);
-                        }
-                    }
-                    break;
-
-                default:
-                    $front->setParam($key, $value);
-                    break;
-            }
-        }
-
-        if (null !== ($bootstrap = $this->getBootstrap())) {
-            $this->getBootstrap()->frontController = $front;
-        }
-
-        return $front;
-    }
-
-    /**
-     * Retrieve front controller instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        if (null === $this->_front) {
-            $this->_front = Zend_Controller_Front::getInstance();
-        }
-        return $this->_front;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Layout.php b/airtime_mvc/library/Zend/Application/Resource/Layout.php
deleted file mode 100644
index fb4a19b35..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Layout.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Layout.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for settings layout options
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Layout
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Layout
-     */
-    protected $_layout;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Layout
-     */
-    public function init()
-    {
-        $this->getBootstrap()->bootstrap('FrontController');
-        return $this->getLayout();
-    }
-
-    /**
-     * Retrieve layout object
-     *
-     * @return Zend_Layout
-     */
-    public function getLayout()
-    {
-        if (null === $this->_layout) {
-            $this->_layout = Zend_Layout::startMvc($this->getOptions());
-        }
-        return $this->_layout;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Locale.php b/airtime_mvc/library/Zend/Application/Resource/Locale.php
deleted file mode 100644
index 39943d38c..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Locale.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Locale.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for initializing the locale
- *
- * @uses       Zend_Application_Resource_Base
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Locale
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    const DEFAULT_REGISTRY_KEY = 'Zend_Locale';
-
-    /**
-     * @var Zend_Locale
-     */
-    protected $_locale;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Locale
-     */
-    public function init()
-    {
-        return $this->getLocale();
-    }
-
-
-    /**
-     * Retrieve locale object
-     *
-     * @return Zend_Locale
-     */
-    public function getLocale()
-    {
-        if (null === $this->_locale) {
-            $options = $this->getOptions();
-            if(!isset($options['default'])) {
-                $this->_locale = new Zend_Locale();
-            } elseif(!isset($options['force']) ||
-                     (bool) $options['force'] == false)
-            {
-                // Don't force any locale, just go for auto detection
-                Zend_Locale::setDefault($options['default']);
-                $this->_locale = new Zend_Locale();
-            } else {
-                $this->_locale = new Zend_Locale($options['default']);
-            }
-
-            $key = (isset($options['registry_key']) && !is_numeric($options['registry_key']))
-                ? $options['registry_key']
-                : self::DEFAULT_REGISTRY_KEY;
-            Zend_Registry::set($key, $this->_locale);
-        }
-
-        return $this->_locale;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Log.php b/airtime_mvc/library/Zend/Application/Resource/Log.php
deleted file mode 100644
index 48a5575d0..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Log.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for initializing the locale
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Log
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Log
-     */
-    protected $_log;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Log
-     */
-    public function init()
-    {
-        return $this->getLog();
-    }
-
-    /**
-     * Attach logger
-     * 
-     * @param  Zend_Log $log 
-     * @return Zend_Application_Resource_Log
-     */
-    public function setLog(Zend_Log $log)
-    {
-        $this->_log = $log;
-        return $this;
-    }
-
-    public function getLog()
-    {
-        if (null === $this->_log) {
-            $options = $this->getOptions();
-            $log = Zend_Log::factory($options);
-            $this->setLog($log);
-        }
-        return $this->_log;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Mail.php b/airtime_mvc/library/Zend/Application/Resource/Mail.php
deleted file mode 100644
index ba5b359a4..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Mail.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 17687 2009-08-20 12:55:34Z thomas $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-/**
- * Resource for setting up Mail Transport and default From & ReplyTo addresses
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract
-{
-
-    /**
-     * @var Zend_Mail_Transport_Abstract
-     */
-    protected $_transport;
-
-    public function init() {
-        return $this->getMail();
-    }
-    
-    /**
-     *
-     * @return Zend_Mail_Transport_Abstract|null
-     */
-    public function getMail()
-    {
-        if (null === $this->_transport) {
-            $options = $this->getOptions();
-            foreach($options as $key => $option) {
-                $options[strtolower($key)] = $option;         
-            }
-            $this->setOptions($options);
-
-            if(isset($options['transport']) &&
-               !is_numeric($options['transport']))
-            {
-                $this->_transport = $this->_setupTransport($options['transport']);
-                if(!isset($options['transport']['register']) ||
-                   $options['transport']['register'] == '1' ||
-                   (isset($options['transport']['register']) &&
-                        !is_numeric($options['transport']['register']) &&
-                        (bool) $options['transport']['register'] == true))
-                {
-                    Zend_Mail::setDefaultTransport($this->_transport);
-                }
-            }
-            
-            $this->_setDefaults('from');
-            $this->_setDefaults('replyTo');
-        }
-
-        return $this->_transport;
-    }
-    
-    protected function _setDefaults($type) {
-        $key = strtolower('default' . $type);
-        $options = $this->getOptions();
-
-        if(isset($options[$key]['email']) &&
-           !is_numeric($options[$key]['email']))
-        {
-            $method = array('Zend_Mail', 'setDefault' . ucfirst($type));
-            if(isset($options[$key]['name']) &&
-               !is_numeric($options[$key]['name']))
-            {
-                call_user_func($method, $options[$key]['email'],
-                                        $options[$key]['name']);
-            } else {
-                call_user_func($method, $options[$key]['email']);
-            }
-        }
-    }
-    
-    protected function _setupTransport($options)
-    {
-    	if(!isset($options['type'])) {
-    		$options['type'] = 'sendmail';
-    	}
-    	
-        $transportName = $options['type'];
-        if(!Zend_Loader_Autoloader::autoload($transportName))
-        {
-            $transportName = ucfirst(strtolower($transportName));
-
-            if(!Zend_Loader_Autoloader::autoload($transportName))
-            {
-                $transportName = 'Zend_Mail_Transport_' . $transportName;
-                if(!Zend_Loader_Autoloader::autoload($transportName)) {
-                    throw new Zend_Application_Resource_Exception(
-                        "Specified Mail Transport '{$transportName}'"
-                        . 'could not be found'
-                    );
-                }
-            }
-        }
-        
-        unset($options['type']);
-        
-        switch($transportName) {
-            case 'Zend_Mail_Transport_Smtp':
-                if(!isset($options['host'])) {
-                    throw new Zend_Application_Resource_Exception(
-                        'A host is necessary for smtp transport,'
-                        .' but none was given');
-                }
-                
-                $transport = new $transportName($options['host'], $options);
-                break;
-            case 'Zend_Mail_Transport_Sendmail':
-            default:
-                $transport = new $transportName($options);
-                break;
-        }
-
-        return $transport;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Modules.php b/airtime_mvc/library/Zend/Application/Resource/Modules.php
deleted file mode 100644
index f8dd962d5..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Modules.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Modules.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Module bootstrapping resource
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Modules extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var ArrayObject
-     */
-    protected $_bootstraps;
-
-    /**
-     * Constructor
-     *
-     * @param  mixed $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->_bootstraps = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-        parent::__construct($options);
-    }
-
-    /**
-     * Initialize modules
-     *
-     * @return array
-     * @throws Zend_Application_Resource_Exception When bootstrap class was not found
-     */
-    public function init()
-    {
-        $bootstrap = $this->getBootstrap();
-        $bootstrap->bootstrap('FrontController');
-        $front = $bootstrap->getResource('FrontController');
-
-        $modules = $front->getControllerDirectory();
-        $default = $front->getDefaultModule();
-        $curBootstrapClass = get_class($bootstrap);
-        foreach ($modules as $module => $moduleDirectory) {
-            $bootstrapClass = $this->_formatModuleName($module) . '_Bootstrap';
-            if (!class_exists($bootstrapClass, false)) {
-                $bootstrapPath  = dirname($moduleDirectory) . '/Bootstrap.php';
-                if (file_exists($bootstrapPath)) {
-                    $eMsgTpl = 'Bootstrap file found for module "%s" but bootstrap class "%s" not found';
-                    include_once $bootstrapPath;
-                    if (($default != $module)
-                        && !class_exists($bootstrapClass, false)
-                    ) {
-                        throw new Zend_Application_Resource_Exception(sprintf(
-                            $eMsgTpl, $module, $bootstrapClass
-                        ));
-                    } elseif ($default == $module) {
-                        if (!class_exists($bootstrapClass, false)) {
-                            $bootstrapClass = 'Bootstrap';
-                            if (!class_exists($bootstrapClass, false)) {
-                                throw new Zend_Application_Resource_Exception(sprintf(
-                                    $eMsgTpl, $module, $bootstrapClass
-                                ));
-                            }
-                        }
-                    }
-                } else {
-                    continue;
-                }
-            }
-
-            if ($bootstrapClass == $curBootstrapClass) {
-                // If the found bootstrap class matches the one calling this
-                // resource, don't re-execute.
-                continue;
-            }
-
-            $moduleBootstrap = new $bootstrapClass($bootstrap);
-            $moduleBootstrap->bootstrap();
-            $this->_bootstraps[$module] = $moduleBootstrap;
-        }
-
-        return $this->_bootstraps;
-    }
-
-    /**
-     * Get bootstraps that have been run
-     *
-     * @return ArrayObject
-     */
-    public function getExecutedBootstraps()
-    {
-        return $this->_bootstraps;
-    }
-
-    /**
-     * Format a module name to the module class prefix
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _formatModuleName($name)
-    {
-        $name = strtolower($name);
-        $name = str_replace(array('-', '.'), ' ', $name);
-        $name = ucwords($name);
-        $name = str_replace(' ', '', $name);
-        return $name;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Multidb.php b/airtime_mvc/library/Zend/Application/Resource/Multidb.php
deleted file mode 100644
index 226fbd743..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Multidb.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-require_once 'Zend/Db/Table.php';
-
-/**
- */
-
-/**
- * Cache Manager resource
- *
- * Example configuration:
- * <pre>
- *   resources.multidb.db1.adapter = "pdo_mysql"
- *   resources.multidb.db1.host = "localhost"
- *   resources.multidb.db1.username = "webuser"
- *   resources.multidb.db1.password = "XXXX"
- *   resources.multidb.db1.dbname = "db1"
- *   resources.multidb.db1.default = true
- *   
- *   resources.multidb.db2.adapter = "pdo_pgsql"
- *   resources.multidb.db2.host = "example.com"
- *   resources.multidb.db2.username = "dba"
- *   resources.multidb.db2.password = "notthatpublic"
- *   resources.multidb.db2.dbname = "db2"
- * </pre>
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Multidb extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * Associative array containing all configured db's
-     * 
-     * @var array
-     */   
-    protected $_dbs = array();
-    
-    /**
-     * An instance of the default db, if set
-     * 
-     * @var null|Zend_Db_Adapter_Abstract
-     */
-    protected $_defaultDb;
-
-    /**
-     * Initialize the Database Connections (instances of Zend_Db_Table_Abstract)
-     *
-     * @return Zend_Application_Resource_Multidb
-     */    
-    public function init() 
-    {
-        $options = $this->getOptions();
-        
-        foreach ($options as $id => $params) {
-        	$adapter = $params['adapter'];
-            $default = isset($params['default'])?(int)$params['default']:false;
-            unset($params['adapter'], $params['default']);
-        	
-            $this->_dbs[$id] = Zend_Db::factory($adapter, $params);
-
-            if ($default
-                // For consistency with the Db Resource Plugin
-                || (isset($params['isDefaultTableAdapter']) 
-                    && $params['isDefaultTableAdapter'] == true)
-            ) {
-                $this->_setDefault($this->_dbs[$id]);
-            }
-        }
-        
-        return $this;
-    }
-
-    /**
-     * Determine if the given db(identifier) is the default db.
-     *
-     * @param  string|Zend_Db_Adapter_Abstract $db The db to determine whether it's set as default
-     * @return boolean True if the given parameter is configured as default. False otherwise
-     */
-    public function isDefault($db)
-    {
-        if(!$db instanceof Zend_Db_Adapter_Abstract) {
-            $db = $this->getDb($db);
-        }
-
-        return $db === $this->_defaultDb;
-    }
-
-    /**
-     * Retrieve the specified database connection
-     * 
-     * @param  null|string|Zend_Db_Adapter_Abstract $db The adapter to retrieve.
-     *                                               Null to retrieve the default connection
-     * @return Zend_Db_Adapter_Abstract
-     * @throws Zend_Application_Resource_Exception if the given parameter could not be found
-     */
-    public function getDb($db = null) 
-    {
-        if ($db === null) {
-            return $this->getDefaultDb();
-        }
-        
-        if (isset($this->_dbs[$db])) {
-            return $this->_dbs[$db];
-        }
-        
-        throw new Zend_Application_Resource_Exception(
-            'A DB adapter was tried to retrieve, but was not configured'
-        );
-    }
-
-    /**
-     * Get the default db connection
-     * 
-     * @param  boolean $justPickOne If true, a random (the first one in the stack)
-     *                           connection is returned if no default was set.
-     *                           If false, null is returned if no default was set.
-     * @return null|Zend_Db_Adapter_Abstract
-     */
-    public function getDefaultDb($justPickOne = true) 
-    {
-        if ($this->_defaultDb !== null) {
-            return $this->_defaultDb;
-        }
-
-        if ($justPickOne) {
-            return reset($this->_dbs); // Return first db in db pool
-        }
-        
-        return null;
-    }
-
-    /**
-     * Set the default db adapter
-     * 
-     * @var Zend_Db_Adapter_Abstract $adapter Adapter to set as default
-     */
-    protected function _setDefault(Zend_Db_Adapter_Abstract $adapter) 
-    {
-        Zend_Db_Table::setDefaultAdapter($adapter);
-        $this->_defaultDb = $adapter;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Navigation.php b/airtime_mvc/library/Zend/Application/Resource/Navigation.php
deleted file mode 100644
index 566b20aa0..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Navigation.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Navigation.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for setting navigation structure
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Dolf Schimmel
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Navigation
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    const DEFAULT_REGISTRY_KEY = 'Zend_Navigation';
-
-    /**
-     * @var Zend_Navigation
-     */
-    protected $_container;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Navigation
-     */
-    public function init()
-    {
-        if (!$this->_container) {
-            $options = $this->getOptions();
-            $pages = isset($options['pages']) ? $options['pages'] : array();
-            $this->_container = new Zend_Navigation($pages);
-        }
-
-        $this->store();
-        return $this->_container;
-    }
-
-    /**
-     * Stores navigation container in registry or Navigation view helper
-     *
-     * @return void
-     */
-    public function store()
-    {
-        $options = $this->getOptions();
-        if (isset($options['storage']['registry']) &&
-            $options['storage']['registry'] == true) {
-            $this->_storeRegistry();
-        } else {
-            $this->_storeHelper();
-        }
-    }
-
-    /**
-     * Stores navigation container in the registry
-     *
-     * @return void
-     */
-    protected function _storeRegistry()
-    {
-        $options = $this->getOptions();
-        if(isset($options['storage']['registry']['key']) &&
-           !is_numeric($options['storage']['registry']['key'])) // see ZF-7461
-        {
-           $key = $options['storage']['registry']['key'];
-        } else {
-            $key = self::DEFAULT_REGISTRY_KEY;
-        }
-
-        Zend_Registry::set($key,$this->getContainer());
-    }
-
-    /**
-     * Stores navigation container in the Navigation helper
-     *
-     * @return void
-     */
-    protected function _storeHelper()
-    {
-        $this->getBootstrap()->bootstrap('view');
-        $view = $this->getBootstrap()->view;
-        $view->getHelper('navigation')->navigation($this->getContainer());
-    }
-
-    /**
-     * Returns navigation container
-     *
-     * @return Zend_Navigation
-     */
-    public function getContainer()
-    {
-        return $this->_container;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Resource.php b/airtime_mvc/library/Zend/Application/Resource/Resource.php
deleted file mode 100644
index d3246acc3..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Resource.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for bootstrap resources
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Application_Resource_Resource
-{
-    /**
-     * Constructor
-     *
-     * Must take an optional single argument, $options.
-     *
-     * @param  mixed $options
-     * @return void
-     */
-    public function __construct($options = null);
-
-    /**
-     * Set the bootstrap to which the resource is attached
-     *
-     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap
-     * @return Zend_Application_Resource_Resource
-     */
-    public function setBootstrap(Zend_Application_Bootstrap_Bootstrapper $bootstrap);
-
-    /**
-     * Retrieve the bootstrap to which the resource is attached
-     *
-     * @return Zend_Application_Bootstrap_Bootstrapper
-     */
-    public function getBootstrap();
-
-    /**
-     * Set resource options
-     *
-     * @param  array $options
-     * @return Zend_Application_Resource_Resource
-     */
-    public function setOptions(array $options);
-
-    /**
-     * Retrieve resource options
-     *
-     * @return array
-     */
-    public function getOptions();
-
-    /**
-     * Strategy pattern: initialize resource
-     *
-     * @return mixed
-     */
-    public function init();
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/ResourceAbstract.php b/airtime_mvc/library/Zend/Application/Resource/ResourceAbstract.php
deleted file mode 100644
index 381b8b64f..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/ResourceAbstract.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResourceAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Application_Resource_Resource
- */
-require_once 'Zend/Application/Resource/Resource.php';
-
-/**
- * Abstract class for bootstrap resources
- *
- * @uses       Zend_Application_Resource_Resource
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Application_Resource_Resource
-{
-    /**
-     * Parent bootstrap
-     *
-     * @var Zend_Application_Bootstrap_Bootstrapper
-     */
-    protected $_bootstrap;
-
-    /**
-     * Options for the resource
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Create a instance with options
-     *
-     * @param mixed $options
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } else if ($options instanceof Zend_Config) {
-            $this->setOptions($options->toArray());
-        }
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for resource
-     * @return Zend_Application_Resource_ResourceAbstract
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . strtolower($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-            if ('bootstrap' === $key) {
-                unset($options[$key]);
-            }
-        }
-
-        $this->_options = $this->mergeOptions($this->_options, $options);
-
-        return $this;
-    }
-
-    /**
-     * Retrieve resource options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Merge options recursively
-     *
-     * @param  array $array1
-     * @param  mixed $array2
-     * @return array
-     */
-    public function mergeOptions(array $array1, $array2 = null)
-    {
-        if (is_array($array2)) {
-            foreach ($array2 as $key => $val) {
-                if (is_array($array2[$key])) {
-                    $array1[$key] = (array_key_exists($key, $array1) && is_array($array1[$key]))
-                                  ? $this->mergeOptions($array1[$key], $array2[$key])
-                                  : $array2[$key];
-                } else {
-                    $array1[$key] = $val;
-                }
-            }
-        }
-        return $array1;
-    }
-
-    /**
-     * Set the bootstrap to which the resource is attached
-     *
-     * @param  Zend_Application_Bootstrap_Bootstrapper $bootstrap
-     * @return Zend_Application_Resource_Resource
-     */
-    public function setBootstrap(Zend_Application_Bootstrap_Bootstrapper $bootstrap)
-    {
-        $this->_bootstrap = $bootstrap;
-        return $this;
-    }
-
-    /**
-     * Retrieve the bootstrap to which the resource is attached
-     *
-     * @return null|Zend_Application_Bootstrap_Bootstrapper
-     */
-    public function getBootstrap()
-    {
-        return $this->_bootstrap;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Router.php b/airtime_mvc/library/Zend/Application/Resource/Router.php
deleted file mode 100644
index 1a73fc915..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Router.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Router.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for initializing the locale
- *
- * @uses       Zend_Application_Resource_Base
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Router
-    extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_Controller_Router_Rewrite
-     */
-    protected $_router;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function init()
-    {
-        return $this->getRouter();
-    }
-
-    /**
-     * Retrieve router object
-     *
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function getRouter()
-    {
-        if (null === $this->_router) {
-            $bootstrap = $this->getBootstrap();
-            $bootstrap->bootstrap('FrontController');
-            $this->_router = $bootstrap->getContainer()->frontcontroller->getRouter();
-
-            $options = $this->getOptions();
-            if (!isset($options['routes'])) {
-                $options['routes'] = array();
-            }
-
-            if (isset($options['chainNameSeparator'])) {
-                $this->_router->setChainNameSeparator($options['chainNameSeparator']);
-            }
-
-            if (isset($options['useRequestParametersAsGlobal'])) {
-                $this->_router->useRequestParametersAsGlobal($options['useRequestParametersAsGlobal']);
-            }
-
-            $this->_router->addConfig(new Zend_Config($options['routes']));
-        }
-
-        return $this->_router;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Session.php b/airtime_mvc/library/Zend/Application/Resource/Session.php
deleted file mode 100644
index 306b676f2..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Session.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Session.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for setting session options
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Session extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * Save handler to use
-     *
-     * @var Zend_Session_SaveHandler_Interface
-     */
-    protected $_saveHandler = null;
-
-    /**
-     * Set session save handler
-     *
-     * @param  array|string|Zend_Session_SaveHandler_Interface $saveHandler
-     * @return Zend_Application_Resource_Session
-     * @throws Zend_Application_Resource_Exception When $saveHandler is no valid save handler
-     */
-    public function setSaveHandler($saveHandler)
-    {
-        $this->_saveHandler = $saveHandler;
-        return $this;
-    }
-
-    /**
-     * Get session save handler
-     *
-     * @return Zend_Session_SaveHandler_Interface
-     */
-    public function getSaveHandler()
-    {
-        if (!$this->_saveHandler instanceof Zend_Session_SaveHandler_Interface) {
-            if (is_array($this->_saveHandler)) {
-                if (!array_key_exists('class', $this->_saveHandler)) {
-                    throw new Zend_Application_Resource_Exception('Session save handler class not provided in options');
-                }
-                $options = array();
-                if (array_key_exists('options', $this->_saveHandler)) {
-                    $options = $this->_saveHandler['options'];
-                }
-                $this->_saveHandler = $this->_saveHandler['class'];
-                $this->_saveHandler = new $this->_saveHandler($options);
-            } elseif (is_string($this->_saveHandler)) {
-                $this->_saveHandler = new $this->_saveHandler();
-            }
-
-            if (!$this->_saveHandler instanceof Zend_Session_SaveHandler_Interface) {
-                throw new Zend_Application_Resource_Exception('Invalid session save handler');
-            }
-        }
-        return $this->_saveHandler;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function _hasSaveHandler()
-    {
-        return ($this->_saveHandler !== null);
-    }
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return void
-     */
-    public function init()
-    {
-        $options = array_change_key_case($this->getOptions(), CASE_LOWER);
-        if (isset($options['savehandler'])) {
-            unset($options['savehandler']);
-        }
-
-        if (count($options) > 0) {
-            Zend_Session::setOptions($options);
-        }
-
-        if ($this->_hasSaveHandler()) {
-            Zend_Session::setSaveHandler($this->getSaveHandler());
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/Translate.php b/airtime_mvc/library/Zend/Application/Resource/Translate.php
deleted file mode 100644
index 759d5f44f..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/Translate.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Translate.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for setting translation options
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract
-{
-    const DEFAULT_REGISTRY_KEY = 'Zend_Translate';
-
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translate;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_Translate
-     */
-    public function init()
-    {
-        return $this->getTranslate();
-    }
-
-    /**
-     * Retrieve translate object
-     *
-     * @return Zend_Translate
-     * @throws Zend_Application_Resource_Exception if registry key was used
-     *          already but is no instance of Zend_Translate
-     */
-    public function getTranslate()
-    {
-        if (null === $this->_translate) {
-            $options = $this->getOptions();
-
-            if (!isset($options['data'])) {
-                require_once 'Zend/Application/Resource/Exception.php';
-                throw new Zend_Application_Resource_Exception('No translation source data provided.');
-            }
-
-            $adapter = isset($options['adapter']) ? $options['adapter'] : Zend_Translate::AN_ARRAY;
-            $locale  = isset($options['locale'])  ? $options['locale']  : null;
-            $translateOptions = isset($options['options']) ? $options['options'] : array();
-
-            $key = (isset($options['registry_key']) && !is_numeric($options['registry_key']))
-                 ? $options['registry_key']
-                 : self::DEFAULT_REGISTRY_KEY;
-
-            if(Zend_Registry::isRegistered($key)) {
-                $translate = Zend_Registry::get($key);
-                if(!$translate instanceof Zend_Translate) {
-                    require_once 'Zend/Application/Resource/Exception.php';
-                    throw new Zend_Application_Resource_Exception($key
-                                   . ' already registered in registry but is '
-                                   . 'no instance of Zend_Translate');
-                }
-
-                $translate->addTranslation($options['data'], $locale, $options);
-                $this->_translate = $translate;
-            } else {
-                $this->_translate = new Zend_Translate(
-                    $adapter, $options['data'], $locale, $translateOptions
-                );
-
-                Zend_Registry::set($key, $this->_translate);
-            }
-        }
-
-        return $this->_translate;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Application/Resource/View.php b/airtime_mvc/library/Zend/Application/Resource/View.php
deleted file mode 100644
index 2550a94ce..000000000
--- a/airtime_mvc/library/Zend/Application/Resource/View.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 20816 2010-02-01 21:13:54Z freak $
- */
-
-/**
- * @see Zend_Application_Resource_ResourceAbstract
- */
-require_once 'Zend/Application/Resource/ResourceAbstract.php';
-
-
-/**
- * Resource for settings view options
- *
- * @uses       Zend_Application_Resource_ResourceAbstract
- * @category   Zend
- * @package    Zend_Application
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract
-{
-    /**
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * Defined by Zend_Application_Resource_Resource
-     *
-     * @return Zend_View
-     */
-    public function init()
-    {
-        $view = $this->getView();
-
-        $viewRenderer = new Zend_Controller_Action_Helper_ViewRenderer();
-        $viewRenderer->setView($view);
-        Zend_Controller_Action_HelperBroker::addHelper($viewRenderer);
-        return $view;
-    }
-
-    /**
-     * Retrieve view object
-     *
-     * @return Zend_View
-     */
-    public function getView()
-    {
-        if (null === $this->_view) {
-            $options = $this->getOptions();
-            $this->_view = new Zend_View($options);
-
-            if(isset($options['doctype'])) {
-                $this->_view->doctype()->setDoctype(strtoupper($options['doctype']));
-            }
-        }
-        return $this->_view;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth.php b/airtime_mvc/library/Zend/Auth.php
deleted file mode 100644
index 5bd2b96d4..000000000
--- a/airtime_mvc/library/Zend/Auth.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Auth.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth
-{
-    /**
-     * Singleton instance
-     *
-     * @var Zend_Auth
-     */
-    protected static $_instance = null;
-
-    /**
-     * Persistent storage handler
-     *
-     * @var Zend_Auth_Storage_Interface
-     */
-    protected $_storage = null;
-
-    /**
-     * Singleton pattern implementation makes "new" unavailable
-     *
-     * @return void
-     */
-    protected function __construct()
-    {}
-
-    /**
-     * Singleton pattern implementation makes "clone" unavailable
-     *
-     * @return void
-     */
-    protected function __clone()
-    {}
-
-    /**
-     * Returns an instance of Zend_Auth
-     *
-     * Singleton pattern implementation
-     *
-     * @return Zend_Auth Provides a fluent interface
-     */
-    public static function getInstance()
-    {
-        if (null === self::$_instance) {
-            self::$_instance = new self();
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Returns the persistent storage handler
-     *
-     * Session storage is used by default unless a different storage adapter has been set.
-     *
-     * @return Zend_Auth_Storage_Interface
-     */
-    public function getStorage()
-    {
-        if (null === $this->_storage) {
-            /**
-             * @see Zend_Auth_Storage_Session
-             */
-            require_once 'Zend/Auth/Storage/Session.php';
-            $this->setStorage(new Zend_Auth_Storage_Session());
-        }
-
-        return $this->_storage;
-    }
-
-    /**
-     * Sets the persistent storage handler
-     *
-     * @param  Zend_Auth_Storage_Interface $storage
-     * @return Zend_Auth Provides a fluent interface
-     */
-    public function setStorage(Zend_Auth_Storage_Interface $storage)
-    {
-        $this->_storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Authenticates against the supplied adapter
-     *
-     * @param  Zend_Auth_Adapter_Interface $adapter
-     * @return Zend_Auth_Result
-     */
-    public function authenticate(Zend_Auth_Adapter_Interface $adapter)
-    {
-        $result = $adapter->authenticate();
-
-        /**
-         * ZF-7546 - prevent multiple succesive calls from storing inconsistent results
-         * Ensure storage has clean state
-         */
-        if ($this->hasIdentity()) {
-            $this->clearIdentity();
-        }
-
-        if ($result->isValid()) {
-            $this->getStorage()->write($result->getIdentity());
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns true if and only if an identity is available from storage
-     *
-     * @return boolean
-     */
-    public function hasIdentity()
-    {
-        return !$this->getStorage()->isEmpty();
-    }
-
-    /**
-     * Returns the identity from storage or null if no identity is available
-     *
-     * @return mixed|null
-     */
-    public function getIdentity()
-    {
-        $storage = $this->getStorage();
-
-        if ($storage->isEmpty()) {
-            return null;
-        }
-
-        return $storage->read();
-    }
-
-    /**
-     * Clears the identity from persistent storage
-     *
-     * @return void
-     */
-    public function clearIdentity()
-    {
-        $this->getStorage()->clear();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/DbTable.php b/airtime_mvc/library/Zend/Auth/Adapter/DbTable.php
deleted file mode 100644
index 908423f64..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/DbTable.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Auth_Result
- */
-require_once 'Zend/Auth/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
-{
-
-    /**
-     * Database Connection
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_zendDb = null;
-
-    /**
-     * @var Zend_Db_Select
-     */
-    protected $_dbSelect = null;
-
-    /**
-     * $_tableName - the table name to check
-     *
-     * @var string
-     */
-    protected $_tableName = null;
-
-    /**
-     * $_identityColumn - the column to use as the identity
-     *
-     * @var string
-     */
-    protected $_identityColumn = null;
-
-    /**
-     * $_credentialColumns - columns to be used as the credentials
-     *
-     * @var string
-     */
-    protected $_credentialColumn = null;
-
-    /**
-     * $_identity - Identity value
-     *
-     * @var string
-     */
-    protected $_identity = null;
-
-    /**
-     * $_credential - Credential values
-     *
-     * @var string
-     */
-    protected $_credential = null;
-
-    /**
-     * $_credentialTreatment - Treatment applied to the credential, such as MD5() or PASSWORD()
-     *
-     * @var string
-     */
-    protected $_credentialTreatment = null;
-
-    /**
-     * $_authenticateResultInfo
-     *
-     * @var array
-     */
-    protected $_authenticateResultInfo = null;
-
-    /**
-     * $_resultRow - Results of database authentication query
-     *
-     * @var array
-     */
-    protected $_resultRow = null;
-
-    /**
-     * __construct() - Sets configuration options
-     *
-     * @param  Zend_Db_Adapter_Abstract $zendDb
-     * @param  string                   $tableName
-     * @param  string                   $identityColumn
-     * @param  string                   $credentialColumn
-     * @param  string                   $credentialTreatment
-     * @return void
-     */
-    public function __construct(Zend_Db_Adapter_Abstract $zendDb, $tableName = null, $identityColumn = null,
-                                $credentialColumn = null, $credentialTreatment = null)
-    {
-        $this->_zendDb = $zendDb;
-
-        if (null !== $tableName) {
-            $this->setTableName($tableName);
-        }
-
-        if (null !== $identityColumn) {
-            $this->setIdentityColumn($identityColumn);
-        }
-
-        if (null !== $credentialColumn) {
-            $this->setCredentialColumn($credentialColumn);
-        }
-
-        if (null !== $credentialTreatment) {
-            $this->setCredentialTreatment($credentialTreatment);
-        }
-    }
-
-    /**
-     * setTableName() - set the table name to be used in the select query
-     *
-     * @param  string $tableName
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setTableName($tableName)
-    {
-        $this->_tableName = $tableName;
-        return $this;
-    }
-
-    /**
-     * setIdentityColumn() - set the column name to be used as the identity column
-     *
-     * @param  string $identityColumn
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setIdentityColumn($identityColumn)
-    {
-        $this->_identityColumn = $identityColumn;
-        return $this;
-    }
-
-    /**
-     * setCredentialColumn() - set the column name to be used as the credential column
-     *
-     * @param  string $credentialColumn
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setCredentialColumn($credentialColumn)
-    {
-        $this->_credentialColumn = $credentialColumn;
-        return $this;
-    }
-
-    /**
-     * setCredentialTreatment() - allows the developer to pass a parameterized string that is
-     * used to transform or treat the input credential data.
-     *
-     * In many cases, passwords and other sensitive data are encrypted, hashed, encoded,
-     * obscured, or otherwise treated through some function or algorithm. By specifying a
-     * parameterized treatment string with this method, a developer may apply arbitrary SQL
-     * upon input credential data.
-     *
-     * Examples:
-     *
-     *  'PASSWORD(?)'
-     *  'MD5(?)'
-     *
-     * @param  string $treatment
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setCredentialTreatment($treatment)
-    {
-        $this->_credentialTreatment = $treatment;
-        return $this;
-    }
-
-    /**
-     * setIdentity() - set the value to be used as the identity
-     *
-     * @param  string $value
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setIdentity($value)
-    {
-        $this->_identity = $value;
-        return $this;
-    }
-
-    /**
-     * setCredential() - set the credential value to be used, optionally can specify a treatment
-     * to be used, should be supplied in parameterized form, such as 'MD5(?)' or 'PASSWORD(?)'
-     *
-     * @param  string $credential
-     * @return Zend_Auth_Adapter_DbTable Provides a fluent interface
-     */
-    public function setCredential($credential)
-    {
-        $this->_credential = $credential;
-        return $this;
-    }
-
-    /**
-     * getDbSelect() - Return the preauthentication Db Select object for userland select query modification
-     *
-     * @return Zend_Db_Select
-     */
-    public function getDbSelect()
-    {
-        if ($this->_dbSelect == null) {
-            $this->_dbSelect = $this->_zendDb->select();
-        }
-
-        return $this->_dbSelect;
-    }
-
-    /**
-     * getResultRowObject() - Returns the result row as a stdClass object
-     *
-     * @param  string|array $returnColumns
-     * @param  string|array $omitColumns
-     * @return stdClass|boolean
-     */
-    public function getResultRowObject($returnColumns = null, $omitColumns = null)
-    {
-        if (!$this->_resultRow) {
-            return false;
-        }
-
-        $returnObject = new stdClass();
-
-        if (null !== $returnColumns) {
-
-            $availableColumns = array_keys($this->_resultRow);
-            foreach ( (array) $returnColumns as $returnColumn) {
-                if (in_array($returnColumn, $availableColumns)) {
-                    $returnObject->{$returnColumn} = $this->_resultRow[$returnColumn];
-                }
-            }
-            return $returnObject;
-
-        } elseif (null !== $omitColumns) {
-
-            $omitColumns = (array) $omitColumns;
-            foreach ($this->_resultRow as $resultColumn => $resultValue) {
-                if (!in_array($resultColumn, $omitColumns)) {
-                    $returnObject->{$resultColumn} = $resultValue;
-                }
-            }
-            return $returnObject;
-
-        } else {
-
-            foreach ($this->_resultRow as $resultColumn => $resultValue) {
-                $returnObject->{$resultColumn} = $resultValue;
-            }
-            return $returnObject;
-
-        }
-    }
-
-    /**
-     * authenticate() - defined by Zend_Auth_Adapter_Interface.  This method is called to
-     * attempt an authentication.  Previous to this call, this adapter would have already
-     * been configured with all necessary information to successfully connect to a database
-     * table and attempt to find a record matching the provided identity.
-     *
-     * @throws Zend_Auth_Adapter_Exception if answering the authentication query is impossible
-     * @return Zend_Auth_Result
-     */
-    public function authenticate()
-    {
-        $this->_authenticateSetup();
-        $dbSelect = $this->_authenticateCreateSelect();
-        $resultIdentities = $this->_authenticateQuerySelect($dbSelect);
-
-        if ( ($authResult = $this->_authenticateValidateResultset($resultIdentities)) instanceof Zend_Auth_Result) {
-            return $authResult;
-        }
-
-        $authResult = $this->_authenticateValidateResult(array_shift($resultIdentities));
-        return $authResult;
-    }
-
-    /**
-     * _authenticateSetup() - This method abstracts the steps involved with
-     * making sure that this adapter was indeed setup properly with all
-     * required pieces of information.
-     *
-     * @throws Zend_Auth_Adapter_Exception - in the event that setup was not done properly
-     * @return true
-     */
-    protected function _authenticateSetup()
-    {
-        $exception = null;
-
-        if ($this->_tableName == '') {
-            $exception = 'A table must be supplied for the Zend_Auth_Adapter_DbTable authentication adapter.';
-        } elseif ($this->_identityColumn == '') {
-            $exception = 'An identity column must be supplied for the Zend_Auth_Adapter_DbTable authentication adapter.';
-        } elseif ($this->_credentialColumn == '') {
-            $exception = 'A credential column must be supplied for the Zend_Auth_Adapter_DbTable authentication adapter.';
-        } elseif ($this->_identity == '') {
-            $exception = 'A value for the identity was not provided prior to authentication with Zend_Auth_Adapter_DbTable.';
-        } elseif ($this->_credential === null) {
-            $exception = 'A credential value was not provided prior to authentication with Zend_Auth_Adapter_DbTable.';
-        }
-
-        if (null !== $exception) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception($exception);
-        }
-
-        $this->_authenticateResultInfo = array(
-            'code'     => Zend_Auth_Result::FAILURE,
-            'identity' => $this->_identity,
-            'messages' => array()
-            );
-
-        return true;
-    }
-
-    /**
-     * _authenticateCreateSelect() - This method creates a Zend_Db_Select object that
-     * is completely configured to be queried against the database.
-     *
-     * @return Zend_Db_Select
-     */
-    protected function _authenticateCreateSelect()
-    {
-        // build credential expression
-        if (empty($this->_credentialTreatment) || (strpos($this->_credentialTreatment, '?') === false)) {
-            $this->_credentialTreatment = '?';
-        }
-
-        $credentialExpression = new Zend_Db_Expr(
-            '(CASE WHEN ' .
-            $this->_zendDb->quoteInto(
-                $this->_zendDb->quoteIdentifier($this->_credentialColumn, true)
-                . ' = ' . $this->_credentialTreatment, $this->_credential
-                )
-            . ' THEN 1 ELSE 0 END) AS '
-            . $this->_zendDb->quoteIdentifier(
-                $this->_zendDb->foldCase('zend_auth_credential_match')
-                )
-            );
-
-        // get select
-        $dbSelect = clone $this->getDbSelect();
-        $dbSelect->from($this->_tableName, array('*', $credentialExpression))
-                 ->where($this->_zendDb->quoteIdentifier($this->_identityColumn, true) . ' = ?', $this->_identity);
-
-        return $dbSelect;
-    }
-
-    /**
-     * _authenticateQuerySelect() - This method accepts a Zend_Db_Select object and
-     * performs a query against the database with that object.
-     *
-     * @param Zend_Db_Select $dbSelect
-     * @throws Zend_Auth_Adapter_Exception - when an invalid select
-     *                                       object is encountered
-     * @return array
-     */
-    protected function _authenticateQuerySelect(Zend_Db_Select $dbSelect)
-    {
-        try {
-            if ($this->_zendDb->getFetchMode() != Zend_DB::FETCH_ASSOC) {
-                $origDbFetchMode = $this->_zendDb->getFetchMode();
-                $this->_zendDb->setFetchMode(Zend_DB::FETCH_ASSOC);
-            }
-            $resultIdentities = $this->_zendDb->fetchAll($dbSelect->__toString());
-            if (isset($origDbFetchMode)) {
-                $this->_zendDb->setFetchMode($origDbFetchMode);
-                unset($origDbFetchMode);
-            }
-        } catch (Exception $e) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('The supplied parameters to Zend_Auth_Adapter_DbTable failed to '
-                                                . 'produce a valid sql statement, please check table and column names '
-                                                . 'for validity.', 0, $e);
-        }
-        return $resultIdentities;
-    }
-
-    /**
-     * _authenticateValidateResultSet() - This method attempts to make
-     * certain that only one record was returned in the resultset
-     *
-     * @param array $resultIdentities
-     * @return true|Zend_Auth_Result
-     */
-    protected function _authenticateValidateResultSet(array $resultIdentities)
-    {
-
-        if (count($resultIdentities) < 1) {
-            $this->_authenticateResultInfo['code'] = Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
-            $this->_authenticateResultInfo['messages'][] = 'A record with the supplied identity could not be found.';
-            return $this->_authenticateCreateAuthResult();
-        } elseif (count($resultIdentities) > 1) {
-            $this->_authenticateResultInfo['code'] = Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS;
-            $this->_authenticateResultInfo['messages'][] = 'More than one record matches the supplied identity.';
-            return $this->_authenticateCreateAuthResult();
-        }
-
-        return true;
-    }
-
-    /**
-     * _authenticateValidateResult() - This method attempts to validate that
-     * the record in the resultset is indeed a record that matched the
-     * identity provided to this adapter.
-     *
-     * @param array $resultIdentity
-     * @return Zend_Auth_Result
-     */
-    protected function _authenticateValidateResult($resultIdentity)
-    {
-        $zendAuthCredentialMatchColumn = $this->_zendDb->foldCase('zend_auth_credential_match');
-
-        if ($resultIdentity[$zendAuthCredentialMatchColumn] != '1') {
-            $this->_authenticateResultInfo['code'] = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
-            $this->_authenticateResultInfo['messages'][] = 'Supplied credential is invalid.';
-            return $this->_authenticateCreateAuthResult();
-        }
-
-        unset($resultIdentity[$zendAuthCredentialMatchColumn]);
-        $this->_resultRow = $resultIdentity;
-
-        $this->_authenticateResultInfo['code'] = Zend_Auth_Result::SUCCESS;
-        $this->_authenticateResultInfo['messages'][] = 'Authentication successful.';
-        return $this->_authenticateCreateAuthResult();
-    }
-
-    /**
-     * _authenticateCreateAuthResult() - Creates a Zend_Auth_Result object from
-     * the information that has been collected during the authenticate() attempt.
-     *
-     * @return Zend_Auth_Result
-     */
-    protected function _authenticateCreateAuthResult()
-    {
-        return new Zend_Auth_Result(
-            $this->_authenticateResultInfo['code'],
-            $this->_authenticateResultInfo['identity'],
-            $this->_authenticateResultInfo['messages']
-            );
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Digest.php b/airtime_mvc/library/Zend/Auth/Adapter/Digest.php
deleted file mode 100644
index 90b79a836..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Digest.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Digest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
-{
-    /**
-     * Filename against which authentication queries are performed
-     *
-     * @var string
-     */
-    protected $_filename;
-
-    /**
-     * Digest authentication realm
-     *
-     * @var string
-     */
-    protected $_realm;
-
-    /**
-     * Digest authentication user
-     *
-     * @var string
-     */
-    protected $_username;
-
-    /**
-     * Password for the user of the realm
-     *
-     * @var string
-     */
-    protected $_password;
-
-    /**
-     * Sets adapter options
-     *
-     * @param  mixed $filename
-     * @param  mixed $realm
-     * @param  mixed $username
-     * @param  mixed $password
-     * @return void
-     */
-    public function __construct($filename = null, $realm = null, $username = null, $password = null)
-    {
-        $options = array('filename', 'realm', 'username', 'password');
-        foreach ($options as $option) {
-            if (null !== $$option) {
-                $methodName = 'set' . ucfirst($option);
-                $this->$methodName($$option);
-            }
-        }
-    }
-
-    /**
-     * Returns the filename option value or null if it has not yet been set
-     *
-     * @return string|null
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
-
-    /**
-     * Sets the filename option value
-     *
-     * @param  mixed $filename
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
-     */
-    public function setFilename($filename)
-    {
-        $this->_filename = (string) $filename;
-        return $this;
-    }
-
-    /**
-     * Returns the realm option value or null if it has not yet been set
-     *
-     * @return string|null
-     */
-    public function getRealm()
-    {
-        return $this->_realm;
-    }
-
-    /**
-     * Sets the realm option value
-     *
-     * @param  mixed $realm
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
-     */
-    public function setRealm($realm)
-    {
-        $this->_realm = (string) $realm;
-        return $this;
-    }
-
-    /**
-     * Returns the username option value or null if it has not yet been set
-     *
-     * @return string|null
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Sets the username option value
-     *
-     * @param  mixed $username
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
-     */
-    public function setUsername($username)
-    {
-        $this->_username = (string) $username;
-        return $this;
-    }
-
-    /**
-     * Returns the password option value or null if it has not yet been set
-     *
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Sets the password option value
-     *
-     * @param  mixed $password
-     * @return Zend_Auth_Adapter_Digest Provides a fluent interface
-     */
-    public function setPassword($password)
-    {
-        $this->_password = (string) $password;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Auth_Adapter_Interface
-     *
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result
-     */
-    public function authenticate()
-    {
-        $optionsRequired = array('filename', 'realm', 'username', 'password');
-        foreach ($optionsRequired as $optionRequired) {
-            if (null === $this->{"_$optionRequired"}) {
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception("Option '$optionRequired' must be set before authentication");
-            }
-        }
-
-        if (false === ($fileHandle = @fopen($this->_filename, 'r'))) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception("Cannot open '$this->_filename' for reading");
-        }
-
-        $id       = "$this->_username:$this->_realm";
-        $idLength = strlen($id);
-
-        $result = array(
-            'code'  => Zend_Auth_Result::FAILURE,
-            'identity' => array(
-                'realm'    => $this->_realm,
-                'username' => $this->_username,
-                ),
-            'messages' => array()
-            );
-
-        while ($line = trim(fgets($fileHandle))) {
-            if (substr($line, 0, $idLength) === $id) {
-                if (substr($line, -32) === md5("$this->_username:$this->_realm:$this->_password")) {
-                    $result['code'] = Zend_Auth_Result::SUCCESS;
-                } else {
-                    $result['code'] = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
-                    $result['messages'][] = 'Password incorrect';
-                }
-                return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
-            }
-        }
-
-        $result['code'] = Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
-        $result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found";
-        return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Exception.php b/airtime_mvc/library/Zend/Auth/Adapter/Exception.php
deleted file mode 100644
index aee0a014b..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Auth_Exception
- */
-require_once 'Zend/Auth/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_Exception extends Zend_Auth_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Http.php b/airtime_mvc/library/Zend/Auth/Adapter/Http.php
deleted file mode 100644
index 7edbc628b..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Http.php
+++ /dev/null
@@ -1,847 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-
-/**
- * HTTP Authentication Adapter
- *
- * Implements a pretty good chunk of RFC 2617.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @todo       Support auth-int
- * @todo       Track nonces, nonce-count, opaque for replay protection and stale support
- * @todo       Support Authentication-Info header
- */
-class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
-{
-    /**
-     * Reference to the HTTP Request object
-     *
-     * @var Zend_Controller_Request_Http
-     */
-    protected $_request;
-
-    /**
-     * Reference to the HTTP Response object
-     *
-     * @var Zend_Controller_Response_Http
-     */
-    protected $_response;
-
-    /**
-     * Object that looks up user credentials for the Basic scheme
-     *
-     * @var Zend_Auth_Adapter_Http_Resolver_Interface
-     */
-    protected $_basicResolver;
-
-    /**
-     * Object that looks up user credentials for the Digest scheme
-     *
-     * @var Zend_Auth_Adapter_Http_Resolver_Interface
-     */
-    protected $_digestResolver;
-
-    /**
-     * List of authentication schemes supported by this class
-     *
-     * @var array
-     */
-    protected $_supportedSchemes = array('basic', 'digest');
-
-    /**
-     * List of schemes this class will accept from the client
-     *
-     * @var array
-     */
-    protected $_acceptSchemes;
-
-    /**
-     * Space-delimited list of protected domains for Digest Auth
-     *
-     * @var string
-     */
-    protected $_domains;
-
-    /**
-     * The protection realm to use
-     *
-     * @var string
-     */
-    protected $_realm;
-
-    /**
-     * Nonce timeout period
-     *
-     * @var integer
-     */
-    protected $_nonceTimeout;
-
-    /**
-     * Whether to send the opaque value in the header. True by default
-     *
-     * @var boolean
-     */
-    protected $_useOpaque;
-
-    /**
-     * List of the supported digest algorithms. I want to support both MD5 and
-     * MD5-sess, but MD5-sess won't make it into the first version.
-     *
-     * @var array
-     */
-    protected $_supportedAlgos = array('MD5');
-
-    /**
-     * The actual algorithm to use. Defaults to MD5
-     *
-     * @var string
-     */
-    protected $_algo;
-
-    /**
-     * List of supported qop options. My intetion is to support both 'auth' and
-     * 'auth-int', but 'auth-int' won't make it into the first version.
-     *
-     * @var array
-     */
-    protected $_supportedQops = array('auth');
-
-    /**
-     * Whether or not to do Proxy Authentication instead of origin server
-     * authentication (send 407's instead of 401's). Off by default.
-     *
-     * @var boolean
-     */
-    protected $_imaProxy;
-
-    /**
-     * Flag indicating the client is IE and didn't bother to return the opaque string
-     *
-     * @var boolean
-     */
-    protected $_ieNoOpaque;
-
-    /**
-     * Constructor
-     *
-     * @param  array $config Configuration settings:
-     *    'accept_schemes' => 'basic'|'digest'|'basic digest'
-     *    'realm' => <string>
-     *    'digest_domains' => <string> Space-delimited list of URIs
-     *    'nonce_timeout' => <int>
-     *    'use_opaque' => <bool> Whether to send the opaque value in the header
-     *    'alogrithm' => <string> See $_supportedAlgos. Default: MD5
-     *    'proxy_auth' => <bool> Whether to do authentication as a Proxy
-     * @throws Zend_Auth_Adapter_Exception
-     * @return void
-     */
-    public function __construct(array $config)
-    {
-        if (!extension_loaded('hash')) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception(__CLASS__  . ' requires the \'hash\' extension');
-        }
-
-        $this->_request  = null;
-        $this->_response = null;
-        $this->_ieNoOpaque = false;
-
-
-        if (empty($config['accept_schemes'])) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('Config key \'accept_schemes\' is required');
-        }
-
-        $schemes = explode(' ', $config['accept_schemes']);
-        $this->_acceptSchemes = array_intersect($schemes, $this->_supportedSchemes);
-        if (empty($this->_acceptSchemes)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('No supported schemes given in \'accept_schemes\'. Valid values: '
-                                                . implode(', ', $this->_supportedSchemes));
-        }
-
-        // Double-quotes are used to delimit the realm string in the HTTP header,
-        // and colons are field delimiters in the password file.
-        if (empty($config['realm']) ||
-            !ctype_print($config['realm']) ||
-            strpos($config['realm'], ':') !== false ||
-            strpos($config['realm'], '"') !== false) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('Config key \'realm\' is required, and must contain only printable '
-                                                . 'characters, excluding quotation marks and colons');
-        } else {
-            $this->_realm = $config['realm'];
-        }
-
-        if (in_array('digest', $this->_acceptSchemes)) {
-            if (empty($config['digest_domains']) ||
-                !ctype_print($config['digest_domains']) ||
-                strpos($config['digest_domains'], '"') !== false) {
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception('Config key \'digest_domains\' is required, and must contain '
-                                                    . 'only printable characters, excluding quotation marks');
-            } else {
-                $this->_domains = $config['digest_domains'];
-            }
-
-            if (empty($config['nonce_timeout']) ||
-                !is_numeric($config['nonce_timeout'])) {
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception('Config key \'nonce_timeout\' is required, and must be an '
-                                                    . 'integer');
-            } else {
-                $this->_nonceTimeout = (int) $config['nonce_timeout'];
-            }
-
-            // We use the opaque value unless explicitly told not to
-            if (isset($config['use_opaque']) && false == (bool) $config['use_opaque']) {
-                $this->_useOpaque = false;
-            } else {
-                $this->_useOpaque = true;
-            }
-
-            if (isset($config['algorithm']) && in_array($config['algorithm'], $this->_supportedAlgos)) {
-                $this->_algo = $config['algorithm'];
-            } else {
-                $this->_algo = 'MD5';
-            }
-        }
-
-        // Don't be a proxy unless explicitly told to do so
-        if (isset($config['proxy_auth']) && true == (bool) $config['proxy_auth']) {
-            $this->_imaProxy = true;  // I'm a Proxy
-        } else {
-            $this->_imaProxy = false;
-        }
-    }
-
-    /**
-     * Setter for the _basicResolver property
-     *
-     * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
-     */
-    public function setBasicResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
-    {
-        $this->_basicResolver = $resolver;
-
-        return $this;
-    }
-
-    /**
-     * Getter for the _basicResolver property
-     *
-     * @return Zend_Auth_Adapter_Http_Resolver_Interface
-     */
-    public function getBasicResolver()
-    {
-        return $this->_basicResolver;
-    }
-
-    /**
-     * Setter for the _digestResolver property
-     *
-     * @param  Zend_Auth_Adapter_Http_Resolver_Interface $resolver
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
-     */
-    public function setDigestResolver(Zend_Auth_Adapter_Http_Resolver_Interface $resolver)
-    {
-        $this->_digestResolver = $resolver;
-
-        return $this;
-    }
-
-    /**
-     * Getter for the _digestResolver property
-     *
-     * @return Zend_Auth_Adapter_Http_Resolver_Interface
-     */
-    public function getDigestResolver()
-    {
-        return $this->_digestResolver;
-    }
-
-    /**
-     * Setter for the Request object
-     *
-     * @param  Zend_Controller_Request_Http $request
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
-     */
-    public function setRequest(Zend_Controller_Request_Http $request)
-    {
-        $this->_request = $request;
-
-        return $this;
-    }
-
-    /**
-     * Getter for the Request object
-     *
-     * @return Zend_Controller_Request_Http
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Setter for the Response object
-     *
-     * @param  Zend_Controller_Response_Http $response
-     * @return Zend_Auth_Adapter_Http Provides a fluent interface
-     */
-    public function setResponse(Zend_Controller_Response_Http $response)
-    {
-        $this->_response = $response;
-
-        return $this;
-    }
-
-    /**
-     * Getter for the Response object
-     *
-     * @return Zend_Controller_Response_Http
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Authenticate
-     *
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result
-     */
-    public function authenticate()
-    {
-        if (empty($this->_request) ||
-            empty($this->_response)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('Request and Response objects must be set before calling '
-                                                . 'authenticate()');
-        }
-
-        if ($this->_imaProxy) {
-            $getHeader = 'Proxy-Authorization';
-        } else {
-            $getHeader = 'Authorization';
-        }
-
-        $authHeader = $this->_request->getHeader($getHeader);
-        if (!$authHeader) {
-            return $this->_challengeClient();
-        }
-
-        list($clientScheme) = explode(' ', $authHeader);
-        $clientScheme = strtolower($clientScheme);
-
-        // The server can issue multiple challenges, but the client should
-        // answer with only the selected auth scheme.
-        if (!in_array($clientScheme, $this->_supportedSchemes)) {
-            $this->_response->setHttpResponseCode(400);
-            return new Zend_Auth_Result(
-                Zend_Auth_Result::FAILURE_UNCATEGORIZED,
-                array(),
-                array('Client requested an incorrect or unsupported authentication scheme')
-            );
-        }
-
-        // client sent a scheme that is not the one required
-        if (!in_array($clientScheme, $this->_acceptSchemes)) {
-            // challenge again the client
-            return $this->_challengeClient();
-        }
-
-        switch ($clientScheme) {
-            case 'basic':
-                $result = $this->_basicAuth($authHeader);
-                break;
-            case 'digest':
-                $result = $this->_digestAuth($authHeader);
-            break;
-            default:
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception('Unsupported authentication scheme');
-        }
-
-        return $result;
-    }
-
-    /**
-     * Challenge Client
-     *
-     * Sets a 401 or 407 Unauthorized response code, and creates the
-     * appropriate Authenticate header(s) to prompt for credentials.
-     *
-     * @return Zend_Auth_Result Always returns a non-identity Auth result
-     */
-    protected function _challengeClient()
-    {
-        if ($this->_imaProxy) {
-            $statusCode = 407;
-            $headerName = 'Proxy-Authenticate';
-        } else {
-            $statusCode = 401;
-            $headerName = 'WWW-Authenticate';
-        }
-
-        $this->_response->setHttpResponseCode($statusCode);
-
-        // Send a challenge in each acceptable authentication scheme
-        if (in_array('basic', $this->_acceptSchemes)) {
-            $this->_response->setHeader($headerName, $this->_basicHeader());
-        }
-        if (in_array('digest', $this->_acceptSchemes)) {
-            $this->_response->setHeader($headerName, $this->_digestHeader());
-        }
-        return new Zend_Auth_Result(
-            Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID,
-            array(),
-            array('Invalid or absent credentials; challenging client')
-        );
-    }
-
-    /**
-     * Basic Header
-     *
-     * Generates a Proxy- or WWW-Authenticate header value in the Basic
-     * authentication scheme.
-     *
-     * @return string Authenticate header value
-     */
-    protected function _basicHeader()
-    {
-        return 'Basic realm="' . $this->_realm . '"';
-    }
-
-    /**
-     * Digest Header
-     *
-     * Generates a Proxy- or WWW-Authenticate header value in the Digest
-     * authentication scheme.
-     *
-     * @return string Authenticate header value
-     */
-    protected function _digestHeader()
-    {
-        $wwwauth = 'Digest realm="' . $this->_realm . '", '
-                 . 'domain="' . $this->_domains . '", '
-                 . 'nonce="' . $this->_calcNonce() . '", '
-                 . ($this->_useOpaque ? 'opaque="' . $this->_calcOpaque() . '", ' : '')
-                 . 'algorithm="' . $this->_algo . '", '
-                 . 'qop="' . implode(',', $this->_supportedQops) . '"';
-
-        return $wwwauth;
-    }
-
-    /**
-     * Basic Authentication
-     *
-     * @param  string $header Client's Authorization header
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result
-     */
-    protected function _basicAuth($header)
-    {
-        if (empty($header)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required');
-        }
-        if (empty($this->_basicResolver)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('A basicResolver object must be set before doing Basic '
-                                                . 'authentication');
-        }
-
-        // Decode the Authorization header
-        $auth = substr($header, strlen('Basic '));
-        $auth = base64_decode($auth);
-        if (!$auth) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('Unable to base64_decode Authorization header value');
-        }
-
-        // See ZF-1253. Validate the credentials the same way the digest
-        // implementation does. If invalid credentials are detected,
-        // re-challenge the client.
-        if (!ctype_print($auth)) {
-            return $this->_challengeClient();
-        }
-        // Fix for ZF-1515: Now re-challenges on empty username or password
-        $creds = array_filter(explode(':', $auth));
-        if (count($creds) != 2) {
-            return $this->_challengeClient();
-        }
-
-        $password = $this->_basicResolver->resolve($creds[0], $this->_realm);
-        if ($password && $password == $creds[1]) {
-            $identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
-            return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
-        } else {
-            return $this->_challengeClient();
-        }
-    }
-
-    /**
-     * Digest Authentication
-     *
-     * @param  string $header Client's Authorization header
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result Valid auth result only on successful auth
-     */
-    protected function _digestAuth($header)
-    {
-        if (empty($header)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required');
-        }
-        if (empty($this->_digestResolver)) {
-            /**
-             * @see Zend_Auth_Adapter_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Exception.php';
-            throw new Zend_Auth_Adapter_Exception('A digestResolver object must be set before doing Digest authentication');
-        }
-
-        $data = $this->_parseDigestAuth($header);
-        if ($data === false) {
-            $this->_response->setHttpResponseCode(400);
-            return new Zend_Auth_Result(
-                Zend_Auth_Result::FAILURE_UNCATEGORIZED,
-                array(),
-                array('Invalid Authorization header format')
-            );
-        }
-
-        // See ZF-1052. This code was a bit too unforgiving of invalid
-        // usernames. Now, if the username is bad, we re-challenge the client.
-        if ('::invalid::' == $data['username']) {
-            return $this->_challengeClient();
-        }
-
-        // Verify that the client sent back the same nonce
-        if ($this->_calcNonce() != $data['nonce']) {
-            return $this->_challengeClient();
-        }
-        // The opaque value is also required to match, but of course IE doesn't
-        // play ball.
-        if (!$this->_ieNoOpaque && $this->_calcOpaque() != $data['opaque']) {
-            return $this->_challengeClient();
-        }
-
-        // Look up the user's password hash. If not found, deny access.
-        // This makes no assumptions about how the password hash was
-        // constructed beyond that it must have been built in such a way as
-        // to be recreatable with the current settings of this object.
-        $ha1 = $this->_digestResolver->resolve($data['username'], $data['realm']);
-        if ($ha1 === false) {
-            return $this->_challengeClient();
-        }
-
-        // If MD5-sess is used, a1 value is made of the user's password
-        // hash with the server and client nonce appended, separated by
-        // colons.
-        if ($this->_algo == 'MD5-sess') {
-            $ha1 = hash('md5', $ha1 . ':' . $data['nonce'] . ':' . $data['cnonce']);
-        }
-
-        // Calculate h(a2). The value of this hash depends on the qop
-        // option selected by the client and the supported hash functions
-        switch ($data['qop']) {
-            case 'auth':
-                $a2 = $this->_request->getMethod() . ':' . $data['uri'];
-                break;
-            case 'auth-int':
-                // Should be REQUEST_METHOD . ':' . uri . ':' . hash(entity-body),
-                // but this isn't supported yet, so fall through to default case
-            default:
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception('Client requested an unsupported qop option');
-        }
-        // Using hash() should make parameterizing the hash algorithm
-        // easier
-        $ha2 = hash('md5', $a2);
-
-
-        // Calculate the server's version of the request-digest. This must
-        // match $data['response']. See RFC 2617, section 3.2.2.1
-        $message = $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $ha2;
-        $digest  = hash('md5', $ha1 . ':' . $message);
-
-        // If our digest matches the client's let them in, otherwise return
-        // a 401 code and exit to prevent access to the protected resource.
-        if ($digest == $data['response']) {
-            $identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
-            return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
-        } else {
-            return $this->_challengeClient();
-        }
-    }
-
-    /**
-     * Calculate Nonce
-     *
-     * @return string The nonce value
-     */
-    protected function _calcNonce()
-    {
-        // Once subtle consequence of this timeout calculation is that it
-        // actually divides all of time into _nonceTimeout-sized sections, such
-        // that the value of timeout is the point in time of the next
-        // approaching "boundary" of a section. This allows the server to
-        // consistently generate the same timeout (and hence the same nonce
-        // value) across requests, but only as long as one of those
-        // "boundaries" is not crossed between requests. If that happens, the
-        // nonce will change on its own, and effectively log the user out. This
-        // would be surprising if the user just logged in.
-        $timeout = ceil(time() / $this->_nonceTimeout) * $this->_nonceTimeout;
-
-        $nonce = hash('md5', $timeout . ':' . $this->_request->getServer('HTTP_USER_AGENT') . ':' . __CLASS__);
-        return $nonce;
-    }
-
-    /**
-     * Calculate Opaque
-     *
-     * The opaque string can be anything; the client must return it exactly as
-     * it was sent. It may be useful to store data in this string in some
-     * applications. Ideally, a new value for this would be generated each time
-     * a WWW-Authenticate header is sent (in order to reduce predictability),
-     * but we would have to be able to create the same exact value across at
-     * least two separate requests from the same client.
-     *
-     * @return string The opaque value
-     */
-    protected function _calcOpaque()
-    {
-        return hash('md5', 'Opaque Data:' . __CLASS__);
-    }
-
-    /**
-     * Parse Digest Authorization header
-     *
-     * @param  string $header Client's Authorization: HTTP header
-     * @return array|false Data elements from header, or false if any part of
-     *         the header is invalid
-     */
-    protected function _parseDigestAuth($header)
-    {
-        $temp = null;
-        $data = array();
-
-        // See ZF-1052. Detect invalid usernames instead of just returning a
-        // 400 code.
-        $ret = preg_match('/username="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])
-                  || !ctype_print($temp[1])
-                  || strpos($temp[1], ':') !== false) {
-            $data['username'] = '::invalid::';
-        } else {
-            $data['username'] = $temp[1];
-        }
-        $temp = null;
-
-        $ret = preg_match('/realm="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (!ctype_print($temp[1]) || strpos($temp[1], ':') !== false) {
-            return false;
-        } else {
-            $data['realm'] = $temp[1];
-        }
-        $temp = null;
-
-        $ret = preg_match('/nonce="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (!ctype_xdigit($temp[1])) {
-            return false;
-        } else {
-            $data['nonce'] = $temp[1];
-        }
-        $temp = null;
-
-        $ret = preg_match('/uri="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        // Section 3.2.2.5 in RFC 2617 says the authenticating server must
-        // verify that the URI field in the Authorization header is for the
-        // same resource requested in the Request Line.
-        $rUri = @parse_url($this->_request->getRequestUri());
-        $cUri = @parse_url($temp[1]);
-        if (false === $rUri || false === $cUri) {
-            return false;
-        } else {
-            // Make sure the path portion of both URIs is the same
-            if ($rUri['path'] != $cUri['path']) {
-                return false;
-            }
-            // Section 3.2.2.5 seems to suggest that the value of the URI
-            // Authorization field should be made into an absolute URI if the
-            // Request URI is absolute, but it's vague, and that's a bunch of
-            // code I don't want to write right now.
-            $data['uri'] = $temp[1];
-        }
-        $temp = null;
-
-        $ret = preg_match('/response="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (32 != strlen($temp[1]) || !ctype_xdigit($temp[1])) {
-            return false;
-        } else {
-            $data['response'] = $temp[1];
-        }
-        $temp = null;
-
-        // The spec says this should default to MD5 if omitted. OK, so how does
-        // that square with the algo we send out in the WWW-Authenticate header,
-        // if it can easily be overridden by the client?
-        $ret = preg_match('/algorithm="?(' . $this->_algo . ')"?/', $header, $temp);
-        if ($ret && !empty($temp[1])
-                 && in_array($temp[1], $this->_supportedAlgos)) {
-            $data['algorithm'] = $temp[1];
-        } else {
-            $data['algorithm'] = 'MD5';  // = $this->_algo; ?
-        }
-        $temp = null;
-
-        // Not optional in this implementation
-        $ret = preg_match('/cnonce="([^"]+)"/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (!ctype_print($temp[1])) {
-            return false;
-        } else {
-            $data['cnonce'] = $temp[1];
-        }
-        $temp = null;
-
-        // If the server sent an opaque value, the client must send it back
-        if ($this->_useOpaque) {
-            $ret = preg_match('/opaque="([^"]+)"/', $header, $temp);
-            if (!$ret || empty($temp[1])) {
-
-                // Big surprise: IE isn't RFC 2617-compliant.
-                if (false !== strpos($this->_request->getHeader('User-Agent'), 'MSIE')) {
-                    $temp[1] = '';
-                    $this->_ieNoOpaque = true;
-                } else {
-                    return false;
-                }
-            }
-            // This implementation only sends MD5 hex strings in the opaque value
-            if (!$this->_ieNoOpaque &&
-                (32 != strlen($temp[1]) || !ctype_xdigit($temp[1]))) {
-                return false;
-            } else {
-                $data['opaque'] = $temp[1];
-            }
-            $temp = null;
-        }
-
-        // Not optional in this implementation, but must be one of the supported
-        // qop types
-        $ret = preg_match('/qop="?(' . implode('|', $this->_supportedQops) . ')"?/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (!in_array($temp[1], $this->_supportedQops)) {
-            return false;
-        } else {
-            $data['qop'] = $temp[1];
-        }
-        $temp = null;
-
-        // Not optional in this implementation. The spec says this value
-        // shouldn't be a quoted string, but apparently some implementations
-        // quote it anyway. See ZF-1544.
-        $ret = preg_match('/nc="?([0-9A-Fa-f]{8})"?/', $header, $temp);
-        if (!$ret || empty($temp[1])) {
-            return false;
-        }
-        if (8 != strlen($temp[1]) || !ctype_xdigit($temp[1])) {
-            return false;
-        } else {
-            $data['nc'] = $temp[1];
-        }
-        $temp = null;
-
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Exception.php b/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Exception.php
deleted file mode 100644
index 3e927f51f..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Exception
- */
-require_once 'Zend/Auth/Exception.php';
-
-
-/**
- * HTTP Auth Resolver Exception
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/File.php b/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/File.php
deleted file mode 100644
index dfcb087da..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/File.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Adapter_Http_Resolver_Interface
- */
-require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php';
-
-
-/**
- * HTTP Authentication File Resolver
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Resolver_Interface
-{
-    /**
-     * Path to credentials file
-     *
-     * @var string
-     */
-    protected $_file;
-
-    /**
-     * Constructor
-     *
-     * @param  string $path Complete filename where the credentials are stored
-     * @return void
-     */
-    public function __construct($path = '')
-    {
-        if (!empty($path)) {
-            $this->setFile($path);
-        }
-    }
-
-    /**
-     * Set the path to the credentials file
-     *
-     * @param  string $path
-     * @throws Zend_Auth_Adapter_Http_Resolver_Exception
-     * @return Zend_Auth_Adapter_Http_Resolver_File Provides a fluent interface
-     */
-    public function setFile($path)
-    {
-        if (empty($path) || !is_readable($path)) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Path not readable: ' . $path);
-        }
-        $this->_file = $path;
-
-        return $this;
-    }
-
-    /**
-     * Returns the path to the credentials file
-     *
-     * @return string
-     */
-    public function getFile()
-    {
-        return $this->_file;
-    }
-
-    /**
-     * Resolve credentials
-     *
-     * Only the first matching username/realm combination in the file is
-     * returned. If the file contains credentials for Digest authentication,
-     * the returned string is the password hash, or h(a1) from RFC 2617. The
-     * returned string is the plain-text password for Basic authentication.
-     *
-     * The expected format of the file is:
-     *   username:realm:sharedSecret
-     *
-     * That is, each line consists of the user's username, the applicable
-     * authentication realm, and the password or hash, each delimited by
-     * colons.
-     *
-     * @param  string $username Username
-     * @param  string $realm    Authentication Realm
-     * @throws Zend_Auth_Adapter_Http_Resolver_Exception
-     * @return string|false User's shared secret, if the user is found in the
-     *         realm, false otherwise.
-     */
-    public function resolve($username, $realm)
-    {
-        if (empty($username)) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username is required');
-        } else if (!ctype_print($username) || strpos($username, ':') !== false) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username must consist only of printable characters, '
-                                                              . 'excluding the colon');
-        }
-        if (empty($realm)) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm is required');
-        } else if (!ctype_print($realm) || strpos($realm, ':') !== false) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm must consist only of printable characters, '
-                                                              . 'excluding the colon.');
-        }
-
-        // Open file, read through looking for matching credentials
-        $fp = @fopen($this->_file, 'r');
-        if (!$fp) {
-            /**
-             * @see Zend_Auth_Adapter_Http_Resolver_Exception
-             */
-            require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php';
-            throw new Zend_Auth_Adapter_Http_Resolver_Exception('Unable to open password file: ' . $this->_file);
-        }
-
-        // No real validation is done on the contents of the password file. The
-        // assumption is that we trust the administrators to keep it secure.
-        while (($line = fgetcsv($fp, 512, ':')) !== false) {
-            if ($line[0] == $username && $line[1] == $realm) {
-                $password = $line[2];
-                fclose($fp);
-                return $password;
-            }
-        }
-
-        fclose($fp);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Interface.php b/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Interface.php
deleted file mode 100644
index 78c034314..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Http/Resolver/Interface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Auth HTTP Resolver Interface
- *
- * Defines an interace to resolve a username/realm combination into a shared
- * secret usable by HTTP Authentication.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Auth_Adapter_Http_Resolver_Interface
-{
-    /**
-     * Resolve username/realm to password/hash/etc.
-     *
-     * @param  string $username Username
-     * @param  string $realm    Authentication Realm
-     * @return string|false User's shared secret, if the user is found in the
-     *         realm, false otherwise.
-     */
-    public function resolve($username, $realm);
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/InfoCard.php b/airtime_mvc/library/Zend/Auth/Adapter/InfoCard.php
deleted file mode 100644
index a2f57329d..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/InfoCard.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-/**
- * @see Zend_Auth_Result
- */
-require_once 'Zend/Auth/Result.php';
-
-/**
- * @see Zend_InfoCard
- */
-require_once 'Zend/InfoCard.php';
-
-/**
- * A Zend_Auth Authentication Adapter allowing the use of Information Cards as an
- * authentication mechanism
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_InfoCard implements Zend_Auth_Adapter_Interface
-{
-    /**
-     * The XML Token being authenticated
-     *
-     * @var string
-     */
-    protected $_xmlToken;
-
-    /**
-     * The instance of Zend_InfoCard
-     *
-     * @var Zend_InfoCard
-     */
-    protected $_infoCard;
-
-    /**
-     * Constructor
-     *
-     * @param  string $strXmlDocument The XML Token provided by the client
-     * @return void
-     */
-    public function __construct($strXmlDocument)
-    {
-        $this->_xmlToken = $strXmlDocument;
-        $this->_infoCard = new Zend_InfoCard();
-    }
-
-    /**
-     * Sets the InfoCard component Adapter to use
-     *
-     * @param  Zend_InfoCard_Adapter_Interface $a
-     * @return Zend_Auth_Adapter_InfoCard Provides a fluent interface
-     */
-    public function setAdapter(Zend_InfoCard_Adapter_Interface $a)
-    {
-        $this->_infoCard->setAdapter($a);
-        return $this;
-    }
-
-    /**
-     * Retrieves the InfoCard component adapter being used
-     *
-     * @return Zend_InfoCard_Adapter_Interface
-     */
-    public function getAdapter()
-    {
-        return $this->_infoCard->getAdapter();
-    }
-
-    /**
-     * Retrieves the InfoCard public key cipher object being used
-     *
-     * @return Zend_InfoCard_Cipher_PKI_Interface
-     */
-    public function getPKCipherObject()
-    {
-        return $this->_infoCard->getPKCipherObject();
-    }
-
-    /**
-     * Sets the InfoCard public key cipher object to use
-     *
-     * @param  Zend_InfoCard_Cipher_PKI_Interface $cipherObj
-     * @return Zend_Auth_Adapter_InfoCard Provides a fluent interface
-     */
-    public function setPKICipherObject(Zend_InfoCard_Cipher_PKI_Interface $cipherObj)
-    {
-        $this->_infoCard->setPKICipherObject($cipherObj);
-        return $this;
-    }
-
-    /**
-     * Retrieves the Symmetric cipher object being used
-     *
-     * @return Zend_InfoCard_Cipher_Symmetric_Interface
-     */
-    public function getSymCipherObject()
-    {
-        return $this->_infoCard->getSymCipherObject();
-    }
-
-    /**
-     * Sets the InfoCard symmetric cipher object to use
-     *
-     * @param  Zend_InfoCard_Cipher_Symmetric_Interface $cipherObj
-     * @return Zend_Auth_Adapter_InfoCard Provides a fluent interface
-     */
-    public function setSymCipherObject(Zend_InfoCard_Cipher_Symmetric_Interface $cipherObj)
-    {
-        $this->_infoCard->setSymCipherObject($cipherObj);
-        return $this;
-    }
-
-    /**
-     * Remove a Certificate Pair by Key ID from the search list
-     *
-     * @param  string $key_id The Certificate Key ID returned from adding the certificate pair
-     * @throws Zend_InfoCard_Exception
-     * @return Zend_Auth_Adapter_InfoCard Provides a fluent interface
-     */
-    public function removeCertificatePair($key_id)
-    {
-        $this->_infoCard->removeCertificatePair($key_id);
-        return $this;
-    }
-
-    /**
-     * Add a Certificate Pair to the list of certificates searched by the component
-     *
-     * @param  string $private_key_file    The path to the private key file for the pair
-     * @param  string $public_key_file     The path to the certificate / public key for the pair
-     * @param  string $type                (optional) The URI for the type of key pair this is (default RSA with OAEP padding)
-     * @param  string $password            (optional) The password for the private key file if necessary
-     * @throws Zend_InfoCard_Exception
-     * @return string A key ID representing this key pair in the component
-     */
-    public function addCertificatePair($private_key_file, $public_key_file, $type = Zend_InfoCard_Cipher::ENC_RSA_OAEP_MGF1P, $password = null)
-    {
-        return $this->_infoCard->addCertificatePair($private_key_file, $public_key_file, $type, $password);
-    }
-
-    /**
-     * Return a Certificate Pair from a key ID
-     *
-     * @param  string $key_id The Key ID of the certificate pair in the component
-     * @throws Zend_InfoCard_Exception
-     * @return array An array containing the path to the private/public key files,
-     *               the type URI and the password if provided
-     */
-    public function getCertificatePair($key_id)
-    {
-        return $this->_infoCard->getCertificatePair($key_id);
-    }
-
-    /**
-     * Set the XML Token to be processed
-     *
-     * @param  string $strXmlToken The XML token to process
-     * @return Zend_Auth_Adapter_InfoCard Provides a fluent interface
-     */
-    public function setXmlToken($strXmlToken)
-    {
-        $this->_xmlToken = $strXmlToken;
-        return $this;
-    }
-
-    /**
-     * Get the XML Token being processed
-     *
-     * @return string The XML token to be processed
-     */
-    public function getXmlToken()
-    {
-        return $this->_xmlToken;
-    }
-
-    /**
-     * Authenticates the XML token
-     *
-     * @return Zend_Auth_Result The result of the authentication
-     */
-    public function authenticate()
-    {
-        try {
-            $claims = $this->_infoCard->process($this->getXmlToken());
-        } catch(Exception $e) {
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE , null, array('Exception Thrown',
-                                                                                $e->getMessage(),
-                                                                                $e->getTraceAsString(),
-                                                                                serialize($e)));
-        }
-
-        if(!$claims->isValid()) {
-            switch($claims->getCode()) {
-                case Zend_infoCard_Claims::RESULT_PROCESSING_FAILURE:
-                    return new Zend_Auth_Result(
-                        Zend_Auth_Result::FAILURE,
-                        $claims,
-                        array(
-                            'Processing Failure',
-                            $claims->getErrorMsg()
-                        )
-                    );
-                    break;
-                case Zend_InfoCard_Claims::RESULT_VALIDATION_FAILURE:
-                    return new Zend_Auth_Result(
-                        Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID,
-                        $claims,
-                        array(
-                            'Validation Failure',
-                            $claims->getErrorMsg()
-                        )
-                    );
-                    break;
-                default:
-                    return new Zend_Auth_Result(
-                        Zend_Auth_Result::FAILURE,
-                        $claims,
-                        array(
-                            'Unknown Failure',
-                            $claims->getErrorMsg()
-                        )
-                    );
-                    break;
-            }
-        }
-
-        return new Zend_Auth_Result(
-            Zend_Auth_Result::SUCCESS,
-            $claims
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Interface.php b/airtime_mvc/library/Zend/Auth/Adapter/Interface.php
deleted file mode 100644
index d2c3207e3..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Interface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Result
- */
-require_once 'Zend/Auth/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Auth_Adapter_Interface
-{
-    /**
-     * Performs an authentication attempt
-     *
-     * @throws Zend_Auth_Adapter_Exception If authentication cannot be performed
-     * @return Zend_Auth_Result
-     */
-    public function authenticate();
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/Ldap.php b/airtime_mvc/library/Zend/Auth/Adapter/Ldap.php
deleted file mode 100644
index b159c9106..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/Ldap.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ldap.php 21320 2010-03-04 16:05:09Z sgehrig $
- */
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface
-{
-
-    /**
-     * The Zend_Ldap context.
-     *
-     * @var Zend_Ldap
-     */
-    protected $_ldap = null;
-
-    /**
-     * The array of arrays of Zend_Ldap options passed to the constructor.
-     *
-     * @var array
-     */
-    protected $_options = null;
-
-    /**
-     * The username of the account being authenticated.
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * The password of the account being authenticated.
-     *
-     * @var string
-     */
-    protected $_password = null;
-
-    /**
-     * The DN of the authenticated account. Used to retrieve the account entry on request.
-     *
-     * @var string
-     */
-    protected $_authenticatedDn = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array  $options  An array of arrays of Zend_Ldap options
-     * @param  string $username The username of the account being authenticated
-     * @param  string $password The password of the account being authenticated
-     * @return void
-     */
-    public function __construct(array $options = array(), $username = null, $password = null)
-    {
-        $this->setOptions($options);
-        if ($username !== null) {
-            $this->setUsername($username);
-        }
-        if ($password !== null) {
-            $this->setPassword($password);
-        }
-    }
-
-    /**
-     * Returns the array of arrays of Zend_Ldap options of this adapter.
-     *
-     * @return array|null
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets the array of arrays of Zend_Ldap options to be used by
-     * this adapter.
-     *
-     * @param  array $options The array of arrays of Zend_Ldap options
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setOptions($options)
-    {
-        $this->_options = is_array($options) ? $options : array();
-        return $this;
-    }
-
-    /**
-     * Returns the username of the account being authenticated, or
-     * NULL if none is set.
-     *
-     * @return string|null
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Sets the username for binding
-     *
-     * @param  string $username The username for binding
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setUsername($username)
-    {
-        $this->_username = (string) $username;
-        return $this;
-    }
-
-    /**
-     * Returns the password of the account being authenticated, or
-     * NULL if none is set.
-     *
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Sets the passwort for the account
-     *
-     * @param  string $password The password of the account being authenticated
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setPassword($password)
-    {
-        $this->_password = (string) $password;
-        return $this;
-    }
-
-    /**
-     * setIdentity() - set the identity (username) to be used
-     *
-     * Proxies to {@see setUsername()}
-     *
-     * Closes ZF-6813
-     *
-     * @param  string $identity
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setIdentity($identity)
-    {
-        return $this->setUsername($identity);
-    }
-
-    /**
-     * setCredential() - set the credential (password) value to be used
-     *
-     * Proxies to {@see setPassword()}
-     *
-     * Closes ZF-6813
-     *
-     * @param  string $credential
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setCredential($credential)
-    {
-        return $this->setPassword($credential);
-    }
-
-    /**
-     * Returns the LDAP Object
-     *
-     * @return Zend_Ldap The Zend_Ldap object used to authenticate the credentials
-     */
-    public function getLdap()
-    {
-        if ($this->_ldap === null) {
-            /**
-             * @see Zend_Ldap
-             */
-            require_once 'Zend/Ldap.php';
-            $this->_ldap = new Zend_Ldap();
-        }
-
-        return $this->_ldap;
-    }
-
-    /**
-     * Set an Ldap connection
-     *
-     * @param Zend_Ldap $ldap An existing Ldap object
-     * @return Zend_Auth_Adapter_Ldap Provides a fluent interface
-     */
-    public function setLdap(Zend_Ldap $ldap)
-    {
-        $this->_ldap = $ldap;
-
-        $this->setOptions(array($ldap->getOptions()));
-
-        return $this;
-    }
-
-    /**
-     * Returns a domain name for the current LDAP options. This is used
-     * for skipping redundant operations (e.g. authentications).
-     *
-     * @return string
-     */
-    protected function _getAuthorityName()
-    {
-        $options = $this->getLdap()->getOptions();
-        $name = $options['accountDomainName'];
-        if (!$name)
-            $name = $options['accountDomainNameShort'];
-        return $name ? $name : '';
-    }
-
-    /**
-     * Authenticate the user
-     *
-     * @throws Zend_Auth_Adapter_Exception
-     * @return Zend_Auth_Result
-     */
-    public function authenticate()
-    {
-        /**
-         * @see Zend_Ldap_Exception
-         */
-        require_once 'Zend/Ldap/Exception.php';
-
-        $messages = array();
-        $messages[0] = ''; // reserved
-        $messages[1] = ''; // reserved
-
-        $username = $this->_username;
-        $password = $this->_password;
-
-        if (!$username) {
-            $code = Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
-            $messages[0] = 'A username is required';
-            return new Zend_Auth_Result($code, '', $messages);
-        }
-        if (!$password) {
-            /* A password is required because some servers will
-             * treat an empty password as an anonymous bind.
-             */
-            $code = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
-            $messages[0] = 'A password is required';
-            return new Zend_Auth_Result($code, '', $messages);
-        }
-
-        $ldap = $this->getLdap();
-
-        $code = Zend_Auth_Result::FAILURE;
-        $messages[0] = "Authority not found: $username";
-        $failedAuthorities = array();
-
-        /* Iterate through each server and try to authenticate the supplied
-         * credentials against it.
-         */
-        foreach ($this->_options as $name => $options) {
-
-            if (!is_array($options)) {
-                /**
-                 * @see Zend_Auth_Adapter_Exception
-                 */
-                require_once 'Zend/Auth/Adapter/Exception.php';
-                throw new Zend_Auth_Adapter_Exception('Adapter options array not an array');
-            }
-            $adapterOptions = $this->_prepareOptions($ldap, $options);
-            $dname = '';
-
-            try {
-                if ($messages[1])
-                    $messages[] = $messages[1];
-                $messages[1] = '';
-                $messages[] = $this->_optionsToString($options);
-
-                $dname = $this->_getAuthorityName();
-                if (isset($failedAuthorities[$dname])) {
-                    /* If multiple sets of server options for the same domain
-                     * are supplied, we want to skip redundant authentications
-                     * where the identity or credentials where found to be
-                     * invalid with another server for the same domain. The
-                     * $failedAuthorities array tracks this condition (and also
-                     * serves to supply the original error message).
-                     * This fixes issue ZF-4093.
-                     */
-                    $messages[1] = $failedAuthorities[$dname];
-                    $messages[] = "Skipping previously failed authority: $dname";
-                    continue;
-                }
-
-                $canonicalName = $ldap->getCanonicalAccountName($username);
-                $ldap->bind($canonicalName, $password);
-                /*
-                 * Fixes problem when authenticated user is not allowed to retrieve
-                 * group-membership information or own account.
-                 * This requires that the user specified with "username" and optionally
-                 * "password" in the Zend_Ldap options is able to retrieve the required
-                 * information.
-                 */
-                $requireRebind = false;
-                if (isset($options['username'])) {
-                    $ldap->bind();
-                    $requireRebind = true;
-                }
-                $dn = $ldap->getCanonicalAccountName($canonicalName, Zend_Ldap::ACCTNAME_FORM_DN);
-
-                $groupResult = $this->_checkGroupMembership($ldap, $canonicalName, $dn, $adapterOptions);
-                if ($groupResult === true) {
-                    $this->_authenticatedDn = $dn;
-                    $messages[0] = '';
-                    $messages[1] = '';
-                    $messages[] = "$canonicalName authentication successful";
-                    if ($requireRebind === true) {
-	                    // rebinding with authenticated user
-	                    $ldap->bind($dn, $password);
-                    }
-                    return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $canonicalName, $messages);
-                } else {
-                    $messages[0] = 'Account is not a member of the specified group';
-                    $messages[1] = $groupResult;
-                    $failedAuthorities[$dname] = $groupResult;
-                }
-            } catch (Zend_Ldap_Exception $zle) {
-
-                /* LDAP based authentication is notoriously difficult to diagnose. Therefore
-                 * we bend over backwards to capture and record every possible bit of
-                 * information when something goes wrong.
-                 */
-
-                $err = $zle->getCode();
-
-                if ($err == Zend_Ldap_Exception::LDAP_X_DOMAIN_MISMATCH) {
-                    /* This error indicates that the domain supplied in the
-                     * username did not match the domains in the server options
-                     * and therefore we should just skip to the next set of
-                     * server options.
-                     */
-                    continue;
-                } else if ($err == Zend_Ldap_Exception::LDAP_NO_SUCH_OBJECT) {
-                    $code = Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND;
-                    $messages[0] = "Account not found: $username";
-                    $failedAuthorities[$dname] = $zle->getMessage();
-                } else if ($err == Zend_Ldap_Exception::LDAP_INVALID_CREDENTIALS) {
-                    $code = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
-                    $messages[0] = 'Invalid credentials';
-                    $failedAuthorities[$dname] = $zle->getMessage();
-                } else {
-                    $line = $zle->getLine();
-                    $messages[] = $zle->getFile() . "($line): " . $zle->getMessage();
-                    $messages[] = str_replace($password, '*****', $zle->getTraceAsString());
-                    $messages[0] = 'An unexpected failure occurred';
-                }
-                $messages[1] = $zle->getMessage();
-            }
-        }
-
-        $msg = isset($messages[1]) ? $messages[1] : $messages[0];
-        $messages[] = "$username authentication failed: $msg";
-
-        return new Zend_Auth_Result($code, $username, $messages);
-    }
-
-    /**
-     * Sets the LDAP specific options on the Zend_Ldap instance
-     *
-     * @param  Zend_Ldap $ldap
-     * @param  array $options
-     * @return array of auth-adapter specific options
-     */
-    protected function _prepareOptions(Zend_Ldap $ldap, array $options)
-    {
-        $adapterOptions = array(
-            'group'       => null,
-            'groupDn'     => $ldap->getBaseDn(),
-            'groupScope'  => Zend_Ldap::SEARCH_SCOPE_SUB,
-            'groupAttr'   => 'cn',
-            'groupFilter' => 'objectClass=groupOfUniqueNames',
-            'memberAttr'  => 'uniqueMember',
-            'memberIsDn'  => true
-        );
-        foreach ($adapterOptions as $key => $value) {
-            if (array_key_exists($key, $options)) {
-                $value = $options[$key];
-                unset($options[$key]);
-                switch ($key) {
-                    case 'groupScope':
-                        $value = (int)$value;
-                        if (in_array($value, array(Zend_Ldap::SEARCH_SCOPE_BASE,
-                                Zend_Ldap::SEARCH_SCOPE_ONE, Zend_Ldap::SEARCH_SCOPE_SUB), true)) {
-                           $adapterOptions[$key] = $value;
-                        }
-                        break;
-                    case 'memberIsDn':
-                        $adapterOptions[$key] = ($value === true ||
-                                $value === '1' || strcasecmp($value, 'true') == 0);
-                        break;
-                    default:
-                        $adapterOptions[$key] = trim($value);
-                        break;
-                }
-            }
-        }
-        $ldap->setOptions($options);
-        return $adapterOptions;
-    }
-
-    /**
-     * Checks the group membership of the bound user
-     *
-     * @param  Zend_Ldap $ldap
-     * @param  string    $canonicalName
-     * @param  string    $dn
-     * @param  array     $adapterOptions
-     * @return string|true
-     */
-    protected function _checkGroupMembership(Zend_Ldap $ldap, $canonicalName, $dn, array $adapterOptions)
-    {
-        if ($adapterOptions['group'] === null) {
-            return true;
-        }
-
-        if ($adapterOptions['memberIsDn'] === false) {
-            $user = $canonicalName;
-        } else {
-            $user = $dn;
-        }
-
-        /**
-         * @see Zend_Ldap_Filter
-         */
-        require_once 'Zend/Ldap/Filter.php';
-        $groupName = Zend_Ldap_Filter::equals($adapterOptions['groupAttr'], $adapterOptions['group']);
-        $membership = Zend_Ldap_Filter::equals($adapterOptions['memberAttr'], $user);
-        $group = Zend_Ldap_Filter::andFilter($groupName, $membership);
-        $groupFilter = $adapterOptions['groupFilter'];
-        if (!empty($groupFilter)) {
-            $group = $group->addAnd($groupFilter);
-        }
-
-        $result = $ldap->count($group, $adapterOptions['groupDn'], $adapterOptions['groupScope']);
-
-        if ($result === 1) {
-            return true;
-        } else {
-            return 'Failed to verify group membership with ' . $group->toString();
-        }
-    }
-
-    /**
-     * getAccountObject() - Returns the result entry as a stdClass object
-     *
-     * This resembles the feature {@see Zend_Auth_Adapter_DbTable::getResultRowObject()}.
-     * Closes ZF-6813
-     *
-     * @param  array $returnAttribs
-     * @param  array $omitAttribs
-     * @return stdClass|boolean
-     */
-    public function getAccountObject(array $returnAttribs = array(), array $omitAttribs = array())
-    {
-        if (!$this->_authenticatedDn) {
-            return false;
-        }
-
-        $returnObject = new stdClass();
-
-        $omitAttribs = array_map('strtolower', $omitAttribs);
-
-        $entry = $this->getLdap()->getEntry($this->_authenticatedDn, $returnAttribs, true);
-        foreach ($entry as $attr => $value) {
-            if (in_array($attr, $omitAttribs)) {
-                // skip attributes marked to be omitted
-                continue;
-            }
-            if (is_array($value)) {
-                $returnObject->$attr = (count($value) > 1) ? $value : $value[0];
-            } else {
-                $returnObject->$attr = $value;
-            }
-        }
-        return $returnObject;
-    }
-
-    /**
-     * Converts options to string
-     *
-     * @param  array $options
-     * @return string
-     */
-    private function _optionsToString(array $options)
-    {
-        $str = '';
-        foreach ($options as $key => $val) {
-            if ($key === 'password')
-                $val = '*****';
-            if ($str)
-                $str .= ',';
-            $str .= $key . '=' . $val;
-        }
-        return $str;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Adapter/OpenId.php b/airtime_mvc/library/Zend/Auth/Adapter/OpenId.php
deleted file mode 100644
index 1d55605ab..000000000
--- a/airtime_mvc/library/Zend/Auth/Adapter/OpenId.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Adapter_Interface
- */
-require_once 'Zend/Auth/Adapter/Interface.php';
-
-
-/**
- * @see Zend_OpenId_Consumer
- */
-require_once 'Zend/OpenId/Consumer.php';
-
-
-/**
- * A Zend_Auth Authentication Adapter allowing the use of OpenID protocol as an
- * authentication mechanism
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Zend_Auth_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface
-{
-    /**
-     * The identity value being authenticated
-     *
-     * @var string
-     */
-    private $_id = null;
-
-    /**
-     * Reference to an implementation of a storage object
-     *
-     * @var Zend_OpenId_Consumer_Storage
-     */
-    private $_storage = null;
-
-    /**
-     * The URL to redirect response from server to
-     *
-     * @var string
-     */
-    private $_returnTo = null;
-
-    /**
-     * The HTTP URL to identify consumer on server
-     *
-     * @var string
-     */
-    private $_root = null;
-
-    /**
-     * Extension object or array of extensions objects
-     *
-     * @var string
-     */
-    private $_extensions = null;
-
-    /**
-     * The response object to perform HTTP or HTML form redirection
-     *
-     * @var Zend_Controller_Response_Abstract
-     */
-    private $_response = null;
-
-    /**
-     * Enables or disables interaction with user during authentication on
-     * OpenID provider.
-     *
-     * @var bool
-     */
-    private $_check_immediate = false;
-
-    /**
-     * HTTP client to make HTTP requests
-     *
-     * @var Zend_Http_Client $_httpClient
-     */
-    private $_httpClient = null;
-
-    /**
-     * Constructor
-     *
-     * @param string $id the identity value
-     * @param Zend_OpenId_Consumer_Storage $storage an optional implementation
-     *        of a storage object
-     * @param string $returnTo HTTP URL to redirect response from server to
-     * @param string $root HTTP URL to identify consumer on server
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *        object to perform HTTP or HTML form redirection
-     * @return void
-     */
-    public function __construct($id = null,
-                                Zend_OpenId_Consumer_Storage $storage = null,
-                                $returnTo = null,
-                                $root = null,
-                                $extensions = null,
-                                Zend_Controller_Response_Abstract $response = null) {
-        $this->_id         = $id;
-        $this->_storage    = $storage;
-        $this->_returnTo   = $returnTo;
-        $this->_root       = $root;
-        $this->_extensions = $extensions;
-        $this->_response   = $response;
-    }
-
-    /**
-     * Sets the value to be used as the identity
-     *
-     * @param  string $id the identity value
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setIdentity($id)
-    {
-        $this->_id = $id;
-        return $this;
-    }
-
-    /**
-     * Sets the storage implementation which will be use by OpenId
-     *
-     * @param  Zend_OpenId_Consumer_Storage $storage
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setStorage(Zend_OpenId_Consumer_Storage $storage)
-    {
-        $this->_storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Sets the HTTP URL to redirect response from server to
-     *
-     * @param  string $returnTo
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setReturnTo($returnTo)
-    {
-        $this->_returnTo = $returnTo;
-        return $this;
-    }
-
-    /**
-     * Sets HTTP URL to identify consumer on server
-     *
-     * @param  string $root
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setRoot($root)
-    {
-        $this->_root = $root;
-        return $this;
-    }
-
-    /**
-     * Sets OpenID extension(s)
-     *
-     * @param  mixed $extensions
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setExtensions($extensions)
-    {
-        $this->_extensions = $extensions;
-        return $this;
-    }
-
-    /**
-     * Sets an optional response object to perform HTTP or HTML form redirection
-     *
-     * @param  string $root
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setResponse($response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Enables or disables interaction with user during authentication on
-     * OpenID provider.
-     *
-     * @param  bool $check_immediate
-     * @return Zend_Auth_Adapter_OpenId Provides a fluent interface
-     */
-    public function setCheckImmediate($check_immediate)
-    {
-        $this->_check_immediate = $check_immediate;
-        return $this;
-    }
-
-    /**
-     * Sets HTTP client object to make HTTP requests
-     *
-     * @param Zend_Http_Client $client HTTP client object to be used
-     */
-    public function setHttpClient($client) {
-        $this->_httpClient = $client;
-    }
-
-    /**
-     * Authenticates the given OpenId identity.
-     * Defined by Zend_Auth_Adapter_Interface.
-     *
-     * @throws Zend_Auth_Adapter_Exception If answering the authentication query is impossible
-     * @return Zend_Auth_Result
-     */
-    public function authenticate() {
-        $id = $this->_id;
-        if (!empty($id)) {
-            $consumer = new Zend_OpenId_Consumer($this->_storage);
-            $consumer->setHttpClient($this->_httpClient);
-            /* login() is never returns on success */
-            if (!$this->_check_immediate) {
-                if (!$consumer->login($id,
-                        $this->_returnTo,
-                        $this->_root,
-                        $this->_extensions,
-                        $this->_response)) {
-                    return new Zend_Auth_Result(
-                        Zend_Auth_Result::FAILURE,
-                        $id,
-                        array("Authentication failed", $consumer->getError()));
-                }
-            } else {
-                if (!$consumer->check($id,
-                        $this->_returnTo,
-                        $this->_root,
-                        $this->_extensions,
-                        $this->_response)) {
-                    return new Zend_Auth_Result(
-                        Zend_Auth_Result::FAILURE,
-                        $id,
-                        array("Authentication failed", $consumer->getError()));
-                }
-            }
-        } else {
-            $params = (isset($_SERVER['REQUEST_METHOD']) &&
-                       $_SERVER['REQUEST_METHOD']=='POST') ? $_POST: $_GET;
-            $consumer = new Zend_OpenId_Consumer($this->_storage);
-            $consumer->setHttpClient($this->_httpClient);
-            if ($consumer->verify(
-                    $params,
-                    $id,
-                    $this->_extensions)) {
-                return new Zend_Auth_Result(
-                    Zend_Auth_Result::SUCCESS,
-                    $id,
-                    array("Authentication successful"));
-            } else {
-                return new Zend_Auth_Result(
-                    Zend_Auth_Result::FAILURE,
-                    $id,
-                    array("Authentication failed", $consumer->getError()));
-            }
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Auth/Exception.php b/airtime_mvc/library/Zend/Auth/Exception.php
deleted file mode 100644
index 933ce1c0d..000000000
--- a/airtime_mvc/library/Zend/Auth/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Auth/Result.php b/airtime_mvc/library/Zend/Auth/Result.php
deleted file mode 100644
index 964d44d80..000000000
--- a/airtime_mvc/library/Zend/Auth/Result.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Result
-{
-    /**
-     * General Failure
-     */
-    const FAILURE                        =  0;
-
-    /**
-     * Failure due to identity not being found.
-     */
-    const FAILURE_IDENTITY_NOT_FOUND     = -1;
-
-    /**
-     * Failure due to identity being ambiguous.
-     */
-    const FAILURE_IDENTITY_AMBIGUOUS     = -2;
-
-    /**
-     * Failure due to invalid credential being supplied.
-     */
-    const FAILURE_CREDENTIAL_INVALID     = -3;
-
-    /**
-     * Failure due to uncategorized reasons.
-     */
-    const FAILURE_UNCATEGORIZED          = -4;
-
-    /**
-     * Authentication success.
-     */
-    const SUCCESS                        =  1;
-
-    /**
-     * Authentication result code
-     *
-     * @var int
-     */
-    protected $_code;
-
-    /**
-     * The identity used in the authentication attempt
-     *
-     * @var mixed
-     */
-    protected $_identity;
-
-    /**
-     * An array of string reasons why the authentication attempt was unsuccessful
-     *
-     * If authentication was successful, this should be an empty array.
-     *
-     * @var array
-     */
-    protected $_messages;
-
-    /**
-     * Sets the result code, identity, and failure messages
-     *
-     * @param  int     $code
-     * @param  mixed   $identity
-     * @param  array   $messages
-     * @return void
-     */
-    public function __construct($code, $identity, array $messages = array())
-    {
-        $code = (int) $code;
-
-        if ($code < self::FAILURE_UNCATEGORIZED) {
-            $code = self::FAILURE;
-        } elseif ($code > self::SUCCESS ) {
-            $code = 1;
-        }
-
-        $this->_code     = $code;
-        $this->_identity = $identity;
-        $this->_messages = $messages;
-    }
-
-    /**
-     * Returns whether the result represents a successful authentication attempt
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->_code > 0) ? true : false;
-    }
-
-    /**
-     * getCode() - Get the result code for this authentication attempt
-     *
-     * @return int
-     */
-    public function getCode()
-    {
-        return $this->_code;
-    }
-
-    /**
-     * Returns the identity used in the authentication attempt
-     *
-     * @return mixed
-     */
-    public function getIdentity()
-    {
-        return $this->_identity;
-    }
-
-    /**
-     * Returns an array of string reasons why the authentication attempt was unsuccessful
-     *
-     * If authentication was successful, this method returns an empty array.
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->_messages;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Storage/Exception.php b/airtime_mvc/library/Zend/Auth/Storage/Exception.php
deleted file mode 100644
index d45afe7e9..000000000
--- a/airtime_mvc/library/Zend/Auth/Storage/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Exception
- */
-require_once 'Zend/Auth/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Storage_Exception extends Zend_Auth_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Auth/Storage/Interface.php b/airtime_mvc/library/Zend/Auth/Storage/Interface.php
deleted file mode 100644
index 9fedf0132..000000000
--- a/airtime_mvc/library/Zend/Auth/Storage/Interface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Auth_Storage_Interface
-{
-    /**
-     * Returns true if and only if storage is empty
-     *
-     * @throws Zend_Auth_Storage_Exception If it is impossible to determine whether storage is empty
-     * @return boolean
-     */
-    public function isEmpty();
-
-    /**
-     * Returns the contents of storage
-     *
-     * Behavior is undefined when storage is empty.
-     *
-     * @throws Zend_Auth_Storage_Exception If reading contents from storage is impossible
-     * @return mixed
-     */
-    public function read();
-
-    /**
-     * Writes $contents to storage
-     *
-     * @param  mixed $contents
-     * @throws Zend_Auth_Storage_Exception If writing $contents to storage is impossible
-     * @return void
-     */
-    public function write($contents);
-
-    /**
-     * Clears contents from storage
-     *
-     * @throws Zend_Auth_Storage_Exception If clearing contents from storage is impossible
-     * @return void
-     */
-    public function clear();
-}
diff --git a/airtime_mvc/library/Zend/Auth/Storage/NonPersistent.php b/airtime_mvc/library/Zend/Auth/Storage/NonPersistent.php
deleted file mode 100644
index c8101e9da..000000000
--- a/airtime_mvc/library/Zend/Auth/Storage/NonPersistent.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Storage_Interface
- */
-require_once 'Zend/Auth/Storage/Interface.php';
-
-
-/**
- * Non-Persistent Auth Storage
- *
- * Since HTTP Authentication happens again on each request, this will always be
- * re-populated. So there's no need to use sessions, this simple value class
- * will hold the data for rest of the current request.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Storage_NonPersistent implements Zend_Auth_Storage_Interface
-{
-    /**
-     * Holds the actual auth data
-     */
-    protected $_data;
-
-    /**
-     * Returns true if and only if storage is empty
-     *
-     * @throws Zend_Auth_Storage_Exception If it is impossible to determine whether storage is empty
-     * @return boolean
-     */
-    public function isEmpty()
-    {
-        return empty($this->_data);
-    }
-
-    /**
-     * Returns the contents of storage
-     * Behavior is undefined when storage is empty.
-     *
-     * @throws Zend_Auth_Storage_Exception If reading contents from storage is impossible
-     * @return mixed
-     */
-    public function read()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Writes $contents to storage
-     *
-     * @param  mixed $contents
-     * @throws Zend_Auth_Storage_Exception If writing $contents to storage is impossible
-     * @return void
-     */
-    public function write($contents)
-    {
-        $this->_data = $contents;
-    }
-
-    /**
-     * Clears contents from storage
-     *
-     * @throws Zend_Auth_Storage_Exception If clearing contents from storage is impossible
-     * @return void
-     */
-    public function clear()
-    {
-        $this->_data = null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Auth/Storage/Session.php b/airtime_mvc/library/Zend/Auth/Storage/Session.php
deleted file mode 100644
index 60579dbe9..000000000
--- a/airtime_mvc/library/Zend/Auth/Storage/Session.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Auth_Storage_Interface
- */
-require_once 'Zend/Auth/Storage/Interface.php';
-
-
-/**
- * @see Zend_Session
- */
-require_once 'Zend/Session.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Auth
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface
-{
-    /**
-     * Default session namespace
-     */
-    const NAMESPACE_DEFAULT = 'Zend_Auth';
-
-    /**
-     * Default session object member name
-     */
-    const MEMBER_DEFAULT = 'storage';
-
-    /**
-     * Object to proxy $_SESSION storage
-     *
-     * @var Zend_Session_Namespace
-     */
-    protected $_session;
-
-    /**
-     * Session namespace
-     *
-     * @var mixed
-     */
-    protected $_namespace;
-
-    /**
-     * Session object member
-     *
-     * @var mixed
-     */
-    protected $_member;
-
-    /**
-     * Sets session storage options and initializes session namespace object
-     *
-     * @param  mixed $namespace
-     * @param  mixed $member
-     * @return void
-     */
-    public function __construct($namespace = self::NAMESPACE_DEFAULT, $member = self::MEMBER_DEFAULT)
-    {
-        $this->_namespace = $namespace;
-        $this->_member    = $member;
-        $this->_session   = new Zend_Session_Namespace($this->_namespace);
-    }
-
-    /**
-     * Returns the session namespace
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_namespace;
-    }
-
-    /**
-     * Returns the name of the session object member
-     *
-     * @return string
-     */
-    public function getMember()
-    {
-        return $this->_member;
-    }
-
-    /**
-     * Defined by Zend_Auth_Storage_Interface
-     *
-     * @return boolean
-     */
-    public function isEmpty()
-    {
-        return !isset($this->_session->{$this->_member});
-    }
-
-    /**
-     * Defined by Zend_Auth_Storage_Interface
-     *
-     * @return mixed
-     */
-    public function read()
-    {
-        return $this->_session->{$this->_member};
-    }
-
-    /**
-     * Defined by Zend_Auth_Storage_Interface
-     *
-     * @param  mixed $contents
-     * @return void
-     */
-    public function write($contents)
-    {
-        $this->_session->{$this->_member} = $contents;
-    }
-
-    /**
-     * Defined by Zend_Auth_Storage_Interface
-     *
-     * @return void
-     */
-    public function clear()
-    {
-        unset($this->_session->{$this->_member});
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode.php b/airtime_mvc/library/Zend/Barcode.php
deleted file mode 100644
index a5c0c636c..000000000
--- a/airtime_mvc/library/Zend/Barcode.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Barcode.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for generate Barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode
-{
-    /**
-     * Factory for Zend_Barcode classes.
-     *
-     * First argument may be a string containing the base of the adapter class
-     * name, e.g. 'int25' corresponds to class Zend_Barcode_Object_Int25.  This
-     * is case-insensitive.
-     *
-     * First argument may alternatively be an object of type Zend_Config.
-     * The barcode class base name is read from the 'barcode' property.
-     * The barcode config parameters are read from the 'params' property.
-     *
-     * Second argument is optional and may be an associative array of key-value
-     * pairs.  This is used as the argument to the barcode constructor.
-     *
-     * If the first argument is of type Zend_Config, it is assumed to contain
-     * all parameters, and the second argument is ignored.
-     *
-     * @param  mixed $barcode         String name of barcode class, or Zend_Config object.
-     * @param  mixed $renderer        String name of renderer class
-     * @param  mixed $barcodeConfig   OPTIONAL; an array or Zend_Config object with barcode parameters.
-     * @param  mixed $rendererConfig  OPTIONAL; an array or Zend_Config object with renderer parameters.
-     * @param  boolean $automaticRenderError  OPTIONAL; set the automatic rendering of exception
-     * @return Zend_Barcode
-     * @throws Zend_Barcode_Exception
-     */
-    public static function factory(
-        $barcode, 
-        $renderer = 'image', 
-        $barcodeConfig = array(), 
-        $rendererConfig = array(), 
-        $automaticRenderError = true
-    ) {
-        /*
-         * Convert Zend_Config argument to plain string
-         * barcode name and separate config object.
-         */
-        if ($barcode instanceof Zend_Config) {
-            if (isset($barcode->rendererParams)) {
-                $rendererConfig = $barcode->rendererParams->toArray();
-            }
-            if (isset($barcode->renderer)) {
-                $renderer = (string) $barcode->renderer;
-            }
-            if (isset($barcode->barcodeParams)) {
-                $barcodeConfig = $barcode->barcodeParams->toArray();
-            }
-            if (isset($barcode->barcode)) {
-                $barcode = (string) $barcode->barcode;
-            } else {
-                $barcode = null;
-            }
-        }
-
-        try {
-            $barcode  = self::makeBarcode($barcode, $barcodeConfig);
-            $renderer = self::makeRenderer($renderer, $rendererConfig);
-        } catch (Zend_Exception $e) {
-            $renderable = ($e instanceof Zend_Barcode_Exception) ? $e->isRenderable() : false;
-            if ($automaticRenderError && $renderable) {
-                $barcode = self::makeBarcode('error', array(
-                    'text' => $e->getMessage()
-                ));
-                $renderer = self::makeRenderer($renderer, array());
-            } else {
-                throw $e;
-            }
-        }
-
-        $renderer->setAutomaticRenderError($automaticRenderError);
-        return $renderer->setBarcode($barcode);
-    }
-
-    /**
-     * Barcode Constructor
-     *
-     * @param mixed $barcode        String name of barcode class, or Zend_Config object.
-     * @param mixed $barcodeConfig  OPTIONAL; an array or Zend_Config object with barcode parameters.
-     * @return Zend_Barcode_Object
-     */
-    public static function makeBarcode($barcode, $barcodeConfig = array())
-    {
-        if ($barcode instanceof Zend_Barcode_Object_ObjectAbstract) {
-            return $barcode;
-        }
-
-        /*
-         * Convert Zend_Config argument to plain string
-         * barcode name and separate config object.
-         */
-        if ($barcode instanceof Zend_Config) {
-            if (isset($barcode->barcodeParams) && $barcode->barcodeParams instanceof Zend_Config) {
-                $barcodeConfig = $barcode->barcodeParams->toArray();
-            }
-            if (isset($barcode->barcode)) {
-                $barcode = (string) $barcode->barcode;
-            } else {
-                $barcode = null;
-            }
-        }
-        if ($barcodeConfig instanceof Zend_Config) {
-            $barcodeConfig = $barcodeConfig->toArray();
-        }
-
-        /*
-         * Verify that barcode parameters are in an array.
-         */
-        if (!is_array($barcodeConfig)) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            throw new Zend_Barcode_Exception(
-                'Barcode parameters must be in an array or a Zend_Config object'
-            );
-        }
-
-        /*
-         * Verify that an barcode name has been specified.
-         */
-        if (!is_string($barcode) || empty($barcode)) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            throw new Zend_Barcode_Exception(
-                'Barcode name must be specified in a string'
-            );
-        }
-        /*
-         * Form full barcode class name
-         */
-        $barcodeNamespace = 'Zend_Barcode_Object';
-        if (isset($barcodeConfig['barcodeNamespace'])) {
-            $barcodeNamespace = $barcodeConfig['barcodeNamespace'];
-        }
-
-        $barcodeName = strtolower($barcodeNamespace . '_' . $barcode);
-        $barcodeName = str_replace(' ', '_', ucwords(
-            str_replace( '_', ' ', $barcodeName)
-        ));
-
-        /*
-         * Load the barcode class.  This throws an exception
-         * if the specified class cannot be loaded.
-         */
-        if (!class_exists($barcodeName)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($barcodeName);
-        }
-
-        /*
-         * Create an instance of the barcode class.
-         * Pass the config to the barcode class constructor.
-         */
-        $bcAdapter = new $barcodeName($barcodeConfig);
-
-        /*
-         * Verify that the object created is a descendent of the abstract barcode type.
-         */
-        if (!$bcAdapter instanceof Zend_Barcode_Object_ObjectAbstract) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            throw new Zend_Barcode_Exception(
-                "Barcode class '$barcodeName' does not extend Zend_Barcode_Object_ObjectAbstract"
-            );
-        }
-        return $bcAdapter;
-    }
-
-    /**
-     * Renderer Constructor
-     *
-     * @param mixed $renderer           String name of renderer class, or Zend_Config object.
-     * @param mixed $rendererConfig     OPTIONAL; an array or Zend_Config object with renderer parameters.
-     * @return Zend_Barcode_Renderer
-     */
-    public static function makeRenderer($renderer = 'image', $rendererConfig = array())
-    {
-        if ($renderer instanceof Zend_Barcode_Renderer_RendererAbstract) {
-            return $renderer;
-        }
-
-        /*
-         * Convert Zend_Config argument to plain string
-         * barcode name and separate config object.
-         */
-        if ($renderer instanceof Zend_Config) {
-            if (isset($renderer->rendererParams)) {
-                $rendererConfig = $renderer->rendererParams->toArray();
-            }
-            if (isset($renderer->renderer)) {
-                $renderer = (string) $renderer->renderer;
-            }
-        }
-        if ($rendererConfig instanceof Zend_Config) {
-            $rendererConfig = $rendererConfig->toArray();
-        }
-
-        /*
-         * Verify that barcode parameters are in an array.
-         */
-        if (!is_array($rendererConfig)) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            $e = new Zend_Barcode_Exception(
-                'Barcode parameters must be in an array or a Zend_Config object'
-            );
-            $e->setIsRenderable(false);
-            throw $e;
-        }
-
-        /*
-         * Verify that an barcode name has been specified.
-         */
-        if (!is_string($renderer) || empty($renderer)) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            $e = new Zend_Barcode_Exception(
-                'Renderer name must be specified in a string'
-            );
-            $e->setIsRenderable(false);
-            throw $e;
-        }
-
-        /*
-         * Form full barcode class name
-         */
-        $rendererNamespace = 'Zend_Barcode_Renderer';
-        if (isset($rendererConfig['rendererNamespace'])) {
-            $rendererNamespace = $rendererConfig['rendererNamespace'];
-        }
-
-        $rendererName = strtolower($rendererNamespace . '_' . $renderer);
-        $rendererName = str_replace(' ', '_', ucwords(
-            str_replace( '_', ' ', $rendererName)
-        ));
-
-        /*
-         * Load the barcode class.  This throws an exception
-         * if the specified class cannot be loaded.
-         */
-        if (!class_exists($rendererName)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($rendererName);
-        }
-
-        /*
-         * Create an instance of the barcode class.
-         * Pass the config to the barcode class constructor.
-         */
-        $rdrAdapter = new $rendererName($rendererConfig);
-
-        /*
-         * Verify that the object created is a descendent of the abstract barcode type.
-         */
-        if (!$rdrAdapter instanceof Zend_Barcode_Renderer_RendererAbstract) {
-            /**
-             * @see Zend_Barcode_Exception
-             */
-            require_once 'Zend/Barcode/Exception.php';
-            $e = new Zend_Barcode_Exception(
-                "Renderer class '$rendererName' does not extend Zend_Barcode_Renderer_RendererAbstract"
-            );
-            $e->setIsRenderable(false);
-            throw $e;
-        }
-        return $rdrAdapter;
-    }
-
-    /**
-     * Proxy to renderer render() method
-     *
-     * @param string | Zend_Barcode_Object | array | Zend_Config $barcode
-     * @param string | Zend_Barcode_Renderer $renderer
-     * @param array | Zend_Config $barcodeConfig
-     * @param array | Zend_Config $rendererConfig
-     */
-    public static function render(
-        $barcode, 
-        $renderer, 
-        $barcodeConfig = array(), 
-        $rendererConfig = array()
-    ) {
-        self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render();
-    }
-
-    /**
-     * Proxy to renderer draw() method
-     *
-     * @param string | Zend_Barcode_Object | array | Zend_Config $barcode
-     * @param string | Zend_Barcode_Renderer $renderer
-     * @param array | Zend_Config $barcodeConfig
-     * @param array | Zend_Config $rendererConfig
-     * @return mixed
-     */
-    public static function draw(
-        $barcode, 
-        $renderer, 
-        $barcodeConfig = array(), 
-        $rendererConfig = array()
-    ) {
-        return self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw();
-    }
-
-    /**
-     * Proxy for setBarcodeFont of Zend_Barcode_Object
-     * @param string $font
-     * @eturn void
-     */
-    public static function setBarcodeFont($font)
-    {
-        require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-        Zend_Barcode_Object_ObjectAbstract::setBarcodeFont($font);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Exception.php b/airtime_mvc/library/Zend/Barcode/Exception.php
deleted file mode 100644
index afc0e89db..000000000
--- a/airtime_mvc/library/Zend/Barcode/Exception.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to version 1.0 of the Zend Framework
- * license, that is bundled with this package in the file LICENSE.txt, and
- * is available through the world-wide-web at the following URL:
- * http://framework.zend.com/license/new-bsd. If you did not receive
- * a copy of the Zend Framework license and are unable to obtain it
- * through the world-wide-web, please send a note to license@zend.com
- * so we can mail you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Zend_Barcode_Exception
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Exception extends Zend_Exception
-{
-    /**
-     * Is this exception renderable?
-     * @var bool
-     */
-    protected $_isRenderable = true;
-
-    /**
-     * Set renderable flag
-     * 
-     * @param  bool $flag 
-     * @return Zend_Barcode_Exception
-     */
-    public function setIsRenderable($flag)
-    {
-        $this->_isRenderable = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve renderable flag
-     * 
-     * @return bool
-     */
-    public function isRenderable()
-    {
-        return $this->_isRenderable;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Code25.php b/airtime_mvc/library/Zend/Barcode/Object/Code25.php
deleted file mode 100644
index 538e4723c..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Code25.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_ObjectAbstract
- */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Interleaved 2 of 5 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Code25 extends Zend_Barcode_Object_ObjectAbstract
-{
-    /**
-     * Coding map
-     * - 0 = narrow bar
-     * - 1 = wide bar
-     * @var array
-     */
-    protected $_codingMap = array(
-        '0' => '00110',
-        '1' => '10001',
-        '2' => '01001',
-        '3' => '11000',
-        '4' => '00101',
-        '5' => '10100',
-        '6' => '01100',
-        '7' => '00011',
-        '8' => '10010',
-        '9' => '01010',
-    );
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (2 * $this->_barThickWidth + 4 * $this->_barThinWidth) * $this->_factor;
-        $characterLength = (3 * $this->_barThinWidth + 2 * $this->_barThickWidth + 5 * $this->_barThinWidth)
-                         * $this->_factor;
-        $encodedData     = strlen($this->getText()) * $characterLength;
-        $stopCharacter   = (2 * $this->_barThickWidth + 4 * $this->_barThinWidth) * $this->_factor;
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Partial check of interleaved 2 of 5 barcode
-     * @return void
-     */
-    protected function _checkParams()
-    {
-        $this->_checkRatio();
-    }
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-
-        // Start character (30301)
-        $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(0 , 1);
-
-        $text = str_split($this->getText());
-        foreach ($text as $char) {
-            $barcodeChar = str_split($this->_codingMap[$char]);
-            foreach ($barcodeChar as $c) {
-                /* visible, width, top, length */
-                $width = $c ? $this->_barThickWidth : $this->_barThinWidth;
-                $barcodeTable[] = array(1 , $width , 0 , 1);
-                $barcodeTable[] = array(0 , 1);
-            }
-        }
-
-        // Stop character (30103)
-        $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThickWidth , 0 , 1);
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $factor   = 3;
-        $checksum = 0;
-
-        for ($i = strlen($text); $i > 0; $i --) {
-            $checksum += intval($text{$i - 1}) * $factor;
-            $factor    = 4 - $factor;
-        }
-
-        $checksum = (10 - ($checksum % 10)) % 10;
-
-        return $checksum;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Code25interleaved.php b/airtime_mvc/library/Zend/Barcode/Object/Code25interleaved.php
deleted file mode 100644
index e7e1a0197..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Code25interleaved.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Code25interleaved.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Object_Code25 */
-require_once 'Zend/Barcode/Object/Code25.php';
-
-/** @see Zend_Validate_Barcode */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Interleaved 2 of 5 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Code25interleaved extends Zend_Barcode_Object_Code25
-{
-    /**
-     * Drawing of bearer bars
-     * @var boolean
-     */
-    private $_withBearerBars = false;
-
-    /**
-     * Default options for Code25interleaved barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 'even';
-    }
-
-    /**
-     * Activate/deactivate drawing of bearer bars
-     * @param boolean $value
-     * @return Zend_Barcode_Object_Int25
-     */
-    public function setWithBearerBars($value)
-    {
-        $this->_withBearerBars = (bool) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve if bearer bars are enabled
-     * @return boolean
-     */
-    public function getWithBearerBars()
-    {
-        return $this->_withBearerBars;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (4 * $this->_barThinWidth) * $this->_factor;
-        $characterLength = (3 * $this->_barThinWidth + 2 * $this->_barThickWidth) * $this->_factor;
-        $encodedData     = strlen($this->getText()) * $characterLength;
-        $stopCharacter   = ($this->_barThickWidth + 2 * $this->_barThinWidth) * $this->_factor;
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        if ($this->_withBearerBars) {
-            $this->_withBorder = false;
-        }
-
-        // Start character (0000)
-        $barcodeTable[] = array(1, $this->_barThinWidth, 0, 1);
-        $barcodeTable[] = array(0, $this->_barThinWidth, 0, 1);
-        $barcodeTable[] = array(1, $this->_barThinWidth, 0, 1);
-        $barcodeTable[] = array(0, $this->_barThinWidth, 0, 1);
-
-        // Encoded $text
-        $text = $this->getText();
-        for ($i = 0; $i < strlen($text); $i += 2) { // Draw 2 chars at a time
-            $char1 = substr($text, $i, 1);
-            $char2 = substr($text, $i + 1, 1);
-
-            // Interleave
-            for ($ibar = 0; $ibar < 5; $ibar ++) {
-                // Draws char1 bar (fore color)
-                $barWidth = (substr($this->_codingMap[$char1], $ibar, 1))
-                          ? $this->_barThickWidth
-                          : $this->_barThinWidth;
-
-                $barcodeTable[] = array(1, $barWidth, 0, 1);
-
-                // Left space corresponding to char2 (background color)
-                $barWidth = (substr($this->_codingMap[$char2], $ibar, 1))
-                          ? $this->_barThickWidth
-                          : $this->_barThinWidth;
-                $barcodeTable[] = array(0, $barWidth, 0 , 1);
-            }
-        }
-
-        // Stop character (100)
-        $barcodeTable[] = array(1 , $this->_barThickWidth, 0, 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth,  0, 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth,  0, 1);
-        return $barcodeTable;
-    }
-
-    /**
-     * Drawing of bearer bars (if enabled)
-     *
-     * @return void
-     */
-    protected function _postDrawBarcode()
-    {
-        if (!$this->_withBearerBars) {
-            return;
-        }
-
-        $width  = $this->_barThickWidth * $this->_factor;
-        $point1 = $this->_rotate(-1, -1);
-        $point2 = $this->_rotate($this->_calculateWidth() - 1, -1);
-        $point3 = $this->_rotate($this->_calculateWidth() - 1, $width - 1);
-        $point4 = $this->_rotate(-1, $width - 1);
-        $this->_addPolygon(array(
-            $point1,
-            $point2,
-            $point3,
-            $point4,
-        ));
-        $point1 = $this->_rotate(
-            0,
-            0 + $this->_barHeight * $this->_factor - 1
-        );
-        $point2 = $this->_rotate(
-            $this->_calculateWidth() - 1,
-            0 + $this->_barHeight * $this->_factor - 1
-        );
-        $point3 = $this->_rotate(
-            $this->_calculateWidth() - 1,
-            0 + $this->_barHeight * $this->_factor - $width
-        );
-        $point4 = $this->_rotate(
-            0,
-            0 + $this->_barHeight * $this->_factor - $width
-        );
-        $this->_addPolygon(array(
-            $point1,
-            $point2,
-            $point3,
-            $point4,
-        ));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Code39.php b/airtime_mvc/library/Zend/Barcode/Object/Code39.php
deleted file mode 100644
index 864fe3684..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Code39.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Code39.php 21658 2010-03-27 14:29:57Z mikaelkael $
- */
-
-/**
- * @see Zend_Barcode_Object_ObjectAbstract
- */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * @see 'Zend_Validate_Barcode'
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Code39 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Code39 extends Zend_Barcode_Object_ObjectAbstract
-{
-    /**
-     * Coding map
-     * @var array
-     */
-    protected $_codingMap = array(
-        '0' => '000110100',
-        '1' => '100100001',
-        '2' => '001100001',
-        '3' => '101100000',
-        '4' => '000110001',
-        '5' => '100110000',
-        '6' => '001110000',
-        '7' => '000100101',
-        '8' => '100100100',
-        '9' => '001100100',
-        'A' => '100001001',
-        'B' => '001001001',
-        'C' => '101001000',
-        'D' => '000011001',
-        'E' => '100011000',
-        'F' => '001011000',
-        'G' => '000001101',
-        'H' => '100001100',
-        'I' => '001001100',
-        'J' => '000011100',
-        'K' => '100000011',
-        'L' => '001000011',
-        'M' => '101000010',
-        'N' => '000010011',
-        'O' => '100010010',
-        'P' => '001010010',
-        'Q' => '000000111',
-        'R' => '100000110',
-        'S' => '001000110',
-        'T' => '000010110',
-        'U' => '110000001',
-        'V' => '011000001',
-        'W' => '111000000',
-        'X' => '010010001',
-        'Y' => '110010000',
-        'Z' => '011010000',
-        '-' => '010000101',
-        '.' => '110000100',
-        ' ' => '011000100',
-        '$' => '010101000',
-        '/' => '010100010',
-        '+' => '010001010',
-        '%' => '000101010',
-        '*' => '010010100',
-    );
-
-    /**
-     * Partial check of Code39 barcode
-     * @return void
-     */
-    protected function _checkParams()
-    {
-        $this->_checkRatio();
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return int
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $characterLength = (6 * $this->_barThinWidth + 3 * $this->_barThickWidth + 1) * $this->_factor;
-        $encodedData     = strlen($this->getText()) * $characterLength - $this->_factor;
-        return $quietZone + $encodedData + $quietZone;
-    }
-
-    /**
-     * Retrieve text to display
-     * @return string
-     */
-    public function getText()
-    {
-        return '*' . parent::getText() . '*';
-    }
-
-    /**
-     * Retrieve text to display
-     * @return string
-     */
-    public function getTextToDisplay()
-    {
-        $text = parent::getTextToDisplay();
-        if (substr($text, 0, 1) != '*' && substr($text, -1) != '*') {
-            return '*' . $text . '*';
-        } else {
-            return $text;
-        }
-    }
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $text         = str_split($this->getText());
-        $barcodeTable = array();
-        foreach ($text as $char) {
-            $barcodeChar = str_split($this->_codingMap[$char]);
-            $visible     = true;
-            foreach ($barcodeChar as $c) {
-                /* visible, width, top, length */
-                $width          = $c ? $this->_barThickWidth : $this->_barThinWidth;
-                $barcodeTable[] = array((int) $visible, $width, 0, 1);
-                $visible = ! $visible;
-            }
-            $barcodeTable[] = array(0 , 1);
-        }
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $text     = str_split($text);
-        $charset  = array_flip(array_keys($this->_codingMap));
-        $checksum = 0;
-        foreach ($text as $character) {
-            $checksum += $charset[$character];
-        }
-        return array_search(($checksum % 43), $charset);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Ean13.php b/airtime_mvc/library/Zend/Barcode/Object/Ean13.php
deleted file mode 100644
index 2005708d4..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Ean13.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_ObjectAbstract
- */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Ean13 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Ean13 extends Zend_Barcode_Object_ObjectAbstract
-{
-
-    /**
-     * Coding map
-     * - 0 = narrow bar
-     * - 1 = wide bar
-     * @var array
-     */
-    protected $_codingMap = array(
-        'A' => array(
-            0 => "0001101", 1 => "0011001", 2 => "0010011", 3 => "0111101", 4 => "0100011",
-            5 => "0110001", 6 => "0101111", 7 => "0111011", 8 => "0110111", 9 => "0001011"
-        ),
-        'B' => array(
-            0 => "0100111", 1 => "0110011", 2 => "0011011", 3 => "0100001", 4 => "0011101",
-            5 => "0111001", 6 => "0000101", 7 => "0010001", 8 => "0001001", 9 => "0010111"
-        ),
-        'C' => array(
-            0 => "1110010", 1 => "1100110", 2 => "1101100", 3 => "1000010", 4 => "1011100",
-            5 => "1001110", 6 => "1010000", 7 => "1000100", 8 => "1001000", 9 => "1110100"
-        ));
-
-    protected $_parities = array(
-		0 => array('A','A','A','A','A','A'),
-		1 => array('A','A','B','A','B','B'),
-		2 => array('A','A','B','B','A','B'),
-		3 => array('A','A','B','B','B','A'),
-		4 => array('A','B','A','A','B','B'),
-		5 => array('A','B','B','A','A','B'),
-		6 => array('A','B','B','B','A','A'),
-		7 => array('A','B','A','B','A','B'),
-		8 => array('A','B','A','B','B','A'),
-		9 => array('A','B','B','A','B','A')
-	);
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 13;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (3 * $this->_barThinWidth) * $this->_factor;
-        $middleCharacter = (5 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (3 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (7 * $this->_barThinWidth) * $this->_factor * 12;
-        return $quietZone + $startCharacter + $middleCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Partial check of interleaved EAN/UPC barcode
-     * @return void
-     */
-    protected function _checkParams()
-    {}
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-        $height = ($this->_drawText) ? 1.1 : 1;
-
-        // Start character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-
-        $textTable = str_split($this->getText());
-        $parity = $this->_parities[$textTable[0]];
-
-        // First part
-        for ($i = 1; $i < 7; $i++) {
-            $bars = str_split($this->_codingMap[$parity[$i - 1]][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Middle character (01010)
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-
-        // Second part
-        for ($i = 7; $i < 13; $i++) {
-            $bars = str_split($this->_codingMap['C'][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Stop character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $factor   = 3;
-        $checksum = 0;
-
-        for ($i = strlen($text); $i > 0; $i --) {
-            $checksum += intval($text{$i - 1}) * $factor;
-            $factor    = 4 - $factor;
-        }
-
-        $checksum = (10 - ($checksum % 10)) % 10;
-
-        return $checksum;
-    }
-
-    /**
-     * Partial function to draw text
-     * @return void
-     */
-    protected function _drawText()
-    {
-        if (get_class($this) == 'Zend_Barcode_Object_Ean13') {
-            $this->_drawEan13Text();
-        } else {
-            parent::_drawText();
-        }
-    }
-
-    protected function _drawEan13Text()
-    {
-        if ($this->_drawText) {
-            $text = $this->getTextToDisplay();
-            $characterWidth = (7 * $this->_barThinWidth) * $this->_factor;
-            $leftPosition = $this->getQuietZone() - $characterWidth;
-            for ($i = 0; $i < $this->_barcodeLength; $i ++) {
-                $this->_addText(
-                    $text{$i},
-                    $this->_fontSize * $this->_factor,
-                    $this->_rotate(
-                        $leftPosition,
-                        (int) $this->_withBorder * 2
-                            + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
-                    ),
-                    $this->_font,
-                    $this->_foreColor,
-                    'left',
-                    - $this->_orientation
-                );
-                switch ($i) {
-                    case 0:
-                        $factor = 3;
-                        break;
-                    case 6:
-                        $factor = 4;
-                        break;
-                    default:
-                        $factor = 0;
-                }
-                $leftPosition = $leftPosition + $characterWidth + ($factor * $this->_barThinWidth * $this->_factor);
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Ean2.php b/airtime_mvc/library/Zend/Barcode/Object/Ean2.php
deleted file mode 100644
index f214129ff..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Ean2.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean2.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Ean5
- */
-require_once 'Zend/Barcode/Object/Ean5.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Ean2 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Ean2 extends Zend_Barcode_Object_Ean5
-{
-
-    protected $_parities = array(
-        0 => array('A','A'),
-        1 => array('A','B'),
-        2 => array('B','A'),
-        3 => array('B','B')
-    );
-
-    /**
-     * Default options for Ean2 barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 2;
-    }
-
-    protected function _getParity($i)
-    {
-        $modulo = $this->getText() % 4;
-        return $this->_parities[$modulo][$i];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Ean5.php b/airtime_mvc/library/Zend/Barcode/Object/Ean5.php
deleted file mode 100644
index f983b31b2..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Ean5.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean5.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Ean13
- */
-require_once 'Zend/Barcode/Object/Ean13.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Ean5 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Ean5 extends Zend_Barcode_Object_Ean13
-{
-
-    protected $_parities = array(
-        0 => array('B','B','A','A','A'),
-        1 => array('B','A','B','A','A'),
-        2 => array('B','A','A','B','A'),
-        3 => array('B','A','A','A','B'),
-        4 => array('A','B','B','A','A'),
-        5 => array('A','A','B','B','A'),
-        6 => array('A','A','A','B','B'),
-        7 => array('A','B','A','B','A'),
-        8 => array('A','B','A','A','B'),
-        9 => array('A','A','B','A','B')
-    );
-
-    /**
-     * Default options for Ean5 barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 5;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (5 * $this->_barThinWidth) * $this->_factor;
-        $middleCharacter = (2 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (7 * $this->_barThinWidth) * $this->_factor;
-        return $quietZone + $startCharacter + ($this->_barcodeLength - 1) * $middleCharacter + $this->_barcodeLength * $encodedData + $quietZone;
-    }
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-
-        // Start character (01011)
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-
-        $firstCharacter = true;
-        $textTable = str_split($this->getText());
-
-        // Characters
-        for ($i = 0; $i < $this->_barcodeLength; $i++) {
-            if ($firstCharacter) {
-                $firstCharacter = false;
-            } else {
-                // Intermediate character (01)
-                $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-                $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-            }
-            $bars = str_split($this->_codingMap[$this->_getParity($i)][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $checksum = 0;
-
-        for ($i = 0 ; $i < $this->_barcodeLength; $i ++) {
-            $checksum += intval($text{$i}) * ($i % 2 ? 9 : 3);
-        }
-
-        return ($checksum % 10);
-    }
-
-    protected function _getParity($i)
-    {
-        $checksum = $this->getChecksum($this->getText());
-        return $this->_parities[$checksum][$i];
-    }
-
-    /**
-     * Retrieve text to encode
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->_addLeadingZeros($this->_text);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Ean8.php b/airtime_mvc/library/Zend/Barcode/Object/Ean8.php
deleted file mode 100644
index 1c10a193f..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Ean8.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean8.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Ean13
- */
-require_once 'Zend/Barcode/Object/Ean13.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Ean8 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13
-{
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 8;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (3 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (3 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (7 * $this->_barThinWidth) * $this->_factor * 8;
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-        /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-        $height = ($this->_drawText) ? 1.1 : 1;
-
-        // Start character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-
-        $textTable = str_split($this->getText());
-
-        // First part
-        for ($i = 0; $i < 4; $i++) {
-            $bars = str_split($this->_codingMap['A'][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Middle character (01010)
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-
-        // Second part
-        for ($i = 4; $i < 8; $i++) {
-            $bars = str_split($this->_codingMap['C'][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Stop character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        return $barcodeTable;
-    }
-
-    /**
-     * Partial function to draw text
-     * @return void
-     */
-    protected function _drawText()
-    {
-        if ($this->_drawText) {
-            $text = $this->getTextToDisplay();
-            $characterWidth = (7 * $this->_barThinWidth) * $this->_factor;
-            $leftPosition = $this->getQuietZone() + (3 * $this->_barThinWidth) * $this->_factor;
-            for ($i = 0; $i < $this->_barcodeLength; $i ++) {
-                $this->_addText(
-                    $text{$i},
-                    $this->_fontSize * $this->_factor,
-                    $this->_rotate(
-                        $leftPosition,
-                        (int) $this->_withBorder * 2
-                            + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
-                    ),
-                    $this->_font,
-                    $this->_foreColor,
-                    'left',
-                    - $this->_orientation
-                );
-                switch ($i) {
-                    case 3:
-                        $factor = 4;
-                        break;
-                    default:
-                        $factor = 0;
-                }
-                $leftPosition = $leftPosition + $characterWidth + ($factor * $this->_barThinWidth * $this->_factor);
-            }
-        }
-    }
-
-    /**
-     * Particular validation for Ean8 barcode objects
-     * (to suppress checksum character substitution)
-     * @param string $value
-     * @param array  $options
-     */
-    protected function _validateText($value, $options = array())
-    {
-        $validator = new Zend_Validate_Barcode(array(
-            'adapter'  => 'ean8',
-            'checksum' => false,
-        ));
-
-        $value = $this->_addLeadingZeros($value, true);
-
-        if (!$validator->isValid($value)) {
-            $message = implode("\n", $validator->getMessages());
-
-            /**
-             * @see Zend_Barcode_Object_Exception
-             */
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception($message);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Error.php b/airtime_mvc/library/Zend/Barcode/Object/Error.php
deleted file mode 100644
index 7a990460d..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Error.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Object_ObjectAbstract */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * Class for generate Barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract
-{
-    /**
-     * All texts are accepted
-     * @param string $value
-     * @return boolean
-     */
-    public function validateText($value)
-    {
-        return true;
-    }
-
-    /**
-     * Height is forced
-     * @return integer
-     */
-    public function getHeight($recalculate = false)
-    {
-        return 40;
-    }
-
-    /**
-     * Width is forced
-     * @return integer
-     */
-    public function getWidth($recalculate = false)
-    {
-        return 400;
-    }
-
-    /**
-     * Reset precedent instructions
-     * and draw the error message
-     * @return array
-     */
-    public function draw()
-    {
-        $this->_instructions = array();
-        $this->_addText('ERROR:', 10, array(5 , 18), $this->_font, 0, 'left');
-        $this->_addText($this->_text, 10, array(5 , 32), $this->_font, 0, 'left');
-        return $this->_instructions;
-    }
-
-    /**
-     * For compatibility reason
-     * @return void
-     */
-    protected function _prepareBarcode()
-    {
-    }
-
-    /**
-     * For compatibility reason
-     * @return void
-     */
-    protected function _checkParams()
-    {
-    }
-
-    /**
-     * For compatibility reason
-     * @return void
-     */
-    protected function _calculateBarcodeWidth()
-    {
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Exception.php b/airtime_mvc/library/Zend/Barcode/Object/Exception.php
deleted file mode 100644
index ad4a22670..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to version 1.0 of the Zend Framework
- * license, that is bundled with this package in the file LICENSE.txt, and
- * is available through the world-wide-web at the following URL:
- * http://framework.zend.com/license/new-bsd. If you did not receive
- * a copy of the Zend Framework license and are unable to obtain it
- * through the world-wide-web, please send a note to license@zend.com
- * so we can mail you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Exception */
-require_once 'Zend/Barcode/Exception.php';
-
-/**
- * Zend_Barcode_Renderer_Exception
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Exception extends Zend_Barcode_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Identcode.php b/airtime_mvc/library/Zend/Barcode/Object/Identcode.php
deleted file mode 100644
index 000390092..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Identcode.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Identcode.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Code25interleaved
- */
-require_once 'Zend/Barcode/Object/Code25interleaved.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Identcode barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Identcode extends Zend_Barcode_Object_Code25interleaved
-{
-
-    /**
-     * Default options for Identcode barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 12;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Retrieve text to display
-     * @return string
-     */
-    public function getTextToDisplay()
-    {
-        return preg_replace('/([0-9]{2})([0-9]{3})([0-9]{3})([0-9]{3})([0-9])/',
-                            '$1.$2 $3.$4 $5',
-                            $this->getText());
-    }
-
-    /**
-     * Check allowed characters
-     * @param string $value
-     * @return string
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function validateText($value)
-    {
-        $this->_validateText($value, array('validator' => $this->getType()));
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $checksum = 0;
-
-        for ($i = strlen($text); $i > 0; $i --) {
-            $checksum += intval($text{$i - 1}) * (($i % 2) ? 4 : 9);
-        }
-
-        $checksum = (10 - ($checksum % 10)) % 10;
-
-        return $checksum;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Itf14.php b/airtime_mvc/library/Zend/Barcode/Object/Itf14.php
deleted file mode 100644
index 909c4043a..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Itf14.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Itf14.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Object_Code25interleaved */
-require_once 'Zend/Barcode/Object/Code25interleaved.php';
-
-/** @see Zend_Validate_Barcode */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Itf14 barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Itf14 extends Zend_Barcode_Object_Code25interleaved
-{
-
-    /**
-     * Default options for Identcode barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 14;
-        $this->_mandatoryChecksum = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Leitcode.php b/airtime_mvc/library/Zend/Barcode/Object/Leitcode.php
deleted file mode 100644
index ba5973a4a..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Leitcode.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Leitcode.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Identcode
- */
-require_once 'Zend/Barcode/Object/Identcode.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Identcode barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Leitcode extends Zend_Barcode_Object_Identcode
-{
-
-    /**
-     * Default options for Leitcode barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 14;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Retrieve text to display
-     * @return string
-     */
-    public function getTextToDisplay()
-    {
-        return preg_replace('/([0-9]{5})([0-9]{3})([0-9]{3})([0-9]{2})([0-9])/',
-                            '$1.$2.$3.$4 $5',
-                            $this->getText());
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/ObjectAbstract.php b/airtime_mvc/library/Zend/Barcode/Object/ObjectAbstract.php
deleted file mode 100644
index b05cd768c..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/ObjectAbstract.php
+++ /dev/null
@@ -1,1281 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ObjectAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for generate Barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Barcode_Object_ObjectAbstract
-{
-    /**
-     * Namespace of the barcode for autoloading
-     * @var string
-     */
-    protected $_barcodeNamespace = 'Zend_Barcode_Object';
-
-    /**
-     * Set of drawing instructions
-     * @var array
-     */
-    protected $_instructions = array();
-
-    /**
-     * Barcode type
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * Height of the object
-     * @var integer
-     */
-    protected $_height = null;
-
-    /**
-     * Width of the object
-     * @var integer
-     */
-    protected $_width = null;
-
-    /**
-     * Height of the bar
-     * @var integer
-     */
-    protected $_barHeight = 50;
-
-    /**
-     * Width of a thin bar
-     * @var integer
-     */
-    protected $_barThinWidth = 1;
-
-    /**
-     * Width of a thick bar
-     * @var integer
-     */
-    protected $_barThickWidth = 3;
-
-    /**
-     * Factor to multiply bar and font measure
-     * (barHeight, barThinWidth, barThickWidth & fontSize)
-     * @var integer
-     */
-    protected $_factor = 1;
-
-    /**
-     * Font and bars color of the object
-     * @var integer
-     */
-    protected $_foreColor = 0x000000;
-
-    /**
-     * Background color of the object
-     * @var integer
-     */
-    protected $_backgroundColor = 0xFFFFFF;
-
-    /**
-     * Activate/deactivate border of the object
-     * @var boolean
-     */
-    protected $_withBorder = false;
-
-    /**
-     * Orientation of the barcode in degrees
-     * @var float
-     */
-    protected $_orientation = 0;
-
-    /**
-     * Offset from the top the object
-     * (calculated from the orientation)
-     * @var integer
-     */
-    protected $_offsetTop = null;
-
-    /**
-     * Offset from the left the object
-     * (calculated from the orientation)
-     * @var integer
-     */
-    protected $_offsetLeft = null;
-
-    /**
-     * Text to display
-     * @var string
-     */
-    protected $_text = null;
-
-    /**
-     * Display (or not) human readable text
-     * @var boolean
-     */
-    protected $_drawText = true;
-
-    /**
-     * Adjust (or not) position of human readable characters with barcode
-     * @var boolean
-     */
-    protected $_stretchText = false;
-
-    /**
-     * Font resource
-     *  - integer (1 to 5): corresponds to GD included fonts
-     *  - string: corresponds to path of a TTF font
-     * @var integer|string
-     */
-    protected $_font = null;
-
-    /**
-     * Font size
-     * @var float
-     */
-    protected $_fontSize = 10;
-
-    /**
-     * Drawing of checksum
-     * @var boolean
-     */
-    protected $_withChecksum = false;
-
-    /**
-     * Drawing of checksum inside text
-     * @var boolean
-     */
-    protected $_withChecksumInText = false;
-
-    /**
-     * Fix barcode length (numeric or string like 'even')
-     * @var $_barcodeLength integer | string
-     */
-    protected $_barcodeLength = null;
-
-    /**
-     * Activate automatic addition of leading zeros
-     * if barcode length is fixed
-     * @var $_addLeadingZeros boolean
-     */
-    protected $_addLeadingZeros = true;
-
-    /**
-     * Activation of mandatory checksum
-     * to deactivate unauthorized modification
-     * @var $_mandatoryChecksum boolean
-     */
-    protected $_mandatoryChecksum = false;
-
-    /**
-     * Character used to substitute checksum character for validation
-     * @var $_substituteChecksumCharacter mixed
-     */
-    protected $_substituteChecksumCharacter = 0;
-
-    /**
-     * TTF font name: can be set before instanciation of the object
-     * @var string
-     */
-    protected static $_staticFont = null;
-
-    /**
-     * Constructor
-     * @param array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->_getDefaultOptions();
-        if (self::$_staticFont !== null) {
-            $this->_font = self::$_staticFont;
-        }
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-        $this->_type = strtolower(substr(get_class($this), strlen($this->_barcodeNamespace) + 1));
-        if ($this->_mandatoryChecksum) {
-            $this->_withChecksum = true;
-            $this->_withChecksumInText = true;
-        }
-    }
-
-    /**
-     * Set default options for particular object
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-    }
-
-    /**
-     * Set barcode state from options array
-     * @param  array $options
-     * @return Zend_Barcode_Object
-     */
-    public function setOptions($options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set barcode state from config object
-     * @param Zend_Config $config
-     * @return Zend_Barcode_Object
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set barcode namespace for autoloading
-     *
-     * @param string $namespace
-     * @return Zend_Barcode_Object
-     */
-    public function setBarcodeNamespace($namespace)
-    {
-        $this->_barcodeNamespace = $namespace;
-        return $this;
-    }
-
-    /**
-     * Retrieve barcode namespace
-     *
-     * @return string
-     */
-    public function getBarcodeNamespace()
-    {
-        return $this->_barcodeNamespace;
-    }
-
-    /**
-     * Retrieve type of barcode
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set height of the barcode bar
-     * @param integer $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setBarHeight($value)
-    {
-        if (intval($value) <= 0) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Bar height must be greater than 0'
-            );
-        }
-        $this->_barHeight = intval($value);
-        return $this;
-    }
-
-    /**
-     * Get height of the barcode bar
-     * @return integer
-     */
-    public function getBarHeight()
-    {
-        return $this->_barHeight;
-    }
-
-    /**
-     * Set thickness of thin bar
-     * @param integer $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setBarThinWidth($value)
-    {
-        if (intval($value) <= 0) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Bar width must be greater than 0'
-            );
-        }
-        $this->_barThinWidth = intval($value);
-        return $this;
-    }
-
-    /**
-     * Get thickness of thin bar
-     * @return integer
-     */
-    public function getBarThinWidth()
-    {
-        return $this->_barThinWidth;
-    }
-
-    /**
-     * Set thickness of thick bar
-     * @param integer $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setBarThickWidth($value)
-    {
-        if (intval($value) <= 0) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Bar width must be greater than 0'
-            );
-        }
-        $this->_barThickWidth = intval($value);
-        return $this;
-    }
-
-    /**
-     * Get thickness of thick bar
-     * @return integer
-     */
-    public function getBarThickWidth()
-    {
-        return $this->_barThickWidth;
-    }
-
-    /**
-     * Set factor applying to
-     * thinBarWidth - thickBarWidth - barHeight - fontSize
-     * @param integer $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setFactor($value)
-    {
-        if (floatval($value) <= 0) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Factor must be greater than 0'
-            );
-        }
-        $this->_factor = floatval($value);
-        return $this;
-    }
-
-    /**
-     * Get factor applying to
-     * thinBarWidth - thickBarWidth - barHeight - fontSize
-     * @return integer
-     */
-    public function getFactor()
-    {
-        return $this->_factor;
-    }
-
-    /**
-     * Set color of the barcode and text
-     * @param string $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setForeColor($value)
-    {
-        if (preg_match('`\#[0-9A-F]{6}`', $value)) {
-            $this->_foreColor = hexdec($value);
-        } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) {
-            $this->_foreColor = intval($value);
-        } else {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Text color must be set as #[0-9A-F]{6}'
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve color of the barcode and text
-     * @return unknown
-     */
-    public function getForeColor()
-    {
-        return $this->_foreColor;
-    }
-
-    /**
-     * Set the color of the background
-     * @param integer $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setBackgroundColor($value)
-    {
-        if (preg_match('`\#[0-9A-F]{6}`', $value)) {
-            $this->_backgroundColor = hexdec($value);
-        } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) {
-            $this->_backgroundColor = intval($value);
-        } else {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Background color must be set as #[0-9A-F]{6}'
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve background color of the image
-     * @return integer
-     */
-    public function getBackgroundColor()
-    {
-        return $this->_backgroundColor;
-    }
-
-    /**
-     * Activate/deactivate drawing of the bar
-     * @param boolean $value
-     * @return Zend_Barcode_Object
-     */
-    public function setWithBorder($value)
-    {
-        $this->_withBorder = (bool) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve if border are draw or not
-     * @return boolean
-     */
-    public function getWithBorder()
-    {
-        return $this->_withBorder;
-    }
-
-    /**
-     * Allow fast inversion of font/bars color and background color
-     * @return Zend_Barcode_Object
-     */
-    public function setReverseColor()
-    {
-        $tmp                    = $this->_foreColor;
-        $this->_foreColor       = $this->_backgroundColor;
-        $this->_backgroundColor = $tmp;
-        return $this;
-    }
-
-    /**
-     * Set orientation of barcode and text
-     * @param float $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setOrientation($value)
-    {
-        $this->_orientation = floatval($value) - floor(floatval($value) / 360) * 360;
-        return $this;
-    }
-
-    /**
-     * Retrieve orientation of barcode and text
-     * @return float
-     */
-    public function getOrientation()
-    {
-        return $this->_orientation;
-    }
-
-    /**
-     * Set text to encode
-     * @param string $value
-     * @return Zend_Barcode_Object
-     */
-    public function setText($value)
-    {
-        $this->_text = trim($value);
-        return $this;
-    }
-
-    /**
-     * Retrieve text to encode
-     * @return string
-     */
-    public function getText()
-    {
-        $text = $this->_text;
-        if ($this->_withChecksum) {
-            $text .= $this->getChecksum($this->_text);
-        }
-        return $this->_addLeadingZeros($text);
-    }
-
-    /**
-     * Automatically add leading zeros if barcode length is fixed
-     * @param string $text
-     * @param boolean $withoutChecksum
-     */
-    protected function _addLeadingZeros($text, $withoutChecksum = false)
-    {
-        if ($this->_barcodeLength && $this->_addLeadingZeros) {
-            $omitChecksum = (int) ($this->_withChecksum && $withoutChecksum);
-            if (is_int($this->_barcodeLength)) {
-                $length = $this->_barcodeLength - $omitChecksum;
-                if (strlen($text) < $length) {
-                    $text = str_repeat('0', $length - strlen($text)) . $text;
-                }
-            } else {
-                if ($this->_barcodeLength == 'even') {
-                    $text = ((strlen($text) - $omitChecksum) % 2 ? '0' . $text : $text);
-                }
-            }
-        }
-        return $text;
-    }
-
-    /**
-     * Retrieve text to encode
-     * @return string
-     */
-    public function getRawText()
-    {
-        return $this->_text;
-    }
-
-    /**
-     * Retrieve text to display
-     * @return string
-     */
-    public function getTextToDisplay()
-    {
-        if ($this->_withChecksumInText) {
-            return $this->getText();
-        } else {
-            return $this->_addLeadingZeros($this->_text, true);
-        }
-    }
-
-    /**
-     * Activate/deactivate drawing of text to encode
-     * @param boolean $value
-     * @return Zend_Barcode_Object
-     */
-    public function setDrawText($value)
-    {
-        $this->_drawText = (bool) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve if drawing of text to encode is enabled
-     * @return boolean
-     */
-    public function getDrawText()
-    {
-        return $this->_drawText;
-    }
-
-    /**
-     * Activate/deactivate the adjustment of the position
-     * of the characters to the position of the bars
-     * @param boolean $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setStretchText($value)
-    {
-        $this->_stretchText = (bool) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve if the adjustment of the position of the characters
-     * to the position of the bars is enabled
-     * @return boolean
-     */
-    public function getStretchText()
-    {
-        return $this->_stretchText;
-    }
-
-    /**
-     * Activate/deactivate the automatic generation
-     * of the checksum character
-     * added to the barcode text
-     * @param boolean $value
-     * @return Zend_Barcode_Object
-     */
-    public function setWithChecksum($value)
-    {
-        if (!$this->_mandatoryChecksum) {
-            $this->_withChecksum = (bool) $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve if the checksum character is automatically
-     * added to the barcode text
-     * @return boolean
-     */
-    public function getWithChecksum()
-    {
-        return $this->_withChecksum;
-    }
-
-    /**
-     * Activate/deactivate the automatic generation
-     * of the checksum character
-     * added to the barcode text
-     * @param boolean $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setWithChecksumInText($value)
-    {
-        if (!$this->_mandatoryChecksum) {
-            $this->_withChecksumInText = (bool) $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve if the checksum character is automatically
-     * added to the barcode text
-     * @return boolean
-     */
-    public function getWithChecksumInText()
-    {
-        return $this->_withChecksumInText;
-    }
-
-    /**
-     * Set the font for all instances of barcode
-     * @param string $font
-     * @return void
-     */
-    public static function setBarcodeFont($font)
-    {
-        if (is_string($font) || (is_int($font) && $font >= 1 && $font <= 5)) {
-            self::$_staticFont = $font;
-        }
-    }
-
-    /**
-     * Set the font:
-     *  - if integer between 1 and 5, use gd built-in fonts
-     *  - if string, $value is assumed to be the path to a TTF font
-     * @param integer|string $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setFont($value)
-    {
-        if (is_int($value) && $value >= 1 && $value <= 5) {
-            if (!extension_loaded('gd')) {
-                require_once 'Zend/Barcode/Object/Exception.php';
-                throw new Zend_Barcode_Object_Exception(
-                    'GD extension is required to use numeric font'
-                );
-            }
-
-            // Case of numeric font with GD
-            $this->_font = $value;
-
-            // In this case font size is given by:
-            $this->_fontSize = imagefontheight($value);
-        } elseif (is_string($value)) {
-            $this->_font = $value;
-        } else {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(sprintf(
-                'Invalid font "%s" provided to setFont()',
-                $value
-            ));
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve the font
-     * @return integer|string
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     * Set the size of the font in case of TTF
-     * @param float $value
-     * @return Zend_Barcode_Object
-     * @throw Zend_Barcode_Object_Exception
-     */
-    public function setFontSize($value)
-    {
-        if (is_numeric($this->_font)) {
-            // Case of numeric font with GD
-            return $this;
-        }
-
-        if (!is_numeric($value)) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Font size must be a numeric value'
-            );
-        }
-
-        $this->_fontSize = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve the size of the font in case of TTF
-     * @return float
-     */
-    public function getFontSize()
-    {
-        return $this->_fontSize;
-    }
-
-    /**
-     * Quiet zone before first bar
-     * and after the last bar
-     * @return integer
-     */
-    public function getQuietZone()
-    {
-        return 10 * $this->_barThinWidth * $this->_factor;
-    }
-
-    /**
-     * Add an instruction in the array of instructions
-     * @param array $instruction
-     */
-    protected function _addInstruction(array $instruction)
-    {
-        $this->_instructions[] = $instruction;
-    }
-
-    /**
-     * Retrieve the set of drawing instructions
-     * @return array
-     */
-    public function getInstructions()
-    {
-        return $this->_instructions;
-    }
-
-    /**
-     * Add a polygon drawing instruction in the set of instructions
-     * @param array $points
-     * @param integer $color
-     * @param boolean $filled
-     */
-    protected function _addPolygon(array $points, $color = null, $filled = true)
-    {
-        if ($color === null) {
-            $color = $this->_foreColor;
-        }
-        $this->_addInstruction(array(
-            'type'   => 'polygon',
-            'points' => $points,
-            'color'  => $color,
-            'filled' => $filled,
-        ));
-    }
-
-    /**
-     * Add a text drawing instruction in the set of instructions
-     * @param string $text
-     * @param float $size
-     * @param array $position
-     * @param string $font
-     * @param integer $color
-     * @param string $alignment
-     * @param float $orientation
-     */
-    protected function _addText(
-        $text,
-        $size,
-        $position,
-        $font,
-        $color,
-        $alignment = 'center',
-        $orientation = 0
-    ) {
-        if ($color === null) {
-            $color = $this->_foreColor;
-        }
-        $this->_addInstruction(array(
-            'type'        => 'text',
-            'text'        => $text,
-            'size'        => $size,
-            'position'    => $position,
-            'font'        => $font,
-            'color'       => $color,
-            'alignment'   => $alignment,
-            'orientation' => $orientation,
-        ));
-    }
-
-    /**
-     * Checking of parameters after all settings
-     * @return void
-     */
-    public function checkParams()
-    {
-        $this->_checkText();
-        $this->_checkFontAndOrientation();
-        $this->_checkParams();
-        return true;
-    }
-
-    /**
-     * Check if a text is really provided to barcode
-     * @return void
-     * @throw Zend_Barcode_Object_Exception
-     */
-    protected function _checkText($value = null)
-    {
-        if ($value === null) {
-            $value = $this->_text;
-        }
-        if (!strlen($value)) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'A text must be provide to Barcode before drawing'
-            );
-        }
-        $this->validateText($value);
-    }
-
-    /**
-     * Check the ratio between the thick and the thin bar
-     * @param integer $min
-     * @param integer $max
-     * @return void
-     * @throw Zend_Barcode_Object_Exception
-     */
-    protected function _checkRatio($min = 2, $max = 3)
-    {
-        $ratio = $this->_barThickWidth / $this->_barThinWidth;
-        if (!($ratio >= $min && $ratio <= $max)) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(sprintf(
-                'Ratio thick/thin bar must be between %0.1f and %0.1f (actual %0.3f)',
-                $min,
-                $max,
-                $ratio
-            ));
-        }
-    }
-
-    /**
-     * Drawing with an angle is just allow TTF font
-     * @return void
-     * @throw Zend_Barcode_Object_Exception
-     */
-    protected function _checkFontAndOrientation()
-    {
-        if (is_numeric($this->_font) && $this->_orientation != 0) {
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception(
-                'Only drawing with TTF font allow orientation of the barcode.'
-            );
-        }
-    }
-
-    /**
-     * Width of the result image
-     * (before any rotation)
-     * @return integer
-     */
-    protected function _calculateWidth()
-    {
-        return (int) $this->_withBorder
-            + $this->_calculateBarcodeWidth()
-            + (int) $this->_withBorder;
-    }
-
-    /**
-     * Calculate the width of the barcode
-     * @return integer
-     */
-    abstract protected function _calculateBarcodeWidth();
-
-    /**
-     * Height of the result object
-     * @return integer
-     */
-    protected function _calculateHeight()
-    {
-        return (int) $this->_withBorder * 2
-            + $this->_calculateBarcodeHeight()
-            + (int) $this->_withBorder * 2;
-    }
-
-    /**
-     * Height of the barcode
-     * @return integer
-     */
-    protected function _calculateBarcodeHeight()
-    {
-        $textHeight = 0;
-        $extraHeight = 0;
-        if ($this->_drawText) {
-            $textHeight += $this->_fontSize;
-            $extraHeight = 2;
-        }
-        return ($this->_barHeight + $textHeight) * $this->_factor + $extraHeight;
-    }
-
-    /**
-     * Get height of the result object
-     * @return integer
-     */
-    public function getHeight($recalculate = false)
-    {
-        if ($this->_height === null || $recalculate) {
-            $this->_height =
-                abs($this->_calculateHeight() * cos($this->_orientation / 180 * pi()))
-                + abs($this->_calculateWidth() * sin($this->_orientation / 180 * pi()));
-        }
-        return $this->_height;
-    }
-
-    /**
-     * Get width of the result object
-     * @return integer
-     */
-    public function getWidth($recalculate = false)
-    {
-        if ($this->_width === null || $recalculate) {
-            $this->_width =
-                abs($this->_calculateWidth() * cos($this->_orientation / 180 * pi()))
-                + abs($this->_calculateHeight() * sin($this->_orientation / 180 * pi()));
-        }
-        return $this->_width;
-    }
-
-    /**
-     * Calculate the offset from the left of the object
-     * if an orientation is activated
-     * @param boolean $recalculate
-     * @return float
-     */
-    public function getOffsetLeft($recalculate = false)
-    {
-        if ($this->_offsetLeft === null || $recalculate) {
-            $this->_offsetLeft = - min(array(
-                0 * cos(
-                        $this->_orientation / 180 * pi()) - 0 * sin(
-                        $this->_orientation / 180 * pi()),
-                0 * cos(
-                        $this->_orientation / 180 * pi()) - $this->_calculateBarcodeHeight() * sin(
-                        $this->_orientation / 180 * pi()),
-                $this->_calculateBarcodeWidth() * cos(
-                        $this->_orientation / 180 * pi()) - $this->_calculateBarcodeHeight() * sin(
-                        $this->_orientation / 180 * pi()),
-                $this->_calculateBarcodeWidth() * cos(
-                        $this->_orientation / 180 * pi()) - 0 * sin(
-                        $this->_orientation / 180 * pi()),
-            ));
-        }
-        return $this->_offsetLeft;
-    }
-
-    /**
-     * Calculate the offset from the top of the object
-     * if an orientation is activated
-     * @param boolean $recalculate
-     * @return float
-     */
-    public function getOffsetTop($recalculate = false)
-    {
-        if ($this->_offsetTop === null || $recalculate) {
-            $this->_offsetTop = - min(array(
-                0 * cos(
-                        $this->_orientation / 180 * pi()) + 0 * sin(
-                        $this->_orientation / 180 * pi()),
-                $this->_calculateBarcodeHeight() * cos(
-                        $this->_orientation / 180 * pi()) + 0 * sin(
-                        $this->_orientation / 180 * pi()),
-                $this->_calculateBarcodeHeight() * cos(
-                        $this->_orientation / 180 * pi()) + $this->_calculateBarcodeWidth() * sin(
-                        $this->_orientation / 180 * pi()),
-                0 * cos(
-                        $this->_orientation / 180 * pi()) + $this->_calculateBarcodeWidth() * sin(
-                        $this->_orientation / 180 * pi()),
-            ));
-        }
-        return $this->_offsetTop;
-    }
-
-    /**
-     * Apply rotation on a point in X/Y dimensions
-     * @param float $x1     x-position before rotation
-     * @param float $y1     y-position before rotation
-     * @return array        Array of two elements corresponding to the new XY point
-     */
-    protected function _rotate($x1, $y1)
-    {
-        $x2 = $x1 * cos($this->_orientation / 180 * pi())
-            - $y1 * sin($this->_orientation / 180 * pi())
-            + $this->getOffsetLeft();
-        $y2 = $y1 * cos($this->_orientation / 180 * pi())
-            + $x1 * sin($this->_orientation / 180 * pi())
-            + $this->getOffsetTop();
-        return array(intval($x2) , intval($y2));
-    }
-
-    /**
-     * Complete drawing of the barcode
-     * @return array Table of instructions
-     */
-    public function draw()
-    {
-        $this->checkParams();
-        $this->_drawBarcode();
-        $this->_drawBorder();
-        $this->_drawText();
-        return $this->getInstructions();
-    }
-
-    /**
-     * Draw the barcode
-     * @return void
-     */
-    protected function _drawBarcode()
-    {
-        $barcodeTable = $this->_prepareBarcode();
-
-        $this->_preDrawBarcode();
-
-        $xpos = (int) $this->_withBorder;
-        $ypos = (int) $this->_withBorder;
-
-        $point1 = $this->_rotate(0, 0);
-        $point2 = $this->_rotate(0, $this->_calculateHeight() - 1);
-        $point3 = $this->_rotate(
-            $this->_calculateWidth() - 1,
-            $this->_calculateHeight() - 1
-        );
-        $point4 = $this->_rotate($this->_calculateWidth() - 1, 0);
-
-        $this->_addPolygon(array(
-            $point1,
-            $point2,
-            $point3,
-            $point4
-        ), $this->_backgroundColor);
-
-        $xpos     += $this->getQuietZone();
-        $barLength = $this->_barHeight * $this->_factor;
-
-        foreach ($barcodeTable as $bar) {
-            $width = $bar[1] * $this->_factor;
-            if ($bar[0]) {
-                $point1 = $this->_rotate($xpos, $ypos + $bar[2] * $barLength);
-                $point2 = $this->_rotate($xpos, $ypos + $bar[3] * $barLength);
-                $point3 = $this->_rotate(
-                    $xpos + $width - 1,
-                    $ypos + $bar[3] * $barLength
-                );
-                $point4 = $this->_rotate(
-                    $xpos + $width - 1,
-                    $ypos + $bar[2] * $barLength
-                );
-                $this->_addPolygon(array(
-                    $point1,
-                    $point2,
-                    $point3,
-                    $point4,
-                ));
-            }
-            $xpos += $width;
-        }
-
-        $this->_postDrawBarcode();
-    }
-
-    /**
-     * Partial function to draw border
-     * @return void
-     */
-    protected function _drawBorder()
-    {
-        if ($this->_withBorder) {
-            $point1 = $this->_rotate(0, 0);
-            $point2 = $this->_rotate($this->_calculateWidth() - 1, 0);
-            $point3 = $this->_rotate(
-                $this->_calculateWidth() - 1,
-                $this->_calculateHeight() - 1
-            );
-            $point4 = $this->_rotate(0, $this->_calculateHeight() - 1);
-            $this->_addPolygon(array(
-                $point1,
-                $point2,
-                $point3,
-                $point4,
-                $point1,
-            ), $this->_foreColor, false);
-        }
-    }
-
-    /**
-     * Partial function to draw text
-     * @return void
-     */
-    protected function _drawText()
-    {
-        if ($this->_drawText) {
-            $text = $this->getTextToDisplay();
-            if ($this->_stretchText) {
-                $textLength = strlen($text);
-                $space      = ($this->_calculateWidth() - 2 * $this->getQuietZone()) / $textLength;
-                for ($i = 0; $i < $textLength; $i ++) {
-                    $leftPosition = $this->getQuietZone() + $space * ($i + 0.5);
-                    $this->_addText(
-                        $text{$i},
-                        $this->_fontSize * $this->_factor,
-                        $this->_rotate(
-                            $leftPosition,
-                            (int) $this->_withBorder * 2
-                                + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
-                        ),
-                        $this->_font,
-                        $this->_foreColor,
-                        'center',
-                        - $this->_orientation
-                    );
-                }
-            } else {
-                $this->_addText(
-                    $text,
-                    $this->_fontSize * $this->_factor,
-                    $this->_rotate(
-                        $this->_calculateWidth() / 2,
-                        (int) $this->_withBorder * 2
-                            + $this->_factor * ($this->_barHeight + $this->_fontSize) + 1
-                    ),
-                    $this->_font,
-                    $this->_foreColor,
-                    'center',
-                    - $this->_orientation
-                );
-            }
-        }
-    }
-
-    /**
-     * Check for invalid characters
-     * @param   string $value    Text to be ckecked
-     * @return void
-     */
-    public function validateText($value)
-    {
-        $this->_validateText($value);
-    }
-
-    /**
-     * Standard validation for most of barcode objects
-     * @param string $value
-     * @param array  $options
-     */
-    protected function _validateText($value, $options = array())
-    {
-        $validatorName = (isset($options['validator'])) ? $options['validator'] : $this->getType();
-
-        $validator = new Zend_Validate_Barcode(array(
-            'adapter'  => $validatorName,
-            'checksum' => false,
-        ));
-
-        $checksumCharacter = '';
-        $withChecksum = false;
-        if ($this->_mandatoryChecksum) {
-            $checksumCharacter = $this->_substituteChecksumCharacter;
-            $withChecksum = true;
-        }
-
-        $value = $this->_addLeadingZeros($value, $withChecksum) . $checksumCharacter;
-
-        if (!$validator->isValid($value)) {
-            $message = implode("\n", $validator->getMessages());
-
-            /**
-             * @see Zend_Barcode_Object_Exception
-             */
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception($message);
-        }
-    }
-
-    /**
-     * Each child must prepare the barcode and return
-     * a table like array(
-     *     0 => array(
-     *         0 => int (visible(black) or not(white))
-     *         1 => int (width of the bar)
-     *         2 => float (0->1 position from the top of the beginning of the bar in %)
-     *         3 => float (0->1 position from the top of the end of the bar in %)
-     *     ),
-     *     1 => ...
-     * )
-     *
-     * @return array
-     */
-    abstract protected function _prepareBarcode();
-
-    /**
-     * Checking of parameters after all settings
-     *
-     * @return void
-     */
-    abstract protected function _checkParams();
-
-    /**
-     * Allow each child to draw something else
-     *
-     * @return void
-     */
-    protected function _preDrawBarcode()
-    {
-    }
-
-    /**
-     * Allow each child to draw something else
-     * (ex: bearer bars in interleaved 2 of 5 code)
-     *
-     * @return void
-     */
-    protected function _postDrawBarcode()
-    {
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Planet.php b/airtime_mvc/library/Zend/Barcode/Object/Planet.php
deleted file mode 100644
index eb346a280..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Planet.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Planet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Postnet
- */
-require_once 'Zend/Barcode/Object/Postnet.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Planet barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet
-{
-
-    /**
-     * Coding map
-     * - 0 = half bar
-     * - 1 = complete bar
-     * @var array
-     */
-    protected $_codingMap = array(
-        0 => "00111",
-        1 => "11100",
-        2 => "11010",
-        3 => "11001",
-        4 => "10110",
-        5 => "10101",
-        6 => "10011",
-        7 => "01110",
-        8 => "01101",
-        9 => "01011"
-    );
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Postnet.php b/airtime_mvc/library/Zend/Barcode/Object/Postnet.php
deleted file mode 100644
index 4e7eced7e..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Postnet.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Postnet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_ObjectAbstract
- */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Postnet barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Postnet extends Zend_Barcode_Object_ObjectAbstract
-{
-
-    /**
-     * Coding map
-     * - 0 = half bar
-     * - 1 = complete bar
-     * @var array
-     */
-    protected $_codingMap = array(
-        0 => "11000",
-        1 => "00011",
-        2 => "00101",
-        3 => "00110",
-        4 => "01001",
-        5 => "01010",
-        6 => "01100",
-        7 => "10001",
-        8 => "10010",
-        9 => "10100"
-    );
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barThinWidth = 2;
-        $this->_barHeight = 20;
-        $this->_drawText = false;
-        $this->_stretchText = true;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (2 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (1 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (10 * $this->_barThinWidth) * $this->_factor * strlen($this->getText());
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Partial check of interleaved Postnet barcode
-     * @return void
-     */
-    protected function _checkParams()
-    {}
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-
-        // Start character (1)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-
-        // Text to encode
-        $textTable = str_split($this->getText());
-        foreach ($textTable as $char) {
-            $bars = str_split($this->_codingMap[$char]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array(1 , $this->_barThinWidth , 0.5 - $b * 0.5 , 1);
-                $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Stop character (1)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $sum = array_sum(str_split($text));
-        $checksum = (10 - ($sum % 10)) % 10;
-        return $checksum;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Royalmail.php b/airtime_mvc/library/Zend/Barcode/Object/Royalmail.php
deleted file mode 100644
index 87052fdb0..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Royalmail.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Royalmail.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_ObjectAbstract
- */
-require_once 'Zend/Barcode/Object/ObjectAbstract.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate Royal maim barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Royalmail extends Zend_Barcode_Object_ObjectAbstract
-{
-
-    /**
-     * Coding map
-     * - 0 = Tracker, Ascender and Descender
-     * - 1 = Tracker and Ascender
-     * - 2 = Tracker and Descender
-     * - 3 = Tracker
-     * @var array
-     */
-    protected $_codingMap = array(
-        '0' => '3300', '1' => '3210', '2' => '3201', '3' => '2310', '4' => '2301', '5' => '2211',
-        '6' => '3120', '7' => '3030', '8' => '3021', '9' => '2130', 'A' => '2121', 'B' => '2031',
-        'C' => '3102', 'D' => '3012', 'E' => '3003', 'F' => '2112', 'G' => '2103', 'H' => '2013',
-        'I' => '1320', 'J' => '1230', 'K' => '1221', 'L' => '0330', 'M' => '0321', 'N' => '0231',
-        'O' => '1302', 'P' => '1212', 'Q' => '1203', 'R' => '0312', 'S' => '0303', 'T' => '0213',
-        'U' => '1122', 'V' => '1032', 'W' => '1023', 'X' => '0132', 'Y' => '0123', 'Z' => '0033'
-    );
-
-    protected $_rows = array(
-        '0' => 1, '1' => 1, '2' => 1, '3' => 1, '4' => 1, '5' => 1,
-        '6' => 2, '7' => 2, '8' => 2, '9' => 2, 'A' => 2, 'B' => 2,
-        'C' => 3, 'D' => 3, 'E' => 3, 'F' => 3, 'G' => 3, 'H' => 3,
-        'I' => 4, 'J' => 4, 'K' => 4, 'L' => 4, 'M' => 4, 'N' => 4,
-        'O' => 5, 'P' => 5, 'Q' => 5, 'R' => 5, 'S' => 5, 'T' => 5,
-        'U' => 0, 'V' => 0, 'W' => 0, 'X' => 0, 'Y' => 0, 'Z' => 0,
-    );
-
-    protected $_columns = array(
-        '0' => 1, '1' => 2, '2' => 3, '3' => 4, '4' => 5, '5' => 0,
-        '6' => 1, '7' => 2, '8' => 3, '9' => 4, 'A' => 5, 'B' => 0,
-        'C' => 1, 'D' => 2, 'E' => 3, 'F' => 4, 'G' => 5, 'H' => 0,
-        'I' => 1, 'J' => 2, 'K' => 3, 'L' => 4, 'M' => 5, 'N' => 0,
-        'O' => 1, 'P' => 2, 'Q' => 3, 'R' => 4, 'S' => 5, 'T' => 0,
-        'U' => 1, 'V' => 2, 'W' => 3, 'X' => 4, 'Y' => 5, 'Z' => 0,
-    );
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barThinWidth = 2;
-        $this->_barHeight = 20;
-        $this->_drawText = false;
-        $this->_stretchText = true;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (2 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (1 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (8 * $this->_barThinWidth) * $this->_factor * strlen($this->getText());
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Partial check of interleaved Postnet barcode
-     * @return void
-     */
-    protected function _checkParams()
-    {}
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-
-        // Start character (1)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 5/8);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-
-        // Text to encode
-        $textTable = str_split($this->getText());
-        foreach ($textTable as $char) {
-            $bars = str_split($this->_codingMap[$char]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array(1 , $this->_barThinWidth , ($b > 1 ? 3/8 : 0) , ($b % 2 ? 5/8 : 1));
-                $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Stop character (1)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , 1);
-        return $barcodeTable;
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $this->_checkText($text);
-        $values   = str_split($text);
-        $rowvalue = 0;
-        $colvalue = 0;
-        foreach($values as $row) {
-            $rowvalue += $this->_rows[$row];
-            $colvalue += $this->_columns[$row];
-        }
-
-        $rowvalue %= 6;
-        $colvalue %= 6;
-
-        $rowchkvalue = array_keys($this->_rows, $rowvalue);
-        $colchkvalue = array_keys($this->_columns, $colvalue);
-        return current(array_intersect($rowchkvalue, $colchkvalue));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Upca.php b/airtime_mvc/library/Zend/Barcode/Object/Upca.php
deleted file mode 100644
index f34225987..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Upca.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Upca.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Ean13
- */
-require_once 'Zend/Barcode/Object/Ean13.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate UpcA barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Upca extends Zend_Barcode_Object_Ean13
-{
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 12;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (3 * $this->_barThinWidth) * $this->_factor;
-        $middleCharacter = (5 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (3 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (7 * $this->_barThinWidth) * $this->_factor * 12;
-        return $quietZone + $startCharacter + $middleCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-        /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-        $height = ($this->_drawText) ? 1.1 : 1;
-
-        // Start character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-
-        $textTable = str_split($this->getText());
-
-        // First character
-        $bars = str_split($this->_codingMap['A'][$textTable[0]]);
-        foreach ($bars as $b) {
-            $barcodeTable[] = array($b , $this->_barThinWidth , 0 , $height);
-        }
-
-        // First part
-        for ($i = 1; $i < 6; $i++) {
-            $bars = str_split($this->_codingMap['A'][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Middle character (01010)
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-
-        // Second part
-        for ($i = 6; $i < 11; $i++) {
-            $bars = str_split($this->_codingMap['C'][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Last character
-        $bars = str_split($this->_codingMap['C'][$textTable[11]]);
-        foreach ($bars as $b) {
-            $barcodeTable[] = array($b , $this->_barThinWidth , 0 , $height);
-        }
-
-        // Stop character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        return $barcodeTable;
-    }
-
-    /**
-     * Partial function to draw text
-     * @return void
-     */
-    protected function _drawText()
-    {
-        if ($this->_drawText) {
-            $text = $this->getTextToDisplay();
-            $characterWidth = (7 * $this->_barThinWidth) * $this->_factor;
-            $leftPosition = $this->getQuietZone() - $characterWidth;
-            for ($i = 0; $i < $this->_barcodeLength; $i ++) {
-                $fontSize = $this->_fontSize;
-                if ($i == 0 || $i == 11) {
-                    $fontSize *= 0.8;
-                }
-                $this->_addText(
-                    $text{$i},
-                    $fontSize * $this->_factor,
-                    $this->_rotate(
-                        $leftPosition,
-                        (int) $this->_withBorder * 2
-                            + $this->_factor * ($this->_barHeight + $fontSize) + 1
-                    ),
-                    $this->_font,
-                    $this->_foreColor,
-                    'left',
-                    - $this->_orientation
-                );
-                switch ($i) {
-                    case 0:
-                        $factor = 10;
-                        break;
-                    case 5:
-                        $factor = 4;
-                        break;
-                    case 10:
-                        $factor = 11;
-                        break;
-                    default:
-                        $factor = 0;
-                }
-                $leftPosition = $leftPosition + $characterWidth + ($factor * $this->_barThinWidth * $this->_factor);
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Object/Upce.php b/airtime_mvc/library/Zend/Barcode/Object/Upce.php
deleted file mode 100644
index 82098603d..000000000
--- a/airtime_mvc/library/Zend/Barcode/Object/Upce.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Object
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Upce.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Barcode_Object_Ean13
- */
-require_once 'Zend/Barcode/Object/Ean13.php';
-
-/**
- * @see Zend_Validate_Barcode
- */
-require_once 'Zend/Validate/Barcode.php';
-
-/**
- * Class for generate UpcA barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13
-{
-
-    protected $_parities = array(
-        0 => array(
-            0 => array('B','B','B','A','A','A'),
-            1 => array('B','B','A','B','A','A'),
-            2 => array('B','B','A','A','B','A'),
-            3 => array('B','B','A','A','A','B'),
-            4 => array('B','A','B','B','A','A'),
-            5 => array('B','A','A','B','B','A'),
-            6 => array('B','A','A','A','B','B'),
-            7 => array('B','A','B','A','B','A'),
-            8 => array('B','A','B','A','A','B'),
-            9 => array('B','A','A','B','A','B')),
-        1 => array(
-            0 => array('A','A','A','B','B','B'),
-            1 => array('A','A','B','A','B','B'),
-            2 => array('A','A','B','B','A','B'),
-            3 => array('A','A','B','B','B','A'),
-            4 => array('A','B','A','A','B','B'),
-            5 => array('A','B','B','A','A','B'),
-            6 => array('A','B','B','B','A','A'),
-            7 => array('A','B','A','B','A','B'),
-            8 => array('A','B','A','B','B','A'),
-            9 => array('A','B','B','A','B','A'))
-    );
-
-    /**
-     * Default options for Postnet barcode
-     * @return void
-     */
-    protected function _getDefaultOptions()
-    {
-        $this->_barcodeLength = 8;
-        $this->_mandatoryChecksum = true;
-    }
-
-    /**
-     * Retrieve text to encode
-     * @return string
-     */
-    public function getText()
-    {
-        $text = parent::getText();
-        if ($text{0} != 1) {
-            $text{0} = 0;
-        }
-        return $text;
-    }
-
-    /**
-     * Width of the barcode (in pixels)
-     * @return integer
-     */
-    protected function _calculateBarcodeWidth()
-    {
-        $quietZone       = $this->getQuietZone();
-        $startCharacter  = (3 * $this->_barThinWidth) * $this->_factor;
-        $stopCharacter   = (6 * $this->_barThinWidth) * $this->_factor;
-        $encodedData     = (7 * $this->_barThinWidth) * $this->_factor * 6;
-        return $quietZone + $startCharacter + $encodedData + $stopCharacter + $quietZone;
-    }
-
-    /**
-     * Prepare array to draw barcode
-     * @return array
-     */
-    protected function _prepareBarcode()
-    {
-        $barcodeTable = array();
-        $height = ($this->_drawText) ? 1.1 : 1;
-
-        // Start character (101)
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-
-        $textTable = str_split($this->getText());
-        $system = 0;
-        if ($textTable[0] == 1) {
-            $system = 1;
-        }
-        $checksum = $textTable[7];
-        $parity = $this->_parities[$system][$checksum];
-
-        for ($i = 1; $i < 7; $i++) {
-            $bars = str_split($this->_codingMap[$parity[$i - 1]][$textTable[$i]]);
-            foreach ($bars as $b) {
-                $barcodeTable[] = array($b , $this->_barThinWidth , 0 , 1);
-            }
-        }
-
-        // Stop character (10101)
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(0 , $this->_barThinWidth , 0 , $height);
-        $barcodeTable[] = array(1 , $this->_barThinWidth , 0 , $height);
-        return $barcodeTable;
-    }
-
-    /**
-     * Partial function to draw text
-     * @return void
-     */
-    protected function _drawText()
-    {
-        if ($this->_drawText) {
-            $text = $this->getTextToDisplay();
-            $characterWidth = (7 * $this->_barThinWidth) * $this->_factor;
-            $leftPosition = $this->getQuietZone() - $characterWidth;
-            for ($i = 0; $i < $this->_barcodeLength; $i ++) {
-                $fontSize = $this->_fontSize;
-                if ($i == 0 || $i == 7) {
-                    $fontSize *= 0.8;
-                }
-                $this->_addText(
-                    $text{$i},
-                    $fontSize * $this->_factor,
-                    $this->_rotate(
-                        $leftPosition,
-                        (int) $this->_withBorder * 2
-                            + $this->_factor * ($this->_barHeight + $fontSize) + 1
-                    ),
-                    $this->_font,
-                    $this->_foreColor,
-                    'left',
-                    - $this->_orientation
-                );
-                switch ($i) {
-                    case 0:
-                        $factor = 3;
-                        break;
-                    case 6:
-                        $factor = 5;
-                        break;
-                    default:
-                        $factor = 0;
-                }
-                $leftPosition = $leftPosition + $characterWidth + ($factor * $this->_barThinWidth * $this->_factor);
-            }
-        }
-    }
-
-    /**
-     * Particular validation for Upce barcode objects
-     * (to suppress checksum character substitution)
-     * @param string $value
-     * @param array  $options
-     */
-    protected function _validateText($value, $options = array())
-    {
-        $validator = new Zend_Validate_Barcode(array(
-            'adapter'  => 'upce',
-            'checksum' => false,
-        ));
-
-        $value = $this->_addLeadingZeros($value, true);
-
-        if (!$validator->isValid($value)) {
-            $message = implode("\n", $validator->getMessages());
-
-            /**
-             * @see Zend_Barcode_Object_Exception
-             */
-            require_once 'Zend/Barcode/Object/Exception.php';
-            throw new Zend_Barcode_Object_Exception($message);
-        }
-    }
-
-    /**
-     * Get barcode checksum
-     *
-     * @param  string $text
-     * @return int
-     */
-    public function getChecksum($text)
-    {
-        $text = $this->_addLeadingZeros($text, true);
-        if ($text{0} != 1) {
-            $text{0} = 0;
-        }
-        return parent::getChecksum($text);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Renderer/Exception.php b/airtime_mvc/library/Zend/Barcode/Renderer/Exception.php
deleted file mode 100644
index b230884ed..000000000
--- a/airtime_mvc/library/Zend/Barcode/Renderer/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to version 1.0 of the Zend Framework
- * license, that is bundled with this package in the file LICENSE.txt, and
- * is available through the world-wide-web at the following URL:
- * http://framework.zend.com/license/new-bsd. If you did not receive
- * a copy of the Zend Framework license and are unable to obtain it
- * through the world-wide-web, please send a note to license@zend.com
- * so we can mail you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Exception */
-require_once 'Zend/Barcode/Exception.php';
-
-/**
- * Zend_Barcode_Renderer_Exception
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Renderer_Exception extends Zend_Barcode_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Renderer/Image.php b/airtime_mvc/library/Zend/Barcode/Renderer/Image.php
deleted file mode 100644
index 1ce257523..000000000
--- a/airtime_mvc/library/Zend/Barcode/Renderer/Image.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20367 2010-01-18 04:51:23Z ralph $
- */
-
-/** @see Zend_Barcode_Renderer_RendererAbstract*/
-require_once 'Zend/Barcode/Renderer/RendererAbstract.php';
-
-/**
- * Class for rendering the barcode as image
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract
-{
-    /**
-     * List of authorized output format
-     * @var array
-     */
-    protected $_allowedImageType = array(
-        'png',
-        'jpeg',
-        'gif',
-    );
-
-    /**
-     * Image format
-     * @var string
-     */
-    protected $_imageType = 'png';
-
-    /**
-     * Resource for the image
-     * @var resource
-     */
-    protected $_resource = null;
-
-    /**
-     * Resource for the font and bars color of the image
-     * @var integer
-     */
-    protected $_imageForeColor = null;
-
-    /**
-     * Resource for the background color of the image
-     * @var integer
-     */
-    protected $_imageBackgroundColor = null;
-
-    /**
-     * Height of the rendered image wanted by user
-     * @var integer
-     */
-    protected $_userHeight = 0;
-
-    /**
-     * Width of the rendered image wanted by user
-     * @var integer
-     */
-    protected $_userWidth = 0;
-
-    public function __construct($options = null)
-    {
-        if (!function_exists('gd_info')) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception('Zend_Barcode_Renderer_Image requires the GD extension');
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * Set height of the result image
-     * @param null|integer $value
-     * @return Zend_Image_Barcode_Abstract
-     * @throw Zend_Image_Barcode_Exception
-     */
-    public function setHeight($value)
-    {
-        if (!is_numeric($value) || intval($value) < 0) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Image height must be greater than or equals 0'
-            );
-        }
-        $this->_userHeight = intval($value);
-        return $this;
-    }
-
-    /**
-     * Get barcode height
-     *
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->_userHeight;
-    }
-
-    /**
-     * Set barcode width
-     *
-     * @param mixed $value
-     * @return void
-     */
-    public function setWidth($value)
-    {
-        if (!is_numeric($value) || intval($value) < 0) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Image width must be greater than or equals 0'
-            );
-        }
-        $this->_userWidth = intval($value);
-        return $this;
-    }
-
-    /**
-     * Get barcode width
-     *
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->_userWidth;
-    }
-
-    /**
-     * Set an image resource to draw the barcode inside
-     *
-     * @param resource $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setResource($image)
-    {
-        if (gettype($image) != 'resource' || get_resource_type($image) != 'gd') {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Invalid image resource provided to setResource()'
-            );
-        }
-        $this->_resource = $image;
-        return $this;
-    }
-
-    /**
-     * Set the image type to produce (png, jpeg, gif)
-     *
-     * @param string $value
-     * @return Zend_Barcode_RendererAbstract
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setImageType($value)
-    {
-        if ($value == 'jpg') {
-            $value = 'jpeg';
-        }
-
-        if (!in_array($value, $this->_allowedImageType)) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(sprintf(
-                'Invalid type "%s" provided to setImageType()',
-                $value
-            ));
-        }
-
-        $this->_imageType = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve the image type to produce
-     *
-     * @return string
-     */
-    public function getImageType()
-    {
-        return $this->_imageType;
-    }
-
-    /**
-     * Initialize the image resource
-     *
-     * @return void
-     */
-    protected function _initRenderer()
-    {
-        if (!extension_loaded('gd')) {
-            require_once 'Zend/Barcode/Exception.php';
-            $e = new Zend_Barcode_Exception(
-                'Gd extension must be loaded to render barcode as image'
-            );
-            $e->setIsRenderable(false);
-            throw $e;
-        }
-
-        $barcodeWidth  = $this->_barcode->getWidth(true);
-        $barcodeHeight = $this->_barcode->getHeight(true);
-
-        if ($this->_resource !== null) {
-            $foreColor       = $this->_barcode->getForeColor();
-            $backgroundColor = $this->_barcode->getBackgroundColor();
-            $this->_imageBackgroundColor = imagecolorallocate(
-                $this->_resource,
-                ($backgroundColor & 0xFF0000) >> 16,
-                ($backgroundColor & 0x00FF00) >> 8,
-                $backgroundColor & 0x0000FF
-            );
-            $this->_imageForeColor = imagecolorallocate(
-                $this->_resource,
-                ($foreColor & 0xFF0000) >> 16,
-                ($foreColor & 0x00FF00) >> 8,
-                $foreColor & 0x0000FF
-            );
-        } else {
-            $width = $barcodeWidth;
-            $height = $barcodeHeight;
-            if ($this->_userWidth && $this->_barcode->getType() != 'error') {
-                $width = $this->_userWidth;
-            }
-            if ($this->_userHeight && $this->_barcode->getType() != 'error') {
-                $height = $this->_userHeight;
-            }
-
-            $foreColor       = $this->_barcode->getForeColor();
-            $backgroundColor = $this->_barcode->getBackgroundColor();
-            $this->_resource = imagecreatetruecolor($width, $height);
-
-            $this->_imageBackgroundColor = imagecolorallocate(
-                $this->_resource,
-                ($backgroundColor & 0xFF0000) >> 16,
-                ($backgroundColor & 0x00FF00) >> 8,
-                $backgroundColor & 0x0000FF
-            );
-            $this->_imageForeColor = imagecolorallocate(
-                $this->_resource,
-                ($foreColor & 0xFF0000) >> 16,
-                ($foreColor & 0x00FF00) >> 8,
-                $foreColor & 0x0000FF
-            );
-            $white = imagecolorallocate($this->_resource, 255, 255, 255);
-            imagefilledrectangle($this->_resource, 0, 0, $width - 1, $height - 1, $white);
-        }
-        $this->_adjustPosition(imagesy($this->_resource), imagesx($this->_resource));
-        imagefilledrectangle(
-            $this->_resource,
-            $this->_leftOffset,
-            $this->_topOffset,
-            $this->_leftOffset + $barcodeWidth - 1,
-            $this->_topOffset + $barcodeHeight - 1,
-            $this->_imageBackgroundColor
-        );
-    }
-
-    /**
-     * Check barcode parameters
-     *
-     * @return void
-     */
-    protected function _checkParams()
-    {
-        $this->_checkDimensions();
-    }
-
-    /**
-     * Check barcode dimensions
-     *
-     * @return void
-     */
-    protected function _checkDimensions()
-    {
-        if ($this->_resource !== null) {
-            if (imagesy($this->_resource) < $this->_barcode->getHeight(true)) {
-                require_once 'Zend/Barcode/Renderer/Exception.php';
-                throw new Zend_Barcode_Renderer_Exception(
-                    'Barcode is define outside the image (height)'
-                );
-            }
-        } else {
-            if ($this->_userHeight) {
-                $height = $this->_barcode->getHeight(true);
-                if ($this->_userHeight < $height) {
-                    require_once 'Zend/Barcode/Renderer/Exception.php';
-                    throw new Zend_Barcode_Renderer_Exception(sprintf(
-                        "Barcode is define outside the image (calculated: '%d', provided: '%d')",
-                        $height,
-                        $this->_userHeight
-                    ));
-                }
-            }
-        }
-        if ($this->_resource !== null) {
-            if (imagesx($this->_resource) < $this->_barcode->getWidth(true)) {
-                require_once 'Zend/Barcode/Renderer/Exception.php';
-                throw new Zend_Barcode_Renderer_Exception(
-                    'Barcode is define outside the image (width)'
-                );
-            }
-        } else {
-            if ($this->_userWidth) {
-                $width = $this->_barcode->getWidth(true);
-                if ($this->_userWidth < $width) {
-                    require_once 'Zend/Barcode/Renderer/Exception.php';
-                    throw new Zend_Barcode_Renderer_Exception(sprintf(
-                        "Barcode is define outside the image (calculated: '%d', provided: '%d')",
-                        $width,
-                        $this->_userWidth
-                    ));
-                }
-            }
-        }
-    }
-
-    /**
-     * Draw and render the barcode with correct headers
-     *
-     * @return mixed
-     */
-    public function render()
-    {
-        $this->draw();
-        header("Content-Type: image/" . $this->_imageType);
-        $functionName = 'image' . $this->_imageType;
-        call_user_func($functionName, $this->_resource);
-        @imagedestroy($this->_resource);
-    }
-
-    /**
-     * Draw a polygon in the image resource
-     *
-     * @param array $points
-     * @param integer $color
-     * @param boolean $filled
-     */
-    protected function _drawPolygon($points, $color, $filled = true)
-    {
-        $newPoints = array(
-            $points[0][0] + $this->_leftOffset,
-            $points[0][1] + $this->_topOffset,
-            $points[1][0] + $this->_leftOffset,
-            $points[1][1] + $this->_topOffset,
-            $points[2][0] + $this->_leftOffset,
-            $points[2][1] + $this->_topOffset,
-            $points[3][0] + $this->_leftOffset,
-            $points[3][1] + $this->_topOffset,
-        );
-
-        $allocatedColor = imagecolorallocate(
-            $this->_resource,
-            ($color & 0xFF0000) >> 16,
-            ($color & 0x00FF00) >> 8,
-            $color & 0x0000FF
-        );
-
-        if ($filled) {
-            imagefilledpolygon($this->_resource, $newPoints, 4, $allocatedColor);
-        } else {
-            imagepolygon($this->_resource, $newPoints, 4, $allocatedColor);
-        }
-    }
-
-    /**
-     * Draw a polygon in the image resource
-     *
-     * @param string $text
-     * @param float $size
-     * @param array $position
-     * @param string $font
-     * @param integer $color
-     * @param string $alignment
-     * @param float $orientation
-     */
-    protected function _drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
-    {
-        $allocatedColor = imagecolorallocate(
-            $this->_resource,
-            ($color & 0xFF0000) >> 16,
-            ($color & 0x00FF00) >> 8,
-            $color & 0x0000FF
-        );
-
-        if ($font == null) {
-            $font = 3;
-        }
-        $position[0] += $this->_leftOffset;
-        $position[1] += $this->_topOffset;
-
-        if (is_numeric($font)) {
-            if ($orientation) {
-                /**
-                 * imagestring() doesn't allow orientation, if orientation
-                 * needed: a TTF font is required.
-                 * Throwing an exception here, allow to use automaticRenderError
-                 * to informe user of the problem instead of simply not drawing
-                 * the text
-                 */
-                require_once 'Zend/Barcode/Renderer/Exception.php';
-                throw new Zend_Barcode_Renderer_Exception(
-                    'No orientation possible with GD internal font'
-                );
-            }
-            $fontWidth = imagefontwidth($font);
-            $positionY = $position[1] - imagefontheight($font) + 1;
-            switch ($alignment) {
-                case 'left':
-                    $positionX = $position[0];
-                    break;
-                case 'center':
-                    $positionX = $position[0] - ceil(($fontWidth * strlen($text)) / 2);
-                    break;
-                case 'right':
-                    $positionX = $position[0] - ($fontWidth * strlen($text));
-                    break;
-            }
-            imagestring($this->_resource, $font, $positionX, $positionY, $text, $color);
-        } else {
-            
-            if (!function_exists('imagettfbbox')) {
-                require_once 'Zend/Barcode/Renderer/Exception.php';
-                throw new Zend_Barcode_Renderer_Exception(
-                    'A font was provided, but this instance of PHP does not have TTF (FreeType) support'
-                    );
-            }
-            
-            $box = imagettfbbox($size, 0, $font, $text);
-            switch ($alignment) {
-                case 'left':
-                    $width = 0;
-                    break;
-                case 'center':
-                    $width = ($box[2] - $box[0]) / 2;
-                    break;
-                case 'right':
-                    $width = ($box[2] - $box[0]);
-                    break;
-            }
-            imagettftext(
-                $this->_resource,
-                $size,
-                $orientation,
-                $position[0] - ($width * cos(pi() * $orientation / 180)),
-                $position[1] + ($width * sin(pi() * $orientation / 180)),
-                $allocatedColor,
-                $font,
-                $text
-            );
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Renderer/Pdf.php b/airtime_mvc/library/Zend/Barcode/Renderer/Pdf.php
deleted file mode 100644
index 402d09fc4..000000000
--- a/airtime_mvc/library/Zend/Barcode/Renderer/Pdf.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pdf.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Barcode_Renderer_RendererAbstract */
-require_once 'Zend/Barcode/Renderer/RendererAbstract.php';
-
-/** @see Zend_Pdf */
-require_once 'Zend/Pdf.php';
-
-/** @see Zend_Pdf_Page */
-require_once 'Zend/Pdf/Page.php';
-
-/** @see Zend_Pdf_Color_Rgb */
-require_once 'Zend/Pdf/Color/Rgb.php';
-
-/**
- * Class for rendering the barcode in PDF resource
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract
-{
-    /**
-     * PDF resource
-     * @var Zend_Pdf
-     */
-    protected $_resource = null;
-
-    /**
-     * Page number in PDF resource
-     * @var integer
-     */
-    protected $_page = 0;
-
-    /**
-     * Module size rendering
-     * @var float
-     */
-    protected $_moduleSize = 0.5;
-
-    /**
-     * Set an image resource to draw the barcode inside
-     * @param resource $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setResource($pdf, $page = 0)
-    {
-        if (!$pdf instanceof Zend_Pdf) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Invalid Zend_Pdf resource provided to setResource()'
-            );
-        }
-
-        $this->_resource = $pdf;
-        $this->_page     = intval($page);
-
-        if (!count($this->_resource->pages)) {
-            $this->_page = 0;
-            $this->_resource->pages[] = new Zend_Pdf_Page(
-                Zend_Pdf_Page::SIZE_A4
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Check renderer parameters
-     *
-     * @return void
-     */
-    protected function _checkParams()
-    {
-    }
-
-    /**
-     * Draw the barcode in the PDF, send headers and the PDF
-     * @return mixed
-     */
-    public function render()
-    {
-        $this->draw();
-        header("Content-Type: application/pdf");
-        echo $this->_resource->render();
-    }
-
-    /**
-     * Initialize the PDF resource
-     * @return void
-     */
-    protected function _initRenderer()
-    {
-        if ($this->_resource === null) {
-            $this->_resource = new Zend_Pdf();
-            $this->_resource->pages[] = new Zend_Pdf_Page(
-                Zend_Pdf_Page::SIZE_A4
-            );
-        }
-
-        $pdfPage = $this->_resource->pages[$this->_page];
-        $this->_adjustPosition($pdfPage->getHeight(), $pdfPage->getWidth());
-    }
-
-    /**
-     * Draw a polygon in the rendering resource
-     * @param array $points
-     * @param integer $color
-     * @param boolean $filled
-     */
-    protected function _drawPolygon($points, $color, $filled = true)
-    {
-        $page = $this->_resource->pages[$this->_page];
-        foreach ($points as $point) {
-            $x[] = $point[0] * $this->_moduleSize + $this->_leftOffset;
-            $y[] = $page->getHeight() - $point[1] * $this->_moduleSize - $this->_topOffset;
-        }
-        if (count($y) == 4) {
-            if ($x[0] != $x[3] && $y[0] == $y[3]) {
-                $y[0] -= ($this->_moduleSize / 2);
-                $y[3] -= ($this->_moduleSize / 2);
-            }
-            if ($x[1] != $x[2] && $y[1] == $y[2]) {
-                $y[1] += ($this->_moduleSize / 2);
-                $y[2] += ($this->_moduleSize / 2);
-            }
-        }
-
-        $color = new Zend_Pdf_Color_RGB(
-            ($color & 0xFF0000) >> 16,
-            ($color & 0x00FF00) >> 8,
-            $color & 0x0000FF
-        );
-
-        $page->setLineColor($color);
-        $page->setFillColor($color);
-        $page->setLineWidth($this->_moduleSize);
-
-        $fillType = ($filled)
-                  ? Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE
-                  : Zend_Pdf_Page::SHAPE_DRAW_STROKE;
-
-        $page->drawPolygon($x, $y, $fillType);
-    }
-
-    /**
-     * Draw a polygon in the rendering resource
-     * @param string $text
-     * @param float $size
-     * @param array $position
-     * @param string $font
-     * @param integer $color
-     * @param string $alignment
-     * @param float $orientation
-     */
-    protected function _drawText(
-        $text,
-        $size,
-        $position,
-        $font,
-        $color,
-        $alignment = 'center',
-        $orientation = 0
-    ) {
-        $page  = $this->_resource->pages[$this->_page];
-        $color = new Zend_Pdf_Color_RGB(
-            ($color & 0xFF0000) >> 16,
-            ($color & 0x00FF00) >> 8,
-            $color & 0x0000FF
-        );
-
-        $page->setLineColor($color);
-        $page->setFillColor($color);
-        $page->setFont(Zend_Pdf_Font::fontWithPath($font), $size * $this->_moduleSize * 1.2);
-
-        $width = $this->widthForStringUsingFontSize(
-            $text,
-            Zend_Pdf_Font::fontWithPath($font),
-            $size * $this->_moduleSize
-        );
-
-        $angle = pi() * $orientation / 180;
-        $left = $position[0] * $this->_moduleSize + $this->_leftOffset;
-        $top  = $page->getHeight() - $position[1] * $this->_moduleSize - $this->_topOffset;
-
-        switch ($alignment) {
-            case 'center':
-                $left -= ($width / 2) * cos($angle);
-                $top  -= ($width / 2) * sin($angle);
-                break;
-            case 'right':
-                $left -= $width;
-                break;
-        }
-        $page->rotate($left, $top, $angle);
-        $page->drawText($text, $left, $top);
-        $page->rotate($left, $top, - $angle);
-    }
-
-    /**
-     * Calculate the width of a string:
-     * in case of using alignment parameter in drawText
-     * @param string $text
-     * @param Zend_Pdf_Font $font
-     * @param float $fontSize
-     * @return float
-     */
-    public function widthForStringUsingFontSize($text, $font, $fontSize)
-    {
-        $drawingString = iconv('UTF-8', 'UTF-16BE//IGNORE', $text);
-        $characters    = array();
-        for ($i = 0; $i < strlen($drawingString); $i ++) {
-            $characters[] = (ord($drawingString[$i ++]) << 8) | ord($drawingString[$i]);
-        }
-        $glyphs = $font->glyphNumbersForCharacters($characters);
-        $widths = $font->widthsForGlyphs($glyphs);
-        $stringWidth = (array_sum($widths) / $font->getUnitsPerEm()) * $fontSize;
-        return $stringWidth;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Barcode/Renderer/RendererAbstract.php b/airtime_mvc/library/Zend/Barcode/Renderer/RendererAbstract.php
deleted file mode 100644
index 4abcaeea0..000000000
--- a/airtime_mvc/library/Zend/Barcode/Renderer/RendererAbstract.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 20316 2010-01-15 22:27:00Z mikaelkael $
- */
-
-/**
- * Class for rendering the barcode
- *
- * @category   Zend
- * @package    Zend_Barcode
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Barcode_Renderer_RendererAbstract
-{
-    /**
-     * Namespace of the renderer for autoloading
-     * @var string
-     */
-    protected $_rendererNamespace = 'Zend_Barcode_Renderer';
-
-    /**
-     * Renderer type
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * Activate/Deactivate the automatic rendering of exception
-     * @var boolean
-     */
-    protected $_automaticRenderError = false;
-
-    /**
-     * Offset of the barcode from the top of the rendering resource
-     * @var integer
-     */
-    protected $_topOffset = 0;
-
-    /**
-     * Offset of the barcode from the left of the rendering resource
-     * @var integer
-     */
-    protected $_leftOffset = 0;
-
-    /**
-     * Horizontal position of the barcode in the rendering resource
-     * @var integer
-     */
-    protected $_horizontalPosition = 'left';
-
-    /**
-     * Vertical position of the barcode in the rendering resource
-     * @var integer
-     */
-    protected $_verticalPosition = 'top';
-
-    /**
-     * Module size rendering
-     * @var float
-     */
-    protected $_moduleSize = 1;
-
-    /**
-     * Barcode object
-     * @var Zend_Barcode_Object
-     */
-    protected $_barcode;
-
-    /**
-     * Drawing resource
-     */
-    protected $_resource;
-
-    /**
-     * Constructor
-     * @param array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-        $this->_type = strtolower(substr(
-            get_class($this),
-            strlen($this->_rendererNamespace) + 1
-        ));
-    }
-
-    /**
-     * Set renderer state from options array
-     * @param  array $options
-     * @return Zend_Renderer_Object
-     */
-    public function setOptions($options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set renderer state from config object
-     * @param Zend_Config $config
-     * @return Zend_Renderer_Object
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set renderer namespace for autoloading
-     *
-     * @param string $namespace
-     * @return Zend_Renderer_Object
-     */
-    public function setRendererNamespace($namespace)
-    {
-        $this->_rendererNamespace = $namespace;
-        return $this;
-    }
-
-    /**
-     * Retrieve renderer namespace
-     *
-     * @return string
-     */
-    public function getRendererNamespace()
-    {
-        return $this->_rendererNamespace;
-    }
-
-    /**
-     * Retrieve renderer type
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Manually adjust top position
-     * @param integer $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setTopOffset($value)
-    {
-        if (!is_numeric($value) || intval($value) < 0) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Vertical position must be greater than or equals 0'
-            );
-        }
-        $this->_topOffset = intval($value);
-        return $this;
-    }
-
-    /**
-     * Retrieve vertical adjustment
-     * @return integer
-     */
-    public function getTopOffset()
-    {
-        return $this->_topOffset;
-    }
-
-    /**
-     * Manually adjust left position
-     * @param integer $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setLeftOffset($value)
-    {
-        if (!is_numeric($value) || intval($value) < 0) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Horizontal position must be greater than or equals 0'
-            );
-        }
-        $this->_leftOffset = intval($value);
-        return $this;
-    }
-
-    /**
-     * Retrieve vertical adjustment
-     * @return integer
-     */
-    public function getLeftOffset()
-    {
-        return $this->_leftOffset;
-    }
-
-    /**
-     * Activate/Deactivate the automatic rendering of exception
-     * @param boolean $value
-     */
-    public function setAutomaticRenderError($value)
-    {
-        $this->_automaticRenderError = (bool) $value;
-        return $this;
-    }
-
-    /**
-     * Horizontal position of the barcode in the rendering resource
-     * @param string $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setHorizontalPosition($value)
-    {
-        if (!in_array($value, array('left' , 'center' , 'right'))) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                "Invalid barcode position provided must be 'left', 'center' or 'right'"
-            );
-        }
-        $this->_horizontalPosition = $value;
-        return $this;
-    }
-
-    /**
-     * Horizontal position of the barcode in the rendering resource
-     * @return string
-     */
-    public function getHorizontalPosition()
-    {
-        return $this->_horizontalPosition;
-    }
-
-    /**
-     * Vertical position of the barcode in the rendering resource
-     * @param string $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setVerticalPosition($value)
-    {
-        if (!in_array($value, array('top' , 'middle' , 'bottom'))) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                "Invalid barcode position provided must be 'top', 'middle' or 'bottom'"
-            );
-        }
-        $this->_verticalPosition = $value;
-        return $this;
-    }
-
-    /**
-     * Vertical position of the barcode in the rendering resource
-     * @return string
-     */
-    public function getVerticalPosition()
-    {
-        return $this->_verticalPosition;
-    }
-
-    /**
-     * Set the size of a module
-     * @param float $value
-     * @return Zend_Barcode_Renderer
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    public function setModuleSize($value)
-    {
-        if (!is_numeric($value) || floatval($value) <= 0) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Float size must be greater than 0'
-            );
-        }
-        $this->_moduleSize = floatval($value);
-        return $this;
-    }
-
-
-    /**
-     * Set the size of a module
-     * @return float
-     */
-    public function getModuleSize()
-    {
-        return $this->_moduleSize;
-    }
-
-    /**
-     * Retrieve the automatic rendering of exception
-     * @return boolean
-     */
-    public function getAutomaticRenderError()
-    {
-        return $this->_automaticRenderError;
-    }
-
-    /**
-     * Set the barcode object
-     * @param Zend_Barcode_Object $barcode
-     * @return Zend_Barcode_Renderer
-     */
-    public function setBarcode($barcode)
-    {
-        if (!$barcode instanceof Zend_Barcode_Object_ObjectAbstract) {
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'Invalid barcode object provided to setBarcode()'
-            );
-        }
-        $this->_barcode = $barcode;
-        return $this;
-    }
-
-    /**
-     * Retrieve the barcode object
-     * @return Zend_Barcode_Object
-     */
-    public function getBarcode()
-    {
-        return $this->_barcode;
-    }
-
-    /**
-     * Checking of parameters after all settings
-     * @return boolean
-     */
-    public function checkParams()
-    {
-        $this->_checkBarcodeObject();
-        $this->_checkParams();
-        return true;
-    }
-
-    /**
-     * Check if a barcode object is correctly provided
-     * @return void
-     * @throw Zend_Barcode_Renderer_Exception
-     */
-    protected function _checkBarcodeObject()
-    {
-        if ($this->_barcode === null) {
-            /**
-             * @see Zend_Barcode_Renderer_Exception
-             */
-            require_once 'Zend/Barcode/Renderer/Exception.php';
-            throw new Zend_Barcode_Renderer_Exception(
-                'No barcode object provided'
-            );
-        }
-    }
-
-    /**
-     * Calculate the left and top offset of the barcode in the
-     * rendering support
-     *
-     * @param float $supportHeight
-     * @param float $supportWidth
-     * @return void
-     */
-    protected function _adjustPosition($supportHeight, $supportWidth)
-    {
-        $barcodeHeight = $this->_barcode->getHeight(true) * $this->_moduleSize;
-        if ($barcodeHeight != $supportHeight && $this->_topOffset == 0) {
-            switch ($this->_verticalPosition) {
-                case 'middle':
-                    $this->_topOffset = floor(
-                            ($supportHeight - $barcodeHeight) / 2);
-                    break;
-                case 'bottom':
-                    $this->_topOffset = $supportHeight - $barcodeHeight;
-                    break;
-                case 'top':
-                default:
-                    $this->_topOffset = 0;
-                    break;
-            }
-        }
-        $barcodeWidth = $this->_barcode->getWidth(true) * $this->_moduleSize;
-        if ($barcodeWidth != $supportWidth && $this->_leftOffset == 0) {
-            switch ($this->_horizontalPosition) {
-                case 'center':
-                    $this->_leftOffset = floor(
-                            ($supportWidth - $barcodeWidth) / 2);
-                    break;
-                case 'right':
-                    $this->_leftOffset = $supportWidth - $barcodeWidth;
-                    break;
-                case 'left':
-                default:
-                    $this->_leftOffset = 0;
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Draw the barcode in the rendering resource
-     * @return mixed
-     */
-    public function draw()
-    {
-        try {
-            $this->checkParams();
-            $this->_initRenderer();
-            $this->_drawInstructionList();
-        } catch (Zend_Exception $e) {
-            $renderable = false;
-            if ($e instanceof Zend_Barcode_Exception) {
-                $renderable = $e->isRenderable();
-            }
-            if ($this->_automaticRenderError && $renderable) {
-                $barcode = Zend_Barcode::makeBarcode(
-                    'error',
-                    array('text' => $e->getMessage())
-                );
-                $this->setBarcode($barcode);
-                $this->_resource = null;
-                $this->_initRenderer();
-                $this->_drawInstructionList();
-            } else {
-                if ($e instanceof Zend_Barcode_Exception) {
-                    $e->setIsRenderable(false);
-                }
-                throw $e;
-            }
-        }
-        return $this->_resource;
-    }
-
-    /**
-     * Sub process to draw the barcode instructions
-     * Needed by the automatic error rendering
-     */
-    private function _drawInstructionList()
-    {
-        $instructionList = $this->_barcode->draw();
-        foreach ($instructionList as $instruction) {
-            switch ($instruction['type']) {
-                case 'polygon':
-                    $this->_drawPolygon(
-                        $instruction['points'],
-                        $instruction['color'],
-                        $instruction['filled']
-                    );
-                    break;
-                case 'text': //$text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
-                    $this->_drawText(
-                        $instruction['text'],
-                        $instruction['size'],
-                        $instruction['position'],
-                        $instruction['font'],
-                        $instruction['color'],
-                        $instruction['alignment'],
-                        $instruction['orientation']
-                    );
-                    break;
-                default:
-                    /**
-                     * @see Zend_Barcode_Renderer_Exception
-                     */
-                    require_once 'Zend/Barcode/Renderer/Exception.php';
-                    throw new Zend_Barcode_Renderer_Exception(
-                        'Unkown drawing command'
-                    );
-            }
-        }
-    }
-
-    /**
-     * Checking of parameters after all settings
-     * @return void
-     */
-    abstract protected function _checkParams();
-
-    /**
-     * Render the resource by sending headers and drawed resource
-     * @return mixed
-     */
-    abstract public function render();
-
-    /**
-     * Initialize the rendering resource
-     * @return void
-     */
-    abstract protected function _initRenderer();
-
-    /**
-     * Draw a polygon in the rendering resource
-     * @param array $points
-     * @param integer $color
-     * @param boolean $filled
-     */
-    abstract protected function _drawPolygon($points, $color, $filled = true);
-
-    /**
-     * Draw a polygon in the rendering resource
-     * @param string $text
-     * @param float $size
-     * @param array $position
-     * @param string $font
-     * @param integer $color
-     * @param string $alignment
-     * @param float $orientation
-     */
-    abstract protected function _drawText(
-        $text, 
-        $size, 
-        $position, 
-        $font, 
-        $color, 
-        $alignment = 'center', 
-        $orientation = 0
-    );
-}
diff --git a/airtime_mvc/library/Zend/Cache.php b/airtime_mvc/library/Zend/Cache.php
deleted file mode 100644
index 379251151..000000000
--- a/airtime_mvc/library/Zend/Cache.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Cache
-{
-
-    /**
-     * Standard frontends
-     *
-     * @var array
-     */
-    public static $standardFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
-
-    /**
-     * Standard backends
-     *
-     * @var array
-     */
-    public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Apc', 'ZendPlatform', 'Xcache', 'TwoLevels');
-
-    /**
-     * Standard backends which implement the ExtendedInterface
-     *
-     * @var array
-     */
-    public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Sqlite');
-
-    /**
-     * Only for backward compatibily (may be removed in next major release)
-     *
-     * @var array
-     * @deprecated
-     */
-    public static $availableFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
-
-    /**
-     * Only for backward compatibily (may be removed in next major release)
-     *
-     * @var array
-     * @deprecated
-     */
-    public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Apc', 'ZendPlatform', 'Xcache', 'TwoLevels');
-
-    /**
-     * Consts for clean() method
-     */
-    const CLEANING_MODE_ALL              = 'all';
-    const CLEANING_MODE_OLD              = 'old';
-    const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
-    const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
-    const CLEANING_MODE_MATCHING_ANY_TAG = 'matchingAnyTag';
-
-    /**
-     * Factory
-     *
-     * @param mixed  $frontend        frontend name (string) or Zend_Cache_Frontend_ object
-     * @param mixed  $backend         backend name (string) or Zend_Cache_Backend_ object
-     * @param array  $frontendOptions associative array of options for the corresponding frontend constructor
-     * @param array  $backendOptions  associative array of options for the corresponding backend constructor
-     * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
-     * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
-     * @param boolean $autoload if true, there will no require_once for backend and frontend (usefull only for custom backends/frontends)
-     * @throws Zend_Cache_Exception
-     * @return Zend_Cache_Core|Zend_Cache_Frontend
-     */
-    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
-    {
-        if (is_string($backend)) {
-            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
-        } else {
-            if ((is_object($backend)) && (in_array('Zend_Cache_Backend_Interface', class_implements($backend)))) {
-                $backendObject = $backend;
-            } else {
-                self::throwException('backend must be a backend name (string) or an object which implements Zend_Cache_Backend_Interface');
-            }
-        }
-        if (is_string($frontend)) {
-            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
-        } else {
-            if (is_object($frontend)) {
-                $frontendObject = $frontend;
-            } else {
-                self::throwException('frontend must be a frontend name (string) or an object');
-            }
-        }
-        $frontendObject->setBackend($backendObject);
-        return $frontendObject;
-    }
-
-    /**
-     * Frontend Constructor
-     *
-     * @param string  $backend
-     * @param array   $backendOptions
-     * @param boolean $customBackendNaming
-     * @param boolean $autoload
-     * @return Zend_Cache_Backend
-     */
-    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
-    {
-        if (!$customBackendNaming) {
-            $backend  = self::_normalizeName($backend);
-        }
-        if (in_array($backend, Zend_Cache::$standardBackends)) {
-            // we use a standard backend
-            $backendClass = 'Zend_Cache_Backend_' . $backend;
-            // security controls are explicit
-            require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-        } else {
-            // we use a custom backend
-            if (!preg_match('~^[\w]+$~D', $backend)) {
-                Zend_Cache::throwException("Invalid backend name [$backend]");
-            }
-            if (!$customBackendNaming) {
-                // we use this boolean to avoid an API break
-                $backendClass = 'Zend_Cache_Backend_' . $backend;
-            } else {
-                $backendClass = $backend;
-            }
-            if (!$autoload) {
-                $file = str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
-        }
-        return new $backendClass($backendOptions);
-    }
-
-    /**
-     * Backend Constructor
-     *
-     * @param string  $frontend
-     * @param array   $frontendOptions
-     * @param boolean $customFrontendNaming
-     * @param boolean $autoload
-     * @return Zend_Cache_Core|Zend_Cache_Frontend
-     */
-    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
-    {
-        if (!$customFrontendNaming) {
-            $frontend = self::_normalizeName($frontend);
-        }
-        if (in_array($frontend, self::$standardFrontends)) {
-            // we use a standard frontend
-            // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
-            $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend;
-            // security controls are explicit
-            require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-        } else {
-            // we use a custom frontend
-            if (!preg_match('~^[\w]+$~D', $frontend)) {
-                Zend_Cache::throwException("Invalid frontend name [$frontend]");
-            }
-            if (!$customFrontendNaming) {
-                // we use this boolean to avoid an API break
-                $frontendClass = 'Zend_Cache_Frontend_' . $frontend;
-            } else {
-                $frontendClass = $frontend;
-            }
-            if (!$autoload) {
-                $file = str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
-        }
-        return new $frontendClass($frontendOptions);
-    }
-
-    /**
-     * Throw an exception
-     *
-     * Note : for perf reasons, the "load" of Zend/Cache/Exception is dynamic
-     * @param  string $msg  Message for the exception
-     * @throws Zend_Cache_Exception
-     */
-    public static function throwException($msg, Exception $e = null)
-    {
-        // For perfs reasons, we use this dynamic inclusion
-        require_once 'Zend/Cache/Exception.php';
-        throw new Zend_Cache_Exception($msg, 0, $e);
-    }
-
-    /**
-     * Normalize frontend and backend names to allow multiple words TitleCased
-     *
-     * @param  string $name  Name to normalize
-     * @return string
-     */
-    protected static function _normalizeName($name)
-    {
-        $name = ucfirst(strtolower($name));
-        $name = str_replace(array('-', '_', '.'), ' ', $name);
-        $name = ucwords($name);
-        $name = str_replace(' ', '', $name);
-        return $name;
-    }
-
-    /**
-     * Returns TRUE if the $filename is readable, or FALSE otherwise.
-     * This function uses the PHP include_path, where PHP's is_readable()
-     * does not.
-     *
-     * Note : this method comes from Zend_Loader (see #ZF-2891 for details)
-     *
-     * @param string   $filename
-     * @return boolean
-     */
-    private static function _isReadable($filename)
-    {
-        if (!$fh = @fopen($filename, 'r', true)) {
-            return false;
-        }
-        @fclose($fh);
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend.php b/airtime_mvc/library/Zend/Cache/Backend.php
deleted file mode 100644
index 8049a1a84..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Backend.php 20882 2010-02-03 18:19:44Z matthew $
- */
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend
-{
-    /**
-     * Frontend or Core directives
-     *
-     * =====> (int) lifetime :
-     * - Cache lifetime (in seconds)
-     * - If null, the cache is valid forever
-     *
-     * =====> (int) logging :
-     * - if set to true, a logging is activated throw Zend_Log
-     *
-     * @var array directives
-     */
-    protected $_directives = array(
-        'lifetime' => 3600,
-        'logging'  => false,
-        'logger'   => null
-    );
-
-    /**
-     * Available options
-     *
-     * @var array available options
-     */
-    protected $_options = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-    }
-
-    /**
-     * Set the frontend directives
-     *
-     * @param  array $directives Assoc of directives
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setDirectives($directives)
-    {
-        if (!is_array($directives)) Zend_Cache::throwException('Directives parameter must be an array');
-        while (list($name, $value) = each($directives)) {
-            if (!is_string($name)) {
-                Zend_Cache::throwException("Incorrect option name : $name");
-            }
-            $name = strtolower($name);
-            if (array_key_exists($name, $this->_directives)) {
-                $this->_directives[$name] = $value;
-            }
-
-        }
-
-        $this->_loggerSanity();
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            Zend_Cache::throwException("Incorrect option name : $name");
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            $this->_options[$name] = $value;
-        }
-    }
-
-    /**
-     * Get the life time
-     *
-     * if $specificLifetime is not false, the given specific life time is used
-     * else, the global lifetime is used
-     *
-     * @param  int $specificLifetime
-     * @return int Cache life time
-     */
-    public function getLifetime($specificLifetime)
-    {
-        if ($specificLifetime === false) {
-            return $this->_directives['lifetime'];
-        }
-        return $specificLifetime;
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * DEPRECATED : use getCapabilities() instead
-     *
-     * @deprecated
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return true;
-    }
-
-    /**
-     * Determine system TMP directory and detect if we have read access
-     *
-     * inspired from Zend_File_Transfer_Adapter_Abstract
-     *
-     * @return string
-     * @throws Zend_Cache_Exception if unable to determine directory
-     */
-    public function getTmpDir()
-    {
-        $tmpdir = array();
-        foreach (array($_ENV, $_SERVER) as $tab) {
-            foreach (array('TMPDIR', 'TEMP', 'TMP', 'windir', 'SystemRoot') as $key) {
-                if (isset($tab[$key])) {
-                    if (($key == 'windir') or ($key == 'SystemRoot')) {
-                        $dir = realpath($tab[$key] . '\\temp');
-                    } else {
-                        $dir = realpath($tab[$key]);
-                    }
-                    if ($this->_isGoodTmpDir($dir)) {
-                        return $dir;
-                    }
-                }
-            }
-        }
-        $upload = ini_get('upload_tmp_dir');
-        if ($upload) {
-            $dir = realpath($upload);
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        if (function_exists('sys_get_temp_dir')) {
-            $dir = sys_get_temp_dir();
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        // Attemp to detect by creating a temporary file
-        $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
-        if ($tempFile) {
-            $dir = realpath(dirname($tempFile));
-            unlink($tempFile);
-            if ($this->_isGoodTmpDir($dir)) {
-                return $dir;
-            }
-        }
-        if ($this->_isGoodTmpDir('/tmp')) {
-            return '/tmp';
-        }
-        if ($this->_isGoodTmpDir('\\temp')) {
-            return '\\temp';
-        }
-        Zend_Cache::throwException('Could not determine temp directory, please specify a cache_dir manually');
-    }
-
-    /**
-     * Verify if the given temporary directory is readable and writable
-     *
-     * @param $dir temporary directory
-     * @return boolean true if the directory is ok
-     */
-    protected function _isGoodTmpDir($dir)
-    {
-        if (is_readable($dir)) {
-            if (is_writable($dir)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Make sure if we enable logging that the Zend_Log class
-     * is available.
-     * Create a default log object if none is set.
-     *
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _loggerSanity()
-    {
-        if (!isset($this->_directives['logging']) || !$this->_directives['logging']) {
-            return;
-        }
-
-        if (isset($this->_directives['logger'])) {
-            if ($this->_directives['logger'] instanceof Zend_Log) {
-                return;
-            }
-            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
-        }
-
-        // Create a default logger to the standard output stream
-        require_once 'Zend/Log.php';
-        require_once 'Zend/Log/Writer/Stream.php';
-        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
-        $this->_directives['logger'] = $logger;
-    }
-
-    /**
-     * Log a message at the WARN (4) priority.
-     *
-     * @param  string $message
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _log($message, $priority = 4)
-    {
-        if (!$this->_directives['logging']) {
-            return;
-        }
-
-        if (!isset($this->_directives['logger'])) {
-            Zend_Cache::throwException('Logging is enabled but logger is not set.');
-        }
-        $logger = $this->_directives['logger'];
-        if (!$logger instanceof Zend_Log) {
-            Zend_Cache::throwException('Logger object is not an instance of Zend_Log class.');
-        }
-        $logger->log($message, $priority);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Apc.php b/airtime_mvc/library/Zend/Cache/Backend/Apc.php
deleted file mode 100644
index 0a13a5772..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Apc.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Apc.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Log message
-     */
-    const TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND = 'Zend_Cache_Backend_Apc::clean() : tags are unsupported by the Apc backend';
-    const TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND =  'Zend_Cache_Backend_Apc::save() : tags are unsupported by the Apc backend';
-
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        if (!extension_loaded('apc')) {
-            Zend_Cache::throwException('The apc extension must be loaded for using this backend !');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * WARNING $doNotTestCacheValidity=true is unsupported by the Apc backend
-     *
-     * @param  string  $id                     cache id
-     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-     * @return string cached datas (or false)
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $tmp = apc_fetch($id);
-        if (is_array($tmp)) {
-            return $tmp[0];
-        }
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $tmp = apc_fetch($id);
-        if (is_array($tmp)) {
-            return $tmp[1];
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param string $data datas to cache
-     * @param string $id cache id
-     * @param array $tags array of strings, the cache record will be tagged by each string entry
-     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $lifetime = $this->getLifetime($specificLifetime);
-        $result = apc_store($id, array($data, time(), $lifetime), $lifetime);
-        if (count($tags) > 0) {
-            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        }
-        return $result;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id cache id
-     * @return boolean true if no problem
-     */
-    public function remove($id)
-    {
-        return apc_delete($id);
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => unsupported
-     * 'matchingTag'    => unsupported
-     * 'notMatchingTag' => unsupported
-     * 'matchingAnyTag' => unsupported
-     *
-     * @param  string $mode clean mode
-     * @param  array  $tags array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                return apc_clear_cache('user');
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $this->_log("Zend_Cache_Backend_Apc::clean() : CLEANING_MODE_OLD is unsupported by the Apc backend");
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_APC_BACKEND);
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * DEPRECATED : use getCapabilities() instead
-     *
-     * @deprecated
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return false;
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @throws Zend_Cache_Exception
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        $mem = apc_sma_info(true);
-        $memSize    = $mem['num_seg'] * $mem['seg_size'];
-        $memAvailable= $mem['avail_mem'];
-        $memUsed = $memSize - $memAvailable;
-        if ($memSize == 0) {
-            Zend_Cache::throwException('can\'t get apc memory size');
-        }
-        if ($memUsed > $memSize) {
-            return 100;
-        }
-        return ((int) (100. * ($memUsed / $memSize)));
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_APC_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        $res = array();
-        $array = apc_cache_info('user', false);
-        $records = $array['cache_list'];
-        foreach ($records as $record) {
-            $res[] = $record['info'];
-        }
-        return $res;
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        $tmp = apc_fetch($id);
-        if (is_array($tmp)) {
-            $data = $tmp[0];
-            $mtime = $tmp[1];
-            if (!isset($tmp[2])) {
-                // because this record is only with 1.7 release
-                // if old cache records are still there...
-                return false;
-            }
-            $lifetime = $tmp[2];
-            return array(
-                'expire' => $mtime + $lifetime,
-                'tags' => array(),
-                'mtime' => $mtime
-            );
-        }
-        return false;
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        $tmp = apc_fetch($id);
-        if (is_array($tmp)) {
-            $data = $tmp[0];
-            $mtime = $tmp[1];
-            if (!isset($tmp[2])) {
-                // because this record is only with 1.7 release
-                // if old cache records are still there...
-                return false;
-            }
-            $lifetime = $tmp[2];
-            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
-            if ($newLifetime <=0) {
-                return false;
-            }
-            apc_store($id, array($data, time(), $newLifetime), $newLifetime);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => false,
-            'tags' => false,
-            'expired_read' => false,
-            'priority' => false,
-            'infinite_lifetime' => false,
-            'get_list' => true
-        );
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/BlackHole.php b/airtime_mvc/library/Zend/Cache/Backend/BlackHole.php
deleted file mode 100644
index 9ae72f397..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/BlackHole.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlackHole.php 17867 2009-08-28 09:42:11Z yoshida@zend.co.jp $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_BlackHole 
-    extends Zend_Cache_Backend 
-    implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string $id cache id
-     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data             Datas to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        return true;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id cache id
-     * @return boolean true if no problem
-     */
-    public function remove($id)
-    {
-        return true;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => remove too old cache entries ($tags is not used)
-     * 'matchingTag'    => remove cache entries matching all given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'notMatchingTag' => remove cache entries not matching one of the given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'matchingAnyTag' => remove cache entries matching any given tags
-     *                     ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode clean mode
-     * @param  tags array $tags array of tags
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        return true;
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        return array();
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param  array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        return array();
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     * @throws Zend_Cache_Exception
-     */
-    public function getFillingPercentage()
-    {
-        return 0;
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param  string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        return false;
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param  string $id cache id
-     * @param  int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        return false;
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => true,
-            'tags'               => true,
-            'expired_read'       => true,
-            'priority'           => true,
-            'infinite_lifetime'  => true,
-            'get_list'           => true,
-        );
-    }
-
-    /**
-     * PUBLIC METHOD FOR UNIT TESTING ONLY !
-     *
-     * Force a cache record to expire
-     *
-     * @param string $id cache id
-     */
-    public function ___expire($id)
-    {
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/ExtendedInterface.php b/airtime_mvc/library/Zend/Cache/Backend/ExtendedInterface.php
deleted file mode 100644
index ec735a476..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/ExtendedInterface.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ExtendedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface
-{
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds();
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags();
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array());
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array());
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array());
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage();
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id);
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime);
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities();
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/File.php b/airtime_mvc/library/Zend/Cache/Backend/File.php
deleted file mode 100644
index dc8888c7b..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/File.php
+++ /dev/null
@@ -1,1006 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 21642 2010-03-25 17:07:02Z mabe $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Available options
-     *
-     * =====> (string) cache_dir :
-     * - Directory where to put the cache files
-     *
-     * =====> (boolean) file_locking :
-     * - Enable / disable file_locking
-     * - Can avoid cache corruption under bad circumstances but it doesn't work on multithread
-     * webservers and on NFS filesystems for example
-     *
-     * =====> (boolean) read_control :
-     * - Enable / disable read control
-     * - If enabled, a control key is embeded in cache file and this key is compared with the one
-     * calculated after the reading.
-     *
-     * =====> (string) read_control_type :
-     * - Type of read control (only if read control is enabled). Available values are :
-     *   'md5' for a md5 hash control (best but slowest)
-     *   'crc32' for a crc32 hash control (lightly less safe but faster, better choice)
-     *   'adler32' for an adler32 hash control (excellent choice too, faster than crc32)
-     *   'strlen' for a length only test (fastest)
-     *
-     * =====> (int) hashed_directory_level :
-     * - Hashed directory level
-     * - Set the hashed directory structure level. 0 means "no hashed directory
-     * structure", 1 means "one level of directory", 2 means "two levels"...
-     * This option can speed up the cache only when you have many thousands of
-     * cache file. Only specific benchs can help you to choose the perfect value
-     * for you. Maybe, 1 or 2 is a good start.
-     *
-     * =====> (int) hashed_directory_umask :
-     * - Umask for hashed directory structure
-     *
-     * =====> (string) file_name_prefix :
-     * - prefix for cache files
-     * - be really carefull with this option because a too generic value in a system cache dir
-     *   (like /tmp) can cause disasters when cleaning the cache
-     *
-     * =====> (int) cache_file_umask :
-     * - Umask for cache files
-     *
-     * =====> (int) metatadatas_array_max_size :
-     * - max size for the metadatas array (don't change this value unless you
-     *   know what you are doing)
-     *
-     * @var array available options
-     */
-    protected $_options = array(
-        'cache_dir' => null,
-        'file_locking' => true,
-        'read_control' => true,
-        'read_control_type' => 'crc32',
-        'hashed_directory_level' => 0,
-        'hashed_directory_umask' => 0700,
-        'file_name_prefix' => 'zend_cache',
-        'cache_file_umask' => 0600,
-        'metadatas_array_max_size' => 100
-    );
-
-    /**
-     * Array of metadatas (each item is an associative array)
-     *
-     * @var array
-     */
-    protected $_metadatasArray = array();
-
-
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-        if ($this->_options['cache_dir'] !== null) { // particular case for this option
-            $this->setCacheDir($this->_options['cache_dir']);
-        } else {
-            $this->setCacheDir(self::getTmpDir() . DIRECTORY_SEPARATOR, false);
-        }
-        if (isset($this->_options['file_name_prefix'])) { // particular case for this option
-            if (!preg_match('~^[a-zA-Z0-9_]+$~D', $this->_options['file_name_prefix'])) {
-                Zend_Cache::throwException('Invalid file_name_prefix : must use only [a-zA-Z0-9_]');
-            }
-        }
-        if ($this->_options['metadatas_array_max_size'] < 10) {
-            Zend_Cache::throwException('Invalid metadatas_array_max_size, must be > 10');
-        }
-        if (isset($options['hashed_directory_umask']) && is_string($options['hashed_directory_umask'])) {
-            // See #ZF-4422
-            $this->_options['hashed_directory_umask'] = octdec($this->_options['hashed_directory_umask']);
-        }
-        if (isset($options['cache_file_umask']) && is_string($options['cache_file_umask'])) {
-            // See #ZF-4422
-            $this->_options['cache_file_umask'] = octdec($this->_options['cache_file_umask']);
-        }
-    }
-
-    /**
-     * Set the cache_dir (particular case of setOption() method)
-     *
-     * @param  string  $value
-     * @param  boolean $trailingSeparator If true, add a trailing separator is necessary
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setCacheDir($value, $trailingSeparator = true)
-    {
-        if (!is_dir($value)) {
-            Zend_Cache::throwException('cache_dir must be a directory');
-        }
-        if (!is_writable($value)) {
-            Zend_Cache::throwException('cache_dir is not writable');
-        }
-        if ($trailingSeparator) {
-            // add a trailing DIRECTORY_SEPARATOR if necessary
-            $value = rtrim(realpath($value), '\\/') . DIRECTORY_SEPARATOR;
-        }
-        $this->_options['cache_dir'] = $value;
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param string $id cache id
-     * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        if (!($this->_test($id, $doNotTestCacheValidity))) {
-            // The cache is not hit !
-            return false;
-        }
-        $metadatas = $this->_getMetadatas($id);
-        $file = $this->_file($id);
-        $data = $this->_fileGetContents($file);
-        if ($this->_options['read_control']) {
-            $hashData = $this->_hash($data, $this->_options['read_control_type']);
-            $hashControl = $metadatas['hash'];
-            if ($hashData != $hashControl) {
-                // Problem detected by the read control !
-                $this->_log('Zend_Cache_Backend_File::load() / read_control : stored hash and computed hash do not match');
-                $this->remove($id);
-                return false;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param string $id cache id
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        clearstatcache();
-        return $this->_test($id, false);
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data             Datas to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        clearstatcache();
-        $file = $this->_file($id);
-        $path = $this->_path($id);
-        if ($this->_options['hashed_directory_level'] > 0) {
-            if (!is_writable($path)) {
-                // maybe, we just have to build the directory structure
-                $this->_recursiveMkdirAndChmod($id);
-            }
-            if (!is_writable($path)) {
-                return false;
-            }
-        }
-        if ($this->_options['read_control']) {
-            $hash = $this->_hash($data, $this->_options['read_control_type']);
-        } else {
-            $hash = '';
-        }
-        $metadatas = array(
-            'hash' => $hash,
-            'mtime' => time(),
-            'expire' => $this->_expireTime($this->getLifetime($specificLifetime)),
-            'tags' => $tags
-        );
-        $res = $this->_setMetadatas($id, $metadatas);
-        if (!$res) {
-            $this->_log('Zend_Cache_Backend_File::save() / error on saving metadata');
-            return false;
-        }
-        $res = $this->_filePutContents($file, $data);
-        return $res;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id cache id
-     * @return boolean true if no problem
-     */
-    public function remove($id)
-    {
-        $file = $this->_file($id);
-        $boolRemove   = $this->_remove($file);
-        $boolMetadata = $this->_delMetadatas($id);
-        return $boolMetadata && $boolRemove;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => remove too old cache entries ($tags is not used)
-     * 'matchingTag'    => remove cache entries matching all given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'notMatchingTag' => remove cache entries not matching one of the given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'matchingAnyTag' => remove cache entries matching any given tags
-     *                     ($tags can be an array of strings or a single string)
-     *
-     * @param string $mode clean mode
-     * @param tags array $tags array of tags
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        // We use this protected method to hide the recursive stuff
-        clearstatcache();
-        return $this->_clean($this->_options['cache_dir'], $mode, $tags);
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        return $this->_get($this->_options['cache_dir'], 'ids', array());
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        return $this->_get($this->_options['cache_dir'], 'tags', array());
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        return $this->_get($this->_options['cache_dir'], 'matching', $tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        return $this->_get($this->_options['cache_dir'], 'notMatching', $tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        return $this->_get($this->_options['cache_dir'], 'matchingAny', $tags);
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @throws Zend_Cache_Exception
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        $free = disk_free_space($this->_options['cache_dir']);
-        $total = disk_total_space($this->_options['cache_dir']);
-        if ($total == 0) {
-            Zend_Cache::throwException('can\'t get disk_total_space');
-        } else {
-            if ($free >= $total) {
-                return 100;
-            }
-            return ((int) (100. * ($total - $free) / $total));
-        }
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        $metadatas = $this->_getMetadatas($id);
-        if (!$metadatas) {
-            return false;
-        }
-        if (time() > $metadatas['expire']) {
-            return false;
-        }
-        return array(
-            'expire' => $metadatas['expire'],
-            'tags' => $metadatas['tags'],
-            'mtime' => $metadatas['mtime']
-        );
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        $metadatas = $this->_getMetadatas($id);
-        if (!$metadatas) {
-            return false;
-        }
-        if (time() > $metadatas['expire']) {
-            return false;
-        }
-        $newMetadatas = array(
-            'hash' => $metadatas['hash'],
-            'mtime' => time(),
-            'expire' => $metadatas['expire'] + $extraLifetime,
-            'tags' => $metadatas['tags']
-        );
-        $res = $this->_setMetadatas($id, $newMetadatas);
-        if (!$res) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => true,
-            'tags' => true,
-            'expired_read' => true,
-            'priority' => false,
-            'infinite_lifetime' => true,
-            'get_list' => true
-        );
-    }
-
-    /**
-     * PUBLIC METHOD FOR UNIT TESTING ONLY !
-     *
-     * Force a cache record to expire
-     *
-     * @param string $id cache id
-     */
-    public function ___expire($id)
-    {
-        $metadatas = $this->_getMetadatas($id);
-        if ($metadatas) {
-            $metadatas['expire'] = 1;
-            $this->_setMetadatas($id, $metadatas);
-        }
-    }
-
-    /**
-     * Get a metadatas record
-     *
-     * @param  string $id  Cache id
-     * @return array|false Associative array of metadatas
-     */
-    protected function _getMetadatas($id)
-    {
-        if (isset($this->_metadatasArray[$id])) {
-            return $this->_metadatasArray[$id];
-        } else {
-            $metadatas = $this->_loadMetadatas($id);
-            if (!$metadatas) {
-                return false;
-            }
-            $this->_setMetadatas($id, $metadatas, false);
-            return $metadatas;
-        }
-    }
-
-    /**
-     * Set a metadatas record
-     *
-     * @param  string $id        Cache id
-     * @param  array  $metadatas Associative array of metadatas
-     * @param  boolean $save     optional pass false to disable saving to file
-     * @return boolean True if no problem
-     */
-    protected function _setMetadatas($id, $metadatas, $save = true)
-    {
-        if (count($this->_metadatasArray) >= $this->_options['metadatas_array_max_size']) {
-            $n = (int) ($this->_options['metadatas_array_max_size'] / 10);
-            $this->_metadatasArray = array_slice($this->_metadatasArray, $n);
-        }
-        if ($save) {
-            $result = $this->_saveMetadatas($id, $metadatas);
-            if (!$result) {
-                return false;
-            }
-        }
-        $this->_metadatasArray[$id] = $metadatas;
-        return true;
-    }
-
-    /**
-     * Drop a metadata record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    protected function _delMetadatas($id)
-    {
-        if (isset($this->_metadatasArray[$id])) {
-            unset($this->_metadatasArray[$id]);
-        }
-        $file = $this->_metadatasFile($id);
-        return $this->_remove($file);
-    }
-
-    /**
-     * Clear the metadatas array
-     *
-     * @return void
-     */
-    protected function _cleanMetadatas()
-    {
-        $this->_metadatasArray = array();
-    }
-
-    /**
-     * Load metadatas from disk
-     *
-     * @param  string $id Cache id
-     * @return array|false Metadatas associative array
-     */
-    protected function _loadMetadatas($id)
-    {
-        $file = $this->_metadatasFile($id);
-        $result = $this->_fileGetContents($file);
-        if (!$result) {
-            return false;
-        }
-        $tmp = @unserialize($result);
-        return $tmp;
-    }
-
-    /**
-     * Save metadatas to disk
-     *
-     * @param  string $id        Cache id
-     * @param  array  $metadatas Associative array
-     * @return boolean True if no problem
-     */
-    protected function _saveMetadatas($id, $metadatas)
-    {
-        $file = $this->_metadatasFile($id);
-        $result = $this->_filePutContents($file, serialize($metadatas));
-        if (!$result) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Make and return a file name (with path) for metadatas
-     *
-     * @param  string $id Cache id
-     * @return string Metadatas file name (with path)
-     */
-    protected function _metadatasFile($id)
-    {
-        $path = $this->_path($id);
-        $fileName = $this->_idToFileName('internal-metadatas---' . $id);
-        return $path . $fileName;
-    }
-
-    /**
-     * Check if the given filename is a metadatas one
-     *
-     * @param  string $fileName File name
-     * @return boolean True if it's a metadatas one
-     */
-    protected function _isMetadatasFile($fileName)
-    {
-        $id = $this->_fileNameToId($fileName);
-        if (substr($id, 0, 21) == 'internal-metadatas---') {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Remove a file
-     *
-     * If we can't remove the file (because of locks or any problem), we will touch
-     * the file to invalidate it
-     *
-     * @param  string $file Complete file path
-     * @return boolean True if ok
-     */
-    protected function _remove($file)
-    {
-        if (!is_file($file)) {
-            return false;
-        }
-        if (!@unlink($file)) {
-            # we can't remove the file (because of locks or any problem)
-            $this->_log("Zend_Cache_Backend_File::_remove() : we can't remove $file");
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Clean some cache records (protected method used for recursive stuff)
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $dir  Directory to clean
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    protected function _clean($dir, $mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        if (!is_dir($dir)) {
-            return false;
-        }
-        $result = true;
-        $prefix = $this->_options['file_name_prefix'];
-        $glob = @glob($dir . $prefix . '--*');
-        if ($glob === false) {
-            // On some systems it is impossible to distinguish between empty match and an error.
-            return true;
-        }
-        foreach ($glob as $file)  {
-            if (is_file($file)) {
-                $fileName = basename($file);
-                if ($this->_isMetadatasFile($fileName)) {
-                    // in CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files
-                    if ($mode != Zend_Cache::CLEANING_MODE_ALL) {
-                        continue;
-                    }
-                }
-                $id = $this->_fileNameToId($fileName);
-                $metadatas = $this->_getMetadatas($id);
-                if ($metadatas === FALSE) {
-                    $metadatas = array('expire' => 1, 'tags' => array());
-                }
-                switch ($mode) {
-                    case Zend_Cache::CLEANING_MODE_ALL:
-                        $res = $this->remove($id);
-                        if (!$res) {
-                            // in this case only, we accept a problem with the metadatas file drop
-                            $res = $this->_remove($file);
-                        }
-                        $result = $result && $res;
-                        break;
-                    case Zend_Cache::CLEANING_MODE_OLD:
-                        if (time() > $metadatas['expire']) {
-                            $result = $this->remove($id) && $result;
-                        }
-                        break;
-                    case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-                        $matching = true;
-                        foreach ($tags as $tag) {
-                            if (!in_array($tag, $metadatas['tags'])) {
-                                $matching = false;
-                                break;
-                            }
-                        }
-                        if ($matching) {
-                            $result = $this->remove($id) && $result;
-                        }
-                        break;
-                    case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-                        $matching = false;
-                        foreach ($tags as $tag) {
-                            if (in_array($tag, $metadatas['tags'])) {
-                                $matching = true;
-                                break;
-                            }
-                        }
-                        if (!$matching) {
-                            $result = $this->remove($id) && $result;
-                        }
-                        break;
-                    case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                        $matching = false;
-                        foreach ($tags as $tag) {
-                            if (in_array($tag, $metadatas['tags'])) {
-                                $matching = true;
-                                break;
-                            }
-                        }
-                        if ($matching) {
-                            $result = $this->remove($id) && $result;
-                        }
-                        break;
-                    default:
-                        Zend_Cache::throwException('Invalid mode for clean() method');
-                        break;
-                }
-            }
-            if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) {
-                // Recursive call
-                $result = $this->_clean($file . DIRECTORY_SEPARATOR, $mode, $tags) && $result;
-                if ($mode=='all') {
-                    // if mode=='all', we try to drop the structure too
-                    @rmdir($file);
-                }
-            }
-        }
-        return $result;
-    }
-
-    protected function _get($dir, $mode, $tags = array())
-    {
-        if (!is_dir($dir)) {
-            return false;
-        }
-        $result = array();
-        $prefix = $this->_options['file_name_prefix'];
-        $glob = @glob($dir . $prefix . '--*');
-        if ($glob === false) {
-            // On some systems it is impossible to distinguish between empty match and an error.
-            return array();
-        }
-        foreach ($glob as $file)  {
-            if (is_file($file)) {
-                $fileName = basename($file);
-                $id = $this->_fileNameToId($fileName);
-                $metadatas = $this->_getMetadatas($id);
-                if ($metadatas === FALSE) {
-                    continue;
-                }
-                if (time() > $metadatas['expire']) {
-                    continue;
-                }
-                switch ($mode) {
-                    case 'ids':
-                        $result[] = $id;
-                        break;
-                    case 'tags':
-                        $result = array_unique(array_merge($result, $metadatas['tags']));
-                        break;
-                    case 'matching':
-                        $matching = true;
-                        foreach ($tags as $tag) {
-                            if (!in_array($tag, $metadatas['tags'])) {
-                                $matching = false;
-                                break;
-                            }
-                        }
-                        if ($matching) {
-                            $result[] = $id;
-                        }
-                        break;
-                    case 'notMatching':
-                        $matching = false;
-                        foreach ($tags as $tag) {
-                            if (in_array($tag, $metadatas['tags'])) {
-                                $matching = true;
-                                break;
-                            }
-                        }
-                        if (!$matching) {
-                            $result[] = $id;
-                        }
-                        break;
-                    case 'matchingAny':
-                        $matching = false;
-                        foreach ($tags as $tag) {
-                            if (in_array($tag, $metadatas['tags'])) {
-                                $matching = true;
-                                break;
-                            }
-                        }
-                        if ($matching) {
-                            $result[] = $id;
-                        }
-                        break;
-                    default:
-                        Zend_Cache::throwException('Invalid mode for _get() method');
-                        break;
-                }
-            }
-            if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) {
-                // Recursive call
-                $recursiveRs =  $this->_get($file . DIRECTORY_SEPARATOR, $mode, $tags);
-                if ($recursiveRs === false) {
-                    $this->_log('Zend_Cache_Backend_File::_get() / recursive call : can\'t list entries of "'.$file.'"');
-                } else {
-                    $result = array_unique(array_merge($result, $recursiveRs));
-                }
-            }
-        }
-        return array_unique($result);
-    }
-
-    /**
-     * Compute & return the expire time
-     *
-     * @return int expire time (unix timestamp)
-     */
-    protected function _expireTime($lifetime)
-    {
-        if ($lifetime === null) {
-            return 9999999999;
-        }
-        return time() + $lifetime;
-    }
-
-    /**
-     * Make a control key with the string containing datas
-     *
-     * @param  string $data        Data
-     * @param  string $controlType Type of control 'md5', 'crc32' or 'strlen'
-     * @throws Zend_Cache_Exception
-     * @return string Control key
-     */
-    protected function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return crc32($data);
-        case 'strlen':
-            return strlen($data);
-        case 'adler32':
-            return hash('adler32', $data);
-        default:
-            Zend_Cache::throwException("Incorrect hash function : $controlType");
-        }
-    }
-
-    /**
-     * Transform a cache id into a file name and return it
-     *
-     * @param  string $id Cache id
-     * @return string File name
-     */
-    protected function _idToFileName($id)
-    {
-        $prefix = $this->_options['file_name_prefix'];
-        $result = $prefix . '---' . $id;
-        return $result;
-    }
-
-    /**
-     * Make and return a file name (with path)
-     *
-     * @param  string $id Cache id
-     * @return string File name (with path)
-     */
-    protected function _file($id)
-    {
-        $path = $this->_path($id);
-        $fileName = $this->_idToFileName($id);
-        return $path . $fileName;
-    }
-
-    /**
-     * Return the complete directory path of a filename (including hashedDirectoryStructure)
-     *
-     * @param  string $id Cache id
-     * @param  boolean $parts if true, returns array of directory parts instead of single string
-     * @return string Complete directory path
-     */
-    protected function _path($id, $parts = false)
-    {
-        $partsArray = array();
-        $root = $this->_options['cache_dir'];
-        $prefix = $this->_options['file_name_prefix'];
-        if ($this->_options['hashed_directory_level']>0) {
-            $hash = hash('adler32', $id);
-            for ($i=0 ; $i < $this->_options['hashed_directory_level'] ; $i++) {
-                $root = $root . $prefix . '--' . substr($hash, 0, $i + 1) . DIRECTORY_SEPARATOR;
-                $partsArray[] = $root;
-            }
-        }
-        if ($parts) {
-            return $partsArray;
-        } else {
-            return $root;
-        }
-    }
-
-    /**
-     * Make the directory strucuture for the given id
-     *
-     * @param string $id cache id
-     * @return boolean true
-     */
-    protected function _recursiveMkdirAndChmod($id)
-    {
-        if ($this->_options['hashed_directory_level'] <=0) {
-            return true;
-        }
-        $partsArray = $this->_path($id, true);
-        foreach ($partsArray as $part) {
-            if (!is_dir($part)) {
-                @mkdir($part, $this->_options['hashed_directory_umask']);
-                @chmod($part, $this->_options['hashed_directory_umask']); // see #ZF-320 (this line is required in some configurations)
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Test if the given cache id is available (and still valid as a cache record)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return boolean|mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    protected function _test($id, $doNotTestCacheValidity)
-    {
-        $metadatas = $this->_getMetadatas($id);
-        if (!$metadatas) {
-            return false;
-        }
-        if ($doNotTestCacheValidity || (time() <= $metadatas['expire'])) {
-            return $metadatas['mtime'];
-        }
-        return false;
-    }
-
-    /**
-     * Return the file content of the given file
-     *
-     * @param  string $file File complete path
-     * @return string File content (or false if problem)
-     */
-    protected function _fileGetContents($file)
-    {
-        $result = false;
-        if (!is_file($file)) {
-            return false;
-        }
-        $f = @fopen($file, 'rb');
-        if ($f) {
-            if ($this->_options['file_locking']) @flock($f, LOCK_SH);
-            $result = stream_get_contents($f);
-            if ($this->_options['file_locking']) @flock($f, LOCK_UN);
-            @fclose($f);
-        }
-        return $result;
-    }
-
-    /**
-     * Put the given string into the given file
-     *
-     * @param  string $file   File complete path
-     * @param  string $string String to put in file
-     * @return boolean true if no problem
-     */
-    protected function _filePutContents($file, $string)
-    {
-        $result = false;
-        $f = @fopen($file, 'ab+');
-        if ($f) {
-            if ($this->_options['file_locking']) @flock($f, LOCK_EX);
-            fseek($f, 0);
-            ftruncate($f, 0);
-            $tmp = @fwrite($f, $string);
-            if (!($tmp === FALSE)) {
-                $result = true;
-            }
-            @fclose($f);
-        }
-        @chmod($file, $this->_options['cache_file_umask']);
-        return $result;
-    }
-
-    /**
-     * Transform a file name into cache id and return it
-     *
-     * @param  string $fileName File name
-     * @return string Cache id
-     */
-    protected function _fileNameToId($fileName)
-    {
-        $prefix = $this->_options['file_name_prefix'];
-        return preg_replace('~^' . $prefix . '---(.*)$~', '$1', $fileName);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Interface.php b/airtime_mvc/library/Zend/Cache/Backend/Interface.php
deleted file mode 100644
index 3e8c7d121..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Interface.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Cache_Backend_Interface
-{
-    /**
-     * Set the frontend directives
-     *
-     * @param array $directives assoc of directives
-     */
-    public function setDirectives($directives);
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * Note : return value is always "string" (unserialization is done by the core not by the backend)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false);
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id);
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data            Datas to cache
-     * @param  string $id              Cache id
-     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false);
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id);
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array());
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Memcached.php b/airtime_mvc/library/Zend/Cache/Backend/Memcached.php
deleted file mode 100644
index 5c488a6e0..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Memcached.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Memcached.php 21535 2010-03-17 18:20:53Z mabe $
- */
-
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Default Values
-     */
-    const DEFAULT_HOST = '127.0.0.1';
-    const DEFAULT_PORT =  11211;
-    const DEFAULT_PERSISTENT = true;
-    const DEFAULT_WEIGHT  = 1;
-    const DEFAULT_TIMEOUT = 1;
-    const DEFAULT_RETRY_INTERVAL = 15;
-    const DEFAULT_STATUS = true;
-    const DEFAULT_FAILURE_CALLBACK = null;
-
-    /**
-     * Log message
-     */
-    const TAGS_UNSUPPORTED_BY_CLEAN_OF_MEMCACHED_BACKEND = 'Zend_Cache_Backend_Memcached::clean() : tags are unsupported by the Memcached backend';
-    const TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND =  'Zend_Cache_Backend_Memcached::save() : tags are unsupported by the Memcached backend';
-
-    /**
-     * Available options
-     *
-     * =====> (array) servers :
-     * an array of memcached server ; each memcached server is described by an associative array :
-     * 'host' => (string) : the name of the memcached server
-     * 'port' => (int) : the port of the memcached server
-     * 'persistent' => (bool) : use or not persistent connections to this memcached server
-     * 'weight' => (int) : number of buckets to create for this server which in turn control its
-     *                     probability of it being selected. The probability is relative to the total
-     *                     weight of all servers.
-     * 'timeout' => (int) : value in seconds which will be used for connecting to the daemon. Think twice
-     *                      before changing the default value of 1 second - you can lose all the
-     *                      advantages of caching if your connection is too slow.
-     * 'retry_interval' => (int) : controls how often a failed server will be retried, the default value
-     *                             is 15 seconds. Setting this parameter to -1 disables automatic retry.
-     * 'status' => (bool) : controls if the server should be flagged as online.
-     * 'failure_callback' => (callback) : Allows the user to specify a callback function to run upon
-     *                                    encountering an error. The callback is run before failover
-     *                                    is attempted. The function takes two parameters, the hostname
-     *                                    and port of the failed server.
-     *
-     * =====> (boolean) compression :
-     * true if you want to use on-the-fly compression
-     *
-     * =====> (boolean) compatibility :
-     * true if you use old memcache server or extension
-     *
-     * @var array available options
-     */
-    protected $_options = array(
-        'servers' => array(array(
-            'host' => self::DEFAULT_HOST,
-            'port' => self::DEFAULT_PORT,
-            'persistent' => self::DEFAULT_PERSISTENT,
-            'weight'  => self::DEFAULT_WEIGHT,
-            'timeout' => self::DEFAULT_TIMEOUT,
-            'retry_interval' => self::DEFAULT_RETRY_INTERVAL,
-            'status' => self::DEFAULT_STATUS,
-            'failure_callback' => self::DEFAULT_FAILURE_CALLBACK
-        )),
-        'compression' => false,
-        'compatibility' => false,
-    );
-
-    /**
-     * Memcache object
-     *
-     * @var mixed memcache object
-     */
-    protected $_memcache = null;
-
-    /**
-     * Constructor
-     *
-     * @param array $options associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        if (!extension_loaded('memcache')) {
-            Zend_Cache::throwException('The memcache extension must be loaded for using this backend !');
-        }
-        parent::__construct($options);
-        if (isset($this->_options['servers'])) {
-            $value= $this->_options['servers'];
-            if (isset($value['host'])) {
-                // in this case, $value seems to be a simple associative array (one server only)
-                $value = array(0 => $value); // let's transform it into a classical array of associative arrays
-            }
-            $this->setOption('servers', $value);
-        }
-        $this->_memcache = new Memcache;
-        foreach ($this->_options['servers'] as $server) {
-            if (!array_key_exists('port', $server)) {
-                $server['port'] = self::DEFAULT_PORT;
-            }
-            if (!array_key_exists('persistent', $server)) {
-                $server['persistent'] = self::DEFAULT_PERSISTENT;
-            }
-            if (!array_key_exists('weight', $server)) {
-                $server['weight'] = self::DEFAULT_WEIGHT;
-            }
-            if (!array_key_exists('timeout', $server)) {
-                $server['timeout'] = self::DEFAULT_TIMEOUT;
-            }
-            if (!array_key_exists('retry_interval', $server)) {
-                $server['retry_interval'] = self::DEFAULT_RETRY_INTERVAL;
-            }
-            if (!array_key_exists('status', $server)) {
-                $server['status'] = self::DEFAULT_STATUS;
-            }
-            if (!array_key_exists('failure_callback', $server)) {
-                $server['failure_callback'] = self::DEFAULT_FAILURE_CALLBACK;
-            }
-            if ($this->_options['compatibility']) {
-                // No status for compatibility mode (#ZF-5887)
-                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
-                                        $server['weight'], $server['timeout'],
-                                        $server['retry_interval']);
-            } else {
-                $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'],
-                                        $server['weight'], $server['timeout'],
-                                        $server['retry_interval'],
-                                        $server['status'], $server['failure_callback']);
-            }
-        }
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $tmp = $this->_memcache->get($id);
-        if (is_array($tmp) && isset($tmp[0])) {
-            return $tmp[0];
-        }
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id Cache id
-     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $tmp = $this->_memcache->get($id);
-        if (is_array($tmp)) {
-            return $tmp[1];
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data             Datas to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean True if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $lifetime = $this->getLifetime($specificLifetime);
-        if ($this->_options['compression']) {
-            $flag = MEMCACHE_COMPRESSED;
-        } else {
-            $flag = 0;
-        }
-
-        // ZF-8856: using set because add needs a second request if item already exists
-        $result = @$this->_memcache->set($id, array($data, time(), $lifetime), $flag, $lifetime);
-
-        if (count($tags) > 0) {
-            $this->_log("Zend_Cache_Backend_Memcached::save() : tags are unsupported by the Memcached backend");
-        }
-
-        return $result;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        return $this->_memcache->delete($id, 0);
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => unsupported
-     * 'matchingTag'    => unsupported
-     * 'notMatchingTag' => unsupported
-     * 'matchingAnyTag' => unsupported
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                return $this->_memcache->flush();
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $this->_log("Zend_Cache_Backend_Memcached::clean() : CLEANING_MODE_OLD is unsupported by the Memcached backend");
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_MEMCACHED_BACKEND);
-                break;
-               default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                   break;
-        }
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return false;
-    }
-
-    /**
-     * Set the frontend directives
-     *
-     * @param  array $directives Assoc of directives
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setDirectives($directives)
-    {
-        parent::setDirectives($directives);
-        $lifetime = $this->getLifetime(false);
-        if ($lifetime > 2592000) {
-            // #ZF-3490 : For the memcached backend, there is a lifetime limit of 30 days (2592000 seconds)
-            $this->_log('memcached backend has a limit of 30 days (2592000 seconds) for the lifetime');
-        }
-        if ($lifetime === null) {
-            // #ZF-4614 : we tranform null to zero to get the maximal lifetime
-            parent::setDirectives(array('lifetime' => 0));
-        }
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        $this->_log("Zend_Cache_Backend_Memcached::save() : getting the list of cache ids is unsupported by the Memcache backend");
-        return array();
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_MEMCACHED_BACKEND);
-        return array();
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @throws Zend_Cache_Exception
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        $mems = $this->_memcache->getExtendedStats();
-
-        $memSize = null;
-        $memUsed = null;
-        foreach ($mems as $key => $mem) {
-            if ($mem === false) {
-                $this->_log('can\'t get stat from ' . $key);
-                continue;
-            }
-
-            $eachSize = $mem['limit_maxbytes'];
-            $eachUsed = $mem['bytes'];
-            if ($eachUsed > $eachSize) {
-                $eachUsed = $eachSize;
-            }
-
-            $memSize += $eachSize;
-            $memUsed += $eachUsed;
-        }
-
-        if ($memSize === null || $memUsed === null) {
-            Zend_Cache::throwException('Can\'t get filling percentage');
-        }
-
-        return ((int) (100. * ($memUsed / $memSize)));
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        $tmp = $this->_memcache->get($id);
-        if (is_array($tmp)) {
-            $data = $tmp[0];
-            $mtime = $tmp[1];
-            if (!isset($tmp[2])) {
-                // because this record is only with 1.7 release
-                // if old cache records are still there...
-                return false;
-            }
-            $lifetime = $tmp[2];
-            return array(
-                'expire' => $mtime + $lifetime,
-                'tags' => array(),
-                'mtime' => $mtime
-            );
-        }
-        return false;
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        if ($this->_options['compression']) {
-            $flag = MEMCACHE_COMPRESSED;
-        } else {
-            $flag = 0;
-        }
-        $tmp = $this->_memcache->get($id);
-        if (is_array($tmp)) {
-            $data = $tmp[0];
-            $mtime = $tmp[1];
-            if (!isset($tmp[2])) {
-                // because this record is only with 1.7 release
-                // if old cache records are still there...
-                return false;
-            }
-            $lifetime = $tmp[2];
-            $newLifetime = $lifetime - (time() - $mtime) + $extraLifetime;
-            if ($newLifetime <=0) {
-                return false;
-            }
-            // #ZF-5702 : we try replace() first becase set() seems to be slower
-            if (!($result = $this->_memcache->replace($id, array($data, time(), $newLifetime), $flag, $newLifetime))) {
-                $result = $this->_memcache->set($id, array($data, time(), $newLifetime), $flag, $newLifetime);
-            }
-            return $result;
-        }
-        return false;
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => false,
-            'tags' => false,
-            'expired_read' => false,
-            'priority' => false,
-            'infinite_lifetime' => false,
-            'get_list' => false
-        );
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Sqlite.php b/airtime_mvc/library/Zend/Cache/Backend/Sqlite.php
deleted file mode 100644
index 5b81fc322..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Sqlite.php
+++ /dev/null
@@ -1,679 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Available options
-     *
-     * =====> (string) cache_db_complete_path :
-     * - the complete path (filename included) of the SQLITE database
-     *
-     * ====> (int) automatic_vacuum_factor :
-     * - Disable / Tune the automatic vacuum process
-     * - The automatic vacuum process defragment the database file (and make it smaller)
-     *   when a clean() or delete() is called
-     *     0               => no automatic vacuum
-     *     1               => systematic vacuum (when delete() or clean() methods are called)
-     *     x (integer) > 1 => automatic vacuum randomly 1 times on x clean() or delete()
-     *
-     * @var array Available options
-     */
-    protected $_options = array(
-        'cache_db_complete_path' => null,
-        'automatic_vacuum_factor' => 10
-    );
-
-    /**
-     * DB ressource
-     *
-     * @var mixed $_db
-     */
-    private $_db = null;
-
-    /**
-     * Boolean to store if the structure has benn checked or not
-     *
-     * @var boolean $_structureChecked
-     */
-    private $_structureChecked = false;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-        if ($this->_options['cache_db_complete_path'] === null) {
-            Zend_Cache::throwException('cache_db_complete_path option has to set');
-        }
-        if (!extension_loaded('sqlite')) {
-            Zend_Cache::throwException("Cannot use SQLite storage because the 'sqlite' extension is not loaded in the current PHP environment");
-        }
-        $this->_getConnection();
-    }
-
-    /**
-     * Destructor
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        @sqlite_close($this->_getConnection());
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false Cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $this->_checkAndBuildStructure();
-        $sql = "SELECT content FROM cache WHERE id='$id'";
-        if (!$doNotTestCacheValidity) {
-            $sql = $sql . " AND (expire=0 OR expire>" . time() . ')';
-        }
-        $result = $this->_query($sql);
-        $row = @sqlite_fetch_array($result);
-        if ($row) {
-            return $row['content'];
-        }
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param string $id Cache id
-     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $this->_checkAndBuildStructure();
-        $sql = "SELECT lastModified FROM cache WHERE id='$id' AND (expire=0 OR expire>" . time() . ')';
-        $result = $this->_query($sql);
-        $row = @sqlite_fetch_array($result);
-        if ($row) {
-            return ((int) $row['lastModified']);
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data             Datas to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $this->_checkAndBuildStructure();
-        $lifetime = $this->getLifetime($specificLifetime);
-        $data = @sqlite_escape_string($data);
-        $mktime = time();
-        if ($lifetime === null) {
-            $expire = 0;
-        } else {
-            $expire = $mktime + $lifetime;
-        }
-        $this->_query("DELETE FROM cache WHERE id='$id'");
-        $sql = "INSERT INTO cache (id, content, lastModified, expire) VALUES ('$id', '$data', $mktime, $expire)";
-        $res = $this->_query($sql);
-        if (!$res) {
-            $this->_log("Zend_Cache_Backend_Sqlite::save() : impossible to store the cache id=$id");
-            return false;
-        }
-        $res = true;
-        foreach ($tags as $tag) {
-            $res = $this->_registerTag($id, $tag) && $res;
-        }
-        return $res;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        $this->_checkAndBuildStructure();
-        $res = $this->_query("SELECT COUNT(*) AS nbr FROM cache WHERE id='$id'");
-        $result1 = @sqlite_fetch_single($res);
-        $result2 = $this->_query("DELETE FROM cache WHERE id='$id'");
-        $result3 = $this->_query("DELETE FROM tag WHERE id='$id'");
-        $this->_automaticVacuum();
-        return ($result1 && $result2 && $result3);
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean True if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        $this->_checkAndBuildStructure();
-        $return = $this->_clean($mode, $tags);
-        $this->_automaticVacuum();
-        return $return;
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        $this->_checkAndBuildStructure();
-        $res = $this->_query("SELECT id FROM cache WHERE (expire=0 OR expire>" . time() . ")");
-        $result = array();
-        while ($id = @sqlite_fetch_single($res)) {
-            $result[] = $id;
-        }
-        return $result;
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        $this->_checkAndBuildStructure();
-        $res = $this->_query("SELECT DISTINCT(name) AS name FROM tag");
-        $result = array();
-        while ($id = @sqlite_fetch_single($res)) {
-            $result[] = $id;
-        }
-        return $result;
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        $first = true;
-        $ids = array();
-        foreach ($tags as $tag) {
-            $res = $this->_query("SELECT DISTINCT(id) AS id FROM tag WHERE name='$tag'");
-            if (!$res) {
-                return array();
-            }
-            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
-            $ids2 = array();
-            foreach ($rows as $row) {
-                $ids2[] = $row['id'];
-            }
-            if ($first) {
-                $ids = $ids2;
-                $first = false;
-            } else {
-                $ids = array_intersect($ids, $ids2);
-            }
-        }
-        $result = array();
-        foreach ($ids as $id) {
-            $result[] = $id;
-        }
-        return $result;
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        $res = $this->_query("SELECT id FROM cache");
-        $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
-        $result = array();
-        foreach ($rows as $row) {
-            $id = $row['id'];
-            $matching = false;
-            foreach ($tags as $tag) {
-                $res = $this->_query("SELECT COUNT(*) AS nbr FROM tag WHERE name='$tag' AND id='$id'");
-                if (!$res) {
-                    return array();
-                }
-                $nbr = (int) @sqlite_fetch_single($res);
-                if ($nbr > 0) {
-                    $matching = true;
-                }
-            }
-            if (!$matching) {
-                $result[] = $id;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        $first = true;
-        $ids = array();
-        foreach ($tags as $tag) {
-            $res = $this->_query("SELECT DISTINCT(id) AS id FROM tag WHERE name='$tag'");
-            if (!$res) {
-                return array();
-            }
-            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
-            $ids2 = array();
-            foreach ($rows as $row) {
-                $ids2[] = $row['id'];
-            }
-            if ($first) {
-                $ids = $ids2;
-                $first = false;
-            } else {
-                $ids = array_merge($ids, $ids2);
-            }
-        }
-        $result = array();
-        foreach ($ids as $id) {
-            $result[] = $id;
-        }
-        return $result;
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @throws Zend_Cache_Exception
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        $dir = dirname($this->_options['cache_db_complete_path']);
-        $free = disk_free_space($dir);
-        $total = disk_total_space($dir);
-        if ($total == 0) {
-            Zend_Cache::throwException('can\'t get disk_total_space');
-        } else {
-            if ($free >= $total) {
-                return 100;
-            }
-            return ((int) (100. * ($total - $free) / $total));
-        }
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        $tags = array();
-        $res = $this->_query("SELECT name FROM tag WHERE id='$id'");
-        if ($res) {
-            $rows = @sqlite_fetch_all($res, SQLITE_ASSOC);
-            foreach ($rows as $row) {
-                $tags[] = $row['name'];
-            }
-        }
-        $this->_query('CREATE TABLE cache (id TEXT PRIMARY KEY, content BLOB, lastModified INTEGER, expire INTEGER)');
-        $res = $this->_query("SELECT lastModified,expire FROM cache WHERE id='$id'");
-        if (!$res) {
-            return false;
-        }
-        $row = @sqlite_fetch_array($res, SQLITE_ASSOC);
-        return array(
-            'tags' => $tags,
-            'mtime' => $row['lastModified'],
-            'expire' => $row['expire']
-        );
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        $sql = "SELECT expire FROM cache WHERE id='$id' AND (expire=0 OR expire>" . time() . ')';
-        $res = $this->_query($sql);
-        if (!$res) {
-            return false;
-        }
-        $expire = @sqlite_fetch_single($res);
-        $newExpire = $expire + $extraLifetime;
-        $res = $this->_query("UPDATE cache SET lastModified=" . time() . ", expire=$newExpire WHERE id='$id'");
-        if ($res) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => true,
-            'tags' => true,
-            'expired_read' => true,
-            'priority' => false,
-            'infinite_lifetime' => true,
-            'get_list' => true
-        );
-    }
-
-    /**
-     * PUBLIC METHOD FOR UNIT TESTING ONLY !
-     *
-     * Force a cache record to expire
-     *
-     * @param string $id Cache id
-     */
-    public function ___expire($id)
-    {
-        $time = time() - 1;
-        $this->_query("UPDATE cache SET lastModified=$time, expire=$time WHERE id='$id'");
-    }
-
-    /**
-     * Return the connection resource
-     *
-     * If we are not connected, the connection is made
-     *
-     * @throws Zend_Cache_Exception
-     * @return resource Connection resource
-     */
-    private function _getConnection()
-    {
-        if (is_resource($this->_db)) {
-            return $this->_db;
-        } else {
-            $this->_db = @sqlite_open($this->_options['cache_db_complete_path']);
-            if (!(is_resource($this->_db))) {
-                Zend_Cache::throwException("Impossible to open " . $this->_options['cache_db_complete_path'] . " cache DB file");
-            }
-            return $this->_db;
-        }
-    }
-
-    /**
-     * Execute an SQL query silently
-     *
-     * @param string $query SQL query
-     * @return mixed|false query results
-     */
-    private function _query($query)
-    {
-        $db = $this->_getConnection();
-        if (is_resource($db)) {
-            $res = @sqlite_query($db, $query);
-            if ($res === false) {
-                return false;
-            } else {
-                return $res;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Deal with the automatic vacuum process
-     *
-     * @return void
-     */
-    private function _automaticVacuum()
-    {
-        if ($this->_options['automatic_vacuum_factor'] > 0) {
-            $rand = rand(1, $this->_options['automatic_vacuum_factor']);
-            if ($rand == 1) {
-                $this->_query('VACUUM');
-                @sqlite_close($this->_getConnection());
-            }
-        }
-    }
-
-    /**
-     * Register a cache id with the given tag
-     *
-     * @param  string $id  Cache id
-     * @param  string $tag Tag
-     * @return boolean True if no problem
-     */
-    private function _registerTag($id, $tag) {
-        $res = $this->_query("DELETE FROM TAG WHERE name='$tag' AND id='$id'");
-        $res = $this->_query("INSERT INTO tag (name, id) VALUES ('$tag', '$id')");
-        if (!$res) {
-            $this->_log("Zend_Cache_Backend_Sqlite::_registerTag() : impossible to register tag=$tag on id=$id");
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Build the database structure
-     *
-     * @return false
-     */
-    private function _buildStructure()
-    {
-        $this->_query('DROP INDEX tag_id_index');
-        $this->_query('DROP INDEX tag_name_index');
-        $this->_query('DROP INDEX cache_id_expire_index');
-        $this->_query('DROP TABLE version');
-        $this->_query('DROP TABLE cache');
-        $this->_query('DROP TABLE tag');
-        $this->_query('CREATE TABLE version (num INTEGER PRIMARY KEY)');
-        $this->_query('CREATE TABLE cache (id TEXT PRIMARY KEY, content BLOB, lastModified INTEGER, expire INTEGER)');
-        $this->_query('CREATE TABLE tag (name TEXT, id TEXT)');
-        $this->_query('CREATE INDEX tag_id_index ON tag(id)');
-        $this->_query('CREATE INDEX tag_name_index ON tag(name)');
-        $this->_query('CREATE INDEX cache_id_expire_index ON cache(id, expire)');
-        $this->_query('INSERT INTO version (num) VALUES (1)');
-    }
-
-    /**
-     * Check if the database structure is ok (with the good version)
-     *
-     * @return boolean True if ok
-     */
-    private function _checkStructureVersion()
-    {
-        $result = $this->_query("SELECT num FROM version");
-        if (!$result) return false;
-        $row = @sqlite_fetch_array($result);
-        if (!$row) {
-            return false;
-        }
-        if (((int) $row['num']) != 1) {
-            // old cache structure
-            $this->_log('Zend_Cache_Backend_Sqlite::_checkStructureVersion() : old cache structure version detected => the cache is going to be dropped');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean True if no problem
-     */
-    private function _clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                $res1 = $this->_query('DELETE FROM cache');
-                $res2 = $this->_query('DELETE FROM tag');
-                return $res1 && $res2;
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $mktime = time();
-                $res1 = $this->_query("DELETE FROM tag WHERE id IN (SELECT id FROM cache WHERE expire>0 AND expire<=$mktime)");
-                $res2 = $this->_query("DELETE FROM cache WHERE expire>0 AND expire<=$mktime");
-                return $res1 && $res2;
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-                $ids = $this->getIdsMatchingTags($tags);
-                $result = true;
-                foreach ($ids as $id) {
-                    $result = $this->remove($id) && $result;
-                }
-                return $result;
-                break;
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-                $ids = $this->getIdsNotMatchingTags($tags);
-                $result = true;
-                foreach ($ids as $id) {
-                    $result = $this->remove($id) && $result;
-                }
-                return $result;
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $ids = $this->getIdsMatchingAnyTags($tags);
-                $result = true;
-                foreach ($ids as $id) {
-                    $result = $this->remove($id) && $result;
-                }
-                return $result;
-                break;
-            default:
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Check if the database structure is ok (with the good version), if no : build it
-     *
-     * @throws Zend_Cache_Exception
-     * @return boolean True if ok
-     */
-    private function _checkAndBuildStructure()
-    {
-        if (!($this->_structureChecked)) {
-            if (!$this->_checkStructureVersion()) {
-                $this->_buildStructure();
-                if (!$this->_checkStructureVersion()) {
-                    Zend_Cache::throwException("Impossible to build cache structure in " . $this->_options['cache_db_complete_path']);
-                }
-            }
-            $this->_structureChecked = true;
-        }
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Static.php b/airtime_mvc/library/Zend/Cache/Backend/Static.php
deleted file mode 100644
index 224e9d4e7..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Static.php
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlackHole.php 17867 2009-08-28 09:42:11Z yoshida@zend.co.jp $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Static 
-    extends Zend_Cache_Backend 
-    implements Zend_Cache_Backend_Interface
-{
-    const INNER_CACHE_NAME = 'zend_cache_backend_static_tagcache';
-
-    /**
-     * Static backend options
-     * @var array
-     */
-    protected $_options = array(
-        'public_dir'            => null,
-        'sub_dir'               => 'html',
-        'file_extension'        => '.html',
-        'index_filename'        => 'index',
-        'file_locking'          => true,
-        'cache_file_umask'      => 0600,
-        'cache_directory_umask' => 0700,
-        'debug_header'          => false,
-        'tag_cache'             => null,
-        'disable_caching'       => false
-    );
-
-    /**
-     * Cache for handling tags
-     * @var Zend_Cache_Core
-     */
-    protected $_tagCache = null;
-
-    /**
-     * Tagged items
-     * @var array
-     */
-    protected $_tagged = null;
-
-    /**
-     * Interceptor child method to handle the case where an Inner
-     * Cache object is being set since it's not supported by the
-     * standard backend interface
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Cache_Backend_Static
-     */
-    public function setOption($name, $value)
-    {
-        if ($name == 'tag_cache') {
-            $this->setInnerCache($value);
-        } else {
-            parent::setOption($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve any option via interception of the parent's statically held
-     * options including the local option for a tag cache.
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getOption($name)
-    {
-        if ($name == 'tag_cache') {
-            return $this->getInnerCache();
-        } else {
-            if (in_array($name, $this->_options)) {
-                return $this->_options[$name];
-            }
-            if ($name == 'lifetime') {
-                return parent::getLifetime();
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * Note : return value is always "string" (unserialization is done by the core not by the backend)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        if (empty($id)) {
-            $id = $this->_detectId();
-        } else {
-            $id = $this->_decodeId($id);
-        }
-        if (!$this->_verifyPath($id)) {
-            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
-        }
-        if ($doNotTestCacheValidity) {
-            $this->_log("Zend_Cache_Backend_Static::load() : \$doNotTestCacheValidity=true is unsupported by the Static backend");
-        }
-
-        $fileName = basename($id);
-        if (empty($fileName)) {
-            $fileName = $this->_options['index_filename'];
-        }
-        $pathName = $this->_options['public_dir'] . dirname($id);
-        $file     = rtrim($pathName, '/') . '/' . $fileName . $this->_options['file_extension'];
-        if (file_exists($file)) {
-            $content = file_get_contents($file);
-            return $content;
-        }
-
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return bool 
-     */
-    public function test($id)
-    {
-        $id = $this->_decodeId($id);
-        if (!$this->_verifyPath($id)) {
-            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
-        }
-
-        $fileName = basename($id);
-        if (empty($fileName)) {
-            $fileName = $this->_options['index_filename'];
-        }
-        if (is_null($this->_tagged) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
-            $this->_tagged = $tagged;
-        } elseif (!$this->_tagged) {
-            return false;
-        }
-        $pathName = $this->_options['public_dir'] . dirname($id);
-        
-        // Switch extension if needed
-        if (isset($this->_tagged[$id])) {
-            $extension = $this->_tagged[$id]['extension'];
-        } else {
-            $extension = $this->_options['file_extension'];
-        }
-        $file     = $pathName . '/' . $fileName . $extension;
-        if (file_exists($file)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data            Datas to cache
-     * @param  string $id              Cache id
-     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        if ($this->_options['disable_caching']) {
-            return true;
-        }
-        $extension = null;
-        if ($this->_isSerialized($data)) {
-            $data = unserialize($data);
-            $extension = '.' . ltrim($data[1], '.');
-            $data = $data[0];
-        }
-
-        clearstatcache();
-        if (is_null($id) || strlen($id) == 0) {
-            $id = $this->_detectId();
-        } else {
-            $id = $this->_decodeId($id);
-        }
-
-        $fileName = basename($id);
-        if (empty($fileName)) {
-            $fileName = $this->_options['index_filename'];
-        }
-
-        $pathName = realpath($this->_options['public_dir']) . dirname($id);
-        $this->_createDirectoriesFor($pathName);
-
-        if (is_null($id) || strlen($id) == 0) {
-            $dataUnserialized = unserialize($data);
-            $data = $dataUnserialized['data'];
-        }
-        $ext = $this->_options['file_extension'];
-        if ($extension) $ext = $extension;
-        $file = rtrim($pathName, '/') . '/' . $fileName . $ext;
-        if ($this->_options['file_locking']) {
-            $result = file_put_contents($file, $data, LOCK_EX);
-        } else {
-            $result = file_put_contents($file, $data);
-        }
-        @chmod($file, $this->_octdec($this->_options['cache_file_umask']));
-
-        if (is_null($this->_tagged) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
-            $this->_tagged = $tagged;
-        } elseif (is_null($this->_tagged)) {
-            $this->_tagged = array();
-        }
-        if (!isset($this->_tagged[$id])) {
-            $this->_tagged[$id] = array();
-        }
-        if (!isset($this->_tagged[$id]['tags'])) {
-            $this->_tagged[$id]['tags'] = array();
-        }
-        $this->_tagged[$id]['tags'] = array_unique(array_merge($this->_tagged[$id]['tags'], $tags));
-        $this->_tagged[$id]['extension'] = $ext;
-        $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
-        return (bool) $result;
-    }
-    
-    /**
-     * Recursively create the directories needed to write the static file
-     */
-    protected function _createDirectoriesFor($path)
-    {
-        $parts = explode('/', $path);
-        $directory = '';
-        foreach ($parts as $part) {
-            $directory = rtrim($directory, '/') . '/' . $part;
-            if (!is_dir($directory)) {
-                mkdir($directory, $this->_octdec($this->_options['cache_directory_umask']));
-            }
-        }
-    }
-    
-    /**
-     * Detect serialization of data (cannot predict since this is the only way
-     * to obey the interface yet pass in another parameter).
-     *
-     * In future, ZF 2.0, check if we can just avoid the interface restraints.
-     *
-     * This format is the only valid one possible for the class, so it's simple
-     * to just run a regular expression for the starting serialized format.
-     */
-    protected function _isSerialized($data)
-    {
-        return preg_match("/a:2:\{i:0;s:\d+:\"/", $data);
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        if (!$this->_verifyPath($id)) {
-            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
-        }
-        $fileName = basename($id);
-        if (is_null($this->_tagged) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
-            $this->_tagged = $tagged;
-        } elseif (!$this->_tagged) {
-            return false;
-        }
-        if (isset($this->_tagged[$id])) {
-            $extension = $this->_tagged[$id]['extension'];
-        } else {
-            $extension = $this->_options['file_extension'];
-        }
-        if (empty($fileName)) {
-            $fileName = $this->_options['index_filename'];
-        }
-        $pathName = $this->_options['public_dir'] . dirname($id);
-        $file     = realpath($pathName) . '/' . $fileName . $extension;
-        if (!file_exists($file)) {
-            return false;
-        }
-        return unlink($file);
-    }
-
-    /**
-     * Remove a cache record recursively for the given directory matching a
-     * REQUEST_URI based relative path (deletes the actual file matching this
-     * in addition to the matching directory)
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function removeRecursively($id)
-    {
-        if (!$this->_verifyPath($id)) {
-            Zend_Cache::throwException('Invalid cache id: does not match expected public_dir path');
-        }
-        $fileName = basename($id);
-        if (empty($fileName)) {
-            $fileName = $this->_options['index_filename'];
-        }
-        $pathName  = $this->_options['public_dir'] . dirname($id);
-        $file      = $pathName . '/' . $fileName . $this->_options['file_extension'];
-        $directory = $pathName . '/' . $fileName;
-        if (file_exists($directory)) {
-            if (!is_writable($directory)) {
-                return false;
-            }
-            foreach (new DirectoryIterator($directory) as $file) {
-                if (true === $file->isFile()) {
-                    if (false === unlink($file->getPathName())) {
-                        return false;
-                    }
-                }
-            }
-            rmdir(dirname($path));
-        }
-        if (file_exists($file)) {
-            if (!is_writable($file)) {
-                return false;
-            }
-            return unlink($file);
-        }
-        return true;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        $result = false;
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                if (empty($tags)) {
-                    throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
-                }
-                if (is_null($this->_tagged) && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) {
-                    $this->_tagged = $tagged;
-                } elseif (!$this->_tagged) {
-                    return true;
-                }
-                foreach ($tags as $tag) {
-                    $urls = array_keys($this->_tagged);
-                    foreach ($urls as $url) {
-                        if (isset($this->_tagged[$url]['tags']) && in_array($tag, $this->_tagged[$url]['tags'])) {
-                            $this->remove($url);
-                            unset($this->_tagged[$url]);
-                        }
-                    }
-                }
-                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
-                $result = true;
-                break;
-            case Zend_Cache::CLEANING_MODE_ALL:
-                if (is_null($this->_tagged)) {
-                    $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
-                    $this->_tagged = $tagged;
-                }
-                if (is_null($this->_tagged) || empty($this->_tagged)) {
-                    return true;
-                }
-                $urls = array_keys($this->_tagged);
-                foreach ($urls as $url) {
-                    $this->remove($url);
-                    unset($this->_tagged[$url]);
-                }
-                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
-                $result = true;
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $this->_log("Zend_Cache_Backend_Static : Selected Cleaning Mode Currently Unsupported By This Backend");
-                break;
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-                if (empty($tags)) {
-                    throw new Zend_Exception('Cannot use tag matching modes as no tags were defined');
-                }
-                if (is_null($this->_tagged)) {
-                    $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME);
-                    $this->_tagged = $tagged;
-                }
-                if (is_null($this->_tagged) || empty($this->_tagged)) {
-                    return true;
-                }
-                $urls = array_keys($this->_tagged);
-                foreach ($urls as $url) {
-                    $difference = array_diff($tags, $this->_tagged[$url]['tags']);
-                    if (count($tags) == count($difference)) {
-                        $this->remove($url);
-                        unset($this->_tagged[$url]);
-                    }
-                }
-                $this->getInnerCache()->save($this->_tagged, self::INNER_CACHE_NAME);
-                $result = true;
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-        return $result;
-    }
-
-    /**
-     * Set an Inner Cache, used here primarily to store Tags associated
-     * with caches created by this backend. Note: If Tags are lost, the cache
-     * should be completely cleaned as the mapping of tags to caches will
-     * have been irrevocably lost.
-     *
-     * @param  Zend_Cache_Core
-     * @return void
-     */
-    public function setInnerCache(Zend_Cache_Core $cache)
-    {
-        $this->_tagCache = $cache;
-        $this->_options['tag_cache'] = $cache;
-    }
-
-    /**
-     * Get the Inner Cache if set
-     *
-     * @return Zend_Cache_Core
-     */
-    public function getInnerCache()
-    {
-        if (is_null($this->_tagCache)) {
-            Zend_Cache::throwException('An Inner Cache has not been set; use setInnerCache()');
-        }
-        return $this->_tagCache;
-    }
-
-    /**
-     * Verify path exists and is non-empty
-     * 
-     * @param  string $path 
-     * @return bool
-     */
-    protected function _verifyPath($path)
-    {
-        $path = realpath($path);
-        $base = realpath($this->_options['public_dir']);
-        return strncmp($path, $base, strlen($base)) !== 0;
-    }
-
-    /**
-     * Determine the page to save from the request
-     * 
-     * @return string
-     */
-    protected function _detectId()
-    {
-        return $_SERVER['REQUEST_URI'];
-    }
-
-    /**
-     * Validate a cache id or a tag (security, reliable filenames, reserved prefixes...)
-     *
-     * Throw an exception if a problem is found
-     *
-     * @param  string $string Cache id or tag
-     * @throws Zend_Cache_Exception
-     * @return void
-     * @deprecated Not usable until perhaps ZF 2.0
-     */
-    protected static function _validateIdOrTag($string)
-    {
-        if (!is_string($string)) {
-            Zend_Cache::throwException('Invalid id or tag : must be a string');
-        }
-
-        // Internal only checked in Frontend - not here!
-        if (substr($string, 0, 9) == 'internal-') {
-            return;
-        }
-
-        // Validation assumes no query string, fragments or scheme included - only the path
-        if (!preg_match(
-                '/^(?:\/(?:(?:%[[:xdigit:]]{2}|[A-Za-z0-9-_.!~*\'()\[\]:@&=+$,;])*)?)+$/', 
-                $string
-            )
-        ) {
-            Zend_Cache::throwException("Invalid id or tag '$string' : must be a valid URL path");
-        }
-    }
-    
-    /**
-     * Detect an octal string and return its octal value for file permission ops
-     * otherwise return the non-string (assumed octal or decimal int already)
-     *
-     * @param $val The potential octal in need of conversion
-     * @return int
-     */
-    protected function _octdec($val)
-    {
-        if (decoct(octdec($val)) == $val && is_string($val)) {
-            return octdec($val);
-        }
-        return $val;
-    }
-    
-    /**
-     * Decode a request URI from the provided ID
-     */
-    protected function _decodeId($id)
-    {
-        return pack('H*', $id);;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Test.php b/airtime_mvc/library/Zend/Cache/Backend/Test.php
deleted file mode 100644
index eaeec3b4b..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Test.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Test.php 21292 2010-03-02 10:25:22Z mabe $
- */
-
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Available options
-     *
-     * @var array available options
-     */
-    protected $_options = array();
-
-    /**
-     * Frontend or Core directives
-     *
-     * @var array directives
-     */
-    protected $_directives = array();
-
-    /**
-     * Array to log actions
-     *
-     * @var array $_log
-     */
-    private $_log = array();
-
-    /**
-     * Current index for log array
-     *
-     * @var int $_index
-     */
-    private $_index = 0;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        $this->_addLog('construct', array($options));
-    }
-
-    /**
-     * Set the frontend directives
-     *
-     * @param  array $directives assoc of directives
-     * @return void
-     */
-    public function setDirectives($directives)
-    {
-        $this->_addLog('setDirectives', array($directives));
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * For this test backend only, if $id == 'false', then the method will return false
-     * if $id == 'serialized', the method will return a serialized array
-     * ('foo' else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string Cached datas (or false)
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $this->_addLog('get', array($id, $doNotTestCacheValidity));
-        if ( $id == 'false'
-          || $id == 'd8523b3ee441006261eeffa5c3d3a0a7'
-          || $id == 'e83249ea22178277d5befc2c5e2e9ace'
-          || $id == '40f649b94977c0a6e76902e2a0b43587')
-        {
-            return false;
-        }
-        if ($id=='serialized') {
-            return serialize(array('foo'));
-        }
-        if ($id=='serialized2') {
-            return serialize(array('headers' => array(), 'data' => 'foo'));
-        }
-        if (($id=='71769f39054f75894288e397df04e445') or ($id=='615d222619fb20b527168340cebd0578')) {
-            return serialize(array('foo', 'bar'));
-        }
-        if (($id=='8a02d218a5165c467e7a5747cc6bd4b6') or ($id=='648aca1366211d17cbf48e65dc570bee')) {
-            return serialize(array('foo', 'bar'));
-        }
-        return 'foo';
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * For this test backend only, if $id == 'false', then the method will return false
-     * (123456 else)
-     *
-     * @param  string $id Cache id
-     * @return mixed|false false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $this->_addLog('test', array($id));
-        if ($id=='false') {
-            return false;
-        }
-        if (($id=='3c439c922209e2cb0b54d6deffccd75a')) {
-            return false;
-        }
-        return 123456;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * For this test backend only, if $id == 'false', then the method will return false
-     * (true else)
-     *
-     * @param  string $data             Datas to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean True if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $this->_addLog('save', array($data, $id, $tags));
-        if ($id=='false') {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * For this test backend only, if $id == 'false', then the method will return false
-     * (true else)
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        $this->_addLog('remove', array($id));
-        if ($id=='false') {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * For this test backend only, if $mode == 'false', then the method will return false
-     * (true else)
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @return boolean True if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        $this->_addLog('clean', array($mode, $tags));
-        if ($mode=='false') {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Get the last log
-     *
-     * @return string The last log
-     */
-    public function getLastLog()
-    {
-        return $this->_log[$this->_index - 1];
-    }
-
-    /**
-     * Get the log index
-     *
-     * @return int Log index
-     */
-    public function getLogIndex()
-    {
-        return $this->_index;
-    }
-
-    /**
-     * Get the complete log array
-     *
-     * @return array Complete log array
-     */
-    public function getAllLogs()
-    {
-        return $this->_log;
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return true;
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        return array(
-            'prefix_id1', 'prefix_id2'
-        );
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        return array(
-            'tag1', 'tag2'
-        );
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        if ($tags == array('tag1', 'tag2')) {
-            return array('prefix_id1', 'prefix_id2');
-        }
-
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        if ($tags == array('tag3', 'tag4')) {
-            return array('prefix_id3', 'prefix_id4');
-        }
-
-        return array();
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        if ($tags == array('tag5', 'tag6')) {
-            return array('prefix_id5', 'prefix_id6');
-        }
-
-        return array();
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        return 50;
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        return false;
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        return true;
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'automatic_cleaning' => true,
-            'tags'               => true,
-            'expired_read'       => false,
-            'priority'           => true,
-            'infinite_lifetime'  => true,
-            'get_list'           => true
-        );
-    }
-
-    /**
-     * Add an event to the log array
-     *
-     * @param  string $methodName MethodName
-     * @param  array  $args       Arguments
-     * @return void
-     */
-    private function _addLog($methodName, $args)
-    {
-        $this->_log[$this->_index] = array(
-            'methodName' => $methodName,
-            'args' => $args
-        );
-        $this->_index = $this->_index + 1;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/TwoLevels.php b/airtime_mvc/library/Zend/Cache/Backend/TwoLevels.php
deleted file mode 100644
index c02784494..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/TwoLevels.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TwoLevels.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Backend_ExtendedInterface
- */
-require_once 'Zend/Cache/Backend/ExtendedInterface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface
-{
-    /**
-     * Available options
-     *
-     * =====> (string) slow_backend :
-     * - Slow backend name
-     * - Must implement the Zend_Cache_Backend_ExtendedInterface
-     * - Should provide a big storage
-     *
-     * =====> (string) fast_backend :
-     * - Flow backend name
-     * - Must implement the Zend_Cache_Backend_ExtendedInterface
-     * - Must be much faster than slow_backend
-     *
-     * =====> (array) slow_backend_options :
-     * - Slow backend options (see corresponding backend)
-     *
-     * =====> (array) fast_backend_options :
-     * - Fast backend options (see corresponding backend)
-     *
-     * =====> (int) stats_update_factor :
-     * - Disable / Tune the computation of the fast backend filling percentage
-     * - When saving a record into cache :
-     *     1               => systematic computation of the fast backend filling percentage
-     *     x (integer) > 1 => computation of the fast backend filling percentage randomly 1 times on x cache write
-     *
-     * =====> (boolean) slow_backend_custom_naming :
-     * =====> (boolean) fast_backend_custom_naming :
-     * =====> (boolean) slow_backend_autoload :
-     * =====> (boolean) fast_backend_autoload :
-     * - See Zend_Cache::factory() method
-     *
-     * =====> (boolean) auto_refresh_fast_cache
-     * - If true, auto refresh the fast cache when a cache record is hit
-     *
-     * @var array available options
-     */
-    protected $_options = array(
-        'slow_backend' => 'File',
-        'fast_backend' => 'Apc',
-        'slow_backend_options' => array(),
-        'fast_backend_options' => array(),
-        'stats_update_factor' => 10,
-        'slow_backend_custom_naming' => false,
-        'fast_backend_custom_naming' => false,
-        'slow_backend_autoload' => false,
-        'fast_backend_autoload' => false,
-        'auto_refresh_fast_cache' => true
-    );
-
-    /**
-     * Slow Backend
-     *
-     * @var Zend_Cache_Backend
-     */
-    protected $_slowBackend;
-
-    /**
-     * Fast Backend
-     *
-     * @var Zend_Cache_Backend
-     */
-    protected $_fastBackend;
-
-    /**
-     * Cache for the fast backend filling percentage
-     *
-     * @var int
-     */
-    protected $_fastBackendFillingPercentage = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-        if ($this->_options['slow_backend'] === null) {
-            Zend_Cache::throwException('slow_backend option has to set');
-        }
-        if ($this->_options['fast_backend'] === null) {
-            Zend_Cache::throwException('fast_backend option has to set');
-        }
-        $this->_slowBackend = Zend_Cache::_makeBackend($this->_options['slow_backend'], $this->_options['slow_backend_options'], $this->_options['slow_backend_custom_naming'], $this->_options['slow_backend_autoload']);
-        $this->_fastBackend = Zend_Cache::_makeBackend($this->_options['fast_backend'], $this->_options['fast_backend_options'], $this->_options['fast_backend_custom_naming'], $this->_options['fast_backend_autoload']);
-        if (!in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_slowBackend))) {
-            Zend_Cache::throwException('slow_backend must implement the Zend_Cache_Backend_ExtendedInterface interface');
-        }
-        if (!in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_fastBackend))) {
-            Zend_Cache::throwException('fast_backend must implement the Zend_Cache_Backend_ExtendedInterface interface');
-        }
-        $this->_slowBackend->setDirectives($this->_directives);
-        $this->_fastBackend->setDirectives($this->_directives);
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $fastTest = $this->_fastBackend->test($id);
-        if ($fastTest) {
-            return $fastTest;
-        } else {
-            return $this->_slowBackend->test($id);
-        }
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data            Datas to cache
-     * @param  string $id              Cache id
-     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false, $priority = 8)
-    {
-        $usage = $this->_getFastFillingPercentage('saving');
-        $boolFast = true;
-        $lifetime = $this->getLifetime($specificLifetime);
-        $preparedData = $this->_prepareData($data, $lifetime, $priority);
-        if (($priority > 0) && (10 * $priority >= $usage)) {
-            $fastLifetime = $this->_getFastLifetime($lifetime, $priority);
-            $boolFast = $this->_fastBackend->save($preparedData, $id, array(), $fastLifetime);
-        }
-        $boolSlow = $this->_slowBackend->save($preparedData, $id, $tags, $lifetime);
-        return ($boolFast && $boolSlow);
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * Note : return value is always "string" (unserialization is done by the core not by the backend)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string|false cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $res = $this->_fastBackend->load($id, $doNotTestCacheValidity);
-        if ($res === false) {
-            $res = $this->_slowBackend->load($id, $doNotTestCacheValidity);
-            if ($res === false) {
-                // there is no cache at all for this id
-                return false;
-            }
-        }
-        $array = unserialize($res);
-        // maybe, we have to refresh the fast cache ?
-        if ($this->_options['auto_refresh_fast_cache']) {
-            if ($array['priority'] == 10) {
-                // no need to refresh the fast cache with priority = 10
-                return $array['data'];
-            }
-            $newFastLifetime = $this->_getFastLifetime($array['lifetime'], $array['priority'], time() - $array['expire']);
-            // we have the time to refresh the fast cache
-            $usage = $this->_getFastFillingPercentage('loading');
-            if (($array['priority'] > 0) && (10 * $array['priority'] >= $usage)) {
-                // we can refresh the fast cache
-                $preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']);
-                $this->_fastBackend->save($preparedData, $id, array(), $newFastLifetime);
-            }
-        }
-        return $array['data'];
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        $boolFast = $this->_fastBackend->remove($id);
-        $boolSlow = $this->_slowBackend->remove($id);
-        return $boolFast && $boolSlow;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                $boolFast = $this->_fastBackend->clean(Zend_Cache::CLEANING_MODE_ALL);
-                $boolSlow = $this->_slowBackend->clean(Zend_Cache::CLEANING_MODE_ALL);
-                return $boolFast && $boolSlow;
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                return $this->_slowBackend->clean(Zend_Cache::CLEANING_MODE_OLD);
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-                $ids = $this->_slowBackend->getIdsMatchingTags($tags);
-                $res = true;
-                foreach ($ids as $id) {
-                    $bool = $this->remove($id);
-                    $res = $res && $bool;
-                }
-                return $res;
-                break;
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-                $ids = $this->_slowBackend->getIdsNotMatchingTags($tags);
-                $res = true;
-                foreach ($ids as $id) {
-                    $bool = $this->remove($id);
-                    $res = $res && $bool;
-                }
-                return $res;
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $ids = $this->_slowBackend->getIdsMatchingAnyTags($tags);
-                $res = true;
-                foreach ($ids as $id) {
-                    $bool = $this->remove($id);
-                    $res = $res && $bool;
-                }
-                return $res;
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        return $this->_slowBackend->getIds();
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        return $this->_slowBackend->getTags();
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        return $this->_slowBackend->getIdsMatchingTags($tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        return $this->_slowBackend->getIdsNotMatchingTags($tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of any matching cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        return $this->_slowBackend->getIdsMatchingAnyTags($tags);
-    }
-
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        return $this->_slowBackend->getFillingPercentage();
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array must include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        return $this->_slowBackend->getMetadatas($id);
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        return $this->_slowBackend->touch($id, $extraLifetime);
-    }
-
-    /**
-     * Return an associative array of capabilities (booleans) of the backend
-     *
-     * The array must include these keys :
-     * - automatic_cleaning (is automating cleaning necessary)
-     * - tags (are tags supported)
-     * - expired_read (is it possible to read expired cache records
-     *                 (for doNotTestCacheValidity option for example))
-     * - priority does the backend deal with priority when saving
-     * - infinite_lifetime (is infinite lifetime can work with this backend)
-     * - get_list (is it possible to get the list of cache ids and the complete list of tags)
-     *
-     * @return array associative of with capabilities
-     */
-    public function getCapabilities()
-    {
-        $slowBackendCapabilities = $this->_slowBackend->getCapabilities();
-        return array(
-            'automatic_cleaning' => $slowBackendCapabilities['automatic_cleaning'],
-            'tags' => $slowBackendCapabilities['tags'],
-            'expired_read' => $slowBackendCapabilities['expired_read'],
-            'priority' => $slowBackendCapabilities['priority'],
-            'infinite_lifetime' => $slowBackendCapabilities['infinite_lifetime'],
-            'get_list' => $slowBackendCapabilities['get_list']
-        );
-    }
-
-    /**
-     * Prepare a serialized array to store datas and metadatas informations
-     *
-     * @param string $data data to store
-     * @param int $lifetime original lifetime
-     * @param int $priority priority
-     * @return string serialize array to store into cache
-     */
-    private function _prepareData($data, $lifetime, $priority)
-    {
-        $lt = $lifetime;
-        if ($lt === null) {
-            $lt = 9999999999;
-        }
-        return serialize(array(
-            'data' => $data,
-            'lifetime' => $lifetime,
-            'expire' => time() + $lt,
-            'priority' => $priority
-        ));
-    }
-
-    /**
-     * Compute and return the lifetime for the fast backend
-     *
-     * @param int $lifetime original lifetime
-     * @param int $priority priority
-     * @param int $maxLifetime maximum lifetime
-     * @return int lifetime for the fast backend
-     */
-    private function _getFastLifetime($lifetime, $priority, $maxLifetime = null)
-    {
-        if ($lifetime === null) {
-            // if lifetime is null, we have an infinite lifetime
-            // we need to use arbitrary lifetimes
-            $fastLifetime = (int) (2592000 / (11 - $priority));
-        } else {
-            $fastLifetime = (int) ($lifetime / (11 - $priority));
-        }
-        if (($maxLifetime !== null) && ($maxLifetime >= 0)) {
-            if ($fastLifetime > $maxLifetime) {
-                return $maxLifetime;
-            }
-        }
-        return $fastLifetime;
-    }
-
-    /**
-     * PUBLIC METHOD FOR UNIT TESTING ONLY !
-     *
-     * Force a cache record to expire
-     *
-     * @param string $id cache id
-     */
-    public function ___expire($id)
-    {
-        $this->_fastBackend->remove($id);
-        $this->_slowBackend->___expire($id);
-    }
-
-    private function _getFastFillingPercentage($mode)
-    {
-
-        if ($mode == 'saving') {
-            // mode saving
-            if ($this->_fastBackendFillingPercentage === null) {
-                $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
-            } else {
-                $rand = rand(1, $this->_options['stats_update_factor']);
-                if ($rand == 1) {
-                    // we force a refresh
-                    $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
-                }
-            }
-        } else {
-            // mode loading
-            // we compute the percentage only if it's not available in cache
-            if ($this->_fastBackendFillingPercentage === null) {
-                $this->_fastBackendFillingPercentage = $this->_fastBackend->getFillingPercentage();
-            }
-        }
-        return $this->_fastBackendFillingPercentage;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/Xcache.php b/airtime_mvc/library/Zend/Cache/Backend/Xcache.php
deleted file mode 100644
index fbdf4d0f4..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/Xcache.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xcache.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/**
- * @see Zend_Cache_Backend
- */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
-{
-
-    /**
-     * Log message
-     */
-    const TAGS_UNSUPPORTED_BY_CLEAN_OF_XCACHE_BACKEND = 'Zend_Cache_Backend_Xcache::clean() : tags are unsupported by the Xcache backend';
-    const TAGS_UNSUPPORTED_BY_SAVE_OF_XCACHE_BACKEND =  'Zend_Cache_Backend_Xcache::save() : tags are unsupported by the Xcache backend';
-
-    /**
-     * Available options
-     *
-     * =====> (string) user :
-     * xcache.admin.user (necessary for the clean() method)
-     *
-     * =====> (string) password :
-     * xcache.admin.pass (clear, not MD5) (necessary for the clean() method)
-     *
-     * @var array available options
-     */
-    protected $_options = array(
-        'user' => null,
-        'password' => null
-    );
-
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        if (!extension_loaded('xcache')) {
-            Zend_Cache::throwException('The xcache extension must be loaded for using this backend !');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * WARNING $doNotTestCacheValidity=true is unsupported by the Xcache backend
-     *
-     * @param  string  $id                     cache id
-     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-     * @return string cached datas (or false)
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        if ($doNotTestCacheValidity) {
-            $this->_log("Zend_Cache_Backend_Xcache::load() : \$doNotTestCacheValidity=true is unsupported by the Xcache backend");
-        }
-        $tmp = xcache_get($id);
-        if (is_array($tmp)) {
-            return $tmp[0];
-        }
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        if (xcache_isset($id)) {
-            $tmp = xcache_get($id);
-            if (is_array($tmp)) {
-                return $tmp[1];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param string $data datas to cache
-     * @param string $id cache id
-     * @param array $tags array of strings, the cache record will be tagged by each string entry
-     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $lifetime = $this->getLifetime($specificLifetime);
-        $result = xcache_set($id, array($data, time()), $lifetime);
-        if (count($tags) > 0) {
-            $this->_log(self::TAGS_UNSUPPORTED_BY_SAVE_OF_XCACHE_BACKEND);
-        }
-        return $result;
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id cache id
-     * @return boolean true if no problem
-     */
-    public function remove($id)
-    {
-        return xcache_unset($id);
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => unsupported
-     * 'matchingTag'    => unsupported
-     * 'notMatchingTag' => unsupported
-     * 'matchingAnyTag' => unsupported
-     *
-     * @param  string $mode clean mode
-     * @param  array  $tags array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                // Necessary because xcache_clear_cache() need basic authentification
-                $backup = array();
-                if (isset($_SERVER['PHP_AUTH_USER'])) {
-                    $backup['PHP_AUTH_USER'] = $_SERVER['PHP_AUTH_USER'];
-                }
-                if (isset($_SERVER['PHP_AUTH_PW'])) {
-                    $backup['PHP_AUTH_PW'] = $_SERVER['PHP_AUTH_PW'];
-                }
-                if ($this->_options['user']) {
-                    $_SERVER['PHP_AUTH_USER'] = $this->_options['user'];
-                }
-                if ($this->_options['password']) {
-                    $_SERVER['PHP_AUTH_PW'] = $this->_options['password'];
-                }
-                xcache_clear_cache(XC_TYPE_VAR, 0);
-                if (isset($backup['PHP_AUTH_USER'])) {
-                    $_SERVER['PHP_AUTH_USER'] = $backup['PHP_AUTH_USER'];
-                    $_SERVER['PHP_AUTH_PW'] = $backup['PHP_AUTH_PW'];
-                }
-                return true;
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $this->_log("Zend_Cache_Backend_Xcache::clean() : CLEANING_MODE_OLD is unsupported by the Xcache backend");
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $this->_log(self::TAGS_UNSUPPORTED_BY_CLEAN_OF_XCACHE_BACKEND);
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-    }
-
-    /**
-     * Return true if the automatic cleaning is available for the backend
-     *
-     * @return boolean
-     */
-    public function isAutomaticCleaningAvailable()
-    {
-        return false;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/ZendPlatform.php b/airtime_mvc/library/Zend/Cache/Backend/ZendPlatform.php
deleted file mode 100644
index 011428384..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/ZendPlatform.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ZendPlatform.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend.php';
-
-/**
- * @see Zend_Cache_Backend_Interface
- */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-
-/**
- * Impementation of Zend Cache Backend using the Zend Platform (Output Content Caching)
- *
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_ZendPlatform extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
-{
-    /**
-     * internal ZP prefix
-     */
-    const TAGS_PREFIX = "internal_ZPtag:";
-
-    /**
-     * Constructor
-     * Validate that the Zend Platform is loaded and licensed
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        if (!function_exists('accelerator_license_info')) {
-            Zend_Cache::throwException('The Zend Platform extension must be loaded for using this backend !');
-        }
-        if (!function_exists('accelerator_get_configuration')) {
-            $licenseInfo = accelerator_license_info();
-            Zend_Cache::throwException('The Zend Platform extension is not loaded correctly: '.$licenseInfo['failure_reason']);
-        }
-        $accConf = accelerator_get_configuration();
-        if (@!$accConf['output_cache_licensed']) {
-            Zend_Cache::throwException('The Zend Platform extension does not have the proper license to use content caching features');
-        }
-        if (@!$accConf['output_cache_enabled']) {
-            Zend_Cache::throwException('The Zend Platform content caching feature must be enabled for using this backend, set the \'zend_accelerator.output_cache_enabled\' directive to On !');
-        }
-        if (!is_writable($accConf['output_cache_dir'])) {
-            Zend_Cache::throwException('The cache copies directory \''. ini_get('zend_accelerator.output_cache_dir') .'\' must be writable !');
-        }
-        parent:: __construct($options);
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @return string Cached data (or false)
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        // doNotTestCacheValidity implemented by giving zero lifetime to the cache
-        if ($doNotTestCacheValidity) {
-            $lifetime = 0;
-        } else {
-            $lifetime = $this->_directives['lifetime'];
-        }
-        $res = output_cache_get($id, $lifetime);
-        if($res) {
-            return $res[0];
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id Cache id
-     * @return mixed|false false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     */
-    public function test($id)
-    {
-        $result = output_cache_get($id, $this->_directives['lifetime']);
-        if ($result) {
-            return $result[1];
-        }
-        return false;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param  string $data             Data to cache
-     * @param  string $id               Cache id
-     * @param  array  $tags             Array of strings, the cache record will be tagged by each string entry
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        if (!($specificLifetime === false)) {
-            $this->_log("Zend_Cache_Backend_ZendPlatform::save() : non false specifc lifetime is unsuported for this backend");
-        }
-
-        $lifetime = $this->_directives['lifetime'];
-        $result1  = output_cache_put($id, array($data, time()));
-        $result2  = (count($tags) == 0);
-
-        foreach ($tags as $tag) {
-            $tagid = self::TAGS_PREFIX.$tag;
-            $old_tags = output_cache_get($tagid, $lifetime);
-            if ($old_tags === false) {
-                $old_tags = array();
-            }
-            $old_tags[$id] = $id;
-            output_cache_remove_key($tagid);
-            $result2 = output_cache_put($tagid, $old_tags);
-        }
-
-        return $result1 && $result2;
-    }
-
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id Cache id
-     * @return boolean True if no problem
-     */
-    public function remove($id)
-    {
-        return output_cache_remove_key($id);
-    }
-
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
-     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
-     *                                               This mode is not supported in this backend
-     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
-     *                                               ($tags can be an array of strings or a single string)
-     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => unsupported
-     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
-     *                                               ($tags can be an array of strings or a single string)
-     *
-     * @param  string $mode Clean mode
-     * @param  array  $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $cache_dir = ini_get('zend_accelerator.output_cache_dir');
-                if (!$cache_dir) {
-                    return false;
-                }
-                $cache_dir .= '/.php_cache_api/';
-                return $this->_clean($cache_dir, $mode);
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-                $idlist = null;
-                foreach ($tags as $tag) {
-                    $next_idlist = output_cache_get(self::TAGS_PREFIX.$tag, $this->_directives['lifetime']);
-                    if ($idlist) {
-                        $idlist = array_intersect_assoc($idlist, $next_idlist);
-                    } else {
-                        $idlist = $next_idlist;
-                    }
-                    if (count($idlist) == 0) {
-                        // if ID list is already empty - we may skip checking other IDs
-                        $idlist = null;
-                        break;
-                    }
-                }
-                if ($idlist) {
-                    foreach ($idlist as $id) {
-                        output_cache_remove_key($id);
-                    }
-                }
-                return true;
-                break;
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-                $this->_log("Zend_Cache_Backend_ZendPlatform::clean() : CLEANING_MODE_NOT_MATCHING_TAG is not supported by the Zend Platform backend");
-                return false;
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $idlist = null;
-                foreach ($tags as $tag) {
-                    $next_idlist = output_cache_get(self::TAGS_PREFIX.$tag, $this->_directives['lifetime']);
-                    if ($idlist) {
-                        $idlist = array_merge_recursive($idlist, $next_idlist);
-                    } else {
-                        $idlist = $next_idlist;
-                    }
-                    if (count($idlist) == 0) {
-                        // if ID list is already empty - we may skip checking other IDs
-                        $idlist = null;
-                        break;
-                    }
-                }
-                if ($idlist) {
-                    foreach ($idlist as $id) {
-                        output_cache_remove_key($id);
-                    }
-                }
-                return true;
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-    }
-
-    /**
-     * Clean a directory and recursivly go over it's subdirectories
-     *
-     * Remove all the cached files that need to be cleaned (according to mode and files mtime)
-     *
-     * @param  string $dir  Path of directory ot clean
-     * @param  string $mode The same parameter as in Zend_Cache_Backend_ZendPlatform::clean()
-     * @return boolean True if ok
-     */
-    private function _clean($dir, $mode)
-    {
-        $d = @dir($dir);
-        if (!$d) {
-            return false;
-        }
-        $result = true;
-        while (false !== ($file = $d->read())) {
-            if ($file == '.' || $file == '..') {
-                continue;
-            }
-            $file = $d->path . $file;
-            if (is_dir($file)) {
-                $result = ($this->_clean($file .'/', $mode)) && ($result);
-            } else {
-                if ($mode == Zend_Cache::CLEANING_MODE_ALL) {
-                    $result = ($this->_remove($file)) && ($result);
-                } else if ($mode == Zend_Cache::CLEANING_MODE_OLD) {
-                    // Files older than lifetime get deleted from cache
-                    if ($this->_directives['lifetime'] !== null) {
-                        if ((time() - @filemtime($file)) > $this->_directives['lifetime']) {
-                            $result = ($this->_remove($file)) && ($result);
-                        }
-                    }
-                }
-            }
-        }
-        $d->close();
-        return $result;
-    }
-
-    /**
-     * Remove a file
-     *
-     * If we can't remove the file (because of locks or any problem), we will touch
-     * the file to invalidate it
-     *
-     * @param  string $file Complete file path
-     * @return boolean True if ok
-     */
-    private function _remove($file)
-    {
-        if (!@unlink($file)) {
-            # If we can't remove the file (because of locks or any problem), we will touch
-            # the file to invalidate it
-            $this->_log("Zend_Cache_Backend_ZendPlatform::_remove() : we can't remove $file => we are going to try to invalidate it");
-            if ($this->_directives['lifetime'] === null) {
-                return false;
-            }
-            if (!file_exists($file)) {
-                return false;
-            }
-            return @touch($file, time() - 2*abs($this->_directives['lifetime']));
-        }
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/ZendServer.php b/airtime_mvc/library/Zend/Cache/Backend/ZendServer.php
deleted file mode 100644
index ee9dc4c06..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/ZendServer.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ZendServer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Cache_Backend_Interface */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/** @see Zend_Cache_Backend */
-require_once 'Zend/Cache/Backend.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Cache_Backend_ZendServer extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface
-{
-    /**
-     * Available options
-     *
-     * =====> (string) namespace :
-     * Namespace to be used for chaching operations
-     *
-     * @var array available options
-     */
-    protected $_options = array(
-        'namespace' => 'zendframework'
-    );
-
-    /**
-     * Store data
-     *
-     * @param mixed  $data        Object to store
-     * @param string $id          Cache id
-     * @param int    $timeToLive  Time to live in seconds
-     * @throws Zend_Cache_Exception
-     */
-    abstract protected function _store($data, $id, $timeToLive);
-
-    /**
-     * Fetch data
-     *
-     * @param string $id          Cache id
-     * @throws Zend_Cache_Exception
-     */
-    abstract protected function _fetch($id);
-
-    /**
-     * Unset data
-     *
-     * @param string $id          Cache id
-     */
-    abstract protected function _unset($id);
-
-    /**
-     * Clear cache
-     */
-    abstract protected function _clear();
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     cache id
-     * @param  boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested
-     * @return string cached datas (or false)
-     */
-    public function load($id, $doNotTestCacheValidity = false)
-    {
-        $tmp = $this->_fetch($id);
-        if ($tmp !== null) {
-            return $tmp;
-        }
-        return false;
-    }
-
-    /**
-     * Test if a cache is available or not (for the given id)
-     *
-     * @param  string $id cache id
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
-     * @throws Zend_Cache_Exception
-     */
-    public function test($id)
-    {
-        $tmp = $this->_fetch('internal-metadatas---' . $id);
-        if ($tmp !== false) {
-            if (!is_array($tmp) || !isset($tmp['mtime'])) {
-                Zend_Cache::throwException('Cache metadata for \'' . $id . '\' id is corrupted' );
-            }
-            return $tmp['mtime'];
-        }
-        return false;
-    }
-
-    /**
-     * Compute & return the expire time
-     *
-     * @return int expire time (unix timestamp)
-     */
-    private function _expireTime($lifetime)
-    {
-        if ($lifetime === null) {
-            return 9999999999;
-        }
-        return time() + $lifetime;
-    }
-
-    /**
-     * Save some string datas into a cache record
-     *
-     * Note : $data is always "string" (serialization is done by the
-     * core not by the backend)
-     *
-     * @param string $data datas to cache
-     * @param string $id cache id
-     * @param array $tags array of strings, the cache record will be tagged by each string entry
-     * @param int $specificLifetime if != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @return boolean true if no problem
-     */
-    public function save($data, $id, $tags = array(), $specificLifetime = false)
-    {
-        $lifetime = $this->getLifetime($specificLifetime);
-        $metadatas = array(
-            'mtime' => time(),
-            'expire' => $this->_expireTime($lifetime),
-        );
-
-        if (count($tags) > 0) {
-            $this->_log('Zend_Cache_Backend_ZendServer::save() : tags are unsupported by the ZendServer backends');
-        }
-
-        return  $this->_store($data, $id, $lifetime) &&
-                $this->_store($metadatas, 'internal-metadatas---' . $id, $lifetime);
-    }
-
-    /**
-     * Remove a cache record
-     *
-     * @param  string $id cache id
-     * @return boolean true if no problem
-     */
-    public function remove($id)
-    {
-        $result1 = $this->_unset($id);
-        $result2 = $this->_unset('internal-metadatas---' . $id);
-
-        return $result1 && $result2;
-    }
-
-    /**
-     * Clean some cache records
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => unsupported
-     * 'matchingTag'    => unsupported
-     * 'notMatchingTag' => unsupported
-     * 'matchingAnyTag' => unsupported
-     *
-     * @param  string $mode clean mode
-     * @param  array  $tags array of tags
-     * @throws Zend_Cache_Exception
-     * @return boolean true if no problem
-     */
-    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array())
-    {
-        switch ($mode) {
-            case Zend_Cache::CLEANING_MODE_ALL:
-                $this->_clear();
-                return true;
-                break;
-            case Zend_Cache::CLEANING_MODE_OLD:
-                $this->_log("Zend_Cache_Backend_ZendServer::clean() : CLEANING_MODE_OLD is unsupported by the Zend Server backends.");
-                break;
-            case Zend_Cache::CLEANING_MODE_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG:
-            case Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG:
-                $this->_clear();
-                $this->_log('Zend_Cache_Backend_ZendServer::clean() : tags are unsupported by the Zend Server backends.');
-                break;
-            default:
-                Zend_Cache::throwException('Invalid mode for clean() method');
-                break;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/ZendServer/Disk.php b/airtime_mvc/library/Zend/Cache/Backend/ZendServer/Disk.php
deleted file mode 100644
index 40ffb5158..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/ZendServer/Disk.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Disk.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Cache_Backend_Interface */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/** @see Zend_Cache_Backend_ZendServer */
-require_once 'Zend/Cache/Backend/ZendServer.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface
-{
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @throws Zend_Cache_Exception
-     */
-    public function __construct(array $options = array())
-    {
-        if (!function_exists('zend_disk_cache_store')) {
-            Zend_Cache::throwException('Zend_Cache_ZendServer_Disk backend has to be used within Zend Server environment.');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Store data
-     *
-     * @param mixed  $data        Object to store
-     * @param string $id          Cache id
-     * @param int    $timeToLive  Time to live in seconds
-     * @return boolean true if no problem
-     */
-    protected function _store($data, $id, $timeToLive)
-    {
-        if (zend_disk_cache_store($this->_options['namespace'] . '::' . $id,
-                                  $data,
-                                  $timeToLive) === false) {
-            $this->_log('Store operation failed.');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Fetch data
-     *
-     * @param string $id          Cache id
-     */
-    protected function _fetch($id)
-    {
-        return zend_disk_cache_fetch($this->_options['namespace'] . '::' . $id);
-    }
-
-    /**
-     * Unset data
-     *
-     * @param string $id          Cache id
-     * @return boolean true if no problem
-     */
-    protected function _unset($id)
-    {
-        return zend_disk_cache_delete($this->_options['namespace'] . '::' . $id);
-    }
-
-    /**
-     * Clear cache
-     */
-    protected function _clear()
-    {
-        zend_disk_cache_clear($this->_options['namespace']);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Backend/ZendServer/ShMem.php b/airtime_mvc/library/Zend/Cache/Backend/ZendServer/ShMem.php
deleted file mode 100644
index 46bc94622..000000000
--- a/airtime_mvc/library/Zend/Cache/Backend/ZendServer/ShMem.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ShMem.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Cache_Backend_Interface */
-require_once 'Zend/Cache/Backend/Interface.php';
-
-/** @see Zend_Cache_Backend_ZendServer */
-require_once 'Zend/Cache/Backend/ZendServer.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Backend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface
-{
-    /**
-     * Constructor
-     *
-     * @param  array $options associative array of options
-     * @throws Zend_Cache_Exception
-     */
-    public function __construct(array $options = array())
-    {
-        if (!function_exists('zend_shm_cache_store')) {
-            Zend_Cache::throwException('Zend_Cache_ZendServer_ShMem backend has to be used within Zend Server environment.');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Store data
-     *
-     * @param mixed  $data        Object to store
-     * @param string $id          Cache id
-     * @param int    $timeToLive  Time to live in seconds
-     *
-     */
-    protected function _store($data, $id, $timeToLive)
-    {
-        if (zend_shm_cache_store($this->_options['namespace'] . '::' . $id,
-                                  $data,
-                                  $timeToLive) === false) {
-            $this->_log('Store operation failed.');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Fetch data
-     *
-     * @param string $id          Cache id
-     */
-    protected function _fetch($id)
-    {
-        return zend_shm_cache_fetch($this->_options['namespace'] . '::' . $id);
-    }
-
-    /**
-     * Unset data
-     *
-     * @param string $id          Cache id
-     * @return boolean true if no problem
-     */
-    protected function _unset($id)
-    {
-        return zend_shm_cache_delete($this->_options['namespace'] . '::' . $id);
-    }
-
-    /**
-     * Clear cache
-     */
-    protected function _clear()
-    {
-        zend_shm_cache_clear($this->_options['namespace']);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Core.php b/airtime_mvc/library/Zend/Cache/Core.php
deleted file mode 100644
index 6598c109a..000000000
--- a/airtime_mvc/library/Zend/Cache/Core.php
+++ /dev/null
@@ -1,756 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Core.php 21293 2010-03-02 10:26:32Z mabe $
- */
-
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Core
-{
-    /**
-     * Messages
-     */
-    const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend';
-    const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available';
-
-    /**
-     * Backend Object
-     *
-     * @var object $_backend
-     */
-    protected $_backend = null;
-
-    /**
-     * Available options
-     *
-     * ====> (boolean) write_control :
-     * - Enable / disable write control (the cache is read just after writing to detect corrupt entries)
-     * - Enable write control will lightly slow the cache writing but not the cache reading
-     * Write control can detect some corrupt cache files but maybe it's not a perfect control
-     *
-     * ====> (boolean) caching :
-     * - Enable / disable caching
-     * (can be very useful for the debug of cached scripts)
-     *
-     * =====> (string) cache_id_prefix :
-     * - prefix for cache ids (namespace)
-     *
-     * ====> (boolean) automatic_serialization :
-     * - Enable / disable automatic serialization
-     * - It can be used to save directly datas which aren't strings (but it's slower)
-     *
-     * ====> (int) automatic_cleaning_factor :
-     * - Disable / Tune the automatic cleaning process
-     * - The automatic cleaning process destroy too old (for the given life time)
-     *   cache files when a new cache file is written :
-     *     0               => no automatic cache cleaning
-     *     1               => systematic cache cleaning
-     *     x (integer) > 1 => automatic cleaning randomly 1 times on x cache write
-     *
-     * ====> (int) lifetime :
-     * - Cache lifetime (in seconds)
-     * - If null, the cache is valid forever.
-     *
-     * ====> (boolean) logging :
-     * - If set to true, logging is activated (but the system is slower)
-     *
-     * ====> (boolean) ignore_user_abort
-     * - If set to true, the core will set the ignore_user_abort PHP flag inside the
-     *   save() method to avoid cache corruptions in some cases (default false)
-     *
-     * @var array $_options available options
-     */
-    protected $_options = array(
-        'write_control'             => true,
-        'caching'                   => true,
-        'cache_id_prefix'           => null,
-        'automatic_serialization'   => false,
-        'automatic_cleaning_factor' => 10,
-        'lifetime'                  => 3600,
-        'logging'                   => false,
-        'logger'                    => null,
-        'ignore_user_abort'         => false
-    );
-
-    /**
-     * Array of options which have to be transfered to backend
-     *
-     * @var array $_directivesList
-     */
-    protected static $_directivesList = array('lifetime', 'logging', 'logger');
-
-    /**
-     * Not used for the core, just a sort a hint to get a common setOption() method (for the core and for frontends)
-     *
-     * @var array $_specificOptions
-     */
-    protected $_specificOptions = array();
-
-    /**
-     * Last used cache id
-     *
-     * @var string $_lastId
-     */
-    private $_lastId = null;
-
-    /**
-     * True if the backend implements Zend_Cache_Backend_ExtendedInterface
-     *
-     * @var boolean $_extendedBackend
-     */
-    protected $_extendedBackend = false;
-
-    /**
-     * Array of capabilities of the backend (only if it implements Zend_Cache_Backend_ExtendedInterface)
-     *
-     * @var array
-     */
-    protected $_backendCapabilities = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options Associative array of options or Zend_Config instance
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (!is_array($options)) {
-            Zend_Cache::throwException("Options passed were not an array"
-            . " or Zend_Config instance.");
-        }
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        $this->_loggerSanity();
-    }
-
-    /**
-     * Set options using an instance of type Zend_Config
-     *
-     * @param Zend_Config $config
-     * @return Zend_Cache_Core
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $options = $config->toArray();
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Set the backend
-     *
-     * @param  object $backendObject
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setBackend(Zend_Cache_Backend $backendObject)
-    {
-        $this->_backend= $backendObject;
-        // some options (listed in $_directivesList) have to be given
-        // to the backend too (even if they are not "backend specific")
-        $directives = array();
-        foreach (Zend_Cache_Core::$_directivesList as $directive) {
-            $directives[$directive] = $this->_options[$directive];
-        }
-        $this->_backend->setDirectives($directives);
-        if (in_array('Zend_Cache_Backend_ExtendedInterface', class_implements($this->_backend))) {
-            $this->_extendedBackend = true;
-            $this->_backendCapabilities = $this->_backend->getCapabilities();
-        }
-
-    }
-
-    /**
-     * Returns the backend
-     *
-     * @return object backend object
-     */
-    public function getBackend()
-    {
-        return $this->_backend;
-    }
-
-    /**
-     * Public frontend to set an option
-     *
-     * There is an additional validation (relatively to the protected _setOption method)
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            Zend_Cache::throwException("Incorrect option name : $name");
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            // This is a Core option
-            $this->_setOption($name, $value);
-            return;
-        }
-        if (array_key_exists($name, $this->_specificOptions)) {
-            // This a specic option of this frontend
-            $this->_specificOptions[$name] = $value;
-            return;
-        }
-    }
-
-    /**
-     * Public frontend to get an option value
-     *
-     * @param  string $name  Name of the option
-     * @throws Zend_Cache_Exception
-     * @return mixed option value
-     */
-    public function getOption($name)
-    {
-        if (is_string($name)) {
-            $name = strtolower($name);
-            if (array_key_exists($name, $this->_options)) {
-                // This is a Core option
-                return $this->_options[$name];
-            }
-            if (array_key_exists($name, $this->_specificOptions)) {
-                // This a specic option of this frontend
-                return $this->_specificOptions[$name];
-            }
-        }
-        Zend_Cache::throwException("Incorrect option name : $name");
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    private function _setOption($name, $value)
-    {
-        if (!is_string($name) || !array_key_exists($name, $this->_options)) {
-            Zend_Cache::throwException("Incorrect option name : $name");
-        }
-        if ($name == 'lifetime' && empty($value)) {
-            $value = null;
-        }
-        $this->_options[$name] = $value;
-    }
-
-    /**
-     * Force a new lifetime
-     *
-     * The new value is set for the core/frontend but for the backend too (directive)
-     *
-     * @param  int $newLifetime New lifetime (in seconds)
-     * @return void
-     */
-    public function setLifetime($newLifetime)
-    {
-        $this->_options['lifetime'] = $newLifetime;
-        $this->_backend->setDirectives(array(
-            'lifetime' => $newLifetime
-        ));
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
-     * @return mixed|false Cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
-    {
-        if (!$this->_options['caching']) {
-            return false;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        $this->_lastId = $id;
-        self::_validateIdOrTag($id);
-        $data = $this->_backend->load($id, $doNotTestCacheValidity);
-        if ($data===false) {
-            // no cache available
-            return false;
-        }
-        if ((!$doNotUnserialize) && $this->_options['automatic_serialization']) {
-            // we need to unserialize before sending the result
-            return unserialize($data);
-        }
-        return $data;
-    }
-
-    /**
-     * Test if a cache is available for the given id
-     *
-     * @param  string $id Cache id
-     * @return int|false Last modified time of cache entry if it is available, false otherwise
-     */
-    public function test($id)
-    {
-        if (!$this->_options['caching']) {
-            return false;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        self::_validateIdOrTag($id);
-        $this->_lastId = $id;
-        return $this->_backend->test($id);
-    }
-
-    /**
-     * Save some data in a cache
-     *
-     * @param  mixed $data           Data to put in cache (can be another type than string if automatic_serialization is on)
-     * @param  string $id             Cache id (if not set, the last cache id will be used)
-     * @param  array $tags           Cache tags
-     * @param  int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @throws Zend_Cache_Exception
-     * @return boolean True if no problem
-     */
-    public function save($data, $id = null, $tags = array(), $specificLifetime = false, $priority = 8)
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        if ($id === null) {
-            $id = $this->_lastId;
-        } else {
-            $id = $this->_id($id);
-        }
-        self::_validateIdOrTag($id);
-        self::_validateTagsArray($tags);
-        if ($this->_options['automatic_serialization']) {
-            // we need to serialize datas before storing them
-            $data = serialize($data);
-        } else {
-            if (!is_string($data)) {
-                Zend_Cache::throwException("Datas must be string or set automatic_serialization = true");
-            }
-        }
-        // automatic cleaning
-        if ($this->_options['automatic_cleaning_factor'] > 0) {
-            $rand = rand(1, $this->_options['automatic_cleaning_factor']);
-            if ($rand==1) {
-                if ($this->_extendedBackend) {
-                    // New way
-                    if ($this->_backendCapabilities['automatic_cleaning']) {
-                        $this->clean(Zend_Cache::CLEANING_MODE_OLD);
-                    } else {
-                        $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend');
-                    }
-                } else {
-                    // Deprecated way (will be removed in next major version)
-                    if (method_exists($this->_backend, 'isAutomaticCleaningAvailable') && ($this->_backend->isAutomaticCleaningAvailable())) {
-                        $this->clean(Zend_Cache::CLEANING_MODE_OLD);
-                    } else {
-                        $this->_log('Zend_Cache_Core::save() / automatic cleaning is not available/necessary with this backend');
-                    }
-                }
-            }
-        }
-        if ($this->_options['ignore_user_abort']) {
-            $abort = ignore_user_abort(true);
-        }
-        if (($this->_extendedBackend) && ($this->_backendCapabilities['priority'])) {
-            $result = $this->_backend->save($data, $id, $tags, $specificLifetime, $priority);
-        } else {
-            $result = $this->_backend->save($data, $id, $tags, $specificLifetime);
-        }
-        if ($this->_options['ignore_user_abort']) {
-            ignore_user_abort($abort);
-        }
-        if (!$result) {
-            // maybe the cache is corrupted, so we remove it !
-            if ($this->_options['logging']) {
-                $this->_log("Zend_Cache_Core::save() : impossible to save cache (id=$id)");
-            }
-            $this->remove($id);
-            return false;
-        }
-        if ($this->_options['write_control']) {
-            $data2 = $this->_backend->load($id, true);
-            if ($data!=$data2) {
-                $this->_log('Zend_Cache_Core::save() / write_control : written and read data do not match');
-                $this->_backend->remove($id);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove a cache
-     *
-     * @param  string $id Cache id to remove
-     * @return boolean True if ok
-     */
-    public function remove($id)
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        self::_validateIdOrTag($id);
-        return $this->_backend->remove($id);
-    }
-
-    /**
-     * Clean cache entries
-     *
-     * Available modes are :
-     * 'all' (default)  => remove all cache entries ($tags is not used)
-     * 'old'            => remove too old cache entries ($tags is not used)
-     * 'matchingTag'    => remove cache entries matching all given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'notMatchingTag' => remove cache entries not matching one of the given tags
-     *                     ($tags can be an array of strings or a single string)
-     * 'matchingAnyTag' => remove cache entries matching any given tags
-     *                     ($tags can be an array of strings or a single string)
-     *
-     * @param  string       $mode
-     * @param  array|string $tags
-     * @throws Zend_Cache_Exception
-     * @return boolean True if ok
-     */
-    public function clean($mode = 'all', $tags = array())
-    {
-        if (!$this->_options['caching']) {
-            return true;
-        }
-        if (!in_array($mode, array(Zend_Cache::CLEANING_MODE_ALL,
-                                   Zend_Cache::CLEANING_MODE_OLD,
-                                   Zend_Cache::CLEANING_MODE_MATCHING_TAG,
-                                   Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG,
-                                   Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG))) {
-            Zend_Cache::throwException('Invalid cleaning mode');
-        }
-        self::_validateTagsArray($tags);
-        return $this->_backend->clean($mode, $tags);
-    }
-
-    /**
-     * Return an array of stored cache ids which match given tags
-     *
-     * In case of multiple tags, a logical AND is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching cache ids (string)
-     */
-    public function getIdsMatchingTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG);
-        }
-
-        $ids = $this->_backend->getIdsMatchingTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids which don't match given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of not matching cache ids (string)
-     */
-    public function getIdsNotMatchingTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG);
-        }
-
-        $ids = $this->_backend->getIdsNotMatchingTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids which match any given tags
-     *
-     * In case of multiple tags, a logical OR is made between tags
-     *
-     * @param array $tags array of tags
-     * @return array array of matching any cache ids (string)
-     */
-    public function getIdsMatchingAnyTags($tags = array())
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG);
-        }
-
-        $ids = $this->_backend->getIdsMatchingAnyTags($tags);
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored cache ids
-     *
-     * @return array array of stored cache ids (string)
-     */
-    public function getIds()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-
-        $ids = $this->_backend->getIds();
-
-        // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600)
-        if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') {
-            $prefix    = & $this->_options['cache_id_prefix'];
-            $prefixLen = strlen($prefix);
-            foreach ($ids as &$id) {
-                if (strpos($id, $prefix) === 0) {
-                    $id = substr($id, $prefixLen);
-                }
-            }
-        }
-
-        return $ids;
-    }
-
-    /**
-     * Return an array of stored tags
-     *
-     * @return array array of stored tags (string)
-     */
-    public function getTags()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        if (!($this->_backendCapabilities['tags'])) {
-            Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG);
-        }
-        return $this->_backend->getTags();
-    }
-
-    /**
-     * Return the filling percentage of the backend storage
-     *
-     * @return int integer between 0 and 100
-     */
-    public function getFillingPercentage()
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        return $this->_backend->getFillingPercentage();
-    }
-
-    /**
-     * Return an array of metadatas for the given cache id
-     *
-     * The array will include these keys :
-     * - expire : the expire timestamp
-     * - tags : a string array of tags
-     * - mtime : timestamp of last modification time
-     *
-     * @param string $id cache id
-     * @return array array of metadatas (false if the cache id is not found)
-     */
-    public function getMetadatas($id)
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        return $this->_backend->getMetadatas($id);
-    }
-
-    /**
-     * Give (if possible) an extra lifetime to the given cache id
-     *
-     * @param string $id cache id
-     * @param int $extraLifetime
-     * @return boolean true if ok
-     */
-    public function touch($id, $extraLifetime)
-    {
-        if (!$this->_extendedBackend) {
-            Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF);
-        }
-        $id = $this->_id($id); // cache id may need prefix
-        return $this->_backend->touch($id, $extraLifetime);
-    }
-
-    /**
-     * Validate a cache id or a tag (security, reliable filenames, reserved prefixes...)
-     *
-     * Throw an exception if a problem is found
-     *
-     * @param  string $string Cache id or tag
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected static function _validateIdOrTag($string)
-    {
-        if (!is_string($string)) {
-            Zend_Cache::throwException('Invalid id or tag : must be a string');
-        }
-        if (substr($string, 0, 9) == 'internal-') {
-            Zend_Cache::throwException('"internal-*" ids or tags are reserved');
-        }
-        if (!preg_match('~^[a-zA-Z0-9_]+$~D', $string)) {
-            Zend_Cache::throwException("Invalid id or tag '$string' : must use only [a-zA-Z0-9_]");
-        }
-    }
-
-    /**
-     * Validate a tags array (security, reliable filenames, reserved prefixes...)
-     *
-     * Throw an exception if a problem is found
-     *
-     * @param  array $tags Array of tags
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected static function _validateTagsArray($tags)
-    {
-        if (!is_array($tags)) {
-            Zend_Cache::throwException('Invalid tags array : must be an array');
-        }
-        foreach($tags as $tag) {
-            self::_validateIdOrTag($tag);
-        }
-        reset($tags);
-    }
-
-    /**
-     * Make sure if we enable logging that the Zend_Log class
-     * is available.
-     * Create a default log object if none is set.
-     *
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _loggerSanity()
-    {
-        if (!isset($this->_options['logging']) || !$this->_options['logging']) {
-            return;
-        }
-
-        if (isset($this->_options['logger']) && $this->_options['logger'] instanceof Zend_Log) {
-            return;
-        }
-
-        // Create a default logger to the standard output stream
-        require_once 'Zend/Log/Writer/Stream.php';
-        $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output'));
-        $this->_options['logger'] = $logger;
-    }
-
-    /**
-     * Log a message at the WARN (4) priority.
-     *
-     * @param string $message
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _log($message, $priority = 4)
-    {
-        if (!$this->_options['logging']) {
-            return;
-        }
-        if (!(isset($this->_options['logger']) || $this->_options['logger'] instanceof Zend_Log)) {
-            Zend_Cache::throwException('Logging is enabled but logger is not set');
-        }
-        $logger = $this->_options['logger'];
-        $logger->log($message, $priority);
-    }
-
-    /**
-     * Make and return a cache id
-     *
-     * Checks 'cache_id_prefix' and returns new id with prefix or simply the id if null
-     *
-     * @param  string $id Cache id
-     * @return string Cache id (with or without prefix)
-     */
-    protected function _id($id)
-    {
-        if (($id !== null) && isset($this->_options['cache_id_prefix'])) {
-            return $this->_options['cache_id_prefix'] . $id; // return with prefix
-        }
-        return $id; // no prefix, just return the $id passed
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Exception.php b/airtime_mvc/library/Zend/Cache/Exception.php
deleted file mode 100644
index 5ca005d18..000000000
--- a/airtime_mvc/library/Zend/Cache/Exception.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Exception extends Zend_Exception {}
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/Capture.php b/airtime_mvc/library/Zend/Cache/Frontend/Capture.php
deleted file mode 100644
index a4ed47d6a..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/Capture.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_Capture extends Zend_Cache_Core
-{
-    /**
-     * Page identifiers
-     * @var array
-     */
-    protected $_idStack = array();
-
-    /**
-     * Tags
-     * @var array
-     */
-    protected $_tags = array();
-    
-    protected $_extension = null;
-
-    /**
-     * Start the cache
-     *
-     * @param  string  $id Cache id
-     * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas)
-     */
-    public function start($id, array $tags, $extension = null)
-    {
-        $this->_tags = $tags;
-        $this->_extension = $extension;
-        ob_start(array($this, '_flush'));
-        ob_implicit_flush(false);
-        $this->_idStack[] = $id;
-        return false;
-    }
-
-    /**
-     * callback for output buffering
-     * (shouldn't really be called manually)
-     *
-     * @param  string $data Buffered output
-     * @return string Data to send to browser
-     */
-    public function _flush($data)
-    {
-        $id = array_pop($this->_idStack);
-        if (is_null($id)) {
-            Zend_Cache::throwException('use of _flush() without a start()');
-        }
-        if ($this->_extension) {
-            $this->save(serialize(array($data, $this->_extension)), $id, $this->_tags);
-        } else {
-            $this->save($data, $id, $this->_tags);
-        }
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/Class.php b/airtime_mvc/library/Zend/Cache/Frontend/Class.php
deleted file mode 100644
index e5e2d0eb3..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/Class.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Class.php 20379 2010-01-18 14:40:57Z mabe $
- */
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_Class extends Zend_Cache_Core
-{
-    /**
-     * Available options
-     *
-     * ====> (mixed) cached_entity :
-     * - if set to a class name, we will cache an abstract class and will use only static calls
-     * - if set to an object, we will cache this object methods
-     *
-     * ====> (boolean) cache_by_default :
-     * - if true, method calls will be cached by default
-     *
-     * ====> (array) cached_methods :
-     * - an array of method names which will be cached (even if cache_by_default = false)
-     *
-     * ====> (array) non_cached_methods :
-     * - an array of method names which won't be cached (even if cache_by_default = true)
-     *
-     * @var array available options
-     */
-    protected $_specificOptions = array(
-        'cached_entity' => null,
-        'cache_by_default' => true,
-        'cached_methods' => array(),
-        'non_cached_methods' => array()
-    );
-
-    /**
-     * Tags array
-     *
-     * @var array
-     */
-    private $_tags = array();
-
-    /**
-     * SpecificLifetime value
-     *
-     * false => no specific life time
-     *
-     * @var int
-     */
-    private $_specificLifetime = false;
-
-    /**
-     * The cached object or the name of the cached abstract class
-     *
-     * @var mixed
-     */
-    private $_cachedEntity = null;
-
-     /**
-      * The class name of the cached object or cached abstract class
-      *
-      * Used to differentiate between different classes with the same method calls.
-      *
-      * @var string
-      */
-    private $_cachedEntityLabel = '';
-
-    /**
-     * Priority (used by some particular backends)
-     *
-     * @var int
-     */
-    private $_priority = 8;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        if ($this->_specificOptions['cached_entity'] === null) {
-            Zend_Cache::throwException('cached_entity must be set !');
-        }
-        $this->setCachedEntity($this->_specificOptions['cached_entity']);
-        $this->setOption('automatic_serialization', true);
-    }
-
-    /**
-     * Set a specific life time
-     *
-     * @param  int $specificLifetime
-     * @return void
-     */
-    public function setSpecificLifetime($specificLifetime = false)
-    {
-        $this->_specificLifetime = $specificLifetime;
-    }
-
-    /**
-     * Set the priority (used by some particular backends)
-     *
-     * @param int $priority integer between 0 (very low priority) and 10 (maximum priority)
-     */
-    public function setPriority($priority)
-    {
-        $this->_priority = $priority;
-    }
-
-    /**
-     * Public frontend to set an option
-     *
-     * Just a wrapper to get a specific behaviour for cached_entity
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if ($name == 'cached_entity') {
-            $this->setCachedEntity($value);
-        } else {
-            parent::setOption($name, $value);
-        }
-    }
-
-    /**
-     * Specific method to set the cachedEntity
-     *
-     * if set to a class name, we will cache an abstract class and will use only static calls
-     * if set to an object, we will cache this object methods
-     *
-     * @param mixed $cachedEntity
-     */
-    public function setCachedEntity($cachedEntity)
-    {
-        if (!is_string($cachedEntity) && !is_object($cachedEntity)) {
-            Zend_Cache::throwException('cached_entity must be an object or a class name');
-        }
-        $this->_cachedEntity = $cachedEntity;
-        $this->_specificOptions['cached_entity'] = $cachedEntity;
-        if (is_string($this->_cachedEntity)){
-            $this->_cachedEntityLabel = $this->_cachedEntity;
-        } else {
-            $ro = new ReflectionObject($this->_cachedEntity);
-            $this->_cachedEntityLabel = $ro->getName();
-        }
-    }
-
-    /**
-     * Set the cache array
-     *
-     * @param  array $tags
-     * @return void
-     */
-    public function setTagsArray($tags = array())
-    {
-        $this->_tags = $tags;
-    }
-
-    /**
-     * Main method : call the specified method or get the result from cache
-     *
-     * @param  string $name       Method name
-     * @param  array  $parameters Method parameters
-     * @return mixed Result
-     */
-    public function __call($name, $parameters)
-    {
-        $cacheBool1 = $this->_specificOptions['cache_by_default'];
-        $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']);
-        $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']);
-        $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
-        if (!$cache) {
-            // We do not have not cache
-            return call_user_func_array(array($this->_cachedEntity, $name), $parameters);
-        }
-
-        $id = $this->_makeId($name, $parameters);
-        if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1]) ) {
-            // A cache is available
-            $output = $rs[0];
-            $return = $rs[1];
-        } else {
-            // A cache is not available (or not valid for this frontend)
-            ob_start();
-            ob_implicit_flush(false);
-            $return = call_user_func_array(array($this->_cachedEntity, $name), $parameters);
-            $output = ob_get_contents();
-            ob_end_clean();
-            $data = array($output, $return);
-            $this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority);
-        }
-
-        echo $output;
-        return $return;
-    }
-
-    /**
-     * Make a cache id from the method name and parameters
-     *
-     * @param  string $name       Method name
-     * @param  array  $parameters Method parameters
-     * @return string Cache id
-     */
-    private function _makeId($name, $parameters)
-    {
-        return md5($this->_cachedEntityLabel . '__' . $name . '__' . serialize($parameters));
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/File.php b/airtime_mvc/library/Zend/Cache/Frontend/File.php
deleted file mode 100644
index 07c7ddcab..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/File.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_File extends Zend_Cache_Core
-{
-
-    /**
-     * Consts for master_files_mode
-     */
-    const MODE_AND = 'AND';
-    const MODE_OR  = 'OR';
-
-    /**
-     * Available options
-     *
-     * ====> (string) master_file :
-     * - a complete path of the master file
-     * - deprecated (see master_files)
-     *
-     * ====> (array) master_files :
-     * - an array of complete path of master files
-     * - this option has to be set !
-     *
-     * ====> (string) master_files_mode :
-     * - Zend_Cache_Frontend_File::MODE_AND or Zend_Cache_Frontend_File::MODE_OR
-     * - if MODE_AND, then all master files have to be touched to get a cache invalidation
-     * - if MODE_OR (default), then a single touched master file is enough to get a cache invalidation
-     *
-     * ====> (boolean) ignore_missing_master_files
-     * - if set to true, missing master files are ignored silently
-     * - if set to false (default), an exception is thrown if there is a missing master file
-     * @var array available options
-     */
-    protected $_specificOptions = array(
-        'master_file' => null,
-        'master_files' => null,
-        'master_files_mode' => 'OR',
-        'ignore_missing_master_files' => false
-    );
-
-    /**
-     * Master file mtimes
-     *
-     * Array of int
-     *
-     * @var array
-     */
-    private $_masterFile_mtimes = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        if (!isset($this->_specificOptions['master_files'])) {
-            Zend_Cache::throwException('master_files option must be set');
-        }
-    }
-
-    /**
-     * Change the master_file option
-     *
-     * @param string $masterFile the complete path and name of the master file
-     */
-    public function setMasterFiles($masterFiles)
-    {
-        clearstatcache();
-        $this->_specificOptions['master_file'] = $masterFiles[0]; // to keep a compatibility
-        $this->_specificOptions['master_files'] = $masterFiles;
-        $this->_masterFile_mtimes = array();
-        $i = 0;
-        foreach ($masterFiles as $masterFile) {
-            $this->_masterFile_mtimes[$i] = @filemtime($masterFile);
-            if ((!($this->_specificOptions['ignore_missing_master_files'])) && (!($this->_masterFile_mtimes[$i]))) {
-                Zend_Cache::throwException('Unable to read master_file : '.$masterFile);
-            }
-            $i++;
-        }
-    }
-
-    /**
-     * Change the master_file option
-     *
-     * To keep the compatibility
-     *
-     * @deprecated
-     * @param string $masterFile the complete path and name of the master file
-     */
-    public function setMasterFile($masterFile)
-    {
-          $this->setMasterFiles(array(0 => $masterFile));
-    }
-
-    /**
-     * Public frontend to set an option
-     *
-     * Just a wrapper to get a specific behaviour for master_file
-     *
-     * @param  string $name  Name of the option
-     * @param  mixed  $value Value of the option
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function setOption($name, $value)
-    {
-        if ($name == 'master_file') {
-            $this->setMasterFile($value);
-        } else if ($name == 'master_files') {
-            $this->setMasterFiles($value);
-        } else {
-            parent::setOption($name, $value);
-        }
-    }
-
-    /**
-     * Test if a cache is available for the given id and (if yes) return it (false else)
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @param  boolean $doNotUnserialize       Do not serialize (even if automatic_serialization is true) => for internal use
-     * @return mixed|false Cached datas
-     */
-    public function load($id, $doNotTestCacheValidity = false, $doNotUnserialize = false)
-    {
-        if (!$doNotTestCacheValidity) {
-            if ($this->test($id)) {
-                return parent::load($id, true, $doNotUnserialize);
-            }
-            return false;
-        }
-        return parent::load($id, true, $doNotUnserialize);
-    }
-
-    /**
-     * Test if a cache is available for the given id
-     *
-     * @param  string $id Cache id
-     * @return int|false Last modified time of cache entry if it is available, false otherwise
-     */
-    public function test($id)
-    {
-        $lastModified = parent::test($id);
-        if ($lastModified) {
-            if ($this->_specificOptions['master_files_mode'] == self::MODE_AND) {
-                // MODE_AND
-                foreach($this->_masterFile_mtimes as $masterFileMTime) {
-                    if ($masterFileMTime) {
-                        if ($lastModified > $masterFileMTime) {
-                            return $lastModified;
-                        }
-                    }
-                }
-            } else {
-                // MODE_OR
-                $res = true;
-                foreach($this->_masterFile_mtimes as $masterFileMTime) {
-                    if ($masterFileMTime) {
-                        if ($lastModified <= $masterFileMTime) {
-                            return false;
-                        }
-                    }
-                }
-                return $lastModified;
-            }
-        }
-        return false;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/Function.php b/airtime_mvc/library/Zend/Cache/Frontend/Function.php
deleted file mode 100644
index d6ca522ff..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/Function.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Function.php 20379 2010-01-18 14:40:57Z mabe $
- */
-
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_Function extends Zend_Cache_Core
-{
-    /**
-     * This frontend specific options
-     *
-     * ====> (boolean) cache_by_default :
-     * - if true, function calls will be cached by default
-     *
-     * ====> (array) cached_functions :
-     * - an array of function names which will be cached (even if cache_by_default = false)
-     *
-     * ====> (array) non_cached_functions :
-     * - an array of function names which won't be cached (even if cache_by_default = true)
-     *
-     * @var array options
-     */
-    protected $_specificOptions = array(
-        'cache_by_default' => true,
-        'cached_functions' => array(),
-        'non_cached_functions' => array()
-    );
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $this->setOption($name, $value);
-        }
-        $this->setOption('automatic_serialization', true);
-    }
-
-    /**
-     * Main method : call the specified function or get the result from cache
-     *
-     * @param  string $name             Function name
-     * @param  array  $parameters       Function parameters
-     * @param  array  $tags             Cache tags
-     * @param  int    $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  int   $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @return mixed Result
-     */
-    public function call($name, $parameters = array(), $tags = array(), $specificLifetime = false, $priority = 8)
-    {
-        $cacheBool1 = $this->_specificOptions['cache_by_default'];
-        $cacheBool2 = in_array($name, $this->_specificOptions['cached_functions']);
-        $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_functions']);
-        $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3));
-        if (!$cache) {
-            // We do not have not cache
-            return call_user_func_array($name, $parameters);
-        }
-
-        $id = $this->_makeId($name, $parameters);
-        if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1])) {
-            // A cache is available
-            $output = $rs[0];
-            $return = $rs[1];
-        } else {
-            // A cache is not available (or not valid for this frontend)
-            ob_start();
-            ob_implicit_flush(false);
-            $return = call_user_func_array($name, $parameters);
-            $output = ob_get_contents();
-            ob_end_clean();
-            $data = array($output, $return);
-            $this->save($data, $id, $tags, $specificLifetime, $priority);
-        }
-
-        echo $output;
-        return $return;
-    }
-
-    /**
-     * Make a cache id from the function name and parameters
-     *
-     * @param  string $name       Function name
-     * @param  array  $parameters Function parameters
-     * @throws Zend_Cache_Exception
-     * @return string Cache id
-     */
-    private function _makeId($name, $parameters)
-    {
-        if (!is_string($name)) {
-            Zend_Cache::throwException('Incorrect function name');
-        }
-        if (!is_array($parameters)) {
-            Zend_Cache::throwException('parameters argument must be an array');
-        }
-        return md5($name . serialize($parameters));
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/Output.php b/airtime_mvc/library/Zend/Cache/Frontend/Output.php
deleted file mode 100644
index 021150e6d..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/Output.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Output.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_Output extends Zend_Cache_Core
-{
-
-    private $_idStack = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array $options Associative array of options
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct($options);
-        $this->_idStack = array();
-    }
-
-    /**
-     * Start the cache
-     *
-     * @param  string  $id                     Cache id
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @param  boolean $echoData               If set to true, datas are sent to the browser if the cache is hit (simpy returned else)
-     * @return mixed True if the cache is hit (false else) with $echoData=true (default) ; string else (datas)
-     */
-    public function start($id, $doNotTestCacheValidity = false, $echoData = true)
-    {
-        $data = $this->load($id, $doNotTestCacheValidity);
-        if ($data !== false) {
-            if ( $echoData ) {
-                echo($data);
-                return true;
-            } else {
-                return $data;
-            }
-        }
-        ob_start();
-        ob_implicit_flush(false);
-        $this->_idStack[] = $id;
-        return false;
-    }
-
-    /**
-     * Stop the cache
-     *
-     * @param  array   $tags             Tags array
-     * @param  int     $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
-     * @param  string  $forcedDatas      If not null, force written datas with this
-     * @param  boolean $echoData         If set to true, datas are sent to the browser
-     * @param  int     $priority         integer between 0 (very low priority) and 10 (maximum priority) used by some particular backends
-     * @return void
-     */
-    public function end($tags = array(), $specificLifetime = false, $forcedDatas = null, $echoData = true, $priority = 8)
-    {
-        if ($forcedDatas === null) {
-            $data = ob_get_contents();
-            ob_end_clean();
-        } else {
-            $data =& $forcedDatas;
-        }
-        $id = array_pop($this->_idStack);
-        if ($id === null) {
-            Zend_Cache::throwException('use of end() without a start()');
-        }
-        $this->save($data, $id, $tags, $specificLifetime, $priority);
-        if ($echoData) {
-            echo($data);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Frontend/Page.php b/airtime_mvc/library/Zend/Cache/Frontend/Page.php
deleted file mode 100644
index c8edceb7f..000000000
--- a/airtime_mvc/library/Zend/Cache/Frontend/Page.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Page.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Cache_Core
- */
-require_once 'Zend/Cache/Core.php';
-
-
-/**
- * @package    Zend_Cache
- * @subpackage Zend_Cache_Frontend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Frontend_Page extends Zend_Cache_Core
-{
-    /**
-     * This frontend specific options
-     *
-     * ====> (boolean) http_conditional :
-     * - if true, http conditional mode is on
-     * WARNING : http_conditional OPTION IS NOT IMPLEMENTED FOR THE MOMENT (TODO)
-     *
-     * ====> (boolean) debug_header :
-     * - if true, a debug text is added before each cached pages
-     *
-     * ====> (boolean) content_type_memorization :
-     * - deprecated => use memorize_headers instead
-     * - if the Content-Type header is sent after the cache was started, the
-     *   corresponding value can be memorized and replayed when the cache is hit
-     *   (if false (default), the frontend doesn't take care of Content-Type header)
-     *
-     * ====> (array) memorize_headers :
-     * - an array of strings corresponding to some HTTP headers name. Listed headers
-     *   will be stored with cache datas and "replayed" when the cache is hit
-     *
-     * ====> (array) default_options :
-     * - an associative array of default options :
-     *     - (boolean) cache : cache is on by default if true
-     *     - (boolean) cacheWithXXXVariables  (XXXX = 'Get', 'Post', 'Session', 'Files' or 'Cookie') :
-     *       if true,  cache is still on even if there are some variables in this superglobal array
-     *       if false, cache is off if there are some variables in this superglobal array
-     *     - (boolean) makeIdWithXXXVariables (XXXX = 'Get', 'Post', 'Session', 'Files' or 'Cookie') :
-     *       if true, we have to use the content of this superglobal array to make a cache id
-     *       if false, the cache id won't be dependent of the content of this superglobal array
-     *     - (int) specific_lifetime : cache specific lifetime
-     *                                (false => global lifetime is used, null => infinite lifetime,
-     *                                 integer => this lifetime is used), this "lifetime" is probably only
-     *                                usefull when used with "regexps" array
-     *     - (array) tags : array of tags (strings)
-     *     - (int) priority : integer between 0 (very low priority) and 10 (maximum priority) used by
-     *                        some particular backends
-     *
-     * ====> (array) regexps :
-     * - an associative array to set options only for some REQUEST_URI
-     * - keys are (pcre) regexps
-     * - values are associative array with specific options to set if the regexp matchs on $_SERVER['REQUEST_URI']
-     *   (see default_options for the list of available options)
-     * - if several regexps match the $_SERVER['REQUEST_URI'], only the last one will be used
-     *
-     * @var array options
-     */
-    protected $_specificOptions = array(
-        'http_conditional' => false,
-        'debug_header' => false,
-        'content_type_memorization' => false,
-        'memorize_headers' => array(),
-        'default_options' => array(
-            'cache_with_get_variables' => false,
-            'cache_with_post_variables' => false,
-            'cache_with_session_variables' => false,
-            'cache_with_files_variables' => false,
-            'cache_with_cookie_variables' => false,
-            'make_id_with_get_variables' => true,
-            'make_id_with_post_variables' => true,
-            'make_id_with_session_variables' => true,
-            'make_id_with_files_variables' => true,
-            'make_id_with_cookie_variables' => true,
-            'cache' => true,
-            'specific_lifetime' => false,
-            'tags' => array(),
-            'priority' => null
-        ),
-        'regexps' => array()
-    );
-
-    /**
-     * Internal array to store some options
-     *
-     * @var array associative array of options
-     */
-    protected $_activeOptions = array();
-
-    /**
-     * If true, the page won't be cached
-     *
-     * @var boolean
-     */
-    protected $_cancel = false;
-
-    /**
-     * Constructor
-     *
-     * @param  array   $options                Associative array of options
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        while (list($name, $value) = each($options)) {
-            $name = strtolower($name);
-            switch ($name) {
-                case 'regexps':
-                    $this->_setRegexps($value);
-                    break;
-                case 'default_options':
-                    $this->_setDefaultOptions($value);
-                    break;
-                case 'content_type_memorization':
-                    $this->_setContentTypeMemorization($value);
-                    break;
-                default:
-                    $this->setOption($name, $value);
-            }
-        }
-        if (isset($this->_specificOptions['http_conditional'])) {
-            if ($this->_specificOptions['http_conditional']) {
-                Zend_Cache::throwException('http_conditional is not implemented for the moment !');
-            }
-        }
-        $this->setOption('automatic_serialization', true);
-    }
-
-    /**
-     * Specific setter for the 'default_options' option (with some additional tests)
-     *
-     * @param  array $options Associative array
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _setDefaultOptions($options)
-    {
-        if (!is_array($options)) {
-            Zend_Cache::throwException('default_options must be an array !');
-        }
-        foreach ($options as $key=>$value) {
-            if (!is_string($key)) {
-                Zend_Cache::throwException("invalid option [$key] !");
-            }
-            $key = strtolower($key);
-            if (isset($this->_specificOptions['default_options'][$key])) {
-                $this->_specificOptions['default_options'][$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Set the deprecated contentTypeMemorization option
-     *
-     * @param boolean $value value
-     * @return void
-     * @deprecated
-     */
-    protected function _setContentTypeMemorization($value)
-    {
-        $found = null;
-        foreach ($this->_specificOptions['memorize_headers'] as $key => $value) {
-            if (strtolower($value) == 'content-type') {
-                $found = $key;
-            }
-        }
-        if ($value) {
-            if (!$found) {
-                $this->_specificOptions['memorize_headers'][] = 'Content-Type';
-            }
-        } else {
-            if ($found) {
-                unset($this->_specificOptions['memorize_headers'][$found]);
-            }
-        }
-    }
-
-    /**
-     * Specific setter for the 'regexps' option (with some additional tests)
-     *
-     * @param  array $options Associative array
-     * @throws Zend_Cache_Exception
-     * @return void
-     */
-    protected function _setRegexps($regexps)
-    {
-        if (!is_array($regexps)) {
-            Zend_Cache::throwException('regexps option must be an array !');
-        }
-        foreach ($regexps as $regexp=>$conf) {
-            if (!is_array($conf)) {
-                Zend_Cache::throwException('regexps option must be an array of arrays !');
-            }
-            $validKeys = array_keys($this->_specificOptions['default_options']);
-            foreach ($conf as $key=>$value) {
-                if (!is_string($key)) {
-                    Zend_Cache::throwException("unknown option [$key] !");
-                }
-                $key = strtolower($key);
-                if (!in_array($key, $validKeys)) {
-                    unset($regexps[$regexp][$key]);
-                }
-            }
-        }
-        $this->setOption('regexps', $regexps);
-    }
-
-    /**
-     * Start the cache
-     *
-     * @param  string  $id       (optional) A cache id (if you set a value here, maybe you have to use Output frontend instead)
-     * @param  boolean $doNotDie For unit testing only !
-     * @return boolean True if the cache is hit (false else)
-     */
-    public function start($id = false, $doNotDie = false)
-    {
-        $this->_cancel = false;
-        $lastMatchingRegexp = null;
-        foreach ($this->_specificOptions['regexps'] as $regexp => $conf) {
-            if (preg_match("`$regexp`", $_SERVER['REQUEST_URI'])) {
-                $lastMatchingRegexp = $regexp;
-            }
-        }
-        $this->_activeOptions = $this->_specificOptions['default_options'];
-        if ($lastMatchingRegexp !== null) {
-            $conf = $this->_specificOptions['regexps'][$lastMatchingRegexp];
-            foreach ($conf as $key=>$value) {
-                $this->_activeOptions[$key] = $value;
-            }
-        }
-        if (!($this->_activeOptions['cache'])) {
-            return false;
-        }
-        if (!$id) {
-            $id = $this->_makeId();
-            if (!$id) {
-                return false;
-            }
-        }
-        $array = $this->load($id);
-        if ($array !== false) {
-            $data = $array['data'];
-            $headers = $array['headers'];
-            if (!headers_sent()) {
-                foreach ($headers as $key=>$headerCouple) {
-                    $name = $headerCouple[0];
-                    $value = $headerCouple[1];
-                    header("$name: $value");
-                }
-            }
-            if ($this->_specificOptions['debug_header']) {
-                echo 'DEBUG HEADER : This is a cached page !';
-            }
-            echo $data;
-            if ($doNotDie) {
-                return true;
-            }
-            die();
-        }
-        ob_start(array($this, '_flush'));
-        ob_implicit_flush(false);
-        return false;
-    }
-
-    /**
-     * Cancel the current caching process
-     */
-    public function cancel()
-    {
-        $this->_cancel = true;
-    }
-
-    /**
-     * callback for output buffering
-     * (shouldn't really be called manually)
-     *
-     * @param  string $data Buffered output
-     * @return string Data to send to browser
-     */
-    public function _flush($data)
-    {
-        if ($this->_cancel) {
-            return $data;
-        }
-        $contentType = null;
-        $storedHeaders = array();
-        $headersList = headers_list();
-        foreach($this->_specificOptions['memorize_headers'] as $key=>$headerName) {
-            foreach ($headersList as $headerSent) {
-                $tmp = explode(':', $headerSent);
-                $headerSentName = trim(array_shift($tmp));
-                if (strtolower($headerName) == strtolower($headerSentName)) {
-                    $headerSentValue = trim(implode(':', $tmp));
-                    $storedHeaders[] = array($headerSentName, $headerSentValue);
-                }
-            }
-        }
-        $array = array(
-            'data' => $data,
-            'headers' => $storedHeaders
-        );
-        $this->save($array, null, $this->_activeOptions['tags'], $this->_activeOptions['specific_lifetime'], $this->_activeOptions['priority']);
-        return $data;
-    }
-
-    /**
-     * Make an id depending on REQUEST_URI and superglobal arrays (depending on options)
-     *
-     * @return mixed|false a cache id (string), false if the cache should have not to be used
-     */
-    protected function _makeId()
-    {
-        $tmp = $_SERVER['REQUEST_URI'];
-        $array = explode('?', $tmp, 2);
-          $tmp = $array[0];
-        foreach (array('Get', 'Post', 'Session', 'Files', 'Cookie') as $arrayName) {
-            $tmp2 = $this->_makePartialId($arrayName, $this->_activeOptions['cache_with_' . strtolower($arrayName) . '_variables'], $this->_activeOptions['make_id_with_' . strtolower($arrayName) . '_variables']);
-            if ($tmp2===false) {
-                return false;
-            }
-            $tmp = $tmp . $tmp2;
-        }
-        return md5($tmp);
-    }
-
-    /**
-     * Make a partial id depending on options
-     *
-     * @param  string $arrayName Superglobal array name
-     * @param  bool   $bool1     If true, cache is still on even if there are some variables in the superglobal array
-     * @param  bool   $bool2     If true, we have to use the content of the superglobal array to make a partial id
-     * @return mixed|false Partial id (string) or false if the cache should have not to be used
-     */
-    protected function _makePartialId($arrayName, $bool1, $bool2)
-    {
-        switch ($arrayName) {
-        case 'Get':
-            $var = $_GET;
-            break;
-        case 'Post':
-            $var = $_POST;
-            break;
-        case 'Session':
-            if (isset($_SESSION)) {
-                $var = $_SESSION;
-            } else {
-                $var = null;
-            }
-            break;
-        case 'Cookie':
-            if (isset($_COOKIE)) {
-                $var = $_COOKIE;
-            } else {
-                $var = null;
-            }
-            break;
-        case 'Files':
-            $var = $_FILES;
-            break;
-        default:
-            return false;
-        }
-        if ($bool1) {
-            if ($bool2) {
-                return serialize($var);
-            }
-            return '';
-        }
-        if (count($var) > 0) {
-            return false;
-        }
-        return '';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Cache/Manager.php b/airtime_mvc/library/Zend/Cache/Manager.php
deleted file mode 100644
index a409a2b81..000000000
--- a/airtime_mvc/library/Zend/Cache/Manager.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/** @see Zend_Cache_Exception */
-require_once 'Zend/Cache/Exception.php';
-
-/** @see Zend_Cache */
-require_once 'Zend/Cache.php';
-
-/**
- * @category   Zend
- * @package    Zend_Cache
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Cache_Manager
-{
-    /**
-     * Constant holding reserved name for default Page Cache
-     */
-    const PAGECACHE = 'page';
-    
-    /**
-     * Constant holding reserved name for default Page Tag Cache
-     */
-    const PAGETAGCACHE = 'pagetag';
-
-    /**
-     * Array of caches stored by the Cache Manager instance
-     *
-     * @var array
-     */
-    protected $_caches = array();
-
-    /**
-     * Array of ready made configuration templates for lazy
-     * loading caches.
-     *
-     * @var array
-     */
-    protected $_optionTemplates = array(
-        // Null Cache (Enforce Null/Empty Values)
-        'skeleton' => array(
-            'frontend' => array(
-                'name'    => null,
-                'options' => array(),
-            ),
-            'backend' => array(
-                'name'    => null,
-                'options' => array(),
-            ),
-        ),
-        // Simple Common Default
-        'default' => array(
-            'frontend' => array(
-                'name'    => 'Core',
-                'options' => array(
-                    'automatic_serialization' => true,
-                ),
-            ),
-            'backend' => array(
-                'name'    => 'File',
-                'options' => array(
-                    'cache_dir' => '../cache',
-                ),
-            ),
-        ),
-        // Static Page HTML Cache
-        'page' => array(
-            'frontend' => array(
-                'name'    => 'Capture',
-                'options' => array(
-                    'ignore_user_abort' => true,
-                ),
-            ),
-            'backend' => array(
-                'name'    => 'Static',
-                'options' => array(
-                    'public_dir' => '../public',
-                ),
-            ),
-        ),
-        // Tag Cache
-        'pagetag' => array(
-            'frontend' => array(
-                'name'    => 'Core',
-                'options' => array(
-                    'automatic_serialization' => true,
-                    'lifetime' => null
-                ),
-            ),
-            'backend' => array(
-                'name'    => 'File',
-                'options' => array(
-                    'cache_dir' => '../cache',
-                    'cache_file_umask' => 0644
-                ),
-            ),
-        ),
-    );
-
-    /**
-     * Set a new cache for the Cache Manager to contain
-     *
-     * @param  string $name
-     * @param  Zend_Cache_Core $cache
-     * @return Zend_Cache_Manager
-     */
-    public function setCache($name, Zend_Cache_Core $cache)
-    {
-        $this->_caches[$name] = $cache;
-        return $this;
-    }
-
-    /**
-     * Check if the Cache Manager contains the named cache object, or a named
-     * configuration template to lazy load the cache object
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function hasCache($name)
-    {
-        if (isset($this->_caches[$name])
-            || $this->hasCacheTemplate($name)
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Fetch the named cache object, or instantiate and return a cache object
-     * using a named configuration template
-     *
-     * @param  string $name
-     * @return Zend_Cache_Core
-     */
-    public function getCache($name)
-    {
-        if (isset($this->_caches[$name])) {
-            return $this->_caches[$name];
-        }
-        if (isset($this->_optionTemplates[$name])) {
-            if ($name == self::PAGECACHE 
-                && (!isset($this->_optionTemplates[$name]['backend']['options']['tag_cache']) 
-                || !$this->_optionTemplates[$name]['backend']['options']['tag_cache'] instanceof Zend_Cache_Core)
-            ) {
-                $this->_optionTemplates[$name]['backend']['options']['tag_cache']
-                    = $this->getCache(self::PAGETAGCACHE );
-            }
-            $this->_caches[$name] = Zend_Cache::factory(
-                $this->_optionTemplates[$name]['frontend']['name'],
-                $this->_optionTemplates[$name]['backend']['name'],
-                isset($this->_optionTemplates[$name]['frontend']['options']) ? $this->_optionTemplates[$name]['frontend']['options'] : array(),
-                isset($this->_optionTemplates[$name]['backend']['options']) ? $this->_optionTemplates[$name]['backend']['options'] : array()
-            );
-            return $this->_caches[$name];
-        }
-    }
-
-    /**
-     * Set a named configuration template from which a cache object can later
-     * be lazy loaded
-     *
-     * @param  string $name
-     * @param  array $options
-     * @return Zend_Cache_Manager
-     */
-    public function setCacheTemplate($name, $options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Cache/Exception.php';
-            throw new Zend_Cache_Exception('Options passed must be in'
-                . ' an associative array or instance of Zend_Config');
-        }
-        $this->_optionTemplates[$name] = $options;
-        return $this;
-    }
-
-    /**
-     * Check if the named configuration template
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasCacheTemplate($name)
-    {
-        if (isset($this->_optionTemplates[$name])) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the named configuration template
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCacheTemplate($name)
-    {
-        if (isset($this->_optionTemplates[$name])) {
-            return $this->_optionTemplates[$name];
-        }
-    }
-
-    /**
-     * Pass an array containing changes to be applied to a named
-     * configuration
-     * template
-     *
-     * @param  string $name
-     * @param  array $options
-     * @return Zend_Cache_Manager
-     * @throws Zend_Cache_Exception for invalid options format or if option templates do not have $name
-     */
-    public function setTemplateOptions($name, $options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Cache/Exception.php';
-            throw new Zend_Cache_Exception('Options passed must be in'
-                . ' an associative array or instance of Zend_Config');
-        }
-        if (!isset($this->_optionTemplates[$name])) {
-            throw new Zend_Cache_Exception('A cache configuration template'
-                . 'does not exist with the name "' . $name . '"');
-        }
-        $this->_optionTemplates[$name]
-            = $this->_mergeOptions($this->_optionTemplates[$name], $options);
-        return $this;
-    }
-
-    /**
-     * Simple method to merge two configuration arrays
-     *
-     * @param  array $current
-     * @param  array $options
-     * @return array
-     */
-    protected function _mergeOptions(array $current, array $options)
-    {
-        if (isset($options['frontend']['name'])) {
-            $current['frontend']['name'] = $options['frontend']['name'];
-        }
-        if (isset($options['backend']['name'])) {
-            $current['backend']['name'] = $options['backend']['name'];
-        }
-        if (isset($options['frontend']['options'])) {
-            foreach ($options['frontend']['options'] as $key=>$value) {
-                $current['frontend']['options'][$key] = $value;
-            }
-        }
-        if (isset($options['backend']['options'])) {
-            foreach ($options['backend']['options'] as $key=>$value) {
-                $current['backend']['options'][$key] = $value;
-            }
-        }
-        return $current;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Adapter.php b/airtime_mvc/library/Zend/Captcha/Adapter.php
deleted file mode 100644
index 02c1391bc..000000000
--- a/airtime_mvc/library/Zend/Captcha/Adapter.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Validate_Interface */
-require_once 'Zend/Validate/Interface.php';
-
-/**
- * Generic Captcha adapter interface
- *
- * Each specific captcha implementation should implement this interface
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Captcha_Adapter extends Zend_Validate_Interface
-{
-    /**
-     * Generate a new captcha
-     *
-     * @return string new captcha ID
-     */
-    public function generate();
-
-    /**
-     * Display the captcha
-     *
-     * @param  Zend_View_Interface $view
-     * @param  mixed $element
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null, $element = null);
-
-    /**
-     * Set captcha name
-     *
-     * @param  string $name
-     * @return Zend_Captcha_Adapter
-     */
-    public function setName($name);
-
-    /**
-     * Get captcha name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Get optional private decorator for this captcha type
-     *
-     * @return Zend_Form_Decorator_Interface|string
-     */
-    public function getDecorator();
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Base.php b/airtime_mvc/library/Zend/Captcha/Base.php
deleted file mode 100644
index 240d1463b..000000000
--- a/airtime_mvc/library/Zend/Captcha/Base.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Captcha_Adapter */
-require_once 'Zend/Captcha/Adapter.php';
-
-/** @see Zend_Validate_Abstract */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Base class for Captcha adapters
- *
- * Provides some utility functionality to build on
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter
-{
-    /**
-     * Element name
-     *
-     * Useful to generate/check form fields
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Captcha options
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Options to skip when processing options
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Get name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set name
-     *
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        // Set options
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } else if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-    }
-
-    /**
-     * Set single option for the object
-     *
-     * @param string $key
-     * @param string $value
-     * @return Zend_Form_Element
-     */
-    public function setOption($key, $value)
-    {
-        if (in_array(strtolower($key), $this->_skipOptions)) {
-            return $this;
-        }
-
-        $method = 'set' . ucfirst ($key);
-        if (method_exists ($this, $method)) {
-            // Setter exists; use it
-            $this->$method ($value);
-            $this->_options[$key] = $value;
-        } elseif (property_exists($this, $key)) {
-            // Assume it's metadata
-            $this->$key = $value;
-            $this->_options[$key] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Set object state from options array
-     *
-     * @param  array $options
-     * @return Zend_Form_Element
-     */
-    public function setOptions($options = null)
-    {
-        foreach ($options as $key => $value) {
-            $this->setOption($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve options representing object state
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Set object state from config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Captcha_Base
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Get optional decorator
-     *
-     * By default, return null, indicating no extra decorator needed.
-     *
-     * @return null
-     */
-    public function getDecorator()
-    {
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Dumb.php b/airtime_mvc/library/Zend/Captcha/Dumb.php
deleted file mode 100644
index 795b27c9d..000000000
--- a/airtime_mvc/library/Zend/Captcha/Dumb.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Captcha_Word */
-require_once 'Zend/Captcha/Word.php';
-
-/**
- * Example dumb word-based captcha
- *
- * Note that only rendering is necessary for word-based captcha
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dumb.php 20096 2010-01-06 02:05:09Z bkarwin $
-*/
-class Zend_Captcha_Dumb extends Zend_Captcha_Word
-{
-    /**
-     * Render the captcha
-     *
-     * @param  Zend_View_Interface $view
-     * @param  mixed $element
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null, $element = null)
-    {
-        return 'Please type this word backwards: <b>'
-             . strrev($this->getWord())
-             . '</b>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Exception.php b/airtime_mvc/library/Zend/Captcha/Exception.php
deleted file mode 100644
index e247f42bb..000000000
--- a/airtime_mvc/library/Zend/Captcha/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Captcha_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Figlet.php b/airtime_mvc/library/Zend/Captcha/Figlet.php
deleted file mode 100644
index 3d93c5598..000000000
--- a/airtime_mvc/library/Zend/Captcha/Figlet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Captcha_Word */
-require_once 'Zend/Captcha/Word.php';
-
-/** @see Zend_Text_Figlet */
-require_once 'Zend/Text/Figlet.php';
-
-/**
- * Captcha based on figlet text rendering service
- *
- * Note that this engine seems not to like numbers
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Captcha_Figlet extends Zend_Captcha_Word
-{
-    /**
-     * Figlet text renderer
-     *
-     * @var Zend_Text_Figlet
-     */
-    protected $_figlet;
-
-    /**
-     * Constructor
-     *
-     * @param  null|string|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-        $this->_figlet = new Zend_Text_Figlet($options);
-    }
-
-    /**
-     * Generate new captcha
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $this->_useNumbers = false;
-        return parent::generate();
-    }
-
-    /**
-     * Display the captcha
-     *
-     * @param Zend_View_Interface $view
-     * @param mixed $element
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null, $element = null)
-    {
-        return '<pre>'
-             . $this->_figlet->render($this->getWord())
-             . "</pre>\n";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Image.php b/airtime_mvc/library/Zend/Captcha/Image.php
deleted file mode 100644
index cc79a4e25..000000000
--- a/airtime_mvc/library/Zend/Captcha/Image.php
+++ /dev/null
@@ -1,600 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Captcha_Word */
-require_once 'Zend/Captcha/Word.php';
-
-/**
- * Image-based captcha element
- *
- * Generates image displaying random word
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Captcha_Image extends Zend_Captcha_Word
-{
-    /**
-     * Directory for generated images
-     *
-     * @var string
-     */
-    protected $_imgDir = "./images/captcha/";
-
-    /**
-     * URL for accessing images
-     *
-     * @var string
-     */
-    protected $_imgUrl = "/images/captcha/";
-
-    /**
-     * Image's alt tag content
-     *
-     * @var string
-     */
-    protected $_imgAlt = "";
-
-    /**
-     * Image suffix (including dot)
-     *
-     * @var string
-     */
-    protected $_suffix = ".png";
-
-    /**
-     * Image width
-     *
-     * @var int
-     */
-    protected $_width = 200;
-
-    /**
-     * Image height
-     *
-     * @var int
-     */
-    protected $_height = 50;
-
-    /**
-     * Font size
-     *
-     * @var int
-     */
-    protected $_fsize = 24;
-
-    /**
-     * Image font file
-     *
-     * @var string
-     */
-    protected $_font;
-
-    /**
-     * Image to use as starting point
-     * Default is blank image. If provided, should be PNG image.
-     *
-     * @var string
-     */
-    protected $_startImage;
-    /**
-     * How frequently to execute garbage collection
-     *
-     * @var int
-     */
-    protected $_gcFreq = 10;
-
-    /**
-     * How long to keep generated images
-     *
-     * @var int
-     */
-    protected $_expiration = 600;
-
-    /**
-     * Number of noise dots on image
-     * Used twice - before and after transform
-     *
-     * @var int
-     */
-    protected $_dotNoiseLevel = 100;
-    /**
-     * Number of noise lines on image
-     * Used twice - before and after transform
-     *
-     * @var int
-     */
-    protected $_lineNoiseLevel = 5;
-    /**
-     * @return string
-     */
-    public function getImgAlt ()
-    {
-        return $this->_imgAlt;
-    }
-    /**
-     * @return string
-     */
-    public function getStartImage ()
-    {
-        return $this->_startImage;
-    }
-    /**
-     * @return int
-     */
-    public function getDotNoiseLevel ()
-    {
-        return $this->_dotNoiseLevel;
-    }
-    /**
-     * @return int
-     */
-    public function getLineNoiseLevel ()
-    {
-        return $this->_lineNoiseLevel;
-    }
-    /**
-     * Get captcha expiration
-     *
-     * @return int
-     */
-    public function getExpiration()
-    {
-        return $this->_expiration;
-    }
-
-    /**
-     * Get garbage collection frequency
-     *
-     * @return int
-     */
-    public function getGcFreq()
-    {
-        return $this->_gcFreq;
-    }
-    /**
-     * Get font to use when generating captcha
-     *
-     * @return string
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     * Get font size
-     *
-     * @return int
-     */
-    public function getFontSize()
-    {
-        return $this->_fsize;
-    }
-
-    /**
-     * Get captcha image height
-     *
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
-
-    /**
-     * Get captcha image directory
-     *
-     * @return string
-     */
-    public function getImgDir()
-    {
-        return $this->_imgDir;
-    }
-    /**
-     * Get captcha image base URL
-     *
-     * @return string
-     */
-    public function getImgUrl()
-    {
-        return $this->_imgUrl;
-    }
-    /**
-     * Get captcha image file suffix
-     *
-     * @return string
-     */
-    public function getSuffix()
-    {
-        return $this->_suffix;
-    }
-    /**
-     * Get captcha image width
-     *
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
-    /**
-     * @param string $startImage
-     */
-    public function setStartImage ($startImage)
-    {
-        $this->_startImage = $startImage;
-        return $this;
-    }
-    /**
-     * @param int $dotNoiseLevel
-     */
-    public function setDotNoiseLevel ($dotNoiseLevel)
-    {
-        $this->_dotNoiseLevel = $dotNoiseLevel;
-        return $this;
-    }
-   /**
-     * @param int $lineNoiseLevel
-     */
-    public function setLineNoiseLevel ($lineNoiseLevel)
-    {
-        $this->_lineNoiseLevel = $lineNoiseLevel;
-        return $this;
-    }
-
-    /**
-     * Set captcha expiration
-     *
-     * @param int $expiration
-     * @return Zend_Captcha_Image
-     */
-    public function setExpiration($expiration)
-    {
-        $this->_expiration = $expiration;
-        return $this;
-    }
-
-    /**
-     * Set garbage collection frequency
-     *
-     * @param int $gcFreq
-     * @return Zend_Captcha_Image
-     */
-    public function setGcFreq($gcFreq)
-    {
-        $this->_gcFreq = $gcFreq;
-        return $this;
-    }
-
-    /**
-     * Set captcha font
-     *
-     * @param  string $font
-     * @return Zend_Captcha_Image
-     */
-    public function setFont($font)
-    {
-        $this->_font = $font;
-        return $this;
-    }
-
-    /**
-     * Set captcha font size
-     *
-     * @param  int $fsize
-     * @return Zend_Captcha_Image
-     */
-    public function setFontSize($fsize)
-    {
-        $this->_fsize = $fsize;
-        return $this;
-    }
-
-    /**
-     * Set captcha image height
-     *
-     * @param  int $height
-     * @return Zend_Captcha_Image
-     */
-    public function setHeight($height)
-    {
-        $this->_height = $height;
-        return $this;
-    }
-
-    /**
-     * Set captcha image storage directory
-     *
-     * @param  string $imgDir
-     * @return Zend_Captcha_Image
-     */
-    public function setImgDir($imgDir)
-    {
-        $this->_imgDir = rtrim($imgDir, "/\\") . '/';
-        return $this;
-    }
-
-    /**
-     * Set captcha image base URL
-     *
-     * @param  string $imgUrl
-     * @return Zend_Captcha_Image
-     */
-    public function setImgUrl($imgUrl)
-    {
-        $this->_imgUrl = rtrim($imgUrl, "/\\") . '/';
-        return $this;
-    }
-    /**
-     * @param string $imgAlt
-     */
-    public function setImgAlt ($imgAlt)
-    {
-        $this->_imgAlt = $imgAlt;
-        return $this;
-    }
-
-    /**
-     * Set captch image filename suffix
-     *
-     * @param  string $suffix
-     * @return Zend_Captcha_Image
-     */
-    public function setSuffix($suffix)
-    {
-        $this->_suffix = $suffix;
-        return $this;
-    }
-
-    /**
-     * Set captcha image width
-     *
-     * @param  int $width
-     * @return Zend_Captcha_Image
-     */
-    public function setWidth($width)
-    {
-        $this->_width = $width;
-        return $this;
-    }
-
-    /**
-     * Generate random frequency
-     *
-     * @return float
-     */
-    protected function _randomFreq()
-    {
-        return mt_rand(700000, 1000000) / 15000000;
-    }
-
-    /**
-     * Generate random phase
-     *
-     * @return float
-     */
-    protected function _randomPhase()
-    {
-        // random phase from 0 to pi
-        return mt_rand(0, 3141592) / 1000000;
-    }
-
-    /**
-     * Generate random character size
-     *
-     * @return int
-     */
-    protected function _randomSize()
-    {
-        return mt_rand(300, 700) / 100;
-    }
-
-    /**
-     * Generate captcha
-     *
-     * @return string captcha ID
-     */
-    public function generate()
-    {
-        $id = parent::generate();
-        $tries = 5;
-        // If there's already such file, try creating a new ID
-        while($tries-- && file_exists($this->getImgDir() . $id . $this->getSuffix())) {
-            $id = $this->_generateRandomId();
-            $this->_setId($id);
-        }
-        $this->_generateImage($id, $this->getWord());
-
-        if (mt_rand(1, $this->getGcFreq()) == 1) {
-            $this->_gc();
-        }
-        return $id;
-    }
-
-    /**
-     * Generate image captcha
-     *
-     * Override this function if you want different image generator
-     * Wave transform from http://www.captcha.ru/captchas/multiwave/
-     *
-     * @param string $id Captcha ID
-     * @param string $word Captcha word
-     */
-    protected function _generateImage($id, $word)
-    {
-        if (!extension_loaded("gd")) {
-            require_once 'Zend/Captcha/Exception.php';
-            throw new Zend_Captcha_Exception("Image CAPTCHA requires GD extension");
-        }
-
-        if (!function_exists("imagepng")) {
-            require_once 'Zend/Captcha/Exception.php';
-            throw new Zend_Captcha_Exception("Image CAPTCHA requires PNG support");
-        }
-
-        if (!function_exists("imageftbbox")) {
-            require_once 'Zend/Captcha/Exception.php';
-            throw new Zend_Captcha_Exception("Image CAPTCHA requires FT fonts support");
-        }
-
-        $font = $this->getFont();
-
-        if (empty($font)) {
-            require_once 'Zend/Captcha/Exception.php';
-            throw new Zend_Captcha_Exception("Image CAPTCHA requires font");
-        }
-
-        $w     = $this->getWidth();
-        $h     = $this->getHeight();
-        $fsize = $this->getFontSize();
-
-        $img_file   = $this->getImgDir() . $id . $this->getSuffix();
-        if(empty($this->_startImage)) {
-            $img        = imagecreatetruecolor($w, $h);
-        } else {
-            $img = imagecreatefrompng($this->_startImage);
-            if(!$img) {
-                require_once 'Zend/Captcha/Exception.php';
-                throw new Zend_Captcha_Exception("Can not load start image");
-            }
-            $w = imagesx($img);
-            $h = imagesy($img);
-        }
-        $text_color = imagecolorallocate($img, 0, 0, 0);
-        $bg_color   = imagecolorallocate($img, 255, 255, 255);
-        imagefilledrectangle($img, 0, 0, $w-1, $h-1, $bg_color);
-        $textbox = imageftbbox($fsize, 0, $font, $word);
-        $x = ($w - ($textbox[2] - $textbox[0])) / 2;
-        $y = ($h - ($textbox[7] - $textbox[1])) / 2;
-        imagefttext($img, $fsize, 0, $x, $y, $text_color, $font, $word);
-
-       // generate noise
-        for ($i=0; $i<$this->_dotNoiseLevel; $i++) {
-           imagefilledellipse($img, mt_rand(0,$w), mt_rand(0,$h), 2, 2, $text_color);
-        }
-        for($i=0; $i<$this->_lineNoiseLevel; $i++) {
-           imageline($img, mt_rand(0,$w), mt_rand(0,$h), mt_rand(0,$w), mt_rand(0,$h), $text_color);
-        }
-
-        // transformed image
-        $img2     = imagecreatetruecolor($w, $h);
-        $bg_color = imagecolorallocate($img2, 255, 255, 255);
-        imagefilledrectangle($img2, 0, 0, $w-1, $h-1, $bg_color);
-        // apply wave transforms
-        $freq1 = $this->_randomFreq();
-        $freq2 = $this->_randomFreq();
-        $freq3 = $this->_randomFreq();
-        $freq4 = $this->_randomFreq();
-
-        $ph1 = $this->_randomPhase();
-        $ph2 = $this->_randomPhase();
-        $ph3 = $this->_randomPhase();
-        $ph4 = $this->_randomPhase();
-
-        $szx = $this->_randomSize();
-        $szy = $this->_randomSize();
-
-        for ($x = 0; $x < $w; $x++) {
-            for ($y = 0; $y < $h; $y++) {
-                $sx = $x + (sin($x*$freq1 + $ph1) + sin($y*$freq3 + $ph3)) * $szx;
-                $sy = $y + (sin($x*$freq2 + $ph2) + sin($y*$freq4 + $ph4)) * $szy;
-
-                if ($sx < 0 || $sy < 0 || $sx >= $w - 1 || $sy >= $h - 1) {
-                    continue;
-                } else {
-                    $color    = (imagecolorat($img, $sx, $sy) >> 16)         & 0xFF;
-                    $color_x  = (imagecolorat($img, $sx + 1, $sy) >> 16)     & 0xFF;
-                    $color_y  = (imagecolorat($img, $sx, $sy + 1) >> 16)     & 0xFF;
-                    $color_xy = (imagecolorat($img, $sx + 1, $sy + 1) >> 16) & 0xFF;
-                }
-                if ($color == 255 && $color_x == 255 && $color_y == 255 && $color_xy == 255) {
-                    // ignore background
-                    continue;
-                } elseif ($color == 0 && $color_x == 0 && $color_y == 0 && $color_xy == 0) {
-                    // transfer inside of the image as-is
-                    $newcolor = 0;
-                } else {
-                    // do antialiasing for border items
-                    $frac_x  = $sx-floor($sx);
-                    $frac_y  = $sy-floor($sy);
-                    $frac_x1 = 1-$frac_x;
-                    $frac_y1 = 1-$frac_y;
-
-                    $newcolor = $color    * $frac_x1 * $frac_y1
-                              + $color_x  * $frac_x  * $frac_y1
-                              + $color_y  * $frac_x1 * $frac_y
-                              + $color_xy * $frac_x  * $frac_y;
-                }
-                imagesetpixel($img2, $x, $y, imagecolorallocate($img2, $newcolor, $newcolor, $newcolor));
-            }
-        }
-
-        // generate noise
-        for ($i=0; $i<$this->_dotNoiseLevel; $i++) {
-            imagefilledellipse($img2, mt_rand(0,$w), mt_rand(0,$h), 2, 2, $text_color);
-        }
-        for ($i=0; $i<$this->_lineNoiseLevel; $i++) {
-           imageline($img2, mt_rand(0,$w), mt_rand(0,$h), mt_rand(0,$w), mt_rand(0,$h), $text_color);
-        }
-
-        imagepng($img2, $img_file);
-        imagedestroy($img);
-        imagedestroy($img2);
-    }
-
-    /**
-     * Remove old files from image directory
-     *
-     */
-    protected function _gc()
-    {
-        $expire = time() - $this->getExpiration();
-        $imgdir = $this->getImgDir();
-        if(!$imgdir || strlen($imgdir) < 2) {
-            // safety guard
-            return;
-        }
-        foreach (new DirectoryIterator($imgdir) as $file) {
-            if (!$file->isDot() && !$file->isDir()) {
-                if ($file->getMTime() < $expire) {
-                    unlink($file->getPathname());
-                }
-            }
-        }
-    }
-
-    /**
-     * Display the captcha
-     *
-     * @param Zend_View_Interface $view
-     * @param mixed $element
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null, $element = null)
-    {
-        return '<img width="'.$this->getWidth().'" height="'.$this->getHeight().'" alt="'.$this->getImgAlt().'" src="' . $this->getImgUrl() . $this->getId() . $this->getSuffix() . '"/><br/>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/ReCaptcha.php b/airtime_mvc/library/Zend/Captcha/ReCaptcha.php
deleted file mode 100644
index 820c4406d..000000000
--- a/airtime_mvc/library/Zend/Captcha/ReCaptcha.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Captcha_Base */
-require_once 'Zend/Captcha/Base.php';
-
-/** @see Zend_Service_ReCaptcha */
-require_once 'Zend/Service/ReCaptcha.php';
-
-/**
- * ReCaptcha adapter
- *
- * Allows to insert captchas driven by ReCaptcha service
- *
- * @see http://recaptcha.net/apidocs/captcha/
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base
-{
-    /**@+
-     * ReCaptcha Field names
-     * @var string
-     */
-    protected $_CHALLENGE = 'recaptcha_challenge_field';
-    protected $_RESPONSE  = 'recaptcha_response_field';
-    /**@-*/
-
-    /**
-     * Recaptcha service object
-     *
-     * @var Zend_Service_Recaptcha
-     */
-    protected $_service;
-
-    /**
-     * Parameters defined by the service
-     *
-     * @var array
-     */
-    protected $_serviceParams = array();
-
-    /**
-     * Options defined by the service
-     *
-     * @var array
-     */
-    protected $_serviceOptions = array();
-
-    /**#@+
-     * Error codes
-     */
-    const MISSING_VALUE = 'missingValue';
-    const ERR_CAPTCHA   = 'errCaptcha';
-    const BAD_CAPTCHA   = 'badCaptcha';
-    /**#@-*/
-
-    /**
-     * Error messages
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::MISSING_VALUE => 'Missing captcha fields',
-        self::ERR_CAPTCHA   => 'Failed to validate captcha',
-        self::BAD_CAPTCHA   => 'Captcha value is wrong: %value%',
-    );
-
-    /**
-     * Retrieve ReCaptcha Private key
-     *
-     * @return string
-     */
-    public function getPrivkey()
-    {
-        return $this->getService()->getPrivateKey();
-    }
-
-    /**
-     * Retrieve ReCaptcha Public key
-     *
-     * @return string
-     */
-    public function getPubkey()
-    {
-        return $this->getService()->getPublicKey();
-    }
-
-    /**
-     * Set ReCaptcha Private key
-     *
-     * @param string $privkey
-     * @return Zend_Captcha_ReCaptcha
-     */
-    public function setPrivkey($privkey)
-    {
-        $this->getService()->setPrivateKey($privkey);
-        return $this;
-    }
-
-    /**
-     * Set ReCaptcha public key
-     *
-     * @param string $pubkey
-     * @return Zend_Captcha_ReCaptcha
-     */
-    public function setPubkey($pubkey)
-    {
-        $this->getService()->setPublicKey($pubkey);
-        return $this;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->setService(new Zend_Service_ReCaptcha());
-        $this->_serviceParams = $this->getService()->getParams();
-        $this->_serviceOptions = $this->getService()->getOptions();
-
-        parent::__construct($options);
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (!empty($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set service object
-     *
-     * @param  Zend_Service_ReCaptcha $service
-     * @return Zend_Captcha_ReCaptcha
-     */
-    public function setService(Zend_Service_ReCaptcha $service)
-    {
-        $this->_service = $service;
-        return $this;
-    }
-
-    /**
-     * Retrieve ReCaptcha service object
-     *
-     * @return Zend_Service_ReCaptcha
-     */
-    public function getService()
-    {
-        return $this->_service;
-    }
-
-    /**
-     * Set option
-     *
-     * If option is a service parameter, proxies to the service. The same
-     * goes for any service options (distinct from service params)
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Captcha_ReCaptcha
-     */
-    public function setOption($key, $value)
-    {
-        $service = $this->getService();
-        if (isset($this->_serviceParams[$key])) {
-            $service->setParam($key, $value);
-            return $this;
-        }
-        if (isset($this->_serviceOptions[$key])) {
-            $service->setOption($key, $value);
-            return $this;
-        }
-        return parent::setOption($key, $value);
-    }
-
-    /**
-     * Generate captcha
-     *
-     * @see Zend_Form_Captcha_Adapter::generate()
-     * @return string
-     */
-    public function generate()
-    {
-        return "";
-    }
-
-    /**
-     * Validate captcha
-     *
-     * @see    Zend_Validate_Interface::isValid()
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value, $context = null)
-    {
-        if (!is_array($value) && !is_array($context)) {
-            $this->_error(self::MISSING_VALUE);
-            return false;
-        }
-
-        if (!is_array($value) && is_array($context)) {
-            $value = $context;
-        }
-
-        if (empty($value[$this->_CHALLENGE]) || empty($value[$this->_RESPONSE])) {
-            $this->_error(self::MISSING_VALUE);
-            return false;
-        }
-
-        $service = $this->getService();
-
-        $res = $service->verify($value[$this->_CHALLENGE], $value[$this->_RESPONSE]);
-
-        if (!$res) {
-            $this->_error(self::ERR_CAPTCHA);
-            return false;
-        }
-
-        if (!$res->isValid()) {
-            $this->_error(self::BAD_CAPTCHA, $res->getErrorCode());
-            $service->setParam('error', $res->getErrorCode());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Render captcha
-     *
-     * @param  Zend_View_Interface $view
-     * @param  mixed $element
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null, $element = null)
-    {
-        return $this->getService()->getHTML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Captcha/Word.php b/airtime_mvc/library/Zend/Captcha/Word.php
deleted file mode 100644
index b7216b50c..000000000
--- a/airtime_mvc/library/Zend/Captcha/Word.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Captcha_Base */
-require_once 'Zend/Captcha/Base.php';
-
-/**
- * Word-based captcha adapter
- *
- * Generates random word which user should recognise
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Word.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Captcha_Word extends Zend_Captcha_Base
-{
-    /**#@+
-     * @var array Character sets
-     */
-    static $V  = array("a", "e", "i", "o", "u", "y");
-    static $VN = array("a", "e", "i", "o", "u", "y","2","3","4","5","6","7","8","9");
-    static $C  = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z");
-    static $CN = array("b","c","d","f","g","h","j","k","m","n","p","q","r","s","t","u","v","w","x","z","2","3","4","5","6","7","8","9");
-    /**#@-*/
-
-    /**
-     * Random session ID
-     *
-     * @var string
-     */
-    protected $_id;
-
-    /**
-     * Generated word
-     *
-     * @var string
-     */
-    protected $_word;
-
-    /**
-     * Session
-     *
-     * @var Zend_Session_Namespace
-     */
-    protected $_session;
-
-    /**
-     * Class name for sessions
-     *
-     * @var string
-     */
-    protected $_sessionClass = 'Zend_Session_Namespace';
-
-    /**
-     * Should the numbers be used or only letters
-     *
-     * @var boolean
-     */
-    protected $_useNumbers = true;
-
-    /**
-     * Should both cases be used or only lowercase
-     *
-     * @var boolean
-     */
-    // protected $_useCase = false;
-
-    /**
-     * Session lifetime for the captcha data
-     *
-     * @var integer
-     */
-    protected $_timeout = 300;
-    
-    /**
-     * Should generate() keep session or create a new one?
-     * 
-     * @var boolean
-     */
-    protected $_keepSession = false;
-
-    /**#@+
-     * Error codes
-     */
-    const MISSING_VALUE = 'missingValue';
-    const MISSING_ID    = 'missingID';
-    const BAD_CAPTCHA   = 'badCaptcha';
-    /**#@-*/
-
-    /**
-     * Error messages
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::MISSING_VALUE => 'Empty captcha value',
-        self::MISSING_ID    => 'Captcha ID field is missing',
-        self::BAD_CAPTCHA   => 'Captcha value is wrong',
-    );
-
-    /**
-     * Length of the word to generate
-     *
-     * @var integer
-     */
-    protected $_wordlen = 8;
-
-    /**
-     * Retrieve session class to utilize
-     *
-     * @return string
-     */
-    public function getSessionClass()
-    {
-        return $this->_sessionClass;
-    }
-
-    /**
-     * Set session class for persistence
-     *
-     * @param  string $_sessionClass
-     * @return Zend_Captcha_Word
-     */
-    public function setSessionClass($_sessionClass)
-    {
-        $this->_sessionClass = $_sessionClass;
-        return $this;
-    }
-
-    /**
-     * Retrieve word length to use when genrating captcha
-     *
-     * @return integer
-     */
-    public function getWordlen()
-    {
-        return $this->_wordlen;
-    }
-
-    /**
-     * Set word length of captcha
-     *
-     * @param integer $wordlen
-     * @return Zend_Captcha_Word
-     */
-    public function setWordlen($wordlen)
-    {
-        $this->_wordlen = $wordlen;
-        return $this;
-    }
-
-    /**
-     * Retrieve captcha ID
-     *
-     * @return string
-     */
-    public function getId ()
-    {
-        if (null === $this->_id) {
-            $this->_setId($this->_generateRandomId());
-        }
-        return $this->_id;
-    }
-
-    /**
-     * Set captcha identifier
-     *
-     * @param string $id
-     * return Zend_Captcha_Word
-     */
-    protected function _setId ($id)
-    {
-        $this->_id = $id;
-        return $this;
-    }
-
-    /**
-     * Set timeout for session token
-     *
-     * @param  int $ttl
-     * @return Zend_Captcha_Word
-     */
-    public function setTimeout($ttl)
-    {
-        $this->_timeout = (int) $ttl;
-        return $this;
-    }
-
-    /**
-     * Get session token timeout
-     *
-     * @return int
-     */
-    public function getTimeout()
-    {
-        return $this->_timeout;
-    }
-
-	/**
-	 * Sets if session should be preserved on generate()
-	 * 
-	 * @param $keepSession Should session be kept on generate()?
-	 * @return Zend_Captcha_Word
-	 */
-	public function setKeepSession($keepSession) 
-	{
-		$this->_keepSession = $keepSession;
-		return $this;
-	}
-
-    /**
-     * Get session object
-     *
-     * @return Zend_Session_Namespace
-     */
-    public function getSession()
-    {
-        if (!isset($this->_session) || (null === $this->_session)) {
-            $id = $this->getId();
-            if (!class_exists($this->_sessionClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($this->_sessionClass);
-            }
-            $this->_session = new $this->_sessionClass('Zend_Form_Captcha_' . $id);
-            $this->_session->setExpirationHops(1, null, true);
-            $this->_session->setExpirationSeconds($this->getTimeout());
-        }
-        return $this->_session;
-    }
-
-    /**
-     * Set session namespace object
-     *
-     * @param  Zend_Session_Namespace $session
-     * @return Zend_Captcha_Word
-     */
-    public function setSession(Zend_Session_Namespace $session)
-    {
-        $this->_session = $session;
-        if($session) {
-            $this->_keepSession = true;
-        }
-        return $this;
-    }
-
-    /**
-     * Get captcha word
-     *
-     * @return string
-     */
-    public function getWord()
-    {
-        if (empty($this->_word)) {
-            $session     = $this->getSession();
-            $this->_word = $session->word;
-        }
-        return $this->_word;
-    }
-
-    /**
-     * Set captcha word
-     *
-     * @param  string $word
-     * @return Zend_Captcha_Word
-     */
-    protected function _setWord($word)
-    {
-        $session       = $this->getSession();
-        $session->word = $word;
-        $this->_word   = $word;
-        return $this;
-    }
-
-    /**
-     * Generate new random word
-     *
-     * @return string
-     */
-    protected function _generateWord()
-    {
-        $word       = '';
-        $wordLen    = $this->getWordLen();
-        $vowels     = $this->_useNumbers ? self::$VN : self::$V;
-        $consonants = $this->_useNumbers ? self::$CN : self::$C;
-
-        for ($i=0; $i < $wordLen; $i = $i + 2) {
-            // generate word with mix of vowels and consonants
-            $consonant = $consonants[array_rand($consonants)];
-            $vowel     = $vowels[array_rand($vowels)];
-            $word     .= $consonant . $vowel;
-        }
-
-        if (strlen($word) > $wordLen) {
-            $word = substr($word, 0, $wordLen);
-        }
-
-        return $word;
-    }
-
-    /**
-     * Generate new session ID and new word
-     *
-     * @return string session ID
-     */
-    public function generate()
-    {
-        if(!$this->_keepSession) {
-            $this->_session = null;   
-        }
-        $id = $this->_generateRandomId();
-        $this->_setId($id);
-        $word = $this->_generateWord();
-        $this->_setWord($word);
-        return $id;
-    }
-
-    protected function _generateRandomId()
-    {
-        return md5(mt_rand(0, 1000) . microtime(true));
-    }
-
-    /**
-     * Validate the word
-     *
-     * @see    Zend_Validate_Interface::isValid()
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value, $context = null)
-    {
-        if (!is_array($value) && !is_array($context)) {
-            $this->_error(self::MISSING_VALUE);
-            return false;
-        }
-        if (!is_array($value) && is_array($context)) {
-            $value = $context;
-        }
-
-        $name = $this->getName();
-
-        if (isset($value[$name])) {
-            $value = $value[$name];
-        }
-
-        if (!isset($value['input'])) {
-            $this->_error(self::MISSING_VALUE);
-            return false;
-        }
-        $input = strtolower($value['input']);
-        $this->_setValue($input);
-
-        if (!isset($value['id'])) {
-            $this->_error(self::MISSING_ID);
-            return false;
-        }
-
-        $this->_id = $value['id'];
-        if ($input !== $this->getWord()) {
-            $this->_error(self::BAD_CAPTCHA);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get captcha decorator
-     *
-     * @return string
-     */
-    public function getDecorator()
-    {
-        return "Captcha_Word";
-    }
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Abstract.php b/airtime_mvc/library/Zend/CodeGenerator/Abstract.php
deleted file mode 100644
index c74a397c6..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Abstract.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_CodeGenerator_Abstract
-{
-
-    /**
-     * @var string
-     */
-    protected $_sourceContent = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isSourceDirty = true;
-
-    /**
-     * __construct()
-     *
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        $this->_init();
-        if ($options != null) {
-            // use Zend_Config objects if provided
-            if ($options instanceof Zend_Config) {
-                $options = $options->toArray();
-            }
-            // pass arrays to setOptions
-            if (is_array($options)) {
-                $this->setOptions($options);
-            }
-        }
-        $this->_prepare();
-    }
-
-    /**
-     * setConfig()
-     *
-     * @param Zend_Config $config
-     * @return Zend_CodeGenerator_Abstract
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->setOptions($config->toArray());
-        return $this;
-    }
-
-    /**
-     * setOptions()
-     *
-     * @param array $options
-     * @return Zend_CodeGenerator_Abstract
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $methodName = 'set' . $optionName;
-            if (method_exists($this, $methodName)) {
-                $this->{$methodName}($optionValue);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * setSourceContent()
-     *
-     * @param string $sourceContent
-     */
-    public function setSourceContent($sourceContent)
-    {
-        $this->_sourceContent = $sourceContent;
-        return;
-    }
-
-    /**
-     * getSourceContent()
-     *
-     * @return string
-     */
-    public function getSourceContent()
-    {
-        return $this->_sourceContent;
-    }
-
-    /**
-     * _init() - this is called before the constuctor
-     *
-     */
-    protected function _init()
-    {
-
-    }
-
-    /**
-     * _prepare() - this is called at construction completion
-     *
-     */
-    protected function _prepare()
-    {
-
-    }
-
-    /**
-     * generate() - must be implemented by the child
-     *
-     */
-    abstract public function generate();
-
-    /**
-     * __toString() - casting to a string will in turn call generate()
-     *
-     * @return string
-     */
-    final public function __toString()
-    {
-        return $this->generate();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Exception.php b/airtime_mvc/library/Zend/CodeGenerator/Exception.php
deleted file mode 100644
index 7e9ad09d4..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Exception extends Zend_Exception
-{}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Abstract.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Abstract.php
deleted file mode 100644
index fabdb4937..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Abstract.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Abstract
- */
-require_once 'Zend/CodeGenerator/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstract
-{
-
-    /**
-     * Line feed to use in place of EOL
-     *
-     */
-    const LINE_FEED = "\n";
-
-    /**
-     * @var bool
-     */
-    protected $_isSourceDirty = true;
-
-    /**
-     * @var int|string
-     */
-    protected $_indentation = '    ';
-
-    /**
-     * setSourceDirty()
-     *
-     * @param bool $isSourceDirty
-     * @return Zend_CodeGenerator_Php_Abstract
-     */
-    public function setSourceDirty($isSourceDirty = true)
-    {
-        $this->_isSourceDirty = ($isSourceDirty) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isSourceDirty()
-     *
-     * @return bool
-     */
-    public function isSourceDirty()
-    {
-        return $this->_isSourceDirty;
-    }
-
-    /**
-     * setIndentation()
-     *
-     * @param string|int $indentation
-     * @return Zend_CodeGenerator_Php_Abstract
-     */
-    public function setIndentation($indentation)
-    {
-        $this->_indentation = $indentation;
-        return $this;
-    }
-
-    /**
-     * getIndentation()
-     *
-     * @return string|int
-     */
-    public function getIndentation()
-    {
-        return $this->_indentation;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Body.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Body.php
deleted file mode 100644
index 8526ba4e3..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Body.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Body.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Abstract
- */
-require_once 'Zend/CodeGenerator/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract
-{
-
-    /**
-     * @var string
-     */
-    protected $_content = null;
-
-    /**
-     * setContent()
-     *
-     * @param string $content
-     * @return Zend_CodeGenerator_Php_Body
-     */
-    public function setContent($content)
-    {
-        $this->_content = $content;
-        return $this;
-    }
-
-    /**
-     * getContent()
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return (string) $this->_content;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        return $this->getContent();
-    }
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Class.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Class.php
deleted file mode 100644
index 307a4b0c6..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Class.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Member_Container
- */
-require_once 'Zend/CodeGenerator/Php/Member/Container.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Method
- */
-require_once 'Zend/CodeGenerator/Php/Method.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Property
- */
-require_once 'Zend/CodeGenerator/Php/Property.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock
- */
-require_once 'Zend/CodeGenerator/Php/Docblock.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
-{
-
-    /**
-     * @var Zend_CodeGenerator_Php_Docblock
-     */
-    protected $_docblock = null;
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isAbstract = false;
-
-    /**
-     * @var string
-     */
-    protected $_extendedClass = null;
-
-    /**
-     * @var array Array of string names
-     */
-    protected $_implementedInterfaces = array();
-
-    /**
-     * @var array Array of properties
-     */
-    protected $_properties = null;
-
-    /**
-     * @var array Array of methods
-     */
-    protected $_methods = null;
-
-    /**
-     * fromReflection() - build a Code Generation PHP Object from a Class Reflection
-     *
-     * @param Zend_Reflection_Class $reflectionClass
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public static function fromReflection(Zend_Reflection_Class $reflectionClass)
-    {
-        $class = new self();
-
-        $class->setSourceContent($class->getSourceContent());
-        $class->setSourceDirty(false);
-
-        if ($reflectionClass->getDocComment() != '') {
-            $class->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionClass->getDocblock()));
-        }
-
-        $class->setAbstract($reflectionClass->isAbstract());
-        $class->setName($reflectionClass->getName());
-
-        if ($parentClass = $reflectionClass->getParentClass()) {
-            $class->setExtendedClass($parentClass->getName());
-            $interfaces = array_diff($reflectionClass->getInterfaces(), $parentClass->getInterfaces());
-        } else {
-            $interfaces = $reflectionClass->getInterfaces();
-        }
-
-        $interfaceNames = array();
-        foreach($interfaces AS $interface) {
-            $interfaceNames[] = $interface->getName();
-        }
-
-        $class->setImplementedInterfaces($interfaceNames);
-
-        $properties = array();
-        foreach ($reflectionClass->getProperties() as $reflectionProperty) {
-            if ($reflectionProperty->getDeclaringClass()->getName() == $class->getName()) {
-                $properties[] = Zend_CodeGenerator_Php_Property::fromReflection($reflectionProperty);
-            }
-        }
-        $class->setProperties($properties);
-
-        $methods = array();
-        foreach ($reflectionClass->getMethods() as $reflectionMethod) {
-            if ($reflectionMethod->getDeclaringClass()->getName() == $class->getName()) {
-                $methods[] = Zend_CodeGenerator_Php_Method::fromReflection($reflectionMethod);
-            }
-        }
-        $class->setMethods($methods);
-
-        return $class;
-    }
-
-    /**
-     * setDocblock() Set the docblock
-     *
-     * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setDocblock($docblock)
-    {
-        if (is_string($docblock)) {
-            $docblock = array('shortDescription' => $docblock);
-        }
-
-        if (is_array($docblock)) {
-            $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
-        } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
-        }
-
-        $this->_docblock = $docblock;
-        return $this;
-    }
-
-    /**
-     * getDocblock()
-     *
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function getDocblock()
-    {
-        return $this->_docblock;
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * setAbstract()
-     *
-     * @param bool $isAbstract
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setAbstract($isAbstract)
-    {
-        $this->_isAbstract = ($isAbstract) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isAbstract()
-     *
-     * @return bool
-     */
-    public function isAbstract()
-    {
-        return $this->_isAbstract;
-    }
-
-    /**
-     * setExtendedClass()
-     *
-     * @param string $extendedClass
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setExtendedClass($extendedClass)
-    {
-        $this->_extendedClass = $extendedClass;
-        return $this;
-    }
-
-    /**
-     * getExtendedClass()
-     *
-     * @return string
-     */
-    public function getExtendedClass()
-    {
-        return $this->_extendedClass;
-    }
-
-    /**
-     * setImplementedInterfaces()
-     *
-     * @param array $implementedInterfaces
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setImplementedInterfaces(Array $implementedInterfaces)
-    {
-        $this->_implementedInterfaces = $implementedInterfaces;
-        return $this;
-    }
-
-    /**
-     * getImplementedInterfaces
-     *
-     * @return array
-     */
-    public function getImplementedInterfaces()
-    {
-        return $this->_implementedInterfaces;
-    }
-
-    /**
-     * setProperties()
-     *
-     * @param array $properties
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setProperties(Array $properties)
-    {
-        foreach ($properties as $property) {
-            $this->setProperty($property);
-        }
-
-        return $this;
-    }
-
-    /**
-     * setProperty()
-     *
-     * @param array|Zend_CodeGenerator_Php_Property $property
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setProperty($property)
-    {
-        if (is_array($property)) {
-            $property = new Zend_CodeGenerator_Php_Property($property);
-            $propertyName = $property->getName();
-        } elseif ($property instanceof Zend_CodeGenerator_Php_Property) {
-            $propertyName = $property->getName();
-        } else {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property');
-        }
-
-        if (isset($this->_properties[$propertyName])) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.');
-        }
-
-        $this->_properties[$propertyName] = $property;
-        return $this;
-    }
-
-    /**
-     * getProperties()
-     *
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->_properties;
-    }
-
-    /**
-     * getProperty()
-     *
-     * @param string $propertyName
-     * @return Zend_CodeGenerator_Php_Property
-     */
-    public function getProperty($propertyName)
-    {
-        foreach ($this->_properties as $property) {
-            if ($property->getName() == $propertyName) {
-                return $property;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * hasProperty()
-     *
-     * @param string $propertyName
-     * @return bool
-     */
-    public function hasProperty($propertyName)
-    {
-        return isset($this->_properties[$propertyName]);
-    }
-
-    /**
-     * setMethods()
-     *
-     * @param array $methods
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setMethods(Array $methods)
-    {
-        foreach ($methods as $method) {
-            $this->setMethod($method);
-        }
-        return $this;
-    }
-
-    /**
-     * setMethod()
-     *
-     * @param array|Zend_CodeGenerator_Php_Method $method
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function setMethod($method)
-    {
-        if (is_array($method)) {
-            $method = new Zend_CodeGenerator_Php_Method($method);
-            $methodName = $method->getName();
-        } elseif ($method instanceof Zend_CodeGenerator_Php_Method) {
-            $methodName = $method->getName();
-        } else {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setMethod() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Method');
-        }
-
-        if (isset($this->_methods[$methodName])) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('A method by name ' . $methodName . ' already exists in this class.');
-        }
-
-        $this->_methods[$methodName] = $method;
-        return $this;
-    }
-
-    /**
-     * getMethods()
-     *
-     * @return array
-     */
-    public function getMethods()
-    {
-        return $this->_methods;
-    }
-
-    /**
-     * getMethod()
-     *
-     * @param string $methodName
-     * @return Zend_CodeGenerator_Php_Method
-     */
-    public function getMethod($methodName)
-    {
-        foreach ($this->_methods as $method) {
-            if ($method->getName() == $methodName) {
-                return $method;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * hasMethod()
-     *
-     * @param string $methodName
-     * @return bool
-     */
-    public function hasMethod($methodName)
-    {
-        return isset($this->_methods[$methodName]);
-    }
-
-    /**
-     * isSourceDirty()
-     *
-     * @return bool
-     */
-    public function isSourceDirty()
-    {
-        if (($docblock = $this->getDocblock()) && $docblock->isSourceDirty()) {
-            return true;
-        }
-
-        foreach ($this->_properties as $property) {
-            if ($property->isSourceDirty()) {
-                return true;
-            }
-        }
-
-        foreach ($this->_methods as $method) {
-            if ($method->isSourceDirty()) {
-                return true;
-            }
-        }
-
-        return parent::isSourceDirty();
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        if (!$this->isSourceDirty()) {
-            return $this->getSourceContent();
-        }
-
-        $output = '';
-
-        if (null !== ($docblock = $this->getDocblock())) {
-            $docblock->setIndentation('');
-            $output .= $docblock->generate();
-        }
-
-        if ($this->isAbstract()) {
-            $output .= 'abstract ';
-        }
-
-        $output .= 'class ' . $this->getName();
-
-        if (null !== ($ec = $this->_extendedClass)) {
-            $output .= ' extends ' . $ec;
-        }
-
-        $implemented = $this->getImplementedInterfaces();
-        if (!empty($implemented)) {
-            $output .= ' implements ' . implode(', ', $implemented);
-        }
-
-        $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED;
-
-        $properties = $this->getProperties();
-        if (!empty($properties)) {
-            foreach ($properties as $property) {
-                $output .= $property->generate() . self::LINE_FEED . self::LINE_FEED;
-            }
-        }
-
-        $methods = $this->getMethods();
-        if (!empty($methods)) {
-            foreach ($methods as $method) {
-                $output .= $method->generate() . self::LINE_FEED;
-            }
-        }
-
-        $output .= self::LINE_FEED . '}' . self::LINE_FEED;
-
-        return $output;
-    }
-
-    /**
-     * _init() - is called at construction time
-     *
-     */
-    protected function _init()
-    {
-        $this->_properties = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY);
-        $this->_methods = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_METHOD);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock.php
deleted file mode 100644
index 8dec8fa13..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract
-{
-    /**
-     * @var string
-     */
-    protected $_shortDescription = null;
-
-    /**
-     * @var string
-     */
-    protected $_longDescription = null;
-
-    /**
-     * @var array
-     */
-    protected $_tags = array();
-
-    /**
-     * @var string
-     */
-    protected $_indentation = '';
-
-    /**
-     * fromReflection() - Build a docblock generator object from a reflection object
-     *
-     * @param Zend_Reflection_Docblock $reflectionDocblock
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public static function fromReflection(Zend_Reflection_Docblock $reflectionDocblock)
-    {
-        $docblock = new self();
-
-        $docblock->setSourceContent($reflectionDocblock->getContents());
-        $docblock->setSourceDirty(false);
-
-        $docblock->setShortDescription($reflectionDocblock->getShortDescription());
-        $docblock->setLongDescription($reflectionDocblock->getLongDescription());
-
-        foreach ($reflectionDocblock->getTags() as $tag) {
-            $docblock->setTag(Zend_CodeGenerator_Php_Docblock_Tag::fromReflection($tag));
-        }
-
-        return $docblock;
-    }
-
-    /**
-     * setShortDescription()
-     *
-     * @param string $shortDescription
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function setShortDescription($shortDescription)
-    {
-        $this->_shortDescription = $shortDescription;
-        return $this;
-    }
-
-    /**
-     * getShortDescription()
-     *
-     * @return string
-     */
-    public function getShortDescription()
-    {
-        return $this->_shortDescription;
-    }
-
-    /**
-     * setLongDescription()
-     *
-     * @param string $longDescription
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function setLongDescription($longDescription)
-    {
-        $this->_longDescription = $longDescription;
-        return $this;
-    }
-
-    /**
-     * getLongDescription()
-     *
-     * @return string
-     */
-    public function getLongDescription()
-    {
-        return $this->_longDescription;
-    }
-
-    /**
-     * setTags()
-     *
-     * @param array $tags
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function setTags(Array $tags)
-    {
-        foreach ($tags as $tag) {
-            $this->setTag($tag);
-        }
-
-        return $this;
-    }
-
-    /**
-     * setTag()
-     *
-     * @param array|Zend_CodeGenerator_Php_Docblock_Tag $tag
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function setTag($tag)
-    {
-        if (is_array($tag)) {
-            $tag = new Zend_CodeGenerator_Php_Docblock_Tag($tag);
-        } elseif (!$tag instanceof Zend_CodeGenerator_Php_Docblock_Tag) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception(
-                'setTag() expects either an array of method options or an '
-                . 'instance of Zend_CodeGenerator_Php_Docblock_Tag'
-                );
-        }
-
-        $this->_tags[] = $tag;
-        return $this;
-    }
-
-    /**
-     * getTags
-     *
-     * @return array Array of Zend_CodeGenerator_Php_Docblock_Tag
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        if (!$this->isSourceDirty()) {
-            return $this->_docCommentize($this->getSourceContent());
-        }
-
-        $output  = '';
-        if (null !== ($sd = $this->getShortDescription())) {
-            $output .= $sd . self::LINE_FEED . self::LINE_FEED;
-        }
-        if (null !== ($ld = $this->getLongDescription())) {
-            $output .= $ld . self::LINE_FEED . self::LINE_FEED;
-        }
-
-        foreach ($this->getTags() as $tag) {
-            $output .= $tag->generate() . self::LINE_FEED;
-        }
-
-        return $this->_docCommentize(trim($output));
-    }
-
-    /**
-     * _docCommentize()
-     *
-     * @param string $content
-     * @return string
-     */
-    protected function _docCommentize($content)
-    {
-        $indent = $this->getIndentation();
-        $output = $indent . '/**' . self::LINE_FEED;
-        $content = wordwrap($content, 80, self::LINE_FEED);
-        $lines = explode(self::LINE_FEED, $content);
-        foreach ($lines as $line) {
-            $output .= $indent . ' * ' . $line . self::LINE_FEED;
-        }
-        $output .= $indent . ' */' . self::LINE_FEED;
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag.php
deleted file mode 100644
index eaf430e48..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag_Param
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Param.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag_Return
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag/Return.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstract
-{
-
-    /**
-     * @var Zend_Loader_PluginLoader
-     */
-    protected static $_pluginLoader = null;
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Docblock_Tag $reflectionTag
-     * @return Zend_CodeGenerator_Php_Docblock_Tag
-     */
-    public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTag)
-    {
-        $tagName = $reflectionTag->getName();
-
-        $codeGenDocblockTag = self::factory($tagName);
-
-        // transport any properties via accessors and mutators from reflection to codegen object
-        $reflectionClass = new ReflectionClass($reflectionTag);
-        foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            if (substr($method->getName(), 0, 3) == 'get') {
-                $propertyName = substr($method->getName(), 3);
-                if (method_exists($codeGenDocblockTag, 'set' . $propertyName)) {
-                    $codeGenDocblockTag->{'set' . $propertyName}($reflectionTag->{'get' . $propertyName}());
-                }
-            }
-        }
-
-        return $codeGenDocblockTag;
-    }
-
-    /**
-     * setPluginLoader()
-     *
-     * @param Zend_Loader_PluginLoader $pluginLoader
-     */
-    public static function setPluginLoader(Zend_Loader_PluginLoader $pluginLoader)
-    {
-        self::$_pluginLoader = $pluginLoader;
-        return;
-    }
-
-    /**
-     * getPluginLoader()
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getPluginLoader()
-    {
-        if (self::$_pluginLoader == null) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            self::setPluginLoader(new Zend_Loader_PluginLoader(array(
-                'Zend_CodeGenerator_Php_Docblock_Tag' => dirname(__FILE__) . '/Tag/'))
-                );
-        }
-
-        return self::$_pluginLoader;
-    }
-
-    public static function factory($tagName)
-    {
-        $pluginLoader = self::getPluginLoader();
-
-        try {
-            $tagClass = $pluginLoader->load($tagName);
-        } catch (Zend_Loader_Exception $exception) {
-            $tagClass = 'Zend_CodeGenerator_Php_Docblock_Tag';
-        }
-
-        $tag = new $tagClass(array('name' => $tagName));
-        return $tag;
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_CodeGenerator_Php_Docblock_Tag
-     */
-    public function setName($name)
-    {
-        $this->_name = ltrim($name, '@');
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * setDescription()
-     *
-     * @param string $description
-     * @return Zend_CodeGenerator_Php_Docblock_Tag
-     */
-    public function setDescription($description)
-    {
-        $this->_description = $description;
-        return $this;
-    }
-
-    /**
-     * getDescription()
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        return '@' . $this->_name . ' ' . $this->_description;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php
deleted file mode 100644
index dc76cbd78..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: License.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag
-{
-
-    /**
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Docblock_Tag $reflectionTagReturn
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_License
-     */
-    public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagLicense)
-    {
-        $returnTag = new self();
-
-        $returnTag->setName('license');
-        $returnTag->setUrl($reflectionTagLicense->getUrl());
-        $returnTag->setDescription($reflectionTagLicense->getDescription());
-
-        return $returnTag;
-    }
-
-    /**
-     * setUrl()
-     *
-     * @param string $url
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_License
-     */
-    public function setUrl($url)
-    {
-        $this->_url = $url;
-        return $this;
-    }
-
-    /**
-     * getUrl()
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $output = '@license ' . $this->_url . ' ' . $this->_description . self::LINE_FEED;
-        return $output;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php
deleted file mode 100644
index 4d14be5e9..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_Docblock_Tag
-{
-
-    /**
-     * @var string
-     */
-    protected $_datatype = null;
-
-    /**
-     * @var string
-     */
-    protected $_paramName = null;
-
-    /**
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Docblock_Tag $reflectionTagParam
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_Param
-     */
-    public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagParam)
-    {
-        $paramTag = new self();
-
-        $paramTag->setName('param');
-        $paramTag->setDatatype($reflectionTagParam->getType()); // @todo rename
-        $paramTag->setParamName($reflectionTagParam->getVariableName());
-        $paramTag->setDescription($reflectionTagParam->getDescription());
-
-        return $paramTag;
-    }
-
-    /**
-     * setDatatype()
-     *
-     * @param string $datatype
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_Param
-     */
-    public function setDatatype($datatype)
-    {
-        $this->_datatype = $datatype;
-        return $this;
-    }
-
-    /**
-     * getDatatype
-     *
-     * @return string
-     */
-    public function getDatatype()
-    {
-        return $this->_datatype;
-    }
-
-    /**
-     * setParamName()
-     *
-     * @param string $paramName
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_Param
-     */
-    public function setParamName($paramName)
-    {
-        $this->_paramName = $paramName;
-        return $this;
-    }
-
-    /**
-     * getParamName()
-     *
-     * @return string
-     */
-    public function getParamName()
-    {
-        return $this->_paramName;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $output = '@param '
-            . (($this->_datatype  != null) ? $this->_datatype : 'unknown')
-            . (($this->_paramName != null) ? ' $' . $this->_paramName : '')
-            . (($this->_description != null) ? ' ' . $this->_description : '');
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
deleted file mode 100644
index b0acb60a8..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock_Tag
- */
-require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag
-{
-
-    /**
-     * @var string
-     */
-    protected $_datatype = null;
-
-    /**
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Docblock_Tag $reflectionTagReturn
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_Return
-     */
-    public static function fromReflection(Zend_Reflection_Docblock_Tag $reflectionTagReturn)
-    {
-        $returnTag = new self();
-
-        $returnTag->setName('return');
-        $returnTag->setDatatype($reflectionTagReturn->getType()); // @todo rename
-        $returnTag->setDescription($reflectionTagReturn->getDescription());
-
-        return $returnTag;
-    }
-
-    /**
-     * setDatatype()
-     *
-     * @param string $datatype
-     * @return Zend_CodeGenerator_Php_Docblock_Tag_Return
-     */
-    public function setDatatype($datatype)
-    {
-        $this->_datatype = $datatype;
-        return $this;
-    }
-
-    /**
-     * getDatatype()
-     *
-     * @return string
-     */
-    public function getDatatype()
-    {
-        return $this->_datatype;
-    }
-
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $output = '@return ' . $this->_datatype . ' ' . $this->_description;
-        return $output;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Exception.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Exception.php
deleted file mode 100644
index 70622d2d8..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Exception
- */
-require_once 'Zend/CodeGenerator/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Exception extends Zend_CodeGenerator_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/File.php b/airtime_mvc/library/Zend/CodeGenerator/Php/File.php
deleted file mode 100644
index 8e90c65ab..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/File.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Class
- */
-require_once 'Zend/CodeGenerator/Php/Class.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract
-{
-
-    /**
-     * @var array Array of Zend_CodeGenerator_Php_File
-     */
-    protected static $_fileCodeGenerators = array();
-
-    /**#@+
-     * @var string
-     */
-    protected static $_markerDocblock = '/* Zend_CodeGenerator_Php_File-DocblockMarker */';
-    protected static $_markerRequire = '/* Zend_CodeGenerator_Php_File-RequireMarker: {?} */';
-    protected static $_markerClass = '/* Zend_CodeGenerator_Php_File-ClassMarker: {?} */';
-    /**#@-*/
-
-    /**
-     * @var string
-     */
-    protected $_filename = null;
-
-    /**
-     * @var Zend_CodeGenerator_Php_Docblock
-     */
-    protected $_docblock = null;
-
-    /**
-     * @var array
-     */
-    protected $_requiredFiles = array();
-
-    /**
-     * @var array
-     */
-    protected $_classes = array();
-
-    /**
-     * @var string
-     */
-    protected $_body = null;
-
-    public static function registerFileCodeGenerator(Zend_CodeGenerator_Php_File $fileCodeGenerator, $fileName = null)
-    {
-        if ($fileName == null) {
-            $fileName = $fileCodeGenerator->getFilename();
-        }
-
-        if ($fileName == '') {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('FileName does not exist.');
-        }
-
-        // cannot use realpath since the file might not exist, but we do need to have the index
-        // in the same DIRECTORY_SEPARATOR that realpath would use:
-        $fileName = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $fileName);
-
-        self::$_fileCodeGenerators[$fileName] = $fileCodeGenerator;
-
-    }
-
-    /**
-     * fromReflectedFilePath() - use this if you intend on generating code generation objects based on the same file.
-     * This will keep previous changes to the file in tact during the same PHP process
-     *
-     * @param string $filePath
-     * @param bool $usePreviousCodeGeneratorIfItExists
-     * @param bool $includeIfNotAlreadyIncluded
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public static function fromReflectedFileName($filePath, $usePreviousCodeGeneratorIfItExists = true, $includeIfNotAlreadyIncluded = true)
-    {
-        $realpath = realpath($filePath);
-
-        if ($realpath === false) {
-            if ( ($realpath = Zend_Reflection_file::findRealpathInIncludePath($filePath)) === false) {
-                require_once 'Zend/CodeGenerator/Php/Exception.php';
-                throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.');
-            }
-        }
-
-        if ($usePreviousCodeGeneratorIfItExists && isset(self::$_fileCodeGenerators[$realpath])) {
-            return self::$_fileCodeGenerators[$realpath];
-        }
-
-        if ($includeIfNotAlreadyIncluded && !in_array($realpath, get_included_files())) {
-            include $realpath;
-        }
-
-        $codeGenerator = self::fromReflection(($fileReflector = new Zend_Reflection_File($realpath)));
-
-        if (!isset(self::$_fileCodeGenerators[$fileReflector->getFileName()])) {
-            self::$_fileCodeGenerators[$fileReflector->getFileName()] = $codeGenerator;
-        }
-
-        return $codeGenerator;
-    }
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_File $reflectionFile
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public static function fromReflection(Zend_Reflection_File $reflectionFile)
-    {
-        $file = new self();
-
-        $file->setSourceContent($reflectionFile->getContents());
-        $file->setSourceDirty(false);
-
-        $body = $reflectionFile->getContents();
-
-        // @todo this whole area needs to be reworked with respect to how body lines are processed
-        foreach ($reflectionFile->getClasses() as $class) {
-            $file->setClass(Zend_CodeGenerator_Php_Class::fromReflection($class));
-            $classStartLine = $class->getStartLine(true);
-            $classEndLine = $class->getEndLine();
-
-            $bodyLines = explode("\n", $body);
-            $bodyReturn = array();
-            for ($lineNum = 1; $lineNum <= count($bodyLines); $lineNum++) {
-                if ($lineNum == $classStartLine) {
-                    $bodyReturn[] = str_replace('?', $class->getName(), self::$_markerClass);  //'/* Zend_CodeGenerator_Php_File-ClassMarker: {' . $class->getName() . '} */';
-                    $lineNum = $classEndLine;
-                } else {
-                    $bodyReturn[] = $bodyLines[$lineNum - 1]; // adjust for index -> line conversion
-                }
-            }
-            $body = implode("\n", $bodyReturn);
-            unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
-        }
-
-        if (($reflectionFile->getDocComment() != '')) {
-            $docblock = $reflectionFile->getDocblock();
-            $file->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($docblock));
-
-            $bodyLines = explode("\n", $body);
-            $bodyReturn = array();
-            for ($lineNum = 1; $lineNum <= count($bodyLines); $lineNum++) {
-                if ($lineNum == $docblock->getStartLine()) {
-                    $bodyReturn[] = str_replace('?', $class->getName(), self::$_markerDocblock);  //'/* Zend_CodeGenerator_Php_File-ClassMarker: {' . $class->getName() . '} */';
-                    $lineNum = $docblock->getEndLine();
-                } else {
-                    $bodyReturn[] = $bodyLines[$lineNum - 1]; // adjust for index -> line conversion
-                }
-            }
-            $body = implode("\n", $bodyReturn);
-            unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
-        }
-
-        $file->setBody($body);
-
-        return $file;
-    }
-
-    /**
-     * setDocblock() Set the docblock
-     *
-     * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setDocblock($docblock)
-    {
-        if (is_string($docblock)) {
-            $docblock = array('shortDescription' => $docblock);
-        }
-
-        if (is_array($docblock)) {
-            $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
-        } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
-        }
-
-        $this->_docblock = $docblock;
-        return $this;
-    }
-
-    /**
-     * Get docblock
-     *
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function getDocblock()
-    {
-        return $this->_docblock;
-    }
-
-    /**
-     * setRequiredFiles
-     *
-     * @param array $requiredFiles
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setRequiredFiles($requiredFiles)
-    {
-        $this->_requiredFiles = $requiredFiles;
-        return $this;
-    }
-
-    /**
-     * getRequiredFiles()
-     *
-     * @return array
-     */
-    public function getRequiredFiles()
-    {
-        return $this->_requiredFiles;
-    }
-
-    /**
-     * setClasses()
-     *
-     * @param array $classes
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setClasses(Array $classes)
-    {
-        foreach ($classes as $class) {
-            $this->setClass($class);
-        }
-        return $this;
-    }
-
-    /**
-     * getClass()
-     *
-     * @param string $name
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function getClass($name = null)
-    {
-        if ($name == null) {
-            reset($this->_classes);
-            return current($this->_classes);
-        }
-
-        return $this->_classes[$name];
-    }
-
-    /**
-     * setClass()
-     *
-     * @param Zend_CodeGenerator_Php_Class|array $class
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setClass($class)
-    {
-        if (is_array($class)) {
-            $class = new Zend_CodeGenerator_Php_Class($class);
-            $className = $class->getName();
-        } elseif ($class instanceof Zend_CodeGenerator_Php_Class) {
-            $className = $class->getName();
-        } else {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('Expecting either an array or an instance of Zend_CodeGenerator_Php_Class');
-        }
-
-        // @todo check for dup here
-
-        $this->_classes[$className] = $class;
-        return $this;
-    }
-
-    /**
-     * setFilename()
-     *
-     * @param string $filename
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setFilename($filename)
-    {
-        $this->_filename = $filename;
-        return $this;
-    }
-
-    /**
-     * getFilename()
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
-
-    /**
-     * getClasses()
-     *
-     * @return array Array of Zend_CodeGenerator_Php_Class
-     */
-    public function getClasses()
-    {
-        return $this->_classes;
-    }
-
-    /**
-     * setBody()
-     *
-     * @param string $body
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setBody($body)
-    {
-        $this->_body = $body;
-        return $this;
-    }
-
-    /**
-     * getBody()
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->_body;
-    }
-
-    /**
-     * isSourceDirty()
-     *
-     * @return bool
-     */
-    public function isSourceDirty()
-    {
-        if (($docblock = $this->getDocblock()) && $docblock->isSourceDirty()) {
-            return true;
-        }
-
-        foreach ($this->_classes as $class) {
-            if ($class->isSourceDirty()) {
-                return true;
-            }
-        }
-
-        return parent::isSourceDirty();
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        if ($this->isSourceDirty() === false) {
-            return $this->_sourceContent;
-        }
-
-        $output = '';
-
-        // start with the body (if there), or open tag
-        if (preg_match('#(?:\s*)<\?php#', $this->getBody()) == false) {
-            $output = '<?php' . self::LINE_FEED;
-        }
-
-        // if there are markers, put the body into the output
-        $body = $this->getBody();
-        if (preg_match('#/\* Zend_CodeGenerator_Php_File-(.*?)Marker:#', $body)) {
-            $output .= $body;
-            $body    = '';
-        }
-
-        // Add file docblock, if any
-        if (null !== ($docblock = $this->getDocblock())) {
-            $docblock->setIndentation('');
-            $regex = preg_quote(self::$_markerDocblock, '#');
-            if (preg_match('#'.$regex.'#', $output)) {
-                $output  = preg_replace('#'.$regex.'#', $docblock->generate(), $output, 1);
-            } else {
-                $output .= $docblock->generate() . self::LINE_FEED;
-            }
-        }
-
-        // newline
-        $output .= self::LINE_FEED;
-
-        // process required files
-        // @todo marker replacement for required files
-        $requiredFiles = $this->getRequiredFiles();
-        if (!empty($requiredFiles)) {
-            foreach ($requiredFiles as $requiredFile) {
-                $output .= 'require_once \'' . $requiredFile . '\';' . self::LINE_FEED;
-            }
-
-            $output .= self::LINE_FEED;
-        }
-
-        // process classes
-        $classes = $this->getClasses();
-        if (!empty($classes)) {
-            foreach ($classes as $class) {
-                $regex = str_replace('?', $class->getName(), self::$_markerClass);
-                $regex = preg_quote($regex, '#');
-                if (preg_match('#'.$regex.'#', $output)) {
-                    $output = preg_replace('#'.$regex.'#', $class->generate(), $output, 1);
-                } else {
-                    $output .= $class->generate() . self::LINE_FEED;
-                }
-            }
-
-        }
-
-        if (!empty($body)) {
-
-            // add an extra space betwee clsses and
-            if (!empty($classes)) {
-                $output .= self::LINE_FEED;
-            }
-
-            $output .= $body;
-        }
-
-        return $output;
-    }
-
-    public function write()
-    {
-        if ($this->_filename == '' || !is_writable(dirname($this->_filename))) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('This code generator object is not writable.');
-        }
-        file_put_contents($this->_filename, $this->generate());
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Abstract.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Abstract.php
deleted file mode 100644
index 2df8fd18f..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Abstract.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Docblock.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator_Php_Abstract
-{
-
-    /**#@+
-     * @param const string
-     */
-    const VISIBILITY_PUBLIC    = 'public';
-    const VISIBILITY_PROTECTED = 'protected';
-    const VISIBILITY_PRIVATE   = 'private';
-    /**#@-*/
-
-    /**
-     * @var Zend_CodeGenerator_Php_Docblock
-     */
-    protected $_docblock   = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isAbstract = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isFinal    = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isStatic   = false;
-
-    /**
-     * @var const
-     */
-    protected $_visibility = self::VISIBILITY_PUBLIC;
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * setDocblock() Set the docblock
-     *
-     * @param Zend_CodeGenerator_Php_Docblock|array|string $docblock
-     * @return Zend_CodeGenerator_Php_File
-     */
-    public function setDocblock($docblock)
-    {
-        if (is_string($docblock)) {
-            $docblock = array('shortDescription' => $docblock);
-        }
-
-        if (is_array($docblock)) {
-            $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
-        } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
-        }
-
-        $this->_docblock = $docblock;
-        return $this;
-    }
-
-    /**
-     * getDocblock()
-     *
-     * @return Zend_CodeGenerator_Php_Docblock
-     */
-    public function getDocblock()
-    {
-        return $this->_docblock;
-    }
-
-    /**
-     * setAbstract()
-     *
-     * @param bool $isAbstract
-     * @return Zend_CodeGenerator_Php_Member_Abstract
-     */
-    public function setAbstract($isAbstract)
-    {
-        $this->_isAbstract = ($isAbstract) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isAbstract()
-     *
-     * @return bool
-     */
-    public function isAbstract()
-    {
-        return $this->_isAbstract;
-    }
-
-    /**
-     * setFinal()
-     *
-     * @param bool $isFinal
-     * @return Zend_CodeGenerator_Php_Member_Abstract
-     */
-    public function setFinal($isFinal)
-    {
-        $this->_isFinal = ($isFinal) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isFinal()
-     *
-     * @return bool
-     */
-    public function isFinal()
-    {
-        return $this->_isFinal;
-    }
-
-    /**
-     * setStatic()
-     *
-     * @param bool $isStatic
-     * @return Zend_CodeGenerator_Php_Member_Abstract
-     */
-    public function setStatic($isStatic)
-    {
-        $this->_isStatic = ($isStatic) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isStatic()
-     *
-     * @return bool
-     */
-    public function isStatic()
-    {
-        return $this->_isStatic;
-    }
-
-    /**
-     * setVisitibility()
-     *
-     * @param const $visibility
-     * @return Zend_CodeGenerator_Php_Member_Abstract
-     */
-    public function setVisibility($visibility)
-    {
-        $this->_visibility = $visibility;
-        return $this;
-    }
-
-    /**
-     * getVisibility()
-     *
-     * @return const
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_CodeGenerator_Php_Member_Abstract
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Container.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Container.php
deleted file mode 100644
index e0e613291..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Member/Container.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Member_Container extends ArrayObject
-{
-
-    /**#@+
-     * @param const string
-     */
-    const TYPE_PROPERTY = 'property';
-    const TYPE_METHOD   = 'method';
-    /**#@-*/
-
-    /**
-     * @var const|string
-     */
-    protected $_type = self::TYPE_PROPERTY;
-
-    /**
-     * __construct()
-     *
-     * @param const|string $type
-     */
-    public function __construct($type = self::TYPE_PROPERTY)
-    {
-        $this->_type = $type;
-        parent::__construct(array(), self::ARRAY_AS_PROPS);
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Method.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Method.php
deleted file mode 100644
index f02b3ef21..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Method.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Member_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Member/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Docblock
- */
-require_once 'Zend/CodeGenerator/Php/Docblock.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Parameter
- */
-require_once 'Zend/CodeGenerator/Php/Parameter.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract
-{
-    /**
-     * @var Zend_CodeGenerator_Php_Docblock
-     */
-    protected $_docblock = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isFinal = false;
-
-    /**
-     * @var array
-     */
-    protected $_parameters = array();
-
-    /**
-     * @var string
-     */
-    protected $_body = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Method $reflectionMethod
-     * @return Zend_CodeGenerator_Php_Method
-     */
-    public static function fromReflection(Zend_Reflection_Method $reflectionMethod)
-    {
-        $method = new self();
-
-        $method->setSourceContent($reflectionMethod->getContents(false));
-        $method->setSourceDirty(false);
-
-        if ($reflectionMethod->getDocComment() != '') {
-            $method->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionMethod->getDocblock()));
-        }
-
-        $method->setFinal($reflectionMethod->isFinal());
-
-        if ($reflectionMethod->isPrivate()) {
-            $method->setVisibility(self::VISIBILITY_PRIVATE);
-        } elseif ($reflectionMethod->isProtected()) {
-            $method->setVisibility(self::VISIBILITY_PROTECTED);
-        } else {
-            $method->setVisibility(self::VISIBILITY_PUBLIC);
-        }
-
-        $method->setStatic($reflectionMethod->isStatic());
-
-        $method->setName($reflectionMethod->getName());
-
-        foreach ($reflectionMethod->getParameters() as $reflectionParameter) {
-            $method->setParameter(Zend_CodeGenerator_Php_Parameter::fromReflection($reflectionParameter));
-        }
-
-        $method->setBody($reflectionMethod->getBody());
-
-        return $method;
-    }
-
-    /**
-     * setFinal()
-     *
-     * @param bool $isFinal
-     */
-    public function setFinal($isFinal)
-    {
-        $this->_isFinal = ($isFinal) ? true : false;
-    }
-
-    /**
-     * setParameters()
-     *
-     * @param array $parameters
-     * @return Zend_CodeGenerator_Php_Method
-     */
-    public function setParameters(Array $parameters)
-    {
-        foreach ($parameters as $parameter) {
-            $this->setParameter($parameter);
-        }
-        return $this;
-    }
-
-    /**
-     * setParameter()
-     *
-     * @param Zend_CodeGenerator_Php_Parameter|array $parameter
-     * @return Zend_CodeGenerator_Php_Method
-     */
-    public function setParameter($parameter)
-    {
-        if (is_array($parameter)) {
-            $parameter = new Zend_CodeGenerator_Php_Parameter($parameter);
-            $parameterName = $parameter->getName();
-        } elseif ($parameter instanceof Zend_CodeGenerator_Php_Parameter) {
-            $parameterName = $parameter->getName();
-        } else {
-            require_once 'Zend/CodeGenerator/Php/Exception.php';
-            throw new Zend_CodeGenerator_Php_Exception('setParameter() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Parameter');
-        }
-
-        $this->_parameters[$parameterName] = $parameter;
-        return $this;
-    }
-
-    /**
-     * getParameters()
-     *
-     * @return array Array of Zend_CodeGenerator_Php_Parameter
-     */
-    public function getParameters()
-    {
-        return $this->_parameters;
-    }
-
-    /**
-     * setBody()
-     *
-     * @param string $body
-     * @return Zend_CodeGenerator_Php_Method
-     */
-    public function setBody($body)
-    {
-        $this->_body = $body;
-        return $this;
-    }
-
-    /**
-     * getBody()
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->_body;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $output = '';
-
-        $indent = $this->getIndentation();
-
-        if (($docblock = $this->getDocblock()) !== null) {
-            $docblock->setIndentation($indent);
-            $output .= $docblock->generate();
-        }
-
-        $output .= $indent;
-
-        if ($this->isAbstract()) {
-            $output .= 'abstract ';
-        } else {
-            $output .= (($this->isFinal()) ? 'final ' : '');
-        }
-
-        $output .= $this->getVisibility()
-            . (($this->isStatic()) ? ' static' : '')
-            . ' function ' . $this->getName() . '(';
-
-        $parameters = $this->getParameters();
-        if (!empty($parameters)) {
-            foreach ($parameters as $parameter) {
-                $parameterOuput[] = $parameter->generate();
-            }
-
-            $output .= implode(', ', $parameterOuput);
-        }
-
-        $output .= ')' . self::LINE_FEED . $indent . '{' . self::LINE_FEED;
-
-        if ($this->_body) {
-            $output .= '        '
-                    .  str_replace(self::LINE_FEED, self::LINE_FEED . $indent . $indent, trim($this->_body))
-                    .  self::LINE_FEED;
-        }
-
-        $output .= $indent . '}' . self::LINE_FEED;
-
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter.php
deleted file mode 100644
index 321ab2495..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_ParameterDefaultValue
- */
-require_once 'Zend/CodeGenerator/Php/Parameter/DefaultValue.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract
-{
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var string
-     */
-    protected $_defaultValue = null;
-
-    /**
-     * @var int
-     */
-    protected $_position = null;
-
-    /**
-     * @var bool
-     */
-    protected $_passedByReference = false;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Parameter $reflectionParameter
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public static function fromReflection(Zend_Reflection_Parameter $reflectionParameter)
-    {
-        $param = new Zend_CodeGenerator_Php_Parameter();
-        $param->setName($reflectionParameter->getName());
-
-        if($reflectionParameter->isArray()) {
-            $param->setType('array');
-        } else {
-            $typeClass = $reflectionParameter->getClass();
-            if($typeClass !== null) {
-                $param->setType($typeClass->getName());
-            }
-        }
-
-        $param->setPosition($reflectionParameter->getPosition());
-
-        if($reflectionParameter->isOptional()) {
-            $param->setDefaultValue($reflectionParameter->getDefaultValue());
-        }
-        $param->setPassedByReference($reflectionParameter->isPassedByReference());
-
-        return $param;
-    }
-
-    /**
-     * setType()
-     *
-     * @param string $type
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * getType()
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set the default value of the parameter.
-     *
-     * Certain variables are difficult to expres
-     *
-     * @param null|bool|string|int|float|Zend_CodeGenerator_Php_Parameter_DefaultValue $defaultValue
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public function setDefaultValue($defaultValue)
-    {
-        if($defaultValue === null) {
-            $this->_defaultValue = new Zend_CodeGenerator_Php_Parameter_DefaultValue("null");
-        } else if(is_array($defaultValue)) {
-            $defaultValue = str_replace(array("\r", "\n"), "", var_export($defaultValue, true));
-            $this->_defaultValue = new Zend_CodeGenerator_Php_Parameter_DefaultValue($defaultValue);
-        } else if(is_bool($defaultValue)) {
-            if($defaultValue == true) {
-                $this->_defaultValue = new Zend_CodeGenerator_Php_Parameter_DefaultValue("true");
-            } else {
-                $this->_defaultValue = new Zend_CodeGenerator_Php_Parameter_DefaultValue("false");
-            }
-        } else {
-            $this->_defaultValue = $defaultValue;
-        }
-        return $this;
-    }
-
-    /**
-     * getDefaultValue()
-     *
-     * @return string
-     */
-    public function getDefaultValue()
-    {
-        return $this->_defaultValue;
-    }
-
-    /**
-     * setPosition()
-     *
-     * @param int $position
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public function setPosition($position)
-    {
-        $this->_position = $position;
-        return $this;
-    }
-
-    /**
-     * getPosition()
-     *
-     * @return int
-     */
-    public function getPosition()
-    {
-        return $this->_position;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getPassedByReference()
-    {
-        return $this->_passedByReference;
-    }
-
-    /**
-     * @param bool $passedByReference
-     * @return Zend_CodeGenerator_Php_Parameter
-     */
-    public function setPassedByReference($passedByReference)
-    {
-        $this->_passedByReference = $passedByReference;
-        return $this;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $output = '';
-
-        if ($this->_type) {
-            $output .= $this->_type . ' ';
-        }
-
-        if($this->_passedByReference === true) {
-            $output .= '&';
-        }
-
-        $output .= '$' . $this->_name;
-
-        if ($this->_defaultValue !== null) {
-            $output .= ' = ';
-            if (is_string($this->_defaultValue)) {
-                $output .= '\'' . $this->_defaultValue . '\'';
-            } else if($this->_defaultValue instanceof Zend_CodeGenerator_Php_ParameterDefaultValue) {
-                $output .= (string)$this->_defaultValue;
-            } else {
-                $output .= $this->_defaultValue;
-            }
-        }
-
-        return $output;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
deleted file mode 100644
index f94ce5ae9..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage Php
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DefaultValue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * A value-holder object for non-expressable parameter default values, such as null, booleans and empty array()
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage Php
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Parameter_DefaultValue
-{
-    /**
-     * @var string
-     */
-    protected $_defaultValue = null;
-
-    /**
-     *
-     * @param string $defaultValue
-     * @throws Zend_CodeGenerator_Php_Exception
-     */
-    public function __construct($defaultValue)
-    {
-        if(!is_string($defaultValue)) {
-            require_once "Zend/CodeGenerator/Php/Exception.php";
-            throw new Zend_CodeGenerator_Php_Exception(
-                "Can only set a string as default value representation, ".
-                "but ".gettype($defaultValue)." was given."
-            );
-        }
-        $this->_defaultValue = $defaultValue;
-    }
-
-    public function __toString()
-    {
-        return $this->_defaultValue;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Property.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Property.php
deleted file mode 100644
index dcf462b8f..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Property.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Member_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Member/Abstract.php';
-
-/**
- * @see Zend_CodeGenerator_Php_Property_DefaultValue
- */
-require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract
-{
-
-    /**
-     * @var bool
-     */
-    protected $_isConst = null;
-
-    /**
-     * @var string
-     */
-    protected $_defaultValue = null;
-
-    /**
-     * fromReflection()
-     *
-     * @param Zend_Reflection_Property $reflectionProperty
-     * @return Zend_CodeGenerator_Php_Property
-     */
-    public static function fromReflection(Zend_Reflection_Property $reflectionProperty)
-    {
-        $property = new self();
-
-        $property->setName($reflectionProperty->getName());
-
-        $allDefaultProperties = $reflectionProperty->getDeclaringClass()->getDefaultProperties();
-
-        $property->setDefaultValue($allDefaultProperties[$reflectionProperty->getName()]);
-
-        if ($reflectionProperty->getDocComment() != '') {
-            $property->setDocblock(Zend_CodeGenerator_Php_Docblock::fromReflection($reflectionProperty->getDocComment()));
-        }
-
-        if ($reflectionProperty->isStatic()) {
-            $property->setStatic(true);
-        }
-
-        if ($reflectionProperty->isPrivate()) {
-            $property->setVisibility(self::VISIBILITY_PRIVATE);
-        } elseif ($reflectionProperty->isProtected()) {
-            $property->setVisibility(self::VISIBILITY_PROTECTED);
-        } else {
-            $property->setVisibility(self::VISIBILITY_PUBLIC);
-        }
-
-        $property->setSourceDirty(false);
-
-        return $property;
-    }
-
-    /**
-     * setConst()
-     *
-     * @param bool $const
-     * @return Zend_CodeGenerator_Php_Property
-     */
-    public function setConst($const)
-    {
-        $this->_isConst = $const;
-        return $this;
-    }
-
-    /**
-     * isConst()
-     *
-     * @return bool
-     */
-    public function isConst()
-    {
-        return ($this->_isConst) ? true : false;
-    }
-
-    /**
-     * setDefaultValue()
-     *
-     * @param Zend_CodeGenerator_Php_Property_DefaultValue|string|array $defaultValue
-     * @return Zend_CodeGenerator_Php_Property
-     */
-    public function setDefaultValue($defaultValue)
-    {
-        // if it looks like
-        if (is_array($defaultValue)
-            && array_key_exists('value', $defaultValue)
-            && array_key_exists('type', $defaultValue)) {
-            $defaultValue = new Zend_CodeGenerator_Php_Property_DefaultValue($defaultValue);
-        }
-
-        if (!($defaultValue instanceof Zend_CodeGenerator_Php_Property_DefaultValue)) {
-            $defaultValue = new Zend_CodeGenerator_Php_Property_DefaultValue(array('value' => $defaultValue));
-        }
-
-        $this->_defaultValue = $defaultValue;
-        return $this;
-    }
-
-    /**
-     * getDefaultValue()
-     *
-     * @return Zend_CodeGenerator_Php_Property_DefaultValue
-     */
-    public function getDefaultValue()
-    {
-        return $this->_defaultValue;
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $name         = $this->getName();
-        $defaultValue = $this->getDefaultValue();
-
-        $output = '';
-
-        if (($docblock = $this->getDocblock()) !== null) {
-            $docblock->setIndentation('    ');
-            $output .= $docblock->generate();
-        }
-
-        if ($this->isConst()) {
-            if ($defaultValue != null && !$defaultValue->isValidConstantType()) {
-                require_once 'Zend/CodeGenerator/Php/Exception.php';
-                throw new Zend_CodeGenerator_Php_Exception('The property ' . $this->_name . ' is said to be '
-                    . 'constant but does not have a valid constant value.');
-            }
-            $output .= $this->_indentation . 'const ' . $name . ' = '
-                . (($defaultValue !== null) ? $defaultValue->generate() : 'null;');
-        } else {
-            $output .= $this->_indentation
-                . $this->getVisibility()
-                . (($this->isStatic()) ? ' static' : '')
-                . ' $' . $name . ' = '
-                . (($defaultValue !== null) ? $defaultValue->generate() : 'null;');
-        }
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/CodeGenerator/Php/Property/DefaultValue.php b/airtime_mvc/library/Zend/CodeGenerator/Php/Property/DefaultValue.php
deleted file mode 100644
index 210611666..000000000
--- a/airtime_mvc/library/Zend/CodeGenerator/Php/Property/DefaultValue.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @subpackage PHP
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DefaultValue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_CodeGenerator_Php_Abstract
- */
-require_once 'Zend/CodeGenerator/Php/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_CodeGenerator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Php_Abstract
-{
-    /**#@+
-     * Constant values
-     */
-    const TYPE_AUTO     = 'auto';
-    const TYPE_BOOLEAN  = 'boolean';
-    const TYPE_BOOL     = 'bool';
-    const TYPE_NUMBER   = 'number';
-    const TYPE_INTEGER  = 'integer';
-    const TYPE_INT      = 'int';
-    const TYPE_FLOAT    = 'float';
-    const TYPE_DOUBLE   = 'double';
-    const TYPE_STRING   = 'string';
-    const TYPE_ARRAY    = 'array';
-    const TYPE_CONSTANT = 'constant';
-    const TYPE_NULL     = 'null';
-    const TYPE_OTHER    = 'other';
-    /**#@-*/
-
-    /**
-     * @var array of reflected constants
-     */
-    protected static $_constants = array();
-
-    /**
-     * @var mixed
-     */
-    protected $_value = null;
-
-    /**
-     * @var string
-     */
-    protected $_type  = self::TYPE_AUTO;
-
-    /**
-     * @var int
-     */
-    protected $_arrayDepth = 1;
-
-    /**
-     * _init()
-     *
-     * This method will prepare the constant array for this class
-     */
-    protected function _init()
-    {
-        if(count(self::$_constants) == 0) {
-            $reflect = new ReflectionClass(get_class($this));
-            self::$_constants = $reflect->getConstants();
-            unset($reflect);
-        }
-    }
-
-    /**
-     * isValidConstantType()
-     *
-     * @return bool
-     */
-    public function isValidConstantType()
-    {
-        if ($this->_type == self::TYPE_AUTO) {
-            $type = $this->_getAutoDeterminedType($this->_value);
-        }
-
-        // valid types for constants
-        $scalarTypes = array(
-            self::TYPE_BOOLEAN,
-            self::TYPE_BOOL,
-            self::TYPE_NUMBER,
-            self::TYPE_INTEGER,
-            self::TYPE_INT,
-            self::TYPE_FLOAT,
-            self::TYPE_DOUBLE,
-            self::TYPE_STRING,
-            self::TYPE_CONSTANT,
-            self::TYPE_NULL
-            );
-
-        return in_array($type, $scalarTypes);
-    }
-
-    /**
-     * setValue()
-     *
-     * @param mixed $value
-     * @return Zend_CodeGenerator_Php_Property_DefaultValue
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * getValue()
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * setType()
-     *
-     * @param string $type
-     * @return Zend_CodeGenerator_Php_Property_DefaultValue
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * getType()
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * setArrayDepth()
-     *
-     * @param int $arrayDepth
-     * @return Zend_CodeGenerator_Php_Property_DefaultValue
-     */
-    public function setArrayDepth($arrayDepth)
-    {
-        $this->_arrayDepth = $arrayDepth;
-        return $this;
-    }
-
-    /**
-     * getArrayDepth()
-     *
-     * @return int
-     */
-    public function getArrayDepth()
-    {
-        return $this->_arrayDepth;
-    }
-
-    /**
-     * _getValidatedType()
-     *
-     * @param string $type
-     * @return string
-     */
-    protected function _getValidatedType($type)
-    {
-        if (($constName = array_search($type, self::$_constants)) !== false) {
-            return $type;
-        }
-
-        return self::TYPE_AUTO;
-    }
-
-    /**
-     * _getAutoDeterminedType()
-     *
-     * @param mixed $value
-     * @return string
-     */
-    public function _getAutoDeterminedType($value)
-    {
-        switch (gettype($value)) {
-            case 'boolean':
-                return self::TYPE_BOOLEAN;
-            case 'integer':
-                return self::TYPE_INT;
-            case 'string':
-                return self::TYPE_STRING;
-            case 'double':
-            case 'float':
-            case 'integer':
-                return self::TYPE_NUMBER;
-            case 'array':
-                return self::TYPE_ARRAY;
-            case 'NULL':
-                return self::TYPE_NULL;
-            case 'object':
-            case 'resource':
-            case 'unknown type':
-            default:
-                return self::TYPE_OTHER;
-        }
-    }
-
-    /**
-     * generate()
-     *
-     * @return string
-     */
-    public function generate()
-    {
-        $type = $this->_type;
-
-        if ($type != self::TYPE_AUTO) {
-            $type = $this->_getValidatedType($type);
-        }
-
-        $value = $this->_value;
-
-        if ($type == self::TYPE_AUTO) {
-            $type = $this->_getAutoDeterminedType($value);
-
-            if ($type == self::TYPE_ARRAY) {
-                $rii = new RecursiveIteratorIterator(
-                    $it = new RecursiveArrayIterator($value),
-                    RecursiveIteratorIterator::SELF_FIRST
-                    );
-                foreach ($rii as $curKey => $curValue) {
-                    if (!$curValue instanceof Zend_CodeGenerator_Php_Property_DefaultValue) {
-                        $curValue = new self(array('value' => $curValue));
-                        $rii->getSubIterator()->offsetSet($curKey, $curValue);
-                    }
-                    $curValue->setArrayDepth($rii->getDepth());
-                }
-                $value = $rii->getSubIterator()->getArrayCopy();
-            }
-
-        }
-
-        $output = '';
-
-        switch ($type) {
-            case self::TYPE_BOOLEAN:
-            case self::TYPE_BOOL:
-                $output .= ( $value ? 'true' : 'false' );
-                break;
-            case self::TYPE_STRING:
-                $output .= "'" . addcslashes($value, "'") . "'";
-                break;
-            case self::TYPE_NULL:
-                $output .= 'null';
-                break;
-            case self::TYPE_NUMBER:
-            case self::TYPE_INTEGER:
-            case self::TYPE_INT:
-            case self::TYPE_FLOAT:
-            case self::TYPE_DOUBLE:
-            case self::TYPE_CONSTANT:
-                $output .= $value;
-                break;
-            case self::TYPE_ARRAY:
-                $output .= 'array(';
-                $curArrayMultiblock = false;
-                if (count($value) > 1) {
-                    $curArrayMultiblock = true;
-                    $output .= PHP_EOL . str_repeat($this->_indentation, $this->_arrayDepth+1);
-                }
-                $outputParts = array();
-                $noKeyIndex = 0;
-                foreach ($value as $n => $v) {
-                    $v->setArrayDepth($this->_arrayDepth + 1);
-                    $partV = $v->generate();
-                    $partV = substr($partV, 0, strlen($partV)-1);
-                    if ($n === $noKeyIndex) {
-                        $outputParts[] = $partV;
-                        $noKeyIndex++;
-                    } else {
-                        $outputParts[] = (is_int($n) ? $n : "'" . addcslashes($n, "'") . "'") . ' => ' . $partV;
-                    }
-
-                }
-                $output .= implode(',' . PHP_EOL . str_repeat($this->_indentation, $this->_arrayDepth+1), $outputParts);
-                if ($curArrayMultiblock == true) {
-                    $output .= PHP_EOL . str_repeat($this->_indentation, $this->_arrayDepth+1);
-                }
-                $output .= ')';
-                break;
-            case self::TYPE_OTHER:
-            default:
-                require_once "Zend/CodeGenerator/Php/Exception.php";
-                throw new Zend_CodeGenerator_Php_Exception(
-                    "Type '".get_class($value)."' is unknown or cannot be used as property default value."
-                );
-        }
-
-        $output .= ';';
-
-        return $output;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Config.php b/airtime_mvc/library/Zend/Config.php
deleted file mode 100644
index 357f18839..000000000
--- a/airtime_mvc/library/Zend/Config.php
+++ /dev/null
@@ -1,484 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config implements Countable, Iterator
-{
-    /**
-     * Whether in-memory modifications to configuration data are allowed
-     *
-     * @var boolean
-     */
-    protected $_allowModifications;
-
-    /**
-     * Iteration index
-     *
-     * @var integer
-     */
-    protected $_index;
-
-    /**
-     * Number of elements in configuration data
-     *
-     * @var integer
-     */
-    protected $_count;
-
-    /**
-     * Contains array of configuration data
-     *
-     * @var array
-     */
-    protected $_data;
-
-    /**
-     * Used when unsetting values during iteration to ensure we do not skip
-     * the next element
-     *
-     * @var boolean
-     */
-    protected $_skipNextIteration;
-
-    /**
-     * Contains which config file sections were loaded. This is null
-     * if all sections were loaded, a string name if one section is loaded
-     * and an array of string names if multiple sections were loaded.
-     *
-     * @var mixed
-     */
-    protected $_loadedSection;
-
-    /**
-     * This is used to track section inheritance. The keys are names of sections that
-     * extend other sections, and the values are the extended sections.
-     *
-     * @var array
-     */
-    protected $_extends = array();
-
-    /**
-     * Load file error string.
-     *
-     * Is null if there was no error while file loading
-     *
-     * @var string
-     */
-    protected $_loadFileErrorStr = null;
-
-    /**
-     * Zend_Config provides a property based interface to
-     * an array. The data are read-only unless $allowModifications
-     * is set to true on construction.
-     *
-     * Zend_Config also implements Countable and Iterator to
-     * facilitate easy access to the data.
-     *
-     * @param  array   $array
-     * @param  boolean $allowModifications
-     * @return void
-     */
-    public function __construct(array $array, $allowModifications = false)
-    {
-        $this->_allowModifications = (boolean) $allowModifications;
-        $this->_loadedSection = null;
-        $this->_index = 0;
-        $this->_data = array();
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                $this->_data[$key] = new self($value, $this->_allowModifications);
-            } else {
-                $this->_data[$key] = $value;
-            }
-        }
-        $this->_count = count($this->_data);
-    }
-
-    /**
-     * Retrieve a value and return $default if there is no element set.
-     *
-     * @param string $name
-     * @param mixed $default
-     * @return mixed
-     */
-    public function get($name, $default = null)
-    {
-        $result = $default;
-        if (array_key_exists($name, $this->_data)) {
-            $result = $this->_data[$name];
-        }
-        return $result;
-    }
-
-    /**
-     * Magic function so that $obj->value will work.
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        return $this->get($name);
-    }
-
-    /**
-     * Only allow setting of a property if $allowModifications
-     * was set to true on construction. Otherwise, throw an exception.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @throws Zend_Config_Exception
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        if ($this->_allowModifications) {
-            if (is_array($value)) {
-                $this->_data[$name] = new self($value, true);
-            } else {
-                $this->_data[$name] = $value;
-            }
-            $this->_count = count($this->_data);
-        } else {
-            /** @see Zend_Config_Exception */
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Zend_Config is read only');
-        }
-    }
-
-    /**
-     * Deep clone of this instance to ensure that nested Zend_Configs
-     * are also cloned.
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-      $array = array();
-      foreach ($this->_data as $key => $value) {
-          if ($value instanceof Zend_Config) {
-              $array[$key] = clone $value;
-          } else {
-              $array[$key] = $value;
-          }
-      }
-      $this->_data = $array;
-    }
-
-    /**
-     * Return an associative array of the stored data.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = array();
-        $data = $this->_data;
-        foreach ($data as $key => $value) {
-            if ($value instanceof Zend_Config) {
-                $array[$key] = $value->toArray();
-            } else {
-                $array[$key] = $value;
-            }
-        }
-        return $array;
-    }
-
-    /**
-     * Support isset() overloading on PHP 5.1
-     *
-     * @param string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        return isset($this->_data[$name]);
-    }
-
-    /**
-     * Support unset() overloading on PHP 5.1
-     *
-     * @param  string $name
-     * @throws Zend_Config_Exception
-     * @return void
-     */
-    public function __unset($name)
-    {
-        if ($this->_allowModifications) {
-            unset($this->_data[$name]);
-            $this->_count = count($this->_data);
-            $this->_skipNextIteration = true;
-        } else {
-            /** @see Zend_Config_Exception */
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Zend_Config is read only');
-        }
-
-    }
-
-    /**
-     * Defined by Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->_count;
-    }
-
-    /**
-     * Defined by Iterator interface
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        $this->_skipNextIteration = false;
-        return current($this->_data);
-    }
-
-    /**
-     * Defined by Iterator interface
-     *
-     * @return mixed
-     */
-    public function key()
-    {
-        return key($this->_data);
-    }
-
-    /**
-     * Defined by Iterator interface
-     *
-     */
-    public function next()
-    {
-        if ($this->_skipNextIteration) {
-            $this->_skipNextIteration = false;
-            return;
-        }
-        next($this->_data);
-        $this->_index++;
-    }
-
-    /**
-     * Defined by Iterator interface
-     *
-     */
-    public function rewind()
-    {
-        $this->_skipNextIteration = false;
-        reset($this->_data);
-        $this->_index = 0;
-    }
-
-    /**
-     * Defined by Iterator interface
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return $this->_index < $this->_count;
-    }
-
-    /**
-     * Returns the section name(s) loaded.
-     *
-     * @return mixed
-     */
-    public function getSectionName()
-    {
-        if(is_array($this->_loadedSection) && count($this->_loadedSection) == 1) {
-            $this->_loadedSection = $this->_loadedSection[0];
-        }
-        return $this->_loadedSection;
-    }
-
-    /**
-     * Returns true if all sections were loaded
-     *
-     * @return boolean
-     */
-    public function areAllSectionsLoaded()
-    {
-        return $this->_loadedSection === null;
-    }
-
-
-    /**
-     * Merge another Zend_Config with this one. The items
-     * in $merge will override the same named items in
-     * the current config.
-     *
-     * @param Zend_Config $merge
-     * @return Zend_Config
-     */
-    public function merge(Zend_Config $merge)
-    {
-        foreach($merge as $key => $item) {
-            if(array_key_exists($key, $this->_data)) {
-                if($item instanceof Zend_Config && $this->$key instanceof Zend_Config) {
-                    $this->$key = $this->$key->merge(new Zend_Config($item->toArray(), !$this->readOnly()));
-                } else {
-                    $this->$key = $item;
-                }
-            } else {
-                if($item instanceof Zend_Config) {
-                    $this->$key = new Zend_Config($item->toArray(), !$this->readOnly());
-                } else {
-                    $this->$key = $item;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Prevent any more modifications being made to this instance. Useful
-     * after merge() has been used to merge multiple Zend_Config objects
-     * into one object which should then not be modified again.
-     *
-     */
-    public function setReadOnly()
-    {
-        $this->_allowModifications = false;
-        foreach ($this->_data as $key => $value) {
-            if ($value instanceof Zend_Config) {
-                $value->setReadOnly();
-            }
-        }
-    }
-
-    /**
-     * Returns if this Zend_Config object is read only or not.
-     *
-     * @return boolean
-     */
-    public function readOnly()
-    {
-        return !$this->_allowModifications;
-    }
-
-    /**
-     * Get the current extends
-     *
-     * @return array
-     */
-    public function getExtends()
-    {
-        return $this->_extends;
-    }
-
-    /**
-     * Set an extend for Zend_Config_Writer
-     *
-     * @param  string $extendingSection
-     * @param  string $extendedSection
-     * @return void
-     */
-    public function setExtend($extendingSection, $extendedSection = null)
-    {
-        if ($extendedSection === null && isset($this->_extends[$extendingSection])) {
-            unset($this->_extends[$extendingSection]);
-        } else if ($extendedSection !== null) {
-            $this->_extends[$extendingSection] = $extendedSection;
-        }
-    }
-
-    /**
-     * Throws an exception if $extendingSection may not extend $extendedSection,
-     * and tracks the section extension if it is valid.
-     *
-     * @param  string $extendingSection
-     * @param  string $extendedSection
-     * @throws Zend_Config_Exception
-     * @return void
-     */
-    protected function _assertValidExtend($extendingSection, $extendedSection)
-    {
-        // detect circular section inheritance
-        $extendedSectionCurrent = $extendedSection;
-        while (array_key_exists($extendedSectionCurrent, $this->_extends)) {
-            if ($this->_extends[$extendedSectionCurrent] == $extendingSection) {
-                /** @see Zend_Config_Exception */
-                require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception('Illegal circular inheritance detected');
-            }
-            $extendedSectionCurrent = $this->_extends[$extendedSectionCurrent];
-        }
-        // remember that this section extends another section
-        $this->_extends[$extendingSection] = $extendedSection;
-    }
-
-    /**
-     * Handle any errors from simplexml_load_file or parse_ini_file
-     *
-     * @param integer $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param integer $errline
-     */
-    protected function _loadFileErrorHandler($errno, $errstr, $errfile, $errline)
-    {
-        if ($this->_loadFileErrorStr === null) {
-            $this->_loadFileErrorStr = $errstr;
-        } else {
-            $this->_loadFileErrorStr .= (PHP_EOL . $errstr);
-        }
-    }
-
-    /**
-     * Merge two arrays recursively, overwriting keys of the same name
-     * in $firstArray with the value in $secondArray.
-     *
-     * @param  mixed $firstArray  First array
-     * @param  mixed $secondArray Second array to merge into first array
-     * @return array
-     */
-    protected function _arrayMergeRecursive($firstArray, $secondArray)
-    {
-        if (is_array($firstArray) && is_array($secondArray)) {
-            foreach ($secondArray as $key => $value) {
-                if (isset($firstArray[$key])) {
-                    $firstArray[$key] = $this->_arrayMergeRecursive($firstArray[$key], $value);
-                } else {
-                    if($key === 0) {
-                        $firstArray= array(0=>$this->_arrayMergeRecursive($firstArray, $value));
-                    } else {
-                        $firstArray[$key] = $value;
-                    }
-                }
-            }
-        } else {
-            $firstArray = $secondArray;
-        }
-
-        return $firstArray;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Config/Exception.php b/airtime_mvc/library/Zend/Config/Exception.php
deleted file mode 100644
index 1532c1652..000000000
--- a/airtime_mvc/library/Zend/Config/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Exception extends Zend_Exception {}
diff --git a/airtime_mvc/library/Zend/Config/Ini.php b/airtime_mvc/library/Zend/Config/Ini.php
deleted file mode 100644
index e1966d505..000000000
--- a/airtime_mvc/library/Zend/Config/Ini.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Config
- */
-require_once 'Zend/Config.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Ini extends Zend_Config
-{
-    /**
-     * String that separates nesting levels of configuration data identifiers
-     *
-     * @var string
-     */
-    protected $_nestSeparator = '.';
-
-    /**
-     * String that separates the parent section name
-     *
-     * @var string
-     */
-    protected $_sectionSeparator = ':';
-
-    /**
-     * Whether to skip extends or not
-     *
-     * @var boolean
-     */
-    protected $_skipExtends = false;
-
-    /**
-     * Loads the section $section from the config file $filename for
-     * access facilitated by nested object properties.
-     *
-     * If the section name contains a ":" then the section name to the right
-     * is loaded and included into the properties. Note that the keys in
-     * this $section will override any keys of the same
-     * name in the sections that have been included via ":".
-     *
-     * If the $section is null, then all sections in the ini file are loaded.
-     *
-     * If any key includes a ".", then this will act as a separator to
-     * create a sub-property.
-     *
-     * example ini file:
-     *      [all]
-     *      db.connection = database
-     *      hostname = live
-     *
-     *      [staging : all]
-     *      hostname = staging
-     *
-     * after calling $data = new Zend_Config_Ini($file, 'staging'); then
-     *      $data->hostname === "staging"
-     *      $data->db->connection === "database"
-     *
-     * The $options parameter may be provided as either a boolean or an array.
-     * If provided as a boolean, this sets the $allowModifications option of
-     * Zend_Config. If provided as an array, there are two configuration
-     * directives that may be set. For example:
-     *
-     * $options = array(
-     *     'allowModifications' => false,
-     *     'nestSeparator'      => '->'
-     *      );
-     *
-     * @param  string        $filename
-     * @param  string|null   $section
-     * @param  boolean|array $options
-     * @throws Zend_Config_Exception
-     * @return void
-     */
-    public function __construct($filename, $section = null, $options = false)
-    {
-        if (empty($filename)) {
-            /**
-             * @see Zend_Config_Exception
-             */
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Filename is not set');
-        }
-
-        $allowModifications = false;
-        if (is_bool($options)) {
-            $allowModifications = $options;
-        } elseif (is_array($options)) {
-            if (isset($options['allowModifications'])) {
-                $allowModifications = (bool) $options['allowModifications'];
-            }
-            if (isset($options['nestSeparator'])) {
-                $this->_nestSeparator = (string) $options['nestSeparator'];
-            }
-            if (isset($options['skipExtends'])) {
-                $this->_skipExtends = (bool) $options['skipExtends'];
-            }
-        }
-
-        $iniArray = $this->_loadIniFile($filename);
-
-        if (null === $section) {
-            // Load entire file
-            $dataArray = array();
-            foreach ($iniArray as $sectionName => $sectionData) {
-                if(!is_array($sectionData)) {
-                    $dataArray = $this->_arrayMergeRecursive($dataArray, $this->_processKey(array(), $sectionName, $sectionData));
-                } else {
-                    $dataArray[$sectionName] = $this->_processSection($iniArray, $sectionName);
-                }
-            }
-            parent::__construct($dataArray, $allowModifications);
-        } else {
-            // Load one or more sections
-            if (!is_array($section)) {
-                $section = array($section);
-            }
-            $dataArray = array();
-            foreach ($section as $sectionName) {
-                if (!isset($iniArray[$sectionName])) {
-                    /**
-                     * @see Zend_Config_Exception
-                     */
-                    require_once 'Zend/Config/Exception.php';
-                    throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $filename");
-                }
-                $dataArray = $this->_arrayMergeRecursive($this->_processSection($iniArray, $sectionName), $dataArray);
-
-            }
-            parent::__construct($dataArray, $allowModifications);
-        }
-
-        $this->_loadedSection = $section;
-    }
-    
-    /**
-     * Load the INI file from disk using parse_ini_file(). Use a private error
-     * handler to convert any loading errors into a Zend_Config_Exception
-     * 
-     * @param string $filename
-     * @throws Zend_Config_Exception
-     * @return array
-     */
-    protected function _parseIniFile($filename)
-    {
-        set_error_handler(array($this, '_loadFileErrorHandler'));
-        $iniArray = parse_ini_file($filename, true); // Warnings and errors are suppressed
-        restore_error_handler();
-        
-        // Check if there was a error while loading file
-        if ($this->_loadFileErrorStr !== null) {
-            /**
-             * @see Zend_Config_Exception
-             */
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception($this->_loadFileErrorStr);
-        }
-        
-        return $iniArray;
-    }
-
-    /**
-     * Load the ini file and preprocess the section separator (':' in the
-     * section name (that is used for section extension) so that the resultant
-     * array has the correct section names and the extension information is
-     * stored in a sub-key called ';extends'. We use ';extends' as this can
-     * never be a valid key name in an INI file that has been loaded using
-     * parse_ini_file().
-     *
-     * @param string $filename
-     * @throws Zend_Config_Exception
-     * @return array
-     */
-    protected function _loadIniFile($filename)
-    {
-        $loaded = $this->_parseIniFile($filename);
-        $iniArray = array();
-        foreach ($loaded as $key => $data)
-        {
-            $pieces = explode($this->_sectionSeparator, $key);
-            $thisSection = trim($pieces[0]);
-            switch (count($pieces)) {
-                case 1:
-                    $iniArray[$thisSection] = $data;
-                    break;
-
-                case 2:
-                    $extendedSection = trim($pieces[1]);
-                    $iniArray[$thisSection] = array_merge(array(';extends'=>$extendedSection), $data);
-                    break;
-
-                default:
-                    /**
-                     * @see Zend_Config_Exception
-                     */
-                    require_once 'Zend/Config/Exception.php';
-                    throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections in $filename");
-            }
-        }
-
-        return $iniArray;
-    }
-
-    /**
-     * Process each element in the section and handle the ";extends" inheritance
-     * key. Passes control to _processKey() to handle the nest separator
-     * sub-property syntax that may be used within the key name.
-     *
-     * @param  array  $iniArray
-     * @param  string $section
-     * @param  array  $config
-     * @throws Zend_Config_Exception
-     * @return array
-     */
-    protected function _processSection($iniArray, $section, $config = array())
-    {
-        $thisSection = $iniArray[$section];
-
-        foreach ($thisSection as $key => $value) {
-            if (strtolower($key) == ';extends') {
-                if (isset($iniArray[$value])) {
-                    $this->_assertValidExtend($section, $value);
-
-                    if (!$this->_skipExtends) {
-                        $config = $this->_processSection($iniArray, $value, $config);
-                    }
-                } else {
-                    /**
-                     * @see Zend_Config_Exception
-                     */
-                    require_once 'Zend/Config/Exception.php';
-                    throw new Zend_Config_Exception("Parent section '$section' cannot be found");
-                }
-            } else {
-                $config = $this->_processKey($config, $key, $value);
-            }
-        }
-        return $config;
-    }
-
-    /**
-     * Assign the key's value to the property list. Handles the
-     * nest separator for sub-properties.
-     *
-     * @param  array  $config
-     * @param  string $key
-     * @param  string $value
-     * @throws Zend_Config_Exception
-     * @return array
-     */
-    protected function _processKey($config, $key, $value)
-    {
-        if (strpos($key, $this->_nestSeparator) !== false) {
-            $pieces = explode($this->_nestSeparator, $key, 2);
-            if (strlen($pieces[0]) && strlen($pieces[1])) {
-                if (!isset($config[$pieces[0]])) {
-                    if ($pieces[0] === '0' && !empty($config)) {
-                        // convert the current values in $config into an array
-                        $config = array($pieces[0] => $config);
-                    } else {
-                        $config[$pieces[0]] = array();
-                    }
-                } elseif (!is_array($config[$pieces[0]])) {
-                    /**
-                     * @see Zend_Config_Exception
-                     */
-                    require_once 'Zend/Config/Exception.php';
-                    throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists");
-                }
-                $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value);
-            } else {
-                /**
-                 * @see Zend_Config_Exception
-                 */
-                require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception("Invalid key '$key'");
-            }
-        } else {
-            $config[$key] = $value;
-        }
-        return $config;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Config/Writer.php b/airtime_mvc/library/Zend/Config/Writer.php
deleted file mode 100644
index 9bfedca74..000000000
--- a/airtime_mvc/library/Zend/Config/Writer.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Config_Writer
-{
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options'
-    );
-
-    /**
-     * Config object to write
-     *
-     * @var Zend_Config
-     */
-    protected $_config = null;
-
-    /**
-     * Create a new adapter
-     *
-     * $options can only be passed as array or be omitted
-     *
-     * @param null|array $options
-     */
-    public function __construct(array $options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set options via a Zend_Config instance
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Config_Writer
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->_config = $config;
-
-        return $this;
-    }
-
-    /**
-     * Set options via an array
-     *
-     * @param  array $options
-     * @return Zend_Config_Writer
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Write a Zend_Config object to it's target
-     *
-     * @return void
-     */
-    abstract public function write();
-}
diff --git a/airtime_mvc/library/Zend/Config/Writer/Array.php b/airtime_mvc/library/Zend/Config/Writer/Array.php
deleted file mode 100644
index d6fb134c5..000000000
--- a/airtime_mvc/library/Zend/Config/Writer/Array.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Config_Writer
- */
-require_once 'Zend/Config/Writer/FileAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Writer_Array extends Zend_Config_Writer_FileAbstract
-{
-    /**
-     * Render a Zend_Config into a PHP Array config string.
-     *
-     * @since 1.10
-     * @return string
-     */
-    public function render()
-    {
-        $data        = $this->_config->toArray();
-        $sectionName = $this->_config->getSectionName();
-
-        if (is_string($sectionName)) {
-            $data = array($sectionName => $data);
-        }
-
-        $arrayString = "<?php\n"
-                     . "return " . var_export($data, true) . ";\n";
-
-        return $arrayString;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Config/Writer/FileAbstract.php b/airtime_mvc/library/Zend/Config/Writer/FileAbstract.php
deleted file mode 100644
index e90213e8a..000000000
--- a/airtime_mvc/library/Zend/Config/Writer/FileAbstract.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @package    Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-require_once "Zend/Config/Writer.php";
-
-/**
- * Abstract File Writer
- *
- * @category   Zend
- * @package    Zend_package
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FileAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer
-{
-    /**
-     * Filename to write to
-     *
-     * @var string
-     */
-    protected $_filename = null;
-
-    /**
-     * Wether to exclusively lock the file or not
-     *
-     * @var boolean
-     */
-    protected $_exclusiveLock = false;
-
-    /**
-     * Set the target filename
-     *
-     * @param  string $filename
-     * @return Zend_Config_Writer_Array
-     */
-    public function setFilename($filename)
-    {
-        $this->_filename = $filename;
-
-        return $this;
-    }
-
-    /**
-     * Set wether to exclusively lock the file or not
-     *
-     * @param  boolean     $exclusiveLock
-     * @return Zend_Config_Writer_Array
-     */
-    public function setExclusiveLock($exclusiveLock)
-    {
-        $this->_exclusiveLock = $exclusiveLock;
-
-        return $this;
-    }
-
-    /**
-     * Write configuration to file.
-     *
-     * @param string $filename
-     * @param Zend_Config $config
-     * @param bool $exclusiveLock
-     * @return void
-     */
-    public function write($filename = null, Zend_Config $config = null, $exclusiveLock = null)
-    {
-        if ($filename !== null) {
-            $this->setFilename($filename);
-        }
-
-        if ($config !== null) {
-            $this->setConfig($config);
-        }
-
-        if ($exclusiveLock !== null) {
-            $this->setExclusiveLock($exclusiveLock);
-        }
-
-        if ($this->_filename === null) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('No filename was set');
-        }
-
-        if ($this->_config === null) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('No config was set');
-        }
-
-        $configString = $this->render();
-
-        $flags = 0;
-
-        if ($this->_exclusiveLock) {
-            $flags |= LOCK_EX;
-        }
-
-        $result = @file_put_contents($this->_filename, $configString, $flags);
-
-        if ($result === false) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');
-        }
-    }
-
-    /**
-     * Render a Zend_Config into a config file string.
-     *
-     * @since 1.10
-     * @todo For 2.0 this should be redone into an abstract method.
-     * @return string
-     */
-    public function render()
-    {
-        return "";
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Config/Writer/Ini.php b/airtime_mvc/library/Zend/Config/Writer/Ini.php
deleted file mode 100644
index 7457a0aee..000000000
--- a/airtime_mvc/library/Zend/Config/Writer/Ini.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Config_Writer
- */
-require_once 'Zend/Config/Writer/FileAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract
-{
-    /**
-     * String that separates nesting levels of configuration data identifiers
-     *
-     * @var string
-     */
-    protected $_nestSeparator = '.';
-
-    /**
-     * If true the ini string is rendered in the global namespace without sections.
-     *
-     * @var bool
-     */
-    protected $_renderWithoutSections = false;
-
-    /**
-     * Set the nest separator
-     *
-     * @param  string $filename
-     * @return Zend_Config_Writer_Ini
-     */
-    public function setNestSeparator($separator)
-    {
-        $this->_nestSeparator = $separator;
-
-        return $this;
-    }
-
-    /**
-     * Set if rendering should occour without sections or not.
-     *
-     * If set to true, the INI file is rendered without sections completely
-     * into the global namespace of the INI file.
-     *
-     * @param  bool $withoutSections
-     * @return Zend_Config_Writer_Ini
-     */
-    public function setRenderWithoutSections($withoutSections=true)
-    {
-        $this->_renderWithoutSections = (bool)$withoutSections;
-        return $this;
-    }
-
-    /**
-     * Render a Zend_Config into a INI config string.
-     *
-     * @since 1.10
-     * @return string
-     */
-    public function render()
-    {
-        $iniString   = '';
-        $extends     = $this->_config->getExtends();
-        $sectionName = $this->_config->getSectionName();
-
-        if($this->_renderWithoutSections == true) {
-            $iniString .= $this->_addBranch($this->_config);
-        } else if (is_string($sectionName)) {
-            $iniString .= '[' . $sectionName . ']' . "\n"
-                       .  $this->_addBranch($this->_config)
-                       .  "\n";
-        } else {
-            foreach ($this->_config as $sectionName => $data) {
-                if (!($data instanceof Zend_Config)) {
-                    $iniString .= $sectionName
-                               .  ' = '
-                               .  $this->_prepareValue($data)
-                               .  "\n";
-                } else {
-                    if (isset($extends[$sectionName])) {
-                        $sectionName .= ' : ' . $extends[$sectionName];
-                    }
-
-                    $iniString .= '[' . $sectionName . ']' . "\n"
-                               .  $this->_addBranch($data)
-                               .  "\n";
-                }
-            }
-        }
-
-        return $iniString;
-    }
-
-    /**
-     * Add a branch to an INI string recursively
-     *
-     * @param  Zend_Config $config
-     * @return void
-     */
-    protected function _addBranch(Zend_Config $config, $parents = array())
-    {
-        $iniString = '';
-
-        foreach ($config as $key => $value) {
-            $group = array_merge($parents, array($key));
-
-            if ($value instanceof Zend_Config) {
-                $iniString .= $this->_addBranch($value, $group);
-            } else {
-                $iniString .= implode($this->_nestSeparator, $group)
-                           .  ' = '
-                           .  $this->_prepareValue($value)
-                           .  "\n";
-            }
-        }
-
-        return $iniString;
-    }
-
-    /**
-     * Prepare a value for INI
-     *
-     * @param  mixed $value
-     * @return string
-     */
-    protected function _prepareValue($value)
-    {
-        if (is_integer($value) || is_float($value)) {
-            return $value;
-        } elseif (is_bool($value)) {
-            return ($value ? 'true' : 'false');
-        } elseif (strpos($value, '"') === false) {
-            return '"' . $value .  '"';
-        } else {
-            /** @see Zend_Config_Exception */
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Value can not contain double quotes "');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Config/Writer/Xml.php b/airtime_mvc/library/Zend/Config/Writer/Xml.php
deleted file mode 100644
index 72fc0a0b8..000000000
--- a/airtime_mvc/library/Zend/Config/Writer/Xml.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Config_Writer
- */
-require_once 'Zend/Config/Writer/FileAbstract.php';
-
-/**
- * @see Zend_Config_Xml
- */
-require_once 'Zend/Config/Xml.php';
-
-/**
- * @category   Zend
- * @package    Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract
-{
-    /**
-     * Render a Zend_Config into a XML config string.
-     *
-     * @since 1.10
-     * @return string
-     */
-    public function render()
-    {
-        $xml         = new SimpleXMLElement('<zend-config xmlns:zf="' . Zend_Config_Xml::XML_NAMESPACE . '"/>');
-        $extends     = $this->_config->getExtends();
-        $sectionName = $this->_config->getSectionName();
-
-        if (is_string($sectionName)) {
-            $child = $xml->addChild($sectionName);
-
-            $this->_addBranch($this->_config, $child, $xml);
-        } else {
-            foreach ($this->_config as $sectionName => $data) {
-                if (!($data instanceof Zend_Config)) {
-                    $xml->addChild($sectionName, (string) $data);
-                } else {
-                    $child = $xml->addChild($sectionName);
-
-                    if (isset($extends[$sectionName])) {
-                        $child->addAttribute('zf:extends', $extends[$sectionName], Zend_Config_Xml::XML_NAMESPACE);
-                    }
-
-                    $this->_addBranch($data, $child, $xml);
-                }
-            }
-        }
-
-        $dom = dom_import_simplexml($xml)->ownerDocument;
-        $dom->formatOutput = true;
-
-        $xmlString = $dom->saveXML();
-
-        return $xmlString;
-    }
-
-    /**
-     * Add a branch to an XML object recursively
-     *
-     * @param  Zend_Config      $config
-     * @param  SimpleXMLElement $xml
-     * @param  SimpleXMLElement $parent
-     * @return void
-     */
-    protected function _addBranch(Zend_Config $config, SimpleXMLElement $xml, SimpleXMLElement $parent)
-    {
-        $branchType = null;
-
-        foreach ($config as $key => $value) {
-            if ($branchType === null) {
-                if (is_numeric($key)) {
-                    $branchType = 'numeric';
-                    $branchName = $xml->getName();
-                    $xml        = $parent;
-
-                    unset($parent->{$branchName});
-                } else {
-                    $branchType = 'string';
-                }
-            } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) {
-                require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed');
-            }
-
-            if ($branchType === 'numeric') {
-                if ($value instanceof Zend_Config) {
-                    $child = $parent->addChild($branchName);
-
-                    $this->_addBranch($value, $child, $parent);
-                } else {
-                    $parent->addChild($branchName, (string) $value);
-                }
-            } else {
-                if ($value instanceof Zend_Config) {
-                    $child = $xml->addChild($key);
-
-                    $this->_addBranch($value, $child, $xml);
-                } else {
-                    $xml->addChild($key, (string) $value);
-                }
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Config/Xml.php b/airtime_mvc/library/Zend/Config/Xml.php
deleted file mode 100644
index fa14b9e42..000000000
--- a/airtime_mvc/library/Zend/Config/Xml.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Xml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Config
- */
-require_once 'Zend/Config.php';
-
-/**
- * XML Adapter for Zend_Config
- *
- * @category  Zend
- * @package   Zend_Config
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Config_Xml extends Zend_Config
-{
-    /**
-     * XML namespace for ZF-related tags and attributes
-     */
-    const XML_NAMESPACE = 'http://framework.zend.com/xml/zend-config-xml/1.0/';
-
-    /**
-     * Whether to skip extends or not
-     *
-     * @var boolean
-     */
-    protected $_skipExtends = false;
-
-    /**
-     * Loads the section $section from the config file (or string $xml for
-     * access facilitated by nested object properties.
-     *
-     * Sections are defined in the XML as children of the root element.
-     *
-     * In order to extend another section, a section defines the "extends"
-     * attribute having a value of the section name from which the extending
-     * section inherits values.
-     *
-     * Note that the keys in $section will override any keys of the same
-     * name in the sections that have been included via "extends".
-     *
-     * @param  string  $xml     XML file or string to process
-     * @param  mixed   $section Section to process
-     * @param  boolean $options Whether modifications are allowed at runtime
-     * @throws Zend_Config_Exception When xml is not set or cannot be loaded
-     * @throws Zend_Config_Exception When section $sectionName cannot be found in $xml
-     */
-    public function __construct($xml, $section = null, $options = false)
-    {
-        if (empty($xml)) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception('Filename is not set');
-        }
-
-        $allowModifications = false;
-        if (is_bool($options)) {
-            $allowModifications = $options;
-        } elseif (is_array($options)) {
-            if (isset($options['allowModifications'])) {
-                $allowModifications = (bool) $options['allowModifications'];
-            }
-            if (isset($options['skipExtends'])) {
-                $this->_skipExtends = (bool) $options['skipExtends'];
-            }
-        }
-
-        set_error_handler(array($this, '_loadFileErrorHandler')); // Warnings and errors are suppressed
-        if (strstr($xml, '<?xml')) {
-            $config = simplexml_load_string($xml);
-        } else {
-            $config = simplexml_load_file($xml);
-        }
-
-        restore_error_handler();
-        // Check if there was a error while loading file
-        if ($this->_loadFileErrorStr !== null) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception($this->_loadFileErrorStr);
-        }
-
-        if ($section === null) {
-            $dataArray = array();
-            foreach ($config as $sectionName => $sectionData) {
-                $dataArray[$sectionName] = $this->_processExtends($config, $sectionName);
-            }
-
-            parent::__construct($dataArray, $allowModifications);
-        } else if (is_array($section)) {
-            $dataArray = array();
-            foreach ($section as $sectionName) {
-                if (!isset($config->$sectionName)) {
-                    require_once 'Zend/Config/Exception.php';
-                    throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $xml");
-                }
-
-                $dataArray = array_merge($this->_processExtends($config, $sectionName), $dataArray);
-            }
-
-            parent::__construct($dataArray, $allowModifications);
-        } else {
-            if (!isset($config->$section)) {
-                require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception("Section '$section' cannot be found in $xml");
-            }
-
-            $dataArray = $this->_processExtends($config, $section);
-            if (!is_array($dataArray)) {
-                // Section in the XML file contains just one top level string
-                $dataArray = array($section => $dataArray);
-            }
-
-            parent::__construct($dataArray, $allowModifications);
-        }
-
-        $this->_loadedSection = $section;
-    }
-
-    /**
-     * Helper function to process each element in the section and handle
-     * the "extends" inheritance attribute.
-     *
-     * @param  SimpleXMLElement $element XML Element to process
-     * @param  string           $section Section to process
-     * @param  array            $config  Configuration which was parsed yet
-     * @throws Zend_Config_Exception When $section cannot be found
-     * @return array
-     */
-    protected function _processExtends(SimpleXMLElement $element, $section, array $config = array())
-    {
-        if (!isset($element->$section)) {
-            require_once 'Zend/Config/Exception.php';
-            throw new Zend_Config_Exception("Section '$section' cannot be found");
-        }
-
-        $thisSection  = $element->$section;
-        $nsAttributes = $thisSection->attributes(self::XML_NAMESPACE);
-
-        if (isset($thisSection['extends']) || isset($nsAttributes['extends'])) {
-            $extendedSection = (string) (isset($nsAttributes['extends']) ? $nsAttributes['extends'] : $thisSection['extends']);
-            $this->_assertValidExtend($section, $extendedSection);
-
-            if (!$this->_skipExtends) {
-                $config = $this->_processExtends($element, $extendedSection, $config);
-            }
-        }
-
-        $config = $this->_arrayMergeRecursive($config, $this->_toArray($thisSection));
-
-        return $config;
-    }
-
-    /**
-     * Returns a string or an associative and possibly multidimensional array from
-     * a SimpleXMLElement.
-     *
-     * @param  SimpleXMLElement $xmlObject Convert a SimpleXMLElement into an array
-     * @return array|string
-     */
-    protected function _toArray(SimpleXMLElement $xmlObject)
-    {
-        $config       = array();
-        $nsAttributes = $xmlObject->attributes(self::XML_NAMESPACE);
-
-        // Search for parent node values
-        if (count($xmlObject->attributes()) > 0) {
-            foreach ($xmlObject->attributes() as $key => $value) {
-                if ($key === 'extends') {
-                    continue;
-                }
-
-                $value = (string) $value;
-
-                if (array_key_exists($key, $config)) {
-                    if (!is_array($config[$key])) {
-                        $config[$key] = array($config[$key]);
-                    }
-
-                    $config[$key][] = $value;
-                } else {
-                    $config[$key] = $value;
-                }
-            }
-        }
-
-        // Search for local 'const' nodes and replace them
-        if (count($xmlObject->children(self::XML_NAMESPACE)) > 0) {
-            if (count($xmlObject->children()) > 0) {
-                require_once 'Zend/Config/Exception.php';
-                throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children");
-            }
-
-            $dom                 = dom_import_simplexml($xmlObject);
-            $namespaceChildNodes = array();
-
-            // We have to store them in an array, as replacing nodes will
-            // confuse the DOMNodeList later
-            foreach ($dom->childNodes as $node) {
-                if ($node instanceof DOMElement && $node->namespaceURI === self::XML_NAMESPACE) {
-                    $namespaceChildNodes[] = $node;
-                }
-            }
-
-            foreach ($namespaceChildNodes as $node) {
-                switch ($node->localName) {
-                    case 'const':
-                        if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) {
-                            require_once 'Zend/Config/Exception.php';
-                            throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node");
-                        }
-
-                        $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name');
-
-                        if (!defined($constantName)) {
-                            require_once 'Zend/Config/Exception.php';
-                            throw new Zend_Config_Exception("Constant with name '$constantName' was not defined");
-                        }
-
-                        $constantValue = constant($constantName);
-
-                        $dom->replaceChild($dom->ownerDocument->createTextNode($constantValue), $node);
-                        break;
-
-                    default:
-                        require_once 'Zend/Config/Exception.php';
-                        throw new Zend_Config_Exception("Unknown node with name '$node->localName' found");
-                }
-            }
-
-            return (string) simplexml_import_dom($dom);
-        }
-
-        // Search for children
-        if (count($xmlObject->children()) > 0) {
-            foreach ($xmlObject->children() as $key => $value) {
-                if (count($value->children()) > 0 || count($value->children(self::XML_NAMESPACE)) > 0) {
-                    $value = $this->_toArray($value);
-                } else if (count($value->attributes()) > 0) {
-                    $attributes = $value->attributes();
-                    if (isset($attributes['value'])) {
-                        $value = (string) $attributes['value'];
-                    } else {
-                        $value = $this->_toArray($value);
-                    }
-                } else {
-                    $value = (string) $value;
-                }
-
-                if (array_key_exists($key, $config)) {
-                    if (!is_array($config[$key]) || !array_key_exists(0, $config[$key])) {
-                        $config[$key] = array($config[$key]);
-                    }
-
-                    $config[$key][] = $value;
-                } else {
-                    $config[$key] = $value;
-                }
-            }
-        } else if (!isset($xmlObject['extends']) && !isset($nsAttributes['extends']) && (count($config) === 0)) {
-            // Object has no children nor attributes and doesn't use the extends
-            // attribute: it's a string
-            $config = (string) $xmlObject;
-        }
-
-        return $config;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Console/Getopt.php b/airtime_mvc/library/Zend/Console/Getopt.php
deleted file mode 100644
index 1e173bdea..000000000
--- a/airtime_mvc/library/Zend/Console/Getopt.php
+++ /dev/null
@@ -1,969 +0,0 @@
-<?php
-/**
- * Zend_Console_Getopt is a class to parse options for command-line
- * applications.
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Getopt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Console_Getopt is a class to parse options for command-line
- * applications.
- *
- * Terminology:
- * Argument: an element of the argv array.  This may be part of an option,
- *   or it may be a non-option command-line argument.
- * Flag: the letter or word set off by a '-' or '--'.  Example: in '--output filename',
- *   '--output' is the flag.
- * Parameter: the additional argument that is associated with the option.
- *   Example: in '--output filename', the 'filename' is the parameter.
- * Option: the combination of a flag and its parameter, if any.
- *   Example: in '--output filename', the whole thing is the option.
- *
- * The following features are supported:
- *
- * - Short flags like '-a'.  Short flags are preceded by a single
- *   dash.  Short flags may be clustered e.g. '-abc', which is the
- *   same as '-a' '-b' '-c'.
- * - Long flags like '--verbose'.  Long flags are preceded by a
- *   double dash.  Long flags may not be clustered.
- * - Options may have a parameter, e.g. '--output filename'.
- * - Parameters for long flags may also be set off with an equals sign,
- *   e.g. '--output=filename'.
- * - Parameters for long flags may be checked as string, word, or integer.
- * - Automatic generation of a helpful usage message.
- * - Signal end of options with '--'; subsequent arguments are treated
- *   as non-option arguments, even if they begin with '-'.
- * - Raise exception Zend_Console_Getopt_Exception in several cases
- *   when invalid flags or parameters are given.  Usage message is
- *   returned in the exception object.
- *
- * The format for specifying options uses a PHP associative array.
- * The key is has the format of a list of pipe-separated flag names,
- * followed by an optional '=' to indicate a required parameter or
- * '-' to indicate an optional parameter.  Following that, the type
- * of parameter may be specified as 's' for string, 'w' for word,
- * or 'i' for integer.
- *
- * Examples:
- * - 'user|username|u=s'  this means '--user' or '--username' or '-u'
- *   are synonyms, and the option requires a string parameter.
- * - 'p=i'  this means '-p' requires an integer parameter.  No synonyms.
- * - 'verbose|v-i'  this means '--verbose' or '-v' are synonyms, and
- *   they take an optional integer parameter.
- * - 'help|h'  this means '--help' or '-h' are synonyms, and
- *   they take no parameter.
- *
- * The values in the associative array are strings that are used as
- * brief descriptions of the options when printing a usage message.
- *
- * The simpler format for specifying options used by PHP's getopt()
- * function is also supported.  This is similar to GNU getopt and shell
- * getopt format.
- *
- * Example:  'abc:' means options '-a', '-b', and '-c'
- * are legal, and the latter requires a string parameter.
- *
- * @category   Zend
- * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    Release: @package_version@
- * @since      Class available since Release 0.6.0
- *
- * @todo  Handle params with multiple values, e.g. --colors=red,green,blue
- *        Set value of parameter to the array of values.  Allow user to specify
- *        the separator with Zend_Console_Getopt::CONFIG_PARAMETER_SEPARATOR.
- *        If this config value is null or empty string, do not split values
- *        into arrays.  Default separator is comma (',').
- *
- * @todo  Handle params with multiple values specified with separate options
- *        e.g. --colors red --colors green --colors blue should give one
- *        option with an array(red, green, blue).
- *        Enable with Zend_Console_Getopt::CONFIG_CUMULATIVE_PARAMETERS.
- *        Default is that subsequent options overwrite the parameter value.
- *
- * @todo  Handle flags occurring multiple times, e.g. -v -v -v
- *        Set value of the option's parameter to the integer count of instances
- *        instead of a boolean.
- *        Enable with Zend_Console_Getopt::CONFIG_CUMULATIVE_FLAGS.
- *        Default is that the value is simply boolean true regardless of
- *        how many instances of the flag appear.
- *
- * @todo  Handle flags that implicitly print usage message, e.g. --help
- *
- * @todo  Handle freeform options, e.g. --set-variable
- *        Enable with Zend_Console_Getopt::CONFIG_FREEFORM_FLAGS
- *        All flag-like syntax is recognized, no flag generates an exception.
- *
- * @todo  Handle numeric options, e.g. -1, -2, -3, -1000
- *        Enable with Zend_Console_Getopt::CONFIG_NUMERIC_FLAGS
- *        The rule must specify a named flag and the '#' symbol as the
- *        parameter type. e.g.,  'lines=#'
- *
- * @todo  Enable user to specify header and footer content in the help message.
- *
- * @todo  Feature request to handle option interdependencies.
- *        e.g. if -b is specified, -a must be specified or else the
- *        usage is invalid.
- *
- * @todo  Feature request to implement callbacks.
- *        e.g. if -a is specified, run function 'handleOptionA'().
- */
-class Zend_Console_Getopt
-{
-
-    /**
-     * The options for a given application can be in multiple formats.
-     * modeGnu is for traditional 'ab:c:' style getopt format.
-     * modeZend is for a more structured format.
-     */
-    const MODE_ZEND                         = 'zend';
-    const MODE_GNU                          = 'gnu';
-
-    /**
-     * Constant tokens for various symbols used in the mode_zend
-     * rule format.
-     */
-    const PARAM_REQUIRED                    = '=';
-    const PARAM_OPTIONAL                    = '-';
-    const TYPE_STRING                       = 's';
-    const TYPE_WORD                         = 'w';
-    const TYPE_INTEGER                      = 'i';
-
-    /**
-     * These are constants for optional behavior of this class.
-     * ruleMode is either 'zend' or 'gnu' or a user-defined mode.
-     * dashDash is true if '--' signifies the end of command-line options.
-     * ignoreCase is true if '--opt' and '--OPT' are implicitly synonyms.
-     * parseAll is true if all options on the command line should be parsed, regardless of
-     * whether an argument appears before them.
-     */
-    const CONFIG_RULEMODE                   = 'ruleMode';
-    const CONFIG_DASHDASH                   = 'dashDash';
-    const CONFIG_IGNORECASE                 = 'ignoreCase';
-    const CONFIG_PARSEALL                   = 'parseAll';
-
-    /**
-     * Defaults for getopt configuration are:
-     * ruleMode is 'zend' format,
-     * dashDash (--) token is enabled,
-     * ignoreCase is not enabled,
-     * parseAll is enabled.
-     */
-    protected $_getoptConfig = array(
-        self::CONFIG_RULEMODE   => self::MODE_ZEND,
-        self::CONFIG_DASHDASH   => true,
-        self::CONFIG_IGNORECASE => false,
-        self::CONFIG_PARSEALL   => true,
-    );
-
-    /**
-     * Stores the command-line arguments for the calling applicaion.
-     *
-     * @var array
-     */
-    protected $_argv = array();
-
-    /**
-     * Stores the name of the calling applicaion.
-     *
-     * @var string
-     */
-    protected $_progname = '';
-
-    /**
-     * Stores the list of legal options for this application.
-     *
-     * @var array
-     */
-    protected $_rules = array();
-
-    /**
-     * Stores alternate spellings of legal options.
-     *
-     * @var array
-     */
-    protected $_ruleMap = array();
-
-    /**
-     * Stores options given by the user in the current invocation
-     * of the application, as well as parameters given in options.
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Stores the command-line arguments other than options.
-     *
-     * @var array
-     */
-    protected $_remainingArgs = array();
-
-    /**
-     * State of the options: parsed or not yet parsed?
-     *
-     * @var boolean
-     */
-    protected $_parsed = false;
-
-    /**
-     * The constructor takes one to three parameters.
-     *
-     * The first parameter is $rules, which may be a string for
-     * gnu-style format, or a structured array for Zend-style format.
-     *
-     * The second parameter is $argv, and it is optional.  If not
-     * specified, $argv is inferred from the global argv.
-     *
-     * The third parameter is an array of configuration parameters
-     * to control the behavior of this instance of Getopt; it is optional.
-     *
-     * @param  array $rules
-     * @param  array $argv
-     * @param  array $getoptConfig
-     * @return void
-     */
-    public function __construct($rules, $argv = null, $getoptConfig = array())
-    {
-        if (!isset($_SERVER['argv'])) {
-            require_once 'Zend/Console/Getopt/Exception.php';
-            if (ini_get('register_argc_argv') == false) {
-                throw new Zend_Console_Getopt_Exception(
-                    "argv is not available, because ini option 'register_argc_argv' is set Off"
-                );
-            } else {
-                throw new Zend_Console_Getopt_Exception(
-                    '$_SERVER["argv"] is not set, but Zend_Console_Getopt cannot work without this information.'
-                );
-            }
-        }
-
-        $this->_progname = $_SERVER['argv'][0];
-        $this->setOptions($getoptConfig);
-        $this->addRules($rules);
-        if (!is_array($argv)) {
-            $argv = array_slice($_SERVER['argv'], 1);
-        }
-        if (isset($argv)) {
-            $this->addArguments((array)$argv);
-        }
-    }
-
-    /**
-     * Return the state of the option seen on the command line of the
-     * current application invocation.  This function returns true, or the
-     * parameter to the option, if any.  If the option was not given,
-     * this function returns null.
-     *
-     * The magic __get method works in the context of naming the option
-     * as a virtual member of this class.
-     *
-     * @param  string $key
-     * @return string
-     */
-    public function __get($key)
-    {
-        return $this->getOption($key);
-    }
-
-    /**
-     * Test whether a given option has been seen.
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        $this->parse();
-        if (isset($this->_ruleMap[$key])) {
-            $key = $this->_ruleMap[$key];
-            return isset($this->_options[$key]);
-        }
-        return false;
-    }
-
-    /**
-     * Set the value for a given option.
-     *
-     * @param  string $key
-     * @param  string $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this->parse();
-        if (isset($this->_ruleMap[$key])) {
-            $key = $this->_ruleMap[$key];
-            $this->_options[$key] = $value;
-        }
-    }
-
-    /**
-     * Return the current set of options and parameters seen as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Unset an option.
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        $this->parse();
-        if (isset($this->_ruleMap[$key])) {
-            $key = $this->_ruleMap[$key];
-            unset($this->_options[$key]);
-        }
-    }
-
-    /**
-     * Define additional command-line arguments.
-     * These are appended to those defined when the constructor was called.
-     *
-     * @param  array $argv
-     * @throws Zend_Console_Getopt_Exception When not given an array as parameter
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function addArguments($argv)
-    {
-        if(!is_array($argv)) {
-            require_once 'Zend/Console/Getopt/Exception.php';
-            throw new Zend_Console_Getopt_Exception(
-                "Parameter #1 to addArguments should be an array");
-        }
-        $this->_argv = array_merge($this->_argv, $argv);
-        $this->_parsed = false;
-        return $this;
-    }
-
-    /**
-     * Define full set of command-line arguments.
-     * These replace any currently defined.
-     *
-     * @param  array $argv
-     * @throws Zend_Console_Getopt_Exception When not given an array as parameter
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function setArguments($argv)
-    {
-        if(!is_array($argv)) {
-            require_once 'Zend/Console/Getopt/Exception.php';
-            throw new Zend_Console_Getopt_Exception(
-                "Parameter #1 to setArguments should be an array");
-        }
-        $this->_argv = $argv;
-        $this->_parsed = false;
-        return $this;
-    }
-
-    /**
-     * Define multiple configuration options from an associative array.
-     * These are not program options, but properties to configure
-     * the behavior of Zend_Console_Getopt.
-     *
-     * @param  array $getoptConfig
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function setOptions($getoptConfig)
-    {
-        if (isset($getoptConfig)) {
-            foreach ($getoptConfig as $key => $value) {
-                $this->setOption($key, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Define one configuration option as a key/value pair.
-     * These are not program options, but properties to configure
-     * the behavior of Zend_Console_Getopt.
-     *
-     * @param  string $configKey
-     * @param  string $configValue
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function setOption($configKey, $configValue)
-    {
-        if ($configKey !== null) {
-            $this->_getoptConfig[$configKey] = $configValue;
-        }
-        return $this;
-    }
-
-    /**
-     * Define additional option rules.
-     * These are appended to the rules defined when the constructor was called.
-     *
-     * @param  array $rules
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function addRules($rules)
-    {
-        $ruleMode = $this->_getoptConfig['ruleMode'];
-        switch ($this->_getoptConfig['ruleMode']) {
-            case self::MODE_ZEND:
-                if (is_array($rules)) {
-                    $this->_addRulesModeZend($rules);
-                    break;
-                }
-                // intentional fallthrough
-            case self::MODE_GNU:
-                $this->_addRulesModeGnu($rules);
-                break;
-            default:
-                /**
-                 * Call addRulesModeFoo() for ruleMode 'foo'.
-                 * The developer should subclass Getopt and
-                 * provide this method.
-                 */
-                $method = '_addRulesMode' . ucfirst($ruleMode);
-                $this->$method($rules);
-        }
-        $this->_parsed = false;
-        return $this;
-    }
-
-    /**
-     * Return the current set of options and parameters seen as a string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $this->parse();
-        $s = array();
-        foreach ($this->_options as $flag => $value) {
-            $s[] = $flag . '=' . ($value === true ? 'true' : $value);
-        }
-        return implode(' ', $s);
-    }
-
-    /**
-     * Return the current set of options and parameters seen
-     * as an array of canonical options and parameters.
-     *
-     * Clusters have been expanded, and option aliases
-     * have been mapped to their primary option names.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $this->parse();
-        $s = array();
-        foreach ($this->_options as $flag => $value) {
-            $s[] = $flag;
-            if ($value !== true) {
-                $s[] = $value;
-            }
-        }
-        return $s;
-    }
-
-    /**
-     * Return the current set of options and parameters seen in Json format.
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $this->parse();
-        $j = array();
-        foreach ($this->_options as $flag => $value) {
-            $j['options'][] = array(
-                'option' => array(
-                    'flag' => $flag,
-                    'parameter' => $value
-                )
-            );
-        }
-
-        /**
-         * @see Zend_Json
-         */
-        require_once 'Zend/Json.php';
-        $json = Zend_Json::encode($j);
-
-        return $json;
-    }
-
-    /**
-     * Return the current set of options and parameters seen in XML format.
-     *
-     * @return string
-     */
-    public function toXml()
-    {
-        $this->parse();
-        $doc = new DomDocument('1.0', 'utf-8');
-        $optionsNode = $doc->createElement('options');
-        $doc->appendChild($optionsNode);
-        foreach ($this->_options as $flag => $value) {
-            $optionNode = $doc->createElement('option');
-            $optionNode->setAttribute('flag', utf8_encode($flag));
-            if ($value !== true) {
-                $optionNode->setAttribute('parameter', utf8_encode($value));
-            }
-            $optionsNode->appendChild($optionNode);
-        }
-        $xml = $doc->saveXML();
-        return $xml;
-    }
-
-    /**
-     * Return a list of options that have been seen in the current argv.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        $this->parse();
-        return array_keys($this->_options);
-    }
-
-    /**
-     * Return the state of the option seen on the command line of the
-     * current application invocation.
-     *
-     * This function returns true, or the parameter value to the option, if any.
-     * If the option was not given, this function returns false.
-     *
-     * @param  string $flag
-     * @return mixed
-     */
-    public function getOption($flag)
-    {
-        $this->parse();
-        if ($this->_getoptConfig[self::CONFIG_IGNORECASE]) {
-            $flag = strtolower($flag);
-        }
-        if (isset($this->_ruleMap[$flag])) {
-            $flag = $this->_ruleMap[$flag];
-            if (isset($this->_options[$flag])) {
-                return $this->_options[$flag];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return the arguments from the command-line following all options found.
-     *
-     * @return array
-     */
-    public function getRemainingArgs()
-    {
-        $this->parse();
-        return $this->_remainingArgs;
-    }
-
-    /**
-     * Return a useful option reference, formatted for display in an
-     * error message.
-     *
-     * Note that this usage information is provided in most Exceptions
-     * generated by this class.
-     *
-     * @return string
-     */
-    public function getUsageMessage()
-    {
-        $usage = "Usage: {$this->_progname} [ options ]\n";
-        $maxLen = 20;
-        foreach ($this->_rules as $rule) {
-            $flags = array();
-            if (is_array($rule['alias'])) {
-                foreach ($rule['alias'] as $flag) {
-                    $flags[] = (strlen($flag) == 1 ? '-' : '--') . $flag;
-                }
-            }
-            $linepart['name'] = implode('|', $flags);
-            if (isset($rule['param']) && $rule['param'] != 'none') {
-                $linepart['name'] .= ' ';
-                switch ($rule['param']) {
-                    case 'optional':
-                        $linepart['name'] .= "[ <{$rule['paramType']}> ]";
-                        break;
-                    case 'required':
-                        $linepart['name'] .= "<{$rule['paramType']}>";
-                        break;
-                }
-            }
-            if (strlen($linepart['name']) > $maxLen) {
-                $maxLen = strlen($linepart['name']);
-            }
-            $linepart['help'] = '';
-            if (isset($rule['help'])) {
-                $linepart['help'] .= $rule['help'];
-            }
-            $lines[] = $linepart;
-        }
-        foreach ($lines as $linepart) {
-            $usage .= sprintf("%s %s\n",
-            str_pad($linepart['name'], $maxLen),
-            $linepart['help']);
-        }
-        return $usage;
-    }
-
-    /**
-     * Define aliases for options.
-     *
-     * The parameter $aliasMap is an associative array
-     * mapping option name (short or long) to an alias.
-     *
-     * @param  array $aliasMap
-     * @throws Zend_Console_Getopt_Exception
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function setAliases($aliasMap)
-    {
-        foreach ($aliasMap as $flag => $alias)
-        {
-            if ($this->_getoptConfig[self::CONFIG_IGNORECASE]) {
-                $flag = strtolower($flag);
-                $alias = strtolower($alias);
-            }
-            if (!isset($this->_ruleMap[$flag])) {
-                continue;
-            }
-            $flag = $this->_ruleMap[$flag];
-            if (isset($this->_rules[$alias]) || isset($this->_ruleMap[$alias])) {
-                $o = (strlen($alias) == 1 ? '-' : '--') . $alias;
-                require_once 'Zend/Console/Getopt/Exception.php';
-                throw new Zend_Console_Getopt_Exception(
-                    "Option \"$o\" is being defined more than once.");
-            }
-            $this->_rules[$flag]['alias'][] = $alias;
-            $this->_ruleMap[$alias] = $flag;
-        }
-        return $this;
-    }
-
-    /**
-     * Define help messages for options.
-     *
-     * The parameter $help_map is an associative array
-     * mapping option name (short or long) to the help string.
-     *
-     * @param  array $helpMap
-     * @return Zend_Console_Getopt Provides a fluent interface
-     */
-    public function setHelp($helpMap)
-    {
-        foreach ($helpMap as $flag => $help)
-        {
-            if (!isset($this->_ruleMap[$flag])) {
-                continue;
-            }
-            $flag = $this->_ruleMap[$flag];
-            $this->_rules[$flag]['help'] = $help;
-        }
-        return $this;
-    }
-
-    /**
-     * Parse command-line arguments and find both long and short
-     * options.
-     *
-     * Also find option parameters, and remaining arguments after
-     * all options have been parsed.
-     *
-     * @return Zend_Console_Getopt|null Provides a fluent interface
-     */
-    public function parse()
-    {
-        if ($this->_parsed === true) {
-            return;
-        }
-        $argv = $this->_argv;
-        $this->_options = array();
-        $this->_remainingArgs = array();
-        while (count($argv) > 0) {
-            if ($argv[0] == '--') {
-                array_shift($argv);
-                if ($this->_getoptConfig[self::CONFIG_DASHDASH]) {
-                    $this->_remainingArgs = array_merge($this->_remainingArgs, $argv);
-                    break;
-                }
-            }
-            if (substr($argv[0], 0, 2) == '--') {
-                $this->_parseLongOption($argv);
-            } else if (substr($argv[0], 0, 1) == '-' && ('-' != $argv[0] || count($argv) >1))  {
-                $this->_parseShortOptionCluster($argv);
-            } else if($this->_getoptConfig[self::CONFIG_PARSEALL]) {
-                $this->_remainingArgs[] = array_shift($argv);
-            } else {
-                /*
-                 * We should put all other arguments in _remainingArgs and stop parsing
-                 * since CONFIG_PARSEALL is false.
-                 */
-                $this->_remainingArgs = array_merge($this->_remainingArgs, $argv);
-                break;
-            }
-        }
-        $this->_parsed = true;
-        return $this;
-    }
-
-    /**
-     * Parse command-line arguments for a single long option.
-     * A long option is preceded by a double '--' character.
-     * Long options may not be clustered.
-     *
-     * @param  mixed &$argv
-     * @return void
-     */
-    protected function _parseLongOption(&$argv)
-    {
-        $optionWithParam = ltrim(array_shift($argv), '-');
-        $l = explode('=', $optionWithParam, 2);
-        $flag = array_shift($l);
-        $param = array_shift($l);
-        if (isset($param)) {
-            array_unshift($argv, $param);
-        }
-        $this->_parseSingleOption($flag, $argv);
-    }
-
-    /**
-     * Parse command-line arguments for short options.
-     * Short options are those preceded by a single '-' character.
-     * Short options may be clustered.
-     *
-     * @param  mixed &$argv
-     * @return void
-     */
-    protected function _parseShortOptionCluster(&$argv)
-    {
-        $flagCluster = ltrim(array_shift($argv), '-');
-        foreach (str_split($flagCluster) as $flag) {
-            $this->_parseSingleOption($flag, $argv);
-        }
-    }
-
-    /**
-     * Parse command-line arguments for a single option.
-     *
-     * @param  string $flag
-     * @param  mixed  $argv
-     * @throws Zend_Console_Getopt_Exception
-     * @return void
-     */
-    protected function _parseSingleOption($flag, &$argv)
-    {
-        if ($this->_getoptConfig[self::CONFIG_IGNORECASE]) {
-            $flag = strtolower($flag);
-        }
-        if (!isset($this->_ruleMap[$flag])) {
-            require_once 'Zend/Console/Getopt/Exception.php';
-            throw new Zend_Console_Getopt_Exception(
-                "Option \"$flag\" is not recognized.",
-                $this->getUsageMessage());
-        }
-        $realFlag = $this->_ruleMap[$flag];
-        switch ($this->_rules[$realFlag]['param']) {
-            case 'required':
-                if (count($argv) > 0) {
-                    $param = array_shift($argv);
-                    $this->_checkParameterType($realFlag, $param);
-                } else {
-                    require_once 'Zend/Console/Getopt/Exception.php';
-                    throw new Zend_Console_Getopt_Exception(
-                        "Option \"$flag\" requires a parameter.",
-                        $this->getUsageMessage());
-                }
-                break;
-            case 'optional':
-                if (count($argv) > 0 && substr($argv[0], 0, 1) != '-') {
-                    $param = array_shift($argv);
-                    $this->_checkParameterType($realFlag, $param);
-                } else {
-                    $param = true;
-                }
-                break;
-            default:
-                $param = true;
-        }
-        $this->_options[$realFlag] = $param;
-    }
-
-    /**
-     * Return true if the parameter is in a valid format for
-     * the option $flag.
-     * Throw an exception in most other cases.
-     *
-     * @param  string $flag
-     * @param  string $param
-     * @throws Zend_Console_Getopt_Exception
-     * @return bool
-     */
-    protected function _checkParameterType($flag, $param)
-    {
-        $type = 'string';
-        if (isset($this->_rules[$flag]['paramType'])) {
-            $type = $this->_rules[$flag]['paramType'];
-        }
-        switch ($type) {
-            case 'word':
-                if (preg_match('/\W/', $param)) {
-                    require_once 'Zend/Console/Getopt/Exception.php';
-                    throw new Zend_Console_Getopt_Exception(
-                        "Option \"$flag\" requires a single-word parameter, but was given \"$param\".",
-                        $this->getUsageMessage());
-                }
-                break;
-            case 'integer':
-                if (preg_match('/\D/', $param)) {
-                    require_once 'Zend/Console/Getopt/Exception.php';
-                    throw new Zend_Console_Getopt_Exception(
-                        "Option \"$flag\" requires an integer parameter, but was given \"$param\".",
-                        $this->getUsageMessage());
-                }
-                break;
-            case 'string':
-            default:
-                break;
-        }
-        return true;
-    }
-
-    /**
-     * Define legal options using the gnu-style format.
-     *
-     * @param  string $rules
-     * @return void
-     */
-    protected function _addRulesModeGnu($rules)
-    {
-        $ruleArray = array();
-
-        /**
-         * Options may be single alphanumeric characters.
-         * Options may have a ':' which indicates a required string parameter.
-         * No long options or option aliases are supported in GNU style.
-         */
-        preg_match_all('/([a-zA-Z0-9]:?)/', $rules, $ruleArray);
-        foreach ($ruleArray[1] as $rule) {
-            $r = array();
-            $flag = substr($rule, 0, 1);
-            if ($this->_getoptConfig[self::CONFIG_IGNORECASE]) {
-                $flag = strtolower($flag);
-            }
-            $r['alias'][] = $flag;
-            if (substr($rule, 1, 1) == ':') {
-                $r['param'] = 'required';
-                $r['paramType'] = 'string';
-            } else {
-                $r['param'] = 'none';
-            }
-            $this->_rules[$flag] = $r;
-            $this->_ruleMap[$flag] = $flag;
-        }
-    }
-
-    /**
-     * Define legal options using the Zend-style format.
-     *
-     * @param  array $rules
-     * @throws Zend_Console_Getopt_Exception
-     * @return void
-     */
-    protected function _addRulesModeZend($rules)
-    {
-        foreach ($rules as $ruleCode => $helpMessage)
-        {
-            // this may have to translate the long parm type if there
-            // are any complaints that =string will not work (even though that use
-            // case is not documented)
-            if (in_array(substr($ruleCode, -2, 1), array('-', '='))) {
-                $flagList  = substr($ruleCode, 0, -2);
-                $delimiter = substr($ruleCode, -2, 1);
-                $paramType = substr($ruleCode, -1);
-            } else {
-                $flagList = $ruleCode;
-                $delimiter = $paramType = null;
-            }
-            if ($this->_getoptConfig[self::CONFIG_IGNORECASE]) {
-                $flagList = strtolower($flagList);
-            }
-            $flags = explode('|', $flagList);
-            $rule = array();
-            $mainFlag = $flags[0];
-            foreach ($flags as $flag) {
-                if (empty($flag)) {
-                    require_once 'Zend/Console/Getopt/Exception.php';
-                    throw new Zend_Console_Getopt_Exception(
-                        "Blank flag not allowed in rule \"$ruleCode\".");
-                }
-                if (strlen($flag) == 1) {
-                    if (isset($this->_ruleMap[$flag])) {
-                        require_once 'Zend/Console/Getopt/Exception.php';
-                        throw new Zend_Console_Getopt_Exception(
-                            "Option \"-$flag\" is being defined more than once.");
-                    }
-                    $this->_ruleMap[$flag] = $mainFlag;
-                    $rule['alias'][] = $flag;
-                } else {
-                    if (isset($this->_rules[$flag]) || isset($this->_ruleMap[$flag])) {
-                        require_once 'Zend/Console/Getopt/Exception.php';
-                        throw new Zend_Console_Getopt_Exception(
-                            "Option \"--$flag\" is being defined more than once.");
-                    }
-                    $this->_ruleMap[$flag] = $mainFlag;
-                    $rule['alias'][] = $flag;
-                }
-            }
-            if (isset($delimiter)) {
-                switch ($delimiter) {
-                    case self::PARAM_REQUIRED:
-                        $rule['param'] = 'required';
-                        break;
-                    case self::PARAM_OPTIONAL:
-                    default:
-                        $rule['param'] = 'optional';
-                }
-                switch (substr($paramType, 0, 1)) {
-                    case self::TYPE_WORD:
-                        $rule['paramType'] = 'word';
-                        break;
-                    case self::TYPE_INTEGER:
-                        $rule['paramType'] = 'integer';
-                        break;
-                    case self::TYPE_STRING:
-                    default:
-                        $rule['paramType'] = 'string';
-                }
-            } else {
-                $rule['param'] = 'none';
-            }
-            $rule['help'] = $helpMessage;
-            $this->_rules[$mainFlag] = $rule;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Console/Getopt/Exception.php b/airtime_mvc/library/Zend/Console/Getopt/Exception.php
deleted file mode 100644
index b323d1fac..000000000
--- a/airtime_mvc/library/Zend/Console/Getopt/Exception.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Console_Getopt_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Console_Getopt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Console_Getopt_Exception extends Zend_Exception
-{
-    /**
-     * Usage
-     *
-     * @var string
-     */
-    protected $usage = '';
-
-    /**
-     * Constructor
-     *
-     * @param string $message
-     * @param string $usage
-     * @return void
-     */
-    public function __construct($message, $usage = '')
-    {
-        $this->usage = $usage;
-        parent::__construct($message);
-    }
-
-    /**
-     * Returns the usage
-     *
-     * @return string
-     */
-    public function getUsageMessage()
-    {
-        return $this->usage;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action.php b/airtime_mvc/library/Zend/Controller/Action.php
deleted file mode 100644
index 562598236..000000000
--- a/airtime_mvc/library/Zend/Controller/Action.php
+++ /dev/null
@@ -1,688 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Action.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_HelperBroker
- */
-require_once 'Zend/Controller/Action/HelperBroker.php';
-
-/**
- * @see Zend_Controller_Action_Interface
- */
-require_once 'Zend/Controller/Action/Interface.php';
-
-/**
- * @see Zend_Controller_Front
- */
-require_once 'Zend/Controller/Front.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface
-{
-    /**
-     * @var array of existing class methods
-     */
-    protected $_classMethods;
-
-    /**
-     * Word delimiters (used for normalizing view script paths)
-     * @var array
-     */
-    protected $_delimiters;
-
-    /**
-     * Array of arguments provided to the constructor, minus the
-     * {@link $_request Request object}.
-     * @var array
-     */
-    protected $_invokeArgs = array();
-
-    /**
-     * Front controller instance
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
-     * Zend_Controller_Request_Abstract object wrapping the request environment
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request = null;
-
-    /**
-     * Zend_Controller_Response_Abstract object wrapping the response
-     * @var Zend_Controller_Response_Abstract
-     */
-    protected $_response = null;
-
-    /**
-     * View script suffix; defaults to 'phtml'
-     * @see {render()}
-     * @var string
-     */
-    public $viewSuffix = 'phtml';
-
-    /**
-     * View object
-     * @var Zend_View_Interface
-     */
-    public $view;
-
-    /**
-     * Helper Broker to assist in routing help requests to the proper object
-     *
-     * @var Zend_Controller_Action_HelperBroker
-     */
-    protected $_helper = null;
-
-    /**
-     * Class constructor
-     *
-     * The request and response objects should be registered with the
-     * controller, as should be any additional optional arguments; these will be
-     * available via {@link getRequest()}, {@link getResponse()}, and
-     * {@link getInvokeArgs()}, respectively.
-     *
-     * When overriding the constructor, please consider this usage as a best
-     * practice and ensure that each is registered appropriately; the easiest
-     * way to do so is to simply call parent::__construct($request, $response,
-     * $invokeArgs).
-     *
-     * After the request, response, and invokeArgs are set, the
-     * {@link $_helper helper broker} is initialized.
-     *
-     * Finally, {@link init()} is called as the final action of
-     * instantiation, and may be safely overridden to perform initialization
-     * tasks; as a general rule, override {@link init()} instead of the
-     * constructor to customize an action controller's instantiation.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @param Zend_Controller_Response_Abstract $response
-     * @param array $invokeArgs Any additional invocation arguments
-     * @return void
-     */
-    public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
-    {
-        $this->setRequest($request)
-             ->setResponse($response)
-             ->_setInvokeArgs($invokeArgs);
-        $this->_helper = new Zend_Controller_Action_HelperBroker($this);
-        $this->init();
-    }
-
-    /**
-     * Initialize object
-     *
-     * Called from {@link __construct()} as final step of object instantiation.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Initialize View object
-     *
-     * Initializes {@link $view} if not otherwise a Zend_View_Interface.
-     *
-     * If {@link $view} is not otherwise set, instantiates a new Zend_View
-     * object, using the 'views' subdirectory at the same level as the
-     * controller directory for the current module as the base directory.
-     * It uses this to set the following:
-     * - script path = views/scripts/
-     * - helper path = views/helpers/
-     * - filter path = views/filters/
-     *
-     * @return Zend_View_Interface
-     * @throws Zend_Controller_Exception if base view directory does not exist
-     */
-    public function initView()
-    {
-        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
-            return $this->view;
-        }
-
-        require_once 'Zend/View/Interface.php';
-        if (isset($this->view) && ($this->view instanceof Zend_View_Interface)) {
-            return $this->view;
-        }
-
-        $request = $this->getRequest();
-        $module  = $request->getModuleName();
-        $dirs    = $this->getFrontController()->getControllerDirectory();
-        if (empty($module) || !isset($dirs[$module])) {
-            $module = $this->getFrontController()->getDispatcher()->getDefaultModule();
-        }
-        $baseDir = dirname($dirs[$module]) . DIRECTORY_SEPARATOR . 'views';
-        if (!file_exists($baseDir) || !is_dir($baseDir)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Missing base view directory ("' . $baseDir . '")');
-        }
-
-        require_once 'Zend/View.php';
-        $this->view = new Zend_View(array('basePath' => $baseDir));
-
-        return $this->view;
-    }
-
-    /**
-     * Render a view
-     *
-     * Renders a view. By default, views are found in the view script path as
-     * <controller>/<action>.phtml. You may change the script suffix by
-     * resetting {@link $viewSuffix}. You may omit the controller directory
-     * prefix by specifying boolean true for $noController.
-     *
-     * By default, the rendered contents are appended to the response. You may
-     * specify the named body content segment to set by specifying a $name.
-     *
-     * @see Zend_Controller_Response_Abstract::appendBody()
-     * @param  string|null $action Defaults to action registered in request object
-     * @param  string|null $name Response object named path segment to use; defaults to null
-     * @param  bool $noController  Defaults to false; i.e. use controller name as subdir in which to search for view script
-     * @return void
-     */
-    public function render($action = null, $name = null, $noController = false)
-    {
-        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
-            return $this->_helper->viewRenderer->render($action, $name, $noController);
-        }
-
-        $view   = $this->initView();
-        $script = $this->getViewScript($action, $noController);
-
-        $this->getResponse()->appendBody(
-            $view->render($script),
-            $name
-        );
-    }
-
-    /**
-     * Render a given view script
-     *
-     * Similar to {@link render()}, this method renders a view script. Unlike render(),
-     * however, it does not autodetermine the view script via {@link getViewScript()},
-     * but instead renders the script passed to it. Use this if you know the
-     * exact view script name and path you wish to use, or if using paths that do not
-     * conform to the spec defined with getViewScript().
-     *
-     * By default, the rendered contents are appended to the response. You may
-     * specify the named body content segment to set by specifying a $name.
-     *
-     * @param  string $script
-     * @param  string $name
-     * @return void
-     */
-    public function renderScript($script, $name = null)
-    {
-        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
-            return $this->_helper->viewRenderer->renderScript($script, $name);
-        }
-
-        $view = $this->initView();
-        $this->getResponse()->appendBody(
-            $view->render($script),
-            $name
-        );
-    }
-
-    /**
-     * Construct view script path
-     *
-     * Used by render() to determine the path to the view script.
-     *
-     * @param  string $action Defaults to action registered in request object
-     * @param  bool $noController  Defaults to false; i.e. use controller name as subdir in which to search for view script
-     * @return string
-     * @throws Zend_Controller_Exception with bad $action
-     */
-    public function getViewScript($action = null, $noController = null)
-    {
-        if (!$this->getInvokeArg('noViewRenderer') && $this->_helper->hasHelper('viewRenderer')) {
-            $viewRenderer = $this->_helper->getHelper('viewRenderer');
-            if (null !== $noController) {
-                $viewRenderer->setNoController($noController);
-            }
-            return $viewRenderer->getViewScript($action);
-        }
-
-        $request = $this->getRequest();
-        if (null === $action) {
-            $action = $request->getActionName();
-        } elseif (!is_string($action)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid action specifier for view render');
-        }
-
-        if (null === $this->_delimiters) {
-            $dispatcher = Zend_Controller_Front::getInstance()->getDispatcher();
-            $wordDelimiters = $dispatcher->getWordDelimiter();
-            $pathDelimiters = $dispatcher->getPathDelimiter();
-            $this->_delimiters = array_unique(array_merge($wordDelimiters, (array) $pathDelimiters));
-        }
-
-        $action = str_replace($this->_delimiters, '-', $action);
-        $script = $action . '.' . $this->viewSuffix;
-
-        if (!$noController) {
-            $controller = $request->getControllerName();
-            $controller = str_replace($this->_delimiters, '-', $controller);
-            $script = $controller . DIRECTORY_SEPARATOR . $script;
-        }
-
-        return $script;
-    }
-
-    /**
-     * Return the Request object
-     *
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set the Request object
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return Zend_Controller_Action
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * Return the Response object
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Set the Response object
-     *
-     * @param Zend_Controller_Response_Abstract $response
-     * @return Zend_Controller_Action
-     */
-    public function setResponse(Zend_Controller_Response_Abstract $response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Set invocation arguments
-     *
-     * @param array $args
-     * @return Zend_Controller_Action
-     */
-    protected function _setInvokeArgs(array $args = array())
-    {
-        $this->_invokeArgs = $args;
-        return $this;
-    }
-
-    /**
-     * Return the array of constructor arguments (minus the Request object)
-     *
-     * @return array
-     */
-    public function getInvokeArgs()
-    {
-        return $this->_invokeArgs;
-    }
-
-    /**
-     * Return a single invocation argument
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function getInvokeArg($key)
-    {
-        if (isset($this->_invokeArgs[$key])) {
-            return $this->_invokeArgs[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get a helper by name
-     *
-     * @param  string $helperName
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function getHelper($helperName)
-    {
-        return $this->_helper->{$helperName};
-    }
-
-    /**
-     * Get a clone of a helper by name
-     *
-     * @param  string $helperName
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function getHelperCopy($helperName)
-    {
-        return clone $this->_helper->{$helperName};
-    }
-
-    /**
-     * Set the front controller instance
-     *
-     * @param Zend_Controller_Front $front
-     * @return Zend_Controller_Action
-     */
-    public function setFrontController(Zend_Controller_Front $front)
-    {
-        $this->_frontController = $front;
-        return $this;
-    }
-
-    /**
-     * Retrieve Front Controller
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        // Used cache version if found
-        if (null !== $this->_frontController) {
-            return $this->_frontController;
-        }
-
-        // Grab singleton instance, if class has been loaded
-        if (class_exists('Zend_Controller_Front')) {
-            $this->_frontController = Zend_Controller_Front::getInstance();
-            return $this->_frontController;
-        }
-
-        // Throw exception in all other cases
-        require_once 'Zend/Controller/Exception.php';
-        throw new Zend_Controller_Exception('Front controller class has not been loaded');
-    }
-
-    /**
-     * Pre-dispatch routines
-     *
-     * Called before action method. If using class with
-     * {@link Zend_Controller_Front}, it may modify the
-     * {@link $_request Request object} and reset its dispatched flag in order
-     * to skip processing the current action.
-     *
-     * @return void
-     */
-    public function preDispatch()
-    {
-    }
-
-    /**
-     * Post-dispatch routines
-     *
-     * Called after action method execution. If using class with
-     * {@link Zend_Controller_Front}, it may modify the
-     * {@link $_request Request object} and reset its dispatched flag in order
-     * to process an additional action.
-     *
-     * Common usages for postDispatch() include rendering content in a sitewide
-     * template, link url correction, setting headers, etc.
-     *
-     * @return void
-     */
-    public function postDispatch()
-    {
-    }
-
-    /**
-     * Proxy for undefined methods.  Default behavior is to throw an
-     * exception on undefined methods, however this function can be
-     * overridden to implement magic (dynamic) actions, or provide run-time
-     * dispatching.
-     *
-     * @param  string $methodName
-     * @param  array $args
-     * @return void
-     * @throws Zend_Controller_Action_Exception
-     */
-    public function __call($methodName, $args)
-    {
-        require_once 'Zend/Controller/Action/Exception.php';
-        if ('Action' == substr($methodName, -6)) {
-            $action = substr($methodName, 0, strlen($methodName) - 6);
-            throw new Zend_Controller_Action_Exception(sprintf('Action "%s" does not exist and was not trapped in __call()', $action), 404);
-        }
-
-        throw new Zend_Controller_Action_Exception(sprintf('Method "%s" does not exist and was not trapped in __call()', $methodName), 500);
-    }
-
-    /**
-     * Dispatch the requested action
-     *
-     * @param string $action Method name of action
-     * @return void
-     */
-    public function dispatch($action)
-    {
-        // Notify helpers of action preDispatch state
-        $this->_helper->notifyPreDispatch();
-
-        $this->preDispatch();
-        if ($this->getRequest()->isDispatched()) {
-            if (null === $this->_classMethods) {
-                $this->_classMethods = get_class_methods($this);
-            }
-
-            // preDispatch() didn't change the action, so we can continue
-            if ($this->getInvokeArg('useCaseSensitiveActions') || in_array($action, $this->_classMethods)) {
-                if ($this->getInvokeArg('useCaseSensitiveActions')) {
-                    trigger_error('Using case sensitive actions without word separators is deprecated; please do not rely on this "feature"');
-                }
-                $this->$action();
-            } else {
-                $this->__call($action, array());
-            }
-            $this->postDispatch();
-        }
-
-        // whats actually important here is that this action controller is
-        // shutting down, regardless of dispatching; notify the helpers of this
-        // state
-        $this->_helper->notifyPostDispatch();
-    }
-
-    /**
-     * Call the action specified in the request object, and return a response
-     *
-     * Not used in the Action Controller implementation, but left for usage in
-     * Page Controller implementations. Dispatches a method based on the
-     * request.
-     *
-     * Returns a Zend_Controller_Response_Abstract object, instantiating one
-     * prior to execution if none exists in the controller.
-     *
-     * {@link preDispatch()} is called prior to the action,
-     * {@link postDispatch()} is called following it.
-     *
-     * @param null|Zend_Controller_Request_Abstract $request Optional request
-     * object to use
-     * @param null|Zend_Controller_Response_Abstract $response Optional response
-     * object to use
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function run(Zend_Controller_Request_Abstract $request = null, Zend_Controller_Response_Abstract $response = null)
-    {
-        if (null !== $request) {
-            $this->setRequest($request);
-        } else {
-            $request = $this->getRequest();
-        }
-
-        if (null !== $response) {
-            $this->setResponse($response);
-        }
-
-        $action = $request->getActionName();
-        if (empty($action)) {
-            $action = 'index';
-        }
-        $action = $action . 'Action';
-
-        $request->setDispatched(true);
-        $this->dispatch($action);
-
-        return $this->getResponse();
-    }
-
-    /**
-     * Gets a parameter from the {@link $_request Request object}.  If the
-     * parameter does not exist, NULL will be returned.
-     *
-     * If the parameter does not exist and $default is set, then
-     * $default will be returned instead of NULL.
-     *
-     * @param string $paramName
-     * @param mixed $default
-     * @return mixed
-     */
-    protected function _getParam($paramName, $default = null)
-    {
-        $value = $this->getRequest()->getParam($paramName);
-        if ((null === $value) && (null !== $default)) {
-            $value = $default;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Set a parameter in the {@link $_request Request object}.
-     *
-     * @param string $paramName
-     * @param mixed $value
-     * @return Zend_Controller_Action
-     */
-    protected function _setParam($paramName, $value)
-    {
-        $this->getRequest()->setParam($paramName, $value);
-
-        return $this;
-    }
-
-    /**
-     * Determine whether a given parameter exists in the
-     * {@link $_request Request object}.
-     *
-     * @param string $paramName
-     * @return boolean
-     */
-    protected function _hasParam($paramName)
-    {
-        return null !== $this->getRequest()->getParam($paramName);
-    }
-
-    /**
-     * Return all parameters in the {@link $_request Request object}
-     * as an associative array.
-     *
-     * @return array
-     */
-    protected function _getAllParams()
-    {
-        return $this->getRequest()->getParams();
-    }
-
-
-    /**
-     * Forward to another controller/action.
-     *
-     * It is important to supply the unformatted names, i.e. "article"
-     * rather than "ArticleController".  The dispatcher will do the
-     * appropriate formatting when the request is received.
-     *
-     * If only an action name is provided, forwards to that action in this
-     * controller.
-     *
-     * If an action and controller are specified, forwards to that action and
-     * controller in this module.
-     *
-     * Specifying an action, controller, and module is the most specific way to
-     * forward.
-     *
-     * A fourth argument, $params, will be used to set the request parameters.
-     * If either the controller or module are unnecessary for forwarding,
-     * simply pass null values for them before specifying the parameters.
-     *
-     * @param string $action
-     * @param string $controller
-     * @param string $module
-     * @param array $params
-     * @return void
-     */
-    final protected function _forward($action, $controller = null, $module = null, array $params = null)
-    {
-        $request = $this->getRequest();
-
-        if (null !== $params) {
-            $request->setParams($params);
-        }
-
-        if (null !== $controller) {
-            $request->setControllerName($controller);
-
-            // Module should only be reset if controller has been specified
-            if (null !== $module) {
-                $request->setModuleName($module);
-            }
-        }
-
-        $request->setActionName($action)
-                ->setDispatched(false);
-    }
-
-    /**
-     * Redirect to another URL
-     *
-     * Proxies to {@link Zend_Controller_Action_Helper_Redirector::gotoUrl()}.
-     *
-     * @param string $url
-     * @param array $options Options to be used when redirecting
-     * @return void
-     */
-    protected function _redirect($url, array $options = array())
-    {
-        $this->_helper->redirector->gotoUrl($url, $options);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Exception.php b/airtime_mvc/library/Zend/Controller/Action/Exception.php
deleted file mode 100644
index f7d0b579f..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Controller_Exception
- */
-require_once 'Zend/Controller/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Exception extends Zend_Controller_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/Abstract.php b/airtime_mvc/library/Zend/Controller/Action/Helper/Abstract.php
deleted file mode 100644
index 009f68b23..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/Abstract.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20261 2010-01-13 18:55:25Z matthew $
- */
-
-/**
- * @see Zend_Controller_Action
- */
-require_once 'Zend/Controller/Action.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * $_actionController
-     *
-     * @var Zend_Controller_Action $_actionController
-     */
-    protected $_actionController = null;
-
-    /**
-     * @var mixed $_frontController
-     */
-    protected $_frontController = null;
-
-    /**
-     * setActionController()
-     *
-     * @param  Zend_Controller_Action $actionController
-     * @return Zend_Controller_ActionHelper_Abstract Provides a fluent interface
-     */
-    public function setActionController(Zend_Controller_Action $actionController = null)
-    {
-        $this->_actionController = $actionController;
-        return $this;
-    }
-
-    /**
-     * Retrieve current action controller
-     *
-     * @return Zend_Controller_Action
-     */
-    public function getActionController()
-    {
-        return $this->_actionController;
-    }
-
-    /**
-     * Retrieve front controller instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        return Zend_Controller_Front::getInstance();
-    }
-
-    /**
-     * Hook into action controller initialization
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Hook into action controller preDispatch() workflow
-     *
-     * @return void
-     */
-    public function preDispatch()
-    {
-    }
-
-    /**
-     * Hook into action controller postDispatch() workflow
-     *
-     * @return void
-     */
-    public function postDispatch()
-    {
-    }
-
-    /**
-     * getRequest() -
-     *
-     * @return Zend_Controller_Request_Abstract $request
-     */
-    public function getRequest()
-    {
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            $controller = $this->getFrontController();
-        }
-
-        return $controller->getRequest();
-    }
-
-    /**
-     * getResponse() -
-     *
-     * @return Zend_Controller_Response_Abstract $response
-     */
-    public function getResponse()
-    {
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            $controller = $this->getFrontController();
-        }
-
-        return $controller->getResponse();
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        $full_class_name = get_class($this);
-
-        if (strpos($full_class_name, '_') !== false) {
-            $helper_name = strrchr($full_class_name, '_');
-            return ltrim($helper_name, '_');
-        } else {
-            return $full_class_name;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/ActionStack.php b/airtime_mvc/library/Zend/Controller/Action/Helper/ActionStack.php
deleted file mode 100644
index 17b9862c6..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/ActionStack.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Add to action stack
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * @var Zend_Controller_Plugin_ActionStack
-     */
-    protected $_actionStack;
-
-    /**
-     * Constructor
-     *
-     * Register action stack plugin
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $front = Zend_Controller_Front::getInstance();
-        if (!$front->hasPlugin('Zend_Controller_Plugin_ActionStack')) {
-            /**
-             * @see Zend_Controller_Plugin_ActionStack
-             */
-            require_once 'Zend/Controller/Plugin/ActionStack.php';
-            $this->_actionStack = new Zend_Controller_Plugin_ActionStack();
-            $front->registerPlugin($this->_actionStack, 97);
-        } else {
-            $this->_actionStack = $front->getPlugin('Zend_Controller_Plugin_ActionStack');
-        }
-    }
-
-    /**
-     * Push onto the stack
-     *
-     * @param  Zend_Controller_Request_Abstract $next
-     * @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
-     */
-    public function pushStack(Zend_Controller_Request_Abstract $next)
-    {
-        $this->_actionStack->pushStack($next);
-        return $this;
-    }
-
-    /**
-     * Push a new action onto the stack
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ActionStack
-     */
-    public function actionToStack($action, $controller = null, $module = null, array $params = array())
-    {
-        if ($action instanceof Zend_Controller_Request_Abstract) {
-            return $this->pushStack($action);
-        } elseif (!is_string($action)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('ActionStack requires either a request object or minimally a string action');
-        }
-
-        $request = $this->getRequest();
-
-        if ($request instanceof Zend_Controller_Request_Abstract === false){
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Request object not set yet');
-        }
-
-        $controller = (null === $controller) ? $request->getControllerName() : $controller;
-        $module = (null === $module) ? $request->getModuleName() : $module;
-
-        /**
-         * @see Zend_Controller_Request_Simple
-         */
-        require_once 'Zend/Controller/Request/Simple.php';
-        $newRequest = new Zend_Controller_Request_Simple($action, $controller, $module, $params);
-
-        return $this->pushStack($newRequest);
-    }
-
-    /**
-     * Perform helper when called as $this->_helper->actionStack() from an action controller
-     *
-     * Proxies to {@link simple()}
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array $params
-     * @return boolean
-     */
-    public function direct($action, $controller = null, $module = null, array $params = array())
-    {
-        return $this->actionToStack($action, $controller, $module, $params);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/AjaxContext.php b/airtime_mvc/library/Zend/Controller/Action/Helper/AjaxContext.php
deleted file mode 100644
index 205f10b3a..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/AjaxContext.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AjaxContext.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_ContextSwitch
- */
-require_once 'Zend/Controller/Action/Helper/ContextSwitch.php';
-
-/**
- * Simplify AJAX context switching based on requested format
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch
-{
-    /**
-     * Controller property to utilize for context switching
-     * @var string
-     */
-    protected $_contextKey = 'ajaxable';
-
-    /**
-     * Constructor
-     *
-     * Add HTML context
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->addContext('html', array('suffix' => 'ajax'));
-    }
-
-    /**
-     * Initialize AJAX context switching
-     *
-     * Checks for XHR requests; if detected, attempts to perform context switch.
-     *
-     * @param  string $format
-     * @return void
-     */
-    public function initContext($format = null)
-    {
-        $this->_currentContext = null;
-
-        if (!$this->getRequest()->isXmlHttpRequest()) {
-            return;
-        }
-
-        return parent::initContext($format);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/airtime_mvc/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
deleted file mode 100644
index b3b6f0c2f..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Create and send autocompletion lists
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * Suppress exit when sendJson() called
-     *
-     * @var boolean
-     */
-    public $suppressExit = false;
-
-    /**
-     * Validate autocompletion data
-     *
-     * @param  mixed $data
-     * @return boolean
-     */
-    abstract public function validateData($data);
-
-    /**
-     * Prepare autocompletion data
-     *
-     * @param  mixed   $data
-     * @param  boolean $keepLayouts
-     * @return mixed
-     */
-    abstract public function prepareAutoCompletion($data, $keepLayouts = false);
-
-    /**
-     * Disable layouts and view renderer
-     *
-     * @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
-     */
-    public function disableLayouts()
-    {
-        /**
-         * @see Zend_Layout
-         */
-        require_once 'Zend/Layout.php';
-        if (null !== ($layout = Zend_Layout::getMvcInstance())) {
-            $layout->disableLayout();
-        }
-
-        Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
-
-        return $this;
-    }
-
-    /**
-     * Encode data to JSON
-     *
-     * @param  mixed $data
-     * @param  bool  $keepLayouts
-     * @throws Zend_Controller_Action_Exception
-     * @return string
-     */
-    public function encodeJson($data, $keepLayouts = false)
-    {
-        if ($this->validateData($data)) {
-            return Zend_Controller_Action_HelperBroker::getStaticHelper('Json')->encodeJson($data, $keepLayouts);
-        }
-
-        /**
-         * @see Zend_Controller_Action_Exception
-         */
-        require_once 'Zend/Controller/Action/Exception.php';
-        throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion');
-    }
-
-    /**
-     * Send autocompletion data
-     *
-     * Calls prepareAutoCompletion, populates response body with this
-     * information, and sends response.
-     *
-     * @param  mixed $data
-     * @param  bool  $keepLayouts
-     * @return string|void
-     */
-    public function sendAutoCompletion($data, $keepLayouts = false)
-    {
-        $data = $this->prepareAutoCompletion($data, $keepLayouts);
-
-        $response = $this->getResponse();
-        $response->setBody($data);
-
-        if (!$this->suppressExit) {
-            $response->sendResponse();
-            exit;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Strategy pattern: allow calling helper as broker method
-     *
-     * Prepares autocompletion data and, if $sendNow is true, immediately sends
-     * response.
-     *
-     * @param  mixed $data
-     * @param  bool  $sendNow
-     * @param  bool  $keepLayouts
-     * @return string|void
-     */
-    public function direct($data, $sendNow = true, $keepLayouts = false)
-    {
-        if ($sendNow) {
-            return $this->sendAutoCompletion($data, $keepLayouts);
-        }
-
-        return $this->prepareAutoCompletion($data, $keepLayouts);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php
deleted file mode 100644
index 3894c8763..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AutoCompleteDojo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_AutoComplete_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php';
-
-/**
- * Create and send Dojo-compatible autocompletion lists
- *
- * @uses       Zend_Controller_Action_Helper_AutoComplete_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Action_Helper_AutoComplete_Abstract
-{
-    /**
-     * Validate data for autocompletion
-     *
-     * Stub; unused
-     *
-     * @param  mixed $data
-     * @return boolean
-     */
-    public function validateData($data)
-    {
-        return true;
-    }
-
-    /**
-     * Prepare data for autocompletion
-     *
-     * @param  mixed   $data
-     * @param  boolean $keepLayouts
-     * @return string
-     */
-    public function prepareAutoCompletion($data, $keepLayouts = false)
-    {
-        if (!$data instanceof Zend_Dojo_Data) {
-            require_once 'Zend/Dojo/Data.php';
-            $items = array();
-            foreach ($data as $key => $value) {
-                $items[] = array('label' => $value, 'name' => $value);
-            }
-            $data = new Zend_Dojo_Data('name', $items);
-        }
-
-        if (!$keepLayouts) {
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
-
-            require_once 'Zend/Layout.php';
-            $layout = Zend_Layout::getMvcInstance();
-            if ($layout instanceof Zend_Layout) {
-                $layout->disableLayout();
-            }
-        }
-
-        $response = Zend_Controller_Front::getInstance()->getResponse();
-        $response->setHeader('Content-Type', 'application/json');
-
-        return $data->toJson();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php
deleted file mode 100644
index 0125c560b..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AutoCompleteScriptaculous.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_AutoComplete_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php';
-
-/**
- * Create and send Scriptaculous-compatible autocompletion lists
- *
- * @uses       Zend_Controller_Action_Helper_AutoComplete_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Controller_Action_Helper_AutoComplete_Abstract
-{
-    /**
-     * Validate data for autocompletion
-     *
-     * @param  mixed $data
-     * @return bool
-     */
-    public function validateData($data)
-    {
-        if (!is_array($data) && !is_scalar($data)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Prepare data for autocompletion
-     *
-     * @param  mixed   $data
-     * @param  boolean $keepLayouts
-     * @throws Zend_Controller_Action_Exception
-     * @return string
-     */
-    public function prepareAutoCompletion($data, $keepLayouts = false)
-    {
-        if (!$this->validateData($data)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion');
-        }
-
-        $data = (array) $data;
-        $data = '<ul><li>' . implode('</li><li>', $data) . '</li></ul>';
-
-        if (!$keepLayouts) {
-            $this->disableLayouts();
-        }
-
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/Cache.php b/airtime_mvc/library/Zend/Controller/Action/Helper/Cache.php
deleted file mode 100644
index d1df4944a..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/Cache.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * @see Zend_Controller_Action_Exception
- */
-require_once 'Zend/Controller/Action/Exception.php';
-
-/**
- * @see Zend_Cache_Manager
- */
-require_once 'Zend/Cache/Manager.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_Cache
-    extends Zend_Controller_Action_Helper_Abstract
-{
-
-    /**
-     * Local Cache Manager object used by Helper
-     *
-     * @var Zend_Cache_Manager
-     */
-    protected $_manager = null;
-
-    /**
-     * Indexed map of Actions to attempt Page caching on by Controller
-     *
-     * @var array
-     */
-    protected $_caching = array();
-
-    /**
-     * Indexed map of Tags by Controller and Action
-     *
-     * @var array
-     */
-    protected $_tags = array();
-    
-    /**
-     * Indexed map of Extensions by Controller and Action
-     *
-     * @var array
-     */
-    protected $_extensions = array();
-
-    /**
-     * Track output buffering condition
-     */
-    protected $_obStarted = false;
-
-    /**
-     * Tell the helper which actions are cacheable and under which
-     * tags (if applicable) they should be recorded with
-     *
-     * @param array $actions
-     * @param array $tags
-     * @return void
-     */
-    public function direct(array $actions, array $tags = array(), $extension = null)
-    {
-        $controller = $this->getRequest()->getControllerName();
-        $actions = array_unique($actions);
-        if (!isset($this->_caching[$controller])) {
-            $this->_caching[$controller] = array();
-        }
-        if (!empty($tags)) {
-            $tags = array_unique($tags);
-            if (!isset($this->_tags[$controller])) {
-                $this->_tags[$controller] = array();
-            }
-        }
-        foreach ($actions as $action) {
-            $this->_caching[$controller][] = $action;
-            if (!empty($tags)) {
-                $this->_tags[$controller][$action] = array();
-                foreach ($tags as $tag) {
-                    $this->_tags[$controller][$action][] = $tag;
-                }
-            }
-        }
-        if ($extension) {
-            if (!isset($this->_extensions[$controller])) {
-                $this->_extensions[$controller] = array();
-            }
-            foreach ($actions as $action) {
-                $this->_extensions[$controller][$action] = $extension;
-            }
-        }
-    }
-
-    /**
-     * Remove a specific page cache static file based on its
-     * relative URL from the application's public directory.
-     * The file extension is not required here; usually matches
-     * the original REQUEST_URI that was cached.
-     *
-     * @param string $relativeUrl
-     * @param bool $recursive
-     * @return mixed
-     */
-    public function removePage($relativeUrl, $recursive = false)
-    {
-        $cache = $this->getCache(Zend_Cache_Manager::PAGECACHE);
-        if ($recursive) {
-            $backend = $cache->getBackend();
-            if (($backend instanceof Zend_Cache_Backend)
-                && method_exists($backend, 'removeRecursively')
-            ) {
-                return $backend->removeRecursively($relativeUrl);
-            }
-        }
-
-        return $cache->remove($relativeUrl);
-    }
-
-    /**
-     * Remove a specific page cache static file based on its
-     * relative URL from the application's public directory.
-     * The file extension is not required here; usually matches
-     * the original REQUEST_URI that was cached.
-     *
-     * @param array $tags
-     * @return mixed
-     */
-    public function removePagesTagged(array $tags)
-    {
-        return $this->getCache(Zend_Cache_Manager::PAGECACHE)
-            ->clean(Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
-    }
-
-    /**
-     * Commence page caching for any cacheable actions
-     *
-     * @return void
-     */
-    public function preDispatch()
-    {
-        $controller = $this->getRequest()->getControllerName();
-        $action = $this->getRequest()->getActionName();
-        $stats = ob_get_status(true);
-        foreach ($stats as $status) {
-            if ($status['name'] == 'Zend_Cache_Frontend_Page::_flush'
-            || $status['name'] == 'Zend_Cache_Frontend_Capture::_flush') {
-                $obStarted = true;
-            }
-        }
-        if (!isset($obStarted) && isset($this->_caching[$controller]) &&
-        in_array($action, $this->_caching[$controller])) {
-            $reqUri = $this->getRequest()->getRequestUri();
-            $tags = array();
-            if (isset($this->_tags[$controller][$action])
-            && !empty($this->_tags[$controller][$action])) {
-                $tags = array_unique($this->_tags[$controller][$action]);
-            }
-            $extension = null;
-            if (isset($this->_extensions[$controller][$action])) {
-                $extension = $this->_extensions[$controller][$action];
-            }
-            $this->getCache(Zend_Cache_Manager::PAGECACHE)
-                ->start($this->_encodeCacheId($reqUri), $tags, $extension);
-        }
-    }
-    
-    /**
-     * Encode a Cache ID as hexadecimal. This is a workaround because Backend ID validation
-     * is trapped in the Frontend classes. Will try to get this reversed for ZF 2.0
-     * because it's a major annoyance to have IDs so restricted!
-     *
-     * @return string
-     * @param string $requestUri
-     */
-    protected function _encodeCacheId($requestUri)
-    {
-        return bin2hex($requestUri);
-    }
-
-    /**
-     * Set an instance of the Cache Manager for this helper
-     *
-     * @param Zend_Cache_Manager $manager
-     * @return void
-     */
-    public function setManager(Zend_Cache_Manager $manager)
-    {
-        $this->_manager = $manager;
-        return $this;
-    }
-
-    /**
-     * Get the Cache Manager instance or instantiate the object if not
-     * exists. Attempts to load from bootstrap if available.
-     *
-     * @return Zend_Cache_Manager
-     */
-    public function getManager()
-    {
-        if (!is_null($this->_manager)) {
-            return $this->_manager;
-        }
-        $front = Zend_Controller_Front::getInstance();
-        if ($front->getParam('bootstrap')
-        && $front->getParam('bootstrap')->getResource('CacheManager')) {
-            return $front->getParam('bootstrap')
-                ->getResource('CacheManager');
-        }
-        $this->_manager = new Zend_Cache_Manager;
-        return $this->_manager;
-    }
-
-    /**
-     * Return a list of actions for the current Controller marked for
-     * caching
-     *
-     * @return array
-     */
-    public function getCacheableActions()
-    {
-        return $this->_caching;
-    }
-
-    /**
-     * Return a list of tags set for all cacheable actions
-     *
-     * @return array
-     */
-    public function getCacheableTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Proxy non-matched methods back to Zend_Cache_Manager where
-     * appropriate
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (method_exists($this->getManager(), $method)) {
-            return call_user_func_array(
-                array($this->getManager(), $method), $args
-            );
-        }
-        throw new Zend_Controller_Action_Exception('Method does not exist:'
-            . $method);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/ContextSwitch.php b/airtime_mvc/library/Zend/Controller/Action/Helper/ContextSwitch.php
deleted file mode 100644
index 8cf154d1e..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/ContextSwitch.php
+++ /dev/null
@@ -1,1394 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContextSwitch.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Simplify context switching based on requested format
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * Trigger type constants
-     */
-    const TRIGGER_INIT = 'TRIGGER_INIT';
-    const TRIGGER_POST = 'TRIGGER_POST';
-
-    /**
-     * Supported contexts
-     * @var array
-     */
-    protected $_contexts = array();
-
-    /**
-     * JSON auto-serialization flag
-     * @var boolean
-     */
-    protected $_autoJsonSerialization = true;
-
-    /**
-     * Controller property key to utilize for context switching
-     * @var string
-     */
-    protected $_contextKey = 'contexts';
-
-    /**
-     * Request parameter containing requested context
-     * @var string
-     */
-    protected $_contextParam = 'format';
-
-    /**
-     * Current context
-     * @var string
-     */
-    protected $_currentContext;
-
-    /**
-     * Default context (xml)
-     * @var string
-     */
-    protected $_defaultContext = 'xml';
-
-    /**
-     * Whether or not to disable layouts when switching contexts
-     * @var boolean
-     */
-    protected $_disableLayout = true;
-
-    /**
-     * Methods that require special configuration
-     * @var array
-     */
-    protected $_specialConfig = array(
-        'setSuffix',
-        'setHeaders',
-        'setCallbacks',
-    );
-
-    /**
-     * Methods that are not configurable via setOptions and setConfig
-     * @var array
-     */
-    protected $_unconfigurable = array(
-        'setOptions',
-        'setConfig',
-        'setHeader',
-        'setCallback',
-        'setContext',
-        'setActionContext',
-        'setActionContexts',
-    );
-
-    /**
-     * @var Zend_Controller_Action_Helper_ViewRenderer
-     */
-    protected $_viewRenderer;
-
-    /**
-     * Original view suffix prior to detecting context switch
-     * @var string
-     */
-    protected $_viewSuffixOrig;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        } elseif (is_array($options)) {
-            $this->setOptions($options);
-        }
-
-        if (empty($this->_contexts)) {
-            $this->addContexts(array(
-                'json' => array(
-                    'suffix'    => 'json',
-                    'headers'   => array('Content-Type' => 'application/json'),
-                    'callbacks' => array(
-                        'init' => 'initJsonContext',
-                        'post' => 'postJsonContext'
-                    )
-                ),
-                'xml'  => array(
-                    'suffix'    => 'xml',
-                    'headers'   => array('Content-Type' => 'application/xml'),
-                )
-            ));
-        }
-
-        $this->init();
-    }
-
-    /**
-     * Initialize at start of action controller
-     *
-     * Reset the view script suffix to the original state, or store the
-     * original state.
-     *
-     * @return void
-     */
-    public function init()
-    {
-        if (null === $this->_viewSuffixOrig) {
-            $this->_viewSuffixOrig = $this->_getViewRenderer()->getViewSuffix();
-        } else {
-            $this->_getViewRenderer()->setViewSuffix($this->_viewSuffixOrig);
-        }
-    }
-
-    /**
-     * Configure object from array of options
-     *
-     * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setOptions(array $options)
-    {
-        if (isset($options['contexts'])) {
-            $this->setContexts($options['contexts']);
-            unset($options['contexts']);
-        }
-
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $this->_unconfigurable)) {
-                continue;
-            }
-
-            if (in_array($method, $this->_specialConfig)) {
-                $method = '_' . $method;
-            }
-
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set object state from config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Strategy pattern: return object
-     *
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function direct()
-    {
-        return $this;
-    }
-
-    /**
-     * Initialize context detection and switching
-     *
-     * @param  mixed $format
-     * @throws Zend_Controller_Action_Exception
-     * @return void
-     */
-    public function initContext($format = null)
-    {
-        $this->_currentContext = null;
-
-        $controller = $this->getActionController();
-        $request    = $this->getRequest();
-        $action     = $request->getActionName();
-
-        // Return if no context switching enabled, or no context switching
-        // enabled for this action
-        $contexts = $this->getActionContexts($action);
-        if (empty($contexts)) {
-            return;
-        }
-
-        // Return if no context parameter provided
-        if (!$context = $request->getParam($this->getContextParam())) {
-            if ($format === null) {
-                return;
-            }
-            $context = $format;
-            $format  = null;
-        }
-
-        // Check if context allowed by action controller
-        if (!$this->hasActionContext($action, $context)) {
-            return;
-        }
-
-        // Return if invalid context parameter provided and no format or invalid
-        // format provided
-        if (!$this->hasContext($context)) {
-            if (empty($format) || !$this->hasContext($format)) {
-
-                return;
-            }
-        }
-
-        // Use provided format if passed
-        if (!empty($format) && $this->hasContext($format)) {
-            $context = $format;
-        }
-
-        $suffix = $this->getSuffix($context);
-
-        $this->_getViewRenderer()->setViewSuffix($suffix);
-
-        $headers = $this->getHeaders($context);
-        if (!empty($headers)) {
-            $response = $this->getResponse();
-            foreach ($headers as $header => $content) {
-                $response->setHeader($header, $content);
-            }
-        }
-
-        if ($this->getAutoDisableLayout()) {
-            /**
-             * @see Zend_Layout
-             */
-            require_once 'Zend/Layout.php';
-            $layout = Zend_Layout::getMvcInstance();
-            if (null !== $layout) {
-                $layout->disableLayout();
-            }
-        }
-
-        if (null !== ($callback = $this->getCallback($context, self::TRIGGER_INIT))) {
-            if (is_string($callback) && method_exists($this, $callback)) {
-                $this->$callback();
-            } elseif (is_string($callback) && function_exists($callback)) {
-                $callback();
-            } elseif (is_array($callback)) {
-                call_user_func($callback);
-            } else {
-                /**
-                 * @see Zend_Controller_Action_Exception
-                 */
-                require_once 'Zend/Controller/Action/Exception.php';
-                throw new Zend_Controller_Action_Exception(sprintf('Invalid context callback registered for context "%s"', $context));
-            }
-        }
-
-        $this->_currentContext = $context;
-    }
-
-    /**
-     * JSON context extra initialization
-     *
-     * Turns off viewRenderer auto-rendering
-     *
-     * @return void
-     */
-    public function initJsonContext()
-    {
-        if (!$this->getAutoJsonSerialization()) {
-            return;
-        }
-
-        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-        $view = $viewRenderer->view;
-        if ($view instanceof Zend_View_Interface) {
-            $viewRenderer->setNoRender(true);
-        }
-    }
-
-    /**
-     * Should JSON contexts auto-serialize?
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setAutoJsonSerialization($flag)
-    {
-        $this->_autoJsonSerialization = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get JSON context auto-serialization flag
-     *
-     * @return boolean
-     */
-    public function getAutoJsonSerialization()
-    {
-        return $this->_autoJsonSerialization;
-    }
-
-    /**
-     * Set suffix from array
-     *
-     * @param  array $spec
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    protected function _setSuffix(array $spec)
-    {
-        foreach ($spec as $context => $suffixInfo) {
-            if (!is_string($context)) {
-                $context = null;
-            }
-
-            if (is_string($suffixInfo)) {
-                $this->setSuffix($context, $suffixInfo);
-                continue;
-            } elseif (is_array($suffixInfo)) {
-                if (isset($suffixInfo['suffix'])) {
-                    $suffix                    = $suffixInfo['suffix'];
-                    $prependViewRendererSuffix = true;
-
-                    if ((null === $context) && isset($suffixInfo['context'])) {
-                        $context = $suffixInfo['context'];
-                    }
-
-                    if (isset($suffixInfo['prependViewRendererSuffix'])) {
-                        $prependViewRendererSuffix = $suffixInfo['prependViewRendererSuffix'];
-                    }
-
-                    $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
-                    continue;
-                }
-
-                $count = count($suffixInfo);
-                switch (true) {
-                    case (($count < 2) && (null === $context)):
-                        /**
-                         * @see Zend_Controller_Action_Exception
-                         */
-                        require_once 'Zend/Controller/Action/Exception.php';
-                        throw new Zend_Controller_Action_Exception('Invalid suffix information provided in config');
-                    case ($count < 2):
-                        $suffix = array_shift($suffixInfo);
-                        $this->setSuffix($context, $suffix);
-                        break;
-                    case (($count < 3) && (null === $context)):
-                        $context = array_shift($suffixInfo);
-                        $suffix  = array_shift($suffixInfo);
-                        $this->setSuffix($context, $suffix);
-                        break;
-                    case (($count == 3) && (null === $context)):
-                        $context = array_shift($suffixInfo);
-                        $suffix  = array_shift($suffixInfo);
-                        $prependViewRendererSuffix = array_shift($suffixInfo);
-                        $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
-                        break;
-                    case ($count >= 2):
-                        $suffix  = array_shift($suffixInfo);
-                        $prependViewRendererSuffix = array_shift($suffixInfo);
-                        $this->setSuffix($context, $suffix, $prependViewRendererSuffix);
-                        break;
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Customize view script suffix to use when switching context.
-     *
-     * Passing an empty suffix value to the setters disables the view script
-     * suffix change.
-     *
-     * @param  string  $context                   Context type for which to set suffix
-     * @param  string  $suffix                    Suffix to use
-     * @param  boolean $prependViewRendererSuffix Whether or not to prepend the new suffix to the viewrenderer suffix
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setSuffix($context, $suffix, $prependViewRendererSuffix = true)
-    {
-        if (!isset($this->_contexts[$context])) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Cannot set suffix; invalid context type "%s"', $context));
-        }
-
-        if (empty($suffix)) {
-            $suffix = '';
-        }
-
-        if (is_array($suffix)) {
-            if (isset($suffix['prependViewRendererSuffix'])) {
-                $prependViewRendererSuffix = $suffix['prependViewRendererSuffix'];
-            }
-            if (isset($suffix['suffix'])) {
-                $suffix = $suffix['suffix'];
-            } else {
-                $suffix = '';
-            }
-        }
-
-        $suffix = (string) $suffix;
-
-        if ($prependViewRendererSuffix) {
-            if (empty($suffix)) {
-                $suffix = $this->_getViewRenderer()->getViewSuffix();
-            } else {
-                $suffix .= '.' . $this->_getViewRenderer()->getViewSuffix();
-            }
-        }
-
-        $this->_contexts[$context]['suffix'] = $suffix;
-        return $this;
-    }
-
-    /**
-     * Retrieve suffix for given context type
-     *
-     * @param  string $type Context type
-     * @throws Zend_Controller_Action_Exception
-     * @return string
-     */
-    public function getSuffix($type)
-    {
-        if (!isset($this->_contexts[$type])) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Cannot retrieve suffix; invalid context type "%s"', $type));
-        }
-
-        return $this->_contexts[$type]['suffix'];
-    }
-
-    /**
-     * Does the given context exist?
-     *
-     * @param  string  $context
-     * @param  boolean $throwException
-     * @throws Zend_Controller_Action_Exception if context does not exist and throwException is true
-     * @return bool
-     */
-    public function hasContext($context, $throwException = false)
-    {
-        if (is_string($context)) {
-            if (isset($this->_contexts[$context])) {
-                return true;
-            }
-        } elseif (is_array($context)) {
-            $error = false;
-            foreach ($context as $test) {
-                if (!isset($this->_contexts[$test])) {
-                    $error = (string) $test;
-                    break;
-                }
-            }
-            if (false === $error) {
-                return true;
-            }
-            $context = $error;
-        } elseif (true === $context) {
-            return true;
-        }
-
-        if ($throwException) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Context "%s" does not exist', $context));
-        }
-
-        return false;
-    }
-
-    /**
-     * Add header to context
-     *
-     * @param  string $context
-     * @param  string $header
-     * @param  string $content
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function addHeader($context, $header, $content)
-    {
-        $context = (string) $context;
-        $this->hasContext($context, true);
-
-        $header  = (string) $header;
-        $content = (string) $content;
-
-        if (isset($this->_contexts[$context]['headers'][$header])) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Cannot add "%s" header to context "%s": already exists', $header, $context));
-        }
-
-        $this->_contexts[$context]['headers'][$header] = $content;
-        return $this;
-    }
-
-    /**
-     * Customize response header to use when switching context
-     *
-     * Passing an empty header value to the setters disables the response
-     * header.
-     *
-     * @param  string $type   Context type for which to set suffix
-     * @param  string $header Header to set
-     * @param  string $content Header content
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setHeader($context, $header, $content)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        $header  = (string) $header;
-        $content = (string) $content;
-
-        $this->_contexts[$context]['headers'][$header] = $content;
-        return $this;
-    }
-
-    /**
-     * Add multiple headers at once for a given context
-     *
-     * @param  string $context
-     * @param  array  $headers
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function addHeaders($context, array $headers)
-    {
-        foreach ($headers as $header => $content) {
-            $this->addHeader($context, $header, $content);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set headers from context => headers pairs
-     *
-     * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    protected function _setHeaders(array $options)
-    {
-        foreach ($options as $context => $headers) {
-            if (!is_array($headers)) {
-                continue;
-            }
-            $this->setHeaders($context, $headers);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set multiple headers at once for a given context
-     *
-     * @param  string $context
-     * @param  array  $headers
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setHeaders($context, array $headers)
-    {
-        $this->clearHeaders($context);
-        foreach ($headers as $header => $content) {
-            $this->setHeader($context, $header, $content);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve context header
-     *
-     * Returns the value of a given header for a given context type
-     *
-     * @param  string $context
-     * @param  string $header
-     * @return string|null
-     */
-    public function getHeader($context, $header)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        $header  = (string) $header;
-        if (isset($this->_contexts[$context]['headers'][$header])) {
-            return $this->_contexts[$context]['headers'][$header];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve context headers
-     *
-     * Returns all headers for a context as key/value pairs
-     *
-     * @param  string $context
-     * @return array
-     */
-    public function getHeaders($context)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        return $this->_contexts[$context]['headers'];
-    }
-
-    /**
-     * Remove a single header from a context
-     *
-     * @param  string $context
-     * @param  string $header
-     * @return boolean
-     */
-    public function removeHeader($context, $header)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        $header  = (string) $header;
-        if (isset($this->_contexts[$context]['headers'][$header])) {
-            unset($this->_contexts[$context]['headers'][$header]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all headers for a given context
-     *
-     * @param  string $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function clearHeaders($context)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        $this->_contexts[$context]['headers'] = array();
-        return $this;
-    }
-
-    /**
-     * Validate trigger and return in normalized form
-     *
-     * @param  string $trigger
-     * @throws Zend_Controller_Action_Exception
-     * @return string
-     */
-    protected function _validateTrigger($trigger)
-    {
-        $trigger = strtoupper($trigger);
-        if ('TRIGGER_' !== substr($trigger, 0, 8)) {
-            $trigger = 'TRIGGER_' . $trigger;
-        }
-
-        if (!in_array($trigger, array(self::TRIGGER_INIT, self::TRIGGER_POST))) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Invalid trigger "%s"', $trigger));
-        }
-
-        return $trigger;
-    }
-
-    /**
-     * Set a callback for a given context and trigger
-     *
-     * @param  string       $context
-     * @param  string       $trigger
-     * @param  string|array $callback
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setCallback($context, $trigger, $callback)
-    {
-        $this->hasContext($context, true);
-        $trigger = $this->_validateTrigger($trigger);
-
-        if (!is_string($callback)) {
-            if (!is_array($callback) || (2 != count($callback))) {
-                /**
-                 * @see Zend_Controller_Action_Exception
-                 */
-                require_once 'Zend/Controller/Action/Exception.php';
-                throw new Zend_Controller_Action_Exception('Invalid callback specified');
-            }
-        }
-
-        $this->_contexts[$context]['callbacks'][$trigger] = $callback;
-        return $this;
-    }
-
-    /**
-     * Set callbacks from array of context => callbacks pairs
-     *
-     * @param  array $options
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    protected function _setCallbacks(array $options)
-    {
-        foreach ($options as $context => $callbacks) {
-            if (!is_array($callbacks)) {
-                continue;
-            }
-
-            $this->setCallbacks($context, $callbacks);
-        }
-        return $this;
-    }
-
-    /**
-     * Set callbacks for a given context
-     *
-     * Callbacks should be in trigger/callback pairs.
-     *
-     * @param  string $context
-     * @param  array  $callbacks
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setCallbacks($context, array $callbacks)
-    {
-        $this->hasContext($context, true);
-        $context = (string) $context;
-        if (!isset($this->_contexts[$context]['callbacks'])) {
-            $this->_contexts[$context]['callbacks'] = array();
-        }
-
-        foreach ($callbacks as $trigger => $callback) {
-            $this->setCallback($context, $trigger, $callback);
-        }
-        return $this;
-    }
-
-    /**
-     * Get a single callback for a given context and trigger
-     *
-     * @param  string $context
-     * @param  string $trigger
-     * @return string|array|null
-     */
-    public function getCallback($context, $trigger)
-    {
-        $this->hasContext($context, true);
-        $trigger = $this->_validateTrigger($trigger);
-        if (isset($this->_contexts[$context]['callbacks'][$trigger])) {
-            return $this->_contexts[$context]['callbacks'][$trigger];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get all callbacks for a given context
-     *
-     * @param  string $context
-     * @return array
-     */
-    public function getCallbacks($context)
-    {
-        $this->hasContext($context, true);
-        return $this->_contexts[$context]['callbacks'];
-    }
-
-    /**
-     * Clear a callback for a given context and trigger
-     *
-     * @param  string $context
-     * @param  string $trigger
-     * @return boolean
-     */
-    public function removeCallback($context, $trigger)
-    {
-        $this->hasContext($context, true);
-        $trigger = $this->_validateTrigger($trigger);
-        if (isset($this->_contexts[$context]['callbacks'][$trigger])) {
-            unset($this->_contexts[$context]['callbacks'][$trigger]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all callbacks for a given context
-     *
-     * @param  string $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function clearCallbacks($context)
-    {
-        $this->hasContext($context, true);
-        $this->_contexts[$context]['callbacks'] = array();
-        return $this;
-    }
-
-    /**
-     * Set name of parameter to use when determining context format
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setContextParam($name)
-    {
-        $this->_contextParam = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Return context format request parameter name
-     *
-     * @return string
-     */
-    public function getContextParam()
-    {
-        return $this->_contextParam;
-    }
-
-    /**
-     * Indicate default context to use when no context format provided
-     *
-     * @param  string $type
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setDefaultContext($type)
-    {
-        if (!isset($this->_contexts[$type])) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Cannot set default context; invalid context type "%s"', $type));
-        }
-
-        $this->_defaultContext = $type;
-        return $this;
-    }
-
-    /**
-     * Return default context
-     *
-     * @return string
-     */
-    public function getDefaultContext()
-    {
-        return $this->_defaultContext;
-    }
-
-    /**
-     * Set flag indicating if layout should be disabled
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setAutoDisableLayout($flag)
-    {
-        $this->_disableLayout = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve auto layout disable flag
-     *
-     * @return boolean
-     */
-    public function getAutoDisableLayout()
-    {
-        return $this->_disableLayout;
-    }
-
-    /**
-     * Add new context
-     *
-     * @param  string $context Context type
-     * @param  array  $spec    Context specification
-     * @throws Zend_Controller_Action_Exception
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function addContext($context, array $spec)
-    {
-        if ($this->hasContext($context)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf('Cannot add context "%s"; already exists', $context));
-        }
-        $context = (string) $context;
-
-        $this->_contexts[$context] = array();
-
-        $this->setSuffix($context,    (isset($spec['suffix'])    ? $spec['suffix']    : ''))
-             ->setHeaders($context,   (isset($spec['headers'])   ? $spec['headers']   : array()))
-             ->setCallbacks($context, (isset($spec['callbacks']) ? $spec['callbacks'] : array()));
-        return $this;
-    }
-
-    /**
-     * Overwrite existing context
-     *
-     * @param  string $context Context type
-     * @param  array  $spec    Context specification
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setContext($context, array $spec)
-    {
-        $this->removeContext($context);
-        return $this->addContext($context, $spec);
-    }
-
-    /**
-     * Add multiple contexts
-     *
-     * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function addContexts(array $contexts)
-    {
-        foreach ($contexts as $context => $spec) {
-            $this->addContext($context, $spec);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple contexts, after first removing all
-     *
-     * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setContexts(array $contexts)
-    {
-        $this->clearContexts();
-        foreach ($contexts as $context => $spec) {
-            $this->addContext($context, $spec);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve context specification
-     *
-     * @param  string $context
-     * @return array|null
-     */
-    public function getContext($context)
-    {
-        if ($this->hasContext($context)) {
-            return $this->_contexts[(string) $context];
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve context definitions
-     *
-     * @return array
-     */
-    public function getContexts()
-    {
-        return $this->_contexts;
-    }
-
-    /**
-     * Remove a context
-     *
-     * @param  string $context
-     * @return boolean
-     */
-    public function removeContext($context)
-    {
-        if ($this->hasContext($context)) {
-            unset($this->_contexts[(string) $context]);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Remove all contexts
-     *
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function clearContexts()
-    {
-        $this->_contexts = array();
-        return $this;
-    }
-
-    /**
-     * Return current context, if any
-     *
-     * @return null|string
-     */
-    public function getCurrentContext()
-    {
-        return $this->_currentContext;
-    }
-
-    /**
-     * Post dispatch processing
-     *
-     * Execute postDispatch callback for current context, if available
-     *
-     * @throws Zend_Controller_Action_Exception
-     * @return void
-     */
-    public function postDispatch()
-    {
-        $context = $this->getCurrentContext();
-        if (null !== $context) {
-            if (null !== ($callback = $this->getCallback($context, self::TRIGGER_POST))) {
-                if (is_string($callback) && method_exists($this, $callback)) {
-                    $this->$callback();
-                } elseif (is_string($callback) && function_exists($callback)) {
-                    $callback();
-                } elseif (is_array($callback)) {
-                    call_user_func($callback);
-                } else {
-                    /**
-                     * @see Zend_Controller_Action_Exception
-                     */
-                    require_once 'Zend/Controller/Action/Exception.php';
-                    throw new Zend_Controller_Action_Exception(sprintf('Invalid postDispatch context callback registered for context "%s"', $context));
-                }
-            }
-        }
-    }
-
-    /**
-     * JSON post processing
-     *
-     * JSON serialize view variables to response body
-     *
-     * @return void
-     */
-    public function postJsonContext()
-    {
-        if (!$this->getAutoJsonSerialization()) {
-            return;
-        }
-
-        $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-        $view = $viewRenderer->view;
-        if ($view instanceof Zend_View_Interface) {
-            /**
-             * @see Zend_Json
-             */
-            if(method_exists($view, 'getVars')) {
-                require_once 'Zend/Json.php';
-                $vars = Zend_Json::encode($view->getVars());
-                $this->getResponse()->setBody($vars);
-            } else {
-                require_once 'Zend/Controller/Action/Exception.php';
-                throw new Zend_Controller_Action_Exception('View does not implement the getVars() method needed to encode the view into JSON');
-            }
-        }
-    }
-
-    /**
-     * Add one or more contexts to an action
-     *
-     * @param  string       $action
-     * @param  string|array $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
-     */
-    public function addActionContext($action, $context)
-    {
-        $this->hasContext($context, true);
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            return;
-        }
-        $action     = (string) $action;
-        $contextKey = $this->_contextKey;
-
-        if (!isset($controller->$contextKey)) {
-            $controller->$contextKey = array();
-        }
-
-        if (true === $context) {
-            $contexts = $this->getContexts();
-            $controller->{$contextKey}[$action] = array_keys($contexts);
-            return $this;
-        }
-
-        $context = (array) $context;
-        if (!isset($controller->{$contextKey}[$action])) {
-            $controller->{$contextKey}[$action] = $context;
-        } else {
-            $controller->{$contextKey}[$action] = array_merge(
-                $controller->{$contextKey}[$action],
-                $context
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a context as available for a given controller action
-     *
-     * @param  string       $action
-     * @param  string|array $context
-     * @return Zend_Controller_Action_Helper_ContextSwitch|void Provides a fluent interface
-     */
-    public function setActionContext($action, $context)
-    {
-        $this->hasContext($context, true);
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            return;
-        }
-        $action     = (string) $action;
-        $contextKey = $this->_contextKey;
-
-        if (!isset($controller->$contextKey)) {
-            $controller->$contextKey = array();
-        }
-
-        if (true === $context) {
-            $contexts = $this->getContexts();
-            $controller->{$contextKey}[$action] = array_keys($contexts);
-        } else {
-            $controller->{$contextKey}[$action] = (array) $context;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add multiple action/context pairs at once
-     *
-     * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function addActionContexts(array $contexts)
-    {
-        foreach ($contexts as $action => $context) {
-            $this->addActionContext($action, $context);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite and set multiple action contexts at once
-     *
-     * @param  array $contexts
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function setActionContexts(array $contexts)
-    {
-        foreach ($contexts as $action => $context) {
-            $this->setActionContext($action, $context);
-        }
-        return $this;
-    }
-
-    /**
-     * Does a particular controller action have the given context(s)?
-     *
-     * @param  string       $action
-     * @param  string|array $context
-     * @throws Zend_Controller_Action_Exception
-     * @return boolean
-     */
-    public function hasActionContext($action, $context)
-    {
-        $this->hasContext($context, true);
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            return false;
-        }
-        $action     = (string) $action;
-        $contextKey = $this->_contextKey;
-
-        if (!isset($controller->{$contextKey})) {
-            return false;
-        }
-
-        $allContexts = $controller->{$contextKey};
-
-        if (!is_array($allContexts)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception("Invalid contexts found for controller");
-        }
-
-        if (!isset($allContexts[$action])) {
-            return false;
-        }
-
-        if (true === $allContexts[$action]) {
-            return true;
-        }
-
-        $contexts = $allContexts[$action];
-
-        if (!is_array($contexts)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception(sprintf("Invalid contexts found for action '%s'", $action));
-        }
-
-        if (is_string($context) && in_array($context, $contexts)) {
-            return true;
-        } elseif (is_array($context)) {
-            $found = true;
-            foreach ($context as $test) {
-                if (!in_array($test, $contexts)) {
-                    $found = false;
-                    break;
-                }
-            }
-            return $found;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get contexts for a given action or all actions in the controller
-     *
-     * @param  string $action
-     * @return array
-     */
-    public function getActionContexts($action = null)
-    {
-        $controller = $this->getActionController();
-        if (null === $controller) {
-            return array();
-        }
-        $action     = (string) $action;
-        $contextKey = $this->_contextKey;
-
-        if (!isset($controller->$contextKey)) {
-            return array();
-        }
-
-        if (null !== $action) {
-            if (isset($controller->{$contextKey}[$action])) {
-                return $controller->{$contextKey}[$action];
-            } else {
-                return array();
-            }
-        }
-
-        return $controller->$contextKey;
-    }
-
-    /**
-     * Remove one or more contexts for a given controller action
-     *
-     * @param  string       $action
-     * @param  string|array $context
-     * @return boolean
-     */
-    public function removeActionContext($action, $context)
-    {
-        if ($this->hasActionContext($action, $context)) {
-            $controller     = $this->getActionController();
-            $contextKey     = $this->_contextKey;
-            $action         = (string) $action;
-            $contexts       = $controller->$contextKey;
-            $actionContexts = $contexts[$action];
-            $contexts       = (array) $context;
-            foreach ($contexts as $context) {
-                $index = array_search($context, $actionContexts);
-                if (false !== $index) {
-                    unset($controller->{$contextKey}[$action][$index]);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Clear all contexts for a given controller action or all actions
-     *
-     * @param  string $action
-     * @return Zend_Controller_Action_Helper_ContextSwitch Provides a fluent interface
-     */
-    public function clearActionContexts($action = null)
-    {
-        $controller = $this->getActionController();
-        $contextKey = $this->_contextKey;
-
-        if (!isset($controller->$contextKey) || empty($controller->$contextKey)) {
-            return $this;
-        }
-
-        if (null === $action) {
-            $controller->$contextKey = array();
-            return $this;
-        }
-
-        $action = (string) $action;
-        if (isset($controller->{$contextKey}[$action])) {
-            unset($controller->{$contextKey}[$action]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve ViewRenderer
-     *
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    protected function _getViewRenderer()
-    {
-        if (null === $this->_viewRenderer) {
-            $this->_viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-        }
-
-        return $this->_viewRenderer;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/FlashMessenger.php b/airtime_mvc/library/Zend/Controller/Action/Helper/FlashMessenger.php
deleted file mode 100644
index 57e339027..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/FlashMessenger.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Session
- */
-require_once 'Zend/Session.php';
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Flash Messenger - implement session-based messages
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FlashMessenger.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable
-{
-    /**
-     * $_messages - Messages from previous request
-     *
-     * @var array
-     */
-    static protected $_messages = array();
-
-    /**
-     * $_session - Zend_Session storage object
-     *
-     * @var Zend_Session
-     */
-    static protected $_session = null;
-
-    /**
-     * $_messageAdded - Wether a message has been previously added
-     *
-     * @var boolean
-     */
-    static protected $_messageAdded = false;
-
-    /**
-     * $_namespace - Instance namespace, default is 'default'
-     *
-     * @var string
-     */
-    protected $_namespace = 'default';
-
-    /**
-     * __construct() - Instance constructor, needed to get iterators, etc
-     *
-     * @param  string $namespace
-     * @return void
-     */
-    public function __construct()
-    {
-        if (!self::$_session instanceof Zend_Session_Namespace) {
-            self::$_session = new Zend_Session_Namespace($this->getName());
-            foreach (self::$_session as $namespace => $messages) {
-                self::$_messages[$namespace] = $messages;
-                unset(self::$_session->{$namespace});
-            }
-        }
-    }
-
-    /**
-     * postDispatch() - runs after action is dispatched, in this
-     * case, it is resetting the namespace in case we have forwarded to a different
-     * action, Flashmessage will be 'clean' (default namespace)
-     *
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
-     */
-    public function postDispatch()
-    {
-        $this->resetNamespace();
-        return $this;
-    }
-
-    /**
-     * setNamespace() - change the namespace messages are added to, useful for
-     * per action controller messaging between requests
-     *
-     * @param  string $namespace
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
-     */
-    public function setNamespace($namespace = 'default')
-    {
-        $this->_namespace = $namespace;
-        return $this;
-    }
-
-    /**
-     * resetNamespace() - reset the namespace to the default
-     *
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
-     */
-    public function resetNamespace()
-    {
-        $this->setNamespace();
-        return $this;
-    }
-
-    /**
-     * addMessage() - Add a message to flash message
-     *
-     * @param  string $message
-     * @return Zend_Controller_Action_Helper_FlashMessenger Provides a fluent interface
-     */
-    public function addMessage($message)
-    {
-        if (self::$_messageAdded === false) {
-            self::$_session->setExpirationHops(1, null, true);
-        }
-
-        if (!is_array(self::$_session->{$this->_namespace})) {
-            self::$_session->{$this->_namespace} = array();
-        }
-
-        self::$_session->{$this->_namespace}[] = $message;
-
-        return $this;
-    }
-
-    /**
-     * hasMessages() - Wether a specific namespace has messages
-     *
-     * @return boolean
-     */
-    public function hasMessages()
-    {
-        return isset(self::$_messages[$this->_namespace]);
-    }
-
-    /**
-     * getMessages() - Get messages from a specific namespace
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        if ($this->hasMessages()) {
-            return self::$_messages[$this->_namespace];
-        }
-
-        return array();
-    }
-
-    /**
-     * Clear all messages from the previous request & current namespace
-     *
-     * @return boolean True if messages were cleared, false if none existed
-     */
-    public function clearMessages()
-    {
-        if ($this->hasMessages()) {
-            unset(self::$_messages[$this->_namespace]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * hasCurrentMessages() - check to see if messages have been added to current
-     * namespace within this request
-     *
-     * @return boolean
-     */
-    public function hasCurrentMessages()
-    {
-        return isset(self::$_session->{$this->_namespace});
-    }
-
-    /**
-     * getCurrentMessages() - get messages that have been added to the current
-     * namespace within this request
-     *
-     * @return array
-     */
-    public function getCurrentMessages()
-    {
-        if ($this->hasCurrentMessages()) {
-            return self::$_session->{$this->_namespace};
-        }
-
-        return array();
-    }
-
-    /**
-     * clear messages from the current request & current namespace
-     *
-     * @return boolean
-     */
-    public function clearCurrentMessages()
-    {
-        if ($this->hasCurrentMessages()) {
-            unset(self::$_session->{$this->_namespace});
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * getIterator() - complete the IteratorAggregate interface, for iterating
-     *
-     * @return ArrayObject
-     */
-    public function getIterator()
-    {
-        if ($this->hasMessages()) {
-            return new ArrayObject($this->getMessages());
-        }
-
-        return new ArrayObject();
-    }
-
-    /**
-     * count() - Complete the countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if ($this->hasMessages()) {
-            return count($this->getMessages());
-        }
-
-        return 0;
-    }
-
-    /**
-     * Strategy pattern: proxy to addMessage()
-     *
-     * @param  string $message
-     * @return void
-     */
-    public function direct($message)
-    {
-        return $this->addMessage($message);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/Json.php b/airtime_mvc/library/Zend/Controller/Action/Helper/Json.php
deleted file mode 100644
index 2a78fc4b6..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/Json.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Json.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Simplify AJAX context switching based on requested format
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * Suppress exit when sendJson() called
-     * @var boolean
-     */
-    public $suppressExit = false;
-
-    /**
-     * Create JSON response
-     *
-     * Encodes and returns data to JSON. Content-Type header set to
-     * 'application/json', and disables layouts and viewRenderer (if being
-     * used).
-     *
-     * @param  mixed   $data
-     * @param  boolean $keepLayouts
-     * @param  boolean|array $keepLayouts
-     * NOTE:   if boolean, establish $keepLayouts to true|false
-     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
-     *         if $keepLayouts and parmas for Zend_Json::encode are required
-     *         then, the array can contains a 'keepLayout'=>true|false
-     *         that will not be passed to Zend_Json::encode method but will be passed
-     *         to Zend_View_Helper_Json
-     * @throws Zend_Controller_Action_Helper_Json
-     * @return string
-     */
-    public function encodeJson($data, $keepLayouts = false)
-    {
-        /**
-         * @see Zend_View_Helper_Json
-         */
-        require_once 'Zend/View/Helper/Json.php';
-        $jsonHelper = new Zend_View_Helper_Json();
-        $data = $jsonHelper->json($data, $keepLayouts);
-
-        if (!$keepLayouts) {
-            /**
-             * @see Zend_Controller_Action_HelperBroker
-             */
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Encode JSON response and immediately send
-     *
-     * @param  mixed   $data
-     * @param  boolean|array $keepLayouts
-     * NOTE:   if boolean, establish $keepLayouts to true|false
-     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
-     *         if $keepLayouts and parmas for Zend_Json::encode are required
-     *         then, the array can contains a 'keepLayout'=>true|false
-     *         that will not be passed to Zend_Json::encode method but will be passed
-     *         to Zend_View_Helper_Json
-     * @return string|void
-     */
-    public function sendJson($data, $keepLayouts = false)
-    {
-        $data = $this->encodeJson($data, $keepLayouts);
-        $response = $this->getResponse();
-        $response->setBody($data);
-
-        if (!$this->suppressExit) {
-            $response->sendResponse();
-            exit;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Strategy pattern: call helper as helper broker method
-     *
-     * Allows encoding JSON. If $sendNow is true, immediately sends JSON
-     * response.
-     *
-     * @param  mixed   $data
-     * @param  boolean $sendNow
-     * @param  boolean $keepLayouts
-     * @return string|void
-     */
-    public function direct($data, $sendNow = true, $keepLayouts = false)
-    {
-        if ($sendNow) {
-            return $this->sendJson($data, $keepLayouts);
-        }
-        return $this->encodeJson($data, $keepLayouts);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/Redirector.php b/airtime_mvc/library/Zend/Controller/Action/Helper/Redirector.php
deleted file mode 100644
index 04b564788..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/Redirector.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Redirector.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * HTTP status code for redirects
-     * @var int
-     */
-    protected $_code = 302;
-
-    /**
-     * Whether or not calls to _redirect() should exit script execution
-     * @var boolean
-     */
-    protected $_exit = true;
-
-    /**
-     * Whether or not _redirect() should attempt to prepend the base URL to the
-     * passed URL (if it's a relative URL)
-     * @var boolean
-     */
-    protected $_prependBase = true;
-
-    /**
-     * Url to which to redirect
-     * @var string
-     */
-    protected $_redirectUrl = null;
-
-    /**
-     * Whether or not to use an absolute URI when redirecting
-     * @var boolean
-     */
-    protected $_useAbsoluteUri = false;
-
-    /**
-     * Whether or not to close the session before exiting
-     * @var boolean
-     */
-    protected $_closeSessionOnExit = true;
-
-    /**
-     * Retrieve HTTP status code to emit on {@link _redirect()} call
-     *
-     * @return int
-     */
-    public function getCode()
-    {
-        return $this->_code;
-    }
-
-    /**
-     * Validate HTTP status redirect code
-     *
-     * @param  int $code
-     * @throws Zend_Controller_Action_Exception on invalid HTTP status code
-     * @return true
-     */
-    protected function _checkCode($code)
-    {
-        $code = (int)$code;
-        if ((300 > $code) || (307 < $code) || (304 == $code) || (306 == $code)) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Invalid redirect HTTP status code (' . $code  . ')');
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieve HTTP status code for {@link _redirect()} behaviour
-     *
-     * @param  int $code
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
-     */
-    public function setCode($code)
-    {
-        $this->_checkCode($code);
-        $this->_code = $code;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag for whether or not {@link _redirect()} will exit when finished.
-     *
-     * @return boolean
-     */
-    public function getExit()
-    {
-        return $this->_exit;
-    }
-
-    /**
-     * Retrieve exit flag for {@link _redirect()} behaviour
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
-     */
-    public function setExit($flag)
-    {
-        $this->_exit = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag for whether or not {@link _redirect()} will prepend the
-     * base URL on relative URLs
-     *
-     * @return boolean
-     */
-    public function getPrependBase()
-    {
-        return $this->_prependBase;
-    }
-
-    /**
-     * Retrieve 'prepend base' flag for {@link _redirect()} behaviour
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
-     */
-    public function setPrependBase($flag)
-    {
-        $this->_prependBase = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag for whether or not {@link redirectAndExit()} shall close the session before
-     * exiting.
-     *
-     * @return boolean
-     */
-    public function getCloseSessionOnExit()
-    {
-        return $this->_closeSessionOnExit;
-    }
-
-    /**
-     * Set flag for whether or not {@link redirectAndExit()} shall close the session before exiting.
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
-     */
-    public function setCloseSessionOnExit($flag)
-    {
-        $this->_closeSessionOnExit = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Return use absolute URI flag
-     *
-     * @return boolean
-     */
-    public function getUseAbsoluteUri()
-    {
-        return $this->_useAbsoluteUri;
-    }
-
-    /**
-     * Set use absolute URI flag
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
-     */
-    public function setUseAbsoluteUri($flag = true)
-    {
-        $this->_useAbsoluteUri = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Set redirect in response object
-     *
-     * @return void
-     */
-    protected function _redirect($url)
-    {
-        if ($this->getUseAbsoluteUri() && !preg_match('#^(https?|ftp)://#', $url)) {
-            $host  = (isset($_SERVER['HTTP_HOST'])?$_SERVER['HTTP_HOST']:'');
-            $proto = (isset($_SERVER['HTTPS'])&&$_SERVER['HTTPS']!=="off") ? 'https' : 'http';
-            $port  = (isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:80);
-            $uri   = $proto . '://' . $host;
-            if ((('http' == $proto) && (80 != $port)) || (('https' == $proto) && (443 != $port))) {
-                $uri .= ':' . $port;
-            }
-            $url = $uri . '/' . ltrim($url, '/');
-        }
-        $this->_redirectUrl = $url;
-        $this->getResponse()->setRedirect($url, $this->getCode());
-    }
-
-    /**
-     * Retrieve currently set URL for redirect
-     *
-     * @return string
-     */
-    public function getRedirectUrl()
-    {
-        return $this->_redirectUrl;
-    }
-
-    /**
-     * Determine if the baseUrl should be prepended, and prepend if necessary
-     *
-     * @param  string $url
-     * @return string
-     */
-    protected function _prependBase($url)
-    {
-        if ($this->getPrependBase()) {
-            $request = $this->getRequest();
-            if ($request instanceof Zend_Controller_Request_Http) {
-                $base = rtrim($request->getBaseUrl(), '/');
-                if (!empty($base) && ('/' != $base)) {
-                    $url = $base . '/' . ltrim($url, '/');
-                } else {
-                    $url = '/' . ltrim($url, '/');
-                }
-            }
-        }
-
-        return $url;
-    }
-
-    /**
-     * Set a redirect URL of the form /module/controller/action/params
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @return void
-     */
-    public function setGotoSimple($action, $controller = null, $module = null, array $params = array())
-    {
-        $dispatcher = $this->getFrontController()->getDispatcher();
-        $request    = $this->getRequest();
-        $curModule  = $request->getModuleName();
-        $useDefaultController = false;
-
-        if (null === $controller && null !== $module) {
-            $useDefaultController = true;
-        }
-
-        if (null === $module) {
-            $module = $curModule;
-        }
-
-        if ($module == $dispatcher->getDefaultModule()) {
-            $module = '';
-        }
-
-        if (null === $controller && !$useDefaultController) {
-            $controller = $request->getControllerName();
-            if (empty($controller)) {
-                $controller = $dispatcher->getDefaultControllerName();
-            }
-        }
-
-        $params['module']     = $module;
-        $params['controller'] = $controller;
-        $params['action']     = $action;
-
-        $router = $this->getFrontController()->getRouter();
-        $url    = $router->assemble($params, 'default', true);
-
-        $this->_redirect($url);
-    }
-
-    /**
-     * Build a URL based on a route
-     *
-     * @param  array   $urlOptions
-     * @param  string  $name Route name
-     * @param  boolean $reset
-     * @param  boolean $encode
-     * @return void
-     */
-    public function setGotoRoute(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
-    {
-        $router = $this->getFrontController()->getRouter();
-        $url    = $router->assemble($urlOptions, $name, $reset, $encode);
-
-        $this->_redirect($url);
-    }
-
-    /**
-     * Set a redirect URL string
-     *
-     * By default, emits a 302 HTTP status header, prepends base URL as defined
-     * in request object if url is relative, and halts script execution by
-     * calling exit().
-     *
-     * $options is an optional associative array that can be used to control
-     * redirect behaviour. The available option keys are:
-     * - exit: boolean flag indicating whether or not to halt script execution when done
-     * - prependBase: boolean flag indicating whether or not to prepend the base URL when a relative URL is provided
-     * - code: integer HTTP status code to use with redirect. Should be between 300 and 307.
-     *
-     * _redirect() sets the Location header in the response object. If you set
-     * the exit flag to false, you can override this header later in code
-     * execution.
-     *
-     * If the exit flag is true (true by default), _redirect() will write and
-     * close the current session, if any.
-     *
-     * @param  string $url
-     * @param  array  $options
-     * @return void
-     */
-    public function setGotoUrl($url, array $options = array())
-    {
-        // prevent header injections
-        $url = str_replace(array("\n", "\r"), '', $url);
-
-        if (null !== $options) {
-            if (isset($options['exit'])) {
-                $this->setExit(($options['exit']) ? true : false);
-            }
-            if (isset($options['prependBase'])) {
-                $this->setPrependBase(($options['prependBase']) ? true : false);
-            }
-            if (isset($options['code'])) {
-                $this->setCode($options['code']);
-            }
-        }
-
-        // If relative URL, decide if we should prepend base URL
-        if (!preg_match('|^[a-z]+://|', $url)) {
-            $url = $this->_prependBase($url);
-        }
-
-        $this->_redirect($url);
-    }
-
-    /**
-     * Perform a redirect to an action/controller/module with params
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @return void
-     */
-    public function gotoSimple($action, $controller = null, $module = null, array $params = array())
-    {
-        $this->setGotoSimple($action, $controller, $module, $params);
-
-        if ($this->getExit()) {
-            $this->redirectAndExit();
-        }
-    }
-
-    /**
-     * Perform a redirect to an action/controller/module with params, forcing an immdiate exit
-     *
-     * @param  mixed $action
-     * @param  mixed $controller
-     * @param  mixed $module
-     * @param  array $params
-     * @return void
-     */
-    public function gotoSimpleAndExit($action, $controller = null, $module = null, array $params = array())
-    {
-        $this->setGotoSimple($action, $controller, $module, $params);
-        $this->redirectAndExit();
-    }
-
-    /**
-     * Redirect to a route-based URL
-     *
-     * Uses route's assemble method tobuild the URL; route is specified by $name;
-     * default route is used if none provided.
-     *
-     * @param  array   $urlOptions Array of key/value pairs used to assemble URL
-     * @param  string  $name
-     * @param  boolean $reset
-     * @param  boolean $encode
-     * @return void
-     */
-    public function gotoRoute(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
-    {
-        $this->setGotoRoute($urlOptions, $name, $reset, $encode);
-
-        if ($this->getExit()) {
-            $this->redirectAndExit();
-        }
-    }
-
-    /**
-     * Redirect to a route-based URL, and immediately exit
-     *
-     * Uses route's assemble method tobuild the URL; route is specified by $name;
-     * default route is used if none provided.
-     *
-     * @param  array   $urlOptions Array of key/value pairs used to assemble URL
-     * @param  string  $name
-     * @param  boolean $reset
-     * @return void
-     */
-    public function gotoRouteAndExit(array $urlOptions = array(), $name = null, $reset = false)
-    {
-        $this->setGotoRoute($urlOptions, $name, $reset);
-        $this->redirectAndExit();
-    }
-
-    /**
-     * Perform a redirect to a url
-     *
-     * @param  string $url
-     * @param  array  $options
-     * @return void
-     */
-    public function gotoUrl($url, array $options = array())
-    {
-        $this->setGotoUrl($url, $options);
-
-        if ($this->getExit()) {
-            $this->redirectAndExit();
-        }
-    }
-
-    /**
-     * Set a URL string for a redirect, perform redirect, and immediately exit
-     *
-     * @param  string $url
-     * @param  array  $options
-     * @return void
-     */
-    public function gotoUrlAndExit($url, array $options = array())
-    {
-        $this->gotoUrl($url, $options);
-        $this->redirectAndExit();
-    }
-
-    /**
-     * exit(): Perform exit for redirector
-     *
-     * @return void
-     */
-    public function redirectAndExit()
-    {
-        if ($this->getCloseSessionOnExit()) {
-            // Close session, if started
-            if (class_exists('Zend_Session', false) && Zend_Session::isStarted()) {
-                Zend_Session::writeClose();
-            } elseif (isset($_SESSION)) {
-                session_write_close();
-            }
-        }
-
-        $this->getResponse()->sendHeaders();
-        exit();
-    }
-
-    /**
-     * direct(): Perform helper when called as
-     * $this->_helper->redirector($action, $controller, $module, $params)
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @return void
-     */
-    public function direct($action, $controller = null, $module = null, array $params = array())
-    {
-        $this->gotoSimple($action, $controller, $module, $params);
-    }
-
-    /**
-     * Overloading
-     *
-     * Overloading for old 'goto', 'setGoto', and 'gotoAndExit' methods
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Controller_Action_Exception for invalid methods
-     */
-    public function __call($method, $args)
-    {
-        $method = strtolower($method);
-        if ('goto' == $method) {
-            return call_user_func_array(array($this, 'gotoSimple'), $args);
-        }
-        if ('setgoto' == $method) {
-            return call_user_func_array(array($this, 'setGotoSimple'), $args);
-        }
-        if ('gotoandexit' == $method) {
-            return call_user_func_array(array($this, 'gotoSimpleAndExit'), $args);
-        }
-
-        require_once 'Zend/Controller/Action/Exception.php';
-        throw new Zend_Controller_Action_Exception(sprintf('Invalid method "%s" called on redirector', $method));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/Url.php b/airtime_mvc/library/Zend/Controller/Action/Helper/Url.php
deleted file mode 100644
index 9f922e941..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/Url.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Helper for creating URLs for redirects and other tasks
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * Create URL based on default route
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @return string
-     */
-    public function simple($action, $controller = null, $module = null, array $params = null)
-    {
-        $request = $this->getRequest();
-
-        if (null === $controller) {
-            $controller = $request->getControllerName();
-        }
-
-        if (null === $module) {
-            $module = $request->getModuleName();
-        }
-
-        $url = $controller . '/' . $action;
-        if ($module != $this->getFrontController()->getDispatcher()->getDefaultModule()) {
-            $url = $module . '/' . $url;
-        }
-
-        if ('' !== ($baseUrl = $this->getFrontController()->getBaseUrl())) {
-            $url = $baseUrl . '/' . $url;
-        }
-
-        if (null !== $params) {
-            $paramPairs = array();
-            foreach ($params as $key => $value) {
-                $paramPairs[] = urlencode($key) . '/' . urlencode($value);
-            }
-            $paramString = implode('/', $paramPairs);
-            $url .= '/' . $paramString;
-        }
-
-        $url = '/' . ltrim($url, '/');
-
-        return $url;
-    }
-
-    /**
-     * Assembles a URL based on a given route
-     *
-     * This method will typically be used for more complex operations, as it
-     * ties into the route objects registered with the router.
-     *
-     * @param  array   $urlOptions Options passed to the assemble method of the Route object.
-     * @param  mixed   $name       The name of a Route to use. If null it will use the current Route
-     * @param  boolean $reset
-     * @param  boolean $encode
-     * @return string Url for the link href attribute.
-     */
-    public function url($urlOptions = array(), $name = null, $reset = false, $encode = true)
-    {
-        $router = $this->getFrontController()->getRouter();
-        return $router->assemble($urlOptions, $name, $reset, $encode);
-    }
-
-    /**
-     * Perform helper when called as $this->_helper->url() from an action controller
-     *
-     * Proxies to {@link simple()}
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module
-     * @param  array  $params
-     * @return string
-     */
-    public function direct($action, $controller = null, $module = null, array $params = null)
-    {
-        return $this->simple($action, $controller, $module, $params);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Helper/ViewRenderer.php b/airtime_mvc/library/Zend/Controller/Action/Helper/ViewRenderer.php
deleted file mode 100644
index 4150a2f26..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Helper/ViewRenderer.php
+++ /dev/null
@@ -1,989 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewRenderer.php 20261 2010-01-13 18:55:25Z matthew $
- */
-
-/**
- * @see Zend_Controller_Action_Helper_Abstract
- */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * @see Zend_View
- */
-require_once 'Zend/View.php';
-
-/**
- * View script integration
- *
- * Zend_Controller_Action_Helper_ViewRenderer provides transparent view
- * integration for action controllers. It allows you to create a view object
- * once, and populate it throughout all actions. Several global options may be
- * set:
- *
- * - noController: if set true, render() will not look for view scripts in
- *   subdirectories named after the controller
- * - viewSuffix: what view script filename suffix to use
- *
- * The helper autoinitializes the action controller view preDispatch(). It
- * determines the path to the class file, and then determines the view base
- * directory from there. It also uses the module name as a class prefix for
- * helpers and views such that if your module name is 'Search', it will set the
- * helper class prefix to 'Search_View_Helper' and the filter class prefix to ;
- * 'Search_View_Filter'.
- *
- * Usage:
- * <code>
- * // In your bootstrap:
- * Zend_Controller_Action_HelperBroker::addHelper(new Zend_Controller_Action_Helper_ViewRenderer());
- *
- * // In your action controller methods:
- * $viewHelper = $this->_helper->getHelper('view');
- *
- * // Don't use controller subdirectories
- * $viewHelper->setNoController(true);
- *
- * // Specify a different script to render:
- * $this->_helper->viewRenderer('form');
- *
- * </code>
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action_Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * @var Zend_View_Interface
-     */
-    public $view;
-
-    /**
-     * Word delimiters
-     * @var array
-     */
-    protected $_delimiters;
-
-    /**
-     * @var Zend_Filter_Inflector
-     */
-    protected $_inflector;
-
-    /**
-     * Inflector target
-     * @var string
-     */
-    protected $_inflectorTarget = '';
-
-    /**
-     * Current module directory
-     * @var string
-     */
-    protected $_moduleDir = '';
-
-    /**
-     * Whether or not to autorender using controller name as subdirectory;
-     * global setting (not reset at next invocation)
-     * @var boolean
-     */
-    protected $_neverController = false;
-
-    /**
-     * Whether or not to autorender postDispatch; global setting (not reset at
-     * next invocation)
-     * @var boolean
-     */
-    protected $_neverRender     = false;
-
-    /**
-     * Whether or not to use a controller name as a subdirectory when rendering
-     * @var boolean
-     */
-    protected $_noController    = false;
-
-    /**
-     * Whether or not to autorender postDispatch; per controller/action setting (reset
-     * at next invocation)
-     * @var boolean
-     */
-    protected $_noRender        = false;
-
-    /**
-     * Characters representing path delimiters in the controller
-     * @var string|array
-     */
-    protected $_pathDelimiters;
-
-    /**
-     * Which named segment of the response to utilize
-     * @var string
-     */
-    protected $_responseSegment = null;
-
-    /**
-     * Which action view script to render
-     * @var string
-     */
-    protected $_scriptAction    = null;
-
-    /**
-     * View object basePath
-     * @var string
-     */
-    protected $_viewBasePathSpec = ':moduleDir/views';
-
-    /**
-     * View script path specification string
-     * @var string
-     */
-    protected $_viewScriptPathSpec = ':controller/:action.:suffix';
-
-    /**
-     * View script path specification string, minus controller segment
-     * @var string
-     */
-    protected $_viewScriptPathNoControllerSpec = ':action.:suffix';
-
-    /**
-     * View script suffix
-     * @var string
-     */
-    protected $_viewSuffix      = 'phtml';
-
-    /**
-     * Constructor
-     *
-     * Optionally set view object and options.
-     *
-     * @param  Zend_View_Interface $view
-     * @param  array               $options
-     * @return void
-     */
-    public function __construct(Zend_View_Interface $view = null, array $options = array())
-    {
-        if (null !== $view) {
-            $this->setView($view);
-        }
-
-        if (!empty($options)) {
-            $this->_setOptions($options);
-        }
-    }
-
-    /**
-     * Clone - also make sure the view is cloned.
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        if (isset($this->view) && $this->view instanceof Zend_View_Interface) {
-            $this->view = clone $this->view;
-
-        }
-    }
-
-    /**
-     * Set the view object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-        return $this;
-    }
-
-    /**
-     * Get current module name
-     *
-     * @return string
-     */
-    public function getModule()
-    {
-        $request = $this->getRequest();
-        $module  = $request->getModuleName();
-        if (null === $module) {
-            $module = $this->getFrontController()->getDispatcher()->getDefaultModule();
-        }
-
-        return $module;
-    }
-
-    /**
-     * Get module directory
-     *
-     * @throws Zend_Controller_Action_Exception
-     * @return string
-     */
-    public function getModuleDirectory()
-    {
-        $module    = $this->getModule();
-        $moduleDir = $this->getFrontController()->getControllerDirectory($module);
-        if ((null === $moduleDir) || is_array($moduleDir)) {
-            /**
-             * @see Zend_Controller_Action_Exception
-             */
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory for module "' . $module . '"');
-        }
-        $this->_moduleDir = dirname($moduleDir);
-        return $this->_moduleDir;
-    }
-
-    /**
-     * Get inflector
-     *
-     * @return Zend_Filter_Inflector
-     */
-    public function getInflector()
-    {
-        if (null === $this->_inflector) {
-            /**
-             * @see Zend_Filter_Inflector
-             */
-            require_once 'Zend/Filter/Inflector.php';
-            /**
-             * @see Zend_Filter_PregReplace
-             */
-            require_once 'Zend/Filter/PregReplace.php';
-            /**
-             * @see Zend_Filter_Word_UnderscoreToSeparator
-             */
-            require_once 'Zend/Filter/Word/UnderscoreToSeparator.php';
-            $this->_inflector = new Zend_Filter_Inflector();
-            $this->_inflector->setStaticRuleReference('moduleDir', $this->_moduleDir) // moduleDir must be specified before the less specific 'module'
-                 ->addRules(array(
-                     ':module'     => array('Word_CamelCaseToDash', 'StringToLower'),
-                     ':controller' => array('Word_CamelCaseToDash', new Zend_Filter_Word_UnderscoreToSeparator('/'), 'StringToLower', new Zend_Filter_PregReplace('/\./', '-')),
-                     ':action'     => array('Word_CamelCaseToDash', new Zend_Filter_PregReplace('#[^a-z0-9' . preg_quote('/', '#') . ']+#i', '-'), 'StringToLower'),
-                 ))
-                 ->setStaticRuleReference('suffix', $this->_viewSuffix)
-                 ->setTargetReference($this->_inflectorTarget);
-        }
-
-        // Ensure that module directory is current
-        $this->getModuleDirectory();
-
-        return $this->_inflector;
-    }
-
-    /**
-     * Set inflector
-     *
-     * @param  Zend_Filter_Inflector $inflector
-     * @param  boolean               $reference Whether the moduleDir, target, and suffix should be set as references to ViewRenderer properties
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setInflector(Zend_Filter_Inflector $inflector, $reference = false)
-    {
-        $this->_inflector = $inflector;
-        if ($reference) {
-            $this->_inflector->setStaticRuleReference('suffix', $this->_viewSuffix)
-                 ->setStaticRuleReference('moduleDir', $this->_moduleDir)
-                 ->setTargetReference($this->_inflectorTarget);
-        }
-        return $this;
-    }
-
-    /**
-     * Set inflector target
-     *
-     * @param  string $target
-     * @return void
-     */
-    protected function _setInflectorTarget($target)
-    {
-        $this->_inflectorTarget = (string) $target;
-    }
-
-    /**
-     * Set internal module directory representation
-     *
-     * @param  string $dir
-     * @return void
-     */
-    protected function _setModuleDir($dir)
-    {
-        $this->_moduleDir = (string) $dir;
-    }
-
-    /**
-     * Get internal module directory representation
-     *
-     * @return string
-     */
-    protected function _getModuleDir()
-    {
-        return $this->_moduleDir;
-    }
-
-    /**
-     * Generate a class prefix for helper and filter classes
-     *
-     * @return string
-     */
-    protected function _generateDefaultPrefix()
-    {
-        $default = 'Zend_View';
-        if (null === $this->_actionController) {
-            return $default;
-        }
-
-        $class = get_class($this->_actionController);
-
-        if (!strstr($class, '_')) {
-            return $default;
-        }
-
-        $module = $this->getModule();
-        if ('default' == $module) {
-            return $default;
-        }
-
-        $prefix = substr($class, 0, strpos($class, '_')) . '_View';
-
-        return $prefix;
-    }
-
-    /**
-     * Retrieve base path based on location of current action controller
-     *
-     * @return string
-     */
-    protected function _getBasePath()
-    {
-        if (null === $this->_actionController) {
-            return './views';
-        }
-
-        $inflector = $this->getInflector();
-        $this->_setInflectorTarget($this->getViewBasePathSpec());
-
-        $dispatcher = $this->getFrontController()->getDispatcher();
-        $request = $this->getRequest();
-
-        $parts = array(
-            'module'     => (($moduleName = $request->getModuleName()) != '') ? $dispatcher->formatModuleName($moduleName) : $moduleName,
-            'controller' => $request->getControllerName(),
-            'action'     => $dispatcher->formatActionName($request->getActionName())
-            );
-
-        $path = $inflector->filter($parts);
-        return $path;
-    }
-
-    /**
-     * Set options
-     *
-     * @param  array $options
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    protected function _setOptions(array $options)
-    {
-        foreach ($options as $key => $value)
-        {
-            switch ($key) {
-                case 'neverRender':
-                case 'neverController':
-                case 'noController':
-                case 'noRender':
-                    $property = '_' . $key;
-                    $this->{$property} = ($value) ? true : false;
-                    break;
-                case 'responseSegment':
-                case 'scriptAction':
-                case 'viewBasePathSpec':
-                case 'viewScriptPathSpec':
-                case 'viewScriptPathNoControllerSpec':
-                case 'viewSuffix':
-                    $property = '_' . $key;
-                    $this->{$property} = (string) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Initialize the view object
-     *
-     * $options may contain the following keys:
-     * - neverRender - flag dis/enabling postDispatch() autorender (affects all subsequent calls)
-     * - noController - flag indicating whether or not to look for view scripts in subdirectories named after the controller
-     * - noRender - flag indicating whether or not to autorender postDispatch()
-     * - responseSegment - which named response segment to render a view script to
-     * - scriptAction - what action script to render
-     * - viewBasePathSpec - specification to use for determining view base path
-     * - viewScriptPathSpec - specification to use for determining view script paths
-     * - viewScriptPathNoControllerSpec - specification to use for determining view script paths when noController flag is set
-     * - viewSuffix - what view script filename suffix to use
-     *
-     * @param  string $path
-     * @param  string $prefix
-     * @param  array  $options
-     * @throws Zend_Controller_Action_Exception
-     * @return void
-     */
-    public function initView($path = null, $prefix = null, array $options = array())
-    {
-        if (null === $this->view) {
-            $this->setView(new Zend_View());
-        }
-
-        // Reset some flags every time
-        $options['noController'] = (isset($options['noController'])) ? $options['noController'] : false;
-        $options['noRender']     = (isset($options['noRender'])) ? $options['noRender'] : false;
-        $this->_scriptAction     = null;
-        $this->_responseSegment  = null;
-
-        // Set options first; may be used to determine other initializations
-        $this->_setOptions($options);
-
-        // Get base view path
-        if (empty($path)) {
-            $path = $this->_getBasePath();
-            if (empty($path)) {
-                /**
-                 * @see Zend_Controller_Action_Exception
-                 */
-                require_once 'Zend/Controller/Action/Exception.php';
-                throw new Zend_Controller_Action_Exception('ViewRenderer initialization failed: retrieved view base path is empty');
-            }
-        }
-
-        if (null === $prefix) {
-            $prefix = $this->_generateDefaultPrefix();
-        }
-
-        // Determine if this path has already been registered
-        $currentPaths = $this->view->getScriptPaths();
-        $path         = str_replace(array('/', '\\'), '/', $path);
-        $pathExists   = false;
-        foreach ($currentPaths as $tmpPath) {
-            $tmpPath = str_replace(array('/', '\\'), '/', $tmpPath);
-            if (strstr($tmpPath, $path)) {
-                $pathExists = true;
-                break;
-            }
-        }
-        if (!$pathExists) {
-            $this->view->addBasePath($path, $prefix);
-        }
-
-        // Register view with action controller (unless already registered)
-        if ((null !== $this->_actionController) && (null === $this->_actionController->view)) {
-            $this->_actionController->view       = $this->view;
-            $this->_actionController->viewSuffix = $this->_viewSuffix;
-        }
-    }
-
-    /**
-     * init - initialize view
-     *
-     * @return void
-     */
-    public function init()
-    {
-        if ($this->getFrontController()->getParam('noViewRenderer')) {
-            return;
-        }
-
-        $this->initView();
-    }
-
-    /**
-     * Set view basePath specification
-     *
-     * Specification can contain one or more of the following:
-     * - :moduleDir - current module directory
-     * - :controller - name of current controller in the request
-     * - :action - name of current action in the request
-     * - :module - name of current module in the request
-     *
-     * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setViewBasePathSpec($path)
-    {
-        $this->_viewBasePathSpec = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current view basePath specification string
-     *
-     * @return string
-     */
-    public function getViewBasePathSpec()
-    {
-        return $this->_viewBasePathSpec;
-    }
-
-    /**
-     * Set view script path specification
-     *
-     * Specification can contain one or more of the following:
-     * - :moduleDir - current module directory
-     * - :controller - name of current controller in the request
-     * - :action - name of current action in the request
-     * - :module - name of current module in the request
-     *
-     * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setViewScriptPathSpec($path)
-    {
-        $this->_viewScriptPathSpec = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current view script path specification string
-     *
-     * @return string
-     */
-    public function getViewScriptPathSpec()
-    {
-        return $this->_viewScriptPathSpec;
-    }
-
-    /**
-     * Set view script path specification (no controller variant)
-     *
-     * Specification can contain one or more of the following:
-     * - :moduleDir - current module directory
-     * - :controller - name of current controller in the request
-     * - :action - name of current action in the request
-     * - :module - name of current module in the request
-     *
-     * :controller will likely be ignored in this variant.
-     *
-     * @param  string $path
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setViewScriptPathNoControllerSpec($path)
-    {
-        $this->_viewScriptPathNoControllerSpec = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current view script path specification string (no controller variant)
-     *
-     * @return string
-     */
-    public function getViewScriptPathNoControllerSpec()
-    {
-        return $this->_viewScriptPathNoControllerSpec;
-    }
-
-    /**
-     * Get a view script based on an action and/or other variables
-     *
-     * Uses values found in current request if no values passed in $vars.
-     *
-     * If {@link $_noController} is set, uses {@link $_viewScriptPathNoControllerSpec};
-     * otherwise, uses {@link $_viewScriptPathSpec}.
-     *
-     * @param  string $action
-     * @param  array  $vars
-     * @return string
-     */
-    public function getViewScript($action = null, array $vars = array())
-    {
-        $request = $this->getRequest();
-        if ((null === $action) && (!isset($vars['action']))) {
-            $action = $this->getScriptAction();
-            if (null === $action) {
-                $action = $request->getActionName();
-            }
-            $vars['action'] = $action;
-        } elseif (null !== $action) {
-            $vars['action'] = $action;
-        }
-
-        $inflector = $this->getInflector();
-        if ($this->getNoController() || $this->getNeverController()) {
-            $this->_setInflectorTarget($this->getViewScriptPathNoControllerSpec());
-        } else {
-            $this->_setInflectorTarget($this->getViewScriptPathSpec());
-        }
-        return $this->_translateSpec($vars);
-    }
-
-    /**
-     * Set the neverRender flag (i.e., globally dis/enable autorendering)
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setNeverRender($flag = true)
-    {
-        $this->_neverRender = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve neverRender flag value
-     *
-     * @return boolean
-     */
-    public function getNeverRender()
-    {
-        return $this->_neverRender;
-    }
-
-    /**
-     * Set the noRender flag (i.e., whether or not to autorender)
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setNoRender($flag = true)
-    {
-        $this->_noRender = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve noRender flag value
-     *
-     * @return boolean
-     */
-    public function getNoRender()
-    {
-        return $this->_noRender;
-    }
-
-    /**
-     * Set the view script to use
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setScriptAction($name)
-    {
-        $this->_scriptAction = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve view script name
-     *
-     * @return string
-     */
-    public function getScriptAction()
-    {
-        return $this->_scriptAction;
-    }
-
-    /**
-     * Set the response segment name
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setResponseSegment($name)
-    {
-        if (null === $name) {
-            $this->_responseSegment = null;
-        } else {
-            $this->_responseSegment = (string) $name;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve named response segment name
-     *
-     * @return string
-     */
-    public function getResponseSegment()
-    {
-        return $this->_responseSegment;
-    }
-
-    /**
-     * Set the noController flag (i.e., whether or not to render into controller subdirectories)
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setNoController($flag = true)
-    {
-        $this->_noController = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve noController flag value
-     *
-     * @return boolean
-     */
-    public function getNoController()
-    {
-        return $this->_noController;
-    }
-
-    /**
-     * Set the neverController flag (i.e., whether or not to render into controller subdirectories)
-     *
-     * @param  boolean $flag
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setNeverController($flag = true)
-    {
-        $this->_neverController = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve neverController flag value
-     *
-     * @return boolean
-     */
-    public function getNeverController()
-    {
-        return $this->_neverController;
-    }
-
-    /**
-     * Set view script suffix
-     *
-     * @param  string $suffix
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setViewSuffix($suffix)
-    {
-        $this->_viewSuffix = (string) $suffix;
-        return $this;
-    }
-
-    /**
-     * Get view script suffix
-     *
-     * @return string
-     */
-    public function getViewSuffix()
-    {
-        return $this->_viewSuffix;
-    }
-
-    /**
-     * Set options for rendering a view script
-     *
-     * @param  string  $action       View script to render
-     * @param  string  $name         Response named segment to render to
-     * @param  boolean $noController Whether or not to render within a subdirectory named after the controller
-     * @return Zend_Controller_Action_Helper_ViewRenderer Provides a fluent interface
-     */
-    public function setRender($action = null, $name = null, $noController = null)
-    {
-        if (null !== $action) {
-            $this->setScriptAction($action);
-        }
-
-        if (null !== $name) {
-            $this->setResponseSegment($name);
-        }
-
-        if (null !== $noController) {
-            $this->setNoController($noController);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Inflect based on provided vars
-     *
-     * Allowed variables are:
-     * - :moduleDir - current module directory
-     * - :module - current module name
-     * - :controller - current controller name
-     * - :action - current action name
-     * - :suffix - view script file suffix
-     *
-     * @param  array $vars
-     * @return string
-     */
-    protected function _translateSpec(array $vars = array())
-    {
-        $inflector  = $this->getInflector();
-        $request    = $this->getRequest();
-        $dispatcher = $this->getFrontController()->getDispatcher();
-        $module     = $dispatcher->formatModuleName($request->getModuleName());
-        $controller = $request->getControllerName();
-        $action     = $dispatcher->formatActionName($request->getActionName());
-
-        $params     = compact('module', 'controller', 'action');
-        foreach ($vars as $key => $value) {
-            switch ($key) {
-                case 'module':
-                case 'controller':
-                case 'action':
-                case 'moduleDir':
-                case 'suffix':
-                    $params[$key] = (string) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        if (isset($params['suffix'])) {
-            $origSuffix = $this->getViewSuffix();
-            $this->setViewSuffix($params['suffix']);
-        }
-        if (isset($params['moduleDir'])) {
-            $origModuleDir = $this->_getModuleDir();
-            $this->_setModuleDir($params['moduleDir']);
-        }
-
-        $filtered = $inflector->filter($params);
-
-        if (isset($params['suffix'])) {
-            $this->setViewSuffix($origSuffix);
-        }
-        if (isset($params['moduleDir'])) {
-            $this->_setModuleDir($origModuleDir);
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Render a view script (optionally to a named response segment)
-     *
-     * Sets the noRender flag to true when called.
-     *
-     * @param  string $script
-     * @param  string $name
-     * @return void
-     */
-    public function renderScript($script, $name = null)
-    {
-        if (null === $name) {
-            $name = $this->getResponseSegment();
-        }
-
-        $this->getResponse()->appendBody(
-            $this->view->render($script),
-            $name
-        );
-
-        $this->setNoRender();
-    }
-
-    /**
-     * Render a view based on path specifications
-     *
-     * Renders a view based on the view script path specifications.
-     *
-     * @param  string  $action
-     * @param  string  $name
-     * @param  boolean $noController
-     * @return void
-     */
-    public function render($action = null, $name = null, $noController = null)
-    {
-        $this->setRender($action, $name, $noController);
-        $path = $this->getViewScript();
-        $this->renderScript($path, $name);
-    }
-
-    /**
-     * Render a script based on specification variables
-     *
-     * Pass an action, and one or more specification variables (view script suffix)
-     * to determine the view script path, and render that script.
-     *
-     * @param  string $action
-     * @param  array  $vars
-     * @param  string $name
-     * @return void
-     */
-    public function renderBySpec($action = null, array $vars = array(), $name = null)
-    {
-        if (null !== $name) {
-            $this->setResponseSegment($name);
-        }
-
-        $path = $this->getViewScript($action, $vars);
-
-        $this->renderScript($path);
-    }
-
-    /**
-     * postDispatch - auto render a view
-     *
-     * Only autorenders if:
-     * - _noRender is false
-     * - action controller is present
-     * - request has not been re-dispatched (i.e., _forward() has not been called)
-     * - response is not a redirect
-     *
-     * @return void
-     */
-    public function postDispatch()
-    {
-        if ($this->_shouldRender()) {
-            $this->render();
-        }
-    }
-
-    /**
-     * Should the ViewRenderer render a view script?
-     *
-     * @return boolean
-     */
-    protected function _shouldRender()
-    {
-        return (!$this->getFrontController()->getParam('noViewRenderer')
-            && !$this->_neverRender
-            && !$this->_noRender
-            && (null !== $this->_actionController)
-            && $this->getRequest()->isDispatched()
-            && !$this->getResponse()->isRedirect()
-        );
-    }
-
-    /**
-     * Use this helper as a method; proxies to setRender()
-     *
-     * @param  string  $action
-     * @param  string  $name
-     * @param  boolean $noController
-     * @return void
-     */
-    public function direct($action = null, $name = null, $noController = null)
-    {
-        $this->setRender($action, $name, $noController);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/HelperBroker.php b/airtime_mvc/library/Zend/Controller/Action/HelperBroker.php
deleted file mode 100644
index 387b6c3a9..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/HelperBroker.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelperBroker.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Action_HelperBroker_PriorityStack
- */
-require_once 'Zend/Controller/Action/HelperBroker/PriorityStack.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_HelperBroker
-{
-    /**
-     * $_actionController - ActionController reference
-     *
-     * @var Zend_Controller_Action
-     */
-    protected $_actionController;
-
-    /**
-     * @var Zend_Loader_PluginLoader_Interface
-     */
-    protected static $_pluginLoader;
-
-    /**
-     * $_helpers - Helper array
-     *
-     * @var Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    protected static $_stack = null;
-
-    /**
-     * Set PluginLoader for use with broker
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @return void
-     */
-    public static function setPluginLoader($loader)
-    {
-        if ((null !== $loader) && (!$loader instanceof Zend_Loader_PluginLoader_Interface)) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Invalid plugin loader provided to HelperBroker');
-        }
-        self::$_pluginLoader = $loader;
-    }
-
-    /**
-     * Retrieve PluginLoader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getPluginLoader()
-    {
-        if (null === self::$_pluginLoader) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            self::$_pluginLoader = new Zend_Loader_PluginLoader(array(
-                'Zend_Controller_Action_Helper' => 'Zend/Controller/Action/Helper/',
-            ));
-        }
-        return self::$_pluginLoader;
-    }
-
-    /**
-     * addPrefix() - Add repository of helpers by prefix
-     *
-     * @param string $prefix
-     */
-    static public function addPrefix($prefix)
-    {
-        $prefix = rtrim($prefix, '_');
-        $path   = str_replace('_', DIRECTORY_SEPARATOR, $prefix);
-        self::getPluginLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * addPath() - Add path to repositories where Action_Helpers could be found.
-     *
-     * @param string $path
-     * @param string $prefix Optional; defaults to 'Zend_Controller_Action_Helper'
-     * @return void
-     */
-    static public function addPath($path, $prefix = 'Zend_Controller_Action_Helper')
-    {
-        self::getPluginLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * addHelper() - Add helper objects
-     *
-     * @param Zend_Controller_Action_Helper_Abstract $helper
-     * @return void
-     */
-    static public function addHelper(Zend_Controller_Action_Helper_Abstract $helper)
-    {
-        self::getStack()->push($helper);
-        return;
-    }
-
-    /**
-     * resetHelpers()
-     *
-     * @return void
-     */
-    static public function resetHelpers()
-    {
-        self::$_stack = null;
-        return;
-    }
-
-    /**
-     * Retrieve or initialize a helper statically
-     *
-     * Retrieves a helper object statically, loading on-demand if the helper
-     * does not already exist in the stack. Always returns a helper, unless
-     * the helper class cannot be found.
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public static function getStaticHelper($name)
-    {
-        $name  = self::_normalizeHelperName($name);
-        $stack = self::getStack();
-
-        if (!isset($stack->{$name})) {
-            self::_loadHelper($name);
-        }
-
-        return $stack->{$name};
-    }
-
-    /**
-     * getExistingHelper() - get helper by name
-     *
-     * Static method to retrieve helper object. Only retrieves helpers already
-     * initialized with the broker (either via addHelper() or on-demand loading
-     * via getHelper()).
-     *
-     * Throws an exception if the referenced helper does not exist in the
-     * stack; use {@link hasHelper()} to check if the helper is registered
-     * prior to retrieving it.
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_Abstract
-     * @throws Zend_Controller_Action_Exception
-     */
-    public static function getExistingHelper($name)
-    {
-        $name  = self::_normalizeHelperName($name);
-        $stack = self::getStack();
-
-        if (!isset($stack->{$name})) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker');
-        }
-
-        return $stack->{$name};
-    }
-
-    /**
-     * Return all registered helpers as helper => object pairs
-     *
-     * @return array
-     */
-    public static function getExistingHelpers()
-    {
-        return self::getStack()->getHelpersByName();
-    }
-
-    /**
-     * Is a particular helper loaded in the broker?
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public static function hasHelper($name)
-    {
-        $name = self::_normalizeHelperName($name);
-        return isset(self::getStack()->{$name});
-    }
-
-    /**
-     * Remove a particular helper from the broker
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public static function removeHelper($name)
-    {
-        $name = self::_normalizeHelperName($name);
-        $stack = self::getStack();
-        if (isset($stack->{$name})) {
-            unset($stack->{$name});
-        }
-
-        return false;
-    }
-
-    /**
-     * Lazy load the priority stack and return it
-     *
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public static function getStack()
-    {
-        if (self::$_stack == null) {
-            self::$_stack = new Zend_Controller_Action_HelperBroker_PriorityStack();
-        }
-
-        return self::$_stack;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param Zend_Controller_Action $actionController
-     * @return void
-     */
-    public function __construct(Zend_Controller_Action $actionController)
-    {
-        $this->_actionController = $actionController;
-        foreach (self::getStack() as $helper) {
-            $helper->setActionController($actionController);
-            $helper->init();
-        }
-    }
-
-    /**
-     * notifyPreDispatch() - called by action controller dispatch method
-     *
-     * @return void
-     */
-    public function notifyPreDispatch()
-    {
-        foreach (self::getStack() as $helper) {
-            $helper->preDispatch();
-        }
-    }
-
-    /**
-     * notifyPostDispatch() - called by action controller dispatch method
-     *
-     * @return void
-     */
-    public function notifyPostDispatch()
-    {
-        foreach (self::getStack() as $helper) {
-            $helper->postDispatch();
-        }
-    }
-
-    /**
-     * getHelper() - get helper by name
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function getHelper($name)
-    {
-        $name  = self::_normalizeHelperName($name);
-        $stack = self::getStack();
-
-        if (!isset($stack->{$name})) {
-            self::_loadHelper($name);
-        }
-
-        $helper = $stack->{$name};
-
-        $initialize = false;
-        if (null === ($actionController = $helper->getActionController())) {
-            $initialize = true;
-        } elseif ($actionController !== $this->_actionController) {
-            $initialize = true;
-        }
-
-        if ($initialize) {
-            $helper->setActionController($this->_actionController)
-                   ->init();
-        }
-
-        return $helper;
-    }
-
-    /**
-     * Method overloading
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Controller_Action_Exception if helper does not have a direct() method
-     */
-    public function __call($method, $args)
-    {
-        $helper = $this->getHelper($method);
-        if (!method_exists($helper, 'direct')) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Helper "' . $method . '" does not support overloading via direct()');
-        }
-        return call_user_func_array(array($helper, 'direct'), $args);
-    }
-
-    /**
-     * Retrieve helper by name as object property
-     *
-     * @param  string $name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function __get($name)
-    {
-        return $this->getHelper($name);
-    }
-
-    /**
-     * Normalize helper name for lookups
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected static function _normalizeHelperName($name)
-    {
-        if (strpos($name, '_') !== false) {
-            $name = str_replace(' ', '', ucwords(str_replace('_', ' ', $name)));
-        }
-
-        return ucfirst($name);
-    }
-
-    /**
-     * Load a helper
-     *
-     * @param  string $name
-     * @return void
-     */
-    protected static function _loadHelper($name)
-    {
-        try {
-            $class = self::getPluginLoader()->load($name);
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Action Helper by name ' . $name . ' not found', 0, $e);
-        }
-
-        $helper = new $class();
-
-        if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('Helper name ' . $name . ' -> class ' . $class . ' is not of type Zend_Controller_Action_Helper_Abstract');
-        }
-
-        self::getStack()->push($helper);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/HelperBroker/PriorityStack.php b/airtime_mvc/library/Zend/Controller/Action/HelperBroker/PriorityStack.php
deleted file mode 100644
index bc84c45c2..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/HelperBroker/PriorityStack.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PriorityStack.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable
-{
-
-    protected $_helpersByPriority = array();
-    protected $_helpersByNameRef  = array();
-    protected $_nextDefaultPriority = 1;
-
-    /**
-     * Magic property overloading for returning helper by name
-     *
-     * @param string $helperName    The helper name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function __get($helperName)
-    {
-        if (!array_key_exists($helperName, $this->_helpersByNameRef)) {
-            return false;
-        }
-
-        return $this->_helpersByNameRef[$helperName];
-    }
-
-    /**
-     * Magic property overloading for returning if helper is set by name
-     *
-     * @param string $helperName    The helper name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function __isset($helperName)
-    {
-        return array_key_exists($helperName, $this->_helpersByNameRef);
-    }
-
-    /**
-     * Magic property overloading for unsetting if helper is exists by name
-     *
-     * @param string $helperName    The helper name
-     * @return Zend_Controller_Action_Helper_Abstract
-     */
-    public function __unset($helperName)
-    {
-        return $this->offsetUnset($helperName);
-    }
-
-    /**
-     * push helper onto the stack
-     *
-     * @param Zend_Controller_Action_Helper_Abstract $helper
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public function push(Zend_Controller_Action_Helper_Abstract $helper)
-    {
-        $this->offsetSet($this->getNextFreeHigherPriority(), $helper);
-        return $this;
-    }
-
-    /**
-     * Return something iterable
-     *
-     * @return array
-     */
-    public function getIterator()
-    {
-        return new ArrayObject($this->_helpersByPriority);
-    }
-
-    /**
-     * offsetExists()
-     *
-     * @param int|string $priorityOrHelperName
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public function offsetExists($priorityOrHelperName)
-    {
-        if (is_string($priorityOrHelperName)) {
-            return array_key_exists($priorityOrHelperName, $this->_helpersByNameRef);
-        } else {
-            return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
-        }
-    }
-
-    /**
-     * offsetGet()
-     *
-     * @param int|string $priorityOrHelperName
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public function offsetGet($priorityOrHelperName)
-    {
-        if (!$this->offsetExists($priorityOrHelperName)) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('A helper with priority ' . $priorityOrHelperName . ' does not exist.');
-        }
-
-        if (is_string($priorityOrHelperName)) {
-            return $this->_helpersByNameRef[$priorityOrHelperName];
-        } else {
-            return $this->_helpersByPriority[$priorityOrHelperName];
-        }
-    }
-
-    /**
-     * offsetSet()
-     *
-     * @param int $priority
-     * @param Zend_Controller_Action_Helper_Abstract $helper
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public function offsetSet($priority, $helper)
-    {
-        $priority = (int) $priority;
-
-        if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.');
-        }
-
-        if (array_key_exists($helper->getName(), $this->_helpersByNameRef)) {
-            // remove any object with the same name to retain BC compailitbility
-            // @todo At ZF 2.0 time throw an exception here.
-            $this->offsetUnset($helper->getName());
-        }
-
-        if (array_key_exists($priority, $this->_helpersByPriority)) {
-            $priority = $this->getNextFreeHigherPriority($priority);  // ensures LIFO
-            trigger_error("A helper with the same priority already exists, reassigning to $priority", E_USER_WARNING);
-        }
-
-        $this->_helpersByPriority[$priority] = $helper;
-        $this->_helpersByNameRef[$helper->getName()] = $helper;
-
-        if ($priority == ($nextFreeDefault = $this->getNextFreeHigherPriority($this->_nextDefaultPriority))) {
-            $this->_nextDefaultPriority = $nextFreeDefault;
-        }
-
-        krsort($this->_helpersByPriority);  // always make sure priority and LIFO are both enforced
-        return $this;
-    }
-
-    /**
-     * offsetUnset()
-     *
-     * @param int|string $priorityOrHelperName Priority integer or the helper name
-     * @return Zend_Controller_Action_HelperBroker_PriorityStack
-     */
-    public function offsetUnset($priorityOrHelperName)
-    {
-        if (!$this->offsetExists($priorityOrHelperName)) {
-            require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.');
-        }
-
-        if (is_string($priorityOrHelperName)) {
-            $helperName = $priorityOrHelperName;
-            $helper = $this->_helpersByNameRef[$helperName];
-            $priority = array_search($helper, $this->_helpersByPriority, true);
-        } else {
-            $priority = $priorityOrHelperName;
-            $helperName = $this->_helpersByPriority[$priorityOrHelperName]->getName();
-        }
-
-        unset($this->_helpersByNameRef[$helperName]);
-        unset($this->_helpersByPriority[$priority]);
-        return $this;
-    }
-
-    /**
-     * return the count of helpers
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_helpersByPriority);
-    }
-
-    /**
-     * Find the next free higher priority.  If an index is given, it will
-     * find the next free highest priority after it.
-     *
-     * @param int $indexPriority OPTIONAL
-     * @return int
-     */
-    public function getNextFreeHigherPriority($indexPriority = null)
-    {
-        if ($indexPriority == null) {
-            $indexPriority = $this->_nextDefaultPriority;
-        }
-
-        $priorities = array_keys($this->_helpersByPriority);
-
-        while (in_array($indexPriority, $priorities)) {
-            $indexPriority++;
-        }
-
-        return $indexPriority;
-    }
-
-    /**
-     * Find the next free lower priority.  If an index is given, it will
-     * find the next free lower priority before it.
-     *
-     * @param int $indexPriority
-     * @return int
-     */
-    public function getNextFreeLowerPriority($indexPriority = null)
-    {
-        if ($indexPriority == null) {
-            $indexPriority = $this->_nextDefaultPriority;
-        }
-
-        $priorities = array_keys($this->_helpersByPriority);
-
-        while (in_array($indexPriority, $priorities)) {
-            $indexPriority--;
-        }
-
-        return $indexPriority;
-    }
-
-    /**
-     * return the highest priority
-     *
-     * @return int
-     */
-    public function getHighestPriority()
-    {
-        return max(array_keys($this->_helpersByPriority));
-    }
-
-    /**
-     * return the lowest priority
-     *
-     * @return int
-     */
-    public function getLowestPriority()
-    {
-        return min(array_keys($this->_helpersByPriority));
-    }
-
-    /**
-     * return the helpers referenced by name
-     *
-     * @return array
-     */
-    public function getHelpersByName()
-    {
-        return $this->_helpersByNameRef;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Action/Interface.php b/airtime_mvc/library/Zend/Controller/Action/Interface.php
deleted file mode 100644
index eb00ada36..000000000
--- a/airtime_mvc/library/Zend/Controller/Action/Interface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Controller_Action_Interface
-{
-    /**
-     * Class constructor
-     *
-     * The request and response objects should be registered with the
-     * controller, as should be any additional optional arguments; these will be
-     * available via {@link getRequest()}, {@link getResponse()}, and
-     * {@link getInvokeArgs()}, respectively.
-     *
-     * When overriding the constructor, please consider this usage as a best
-     * practice and ensure that each is registered appropriately; the easiest
-     * way to do so is to simply call parent::__construct($request, $response,
-     * $invokeArgs).
-     *
-     * After the request, response, and invokeArgs are set, the
-     * {@link $_helper helper broker} is initialized.
-     *
-     * Finally, {@link init()} is called as the final action of
-     * instantiation, and may be safely overridden to perform initialization
-     * tasks; as a general rule, override {@link init()} instead of the
-     * constructor to customize an action controller's instantiation.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @param Zend_Controller_Response_Abstract $response
-     * @param array $invokeArgs Any additional invocation arguments
-     * @return void
-     */
-    public function __construct(Zend_Controller_Request_Abstract $request,
-                                Zend_Controller_Response_Abstract $response,
-                                array $invokeArgs = array());
-
-    /**
-     * Dispatch the requested action
-     *
-     * @param string $action Method name of action
-     * @return void
-     */
-    public function dispatch($action);
-}
diff --git a/airtime_mvc/library/Zend/Controller/Dispatcher/Abstract.php b/airtime_mvc/library/Zend/Controller/Dispatcher/Abstract.php
deleted file mode 100644
index 064ceefa0..000000000
--- a/airtime_mvc/library/Zend/Controller/Dispatcher/Abstract.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Controller_Dispatcher_Interface */
-require_once 'Zend/Controller/Dispatcher/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Dispatcher_Interface
-{
-    /**
-     * Default action
-     * @var string
-     */
-    protected $_defaultAction = 'index';
-
-    /**
-     * Default controller
-     * @var string
-     */
-    protected $_defaultController = 'index';
-
-    /**
-     * Default module
-     * @var string
-     */
-    protected $_defaultModule = 'default';
-
-    /**
-     * Front Controller instance
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
-     * Array of invocation parameters to use when instantiating action
-     * controllers
-     * @var array
-     */
-    protected $_invokeParams = array();
-
-    /**
-     * Path delimiter character
-     * @var string
-     */
-    protected $_pathDelimiter = '_';
-
-    /**
-     * Response object to pass to action controllers, if any
-     * @var Zend_Controller_Response_Abstract|null
-     */
-    protected $_response = null;
-
-    /**
-     * Word delimiter characters
-     * @var array
-     */
-    protected $_wordDelimiter = array('-', '.');
-
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct(array $params = array())
-    {
-        $this->setParams($params);
-    }
-
-    /**
-     * Formats a string into a controller name.  This is used to take a raw
-     * controller name, such as one stored inside a Zend_Controller_Request_Abstract
-     * object, and reformat it to a proper class name that a class extending
-     * Zend_Controller_Action would use.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatControllerName($unformatted)
-    {
-        return ucfirst($this->_formatName($unformatted)) . 'Controller';
-    }
-
-    /**
-     * Formats a string into an action name.  This is used to take a raw
-     * action name, such as one that would be stored inside a Zend_Controller_Request_Abstract
-     * object, and reformat into a proper method name that would be found
-     * inside a class extending Zend_Controller_Action.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatActionName($unformatted)
-    {
-        $formatted = $this->_formatName($unformatted, true);
-        return strtolower(substr($formatted, 0, 1)) . substr($formatted, 1) . 'Action';
-    }
-
-    /**
-     * Verify delimiter
-     *
-     * Verify a delimiter to use in controllers or actions. May be a single
-     * string or an array of strings.
-     *
-     * @param string|array $spec
-     * @return array
-     * @throws Zend_Controller_Dispatcher_Exception with invalid delimiters
-     */
-    public function _verifyDelimiter($spec)
-    {
-        if (is_string($spec)) {
-            return (array) $spec;
-        } elseif (is_array($spec)) {
-            $allStrings = true;
-            foreach ($spec as $delim) {
-                if (!is_string($delim)) {
-                    $allStrings = false;
-                    break;
-                }
-            }
-
-            if (!$allStrings) {
-                require_once 'Zend/Controller/Dispatcher/Exception.php';
-                throw new Zend_Controller_Dispatcher_Exception('Word delimiter array must contain only strings');
-            }
-
-            return $spec;
-        }
-
-        require_once 'Zend/Controller/Dispatcher/Exception.php';
-        throw new Zend_Controller_Dispatcher_Exception('Invalid word delimiter');
-    }
-
-    /**
-     * Retrieve the word delimiter character(s) used in
-     * controller or action names
-     *
-     * @return array
-     */
-    public function getWordDelimiter()
-    {
-        return $this->_wordDelimiter;
-    }
-
-    /**
-     * Set word delimiter
-     *
-     * Set the word delimiter to use in controllers and actions. May be a
-     * single string or an array of strings.
-     *
-     * @param string|array $spec
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setWordDelimiter($spec)
-    {
-        $spec = $this->_verifyDelimiter($spec);
-        $this->_wordDelimiter = $spec;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve the path delimiter character(s) used in
-     * controller names
-     *
-     * @return array
-     */
-    public function getPathDelimiter()
-    {
-        return $this->_pathDelimiter;
-    }
-
-    /**
-     * Set path delimiter
-     *
-     * Set the path delimiter to use in controllers. May be a single string or
-     * an array of strings.
-     *
-     * @param string $spec
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setPathDelimiter($spec)
-    {
-        if (!is_string($spec)) {
-            require_once 'Zend/Controller/Dispatcher/Exception.php';
-            throw new Zend_Controller_Dispatcher_Exception('Invalid path delimiter');
-        }
-        $this->_pathDelimiter = $spec;
-
-        return $this;
-    }
-
-    /**
-     * Formats a string from a URI into a PHP-friendly name.
-     *
-     * By default, replaces words separated by the word separator character(s)
-     * with camelCaps. If $isAction is false, it also preserves replaces words
-     * separated by the path separation character with an underscore, making
-     * the following word Title cased. All non-alphanumeric characters are
-     * removed.
-     *
-     * @param string $unformatted
-     * @param boolean $isAction Defaults to false
-     * @return string
-     */
-    protected function _formatName($unformatted, $isAction = false)
-    {
-        // preserve directories
-        if (!$isAction) {
-            $segments = explode($this->getPathDelimiter(), $unformatted);
-        } else {
-            $segments = (array) $unformatted;
-        }
-
-        foreach ($segments as $key => $segment) {
-            $segment        = str_replace($this->getWordDelimiter(), ' ', strtolower($segment));
-            $segment        = preg_replace('/[^a-z0-9 ]/', '', $segment);
-            $segments[$key] = str_replace(' ', '', ucwords($segment));
-        }
-
-        return implode('_', $segments);
-    }
-
-    /**
-     * Retrieve front controller instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        if (null === $this->_frontController) {
-            require_once 'Zend/Controller/Front.php';
-            $this->_frontController = Zend_Controller_Front::getInstance();
-        }
-
-        return $this->_frontController;
-    }
-
-    /**
-     * Set front controller instance
-     *
-     * @param Zend_Controller_Front $controller
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setFrontController(Zend_Controller_Front $controller)
-    {
-        $this->_frontController = $controller;
-        return $this;
-    }
-
-    /**
-     * Add or modify a parameter to use when instantiating an action controller
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setParam($name, $value)
-    {
-        $name = (string) $name;
-        $this->_invokeParams[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Set parameters to pass to action controller constructors
-     *
-     * @param array $params
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setParams(array $params)
-    {
-        $this->_invokeParams = array_merge($this->_invokeParams, $params);
-        return $this;
-    }
-
-    /**
-     * Retrieve a single parameter from the controller parameter stack
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function getParam($name)
-    {
-        if(isset($this->_invokeParams[$name])) {
-            return $this->_invokeParams[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve action controller instantiation parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_invokeParams;
-    }
-
-    /**
-     * Clear the controller parameter stack
-     *
-     * By default, clears all parameters. If a parameter name is given, clears
-     * only that parameter; if an array of parameter names is provided, clears
-     * each.
-     *
-     * @param null|string|array single key or array of keys for params to clear
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function clearParams($name = null)
-    {
-        if (null === $name) {
-            $this->_invokeParams = array();
-        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
-            unset($this->_invokeParams[$name]);
-        } elseif (is_array($name)) {
-            foreach ($name as $key) {
-                if (is_string($key) && isset($this->_invokeParams[$key])) {
-                    unset($this->_invokeParams[$key]);
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set response object to pass to action controllers
-     *
-     * @param Zend_Controller_Response_Abstract|null $response
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setResponse(Zend_Controller_Response_Abstract $response = null)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Return the registered response object
-     *
-     * @return Zend_Controller_Response_Abstract|null
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Set the default controller (minus any formatting)
-     *
-     * @param string $controller
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setDefaultControllerName($controller)
-    {
-        $this->_defaultController = (string) $controller;
-        return $this;
-    }
-
-    /**
-     * Retrieve the default controller name (minus formatting)
-     *
-     * @return string
-     */
-    public function getDefaultControllerName()
-    {
-        return $this->_defaultController;
-    }
-
-    /**
-     * Set the default action (minus any formatting)
-     *
-     * @param string $action
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setDefaultAction($action)
-    {
-        $this->_defaultAction = (string) $action;
-        return $this;
-    }
-
-    /**
-     * Retrieve the default action name (minus formatting)
-     *
-     * @return string
-     */
-    public function getDefaultAction()
-    {
-        return $this->_defaultAction;
-    }
-
-    /**
-     * Set the default module
-     *
-     * @param string $module
-     * @return Zend_Controller_Dispatcher_Abstract
-     */
-    public function setDefaultModule($module)
-    {
-        $this->_defaultModule = (string) $module;
-        return $this;
-    }
-
-    /**
-     * Retrieve the default module
-     *
-     * @return string
-     */
-    public function getDefaultModule()
-    {
-        return $this->_defaultModule;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Dispatcher/Exception.php b/airtime_mvc/library/Zend/Controller/Dispatcher/Exception.php
deleted file mode 100644
index 7a58cf8ac..000000000
--- a/airtime_mvc/library/Zend/Controller/Dispatcher/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Exception */
-require_once 'Zend/Controller/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Dispatcher_Exception extends Zend_Controller_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Controller/Dispatcher/Interface.php b/airtime_mvc/library/Zend/Controller/Dispatcher/Interface.php
deleted file mode 100644
index 827672898..000000000
--- a/airtime_mvc/library/Zend/Controller/Dispatcher/Interface.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Controller_Request_Abstract
- */
-require_once 'Zend/Controller/Request/Abstract.php';
-
-/**
- * Zend_Controller_Response_Abstract
- */
-require_once 'Zend/Controller/Response/Abstract.php';
-
-/**
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Controller_Dispatcher_Interface
-{
-    /**
-     * Formats a string into a controller name.  This is used to take a raw
-     * controller name, such as one that would be packaged inside a request
-     * object, and reformat it to a proper class name that a class extending
-     * Zend_Controller_Action would use.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatControllerName($unformatted);
-
-    /**
-     * Formats a string into a module name.  This is used to take a raw
-     * module name, such as one that would be packaged inside a request
-     * object, and reformat it to a proper directory/class name that a class extending
-     * Zend_Controller_Action would use.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatModuleName($unformatted);
-
-    /**
-     * Formats a string into an action name.  This is used to take a raw
-     * action name, such as one that would be packaged inside a request
-     * object, and reformat into a proper method name that would be found
-     * inside a class extending Zend_Controller_Action.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatActionName($unformatted);
-
-    /**
-     * Returns TRUE if an action can be dispatched, or FALSE otherwise.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return boolean
-     */
-    public function isDispatchable(Zend_Controller_Request_Abstract $request);
-
-    /**
-     * Add or modify a parameter with which to instantiate an Action Controller
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function setParam($name, $value);
-
-    /**
-     * Set an array of a parameters to pass to the Action Controller constructor
-     *
-     * @param array $params
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function setParams(array $params);
-
-    /**
-     * Retrieve a single parameter from the controller parameter stack
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function getParam($name);
-
-    /**
-     * Retrieve the parameters to pass to the Action Controller constructor
-     *
-     * @return array
-     */
-    public function getParams();
-
-    /**
-     * Clear the controller parameter stack
-     *
-     * By default, clears all parameters. If a parameter name is given, clears
-     * only that parameter; if an array of parameter names is provided, clears
-     * each.
-     *
-     * @param null|string|array single key or array of keys for params to clear
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function clearParams($name = null);
-
-    /**
-     * Set the response object to use, if any
-     *
-     * @param Zend_Controller_Response_Abstract|null $response
-     * @return void
-     */
-    public function setResponse(Zend_Controller_Response_Abstract $response = null);
-
-    /**
-     * Retrieve the response object, if any
-     *
-     * @return Zend_Controller_Response_Abstract|null
-     */
-    public function getResponse();
-
-    /**
-     * Add a controller directory to the controller directory stack
-     *
-     * @param string $path
-     * @param string $args
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function addControllerDirectory($path, $args = null);
-
-    /**
-     * Set the directory where controller files are stored
-     *
-     * Specify a string or an array; if an array is specified, all paths will be
-     * added.
-     *
-     * @param string|array $dir
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function setControllerDirectory($path);
-
-    /**
-     * Return the currently set directory(ies) for controller file lookup
-     *
-     * @return array
-     */
-    public function getControllerDirectory();
-
-    /**
-     * Dispatches a request object to a controller/action.  If the action
-     * requests a forward to another action, a new request will be returned.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @param  Zend_Controller_Response_Abstract $response
-     * @return void
-     */
-    public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response);
-
-    /**
-     * Whether or not a given module is valid
-     *
-     * @param string $module
-     * @return boolean
-     */
-    public function isValidModule($module);
-
-    /**
-     * Retrieve the default module name
-     *
-     * @return string
-     */
-    public function getDefaultModule();
-
-    /**
-     * Retrieve the default controller name
-     *
-     * @return string
-     */
-    public function getDefaultControllerName();
-
-    /**
-     * Retrieve the default action
-     *
-     * @return string
-     */
-    public function getDefaultAction();
-}
diff --git a/airtime_mvc/library/Zend/Controller/Dispatcher/Standard.php b/airtime_mvc/library/Zend/Controller/Dispatcher/Standard.php
deleted file mode 100644
index d005546f2..000000000
--- a/airtime_mvc/library/Zend/Controller/Dispatcher/Standard.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Standard.php 20244 2010-01-12 21:12:56Z matthew $
- */
-
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/** Zend_Controller_Dispatcher_Abstract */
-require_once 'Zend/Controller/Dispatcher/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Dispatcher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract
-{
-    /**
-     * Current dispatchable directory
-     * @var string
-     */
-    protected $_curDirectory;
-
-    /**
-     * Current module (formatted)
-     * @var string
-     */
-    protected $_curModule;
-
-    /**
-     * Controller directory(ies)
-     * @var array
-     */
-    protected $_controllerDirectory = array();
-
-    /**
-     * Constructor: Set current module to default value
-     *
-     * @param  array $params
-     * @return void
-     */
-    public function __construct(array $params = array())
-    {
-        parent::__construct($params);
-        $this->_curModule = $this->getDefaultModule();
-    }
-
-    /**
-     * Add a single path to the controller directory stack
-     *
-     * @param string $path
-     * @param string $module
-     * @return Zend_Controller_Dispatcher_Standard
-     */
-    public function addControllerDirectory($path, $module = null)
-    {
-        if (null === $module) {
-            $module = $this->_defaultModule;
-        }
-
-        $module = (string) $module;
-        $path   = rtrim((string) $path, '/\\');
-
-        $this->_controllerDirectory[$module] = $path;
-        return $this;
-    }
-
-    /**
-     * Set controller directory
-     *
-     * @param array|string $directory
-     * @return Zend_Controller_Dispatcher_Standard
-     */
-    public function setControllerDirectory($directory, $module = null)
-    {
-        $this->_controllerDirectory = array();
-
-        if (is_string($directory)) {
-            $this->addControllerDirectory($directory, $module);
-        } elseif (is_array($directory)) {
-            foreach ((array) $directory as $module => $path) {
-                $this->addControllerDirectory($path, $module);
-            }
-        } else {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Controller directory spec must be either a string or an array');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the currently set directories for Zend_Controller_Action class
-     * lookup
-     *
-     * If a module is specified, returns just that directory.
-     *
-     * @param  string $module Module name
-     * @return array|string Returns array of all directories by default, single
-     * module directory if module argument provided
-     */
-    public function getControllerDirectory($module = null)
-    {
-        if (null === $module) {
-            return $this->_controllerDirectory;
-        }
-
-        $module = (string) $module;
-        if (array_key_exists($module, $this->_controllerDirectory)) {
-            return $this->_controllerDirectory[$module];
-        }
-
-        return null;
-    }
-
-    /**
-     * Remove a controller directory by module name
-     *
-     * @param  string $module
-     * @return bool
-     */
-    public function removeControllerDirectory($module)
-    {
-        $module = (string) $module;
-        if (array_key_exists($module, $this->_controllerDirectory)) {
-            unset($this->_controllerDirectory[$module]);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Format the module name.
-     *
-     * @param string $unformatted
-     * @return string
-     */
-    public function formatModuleName($unformatted)
-    {
-        if (($this->_defaultModule == $unformatted) && !$this->getParam('prefixDefaultModule')) {
-            return $unformatted;
-        }
-
-        return ucfirst($this->_formatName($unformatted));
-    }
-
-    /**
-     * Format action class name
-     *
-     * @param string $moduleName Name of the current module
-     * @param string $className Name of the action class
-     * @return string Formatted class name
-     */
-    public function formatClassName($moduleName, $className)
-    {
-        return $this->formatModuleName($moduleName) . '_' . $className;
-    }
-
-    /**
-     * Convert a class name to a filename
-     *
-     * @param string $class
-     * @return string
-     */
-    public function classToFilename($class)
-    {
-        return str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-    }
-
-    /**
-     * Returns TRUE if the Zend_Controller_Request_Abstract object can be
-     * dispatched to a controller.
-     *
-     * Use this method wisely. By default, the dispatcher will fall back to the
-     * default controller (either in the module specified or the global default)
-     * if a given controller does not exist. This method returning false does
-     * not necessarily indicate the dispatcher will not still dispatch the call.
-     *
-     * @param Zend_Controller_Request_Abstract $action
-     * @return boolean
-     */
-    public function isDispatchable(Zend_Controller_Request_Abstract $request)
-    {
-        $className = $this->getControllerClass($request);
-        if (!$className) {
-            return false;
-        }
-
-        if (class_exists($className, false)) {
-            return true;
-        }
-
-        $fileSpec    = $this->classToFilename($className);
-        $dispatchDir = $this->getDispatchDirectory();
-        $test        = $dispatchDir . DIRECTORY_SEPARATOR . $fileSpec;
-        return Zend_Loader::isReadable($test);
-    }
-
-    /**
-     * Dispatch to a controller/action
-     *
-     * By default, if a controller is not dispatchable, dispatch() will throw
-     * an exception. If you wish to use the default controller instead, set the
-     * param 'useDefaultControllerAlways' via {@link setParam()}.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @param Zend_Controller_Response_Abstract $response
-     * @return void
-     * @throws Zend_Controller_Dispatcher_Exception
-     */
-    public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response)
-    {
-        $this->setResponse($response);
-
-        /**
-         * Get controller class
-         */
-        if (!$this->isDispatchable($request)) {
-            $controller = $request->getControllerName();
-            if (!$this->getParam('useDefaultControllerAlways') && !empty($controller)) {
-                require_once 'Zend/Controller/Dispatcher/Exception.php';
-                throw new Zend_Controller_Dispatcher_Exception('Invalid controller specified (' . $request->getControllerName() . ')');
-            }
-
-            $className = $this->getDefaultControllerClass($request);
-        } else {
-            $className = $this->getControllerClass($request);
-            if (!$className) {
-                $className = $this->getDefaultControllerClass($request);
-            }
-        }
-
-        /**
-         * Load the controller class file
-         */
-        $className = $this->loadClass($className);
-
-        /**
-         * Instantiate controller with request, response, and invocation
-         * arguments; throw exception if it's not an action controller
-         */
-        $controller = new $className($request, $this->getResponse(), $this->getParams());
-        if (!($controller instanceof Zend_Controller_Action_Interface) &&
-            !($controller instanceof Zend_Controller_Action)) {
-            require_once 'Zend/Controller/Dispatcher/Exception.php';
-            throw new Zend_Controller_Dispatcher_Exception(
-                'Controller "' . $className . '" is not an instance of Zend_Controller_Action_Interface'
-            );
-        }
-
-        /**
-         * Retrieve the action name
-         */
-        $action = $this->getActionMethod($request);
-
-        /**
-         * Dispatch the method call
-         */
-        $request->setDispatched(true);
-
-        // by default, buffer output
-        $disableOb = $this->getParam('disableOutputBuffering');
-        $obLevel   = ob_get_level();
-        if (empty($disableOb)) {
-            ob_start();
-        }
-
-        try {
-            $controller->dispatch($action);
-        } catch (Exception $e) {
-            // Clean output buffer on error
-            $curObLevel = ob_get_level();
-            if ($curObLevel > $obLevel) {
-                do {
-                    ob_get_clean();
-                    $curObLevel = ob_get_level();
-                } while ($curObLevel > $obLevel);
-            }
-            throw $e;
-        }
-
-        if (empty($disableOb)) {
-            $content = ob_get_clean();
-            $response->appendBody($content);
-        }
-
-        // Destroy the page controller instance and reflection objects
-        $controller = null;
-    }
-
-    /**
-     * Load a controller class
-     *
-     * Attempts to load the controller class file from
-     * {@link getControllerDirectory()}.  If the controller belongs to a
-     * module, looks for the module prefix to the controller class.
-     *
-     * @param string $className
-     * @return string Class name loaded
-     * @throws Zend_Controller_Dispatcher_Exception if class not loaded
-     */
-    public function loadClass($className)
-    {
-        $finalClass  = $className;
-        if (($this->_defaultModule != $this->_curModule)
-            || $this->getParam('prefixDefaultModule'))
-        {
-            $finalClass = $this->formatClassName($this->_curModule, $className);
-        }
-        if (class_exists($finalClass, false)) {
-            return $finalClass;
-        }
-
-        $dispatchDir = $this->getDispatchDirectory();
-        $loadFile    = $dispatchDir . DIRECTORY_SEPARATOR . $this->classToFilename($className);
-
-        if (Zend_Loader::isReadable($loadFile)) {
-            include_once $loadFile;
-        } else {
-            require_once 'Zend/Controller/Dispatcher/Exception.php';
-            throw new Zend_Controller_Dispatcher_Exception('Cannot load controller class "' . $className . '" from file "' . $loadFile . "'");
-        }
-
-        if (!class_exists($finalClass, false)) {
-            require_once 'Zend/Controller/Dispatcher/Exception.php';
-            throw new Zend_Controller_Dispatcher_Exception('Invalid controller class ("' . $finalClass . '")');
-        }
-
-        return $finalClass;
-    }
-
-    /**
-     * Get controller class name
-     *
-     * Try request first; if not found, try pulling from request parameter;
-     * if still not found, fallback to default
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return string|false Returns class name on success
-     */
-    public function getControllerClass(Zend_Controller_Request_Abstract $request)
-    {
-        $controllerName = $request->getControllerName();
-        if (empty($controllerName)) {
-            if (!$this->getParam('useDefaultControllerAlways')) {
-                return false;
-            }
-            $controllerName = $this->getDefaultControllerName();
-            $request->setControllerName($controllerName);
-        }
-
-        $className = $this->formatControllerName($controllerName);
-
-        $controllerDirs      = $this->getControllerDirectory();
-        $module = $request->getModuleName();
-        if ($this->isValidModule($module)) {
-            $this->_curModule    = $module;
-            $this->_curDirectory = $controllerDirs[$module];
-        } elseif ($this->isValidModule($this->_defaultModule)) {
-            $request->setModuleName($this->_defaultModule);
-            $this->_curModule    = $this->_defaultModule;
-            $this->_curDirectory = $controllerDirs[$this->_defaultModule];
-        } else {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('No default module defined for this application');
-        }
-
-        return $className;
-    }
-
-    /**
-     * Determine if a given module is valid
-     *
-     * @param  string $module
-     * @return bool
-     */
-    public function isValidModule($module)
-    {
-        if (!is_string($module)) {
-            return false;
-        }
-
-        $module        = strtolower($module);
-        $controllerDir = $this->getControllerDirectory();
-        foreach (array_keys($controllerDir) as $moduleName) {
-            if ($module == strtolower($moduleName)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve default controller class
-     *
-     * Determines whether the default controller to use lies within the
-     * requested module, or if the global default should be used.
-     *
-     * By default, will only use the module default unless that controller does
-     * not exist; if this is the case, it falls back to the default controller
-     * in the default module.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return string
-     */
-    public function getDefaultControllerClass(Zend_Controller_Request_Abstract $request)
-    {
-        $controller = $this->getDefaultControllerName();
-        $default    = $this->formatControllerName($controller);
-        $request->setControllerName($controller)
-                ->setActionName(null);
-
-        $module              = $request->getModuleName();
-        $controllerDirs      = $this->getControllerDirectory();
-        $this->_curModule    = $this->_defaultModule;
-        $this->_curDirectory = $controllerDirs[$this->_defaultModule];
-        if ($this->isValidModule($module)) {
-            $found = false;
-            if (class_exists($default, false)) {
-                $found = true;
-            } else {
-                $moduleDir = $controllerDirs[$module];
-                $fileSpec  = $moduleDir . DIRECTORY_SEPARATOR . $this->classToFilename($default);
-                if (Zend_Loader::isReadable($fileSpec)) {
-                    $found = true;
-                    $this->_curDirectory = $moduleDir;
-                }
-            }
-            if ($found) {
-                $request->setModuleName($module);
-                $this->_curModule    = $this->formatModuleName($module);
-            }
-        } else {
-            $request->setModuleName($this->_defaultModule);
-        }
-
-        return $default;
-    }
-
-    /**
-     * Return the value of the currently selected dispatch directory (as set by
-     * {@link getController()})
-     *
-     * @return string
-     */
-    public function getDispatchDirectory()
-    {
-        return $this->_curDirectory;
-    }
-
-    /**
-     * Determine the action name
-     *
-     * First attempt to retrieve from request; then from request params
-     * using action key; default to default action
-     *
-     * Returns formatted action name
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return string
-     */
-    public function getActionMethod(Zend_Controller_Request_Abstract $request)
-    {
-        $action = $request->getActionName();
-        if (empty($action)) {
-            $action = $this->getDefaultAction();
-            $request->setActionName($action);
-        }
-
-        return $this->formatActionName($action);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Exception.php b/airtime_mvc/library/Zend/Controller/Exception.php
deleted file mode 100644
index 2cd0ff09d..000000000
--- a/airtime_mvc/library/Zend/Controller/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Controller/Front.php b/airtime_mvc/library/Zend/Controller/Front.php
deleted file mode 100644
index 877a2571e..000000000
--- a/airtime_mvc/library/Zend/Controller/Front.php
+++ /dev/null
@@ -1,994 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Front.php 20246 2010-01-12 21:36:08Z dasprid $
- */
-
-
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/** Zend_Controller_Action_HelperBroker */
-require_once 'Zend/Controller/Action/HelperBroker.php';
-
-/** Zend_Controller_Plugin_Broker */
-require_once 'Zend/Controller/Plugin/Broker.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Front
-{
-    /**
-     * Base URL
-     * @var string
-     */
-    protected $_baseUrl = null;
-
-    /**
-     * Directory|ies where controllers are stored
-     *
-     * @var string|array
-     */
-    protected $_controllerDir = null;
-
-    /**
-     * Instance of Zend_Controller_Dispatcher_Interface
-     * @var Zend_Controller_Dispatcher_Interface
-     */
-    protected $_dispatcher = null;
-
-    /**
-     * Singleton instance
-     *
-     * Marked only as protected to allow extension of the class. To extend,
-     * simply override {@link getInstance()}.
-     *
-     * @var Zend_Controller_Front
-     */
-    protected static $_instance = null;
-
-    /**
-     * Array of invocation parameters to use when instantiating action
-     * controllers
-     * @var array
-     */
-    protected $_invokeParams = array();
-
-    /**
-     * Subdirectory within a module containing controllers; defaults to 'controllers'
-     * @var string
-     */
-    protected $_moduleControllerDirectoryName = 'controllers';
-
-    /**
-     * Instance of Zend_Controller_Plugin_Broker
-     * @var Zend_Controller_Plugin_Broker
-     */
-    protected $_plugins = null;
-
-    /**
-     * Instance of Zend_Controller_Request_Abstract
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request = null;
-
-    /**
-     * Instance of Zend_Controller_Response_Abstract
-     * @var Zend_Controller_Response_Abstract
-     */
-    protected $_response = null;
-
-    /**
-     * Whether or not to return the response prior to rendering output while in
-     * {@link dispatch()}; default is to send headers and render output.
-     * @var boolean
-     */
-    protected $_returnResponse = false;
-
-    /**
-     * Instance of Zend_Controller_Router_Interface
-     * @var Zend_Controller_Router_Interface
-     */
-    protected $_router = null;
-
-    /**
-     * Whether or not exceptions encountered in {@link dispatch()} should be
-     * thrown or trapped in the response object
-     * @var boolean
-     */
-    protected $_throwExceptions = false;
-
-    /**
-     * Constructor
-     *
-     * Instantiate using {@link getInstance()}; front controller is a singleton
-     * object.
-     *
-     * Instantiates the plugin broker.
-     *
-     * @return void
-     */
-    protected function __construct()
-    {
-        $this->_plugins = new Zend_Controller_Plugin_Broker();
-    }
-
-    /**
-     * Enforce singleton; disallow cloning
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
-
-    /**
-     * Singleton instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public static function getInstance()
-    {
-        if (null === self::$_instance) {
-            self::$_instance = new self();
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Resets all object properties of the singleton instance
-     *
-     * Primarily used for testing; could be used to chain front controllers.
-     *
-     * Also resets action helper broker, clearing all registered helpers.
-     *
-     * @return void
-     */
-    public function resetInstance()
-    {
-        $reflection = new ReflectionObject($this);
-        foreach ($reflection->getProperties() as $property) {
-            $name = $property->getName();
-            switch ($name) {
-                case '_instance':
-                    break;
-                case '_controllerDir':
-                case '_invokeParams':
-                    $this->{$name} = array();
-                    break;
-                case '_plugins':
-                    $this->{$name} = new Zend_Controller_Plugin_Broker();
-                    break;
-                case '_throwExceptions':
-                case '_returnResponse':
-                    $this->{$name} = false;
-                    break;
-                case '_moduleControllerDirectoryName':
-                    $this->{$name} = 'controllers';
-                    break;
-                default:
-                    $this->{$name} = null;
-                    break;
-            }
-        }
-        Zend_Controller_Action_HelperBroker::resetHelpers();
-    }
-
-    /**
-     * Convenience feature, calls setControllerDirectory()->setRouter()->dispatch()
-     *
-     * In PHP 5.1.x, a call to a static method never populates $this -- so run()
-     * may actually be called after setting up your front controller.
-     *
-     * @param string|array $controllerDirectory Path to Zend_Controller_Action
-     * controller classes or array of such paths
-     * @return void
-     * @throws Zend_Controller_Exception if called from an object instance
-     */
-    public static function run($controllerDirectory)
-    {
-        self::getInstance()
-            ->setControllerDirectory($controllerDirectory)
-            ->dispatch();
-    }
-
-    /**
-     * Add a controller directory to the controller directory stack
-     *
-     * If $args is presented and is a string, uses it for the array key mapping
-     * to the directory specified.
-     *
-     * @param string $directory
-     * @param string $module Optional argument; module with which to associate directory. If none provided, assumes 'default'
-     * @return Zend_Controller_Front
-     * @throws Zend_Controller_Exception if directory not found or readable
-     */
-    public function addControllerDirectory($directory, $module = null)
-    {
-        $this->getDispatcher()->addControllerDirectory($directory, $module);
-        return $this;
-    }
-
-    /**
-     * Set controller directory
-     *
-     * Stores controller directory(ies) in dispatcher. May be an array of
-     * directories or a string containing a single directory.
-     *
-     * @param string|array $directory Path to Zend_Controller_Action controller
-     * classes or array of such paths
-     * @param  string $module Optional module name to use with string $directory
-     * @return Zend_Controller_Front
-     */
-    public function setControllerDirectory($directory, $module = null)
-    {
-        $this->getDispatcher()->setControllerDirectory($directory, $module);
-        return $this;
-    }
-
-    /**
-     * Retrieve controller directory
-     *
-     * Retrieves:
-     * - Array of all controller directories if no $name passed
-     * - String path if $name passed and exists as a key in controller directory array
-     * - null if $name passed but does not exist in controller directory keys
-     *
-     * @param  string $name Default null
-     * @return array|string|null
-     */
-    public function getControllerDirectory($name = null)
-    {
-        return $this->getDispatcher()->getControllerDirectory($name);
-    }
-
-    /**
-     * Remove a controller directory by module name
-     *
-     * @param  string $module
-     * @return bool
-     */
-    public function removeControllerDirectory($module)
-    {
-        return $this->getDispatcher()->removeControllerDirectory($module);
-    }
-
-    /**
-     * Specify a directory as containing modules
-     *
-     * Iterates through the directory, adding any subdirectories as modules;
-     * the subdirectory within each module named after {@link $_moduleControllerDirectoryName}
-     * will be used as the controller directory path.
-     *
-     * @param  string $path
-     * @return Zend_Controller_Front
-     */
-    public function addModuleDirectory($path)
-    {
-        try{
-            $dir = new DirectoryIterator($path);
-        } catch(Exception $e) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception("Directory $path not readable", 0, $e);
-        }
-        foreach ($dir as $file) {
-            if ($file->isDot() || !$file->isDir()) {
-                continue;
-            }
-
-            $module    = $file->getFilename();
-
-            // Don't use SCCS directories as modules
-            if (preg_match('/^[^a-z]/i', $module) || ('CVS' == $module)) {
-                continue;
-            }
-
-            $moduleDir = $file->getPathname() . DIRECTORY_SEPARATOR . $this->getModuleControllerDirectoryName();
-            $this->addControllerDirectory($moduleDir, $module);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the path to a module directory (but not the controllers directory within)
-     *
-     * @param  string $module
-     * @return string|null
-     */
-    public function getModuleDirectory($module = null)
-    {
-        if (null === $module) {
-            $request = $this->getRequest();
-            if (null !== $request) {
-                $module = $this->getRequest()->getModuleName();
-            }
-            if (empty($module)) {
-                $module = $this->getDispatcher()->getDefaultModule();
-            }
-        }
-
-        $controllerDir = $this->getControllerDirectory($module);
-
-        if ((null === $controllerDir) || !is_string($controllerDir)) {
-            return null;
-        }
-
-        return dirname($controllerDir);
-    }
-
-    /**
-     * Set the directory name within a module containing controllers
-     *
-     * @param  string $name
-     * @return Zend_Controller_Front
-     */
-    public function setModuleControllerDirectoryName($name = 'controllers')
-    {
-        $this->_moduleControllerDirectoryName = (string) $name;
-
-        return $this;
-    }
-
-    /**
-     * Return the directory name within a module containing controllers
-     *
-     * @return string
-     */
-    public function getModuleControllerDirectoryName()
-    {
-        return $this->_moduleControllerDirectoryName;
-    }
-
-    /**
-     * Set the default controller (unformatted string)
-     *
-     * @param string $controller
-     * @return Zend_Controller_Front
-     */
-    public function setDefaultControllerName($controller)
-    {
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->setDefaultControllerName($controller);
-        return $this;
-    }
-
-    /**
-     * Retrieve the default controller (unformatted string)
-     *
-     * @return string
-     */
-    public function getDefaultControllerName()
-    {
-        return $this->getDispatcher()->getDefaultControllerName();
-    }
-
-    /**
-     * Set the default action (unformatted string)
-     *
-     * @param string $action
-     * @return Zend_Controller_Front
-     */
-    public function setDefaultAction($action)
-    {
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->setDefaultAction($action);
-        return $this;
-    }
-
-    /**
-     * Retrieve the default action (unformatted string)
-     *
-     * @return string
-     */
-    public function getDefaultAction()
-    {
-        return $this->getDispatcher()->getDefaultAction();
-    }
-
-    /**
-     * Set the default module name
-     *
-     * @param string $module
-     * @return Zend_Controller_Front
-     */
-    public function setDefaultModule($module)
-    {
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->setDefaultModule($module);
-        return $this;
-    }
-
-    /**
-     * Retrieve the default module
-     *
-     * @return string
-     */
-    public function getDefaultModule()
-    {
-        return $this->getDispatcher()->getDefaultModule();
-    }
-
-    /**
-     * Set request class/object
-     *
-     * Set the request object.  The request holds the request environment.
-     *
-     * If a class name is provided, it will instantiate it
-     *
-     * @param string|Zend_Controller_Request_Abstract $request
-     * @throws Zend_Controller_Exception if invalid request class
-     * @return Zend_Controller_Front
-     */
-    public function setRequest($request)
-    {
-        if (is_string($request)) {
-            if (!class_exists($request)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($request);
-            }
-            $request = new $request();
-        }
-        if (!$request instanceof Zend_Controller_Request_Abstract) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid request class');
-        }
-
-        $this->_request = $request;
-
-        return $this;
-    }
-
-    /**
-     * Return the request object.
-     *
-     * @return null|Zend_Controller_Request_Abstract
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set router class/object
-     *
-     * Set the router object.  The router is responsible for mapping
-     * the request to a controller and action.
-     *
-     * If a class name is provided, instantiates router with any parameters
-     * registered via {@link setParam()} or {@link setParams()}.
-     *
-     * @param string|Zend_Controller_Router_Interface $router
-     * @throws Zend_Controller_Exception if invalid router class
-     * @return Zend_Controller_Front
-     */
-    public function setRouter($router)
-    {
-        if (is_string($router)) {
-            if (!class_exists($router)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($router);
-            }
-            $router = new $router();
-        }
-
-        if (!$router instanceof Zend_Controller_Router_Interface) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid router class');
-        }
-
-        $router->setFrontController($this);
-        $this->_router = $router;
-
-        return $this;
-    }
-
-    /**
-     * Return the router object.
-     *
-     * Instantiates a Zend_Controller_Router_Rewrite object if no router currently set.
-     *
-     * @return Zend_Controller_Router_Interface
-     */
-    public function getRouter()
-    {
-        if (null == $this->_router) {
-            require_once 'Zend/Controller/Router/Rewrite.php';
-            $this->setRouter(new Zend_Controller_Router_Rewrite());
-        }
-
-        return $this->_router;
-    }
-
-    /**
-     * Set the base URL used for requests
-     *
-     * Use to set the base URL segment of the REQUEST_URI to use when
-     * determining PATH_INFO, etc. Examples:
-     * - /admin
-     * - /myapp
-     * - /subdir/index.php
-     *
-     * Note that the URL should not include the full URI. Do not use:
-     * - http://example.com/admin
-     * - http://example.com/myapp
-     * - http://example.com/subdir/index.php
-     *
-     * If a null value is passed, this can be used as well for autodiscovery (default).
-     *
-     * @param string $base
-     * @return Zend_Controller_Front
-     * @throws Zend_Controller_Exception for non-string $base
-     */
-    public function setBaseUrl($base = null)
-    {
-        if (!is_string($base) && (null !== $base)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Rewrite base must be a string');
-        }
-
-        $this->_baseUrl = $base;
-
-        if ((null !== ($request = $this->getRequest())) && (method_exists($request, 'setBaseUrl'))) {
-            $request->setBaseUrl($base);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve the currently set base URL
-     *
-     * @return string
-     */
-    public function getBaseUrl()
-    {
-        $request = $this->getRequest();
-        if ((null !== $request) && method_exists($request, 'getBaseUrl')) {
-            return $request->getBaseUrl();
-        }
-
-        return $this->_baseUrl;
-    }
-
-    /**
-     * Set the dispatcher object.  The dispatcher is responsible for
-     * taking a Zend_Controller_Dispatcher_Token object, instantiating the controller, and
-     * call the action method of the controller.
-     *
-     * @param Zend_Controller_Dispatcher_Interface $dispatcher
-     * @return Zend_Controller_Front
-     */
-    public function setDispatcher(Zend_Controller_Dispatcher_Interface $dispatcher)
-    {
-        $this->_dispatcher = $dispatcher;
-        return $this;
-    }
-
-    /**
-     * Return the dispatcher object.
-     *
-     * @return Zend_Controller_Dispatcher_Interface
-     */
-    public function getDispatcher()
-    {
-        /**
-         * Instantiate the default dispatcher if one was not set.
-         */
-        if (!$this->_dispatcher instanceof Zend_Controller_Dispatcher_Interface) {
-            require_once 'Zend/Controller/Dispatcher/Standard.php';
-            $this->_dispatcher = new Zend_Controller_Dispatcher_Standard();
-        }
-        return $this->_dispatcher;
-    }
-
-    /**
-     * Set response class/object
-     *
-     * Set the response object.  The response is a container for action
-     * responses and headers. Usage is optional.
-     *
-     * If a class name is provided, instantiates a response object.
-     *
-     * @param string|Zend_Controller_Response_Abstract $response
-     * @throws Zend_Controller_Exception if invalid response class
-     * @return Zend_Controller_Front
-     */
-    public function setResponse($response)
-    {
-        if (is_string($response)) {
-            if (!class_exists($response)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($response);
-            }
-            $response = new $response();
-        }
-        if (!$response instanceof Zend_Controller_Response_Abstract) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid response class');
-        }
-
-        $this->_response = $response;
-
-        return $this;
-    }
-
-    /**
-     * Return the response object.
-     *
-     * @return null|Zend_Controller_Response_Abstract
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Add or modify a parameter to use when instantiating an action controller
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return Zend_Controller_Front
-     */
-    public function setParam($name, $value)
-    {
-        $name = (string) $name;
-        $this->_invokeParams[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Set parameters to pass to action controller constructors
-     *
-     * @param array $params
-     * @return Zend_Controller_Front
-     */
-    public function setParams(array $params)
-    {
-        $this->_invokeParams = array_merge($this->_invokeParams, $params);
-        return $this;
-    }
-
-    /**
-     * Retrieve a single parameter from the controller parameter stack
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function getParam($name)
-    {
-        if(isset($this->_invokeParams[$name])) {
-            return $this->_invokeParams[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve action controller instantiation parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_invokeParams;
-    }
-
-    /**
-     * Clear the controller parameter stack
-     *
-     * By default, clears all parameters. If a parameter name is given, clears
-     * only that parameter; if an array of parameter names is provided, clears
-     * each.
-     *
-     * @param null|string|array single key or array of keys for params to clear
-     * @return Zend_Controller_Front
-     */
-    public function clearParams($name = null)
-    {
-        if (null === $name) {
-            $this->_invokeParams = array();
-        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
-            unset($this->_invokeParams[$name]);
-        } elseif (is_array($name)) {
-            foreach ($name as $key) {
-                if (is_string($key) && isset($this->_invokeParams[$key])) {
-                    unset($this->_invokeParams[$key]);
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Register a plugin.
-     *
-     * @param  Zend_Controller_Plugin_Abstract $plugin
-     * @param  int $stackIndex Optional; stack index for plugin
-     * @return Zend_Controller_Front
-     */
-    public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
-    {
-        $this->_plugins->registerPlugin($plugin, $stackIndex);
-        return $this;
-    }
-
-    /**
-     * Unregister a plugin.
-     *
-     * @param  string|Zend_Controller_Plugin_Abstract $plugin Plugin class or object to unregister
-     * @return Zend_Controller_Front
-     */
-    public function unregisterPlugin($plugin)
-    {
-        $this->_plugins->unregisterPlugin($plugin);
-        return $this;
-    }
-
-    /**
-     * Is a particular plugin registered?
-     *
-     * @param  string $class
-     * @return bool
-     */
-    public function hasPlugin($class)
-    {
-        return $this->_plugins->hasPlugin($class);
-    }
-
-    /**
-     * Retrieve a plugin or plugins by class
-     *
-     * @param  string $class
-     * @return false|Zend_Controller_Plugin_Abstract|array
-     */
-    public function getPlugin($class)
-    {
-        return $this->_plugins->getPlugin($class);
-    }
-
-    /**
-     * Retrieve all plugins
-     *
-     * @return array
-     */
-    public function getPlugins()
-    {
-        return $this->_plugins->getPlugins();
-    }
-
-    /**
-     * Set the throwExceptions flag and retrieve current status
-     *
-     * Set whether exceptions encounted in the dispatch loop should be thrown
-     * or caught and trapped in the response object.
-     *
-     * Default behaviour is to trap them in the response object; call this
-     * method to have them thrown.
-     *
-     * Passing no value will return the current value of the flag; passing a
-     * boolean true or false value will set the flag and return the current
-     * object instance.
-     *
-     * @param boolean $flag Defaults to null (return flag state)
-     * @return boolean|Zend_Controller_Front Used as a setter, returns object; as a getter, returns boolean
-     */
-    public function throwExceptions($flag = null)
-    {
-        if ($flag !== null) {
-            $this->_throwExceptions = (bool) $flag;
-            return $this;
-        }
-
-        return $this->_throwExceptions;
-    }
-
-    /**
-     * Set whether {@link dispatch()} should return the response without first
-     * rendering output. By default, output is rendered and dispatch() returns
-     * nothing.
-     *
-     * @param boolean $flag
-     * @return boolean|Zend_Controller_Front Used as a setter, returns object; as a getter, returns boolean
-     */
-    public function returnResponse($flag = null)
-    {
-        if (true === $flag) {
-            $this->_returnResponse = true;
-            return $this;
-        } elseif (false === $flag) {
-            $this->_returnResponse = false;
-            return $this;
-        }
-
-        return $this->_returnResponse;
-    }
-
-    /**
-     * Dispatch an HTTP request to a controller/action.
-     *
-     * @param Zend_Controller_Request_Abstract|null $request
-     * @param Zend_Controller_Response_Abstract|null $response
-     * @return void|Zend_Controller_Response_Abstract Returns response object if returnResponse() is true
-     */
-    public function dispatch(Zend_Controller_Request_Abstract $request = null, Zend_Controller_Response_Abstract $response = null)
-    {
-        if (!$this->getParam('noErrorHandler') && !$this->_plugins->hasPlugin('Zend_Controller_Plugin_ErrorHandler')) {
-            // Register with stack index of 100
-            require_once 'Zend/Controller/Plugin/ErrorHandler.php';
-            $this->_plugins->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(), 100);
-        }
-
-        if (!$this->getParam('noViewRenderer') && !Zend_Controller_Action_HelperBroker::hasHelper('viewRenderer')) {
-            require_once 'Zend/Controller/Action/Helper/ViewRenderer.php';
-            Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-80, new Zend_Controller_Action_Helper_ViewRenderer());
-        }
-
-        /**
-         * Instantiate default request object (HTTP version) if none provided
-         */
-        if (null !== $request) {
-            $this->setRequest($request);
-        } elseif ((null === $request) && (null === ($request = $this->getRequest()))) {
-            require_once 'Zend/Controller/Request/Http.php';
-            $request = new Zend_Controller_Request_Http();
-            $this->setRequest($request);
-        }
-
-        /**
-         * Set base URL of request object, if available
-         */
-        if (is_callable(array($this->_request, 'setBaseUrl'))) {
-            if (null !== $this->_baseUrl) {
-                $this->_request->setBaseUrl($this->_baseUrl);
-            }
-        }
-
-        /**
-         * Instantiate default response object (HTTP version) if none provided
-         */
-        if (null !== $response) {
-            $this->setResponse($response);
-        } elseif ((null === $this->_response) && (null === ($this->_response = $this->getResponse()))) {
-            require_once 'Zend/Controller/Response/Http.php';
-            $response = new Zend_Controller_Response_Http();
-            $this->setResponse($response);
-        }
-
-        /**
-         * Register request and response objects with plugin broker
-         */
-        $this->_plugins
-             ->setRequest($this->_request)
-             ->setResponse($this->_response);
-
-        /**
-         * Initialize router
-         */
-        $router = $this->getRouter();
-        $router->setParams($this->getParams());
-
-        /**
-         * Initialize dispatcher
-         */
-        $dispatcher = $this->getDispatcher();
-        $dispatcher->setParams($this->getParams())
-                   ->setResponse($this->_response);
-
-        // Begin dispatch
-        try {
-            /**
-             * Route request to controller/action, if a router is provided
-             */
-
-            /**
-            * Notify plugins of router startup
-            */
-            $this->_plugins->routeStartup($this->_request);
-
-            try {
-                $router->route($this->_request);
-            }  catch (Exception $e) {
-                if ($this->throwExceptions()) {
-                    throw $e;
-                }
-
-                $this->_response->setException($e);
-            }
-
-            /**
-            * Notify plugins of router completion
-            */
-            $this->_plugins->routeShutdown($this->_request);
-
-            /**
-             * Notify plugins of dispatch loop startup
-             */
-            $this->_plugins->dispatchLoopStartup($this->_request);
-
-            /**
-             *  Attempt to dispatch the controller/action. If the $this->_request
-             *  indicates that it needs to be dispatched, move to the next
-             *  action in the request.
-             */
-            do {
-                $this->_request->setDispatched(true);
-
-                /**
-                 * Notify plugins of dispatch startup
-                 */
-                $this->_plugins->preDispatch($this->_request);
-
-                /**
-                 * Skip requested action if preDispatch() has reset it
-                 */
-                if (!$this->_request->isDispatched()) {
-                    continue;
-                }
-
-                /**
-                 * Dispatch request
-                 */
-                try {
-                    $dispatcher->dispatch($this->_request, $this->_response);
-                } catch (Exception $e) {
-                    if ($this->throwExceptions()) {
-                        throw $e;
-                    }
-                    $this->_response->setException($e);
-                }
-
-                /**
-                 * Notify plugins of dispatch completion
-                 */
-                $this->_plugins->postDispatch($this->_request);
-            } while (!$this->_request->isDispatched());
-        } catch (Exception $e) {
-            if ($this->throwExceptions()) {
-                throw $e;
-            }
-
-            $this->_response->setException($e);
-        }
-
-        /**
-         * Notify plugins of dispatch loop completion
-         */
-        try {
-            $this->_plugins->dispatchLoopShutdown();
-        } catch (Exception $e) {
-            if ($this->throwExceptions()) {
-                throw $e;
-            }
-
-            $this->_response->setException($e);
-        }
-
-        if ($this->returnResponse()) {
-            return $this->_response;
-        }
-
-        $this->_response->sendResponse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Plugin/Abstract.php b/airtime_mvc/library/Zend/Controller/Plugin/Abstract.php
deleted file mode 100644
index 007d2f630..000000000
--- a/airtime_mvc/library/Zend/Controller/Plugin/Abstract.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Plugin_Abstract
-{
-    /**
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request;
-
-    /**
-     * @var Zend_Controller_Response_Abstract
-     */
-    protected $_response;
-
-    /**
-     * Set request object
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return Zend_Controller_Plugin_Abstract
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * Get request object
-     *
-     * @return Zend_Controller_Request_Abstract $request
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set response object
-     *
-     * @param Zend_Controller_Response_Abstract $response
-     * @return Zend_Controller_Plugin_Abstract
-     */
-    public function setResponse(Zend_Controller_Response_Abstract $response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Get response object
-     *
-     * @return Zend_Controller_Response_Abstract $response
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Called before Zend_Controller_Front begins evaluating the
-     * request against its routes.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function routeStartup(Zend_Controller_Request_Abstract $request)
-    {}
-
-    /**
-     * Called after Zend_Controller_Router exits.
-     *
-     * Called after Zend_Controller_Front exits from the router.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function routeShutdown(Zend_Controller_Request_Abstract $request)
-    {}
-
-    /**
-     * Called before Zend_Controller_Front enters its dispatch loop.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
-    {}
-
-    /**
-     * Called before an action is dispatched by Zend_Controller_Dispatcher.
-     *
-     * This callback allows for proxy or filter behavior.  By altering the
-     * request and resetting its dispatched flag (via
-     * {@link Zend_Controller_Request_Abstract::setDispatched() setDispatched(false)}),
-     * the current action may be skipped.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function preDispatch(Zend_Controller_Request_Abstract $request)
-    {}
-
-    /**
-     * Called after an action is dispatched by Zend_Controller_Dispatcher.
-     *
-     * This callback allows for proxy or filter behavior. By altering the
-     * request and resetting its dispatched flag (via
-     * {@link Zend_Controller_Request_Abstract::setDispatched() setDispatched(false)}),
-     * a new action may be specified for dispatching.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function postDispatch(Zend_Controller_Request_Abstract $request)
-    {}
-
-    /**
-     * Called before Zend_Controller_Front exits its dispatch loop.
-     *
-     * @return void
-     */
-    public function dispatchLoopShutdown()
-    {}
-}
diff --git a/airtime_mvc/library/Zend/Controller/Plugin/ActionStack.php b/airtime_mvc/library/Zend/Controller/Plugin/ActionStack.php
deleted file mode 100644
index a209d95b8..000000000
--- a/airtime_mvc/library/Zend/Controller/Plugin/ActionStack.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Plugin_Abstract */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/** Zend_Registry */
-require_once 'Zend/Registry.php';
-
-/**
- * Manage a stack of actions
- *
- * @uses       Zend_Controller_Plugin_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActionStack.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract
-{
-    /** @var Zend_Registry */
-    protected $_registry;
-
-    /**
-     * Registry key under which actions are stored
-     * @var string
-     */
-    protected $_registryKey = 'Zend_Controller_Plugin_ActionStack';
-
-    /**
-     * Valid keys for stack items
-     * @var array
-     */
-    protected $_validKeys = array(
-        'module',
-        'controller',
-        'action',
-        'params'
-    );
-
-    /**
-     * Flag to determine whether request parameters are cleared between actions, or whether new parameters
-     * are added to existing request parameters.
-     *
-     * @var Bool
-     */
-    protected $_clearRequestParams = false;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Registry $registry
-     * @param  string $key
-     * @return void
-     */
-    public function __construct(Zend_Registry $registry = null, $key = null)
-    {
-        if (null === $registry) {
-            $registry = Zend_Registry::getInstance();
-        }
-        $this->setRegistry($registry);
-
-        if (null !== $key) {
-            $this->setRegistryKey($key);
-        } else {
-            $key = $this->getRegistryKey();
-        }
-
-        $registry[$key] = array();
-    }
-
-    /**
-     * Set registry object
-     *
-     * @param  Zend_Registry $registry
-     * @return Zend_Controller_Plugin_ActionStack
-     */
-    public function setRegistry(Zend_Registry $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * Retrieve registry object
-     *
-     * @return Zend_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->_registry;
-    }
-
-    /**
-     * Retrieve registry key
-     *
-     * @return string
-     */
-    public function getRegistryKey()
-    {
-        return $this->_registryKey;
-    }
-
-    /**
-     * Set registry key
-     *
-     * @param  string $key
-     * @return Zend_Controller_Plugin_ActionStack
-     */
-    public function setRegistryKey($key)
-    {
-        $this->_registryKey = (string) $key;
-        return $this;
-    }
-
-    /**
-     *  Set clearRequestParams flag
-     *
-     *  @param  bool $clearRequestParams
-     *  @return Zend_Controller_Plugin_ActionStack
-     */
-    public function setClearRequestParams($clearRequestParams)
-    {
-        $this->_clearRequestParams = (bool) $clearRequestParams;
-        return $this;
-    }
-
-    /**
-     * Retrieve clearRequestParams flag
-     *
-     * @return bool
-     */
-    public function getClearRequestParams()
-    {
-        return $this->_clearRequestParams;
-    }
-
-    /**
-     * Retrieve action stack
-     *
-     * @return array
-     */
-    public function getStack()
-    {
-        $registry = $this->getRegistry();
-        $stack    = $registry[$this->getRegistryKey()];
-        return $stack;
-    }
-
-    /**
-     * Save stack to registry
-     *
-     * @param  array $stack
-     * @return Zend_Controller_Plugin_ActionStack
-     */
-    protected function _saveStack(array $stack)
-    {
-        $registry = $this->getRegistry();
-        $registry[$this->getRegistryKey()] = $stack;
-        return $this;
-    }
-
-    /**
-     * Push an item onto the stack
-     *
-     * @param  Zend_Controller_Request_Abstract $next
-     * @return Zend_Controller_Plugin_ActionStack
-     */
-    public function pushStack(Zend_Controller_Request_Abstract $next)
-    {
-        $stack = $this->getStack();
-        array_push($stack, $next);
-        return $this->_saveStack($stack);
-    }
-
-    /**
-     * Pop an item off the action stack
-     *
-     * @return false|Zend_Controller_Request_Abstract
-     */
-    public function popStack()
-    {
-        $stack = $this->getStack();
-        if (0 == count($stack)) {
-            return false;
-        }
-
-        $next = array_pop($stack);
-        $this->_saveStack($stack);
-
-        if (!$next instanceof Zend_Controller_Request_Abstract) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('ArrayStack should only contain request objects');
-        }
-        $action = $next->getActionName();
-        if (empty($action)) {
-            return $this->popStack($stack);
-        }
-
-        $request    = $this->getRequest();
-        $controller = $next->getControllerName();
-        if (empty($controller)) {
-            $next->setControllerName($request->getControllerName());
-        }
-
-        $module = $next->getModuleName();
-        if (empty($module)) {
-            $next->setModuleName($request->getModuleName());
-        }
-
-        return $next;
-    }
-
-    /**
-     * postDispatch() plugin hook -- check for actions in stack, and dispatch if any found
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function postDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        // Don't move on to next request if this is already an attempt to
-        // forward
-        if (!$request->isDispatched()) {
-            return;
-        }
-
-        $this->setRequest($request);
-        $stack = $this->getStack();
-        if (empty($stack)) {
-            return;
-        }
-        $next = $this->popStack();
-        if (!$next) {
-            return;
-        }
-
-        $this->forward($next);
-    }
-
-    /**
-     * Forward request with next action
-     *
-     * @param  array $next
-     * @return void
-     */
-    public function forward(Zend_Controller_Request_Abstract $next)
-    {
-        $request = $this->getRequest();
-        if ($this->getClearRequestParams()) {
-            $request->clearParams();
-        }
-
-        $request->setModuleName($next->getModuleName())
-                ->setControllerName($next->getControllerName())
-                ->setActionName($next->getActionName())
-                ->setParams($next->getParams())
-                ->setDispatched(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Plugin/Broker.php b/airtime_mvc/library/Zend/Controller/Plugin/Broker.php
deleted file mode 100644
index 9c2f1aaa3..000000000
--- a/airtime_mvc/library/Zend/Controller/Plugin/Broker.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Broker.php 20255 2010-01-13 13:23:36Z matthew $
- */
-
-/** Zend_Controller_Plugin_Abstract */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract
-{
-
-    /**
-     * Array of instance of objects extending Zend_Controller_Plugin_Abstract
-     *
-     * @var array
-     */
-    protected $_plugins = array();
-
-
-    /**
-     * Register a plugin.
-     *
-     * @param  Zend_Controller_Plugin_Abstract $plugin
-     * @param  int $stackIndex
-     * @return Zend_Controller_Plugin_Broker
-     */
-    public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
-    {
-        if (false !== array_search($plugin, $this->_plugins, true)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Plugin already registered');
-        }
-
-        $stackIndex = (int) $stackIndex;
-
-        if ($stackIndex) {
-            if (isset($this->_plugins[$stackIndex])) {
-                require_once 'Zend/Controller/Exception.php';
-                throw new Zend_Controller_Exception('Plugin with stackIndex "' . $stackIndex . '" already registered');
-            }
-            $this->_plugins[$stackIndex] = $plugin;
-        } else {
-            $stackIndex = count($this->_plugins);
-            while (isset($this->_plugins[$stackIndex])) {
-                ++$stackIndex;
-            }
-            $this->_plugins[$stackIndex] = $plugin;
-        }
-
-        $request = $this->getRequest();
-        if ($request) {
-            $this->_plugins[$stackIndex]->setRequest($request);
-        }
-        $response = $this->getResponse();
-        if ($response) {
-            $this->_plugins[$stackIndex]->setResponse($response);
-        }
-
-        ksort($this->_plugins);
-
-        return $this;
-    }
-
-    /**
-     * Unregister a plugin.
-     *
-     * @param string|Zend_Controller_Plugin_Abstract $plugin Plugin object or class name
-     * @return Zend_Controller_Plugin_Broker
-     */
-    public function unregisterPlugin($plugin)
-    {
-        if ($plugin instanceof Zend_Controller_Plugin_Abstract) {
-            // Given a plugin object, find it in the array
-            $key = array_search($plugin, $this->_plugins, true);
-            if (false === $key) {
-                require_once 'Zend/Controller/Exception.php';
-                throw new Zend_Controller_Exception('Plugin never registered.');
-            }
-            unset($this->_plugins[$key]);
-        } elseif (is_string($plugin)) {
-            // Given a plugin class, find all plugins of that class and unset them
-            foreach ($this->_plugins as $key => $_plugin) {
-                $type = get_class($_plugin);
-                if ($plugin == $type) {
-                    unset($this->_plugins[$key]);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Is a plugin of a particular class registered?
-     *
-     * @param  string $class
-     * @return bool
-     */
-    public function hasPlugin($class)
-    {
-        foreach ($this->_plugins as $plugin) {
-            $type = get_class($plugin);
-            if ($class == $type) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve a plugin or plugins by class
-     *
-     * @param  string $class Class name of plugin(s) desired
-     * @return false|Zend_Controller_Plugin_Abstract|array Returns false if none found, plugin if only one found, and array of plugins if multiple plugins of same class found
-     */
-    public function getPlugin($class)
-    {
-        $found = array();
-        foreach ($this->_plugins as $plugin) {
-            $type = get_class($plugin);
-            if ($class == $type) {
-                $found[] = $plugin;
-            }
-        }
-
-        switch (count($found)) {
-            case 0:
-                return false;
-            case 1:
-                return $found[0];
-            default:
-                return $found;
-        }
-    }
-
-    /**
-     * Retrieve all plugins
-     *
-     * @return array
-     */
-    public function getPlugins()
-    {
-        return $this->_plugins;
-    }
-
-    /**
-     * Set request object, and register with each plugin
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return Zend_Controller_Plugin_Broker
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request)
-    {
-        $this->_request = $request;
-
-        foreach ($this->_plugins as $plugin) {
-            $plugin->setRequest($request);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get request object
-     *
-     * @return Zend_Controller_Request_Abstract $request
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set response object
-     *
-     * @param Zend_Controller_Response_Abstract $response
-     * @return Zend_Controller_Plugin_Broker
-     */
-    public function setResponse(Zend_Controller_Response_Abstract $response)
-    {
-        $this->_response = $response;
-
-        foreach ($this->_plugins as $plugin) {
-            $plugin->setResponse($response);
-        }
-
-
-        return $this;
-    }
-
-    /**
-     * Get response object
-     *
-     * @return Zend_Controller_Response_Abstract $response
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-
-    /**
-     * Called before Zend_Controller_Front begins evaluating the
-     * request against its routes.
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function routeStartup(Zend_Controller_Request_Abstract $request)
-    {
-        foreach ($this->_plugins as $plugin) {
-            try {
-                $plugin->routeStartup($request);
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Called before Zend_Controller_Front exits its iterations over
-     * the route set.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function routeShutdown(Zend_Controller_Request_Abstract $request)
-    {
-        foreach ($this->_plugins as $plugin) {
-            try {
-                $plugin->routeShutdown($request);
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Called before Zend_Controller_Front enters its dispatch loop.
-     *
-     * During the dispatch loop, Zend_Controller_Front keeps a
-     * Zend_Controller_Request_Abstract object, and uses
-     * Zend_Controller_Dispatcher to dispatch the
-     * Zend_Controller_Request_Abstract object to controllers/actions.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
-    {
-        foreach ($this->_plugins as $plugin) {
-            try {
-                $plugin->dispatchLoopStartup($request);
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Called before an action is dispatched by Zend_Controller_Dispatcher.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function preDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        foreach ($this->_plugins as $plugin) {
-            try {
-                $plugin->preDispatch($request);
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Called after an action is dispatched by Zend_Controller_Dispatcher.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function postDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        foreach ($this->_plugins as $plugin) {
-            try {
-                $plugin->postDispatch($request);
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Called before Zend_Controller_Front exits its dispatch loop.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function dispatchLoopShutdown()
-    {
-       foreach ($this->_plugins as $plugin) {
-           try {
-                $plugin->dispatchLoopShutdown();
-            } catch (Exception $e) {
-                if (Zend_Controller_Front::getInstance()->throwExceptions()) {
-                    throw $e;
-                } else {
-                    $this->getResponse()->setException($e);
-                }
-            }
-       }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Plugin/ErrorHandler.php b/airtime_mvc/library/Zend/Controller/Plugin/ErrorHandler.php
deleted file mode 100644
index 1e70e66ab..000000000
--- a/airtime_mvc/library/Zend/Controller/Plugin/ErrorHandler.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Plugin_Abstract */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/**
- * Handle exceptions that bubble up based on missing controllers, actions, or
- * application errors, and forward to an error handler.
- *
- * @uses       Zend_Controller_Plugin_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ErrorHandler.php 20246 2010-01-12 21:36:08Z dasprid $
- */
-class Zend_Controller_Plugin_ErrorHandler extends Zend_Controller_Plugin_Abstract
-{
-    /**
-     * Const - No controller exception; controller does not exist
-     */
-    const EXCEPTION_NO_CONTROLLER = 'EXCEPTION_NO_CONTROLLER';
-
-    /**
-     * Const - No action exception; controller exists, but action does not
-     */
-    const EXCEPTION_NO_ACTION = 'EXCEPTION_NO_ACTION';
-
-    /**
-     * Const - No route exception; no routing was possible
-     */
-    const EXCEPTION_NO_ROUTE = 'EXCEPTION_NO_ROUTE';
-
-    /**
-     * Const - Other Exception; exceptions thrown by application controllers
-     */
-    const EXCEPTION_OTHER = 'EXCEPTION_OTHER';
-
-    /**
-     * Module to use for errors; defaults to default module in dispatcher
-     * @var string
-     */
-    protected $_errorModule;
-
-    /**
-     * Controller to use for errors; defaults to 'error'
-     * @var string
-     */
-    protected $_errorController = 'error';
-
-    /**
-     * Action to use for errors; defaults to 'error'
-     * @var string
-     */
-    protected $_errorAction = 'error';
-
-    /**
-     * Flag; are we already inside the error handler loop?
-     * @var bool
-     */
-    protected $_isInsideErrorHandlerLoop = false;
-
-    /**
-     * Exception count logged at first invocation of plugin
-     * @var int
-     */
-    protected $_exceptionCountAtFirstEncounter = 0;
-
-    /**
-     * Constructor
-     *
-     * Options may include:
-     * - module
-     * - controller
-     * - action
-     *
-     * @param  Array $options
-     * @return void
-     */
-    public function __construct(Array $options = array())
-    {
-        $this->setErrorHandler($options);
-    }
-
-    /**
-     * setErrorHandler() - setup the error handling options
-     *
-     * @param  array $options
-     * @return Zend_Controller_Plugin_ErrorHandler
-     */
-    public function setErrorHandler(Array $options = array())
-    {
-        if (isset($options['module'])) {
-            $this->setErrorHandlerModule($options['module']);
-        }
-        if (isset($options['controller'])) {
-            $this->setErrorHandlerController($options['controller']);
-        }
-        if (isset($options['action'])) {
-            $this->setErrorHandlerAction($options['action']);
-        }
-        return $this;
-    }
-
-    /**
-     * Set the module name for the error handler
-     *
-     * @param  string $module
-     * @return Zend_Controller_Plugin_ErrorHandler
-     */
-    public function setErrorHandlerModule($module)
-    {
-        $this->_errorModule = (string) $module;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current error handler module
-     *
-     * @return string
-     */
-    public function getErrorHandlerModule()
-    {
-        if (null === $this->_errorModule) {
-            $this->_errorModule = Zend_Controller_Front::getInstance()->getDispatcher()->getDefaultModule();
-        }
-        return $this->_errorModule;
-    }
-
-    /**
-     * Set the controller name for the error handler
-     *
-     * @param  string $controller
-     * @return Zend_Controller_Plugin_ErrorHandler
-     */
-    public function setErrorHandlerController($controller)
-    {
-        $this->_errorController = (string) $controller;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current error handler controller
-     *
-     * @return string
-     */
-    public function getErrorHandlerController()
-    {
-        return $this->_errorController;
-    }
-
-    /**
-     * Set the action name for the error handler
-     *
-     * @param  string $action
-     * @return Zend_Controller_Plugin_ErrorHandler
-     */
-    public function setErrorHandlerAction($action)
-    {
-        $this->_errorAction = (string) $action;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current error handler action
-     *
-     * @return string
-     */
-    public function getErrorHandlerAction()
-    {
-        return $this->_errorAction;
-    }
-
-    /**
-     * Route shutdown hook -- Ccheck for router exceptions
-     * 
-     * @param Zend_Controller_Request_Abstract $request 
-     */
-    public function routeShutdown(Zend_Controller_Request_Abstract $request)
-    {
-        $this->_handleError($request);
-    }
-
-    /**
-     * Post dispatch hook -- check for exceptions and dispatch error handler if
-     * necessary
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     */
-    public function postDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        $this->_handleError($request);
-    }
-
-    /**
-     * Handle errors and exceptions
-     *
-     * If the 'noErrorHandler' front controller flag has been set,
-     * returns early.
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    protected function _handleError(Zend_Controller_Request_Abstract $request)
-    {
-        $frontController = Zend_Controller_Front::getInstance();
-        if ($frontController->getParam('noErrorHandler')) {
-            return;
-        }
-
-        $response = $this->getResponse();
-
-        if ($this->_isInsideErrorHandlerLoop) {
-            $exceptions = $response->getException();
-            if (count($exceptions) > $this->_exceptionCountAtFirstEncounter) {
-                // Exception thrown by error handler; tell the front controller to throw it
-                $frontController->throwExceptions(true);
-                throw array_pop($exceptions);
-            }
-        }
-
-        // check for an exception AND allow the error handler controller the option to forward
-        if (($response->isException()) && (!$this->_isInsideErrorHandlerLoop)) {
-            $this->_isInsideErrorHandlerLoop = true;
-
-            // Get exception information
-            $error            = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
-            $exceptions       = $response->getException();
-            $exception        = $exceptions[0];
-            $exceptionType    = get_class($exception);
-            $error->exception = $exception;
-            switch ($exceptionType) {
-                case 'Zend_Controller_Router_Exception':
-                    if (404 == $exception->getCode()) {
-                        $error->type = self::EXCEPTION_NO_ROUTE;
-                    } else {
-                        $error->type = self::EXCEPTION_OTHER;
-                    }
-                    break;
-                case 'Zend_Controller_Dispatcher_Exception':
-                    $error->type = self::EXCEPTION_NO_CONTROLLER;
-                    break;
-                case 'Zend_Controller_Action_Exception':
-                    if (404 == $exception->getCode()) {
-                        $error->type = self::EXCEPTION_NO_ACTION;
-                    } else {
-                        $error->type = self::EXCEPTION_OTHER;
-                    }
-                    break;
-                default:
-                    $error->type = self::EXCEPTION_OTHER;
-                    break;
-            }
-
-            // Keep a copy of the original request
-            $error->request = clone $request;
-
-            // get a count of the number of exceptions encountered
-            $this->_exceptionCountAtFirstEncounter = count($exceptions);
-
-            // Forward to the error handler
-            $request->setParam('error_handler', $error)
-                    ->setModuleName($this->getErrorHandlerModule())
-                    ->setControllerName($this->getErrorHandlerController())
-                    ->setActionName($this->getErrorHandlerAction())
-                    ->setDispatched(false);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Plugin/PutHandler.php b/airtime_mvc/library/Zend/Controller/Plugin/PutHandler.php
deleted file mode 100644
index 84eb49c07..000000000
--- a/airtime_mvc/library/Zend/Controller/Plugin/PutHandler.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PutHandler.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Plugin_Abstract
- */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/**
- * @see Zend_Controller_Request_Http
- */
-require_once 'Zend/Controller/Request/Http.php';
-
-/**
- * Plugin to digest PUT request body and make params available just like POST
- *
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Plugin_PutHandler extends Zend_Controller_Plugin_Abstract
-{
-    /**
-     * Before dispatching, digest PUT request body and set params
-     *
-     * @param Zend_Controller_Request_Abstract $request
-     */
-    public function preDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        if (!$request instanceof Zend_Controller_Request_Http) {
-            return;
-        }
-
-        if ($this->_request->isPut()) {
-            $putParams = array();
-            parse_str($this->_request->getRawBody(), $putParams);
-            $request->setParams($putParams);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Request/Abstract.php b/airtime_mvc/library/Zend/Controller/Request/Abstract.php
deleted file mode 100644
index 1d18e0c5e..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/Abstract.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Request_Abstract
-{
-    /**
-     * Has the action been dispatched?
-     * @var boolean
-     */
-    protected $_dispatched = false;
-
-    /**
-     * Module
-     * @var string
-     */
-    protected $_module;
-
-    /**
-     * Module key for retrieving module from params
-     * @var string
-     */
-    protected $_moduleKey = 'module';
-
-    /**
-     * Controller
-     * @var string
-     */
-    protected $_controller;
-
-    /**
-     * Controller key for retrieving controller from params
-     * @var string
-     */
-    protected $_controllerKey = 'controller';
-
-    /**
-     * Action
-     * @var string
-     */
-    protected $_action;
-
-    /**
-     * Action key for retrieving action from params
-     * @var string
-     */
-    protected $_actionKey = 'action';
-
-    /**
-     * Request parameters
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Retrieve the module name
-     *
-     * @return string
-     */
-    public function getModuleName()
-    {
-        if (null === $this->_module) {
-            $this->_module = $this->getParam($this->getModuleKey());
-        }
-
-        return $this->_module;
-    }
-
-    /**
-     * Set the module name to use
-     *
-     * @param string $value
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setModuleName($value)
-    {
-        $this->_module = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve the controller name
-     *
-     * @return string
-     */
-    public function getControllerName()
-    {
-        if (null === $this->_controller) {
-            $this->_controller = $this->getParam($this->getControllerKey());
-        }
-
-        return $this->_controller;
-    }
-
-    /**
-     * Set the controller name to use
-     *
-     * @param string $value
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setControllerName($value)
-    {
-        $this->_controller = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve the action name
-     *
-     * @return string
-     */
-    public function getActionName()
-    {
-        if (null === $this->_action) {
-            $this->_action = $this->getParam($this->getActionKey());
-        }
-
-        return $this->_action;
-    }
-
-    /**
-     * Set the action name
-     *
-     * @param string $value
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setActionName($value)
-    {
-        $this->_action = $value;
-        /**
-         * @see ZF-3465
-         */
-        if (null === $value) {
-            $this->setParam($this->getActionKey(), $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve the module key
-     *
-     * @return string
-     */
-    public function getModuleKey()
-    {
-        return $this->_moduleKey;
-    }
-
-    /**
-     * Set the module key
-     *
-     * @param string $key
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setModuleKey($key)
-    {
-        $this->_moduleKey = (string) $key;
-        return $this;
-    }
-
-    /**
-     * Retrieve the controller key
-     *
-     * @return string
-     */
-    public function getControllerKey()
-    {
-        return $this->_controllerKey;
-    }
-
-    /**
-     * Set the controller key
-     *
-     * @param string $key
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setControllerKey($key)
-    {
-        $this->_controllerKey = (string) $key;
-        return $this;
-    }
-
-    /**
-     * Retrieve the action key
-     *
-     * @return string
-     */
-    public function getActionKey()
-    {
-        return $this->_actionKey;
-    }
-
-    /**
-     * Set the action key
-     *
-     * @param string $key
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setActionKey($key)
-    {
-        $this->_actionKey = (string) $key;
-        return $this;
-    }
-
-    /**
-     * Get an action parameter
-     *
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed
-     */
-    public function getParam($key, $default = null)
-    {
-        $key = (string) $key;
-        if (isset($this->_params[$key])) {
-            return $this->_params[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Retrieve only user params (i.e, any param specific to the object and not the environment)
-     *
-     * @return array
-     */
-    public function getUserParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Retrieve a single user param (i.e, a param specific to the object and not the environment)
-     *
-     * @param string $key
-     * @param string $default Default value to use if key not found
-     * @return mixed
-     */
-    public function getUserParam($key, $default = null)
-    {
-        if (isset($this->_params[$key])) {
-            return $this->_params[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Set an action parameter
-     *
-     * A $value of null will unset the $key if it exists
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setParam($key, $value)
-    {
-        $key = (string) $key;
-
-        if ((null === $value) && isset($this->_params[$key])) {
-            unset($this->_params[$key]);
-        } elseif (null !== $value) {
-            $this->_params[$key] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get all action parameters
-     *
-     * @return array
-     */
-     public function getParams()
-     {
-         return $this->_params;
-     }
-
-    /**
-     * Set action parameters en masse; does not overwrite
-     *
-     * Null values will unset the associated key.
-     *
-     * @param array $array
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setParams(array $array)
-    {
-        $this->_params = $this->_params + (array) $array;
-
-        foreach ($this->_params as $key => $value) {
-            if (null === $value) {
-                unset($this->_params[$key]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Unset all user parameters
-     *
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function clearParams()
-    {
-        $this->_params = array();
-        return $this;
-    }
-
-    /**
-     * Set flag indicating whether or not request has been dispatched
-     *
-     * @param boolean $flag
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function setDispatched($flag = true)
-    {
-        $this->_dispatched = $flag ? true : false;
-        return $this;
-    }
-
-    /**
-     * Determine if the request has been dispatched
-     *
-     * @return boolean
-     */
-    public function isDispatched()
-    {
-        return $this->_dispatched;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Request/Apache404.php b/airtime_mvc/library/Zend/Controller/Request/Apache404.php
deleted file mode 100644
index 3039860d1..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/Apache404.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Apache404.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Controller_Request_Http */
-require_once 'Zend/Controller/Request/Http.php';
-
-/** Zend_Uri */
-require_once 'Zend/Uri.php';
-
-/**
- * Zend_Controller_Request_Apache404
- *
- * HTTP request object for use with Zend_Controller family. Extends basic HTTP
- * request object to allow for two edge cases when using Apache:
- * - Using Apache's 404 handler instead of mod_rewrite to direct requests
- * - Using the PT flag in rewrite rules
- *
- * In each case, the URL to check against is found in REDIRECT_URL, not
- * REQUEST_URI.
- *
- * @uses       Zend_Controller_Request_Http
- * @package    Zend_Controller
- * @subpackage Request
- */
-class Zend_Controller_Request_Apache404 extends Zend_Controller_Request_Http
-{
-    public function setRequestUri($requestUri = null)
-    {
-        $parseUriGetVars = false;
-        if ($requestUri === null) {
-            if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
-                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
-            } elseif (isset($_SERVER['REDIRECT_URL'])) {  // Check if using mod_rewrite
-                $requestUri = $_SERVER['REDIRECT_URL'];
-                if (isset($_SERVER['REDIRECT_QUERYSTRING'])) {
-                    $parseUriGetVars = $_SERVER['REDIRECT_QUERYSTRING'];
-                }
-            } elseif (isset($_SERVER['REQUEST_URI'])) {
-                $requestUri = $_SERVER['REQUEST_URI'];
-            } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
-                $requestUri = $_SERVER['ORIG_PATH_INFO'];
-                if (!empty($_SERVER['QUERY_STRING'])) {
-                    $requestUri .= '?' . $_SERVER['QUERY_STRING'];
-                }
-            } else {
-                return $this;
-            }
-        } elseif (!is_string($requestUri)) {
-            return $this;
-        } else {
-            if (false !== ($pos = strpos($requestUri, '?'))) {
-                $parseUriGetVars = substr($requestUri, $pos + 1);
-            }
-        }
-
-        if ($parseUriGetVars) {
-            // Set GET items, if available
-            parse_str($parseUriGetVars, $_GET);
-        }
-
-        $this->_requestUri = $requestUri;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Request/Exception.php b/airtime_mvc/library/Zend/Controller/Request/Exception.php
deleted file mode 100644
index 838fa58c5..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Exception */
-require_once 'Zend/Controller/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Request_Exception extends Zend_Controller_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Controller/Request/Http.php b/airtime_mvc/library/Zend/Controller/Request/Http.php
deleted file mode 100644
index 4b207d220..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/Http.php
+++ /dev/null
@@ -1,1053 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20984 2010-02-08 16:25:08Z matthew $
- */
-
-/** @see Zend_Controller_Request_Abstract */
-require_once 'Zend/Controller/Request/Abstract.php';
-
-/** @see Zend_Uri */
-require_once 'Zend/Uri.php';
-
-/**
- * Zend_Controller_Request_Http
- *
- * HTTP request object for use with Zend_Controller family.
- *
- * @uses Zend_Controller_Request_Abstract
- * @package Zend_Controller
- * @subpackage Request
- */
-class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
-{
-    /**
-     * Scheme for http
-     *
-     */
-    const SCHEME_HTTP  = 'http';
-
-    /**
-     * Scheme for https
-     *
-     */
-    const SCHEME_HTTPS = 'https';
-
-    /**
-     * Allowed parameter sources
-     * @var array
-     */
-    protected $_paramSources = array('_GET', '_POST');
-
-    /**
-     * REQUEST_URI
-     * @var string;
-     */
-    protected $_requestUri;
-
-    /**
-     * Base URL of request
-     * @var string
-     */
-    protected $_baseUrl = null;
-
-    /**
-     * Base path of request
-     * @var string
-     */
-    protected $_basePath = null;
-
-    /**
-     * PATH_INFO
-     * @var string
-     */
-    protected $_pathInfo = '';
-
-    /**
-     * Instance parameters
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Raw request body
-     * @var string|false
-     */
-    protected $_rawBody;
-
-    /**
-     * Alias keys for request parameters
-     * @var array
-     */
-    protected $_aliases = array();
-
-    /**
-     * Constructor
-     *
-     * If a $uri is passed, the object will attempt to populate itself using
-     * that information.
-     *
-     * @param string|Zend_Uri $uri
-     * @return void
-     * @throws Zend_Controller_Request_Exception when invalid URI passed
-     */
-    public function __construct($uri = null)
-    {
-        if (null !== $uri) {
-            if (!$uri instanceof Zend_Uri) {
-                $uri = Zend_Uri::factory($uri);
-            }
-            if ($uri->valid()) {
-                $path  = $uri->getPath();
-                $query = $uri->getQuery();
-                if (!empty($query)) {
-                    $path .= '?' . $query;
-                }
-
-                $this->setRequestUri($path);
-            } else {
-                require_once 'Zend/Controller/Request/Exception.php';
-                throw new Zend_Controller_Request_Exception('Invalid URI provided to constructor');
-            }
-        } else {
-            $this->setRequestUri();
-        }
-    }
-
-    /**
-     * Access values contained in the superglobals as public members
-     * Order of precedence: 1. GET, 2. POST, 3. COOKIE, 4. SERVER, 5. ENV
-     *
-     * @see http://msdn.microsoft.com/en-us/library/system.web.httprequest.item.aspx
-     * @param string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        switch (true) {
-            case isset($this->_params[$key]):
-                return $this->_params[$key];
-            case isset($_GET[$key]):
-                return $_GET[$key];
-            case isset($_POST[$key]):
-                return $_POST[$key];
-            case isset($_COOKIE[$key]):
-                return $_COOKIE[$key];
-            case ($key == 'REQUEST_URI'):
-                return $this->getRequestUri();
-            case ($key == 'PATH_INFO'):
-                return $this->getPathInfo();
-            case isset($_SERVER[$key]):
-                return $_SERVER[$key];
-            case isset($_ENV[$key]):
-                return $_ENV[$key];
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * Alias to __get
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        return $this->__get($key);
-    }
-
-    /**
-     * Set values
-     *
-     * In order to follow {@link __get()}, which operates on a number of
-     * superglobals, setting values through overloading is not allowed and will
-     * raise an exception. Use setParam() instead.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     * @throws Zend_Controller_Request_Exception
-     */
-    public function __set($key, $value)
-    {
-        require_once 'Zend/Controller/Request/Exception.php';
-        throw new Zend_Controller_Request_Exception('Setting values in superglobals not allowed; please use setParam()');
-    }
-
-    /**
-     * Alias to __set()
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        return $this->__set($key, $value);
-    }
-
-    /**
-     * Check to see if a property is set
-     *
-     * @param string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        switch (true) {
-            case isset($this->_params[$key]):
-                return true;
-            case isset($_GET[$key]):
-                return true;
-            case isset($_POST[$key]):
-                return true;
-            case isset($_COOKIE[$key]):
-                return true;
-            case isset($_SERVER[$key]):
-                return true;
-            case isset($_ENV[$key]):
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Alias to __isset()
-     *
-     * @param string $key
-     * @return boolean
-     */
-    public function has($key)
-    {
-        return $this->__isset($key);
-    }
-
-    /**
-     * Set GET values
-     *
-     * @param  string|array $spec
-     * @param  null|mixed $value
-     * @return Zend_Controller_Request_Http
-     */
-    public function setQuery($spec, $value = null)
-    {
-        if ((null === $value) && !is_array($spec)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid value passed to setQuery(); must be either array of values or key/value pair');
-        }
-        if ((null === $value) && is_array($spec)) {
-            foreach ($spec as $key => $value) {
-                $this->setQuery($key, $value);
-            }
-            return $this;
-        }
-        $_GET[(string) $spec] = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve a member of the $_GET superglobal
-     *
-     * If no $key is passed, returns the entire $_GET array.
-     *
-     * @todo How to retrieve from nested arrays
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed Returns null if key does not exist
-     */
-    public function getQuery($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $_GET;
-        }
-
-        return (isset($_GET[$key])) ? $_GET[$key] : $default;
-    }
-
-    /**
-     * Set POST values
-     *
-     * @param  string|array $spec
-     * @param  null|mixed $value
-     * @return Zend_Controller_Request_Http
-     */
-    public function setPost($spec, $value = null)
-    {
-        if ((null === $value) && !is_array($spec)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid value passed to setPost(); must be either array of values or key/value pair');
-        }
-        if ((null === $value) && is_array($spec)) {
-            foreach ($spec as $key => $value) {
-                $this->setPost($key, $value);
-            }
-            return $this;
-        }
-        $_POST[(string) $spec] = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve a member of the $_POST superglobal
-     *
-     * If no $key is passed, returns the entire $_POST array.
-     *
-     * @todo How to retrieve from nested arrays
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed Returns null if key does not exist
-     */
-    public function getPost($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $_POST;
-        }
-
-        return (isset($_POST[$key])) ? $_POST[$key] : $default;
-    }
-
-    /**
-     * Retrieve a member of the $_COOKIE superglobal
-     *
-     * If no $key is passed, returns the entire $_COOKIE array.
-     *
-     * @todo How to retrieve from nested arrays
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed Returns null if key does not exist
-     */
-    public function getCookie($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $_COOKIE;
-        }
-
-        return (isset($_COOKIE[$key])) ? $_COOKIE[$key] : $default;
-    }
-
-    /**
-     * Retrieve a member of the $_SERVER superglobal
-     *
-     * If no $key is passed, returns the entire $_SERVER array.
-     *
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed Returns null if key does not exist
-     */
-    public function getServer($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $_SERVER;
-        }
-
-        return (isset($_SERVER[$key])) ? $_SERVER[$key] : $default;
-    }
-
-    /**
-     * Retrieve a member of the $_ENV superglobal
-     *
-     * If no $key is passed, returns the entire $_ENV array.
-     *
-     * @param string $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed Returns null if key does not exist
-     */
-    public function getEnv($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $_ENV;
-        }
-
-        return (isset($_ENV[$key])) ? $_ENV[$key] : $default;
-    }
-
-    /**
-     * Set the REQUEST_URI on which the instance operates
-     *
-     * If no request URI is passed, uses the value in $_SERVER['REQUEST_URI'],
-     * $_SERVER['HTTP_X_REWRITE_URL'], or $_SERVER['ORIG_PATH_INFO'] + $_SERVER['QUERY_STRING'].
-     *
-     * @param string $requestUri
-     * @return Zend_Controller_Request_Http
-     */
-    public function setRequestUri($requestUri = null)
-    {
-        if ($requestUri === null) {
-            if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
-                $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
-            } elseif (
-                // IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
-                isset($_SERVER['IIS_WasUrlRewritten'])
-                && $_SERVER['IIS_WasUrlRewritten'] == '1'
-                && isset($_SERVER['UNENCODED_URL'])
-                && $_SERVER['UNENCODED_URL'] != ''
-                ) {
-                $requestUri = $_SERVER['UNENCODED_URL'];
-            } elseif (isset($_SERVER['REQUEST_URI'])) {
-                $requestUri = $_SERVER['REQUEST_URI'];
-                // Http proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
-                $schemeAndHttpHost = $this->getScheme() . '://' . $this->getHttpHost();
-                if (strpos($requestUri, $schemeAndHttpHost) === 0) {
-                    $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
-                }
-            } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
-                $requestUri = $_SERVER['ORIG_PATH_INFO'];
-                if (!empty($_SERVER['QUERY_STRING'])) {
-                    $requestUri .= '?' . $_SERVER['QUERY_STRING'];
-                }
-            } else {
-                return $this;
-            }
-        } elseif (!is_string($requestUri)) {
-            return $this;
-        } else {
-            // Set GET items, if available
-            if (false !== ($pos = strpos($requestUri, '?'))) {
-                // Get key => value pairs and set $_GET
-                $query = substr($requestUri, $pos + 1);
-                parse_str($query, $vars);
-                $this->setQuery($vars);
-            }
-        }
-
-        $this->_requestUri = $requestUri;
-        return $this;
-    }
-
-    /**
-     * Returns the REQUEST_URI taking into account
-     * platform differences between Apache and IIS
-     *
-     * @return string
-     */
-    public function getRequestUri()
-    {
-        if (empty($this->_requestUri)) {
-            $this->setRequestUri();
-        }
-
-        return $this->_requestUri;
-    }
-
-    /**
-     * Set the base URL of the request; i.e., the segment leading to the script name
-     *
-     * E.g.:
-     * - /admin
-     * - /myapp
-     * - /subdir/index.php
-     *
-     * Do not use the full URI when providing the base. The following are
-     * examples of what not to use:
-     * - http://example.com/admin (should be just /admin)
-     * - http://example.com/subdir/index.php (should be just /subdir/index.php)
-     *
-     * If no $baseUrl is provided, attempts to determine the base URL from the
-     * environment, using SCRIPT_FILENAME, SCRIPT_NAME, PHP_SELF, and
-     * ORIG_SCRIPT_NAME in its determination.
-     *
-     * @param mixed $baseUrl
-     * @return Zend_Controller_Request_Http
-     */
-    public function setBaseUrl($baseUrl = null)
-    {
-        if ((null !== $baseUrl) && !is_string($baseUrl)) {
-            return $this;
-        }
-
-        if ($baseUrl === null) {
-            $filename = (isset($_SERVER['SCRIPT_FILENAME'])) ? basename($_SERVER['SCRIPT_FILENAME']) : '';
-
-            if (isset($_SERVER['SCRIPT_NAME']) && basename($_SERVER['SCRIPT_NAME']) === $filename) {
-                $baseUrl = $_SERVER['SCRIPT_NAME'];
-            } elseif (isset($_SERVER['PHP_SELF']) && basename($_SERVER['PHP_SELF']) === $filename) {
-                $baseUrl = $_SERVER['PHP_SELF'];
-            } elseif (isset($_SERVER['ORIG_SCRIPT_NAME']) && basename($_SERVER['ORIG_SCRIPT_NAME']) === $filename) {
-                $baseUrl = $_SERVER['ORIG_SCRIPT_NAME']; // 1and1 shared hosting compatibility
-            } else {
-                // Backtrack up the script_filename to find the portion matching
-                // php_self
-                $path    = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '';
-                $file    = isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : '';
-                $segs    = explode('/', trim($file, '/'));
-                $segs    = array_reverse($segs);
-                $index   = 0;
-                $last    = count($segs);
-                $baseUrl = '';
-                do {
-                    $seg     = $segs[$index];
-                    $baseUrl = '/' . $seg . $baseUrl;
-                    ++$index;
-                } while (($last > $index) && (false !== ($pos = strpos($path, $baseUrl))) && (0 != $pos));
-            }
-
-            // Does the baseUrl have anything in common with the request_uri?
-            $requestUri = $this->getRequestUri();
-
-            if (0 === strpos($requestUri, $baseUrl)) {
-                // full $baseUrl matches
-                $this->_baseUrl = $baseUrl;
-                return $this;
-            }
-
-            if (0 === strpos($requestUri, dirname($baseUrl))) {
-                // directory portion of $baseUrl matches
-                $this->_baseUrl = rtrim(dirname($baseUrl), '/');
-                return $this;
-            }
-
-            $truncatedRequestUri = $requestUri;
-            if (($pos = strpos($requestUri, '?')) !== false) {
-                $truncatedRequestUri = substr($requestUri, 0, $pos);
-            }
-
-            $basename = basename($baseUrl);
-            if (empty($basename) || !strpos($truncatedRequestUri, $basename)) {
-                // no match whatsoever; set it blank
-                $this->_baseUrl = '';
-                return $this;
-            }
-
-            // If using mod_rewrite or ISAPI_Rewrite strip the script filename
-            // out of baseUrl. $pos !== 0 makes sure it is not matching a value
-            // from PATH_INFO or QUERY_STRING
-            if ((strlen($requestUri) >= strlen($baseUrl))
-                && ((false !== ($pos = strpos($requestUri, $baseUrl))) && ($pos !== 0)))
-            {
-                $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
-            }
-        }
-
-        $this->_baseUrl = rtrim($baseUrl, '/');
-        return $this;
-    }
-
-    /**
-     * Everything in REQUEST_URI before PATH_INFO
-     * <form action="<?=$baseUrl?>/news/submit" method="POST"/>
-     *
-     * @return string
-     */
-    public function getBaseUrl()
-    {
-        if (null === $this->_baseUrl) {
-            $this->setBaseUrl();
-        }
-
-        return $this->_baseUrl;
-    }
-
-    /**
-     * Set the base path for the URL
-     *
-     * @param string|null $basePath
-     * @return Zend_Controller_Request_Http
-     */
-    public function setBasePath($basePath = null)
-    {
-        if ($basePath === null) {
-            $filename = (isset($_SERVER['SCRIPT_FILENAME']))
-                      ? basename($_SERVER['SCRIPT_FILENAME'])
-                      : '';
-
-            $baseUrl = $this->getBaseUrl();
-            if (empty($baseUrl)) {
-                $this->_basePath = '';
-                return $this;
-            }
-
-            if (basename($baseUrl) === $filename) {
-                $basePath = dirname($baseUrl);
-            } else {
-                $basePath = $baseUrl;
-            }
-        }
-
-        if (substr(PHP_OS, 0, 3) === 'WIN') {
-            $basePath = str_replace('\\', '/', $basePath);
-        }
-
-        $this->_basePath = rtrim($basePath, '/');
-        return $this;
-    }
-
-    /**
-     * Everything in REQUEST_URI before PATH_INFO not including the filename
-     * <img src="<?=$basePath?>/images/zend.png"/>
-     *
-     * @return string
-     */
-    public function getBasePath()
-    {
-        if (null === $this->_basePath) {
-            $this->setBasePath();
-        }
-
-        return $this->_basePath;
-    }
-
-    /**
-     * Set the PATH_INFO string
-     *
-     * @param string|null $pathInfo
-     * @return Zend_Controller_Request_Http
-     */
-    public function setPathInfo($pathInfo = null)
-    {
-        if ($pathInfo === null) {
-            $baseUrl = $this->getBaseUrl();
-
-            if (null === ($requestUri = $this->getRequestUri())) {
-                return $this;
-            }
-
-            // Remove the query string from REQUEST_URI
-            if ($pos = strpos($requestUri, '?')) {
-                $requestUri = substr($requestUri, 0, $pos);
-            }
-
-            if (null !== $baseUrl
-                && ((!empty($baseUrl) && 0 === strpos($requestUri, $baseUrl)) 
-                    || empty($baseUrl))
-                    && false === ($pathInfo = substr($requestUri, strlen($baseUrl)))
-            ){ 
-                // If substr() returns false then PATH_INFO is set to an empty string 
-                $pathInfo = '';
-            } elseif (null === $baseUrl 
-                    || (!empty($baseUrl) && false === strpos($requestUri, $baseUrl))
-            ) { 
-                $pathInfo = $requestUri; 
-            }
-        }
-
-        $this->_pathInfo = (string) $pathInfo;
-        return $this;
-    }
-
-    /**
-     * Returns everything between the BaseUrl and QueryString.
-     * This value is calculated instead of reading PATH_INFO
-     * directly from $_SERVER due to cross-platform differences.
-     *
-     * @return string
-     */
-    public function getPathInfo()
-    {
-        if (empty($this->_pathInfo)) {
-            $this->setPathInfo();
-        }
-
-        return $this->_pathInfo;
-    }
-
-    /**
-     * Set allowed parameter sources
-     *
-     * Can be empty array, or contain one or more of '_GET' or '_POST'.
-     *
-     * @param  array $paramSoures
-     * @return Zend_Controller_Request_Http
-     */
-    public function setParamSources(array $paramSources = array())
-    {
-        $this->_paramSources = $paramSources;
-        return $this;
-    }
-
-    /**
-     * Get list of allowed parameter sources
-     *
-     * @return array
-     */
-    public function getParamSources()
-    {
-        return $this->_paramSources;
-    }
-
-    /**
-     * Set a userland parameter
-     *
-     * Uses $key to set a userland parameter. If $key is an alias, the actual
-     * key will be retrieved and used to set the parameter.
-     *
-     * @param mixed $key
-     * @param mixed $value
-     * @return Zend_Controller_Request_Http
-     */
-    public function setParam($key, $value)
-    {
-        $key = (null !== ($alias = $this->getAlias($key))) ? $alias : $key;
-        parent::setParam($key, $value);
-        return $this;
-    }
-
-    /**
-     * Retrieve a parameter
-     *
-     * Retrieves a parameter from the instance. Priority is in the order of
-     * userland parameters (see {@link setParam()}), $_GET, $_POST. If a
-     * parameter matching the $key is not found, null is returned.
-     *
-     * If the $key is an alias, the actual key aliased will be used.
-     *
-     * @param mixed $key
-     * @param mixed $default Default value to use if key not found
-     * @return mixed
-     */
-    public function getParam($key, $default = null)
-    {
-        $keyName = (null !== ($alias = $this->getAlias($key))) ? $alias : $key;
-
-        $paramSources = $this->getParamSources();
-        if (isset($this->_params[$keyName])) {
-            return $this->_params[$keyName];
-        } elseif (in_array('_GET', $paramSources) && (isset($_GET[$keyName]))) {
-            return $_GET[$keyName];
-        } elseif (in_array('_POST', $paramSources) && (isset($_POST[$keyName]))) {
-            return $_POST[$keyName];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Retrieve an array of parameters
-     *
-     * Retrieves a merged array of parameters, with precedence of userland
-     * params (see {@link setParam()}), $_GET, $_POST (i.e., values in the
-     * userland params will take precedence over all others).
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        $return       = $this->_params;
-        $paramSources = $this->getParamSources();
-        if (in_array('_GET', $paramSources)
-            && isset($_GET)
-            && is_array($_GET)
-        ) {
-            $return += $_GET;
-        }
-        if (in_array('_POST', $paramSources)
-            && isset($_POST)
-            && is_array($_POST)
-        ) {
-            $return += $_POST;
-        }
-        return $return;
-    }
-
-    /**
-     * Set parameters
-     *
-     * Set one or more parameters. Parameters are set as userland parameters,
-     * using the keys specified in the array.
-     *
-     * @param array $params
-     * @return Zend_Controller_Request_Http
-     */
-    public function setParams(array $params)
-    {
-        foreach ($params as $key => $value) {
-            $this->setParam($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Set a key alias
-     *
-     * Set an alias used for key lookups. $name specifies the alias, $target
-     * specifies the actual key to use.
-     *
-     * @param string $name
-     * @param string $target
-     * @return Zend_Controller_Request_Http
-     */
-    public function setAlias($name, $target)
-    {
-        $this->_aliases[$name] = $target;
-        return $this;
-    }
-
-    /**
-     * Retrieve an alias
-     *
-     * Retrieve the actual key represented by the alias $name.
-     *
-     * @param string $name
-     * @return string|null Returns null when no alias exists
-     */
-    public function getAlias($name)
-    {
-        if (isset($this->_aliases[$name])) {
-            return $this->_aliases[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve the list of all aliases
-     *
-     * @return array
-     */
-    public function getAliases()
-    {
-        return $this->_aliases;
-    }
-
-    /**
-     * Return the method by which the request was made
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->getServer('REQUEST_METHOD');
-    }
-
-    /**
-     * Was the request made by POST?
-     *
-     * @return boolean
-     */
-    public function isPost()
-    {
-        if ('POST' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Was the request made by GET?
-     *
-     * @return boolean
-     */
-    public function isGet()
-    {
-        if ('GET' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Was the request made by PUT?
-     *
-     * @return boolean
-     */
-    public function isPut()
-    {
-        if ('PUT' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Was the request made by DELETE?
-     *
-     * @return boolean
-     */
-    public function isDelete()
-    {
-        if ('DELETE' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Was the request made by HEAD?
-     *
-     * @return boolean
-     */
-    public function isHead()
-    {
-        if ('HEAD' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Was the request made by OPTIONS?
-     *
-     * @return boolean
-     */
-    public function isOptions()
-    {
-        if ('OPTIONS' == $this->getMethod()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Is the request a Javascript XMLHttpRequest?
-     *
-     * Should work with Prototype/Script.aculo.us, possibly others.
-     *
-     * @return boolean
-     */
-    public function isXmlHttpRequest()
-    {
-        return ($this->getHeader('X_REQUESTED_WITH') == 'XMLHttpRequest');
-    }
-
-    /**
-     * Is this a Flash request?
-     *
-     * @return boolean
-     */
-    public function isFlashRequest()
-    {
-        $header = strtolower($this->getHeader('USER_AGENT'));
-        return (strstr($header, ' flash')) ? true : false;
-    }
-
-    /**
-     * Is https secure request
-     *
-     * @return boolean
-     */
-    public function isSecure()
-    {
-        return ($this->getScheme() === self::SCHEME_HTTPS);
-    }
-
-    /**
-     * Return the raw body of the request, if present
-     *
-     * @return string|false Raw body, or false if not present
-     */
-    public function getRawBody()
-    {
-        if (null === $this->_rawBody) {
-            $body = file_get_contents('php://input');
-
-            if (strlen(trim($body)) > 0) {
-                $this->_rawBody = $body;
-            } else {
-                $this->_rawBody = false;
-            }
-        }
-        return $this->_rawBody;
-    }
-
-    /**
-     * Return the value of the given HTTP header. Pass the header name as the
-     * plain, HTTP-specified header name. Ex.: Ask for 'Accept' to get the
-     * Accept header, 'Accept-Encoding' to get the Accept-Encoding header.
-     *
-     * @param string $header HTTP header name
-     * @return string|false HTTP header value, or false if not found
-     * @throws Zend_Controller_Request_Exception
-     */
-    public function getHeader($header)
-    {
-        if (empty($header)) {
-            require_once 'Zend/Controller/Request/Exception.php';
-            throw new Zend_Controller_Request_Exception('An HTTP header name is required');
-        }
-
-        // Try to get it from the $_SERVER array first
-        $temp = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
-            return $_SERVER[$temp];
-        }
-
-        // This seems to be the only way to get the Authorization header on
-        // Apache
-        if (function_exists('apache_request_headers')) {
-            $headers = apache_request_headers();
-            if (!empty($headers[$header])) {
-                return $headers[$header];
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the request URI scheme
-     *
-     * @return string
-     */
-    public function getScheme()
-    {
-        return ($this->getServer('HTTPS') == 'on') ? self::SCHEME_HTTPS : self::SCHEME_HTTP;
-    }
-
-    /**
-     * Get the HTTP host.
-     *
-     * "Host" ":" host [ ":" port ] ; Section 3.2.2
-     * Note the HTTP Host header is not the same as the URI host.
-     * It includes the port while the URI host doesn't.
-     *
-     * @return string
-     */
-    public function getHttpHost()
-    {
-        $host = $this->getServer('HTTP_HOST');
-        if (!empty($host)) {
-            return $host;
-        }
-
-        $scheme = $this->getScheme();
-        $name   = $this->getServer('SERVER_NAME');
-        $port   = $this->getServer('SERVER_PORT');
-
-        if (($scheme == self::SCHEME_HTTP && $port == 80) || ($scheme == self::SCHEME_HTTPS && $port == 443)) {
-            return $name;
-        } else {
-            return $name . ':' . $port;
-        }
-    }
-
-    /**
-     * Get the client's IP addres
-     *
-     * @param  boolean $checkProxy
-     * @return string
-     */
-    public function getClientIp($checkProxy = true)
-    {
-        if ($checkProxy && $this->getServer('HTTP_CLIENT_IP') != null) {
-            $ip = $this->getServer('HTTP_CLIENT_IP');
-        } else if ($checkProxy && $this->getServer('HTTP_X_FORWARDED_FOR') != null) {
-            $ip = $this->getServer('HTTP_X_FORWARDED_FOR');
-        } else {
-            $ip = $this->getServer('REMOTE_ADDR');
-        }
-
-        return $ip;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Request/HttpTestCase.php b/airtime_mvc/library/Zend/Controller/Request/HttpTestCase.php
deleted file mode 100644
index 90434d842..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/HttpTestCase.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Request_Http
- */
-require_once 'Zend/Controller/Request/Http.php';
-
-/**
- * Zend_Controller_Request_HttpTestCase
- *
- * HTTP request object for use with Zend_Controller family.
- *
- * @uses Zend_Controller_Request_Http
- * @package Zend_Controller
- * @subpackage Request
- */
-class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
-{
-    /**
-     * Request headers
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * Request method
-     * @var string
-     */
-    protected $_method = 'GET';
-
-    /**
-     * Raw POST body
-     * @var string|null
-     */
-    protected $_rawBody;
-
-    /**
-     * Valid request method types
-     * @var array
-     */
-    protected $_validMethodTypes = array(
-        'DELETE',
-        'GET',
-        'HEAD',
-        'OPTIONS',
-        'POST',
-        'PUT',
-    );
-
-    /**
-     * Clear GET values
-     *
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function clearQuery()
-    {
-        $_GET = array();
-        return $this;
-    }
-
-    /**
-     * Clear POST values
-     *
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function clearPost()
-    {
-        $_POST = array();
-        return $this;
-    }
-
-    /**
-     * Set raw POST body
-     *
-     * @param  string $content
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function setRawBody($content)
-    {
-        $this->_rawBody = (string) $content;
-        return $this;
-    }
-
-    /**
-     * Get RAW POST body
-     *
-     * @return string|null
-     */
-    public function getRawBody()
-    {
-        return $this->_rawBody;
-    }
-
-    /**
-     * Clear raw POST body
-     *
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function clearRawBody()
-    {
-        $this->_rawBody = null;
-        return $this;
-    }
-
-    /**
-     * Set a cookie
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function setCookie($key, $value)
-    {
-        $_COOKIE[(string) $key] = $value;
-        return $this;
-    }
-
-    /**
-     * Set multiple cookies at once
-     *
-     * @param array $cookies
-     * @return void
-     */
-    public function setCookies(array $cookies)
-    {
-        foreach ($cookies as $key => $value) {
-            $_COOKIE[$key] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all cookies
-     *
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function clearCookies()
-    {
-        $_COOKIE = array();
-        return $this;
-    }
-
-    /**
-     * Set request method
-     *
-     * @param  string $type
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function setMethod($type)
-    {
-        $type = strtoupper(trim((string) $type));
-        if (!in_array($type, $this->_validMethodTypes)) {
-            require_once 'Zend/Controller/Exception.php';
-            throw new Zend_Controller_Exception('Invalid request method specified');
-        }
-        $this->_method = $type;
-        return $this;
-    }
-
-    /**
-     * Get request method
-     *
-     * @return string|null
-     */
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-
-    /**
-     * Set a request header
-     *
-     * @param  string $key
-     * @param  string $value
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function setHeader($key, $value)
-    {
-        $key = $this->_normalizeHeaderName($key);
-        $this->_headers[$key] = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Set request headers
-     *
-     * @param  array $headers
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function setHeaders(array $headers)
-    {
-        foreach ($headers as $key => $value) {
-            $this->setHeader($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Get request header
-     *
-     * @param  string $header
-     * @param  mixed $default
-     * @return string|null
-     */
-    public function getHeader($header, $default = null)
-    {
-        $header = $this->_normalizeHeaderName($header);
-        if (array_key_exists($header, $this->_headers)) {
-            return $this->_headers[$header];
-        }
-        return $default;
-    }
-
-    /**
-     * Get all request headers
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Clear request headers
-     *
-     * @return Zend_Controller_Request_HttpTestCase
-     */
-    public function clearHeaders()
-    {
-        $this->_headers = array();
-        return $this;
-    }
-
-    /**
-     * Get REQUEST_URI
-     *
-     * @return null|string
-     */
-    public function getRequestUri()
-    {
-        return $this->_requestUri;
-    }
-
-    /**
-     * Normalize a header name for setting and retrieval
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _normalizeHeaderName($name)
-    {
-        $name = strtoupper((string) $name);
-        $name = str_replace('-', '_', $name);
-        return $name;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Request/Simple.php b/airtime_mvc/library/Zend/Controller/Request/Simple.php
deleted file mode 100644
index 866f76bdb..000000000
--- a/airtime_mvc/library/Zend/Controller/Request/Simple.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Controller_Request_Abstract */
-require_once 'Zend/Controller/Request/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract
-{
-
-    public function __construct($action = null, $controller = null, $module = null, array $params = array())
-    {
-        if ($action) {
-            $this->setActionName($action);
-        }
-
-        if ($controller) {
-            $this->setControllerName($controller);
-        }
-
-        if ($module) {
-            $this->setModuleName($module);
-        }
-
-        if ($params) {
-            $this->setParams($params);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Response/Abstract.php b/airtime_mvc/library/Zend/Controller/Response/Abstract.php
deleted file mode 100644
index df862ba3f..000000000
--- a/airtime_mvc/library/Zend/Controller/Response/Abstract.php
+++ /dev/null
@@ -1,794 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21302 2010-03-02 23:01:38Z yoshida@zend.co.jp $
- */
-
-/**
- * Zend_Controller_Response_Abstract
- *
- * Base class for Zend_Controller responses
- *
- * @package Zend_Controller
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Response_Abstract
-{
-    /**
-     * Body content
-     * @var array
-     */
-    protected $_body = array();
-
-    /**
-     * Exception stack
-     * @var Exception
-     */
-    protected $_exceptions = array();
-
-    /**
-     * Array of headers. Each header is an array with keys 'name' and 'value'
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * Array of raw headers. Each header is a single string, the entire header to emit
-     * @var array
-     */
-    protected $_headersRaw = array();
-
-    /**
-     * HTTP response code to use in headers
-     * @var int
-     */
-    protected $_httpResponseCode = 200;
-
-    /**
-     * Flag; is this response a redirect?
-     * @var boolean
-     */
-    protected $_isRedirect = false;
-
-    /**
-     * Whether or not to render exceptions; off by default
-     * @var boolean
-     */
-    protected $_renderExceptions = false;
-
-    /**
-     * Flag; if true, when header operations are called after headers have been
-     * sent, an exception will be raised; otherwise, processing will continue
-     * as normal. Defaults to true.
-     *
-     * @see canSendHeaders()
-     * @var boolean
-     */
-    public $headersSentThrowsException = true;
-
-    /**
-     * Normalize a header name
-     *
-     * Normalizes a header name to X-Capitalized-Names
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _normalizeHeader($name)
-    {
-        $filtered = str_replace(array('-', '_'), ' ', (string) $name);
-        $filtered = ucwords(strtolower($filtered));
-        $filtered = str_replace(' ', '-', $filtered);
-        return $filtered;
-    }
-
-    /**
-     * Set a header
-     *
-     * If $replace is true, replaces any headers already defined with that
-     * $name.
-     *
-     * @param string $name
-     * @param string $value
-     * @param boolean $replace
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setHeader($name, $value, $replace = false)
-    {
-        $this->canSendHeaders(true);
-        $name  = $this->_normalizeHeader($name);
-        $value = (string) $value;
-
-        if ($replace) {
-            foreach ($this->_headers as $key => $header) {
-                if ($name == $header['name']) {
-                    unset($this->_headers[$key]);
-                }
-            }
-        }
-
-        $this->_headers[] = array(
-            'name'    => $name,
-            'value'   => $value,
-            'replace' => $replace
-        );
-
-        return $this;
-    }
-
-    /**
-     * Set redirect URL
-     *
-     * Sets Location header and response code. Forces replacement of any prior
-     * redirects.
-     *
-     * @param string $url
-     * @param int $code
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setRedirect($url, $code = 302)
-    {
-        $this->canSendHeaders(true);
-        $this->setHeader('Location', $url, true)
-             ->setHttpResponseCode($code);
-
-        return $this;
-    }
-
-    /**
-     * Is this a redirect?
-     *
-     * @return boolean
-     */
-    public function isRedirect()
-    {
-        return $this->_isRedirect;
-    }
-
-    /**
-     * Return array of headers; see {@link $_headers} for format
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Clear headers
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function clearHeaders()
-    {
-        $this->_headers = array();
-
-        return $this;
-    }
-
-    /**
-     * Clears the specified HTTP header
-     *
-     * @param  string $name
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function clearHeader($name)
-    {
-        if (! count($this->_headers)) {
-            return $this;
-        }
-
-        foreach ($this->_headers as $index => $header) {
-            if ($name == $header['name']) {
-                unset($this->_headers[$index]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set raw HTTP header
-     *
-     * Allows setting non key => value headers, such as status codes
-     *
-     * @param string $value
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setRawHeader($value)
-    {
-        $this->canSendHeaders(true);
-        if ('Location' == substr($value, 0, 8)) {
-            $this->_isRedirect = true;
-        }
-        $this->_headersRaw[] = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve all {@link setRawHeader() raw HTTP headers}
-     *
-     * @return array
-     */
-    public function getRawHeaders()
-    {
-        return $this->_headersRaw;
-    }
-
-    /**
-     * Clear all {@link setRawHeader() raw HTTP headers}
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function clearRawHeaders()
-    {
-        $this->_headersRaw = array();
-        return $this;
-    }
-
-    /**
-     * Clears the specified raw HTTP header
-     *
-     * @param  string $headerRaw
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function clearRawHeader($headerRaw)
-    {
-        if (! count($this->_headersRaw)) {
-            return $this;
-        }
-
-        $key = array_search($headerRaw, $this->_headersRaw);
-        unset($this->_headersRaw[$key]);
-
-        return $this;
-    }
-
-    /**
-     * Clear all headers, normal and raw
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function clearAllHeaders()
-    {
-        return $this->clearHeaders()
-                    ->clearRawHeaders();
-    }
-
-    /**
-     * Set HTTP response code to use with headers
-     *
-     * @param int $code
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setHttpResponseCode($code)
-    {
-        if (!is_int($code) || (100 > $code) || (599 < $code)) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Invalid HTTP response code');
-        }
-
-        if ((300 <= $code) && (307 >= $code)) {
-            $this->_isRedirect = true;
-        } else {
-            $this->_isRedirect = false;
-        }
-
-        $this->_httpResponseCode = $code;
-        return $this;
-    }
-
-    /**
-     * Retrieve HTTP response code
-     *
-     * @return int
-     */
-    public function getHttpResponseCode()
-    {
-        return $this->_httpResponseCode;
-    }
-
-    /**
-     * Can we send headers?
-     *
-     * @param boolean $throw Whether or not to throw an exception if headers have been sent; defaults to false
-     * @return boolean
-     * @throws Zend_Controller_Response_Exception
-     */
-    public function canSendHeaders($throw = false)
-    {
-        $ok = headers_sent($file, $line);
-        if ($ok && $throw && $this->headersSentThrowsException) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line);
-        }
-
-        return !$ok;
-    }
-
-    /**
-     * Send all headers
-     *
-     * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code}
-     * has been specified, it is sent with the first header.
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function sendHeaders()
-    {
-        // Only check if we can send headers if we have headers to send
-        if (count($this->_headersRaw) || count($this->_headers) || (200 != $this->_httpResponseCode)) {
-            $this->canSendHeaders(true);
-        } elseif (200 == $this->_httpResponseCode) {
-            // Haven't changed the response code, and we have no headers
-            return $this;
-        }
-
-        $httpCodeSent = false;
-
-        foreach ($this->_headersRaw as $header) {
-            if (!$httpCodeSent && $this->_httpResponseCode) {
-                header($header, true, $this->_httpResponseCode);
-                $httpCodeSent = true;
-            } else {
-                header($header);
-            }
-        }
-
-        foreach ($this->_headers as $header) {
-            if (!$httpCodeSent && $this->_httpResponseCode) {
-                header($header['name'] . ': ' . $header['value'], $header['replace'], $this->_httpResponseCode);
-                $httpCodeSent = true;
-            } else {
-                header($header['name'] . ': ' . $header['value'], $header['replace']);
-            }
-        }
-
-        if (!$httpCodeSent) {
-            header('HTTP/1.1 ' . $this->_httpResponseCode);
-            $httpCodeSent = true;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set body content
-     *
-     * If $name is not passed, or is not a string, resets the entire body and
-     * sets the 'default' key to $content.
-     *
-     * If $name is a string, sets the named segment in the body array to
-     * $content.
-     *
-     * @param string $content
-     * @param null|string $name
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setBody($content, $name = null)
-    {
-        if ((null === $name) || !is_string($name)) {
-            $this->_body = array('default' => (string) $content);
-        } else {
-            $this->_body[$name] = (string) $content;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Append content to the body content
-     *
-     * @param string $content
-     * @param null|string $name
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function appendBody($content, $name = null)
-    {
-        if ((null === $name) || !is_string($name)) {
-            if (isset($this->_body['default'])) {
-                $this->_body['default'] .= (string) $content;
-            } else {
-                return $this->append('default', $content);
-            }
-        } elseif (isset($this->_body[$name])) {
-            $this->_body[$name] .= (string) $content;
-        } else {
-            return $this->append($name, $content);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear body array
-     *
-     * With no arguments, clears the entire body array. Given a $name, clears
-     * just that named segment; if no segment matching $name exists, returns
-     * false to indicate an error.
-     *
-     * @param  string $name Named segment to clear
-     * @return boolean
-     */
-    public function clearBody($name = null)
-    {
-        if (null !== $name) {
-            $name = (string) $name;
-            if (isset($this->_body[$name])) {
-                unset($this->_body[$name]);
-                return true;
-            }
-
-            return false;
-        }
-
-        $this->_body = array();
-        return true;
-    }
-
-    /**
-     * Return the body content
-     *
-     * If $spec is false, returns the concatenated values of the body content
-     * array. If $spec is boolean true, returns the body content array. If
-     * $spec is a string and matches a named segment, returns the contents of
-     * that segment; otherwise, returns null.
-     *
-     * @param boolean $spec
-     * @return string|array|null
-     */
-    public function getBody($spec = false)
-    {
-        if (false === $spec) {
-            ob_start();
-            $this->outputBody();
-            return ob_get_clean();
-        } elseif (true === $spec) {
-            return $this->_body;
-        } elseif (is_string($spec) && isset($this->_body[$spec])) {
-            return $this->_body[$spec];
-        }
-
-        return null;
-    }
-
-    /**
-     * Append a named body segment to the body content array
-     *
-     * If segment already exists, replaces with $content and places at end of
-     * array.
-     *
-     * @param string $name
-     * @param string $content
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function append($name, $content)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
-        }
-
-        if (isset($this->_body[$name])) {
-            unset($this->_body[$name]);
-        }
-        $this->_body[$name] = (string) $content;
-        return $this;
-    }
-
-    /**
-     * Prepend a named body segment to the body content array
-     *
-     * If segment already exists, replaces with $content and places at top of
-     * array.
-     *
-     * @param string $name
-     * @param string $content
-     * @return void
-     */
-    public function prepend($name, $content)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
-        }
-
-        if (isset($this->_body[$name])) {
-            unset($this->_body[$name]);
-        }
-
-        $new = array($name => (string) $content);
-        $this->_body = $new + $this->_body;
-
-        return $this;
-    }
-
-    /**
-     * Insert a named segment into the body content array
-     *
-     * @param  string $name
-     * @param  string $content
-     * @param  string $parent
-     * @param  boolean $before Whether to insert the new segment before or
-     * after the parent. Defaults to false (after)
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function insert($name, $content, $parent = null, $before = false)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")');
-        }
-
-        if ((null !== $parent) && !is_string($parent)) {
-            require_once 'Zend/Controller/Response/Exception.php';
-            throw new Zend_Controller_Response_Exception('Invalid body segment parent key ("' . gettype($parent) . '")');
-        }
-
-        if (isset($this->_body[$name])) {
-            unset($this->_body[$name]);
-        }
-
-        if ((null === $parent) || !isset($this->_body[$parent])) {
-            return $this->append($name, $content);
-        }
-
-        $ins  = array($name => (string) $content);
-        $keys = array_keys($this->_body);
-        $loc  = array_search($parent, $keys);
-        if (!$before) {
-            // Increment location if not inserting before
-            ++$loc;
-        }
-
-        if (0 === $loc) {
-            // If location of key is 0, we're prepending
-            $this->_body = $ins + $this->_body;
-        } elseif ($loc >= (count($this->_body))) {
-            // If location of key is maximal, we're appending
-            $this->_body = $this->_body + $ins;
-        } else {
-            // Otherwise, insert at location specified
-            $pre  = array_slice($this->_body, 0, $loc);
-            $post = array_slice($this->_body, $loc);
-            $this->_body = $pre + $ins + $post;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Echo the body segments
-     *
-     * @return void
-     */
-    public function outputBody()
-    {
-        $body = implode('', $this->_body);
-        echo $body;
-    }
-
-    /**
-     * Register an exception with the response
-     *
-     * @param Exception $e
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function setException(Exception $e)
-    {
-        $this->_exceptions[] = $e;
-        return $this;
-    }
-
-    /**
-     * Retrieve the exception stack
-     *
-     * @return array
-     */
-    public function getException()
-    {
-        return $this->_exceptions;
-    }
-
-    /**
-     * Has an exception been registered with the response?
-     *
-     * @return boolean
-     */
-    public function isException()
-    {
-        return !empty($this->_exceptions);
-    }
-
-    /**
-     * Does the response object contain an exception of a given type?
-     *
-     * @param  string $type
-     * @return boolean
-     */
-    public function hasExceptionOfType($type)
-    {
-        foreach ($this->_exceptions as $e) {
-            if ($e instanceof $type) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Does the response object contain an exception with a given message?
-     *
-     * @param  string $message
-     * @return boolean
-     */
-    public function hasExceptionOfMessage($message)
-    {
-        foreach ($this->_exceptions as $e) {
-            if ($message == $e->getMessage()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Does the response object contain an exception with a given code?
-     *
-     * @param  int $code
-     * @return boolean
-     */
-    public function hasExceptionOfCode($code)
-    {
-        $code = (int) $code;
-        foreach ($this->_exceptions as $e) {
-            if ($code == $e->getCode()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve all exceptions of a given type
-     *
-     * @param  string $type
-     * @return false|array
-     */
-    public function getExceptionByType($type)
-    {
-        $exceptions = array();
-        foreach ($this->_exceptions as $e) {
-            if ($e instanceof $type) {
-                $exceptions[] = $e;
-            }
-        }
-
-        if (empty($exceptions)) {
-            $exceptions = false;
-        }
-
-        return $exceptions;
-    }
-
-    /**
-     * Retrieve all exceptions of a given message
-     *
-     * @param  string $message
-     * @return false|array
-     */
-    public function getExceptionByMessage($message)
-    {
-        $exceptions = array();
-        foreach ($this->_exceptions as $e) {
-            if ($message == $e->getMessage()) {
-                $exceptions[] = $e;
-            }
-        }
-
-        if (empty($exceptions)) {
-            $exceptions = false;
-        }
-
-        return $exceptions;
-    }
-
-    /**
-     * Retrieve all exceptions of a given code
-     *
-     * @param mixed $code
-     * @return void
-     */
-    public function getExceptionByCode($code)
-    {
-        $code       = (int) $code;
-        $exceptions = array();
-        foreach ($this->_exceptions as $e) {
-            if ($code == $e->getCode()) {
-                $exceptions[] = $e;
-            }
-        }
-
-        if (empty($exceptions)) {
-            $exceptions = false;
-        }
-
-        return $exceptions;
-    }
-
-    /**
-     * Whether or not to render exceptions (off by default)
-     *
-     * If called with no arguments or a null argument, returns the value of the
-     * flag; otherwise, sets it and returns the current value.
-     *
-     * @param boolean $flag Optional
-     * @return boolean
-     */
-    public function renderExceptions($flag = null)
-    {
-        if (null !== $flag) {
-            $this->_renderExceptions = $flag ? true : false;
-        }
-
-        return $this->_renderExceptions;
-    }
-
-    /**
-     * Send the response, including all headers, rendering exceptions if so
-     * requested.
-     *
-     * @return void
-     */
-    public function sendResponse()
-    {
-        $this->sendHeaders();
-
-        if ($this->isException() && $this->renderExceptions()) {
-            $exceptions = '';
-            foreach ($this->getException() as $e) {
-                $exceptions .= $e->__toString() . "\n";
-            }
-            echo $exceptions;
-            return;
-        }
-
-        $this->outputBody();
-    }
-
-    /**
-     * Magic __toString functionality
-     *
-     * Proxies to {@link sendResponse()} and returns response value as string
-     * using output buffering.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        ob_start();
-        $this->sendResponse();
-        return ob_get_clean();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Response/Cli.php b/airtime_mvc/library/Zend/Controller/Response/Cli.php
deleted file mode 100644
index 40aea080a..000000000
--- a/airtime_mvc/library/Zend/Controller/Response/Cli.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cli.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Response_Abstract */
-require_once 'Zend/Controller/Response/Abstract.php';
-
-
-/**
- * Zend_Controller_Response_Cli
- *
- * CLI response for controllers
- *
- * @uses Zend_Controller_Response_Abstract
- * @package Zend_Controller
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Response_Cli extends Zend_Controller_Response_Abstract
-{
-    /**
-     * Flag; if true, when header operations are called after headers have been
-     * sent, an exception will be raised; otherwise, processing will continue
-     * as normal. Defaults to false.
-     *
-     * @see canSendHeaders()
-     * @var boolean
-     */
-    public $headersSentThrowsException = false;
-
-
-    /**
-     * Magic __toString functionality
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if ($this->isException() && $this->renderExceptions()) {
-            $exceptions = '';
-            foreach ($this->getException() as $e) {
-                $exceptions .= $e->__toString() . "\n";
-            }
-            return $exceptions;
-        }
-
-        return $this->_body;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Response/Exception.php b/airtime_mvc/library/Zend/Controller/Response/Exception.php
deleted file mode 100644
index 58b6fdda6..000000000
--- a/airtime_mvc/library/Zend/Controller/Response/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Request
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Exception */
-require_once 'Zend/Controller/Exception.php';
-
-
-/**
- * @package    Zend_Controller
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Response_Exception extends Zend_Controller_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Controller/Response/Http.php b/airtime_mvc/library/Zend/Controller/Response/Http.php
deleted file mode 100644
index 22576e8b9..000000000
--- a/airtime_mvc/library/Zend/Controller/Response/Http.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Response_Abstract */
-require_once 'Zend/Controller/Response/Abstract.php';
-
-
-/**
- * Zend_Controller_Response_Http
- *
- * HTTP response for controllers
- *
- * @uses Zend_Controller_Response_Abstract
- * @package Zend_Controller
- * @subpackage Response
- */
-class Zend_Controller_Response_Http extends Zend_Controller_Response_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Controller/Response/HttpTestCase.php b/airtime_mvc/library/Zend/Controller/Response/HttpTestCase.php
deleted file mode 100644
index f27b0a983..000000000
--- a/airtime_mvc/library/Zend/Controller/Response/HttpTestCase.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Response_Http
- */
-require_once 'Zend/Controller/Response/Http.php';
-
-/**
- * Zend_Controller_Response_HttpTestCase
- *
- * @uses Zend_Controller_Response_Http
- * @package Zend_Controller
- * @subpackage Response
- */
-class Zend_Controller_Response_HttpTestCase extends Zend_Controller_Response_Http
-{
-    /**
-     * "send" headers by returning array of all headers that would be sent
-     *
-     * @return array
-     */
-    public function sendHeaders()
-    {
-        $headers = array();
-        foreach ($this->_headersRaw as $header) {
-            $headers[] = $header;
-        }
-        foreach ($this->_headers as $header) {
-            $name = $header['name'];
-            $key  = strtolower($name);
-            if (array_key_exists($name, $headers)) {
-                if ($header['replace']) {
-                    $headers[$key] = $header['name'] . ': ' . $header['value'];
-                }
-            } else {
-                $headers[$key] = $header['name'] . ': ' . $header['value'];
-            }
-        }
-        return $headers;
-    }
-
-    /**
-     * Can we send headers?
-     *
-     * @param  bool $throw
-     * @return void
-     */
-    public function canSendHeaders($throw = false)
-    {
-        return true;
-    }
-
-    /**
-     * Return the concatenated body segments
-     *
-     * @return string
-     */
-    public function outputBody()
-    {
-        $fullContent = '';
-        foreach ($this->_body as $content) {
-            $fullContent .= $content;
-        }
-        return $fullContent;
-    }
-
-    /**
-     * Get body and/or body segments
-     *
-     * @param  bool|string $spec
-     * @return string|array|null
-     */
-    public function getBody($spec = false)
-    {
-        if (false === $spec) {
-            return $this->outputBody();
-        } elseif (true === $spec) {
-            return $this->_body;
-        } elseif (is_string($spec) && isset($this->_body[$spec])) {
-            return $this->_body[$spec];
-        }
-
-        return null;
-    }
-
-    /**
-     * "send" Response
-     *
-     * Concats all response headers, and then final body (separated by two
-     * newlines)
-     *
-     * @return string
-     */
-    public function sendResponse()
-    {
-        $headers = $this->sendHeaders();
-        $content = implode("\n", $headers) . "\n\n";
-
-        if ($this->isException() && $this->renderExceptions()) {
-            $exceptions = '';
-            foreach ($this->getException() as $e) {
-                $exceptions .= $e->__toString() . "\n";
-            }
-            $content .= $exceptions;
-        } else {
-            $content .= $this->outputBody();
-        }
-
-        return $content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Abstract.php b/airtime_mvc/library/Zend/Controller/Router/Abstract.php
deleted file mode 100644
index fb60ebd0c..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Abstract.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Controller_Router_Interface */
-require_once 'Zend/Controller/Router/Interface.php';
-
-/**
- * Simple first implementation of a router, to be replaced
- * with rules-based URI processor.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface
-{
-    /**
-     * Front controller instance
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
-     * Array of invocation parameters to use when instantiating action
-     * controllers
-     * @var array
-     */
-    protected $_invokeParams = array();
-
-    /**
-     * Constructor
-     *
-     * @param array $params
-     * @return void
-     */
-    public function __construct(array $params = array())
-    {
-        $this->setParams($params);
-    }
-
-    /**
-     * Add or modify a parameter to use when instantiating an action controller
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return Zend_Controller_Router
-     */
-    public function setParam($name, $value)
-    {
-        $name = (string) $name;
-        $this->_invokeParams[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Set parameters to pass to action controller constructors
-     *
-     * @param array $params
-     * @return Zend_Controller_Router
-     */
-    public function setParams(array $params)
-    {
-        $this->_invokeParams = array_merge($this->_invokeParams, $params);
-        return $this;
-    }
-
-    /**
-     * Retrieve a single parameter from the controller parameter stack
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function getParam($name)
-    {
-        if(isset($this->_invokeParams[$name])) {
-            return $this->_invokeParams[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve action controller instantiation parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_invokeParams;
-    }
-
-    /**
-     * Clear the controller parameter stack
-     *
-     * By default, clears all parameters. If a parameter name is given, clears
-     * only that parameter; if an array of parameter names is provided, clears
-     * each.
-     *
-     * @param null|string|array single key or array of keys for params to clear
-     * @return Zend_Controller_Router
-     */
-    public function clearParams($name = null)
-    {
-        if (null === $name) {
-            $this->_invokeParams = array();
-        } elseif (is_string($name) && isset($this->_invokeParams[$name])) {
-            unset($this->_invokeParams[$name]);
-        } elseif (is_array($name)) {
-            foreach ($name as $key) {
-                if (is_string($key) && isset($this->_invokeParams[$key])) {
-                    unset($this->_invokeParams[$key]);
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve Front Controller
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        // Used cache version if found
-        if (null !== $this->_frontController) {
-            return $this->_frontController;
-        }
-
-        require_once 'Zend/Controller/Front.php';
-        $this->_frontController = Zend_Controller_Front::getInstance();
-        return $this->_frontController;
-    }
-
-    /**
-     * Set Front Controller
-     *
-     * @param Zend_Controller_Front $controller
-     * @return Zend_Controller_Router_Interface
-     */
-    public function setFrontController(Zend_Controller_Front $controller)
-    {
-        $this->_frontController = $controller;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Exception.php b/airtime_mvc/library/Zend/Controller/Router/Exception.php
deleted file mode 100644
index f4bf757de..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Controller_Exception */
-require_once 'Zend/Controller/Exception.php';
-
-
-/**
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Router_Exception extends Zend_Controller_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Controller/Router/Interface.php b/airtime_mvc/library/Zend/Controller/Router/Interface.php
deleted file mode 100644
index aa7f6a0dc..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Interface.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Controller_Router_Interface
-{
-    /**
-     * Processes a request and sets its controller and action.  If
-     * no route was possible, an exception is thrown.
-     *
-     * @param  Zend_Controller_Request_Abstract
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Request_Abstract|boolean
-     */
-    public function route(Zend_Controller_Request_Abstract $dispatcher);
-
-    /**
-     * Generates a URL path that can be used in URL creation, redirection, etc.
-     *
-     * May be passed user params to override ones from URI, Request or even defaults.
-     * If passed parameter has a value of null, it's URL variable will be reset to
-     * default.
-     *
-     * If null is passed as a route name assemble will use the current Route or 'default'
-     * if current is not yet set.
-     *
-     * Reset is used to signal that all parameters should be reset to it's defaults.
-     * Ignoring all URL specified values. User specified params still get precedence.
-     *
-     * Encode tells to url encode resulting path parts.
-     *
-     * @param  array $userParams Options passed by a user used to override parameters
-     * @param  mixed $name The name of a Route to use
-     * @param  bool $reset Whether to reset to the route defaults ignoring URL params
-     * @param  bool $encode Tells to encode URL parts on output
-     * @throws Zend_Controller_Router_Exception
-     * @return string Resulting URL path
-     */
-    public function assemble($userParams, $name = null, $reset = false, $encode = true);
-
-    /**
-     * Retrieve Front Controller
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController();
-
-    /**
-     * Set Front Controller
-     *
-     * @param Zend_Controller_Front $controller
-     * @return Zend_Controller_Router_Interface
-     */
-    public function setFrontController(Zend_Controller_Front $controller);
-
-    /**
-     * Add or modify a parameter with which to instantiate any helper objects
-     *
-     * @param string $name
-     * @param mixed $param
-     * @return Zend_Controller_Router_Interface
-     */
-    public function setParam($name, $value);
-
-    /**
-     * Set an array of a parameters to pass to helper object constructors
-     *
-     * @param array $params
-     * @return Zend_Controller_Router_Interface
-     */
-    public function setParams(array $params);
-
-    /**
-     * Retrieve a single parameter from the controller parameter stack
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function getParam($name);
-
-    /**
-     * Retrieve the parameters to pass to helper object constructors
-     *
-     * @return array
-     */
-    public function getParams();
-
-    /**
-     * Clear the controller parameter stack
-     *
-     * By default, clears all parameters. If a parameter name is given, clears
-     * only that parameter; if an array of parameter names is provided, clears
-     * each.
-     *
-     * @param null|string|array single key or array of keys for params to clear
-     * @return Zend_Controller_Router_Interface
-     */
-    public function clearParams($name = null);
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Rewrite.php b/airtime_mvc/library/Zend/Controller/Router/Rewrite.php
deleted file mode 100644
index 48bb82eee..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Rewrite.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Rewrite.php 20246 2010-01-12 21:36:08Z dasprid $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Abstract */
-require_once 'Zend/Controller/Router/Abstract.php';
-
-/** Zend_Controller_Router_Route */
-require_once 'Zend/Controller/Router/Route.php';
-
-/**
- * Ruby routing based Router.
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://manuals.rubyonrails.com/read/chapter/65
- */
-class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
-{
-
-    /**
-     * Whether or not to use default routes
-     *
-     * @var boolean
-     */
-    protected $_useDefaultRoutes = true;
-
-    /**
-     * Array of routes to match against
-     *
-     * @var array
-     */
-    protected $_routes = array();
-
-    /**
-     * Currently matched route
-     *
-     * @var Zend_Controller_Router_Route_Interface
-     */
-    protected $_currentRoute = null;
-
-    /**
-     * Global parameters given to all routes
-     *
-     * @var array
-     */
-    protected $_globalParams = array();
-
-    /**
-     * Separator to use with chain names
-     *
-     * @var string
-     */
-    protected $_chainNameSeparator = '-';
-
-    /**
-     * Determines if request parameters should be used as global parameters
-     * inside this router.
-     *
-     * @var boolean
-     */
-    protected $_useCurrentParamsAsGlobal = false;
-
-    /**
-     * Add default routes which are used to mimic basic router behaviour
-     *
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function addDefaultRoutes()
-    {
-        if (!$this->hasRoute('default')) {
-            $dispatcher = $this->getFrontController()->getDispatcher();
-            $request = $this->getFrontController()->getRequest();
-
-            require_once 'Zend/Controller/Router/Route/Module.php';
-            $compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request);
-
-            $this->_routes = array_merge(array('default' => $compat), $this->_routes);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add route to the route chain
-     *
-     * If route contains method setRequest(), it is initialized with a request object
-     *
-     * @param  string                                 $name       Name of the route
-     * @param  Zend_Controller_Router_Route_Interface $route      Instance of the route
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function addRoute($name, Zend_Controller_Router_Route_Interface $route)
-    {
-        if (method_exists($route, 'setRequest')) {
-            $route->setRequest($this->getFrontController()->getRequest());
-        }
-
-        $this->_routes[$name] = $route;
-
-        return $this;
-    }
-
-    /**
-     * Add routes to the route chain
-     *
-     * @param  array $routes Array of routes with names as keys and routes as values
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function addRoutes($routes) {
-        foreach ($routes as $name => $route) {
-            $this->addRoute($name, $route);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Create routes out of Zend_Config configuration
-     *
-     * Example INI:
-     * routes.archive.route = "archive/:year/*"
-     * routes.archive.defaults.controller = archive
-     * routes.archive.defaults.action = show
-     * routes.archive.defaults.year = 2000
-     * routes.archive.reqs.year = "\d+"
-     *
-     * routes.news.type = "Zend_Controller_Router_Route_Static"
-     * routes.news.route = "news"
-     * routes.news.defaults.controller = "news"
-     * routes.news.defaults.action = "list"
-     *
-     * And finally after you have created a Zend_Config with above ini:
-     * $router = new Zend_Controller_Router_Rewrite();
-     * $router->addConfig($config, 'routes');
-     *
-     * @param  Zend_Config $config  Configuration object
-     * @param  string      $section Name of the config section containing route's definitions
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function addConfig(Zend_Config $config, $section = null)
-    {
-        if ($section !== null) {
-            if ($config->{$section} === null) {
-                require_once 'Zend/Controller/Router/Exception.php';
-                throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'");
-            }
-
-            $config = $config->{$section};
-        }
-
-        foreach ($config as $name => $info) {
-            $route = $this->_getRouteFromConfig($info);
-
-            if ($route instanceof Zend_Controller_Router_Route_Chain) {
-                if (!isset($info->chain)) {
-                    require_once 'Zend/Controller/Router/Exception.php';
-                    throw new Zend_Controller_Router_Exception("No chain defined");
-                }
-
-                if ($info->chain instanceof Zend_Config) {
-                    $childRouteNames = $info->chain;
-                } else {
-                    $childRouteNames = explode(',', $info->chain);
-                }
-
-                foreach ($childRouteNames as $childRouteName) {
-                    $childRoute = $this->getRoute(trim($childRouteName));
-                    $route->chain($childRoute);
-                }
-
-                $this->addRoute($name, $route);
-            } elseif (isset($info->chains) && $info->chains instanceof Zend_Config) {
-                $this->_addChainRoutesFromConfig($name, $route, $info->chains);
-            } else {
-                $this->addRoute($name, $route);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get a route frm a config instance
-     *
-     * @param  Zend_Config $info
-     * @return Zend_Controller_Router_Route_Interface
-     */
-    protected function _getRouteFromConfig(Zend_Config $info)
-    {
-        $class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route';
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-
-        $route = call_user_func(array($class, 'getInstance'), $info);
-
-        if (isset($info->abstract) && $info->abstract && method_exists($route, 'isAbstract')) {
-            $route->isAbstract(true);
-        }
-
-        return $route;
-    }
-
-    /**
-     * Add chain routes from a config route
-     *
-     * @param  string                                 $name
-     * @param  Zend_Controller_Router_Route_Interface $route
-     * @param  Zend_Config                            $childRoutesInfo
-     * @return void
-     */
-    protected function _addChainRoutesFromConfig($name,
-                                                 Zend_Controller_Router_Route_Interface $route,
-                                                 Zend_Config $childRoutesInfo)
-    {
-        foreach ($childRoutesInfo as $childRouteName => $childRouteInfo) {
-            if (is_string($childRouteInfo)) {
-                $childRouteName = $childRouteInfo;
-                $childRoute     = $this->getRoute($childRouteName);
-            } else {
-                $childRoute = $this->_getRouteFromConfig($childRouteInfo);
-            }
-
-            if ($route instanceof Zend_Controller_Router_Route_Chain) {
-                $chainRoute = clone $route;
-                $chainRoute->chain($childRoute);
-            } else {
-                $chainRoute = $route->chain($childRoute);
-            }
-
-            $chainName = $name . $this->_chainNameSeparator . $childRouteName;
-
-            if (isset($childRouteInfo->chains)) {
-                $this->_addChainRoutesFromConfig($chainName, $chainRoute, $childRouteInfo->chains);
-            } else {
-                $this->addRoute($chainName, $chainRoute);
-            }
-        }
-    }
-
-    /**
-     * Remove a route from the route chain
-     *
-     * @param  string $name Name of the route
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function removeRoute($name)
-    {
-        if (!isset($this->_routes[$name])) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception("Route $name is not defined");
-        }
-
-        unset($this->_routes[$name]);
-
-        return $this;
-    }
-
-    /**
-     * Remove all standard default routes
-     *
-     * @param  Zend_Controller_Router_Route_Interface Route
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function removeDefaultRoutes()
-    {
-        $this->_useDefaultRoutes = false;
-
-        return $this;
-    }
-
-    /**
-     * Check if named route exists
-     *
-     * @param  string $name Name of the route
-     * @return boolean
-     */
-    public function hasRoute($name)
-    {
-        return isset($this->_routes[$name]);
-    }
-
-    /**
-     * Retrieve a named route
-     *
-     * @param string $name Name of the route
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Router_Route_Interface Route object
-     */
-    public function getRoute($name)
-    {
-        if (!isset($this->_routes[$name])) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception("Route $name is not defined");
-        }
-
-        return $this->_routes[$name];
-    }
-
-    /**
-     * Retrieve a currently matched route
-     *
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Router_Route_Interface Route object
-     */
-    public function getCurrentRoute()
-    {
-        if (!isset($this->_currentRoute)) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception("Current route is not defined");
-        }
-        return $this->getRoute($this->_currentRoute);
-    }
-
-    /**
-     * Retrieve a name of currently matched route
-     *
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Router_Route_Interface Route object
-     */
-    public function getCurrentRouteName()
-    {
-        if (!isset($this->_currentRoute)) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception("Current route is not defined");
-        }
-        return $this->_currentRoute;
-    }
-
-    /**
-     * Retrieve an array of routes added to the route chain
-     *
-     * @return array All of the defined routes
-     */
-    public function getRoutes()
-    {
-        return $this->_routes;
-    }
-
-    /**
-     * Find a matching route to the current PATH_INFO and inject
-     * returning values to the Request object.
-     *
-     * @throws Zend_Controller_Router_Exception
-     * @return Zend_Controller_Request_Abstract Request object
-     */
-    public function route(Zend_Controller_Request_Abstract $request)
-    {
-        if (!$request instanceof Zend_Controller_Request_Http) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception('Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object');
-        }
-
-        if ($this->_useDefaultRoutes) {
-            $this->addDefaultRoutes();
-        }
-
-        // Find the matching route
-        $routeMatched = false;
-        
-        foreach (array_reverse($this->_routes) as $name => $route) {
-            // TODO: Should be an interface method. Hack for 1.0 BC
-            if (method_exists($route, 'isAbstract') && $route->isAbstract()) {
-                continue;
-            }
-
-            // TODO: Should be an interface method. Hack for 1.0 BC
-            if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
-                $match = $request->getPathInfo();
-            } else {
-                $match = $request;
-            }
-
-            if ($params = $route->match($match)) {
-                $this->_setRequestParams($request, $params);
-                $this->_currentRoute = $name;
-                $routeMatched        = true;
-                break;
-            }
-        }
-
-         if (!$routeMatched) {
-             require_once 'Zend/Controller/Router/Exception.php';
-             throw new Zend_Controller_Router_Exception('No route matched the request', 404);
-         }
-
-        if($this->_useCurrentParamsAsGlobal) {
-            $params = $request->getParams();
-            foreach($params as $param => $value) {
-                $this->setGlobalParam($param, $value);
-            }
-        }
-
-        return $request;
-
-    }
-
-    protected function _setRequestParams($request, $params)
-    {
-        foreach ($params as $param => $value) {
-
-            $request->setParam($param, $value);
-
-            if ($param === $request->getModuleKey()) {
-                $request->setModuleName($value);
-            }
-            if ($param === $request->getControllerKey()) {
-                $request->setControllerName($value);
-            }
-            if ($param === $request->getActionKey()) {
-                $request->setActionName($value);
-            }
-
-        }
-    }
-
-    /**
-     * Generates a URL path that can be used in URL creation, redirection, etc.
-     *
-     * @param  array $userParams Options passed by a user used to override parameters
-     * @param  mixed $name The name of a Route to use
-     * @param  bool $reset Whether to reset to the route defaults ignoring URL params
-     * @param  bool $encode Tells to encode URL parts on output
-     * @throws Zend_Controller_Router_Exception
-     * @return string Resulting absolute URL path
-     */
-    public function assemble($userParams, $name = null, $reset = false, $encode = true)
-    {
-        if ($name == null) {
-            try {
-                $name = $this->getCurrentRouteName();
-            } catch (Zend_Controller_Router_Exception $e) {
-                $name = 'default';
-            }
-        }
-
-        $params = array_merge($this->_globalParams, $userParams);
-
-        $route = $this->getRoute($name);
-        $url   = $route->assemble($params, $reset, $encode);
-
-        if (!preg_match('|^[a-z]+://|', $url)) {
-            $url = rtrim($this->getFrontController()->getBaseUrl(), '/') . '/' . $url;
-        }
-
-        return $url;
-    }
-
-    /**
-     * Set a global parameter
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function setGlobalParam($name, $value)
-    {
-        $this->_globalParams[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Set the separator to use with chain names
-     *
-     * @param string $separator The separator to use
-     * @return Zend_Controller_Router_Rewrite
-     */
-    public function setChainNameSeparator($separator) {
-        $this->_chainNameSeparator = $separator;
-
-        return $this;
-    }
-
-    /**
-     * Get the separator to use for chain names
-     *
-     * @return string
-     */
-    public function getChainNameSeparator() {
-        return $this->_chainNameSeparator;
-    }
-
-    /**
-     * Determines/returns whether to use the request parameters as global parameters.
-     *
-     * @param boolean|null $use
-     *           Null/unset when you want to retrieve the current state.
-     *           True when request parameters should be global, false otherwise
-     * @return boolean|Zend_Controller_Router_Rewrite
-     *              Returns a boolean if first param isn't set, returns an
-     *              instance of Zend_Controller_Router_Rewrite otherwise.
-     *
-     */
-    public function useRequestParametersAsGlobal($use = null) {
-        if($use === null) {
-            return $this->_useCurrentParamsAsGlobal;
-        }
-
-        $this->_useCurrentParamsAsGlobal = (bool) $use;
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route.php b/airtime_mvc/library/Zend/Controller/Router/Route.php
deleted file mode 100644
index 1239db085..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route.php
+++ /dev/null
@@ -1,559 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Route.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * Route
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://manuals.rubyonrails.com/read/chapter/65
- */
-class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
-{
-    /**
-     * Default translator
-     *
-     * @var Zend_Translate
-     */
-    protected static $_defaultTranslator;
-
-    /**
-     * Translator
-     *
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Default locale
-     *
-     * @var mixed
-     */
-    protected static $_defaultLocale;
-
-    /**
-     * Locale
-     *
-     * @var mixed
-     */
-    protected $_locale;
-
-    /**
-     * Wether this is a translated route or not
-     *
-     * @var boolean
-     */
-    protected $_isTranslated = false;
-
-    /**
-     * Translatable variables
-     *
-     * @var array
-     */
-    protected $_translatable = array();
-
-    protected $_urlVariable = ':';
-    protected $_urlDelimiter = '/';
-    protected $_regexDelimiter = '#';
-    protected $_defaultRegex = null;
-
-    /**
-     * Holds names of all route's pattern variable names. Array index holds a position in URL.
-     * @var array
-     */
-    protected $_variables = array();
-
-    /**
-     * Holds Route patterns for all URL parts. In case of a variable it stores it's regex
-     * requirement or null. In case of a static part, it holds only it's direct value.
-     * In case of a wildcard, it stores an asterisk (*)
-     * @var array
-     */
-    protected $_parts = array();
-
-    /**
-     * Holds user submitted default values for route's variables. Name and value pairs.
-     * @var array
-     */
-    protected $_defaults = array();
-
-    /**
-     * Holds user submitted regular expression patterns for route's variables' values.
-     * Name and value pairs.
-     * @var array
-     */
-    protected $_requirements = array();
-
-    /**
-     * Associative array filled on match() that holds matched path values
-     * for given variable names.
-     * @var array
-     */
-    protected $_values = array();
-
-    /**
-     * Associative array filled on match() that holds wildcard variable
-     * names and values.
-     * @var array
-     */
-    protected $_wildcardData = array();
-
-    /**
-     * Helper var that holds a count of route pattern's static parts
-     * for validation
-     * @var int
-     */
-    protected $_staticCount = 0;
-
-    public function getVersion() {
-        return 1;
-    }
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     *
-     * @param Zend_Config $config Configuration object
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $reqs = ($config->reqs instanceof Zend_Config) ? $config->reqs->toArray() : array();
-        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        return new self($config->route, $defs, $reqs);
-    }
-
-    /**
-     * Prepares the route for mapping by splitting (exploding) it
-     * to a corresponding atomic parts. These parts are assigned
-     * a position which is later used for matching and preparing values.
-     *
-     * @param string $route Map used to match with later submitted URL path
-     * @param array $defaults Defaults for map variables with keys as variable names
-     * @param array $reqs Regular expression requirements for variables (keys as variable names)
-     * @param Zend_Translate $translator Translator to use for this instance
-     */
-    public function __construct($route, $defaults = array(), $reqs = array(), Zend_Translate $translator = null, $locale = null)
-    {
-        $route               = trim($route, $this->_urlDelimiter);
-        $this->_defaults     = (array) $defaults;
-        $this->_requirements = (array) $reqs;
-        $this->_translator   = $translator;
-        $this->_locale       = $locale;
-
-        if ($route !== '') {
-            foreach (explode($this->_urlDelimiter, $route) as $pos => $part) {
-                if (substr($part, 0, 1) == $this->_urlVariable && substr($part, 1, 1) != $this->_urlVariable) {
-                    $name = substr($part, 1);
-
-                    if (substr($name, 0, 1) === '@' && substr($name, 1, 1) !== '@') {
-                        $name                  = substr($name, 1);
-                        $this->_translatable[] = $name;
-                        $this->_isTranslated   = true;
-                    }
-
-                    $this->_parts[$pos]     = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
-                    $this->_variables[$pos] = $name;
-                } else {
-                    if (substr($part, 0, 1) == $this->_urlVariable) {
-                        $part = substr($part, 1);
-                    }
-
-                    if (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@') {
-                        $this->_isTranslated = true;
-                    }
-
-                    $this->_parts[$pos] = $part;
-
-                    if ($part !== '*') {
-                        $this->_staticCount++;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Matches a user submitted path with parts defined by a map. Assigns and
-     * returns an array of variables on a successful match.
-     *
-     * @param string $path Path used to match against this routing map
-     * @return array|false An array of assigned values or a false on a mismatch
-     */
-    public function match($path, $partial = false)
-    {
-        if ($this->_isTranslated) {
-            $translateMessages = $this->getTranslator()->getMessages();
-        }
-
-        $pathStaticCount = 0;
-        $values          = array();
-        $matchedPath     = '';
-
-        if (!$partial) {
-            $path = trim($path, $this->_urlDelimiter);
-        }
-
-        if ($path !== '') {
-            $path = explode($this->_urlDelimiter, $path);
-
-            foreach ($path as $pos => $pathPart) {
-                // Path is longer than a route, it's not a match
-                if (!array_key_exists($pos, $this->_parts)) {
-                    if ($partial) {
-                        break;
-                    } else {
-                        return false;
-                    }
-                }
-
-                $matchedPath .= $pathPart . $this->_urlDelimiter;
-
-                // If it's a wildcard, get the rest of URL as wildcard data and stop matching
-                if ($this->_parts[$pos] == '*') {
-                    $count = count($path);
-                    for($i = $pos; $i < $count; $i+=2) {
-                        $var = urldecode($path[$i]);
-                        if (!isset($this->_wildcardData[$var]) && !isset($this->_defaults[$var]) && !isset($values[$var])) {
-                            $this->_wildcardData[$var] = (isset($path[$i+1])) ? urldecode($path[$i+1]) : null;
-                        }
-                    }
-
-                    $matchedPath = implode($this->_urlDelimiter, $path);
-                    break;
-                }
-
-                $name     = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
-                $pathPart = urldecode($pathPart);
-
-                // Translate value if required
-                $part = $this->_parts[$pos];
-                if ($this->_isTranslated && (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@' && $name === null) || $name !== null && in_array($name, $this->_translatable)) {
-                    if (substr($part, 0, 1) === '@') {
-                        $part = substr($part, 1);
-                    }
-
-                    if (($originalPathPart = array_search($pathPart, $translateMessages)) !== false) {
-                        $pathPart = $originalPathPart;
-                    }
-                }
-
-                if (substr($part, 0, 2) === '@@') {
-                    $part = substr($part, 1);
-                }
-
-                // If it's a static part, match directly
-                if ($name === null && $part != $pathPart) {
-                    return false;
-                }
-
-                // If it's a variable with requirement, match a regex. If not - everything matches
-                if ($part !== null && !preg_match($this->_regexDelimiter . '^' . $part . '$' . $this->_regexDelimiter . 'iu', $pathPart)) {
-                    return false;
-                }
-
-                // If it's a variable store it's value for later
-                if ($name !== null) {
-                    $values[$name] = $pathPart;
-                } else {
-                    $pathStaticCount++;
-                }
-            }
-        }
-
-        // Check if all static mappings have been matched
-        if ($this->_staticCount != $pathStaticCount) {
-            return false;
-        }
-
-        $return = $values + $this->_wildcardData + $this->_defaults;
-
-        // Check if all map variables have been initialized
-        foreach ($this->_variables as $var) {
-            if (!array_key_exists($var, $return)) {
-                return false;
-            }
-        }
-
-        $this->setMatchedPath(rtrim($matchedPath, $this->_urlDelimiter));
-
-        $this->_values = $values;
-
-        return $return;
-
-    }
-
-    /**
-     * Assembles user submitted parameters forming a URL path defined by this route
-     *
-     * @param  array $data An array of variable and value pairs used as parameters
-     * @param  boolean $reset Whether or not to set route defaults with those provided in $data
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
-    {
-        if ($this->_isTranslated) {
-            $translator = $this->getTranslator();
-
-            if (isset($data['@locale'])) {
-                $locale = $data['@locale'];
-                unset($data['@locale']);
-            } else {
-                $locale = $this->getLocale();
-            }
-        }
-
-        $url  = array();
-        $flag = false;
-
-        foreach ($this->_parts as $key => $part) {
-            $name = isset($this->_variables[$key]) ? $this->_variables[$key] : null;
-
-            $useDefault = false;
-            if (isset($name) && array_key_exists($name, $data) && $data[$name] === null) {
-                $useDefault = true;
-            }
-
-            if (isset($name)) {
-                if (isset($data[$name]) && !$useDefault) {
-                    $value = $data[$name];
-                    unset($data[$name]);
-                } elseif (!$reset && !$useDefault && isset($this->_values[$name])) {
-                    $value = $this->_values[$name];
-                } elseif (!$reset && !$useDefault && isset($this->_wildcardData[$name])) {
-                    $value = $this->_wildcardData[$name];
-                } elseif (isset($this->_defaults[$name])) {
-                    $value = $this->_defaults[$name];
-                } else {
-                    require_once 'Zend/Controller/Router/Exception.php';
-                    throw new Zend_Controller_Router_Exception($name . ' is not specified');
-                }
-
-                if ($this->_isTranslated && in_array($name, $this->_translatable)) {
-                    $url[$key] = $translator->translate($value, $locale);
-                } else {
-                    $url[$key] = $value;
-                }
-            } elseif ($part != '*') {
-                if ($this->_isTranslated && substr($part, 0, 1) === '@') {
-                    if (substr($part, 1, 1) !== '@') {
-                        $url[$key] = $translator->translate(substr($part, 1), $locale);
-                    } else {
-                        $url[$key] = substr($part, 1);
-                    }
-                } else {
-                    if (substr($part, 0, 2) === '@@') {
-                        $part = substr($part, 1);
-                    }
-
-                    $url[$key] = $part;
-                }
-            } else {
-                if (!$reset) $data += $this->_wildcardData;
-                $defaults = $this->getDefaults();
-                foreach ($data as $var => $value) {
-                    if ($value !== null && (!isset($defaults[$var]) || $value != $defaults[$var])) {
-                        $url[$key++] = $var;
-                        $url[$key++] = $value;
-                        $flag = true;
-                    }
-                }
-            }
-        }
-
-        $return = '';
-
-        foreach (array_reverse($url, true) as $key => $value) {
-            $defaultValue = null;
-
-            if (isset($this->_variables[$key])) {
-                $defaultValue = $this->getDefault($this->_variables[$key]);
-
-                if ($this->_isTranslated && $defaultValue !== null && isset($this->_translatable[$this->_variables[$key]])) {
-                    $defaultValue = $translator->translate($defaultValue, $locale);
-                }
-            }
-
-            if ($flag || $value !== $defaultValue || $partial) {
-                if ($encode) $value = urlencode($value);
-                $return = $this->_urlDelimiter . $value . $return;
-                $flag = true;
-            }
-        }
-
-        return trim($return, $this->_urlDelimiter);
-
-    }
-
-    /**
-     * Return a single parameter of route's defaults
-     *
-     * @param string $name Array key of the parameter
-     * @return string Previously set default
-     */
-    public function getDefault($name) {
-        if (isset($this->_defaults[$name])) {
-            return $this->_defaults[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Return an array of defaults
-     *
-     * @return array Route defaults
-     */
-    public function getDefaults() {
-        return $this->_defaults;
-    }
-
-    /**
-     * Get all variables which are used by the route
-     *
-     * @return array
-     */
-    public function getVariables()
-    {
-        return $this->_variables;
-    }
-
-    /**
-     * Set a default translator
-     *
-     * @param  Zend_Translate $translator
-     * @return void
-     */
-    public static function setDefaultTranslator(Zend_Translate $translator = null)
-    {
-        self::$_defaultTranslator = $translator;
-    }
-
-    /**
-     * Get the default translator
-     *
-     * @return Zend_Translate
-     */
-    public static function getDefaultTranslator()
-    {
-        return self::$_defaultTranslator;
-    }
-
-    /**
-     * Set a translator
-     *
-     * @param  Zend_Translate $translator
-     * @return void
-     */
-    public function setTranslator(Zend_Translate $translator)
-    {
-        $this->_translator = $translator;
-    }
-
-    /**
-     * Get the translator
-     *
-     * @throws Zend_Controller_Router_Exception When no translator can be found
-     * @return Zend_Translate
-     */
-    public function getTranslator()
-    {
-        if ($this->_translator !== null) {
-            return $this->_translator;
-        } else if (($translator = self::getDefaultTranslator()) !== null) {
-            return $translator;
-        } else {
-            try {
-                $translator = Zend_Registry::get('Zend_Translate');
-            } catch (Zend_Exception $e) {
-                $translator = null;
-            }
-
-            if ($translator instanceof Zend_Translate) {
-                return $translator;
-            }
-        }
-
-        require_once 'Zend/Controller/Router/Exception.php';
-        throw new Zend_Controller_Router_Exception('Could not find a translator');
-    }
-
-    /**
-     * Set a default locale
-     *
-     * @param  mixed $locale
-     * @return void
-     */
-    public static function setDefaultLocale($locale = null)
-    {
-        self::$_defaultLocale = $locale;
-    }
-
-    /**
-     * Get the default locale
-     *
-     * @return mixed
-     */
-    public static function getDefaultLocale()
-    {
-        return self::$_defaultLocale;
-    }
-
-    /**
-     * Set a locale
-     *
-     * @param  mixed $locale
-     * @return void
-     */
-    public function setLocale($locale)
-    {
-        $this->_locale = $locale;
-    }
-
-    /**
-     * Get the locale
-     *
-     * @return mixed
-     */
-    public function getLocale()
-    {
-        if ($this->_locale !== null) {
-            return $this->_locale;
-        } else if (($locale = self::getDefaultLocale()) !== null) {
-            return $locale;
-        } else {
-            try {
-                $locale = Zend_Registry::get('Zend_Locale');
-            } catch (Zend_Exception $e) {
-                $locale = null;
-            }
-
-            if ($locale !== null) {
-                return $locale;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Abstract.php b/airtime_mvc/library/Zend/Controller/Router/Route/Abstract.php
deleted file mode 100644
index 426a285e1..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Abstract.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Controller_Router_Route_Interface
- */
-require_once 'Zend/Controller/Router/Route/Interface.php';
-
-/**
- * Abstract Route
- *
- * Implements interface and provides convenience methods
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface
-{
-    /**
-     * Wether this route is abstract or not
-     *
-     * @var boolean
-     */
-    protected $_isAbstract = false;
-
-    /**
-     * Path matched by this route
-     *
-     * @var string
-     */
-    protected $_matchedPath = null;
-
-    /**
-     * Get the version of the route
-     *
-     * @return integer
-     */
-    public function getVersion()
-    {
-        return 2;
-    }
-
-    /**
-     * Set partially matched path
-     *
-     * @param  string $path
-     * @return void
-     */
-    public function setMatchedPath($path)
-    {
-        $this->_matchedPath = $path;
-    }
-
-    /**
-     * Get partially matched path
-     *
-     * @return string
-     */
-    public function getMatchedPath()
-    {
-        return $this->_matchedPath;
-    }
-
-    /**
-     * Check or set wether this is an abstract route or not
-     *
-     * @param  boolean $flag
-     * @return boolean
-     */
-    public function isAbstract($flag = null)
-    {
-        if ($flag !== null) {
-            $this->_isAbstract = $flag;
-        }
-
-        return $this->_isAbstract;
-    }
-
-    /**
-     * Create a new chain
-     *
-     * @param  Zend_Controller_Router_Route_Abstract $route
-     * @param  string                                $separator
-     * @return Zend_Controller_Router_Route_Chain
-     */
-    public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
-    {
-        require_once 'Zend/Controller/Router/Route/Chain.php';
-
-        $chain = new Zend_Controller_Router_Route_Chain();
-        $chain->chain($this)->chain($route, $separator);
-
-        return $chain;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Chain.php b/airtime_mvc/library/Zend/Controller/Router/Route/Chain.php
deleted file mode 100644
index 6de98fb0a..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Chain.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Chain.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * Chain route is used for managing route chaining.
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract
-{
-    protected $_routes = array();
-    protected $_separators = array();
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     *
-     * @param Zend_Config $config Configuration object
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        return new self($config->route, $defs);
-    }
-
-    /**
-     * Add a route to this chain
-     *
-     * @param  Zend_Controller_Router_Route_Abstract $route
-     * @param  string                                $separator
-     * @return Zend_Controller_Router_Route_Chain
-     */
-    public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
-    {
-        $this->_routes[]     = $route;
-        $this->_separators[] = $separator;
-
-        return $this;
-
-    }
-
-    /**
-     * Matches a user submitted path with a previously defined route.
-     * Assigns and returns an array of defaults on a successful match.
-     *
-     * @param  Zend_Controller_Request_Http $request Request to get the path info from
-     * @return array|false An array of assigned values or a false on a mismatch
-     */
-    public function match($request, $partial = null)
-    {
-        $path    = trim($request->getPathInfo(), '/');
-        $subPath = $path;
-        $values  = array();
-
-        foreach ($this->_routes as $key => $route) {
-            if ($key > 0 && $matchedPath !== null) {
-                $separator = substr($subPath, 0, strlen($this->_separators[$key]));
-
-                if ($separator !== $this->_separators[$key]) {
-                    return false;
-                }
-
-                $subPath = substr($subPath, strlen($separator));
-            }
-
-            // TODO: Should be an interface method. Hack for 1.0 BC
-            if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
-                $match = $subPath;
-            } else {
-                $request->setPathInfo($subPath);
-                $match = $request;
-            }
-
-            $res = $route->match($match, true);
-            if ($res === false) {
-                return false;
-            }
-
-            $matchedPath = $route->getMatchedPath();
-
-            if ($matchedPath !== null) {
-                $subPath     = substr($subPath, strlen($matchedPath));
-                $separator   = substr($subPath, 0, strlen($this->_separators[$key]));
-            }
-
-            $values = $res + $values;
-        }
-
-        $request->setPathInfo($path);
-
-        if ($subPath !== '' && $subPath !== false) {
-            return false;
-        }
-
-        return $values;
-    }
-
-    /**
-     * Assembles a URL path defined by this route
-     *
-     * @param array $data An array of variable and value pairs used as parameters
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = false)
-    {
-        $value     = '';
-        $numRoutes = count($this->_routes);
-
-        foreach ($this->_routes as $key => $route) {
-            if ($key > 0) {
-                $value .= $this->_separators[$key];
-            }
-
-            $value .= $route->assemble($data, $reset, $encode, (($numRoutes - 1) > $key));
-
-            if (method_exists($route, 'getVariables')) {
-                $variables = $route->getVariables();
-
-                foreach ($variables as $variable) {
-                    $data[$variable] = null;
-                }
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Set the request object for this and the child routes
-     *
-     * @param  Zend_Controller_Request_Abstract|null $request
-     * @return void
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request = null)
-    {
-        $this->_request = $request;
-
-        foreach ($this->_routes as $route) {
-            if (method_exists($route, 'setRequest')) {
-                $route->setRequest($request);
-            }
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Hostname.php b/airtime_mvc/library/Zend/Controller/Router/Route/Hostname.php
deleted file mode 100644
index 082977111..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Hostname.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Hostname.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * Hostname Route
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://manuals.rubyonrails.com/read/chapter/65
- */
-class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route_Abstract
-{
-
-    protected $_hostVariable   = ':';
-    protected $_regexDelimiter = '#';
-    protected $_defaultRegex   = null;
-
-    /**
-     * Holds names of all route's pattern variable names. Array index holds a position in host.
-     * @var array
-     */
-    protected $_variables = array();
-
-    /**
-     * Holds Route patterns for all host parts. In case of a variable it stores it's regex
-     * requirement or null. In case of a static part, it holds only it's direct value.
-     * @var array
-     */
-    protected $_parts = array();
-
-    /**
-     * Holds user submitted default values for route's variables. Name and value pairs.
-     * @var array
-     */
-    protected $_defaults = array();
-
-    /**
-     * Holds user submitted regular expression patterns for route's variables' values.
-     * Name and value pairs.
-     * @var array
-     */
-    protected $_requirements = array();
-
-    /**
-     * Default scheme
-     * @var string
-     */
-    protected $_scheme = null;
-
-    /**
-     * Associative array filled on match() that holds matched path values
-     * for given variable names.
-     * @var array
-     */
-    protected $_values = array();
-
-    /**
-     * Current request object
-     *
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request;
-
-    /**
-     * Helper var that holds a count of route pattern's static parts
-     * for validation
-     * @var int
-     */
-    private $_staticCount = 0;
-
-    /**
-     * Set the request object
-     *
-     * @param  Zend_Controller_Request_Abstract|null $request
-     * @return void
-     */
-    public function setRequest(Zend_Controller_Request_Abstract $request = null)
-    {
-        $this->_request = $request;
-    }
-
-    /**
-     * Get the request object
-     *
-     * @return Zend_Controller_Request_Abstract $request
-     */
-    public function getRequest()
-    {
-        if ($this->_request === null) {
-            require_once 'Zend/Controller/Front.php';
-            $this->_request = Zend_Controller_Front::getInstance()->getRequest();
-        }
-
-        return $this->_request;
-    }
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     *
-     * @param Zend_Config $config Configuration object
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $reqs   = ($config->reqs instanceof Zend_Config) ? $config->reqs->toArray() : array();
-        $defs   = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        $scheme = (isset($config->scheme)) ? $config->scheme : null;
-        return new self($config->route, $defs, $reqs, $scheme);
-    }
-
-    /**
-     * Prepares the route for mapping by splitting (exploding) it
-     * to a corresponding atomic parts. These parts are assigned
-     * a position which is later used for matching and preparing values.
-     *
-     * @param string $route Map used to match with later submitted hostname
-     * @param array  $defaults Defaults for map variables with keys as variable names
-     * @param array  $reqs Regular expression requirements for variables (keys as variable names)
-     * @param string $scheme
-     */
-    public function __construct($route, $defaults = array(), $reqs = array(), $scheme = null)
-    {
-        $route               = trim($route, '.');
-        $this->_defaults     = (array) $defaults;
-        $this->_requirements = (array) $reqs;
-        $this->_scheme       = $scheme;
-
-        if ($route != '') {
-            foreach (explode('.', $route) as $pos => $part) {
-                if (substr($part, 0, 1) == $this->_hostVariable) {
-                    $name = substr($part, 1);
-                    $this->_parts[$pos] = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
-                    $this->_variables[$pos] = $name;
-                } else {
-                    $this->_parts[$pos] = $part;
-                    $this->_staticCount++;
-                }
-            }
-        }
-    }
-
-    /**
-     * Matches a user submitted path with parts defined by a map. Assigns and
-     * returns an array of variables on a successful match.
-     *
-     * @param Zend_Controller_Request_Http $request Request to get the host from
-     * @return array|false An array of assigned values or a false on a mismatch
-     */
-    public function match($request)
-    {
-        // Check the scheme if required
-        if ($this->_scheme !== null) {
-            $scheme = $request->getScheme();
-
-            if ($scheme !== $this->_scheme) {
-                return false;
-            }
-        }
-
-        // Get the host and remove unnecessary port information
-        $host = $request->getHttpHost();
-        if (preg_match('#:\d+$#', $host, $result) === 1) {
-            $host = substr($host, 0, -strlen($result[0]));
-        }
-
-        $hostStaticCount = 0;
-        $values = array();
-
-        $host = trim($host, '.');
-
-        if ($host != '') {
-            $host = explode('.', $host);
-
-            foreach ($host as $pos => $hostPart) {
-                // Host is longer than a route, it's not a match
-                if (!array_key_exists($pos, $this->_parts)) {
-                    return false;
-                }
-
-                $name = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
-                $hostPart = urldecode($hostPart);
-
-                // If it's a static part, match directly
-                if ($name === null && $this->_parts[$pos] != $hostPart) {
-                    return false;
-                }
-
-                // If it's a variable with requirement, match a regex. If not - everything matches
-                if ($this->_parts[$pos] !== null && !preg_match($this->_regexDelimiter . '^' . $this->_parts[$pos] . '$' . $this->_regexDelimiter . 'iu', $hostPart)) {
-                    return false;
-                }
-
-                // If it's a variable store it's value for later
-                if ($name !== null) {
-                    $values[$name] = $hostPart;
-                } else {
-                    $hostStaticCount++;
-                }
-            }
-        }
-
-        // Check if all static mappings have been matched
-        if ($this->_staticCount != $hostStaticCount) {
-            return false;
-        }
-
-        $return = $values + $this->_defaults;
-
-        // Check if all map variables have been initialized
-        foreach ($this->_variables as $var) {
-            if (!array_key_exists($var, $return)) {
-                return false;
-            }
-        }
-
-        $this->_values = $values;
-
-        return $return;
-
-    }
-
-    /**
-     * Assembles user submitted parameters forming a hostname defined by this route
-     *
-     * @param  array $data An array of variable and value pairs used as parameters
-     * @param  boolean $reset Whether or not to set route defaults with those provided in $data
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
-    {
-        $host = array();
-        $flag = false;
-
-        foreach ($this->_parts as $key => $part) {
-            $name = isset($this->_variables[$key]) ? $this->_variables[$key] : null;
-
-            $useDefault = false;
-            if (isset($name) && array_key_exists($name, $data) && $data[$name] === null) {
-                $useDefault = true;
-            }
-
-            if (isset($name)) {
-                if (isset($data[$name]) && !$useDefault) {
-                    $host[$key] = $data[$name];
-                    unset($data[$name]);
-                } elseif (!$reset && !$useDefault && isset($this->_values[$name])) {
-                    $host[$key] = $this->_values[$name];
-                } elseif (isset($this->_defaults[$name])) {
-                    $host[$key] = $this->_defaults[$name];
-                } else {
-                    require_once 'Zend/Controller/Router/Exception.php';
-                    throw new Zend_Controller_Router_Exception($name . ' is not specified');
-                }
-            } else {
-                $host[$key] = $part;
-            }
-        }
-
-        $return = '';
-
-        foreach (array_reverse($host, true) as $key => $value) {
-            if ($flag || !isset($this->_variables[$key]) || $value !== $this->getDefault($this->_variables[$key]) || $partial) {
-                if ($encode) $value = urlencode($value);
-                $return = '.' . $value . $return;
-                $flag = true;
-            }
-        }
-
-        $url = trim($return, '.');
-
-        if ($this->_scheme !== null) {
-            $scheme = $this->_scheme;
-        } else {
-            $request = $this->getRequest();
-            if ($request instanceof Zend_Controller_Request_Http) {
-                $scheme = $request->getScheme();
-            } else {
-                $scheme = 'http';
-            }
-        }
-
-        $hostname = implode('.', $host);
-        $url      = $scheme . '://' . $url;
-
-        return $url;
-    }
-
-    /**
-     * Return a single parameter of route's defaults
-     *
-     * @param string $name Array key of the parameter
-     * @return string Previously set default
-     */
-    public function getDefault($name) {
-        if (isset($this->_defaults[$name])) {
-            return $this->_defaults[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Return an array of defaults
-     *
-     * @return array Route defaults
-     */
-    public function getDefaults() {
-        return $this->_defaults;
-    }
-
-    /**
-     * Get all variables which are used by the route
-     *
-     * @return array
-     */
-    public function getVariables()
-    {
-        return $this->_variables;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Interface.php b/airtime_mvc/library/Zend/Controller/Router/Route/Interface.php
deleted file mode 100644
index 22a6aeec0..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Interface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Config */
-require_once 'Zend/Config.php';
-
-/**
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Controller_Router_Route_Interface {
-    public function match($path);
-    public function assemble($data = array(), $reset = false, $encode = false);
-    public static function getInstance(Zend_Config $config);
-}
-
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Module.php b/airtime_mvc/library/Zend/Controller/Router/Route/Module.php
deleted file mode 100644
index 9c59d437c..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Module.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Module.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * Module Route
- *
- * Default route for module functionality
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://manuals.rubyonrails.com/read/chapter/65
- */
-class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_Abstract
-{
-    /**
-     * URI delimiter
-     */
-    const URI_DELIMITER = '/';
-
-    /**
-     * Default values for the route (ie. module, controller, action, params)
-     * @var array
-     */
-    protected $_defaults;
-
-    protected $_values      = array();
-    protected $_moduleValid = false;
-    protected $_keysSet     = false;
-
-    /**#@+
-     * Array keys to use for module, controller, and action. Should be taken out of request.
-     * @var string
-     */
-    protected $_moduleKey     = 'module';
-    protected $_controllerKey = 'controller';
-    protected $_actionKey     = 'action';
-    /**#@-*/
-
-    /**
-     * @var Zend_Controller_Dispatcher_Interface
-     */
-    protected $_dispatcher;
-
-    /**
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request;
-
-    public function getVersion() {
-        return 1;
-    }
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $frontController = Zend_Controller_Front::getInstance();
-
-        $defs       = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        $dispatcher = $frontController->getDispatcher();
-        $request    = $frontController->getRequest();
-
-        return new self($defs, $dispatcher, $request);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param array $defaults Defaults for map variables with keys as variable names
-     * @param Zend_Controller_Dispatcher_Interface $dispatcher Dispatcher object
-     * @param Zend_Controller_Request_Abstract $request Request object
-     */
-    public function __construct(array $defaults = array(),
-                Zend_Controller_Dispatcher_Interface $dispatcher = null,
-                Zend_Controller_Request_Abstract $request = null)
-    {
-        $this->_defaults = $defaults;
-
-        if (isset($request)) {
-            $this->_request = $request;
-        }
-
-        if (isset($dispatcher)) {
-            $this->_dispatcher = $dispatcher;
-        }
-    }
-
-    /**
-     * Set request keys based on values in request object
-     *
-     * @return void
-     */
-    protected function _setRequestKeys()
-    {
-        if (null !== $this->_request) {
-            $this->_moduleKey     = $this->_request->getModuleKey();
-            $this->_controllerKey = $this->_request->getControllerKey();
-            $this->_actionKey     = $this->_request->getActionKey();
-        }
-
-        if (null !== $this->_dispatcher) {
-            $this->_defaults += array(
-                $this->_controllerKey => $this->_dispatcher->getDefaultControllerName(),
-                $this->_actionKey     => $this->_dispatcher->getDefaultAction(),
-                $this->_moduleKey     => $this->_dispatcher->getDefaultModule()
-            );
-        }
-
-        $this->_keysSet = true;
-    }
-
-    /**
-     * Matches a user submitted path. Assigns and returns an array of variables
-     * on a successful match.
-     *
-     * If a request object is registered, it uses its setModuleName(),
-     * setControllerName(), and setActionName() accessors to set those values.
-     * Always returns the values as an array.
-     *
-     * @param string $path Path used to match against this routing map
-     * @return array An array of assigned values or a false on a mismatch
-     */
-    public function match($path, $partial = false)
-    {
-        $this->_setRequestKeys();
-
-        $values = array();
-        $params = array();
-
-        if (!$partial) {
-            $path = trim($path, self::URI_DELIMITER);
-        } else {
-            $matchedPath = $path;
-        }
-
-        if ($path != '') {
-            $path = explode(self::URI_DELIMITER, $path);
-
-            if ($this->_dispatcher && $this->_dispatcher->isValidModule($path[0])) {
-                $values[$this->_moduleKey] = array_shift($path);
-                $this->_moduleValid = true;
-            }
-
-            if (count($path) && !empty($path[0])) {
-                $values[$this->_controllerKey] = array_shift($path);
-            }
-
-            if (count($path) && !empty($path[0])) {
-                $values[$this->_actionKey] = array_shift($path);
-            }
-
-            if ($numSegs = count($path)) {
-                for ($i = 0; $i < $numSegs; $i = $i + 2) {
-                    $key = urldecode($path[$i]);
-                    $val = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null;
-                    $params[$key] = (isset($params[$key]) ? (array_merge((array) $params[$key], array($val))): $val);
-                }
-            }
-        }
-
-        if ($partial) {
-            $this->setMatchedPath($matchedPath);
-        }
-
-        $this->_values = $values + $params;
-
-        return $this->_values + $this->_defaults;
-    }
-
-    /**
-     * Assembles user submitted parameters forming a URL path defined by this route
-     *
-     * @param array $data An array of variable and value pairs used as parameters
-     * @param bool $reset Weither to reset the current params
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = true, $partial = false)
-    {
-        if (!$this->_keysSet) {
-            $this->_setRequestKeys();
-        }
-
-        $params = (!$reset) ? $this->_values : array();
-
-        foreach ($data as $key => $value) {
-            if ($value !== null) {
-                $params[$key] = $value;
-            } elseif (isset($params[$key])) {
-                unset($params[$key]);
-            }
-        }
-
-        $params += $this->_defaults;
-
-        $url = '';
-
-        if ($this->_moduleValid || array_key_exists($this->_moduleKey, $data)) {
-            if ($params[$this->_moduleKey] != $this->_defaults[$this->_moduleKey]) {
-                $module = $params[$this->_moduleKey];
-            }
-        }
-        unset($params[$this->_moduleKey]);
-
-        $controller = $params[$this->_controllerKey];
-        unset($params[$this->_controllerKey]);
-
-        $action = $params[$this->_actionKey];
-        unset($params[$this->_actionKey]);
-
-        foreach ($params as $key => $value) {
-            $key = ($encode) ? urlencode($key) : $key;
-            if (is_array($value)) {
-                foreach ($value as $arrayValue) {
-                    $arrayValue = ($encode) ? urlencode($arrayValue) : $arrayValue;
-                    $url .= '/' . $key;
-                    $url .= '/' . $arrayValue;
-                }
-            } else {
-                if ($encode) $value = urlencode($value);
-                $url .= '/' . $key;
-                $url .= '/' . $value;
-            }
-        }
-
-        if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) {
-            if ($encode) $action = urlencode($action);
-            $url = '/' . $action . $url;
-        }
-
-        if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) {
-            if ($encode) $controller = urlencode($controller);
-            $url = '/' . $controller . $url;
-        }
-
-        if (isset($module)) {
-            if ($encode) $module = urlencode($module);
-            $url = '/' . $module . $url;
-        }
-
-        return ltrim($url, self::URI_DELIMITER);
-    }
-
-    /**
-     * Return a single parameter of route's defaults
-     *
-     * @param string $name Array key of the parameter
-     * @return string Previously set default
-     */
-    public function getDefault($name) {
-        if (isset($this->_defaults[$name])) {
-            return $this->_defaults[$name];
-        }
-    }
-
-    /**
-     * Return an array of defaults
-     *
-     * @return array Route defaults
-     */
-    public function getDefaults() {
-        return $this->_defaults;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Regex.php b/airtime_mvc/library/Zend/Controller/Router/Route/Regex.php
deleted file mode 100644
index 160f7cdab..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Regex.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Regex.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * Regex Route
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract
-{
-    protected $_regex = null;
-    protected $_defaults = array();
-    protected $_reverse = null;
-    protected $_map = array();
-    protected $_values = array();
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     *
-     * @param Zend_Config $config Configuration object
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        $map = ($config->map instanceof Zend_Config) ? $config->map->toArray() : array();
-        $reverse = (isset($config->reverse)) ? $config->reverse : null;
-        return new self($config->route, $defs, $map, $reverse);
-    }
-
-    public function __construct($route, $defaults = array(), $map = array(), $reverse = null)
-    {
-        $this->_regex    = $route;
-        $this->_defaults = (array) $defaults;
-        $this->_map      = (array) $map;
-        $this->_reverse  = $reverse;
-    }
-
-    public function getVersion() {
-        return 1;
-    }
-
-    /**
-     * Matches a user submitted path with a previously defined route.
-     * Assigns and returns an array of defaults on a successful match.
-     *
-     * @param  string $path Path used to match against this routing map
-     * @return array|false  An array of assigned values or a false on a mismatch
-     */
-    public function match($path, $partial = false)
-    {
-        if (!$partial) {
-            $path = trim(urldecode($path), '/');
-            $regex = '#^' . $this->_regex . '$#i';
-        } else {
-            $regex = '#^' . $this->_regex . '#i';
-        }
-
-        $res = preg_match($regex, $path, $values);
-
-        if ($res === 0) {
-            return false;
-        }
-
-        if ($partial) {
-            $this->setMatchedPath($values[0]);
-        }
-
-        // array_filter_key()? Why isn't this in a standard PHP function set yet? :)
-        foreach ($values as $i => $value) {
-            if (!is_int($i) || $i === 0) {
-                unset($values[$i]);
-            }
-        }
-
-        $this->_values = $values;
-
-        $values   = $this->_getMappedValues($values);
-        $defaults = $this->_getMappedValues($this->_defaults, false, true);
-        $return   = $values + $defaults;
-
-        return $return;
-    }
-
-    /**
-     * Maps numerically indexed array values to it's associative mapped counterpart.
-     * Or vice versa. Uses user provided map array which consists of index => name
-     * parameter mapping. If map is not found, it returns original array.
-     *
-     * Method strips destination type of keys form source array. Ie. if source array is
-     * indexed numerically then every associative key will be stripped. Vice versa if reversed
-     * is set to true.
-     *
-     * @param  array   $values Indexed or associative array of values to map
-     * @param  boolean $reversed False means translation of index to association. True means reverse.
-     * @param  boolean $preserve Should wrong type of keys be preserved or stripped.
-     * @return array   An array of mapped values
-     */
-    protected function _getMappedValues($values, $reversed = false, $preserve = false)
-    {
-        if (count($this->_map) == 0) {
-            return $values;
-        }
-
-        $return = array();
-
-        foreach ($values as $key => $value) {
-            if (is_int($key) && !$reversed) {
-                if (array_key_exists($key, $this->_map)) {
-                    $index = $this->_map[$key];
-                } elseif (false === ($index = array_search($key, $this->_map))) {
-                    $index = $key;
-                }
-                $return[$index] = $values[$key];
-            } elseif ($reversed) {
-                $index = $key;
-                if (!is_int($key)) {
-                    if (array_key_exists($key, $this->_map)) {
-                        $index = $this->_map[$key];
-                    } else {
-                        $index = array_search($key, $this->_map, true);
-                    }
-                }
-                if (false !== $index) {
-                    $return[$index] = $values[$key];
-                }
-            } elseif ($preserve) {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Assembles a URL path defined by this route
-     *
-     * @param  array $data An array of name (or index) and value pairs used as parameters
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
-    {
-        if ($this->_reverse === null) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception('Cannot assemble. Reversed route is not specified.');
-        }
-
-        $defaultValuesMapped  = $this->_getMappedValues($this->_defaults, true, false);
-        $matchedValuesMapped  = $this->_getMappedValues($this->_values, true, false);
-        $dataValuesMapped     = $this->_getMappedValues($data, true, false);
-
-        // handle resets, if so requested (By null value) to do so
-        if (($resetKeys = array_search(null, $dataValuesMapped, true)) !== false) {
-            foreach ((array) $resetKeys as $resetKey) {
-                if (isset($matchedValuesMapped[$resetKey])) {
-                    unset($matchedValuesMapped[$resetKey]);
-                    unset($dataValuesMapped[$resetKey]);
-                }
-            }
-        }
-
-        // merge all the data together, first defaults, then values matched, then supplied
-        $mergedData = $defaultValuesMapped;
-        $mergedData = $this->_arrayMergeNumericKeys($mergedData, $matchedValuesMapped);
-        $mergedData = $this->_arrayMergeNumericKeys($mergedData, $dataValuesMapped);
-
-        if ($encode) {
-            foreach ($mergedData as $key => &$value) {
-                $value = urlencode($value);
-            }
-        }
-
-        ksort($mergedData);
-
-        $return = @vsprintf($this->_reverse, $mergedData);
-
-        if ($return === false) {
-            require_once 'Zend/Controller/Router/Exception.php';
-            throw new Zend_Controller_Router_Exception('Cannot assemble. Too few arguments?');
-        }
-
-        return $return;
-
-    }
-
-    /**
-     * Return a single parameter of route's defaults
-     *
-     * @param string $name Array key of the parameter
-     * @return string Previously set default
-     */
-    public function getDefault($name) {
-        if (isset($this->_defaults[$name])) {
-            return $this->_defaults[$name];
-        }
-    }
-
-    /**
-     * Return an array of defaults
-     *
-     * @return array Route defaults
-     */
-    public function getDefaults() {
-        return $this->_defaults;
-    }
-
-    /**
-     * Get all variables which are used by the route
-     *
-     * @return array
-     */
-    public function getVariables()
-    {
-        $variables = array();
-
-        foreach ($this->_map as $key => $value) {
-            if (is_numeric($key)) {
-                $variables[] = $value;
-            } else {
-                $variables[] = $key;
-            }
-        }
-
-        return $variables;
-    }
-
-    /**
-     * _arrayMergeNumericKeys() - allows for a strict key (numeric's included) array_merge.
-     * php's array_merge() lacks the ability to merge with numeric keys.
-     *
-     * @param array $array1
-     * @param array $array2
-     * @return array
-     */
-    protected function _arrayMergeNumericKeys(Array $array1, Array $array2)
-    {
-        $returnArray = $array1;
-        foreach ($array2 as $array2Index => $array2Value) {
-            $returnArray[$array2Index] = $array2Value;
-        }
-        return $returnArray;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Controller/Router/Route/Static.php b/airtime_mvc/library/Zend/Controller/Router/Route/Static.php
deleted file mode 100644
index 178704227..000000000
--- a/airtime_mvc/library/Zend/Controller/Router/Route/Static.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Static.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Router_Route_Abstract */
-require_once 'Zend/Controller/Router/Route/Abstract.php';
-
-/**
- * StaticRoute is used for managing static URIs.
- *
- * It's a lot faster compared to the standard Route implementation.
- *
- * @package    Zend_Controller
- * @subpackage Router
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_Abstract
-{
-
-    protected $_route = null;
-    protected $_defaults = array();
-
-    public function getVersion() {
-        return 1;
-    }
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     *
-     * @param Zend_Config $config Configuration object
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
-        return new self($config->route, $defs);
-    }
-
-    /**
-     * Prepares the route for mapping.
-     *
-     * @param string $route Map used to match with later submitted URL path
-     * @param array $defaults Defaults for map variables with keys as variable names
-     */
-    public function __construct($route, $defaults = array())
-    {
-        $this->_route = trim($route, '/');
-        $this->_defaults = (array) $defaults;
-    }
-
-    /**
-     * Matches a user submitted path with a previously defined route.
-     * Assigns and returns an array of defaults on a successful match.
-     *
-     * @param string $path Path used to match against this routing map
-     * @return array|false An array of assigned values or a false on a mismatch
-     */
-    public function match($path, $partial = false)
-    {
-        if ($partial) {
-            if (substr($path, 0, strlen($this->_route)) === $this->_route) {
-                $this->setMatchedPath($this->_route);
-                return $this->_defaults;
-            }
-        } else {
-            if (trim($path, '/') == $this->_route) {
-                return $this->_defaults;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Assembles a URL path defined by this route
-     *
-     * @param array $data An array of variable and value pairs used as parameters
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
-    {
-        return $this->_route;
-    }
-
-    /**
-     * Return a single parameter of route's defaults
-     *
-     * @param string $name Array key of the parameter
-     * @return string Previously set default
-     */
-    public function getDefault($name) {
-        if (isset($this->_defaults[$name])) {
-            return $this->_defaults[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Return an array of defaults
-     *
-     * @return array Route defaults
-     */
-    public function getDefaults() {
-        return $this->_defaults;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Crypt.php b/airtime_mvc/library/Zend/Crypt.php
deleted file mode 100644
index 49bb134f0..000000000
--- a/airtime_mvc/library/Zend/Crypt.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Crypt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt
-{
-
-    const TYPE_OPENSSL = 'openssl';
-    const TYPE_HASH = 'hash';
-    const TYPE_MHASH = 'mhash';
-
-    protected static $_type = null;
-
-    /**
-     * @var array
-     */
-    protected static $_supportedAlgosOpenssl = array(
-        'md2',
-        'md4',
-        'mdc2',
-        'rmd160',
-        'sha',
-        'sha1',
-        'sha224',
-        'sha256',
-        'sha384',
-        'sha512'
-    );
-
-    /**
-     * @var array
-     */
-    protected static $_supportedAlgosMhash = array(
-        'adler32',
-        'crc32',
-        'crc32b',
-        'gost',
-        'haval128',
-        'haval160',
-        'haval192',
-        'haval256',
-        'md4',
-        'md5',
-        'ripemd160',
-        'sha1',
-        'sha256',
-        'tiger',
-        'tiger128',
-        'tiger160'
-    );
-
-    /**
-     * @param string $algorithm
-     * @param string $data
-     * @param bool $binaryOutput
-     * @return unknown
-     */
-    public static function hash($algorithm, $data, $binaryOutput = false)
-    {
-        $algorithm = strtolower($algorithm);
-        if (function_exists($algorithm)) {
-            return $algorithm($data, $binaryOutput);
-        }
-        self::_detectHashSupport($algorithm);
-        $supportedMethod = '_digest' . ucfirst(self::$_type);
-        $result = self::$supportedMethod($algorithm, $data, $binaryOutput);
-    }
-
-    /**
-     * @param string $algorithm
-     * @throws Zend_Crypt_Exception
-     */
-    protected static function _detectHashSupport($algorithm)
-    {
-        if (function_exists('hash')) {
-            self::$_type = self::TYPE_HASH;
-            if (in_array($algorithm, hash_algos())) {
-               return;
-            }
-        }
-        if (function_exists('mhash')) {
-            self::$_type = self::TYPE_MHASH;
-            if (in_array($algorithm, self::$_supportedAlgosMhash)) {
-               return;
-            }
-        }
-        if (function_exists('openssl_digest')) {
-            if ($algorithm == 'ripemd160') {
-                $algorithm = 'rmd160';
-            }
-            self::$_type = self::TYPE_OPENSSL;
-            if (in_array($algorithm, self::$_supportedAlgosOpenssl)) {
-               return;
-            }
-        }
-        /**
-         * @see Zend_Crypt_Exception
-         */
-        require_once 'Zend/Crypt/Exception.php';
-        throw new Zend_Crypt_Exception('\'' . $algorithm . '\' is not supported by any available extension or native function');
-    }
-
-    /**
-     * @param string $algorithm
-     * @param string $data
-     * @param bool $binaryOutput
-     * @return string
-     */
-    protected static function _digestHash($algorithm, $data, $binaryOutput)
-    {
-        return hash($algorithm, $data, $binaryOutput);
-    }
-
-    /**
-     * @param string $algorithm
-     * @param string $data
-     * @param bool $binaryOutput
-     * @return string
-     */
-    protected static function _digestMhash($algorithm, $data, $binaryOutput)
-    {
-        $constant = constant('MHASH_' . strtoupper($algorithm));
-        $binary = mhash($constant, $data);
-        if ($binaryOutput) {
-            return $binary;
-        }
-        return bin2hex($binary);
-    }
-
-    /**
-     * @param string $algorithm
-     * @param string $data
-     * @param bool $binaryOutput
-     * @return string
-     */
-    protected static function _digestOpenssl($algorithm, $data, $binaryOutput)
-    {
-        if ($algorithm == 'ripemd160') {
-            $algorithm = 'rmd160';
-        }
-        return openssl_digest($data, $algorithm, $binaryOutput);
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/DiffieHellman.php b/airtime_mvc/library/Zend/Crypt/DiffieHellman.php
deleted file mode 100644
index 5ab6b8c92..000000000
--- a/airtime_mvc/library/Zend/Crypt/DiffieHellman.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage DiffieHellman
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DiffieHellman.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * PHP implementation of the Diffie-Hellman public key encryption algorithm.
- * Allows two unassociated parties to establish a joint shared secret key
- * to be used in encrypting subsequent communications.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_DiffieHellman
-{
-
-    /**
-     * Static flag to select whether to use PHP5.3's openssl extension
-     * if available.
-     *
-     * @var boolean
-     */
-    public static $useOpenssl = true;
-
-    /**
-     * Default large prime number; required by the algorithm.
-     *
-     * @var string
-     */
-    private $_prime = null;
-
-    /**
-     * The default generator number. This number must be greater than 0 but
-     * less than the prime number set.
-     *
-     * @var string
-     */
-    private $_generator = null;
-
-    /**
-     * A private number set by the local user. It's optional and will
-     * be generated if not set.
-     *
-     * @var string
-     */
-    private $_privateKey = null;
-
-    /**
-     * BigInteger support object courtesy of Zend_Crypt_Math
-     *
-     * @var Zend_Crypt_Math_BigInteger
-     */
-    private $_math = null;
-
-    /**
-     * The public key generated by this instance after calling generateKeys().
-     *
-     * @var string
-     */
-    private $_publicKey = null;
-
-    /**
-     * The shared secret key resulting from a completed Diffie Hellman
-     * exchange
-     *
-     * @var string
-     */
-    private $_secretKey = null;
-
-    /**
-     * Constants
-     */
-    const BINARY = 'binary';
-    const NUMBER = 'number';
-    const BTWOC  = 'btwoc';
-
-    /**
-     * Constructor; if set construct the object using the parameter array to
-     * set values for Prime, Generator and Private.
-     * If a Private Key is not set, one will be generated at random.
-     *
-     * @param string $prime
-     * @param string $generator
-     * @param string $privateKey
-     * @param string $privateKeyType
-     * @return void
-     */
-    public function __construct($prime, $generator, $privateKey = null, $privateKeyType = self::NUMBER)
-    {
-        $this->setPrime($prime);
-        $this->setGenerator($generator);
-        if (!is_null($privateKey)) {
-            $this->setPrivateKey($privateKey, $privateKeyType);
-        }
-        $this->setBigIntegerMath();
-    }
-
-    /**
-     * Generate own public key. If a private number has not already been
-     * set, one will be generated at this stage.
-     *
-     * @return Zend_Crypt_DiffieHellman
-     */
-    public function generateKeys()
-    {
-        if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) {
-            $details = array();
-            $details['p'] = $this->getPrime();
-            $details['g'] = $this->getGenerator();
-            if ($this->hasPrivateKey()) {
-                $details['priv_key'] = $this->getPrivateKey();
-            }
-            $opensslKeyResource = openssl_pkey_new( array('dh' => $details) );
-            $data = openssl_pkey_get_details($opensslKeyResource);
-            $this->setPrivateKey($data['dh']['priv_key'], self::BINARY);
-            $this->setPublicKey($data['dh']['pub_key'], self::BINARY);
-        } else {
-            // Private key is lazy generated in the absence of PHP 5.3's ext/openssl
-            $publicKey = $this->_math->powmod($this->getGenerator(), $this->getPrivateKey(), $this->getPrime());
-            $this->setPublicKey($publicKey);
-        }
-        return $this;
-    }
-
-    /**
-     * Setter for the value of the public number
-     *
-     * @param string $number
-     * @param string $type
-     * @return Zend_Crypt_DiffieHellman
-     */
-    public function setPublicKey($number, $type = self::NUMBER)
-    {
-        if ($type == self::BINARY) {
-            $number = $this->_math->fromBinary($number);
-        }
-        if (!preg_match("/^\d+$/", $number)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
-        }
-        $this->_publicKey = (string) $number;
-        return $this;
-    }
-
-    /**
-     * Returns own public key for communication to the second party to this
-     * transaction.
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getPublicKey($type = self::NUMBER)
-    {
-        if (is_null($this->_publicKey)) {
-            require_once 'Zend/Crypt/DiffieHellman/Exception.php';
-            throw new Zend_Crypt_DiffieHellman_Exception('A public key has not yet been generated using a prior call to generateKeys()');
-        }
-        if ($type == self::BINARY) {
-            return $this->_math->toBinary($this->_publicKey);
-        } elseif ($type == self::BTWOC) {
-            return $this->_math->btwoc($this->_math->toBinary($this->_publicKey));
-        }
-        return $this->_publicKey;
-    }
-
-    /**
-     * Compute the shared secret key based on the public key received from the
-     * the second party to this transaction. This should agree to the secret
-     * key the second party computes on our own public key.
-     * Once in agreement, the key is known to only to both parties.
-     * By default, the function expects the public key to be in binary form
-     * which is the typical format when being transmitted.
-     *
-     * If you need the binary form of the shared secret key, call
-     * getSharedSecretKey() with the optional parameter for Binary output.
-     *
-     * @param string $publicKey
-     * @param string $type
-     * @return mixed
-     */
-    public function computeSecretKey($publicKey, $type = self::NUMBER, $output = self::NUMBER)
-    {
-        if ($type == self::BINARY) {
-            $publicKey = $this->_math->fromBinary($publicKey);
-        }
-        if (!preg_match("/^\d+$/", $publicKey)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
-        }
-        if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) {
-            $this->_secretKey = openssl_dh_compute_key($publicKey, $this->getPublicKey());
-        } else {
-            $this->_secretKey = $this->_math->powmod($publicKey, $this->getPrivateKey(), $this->getPrime());
-        }
-        return $this->getSharedSecretKey($output);
-    }
-
-    /**
-     * Return the computed shared secret key from the DiffieHellman transaction
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getSharedSecretKey($type = self::NUMBER)
-    {
-        if (!isset($this->_secretKey)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('A secret key has not yet been computed; call computeSecretKey()');
-        }
-        if ($type == self::BINARY) {
-            return $this->_math->toBinary($this->_secretKey);
-        } elseif ($type == self::BTWOC) {
-            return $this->_math->btwoc($this->_math->toBinary($this->_secretKey));
-        }
-        return $this->_secretKey;
-    }
-
-    /**
-     * Setter for the value of the prime number
-     *
-     * @param string $number
-     * @return Zend_Crypt_DiffieHellman
-     */
-    public function setPrime($number)
-    {
-        if (!preg_match("/^\d+$/", $number) || $number < 11) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number or too small: should be a large natural number prime');
-        }
-        $this->_prime = (string) $number;
-        return $this;
-    }
-
-    /**
-     * Getter for the value of the prime number
-     *
-     * @return string
-     */
-    public function getPrime()
-    {
-        if (!isset($this->_prime)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('No prime number has been set');
-        }
-        return $this->_prime;
-    }
-
-
-    /**
-     * Setter for the value of the generator number
-     *
-     * @param string $number
-     * @return Zend_Crypt_DiffieHellman
-     */
-    public function setGenerator($number)
-    {
-        if (!preg_match("/^\d+$/", $number) || $number < 2) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number greater than 1');
-        }
-        $this->_generator = (string) $number;
-        return $this;
-    }
-
-    /**
-     * Getter for the value of the generator number
-     *
-     * @return string
-     */
-    public function getGenerator()
-    {
-        if (!isset($this->_generator)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('No generator number has been set');
-        }
-        return $this->_generator;
-    }
-
-    /**
-     * Setter for the value of the private number
-     *
-     * @param string $number
-     * @param string $type
-     * @return Zend_Crypt_DiffieHellman
-     */
-    public function setPrivateKey($number, $type = self::NUMBER)
-    {
-        if ($type == self::BINARY) {
-            $number = $this->_math->fromBinary($number);
-        }
-        if (!preg_match("/^\d+$/", $number)) {
-            require_once('Zend/Crypt/DiffieHellman/Exception.php');
-            throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number');
-        }
-        $this->_privateKey = (string) $number;
-        return $this;
-    }
-
-    /**
-     * Getter for the value of the private number
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getPrivateKey($type = self::NUMBER)
-    {
-        if (!$this->hasPrivateKey()) {
-            $this->setPrivateKey($this->_generatePrivateKey());
-        }
-        if ($type == self::BINARY) {
-            return $this->_math->toBinary($this->_privateKey);
-        } elseif ($type == self::BTWOC) {
-            return $this->_math->btwoc($this->_math->toBinary($this->_privateKey));
-        }
-        return $this->_privateKey;
-    }
-
-    /**
-     * Check whether a private key currently exists.
-     *
-     * @return boolean
-     */
-    public function hasPrivateKey()
-    {
-        return isset($this->_privateKey);
-    }
-
-    /**
-     * Setter to pass an extension parameter which is used to create
-     * a specific BigInteger instance for a specific extension type.
-     * Allows manual setting of the class in case of an extension
-     * problem or bug.
-     *
-     * @param string $extension
-     * @return void
-     */
-    public function setBigIntegerMath($extension = null)
-    {
-        /**
-         * @see Zend_Crypt_Math
-         */
-        require_once 'Zend/Crypt/Math.php';
-        $this->_math = new Zend_Crypt_Math($extension);
-    }
-
-    /**
-     * In the event a private number/key has not been set by the user,
-     * or generated by ext/openssl, a best attempt will be made to
-     * generate a random key. Having a random number generator installed
-     * on linux/bsd is highly recommended! The alternative is not recommended
-     * for production unless without any other option.
-     *
-     * @return string
-     */
-    protected function _generatePrivateKey()
-    {
-        $rand = $this->_math->rand($this->getGenerator(), $this->getPrime());
-        return $rand;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/DiffieHellman/Exception.php b/airtime_mvc/library/Zend/Crypt/DiffieHellman/Exception.php
deleted file mode 100644
index fcb6d740b..000000000
--- a/airtime_mvc/library/Zend/Crypt/DiffieHellman/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage DiffieHellman
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Exception
- */
-require_once 'Zend/Crypt/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Exception.php b/airtime_mvc/library/Zend/Crypt/Exception.php
deleted file mode 100644
index 907d955c4..000000000
--- a/airtime_mvc/library/Zend/Crypt/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Hmac.php b/airtime_mvc/library/Zend/Crypt/Hmac.php
deleted file mode 100644
index 1783a426e..000000000
--- a/airtime_mvc/library/Zend/Crypt/Hmac.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Hmac
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hmac.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt
- */
-require_once 'Zend/Crypt.php';
-
-/**
- * PHP implementation of the RFC 2104 Hash based Message Authentication Code
- * algorithm.
- *
- * @todo  Patch for refactoring failed tests (key block sizes >80 using internal algo)
- * @todo       Check if mhash() is a required alternative (will be PECL-only soon)
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Hmac extends Zend_Crypt
-{
-
-    /**
-     * The key to use for the hash
-     *
-     * @var string
-     */
-    protected static $_key = null;
-
-    /**
-     * pack() format to be used for current hashing method
-     *
-     * @var string
-     */
-    protected static $_packFormat = null;
-
-    /**
-     * Hashing algorithm; can be the md5/sha1 functions or any algorithm name
-     * listed in the output of PHP 5.1.2+ hash_algos().
-     *
-     * @var string
-     */
-    protected static $_hashAlgorithm = 'md5';
-
-    /**
-     * List of algorithms supported my mhash()
-     *
-     * @var array
-     */
-    protected static $_supportedMhashAlgorithms = array('adler32',' crc32', 'crc32b', 'gost',
-            'haval128', 'haval160', 'haval192', 'haval256', 'md4', 'md5', 'ripemd160',
-            'sha1', 'sha256', 'tiger', 'tiger128', 'tiger160');
-
-    /**
-     * Constants representing the output mode of the hash algorithm
-     */
-    const STRING = 'string';
-    const BINARY = 'binary';
-
-    /**
-     * Performs a HMAC computation given relevant details such as Key, Hashing
-     * algorithm, the data to compute MAC of, and an output format of String,
-     * Binary notation or BTWOC.
-     *
-     * @param string $key
-     * @param string $hash
-     * @param string $data
-     * @param string $output
-     * @param boolean $internal
-     * @return string
-     */
-    public static function compute($key, $hash, $data, $output = self::STRING)
-    {
-        // set the key
-        if (!isset($key) || empty($key)) {
-            require_once 'Zend/Crypt/Hmac/Exception.php';
-            throw new Zend_Crypt_Hmac_Exception('provided key is null or empty');
-        }
-        self::$_key = $key;
-
-        // set the hash
-        self::_setHashAlgorithm($hash);
-
-        // perform hashing and return
-        return self::_hash($data, $output);
-    }
-
-    /**
-     * Setter for the hash method.
-     *
-     * @param string $hash
-     * @return Zend_Crypt_Hmac
-     */
-    protected static function _setHashAlgorithm($hash)
-    {
-        if (!isset($hash) || empty($hash)) {
-            require_once 'Zend/Crypt/Hmac/Exception.php';
-            throw new Zend_Crypt_Hmac_Exception('provided hash string is null or empty');
-        }
-
-        $hash = strtolower($hash);
-        $hashSupported = false;
-
-        if (function_exists('hash_algos') && in_array($hash, hash_algos())) {
-            $hashSupported = true;
-        }
-
-        if ($hashSupported === false && function_exists('mhash') && in_array($hash, self::$_supportedAlgosMhash)) {
-            $hashSupported = true;
-        }
-
-        if ($hashSupported === false) {
-            require_once 'Zend/Crypt/Hmac/Exception.php';
-            throw new Zend_Crypt_Hmac_Exception('hash algorithm provided is not supported on this PHP installation; please enable the hash or mhash extensions');
-        }
-        self::$_hashAlgorithm = $hash;
-    }
-
-    /**
-     * Perform HMAC and return the keyed data
-     *
-     * @param string $data
-     * @param string $output
-     * @param bool $internal Option to not use hash() functions for testing
-     * @return string
-     */
-    protected static function _hash($data, $output = self::STRING, $internal = false)
-    {
-        if (function_exists('hash_hmac')) {
-            if ($output == self::BINARY) {
-                return hash_hmac(self::$_hashAlgorithm, $data, self::$_key, 1);
-            }
-            return hash_hmac(self::$_hashAlgorithm, $data, self::$_key);
-        }
-
-        if (function_exists('mhash')) {
-            if ($output == self::BINARY) {
-                return mhash(self::_getMhashDefinition(self::$_hashAlgorithm), $data, self::$_key);
-            }
-            $bin = mhash(self::_getMhashDefinition(self::$_hashAlgorithm), $data, self::$_key);
-            return bin2hex($bin);
-        }
-    }
-
-    /**
-     * Since MHASH accepts an integer constant representing the hash algorithm
-     * we need to make a small detour to get the correct integer matching our
-     * algorithm's name.
-     *
-     * @param string $hashAlgorithm
-     * @return integer
-     */
-    protected static function _getMhashDefinition($hashAlgorithm)
-    {
-        for ($i = 0; $i <= mhash_count(); $i++)
-        {
-            $types[mhash_get_hash_name($i)] = $i;
-        }
-        return $types[strtoupper($hashAlgorithm)];
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Hmac/Exception.php b/airtime_mvc/library/Zend/Crypt/Hmac/Exception.php
deleted file mode 100644
index 8ed2e5d51..000000000
--- a/airtime_mvc/library/Zend/Crypt/Hmac/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Hmac
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Exception
- */
-require_once 'Zend/Crypt/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math.php b/airtime_mvc/library/Zend/Crypt/Math.php
deleted file mode 100644
index 9cd98fd15..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Math.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Math_BigInteger
- */
-require_once 'Zend/Crypt/Math/BigInteger.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math extends Zend_Crypt_Math_BigInteger
-{
-
-    /**
-     * Generate a pseudorandom number within the given range.
-     * Will attempt to read from a systems RNG if it exists or else utilises
-     * a simple random character to maximum length process. Simplicity
-     * is a factor better left for development...
-     *
-     * @param string|int $minimum
-     * @param string|int $maximum
-     * @return string
-     */
-    public function rand($minimum, $maximum)
-    {
-        if (file_exists('/dev/urandom')) {
-            $frandom = fopen('/dev/urandom', 'r');
-            if ($frandom !== false) {
-                return fread($frandom, strlen($maximum) - 1);
-            }
-        }
-        if (strlen($maximum) < 4) {
-            return mt_rand($minimum, $maximum - 1);
-        }
-        $rand = '';
-        $i2 = strlen($maximum) - 1;
-        for ($i = 1;$i < $i2;$i++) {
-            $rand .= mt_rand(0,9);
-        }
-        $rand .= mt_rand(0,9);
-        return $rand;
-    }
-
-    /**
-     * Get the big endian two's complement of a given big integer in
-     * binary notation
-     *
-     * @param string $long
-     * @return string
-     */
-    public function btwoc($long) {
-        if (ord($long[0]) > 127) {
-            return "\x00" . $long;
-        }
-        return $long;
-    }
-
-    /**
-     * Translate a binary form into a big integer string
-     *
-     * @param string $binary
-     * @return string
-     */
-    public function fromBinary($binary) {
-        return $this->_math->binaryToInteger($binary);
-    }
-
-    /**
-     * Translate a big integer string into a binary form
-     *
-     * @param string $integer
-     * @return string
-     */
-    public function toBinary($integer)
-    {
-        return $this->_math->integerToBinary($integer);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Crypt/Math/BigInteger.php b/airtime_mvc/library/Zend/Crypt/Math/BigInteger.php
deleted file mode 100644
index bb02dbb39..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/BigInteger.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BigInteger.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Support for arbitrary precision mathematics in PHP.
- *
- * Zend_Crypt_Math_BigInteger is a wrapper across three PHP extensions: bcmath, gmp
- * and big_int. Since each offer similar functionality, but availability of
- * each differs across installations of PHP, this wrapper attempts to select
- * the fastest option available and encapsulate a subset of its functionality
- * which all extensions share in common.
- *
- * This class requires one of the three extensions to be available. BCMATH
- * while the slowest, is available by default under Windows, and under Unix
- * if PHP is compiled with the flag "--enable-bcmath". GMP requires the gmp
- * library from http://www.swox.com/gmp/ and PHP compiled with the "--with-gmp"
- * flag. BIG_INT support is available from a big_int PHP library available from
- * only from PECL (a Windows port is not available).
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math_BigInteger
-{
-
-    /**
-     * Holds an instance of one of the three arbitrary precision wrappers.
-     *
-     * @var Zend_Crypt_Math_BigInteger_Interface
-     */
-    protected $_math = null;
-
-    /**
-     * Constructor; a Factory which detects a suitable PHP extension for
-     * arbitrary precision math and instantiates the suitable wrapper
-     * object.
-     *
-     * @param string $extension
-     * @throws  Zend_Crypt_Math_BigInteger_Exception
-     */
-    public function __construct($extension = null)
-    {
-        if (!is_null($extension) && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) {
-            require_once('Zend/Crypt/Math/BigInteger/Exception.php');
-            throw new Zend_Crypt_Math_BigInteger_Exception('Invalid extension type; please use one of bcmath, gmp or bigint');
-        }
-        $this->_loadAdapter($extension);
-    }
-
-    /**
-     * Redirect all public method calls to the wrapped extension object.
-     *
-     * @param   string $methodName
-     * @param   array $args
-     * @throws  Zend_Crypt_Math_BigInteger_Exception
-     */
-    public function __call($methodName, $args)
-    {
-        if(!method_exists($this->_math, $methodName)) {
-            require_once 'Zend/Crypt/Math/BigInteger/Exception.php';
-            throw new Zend_Crypt_Math_BigInteger_Exception('invalid method call: ' . get_class($this->_math) . '::' . $methodName . '() does not exist');
-        }
-        return call_user_func_array(array($this->_math, $methodName), $args);
-    }
-
-    /**
-     * @param string $extension
-     * @throws  Zend_Crypt_Math_BigInteger_Exception
-     */
-    protected function _loadAdapter($extension = null)
-    {
-        if (is_null($extension)) {
-            if (extension_loaded('gmp')) {
-                $extension = 'gmp';
-            //} elseif (extension_loaded('big_int')) {
-            //    $extension = 'big_int';
-            } else {
-                $extension = 'bcmath';
-            }
-        }
-        if($extension == 'gmp' && extension_loaded('gmp')) {
-            require_once 'Zend/Crypt/Math/BigInteger/Gmp.php';
-            $this->_math = new Zend_Crypt_Math_BigInteger_Gmp();
-        //} elseif($extension == 'bigint' && extension_loaded('big_int')) {
-        //    require_once 'Zend/Crypt_Math/BigInteger/Bigint.php';
-        //    $this->_math = new Zend_Crypt_Math_BigInteger_Bigint();
-        } elseif ($extension == 'bcmath') {
-            require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php';
-            $this->_math = new Zend_Crypt_Math_BigInteger_Bcmath();
-        } else {
-            require_once 'Zend/Crypt/Math/BigInteger/Exception.php';
-            throw new Zend_Crypt_Math_BigInteger_Exception($extension . ' big integer precision math support not detected');
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Bcmath.php b/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Bcmath.php
deleted file mode 100644
index 092e5b4c2..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Bcmath.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Bcmath.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Math_BigInteger_Interface
- */
-require_once 'Zend/Crypt/Math/BigInteger/Interface.php';
-
-/**
- * Support for arbitrary precision mathematics in PHP.
- *
- * Zend_Crypt_Math_BigInteger_Bcmath is a wrapper across the PHP BCMath
- * extension.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_Interface
-{
-
-    /**
-     * Initialise a big integer into an extension specific type. This is not
-     * applicable to BCMath.
-     * @param string $operand
-     * @param int $base
-     * @return string
-     */
-    public function init($operand, $base = 10)
-    {
-        return $operand;
-    }
-
-    /**
-     * Adds two arbitrary precision numbers
-     *
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function add($left_operand, $right_operand)
-    {
-        return bcadd($left_operand, $right_operand);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function subtract($left_operand, $right_operand)
-    {
-        return bcsub($left_operand, $right_operand);
-    }
-
-    /**
-     * Compare two big integers and returns result as an integer where 0 means
-     * both are identical, 1 that left_operand is larger, or -1 that
-     * right_operand is larger.
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return int
-     */
-    public function compare($left_operand, $right_operand)
-    {
-        return bccomp($left_operand, $right_operand);
-    }
-
-    /**
-     * Divide two big integers and return result or NULL if the denominator
-     * is zero.
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string|null
-     */
-    public function divide($left_operand, $right_operand)
-    {
-        return bcdiv($left_operand, $right_operand);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function modulus($left_operand, $modulus)
-    {
-        return bcmod($left_operand, $modulus);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function multiply($left_operand, $right_operand)
-    {
-        return bcmul($left_operand, $right_operand);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function pow($left_operand, $right_operand)
-    {
-        return bcpow($left_operand, $right_operand);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function powmod($left_operand, $right_operand, $modulus)
-    {
-        return bcpowmod($left_operand, $right_operand, $modulus);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function sqrt($operand)
-    {
-        return bcsqrt($operand);
-    }
-
-
-    public function binaryToInteger($operand)
-    {
-        $result = '0';
-        while (strlen($operand)) {
-            $ord = ord(substr($operand, 0, 1));
-            $result = bcadd(bcmul($result, 256), $ord);
-            $operand = substr($operand, 1);
-        }
-        return $result;
-    }
-
-
-    public function integerToBinary($operand)
-    {
-        $cmp = bccomp($operand, 0);
-        $return = '';
-        if ($cmp == 0) {
-            return (chr(0));
-        }
-        while (bccomp($operand, 0) > 0) {
-            $return = chr(bcmod($operand, 256)) . $return;
-            $operand = bcdiv($operand, 256);
-        }
-        if (ord($return[0]) > 127) {
-            $return = chr(0) . $return;
-        }
-        return $return;
-    }
-
-    /**public function integerToBinary($operand)
-    {
-        $return = '';
-        while(bccomp($operand, '0')) {
-            $return .= chr(bcmod($operand, '256'));
-            $operand = bcdiv($operand, '256');
-        }
-        return $return;
-    }**/ // Prior version for referenced offset
-
-
-    public function hexToDecimal($operand)
-    {
-        $return = '0';
-        while(strlen($hex)) {
-            $hex = hexdec(substr($operand, 0, 4));
-            $dec = bcadd(bcmul($return, 65536), $hex);
-            $operand = substr($operand, 4);
-        }
-        return $return;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Exception.php b/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Exception.php
deleted file mode 100644
index 201242db2..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Math_Exception
- */
-require_once 'Zend/Crypt/Math/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Gmp.php b/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Gmp.php
deleted file mode 100644
index a5b25137b..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Gmp.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gmp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Math_BigInteger_Interface
- */
-require_once 'Zend/Crypt/Math/BigInteger/Interface.php';
-
-/**
- * Support for arbitrary precision mathematics in PHP.
- *
- * Zend_Crypt_Math_BigInteger_Bcmath is a wrapper across the PHP BCMath
- * extension.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Interface
-{
-
-    /**
-     * Initialise a big integer into an extension specific type.
-     * @param string $operand
-     * @param int $base
-     * @return string
-     */
-    public function init($operand, $base = 10)
-    {
-        return $operand;
-    }
-
-    /**
-     * Adds two arbitrary precision numbers
-     *
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function add($left_operand, $right_operand)
-    {
-        $result = gmp_add($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function subtract($left_operand, $right_operand)
-    {
-        $result = gmp_sub($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * Compare two big integers and returns result as an integer where 0 means
-     * both are identical, 1 that left_operand is larger, or -1 that
-     * right_operand is larger.
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return int
-     */
-    public function compare($left_operand, $right_operand)
-    {
-        $result = gmp_cmp($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * Divide two big integers and return result or NULL if the denominator
-     * is zero.
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string|null
-     */
-    public function divide($left_operand, $right_operand)
-    {
-        $result = gmp_div($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function modulus($left_operand, $modulus)
-    {
-        $result = gmp_mod($left_operand, $modulus);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function multiply($left_operand, $right_operand)
-    {
-        $result = gmp_mul($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function pow($left_operand, $right_operand)
-    {
-        $result = gmp_pow($left_operand, $right_operand);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function powmod($left_operand, $right_operand, $modulus)
-    {
-        $result = gmp_powm($left_operand, $right_operand, $modulus);
-        return gmp_strval($result);
-    }
-
-    /**
-     * @param string $left_operand
-     * @param string $right_operand
-     * @return string
-     */
-    public function sqrt($operand)
-    {
-        $result = gmp_sqrt($operand);
-        return gmp_strval($result);
-    }
-
-
-    public function binaryToInteger($operand)
-    {
-        $result = '0';
-        while (strlen($operand)) {
-            $ord = ord(substr($operand, 0, 1));
-            $result = gmp_add(gmp_mul($result, 256), $ord);
-            $operand = substr($operand, 1);
-        }
-        return gmp_strval($result);
-    }
-
-
-    public function integerToBinary($operand)
-    {
-        $bigInt = gmp_strval($operand, 16);
-        if (strlen($bigInt) % 2 != 0) {
-            $bigInt = '0' . $bigInt;
-        } else if ($bigInt[0] > '7') {
-            $bigInt = '00' . $bigInt;
-        }
-        $return = pack("H*", $bigInt);
-        return $return;
-    }
-
-
-    public function hexToDecimal($operand)
-    {
-        $return = '0';
-        while(strlen($hex)) {
-            $hex = hexdec(substr($operand, 0, 4));
-            $dec = gmp_add(gmp_mul($return, 65536), $hex);
-            $operand = substr($operand, 4);
-        }
-        return $return;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Interface.php b/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Interface.php
deleted file mode 100644
index f0cce8b5d..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/BigInteger/Interface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Support for arbitrary precision mathematics in PHP.
- *
- * Interface for a wrapper across any PHP extension supporting arbitrary
- * precision maths.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Crypt_Math_BigInteger_Interface
-{
-
-    public function init($operand, $base = 10);
-    public function add($left_operand, $right_operand);
-    public function subtract($left_operand, $right_operand);
-    public function compare($left_operand, $right_operand);
-    public function divide($left_operand, $right_operand);
-    public function modulus($left_operand, $modulus);
-    public function multiply($left_operand, $right_operand);
-    public function pow($left_operand, $right_operand);
-    public function powmod($left_operand, $right_operand, $modulus);
-    public function sqrt($operand);
-    public function binaryToInteger($operand);
-    public function integerToBinary($operand);
-    public function hexToDecimal($operand);
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Math/Exception.php b/airtime_mvc/library/Zend/Crypt/Math/Exception.php
deleted file mode 100644
index d7c3e8ed3..000000000
--- a/airtime_mvc/library/Zend/Crypt/Math/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Math
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Exception
- */
-require_once 'Zend/Crypt/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Math_Exception extends Zend_Crypt_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Rsa.php b/airtime_mvc/library/Zend/Crypt/Rsa.php
deleted file mode 100644
index 9b79714a8..000000000
--- a/airtime_mvc/library/Zend/Crypt/Rsa.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Rsa
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rsa.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Rsa_Key_Private
- */
-require_once 'Zend/Crypt/Rsa/Key/Private.php';
-
-/**
- * @see Zend_Crypt_Rsa_Key_Public
- */
-require_once 'Zend/Crypt/Rsa/Key/Public.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Rsa
-{
-
-    const BINARY = 'binary';
-    const BASE64 = 'base64';
-
-    protected $_privateKey = null;
-
-    protected $_publicKey = null;
-
-    /**
-     * @var string
-     */
-    protected $_pemString = null;
-
-    protected $_pemPath = null;
-
-    protected $_certificateString = null;
-
-    protected $_certificatePath = null;
-
-    protected $_hashAlgorithm = OPENSSL_ALGO_SHA1;
-
-    protected $_passPhrase = null;
-
-    public function __construct(array $options = null)
-    {
-        if (isset($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    public function setOptions(array $options)
-    {
-        if (isset($options['passPhrase'])) {
-            $this->_passPhrase = $options['passPhrase'];
-        }
-        foreach ($options as $option=>$value) {
-            switch ($option) {
-                case 'pemString':
-                    $this->setPemString($value);
-                    break;
-                case 'pemPath':
-                    $this->setPemPath($value);
-                    break;
-                case 'certificateString':
-                    $this->setCertificateString($value);
-                    break;
-                case 'certificatePath':
-                    $this->setCertificatePath($value);
-                    break;
-                case 'hashAlgorithm':
-                    $this->setHashAlgorithm($value);
-                    break;
-            }
-        }
-    }
-
-    public function getPrivateKey()
-    {
-        return $this->_privateKey;
-    }
-
-    public function getPublicKey()
-    {
-        return $this->_publicKey;
-    }
-
-    /**
-     * @param string $data
-     * @param Zend_Crypt_Rsa_Key_Private $privateKey
-     * @param string $format
-     * @return string
-     */
-    public function sign($data, Zend_Crypt_Rsa_Key_Private $privateKey = null, $format = null)
-    {
-        $signature = '';
-        if (isset($privateKey)) {
-            $opensslKeyResource = $privateKey->getOpensslKeyResource();
-        } else {
-            $opensslKeyResource = $this->_privateKey->getOpensslKeyResource();
-        }
-        $result = openssl_sign(
-            $data, $signature,
-            $opensslKeyResource,
-            $this->getHashAlgorithm()
-        );
-        if ($format == self::BASE64) {
-            return base64_encode($signature);
-        }
-        return $signature;
-    }
-
-    /**
-     * @param string $data
-     * @param string $signature
-     * @param string $format
-     * @return string
-     */
-    public function verifySignature($data, $signature, $format = null)
-    {
-        if ($format == self::BASE64) {
-            $signature = base64_decode($signature);
-        }
-        $result = openssl_verify($data, $signature,
-            $this->getPublicKey()->getOpensslKeyResource(),
-            $this->getHashAlgorithm());
-        return $result;
-    }
-
-    /**
-     * @param string $data
-     * @param Zend_Crypt_Rsa_Key $key
-     * @param string $format
-     * @return string
-     */
-    public function encrypt($data, Zend_Crypt_Rsa_Key $key, $format = null)
-    {
-        $encrypted = '';
-        $function = 'openssl_public_encrypt';
-        if ($key instanceof Zend_Crypt_Rsa_Key_Private) {
-            $function = 'openssl_private_encrypt';
-        }
-        $function($data, $encrypted, $key->getOpensslKeyResource());
-        if ($format == self::BASE64) {
-            return base64_encode($encrypted);
-        }
-        return $encrypted;
-    }
-
-    /**
-     * @param string $data
-     * @param Zend_Crypt_Rsa_Key $key
-     * @param string $format
-     * @return string
-     */
-    public function decrypt($data, Zend_Crypt_Rsa_Key $key, $format = null)
-    {
-        $decrypted = '';
-        if ($format == self::BASE64) {
-            $data = base64_decode($data);
-        }
-        $function = 'openssl_private_decrypt';
-        if ($key instanceof Zend_Crypt_Rsa_Key_Public) {
-            $function = 'openssl_public_decrypt';
-        }
-        $function($data, $decrypted, $key->getOpensslKeyResource());
-        return $decrypted;
-    }
-
-    public function generateKeys(array $configargs = null)
-    {
-        $config = null;
-        $passPhrase = null;
-        if (!is_null($configargs)) {
-            if (isset($configargs['passPhrase'])) {
-                $passPhrase = $configargs['passPhrase'];
-                unset($configargs['passPhrase']);
-            }
-            $config = $this->_parseConfigArgs($configargs);
-        }
-        $privateKey = null;
-        $publicKey = null;
-        $resource = openssl_pkey_new($config);
-        // above fails on PHP 5.3
-        openssl_pkey_export($resource, $private, $passPhrase);
-        $privateKey = new Zend_Crypt_Rsa_Key_Private($private, $passPhrase);
-        $details = openssl_pkey_get_details($resource);
-        $publicKey = new Zend_Crypt_Rsa_Key_Public($details['key']);
-        $return = new ArrayObject(array(
-           'privateKey'=>$privateKey,
-           'publicKey'=>$publicKey
-        ), ArrayObject::ARRAY_AS_PROPS);
-        return $return;
-    }
-
-    /**
-     * @param string $value
-     */
-    public function setPemString($value)
-    {
-        $this->_pemString = $value;
-        $this->_privateKey = new Zend_Crypt_Rsa_Key_Private($this->_pemString, $this->_passPhrase);
-        $this->_publicKey = $this->_privateKey->getPublicKey();
-    }
-
-    public function setPemPath($value)
-    {
-        $this->_pemPath = $value;
-        $this->setPemString(file_get_contents($this->_pemPath));
-    }
-
-    public function setCertificateString($value)
-    {
-        $this->_certificateString = $value;
-        $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_certificateString, $this->_passPhrase);
-    }
-
-    public function setCertificatePath($value)
-    {
-        $this->_certificatePath = $value;
-        $this->setCertificateString(file_get_contents($this->_certificatePath));
-    }
-
-    public function setHashAlgorithm($name)
-    {
-        switch ($name) {
-            case 'md2':
-                $this->_hashAlgorithm = OPENSSL_ALGO_MD2;
-                break;
-            case 'md4':
-                $this->_hashAlgorithm = OPENSSL_ALGO_MD4;
-                break;
-            case 'md5':
-                $this->_hashAlgorithm = OPENSSL_ALGO_MD5;
-                break;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getPemString()
-    {
-        return $this->_pemString;
-    }
-
-    public function getPemPath()
-    {
-        return $this->_pemPath;
-    }
-
-    public function getCertificateString()
-    {
-        return $this->_certificateString;
-    }
-
-    public function getCertificatePath()
-    {
-        return $this->_certificatePath;
-    }
-
-    public function getHashAlgorithm()
-    {
-        return $this->_hashAlgorithm;
-    }
-
-    protected function _parseConfigArgs(array $config = null)
-    {
-        $configs = array();
-        if (isset($config['privateKeyBits'])) {
-            $configs['private_key_bits'] = $config['privateKeyBits'];
-        }
-        if (!empty($configs)) {
-            return $configs;
-        }
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Rsa/Key.php b/airtime_mvc/library/Zend/Crypt/Rsa/Key.php
deleted file mode 100644
index b4176742d..000000000
--- a/airtime_mvc/library/Zend/Crypt/Rsa/Key.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Rsa
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Key.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Rsa_Key implements Countable
-{
-    /**
-     * @var string
-     */
-    protected $_pemString = null;
-
-    /**
-     * Bits, key string and type of key
-     *
-     * @var array
-     */
-    protected $_details = array();
-
-    /**
-     * Key Resource
-     *
-     * @var resource
-     */
-    protected $_opensslKeyResource = null;
-
-    /**
-     * Retrieves key resource
-     *
-     * @return resource
-     */
-    public function getOpensslKeyResource()
-    {
-        return $this->_opensslKeyResource;
-    }
-
-    /**
-     * @return string
-     * @throws Zend_Crypt_Exception
-     */
-    public function toString()
-    {
-        if (!empty($this->_pemString)) {
-            return $this->_pemString;
-        } elseif (!empty($this->_certificateString)) {
-            return $this->_certificateString;
-        }
-        /**
-         * @see Zend_Crypt_Exception
-         */
-        require_once 'Zend/Crypt/Exception.php';
-        throw new Zend_Crypt_Exception('No public key string representation is available');
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    public function count()
-    {
-        return $this->_details['bits'];
-    }
-
-    public function getType()
-    {
-        return $this->_details['type'];
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Rsa/Key/Private.php b/airtime_mvc/library/Zend/Crypt/Rsa/Key/Private.php
deleted file mode 100644
index 632f6f01e..000000000
--- a/airtime_mvc/library/Zend/Crypt/Rsa/Key/Private.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Rsa
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Private.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Rsa_Key
- */
-require_once 'Zend/Crypt/Rsa/Key.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key
-{
-
-    protected $_publicKey = null;
-
-    public function __construct($pemString, $passPhrase = null)
-    {
-        $this->_pemString = $pemString;
-        $this->_parse($passPhrase);
-    }
-
-    /**
-     * @param string $passPhrase
-     * @throws Zend_Crypt_Exception
-     */
-    protected function _parse($passPhrase)
-    {
-        $result = openssl_get_privatekey($this->_pemString, $passPhrase);
-        if (!$result) {
-            /**
-             * @see Zend_Crypt_Exception
-             */
-            require_once 'Zend/Crypt/Exception.php';
-            throw new Zend_Crypt_Exception('Unable to load private key');
-        }
-        $this->_opensslKeyResource = $result;
-        $this->_details = openssl_pkey_get_details($this->_opensslKeyResource);
-    }
-
-    public function getPublicKey()
-    {
-        if (is_null($this->_publicKey)) {
-            /**
-             * @see Zend_Crypt_Rsa_Key_Public
-             */
-            require_once 'Zend/Crypt/Rsa/Key/Public.php';
-            $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_details['key']);
-        }
-        return $this->_publicKey;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Crypt/Rsa/Key/Public.php b/airtime_mvc/library/Zend/Crypt/Rsa/Key/Public.php
deleted file mode 100644
index 567100a0e..000000000
--- a/airtime_mvc/library/Zend/Crypt/Rsa/Key/Public.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Crypt
- * @subpackage Rsa
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Public.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Crypt_Rsa_Key
- */
-require_once 'Zend/Crypt/Rsa/Key.php';
-
-/**
- * @category   Zend
- * @package    Zend_Crypt
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key
-{
-
-    protected $_certificateString = null;
-
-    public function __construct($string)
-    {
-        $this->_parse($string);
-    }
-
-    /**
-     * @param string $string
-     * @throws Zend_Crypt_Exception
-     */
-    protected function _parse($string)
-    {
-        if (preg_match("/^-----BEGIN CERTIFICATE-----/", $string)) {
-            $this->_certificateString = $string;
-        } else {
-            $this->_pemString = $string;
-        }
-        $result = openssl_get_publickey($string);
-        if (!$result) {
-            /**
-             * @see Zend_Crypt_Exception
-             */
-            require_once 'Zend/Crypt/Exception.php';
-            throw new Zend_Crypt_Exception('Unable to load public key');
-        }
-        //openssl_pkey_export($result, $public);
-        //$this->_pemString = $public;
-        $this->_opensslKeyResource = $result;
-        $this->_details = openssl_pkey_get_details($this->_opensslKeyResource);
-    }
-
-    public function getCertificate()
-    {
-        return $this->_certificateString;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Currency.php b/airtime_mvc/library/Zend/Currency.php
deleted file mode 100644
index 6906695f2..000000000
--- a/airtime_mvc/library/Zend/Currency.php
+++ /dev/null
@@ -1,890 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Currency.php 21647 2010-03-25 20:59:40Z thomas $
- */
-
-/**
- * include needed classes
- */
-require_once 'Zend/Locale.php';
-require_once 'Zend/Locale/Data.php';
-require_once 'Zend/Locale/Format.php';
-
-/**
- * Class for handling currency notations
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Currency
-{
-    // Constants for defining what currency symbol should be displayed
-    const NO_SYMBOL     = 1;
-    const USE_SYMBOL    = 2;
-    const USE_SHORTNAME = 3;
-    const USE_NAME      = 4;
-
-    // Constants for defining the position of the currencysign
-    const STANDARD = 8;
-    const RIGHT    = 16;
-    const LEFT     = 32;
-
-    /**
-     * Options array
-     *
-     * The following options are available
-     * 'position'  => Position for the currency sign
-     * 'script'    => Script for the output
-     * 'format'    => Locale for numeric output
-     * 'display'   => Currency detail to show
-     * 'precision' => Precision for the currency
-     * 'name'      => Name for this currency
-     * 'currency'  => 3 lettered international abbreviation
-     * 'symbol'    => Currency symbol
-     * 'locale'    => Locale for this currency
-     * 'value'     => Money value
-     * 'service'   => Exchange service to use
-     *
-     * @var array
-     * @see Zend_Locale
-     */
-    protected $_options = array(
-        'position'  => self::STANDARD,
-        'script'    => null,
-        'format'    => null,
-        'display'   => self::NO_SYMBOL,
-        'precision' => 2,
-        'name'      => null,
-        'currency'  => null,
-        'symbol'    => null,
-        'locale'    => null,
-        'value'     => 0,
-        'service'   => null
-    );
-
-    /**
-     * Creates a currency instance. Every supressed parameter is used from the actual or the given locale.
-     *
-     * @param  string|array       $options OPTIONAL Options array or currency short name
-     *                                              when string is given
-     * @param  string|Zend_Locale $locale  OPTIONAL locale name
-     * @throws Zend_Currency_Exception When currency is invalid
-     */
-    public function __construct($options = null, $locale = null)
-    {
-        if (is_array($options)) {
-            $this->setLocale($locale);
-            $this->setFormat($options);
-        } else if (Zend_Locale::isLocale($options, false, false)) {
-            $this->setLocale($options);
-            $options = $locale;
-        } else {
-            $this->setLocale($locale);
-        }
-
-        // Get currency details
-        if (!isset($this->_options['currency']) || !is_array($options)) {
-            $this->_options['currency'] = self::getShortName($options, $this->_options['locale']);
-        }
-
-        if (!isset($this->_options['name']) || !is_array($options)) {
-            $this->_options['name']     = self::getName($options, $this->_options['locale']);
-        }
-
-        if (!isset($this->_options['symbol']) || !is_array($options)) {
-            $this->_options['symbol']   = self::getSymbol($options, $this->_options['locale']);
-        }
-
-        if (($this->_options['currency'] === null) and ($this->_options['name'] === null)) {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception("Currency '$options' not found");
-        }
-
-        // Get the format
-        if (!empty($this->_options['symbol'])) {
-            $this->_options['display'] = self::USE_SYMBOL;
-        } else if (!empty($this->_options['currency'])) {
-            $this->_options['display'] = self::USE_SHORTNAME;
-        }
-    }
-
-    /**
-     * Returns a localized currency string
-     *
-     * @param  integer|float $value   OPTIONAL Currency value
-     * @param  array         $options OPTIONAL options to set temporary
-     * @throws Zend_Currency_Exception When the value is not a number
-     * @return string
-     */
-    public function toCurrency($value = null, array $options = array())
-    {
-        if ($value === null) {
-            if (is_array($value) && isset($options['value'])) {
-                $value = $options['value'];
-            } else {
-                $value = $this->_options['value'];
-            }
-        }
-
-        if (is_array($value)) {
-            $options += $value;
-            if (isset($options['value'])) {
-                $value = $options['value'];
-            }
-        }
-
-        // Validate the passed number
-        if (!(isset($value)) or (is_numeric($value) === false)) {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception("Value '$value' has to be numeric");
-        }
-
-        if (isset($options['currency'])) {
-            if (!isset($options['locale'])) {
-                $options['locale'] = $this->_options['locale'];
-            }
-
-            $options['currency'] = self::getShortName($options['currency'], $options['locale']);
-            $options['name']     = self::getName($options['currency'], $options['locale']);
-            $options['symbol']   = self::getSymbol($options['currency'], $options['locale']);
-        }
-
-        $options = $this->_checkOptions($options) + $this->_options;
-
-        // Format the number
-        $format = $options['format'];
-        $locale = $options['locale'];
-        if (empty($format)) {
-            $format = Zend_Locale_Data::getContent($locale, 'currencynumber');
-        } else if (Zend_Locale::isLocale($format, true, false)) {
-            $locale = $format;
-            $format = Zend_Locale_Data::getContent($format, 'currencynumber');
-        }
-
-        $original = $value;
-        $value    = Zend_Locale_Format::toNumber($value, array('locale'        => $locale,
-                                                               'number_format' => $format,
-                                                               'precision'     => $options['precision']));
-
-        if ($options['position'] !== self::STANDARD) {
-            $value = str_replace('¤', '', $value);
-            $space = '';
-            if (iconv_strpos($value, ' ') !== false) {
-                $value = str_replace(' ', '', $value);
-                $space = ' ';
-            }
-
-            if ($options['position'] == self::LEFT) {
-                $value = '¤' . $space . $value;
-            } else {
-                $value = $value . $space . '¤';
-            }
-        }
-
-        // Localize the number digits
-        if (empty($options['script']) === false) {
-            $value = Zend_Locale_Format::convertNumerals($value, 'Latn', $options['script']);
-        }
-
-        // Get the sign to be placed next to the number
-        if (is_numeric($options['display']) === false) {
-            $sign = $options['display'];
-        } else {
-            switch($options['display']) {
-                case self::USE_SYMBOL:
-                    $sign = $this->_extractPattern($options['symbol'], $original);
-                    break;
-
-                case self::USE_SHORTNAME:
-                    $sign = $options['currency'];
-                    break;
-
-                case self::USE_NAME:
-                    $sign = $options['name'];
-                    break;
-
-                default:
-                    $sign = '';
-                    $value = str_replace(' ', '', $value);
-                    break;
-            }
-        }
-
-        $value = str_replace('¤', $sign, $value);
-        return $value;
-    }
-
-    /**
-     * Internal method to extract the currency pattern
-     * when a choice is given based on the given value
-     *
-     * @param  string $pattern
-     * @param  float|integer $value
-     * @return string
-     */
-    private function _extractPattern($pattern, $value)
-    {
-        if (strpos($pattern, '|') === false) {
-            return $pattern;
-        }
-
-        $patterns = explode('|', $pattern);
-        $token    = $pattern;
-        $value    = trim(str_replace('¤', '', $value));
-        krsort($patterns);
-        foreach($patterns as $content) {
-            if (strpos($content, '<') !== false) {
-                $check = iconv_substr($content, 0, iconv_strpos($content, '<'));
-                $token = iconv_substr($content, iconv_strpos($content, '<') + 1);
-                if ($check < $value) {
-                    return $token;
-                }
-            } else {
-                $check = iconv_substr($content, 0, iconv_strpos($content, '≤'));
-                $token = iconv_substr($content, iconv_strpos($content, '≤') + 1);
-                if ($check <= $value) {
-                    return $token;
-                }
-            }
-
-        }
-
-        return $token;
-    }
-
-    /**
-     * Sets the formating options of the localized currency string
-     * If no parameter is passed, the standard setting of the
-     * actual set locale will be used
-     *
-     * @param  array $options (Optional) Options to set
-     * @return Zend_Currency
-     */
-    public function setFormat(array $options = array())
-    {
-        $this->_options = $this->_checkOptions($options) + $this->_options;
-        return $this;
-    }
-
-    /**
-     * Internal function for checking static given locale parameter
-     *
-     * @param  string             $currency (Optional) Currency name
-     * @param  string|Zend_Locale $locale   (Optional) Locale to display informations
-     * @throws Zend_Currency_Exception When locale contains no region
-     * @return string The extracted locale representation as string
-     */
-    private function _checkParams($currency = null, $locale = null)
-    {
-        // Manage the params
-        if ((empty($locale)) and (!empty($currency)) and
-            (Zend_Locale::isLocale($currency, true, false))) {
-            $locale   = $currency;
-            $currency = null;
-        }
-
-        // Validate the locale and get the country short name
-        $country = null;
-        if ((Zend_Locale::isLocale($locale, true, false)) and (strlen($locale) > 4)) {
-            $country = substr($locale, (strpos($locale, '_') + 1));
-        } else {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'");
-        }
-
-        // Get the available currencies for this country
-        $data = Zend_Locale_Data::getContent($locale, 'currencytoregion', $country);
-        if ((empty($currency) === false) and (empty($data) === false)) {
-            $abbreviation = $currency;
-        } else {
-            $abbreviation = $data;
-        }
-
-        return array('locale' => $locale, 'currency' => $currency, 'name' => $abbreviation, 'country' => $country);
-    }
-
-    /**
-     * Returns the actual or details of other currency symbols,
-     * when no symbol is available it returns the currency shortname (f.e. FIM for Finnian Mark)
-     *
-     * @param  string             $currency (Optional) Currency name
-     * @param  string|Zend_Locale $locale   (Optional) Locale to display informations
-     * @return string
-     */
-    public function getSymbol($currency = null, $locale = null)
-    {
-        if (($currency === null) and ($locale === null)) {
-            return $this->_options['symbol'];
-        }
-
-        $params = self::_checkParams($currency, $locale);
-
-        // Get the symbol
-        $symbol = Zend_Locale_Data::getContent($params['locale'], 'currencysymbol', $params['currency']);
-        if (empty($symbol) === true) {
-            $symbol = Zend_Locale_Data::getContent($params['locale'], 'currencysymbol', $params['name']);
-        }
-
-        if (empty($symbol) === true) {
-            return null;
-        }
-
-        return $symbol;
-    }
-
-    /**
-     * Returns the actual or details of other currency shortnames
-     *
-     * @param  string             $currency OPTIONAL Currency's name
-     * @param  string|Zend_Locale $locale   OPTIONAL The locale
-     * @return string
-     */
-    public function getShortName($currency = null, $locale = null)
-    {
-        if (($currency === null) and ($locale === null)) {
-            return $this->_options['currency'];
-        }
-
-        $params = self::_checkParams($currency, $locale);
-
-        // Get the shortname
-        if (empty($params['currency']) === true) {
-            return $params['name'];
-        }
-
-        $list = Zend_Locale_Data::getContent($params['locale'], 'currencytoname', $params['currency']);
-        if (empty($list) === true) {
-            $list = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['currency']);
-            if (empty($list) === false) {
-                $list = $params['currency'];
-            }
-        }
-
-        if (empty($list) === true) {
-            return null;
-        }
-
-        return $list;
-    }
-
-    /**
-     * Returns the actual or details of other currency names
-     *
-     * @param  string             $currency (Optional) Currency's short name
-     * @param  string|Zend_Locale $locale   (Optional) The locale
-     * @return string
-     */
-    public function getName($currency = null, $locale = null)
-    {
-        if (($currency === null) and ($locale === null)) {
-            return $this->_options['name'];
-        }
-
-        $params = self::_checkParams($currency, $locale);
-
-        // Get the name
-        $name = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['currency']);
-        if (empty($name) === true) {
-            $name = Zend_Locale_Data::getContent($params['locale'], 'nametocurrency', $params['name']);
-        }
-
-        if (empty($name) === true) {
-            return null;
-        }
-
-        return $name;
-    }
-
-    /**
-     * Returns a list of regions where this currency is or was known
-     *
-     * @param  string $currency OPTIONAL Currency's short name
-     * @throws Zend_Currency_Exception When no currency was defined
-     * @return array List of regions
-     */
-    public function getRegionList($currency = null)
-    {
-        if ($currency === null) {
-            $currency = $this->_options['currency'];
-        }
-
-        if (empty($currency) === true) {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception('No currency defined');
-        }
-
-        $data = Zend_Locale_Data::getContent('', 'regiontocurrency', $currency);
-
-        $result = explode(' ', $data);
-        return $result;
-    }
-
-    /**
-     * Returns a list of currencies which are used in this region
-     * a region name should be 2 charachters only (f.e. EG, DE, US)
-     * If no region is given, the actual region is used
-     *
-     * @param  string $region OPTIONAL Region to return the currencies for
-     * @return array List of currencies
-     */
-    public function getCurrencyList($region = null)
-    {
-        if (empty($region) === true) {
-            if (strlen($this->_options['locale']) > 4) {
-                $region = substr($this->_options['locale'], (strpos($this->_options['locale'], '_') + 1));
-            }
-        }
-
-        return Zend_Locale_Data::getList('', 'regiontocurrency', $region);
-    }
-
-    /**
-     * Returns the actual currency name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->toCurrency();
-    }
-
-    /**
-     * Returns the currency name
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        $cache = Zend_Locale_Data::getCache();
-        return $cache;
-    }
-
-    /**
-     * Sets a cache for Zend_Currency
-     *
-     * @param  Zend_Cache_Core $cache Cache to set
-     * @return void
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        Zend_Locale_Data::setCache($cache);
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        return Zend_Locale_Data::hasCache();
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        Zend_Locale_Data::removeCache();
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        Zend_Locale_Data::clearCache();
-    }
-
-    /**
-     * Sets a new locale for data retreivement
-     * Example: 'de_XX' will be set to 'de' because 'de_XX' does not exist
-     * 'xx_YY' will be set to 'root' because 'xx' does not exist
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
-     * @throws Zend_Currency_Exception When the given locale does not exist
-     * @return Zend_Currency Provides fluent interface
-     */
-    public function setLocale($locale = null)
-    {
-        require_once 'Zend/Locale.php';
-        try {
-            $locale = Zend_Locale::findLocale($locale);
-            if (strlen($locale) > 4) {
-                $this->_options['locale'] = $locale;
-            } else {
-                require_once 'Zend/Currency/Exception.php';
-                throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'");
-            }
-        } catch (Zend_Locale_Exception $e) {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception($e->getMessage());
-        }
-
-        // Get currency details
-        $this->_options['currency'] = $this->getShortName(null, $this->_options['locale']);
-        $this->_options['name']     = $this->getName(null, $this->_options['locale']);
-        $this->_options['symbol']   = $this->getSymbol(null, $this->_options['locale']);
-
-        return $this;
-    }
-
-    /**
-     * Returns the actual set locale
-     *
-     * @return string
-     */
-    public function getLocale()
-    {
-        return $this->_options['locale'];
-    }
-
-    /**
-     * Returns the value
-     *
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->_options['value'];
-    }
-
-    /**
-     * Adds a currency
-     *
-     * @param float|integer|Zend_Currency $value    Add this value to currency
-     * @param string|Zend_Currency        $currency The currency to add
-     * @return Zend_Currency
-     */
-    public function setValue($value, $currency = null)
-    {
-        $this->_options['value'] = $this->_exchangeCurrency($value, $currency);
-        return $this;
-    }
-
-    /**
-     * Adds a currency
-     *
-     * @param float|integer|Zend_Currency $value    Add this value to currency
-     * @param string|Zend_Currency        $currency The currency to add
-     * @return Zend_Currency
-     */
-    public function add($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $this->_options['value'] += (float) $value;
-        return $this;
-    }
-
-    /**
-     * Substracts a currency
-     *
-     * @param float|integer|Zend_Currency $value    Substracts this value from currency
-     * @param string|Zend_Currency        $currency The currency to substract
-     * @return Zend_Currency
-     */
-    public function sub($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $this->_options['value'] -= (float) $value;
-        return $this;
-    }
-
-    /**
-     * Divides a currency
-     *
-     * @param float|integer|Zend_Currency $value    Divides this value from currency
-     * @param string|Zend_Currency        $currency The currency to divide
-     * @return Zend_Currency
-     */
-    public function div($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $this->_options['value'] /= (float) $value;
-        return $this;
-    }
-
-    /**
-     * Multiplies a currency
-     *
-     * @param float|integer|Zend_Currency $value    Multiplies this value from currency
-     * @param string|Zend_Currency        $currency The currency to multiply
-     * @return Zend_Currency
-     */
-    public function mul($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $this->_options['value'] *= (float) $value;
-        return $this;
-    }
-
-    /**
-     * Calculates the modulo from a currency
-     *
-     * @param float|integer|Zend_Currency $value    Calculate modulo from this value
-     * @param string|Zend_Currency        $currency The currency to calculate the modulo
-     * @return Zend_Currency
-     */
-    public function mod($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $this->_options['value'] %= (float) $value;
-        return $this;
-    }
-
-    /**
-     * Compares two currencies
-     *
-     * @param float|integer|Zend_Currency $value    Compares the currency with this value
-     * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return Zend_Currency
-     */
-    public function compare($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        $value = $this->_options['value'] - $value;
-        if ($value < 0) {
-            return -1;
-        } else if ($value > 0) {
-            return 1;
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns true when the two currencies are equal
-     *
-     * @param float|integer|Zend_Currency $value    Compares the currency with this value
-     * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return boolean
-     */
-    public function equals($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        if ($this->_options['value'] == $value) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true when the currency is more than the given value
-     *
-     * @param float|integer|Zend_Currency $value    Compares the currency with this value
-     * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return boolean
-     */
-    public function isMore($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        if ($this->_options['value'] > $value) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true when the currency is less than the given value
-     *
-     * @param float|integer|Zend_Currency $value    Compares the currency with this value
-     * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return boolean
-     */
-    public function isLess($value, $currency = null)
-    {
-        $value = $this->_exchangeCurrency($value, $currency);
-        if ($this->_options['value'] < $value) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Internal method which calculates the exchanges currency
-     *
-     * @param float|integer|Zend_Currency $value    Compares the currency with this value
-     * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return unknown
-     */
-    protected function _exchangeCurrency($value, $currency)
-    {
-        if ($value instanceof Zend_Currency) {
-            $currency = $value->getShortName();
-            $value    = $value->getValue();
-        } else {
-            $currency = $this->getShortName($currency, $this->getLocale());
-        }
-
-        $rate = 1;
-        if ($currency !== $this->getShortName()) {
-            $service = $this->getService();
-            if (!($service instanceof Zend_Currency_CurrencyInterface)) {
-                require_once 'Zend/Currency/Exception.php';
-                throw new Zend_Currency_Exception('No exchange service applied');
-            }
-
-            $rate = $service->getRate($currency, $this->getShortName());
-        }
-
-        $value *= $rate;
-        return $value;
-    }
-
-    /**
-     * Returns the set service class
-     *
-     * @return Zend_Service
-     */
-    public function getService()
-    {
-        return $this->_options['service'];
-    }
-
-    /**
-     * Sets a new exchange service
-     *
-     * @param string|Zend_Currency_CurrencyInterface $service Service class
-     * @return Zend_Currency
-     */
-    public function setService($service)
-    {
-        if (is_string($service)) {
-            require_once 'Zend/Loader.php';
-            if (!class_exists($service)) {
-                $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php';
-                if (Zend_Loader::isReadable($file)) {
-                    Zend_Loader::loadClass($class);
-                }
-            }
-
-            $service = new $service;
-        }
-
-        if (!($service instanceof Zend_Currency_CurrencyInterface)) {
-            require_once 'Zend/Currency/Exception.php';
-            throw new Zend_Currency_Exception('A currency service must implement Zend_Currency_CurrencyInterface');
-        }
-
-        $this->_options['service'] = $service;
-        return $this;
-    }
-
-    /**
-     * Internal method for checking the options array
-     *
-     * @param  array $options Options to check
-     * @throws Zend_Currency_Exception On unknown position
-     * @throws Zend_Currency_Exception On unknown locale
-     * @throws Zend_Currency_Exception On unknown display
-     * @throws Zend_Currency_Exception On precision not between -1 and 30
-     * @throws Zend_Currency_Exception On problem with script conversion
-     * @throws Zend_Currency_Exception On unknown options
-     * @return array
-     */
-    protected function _checkOptions(array $options = array())
-    {
-        if (count($options) === 0) {
-            return $this->_options;
-        }
-
-        foreach ($options as $name => $value) {
-            $name = strtolower($name);
-            if ($name !== 'format') {
-                if (gettype($value) === 'string') {
-                    $value = strtolower($value);
-                }
-            }
-
-            switch($name) {
-                case 'position':
-                    if (($value !== self::STANDARD) and ($value !== self::RIGHT) and ($value !== self::LEFT)) {
-                        require_once 'Zend/Currency/Exception.php';
-                        throw new Zend_Currency_Exception("Unknown position '" . $value . "'");
-                    }
-
-                    break;
-
-                case 'format':
-                    if ((empty($value) === false) and (Zend_Locale::isLocale($value, null, false) === false)) {
-                        if (!is_string($value) || (strpos($value, '0') === false)) {
-                            require_once 'Zend/Currency/Exception.php';
-                            throw new Zend_Currency_Exception("'" .
-                                ((gettype($value) === 'object') ? get_class($value) : $value)
-                                . "' is no format token");
-                        }
-                    }
-                    break;
-
-                case 'display':
-                    if (is_numeric($value) and ($value !== self::NO_SYMBOL) and ($value !== self::USE_SYMBOL) and
-                        ($value !== self::USE_SHORTNAME) and ($value !== self::USE_NAME)) {
-                        require_once 'Zend/Currency/Exception.php';
-                        throw new Zend_Currency_Exception("Unknown display '$value'");
-                    }
-                    break;
-
-                case 'precision':
-                    if ($value === null) {
-                        $value = -1;
-                    }
-
-                    if (($value < -1) or ($value > 30)) {
-                        require_once 'Zend/Currency/Exception.php';
-                        throw new Zend_Currency_Exception("'$value' precision has to be between -1 and 30.");
-                    }
-                    break;
-
-                case 'script':
-                    try {
-                        Zend_Locale_Format::convertNumerals(0, $options['script']);
-                    } catch (Zend_Locale_Exception $e) {
-                        require_once 'Zend/Currency/Exception.php';
-                        throw new Zend_Currency_Exception($e->getMessage());
-                    }
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Currency/CurrencyInterface.php b/airtime_mvc/library/Zend/Currency/CurrencyInterface.php
deleted file mode 100644
index a331f7c4b..000000000
--- a/airtime_mvc/library/Zend/Currency/CurrencyInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 16971 2009-07-22 18:05:45Z mikaelkael $
- */
-
-/**
- * Exception class for Zend_Currency
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Currency_CurrencyInterface
-{
-    /**
-     * Returns the actual exchange rate
-     *
-     * @param string $from Short Name of the base currency
-     * @param string $to   Short Name of the currency to exchange to
-     */
-    public function getRate($from, $to);
-}
diff --git a/airtime_mvc/library/Zend/Currency/Exception.php b/airtime_mvc/library/Zend/Currency/Exception.php
deleted file mode 100644
index 35c52bcbb..000000000
--- a/airtime_mvc/library/Zend/Currency/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Currency
- *
- * @category  Zend
- * @package   Zend_Currency
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Currency_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Date.php b/airtime_mvc/library/Zend/Date.php
deleted file mode 100644
index 8776912cd..000000000
--- a/airtime_mvc/library/Zend/Date.php
+++ /dev/null
@@ -1,4950 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Date.php 21282 2010-03-01 21:40:19Z thomas $
- */
-
-/**
- * Include needed Date classes
- */
-require_once 'Zend/Date/DateObject.php';
-require_once 'Zend/Locale.php';
-require_once 'Zend/Locale/Format.php';
-require_once 'Zend/Locale/Math.php';
-
-/**
- * @category  Zend
- * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Date extends Zend_Date_DateObject
-{
-    private $_locale  = null;
-
-    // Fractional second variables
-    private $_fractional = 0;
-    private $_precision  = 3;
-
-    private static $_options = array(
-        'format_type'  => 'iso',      // format for date strings 'iso' or 'php'
-        'fix_dst'      => true,       // fix dst on summer/winter time change
-        'extend_month' => false,      // false - addMonth like SQL, true like excel
-        'cache'        => null,       // cache to set
-        'timesync'     => null        // timesync server to set
-    );
-
-    // Class wide Date Constants
-    const DAY               = 'dd';
-    const DAY_SHORT         = 'd';
-    const DAY_SUFFIX        = 'SS';
-    const DAY_OF_YEAR       = 'D';
-    const WEEKDAY           = 'EEEE';
-    const WEEKDAY_SHORT     = 'EEE';
-    const WEEKDAY_NARROW    = 'E';
-    const WEEKDAY_NAME      = 'EE';
-    const WEEKDAY_8601      = 'eee';
-    const WEEKDAY_DIGIT     = 'e';
-    const WEEK              = 'ww';
-    const MONTH             = 'MM';
-    const MONTH_SHORT       = 'M';
-    const MONTH_DAYS        = 'ddd';
-    const MONTH_NAME        = 'MMMM';
-    const MONTH_NAME_SHORT  = 'MMM';
-    const MONTH_NAME_NARROW = 'MMMMM';
-    const YEAR              = 'y';
-    const YEAR_SHORT        = 'yy';
-    const YEAR_8601         = 'Y';
-    const YEAR_SHORT_8601   = 'YY';
-    const LEAPYEAR          = 'l';
-    const MERIDIEM          = 'a';
-    const SWATCH            = 'B';
-    const HOUR              = 'HH';
-    const HOUR_SHORT        = 'H';
-    const HOUR_AM           = 'hh';
-    const HOUR_SHORT_AM     = 'h';
-    const MINUTE            = 'mm';
-    const MINUTE_SHORT      = 'm';
-    const SECOND            = 'ss';
-    const SECOND_SHORT      = 's';
-    const MILLISECOND       = 'S';
-    const TIMEZONE_NAME     = 'zzzz';
-    const DAYLIGHT          = 'I';
-    const GMT_DIFF          = 'Z';
-    const GMT_DIFF_SEP      = 'ZZZZ';
-    const TIMEZONE          = 'z';
-    const TIMEZONE_SECS     = 'X';
-    const ISO_8601          = 'c';
-    const RFC_2822          = 'r';
-    const TIMESTAMP         = 'U';
-    const ERA               = 'G';
-    const ERA_NAME          = 'GGGG';
-    const ERA_NARROW        = 'GGGGG';
-    const DATES             = 'F';
-    const DATE_FULL         = 'FFFFF';
-    const DATE_LONG         = 'FFFF';
-    const DATE_MEDIUM       = 'FFF';
-    const DATE_SHORT        = 'FF';
-    const TIMES             = 'WW';
-    const TIME_FULL         = 'TTTTT';
-    const TIME_LONG         = 'TTTT';
-    const TIME_MEDIUM       = 'TTT';
-    const TIME_SHORT        = 'TT';
-    const DATETIME          = 'K';
-    const DATETIME_FULL     = 'KKKKK';
-    const DATETIME_LONG     = 'KKKK';
-    const DATETIME_MEDIUM   = 'KKK';
-    const DATETIME_SHORT    = 'KK';
-    const ATOM              = 'OOO';
-    const COOKIE            = 'CCC';
-    const RFC_822           = 'R';
-    const RFC_850           = 'RR';
-    const RFC_1036          = 'RRR';
-    const RFC_1123          = 'RRRR';
-    const RFC_3339          = 'RRRRR';
-    const RSS               = 'SSS';
-    const W3C               = 'WWW';
-
-    /**
-     * Generates the standard date object, could be a unix timestamp, localized date,
-     * string, integer, array and so on. Also parts of dates or time are supported
-     * Always set the default timezone: http://php.net/date_default_timezone_set
-     * For example, in your bootstrap: date_default_timezone_set('America/Los_Angeles');
-     * For detailed instructions please look in the docu.
-     *
-     * @param  string|integer|Zend_Date|array  $date    OPTIONAL Date value or value of date part to set
-     *                                                 ,depending on $part. If null the actual time is set
-     * @param  string                          $part    OPTIONAL Defines the input format of $date
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     * @throws Zend_Date_Exception
-     */
-    public function __construct($date = null, $part = null, $locale = null)
-    {
-        if (is_object($date) and !($date instanceof Zend_TimeSync_Protocol) and
-            !($date instanceof Zend_Date)) {
-            if ($locale instanceof Zend_Locale) {
-                $locale = $date;
-                $date   = null;
-                $part   = null;
-            } else {
-                $date = (string) $date;
-            }
-        }
-
-        if (($date !== null) and !is_array($date) and !($date instanceof Zend_TimeSync_Protocol) and
-            !($date instanceof Zend_Date) and !defined($date) and Zend_Locale::isLocale($date, true, false)) {
-            $locale = $date;
-            $date   = null;
-            $part   = null;
-        } else if (($part !== null) and !defined($part) and Zend_Locale::isLocale($part, true, false)) {
-            $locale = $part;
-            $part   = null;
-        }
-
-        $this->setLocale($locale);
-        if (is_string($date) && ($part === null) && (strlen($date) <= 5)) {
-            $part = $date;
-            $date = null;
-        }
-
-        if ($date === null) {
-            if ($part === null) {
-                $date = time();
-            } else if ($part !== self::TIMESTAMP) {
-                $date = self::now($locale);
-                $date = $date->get($part);
-            }
-        }
-
-        if ($date instanceof Zend_TimeSync_Protocol) {
-            $date = $date->getInfo();
-            $date = $this->_getTime($date['offset']);
-            $part = null;
-        } else if (parent::$_defaultOffset != 0) {
-            $date = $this->_getTime(parent::$_defaultOffset);
-        }
-
-        // set the timezone and offset for $this
-        $zone = @date_default_timezone_get();
-        $this->setTimezone($zone);
-
-        // try to get timezone from date-string
-        if (!is_int($date)) {
-            $zone = $this->getTimezoneFromString($date);
-            $this->setTimezone($zone);
-        }
-
-        // set datepart
-        if (($part !== null && $part !== self::TIMESTAMP) or (!is_numeric($date))) {
-            // switch off dst handling for value setting
-            $this->setUnixTimestamp($this->getGmtOffset());
-            $this->set($date, $part, $this->_locale);
-
-            // DST fix
-            if (is_array($date) === true) {
-                if (!isset($date['hour'])) {
-                    $date['hour'] = 0;
-                }
-
-                $hour = $this->toString('H', 'iso', true);
-                $hour = $date['hour'] - $hour;
-                switch ($hour) {
-                    case 1 :
-                    case -23 :
-                        $this->addTimestamp(3600);
-                        break;
-                    case -1 :
-                    case 23 :
-                        $this->subTimestamp(3600);
-                        break;
-                    case 2 :
-                    case -22 :
-                        $this->addTimestamp(7200);
-                        break;
-                    case -2 :
-                    case 22 :
-                        $this->subTimestamp(7200);
-                        break;
-                }
-            }
-        } else {
-            $this->setUnixTimestamp($date);
-        }
-    }
-
-    /**
-     * Sets class wide options, if no option was given, the actual set options will be returned
-     *
-     * @param  array  $options  Options to set
-     * @throws Zend_Date_Exception
-     * @return Options array if no option was given
-     */
-    public static function setOptions(array $options = array())
-    {
-        if (empty($options)) {
-            return self::$_options;
-        }
-
-        foreach ($options as $name => $value) {
-            $name  = strtolower($name);
-
-            if (array_key_exists($name, self::$_options)) {
-                switch($name) {
-                    case 'format_type' :
-                        if ((strtolower($value) != 'php') && (strtolower($value) != 'iso')) {
-                            require_once 'Zend/Date/Exception.php';
-                            throw new Zend_Date_Exception("Unknown format type ($value) for dates, only 'iso' and 'php' supported", 0, null, $value);
-                        }
-                        break;
-                    case 'fix_dst' :
-                        if (!is_bool($value)) {
-                            require_once 'Zend/Date/Exception.php';
-                            throw new Zend_Date_Exception("'fix_dst' has to be boolean", 0, null, $value);
-                        }
-                        break;
-                    case 'extend_month' :
-                        if (!is_bool($value)) {
-                            require_once 'Zend/Date/Exception.php';
-                            throw new Zend_Date_Exception("'extend_month' has to be boolean", 0, null, $value);
-                        }
-                        break;
-                    case 'cache' :
-                        if ($value === null) {
-                            parent::$_cache = null;
-                        } else {
-                            if (!$value instanceof Zend_Cache_Core) {
-                                require_once 'Zend/Date/Exception.php';
-                                throw new Zend_Date_Exception("Instance of Zend_Cache expected");
-                            }
-
-                            parent::$_cache = $value;
-                            Zend_Locale_Data::setCache($value);
-                        }
-                        break;
-                    case 'timesync' :
-                        if ($value === null) {
-                            parent::$_defaultOffset = 0;
-                        } else {
-                            if (!$value instanceof Zend_TimeSync_Protocol) {
-                                require_once 'Zend/Date/Exception.php';
-                                throw new Zend_Date_Exception("Instance of Zend_TimeSync expected");
-                            }
-
-                            $date = $value->getInfo();
-                            parent::$_defaultOffset = $date['offset'];
-                        }
-                        break;
-                }
-                self::$_options[$name] = $value;
-            }
-            else {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("Unknown option: $name = $value");
-            }
-        }
-    }
-
-    /**
-     * Returns this object's internal UNIX timestamp (equivalent to Zend_Date::TIMESTAMP).
-     * If the timestamp is too large for integers, then the return value will be a string.
-     * This function does not return the timestamp as an object.
-     * Use clone() or copyPart() instead.
-     *
-     * @return integer|string  UNIX timestamp
-     */
-    public function getTimestamp()
-    {
-        return $this->getUnixTimestamp();
-    }
-
-    /**
-     * Returns the calculated timestamp
-     * HINT: timestamps are always GMT
-     *
-     * @param  string                          $calc    Type of calculation to make
-     * @param  string|integer|array|Zend_Date  $stamp   Timestamp to calculate, when null the actual timestamp is calculated
-     * @return Zend_Date|integer
-     * @throws Zend_Date_Exception
-     */
-    private function _timestamp($calc, $stamp)
-    {
-        if ($stamp instanceof Zend_Date) {
-            // extract timestamp from object
-            $stamp = $stamp->getTimestamp();
-        }
-
-        if (is_array($stamp)) {
-            if (isset($stamp['timestamp']) === true) {
-                $stamp = $stamp['timestamp'];
-            } else {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('no timestamp given in array');
-            }
-        }
-
-        if ($calc === 'set') {
-            $return = $this->setUnixTimestamp($stamp);
-        } else {
-            $return = $this->_calcdetail($calc, $stamp, self::TIMESTAMP, null);
-        }
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-    /**
-     * Sets a new timestamp
-     *
-     * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to set
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setTimestamp($timestamp)
-    {
-        return $this->_timestamp('set', $timestamp);
-    }
-
-    /**
-     * Adds a timestamp
-     *
-     * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to add
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addTimestamp($timestamp)
-    {
-        return $this->_timestamp('add', $timestamp);
-    }
-
-    /**
-     * Subtracts a timestamp
-     *
-     * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to sub
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subTimestamp($timestamp)
-    {
-        return $this->_timestamp('sub', $timestamp);
-    }
-
-    /**
-     * Compares two timestamps, returning the difference as integer
-     *
-     * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to compare
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareTimestamp($timestamp)
-    {
-        return $this->_timestamp('cmp', $timestamp);
-    }
-
-    /**
-     * Returns a string representation of the object
-     * Supported format tokens are:
-     * G - era, y - year, Y - ISO year, M - month, w - week of year, D - day of year, d - day of month
-     * E - day of week, e - number of weekday (1-7), h - hour 1-12, H - hour 0-23, m - minute, s - second
-     * A - milliseconds of day, z - timezone, Z - timezone offset, S - fractional second, a - period of day
-     *
-     * Additionally format tokens but non ISO conform are:
-     * SS - day suffix, eee - php number of weekday(0-6), ddd - number of days per month
-     * l - Leap year, B - swatch internet time, I - daylight saving time, X - timezone offset in seconds
-     * r - RFC2822 format, U - unix timestamp
-     *
-     * Not supported ISO tokens are
-     * u - extended year, Q - quarter, q - quarter, L - stand alone month, W - week of month
-     * F - day of week of month, g - modified julian, c - stand alone weekday, k - hour 0-11, K - hour 1-24
-     * v - wall zone
-     *
-     * @param  string              $format  OPTIONAL Rule for formatting output. If null the default date format is used
-     * @param  string              $type    OPTIONAL Type for the format string which overrides the standard setting
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return string
-     */
-    public function toString($format = null, $type = null, $locale = null)
-    {
-        if (is_object($format)) {
-            if ($format instanceof Zend_Locale) {
-                $locale = $format;
-                $format = null;
-            } else {
-                $format = (string) $format;
-            }
-        }
-
-        if (is_object($type)) {
-            if ($type instanceof Zend_Locale) {
-                $locale = $type;
-                $type   = null;
-            } else {
-                $type = (string) $type;
-            }
-        }
-
-        if (($format !== null) and !defined($format) and
-            ($format != 'ee') and ($format != 'ss') and Zend_Locale::isLocale($format, null, false)) {
-            $locale = $format;
-            $format = null;
-        }
-
-        if (($type !== null) and ($type != 'php') and ($type != 'iso') and
-            Zend_Locale::isLocale($type, null, false)) {
-            $locale = $type;
-            $type = null;
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if ($format === null) {
-            $format = Zend_Locale_Format::getDateFormat($locale) . ' ' . Zend_Locale_Format::getTimeFormat($locale);
-        } else if (((self::$_options['format_type'] == 'php') && ($type === null)) or ($type == 'php')) {
-            $format = Zend_Locale_Format::convertPhpToIsoFormat($format);
-        }
-
-        return $this->date($this->_toToken($format, $locale), $this->getUnixTimestamp(), false);
-    }
-
-    /**
-     * Returns a string representation of the date which is equal with the timestamp
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString(null, $this->_locale);
-    }
-
-    /**
-     * Returns a integer representation of the object
-     * But returns false when the given part is no value f.e. Month-Name
-     *
-     * @param  string|integer|Zend_Date  $part  OPTIONAL Defines the date or datepart to return as integer
-     * @return integer|false
-     */
-    public function toValue($part = null)
-    {
-        $result = $this->get($part);
-        if (is_numeric($result)) {
-          return intval("$result");
-        } else {
-          return false;
-        }
-    }
-
-    /**
-     * Returns an array representation of the object
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return array('day'       => $this->toString(self::DAY_SHORT, 'iso'),
-                     'month'     => $this->toString(self::MONTH_SHORT, 'iso'),
-                     'year'      => $this->toString(self::YEAR, 'iso'),
-                     'hour'      => $this->toString(self::HOUR_SHORT, 'iso'),
-                     'minute'    => $this->toString(self::MINUTE_SHORT, 'iso'),
-                     'second'    => $this->toString(self::SECOND_SHORT, 'iso'),
-                     'timezone'  => $this->toString(self::TIMEZONE, 'iso'),
-                     'timestamp' => $this->toString(self::TIMESTAMP, 'iso'),
-                     'weekday'   => $this->toString(self::WEEKDAY_8601, 'iso'),
-                     'dayofyear' => $this->toString(self::DAY_OF_YEAR, 'iso'),
-                     'week'      => $this->toString(self::WEEK, 'iso'),
-                     'gmtsecs'   => $this->toString(self::TIMEZONE_SECS, 'iso'));
-    }
-
-    /**
-     * Returns a representation of a date or datepart
-     * This could be for example a localized monthname, the time without date,
-     * the era or only the fractional seconds. There are about 50 different supported date parts.
-     * For a complete list of supported datepart values look into the docu
-     *
-     * @param  string              $part    OPTIONAL Part of the date to return, if null the timestamp is returned
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return string  date or datepart
-     */
-    public function get($part = null, $locale = null)
-    {
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if (($part !== null) and !defined($part) and
-            ($part != 'ee') and ($part != 'ss') and Zend_Locale::isLocale($part, null, false)) {
-            $locale = $part;
-            $part = null;
-        }
-
-        if ($part === null) {
-            $part = self::TIMESTAMP;
-        } else if (self::$_options['format_type'] == 'php') {
-            $part = Zend_Locale_Format::convertPhpToIsoFormat($part);
-        }
-
-        return $this->date($this->_toToken($part, $locale), $this->getUnixTimestamp(), false);
-    }
-
-    /**
-     * Internal method to apply tokens
-     *
-     * @param string $part
-     * @param string $locale
-     * @return string
-     */
-    private function _toToken($part, $locale) {
-        // get format tokens
-        $comment = false;
-        $format  = '';
-        $orig    = '';
-        for ($i = 0; $i < strlen($part); ++$i) {
-            if ($part[$i] == "'") {
-                $comment = $comment ? false : true;
-                if (isset($part[$i+1]) && ($part[$i+1] == "'")) {
-                    $comment = $comment ? false : true;
-                    $format .= "\\'";
-                    ++$i;
-                }
-
-                $orig = '';
-                continue;
-            }
-
-            if ($comment) {
-                $format .= '\\' . $part[$i];
-                $orig = '';
-            } else {
-                $orig .= $part[$i];
-                if (!isset($part[$i+1]) || (isset($orig[0]) && ($orig[0] != $part[$i+1]))) {
-                    $format .= $this->_parseIsoToDate($orig, $locale);
-                    $orig  = '';
-                }
-            }
-        }
-
-        return $format;
-    }
-
-    /**
-     * Internal parsing method
-     *
-     * @param string $token
-     * @param string $locale
-     * @return string
-     */
-    private function _parseIsoToDate($token, $locale) {
-        switch($token) {
-            case self::DAY :
-                return 'd';
-                break;
-
-            case self::WEEKDAY_SHORT :
-                $weekday = strtolower($this->date('D', $this->getUnixTimestamp(), false));
-                $day     = Zend_Locale_Data::getContent($locale, 'day', array('gregorian', 'format', 'wide', $weekday));
-                return $this->_toComment(iconv_substr($day, 0, 3, 'UTF-8'));
-                break;
-
-            case self::DAY_SHORT :
-                return 'j';
-                break;
-
-            case self::WEEKDAY :
-                $weekday = strtolower($this->date('D', $this->getUnixTimestamp(), false));
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'day', array('gregorian', 'format', 'wide', $weekday)));
-                break;
-
-            case self::WEEKDAY_8601 :
-                return 'N';
-                break;
-
-            case 'ee' :
-                return $this->_toComment(str_pad($this->date('N', $this->getUnixTimestamp(), false), 2, '0', STR_PAD_LEFT));
-                break;
-
-            case self::DAY_SUFFIX :
-                return 'S';
-                break;
-
-            case self::WEEKDAY_DIGIT :
-                return 'w';
-                break;
-
-            case self::DAY_OF_YEAR :
-                return 'z';
-                break;
-
-            case 'DDD' :
-                return $this->_toComment(str_pad($this->date('z', $this->getUnixTimestamp(), false), 3, '0', STR_PAD_LEFT));
-                break;
-
-            case 'DD' :
-                return $this->_toComment(str_pad($this->date('z', $this->getUnixTimestamp(), false), 2, '0', STR_PAD_LEFT));
-                break;
-
-            case self::WEEKDAY_NARROW :
-            case 'EEEEE' :
-                $weekday = strtolower($this->date('D', $this->getUnixTimestamp(), false));
-                $day = Zend_Locale_Data::getContent($locale, 'day', array('gregorian', 'format', 'abbreviated', $weekday));
-                return $this->_toComment(iconv_substr($day, 0, 1, 'UTF-8'));
-                break;
-
-            case self::WEEKDAY_NAME :
-                $weekday = strtolower($this->date('D', $this->getUnixTimestamp(), false));
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'day', array('gregorian', 'format', 'abbreviated', $weekday)));
-                break;
-
-            case 'w' :
-                $week = $this->date('W', $this->getUnixTimestamp(), false);
-                return $this->_toComment(($week[0] == '0') ? $week[1] : $week);
-                break;
-
-            case self::WEEK :
-                return 'W';
-                break;
-
-            case self::MONTH_NAME :
-                $month = $this->date('n', $this->getUnixTimestamp(), false);
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'month', array('gregorian', 'format', 'wide', $month)));
-                break;
-
-            case self::MONTH :
-                return 'm';
-                break;
-
-            case self::MONTH_NAME_SHORT :
-                $month = $this->date('n', $this->getUnixTimestamp(), false);
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'month', array('gregorian', 'format', 'abbreviated', $month)));
-                break;
-
-            case self::MONTH_SHORT :
-                return 'n';
-                break;
-
-            case self::MONTH_DAYS :
-                return 't';
-                break;
-
-            case self::MONTH_NAME_NARROW :
-                $month = $this->date('n', $this->getUnixTimestamp(), false);
-                $mon = Zend_Locale_Data::getContent($locale, 'month', array('gregorian', 'format', 'abbreviated', $month));
-                return $this->_toComment(iconv_substr($mon, 0, 1, 'UTF-8'));
-                break;
-
-            case self::LEAPYEAR :
-                return 'L';
-                break;
-
-            case self::YEAR_8601 :
-                return 'o';
-                break;
-
-            case self::YEAR :
-                return 'Y';
-                break;
-
-            case self::YEAR_SHORT :
-                return 'y';
-                break;
-
-            case self::YEAR_SHORT_8601 :
-                return $this->_toComment(substr($this->date('o', $this->getUnixTimestamp(), false), -2, 2));
-                break;
-
-            case self::MERIDIEM :
-                $am = $this->date('a', $this->getUnixTimestamp(), false);
-                if ($am == 'am') {
-                    return $this->_toComment(Zend_Locale_Data::getContent($locale, 'am'));
-                }
-
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'pm'));
-                break;
-
-            case self::SWATCH :
-                return 'B';
-                break;
-
-            case self::HOUR_SHORT_AM :
-                return 'g';
-                break;
-
-            case self::HOUR_SHORT :
-                return 'G';
-                break;
-
-            case self::HOUR_AM :
-                return 'h';
-                break;
-
-            case self::HOUR :
-                return 'H';
-                break;
-
-            case self::MINUTE :
-                return $this->_toComment(str_pad($this->date('i', $this->getUnixTimestamp(), false), 2, '0', STR_PAD_LEFT));
-                break;
-
-            case self::SECOND :
-                return $this->_toComment(str_pad($this->date('s', $this->getUnixTimestamp(), false), 2, '0', STR_PAD_LEFT));
-                break;
-
-            case self::MINUTE_SHORT :
-                return 'i';
-                break;
-
-            case self::SECOND_SHORT :
-                return 's';
-                break;
-
-            case self::MILLISECOND :
-                return $this->_toComment($this->getMilliSecond());
-                break;
-
-            case self::TIMEZONE_NAME :
-            case 'vvvv' :
-                return 'e';
-                break;
-
-            case self::DAYLIGHT :
-                return 'I';
-                break;
-
-            case self::GMT_DIFF :
-            case 'ZZ' :
-            case 'ZZZ' :
-                return 'O';
-                break;
-
-            case self::GMT_DIFF_SEP :
-                return 'P';
-                break;
-
-            case self::TIMEZONE :
-            case 'v' :
-            case 'zz' :
-            case 'zzz' :
-                return 'T';
-                break;
-
-            case self::TIMEZONE_SECS :
-                return 'Z';
-                break;
-
-            case self::ISO_8601 :
-                return 'c';
-                break;
-
-            case self::RFC_2822 :
-                return 'r';
-                break;
-
-            case self::TIMESTAMP :
-                return 'U';
-                break;
-
-            case self::ERA :
-            case 'GG' :
-            case 'GGG' :
-                $year = $this->date('Y', $this->getUnixTimestamp(), false);
-                if ($year < 0) {
-                    return $this->_toComment(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Abbr', '0')));
-                }
-
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Abbr', '1')));
-                break;
-
-            case self::ERA_NARROW :
-                $year = $this->date('Y', $this->getUnixTimestamp(), false);
-                if ($year < 0) {
-                    return $this->_toComment(iconv_substr(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Abbr', '0')), 0, 1, 'UTF-8')) . '.';
-                }
-
-                return $this->_toComment(iconv_substr(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Abbr', '1')), 0, 1, 'UTF-8')) . '.';
-                break;
-
-            case self::ERA_NAME :
-                $year = $this->date('Y', $this->getUnixTimestamp(), false);
-                if ($year < 0) {
-                    return $this->_toComment(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Names', '0')));
-                }
-
-                return $this->_toComment(Zend_Locale_Data::getContent($locale, 'era', array('gregorian', 'Names', '1')));
-                break;
-
-            case self::DATES :
-                return $this->_toToken(Zend_Locale_Format::getDateFormat($locale), $locale);
-                break;
-
-            case self::DATE_FULL :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'full')), $locale);
-                break;
-
-            case self::DATE_LONG :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'long')), $locale);
-                break;
-
-            case self::DATE_MEDIUM :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'medium')), $locale);
-                break;
-
-            case self::DATE_SHORT :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short')), $locale);
-                break;
-
-            case self::TIMES :
-                return $this->_toToken(Zend_Locale_Format::getTimeFormat($locale), $locale);
-                break;
-
-            case self::TIME_FULL :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'time', 'full'), $locale);
-                break;
-
-            case self::TIME_LONG :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'time', 'long'), $locale);
-                break;
-
-            case self::TIME_MEDIUM :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'time', 'medium'), $locale);
-                break;
-
-            case self::TIME_SHORT :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'time', 'short'), $locale);
-                break;
-
-            case self::DATETIME :
-                return $this->_toToken(Zend_Locale_Format::getDateTimeFormat($locale), $locale);
-                break;
-
-            case self::DATETIME_FULL :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'full')), $locale);
-                break;
-
-            case self::DATETIME_LONG :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'long')), $locale);
-                break;
-
-            case self::DATETIME_MEDIUM :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'medium')), $locale);
-                break;
-
-            case self::DATETIME_SHORT :
-                return $this->_toToken(Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'short')), $locale);
-                break;
-
-            case self::ATOM :
-                return 'Y\-m\-d\TH\:i\:sP';
-                break;
-
-            case self::COOKIE :
-                return 'l\, d\-M\-y H\:i\:s e';
-                break;
-
-            case self::RFC_822 :
-                return 'D\, d M y H\:i\:s O';
-                break;
-
-            case self::RFC_850 :
-                return 'l\, d\-M\-y H\:i\:s e';
-                break;
-
-            case self::RFC_1036 :
-                return 'D\, d M y H\:i\:s O';
-                break;
-
-            case self::RFC_1123 :
-                return 'D\, d M Y H\:i\:s O';
-                break;
-
-            case self::RFC_3339 :
-                return 'Y\-m\-d\TH\:i\:sP';
-                break;
-
-            case self::RSS :
-                return 'D\, d M Y H\:i\:s O';
-                break;
-
-            case self::W3C :
-                return 'Y\-m\-d\TH\:i\:sP';
-                break;
-        }
-
-        if ($token == '') {
-            return '';
-        }
-
-        switch ($token[0]) {
-            case 'y' :
-                if ((strlen($token) == 4) && (abs($this->getUnixTimestamp()) <= 0x7FFFFFFF)) {
-                    return 'Y';
-                }
-
-                $length = iconv_strlen($token, 'UTF-8');
-                return $this->_toComment(str_pad($this->date('Y', $this->getUnixTimestamp(), false), $length, '0', STR_PAD_LEFT));
-                break;
-
-            case 'Y' :
-                if ((strlen($token) == 4) && (abs($this->getUnixTimestamp()) <= 0x7FFFFFFF)) {
-                    return 'o';
-                }
-
-                $length = iconv_strlen($token, 'UTF-8');
-                return $this->_toComment(str_pad($this->date('o', $this->getUnixTimestamp(), false), $length, '0', STR_PAD_LEFT));
-                break;
-
-            case 'A' :
-                $length  = iconv_strlen($token, 'UTF-8');
-                $result  = substr($this->getMilliSecond(), 0, 3);
-                $result += $this->date('s', $this->getUnixTimestamp(), false) * 1000;
-                $result += $this->date('i', $this->getUnixTimestamp(), false) * 60000;
-                $result += $this->date('H', $this->getUnixTimestamp(), false) * 3600000;
-
-                return $this->_toComment(str_pad($result, $length, '0', STR_PAD_LEFT));
-                break;
-        }
-
-        return $this->_toComment($token);
-    }
-
-    /**
-     * Private function to make a comment of a token
-     *
-     * @param string $token
-     * @return string
-     */
-    private function _toComment($token)
-    {
-        $token = str_split($token);
-        $result = '';
-        foreach ($token as $tok) {
-            $result .= '\\' . $tok;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return digit from standard names (english)
-     * Faster implementation than locale aware searching
-     *
-     * @param  string  $name
-     * @return integer  Number of this month
-     * @throws Zend_Date_Exception
-     */
-    private function _getDigitFromName($name)
-    {
-        switch($name) {
-            case "Jan":
-                return 1;
-
-            case "Feb":
-                return 2;
-
-            case "Mar":
-                return 3;
-
-            case "Apr":
-                return 4;
-
-            case "May":
-                return 5;
-
-            case "Jun":
-                return 6;
-
-            case "Jul":
-                return 7;
-
-            case "Aug":
-                return 8;
-
-            case "Sep":
-                return 9;
-
-            case "Oct":
-                return 10;
-
-            case "Nov":
-                return 11;
-
-            case "Dec":
-                return 12;
-
-            default:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('Month ($name) is not a known month');
-        }
-    }
-
-    /**
-     * Counts the exact year number
-     * < 70 - 2000 added, >70 < 100 - 1900, others just returned
-     *
-     * @param  integer  $value year number
-     * @return integer  Number of year
-     */
-    public static function getFullYear($value)
-    {
-        if ($value >= 0) {
-            if ($value < 70) {
-                $value += 2000;
-            } else if ($value < 100) {
-                $value += 1900;
-            }
-        }
-        return $value;
-    }
-
-    /**
-     * Sets the given date as new date or a given datepart as new datepart returning the new datepart
-     * This could be for example a localized dayname, the date without time,
-     * the month or only the seconds. There are about 50 different supported date parts.
-     * For a complete list of supported datepart values look into the docu
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to set
-     * @param  string                          $part    OPTIONAL Part of the date to set, if null the timestamp is set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function set($date, $part = null, $locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $part = Zend_Locale_Format::convertPhpToIsoFormat($part);
-        }
-
-        $zone = $this->getTimezoneFromString($date);
-        $this->setTimezone($zone);
-
-        $this->_calculate('set', $date, $part, $locale);
-        return $this;
-    }
-
-    /**
-     * Adds a date or datepart to the existing date, by extracting $part from $date,
-     * and modifying this object by adding that part.  The $part is then extracted from
-     * this object and returned as an integer or numeric string (for large values, or $part's
-     * corresponding to pre-defined formatted date strings).
-     * This could be for example a ISO 8601 date, the hour the monthname or only the minute.
-     * There are about 50 different supported date parts.
-     * For a complete list of supported datepart values look into the docu.
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to add
-     * @param  string                          $part    OPTIONAL Part of the date to add, if null the timestamp is added
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function add($date, $part = self::TIMESTAMP, $locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $part = Zend_Locale_Format::convertPhpToIsoFormat($part);
-        }
-
-        $this->_calculate('add', $date, $part, $locale);
-        return $this;
-    }
-
-    /**
-     * Subtracts a date from another date.
-     * This could be for example a RFC2822 date, the time,
-     * the year or only the timestamp. There are about 50 different supported date parts.
-     * For a complete list of supported datepart values look into the docu
-     * Be aware: Adding -2 Months is not equal to Subtracting 2 Months !!!
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to subtract
-     * @param  string                          $part    OPTIONAL Part of the date to sub, if null the timestamp is subtracted
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function sub($date, $part = self::TIMESTAMP, $locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $part = Zend_Locale_Format::convertPhpToIsoFormat($part);
-        }
-
-        $this->_calculate('sub', $date, $part, $locale);
-        return $this;
-    }
-
-    /**
-     * Compares a date or datepart with the existing one.
-     * Returns -1 if earlier, 0 if equal and 1 if later.
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to compare with the date object
-     * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is subtracted
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compare($date, $part = null, $locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $part = Zend_Locale_Format::convertPhpToIsoFormat($part);
-        }
-
-        $compare = $this->_calculate('cmp', $date, $part, $locale);
-
-        if ($compare > 0) {
-            return 1;
-        } else if ($compare < 0) {
-            return -1;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns a new instance of Zend_Date with the selected part copied.
-     * To make an exact copy, use PHP's clone keyword.
-     * For a complete list of supported date part values look into the docu.
-     * If a date part is copied, all other date parts are set to standard values.
-     * For example: If only YEAR is copied, the returned date object is equal to
-     * 01-01-YEAR 00:00:00 (01-01-1970 00:00:00 is equal to timestamp 0)
-     * If only HOUR is copied, the returned date object is equal to
-     * 01-01-1970 HOUR:00:00 (so $this contains a timestamp equal to a timestamp of 0 plus HOUR).
-     *
-     * @param  string              $part    Part of the date to compare, if null the timestamp is subtracted
-     * @param  string|Zend_Locale  $locale  OPTIONAL New object's locale.  No adjustments to timezone are made.
-     * @return Zend_Date New clone with requested part
-     */
-    public function copyPart($part, $locale = null)
-    {
-        $clone = clone $this;           // copy all instance variables
-        $clone->setUnixTimestamp(0);    // except the timestamp
-        if ($locale != null) {
-            $clone->setLocale($locale); // set an other locale if selected
-        }
-        $clone->set($this, $part);
-        return $clone;
-    }
-
-    /**
-     * Internal function, returns the offset of a given timezone
-     *
-     * @param string $zone
-     * @return integer
-     */
-    public function getTimezoneFromString($zone)
-    {
-        if (is_array($zone)) {
-            return $this->getTimezone();
-        }
-
-        if ($zone instanceof Zend_Date) {
-            return $zone->getTimezone();
-        }
-
-        $match = array();
-        preg_match('/\dZ$/', $zone, $match);
-        if (!empty($match)) {
-            return "Etc/UTC";
-        }
-
-        preg_match('/([+-]\d{2}):{0,1}\d{2}/', $zone, $match);
-        if (!empty($match) and ($match[count($match) - 1] <= 12) and ($match[count($match) - 1] >= -12)) {
-            $zone = "Etc/GMT";
-            $zone .= ($match[count($match) - 1] < 0) ? "+" : "-";
-            $zone .= (int) abs($match[count($match) - 1]);
-            return $zone;
-        }
-
-        preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
-        try {
-            if (!empty($match) and (!is_int($match[count($match) - 1]))) {
-                $oldzone = $this->getTimezone();
-                $this->setTimezone($match[count($match) - 1]);
-                $result = $this->getTimezone();
-                $this->setTimezone($oldzone);
-                if ($result !== $oldzone) {
-                    return $match[count($match) - 1];
-                }
-            }
-        } catch (Exception $e) {
-            // fall through
-        }
-
-        return $this->getTimezone();
-    }
-
-    /**
-     * Calculates the date or object
-     *
-     * @param  string                    $calc  Calculation to make
-     * @param  string|integer            $date  Date for calculation
-     * @param  string|integer            $comp  Second date for calculation
-     * @param  boolean|integer           $dst   Use dst correction if option is set
-     * @return integer|string|Zend_Date  new timestamp or Zend_Date depending on calculation
-     */
-    private function _assign($calc, $date, $comp = 0, $dst = false)
-    {
-        switch ($calc) {
-            case 'set' :
-                if (!empty($comp)) {
-                    $this->setUnixTimestamp(call_user_func(Zend_Locale_Math::$sub, $this->getUnixTimestamp(), $comp));
-                }
-                $this->setUnixTimestamp(call_user_func(Zend_Locale_Math::$add, $this->getUnixTimestamp(), $date));
-                $value = $this->getUnixTimestamp();
-                break;
-            case 'add' :
-                $this->setUnixTimestamp(call_user_func(Zend_Locale_Math::$add, $this->getUnixTimestamp(), $date));
-                $value = $this->getUnixTimestamp();
-                break;
-            case 'sub' :
-                $this->setUnixTimestamp(call_user_func(Zend_Locale_Math::$sub, $this->getUnixTimestamp(), $date));
-                $value = $this->getUnixTimestamp();
-                break;
-            default :
-                // cmp - compare
-                return call_user_func(Zend_Locale_Math::$comp, $comp, $date);
-                break;
-        }
-
-        // dst-correction if 'fix_dst' = true and dst !== false but only for non UTC and non GMT
-        if ((self::$_options['fix_dst'] === true) and ($dst !== false) and ($this->_dst === true)) {
-            $hour = $this->toString(self::HOUR, 'iso');
-            if ($hour != $dst) {
-                if (($dst == ($hour + 1)) or ($dst == ($hour - 23))) {
-                    $value += 3600;
-                } else if (($dst == ($hour - 1)) or ($dst == ($hour + 23))) {
-                    $value -= 3600;
-                }
-                $this->setUnixTimestamp($value);
-            }
-        }
-        return $this->getUnixTimestamp();
-    }
-
-
-    /**
-     * Calculates the date or object
-     *
-     * @param  string                          $calc    Calculation to make, one of: 'add'|'sub'|'cmp'|'copy'|'set'
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to calculate with
-     * @param  string                          $part    Part of the date to calculate, if null the timestamp is used
-     * @param  string|Zend_Locale              $locale  Locale for parsing input
-     * @return integer|string|Zend_Date        new timestamp
-     * @throws Zend_Date_Exception
-     */
-    private function _calculate($calc, $date, $part, $locale)
-    {
-        if ($date === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $date must be set, null is not allowed');
-        }
-
-        if (($part !== null) && (strlen($part) !== 2) && (Zend_Locale::isLocale($part, null, false))) {
-            $locale = $part;
-            $part   = null;
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        $locale = (string) $locale;
-
-        // Create date parts
-        $year   = $this->toString(self::YEAR, 'iso');
-        $month  = $this->toString(self::MONTH_SHORT, 'iso');
-        $day    = $this->toString(self::DAY_SHORT, 'iso');
-        $hour   = $this->toString(self::HOUR_SHORT, 'iso');
-        $minute = $this->toString(self::MINUTE_SHORT, 'iso');
-        $second = $this->toString(self::SECOND_SHORT, 'iso');
-        // If object extract value
-        if ($date instanceof Zend_Date) {
-            $date = $date->toString($part, 'iso', $locale);
-        }
-
-        if (is_array($date) === true) {
-            if (empty($part) === false) {
-                switch($part) {
-                    // Fall through
-                    case self::DAY:
-                    case self::DAY_SHORT:
-                        if (isset($date['day']) === true) {
-                            $date = $date['day'];
-                        }
-                        break;
-                    // Fall through
-                    case self::WEEKDAY_SHORT:
-                    case self::WEEKDAY:
-                    case self::WEEKDAY_8601:
-                    case self::WEEKDAY_DIGIT:
-                    case self::WEEKDAY_NARROW:
-                    case self::WEEKDAY_NAME:
-                        if (isset($date['weekday']) === true) {
-                            $date = $date['weekday'];
-                            $part = self::WEEKDAY_DIGIT;
-                        }
-                        break;
-                    case self::DAY_OF_YEAR:
-                        if (isset($date['day_of_year']) === true) {
-                            $date = $date['day_of_year'];
-                        }
-                        break;
-                    // Fall through
-                    case self::MONTH:
-                    case self::MONTH_SHORT:
-                    case self::MONTH_NAME:
-                    case self::MONTH_NAME_SHORT:
-                    case self::MONTH_NAME_NARROW:
-                        if (isset($date['month']) === true) {
-                            $date = $date['month'];
-                        }
-                        break;
-                    // Fall through
-                    case self::YEAR:
-                    case self::YEAR_SHORT:
-                    case self::YEAR_8601:
-                    case self::YEAR_SHORT_8601:
-                        if (isset($date['year']) === true) {
-                            $date = $date['year'];
-                        }
-                        break;
-                    // Fall through
-                    case self::HOUR:
-                    case self::HOUR_AM:
-                    case self::HOUR_SHORT:
-                    case self::HOUR_SHORT_AM:
-                        if (isset($date['hour']) === true) {
-                            $date = $date['hour'];
-                        }
-                        break;
-                    // Fall through
-                    case self::MINUTE:
-                    case self::MINUTE_SHORT:
-                        if (isset($date['minute']) === true) {
-                            $date = $date['minute'];
-                        }
-                        break;
-                    // Fall through
-                    case self::SECOND:
-                    case self::SECOND_SHORT:
-                        if (isset($date['second']) === true) {
-                            $date = $date['second'];
-                        }
-                        break;
-                    // Fall through
-                    case self::TIMEZONE:
-                    case self::TIMEZONE_NAME:
-                        if (isset($date['timezone']) === true) {
-                            $date = $date['timezone'];
-                        }
-                        break;
-                    case self::TIMESTAMP:
-                        if (isset($date['timestamp']) === true) {
-                            $date = $date['timestamp'];
-                        }
-                        break;
-                    case self::WEEK:
-                        if (isset($date['week']) === true) {
-                            $date = $date['week'];
-                        }
-                        break;
-                    case self::TIMEZONE_SECS:
-                        if (isset($date['gmtsecs']) === true) {
-                            $date = $date['gmtsecs'];
-                        }
-                        break;
-                    default:
-                        require_once 'Zend/Date/Exception.php';
-                        throw new Zend_Date_Exception("datepart for part ($part) not found in array");
-                        break;
-                }
-            } else {
-                $hours = 0;
-                if (isset($date['hour']) === true) {
-                    $hours = $date['hour'];
-                }
-                $minutes = 0;
-                if (isset($date['minute']) === true) {
-                    $minutes = $date['minute'];
-                }
-                $seconds = 0;
-                if (isset($date['second']) === true) {
-                    $seconds = $date['second'];
-                }
-                $months = 0;
-                if (isset($date['month']) === true) {
-                    $months = $date['month'];
-                }
-                $days = 0;
-                if (isset($date['day']) === true) {
-                    $days = $date['day'];
-                }
-                $years = 0;
-                if (isset($date['year']) === true) {
-                    $years = $date['year'];
-                }
-                return $this->_assign($calc, $this->mktime($hours, $minutes, $seconds, $months, $days, $years, true),
-                                             $this->mktime($hour, $minute, $second, $month, $day, $year, true), $hour);
-            }
-        }
-
-        // $date as object, part of foreign date as own date
-        switch($part) {
-
-            // day formats
-            case self::DAY:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date);
-                break;
-
-            case self::WEEKDAY_SHORT:
-                $daylist = Zend_Locale_Data::getList($locale, 'day');
-                $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale);
-                $cnt = 0;
-
-                foreach ($daylist as $key => $value) {
-                    if (strtoupper(iconv_substr($value, 0, 3, 'UTF-8')) == strtoupper($date)) {
-                         $found = $cnt;
-                        break;
-                    }
-                    ++$cnt;
-                }
-
-                // Weekday found
-                if ($cnt < 7) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $found, 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            case self::DAY_SHORT:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date);
-                break;
-
-            case self::WEEKDAY:
-                $daylist = Zend_Locale_Data::getList($locale, 'day');
-                $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale);
-                $cnt = 0;
-
-                foreach ($daylist as $key => $value) {
-                    if (strtoupper($value) == strtoupper($date)) {
-                        $found = $cnt;
-                        break;
-                    }
-                    ++$cnt;
-                }
-
-                // Weekday found
-                if ($cnt < 7) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $found, 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            case self::WEEKDAY_8601:
-                $weekday = (int) $this->toString(self::WEEKDAY_8601, 'iso', $locale);
-                if ((intval($date) > 0) and (intval($date) < 8)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            case self::DAY_SUFFIX:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('day suffix not supported', 0, null, $date);
-                break;
-
-            case self::WEEKDAY_DIGIT:
-                $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale);
-                if (is_numeric($date) and (intval($date) >= 0) and (intval($date) < 7)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $date, 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            case self::DAY_OF_YEAR:
-                if (is_numeric($date)) {
-                    if (($calc == 'add') || ($calc == 'sub')) {
-                        $year = 1970;
-                        ++$date;
-                        ++$day;
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, $date, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date);
-                break;
-
-            case self::WEEKDAY_NARROW:
-                $daylist = Zend_Locale_Data::getList($locale, 'day', array('gregorian', 'format', 'abbreviated'));
-                $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale);
-                $cnt = 0;
-                foreach ($daylist as $key => $value) {
-                    if (strtoupper(iconv_substr($value, 0, 1, 'UTF-8')) == strtoupper($date)) {
-                        $found = $cnt;
-                        break;
-                    }
-                    ++$cnt;
-                }
-
-                // Weekday found
-                if ($cnt < 7) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $found, 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            case self::WEEKDAY_NAME:
-                $daylist = Zend_Locale_Data::getList($locale, 'day', array('gregorian', 'format', 'abbreviated'));
-                $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale);
-                $cnt = 0;
-                foreach ($daylist as $key => $value) {
-                    if (strtoupper($value) == strtoupper($date)) {
-                        $found = $cnt;
-                        break;
-                    }
-                    ++$cnt;
-                }
-
-                // Weekday found
-                if ($cnt < 7) {
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $found, 1970, true),
-                                                 $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour);
-                }
-
-                // Weekday not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date);
-                break;
-
-            // week formats
-            case self::WEEK:
-                if (is_numeric($date)) {
-                    $week = (int) $this->toString(self::WEEK, 'iso', $locale);
-                    return $this->_assign($calc, parent::mktime(0, 0, 0, 1, 1 + ($date * 7), 1970, true),
-                                                 parent::mktime(0, 0, 0, 1, 1 + ($week * 7), 1970, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, week expected", 0, null, $date);
-                break;
-
-            // month formats
-            case self::MONTH_NAME:
-                $monthlist = Zend_Locale_Data::getList($locale, 'month');
-                $cnt = 0;
-                foreach ($monthlist as $key => $value) {
-                    if (strtoupper($value) == strtoupper($date)) {
-                        $found = $key;
-                        break;
-                    }
-                    ++$cnt;
-                }
-                $date = array_search($date, $monthlist);
-
-                // Monthname found
-                if ($cnt < 12) {
-                    $fixday = 0;
-                    if ($calc == 'add') {
-                        $date += $found;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] == false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    } else if ($calc == 'sub') {
-                        $date = $month - $found;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] == false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $date,  $day + $fixday, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), $hour);
-                }
-
-                // Monthname not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date);
-                break;
-
-            case self::MONTH:
-                if (is_numeric($date)) {
-                    $fixday = 0;
-                    if ($calc == 'add') {
-                        $date += $month;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] == false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    } else if ($calc == 'sub') {
-                        $date = $month - $date;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] == false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $date, $day + $fixday, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date);
-                break;
-
-            case self::MONTH_NAME_SHORT:
-                $monthlist = Zend_Locale_Data::getList($locale, 'month', array('gregorian', 'format', 'abbreviated'));
-                $cnt = 0;
-                foreach ($monthlist as $key => $value) {
-                    if (strtoupper($value) == strtoupper($date)) {
-                        $found = $key;
-                        break;
-                    }
-                    ++$cnt;
-                }
-                $date = array_search($date, $monthlist);
-
-                // Monthname found
-                if ($cnt < 12) {
-                    $fixday = 0;
-                    if ($calc == 'add') {
-                        $date += $found;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    } else if ($calc == 'sub') {
-                        $date = $month - $found;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $date, $day + $fixday, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), $hour);
-                }
-
-                // Monthname not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date);
-                break;
-
-            case self::MONTH_SHORT:
-                if (is_numeric($date) === true) {
-                    $fixday = 0;
-                    if ($calc === 'add') {
-                        $date += $month;
-                        $calc  = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    } else if ($calc === 'sub') {
-                        $date = $month - $date;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $date,  $day + $fixday, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day,           $year, true), $hour);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date);
-                break;
-
-            case self::MONTH_DAYS:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('month days not supported', 0, null, $date);
-                break;
-
-            case self::MONTH_NAME_NARROW:
-                $monthlist = Zend_Locale_Data::getList($locale, 'month', array('gregorian', 'stand-alone', 'narrow'));
-                $cnt       = 0;
-                foreach ($monthlist as $key => $value) {
-                    if (strtoupper($value) === strtoupper($date)) {
-                        $found = $key;
-                        break;
-                    }
-                    ++$cnt;
-                }
-                $date = array_search($date, $monthlist);
-
-                // Monthname found
-                if ($cnt < 12) {
-                    $fixday = 0;
-                    if ($calc === 'add') {
-                        $date += $found;
-                        $calc  = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    } else if ($calc === 'sub') {
-                        $date = $month - $found;
-                        $calc = 'set';
-                        if (self::$_options['extend_month'] === false) {
-                            $parts = $this->getDateParts($this->mktime($hour, $minute, $second, $date, $day, $year, false));
-                            if ($parts['mday'] != $day) {
-                                $fixday = ($parts['mday'] < $day) ? -$parts['mday'] : ($parts['mday'] - $day);
-                            }
-                        }
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $date,  $day + $fixday, $year, true),
-                                                 $this->mktime(0, 0, 0, $month, $day,           $year, true), $hour);
-                }
-
-                // Monthname not found
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date);
-                break;
-
-            // year formats
-            case self::LEAPYEAR:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('leap year not supported', 0, null, $date);
-                break;
-
-            case self::YEAR_8601:
-                if (is_numeric($date)) {
-                    if ($calc === 'add') {
-                        $date += $year;
-                        $calc  = 'set';
-                    } else if ($calc === 'sub') {
-                        $date = $year - $date;
-                        $calc = 'set';
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, intval($date), true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year,         true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date);
-                break;
-
-            case self::YEAR:
-                if (is_numeric($date)) {
-                    if ($calc === 'add') {
-                        $date += $year;
-                        $calc  = 'set';
-                    } else if ($calc === 'sub') {
-                        $date = $year - $date;
-                        $calc = 'set';
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, intval($date), true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year,         true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date);
-                break;
-
-            case self::YEAR_SHORT:
-                if (is_numeric($date)) {
-                    $date = intval($date);
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        $date = self::getFullYear($date);
-                    }
-                    if ($calc === 'add') {
-                        $date += $year;
-                        $calc  = 'set';
-                    } else if ($calc === 'sub') {
-                        $date = $year - $date;
-                        $calc = 'set';
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, $date, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date);
-                break;
-
-            case self::YEAR_SHORT_8601:
-                if (is_numeric($date)) {
-                    $date = intval($date);
-                    if (($calc === 'set') || ($calc === 'cmp')) {
-                        $date = self::getFullYear($date);
-                    }
-                    if ($calc === 'add') {
-                        $date += $year;
-                        $calc  = 'set';
-                    } else if ($calc === 'sub') {
-                        $date = $year - $date;
-                        $calc = 'set';
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, $date, true),
-                                                 $this->mktime(0, 0, 0, $month, $day, $year, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date);
-                break;
-
-            // time formats
-            case self::MERIDIEM:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('meridiem not supported', 0, null, $date);
-                break;
-
-            case self::SWATCH:
-                if (is_numeric($date)) {
-                    $rest    = intval($date);
-                    $hours   = floor($rest * 24 / 1000);
-                    $rest    = $rest - ($hours * 1000 / 24);
-                    $minutes = floor($rest * 1440 / 1000);
-                    $rest    = $rest - ($minutes * 1000 / 1440);
-                    $seconds = floor($rest * 86400 / 1000);
-                    return $this->_assign($calc, $this->mktime($hours, $minutes, $seconds, 1, 1, 1970, true),
-                                                 $this->mktime($hour,  $minute,  $second,  1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, swatchstamp expected", 0, null, $date);
-                break;
-
-            case self::HOUR_SHORT_AM:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true),
-                                                 $this->mktime($hour,         0, 0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date);
-                break;
-
-            case self::HOUR_SHORT:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true),
-                                                 $this->mktime($hour,         0, 0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date);
-                break;
-
-            case self::HOUR_AM:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true),
-                                                 $this->mktime($hour,         0, 0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date);
-                break;
-
-            case self::HOUR:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true),
-                                                 $this->mktime($hour,         0, 0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date);
-                break;
-
-            case self::MINUTE:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, intval($date), 0, 1, 1, 1970, true),
-                                                 $this->mktime(0, $minute,       0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date);
-                break;
-
-            case self::SECOND:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, intval($date), 1, 1, 1970, true),
-                                                 $this->mktime(0, 0, $second,       1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date);
-                break;
-
-            case self::MILLISECOND:
-                if (is_numeric($date)) {
-                    switch($calc) {
-                        case 'set' :
-                            return $this->setMillisecond($date);
-                            break;
-                        case 'add' :
-                            return $this->addMillisecond($date);
-                            break;
-                        case 'sub' :
-                            return $this->subMillisecond($date);
-                            break;
-                    }
-
-                    return $this->compareMillisecond($date);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, milliseconds expected", 0, null, $date);
-                break;
-
-            case self::MINUTE_SHORT:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, intval($date), 0, 1, 1, 1970, true),
-                                                 $this->mktime(0, $minute,       0, 1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date);
-                break;
-
-            case self::SECOND_SHORT:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $this->mktime(0, 0, intval($date), 1, 1, 1970, true),
-                                                 $this->mktime(0, 0, $second,       1, 1, 1970, true), false);
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date);
-                break;
-
-            // timezone formats
-            // break intentionally omitted
-            case self::TIMEZONE_NAME:
-            case self::TIMEZONE:
-            case self::TIMEZONE_SECS:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('timezone not supported', 0, null, $date);
-                break;
-
-            case self::DAYLIGHT:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('daylight not supported', 0, null, $date);
-                break;
-
-            case self::GMT_DIFF:
-            case self::GMT_DIFF_SEP:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('gmtdiff not supported', 0, null, $date);
-                break;
-
-            // date strings
-            case self::ISO_8601:
-                // (-)YYYY-MM-dd
-                preg_match('/^(-{0,1}\d{4})-(\d{2})-(\d{2})/', $date, $datematch);
-                // (-)YY-MM-dd
-                if (empty($datematch)) {
-                    preg_match('/^(-{0,1}\d{2})-(\d{2})-(\d{2})/', $date, $datematch);
-                }
-                // (-)YYYYMMdd
-                if (empty($datematch)) {
-                    preg_match('/^(-{0,1}\d{4})(\d{2})(\d{2})/', $date, $datematch);
-                }
-                // (-)YYMMdd
-                if (empty($datematch)) {
-                    preg_match('/^(-{0,1}\d{2})(\d{2})(\d{2})/', $date, $datematch);
-                }
-                $tmpdate = $date;
-                if (!empty($datematch)) {
-                    $dateMatchCharCount = iconv_strlen($datematch[0], 'UTF-8');
-                    $tmpdate = iconv_substr($date,
-                                            $dateMatchCharCount,
-                                            iconv_strlen($date, 'UTF-8') - $dateMatchCharCount,
-                                            'UTF-8');
-                }
-                // (T)hh:mm:ss
-                preg_match('/[T,\s]{0,1}(\d{2}):(\d{2}):(\d{2})/', $tmpdate, $timematch);
-                if (empty($timematch)) {
-                    preg_match('/[T,\s]{0,1}(\d{2})(\d{2})(\d{2})/', $tmpdate, $timematch);
-                }
-                if (empty($datematch) and empty($timematch)) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date);
-                }
-                if (!empty($timematch)) {
-                    $timeMatchCharCount = iconv_strlen($timematch[0], 'UTF-8');
-                    $tmpdate = iconv_substr($tmpdate,
-                                            $timeMatchCharCount,
-                                            iconv_strlen($tmpdate, 'UTF-8') - $timeMatchCharCount,
-                                            'UTF-8');
-                }
-                if (empty($datematch)) {
-                    $datematch[1] = 1970;
-                    $datematch[2] = 1;
-                    $datematch[3] = 1;
-                } else if (iconv_strlen($datematch[1], 'UTF-8') == 2) {
-                    $datematch[1] = self::getFullYear($datematch[1]);
-                }
-                if (empty($timematch)) {
-                    $timematch[1] = 0;
-                    $timematch[2] = 0;
-                    $timematch[3] = 0;
-                }
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$datematch[2];
-                    --$month;
-                    --$datematch[3];
-                    --$day;
-                    $datematch[1] -= 1970;
-                    $year         -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($timematch[1], $timematch[2], $timematch[3], 1 + $datematch[2], 1 + $datematch[3], 1970 + $datematch[1], false),
-                                             $this->mktime($hour,         $minute,       $second,       1 + $month,        1 + $day,          1970 + $year,         false), false);
-                break;
-
-            case self::RFC_2822:
-                $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4})$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date);
-                }
-
-                $months  = $this->_getDigitFromName($match[2]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], false),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     false), false);
-                break;
-
-            case self::TIMESTAMP:
-                if (is_numeric($date)) {
-                    return $this->_assign($calc, $date, $this->getUnixTimestamp());
-                }
-
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("invalid date ($date) operand, timestamp expected", 0, null, $date);
-                break;
-
-            // additional formats
-            // break intentionally omitted
-            case self::ERA:
-            case self::ERA_NAME:
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception('era not supported', 0, null, $date);
-                break;
-
-            case self::DATES:
-                try {
-                    $parsed = Zend_Locale_Format::getDate($date, array('locale' => $locale, 'format_type' => 'iso', 'fix_date' => true));
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime(0, 0, 0, 1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATE_FULL:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'full'));
-                    $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime(0, 0, 0, 1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATE_LONG:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'long'));
-                    $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    if (($calc == 'set') || ($calc == 'cmp')){
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime(0, 0, 0, 1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATE_MEDIUM:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'medium'));
-                    $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime(0, 0, 0, 1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATE_SHORT:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short'));
-                    $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    $parsed['year'] = self::getFullYear($parsed['year']);
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime(0, 0, 0, 1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::TIMES:
-                try {
-                    if ($calc != 'set') {
-                        $month = 1;
-                        $day   = 1;
-                        $year  = 1970;
-                    }
-                    $parsed = Zend_Locale_Format::getTime($date, array('locale' => $locale, 'format_type' => 'iso', 'fix_date' => true));
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true),
-                                                 $this->mktime($hour,           $minute,           $second,           $month, $day, $year, true), false);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::TIME_FULL:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'full'));
-                    $parsed = Zend_Locale_Format::getTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-                    if ($calc != 'set') {
-                        $month = 1;
-                        $day   = 1;
-                        $year  = 1970;
-                    }
-
-                    if (!isset($parsed['second'])) {
-                        $parsed['second'] = 0;
-                    }
-
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true),
-                                                 $this->mktime($hour,           $minute,           $second,           $month, $day, $year, true), false);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::TIME_LONG:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'long'));
-                    $parsed = Zend_Locale_Format::getTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-                    if ($calc != 'set') {
-                        $month = 1;
-                        $day   = 1;
-                        $year  = 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true),
-                                                 $this->mktime($hour,           $minute,           $second,           $month, $day, $year, true), false);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::TIME_MEDIUM:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'medium'));
-                    $parsed = Zend_Locale_Format::getTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-                    if ($calc != 'set') {
-                        $month = 1;
-                        $day   = 1;
-                        $year  = 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true),
-                                                 $this->mktime($hour,           $minute,           $second,           $month, $day, $year, true), false);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::TIME_SHORT:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'short'));
-                    $parsed = Zend_Locale_Format::getTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-                    if ($calc != 'set') {
-                        $month = 1;
-                        $day   = 1;
-                        $year  = 1970;
-                    }
-
-                    if (!isset($parsed['second'])) {
-                        $parsed['second'] = 0;
-                    }
-
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true),
-                                                 $this->mktime($hour,           $minute,           $second,           $month, $day, $year, true), false);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATETIME:
-                try {
-                    $parsed = Zend_Locale_Format::getDateTime($date, array('locale' => $locale, 'format_type' => 'iso', 'fix_date' => true));
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime($hour,           $minute,           $second,           1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATETIME_FULL:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'full'));
-                    $parsed = Zend_Locale_Format::getDateTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-
-                    if (!isset($parsed['second'])) {
-                        $parsed['second'] = 0;
-                    }
-
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime($hour,           $minute,           $second,           1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATETIME_LONG:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'long'));
-                    $parsed = Zend_Locale_Format::getDateTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    if (($calc == 'set') || ($calc == 'cmp')){
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime($hour,           $minute,           $second,           1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATETIME_MEDIUM:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'medium'));
-                    $parsed = Zend_Locale_Format::getDateTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime($hour,           $minute,           $second,           1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            case self::DATETIME_SHORT:
-                try {
-                    $format = Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'short'));
-                    $parsed = Zend_Locale_Format::getDateTime($date, array('date_format' => $format, 'format_type' => 'iso', 'locale' => $locale));
-
-                    $parsed['year'] = self::getFullYear($parsed['year']);
-
-                    if (($calc == 'set') || ($calc == 'cmp')) {
-                        --$parsed['month'];
-                        --$month;
-                        --$parsed['day'];
-                        --$day;
-                        $parsed['year'] -= 1970;
-                        $year  -= 1970;
-                    }
-
-                    if (!isset($parsed['second'])) {
-                        $parsed['second'] = 0;
-                    }
-
-                    return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true),
-                                                 $this->mktime($hour,           $minute,           $second,           1 + $month,           1 + $day,           1970 + $year,           true), $hour);
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                }
-                break;
-
-            // ATOM and RFC_3339 are identical
-            case self::ATOM:
-            case self::RFC_3339:
-                $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\d{0,4}([+-]{1}\d{2}:\d{2}|Z)$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, ATOM format expected", 0, null, $date);
-                }
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$match[2];
-                    --$month;
-                    --$match[3];
-                    --$day;
-                    $match[1] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $match[2], 1 + $match[3], 1970 + $match[1], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,    1 + $day,      1970 + $year,     true), false);
-                break;
-
-            case self::COOKIE:
-                $result = preg_match("/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,20}$/", $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, COOKIE format expected", 0, null, $date);
-                }
-                $matchStartPos = iconv_strpos($match[0], ' ', 0, 'UTF-8') + 1;
-                $match[0] = iconv_substr($match[0],
-                                         $matchStartPos,
-                                         iconv_strlen($match[0], 'UTF-8') - $matchStartPos,
-                                         'UTF-8');
-
-                $months    = $this->_getDigitFromName($match[2]);
-                $match[3] = self::getFullYear($match[3]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     true), false);
-                break;
-
-            case self::RFC_822:
-            case self::RFC_1036:
-                // new RFC 822 format, identical to RFC 1036 standard
-                $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, RFC 822 date format expected", 0, null, $date);
-                }
-
-                $months    = $this->_getDigitFromName($match[2]);
-                $match[3] = self::getFullYear($match[3]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], false),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     false), false);
-                break;
-
-            case self::RFC_850:
-                $result = preg_match('/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,21}$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, RFC 850 date format expected", 0, null, $date);
-                }
-
-                $months    = $this->_getDigitFromName($match[2]);
-                $match[3] = self::getFullYear($match[3]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     true), false);
-                break;
-
-            case self::RFC_1123:
-                $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2,4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, RFC 1123 date format expected", 0, null, $date);
-                }
-
-                $months  = $this->_getDigitFromName($match[2]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     true), false);
-                break;
-
-            case self::RSS:
-                $result = preg_match('/^\w{3},\s(\d{2})\s(\w{3})\s(\d{2,4})\s(\d{1,2}):(\d{2}):(\d{2})\s.{1,21}$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, RSS date format expected", 0, null, $date);
-                }
-
-                $months  = $this->_getDigitFromName($match[2]);
-                $match[3] = self::getFullYear($match[3]);
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$months;
-                    --$month;
-                    --$match[1];
-                    --$day;
-                    $match[3] -= 1970;
-                    $year  -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $months, 1 + $match[1], 1970 + $match[3], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,  1 + $day,      1970 + $year,     true), false);
-                break;
-
-            case self::W3C:
-                $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})[+-]{1}\d{2}:\d{2}$/', $date, $match);
-                if (!$result) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("invalid date ($date) operand, W3C date format expected", 0, null, $date);
-                }
-
-                if (($calc == 'set') || ($calc == 'cmp')) {
-                    --$match[2];
-                    --$month;
-                    --$match[3];
-                    --$day;
-                    $match[1] -= 1970;
-                    $year     -= 1970;
-                }
-                return $this->_assign($calc, $this->mktime($match[4], $match[5], $match[6], 1 + $match[2], 1 + $match[3], 1970 + $match[1], true),
-                                             $this->mktime($hour,     $minute,   $second,   1 + $month,    1 + $day,      1970 + $year,     true), false);
-                break;
-
-            default:
-                if (!is_numeric($date) || !empty($part)) {
-                    try {
-                        if (empty($part)) {
-                            $part  = Zend_Locale_Format::getDateFormat($locale) . " ";
-                            $part .= Zend_Locale_Format::getTimeFormat($locale);
-                        }
-
-                        $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $part, 'locale' => $locale, 'fix_date' => true, 'format_type' => 'iso'));
-                        if ((strpos(strtoupper($part), 'YY') !== false) and (strpos(strtoupper($part), 'YYYY') === false)) {
-                            $parsed['year'] = self::getFullYear($parsed['year']);
-                        }
-
-                        if (($calc == 'set') || ($calc == 'cmp')) {
-                            if (isset($parsed['month'])) {
-                                --$parsed['month'];
-                            } else {
-                                $parsed['month'] = 0;
-                            }
-
-                            if (isset($parsed['day'])) {
-                                --$parsed['day'];
-                            } else {
-                                $parsed['day'] = 0;
-                            }
-
-                            if (isset($parsed['year'])) {
-                                $parsed['year'] -= 1970;
-                            } else {
-                                $parsed['year'] = 0;
-                            }
-                        }
-
-                        return $this->_assign($calc, $this->mktime(
-                            isset($parsed['hour']) ? $parsed['hour'] : 0,
-                            isset($parsed['minute']) ? $parsed['minute'] : 0,
-                            isset($parsed['second']) ? $parsed['second'] : 0,
-                            isset($parsed['month']) ? (1 + $parsed['month']) : 1,
-                            isset($parsed['day']) ? (1 + $parsed['day']) : 1,
-                            isset($parsed['year']) ? (1970 + $parsed['year']) : 1970,
-                            false), $this->getUnixTimestamp(), false);
-                    } catch (Zend_Locale_Exception $e) {
-                        if (!is_numeric($date)) {
-                            require_once 'Zend/Date/Exception.php';
-                            throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date);
-                        }
-                    }
-                }
-
-                return $this->_assign($calc, $date, $this->getUnixTimestamp(), false);
-                break;
-        }
-    }
-
-    /**
-     * Returns true when both date objects or date parts are equal.
-     * For example:
-     * 15.May.2000 <-> 15.June.2000 Equals only for Day or Year... all other will return false
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to equal with
-     * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return boolean
-     * @throws Zend_Date_Exception
-     */
-    public function equals($date, $part = null, $locale = null)
-    {
-        $result = $this->compare($date, $part, $locale);
-
-        if ($result == 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns if the given date or datepart is earlier
-     * For example:
-     * 15.May.2000 <-> 13.June.1999 will return true for day, year and date, but not for month
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to compare with
-     * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return boolean
-     * @throws Zend_Date_Exception
-     */
-    public function isEarlier($date, $part = null, $locale = null)
-    {
-        $result = $this->compare($date, $part, $locale);
-
-        if ($result == -1) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns if the given date or datepart is later
-     * For example:
-     * 15.May.2000 <-> 13.June.1999 will return true for month but false for day, year and date
-     * Returns if the given date is later
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to compare with
-     * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return boolean
-     * @throws Zend_Date_Exception
-     */
-    public function isLater($date, $part = null, $locale = null)
-    {
-        $result = $this->compare($date, $part, $locale);
-
-        if ($result == 1) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns only the time of the date as new Zend_Date object
-     * For example:
-     * 15.May.2000 10:11:23 will return a dateobject equal to 01.Jan.1970 10:11:23
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getTime($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'H:i:s';
-        } else {
-            $format = self::TIME_MEDIUM;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-    /**
-     * Returns the calculated time
-     *
-     * @param  string                    $calc    Calculation to make
-     * @param  string|integer|array|Zend_Date  $time    Time to calculate with, if null the actual time is taken
-     * @param  string                          $format  Timeformat for parsing input
-     * @param  string|Zend_Locale              $locale  Locale for parsing input
-     * @return integer|Zend_Date  new time
-     * @throws Zend_Date_Exception
-     */
-    private function _time($calc, $time, $format, $locale)
-    {
-        if ($time === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $time must be set, null is not allowed');
-        }
-
-        if ($time instanceof Zend_Date) {
-            // extract time from object
-            $time = $time->toString('HH:mm:ss', 'iso');
-        } else {
-            if (is_array($time)) {
-                if ((isset($time['hour']) === true) or (isset($time['minute']) === true) or
-                    (isset($time['second']) === true)) {
-                    $parsed = $time;
-                } else {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("no hour, minute or second given in array");
-                }
-            } else {
-                if (self::$_options['format_type'] == 'php') {
-                    $format = Zend_Locale_Format::convertPhpToIsoFormat($format);
-                }
-                try {
-                    if ($locale === null) {
-                        $locale = $this->getLocale();
-                    }
-
-                    $parsed = Zend_Locale_Format::getTime($time, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso'));
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e);
-                }
-            }
-
-            if (!array_key_exists('hour', $parsed)) {
-                $parsed['hour'] = 0;
-            }
-
-            if (!array_key_exists('minute', $parsed)) {
-                $parsed['minute'] = 0;
-            }
-
-            if (!array_key_exists('second', $parsed)) {
-                $parsed['second'] = 0;
-            }
-
-            $time  = str_pad($parsed['hour'], 2, '0', STR_PAD_LEFT) . ":";
-            $time .= str_pad($parsed['minute'], 2, '0', STR_PAD_LEFT) . ":";
-            $time .= str_pad($parsed['second'], 2, '0', STR_PAD_LEFT);
-        }
-
-        $return = $this->_calcdetail($calc, $time, self::TIMES, 'de');
-        if ($calc != 'cmp') {
-            return $this;
-        }
-
-        return $return;
-    }
-
-
-    /**
-     * Sets a new time for the date object. Format defines how to parse the time string.
-     * Also a complete date can be given, but only the time is used for setting.
-     * For example: dd.MMMM.yyTHH:mm' and 'ss sec'-> 10.May.07T25:11 and 44 sec => 1h11min44sec + 1 day
-     * Returned is the new date object and the existing date is left as it was before
-     *
-     * @param  string|integer|array|Zend_Date  $time    Time to set
-     * @param  string                          $format  OPTIONAL Timeformat for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setTime($time, $format = null, $locale = null)
-    {
-        return $this->_time('set', $time, $format, $locale);
-    }
-
-
-    /**
-     * Adds a time to the existing date. Format defines how to parse the time string.
-     * If only parts are given the other parts are set to 0.
-     * If no format is given, the standardformat of this locale is used.
-     * For example: HH:mm:ss -> 10 -> +10 hours
-     *
-     * @param  string|integer|array|Zend_Date  $time    Time to add
-     * @param  string                          $format  OPTIONAL Timeformat for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addTime($time, $format = null, $locale = null)
-    {
-        return $this->_time('add', $time, $format, $locale);
-    }
-
-
-    /**
-     * Subtracts a time from the existing date. Format defines how to parse the time string.
-     * If only parts are given the other parts are set to 0.
-     * If no format is given, the standardformat of this locale is used.
-     * For example: HH:mm:ss -> 10 -> -10 hours
-     *
-     * @param  string|integer|array|Zend_Date  $time    Time to sub
-     * @param  string                          $format  OPTIONAL Timeformat for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid inteface
-     * @throws Zend_Date_Exception
-     */
-    public function subTime($time, $format = null, $locale = null)
-    {
-        return $this->_time('sub', $time, $format, $locale);
-    }
-
-
-    /**
-     * Compares the time from the existing date. Format defines how to parse the time string.
-     * If only parts are given the other parts are set to default.
-     * If no format us given, the standardformat of this locale is used.
-     * For example: HH:mm:ss -> 10 -> 10 hours
-     *
-     * @param  string|integer|array|Zend_Date  $time    Time to compare
-     * @param  string                          $format  OPTIONAL Timeformat for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareTime($time, $format = null, $locale = null)
-    {
-        return $this->_time('cmp', $time, $format, $locale);
-    }
-
-    /**
-     * Returns a clone of $this, with the time part set to 00:00:00.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getDate($locale = null)
-    {
-        $orig = self::$_options['format_type'];
-        if (self::$_options['format_type'] == 'php') {
-            self::$_options['format_type'] = 'iso';
-        }
-
-        $date = $this->copyPart(self::DATE_MEDIUM, $locale);
-        $date->addTimestamp($this->getGmtOffset());
-        self::$_options['format_type'] = $orig;
-
-        return $date;
-    }
-
-    /**
-     * Returns the calculated date
-     *
-     * @param  string                          $calc    Calculation to make
-     * @param  string|integer|array|Zend_Date  $date    Date to calculate with, if null the actual date is taken
-     * @param  string                          $format  Date format for parsing
-     * @param  string|Zend_Locale              $locale  Locale for parsing input
-     * @return integer|Zend_Date  new date
-     * @throws Zend_Date_Exception
-     */
-    private function _date($calc, $date, $format, $locale)
-    {
-        if ($date === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $date must be set, null is not allowed');
-        }
-
-        if ($date instanceof Zend_Date) {
-            // extract date from object
-            $date = $date->toString('d.M.y', 'iso');
-        } else {
-            if (is_array($date)) {
-                if ((isset($date['year']) === true) or (isset($date['month']) === true) or
-                    (isset($date['day']) === true)) {
-                    $parsed = $date;
-                } else {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("no day,month or year given in array");
-                }
-            } else {
-                if ((self::$_options['format_type'] == 'php') && !defined($format)) {
-                    $format = Zend_Locale_Format::convertPhpToIsoFormat($format);
-                }
-                try {
-                    if ($locale === null) {
-                        $locale = $this->getLocale();
-                    }
-
-                    $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso'));
-                    if ((strpos(strtoupper($format), 'YY') !== false) and (strpos(strtoupper($format), 'YYYY') === false)) {
-                        $parsed['year'] = self::getFullYear($parsed['year']);
-                    }
-                } catch (Zend_Locale_Exception $e) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception($e->getMessage(), 0, $e);
-                }
-            }
-
-            if (!array_key_exists('day', $parsed)) {
-                $parsed['day'] = 1;
-            }
-
-            if (!array_key_exists('month', $parsed)) {
-                $parsed['month'] = 1;
-            }
-
-            if (!array_key_exists('year', $parsed)) {
-                $parsed['year'] = 0;
-            }
-
-            $date  = $parsed['day'] . "." . $parsed['month'] . "." . $parsed['year'];
-        }
-
-        $return = $this->_calcdetail($calc, $date, self::DATE_MEDIUM, 'de');
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-
-    /**
-     * Sets a new date for the date object. Format defines how to parse the date string.
-     * Also a complete date with time can be given, but only the date is used for setting.
-     * For example: MMMM.yy HH:mm-> May.07 22:11 => 01.May.07 00:00
-     * Returned is the new date object and the existing time is left as it was before
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date to set
-     * @param  string                          $format  OPTIONAL Date format for parsing
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setDate($date, $format = null, $locale = null)
-    {
-        return $this->_date('set', $date, $format, $locale);
-    }
-
-
-    /**
-     * Adds a date to the existing date object. Format defines how to parse the date string.
-     * If only parts are given the other parts are set to 0.
-     * If no format is given, the standardformat of this locale is used.
-     * For example: MM.dd.YYYY -> 10 -> +10 months
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date to add
-     * @param  string                          $format  OPTIONAL Date format for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addDate($date, $format = null, $locale = null)
-    {
-        return $this->_date('add', $date, $format, $locale);
-    }
-
-
-    /**
-     * Subtracts a date from the existing date object. Format defines how to parse the date string.
-     * If only parts are given the other parts are set to 0.
-     * If no format is given, the standardformat of this locale is used.
-     * For example: MM.dd.YYYY -> 10 -> -10 months
-     * Be aware: Subtracting 2 months is not equal to Adding -2 months !!!
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date to sub
-     * @param  string                          $format  OPTIONAL Date format for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subDate($date, $format = null, $locale = null)
-    {
-        return $this->_date('sub', $date, $format, $locale);
-    }
-
-
-    /**
-     * Compares the date from the existing date object, ignoring the time.
-     * Format defines how to parse the date string.
-     * If only parts are given the other parts are set to 0.
-     * If no format is given, the standardformat of this locale is used.
-     * For example: 10.01.2000 => 10.02.1999 -> false
-     *
-     * @param  string|integer|array|Zend_Date  $date    Date to compare
-     * @param  string                          $format  OPTIONAL Date format for parsing input
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareDate($date, $format = null, $locale = null)
-    {
-        return $this->_date('cmp', $date, $format, $locale);
-    }
-
-
-    /**
-     * Returns the full ISO 8601 date from the date object.
-     * Always the complete ISO 8601 specifiction is used. If an other ISO date is needed
-     * (ISO 8601 defines several formats) use toString() instead.
-     * This function does not return the ISO date as object. Use copy() instead.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return string
-     */
-    public function getIso($locale = null)
-    {
-        return $this->toString(self::ISO_8601, 'iso', $locale);
-    }
-
-
-    /**
-     * Sets a new date for the date object. Not given parts are set to default.
-     * Only supported ISO 8601 formats are accepted.
-     * For example: 050901 -> 01.Sept.2005 00:00:00, 20050201T10:00:30 -> 01.Feb.2005 10h00m30s
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    ISO Date to set
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setIso($date, $locale = null)
-    {
-        return $this->_calcvalue('set', $date, 'iso', self::ISO_8601, $locale);
-    }
-
-
-    /**
-     * Adds a ISO date to the date object. Not given parts are set to default.
-     * Only supported ISO 8601 formats are accepted.
-     * For example: 050901 -> + 01.Sept.2005 00:00:00, 10:00:00 -> +10h
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    ISO Date to add
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addIso($date, $locale = null)
-    {
-        return $this->_calcvalue('add', $date, 'iso', self::ISO_8601, $locale);
-    }
-
-
-    /**
-     * Subtracts a ISO date from the date object. Not given parts are set to default.
-     * Only supported ISO 8601 formats are accepted.
-     * For example: 050901 -> - 01.Sept.2005 00:00:00, 10:00:00 -> -10h
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    ISO Date to sub
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subIso($date, $locale = null)
-    {
-        return $this->_calcvalue('sub', $date, 'iso', self::ISO_8601, $locale);
-    }
-
-
-    /**
-     * Compares a ISO date with the date object. Not given parts are set to default.
-     * Only supported ISO 8601 formats are accepted.
-     * For example: 050901 -> - 01.Sept.2005 00:00:00, 10:00:00 -> -10h
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|Zend_Date  $date    ISO Date to sub
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareIso($date, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $date, 'iso', self::ISO_8601, $locale);
-    }
-
-
-    /**
-     * Returns a RFC 822 compilant datestring from the date object.
-     * This function does not return the RFC date as object. Use copy() instead.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return string
-     */
-    public function getArpa($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'D\, d M y H\:i\:s O';
-        } else {
-            $format = self::RFC_822;
-        }
-
-        return $this->toString($format, 'iso', $locale);
-    }
-
-
-    /**
-     * Sets a RFC 822 date as new date for the date object.
-     * Only RFC 822 compilant date strings are accepted.
-     * For example: Sat, 14 Feb 09 00:31:30 +0100
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    RFC 822 to set
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setArpa($date, $locale = null)
-    {
-        return $this->_calcvalue('set', $date, 'arpa', self::RFC_822, $locale);
-    }
-
-
-    /**
-     * Adds a RFC 822 date to the date object.
-     * ARPA messages are used in emails or HTTP Headers.
-     * Only RFC 822 compilant date strings are accepted.
-     * For example: Sat, 14 Feb 09 00:31:30 +0100
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    RFC 822 Date to add
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addArpa($date, $locale = null)
-    {
-        return $this->_calcvalue('add', $date, 'arpa', self::RFC_822, $locale);
-    }
-
-
-    /**
-     * Subtracts a RFC 822 date from the date object.
-     * ARPA messages are used in emails or HTTP Headers.
-     * Only RFC 822 compilant date strings are accepted.
-     * For example: Sat, 14 Feb 09 00:31:30 +0100
-     * Returned is the new date object
-     *
-     * @param  string|integer|Zend_Date  $date    RFC 822 Date to sub
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subArpa($date, $locale = null)
-    {
-        return $this->_calcvalue('sub', $date, 'arpa', self::RFC_822, $locale);
-    }
-
-
-    /**
-     * Compares a RFC 822 compilant date with the date object.
-     * ARPA messages are used in emails or HTTP Headers.
-     * Only RFC 822 compilant date strings are accepted.
-     * For example: Sat, 14 Feb 09 00:31:30 +0100
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|Zend_Date  $date    RFC 822 Date to sub
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareArpa($date, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $date, 'arpa', self::RFC_822, $locale);
-    }
-
-
-    /**
-     * Check if location is supported
-     *
-     * @param $location array - locations array
-     * @return $horizon float
-     */
-    private function _checkLocation($location)
-    {
-        if (!isset($location['longitude']) or !isset($location['latitude'])) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('Location must include \'longitude\' and \'latitude\'', 0, null, $location);
-        }
-        if (($location['longitude'] > 180) or ($location['longitude'] < -180)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('Longitude must be between -180 and 180', 0, null, $location);
-        }
-        if (($location['latitude'] > 90) or ($location['latitude'] < -90)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('Latitude must be between -90 and 90', 0, null, $location);
-        }
-
-        if (!isset($location['horizon'])){
-            $location['horizon'] = 'effective';
-        }
-
-        switch ($location['horizon']) {
-            case 'civil' :
-                return -0.104528;
-                break;
-            case 'nautic' :
-                return -0.207912;
-                break;
-            case 'astronomic' :
-                return -0.309017;
-                break;
-            default :
-                return -0.0145439;
-                break;
-        }
-    }
-
-
-    /**
-     * Returns the time of sunrise for this date and a given location as new date object
-     * For a list of cities and correct locations use the class Zend_Date_Cities
-     *
-     * @param  $location array - location of sunrise
-     *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
-     *                   ['longitude'] -> longitude of location
-     *                   ['latitude']  -> latitude of location
-     * @return Zend_Date
-     * @throws Zend_Date_Exception
-     */
-    public function getSunrise($location)
-    {
-        $horizon = $this->_checkLocation($location);
-        $result = clone $this;
-        $result->set($this->calcSun($location, $horizon, true), self::TIMESTAMP);
-        return $result;
-    }
-
-
-    /**
-     * Returns the time of sunset for this date and a given location as new date object
-     * For a list of cities and correct locations use the class Zend_Date_Cities
-     *
-     * @param  $location array - location of sunset
-     *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
-     *                   ['longitude'] -> longitude of location
-     *                   ['latitude']  -> latitude of location
-     * @return Zend_Date
-     * @throws Zend_Date_Exception
-     */
-    public function getSunset($location)
-    {
-        $horizon = $this->_checkLocation($location);
-        $result = clone $this;
-        $result->set($this->calcSun($location, $horizon, false), self::TIMESTAMP);
-        return $result;
-    }
-
-
-    /**
-     * Returns an array with the sunset and sunrise dates for all horizon types
-     * For a list of cities and correct locations use the class Zend_Date_Cities
-     *
-     * @param  $location array - location of suninfo
-     *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
-     *                   ['longitude'] -> longitude of location
-     *                   ['latitude']  -> latitude of location
-     * @return array - [sunset|sunrise][effective|civil|nautic|astronomic]
-     * @throws Zend_Date_Exception
-     */
-    public function getSunInfo($location)
-    {
-        $suninfo = array();
-        for ($i = 0; $i < 4; ++$i) {
-            switch ($i) {
-                case 0 :
-                    $location['horizon'] = 'effective';
-                    break;
-                case 1 :
-                    $location['horizon'] = 'civil';
-                    break;
-                case 2 :
-                    $location['horizon'] = 'nautic';
-                    break;
-                case 3 :
-                    $location['horizon'] = 'astronomic';
-                    break;
-            }
-            $horizon = $this->_checkLocation($location);
-            $result = clone $this;
-            $result->set($this->calcSun($location, $horizon, true), self::TIMESTAMP);
-            $suninfo['sunrise'][$location['horizon']] = $result;
-            $result = clone $this;
-            $result->set($this->calcSun($location, $horizon, false), self::TIMESTAMP);
-            $suninfo['sunset'][$location['horizon']]  = $result;
-        }
-        return $suninfo;
-    }
-
-
-    /**
-     * Check a given year for leap year.
-     *
-     * @param  integer|array|Zend_Date  $year  Year to check
-     * @return boolean
-     */
-    public static function checkLeapYear($year)
-    {
-        if ($year instanceof Zend_Date) {
-            $year = (int) $year->toString(self::YEAR, 'iso');
-        }
-
-        if (is_array($year)) {
-            if (isset($year['year']) === true) {
-                $year = $year['year'];
-            } else {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("no year given in array");
-            }
-        }
-
-        if (!is_numeric($year)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("year ($year) has to be integer for checkLeapYear()", 0, null, $year);
-        }
-
-        return (bool) parent::isYearLeapYear($year);
-    }
-
-
-    /**
-     * Returns true, if the year is a leap year.
-     *
-     * @return boolean
-     */
-    public function isLeapYear()
-    {
-        return self::checkLeapYear($this);
-    }
-
-
-    /**
-     * Returns if the set date is todays date
-     *
-     * @return boolean
-     */
-    public function isToday()
-    {
-        $today = $this->date('Ymd', $this->_getTime());
-        $day   = $this->date('Ymd', $this->getUnixTimestamp());
-        return ($today == $day);
-    }
-
-
-    /**
-     * Returns if the set date is yesterdays date
-     *
-     * @return boolean
-     */
-    public function isYesterday()
-    {
-        list($year, $month, $day) = explode('-', $this->date('Y-m-d', $this->_getTime()));
-        // adjusts for leap days and DST changes that are timezone specific
-        $yesterday = $this->date('Ymd', $this->mktime(0, 0, 0, $month, $day -1, $year));
-        $day   = $this->date('Ymd', $this->getUnixTimestamp());
-        return $day == $yesterday;
-    }
-
-
-    /**
-     * Returns if the set date is tomorrows date
-     *
-     * @return boolean
-     */
-    public function isTomorrow()
-    {
-        list($year, $month, $day) = explode('-', $this->date('Y-m-d', $this->_getTime()));
-        // adjusts for leap days and DST changes that are timezone specific
-        $tomorrow = $this->date('Ymd', $this->mktime(0, 0, 0, $month, $day +1, $year));
-        $day   = $this->date('Ymd', $this->getUnixTimestamp());
-        return $day == $tomorrow;
-    }
-
-    /**
-     * Returns the actual date as new date object
-     *
-     * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public static function now($locale = null)
-    {
-        return new Zend_Date(time(), self::TIMESTAMP, $locale);
-    }
-
-    /**
-     * Calculate date details
-     *
-     * @param  string                          $calc    Calculation to make
-     * @param  string|integer|array|Zend_Date  $date    Date or Part to calculate
-     * @param  string                          $part    Datepart for Calculation
-     * @param  string|Zend_Locale              $locale  Locale for parsing input
-     * @return integer|string  new date
-     * @throws Zend_Date_Exception
-     */
-    private function _calcdetail($calc, $date, $type, $locale)
-    {
-        $old = false;
-        if (self::$_options['format_type'] == 'php') {
-            self::$_options['format_type'] = 'iso';
-            $old = true;
-        }
-
-        switch($calc) {
-            case 'set' :
-                $return = $this->set($date, $type, $locale);
-                break;
-            case 'add' :
-                $return = $this->add($date, $type, $locale);
-                break;
-            case 'sub' :
-                $return = $this->sub($date, $type, $locale);
-                break;
-            default :
-                $return = $this->compare($date, $type, $locale);
-                break;
-        }
-
-        if ($old) {
-            self::$_options['format_type'] = 'php';
-        }
-
-        return $return;
-    }
-
-    /**
-     * Internal calculation, returns the requested date type
-     *
-     * @param  string                    $calc    Calculation to make
-     * @param  string|integer|Zend_Date  $value   Datevalue to calculate with, if null the actual value is taken
-     * @param  string|Zend_Locale        $locale  Locale for parsing input
-     * @return integer|Zend_Date  new date
-     * @throws Zend_Date_Exception
-     */
-    private function _calcvalue($calc, $value, $type, $parameter, $locale)
-    {
-        if ($value === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("parameter $type must be set, null is not allowed");
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if ($value instanceof Zend_Date) {
-            // extract value from object
-            $value = $value->toString($parameter, 'iso', $locale);
-        } else if (!is_array($value) && !is_numeric($value) && ($type != 'iso') && ($type != 'arpa')) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("invalid $type ($value) operand", 0, null, $value);
-        }
-
-        $return = $this->_calcdetail($calc, $value, $parameter, $locale);
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-
-    /**
-     * Returns only the year from the date object as new object.
-     * For example: 10.May.2000 10:30:00 -> 01.Jan.2000 00:00:00
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getYear($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'Y';
-        } else {
-            $format = self::YEAR;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Sets a new year
-     * If the year is between 0 and 69, 2000 will be set (2000-2069)
-     * If the year if between 70 and 99, 1999 will be set (1970-1999)
-     * 3 or 4 digit years are set as expected. If you need to set year 0-99
-     * use set() instead.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $date    Year to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setYear($year, $locale = null)
-    {
-        return $this->_calcvalue('set', $year, 'year', self::YEAR, $locale);
-    }
-
-
-    /**
-     * Adds the year to the existing date object
-     * If the year is between 0 and 69, 2000 will be added (2000-2069)
-     * If the year if between 70 and 99, 1999 will be added (1970-1999)
-     * 3 or 4 digit years are added as expected. If you need to add years from 0-99
-     * use add() instead.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $date    Year to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addYear($year, $locale = null)
-    {
-        return $this->_calcvalue('add', $year, 'year', self::YEAR, $locale);
-    }
-
-
-    /**
-     * Subs the year from the existing date object
-     * If the year is between 0 and 69, 2000 will be subtracted (2000-2069)
-     * If the year if between 70 and 99, 1999 will be subtracted (1970-1999)
-     * 3 or 4 digit years are subtracted as expected. If you need to subtract years from 0-99
-     * use sub() instead.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $date    Year to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subYear($year, $locale = null)
-    {
-        return $this->_calcvalue('sub', $year, 'year', self::YEAR, $locale);
-    }
-
-
-    /**
-     * Compares the year with the existing date object, ignoring other date parts.
-     * For example: 10.03.2000 -> 15.02.2000 -> true
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $year    Year to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareYear($year, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $year, 'year', self::YEAR, $locale);
-    }
-
-
-    /**
-     * Returns only the month from the date object as new object.
-     * For example: 10.May.2000 10:30:00 -> 01.May.1970 00:00:00
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getMonth($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'm';
-        } else {
-            $format = self::MONTH;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Returns the calculated month
-     *
-     * @param  string                          $calc    Calculation to make
-     * @param  string|integer|array|Zend_Date  $month   Month to calculate with, if null the actual month is taken
-     * @param  string|Zend_Locale              $locale  Locale for parsing input
-     * @return integer|Zend_Date  new time
-     * @throws Zend_Date_Exception
-     */
-    private function _month($calc, $month, $locale)
-    {
-        if ($month === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $month must be set, null is not allowed');
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if ($month instanceof Zend_Date) {
-            // extract month from object
-            $found = $month->toString(self::MONTH_SHORT, 'iso', $locale);
-        } else {
-            if (is_numeric($month)) {
-                $found = $month;
-            } else if (is_array($month)) {
-                if (isset($month['month']) === true) {
-                    $month = $month['month'];
-                } else {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("no month given in array");
-                }
-            } else {
-                $monthlist  = Zend_Locale_Data::getList($locale, 'month');
-                $monthlist2 = Zend_Locale_Data::getList($locale, 'month', array('gregorian', 'format', 'abbreviated'));
-
-                $monthlist = array_merge($monthlist, $monthlist2);
-                $found = 0;
-                $cnt = 0;
-                foreach ($monthlist as $key => $value) {
-                    if (strtoupper($value) == strtoupper($month)) {
-                        $found = ($key % 12) + 1;
-                        break;
-                    }
-                    ++$cnt;
-                }
-                if ($found == 0) {
-                    foreach ($monthlist2 as $key => $value) {
-                        if (strtoupper(iconv_substr($value, 0, 1, 'UTF-8')) == strtoupper($month)) {
-                            $found = $key + 1;
-                            break;
-                        }
-                        ++$cnt;
-                    }
-                }
-                if ($found == 0) {
-                    require_once 'Zend/Date/Exception.php';
-                    throw new Zend_Date_Exception("unknown month name ($month)", 0, null, $month);
-                }
-            }
-        }
-        $return = $this->_calcdetail($calc, $found, self::MONTH_SHORT, $locale);
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-
-    /**
-     * Sets a new month
-     * The month can be a number or a string. Setting months lower then 0 and greater then 12
-     * will result in adding or subtracting the relevant year. (12 months equal one year)
-     * If a localized monthname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $month   Month to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setMonth($month, $locale = null)
-    {
-        return $this->_month('set', $month, $locale);
-    }
-
-
-    /**
-     * Adds months to the existing date object.
-     * The month can be a number or a string. Adding months lower then 0 and greater then 12
-     * will result in adding or subtracting the relevant year. (12 months equal one year)
-     * If a localized monthname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $month   Month to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addMonth($month, $locale = null)
-    {
-        return $this->_month('add', $month, $locale);
-    }
-
-
-    /**
-     * Subtracts months from the existing date object.
-     * The month can be a number or a string. Subtracting months lower then 0 and greater then 12
-     * will result in adding or subtracting the relevant year. (12 months equal one year)
-     * If a localized monthname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     *
-     * @param  string|integer|array|Zend_Date  $month   Month to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subMonth($month, $locale = null)
-    {
-        return $this->_month('sub', $month, $locale);
-    }
-
-
-    /**
-     * Compares the month with the existing date object, ignoring other date parts.
-     * For example: 10.03.2000 -> 15.03.1950 -> true
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $month   Month to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareMonth($month, $locale = null)
-    {
-        return $this->_month('cmp', $month, $locale);
-    }
-
-
-    /**
-     * Returns the day as new date object
-     * Example: 20.May.1986 -> 20.Jan.1970 00:00:00
-     *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getDay($locale = null)
-    {
-        return $this->copyPart(self::DAY_SHORT, $locale);
-    }
-
-
-    /**
-     * Returns the calculated day
-     *
-     * @param $calc    string                    Type of calculation to make
-     * @param $day     string|integer|Zend_Date  Day to calculate, when null the actual day is calculated
-     * @param $locale  string|Zend_Locale        Locale for parsing input
-     * @return Zend_Date|integer
-     */
-    private function _day($calc, $day, $locale)
-    {
-        if ($day === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $day must be set, null is not allowed');
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if ($day instanceof Zend_Date) {
-            $day = $day->toString(self::DAY_SHORT, 'iso', $locale);
-        }
-
-        if (is_numeric($day)) {
-            $type = self::DAY_SHORT;
-        } else if (is_array($day)) {
-            if (isset($day['day']) === true) {
-                $day = $day['day'];
-                $type = self::WEEKDAY;
-            } else {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("no day given in array");
-            }
-        } else {
-            switch (iconv_strlen($day, 'UTF-8')) {
-                case 1 :
-                   $type = self::WEEKDAY_NARROW;
-                    break;
-                case 2:
-                    $type = self::WEEKDAY_NAME;
-                    break;
-                case 3:
-                    $type = self::WEEKDAY_SHORT;
-                    break;
-                default:
-                    $type = self::WEEKDAY;
-                    break;
-            }
-        }
-        $return = $this->_calcdetail($calc, $day, $type, $locale);
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-
-    /**
-     * Sets a new day
-     * The day can be a number or a string. Setting days lower then 0 or greater than the number of this months days
-     * will result in adding or subtracting the relevant month.
-     * If a localized dayname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     * Example: setDay('Montag', 'de_AT'); will set the monday of this week as day.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Day to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setDay($day, $locale = null)
-    {
-        return $this->_day('set', $day, $locale);
-    }
-
-
-    /**
-     * Adds days to the existing date object.
-     * The day can be a number or a string. Adding days lower then 0 or greater than the number of this months days
-     * will result in adding or subtracting the relevant month.
-     * If a localized dayname is given it will be parsed with the default locale or the optional
-     * set locale.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Day to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addDay($day, $locale = null)
-    {
-        return $this->_day('add', $day, $locale);
-    }
-
-
-    /**
-     * Subtracts days from the existing date object.
-     * The day can be a number or a string. Subtracting days lower then 0 or greater than the number of this months days
-     * will result in adding or subtracting the relevant month.
-     * If a localized dayname is given it will be parsed with the default locale or the optional
-     * set locale.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Day to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subDay($day, $locale = null)
-    {
-        return $this->_day('sub', $day, $locale);
-    }
-
-
-    /**
-     * Compares the day with the existing date object, ignoring other date parts.
-     * For example: 'Monday', 'en' -> 08.Jan.2007 -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $day     Day to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareDay($day, $locale = null)
-    {
-        return $this->_day('cmp', $day, $locale);
-    }
-
-
-    /**
-     * Returns the weekday as new date object
-     * Weekday is always from 1-7
-     * Example: 09-Jan-2007 -> 2 = Tuesday -> 02-Jan-1970 (when 02.01.1970 is also Tuesday)
-     *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getWeekday($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'l';
-        } else {
-            $format = self::WEEKDAY;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Returns the calculated weekday
-     *
-     * @param  $calc     string                          Type of calculation to make
-     * @param  $weekday  string|integer|array|Zend_Date  Weekday to calculate, when null the actual weekday is calculated
-     * @param  $locale   string|Zend_Locale              Locale for parsing input
-     * @return Zend_Date|integer
-     * @throws Zend_Date_Exception
-     */
-    private function _weekday($calc, $weekday, $locale)
-    {
-        if ($weekday === null) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('parameter $weekday must be set, null is not allowed');
-        }
-
-        if ($locale === null) {
-            $locale = $this->getLocale();
-        }
-
-        if ($weekday instanceof Zend_Date) {
-            $weekday = $weekday->toString(self::WEEKDAY_8601, 'iso', $locale);
-        }
-
-        if (is_numeric($weekday)) {
-            $type = self::WEEKDAY_8601;
-        } else if (is_array($weekday)) {
-            if (isset($weekday['weekday']) === true) {
-                $weekday = $weekday['weekday'];
-                $type = self::WEEKDAY;
-            } else {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("no weekday given in array");
-            }
-        } else {
-            switch(iconv_strlen($weekday, 'UTF-8')) {
-                case 1:
-                   $type = self::WEEKDAY_NARROW;
-                    break;
-                case 2:
-                    $type = self::WEEKDAY_NAME;
-                    break;
-                case 3:
-                    $type = self::WEEKDAY_SHORT;
-                    break;
-                default:
-                    $type = self::WEEKDAY;
-                    break;
-            }
-        }
-        $return = $this->_calcdetail($calc, $weekday, $type, $locale);
-        if ($calc != 'cmp') {
-            return $this;
-        }
-        return $return;
-    }
-
-
-    /**
-     * Sets a new weekday
-     * The weekday can be a number or a string. If a localized weekday name is given,
-     * then it will be parsed as a date in $locale (defaults to the same locale as $this).
-     * Returned is the new date object.
-     * Example: setWeekday(3); will set the wednesday of this week as day.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setWeekday($weekday, $locale = null)
-    {
-        return $this->_weekday('set', $weekday, $locale);
-    }
-
-
-    /**
-     * Adds weekdays to the existing date object.
-     * The weekday can be a number or a string.
-     * If a localized dayname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     * Example: addWeekday(3); will add the difference of days from the begining of the month until
-     * wednesday.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addWeekday($weekday, $locale = null)
-    {
-        return $this->_weekday('add', $weekday, $locale);
-    }
-
-
-    /**
-     * Subtracts weekdays from the existing date object.
-     * The weekday can be a number or a string.
-     * If a localized dayname is given it will be parsed with the default locale or the optional
-     * set locale.
-     * Returned is the new date object
-     * Example: subWeekday(3); will subtract the difference of days from the begining of the month until
-     * wednesday.
-     *
-     * @param  string|integer|array|Zend_Date  $month   Weekday to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subWeekday($weekday, $locale = null)
-    {
-        return $this->_weekday('sub', $weekday, $locale);
-    }
-
-
-    /**
-     * Compares the weekday with the existing date object, ignoring other date parts.
-     * For example: 'Monday', 'en' -> 08.Jan.2007 -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $weekday  Weekday to compare
-     * @param  string|Zend_Locale              $locale   OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareWeekday($weekday, $locale = null)
-    {
-        return $this->_weekday('cmp', $weekday, $locale);
-    }
-
-
-    /**
-     * Returns the day of year as new date object
-     * Example: 02.Feb.1986 10:00:00 -> 02.Feb.1970 00:00:00
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getDayOfYear($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'D';
-        } else {
-            $format = self::DAY_OF_YEAR;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Sets a new day of year
-     * The day of year is always a number.
-     * Returned is the new date object
-     * Example: 04.May.2004 -> setDayOfYear(10) -> 10.Jan.2004
-     *
-     * @param  string|integer|array|Zend_Date  $day     Day of Year to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setDayOfYear($day, $locale = null)
-    {
-        return $this->_calcvalue('set', $day, 'day of year', self::DAY_OF_YEAR, $locale);
-    }
-
-
-    /**
-     * Adds a day of year to the existing date object.
-     * The day of year is always a number.
-     * Returned is the new date object
-     * Example: addDayOfYear(10); will add 10 days to the existing date object.
-     *
-     * @param  string|integer|array|Zend_Date  $day     Day of Year to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addDayOfYear($day, $locale = null)
-    {
-        return $this->_calcvalue('add', $day, 'day of year', self::DAY_OF_YEAR, $locale);
-    }
-
-
-    /**
-     * Subtracts a day of year from the existing date object.
-     * The day of year is always a number.
-     * Returned is the new date object
-     * Example: subDayOfYear(10); will subtract 10 days from the existing date object.
-     *
-     * @param  string|integer|array|Zend_Date  $day     Day of Year to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subDayOfYear($day, $locale = null)
-    {
-        return $this->_calcvalue('sub', $day, 'day of year', self::DAY_OF_YEAR, $locale);
-    }
-
-
-    /**
-     * Compares the day of year with the existing date object.
-     * For example: compareDayOfYear(33) -> 02.Feb.2007 -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $day     Day of Year to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareDayOfYear($day, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $day, 'day of year', self::DAY_OF_YEAR, $locale);
-    }
-
-
-    /**
-     * Returns the hour as new date object
-     * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 10:00:00
-     *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getHour($locale = null)
-    {
-        return $this->copyPart(self::HOUR, $locale);
-    }
-
-
-    /**
-     * Sets a new hour
-     * The hour is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> setHour(7); -> 04.May.1993 07:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $hour    Hour to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setHour($hour, $locale = null)
-    {
-        return $this->_calcvalue('set', $hour, 'hour', self::HOUR_SHORT, $locale);
-    }
-
-
-    /**
-     * Adds hours to the existing date object.
-     * The hour is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> addHour(12); -> 05.May.1993 01:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $hour    Hour to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addHour($hour, $locale = null)
-    {
-        return $this->_calcvalue('add', $hour, 'hour', self::HOUR_SHORT, $locale);
-    }
-
-
-    /**
-     * Subtracts hours from the existing date object.
-     * The hour is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> subHour(6); -> 05.May.1993 07:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $hour    Hour to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subHour($hour, $locale = null)
-    {
-        return $this->_calcvalue('sub', $hour, 'hour', self::HOUR_SHORT, $locale);
-    }
-
-
-    /**
-     * Compares the hour with the existing date object.
-     * For example: 10:30:25 -> compareHour(10) -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $hour    Hour to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareHour($hour, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $hour, 'hour', self::HOUR_SHORT, $locale);
-    }
-
-
-    /**
-     * Returns the minute as new date object
-     * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 00:30:00
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getMinute($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'i';
-        } else {
-            $format = self::MINUTE;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Sets a new minute
-     * The minute is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> setMinute(29); -> 04.May.1993 13:29:25
-     *
-     * @param  string|integer|array|Zend_Date  $minute  Minute to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setMinute($minute, $locale = null)
-    {
-        return $this->_calcvalue('set', $minute, 'minute', self::MINUTE_SHORT, $locale);
-    }
-
-
-    /**
-     * Adds minutes to the existing date object.
-     * The minute is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> addMinute(65); -> 04.May.1993 13:12:25
-     *
-     * @param  string|integer|array|Zend_Date  $minute  Minute to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addMinute($minute, $locale = null)
-    {
-        return $this->_calcvalue('add', $minute, 'minute', self::MINUTE_SHORT, $locale);
-    }
-
-
-    /**
-     * Subtracts minutes from the existing date object.
-     * The minute is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> subMinute(9); -> 04.May.1993 12:58:25
-     *
-     * @param  string|integer|array|Zend_Date  $minute  Minute to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subMinute($minute, $locale = null)
-    {
-        return $this->_calcvalue('sub', $minute, 'minute', self::MINUTE_SHORT, $locale);
-    }
-
-
-    /**
-     * Compares the minute with the existing date object.
-     * For example: 10:30:25 -> compareMinute(30) -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date  $minute  Hour to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareMinute($minute, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $minute, 'minute', self::MINUTE_SHORT, $locale);
-    }
-
-
-    /**
-     * Returns the second as new date object
-     * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 00:00:25
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getSecond($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 's';
-        } else {
-            $format = self::SECOND;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-
-    /**
-     * Sets new seconds to the existing date object.
-     * The second is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> setSecond(100); -> 04.May.1993 13:08:40
-     *
-     * @param  string|integer|array|Zend_Date $second Second to set
-     * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setSecond($second, $locale = null)
-    {
-        return $this->_calcvalue('set', $second, 'second', self::SECOND_SHORT, $locale);
-    }
-
-
-    /**
-     * Adds seconds to the existing date object.
-     * The second is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> addSecond(65); -> 04.May.1993 13:08:30
-     *
-     * @param  string|integer|array|Zend_Date $second Second to add
-     * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addSecond($second, $locale = null)
-    {
-        return $this->_calcvalue('add', $second, 'second', self::SECOND_SHORT, $locale);
-    }
-
-
-    /**
-     * Subtracts seconds from the existing date object.
-     * The second is always a number.
-     * Returned is the new date object
-     * Example: 04.May.1993 13:07:25 -> subSecond(10); -> 04.May.1993 13:07:15
-     *
-     * @param  string|integer|array|Zend_Date $second Second to sub
-     * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subSecond($second, $locale = null)
-    {
-        return $this->_calcvalue('sub', $second, 'second', self::SECOND_SHORT, $locale);
-    }
-
-
-    /**
-     * Compares the second with the existing date object.
-     * For example: 10:30:25 -> compareSecond(25) -> 0
-     * Returns if equal, earlier or later
-     *
-     * @param  string|integer|array|Zend_Date $second Second to compare
-     * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     * @throws Zend_Date_Exception
-     */
-    public function compareSecond($second, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $second, 'second', self::SECOND_SHORT, $locale);
-    }
-
-
-    /**
-     * Returns the precision for fractional seconds
-     *
-     * @return integer
-     */
-    public function getFractionalPrecision()
-    {
-        return $this->_precision;
-    }
-
-
-    /**
-     * Sets a new precision for fractional seconds
-     *
-     * @param  integer $precision Precision for the fractional datepart 3 = milliseconds
-     * @throws Zend_Date_Exception
-     * @return Zend_Date Provides fluid interface
-     */
-    public function setFractionalPrecision($precision)
-    {
-        if (!intval($precision) or ($precision < 0) or ($precision > 9)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision);
-        }
-
-        $this->_precision = (int) $precision;
-        if ($this->_precision < strlen($this->_fractional)) {
-            $this->_fractional = substr($this->_fractional, 0, $this->_precision);
-        } else {
-            $this->_fractional = str_pad($this->_fractional, $this->_precision, '0', STR_PAD_RIGHT);
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * Returns the milliseconds of the date object
-     *
-     * @return string
-     */
-    public function getMilliSecond()
-    {
-        return $this->_fractional;
-    }
-
-
-    /**
-     * Sets new milliseconds for the date object
-     * Example: setMilliSecond(550, 2) -> equals +5 Sec +50 MilliSec
-     *
-     * @param  integer|Zend_Date $milli     (Optional) Millisecond to set, when null the actual millisecond is set
-     * @param  integer           $precision (Optional) Fraction precision of the given milliseconds
-     * @return Zend_Date Provides fluid interface
-     */
-    public function setMilliSecond($milli = null, $precision = null)
-    {
-        if ($milli === null) {
-            list($milli, $time) = explode(" ", microtime());
-            $milli = intval($milli);
-            $precision = 6;
-        } else if (!is_numeric($milli)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli);
-        }
-
-        if ($precision === null) {
-            $precision = $this->_precision;
-        }
-
-        if (!is_int($precision) || $precision < 1 || $precision > 9) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision);
-        }
-
-        $this->_fractional = 0;
-        $this->addMilliSecond($milli, $precision);
-        return $this;
-    }
-
-
-    /**
-     * Adds milliseconds to the date object
-     *
-     * @param  integer|Zend_Date $milli     (Optional) Millisecond to add, when null the actual millisecond is added
-     * @param  integer           $precision (Optional) Fractional precision for the given milliseconds
-     * @return Zend_Date Provides fluid interface
-     */
-    public function addMilliSecond($milli = null, $precision = null)
-    {
-        if ($milli === null) {
-            list($milli, $time) = explode(" ", microtime());
-            $milli = intval($milli);
-        } else if (!is_numeric($milli)) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli);
-        }
-
-        if ($precision === null) {
-            $precision = strlen($milli);
-            if ($milli < 0) {
-                --$precision;
-            }
-        }
-
-        if (!is_int($precision) || $precision < 1 || $precision > 9) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision);
-        }
-
-        $this->_fractional += $milli;
-
-        // Add/sub milliseconds + add/sub seconds
-        $max = pow(10, $this->_precision);
-        // Milli includes seconds
-        if ($this->_fractional >= $max) {
-            while ($this->_fractional >= $max) {
-                $this->addSecond(1);
-                $this->_fractional -= $max;
-            }
-        }
-
-        if ($this->_fractional < 0) {
-            while ($this->_fractional < 0) {
-                $this->subSecond(1);
-                $this->_fractional += $max;
-            }
-        }
-
-        if ($this->_precision > strlen($this->_fractional)) {
-            $this->_fractional = str_pad($this->_fractional, $this->_precision, '0', STR_PAD_LEFT);
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * Subtracts a millisecond
-     *
-     * @param  integer|Zend_Date $milli     (Optional) Millisecond to sub, when null the actual millisecond is subtracted
-     * @param  integer           $precision (Optional) Fractional precision for the given milliseconds
-     * @return Zend_Date Provides fluid interface
-     */
-    public function subMilliSecond($milli = null, $precision = null)
-    {
-        $this->addMilliSecond(0 - $milli, $precision);
-        return $this;
-    }
-
-    /**
-     * Compares only the millisecond part, returning the difference
-     *
-     * @param  integer|Zend_Date  $milli  OPTIONAL Millisecond to compare, when null the actual millisecond is compared
-     * @param  integer            $precision  OPTIONAL Fractional precision for the given milliseconds
-     * @throws Zend_Date_Exception On invalid input
-     * @return integer  0 = equal, 1 = later, -1 = earlier
-     */
-    public function compareMilliSecond($milli = null, $precision = null)
-    {
-        if ($milli === null) {
-            list($milli, $time) = explode(" ", microtime());
-            $milli = intval($milli);
-        } else if (is_numeric($milli) === false) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli);
-        }
-
-        if ($precision === null) {
-            $precision = strlen($milli);
-        } else if (!is_int($precision) || $precision < 1 || $precision > 9) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision);
-        }
-
-        if ($precision === 0) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('precision is 0');
-        }
-
-        if ($precision != $this->_precision) {
-            if ($precision > $this->_precision) {
-                $diff = $precision - $this->_precision;
-                $milli = (int) ($milli / (10 * $diff));
-            } else {
-                $diff = $this->_precision - $precision;
-                $milli = (int) ($milli * (10 * $diff));
-            }
-        }
-
-        $comp = $this->_fractional - $milli;
-        if ($comp < 0) {
-            return -1;
-        } else if ($comp > 0) {
-            return 1;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the week as new date object using monday as begining of the week
-     * Example: 12.Jan.2007 -> 08.Jan.1970 00:00:00
-     *
-     * @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date
-     */
-    public function getWeek($locale = null)
-    {
-        if (self::$_options['format_type'] == 'php') {
-            $format = 'W';
-        } else {
-            $format = self::WEEK;
-        }
-
-        return $this->copyPart($format, $locale);
-    }
-
-    /**
-     * Sets a new week. The week is always a number. The day of week is not changed.
-     * Returned is the new date object
-     * Example: 09.Jan.2007 13:07:25 -> setWeek(1); -> 02.Jan.2007 13:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $week    Week to set
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function setWeek($week, $locale = null)
-    {
-        return $this->_calcvalue('set', $week, 'week', self::WEEK, $locale);
-    }
-
-    /**
-     * Adds a week. The week is always a number. The day of week is not changed.
-     * Returned is the new date object
-     * Example: 09.Jan.2007 13:07:25 -> addWeek(1); -> 16.Jan.2007 13:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $week    Week to add
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function addWeek($week, $locale = null)
-    {
-        return $this->_calcvalue('add', $week, 'week', self::WEEK, $locale);
-    }
-
-    /**
-     * Subtracts a week. The week is always a number. The day of week is not changed.
-     * Returned is the new date object
-     * Example: 09.Jan.2007 13:07:25 -> subWeek(1); -> 02.Jan.2007 13:07:25
-     *
-     * @param  string|integer|array|Zend_Date  $week    Week to sub
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return Zend_Date Provides fluid interface
-     * @throws Zend_Date_Exception
-     */
-    public function subWeek($week, $locale = null)
-    {
-        return $this->_calcvalue('sub', $week, 'week', self::WEEK, $locale);
-    }
-
-    /**
-     * Compares only the week part, returning the difference
-     * Returned is the new date object
-     * Returns if equal, earlier or later
-     * Example: 09.Jan.2007 13:07:25 -> compareWeek(2); -> 0
-     *
-     * @param  string|integer|array|Zend_Date  $week    Week to compare
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return integer 0 = equal, 1 = later, -1 = earlier
-     */
-    public function compareWeek($week, $locale = null)
-    {
-        return $this->_calcvalue('cmp', $week, 'week', self::WEEK, $locale);
-    }
-
-    /**
-     * Sets a new standard locale for the date object.
-     * This locale will be used for all functions
-     * Returned is the really set locale.
-     * Example: 'de_XX' will be set to 'de' because 'de_XX' does not exist
-     * 'xx_YY' will be set to 'root' because 'xx' does not exist
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
-     * @throws Zend_Date_Exception When the given locale does not exist
-     * @return Zend_Date Provides fluent interface
-     */
-    public function setLocale($locale = null)
-    {
-        try {
-            $this->_locale = Zend_Locale::findLocale($locale);
-        } catch (Zend_Locale_Exception $e) {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception($e->getMessage(), 0, $e);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the actual set locale
-     *
-     * @return string
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Checks if the given date is a real date or datepart.
-     * Returns false if a expected datepart is missing or a datepart exceeds its possible border.
-     * But the check will only be done for the expected dateparts which are given by format.
-     * If no format is given the standard dateformat for the actual locale is used.
-     * f.e. 30.February.2007 will return false if format is 'dd.MMMM.YYYY'
-     *
-     * @param  string|array|Zend_Date $date   Date to parse for correctness
-     * @param  string                 $format (Optional) Format for parsing the date string
-     * @param  string|Zend_Locale     $locale (Optional) Locale for parsing date parts
-     * @return boolean                True when all date parts are correct
-     */
-    public static function isDate($date, $format = null, $locale = null)
-    {
-        if (!is_string($date) && !is_numeric($date) && !($date instanceof Zend_Date) &&
-            !is_array($date)) {
-            return false;
-        }
-
-        if (($format !== null) and (Zend_Locale::isLocale($format, null, false))) {
-            $locale = $format;
-            $format = null;
-        }
-
-        $locale = Zend_Locale::findLocale($locale);
-
-        if ($format === null) {
-            $format = Zend_Locale_Format::getDateFormat($locale);
-        } else if ((self::$_options['format_type'] == 'php') && !defined($format)) {
-            $format = Zend_Locale_Format::convertPhpToIsoFormat($format);
-        }
-
-        $format = self::_getLocalizedToken($format, $locale);
-        if (!is_array($date)) {
-            try {
-                $parsed = Zend_Locale_Format::getDate($date, array('locale' => $locale,
-                                                      'date_format' => $format, 'format_type' => 'iso',
-                                                      'fix_date' => false));
-            } catch (Zend_Locale_Exception $e) {
-                // Date can not be parsed
-                return false;
-            }
-        } else {
-            $parsed = $date;
-        }
-
-        if (((strpos($format, 'Y') !== false) or (strpos($format, 'y') !== false)) and
-            (!isset($parsed['year']))) {
-            // Year expected but not found
-                return false;
-        }
-
-        if ((strpos($format, 'M') !== false) and (!isset($parsed['month']))) {
-            // Month expected but not found
-            return false;
-        }
-
-        if ((strpos($format, 'd') !== false) and (!isset($parsed['day']))) {
-            // Day expected but not found
-            return false;
-        }
-
-        if (((strpos($format, 'H') !== false) or (strpos($format, 'h') !== false)) and
-            (!isset($parsed['hour']))) {
-            // Hour expected but not found
-                return false;
-        }
-
-        if ((strpos($format, 'm') !== false) and (!isset($parsed['minute']))) {
-            // Minute expected but not found
-            return false;
-        }
-
-        if ((strpos($format, 's') !== false) and (!isset($parsed['second']))) {
-            // Second expected  but not found
-            return false;
-        }
-
-        // Set not given dateparts
-        if (isset($parsed['hour']) === false) {
-            $parsed['hour'] = 12;
-        }
-
-        if (isset($parsed['minute']) === false) {
-            $parsed['minute'] = 0;
-        }
-
-        if (isset($parsed['second']) === false) {
-            $parsed['second'] = 0;
-        }
-
-        if (isset($parsed['month']) === false) {
-            $parsed['month'] = 1;
-        }
-
-        if (isset($parsed['day']) === false) {
-            $parsed['day'] = 1;
-        }
-
-        if (isset($parsed['year']) === false) {
-            $parsed['year'] = 1970;
-        }
-
-        if (self::isYearLeapYear($parsed['year'])) {
-            $parsed['year'] = 1972;
-        } else {
-            $parsed['year'] = 1971;
-        }
-
-        $date      = new self($parsed, null, $locale);
-        $timestamp = $date->mktime($parsed['hour'], $parsed['minute'], $parsed['second'],
-                                   $parsed['month'], $parsed['day'], $parsed['year']);
-
-        if ($parsed['year'] != $date->date('Y', $timestamp)) {
-            // Given year differs from parsed year
-            return false;
-        }
-
-        if ($parsed['month'] != $date->date('n', $timestamp)) {
-            // Given month differs from parsed month
-            return false;
-        }
-
-        if ($parsed['day'] != $date->date('j', $timestamp)) {
-            // Given day differs from parsed day
-            return false;
-        }
-
-        if ($parsed['hour'] != $date->date('G', $timestamp)) {
-            // Given hour differs from parsed hour
-            return false;
-        }
-
-        if ($parsed['minute'] != $date->date('i', $timestamp)) {
-            // Given minute differs from parsed minute
-            return false;
-        }
-
-        if ($parsed['second'] != $date->date('s', $timestamp)) {
-            // Given second differs from parsed second
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the ISO Token for all localized constants
-     *
-     * @param string $token Token to normalize
-     * @param string $locale Locale to search
-     * @return string
-     */
-    protected static function _getLocalizedToken($token, $locale)
-    {
-        switch($token) {
-            case self::ISO_8601 :
-                return "yyyy-MM-ddThh:mm:ss";
-                break;
-            case self::RFC_2822 :
-                return "EEE, dd MMM yyyy HH:mm:ss";
-                break;
-            case self::DATES :
-                return Zend_Locale_Data::getContent($locale, 'date');
-                break;
-            case self::DATE_FULL :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'full'));
-                break;
-            case self::DATE_LONG :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'long'));
-                break;
-            case self::DATE_MEDIUM :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'medium'));
-                break;
-            case self::DATE_SHORT :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short'));
-                break;
-            case self::TIMES :
-                return Zend_Locale_Data::getContent($locale, 'date');
-                break;
-            case self::TIME_FULL :
-                return Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'full'));
-                break;
-            case self::TIME_LONG :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'long'));
-                break;
-            case self::TIME_MEDIUM :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'medium'));
-                break;
-            case self::TIME_SHORT :
-                return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short'));
-                break;
-            case self::DATETIME :
-                return Zend_Locale_Data::getContent($locale, 'datetime');
-                break;
-            case self::DATETIME_FULL :
-                return Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'full'));
-                break;
-            case self::DATETIME_LONG :
-                return Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'long'));
-                break;
-            case self::DATETIME_MEDIUM :
-                return Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'medium'));
-                break;
-            case self::DATETIME_SHORT :
-                return Zend_Locale_Data::getContent($locale, 'datetime', array('gregorian', 'short'));
-                break;
-            case self::ATOM :
-            case self::RFC_3339 :
-            case self::W3C :
-                return "yyyy-MM-DD HH:mm:ss";
-                break;
-            case self::COOKIE :
-            case self::RFC_850 :
-                return "EEEE, dd-MM-yyyy HH:mm:ss";
-                break;
-            case self::RFC_822 :
-            case self::RFC_1036 :
-            case self::RFC_1123 :
-            case self::RSS :
-                return "EEE, dd MM yyyy HH:mm:ss";
-                break;
-        }
-
-        return $token;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Date/Cities.php b/airtime_mvc/library/Zend/Date/Cities.php
deleted file mode 100644
index 47244b629..000000000
--- a/airtime_mvc/library/Zend/Date/Cities.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Cities.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Additional data for sunset/sunrise calculations
- *
- * Holds the geographical data for all capital cities and many others worldwide
- * Original data from http://www.fallingrain.com/world/
- *
- * @category   Zend
- * @package    Zend_Date
- * @subpackage Zend_Date_Cities
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Date_Cities
-{
-    /**
-     * Array Collection of known cities
-     *
-     * The array contains 'latitude' and 'longitude' for every known city
-     *
-     * @var Array
-     */
-    public static $cities = array(
-        'Abidjan'       => array('latitude' =>    5.3411111, 'longitude' =>   -4.0280556),
-        'Abu Dhabi'     => array('latitude' =>   24.4666667, 'longitude' =>   54.3666667),
-        'Abuja'       => array('latitude' =>    9.1758333, 'longitude' =>    7.1808333),
-        'Accra'       => array('latitude' =>    5.55,      'longitude' =>   -0.2166667),
-        'Adamstown'   => array('latitude' =>  -25.0666667, 'longitude' => -130.0833333),
-        'Addis Ababa' => array('latitude' =>    9.0333333, 'longitude' =>   38.7),
-        'Adelaide'    => array('latitude' =>  -34.9333333, 'longitude' =>  138.6),
-        'Algiers'     => array('latitude' =>   36.7630556, 'longitude' =>    3.0505556),
-        'Alofi'       => array('latitude' =>  -19.0166667, 'longitude' => -169.9166667),
-        'Amman'       => array('latitude' =>   31.95,      'longitude' =>   35.9333333),
-        'Amsterdam'        => array('latitude' =>   52.35,      'longitude' =>    4.9166667),
-        'Andorra la Vella' => array('latitude' => 42.5,    'longitude' =>    1.5166667),
-        'Ankara'      => array('latitude' =>   39.9272222, 'longitude' =>   32.8644444),
-        'Antananarivo' => array('latitude' => -18.9166667, 'longitude' =>   47.5166667),
-        'Apia'        => array('latitude' =>  -13.8333333, 'longitude' => -171.7333333),
-        'Ashgabat'    => array('latitude' =>   37.95,      'longitude' =>   58.3833333),
-        'Asmara'      => array('latitude' =>   15.3333333, 'longitude' =>   38.9333333),
-        'Astana'      => array('latitude' =>   51.1811111, 'longitude' =>   71.4277778),
-        'Asunción'    => array('latitude' =>  -25.2666667, 'longitude' =>  -57.6666667),
-        'Athens'      => array('latitude' =>   37.9833333, 'longitude' =>   23.7333333),
-        'Auckland'    => array('latitude' =>  -36.8666667, 'longitude' =>  174.7666667),
-        'Avarua'      => array('latitude' =>  -21.2,       'longitude' => -159.7666667),
-        'Baghdad'     => array('latitude' =>   33.3386111, 'longitude' =>   44.3938889),
-        'Baku'        => array('latitude' =>   40.3952778, 'longitude' =>   49.8822222),
-        'Bamako'      => array('latitude' =>   12.65,      'longitude' =>   -8),
-        'Bandar Seri Begawan' => array('latitude' => 4.8833333, 'longitude' => 114.9333333),
-        'Bankok'      => array('latitude' =>   13.5833333, 'longitude' =>  100.2166667),
-        'Bangui'      => array('latitude' =>    4.3666667, 'longitude' =>   18.5833333),
-        'Banjul'      => array('latitude' =>   13.4530556, 'longitude' =>  -16.5775),
-        'Basel'       => array('latitude' =>   47.5666667, 'longitude' =>    7.6),
-        'Basseterre'  => array('latitude' =>   17.3,       'longitude' =>  -62.7166667),
-        'Beijing'     => array('latitude' =>   39.9288889, 'longitude' =>  116.3883333),
-        'Beirut'      => array('latitude' =>   33.8719444, 'longitude' =>   35.5097222),
-        'Belgrade'    => array('latitude' =>   44.8186111, 'longitude' =>   20.4680556),
-        'Belmopan'    => array('latitude' =>   17.25,      'longitude' =>  -88.7666667),
-        'Berlin'      => array('latitude' =>   52.5166667, 'longitude' =>   13.4),
-        'Bern'        => array('latitude' =>   46.9166667, 'longitude' =>    7.4666667),
-        'Bishkek'     => array('latitude' =>   42.8730556, 'longitude' =>   74.6002778),
-        'Bissau'      => array('latitude' =>   11.85,      'longitude' =>  -15.5833333),
-        'Bloemfontein' => array('latitude' => -29.1333333, 'longitude' =>   26.2),
-        'Bogotá'      => array('latitude' =>    4.6,       'longitude' =>  -74.0833333),
-        'Brasilia'    => array('latitude' =>  -15.7833333, 'longitude' =>  -47.9166667),
-        'Bratislava'  => array('latitude' =>   48.15,      'longitude' =>   17.1166667),
-        'Brazzaville' => array('latitude' =>   -4.2591667, 'longitude' =>   15.2847222),
-        'Bridgetown'  => array('latitude' =>   13.1,       'longitude' =>  -59.6166667),
-        'Brisbane'    => array('latitude' =>  -27.5,       'longitude' =>  153.0166667),
-        'Brussels'    => array('latitude' =>  50.8333333,  'longitude' =>    4.3333333),
-        'Bucharest'   => array('latitude' =>  44.4333333,  'longitude' =>   26.1),
-        'Budapest'    => array('latitude' =>  47.5,        'longitude' =>   19.0833333),
-        'Buenos Aires' => array('latitude' => -34.5875,    'longitude' =>  -58.6725),
-        'Bujumbura'   => array('latitude' =>   -3.3761111, 'longitude' =>   29.36),
-        'Cairo'       => array('latitude' =>   30.05,      'longitude' =>   31.25),
-        'Calgary'     => array('latitude' =>   51.0833333, 'longitude' => -114.0833333),
-        'Canberra'    => array('latitude' =>  -35.2833333, 'longitude' =>  149.2166667),
-        'Cape Town'   => array('latitude' =>  -33.9166667, 'longitude' =>   18.4166667),
-        'Caracas'     => array('latitude' =>   10.5,       'longitude' =>  -66.9166667),
-        'Castries'    => array('latitude' =>   14,         'longitude' =>  -61),
-        'Charlotte Amalie' => array('latitude' => 18.34389, 'longitude' => -64.93111),
-        'Chicago'     => array('latitude' =>   41.85,      'longitude' =>  -87.65),
-        'Chisinau'    => array('latitude' =>   47.055556,  'longitude' =>   28.8575),
-        'Cockburn Town' => array('latitude' => 21.4666667, 'longitude' =>  -71.1333333),
-        'Colombo'     => array('latitude' =>    6.9319444, 'longitude' =>   79.8477778),
-        'Conakry'     => array('latitude' =>    9.5091667, 'longitude' =>  -13.7122222),
-        'Copenhagen'  => array('latitude' =>   55.6666667, 'longitude' =>   12.5833333),
-        'Cotonou'     => array('latitude' =>    6.35,      'longitude' =>    2.4333333),
-        'Dakar'       => array('latitude' =>   14.6708333, 'longitude' =>  -17.4380556),
-        'Damascus'    => array('latitude' =>   33.5,       'longitude' =>   36.3),
-        'Dar es Salaam' => array('latitude' => -6.8,       'longitude' =>   39.2833333),
-        'Dhaka'       => array('latitude' =>   23.7230556, 'longitude' =>   90.4086111),
-        'Dili'        => array('latitude' =>   -8.5586111, 'longitude' =>  125.5736111),
-        'Djibouti'    => array('latitude' =>   11.595,     'longitude' =>   43.1480556),
-        'Dodoma'      => array('latitude' =>   -6.1833333, 'longitude' =>   35.75),
-        'Doha'        => array('latitude' =>   25.2866667, 'longitude' =>   51.5333333),
-        'Dubai'       => array('latitude' =>   25.2522222, 'longitude' =>   55.28),
-        'Dublin'      => array('latitude' =>   53.3330556, 'longitude' =>   -6.2488889),
-        'Dushanbe'    => array('latitude' =>   38.56,      'longitude' =>   68.7738889 ),
-        'Fagatogo'    => array('latitude' =>  -14.2825,    'longitude' => -170.69),
-        'Fongafale'   => array('latitude' =>   -8.5166667, 'longitude' =>  179.2166667),
-        'Freetown'    => array('latitude' =>    8.49,      'longitude' =>  -13.2341667),
-        'Gaborone'    => array('latitude' =>  -24.6463889, 'longitude' =>   25.9119444),
-        'Geneva'      => array('latitude' =>   46.2,       'longitude' =>    6.1666667),
-        'George Town' => array('latitude' =>   19.3,       'longitude' =>  -81.3833333),
-        'Georgetown'  => array('latitude' =>    6.8,       'longitude' =>  -58.1666667),
-        'Gibraltar'   => array('latitude' =>   36.1333333, 'longitude' =>   -5.35),
-        'Glasgow'     => array('latitude' =>   55.8333333, 'longitude' =>   -4.25),
-        'Guatemala la Nueva' => array('latitude' => 14.6211111, 'longitude' => -90.5269444),
-        'Hagatna'     => array('latitude' =>   13.47417,   'longitude' =>  144.74778),
-        'The Hague'   => array('latitude' =>   52.0833333, 'longitude' =>    4.3),
-        'Hamilton'    => array('latitude' =>   32.2941667, 'longitude' =>  -64.7838889),
-        'Hanoi'       => array('latitude' =>   21.0333333, 'longitude' =>  105.85),
-        'Harare'      => array('latitude' =>  -17.8177778, 'longitude' =>   31.0447222),
-        'Havana'      => array('latitude' =>   23.1319444, 'longitude' =>  -82.3641667),
-        'Helsinki'    => array('latitude' =>   60.1755556, 'longitude' =>   24.9341667),
-        'Honiara'     => array('latitude' =>   -9.4333333, 'longitude' =>  159.95),
-        'Islamabad'   => array('latitude' =>   30.8486111, 'longitude' =>   72.4944444),
-        'Istanbul'    => array('latitude' =>   41.0186111, 'longitude' =>   28.9647222),
-        'Jakarta'     => array('latitude' =>   -6.1744444, 'longitude' =>  106.8294444),
-        'Jamestown'   => array('latitude' =>  -15.9333333, 'longitude' =>   -5.7166667),
-        'Jerusalem'   => array('latitude' =>   31.7666667, 'longitude' =>   35.2333333),
-        'Johannesburg' => array('latitude' => -26.2,       'longitude' =>   28.0833333),
-        'Kabul'       => array('latitude' =>   34.5166667, 'longitude' =>   69.1833333),
-        'Kampala'     => array('latitude' =>    0.3155556, 'longitude' =>   32.5655556),
-        'Kathmandu'   => array('latitude' =>   27.7166667, 'longitude' =>   85.3166667),
-        'Khartoum'    => array('latitude' =>   15.5880556, 'longitude' =>   32.5341667),
-        'Kigali'      => array('latitude' =>   -1.9536111, 'longitude' =>   30.0605556),
-        'Kingston'    => array('latitude' =>  -29.05,      'longitude' =>  167.95),
-        'Kingstown'   => array('latitude' =>   13.1333333, 'longitude' =>  -61.2166667),
-        'Kinshasa'    => array('latitude' =>   -4.3,       'longitude' =>   15.3),
-        'Kolkata'     => array('latitude' =>   22.5697222, 'longitude' =>   88.3697222),
-        'Kuala Lumpur' => array('latitude' =>   3.1666667, 'longitude' =>  101.7),
-        'Kuwait City' => array('latitude' =>   29.3697222, 'longitude' =>   47.9783333),
-        'Kiev'        => array('latitude' =>   50.4333333, 'longitude' =>   30.5166667),
-        'La Paz'      => array('latitude' =>  -16.5,       'longitude' =>  -68.15),
-        'Libreville'  => array('latitude' =>    0.3833333, 'longitude' =>    9.45),
-        'Lilongwe'    => array('latitude' =>  -13.9833333, 'longitude' =>   33.7833333),
-        'Lima'        => array('latitude' =>  -12.05,      'longitude' =>  -77.05),
-        'Lisbon'      => array('latitude' =>   38.7166667, 'longitude' =>   -9.1333333),
-        'Ljubljana'   => array('latitude' =>   46.0552778, 'longitude' =>   14.5144444),
-        'Lobamba'     => array('latitude' =>  -26.4666667, 'longitude' =>   31.2),
-        'Lomé'        => array('latitude' =>    9.7166667, 'longitude' =>   38.3),
-        'London'      => array('latitude' =>   51.5,       'longitude' =>   -0.1166667),
-        'Los Angeles' => array('latitude' =>   34.05222,   'longitude' => -118.24278),
-        'Luanda'      => array('latitude' =>   -8.8383333, 'longitude' =>   13.2344444),
-        'Lusaka'      => array('latitude' =>  -15.4166667, 'longitude' =>   28.2833333),
-        'Luxembourg'  => array('latitude' =>   49.6116667, 'longitude' =>    6.13),
-        'Madrid'      => array('latitude' =>   40.4,       'longitude' =>   -3.6833333),
-        'Majuro'      => array('latitude' =>    7.1,       'longitude' =>  171.3833333),
-        'Malabo'      => array('latitude' =>    3.75,      'longitude' =>    8.7833333),
-        'Managua'     => array('latitude' =>   12.1508333, 'longitude' =>  -86.2683333),
-        'Manama'      => array('latitude' =>   26.2361111, 'longitude' =>   50.5830556),
-        'Manila'      => array('latitude' =>   14.6041667, 'longitude' =>  120.9822222),
-        'Maputo'      => array('latitude' =>  -25.9652778, 'longitude' =>   32.5891667),
-        'Maseru'      => array('latitude' =>  -29.3166667, 'longitude' =>   27.4833333),
-        'Mbabane'     => array('latitude' =>  -26.3166667, 'longitude' =>   31.1333333),
-        'Melbourne'   => array('latitude' =>  -37.8166667, 'longitude' =>  144.9666667),
-        'Melekeok'    => array('latitude' =>    7.4933333, 'longitude' =>  134.6341667),
-        'Mexiko City' => array('latitude' =>   19.4341667, 'longitude' =>  -99.1386111),
-        'Minsk'       => array('latitude' =>   53.9,       'longitude' =>   27.5666667),
-        'Mogadishu'   => array('latitude' =>    2.0666667, 'longitude' =>   45.3666667),
-        'Monaco'      => array('latitude' =>   43.7333333, 'longitude' =>    7.4166667),
-        'Monrovia'    => array('latitude' =>    6.3105556, 'longitude' =>  -10.8047222),
-        'Montevideo'  => array('latitude' =>  -34.8580556, 'longitude' =>  -56.1708333),
-        'Montreal'    => array('latitude' =>   45.5,       'longitude' =>  -73.5833333),
-        'Moroni'      => array('latitude' =>  -11.7041667, 'longitude' =>   43.2402778),
-        'Moscow'      => array('latitude' =>   55.7522222, 'longitude' =>   37.6155556),
-        'Muscat'      => array('latitude' =>   23.6133333, 'longitude' =>   58.5933333),
-        'Nairobi'     => array('latitude' =>   -1.3166667, 'longitude' =>   36.8333333),
-        'Nassau'      => array('latitude' =>   25.0833333, 'longitude' =>  -77.35),
-        'N´Djamena'   => array('latitude' =>   12.1130556, 'longitude' =>   15.0491667),
-        'New Dehli'   => array('latitude' =>   28.6,       'longitude' =>   77.2),
-        'New York'    => array('latitude' =>   40.71417,   'longitude' =>  -74.00639),
-        'Newcastle'   => array('latitude' =>  -32.9166667, 'longitude' =>  151.75),
-        'Niamey'      => array('latitude' =>   13.6666667, 'longitude' =>    1.7833333),
-        'Nicosia'     => array('latitude' =>   35.1666667, 'longitude' =>   33.3666667),
-        'Nouakchott'  => array('latitude' =>   18.0863889, 'longitude' =>  -15.9752778),
-        'Noumea'      => array('latitude' =>  -22.2666667, 'longitude' =>  166.45),
-        'Nuku´alofa'  => array('latitude' =>  -21.1333333, 'longitude' => -175.2),
-        'Nuuk'        => array('latitude' =>   64.1833333, 'longitude' =>  -51.75),
-        'Oranjestad'  => array('latitude' =>   12.5166667, 'longitude' =>  -70.0333333),
-        'Oslo'        => array('latitude' =>   59.9166667, 'longitude' =>   10.75),
-        'Ouagadougou' => array('latitude' =>   12.3702778, 'longitude' =>   -1.5247222),
-        'Palikir'     => array('latitude' =>    6.9166667, 'longitude' =>  158.15),
-        'Panama City' => array('latitude' =>    8.9666667, 'longitude' =>  -79.5333333),
-        'Papeete'     => array('latitude' =>  -17.5333333, 'longitude' => -149.5666667),
-        'Paramaribo'  => array('latitude' =>    5.8333333, 'longitude' =>  -55.1666667),
-        'Paris'       => array('latitude' =>   48.8666667, 'longitude' =>    2.3333333),
-        'Perth'       => array('latitude' =>  -31.9333333, 'longitude' =>  115.8333333),
-        'Phnom Penh'  => array('latitude' =>   11.55,      'longitude' =>  104.9166667),
-        'Podgorica'   => array('latitude' =>   43.7752778, 'longitude' =>   19.6827778),
-        'Port Louis'  => array('latitude' =>  -20.1666667, 'longitude' =>   57.5),
-        'Port Moresby' => array('latitude' =>  -9.4647222, 'longitude' =>  147.1925),
-        'Port-au-Prince' => array('latitude' => 18.5391667, 'longitude' => -72.335),
-        'Port of Spain' => array('latitude' => 10.6666667, 'longitude' =>  -61.5),
-        'Porto-Novo'  => array('latitude' =>    6.4833333, 'longitude' =>    2.6166667),
-        'Prague'      => array('latitude' =>   50.0833333, 'longitude' =>   14.4666667),
-        'Praia'       => array('latitude' =>   14.9166667, 'longitude' =>  -23.5166667),
-        'Pretoria'    => array('latitude' =>  -25.7069444, 'longitude' =>   28.2294444),
-        'Pyongyang'   => array('latitude' =>   39.0194444, 'longitude' =>  125.7547222),
-        'Quito'       => array('latitude' =>   -0.2166667, 'longitude' =>  -78.5),
-        'Rabat'       => array('latitude' =>   34.0252778, 'longitude' =>   -6.8361111),
-        'Reykjavik'   => array('latitude' =>   64.15,      'longitude' =>  -21.95),
-        'Riga'        => array('latitude' =>   56.95,      'longitude' =>   24.1),
-        'Rio de Janero' => array('latitude' => -22.9,      'longitude' =>  -43.2333333),
-        'Road Town'   => array('latitude' =>   18.4166667, 'longitude' =>  -64.6166667),
-        'Rome'        => array('latitude' =>   41.9,       'longitude' =>   12.4833333),
-        'Roseau'      => array('latitude' =>   15.3,       'longitude' =>  -61.4),
-        'Rotterdam'   => array('latitude' =>   51.9166667, 'longitude' =>    4.5),
-        'Salvador'    => array('latitude' =>  -12.9833333, 'longitude' =>  -38.5166667),
-        'San José'    => array('latitude' =>    9.9333333, 'longitude' =>  -84.0833333),
-        'San Juan'    => array('latitude' =>   18.46833,   'longitude' =>  -66.10611),
-        'San Marino'  => array('latitude' =>   43.5333333, 'longitude' =>   12.9666667),
-        'San Salvador' => array('latitude' =>  13.7086111, 'longitude' =>  -89.2030556),
-        'Sanaá'       => array('latitude' =>   15.3547222, 'longitude' =>   44.2066667),
-        'Santa Cruz'  => array('latitude' =>  -17.8,       'longitude' =>  -63.1666667),
-        'Santiago'    => array('latitude' =>  -33.45,      'longitude' =>  -70.6666667),
-        'Santo Domingo' => array('latitude' => 18.4666667, 'longitude' =>  -69.9),
-        'Sao Paulo'   => array('latitude' =>  -23.5333333, 'longitude' =>  -46.6166667),
-        'Sarajevo'    => array('latitude' =>   43.85,      'longitude' =>   18.3833333),
-        'Seoul'       => array('latitude' =>   37.5663889, 'longitude' =>  126.9997222),
-        'Shanghai'    => array('latitude' =>   31.2222222, 'longitude' =>  121.4580556),
-        'Sydney'      => array('latitude' =>  -33.8833333, 'longitude' =>  151.2166667),
-        'Singapore'   => array('latitude' =>    1.2930556, 'longitude' =>  103.8558333),
-        'Skopje'      => array('latitude' =>   42,         'longitude' =>   21.4333333),
-        'Sofia'       => array('latitude' =>   42.6833333, 'longitude' =>   23.3166667),
-        'St. George´s' => array('latitude' =>  12.05,      'longitude' =>  -61.75),
-        'St. John´s'  => array('latitude' =>   17.1166667, 'longitude' =>  -61.85),
-        'Stanley'     => array('latitude' =>  -51.7,       'longitude' =>  -57.85),
-        'Stockholm'   => array('latitude' =>   59.3333333, 'longitude' =>   18.05),
-        'Suva'        => array('latitude' =>  -18.1333333, 'longitude' =>  178.4166667),
-        'Taipei'      => array('latitude' =>   25.0166667, 'longitude' =>  121.45),
-        'Tallinn'     => array('latitude' =>   59.4338889, 'longitude' =>   24.7280556),
-        'Tashkent'    => array('latitude' =>   41.3166667, 'longitude' =>   69.25),
-        'Tbilisi'     => array('latitude' =>   41.725,     'longitude' =>   44.7908333),
-        'Tegucigalpa' => array('latitude' =>   14.1,       'longitude' =>  -87.2166667),
-        'Tehran'      => array('latitude' =>   35.6719444, 'longitude' =>   51.4244444),
-        'The Hague'   => array('latitude' =>   52.0833333, 'longitude' =>    4.3),
-        'Thimphu'     => array('latitude' =>   27.4833333, 'longitude' =>   89.6),
-        'Tirana'      => array('latitude' =>   41.3275,    'longitude' =>   19.8188889),
-        'Tiraspol'    => array('latitude' =>   46.8402778, 'longitude' =>   29.6433333),
-        'Tokyo'       => array('latitude' =>   35.685,     'longitude' =>  139.7513889),
-        'Toronto'     => array('latitude' =>   43.6666667, 'longitude' =>  -79.4166667),
-        'Tórshavn'    => array('latitude' =>   62.0166667, 'longitude' =>   -6.7666667),
-        'Tripoli'     => array('latitude' =>   32.8925,    'longitude' =>   13.18),
-        'Tunis'       => array('latitude' =>   36.8027778, 'longitude' =>   10.1797222),
-        'Ulaanbaatar' => array('latitude' =>   47.9166667, 'longitude' =>  106.9166667),
-        'Vaduz'       => array('latitude' =>   47.1333333, 'longitude' =>    9.5166667),
-        'Valletta'    => array('latitude' =>   35.8997222, 'longitude' =>   14.5147222),
-        'Valparaiso'  => array('latitude' =>  -33.0477778, 'longitude' =>  -71.6011111),
-        'Vancouver'   => array('latitude' =>   49.25,      'longitude' => -123.1333333),
-        'Vatican City' => array('latitude' =>  41.9,       'longitude' =>   12.4833333),
-        'Victoria'    => array('latitude' =>   -4.6166667, 'longitude' =>   55.45),
-        'Vienna'      => array('latitude' =>   48.2,       'longitude' =>   16.3666667),
-        'Vientaine'   => array('latitude' =>   17.9666667, 'longitude' =>  102.6),
-        'Vilnius'     => array('latitude' =>   54.6833333, 'longitude' =>   25.3166667),
-        'Warsaw'      => array('latitude' =>   52.25,      'longitude' =>   21),
-        'Washington dc' => array('latitude' => 38.895,     'longitude' =>  -77.03667),
-        'Wellington'  => array('latitude' =>  -41.3,       'longitude' =>  174.7833333),
-        'Willemstad'  => array('latitude' =>   12.1,       'longitude' =>  -68.9166667),
-        'Windhoek'    => array('latitude' =>  -22.57,      'longitude' =>   17.0836111),
-        'Yamoussoukro' => array('latitude' =>   6.8166667, 'longitude' =>   -5.2833333),
-        'Yaoundé'     => array('latitude' =>    3.8666667, 'longitude' =>   11.5166667),
-        'Yerevan'     => array('latitude' =>   40.1811111, 'longitude' =>   44.5136111),
-        'Zürich'      => array('latitude' =>   47.3666667, 'longitude' =>    8.55),
-        'Zagreb'      => array('latitude' =>   45.8,       'longitude' =>   16)
-    );
-
-    /**
-     * Returns the location from the selected city
-     *
-     * @param  string $city    City to get location for
-     * @param  string $horizon Horizon to use :
-     *                         default: effective
-     *                         others are civil, nautic, astronomic
-     * @return array
-     * @throws Zend_Date_Exception When city is unknown
-     */
-    public static function City($city, $horizon = false)
-    {
-        foreach (self::$cities as $key => $value) {
-            if (strtolower($key) === strtolower($city)) {
-                $return            = $value;
-                $return['horizon'] = $horizon;
-                return $return;
-            }
-        }
-        require_once 'Zend/Date/Exception.php';
-        throw new Zend_Date_Exception('unknown city');
-    }
-
-    /**
-     * Return a list with all known cities
-     *
-     * @return array
-     */
-    public static function getCityList()
-    {
-        return array_keys(self::$cities);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Date/DateObject.php b/airtime_mvc/library/Zend/Date/DateObject.php
deleted file mode 100644
index 4d7e5a46c..000000000
--- a/airtime_mvc/library/Zend/Date/DateObject.php
+++ /dev/null
@@ -1,1060 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: DateObject.php 20279 2010-01-14 15:21:47Z thomas $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @category   Zend
- * @package    Zend_Date
- * @subpackage Zend_Date_DateObject
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Date_DateObject {
-
-    /**
-     * UNIX Timestamp
-     */
-    private   $_unixTimestamp;
-    protected static $_cache         = null;
-    protected static $_defaultOffset = 0;
-
-    /**
-     * active timezone
-     */
-    private   $_timezone    = 'UTC';
-    private   $_offset      = 0;
-    private   $_syncronised = 0;
-
-    // turn off DST correction if UTC or GMT
-    protected $_dst         = true;
-
-    /**
-     * Table of Monthdays
-     */
-    private static $_monthTable = array(31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-
-    /**
-     * Table of Years
-     */
-    private static $_yearTable = array(
-        1970 => 0,            1960 => -315619200,   1950 => -631152000,
-        1940 => -946771200,   1930 => -1262304000,  1920 => -1577923200,
-        1910 => -1893456000,  1900 => -2208988800,  1890 => -2524521600,
-        1880 => -2840140800,  1870 => -3155673600,  1860 => -3471292800,
-        1850 => -3786825600,  1840 => -4102444800,  1830 => -4417977600,
-        1820 => -4733596800,  1810 => -5049129600,  1800 => -5364662400,
-        1790 => -5680195200,  1780 => -5995814400,  1770 => -6311347200,
-        1760 => -6626966400,  1750 => -6942499200,  1740 => -7258118400,
-        1730 => -7573651200,  1720 => -7889270400,  1710 => -8204803200,
-        1700 => -8520336000,  1690 => -8835868800,  1680 => -9151488000,
-        1670 => -9467020800,  1660 => -9782640000,  1650 => -10098172800,
-        1640 => -10413792000, 1630 => -10729324800, 1620 => -11044944000,
-        1610 => -11360476800, 1600 => -11676096000);
-
-    /**
-     * Set this object to have a new UNIX timestamp.
-     *
-     * @param  string|integer  $timestamp  OPTIONAL timestamp; defaults to local time using time()
-     * @return string|integer  old timestamp
-     * @throws Zend_Date_Exception
-     */
-    protected function setUnixTimestamp($timestamp = null)
-    {
-        $old = $this->_unixTimestamp;
-
-        if (is_numeric($timestamp)) {
-            $this->_unixTimestamp = $timestamp;
-        } else if ($timestamp === null) {
-            $this->_unixTimestamp = time();
-        } else {
-            require_once 'Zend/Date/Exception.php';
-            throw new Zend_Date_Exception('\'' . $timestamp . '\' is not a valid UNIX timestamp', 0, null, $timestamp);
-        }
-
-        return $old;
-    }
-
-    /**
-     * Returns this object's UNIX timestamp
-     * A timestamp greater then the integer range will be returned as string
-     * This function does not return the timestamp as object. Use copy() instead.
-     *
-     * @return  integer|string  timestamp
-     */
-    protected function getUnixTimestamp()
-    {
-        if ($this->_unixTimestamp === intval($this->_unixTimestamp)) {
-            return (int) $this->_unixTimestamp;
-        } else {
-            return (string) $this->_unixTimestamp;
-        }
-    }
-
-    /**
-     * Internal function.
-     * Returns time().  This method exists to allow unit tests to work-around methods that might otherwise
-     * be hard-coded to use time().  For example, this makes it possible to test isYesterday() in Date.php.
-     *
-     * @param   integer  $sync      OPTIONAL time syncronisation value
-     * @return  integer  timestamp
-     */
-    protected function _getTime($sync = null)
-    {
-        if ($sync !== null) {
-            $this->_syncronised = round($sync);
-        }
-        return (time() + $this->_syncronised);
-    }
-
-    /**
-     * Internal mktime function used by Zend_Date.
-     * The timestamp returned by mktime() can exceed the precision of traditional UNIX timestamps,
-     * by allowing PHP to auto-convert to using a float value.
-     *
-     * Returns a timestamp relative to 1970/01/01 00:00:00 GMT/UTC.
-     * DST (Summer/Winter) is depriciated since php 5.1.0.
-     * Year has to be 4 digits otherwise it would be recognised as
-     * year 70 AD instead of 1970 AD as expected !!
-     *
-     * @param  integer  $hour
-     * @param  integer  $minute
-     * @param  integer  $second
-     * @param  integer  $month
-     * @param  integer  $day
-     * @param  integer  $year
-     * @param  boolean  $gmt     OPTIONAL true = other arguments are for UTC time, false = arguments are for local time/date
-     * @return  integer|float  timestamp (number of seconds elapsed relative to 1970/01/01 00:00:00 GMT/UTC)
-     */
-    protected function mktime($hour, $minute, $second, $month, $day, $year, $gmt = false)
-    {
-
-        // complete date but in 32bit timestamp - use PHP internal
-        if ((1901 < $year) and ($year < 2038)) {
-
-            $oldzone = @date_default_timezone_get();
-            // Timezone also includes DST settings, therefor substracting the GMT offset is not enough
-            // We have to set the correct timezone to get the right value
-            if (($this->_timezone != $oldzone) and ($gmt === false)) {
-                date_default_timezone_set($this->_timezone);
-            }
-            $result = ($gmt) ? @gmmktime($hour, $minute, $second, $month, $day, $year)
-                             :   @mktime($hour, $minute, $second, $month, $day, $year);
-            date_default_timezone_set($oldzone);
-
-            return $result;
-        }
-
-        if ($gmt !== true) {
-            $second += $this->_offset;
-        }
-
-        if (isset(self::$_cache)) {
-            $id = strtr('Zend_DateObject_mkTime_' . $this->_offset . '_' . $year.$month.$day.'_'.$hour.$minute.$second . '_'.(int)$gmt, '-','_');
-            if ($result = self::$_cache->load($id)) {
-                return unserialize($result);
-            }
-        }
-
-        // date to integer
-        $day   = intval($day);
-        $month = intval($month);
-        $year  = intval($year);
-
-        // correct months > 12 and months < 1
-        if ($month > 12) {
-            $overlap = floor($month / 12);
-            $year   += $overlap;
-            $month  -= $overlap * 12;
-        } else {
-            $overlap = ceil((1 - $month) / 12);
-            $year   -= $overlap;
-            $month  += $overlap * 12;
-        }
-
-        $date = 0;
-        if ($year >= 1970) {
-
-            // Date is after UNIX epoch
-            // go through leapyears
-            // add months from latest given year
-            for ($count = 1970; $count <= $year; $count++) {
-
-                $leapyear = self::isYearLeapYear($count);
-                if ($count < $year) {
-
-                    $date += 365;
-                    if ($leapyear === true) {
-                        $date++;
-                    }
-
-                } else {
-
-                    for ($mcount = 0; $mcount < ($month - 1); $mcount++) {
-                        $date += self::$_monthTable[$mcount];
-                        if (($leapyear === true) and ($mcount == 1)) {
-                            $date++;
-                        }
-
-                    }
-                }
-            }
-
-            $date += $day - 1;
-            $date = (($date * 86400) + ($hour * 3600) + ($minute * 60) + $second);
-        } else {
-
-            // Date is before UNIX epoch
-            // go through leapyears
-            // add months from latest given year
-            for ($count = 1969; $count >= $year; $count--) {
-
-                $leapyear = self::isYearLeapYear($count);
-                if ($count > $year)
-                {
-                    $date += 365;
-                    if ($leapyear === true)
-                        $date++;
-                } else {
-
-                    for ($mcount = 11; $mcount > ($month - 1); $mcount--) {
-                        $date += self::$_monthTable[$mcount];
-                        if (($leapyear === true) and ($mcount == 1)) {
-                            $date++;
-                        }
-
-                    }
-                }
-            }
-
-            $date += (self::$_monthTable[$month - 1] - $day);
-            $date = -(($date * 86400) + (86400 - (($hour * 3600) + ($minute * 60) + $second)));
-
-            // gregorian correction for 5.Oct.1582
-            if ($date < -12220185600) {
-                $date += 864000;
-            } else if ($date < -12219321600) {
-                $date  = -12219321600;
-            }
-        }
-
-        if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($date), $id);
-        }
-
-        return $date;
-    }
-
-    /**
-     * Returns true, if given $year is a leap year.
-     *
-     * @param  integer  $year
-     * @return boolean  true, if year is leap year
-     */
-    protected static function isYearLeapYear($year)
-    {
-        // all leapyears can be divided through 4
-        if (($year % 4) != 0) {
-            return false;
-        }
-
-        // all leapyears can be divided through 400
-        if ($year % 400 == 0) {
-            return true;
-        } else if (($year > 1582) and ($year % 100 == 0)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Internal mktime function used by Zend_Date for handling 64bit timestamps.
-     *
-     * Returns a formatted date for a given timestamp.
-     *
-     * @param  string   $format     format for output
-     * @param  mixed    $timestamp
-     * @param  boolean  $gmt        OPTIONAL true = other arguments are for UTC time, false = arguments are for local time/date
-     * @return string
-     */
-    protected function date($format, $timestamp = null, $gmt = false)
-    {
-        $oldzone = @date_default_timezone_get();
-        if ($this->_timezone != $oldzone) {
-            date_default_timezone_set($this->_timezone);
-        }
-
-        if ($timestamp === null) {
-            $result = ($gmt) ? @gmdate($format) : @date($format);
-            date_default_timezone_set($oldzone);
-            return $result;
-        }
-
-        if (abs($timestamp) <= 0x7FFFFFFF) {
-            $result = ($gmt) ? @gmdate($format, $timestamp) : @date($format, $timestamp);
-            date_default_timezone_set($oldzone);
-            return $result;
-        }
-
-        $jump      = false;
-        $origstamp = $timestamp;
-        if (isset(self::$_cache)) {
-            $idstamp = strtr('Zend_DateObject_date_' . $this->_offset . '_'. $timestamp . '_'.(int)$gmt, '-','_');
-            if ($result2 = self::$_cache->load($idstamp)) {
-                $timestamp = unserialize($result2);
-                $jump = true;
-            }
-        }
-
-        // check on false or null alone failes
-        if (empty($gmt) and empty($jump)) {
-            $tempstamp = $timestamp;
-            if ($tempstamp > 0) {
-                while (abs($tempstamp) > 0x7FFFFFFF) {
-                    $tempstamp -= (86400 * 23376);
-                }
-
-                $dst = date("I", $tempstamp);
-                if ($dst === 1) {
-                    $timestamp += 3600;
-                }
-
-                $temp       = date('Z', $tempstamp);
-                $timestamp += $temp;
-            }
-
-            if (isset(self::$_cache)) {
-                self::$_cache->save( serialize($timestamp), $idstamp);
-            }
-        }
-
-
-        if (($timestamp < 0) and ($gmt !== true)) {
-            $timestamp -= $this->_offset;
-        }
-
-        date_default_timezone_set($oldzone);
-        $date   = $this->getDateParts($timestamp, true);
-        $length = strlen($format);
-        $output = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            switch($format[$i]) {
-                // day formats
-                case 'd':  // day of month, 2 digits, with leading zero, 01 - 31
-                    $output .= (($date['mday'] < 10) ? '0' . $date['mday'] : $date['mday']);
-                    break;
-
-                case 'D':  // day of week, 3 letters, Mon - Sun
-                    $output .= date('D', 86400 * (3 + self::dayOfWeek($date['year'], $date['mon'], $date['mday'])));
-                    break;
-
-                case 'j':  // day of month, without leading zero, 1 - 31
-                    $output .= $date['mday'];
-                    break;
-
-                case 'l':  // day of week, full string name, Sunday - Saturday
-                    $output .= date('l', 86400 * (3 + self::dayOfWeek($date['year'], $date['mon'], $date['mday'])));
-                    break;
-
-                case 'N':  // ISO 8601 numeric day of week, 1 - 7
-                    $day = self::dayOfWeek($date['year'], $date['mon'], $date['mday']);
-                    if ($day == 0) {
-                        $day = 7;
-                    }
-                    $output .= $day;
-                    break;
-
-                case 'S':  // english suffix for day of month, st nd rd th
-                    if (($date['mday'] % 10) == 1) {
-                        $output .= 'st';
-                    } else if ((($date['mday'] % 10) == 2) and ($date['mday'] != 12)) {
-                        $output .= 'nd';
-                    } else if (($date['mday'] % 10) == 3) {
-                        $output .= 'rd';
-                    } else {
-                        $output .= 'th';
-                    }
-                    break;
-
-                case 'w':  // numeric day of week, 0 - 6
-                    $output .= self::dayOfWeek($date['year'], $date['mon'], $date['mday']);
-                    break;
-
-                case 'z':  // day of year, 0 - 365
-                    $output .= $date['yday'];
-                    break;
-
-
-                // week formats
-                case 'W':  // ISO 8601, week number of year
-                    $output .= $this->weekNumber($date['year'], $date['mon'], $date['mday']);
-                    break;
-
-
-                // month formats
-                case 'F':  // string month name, january - december
-                    $output .= date('F', mktime(0, 0, 0, $date['mon'], 2, 1971));
-                    break;
-
-                case 'm':  // number of month, with leading zeros, 01 - 12
-                    $output .= (($date['mon'] < 10) ? '0' . $date['mon'] : $date['mon']);
-                    break;
-
-                case 'M':  // 3 letter month name, Jan - Dec
-                    $output .= date('M',mktime(0, 0, 0, $date['mon'], 2, 1971));
-                    break;
-
-                case 'n':  // number of month, without leading zeros, 1 - 12
-                    $output .= $date['mon'];
-                    break;
-
-                case 't':  // number of day in month
-                    $output .= self::$_monthTable[$date['mon'] - 1];
-                    break;
-
-
-                // year formats
-                case 'L':  // is leap year ?
-                    $output .= (self::isYearLeapYear($date['year'])) ? '1' : '0';
-                    break;
-
-                case 'o':  // ISO 8601 year number
-                    $week = $this->weekNumber($date['year'], $date['mon'], $date['mday']);
-                    if (($week > 50) and ($date['mon'] == 1)) {
-                        $output .= ($date['year'] - 1);
-                    } else {
-                        $output .= $date['year'];
-                    }
-                    break;
-
-                case 'Y':  // year number, 4 digits
-                    $output .= $date['year'];
-                    break;
-
-                case 'y':  // year number, 2 digits
-                    $output .= substr($date['year'], strlen($date['year']) - 2, 2);
-                    break;
-
-
-                // time formats
-                case 'a':  // lower case am/pm
-                    $output .= (($date['hours'] >= 12) ? 'pm' : 'am');
-                    break;
-
-                case 'A':  // upper case am/pm
-                    $output .= (($date['hours'] >= 12) ? 'PM' : 'AM');
-                    break;
-
-                case 'B':  // swatch internet time
-                    $dayseconds = ($date['hours'] * 3600) + ($date['minutes'] * 60) + $date['seconds'];
-                    if ($gmt === true) {
-                        $dayseconds += 3600;
-                    }
-                    $output .= (int) (($dayseconds % 86400) / 86.4);
-                    break;
-
-                case 'g':  // hours without leading zeros, 12h format
-                    if ($date['hours'] > 12) {
-                        $hour = $date['hours'] - 12;
-                    } else {
-                        if ($date['hours'] == 0) {
-                            $hour = '12';
-                        } else {
-                            $hour = $date['hours'];
-                        }
-                    }
-                    $output .= $hour;
-                    break;
-
-                case 'G':  // hours without leading zeros, 24h format
-                    $output .= $date['hours'];
-                    break;
-
-                case 'h':  // hours with leading zeros, 12h format
-                    if ($date['hours'] > 12) {
-                        $hour = $date['hours'] - 12;
-                    } else {
-                        if ($date['hours'] == 0) {
-                            $hour = '12';
-                        } else {
-                            $hour = $date['hours'];
-                        }
-                    }
-                    $output .= (($hour < 10) ? '0'.$hour : $hour);
-                    break;
-
-                case 'H':  // hours with leading zeros, 24h format
-                    $output .= (($date['hours'] < 10) ? '0' . $date['hours'] : $date['hours']);
-                    break;
-
-                case 'i':  // minutes with leading zeros
-                    $output .= (($date['minutes'] < 10) ? '0' . $date['minutes'] : $date['minutes']);
-                    break;
-
-                case 's':  // seconds with leading zeros
-                    $output .= (($date['seconds'] < 10) ? '0' . $date['seconds'] : $date['seconds']);
-                    break;
-
-
-                // timezone formats
-                case 'e':  // timezone identifier
-                    if ($gmt === true) {
-                        $output .= gmdate('e', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    } else {
-                        $output .=   date('e', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    }
-                    break;
-
-                case 'I':  // daylight saving time or not
-                    if ($gmt === true) {
-                        $output .= gmdate('I', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    } else {
-                        $output .=   date('I', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    }
-                    break;
-
-                case 'O':  // difference to GMT in hours
-                    $gmtstr = ($gmt === true) ? 0 : $this->getGmtOffset();
-                    $output .= sprintf('%s%04d', ($gmtstr <= 0) ? '+' : '-', abs($gmtstr) / 36);
-                    break;
-
-                case 'P':  // difference to GMT with colon
-                    $gmtstr = ($gmt === true) ? 0 : $this->getGmtOffset();
-                    $gmtstr = sprintf('%s%04d', ($gmtstr <= 0) ? '+' : '-', abs($gmtstr) / 36);
-                    $output = $output . substr($gmtstr, 0, 3) . ':' . substr($gmtstr, 3);
-                    break;
-
-                case 'T':  // timezone settings
-                    if ($gmt === true) {
-                        $output .= gmdate('T', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    } else {
-                        $output .=   date('T', mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                                      $date['mon'], $date['mday'], 2000));
-                    }
-                    break;
-
-                case 'Z':  // timezone offset in seconds
-                    $output .= ($gmt === true) ? 0 : -$this->getGmtOffset();
-                    break;
-
-
-                // complete time formats
-                case 'c':  // ISO 8601 date format
-                    $difference = $this->getGmtOffset();
-                    $difference = sprintf('%s%04d', ($difference <= 0) ? '+' : '-', abs($difference) / 36);
-                    $difference = substr($difference, 0, 3) . ':' . substr($difference, 3);
-                    $output .= $date['year'] . '-'
-                             . (($date['mon']     < 10) ? '0' . $date['mon']     : $date['mon'])     . '-'
-                             . (($date['mday']    < 10) ? '0' . $date['mday']    : $date['mday'])    . 'T'
-                             . (($date['hours']   < 10) ? '0' . $date['hours']   : $date['hours'])   . ':'
-                             . (($date['minutes'] < 10) ? '0' . $date['minutes'] : $date['minutes']) . ':'
-                             . (($date['seconds'] < 10) ? '0' . $date['seconds'] : $date['seconds'])
-                             . $difference;
-                    break;
-
-                case 'r':  // RFC 2822 date format
-                    $difference = $this->getGmtOffset();
-                    $difference = sprintf('%s%04d', ($difference <= 0) ? '+' : '-', abs($difference) / 36);
-                    $output .= gmdate('D', 86400 * (3 + self::dayOfWeek($date['year'], $date['mon'], $date['mday']))) . ', '
-                             . (($date['mday']    < 10) ? '0' . $date['mday']    : $date['mday'])    . ' '
-                             . date('M', mktime(0, 0, 0, $date['mon'], 2, 1971)) . ' '
-                             . $date['year'] . ' '
-                             . (($date['hours']   < 10) ? '0' . $date['hours']   : $date['hours'])   . ':'
-                             . (($date['minutes'] < 10) ? '0' . $date['minutes'] : $date['minutes']) . ':'
-                             . (($date['seconds'] < 10) ? '0' . $date['seconds'] : $date['seconds']) . ' '
-                             . $difference;
-                    break;
-
-                case 'U':  // Unix timestamp
-                    $output .= $origstamp;
-                    break;
-
-
-                // special formats
-                case "\\":  // next letter to print with no format
-                    $i++;
-                    if ($i < $length) {
-                        $output .= $format[$i];
-                    }
-                    break;
-
-                default:  // letter is no format so add it direct
-                    $output .= $format[$i];
-                    break;
-            }
-        }
-
-        return (string) $output;
-    }
-
-    /**
-     * Returns the day of week for a Gregorian calendar date.
-     * 0 = sunday, 6 = saturday
-     *
-     * @param  integer  $year
-     * @param  integer  $month
-     * @param  integer  $day
-     * @return integer  dayOfWeek
-     */
-    protected static function dayOfWeek($year, $month, $day)
-    {
-        if ((1901 < $year) and ($year < 2038)) {
-            return (int) date('w', mktime(0, 0, 0, $month, $day, $year));
-        }
-
-        // gregorian correction
-        $correction = 0;
-        if (($year < 1582) or (($year == 1582) and (($month < 10) or (($month == 10) && ($day < 15))))) {
-            $correction = 3;
-        }
-
-        if ($month > 2) {
-            $month -= 2;
-        } else {
-            $month += 10;
-            $year--;
-        }
-
-        $day  = floor((13 * $month - 1) / 5) + $day + ($year % 100) + floor(($year % 100) / 4);
-        $day += floor(($year / 100) / 4) - 2 * floor($year / 100) + 77 + $correction;
-
-        return (int) ($day - 7 * floor($day / 7));
-    }
-
-    /**
-     * Internal getDateParts function for handling 64bit timestamps, similar to:
-     * http://www.php.net/getdate
-     *
-     * Returns an array of date parts for $timestamp, relative to 1970/01/01 00:00:00 GMT/UTC.
-     *
-     * $fast specifies ALL date parts should be returned (slower)
-     * Default is false, and excludes $dayofweek, weekday, month and timestamp from parts returned.
-     *
-     * @param   mixed    $timestamp
-     * @param   boolean  $fast   OPTIONAL defaults to fast (false), resulting in fewer date parts
-     * @return  array
-     */
-    protected function getDateParts($timestamp = null, $fast = null)
-    {
-
-        // actual timestamp
-        if (!is_numeric($timestamp)) {
-            return getdate();
-        }
-
-        // 32bit timestamp
-        if (abs($timestamp) <= 0x7FFFFFFF) {
-            return @getdate((int) $timestamp);
-        }
-
-        if (isset(self::$_cache)) {
-            $id = strtr('Zend_DateObject_getDateParts_' . $timestamp.'_'.(int)$fast, '-','_');
-            if ($result = self::$_cache->load($id)) {
-                return unserialize($result);
-            }
-        }
-
-        $otimestamp = $timestamp;
-        $numday = 0;
-        $month = 0;
-        // gregorian correction
-        if ($timestamp < -12219321600) {
-            $timestamp -= 864000;
-        }
-
-        // timestamp lower 0
-        if ($timestamp < 0) {
-            $sec = 0;
-            $act = 1970;
-
-            // iterate through 10 years table, increasing speed
-            foreach(self::$_yearTable as $year => $seconds) {
-                if ($timestamp >= $seconds) {
-                    $i = $act;
-                    break;
-                }
-                $sec = $seconds;
-                $act = $year;
-            }
-
-            $timestamp -= $sec;
-            if (!isset($i)) {
-                $i = $act;
-            }
-
-            // iterate the max last 10 years
-            do {
-                --$i;
-                $day = $timestamp;
-
-                $timestamp += 31536000;
-                $leapyear = self::isYearLeapYear($i);
-                if ($leapyear === true) {
-                    $timestamp += 86400;
-                }
-
-                if ($timestamp >= 0) {
-                    $year = $i;
-                    break;
-                }
-            } while ($timestamp < 0);
-
-            $secondsPerYear = 86400 * ($leapyear ? 366 : 365) + $day;
-
-            $timestamp = $day;
-            // iterate through months
-            for ($i = 12; --$i >= 0;) {
-                $day = $timestamp;
-
-                $timestamp += self::$_monthTable[$i] * 86400;
-                if (($leapyear === true) and ($i == 1)) {
-                    $timestamp += 86400;
-                }
-
-                if ($timestamp >= 0) {
-                    $month  = $i;
-                    $numday = self::$_monthTable[$i];
-                    if (($leapyear === true) and ($i == 1)) {
-                        ++$numday;
-                    }
-                    break;
-                }
-            }
-
-            $timestamp  = $day;
-            $numberdays = $numday + ceil(($timestamp + 1) / 86400);
-
-            $timestamp += ($numday - $numberdays + 1) * 86400;
-            $hours      = floor($timestamp / 3600);
-        } else {
-
-            // iterate through years
-            for ($i = 1970;;$i++) {
-                $day = $timestamp;
-
-                $timestamp -= 31536000;
-                $leapyear = self::isYearLeapYear($i);
-                if ($leapyear === true) {
-                    $timestamp -= 86400;
-                }
-
-                if ($timestamp < 0) {
-                    $year = $i;
-                    break;
-                }
-            }
-
-            $secondsPerYear = $day;
-
-            $timestamp = $day;
-            // iterate through months
-            for ($i = 0; $i <= 11; $i++) {
-                $day = $timestamp;
-                $timestamp -= self::$_monthTable[$i] * 86400;
-
-                if (($leapyear === true) and ($i == 1)) {
-                    $timestamp -= 86400;
-                }
-
-                if ($timestamp < 0) {
-                    $month  = $i;
-                    $numday = self::$_monthTable[$i];
-                    if (($leapyear === true) and ($i == 1)) {
-                        ++$numday;
-                    }
-                    break;
-                }
-            }
-
-            $timestamp  = $day;
-            $numberdays = ceil(($timestamp + 1) / 86400);
-            $timestamp  = $timestamp - ($numberdays - 1) * 86400;
-            $hours = floor($timestamp / 3600);
-        }
-
-        $timestamp -= $hours * 3600;
-
-        $month  += 1;
-        $minutes = floor($timestamp / 60);
-        $seconds = $timestamp - $minutes * 60;
-
-        if ($fast === true) {
-            $array = array(
-                'seconds' => $seconds,
-                'minutes' => $minutes,
-                'hours'   => $hours,
-                'mday'    => $numberdays,
-                'mon'     => $month,
-                'year'    => $year,
-                'yday'    => floor($secondsPerYear / 86400),
-            );
-        } else {
-
-            $dayofweek = self::dayOfWeek($year, $month, $numberdays);
-            $array = array(
-                    'seconds' => $seconds,
-                    'minutes' => $minutes,
-                    'hours'   => $hours,
-                    'mday'    => $numberdays,
-                    'wday'    => $dayofweek,
-                    'mon'     => $month,
-                    'year'    => $year,
-                    'yday'    => floor($secondsPerYear / 86400),
-                    'weekday' => gmdate('l', 86400 * (3 + $dayofweek)),
-                    'month'   => gmdate('F', mktime(0, 0, 0, $month, 1, 1971)),
-                    0         => $otimestamp
-            );
-        }
-
-        if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($array), $id);
-        }
-
-        return $array;
-    }
-
-    /**
-     * Internal getWeekNumber function for handling 64bit timestamps
-     *
-     * Returns the ISO 8601 week number of a given date
-     *
-     * @param  integer  $year
-     * @param  integer  $month
-     * @param  integer  $day
-     * @return integer
-     */
-    protected function weekNumber($year, $month, $day)
-    {
-        if ((1901 < $year) and ($year < 2038)) {
-            return (int) date('W', mktime(0, 0, 0, $month, $day, $year));
-        }
-
-        $dayofweek = self::dayOfWeek($year, $month, $day);
-        $firstday  = self::dayOfWeek($year, 1, 1);
-        if (($month == 1) and (($firstday < 1) or ($firstday > 4)) and ($day < 4)) {
-            $firstday  = self::dayOfWeek($year - 1, 1, 1);
-            $month     = 12;
-            $day       = 31;
-
-        } else if (($month == 12) and ((self::dayOfWeek($year + 1, 1, 1) < 5) and
-                   (self::dayOfWeek($year + 1, 1, 1) > 0))) {
-            return 1;
-        }
-
-        return intval (((self::dayOfWeek($year, 1, 1) < 5) and (self::dayOfWeek($year, 1, 1) > 0)) +
-               4 * ($month - 1) + (2 * ($month - 1) + ($day - 1) + $firstday - $dayofweek + 6) * 36 / 256);
-    }
-
-    /**
-     * Internal _range function
-     * Sets the value $a to be in the range of [0, $b]
-     *
-     * @param float $a - value to correct
-     * @param float $b - maximum range to set
-     */
-    private function _range($a, $b) {
-        while ($a < 0) {
-            $a += $b;
-        }
-        while ($a >= $b) {
-            $a -= $b;
-        }
-        return $a;
-    }
-
-    /**
-     * Calculates the sunrise or sunset based on a location
-     *
-     * @param  array  $location  Location for calculation MUST include 'latitude', 'longitude', 'horizon'
-     * @param  bool   $horizon   true: sunrise; false: sunset
-     * @return mixed  - false: midnight sun, integer:
-     */
-    protected function calcSun($location, $horizon, $rise = false)
-    {
-        // timestamp within 32bit
-        if (abs($this->_unixTimestamp) <= 0x7FFFFFFF) {
-            if ($rise === false) {
-                return date_sunset($this->_unixTimestamp, SUNFUNCS_RET_TIMESTAMP, $location['latitude'],
-                                   $location['longitude'], 90 + $horizon, $this->getGmtOffset() / 3600);
-            }
-            return date_sunrise($this->_unixTimestamp, SUNFUNCS_RET_TIMESTAMP, $location['latitude'],
-                                $location['longitude'], 90 + $horizon, $this->getGmtOffset() / 3600);
-        }
-
-        // self calculation - timestamp bigger than 32bit
-        // fix circle values
-        $quarterCircle      = 0.5 * M_PI;
-        $halfCircle         =       M_PI;
-        $threeQuarterCircle = 1.5 * M_PI;
-        $fullCircle         = 2   * M_PI;
-
-        // radiant conversion for coordinates
-        $radLatitude  = $location['latitude']   * $halfCircle / 180;
-        $radLongitude = $location['longitude']  * $halfCircle / 180;
-
-        // get solar coordinates
-        $tmpRise       = $rise ? $quarterCircle : $threeQuarterCircle;
-        $radDay        = $this->date('z',$this->_unixTimestamp) + ($tmpRise - $radLongitude) / $fullCircle;
-
-        // solar anomoly and longitude
-        $solAnomoly    = $radDay * 0.017202 - 0.0574039;
-        $solLongitude  = $solAnomoly + 0.0334405 * sin($solAnomoly);
-        $solLongitude += 4.93289 + 3.49066E-4 * sin(2 * $solAnomoly);
-
-        // get quadrant
-        $solLongitude = $this->_range($solLongitude, $fullCircle);
-
-        if (($solLongitude / $quarterCircle) - intval($solLongitude / $quarterCircle) == 0) {
-            $solLongitude += 4.84814E-6;
-        }
-
-        // solar ascension
-        $solAscension = sin($solLongitude) / cos($solLongitude);
-        $solAscension = atan2(0.91746 * $solAscension, 1);
-
-        // adjust quadrant
-        if ($solLongitude > $threeQuarterCircle) {
-            $solAscension += $fullCircle;
-        } else if ($solLongitude > $quarterCircle) {
-            $solAscension += $halfCircle;
-        }
-
-        // solar declination
-        $solDeclination  = 0.39782 * sin($solLongitude);
-        $solDeclination /=  sqrt(-$solDeclination * $solDeclination + 1);
-        $solDeclination  = atan2($solDeclination, 1);
-
-        $solHorizon = $horizon - sin($solDeclination) * sin($radLatitude);
-        $solHorizon /= cos($solDeclination) * cos($radLatitude);
-
-        // midnight sun, always night
-        if (abs($solHorizon) > 1) {
-            return false;
-        }
-
-        $solHorizon /= sqrt(-$solHorizon * $solHorizon + 1);
-        $solHorizon  = $quarterCircle - atan2($solHorizon, 1);
-
-        if ($rise) {
-            $solHorizon = $fullCircle - $solHorizon;
-        }
-
-        // time calculation
-        $localTime     = $solHorizon + $solAscension - 0.0172028 * $radDay - 1.73364;
-        $universalTime = $localTime - $radLongitude;
-
-        // determinate quadrant
-        $universalTime = $this->_range($universalTime, $fullCircle);
-
-        // radiant to hours
-        $universalTime *= 24 / $fullCircle;
-
-        // convert to time
-        $hour = intval($universalTime);
-        $universalTime    = ($universalTime - $hour) * 60;
-        $min  = intval($universalTime);
-        $universalTime    = ($universalTime - $min) * 60;
-        $sec  = intval($universalTime);
-
-        return $this->mktime($hour, $min, $sec, $this->date('m', $this->_unixTimestamp),
-                             $this->date('j', $this->_unixTimestamp), $this->date('Y', $this->_unixTimestamp),
-                             -1, true);
-    }
-
-    /**
-     * Sets a new timezone for calculation of $this object's gmt offset.
-     * For a list of supported timezones look here: http://php.net/timezones
-     * If no timezone can be detected or the given timezone is wrong UTC will be set.
-     *
-     * @param  string  $zone      OPTIONAL timezone for date calculation; defaults to date_default_timezone_get()
-     * @return Zend_Date_DateObject Provides fluent interface
-     * @throws Zend_Date_Exception
-     */
-    public function setTimezone($zone = null)
-    {
-        $oldzone = @date_default_timezone_get();
-        if ($zone === null) {
-            $zone = $oldzone;
-        }
-
-        // throw an error on false input, but only if the new date extension is available
-        if (function_exists('timezone_open')) {
-            if (!@timezone_open($zone)) {
-                require_once 'Zend/Date/Exception.php';
-                throw new Zend_Date_Exception("timezone ($zone) is not a known timezone", 0, null, $zone);
-            }
-        }
-        // this can generate an error if the date extension is not available and a false timezone is given
-        $result = @date_default_timezone_set($zone);
-        if ($result === true) {
-            $this->_offset   = mktime(0, 0, 0, 1, 2, 1970) - gmmktime(0, 0, 0, 1, 2, 1970);
-            $this->_timezone = $zone;
-        }
-        date_default_timezone_set($oldzone);
-
-        if (($zone == 'UTC') or ($zone == 'GMT')) {
-            $this->_dst = false;
-        } else {
-            $this->_dst = true;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the timezone of $this object.
-     * The timezone is initially set when the object is instantiated.
-     *
-     * @return  string  actual set timezone string
-     */
-    public function getTimezone()
-    {
-        return $this->_timezone;
-    }
-
-    /**
-     * Return the offset to GMT of $this object's timezone.
-     * The offset to GMT is initially set when the object is instantiated using the currently,
-     * in effect, default timezone for PHP functions.
-     *
-     * @return  integer  seconds difference between GMT timezone and timezone when object was instantiated
-     */
-    public function getGmtOffset()
-    {
-        $date   = $this->getDateParts($this->getUnixTimestamp(), true);
-        $zone   = @date_default_timezone_get();
-        $result = @date_default_timezone_set($this->_timezone);
-        if ($result === true) {
-            $offset = $this->mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                    $date['mon'], $date['mday'], $date['year'], false)
-                    - $this->mktime($date['hours'], $date['minutes'], $date['seconds'],
-                                    $date['mon'], $date['mday'], $date['year'], true);
-        }
-        date_default_timezone_set($zone);
-
-        return $offset;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Date/Exception.php b/airtime_mvc/library/Zend/Date/Exception.php
deleted file mode 100644
index d0db60786..000000000
--- a/airtime_mvc/library/Zend/Date/Exception.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20279 2010-01-14 15:21:47Z thomas $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Date_Exception extends Zend_Exception
-{
-    protected $operand = null;
-
-    public function __construct($message, $code = 0, $e = null, $op = null)
-    {
-        $this->operand = $op;
-        parent::__construct($message, $code, $e);
-    }
-
-    public function getOperand()
-    {
-        return $this->operand;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db.php b/airtime_mvc/library/Zend/Db.php
deleted file mode 100644
index eb0070ce1..000000000
--- a/airtime_mvc/library/Zend/Db.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Class for connecting to SQL databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db
-{
-
-    /**
-     * Use the PROFILER constant in the config of a Zend_Db_Adapter.
-     */
-    const PROFILER = 'profiler';
-
-    /**
-     * Use the CASE_FOLDING constant in the config of a Zend_Db_Adapter.
-     */
-    const CASE_FOLDING = 'caseFolding';
-
-    /**
-     * Use the AUTO_QUOTE_IDENTIFIERS constant in the config of a Zend_Db_Adapter.
-     */
-    const AUTO_QUOTE_IDENTIFIERS = 'autoQuoteIdentifiers';
-
-    /**
-     * Use the ALLOW_SERIALIZATION constant in the config of a Zend_Db_Adapter.
-     */
-    const ALLOW_SERIALIZATION = 'allowSerialization';
-
-    /**
-     * Use the AUTO_RECONNECT_ON_UNSERIALIZE constant in the config of a Zend_Db_Adapter.
-     */
-    const AUTO_RECONNECT_ON_UNSERIALIZE = 'autoReconnectOnUnserialize';
-
-    /**
-     * Use the INT_TYPE, BIGINT_TYPE, and FLOAT_TYPE with the quote() method.
-     */
-    const INT_TYPE    = 0;
-    const BIGINT_TYPE = 1;
-    const FLOAT_TYPE  = 2;
-
-    /**
-     * PDO constant values discovered by this script result:
-     *
-     * $list = array(
-     *    'PARAM_BOOL', 'PARAM_NULL', 'PARAM_INT', 'PARAM_STR', 'PARAM_LOB',
-     *    'PARAM_STMT', 'PARAM_INPUT_OUTPUT', 'FETCH_LAZY', 'FETCH_ASSOC',
-     *    'FETCH_NUM', 'FETCH_BOTH', 'FETCH_OBJ', 'FETCH_BOUND',
-     *    'FETCH_COLUMN', 'FETCH_CLASS', 'FETCH_INTO', 'FETCH_FUNC',
-     *    'FETCH_GROUP', 'FETCH_UNIQUE', 'FETCH_CLASSTYPE', 'FETCH_SERIALIZE',
-     *    'FETCH_NAMED', 'ATTR_AUTOCOMMIT', 'ATTR_PREFETCH', 'ATTR_TIMEOUT',
-     *    'ATTR_ERRMODE', 'ATTR_SERVER_VERSION', 'ATTR_CLIENT_VERSION',
-     *    'ATTR_SERVER_INFO', 'ATTR_CONNECTION_STATUS', 'ATTR_CASE',
-     *    'ATTR_CURSOR_NAME', 'ATTR_CURSOR', 'ATTR_ORACLE_NULLS',
-     *    'ATTR_PERSISTENT', 'ATTR_STATEMENT_CLASS', 'ATTR_FETCH_TABLE_NAMES',
-     *    'ATTR_FETCH_CATALOG_NAMES', 'ATTR_DRIVER_NAME',
-     *    'ATTR_STRINGIFY_FETCHES', 'ATTR_MAX_COLUMN_LEN', 'ERRMODE_SILENT',
-     *    'ERRMODE_WARNING', 'ERRMODE_EXCEPTION', 'CASE_NATURAL',
-     *    'CASE_LOWER', 'CASE_UPPER', 'NULL_NATURAL', 'NULL_EMPTY_STRING',
-     *    'NULL_TO_STRING', 'ERR_NONE', 'FETCH_ORI_NEXT',
-     *    'FETCH_ORI_PRIOR', 'FETCH_ORI_FIRST', 'FETCH_ORI_LAST',
-     *    'FETCH_ORI_ABS', 'FETCH_ORI_REL', 'CURSOR_FWDONLY', 'CURSOR_SCROLL',
-     *    'ERR_CANT_MAP', 'ERR_SYNTAX', 'ERR_CONSTRAINT', 'ERR_NOT_FOUND',
-     *    'ERR_ALREADY_EXISTS', 'ERR_NOT_IMPLEMENTED', 'ERR_MISMATCH',
-     *    'ERR_TRUNCATED', 'ERR_DISCONNECTED', 'ERR_NO_PERM',
-     * );
-     *
-     * $const = array();
-     * foreach ($list as $name) {
-     *    $const[$name] = constant("PDO::$name");
-     * }
-     * var_export($const);
-     */
-    const ATTR_AUTOCOMMIT = 0;
-    const ATTR_CASE = 8;
-    const ATTR_CLIENT_VERSION = 5;
-    const ATTR_CONNECTION_STATUS = 7;
-    const ATTR_CURSOR = 10;
-    const ATTR_CURSOR_NAME = 9;
-    const ATTR_DRIVER_NAME = 16;
-    const ATTR_ERRMODE = 3;
-    const ATTR_FETCH_CATALOG_NAMES = 15;
-    const ATTR_FETCH_TABLE_NAMES = 14;
-    const ATTR_MAX_COLUMN_LEN = 18;
-    const ATTR_ORACLE_NULLS = 11;
-    const ATTR_PERSISTENT = 12;
-    const ATTR_PREFETCH = 1;
-    const ATTR_SERVER_INFO = 6;
-    const ATTR_SERVER_VERSION = 4;
-    const ATTR_STATEMENT_CLASS = 13;
-    const ATTR_STRINGIFY_FETCHES = 17;
-    const ATTR_TIMEOUT = 2;
-    const CASE_LOWER = 2;
-    const CASE_NATURAL = 0;
-    const CASE_UPPER = 1;
-    const CURSOR_FWDONLY = 0;
-    const CURSOR_SCROLL = 1;
-    const ERR_ALREADY_EXISTS = NULL;
-    const ERR_CANT_MAP = NULL;
-    const ERR_CONSTRAINT = NULL;
-    const ERR_DISCONNECTED = NULL;
-    const ERR_MISMATCH = NULL;
-    const ERR_NO_PERM = NULL;
-    const ERR_NONE = '00000';
-    const ERR_NOT_FOUND = NULL;
-    const ERR_NOT_IMPLEMENTED = NULL;
-    const ERR_SYNTAX = NULL;
-    const ERR_TRUNCATED = NULL;
-    const ERRMODE_EXCEPTION = 2;
-    const ERRMODE_SILENT = 0;
-    const ERRMODE_WARNING = 1;
-    const FETCH_ASSOC = 2;
-    const FETCH_BOTH = 4;
-    const FETCH_BOUND = 6;
-    const FETCH_CLASS = 8;
-    const FETCH_CLASSTYPE = 262144;
-    const FETCH_COLUMN = 7;
-    const FETCH_FUNC = 10;
-    const FETCH_GROUP = 65536;
-    const FETCH_INTO = 9;
-    const FETCH_LAZY = 1;
-    const FETCH_NAMED = 11;
-    const FETCH_NUM = 3;
-    const FETCH_OBJ = 5;
-    const FETCH_ORI_ABS = 4;
-    const FETCH_ORI_FIRST = 2;
-    const FETCH_ORI_LAST = 3;
-    const FETCH_ORI_NEXT = 0;
-    const FETCH_ORI_PRIOR = 1;
-    const FETCH_ORI_REL = 5;
-    const FETCH_SERIALIZE = 524288;
-    const FETCH_UNIQUE = 196608;
-    const NULL_EMPTY_STRING = 1;
-    const NULL_NATURAL = 0;
-    const NULL_TO_STRING = NULL;
-    const PARAM_BOOL = 5;
-    const PARAM_INPUT_OUTPUT = -2147483648;
-    const PARAM_INT = 1;
-    const PARAM_LOB = 3;
-    const PARAM_NULL = 0;
-    const PARAM_STMT = 4;
-    const PARAM_STR = 2;
-
-    /**
-     * Factory for Zend_Db_Adapter_Abstract classes.
-     *
-     * First argument may be a string containing the base of the adapter class
-     * name, e.g. 'Mysqli' corresponds to class Zend_Db_Adapter_Mysqli.  This
-     * name is currently case-insensitive, but is not ideal to rely on this behavior.
-     * If your class is named 'My_Company_Pdo_Mysql', where 'My_Company' is the namespace
-     * and 'Pdo_Mysql' is the adapter name, it is best to use the name exactly as it
-     * is defined in the class.  This will ensure proper use of the factory API.
-     *
-     * First argument may alternatively be an object of type Zend_Config.
-     * The adapter class base name is read from the 'adapter' property.
-     * The adapter config parameters are read from the 'params' property.
-     *
-     * Second argument is optional and may be an associative array of key-value
-     * pairs.  This is used as the argument to the adapter constructor.
-     *
-     * If the first argument is of type Zend_Config, it is assumed to contain
-     * all parameters, and the second argument is ignored.
-     *
-     * @param  mixed $adapter String name of base adapter class, or Zend_Config object.
-     * @param  mixed $config  OPTIONAL; an array or Zend_Config object with adapter parameters.
-     * @return Zend_Db_Adapter_Abstract
-     * @throws Zend_Db_Exception
-     */
-    public static function factory($adapter, $config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        }
-
-        /*
-         * Convert Zend_Config argument to plain string
-         * adapter name and separate config object.
-         */
-        if ($adapter instanceof Zend_Config) {
-            if (isset($adapter->params)) {
-                $config = $adapter->params->toArray();
-            }
-            if (isset($adapter->adapter)) {
-                $adapter = (string) $adapter->adapter;
-            } else {
-                $adapter = null;
-            }
-        }
-
-        /*
-         * Verify that adapter parameters are in an array.
-         */
-        if (!is_array($config)) {
-            /**
-             * @see Zend_Db_Exception
-             */
-            require_once 'Zend/Db/Exception.php';
-            throw new Zend_Db_Exception('Adapter parameters must be in an array or a Zend_Config object');
-        }
-
-        /*
-         * Verify that an adapter name has been specified.
-         */
-        if (!is_string($adapter) || empty($adapter)) {
-            /**
-             * @see Zend_Db_Exception
-             */
-            require_once 'Zend/Db/Exception.php';
-            throw new Zend_Db_Exception('Adapter name must be specified in a string');
-        }
-
-        /*
-         * Form full adapter class name
-         */
-        $adapterNamespace = 'Zend_Db_Adapter';
-        if (isset($config['adapterNamespace'])) {
-            if ($config['adapterNamespace'] != '') {
-                $adapterNamespace = $config['adapterNamespace'];
-            }
-            unset($config['adapterNamespace']);
-        }
-
-        // Adapter no longer normalized- see http://framework.zend.com/issues/browse/ZF-5606
-        $adapterName = $adapterNamespace . '_';
-        $adapterName .= str_replace(' ', '_', ucwords(str_replace('_', ' ', strtolower($adapter))));
-
-        /*
-         * Load the adapter class.  This throws an exception
-         * if the specified class cannot be loaded.
-         */
-        if (!class_exists($adapterName)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($adapterName);
-        }
-
-        /*
-         * Create an instance of the adapter class.
-         * Pass the config to the adapter class constructor.
-         */
-        $dbAdapter = new $adapterName($config);
-
-        /*
-         * Verify that the object created is a descendent of the abstract adapter type.
-         */
-        if (! $dbAdapter instanceof Zend_Db_Adapter_Abstract) {
-            /**
-             * @see Zend_Db_Exception
-             */
-            require_once 'Zend/Db/Exception.php';
-            throw new Zend_Db_Exception("Adapter class '$adapterName' does not extend Zend_Db_Adapter_Abstract");
-        }
-
-        return $dbAdapter;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Abstract.php b/airtime_mvc/library/Zend/Db/Adapter/Abstract.php
deleted file mode 100644
index ac9403ef2..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Abstract.php
+++ /dev/null
@@ -1,1252 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @see Zend_Db_Select
- */
-require_once 'Zend/Db/Select.php';
-
-/**
- * Class for connecting to SQL databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Adapter_Abstract
-{
-
-    /**
-     * User-provided configuration
-     *
-     * @var array
-     */
-    protected $_config = array();
-
-    /**
-     * Fetch mode
-     *
-     * @var integer
-     */
-    protected $_fetchMode = Zend_Db::FETCH_ASSOC;
-
-    /**
-     * Query profiler object, of type Zend_Db_Profiler
-     * or a subclass of that.
-     *
-     * @var Zend_Db_Profiler
-     */
-    protected $_profiler;
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement';
-
-    /**
-     * Default class name for the profiler object.
-     *
-     * @var string
-     */
-    protected $_defaultProfilerClass = 'Zend_Db_Profiler';
-
-    /**
-     * Database connection
-     *
-     * @var object|resource|null
-     */
-    protected $_connection = null;
-
-    /**
-     * Specifies the case of column names retrieved in queries
-     * Options
-     * Zend_Db::CASE_NATURAL (default)
-     * Zend_Db::CASE_LOWER
-     * Zend_Db::CASE_UPPER
-     *
-     * @var integer
-     */
-    protected $_caseFolding = Zend_Db::CASE_NATURAL;
-
-    /**
-     * Specifies whether the adapter automatically quotes identifiers.
-     * If true, most SQL generated by Zend_Db classes applies
-     * identifier quoting automatically.
-     * If false, developer must quote identifiers themselves
-     * by calling quoteIdentifier().
-     *
-     * @var bool
-     */
-    protected $_autoQuoteIdentifiers = true;
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE
-    );
-
-    /** Weither or not that object can get serialized
-     *
-     * @var bool
-     */
-    protected $_allowSerialization = true;
-
-    /**
-     * Weither or not the database should be reconnected
-     * to that adapter when waking up
-     *
-     * @var bool
-     */
-    protected $_autoReconnectOnUnserialize = false;
-
-    /**
-     * Constructor.
-     *
-     * $config is an array of key/value pairs or an instance of Zend_Config
-     * containing configuration options.  These options are common to most adapters:
-     *
-     * dbname         => (string) The name of the database to user
-     * username       => (string) Connect to the database as this username.
-     * password       => (string) Password associated with the username.
-     * host           => (string) What host to connect to, defaults to localhost
-     *
-     * Some options are used on a case-by-case basis by adapters:
-     *
-     * port           => (string) The port of the database
-     * persistent     => (boolean) Whether to use a persistent connection or not, defaults to false
-     * protocol       => (string) The network protocol, defaults to TCPIP
-     * caseFolding    => (int) style of case-alteration used for identifiers
-     *
-     * @param  array|Zend_Config $config An array or instance of Zend_Config having configuration data
-     * @throws Zend_Db_Adapter_Exception
-     */
-    public function __construct($config)
-    {
-        /*
-         * Verify that adapter parameters are in an array.
-         */
-        if (!is_array($config)) {
-            /*
-             * Convert Zend_Config argument to a plain array.
-             */
-            if ($config instanceof Zend_Config) {
-                $config = $config->toArray();
-            } else {
-                /**
-                 * @see Zend_Db_Adapter_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Exception.php';
-                throw new Zend_Db_Adapter_Exception('Adapter parameters must be in an array or a Zend_Config object');
-            }
-        }
-
-        $this->_checkRequiredOptions($config);
-
-        $options = array(
-            Zend_Db::CASE_FOLDING           => $this->_caseFolding,
-            Zend_Db::AUTO_QUOTE_IDENTIFIERS => $this->_autoQuoteIdentifiers
-        );
-        $driverOptions = array();
-
-        /*
-         * normalize the config and merge it with the defaults
-         */
-        if (array_key_exists('options', $config)) {
-            // can't use array_merge() because keys might be integers
-            foreach ((array) $config['options'] as $key => $value) {
-                $options[$key] = $value;
-            }
-        }
-        if (array_key_exists('driver_options', $config)) {
-            if (!empty($config['driver_options'])) {
-                // can't use array_merge() because keys might be integers
-                foreach ((array) $config['driver_options'] as $key => $value) {
-                    $driverOptions[$key] = $value;
-                }
-            }
-        }
-
-        if (!isset($config['charset'])) {
-            $config['charset'] = null;
-        }
-
-        if (!isset($config['persistent'])) {
-            $config['persistent'] = false;
-        }
-
-        $this->_config = array_merge($this->_config, $config);
-        $this->_config['options'] = $options;
-        $this->_config['driver_options'] = $driverOptions;
-
-
-        // obtain the case setting, if there is one
-        if (array_key_exists(Zend_Db::CASE_FOLDING, $options)) {
-            $case = (int) $options[Zend_Db::CASE_FOLDING];
-            switch ($case) {
-                case Zend_Db::CASE_LOWER:
-                case Zend_Db::CASE_UPPER:
-                case Zend_Db::CASE_NATURAL:
-                    $this->_caseFolding = $case;
-                    break;
-                default:
-                    /** @see Zend_Db_Adapter_Exception */
-                    require_once 'Zend/Db/Adapter/Exception.php';
-                    throw new Zend_Db_Adapter_Exception('Case must be one of the following constants: '
-                        . 'Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER');
-            }
-        }
-
-        // obtain quoting property if there is one
-        if (array_key_exists(Zend_Db::AUTO_QUOTE_IDENTIFIERS, $options)) {
-            $this->_autoQuoteIdentifiers = (bool) $options[Zend_Db::AUTO_QUOTE_IDENTIFIERS];
-        }
-
-        // obtain allow serialization property if there is one
-        if (array_key_exists(Zend_Db::ALLOW_SERIALIZATION, $options)) {
-            $this->_allowSerialization = (bool) $options[Zend_Db::ALLOW_SERIALIZATION];
-        }
-
-        // obtain auto reconnect on unserialize property if there is one
-        if (array_key_exists(Zend_Db::AUTO_RECONNECT_ON_UNSERIALIZE, $options)) {
-            $this->_autoReconnectOnUnserialize = (bool) $options[Zend_Db::AUTO_RECONNECT_ON_UNSERIALIZE];
-        }
-
-        // create a profiler object
-        $profiler = false;
-        if (array_key_exists(Zend_Db::PROFILER, $this->_config)) {
-            $profiler = $this->_config[Zend_Db::PROFILER];
-            unset($this->_config[Zend_Db::PROFILER]);
-        }
-        $this->setProfiler($profiler);
-    }
-
-    /**
-     * Check for config options that are mandatory.
-     * Throw exceptions if any are missing.
-     *
-     * @param array $config
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _checkRequiredOptions(array $config)
-    {
-        // we need at least a dbname
-        if (! array_key_exists('dbname', $config)) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance");
-        }
-
-        if (! array_key_exists('password', $config)) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials");
-        }
-
-        if (! array_key_exists('username', $config)) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials");
-        }
-    }
-
-    /**
-     * Returns the underlying database connection object or resource.
-     * If not presently connected, this initiates the connection.
-     *
-     * @return object|resource|null
-     */
-    public function getConnection()
-    {
-        $this->_connect();
-        return $this->_connection;
-    }
-
-    /**
-     * Returns the configuration variables in this adapter.
-     *
-     * @return array
-     */
-    public function getConfig()
-    {
-        return $this->_config;
-    }
-
-    /**
-     * Set the adapter's profiler object.
-     *
-     * The argument may be a boolean, an associative array, an instance of
-     * Zend_Db_Profiler, or an instance of Zend_Config.
-     *
-     * A boolean argument sets the profiler to enabled if true, or disabled if
-     * false.  The profiler class is the adapter's default profiler class,
-     * Zend_Db_Profiler.
-     *
-     * An instance of Zend_Db_Profiler sets the adapter's instance to that
-     * object.  The profiler is enabled and disabled separately.
-     *
-     * An associative array argument may contain any of the keys 'enabled',
-     * 'class', and 'instance'. The 'enabled' and 'instance' keys correspond to the
-     * boolean and object types documented above. The 'class' key is used to name a
-     * class to use for a custom profiler. The class must be Zend_Db_Profiler or a
-     * subclass. The class is instantiated with no constructor arguments. The 'class'
-     * option is ignored when the 'instance' option is supplied.
-     *
-     * An object of type Zend_Config may contain the properties 'enabled', 'class', and
-     * 'instance', just as if an associative array had been passed instead.
-     *
-     * @param  Zend_Db_Profiler|Zend_Config|array|boolean $profiler
-     * @return Zend_Db_Adapter_Abstract Provides a fluent interface
-     * @throws Zend_Db_Profiler_Exception if the object instance or class specified
-     *         is not Zend_Db_Profiler or an extension of that class.
-     */
-    public function setProfiler($profiler)
-    {
-        $enabled          = null;
-        $profilerClass    = $this->_defaultProfilerClass;
-        $profilerInstance = null;
-
-        if ($profilerIsObject = is_object($profiler)) {
-            if ($profiler instanceof Zend_Db_Profiler) {
-                $profilerInstance = $profiler;
-            } else if ($profiler instanceof Zend_Config) {
-                $profiler = $profiler->toArray();
-            } else {
-                /**
-                 * @see Zend_Db_Profiler_Exception
-                 */
-                require_once 'Zend/Db/Profiler/Exception.php';
-                throw new Zend_Db_Profiler_Exception('Profiler argument must be an instance of either Zend_Db_Profiler'
-                    . ' or Zend_Config when provided as an object');
-            }
-        }
-
-        if (is_array($profiler)) {
-            if (isset($profiler['enabled'])) {
-                $enabled = (bool) $profiler['enabled'];
-            }
-            if (isset($profiler['class'])) {
-                $profilerClass = $profiler['class'];
-            }
-            if (isset($profiler['instance'])) {
-                $profilerInstance = $profiler['instance'];
-            }
-        } else if (!$profilerIsObject) {
-            $enabled = (bool) $profiler;
-        }
-
-        if ($profilerInstance === null) {
-            if (!class_exists($profilerClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($profilerClass);
-            }
-            $profilerInstance = new $profilerClass();
-        }
-
-        if (!$profilerInstance instanceof Zend_Db_Profiler) {
-            /** @see Zend_Db_Profiler_Exception */
-            require_once 'Zend/Db/Profiler/Exception.php';
-            throw new Zend_Db_Profiler_Exception('Class ' . get_class($profilerInstance) . ' does not extend '
-                . 'Zend_Db_Profiler');
-        }
-
-        if (null !== $enabled) {
-            $profilerInstance->setEnabled($enabled);
-        }
-
-        $this->_profiler = $profilerInstance;
-
-        return $this;
-    }
-
-
-    /**
-     * Returns the profiler for this adapter.
-     *
-     * @return Zend_Db_Profiler
-     */
-    public function getProfiler()
-    {
-        return $this->_profiler;
-    }
-
-    /**
-     * Get the default statement class.
-     *
-     * @return string
-     */
-    public function getStatementClass()
-    {
-        return $this->_defaultStmtClass;
-    }
-
-    /**
-     * Set the default statement class.
-     *
-     * @return Zend_Db_Adapter_Abstract Fluent interface
-     */
-    public function setStatementClass($class)
-    {
-        $this->_defaultStmtClass = $class;
-        return $this;
-    }
-
-    /**
-     * Prepares and executes an SQL statement with bound data.
-     *
-     * @param  mixed  $sql  The SQL statement with placeholders.
-     *                      May be a string or Zend_Db_Select.
-     * @param  mixed  $bind An array of data to bind to the placeholders.
-     * @return Zend_Db_Statement_Interface
-     */
-    public function query($sql, $bind = array())
-    {
-        // connect to the database if needed
-        $this->_connect();
-
-        // is the $sql a Zend_Db_Select object?
-        if ($sql instanceof Zend_Db_Select) {
-            if (empty($bind)) {
-                $bind = $sql->getBind();
-            }
-
-            $sql = $sql->assemble();
-        }
-
-        // make sure $bind to an array;
-        // don't use (array) typecasting because
-        // because $bind may be a Zend_Db_Expr object
-        if (!is_array($bind)) {
-            $bind = array($bind);
-        }
-
-        // prepare and execute the statement with profiling
-        $stmt = $this->prepare($sql);
-        $stmt->execute($bind);
-
-        // return the results embedded in the prepared statement object
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Leave autocommit mode and begin a transaction.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function beginTransaction()
-    {
-        $this->_connect();
-        $q = $this->_profiler->queryStart('begin', Zend_Db_Profiler::TRANSACTION);
-        $this->_beginTransaction();
-        $this->_profiler->queryEnd($q);
-        return $this;
-    }
-
-    /**
-     * Commit a transaction and return to autocommit mode.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function commit()
-    {
-        $this->_connect();
-        $q = $this->_profiler->queryStart('commit', Zend_Db_Profiler::TRANSACTION);
-        $this->_commit();
-        $this->_profiler->queryEnd($q);
-        return $this;
-    }
-
-    /**
-     * Roll back a transaction and return to autocommit mode.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function rollBack()
-    {
-        $this->_connect();
-        $q = $this->_profiler->queryStart('rollback', Zend_Db_Profiler::TRANSACTION);
-        $this->_rollBack();
-        $this->_profiler->queryEnd($q);
-        return $this;
-    }
-
-    /**
-     * Inserts a table row with specified data.
-     *
-     * @param mixed $table The table to insert data into.
-     * @param array $bind Column-value pairs.
-     * @return int The number of affected rows.
-     */
-    public function insert($table, array $bind)
-    {
-        // extract and quote col names from the array keys
-        $cols = array();
-        $vals = array();
-        foreach ($bind as $col => $val) {
-            $cols[] = $this->quoteIdentifier($col, true);
-            if ($val instanceof Zend_Db_Expr) {
-                $vals[] = $val->__toString();
-                unset($bind[$col]);
-            } else {
-                $vals[] = '?';
-            }
-        }
-
-        // build the statement
-        $sql = "INSERT INTO "
-             . $this->quoteIdentifier($table, true)
-             . ' (' . implode(', ', $cols) . ') '
-             . 'VALUES (' . implode(', ', $vals) . ')';
-
-        // execute the statement and return the number of affected rows
-        $stmt = $this->query($sql, array_values($bind));
-        $result = $stmt->rowCount();
-        return $result;
-    }
-
-    /**
-     * Updates table rows with specified data based on a WHERE clause.
-     *
-     * @param  mixed        $table The table to update.
-     * @param  array        $bind  Column-value pairs.
-     * @param  mixed        $where UPDATE WHERE clause(s).
-     * @return int          The number of affected rows.
-     */
-    public function update($table, array $bind, $where = '')
-    {
-        /**
-         * Build "col = ?" pairs for the statement,
-         * except for Zend_Db_Expr which is treated literally.
-         */
-        $set = array();
-        $i = 0;
-        foreach ($bind as $col => $val) {
-            if ($val instanceof Zend_Db_Expr) {
-                $val = $val->__toString();
-                unset($bind[$col]);
-            } else {
-                if ($this->supportsParameters('positional')) {
-                    $val = '?';
-                } else {
-                    if ($this->supportsParameters('named')) {
-                        unset($bind[$col]);
-                        $bind[':'.$col.$i] = $val;
-                        $val = ':'.$col.$i;
-                        $i++;
-                    } else {
-                        /** @see Zend_Db_Adapter_Exception */
-                        require_once 'Zend/Db/Adapter/Exception.php';
-                        throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding");
-                    }
-                }
-            }
-            $set[] = $this->quoteIdentifier($col, true) . ' = ' . $val;
-        }
-
-        $where = $this->_whereExpr($where);
-
-        /**
-         * Build the UPDATE statement
-         */
-        $sql = "UPDATE "
-             . $this->quoteIdentifier($table, true)
-             . ' SET ' . implode(', ', $set)
-             . (($where) ? " WHERE $where" : '');
-
-        /**
-         * Execute the statement and return the number of affected rows
-         */
-        if ($this->supportsParameters('positional')) {
-            $stmt = $this->query($sql, array_values($bind));
-        } else {
-            $stmt = $this->query($sql, $bind);
-        }
-        $result = $stmt->rowCount();
-        return $result;
-    }
-
-    /**
-     * Deletes table rows based on a WHERE clause.
-     *
-     * @param  mixed        $table The table to update.
-     * @param  mixed        $where DELETE WHERE clause(s).
-     * @return int          The number of affected rows.
-     */
-    public function delete($table, $where = '')
-    {
-        $where = $this->_whereExpr($where);
-
-        /**
-         * Build the DELETE statement
-         */
-        $sql = "DELETE FROM "
-             . $this->quoteIdentifier($table, true)
-             . (($where) ? " WHERE $where" : '');
-
-        /**
-         * Execute the statement and return the number of affected rows
-         */
-        $stmt = $this->query($sql);
-        $result = $stmt->rowCount();
-        return $result;
-    }
-
-    /**
-     * Convert an array, string, or Zend_Db_Expr object
-     * into a string to put in a WHERE clause.
-     *
-     * @param mixed $where
-     * @return string
-     */
-    protected function _whereExpr($where)
-    {
-        if (empty($where)) {
-            return $where;
-        }
-        if (!is_array($where)) {
-            $where = array($where);
-        }
-        foreach ($where as $cond => &$term) {
-            // is $cond an int? (i.e. Not a condition)
-            if (is_int($cond)) {
-                // $term is the full condition
-                if ($term instanceof Zend_Db_Expr) {
-                    $term = $term->__toString();
-                }
-            } else {
-                // $cond is the condition with placeholder,
-                // and $term is quoted into the condition
-                $term = $this->quoteInto($cond, $term);
-            }
-            $term = '(' . $term . ')';
-        }
-
-        $where = implode(' AND ', $where);
-        return $where;
-    }
-
-    /**
-     * Creates and returns a new Zend_Db_Select object for this adapter.
-     *
-     * @return Zend_Db_Select
-     */
-    public function select()
-    {
-        return new Zend_Db_Select($this);
-    }
-
-    /**
-     * Get the fetch mode.
-     *
-     * @return int
-     */
-    public function getFetchMode()
-    {
-        return $this->_fetchMode;
-    }
-
-    /**
-     * Fetches all SQL result rows as a sequential array.
-     * Uses the current fetchMode for the adapter.
-     *
-     * @param string|Zend_Db_Select $sql  An SQL SELECT statement.
-     * @param mixed                 $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
-     * @return array
-     */
-    public function fetchAll($sql, $bind = array(), $fetchMode = null)
-    {
-        if ($fetchMode === null) {
-            $fetchMode = $this->_fetchMode;
-        }
-        $stmt = $this->query($sql, $bind);
-        $result = $stmt->fetchAll($fetchMode);
-        return $result;
-    }
-
-    /**
-     * Fetches the first row of the SQL result.
-     * Uses the current fetchMode for the adapter.
-     *
-     * @param string|Zend_Db_Select $sql An SQL SELECT statement.
-     * @param mixed $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
-     * @return array
-     */
-    public function fetchRow($sql, $bind = array(), $fetchMode = null)
-    {
-        if ($fetchMode === null) {
-            $fetchMode = $this->_fetchMode;
-        }
-        $stmt = $this->query($sql, $bind);
-        $result = $stmt->fetch($fetchMode);
-        return $result;
-    }
-
-    /**
-     * Fetches all SQL result rows as an associative array.
-     *
-     * The first column is the key, the entire row array is the
-     * value.  You should construct the query to be sure that
-     * the first column contains unique values, or else
-     * rows with duplicate values in the first column will
-     * overwrite previous data.
-     *
-     * @param string|Zend_Db_Select $sql An SQL SELECT statement.
-     * @param mixed $bind Data to bind into SELECT placeholders.
-     * @return array
-     */
-    public function fetchAssoc($sql, $bind = array())
-    {
-        $stmt = $this->query($sql, $bind);
-        $data = array();
-        while ($row = $stmt->fetch(Zend_Db::FETCH_ASSOC)) {
-            $tmp = array_values(array_slice($row, 0, 1));
-            $data[$tmp[0]] = $row;
-        }
-        return $data;
-    }
-
-    /**
-     * Fetches the first column of all SQL result rows as an array.
-     *
-     * The first column in each row is used as the array key.
-     *
-     * @param string|Zend_Db_Select $sql An SQL SELECT statement.
-     * @param mixed $bind Data to bind into SELECT placeholders.
-     * @return array
-     */
-    public function fetchCol($sql, $bind = array())
-    {
-        $stmt = $this->query($sql, $bind);
-        $result = $stmt->fetchAll(Zend_Db::FETCH_COLUMN, 0);
-        return $result;
-    }
-
-    /**
-     * Fetches all SQL result rows as an array of key-value pairs.
-     *
-     * The first column is the key, the second column is the
-     * value.
-     *
-     * @param string|Zend_Db_Select $sql An SQL SELECT statement.
-     * @param mixed $bind Data to bind into SELECT placeholders.
-     * @return array
-     */
-    public function fetchPairs($sql, $bind = array())
-    {
-        $stmt = $this->query($sql, $bind);
-        $data = array();
-        while ($row = $stmt->fetch(Zend_Db::FETCH_NUM)) {
-            $data[$row[0]] = $row[1];
-        }
-        return $data;
-    }
-
-    /**
-     * Fetches the first column of the first row of the SQL result.
-     *
-     * @param string|Zend_Db_Select $sql An SQL SELECT statement.
-     * @param mixed $bind Data to bind into SELECT placeholders.
-     * @return string
-     */
-    public function fetchOne($sql, $bind = array())
-    {
-        $stmt = $this->query($sql, $bind);
-        $result = $stmt->fetchColumn(0);
-        return $result;
-    }
-
-    /**
-     * Quote a raw string.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value)) {
-            return $value;
-        } elseif (is_float($value)) {
-            return sprintf('%F', $value);
-        }
-        return "'" . addcslashes($value, "\000\n\r\\'\"\032") . "'";
-    }
-
-    /**
-     * Safely quotes a value for an SQL statement.
-     *
-     * If an array is passed as the value, the array values are quoted
-     * and then returned as a comma-separated string.
-     *
-     * @param mixed $value The value to quote.
-     * @param mixed $type  OPTIONAL the SQL datatype name, or constant, or null.
-     * @return mixed An SQL-safe quoted value (or string of separated values).
-     */
-    public function quote($value, $type = null)
-    {
-        $this->_connect();
-
-        if ($value instanceof Zend_Db_Select) {
-            return '(' . $value->assemble() . ')';
-        }
-
-        if ($value instanceof Zend_Db_Expr) {
-            return $value->__toString();
-        }
-
-        if (is_array($value)) {
-            foreach ($value as &$val) {
-                $val = $this->quote($val, $type);
-            }
-            return implode(', ', $value);
-        }
-
-        if ($type !== null && array_key_exists($type = strtoupper($type), $this->_numericDataTypes)) {
-            $quotedValue = '0';
-            switch ($this->_numericDataTypes[$type]) {
-                case Zend_Db::INT_TYPE: // 32-bit integer
-                    $quotedValue = (string) intval($value);
-                    break;
-                case Zend_Db::BIGINT_TYPE: // 64-bit integer
-                    // ANSI SQL-style hex literals (e.g. x'[\dA-F]+')
-                    // are not supported here, because these are string
-                    // literals, not numeric literals.
-                    if (preg_match('/^(
-                          [+-]?                  # optional sign
-                          (?:
-                            0[Xx][\da-fA-F]+     # ODBC-style hexadecimal
-                            |\d+                 # decimal or octal, or MySQL ZEROFILL decimal
-                            (?:[eE][+-]?\d+)?    # optional exponent on decimals or octals
-                          )
-                        )/x',
-                        (string) $value, $matches)) {
-                        $quotedValue = $matches[1];
-                    }
-                    break;
-                case Zend_Db::FLOAT_TYPE: // float or decimal
-                    $quotedValue = sprintf('%F', $value);
-            }
-            return $quotedValue;
-        }
-
-        return $this->_quote($value);
-    }
-
-    /**
-     * Quotes a value and places into a piece of text at a placeholder.
-     *
-     * The placeholder is a question-mark; all placeholders will be replaced
-     * with the quoted value.   For example:
-     *
-     * <code>
-     * $text = "WHERE date < ?";
-     * $date = "2005-01-02";
-     * $safe = $sql->quoteInto($text, $date);
-     * // $safe = "WHERE date < '2005-01-02'"
-     * </code>
-     *
-     * @param string  $text  The text with a placeholder.
-     * @param mixed   $value The value to quote.
-     * @param string  $type  OPTIONAL SQL datatype
-     * @param integer $count OPTIONAL count of placeholders to replace
-     * @return string An SQL-safe quoted value placed into the original text.
-     */
-    public function quoteInto($text, $value, $type = null, $count = null)
-    {
-        if ($count === null) {
-            return str_replace('?', $this->quote($value, $type), $text);
-        } else {
-            while ($count > 0) {
-                if (strpos($text, '?') !== false) {
-                    $text = substr_replace($text, $this->quote($value, $type), strpos($text, '?'), 1);
-                }
-                --$count;
-            }
-            return $text;
-        }
-    }
-
-    /**
-     * Quotes an identifier.
-     *
-     * Accepts a string representing a qualified indentifier. For Example:
-     * <code>
-     * $adapter->quoteIdentifier('myschema.mytable')
-     * </code>
-     * Returns: "myschema"."mytable"
-     *
-     * Or, an array of one or more identifiers that may form a qualified identifier:
-     * <code>
-     * $adapter->quoteIdentifier(array('myschema','my.table'))
-     * </code>
-     * Returns: "myschema"."my.table"
-     *
-     * The actual quote character surrounding the identifiers may vary depending on
-     * the adapter.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @return string The quoted identifier.
-     */
-    public function quoteIdentifier($ident, $auto=false)
-    {
-        return $this->_quoteIdentifierAs($ident, null, $auto);
-    }
-
-    /**
-     * Quote a column identifier and alias.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An alias for the column.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @return string The quoted identifier and alias.
-     */
-    public function quoteColumnAs($ident, $alias, $auto=false)
-    {
-        return $this->_quoteIdentifierAs($ident, $alias, $auto);
-    }
-
-    /**
-     * Quote a table identifier and alias.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An alias for the table.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @return string The quoted identifier and alias.
-     */
-    public function quoteTableAs($ident, $alias = null, $auto = false)
-    {
-        return $this->_quoteIdentifierAs($ident, $alias, $auto);
-    }
-
-    /**
-     * Quote an identifier and an optional alias.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An optional alias.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @param string $as The string to add between the identifier/expression and the alias.
-     * @return string The quoted identifier and alias.
-     */
-    protected function _quoteIdentifierAs($ident, $alias = null, $auto = false, $as = ' AS ')
-    {
-        if ($ident instanceof Zend_Db_Expr) {
-            $quoted = $ident->__toString();
-        } elseif ($ident instanceof Zend_Db_Select) {
-            $quoted = '(' . $ident->assemble() . ')';
-        } else {
-            if (is_string($ident)) {
-                $ident = explode('.', $ident);
-            }
-            if (is_array($ident)) {
-                $segments = array();
-                foreach ($ident as $segment) {
-                    if ($segment instanceof Zend_Db_Expr) {
-                        $segments[] = $segment->__toString();
-                    } else {
-                        $segments[] = $this->_quoteIdentifier($segment, $auto);
-                    }
-                }
-                if ($alias !== null && end($ident) == $alias) {
-                    $alias = null;
-                }
-                $quoted = implode('.', $segments);
-            } else {
-                $quoted = $this->_quoteIdentifier($ident, $auto);
-            }
-        }
-        if ($alias !== null) {
-            $quoted .= $as . $this->_quoteIdentifier($alias, $auto);
-        }
-        return $quoted;
-    }
-
-    /**
-     * Quote an identifier.
-     *
-     * @param  string $value The identifier or expression.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @return string        The quoted identifier and alias.
-     */
-    protected function _quoteIdentifier($value, $auto=false)
-    {
-        if ($auto === false || $this->_autoQuoteIdentifiers === true) {
-            $q = $this->getQuoteIdentifierSymbol();
-            return ($q . str_replace("$q", "$q$q", $value) . $q);
-        }
-        return $value;
-    }
-
-    /**
-     * Returns the symbol the adapter uses for delimited identifiers.
-     *
-     * @return string
-     */
-    public function getQuoteIdentifierSymbol()
-    {
-        return '"';
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        return null;
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database, and return it.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        return null;
-    }
-
-    /**
-     * Helper method to change the case of the strings used
-     * when returning result sets in FETCH_ASSOC and FETCH_BOTH
-     * modes.
-     *
-     * This is not intended to be used by application code,
-     * but the method must be public so the Statement class
-     * can invoke it.
-     *
-     * @param string $key
-     * @return string
-     */
-    public function foldCase($key)
-    {
-        switch ($this->_caseFolding) {
-            case Zend_Db::CASE_LOWER:
-                $value = strtolower((string) $key);
-                break;
-            case Zend_Db::CASE_UPPER:
-                $value = strtoupper((string) $key);
-                break;
-            case Zend_Db::CASE_NATURAL:
-            default:
-                $value = (string) $key;
-        }
-        return $value;
-    }
-
-    /**
-     * called when object is getting serialized
-     * This disconnects the DB object that cant be serialized
-     *
-     * @throws Zend_Db_Adapter_Exception
-     * @return array
-     */
-    public function __sleep()
-    {
-        if ($this->_allowSerialization == false) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception(get_class($this) ." is not allowed to be serialized");
-        }
-        $this->_connection = false;
-        return array_keys(array_diff_key(get_object_vars($this), array('_connection'=>false)));
-    }
-
-    /**
-     * called when object is getting unserialized
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        if ($this->_autoReconnectOnUnserialize == true) {
-            $this->getConnection();
-        }
-    }
-
-    /**
-     * Abstract Methods
-     */
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    abstract public function listTables();
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME => string; name of database or schema
-     * TABLE_NAME  => string;
-     * COLUMN_NAME => string; column name
-     * COLUMN_POSITION => number; ordinal position of column in table
-     * DATA_TYPE   => string; SQL datatype name of column
-     * DEFAULT     => string; default expression of column, null if none
-     * NULLABLE    => boolean; true if column can have nulls
-     * LENGTH      => number; length of CHAR/VARCHAR
-     * SCALE       => number; scale of NUMERIC/DECIMAL
-     * PRECISION   => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED    => boolean; unsigned property of an integer type
-     * PRIMARY     => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    abstract public function describeTable($tableName, $schemaName = null);
-
-    /**
-     * Creates a connection to the database.
-     *
-     * @return void
-     */
-    abstract protected function _connect();
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    abstract public function isConnected();
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    abstract public function closeConnection();
-
-    /**
-     * Prepare a statement and return a PDOStatement-like object.
-     *
-     * @param string|Zend_Db_Select $sql SQL query
-     * @return Zend_Db_Statement|PDOStatement
-     */
-    abstract public function prepare($sql);
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    abstract public function lastInsertId($tableName = null, $primaryKey = null);
-
-    /**
-     * Begin a transaction.
-     */
-    abstract protected function _beginTransaction();
-
-    /**
-     * Commit a transaction.
-     */
-    abstract protected function _commit();
-
-    /**
-     * Roll-back a transaction.
-     */
-    abstract protected function _rollBack();
-
-    /**
-     * Set the fetch mode.
-     *
-     * @param integer $mode
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    abstract public function setFetchMode($mode);
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param mixed $sql
-     * @param integer $count
-     * @param integer $offset
-     * @return string
-     */
-    abstract public function limit($sql, $count, $offset = 0);
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    abstract public function supportsParameters($type);
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    abstract public function getServerVersion();
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Db2.php b/airtime_mvc/library/Zend/Db/Adapter/Db2.php
deleted file mode 100644
index 7181a45fa..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Db2.php
+++ /dev/null
@@ -1,832 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $
- *
- */
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Statement_Db2
- */
-require_once 'Zend/Db/Statement/Db2.php';
-
-
-/**
- * @package    Zend_Db
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract
-{
-    /**
-     * User-provided configuration.
-     *
-     * Basic keys are:
-     *
-     * username   => (string)  Connect to the database as this username.
-     * password   => (string)  Password associated with the username.
-     * host       => (string)  What host to connect to (default 127.0.0.1)
-     * dbname     => (string)  The name of the database to user
-     * protocol   => (string)  Protocol to use, defaults to "TCPIP"
-     * port       => (integer) Port number to use for TCP/IP if protocol is "TCPIP"
-     * persistent => (boolean) Set TRUE to use a persistent connection (db2_pconnect)
-     * os         => (string)  This should be set to 'i5' if the db is on an os400/i5
-     * schema     => (string)  The default schema the connection should use
-     *
-     * @var array
-     */
-    protected $_config = array(
-        'dbname'       => null,
-        'username'     => null,
-        'password'     => null,
-        'host'         => 'localhost',
-        'port'         => '50000',
-        'protocol'     => 'TCPIP',
-        'persistent'   => false,
-        'os'           => null,
-        'schema'       => null
-    );
-
-    /**
-     * Execution mode
-     *
-     * @var int execution flag (DB2_AUTOCOMMIT_ON or DB2_AUTOCOMMIT_OFF)
-     */
-    protected $_execute_mode = DB2_AUTOCOMMIT_ON;
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Db2';
-    protected $_isI5 = false;
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INTEGER'            => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'NUMERIC'            => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Creates a connection resource.
-     *
-     * @return void
-     */
-    protected function _connect()
-    {
-        if (is_resource($this->_connection)) {
-            // connection already exists
-            return;
-        }
-
-        if (!extension_loaded('ibm_db2')) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception('The IBM DB2 extension is required for this adapter but the extension is not loaded');
-        }
-
-        $this->_determineI5();
-        if ($this->_config['persistent']) {
-            // use persistent connection
-            $conn_func_name = 'db2_pconnect';
-        } else {
-            // use "normal" connection
-            $conn_func_name = 'db2_connect';
-        }
-
-        if (!isset($this->_config['driver_options']['autocommit'])) {
-            // set execution mode
-            $this->_config['driver_options']['autocommit'] = &$this->_execute_mode;
-        }
-
-        if (isset($this->_config['options'][Zend_Db::CASE_FOLDING])) {
-            $caseAttrMap = array(
-                Zend_Db::CASE_NATURAL => DB2_CASE_NATURAL,
-                Zend_Db::CASE_UPPER   => DB2_CASE_UPPER,
-                Zend_Db::CASE_LOWER   => DB2_CASE_LOWER
-            );
-            $this->_config['driver_options']['DB2_ATTR_CASE'] = $caseAttrMap[$this->_config['options'][Zend_Db::CASE_FOLDING]];
-        }
-
-        if ($this->_config['host'] !== 'localhost' && !$this->_isI5) {
-            // if the host isn't localhost, use extended connection params
-            $dbname = 'DRIVER={IBM DB2 ODBC DRIVER}' .
-                     ';DATABASE=' . $this->_config['dbname'] .
-                     ';HOSTNAME=' . $this->_config['host'] .
-                     ';PORT='     . $this->_config['port'] .
-                     ';PROTOCOL=' . $this->_config['protocol'] .
-                     ';UID='      . $this->_config['username'] .
-                     ';PWD='      . $this->_config['password'] .';';
-            $this->_connection = $conn_func_name(
-                $dbname,
-                null,
-                null,
-                $this->_config['driver_options']
-            );
-        } else {
-            // host is localhost, so use standard connection params
-            $this->_connection = $conn_func_name(
-                $this->_config['dbname'],
-                $this->_config['username'],
-                $this->_config['password'],
-                $this->_config['driver_options']
-            );
-        }
-
-        // check the connection
-        if (!$this->_connection) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception(db2_conn_errormsg(), db2_conn_error());
-        }
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return ((bool) (is_resource($this->_connection)
-                     && get_resource_type($this->_connection) == 'DB2 Connection'));
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        if ($this->isConnected()) {
-            db2_close($this->_connection);
-        }
-        $this->_connection = null;
-    }
-
-    /**
-     * Returns an SQL statement for preparation.
-     *
-     * @param string $sql The SQL statement with placeholders.
-     * @return Zend_Db_Statement_Db2
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        $stmtClass = $this->_defaultStmtClass;
-        if (!class_exists($stmtClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($stmtClass);
-        }
-        $stmt = new $stmtClass($this, $sql);
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Gets the execution mode
-     *
-     * @return int the execution mode (DB2_AUTOCOMMIT_ON or DB2_AUTOCOMMIT_OFF)
-     */
-    public function _getExecuteMode()
-    {
-        return $this->_execute_mode;
-    }
-
-    /**
-     * @param integer $mode
-     * @return void
-     */
-    public function _setExecuteMode($mode)
-    {
-        switch ($mode) {
-            case DB2_AUTOCOMMIT_OFF:
-            case DB2_AUTOCOMMIT_ON:
-                $this->_execute_mode = $mode;
-                db2_autocommit($this->_connection, $mode);
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Db2_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Db2/Exception.php';
-                throw new Zend_Db_Adapter_Db2_Exception("execution mode not supported");
-                break;
-        }
-    }
-
-    /**
-     * Quote a raw string.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            return $value;
-        }
-        /**
-         * Use db2_escape_string() if it is present in the IBM DB2 extension.
-         * But some supported versions of PHP do not include this function,
-         * so fall back to default quoting in the parent class.
-         */
-        if (function_exists('db2_escape_string')) {
-            return "'" . db2_escape_string($value) . "'";
-        }
-        return parent::_quote($value);
-    }
-
-    /**
-     * @return string
-     */
-    public function getQuoteIdentifierSymbol()
-    {
-        $this->_connect();
-        $info = db2_server_info($this->_connection);
-        if ($info) {
-            $identQuote = $info->IDENTIFIER_QUOTE_CHAR;
-        } else {
-            // db2_server_info() does not return result on some i5 OS version
-            if ($this->_isI5) {
-                $identQuote ="'";
-            }
-        }
-        return $identQuote;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     * @param string $schema OPTIONAL
-     * @return array
-     */
-    public function listTables($schema = null)
-    {
-        $this->_connect();
-
-        if ($schema === null && $this->_config['schema'] != null) {
-            $schema = $this->_config['schema'];
-        }
-
-        $tables = array();
-
-        if (!$this->_isI5) {
-            if ($schema) {
-                $stmt = db2_tables($this->_connection, null, $schema);
-            } else {
-                $stmt = db2_tables($this->_connection);
-            }
-            while ($row = db2_fetch_assoc($stmt)) {
-                $tables[] = $row['TABLE_NAME'];
-            }
-        } else {
-            $tables = $this->_i5listTables($schema);
-        }
-
-        return $tables;
-    }
-
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     *                     DB2 not supports UNSIGNED integer.
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        // Ensure the connection is made so that _isI5 is set
-        $this->_connect();
-
-        if ($schemaName === null && $this->_config['schema'] != null) {
-            $schemaName = $this->_config['schema'];
-        }
-
-        if (!$this->_isI5) {
-
-            $sql = "SELECT DISTINCT c.tabschema, c.tabname, c.colname, c.colno,
-                c.typename, c.default, c.nulls, c.length, c.scale,
-                c.identity, tc.type AS tabconsttype, k.colseq
-                FROM syscat.columns c
-                LEFT JOIN (syscat.keycoluse k JOIN syscat.tabconst tc
-                ON (k.tabschema = tc.tabschema
-                    AND k.tabname = tc.tabname
-                    AND tc.type = 'P'))
-                ON (c.tabschema = k.tabschema
-                    AND c.tabname = k.tabname
-                    AND c.colname = k.colname)
-                WHERE "
-                . $this->quoteInto('UPPER(c.tabname) = UPPER(?)', $tableName);
-
-            if ($schemaName) {
-               $sql .= $this->quoteInto(' AND UPPER(c.tabschema) = UPPER(?)', $schemaName);
-            }
-
-            $sql .= " ORDER BY c.colno";
-
-        } else {
-
-            // DB2 On I5 specific query
-            $sql = "SELECT DISTINCT C.TABLE_SCHEMA, C.TABLE_NAME, C.COLUMN_NAME, C.ORDINAL_POSITION,
-                C.DATA_TYPE, C.COLUMN_DEFAULT, C.NULLS ,C.LENGTH, C.SCALE, LEFT(C.IDENTITY,1),
-                LEFT(tc.TYPE, 1) AS tabconsttype, k.COLSEQ
-                FROM QSYS2.SYSCOLUMNS C
-                LEFT JOIN (QSYS2.syskeycst k JOIN QSYS2.SYSCST tc
-                    ON (k.TABLE_SCHEMA = tc.TABLE_SCHEMA
-                      AND k.TABLE_NAME = tc.TABLE_NAME
-                      AND LEFT(tc.type,1) = 'P'))
-                    ON (C.TABLE_SCHEMA = k.TABLE_SCHEMA
-                       AND C.TABLE_NAME = k.TABLE_NAME
-                       AND C.COLUMN_NAME = k.COLUMN_NAME)
-                WHERE "
-                 . $this->quoteInto('UPPER(C.TABLE_NAME) = UPPER(?)', $tableName);
-
-            if ($schemaName) {
-                $sql .= $this->quoteInto(' AND UPPER(C.TABLE_SCHEMA) = UPPER(?)', $schemaName);
-            }
-
-            $sql .= " ORDER BY C.ORDINAL_POSITION FOR FETCH ONLY";
-        }
-
-        $desc = array();
-        $stmt = $this->query($sql);
-
-        /**
-         * To avoid case issues, fetch using FETCH_NUM
-         */
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        /**
-         * The ordering of columns is defined by the query so we can map
-         * to variables to improve readability
-         */
-        $tabschema      = 0;
-        $tabname        = 1;
-        $colname        = 2;
-        $colno          = 3;
-        $typename       = 4;
-        $default        = 5;
-        $nulls          = 6;
-        $length         = 7;
-        $scale          = 8;
-        $identityCol    = 9;
-        $tabconstType   = 10;
-        $colseq         = 11;
-
-        foreach ($result as $key => $row) {
-            list ($primary, $primaryPosition, $identity) = array(false, null, false);
-            if ($row[$tabconstType] == 'P') {
-                $primary = true;
-                $primaryPosition = $row[$colseq];
-            }
-            /**
-             * In IBM DB2, an column can be IDENTITY
-             * even if it is not part of the PRIMARY KEY.
-             */
-            if ($row[$identityCol] == 'Y') {
-                $identity = true;
-            }
-
-            // only colname needs to be case adjusted
-            $desc[$this->foldCase($row[$colname])] = array(
-                'SCHEMA_NAME'      => $this->foldCase($row[$tabschema]),
-                'TABLE_NAME'       => $this->foldCase($row[$tabname]),
-                'COLUMN_NAME'      => $this->foldCase($row[$colname]),
-                'COLUMN_POSITION'  => (!$this->_isI5) ? $row[$colno]+1 : $row[$colno],
-                'DATA_TYPE'        => $row[$typename],
-                'DEFAULT'          => $row[$default],
-                'NULLABLE'         => (bool) ($row[$nulls] == 'Y'),
-                'LENGTH'           => $row[$length],
-                'SCALE'            => $row[$scale],
-                'PRECISION'        => ($row[$typename] == 'DECIMAL' ? $row[$length] : 0),
-                'UNSIGNED'         => false,
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-
-        return $desc;
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $this->_connect();
-
-        if (!$this->_isI5) {
-            $quotedSequenceName = $this->quoteIdentifier($sequenceName, true);
-            $sql = 'SELECT PREVVAL FOR ' . $quotedSequenceName . ' AS VAL FROM SYSIBM.SYSDUMMY1';
-        } else {
-            $quotedSequenceName = $sequenceName;
-            $sql = 'SELECT PREVVAL FOR ' . $this->quoteIdentifier($sequenceName, true) . ' AS VAL FROM QSYS2.QSQPTABL';
-        }
-
-        $value = $this->fetchOne($sql);
-        return (string) $value;
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database, and return it.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $sql = 'SELECT NEXTVAL FOR '.$this->quoteIdentifier($sequenceName, true).' AS VAL FROM SYSIBM.SYSDUMMY1';
-        $value = $this->fetchOne($sql);
-        return (string) $value;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * The IDENTITY_VAL_LOCAL() function gives the last generated identity value
-     * in the current process, even if it was for a GENERATED column.
-     *
-     * @param string $tableName OPTIONAL
-     * @param string $primaryKey OPTIONAL
-     * @param string $idType OPTIONAL used for i5 platform to define sequence/idenity unique value
-     * @return string
-     */
-
-    public function lastInsertId($tableName = null, $primaryKey = null, $idType = null)
-    {
-        $this->_connect();
-
-        if ($this->_isI5) {
-            return (string) $this->_i5LastInsertId($tableName, $idType);
-        }
-
-        if ($tableName !== null) {
-            $sequenceName = $tableName;
-            if ($primaryKey) {
-                $sequenceName .= "_$primaryKey";
-            }
-            $sequenceName .= '_seq';
-            return $this->lastSequenceId($sequenceName);
-        }
-
-        $sql = 'SELECT IDENTITY_VAL_LOCAL() AS VAL FROM SYSIBM.SYSDUMMY1';
-        $value = $this->fetchOne($sql);
-        return (string) $value;
-    }
-
-    /**
-     * Begin a transaction.
-     *
-     * @return void
-     */
-    protected function _beginTransaction()
-    {
-        $this->_setExecuteMode(DB2_AUTOCOMMIT_OFF);
-    }
-
-    /**
-     * Commit a transaction.
-     *
-     * @return void
-     */
-    protected function _commit()
-    {
-        if (!db2_commit($this->_connection)) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception(
-                db2_conn_errormsg($this->_connection),
-                db2_conn_error($this->_connection));
-        }
-
-        $this->_setExecuteMode(DB2_AUTOCOMMIT_ON);
-    }
-
-    /**
-     * Rollback a transaction.
-     *
-     * @return void
-     */
-    protected function _rollBack()
-    {
-        if (!db2_rollback($this->_connection)) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception(
-                db2_conn_errormsg($this->_connection),
-                db2_conn_error($this->_connection));
-        }
-        $this->_setExecuteMode(DB2_AUTOCOMMIT_ON);
-    }
-
-    /**
-     * Set the fetch mode.
-     *
-     * @param integer $mode
-     * @return void
-     * @throws Zend_Db_Adapter_Db2_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        switch ($mode) {
-            case Zend_Db::FETCH_NUM:   // seq array
-            case Zend_Db::FETCH_ASSOC: // assoc array
-            case Zend_Db::FETCH_BOTH:  // seq+assoc array
-            case Zend_Db::FETCH_OBJ:   // object
-                $this->_fetchMode = $mode;
-                break;
-            case Zend_Db::FETCH_BOUND:   // bound to PHP variable
-                /**
-                 * @see Zend_Db_Adapter_Db2_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Db2/Exception.php';
-                throw new Zend_Db_Adapter_Db2_Exception('FETCH_BOUND is not supported yet');
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Db2_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Db2/Exception.php';
-                throw new Zend_Db_Adapter_Db2_Exception("Invalid fetch mode '$mode' specified");
-                break;
-        }
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /**
-             * @see Zend_Db_Adapter_Db2_Exception
-             */
-            require_once 'Zend/Db/Adapter/Db2/Exception.php';
-            throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        if ($offset == 0) {
-            $limit_sql = $sql . " FETCH FIRST $count ROWS ONLY";
-            return $limit_sql;
-        }
-
-        /**
-         * DB2 does not implement the LIMIT clause as some RDBMS do.
-         * We have to simulate it with subqueries and ROWNUM.
-         * Unfortunately because we use the column wildcard "*",
-         * this puts an extra column into the query result set.
-         */
-        $limit_sql = "SELECT z2.*
-            FROM (
-                SELECT ROW_NUMBER() OVER() AS \"ZEND_DB_ROWNUM\", z1.*
-                FROM (
-                    " . $sql . "
-                ) z1
-            ) z2
-            WHERE z2.zend_db_rownum BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
-        return $limit_sql;
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        if ($type == 'positional') {
-            return true;
-        }
-
-        // if its 'named' or anything else
-        return false;
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        $this->_connect();
-        $server_info = db2_server_info($this->_connection);
-        if ($server_info !== false) {
-            $version = $server_info->DBMS_VER;
-            if ($this->_isI5) {
-                $version = (int) substr($version, 0, 2) . '.' . (int) substr($version, 2, 2) . '.' . (int) substr($version, 4);
-            }
-            return $version;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return whether or not this is running on i5
-     *
-     * @return bool
-     */
-    public function isI5()
-    {
-        if ($this->_isI5 === null) {
-            $this->_determineI5();
-        }
-
-        return (bool) $this->_isI5;
-    }
-
-    /**
-     * Check the connection parameters according to verify
-     * type of used OS
-     *
-     *  @return void
-     */
-    protected function _determineI5()
-    {
-        // first us the compiled flag.
-        $this->_isI5 = (php_uname('s') == 'OS400') ? true : false;
-
-        // if this is set, then us it
-        if (isset($this->_config['os'])){
-            if (strtolower($this->_config['os']) === 'i5') {
-                $this->_isI5 = true;
-            } else {
-                // any other value passed in, its null
-                $this->_isI5 = false;
-            }
-        }
-
-    }
-
-    /**
-     * Db2 On I5 specific method
-     *
-     * Returns a list of the tables in the database .
-     * Used only for DB2/400.
-     *
-     * @return array
-     */
-    protected function _i5listTables($schema = null)
-    {
-        //list of i5 libraries.
-        $tables = array();
-        if ($schema) {
-            $tablesStatement = db2_tables($this->_connection, null, $schema);
-            while ($rowTables = db2_fetch_assoc($tablesStatement) ) {
-                if ($rowTables['TABLE_NAME'] !== null) {
-                    $tables[] = $rowTables['TABLE_NAME'];
-                }
-            }
-        } else {
-            $schemaStatement = db2_tables($this->_connection);
-            while ($schema = db2_fetch_assoc($schemaStatement)) {
-                if ($schema['TABLE_SCHEM'] !== null) {
-                    // list of the tables which belongs to the selected library
-                    $tablesStatement = db2_tables($this->_connection, NULL, $schema['TABLE_SCHEM']);
-                    if (is_resource($tablesStatement)) {
-                        while ($rowTables = db2_fetch_assoc($tablesStatement) ) {
-                            if ($rowTables['TABLE_NAME'] !== null) {
-                                $tables[] = $rowTables['TABLE_NAME'];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return $tables;
-    }
-
-    protected function _i5LastInsertId($objectName = null, $idType = null)
-    {
-
-        if ($objectName === null) {
-            $sql = 'SELECT IDENTITY_VAL_LOCAL() AS VAL FROM QSYS2.QSQPTABL';
-            $value = $this->fetchOne($sql);
-            return $value;
-        }
-
-        if (strtoupper($idType) === 'S'){
-            //check i5_lib option
-            $sequenceName = $objectName;
-            return $this->lastSequenceId($sequenceName);
-        }
-
-            //returns last identity value for the specified table
-        //if (strtoupper($idType) === 'I') {
-        $tableName = $objectName;
-        return $this->fetchOne('SELECT IDENTITY_VAL_LOCAL() from ' . $this->quoteIdentifier($tableName));
-    }
-
-}
-
-
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Db2/Exception.php b/airtime_mvc/library/Zend/Db/Adapter/Db2/Exception.php
deleted file mode 100644
index 2ee356d40..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Db2/Exception.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Adapter_Exception
- */
-require_once 'Zend/Db/Adapter/Exception.php';
-
-/**
- * Zend_Db_Adapter_Db2_Exception
- *
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception
-{
-   protected $code = '00000';
-   protected $message = 'unknown exception';
-
-   function __construct($message = 'unknown exception', $code = '00000', Exception $e = null) 
-   {
-       parent::__construct($message, $code, $e);
-   }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Exception.php b/airtime_mvc/library/Zend/Db/Adapter/Exception.php
deleted file mode 100644
index 06585c178..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Exception.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Exception
- */
-require_once 'Zend/Db/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Exception extends Zend_Db_Exception
-{
-    protected $_chainedException = null;
-
-    public function __construct($message = '', $code = 0, Exception $e = null)
-    {
-        if ($e && (0 === $code)) {
-            $code = $e->getCode();
-        }
-        parent::__construct($message, $code, $e);
-    }
-
-    public function hasChainedException()
-    {
-        return ($this->_previous !== null);
-    }
-
-    public function getChainedException()
-    {
-        return $this->getPrevious();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Mysqli.php b/airtime_mvc/library/Zend/Db/Adapter/Mysqli.php
deleted file mode 100644
index a92a00fef..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Mysqli.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Profiler
- */
-require_once 'Zend/Db/Profiler.php';
-
-/**
- * @see Zend_Db_Select
- */
-require_once 'Zend/Db/Select.php';
-
-/**
- * @see Zend_Db_Statement_Mysqli
- */
-require_once 'Zend/Db/Statement/Mysqli.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract
-{
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INT'                => Zend_Db::INT_TYPE,
-        'INTEGER'            => Zend_Db::INT_TYPE,
-        'MEDIUMINT'          => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'TINYINT'            => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'SERIAL'             => Zend_Db::BIGINT_TYPE,
-        'DEC'                => Zend_Db::FLOAT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'DOUBLE'             => Zend_Db::FLOAT_TYPE,
-        'DOUBLE PRECISION'   => Zend_Db::FLOAT_TYPE,
-        'FIXED'              => Zend_Db::FLOAT_TYPE,
-        'FLOAT'              => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * @var Zend_Db_Statement_Mysqli
-     */
-    protected $_stmt = null;
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Mysqli';
-
-    /**
-     * Quote a raw string.
-     *
-     * @param mixed $value Raw string
-     *
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            return $value;
-        }
-        $this->_connect();
-        return "'" . $this->_connection->real_escape_string($value) . "'";
-    }
-
-    /**
-     * Returns the symbol the adapter uses for delimiting identifiers.
-     *
-     * @return string
-     */
-    public function getQuoteIdentifierSymbol()
-    {
-        return "`";
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $result = array();
-        // Use mysqli extension API, because SHOW doesn't work
-        // well as a prepared statement on MySQL 4.1.
-        $sql = 'SHOW TABLES';
-        if ($queryResult = $this->getConnection()->query($sql)) {
-            while ($row = $queryResult->fetch_row()) {
-                $result[] = $row[0];
-            }
-            $queryResult->close();
-        } else {
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error);
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        /**
-         * @todo  use INFORMATION_SCHEMA someday when
-         * MySQL's implementation isn't too slow.
-         */
-
-        if ($schemaName) {
-            $sql = 'DESCRIBE ' . $this->quoteIdentifier("$schemaName.$tableName", true);
-        } else {
-            $sql = 'DESCRIBE ' . $this->quoteIdentifier($tableName, true);
-        }
-
-        /**
-         * Use mysqli extension API, because DESCRIBE doesn't work
-         * well as a prepared statement on MySQL 4.1.
-         */
-        if ($queryResult = $this->getConnection()->query($sql)) {
-            while ($row = $queryResult->fetch_assoc()) {
-                $result[] = $row;
-            }
-            $queryResult->close();
-        } else {
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error);
-        }
-
-        $desc = array();
-
-        $row_defaults = array(
-            'Length'          => null,
-            'Scale'           => null,
-            'Precision'       => null,
-            'Unsigned'        => null,
-            'Primary'         => false,
-            'PrimaryPosition' => null,
-            'Identity'        => false
-        );
-        $i = 1;
-        $p = 1;
-        foreach ($result as $key => $row) {
-            $row = array_merge($row_defaults, $row);
-            if (preg_match('/unsigned/', $row['Type'])) {
-                $row['Unsigned'] = true;
-            }
-            if (preg_match('/^((?:var)?char)\((\d+)\)/', $row['Type'], $matches)) {
-                $row['Type'] = $matches[1];
-                $row['Length'] = $matches[2];
-            } else if (preg_match('/^decimal\((\d+),(\d+)\)/', $row['Type'], $matches)) {
-                $row['Type'] = 'decimal';
-                $row['Precision'] = $matches[1];
-                $row['Scale'] = $matches[2];
-            } else if (preg_match('/^float\((\d+),(\d+)\)/', $row['Type'], $matches)) {
-                $row['Type'] = 'float';
-                $row['Precision'] = $matches[1];
-                $row['Scale'] = $matches[2];
-            } else if (preg_match('/^((?:big|medium|small|tiny)?int)\((\d+)\)/', $row['Type'], $matches)) {
-                $row['Type'] = $matches[1];
-                /**
-                 * The optional argument of a MySQL int type is not precision
-                 * or length; it is only a hint for display width.
-                 */
-            }
-            if (strtoupper($row['Key']) == 'PRI') {
-                $row['Primary'] = true;
-                $row['PrimaryPosition'] = $p;
-                if ($row['Extra'] == 'auto_increment') {
-                    $row['Identity'] = true;
-                } else {
-                    $row['Identity'] = false;
-                }
-                ++$p;
-            }
-            $desc[$this->foldCase($row['Field'])] = array(
-                'SCHEMA_NAME'      => null, // @todo
-                'TABLE_NAME'       => $this->foldCase($tableName),
-                'COLUMN_NAME'      => $this->foldCase($row['Field']),
-                'COLUMN_POSITION'  => $i,
-                'DATA_TYPE'        => $row['Type'],
-                'DEFAULT'          => $row['Default'],
-                'NULLABLE'         => (bool) ($row['Null'] == 'YES'),
-                'LENGTH'           => $row['Length'],
-                'SCALE'            => $row['Scale'],
-                'PRECISION'        => $row['Precision'],
-                'UNSIGNED'         => $row['Unsigned'],
-                'PRIMARY'          => $row['Primary'],
-                'PRIMARY_POSITION' => $row['PrimaryPosition'],
-                'IDENTITY'         => $row['Identity']
-            );
-            ++$i;
-        }
-        return $desc;
-    }
-
-    /**
-     * Creates a connection to the database.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Mysqli_Exception
-     */
-    protected function _connect()
-    {
-        if ($this->_connection) {
-            return;
-        }
-
-        if (!extension_loaded('mysqli')) {
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception('The Mysqli extension is required for this adapter but the extension is not loaded');
-        }
-
-        if (isset($this->_config['port'])) {
-            $port = (integer) $this->_config['port'];
-        } else {
-            $port = null;
-        }
-
-        $this->_connection = mysqli_init();
-
-        if(!empty($this->_config['driver_options'])) {
-            foreach($this->_config['driver_options'] as $option=>$value) {
-                if(is_string($option)) {
-                    // Suppress warnings here
-                    // Ignore it if it's not a valid constant
-                    $option = @constant(strtoupper($option));
-                    if($option === null)
-                        continue;
-                }
-                mysqli_options($this->_connection, $option, $value);
-            }
-        }
-
-        // Suppress connection warnings here.
-        // Throw an exception instead.
-        $_isConnected = @mysqli_real_connect(
-            $this->_connection,
-            $this->_config['host'],
-            $this->_config['username'],
-            $this->_config['password'],
-            $this->_config['dbname'],
-            $port
-        );
-
-        if ($_isConnected === false || mysqli_connect_errno()) {
-
-            $this->closeConnection();
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error());
-        }
-
-        if (!empty($this->_config['charset'])) {
-            mysqli_set_charset($this->_connection, $this->_config['charset']);
-        }
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return ((bool) ($this->_connection instanceof mysqli));
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        if ($this->isConnected()) {
-            $this->_connection->close();
-        }
-        $this->_connection = null;
-    }
-
-    /**
-     * Prepare a statement and return a PDOStatement-like object.
-     *
-     * @param  string  $sql  SQL query
-     * @return Zend_Db_Statement_Mysqli
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        if ($this->_stmt) {
-            $this->_stmt->close();
-        }
-        $stmtClass = $this->_defaultStmtClass;
-        if (!class_exists($stmtClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($stmtClass);
-        }
-        $stmt = new $stmtClass($this, $sql);
-        if ($stmt === false) {
-            return false;
-        }
-        $stmt->setFetchMode($this->_fetchMode);
-        $this->_stmt = $stmt;
-        return $stmt;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * MySQL does not support sequences, so $tableName and $primaryKey are ignored.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     * @todo Return value should be int?
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        $mysqli = $this->_connection;
-        return (string) $mysqli->insert_id;
-    }
-
-    /**
-     * Begin a transaction.
-     *
-     * @return void
-     */
-    protected function _beginTransaction()
-    {
-        $this->_connect();
-        $this->_connection->autocommit(false);
-    }
-
-    /**
-     * Commit a transaction.
-     *
-     * @return void
-     */
-    protected function _commit()
-    {
-        $this->_connect();
-        $this->_connection->commit();
-        $this->_connection->autocommit(true);
-    }
-
-    /**
-     * Roll-back a transaction.
-     *
-     * @return void
-     */
-    protected function _rollBack()
-    {
-        $this->_connect();
-        $this->_connection->rollback();
-        $this->_connection->autocommit(true);
-    }
-
-    /**
-     * Set the fetch mode.
-     *
-     * @param int $mode
-     * @return void
-     * @throws Zend_Db_Adapter_Mysqli_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        switch ($mode) {
-            case Zend_Db::FETCH_LAZY:
-            case Zend_Db::FETCH_ASSOC:
-            case Zend_Db::FETCH_NUM:
-            case Zend_Db::FETCH_BOTH:
-            case Zend_Db::FETCH_NAMED:
-            case Zend_Db::FETCH_OBJ:
-                $this->_fetchMode = $mode;
-                break;
-            case Zend_Db::FETCH_BOUND: // bound to PHP variable
-                /**
-                 * @see Zend_Db_Adapter_Mysqli_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-                throw new Zend_Db_Adapter_Mysqli_Exception('FETCH_BOUND is not supported yet');
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Mysqli_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-                throw new Zend_Db_Adapter_Mysqli_Exception("Invalid fetch mode '$mode' specified");
-        }
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param int $count
-     * @param int $offset OPTIONAL
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /**
-             * @see Zend_Db_Adapter_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Adapter/Mysqli/Exception.php';
-            throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        $sql .= " LIMIT $count";
-        if ($offset > 0) {
-            $sql .= " OFFSET $offset";
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        switch ($type) {
-            case 'positional':
-                return true;
-            case 'named':
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     *@return string
-     */
-    public function getServerVersion()
-    {
-        $this->_connect();
-        $version = $this->_connection->server_version;
-        $major = (int) ($version / 10000);
-        $minor = (int) ($version % 10000 / 100);
-        $revision = (int) ($version % 100);
-        return $major . '.' . $minor . '.' . $revision;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Mysqli/Exception.php b/airtime_mvc/library/Zend/Db/Adapter/Mysqli/Exception.php
deleted file mode 100644
index 2c3eb93ef..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Mysqli/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- *
- */
-
-/**
- * Zend
- */
-require_once 'Zend/Db/Adapter/Exception.php';
-
-/**
- * Zend_Db_Adapter_Mysqli_Exception
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Mysqli_Exception extends Zend_Db_Adapter_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Oracle.php b/airtime_mvc/library/Zend/Db/Adapter/Oracle.php
deleted file mode 100644
index 474a8d0f8..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Oracle.php
+++ /dev/null
@@ -1,682 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Oracle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Statement_Oracle
- */
-require_once 'Zend/Db/Statement/Oracle.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract
-{
-    /**
-     * User-provided configuration.
-     *
-     * Basic keys are:
-     *
-     * username => (string) Connect to the database as this username.
-     * password => (string) Password associated with the username.
-     * dbname   => Either the name of the local Oracle instance, or the
-     *             name of the entry in tnsnames.ora to which you want to connect.
-     * persistent => (boolean) Set TRUE to use a persistent connection
-     * @var array
-     */
-    protected $_config = array(
-        'dbname'       => null,
-        'username'     => null,
-        'password'     => null,
-        'persistent'   => false
-    );
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'BINARY_DOUBLE'      => Zend_Db::FLOAT_TYPE,
-        'BINARY_FLOAT'       => Zend_Db::FLOAT_TYPE,
-        'NUMBER'             => Zend_Db::FLOAT_TYPE,
-    );
-
-    /**
-     * @var integer
-     */
-    protected $_execute_mode = null;
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Oracle';
-
-    /**
-     * Check if LOB field are returned as string
-     * instead of OCI-Lob object
-     *
-     * @var boolean
-     */
-    protected $_lobAsString = null;
-
-    /**
-     * Creates a connection resource.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    protected function _connect()
-    {
-        if (is_resource($this->_connection)) {
-            // connection already exists
-            return;
-        }
-
-        if (!extension_loaded('oci8')) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception('The OCI8 extension is required for this adapter but the extension is not loaded');
-        }
-
-        $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS);
-
-        $connectionFuncName = ($this->_config['persistent'] == true) ? 'oci_pconnect' : 'oci_connect';
-
-        $this->_connection = @$connectionFuncName(
-                $this->_config['username'],
-                $this->_config['password'],
-                $this->_config['dbname'],
-                $this->_config['charset']);
-
-        // check the connection
-        if (!$this->_connection) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception(oci_error());
-        }
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return ((bool) (is_resource($this->_connection)
-                     && get_resource_type($this->_connection) == 'oci8 connection'));
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        if ($this->isConnected()) {
-            oci_close($this->_connection);
-        }
-        $this->_connection = null;
-    }
-
-    /**
-     * Activate/deactivate return of LOB as string
-     *
-     * @param string $lob_as_string
-     * @return Zend_Db_Adapter_Oracle
-     */
-    public function setLobAsString($lobAsString)
-    {
-        $this->_lobAsString = (bool) $lobAsString;
-        return $this;
-    }
-
-    /**
-     * Return whether or not LOB are returned as string
-     *
-     * @return boolean
-     */
-    public function getLobAsString()
-    {
-        if ($this->_lobAsString === null) {
-            // if never set by user, we use driver option if it exists otherwise false
-            if (isset($this->_config['driver_options']) &&
-                isset($this->_config['driver_options']['lob_as_string'])) {
-                $this->_lobAsString = (bool) $this->_config['driver_options']['lob_as_string'];
-            } else {
-                $this->_lobAsString = false;
-            }
-        }
-        return $this->_lobAsString;
-    }
-
-    /**
-     * Returns an SQL statement for preparation.
-     *
-     * @param string $sql The SQL statement with placeholders.
-     * @return Zend_Db_Statement_Oracle
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        $stmtClass = $this->_defaultStmtClass;
-        if (!class_exists($stmtClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($stmtClass);
-        }
-        $stmt = new $stmtClass($this, $sql);
-        if ($stmt instanceof Zend_Db_Statement_Oracle) {
-            $stmt->setLobAsString($this->getLobAsString());
-        }
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Quote a raw string.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            return $value;
-        }
-        $value = str_replace("'", "''", $value);
-        return "'" . addcslashes($value, "\000\n\r\\\032") . "'";
-    }
-
-    /**
-     * Quote a table identifier and alias.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An alias for the table.
-     * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
-     * @return string The quoted identifier and alias.
-     */
-    public function quoteTableAs($ident, $alias = null, $auto = false)
-    {
-        // Oracle doesn't allow the 'AS' keyword between the table identifier/expression and alias.
-        return $this->_quoteIdentifierAs($ident, $alias, $auto, ' ');
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $sql = 'SELECT '.$this->quoteIdentifier($sequenceName, true).'.CURRVAL FROM dual';
-        $value = $this->fetchOne($sql);
-        return $value;
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database, and return it.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $sql = 'SELECT '.$this->quoteIdentifier($sequenceName, true).'.NEXTVAL FROM dual';
-        $value = $this->fetchOne($sql);
-        return $value;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * Oracle does not support IDENTITY columns, so if the sequence is not
-     * specified, this method returns null.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        if ($tableName !== null) {
-            $sequenceName = $tableName;
-            if ($primaryKey) {
-                $sequenceName .= "_$primaryKey";
-            }
-            $sequenceName .= '_seq';
-            return $this->lastSequenceId($sequenceName);
-        }
-
-        // No support for IDENTITY columns; return null
-        return null;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $this->_connect();
-        $data = $this->fetchCol('SELECT table_name FROM all_tables');
-        return $data;
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @todo Discover integer unsigned property.
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $version = $this->getServerVersion();
-        if (($version === null) || version_compare($version, '9.0.0', '>=')) {
-            $sql = "SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
-                    TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
-                    TC.DATA_SCALE, TC.DATA_PRECISION, C.CONSTRAINT_TYPE, CC.POSITION
-                FROM ALL_TAB_COLUMNS TC
-                LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C
-                    ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P'))
-                  ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME
-                WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)";
-            $bind[':TBNAME'] = $tableName;
-            if ($schemaName) {
-                $sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
-                $bind[':SCNAME'] = $schemaName;
-            }
-            $sql .= ' ORDER BY TC.COLUMN_ID';
-        } else {
-            $subSql="SELECT AC.OWNER, AC.TABLE_NAME, ACC.COLUMN_NAME, AC.CONSTRAINT_TYPE, ACC.POSITION
-                from ALL_CONSTRAINTS AC, ALL_CONS_COLUMNS ACC
-                  WHERE ACC.CONSTRAINT_NAME = AC.CONSTRAINT_NAME
-                    AND ACC.TABLE_NAME = AC.TABLE_NAME
-                    AND ACC.OWNER = AC.OWNER
-                    AND AC.CONSTRAINT_TYPE = 'P'
-                    AND UPPER(AC.TABLE_NAME) = UPPER(:TBNAME)";
-            $bind[':TBNAME'] = $tableName;
-            if ($schemaName) {
-                $subSql .= ' AND UPPER(ACC.OWNER) = UPPER(:SCNAME)';
-                $bind[':SCNAME'] = $schemaName;
-            }
-            $sql="SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
-                    TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
-                    TC.DATA_SCALE, TC.DATA_PRECISION, CC.CONSTRAINT_TYPE, CC.POSITION
-                FROM ALL_TAB_COLUMNS TC, ($subSql) CC
-                WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)
-                  AND TC.OWNER = CC.OWNER(+) AND TC.TABLE_NAME = CC.TABLE_NAME(+) AND TC.COLUMN_NAME = CC.COLUMN_NAME(+)";
-            if ($schemaName) {
-                $sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
-            }
-            $sql .= ' ORDER BY TC.COLUMN_ID';
-        }
-
-        $stmt = $this->query($sql, $bind);
-
-        /**
-         * Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
-         */
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $table_name      = 0;
-        $owner           = 1;
-        $column_name     = 2;
-        $data_type       = 3;
-        $data_default    = 4;
-        $nullable        = 5;
-        $column_id       = 6;
-        $data_length     = 7;
-        $data_scale      = 8;
-        $data_precision  = 9;
-        $constraint_type = 10;
-        $position        = 11;
-
-        $desc = array();
-        foreach ($result as $key => $row) {
-            list ($primary, $primaryPosition, $identity) = array(false, null, false);
-            if ($row[$constraint_type] == 'P') {
-                $primary = true;
-                $primaryPosition = $row[$position];
-                /**
-                 * Oracle does not support auto-increment keys.
-                 */
-                $identity = false;
-            }
-            $desc[$this->foldCase($row[$column_name])] = array(
-                'SCHEMA_NAME'      => $this->foldCase($row[$owner]),
-                'TABLE_NAME'       => $this->foldCase($row[$table_name]),
-                'COLUMN_NAME'      => $this->foldCase($row[$column_name]),
-                'COLUMN_POSITION'  => $row[$column_id],
-                'DATA_TYPE'        => $row[$data_type],
-                'DEFAULT'          => $row[$data_default],
-                'NULLABLE'         => (bool) ($row[$nullable] == 'Y'),
-                'LENGTH'           => $row[$data_length],
-                'SCALE'            => $row[$data_scale],
-                'PRECISION'        => $row[$data_precision],
-                'UNSIGNED'         => null, // @todo
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-        return $desc;
-    }
-
-    /**
-     * Leave autocommit mode and begin a transaction.
-     *
-     * @return void
-     */
-    protected function _beginTransaction()
-    {
-        $this->_setExecuteMode(OCI_DEFAULT);
-    }
-
-    /**
-     * Commit a transaction and return to autocommit mode.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    protected function _commit()
-    {
-        if (!oci_commit($this->_connection)) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection));
-        }
-        $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS);
-    }
-
-    /**
-     * Roll back a transaction and return to autocommit mode.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    protected function _rollBack()
-    {
-        if (!oci_rollback($this->_connection)) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection));
-        }
-        $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS);
-    }
-
-    /**
-     * Set the fetch mode.
-     *
-     * @todo Support FETCH_CLASS and FETCH_INTO.
-     *
-     * @param integer $mode A fetch mode.
-     * @return void
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        switch ($mode) {
-            case Zend_Db::FETCH_NUM:   // seq array
-            case Zend_Db::FETCH_ASSOC: // assoc array
-            case Zend_Db::FETCH_BOTH:  // seq+assoc array
-            case Zend_Db::FETCH_OBJ:   // object
-                $this->_fetchMode = $mode;
-                break;
-            case Zend_Db::FETCH_BOUND: // bound to PHP variable
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-                throw new Zend_Db_Adapter_Oracle_Exception('FETCH_BOUND is not supported yet');
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-                throw new Zend_Db_Adapter_Oracle_Exception("Invalid fetch mode '$mode' specified");
-                break;
-        }
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-            throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        /**
-         * Oracle does not implement the LIMIT clause as some RDBMS do.
-         * We have to simulate it with subqueries and ROWNUM.
-         * Unfortunately because we use the column wildcard "*",
-         * this puts an extra column into the query result set.
-         */
-        $limit_sql = "SELECT z2.*
-            FROM (
-                SELECT z1.*, ROWNUM AS \"zend_db_rownum\"
-                FROM (
-                    " . $sql . "
-                ) z1
-            ) z2
-            WHERE z2.\"zend_db_rownum\" BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
-        return $limit_sql;
-    }
-
-    /**
-     * @param integer $mode
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    private function _setExecuteMode($mode)
-    {
-        switch($mode) {
-            case OCI_COMMIT_ON_SUCCESS:
-            case OCI_DEFAULT:
-            case OCI_DESCRIBE_ONLY:
-                $this->_execute_mode = $mode;
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Oracle/Exception.php';
-                throw new Zend_Db_Adapter_Oracle_Exception("Invalid execution mode '$mode' specified");
-                break;
-        }
-    }
-
-    /**
-     * @return int
-     */
-    public function _getExecuteMode()
-    {
-        return $this->_execute_mode;
-    }
-
-    /**
-     * Inserts a table row with specified data.
-     *
-     * Oracle does not support anonymous ('?') binds.
-     *
-     * @param mixed $table The table to insert data into.
-     * @param array $bind Column-value pairs.
-     * @return int The number of affected rows.
-     */
-    public function insert($table, array $bind)
-    {
-        $i = 0;
-        // extract and quote col names from the array keys
-        $cols = array();
-        $vals = array();
-        foreach ($bind as $col => $val) {
-            $cols[] = $this->quoteIdentifier($col, true);
-            if ($val instanceof Zend_Db_Expr) {
-                $vals[] = $val->__toString();
-                unset($bind[$col]);
-            } else {
-                $vals[] = ':'.$col.$i;
-                unset($bind[$col]);
-                $bind[':'.$col.$i] = $val;
-            }
-            $i++;
-        }
-
-        // build the statement
-        $sql = "INSERT INTO "
-             . $this->quoteIdentifier($table, true)
-             . ' (' . implode(', ', $cols) . ') '
-             . 'VALUES (' . implode(', ', $vals) . ')';
-
-        // execute the statement and return the number of affected rows
-        $stmt = $this->query($sql, $bind);
-        $result = $stmt->rowCount();
-        return $result;
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        switch ($type) {
-            case 'named':
-                return true;
-            case 'positional':
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        $this->_connect();
-        $version = oci_server_version($this->_connection);
-        if ($version !== false) {
-            $matches = null;
-            if (preg_match('/((?:[0-9]{1,2}\.){1,3}[0-9]{1,2})/', $version, $matches)) {
-                return $matches[1];
-            } else {
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Oracle/Exception.php b/airtime_mvc/library/Zend/Db/Adapter/Oracle/Exception.php
deleted file mode 100644
index 61f4a3dc8..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Oracle/Exception.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Adapter_Exception
- */
-require_once 'Zend/Db/Adapter/Exception.php';
-
-/**
- * Zend_Db_Adapter_Oracle_Exception
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Oracle_Exception extends Zend_Db_Adapter_Exception
-{
-   protected $message = 'Unknown exception';
-   protected $code = 0;
-
-   function __construct($error = null, $code = 0) {
-       if (is_array($error)) {
-            if (!isset($error['offset'])) {
-                $this->message = $error['code'] .' '. $error['message'];
-            } else {
-                $this->message = $error['code'] .' '. $error['message']." "
-                               . substr($error['sqltext'], 0, $error['offset'])
-                               . "*"
-                               . substr($error['sqltext'], $error['offset']);
-            }
-            $this->code = $error['code'];
-       } else if (is_string($error)) {
-           $this->message = $error;
-       }
-       if (!$this->code && $code) {
-           $this->code = $code;
-       }
-   }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Abstract.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Abstract.php
deleted file mode 100644
index 97dd2fdf8..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Abstract.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-
-/**
- * @see Zend_Db_Statement_Pdo
- */
-require_once 'Zend/Db/Statement/Pdo.php';
-
-
-/**
- * Class for connecting to SQL databases and performing common operations using PDO.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
-{
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Pdo';
-
-    /**
-     * Creates a PDO DSN for the adapter from $this->_config settings.
-     *
-     * @return string
-     */
-    protected function _dsn()
-    {
-        // baseline of DSN parts
-        $dsn = $this->_config;
-
-        // don't pass the username, password, charset, persistent and driver_options in the DSN
-        unset($dsn['username']);
-        unset($dsn['password']);
-        unset($dsn['options']);
-        unset($dsn['charset']);
-        unset($dsn['persistent']);
-        unset($dsn['driver_options']);
-
-        // use all remaining parts in the DSN
-        foreach ($dsn as $key => $val) {
-            $dsn[$key] = "$key=$val";
-        }
-
-        return $this->_pdoType . ':' . implode(';', $dsn);
-    }
-
-    /**
-     * Creates a PDO object and connects to the database.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _connect()
-    {
-        // if we already have a PDO object, no need to re-connect.
-        if ($this->_connection) {
-            return;
-        }
-
-        // get the dsn first, because some adapters alter the $_pdoType
-        $dsn = $this->_dsn();
-
-        // check for PDO extension
-        if (!extension_loaded('pdo')) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded');
-        }
-
-        // check the PDO driver is available
-        if (!in_array($this->_pdoType, PDO::getAvailableDrivers())) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed');
-        }
-
-        // create PDO connection
-        $q = $this->_profiler->queryStart('connect', Zend_Db_Profiler::CONNECT);
-
-        // add the persistence flag if we find it in our config array
-        if (isset($this->_config['persistent']) && ($this->_config['persistent'] == true)) {
-            $this->_config['driver_options'][PDO::ATTR_PERSISTENT] = true;
-        }
-
-        try {
-            $this->_connection = new PDO(
-                $dsn,
-                $this->_config['username'],
-                $this->_config['password'],
-                $this->_config['driver_options']
-            );
-
-            $this->_profiler->queryEnd($q);
-
-            // set the PDO connection to perform case-folding on array keys, or not
-            $this->_connection->setAttribute(PDO::ATTR_CASE, $this->_caseFolding);
-
-            // always use exceptions.
-            $this->_connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-        } catch (PDOException $e) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return ((bool) ($this->_connection instanceof PDO));
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        $this->_connection = null;
-    }
-
-    /**
-     * Prepares an SQL statement.
-     *
-     * @param string $sql The SQL statement with placeholders.
-     * @param array $bind An array of data to bind to the placeholders.
-     * @return PDOStatement
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        $stmtClass = $this->_defaultStmtClass;
-        if (!class_exists($stmtClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($stmtClass);
-        }
-        $stmt = new $stmtClass($this, $sql);
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * On RDBMS brands that don't support sequences, $tableName and $primaryKey
-     * are ignored.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        $this->_connect();
-        return $this->_connection->lastInsertId();
-    }
-
-    /**
-     * Special handling for PDO query().
-     * All bind parameter names must begin with ':'
-     *
-     * @param string|Zend_Db_Select $sql The SQL statement with placeholders.
-     * @param array $bind An array of data to bind to the placeholders.
-     * @return Zend_Db_Statement_Pdo
-     * @throws Zend_Db_Adapter_Exception To re-throw PDOException.
-     */
-    public function query($sql, $bind = array())
-    {
-        if (empty($bind) && $sql instanceof Zend_Db_Select) {
-            $bind = $sql->getBind();
-        }
-
-        if (is_array($bind)) {
-            foreach ($bind as $name => $value) {
-                if (!is_int($name) && !preg_match('/^:/', $name)) {
-                    $newName = ":$name";
-                    unset($bind[$name]);
-                    $bind[$newName] = $value;
-                }
-            }
-        }
-
-        try {
-            return parent::query($sql, $bind);
-        } catch (PDOException $e) {
-            /**
-             * @see Zend_Db_Statement_Exception
-             */
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Executes an SQL statement and return the number of affected rows
-     *
-     * @param  mixed  $sql  The SQL statement with placeholders.
-     *                      May be a string or Zend_Db_Select.
-     * @return integer      Number of rows that were modified
-     *                      or deleted by the SQL statement
-     */
-    public function exec($sql)
-    {
-        if ($sql instanceof Zend_Db_Select) {
-            $sql = $sql->assemble();
-        }
-
-        try {
-            $affected = $this->getConnection()->exec($sql);
-
-            if ($affected === false) {
-                $errorInfo = $this->getConnection()->errorInfo();
-                /**
-                 * @see Zend_Db_Adapter_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Exception.php';
-                throw new Zend_Db_Adapter_Exception($errorInfo[2]);
-            }
-
-            return $affected;
-        } catch (PDOException $e) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Quote a raw string.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            return $value;
-        }
-        $this->_connect();
-        return $this->_connection->quote($value);
-    }
-
-    /**
-     * Begin a transaction.
-     */
-    protected function _beginTransaction()
-    {
-        $this->_connect();
-        $this->_connection->beginTransaction();
-    }
-
-    /**
-     * Commit a transaction.
-     */
-    protected function _commit()
-    {
-        $this->_connect();
-        $this->_connection->commit();
-    }
-
-    /**
-     * Roll-back a transaction.
-     */
-    protected function _rollBack() {
-        $this->_connect();
-        $this->_connection->rollBack();
-    }
-
-    /**
-     * Set the PDO fetch mode.
-     *
-     * @todo Support FETCH_CLASS and FETCH_INTO.
-     *
-     * @param int $mode A PDO fetch mode.
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        //check for PDO extension
-        if (!extension_loaded('pdo')) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded');
-        }
-        switch ($mode) {
-            case PDO::FETCH_LAZY:
-            case PDO::FETCH_ASSOC:
-            case PDO::FETCH_NUM:
-            case PDO::FETCH_BOTH:
-            case PDO::FETCH_NAMED:
-            case PDO::FETCH_OBJ:
-                $this->_fetchMode = $mode;
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Exception
-                 */
-                require_once 'Zend/Db/Adapter/Exception.php';
-                throw new Zend_Db_Adapter_Exception("Invalid fetch mode '$mode' specified");
-                break;
-        }
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        switch ($type) {
-            case 'positional':
-            case 'named':
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        $this->_connect();
-        try {
-            $version = $this->_connection->getAttribute(PDO::ATTR_SERVER_VERSION);
-        } catch (PDOException $e) {
-            // In case of the driver doesn't support getting attributes
-            return null;
-        }
-        $matches = null;
-        if (preg_match('/((?:[0-9]{1,2}\.){1,3}[0-9]{1,2})/', $version, $matches)) {
-            return $matches[1];
-        } else {
-            return null;
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm.php
deleted file mode 100644
index 92f740d4d..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Db_Adapter_Pdo_Abstract */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-/** @see Zend_Db_Abstract_Pdo_Ibm_Db2 */
-require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php';
-
-/** @see Zend_Db_Abstract_Pdo_Ibm_Ids */
-require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php';
-
-/** @see Zend_Db_Statement_Pdo_Ibm */
-require_once 'Zend/Db/Statement/Pdo/Ibm.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract
-{
-    /**
-     * PDO type.
-     *
-     * @var string
-     */
-    protected $_pdoType = 'ibm';
-
-    /**
-     * The IBM data server connected to
-     *
-     * @var string
-     */
-    protected $_serverType = null;
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-                        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-                        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-                        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-                        'INTEGER'            => Zend_Db::INT_TYPE,
-                        'SMALLINT'           => Zend_Db::INT_TYPE,
-                        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-                        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-                        'DEC'                => Zend_Db::FLOAT_TYPE,
-                        'REAL'               => Zend_Db::FLOAT_TYPE,
-                        'NUMERIC'            => Zend_Db::FLOAT_TYPE,
-                        'DOUBLE PRECISION'   => Zend_Db::FLOAT_TYPE,
-                        'FLOAT'              => Zend_Db::FLOAT_TYPE
-                        );
-
-    /**
-     * Creates a PDO object and connects to the database.
-     *
-     * The IBM data server is set.
-     * Current options are DB2 or IDS
-     * @todo also differentiate between z/OS and i/5
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    public function _connect()
-    {
-        if ($this->_connection) {
-            return;
-        }
-        parent::_connect();
-
-        $this->getConnection()->setAttribute(Zend_Db::ATTR_STRINGIFY_FETCHES, true);
-
-        try {
-            if ($this->_serverType === null) {
-                $server = substr($this->getConnection()->getAttribute(PDO::ATTR_SERVER_INFO), 0, 3);
-
-                switch ($server) {
-                    case 'DB2':
-                        $this->_serverType = new Zend_Db_Adapter_Pdo_Ibm_Db2($this);
-
-                        // Add DB2-specific numeric types
-                        $this->_numericDataTypes['DECFLOAT'] = Zend_Db::FLOAT_TYPE;
-                        $this->_numericDataTypes['DOUBLE']   = Zend_Db::FLOAT_TYPE;
-                        $this->_numericDataTypes['NUM']      = Zend_Db::FLOAT_TYPE;
-
-                        break;
-                    case 'IDS':
-                        $this->_serverType = new Zend_Db_Adapter_Pdo_Ibm_Ids($this);
-
-                        // Add IDS-specific numeric types
-                        $this->_numericDataTypes['SERIAL']       = Zend_Db::INT_TYPE;
-                        $this->_numericDataTypes['SERIAL8']      = Zend_Db::BIGINT_TYPE;
-                        $this->_numericDataTypes['INT8']         = Zend_Db::BIGINT_TYPE;
-                        $this->_numericDataTypes['SMALLFLOAT']   = Zend_Db::FLOAT_TYPE;
-                        $this->_numericDataTypes['MONEY']        = Zend_Db::FLOAT_TYPE;
-
-                        break;
-                    }
-            }
-        } catch (PDOException $e) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            $error = strpos($e->getMessage(), 'driver does not support that attribute');
-            if ($error) {
-                throw new Zend_Db_Adapter_Exception("PDO_IBM driver extension is downlevel.  Please use driver release version 1.2.1 or later", 0, $e);
-            } else {
-                throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-    }
-
-    /**
-     * Creates a PDO DSN for the adapter from $this->_config settings.
-     *
-     * @return string
-     */
-    protected function _dsn()
-    {
-        $this->_checkRequiredOptions($this->_config);
-
-        // check if using full connection string
-        if (array_key_exists('host', $this->_config)) {
-            $dsn = ';DATABASE=' . $this->_config['dbname']
-            . ';HOSTNAME=' . $this->_config['host']
-            . ';PORT='     . $this->_config['port']
-            // PDO_IBM supports only DB2 TCPIP protocol
-            . ';PROTOCOL=' . 'TCPIP;';
-        } else {
-            // catalogued connection
-            $dsn = $this->_config['dbname'];
-        }
-        return $this->_pdoType . ': ' . $dsn;
-    }
-
-    /**
-     * Checks required options
-     *
-     * @param  array $config
-     * @throws Zend_Db_Adapter_Exception
-     * @return void
-     */
-    protected function _checkRequiredOptions(array $config)
-    {
-        parent::_checkRequiredOptions($config);
-
-        if (array_key_exists('host', $this->_config) &&
-        !array_key_exists('port', $config)) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration must have a key for 'port' when 'host' is specified");
-        }
-    }
-
-    /**
-     * Prepares an SQL statement.
-     *
-     * @param string $sql The SQL statement with placeholders.
-     * @param array $bind An array of data to bind to the placeholders.
-     * @return PDOStatement
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        $stmtClass = $this->_defaultStmtClass;
-        $stmt = new $stmtClass($this, $sql);
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $this->_connect();
-        return $this->_serverType->listTables();
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     *
-     * @todo Discover integer unsigned property.
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $this->_connect();
-        return $this->_serverType->describeTable($tableName, $schemaName);
-    }
-
-    /**
-     * Inserts a table row with specified data.
-     * Special handling for PDO_IBM
-     * remove empty slots
-     *
-     * @param mixed $table The table to insert data into.
-     * @param array $bind Column-value pairs.
-     * @return int The number of affected rows.
-     */
-    public function insert($table, array $bind)
-    {
-        $this->_connect();
-        $newbind = array();
-        if (is_array($bind)) {
-            foreach ($bind as $name => $value) {
-                if($value !== null) {
-                    $newbind[$name] = $value;
-                }
-            }
-        }
-
-        return parent::insert($table, $newbind);
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-       $this->_connect();
-       return $this->_serverType->limit($sql, $count, $offset);
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT
-     * column.
-     *
-     * @param string $tableName OPTIONAL
-     * @param string $primaryKey OPTIONAL
-     * @return integer
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        $this->_connect();
-
-         if ($tableName !== null) {
-            $sequenceName = $tableName;
-            if ($primaryKey) {
-                $sequenceName .= "_$primaryKey";
-            }
-            $sequenceName .= '_seq';
-            return $this->lastSequenceId($sequenceName);
-        }
-
-        $id = $this->getConnection()->lastInsertId();
-
-        return $id;
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $this->_connect();
-        return $this->_serverType->lastSequenceId($sequenceName);
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database,
-     * and return it.
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $this->_connect();
-        return $this->_serverType->nextSequenceId($sequenceName);
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     * Pdo_Idm doesn't support getAttribute(PDO::ATTR_SERVER_VERSION)
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        try {
-            $stmt = $this->query('SELECT service_level, fixpack_num FROM TABLE (sysproc.env_get_inst_info()) as INSTANCEINFO');
-            $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-            if (count($result)) {
-                $matches = null;
-                if (preg_match('/((?:[0-9]{1,2}\.){1,3}[0-9]{1,2})/', $result[0][0], $matches)) {
-                    return $matches[1];
-                } else {
-                    return null;
-                }
-            }
-            return null;
-        } catch (PDOException $e) {
-            return null;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php
deleted file mode 100644
index 214b71626..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Db_Adapter_Pdo_Ibm */
-require_once 'Zend/Db/Adapter/Pdo/Ibm.php';
-
-/** @see Zend_Db_Statement_Pdo_Ibm */
-require_once 'Zend/Db/Statement/Pdo/Ibm.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Ibm_Db2
-{
-    /**
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_adapter = null;
-
-    /**
-     * Construct the data server class.
-     *
-     * It will be used to generate non-generic SQL
-     * for a particular data server
-     *
-     * @param Zend_Db_Adapter_Abstract $adapter
-     */
-    public function __construct($adapter)
-    {
-        $this->_adapter = $adapter;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $sql = "SELECT tabname "
-        . "FROM SYSCAT.TABLES ";
-        return $this->_adapter->fetchCol($sql);
-    }
-
-    /**
-     * DB2 catalog lookup for describe table
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $sql = "SELECT DISTINCT c.tabschema, c.tabname, c.colname, c.colno,
-                c.typename, c.default, c.nulls, c.length, c.scale,
-                c.identity, tc.type AS tabconsttype, k.colseq
-                FROM syscat.columns c
-                LEFT JOIN (syscat.keycoluse k JOIN syscat.tabconst tc
-                 ON (k.tabschema = tc.tabschema
-                   AND k.tabname = tc.tabname
-                   AND tc.type = 'P'))
-                 ON (c.tabschema = k.tabschema
-                 AND c.tabname = k.tabname
-                 AND c.colname = k.colname)
-            WHERE "
-            . $this->_adapter->quoteInto('UPPER(c.tabname) = UPPER(?)', $tableName);
-        if ($schemaName) {
-            $sql .= $this->_adapter->quoteInto(' AND UPPER(c.tabschema) = UPPER(?)', $schemaName);
-        }
-        $sql .= " ORDER BY c.colno";
-
-        $desc = array();
-        $stmt = $this->_adapter->query($sql);
-
-        /**
-         * To avoid case issues, fetch using FETCH_NUM
-         */
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        /**
-         * The ordering of columns is defined by the query so we can map
-         * to variables to improve readability
-         */
-        $tabschema      = 0;
-        $tabname        = 1;
-        $colname        = 2;
-        $colno          = 3;
-        $typename       = 4;
-        $default        = 5;
-        $nulls          = 6;
-        $length         = 7;
-        $scale          = 8;
-        $identityCol    = 9;
-        $tabconstype    = 10;
-        $colseq         = 11;
-
-        foreach ($result as $key => $row) {
-            list ($primary, $primaryPosition, $identity) = array(false, null, false);
-            if ($row[$tabconstype] == 'P') {
-                $primary = true;
-                $primaryPosition = $row[$colseq];
-            }
-            /**
-             * In IBM DB2, an column can be IDENTITY
-             * even if it is not part of the PRIMARY KEY.
-             */
-            if ($row[$identityCol] == 'Y') {
-                $identity = true;
-            }
-
-            $desc[$this->_adapter->foldCase($row[$colname])] = array(
-            'SCHEMA_NAME'      => $this->_adapter->foldCase($row[$tabschema]),
-            'TABLE_NAME'       => $this->_adapter->foldCase($row[$tabname]),
-            'COLUMN_NAME'      => $this->_adapter->foldCase($row[$colname]),
-            'COLUMN_POSITION'  => $row[$colno]+1,
-            'DATA_TYPE'        => $row[$typename],
-            'DEFAULT'          => $row[$default],
-            'NULLABLE'         => (bool) ($row[$nulls] == 'Y'),
-            'LENGTH'           => $row[$length],
-            'SCALE'            => $row[$scale],
-            'PRECISION'        => ($row[$typename] == 'DECIMAL' ? $row[$length] : 0),
-            'UNSIGNED'         => false,
-            'PRIMARY'          => $primary,
-            'PRIMARY_POSITION' => $primaryPosition,
-            'IDENTITY'         => $identity
-            );
-        }
-
-        return $desc;
-    }
-
-    /**
-     * Adds a DB2-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @throws Zend_Db_Adapter_Exception
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        } else {
-            $offset = intval($offset);
-            if ($offset < 0) {
-                /** @see Zend_Db_Adapter_Exception */
-                require_once 'Zend/Db/Adapter/Exception.php';
-                throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-            }
-
-            if ($offset == 0 && $count > 0) {
-                $limit_sql = $sql . " FETCH FIRST $count ROWS ONLY";
-                return $limit_sql;
-            }
-            /**
-             * DB2 does not implement the LIMIT clause as some RDBMS do.
-             * We have to simulate it with subqueries and ROWNUM.
-             * Unfortunately because we use the column wildcard "*",
-             * this puts an extra column into the query result set.
-             */
-            $limit_sql = "SELECT z2.*
-              FROM (
-                  SELECT ROW_NUMBER() OVER() AS \"ZEND_DB_ROWNUM\", z1.*
-                  FROM (
-                      " . $sql . "
-                  ) z1
-              ) z2
-              WHERE z2.zend_db_rownum BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
-        }
-        return $limit_sql;
-    }
-
-    /**
-     * DB2-specific last sequence id
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $sql = 'SELECT PREVVAL FOR '.$this->_adapter->quoteIdentifier($sequenceName).' AS VAL FROM SYSIBM.SYSDUMMY1';
-        $value = $this->_adapter->fetchOne($sql);
-        return $value;
-    }
-
-    /**
-     * DB2-specific sequence id value
-     *
-     *  @param string $sequenceName
-     *  @return integer
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $sql = 'SELECT NEXTVAL FOR '.$this->_adapter->quoteIdentifier($sequenceName).' AS VAL FROM SYSIBM.SYSDUMMY1';
-        $value = $this->_adapter->fetchOne($sql);
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php
deleted file mode 100644
index 7c710b45d..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ids.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** @see Zend_Db_Adapter_Pdo_Ibm */
-require_once 'Zend/Db/Adapter/Pdo/Ibm.php';
-
-/** @see Zend_Db_Statement_Pdo_Ibm */
-require_once 'Zend/Db/Statement/Pdo/Ibm.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Ibm_Ids
-{
-    /**
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_adapter = null;
-
-    /**
-     * Construct the data server class.
-     *
-     * It will be used to generate non-generic SQL
-     * for a particular data server
-     *
-     * @param Zend_Db_Adapter_Abstract $adapter
-     */
-    public function __construct($adapter)
-    {
-        $this->_adapter = $adapter;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $sql = "SELECT tabname "
-        . "FROM systables ";
-
-        return $this->_adapter->fetchCol($sql);
-    }
-
-    /**
-     * IDS catalog lookup for describe table
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        // this is still a work in progress
-
-        $sql= "SELECT DISTINCT t.owner, t.tabname, c.colname, c.colno, c.coltype,
-               d.default, c.collength, t.tabid
-               FROM syscolumns c
-               JOIN systables t ON c.tabid = t.tabid
-               LEFT JOIN sysdefaults d ON c.tabid = d.tabid AND c.colno = d.colno
-               WHERE "
-                . $this->_adapter->quoteInto('UPPER(t.tabname) = UPPER(?)', $tableName);
-        if ($schemaName) {
-            $sql .= $this->_adapter->quoteInto(' AND UPPER(t.owner) = UPPER(?)', $schemaName);
-        }
-        $sql .= " ORDER BY c.colno";
-
-        $desc = array();
-        $stmt = $this->_adapter->query($sql);
-
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        /**
-         * The ordering of columns is defined by the query so we can map
-         * to variables to improve readability
-         */
-        $tabschema      = 0;
-        $tabname        = 1;
-        $colname        = 2;
-        $colno          = 3;
-        $typename       = 4;
-        $default        = 5;
-        $length         = 6;
-        $tabid          = 7;
-
-        $primaryCols = null;
-
-        foreach ($result as $key => $row) {
-            $primary = false;
-            $primaryPosition = null;
-
-            if (!$primaryCols) {
-                $primaryCols = $this->_getPrimaryInfo($row[$tabid]);
-            }
-
-            if (array_key_exists($row[$colno], $primaryCols)) {
-                $primary = true;
-                $primaryPosition = $primaryCols[$row[$colno]];
-            }
-
-            $identity = false;
-            if ($row[$typename] == 6 + 256 ||
-                $row[$typename] == 18 + 256) {
-                $identity = true;
-            }
-
-            $desc[$this->_adapter->foldCase($row[$colname])] = array (
-                'SCHEMA_NAME'       => $this->_adapter->foldCase($row[$tabschema]),
-                'TABLE_NAME'        => $this->_adapter->foldCase($row[$tabname]),
-                'COLUMN_NAME'       => $this->_adapter->foldCase($row[$colname]),
-                'COLUMN_POSITION'   => $row[$colno],
-                'DATA_TYPE'         => $this->_getDataType($row[$typename]),
-                'DEFAULT'           => $row[$default],
-                'NULLABLE'          => (bool) !($row[$typename] - 256 >= 0),
-                'LENGTH'            => $row[$length],
-                'SCALE'             => ($row[$typename] == 5 ? $row[$length]&255 : 0),
-                'PRECISION'         => ($row[$typename] == 5 ? (int)($row[$length]/256) : 0),
-                'UNSIGNED'          => false,
-                'PRIMARY'           => $primary,
-                'PRIMARY_POSITION'  => $primaryPosition,
-                'IDENTITY'          => $identity
-            );
-        }
-
-        return $desc;
-    }
-
-    /**
-     * Map number representation of a data type
-     * to a string
-     *
-     * @param int $typeNo
-     * @return string
-     */
-    protected function _getDataType($typeNo)
-    {
-        $typemap = array(
-            0       => "CHAR",
-            1       => "SMALLINT",
-            2       => "INTEGER",
-            3       => "FLOAT",
-            4       => "SMALLFLOAT",
-            5       => "DECIMAL",
-            6       => "SERIAL",
-            7       => "DATE",
-            8       => "MONEY",
-            9       => "NULL",
-            10      => "DATETIME",
-            11      => "BYTE",
-            12      => "TEXT",
-            13      => "VARCHAR",
-            14      => "INTERVAL",
-            15      => "NCHAR",
-            16      => "NVARCHAR",
-            17      => "INT8",
-            18      => "SERIAL8",
-            19      => "SET",
-            20      => "MULTISET",
-            21      => "LIST",
-            22      => "Unnamed ROW",
-            40      => "Variable-length opaque type",
-            4118    => "Named ROW"
-        );
-
-        if ($typeNo - 256 >= 0) {
-            $typeNo = $typeNo - 256;
-        }
-
-        return $typemap[$typeNo];
-    }
-
-    /**
-     * Helper method to retrieve primary key column
-     * and column location
-     *
-     * @param int $tabid
-     * @return array
-     */
-    protected function _getPrimaryInfo($tabid)
-    {
-        $sql = "SELECT i.part1, i.part2, i.part3, i.part4, i.part5, i.part6,
-                i.part7, i.part8, i.part9, i.part10, i.part11, i.part12,
-                i.part13, i.part14, i.part15, i.part16
-                FROM sysindexes i
-                JOIN sysconstraints c ON c.idxname = i.idxname
-                WHERE i.tabid = " . $tabid . " AND c.constrtype = 'P'";
-
-        $stmt = $this->_adapter->query($sql);
-        $results = $stmt->fetchAll();
-
-        $cols = array();
-
-        // this should return only 1 row
-        // unless there is no primary key,
-        // in which case, the empty array is returned
-        if ($results) {
-            $row = $results[0];
-        } else {
-            return $cols;
-        }
-
-        $position = 0;
-        foreach ($row as $key => $colno) {
-            $position++;
-            if ($colno == 0) {
-                return $cols;
-            } else {
-                $cols[$colno] = $position;
-            }
-        }
-    }
-
-    /**
-     * Adds an IDS-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @throws Zend_Db_Adapter_Exception
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        } else if ($count == 0) {
-              $limit_sql = str_ireplace("SELECT", "SELECT * FROM (SELECT", $sql);
-              $limit_sql .= ") WHERE 0 = 1";
-        } else {
-            $offset = intval($offset);
-            if ($offset < 0) {
-                /** @see Zend_Db_Adapter_Exception */
-                require_once 'Zend/Db/Adapter/Exception.php';
-                throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-            }
-            if ($offset == 0) {
-                $limit_sql = str_ireplace("SELECT", "SELECT FIRST $count", $sql);
-            } else {
-                $limit_sql = str_ireplace("SELECT", "SELECT SKIP $offset LIMIT $count", $sql);
-            }
-        }
-        return $limit_sql;
-    }
-
-    /**
-     * IDS-specific last sequence id
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $sql = 'SELECT '.$this->_adapter->quoteIdentifier($sequenceName).'.CURRVAL FROM '
-               .'systables WHERE tabid = 1';
-        $value = $this->_adapter->fetchOne($sql);
-        return $value;
-    }
-
-     /**
-     * IDS-specific sequence id value
-     *
-     *  @param string $sequenceName
-     *  @return integer
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $sql = 'SELECT '.$this->_adapter->quoteIdentifier($sequenceName).'.NEXTVAL FROM '
-               .'systables WHERE tabid = 1';
-        $value = $this->_adapter->fetchOne($sql);
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mssql.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mssql.php
deleted file mode 100644
index 3c3fb7710..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mssql.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mssql.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Pdo_Abstract
- */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-
-/**
- * Class for connecting to Microsoft SQL Server databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract
-{
-    /**
-     * PDO type.
-     *
-     * @var string
-     */
-    protected $_pdoType = 'mssql';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INT'                => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'TINYINT'            => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'FLOAT'              => Zend_Db::FLOAT_TYPE,
-        'MONEY'              => Zend_Db::FLOAT_TYPE,
-        'NUMERIC'            => Zend_Db::FLOAT_TYPE,
-        'REAL'               => Zend_Db::FLOAT_TYPE,
-        'SMALLMONEY'         => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Creates a PDO DSN for the adapter from $this->_config settings.
-     *
-     * @return string
-     */
-    protected function _dsn()
-    {
-        // baseline of DSN parts
-        $dsn = $this->_config;
-
-        // don't pass the username and password in the DSN
-        unset($dsn['username']);
-        unset($dsn['password']);
-        unset($dsn['options']);
-        unset($dsn['persistent']);
-        unset($dsn['driver_options']);
-
-        if (isset($dsn['port'])) {
-            $seperator = ':';
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                $seperator = ',';
-            }
-            $dsn['host'] .= $seperator . $dsn['port'];
-            unset($dsn['port']);
-        }
-
-        // this driver supports multiple DSN prefixes
-        // @see http://www.php.net/manual/en/ref.pdo-dblib.connection.php
-        if (isset($dsn['pdoType'])) {
-            switch (strtolower($dsn['pdoType'])) {
-                case 'freetds':
-                case 'sybase':
-                    $this->_pdoType = 'sybase';
-                    break;
-                case 'mssql':
-                    $this->_pdoType = 'mssql';
-                    break;
-                case 'dblib':
-                default:
-                    $this->_pdoType = 'dblib';
-                    break;
-            }
-            unset($dsn['pdoType']);
-        }
-
-        // use all remaining parts in the DSN
-        foreach ($dsn as $key => $val) {
-            $dsn[$key] = "$key=$val";
-        }
-
-        $dsn = $this->_pdoType . ':' . implode(';', $dsn);
-        return $dsn;
-    }
-
-    /**
-     * @return void
-     */
-    protected function _connect()
-    {
-        if ($this->_connection) {
-            return;
-        }
-        parent::_connect();
-        $this->_connection->exec('SET QUOTED_IDENTIFIER ON');
-    }
-
-    /**
-     * Begin a transaction.
-     *
-     * It is necessary to override the abstract PDO transaction functions here, as
-     * the PDO driver for MSSQL does not support transactions.
-     */
-    protected function _beginTransaction()
-    {
-        $this->_connect();
-        $this->_connection->exec('BEGIN TRANSACTION');
-        return true;
-    }
-
-    /**
-     * Commit a transaction.
-     *
-     * It is necessary to override the abstract PDO transaction functions here, as
-     * the PDO driver for MSSQL does not support transactions.
-     */
-    protected function _commit()
-    {
-        $this->_connect();
-        $this->_connection->exec('COMMIT TRANSACTION');
-        return true;
-    }
-
-    /**
-     * Roll-back a transaction.
-     *
-     * It is necessary to override the abstract PDO transaction functions here, as
-     * the PDO driver for MSSQL does not support transactions.
-     */
-    protected function _rollBack() {
-        $this->_connect();
-        $this->_connection->exec('ROLLBACK TRANSACTION');
-        return true;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name";
-        return $this->fetchCol($sql);
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * PRIMARY_AUTO     => integer; position of auto-generated column in primary key
-     *
-     * @todo Discover column primary key position.
-     * @todo Discover integer unsigned property.
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        if ($schemaName != null) {
-            if (strpos($schemaName, '.') !== false) {
-                $result = explode('.', $schemaName);
-                $schemaName = $result[1];
-            }
-        }
-        /**
-         * Discover metadata information about this table.
-         */
-        $sql = "exec sp_columns @table_name = " . $this->quoteIdentifier($tableName, true);
-        if ($schemaName != null) {
-            $sql .= ", @table_owner = " . $this->quoteIdentifier($schemaName, true);
-        }
-
-        $stmt = $this->query($sql);
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $table_name  = 2;
-        $column_name = 3;
-        $type_name   = 5;
-        $precision   = 6;
-        $length      = 7;
-        $scale       = 8;
-        $nullable    = 10;
-        $column_def  = 12;
-        $column_position = 16;
-
-        /**
-         * Discover primary key column(s) for this table.
-         */
-        $sql = "exec sp_pkeys @table_name = " . $this->quoteIdentifier($tableName, true);
-        if ($schemaName != null) {
-            $sql .= ", @table_owner = " . $this->quoteIdentifier($schemaName, true);
-        }
-
-        $stmt = $this->query($sql);
-        $primaryKeysResult = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-        $primaryKeyColumn = array();
-        $pkey_column_name = 3;
-        $pkey_key_seq = 4;
-        foreach ($primaryKeysResult as $pkeysRow) {
-            $primaryKeyColumn[$pkeysRow[$pkey_column_name]] = $pkeysRow[$pkey_key_seq];
-        }
-
-        $desc = array();
-        $p = 1;
-        foreach ($result as $key => $row) {
-            $identity = false;
-            $words = explode(' ', $row[$type_name], 2);
-            if (isset($words[0])) {
-                $type = $words[0];
-                if (isset($words[1])) {
-                    $identity = (bool) preg_match('/identity/', $words[1]);
-                }
-            }
-
-            $isPrimary = array_key_exists($row[$column_name], $primaryKeyColumn);
-            if ($isPrimary) {
-                $primaryPosition = $primaryKeyColumn[$row[$column_name]];
-            } else {
-                $primaryPosition = null;
-            }
-
-            $desc[$this->foldCase($row[$column_name])] = array(
-                'SCHEMA_NAME'      => null, // @todo
-                'TABLE_NAME'       => $this->foldCase($row[$table_name]),
-                'COLUMN_NAME'      => $this->foldCase($row[$column_name]),
-                'COLUMN_POSITION'  => (int) $row[$column_position],
-                'DATA_TYPE'        => $type,
-                'DEFAULT'          => $row[$column_def],
-                'NULLABLE'         => (bool) $row[$nullable],
-                'LENGTH'           => $row[$length],
-                'SCALE'            => $row[$scale],
-                'PRECISION'        => $row[$precision],
-                'UNSIGNED'         => null, // @todo
-                'PRIMARY'          => $isPrimary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-        return $desc;
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @link http://lists.bestpractical.com/pipermail/rt-devel/2005-June/007339.html
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @throws Zend_Db_Adapter_Exception
-     * @return string
-     */
-     public function limit($sql, $count, $offset = 0)
-     {
-        $count = intval($count);
-        if ($count <= 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        $sql = preg_replace(
-            '/^SELECT\s+(DISTINCT\s)?/i',
-            'SELECT $1TOP ' . ($count+$offset) . ' ',
-            $sql
-            );
-
-        if ($offset > 0) {
-            $orderby = stristr($sql, 'ORDER BY');
-
-            if ($orderby !== false) {
-                $orderParts = explode(',', substr($orderby, 8));
-                $pregReplaceCount = null;
-                $orderbyInverseParts = array();
-                foreach ($orderParts as $orderPart) {
-                    $orderPart = rtrim($orderPart);
-                    $inv = preg_replace('/\s+desc$/i', ' ASC', $orderPart, 1, $pregReplaceCount);
-                    if ($pregReplaceCount) {
-                        $orderbyInverseParts[] = $inv;
-                        continue;
-                    }
-                    $inv = preg_replace('/\s+asc$/i', ' DESC', $orderPart, 1, $pregReplaceCount);
-                    if ($pregReplaceCount) {
-                        $orderbyInverseParts[] = $inv;
-                        continue;
-                    } else {
-                        $orderbyInverseParts[] = $orderPart . ' DESC';
-                    }
-                }
-
-                $orderbyInverse = 'ORDER BY ' . implode(', ', $orderbyInverseParts);
-            }
-
-
-
-
-            $sql = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $sql . ') AS inner_tbl';
-            if ($orderby !== false) {
-                $sql .= ' ' . $orderbyInverse . ' ';
-            }
-            $sql .= ') AS outer_tbl';
-            if ($orderby !== false) {
-                $sql .= ' ' . $orderby;
-            }
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * Microsoft SQL Server does not support sequences, so the arguments to
-     * this method are ignored.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     * @throws Zend_Db_Adapter_Exception
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        $sql = 'SELECT SCOPE_IDENTITY()';
-        return (int)$this->fetchOne($sql);
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     * Pdo_Mssql doesn't support getAttribute(PDO::ATTR_SERVER_VERSION)
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        try {
-            $stmt = $this->query("SELECT SERVERPROPERTY('productversion')");
-            $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-            if (count($result)) {
-                return $result[0][0];
-            }
-            return null;
-        } catch (PDOException $e) {
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mysql.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mysql.php
deleted file mode 100644
index 768b88711..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Mysql.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mysql.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Pdo_Abstract
- */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-
-/**
- * Class for connecting to MySQL databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract
-{
-
-    /**
-     * PDO type.
-     *
-     * @var string
-     */
-    protected $_pdoType = 'mysql';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INT'                => Zend_Db::INT_TYPE,
-        'INTEGER'            => Zend_Db::INT_TYPE,
-        'MEDIUMINT'          => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'TINYINT'            => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'SERIAL'             => Zend_Db::BIGINT_TYPE,
-        'DEC'                => Zend_Db::FLOAT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'DOUBLE'             => Zend_Db::FLOAT_TYPE,
-        'DOUBLE PRECISION'   => Zend_Db::FLOAT_TYPE,
-        'FIXED'              => Zend_Db::FLOAT_TYPE,
-        'FLOAT'              => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Creates a PDO object and connects to the database.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _connect()
-    {
-        if ($this->_connection) {
-            return;
-        }
-
-        if (!empty($this->_config['charset'])) {
-            $initCommand = "SET NAMES '" . $this->_config['charset'] . "'";
-            $this->_config['driver_options'][1002] = $initCommand; // 1002 = PDO::MYSQL_ATTR_INIT_COMMAND
-        }
-
-        parent::_connect();
-    }
-
-    /**
-     * @return string
-     */
-    public function getQuoteIdentifierSymbol()
-    {
-        return "`";
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        return $this->fetchCol('SHOW TABLES');
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        // @todo  use INFORMATION_SCHEMA someday when MySQL's
-        // implementation has reasonably good performance and
-        // the version with this improvement is in wide use.
-
-        if ($schemaName) {
-            $sql = 'DESCRIBE ' . $this->quoteIdentifier("$schemaName.$tableName", true);
-        } else {
-            $sql = 'DESCRIBE ' . $this->quoteIdentifier($tableName, true);
-        }
-        $stmt = $this->query($sql);
-
-        // Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $field   = 0;
-        $type    = 1;
-        $null    = 2;
-        $key     = 3;
-        $default = 4;
-        $extra   = 5;
-
-        $desc = array();
-        $i = 1;
-        $p = 1;
-        foreach ($result as $row) {
-            list($length, $scale, $precision, $unsigned, $primary, $primaryPosition, $identity)
-                = array(null, null, null, null, false, null, false);
-            if (preg_match('/unsigned/', $row[$type])) {
-                $unsigned = true;
-            }
-            if (preg_match('/^((?:var)?char)\((\d+)\)/', $row[$type], $matches)) {
-                $row[$type] = $matches[1];
-                $length = $matches[2];
-            } else if (preg_match('/^decimal\((\d+),(\d+)\)/', $row[$type], $matches)) {
-                $row[$type] = 'decimal';
-                $precision = $matches[1];
-                $scale = $matches[2];
-            } else if (preg_match('/^float\((\d+),(\d+)\)/', $row[$type], $matches)) {
-                $row[$type] = 'float';
-                $precision = $matches[1];
-                $scale = $matches[2];
-            } else if (preg_match('/^((?:big|medium|small|tiny)?int)\((\d+)\)/', $row[$type], $matches)) {
-                $row[$type] = $matches[1];
-                // The optional argument of a MySQL int type is not precision
-                // or length; it is only a hint for display width.
-            }
-            if (strtoupper($row[$key]) == 'PRI') {
-                $primary = true;
-                $primaryPosition = $p;
-                if ($row[$extra] == 'auto_increment') {
-                    $identity = true;
-                } else {
-                    $identity = false;
-                }
-                ++$p;
-            }
-            $desc[$this->foldCase($row[$field])] = array(
-                'SCHEMA_NAME'      => null, // @todo
-                'TABLE_NAME'       => $this->foldCase($tableName),
-                'COLUMN_NAME'      => $this->foldCase($row[$field]),
-                'COLUMN_POSITION'  => $i,
-                'DATA_TYPE'        => $row[$type],
-                'DEFAULT'          => $row[$default],
-                'NULLABLE'         => (bool) ($row[$null] == 'YES'),
-                'LENGTH'           => $length,
-                'SCALE'            => $scale,
-                'PRECISION'        => $precision,
-                'UNSIGNED'         => $unsigned,
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-            ++$i;
-        }
-        return $desc;
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param  string $sql
-     * @param  integer $count
-     * @param  integer $offset OPTIONAL
-     * @throws Zend_Db_Adapter_Exception
-     * @return string
-     */
-     public function limit($sql, $count, $offset = 0)
-     {
-        $count = intval($count);
-        if ($count <= 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        $sql .= " LIMIT $count";
-        if ($offset > 0) {
-            $sql .= " OFFSET $offset";
-        }
-
-        return $sql;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Oci.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Oci.php
deleted file mode 100644
index 195cdd337..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Oci.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Oci.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Pdo_Abstract
- */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-
-/**
- * Class for connecting to Oracle databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract
-{
-
-    /**
-     * PDO type.
-     *
-     * @var string
-     */
-    protected $_pdoType = 'oci';
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Pdo_Oci';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'BINARY_DOUBLE'      => Zend_Db::FLOAT_TYPE,
-        'BINARY_FLOAT'       => Zend_Db::FLOAT_TYPE,
-        'NUMBER'             => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Creates a PDO DSN for the adapter from $this->_config settings.
-     *
-     * @return string
-     */
-    protected function _dsn()
-    {
-        // baseline of DSN parts
-        $dsn = $this->_config;
-
-        if (isset($dsn['host'])) {
-            $tns = 'dbname=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)' .
-                   '(HOST=' . $dsn['host'] . ')';
-
-            if (isset($dsn['port'])) {
-                $tns .= '(PORT=' . $dsn['port'] . ')';
-            } else {
-                $tns .= '(PORT=1521)';
-            }
-
-            $tns .= '))(CONNECT_DATA=(SID=' . $dsn['dbname'] . ')))';
-        } else {
-            $tns = 'dbname=' . $dsn['dbname'];
-        }
-
-        if (isset($dsn['charset'])) {
-            $tns .= ';charset=' . $dsn['charset'];
-        }
-
-        return $this->_pdoType . ':' . $tns;
-    }
-
-    /**
-     * Quote a raw string.
-     * Most PDO drivers have an implementation for the quote() method,
-     * but the Oracle OCI driver must use the same implementation as the
-     * Zend_Db_Adapter_Abstract class.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            return $value;
-        }
-        $value = str_replace("'", "''", $value);
-        return "'" . addcslashes($value, "\000\n\r\\\032") . "'";
-    }
-
-    /**
-     * Quote a table identifier and alias.
-     *
-     * @param string|array|Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An alias for the table.
-     * @return string The quoted identifier and alias.
-     */
-    public function quoteTableAs($ident, $alias = null, $auto = false)
-    {
-        // Oracle doesn't allow the 'AS' keyword between the table identifier/expression and alias.
-        return $this->_quoteIdentifierAs($ident, $alias, $auto, ' ');
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $data = $this->fetchCol('SELECT table_name FROM all_tables');
-        return $data;
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @todo Discover integer unsigned property.
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $version = $this->getServerVersion();
-        if (($version === null) || version_compare($version, '9.0.0', '>=')) {
-            $sql = "SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
-                    TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
-                    TC.DATA_SCALE, TC.DATA_PRECISION, C.CONSTRAINT_TYPE, CC.POSITION
-                FROM ALL_TAB_COLUMNS TC
-                LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C
-                    ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P'))
-                  ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME
-                WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)";
-            $bind[':TBNAME'] = $tableName;
-            if ($schemaName) {
-                $sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
-                $bind[':SCNAME'] = $schemaName;
-            }
-            $sql .= ' ORDER BY TC.COLUMN_ID';
-        } else {
-            $subSql="SELECT AC.OWNER, AC.TABLE_NAME, ACC.COLUMN_NAME, AC.CONSTRAINT_TYPE, ACC.POSITION
-                from ALL_CONSTRAINTS AC, ALL_CONS_COLUMNS ACC
-                  WHERE ACC.CONSTRAINT_NAME = AC.CONSTRAINT_NAME
-                    AND ACC.TABLE_NAME = AC.TABLE_NAME
-                    AND ACC.OWNER = AC.OWNER
-                    AND AC.CONSTRAINT_TYPE = 'P'
-                    AND UPPER(AC.TABLE_NAME) = UPPER(:TBNAME)";
-            $bind[':TBNAME'] = $tableName;
-            if ($schemaName) {
-                $subSql .= ' AND UPPER(ACC.OWNER) = UPPER(:SCNAME)';
-                $bind[':SCNAME'] = $schemaName;
-            }
-            $sql="SELECT TC.TABLE_NAME, TC.OWNER, TC.COLUMN_NAME, TC.DATA_TYPE,
-                    TC.DATA_DEFAULT, TC.NULLABLE, TC.COLUMN_ID, TC.DATA_LENGTH,
-                    TC.DATA_SCALE, TC.DATA_PRECISION, CC.CONSTRAINT_TYPE, CC.POSITION
-                FROM ALL_TAB_COLUMNS TC, ($subSql) CC
-                WHERE UPPER(TC.TABLE_NAME) = UPPER(:TBNAME)
-                  AND TC.OWNER = CC.OWNER(+) AND TC.TABLE_NAME = CC.TABLE_NAME(+) AND TC.COLUMN_NAME = CC.COLUMN_NAME(+)";
-            if ($schemaName) {
-                $sql .= ' AND UPPER(TC.OWNER) = UPPER(:SCNAME)';
-            }
-            $sql .= ' ORDER BY TC.COLUMN_ID';
-        }
-
-        $stmt = $this->query($sql, $bind);
-
-        /**
-         * Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
-         */
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $table_name      = 0;
-        $owner           = 1;
-        $column_name     = 2;
-        $data_type       = 3;
-        $data_default    = 4;
-        $nullable        = 5;
-        $column_id       = 6;
-        $data_length     = 7;
-        $data_scale      = 8;
-        $data_precision  = 9;
-        $constraint_type = 10;
-        $position        = 11;
-
-        $desc = array();
-        foreach ($result as $key => $row) {
-            list ($primary, $primaryPosition, $identity) = array(false, null, false);
-            if ($row[$constraint_type] == 'P') {
-                $primary = true;
-                $primaryPosition = $row[$position];
-                /**
-                 * Oracle does not support auto-increment keys.
-                 */
-                $identity = false;
-            }
-            $desc[$this->foldCase($row[$column_name])] = array(
-                'SCHEMA_NAME'      => $this->foldCase($row[$owner]),
-                'TABLE_NAME'       => $this->foldCase($row[$table_name]),
-                'COLUMN_NAME'      => $this->foldCase($row[$column_name]),
-                'COLUMN_POSITION'  => $row[$column_id],
-                'DATA_TYPE'        => $row[$data_type],
-                'DEFAULT'          => $row[$data_default],
-                'NULLABLE'         => (bool) ($row[$nullable] == 'Y'),
-                'LENGTH'           => $row[$data_length],
-                'SCALE'            => $row[$data_scale],
-                'PRECISION'        => $row[$data_precision],
-                'UNSIGNED'         => null, // @todo
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-        return $desc;
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $value = $this->fetchOne('SELECT '.$this->quoteIdentifier($sequenceName, true).'.CURRVAL FROM dual');
-        return $value;
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database, and return it.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return integer
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $value = $this->fetchOne('SELECT '.$this->quoteIdentifier($sequenceName, true).'.NEXTVAL FROM dual');
-        return $value;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * Oracle does not support IDENTITY columns, so if the sequence is not
-     * specified, this method returns null.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     * @throws Zend_Db_Adapter_Oracle_Exception
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        if ($tableName !== null) {
-            $sequenceName = $tableName;
-            if ($primaryKey) {
-                $sequenceName .= $this->foldCase("_$primaryKey");
-            }
-            $sequenceName .= $this->foldCase('_seq');
-            return $this->lastSequenceId($sequenceName);
-        }
-        // No support for IDENTITY columns; return null
-        return null;
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset
-     * @throws Zend_Db_Adapter_Exception
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        /**
-         * Oracle does not implement the LIMIT clause as some RDBMS do.
-         * We have to simulate it with subqueries and ROWNUM.
-         * Unfortunately because we use the column wildcard "*",
-         * this puts an extra column into the query result set.
-         */
-        $limit_sql = "SELECT z2.*
-            FROM (
-                SELECT z1.*, ROWNUM AS \"zend_db_rownum\"
-                FROM (
-                    " . $sql . "
-                ) z1
-            ) z2
-            WHERE z2.\"zend_db_rownum\" BETWEEN " . ($offset+1) . " AND " . ($offset+$count);
-        return $limit_sql;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Pgsql.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Pgsql.php
deleted file mode 100644
index d4fb17451..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Pgsql.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pgsql.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Pdo_Abstract
- */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-
-/**
- * Class for connecting to PostgreSQL databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract
-{
-
-    /**
-     * PDO type.
-     *
-     * @var string
-     */
-    protected $_pdoType = 'pgsql';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INTEGER'            => Zend_Db::INT_TYPE,
-        'SERIAL'             => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'BIGSERIAL'          => Zend_Db::BIGINT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'DOUBLE PRECISION'   => Zend_Db::FLOAT_TYPE,
-        'NUMERIC'            => Zend_Db::FLOAT_TYPE,
-        'REAL'               => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Creates a PDO object and connects to the database.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _connect()
-    {
-        if ($this->_connection) {
-            return;
-        }
-
-        parent::_connect();
-
-        if (!empty($this->_config['charset'])) {
-            $sql = "SET NAMES '" . $this->_config['charset'] . "'";
-            $this->_connection->exec($sql);
-        }
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        // @todo use a better query with joins instead of subqueries
-        $sql = "SELECT c.relname AS table_name "
-             . "FROM pg_class c, pg_user u "
-             . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
-             . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-             . "AND c.relname !~ '^(pg_|sql_)' "
-             . "UNION "
-             . "SELECT c.relname AS table_name "
-             . "FROM pg_class c "
-             . "WHERE c.relkind = 'r' "
-             . "AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) "
-             . "AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) "
-             . "AND c.relname !~ '^pg_'";
-
-        return $this->fetchCol($sql);
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @todo Discover integer unsigned property.
-     *
-     * @param  string $tableName
-     * @param  string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $sql = "SELECT
-                a.attnum,
-                n.nspname,
-                c.relname,
-                a.attname AS colname,
-                t.typname AS type,
-                a.atttypmod,
-                FORMAT_TYPE(a.atttypid, a.atttypmod) AS complete_type,
-                d.adsrc AS default_value,
-                a.attnotnull AS notnull,
-                a.attlen AS length,
-                co.contype,
-                ARRAY_TO_STRING(co.conkey, ',') AS conkey
-            FROM pg_attribute AS a
-                JOIN pg_class AS c ON a.attrelid = c.oid
-                JOIN pg_namespace AS n ON c.relnamespace = n.oid
-                JOIN pg_type AS t ON a.atttypid = t.oid
-                LEFT OUTER JOIN pg_constraint AS co ON (co.conrelid = c.oid
-                    AND a.attnum = ANY(co.conkey) AND co.contype = 'p')
-                LEFT OUTER JOIN pg_attrdef AS d ON d.adrelid = c.oid AND d.adnum = a.attnum
-            WHERE a.attnum > 0 AND c.relname = ".$this->quote($tableName);
-        if ($schemaName) {
-            $sql .= " AND n.nspname = ".$this->quote($schemaName);
-        }
-        $sql .= ' ORDER BY a.attnum';
-
-        $stmt = $this->query($sql);
-
-        // Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $attnum        = 0;
-        $nspname       = 1;
-        $relname       = 2;
-        $colname       = 3;
-        $type          = 4;
-        $atttypemod    = 5;
-        $complete_type = 6;
-        $default_value = 7;
-        $notnull       = 8;
-        $length        = 9;
-        $contype       = 10;
-        $conkey        = 11;
-
-        $desc = array();
-        foreach ($result as $key => $row) {
-            $defaultValue = $row[$default_value];
-            if ($row[$type] == 'varchar' || $row[$type] == 'bpchar' ) {
-                if (preg_match('/character(?: varying)?(?:\((\d+)\))?/', $row[$complete_type], $matches)) {
-                    if (isset($matches[1])) {
-                        $row[$length] = $matches[1];
-                    } else {
-                        $row[$length] = null; // unlimited
-                    }
-                }
-                if (preg_match("/^'(.*?)'::(?:character varying|bpchar)$/", $defaultValue, $matches)) {
-                    $defaultValue = $matches[1];
-                }
-            }
-            list($primary, $primaryPosition, $identity) = array(false, null, false);
-            if ($row[$contype] == 'p') {
-                $primary = true;
-                $primaryPosition = array_search($row[$attnum], explode(',', $row[$conkey])) + 1;
-                $identity = (bool) (preg_match('/^nextval/', $row[$default_value]));
-            }
-            $desc[$this->foldCase($row[$colname])] = array(
-                'SCHEMA_NAME'      => $this->foldCase($row[$nspname]),
-                'TABLE_NAME'       => $this->foldCase($row[$relname]),
-                'COLUMN_NAME'      => $this->foldCase($row[$colname]),
-                'COLUMN_POSITION'  => $row[$attnum],
-                'DATA_TYPE'        => $row[$type],
-                'DEFAULT'          => $defaultValue,
-                'NULLABLE'         => (bool) ($row[$notnull] != 't'),
-                'LENGTH'           => $row[$length],
-                'SCALE'            => null, // @todo
-                'PRECISION'        => null, // @todo
-                'UNSIGNED'         => null, // @todo
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-        return $desc;
-    }
-
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        $sql .= " LIMIT $count";
-        if ($offset > 0) {
-            $sql .= " OFFSET $offset";
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Return the most recent value from the specified sequence in the database.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function lastSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $value = $this->fetchOne("SELECT CURRVAL(".$this->quote($sequenceName).")");
-        return $value;
-    }
-
-    /**
-     * Generate a new value from the specified sequence in the database, and return it.
-     * This is supported only on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2).  Other RDBMS brands return null.
-     *
-     * @param string $sequenceName
-     * @return string
-     */
-    public function nextSequenceId($sequenceName)
-    {
-        $this->_connect();
-        $value = $this->fetchOne("SELECT NEXTVAL(".$this->quote($sequenceName).")");
-        return $value;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        if ($tableName !== null) {
-            $sequenceName = $tableName;
-            if ($primaryKey) {
-                $sequenceName .= "_$primaryKey";
-            }
-            $sequenceName .= '_seq';
-            return $this->lastSequenceId($sequenceName);
-        }
-        return $this->_connection->lastInsertId($tableName);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Sqlite.php b/airtime_mvc/library/Zend/Db/Adapter/Pdo/Sqlite.php
deleted file mode 100644
index afc26c53e..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Pdo/Sqlite.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqlite.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Pdo_Abstract
- */
-require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
-
-
-/**
- * Class for connecting to SQLite2 and SQLite3 databases and performing common operations.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract
-{
-
-    /**
-     * PDO type
-     *
-     * @var string
-     */
-     protected $_pdoType = 'sqlite';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INTEGER'            => Zend_Db::BIGINT_TYPE,
-        'REAL'               => Zend_Db::FLOAT_TYPE
-    );
-
-    /**
-     * Constructor.
-     *
-     * $config is an array of key/value pairs containing configuration
-     * options.  Note that the SQLite options are different than most of
-     * the other PDO adapters in that no username or password are needed.
-     * Also, an extra config key "sqlite2" specifies compatibility mode.
-     *
-     * dbname    => (string) The name of the database to user (required,
-     *                       use :memory: for memory-based database)
-     *
-     * sqlite2   => (boolean) PDO_SQLITE defaults to SQLite 3.  For compatibility
-     *                        with an older SQLite 2 database, set this to TRUE.
-     *
-     * @param array $config An array of configuration keys.
-     */
-    public function __construct(array $config = array())
-    {
-        if (isset($config['sqlite2']) && $config['sqlite2']) {
-            $this->_pdoType = 'sqlite2';
-        }
-
-        // SQLite uses no username/password.  Stub to satisfy parent::_connect()
-        $this->_config['username'] = null;
-        $this->_config['password'] = null;
-
-        return parent::__construct($config);
-    }
-
-    /**
-     * Check for config options that are mandatory.
-     * Throw exceptions if any are missing.
-     *
-     * @param array $config
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _checkRequiredOptions(array $config)
-    {
-        // we need at least a dbname
-        if (! array_key_exists('dbname', $config)) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance");
-        }
-    }
-
-    /**
-     * DSN builder
-     */
-    protected function _dsn()
-    {
-        return $this->_pdoType .':'. $this->_config['dbname'];
-    }
-
-    /**
-     * Special configuration for SQLite behavior: make sure that result sets
-     * contain keys like 'column' instead of 'table.column'.
-     *
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _connect()
-    {
-        /**
-         * if we already have a PDO object, no need to re-connect.
-         */
-        if ($this->_connection) {
-            return;
-        }
-
-        parent::_connect();
-
-        $retval = $this->_connection->exec('PRAGMA full_column_names=0');
-        if ($retval === false) {
-            $error = $this->_connection->errorInfo();
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception($error[2]);
-        }
-
-        $retval = $this->_connection->exec('PRAGMA short_column_names=1');
-        if ($retval === false) {
-            $error = $this->_connection->errorInfo();
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception($error[2]);
-        }
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $sql = "SELECT name FROM sqlite_master WHERE type='table' "
-             . "UNION ALL SELECT name FROM sqlite_temp_master "
-             . "WHERE type='table' ORDER BY name";
-
-        return $this->fetchCol($sql);
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of database or schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        $sql = 'PRAGMA ';
-
-        if ($schemaName) {
-            $sql .= $this->quoteIdentifier($schemaName) . '.';
-        }
-
-        $sql .= 'table_info('.$this->quoteIdentifier($tableName).')';
-
-        $stmt = $this->query($sql);
-
-        /**
-         * Use FETCH_NUM so we are not dependent on the CASE attribute of the PDO connection
-         */
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $cid        = 0;
-        $name       = 1;
-        $type       = 2;
-        $notnull    = 3;
-        $dflt_value = 4;
-        $pk         = 5;
-
-        $desc = array();
-
-        $p = 1;
-        foreach ($result as $key => $row) {
-            list($length, $scale, $precision, $primary, $primaryPosition, $identity) =
-                array(null, null, null, false, null, false);
-            if (preg_match('/^((?:var)?char)\((\d+)\)/i', $row[$type], $matches)) {
-                $row[$type] = $matches[1];
-                $length = $matches[2];
-            } else if (preg_match('/^decimal\((\d+),(\d+)\)/i', $row[$type], $matches)) {
-                $row[$type] = 'DECIMAL';
-                $precision = $matches[1];
-                $scale = $matches[2];
-            }
-            if ((bool) $row[$pk]) {
-                $primary = true;
-                $primaryPosition = $p;
-                /**
-                 * SQLite INTEGER primary key is always auto-increment.
-                 */
-                $identity = (bool) ($row[$type] == 'INTEGER');
-                ++$p;
-            }
-            $desc[$this->foldCase($row[$name])] = array(
-                'SCHEMA_NAME'      => $this->foldCase($schemaName),
-                'TABLE_NAME'       => $this->foldCase($tableName),
-                'COLUMN_NAME'      => $this->foldCase($row[$name]),
-                'COLUMN_POSITION'  => $row[$cid]+1,
-                'DATA_TYPE'        => $row[$type],
-                'DEFAULT'          => $row[$dflt_value],
-                'NULLABLE'         => ! (bool) $row[$notnull],
-                'LENGTH'           => $length,
-                'SCALE'            => $scale,
-                'PRECISION'        => $precision,
-                'UNSIGNED'         => null, // Sqlite3 does not support unsigned data
-                'PRIMARY'          => $primary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity
-            );
-        }
-        return $desc;
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        $sql .= " LIMIT $count";
-        if ($offset > 0) {
-            $sql .= " OFFSET $offset";
-        }
-
-        return $sql;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv.php b/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv.php
deleted file mode 100644
index 6cccc9f5e..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv.php
+++ /dev/null
@@ -1,668 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqlsrv.php 21197 2010-02-24 16:12:53Z rob $
- */
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Statement_Sqlsrv
- */
-require_once 'Zend/Db/Statement/Sqlsrv.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract
-{
-    /**
-     * User-provided configuration.
-     *
-     * Basic keys are:
-     *
-     * username => (string) Connect to the database as this username.
-     * password => (string) Password associated with the username.
-     * dbname   => The name of the local SQL Server instance
-     *
-     * @var array
-     */
-    protected $_config = array(
-        'dbname'       => null,
-        'username'     => null,
-        'password'     => null,
-    );
-
-    /**
-     * Last insert id from INSERT query
-     *
-     * @var int
-     */
-    protected $_lastInsertId;
-
-    /**
-     * Query used to fetch last insert id
-     *
-     * @var string
-     */
-    protected $_lastInsertSQL = 'SELECT SCOPE_IDENTITY() as Current_Identity';
-
-    /**
-     * Keys are UPPERCASE SQL datatypes or the constants
-     * Zend_Db::INT_TYPE, Zend_Db::BIGINT_TYPE, or Zend_Db::FLOAT_TYPE.
-     *
-     * Values are:
-     * 0 = 32-bit integer
-     * 1 = 64-bit integer
-     * 2 = float or decimal
-     *
-     * @var array Associative array of datatypes to values 0, 1, or 2.
-     */
-    protected $_numericDataTypes = array(
-        Zend_Db::INT_TYPE    => Zend_Db::INT_TYPE,
-        Zend_Db::BIGINT_TYPE => Zend_Db::BIGINT_TYPE,
-        Zend_Db::FLOAT_TYPE  => Zend_Db::FLOAT_TYPE,
-        'INT'                => Zend_Db::INT_TYPE,
-        'SMALLINT'           => Zend_Db::INT_TYPE,
-        'TINYINT'            => Zend_Db::INT_TYPE,
-        'BIGINT'             => Zend_Db::BIGINT_TYPE,
-        'DECIMAL'            => Zend_Db::FLOAT_TYPE,
-        'FLOAT'              => Zend_Db::FLOAT_TYPE,
-        'MONEY'              => Zend_Db::FLOAT_TYPE,
-        'NUMERIC'            => Zend_Db::FLOAT_TYPE,
-        'REAL'               => Zend_Db::FLOAT_TYPE,
-        'SMALLMONEY'         => Zend_Db::FLOAT_TYPE,
-    );
-
-    /**
-     * Default class name for a DB statement.
-     *
-     * @var string
-     */
-    protected $_defaultStmtClass = 'Zend_Db_Statement_Sqlsrv';
-
-    /**
-     * Creates a connection resource.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    protected function _connect()
-    {
-        if (is_resource($this->_connection)) {
-            // connection already exists
-            return;
-        }
-
-        if (!extension_loaded('sqlsrv')) {
-            /**
-             * @see Zend_Db_Adapter_Sqlsrv_Exception
-             */
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception('The Sqlsrv extension is required for this adapter but the extension is not loaded');
-        }
-
-        $serverName = $this->_config['host'];
-        if (isset($this->_config['port'])) {
-            $port        = (integer) $this->_config['port'];
-            $serverName .= ', ' . $port;
-        }
-
-        $connectionInfo = array(
-            'Database' => $this->_config['dbname'],
-        );
-
-        if (isset($this->_config['username']) && isset($this->_config['password']))
-        {
-            $connectionInfo += array(
-                'UID'      => $this->_config['username'],
-                'PWD'      => $this->_config['password'],
-            );
-        }
-        // else - windows authentication
-
-        if (!empty($this->_config['driver_options'])) {
-            foreach ($this->_config['driver_options'] as $option => $value) {
-                // A value may be a constant.
-                if (is_string($value)) {
-                    $constantName = strtoupper($value);
-                    if (defined($constantName)) {
-                        $connectionInfo[$option] = constant($constantName);
-                    } else {
-                        $connectionInfo[$option] = $value;
-                    }
-                }
-            }
-        }
-
-        $this->_connection = sqlsrv_connect($serverName, $connectionInfo);
-
-        if (!$this->_connection) {
-            /**
-             * @see Zend_Db_Adapter_Sqlsrv_Exception
-             */
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors());
-        }
-    }
-
-    /**
-     * Check for config options that are mandatory.
-     * Throw exceptions if any are missing.
-     *
-     * @param array $config
-     * @throws Zend_Db_Adapter_Exception
-     */
-    protected function _checkRequiredOptions(array $config)
-    {
-        // we need at least a dbname
-        if (! array_key_exists('dbname', $config)) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance");
-        }
-
-        if (! array_key_exists('password', $config) && array_key_exists('username', $config)) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials.
-                                                If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config.");
-        }
-
-        if (array_key_exists('password', $config) && !array_key_exists('username', $config)) {
-            /**
-             * @see Zend_Db_Adapter_Exception
-             */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials.
-                                                If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config.");
-        }
-    }
-
-    /**
-     * Set the transaction isoltion level.
-     *
-     * @param integer|null $level A fetch mode from SQLSRV_TXN_*.
-     * @return true
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    public function setTransactionIsolationLevel($level = null)
-    {
-        $this->_connect();
-        $sql = null;
-
-        // Default transaction level in sql server
-        if ($level === null)
-        {
-            $level = SQLSRV_TXN_READ_COMMITTED;
-        }
-
-        switch ($level) {
-            case SQLSRV_TXN_READ_UNCOMMITTED:
-                $sql = "READ UNCOMMITTED";
-                break;
-            case SQLSRV_TXN_READ_COMMITTED:
-                $sql = "READ COMMITTED";
-                break;
-            case SQLSRV_TXN_REPEATABLE_READ:
-                $sql = "REPEATABLE READ";
-                break;
-            case SQLSRV_TXN_SNAPSHOT:
-                $sql = "SNAPSHOT";
-                break;
-            case SQLSRV_TXN_SERIALIZABLE:
-                $sql = "SERIALIZABLE";
-                break;
-            default:
-                require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-                throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid transaction isolation level mode '$level' specified");
-        }
-
-        if (!sqlsrv_query($this->_connection, "SET TRANSACTION ISOLATION LEVEL $sql;")) {
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception("Transaction cannot be changed to '$level'");
-        }
-
-        return true;
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return (is_resource($this->_connection)
-                && (get_resource_type($this->_connection) == 'SQL Server Connection')
-        );
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        if ($this->isConnected()) {
-            sqlsrv_close($this->_connection);
-        }
-        $this->_connection = null;
-    }
-
-    /**
-     * Returns an SQL statement for preparation.
-     *
-     * @param string $sql The SQL statement with placeholders.
-     * @return Zend_Db_Statement_Sqlsrv
-     */
-    public function prepare($sql)
-    {
-        $this->_connect();
-        $stmtClass = $this->_defaultStmtClass;
-
-        if (!class_exists($stmtClass)) {
-            /**
-             * @see Zend_Loader
-             */
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($stmtClass);
-        }
-
-        $stmt = new $stmtClass($this, $sql);
-        $stmt->setFetchMode($this->_fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Quote a raw string.
-     *
-     * @param string $value     Raw string
-     * @return string           Quoted string
-     */
-    protected function _quote($value)
-    {
-        if (is_int($value)) {
-            return $value;
-        } elseif (is_float($value)) {
-            return sprintf('%F', $value);
-        }
-
-        return "'" . str_replace("'", "''", $value) . "'";
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        if ($tableName) {
-            $tableName = $this->quote($tableName);
-            $sql       = 'SELECT IDENT_CURRENT (' . $tableName . ') as Current_Identity';
-            return (string) $this->fetchOne($sql);
-        }
-
-        if ($this->_lastInsertId > 0) {
-            return (string) $this->_lastInsertId;
-        }
-
-        $sql = $this->_lastInsertSQL;
-        return (string) $this->fetchOne($sql);
-    }
-
-    /**
-     * Inserts a table row with specified data.
-     *
-     * @param mixed $table The table to insert data into.
-     * @param array $bind Column-value pairs.
-     * @return int The number of affected rows.
-     */
-    public function insert($table, array $bind)
-    {
-        // extract and quote col names from the array keys
-        $cols = array();
-        $vals = array();
-        foreach ($bind as $col => $val) {
-            $cols[] = $this->quoteIdentifier($col, true);
-            if ($val instanceof Zend_Db_Expr) {
-                $vals[] = $val->__toString();
-                unset($bind[$col]);
-            } else {
-                $vals[] = '?';
-            }
-        }
-
-        // build the statement
-        $sql = "INSERT INTO "
-             . $this->quoteIdentifier($table, true)
-             . ' (' . implode(', ', $cols) . ') '
-             . 'VALUES (' . implode(', ', $vals) . ')'
-             . ' ' . $this->_lastInsertSQL;
-
-        // execute the statement and return the number of affected rows
-        $stmt   = $this->query($sql, array_values($bind));
-        $result = $stmt->rowCount();
-
-        $stmt->nextRowset();
-
-        $this->_lastInsertId = $stmt->fetchColumn();
-
-        return $result;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-        $this->_connect();
-        $sql = "SELECT name FROM sysobjects WHERE type = 'U' ORDER BY name";
-        return $this->fetchCol($sql);
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME      => string; name of schema
-     * TABLE_NAME       => string;
-     * COLUMN_NAME      => string; column name
-     * COLUMN_POSITION  => number; ordinal position of column in table
-     * DATA_TYPE        => string; SQL datatype name of column
-     * DEFAULT          => string; default expression of column, null if none
-     * NULLABLE         => boolean; true if column can have nulls
-     * LENGTH           => number; length of CHAR/VARCHAR
-     * SCALE            => number; scale of NUMERIC/DECIMAL
-     * PRECISION        => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED         => boolean; unsigned property of an integer type
-     * PRIMARY          => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     * IDENTITY         => integer; true if column is auto-generated with unique values
-     *
-     * @todo Discover integer unsigned property.
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        /**
-         * Discover metadata information about this table.
-         */
-        $sql    = "exec sp_columns @table_name = " . $this->quoteIdentifier($tableName, true);
-        $stmt   = $this->query($sql);
-        $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-
-        $owner           = 1;
-        $table_name      = 2;
-        $column_name     = 3;
-        $type_name       = 5;
-        $precision       = 6;
-        $length          = 7;
-        $scale           = 8;
-        $nullable        = 10;
-        $column_def      = 12;
-        $column_position = 16;
-
-        /**
-         * Discover primary key column(s) for this table.
-         */
-        $tableOwner = $result[0][$owner];
-        $sql        = "exec sp_pkeys @table_owner = " . $tableOwner
-                    . ", @table_name = " . $this->quoteIdentifier($tableName, true);
-        $stmt       = $this->query($sql);
-
-        $primaryKeysResult = $stmt->fetchAll(Zend_Db::FETCH_NUM);
-        $primaryKeyColumn  = array();
-
-        // Per http://msdn.microsoft.com/en-us/library/ms189813.aspx,
-        // results from sp_keys stored procedure are:
-        // 0=TABLE_QUALIFIER 1=TABLE_OWNER 2=TABLE_NAME 3=COLUMN_NAME 4=KEY_SEQ 5=PK_NAME
-
-        $pkey_column_name = 3;
-        $pkey_key_seq     = 4;
-        foreach ($primaryKeysResult as $pkeysRow) {
-            $primaryKeyColumn[$pkeysRow[$pkey_column_name]] = $pkeysRow[$pkey_key_seq];
-        }
-
-        $desc = array();
-        $p    = 1;
-        foreach ($result as $key => $row) {
-            $identity = false;
-            $words    = explode(' ', $row[$type_name], 2);
-            if (isset($words[0])) {
-                $type = $words[0];
-                if (isset($words[1])) {
-                    $identity = (bool) preg_match('/identity/', $words[1]);
-                }
-            }
-
-            $isPrimary = array_key_exists($row[$column_name], $primaryKeyColumn);
-            if ($isPrimary) {
-                $primaryPosition = $primaryKeyColumn[$row[$column_name]];
-            } else {
-                $primaryPosition = null;
-            }
-
-            $desc[$this->foldCase($row[$column_name])] = array(
-                'SCHEMA_NAME'      => null, // @todo
-                'TABLE_NAME'       => $this->foldCase($row[$table_name]),
-                'COLUMN_NAME'      => $this->foldCase($row[$column_name]),
-                'COLUMN_POSITION'  => (int) $row[$column_position],
-                'DATA_TYPE'        => $type,
-                'DEFAULT'          => $row[$column_def],
-                'NULLABLE'         => (bool) $row[$nullable],
-                'LENGTH'           => $row[$length],
-                'SCALE'            => $row[$scale],
-                'PRECISION'        => $row[$precision],
-                'UNSIGNED'         => null, // @todo
-                'PRIMARY'          => $isPrimary,
-                'PRIMARY_POSITION' => $primaryPosition,
-                'IDENTITY'         => $identity,
-            );
-        }
-
-        return $desc;
-    }
-
-    /**
-     * Leave autocommit mode and begin a transaction.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    protected function _beginTransaction()
-    {
-        if (!sqlsrv_begin_transaction($this->_connection)) {
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors());
-        }
-    }
-
-    /**
-     * Commit a transaction and return to autocommit mode.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    protected function _commit()
-    {
-        if (!sqlsrv_commit($this->_connection)) {
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors());
-        }
-    }
-
-    /**
-     * Roll back a transaction and return to autocommit mode.
-     *
-     * @return void
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    protected function _rollBack()
-    {
-        if (!sqlsrv_rollback($this->_connection)) {
-            require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-            throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors());
-        }
-    }
-
-    /**
-     * Set the fetch mode.
-     *
-     * @todo Support FETCH_CLASS and FETCH_INTO.
-     *
-     * @param integer $mode A fetch mode.
-     * @return void
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        switch ($mode) {
-            case Zend_Db::FETCH_NUM:   // seq array
-            case Zend_Db::FETCH_ASSOC: // assoc array
-            case Zend_Db::FETCH_BOTH:  // seq+assoc array
-            case Zend_Db::FETCH_OBJ:   // object
-                $this->_fetchMode = $mode;
-                break;
-            case Zend_Db::FETCH_BOUND: // bound to PHP variable
-                require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-                throw new Zend_Db_Adapter_Sqlsrv_Exception('FETCH_BOUND is not supported yet');
-                break;
-            default:
-                require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php';
-                throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid fetch mode '$mode' specified");
-                break;
-        }
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param string $sql
-     * @param integer $count
-     * @param integer $offset OPTIONAL
-     * @return string
-     * @throws Zend_Db_Adapter_Sqlsrv_Exception
-     */
-     public function limit($sql, $count, $offset = 0)
-     {
-        $count = intval($count);
-        if ($count <= 0) {
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid");
-        }
-
-        $offset = intval($offset);
-        if ($offset < 0) {
-            /** @see Zend_Db_Adapter_Exception */
-            require_once 'Zend/Db/Adapter/Exception.php';
-            throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid");
-        }
-
-        if ($offset == 0) {
-            $sql = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . $count . ' ', $sql);
-        } else {
-            $orderby = stristr($sql, 'ORDER BY');
-            if ($orderby !== false) {
-                $sort  = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc';
-                $order = str_ireplace('ORDER BY', '', $orderby);
-                $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order));
-            }
-    
-            $sql = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($count+$offset) . ' ', $sql);
-    
-            $sql = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $sql . ') AS inner_tbl';
-            if ($orderby !== false) {
-                $innerOrder = preg_replace('/\".*\".\"(.*)\"/i', '"inner_tbl"."$1"', $order);
-                $sql .= ' ORDER BY ' . $innerOrder . ' ';
-                $sql .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC';
-            }
-            $sql .= ') AS outer_tbl';
-            if ($orderby !== false) {
-                $outerOrder = preg_replace('/\".*\".\"(.*)\"/i', '"outer_tbl"."$1"', $order);
-                $sql .= ' ORDER BY ' . $outerOrder . ' ' . $sort;
-            }
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        if ($type == 'positional') {
-            return true;
-        }
-
-        // if its 'named' or anything else
-        return false;
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        $this->_connect();
-        $version = sqlsrv_client_info($this->_connection);
-
-        if ($version !== false) {
-            return $version['DriverVer'];
-        }
-
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv/Exception.php b/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv/Exception.php
deleted file mode 100644
index 75fd14267..000000000
--- a/airtime_mvc/library/Zend/Db/Adapter/Sqlsrv/Exception.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20629 2010-01-25 21:17:23Z ralph $
- */
-
-/**
- * @see Zend_Db_Adapter_Exception
- */
-require_once 'Zend/Db/Adapter/Exception.php';
-
-/**
- * Zend_Db_Adapter_Sqlsrv_Exception
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Adapter_Sqlsrv_Exception extends Zend_Db_Adapter_Exception
-{
-    /**
-     * Constructor
-     *
-     * If $message is an array, the assumption is that the return value of
-     * sqlsrv_errors() was provided. If so, it then retrieves the most recent
-     * error from that stack, and sets the message and code based on it.
-     *
-     * @param null|array|string $message
-     * @param null|int $code
-     */
-    public function __construct($message = null, $code = 0)
-    {
-       if (is_array($message)) {
-            // Error should be array of errors
-            // We only need first one (?)
-            if (isset($message[0])) {
-                $message = $message[0];
-            }
-
-            $code    = (int)    $message['code'];
-            $message = (string) $message['message'];
-       }
-       parent::__construct($message, $code, new Exception($message, $code));
-   }
-}
diff --git a/airtime_mvc/library/Zend/Db/Exception.php b/airtime_mvc/library/Zend/Db/Exception.php
deleted file mode 100644
index 2d1987c6e..000000000
--- a/airtime_mvc/library/Zend/Db/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Db/Expr.php b/airtime_mvc/library/Zend/Db/Expr.php
deleted file mode 100644
index df366b3b2..000000000
--- a/airtime_mvc/library/Zend/Db/Expr.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Expr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Class for SQL SELECT fragments.
- *
- * This class simply holds a string, so that fragments of SQL statements can be
- * distinguished from identifiers and values that should be implicitly quoted
- * when interpolated into SQL statements.
- *
- * For example, when specifying a primary key value when inserting into a new
- * row, some RDBMS brands may require you to use an expression to generate the
- * new value of a sequence.  If this expression is treated as an identifier,
- * it will be quoted and the expression will not be evaluated.  Another example
- * is that you can use Zend_Db_Expr in the Zend_Db_Select::order() method to
- * order by an expression instead of simply a column name.
- *
- * The way this works is that in each context in which a column name can be
- * specified to methods of Zend_Db classes, if the value is an instance of
- * Zend_Db_Expr instead of a plain string, then the expression is not quoted.
- * If it is a plain string, it is assumed to be a plain column name.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Expr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Expr
-{
-    /**
-     * Storage for the SQL expression.
-     *
-     * @var string
-     */
-    protected $_expression;
-
-    /**
-     * Instantiate an expression, which is just a string stored as
-     * an instance member variable.
-     *
-     * @param string $expression The string containing a SQL expression.
-     */
-    public function __construct($expression)
-    {
-        $this->_expression = (string) $expression;
-    }
-
-    /**
-     * @return string The string of the SQL expression stored in this object.
-     */
-    public function __toString()
-    {
-        return $this->_expression;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Profiler.php b/airtime_mvc/library/Zend/Db/Profiler.php
deleted file mode 100644
index 007fa7888..000000000
--- a/airtime_mvc/library/Zend/Db/Profiler.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Profiler.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Profiler
-{
-
-    /**
-     * A connection operation or selecting a database.
-     */
-    const CONNECT = 1;
-
-    /**
-     * Any general database query that does not fit into the other constants.
-     */
-    const QUERY = 2;
-
-    /**
-     * Adding new data to the database, such as SQL's INSERT.
-     */
-    const INSERT = 4;
-
-    /**
-     * Updating existing information in the database, such as SQL's UPDATE.
-     *
-     */
-    const UPDATE = 8;
-
-    /**
-     * An operation related to deleting data in the database,
-     * such as SQL's DELETE.
-     */
-    const DELETE = 16;
-
-    /**
-     * Retrieving information from the database, such as SQL's SELECT.
-     */
-    const SELECT = 32;
-
-    /**
-     * Transactional operation, such as start transaction, commit, or rollback.
-     */
-    const TRANSACTION = 64;
-
-    /**
-     * Inform that a query is stored (in case of filtering)
-     */
-    const STORED = 'stored';
-
-    /**
-     * Inform that a query is ignored (in case of filtering)
-     */
-    const IGNORED = 'ignored';
-
-    /**
-     * Array of Zend_Db_Profiler_Query objects.
-     *
-     * @var array
-     */
-    protected $_queryProfiles = array();
-
-    /**
-     * Stores enabled state of the profiler.  If set to False, calls to
-     * queryStart() will simply be ignored.
-     *
-     * @var boolean
-     */
-    protected $_enabled = false;
-
-    /**
-     * Stores the number of seconds to filter.  NULL if filtering by time is
-     * disabled.  If an integer is stored here, profiles whose elapsed time
-     * is less than this value in seconds will be unset from
-     * the self::$_queryProfiles array.
-     *
-     * @var integer
-     */
-    protected $_filterElapsedSecs = null;
-
-    /**
-     * Logical OR of any of the filter constants.  NULL if filtering by query
-     * type is disable.  If an integer is stored here, it is the logical OR of
-     * any of the query type constants.  When the query ends, if it is not
-     * one of the types specified, it will be unset from the
-     * self::$_queryProfiles array.
-     *
-     * @var integer
-     */
-    protected $_filterTypes = null;
-
-    /**
-     * Class constructor.  The profiler is disabled by default unless it is
-     * specifically enabled by passing in $enabled here or calling setEnabled().
-     *
-     * @param  boolean $enabled
-     * @return void
-     */
-    public function __construct($enabled = false)
-    {
-        $this->setEnabled($enabled);
-    }
-
-    /**
-     * Enable or disable the profiler.  If $enable is false, the profiler
-     * is disabled and will not log any queries sent to it.
-     *
-     * @param  boolean $enable
-     * @return Zend_Db_Profiler Provides a fluent interface
-     */
-    public function setEnabled($enable)
-    {
-        $this->_enabled = (boolean) $enable;
-
-        return $this;
-    }
-
-    /**
-     * Get the current state of enable.  If True is returned,
-     * the profiler is enabled.
-     *
-     * @return boolean
-     */
-    public function getEnabled()
-    {
-        return $this->_enabled;
-    }
-
-    /**
-     * Sets a minimum number of seconds for saving query profiles.  If this
-     * is set, only those queries whose elapsed time is equal or greater than
-     * $minimumSeconds will be saved.  To save all queries regardless of
-     * elapsed time, set $minimumSeconds to null.
-     *
-     * @param  integer $minimumSeconds OPTIONAL
-     * @return Zend_Db_Profiler Provides a fluent interface
-     */
-    public function setFilterElapsedSecs($minimumSeconds = null)
-    {
-        if (null === $minimumSeconds) {
-            $this->_filterElapsedSecs = null;
-        } else {
-            $this->_filterElapsedSecs = (integer) $minimumSeconds;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the minimum number of seconds for saving query profiles, or null if
-     * query profiles are saved regardless of elapsed time.
-     *
-     * @return integer|null
-     */
-    public function getFilterElapsedSecs()
-    {
-        return $this->_filterElapsedSecs;
-    }
-
-    /**
-     * Sets the types of query profiles to save.  Set $queryType to one of
-     * the Zend_Db_Profiler::* constants to only save profiles for that type of
-     * query.  To save more than one type, logical OR them together.  To
-     * save all queries regardless of type, set $queryType to null.
-     *
-     * @param  integer $queryTypes OPTIONAL
-     * @return Zend_Db_Profiler Provides a fluent interface
-     */
-    public function setFilterQueryType($queryTypes = null)
-    {
-        $this->_filterTypes = $queryTypes;
-
-        return $this;
-    }
-
-    /**
-     * Returns the types of query profiles saved, or null if queries are saved regardless
-     * of their types.
-     *
-     * @return integer|null
-     * @see    Zend_Db_Profiler::setFilterQueryType()
-     */
-    public function getFilterQueryType()
-    {
-        return $this->_filterTypes;
-    }
-
-    /**
-     * Clears the history of any past query profiles.  This is relentless
-     * and will even clear queries that were started and may not have
-     * been marked as ended.
-     *
-     * @return Zend_Db_Profiler Provides a fluent interface
-     */
-    public function clear()
-    {
-        $this->_queryProfiles = array();
-
-        return $this;
-    }
-
-    /**
-     * @param  integer $queryId
-     * @return integer or null
-     */
-    public function queryClone(Zend_Db_Profiler_Query $query)
-    {
-        $this->_queryProfiles[] = clone $query;
-
-        end($this->_queryProfiles);
-
-        return key($this->_queryProfiles);
-    }
-
-    /**
-     * Starts a query.  Creates a new query profile object (Zend_Db_Profiler_Query)
-     * and returns the "query profiler handle".  Run the query, then call
-     * queryEnd() and pass it this handle to make the query as ended and
-     * record the time.  If the profiler is not enabled, this takes no
-     * action and immediately returns null.
-     *
-     * @param  string  $queryText   SQL statement
-     * @param  integer $queryType   OPTIONAL Type of query, one of the Zend_Db_Profiler::* constants
-     * @return integer|null
-     */
-    public function queryStart($queryText, $queryType = null)
-    {
-        if (!$this->_enabled) {
-            return null;
-        }
-
-        // make sure we have a query type
-        if (null === $queryType) {
-            switch (strtolower(substr(ltrim($queryText), 0, 6))) {
-                case 'insert':
-                    $queryType = self::INSERT;
-                    break;
-                case 'update':
-                    $queryType = self::UPDATE;
-                    break;
-                case 'delete':
-                    $queryType = self::DELETE;
-                    break;
-                case 'select':
-                    $queryType = self::SELECT;
-                    break;
-                default:
-                    $queryType = self::QUERY;
-                    break;
-            }
-        }
-
-        /**
-         * @see Zend_Db_Profiler_Query
-         */
-        require_once 'Zend/Db/Profiler/Query.php';
-        $this->_queryProfiles[] = new Zend_Db_Profiler_Query($queryText, $queryType);
-
-        end($this->_queryProfiles);
-
-        return key($this->_queryProfiles);
-    }
-
-    /**
-     * Ends a query.  Pass it the handle that was returned by queryStart().
-     * This will mark the query as ended and save the time.
-     *
-     * @param  integer $queryId
-     * @throws Zend_Db_Profiler_Exception
-     * @return void
-     */
-    public function queryEnd($queryId)
-    {
-        // Don't do anything if the Zend_Db_Profiler is not enabled.
-        if (!$this->_enabled) {
-            return self::IGNORED;
-        }
-
-        // Check for a valid query handle.
-        if (!isset($this->_queryProfiles[$queryId])) {
-            /**
-             * @see Zend_Db_Profiler_Exception
-             */
-            require_once 'Zend/Db/Profiler/Exception.php';
-            throw new Zend_Db_Profiler_Exception("Profiler has no query with handle '$queryId'.");
-        }
-
-        $qp = $this->_queryProfiles[$queryId];
-
-        // Ensure that the query profile has not already ended
-        if ($qp->hasEnded()) {
-            /**
-             * @see Zend_Db_Profiler_Exception
-             */
-            require_once 'Zend/Db/Profiler/Exception.php';
-            throw new Zend_Db_Profiler_Exception("Query with profiler handle '$queryId' has already ended.");
-        }
-
-        // End the query profile so that the elapsed time can be calculated.
-        $qp->end();
-
-        /**
-         * If filtering by elapsed time is enabled, only keep the profile if
-         * it ran for the minimum time.
-         */
-        if (null !== $this->_filterElapsedSecs && $qp->getElapsedSecs() < $this->_filterElapsedSecs) {
-            unset($this->_queryProfiles[$queryId]);
-            return self::IGNORED;
-        }
-
-        /**
-         * If filtering by query type is enabled, only keep the query if
-         * it was one of the allowed types.
-         */
-        if (null !== $this->_filterTypes && !($qp->getQueryType() & $this->_filterTypes)) {
-            unset($this->_queryProfiles[$queryId]);
-            return self::IGNORED;
-        }
-
-        return self::STORED;
-    }
-
-    /**
-     * Get a profile for a query.  Pass it the same handle that was returned
-     * by queryStart() and it will return a Zend_Db_Profiler_Query object.
-     *
-     * @param  integer $queryId
-     * @throws Zend_Db_Profiler_Exception
-     * @return Zend_Db_Profiler_Query
-     */
-    public function getQueryProfile($queryId)
-    {
-        if (!array_key_exists($queryId, $this->_queryProfiles)) {
-            /**
-             * @see Zend_Db_Profiler_Exception
-             */
-            require_once 'Zend/Db/Profiler/Exception.php';
-            throw new Zend_Db_Profiler_Exception("Query handle '$queryId' not found in profiler log.");
-        }
-
-        return $this->_queryProfiles[$queryId];
-    }
-
-    /**
-     * Get an array of query profiles (Zend_Db_Profiler_Query objects).  If $queryType
-     * is set to one of the Zend_Db_Profiler::* constants then only queries of that
-     * type will be returned.  Normally, queries that have not yet ended will
-     * not be returned unless $showUnfinished is set to True.  If no
-     * queries were found, False is returned. The returned array is indexed by the query
-     * profile handles.
-     *
-     * @param  integer $queryType
-     * @param  boolean $showUnfinished
-     * @return array|false
-     */
-    public function getQueryProfiles($queryType = null, $showUnfinished = false)
-    {
-        $queryProfiles = array();
-        foreach ($this->_queryProfiles as $key => $qp) {
-            if ($queryType === null) {
-                $condition = true;
-            } else {
-                $condition = ($qp->getQueryType() & $queryType);
-            }
-
-            if (($qp->hasEnded() || $showUnfinished) && $condition) {
-                $queryProfiles[$key] = $qp;
-            }
-        }
-
-        if (empty($queryProfiles)) {
-            $queryProfiles = false;
-        }
-
-        return $queryProfiles;
-    }
-
-    /**
-     * Get the total elapsed time (in seconds) of all of the profiled queries.
-     * Only queries that have ended will be counted.  If $queryType is set to
-     * one or more of the Zend_Db_Profiler::* constants, the elapsed time will be calculated
-     * only for queries of the given type(s).
-     *
-     * @param  integer $queryType OPTIONAL
-     * @return float
-     */
-    public function getTotalElapsedSecs($queryType = null)
-    {
-        $elapsedSecs = 0;
-        foreach ($this->_queryProfiles as $key => $qp) {
-            if (null === $queryType) {
-                $condition = true;
-            } else {
-                $condition = ($qp->getQueryType() & $queryType);
-            }
-            if (($qp->hasEnded()) && $condition) {
-                $elapsedSecs += $qp->getElapsedSecs();
-            }
-        }
-        return $elapsedSecs;
-    }
-
-    /**
-     * Get the total number of queries that have been profiled.  Only queries that have ended will
-     * be counted.  If $queryType is set to one of the Zend_Db_Profiler::* constants, only queries of
-     * that type will be counted.
-     *
-     * @param  integer $queryType OPTIONAL
-     * @return integer
-     */
-    public function getTotalNumQueries($queryType = null)
-    {
-        if (null === $queryType) {
-            return count($this->_queryProfiles);
-        }
-
-        $numQueries = 0;
-        foreach ($this->_queryProfiles as $qp) {
-            if ($qp->hasEnded() && ($qp->getQueryType() & $queryType)) {
-                $numQueries++;
-            }
-        }
-
-        return $numQueries;
-    }
-
-    /**
-     * Get the Zend_Db_Profiler_Query object for the last query that was run, regardless if it has
-     * ended or not.  If the query has not ended, its end time will be null.  If no queries have
-     * been profiled, false is returned.
-     *
-     * @return Zend_Db_Profiler_Query|false
-     */
-    public function getLastQueryProfile()
-    {
-        if (empty($this->_queryProfiles)) {
-            return false;
-        }
-
-        end($this->_queryProfiles);
-
-        return current($this->_queryProfiles);
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Profiler/Exception.php b/airtime_mvc/library/Zend/Db/Profiler/Exception.php
deleted file mode 100644
index 9af123246..000000000
--- a/airtime_mvc/library/Zend/Db/Profiler/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Exception
- */
-require_once 'Zend/Db/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Profiler_Exception extends Zend_Db_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Profiler/Firebug.php b/airtime_mvc/library/Zend/Db/Profiler/Firebug.php
deleted file mode 100644
index 6be53add0..000000000
--- a/airtime_mvc/library/Zend/Db/Profiler/Firebug.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Db_Profiler */
-require_once 'Zend/Db/Profiler.php';
-
-/** Zend_Wildfire_Plugin_FirePhp */
-require_once 'Zend/Wildfire/Plugin/FirePhp.php';
-
-/** Zend_Wildfire_Plugin_FirePhp_TableMessage */
-require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php';
-
-/**
- * Writes DB events as log messages to the Firebug Console via FirePHP.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Profiler_Firebug extends Zend_Db_Profiler
-{
-    /**
-     * The original label for this profiler.
-     * @var string
-     */
-    protected $_label = null;
-
-    /**
-     * The label template for this profiler
-     * @var string
-     */
-    protected $_label_template = '%label% (%totalCount% @ %totalDuration% sec)';
-
-    /**
-     * The message envelope holding the profiling summary
-     * @var Zend_Wildfire_Plugin_FirePhp_TableMessage
-     */
-    protected $_message = null;
-
-    /**
-     * The total time taken for all profiled queries.
-     * @var float
-     */
-    protected $_totalElapsedTime = 0;
-
-    /**
-     * Constructor
-     *
-     * @param string $label OPTIONAL Label for the profiling info.
-     * @return void
-     */
-    public function __construct($label = null)
-    {
-        $this->_label = $label;
-        if(!$this->_label) {
-            $this->_label = 'Zend_Db_Profiler_Firebug';
-        }
-    }
-
-    /**
-     * Enable or disable the profiler.  If $enable is false, the profiler
-     * is disabled and will not log any queries sent to it.
-     *
-     * @param  boolean $enable
-     * @return Zend_Db_Profiler Provides a fluent interface
-     */
-    public function setEnabled($enable)
-    {
-        parent::setEnabled($enable);
-
-        if ($this->getEnabled()) {
-
-            if (!$this->_message) {
-                $this->_message = new Zend_Wildfire_Plugin_FirePhp_TableMessage($this->_label);
-                $this->_message->setBuffered(true);
-                $this->_message->setHeader(array('Time','Event','Parameters'));
-                $this->_message->setDestroy(true);
-                $this->_message->setOption('includeLineNumbers', false);
-                Zend_Wildfire_Plugin_FirePhp::getInstance()->send($this->_message);
-            }
-
-        } else {
-
-            if ($this->_message) {
-                $this->_message->setDestroy(true);
-                $this->_message = null;
-            }
-
-        }
-
-        return $this;
-    }
-
-    /**
-     * Intercept the query end and log the profiling data.
-     *
-     * @param  integer $queryId
-     * @throws Zend_Db_Profiler_Exception
-     * @return void
-     */
-    public function queryEnd($queryId)
-    {
-        $state = parent::queryEnd($queryId);
-
-        if (!$this->getEnabled() || $state == self::IGNORED) {
-            return;
-        }
-
-        $this->_message->setDestroy(false);
-
-        $profile = $this->getQueryProfile($queryId);
-
-        $this->_totalElapsedTime += $profile->getElapsedSecs();
-
-        $this->_message->addRow(array((string)round($profile->getElapsedSecs(),5),
-                                      $profile->getQuery(),
-                                      ($params=$profile->getQueryParams())?$params:null));
-
-        $this->updateMessageLabel();
-    }
-
-    /**
-     * Update the label of the message holding the profile info.
-     *
-     * @return void
-     */
-    protected function updateMessageLabel()
-    {
-        if (!$this->_message) {
-            return;
-        }
-        $this->_message->setLabel(str_replace(array('%label%',
-                                                    '%totalCount%',
-                                                    '%totalDuration%'),
-                                              array($this->_label,
-                                                    $this->getTotalNumQueries(),
-                                                    (string)round($this->_totalElapsedTime,5)),
-                                              $this->_label_template));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Profiler/Query.php b/airtime_mvc/library/Zend/Db/Profiler/Query.php
deleted file mode 100644
index aacc16fbb..000000000
--- a/airtime_mvc/library/Zend/Db/Profiler/Query.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Profiler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Profiler_Query
-{
-
-    /**
-     * SQL query string or user comment, set by $query argument in constructor.
-     *
-     * @var string
-     */
-    protected $_query = '';
-
-    /**
-     * One of the Zend_Db_Profiler constants for query type, set by $queryType argument in constructor.
-     *
-     * @var integer
-     */
-    protected $_queryType = 0;
-
-    /**
-     * Unix timestamp with microseconds when instantiated.
-     *
-     * @var float
-     */
-    protected $_startedMicrotime = null;
-
-    /**
-     * Unix timestamp with microseconds when self::queryEnd() was called.
-     *
-     * @var integer
-     */
-    protected $_endedMicrotime = null;
-
-    /**
-     * @var array
-     */
-    protected $_boundParams = array();
-
-    /**
-     * @var array
-     */
-
-    /**
-     * Class constructor.  A query is about to be started, save the query text ($query) and its
-     * type (one of the Zend_Db_Profiler::* constants).
-     *
-     * @param  string  $query
-     * @param  integer $queryType
-     * @return void
-     */
-    public function __construct($query, $queryType)
-    {
-        $this->_query = $query;
-        $this->_queryType = $queryType;
-        // by default, and for backward-compatibility, start the click ticking
-        $this->start();
-    }
-
-    /**
-     * Clone handler for the query object.
-     * @return void
-     */
-    public function __clone()
-    {
-        $this->_boundParams = array();
-        $this->_endedMicrotime = null;
-        $this->start();
-    }
-
-    /**
-     * Starts the elapsed time click ticking.
-     * This can be called subsequent to object creation,
-     * to restart the clock.  For instance, this is useful
-     * right before executing a prepared query.
-     *
-     * @return void
-     */
-    public function start()
-    {
-        $this->_startedMicrotime = microtime(true);
-    }
-
-    /**
-     * Ends the query and records the time so that the elapsed time can be determined later.
-     *
-     * @return void
-     */
-    public function end()
-    {
-        $this->_endedMicrotime = microtime(true);
-    }
-
-    /**
-     * Returns true if and only if the query has ended.
-     *
-     * @return boolean
-     */
-    public function hasEnded()
-    {
-        return $this->_endedMicrotime !== null;
-    }
-
-    /**
-     * Get the original SQL text of the query.
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Get the type of this query (one of the Zend_Db_Profiler::* constants)
-     *
-     * @return integer
-     */
-    public function getQueryType()
-    {
-        return $this->_queryType;
-    }
-
-    /**
-     * @param string $param
-     * @param mixed $variable
-     * @return void
-     */
-    public function bindParam($param, $variable)
-    {
-        $this->_boundParams[$param] = $variable;
-    }
-
-    /**
-     * @param array $param
-     * @return void
-     */
-    public function bindParams(array $params)
-    {
-        if (array_key_exists(0, $params)) {
-            array_unshift($params, null);
-            unset($params[0]);
-        }
-        foreach ($params as $param => $value) {
-            $this->bindParam($param, $value);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getQueryParams()
-    {
-        return $this->_boundParams;
-    }
-
-    /**
-     * Get the elapsed time (in seconds) that the query ran.
-     * If the query has not yet ended, false is returned.
-     *
-     * @return float|false
-     */
-    public function getElapsedSecs()
-    {
-        if (null === $this->_endedMicrotime) {
-            return false;
-        }
-
-        return $this->_endedMicrotime - $this->_startedMicrotime;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Select.php b/airtime_mvc/library/Zend/Db/Select.php
deleted file mode 100644
index 4ef6536ba..000000000
--- a/airtime_mvc/library/Zend/Db/Select.php
+++ /dev/null
@@ -1,1351 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Expr
- */
-require_once 'Zend/Db/Expr.php';
-
-
-/**
- * Class for SQL SELECT generation and results.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Select
-{
-
-    const DISTINCT       = 'distinct';
-    const COLUMNS        = 'columns';
-    const FROM           = 'from';
-    const UNION          = 'union';
-    const WHERE          = 'where';
-    const GROUP          = 'group';
-    const HAVING         = 'having';
-    const ORDER          = 'order';
-    const LIMIT_COUNT    = 'limitcount';
-    const LIMIT_OFFSET   = 'limitoffset';
-    const FOR_UPDATE     = 'forupdate';
-
-    const INNER_JOIN     = 'inner join';
-    const LEFT_JOIN      = 'left join';
-    const RIGHT_JOIN     = 'right join';
-    const FULL_JOIN      = 'full join';
-    const CROSS_JOIN     = 'cross join';
-    const NATURAL_JOIN   = 'natural join';
-
-    const SQL_WILDCARD   = '*';
-    const SQL_SELECT     = 'SELECT';
-    const SQL_UNION      = 'UNION';
-    const SQL_UNION_ALL  = 'UNION ALL';
-    const SQL_FROM       = 'FROM';
-    const SQL_WHERE      = 'WHERE';
-    const SQL_DISTINCT   = 'DISTINCT';
-    const SQL_GROUP_BY   = 'GROUP BY';
-    const SQL_ORDER_BY   = 'ORDER BY';
-    const SQL_HAVING     = 'HAVING';
-    const SQL_FOR_UPDATE = 'FOR UPDATE';
-    const SQL_AND        = 'AND';
-    const SQL_AS         = 'AS';
-    const SQL_OR         = 'OR';
-    const SQL_ON         = 'ON';
-    const SQL_ASC        = 'ASC';
-    const SQL_DESC       = 'DESC';
-
-    /**
-     * Bind variables for query
-     *
-     * @var array
-     */
-    protected $_bind = array();
-
-    /**
-     * Zend_Db_Adapter_Abstract object.
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_adapter;
-
-    /**
-     * The initial values for the $_parts array.
-     * NOTE: It is important for the 'FOR_UPDATE' part to be last to ensure
-     * meximum compatibility with database adapters.
-     *
-     * @var array
-     */
-    protected static $_partsInit = array(
-        self::DISTINCT     => false,
-        self::COLUMNS      => array(),
-        self::UNION        => array(),
-        self::FROM         => array(),
-        self::WHERE        => array(),
-        self::GROUP        => array(),
-        self::HAVING       => array(),
-        self::ORDER        => array(),
-        self::LIMIT_COUNT  => null,
-        self::LIMIT_OFFSET => null,
-        self::FOR_UPDATE   => false
-    );
-
-    /**
-     * Specify legal join types.
-     *
-     * @var array
-     */
-    protected static $_joinTypes = array(
-        self::INNER_JOIN,
-        self::LEFT_JOIN,
-        self::RIGHT_JOIN,
-        self::FULL_JOIN,
-        self::CROSS_JOIN,
-        self::NATURAL_JOIN,
-    );
-
-    /**
-     * Specify legal union types.
-     *
-     * @var array
-     */
-    protected static $_unionTypes = array(
-        self::SQL_UNION,
-        self::SQL_UNION_ALL
-    );
-
-    /**
-     * The component parts of a SELECT statement.
-     * Initialized to the $_partsInit array in the constructor.
-     *
-     * @var array
-     */
-    protected $_parts = array();
-
-    /**
-     * Tracks which columns are being select from each table and join.
-     *
-     * @var array
-     */
-    protected $_tableCols = array();
-
-    /**
-     * Class constructor
-     *
-     * @param Zend_Db_Adapter_Abstract $adapter
-     */
-    public function __construct(Zend_Db_Adapter_Abstract $adapter)
-    {
-        $this->_adapter = $adapter;
-        $this->_parts = self::$_partsInit;
-    }
-
-    /**
-     * Get bind variables
-     *
-     * @return array
-     */
-    public function getBind()
-    {
-        return $this->_bind;
-    }
-
-    /**
-     * Set bind variables
-     *
-     * @param mixed $bind
-     * @return Zend_Db_Select
-     */
-    public function bind($bind)
-    {
-        $this->_bind = $bind;
-
-        return $this;
-    }
-
-    /**
-     * Makes the query SELECT DISTINCT.
-     *
-     * @param bool $flag Whether or not the SELECT is DISTINCT (default true).
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function distinct($flag = true)
-    {
-        $this->_parts[self::DISTINCT] = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Adds a FROM table and optional columns to the query.
-     *
-     * The first parameter $name can be a simple string, in which case the
-     * correlation name is generated automatically.  If you want to specify
-     * the correlation name, the first parameter must be an associative
-     * array in which the key is the physical table name, and the value is
-     * the correlation name.  For example, array('table' => 'alias').
-     * The correlation name is prepended to all columns fetched for this
-     * table.
-     *
-     * The second parameter can be a single string or Zend_Db_Expr object,
-     * or else an array of strings or Zend_Db_Expr objects.
-     *
-     * The first parameter can be null or an empty string, in which case
-     * no correlation name is generated or prepended to the columns named
-     * in the second parameter.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name or an associative array relating table name to
-     *                                         correlation name.
-     * @param  array|string|Zend_Db_Expr $cols The columns to select from this table.
-     * @param  string $schema The schema name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function from($name, $cols = '*', $schema = null)
-    {
-        return $this->_join(self::FROM, $name, null, $cols, $schema);
-    }
-
-    /**
-     * Specifies the columns used in the FROM clause.
-     *
-     * The parameter can be a single string or Zend_Db_Expr object,
-     * or else an array of strings or Zend_Db_Expr objects.
-     *
-     * @param  array|string|Zend_Db_Expr $cols The columns to select from this table.
-     * @param  string $correlationName Correlation name of target table. OPTIONAL
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function columns($cols = '*', $correlationName = null)
-    {
-        if ($correlationName === null && count($this->_parts[self::FROM])) {
-            $correlationNameKeys = array_keys($this->_parts[self::FROM]);
-            $correlationName = current($correlationNameKeys);
-        }
-
-        if (!array_key_exists($correlationName, $this->_parts[self::FROM])) {
-            /**
-             * @see Zend_Db_Select_Exception
-             */
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("No table has been specified for the FROM clause");
-        }
-
-        $this->_tableCols($correlationName, $cols);
-
-        return $this;
-    }
-
-    /**
-     * Adds a UNION clause to the query.
-     *
-     * The first parameter has to be an array of Zend_Db_Select or
-     * sql query strings.
-     *
-     * <code>
-     * $sql1 = $db->select();
-     * $sql2 = "SELECT ...";
-     * $select = $db->select()
-     *      ->union(array($sql1, $sql2))
-     *      ->order("id");
-     * </code>
-     *
-     * @param  array $select Array of select clauses for the union.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function union($select = array(), $type = self::SQL_UNION)
-    {
-        if (!is_array($select)) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception(
-                "union() only accepts an array of Zend_Db_Select instances of sql query strings."
-            );
-        }
-
-        if (!in_array($type, self::$_unionTypes)) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("Invalid union type '{$type}'");
-        }
-
-        foreach ($select as $target) {
-            $this->_parts[self::UNION][] = array($target, $type);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a JOIN table and columns to the query.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  string $cond Join on this condition.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function join($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->joinInner($name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Add an INNER JOIN table and colums to the query
-     * Rows in both tables are matched according to the expression
-     * in the $cond argument.  The result set is comprised
-     * of all cases where rows from the left table match
-     * rows from the right table.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  string $cond Join on this condition.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinInner($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::INNER_JOIN, $name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Add a LEFT OUTER JOIN table and colums to the query
-     * All rows from the left operand table are included,
-     * matching rows from the right operand table included,
-     * and the columns from the right operand table are filled
-     * with NULLs if no row exists matching the left table.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  string $cond Join on this condition.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinLeft($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::LEFT_JOIN, $name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Add a RIGHT OUTER JOIN table and colums to the query.
-     * Right outer join is the complement of left outer join.
-     * All rows from the right operand table are included,
-     * matching rows from the left operand table included,
-     * and the columns from the left operand table are filled
-     * with NULLs if no row exists matching the right table.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  string $cond Join on this condition.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinRight($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::RIGHT_JOIN, $name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Add a FULL OUTER JOIN table and colums to the query.
-     * A full outer join is like combining a left outer join
-     * and a right outer join.  All rows from both tables are
-     * included, paired with each other on the same row of the
-     * result set if they satisfy the join condition, and otherwise
-     * paired with NULLs in place of columns from the other table.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  string $cond Join on this condition.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinFull($name, $cond, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::FULL_JOIN, $name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Add a CROSS JOIN table and colums to the query.
-     * A cross join is a cartesian product; there is no join condition.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinCross($name, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::CROSS_JOIN, $name, null, $cols, $schema);
-    }
-
-    /**
-     * Add a NATURAL JOIN table and colums to the query.
-     * A natural join assumes an equi-join across any column(s)
-     * that appear with the same name in both tables.
-     * Only natural inner joins are supported by this API,
-     * even though SQL permits natural outer joins as well.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  array|string|Zend_Db_Expr $name The table name.
-     * @param  array|string $cols The columns to select from the joined table.
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function joinNatural($name, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        return $this->_join(self::NATURAL_JOIN, $name, null, $cols, $schema);
-    }
-
-    /**
-     * Adds a WHERE condition to the query by AND.
-     *
-     * If a value is passed as the second param, it will be quoted
-     * and replaced into the condition wherever a question-mark
-     * appears. Array values are quoted and comma-separated.
-     *
-     * <code>
-     * // simplest but non-secure
-     * $select->where("id = $id");
-     *
-     * // secure (ID is quoted but matched anyway)
-     * $select->where('id = ?', $id);
-     *
-     * // alternatively, with named binding
-     * $select->where('id = :id');
-     * </code>
-     *
-     * Note that it is more correct to use named bindings in your
-     * queries for values other than strings. When you use named
-     * bindings, don't forget to pass the values when actually
-     * making a query:
-     *
-     * <code>
-     * $db->fetchAll($select, array('id' => 5));
-     * </code>
-     *
-     * @param string   $cond  The WHERE condition.
-     * @param mixed    $value OPTIONAL The value to quote into the condition.
-     * @param constant $type  OPTIONAL The type of the given value
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function where($cond, $value = null, $type = null)
-    {
-        $this->_parts[self::WHERE][] = $this->_where($cond, $value, $type, true);
-
-        return $this;
-    }
-
-    /**
-     * Adds a WHERE condition to the query by OR.
-     *
-     * Otherwise identical to where().
-     *
-     * @param string   $cond  The WHERE condition.
-     * @param mixed    $value OPTIONAL The value to quote into the condition.
-     * @param constant $type  OPTIONAL The type of the given value
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     *
-     * @see where()
-     */
-    public function orWhere($cond, $value = null, $type = null)
-    {
-        $this->_parts[self::WHERE][] = $this->_where($cond, $value, $type, false);
-
-        return $this;
-    }
-
-    /**
-     * Adds grouping to the query.
-     *
-     * @param  array|string $spec The column(s) to group by.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function group($spec)
-    {
-        if (!is_array($spec)) {
-            $spec = array($spec);
-        }
-
-        foreach ($spec as $val) {
-            if (preg_match('/\(.*\)/', (string) $val)) {
-                $val = new Zend_Db_Expr($val);
-            }
-            $this->_parts[self::GROUP][] = $val;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a HAVING condition to the query by AND.
-     *
-     * If a value is passed as the second param, it will be quoted
-     * and replaced into the condition wherever a question-mark
-     * appears. See {@link where()} for an example
-     *
-     * @param string $cond The HAVING condition.
-     * @param string|Zend_Db_Expr $val The value to quote into the condition.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function having($cond)
-    {
-        if (func_num_args() > 1) {
-            $val = func_get_arg(1);
-            $cond = $this->_adapter->quoteInto($cond, $val);
-        }
-
-        if ($this->_parts[self::HAVING]) {
-            $this->_parts[self::HAVING][] = self::SQL_AND . " ($cond)";
-        } else {
-            $this->_parts[self::HAVING][] = "($cond)";
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a HAVING condition to the query by OR.
-     *
-     * Otherwise identical to orHaving().
-     *
-     * @param string $cond The HAVING condition.
-     * @param mixed  $val  The value to quote into the condition.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     *
-     * @see having()
-     */
-    public function orHaving($cond)
-    {
-        if (func_num_args() > 1) {
-            $val = func_get_arg(1);
-            $cond = $this->_adapter->quoteInto($cond, $val);
-        }
-
-        if ($this->_parts[self::HAVING]) {
-            $this->_parts[self::HAVING][] = self::SQL_OR . " ($cond)";
-        } else {
-            $this->_parts[self::HAVING][] = "($cond)";
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a row order to the query.
-     *
-     * @param mixed $spec The column(s) and direction to order by.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function order($spec)
-    {
-        if (!is_array($spec)) {
-            $spec = array($spec);
-        }
-
-        // force 'ASC' or 'DESC' on each order spec, default is ASC.
-        foreach ($spec as $val) {
-            if ($val instanceof Zend_Db_Expr) {
-                $expr = $val->__toString();
-                if (empty($expr)) {
-                    continue;
-                }
-                $this->_parts[self::ORDER][] = $val;
-            } else {
-                if (empty($val)) {
-                    continue;
-                }
-                $direction = self::SQL_ASC;
-                if (preg_match('/(.*\W)(' . self::SQL_ASC . '|' . self::SQL_DESC . ')\b/si', $val, $matches)) {
-                    $val = trim($matches[1]);
-                    $direction = $matches[2];
-                }
-                if (preg_match('/\(.*\)/', $val)) {
-                    $val = new Zend_Db_Expr($val);
-                }
-                $this->_parts[self::ORDER][] = array($val, $direction);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a limit count and offset to the query.
-     *
-     * @param int $count OPTIONAL The number of rows to return.
-     * @param int $offset OPTIONAL Start returning after this many rows.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function limit($count = null, $offset = null)
-    {
-        $this->_parts[self::LIMIT_COUNT]  = (int) $count;
-        $this->_parts[self::LIMIT_OFFSET] = (int) $offset;
-        return $this;
-    }
-
-    /**
-     * Sets the limit and count by page number.
-     *
-     * @param int $page Limit results to this page number.
-     * @param int $rowCount Use this many rows per page.
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function limitPage($page, $rowCount)
-    {
-        $page     = ($page > 0)     ? $page     : 1;
-        $rowCount = ($rowCount > 0) ? $rowCount : 1;
-        $this->_parts[self::LIMIT_COUNT]  = (int) $rowCount;
-        $this->_parts[self::LIMIT_OFFSET] = (int) $rowCount * ($page - 1);
-        return $this;
-    }
-
-    /**
-     * Makes the query SELECT FOR UPDATE.
-     *
-     * @param bool $flag Whether or not the SELECT is FOR UPDATE (default true).
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function forUpdate($flag = true)
-    {
-        $this->_parts[self::FOR_UPDATE] = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get part of the structured information for the currect query.
-     *
-     * @param string $part
-     * @return mixed
-     * @throws Zend_Db_Select_Exception
-     */
-    public function getPart($part)
-    {
-        $part = strtolower($part);
-        if (!array_key_exists($part, $this->_parts)) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("Invalid Select part '$part'");
-        }
-        return $this->_parts[$part];
-    }
-
-    /**
-     * Executes the current select object and returns the result
-     *
-     * @param integer $fetchMode OPTIONAL
-     * @param  mixed  $bind An array of data to bind to the placeholders.
-     * @return PDO_Statement|Zend_Db_Statement
-     */
-    public function query($fetchMode = null, $bind = array())
-    {
-        if (!empty($bind)) {
-            $this->bind($bind);
-        }
-
-        $stmt = $this->_adapter->query($this);
-        if ($fetchMode == null) {
-            $fetchMode = $this->_adapter->getFetchMode();
-        }
-        $stmt->setFetchMode($fetchMode);
-        return $stmt;
-    }
-
-    /**
-     * Converts this object to an SQL SELECT string.
-     *
-     * @return string|null This object as a SELECT string. (or null if a string cannot be produced.)
-     */
-    public function assemble()
-    {
-        $sql = self::SQL_SELECT;
-        foreach (array_keys(self::$_partsInit) as $part) {
-            $method = '_render' . ucfirst($part);
-            if (method_exists($this, $method)) {
-                $sql = $this->$method($sql);
-            }
-        }
-        return $sql;
-    }
-
-    /**
-     * Clear parts of the Select object, or an individual part.
-     *
-     * @param string $part OPTIONAL
-     * @return Zend_Db_Select
-     */
-    public function reset($part = null)
-    {
-        if ($part == null) {
-            $this->_parts = self::$_partsInit;
-        } else if (array_key_exists($part, self::$_partsInit)) {
-            $this->_parts[$part] = self::$_partsInit[$part];
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the Zend_Db_Adapter_Abstract for this
-     * particular Zend_Db_Select object.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Populate the {@link $_parts} 'join' key
-     *
-     * Does the dirty work of populating the join key.
-     *
-     * The $name and $cols parameters follow the same logic
-     * as described in the from() method.
-     *
-     * @param  null|string $type Type of join; inner, left, and null are currently supported
-     * @param  array|string|Zend_Db_Expr $name Table name
-     * @param  string $cond Join on this condition
-     * @param  array|string $cols The columns to select from the joined table
-     * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object
-     * @throws Zend_Db_Select_Exception
-     */
-    protected function _join($type, $name, $cond, $cols, $schema = null)
-    {
-        if (!in_array($type, self::$_joinTypes) && $type != self::FROM) {
-            /**
-             * @see Zend_Db_Select_Exception
-             */
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("Invalid join type '$type'");
-        }
-
-        if (count($this->_parts[self::UNION])) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("Invalid use of table with " . self::SQL_UNION);
-        }
-
-        if (empty($name)) {
-            $correlationName = $tableName = '';
-        } else if (is_array($name)) {
-            // Must be array($correlationName => $tableName) or array($ident, ...)
-            foreach ($name as $_correlationName => $_tableName) {
-                if (is_string($_correlationName)) {
-                    // We assume the key is the correlation name and value is the table name
-                    $tableName = $_tableName;
-                    $correlationName = $_correlationName;
-                } else {
-                    // We assume just an array of identifiers, with no correlation name
-                    $tableName = $_tableName;
-                    $correlationName = $this->_uniqueCorrelation($tableName);
-                }
-                break;
-            }
-        } else if ($name instanceof Zend_Db_Expr|| $name instanceof Zend_Db_Select) {
-            $tableName = $name;
-            $correlationName = $this->_uniqueCorrelation('t');
-        } else if (preg_match('/^(.+)\s+AS\s+(.+)$/i', $name, $m)) {
-            $tableName = $m[1];
-            $correlationName = $m[2];
-        } else {
-            $tableName = $name;
-            $correlationName = $this->_uniqueCorrelation($tableName);
-        }
-
-        // Schema from table name overrides schema argument
-        if (!is_object($tableName) && false !== strpos($tableName, '.')) {
-            list($schema, $tableName) = explode('.', $tableName);
-        }
-
-        $lastFromCorrelationName = null;
-        if (!empty($correlationName)) {
-            if (array_key_exists($correlationName, $this->_parts[self::FROM])) {
-                /**
-                 * @see Zend_Db_Select_Exception
-                 */
-                require_once 'Zend/Db/Select/Exception.php';
-                throw new Zend_Db_Select_Exception("You cannot define a correlation name '$correlationName' more than once");
-            }
-
-            if ($type == self::FROM) {
-                // append this from after the last from joinType
-                $tmpFromParts = $this->_parts[self::FROM];
-                $this->_parts[self::FROM] = array();
-                // move all the froms onto the stack
-                while ($tmpFromParts) {
-                    $currentCorrelationName = key($tmpFromParts);
-                    if ($tmpFromParts[$currentCorrelationName]['joinType'] != self::FROM) {
-                        break;
-                    }
-                    $lastFromCorrelationName = $currentCorrelationName;
-                    $this->_parts[self::FROM][$currentCorrelationName] = array_shift($tmpFromParts);
-                }
-            } else {
-                $tmpFromParts = array();
-            }
-            $this->_parts[self::FROM][$correlationName] = array(
-                'joinType'      => $type,
-                'schema'        => $schema,
-                'tableName'     => $tableName,
-                'joinCondition' => $cond
-                );
-            while ($tmpFromParts) {
-                $currentCorrelationName = key($tmpFromParts);
-                $this->_parts[self::FROM][$currentCorrelationName] = array_shift($tmpFromParts);
-            }
-        }
-
-        // add to the columns from this joined table
-        if ($type == self::FROM && $lastFromCorrelationName == null) {
-            $lastFromCorrelationName = true;
-        }
-        $this->_tableCols($correlationName, $cols, $lastFromCorrelationName);
-
-        return $this;
-    }
-
-    /**
-     * Handle JOIN... USING... syntax
-     *
-     * This is functionality identical to the existing JOIN methods, however
-     * the join condition can be passed as a single column name. This method
-     * then completes the ON condition by using the same field for the FROM
-     * table and the JOIN table.
-     *
-     * <code>
-     * $select = $db->select()->from('table1')
-     *                        ->joinUsing('table2', 'column1');
-     *
-     * // SELECT * FROM table1 JOIN table2 ON table1.column1 = table2.column2
-     * </code>
-     *
-     * These joins are called by the developer simply by adding 'Using' to the
-     * method name. E.g.
-     * * joinUsing
-     * * joinInnerUsing
-     * * joinFullUsing
-     * * joinRightUsing
-     * * joinLeftUsing
-     *
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null)
-    {
-        if (empty($this->_parts[self::FROM])) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("You can only perform a joinUsing after specifying a FROM table");
-        }
-
-        $join  = $this->_adapter->quoteIdentifier(key($this->_parts[self::FROM]), true);
-        $from  = $this->_adapter->quoteIdentifier($this->_uniqueCorrelation($name), true);
-
-        $cond1 = $from . '.' . $cond;
-        $cond2 = $join . '.' . $cond;
-        $cond  = $cond1 . ' = ' . $cond2;
-
-        return $this->_join($type, $name, $cond, $cols, $schema);
-    }
-
-    /**
-     * Generate a unique correlation name
-     *
-     * @param string|array $name A qualified identifier.
-     * @return string A unique correlation name.
-     */
-    private function _uniqueCorrelation($name)
-    {
-        if (is_array($name)) {
-            $c = end($name);
-        } else {
-            // Extract just the last name of a qualified table name
-            $dot = strrpos($name,'.');
-            $c = ($dot === false) ? $name : substr($name, $dot+1);
-        }
-        for ($i = 2; array_key_exists($c, $this->_parts[self::FROM]); ++$i) {
-            $c = $name . '_' . (string) $i;
-        }
-        return $c;
-    }
-
-    /**
-     * Adds to the internal table-to-column mapping array.
-     *
-     * @param  string $tbl The table/join the columns come from.
-     * @param  array|string $cols The list of columns; preferably as
-     * an array, but possibly as a string containing one column.
-     * @param  bool|string True if it should be prepended, a correlation name if it should be inserted
-     * @return void
-     */
-    protected function _tableCols($correlationName, $cols, $afterCorrelationName = null)
-    {
-        if (!is_array($cols)) {
-            $cols = array($cols);
-        }
-
-        if ($correlationName == null) {
-            $correlationName = '';
-        }
-
-        $columnValues = array();
-
-        foreach (array_filter($cols) as $alias => $col) {
-            $currentCorrelationName = $correlationName;
-            if (is_string($col)) {
-                // Check for a column matching "<column> AS <alias>" and extract the alias name
-                if (preg_match('/^(.+)\s+' . self::SQL_AS . '\s+(.+)$/i', $col, $m)) {
-                    $col = $m[1];
-                    $alias = $m[2];
-                }
-                // Check for columns that look like functions and convert to Zend_Db_Expr
-                if (preg_match('/\(.*\)/', $col)) {
-                    $col = new Zend_Db_Expr($col);
-                } elseif (preg_match('/(.+)\.(.+)/', $col, $m)) {
-                    $currentCorrelationName = $m[1];
-                    $col = $m[2];
-                }
-            }
-            $columnValues[] = array($currentCorrelationName, $col, is_string($alias) ? $alias : null);
-        }
-
-        if ($columnValues) {
-
-            // should we attempt to prepend or insert these values?
-            if ($afterCorrelationName === true || is_string($afterCorrelationName)) {
-                $tmpColumns = $this->_parts[self::COLUMNS];
-                $this->_parts[self::COLUMNS] = array();
-            } else {
-                $tmpColumns = array();
-            }
-
-            // find the correlation name to insert after
-            if (is_string($afterCorrelationName)) {
-                while ($tmpColumns) {
-                    $this->_parts[self::COLUMNS][] = $currentColumn = array_shift($tmpColumns);
-                    if ($currentColumn[0] == $afterCorrelationName) {
-                        break;
-                    }
-                }
-            }
-
-            // apply current values to current stack
-            foreach ($columnValues as $columnValue) {
-                array_push($this->_parts[self::COLUMNS], $columnValue);
-            }
-
-            // finish ensuring that all previous values are applied (if they exist)
-            while ($tmpColumns) {
-                array_push($this->_parts[self::COLUMNS], array_shift($tmpColumns));
-            }
-        }
-    }
-
-    /**
-     * Internal function for creating the where clause
-     *
-     * @param string   $condition
-     * @param mixed    $value  optional
-     * @param string   $type   optional
-     * @param boolean  $bool  true = AND, false = OR
-     * @return string  clause
-     */
-    protected function _where($condition, $value = null, $type = null, $bool = true)
-    {
-        if (count($this->_parts[self::UNION])) {
-            require_once 'Zend/Db/Select/Exception.php';
-            throw new Zend_Db_Select_Exception("Invalid use of where clause with " . self::SQL_UNION);
-        }
-
-        if ($value !== null) {
-            $condition = $this->_adapter->quoteInto($condition, $value, $type);
-        }
-
-        $cond = "";
-        if ($this->_parts[self::WHERE]) {
-            if ($bool === true) {
-                $cond = self::SQL_AND . ' ';
-            } else {
-                $cond = self::SQL_OR . ' ';
-            }
-        }
-
-        return $cond . "($condition)";
-    }
-
-    /**
-     * @return array
-     */
-    protected function _getDummyTable()
-    {
-        return array();
-    }
-
-    /**
-     * Return a quoted schema name
-     *
-     * @param string   $schema  The schema name OPTIONAL
-     * @return string|null
-     */
-    protected function _getQuotedSchema($schema = null)
-    {
-        if ($schema === null) {
-            return null;
-        }
-        return $this->_adapter->quoteIdentifier($schema, true) . '.';
-    }
-
-    /**
-     * Return a quoted table name
-     *
-     * @param string   $tableName        The table name
-     * @param string   $correlationName  The correlation name OPTIONAL
-     * @return string
-     */
-    protected function _getQuotedTable($tableName, $correlationName = null)
-    {
-        return $this->_adapter->quoteTableAs($tableName, $correlationName, true);
-    }
-
-    /**
-     * Render DISTINCT clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderDistinct($sql)
-    {
-        if ($this->_parts[self::DISTINCT]) {
-            $sql .= ' ' . self::SQL_DISTINCT;
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render DISTINCT clause
-     *
-     * @param string   $sql SQL query
-     * @return string|null
-     */
-    protected function _renderColumns($sql)
-    {
-        if (!count($this->_parts[self::COLUMNS])) {
-            return null;
-        }
-
-        $columns = array();
-        foreach ($this->_parts[self::COLUMNS] as $columnEntry) {
-            list($correlationName, $column, $alias) = $columnEntry;
-            if ($column instanceof Zend_Db_Expr) {
-                $columns[] = $this->_adapter->quoteColumnAs($column, $alias, true);
-            } else {
-                if ($column == self::SQL_WILDCARD) {
-                    $column = new Zend_Db_Expr(self::SQL_WILDCARD);
-                    $alias = null;
-                }
-                if (empty($correlationName)) {
-                    $columns[] = $this->_adapter->quoteColumnAs($column, $alias, true);
-                } else {
-                    $columns[] = $this->_adapter->quoteColumnAs(array($correlationName, $column), $alias, true);
-                }
-            }
-        }
-
-        return $sql .= ' ' . implode(', ', $columns);
-    }
-
-    /**
-     * Render FROM clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderFrom($sql)
-    {
-        /*
-         * If no table specified, use RDBMS-dependent solution
-         * for table-less query.  e.g. DUAL in Oracle.
-         */
-        if (empty($this->_parts[self::FROM])) {
-            $this->_parts[self::FROM] = $this->_getDummyTable();
-        }
-
-        $from = array();
-
-        foreach ($this->_parts[self::FROM] as $correlationName => $table) {
-            $tmp = '';
-
-            $joinType = ($table['joinType'] == self::FROM) ? self::INNER_JOIN : $table['joinType'];
-
-            // Add join clause (if applicable)
-            if (! empty($from)) {
-                $tmp .= ' ' . strtoupper($joinType) . ' ';
-            }
-
-            $tmp .= $this->_getQuotedSchema($table['schema']);
-            $tmp .= $this->_getQuotedTable($table['tableName'], $correlationName);
-
-            // Add join conditions (if applicable)
-            if (!empty($from) && ! empty($table['joinCondition'])) {
-                $tmp .= ' ' . self::SQL_ON . ' ' . $table['joinCondition'];
-            }
-
-            // Add the table name and condition add to the list
-            $from[] = $tmp;
-        }
-
-        // Add the list of all joins
-        if (!empty($from)) {
-            $sql .= ' ' . self::SQL_FROM . ' ' . implode("\n", $from);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render UNION query
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderUnion($sql)
-    {
-        if ($this->_parts[self::UNION]) {
-            $parts = count($this->_parts[self::UNION]);
-            foreach ($this->_parts[self::UNION] as $cnt => $union) {
-                list($target, $type) = $union;
-                if ($target instanceof Zend_Db_Select) {
-                    $target = $target->assemble();
-                }
-                $sql .= $target;
-                if ($cnt < $parts - 1) {
-                    $sql .= ' ' . $type . ' ';
-                }
-            }
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render WHERE clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderWhere($sql)
-    {
-        if ($this->_parts[self::FROM] && $this->_parts[self::WHERE]) {
-            $sql .= ' ' . self::SQL_WHERE . ' ' .  implode(' ', $this->_parts[self::WHERE]);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render GROUP clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderGroup($sql)
-    {
-        if ($this->_parts[self::FROM] && $this->_parts[self::GROUP]) {
-            $group = array();
-            foreach ($this->_parts[self::GROUP] as $term) {
-                $group[] = $this->_adapter->quoteIdentifier($term, true);
-            }
-            $sql .= ' ' . self::SQL_GROUP_BY . ' ' . implode(",\n\t", $group);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render HAVING clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderHaving($sql)
-    {
-        if ($this->_parts[self::FROM] && $this->_parts[self::HAVING]) {
-            $sql .= ' ' . self::SQL_HAVING . ' ' . implode(' ', $this->_parts[self::HAVING]);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render ORDER clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderOrder($sql)
-    {
-        if ($this->_parts[self::ORDER]) {
-            $order = array();
-            foreach ($this->_parts[self::ORDER] as $term) {
-                if (is_array($term)) {
-                    if(is_numeric($term[0]) && strval(intval($term[0])) == $term[0]) {
-                        $order[] = (int)trim($term[0]) . ' ' . $term[1];
-                    } else {
-                        $order[] = $this->_adapter->quoteIdentifier($term[0], true) . ' ' . $term[1];
-                    }
-                } else if (is_numeric($term) && strval(intval($term)) == $term) {
-                    $order[] = (int)trim($term);
-                } else {
-                    $order[] = $this->_adapter->quoteIdentifier($term, true);
-                }
-            }
-            $sql .= ' ' . self::SQL_ORDER_BY . ' ' . implode(', ', $order);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render LIMIT OFFSET clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderLimitoffset($sql)
-    {
-        $count = 0;
-        $offset = 0;
-
-        if (!empty($this->_parts[self::LIMIT_OFFSET])) {
-            $offset = (int) $this->_parts[self::LIMIT_OFFSET];
-            $count = PHP_INT_MAX;
-        }
-
-        if (!empty($this->_parts[self::LIMIT_COUNT])) {
-            $count = (int) $this->_parts[self::LIMIT_COUNT];
-        }
-
-        /*
-         * Add limits clause
-         */
-        if ($count > 0) {
-            $sql = trim($this->_adapter->limit($sql, $count, $offset));
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Render FOR UPDATE clause
-     *
-     * @param string   $sql SQL query
-     * @return string
-     */
-    protected function _renderForupdate($sql)
-    {
-        if ($this->_parts[self::FOR_UPDATE]) {
-            $sql .= ' ' . self::SQL_FOR_UPDATE;
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Turn magic function calls into non-magic function calls
-     * for joinUsing syntax
-     *
-     * @param string $method
-     * @param array $args OPTIONAL Zend_Db_Table_Select query modifier
-     * @return Zend_Db_Select
-     * @throws Zend_Db_Select_Exception If an invalid method is called.
-     */
-    public function __call($method, array $args)
-    {
-        $matches = array();
-
-        /**
-         * Recognize methods for Has-Many cases:
-         * findParent<Class>()
-         * findParent<Class>By<Rule>()
-         * Use the non-greedy pattern repeat modifier e.g. \w+?
-         */
-        if (preg_match('/^join([a-zA-Z]*?)Using$/', $method, $matches)) {
-            $type = strtolower($matches[1]);
-            if ($type) {
-                $type .= ' join';
-                if (!in_array($type, self::$_joinTypes)) {
-                    require_once 'Zend/Db/Select/Exception.php';
-                    throw new Zend_Db_Select_Exception("Unrecognized method '$method()'");
-                }
-                if (in_array($type, array(self::CROSS_JOIN, self::NATURAL_JOIN))) {
-                    require_once 'Zend/Db/Select/Exception.php';
-                    throw new Zend_Db_Select_Exception("Cannot perform a joinUsing with method '$method()'");
-                }
-            } else {
-                $type = self::INNER_JOIN;
-            }
-            array_unshift($args, $type);
-            return call_user_func_array(array($this, '_joinUsing'), $args);
-        }
-
-        require_once 'Zend/Db/Select/Exception.php';
-        throw new Zend_Db_Select_Exception("Unrecognized method '$method()'");
-    }
-
-    /**
-     * Implements magic method.
-     *
-     * @return string This object as a SELECT string.
-     */
-    public function __toString()
-    {
-        try {
-            $sql = $this->assemble();
-        } catch (Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            $sql = '';
-        }
-        return (string)$sql;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Select/Exception.php b/airtime_mvc/library/Zend/Db/Select/Exception.php
deleted file mode 100644
index d95fdb20d..000000000
--- a/airtime_mvc/library/Zend/Db/Select/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Exception
- */
-require_once 'Zend/Db/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Select_Exception extends Zend_Db_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Statement.php b/airtime_mvc/library/Zend/Db/Statement.php
deleted file mode 100644
index 6e8d20a4a..000000000
--- a/airtime_mvc/library/Zend/Db/Statement.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Statement.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @see Zend_Db_Statement_Interface
- */
-require_once 'Zend/Db/Statement/Interface.php';
-
-/**
- * Abstract class to emulate a PDOStatement for native database adapters.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface
-{
-
-    /**
-     * @var resource|object The driver level statement object/resource
-     */
-    protected $_stmt = null;
-
-    /**
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_adapter = null;
-
-    /**
-     * The current fetch mode.
-     *
-     * @var integer
-     */
-    protected $_fetchMode = Zend_Db::FETCH_ASSOC;
-
-    /**
-     * Attributes.
-     *
-     * @var array
-     */
-    protected $_attribute = array();
-
-    /**
-     * Column result bindings.
-     *
-     * @var array
-     */
-    protected $_bindColumn = array();
-
-    /**
-     * Query parameter bindings; covers bindParam() and bindValue().
-     *
-     * @var array
-     */
-    protected $_bindParam = array();
-
-    /**
-     * SQL string split into an array at placeholders.
-     *
-     * @var array
-     */
-    protected $_sqlSplit = array();
-
-    /**
-     * Parameter placeholders in the SQL string by position in the split array.
-     *
-     * @var array
-     */
-    protected $_sqlParam = array();
-
-    /**
-     * @var Zend_Db_Profiler_Query
-     */
-    protected $_queryId = null;
-
-    /**
-     * Constructor for a statement.
-     *
-     * @param Zend_Db_Adapter_Abstract $adapter
-     * @param mixed $sql Either a string or Zend_Db_Select.
-     */
-    public function __construct($adapter, $sql)
-    {
-        $this->_adapter = $adapter;
-        if ($sql instanceof Zend_Db_Select) {
-            $sql = $sql->assemble();
-        }
-        $this->_parseParameters($sql);
-        $this->_prepare($sql);
-
-        $this->_queryId = $this->_adapter->getProfiler()->queryStart($sql);
-    }
-
-    /**
-     * Internal method called by abstract statment constructor to setup
-     * the driver level statement
-     *
-     * @return void
-     */
-    protected function _prepare($sql)
-    {
-        return;
-    }
-
-    /**
-     * @param string $sql
-     * @return void
-     */
-    protected function _parseParameters($sql)
-    {
-        $sql = $this->_stripQuoted($sql);
-
-        // split into text and params
-        $this->_sqlSplit = preg_split('/(\?|\:[a-zA-Z0-9_]+)/',
-            $sql, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-
-        // map params
-        $this->_sqlParam = array();
-        foreach ($this->_sqlSplit as $key => $val) {
-            if ($val == '?') {
-                if ($this->_adapter->supportsParameters('positional') === false) {
-                    /**
-                     * @see Zend_Db_Statement_Exception
-                     */
-                    require_once 'Zend/Db/Statement/Exception.php';
-                    throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$val'");
-                }
-            } else if ($val[0] == ':') {
-                if ($this->_adapter->supportsParameters('named') === false) {
-                    /**
-                     * @see Zend_Db_Statement_Exception
-                     */
-                    require_once 'Zend/Db/Statement/Exception.php';
-                    throw new Zend_Db_Statement_Exception("Invalid bind-variable name '$val'");
-                }
-            }
-            $this->_sqlParam[] = $val;
-        }
-
-        // set up for binding
-        $this->_bindParam = array();
-    }
-
-    /**
-     * Remove parts of a SQL string that contain quoted strings
-     * of values or identifiers.
-     *
-     * @param string $sql
-     * @return string
-     */
-    protected function _stripQuoted($sql)
-    {
-        // get the character for delimited id quotes,
-        // this is usually " but in MySQL is `
-        $d = $this->_adapter->quoteIdentifier('a');
-        $d = $d[0];
-
-        // get the value used as an escaped delimited id quote,
-        // e.g. \" or "" or \`
-        $de = $this->_adapter->quoteIdentifier($d);
-        $de = substr($de, 1, 2);
-        $de = str_replace('\\', '\\\\', $de);
-
-        // get the character for value quoting
-        // this should be '
-        $q = $this->_adapter->quote('a');
-        $q = $q[0];
-
-        // get the value used as an escaped quote,
-        // e.g. \' or ''
-        $qe = $this->_adapter->quote($q);
-        $qe = substr($qe, 1, 2);
-        $qe = str_replace('\\', '\\\\', $qe);
-
-        // get a version of the SQL statement with all quoted
-        // values and delimited identifiers stripped out
-        // remove "foo\"bar"
-        $sql = preg_replace("/$q($qe|\\\\{2}|[^$q])*$q/", '', $sql);
-        // remove 'foo\'bar'
-        if (!empty($q)) {
-            $sql = preg_replace("/$q($qe|[^$q])*$q/", '', $sql);
-        }
-
-        return $sql;
-    }
-
-    /**
-     * Bind a column of the statement result set to a PHP variable.
-     *
-     * @param string $column Name the column in the result set, either by
-     *                       position or by name.
-     * @param mixed  $param  Reference to the PHP variable containing the value.
-     * @param mixed  $type   OPTIONAL
-     * @return bool
-     */
-    public function bindColumn($column, &$param, $type = null)
-    {
-        $this->_bindColumn[$column] =& $param;
-        return true;
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     */
-    public function bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        if (!is_int($parameter) && !is_string($parameter)) {
-            /**
-             * @see Zend_Db_Statement_Exception
-             */
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception('Invalid bind-variable position');
-        }
-
-        $position = null;
-        if (($intval = (int) $parameter) > 0 && $this->_adapter->supportsParameters('positional')) {
-            if ($intval >= 1 || $intval <= count($this->_sqlParam)) {
-                $position = $intval;
-            }
-        } else if ($this->_adapter->supportsParameters('named')) {
-            if ($parameter[0] != ':') {
-                $parameter = ':' . $parameter;
-            }
-            if (in_array($parameter, $this->_sqlParam) !== false) {
-                $position = $parameter;
-            }
-        }
-
-        if ($position === null) {
-            /**
-             * @see Zend_Db_Statement_Exception
-             */
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$parameter'");
-        }
-
-        // Finally we are assured that $position is valid
-        $this->_bindParam[$position] =& $variable;
-        return $this->_bindParam($position, $variable, $type, $length, $options);
-    }
-
-    /**
-     * Binds a value to a parameter.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $value     Scalar value to bind to the parameter.
-     * @param mixed $type      OPTIONAL Datatype of the parameter.
-     * @return bool
-     */
-    public function bindValue($parameter, $value, $type = null)
-    {
-        return $this->bindParam($parameter, $value, $type);
-    }
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     */
-    public function execute(array $params = null)
-    {
-        /*
-         * Simple case - no query profiler to manage.
-         */
-        if ($this->_queryId === null) {
-            return $this->_execute($params);
-        }
-
-        /*
-         * Do the same thing, but with query profiler
-         * management before and after the execute.
-         */
-        $prof = $this->_adapter->getProfiler();
-        $qp = $prof->getQueryProfile($this->_queryId);
-        if ($qp->hasEnded()) {
-            $this->_queryId = $prof->queryClone($qp);
-            $qp = $prof->getQueryProfile($this->_queryId);
-        }
-        if ($params !== null) {
-            $qp->bindParams($params);
-        } else {
-            $qp->bindParams($this->_bindParam);
-        }
-        $qp->start($this->_queryId);
-
-        $retval = $this->_execute($params);
-
-        $prof->queryEnd($this->_queryId);
-
-        return $retval;
-    }
-
-    /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     */
-    public function fetchAll($style = null, $col = null)
-    {
-        $data = array();
-        if ($style === Zend_Db::FETCH_COLUMN && $col === null) {
-            $col = 0;
-        }
-        if ($col === null) {
-            while ($row = $this->fetch($style)) {
-                $data[] = $row;
-            }
-        } else {
-            while (false !== ($val = $this->fetchColumn($col))) {
-                $data[] = $val;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string One value from the next row of result set, or false.
-     */
-    public function fetchColumn($col = 0)
-    {
-        $data = array();
-        $col = (int) $col;
-        $row = $this->fetch(Zend_Db::FETCH_NUM);
-        if (!is_array($row)) {
-            return false;
-        }
-        return $row[$col];
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class, or false.
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        $obj = new $class($config);
-        $row = $this->fetch(Zend_Db::FETCH_ASSOC);
-        if (!is_array($row)) {
-            return false;
-        }
-        foreach ($row as $key => $val) {
-            $obj->$key = $val;
-        }
-        return $obj;
-    }
-
-    /**
-     * Retrieve a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @return mixed      Attribute value.
-     */
-    public function getAttribute($key)
-    {
-        if (array_key_exists($key, $this->_attribute)) {
-            return $this->_attribute[$key];
-        }
-    }
-
-    /**
-     * Set a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @param mixed  $val Attribute value.
-     * @return bool
-     */
-    public function setAttribute($key, $val)
-    {
-        $this->_attribute[$key] = $val;
-    }
-
-    /**
-     * Set the default fetch mode for this statement.
-     *
-     * @param int   $mode The fetch mode.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        switch ($mode) {
-            case Zend_Db::FETCH_NUM:
-            case Zend_Db::FETCH_ASSOC:
-            case Zend_Db::FETCH_BOTH:
-            case Zend_Db::FETCH_OBJ:
-                $this->_fetchMode = $mode;
-                break;
-            case Zend_Db::FETCH_BOUND:
-            default:
-                $this->closeCursor();
-                /**
-                 * @see Zend_Db_Statement_Exception
-                 */
-                require_once 'Zend/Db/Statement/Exception.php';
-                throw new Zend_Db_Statement_Exception('invalid fetch mode');
-                break;
-        }
-    }
-
-    /**
-     * Helper function to map retrieved row
-     * to bound column variables
-     *
-     * @param array $row
-     * @return bool True
-     */
-    public function _fetchBound($row)
-    {
-        foreach ($row as $key => $value) {
-            // bindColumn() takes 1-based integer positions
-            // but fetch() returns 0-based integer indexes
-            if (is_int($key)) {
-                $key++;
-            }
-            // set results only to variables that were bound previously
-            if (isset($this->_bindColumn[$key])) {
-                $this->_bindColumn[$key] = $value;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Gets the Zend_Db_Adapter_Abstract for this
-     * particular Zend_Db_Statement object.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Gets the resource or object setup by the
-     * _parse
-     * @return unknown_type
-     */
-    public function getDriverStatement()
-    {
-        return $this->_stmt;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Db2.php b/airtime_mvc/library/Zend/Db/Statement/Db2.php
deleted file mode 100644
index eec657530..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Db2.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db2.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement
- */
-require_once 'Zend/Db/Statement.php';
-
-/**
- * Extends for DB2 native adapter.
- *
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Db2 extends Zend_Db_Statement
-{
-
-    /**
-     * Column names.
-     */
-    protected $_keys;
-
-    /**
-     * Fetched result values.
-     */
-    protected $_values;
-
-    /**
-     * Prepare a statement handle.
-     *
-     * @param string $sql
-     * @return void
-     * @throws Zend_Db_Statement_Db2_Exception
-     */
-    public function _prepare($sql)
-    {
-        $connection = $this->_adapter->getConnection();
-
-        // db2_prepare on i5 emits errors, these need to be
-        // suppressed so that proper exceptions can be thrown
-        $this->_stmt = @db2_prepare($connection, $sql);
-
-        if (!$this->_stmt) {
-            /**
-             * @see Zend_Db_Statement_Db2_Exception
-             */
-            require_once 'Zend/Db/Statement/Db2/Exception.php';
-            throw new Zend_Db_Statement_Db2_Exception(
-                db2_stmt_errormsg(),
-                db2_stmt_error()
-            );
-        }
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Db2_Exception
-     */
-    public function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        if ($type === null) {
-            $type = DB2_PARAM_IN;
-        }
-
-        if (isset($options['data-type'])) {
-            $datatype = $options['data-type'];
-        } else {
-            $datatype = DB2_CHAR;
-        }
-
-        if (!db2_bind_param($this->_stmt, $position, "variable", $type, $datatype)) {
-            /**
-             * @see Zend_Db_Statement_Db2_Exception
-             */
-            require_once 'Zend/Db/Statement/Db2/Exception.php';
-            throw new Zend_Db_Statement_Db2_Exception(
-                db2_stmt_errormsg(),
-                db2_stmt_error()
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     */
-    public function closeCursor()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-        db2_free_stmt($this->_stmt);
-        $this->_stmt = false;
-        return true;
-    }
-
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     */
-    public function columnCount()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-        return db2_num_fields($this->_stmt);
-    }
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     */
-    public function errorCode()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $error = db2_stmt_error();
-        if ($error === '') {
-            return false;
-        }
-
-        return $error;
-    }
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     */
-    public function errorInfo()
-    {
-        $error = $this->errorCode();
-        if ($error === false){
-            return false;
-        }
-
-        /*
-         * Return three-valued array like PDO.  But DB2 does not distinguish
-         * between SQLCODE and native RDBMS error code, so repeat the SQLCODE.
-         */
-        return array(
-            $error,
-            $error,
-            db2_stmt_errormsg()
-        );
-    }
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Db2_Exception
-     */
-    public function _execute(array $params = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $retval = true;
-        if ($params !== null) {
-            $retval = @db2_execute($this->_stmt, $params);
-        } else {
-            $retval = @db2_execute($this->_stmt);
-        }
-
-        if ($retval === false) {
-            /**
-             * @see Zend_Db_Statement_Db2_Exception
-             */
-            require_once 'Zend/Db/Statement/Db2/Exception.php';
-            throw new Zend_Db_Statement_Db2_Exception(
-                db2_stmt_errormsg(),
-                db2_stmt_error());
-        }
-
-        $this->_keys = array();
-        if ($field_num = $this->columnCount()) {
-            for ($i = 0; $i < $field_num; $i++) {
-                $name = db2_field_name($this->_stmt, $i);
-                $this->_keys[] = $name;
-            }
-        }
-
-        $this->_values = array();
-        if ($this->_keys) {
-            $this->_values = array_fill(0, count($this->_keys), null);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Db2_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-
-        switch ($style) {
-            case Zend_Db::FETCH_NUM :
-                $row = db2_fetch_array($this->_stmt);
-                break;
-            case Zend_Db::FETCH_ASSOC :
-                $row = db2_fetch_assoc($this->_stmt);
-                break;
-            case Zend_Db::FETCH_BOTH :
-                $row = db2_fetch_both($this->_stmt);
-                break;
-            case Zend_Db::FETCH_OBJ :
-                $row = db2_fetch_object($this->_stmt);
-                break;
-            case Zend_Db::FETCH_BOUND:
-                $row = db2_fetch_both($this->_stmt);
-                if ($row !== false) {
-                    return $this->_fetchBound($row);
-                }
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Statement_Db2_Exception
-                 */
-                require_once 'Zend/Db/Statement/Db2/Exception.php';
-                throw new Zend_Db_Statement_Db2_Exception("Invalid fetch mode '$style' specified");
-                break;
-        }
-
-        return $row;
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        $obj = $this->fetch(Zend_Db::FETCH_OBJ);
-        return $obj;
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Db2_Exception
-     */
-    public function nextRowset()
-    {
-        /**
-         * @see Zend_Db_Statement_Db2_Exception
-         */
-        require_once 'Zend/Db/Statement/Db2/Exception.php';
-        throw new Zend_Db_Statement_Db2_Exception(__FUNCTION__ . '() is not implemented');
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     */
-    public function rowCount()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $num = @db2_num_rows($this->_stmt);
-
-        if ($num === false) {
-            return 0;
-        }
-
-        return $num;
-    }
-
-     /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     *
-     * Behaves like parent, but if limit()
-     * is used, the final result removes the extra column
-     * 'zend_db_rownum'
-     */
-    public function fetchAll($style = null, $col = null)
-    {
-        $data = parent::fetchAll($style, $col);
-        $results = array();
-        $remove = $this->_adapter->foldCase('ZEND_DB_ROWNUM');
-
-        foreach ($data as $row) {
-            if (is_array($row) && array_key_exists($remove, $row)) {
-                unset($row[$remove]);
-            }
-            $results[] = $row;
-        }
-        return $results;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Db2/Exception.php b/airtime_mvc/library/Zend/Db/Statement/Db2/Exception.php
deleted file mode 100644
index d758854d8..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Db2/Exception.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Statement_Exception
- */
-require_once 'Zend/Db/Statement/Exception.php';
-
-/**
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Statement_Db2_Exception extends Zend_Db_Statement_Exception
-{
-    /**
-     * @var string
-     */
-    protected $code = '00000';
-
-    /**
-     * @var string
-     */
-    protected $message = 'unknown exception';
-
-    /**
-     * @param string $msg
-     * @param string $state
-     */
-    function __construct($msg = 'unknown exception', $state = '00000')
-    {
-        $this->message = $msg;
-        $this->code = $state;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Statement/Exception.php b/airtime_mvc/library/Zend/Db/Statement/Exception.php
deleted file mode 100644
index f628ea059..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Exception.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20514 2010-01-22 07:57:10Z ralph $
- */
-
-/**
- * @see Zend_Db_Exception
- */
-require_once 'Zend/Db/Exception.php';
-
-/**
- * Zend_Db_Statement_Exception
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Exception extends Zend_Db_Exception
-{
-    /**
-     * Check if this general exception has a specific database driver specific exception nested inside.
-     *
-     * @return bool
-     */
-    public function hasChainedException()
-    {
-        return ($this->getPrevious() !== null);
-    }
-
-    /**
-     * @return Exception|null
-     */
-    public function getChainedException()
-    {
-        return $this->getPrevious();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Interface.php b/airtime_mvc/library/Zend/Db/Statement/Interface.php
deleted file mode 100644
index 701c64010..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Interface.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Emulates a PDOStatement for native database adapters.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Db_Statement_Interface
-{
-
-    /**
-     * Bind a column of the statement result set to a PHP variable.
-     *
-     * @param string $column Name the column in the result set, either by
-     *                       position or by name.
-     * @param mixed  $param  Reference to the PHP variable containing the value.
-     * @param mixed  $type   OPTIONAL
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindColumn($column, &$param, $type = null);
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindParam($parameter, &$variable, $type = null, $length = null, $options = null);
-
-    /**
-     * Binds a value to a parameter.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $value     Scalar value to bind to the parameter.
-     * @param mixed $type      OPTIONAL Datatype of the parameter.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindValue($parameter, $value, $type = null);
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function closeCursor();
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function columnCount();
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorCode();
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorInfo();
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function execute(array $params = array());
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null);
-
-    /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchAll($style = null, $col = null);
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchColumn($col = 0);
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchObject($class = 'stdClass', array $config = array());
-
-    /**
-     * Retrieve a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @return mixed      Attribute value.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function getAttribute($key);
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function nextRowset();
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function rowCount();
-
-    /**
-     * Set a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @param mixed  $val Attribute value.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setAttribute($key, $val);
-
-    /**
-     * Set the default fetch mode for this statement.
-     *
-     * @param int   $mode The fetch mode.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setFetchMode($mode);
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Mysqli.php b/airtime_mvc/library/Zend/Db/Statement/Mysqli.php
deleted file mode 100644
index 808f69276..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Mysqli.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mysqli.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Statement
- */
-require_once 'Zend/Db/Statement.php';
-
-
-/**
- * Extends for Mysqli
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Mysqli extends Zend_Db_Statement
-{
-
-    /**
-     * Column names.
-     *
-     * @var array
-     */
-    protected $_keys;
-
-    /**
-     * Fetched result values.
-     *
-     * @var array
-     */
-    protected $_values;
-
-    /**
-     * @var array
-     */
-    protected $_meta = null;
-
-    /**
-     * @param  string $sql
-     * @return void
-     * @throws Zend_Db_Statement_Mysqli_Exception
-     */
-    public function _prepare($sql)
-    {
-        $mysqli = $this->_adapter->getConnection();
-
-        $this->_stmt = $mysqli->prepare($sql);
-
-        if ($this->_stmt === false || $mysqli->errno) {
-            /**
-             * @see Zend_Db_Statement_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Statement/Mysqli/Exception.php';
-            throw new Zend_Db_Statement_Mysqli_Exception("Mysqli prepare error: " . $mysqli->error, $mysqli->errno);
-        }
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Mysqli_Exception
-     */
-    protected function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        return true;
-    }
-
-    /**
-     * Closes the cursor and the statement.
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        if ($this->_stmt) {
-            $r = $this->_stmt->close();
-            $this->_stmt = null;
-            return $r;
-        }
-        return false;
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     */
-    public function closeCursor()
-    {
-        if ($stmt = $this->_stmt) {
-            $mysqli = $this->_adapter->getConnection();
-            while ($mysqli->more_results()) {
-                $mysqli->next_result();
-            }
-            $this->_stmt->free_result();
-            return $this->_stmt->reset();
-        }
-        return false;
-    }
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     */
-    public function columnCount()
-    {
-        if (isset($this->_meta) && $this->_meta) {
-            return $this->_meta->field_count;
-        }
-        return 0;
-    }
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     */
-    public function errorCode()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-        return substr($this->_stmt->sqlstate, 0, 5);
-    }
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     */
-    public function errorInfo()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-        return array(
-            substr($this->_stmt->sqlstate, 0, 5),
-            $this->_stmt->errno,
-            $this->_stmt->error,
-        );
-    }
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Mysqli_Exception
-     */
-    public function _execute(array $params = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        // if no params were given as an argument to execute(),
-        // then default to the _bindParam array
-        if ($params === null) {
-            $params = $this->_bindParam;
-        }
-        // send $params as input parameters to the statement
-        if ($params) {
-            array_unshift($params, str_repeat('s', count($params)));
-            $stmtParams = array();
-            foreach ($params as $k => &$value) {
-                $stmtParams[$k] = &$value;
-            }
-            call_user_func_array(
-                array($this->_stmt, 'bind_param'),
-                $stmtParams
-                );
-        }
-
-        // execute the statement
-        $retval = $this->_stmt->execute();
-        if ($retval === false) {
-            /**
-             * @see Zend_Db_Statement_Mysqli_Exception
-             */
-            require_once 'Zend/Db/Statement/Mysqli/Exception.php';
-            throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement execute error : " . $this->_stmt->error, $this->_stmt->errno);
-        }
-
-
-        // retain metadata
-        if ($this->_meta === null) {
-            $this->_meta = $this->_stmt->result_metadata();
-            if ($this->_stmt->errno) {
-                /**
-                 * @see Zend_Db_Statement_Mysqli_Exception
-                 */
-                require_once 'Zend/Db/Statement/Mysqli/Exception.php';
-                throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement metadata error: " . $this->_stmt->error, $this->_stmt->errno);
-            }
-        }
-
-        // statements that have no result set do not return metadata
-        if ($this->_meta !== false) {
-
-            // get the column names that will result
-            $this->_keys = array();
-            foreach ($this->_meta->fetch_fields() as $col) {
-                $this->_keys[] = $this->_adapter->foldCase($col->name);
-            }
-
-            // set up a binding space for result variables
-            $this->_values = array_fill(0, count($this->_keys), null);
-
-            // set up references to the result binding space.
-            // just passing $this->_values in the call_user_func_array()
-            // below won't work, you need references.
-            $refs = array();
-            foreach ($this->_values as $i => &$f) {
-                $refs[$i] = &$f;
-            }
-
-            $this->_stmt->store_result();
-            // bind to the result variables
-            call_user_func_array(
-                array($this->_stmt, 'bind_result'),
-                $this->_values
-            );
-        }
-        return $retval;
-    }
-
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Mysqli_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-        // fetch the next result
-        $retval = $this->_stmt->fetch();
-        switch ($retval) {
-            case null: // end of data
-            case false: // error occurred
-                $this->_stmt->reset();
-                return false;
-            default:
-                // fallthrough
-        }
-
-        // make sure we have a fetch mode
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-
-        // dereference the result values, otherwise things like fetchAll()
-        // return the same values for every entry (because of the reference).
-        $values = array();
-        foreach ($this->_values as $key => $val) {
-            $values[] = $val;
-        }
-
-        $row = false;
-        switch ($style) {
-            case Zend_Db::FETCH_NUM:
-                $row = $values;
-                break;
-            case Zend_Db::FETCH_ASSOC:
-                $row = array_combine($this->_keys, $values);
-                break;
-            case Zend_Db::FETCH_BOTH:
-                $assoc = array_combine($this->_keys, $values);
-                $row = array_merge($values, $assoc);
-                break;
-            case Zend_Db::FETCH_OBJ:
-                $row = (object) array_combine($this->_keys, $values);
-                break;
-            case Zend_Db::FETCH_BOUND:
-                $assoc = array_combine($this->_keys, $values);
-                $row = array_merge($values, $assoc);
-                return $this->_fetchBound($row);
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Statement_Mysqli_Exception
-                 */
-                require_once 'Zend/Db/Statement/Mysqli/Exception.php';
-                throw new Zend_Db_Statement_Mysqli_Exception("Invalid fetch mode '$style' specified");
-                break;
-        }
-        return $row;
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Mysqli_Exception
-     */
-    public function nextRowset()
-    {
-        /**
-         * @see Zend_Db_Statement_Mysqli_Exception
-         */
-        require_once 'Zend/Db/Statement/Mysqli/Exception.php';
-        throw new Zend_Db_Statement_Mysqli_Exception(__FUNCTION__.'() is not implemented');
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     */
-    public function rowCount()
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-        $mysqli = $this->_adapter->getConnection();
-        return $mysqli->affected_rows;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Db/Statement/Mysqli/Exception.php b/airtime_mvc/library/Zend/Db/Statement/Mysqli/Exception.php
deleted file mode 100644
index a1c5ff8e7..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Mysqli/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Statement_Exception
- */
-require_once 'Zend/Db/Statement/Exception.php';
-
-/**
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Statement_Mysqli_Exception extends Zend_Db_Statement_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Statement/Oracle.php b/airtime_mvc/library/Zend/Db/Statement/Oracle.php
deleted file mode 100644
index 6aedc93d8..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Oracle.php
+++ /dev/null
@@ -1,577 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Oracle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement
- */
-require_once 'Zend/Db/Statement.php';
-
-/**
- * Extends for Oracle.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Oracle extends Zend_Db_Statement
-{
-
-    /**
-     * Column names.
-     */
-    protected $_keys;
-
-    /**
-     * Fetched result values.
-     */
-    protected $_values;
-
-    /**
-     * Check if LOB field are returned as string
-     * instead of OCI-Lob object
-     *
-     * @var boolean
-     */
-    protected $_lobAsString = false;
-
-    /**
-     * Activate/deactivate return of LOB as string
-     *
-     * @param string $lob_as_string
-     * @return Zend_Db_Statement_Oracle
-     */
-    public function setLobAsString($lob_as_string)
-    {
-        $this->_lobAsString = (bool) $lob_as_string;
-        return $this;
-    }
-
-    /**
-     * Return whether or not LOB are returned as string
-     *
-     * @return boolean
-     */
-    public function getLobAsString()
-    {
-        return $this->_lobAsString;
-    }
-
-    /**
-     * Prepares statement handle
-     *
-     * @param string $sql
-     * @return void
-     * @throws Zend_Db_Statement_Oracle_Exception
-     */
-    protected function _prepare($sql)
-    {
-        $connection = $this->_adapter->getConnection();
-        $this->_stmt = oci_parse($connection, $sql);
-        if (!$this->_stmt) {
-            /**
-             * @see Zend_Db_Statement_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception(oci_error($connection));
-        }
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    protected function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        // default value
-        if ($type === NULL) {
-            $type = SQLT_CHR;
-        }
-
-        // default value
-        if ($length === NULL) {
-            $length = -1;
-        }
-
-        $retval = @oci_bind_by_name($this->_stmt, $parameter, $variable, $length, $type);
-        if ($retval === false) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt));
-        }
-
-        return true;
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     */
-    public function closeCursor()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        oci_free_statement($this->_stmt);
-        $this->_stmt = false;
-        return true;
-    }
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     */
-    public function columnCount()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        return oci_num_fields($this->_stmt);
-    }
-
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     */
-    public function errorCode()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $error = oci_error($this->_stmt);
-
-        if (!$error) {
-            return false;
-        }
-
-        return $error['code'];
-    }
-
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     */
-    public function errorInfo()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $error = oci_error($this->_stmt);
-        if (!$error) {
-            return false;
-        }
-
-        if (isset($error['sqltext'])) {
-            return array(
-                $error['code'],
-                $error['message'],
-                $error['offset'],
-                $error['sqltext'],
-            );
-        } else {
-            return array(
-                $error['code'],
-                $error['message'],
-            );
-        }
-    }
-
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function _execute(array $params = null)
-    {
-        $connection = $this->_adapter->getConnection();
-
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if ($params !== null) {
-            if (!is_array($params)) {
-                $params = array($params);
-            }
-            $error = false;
-            foreach (array_keys($params) as $name) {
-                if (!@oci_bind_by_name($this->_stmt, $name, $params[$name], -1)) {
-                    $error = true;
-                    break;
-                }
-            }
-            if ($error) {
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt));
-            }
-        }
-
-        $retval = @oci_execute($this->_stmt, $this->_adapter->_getExecuteMode());
-        if ($retval === false) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt));
-        }
-
-        $this->_keys = Array();
-        if ($field_num = oci_num_fields($this->_stmt)) {
-            for ($i = 1; $i <= $field_num; $i++) {
-                $name = oci_field_name($this->_stmt, $i);
-                $this->_keys[] = $name;
-            }
-        }
-
-        $this->_values = Array();
-        if ($this->_keys) {
-            $this->_values = array_fill(0, count($this->_keys), null);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-
-        $lob_as_string = $this->getLobAsString() ? OCI_RETURN_LOBS : 0;
-
-        switch ($style) {
-            case Zend_Db::FETCH_NUM:
-                $row = oci_fetch_array($this->_stmt, OCI_NUM | OCI_RETURN_NULLS | $lob_as_string);
-                break;
-            case Zend_Db::FETCH_ASSOC:
-                $row = oci_fetch_array($this->_stmt, OCI_ASSOC | OCI_RETURN_NULLS | $lob_as_string);
-                break;
-            case Zend_Db::FETCH_BOTH:
-                $row = oci_fetch_array($this->_stmt, OCI_BOTH | OCI_RETURN_NULLS | $lob_as_string);
-                break;
-            case Zend_Db::FETCH_OBJ:
-                $row = oci_fetch_object($this->_stmt);
-                break;
-            case Zend_Db::FETCH_BOUND:
-                $row = oci_fetch_array($this->_stmt, OCI_BOTH | OCI_RETURN_NULLS | $lob_as_string);
-                if ($row !== false) {
-                    return $this->_fetchBound($row);
-                }
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                throw new Zend_Db_Statement_Oracle_Exception(
-                    array(
-                        'code'    => 'HYC00',
-                        'message' => "Invalid fetch mode '$style' specified"
-                    )
-                );
-                break;
-        }
-
-        if (! $row && $error = oci_error($this->_stmt)) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception($error);
-        }
-
-        if (is_array($row) && array_key_exists('zend_db_rownum', $row)) {
-            unset($row['zend_db_rownum']);
-        }
-
-        return $row;
-    }
-
-    /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchAll($style = null, $col = 0)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        // make sure we have a fetch mode
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-
-        $flags = OCI_FETCHSTATEMENT_BY_ROW;
-
-        switch ($style) {
-            case Zend_Db::FETCH_BOTH:
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                throw new Zend_Db_Statement_Oracle_Exception(
-                    array(
-                        'code'    => 'HYC00',
-                        'message' => "OCI8 driver does not support fetchAll(FETCH_BOTH), use fetch() in a loop instead"
-                    )
-                );
-                // notreached
-                $flags |= OCI_NUM;
-                $flags |= OCI_ASSOC;
-                break;
-            case Zend_Db::FETCH_NUM:
-                $flags |= OCI_NUM;
-                break;
-            case Zend_Db::FETCH_ASSOC:
-                $flags |= OCI_ASSOC;
-                break;
-            case Zend_Db::FETCH_OBJ:
-                break;
-            case Zend_Db::FETCH_COLUMN:
-                $flags = $flags &~ OCI_FETCHSTATEMENT_BY_ROW;
-                $flags |= OCI_FETCHSTATEMENT_BY_COLUMN;
-                $flags |= OCI_NUM;
-                break;
-            default:
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                throw new Zend_Db_Statement_Oracle_Exception(
-                    array(
-                        'code'    => 'HYC00',
-                        'message' => "Invalid fetch mode '$style' specified"
-                    )
-                );
-                break;
-        }
-
-        $result = Array();
-        if ($flags != OCI_FETCHSTATEMENT_BY_ROW) { /* not Zend_Db::FETCH_OBJ */
-            if (! ($rows = oci_fetch_all($this->_stmt, $result, 0, -1, $flags) )) {
-                if ($error = oci_error($this->_stmt)) {
-                    /**
-                     * @see Zend_Db_Adapter_Oracle_Exception
-                     */
-                    require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                    throw new Zend_Db_Statement_Oracle_Exception($error);
-                }
-                if (!$rows) {
-                    return array();
-                }
-            }
-            if ($style == Zend_Db::FETCH_COLUMN) {
-                $result = $result[$col];
-            }
-            foreach ($result as &$row) {
-                if (is_array($row) && array_key_exists('zend_db_rownum', $row)) {
-                    unset($row['zend_db_rownum']);
-                }
-            }
-        } else {
-            while (($row = oci_fetch_object($this->_stmt)) !== false) {
-                $result [] = $row;
-            }
-            if ($error = oci_error($this->_stmt)) {
-                /**
-                 * @see Zend_Db_Adapter_Oracle_Exception
-                 */
-                require_once 'Zend/Db/Statement/Oracle/Exception.php';
-                throw new Zend_Db_Statement_Oracle_Exception($error);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchColumn($col = 0)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if (!oci_fetch($this->_stmt)) {
-            // if no error, there is simply no record
-            if (!$error = oci_error($this->_stmt)) {
-                return false;
-            }
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception($error);
-        }
-
-        $data = oci_result($this->_stmt, $col+1); //1-based
-        if ($data === false) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt));
-        }
-
-        if ($this->getLobAsString()) {
-            // instanceof doesn't allow '-', we must use a temporary string
-            $type = 'OCI-Lob';
-            if ($data instanceof $type) {
-                $data = $data->read($data->size());
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $obj = oci_fetch_object($this->_stmt);
-
-        if ($error = oci_error($this->_stmt)) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception($error);
-        }
-
-        /* @todo XXX handle parameters */
-
-        return $obj;
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function nextRowset()
-    {
-        /**
-         * @see Zend_Db_Statement_Oracle_Exception
-         */
-        require_once 'Zend/Db/Statement/Oracle/Exception.php';
-        throw new Zend_Db_Statement_Oracle_Exception(
-            array(
-                'code'    => 'HYC00',
-                'message' => 'Optional feature not implemented'
-            )
-        );
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function rowCount()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $num_rows = oci_num_rows($this->_stmt);
-
-        if ($num_rows === false) {
-            /**
-             * @see Zend_Db_Adapter_Oracle_Exception
-             */
-            require_once 'Zend/Db/Statement/Oracle/Exception.php';
-            throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt));
-        }
-
-        return $num_rows;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Oracle/Exception.php b/airtime_mvc/library/Zend/Db/Statement/Oracle/Exception.php
deleted file mode 100644
index 215477bbc..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Oracle/Exception.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Statement_Exception
- */
-require_once 'Zend/Db/Statement/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Statement_Oracle_Exception extends Zend_Db_Statement_Exception
-{
-   protected $message = 'Unknown exception';
-   protected $code = 0;
-
-   function __construct($error = null, $code = 0)
-   {
-       if (is_array($error)) {
-            if (!isset($error['offset'])) {
-                $this->message = $error['code']." ".$error['message'];
-            } else {
-                $this->message = $error['code']." ".$error['message']." ";
-                $this->message .= substr($error['sqltext'], 0, $error['offset']);
-                $this->message .= "*";
-                $this->message .= substr($error['sqltext'], $error['offset']);
-            }
-            $this->code = $error['code'];
-       }
-       if (!$this->code && $code) {
-           $this->code = $code;
-       }
-   }
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Statement/Pdo.php b/airtime_mvc/library/Zend/Db/Statement/Pdo.php
deleted file mode 100644
index 775e40103..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Pdo.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pdo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement
- */
-require_once 'Zend/Db/Statement.php';
-
-/**
- * Proxy class to wrap a PDOStatement object.
- * Matches the interface of PDOStatement.  All methods simply proxy to the
- * matching method in PDOStatement.  PDOExceptions thrown by PDOStatement
- * are re-thrown as Zend_Db_Statement_Exception.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggregate
-{
-
-    /**
-     * @var int
-     */
-    protected $_fetchMode = PDO::FETCH_ASSOC;
-
-    /**
-     * Prepare a string SQL statement and create a statement object.
-     *
-     * @param string $sql
-     * @return void
-     * @throws Zend_Db_Statement_Exception
-     */
-    protected function _prepare($sql)
-    {
-        try {
-            $this->_stmt = $this->_adapter->getConnection()->prepare($sql);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Bind a column of the statement result set to a PHP variable.
-     *
-     * @param string $column Name the column in the result set, either by
-     *                       position or by name.
-     * @param mixed  $param  Reference to the PHP variable containing the value.
-     * @param mixed  $type   OPTIONAL
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindColumn($column, &$param, $type = null)
-    {
-        try {
-            if ($type === null) {
-                return $this->_stmt->bindColumn($column, $param);
-            } else {
-                return $this->_stmt->bindColumn($column, $param, $type);
-            }
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    protected function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        try {
-            if ($type === null) {
-                if (is_bool($variable)) {
-                    $type = PDO::PARAM_BOOL;
-                } elseif ($variable === null) {
-                    $type = PDO::PARAM_NULL;
-                } elseif (is_integer($variable)) {
-                    $type = PDO::PARAM_INT;
-                } else {
-                    $type = PDO::PARAM_STR;
-                }
-            }
-            return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Binds a value to a parameter.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $value     Scalar value to bind to the parameter.
-     * @param mixed $type      OPTIONAL Datatype of the parameter.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindValue($parameter, $value, $type = null)
-    {
-        if (is_string($parameter) && $parameter[0] != ':') {
-            $parameter = ":$parameter";
-        }
-
-        $this->_bindParam[$parameter] = $value;
-
-        try {
-            if ($type === null) {
-                return $this->_stmt->bindValue($parameter, $value);
-            } else {
-                return $this->_stmt->bindValue($parameter, $value, $type);
-            }
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function closeCursor()
-    {
-        try {
-            return $this->_stmt->closeCursor();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function columnCount()
-    {
-        try {
-            return $this->_stmt->columnCount();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorCode()
-    {
-        try {
-            return $this->_stmt->errorCode();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorInfo()
-    {
-        try {
-            return $this->_stmt->errorInfo();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function _execute(array $params = null)
-    {
-        try {
-            if ($params !== null) {
-                return $this->_stmt->execute($params);
-            } else {
-                return $this->_stmt->execute();
-            }
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), (int) $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-        try {
-            return $this->_stmt->fetch($style, $cursor, $offset);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Required by IteratorAggregate interface
-     *
-     * @return IteratorIterator
-     */
-    public function getIterator()
-    {
-        return new IteratorIterator($this->_stmt);
-    }
-
-    /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchAll($style = null, $col = null)
-    {
-        if ($style === null) {
-            $style = $this->_fetchMode;
-        }
-        try {
-            if ($style == PDO::FETCH_COLUMN) {
-                if ($col === null) {
-                    $col = 0;
-                }
-                return $this->_stmt->fetchAll($style, $col);
-            } else {
-                return $this->_stmt->fetchAll($style);
-            }
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchColumn($col = 0)
-    {
-        try {
-            return $this->_stmt->fetchColumn($col);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        try {
-            return $this->_stmt->fetchObject($class, $config);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Retrieve a statement attribute.
-     *
-     * @param integer $key Attribute name.
-     * @return mixed      Attribute value.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function getAttribute($key)
-    {
-        try {
-            return $this->_stmt->getAttribute($key);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Returns metadata for a column in a result set.
-     *
-     * @param int $column
-     * @return mixed
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function getColumnMeta($column)
-    {
-        try {
-            return $this->_stmt->getColumnMeta($column);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function nextRowset()
-    {
-        try {
-            return $this->_stmt->nextRowset();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function rowCount()
-    {
-        try {
-            return $this->_stmt->rowCount();
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Set a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @param mixed  $val Attribute value.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setAttribute($key, $val)
-    {
-        try {
-            return $this->_stmt->setAttribute($key, $val);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Set the default fetch mode for this statement.
-     *
-     * @param int   $mode The fetch mode.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        $this->_fetchMode = $mode;
-        try {
-            return $this->_stmt->setFetchMode($mode);
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Pdo/Ibm.php b/airtime_mvc/library/Zend/Db/Statement/Pdo/Ibm.php
deleted file mode 100644
index 52eb23b88..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Pdo/Ibm.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ibm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement_Pdo
- */
-require_once 'Zend/Db/Statement/Pdo.php';
-
-/**
- * Proxy class to wrap a PDOStatement object for IBM Databases.
- * Matches the interface of PDOStatement.  All methods simply proxy to the
- * matching method in PDOStatement.  PDOExceptions thrown by PDOStatement
- * are re-thrown as Zend_Db_Statement_Exception.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo
-{
-    /**
-    * Returns an array containing all of the result set rows.
-    *
-    * Behaves like parent, but if limit()
-    * is used, the final result removes the extra column
-    * 'zend_db_rownum'
-    *
-    * @param int $style OPTIONAL Fetch mode.
-    * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-    * @return array Collection of rows, each in a format by the fetch mode.
-    * @throws Zend_Db_Statement_Exception
-    */
-    public function fetchAll($style = null, $col = null)
-    {
-        $data = parent::fetchAll($style, $col);
-        $results = array();
-        $remove = $this->_adapter->foldCase('ZEND_DB_ROWNUM');
-
-        foreach ($data as $row) {
-            if (is_array($row) && array_key_exists($remove, $row)) {
-                unset($row[$remove]);
-            }
-            $results[] = $row;
-        }
-        return $results;
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        try {
-            if (($type === null) && ($length === null) && ($options === null)) {
-                return $this->_stmt->bindParam($parameter, $variable);
-            } else {
-                return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options);
-            }
-        } catch (PDOException $e) {
-            require_once 'Zend/Db/Statement/Exception.php';
-            throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Db/Statement/Pdo/Oci.php b/airtime_mvc/library/Zend/Db/Statement/Pdo/Oci.php
deleted file mode 100644
index 49d82c287..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Pdo/Oci.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Oci.php 21105 2010-02-19 21:27:09Z mikaelkael $
- */
-
-/**
- * @see Zend_Db_Statement_Pdo
- */
-require_once 'Zend/Db/Statement/Pdo.php';
-
-/**
- * Proxy class to wrap a PDOStatement object for IBM Databases.
- * Matches the interface of PDOStatement.  All methods simply proxy to the
- * matching method in PDOStatement.  PDOExceptions thrown by PDOStatement
- * are re-thrown as Zend_Db_Statement_Exception.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo
-{
-
-    /**
-    * Returns an array containing all of the result set rows.
-    *
-    * Behaves like parent, but if limit()
-    * is used, the final result removes the extra column
-    * 'zend_db_rownum'
-    *
-    * @param int $style OPTIONAL Fetch mode.
-    * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-    * @return array Collection of rows, each in a format by the fetch mode.
-    * @throws Zend_Db_Statement_Exception
-    */
-    public function fetchAll($style = null, $col = null)
-    {
-        $data = parent::fetchAll($style, $col);
-        $results = array();
-        $remove = $this->_adapter->foldCase('zend_db_rownum');
-
-        foreach ($data as $row) {
-            if (is_array($row) && array_key_exists($remove, $row)) {
-                unset($row[$remove]);
-            }
-            $results[] = $row;
-        }
-        return $results;
-    }
-
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        $row = parent::fetch($style, $cursor, $offset);
-
-        $remove = $this->_adapter->foldCase('zend_db_rownum');
-        if (is_array($row) && array_key_exists($remove, $row)) {
-            unset($row[$remove]);
-        }
-
-        return $row;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Db/Statement/Sqlsrv.php b/airtime_mvc/library/Zend/Db/Statement/Sqlsrv.php
deleted file mode 100644
index 0460991b8..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Sqlsrv.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqlsrv.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement
- */
-require_once 'Zend/Db/Statement.php';
-
-/**
- * Extends for Microsoft SQL Server Driver for PHP
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement
-{
-
-    /**
-     * The connection_stmt object original string.
-     */
-    protected $_originalSQL;
-
-    /**
-     * Column names.
-     */
-    protected $_keys;
-
-    /**
-     * Query executed
-     */
-    protected $_executed = false;
-
-    /**
-     * Prepares statement handle
-     *
-     * @param string $sql
-     * @return void
-     * @throws Zend_Db_Statement_Sqlsrv_Exception
-     */
-    protected function _prepare($sql)
-    {
-        $connection = $this->_adapter->getConnection();
-
-        $this->_stmt = sqlsrv_prepare($connection, $sql);
-
-        if (!$this->_stmt) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
-        }
-
-        $this->_originalSQL = $sql;
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    protected function _bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        //Sql server doesn't support bind by name
-        return true;
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     */
-    public function closeCursor()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        sqlsrv_free_stmt($this->_stmt);
-        $this->_stmt = false;
-        return true;
-    }
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     */
-    public function columnCount()
-    {
-        if ($this->_stmt && $this->_executed) {
-            return sqlsrv_num_fields($this->_stmt);
-        }
-
-        return 0;
-    }
-
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     */
-    public function errorCode()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $error = sqlsrv_errors();
-        if (!$error) {
-            return false;
-        }
-
-        return $error[0]['code'];
-    }
-
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     */
-    public function errorInfo()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $error = sqlsrv_errors();
-        if (!$error) {
-            return false;
-        }
-
-        return array(
-            $error[0]['code'],
-            $error[0]['message'],
-        );
-    }
-
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function _execute(array $params = null)
-    {
-        $connection = $this->_adapter->getConnection();
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if ($params !== null) {
-            if (!is_array($params)) {
-                $params = array($params);
-            }
-            $error = false;
-
-            // make all params passed by reference
-            $params_ = array();
-            $temp    = array();
-            $i       = 1;
-            foreach ($params as $param) {
-                $temp[$i]  = $param;
-                $params_[] = &$temp[$i];
-                $i++;
-            }
-            $params = $params_;
-        }
-
-        $this->_stmt = sqlsrv_query($connection, $this->_originalSQL, $params);
-
-        if (!$this->_stmt) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
-        }
-
-        $this->_executed = true;
-
-        return (!$this->_stmt);
-    }
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param  int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param  int $cursor OPTIONAL Absolute, relative, or other.
-     * @param  int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if (null === $style) {
-            $style = $this->_fetchMode;
-        }
-
-        $values = sqlsrv_fetch_array($this->_stmt, SQLSRV_FETCH_ASSOC);
-
-        if (!$values && (null !== $error = sqlsrv_errors())) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception($error);
-        }
-
-        if (null === $values) {
-            return null;
-        }
-
-        if (!$this->_keys) {
-            foreach ($values as $key => $value) {
-                $this->_keys[] = $this->_adapter->foldCase($key);
-            }
-        }
-
-        $values = array_values($values);
-
-        $row = false;
-        switch ($style) {
-            case Zend_Db::FETCH_NUM:
-                $row = $values;
-                break;
-            case Zend_Db::FETCH_ASSOC:
-                $row = array_combine($this->_keys, $values);
-                break;
-            case Zend_Db::FETCH_BOTH:
-                $assoc = array_combine($this->_keys, $values);
-                $row   = array_merge($values, $assoc);
-                break;
-            case Zend_Db::FETCH_OBJ:
-                $row = (object) array_combine($this->_keys, $values);
-                break;
-            case Zend_Db::FETCH_BOUND:
-                $assoc = array_combine($this->_keys, $values);
-                $row   = array_merge($values, $assoc);
-                $row   = $this->_fetchBound($row);
-                break;
-            default:
-                require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-                throw new Zend_Db_Statement_Sqlsrv_Exception("Invalid fetch mode '$style' specified");
-                break;
-        }
-
-        return $row;
-    }
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchColumn($col = 0)
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if (!sqlsrv_fetch($this->_stmt)) {
-            if (null !== $error = sqlsrv_errors()) {
-                require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-                throw new Zend_Db_Statement_Sqlsrv_Exception($error);
-            }
-
-            // If no error, there is simply no record
-            return false;
-        }
-
-        $data = sqlsrv_get_field($this->_stmt, $col); //0-based
-        if ($data === false) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
-        }
-
-        return $data;
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        $obj = sqlsrv_fetch_object($this->_stmt);
-
-        if ($error = sqlsrv_errors()) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception($error);
-        }
-
-        /* @todo XXX handle parameters */
-
-        if (null === $obj) {
-            return false;
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Returns metadata for a column in a result set.
-     *
-     * @param int $column
-     * @return mixed
-     * @throws Zend_Db_Statement_Sqlsrv_Exception
-     */
-    public function getColumnMeta($column)
-    {
-        $fields = sqlsrv_field_metadata($this->_stmt);
-
-        if (!$fields) {
-            throw new Zend_Db_Statement_Sqlsrv_Exception('Column metadata can not be fetched');
-        }
-
-        if (!isset($fields[$column])) {
-            throw new Zend_Db_Statement_Sqlsrv_Exception('Column index does not exist in statement');
-        }
-
-        return $fields[$column];
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function nextRowset()
-    {
-        if (sqlsrv_next_result($this->_stmt) === false) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
-        }
-
-        //else - moved to next (or there are no more rows)
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function rowCount()
-    {
-        if (!$this->_stmt) {
-            return false;
-        }
-
-        if (!$this->_executed) {
-            return 0;
-        }
-
-        $num_rows = sqlsrv_rows_affected($this->_stmt);
-
-        // Strict check is necessary; 0 is a valid return value
-        if ($num_rows === false) {
-            require_once 'Zend/Db/Statement/Sqlsrv/Exception.php';
-            throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors());
-        }
-
-        return $num_rows;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Statement/Sqlsrv/Exception.php b/airtime_mvc/library/Zend/Db/Statement/Sqlsrv/Exception.php
deleted file mode 100644
index 4c0fb095b..000000000
--- a/airtime_mvc/library/Zend/Db/Statement/Sqlsrv/Exception.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement_Exception
- */
-require_once 'Zend/Db/Statement/Exception.php';
-
-/**
- * @package    Zend_Db
- * @subpackage Statement
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Statement_Sqlsrv_Exception extends Zend_Db_Statement_Exception
-{
-    /**
-     * Constructor
-     *
-     * If $message is an array, the assumption is that the return value of
-     * sqlsrv_errors() was provided. If so, it then retrieves the most recent
-     * error from that stack, and sets the message and code based on it.
-     *
-     * @param null|array|string $message
-     * @param null|int $code
-     */
-    public function __construct($message = null, $code = 0)
-    {
-       if (is_array($message)) {
-            // Error should be array of errors
-            // We only need first one (?)
-            if (isset($message[0])) {
-                $message = $message[0];
-            }
-
-            $code    = (int)    $message['code'];
-            $message = (string) $message['message'];
-       }
-       parent::__construct($message, $code);
-   }
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Table.php b/airtime_mvc/library/Zend/Db/Table.php
deleted file mode 100644
index 1ff00e91e..000000000
--- a/airtime_mvc/library/Zend/Db/Table.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once 'Zend/Db/Table/Abstract.php';
-
-/**
- * @see Zend_Db_Table_Definition
- */
-require_once 'Zend/Db/Table/Definition.php';
-
-/**
- * Class for SQL table interface.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table extends Zend_Db_Table_Abstract
-{
-
-    /**
-     * __construct() - For concrete implementation of Zend_Db_Table
-     *
-     * @param string|array $config string can reference a Zend_Registry key for a db adapter
-     *                             OR it can reference the name of a table
-     * @param array|Zend_Db_Table_Definition $definition
-     */
-    public function __construct($config = array(), $definition = null)
-    {
-        if ($definition !== null && is_array($definition)) {
-            $definition = new Zend_Db_Table_Definition($definition);
-        }
-
-        if (is_string($config)) {
-            if (Zend_Registry::isRegistered($config)) {
-                trigger_error(__CLASS__ . '::' . __METHOD__ . '(\'registryName\') is not valid usage of Zend_Db_Table, '
-                    . 'try extending Zend_Db_Table_Abstract in your extending classes.',
-                    E_USER_NOTICE
-                    );
-                $config = array(self::ADAPTER => $config);
-            } else {
-                // process this as table with or without a definition
-                if ($definition instanceof Zend_Db_Table_Definition
-                    && $definition->hasTableConfig($config)) {
-                    // this will have DEFINITION_CONFIG_NAME & DEFINITION
-                    $config = $definition->getTableConfig($config);
-                } else {
-                    $config = array(self::NAME => $config);
-                }
-            }
-        }
-
-        parent::__construct($config);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Abstract.php b/airtime_mvc/library/Zend/Db/Table/Abstract.php
deleted file mode 100644
index 24235eb01..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Abstract.php
+++ /dev/null
@@ -1,1510 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21079 2010-02-18 18:15:49Z tech13 $
- */
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Adapter/Abstract.php';
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once 'Zend/Db/Select.php';
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * Class for SQL table interface.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Table_Abstract
-{
-
-    const ADAPTER          = 'db';
-    const DEFINITION        = 'definition';
-    const DEFINITION_CONFIG_NAME = 'definitionConfigName';
-    const SCHEMA           = 'schema';
-    const NAME             = 'name';
-    const PRIMARY          = 'primary';
-    const COLS             = 'cols';
-    const METADATA         = 'metadata';
-    const METADATA_CACHE   = 'metadataCache';
-    const METADATA_CACHE_IN_CLASS = 'metadataCacheInClass';
-    const ROW_CLASS        = 'rowClass';
-    const ROWSET_CLASS     = 'rowsetClass';
-    const REFERENCE_MAP    = 'referenceMap';
-    const DEPENDENT_TABLES = 'dependentTables';
-    const SEQUENCE         = 'sequence';
-
-    const COLUMNS          = 'columns';
-    const REF_TABLE_CLASS  = 'refTableClass';
-    const REF_COLUMNS      = 'refColumns';
-    const ON_DELETE        = 'onDelete';
-    const ON_UPDATE        = 'onUpdate';
-
-    const CASCADE          = 'cascade';
-    const RESTRICT         = 'restrict';
-    const SET_NULL         = 'setNull';
-
-    const DEFAULT_NONE     = 'defaultNone';
-    const DEFAULT_CLASS    = 'defaultClass';
-    const DEFAULT_DB       = 'defaultDb';
-
-    const SELECT_WITH_FROM_PART    = true;
-    const SELECT_WITHOUT_FROM_PART = false;
-
-    /**
-     * Default Zend_Db_Adapter_Abstract object.
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected static $_defaultDb;
-
-    /**
-     * Optional Zend_Db_Table_Definition object
-     *
-     * @var unknown_type
-     */
-    protected $_definition = null;
-
-    /**
-     * Optional definition config name used in concrete implementation
-     *
-     * @var string
-     */
-    protected $_definitionConfigName = null;
-
-    /**
-     * Default cache for information provided by the adapter's describeTable() method.
-     *
-     * @var Zend_Cache_Core
-     */
-    protected static $_defaultMetadataCache = null;
-
-    /**
-     * Zend_Db_Adapter_Abstract object.
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_db;
-
-    /**
-     * The schema name (default null means current schema)
-     *
-     * @var array
-     */
-    protected $_schema = null;
-
-    /**
-     * The table name.
-     *
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * The table column names derived from Zend_Db_Adapter_Abstract::describeTable().
-     *
-     * @var array
-     */
-    protected $_cols;
-
-    /**
-     * The primary key column or columns.
-     * A compound key should be declared as an array.
-     * You may declare a single-column primary key
-     * as a string.
-     *
-     * @var mixed
-     */
-    protected $_primary = null;
-
-    /**
-     * If your primary key is a compound key, and one of the columns uses
-     * an auto-increment or sequence-generated value, set _identity
-     * to the ordinal index in the $_primary array for that column.
-     * Note this index is the position of the column in the primary key,
-     * not the position of the column in the table.  The primary key
-     * array is 1-based.
-     *
-     * @var integer
-     */
-    protected $_identity = 1;
-
-    /**
-     * Define the logic for new values in the primary key.
-     * May be a string, boolean true, or boolean false.
-     *
-     * @var mixed
-     */
-    protected $_sequence = true;
-
-    /**
-     * Information provided by the adapter's describeTable() method.
-     *
-     * @var array
-     */
-    protected $_metadata = array();
-
-    /**
-     * Cache for information provided by the adapter's describeTable() method.
-     *
-     * @var Zend_Cache_Core
-     */
-    protected $_metadataCache = null;
-
-    /**
-     * Flag: whether or not to cache metadata in the class
-     * @var bool
-     */
-    protected $_metadataCacheInClass = true;
-
-    /**
-     * Classname for row
-     *
-     * @var string
-     */
-    protected $_rowClass = 'Zend_Db_Table_Row';
-
-    /**
-     * Classname for rowset
-     *
-     * @var string
-     */
-    protected $_rowsetClass = 'Zend_Db_Table_Rowset';
-
-    /**
-     * Associative array map of declarative referential integrity rules.
-     * This array has one entry per foreign key in the current table.
-     * Each key is a mnemonic name for one reference rule.
-     *
-     * Each value is also an associative array, with the following keys:
-     * - columns       = array of names of column(s) in the child table.
-     * - refTableClass = class name of the parent table.
-     * - refColumns    = array of names of column(s) in the parent table,
-     *                   in the same order as those in the 'columns' entry.
-     * - onDelete      = "cascade" means that a delete in the parent table also
-     *                   causes a delete of referencing rows in the child table.
-     * - onUpdate      = "cascade" means that an update of primary key values in
-     *                   the parent table also causes an update of referencing
-     *                   rows in the child table.
-     *
-     * @var array
-     */
-    protected $_referenceMap = array();
-
-    /**
-     * Simple array of class names of tables that are "children" of the current
-     * table, in other words tables that contain a foreign key to this one.
-     * Array elements are not table names; they are class names of classes that
-     * extend Zend_Db_Table_Abstract.
-     *
-     * @var array
-     */
-    protected $_dependentTables = array();
-
-
-    protected $_defaultSource = self::DEFAULT_NONE;
-    protected $_defaultValues = array();
-
-    /**
-     * Constructor.
-     *
-     * Supported params for $config are:
-     * - db              = user-supplied instance of database connector,
-     *                     or key name of registry instance.
-     * - name            = table name.
-     * - primary         = string or array of primary key(s).
-     * - rowClass        = row class name.
-     * - rowsetClass     = rowset class name.
-     * - referenceMap    = array structure to declare relationship
-     *                     to parent tables.
-     * - dependentTables = array of child tables.
-     * - metadataCache   = cache for information from adapter describeTable().
-     *
-     * @param  mixed $config Array of user-specified config options, or just the Db Adapter.
-     * @return void
-     */
-    public function __construct($config = array())
-    {
-        /**
-         * Allow a scalar argument to be the Adapter object or Registry key.
-         */
-        if (!is_array($config)) {
-            $config = array(self::ADAPTER => $config);
-        }
-
-        if ($config) {
-            $this->setOptions($config);
-        }
-
-        $this->_setup();
-        $this->init();
-    }
-
-    /**
-     * setOptions()
-     *
-     * @param array $options
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $key => $value) {
-            switch ($key) {
-                case self::ADAPTER:
-                    $this->_setAdapter($value);
-                    break;
-                case self::DEFINITION:
-                    $this->setDefinition($value);
-                    break;
-                case self::DEFINITION_CONFIG_NAME:
-                    $this->setDefinitionConfigName($value);
-                    break;
-                case self::SCHEMA:
-                    $this->_schema = (string) $value;
-                    break;
-                case self::NAME:
-                    $this->_name = (string) $value;
-                    break;
-                case self::PRIMARY:
-                    $this->_primary = (array) $value;
-                    break;
-                case self::ROW_CLASS:
-                    $this->setRowClass($value);
-                    break;
-                case self::ROWSET_CLASS:
-                    $this->setRowsetClass($value);
-                    break;
-                case self::REFERENCE_MAP:
-                    $this->setReferences($value);
-                    break;
-                case self::DEPENDENT_TABLES:
-                    $this->setDependentTables($value);
-                    break;
-                case self::METADATA_CACHE:
-                    $this->_setMetadataCache($value);
-                    break;
-                case self::METADATA_CACHE_IN_CLASS:
-                    $this->setMetadataCacheInClass($value);
-                    break;
-                case self::SEQUENCE:
-                    $this->_setSequence($value);
-                    break;
-                default:
-                    // ignore unrecognized configuration directive
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * setDefinition()
-     *
-     * @param Zend_Db_Table_Definition $definition
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setDefinition(Zend_Db_Table_Definition $definition)
-    {
-        $this->_definition = $definition;
-        return $this;
-    }
-
-    /**
-     * getDefinition()
-     *
-     * @return Zend_Db_Table_Definition|null
-     */
-    public function getDefinition()
-    {
-        return $this->_definition;
-    }
-
-    /**
-     * setDefinitionConfigName()
-     *
-     * @param string $definition
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setDefinitionConfigName($definitionConfigName)
-    {
-        $this->_definitionConfigName = $definitionConfigName;
-        return $this;
-    }
-
-    /**
-     * getDefinitionConfigName()
-     *
-     * @return string
-     */
-    public function getDefinitionConfigName()
-    {
-        return $this->_definitionConfigName;
-    }
-
-    /**
-     * @param  string $classname
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    public function setRowClass($classname)
-    {
-        $this->_rowClass = (string) $classname;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRowClass()
-    {
-        return $this->_rowClass;
-    }
-
-    /**
-     * @param  string $classname
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    public function setRowsetClass($classname)
-    {
-        $this->_rowsetClass = (string) $classname;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRowsetClass()
-    {
-        return $this->_rowsetClass;
-    }
-
-    /**
-     * Add a reference to the reference map
-     *
-     * @param string $ruleKey
-     * @param string|array $columns
-     * @param string $refTableClass
-     * @param string|array $refColumns
-     * @param string $onDelete
-     * @param string $onUpdate
-     * @return Zend_Db_Table_Abstract
-     */
-    public function addReference($ruleKey, $columns, $refTableClass, $refColumns,
-                                 $onDelete = null, $onUpdate = null)
-    {
-        $reference = array(self::COLUMNS         => (array) $columns,
-                           self::REF_TABLE_CLASS => $refTableClass,
-                           self::REF_COLUMNS     => (array) $refColumns);
-
-        if (!empty($onDelete)) {
-            $reference[self::ON_DELETE] = $onDelete;
-        }
-
-        if (!empty($onUpdate)) {
-            $reference[self::ON_UPDATE] = $onUpdate;
-        }
-
-        $this->_referenceMap[$ruleKey] = $reference;
-
-        return $this;
-    }
-
-    /**
-     * @param array $referenceMap
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    public function setReferences(array $referenceMap)
-    {
-        $this->_referenceMap = $referenceMap;
-
-        return $this;
-    }
-
-    /**
-     * @param string $tableClassname
-     * @param string $ruleKey OPTIONAL
-     * @return array
-     * @throws Zend_Db_Table_Exception
-     */
-    public function getReference($tableClassname, $ruleKey = null)
-    {
-        $thisClass = get_class($this);
-        if ($thisClass === 'Zend_Db_Table') {
-            $thisClass = $this->_definitionConfigName;
-        }
-        $refMap = $this->_getReferenceMapNormalized();
-        if ($ruleKey !== null) {
-            if (!isset($refMap[$ruleKey])) {
-                require_once "Zend/Db/Table/Exception.php";
-                throw new Zend_Db_Table_Exception("No reference rule \"$ruleKey\" from table $thisClass to table $tableClassname");
-            }
-            if ($refMap[$ruleKey][self::REF_TABLE_CLASS] != $tableClassname) {
-                require_once "Zend/Db/Table/Exception.php";
-                throw new Zend_Db_Table_Exception("Reference rule \"$ruleKey\" does not reference table $tableClassname");
-            }
-            return $refMap[$ruleKey];
-        }
-        foreach ($refMap as $reference) {
-            if ($reference[self::REF_TABLE_CLASS] == $tableClassname) {
-                return $reference;
-            }
-        }
-        require_once "Zend/Db/Table/Exception.php";
-        throw new Zend_Db_Table_Exception("No reference from table $thisClass to table $tableClassname");
-    }
-
-    /**
-     * @param  array $dependentTables
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    public function setDependentTables(array $dependentTables)
-    {
-        $this->_dependentTables = $dependentTables;
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDependentTables()
-    {
-        return $this->_dependentTables;
-    }
-
-    /**
-     * set the defaultSource property - this tells the table class where to find default values
-     *
-     * @param string $defaultSource
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setDefaultSource($defaultSource = self::DEFAULT_NONE)
-    {
-        if (!in_array($defaultSource, array(self::DEFAULT_CLASS, self::DEFAULT_DB, self::DEFAULT_NONE))) {
-            $defaultSource = self::DEFAULT_NONE;
-        }
-
-        $this->_defaultSource = $defaultSource;
-        return $this;
-    }
-
-    /**
-     * returns the default source flag that determines where defaultSources come from
-     *
-     * @return unknown
-     */
-    public function getDefaultSource()
-    {
-        return $this->_defaultSource;
-    }
-
-    /**
-     * set the default values for the table class
-     *
-     * @param array $defaultValues
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setDefaultValues(Array $defaultValues)
-    {
-        foreach ($defaultValues as $defaultName => $defaultValue) {
-            if (array_key_exists($defaultName, $this->_metadata)) {
-                $this->_defaultValues[$defaultName] = $defaultValue;
-            }
-        }
-        return $this;
-    }
-
-    public function getDefaultValues()
-    {
-        return $this->_defaultValues;
-    }
-
-
-    /**
-     * Sets the default Zend_Db_Adapter_Abstract for all Zend_Db_Table objects.
-     *
-     * @param  mixed $db Either an Adapter object, or a string naming a Registry key
-     * @return void
-     */
-    public static function setDefaultAdapter($db = null)
-    {
-        self::$_defaultDb = self::_setupAdapter($db);
-    }
-
-    /**
-     * Gets the default Zend_Db_Adapter_Abstract for all Zend_Db_Table objects.
-     *
-     * @return Zend_Db_Adapter_Abstract or null
-     */
-    public static function getDefaultAdapter()
-    {
-        return self::$_defaultDb;
-    }
-
-    /**
-     * @param  mixed $db Either an Adapter object, or a string naming a Registry key
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    protected function _setAdapter($db)
-    {
-        $this->_db = self::_setupAdapter($db);
-        return $this;
-    }
-
-    /**
-     * Gets the Zend_Db_Adapter_Abstract for this particular Zend_Db_Table object.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function getAdapter()
-    {
-        return $this->_db;
-    }
-
-    /**
-     * @param  mixed $db Either an Adapter object, or a string naming a Registry key
-     * @return Zend_Db_Adapter_Abstract
-     * @throws Zend_Db_Table_Exception
-     */
-    protected static function _setupAdapter($db)
-    {
-        if ($db === null) {
-            return null;
-        }
-        if (is_string($db)) {
-            require_once 'Zend/Registry.php';
-            $db = Zend_Registry::get($db);
-        }
-        if (!$db instanceof Zend_Db_Adapter_Abstract) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception('Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored');
-        }
-        return $db;
-    }
-
-    /**
-     * Sets the default metadata cache for information returned by Zend_Db_Adapter_Abstract::describeTable().
-     *
-     * If $defaultMetadataCache is null, then no metadata cache is used by default.
-     *
-     * @param  mixed $metadataCache Either a Cache object, or a string naming a Registry key
-     * @return void
-     */
-    public static function setDefaultMetadataCache($metadataCache = null)
-    {
-        self::$_defaultMetadataCache = self::_setupMetadataCache($metadataCache);
-    }
-
-    /**
-     * Gets the default metadata cache for information returned by Zend_Db_Adapter_Abstract::describeTable().
-     *
-     * @return Zend_Cache_Core or null
-     */
-    public static function getDefaultMetadataCache()
-    {
-        return self::$_defaultMetadataCache;
-    }
-
-    /**
-     * Sets the metadata cache for information returned by Zend_Db_Adapter_Abstract::describeTable().
-     *
-     * If $metadataCache is null, then no metadata cache is used. Since there is no opportunity to reload metadata
-     * after instantiation, this method need not be public, particularly because that it would have no effect
-     * results in unnecessary API complexity. To configure the metadata cache, use the metadataCache configuration
-     * option for the class constructor upon instantiation.
-     *
-     * @param  mixed $metadataCache Either a Cache object, or a string naming a Registry key
-     * @return Zend_Db_Table_Abstract Provides a fluent interface
-     */
-    protected function _setMetadataCache($metadataCache)
-    {
-        $this->_metadataCache = self::_setupMetadataCache($metadataCache);
-        return $this;
-    }
-
-    /**
-     * Gets the metadata cache for information returned by Zend_Db_Adapter_Abstract::describeTable().
-     *
-     * @return Zend_Cache_Core or null
-     */
-    public function getMetadataCache()
-    {
-        return $this->_metadataCache;
-    }
-
-    /**
-     * Indicate whether metadata should be cached in the class for the duration
-     * of the instance
-     *
-     * @param  bool $flag
-     * @return Zend_Db_Table_Abstract
-     */
-    public function setMetadataCacheInClass($flag)
-    {
-        $this->_metadataCacheInClass = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag indicating if metadata should be cached for duration of
-     * instance
-     *
-     * @return bool
-     */
-    public function metadataCacheInClass()
-    {
-        return $this->_metadataCacheInClass;
-    }
-
-    /**
-     * @param mixed $metadataCache Either a Cache object, or a string naming a Registry key
-     * @return Zend_Cache_Core
-     * @throws Zend_Db_Table_Exception
-     */
-    protected static function _setupMetadataCache($metadataCache)
-    {
-        if ($metadataCache === null) {
-            return null;
-        }
-        if (is_string($metadataCache)) {
-            require_once 'Zend/Registry.php';
-            $metadataCache = Zend_Registry::get($metadataCache);
-        }
-        if (!$metadataCache instanceof Zend_Cache_Core) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception('Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored');
-        }
-        return $metadataCache;
-    }
-
-    /**
-     * Sets the sequence member, which defines the behavior for generating
-     * primary key values in new rows.
-     * - If this is a string, then the string names the sequence object.
-     * - If this is boolean true, then the key uses an auto-incrementing
-     *   or identity mechanism.
-     * - If this is boolean false, then the key is user-defined.
-     *   Use this for natural keys, for example.
-     *
-     * @param mixed $sequence
-     * @return Zend_Db_Table_Adapter_Abstract Provides a fluent interface
-     */
-    protected function _setSequence($sequence)
-    {
-        $this->_sequence = $sequence;
-
-        return $this;
-    }
-
-    /**
-     * Turnkey for initialization of a table object.
-     * Calls other protected methods for individual tasks, to make it easier
-     * for a subclass to override part of the setup logic.
-     *
-     * @return void
-     */
-    protected function _setup()
-    {
-        $this->_setupDatabaseAdapter();
-        $this->_setupTableName();
-    }
-
-    /**
-     * Initialize database adapter.
-     *
-     * @return void
-     */
-    protected function _setupDatabaseAdapter()
-    {
-        if (! $this->_db) {
-            $this->_db = self::getDefaultAdapter();
-            if (!$this->_db instanceof Zend_Db_Adapter_Abstract) {
-                require_once 'Zend/Db/Table/Exception.php';
-                throw new Zend_Db_Table_Exception('No adapter found for ' . get_class($this));
-            }
-        }
-    }
-
-    /**
-     * Initialize table and schema names.
-     *
-     * If the table name is not set in the class definition,
-     * use the class name itself as the table name.
-     *
-     * A schema name provided with the table name (e.g., "schema.table") overrides
-     * any existing value for $this->_schema.
-     *
-     * @return void
-     */
-    protected function _setupTableName()
-    {
-        if (! $this->_name) {
-            $this->_name = get_class($this);
-        } else if (strpos($this->_name, '.')) {
-            list($this->_schema, $this->_name) = explode('.', $this->_name);
-        }
-    }
-
-    /**
-     * Initializes metadata.
-     *
-     * If metadata cannot be loaded from cache, adapter's describeTable() method is called to discover metadata
-     * information. Returns true if and only if the metadata are loaded from cache.
-     *
-     * @return boolean
-     * @throws Zend_Db_Table_Exception
-     */
-    protected function _setupMetadata()
-    {
-        if ($this->metadataCacheInClass() && (count($this->_metadata) > 0)) {
-            return true;
-        }
-
-        // Assume that metadata will be loaded from cache
-        $isMetadataFromCache = true;
-
-        // If $this has no metadata cache but the class has a default metadata cache
-        if (null === $this->_metadataCache && null !== self::$_defaultMetadataCache) {
-            // Make $this use the default metadata cache of the class
-            $this->_setMetadataCache(self::$_defaultMetadataCache);
-        }
-
-        // If $this has a metadata cache
-        if (null !== $this->_metadataCache) {
-            // Define the cache identifier where the metadata are saved
-
-            //get db configuration
-            $dbConfig = $this->_db->getConfig();
-
-            // Define the cache identifier where the metadata are saved
-            $cacheId = md5( // port:host/dbname:schema.table (based on availabilty)
-                (isset($dbConfig['options']['port']) ? ':'.$dbConfig['options']['port'] : null)
-                . (isset($dbConfig['options']['host']) ? ':'.$dbConfig['options']['host'] : null)
-                . '/'.$dbConfig['dbname'].':'.$this->_schema.'.'.$this->_name
-                );
-        }
-
-        // If $this has no metadata cache or metadata cache misses
-        if (null === $this->_metadataCache || !($metadata = $this->_metadataCache->load($cacheId))) {
-            // Metadata are not loaded from cache
-            $isMetadataFromCache = false;
-            // Fetch metadata from the adapter's describeTable() method
-            $metadata = $this->_db->describeTable($this->_name, $this->_schema);
-            // If $this has a metadata cache, then cache the metadata
-            if (null !== $this->_metadataCache && !$this->_metadataCache->save($metadata, $cacheId)) {
-                trigger_error('Failed saving metadata to metadataCache', E_USER_NOTICE);
-            }
-        }
-
-        // Assign the metadata to $this
-        $this->_metadata = $metadata;
-
-        // Return whether the metadata were loaded from cache
-        return $isMetadataFromCache;
-    }
-
-    /**
-     * Retrieve table columns
-     *
-     * @return array
-     */
-    protected function _getCols()
-    {
-        if (null === $this->_cols) {
-            $this->_setupMetadata();
-            $this->_cols = array_keys($this->_metadata);
-        }
-        return $this->_cols;
-    }
-
-    /**
-     * Initialize primary key from metadata.
-     * If $_primary is not defined, discover primary keys
-     * from the information returned by describeTable().
-     *
-     * @return void
-     * @throws Zend_Db_Table_Exception
-     */
-    protected function _setupPrimaryKey()
-    {
-        if (!$this->_primary) {
-            $this->_setupMetadata();
-            $this->_primary = array();
-            foreach ($this->_metadata as $col) {
-                if ($col['PRIMARY']) {
-                    $this->_primary[ $col['PRIMARY_POSITION'] ] = $col['COLUMN_NAME'];
-                    if ($col['IDENTITY']) {
-                        $this->_identity = $col['PRIMARY_POSITION'];
-                    }
-                }
-            }
-            // if no primary key was specified and none was found in the metadata
-            // then throw an exception.
-            if (empty($this->_primary)) {
-                require_once 'Zend/Db/Table/Exception.php';
-                throw new Zend_Db_Table_Exception('A table must have a primary key, but none was found');
-            }
-        } else if (!is_array($this->_primary)) {
-            $this->_primary = array(1 => $this->_primary);
-        } else if (isset($this->_primary[0])) {
-            array_unshift($this->_primary, null);
-            unset($this->_primary[0]);
-        }
-
-        $cols = $this->_getCols();
-        if (! array_intersect((array) $this->_primary, $cols) == (array) $this->_primary) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception("Primary key column(s) ("
-                . implode(',', (array) $this->_primary)
-                . ") are not columns in this table ("
-                . implode(',', $cols)
-                . ")");
-        }
-
-        $primary    = (array) $this->_primary;
-        $pkIdentity = $primary[(int) $this->_identity];
-
-        /**
-         * Special case for PostgreSQL: a SERIAL key implicitly uses a sequence
-         * object whose name is "<table>_<column>_seq".
-         */
-        if ($this->_sequence === true && $this->_db instanceof Zend_Db_Adapter_Pdo_Pgsql) {
-            $this->_sequence = $this->_db->quoteIdentifier("{$this->_name}_{$pkIdentity}_seq");
-            if ($this->_schema) {
-                $this->_sequence = $this->_db->quoteIdentifier($this->_schema) . '.' . $this->_sequence;
-            }
-        }
-    }
-
-    /**
-     * Returns a normalized version of the reference map
-     *
-     * @return array
-     */
-    protected function _getReferenceMapNormalized()
-    {
-        $referenceMapNormalized = array();
-
-        foreach ($this->_referenceMap as $rule => $map) {
-
-            $referenceMapNormalized[$rule] = array();
-
-            foreach ($map as $key => $value) {
-                switch ($key) {
-
-                    // normalize COLUMNS and REF_COLUMNS to arrays
-                    case self::COLUMNS:
-                    case self::REF_COLUMNS:
-                        if (!is_array($value)) {
-                            $referenceMapNormalized[$rule][$key] = array($value);
-                        } else {
-                            $referenceMapNormalized[$rule][$key] = $value;
-                        }
-                        break;
-
-                    // other values are copied as-is
-                    default:
-                        $referenceMapNormalized[$rule][$key] = $value;
-                        break;
-                }
-            }
-        }
-
-        return $referenceMapNormalized;
-    }
-
-    /**
-     * Initialize object
-     *
-     * Called from {@link __construct()} as final step of object instantiation.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Returns table information.
-     *
-     * You can elect to return only a part of this information by supplying its key name,
-     * otherwise all information is returned as an array.
-     *
-     * @param  $key The specific info part to return OPTIONAL
-     * @return mixed
-     */
-    public function info($key = null)
-    {
-        $this->_setupPrimaryKey();
-
-        $info = array(
-            self::SCHEMA           => $this->_schema,
-            self::NAME             => $this->_name,
-            self::COLS             => $this->_getCols(),
-            self::PRIMARY          => (array) $this->_primary,
-            self::METADATA         => $this->_metadata,
-            self::ROW_CLASS        => $this->getRowClass(),
-            self::ROWSET_CLASS     => $this->getRowsetClass(),
-            self::REFERENCE_MAP    => $this->_referenceMap,
-            self::DEPENDENT_TABLES => $this->_dependentTables,
-            self::SEQUENCE         => $this->_sequence
-        );
-
-        if ($key === null) {
-            return $info;
-        }
-
-        if (!array_key_exists($key, $info)) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception('There is no table information for the key "' . $key . '"');
-        }
-
-        return $info[$key];
-    }
-
-    /**
-     * Returns an instance of a Zend_Db_Table_Select object.
-     *
-     * @param bool $withFromPart Whether or not to include the from part of the select based on the table
-     * @return Zend_Db_Table_Select
-     */
-    public function select($withFromPart = self::SELECT_WITHOUT_FROM_PART)
-    {
-        require_once 'Zend/Db/Table/Select.php';
-        $select = new Zend_Db_Table_Select($this);
-        if ($withFromPart == self::SELECT_WITH_FROM_PART) {
-            $select->from($this->info(self::NAME), Zend_Db_Table_Select::SQL_WILDCARD, $this->info(self::SCHEMA));
-        }
-        return $select;
-    }
-
-    /**
-     * Inserts a new row.
-     *
-     * @param  array  $data  Column-value pairs.
-     * @return mixed         The primary key of the row inserted.
-     */
-    public function insert(array $data)
-    {
-        $this->_setupPrimaryKey();
-
-        /**
-         * Zend_Db_Table assumes that if you have a compound primary key
-         * and one of the columns in the key uses a sequence,
-         * it's the _first_ column in the compound key.
-         */
-        $primary = (array) $this->_primary;
-        $pkIdentity = $primary[(int)$this->_identity];
-
-        /**
-         * If this table uses a database sequence object and the data does not
-         * specify a value, then get the next ID from the sequence and add it
-         * to the row.  We assume that only the first column in a compound
-         * primary key takes a value from a sequence.
-         */
-        if (is_string($this->_sequence) && !isset($data[$pkIdentity])) {
-            $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence);
-        }
-
-        /**
-         * If the primary key can be generated automatically, and no value was
-         * specified in the user-supplied data, then omit it from the tuple.
-         */
-        if (array_key_exists($pkIdentity, $data) && $data[$pkIdentity] === null) {
-            unset($data[$pkIdentity]);
-        }
-
-        /**
-         * INSERT the new row.
-         */
-        $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name;
-        $this->_db->insert($tableSpec, $data);
-
-        /**
-         * Fetch the most recent ID generated by an auto-increment
-         * or IDENTITY column, unless the user has specified a value,
-         * overriding the auto-increment mechanism.
-         */
-        if ($this->_sequence === true && !isset($data[$pkIdentity])) {
-            $data[$pkIdentity] = $this->_db->lastInsertId();
-        }
-
-        /**
-         * Return the primary key value if the PK is a single column,
-         * else return an associative array of the PK column/value pairs.
-         */
-        $pkData = array_intersect_key($data, array_flip($primary));
-        if (count($primary) == 1) {
-            reset($pkData);
-            return current($pkData);
-        }
-
-        return $pkData;
-    }
-
-    /**
-     * Check if the provided column is an identity of the table
-     *
-     * @param  string $column
-     * @throws Zend_Db_Table_Exception
-     * @return boolean
-     */
-    public function isIdentity($column)
-    {
-        $this->_setupPrimaryKey();
-
-        if (!isset($this->_metadata[$column])) {
-            /**
-             * @see Zend_Db_Table_Exception
-             */
-            require_once 'Zend/Db/Table/Exception.php';
-
-            throw new Zend_Db_Table_Exception('Column "' . $column . '" not found in table.');
-        }
-
-        return (bool) $this->_metadata[$column]['IDENTITY'];
-    }
-
-    /**
-     * Updates existing rows.
-     *
-     * @param  array        $data  Column-value pairs.
-     * @param  array|string $where An SQL WHERE clause, or an array of SQL WHERE clauses.
-     * @return int          The number of rows updated.
-     */
-    public function update(array $data, $where)
-    {
-        $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name;
-        return $this->_db->update($tableSpec, $data, $where);
-    }
-
-    /**
-     * Called by a row object for the parent table's class during save() method.
-     *
-     * @param  string $parentTableClassname
-     * @param  array  $oldPrimaryKey
-     * @param  array  $newPrimaryKey
-     * @return int
-     */
-    public function _cascadeUpdate($parentTableClassname, array $oldPrimaryKey, array $newPrimaryKey)
-    {
-        $this->_setupMetadata();
-        $rowsAffected = 0;
-        foreach ($this->_getReferenceMapNormalized() as $map) {
-            if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_UPDATE])) {
-                switch ($map[self::ON_UPDATE]) {
-                    case self::CASCADE:
-                        $newRefs = array();
-                        $where = array();
-                        for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) {
-                            $col = $this->_db->foldCase($map[self::COLUMNS][$i]);
-                            $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]);
-                            if (array_key_exists($refCol, $newPrimaryKey)) {
-                                $newRefs[$col] = $newPrimaryKey[$refCol];
-                            }
-                            $type = $this->_metadata[$col]['DATA_TYPE'];
-                            $where[] = $this->_db->quoteInto(
-                                $this->_db->quoteIdentifier($col, true) . ' = ?',
-                                $oldPrimaryKey[$refCol], $type);
-                        }
-                        $rowsAffected += $this->update($newRefs, $where);
-                        break;
-                    default:
-                        // no action
-                        break;
-                }
-            }
-        }
-        return $rowsAffected;
-    }
-
-    /**
-     * Deletes existing rows.
-     *
-     * @param  array|string $where SQL WHERE clause(s).
-     * @return int          The number of rows deleted.
-     */
-    public function delete($where)
-    {
-        $tableSpec = ($this->_schema ? $this->_schema . '.' : '') . $this->_name;
-        return $this->_db->delete($tableSpec, $where);
-    }
-
-    /**
-     * Called by parent table's class during delete() method.
-     *
-     * @param  string $parentTableClassname
-     * @param  array  $primaryKey
-     * @return int    Number of affected rows
-     */
-    public function _cascadeDelete($parentTableClassname, array $primaryKey)
-    {
-        $this->_setupMetadata();
-        $rowsAffected = 0;
-        foreach ($this->_getReferenceMapNormalized() as $map) {
-            if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) {
-                switch ($map[self::ON_DELETE]) {
-                    case self::CASCADE:
-                        $where = array();
-                        for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) {
-                            $col = $this->_db->foldCase($map[self::COLUMNS][$i]);
-                            $refCol = $this->_db->foldCase($map[self::REF_COLUMNS][$i]);
-                            $type = $this->_metadata[$col]['DATA_TYPE'];
-                            $where[] = $this->_db->quoteInto(
-                                $this->_db->quoteIdentifier($col, true) . ' = ?',
-                                $primaryKey[$refCol], $type);
-                        }
-                        $rowsAffected += $this->delete($where);
-                        break;
-                    default:
-                        // no action
-                        break;
-                }
-            }
-        }
-        return $rowsAffected;
-    }
-
-    /**
-     * Fetches rows by primary key.  The argument specifies one or more primary
-     * key value(s).  To find multiple rows by primary key, the argument must
-     * be an array.
-     *
-     * This method accepts a variable number of arguments.  If the table has a
-     * multi-column primary key, the number of arguments must be the same as
-     * the number of columns in the primary key.  To find multiple rows in a
-     * table with a multi-column primary key, each argument must be an array
-     * with the same number of elements.
-     *
-     * The find() method always returns a Rowset object, even if only one row
-     * was found.
-     *
-     * @param  mixed $key The value(s) of the primary keys.
-     * @return Zend_Db_Table_Rowset_Abstract Row(s) matching the criteria.
-     * @throws Zend_Db_Table_Exception
-     */
-    public function find()
-    {
-        $this->_setupPrimaryKey();
-        $args = func_get_args();
-        $keyNames = array_values((array) $this->_primary);
-
-        if (count($args) < count($keyNames)) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception("Too few columns for the primary key");
-        }
-
-        if (count($args) > count($keyNames)) {
-            require_once 'Zend/Db/Table/Exception.php';
-            throw new Zend_Db_Table_Exception("Too many columns for the primary key");
-        }
-
-        $whereList = array();
-        $numberTerms = 0;
-        foreach ($args as $keyPosition => $keyValues) {
-            $keyValuesCount = count($keyValues);
-            // Coerce the values to an array.
-            // Don't simply typecast to array, because the values
-            // might be Zend_Db_Expr objects.
-            if (!is_array($keyValues)) {
-                $keyValues = array($keyValues);
-            }
-            if ($numberTerms == 0) {
-                $numberTerms = $keyValuesCount;
-            } else if ($keyValuesCount != $numberTerms) {
-                require_once 'Zend/Db/Table/Exception.php';
-                throw new Zend_Db_Table_Exception("Missing value(s) for the primary key");
-            }
-            $keyValues = array_values($keyValues);
-            for ($i = 0; $i < $keyValuesCount; ++$i) {
-                if (!isset($whereList[$i])) {
-                    $whereList[$i] = array();
-                }
-                $whereList[$i][$keyPosition] = $keyValues[$i];
-            }
-        }
-
-        $whereClause = null;
-        if (count($whereList)) {
-            $whereOrTerms = array();
-            $tableName = $this->_db->quoteTableAs($this->_name, null, true);
-            foreach ($whereList as $keyValueSets) {
-                $whereAndTerms = array();
-                foreach ($keyValueSets as $keyPosition => $keyValue) {
-                    $type = $this->_metadata[$keyNames[$keyPosition]]['DATA_TYPE'];
-                    $columnName = $this->_db->quoteIdentifier($keyNames[$keyPosition], true);
-                    $whereAndTerms[] = $this->_db->quoteInto(
-                        $tableName . '.' . $columnName . ' = ?',
-                        $keyValue, $type);
-                }
-                $whereOrTerms[] = '(' . implode(' AND ', $whereAndTerms) . ')';
-            }
-            $whereClause = '(' . implode(' OR ', $whereOrTerms) . ')';
-        }
-
-        // issue ZF-5775 (empty where clause should return empty rowset)
-        if ($whereClause == null) {
-            $rowsetClass = $this->getRowsetClass();
-            if (!class_exists($rowsetClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($rowsetClass);
-            }
-            return new $rowsetClass(array('table' => $this, 'rowClass' => $this->getRowClass(), 'stored' => true));
-        }
-
-        return $this->fetchAll($whereClause);
-    }
-
-    /**
-     * Fetches all rows.
-     *
-     * Honors the Zend_Db_Adapter fetch mode.
-     *
-     * @param string|array|Zend_Db_Table_Select $where  OPTIONAL An SQL WHERE clause or Zend_Db_Table_Select object.
-     * @param string|array                      $order  OPTIONAL An SQL ORDER clause.
-     * @param int                               $count  OPTIONAL An SQL LIMIT count.
-     * @param int                               $offset OPTIONAL An SQL LIMIT offset.
-     * @return Zend_Db_Table_Rowset_Abstract The row results per the Zend_Db_Adapter fetch mode.
-     */
-    public function fetchAll($where = null, $order = null, $count = null, $offset = null)
-    {
-        if (!($where instanceof Zend_Db_Table_Select)) {
-            $select = $this->select();
-
-            if ($where !== null) {
-                $this->_where($select, $where);
-            }
-
-            if ($order !== null) {
-                $this->_order($select, $order);
-            }
-
-            if ($count !== null || $offset !== null) {
-                $select->limit($count, $offset);
-            }
-
-        } else {
-            $select = $where;
-        }
-
-        $rows = $this->_fetch($select);
-
-        $data  = array(
-            'table'    => $this,
-            'data'     => $rows,
-            'readOnly' => $select->isReadOnly(),
-            'rowClass' => $this->getRowClass(),
-            'stored'   => true
-        );
-
-        $rowsetClass = $this->getRowsetClass();
-        if (!class_exists($rowsetClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($rowsetClass);
-        }
-        return new $rowsetClass($data);
-    }
-
-    /**
-     * Fetches one row in an object of type Zend_Db_Table_Row_Abstract,
-     * or returns null if no row matches the specified criteria.
-     *
-     * @param string|array|Zend_Db_Table_Select $where  OPTIONAL An SQL WHERE clause or Zend_Db_Table_Select object.
-     * @param string|array                      $order  OPTIONAL An SQL ORDER clause.
-     * @return Zend_Db_Table_Row_Abstract|null The row results per the
-     *     Zend_Db_Adapter fetch mode, or null if no row found.
-     */
-    public function fetchRow($where = null, $order = null)
-    {
-        if (!($where instanceof Zend_Db_Table_Select)) {
-            $select = $this->select();
-
-            if ($where !== null) {
-                $this->_where($select, $where);
-            }
-
-            if ($order !== null) {
-                $this->_order($select, $order);
-            }
-
-            $select->limit(1);
-
-        } else {
-            $select = $where->limit(1);
-        }
-
-        $rows = $this->_fetch($select);
-
-        if (count($rows) == 0) {
-            return null;
-        }
-
-        $data = array(
-            'table'   => $this,
-            'data'     => $rows[0],
-            'readOnly' => $select->isReadOnly(),
-            'stored'  => true
-        );
-
-        $rowClass = $this->getRowClass();
-        if (!class_exists($rowClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($rowClass);
-        }
-        return new $rowClass($data);
-    }
-
-    /**
-     * Fetches a new blank row (not from the database).
-     *
-     * @return Zend_Db_Table_Row_Abstract
-     * @deprecated since 0.9.3 - use createRow() instead.
-     */
-    public function fetchNew()
-    {
-        return $this->createRow();
-    }
-
-    /**
-     * Fetches a new blank row (not from the database).
-     *
-     * @param  array $data OPTIONAL data to populate in the new row.
-     * @param  string $defaultSource OPTIONAL flag to force default values into new row
-     * @return Zend_Db_Table_Row_Abstract
-     */
-    public function createRow(array $data = array(), $defaultSource = null)
-    {
-        $cols     = $this->_getCols();
-        $defaults = array_combine($cols, array_fill(0, count($cols), null));
-
-        // nothing provided at call-time, take the class value
-        if ($defaultSource == null) {
-            $defaultSource = $this->_defaultSource;
-        }
-
-        if (!in_array($defaultSource, array(self::DEFAULT_CLASS, self::DEFAULT_DB, self::DEFAULT_NONE))) {
-            $defaultSource = self::DEFAULT_NONE;
-        }
-
-        if ($defaultSource == self::DEFAULT_DB) {
-            foreach ($this->_metadata as $metadataName => $metadata) {
-                if (($metadata['DEFAULT'] != null) &&
-                    ($metadata['NULLABLE'] !== true || ($metadata['NULLABLE'] === true && isset($this->_defaultValues[$metadataName]) && $this->_defaultValues[$metadataName] === true)) &&
-                    (!(isset($this->_defaultValues[$metadataName]) && $this->_defaultValues[$metadataName] === false))) {
-                    $defaults[$metadataName] = $metadata['DEFAULT'];
-                }
-            }
-        } elseif ($defaultSource == self::DEFAULT_CLASS && $this->_defaultValues) {
-            foreach ($this->_defaultValues as $defaultName => $defaultValue) {
-                if (array_key_exists($defaultName, $defaults)) {
-                    $defaults[$defaultName] = $defaultValue;
-                }
-            }
-        }
-
-        $config = array(
-            'table'    => $this,
-            'data'     => $defaults,
-            'readOnly' => false,
-            'stored'   => false
-        );
-
-        $rowClass = $this->getRowClass();
-        if (!class_exists($rowClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($rowClass);
-        }
-        $row = new $rowClass($config);
-        $row->setFromArray($data);
-        return $row;
-    }
-
-    /**
-     * Generate WHERE clause from user-supplied string or array
-     *
-     * @param  string|array $where  OPTIONAL An SQL WHERE clause.
-     * @return Zend_Db_Table_Select
-     */
-    protected function _where(Zend_Db_Table_Select $select, $where)
-    {
-        $where = (array) $where;
-
-        foreach ($where as $key => $val) {
-            // is $key an int?
-            if (is_int($key)) {
-                // $val is the full condition
-                $select->where($val);
-            } else {
-                // $key is the condition with placeholder,
-                // and $val is quoted into the condition
-                $select->where($key, $val);
-            }
-        }
-
-        return $select;
-    }
-
-    /**
-     * Generate ORDER clause from user-supplied string or array
-     *
-     * @param  string|array $order  OPTIONAL An SQL ORDER clause.
-     * @return Zend_Db_Table_Select
-     */
-    protected function _order(Zend_Db_Table_Select $select, $order)
-    {
-        if (!is_array($order)) {
-            $order = array($order);
-        }
-
-        foreach ($order as $val) {
-            $select->order($val);
-        }
-
-        return $select;
-    }
-
-    /**
-     * Support method for fetching rows.
-     *
-     * @param  Zend_Db_Table_Select $select  query options.
-     * @return array An array containing the row results in FETCH_ASSOC mode.
-     */
-    protected function _fetch(Zend_Db_Table_Select $select)
-    {
-        $stmt = $this->_db->query($select);
-        $data = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
-        return $data;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Definition.php b/airtime_mvc/library/Zend/Db/Table/Definition.php
deleted file mode 100644
index 30e601a5b..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Definition.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for SQL table interface.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Definition
-{
-
-    /**
-     * @var array
-     */
-    protected $_tableConfigs = array();
-
-    /**
-     * __construct()
-     *
-     * @param array|Zend_Config $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        } elseif (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * setConfig()
-     *
-     * @param Zend_Config $config
-     * @return Zend_Db_Table_Definition
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->setOptions($config->toArray());
-        return $this;
-    }
-
-    /**
-     * setOptions()
-     *
-     * @param array $options
-     * @return Zend_Db_Table_Definition
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $this->setTableConfig($optionName, $optionValue);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $tableName
-     * @param array  $tableConfig
-     * @return Zend_Db_Table_Definition
-     */
-    public function setTableConfig($tableName, array $tableConfig)
-    {
-        // @todo logic here
-        $tableConfig[Zend_Db_Table::DEFINITION_CONFIG_NAME] = $tableName;
-        $tableConfig[Zend_Db_Table::DEFINITION] = $this;
-
-        if (!isset($tableConfig[Zend_Db_Table::NAME])) {
-            $tableConfig[Zend_Db_Table::NAME] = $tableName;
-        }
-
-        $this->_tableConfigs[$tableName] = $tableConfig;
-        return $this;
-    }
-
-    /**
-     * getTableConfig()
-     *
-     * @param string $tableName
-     * @return array
-     */
-    public function getTableConfig($tableName)
-    {
-        return $this->_tableConfigs[$tableName];
-    }
-
-    /**
-     * removeTableConfig()
-     *
-     * @param string $tableName
-     */
-    public function removeTableConfig($tableName)
-    {
-        unset($this->_tableConfigs[$tableName]);
-    }
-
-    /**
-     * hasTableConfig()
-     *
-     * @param string $tableName
-     * @return bool
-     */
-    public function hasTableConfig($tableName)
-    {
-        return (isset($this->_tableConfigs[$tableName]));
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Exception.php b/airtime_mvc/library/Zend/Db/Table/Exception.php
deleted file mode 100644
index 7916b8499..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Exception
- */
-require_once 'Zend/Db/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Exception extends Zend_Db_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Table/Row.php b/airtime_mvc/library/Zend/Db/Table/Row.php
deleted file mode 100644
index 435776a51..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Row.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Table_Row_Abstract
- */
-require_once 'Zend/Db/Table/Row/Abstract.php';
-
-
-/**
- * Reference concrete class that extends Zend_Db_Table_Row_Abstract.
- * Developers may also create their own classes that extend the abstract class.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Row extends Zend_Db_Table_Row_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Row/Abstract.php b/airtime_mvc/library/Zend/Db/Table/Row/Abstract.php
deleted file mode 100644
index 944f4382f..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Row/Abstract.php
+++ /dev/null
@@ -1,1198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21102 2010-02-19 21:13:37Z ralph $
- */
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
-{
-
-    /**
-     * The data for each column in the row (column_name => value).
-     * The keys must match the physical names of columns in the
-     * table for which this row is defined.
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * This is set to a copy of $_data when the data is fetched from
-     * a database, specified as a new tuple in the constructor, or
-     * when dirty data is posted to the database with save().
-     *
-     * @var array
-     */
-    protected $_cleanData = array();
-
-    /**
-     * Tracks columns where data has been updated. Allows more specific insert and
-     * update operations.
-     *
-     * @var array
-     */
-    protected $_modifiedFields = array();
-
-    /**
-     * Zend_Db_Table_Abstract parent class or instance.
-     *
-     * @var Zend_Db_Table_Abstract
-     */
-    protected $_table = null;
-
-    /**
-     * Connected is true if we have a reference to a live
-     * Zend_Db_Table_Abstract object.
-     * This is false after the Rowset has been deserialized.
-     *
-     * @var boolean
-     */
-    protected $_connected = true;
-
-    /**
-     * A row is marked read only if it contains columns that are not physically represented within
-     * the database schema (e.g. evaluated columns/Zend_Db_Expr columns). This can also be passed
-     * as a run-time config options as a means of protecting row data.
-     *
-     * @var boolean
-     */
-    protected $_readOnly = false;
-
-    /**
-     * Name of the class of the Zend_Db_Table_Abstract object.
-     *
-     * @var string
-     */
-    protected $_tableClass = null;
-
-    /**
-     * Primary row key(s).
-     *
-     * @var array
-     */
-    protected $_primary;
-
-    /**
-     * Constructor.
-     *
-     * Supported params for $config are:-
-     * - table       = class name or object of type Zend_Db_Table_Abstract
-     * - data        = values of columns in this row.
-     *
-     * @param  array $config OPTIONAL Array of user-specified config options.
-     * @return void
-     * @throws Zend_Db_Table_Row_Exception
-     */
-    public function __construct(array $config = array())
-    {
-        if (isset($config['table']) && $config['table'] instanceof Zend_Db_Table_Abstract) {
-            $this->_table = $config['table'];
-            $this->_tableClass = get_class($this->_table);
-        } elseif ($this->_tableClass !== null) {
-            $this->_table = $this->_getTableFromString($this->_tableClass);
-        }
-
-        if (isset($config['data'])) {
-            if (!is_array($config['data'])) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception('Data must be an array');
-            }
-            $this->_data = $config['data'];
-        }
-        if (isset($config['stored']) && $config['stored'] === true) {
-            $this->_cleanData = $this->_data;
-        }
-
-        if (isset($config['readOnly']) && $config['readOnly'] === true) {
-            $this->setReadOnly(true);
-        }
-
-        // Retrieve primary keys from table schema
-        if (($table = $this->_getTable())) {
-            $info = $table->info();
-            $this->_primary = (array) $info['primary'];
-        }
-
-        $this->init();
-    }
-
-    /**
-     * Transform a column name from the user-specified form
-     * to the physical form used in the database.
-     * You can override this method in a custom Row class
-     * to implement column name mappings, for example inflection.
-     *
-     * @param string $columnName Column name given.
-     * @return string The column name after transformation applied (none by default).
-     * @throws Zend_Db_Table_Row_Exception if the $columnName is not a string.
-     */
-    protected function _transformColumn($columnName)
-    {
-        if (!is_string($columnName)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('Specified column is not a string');
-        }
-        // Perform no transformation by default
-        return $columnName;
-    }
-
-    /**
-     * Retrieve row field value
-     *
-     * @param  string $columnName The user-specified column name.
-     * @return string             The corresponding column value.
-     * @throws Zend_Db_Table_Row_Exception if the $columnName is not a column in the row.
-     */
-    public function __get($columnName)
-    {
-        $columnName = $this->_transformColumn($columnName);
-        if (!array_key_exists($columnName, $this->_data)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row");
-        }
-        return $this->_data[$columnName];
-    }
-
-    /**
-     * Set row field value
-     *
-     * @param  string $columnName The column key.
-     * @param  mixed  $value      The value for the property.
-     * @return void
-     * @throws Zend_Db_Table_Row_Exception
-     */
-    public function __set($columnName, $value)
-    {
-        $columnName = $this->_transformColumn($columnName);
-        if (!array_key_exists($columnName, $this->_data)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row");
-        }
-        $this->_data[$columnName] = $value;
-        $this->_modifiedFields[$columnName] = true;
-    }
-
-    /**
-     * Unset row field value
-     *
-     * @param  string $columnName The column key.
-     * @return Zend_Db_Table_Row_Abstract
-     * @throws Zend_Db_Table_Row_Exception
-     */
-    public function __unset($columnName)
-    {
-        $columnName = $this->_transformColumn($columnName);
-        if (!array_key_exists($columnName, $this->_data)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row");
-        }
-        if ($this->isConnected() && in_array($columnName, $this->_table->info('primary'))) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is a primary key and should not be unset");
-        }
-        unset($this->_data[$columnName]);
-        return $this;
-    }
-
-    /**
-     * Test existence of row field
-     *
-     * @param  string  $columnName   The column key.
-     * @return boolean
-     */
-    public function __isset($columnName)
-    {
-        $columnName = $this->_transformColumn($columnName);
-        return array_key_exists($columnName, $this->_data);
-    }
-
-    /**
-     * Store table, primary key and data in serialized object
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_tableClass', '_primary', '_data', '_cleanData', '_readOnly' ,'_modifiedFields');
-    }
-
-    /**
-     * Setup to do on wakeup.
-     * A de-serialized Row should not be assumed to have access to a live
-     * database connection, so set _connected = false.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_connected = false;
-    }
-
-    /**
-     * Proxy to __isset
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return $this->__isset($offset);
-    }
-
-    /**
-     * Proxy to __get
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     * @return string
-     */
-     public function offsetGet($offset)
-     {
-         return $this->__get($offset);
-     }
-
-     /**
-      * Proxy to __set
-      * Required by the ArrayAccess implementation
-      *
-      * @param string $offset
-      * @param mixed $value
-      */
-     public function offsetSet($offset, $value)
-     {
-         $this->__set($offset, $value);
-     }
-
-     /**
-      * Proxy to __unset
-      * Required by the ArrayAccess implementation
-      *
-      * @param string $offset
-      */
-     public function offsetUnset($offset)
-     {
-         return $this->__unset($offset);
-     }
-
-    /**
-     * Initialize object
-     *
-     * Called from {@link __construct()} as final step of object instantiation.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Returns the table object, or null if this is disconnected row
-     *
-     * @return Zend_Db_Table_Abstract|null
-     */
-    public function getTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Set the table object, to re-establish a live connection
-     * to the database for a Row that has been de-serialized.
-     *
-     * @param Zend_Db_Table_Abstract $table
-     * @return boolean
-     * @throws Zend_Db_Table_Row_Exception
-     */
-    public function setTable(Zend_Db_Table_Abstract $table = null)
-    {
-        if ($table == null) {
-            $this->_table = null;
-            $this->_connected = false;
-            return false;
-        }
-
-        $tableClass = get_class($table);
-        if (! $table instanceof $this->_tableClass) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("The specified Table is of class $tableClass, expecting class to be instance of $this->_tableClass");
-        }
-
-        $this->_table = $table;
-        $this->_tableClass = $tableClass;
-
-        $info = $this->_table->info();
-
-        if ($info['cols'] != array_keys($this->_data)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('The specified Table does not have the same columns as the Row');
-        }
-
-        if (! array_intersect((array) $this->_primary, $info['primary']) == (array) $this->_primary) {
-
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("The specified Table '$tableClass' does not have the same primary key as the Row");
-        }
-
-        $this->_connected = true;
-        return true;
-    }
-
-    /**
-     * Query the class name of the Table object for which this
-     * Row was created.
-     *
-     * @return string
-     */
-    public function getTableClass()
-    {
-        return $this->_tableClass;
-    }
-
-    /**
-     * Test the connected status of the row.
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return $this->_connected;
-    }
-
-    /**
-     * Test the read-only status of the row.
-     *
-     * @return boolean
-     */
-    public function isReadOnly()
-    {
-        return $this->_readOnly;
-    }
-
-    /**
-     * Set the read-only status of the row.
-     *
-     * @param boolean $flag
-     * @return boolean
-     */
-    public function setReadOnly($flag)
-    {
-        $this->_readOnly = (bool) $flag;
-    }
-
-    /**
-     * Returns an instance of the parent table's Zend_Db_Table_Select object.
-     *
-     * @return Zend_Db_Table_Select
-     */
-    public function select()
-    {
-        return $this->getTable()->select();
-    }
-
-    /**
-     * Saves the properties to the database.
-     *
-     * This performs an intelligent insert/update, and reloads the
-     * properties with fresh data from the table on success.
-     *
-     * @return mixed The primary key value(s), as an associative array if the
-     *     key is compound, or a scalar if the key is single-column.
-     */
-    public function save()
-    {
-        /**
-         * If the _cleanData array is empty,
-         * this is an INSERT of a new row.
-         * Otherwise it is an UPDATE.
-         */
-        if (empty($this->_cleanData)) {
-            return $this->_doInsert();
-        } else {
-            return $this->_doUpdate();
-        }
-    }
-
-    /**
-     * @return mixed The primary key value(s), as an associative array if the
-     *     key is compound, or a scalar if the key is single-column.
-     */
-    protected function _doInsert()
-    {
-        /**
-         * A read-only row cannot be saved.
-         */
-        if ($this->_readOnly === true) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('This row has been marked read-only');
-        }
-
-        /**
-         * Run pre-INSERT logic
-         */
-        $this->_insert();
-
-        /**
-         * Execute the INSERT (this may throw an exception)
-         */
-        $data = array_intersect_key($this->_data, $this->_modifiedFields);
-        $primaryKey = $this->_getTable()->insert($data);
-
-        /**
-         * Normalize the result to an array indexed by primary key column(s).
-         * The table insert() method may return a scalar.
-         */
-        if (is_array($primaryKey)) {
-            $newPrimaryKey = $primaryKey;
-        } else {
-            //ZF-6167 Use tempPrimaryKey temporary to avoid that zend encoding fails.
-            $tempPrimaryKey = (array) $this->_primary;
-            $newPrimaryKey = array(current($tempPrimaryKey) => $primaryKey);
-        }
-
-        /**
-         * Save the new primary key value in _data.  The primary key may have
-         * been generated by a sequence or auto-increment mechanism, and this
-         * merge should be done before the _postInsert() method is run, so the
-         * new values are available for logging, etc.
-         */
-        $this->_data = array_merge($this->_data, $newPrimaryKey);
-
-        /**
-         * Run post-INSERT logic
-         */
-        $this->_postInsert();
-
-        /**
-         * Update the _cleanData to reflect that the data has been inserted.
-         */
-        $this->_refresh();
-
-        return $primaryKey;
-    }
-
-    /**
-     * @return mixed The primary key value(s), as an associative array if the
-     *     key is compound, or a scalar if the key is single-column.
-     */
-    protected function _doUpdate()
-    {
-        /**
-         * A read-only row cannot be saved.
-         */
-        if ($this->_readOnly === true) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('This row has been marked read-only');
-        }
-
-        /**
-         * Get expressions for a WHERE clause
-         * based on the primary key value(s).
-         */
-        $where = $this->_getWhereQuery(false);
-
-        /**
-         * Run pre-UPDATE logic
-         */
-        $this->_update();
-
-        /**
-         * Compare the data to the modified fields array to discover
-         * which columns have been changed.
-         */
-        $diffData = array_intersect_key($this->_data, $this->_modifiedFields);
-
-        /**
-         * Were any of the changed columns part of the primary key?
-         */
-        $pkDiffData = array_intersect_key($diffData, array_flip((array)$this->_primary));
-
-        /**
-         * Execute cascading updates against dependent tables.
-         * Do this only if primary key value(s) were changed.
-         */
-        if (count($pkDiffData) > 0) {
-            $depTables = $this->_getTable()->getDependentTables();
-            if (!empty($depTables)) {
-                $pkNew = $this->_getPrimaryKey(true);
-                $pkOld = $this->_getPrimaryKey(false);
-                foreach ($depTables as $tableClass) {
-                    $t = $this->_getTableFromString($tableClass);
-                    $t->_cascadeUpdate($this->getTableClass(), $pkOld, $pkNew);
-                }
-            }
-        }
-
-        /**
-         * Execute the UPDATE (this may throw an exception)
-         * Do this only if data values were changed.
-         * Use the $diffData variable, so the UPDATE statement
-         * includes SET terms only for data values that changed.
-         */
-        if (count($diffData) > 0) {
-            $this->_getTable()->update($diffData, $where);
-        }
-
-        /**
-         * Run post-UPDATE logic.  Do this before the _refresh()
-         * so the _postUpdate() function can tell the difference
-         * between changed data and clean (pre-changed) data.
-         */
-        $this->_postUpdate();
-
-        /**
-         * Refresh the data just in case triggers in the RDBMS changed
-         * any columns.  Also this resets the _cleanData.
-         */
-        $this->_refresh();
-
-        /**
-         * Return the primary key value(s) as an array
-         * if the key is compound or a scalar if the key
-         * is a scalar.
-         */
-        $primaryKey = $this->_getPrimaryKey(true);
-        if (count($primaryKey) == 1) {
-            return current($primaryKey);
-        }
-
-        return $primaryKey;
-    }
-
-    /**
-     * Deletes existing rows.
-     *
-     * @return int The number of rows deleted.
-     */
-    public function delete()
-    {
-        /**
-         * A read-only row cannot be deleted.
-         */
-        if ($this->_readOnly === true) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('This row has been marked read-only');
-        }
-
-        $where = $this->_getWhereQuery();
-
-        /**
-         * Execute pre-DELETE logic
-         */
-        $this->_delete();
-
-        /**
-         * Execute cascading deletes against dependent tables
-         */
-        $depTables = $this->_getTable()->getDependentTables();
-        if (!empty($depTables)) {
-            $pk = $this->_getPrimaryKey();
-            foreach ($depTables as $tableClass) {
-                $t = $this->_getTableFromString($tableClass);
-                $t->_cascadeDelete($this->getTableClass(), $pk);
-            }
-        }
-
-        /**
-         * Execute the DELETE (this may throw an exception)
-         */
-        $result = $this->_getTable()->delete($where);
-
-        /**
-         * Execute post-DELETE logic
-         */
-        $this->_postDelete();
-
-        /**
-         * Reset all fields to null to indicate that the row is not there
-         */
-        $this->_data = array_combine(
-            array_keys($this->_data),
-            array_fill(0, count($this->_data), null)
-        );
-
-        return $result;
-    }
-
-    /**
-     * Returns the column/value data as an array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return (array)$this->_data;
-    }
-
-    /**
-     * Sets all data in the row from an array.
-     *
-     * @param  array $data
-     * @return Zend_Db_Table_Row_Abstract Provides a fluent interface
-     */
-    public function setFromArray(array $data)
-    {
-        $data = array_intersect_key($data, $this->_data);
-
-        foreach ($data as $columnName => $value) {
-            $this->__set($columnName, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Refreshes properties from the database.
-     *
-     * @return void
-     */
-    public function refresh()
-    {
-        return $this->_refresh();
-    }
-
-    /**
-     * Retrieves an instance of the parent table.
-     *
-     * @return Zend_Db_Table_Abstract
-     */
-    protected function _getTable()
-    {
-        if (!$this->_connected) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('Cannot save a Row unless it is connected');
-        }
-        return $this->_table;
-    }
-
-    /**
-     * Retrieves an associative array of primary keys.
-     *
-     * @param bool $useDirty
-     * @return array
-     */
-    protected function _getPrimaryKey($useDirty = true)
-    {
-        if (!is_array($this->_primary)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("The primary key must be set as an array");
-        }
-
-        $primary = array_flip($this->_primary);
-        if ($useDirty) {
-            $array = array_intersect_key($this->_data, $primary);
-        } else {
-            $array = array_intersect_key($this->_cleanData, $primary);
-        }
-        if (count($primary) != count($array)) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("The specified Table '$this->_tableClass' does not have the same primary key as the Row");
-        }
-        return $array;
-    }
-
-    /**
-     * Constructs where statement for retrieving row(s).
-     *
-     * @param bool $useDirty
-     * @return array
-     */
-    protected function _getWhereQuery($useDirty = true)
-    {
-        $where = array();
-        $db = $this->_getTable()->getAdapter();
-        $primaryKey = $this->_getPrimaryKey($useDirty);
-        $info = $this->_getTable()->info();
-        $metadata = $info[Zend_Db_Table_Abstract::METADATA];
-
-        // retrieve recently updated row using primary keys
-        $where = array();
-        foreach ($primaryKey as $column => $value) {
-            $tableName = $db->quoteIdentifier($info[Zend_Db_Table_Abstract::NAME], true);
-            $type = $metadata[$column]['DATA_TYPE'];
-            $columnName = $db->quoteIdentifier($column, true);
-            $where[] = $db->quoteInto("{$tableName}.{$columnName} = ?", $value, $type);
-        }
-        return $where;
-    }
-
-    /**
-     * Refreshes properties from the database.
-     *
-     * @return void
-     */
-    protected function _refresh()
-    {
-        $where = $this->_getWhereQuery();
-        $row = $this->_getTable()->fetchRow($where);
-
-        if (null === $row) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception('Cannot refresh row as parent is missing');
-        }
-
-        $this->_data = $row->toArray();
-        $this->_cleanData = $this->_data;
-        $this->_modifiedFields = array();
-    }
-
-    /**
-     * Allows pre-insert logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _insert()
-    {
-    }
-
-    /**
-     * Allows post-insert logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _postInsert()
-    {
-    }
-
-    /**
-     * Allows pre-update logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _update()
-    {
-    }
-
-    /**
-     * Allows post-update logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _postUpdate()
-    {
-    }
-
-    /**
-     * Allows pre-delete logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _delete()
-    {
-    }
-
-    /**
-     * Allows post-delete logic to be applied to row.
-     * Subclasses may override this method.
-     *
-     * @return void
-     */
-    protected function _postDelete()
-    {
-    }
-
-    /**
-     * Prepares a table reference for lookup.
-     *
-     * Ensures all reference keys are set and properly formatted.
-     *
-     * @param Zend_Db_Table_Abstract $dependentTable
-     * @param Zend_Db_Table_Abstract $parentTable
-     * @param string                 $ruleKey
-     * @return array
-     */
-    protected function _prepareReference(Zend_Db_Table_Abstract $dependentTable, Zend_Db_Table_Abstract $parentTable, $ruleKey)
-    {
-        $parentTableName = (get_class($parentTable) === 'Zend_Db_Table') ? $parentTable->getDefinitionConfigName() : get_class($parentTable);
-        $map = $dependentTable->getReference($parentTableName, $ruleKey);
-
-        if (!isset($map[Zend_Db_Table_Abstract::REF_COLUMNS])) {
-            $parentInfo = $parentTable->info();
-            $map[Zend_Db_Table_Abstract::REF_COLUMNS] = array_values((array) $parentInfo['primary']);
-        }
-
-        $map[Zend_Db_Table_Abstract::COLUMNS] = (array) $map[Zend_Db_Table_Abstract::COLUMNS];
-        $map[Zend_Db_Table_Abstract::REF_COLUMNS] = (array) $map[Zend_Db_Table_Abstract::REF_COLUMNS];
-
-        return $map;
-    }
-
-    /**
-     * Query a dependent table to retrieve rows matching the current row.
-     *
-     * @param string|Zend_Db_Table_Abstract  $dependentTable
-     * @param string                         OPTIONAL $ruleKey
-     * @param Zend_Db_Table_Select           OPTIONAL $select
-     * @return Zend_Db_Table_Rowset_Abstract Query result from $dependentTable
-     * @throws Zend_Db_Table_Row_Exception If $dependentTable is not a table or is not loadable.
-     */
-    public function findDependentRowset($dependentTable, $ruleKey = null, Zend_Db_Table_Select $select = null)
-    {
-        $db = $this->_getTable()->getAdapter();
-
-        if (is_string($dependentTable)) {
-            $dependentTable = $this->_getTableFromString($dependentTable);
-        }
-
-        if (!$dependentTable instanceof Zend_Db_Table_Abstract) {
-            $type = gettype($dependentTable);
-            if ($type == 'object') {
-                $type = get_class($dependentTable);
-            }
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Dependent table must be a Zend_Db_Table_Abstract, but it is $type");
-        }
-
-        // even if we are interacting between a table defined in a class and a
-        // table via extension, ensure to persist the definition
-        if (($tableDefinition = $this->_table->getDefinition()) !== null
-            && ($dependentTable->getDefinition() == null)) {
-            $dependentTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
-        }
-
-        if ($select === null) {
-            $select = $dependentTable->select();
-        } else {
-            $select->setTable($dependentTable);
-        }
-
-        $map = $this->_prepareReference($dependentTable, $this->_getTable(), $ruleKey);
-
-        for ($i = 0; $i < count($map[Zend_Db_Table_Abstract::COLUMNS]); ++$i) {
-            $parentColumnName = $db->foldCase($map[Zend_Db_Table_Abstract::REF_COLUMNS][$i]);
-            $value = $this->_data[$parentColumnName];
-            // Use adapter from dependent table to ensure correct query construction
-            $dependentDb = $dependentTable->getAdapter();
-            $dependentColumnName = $dependentDb->foldCase($map[Zend_Db_Table_Abstract::COLUMNS][$i]);
-            $dependentColumn = $dependentDb->quoteIdentifier($dependentColumnName, true);
-            $dependentInfo = $dependentTable->info();
-            $type = $dependentInfo[Zend_Db_Table_Abstract::METADATA][$dependentColumnName]['DATA_TYPE'];
-            $select->where("$dependentColumn = ?", $value, $type);
-        }
-
-        return $dependentTable->fetchAll($select);
-    }
-
-    /**
-     * Query a parent table to retrieve the single row matching the current row.
-     *
-     * @param string|Zend_Db_Table_Abstract $parentTable
-     * @param string                        OPTIONAL $ruleKey
-     * @param Zend_Db_Table_Select          OPTIONAL $select
-     * @return Zend_Db_Table_Row_Abstract   Query result from $parentTable
-     * @throws Zend_Db_Table_Row_Exception If $parentTable is not a table or is not loadable.
-     */
-    public function findParentRow($parentTable, $ruleKey = null, Zend_Db_Table_Select $select = null)
-    {
-        $db = $this->_getTable()->getAdapter();
-
-        if (is_string($parentTable)) {
-            $parentTable = $this->_getTableFromString($parentTable);
-        }
-
-        if (!$parentTable instanceof Zend_Db_Table_Abstract) {
-            $type = gettype($parentTable);
-            if ($type == 'object') {
-                $type = get_class($parentTable);
-            }
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Parent table must be a Zend_Db_Table_Abstract, but it is $type");
-        }
-
-        // even if we are interacting between a table defined in a class and a
-        // table via extension, ensure to persist the definition
-        if (($tableDefinition = $this->_table->getDefinition()) !== null
-            && ($parentTable->getDefinition() == null)) {
-            $parentTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
-        }
-
-        if ($select === null) {
-            $select = $parentTable->select();
-        } else {
-            $select->setTable($parentTable);
-        }
-
-        $map = $this->_prepareReference($this->_getTable(), $parentTable, $ruleKey);
-
-        // iterate the map, creating the proper wheres
-        for ($i = 0; $i < count($map[Zend_Db_Table_Abstract::COLUMNS]); ++$i) {
-            $dependentColumnName = $db->foldCase($map[Zend_Db_Table_Abstract::COLUMNS][$i]);
-            $value = $this->_data[$dependentColumnName];
-            // Use adapter from parent table to ensure correct query construction
-            $parentDb = $parentTable->getAdapter();
-            $parentColumnName = $parentDb->foldCase($map[Zend_Db_Table_Abstract::REF_COLUMNS][$i]);
-            $parentColumn = $parentDb->quoteIdentifier($parentColumnName, true);
-            $parentInfo = $parentTable->info();
-
-            // determine where part
-            $type     = $parentInfo[Zend_Db_Table_Abstract::METADATA][$parentColumnName]['DATA_TYPE'];
-            $nullable = $parentInfo[Zend_Db_Table_Abstract::METADATA][$parentColumnName]['NULLABLE'];
-            if ($value === null && $nullable == true) {
-                $select->where("$parentColumn IS NULL");
-            } elseif ($value === null && $nullable == false) {
-                return null;
-            } else {
-                $select->where("$parentColumn = ?", $value, $type);
-            }
-
-        }
-
-        return $parentTable->fetchRow($select);
-    }
-
-    /**
-     * @param  string|Zend_Db_Table_Abstract  $matchTable
-     * @param  string|Zend_Db_Table_Abstract  $intersectionTable
-     * @param  string                         OPTIONAL $callerRefRule
-     * @param  string                         OPTIONAL $matchRefRule
-     * @param  Zend_Db_Table_Select           OPTIONAL $select
-     * @return Zend_Db_Table_Rowset_Abstract Query result from $matchTable
-     * @throws Zend_Db_Table_Row_Exception If $matchTable or $intersectionTable is not a table class or is not loadable.
-     */
-    public function findManyToManyRowset($matchTable, $intersectionTable, $callerRefRule = null,
-                                         $matchRefRule = null, Zend_Db_Table_Select $select = null)
-    {
-        $db = $this->_getTable()->getAdapter();
-
-        if (is_string($intersectionTable)) {
-            $intersectionTable = $this->_getTableFromString($intersectionTable);
-        }
-
-        if (!$intersectionTable instanceof Zend_Db_Table_Abstract) {
-            $type = gettype($intersectionTable);
-            if ($type == 'object') {
-                $type = get_class($intersectionTable);
-            }
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Intersection table must be a Zend_Db_Table_Abstract, but it is $type");
-        }
-
-        // even if we are interacting between a table defined in a class and a
-        // table via extension, ensure to persist the definition
-        if (($tableDefinition = $this->_table->getDefinition()) !== null
-            && ($intersectionTable->getDefinition() == null)) {
-            $intersectionTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
-        }
-
-        if (is_string($matchTable)) {
-            $matchTable = $this->_getTableFromString($matchTable);
-        }
-
-        if (! $matchTable instanceof Zend_Db_Table_Abstract) {
-            $type = gettype($matchTable);
-            if ($type == 'object') {
-                $type = get_class($matchTable);
-            }
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception("Match table must be a Zend_Db_Table_Abstract, but it is $type");
-        }
-
-        // even if we are interacting between a table defined in a class and a
-        // table via extension, ensure to persist the definition
-        if (($tableDefinition = $this->_table->getDefinition()) !== null
-            && ($matchTable->getDefinition() == null)) {
-            $matchTable->setOptions(array(Zend_Db_Table_Abstract::DEFINITION => $tableDefinition));
-        }
-
-        if ($select === null) {
-            $select = $matchTable->select();
-        } else {
-            $select->setTable($matchTable);
-        }
-
-        // Use adapter from intersection table to ensure correct query construction
-        $interInfo = $intersectionTable->info();
-        $interDb   = $intersectionTable->getAdapter();
-        $interName = $interInfo['name'];
-        $interSchema = isset($interInfo['schema']) ? $interInfo['schema'] : null;
-        $matchInfo = $matchTable->info();
-        $matchName = $matchInfo['name'];
-        $matchSchema = isset($matchInfo['schema']) ? $matchInfo['schema'] : null;
-
-        $matchMap = $this->_prepareReference($intersectionTable, $matchTable, $matchRefRule);
-
-        for ($i = 0; $i < count($matchMap[Zend_Db_Table_Abstract::COLUMNS]); ++$i) {
-            $interCol = $interDb->quoteIdentifier('i' . '.' . $matchMap[Zend_Db_Table_Abstract::COLUMNS][$i], true);
-            $matchCol = $interDb->quoteIdentifier('m' . '.' . $matchMap[Zend_Db_Table_Abstract::REF_COLUMNS][$i], true);
-            $joinCond[] = "$interCol = $matchCol";
-        }
-        $joinCond = implode(' AND ', $joinCond);
-
-        $select->from(array('i' => $interName), array(), $interSchema)
-               ->joinInner(array('m' => $matchName), $joinCond, Zend_Db_Select::SQL_WILDCARD, $matchSchema)
-               ->setIntegrityCheck(false);
-
-        $callerMap = $this->_prepareReference($intersectionTable, $this->_getTable(), $callerRefRule);
-
-        for ($i = 0; $i < count($callerMap[Zend_Db_Table_Abstract::COLUMNS]); ++$i) {
-            $callerColumnName = $db->foldCase($callerMap[Zend_Db_Table_Abstract::REF_COLUMNS][$i]);
-            $value = $this->_data[$callerColumnName];
-            $interColumnName = $interDb->foldCase($callerMap[Zend_Db_Table_Abstract::COLUMNS][$i]);
-            $interCol = $interDb->quoteIdentifier("i.$interColumnName", true);
-            $interInfo = $intersectionTable->info();
-            $type = $interInfo[Zend_Db_Table_Abstract::METADATA][$interColumnName]['DATA_TYPE'];
-            $select->where($interDb->quoteInto("$interCol = ?", $value, $type));
-        }
-
-        $stmt = $select->query();
-
-        $config = array(
-            'table'    => $matchTable,
-            'data'     => $stmt->fetchAll(Zend_Db::FETCH_ASSOC),
-            'rowClass' => $matchTable->getRowClass(),
-            'readOnly' => false,
-            'stored'   => true
-        );
-
-        $rowsetClass = $matchTable->getRowsetClass();
-        if (!class_exists($rowsetClass)) {
-            try {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($rowsetClass);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-        $rowset = new $rowsetClass($config);
-        return $rowset;
-    }
-
-    /**
-     * Turn magic function calls into non-magic function calls
-     * to the above methods.
-     *
-     * @param string $method
-     * @param array $args OPTIONAL Zend_Db_Table_Select query modifier
-     * @return Zend_Db_Table_Row_Abstract|Zend_Db_Table_Rowset_Abstract
-     * @throws Zend_Db_Table_Row_Exception If an invalid method is called.
-     */
-    public function __call($method, array $args)
-    {
-        $matches = array();
-
-        if (count($args) && $args[0] instanceof Zend_Db_Table_Select) {
-            $select = $args[0];
-        } else {
-            $select = null;
-        }
-
-        /**
-         * Recognize methods for Has-Many cases:
-         * findParent<Class>()
-         * findParent<Class>By<Rule>()
-         * Use the non-greedy pattern repeat modifier e.g. \w+?
-         */
-        if (preg_match('/^findParent(\w+?)(?:By(\w+))?$/', $method, $matches)) {
-            $class    = $matches[1];
-            $ruleKey1 = isset($matches[2]) ? $matches[2] : null;
-            return $this->findParentRow($class, $ruleKey1, $select);
-        }
-
-        /**
-         * Recognize methods for Many-to-Many cases:
-         * find<Class1>Via<Class2>()
-         * find<Class1>Via<Class2>By<Rule>()
-         * find<Class1>Via<Class2>By<Rule1>And<Rule2>()
-         * Use the non-greedy pattern repeat modifier e.g. \w+?
-         */
-        if (preg_match('/^find(\w+?)Via(\w+?)(?:By(\w+?)(?:And(\w+))?)?$/', $method, $matches)) {
-            $class    = $matches[1];
-            $viaClass = $matches[2];
-            $ruleKey1 = isset($matches[3]) ? $matches[3] : null;
-            $ruleKey2 = isset($matches[4]) ? $matches[4] : null;
-            return $this->findManyToManyRowset($class, $viaClass, $ruleKey1, $ruleKey2, $select);
-        }
-
-        /**
-         * Recognize methods for Belongs-To cases:
-         * find<Class>()
-         * find<Class>By<Rule>()
-         * Use the non-greedy pattern repeat modifier e.g. \w+?
-         */
-        if (preg_match('/^find(\w+?)(?:By(\w+))?$/', $method, $matches)) {
-            $class    = $matches[1];
-            $ruleKey1 = isset($matches[2]) ? $matches[2] : null;
-            return $this->findDependentRowset($class, $ruleKey1, $select);
-        }
-
-        require_once 'Zend/Db/Table/Row/Exception.php';
-        throw new Zend_Db_Table_Row_Exception("Unrecognized method '$method()'");
-    }
-
-
-    /**
-     * _getTableFromString
-     *
-     * @param string $tableName
-     * @return Zend_Db_Table_Abstract
-     */
-    protected function _getTableFromString($tableName)
-    {
-
-        if ($this->_table instanceof Zend_Db_Table_Abstract) {
-            $tableDefinition = $this->_table->getDefinition();
-
-            if ($tableDefinition !== null && $tableDefinition->hasTableConfig($tableName)) {
-                return new Zend_Db_Table($tableName, $tableDefinition);
-            }
-        }
-
-        // assume the tableName is the class name
-        if (!class_exists($tableName)) {
-            try {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($tableName);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-
-        $options = array();
-
-        if (($table = $this->_getTable())) {
-            $options['db'] = $table->getAdapter();
-        }
-
-        if (isset($tableDefinition) && $tableDefinition !== null) {
-            $options[Zend_Db_Table_Abstract::DEFINITION] = $tableDefinition;
-        }
-
-        return new $tableName($options);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Row/Exception.php b/airtime_mvc/library/Zend/Db/Table/Row/Exception.php
deleted file mode 100644
index c3c717c17..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Row/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Table_Exception
- */
-require_once 'Zend/Db/Table/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Row_Exception extends Zend_Db_Table_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Db/Table/Rowset.php b/airtime_mvc/library/Zend/Db/Table/Rowset.php
deleted file mode 100644
index b04c5142c..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Rowset.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rowset.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Table_Rowset_Abstract
- */
-require_once 'Zend/Db/Table/Rowset/Abstract.php';
-
-
-/**
- * Reference concrete class that extends Zend_Db_Table_Rowset_Abstract.
- * Developers may also create their own classes that extend the abstract class.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Rowset extends Zend_Db_Table_Rowset_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Rowset/Abstract.php b/airtime_mvc/library/Zend/Db/Table/Rowset/Abstract.php
deleted file mode 100644
index c258656a7..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Rowset/Abstract.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Countable, ArrayAccess
-{
-    /**
-     * The original data for each row.
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * Zend_Db_Table_Abstract object.
-     *
-     * @var Zend_Db_Table_Abstract
-     */
-    protected $_table;
-
-    /**
-     * Connected is true if we have a reference to a live
-     * Zend_Db_Table_Abstract object.
-     * This is false after the Rowset has been deserialized.
-     *
-     * @var boolean
-     */
-    protected $_connected = true;
-
-    /**
-     * Zend_Db_Table_Abstract class name.
-     *
-     * @var string
-     */
-    protected $_tableClass;
-
-    /**
-     * Zend_Db_Table_Row_Abstract class name.
-     *
-     * @var string
-     */
-    protected $_rowClass = 'Zend_Db_Table_Row';
-
-    /**
-     * Iterator pointer.
-     *
-     * @var integer
-     */
-    protected $_pointer = 0;
-
-    /**
-     * How many data rows there are.
-     *
-     * @var integer
-     */
-    protected $_count;
-
-    /**
-     * Collection of instantiated Zend_Db_Table_Row objects.
-     *
-     * @var array
-     */
-    protected $_rows = array();
-
-    /**
-     * @var boolean
-     */
-    protected $_stored = false;
-
-    /**
-     * @var boolean
-     */
-    protected $_readOnly = false;
-
-    /**
-     * Constructor.
-     *
-     * @param array $config
-     */
-    public function __construct(array $config)
-    {
-        if (isset($config['table'])) {
-            $this->_table      = $config['table'];
-            $this->_tableClass = get_class($this->_table);
-        }
-        if (isset($config['rowClass'])) {
-            $this->_rowClass   = $config['rowClass'];
-        }
-        if (!class_exists($this->_rowClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($this->_rowClass);
-        }
-        if (isset($config['data'])) {
-            $this->_data       = $config['data'];
-        }
-        if (isset($config['readOnly'])) {
-            $this->_readOnly   = $config['readOnly'];
-        }
-        if (isset($config['stored'])) {
-            $this->_stored     = $config['stored'];
-        }
-
-        // set the count of rows
-        $this->_count = count($this->_data);
-
-        $this->init();
-    }
-
-    /**
-     * Store data, class names, and state in serialized object
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_data', '_tableClass', '_rowClass', '_pointer', '_count', '_rows', '_stored',
-                     '_readOnly');
-    }
-
-    /**
-     * Setup to do on wakeup.
-     * A de-serialized Rowset should not be assumed to have access to a live
-     * database connection, so set _connected = false.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_connected = false;
-    }
-
-    /**
-     * Initialize object
-     *
-     * Called from {@link __construct()} as final step of object instantiation.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Return the connected state of the rowset.
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return $this->_connected;
-    }
-
-    /**
-     * Returns the table object, or null if this is disconnected rowset
-     *
-     * @return Zend_Db_Table_Abstract
-     */
-    public function getTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Set the table object, to re-establish a live connection
-     * to the database for a Rowset that has been de-serialized.
-     *
-     * @param Zend_Db_Table_Abstract $table
-     * @return boolean
-     * @throws Zend_Db_Table_Row_Exception
-     */
-    public function setTable(Zend_Db_Table_Abstract $table)
-    {
-        $this->_table = $table;
-        $this->_connected = false;
-        // @todo This works only if we have iterated through
-        // the result set once to instantiate the rows.
-        foreach ($this as $row) {
-            $connected = $row->setTable($table);
-            if ($connected == true) {
-                $this->_connected = true;
-            }
-        }
-        return $this->_connected;
-    }
-
-    /**
-     * Query the class name of the Table object for which this
-     * Rowset was created.
-     *
-     * @return string
-     */
-    public function getTableClass()
-    {
-        return $this->_tableClass;
-    }
-
-    /**
-     * Rewind the Iterator to the first element.
-     * Similar to the reset() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return Zend_Db_Table_Rowset_Abstract Fluent interface.
-     */
-    public function rewind()
-    {
-        $this->_pointer = 0;
-        return $this;
-    }
-
-    /**
-     * Return the current element.
-     * Similar to the current() function for arrays in PHP
-     * Required by interface Iterator.
-     *
-     * @return Zend_Db_Table_Row_Abstract current element from the collection
-     */
-    public function current()
-    {
-        if ($this->valid() === false) {
-            return null;
-        }
-
-        // do we already have a row object for this position?
-        if (empty($this->_rows[$this->_pointer])) {
-            $this->_rows[$this->_pointer] = new $this->_rowClass(
-                array(
-                    'table'    => $this->_table,
-                    'data'     => $this->_data[$this->_pointer],
-                    'stored'   => $this->_stored,
-                    'readOnly' => $this->_readOnly
-                )
-            );
-        }
-
-        // return the row object
-        return $this->_rows[$this->_pointer];
-    }
-
-    /**
-     * Return the identifying key of the current element.
-     * Similar to the key() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_pointer;
-    }
-
-    /**
-     * Move forward to next element.
-     * Similar to the next() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return void
-     */
-    public function next()
-    {
-        ++$this->_pointer;
-    }
-
-    /**
-     * Check if there is a current element after calls to rewind() or next().
-     * Used to check if we've iterated to the end of the collection.
-     * Required by interface Iterator.
-     *
-     * @return bool False if there's nothing more to iterate over
-     */
-    public function valid()
-    {
-        return $this->_pointer < $this->_count;
-    }
-
-    /**
-     * Returns the number of elements in the collection.
-     *
-     * Implements Countable::count()
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->_count;
-    }
-
-    /**
-     * Take the Iterator to position $position
-     * Required by interface SeekableIterator.
-     *
-     * @param int $position the position to seek to
-     * @return Zend_Db_Table_Rowset_Abstract
-     * @throws Zend_Db_Table_Rowset_Exception
-     */
-    public function seek($position)
-    {
-        $position = (int) $position;
-        if ($position < 0 || $position >= $this->_count) {
-            require_once 'Zend/Db/Table/Rowset/Exception.php';
-            throw new Zend_Db_Table_Rowset_Exception("Illegal index $position");
-        }
-        $this->_pointer = $position;
-        return $this;
-    }
-
-    /**
-     * Check if an offset exists
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->_data[(int) $offset]);
-    }
-
-    /**
-     * Get the row for the given offset
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     * @return Zend_Db_Table_Row_Abstract
-     */
-    public function offsetGet($offset)
-    {
-        $this->_pointer = (int) $offset;
-
-        return $this->current();
-    }
-
-    /**
-     * Does nothing
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     * @param mixed $value
-     */
-    public function offsetSet($offset, $value)
-    {
-    }
-
-    /**
-     * Does nothing
-     * Required by the ArrayAccess implementation
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset)
-    {
-    }
-
-    /**
-     * Returns a Zend_Db_Table_Row from a known position into the Iterator
-     *
-     * @param int $position the position of the row expected
-     * @param bool $seek wether or not seek the iterator to that position after
-     * @return Zend_Db_Table_Row
-     * @throws Zend_Db_Table_Rowset_Exception
-     */
-    public function getRow($position, $seek = false)
-    {
-        $key = $this->key();
-        try {
-            $this->seek($position);
-            $row = $this->current();
-        } catch (Zend_Db_Table_Rowset_Exception $e) {
-            require_once 'Zend/Db/Table/Rowset/Exception.php';
-            throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e);
-        }
-        if ($seek == false) {
-            $this->seek($key);
-        }
-        return $row;
-    }
-
-    /**
-     * Returns all data as an array.
-     *
-     * Updates the $_data property with current row object values.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        // @todo This works only if we have iterated through
-        // the result set once to instantiate the rows.
-        foreach ($this->_rows as $i => $row) {
-            $this->_data[$i] = $row->toArray();
-        }
-        return $this->_data;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Rowset/Exception.php b/airtime_mvc/library/Zend/Db/Table/Rowset/Exception.php
deleted file mode 100644
index 8bdaedd17..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Rowset/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Table_Exception
- */
-require_once 'Zend/Db/Table/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Rowset_Exception extends Zend_Db_Table_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Db/Table/Select.php b/airtime_mvc/library/Zend/Db/Table/Select.php
deleted file mode 100644
index 2f23f88f4..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Select.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Db_Select
- */
-require_once 'Zend/Db/Select.php';
-
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once 'Zend/Db/Table/Abstract.php';
-
-
-/**
- * Class for SQL SELECT query manipulation for the Zend_Db_Table component.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Db_Table_Select extends Zend_Db_Select
-{
-    /**
-     * Table schema for parent Zend_Db_Table.
-     *
-     * @var array
-     */
-    protected $_info;
-
-    /**
-     * Table integrity override.
-     *
-     * @var array
-     */
-    protected $_integrityCheck = true;
-
-    /**
-     * Table instance that created this select object
-     *
-     * @var Zend_Db_Table_Abstract
-     */
-    protected $_table;
-
-    /**
-     * Class constructor
-     *
-     * @param Zend_Db_Table_Abstract $adapter
-     */
-    public function __construct(Zend_Db_Table_Abstract $table)
-    {
-        parent::__construct($table->getAdapter());
-
-        $this->setTable($table);
-    }
-
-    /**
-     * Return the table that created this select object
-     *
-     * @return Zend_Db_Table_Abstract
-     */
-    public function getTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Sets the primary table name and retrieves the table schema.
-     *
-     * @param Zend_Db_Table_Abstract $adapter
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function setTable(Zend_Db_Table_Abstract $table)
-    {
-        $this->_adapter = $table->getAdapter();
-        $this->_info    = $table->info();
-        $this->_table   = $table;
-
-        return $this;
-    }
-
-    /**
-     * Sets the integrity check flag.
-     *
-     * Setting this flag to false skips the checks for table joins, allowing
-     * 'hybrid' table rows to be created.
-     *
-     * @param Zend_Db_Table_Abstract $adapter
-     * @return Zend_Db_Select This Zend_Db_Select object.
-     */
-    public function setIntegrityCheck($flag = true)
-    {
-        $this->_integrityCheck = $flag;
-        return $this;
-    }
-
-    /**
-     * Tests query to determine if expressions or aliases columns exist.
-     *
-     * @return boolean
-     */
-    public function isReadOnly()
-    {
-        $readOnly = false;
-        $fields   = $this->getPart(Zend_Db_Table_Select::COLUMNS);
-        $cols     = $this->_info[Zend_Db_Table_Abstract::COLS];
-
-        if (!count($fields)) {
-            return $readOnly;
-        }
-
-        foreach ($fields as $columnEntry) {
-            $column = $columnEntry[1];
-            $alias = $columnEntry[2];
-
-            if ($alias !== null) {
-                $column = $alias;
-            }
-
-            switch (true) {
-                case ($column == self::SQL_WILDCARD):
-                    break;
-
-                case ($column instanceof Zend_Db_Expr):
-                case (!in_array($column, $cols)):
-                    $readOnly = true;
-                    break 2;
-            }
-        }
-
-        return $readOnly;
-    }
-
-    /**
-     * Adds a FROM table and optional columns to the query.
-     *
-     * The table name can be expressed
-     *
-     * @param  array|string|Zend_Db_Expr|Zend_Db_Table_Abstract $name The table name or an
-                                                                      associative array relating
-                                                                      table name to correlation
-                                                                      name.
-     * @param  array|string|Zend_Db_Expr $cols The columns to select from this table.
-     * @param  string $schema The schema name to specify, if any.
-     * @return Zend_Db_Table_Select This Zend_Db_Table_Select object.
-     */
-    public function from($name, $cols = self::SQL_WILDCARD, $schema = null)
-    {
-        if ($name instanceof Zend_Db_Table_Abstract) {
-            $info = $name->info();
-            $name = $info[Zend_Db_Table_Abstract::NAME];
-            if (isset($info[Zend_Db_Table_Abstract::SCHEMA])) {
-                $schema = $info[Zend_Db_Table_Abstract::SCHEMA];
-            }
-        }
-
-        return $this->joinInner($name, null, $cols, $schema);
-    }
-
-    /**
-     * Performs a validation on the select query before passing back to the parent class.
-     * Ensures that only columns from the primary Zend_Db_Table are returned in the result.
-     *
-     * @return string|null This object as a SELECT string (or null if a string cannot be produced)
-     */
-    public function assemble()
-    {
-        $fields  = $this->getPart(Zend_Db_Table_Select::COLUMNS);
-        $primary = $this->_info[Zend_Db_Table_Abstract::NAME];
-        $schema  = $this->_info[Zend_Db_Table_Abstract::SCHEMA];
-
-
-        if (count($this->_parts[self::UNION]) == 0) {
-
-            // If no fields are specified we assume all fields from primary table
-            if (!count($fields)) {
-                $this->from($primary, self::SQL_WILDCARD, $schema);
-                $fields = $this->getPart(Zend_Db_Table_Select::COLUMNS);
-            }
-
-            $from = $this->getPart(Zend_Db_Table_Select::FROM);
-
-            if ($this->_integrityCheck !== false) {
-                foreach ($fields as $columnEntry) {
-                    list($table, $column) = $columnEntry;
-
-                    // Check each column to ensure it only references the primary table
-                    if ($column) {
-                        if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) {
-                            require_once 'Zend/Db/Table/Select/Exception.php';
-                            throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table');
-                        }
-                    }
-                }
-            }
-        }
-
-        return parent::assemble();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Db/Table/Select/Exception.php b/airtime_mvc/library/Zend/Db/Table/Select/Exception.php
deleted file mode 100644
index c93c86131..000000000
--- a/airtime_mvc/library/Zend/Db/Table/Select/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Select
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Db_Exception
- */
-require_once 'Zend/Db/Select/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Db
- * @subpackage Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Db_Table_Select_Exception extends Zend_Db_Select_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Debug.php b/airtime_mvc/library/Zend/Debug.php
deleted file mode 100644
index f7341f8c2..000000000
--- a/airtime_mvc/library/Zend/Debug.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Debug
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Debug.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Concrete class for generating debug dumps related to the output source.
- *
- * @category   Zend
- * @package    Zend_Debug
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Debug
-{
-
-    /**
-     * @var string
-     */
-    protected static $_sapi = null;
-
-    /**
-     * Get the current value of the debug output environment.
-     * This defaults to the value of PHP_SAPI.
-     *
-     * @return string;
-     */
-    public static function getSapi()
-    {
-        if (self::$_sapi === null) {
-            self::$_sapi = PHP_SAPI;
-        }
-        return self::$_sapi;
-    }
-
-    /**
-     * Set the debug ouput environment.
-     * Setting a value of null causes Zend_Debug to use PHP_SAPI.
-     *
-     * @param string $sapi
-     * @return void;
-     */
-    public static function setSapi($sapi)
-    {
-        self::$_sapi = $sapi;
-    }
-
-    /**
-     * Debug helper function.  This is a wrapper for var_dump() that adds
-     * the <pre /> tags, cleans up newlines and indents, and runs
-     * htmlentities() before output.
-     *
-     * @param  mixed  $var   The variable to dump.
-     * @param  string $label OPTIONAL Label to prepend to output.
-     * @param  bool   $echo  OPTIONAL Echo output if true.
-     * @return string
-     */
-    public static function dump($var, $label=null, $echo=true)
-    {
-        // format the label
-        $label = ($label===null) ? '' : rtrim($label) . ' ';
-
-        // var_dump the variable into a buffer and keep the output
-        ob_start();
-        var_dump($var);
-        $output = ob_get_clean();
-
-        // neaten the newlines and indents
-        $output = preg_replace("/\]\=\>\n(\s+)/m", "] => ", $output);
-        if (self::getSapi() == 'cli') {
-            $output = PHP_EOL . $label
-                    . PHP_EOL . $output
-                    . PHP_EOL;
-        } else {
-            if(!extension_loaded('xdebug')) {
-                $output = htmlspecialchars($output, ENT_QUOTES);
-            }
-
-            $output = '<pre>'
-                    . $label
-                    . $output
-                    . '</pre>';
-        }
-
-        if ($echo) {
-            echo($output);
-        }
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Dojo.php b/airtime_mvc/library/Zend/Dojo.php
deleted file mode 100644
index b3745cb77..000000000
--- a/airtime_mvc/library/Zend/Dojo.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Enable Dojo components
- *
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo
-{
-    /**
-     * Base path to AOL CDN
-     */
-    const CDN_BASE_AOL = 'http://o.aolcdn.com/dojo/';
-
-    /**
-     * Path to dojo on AOL CDN (following version string)
-     */
-    const CDN_DOJO_PATH_AOL = '/dojo/dojo.xd.js';
-
-    /**
-     * Base path to Google CDN
-     */
-    const CDN_BASE_GOOGLE = 'http://ajax.googleapis.com/ajax/libs/dojo/';
-
-    /**
-     * Path to dojo on Google CDN (following version string)
-     */
-    const CDN_DOJO_PATH_GOOGLE = '/dojo/dojo.xd.js';
-
-    /**
-     * Dojo-enable a form instance
-     *
-     * @param  Zend_Form $form
-     * @return void
-     */
-    public static function enableForm(Zend_Form $form)
-    {
-        $form->addPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addPrefixPath('Zend_Dojo_Form_Element', 'Zend/Dojo/Form/Element', 'element')
-             ->addElementPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addDisplayGroupPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator')
-             ->setDefaultDisplayGroupClass('Zend_Dojo_Form_DisplayGroup');
-
-        foreach ($form->getSubForms() as $subForm) {
-            self::enableForm($subForm);
-        }
-
-        if (null !== ($view = $form->getView())) {
-            self::enableView($view);
-        }
-    }
-
-    /**
-     * Dojo-enable a view instance
-     *
-     * @param  Zend_View_Interface $view
-     * @return void
-     */
-    public static function enableView(Zend_View_Interface $view)
-    {
-        if (false === $view->getPluginLoader('helper')->getPaths('Zend_Dojo_View_Helper')) {
-            $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Dojo/BuildLayer.php b/airtime_mvc/library/Zend/Dojo/BuildLayer.php
deleted file mode 100644
index 2fb0cd513..000000000
--- a/airtime_mvc/library/Zend/Dojo/BuildLayer.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BuildLayer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Dojo module layer and custom build profile generation support
- *
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_BuildLayer
-{
-    /**
-     * Flag: whether or not to consume JS aggregated in the dojo() view
-     * helper when generate the module layer contents
-     * @var bool
-     */
-    protected $_consumeJavascript = false;
-
-    /**
-     * Flag: whether or not to consume dojo.addOnLoad events registered
-     * with the dojo() view helper when generating the module layer file
-     * contents
-     * @var bool
-     */
-    protected $_consumeOnLoad = false;
-
-    /**
-     * Dojo view helper reference
-     * @var Zend_Dojo_View_Helper_Dojo_Container
-     */
-    protected $_dojo;
-
-    /**
-     * Name of the custom layer to generate
-     * @var string
-     */
-    protected $_layerName;
-
-    /**
-     * Path to the custom layer script relative to dojo.js (used when
-     * creating the build profile)
-     * @var string
-     */
-    protected $_layerScriptPath;
-
-    /**
-     * Build profile options
-     * @var array
-     */
-    protected $_profileOptions = array(
-        'action'        => 'release',
-        'optimize'      => 'shrinksafe',
-        'layerOptimize' => 'shrinksafe',
-        'copyTests'     => false,
-        'loader'        => 'default',
-        'cssOptimize'   => 'comments',
-    );
-
-    /**
-     * Associative array of module/path pairs for the build profile
-     * @var array
-     */
-    protected $_profilePrefixes = array();
-
-    /**
-     * Zend_View reference
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     * @throws Zend_Dojo_Exception for invalid option argument
-     */
-    public function __construct($options = null)
-    {
-        if (null !== $options) {
-            if ($options instanceof Zend_Config) {
-                $options = $options->toArray();
-            } elseif (!is_array($options)) {
-                require_once 'Zend/Dojo/Exception.php';
-                throw new Zend_Dojo_Exception('Invalid options provided to constructor');
-            }
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set options
-     *
-     * Proxies to any setter that matches an option key.
-     *
-     * @param  array $options
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setOptions(array $options)
-    {
-        $methods = get_class_methods($this);
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set View object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->_view = $view;
-        return $this;
-    }
-
-    /**
-     * Retrieve view object
-     *
-     * @return Zend_View_Interface|null
-     */
-    public function getView()
-    {
-        return $this->_view;
-    }
-
-    /**
-     * Set dojo() view helper instance
-     *
-     * @param  Zend_Dojo_View_Helper_Dojo_Container $helper
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setDojoHelper(Zend_Dojo_View_Helper_Dojo_Container $helper)
-    {
-        $this->_dojo = $helper;
-        return $this;
-    }
-
-    /**
-     * Retrieve dojo() view helper instance
-     *
-     * Will retrieve it from the view object if not registered.
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     * @throws Zend_Dojo_Exception if not registered and no view object found
-     */
-    public function getDojoHelper()
-    {
-        if (null === $this->_dojo) {
-            if (null === ($view = $this->getView())) {
-                require_once 'Zend/Dojo/Exception.php';
-                throw new Zend_Dojo_Exception('View object not registered; cannot retrieve dojo helper');
-            }
-            $helper = $view->getHelper('dojo');
-            $this->setDojoHelper($view->dojo());
-        }
-        return $this->_dojo;
-    }
-
-    /**
-     * Set custom layer name; e.g. "custom.main"
-     *
-     * @param  string $name
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setLayerName($name)
-    {
-        if (!preg_match('/^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/i', $name)) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Invalid layer name provided; must be of form[a-z][a-z0-9_](\.[a-z][a-z0-9_])+');
-        }
-        $this->_layerName = $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve custom layer name
-     *
-     * @return string|null
-     */
-    public function getLayerName()
-    {
-        return $this->_layerName;
-    }
-
-    /**
-     * Set the path to the custom layer script
-     *
-     * Should be a path relative to dojo.js
-     *
-     * @param  string $path
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setLayerScriptPath($path)
-    {
-        $this->_layerScriptPath = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Get custom layer script path
-     *
-     * @return string|null
-     */
-    public function getLayerScriptPath()
-    {
-        return $this->_layerScriptPath;
-    }
-
-    /**
-     * Set flag indicating whether or not to consume JS aggregated in dojo()
-     * view helper
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setConsumeJavascript($flag)
-    {
-        $this->_consumeJavascript = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get flag indicating whether or not to consume JS aggregated in dojo()
-     * view helper
-     *
-     * @return bool
-     */
-    public function consumeJavascript()
-    {
-        return $this->_consumeJavascript;
-    }
-
-    /**
-     * Set flag indicating whether or not to consume dojo.addOnLoad events
-     * aggregated in dojo() view helper
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setConsumeOnLoad($flag)
-    {
-        $this->_consumeOnLoad = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get flag indicating whether or not to consume dojo.addOnLoad events aggregated in dojo() view helper
-     *
-     * @return bool
-     */
-    public function consumeOnLoad()
-    {
-        return $this->_consumeOnLoad;
-    }
-
-    /**
-     * Set many build profile options at once
-     *
-     * @param  array $options
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setProfileOptions(array $options)
-    {
-        $this->_profileOptions += $options;
-        return $this;
-    }
-
-    /**
-     * Add many build profile options at once
-     *
-     * @param  array $options
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function addProfileOptions(array $options)
-    {
-        $this->_profileOptions = $this->_profileOptions + $options;
-        return $this;
-    }
-
-    /**
-     * Add a single build profile option
-     *
-     * @param  string $key
-     * @param  value $value
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function addProfileOption($key, $value)
-    {
-        $this->_profileOptions[(string) $key] = $value;
-        return $this;
-    }
-
-    /**
-     * Is a given build profile option set?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasProfileOption($key)
-    {
-        return array_key_exists((string) $key, $this->_profileOptions);
-    }
-
-    /**
-     * Retrieve a single build profile option
-     *
-     * Returns null if profile option does not exist.
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getProfileOption($key)
-    {
-        if ($this->hasProfileOption($key)) {
-            return $this->_profileOptions[(string) $key];
-        }
-        return null;
-    }
-
-    /**
-     * Get all build profile options
-     *
-     * @return array
-     */
-    public function getProfileOptions()
-    {
-        return $this->_profileOptions;
-    }
-
-    /**
-     * Remove a build profile option
-     *
-     * @param  string $name
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function removeProfileOption($name)
-    {
-        if ($this->hasProfileOption($name)) {
-            unset($this->_profileOptions[(string) $name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove all build profile options
-     *
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function clearProfileOptions()
-    {
-        $this->_profileOptions = array();
-        return $this;
-    }
-
-    /**
-     * Add a build profile dependency prefix
-     *
-     * If just the prefix is passed, sets path to "../$prefix".
-     *
-     * @param  string $prefix
-     * @param  null|string $path
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function addProfilePrefix($prefix, $path = null)
-    {
-        if (null === $path) {
-            $path = '../' . $prefix;
-        }
-        $this->_profilePrefixes[$prefix] = array($prefix, $path);
-        return $this;
-    }
-
-    /**
-     * Set multiple dependency prefixes for bulid profile
-     *
-     * @param  array $prefixes
-     * @return Zend_Dojo_BuildLayer
-     */
-    public function setProfilePrefixes(array $prefixes)
-    {
-        foreach ($prefixes as $prefix => $path) {
-            $this->addProfilePrefix($prefix, $path);
-        }
-        return $this;
-    }
-
-    /**
-     * Get build profile dependency prefixes
-     *
-     * @return array
-     */
-    public function getProfilePrefixes()
-    {
-        $layerName = $this->getLayerName();
-        if (null !== $layerName) {
-            $prefix    = $this->_getPrefix($layerName);
-            if (!array_key_exists($prefix, $this->_profilePrefixes)) {
-                $this->addProfilePrefix($prefix);
-            }
-        }
-        $view = $this->getView();
-        if (!empty($view)) {
-            $helper = $this->getDojoHelper();
-            if ($helper) {
-                $modules = $helper->getModules();
-                foreach ($modules as $module) {
-                    $prefix = $this->_getPrefix($module);
-                    if (!array_key_exists($prefix, $this->_profilePrefixes)) {
-                        $this->addProfilePrefix($prefix);
-                    }
-                }
-            }
-        }
-        return $this->_profilePrefixes;
-    }
-
-    /**
-     * Generate module layer script
-     *
-     * @return string
-     */
-    public function generateLayerScript()
-    {
-        $helper        = $this->getDojoHelper();
-        $layerName     = $this->getLayerName();
-        $modulePaths   = $helper->getModulePaths();
-        $modules       = $helper->getModules();
-        $onLoadActions = $helper->getOnLoadActions();
-        $javascript    = $helper->getJavascript();
-
-        $content = 'dojo.provide("' . $layerName . '");' . "\n\n(function(){\n";
-
-        foreach ($modulePaths as $module => $path) {
-            $content .= sprintf("dojo.registerModulePath(\"%s\", \"%s\");\n", $module, $path);
-        }
-        foreach ($modules as $module) {
-            $content .= sprintf("dojo.require(\"%s\");\n", $module);
-        }
-
-        if ($this->consumeOnLoad()) {
-            foreach ($helper->getOnLoadActions() as $callback) {
-                $content .= sprintf("dojo.addOnLoad(%s);\n", $callback);
-            }
-        }
-        if ($this->consumeJavascript()) {
-            $javascript = implode("\n", $helper->getJavascript());
-            if (!empty($javascript)) {
-                $content .= "\n" . $javascript . "\n";
-            }
-        }
-
-        $content .= "})();";
-
-        return $content;
-    }
-
-    /**
-     * Generate build profile
-     *
-     * @return string
-     */
-    public function generateBuildProfile()
-    {
-        $profileOptions  = $this->getProfileOptions();
-        $layerName       = $this->getLayerName();
-        $layerScriptPath = $this->getLayerScriptPath();
-        $profilePrefixes = $this->getProfilePrefixes();
-
-        if (!array_key_exists('releaseName', $profileOptions)) {
-            $profileOptions['releaseName'] = substr($layerName, 0, strpos($layerName, '.'));
-        }
-
-        $profile = $profileOptions;
-        $profile['layers'] = array(array(
-            'name' => $layerScriptPath,
-            'layerDependencies' => array(),
-            'dependencies' => array($layerName),
-        ));
-        $profile['prefixes'] = array_values($profilePrefixes);
-
-        return 'dependencies = ' . $this->_filterJsonProfileToJavascript($profile) . ';';
-    }
-
-    /**
-     * Retrieve module prefix
-     *
-     * @param  string $module
-     * @return void
-     */
-    protected function _getPrefix($module)
-    {
-        $segments  = explode('.', $module, 2);
-        return $segments[0];
-    }
-
-    /**
-     * Filter a JSON build profile to JavaScript
-     *
-     * @param  string $profile
-     * @return string
-     */
-    protected function _filterJsonProfileToJavascript($profile)
-    {
-        require_once 'Zend/Json.php';
-        $profile = Zend_Json::encode($profile);
-        $profile = preg_replace('/"([^"]*)":/', '$1:', $profile);
-        $profile = preg_replace('/' . preg_quote('\\') . '/', '', $profile);
-        return $profile;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Data.php b/airtime_mvc/library/Zend/Dojo/Data.php
deleted file mode 100644
index a90d329b5..000000000
--- a/airtime_mvc/library/Zend/Dojo/Data.php
+++ /dev/null
@@ -1,563 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Data.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * dojo.data support for Zend Framework
- *
- * @uses       ArrayAccess
- * @uses       Iterator
- * @uses       Countable
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_Data implements ArrayAccess,Iterator,Countable
-{
-    /**
-     * Identifier field of item
-     * @var string|int
-     */
-    protected $_identifier;
-
-    /**
-     * Collected items
-     * @var array
-     */
-    protected $_items = array();
-
-    /**
-     * Label field of item
-     * @var string
-     */
-    protected $_label;
-
-    /**
-     * Data container metadata
-     * @var array
-     */
-    protected $_metadata = array();
-
-    /**
-     * Constructor
-     *
-     * @param  string|null $identifier
-     * @param  array|Traversable|null $items
-     * @param  string|null $label
-     * @return void
-     */
-    public function __construct($identifier = null, $items = null, $label = null)
-    {
-        if (null !== $identifier) {
-            $this->setIdentifier($identifier);
-        }
-        if (null !== $items) {
-            $this->setItems($items);
-        }
-        if (null !== $label) {
-            $this->setLabel($label);
-        }
-    }
-
-    /**
-     * Set the items to collect
-     *
-     * @param array|Traversable $items
-     * @return Zend_Dojo_Data
-     */
-    public function setItems($items)
-    {
-        $this->clearItems();
-        return $this->addItems($items);
-    }
-
-    /**
-     * Set an individual item, optionally by identifier (overwrites)
-     *
-     * @param  array|object $item
-     * @param  string|null $identifier
-     * @return Zend_Dojo_Data
-     */
-    public function setItem($item, $id = null)
-    {
-        $item = $this->_normalizeItem($item, $id);
-        $this->_items[$item['id']] = $item['data'];
-        return $this;
-    }
-
-    /**
-     * Add an individual item, optionally by identifier
-     *
-     * @param  array|object $item
-     * @param  string|null $id
-     * @return Zend_Dojo_Data
-     */
-    public function addItem($item, $id = null)
-    {
-        $item = $this->_normalizeItem($item, $id);
-
-        if ($this->hasItem($item['id'])) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Overwriting items using addItem() is not allowed');
-        }
-
-        $this->_items[$item['id']] = $item['data'];
-
-        return $this;
-    }
-
-    /**
-     * Add multiple items at once
-     *
-     * @param  array|Traversable $items
-     * @return Zend_Dojo_Data
-     */
-    public function addItems($items)
-    {
-        if (!is_array($items) && (!is_object($items) || !($items instanceof Traversable))) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Only arrays and Traversable objects may be added to ' . __CLASS__);
-        }
-
-        foreach ($items as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get all items as an array
-     *
-     * Serializes items to arrays.
-     *
-     * @return array
-     */
-    public function getItems()
-    {
-        return $this->_items;
-    }
-
-    /**
-     * Does an item with the given identifier exist?
-     *
-     * @param  string|int $id
-     * @return bool
-     */
-    public function hasItem($id)
-    {
-        return array_key_exists($id, $this->_items);
-    }
-
-    /**
-     * Retrieve an item by identifier
-     *
-     * Item retrieved will be flattened to an array.
-     *
-     * @param  string $id
-     * @return array
-     */
-    public function getItem($id)
-    {
-        if (!$this->hasItem($id)) {
-            return null;
-        }
-
-        return $this->_items[$id];
-    }
-
-    /**
-     * Remove item by identifier
-     *
-     * @param  string $id
-     * @return Zend_Dojo_Data
-     */
-    public function removeItem($id)
-    {
-        if ($this->hasItem($id)) {
-            unset($this->_items[$id]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove all items at once
-     *
-     * @return Zend_Dojo_Data
-     */
-    public function clearItems()
-    {
-        $this->_items = array();
-        return $this;
-    }
-
-
-    /**
-     * Set identifier for item lookups
-     *
-     * @param  string|int|null $identifier
-     * @return Zend_Dojo_Data
-     */
-    public function setIdentifier($identifier)
-    {
-        if (null === $identifier) {
-            $this->_identifier = null;
-        } elseif (is_string($identifier)) {
-            $this->_identifier = $identifier;
-        } elseif (is_numeric($identifier)) {
-            $this->_identifier = (int) $identifier;
-        } else {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Invalid identifier; please use a string or integer');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve current item identifier
-     *
-     * @return string|int|null
-     */
-    public function getIdentifier()
-    {
-        return $this->_identifier;
-    }
-
-
-    /**
-     * Set label to use for displaying item associations
-     *
-     * @param  string|null $label
-     * @return Zend_Dojo_Data
-     */
-    public function setLabel($label)
-    {
-        if (null === $label) {
-            $this->_label = null;
-        } else {
-            $this->_label = (string) $label;
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve item association label
-     *
-     * @return string|null
-     */
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    /**
-     * Set metadata by key or en masse
-     *
-     * @param  string|array $spec
-     * @param  mixed $value
-     * @return Zend_Dojo_Data
-     */
-    public function setMetadata($spec, $value = null)
-    {
-        if (is_string($spec) && (null !== $value)) {
-            $this->_metadata[$spec] = $value;
-        } elseif (is_array($spec)) {
-            foreach ($spec as $key => $value) {
-                $this->setMetadata($key, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get metadata item or all metadata
-     *
-     * @param  null|string $key Metadata key when pulling single metadata item
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        if (null === $key) {
-            return $this->_metadata;
-        }
-
-        if (array_key_exists($key, $this->_metadata)) {
-            return $this->_metadata[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Clear individual or all metadata item(s)
-     *
-     * @param  null|string $key
-     * @return Zend_Dojo_Data
-     */
-    public function clearMetadata($key = null)
-    {
-        if (null === $key) {
-            $this->_metadata = array();
-        } elseif (array_key_exists($key, $this->_metadata)) {
-            unset($this->_metadata[$key]);
-        }
-        return $this;
-    }
-
-    /**
-     * Load object from array
-     *
-     * @param  array $data
-     * @return Zend_Dojo_Data
-     */
-    public function fromArray(array $data)
-    {
-        if (array_key_exists('identifier', $data)) {
-            $this->setIdentifier($data['identifier']);
-        }
-        if (array_key_exists('label', $data)) {
-            $this->setLabel($data['label']);
-        }
-        if (array_key_exists('items', $data) && is_array($data['items'])) {
-            $this->setItems($data['items']);
-        } else {
-            $this->clearItems();
-        }
-        return $this;
-    }
-
-    /**
-     * Load object from JSON
-     *
-     * @param  string $json
-     * @return Zend_Dojo_Data
-     */
-    public function fromJson($json)
-    {
-        if (!is_string($json)) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('fromJson() expects JSON input');
-        }
-        require_once 'Zend/Json.php';
-        $data = Zend_Json::decode($json);
-        return $this->fromArray($data);
-    }
-
-    /**
-     * Seralize entire data structure, including identifier and label, to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        if (null === ($identifier = $this->getIdentifier())) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Serialization requires that an identifier be present in the object; first call setIdentifier()');
-        }
-
-        $array = array(
-            'identifier' => $identifier,
-            'items'      => array_values($this->getItems()),
-        );
-
-        $metadata = $this->getMetadata();
-        if (!empty($metadata)) {
-            foreach ($metadata as $key => $value) {
-                $array[$key] = $value;
-            }
-        }
-
-        if (null !== ($label = $this->getLabel())) {
-            $array['label'] = $label;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Serialize to JSON (dojo.data format)
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($this->toArray());
-    }
-
-    /**
-     * Serialize to string (proxy to {@link toJson()})
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-
-    /**
-     * ArrayAccess: does offset exist?
-     *
-     * @param  string|int $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return (null !== $this->getItem($offset));
-    }
-
-    /**
-     * ArrayAccess: retrieve by offset
-     *
-     * @param  string|int $offset
-     * @return array
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getItem($offset);
-    }
-
-    /**
-     * ArrayAccess: set value by offset
-     *
-     * @param  string $offset
-     * @param  array|object|null $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->setItem($value, $offset);
-    }
-
-    /**
-     * ArrayAccess: unset value by offset
-     *
-     * @param  string $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        $this->removeItem($offset);
-    }
-
-    /**
-     * Iterator: get current value
-     *
-     * @return array
-     */
-    public function current()
-    {
-        return current($this->_items);
-    }
-
-    /**
-     * Iterator: get current key
-     *
-     * @return string|int
-     */
-    public function key()
-    {
-        return key($this->_items);
-    }
-
-    /**
-     * Iterator: get next item
-     *
-     * @return void
-     */
-    public function next()
-    {
-        return next($this->_items);
-    }
-
-    /**
-     * Iterator: rewind to first value in collection
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        return reset($this->_items);
-    }
-
-    /**
-     * Iterator: is item valid?
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return (bool) $this->current();
-    }
-
-    /**
-     * Countable: how many items are present
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_items);
-    }
-
-    /**
-     * Normalize an item to attach to the collection
-     *
-     * @param  array|object $item
-     * @param  string|int|null $id
-     * @return array
-     */
-    protected function _normalizeItem($item, $id)
-    {
-        if (null === ($identifier = $this->getIdentifier())) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('You must set an identifier prior to adding items');
-        }
-
-        if (!is_object($item) && !is_array($item)) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Only arrays and objects may be attached');
-        }
-
-        if (is_object($item)) {
-            if (method_exists($item, 'toArray')) {
-                $item = $item->toArray();
-            } else {
-                $item = get_object_vars($item);
-            }
-        }
-
-        if ((null === $id) && !array_key_exists($identifier, $item)) {
-            require_once 'Zend/Dojo/Exception.php';
-            throw new Zend_Dojo_Exception('Item must contain a column matching the currently set identifier');
-        } elseif (null === $id) {
-            $id = $item[$identifier];
-        } else {
-            $item[$identifier] = $id;
-        }
-
-        return array(
-            'id'   => $id,
-            'data' => $item,
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Exception.php b/airtime_mvc/library/Zend/Dojo/Exception.php
deleted file mode 100644
index a057d5e9d..000000000
--- a/airtime_mvc/library/Zend/Dojo/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Dojo
- *
- * @uses       Zend_Exception
- * @package    Zend_Dojo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form.php b/airtime_mvc/library/Zend/Dojo/Form.php
deleted file mode 100644
index 21f421e94..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form */
-require_once 'Zend/Form.php';
-
-/**
- * Dijit-enabled Form
- *
- * @uses       Zend_Form
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form extends Zend_Form
-{
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config|null $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->addPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addPrefixPath('Zend_Dojo_Form_Element', 'Zend/Dojo/Form/Element', 'element')
-             ->addElementPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addDisplayGroupPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator')
-             ->setDefaultDisplayGroupClass('Zend_Dojo_Form_DisplayGroup');
-        parent::__construct($options);
-    }
-
-    /**
-     * Load the default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                 ->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form_dojo'))
-                 ->addDecorator('DijitForm');
-        }
-    }
-
-    /**
-     * Set the view object
-     *
-     * Ensures that the view object has the dojo view helper path set.
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            if (false === $view->getPluginLoader('helper')->getPaths('Zend_Dojo_View_Helper')) {
-                $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
-            }
-        }
-        return parent::setView($view);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
deleted file mode 100644
index 4740d7030..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionContainer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * AccordionContainer
- *
- * Render a dijit AccordionContainer
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_AccordionContainer extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'AccordionContainer';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionPane.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionPane.php
deleted file mode 100644
index d5e6c3366..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/AccordionPane.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * AccordionPane
- *
- * Render a dijit AccordionPane
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_AccordionPane extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'AccordionPane';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/BorderContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/BorderContainer.php
deleted file mode 100644
index be7c621da..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/BorderContainer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * BorderContainer
- *
- * Render a dijit BorderContainer
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_BorderContainer extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'BorderContainer';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/ContentPane.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/ContentPane.php
deleted file mode 100644
index 3942b9548..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/ContentPane.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * ContentPane
- *
- * Render a dijit ContentPane
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_ContentPane extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'ContentPane';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitContainer.php
deleted file mode 100644
index 2fd50ee3f..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitContainer.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Dojo_Form_Decorator_DijitContainer
- *
- * Render a dojo dijit layout container via a view helper
- *
- * Accepts the following options:
- * - helper:    the name of the view helper to use
- *
- * Assumes the view helper accepts four parameters, the id, content, dijit
- * parameters, and (X)HTML attributes; these will be provided by the element.
- *
- * @uses       Zend_Form_Decorator_Abstract
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper;
-
-    /**
-     * Element attributes
-     * @var array
-     */
-    protected $_attribs;
-
-    /**
-     * Dijit option parameters
-     * @var array
-     */
-    protected $_dijitParams;
-
-    /**
-     * Container title
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Get view helper for rendering container
-     *
-     * @return string
-     */
-    public function getHelper()
-    {
-        if (null === $this->_helper) {
-            require_once 'Zend/Form/Decorator/Exception.php';
-            throw new Zend_Form_Decorator_Exception('No view helper specified fo DijitContainer decorator');
-        }
-        return $this->_helper;
-    }
-
-    /**
-     * Get element attributes
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        if (null === $this->_attribs) {
-            $attribs = $this->getElement()->getAttribs();
-            if (array_key_exists('dijitParams', $attribs)) {
-                unset($attribs['dijitParams']);
-            }
-            $this->_attribs = $attribs;
-        }
-        return $this->_attribs;
-    }
-
-    /**
-     * Get dijit option parameters
-     *
-     * @return array
-     */
-    public function getDijitParams()
-    {
-        if (null === $this->_dijitParams) {
-            $attribs = $this->getElement()->getAttribs();
-            if (array_key_exists('dijitParams', $attribs)) {
-                $this->_dijitParams = $attribs['dijitParams'];
-            } else {
-                $this->_dijitParams = array();
-            }
-
-            $options = $this->getOptions();
-            if (array_key_exists('dijitParams', $options)) {
-                $this->_dijitParams = array_merge($this->_dijitParams, $options['dijitParams']);
-                $this->removeOption('dijitParams');
-            }
-        }
-
-        // Ensure we have a title param
-        if (!array_key_exists('title', $this->_dijitParams)) {
-            $this->_dijitParams['title'] = $this->getTitle();
-        }
-
-        return $this->_dijitParams;
-    }
-
-    /**
-     * Get title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (null === $this->_title) {
-            $title = null;
-            if (null !== ($element = $this->getElement())) {
-                if (method_exists($element, 'getLegend')) {
-                    $title = $element->getLegend();
-                }
-            }
-            if (empty($title) && (null !== ($title = $this->getOption('legend')))) {
-                $this->removeOption('legend');
-            }
-            if (empty($title) && (null !== ($title = $this->getOption('title')))) {
-                $this->removeOption('title');
-            }
-
-            if (!empty($title)) {
-                if (null !== ($translator = $element->getTranslator())) {
-                    $title = $translator->translate($title);
-                }
-                $this->_title = $title;
-            }
-        }
-
-        return (empty($this->_title) ? '' : $this->_title);
-    }
-
-    /**
-     * Render a dijit layout container
-     *
-     * Replaces $content entirely from currently set element.
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $dijitParams = $this->getDijitParams();
-        $attribs     = array_merge($this->getAttribs(), $this->getOptions());
-
-        if (array_key_exists('legend', $attribs)) {
-            if (!array_key_exists('title', $dijitParams) || empty($dijitParams['title'])) {
-                $dijitParams['title'] = $attribs['legend'];
-            }
-            unset($attribs['legend']);
-        }
-
-        $helper      = $this->getHelper();
-        $id          = $element->getId() . '-' . $helper;
-
-        if ($view->dojo()->hasDijit($id)) {
-            trigger_error(sprintf('Duplicate dijit ID detected for id "%s; temporarily generating uniqid"', $id), E_USER_WARNING);
-            $base = $id;
-            do {
-                $id = $base . '-' . uniqid();
-            } while ($view->dojo()->hasDijit($id));
-        }
-
-        return $view->$helper($id, $content, $dijitParams, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitElement.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitElement.php
deleted file mode 100644
index 9f6e06180..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitElement.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_ViewHelper */
-require_once 'Zend/Form/Decorator/ViewHelper.php';
-
-/**
- * Zend_Dojo_Form_Decorator_DijitElement
- *
- * Render a dojo dijit element via a view helper
- *
- * Accepts the following options:
- * - separator: string with which to separate passed in content and generated content
- * - placement: whether to append or prepend the generated content to the passed in content
- * - helper:    the name of the view helper to use
- *
- * Assumes the view helper accepts three parameters, the name, value, and
- * optional attributes; these will be provided by the element.
- *
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitElement.php 20622 2010-01-25 20:25:57Z matthew $
- */
-class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelper
-{
-    /**
-     * Element attributes
-     * @var array
-     */
-    protected $_attribs;
-
-    /**
-     * Element types that represent buttons
-     * @var array
-     */
-    protected $_buttonTypes = array(
-        'Zend_Dojo_Form_Element_Button',
-        'Zend_Form_Element_Button',
-        'Zend_Form_Element_Reset',
-        'Zend_Form_Element_Submit',
-    );
-
-    /**
-     * Dijit option parameters
-     * @var array
-     */
-    protected $_dijitParams = array();
-
-    /**
-     * Get element attributes
-     *
-     * @return array
-     */
-    public function getElementAttribs()
-    {
-        if (null === $this->_attribs) {
-            $this->_attribs = parent::getElementAttribs();
-            if (array_key_exists('dijitParams', $this->_attribs)) {
-                $this->setDijitParams($this->_attribs['dijitParams']);
-                unset($this->_attribs['dijitParams']);
-            }
-        }
-
-        return $this->_attribs;
-    }
-
-    /**
-     * Set a single dijit option parameter
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Dojo_Form_Decorator_DijitContainer
-     */
-    public function setDijitParam($key, $value)
-    {
-        $this->_dijitParams[(string) $key] = $value;
-        return $this;
-    }
-
-    /**
-     * Set dijit option parameters
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Decorator_DijitContainer
-     */
-    public function setDijitParams(array $params)
-    {
-        $this->_dijitParams = array_merge($this->_dijitParams, $params);
-        return $this;
-    }
-
-    /**
-     * Retrieve a single dijit option parameter
-     *
-     * @param  string $key
-     * @return mixed|null
-     */
-    public function getDijitParam($key)
-    {
-        $this->getElementAttribs();
-        $key = (string) $key;
-        if (array_key_exists($key, $this->_dijitParams)) {
-            return $this->_dijitParams[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get dijit option parameters
-     *
-     * @return array
-     */
-    public function getDijitParams()
-    {
-        $this->getElementAttribs();
-        return $this->_dijitParams;
-    }
-
-    /**
-     * Render an element using a view helper
-     *
-     * Determine view helper from 'helper' option, or, if none set, from
-     * the element type. Then call as
-     * helper($element->getName(), $element->getValue(), $element->getAttribs())
-     *
-     * @param  string $content
-     * @return string
-     * @throws Zend_Form_Decorator_Exception if element or view are not registered
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view = $element->getView();
-        if (null === $view) {
-            require_once 'Zend/Form/Decorator/Exception.php';
-            throw new Zend_Form_Decorator_Exception('DijitElement decorator cannot render without a registered view object');
-        }
-
-        $options = null;
-        $helper    = $this->getHelper();
-        $separator = $this->getSeparator();
-        $value     = $this->getValue($element);
-        $attribs   = $this->getElementAttribs();
-        $name      = $element->getFullyQualifiedName();
-
-        $dijitParams = $this->getDijitParams();
-        $dijitParams['required'] = $element->isRequired();
-
-        $id = $element->getId();
-        if ($view->dojo()->hasDijit($id)) {
-            trigger_error(sprintf('Duplicate dijit ID detected for id "%s; temporarily generating uniqid"', $id), E_USER_NOTICE);
-            $base = $id;
-            do {
-                $id = $base . '-' . uniqid();
-            } while ($view->dojo()->hasDijit($id));
-        }
-        $attribs['id'] = $id;
-
-        if (array_key_exists('options', $attribs)) {
-               $options = $attribs['options'];
-        }
-
-        $elementContent = $view->$helper($name, $value, $dijitParams, $attribs, $options);
-        switch ($this->getPlacement()) {
-            case self::APPEND:
-                return $content . $separator . $elementContent;
-            case self::PREPEND:
-                return $elementContent . $separator . $content;
-            default:
-                return $elementContent;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitForm.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitForm.php
deleted file mode 100644
index 83c1c3f32..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/DijitForm.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * Zend_Dojo_Form_Decorator_DijitForm
- *
- * Render a dojo form dijit via a view helper
- *
- * Accepts the following options:
- * - helper:    the name of the view helper to use
- *
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitForm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * Render a form
-     *
-     * Replaces $content entirely from currently set element.
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $dijitParams = $this->getDijitParams();
-        $attribs     = array_merge($this->getAttribs(), $this->getOptions());
-
-        return $view->form($element->getName(), $attribs, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/SplitContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/SplitContainer.php
deleted file mode 100644
index db7de0bd9..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/SplitContainer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * SplitContainer
- *
- * Render a dijit SplitContainer
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SplitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_SplitContainer extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'SplitContainer';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/StackContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/StackContainer.php
deleted file mode 100644
index 2cc8a6494..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/StackContainer.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * StackContainer
- *
- * Render a dijit StackContainer
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StackContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_StackContainer extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'StackContainer';
-}
-
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Decorator/TabContainer.php b/airtime_mvc/library/Zend/Dojo/Form/Decorator/TabContainer.php
deleted file mode 100644
index 3541e9f61..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Decorator/TabContainer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Decorator_DijitContainer */
-require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php';
-
-/**
- * TabContainer
- *
- * Render a dijit TabContainer
- *
- * @uses       Zend_Dojo_Form_Decorator_DijitContainer
- * @package    Zend_Dojo
- * @subpackage Form_Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TabContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Decorator_TabContainer extends Zend_Dojo_Form_Decorator_DijitContainer
-{
-    /**
-     * View helper
-     * @var string
-     */
-    protected $_helper = 'TabContainer';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/DisplayGroup.php b/airtime_mvc/library/Zend/Dojo/Form/DisplayGroup.php
deleted file mode 100644
index 6118a8c54..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/DisplayGroup.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_DisplayGroup */
-require_once 'Zend/Form/DisplayGroup.php';
-
-/**
- * Dijit-enabled DisplayGroup
- *
- * @uses       Zend_Form_DisplayGroup
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DisplayGroup.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup
-{
-    /**
-     * Constructor
-     *
-     * @param  string $name
-     * @param  Zend_Loader_PluginLoader $loader
-     * @param  array|Zend_Config|null $options
-     * @return void
-     */
-    public function __construct($name, Zend_Loader_PluginLoader $loader, $options = null)
-    {
-        parent::__construct($name, $loader, $options);
-        $this->addPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator');
-    }
-
-    /**
-     * Set the view object
-     *
-     * Ensures that the view object has the dojo view helper path set.
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            if (false === $view->getPluginLoader('helper')->getPaths('Zend_Dojo_View_Helper')) {
-                $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
-            }
-        }
-        return parent::setView($view);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/Button.php b/airtime_mvc/library/Zend/Dojo/Form/Element/Button.php
deleted file mode 100644
index f22e6fd9f..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/Button.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * Button dijit
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Use Button dijit view helper
-     * @var string
-     */
-    public $helper = 'Button';
-
-    /**
-     * Constructor
-     *
-     * @param  string|array|Zend_Config $spec Element name or configuration
-     * @param  string|array|Zend_Config $options Element value or configuration
-     * @return void
-     */
-    public function __construct($spec, $options = null)
-    {
-        if (is_string($spec) && ((null !== $options) && is_string($options))) {
-            $options = array('label' => $options);
-        }
-
-        parent::__construct($spec, $options);
-    }
-
-    /**
-     * Return label
-     *
-     * If no label is present, returns the currently set name.
-     *
-     * If a translator is present, returns the translated label.
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        $value = parent::getLabel();
-
-        if (null === $value) {
-            $value = $this->getName();
-        }
-
-        if (null !== ($translator = $this->getTranslator())) {
-            return $translator->translate($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Has this submit button been selected?
-     *
-     * @return bool
-     */
-    public function isChecked()
-    {
-        $value = $this->getValue();
-
-        if (empty($value)) {
-            return false;
-        }
-        if ($value != $this->getLabel()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Default decorators
-     *
-     * Uses only 'DijitElement' and 'DtDdWrapper' decorators by default.
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('DijitElement')
-                 ->addDecorator('DtDdWrapper');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/CheckBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/CheckBox.php
deleted file mode 100644
index 7a259c78e..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/CheckBox.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * CheckBox dijit
- *
- * Note: this would be easier with mixins or traits...
- *
- * @uses       Zend_Dojo_Form_Element_Dijit
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Is the checkbox checked?
-     * @var bool
-     */
-    public $checked = false;
-
-    /**
-     * Use formCheckbox view helper by default
-     * @var string
-     */
-    public $helper = 'CheckBox';
-
-    /**
-     * Options that will be passed to the view helper
-     * @var array
-     */
-    public $options = array(
-        'checkedValue'   => '1',
-        'uncheckedValue' => '0',
-    );
-
-    /**
-     * Value when checked
-     * @var string
-     */
-    protected $_checkedValue = '1';
-
-    /**
-     * Value when not checked
-     * @var string
-     */
-    protected $_uncheckedValue = '0';
-
-    /**
-     * Current value
-     * @var string 0 or 1
-     */
-    protected $_value = '0';
-
-    /**
-     * Set options
-     *
-     * Intercept checked and unchecked values and set them early; test stored
-     * value against checked and unchecked values after configuration.
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setOptions(array $options)
-    {
-        if (array_key_exists('checkedValue', $options)) {
-            $this->setCheckedValue($options['checkedValue']);
-            unset($options['checkedValue']);
-        }
-        if (array_key_exists('uncheckedValue', $options)) {
-            $this->setUncheckedValue($options['uncheckedValue']);
-            unset($options['uncheckedValue']);
-        }
-        parent::setOptions($options);
-
-        $curValue = $this->getValue();
-        $test     = array($this->getCheckedValue(), $this->getUncheckedValue());
-        if (!in_array($curValue, $test)) {
-            $this->setValue($curValue);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set value
-     *
-     * If value matches checked value, sets to that value, and sets the checked
-     * flag to true.
-     *
-     * Any other value causes the unchecked value to be set as the current
-     * value, and the checked flag to be set as false.
-     *
-     *
-     * @param  mixed $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setValue($value)
-    {
-        if ($value == $this->getCheckedValue()) {
-            parent::setValue($value);
-            $this->checked = true;
-        } else {
-            parent::setValue($this->getUncheckedValue());
-            $this->checked = false;
-        }
-        return $this;
-    }
-
-    /**
-     * Set checked value
-     *
-     * @param  string $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setCheckedValue($value)
-    {
-        $this->_checkedValue = (string) $value;
-        $this->options['checkedValue'] = $value;
-        return $this;
-    }
-
-    /**
-     * Get value when checked
-     *
-     * @return string
-     */
-    public function getCheckedValue()
-    {
-        return $this->_checkedValue;
-    }
-
-    /**
-     * Set unchecked value
-     *
-     * @param  string $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setUncheckedValue($value)
-    {
-        $this->_uncheckedValue = (string) $value;
-        $this->options['uncheckedValue'] = $value;
-        return $this;
-    }
-
-    /**
-     * Get value when not checked
-     *
-     * @return string
-     */
-    public function getUncheckedValue()
-    {
-        return $this->_uncheckedValue;
-    }
-
-    /**
-     * Set checked flag
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setChecked($flag)
-    {
-        $this->checked = (bool) $flag;
-        if ($this->checked) {
-            $this->setValue($this->getCheckedValue());
-        } else {
-            $this->setValue($this->getUncheckedValue());
-        }
-        return $this;
-    }
-
-    /**
-     * Get checked flag
-     *
-     * @return bool
-     */
-    public function isChecked()
-    {
-        return $this->checked;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/ComboBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/ComboBox.php
deleted file mode 100644
index 50ef006d8..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/ComboBox.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_DijitMulti */
-require_once 'Zend/Dojo/Form/Element/DijitMulti.php';
-
-/**
- * ComboBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_DijitMulti
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_ComboBox extends Zend_Dojo_Form_Element_DijitMulti
-{
-    /**
-     * Use ComboBox dijit view helper
-     * @var string
-     */
-    public $helper = 'ComboBox';
-
-    /**
-     * Flag: autoregister inArray validator?
-     * @var bool
-     */
-    protected $_registerInArrayValidator = false;
-
-    /**
-     * Get datastore information
-     *
-     * @return array
-     */
-    public function getStoreInfo()
-    {
-        if (!$this->hasDijitParam('store')) {
-            $this->dijitParams['store'] = array();
-        }
-        return $this->dijitParams['store'];
-    }
-
-    /**
-     * Set datastore identifier
-     *
-     * @param  string $identifier
-     * @return Zend_Dojo_Form_Element_ComboBox
-     */
-    public function setStoreId($identifier)
-    {
-        $store = $this->getStoreInfo();
-        $store['store'] = (string) $identifier;
-        $this->setDijitParam('store', $store);
-        return $this;
-    }
-
-    /**
-     * Get datastore identifier
-     *
-     * @return string|null
-     */
-    public function getStoreId()
-    {
-        $store = $this->getStoreInfo();
-        if (array_key_exists('store', $store)) {
-            return $store['store'];
-        }
-        return null;
-    }
-
-    /**
-     * Set datastore dijit type
-     *
-     * @param  string $dojoType
-     * @return Zend_Dojo_Form_Element_ComboBox
-     */
-    public function setStoreType($dojoType)
-    {
-        $store = $this->getStoreInfo();
-        $store['type'] = (string) $dojoType;
-        $this->setDijitParam('store', $store);
-        return $this;
-    }
-
-    /**
-     * Get datastore dijit type
-     *
-     * @return string|null
-     */
-    public function getStoreType()
-    {
-        $store = $this->getStoreInfo();
-        if (array_key_exists('type', $store)) {
-            return $store['type'];
-        }
-        return null;
-    }
-
-    /**
-     * Set datastore parameters
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_ComboBox
-     */
-    public function setStoreParams(array $params)
-    {
-        $store = $this->getStoreInfo();
-        $store['params'] = $params;
-        $this->setDijitParam('store', $store);
-        return $this;
-    }
-
-    /**
-     * Get datastore params
-     *
-     * @return array
-     */
-    public function getStoreParams()
-    {
-        $store = $this->getStoreInfo();
-        if (array_key_exists('params', $store)) {
-            return $store['params'];
-        }
-        return array();
-    }
-
-    /**
-     * Set autocomplete flag
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_Form_Element_ComboBox
-     */
-    public function setAutocomplete($flag)
-    {
-        $this->setDijitParam('autocomplete', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Get autocomplete flag
-     *
-     * @return bool
-     */
-    public function getAutocomplete()
-    {
-        if (!$this->hasDijitParam('autocomplete')) {
-            return false;
-        }
-        return $this->getDijitParam('autocomplete');
-    }
-
-    /**
-     * Is the value valid?
-     *
-     * @param  string $value
-     * @param  mixed $context
-     * @return bool
-     */
-    public function isValid($value, $context = null)
-    {
-        $storeInfo = $this->getStoreInfo();
-        if (!empty($storeInfo)) {
-            $this->setRegisterInArrayValidator(false);
-        }
-        return parent::isValid($value, $context);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/CurrencyTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
deleted file mode 100644
index 0ae161f07..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/CurrencyTextBox.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_NumberTextBox */
-require_once 'Zend/Dojo/Form/Element/NumberTextBox.php';
-
-/**
- * CurrencyTextBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_NumberTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_CurrencyTextBox extends Zend_Dojo_Form_Element_NumberTextBox
-{
-    /**
-     * Use CurrencyTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'CurrencyTextBox';
-
-    /**
-     * Set currency
-     *
-     * @param  string $currency
-     * @return Zend_Dojo_Form_Element_CurrencyTextBox
-     */
-    public function setCurrency($currency)
-    {
-        $this->setDijitParam('currency', (string) $currency);
-        return $this;
-    }
-
-    /**
-     * Retrieve currency
-     *
-     * @return string|null
-     */
-    public function getCurrency()
-    {
-        return $this->getDijitParam('currency');
-    }
-
-    /**
-     * Set currency symbol
-     *
-     * Casts to string, uppercases, and trims to three characters.
-     *
-     * @param  string $symbol
-     * @return Zend_Dojo_Form_Element_CurrencyTextBox
-     */
-    public function setSymbol($symbol)
-    {
-        $symbol = strtoupper((string) $symbol);
-        $length = strlen($symbol);
-        if (3 > $length) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception('Invalid symbol provided; please provide ISO 4217 alphabetic currency code');
-        }
-        if (3 < $length) {
-            $symbol = substr($symbol, 0, 3);
-        }
-
-        $this->setConstraint('symbol', $symbol);
-        return $this;
-    }
-
-    /**
-     * Retrieve symbol
-     *
-     * @return string|null
-     */
-    public function getSymbol()
-    {
-        return $this->getConstraint('symbol');
-    }
-
-    /**
-     * Set whether currency is fractional
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_Form_Element_CurrencyTextBox
-     */
-    public function setFractional($flag)
-    {
-        $this->setConstraint('fractional', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Get whether or not to present fractional values
-     *
-     * @return bool
-     */
-    public function getFractional()
-    {
-        return ('true' == $this->getConstraint('fractional'));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/DateTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/DateTextBox.php
deleted file mode 100644
index 23a3cbab6..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/DateTextBox.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_ValidationTextBox */
-require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php';
-
-/**
- * DateTextBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_ValidationTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_DateTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
-{
-    /**
-     * Use DateTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'DateTextBox';
-
-    /**
-     * Allowed formatLength types
-     * @var array
-     */
-    protected $_allowedFormatTypes = array(
-        'long',
-        'short',
-        'medium',
-        'full',
-    );
-
-    /**
-     * Allowed selector types
-     * @var array
-     */
-    protected $_allowedSelectorTypes = array(
-        'time',
-        'date',
-    );
-
-    /**
-     * Set am,pm flag
-     *
-     * @param  bool $am,pm
-     * @return Zend_Dojo_Form_Element_DateTextBox
-     */
-    public function setAmPm($flag)
-    {
-        $this->setConstraint('am,pm', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve am,pm flag
-     *
-     * @return bool
-     */
-    public function getAmPm()
-    {
-        if (!$this->hasConstraint('am,pm')) {
-            return false;
-        }
-        return ('true' ==$this->getConstraint('am,pm'));
-    }
-
-    /**
-     * Set strict flag
-     *
-     * @param  bool $strict
-     * @return Zend_Dojo_Form_Element_DateTextBox
-     */
-    public function setStrict($flag)
-    {
-        $this->setConstraint('strict', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve strict flag
-     *
-     * @return bool
-     */
-    public function getStrict()
-    {
-        if (!$this->hasConstraint('strict')) {
-            return false;
-        }
-        return ('true' == $this->getConstraint('strict'));
-    }
-
-    /**
-     * Set locale
-     *
-     * @param  string $locale
-     * @return Zend_Dojo_Form_Element_DateTextBox
-     */
-    public function setLocale($locale)
-    {
-        $this->setConstraint('locale', (string) $locale);
-        return $this;
-    }
-
-    /**
-     * Retrieve locale
-     *
-     * @return string|null
-     */
-    public function getLocale()
-    {
-        return $this->getConstraint('locale');
-    }
-
-    /**
-     * Set date format pattern
-     *
-     * @param  string $pattern
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setDatePattern($pattern)
-    {
-        $this->setConstraint('datePattern', (string) $pattern);
-        return $this;
-    }
-
-    /**
-     * Retrieve date format pattern
-     *
-     * @return string|null
-     */
-    public function getDatePattern()
-    {
-        return $this->getConstraint('datePattern');
-    }
-
-    /**
-     * Set numeric format formatLength
-     *
-     * @see    $_allowedFormatTypes
-     * @param  string $formatLength
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setFormatLength($formatLength)
-    {
-        $formatLength = strtolower($formatLength);
-        if (!in_array($formatLength, $this->_allowedFormatTypes)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception(sprintf('Invalid formatLength "%s" specified', $formatLength));
-        }
-
-        $this->setConstraint('formatLength', $formatLength);
-        return $this;
-    }
-
-    /**
-     * Retrieve formatLength
-     *
-     * @return string|null
-     */
-    public function getFormatLength()
-    {
-        return $this->getConstraint('formatLength');
-    }
-
-    /**
-     * Set numeric format Selector
-     *
-     * @see    $_allowedSelectorTypes
-     * @param  string $selector
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setSelector($selector)
-    {
-        $selector = strtolower($selector);
-        if (!in_array($selector, $this->_allowedSelectorTypes)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception(sprintf('Invalid Selector "%s" specified', $selector));
-        }
-
-        $this->setConstraint('selector', $selector);
-        return $this;
-    }
-
-    /**
-     * Retrieve selector
-     *
-     * @return string|null
-     */
-    public function getSelector()
-    {
-        return $this->getConstraint('selector');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/Dijit.php b/airtime_mvc/library/Zend/Dojo/Form/Element/Dijit.php
deleted file mode 100644
index e8cfe19d8..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/Dijit.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element */
-require_once 'Zend/Form/Element.php';
-
-/**
- * Base element for dijit elements
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Dojo_Form_Element_Dijit extends Zend_Form_Element
-{
-    /**
-     * Dijit parameters
-     * @var array
-     */
-    public $dijitParams = array();
-
-    /**
-     * View helper to use
-     * @var string
-     */
-    public $helper;
-
-    /**
-     * Constructor
-     *
-     * @todo Should we set dojo view helper paths here?
-     * @param  mixed $spec
-     * @param  mixed $options
-     * @return void
-     */
-    public function __construct($spec, $options = null)
-    {
-        $this->addPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator');
-        parent::__construct($spec, $options);
-    }
-
-    /**
-     * Set a dijit parameter
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function setDijitParam($key, $value)
-    {
-        $key = (string) $key;
-        $this->dijitParams[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * Set multiple dijit params at once
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function setDijitParams(array $params)
-    {
-        $this->dijitParams = array_merge($this->dijitParams, $params);
-        return $this;
-    }
-
-    /**
-     * Does the given dijit parameter exist?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasDijitParam($key)
-    {
-        return array_key_exists($key, $this->dijitParams);
-    }
-
-    /**
-     * Get a single dijit parameter
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getDijitParam($key)
-    {
-        $key = (string) $key;
-        if ($this->hasDijitParam($key)) {
-            return $this->dijitParams[$key];
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all dijit parameters
-     *
-     * @return array
-     */
-    public function getDijitParams()
-    {
-        return $this->dijitParams;
-    }
-
-    /**
-     * Remove a single dijit parameter
-     *
-     * @param  string $key
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function removeDijitParam($key)
-    {
-        $key = (string) $key;
-        if (array_key_exists($key, $this->dijitParams)) {
-            unset($this->dijitParams[$key]);
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all dijit parameters
-     *
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function clearDijitParams()
-    {
-        $this->dijitParams = array();
-        return $this;
-    }
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('DijitElement')
-                 ->addDecorator('Errors')
-                 ->addDecorator('Description', array('tag' => 'p', 'class' => 'description'))
-                 ->addDecorator('HtmlTag', array('tag' => 'dd'))
-                 ->addDecorator('Label', array('tag' => 'dt'));
-        }
-    }
-
-    /**
-     * Set the view object
-     *
-     * Ensures that the view object has the dojo view helper path set.
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Dojo_Form_Element_Dijit
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            if (false === $view->getPluginLoader('helper')->getPaths('Zend_Dojo_View_Helper')) {
-                $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
-            }
-        }
-        return parent::setView($view);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/DijitMulti.php b/airtime_mvc/library/Zend/Dojo/Form/Element/DijitMulti.php
deleted file mode 100644
index a8e828d55..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/DijitMulti.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * CheckBox dijit
- *
- * Note: this would be easier with mixins or traits...
- *
- * @uses       Zend_Dojo_Form_Element_Dijit
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitMulti.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Dojo_Form_Element_DijitMulti extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Array of options for multi-item
-     * @var array
-     */
-    public $options = array();
-
-    /**
-     * Flag: autoregister inArray validator?
-     * @var bool
-     */
-    protected $_registerInArrayValidator = true;
-
-    /**
-     * Separator to use between options; defaults to '<br />'.
-     * @var string
-     */
-    protected $_separator = '<br />';
-
-    /**
-     * Which values are translated already?
-     * @var array
-     */
-    protected $_translated = array();
-
-    /**
-     * Retrieve separator
-     *
-     * @return mixed
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Set separator
-     *
-     * @param mixed $separator
-     * @return self
-     */
-    public function setSeparator($separator)
-    {
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * Retrieve options array
-     *
-     * @return array
-     */
-    protected function _getMultiOptions()
-    {
-        if (null === $this->options || !is_array($this->options)) {
-            $this->options = array();
-        }
-
-        return $this->options;
-    }
-
-    /**
-     * Add an option
-     *
-     * @param  string $option
-     * @param  string $value
-     * @return Zend_Form_Element_Multi
-     */
-    public function addMultiOption($option, $value = '')
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (!$this->_translateOption($option, $value)) {
-            $this->options[$option] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add many options at once
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Multi
-     */
-    public function addMultiOptions(array $options)
-    {
-        foreach ($options as $option => $value) {
-            if (is_array($value)
-                && array_key_exists('key', $value)
-                && array_key_exists('value', $value)
-            ) {
-                $this->addMultiOption($value['key'], $value['value']);
-            } else {
-                $this->addMultiOption($option, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set all options at once (overwrites)
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Multi
-     */
-    public function setMultiOptions(array $options)
-    {
-        $this->clearMultiOptions();
-        return $this->addMultiOptions($options);
-    }
-
-    /**
-     * Retrieve single multi option
-     *
-     * @param  string $option
-     * @return mixed
-     */
-    public function getMultiOption($option)
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (isset($this->options[$option])) {
-            $this->_translateOption($option, $this->options[$option]);
-            return $this->options[$option];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve options
-     *
-     * @return array
-     */
-    public function getMultiOptions()
-    {
-        $this->_getMultiOptions();
-        foreach ($this->options as $option => $value) {
-            $this->_translateOption($option, $value);
-        }
-        return $this->options;
-    }
-
-    /**
-     * Remove a single multi option
-     *
-     * @param  string $option
-     * @return bool
-     */
-    public function removeMultiOption($option)
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (isset($this->options[$option])) {
-            unset($this->options[$option]);
-            if (isset($this->_translated[$option])) {
-                unset($this->_translated[$option]);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all options
-     *
-     * @return Zend_Form_Element_Multi
-     */
-    public function clearMultiOptions()
-    {
-        $this->options = array();
-        $this->_translated = array();
-        return $this;
-    }
-
-    /**
-     * Set flag indicating whether or not to auto-register inArray validator
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element_Multi
-     */
-    public function setRegisterInArrayValidator($flag)
-    {
-        $this->_registerInArrayValidator = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get status of auto-register inArray validator flag
-     *
-     * @return bool
-     */
-    public function registerInArrayValidator()
-    {
-        return $this->_registerInArrayValidator;
-    }
-
-    /**
-     * Is the value provided valid?
-     *
-     * Autoregisters InArray validator if necessary.
-     *
-     * @param  string $value
-     * @param  mixed $context
-     * @return bool
-     */
-    public function isValid($value, $context = null)
-    {
-        if ($this->registerInArrayValidator()) {
-            if (!$this->getValidator('InArray')) {
-                $options = $this->getMultiOptions();
-                $this->addValidator(
-                    'InArray',
-                    true,
-                    array(array_keys($options))
-                );
-            }
-        }
-        return parent::isValid($value, $context);
-    }
-
-    /**
-     * Translate an option
-     *
-     * @param  string $option
-     * @param  string $value
-     * @return bool
-     */
-    protected function _translateOption($option, $value)
-    {
-        if (!isset($this->_translated[$option])) {
-            $this->options[$option] = $this->_translateValue($value);
-            if ($this->options[$option] === $value) {
-                return false;
-            }
-            $this->_translated[$option] = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Translate a value
-     *
-     * @param  array|string $value
-     * @return array|string
-     */
-    protected function _translateValue($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $key => $val) {
-                $value[$key] = $this->_translateValue($val);
-            }
-            return $value;
-        } else {
-            if (null !== ($translator = $this->getTranslator())) {
-                if ($translator->isTranslated($value)) {
-                    return $translator->translate($value);
-                }
-            }
-            return $value;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/Editor.php b/airtime_mvc/library/Zend/Dojo/Form/Element/Editor.php
deleted file mode 100644
index 79260c122..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/Editor.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Editor.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * Editor dijit
- *
- * @uses       Zend_Dojo_Form_Element_Dijit
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_Form_Element_Editor extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * @var string View helper
-     */
-    public $helper = 'Editor';
-
-    /**
-     * Add a single event to connect to the editing area
-     *
-     * @param  string $event
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addCaptureEvent($event)
-    {
-        $event = (string) $event;
-        $captureEvents = $this->getCaptureEvents();
-        if (in_array($event, $captureEvents)) {
-            return $this;
-        }
-
-        $captureEvents[] = (string) $event;
-        $this->setDijitParam('captureEvents', $captureEvents);
-        return $this;
-    }
-
-    /**
-     * Add multiple capture events
-     *
-     * @param  array $events
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addCaptureEvents(array $events)
-    {
-        foreach ($events as $event) {
-            $this->addCaptureEvent($event);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite many capture events at once
-     *
-     * @param  array $events
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setCaptureEvents(array $events)
-    {
-        $this->clearCaptureEvents();
-        $this->addCaptureEvents($events);
-        return $this;
-    }
-
-    /**
-     * Get all capture events
-     *
-     * @return array
-     */
-    public function getCaptureEvents()
-    {
-        if (!$this->hasDijitParam('captureEvents')) {
-            return array();
-        }
-        return $this->getDijitParam('captureEvents');
-    }
-
-    /**
-     * Is a given capture event registered?
-     *
-     * @param  string $event
-     * @return bool
-     */
-    public function hasCaptureEvent($event)
-    {
-        $captureEvents = $this->getCaptureEvents();
-        return in_array((string) $event, $captureEvents);
-    }
-
-    /**
-     * Remove a given capture event
-     *
-     * @param  string $event
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function removeCaptureEvent($event)
-    {
-        $event = (string) $event;
-        $captureEvents = $this->getCaptureEvents();
-        if (false === ($index = array_search($event, $captureEvents))) {
-            return $this;
-        }
-        unset($captureEvents[$index]);
-        $this->setDijitParam('captureEvents', $captureEvents);
-        return $this;
-    }
-
-    /**
-     * Clear all capture events
-     *
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function clearCaptureEvents()
-    {
-        return $this->removeDijitParam('captureEvents');
-    }
-
-    /**
-     * Add a single event to the dijit
-     *
-     * @param  string $event
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addEvent($event)
-    {
-        $event = (string) $event;
-        $events = $this->getEvents();
-        if (in_array($event, $events)) {
-            return $this;
-        }
-
-        $events[] = (string) $event;
-        $this->setDijitParam('events', $events);
-        return $this;
-    }
-
-    /**
-     * Add multiple events
-     *
-     * @param  array $events
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addEvents(array $events)
-    {
-        foreach ($events as $event) {
-            $this->addEvent($event);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite many events at once
-     *
-     * @param  array $events
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setEvents(array $events)
-    {
-        $this->clearEvents();
-        $this->addEvents($events);
-        return $this;
-    }
-
-    /**
-     * Get all events
-     *
-     * @return array
-     */
-    public function getEvents()
-    {
-        if (!$this->hasDijitParam('events')) {
-            return array();
-        }
-        return $this->getDijitParam('events');
-    }
-
-    /**
-     * Is a given event registered?
-     *
-     * @param  string $event
-     * @return bool
-     */
-    public function hasEvent($event)
-    {
-        $events = $this->getEvents();
-        return in_array((string) $event, $events);
-    }
-
-    /**
-     * Remove a given event
-     *
-     * @param  string $event
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function removeEvent($event)
-    {
-        $events = $this->getEvents();
-        if (false === ($index = array_search($event, $events))) {
-            return $this;
-        }
-        unset($events[$index]);
-        $this->setDijitParam('events', $events);
-        return $this;
-    }
-
-    /**
-     * Clear all events
-     *
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function clearEvents()
-    {
-        return $this->removeDijitParam('events');
-    }
-
-    /**
-     * Add a single editor plugin
-     *
-     * @param  string $plugin
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addPlugin($plugin)
-    {
-        $plugin = (string) $plugin;
-        $plugins = $this->getPlugins();
-        if (in_array($plugin, $plugins)) {
-            return $this;
-        }
-
-        $plugins[] = (string) $plugin;
-        $this->setDijitParam('plugins', $plugins);
-        return $this;
-    }
-
-    /**
-     * Add multiple plugins
-     *
-     * @param  array $plugins
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addPlugins(array $plugins)
-    {
-        foreach ($plugins as $plugin) {
-            $this->addPlugin($plugin);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite many plugins at once
-     *
-     * @param  array $plugins
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setPlugins(array $plugins)
-    {
-        $this->clearPlugins();
-        $this->addPlugins($plugins);
-        return $this;
-    }
-
-    /**
-     * Get all plugins
-     *
-     * @return array
-     */
-    public function getPlugins()
-    {
-        if (!$this->hasDijitParam('plugins')) {
-            return array();
-        }
-        return $this->getDijitParam('plugins');
-    }
-
-    /**
-     * Is a given plugin registered?
-     *
-     * @param  string $plugin
-     * @return bool
-     */
-    public function hasPlugin($plugin)
-    {
-        $plugins = $this->getPlugins();
-        return in_array((string) $plugin, $plugins);
-    }
-
-    /**
-     * Remove a given plugin
-     *
-     * @param  string $plugin
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function removePlugin($plugin)
-    {
-        $plugins = $this->getPlugins();
-        if (false === ($index = array_search($plugin, $plugins))) {
-            return $this;
-        }
-        unset($plugins[$index]);
-        $this->setDijitParam('plugins', $plugins);
-        return $this;
-    }
-
-    /**
-     * Clear all plugins
-     *
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function clearPlugins()
-    {
-        return $this->removeDijitParam('plugins');
-    }
-
-    /**
-     * Set edit action interval
-     *
-     * @param  int $interval
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setEditActionInterval($interval)
-    {
-        return $this->setDijitParam('editActionInterval', (int) $interval);
-    }
-
-    /**
-     * Get edit action interval; defaults to 3
-     *
-     * @return int
-     */
-    public function getEditActionInterval()
-    {
-        if (!$this->hasDijitParam('editActionInterval')) {
-            $this->setEditActionInterval(3);
-        }
-        return $this->getDijitParam('editActionInterval');
-    }
-
-    /**
-     * Set focus on load flag
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setFocusOnLoad($flag)
-    {
-        return $this->setDijitParam('focusOnLoad', (bool) $flag);
-    }
-
-    /**
-     * Retrieve focus on load flag
-     *
-     * @return bool
-     */
-    public function getFocusOnLoad()
-    {
-        if (!$this->hasDijitParam('focusOnLoad')) {
-             return false;
-        }
-        return $this->getDijitParam('focusOnLoad');
-    }
-
-    /**
-     * Set editor height
-     *
-     * @param  string|int $height
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setHeight($height)
-    {
-        if (!preg_match('/^\d+(em|px|%)?$/i', $height)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception('Invalid height provided; must be integer or CSS measurement');
-        }
-        if (!preg_match('/(em|px|%)$/', $height)) {
-            $height .= 'px';
-        }
-        return $this->setDijitParam('height', $height);
-    }
-
-    /**
-     * Retrieve height
-     *
-     * @return string
-     */
-    public function getHeight()
-    {
-        if (!$this->hasDijitParam('height')) {
-            return '300px';
-        }
-        return $this->getDijitParam('height');
-    }
-
-    /**
-     * Set whether or not to inherit parent's width
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setInheritWidth($flag)
-    {
-        return $this->setDijitParam('inheritWidth', (bool) $flag);
-    }
-
-    /**
-     * Whether or not to inherit the parent's width
-     *
-     * @return bool
-     */
-    public function getInheritWidth()
-    {
-        if (!$this->hasDijitParam('inheritWidth')) {
-            return false;
-        }
-        return $this->getDijitParam('inheritWidth');
-    }
-
-    /**
-     * Set minimum height of editor
-     *
-     * @param  string|int $minHeight
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setMinHeight($minHeight)
-    {
-        if (!preg_match('/^\d+(em)?$/i', $minHeight)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception('Invalid minHeight provided; must be integer or CSS measurement');
-        }
-        if ('em' != substr($minHeight, -2)) {
-            $minHeight .= 'em';
-        }
-        return $this->setDijitParam('minHeight', $minHeight);
-    }
-
-    /**
-     * Get minimum height of editor
-     *
-     * @return string
-     */
-    public function getMinHeight()
-    {
-        if (!$this->hasDijitParam('minHeight')) {
-            return '1em';
-        }
-        return $this->getDijitParam('minHeight');
-    }
-
-    /**
-     * Add a custom stylesheet
-     *
-     * @param  string $styleSheet
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addStyleSheet($styleSheet)
-    {
-        $stylesheets = $this->getStyleSheets();
-        if (strstr($stylesheets, ';')) {
-            $stylesheets = explode(';', $stylesheets);
-        } elseif (!empty($stylesheets)) {
-            $stylesheets = (array) $stylesheets;
-        } else {
-            $stylesheets = array();
-        }
-        if (!in_array($styleSheet, $stylesheets)) {
-            $stylesheets[] = (string) $styleSheet;
-        }
-        return $this->setDijitParam('styleSheets', implode(';', $stylesheets));
-    }
-
-    /**
-     * Add multiple custom stylesheets
-     *
-     * @param  array $styleSheets
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function addStyleSheets(array $styleSheets)
-    {
-        foreach ($styleSheets as $styleSheet) {
-            $this->addStyleSheet($styleSheet);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite all stylesheets
-     *
-     * @param  array $styleSheets
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setStyleSheets(array $styleSheets)
-    {
-        $this->clearStyleSheets();
-        return $this->addStyleSheets($styleSheets);
-    }
-
-    /**
-     * Get all stylesheets
-     *
-     * @return string
-     */
-    public function getStyleSheets()
-    {
-        if (!$this->hasDijitParam('styleSheets')) {
-            return '';
-        }
-        return $this->getDijitParam('styleSheets');
-    }
-
-    /**
-     * Is a given stylesheet registered?
-     *
-     * @param  string $styleSheet
-     * @return bool
-     */
-    public function hasStyleSheet($styleSheet)
-    {
-        $styleSheets = $this->getStyleSheets();
-        $styleSheets = explode(';', $styleSheets);
-        return in_array($styleSheet, $styleSheets);
-    }
-
-    /**
-     * Remove a single stylesheet
-     *
-     * @param  string $styleSheet
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function removeStyleSheet($styleSheet)
-    {
-        $styleSheets = $this->getStyleSheets();
-        $styleSheets = explode(';', $styleSheets);
-        if (false !== ($index = array_search($styleSheet, $styleSheets))) {
-            unset($styleSheets[$index]);
-            $this->setDijitParam('styleSheets', implode(';', $styleSheets));
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all stylesheets
-     *
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function clearStyleSheets()
-    {
-        if ($this->hasDijitParam('styleSheets')) {
-            $this->removeDijitParam('styleSheets');
-        }
-        return $this;
-    }
-
-    /**
-     * Set update interval
-     *
-     * @param  int $interval
-     * @return Zend_Dojo_Form_Element_Editor
-     */
-    public function setUpdateInterval($interval)
-    {
-        return $this->setDijitParam('updateInterval', (int) $interval);
-    }
-
-    /**
-     * Get update interval
-     *
-     * @return int
-     */
-    public function getUpdateInterval()
-    {
-        if (!$this->hasDijitParam('updateInterval')) {
-             return 200;
-        }
-        return $this->getDijitParam('updateInterval');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/FilteringSelect.php b/airtime_mvc/library/Zend/Dojo/Form/Element/FilteringSelect.php
deleted file mode 100644
index 50bc26198..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/FilteringSelect.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_ComboBox */
-require_once 'Zend/Dojo/Form/Element/ComboBox.php';
-
-/**
- * FilteringSelect dijit
- *
- * @uses       Zend_Dojo_Form_Element_ComboBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FilteringSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_FilteringSelect extends Zend_Dojo_Form_Element_ComboBox
-{
-    /**
-     * Use FilteringSelect dijit view helper
-     * @var string
-     */
-    public $helper = 'FilteringSelect';
-
-    /**
-     * Flag: autoregister inArray validator?
-     * @var bool
-     */
-    protected $_registerInArrayValidator = true;
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/HorizontalSlider.php b/airtime_mvc/library/Zend/Dojo/Form/Element/HorizontalSlider.php
deleted file mode 100644
index 61e3e1300..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/HorizontalSlider.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Slider */
-require_once 'Zend/Dojo/Form/Element/Slider.php';
-
-/**
- * HorizontalSlider dijit
- *
- * @uses       Zend_Dojo_Form_Element_Slider
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HorizontalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_HorizontalSlider extends Zend_Dojo_Form_Element_Slider
-{
-    /**
-     * Use HorizontalSlider dijit view helper
-     * @var string
-     */
-    public $helper = 'HorizontalSlider';
-
-    /**
-     * Get top decoration data
-     *
-     * @return array
-     */
-    public function getTopDecoration()
-    {
-        if ($this->hasDijitParam('topDecoration')) {
-            return $this->getDijitParam('topDecoration');
-        }
-        return array();
-    }
-
-    /**
-     * Set dijit to use with top decoration
-     *
-     * @param mixed $dijit
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setTopDecorationDijit($dijit)
-    {
-        $decoration = $this->getTopDecoration();
-        $decoration['dijit'] = (string) $dijit;
-        $this->setDijitParam('topDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set container to use with top decoration
-     *
-     * @param mixed $container
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setTopDecorationContainer($container)
-    {
-        $decoration = $this->getTopDecoration();
-        $decoration['container'] = (string) $container;
-        $this->setDijitParam('topDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set labels to use with top decoration
-     *
-     * @param  array $labels
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setTopDecorationLabels(array $labels)
-    {
-        $decoration = $this->getTopDecoration();
-        $decoration['labels'] = array_values($labels);
-        $this->setDijitParam('topDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set params to use with top decoration
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setTopDecorationParams(array $params)
-    {
-        $decoration = $this->getTopDecoration();
-        $decoration['params'] = $params;
-        $this->setDijitParam('topDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set attribs to use with top decoration
-     *
-     * @param  array $attribs
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setTopDecorationAttribs(array $attribs)
-    {
-        $decoration = $this->getTopDecoration();
-        $decoration['attribs'] = $attribs;
-        $this->setDijitParam('topDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Get bottom decoration data
-     *
-     * @return array
-     */
-    public function getBottomDecoration()
-    {
-        if ($this->hasDijitParam('bottomDecoration')) {
-            return $this->getDijitParam('bottomDecoration');
-        }
-        return array();
-    }
-
-    /**
-     * Set dijit to use with bottom decoration
-     *
-     * @param mixed $dijit
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setBottomDecorationDijit($dijit)
-    {
-        $decoration = $this->getBottomDecoration();
-        $decoration['dijit'] = (string) $dijit;
-        $this->setDijitParam('bottomDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set container to use with bottom decoration
-     *
-     * @param mixed $container
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setBottomDecorationContainer($container)
-    {
-        $decoration = $this->getBottomDecoration();
-        $decoration['container'] = (string) $container;
-        $this->setDijitParam('bottomDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set labels to use with bottom decoration
-     *
-     * @param  array $labels
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setBottomDecorationLabels(array $labels)
-    {
-        $decoration = $this->getBottomDecoration();
-        $decoration['labels'] = array_values($labels);
-        $this->setDijitParam('bottomDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set params to use with bottom decoration
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setBottomDecorationParams(array $params)
-    {
-        $decoration = $this->getBottomDecoration();
-        $decoration['params'] = $params;
-        $this->setDijitParam('bottomDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set attribs to use with bottom decoration
-     *
-     * @param  array $attribs
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setBottomDecorationAttribs(array $attribs)
-    {
-        $decoration = $this->getBottomDecoration();
-        $decoration['attribs'] = $attribs;
-        $this->setDijitParam('bottomDecoration', $decoration);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/NumberSpinner.php b/airtime_mvc/library/Zend/Dojo/Form/Element/NumberSpinner.php
deleted file mode 100644
index c91b82352..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/NumberSpinner.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_ValidationTextBox */
-require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php';
-
-/**
- * NumberSpinner dijit
- *
- * @uses       Zend_Dojo_Form_Element_ValidationTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberSpinner.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_NumberSpinner extends Zend_Dojo_Form_Element_ValidationTextBox
-{
-    /**
-     * Use NumberSpinner dijit view helper
-     * @var string
-     */
-    public $helper = 'NumberSpinner';
-
-    /**
-     * Set defaultTimeout
-     *
-     * @param  int $timeout
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setDefaultTimeout($timeout)
-    {
-        $this->setDijitParam('defaultTimeout', (int) $timeout);
-        return $this;
-    }
-
-    /**
-     * Retrieve defaultTimeout
-     *
-     * @return int|null
-     */
-    public function getDefaultTimeout()
-    {
-        return $this->getDijitParam('defaultTimeout');
-    }
-
-    /**
-     * Set timeoutChangeRate
-     *
-     * @param  int $rate
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setTimeoutChangeRate($rate)
-    {
-        $this->setDijitParam('timeoutChangeRate', (int) $rate);
-        return $this;
-    }
-
-    /**
-     * Retrieve timeoutChangeRate
-     *
-     * @return int|null
-     */
-    public function getTimeoutChangeRate()
-    {
-        return $this->getDijitParam('timeoutChangeRate');
-    }
-
-    /**
-     * Set largeDelta
-     *
-     * @param  int $delta
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setLargeDelta($delta)
-    {
-        $this->setDijitParam('largeDelta', (int) $delta);
-        return $this;
-    }
-
-    /**
-     * Retrieve largeDelta
-     *
-     * @return int|null
-     */
-    public function getLargeDelta()
-    {
-        return $this->getDijitParam('largeDelta');
-    }
-
-    /**
-     * Set smallDelta
-     *
-     * @param  int $delta
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setSmallDelta($delta)
-    {
-        $this->setDijitParam('smallDelta', (int) $delta);
-        return $this;
-    }
-
-    /**
-     * Retrieve smallDelta
-     *
-     * @return int|null
-     */
-    public function getSmallDelta()
-    {
-        return $this->getDijitParam('smallDelta');
-    }
-
-    /**
-     * Set intermediateChanges flag
-     *
-     * @param  bool $flag
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setIntermediateChanges($flag)
-    {
-        $this->setDijitParam('intermediateChanges', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve intermediateChanges flag
-     *
-     * @return bool
-     */
-    public function getIntermediateChanges()
-    {
-        if (!$this->hasDijitParam('intermediateChanges')) {
-            return false;
-        }
-        return $this->getDijitParam('intermediateChanges');
-    }
-
-    /**
-     * Set rangeMessage
-     *
-     * @param  string $message
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setRangeMessage($message)
-    {
-        $this->setDijitParam('rangeMessage', (string) $message);
-        return $this;
-    }
-
-    /**
-     * Retrieve rangeMessage
-     *
-     * @return string|null
-     */
-    public function getRangeMessage()
-    {
-        return $this->getDijitParam('rangeMessage');
-    }
-
-    /**
-     * Set minimum value
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setMin($value)
-    {
-        $constraints = array();
-        if ($this->hasDijitParam('constraints')) {
-            $constraints = $this->getDijitParam('constraints');
-        }
-        $constraints['min'] = (int) $value;
-        $this->setDijitParam('constraints', $constraints);
-        return $this;
-    }
-
-    /**
-     * Get minimum value
-     *
-     * @return null|int
-     */
-    public function getMin()
-    {
-        if (!$this->hasDijitParam('constraints')) {
-            return null;
-        }
-        $constraints = $this->getDijitParam('constraints');
-        if (!array_key_exists('min', $constraints)) {
-            return null;
-        }
-        return $constraints['min'];
-    }
-
-    /**
-     * Set maximum value
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_NumberSpinner
-     */
-    public function setMax($value)
-    {
-        $constraints = array();
-        if ($this->hasDijitParam('constraints')) {
-            $constraints = $this->getDijitParam('constraints');
-        }
-        $constraints['max'] = (int) $value;
-        $this->setDijitParam('constraints', $constraints);
-        return $this;
-    }
-
-    /**
-     * Get maximum value
-     *
-     * @return null|int
-     */
-    public function getMax()
-    {
-        if (!$this->hasDijitParam('constraints')) {
-            return null;
-        }
-        $constraints = $this->getDijitParam('constraints');
-        if (!array_key_exists('max', $constraints)) {
-            return null;
-        }
-        return $constraints['max'];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/NumberTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/NumberTextBox.php
deleted file mode 100644
index 274591faf..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/NumberTextBox.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_ValidationTextBox */
-require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php';
-
-/**
- * NumberTextBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_ValidationTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_NumberTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
-{
-    /**
-     * Use NumberTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'NumberTextBox';
-
-    /**
-     * Allowed numeric type formats
-     * @var array
-     */
-    protected $_allowedTypes = array(
-        'decimal',
-        'scientific',
-        'percent',
-        'currency',
-    );
-
-    /**
-     * Set locale
-     *
-     * @param  string $locale
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setLocale($locale)
-    {
-        $this->setConstraint('locale', (string) $locale);
-        return $this;
-    }
-
-    /**
-     * Retrieve locale
-     *
-     * @return string|null
-     */
-    public function getLocale()
-    {
-        return $this->getConstraint('locale');
-    }
-
-    /**
-     * Set numeric format pattern
-     *
-     * @param  string $pattern
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setPattern($pattern)
-    {
-        $this->setConstraint('pattern', (string) $pattern);
-        return $this;
-    }
-
-    /**
-     * Retrieve numeric format pattern
-     *
-     * @return string|null
-     */
-    public function getPattern()
-    {
-        return $this->getConstraint('pattern');
-    }
-
-    /**
-     * Set numeric format type
-     *
-     * @see    $_allowedTypes
-     * @param  string $type
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setType($type)
-    {
-        $type = strtolower($type);
-        if (!in_array($type, $this->_allowedTypes)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception(sprintf('Invalid numeric type "%s" specified', $type));
-        }
-
-        $this->setConstraint('type', $type);
-        return $this;
-    }
-
-    /**
-     * Retrieve type
-     *
-     * @return string|null
-     */
-    public function getType()
-    {
-        return $this->getConstraint('type');
-    }
-
-    /**
-     * Set decimal places
-     *
-     * @param  int $places
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setPlaces($places)
-    {
-        $this->setConstraint('places', (int) $places);
-        return $this;
-    }
-
-    /**
-     * Retrieve decimal places
-     *
-     * @return int|null
-     */
-    public function getPlaces()
-    {
-        return $this->getConstraint('places');
-    }
-
-    /**
-     * Set strict flag
-     *
-     * @param  bool $strict
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setStrict($flag)
-    {
-        $this->setConstraint('strict', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve strict flag
-     *
-     * @return bool
-     */
-    public function getStrict()
-    {
-        if (!$this->hasConstraint('strict')) {
-            return false;
-        }
-        return ('true' == $this->getConstraint('strict'));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/PasswordTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/PasswordTextBox.php
deleted file mode 100644
index 9a1a96d4d..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/PasswordTextBox.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_ValidationTextBox */
-require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php';
-
-/**
- * ValidationTextBox dijit tied to password input
- *
- * @uses       Zend_Dojo_Form_Element_ValidationTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PasswordTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_PasswordTextBox extends Zend_Dojo_Form_Element_ValidationTextBox
-{
-    /**
-     * Use PasswordTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'PasswordTextBox';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/RadioButton.php b/airtime_mvc/library/Zend/Dojo/Form/Element/RadioButton.php
deleted file mode 100644
index 78e942089..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/RadioButton.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_DijitMulti */
-require_once 'Zend/Dojo/Form/Element/DijitMulti.php';
-
-/**
- * RadioButton dijit
- *
- * @uses       Zend_Dojo_Form_Element_DijitMulti
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RadioButton.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_RadioButton extends Zend_Dojo_Form_Element_DijitMulti
-{
-    /**
-     * Use RadioButton dijit view helper
-     * @var string
-     */
-    public $helper = 'RadioButton';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/SimpleTextarea.php b/airtime_mvc/library/Zend/Dojo/Form/Element/SimpleTextarea.php
deleted file mode 100644
index 6507bcd41..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/SimpleTextarea.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * dijit.form.SimpleTextArea
- *
- * @uses       Zend_Dojo_Form_Element_Dijit
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_SimpleTextarea extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Use SimpleTextarea dijit view helper
-     * @var string
-     */
-    public $helper = 'SimpleTextarea';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/Slider.php b/airtime_mvc/library/Zend/Dojo/Form/Element/Slider.php
deleted file mode 100644
index 4a23b52d8..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/Slider.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * Abstract Slider dijit
- *
- * @uses       Zend_Dojo_Form_Element_Dijit
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Slider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Dojo_Form_Element_Slider extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Set clickSelect flag
-     *
-     * @param  bool $clickSelect
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setClickSelect($flag)
-    {
-        $this->setDijitParam('clickSelect', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve clickSelect flag
-     *
-     * @return bool
-     */
-    public function getClickSelect()
-    {
-        if (!$this->hasDijitParam('clickSelect')) {
-            return false;
-        }
-        return $this->getDijitParam('clickSelect');
-    }
-
-    /**
-     * Set intermediateChanges flag
-     *
-     * @param  bool $intermediateChanges
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setIntermediateChanges($flag)
-    {
-        $this->setDijitParam('intermediateChanges', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve intermediateChanges flag
-     *
-     * @return bool
-     */
-    public function getIntermediateChanges()
-    {
-        if (!$this->hasDijitParam('intermediateChanges')) {
-            return false;
-        }
-        return $this->getDijitParam('intermediateChanges');
-    }
-
-    /**
-     * Set showButtons flag
-     *
-     * @param  bool $showButtons
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setShowButtons($flag)
-    {
-        $this->setDijitParam('showButtons', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve showButtons flag
-     *
-     * @return bool
-     */
-    public function getShowButtons()
-    {
-        if (!$this->hasDijitParam('showButtons')) {
-            return false;
-        }
-        return $this->getDijitParam('showButtons');
-    }
-
-    /**
-     * Set discreteValues
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setDiscreteValues($value)
-    {
-        $this->setDijitParam('discreteValues', (int) $value);
-        return $this;
-    }
-
-    /**
-     * Retrieve discreteValues
-     *
-     * @return int|null
-     */
-    public function getDiscreteValues()
-    {
-        return $this->getDijitParam('discreteValues');
-    }
-
-    /**
-     * Set maximum
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setMaximum($value)
-    {
-        $this->setDijitParam('maximum', (int) $value);
-        return $this;
-    }
-
-    /**
-     * Retrieve maximum
-     *
-     * @return int|null
-     */
-    public function getMaximum()
-    {
-        return $this->getDijitParam('maximum');
-    }
-
-    /**
-     * Set minimum
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setMinimum($value)
-    {
-        $this->setDijitParam('minimum', (int) $value);
-        return $this;
-    }
-
-    /**
-     * Retrieve minimum
-     *
-     * @return int|null
-     */
-    public function getMinimum()
-    {
-        return $this->getDijitParam('minimum');
-    }
-
-    /**
-     * Set pageIncrement
-     *
-     * @param  int $value
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setPageIncrement($value)
-    {
-        $this->setDijitParam('pageIncrement', (int) $value);
-        return $this;
-    }
-
-    /**
-     * Retrieve pageIncrement
-     *
-     * @return int|null
-     */
-    public function getPageIncrement()
-    {
-        return $this->getDijitParam('pageIncrement');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/SubmitButton.php b/airtime_mvc/library/Zend/Dojo/Form/Element/SubmitButton.php
deleted file mode 100644
index bdf83ac27..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/SubmitButton.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Button */
-require_once 'Zend/Dojo/Form/Element/Button.php';
-
-/**
- * Submit button dijit
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubmitButton.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_SubmitButton extends Zend_Dojo_Form_Element_Button
-{
-    /**
-     * Use SubmitButton dijit view helper
-     * @var string
-     */
-    public $helper = 'SubmitButton';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/TextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/TextBox.php
deleted file mode 100644
index 9e72fbdaf..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/TextBox.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * TextBox dijit
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_TextBox extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Use TextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'TextBox';
-
-    /**
-     * Set lowercase flag
-     *
-     * @param  bool $lowercase
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setLowercase($flag)
-    {
-        $this->setDijitParam('lowercase', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve lowercase flag
-     *
-     * @return bool
-     */
-    public function getLowercase()
-    {
-        if (!$this->hasDijitParam('lowercase')) {
-            return false;
-        }
-        return $this->getDijitParam('lowercase');
-    }
-
-    /**
-     * Set propercase flag
-     *
-     * @param  bool $propercase
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setPropercase($flag)
-    {
-        $this->setDijitParam('propercase', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve propercase flag
-     *
-     * @return bool
-     */
-    public function getPropercase()
-    {
-        if (!$this->hasDijitParam('propercase')) {
-            return false;
-        }
-        return $this->getDijitParam('propercase');
-    }
-
-    /**
-     * Set uppercase flag
-     *
-     * @param  bool $uppercase
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setUppercase($flag)
-    {
-        $this->setDijitParam('uppercase', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve uppercase flag
-     *
-     * @return bool
-     */
-    public function getUppercase()
-    {
-        if (!$this->hasDijitParam('uppercase')) {
-            return false;
-        }
-        return $this->getDijitParam('uppercase');
-    }
-
-    /**
-     * Set trim flag
-     *
-     * @param  bool $trim
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setTrim($flag)
-    {
-        $this->setDijitParam('trim', (bool) $flag);
-        return $this;
-    }
-
-    /**
-     * Retrieve trim flag
-     *
-     * @return bool
-     */
-    public function getTrim()
-    {
-        if (!$this->hasDijitParam('trim')) {
-            return false;
-        }
-        return $this->getDijitParam('trim');
-    }
-
-    /**
-     * Set maxLength
-     *
-     * @param  int $length
-     * @return Zend_Dojo_Form_Element_TextBox
-     */
-    public function setMaxLength($length)
-    {
-        $this->setDijitParam('maxLength', (int) $length);
-        return $this;
-    }
-
-    /**
-     * Retrieve maxLength
-     *
-     * @return int|null
-     */
-    public function getMaxLength()
-    {
-        return $this->getDijitParam('maxLength');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/Textarea.php b/airtime_mvc/library/Zend/Dojo/Form/Element/Textarea.php
deleted file mode 100644
index 319bebeb1..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/Textarea.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Dijit */
-require_once 'Zend/Dojo/Form/Element/Dijit.php';
-
-/**
- * Textarea dijit
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_Textarea extends Zend_Dojo_Form_Element_Dijit
-{
-    /**
-     * Use Textarea dijit view helper
-     * @var string
-     */
-    public $helper = 'Textarea';
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/TimeTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/TimeTextBox.php
deleted file mode 100644
index de68dbf4a..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/TimeTextBox.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_DateTextBox */
-require_once 'Zend/Dojo/Form/Element/DateTextBox.php';
-
-/**
- * TimeTextBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_DateTextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimeTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_TimeTextBox extends Zend_Dojo_Form_Element_DateTextBox
-{
-    /**
-     * Use TimeTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'TimeTextBox';
-
-    /**
-     * Validate ISO 8601 time format
-     *
-     * @param  string $format
-     * @return true
-     * @throws Zend_Form_Element_Exception
-     */
-    protected function _validateIso8601($format)
-    {
-        if (!preg_match('/^T\d{2}:\d{2}:\d{2}$/', $format)) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception(sprintf('Invalid format "%s" provided; must match T:00:00:00 format', $format));
-        }
-        return true;
-    }
-
-    /**
-     * Set time format pattern
-     *
-     * @param  string $pattern
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setTimePattern($pattern)
-    {
-        $this->setConstraint('timePattern', (string) $pattern);
-        return $this;
-    }
-
-    /**
-     * Retrieve time format pattern
-     *
-     * @return string|null
-     */
-    public function getTimePattern()
-    {
-        return $this->getConstraint('timePattern');
-    }
-
-    /**
-     * Set clickableIncrement
-     *
-     * @param  string $format
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setClickableIncrement($format)
-    {
-        $format = (string) $format;
-        $this->_validateIso8601($format);
-        $this->setConstraint('clickableIncrement', $format);
-        return $this;
-    }
-
-    /**
-     * Retrieve clickableIncrement
-     *
-     * @return string|null
-     */
-    public function getClickableIncrement()
-    {
-        return $this->getConstraint('clickableIncrement');
-    }
-
-    /**
-     * Set visibleIncrement
-     *
-     * @param  string $format
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setVisibleIncrement($format)
-    {
-        $format = (string) $format;
-        $this->_validateIso8601($format);
-        $this->setConstraint('visibleIncrement', $format);
-        return $this;
-    }
-
-    /**
-     * Retrieve visibleIncrement
-     *
-     * @return string|null
-     */
-    public function getVisibleIncrement()
-    {
-        return $this->getConstraint('visibleIncrement');
-    }
-
-    /**
-     * Set visibleRange
-     *
-     * @param  string $format
-     * @return Zend_Dojo_Form_Element_NumberTextBox
-     */
-    public function setVisibleRange($format)
-    {
-        $format = (string) $format;
-        $this->_validateIso8601($format);
-        $this->setConstraint('visibleRange', $format);
-        return $this;
-    }
-
-    /**
-     * Retrieve visibleRange
-     *
-     * @return string|null
-     */
-    public function getVisibleRange()
-    {
-        return $this->getConstraint('visibleRange');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/ValidationTextBox.php b/airtime_mvc/library/Zend/Dojo/Form/Element/ValidationTextBox.php
deleted file mode 100644
index eb875a847..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/ValidationTextBox.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_TextBox */
-require_once 'Zend/Dojo/Form/Element/TextBox.php';
-
-/**
- * ValidationTextBox dijit
- *
- * @uses       Zend_Dojo_Form_Element_TextBox
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ValidationTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_ValidationTextBox extends Zend_Dojo_Form_Element_TextBox
-{
-    /**
-     * Use ValidationTextBox dijit view helper
-     * @var string
-     */
-    public $helper = 'ValidationTextBox';
-
-    /**
-     * Set invalidMessage
-     *
-     * @param  string $message
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function setInvalidMessage($message)
-    {
-        $this->setDijitParam('invalidMessage', (string) $message);
-        return $this;
-    }
-
-    /**
-     * Retrieve invalidMessage
-     *
-     * @return string|null
-     */
-    public function getInvalidMessage()
-    {
-        return $this->getDijitParam('invalidMessage');
-    }
-
-    /**
-     * Set promptMessage
-     *
-     * @param  string $message
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function setPromptMessage($message)
-    {
-        $this->setDijitParam('promptMessage', (string) $message);
-        return $this;
-    }
-
-    /**
-     * Retrieve promptMessage
-     *
-     * @return string|null
-     */
-    public function getPromptMessage()
-    {
-        return $this->getDijitParam('promptMessage');
-    }
-
-    /**
-     * Set regExp
-     *
-     * @param  string $regexp
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function setRegExp($regexp)
-    {
-        $this->setDijitParam('regExp', (string) $regexp);
-        return $this;
-    }
-
-    /**
-     * Retrieve regExp
-     *
-     * @return string|null
-     */
-    public function getRegExp()
-    {
-        return $this->getDijitParam('regExp');
-    }
-
-    /**
-     * Set an individual constraint
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function setConstraint($key, $value)
-    {
-        $constraints = $this->getConstraints();
-        $constraints[(string) $key] = $value;
-        $this->setConstraints($constraints);
-        return $this;
-    }
-
-    /**
-     * Set validation constraints
-     *
-     * Refer to Dojo dijit.form.ValidationTextBox documentation for valid
-     * structure.
-     *
-     * @param  array $constraints
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function setConstraints(array $constraints)
-    {
-        array_walk_recursive($constraints, array($this, '_castBoolToString'));
-        $this->setDijitParam('constraints', $constraints);
-        return $this;
-    }
-
-    /**
-     * Is the given constraint set?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasConstraint($key)
-    {
-        $constraints = $this->getConstraints();
-        return array_key_exists((string)$key, $constraints);
-    }
-
-    /**
-     * Get an individual constraint
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getConstraint($key)
-    {
-        $key = (string) $key;
-        if (!$this->hasConstraint($key)) {
-            return null;
-        }
-        return $this->dijitParams['constraints'][$key];
-    }
-
-    /**
-     * Get constraints
-     *
-     * @return array
-     */
-    public function getConstraints()
-    {
-        if ($this->hasDijitParam('constraints')) {
-            return $this->getDijitParam('constraints');
-        }
-        return array();
-    }
-
-    /**
-     * Remove a single constraint
-     *
-     * @param  string $key
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function removeConstraint($key)
-    {
-        $key = (string) $key;
-        if ($this->hasConstraint($key)) {
-            unset($this->dijitParams['constraints'][$key]);
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all constraints
-     *
-     * @return Zend_Dojo_Form_Element_ValidationTextBox
-     */
-    public function clearConstraints()
-    {
-        return $this->removeDijitParam('constraints');
-    }
-
-    /**
-     * Cast a boolean value to a string
-     *
-     * @param  mixed $item
-     * @param  string $key
-     * @return void
-     */
-    protected function _castBoolToString(&$item, $key)
-    {
-        if (is_bool($item)) {
-            $item = ($item) ? 'true' : 'false';
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/Element/VerticalSlider.php b/airtime_mvc/library/Zend/Dojo/Form/Element/VerticalSlider.php
deleted file mode 100644
index 1c90a2bac..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/Element/VerticalSlider.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo_Form_Element_Slider */
-require_once 'Zend/Dojo/Form/Element/Slider.php';
-
-/**
- * VerticalSlider dijit
- *
- * @uses       Zend_Dojo_Form_Element_Slider
- * @package    Zend_Dojo
- * @subpackage Form_Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VerticalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_Element_VerticalSlider extends Zend_Dojo_Form_Element_Slider
-{
-    /**
-     * Use VerticalSlider dijit view helper
-     * @var string
-     */
-    public $helper = 'VerticalSlider';
-
-    /**
-     * Get left decoration data
-     *
-     * @return array
-     */
-    public function getLeftDecoration()
-    {
-        if ($this->hasDijitParam('leftDecoration')) {
-            return $this->getDijitParam('leftDecoration');
-        }
-        return array();
-    }
-
-    /**
-     * Set dijit to use with left decoration
-     *
-     * @param mixed $dijit
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setLeftDecorationDijit($dijit)
-    {
-        $decoration = $this->getLeftDecoration();
-        $decoration['dijit'] = (string) $dijit;
-        $this->setDijitParam('leftDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set container to use with left decoration
-     *
-     * @param mixed $container
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setLeftDecorationContainer($container)
-    {
-        $decoration = $this->getLeftDecoration();
-        $decoration['container'] = (string) $container;
-        $this->setDijitParam('leftDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set labels to use with left decoration
-     *
-     * @param  array $labels
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setLeftDecorationLabels(array $labels)
-    {
-        $decoration = $this->getLeftDecoration();
-        $decoration['labels'] = array_values($labels);
-        $this->setDijitParam('leftDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set params to use with left decoration
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setLeftDecorationParams(array $params)
-    {
-        $decoration = $this->getLeftDecoration();
-        $decoration['params'] = $params;
-        $this->setDijitParam('leftDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set attribs to use with left decoration
-     *
-     * @param  array $attribs
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setLeftDecorationAttribs(array $attribs)
-    {
-        $decoration = $this->getLeftDecoration();
-        $decoration['attribs'] = $attribs;
-        $this->setDijitParam('leftDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Get right decoration data
-     *
-     * @return array
-     */
-    public function getRightDecoration()
-    {
-        if ($this->hasDijitParam('rightDecoration')) {
-            return $this->getDijitParam('rightDecoration');
-        }
-        return array();
-    }
-
-    /**
-     * Set dijit to use with right decoration
-     *
-     * @param mixed $dijit
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setRightDecorationDijit($dijit)
-    {
-        $decoration = $this->getRightDecoration();
-        $decoration['dijit'] = (string) $dijit;
-        $this->setDijitParam('rightDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set container to use with right decoration
-     *
-     * @param mixed $container
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setRightDecorationContainer($container)
-    {
-        $decoration = $this->getRightDecoration();
-        $decoration['container'] = (string) $container;
-        $this->setDijitParam('rightDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set labels to use with right decoration
-     *
-     * @param  array $labels
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setRightDecorationLabels(array $labels)
-    {
-        $decoration = $this->getRightDecoration();
-        $decoration['labels'] = array_values($labels);
-        $this->setDijitParam('rightDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set params to use with right decoration
-     *
-     * @param  array $params
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setRightDecorationParams(array $params)
-    {
-        $decoration = $this->getRightDecoration();
-        $decoration['params'] = $params;
-        $this->setDijitParam('rightDecoration', $decoration);
-        return $this;
-    }
-
-    /**
-     * Set attribs to use with right decoration
-     *
-     * @param  array $attribs
-     * @return Zend_Dojo_Form_Element_HorizontalSlider
-     */
-    public function setRightDecorationAttribs(array $attribs)
-    {
-        $decoration = $this->getRightDecoration();
-        $decoration['attribs'] = $attribs;
-        $this->setDijitParam('rightDecoration', $decoration);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/Form/SubForm.php b/airtime_mvc/library/Zend/Dojo/Form/SubForm.php
deleted file mode 100644
index 8202d2545..000000000
--- a/airtime_mvc/library/Zend/Dojo/Form/SubForm.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_SubForm */
-require_once 'Zend/Form/SubForm.php';
-
-/**
- * Dijit-enabled SubForm
- *
- * @uses       Zend_Form_SubForm
- * @package    Zend_Dojo
- * @subpackage Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubForm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_Form_SubForm extends Zend_Form_SubForm
-{
-    /**
-     * Has the dojo view helper path been registered?
-     * @var bool
-     */
-    protected $_dojoViewPathRegistered = false;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config|null $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->addPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addPrefixPath('Zend_Dojo_Form_Element', 'Zend/Dojo/Form/Element', 'element')
-             ->addElementPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator', 'decorator')
-             ->addDisplayGroupPrefixPath('Zend_Dojo_Form_Decorator', 'Zend/Dojo/Form/Decorator')
-             ->setDefaultDisplayGroupClass('Zend_Dojo_Form_DisplayGroup');
-        parent::__construct($options);
-    }
-
-    /**
-     * Load the default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                 ->addDecorator('HtmlTag', array('tag' => 'dl'))
-                 ->addDecorator('ContentPane');
-        }
-    }
-
-    /**
-     * Get view
-     *
-     * @return Zend_View_Interface
-     */
-    public function getView()
-    {
-        $view = parent::getView();
-        if (!$this->_dojoViewPathRegistered) {
-            if (false === $view->getPluginLoader('helper')->getPaths('Zend_Dojo_View_Helper')) {
-                $view->addHelperPath('Zend/Dojo/View/Helper', 'Zend_Dojo_View_Helper');
-            }
-            $this->_dojoViewPathRegistered = true;
-        }
-        return $view;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Exception.php b/airtime_mvc/library/Zend/Dojo/View/Exception.php
deleted file mode 100644
index 17ac74008..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Dojo_Exception
- */
-require_once 'Zend/Dojo/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_View_Exception extends Zend_Dojo_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionContainer.php
deleted file mode 100644
index c8f77b2ac..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionContainer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo AccordionContainer dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_AccordionContainer extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.AccordionContainer';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.layout.AccordionContainer';
-
-    /**
-     * dijit.layout.AccordionContainer
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function accordionContainer($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionPane.php b/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionPane.php
deleted file mode 100644
index c1e6e4a1f..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/AccordionPane.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccordionPane.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo AccordionPane dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_AccordionPane extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.AccordionPane';
-
-    /**
-     * Module being used
-     * @var string
-     */
-    protected $_module = 'dijit.layout.AccordionContainer';
-
-    /**
-     * dijit.layout.AccordionPane
-     *
-     * @param  int $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function accordionPane($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/BorderContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/BorderContainer.php
deleted file mode 100644
index 7e3542be6..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/BorderContainer.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BorderContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo BorderContainer dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_BorderContainer extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.BorderContainer';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.layout.BorderContainer';
-
-    /**
-     * Ensure style is only registered once
-     * @var bool
-     */
-    protected $_styleIsRegistered = false;
-
-    /**
-     * dijit.layout.BorderContainer
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function borderContainer($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        // this will ensure that the border container is viewable:
-        if (!$this->_styleIsRegistered) {
-            $this->view->headStyle()->appendStyle('html, body { height: 100%; width: 100%; margin: 0; padding: 0; }');
-            $this->_styleIsRegistered = true;
-        }
-
-        // and now we create it:
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Button.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Button.php
deleted file mode 100644
index dea3f8a7e..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Button.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo Button dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_Button extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.Button';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.Button';
-
-    /**
-     * dijit.form.Button
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function button($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        $attribs['name'] = $id;
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $id;
-        }
-        $attribs = $this->_prepareDijit($attribs, $params, 'element');
-
-        return $this->view->formButton($id, $value, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/CheckBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/CheckBox.php
deleted file mode 100644
index 4fe04a27b..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/CheckBox.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CheckBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo CheckBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_CheckBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.CheckBox';
-
-    /**
-     * Element type
-     * @var string
-     */
-    protected $_elementType = 'checkbox';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.CheckBox';
-
-    /**
-     * dijit.form.CheckBox
-     *
-     * @param  int $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @param  array $checkedOptions Should contain either two items, or the keys checkedValue and uncheckedValue
-     * @return string
-     */
-    public function checkBox($id, $value = null, array $params = array(), array $attribs = array(), array $checkedOptions = null)
-    {
-        // Prepare the checkbox options
-        require_once 'Zend/View/Helper/FormCheckbox.php';
-        $checked = false;
-        if (isset($attribs['checked']) && $attribs['checked']) {
-            $checked = true;
-        } elseif (isset($attribs['checked'])) {
-            $checked = false;
-        }
-        $checkboxInfo = Zend_View_Helper_FormCheckbox::determineCheckboxInfo($value, $checked, $checkedOptions);
-        $attribs['checked'] = $checkboxInfo['checked'];
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $id;
-        }
-
-        $attribs = $this->_prepareDijit($attribs, $params, 'element');
-
-        // strip options so they don't show up in markup
-        if (array_key_exists('options', $attribs)) {
-            unset($attribs['options']);
-        }
-
-        // and now we create it:
-        $html = '';
-        if (!strstr($id, '[]')) {
-            // hidden element for unchecked value
-            $html .= $this->_renderHiddenElement($id, $checkboxInfo['uncheckedValue']);
-        }
-
-        // and final element
-        $html .= $this->_createFormElement($id, $checkboxInfo['checkedValue'], $params, $attribs);
-
-        return $html;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/ComboBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/ComboBox.php
deleted file mode 100644
index 989474b0d..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/ComboBox.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ComboBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo ComboBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_ComboBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.ComboBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.ComboBox';
-
-    /**
-     * dijit.form.ComboBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @param  array|null $options Select options
-     * @return string
-     */
-    public function comboBox($id, $value = null, array $params = array(), array $attribs = array(), array $options = null)
-    {
-        $html = '';
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $id;
-        }
-        if (array_key_exists('store', $params) && is_array($params['store'])) {
-            // using dojo.data datastore
-            if (false !== ($store = $this->_renderStore($params['store'], $id))) {
-                $params['store'] = $params['store']['store'];
-                if (is_string($store)) {
-                    $html .= $store;
-                }
-                $html .= $this->_createFormElement($id, $value, $params, $attribs);
-                return $html;
-            }
-            unset($params['store']);
-        } elseif (array_key_exists('store', $params)) {
-            if (array_key_exists('storeType', $params)) {
-                $storeParams = array(
-                    'store' => $params['store'],
-                    'type'  => $params['storeType'],
-                );
-                unset($params['storeType']);
-                if (array_key_exists('storeParams', $params)) {
-                    $storeParams['params'] = $params['storeParams'];
-                    unset($params['storeParams']);
-                }
-                if (false !== ($store = $this->_renderStore($storeParams, $id))) {
-                    if (is_string($store)) {
-                        $html .= $store;
-                    }
-                }
-            }
-            $html .= $this->_createFormElement($id, $value, $params, $attribs);
-            return $html;
-        }
-
-        // do as normal select
-        $attribs = $this->_prepareDijit($attribs, $params, 'element');
-        return $this->view->formSelect($id, $value, $attribs, $options);
-    }
-
-    /**
-     * Render data store element
-     *
-     * Renders to dojo view helper
-     *
-     * @param  array $params
-     * @return string|false
-     */
-    protected function _renderStore(array $params, $id)
-    {
-        if (!array_key_exists('store', $params) || !array_key_exists('type', $params)) {
-            return false;
-        }
-
-        $this->dojo->requireModule($params['type']);
-
-        $extraParams = array();
-        $storeParams = array(
-            'dojoType' => $params['type'],
-            'jsId'     => $params['store'],
-        );
-
-        if (array_key_exists('params', $params)) {
-            $storeParams = array_merge($storeParams, $params['params']);
-            $extraParams = $params['params'];
-        }
-
-        if ($this->_useProgrammatic()) {
-            if (!$this->_useProgrammaticNoScript()) {
-                require_once 'Zend/Json.php';
-                $this->dojo->addJavascript('var ' . $storeParams['jsId'] . ";\n");
-                $js = $storeParams['jsId'] . ' = '
-                    . 'new ' . $storeParams['dojoType'] . '('
-                    .     Zend_Json::encode($extraParams)
-                    . ");\n";
-                $js = "function() {\n$js\n}";
-                $this->dojo->_addZendLoad($js);
-            }
-            return true;
-        }
-
-        return '<div' . $this->_htmlAttribs($storeParams) . '></div>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/ContentPane.php b/airtime_mvc/library/Zend/Dojo/View/Helper/ContentPane.php
deleted file mode 100644
index 42bea292c..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/ContentPane.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContentPane.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo ContentPane dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_ContentPane extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.ContentPane';
-
-    /**
-     * Module being used
-     * @var string
-     */
-    protected $_module = 'dijit.layout.ContentPane';
-
-    /**
-     * dijit.layout.ContentPane
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function contentPane($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/CurrencyTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
deleted file mode 100644
index 325b13287..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/CurrencyTextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CurrencyTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo CurrencyTextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_CurrencyTextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.CurrencyTextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.CurrencyTextBox';
-
-    /**
-     * dijit.form.CurrencyTextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function currencyTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/CustomDijit.php b/airtime_mvc/library/Zend/Dojo/View/Helper/CustomDijit.php
deleted file mode 100644
index cb21c35b0..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/CustomDijit.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CustomDijit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Arbitrary dijit support
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_CustomDijit extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Default dojoType; set the value when extending
-     * @var string
-     */
-    protected $_defaultDojoType;
-
-    /**
-     * Render a custom dijit
-     *
-     * Requires that either the {@link $_defaultDojotype} property is set, or
-     * that you pass a value to the "dojoType" key of the $params argument.
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params
-     * @param  array $attribs
-     * @return string|Zend_Dojo_View_Helper_CustomDijit
-     */
-    public function customDijit($id = null, $value = null, array $params = array(), array $attribs = array())
-    {
-        if (null === $id) {
-            return $this;
-        }
-
-        if (!array_key_exists('dojoType', $params)
-            && (null === $this->_defaultDojoType)
-        ) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('No dojoType specified; cannot create dijit');
-        } elseif (array_key_exists('dojoType', $params)) {
-            $this->_dijit  = $params['dojoType'];
-            $this->_module = $params['dojoType'];
-            unset($params['dojoType']);
-        } else {
-            $this->_dijit  = $this->_defaultDojoType;
-            $this->_module = $this->_defaultDojoType;
-        }
-
-        if (array_key_exists('rootNode', $params)) {
-            $this->setRootNode($params['rootNode']);
-            unset($params['rootNode']);
-        }
-
-        return $this->_createLayoutContainer($id, $value, $params, $attribs);
-    }
-
-    /**
-     * Begin capturing content.
-     *
-     * Requires that either the {@link $_defaultDojotype} property is set, or
-     * that you pass a value to the "dojoType" key of the $params argument.
-     *
-     * @param  string $id
-     * @param  array $params
-     * @param  array $attribs
-     * @return void
-     */
-    public function captureStart($id, array $params = array(), array $attribs = array())
-    {
-        if (!array_key_exists('dojoType', $params)
-            && (null === $this->_defaultDojoType)
-        ) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('No dojoType specified; cannot create dijit');
-        } elseif (array_key_exists('dojoType', $params)) {
-            $this->_dijit  = $params['dojoType'];
-            $this->_module = $params['dojoType'];
-            unset($params['dojoType']);
-        } else {
-            $this->_dijit  = $this->_defaultDojoType;
-            $this->_module = $this->_defaultDojoType;
-        }
-
-        return parent::captureStart($id, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/DateTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/DateTextBox.php
deleted file mode 100644
index 8a6e0ee90..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/DateTextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DateTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo DateTextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_DateTextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.DateTextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.DateTextBox';
-
-    /**
-     * dijit.form.DateTextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function dateTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Dijit.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Dijit.php
deleted file mode 100644
index 98ad3f698..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Dijit.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dijit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_View_Helper_HtmlElement */
-require_once 'Zend/View/Helper/HtmlElement.php';
-
-/**
- * Dojo dijit base class
- *
- * @uses       Zend_View_Helper_Abstract
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-abstract class Zend_Dojo_View_Helper_Dijit extends Zend_View_Helper_HtmlElement
-{
-    /**
-     * @var Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public $dojo;
-
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit;
-
-    /**
-     * Element type
-     * @var string
-     */
-    protected $_elementType;
-
-    /**
-     * Parameters that should be JSON encoded
-     * @var array
-     */
-    protected $_jsonParams = array('constraints');
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module;
-
-    /**
-     * Root node element type for layout elements
-     * @var string
-     */
-    protected $_rootNode = 'div';
-
-    /**
-     * Set view
-     *
-     * Set view and enable dojo
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Dojo_View_Helper_Dijit
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        parent::setView($view);
-        $this->dojo = $this->view->dojo();
-        $this->dojo->enable();
-        return $this;
-    }
-
-
-    /**
-     * Get root node type
-     *
-     * @return string
-     */
-    public function getRootNode()
-    {
-        return $this->_rootNode;
-    }
-
-    /**
-     * Set root node type
-     *
-     * @param  string $value
-     * @return Zend_Dojo_View_Helper_Dijit
-     */
-    public function setRootNode($value)
-    {
-        $this->_rootNode = $value;
-        return $this;
-    }
-
-    /**
-     * Whether or not to use declarative dijit creation
-     *
-     * @return bool
-     */
-    protected function _useDeclarative()
-    {
-        return Zend_Dojo_View_Helper_Dojo::useDeclarative();
-    }
-
-    /**
-     * Whether or not to use programmatic dijit creation
-     *
-     * @return bool
-     */
-    protected function _useProgrammatic()
-    {
-        return Zend_Dojo_View_Helper_Dojo::useProgrammatic();
-    }
-
-    /**
-     * Whether or not to use programmatic dijit creation w/o script creation
-     *
-     * @return bool
-     */
-    protected function _useProgrammaticNoScript()
-    {
-        return Zend_Dojo_View_Helper_Dojo::useProgrammaticNoScript();
-    }
-
-    /**
-     * Create a layout container
-     *
-     * @param  int $id
-     * @param  string $content
-     * @param  array $params
-     * @param  array $attribs
-     * @param  string|null $dijit
-     * @return string
-     */
-    protected function _createLayoutContainer($id, $content, array $params, array $attribs, $dijit = null)
-    {
-        $attribs['id'] = $id;
-        $attribs = $this->_prepareDijit($attribs, $params, 'layout', $dijit);
-
-        $nodeType = $this->getRootNode();
-        $html = '<' . $nodeType . $this->_htmlAttribs($attribs) . '>'
-              . $content
-              . "</$nodeType>\n";
-
-        return $html;
-    }
-
-    /**
-     * Create HTML representation of a dijit form element
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params
-     * @param  array $attribs
-     * @param  string|null $dijit
-     * @return string
-     */
-    public function _createFormElement($id, $value, array $params, array $attribs, $dijit = null)
-    {
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $id;
-        }
-        $attribs['name']  = $id;
-        $attribs['value'] = (string) $value;
-        $attribs['type']  = $this->_elementType;
-
-        $attribs = $this->_prepareDijit($attribs, $params, 'element', $dijit);
-
-        $html = '<input'
-              . $this->_htmlAttribs($attribs)
-              . $this->getClosingBracket();
-        return $html;
-    }
-
-    /**
-     * Merge attributes and parameters
-     *
-     * Also sets up requires
-     *
-     * @param  array $attribs
-     * @param  array $params
-     * @param  string $type
-     * @param  string $dijit Dijit type to use (otherwise, pull from $_dijit)
-     * @return array
-     */
-    protected function _prepareDijit(array $attribs, array $params, $type, $dijit = null)
-    {
-        $this->dojo->requireModule($this->_module);
-
-        switch ($type) {
-            case 'layout':
-                $stripParams = array('id');
-                break;
-            case 'element':
-                $stripParams = array('id', 'name', 'value', 'type');
-                foreach (array('checked', 'disabled', 'readonly') as $attrib) {
-                    if (array_key_exists($attrib, $attribs)) {
-                        if ($attribs[$attrib]) {
-                            $attribs[$attrib] = $attrib;
-                        } else {
-                            unset($attribs[$attrib]);
-                        }
-                    }
-                }
-                break;
-            case 'textarea':
-                $stripParams = array('id', 'name', 'type', 'degrade');
-                break;
-            default:
-        }
-
-        foreach ($stripParams as $param) {
-            if (array_key_exists($param, $params)) {
-                unset($params[$param]);
-            }
-        }
-
-        // Normalize constraints, if present
-        foreach ($this->_jsonParams as $param) {
-            if (array_key_exists($param, $params)) {
-                require_once 'Zend/Json.php';
-
-                if (is_array($params[$param])) {
-                    $values = array();
-                    foreach ($params[$param] as $key => $value) {
-                        if (!is_scalar($value)) {
-                            continue;
-                        }
-                        $values[$key] = $value;
-                    }
-                } elseif (is_string($params[$param])) {
-                    $values = (array) $params[$param];
-                } else {
-                    $values = array();
-                }
-                $values = Zend_Json::encode($values);
-                if ($this->_useDeclarative()) {
-                    $values = str_replace('"', "'", $values);
-                }
-                $params[$param] = $values;
-            }
-        }
-
-        $dijit = (null === $dijit) ? $this->_dijit : $dijit;
-        if ($this->_useDeclarative()) {
-            $attribs = array_merge($attribs, $params);
-            if (isset($attribs['required'])) {
-                $attribs['required'] = ($attribs['required']) ? 'true' : 'false';
-            }
-            $attribs['dojoType'] = $dijit;
-        } elseif (!$this->_useProgrammaticNoScript()) {
-            $this->_createDijit($dijit, $attribs['id'], $params);
-        }
-
-        return $attribs;
-    }
-
-    /**
-     * Create a dijit programmatically
-     *
-     * @param  string $dijit
-     * @param  string $id
-     * @param  array $params
-     * @return void
-     */
-    protected function _createDijit($dijit, $id, array $params)
-    {
-        $params['dojoType'] = $dijit;
-
-        array_walk_recursive($params, array($this, '_castBoolToString'));
-
-        $this->dojo->setDijit($id, $params);
-    }
-
-    /**
-     * Cast a boolean to a string value
-     *
-     * @param  mixed $item
-     * @param  string $key
-     * @return void
-     */
-    protected function _castBoolToString(&$item, $key)
-    {
-        if (!is_bool($item)) {
-            return;
-        }
-        $item = ($item) ? "true" : "false";
-    }
-
-    /**
-     * Render a hidden element to hold a value
-     *
-     * @param  string $id
-     * @param  string|int|float $value
-     * @return string
-     */
-    protected function _renderHiddenElement($id, $value)
-    {
-        $hiddenAttribs = array(
-            'name'  => $id,
-            'value' => (string) $value,
-            'type'  => 'hidden',
-        );
-        return '<input' . $this->_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
-    }
-
-    /**
-     * Create JS function for retrieving parent form
-     *
-     * @return void
-     */
-    protected function _createGetParentFormFunction()
-    {
-        $function =<<<EOJ
-if (zend == undefined) {
-    var zend = {};
-}
-zend.findParentForm = function(elementNode) {
-    while (elementNode.nodeName.toLowerCase() != 'form') {
-        elementNode = elementNode.parentNode;
-    }
-    return elementNode;
-};
-EOJ;
-
-        $this->dojo->addJavascript($function);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/DijitContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/DijitContainer.php
deleted file mode 100644
index 94022bdef..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/DijitContainer.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DijitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dijit layout container base class
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-abstract class Zend_Dojo_View_Helper_DijitContainer extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Capture locks
-     * @var array
-     */
-    protected $_captureLock = array();
-
-    /**
-     * Metadata information to use with captured content
-     * @var array
-     */
-    protected $_captureInfo = array();
-
-    /**
-     * Begin capturing content for layout container
-     *
-     * @param  string $id
-     * @param  array $params
-     * @param  array $attribs
-     * @return void
-     */
-    public function captureStart($id, array $params = array(), array $attribs = array())
-    {
-        if (array_key_exists($id, $this->_captureLock)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception(sprintf('Lock already exists for id "%s"', $id));
-        }
-
-        $this->_captureLock[$id] = true;
-        $this->_captureInfo[$id] = array(
-            'params'  => $params,
-            'attribs' => $attribs,
-        );
-
-        ob_start();
-        return;
-    }
-
-    /**
-     * Finish capturing content for layout container
-     *
-     * @param  string $id
-     * @return string
-     */
-    public function captureEnd($id)
-    {
-        if (!array_key_exists($id, $this->_captureLock)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception(sprintf('No capture lock exists for id "%s"; nothing to capture', $id));
-        }
-
-        $content = ob_get_clean();
-        extract($this->_captureInfo[$id]);
-        unset($this->_captureLock[$id], $this->_captureInfo[$id]);
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo.php
deleted file mode 100644
index 597e6a3fa..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Dojo.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Registry */
-require_once 'Zend/Registry.php';
-
-/**
- * Zend_Dojo_View_Helper_Dojo: Dojo View Helper
- *
- * Allows specifying stylesheets, path to dojo, module paths, and onLoad
- * events.
- *
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_View_Helper_Dojo
-{
-    /**#@+
-     * Programmatic dijit creation style constants
-     */
-    const PROGRAMMATIC_SCRIPT = 1;
-    const PROGRAMMATIC_NOSCRIPT = -1;
-    /**#@-*/
-
-    /**
-     * @var Zend_View_Interface
-     */
-    public $view;
-
-    /**
-     * @var Zend_Dojo_View_Helper_Dojo_Container
-     */
-    protected $_container;
-
-    /**
-     * @var bool Whether or not dijits should be declared programmatically
-     */
-    protected static $_useProgrammatic = true;
-
-    /**
-     * Initialize helper
-     *
-     * Retrieve container from registry or create new container and store in
-     * registry.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $registry = Zend_Registry::getInstance();
-        if (!isset($registry[__CLASS__])) {
-            require_once 'Zend/Dojo/View/Helper/Dojo/Container.php';
-            $container = new Zend_Dojo_View_Helper_Dojo_Container();
-            $registry[__CLASS__] = $container;
-        }
-        $this->_container = $registry[__CLASS__];
-    }
-
-    /**
-     * Set view object
-     *
-     * @param  Zend_Dojo_View_Interface $view
-     * @return void
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-        $this->_container->setView($view);
-    }
-
-    /**
-     * Return dojo container
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function dojo()
-    {
-        return $this->_container;
-    }
-
-    /**
-     * Proxy to container methods
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Dojo_View_Exception For invalid method calls
-     */
-    public function __call($method, $args)
-    {
-        if (!method_exists($this->_container, $method)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception(sprintf('Invalid method "%s" called on dojo view helper', $method));
-        }
-
-        return call_user_func_array(array($this->_container, $method), $args);
-    }
-
-    /**
-     * Set whether or not dijits should be created declaratively
-     *
-     * @return void
-     */
-    public static function setUseDeclarative()
-    {
-        self::$_useProgrammatic = false;
-    }
-
-    /**
-     * Set whether or not dijits should be created programmatically
-     *
-     * Optionally, specifiy whether or not dijit helpers should generate the
-     * programmatic dojo.
-     *
-     * @param  int $style
-     * @return void
-     */
-    public static function setUseProgrammatic($style = self::PROGRAMMATIC_SCRIPT)
-    {
-        if (!in_array($style, array(self::PROGRAMMATIC_SCRIPT, self::PROGRAMMATIC_NOSCRIPT))) {
-            $style = self::PROGRAMMATIC_SCRIPT;
-        }
-        self::$_useProgrammatic = $style;
-    }
-
-    /**
-     * Should dijits be created declaratively?
-     *
-     * @return bool
-     */
-    public static function useDeclarative()
-    {
-        return (false === self::$_useProgrammatic);
-    }
-
-    /**
-     * Should dijits be created programmatically?
-     *
-     * @return bool
-     */
-    public static function useProgrammatic()
-    {
-        return (false !== self::$_useProgrammatic);
-    }
-
-    /**
-     * Should dijits be created programmatically but without scripts?
-     *
-     * @return bool
-     */
-    public static function useProgrammaticNoScript()
-    {
-        return (self::PROGRAMMATIC_NOSCRIPT === self::$_useProgrammatic);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo/Container.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo/Container.php
deleted file mode 100644
index 931f96089..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Dojo/Container.php
+++ /dev/null
@@ -1,1199 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Container.php 21705 2010-03-31 17:38:19Z matthew $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Dojo */
-require_once 'Zend/Dojo.php';
-
-/**
- * Container for  Dojo View Helper
- *
- *
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_View_Helper_Dojo_Container
-{
-    /**
-     * @var Zend_View_Interface
-     */
-    public $view;
-
-    /**
-     * addOnLoad capture lock
-     * @var bool
-     */
-    protected $_captureLock = false;
-
-    /**
-     * addOnLoad object on which to apply lambda
-     * @var string
-     */
-    protected $_captureObj;
-
-    /**
-     * Base CDN url to utilize
-     * @var string
-     */
-    protected $_cdnBase = Zend_Dojo::CDN_BASE_GOOGLE;
-
-    /**
-     * Path segment following version string of CDN path
-     * @var string
-     */
-    protected $_cdnDojoPath = Zend_Dojo::CDN_DOJO_PATH_GOOGLE;
-
-    /**
-     * Dojo version to use from CDN
-     * @var string
-     */
-    protected $_cdnVersion = '1.4.1';
-
-    /**
-     * Has the dijit loader been registered?
-     * @var bool
-     */
-    protected $_dijitLoaderRegistered = false;
-
-    /**
-     * Registered programmatic dijits
-     * @var array
-     */
-    protected $_dijits = array();
-
-    /**
-     * Dojo configuration
-     * @var array
-     */
-    protected $_djConfig = array();
-
-    /**
-     * Whether or not dojo is enabled
-     * @var bool
-     */
-    protected $_enabled = false;
-
-    /**
-     * Are we rendering as XHTML?
-     * @var bool
-     */
-    protected $_isXhtml = false;
-
-    /**
-     * Arbitrary javascript to include in dojo script
-     * @var array
-     */
-    protected $_javascriptStatements = array();
-
-    /**
-     * Dojo layers (custom builds) to use
-     * @var array
-     */
-    protected $_layers = array();
-
-    /**
-     * Relative path to dojo
-     * @var string
-     */
-    protected $_localPath = null;
-
-    /**
-     * Root of dojo where all dojo files are installed
-     * @var string
-     */
-    protected $_localRelativePath = null;
-
-    /**
-     * Modules to require
-     * @var array
-     */
-    protected $_modules = array();
-
-    /**
-     * Registered module paths
-     * @var array
-     */
-    protected $_modulePaths = array();
-
-    /**
-     * Actions to perform on window load
-     * @var array
-     */
-    protected $_onLoadActions = array();
-
-    /**
-     * Register the Dojo stylesheet?
-     * @var bool
-     */
-    protected $_registerDojoStylesheet = false;
-
-    /**
-     * Style sheet modules to load
-     * @var array
-     */
-    protected $_stylesheetModules = array();
-
-    /**
-     * Local stylesheets
-     * @var array
-     */
-    protected $_stylesheets = array();
-
-    /**
-     * Array of onLoad events specific to Zend_Dojo integration operations
-     * @var array
-     */
-    protected $_zendLoadActions = array();
-
-    /**
-     * Set view object
-     *
-     * @param  Zend_Dojo_View_Interface $view
-     * @return void
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-    }
-
-    /**
-     * Enable dojo
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function enable()
-    {
-        $this->_enabled = true;
-        return $this;
-    }
-
-    /**
-     * Disable dojo
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function disable()
-    {
-        $this->_enabled = false;
-        return $this;
-    }
-
-    /**
-     * Is dojo enabled?
-     *
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->_enabled;
-    }
-
-    /**
-     * Add options for the Dojo Container to use
-     *
-     * @param array|Zend_Config Array or Zend_Config object with options to use
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setOptions($options)
-    {
-        if($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        foreach($options as $key => $value) {
-            $key = strtolower($key);
-            switch($key) {
-                case 'requiremodules':
-                    $this->requireModule($value);
-                    break;
-                case 'modulepaths':
-                    foreach($value as $module => $path) {
-                        $this->registerModulePath($module, $path);
-                    }
-                    break;
-                case 'layers':
-                    $value = (array) $value;
-                    foreach($value as $layer) {
-                        $this->addLayer($layer);
-                    }
-                    break;
-                case 'cdnbase':
-                    $this->setCdnBase($value);
-                    break;
-                case 'cdnversion':
-                    $this->setCdnVersion($value);
-                    break;
-                case 'cdndojopath':
-                    $this->setCdnDojoPath($value);
-                    break;
-                case 'localpath':
-                    $this->setLocalPath($value);
-                    break;
-                case 'djconfig':
-                    $this->setDjConfig($value);
-                    break;
-                case 'stylesheetmodules':
-                    $value = (array) $value;
-                    foreach($value as $module) {
-                        $this->addStylesheetModule($module);
-                    }
-                    break;
-                case 'stylesheets':
-                    $value = (array) $value;
-                    foreach($value as $stylesheet) {
-                        $this->addStylesheet($stylesheet);
-                    }
-                    break;
-                case 'registerdojostylesheet':
-                    $this->registerDojoStylesheet($value);
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Specify one or multiple modules to require
-     *
-     * @param  string|array $modules
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function requireModule($modules)
-    {
-        if (!is_string($modules) && !is_array($modules)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('Invalid module name specified; must be a string or an array of strings');
-        }
-
-        $modules = (array) $modules;
-
-        foreach ($modules as $mod) {
-            if (!preg_match('/^[a-z][a-z0-9._-]+$/i', $mod)) {
-                require_once 'Zend/Dojo/View/Exception.php';
-                throw new Zend_Dojo_View_Exception(sprintf('Module name specified, "%s", contains invalid characters', (string) $mod));
-            }
-
-            if (!in_array($mod, $this->_modules)) {
-                $this->_modules[] = $mod;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve list of modules to require
-     *
-     * @return array
-     */
-    public function getModules()
-    {
-        return $this->_modules;
-    }
-
-    /**
-     * Register a module path
-     *
-     * @param  string $module The module to register a path for
-     * @param  string $path The path to register for the module
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function registerModulePath($module, $path)
-    {
-        $path = (string) $path;
-        if (!in_array($module, $this->_modulePaths)) {
-            $this->_modulePaths[$module] = $path;
-        }
-
-        return $this;
-    }
-
-    /**
-     * List registered module paths
-     *
-     * @return array
-     */
-    public function getModulePaths()
-    {
-        return $this->_modulePaths;
-    }
-
-    /**
-     * Add layer (custom build) path
-     *
-     * @param  string $path
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addLayer($path)
-    {
-        $path = (string) $path;
-        if (!in_array($path, $this->_layers)) {
-            $this->_layers[] = $path;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get registered layers
-     *
-     * @return array
-     */
-    public function getLayers()
-    {
-        return $this->_layers;
-    }
-
-    /**
-     * Remove a registered layer
-     *
-     * @param  string $path
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function removeLayer($path)
-    {
-        $path = (string) $path;
-        $layers = array_flip($this->_layers);
-        if (array_key_exists($path, $layers)) {
-            unset($layers[$path]);
-            $this->_layers = array_keys($layers);
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all registered layers
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function clearLayers()
-    {
-        $this->_layers = array();
-        return $this;
-    }
-
-    /**
-     * Set CDN base path
-     *
-     * @param  string $url
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setCdnBase($url)
-    {
-        $this->_cdnBase = (string) $url;
-        return $this;
-    }
-
-    /**
-     * Return CDN base URL
-     *
-     * @return string
-     */
-    public function getCdnBase()
-    {
-        return $this->_cdnBase;
-    }
-
-    /**
-     * Use CDN, using version specified
-     *
-     * @param  string $version
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setCdnVersion($version = null)
-    {
-        $this->enable();
-        if (preg_match('/^[1-9]\.[0-9](\.[0-9])?$/', $version)) {
-            $this->_cdnVersion = $version;
-        }
-        return $this;
-    }
-
-    /**
-     * Get CDN version
-     *
-     * @return string
-     */
-    public function getCdnVersion()
-    {
-        return $this->_cdnVersion;
-    }
-
-    /**
-     * Set CDN path to dojo (relative to CDN base + version)
-     *
-     * @param  string $path
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setCdnDojoPath($path)
-    {
-        $this->_cdnDojoPath = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Get CDN path to dojo (relative to CDN base + version)
-     *
-     * @return string
-     */
-    public function getCdnDojoPath()
-    {
-        return $this->_cdnDojoPath;
-    }
-
-    /**
-     * Are we using the CDN?
-     *
-     * @return bool
-     */
-    public function useCdn()
-    {
-        return !$this->useLocalPath();
-    }
-
-    /**
-     * Set path to local dojo
-     *
-     * @param  string $path
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setLocalPath($path)
-    {
-        $this->enable();
-        $this->_localPath = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Get local path to dojo
-     *
-     * @return string
-     */
-    public function getLocalPath()
-    {
-        return $this->_localPath;
-    }
-
-    /**
-     * Are we using a local path?
-     *
-     * @return bool
-     */
-    public function useLocalPath()
-    {
-        return (null === $this->_localPath) ? false : true;
-    }
-
-    /**
-     * Set Dojo configuration
-     *
-     * @param  string $option
-     * @param  mixed $value
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setDjConfig(array $config)
-    {
-        $this->_djConfig = $config;
-        return $this;
-    }
-
-    /**
-     * Set Dojo configuration option
-     *
-     * @param  string $option
-     * @param  mixed $value
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setDjConfigOption($option, $value)
-    {
-        $option = (string) $option;
-        $this->_djConfig[$option] = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve dojo configuration values
-     *
-     * @return array
-     */
-    public function getDjConfig()
-    {
-        return $this->_djConfig;
-    }
-
-    /**
-     * Get dojo configuration value
-     *
-     * @param  string $option
-     * @param  mixed $default
-     * @return mixed
-     */
-    public function getDjConfigOption($option, $default = null)
-    {
-        $option = (string) $option;
-        if (array_key_exists($option, $this->_djConfig)) {
-            return $this->_djConfig[$option];
-        }
-        return $default;
-    }
-
-    /**
-     * Add a stylesheet by module name
-     *
-     * @param  string $module
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addStylesheetModule($module)
-    {
-        if (!preg_match('/^[a-z0-9]+\.[a-z0-9_-]+(\.[a-z0-9_-]+)*$/i', $module)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('Invalid stylesheet module specified');
-        }
-        if (!in_array($module, $this->_stylesheetModules)) {
-            $this->_stylesheetModules[] = $module;
-        }
-        return $this;
-    }
-
-    /**
-     * Get all stylesheet modules currently registered
-     *
-     * @return array
-     */
-    public function getStylesheetModules()
-    {
-        return $this->_stylesheetModules;
-    }
-
-    /**
-     * Add a stylesheet
-     *
-     * @param  string $path
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addStylesheet($path)
-    {
-        $path = (string) $path;
-        if (!in_array($path, $this->_stylesheets)) {
-            $this->_stylesheets[] = (string) $path;
-        }
-        return $this;
-    }
-
-    /**
-     * Register the dojo.css stylesheet?
-     *
-     * With no arguments, returns the status of the flag; with arguments, sets
-     * the flag and returns the object.
-     *
-     * @param  null|bool $flag
-     * @return Zend_Dojo_View_Helper_Dojo_Container|bool
-     */
-    public function registerDojoStylesheet($flag = null)
-    {
-        if (null === $flag) {
-             return $this->_registerDojoStylesheet;
-        }
-
-        $this->_registerDojoStylesheet = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve registered stylesheets
-     *
-     * @return array
-     */
-    public function getStylesheets()
-    {
-        return $this->_stylesheets;
-    }
-
-    /**
-     * Add a script to execute onLoad
-     *
-     * dojo.addOnLoad accepts:
-     * - function name
-     * - lambda
-     *
-     * @param  string $callback Lambda
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addOnLoad($callback)
-    {
-        if (!in_array($callback, $this->_onLoadActions, true)) {
-            $this->_onLoadActions[] = $callback;
-        }
-        return $this;
-    }
-
-    /**
-     * Prepend an onLoad event to the list of onLoad actions
-     *
-     * @param  string $callback Lambda
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function prependOnLoad($callback)
-    {
-        if (!in_array($callback, $this->_onLoadActions, true)) {
-            array_unshift($this->_onLoadActions, $callback);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve all registered onLoad actions
-     *
-     * @return array
-     */
-    public function getOnLoadActions()
-    {
-        return $this->_onLoadActions;
-    }
-
-    /**
-     * Start capturing routines to run onLoad
-     *
-     * @return bool
-     */
-    public function onLoadCaptureStart()
-    {
-        if ($this->_captureLock) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('Cannot nest onLoad captures');
-        }
-
-        $this->_captureLock = true;
-        ob_start();
-        return;
-    }
-
-    /**
-     * Stop capturing routines to run onLoad
-     *
-     * @return bool
-     */
-    public function onLoadCaptureEnd()
-    {
-        $data               = ob_get_clean();
-        $this->_captureLock = false;
-
-        $this->addOnLoad($data);
-        return true;
-    }
-
-    /**
-     * Add a programmatic dijit
-     *
-     * @param  string $id
-     * @param  array $params
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addDijit($id, array $params)
-    {
-        if (array_key_exists($id, $this->_dijits)) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception(sprintf('Duplicate dijit with id "%s" already registered', $id));
-        }
-
-        $this->_dijits[$id] = array(
-            'id'     => $id,
-            'params' => $params,
-        );
-
-        return $this;
-    }
-
-    /**
-     * Set a programmatic dijit (overwrites)
-     *
-     * @param  string $id
-     * @param  array $params
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setDijit($id, array $params)
-    {
-        $this->removeDijit($id);
-        return $this->addDijit($id, $params);
-    }
-
-    /**
-     * Add multiple dijits at once
-     *
-     * Expects an array of id => array $params pairs
-     *
-     * @param  array $dijits
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addDijits(array $dijits)
-    {
-        foreach ($dijits as $id => $params) {
-            $this->addDijit($id, $params);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple dijits at once (overwrites)
-     *
-     * Expects an array of id => array $params pairs
-     *
-     * @param  array $dijits
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function setDijits(array $dijits)
-    {
-        $this->clearDijits();
-        return $this->addDijits($dijits);
-    }
-
-    /**
-     * Is the given programmatic dijit already registered?
-     *
-     * @param  string $id
-     * @return bool
-     */
-    public function hasDijit($id)
-    {
-        return array_key_exists($id, $this->_dijits);
-    }
-
-    /**
-     * Retrieve a dijit by id
-     *
-     * @param  string $id
-     * @return array|null
-     */
-    public function getDijit($id)
-    {
-        if ($this->hasDijit($id)) {
-            return $this->_dijits[$id]['params'];
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all dijits
-     *
-     * Returns dijits as an array of assoc arrays
-     *
-     * @return array
-     */
-    public function getDijits()
-    {
-        return array_values($this->_dijits);
-    }
-
-    /**
-     * Remove a programmatic dijit if it exists
-     *
-     * @param  string $id
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function removeDijit($id)
-    {
-        if (array_key_exists($id, $this->_dijits)) {
-            unset($this->_dijits[$id]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all dijits
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function clearDijits()
-    {
-        $this->_dijits = array();
-        return $this;
-    }
-
-    /**
-     * Render dijits as JSON structure
-     *
-     * @return string
-     */
-    public function dijitsToJson()
-    {
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($this->getDijits());
-    }
-
-    /**
-     * Create dijit loader functionality
-     *
-     * @return void
-     */
-    public function registerDijitLoader()
-    {
-        if (!$this->_dijitLoaderRegistered) {
-            $js =<<<EOJ
-function() {
-    dojo.forEach(zendDijits, function(info) {
-        var n = dojo.byId(info.id);
-        if (null != n) {
-            dojo.attr(n, dojo.mixin({ id: info.id }, info.params));
-        }
-    });
-    dojo.parser.parse();
-}
-EOJ;
-            $this->requireModule('dojo.parser');
-            $this->_addZendLoad($js);
-            $this->addJavascript('var zendDijits = ' . $this->dijitsToJson() . ';');
-            $this->_dijitLoaderRegistered = true;
-        }
-    }
-
-    /**
-     * Add arbitrary javascript to execute in dojo JS container
-     *
-     * @param  string $js
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function addJavascript($js)
-    {
-        $js = preg_replace('/^\s*(.*?)\s*$/s', '$1', $js);
-        if (!in_array(substr($js, -1), array(';', '}'))) {
-            $js .= ';';
-        }
-
-        if (in_array($js, $this->_javascriptStatements)) {
-            return $this;
-        }
-
-        $this->_javascriptStatements[] = $js;
-        return $this;
-    }
-
-    /**
-     * Return all registered javascript statements
-     *
-     * @return array
-     */
-    public function getJavascript()
-    {
-        return $this->_javascriptStatements;
-    }
-
-    /**
-     * Clear arbitrary javascript stack
-     *
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function clearJavascript()
-    {
-        $this->_javascriptStatements = array();
-        return $this;
-    }
-
-    /**
-     * Capture arbitrary javascript to include in dojo script
-     *
-     * @return void
-     */
-    public function javascriptCaptureStart()
-    {
-        if ($this->_captureLock) {
-            require_once 'Zend/Dojo/View/Exception.php';
-            throw new Zend_Dojo_View_Exception('Cannot nest captures');
-        }
-
-        $this->_captureLock = true;
-        ob_start();
-        return;
-    }
-
-    /**
-     * Finish capturing arbitrary javascript to include in dojo script
-     *
-     * @return true
-     */
-    public function javascriptCaptureEnd()
-    {
-        $data               = ob_get_clean();
-        $this->_captureLock = false;
-
-        $this->addJavascript($data);
-        return true;
-    }
-
-    /**
-     * String representation of dojo environment
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!$this->isEnabled()) {
-            return '';
-        }
-
-        $this->_isXhtml = $this->view->doctype()->isXhtml();
-
-        if (Zend_Dojo_View_Helper_Dojo::useDeclarative()) {
-            if (null === $this->getDjConfigOption('parseOnLoad')) {
-                $this->setDjConfigOption('parseOnLoad', true);
-            }
-        }
-
-        if (!empty($this->_dijits)) {
-            $this->registerDijitLoader();
-        }
-
-        $html  = $this->_renderStylesheets() . PHP_EOL
-               . $this->_renderDjConfig() . PHP_EOL
-               . $this->_renderDojoScriptTag() . PHP_EOL
-               . $this->_renderLayers() . PHP_EOL
-               . $this->_renderExtras();
-        return $html;
-    }
-
-    /**
-     * Retrieve local path to dojo resources for building relative paths
-     *
-     * @return string
-     */
-    protected function _getLocalRelativePath()
-    {
-        if (null === $this->_localRelativePath) {
-            $localPath = $this->getLocalPath();
-            $localPath = preg_replace('|[/\\\\]dojo[/\\\\]dojo.js[^/\\\\]*$|i', '', $localPath);
-            $this->_localRelativePath = $localPath;
-        }
-        return $this->_localRelativePath;
-    }
-
-    /**
-     * Render dojo stylesheets
-     *
-     * @return string
-     */
-    protected function _renderStylesheets()
-    {
-        if ($this->useCdn()) {
-            $base = $this->getCdnBase()
-                  . $this->getCdnVersion();
-        } else {
-            $base = $this->_getLocalRelativePath();
-        }
-
-        $registeredStylesheets = $this->getStylesheetModules();
-        foreach ($registeredStylesheets as $stylesheet) {
-            $themeName     = substr($stylesheet, strrpos($stylesheet, '.') + 1);
-            $stylesheet    = str_replace('.', '/', $stylesheet);
-            $stylesheets[] = $base . '/' . $stylesheet . '/' . $themeName . '.css';
-        }
-
-        foreach ($this->getStylesheets() as $stylesheet) {
-            $stylesheets[] = $stylesheet;
-        }
-
-        if ($this->_registerDojoStylesheet) {
-            $stylesheets[] = $base . '/dojo/resources/dojo.css';
-        }
-
-        if (empty($stylesheets)) {
-            return '';
-        }
-
-        array_reverse($stylesheets);
-        $style = '<style type="text/css">' . PHP_EOL
-               . (($this->_isXhtml) ? '<!--' : '<!--') . PHP_EOL;
-        foreach ($stylesheets as $stylesheet) {
-            $style .= '    @import "' . $stylesheet . '";' . PHP_EOL;
-        }
-        $style .= (($this->_isXhtml) ? '-->' : '-->') . PHP_EOL
-                . '</style>';
-
-        return $style;
-    }
-
-    /**
-     * Render DjConfig values
-     *
-     * @return string
-     */
-    protected function _renderDjConfig()
-    {
-        $djConfigValues = $this->getDjConfig();
-        if (empty($djConfigValues)) {
-            return '';
-        }
-
-        require_once 'Zend/Json.php';
-        $scriptTag = '<script type="text/javascript">' . PHP_EOL
-                   . (($this->_isXhtml) ? '//<![CDATA[' : '//<!--') . PHP_EOL
-                   . '    var djConfig = ' . Zend_Json::encode($djConfigValues) . ';' . PHP_EOL
-                   . (($this->_isXhtml) ? '//]]>' : '//-->') . PHP_EOL
-                   . '</script>';
-
-        return $scriptTag;
-    }
-
-    /**
-     * Render dojo script tag
-     *
-     * Renders Dojo script tag by utilizing either local path provided or the
-     * CDN. If any djConfig values were set, they will be serialized and passed
-     * with that attribute.
-     *
-     * @return string
-     */
-    protected function _renderDojoScriptTag()
-    {
-        if ($this->useCdn()) {
-            $source = $this->getCdnBase()
-                    . $this->getCdnVersion()
-                    . $this->getCdnDojoPath();
-        } else {
-            $source = $this->getLocalPath();
-        }
-
-        $scriptTag = '<script type="text/javascript" src="' . $source . '"></script>';
-        return $scriptTag;
-    }
-
-    /**
-     * Render layers (custom builds) as script tags
-     *
-     * @return string
-     */
-    protected function _renderLayers()
-    {
-        $layers = $this->getLayers();
-        if (empty($layers)) {
-            return '';
-        }
-
-        $enc = 'UTF-8';
-        if ($this->view instanceof Zend_View_Interface
-            && method_exists($this->view, 'getEncoding')
-        ) {
-            $enc = $this->view->getEncoding();
-        }
-
-        $html = array();
-        foreach ($layers as $path) {
-            $html[] = sprintf(
-                '<script type="text/javascript" src="%s"></script>',
-                htmlspecialchars($path, ENT_QUOTES, $enc)
-            );
-        }
-
-        return implode("\n", $html);
-    }
-
-    /**
-     * Render dojo module paths and requires
-     *
-     * @return string
-     */
-    protected function _renderExtras()
-    {
-        $js = array();
-        $modulePaths = $this->getModulePaths();
-        if (!empty($modulePaths)) {
-            foreach ($modulePaths as $module => $path) {
-                $js[] =  'dojo.registerModulePath("' . $this->view->escape($module) . '", "' . $this->view->escape($path) . '");';
-            }
-        }
-
-        $modules = $this->getModules();
-        if (!empty($modules)) {
-            foreach ($modules as $module) {
-                $js[] = 'dojo.require("' . $this->view->escape($module) . '");';
-            }
-        }
-
-        $onLoadActions = array();
-        // Get Zend specific onLoad actions; these will always be first to 
-        // ensure that dijits are created in the correct order
-        foreach ($this->_getZendLoadActions() as $callback) {
-            $onLoadActions[] = 'dojo.addOnLoad(' . $callback . ');';
-        }
-
-        // Get all other onLoad actions
-        foreach ($this->getOnLoadActions() as $callback) {
-            $onLoadActions[] = 'dojo.addOnLoad(' . $callback . ');';
-        }
-
-        $javascript = implode("\n    ", $this->getJavascript());
-
-        $content = '';
-        if (!empty($js)) {
-            $content .= implode("\n    ", $js) . "\n";
-        }
-
-        if (!empty($onLoadActions)) {
-            $content .= implode("\n    ", $onLoadActions) . "\n";
-        }
-
-        if (!empty($javascript)) {
-            $content .= $javascript . "\n";
-        }
-
-        if (preg_match('/^\s*$/s', $content)) {
-            return '';
-        }
-
-        $html = '<script type="text/javascript">' . PHP_EOL
-              . (($this->_isXhtml) ? '//<![CDATA[' : '//<!--') . PHP_EOL
-              . $content
-              . (($this->_isXhtml) ? '//]]>' : '//-->') . PHP_EOL
-              . PHP_EOL . '</script>';
-        return $html;
-    }
-
-    /**
-     * Add an onLoad action related to ZF dijit creation
-     *
-     * This method is public, but prefixed with an underscore to indicate that 
-     * it should not normally be called by userland code. It is pertinent to
-     * ensuring that the correct order of operations occurs during dijit 
-     * creation.
-     * 
-     * @param  string $callback 
-     * @return Zend_Dojo_View_Helper_Dojo_Container
-     */
-    public function _addZendLoad($callback)
-    {
-        if (!in_array($callback, $this->_zendLoadActions, true)) {
-            $this->_zendLoadActions[] = $callback;
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve all ZF dijit callbacks
-     * 
-     * @return array
-     */
-    public function _getZendLoadActions()
-    {
-        return $this->_zendLoadActions;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Editor.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Editor.php
deleted file mode 100644
index dfe591609..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Editor.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Editor.php 20116 2010-01-07 14:18:34Z matthew $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/** Zend_Json */
-require_once 'Zend/Json.php';
-
-/**
- * Dojo Editor dijit
- *
- * @uses       Zend_Dojo_View_Helper_Textarea
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dojo_View_Helper_Editor extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * @param string Dijit type
-     */
-    protected $_dijit = 'dijit.Editor';
-
-    /**
-     * @var string Dijit module to load
-     */
-    protected $_module = 'dijit.Editor';
-
-    /**
-     * @var array Maps non-core plugin to module basename
-     */
-    protected $_pluginsModules = array(
-        'createLink' => 'LinkDialog',
-        'insertImage' => 'LinkDialog',
-        'fontName' => 'FontChoice',
-        'fontSize' => 'FontChoice',
-        'formatBlock' => 'FontChoice',
-        'foreColor' => 'TextColor',
-        'hiliteColor' => 'TextColor'
-    );
-
-    /**
-     * JSON-encoded parameters
-     * @var array
-     */
-    protected $_jsonParams = array('captureEvents', 'events', 'plugins');
-
-    /**
-     * dijit.Editor
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params
-     * @param  array $attribs
-     * @return string
-     */
-    public function editor($id, $value = null, $params = array(), $attribs = array())
-    {
-        if (isset($params['plugins'])) {
-            foreach ($this->_getRequiredModules($params['plugins']) as $module) {
-                $this->dojo->requireModule($module);
-            }
-        }
-
-        // Previous versions allowed specifying "degrade" to allow using a 
-        // textarea instead of a div -- but this is insecure. Removing the 
-        // parameter if set to prevent its injection in the dijit.
-        if (isset($params['degrade'])) {
-            unset($params['degrade']);
-        }
-
-        $hiddenName = $id;
-        if (array_key_exists('id', $attribs)) {
-            $hiddenId = $attribs['id'];
-        } else {
-            $hiddenId = $hiddenName;
-        }
-        $hiddenId = $this->_normalizeId($hiddenId);
-
-        $textareaName = $this->_normalizeEditorName($hiddenName);
-        $textareaId   = $hiddenId . '-Editor';
-
-        $hiddenAttribs = array(
-            'id'    => $hiddenId,
-            'name'  => $hiddenName,
-            'value' => $value,
-            'type'  => 'hidden',
-        );
-        $attribs['id'] = $textareaId;
-
-        $this->_createGetParentFormFunction();
-        $this->_createEditorOnSubmit($hiddenId, $textareaId);
-
-        $attribs = $this->_prepareDijit($attribs, $params, 'textarea');
-
-        $html  = '<input' . $this->_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
-        $html .= '<div' . $this->_htmlAttribs($attribs) . '>'
-               . $value
-               . "</div>\n";
-
-        // Embed a textarea in a <noscript> tag to allow for graceful 
-        // degradation
-        $html .= '<noscript>'
-               . $this->view->formTextarea($hiddenId, $value, $attribs)
-               . '</noscript>';
-
-        return $html;
-    }
-
-    /**
-     * Generates the list of required modules to include, if any is needed.
-     *
-     * @param array $plugins plugins to include
-     * @return array
-     */
-    protected function _getRequiredModules(array $plugins)
-    {
-        $modules = array();
-        foreach ($plugins as $commandName) {
-            if (isset($this->_pluginsModules[$commandName])) {
-                $pluginName = $this->_pluginsModules[$commandName];
-                $modules[] = 'dijit._editor.plugins.' . $pluginName;
-            }
-        }
-
-        return array_unique($modules);
-    }
-
-    /**
-     * Normalize editor element name
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _normalizeEditorName($name)
-    {
-        if ('[]' == substr($name, -2)) {
-            $name = substr($name, 0, strlen($name) - 2);
-            $name .= '[Editor][]';
-        } else {
-            $name .= '[Editor]';
-        }
-        return $name;
-    }
-
-    /**
-     * Create onSubmit binding for element
-     *
-     * @param  string $hiddenId
-     * @param  string $editorId
-     * @return void
-     */
-    protected function _createEditorOnSubmit($hiddenId, $editorId)
-    {
-        $this->dojo->onLoadCaptureStart();
-        echo <<<EOJ
-function() {
-    var form = zend.findParentForm(dojo.byId('$hiddenId'));
-    dojo.connect(form, 'submit', function(e) {
-        dojo.byId('$hiddenId').value = dijit.byId('$editorId').getValue(false);
-    });
-}
-EOJ;
-        $this->dojo->onLoadCaptureEnd();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/FilteringSelect.php b/airtime_mvc/library/Zend/Dojo/View/Helper/FilteringSelect.php
deleted file mode 100644
index ed9a39af9..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/FilteringSelect.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FilteringSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_ComboBox */
-require_once 'Zend/Dojo/View/Helper/ComboBox.php';
-
-/**
- * Dojo FilteringSelect dijit
- *
- * @uses       Zend_Dojo_View_Helper_ComboBox
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_FilteringSelect extends Zend_Dojo_View_Helper_ComboBox
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.FilteringSelect';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.FilteringSelect';
-
-    /**
-     * dijit.form.FilteringSelect
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @param  array|null $options Select options
-     * @return string
-     */
-    public function filteringSelect($id, $value = null, array $params = array(), array $attribs = array(), array $options = null)
-    {
-        return $this->comboBox($id, $value, $params, $attribs, $options);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Form.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Form.php
deleted file mode 100644
index 725f5494f..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Form.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo Form dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_Form extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.Form';
-
-    /**
-     * Module being used
-     * @var string
-     */
-    protected $_module = 'dijit.form.Form';
-
-    /**
-     * @var Zend_View_Helper_Form
-     */
-    protected $_helper;
-
-    /**
-     * dijit.form.Form
-     *
-     * @param  string $id
-     * @param  null|array $attribs HTML attributes
-     * @param  false|string $content
-     * @return string
-     */
-    public function form($id, $attribs = null, $content = false)
-    {
-        if (!is_array($attribs)) {
-            $attribs = (array) $attribs;
-        }
-        if (array_key_exists('id', $attribs)) {
-            $attribs['name'] = $id;
-        } else {
-            $attribs['id'] = $id;
-        }
-
-        if (false === $content) {
-            $content = '';
-        }
-
-        $attribs = $this->_prepareDijit($attribs, array(), 'layout');
-
-        return $this->getFormHelper()->form($id, $attribs, $content);
-    }
-
-    /**
-     * Get standard form helper
-     *
-     * @return Zend_View_Helper_Form
-     */
-    public function getFormHelper()
-    {
-        if (null === $this->_helper) {
-            require_once 'Zend/View/Helper/Form.php';
-            $this->_helper = new Zend_View_Helper_Form;
-            $this->_helper->setView($this->view);
-        }
-        return $this->_helper;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/HorizontalSlider.php b/airtime_mvc/library/Zend/Dojo/View/Helper/HorizontalSlider.php
deleted file mode 100644
index ab4b8a08b..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/HorizontalSlider.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HorizontalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Slider */
-require_once 'Zend/Dojo/View/Helper/Slider.php';
-
-/**
- * Dojo HorizontalSlider dijit
- *
- * @uses       Zend_Dojo_View_Helper_Slider
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_HorizontalSlider extends Zend_Dojo_View_Helper_Slider
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.HorizontalSlider';
-
-    /**
-     * Slider type
-     * @var string
-     */
-    protected $_sliderType = 'Horizontal';
-
-    /**
-     * dijit.form.HorizontalSlider
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function horizontalSlider($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->prepareSlider($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/NumberSpinner.php b/airtime_mvc/library/Zend/Dojo/View/Helper/NumberSpinner.php
deleted file mode 100644
index 621db641d..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/NumberSpinner.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberSpinner.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo NumberSpinner dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_NumberSpinner extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.NumberSpinner';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.NumberSpinner';
-
-    /**
-     * dijit.form.NumberSpinner
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function numberSpinner($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        // Get constraints and serialize to JSON if necessary
-        if (array_key_exists('constraints', $params)) {
-            if (!is_array($params['constraints'])) {
-                unset($params['constraints']);
-            }
-        } else {
-            $constraints = array();
-            if (array_key_exists('min', $params)) {
-                $constraints['min'] = $params['min'];
-                unset($params['min']);
-            }
-            if (array_key_exists('max', $params)) {
-                $constraints['max'] = $params['max'];
-                unset($params['max']);
-            }
-            if (array_key_exists('places', $params)) {
-                $constraints['places'] = $params['places'];
-                unset($params['places']);
-            }
-            $params['constraints'] = $constraints;
-        }
-
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/NumberTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/NumberTextBox.php
deleted file mode 100644
index f7b8126f8..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/NumberTextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumberTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo NumberTextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_NumberTextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.NumberTextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.NumberTextBox';
-
-    /**
-     * dijit.form.NumberTextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function numberTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/PasswordTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/PasswordTextBox.php
deleted file mode 100644
index 1672f7f9b..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/PasswordTextBox.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PasswordTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_ValidationTextBox */
-require_once 'Zend/Dojo/View/Helper/ValidationTextBox.php';
-
-/**
- * Dojo ValidationTextBox dijit tied to password input
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_PasswordTextBox extends Zend_Dojo_View_Helper_ValidationTextBox
-{
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'password';
-
-    /**
-     * dijit.form.ValidationTextBox tied to password input
-     *
-     * @param  string $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function passwordTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/RadioButton.php b/airtime_mvc/library/Zend/Dojo/View/Helper/RadioButton.php
deleted file mode 100644
index 74c3e8143..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/RadioButton.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RadioButton.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo RadioButton dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_RadioButton extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.RadioButton';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.CheckBox';
-
-    /**
-     * dijit.form.RadioButton
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @param  array $options Array of radio options
-     * @param  string $listsep String with which to separate options
-     * @return string
-     */
-    public function radioButton(
-        $id,
-        $value = null,
-        array $params = array(),
-        array $attribs = array(),
-        array $options = null,
-        $listsep = "<br />\n"
-    ) {
-        $attribs['name'] = $id;
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $id;
-        }
-        $attribs = $this->_prepareDijit($attribs, $params, 'element');
-
-        if (is_array($options) && $this->_useProgrammatic() && !$this->_useProgrammaticNoScript()) {
-            $baseId = $id;
-            if (array_key_exists('id', $attribs)) {
-                $baseId = $attribs['id'];
-            }
-            require_once 'Zend/Filter/Alnum.php';
-            $filter = new Zend_Filter_Alnum();
-            foreach (array_keys($options) as $key) {
-                $optId = $baseId . '-' . $filter->filter($key);
-                $this->_createDijit($this->_dijit, $optId, array());
-            }
-        }
-
-        return $this->view->formRadio($id, $value, $attribs, $options, $listsep);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/SimpleTextarea.php b/airtime_mvc/library/Zend/Dojo/View/Helper/SimpleTextarea.php
deleted file mode 100644
index 1f66f691b..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/SimpleTextarea.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * dijit.form.SimpleTextarea view helper
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimpleTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dojo_View_Helper_SimpleTextarea extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * @var string Dijit type
-     */
-    protected $_dijit  = 'dijit.form.SimpleTextarea';
-
-    /**
-     * @var string HTML element type
-     */
-    protected $_elementType = 'textarea';
-
-    /**
-     * @var string Dojo module
-     */
-    protected $_module = 'dijit.form.SimpleTextarea';
-
-    /**
-     * dijit.form.SimpleTextarea
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function simpleTextarea($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id']    = $id;
-        }
-        $attribs['name']  = $id;
-        $attribs['type']  = $this->_elementType;
-
-        $attribs = $this->_prepareDijit($attribs, $params, 'textarea');
-
-        $html = '<textarea' . $this->_htmlAttribs($attribs) . '>'
-              . $this->view->escape($value)
-              . "</textarea>\n";
-
-        return $html;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Slider.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Slider.php
deleted file mode 100644
index 6796be3d1..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Slider.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Slider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Abstract class for Dojo Slider dijits
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-abstract class Zend_Dojo_View_Helper_Slider extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.Slider';
-
-    /**
-     * Required slider parameters
-     * @var array
-     */
-    protected $_requiredParams = array('minimum', 'maximum', 'discreteValues');
-
-    /**
-     * Slider type -- vertical or horizontal
-     * @var string
-     */
-    protected $_sliderType;
-
-    /**
-     * dijit.form.Slider
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function prepareSlider($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        $this->_sliderType = strtolower($this->_sliderType);
-
-        // Prepare two items: a hidden element to store the value, and the slider
-        $hidden = $this->_renderHiddenElement($id, $value);
-        $hidden = preg_replace('/(name=")([^"]*)"/', 'id="$2" $1$2"', $hidden);
-
-        foreach ($this->_requiredParams as $param) {
-            if (!array_key_exists($param, $params)) {
-                require_once 'Zend/Dojo/View/Exception.php';
-                throw new Zend_Dojo_View_Exception('prepareSlider() requires minimally the "minimum", "maximum", and "discreteValues" parameters');
-            }
-        }
-
-        $content = '';
-        $params['value'] = $value;
-
-        if (!array_key_exists('onChange', $attribs)) {
-            $attribs['onChange'] = "dojo.byId('" . $id . "').value = arguments[0];";
-        }
-
-        $id  = str_replace('][', '-', $id);
-        $id  = str_replace(array('[', ']'), '-', $id);
-        $id  = rtrim($id, '-');
-        $id .= '-slider';
-
-        switch ($this->_sliderType) {
-            case 'horizontal':
-                if (array_key_exists('topDecoration', $params)) {
-                    $content .= $this->_prepareDecoration('topDecoration', $id, $params['topDecoration']);
-                    unset($params['topDecoration']);
-                }
-
-                if (array_key_exists('bottomDecoration', $params)) {
-                    $content .= $this->_prepareDecoration('bottomDecoration', $id, $params['bottomDecoration']);
-                    unset($params['bottomDecoration']);
-                }
-
-                if (array_key_exists('leftDecoration', $params)) {
-                    unset($params['leftDecoration']);
-                }
-
-                if (array_key_exists('rightDecoration', $params)) {
-                    unset($params['rightDecoration']);
-                }
-                break;
-            case 'vertical':
-                if (array_key_exists('leftDecoration', $params)) {
-                    $content .= $this->_prepareDecoration('leftDecoration', $id, $params['leftDecoration']);
-                    unset($params['leftDecoration']);
-                }
-
-                if (array_key_exists('rightDecoration', $params)) {
-                    $content .= $this->_prepareDecoration('rightDecoration', $id, $params['rightDecoration']);
-                    unset($params['rightDecoration']);
-                }
-
-                if (array_key_exists('topDecoration', $params)) {
-                    unset($params['topDecoration']);
-                }
-
-                if (array_key_exists('bottomDecoration', $params)) {
-                    unset($params['bottomDecoration']);
-                }
-                break;
-            default:
-                require_once 'Zend/Dojo/View/Exception.php';
-                throw new Zend_Dojo_View_Exception('Invalid slider type; slider must be horizontal or vertical');
-        }
-
-        return $hidden . $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-
-    /**
-     * Prepare slider decoration
-     *
-     * @param  string $position
-     * @param  string $id
-     * @param  array $decInfo
-     * @return string
-     */
-    protected function _prepareDecoration($position, $id, $decInfo)
-    {
-        if (!in_array($position, array('topDecoration', 'bottomDecoration', 'leftDecoration', 'rightDecoration'))) {
-            return '';
-        }
-
-        if (!is_array($decInfo)
-            || !array_key_exists('labels', $decInfo)
-            || !is_array($decInfo['labels'])
-        ) {
-            return '';
-        }
-
-        $id .= '-' . $position;
-
-        if (!array_key_exists('dijit', $decInfo)) {
-            $dijit = 'dijit.form.' . ucfirst($this->_sliderType) . 'Rule';
-        } else {
-            $dijit = $decInfo['dijit'];
-            if ('dijit.form.' != substr($dijit, 0, 10)) {
-                $dijit = 'dijit.form.' . $dijit;
-            }
-        }
-
-        $params  = array();
-        $attribs = array();
-        $labels  = $decInfo['labels'];
-        if (array_key_exists('params', $decInfo)) {
-            $params = $decInfo['params'];
-        }
-        if (array_key_exists('attribs', $decInfo)) {
-            $attribs = $decInfo['attribs'];
-        }
-
-        $containerParams = null;
-        if (array_key_exists('container', $params)) {
-            $containerParams = $params['container'];
-            unset($params['container']);
-        }
-
-        if (array_key_exists('labels', $params)) {
-            $labelsParams = $params['labels'];
-            unset($params['labels']);
-        } else {
-            $labelsParams = $params;
-        }
-
-        if (null === $containerParams) {
-            $containerParams = $params;
-        }
-
-        $containerAttribs = null;
-        if (array_key_exists('container', $attribs)) {
-            $containerAttribs = $attribs['container'];
-            unset($attribs['container']);
-        }
-
-        if (array_key_exists('labels', $attribs)) {
-            $labelsAttribs = $attribs['labels'];
-            unset($attribs['labels']);
-        } else {
-            $labelsAttribs = $attribs;
-        }
-
-        if (null === $containerAttribs) {
-            $containerAttribs = $attribs;
-        }
-
-        $containerParams['container'] = $position;
-        $labelsParams['container']    = $position;
-
-        $labelList = $this->_prepareLabelsList($id, $labelsParams, $labelsAttribs, $labels);
-
-        $dijit = 'dijit.form.' . ucfirst($this->_sliderType) . 'Rule';
-        $containerAttribs['id'] = $id;
-        $containerAttribs = $this->_prepareDijit($containerAttribs, $containerParams, 'layout', $dijit);
-        $containerHtml = '<div' . $this->_htmlAttribs($containerAttribs) . "></div>\n";
-
-        switch ($position) {
-            case 'topDecoration':
-            case 'leftDecoration':
-                return $labelList . $containerHtml;
-            case 'bottomDecoration':
-            case 'rightDecoration':
-                return $containerHtml . $labelList;
-        }
-    }
-
-    /**
-     * Prepare slider label list
-     *
-     * @param  string $id
-     * @param  array $params
-     * @param  array $attribs
-     * @param  array $labels
-     * @return string
-     */
-    protected function _prepareLabelsList($id, array $params, array $attribs, array $labels)
-    {
-        $attribs['id'] = $id . '-labels';
-        $dijit = 'dijit.form.' . ucfirst($this->_sliderType) . 'RuleLabels';
-        $attribs = $this->_prepareDijit($attribs, $params, 'layout', $dijit);
-
-        return $this->view->htmlList($labels, true, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/SplitContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/SplitContainer.php
deleted file mode 100644
index d1350def4..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/SplitContainer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SplitContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo SplitContainer dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_SplitContainer extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.SplitContainer';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.layout.SplitContainer';
-
-    /**
-     * dijit.layout.SplitContainer
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function splitContainer($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/StackContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/StackContainer.php
deleted file mode 100644
index e6be5f8ef..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/StackContainer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StackContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo StackContainer dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_StackContainer extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.StackContainer';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.layout.StackContainer';
-
-    /**
-     * dijit.layout.StackContainer
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function stackContainer($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/SubmitButton.php b/airtime_mvc/library/Zend/Dojo/View/Helper/SubmitButton.php
deleted file mode 100644
index 7683f3828..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/SubmitButton.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubmitButton.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Button */
-require_once 'Zend/Dojo/View/Helper/Button.php';
-
-/**
- * Dojo Button dijit tied to submit input
- *
- * @uses       Zend_Dojo_View_Helper_Button
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_SubmitButton extends Zend_Dojo_View_Helper_Button
-{
-    /**
-     * @var string Submit input
-     */
-    protected $_elementType = 'submit';
-
-    /**
-     * dijit.form.Button tied to submit input
-     *
-     * @param  string $id
-     * @param  string $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function submitButton($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        if (!array_key_exists('label', $params)) {
-            $params['label'] = $value;
-        }
-        if (empty($params['label']) && !empty($params['content'])) {
-            $params['label'] = $params['content'];
-            $value = $params['content'];
-        }
-        if (empty($params['label']) && !empty($attribs['content'])) {
-            $params['label'] = $attribs['content'];
-            $value = $attribs['content'];
-            unset($attribs['content']);
-        }
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/TabContainer.php b/airtime_mvc/library/Zend/Dojo/View/Helper/TabContainer.php
deleted file mode 100644
index 5cfdfa021..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/TabContainer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TabContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_DijitContainer */
-require_once 'Zend/Dojo/View/Helper/DijitContainer.php';
-
-/**
- * Dojo TabContainer dijit
- *
- * @uses       Zend_Dojo_View_Helper_DijitContainer
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_TabContainer extends Zend_Dojo_View_Helper_DijitContainer
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.layout.TabContainer';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.layout.TabContainer';
-
-    /**
-     * dijit.layout.TabContainer
-     *
-     * @param  string $id
-     * @param  string $content
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function tabContainer($id = null, $content = '', array $params = array(), array $attribs = array())
-    {
-        if (0 === func_num_args()) {
-            return $this;
-        }
-
-        return $this->_createLayoutContainer($id, $content, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/TextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/TextBox.php
deleted file mode 100644
index f1e104060..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/TextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo TextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_TextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.TextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.TextBox';
-
-    /**
-     * dijit.form.TextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function textBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/Textarea.php b/airtime_mvc/library/Zend/Dojo/View/Helper/Textarea.php
deleted file mode 100644
index 95bbed0fb..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/Textarea.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo Textarea dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_Textarea extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.Textarea';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.Textarea';
-
-    /**
-     * dijit.form.Textarea
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function textarea($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id']    = $id;
-        }
-        $attribs['name']  = $id;
-        $attribs['type']  = $this->_elementType;
-
-        $attribs = $this->_prepareDijit($attribs, $params, 'textarea');
-
-        $html = '<textarea' . $this->_htmlAttribs($attribs) . '>'
-              . $value
-              . "</textarea>\n";
-
-        return $html;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/TimeTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/TimeTextBox.php
deleted file mode 100644
index a56ec1e2b..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/TimeTextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimeTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo TimeTextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_TimeTextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.TimeTextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.TimeTextBox';
-
-    /**
-     * dijit.form.TimeTextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function timeTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/ValidationTextBox.php b/airtime_mvc/library/Zend/Dojo/View/Helper/ValidationTextBox.php
deleted file mode 100644
index f480b595d..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/ValidationTextBox.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ValidationTextBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Dijit */
-require_once 'Zend/Dojo/View/Helper/Dijit.php';
-
-/**
- * Dojo ValidationTextBox dijit
- *
- * @uses       Zend_Dojo_View_Helper_Dijit
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_ValidationTextBox extends Zend_Dojo_View_Helper_Dijit
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.ValidationTextBox';
-
-    /**
-     * HTML element type
-     * @var string
-     */
-    protected $_elementType = 'text';
-
-    /**
-     * Dojo module to use
-     * @var string
-     */
-    protected $_module = 'dijit.form.ValidationTextBox';
-
-    /**
-     * dijit.form.ValidationTextBox
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function validationTextBox($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->_createFormElement($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dojo/View/Helper/VerticalSlider.php b/airtime_mvc/library/Zend/Dojo/View/Helper/VerticalSlider.php
deleted file mode 100644
index bdcaeb219..000000000
--- a/airtime_mvc/library/Zend/Dojo/View/Helper/VerticalSlider.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VerticalSlider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Dojo_View_Helper_Slider */
-require_once 'Zend/Dojo/View/Helper/Slider.php';
-
-/**
- * Dojo VerticalSlider dijit
- *
- * @uses       Zend_Dojo_View_Helper_Slider
- * @package    Zend_Dojo
- * @subpackage View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
-  */
-class Zend_Dojo_View_Helper_VerticalSlider extends Zend_Dojo_View_Helper_Slider
-{
-    /**
-     * Dijit being used
-     * @var string
-     */
-    protected $_dijit  = 'dijit.form.VerticalSlider';
-
-    /**
-     * Slider type
-     * @var string
-     */
-    protected $_sliderType = 'Vertical';
-
-    /**
-     * dijit.form.VerticalSlider
-     *
-     * @param  int $id
-     * @param  mixed $value
-     * @param  array $params  Parameters to use for dijit creation
-     * @param  array $attribs HTML attributes
-     * @return string
-     */
-    public function verticalSlider($id, $value = null, array $params = array(), array $attribs = array())
-    {
-        return $this->prepareSlider($id, $value, $params, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dom/Exception.php b/airtime_mvc/library/Zend/Dom/Exception.php
deleted file mode 100644
index 7517a7ad7..000000000
--- a/airtime_mvc/library/Zend/Dom/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * Zend_Dom Exceptions
- *
- * @category   Zend
- * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dom_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Dom/Query.php b/airtime_mvc/library/Zend/Dom/Query.php
deleted file mode 100644
index 2dd29b877..000000000
--- a/airtime_mvc/library/Zend/Dom/Query.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 21157 2010-02-23 17:52:15Z matthew $
- */
-
-/**
- * @see Zend_Dom_Query_Css2Xpath
- */
-require_once 'Zend/Dom/Query/Css2Xpath.php';
-
-/**
- * @see Zend_Dom_Query_Result
- */
-require_once 'Zend/Dom/Query/Result.php';
-
-/**
- * Query DOM structures based on CSS selectors and/or XPath
- *
- * @package    Zend_Dom
- * @subpackage Query
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Dom_Query
-{
-    /**#@+
-     * Document types
-     */
-    const DOC_XML   = 'docXml';
-    const DOC_HTML  = 'docHtml';
-    const DOC_XHTML = 'docXhtml';
-    /**#@-*/
-
-    /**
-     * @var string
-     */
-    protected $_document;
-
-    /**
-     * DOMDocument errors, if any
-     * @var false|array
-     */
-    protected $_documentErrors = false;
-
-    /**
-     * Document type
-     * @var string
-     */
-    protected $_docType;
-
-    /**
-     * Constructor
-     *
-     * @param  null|string $document
-     * @return void
-     */
-    public function __construct($document = null)
-    {
-        $this->setDocument($document);
-    }
-
-    /**
-     * Set document to query
-     *
-     * @param  string $document
-     * @return Zend_Dom_Query
-     */
-    public function setDocument($document)
-    {
-        if (0 === strlen($document)) {
-            return $this;
-        }
-        // breaking XML declaration to make syntax highlighting work
-        if ('<' . '?xml' == substr(trim($document), 0, 5)) {
-            return $this->setDocumentXml($document);
-        }
-        if (strstr($document, 'DTD XHTML')) {
-            return $this->setDocumentXhtml($document);
-        }
-        return $this->setDocumentHtml($document);
-    }
-
-    /**
-     * Register HTML document
-     *
-     * @param  string $document
-     * @return Zend_Dom_Query
-     */
-    public function setDocumentHtml($document)
-    {
-        $this->_document = (string) $document;
-        $this->_docType  = self::DOC_HTML;
-        return $this;
-    }
-
-    /**
-     * Register XHTML document
-     *
-     * @param  string $document
-     * @return Zend_Dom_Query
-     */
-    public function setDocumentXhtml($document)
-    {
-        $this->_document = (string) $document;
-        $this->_docType  = self::DOC_XHTML;
-        return $this;
-    }
-
-    /**
-     * Register XML document
-     *
-     * @param  string $document
-     * @return Zend_Dom_Query
-     */
-    public function setDocumentXml($document)
-    {
-        $this->_document = (string) $document;
-        $this->_docType  = self::DOC_XML;
-        return $this;
-    }
-
-    /**
-     * Retrieve current document
-     *
-     * @return string
-     */
-    public function getDocument()
-    {
-        return $this->_document;
-    }
-
-    /**
-     * Get document type
-     *
-     * @return string
-     */
-    public function getDocumentType()
-    {
-        return $this->_docType;
-    }
-
-    /**
-     * Get any DOMDocument errors found
-     * 
-     * @return false|array
-     */
-    public function getDocumentErrors()
-    {
-        return $this->_documentErrors;
-    }
-
-    /**
-     * Perform a CSS selector query
-     *
-     * @param  string $query
-     * @return Zend_Dom_Query_Result
-     */
-    public function query($query)
-    {
-        $xpathQuery = Zend_Dom_Query_Css2Xpath::transform($query);
-        return $this->queryXpath($xpathQuery, $query);
-    }
-
-    /**
-     * Perform an XPath query
-     *
-     * @param  string|array $xpathQuery
-     * @param  string $query CSS selector query
-     * @return Zend_Dom_Query_Result
-     */
-    public function queryXpath($xpathQuery, $query = null)
-    {
-        if (null === ($document = $this->getDocument())) {
-            require_once 'Zend/Dom/Exception.php';
-            throw new Zend_Dom_Exception('Cannot query; no document registered');
-        }
-
-        libxml_use_internal_errors(true);
-        $domDoc = new DOMDocument;
-        $type   = $this->getDocumentType();
-        switch ($type) {
-            case self::DOC_XML:
-                $success = $domDoc->loadXML($document);
-                break;
-            case self::DOC_HTML:
-            case self::DOC_XHTML:
-            default:
-                $success = $domDoc->loadHTML($document);
-                break;
-        }
-        $errors = libxml_get_errors();
-        if (!empty($errors)) {
-            $this->_documentErrors = $errors;
-            libxml_clear_errors();
-        }
-        libxml_use_internal_errors(false);
-
-        if (!$success) {
-            require_once 'Zend/Dom/Exception.php';
-            throw new Zend_Dom_Exception(sprintf('Error parsing document (type == %s)', $type));
-        }
-
-        $nodeList   = $this->_getNodeList($domDoc, $xpathQuery);
-        return new Zend_Dom_Query_Result($query, $xpathQuery, $domDoc, $nodeList);
-    }
-
-    /**
-     * Prepare node list
-     *
-     * @param  DOMDocument $document
-     * @param  string|array $xpathQuery
-     * @return array
-     */
-    protected function _getNodeList($document, $xpathQuery)
-    {
-        $xpath      = new DOMXPath($document);
-        $xpathQuery = (string) $xpathQuery;
-        if (preg_match_all('|\[contains\((@[a-z0-9_-]+),\s?\' |i', $xpathQuery, $matches)) {
-            foreach ($matches[1] as $attribute) {
-                $queryString = '//*[' . $attribute . ']';
-                $attributeName = substr($attribute, 1);
-                $nodes = $xpath->query($queryString);
-                foreach ($nodes as $node) {
-                    $attr = $node->attributes->getNamedItem($attributeName);
-                    $attr->value = ' ' . $attr->value . ' ';
-                }
-            }
-        }
-        return $xpath->query($xpathQuery);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dom/Query/Css2Xpath.php b/airtime_mvc/library/Zend/Dom/Query/Css2Xpath.php
deleted file mode 100644
index 351b45322..000000000
--- a/airtime_mvc/library/Zend/Dom/Query/Css2Xpath.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Transform CSS selectors to XPath
- *
- * @package    Zend_Dom
- * @subpackage Query
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Css2Xpath.php 20480 2010-01-21 17:46:20Z matthew $
- */
-class Zend_Dom_Query_Css2Xpath
-{
-    /**
-     * Transform CSS expression to XPath
-     *
-     * @param  string $path
-     * @return string
-     */
-    public static function transform($path)
-    {
-        $path = (string) $path;
-        if (strstr($path, ',')) {
-            $paths       = explode(',', $path);
-            $expressions = array();
-            foreach ($paths as $path) {
-                $xpath = self::transform(trim($path));
-                if (is_string($xpath)) {
-                    $expressions[] = $xpath;
-                } elseif (is_array($xpath)) {
-                    $expressions = array_merge($expressions, $xpath);
-                }
-            }
-            return implode('|', $expressions);
-        }
-
-        $paths    = array('//');
-        $path     = preg_replace('|\s+>\s+|', '>', $path);
-        $segments = preg_split('/\s+/', $path);
-        foreach ($segments as $key => $segment) {
-            $pathSegment = self::_tokenize($segment);
-            if (0 == $key) {
-                if (0 === strpos($pathSegment, '[contains(@class')) {
-                    $paths[0] .= '*' . $pathSegment;
-                } else {
-                    $paths[0] .= $pathSegment;
-                }
-                continue;
-            }
-            if (0 === strpos($pathSegment, '[contains(@class')) {
-                foreach ($paths as $key => $xpath) {
-                    $paths[$key] .= '//*' . $pathSegment;
-                    $paths[]      = $xpath . $pathSegment;
-                }
-            } else {
-                foreach ($paths as $key => $xpath) {
-                    $paths[$key] .= '//' . $pathSegment;
-                }
-            }
-        }
-
-        if (1 == count($paths)) {
-            return $paths[0];
-        }
-        return implode('|', $paths);
-    }
-
-    /**
-     * Tokenize CSS expressions to XPath
-     *
-     * @param  string $expression
-     * @return string
-     */
-    protected static function _tokenize($expression)
-    {
-        // Child selectors
-        $expression = str_replace('>', '/', $expression);
-
-        // IDs
-        $expression = preg_replace('|#([a-z][a-z0-9_-]*)|i', '[@id=\'$1\']', $expression);
-        $expression = preg_replace('|(?<![a-z0-9_-])(\[@id=)|i', '*$1', $expression);
-
-        // arbitrary attribute strict equality
-        if (preg_match('|([a-z]+)\[([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i', $expression)) {
-            $expression = preg_replace_callback(
-                '|([a-z]+)\[([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
-                create_function(
-                    '$matches',
-                    'return $matches[1] . "[@" . strtolower($matches[2]) . "=\'" . $matches[3] . "\']";'
-                ),
-                $expression
-            );
-        }
-
-        // arbitrary attribute contains full word
-        if (preg_match('|([a-z]+)\[([a-z0-9_-]+)~=[\'"]([^\'"]+)[\'"]\]|i', $expression)) {
-            $expression = preg_replace_callback(
-                '|([a-z]+)\[([a-z0-9_-]+)~=[\'"]([^\'"]+)[\'"]\]|i',
-                create_function(
-                    '$matches',
-                    'return $matches[1] . "[contains(@" . strtolower($matches[2]) . ", \' $matches[3] \')]";'
-                ),
-                $expression
-            );
-        }
-
-        // arbitrary attribute contains specified content
-        if (preg_match('|([a-z]+)\[([a-z0-9_-]+)\*=[\'"]([^\'"]+)[\'"]\]|i', $expression)) {
-            $expression = preg_replace_callback(
-                '|([a-z]+)\[([a-z0-9_-]+)\*=[\'"]([^\'"]+)[\'"]\]|i',
-                create_function(
-                    '$matches',
-                    'return $matches[1] . "[contains(@" . strtolower($matches[2]) . ", \'" . $matches[3] . "\')]";'
-                ),
-                $expression
-            );
-        }
-
-        // Classes
-        $expression = preg_replace('|\.([a-z][a-z0-9_-]*)|i', "[contains(@class, ' \$1 ')]", $expression);
-
-        return $expression;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Dom/Query/Result.php b/airtime_mvc/library/Zend/Dom/Query/Result.php
deleted file mode 100644
index d7de96f44..000000000
--- a/airtime_mvc/library/Zend/Dom/Query/Result.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Dom
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Results for DOM XPath query
- *
- * @package    Zend_Dom
- * @subpackage Query
- * @uses       Iterator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Dom_Query_Result implements Iterator,Countable
-{
-    /**
-     * Number of results
-     * @var int
-     */
-    protected $_count;
-
-    /**
-     * CSS Selector query
-     * @var string
-     */
-    protected $_cssQuery;
-
-    /**
-     * @var DOMDocument
-     */
-    protected $_document;
-
-    /**
-     * @var DOMNodeList
-     */
-    protected $_nodeList;
-
-    /**
-     * Current iterator position
-     * @var int
-     */
-    protected $_position = 0;
-
-    /**
-     * @var DOMXPath
-     */
-    protected $_xpath;
-
-    /**
-     * XPath query
-     * @var string
-     */
-    protected $_xpathQuery;
-
-    /**
-     * Constructor
-     *
-     * @param  string $cssQuery
-     * @param  string|array $xpathQuery
-     * @param  DOMDocument $document
-     * @param  DOMNodeList $nodeList
-     * @return void
-     */
-    public function  __construct($cssQuery, $xpathQuery, DOMDocument $document, DOMNodeList $nodeList)
-    {
-        $this->_cssQuery   = $cssQuery;
-        $this->_xpathQuery = $xpathQuery;
-        $this->_document   = $document;
-        $this->_nodeList   = $nodeList;
-    }
-
-    /**
-     * Retrieve CSS Query
-     *
-     * @return string
-     */
-    public function getCssQuery()
-    {
-        return $this->_cssQuery;
-    }
-
-    /**
-     * Retrieve XPath query
-     *
-     * @return string
-     */
-    public function getXpathQuery()
-    {
-        return $this->_xpathQuery;
-    }
-
-    /**
-     * Retrieve DOMDocument
-     *
-     * @return DOMDocument
-     */
-    public function getDocument()
-    {
-        return $this->_document;
-    }
-
-    /**
-     * Iterator: rewind to first element
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_position = 0;
-        return $this->_nodeList->item(0);
-    }
-
-    /**
-     * Iterator: is current position valid?
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        if (in_array($this->_position, range(0, $this->_nodeList->length - 1)) && $this->_nodeList->length > 0) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Iterator: return current element
-     *
-     * @return DOMElement
-     */
-    public function current()
-    {
-        return $this->_nodeList->item($this->_position);
-    }
-
-    /**
-     * Iterator: return key of current element
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_position;
-    }
-
-    /**
-     * Iterator: move to next element
-     *
-     * @return void
-     */
-    public function next()
-    {
-        ++$this->_position;
-        return $this->_nodeList->item($this->_position);
-    }
-
-    /**
-     * Countable: get count
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->_nodeList->length;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Exception.php b/airtime_mvc/library/Zend/Exception.php
deleted file mode 100644
index bbfb792e9..000000000
--- a/airtime_mvc/library/Zend/Exception.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
-* @category   Zend
-* @package    Zend
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-* @license    http://framework.zend.com/license/new-bsd     New BSD License
-*/
-class Zend_Exception extends Exception
-{
-    /**
-     * @var null|Exception
-     */
-    private $_previous = null;
-
-    /**
-     * Construct the exception
-     *
-     * @param  string $msg
-     * @param  int $code
-     * @param  Exception $previous
-     * @return void
-     */
-    public function __construct($msg = '', $code = 0, Exception $previous = null)
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            parent::__construct($msg, (int) $code);
-            $this->_previous = $previous;
-        } else {
-            parent::__construct($msg, (int) $code, $previous);
-        }
-    }
-
-    /**
-     * Overloading
-     *
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     * 
-     * @param  string $method 
-     * @param  array $args 
-     * @return mixed
-     */
-    public function __call($method, array $args)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->_getPrevious();
-        }
-        return null;
-    }
-
-    /**
-     * String representation of the exception
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            if (null !== ($e = $this->getPrevious())) {
-                return $e->__toString() 
-                       . "\n\nNext " 
-                       . parent::__toString();
-            }
-        }
-        return parent::__toString();
-    }
-
-    /**
-     * Returns previous Exception
-     *
-     * @return Exception|null
-     */
-    protected function _getPrevious()
-    {
-        return $this->_previous;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed.php b/airtime_mvc/library/Zend/Feed.php
deleted file mode 100644
index 93154a91c..000000000
--- a/airtime_mvc/library/Zend/Feed.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Feed utility class
- *
- * Base Zend_Feed class, containing constants and the Zend_Http_Client instance
- * accessor.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed
-{
-
-    /**
-     * HTTP client object to use for retrieving feeds
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $_httpClient = null;
-
-    /**
-     * Override HTTP PUT and DELETE request methods?
-     *
-     * @var boolean
-     */
-    protected static $_httpMethodOverride = false;
-
-    /**
-     * @var array
-     */
-    protected static $_namespaces = array(
-        'opensearch' => 'http://a9.com/-/spec/opensearchrss/1.0/',
-        'atom'       => 'http://www.w3.org/2005/Atom',
-        'rss'        => 'http://blogs.law.harvard.edu/tech/rss',
-    );
-
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feeds.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$_httpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object. If none is set, a new Zend_Http_Client will be used.
-     *
-     * @return Zend_Http_Client_Abstract
-     */
-    public static function getHttpClient()
-    {
-        if (!self::$_httpClient instanceof Zend_Http_Client) {
-            /**
-             * @see Zend_Http_Client
-             */
-            require_once 'Zend/Http/Client.php';
-            self::$_httpClient = new Zend_Http_Client();
-        }
-
-        return self::$_httpClient;
-    }
-
-
-    /**
-     * Toggle using POST instead of PUT and DELETE HTTP methods
-     *
-     * Some feed implementations do not accept PUT and DELETE HTTP
-     * methods, or they can't be used because of proxies or other
-     * measures. This allows turning on using POST where PUT and
-     * DELETE would normally be used; in addition, an
-     * X-Method-Override header will be sent with a value of PUT or
-     * DELETE as appropriate.
-     *
-     * @param  boolean $override Whether to override PUT and DELETE.
-     * @return void
-     */
-    public static function setHttpMethodOverride($override = true)
-    {
-        self::$_httpMethodOverride = $override;
-    }
-
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return boolean
-     */
-    public static function getHttpMethodOverride()
-    {
-        return self::$_httpMethodOverride;
-    }
-
-
-    /**
-     * Get the full version of a namespace prefix
-     *
-     * Looks up a prefix (atom:, etc.) in the list of registered
-     * namespaces and returns the full namespace URI if
-     * available. Returns the prefix, unmodified, if it's not
-     * registered.
-     *
-     * @return string
-     */
-    public static function lookupNamespace($prefix)
-    {
-        return isset(self::$_namespaces[$prefix]) ?
-            self::$_namespaces[$prefix] :
-            $prefix;
-    }
-
-
-    /**
-     * Add a namespace and prefix to the registered list
-     *
-     * Takes a prefix and a full namespace URI and adds them to the
-     * list of registered namespaces for use by
-     * Zend_Feed::lookupNamespace().
-     *
-     * @param  string $prefix The namespace prefix
-     * @param  string $namespaceURI The full namespace URI
-     * @return void
-     */
-    public static function registerNamespace($prefix, $namespaceURI)
-    {
-        self::$_namespaces[$prefix] = $namespaceURI;
-    }
-
-
-    /**
-     * Imports a feed located at $uri.
-     *
-     * @param  string $uri
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function import($uri)
-    {
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->request('GET');
-        if ($response->getStatus() !== 200) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-        }
-        $feed = $response->getBody();
-        return self::importString($feed);
-    }
-
-
-    /**
-     * Imports a feed represented by $string.
-     *
-     * @param  string $string
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function importString($string)
-    {
-        // Load the feed as an XML DOMDocument object
-        $libxml_errflag = libxml_use_internal_errors(true);
-        $doc = new DOMDocument;
-        if (trim($string) == '') {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Document/string being imported'
-            . ' is an Empty string or comes from an empty HTTP response');
-        }
-        $status = $doc->loadXML($string);
-        libxml_use_internal_errors($libxml_errflag);
-
-
-        if (!$status) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            // Build error message
-            $error = libxml_get_last_error();
-            if ($error && $error->message) {
-                $errormsg = "DOMDocument cannot parse XML: {$error->message}";
-            } else {
-                $errormsg = "DOMDocument cannot parse XML";
-            }
-
-
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception($errormsg);
-        }
-
-        // Try to find the base feed element or a single <entry> of an Atom feed
-        if ($doc->getElementsByTagName('feed')->item(0) ||
-            $doc->getElementsByTagName('entry')->item(0)) {
-            /**
-             * @see Zend_Feed_Atom
-             */
-            require_once 'Zend/Feed/Atom.php';
-            // return a newly created Zend_Feed_Atom object
-            return new Zend_Feed_Atom(null, $string);
-        }
-
-        // Try to find the base feed element of an RSS feed
-        if ($doc->getElementsByTagName('channel')->item(0)) {
-            /**
-             * @see Zend_Feed_Rss
-             */
-            require_once 'Zend/Feed/Rss.php';
-            // return a newly created Zend_Feed_Rss object
-            return new Zend_Feed_Rss(null, $string);
-        }
-
-        // $string does not appear to be a valid feed of the supported types
-        /**
-         * @see Zend_Feed_Exception
-         */
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Invalid or unsupported feed format');
-    }
-
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Abstract
-     */
-    public static function importFile($filename)
-    {
-        @ini_set('track_errors', 1);
-        $feed = @file_get_contents($filename);
-        @ini_restore('track_errors');
-        if ($feed === false) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg");
-        }
-        return self::importString($feed);
-    }
-
-
-    /**
-     * Attempts to find feeds at $uri referenced by <link ... /> tags. Returns an
-     * array of the feeds referenced at $uri.
-     *
-     * @todo Allow findFeeds() to follow one, but only one, code 302.
-     *
-     * @param  string $uri
-     * @throws Zend_Feed_Exception
-     * @return array
-     */
-    public static function findFeeds($uri)
-    {
-        // Get the HTTP response from $uri and save the contents
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->request();
-        if ($response->getStatus() !== 200) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus());
-        }
-        $contents = $response->getBody();
-
-        // Parse the contents for appropriate <link ... /> tags
-        @ini_set('track_errors', 1);
-        $pattern = '~(<link[^>]+)/?>~i';
-        $result = @preg_match_all($pattern, $contents, $matches);
-        @ini_restore('track_errors');
-        if ($result === false) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("Internal error: $php_errormsg");
-        }
-
-        // Try to fetch a feed for each link tag that appears to refer to a feed
-        $feeds = array();
-        if (isset($matches[1]) && count($matches[1]) > 0) {
-            foreach ($matches[1] as $link) {
-                // force string to be an utf-8 one
-                if (!mb_check_encoding($link, 'UTF-8')) {
-                    $link = mb_convert_encoding($link, 'UTF-8');
-                }
-                $xml = @simplexml_load_string(rtrim($link, ' /') . ' />');
-                if ($xml === false) {
-                    continue;
-                }
-                $attributes = $xml->attributes();
-                if (!isset($attributes['rel']) || !@preg_match('~^(?:alternate|service\.feed)~i', $attributes['rel'])) {
-                    continue;
-                }
-                if (!isset($attributes['type']) ||
-                        !@preg_match('~^application/(?:atom|rss|rdf)\+xml~', $attributes['type'])) {
-                    continue;
-                }
-                if (!isset($attributes['href'])) {
-                    continue;
-                }
-                try {
-                    // checks if we need to canonize the given uri
-                    try {
-                        $uri = Zend_Uri::factory((string) $attributes['href']);
-                    } catch (Zend_Uri_Exception $e) {
-                        // canonize the uri
-                        $path = (string) $attributes['href'];
-                        $query = $fragment = '';
-                        if (substr($path, 0, 1) != '/') {
-                            // add the current root path to this one
-                            $path = rtrim($client->getUri()->getPath(), '/') . '/' . $path;
-                        }
-                        if (strpos($path, '?') !== false) {
-                            list($path, $query) = explode('?', $path, 2);
-                        }
-                        if (strpos($query, '#') !== false) {
-                            list($query, $fragment) = explode('#', $query, 2);
-                        }
-                        $uri = Zend_Uri::factory($client->getUri(true));
-                        $uri->setPath($path);
-                        $uri->setQuery($query);
-                        $uri->setFragment($fragment);
-                    }
-
-                    $feed = self::import($uri);
-                } catch (Exception $e) {
-                    continue;
-                }
-                $feeds[$uri->getUri()] = $feed;
-            }
-        }
-
-        // Return the fetched feeds
-        return $feeds;
-    }
-
-    /**
-     * Construct a new Zend_Feed_Abstract object from a custom array
-     *
-     * @param  array  $data
-     * @param  string $format (rss|atom) the requested output format
-     * @return Zend_Feed_Abstract
-     */
-    public static function importArray(array $data, $format = 'atom')
-    {
-        $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        if (!class_exists($obj)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($obj);
-        }
-
-        /**
-         * @see Zend_Feed_Builder
-         */
-        require_once 'Zend/Feed/Builder.php';
-        return new $obj(null, null, new Zend_Feed_Builder($data));
-    }
-
-    /**
-     * Construct a new Zend_Feed_Abstract object from a Zend_Feed_Builder_Interface data source
-     *
-     * @param  Zend_Feed_Builder_Interface $builder this object will be used to extract the data of the feed
-     * @param  string                      $format (rss|atom) the requested output format
-     * @return Zend_Feed_Abstract
-     */
-    public static function importBuilder(Zend_Feed_Builder_Interface $builder, $format = 'atom')
-    {
-        $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        if (!class_exists($obj)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($obj);
-        }
-        return new $obj(null, null, $builder);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Abstract.php b/airtime_mvc/library/Zend/Feed/Abstract.php
deleted file mode 100644
index 5cba5a251..000000000
--- a/airtime_mvc/library/Zend/Feed/Abstract.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Element
- */
-require_once 'Zend/Feed/Element.php';
-
-
-/**
- * The Zend_Feed_Abstract class is an abstract class representing feeds.
- *
- * Zend_Feed_Abstract implements two core PHP 5 interfaces: ArrayAccess and
- * Iterator. In both cases the collection being treated as an array is
- * considered to be the entry collection, such that iterating over the
- * feed takes you through each of the feed.s entries.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Abstract extends Zend_Feed_Element implements Iterator, Countable
-{
-    /**
-     * Current index on the collection of feed entries for the
-     * Iterator implementation.
-     *
-     * @var integer
-     */
-    protected $_entryIndex = 0;
-
-    /**
-     * Cache of feed entries.
-     *
-     * @var array
-     */
-    protected $_entries;
-
-    /**
-     * Feed constructor
-     *
-     * The Zend_Feed_Abstract constructor takes the URI of a feed or a
-     * feed represented as a string and loads it as XML.
-     *
-     * @param  string $uri The full URI of the feed to load, or NULL if not retrieved via HTTP or as an array.
-     * @param  string $string The feed as a string, or NULL if retrieved via HTTP or as an array.
-     * @param  Zend_Feed_Builder_Interface $builder The feed as a builder instance or NULL if retrieved as a string or via HTTP.
-     * @return void
-     * @throws Zend_Feed_Exception If loading the feed failed.
-     */
-    public function __construct($uri = null, $string = null, Zend_Feed_Builder_Interface $builder = null)
-    {
-        if ($uri !== null) {
-            // Retrieve the feed via HTTP
-            $client = Zend_Feed::getHttpClient();
-            $client->setUri($uri);
-            $response = $client->request('GET');
-            if ($response->getStatus() !== 200) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-            }
-            $this->_element = $response->getBody();
-            $this->__wakeup();
-        } elseif ($string !== null) {
-            // Retrieve the feed from $string
-            $this->_element = $string;
-            $this->__wakeup();
-        } else {
-            // Generate the feed from the array
-            $header = $builder->getHeader();
-            $this->_element = new DOMDocument('1.0', $header['charset']);
-            $root = $this->_mapFeedHeaders($header);
-            $this->_mapFeedEntries($root, $builder->getEntries());
-            $this->_element = $root;
-            $this->_buildEntryCache();
-        }
-    }
-
-
-    /**
-     * Load the feed as an XML DOMDocument object
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        @ini_set('track_errors', 1);
-        $doc = new DOMDocument;
-        $status = @$doc->loadXML($this->_element);
-        @ini_restore('track_errors');
-
-        if (!$status) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            if (!isset($php_errormsg)) {
-                if (function_exists('xdebug_is_enabled')) {
-                    $php_errormsg = '(error message not available, when XDebug is running)';
-                } else {
-                    $php_errormsg = '(error message not available)';
-                }
-            }
-
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
-        }
-
-        $this->_element = $doc;
-    }
-
-
-    /**
-     * Prepare for serialiation
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->_element = $this->saveXML();
-
-        return array('_element');
-    }
-
-
-    /**
-     * Cache the individual feed elements so they don't need to be
-     * searched for on every operation.
-     *
-     * @return void
-     */
-    protected function _buildEntryCache()
-    {
-        $this->_entries = array();
-        foreach ($this->_element->childNodes as $child) {
-            if ($child->localName == $this->_entryElementName) {
-                $this->_entries[] = $child;
-            }
-        }
-    }
-
-
-    /**
-     * Get the number of entries in this feed object.
-     *
-     * @return integer Entry count.
-     */
-    public function count()
-    {
-        return count($this->_entries);
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_entryIndex = 0;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row, or null if no rows.
-     */
-    public function current()
-    {
-        return new $this->_entryClassName(
-            null,
-            $this->_entries[$this->_entryIndex]);
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row number (starts at 0), or NULL if no rows
-     */
-    public function key()
-    {
-        return $this->_entryIndex;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The next row, or null if no more rows.
-     */
-    public function next()
-    {
-        ++$this->_entryIndex;
-    }
-
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return boolean Whether the iteration is valid
-     */
-    public function valid()
-    {
-        return 0 <= $this->_entryIndex && $this->_entryIndex < $this->count();
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    abstract protected function _mapFeedHeaders($array);
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * @param  DOMElement $root the root node to use
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    abstract protected function _mapFeedEntries(DOMElement $root, $array);
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @throws Zend_Feed_Exception if headers have already been sent
-     * @return void
-     */
-    abstract public function send();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Atom.php b/airtime_mvc/library/Zend/Feed/Atom.php
deleted file mode 100644
index 186cde50a..000000000
--- a/airtime_mvc/library/Zend/Feed/Atom.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Abstract
- */
-require_once 'Zend/Feed/Abstract.php';
-
-/**
- * @see Zend_Feed_Entry_Atom
- */
-require_once 'Zend/Feed/Entry/Atom.php';
-
-
-/**
- * Atom feed class
- *
- * The Zend_Feed_Atom class is a concrete subclass of the general
- * Zend_Feed_Abstract class, tailored for representing an Atom
- * feed. It shares all of the same methods with its abstract
- * parent. The distinction is made in the format of data that
- * Zend_Feed_Atom expects, and as a further pointer for users as to
- * what kind of feed object they have been passed.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Atom extends Zend_Feed_Abstract
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Feed_Entry_Atom';
-
-    /**
-     * The element name for individual feed elements (Atom <entry>
-     * elements).
-     *
-     * @var string
-     */
-    protected $_entryElementName = 'entry';
-
-    /**
-     * The default namespace for Atom feeds.
-     *
-     * @var string
-     */
-    protected $_defaultNamespace = 'atom';
-
-
-    /**
-     * Override Zend_Feed_Abstract to set up the $_element and $_entries aliases.
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        parent::__wakeup();
-
-        // Find the base feed element and create an alias to it.
-        $element = $this->_element->getElementsByTagName('feed')->item(0);
-        if (!$element) {
-            // Try to find a single <entry> instead.
-            $element = $this->_element->getElementsByTagName($this->_entryElementName)->item(0);
-            if (!$element) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('No root <feed> or <' . $this->_entryElementName
-                                              . '> element found, cannot parse feed.');
-            }
-
-            $doc = new DOMDocument($this->_element->version,
-                                   $this->_element->actualEncoding);
-            $feed = $doc->appendChild($doc->createElement('feed'));
-            $feed->appendChild($doc->importNode($element, true));
-            $element = $feed;
-        }
-
-        $this->_element = $element;
-
-        // Find the entries and save a pointer to them for speed and
-        // simplicity.
-        $this->_buildEntryCache();
-    }
-
-
-    /**
-     * Easy access to <link> tags keyed by "rel" attributes.
-     *
-     * If $elt->link() is called with no arguments, we will attempt to
-     * return the value of the <link> tag(s) like all other
-     * method-syntax attribute access. If an argument is passed to
-     * link(), however, then we will return the "href" value of the
-     * first <link> tag that has a "rel" attribute matching $rel:
-     *
-     * $elt->link(): returns the value of the link tag.
-     * $elt->link('self'): returns the href from the first <link rel="self"> in the entry.
-     *
-     * @param  string $rel The "rel" attribute to look for.
-     * @return mixed
-     */
-    public function link($rel = null)
-    {
-        if ($rel === null) {
-            return parent::__call('link', null);
-        }
-
-        // index link tags by their "rel" attribute.
-        $links = parent::__get('link');
-        if (!is_array($links)) {
-            if ($links instanceof Zend_Feed_Element) {
-                $links = array($links);
-            } else {
-                return $links;
-            }
-        }
-
-        foreach ($links as $link) {
-            if (empty($link['rel'])) {
-                continue;
-            }
-            if ($rel == $link['rel']) {
-                return $link['href'];
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Make accessing some individual elements of the feed easier.
-     *
-     * Special accessors 'entry' and 'entries' are provided so that if
-     * you wish to iterate over an Atom feed's entries, you can do so
-     * using foreach ($feed->entries as $entry) or foreach
-     * ($feed->entry as $entry).
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'entry':
-                // fall through to the next case
-            case 'entries':
-                return $this;
-
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    protected function _mapFeedHeaders($array)
-    {
-        $feed = $this->_element->createElement('feed');
-        $feed->setAttribute('xmlns', 'http://www.w3.org/2005/Atom');
-
-        $id = $this->_element->createElement('id', $array->link);
-        $feed->appendChild($id);
-
-        $title = $this->_element->createElement('title');
-        $title->appendChild($this->_element->createCDATASection($array->title));
-        $feed->appendChild($title);
-
-        if (isset($array->author)) {
-            $author = $this->_element->createElement('author');
-            $name = $this->_element->createElement('name', $array->author);
-            $author->appendChild($name);
-            if (isset($array->email)) {
-                $email = $this->_element->createElement('email', $array->email);
-                $author->appendChild($email);
-            }
-            $feed->appendChild($author);
-        }
-
-        $updated = isset($array->lastUpdate) ? $array->lastUpdate : time();
-        $updated = $this->_element->createElement('updated', date(DATE_ATOM, $updated));
-        $feed->appendChild($updated);
-
-        if (isset($array->published)) {
-            $published = $this->_element->createElement('published', date(DATE_ATOM, $array->published));
-            $feed->appendChild($published);
-        }
-
-        $link = $this->_element->createElement('link');
-        $link->setAttribute('rel', 'self');
-        $link->setAttribute('href', $array->link);
-        if (isset($array->language)) {
-            $link->setAttribute('hreflang', $array->language);
-        }
-        $feed->appendChild($link);
-
-        if (isset($array->description)) {
-            $subtitle = $this->_element->createElement('subtitle');
-            $subtitle->appendChild($this->_element->createCDATASection($array->description));
-            $feed->appendChild($subtitle);
-        }
-
-        if (isset($array->copyright)) {
-            $copyright = $this->_element->createElement('rights', $array->copyright);
-            $feed->appendChild($copyright);
-        }
-
-        if (isset($array->image)) {
-            $image = $this->_element->createElement('logo', $array->image);
-            $feed->appendChild($image);
-        }
-
-        $generator = !empty($array->generator) ? $array->generator : 'Zend_Feed';
-        $generator = $this->_element->createElement('generator', $generator);
-        $feed->appendChild($generator);
-
-        return $feed;
-    }
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * The following nodes are constructed for each feed entry
-     * <entry>
-     *    <id>url to feed entry</id>
-     *    <title>entry title</title>
-     *    <updated>last update</updated>
-     *    <link rel="alternate" href="url to feed entry" />
-     *    <summary>short text</summary>
-     *    <content>long version, can contain html</content>
-     * </entry>
-     *
-     * @param  array      $array the data to use
-     * @param  DOMElement $root  the root node to use
-     * @return void
-     */
-    protected function _mapFeedEntries(DOMElement $root, $array)
-    {
-        foreach ($array as $dataentry) {
-            $entry = $this->_element->createElement('entry');
-
-            $id = $this->_element->createElement('id', isset($dataentry->guid) ? $dataentry->guid : $dataentry->link);
-            $entry->appendChild($id);
-
-            $title = $this->_element->createElement('title');
-            $title->appendChild($this->_element->createCDATASection($dataentry->title));
-            $entry->appendChild($title);
-
-            $updated = isset($dataentry->lastUpdate) ? $dataentry->lastUpdate : time();
-            $updated = $this->_element->createElement('updated', date(DATE_ATOM, $updated));
-            $entry->appendChild($updated);
-
-            $link = $this->_element->createElement('link');
-            $link->setAttribute('rel', 'alternate');
-            $link->setAttribute('href', $dataentry->link);
-            $entry->appendChild($link);
-
-            $summary = $this->_element->createElement('summary');
-            $summary->appendChild($this->_element->createCDATASection($dataentry->description));
-            $entry->appendChild($summary);
-
-            if (isset($dataentry->content)) {
-                $content = $this->_element->createElement('content');
-                $content->setAttribute('type', 'html');
-                $content->appendChild($this->_element->createCDATASection($dataentry->content));
-                $entry->appendChild($content);
-            }
-
-            if (isset($dataentry->category)) {
-                foreach ($dataentry->category as $category) {
-                    $node = $this->_element->createElement('category');
-                    $node->setAttribute('term', $category['term']);
-                    if (isset($category['scheme'])) {
-                        $node->setAttribute('scheme', $category['scheme']);
-                    }
-                    $entry->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->source)) {
-                $source = $this->_element->createElement('source');
-                $title = $this->_element->createElement('title', $dataentry->source['title']);
-                $source->appendChild($title);
-                $link = $this->_element->createElement('link', $dataentry->source['title']);
-                $link->setAttribute('rel', 'alternate');
-                $link->setAttribute('href', $dataentry->source['url']);
-                $source->appendChild($link);
-            }
-
-            if (isset($dataentry->enclosure)) {
-                foreach ($dataentry->enclosure as $enclosure) {
-                    $node = $this->_element->createElement('link');
-                    $node->setAttribute('rel', 'enclosure');
-                    $node->setAttribute('href', $enclosure['url']);
-                    if (isset($enclosure['type'])) {
-                        $node->setAttribute('type', $enclosure['type']);
-                    }
-                    if (isset($enclosure['length'])) {
-                        $node->setAttribute('length', $enclosure['length']);
-                    }
-                    $entry->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->comments)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:comment',
-                                                             $dataentry->comments);
-                $entry->appendChild($comments);
-            }
-            if (isset($dataentry->commentRss)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:commentRss',
-                                                             $dataentry->commentRss);
-                $entry->appendChild($comments);
-            }
-
-            $root->appendChild($entry);
-        }
-    }
-
-    /**
-     * Override Zend_Feed_Element to allow formated feeds
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $doc->appendChild($doc->importNode($this->_element, true));
-        $doc->formatOutput = true;
-
-        return $doc->saveXML();
-    }
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @return void
-     * @throws Zend_Feed_Exception if headers have already been sent
-     */
-    public function send()
-    {
-        if (headers_sent()) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot send ATOM because headers have already been sent.');
-        }
-
-        header('Content-Type: application/atom+xml; charset=' . $this->_element->ownerDocument->actualEncoding);
-
-        echo $this->saveXML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Builder.php b/airtime_mvc/library/Zend/Feed/Builder.php
deleted file mode 100644
index b44055ec2..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Builder.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Builder_Interface
- */
-require_once 'Zend/Feed/Builder/Interface.php';
-
-/**
- * @see Zend_Feed_Builder_Header
- */
-require_once 'Zend/Feed/Builder/Header.php';
-
-/**
- * @see Zend_Feed_Builder_Entry
- */
-require_once 'Zend/Feed/Builder/Entry.php';
-
-
-/**
- * A simple implementation of Zend_Feed_Builder_Interface.
- *
- * Users are encouraged to make their own classes to implement Zend_Feed_Builder_Interface
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Builder implements Zend_Feed_Builder_Interface
-{
-    /**
-     * The data of the feed
-     *
-     * @var $_data array
-     */
-    private $_data;
-
-    /**
-     * Header of the feed
-     *
-     * @var $_header Zend_Feed_Builder_Header
-     */
-    private $_header;
-
-    /**
-     * List of the entries of the feed
-     *
-     * @var $_entries array
-     */
-    private $_entries = array();
-
-    /**
-     * Constructor. The $data array must conform to the following format:
-     * <code>
-     *  array(
-     *  'title'       => 'title of the feed', //required
-     *  'link'        => 'canonical url to the feed', //required
-     *  'lastUpdate'  => 'timestamp of the update date', // optional
-     *  'published'   => 'timestamp of the publication date', //optional
-     *  'charset'     => 'charset', // required
-     *  'description' => 'short description of the feed', //optional
-     *  'author'      => 'author/publisher of the feed', //optional
-     *  'email'       => 'email of the author', //optional
-     *  'webmaster'   => 'email address for person responsible for technical issues' // optional, ignored if atom is used
-     *  'copyright'   => 'copyright notice', //optional
-     *  'image'       => 'url to image', //optional
-     *  'generator'   => 'generator', // optional
-     *  'language'    => 'language the feed is written in', // optional
-     *  'ttl'         => 'how long in minutes a feed can be cached before refreshing', // optional, ignored if atom is used
-     *  'rating'      => 'The PICS rating for the channel.', // optional, ignored if atom is used
-     *  'cloud'       => array(
-     *                    'domain'            => 'domain of the cloud, e.g. rpc.sys.com' // required
-     *                    'port'              => 'port to connect to' // optional, default to 80
-     *                    'path'              => 'path of the cloud, e.g. /RPC2 //required
-     *                    'registerProcedure' => 'procedure to call, e.g. myCloud.rssPleaseNotify' // required
-     *                    'protocol'          => 'protocol to use, e.g. soap or xml-rpc' // required
-     *                    ), a cloud to be notified of updates // optional, ignored if atom is used
-     *  'textInput'   => array(
-     *                    'title'       => 'the label of the Submit button in the text input area' // required,
-     *                    'description' => 'explains the text input area' // required
-     *                    'name'        => 'the name of the text object in the text input area' // required
-     *                    'link'        => 'the URL of the CGI script that processes text input requests' // required
-     *                    ) // a text input box that can be displayed with the feed // optional, ignored if atom is used
-     *  'skipHours'   => array(
-     *                    'hour in 24 format', // e.g 13 (1pm)
-     *                    // up to 24 rows whose value is a number between 0 and 23
-     *                    ) // Hint telling aggregators which hours they can skip // optional, ignored if atom is used
-     *  'skipDays '   => array(
-     *                    'a day to skip', // e.g Monday
-     *                    // up to 7 rows whose value is a Monday, Tuesday, Wednesday, Thursday, Friday, Saturday or Sunday
-     *                    ) // Hint telling aggregators which days they can skip // optional, ignored if atom is used
-     *  'itunes'      => array(
-     *                    'author'       => 'Artist column' // optional, default to the main author value
-     *                    'owner'        => array(
-     *                                        'name' => 'name of the owner' // optional, default to main author value
-     *                                        'email' => 'email of the owner' // optional, default to main email value
-     *                                        ) // Owner of the podcast // optional
-     *                    'image'        => 'album/podcast art' // optional, default to the main image value
-     *                    'subtitle'     => 'short description' // optional, default to the main description value
-     *                    'summary'      => 'longer description' // optional, default to the main description value
-     *                    'block'        => 'Prevent an episode from appearing (yes|no)' // optional
-     *                    'category'     => array(
-     *                                      array('main' => 'main category', // required
-     *                                            'sub'  => 'sub category' // optional
-     *                                        ),
-     *                                        // up to 3 rows
-     *                                        ) // 'Category column and in iTunes Music Store Browse' // required
-     *                    'explicit'     => 'parental advisory graphic (yes|no|clean)' // optional
-     *                    'keywords'     => 'a comma separated list of 12 keywords maximum' // optional
-     *                    'new-feed-url' => 'used to inform iTunes of new feed URL location' // optional
-     *                    ) // Itunes extension data // optional, ignored if atom is used
-     *  'entries'     => array(
-     *                   array(
-     *                    'title'        => 'title of the feed entry', //required
-     *                    'link'         => 'url to a feed entry', //required
-     *                    'description'  => 'short version of a feed entry', // only text, no html, required
-     *                    'guid'         => 'id of the article, if not given link value will used', //optional
-     *                    'content'      => 'long version', // can contain html, optional
-     *                    'lastUpdate'   => 'timestamp of the publication date', // optional
-     *                    'comments'     => 'comments page of the feed entry', // optional
-     *                    'commentRss'   => 'the feed url of the associated comments', // optional
-     *                    'source'       => array(
-     *                                        'title' => 'title of the original source' // required,
-     *                                        'url' => 'url of the original source' // required
-     *                                           ) // original source of the feed entry // optional
-     *                    'category'     => array(
-     *                                      array(
-     *                                        'term' => 'first category label' // required,
-     *                                        'scheme' => 'url that identifies a categorization scheme' // optional
-     *                                            ),
-     *                                      array(
-     *                                         //data for the second category and so on
-     *                                           )
-     *                                        ) // list of the attached categories // optional
-     *                    'enclosure'    => array(
-     *                                      array(
-     *                                        'url' => 'url of the linked enclosure' // required
-     *                                        'type' => 'mime type of the enclosure' // optional
-     *                                        'length' => 'length of the linked content in octets' // optional
-     *                                           ),
-     *                                      array(
-     *                                         //data for the second enclosure and so on
-     *                                           )
-     *                                        ) // list of the enclosures of the feed entry // optional
-     *                   ),
-     *                   array(
-     *                   //data for the second entry and so on
-     *                   )
-     *                 )
-     * );
-     * </code>
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function __construct(array $data)
-    {
-        $this->_data = $data;
-        $this->_createHeader($data);
-        if (isset($data['entries'])) {
-            $this->_createEntries($data['entries']);
-        }
-    }
-
-    /**
-     * Returns an instance of Zend_Feed_Builder_Header
-     * describing the header of the feed
-     *
-     * @return Zend_Feed_Builder_Header
-     */
-    public function getHeader()
-    {
-        return $this->_header;
-    }
-
-    /**
-     * Returns an array of Zend_Feed_Builder_Entry instances
-     * describing the entries of the feed
-     *
-     * @return array of Zend_Feed_Builder_Entry
-     */
-    public function getEntries()
-    {
-        return $this->_entries;
-    }
-
-    /**
-     * Create the Zend_Feed_Builder_Header instance
-     *
-     * @param  array $data
-     * @throws Zend_Feed_Builder_Exception
-     * @return void
-     */
-    protected function _createHeader(array $data)
-    {
-        $mandatories = array('title', 'link', 'charset');
-        foreach ($mandatories as $mandatory) {
-            if (!isset($data[$mandatory])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
-            }
-        }
-        $this->_header = new Zend_Feed_Builder_Header($data['title'], $data['link'], $data['charset']);
-        if (isset($data['lastUpdate'])) {
-            $this->_header->setLastUpdate($data['lastUpdate']);
-        }
-        if (isset($data['published'])) {
-            $this->_header->setPublishedDate($data['published']);
-        }
-        if (isset($data['description'])) {
-            $this->_header->setDescription($data['description']);
-        }
-        if (isset($data['author'])) {
-            $this->_header->setAuthor($data['author']);
-        }
-        if (isset($data['email'])) {
-            $this->_header->setEmail($data['email']);
-        }
-        if (isset($data['webmaster'])) {
-            $this->_header->setWebmaster($data['webmaster']);
-        }
-        if (isset($data['copyright'])) {
-            $this->_header->setCopyright($data['copyright']);
-        }
-        if (isset($data['image'])) {
-            $this->_header->setImage($data['image']);
-        }
-        if (isset($data['generator'])) {
-            $this->_header->setGenerator($data['generator']);
-        }
-        if (isset($data['language'])) {
-            $this->_header->setLanguage($data['language']);
-        }
-        if (isset($data['ttl'])) {
-            $this->_header->setTtl($data['ttl']);
-        }
-        if (isset($data['rating'])) {
-            $this->_header->setRating($data['rating']);
-        }
-        if (isset($data['cloud'])) {
-            $mandatories = array('domain', 'path', 'registerProcedure', 'protocol');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($data['cloud'][$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your cloud");
-                }
-            }
-            $uri_str = 'http://' . $data['cloud']['domain'] . $data['cloud']['path'];
-            $this->_header->setCloud($uri_str, $data['cloud']['registerProcedure'], $data['cloud']['protocol']);
-        }
-        if (isset($data['textInput'])) {
-            $mandatories = array('title', 'description', 'name', 'link');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($data['textInput'][$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your textInput");
-                }
-            }
-            $this->_header->setTextInput($data['textInput']['title'],
-                                         $data['textInput']['description'],
-                                         $data['textInput']['name'],
-                                         $data['textInput']['link']);
-        }
-        if (isset($data['skipHours'])) {
-            $this->_header->setSkipHours($data['skipHours']);
-        }
-        if (isset($data['skipDays'])) {
-            $this->_header->setSkipDays($data['skipDays']);
-        }
-        if (isset($data['itunes'])) {
-            $itunes = new Zend_Feed_Builder_Header_Itunes($data['itunes']['category']);
-            if (isset($data['itunes']['author'])) {
-                $itunes->setAuthor($data['itunes']['author']);
-            }
-            if (isset($data['itunes']['owner'])) {
-                $name = isset($data['itunes']['owner']['name']) ? $data['itunes']['owner']['name'] : '';
-                $email = isset($data['itunes']['owner']['email']) ? $data['itunes']['owner']['email'] : '';
-                $itunes->setOwner($name, $email);
-            }
-            if (isset($data['itunes']['image'])) {
-                $itunes->setImage($data['itunes']['image']);
-            }
-            if (isset($data['itunes']['subtitle'])) {
-                $itunes->setSubtitle($data['itunes']['subtitle']);
-            }
-            if (isset($data['itunes']['summary'])) {
-                $itunes->setSummary($data['itunes']['summary']);
-            }
-            if (isset($data['itunes']['block'])) {
-                $itunes->setBlock($data['itunes']['block']);
-            }
-            if (isset($data['itunes']['explicit'])) {
-                $itunes->setExplicit($data['itunes']['explicit']);
-            }
-            if (isset($data['itunes']['keywords'])) {
-                $itunes->setKeywords($data['itunes']['keywords']);
-            }
-            if (isset($data['itunes']['new-feed-url'])) {
-                $itunes->setNewFeedUrl($data['itunes']['new-feed-url']);
-            }
-
-            $this->_header->setITunes($itunes);
-        }
-    }
-
-    /**
-     * Create the array of article entries
-     *
-     * @param  array $data
-     * @throws Zend_Feed_Builder_Exception
-     * @return void
-     */
-    protected function _createEntries(array $data)
-    {
-        foreach ($data as $row) {
-            $mandatories = array('title', 'link', 'description');
-            foreach ($mandatories as $mandatory) {
-                if (!isset($row[$mandatory])) {
-                    /**
-                     * @see Zend_Feed_Builder_Exception
-                     */
-                    require_once 'Zend/Feed/Builder/Exception.php';
-                    throw new Zend_Feed_Builder_Exception("$mandatory key is missing");
-                }
-            }
-            $entry = new Zend_Feed_Builder_Entry($row['title'], $row['link'], $row['description']);
-            if (isset($row['author'])) {
-                $entry->setAuthor($row['author']);
-            }
-            if (isset($row['guid'])) {
-                $entry->setId($row['guid']);
-            }
-            if (isset($row['content'])) {
-                $entry->setContent($row['content']);
-            }
-            if (isset($row['lastUpdate'])) {
-                $entry->setLastUpdate($row['lastUpdate']);
-            }
-            if (isset($row['comments'])) {
-                $entry->setCommentsUrl($row['comments']);
-            }
-            if (isset($row['commentRss'])) {
-                $entry->setCommentsRssUrl($row['commentRss']);
-            }
-            if (isset($row['source'])) {
-                $mandatories = array('title', 'url');
-                foreach ($mandatories as $mandatory) {
-                    if (!isset($row['source'][$mandatory])) {
-                        /**
-                         * @see Zend_Feed_Builder_Exception
-                         */
-                        require_once 'Zend/Feed/Builder/Exception.php';
-                        throw new Zend_Feed_Builder_Exception("$mandatory key of source property is missing");
-                    }
-                }
-                $entry->setSource($row['source']['title'], $row['source']['url']);
-            }
-            if (isset($row['category'])) {
-                $entry->setCategories($row['category']);
-            }
-            if (isset($row['enclosure'])) {
-                $entry->setEnclosures($row['enclosure']);
-            }
-
-            $this->_entries[] = $entry;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Builder/Entry.php b/airtime_mvc/library/Zend/Feed/Builder/Entry.php
deleted file mode 100644
index d27dded6f..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder/Entry.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * An entry of a custom build feed
- *
- * Classes implementing the Zend_Feed_Builder_Interface interface
- * uses this class to describe an entry of a feed
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Builder_Entry extends ArrayObject
-{
-    /**
-     * Create a new builder entry
-     *
-     * @param  string $title
-     * @param  string $link
-     * @param  string $description short version of the entry, no html
-     * @return void
-     */
-    public function __construct($title, $link, $description)
-    {
-        $this->offsetSet('title', $title);
-        $this->offsetSet('link', $link);
-        $this->offsetSet('description', $description);
-        $this->setLastUpdate(time());
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param  string $name name of the property to set
-     * @param  mixed $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-    /**
-     * Sets the author of the entry
-     *
-     * @param  string $author
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setAuthor($author)
-    {
-        $this->offsetSet('author', $author);
-        return $this;
-    }
-
-    /**
-     * Sets the id/guid of the entry
-     *
-     * @param  string $id
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setId($id)
-    {
-        $this->offsetSet('guid', $id);
-        return $this;
-    }
-
-    /**
-     * Sets the full html content of the entry
-     *
-     * @param  string $content
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setContent($content)
-    {
-        $this->offsetSet('content', $content);
-        return $this;
-    }
-
-    /**
-     * Timestamp of the update date
-     *
-     * @param  int $lastUpdate
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setLastUpdate($lastUpdate)
-    {
-        $this->offsetSet('lastUpdate', $lastUpdate);
-        return $this;
-    }
-
-    /**
-     * Sets the url of the commented page associated to the entry
-     *
-     * @param  string $comments
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCommentsUrl($comments)
-    {
-        $this->offsetSet('comments', $comments);
-        return $this;
-    }
-
-    /**
-     * Sets the url of the comments feed link
-     *
-     * @param  string $commentRss
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCommentsRssUrl($commentRss)
-    {
-        $this->offsetSet('commentRss', $commentRss);
-        return $this;
-    }
-
-    /**
-     * Defines a reference to the original source
-     *
-     * @param  string $title
-     * @param  string $url
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setSource($title, $url)
-    {
-        $this->offsetSet('source', array('title' => $title,
-                                         'url' => $url));
-        return $this;
-    }
-
-    /**
-     * Sets the categories of the entry
-     * Format of the array:
-     * <code>
-     * array(
-     *   array(
-     *         'term' => 'first category label',
-     *         'scheme' => 'url that identifies a categorization scheme' // optional
-     *        ),
-     *   // second category and so one
-     * )
-     * </code>
-     *
-     * @param  array $categories
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function setCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-        return $this;
-    }
-
-    /**
-     * Add a category to the entry
-     *
-     * @param  array $category see Zend_Feed_Builder_Entry::setCategories() for format
-     * @return Zend_Feed_Builder_Entry
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function addCategory(array $category)
-    {
-        if (empty($category['term'])) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to define the name of the category");
-        }
-
-        if (!$this->offsetExists('category')) {
-            $categories = array($category);
-        } else {
-            $categories = $this->offsetGet('category');
-            $categories[] = $category;
-        }
-        $this->offsetSet('category', $categories);
-        return $this;
-    }
-
-    /**
-     * Sets the enclosures of the entry
-     * Format of the array:
-     * <code>
-     * array(
-     *   array(
-     *         'url' => 'url of the linked enclosure',
-     *         'type' => 'mime type of the enclosure' // optional
-     *         'length' => 'length of the linked content in octets' // optional
-     *        ),
-     *   // second enclosure and so one
-     * )
-     * </code>
-     *
-     * @param  array $enclosures
-     * @return Zend_Feed_Builder_Entry
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setEnclosures(array $enclosures)
-    {
-        foreach ($enclosures as $enclosure) {
-            if (empty($enclosure['url'])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to supply an url for your enclosure");
-            }
-            $type = isset($enclosure['type']) ? $enclosure['type'] : '';
-            $length = isset($enclosure['length']) ? $enclosure['length'] : '';
-            $this->addEnclosure($enclosure['url'], $type, $length);
-        }
-        return $this;
-    }
-
-    /**
-     * Add an enclosure to the entry
-     *
-     * @param  string $url
-     * @param  string $type
-     * @param  string $length
-     * @return Zend_Feed_Builder_Entry
-     */
-    public function addEnclosure($url, $type = '', $length = '')
-    {
-        if (!$this->offsetExists('enclosure')) {
-            $enclosure = array();
-        } else {
-            $enclosure = $this->offsetGet('enclosure');
-        }
-        $enclosure[] = array('url' => $url,
-                             'type' => $type,
-                             'length' => $length);
-        $this->offsetSet('enclosure', $enclosure);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Builder/Exception.php b/airtime_mvc/library/Zend/Feed/Builder/Exception.php
deleted file mode 100644
index c979321cf..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Exception
- */
-require_once 'Zend/Feed/Exception.php';
-
-
-/**
- * Zend_Feed_Builder exception class
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Builder_Exception extends Zend_Feed_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Feed/Builder/Header.php b/airtime_mvc/library/Zend/Feed/Builder/Header.php
deleted file mode 100644
index fe9ecc34f..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder/Header.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Header.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Builder_Header_Itunes
- */
-require_once 'Zend/Feed/Builder/Header/Itunes.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-
-/**
- * Header of a custom build feed
- *
- * Classes implementing the Zend_Feed_Builder_Interface interface
- * uses this class to describe the header of a feed
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Builder_Header extends ArrayObject
-{
-    /**
-     * Constructor
-     *
-     * @param  string $title title of the feed
-     * @param  string $link canonical url of the feed
-     * @param  string $charset charset of the textual data
-     * @return void
-     */
-    public function __construct($title, $link, $charset = 'utf-8')
-    {
-        $this->offsetSet('title', $title);
-        $this->offsetSet('link', $link);
-        $this->offsetSet('charset', $charset);
-        $this->setLastUpdate(time())
-             ->setGenerator('Zend_Feed');
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param string $name  name of the property to set
-     * @param mixed  $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-    /**
-     * Timestamp of the update date
-     *
-     * @param  int $lastUpdate
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setLastUpdate($lastUpdate)
-    {
-        $this->offsetSet('lastUpdate', $lastUpdate);
-        return $this;
-    }
-
-    /**
-     * Timestamp of the publication date
-     *
-     * @param  int $published
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setPublishedDate($published)
-    {
-        $this->offsetSet('published', $published);
-        return $this;
-    }
-
-    /**
-     * Short description of the feed
-     *
-     * @param  string $description
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setDescription($description)
-    {
-        $this->offsetSet('description', $description);
-        return $this;
-    }
-
-    /**
-     * Sets the author of the feed
-     *
-     * @param  string $author
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setAuthor($author)
-    {
-        $this->offsetSet('author', $author);
-        return $this;
-    }
-
-    /**
-     * Sets the author's email
-     *
-     * @param  string $email
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setEmail($email)
-    {
-        /**
-         * @see Zend_Validate_EmailAddress
-         */
-        require_once 'Zend/Validate/EmailAddress.php';
-        $validate = new Zend_Validate_EmailAddress();
-        if (!$validate->isValid($email)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the email property");
-        }
-        $this->offsetSet('email', $email);
-        return $this;
-    }
-
-    /**
-     * Sets the copyright notice
-     *
-     * @param  string $copyright
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setCopyright($copyright)
-    {
-        $this->offsetSet('copyright', $copyright);
-        return $this;
-    }
-
-    /**
-     * Sets the image of the feed
-     *
-     * @param  string $image
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setImage($image)
-    {
-        $this->offsetSet('image', $image);
-        return $this;
-    }
-
-    /**
-     * Sets the generator of the feed
-     *
-     * @param  string $generator
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setGenerator($generator)
-    {
-        $this->offsetSet('generator', $generator);
-        return $this;
-    }
-
-    /**
-     * Sets the language of the feed
-     *
-     * @param  string $language
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setLanguage($language)
-    {
-        $this->offsetSet('language', $language);
-        return $this;
-    }
-
-    /**
-     * Email address for person responsible for technical issues
-     * Ignored if atom is used
-     *
-     * @param  string $webmaster
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setWebmaster($webmaster)
-    {
-        /**
-         * @see Zend_Validate_EmailAddress
-         */
-        require_once 'Zend/Validate/EmailAddress.php';
-        $validate = new Zend_Validate_EmailAddress();
-        if (!$validate->isValid($webmaster)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the webmaster property");
-        }
-        $this->offsetSet('webmaster', $webmaster);
-        return $this;
-    }
-
-    /**
-     * How long in minutes a feed can be cached before refreshing
-     * Ignored if atom is used
-     *
-     * @param  int $ttl
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setTtl($ttl)
-    {
-        /**
-         * @see Zend_Validate_Int
-         */
-        require_once 'Zend/Validate/Int.php';
-        $validate = new Zend_Validate_Int();
-        if (!$validate->isValid($ttl)) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set an integer value to the ttl property");
-        }
-        $this->offsetSet('ttl', $ttl);
-        return $this;
-    }
-
-    /**
-     * PICS rating for the feed
-     * Ignored if atom is used
-     *
-     * @param  string $rating
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setRating($rating)
-    {
-        $this->offsetSet('rating', $rating);
-        return $this;
-    }
-
-    /**
-     * Cloud to be notified of updates of the feed
-     * Ignored if atom is used
-     *
-     * @param  string|Zend_Uri_Http $uri
-     * @param  string               $procedure procedure to call, e.g. myCloud.rssPleaseNotify
-     * @param  string               $protocol  protocol to use, e.g. soap or xml-rpc
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setCloud($uri, $procedure, $protocol)
-    {
-        if (is_string($uri) && Zend_Uri_Http::check($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-        if (!$uri instanceof Zend_Uri_Http) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception('Passed parameter is not a valid HTTP URI');
-        }
-        if (!$uri->getPort()) {
-            $uri->setPort(80);
-        }
-        $this->offsetSet('cloud', array('uri' => $uri,
-                                        'procedure' => $procedure,
-                                        'protocol' => $protocol));
-        return $this;
-    }
-
-    /**
-     * A text input box that can be displayed with the feed
-     * Ignored if atom is used
-     *
-     * @param  string $title       the label of the Submit button in the text input area
-     * @param  string $description explains the text input area
-     * @param  string $name        the name of the text object in the text input area
-     * @param  string $link        the URL of the CGI script that processes text input requests
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setTextInput($title, $description, $name, $link)
-    {
-        $this->offsetSet('textInput', array('title' => $title,
-                                            'description' => $description,
-                                            'name' => $name,
-                                            'link' => $link));
-        return $this;
-    }
-
-    /**
-     * Hint telling aggregators which hours they can skip
-     * Ignored if atom is used
-     *
-     * @param  array $hours list of hours in 24 format
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setSkipHours(array $hours)
-    {
-        if (count($hours) > 24) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you can not have more than 24 rows in the skipHours property");
-        }
-        foreach ($hours as $hour) {
-            if ($hour < 0 || $hour > 23) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$hour has te be between 0 and 23");
-            }
-        }
-        $this->offsetSet('skipHours', $hours);
-        return $this;
-    }
-
-    /**
-     * Hint telling aggregators which days they can skip
-     * Ignored if atom is used
-     *
-     * @param  array $days list of days to skip, e.g. Monday
-     * @return Zend_Feed_Builder_Header
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setSkipDays(array $days)
-    {
-        if (count($days) > 7) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you can not have more than 7 days in the skipDays property");
-        }
-        $valid = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday');
-        foreach ($days as $day) {
-            if (!in_array(strtolower($day), $valid)) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("$day is not a valid day");
-            }
-        }
-        $this->offsetSet('skipDays', $days);
-        return $this;
-    }
-
-    /**
-     * Sets the iTunes rss extension
-     *
-     * @param  Zend_Feed_Builder_Header_Itunes $itunes
-     * @return Zend_Feed_Builder_Header
-     */
-    public function setITunes(Zend_Feed_Builder_Header_Itunes $itunes)
-    {
-        $this->offsetSet('itunes', $itunes);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Builder/Header/Itunes.php b/airtime_mvc/library/Zend/Feed/Builder/Header/Itunes.php
deleted file mode 100644
index 9c25653f5..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder/Header/Itunes.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Itunes.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * ITunes rss extension
- *
- * Classes used to describe the itunes channel extension
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Builder_Header_Itunes extends ArrayObject
-{
-    /**
-     * Constructor
-     *
-     * @param  array $categories Categories columns and in iTunes Music Store Browse
-     * @return void
-     */
-    public function __construct(array $categories)
-    {
-        $this->setCategories($categories);
-    }
-
-    /**
-     * Sets the categories column and in iTunes Music Store Browse
-     * $categories must conform to the following format:
-     * <code>
-     * array(array('main' => 'main category',
-     *             'sub' => 'sub category' // optionnal
-     *            ),
-     *       // up to 3 rows
-     *      )
-     * </code>
-     *
-     * @param  array $categories
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setCategories(array $categories)
-    {
-        $nb = count($categories);
-        if (0 === $nb) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set at least one itunes category");
-        }
-        if ($nb > 3) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set at most three itunes categories");
-        }
-        foreach ($categories as $i => $category) {
-            if (empty($category['main'])) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to set the main category (category #$i)");
-            }
-        }
-        $this->offsetSet('category', $categories);
-        return $this;
-    }
-
-    /**
-     * Sets the artist value, default to the feed's author value
-     *
-     * @param  string $author
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setAuthor($author)
-    {
-        $this->offsetSet('author', $author);
-        return $this;
-    }
-
-    /**
-     * Sets the owner of the postcast
-     *
-     * @param  string $name  default to the feed's author value
-     * @param  string $email default to the feed's email value
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setOwner($name = '', $email = '')
-    {
-        if (!empty($email)) {
-            /**
-             * @see Zend_Validate_EmailAddress
-             */
-            require_once 'Zend/Validate/EmailAddress.php';
-            $validate = new Zend_Validate_EmailAddress();
-            if (!$validate->isValid($email)) {
-                /**
-                 * @see Zend_Feed_Builder_Exception
-                 */
-                require_once 'Zend/Feed/Builder/Exception.php';
-                throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the itunes owner's email property");
-            }
-        }
-        $this->offsetSet('owner', array('name' => $name, 'email' => $email));
-        return $this;
-    }
-
-    /**
-     * Sets the album/podcast art picture
-     * Default to the feed's image value
-     *
-     * @param  string $image
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setImage($image)
-    {
-        $this->offsetSet('image', $image);
-        return $this;
-    }
-
-    /**
-     * Sets the short description of the podcast
-     * Default to the feed's description
-     *
-     * @param  string $subtitle
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setSubtitle($subtitle)
-    {
-        $this->offsetSet('subtitle', $subtitle);
-        return $this;
-    }
-
-    /**
-     * Sets the longer description of the podcast
-     * Default to the feed's description
-     *
-     * @param  string $summary
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setSummary($summary)
-    {
-        $this->offsetSet('summary', $summary);
-        return $this;
-    }
-
-    /**
-     * Prevent a feed from appearing
-     *
-     * @param  string $block can be 'yes' or 'no'
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setBlock($block)
-    {
-        $block = strtolower($block);
-        if (!in_array($block, array('yes', 'no'))) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set yes or no to the itunes block property");
-        }
-        $this->offsetSet('block', $block);
-        return $this;
-    }
-
-    /**
-     * Configuration of the parental advisory graphic
-     *
-     * @param  string $explicit can be 'yes', 'no' or 'clean'
-     * @return Zend_Feed_Builder_Header_Itunes
-     * @throws Zend_Feed_Builder_Exception
-     */
-    public function setExplicit($explicit)
-    {
-        $explicit = strtolower($explicit);
-        if (!in_array($explicit, array('yes', 'no', 'clean'))) {
-            /**
-             * @see Zend_Feed_Builder_Exception
-             */
-            require_once 'Zend/Feed/Builder/Exception.php';
-            throw new Zend_Feed_Builder_Exception("you have to set yes, no or clean to the itunes explicit property");
-        }
-        $this->offsetSet('explicit', $explicit);
-        return $this;
-    }
-
-    /**
-     * Sets a comma separated list of 12 keywords maximum
-     *
-     * @param  string $keywords
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setKeywords($keywords)
-    {
-        $this->offsetSet('keywords', $keywords);
-        return $this;
-    }
-
-    /**
-     * Sets the new feed URL location
-     *
-     * @param  string $url
-     * @return Zend_Feed_Builder_Header_Itunes
-     */
-    public function setNewFeedUrl($url)
-    {
-        $this->offsetSet('new_feed_url', $url);
-        return $this;
-    }
-
-    /**
-     * Read only properties accessor
-     *
-     * @param  string $name property to read
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (!$this->offsetExists($name)) {
-            return NULL;
-        }
-
-        return $this->offsetGet($name);
-    }
-
-    /**
-     * Write properties accessor
-     *
-     * @param  string $name  name of the property to set
-     * @param  mixed  $value value to set
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        $this->offsetSet($name, $value);
-    }
-
-    /**
-     * Isset accessor
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return $this->offsetExists($key);
-    }
-
-    /**
-     * Unset accessor
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->offsetExists($key)) {
-            $this->offsetUnset($key);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Feed/Builder/Interface.php b/airtime_mvc/library/Zend/Feed/Builder/Interface.php
deleted file mode 100644
index 9dce55f81..000000000
--- a/airtime_mvc/library/Zend/Feed/Builder/Interface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Input feed data interface
- *
- * Classes implementing this interface can be passe to Zend_Feed::importBuilder
- * as an input data source for the Zend_Feed construction
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Builder_Interface
-{
-    /**
-     * Returns an instance of Zend_Feed_Builder_Header
-     * describing the header of the feed
-     *
-     * @return Zend_Feed_Builder_Header
-     */
-    public function getHeader();
-
-    /**
-     * Returns an array of Zend_Feed_Builder_Entry instances
-     * describing the entries of the feed
-     *
-     * @return array of Zend_Feed_Builder_Entry
-     */
-    public function getEntries();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Element.php b/airtime_mvc/library/Zend/Feed/Element.php
deleted file mode 100644
index 9d452f199..000000000
--- a/airtime_mvc/library/Zend/Feed/Element.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Element.php 20104 2010-01-06 21:26:01Z matthew $
- */
-
-
-/**
- * Wraps a DOMElement allowing for SimpleXML-like access to attributes.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Element implements ArrayAccess
-{
-
-    /**
-     * @var DOMElement
-     */
-    protected $_element;
-
-    /**
-     * @var string Character encoding to utilize
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * @var Zend_Feed_Element
-     */
-    protected $_parentElement;
-
-    /**
-     * @var boolean
-     */
-    protected $_appended = true;
-
-
-    /**
-     * Zend_Feed_Element constructor.
-     *
-     * @param  DOMElement $element The DOM element we're encapsulating.
-     * @return void
-     */
-    public function __construct($element = null)
-    {
-        $this->_element = $element;
-    }
-
-
-    /**
-     * Get a DOM representation of the element
-     *
-     * Returns the underlying DOM object, which can then be
-     * manipulated with full DOM methods.
-     *
-     * @return DOMDocument
-     */
-    public function getDOM()
-    {
-        return $this->_element;
-    }
-
-
-    /**
-     * Update the object from a DOM element
-     *
-     * Take a DOMElement object, which may be originally from a call
-     * to getDOM() or may be custom created, and use it as the
-     * DOM tree for this Zend_Feed_Element.
-     *
-     * @param  DOMElement $element
-     * @return void
-     */
-    public function setDOM(DOMElement $element)
-    {
-        $this->_element = $this->_element->ownerDocument->importNode($element, true);
-    }
-
-    /**
-     * Set the parent element of this object to another
-     * Zend_Feed_Element.
-     *
-     * @param  Zend_Feed_Element $element
-     * @return void
-     */
-    public function setParent(Zend_Feed_Element $element)
-    {
-        $this->_parentElement = $element;
-        $this->_appended = false;
-    }
-
-
-    /**
-     * Appends this element to its parent if necessary.
-     *
-     * @return void
-     */
-    protected function ensureAppended()
-    {
-        if (!$this->_appended) {
-            $this->_parentElement->getDOM()->appendChild($this->_element);
-            $this->_appended = true;
-            $this->_parentElement->ensureAppended();
-        }
-    }
-
-
-    /**
-     * Get an XML string representation of this element
-     *
-     * Returns a string of this element's XML, including the XML
-     * prologue.
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $doc->appendChild($doc->importNode($this->_element, true));
-        return $doc->saveXML();
-    }
-
-
-    /**
-     * Get the XML for only this element
-     *
-     * Returns a string of this element's XML without prologue.
-     *
-     * @return string
-     */
-    public function saveXmlFragment()
-    {
-        return $this->_element->ownerDocument->saveXML($this->_element);
-    }
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $value Encoding to use
-     * @return Zend_Feed_Element
-     */
-    public function setEncoding($value)
-    {
-        $this->_encoding = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Map variable access onto the underlying entry representation.
-     *
-     * Get-style access returns a Zend_Feed_Element representing the
-     * child element accessed. To get string values, use method syntax
-     * with the __call() overriding.
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        $nodes = $this->_children($var);
-        $length = count($nodes);
-
-        if ($length == 1) {
-            return new Zend_Feed_Element($nodes[0]);
-        } elseif ($length > 1) {
-            return array_map(create_function('$e', 'return new Zend_Feed_Element($e);'), $nodes);
-        } else {
-            // When creating anonymous nodes for __set chaining, don't
-            // call appendChild() on them. Instead we pass the current
-            // element to them as an extra reference; the child is
-            // then responsible for appending itself when it is
-            // actually set. This way "if ($foo->bar)" doesn't create
-            // a phantom "bar" element in our tree.
-            if (strpos($var, ':') !== false) {
-                list($ns, $elt) = explode(':', $var, 2);
-                $node = $this->_element->ownerDocument->createElementNS(Zend_Feed::lookupNamespace($ns), $elt);
-            } else {
-                $node = $this->_element->ownerDocument->createElement($var);
-            }
-            $node = new self($node);
-            $node->setParent($this);
-            return $node;
-        }
-    }
-
-
-    /**
-     * Map variable sets onto the underlying entry representation.
-     *
-     * @param  string $var The property to change.
-     * @param  string $val The property's new value.
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __set($var, $val)
-    {
-        $this->ensureAppended();
-
-        $nodes = $this->_children($var);
-        if (!$nodes) {
-            if (strpos($var, ':') !== false) {
-                list($ns, $elt) = explode(':', $var, 2);
-                $node = $this->_element->ownerDocument->createElementNS(Zend_Feed::lookupNamespace($ns),
-                    $var, htmlspecialchars($val, ENT_NOQUOTES, $this->getEncoding()));
-                $this->_element->appendChild($node);
-            } else {
-                $node = $this->_element->ownerDocument->createElement($var,
-                    htmlspecialchars($val, ENT_NOQUOTES, $this->getEncoding()));
-                $this->_element->appendChild($node);
-            }
-        } elseif (count($nodes) > 1) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot set the value of multiple tags simultaneously.');
-        } else {
-            $nodes[0]->nodeValue = $val;
-        }
-    }
-
-
-    /**
-     * Map isset calls onto the underlying entry representation.
-     *
-     * @param  string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        // Look for access of the form {ns:var}. We don't use
-        // _children() here because we can break out of the loop
-        // immediately once we find something.
-        if (strpos($var, ':') !== false) {
-            list($ns, $elt) = explode(':', $var, 2);
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $elt && $child->prefix == $ns) {
-                    return true;
-                }
-            }
-        } else {
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $var) {
-                    return true;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Get the value of an element with method syntax.
-     *
-     * Map method calls to get the string value of the requested
-     * element. If there are multiple elements that match, this will
-     * return an array of those objects.
-     *
-     * @param  string $var    The element to get the string value of.
-     * @param  mixed  $unused This parameter is not used.
-     * @return mixed The node's value, null, or an array of nodes.
-     */
-    public function __call($var, $unused)
-    {
-        $nodes = $this->_children($var);
-
-        if (!$nodes) {
-            return null;
-        } elseif (count($nodes) > 1) {
-            return $nodes;
-        } else {
-            return $nodes[0]->nodeValue;
-        }
-    }
-
-
-    /**
-     * Remove all children matching $var.
-     *
-     * @param  string $var
-     * @return void
-     */
-    public function __unset($var)
-    {
-        $nodes = $this->_children($var);
-        foreach ($nodes as $node) {
-            $parent = $node->parentNode;
-            $parent->removeChild($node);
-        }
-    }
-
-
-    /**
-     * Returns the nodeValue of this element when this object is used
-     * in a string context.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_element->nodeValue;
-    }
-
-
-    /**
-     * Finds children with tagnames matching $var
-     *
-     * Similar to SimpleXML's children() method.
-     *
-     * @param  string $var Tagname to match, can be either namespace:tagName or just tagName.
-     * @return array
-     */
-    protected function _children($var)
-    {
-        $found = array();
-
-        // Look for access of the form {ns:var}.
-        if (strpos($var, ':') !== false) {
-            list($ns, $elt) = explode(':', $var, 2);
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $elt && $child->prefix == $ns) {
-                    $found[] = $child;
-                }
-            }
-        } else {
-            foreach ($this->_element->childNodes as $child) {
-                if ($child->localName == $var) {
-                    $found[] = $child;
-                }
-            }
-        }
-
-        return $found;
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->hasAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->hasAttribute($offset);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return string
-     */
-    public function offsetGet($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->getAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->getAttribute($offset);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @param  string $value
-     * @return string
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->ensureAppended();
-
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            // DOMElement::setAttributeNS() requires $qualifiedName to have a prefix
-            return $this->_element->setAttributeNS(Zend_Feed::lookupNamespace($ns), $offset, $value);
-        } else {
-            return $this->_element->setAttribute($offset, $value);
-        }
-    }
-
-
-    /**
-     * Required by the ArrayAccess interface.
-     *
-     * @param  string $offset
-     * @return boolean
-     */
-    public function offsetUnset($offset)
-    {
-        if (strpos($offset, ':') !== false) {
-            list($ns, $attr) = explode(':', $offset, 2);
-            return $this->_element->removeAttributeNS(Zend_Feed::lookupNamespace($ns), $attr);
-        } else {
-            return $this->_element->removeAttribute($offset);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Entry/Abstract.php b/airtime_mvc/library/Zend/Feed/Entry/Abstract.php
deleted file mode 100644
index b9a46823c..000000000
--- a/airtime_mvc/library/Zend/Feed/Entry/Abstract.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed
- */
-require_once 'Zend/Feed.php';
-
-/**
- * @see Zend_Feed_Element
- */
-require_once 'Zend/Feed/Element.php';
-
-
-/**
- * Zend_Feed_Entry_Abstract represents a single entry in an Atom or RSS
- * feed.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Entry_Abstract extends Zend_Feed_Element
-{
-    /**
-     * Root XML element for entries. Subclasses must define this to a
-     * non-null value.
-     *
-     * @var string
-     */
-    protected $_rootElement;
-
-    /**
-     * Root namespace for entries. Subclasses may define this to a
-     * non-null value.
-     *
-     * @var string
-     */
-    protected $_rootNamespace = null;
-
-
-    /**
-     * Zend_Feed_Entry_Abstract constructor
-     *
-     * The Zend_Feed_Entry_Abstract constructor takes the URI of the feed the entry
-     * is part of, and optionally an XML construct (usually a
-     * SimpleXMLElement, but it can be an XML string or a DOMNode as
-     * well) that contains the contents of the entry.
-     *
-     * @param  string $uri
-     * @param  SimpleXMLElement|DOMNode|string  $element
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __construct($uri = null, $element = null)
-    {
-        if (!($element instanceof DOMElement)) {
-            if ($element) {
-                // Load the feed as an XML DOMDocument object
-                @ini_set('track_errors', 1);
-                $doc = new DOMDocument();
-                $status = @$doc->loadXML($element);
-                @ini_restore('track_errors');
-
-                if (!$status) {
-                    // prevent the class to generate an undefined variable notice (ZF-2590)
-                    if (!isset($php_errormsg)) {
-                        if (function_exists('xdebug_is_enabled')) {
-                            $php_errormsg = '(error message not available, when XDebug is running)';
-                        } else {
-                            $php_errormsg = '(error message not available)';
-                        }
-                    }
-
-                    /**
-                     * @see Zend_Feed_Exception
-                     */
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
-                }
-
-                $element = $doc->getElementsByTagName($this->_rootElement)->item(0);
-                if (!$element) {
-                    /**
-                     * @see Zend_Feed_Exception
-                     */
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.');
-                }
-            } else {
-                $doc = new DOMDocument('1.0', 'utf-8');
-                if ($this->_rootNamespace !== null) {
-                    $element = $doc->createElementNS(Zend_Feed::lookupNamespace($this->_rootNamespace), $this->_rootElement);
-                } else {
-                    $element = $doc->createElement($this->_rootElement);
-                }
-            }
-        }
-
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Entry/Atom.php b/airtime_mvc/library/Zend/Feed/Entry/Atom.php
deleted file mode 100644
index 01a096d67..000000000
--- a/airtime_mvc/library/Zend/Feed/Entry/Atom.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Entry_Abstract
- */
-require_once 'Zend/Feed/Entry/Abstract.php';
-
-
-/**
- * Concrete class for working with Atom entries.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract
-{
-    /**
-     * Content-Type
-     */
-    const CONTENT_TYPE = 'application/atom+xml';
-
-    /**
-     * Root XML element for Atom entries.
-     *
-     * @var string
-     */
-    protected $_rootElement = 'entry';
-
-    /**
-     * Root namespace for Atom entries.
-     *
-     * @var string
-     */
-    protected $_rootNamespace = 'atom';
-
-
-    /**
-     * Delete an atom entry.
-     *
-     * Delete tries to delete this entry from its feed. If the entry
-     * does not contain a link rel="edit", we throw an error (either
-     * the entry does not yet exist or this is not an editable
-     * feed). If we have a link rel="edit", we do the empty-body
-     * HTTP DELETE to that URI and check for a response of 2xx.
-     * Usually the response would be 204 No Content, but the Atom
-     * Publishing Protocol permits it to be 200 OK.
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function delete()
-    {
-        // Look for link rel="edit" in the entry object.
-        $deleteUri = $this->link('edit');
-        if (!$deleteUri) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot delete entry; no link rel="edit" is present.');
-        }
-
-        // DELETE
-        $client = Zend_Feed::getHttpClient();
-        do {
-            $client->setUri($deleteUri);
-            if (Zend_Feed::getHttpMethodOverride()) {
-                $client->setHeader('X-HTTP-Method-Override', 'DELETE');
-                $response = $client->request('POST');
-            } else {
-                $response = $client->request('DELETE');
-            }
-            $httpStatus = $response->getStatus();
-            switch ((int) $httpStatus / 100) {
-                // Success
-                case 2:
-                    return true;
-                // Redirect
-                case 3:
-                    $deleteUri = $response->getHeader('Location');
-                    continue;
-                // Error
-                default:
-                    /**
-                     * @see Zend_Feed_Exception
-                     */
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception("Expected response code 2xx, got $httpStatus");
-            }
-        } while (true);
-    }
-
-
-    /**
-     * Save a new or updated Atom entry.
-     *
-     * Save is used to either create new entries or to save changes to
-     * existing ones. If we have a link rel="edit", we are changing
-     * an existing entry. In this case we re-serialize the entry and
-     * PUT it to the edit URI, checking for a 200 OK result.
-     *
-     * For posting new entries, you must specify the $postUri
-     * parameter to save() to tell the object where to post itself.
-     * We use $postUri and POST the serialized entry there, checking
-     * for a 201 Created response. If the insert is successful, we
-     * then parse the response from the POST to get any values that
-     * the server has generated: an id, an updated time, and its new
-     * link rel="edit".
-     *
-     * @param  string $postUri Location to POST for creating new entries.
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function save($postUri = null)
-    {
-        if ($this->id()) {
-            // If id is set, look for link rel="edit" in the
-            // entry object and PUT.
-            $editUri = $this->link('edit');
-            if (!$editUri) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Cannot edit entry; no link rel="edit" is present.');
-            }
-
-            $client = Zend_Feed::getHttpClient();
-            $client->setUri($editUri);
-            if (Zend_Feed::getHttpMethodOverride()) {
-                $client->setHeaders(array('X-HTTP-Method-Override: PUT',
-                    'Content-Type: ' . self::CONTENT_TYPE));
-                $client->setRawData($this->saveXML());
-                $response = $client->request('POST');
-            } else {
-                $client->setHeaders('Content-Type', self::CONTENT_TYPE);
-                $client->setRawData($this->saveXML());
-                $response = $client->request('PUT');
-            }
-            if ($response->getStatus() !== 200) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Expected response code 200, got ' . $response->getStatus());
-            }
-        } else {
-            if ($postUri === null) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('PostURI must be specified to save new entries.');
-            }
-            $client = Zend_Feed::getHttpClient();
-            $client->setUri($postUri);
-            $client->setHeaders('Content-Type', self::CONTENT_TYPE);
-            $client->setRawData($this->saveXML());
-            $response = $client->request('POST');
-
-            if ($response->getStatus() !== 201) {
-                /**
-                 * @see Zend_Feed_Exception
-                 */
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Expected response code 201, got '
-                                              . $response->getStatus());
-            }
-        }
-
-        // Update internal properties using $client->responseBody;
-        @ini_set('track_errors', 1);
-        $newEntry = new DOMDocument;
-        $status = @$newEntry->loadXML($response->getBody());
-        @ini_restore('track_errors');
-
-        if (!$status) {
-            // prevent the class to generate an undefined variable notice (ZF-2590)
-            if (!isset($php_errormsg)) {
-                if (function_exists('xdebug_is_enabled')) {
-                    $php_errormsg = '(error message not available, when XDebug is running)';
-                } else {
-                    $php_errormsg = '(error message not available)';
-                }
-            }
-
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('XML cannot be parsed: ' . $php_errormsg);
-        }
-
-        $newEntry = $newEntry->getElementsByTagName($this->_rootElement)->item(0);
-        if (!$newEntry) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('No root <feed> element found in server response:'
-                                          . "\n\n" . $client->responseBody);
-        }
-
-        if ($this->_element->parentNode) {
-            $oldElement = $this->_element;
-            $this->_element = $oldElement->ownerDocument->importNode($newEntry, true);
-            $oldElement->parentNode->replaceChild($this->_element, $oldElement);
-        } else {
-            $this->_element = $newEntry;
-        }
-    }
-
-
-    /**
-     * Easy access to <link> tags keyed by "rel" attributes.
-     *
-     * If $elt->link() is called with no arguments, we will attempt to
-     * return the value of the <link> tag(s) like all other
-     * method-syntax attribute access. If an argument is passed to
-     * link(), however, then we will return the "href" value of the
-     * first <link> tag that has a "rel" attribute matching $rel:
-     *
-     * $elt->link(): returns the value of the link tag.
-     * $elt->link('self'): returns the href from the first <link rel="self"> in the entry.
-     *
-     * @param  string $rel The "rel" attribute to look for.
-     * @return mixed
-     */
-    public function link($rel = null)
-    {
-        if ($rel === null) {
-            return parent::__call('link', null);
-        }
-
-        // index link tags by their "rel" attribute.
-        $links = parent::__get('link');
-        if (!is_array($links)) {
-            if ($links instanceof Zend_Feed_Element) {
-                $links = array($links);
-            } else {
-                return $links;
-            }
-        }
-
-        foreach ($links as $link) {
-            if (empty($link['rel'])) {
-                $link['rel'] = 'alternate'; // see Atom 1.0 spec
-            }
-            if ($rel == $link['rel']) {
-                return $link['href'];
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Entry/Rss.php b/airtime_mvc/library/Zend/Feed/Entry/Rss.php
deleted file mode 100644
index 0d638c724..000000000
--- a/airtime_mvc/library/Zend/Feed/Entry/Rss.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Entry_Abstract
- */
-require_once 'Zend/Feed/Entry/Abstract.php';
-
-
-/**
- * Concrete class for working with RSS items.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Entry_Rss extends Zend_Feed_Entry_Abstract
-{
-    /**
-     * Root XML element for RSS items.
-     *
-     * @var string
-     */
-    protected $_rootElement = 'item';
-
-    /**
-     * Overwrites parent::_get method to enable read access
-     * to content:encoded element.
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'content':
-                $prefix = $this->_element->lookupPrefix('http://purl.org/rss/1.0/modules/content/');
-                return parent::__get("$prefix:encoded");
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Overwrites parent::_set method to enable write access
-     * to content:encoded element.
-     *
-     * @param  string $var The property to change.
-     * @param  string $val The property's new value.
-     * @return void
-     */
-    public function __set($var, $value)
-    {
-        switch ($var) {
-            case 'content':
-                parent::__set('content:encoded', $value);
-                break;
-            default:
-                parent::__set($var, $value);
-        }
-    }
-
-    /**
-     * Overwrites parent::_isset method to enable access
-     * to content:encoded element.
-     *
-     * @param  string $var
-     * @return boolean
-     */
-    public function __isset($var)
-    {
-        switch ($var) {
-            case 'content':
-                // don't use other callback to prevent invalid returned value
-                return $this->content() !== null;
-            default:
-                return parent::__isset($var);
-        }
-    }
-
-    /**
-     * Overwrites parent::_call method to enable read access
-     * to content:encoded element.
-     * Please note that method-style write access is not currently supported
-     * by parent method, consequently this method doesn't as well.
-     *
-     * @param  string $var    The element to get the string value of.
-     * @param  mixed  $unused This parameter is not used.
-     * @return mixed The node's value, null, or an array of nodes.
-     */
-    public function __call($var, $unused)
-    {
-        switch ($var) {
-            case 'content':
-                $prefix = $this->_element->lookupPrefix('http://purl.org/rss/1.0/modules/content/');
-                return parent::__call("$prefix:encoded", $unused);
-            default:
-                return parent::__call($var, $unused);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Exception.php b/airtime_mvc/library/Zend/Feed/Exception.php
deleted file mode 100644
index 733c62669..000000000
--- a/airtime_mvc/library/Zend/Feed/Exception.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub.php
deleted file mode 100644
index 05f60b913..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Abstract
- */
-require_once 'Zend/Feed/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub
-{
-    /**
-     * Verification Modes
-     */
-    const VERIFICATION_MODE_SYNC  = 'sync';
-    const VERIFICATION_MODE_ASYNC = 'async';
-    
-    /**
-     * Subscription States
-     */
-    const SUBSCRIPTION_VERIFIED    = 'verified';
-    const SUBSCRIPTION_NOTVERIFIED = 'not_verified';
-    const SUBSCRIPTION_TODELETE    = 'to_delete';
-
-    /**
-     * Singleton instance if required of the HTTP client
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $httpClient = null;
-
-    /**
-     * Simple utility function which imports any feed URL and
-     * determines the existence of Hub Server endpoints. This works
-     * best if directly given an instance of Zend_Feed_Reader_Atom|Rss
-     * to leverage off.
-     *
-     * @param  Zend_Feed_Reader_FeedAbstract|Zend_Feed_Abstract|string $source
-     * @return array
-     */
-    public static function detectHubs($source)
-    {
-        if (is_string($source)) {
-            $feed = Zend_Feed_Reader::import($source);
-        } elseif (is_object($source) && $source instanceof Zend_Feed_Reader_FeedAbstract) {
-            $feed = $source;
-        } elseif (is_object($source) && $source instanceof Zend_Feed_Abstract) {
-            $feed = Zend_Feed_Reader::importFeed($source);
-        } else {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('The source parameter was'
-            . ' invalid, i.e. not a URL string or an instance of type'
-            . ' Zend_Feed_Reader_FeedAbstract or Zend_Feed_Abstract');
-        }
-        return $feed->getHubs();
-    }
-
-    /**
-     * Allows the external environment to make Zend_Oauth use a specific
-     * Client instance.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$httpClient = $httpClient;
-    }
-
-    /**
-     * Return the singleton instance of the HTTP Client. Note that
-     * the instance is reset and cleared of previous parameters GET/POST.
-     * Headers are NOT reset but handled by this component if applicable.
-     *
-     * @return Zend_Http_Client
-     */
-    public static function getHttpClient()
-    {
-        if (!isset(self::$httpClient)):
-            self::$httpClient = new Zend_Http_Client;
-        else:
-            self::$httpClient->resetParameters();
-        endif;
-        return self::$httpClient;
-    }
-
-    /**
-     * Simple mechanism to delete the entire singleton HTTP Client instance
-     * which forces an new instantiation for subsequent requests.
-     *
-     * @return void
-     */
-    public static function clearHttpClient()
-    {
-        self::$httpClient = null;
-    }
-
-    /**
-     * RFC 3986 safe url encoding method
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-        $rawencoded = rawurlencode($string);
-        $rfcencoded = str_replace('%7E', '~', $rawencoded);
-        return $rfcencoded;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php
deleted file mode 100644
index 48fc56d43..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Callback
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Feed_Pubsubhubbub_CallbackInterface
- */
-require_once 'Zend/Feed/Pubsubhubbub/CallbackInterface.php';
-
-/**
- * @see Zend_Feed_Pubsubhubbub_HttpResponse
- */
-require_once 'Zend/Feed/Pubsubhubbub/HttpResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Callback
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract
-    implements Zend_Feed_Pubsubhubbub_CallbackInterface
-{
-    /**
-     * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used 
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @var Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-     */
-    protected $_storage = null;
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend_Controller_Response_Http.
-     *
-     * @var Zend_Feed_Pubsubhubbub_HttpResponse|Zend_Controller_Response_Http
-     */
-    protected $_httpResponse = null;
-
-    /**
-     * The number of Subscribers for which any updates are on behalf of.
-     *
-     * @var int
-     */
-    protected $_subscriberCount = 1;
-
-    /**
-     * Constructor; accepts an array or Zend_Config instance to preset
-     * options for the Subscriber without calling all supported setter
-     * methods in turn.
-     *
-     * @param array|Zend_Config $options Options array or Zend_Config instance
-     */
-    public function __construct($config = null)
-    {
-        if (!is_null($config)) {
-            $this->setConfig($config);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Zend_Config $options Options array or Zend_Config instance
-     * @return Zend_Feed_Pubsubhubbub_CallbackAbstract
-     */
-    public function setConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        } elseif (!is_array($config)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object'
-            . 'expected, got ' . gettype($config));
-        }
-        if (array_key_exists('storage', $config)) {
-            $this->setStorage($config['storage']);
-        }
-        return $this;
-    }
-
-    /**
-     * Send the response, including all headers.
-     * If you wish to handle this via Zend_Controller, use the getter methods
-     * to retrieve any data needed to be set on your HTTP Response object, or
-     * simply give this object the HTTP Response instance to work with for you!
-     *
-     * @return void
-     */
-    public function sendResponse()
-    {
-        $this->getHttpResponse()->sendResponse();
-    }
-
-    /**
-     * Sets an instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @param  Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $storage
-     * @return Zend_Feed_Pubsubhubbub_CallbackAbstract
-     */
-    public function setStorage(Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $storage)
-    {
-        $this->_storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Gets an instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @return Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-     */
-    public function getStorage()
-    {
-        if ($this->_storage === null) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('No storage object has been'
-                . ' set that subclasses Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface');
-        }
-        return $this->_storage;
-    }
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend_Controller_Response_Http.
-     *
-     * @param  Zend_Feed_Pubsubhubbub_HttpResponse|Zend_Controller_Response_Http $httpResponse
-     * @return Zend_Feed_Pubsubhubbub_CallbackAbstract
-     */
-    public function setHttpResponse($httpResponse)
-    {
-        if (!is_object($httpResponse)
-            || (!$httpResponse instanceof Zend_Feed_Pubsubhubbub_HttpResponse
-                && !$httpResponse instanceof Zend_Controller_Response_Http)
-        ) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('HTTP Response object must'
-                . ' implement one of Zend_Feed_Pubsubhubbub_HttpResponse or'
-                . ' Zend_Controller_Response_Http');
-        }
-        $this->_httpResponse = $httpResponse;
-        return $this;
-    }
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend_Controller_Response_Http.
-     *
-     * @return Zend_Feed_Pubsubhubbub_HttpResponse|Zend_Controller_Response_Http
-     */
-    public function getHttpResponse()
-    {
-        if ($this->_httpResponse === null) {
-            $this->_httpResponse = new Zend_Feed_Pubsubhubbub_HttpResponse;
-        }
-        return $this->_httpResponse;
-    }
-
-    /**
-     * Sets the number of Subscribers for which any updates are on behalf of.
-     * In other words, is this class serving one or more subscribers? How many?
-     * Defaults to 1 if left unchanged.
-     *
-     * @param  string|int $count
-     * @return Zend_Feed_Pubsubhubbub_CallbackAbstract
-     */
-    public function setSubscriberCount($count)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Subscriber count must be'
-                . ' greater than zero');
-        }
-        $this->_subscriberCount = $count;
-        return $this;
-    }
-
-    /**
-     * Gets the number of Subscribers for which any updates are on behalf of.
-     * In other words, is this class serving one or more subscribers? How many?
-     *
-     * @return int
-     */
-    public function getSubscriberCount()
-    {
-        return $this->_subscriberCount;
-    }
-
-    /**
-     * Attempt to detect the callback URL (specifically the path forward)
-     */
-    protected function _detectCallbackUrl()
-    {
-        $callbackUrl = '';
-        if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-            $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL'];
-        } elseif (isset($_SERVER['REQUEST_URI'])) {
-            $callbackUrl = $_SERVER['REQUEST_URI'];
-            $scheme = 'http';
-            if ($_SERVER['HTTPS'] == 'on') {
-                $scheme = 'https';
-            }
-            $schemeAndHttpHost = $scheme . '://' . $this->_getHttpHost();
-            if (strpos($callbackUrl, $schemeAndHttpHost) === 0) {
-                $callbackUrl = substr($callbackUrl, strlen($schemeAndHttpHost));
-            }
-        } elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
-            $callbackUrl= $_SERVER['ORIG_PATH_INFO'];
-            if (!empty($_SERVER['QUERY_STRING'])) {
-                $callbackUrl .= '?' . $_SERVER['QUERY_STRING'];
-            }
-        }
-        return $callbackUrl;
-    }
-
-    /**
-     * Get the HTTP host
-     *
-     * @return string
-     */
-    protected function _getHttpHost()
-    {
-        if (!empty($_SERVER['HTTP_HOST'])) {
-            return $_SERVER['HTTP_HOST'];
-        }
-        $scheme = 'http';
-        if ($_SERVER['HTTPS'] == 'on') {
-            $scheme = 'https';
-        }
-        $name = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if (($scheme == 'http' && $port == 80)
-            || ($scheme == 'https' && $port == 443)
-        ) {
-            return $name;
-        } else {
-            return $name . ':' . $port;
-        }
-    }
-
-    /**
-     * Retrieve a Header value from either $_SERVER or Apache
-     *
-     * @param string $header
-     */
-    protected function _getHeader($header)
-    {
-        $temp = strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
-            return $_SERVER[$temp];
-        }
-        $temp = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
-            return $_SERVER[$temp];
-        }
-        if (function_exists('apache_request_headers')) {
-            $headers = apache_request_headers();
-            if (!empty($headers[$header])) {
-                return $headers[$header];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return the raw body of the request
-     *
-     * @return string|false Raw body, or false if not present
-     */
-    protected function _getRawBody()
-    {
-        $body = file_get_contents('php://input');
-        if (strlen(trim($body)) == 0 && isset($GLOBALS['HTTP_RAW_POST_DATA'])) {
-            $body = $GLOBALS['HTTP_RAW_POST_DATA'];
-        }
-        if (strlen(trim($body)) > 0) {
-            return $body;
-        }
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackInterface.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackInterface.php
deleted file mode 100644
index ce30a6bb2..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/CallbackInterface.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Callback
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Callback
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Pubsubhubbub_CallbackInterface
-{
-    /**
-     * Handle any callback from a Hub Server responding to a subscription or
-     * unsubscription request. This should be the Hub Server confirming the
-     * the request prior to taking action on it.
-     *
-     * @param array $httpData GET/POST data if available and not in $_GET/POST
-     * @param bool $sendResponseNow Whether to send response now or when asked
-     */
-    public function handle(array $httpData = null, $sendResponseNow = false);
-
-    /**
-     * Send the response, including all headers.
-     * If you wish to handle this via Zend_Controller, use the getter methods
-     * to retrieve any data needed to be set on your HTTP Response object, or
-     * simply give this object the HTTP Response instance to work with for you!
-     *
-     * @return void
-     */
-    public function sendResponse();
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend_Controller_Response_Http.
-     *
-     * @param Zend_Feed_Pubsubhubbub_HttpResponse|Zend_Controller_Response_Http $httpResponse
-     */
-    public function setHttpResponse($httpResponse);
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend_Feed_Pubsubhubbub_HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend_Controller_Response_Http.
-     *
-     * @return Zend_Feed_Pubsubhubbub_HttpResponse|Zend_Controller_Response_Http
-     */
-    public function getHttpResponse();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Exception.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Exception.php
deleted file mode 100644
index cac6d2386..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/HttpResponse.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/HttpResponse.php
deleted file mode 100644
index 5a14eb60f..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/HttpResponse.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Feed_Pubsubhubbub
- */
-require_once 'Zend/Feed/Pubsubhubbub.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_HttpResponse
-{
-    /**
-     * The body of any response to the current callback request
-     *
-     * @var string
-     */
-    protected $_body = '';
-
-    /**
-     * Array of headers. Each header is an array with keys 'name' and 'value'
-     *
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * HTTP response code to use in headers
-     *
-     * @var int
-     */
-    protected $_httpResponseCode = 200;
-
-    /**
-     * Send the response, including all headers
-     *
-     * @return void
-     */
-    public function sendResponse()
-    {
-        $this->sendHeaders();
-        echo $this->getBody();
-    }
-
-    /**
-     * Send all headers
-     *
-     * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code}
-     * has been specified, it is sent with the first header.
-     *
-     * @return void
-     */
-    public function sendHeaders()
-    {
-        if (count($this->_headers) || (200 != $this->_httpResponseCode)) {
-            $this->canSendHeaders(true);
-        } elseif (200 == $this->_httpResponseCode) {
-            return;
-        }
-        $httpCodeSent = false;
-        foreach ($this->_headers as $header) {
-            if (!$httpCodeSent && $this->_httpResponseCode) {
-                header($header['name'] . ': ' . $header['value'], $header['replace'], $this->_httpResponseCode);
-                $httpCodeSent = true;
-            } else {
-                header($header['name'] . ': ' . $header['value'], $header['replace']);
-            }
-        }
-        if (!$httpCodeSent) {
-            header('HTTP/1.1 ' . $this->_httpResponseCode);
-            $httpCodeSent = true;
-        }
-    }
-
-    /**
-     * Set a header
-     *
-     * If $replace is true, replaces any headers already defined with that
-     * $name.
-     *
-     * @param  string $name
-     * @param  string $value
-     * @param  boolean $replace
-     * @return Zend_Feed_Pubsubhubbub_HttpResponse
-     */
-    public function setHeader($name, $value, $replace = false)
-    {
-        $name  = $this->_normalizeHeader($name);
-        $value = (string) $value;
-        if ($replace) {
-            foreach ($this->_headers as $key => $header) {
-                if ($name == $header['name']) {
-                    unset($this->_headers[$key]);
-                }
-            }
-        }
-        $this->_headers[] = array(
-            'name'    => $name,
-            'value'   => $value,
-            'replace' => $replace,
-        );
-
-        return $this;
-    }
-
-    /**
-     * Check if a specific Header is set and return its value
-     *
-     * @param  string $name
-     * @return string|null
-     */
-    public function getHeader($name)
-    {
-        $name = $this->_normalizeHeader($name);
-        foreach ($this->_headers as $header) {
-            if ($header['name'] == $name) {
-                return $header['value'];
-            }
-        }
-    }
-
-    /**
-     * Return array of headers; see {@link $_headers} for format
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Can we send headers?
-     *
-     * @param  boolean $throw Whether or not to throw an exception if headers have been sent; defaults to false
-     * @return boolean
-     * @throws Zend_Feed_Pubsubhubbub_Exception
-     */
-    public function canSendHeaders($throw = false)
-    {
-        $ok = headers_sent($file, $line);
-        if ($ok && $throw) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line);
-        }
-        return !$ok;
-    }
-
-    /**
-     * Set HTTP response code to use with headers
-     *
-     * @param  int $code
-     * @return Zend_Feed_Pubsubhubbub_HttpResponse
-     */
-    public function setHttpResponseCode($code)
-    {
-        if (!is_int($code) || (100 > $code) || (599 < $code)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid HTTP response'
-            . ' code:' . $code);
-        }
-        $this->_httpResponseCode = $code;
-        return $this;
-    }
-
-    /**
-     * Retrieve HTTP response code
-     *
-     * @return int
-     */
-    public function getHttpResponseCode()
-    {
-        return $this->_httpResponseCode;
-    }
-
-    /**
-     * Set body content
-     *
-     * @param  string $content
-     * @return Zend_Feed_Pubsubhubbub_HttpResponse
-     */
-    public function setBody($content)
-    {
-        $this->_body = (string) $content;
-        $this->setHeader('content-length', strlen($content));
-        return $this;
-    }
-
-    /**
-     * Return the body content
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->_body;
-    }
-
-    /**
-     * Normalizes a header name to X-Capitalized-Names
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _normalizeHeader($name)
-    {
-        $filtered = str_replace(array('-', '_'), ' ', (string) $name);
-        $filtered = ucwords(strtolower($filtered));
-        $filtered = str_replace(' ', '-', $filtered);
-        return $filtered;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php
deleted file mode 100644
index 839644648..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** @see Zend_Db_Table */
-require_once 'Zend/Db/Table.php';
-
-/** 
- * @see Zend_Registry
- * Seems to fix the file not being included by Zend_Db_Table...
- */
-require_once 'Zend/Registry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Model_ModelAbstract
-{
-    /**
-     * Zend_Db_Table instance to host database methods
-     *
-     * @var Zend_Db_Table
-     */
-    protected $_db = null;
- 
-    /**
-     * Constructor
-     * 
-     * @param  array $data 
-     * @param  Zend_Db_Table_Abstract $tableGateway 
-     * @return void
-     */
-    public function __construct(Zend_Db_Table_Abstract $tableGateway = null)
-    {
-        if (is_null($tableGateway)) {
-            $parts = explode('_', get_class($this));
-            $table = strtolower(array_pop($parts));
-            $this->_db = new Zend_Db_Table($table);
-        } else {
-            $this->_db = $tableGateway;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php
deleted file mode 100644
index 0b3ab2abe..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Entity
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Feed_Pubsubhubbub_Model_ModelAbstract */
-require_once 'Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php';
-
-/** @see Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface */
-require_once 'Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Entity
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Model_Subscription
-    extends Zend_Feed_Pubsubhubbub_Model_ModelAbstract
-    implements Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-{
-    
-    /**
-     * Save subscription to RDMBS
-     *
-     * @param array $data
-     * @return bool
-     */
-    public function setSubscription(array $data)
-    {
-        if (!isset($data['id'])) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception(
-                'ID must be set before attempting a save'
-            );
-        }
-        $result = $this->_db->find($data['id']);
-        if ($result) {
-            $data['created_time'] = $result->current()->created_time;
-            $now = new Zend_Date;
-            if ($data['lease_seconds']) {
-                $data['expiration_time'] = $now->add($data['lease_seconds'], Zend_Date::SECOND)
-                ->get('yyyy-MM-dd HH:mm:ss');
-            }
-            $this->_db->update(
-                $data,
-                $this->_db->getAdapter()->quoteInto('id = ?', $data['id'])
-            );
-            return false;
-        }
-
-        $this->_db->insert($data);
-        return true;
-    }
-    
-    /**
-     * Get subscription by ID/key
-     * 
-     * @param  string $key 
-     * @return array
-     */
-    public function getSubscription($key)
-    {
-        if (empty($key) || !is_string($key)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "key"'
-                .' of "' . $key . '" must be a non-empty string');
-        }
-        $result = $this->_db->find($key);
-        if ($result) {
-            return (array) $result->current();
-        }
-        return false;
-    }
-
-    /**
-     * Determine if a subscription matching the key exists
-     * 
-     * @param  string $key 
-     * @return bool
-     */
-    public function hasSubscription($key)
-    {
-        if (empty($key) || !is_string($key)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "key"'
-                .' of "' . $key . '" must be a non-empty string');
-        }
-        $result = $this->_db->find($key);
-        if ($result) {
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Delete a subscription
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function deleteSubscription($key)
-    {
-        $result = $this->_db->find($key);
-        if ($result) {
-            $this->_db->delete(
-                $this->_db->getAdapter()->quoteInto('id = ?', $key)
-            );
-            return true;
-        }
-        return false;
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php
deleted file mode 100644
index f8a6e6a3e..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Entity
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @subpackage Entity
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-{
-    
-    /**
-     * Save subscription to RDMBS
-     *
-     * @param array $data The key must be stored here as a $data['id'] entry
-     * @return bool
-     */
-    public function setSubscription(array $data);
-    
-    /**
-     * Get subscription by ID/key
-     * 
-     * @param  string $key 
-     * @return array
-     */
-    public function getSubscription($key);
-
-    /**
-     * Determine if a subscription matching the key exists
-     * 
-     * @param  string $key 
-     * @return bool
-     */
-    public function hasSubscription($key);
-    
-    /**
-     * Delete a subscription
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function deleteSubscription($key);
-    
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Publisher.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Publisher.php
deleted file mode 100644
index 1eb594f0d..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Publisher.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Feed_Pubsubhubbub
- */
-require_once 'Zend/Feed/Pubsubhubbub.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Publisher
-{
-    /**
-     * An array of URLs for all Hub Servers used by the Publisher, and to
-     * which all topic update notifications will be sent.
-     *
-     * @var array
-     */
-    protected $_hubUrls = array();
-
-    /**
-     * An array of topic (Atom or RSS feed) URLs which have been updated and
-     * whose updated status will be notified to all Hub Servers.
-     *
-     * @var array
-     */
-    protected $_updatedTopicUrls = array();
-
-    /**
-     * An array of any errors including keys for 'response', 'hubUrl'.
-     * The response is the actual Zend_Http_Response object.
-     *
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * An array of topic (Atom or RSS feed) URLs which have been updated and
-     * whose updated status will be notified to all Hub Servers.
-     *
-     * @var array
-     */
-    protected $_parameters = array();
-
-    /**
-     * Constructor; accepts an array or Zend_Config instance to preset
-     * options for the Publisher without calling all supported setter
-     * methods in turn.
-     *
-     * @param  array|Zend_Config $options Options array or Zend_Config instance
-     * @return void
-     */
-    public function __construct($config = null)
-    {
-        if (!is_null($config)) {
-            $this->setConfig($config);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Zend_Config $options Options array or Zend_Config instance
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function setConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        } elseif (!is_array($config)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object'
-                . 'expected, got ' . gettype($config));
-        }
-        if (array_key_exists('hubUrls', $config)) {
-            $this->addHubUrls($config['hubUrls']);
-        }
-        if (array_key_exists('updatedTopicUrls', $config)) {
-            $this->addUpdatedTopicUrls($config['updatedTopicUrls']);
-        }
-        if (array_key_exists('parameters', $config)) {
-            $this->setParameters($config['parameters']);
-        }
-        return $this;
-    }
-
-    /**
-     * Add a Hub Server URL supported by Publisher
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function addHubUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                .' of "' . $url . '" must be a non-empty string and a valid'
-                .'URL');
-        }
-        $this->_hubUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Hub Server URLs supported by Publisher
-     *
-     * @param  array $urls
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function addHubUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHubUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a Hub Server URL
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function removeHubUrl($url)
-    {
-        if (!in_array($url, $this->getHubUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->_hubUrls);
-        unset($this->_hubUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique Hub Server URLs currently available
-     *
-     * @return array
-     */
-    public function getHubUrls()
-    {
-        $this->_hubUrls = array_unique($this->_hubUrls);
-        return $this->_hubUrls;
-    }
-
-    /**
-     * Add a URL to a topic (Atom or RSS feed) which has been updated
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function addUpdatedTopicUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                .' of "' . $url . '" must be a non-empty string and a valid'
-                .'URL');
-        }
-        $this->_updatedTopicUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Topic URLs which have been updated
-     *
-     * @param  array $urls
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function addUpdatedTopicUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addUpdatedTopicUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an updated topic URL
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function removeUpdatedTopicUrl($url)
-    {
-        if (!in_array($url, $this->getUpdatedTopicUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->_updatedTopicUrls);
-        unset($this->_updatedTopicUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique updated topic URLs currently available
-     *
-     * @return array
-     */
-    public function getUpdatedTopicUrls()
-    {
-        $this->_updatedTopicUrls = array_unique($this->_updatedTopicUrls);
-        return $this->_updatedTopicUrls;
-    }
-
-    /**
-     * Notifies a single Hub Server URL of changes
-     *
-     * @param  string $url The Hub Server's URL
-     * @return void
-     * @throws Zend_Feed_Pubsubhubbub_Exception Thrown on failure
-     */
-    public function notifyHub($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                .' of "' . $url . '" must be a non-empty string and a valid'
-                .'URL');
-        }
-        $client = $this->_getHttpClient();
-        $client->setUri($url);
-        $response = $client->request();
-        if ($response->getStatus() !== 204) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Notification to Hub Server '
-                . 'at "' . $url . '" appears to have failed with a status code of "'
-                . $response->getStatus() . '" and message "'
-                . $response->getMessage() . '"');
-        }
-    }
-
-    /**
-     * Notifies all Hub Server URLs of changes
-     *
-     * If a Hub notification fails, certain data will be retained in an
-     * an array retrieved using getErrors(), if a failure occurs for any Hubs
-     * the isSuccess() check will return FALSE. This method is designed not
-     * to needlessly fail with an Exception/Error unless from Zend_Http_Client.
-     *
-     * @return void
-     * @throws Zend_Feed_Pubsubhubbub_Exception Thrown if no hubs attached
-     */
-    public function notifyAll()
-    {
-        $client = $this->_getHttpClient();
-        $hubs   = $this->getHubUrls();
-        if (empty($hubs)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('No Hub Server URLs'
-                . ' have been set so no notifcations can be sent');
-        }
-        $this->_errors = array();
-        foreach ($hubs as $url) {
-            $client->setUri($url);
-            $response = $client->request();
-            if ($response->getStatus() !== 204) {
-                $this->_errors[] = array(
-                    'response' => $response,
-                    'hubUrl' => $url
-                );
-            }
-        }
-    }
-
-    /**
-     * Add an optional parameter to the update notification requests
-     *
-     * @param  string $name
-     * @param  string|null $value
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function setParameter($name, $value = null)
-    {
-        if (is_array($name)) {
-            $this->setParameters($name);
-            return $this;
-        }
-        if (empty($name) || !is_string($name)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"'
-                .' of "' . $name . '" must be a non-empty string');
-        }
-        if ($value === null) {
-            $this->removeParameter($name);
-            return $this;
-        }
-        if (empty($value) || (!is_string($value) && !is_null($value))) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"'
-                .' of "' . $value . '" must be a non-empty string');
-        }
-        $this->_parameters[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the update notification requests
-     *
-     * @param  array $parameters
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function setParameters(array $parameters)
-    {
-        foreach ($parameters as $name => $value) {
-            $this->setParameter($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an optional parameter for the notification requests
-     *
-     * @param  string $name
-     * @return Zend_Feed_Pubsubhubbub_Publisher
-     */
-    public function removeParameter($name)
-    {
-        if (empty($name) || !is_string($name)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"'
-                .' of "' . $name . '" must be a non-empty string');
-        }
-        if (array_key_exists($name, $this->_parameters)) {
-            unset($this->_parameters[$name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Return an array of optional parameters for notification requests
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->_parameters;
-    }
-
-    /**
-     * Returns a boolean indicator of whether the notifications to Hub
-     * Servers were ALL successful. If even one failed, FALSE is returned.
-     *
-     * @return bool
-     */
-    public function isSuccess()
-    {
-        if (count($this->_errors) > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return an array of errors met from any failures, including keys:
-     * 'response' => the Zend_Http_Response object from the failure
-     * 'hubUrl' => the URL of the Hub Server whose notification failed
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Get a basic prepared HTTP client for use
-     *
-     * @return Zend_Http_Client
-     */
-    protected function _getHttpClient()
-    {
-        $client = Zend_Feed_Pubsubhubbub::getHttpClient();
-        $client->setMethod(Zend_Http_Client::POST);
-        $client->setConfig(array(
-            'useragent' => 'Zend_Feed_Pubsubhubbub_Publisher/' . Zend_Version::VERSION,
-        ));
-        $params   = array();
-        $params[] = 'hub.mode=publish';
-        $topics   = $this->getUpdatedTopicUrls();
-        if (empty($topics)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('No updated topic URLs'
-                . ' have been set');
-        }
-        foreach ($topics as $topicUrl) {
-            $params[] = 'hub.url=' . urlencode($topicUrl);
-        }
-        $optParams = $this->getParameters();
-        foreach ($optParams as $name => $value) {
-            $params[] = urlencode($name) . '=' . urlencode($value);
-        }
-        $paramString = implode('&', $params);
-        $client->setRawData($paramString);
-        return $client;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber.php
deleted file mode 100644
index 35a4ccf96..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber.php
+++ /dev/null
@@ -1,856 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Feed_Pubsubhubbub
- */
-require_once 'Zend/Feed/Pubsubhubbub.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Subscriber
-{
-    /**
-     * An array of URLs for all Hub Servers to subscribe/unsubscribe.
-     *
-     * @var array
-     */
-    protected $_hubUrls = array();
-
-    /**
-     * An array of optional parameters to be included in any
-     * (un)subscribe requests.
-     *
-     * @var array
-     */
-    protected $_parameters = array();
-
-    /**
-     * The URL of the topic (Rss or Atom feed) which is the subject of
-     * our current intent to subscribe to/unsubscribe from updates from
-     * the currently configured Hub Servers.
-     *
-     * @var string
-     */
-    protected $_topicUrl = '';
-
-    /**
-     * The URL Hub Servers must use when communicating with this Subscriber
-     *
-     * @var string
-     */
-    protected $_callbackUrl = '';
-
-    /**
-     * The number of seconds for which the subscriber would like to have the
-     * subscription active. Defaults to null, i.e. not sent, to setup a
-     * permanent subscription if possible.
-     *
-     * @var int
-     */
-    protected $_leaseSeconds = null;
-
-    /**
-     * The preferred verification mode (sync or async). By default, this
-     * Subscriber prefers synchronous verification, but is considered
-     * desireable to support asynchronous verification if possible.
-     *
-     * Zend_Feed_Pubsubhubbub_Subscriber will always send both modes, whose
-     * order of occurance in the parameter list determines this preference.
-     *
-     * @var string
-     */
-    protected $_preferredVerificationMode
-        = Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC;
-
-    /**
-     * An array of any errors including keys for 'response', 'hubUrl'.
-     * The response is the actual Zend_Http_Response object.
-     *
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * An array of Hub Server URLs for Hubs operating at this time in
-     * asynchronous verification mode.
-     *
-     * @var array
-     */
-    protected $_asyncHubs = array();
-
-    /**
-     * An instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used to background
-     * save any verification tokens associated with a subscription or other.
-     *
-     * @var Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-     */
-    protected $_storage = null;
-
-    /**
-     * An array of authentication credentials for HTTP Basic Authentication
-     * if required by specific Hubs. The array is indexed by Hub Endpoint URI
-     * and the value is a simple array of the username and password to apply.
-     *
-     * @var array
-     */
-    protected $_authentications = array();
-    
-    /**
-     * Tells the Subscriber to append any subscription identifier to the path
-     * of the base Callback URL. E.g. an identifier "subkey1" would be added
-     * to the callback URL "http://www.example.com/callback" to create a subscription
-     * specific Callback URL of "http://www.example.com/callback/subkey1".
-     *
-     * This is required for all Hubs using the Pubsubhubbub 0.1 Specification.
-     * It should be manually intercepted and passed to the Callback class using
-     * Zend_Feed_Pubsubhubbub_Subscriber_Callback::setSubscriptionKey(). Will
-     * require a route in the form "callback/:subkey" to allow the parameter be
-     * retrieved from an action using the Zend_Controller_Action::_getParam()
-     * method.
-     *
-     * @var string
-     */
-    protected $_usePathParameter = false;
-
-    /**
-     * Constructor; accepts an array or Zend_Config instance to preset
-     * options for the Subscriber without calling all supported setter
-     * methods in turn.
-     *
-     * @param  array|Zend_Config $options Options array or Zend_Config instance
-     * @return void
-     */
-    public function __construct($config = null)
-    {
-        if (!is_null($config)) {
-            $this->setConfig($config);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Zend_Config $options Options array or Zend_Config instance
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        } elseif (!is_array($config)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object'
-                . ' expected, got ' . gettype($config));
-        }
-        if (array_key_exists('hubUrls', $config)) {
-            $this->addHubUrls($config['hubUrls']);
-        }
-        if (array_key_exists('callbackUrl', $config)) {
-            $this->setCallbackUrl($config['callbackUrl']);
-        }
-        if (array_key_exists('topicUrl', $config)) {
-            $this->setTopicUrl($config['topicUrl']);
-        }
-        if (array_key_exists('storage', $config)) {
-            $this->setStorage($config['storage']);
-        }
-        if (array_key_exists('leaseSeconds', $config)) {
-            $this->setLeaseSeconds($config['leaseSeconds']);
-        }
-        if (array_key_exists('parameters', $config)) {
-            $this->setParameters($config['parameters']);
-        }
-        if (array_key_exists('authentications', $config)) {
-            $this->addAuthentications($config['authentications']);
-        }
-        if (array_key_exists('usePathParameter', $config)) {
-            $this->usePathParameter($config['usePathParameter']);
-        }
-        if (array_key_exists('preferredVerificationMode', $config)) {
-            $this->setPreferredVerificationMode(
-                $config['preferredVerificationMode']
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Set the topic URL (RSS or Atom feed) to which the intended (un)subscribe
-     * event will relate
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setTopicUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                .' of "' . $url . '" must be a non-empty string and a valid'
-                .' URL');
-        }
-        $this->_topicUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Set the topic URL (RSS or Atom feed) to which the intended (un)subscribe
-     * event will relate
-     *
-     * @return string
-     */
-    public function getTopicUrl()
-    {
-        if (empty($this->_topicUrl)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('A valid Topic (RSS or Atom'
-                . ' feed) URL MUST be set before attempting any operation');
-        }
-        return $this->_topicUrl;
-    }
-
-    /**
-     * Set the number of seconds for which any subscription will remain valid
-     *
-     * @param  int $seconds
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setLeaseSeconds($seconds)
-    {
-        $seconds = intval($seconds);
-        if ($seconds <= 0) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Expected lease seconds'
-                . ' must be an integer greater than zero');
-        }
-        $this->_leaseSeconds = $seconds;
-        return $this;
-    }
-
-    /**
-     * Get the number of lease seconds on subscriptions
-     *
-     * @return int
-     */
-    public function getLeaseSeconds()
-    {
-        return $this->_leaseSeconds;
-    }
-
-    /**
-     * Set the callback URL to be used by Hub Servers when communicating with
-     * this Subscriber
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setCallbackUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->_callbackUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Get the callback URL to be used by Hub Servers when communicating with
-     * this Subscriber
-     *
-     * @return string
-     */
-    public function getCallbackUrl()
-    {
-        if (empty($this->_callbackUrl)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('A valid Callback URL MUST be'
-                . ' set before attempting any operation');
-        }
-        return $this->_callbackUrl;
-    }
-
-    /**
-     * Set preferred verification mode (sync or async). By default, this
-     * Subscriber prefers synchronous verification, but does support
-     * asynchronous if that's the Hub Server's utilised mode.
-     *
-     * Zend_Feed_Pubsubhubbub_Subscriber will always send both modes, whose
-     * order of occurance in the parameter list determines this preference.
-     *
-     * @param  string $mode Should be 'sync' or 'async'
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setPreferredVerificationMode($mode)
-    {
-        if ($mode !== Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC
-        && $mode !== Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_ASYNC) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid preferred'
-                . ' mode specified: "' . $mode . '" but should be one of'
-                . ' Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC or'
-                . ' Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_ASYNC');
-        }
-        $this->_preferredVerificationMode = $mode;
-        return $this;
-    }
-
-    /**
-     * Get preferred verification mode (sync or async).
-     *
-     * @return string
-     */
-    public function getPreferredVerificationMode()
-    {
-        return $this->_preferredVerificationMode;
-    }
-
-    /**
-     * Add a Hub Server URL supported by Publisher
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function addHubUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->_hubUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Hub Server URLs supported by Publisher
-     *
-     * @param  array $urls
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function addHubUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHubUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a Hub Server URL
-     *
-     * @param  string $url
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function removeHubUrl($url)
-    {
-        if (!in_array($url, $this->getHubUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->_hubUrls);
-        unset($this->_hubUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique Hub Server URLs currently available
-     *
-     * @return array
-     */
-    public function getHubUrls()
-    {
-        $this->_hubUrls = array_unique($this->_hubUrls);
-        return $this->_hubUrls;
-    }
-    
-    /**
-     * Add authentication credentials for a given URL
-     * 
-     * @param  string $url 
-     * @param  array $authentication 
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function addAuthentication($url, array $authentication)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->_authentications[$url] = $authentication;
-        return $this;
-    }
-    
-    /**
-     * Add authentication credentials for hub URLs
-     * 
-     * @param  array $authentications 
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function addAuthentications(array $authentications)
-    {
-        foreach ($authentications as $url => $authentication) {
-            $this->addAuthentication($url, $authentication);
-        }
-        return $this;
-    }
-    
-    /**
-     * Get all hub URL authentication credentials
-     * 
-     * @return array
-     */
-    public function getAuthentications()
-    {
-        return $this->_authentications;
-    }
-    
-    /**
-     * Set flag indicating whether or not to use a path parameter
-     * 
-     * @param  bool $bool 
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function usePathParameter($bool = true)
-    {
-        $this->_usePathParameter = $bool;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the (un)subscribe requests
-     *
-     * @param  string $name
-     * @param  string|null $value
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setParameter($name, $value = null)
-    {
-        if (is_array($name)) {
-            $this->setParameters($name);
-            return $this;
-        }
-        if (empty($name) || !is_string($name)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if ($value === null) {
-            $this->removeParameter($name);
-            return $this;
-        }
-        if (empty($value) || (!is_string($value) && !is_null($value))) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"'
-                . ' of "' . $value . '" must be a non-empty string');
-        }
-        $this->_parameters[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the (un)subscribe requests
-     *
-     * @param  string $name
-     * @param  string|null $value
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setParameters(array $parameters)
-    {
-        foreach ($parameters as $name => $value) {
-            $this->setParameter($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an optional parameter for the (un)subscribe requests
-     *
-     * @param  string $name
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function removeParameter($name)
-    {
-        if (empty($name) || !is_string($name)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if (array_key_exists($name, $this->_parameters)) {
-            unset($this->_parameters[$name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Return an array of optional parameters for (un)subscribe requests
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->_parameters;
-    }
-
-    /**
-     * Sets an instance of Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface used to background
-     * save any verification tokens associated with a subscription or other.
-     *
-     * @param  Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $storage
-     * @return Zend_Feed_Pubsubhubbub_Subscriber
-     */
-    public function setStorage(Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $storage)
-    {
-        $this->_storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Gets an instance of Zend_Feed_Pubsubhubbub_Storage_StorageInterface used 
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @return Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface
-     */
-    public function getStorage()
-    {
-        if ($this->_storage === null) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('No storage vehicle '
-                . 'has been set.');
-        }
-        return $this->_storage;
-    }
-
-    /**
-     * Subscribe to one or more Hub Servers using the stored Hub URLs
-     * for the given Topic URL (RSS or Atom feed)
-     *
-     * @return void
-     */
-    public function subscribeAll()
-    {
-        return $this->_doRequest('subscribe');
-    }
-
-    /**
-     * Unsubscribe from one or more Hub Servers using the stored Hub URLs
-     * for the given Topic URL (RSS or Atom feed)
-     *
-     * @return void
-     */
-    public function unsubscribeAll()
-    {
-        return $this->_doRequest('unsubscribe');
-    }
-
-    /**
-     * Returns a boolean indicator of whether the notifications to Hub
-     * Servers were ALL successful. If even one failed, FALSE is returned.
-     *
-     * @return bool
-     */
-    public function isSuccess()
-    {
-        if (count($this->_errors) > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return an array of errors met from any failures, including keys:
-     * 'response' => the Zend_Http_Response object from the failure
-     * 'hubUrl' => the URL of the Hub Server whose notification failed
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Return an array of Hub Server URLs who returned a response indicating
-     * operation in Asynchronous Verification Mode, i.e. they will not confirm
-     * any (un)subscription immediately but at a later time (Hubs may be
-     * doing this as a batch process when load balancing)
-     *
-     * @return array
-     */
-    public function getAsyncHubs()
-    {
-        return $this->_asyncHubs;
-    }
-
-    /**
-     * Executes an (un)subscribe request
-     *
-     * @param  string $mode
-     * @return void
-     */
-    protected function _doRequest($mode)
-    {
-        $client = $this->_getHttpClient();
-        $hubs   = $this->getHubUrls();
-        if (empty($hubs)) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('No Hub Server URLs'
-                . ' have been set so no subscriptions can be attempted');
-        }
-        $this->_errors = array();
-        $this->_asyncHubs = array();
-        foreach ($hubs as $url) {
-            if (array_key_exists($url, $this->_authentications)) {
-                $auth = $this->_authentications[$url];
-                $client->setAuth($auth[0], $auth[1]);
-            }
-            $client->setUri($url);
-            $client->setRawData($this->_getRequestParameters($url, $mode));
-            $response = $client->request();
-            if ($response->getStatus() !== 204
-                && $response->getStatus() !== 202
-            ) {
-                $this->_errors[] = array(
-                    'response' => $response,
-                    'hubUrl'   => $url,
-                );
-            /**
-             * At first I thought it was needed, but the backend storage will
-             * allow tracking async without any user interference. It's left
-             * here in case the user is interested in knowing what Hubs
-             * are using async verification modes so they may update Models and
-             * move these to asynchronous processes.
-             */
-            } elseif ($response->getStatus() == 202) {
-                $this->_asyncHubs[] = array(
-                    'response' => $response,
-                    'hubUrl'   => $url,
-                );
-            }
-        }
-    }
-
-    /**
-     * Get a basic prepared HTTP client for use
-     *
-     * @param  string $mode Must be "subscribe" or "unsubscribe"
-     * @return Zend_Http_Client
-     */
-    protected function _getHttpClient()
-    {
-        $client = Zend_Feed_Pubsubhubbub::getHttpClient();
-        $client->setMethod(Zend_Http_Client::POST);
-        $client->setConfig(array('useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
-            . Zend_Version::VERSION));
-        return $client;
-    }
-
-    /**
-     * Return a list of standard protocol/optional parameters for addition to
-     * client's POST body that are specific to the current Hub Server URL
-     *
-     * @param  string $hubUrl
-     * @param  mode $hubUrl
-     * @return string
-     */
-    protected function _getRequestParameters($hubUrl, $mode)
-    {
-        if (!in_array($mode, array('subscribe', 'unsubscribe'))) {
-            require_once 'Zend/Feed/Pubsubhubbub/Exception.php';
-            throw new Zend_Feed_Pubsubhubbub_Exception('Invalid mode specified: "'
-                . $mode . '" which should have been "subscribe" or "unsubscribe"');
-        }
-
-        $params = array(
-            'hub.mode'  => $mode,
-            'hub.topic' => $this->getTopicUrl(),
-        );
-
-        if ($this->getPreferredVerificationMode()
-                == Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC
-        ) {
-            $vmodes = array(
-                Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC,
-                Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_ASYNC,
-            );
-        } else {
-            $vmodes = array(
-                Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_ASYNC,
-                Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC,
-            );
-        }
-        $params['hub.verify'] = array();
-        foreach($vmodes as $vmode) {
-            $params['hub.verify'][] = $vmode;
-        }
-
-        /**
-         * Establish a persistent verify_token and attach key to callback
-         * URL's path/querystring
-         */
-        $key   = $this->_generateSubscriptionKey($params, $hubUrl);
-        $token = $this->_generateVerifyToken();
-        $params['hub.verify_token'] = $token;
-
-        // Note: query string only usable with PuSH 0.2 Hubs
-        if (!$this->_usePathParameter) {
-            $params['hub.callback'] = $this->getCallbackUrl()
-                . '?xhub.subscription=' . Zend_Feed_Pubsubhubbub::urlencode($key);
-        } else {
-            $params['hub.callback'] = rtrim($this->getCallbackUrl(), '/')
-                . '/' . Zend_Feed_Pubsubhubbub::urlencode($key);
-        }
-        if ($mode == 'subscribe' && !is_null($this->getLeaseSeconds())) {
-            $params['hub.lease_seconds'] = $this->getLeaseSeconds();
-        }
-
-        // hub.secret not currently supported
-        $optParams = $this->getParameters();
-        foreach ($optParams as $name => $value) {
-            $params[$name] = $value;
-        }
-        
-        // store subscription to storage
-        $now = new Zend_Date;
-        $expires = null;
-        if (isset($params['hub.lease_seconds'])) {
-            $expires = $now->add($params['hub.lease_seconds'], Zend_Date::SECOND)
-                ->get('yyyy-MM-dd HH:mm:ss');
-        }
-        $data = array(
-            'id'                 => $key,
-            'topic_url'          => $params['hub.topic'],
-            'hub_url'            => $hubUrl,
-            'created_time'       => $now->get('yyyy-MM-dd HH:mm:ss'),
-            'lease_seconds'      => $expires,
-            'verify_token'       => hash('sha256', $params['hub.verify_token']),
-            'secret'             => null,
-            'expiration_time'    => $expires,
-            'subscription_state' => Zend_Feed_Pubsubhubbub::SUBSCRIPTION_NOTVERIFIED,
-        );
-        $this->getStorage()->setSubscription($data);
-
-        return $this->_toByteValueOrderedString(
-            $this->_urlEncode($params)
-        );
-    }
-
-    /**
-     * Simple helper to generate a verification token used in (un)subscribe
-     * requests to a Hub Server. Follows no particular method, which means
-     * it might be improved/changed in future.
-     *
-     * @param  string $hubUrl The Hub Server URL for which this token will apply
-     * @return string
-     */
-    protected function _generateVerifyToken()
-    {
-        if (!empty($this->_testStaticToken)) {
-            return $this->_testStaticToken;
-        }
-        return uniqid(rand(), true) . time();
-    }
-
-    /**
-     * Simple helper to generate a verification token used in (un)subscribe
-     * requests to a Hub Server.
-     *
-     * @param  string $hubUrl The Hub Server URL for which this token will apply
-     * @return string
-     */
-    protected function _generateSubscriptionKey(array $params, $hubUrl)
-    {
-        $keyBase = $params['hub.topic'] . $hubUrl;
-        $key     = md5($keyBase);
-        return $key;
-    }
-
-    /**
-     * URL Encode an array of parameters
-     *
-     * @param  array $params
-     * @return array
-     */
-    protected function _urlEncode(array $params)
-    {
-        $encoded = array();
-        foreach ($params as $key => $value) {
-            if (is_array($value)) {
-                $ekey = Zend_Feed_Pubsubhubbub::urlencode($key);
-                $encoded[$ekey] = array();
-                foreach ($value as $duplicateKey) {
-                    $encoded[$ekey][]
-                        = Zend_Feed_Pubsubhubbub::urlencode($duplicateKey);
-                }
-            } else {
-                $encoded[Zend_Feed_Pubsubhubbub::urlencode($key)]
-                    = Zend_Feed_Pubsubhubbub::urlencode($value);
-            }
-        }
-        return $encoded;
-    }
-
-    /**
-     * Order outgoing parameters
-     *
-     * @param  array $params
-     * @return array
-     */
-    protected function _toByteValueOrderedString(array $params)
-    {
-        $return = array();
-        uksort($params, 'strnatcmp');
-        foreach ($params as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $keyduplicate) {
-                    $return[] = $key . '=' . $keyduplicate;
-                }
-            } else {
-                $return[] = $key . '=' . $value;
-            }
-        }
-        return implode('&', $return);
-    }
-
-    /**
-     * This is STRICTLY for testing purposes only...
-     */
-    protected $_testStaticToken = null;
-
-    final public function setTestStaticToken($token)
-    {
-        $this->_testStaticToken = (string) $token;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php b/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
deleted file mode 100644
index c7195809c..000000000
--- a/airtime_mvc/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Feed_Pubsubhubbub
- */
-require_once 'Zend/Feed/Pubsubhubbub.php';
-
-/**
- * @see Zend_Feed_Pubsubhubbub
- */
-require_once 'Zend/Feed/Pubsubhubbub/CallbackAbstract.php';
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Pubsubhubbub
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Pubsubhubbub_Subscriber_Callback
-    extends Zend_Feed_Pubsubhubbub_CallbackAbstract
-{
-    /**
-     * Contains the content of any feeds sent as updates to the Callback URL
-     *
-     * @var string
-     */
-    protected $_feedUpdate = null;
-    
-    /**
-     * Holds a manually set subscription key (i.e. identifies a unique
-     * subscription) which is typical when it is not passed in the query string
-     * but is part of the Callback URL path, requiring manual retrieval e.g.
-     * using a route and the Zend_Controller_Action::_getParam() method.
-     *
-     * @var string
-     */
-    protected $_subscriptionKey = null;
-    
-    /**
-     * After verification, this is set to the verified subscription's data.
-     *
-     * @var array
-     */
-    protected $_currentSubscriptionData = null;
-    
-    /**
-     * Set a subscription key to use for the current callback request manually.
-     * Required if usePathParameter is enabled for the Subscriber.
-     *
-     * @param  string $key
-     * @return Zend_Feed_Pubsubhubbub_Subscriber_Callback
-     */
-    public function setSubscriptionKey($key)
-    {
-        $this->_subscriptionKey = $key;
-        return $this;
-    }
-
-    /**
-     * Handle any callback from a Hub Server responding to a subscription or
-     * unsubscription request. This should be the Hub Server confirming the
-     * the request prior to taking action on it.
-     *
-     * @param  array $httpGetData GET data if available and not in $_GET
-     * @param  bool $sendResponseNow Whether to send response now or when asked
-     * @return void
-     */
-    public function handle(array $httpGetData = null, $sendResponseNow = false)
-    {
-        if ($httpGetData === null) {
-            $httpGetData = $_GET;
-        }
-
-        /**
-         * Handle any feed updates (sorry for the mess :P)
-         *
-         * This DOES NOT attempt to process a feed update. Feed updates
-         * SHOULD be validated/processed by an asynchronous process so as
-         * to avoid holding up responses to the Hub.
-         */
-        if (strtolower($_SERVER['REQUEST_METHOD']) == 'post'
-            && $this->_hasValidVerifyToken(null, false)
-            && ($this->_getHeader('Content-Type') == 'application/atom+xml'
-                || $this->_getHeader('Content-Type') == 'application/rss+xml'
-                || $this->_getHeader('Content-Type') == 'application/xml'
-                || $this->_getHeader('Content-Type') == 'text/xml'
-                || $this->_getHeader('Content-Type') == 'application/rdf+xml')
-        ) {
-            $this->setFeedUpdate($this->_getRawBody());
-            $this->getHttpResponse()
-                 ->setHeader('X-Hub-On-Behalf-Of', $this->getSubscriberCount());
-        /**
-         * Handle any (un)subscribe confirmation requests
-         */
-        } elseif ($this->isValidHubVerification($httpGetData)) {
-            $data = $this->_currentSubscriptionData;
-            $this->getHttpResponse()->setBody($httpGetData['hub_challenge']);
-            $data['subscription_state'] = Zend_Feed_Pubsubhubbub::SUBSCRIPTION_VERIFIED;
-            if (isset($httpGetData['hub_lease_seconds'])) {
-                $data['lease_seconds'] = $httpGetData['hub_lease_seconds'];
-            }
-            $this->getStorage()->setSubscription($data);
-        /**
-         * Hey, C'mon! We tried everything else!
-         */
-        } else {
-            $this->getHttpResponse()->setHttpResponseCode(404);
-        }
-        if ($sendResponseNow) {
-            $this->sendResponse();
-        }
-    }
-
-    /**
-     * Checks validity of the request simply by making a quick pass and
-     * confirming the presence of all REQUIRED parameters.
-     *
-     * @param  array $httpGetData
-     * @return bool
-     */
-    public function isValidHubVerification(array $httpGetData)
-    {
-        /**
-         * As per the specification, the hub.verify_token is OPTIONAL. This
-         * implementation of Pubsubhubbub considers it REQUIRED and will
-         * always send a hub.verify_token parameter to be echoed back
-         * by the Hub Server. Therefore, its absence is considered invalid.
-         */
-        if (strtolower($_SERVER['REQUEST_METHOD']) !== 'get') {
-            return false;
-        }
-        $required = array(
-            'hub_mode', 
-            'hub_topic',
-            'hub_challenge', 
-            'hub_verify_token',
-        );
-        foreach ($required as $key) {
-            if (!array_key_exists($key, $httpGetData)) {
-                return false;
-            }
-        }
-        if ($httpGetData['hub_mode'] !== 'subscribe'
-            && $httpGetData['hub_mode'] !== 'unsubscribe'
-        ) {
-            return false;
-        }
-        if ($httpGetData['hub_mode'] == 'subscribe'
-            && !array_key_exists('hub_lease_seconds', $httpGetData)
-        ) {
-            return false;
-        }
-        if (!Zend_Uri::check($httpGetData['hub_topic'])) {
-            return false;
-        }
-
-        /**
-         * Attempt to retrieve any Verification Token Key attached to Callback
-         * URL's path by our Subscriber implementation
-         */
-        if (!$this->_hasValidVerifyToken($httpGetData)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Sets a newly received feed (Atom/RSS) sent by a Hub as an update to a
-     * Topic we've subscribed to.
-     *
-     * @param  string $feed
-     * @return Zend_Feed_Pubsubhubbub_Subscriber_Callback
-     */
-    public function setFeedUpdate($feed)
-    {
-        $this->_feedUpdate = $feed;
-        return $this;
-    }
-
-    /**
-     * Check if any newly received feed (Atom/RSS) update was received
-     *
-     * @return bool
-     */
-    public function hasFeedUpdate()
-    {
-        if (is_null($this->_feedUpdate)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Gets a newly received feed (Atom/RSS) sent by a Hub as an update to a
-     * Topic we've subscribed to.
-     *
-     * @return string
-     */
-    public function getFeedUpdate()
-    {
-        return $this->_feedUpdate;
-    }
-
-    /**
-     * Check for a valid verify_token. By default attempts to compare values
-     * with that sent from Hub, otherwise merely ascertains its existence.
-     *
-     * @param  array $httpGetData
-     * @param  bool $checkValue
-     * @return bool
-     */
-    protected function _hasValidVerifyToken(array $httpGetData = null, $checkValue = true)
-    {
-        $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
-        if (empty($verifyTokenKey)) {
-            return false;
-        }
-        $verifyTokenExists = $this->getStorage()->hasSubscription($verifyTokenKey);
-        if (!$verifyTokenExists) {
-            return false;
-        }
-        if ($checkValue) {
-            $data = $this->getStorage()->getSubscription($verifyTokenKey);
-            $verifyToken = $data['verify_token'];
-            if ($verifyToken !== hash('sha256', $httpGetData['hub_verify_token'])) {
-                return false;
-            }
-            $this->_currentSubscriptionData = $data;
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     * Attempt to detect the verification token key. This would be passed in
-     * the Callback URL (which we are handling with this class!) as a URI
-     * path part (the last part by convention).
-     *
-     * @param  null|array $httpGetData
-     * @return false|string
-     */
-    protected function _detectVerifyTokenKey(array $httpGetData = null)
-    {
-        /**
-         * Available when sub keys encoding in Callback URL path
-         */
-        if (isset($this->_subscriptionKey)) {
-            return $this->_subscriptionKey;
-        }
-
-        /**
-         * Available only if allowed by PuSH 0.2 Hubs
-         */
-        if (is_array($httpGetData)
-            && isset($httpGetData['xhub_subscription'])
-        ) {
-            return $httpGetData['xhub_subscription'];
-        }
-
-        /**
-         * Available (possibly) if corrupted in transit and not part of $_GET
-         */
-        $params = $this->_parseQueryString();
-        if (isset($params['xhub.subscription'])) {
-            return rawurldecode($params['xhub.subscription']);
-        }
-
-        return false;
-    }
-
-    /**
-     * Build an array of Query String parameters.
-     * This bypasses $_GET which munges parameter names and cannot accept
-     * multiple parameters with the same key.
-     *
-     * @return array|void
-     */
-    protected function _parseQueryString()
-    {
-        $params      = array();
-        $queryString = '';
-        if (isset($_SERVER['QUERY_STRING'])) {
-            $queryString = $_SERVER['QUERY_STRING'];
-        }
-        if (empty($queryString)) {
-            return array();
-        }
-        $parts = explode('&', $queryString);
-        foreach ($parts as $kvpair) {
-            $pair  = explode('=', $kvpair);
-            $key   = rawurldecode($pair[0]);
-            $value = rawurldecode($pair[1]);
-            if (isset($params[$key])) {
-                if (is_array($params[$key])) {
-                    $params[$key][] = $value;
-                } else {
-                    $params[$key] = array($params[$key], $value);
-                }
-            } else {
-                $params[$key] = $value;
-            }
-        }
-        return $params;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader.php b/airtime_mvc/library/Zend/Feed/Reader.php
deleted file mode 100644
index f44a7483a..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader.php
+++ /dev/null
@@ -1,719 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reader.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed
- */
-require_once 'Zend/Feed.php';
-
-/**
- * @see Zend_Feed_Reader_Feed_Rss
- */
-require_once 'Zend/Feed/Reader/Feed/Rss.php';
-
-/**
- * @see Zend_Feed_Reader_Feed_Atom
- */
-require_once 'Zend/Feed/Reader/Feed/Atom.php';
-
-/**
- * @see Zend_Feed_Reader_FeedSet
- */
-require_once 'Zend/Feed/Reader/FeedSet.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader
-{
-    /**
-     * Namespace constants
-     */
-    const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
-    const NAMESPACE_ATOM_10  = 'http://www.w3.org/2005/Atom';
-    const NAMESPACE_RDF      = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    const NAMESPACE_RSS_090  = 'http://my.netscape.com/rdf/simple/0.9/';
-    const NAMESPACE_RSS_10   = 'http://purl.org/rss/1.0/';
-
-    /**
-     * Feed type constants
-     */
-    const TYPE_ANY              = 'any';
-    const TYPE_ATOM_03          = 'atom-03';
-    const TYPE_ATOM_10          = 'atom-10';
-    const TYPE_ATOM_10_ENTRY    = 'atom-10-entry';
-    const TYPE_ATOM_ANY         = 'atom';
-    const TYPE_RSS_090          = 'rss-090';
-    const TYPE_RSS_091          = 'rss-091';
-    const TYPE_RSS_091_NETSCAPE = 'rss-091n';
-    const TYPE_RSS_091_USERLAND = 'rss-091u';
-    const TYPE_RSS_092          = 'rss-092';
-    const TYPE_RSS_093          = 'rss-093';
-    const TYPE_RSS_094          = 'rss-094';
-    const TYPE_RSS_10           = 'rss-10';
-    const TYPE_RSS_20           = 'rss-20';
-    const TYPE_RSS_ANY          = 'rss';
-
-    /**
-     * Cache instance
-     *
-     * @var Zend_Cache_Core
-     */
-    protected static $_cache = null;
-
-    /**
-     * HTTP client object to use for retrieving feeds
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $_httpClient = null;
-
-    /**
-     * Override HTTP PUT and DELETE request methods?
-     *
-     * @var boolean
-     */
-    protected static $_httpMethodOverride = false;
-
-    protected static $_httpConditionalGet = false;
-
-    protected static $_pluginLoader = null;
-
-    protected static $_prefixPaths = array();
-
-    protected static $_extensions = array(
-        'feed' => array(
-            'DublinCore_Feed',
-            'Atom_Feed'
-        ),
-        'entry' => array(
-            'Content_Entry',
-            'DublinCore_Entry',
-            'Atom_Entry'
-        ),
-        'core' => array(
-            'DublinCore_Feed',
-            'Atom_Feed',
-            'Content_Entry',
-            'DublinCore_Entry',
-            'Atom_Entry'
-        )
-    );
-
-    /**
-     * Get the Feed cache
-     *
-     * @return Zend_Cache_Core
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Set the feed cache
-     *
-     * @param Zend_Cache_Core $cache
-     * @return void
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feeds.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$_httpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object. If none is set, a new Zend_Http_Client will be used.
-     *
-     * @return Zend_Http_Client_Abstract
-     */
-    public static function getHttpClient()
-    {
-        if (!self::$_httpClient instanceof Zend_Http_Client) {
-            /**
-             * @see Zend_Http_Client
-             */
-            require_once 'Zend/Http/Client.php';
-            self::$_httpClient = new Zend_Http_Client();
-        }
-
-        return self::$_httpClient;
-    }
-
-    /**
-     * Toggle using POST instead of PUT and DELETE HTTP methods
-     *
-     * Some feed implementations do not accept PUT and DELETE HTTP
-     * methods, or they can't be used because of proxies or other
-     * measures. This allows turning on using POST where PUT and
-     * DELETE would normally be used; in addition, an
-     * X-Method-Override header will be sent with a value of PUT or
-     * DELETE as appropriate.
-     *
-     * @param  boolean $override Whether to override PUT and DELETE.
-     * @return void
-     */
-    public static function setHttpMethodOverride($override = true)
-    {
-        self::$_httpMethodOverride = $override;
-    }
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return boolean
-     */
-    public static function getHttpMethodOverride()
-    {
-        return self::$_httpMethodOverride;
-    }
-
-    /**
-     * Set the flag indicating whether or not to use HTTP conditional GET
-     *
-     * @param  bool $bool
-     * @return void
-     */
-    public static function useHttpConditionalGet($bool = true)
-    {
-        self::$_httpConditionalGet = $bool;
-    }
-
-    /**
-     * Import a feed by providing a URL
-     *
-     * @param  string $url The URL to the feed
-     * @param  string $etag OPTIONAL Last received ETag for this resource
-     * @param  string $lastModified OPTIONAL Last-Modified value for this resource
-     * @return Zend_Feed_Reader_FeedInterface
-     */
-    public static function import($uri, $etag = null, $lastModified = null)
-    {
-        $cache       = self::getCache();
-        $feed        = null;
-        $responseXml = '';
-        $client      = self::getHttpClient();
-        $client->resetParameters();
-        $client->setHeaders('If-None-Match', null);
-        $client->setHeaders('If-Modified-Since', null);
-        $client->setUri($uri);
-        $cacheId = 'Zend_Feed_Reader_' . md5($uri);
-
-        if (self::$_httpConditionalGet && $cache) {
-            $data = $cache->load($cacheId);
-            if ($data) {
-                if (is_null($etag)) {
-                    $etag = $cache->load($cacheId.'_etag');
-                }
-                if (is_null($lastModified)) {
-                    $lastModified = $cache->load($cacheId.'_lastmodified');;
-                }
-                if ($etag) {
-                    $client->setHeaders('If-None-Match', $etag);
-                }
-                if ($lastModified) {
-                    $client->setHeaders('If-Modified-Since', $lastModified);
-                }
-            }
-            $response = $client->request('GET');
-            if ($response->getStatus() !== 200 && $response->getStatus() !== 304) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-            }
-            if ($response->getStatus() == 304) {
-                $responseXml = $data;
-            } else {
-                $responseXml = $response->getBody();
-                $cache->save($responseXml, $cacheId);
-                if ($response->getHeader('ETag')) {
-                    $cache->save($response->getHeader('ETag'), $cacheId.'_etag');
-                }
-                if ($response->getHeader('Last-Modified')) {
-                    $cache->save($response->getHeader('Last-Modified'), $cacheId.'_lastmodified');
-                }
-            }
-            return self::importString($responseXml);
-        } elseif ($cache) {
-            $data = $cache->load($cacheId);
-            if ($data !== false) {
-                return self::importString($data);
-            }
-            $response = $client->request('GET');
-            if ($response->getStatus() !== 200) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-            }
-            $responseXml = $response->getBody();
-            $cache->save($responseXml, $cacheId);
-            return self::importString($responseXml);
-        } else {
-            $response = $client->request('GET');
-            if ($response->getStatus() !== 200) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
-            }
-            return self::importString($response->getBody());
-        }
-    }
-
-    /**
-     * Import a feed by providing a Zend_Feed_Abstract object
-     *
-     * @param  Zend_Feed_Abstract $feed A fully instantiated Zend_Feed object
-     * @return Zend_Feed_Reader_FeedInterface
-     */
-    public static function importFeed(Zend_Feed_Abstract $feed)
-    {
-        $dom  = $feed->getDOM()->ownerDocument;
-        $type = self::detectType($dom);
-        self::_registerCoreExtensions();
-        if (substr($type, 0, 3) == 'rss') {
-            $reader = new Zend_Feed_Reader_Feed_Rss($dom, $type);
-        } else {
-            $reader = new Zend_Feed_Reader_Feed_Atom($dom, $type);
-        }
-
-        return $reader;
-    }
-
-    /**
-     * Import a feed froma string
-     *
-     * @param  string $string
-     * @return Zend_Feed_Reader_FeedInterface
-     */
-    public static function importString($string)
-    {
-        $libxml_errflag = libxml_use_internal_errors(true);
-        $dom = new DOMDocument;
-        $status = $dom->loadXML($string);
-        libxml_use_internal_errors($libxml_errflag);
-
-        if (!$status) {
-            // Build error message
-            $error = libxml_get_last_error();
-            if ($error && $error->message) {
-                $errormsg = "DOMDocument cannot parse XML: {$error->message}";
-            } else {
-                $errormsg = "DOMDocument cannot parse XML: Please check the XML document's validity";
-            }
-
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception($errormsg);
-        }
-
-        $type = self::detectType($dom);
-
-        self::_registerCoreExtensions();
-
-        if (substr($type, 0, 3) == 'rss') {
-            $reader = new Zend_Feed_Reader_Feed_Rss($dom, $type);
-        } elseif (substr($type, 8, 5) == 'entry') {
-            $reader = new Zend_Feed_Reader_Entry_Atom($dom->documentElement, 0, Zend_Feed_Reader::TYPE_ATOM_10);
-        } elseif (substr($type, 0, 4) == 'atom') {
-            $reader = new Zend_Feed_Reader_Feed_Atom($dom, $type);
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('The URI used does not point to a '
-            . 'valid Atom, RSS or RDF feed that Zend_Feed_Reader can parse.');
-        }
-        return $reader;
-    }
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @throws Zend_Feed_Exception
-     * @return Zend_Feed_Reader_FeedInterface
-     */
-    public static function importFile($filename)
-    {
-        @ini_set('track_errors', 1);
-        $feed = @file_get_contents($filename);
-        @ini_restore('track_errors');
-        if ($feed === false) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg");
-        }
-        return self::importString($feed);
-    }
-
-    public static function findFeedLinks($uri)
-    {
-        // Get the HTTP response from $uri and save the contents
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->request();
-        if ($response->getStatus() !== 200) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus());
-        }
-        $responseHtml = $response->getBody();
-        $libxml_errflag = libxml_use_internal_errors(true);
-        $dom = new DOMDocument;
-        $status = $dom->loadHTML($responseHtml);
-        libxml_use_internal_errors($libxml_errflag);
-        if (!$status) {
-            // Build error message
-            $error = libxml_get_last_error();
-            if ($error && $error->message) {
-                $errormsg = "DOMDocument cannot parse HTML: {$error->message}";
-            } else {
-                $errormsg = "DOMDocument cannot parse HTML: Please check the XML document's validity";
-            }
-
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception($errormsg);
-        }
-        $feedSet = new Zend_Feed_Reader_FeedSet;
-        $links = $dom->getElementsByTagName('link');
-        $feedSet->addLinks($links, $uri);
-        return $feedSet;
-    }
-
-    /**
-     * Detect the feed type of the provided feed
-     *
-     * @param  Zend_Feed_Abstract|DOMDocument|string $feed
-     * @return string
-     */
-    public static function detectType($feed, $specOnly = false)
-    {
-        if ($feed instanceof Zend_Feed_Reader_FeedInterface) {
-            $dom = $feed->getDomDocument();
-        } elseif($feed instanceof DOMDocument) {
-            $dom = $feed;
-        } elseif(is_string($feed) && !empty($feed)) {
-            @ini_set('track_errors', 1);
-            $dom = new DOMDocument;
-            $status = @$doc->loadXML($string);
-            @ini_restore('track_errors');
-            if (!$status) {
-                if (!isset($php_errormsg)) {
-                    if (function_exists('xdebug_is_enabled')) {
-                        $php_errormsg = '(error message not available, when XDebug is running)';
-                    } else {
-                        $php_errormsg = '(error message not available)';
-                    }
-                }
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $php_errormsg");
-            }
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid object/scalar provided: must'
-            . ' be of type Zend_Feed_Reader_FeedInterface, DomDocument or string');
-        }
-        $xpath = new DOMXPath($dom);
-
-        if ($xpath->query('/rss')->length) {
-            $type = self::TYPE_RSS_ANY;
-            $version = $xpath->evaluate('string(/rss/@version)');
-
-            if (strlen($version) > 0) {
-                switch($version) {
-                    case '2.0':
-                        $type = self::TYPE_RSS_20;
-                        break;
-
-                    case '0.94':
-                        $type = self::TYPE_RSS_094;
-                        break;
-
-                    case '0.93':
-                        $type = self::TYPE_RSS_093;
-                        break;
-
-                    case '0.92':
-                        $type = self::TYPE_RSS_092;
-                        break;
-
-                    case '0.91':
-                        $type = self::TYPE_RSS_091;
-                        break;
-                }
-            }
-
-            return $type;
-        }
-
-        $xpath->registerNamespace('rdf', self::NAMESPACE_RDF);
-
-        if ($xpath->query('/rdf:RDF')->length) {
-            $xpath->registerNamespace('rss', self::NAMESPACE_RSS_10);
-
-            if ($xpath->query('/rdf:RDF/rss:channel')->length
-                || $xpath->query('/rdf:RDF/rss:image')->length
-                || $xpath->query('/rdf:RDF/rss:item')->length
-                || $xpath->query('/rdf:RDF/rss:textinput')->length
-            ) {
-                return self::TYPE_RSS_10;
-            }
-
-            $xpath->registerNamespace('rss', self::NAMESPACE_RSS_090);
-
-            if ($xpath->query('/rdf:RDF/rss:channel')->length
-                || $xpath->query('/rdf:RDF/rss:image')->length
-                || $xpath->query('/rdf:RDF/rss:item')->length
-                || $xpath->query('/rdf:RDF/rss:textinput')->length
-            ) {
-                return self::TYPE_RSS_090;
-            }
-        }
-
-        $type = self::TYPE_ATOM_ANY;
-        $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_10);
-
-        if ($xpath->query('//atom:feed')->length) {
-            return self::TYPE_ATOM_10;
-        }
-        
-        if ($xpath->query('//atom:entry')->length) {
-            if ($specOnly == true) {
-                return self::TYPE_ATOM_10;
-            } else {
-                return self::TYPE_ATOM_10_ENTRY;
-            }
-        }
-
-        $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_03);
-
-        if ($xpath->query('//atom:feed')->length) {
-            return self::TYPE_ATOM_03;
-        }
-
-        return self::TYPE_ANY;
-    }
-
-    /**
-     * Set plugin loader for use with Extensions
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     */
-    public static function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader)
-    {
-        self::$_pluginLoader = $loader;
-    }
-
-    /**
-     * Get plugin loader for use with Extensions
-     *
-     * @return  Zend_Loader_PluginLoader_Interface $loader
-     */
-    public static function getPluginLoader()
-    {
-        if (!isset(self::$_pluginLoader)) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            self::$_pluginLoader = new Zend_Loader_PluginLoader(array(
-                'Zend_Feed_Reader_Extension_' => 'Zend/Feed/Reader/Extension/',
-            ));
-        }
-        return self::$_pluginLoader;
-    }
-
-    /**
-     * Add prefix path for loading Extensions
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return void
-     */
-    public static function addPrefixPath($prefix, $path)
-    {
-        $prefix = rtrim($prefix, '_');
-        $path   = rtrim($path, DIRECTORY_SEPARATOR);
-        self::getPluginLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Add multiple Extension prefix paths at once
-     *
-     * @param  array $spec
-     * @return void
-     */
-    public static function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            self::addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $prefixPath) {
-            if (isset($prefixPath['prefix']) && isset($prefixPath['path'])) {
-                self::addPrefixPath($prefixPath['prefix'], $prefixPath['path']);
-            }
-        }
-    }
-
-    /**
-     * Register an Extension by name
-     *
-     * @param  string $name
-     * @return void
-     * @throws Zend_Feed_Exception if unable to resolve Extension class
-     */
-    public static function registerExtension($name)
-    {
-        $feedName  = $name . '_Feed';
-        $entryName = $name . '_Entry';
-        if (self::isRegistered($name)) {
-            if (self::getPluginLoader()->isLoaded($feedName) ||
-                self::getPluginLoader()->isLoaded($entryName)) {
-                return;
-            }
-        }
-        try {
-            self::getPluginLoader()->load($feedName);
-            self::$_extensions['feed'][] = $feedName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        try {
-            self::getPluginLoader()->load($entryName);
-            self::$_extensions['entry'][] = $entryName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        if (!self::getPluginLoader()->isLoaded($feedName)
-            && !self::getPluginLoader()->isLoaded($entryName)
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Could not load extension: ' . $name
-                . 'using Plugin Loader. Check prefix paths are configured and extension exists.');
-        }
-    }
-
-    /**
-     * Is a given named Extension registered?
-     *
-     * @param  string $extensionName
-     * @return boolean
-     */
-    public static function isRegistered($extensionName)
-    {
-        $feedName  = $extensionName . '_Feed';
-        $entryName = $extensionName . '_Entry';
-        if (in_array($feedName, self::$_extensions['feed'])
-            || in_array($entryName, self::$_extensions['entry'])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get a list of extensions
-     *
-     * @return array
-     */
-    public static function getExtensions()
-    {
-        return self::$_extensions;
-    }
-
-    /**
-     * Reset class state to defaults
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        self::$_cache              = null;
-        self::$_httpClient         = null;
-        self::$_httpMethodOverride = false;
-        self::$_httpConditionalGet = false;
-        self::$_pluginLoader       = null;
-        self::$_prefixPaths        = array();
-        self::$_extensions         = array(
-            'feed' => array(
-                'DublinCore_Feed',
-                'Atom_Feed'
-            ),
-            'entry' => array(
-                'Content_Entry',
-                'DublinCore_Entry',
-                'Atom_Entry'
-            ),
-            'core' => array(
-                'DublinCore_Feed',
-                'Atom_Feed',
-                'Content_Entry',
-                'DublinCore_Entry',
-                'Atom_Entry'
-            )
-        );
-    }
-
-    /**
-     * Register core (default) extensions
-     *
-     * @return void
-     */
-    protected static function _registerCoreExtensions()
-    {
-        self::registerExtension('DublinCore');
-        self::registerExtension('Content');
-        self::registerExtension('Atom');
-        self::registerExtension('Slash');
-        self::registerExtension('WellFormedWeb');
-        self::registerExtension('Thread');
-        self::registerExtension('Podcast');
-    }
-    
-    /**
-     * Utility method to apply array_unique operation to a multidimensional
-     * array.
-     *
-     * @param array
-     * @return array
-     */
-    public static function arrayUnique(array $array)
-    {
-        foreach ($array as &$value) {
-            $value = serialize($value);
-        }
-        $array = array_unique($array);
-        foreach ($array as &$value) {
-            $value = unserialize($value);
-        }
-        return $array;
-    }
- 
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Collection.php b/airtime_mvc/library/Zend/Feed/Reader/Collection.php
deleted file mode 100644
index fba2b52b5..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Collection.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Collection extends ArrayObject
-{
-
-    
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Collection/Author.php b/airtime_mvc/library/Zend/Feed/Reader/Collection/Author.php
deleted file mode 100644
index 98a8aea22..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Collection/Author.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
- 
-/**
- * @see Zend_Feed_Reader_Collection_CollectionAbstract
- */
-require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Collection_Author
-extends Zend_Feed_Reader_Collection_CollectionAbstract
-{
-
-    /**
-     * Return a simple array of the most relevant slice of
-     * the author values, i.e. all author names.
-     *
-     * @return array
-     */
-    public function getValues() {
-        $authors = array();
-        foreach ($this->getIterator() as $element) {
-            $authors[] = $element['name'];
-        }
-        return array_unique($authors);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Collection/Category.php b/airtime_mvc/library/Zend/Feed/Reader/Collection/Category.php
deleted file mode 100644
index 3bbc5f168..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Collection/Category.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Category.php 20954 2010-02-06 17:56:27Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Reader_Collection_CollectionAbstract
- */
-require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Collection_Category
-extends Zend_Feed_Reader_Collection_CollectionAbstract
-{
-
-    /**
-     * Return a simple array of the most relevant slice of
-     * the collection values. For example, feed categories contain
-     * the category name, domain/URI, and other data. This method would
-     * merely return the most useful data - i.e. the category names.
-     *
-     * @return array
-     */
-    public function getValues() {
-        $categories = array();
-        foreach ($this->getIterator() as $element) {
-            if (isset($element['label']) && !empty($element['label'])) {
-                $categories[] = $element['label'];
-            } else {
-                $categories[] = $element['term'];
-            }
-        }
-        return array_unique($categories);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Collection/CollectionAbstract.php b/airtime_mvc/library/Zend/Feed/Reader/Collection/CollectionAbstract.php
deleted file mode 100644
index 7b6dbd031..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Collection/CollectionAbstract.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CollectionAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Reader_Collection_CollectionAbstract extends ArrayObject
-{
-
-    /**
-     * Return a simple array of the most relevant slice of
-     * the collection values. For example, feed categories contain
-     * the category name, domain/URI, and other data. This method would
-     * merely return the most useful data - i.e. the category names.
-     *
-     * @return array
-     */
-    public abstract function getValues();
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Entry/Atom.php b/airtime_mvc/library/Zend/Feed/Reader/Entry/Atom.php
deleted file mode 100644
index 308deba59..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Entry/Atom.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_EntryInterface
- */
-require_once 'Zend/Feed/Reader/EntryInterface.php';
-
-/**
- * @see Zend_Feed_Reader_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/EntryAbstract.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Atom_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Entry_Atom extends Zend_Feed_Reader_EntryAbstract implements Zend_Feed_Reader_EntryInterface
-{
-    /**
-     * XPath query
-     *
-     * @var string
-     */
-    protected $_xpathQuery = '';
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  int $entryKey
-     * @param  string $type
-     * @return void
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        parent::__construct($entry, $entryKey, $type);
-
-        // Everyone by now should know XPath indices start from 1 not 0
-        $this->_xpathQuery = '//atom:entry[' . ($this->_entryKey + 1) . ']';
-
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Entry');
-        $this->_extensions['Atom_Entry'] = new $atomClass($entry, $entryKey, $type);
-
-        $threadClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Thread_Entry');
-        $this->_extensions['Thread_Entry'] = new $threadClass($entry, $entryKey, $type);
-        
-        $threadClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Entry');
-        $this->_extensions['DublinCore_Entry'] = new $threadClass($entry, $entryKey, $type);
-    }
-
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $people = $this->getExtension('Atom')->getAuthors();
-
-        $this->_data['authors'] = $people;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->_data)) {
-            return $this->_data['content'];
-        }
-
-        $content = $this->getExtension('Atom')->getContent();
-
-        $this->_data['content'] = $content;
-
-        return $this->_data['content'];
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->_data)) {
-            return $this->_data['datecreated'];
-        }
-
-        $dateCreated = $this->getExtension('Atom')->getDateCreated();
-
-        $this->_data['datecreated'] = $dateCreated;
-
-        return $this->_data['datecreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $dateModified = $this->getExtension('Atom')->getDateModified();
-
-        $this->_data['datemodified'] = $dateModified;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = $this->getExtension('Atom')->getDescription();
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->_data)) {
-            return $this->_data['enclosure'];
-        }
-
-        $enclosure = $this->getExtension('Atom')->getEnclosure();
-
-        $this->_data['enclosure'] = $enclosure;
-
-        return $this->_data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = $this->getExtension('Atom')->getId();
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->_data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->_data['links'][$index])) {
-            return $this->_data['links'][$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->_data)) {
-            return $this->_data['links'];
-        }
-
-        $links = $this->getExtension('Atom')->getLinks();
-
-        $this->_data['links'] = $links;
-
-        return $this->_data['links'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = $this->getExtension('Atom')->getTitle();
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return integer
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->_data)) {
-            return $this->_data['commentcount'];
-        }
-
-        $commentcount = $this->getExtension('Thread')->getCommentCount();
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Atom')->getCommentCount();
-        }
-
-        $this->_data['commentcount'] = $commentcount;
-
-        return $this->_data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->_data)) {
-            return $this->_data['commentlink'];
-        }
-
-        $commentlink = $this->getExtension('Atom')->getCommentLink();
-
-        $this->_data['commentlink'] = $commentlink;
-
-        return $this->_data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink()
-    {
-        if (array_key_exists('commentfeedlink', $this->_data)) {
-            return $this->_data['commentfeedlink'];
-        }
-
-        $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink();
-
-        $this->_data['commentfeedlink'] = $commentfeedlink;
-
-        return $this->_data['commentfeedlink'];
-    }
-    
-    /**
-     * Get category data as a Zend_Feed_Reader_Collection_Category object
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        $categoryCollection = $this->getExtension('Atom')->getCategories();
-        
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-    
-    /**
-     * Get source feed metadata from the entry
-     *
-     * @return Zend_Feed_Reader_Feed_Atom_Source|null
-     */
-    public function getSource()
-    {
-        if (array_key_exists('source', $this->_data)) {
-            return $this->_data['source'];
-        }
-
-        $source = $this->getExtension('Atom')->getSource();
-
-        $this->_data['source'] = $source;
-
-        return $this->_data['source']; 
-    }
-
-    /**
-     * Set the XPath query (incl. on all Extensions)
-     *
-     * @param DOMXPath $xpath
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        parent::setXpath($xpath);
-        foreach ($this->_extensions as $extension) {
-            $extension->setXpath($this->_xpath);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Entry/Rss.php b/airtime_mvc/library/Zend/Feed/Reader/Entry/Rss.php
deleted file mode 100644
index 30f90d8de..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Entry/Rss.php
+++ /dev/null
@@ -1,665 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_EntryInterface
- */
-require_once 'Zend/Feed/Reader/EntryInterface.php';
-
-/**
- * @see Zend_Feed_Reader_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/EntryAbstract.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_DublinCore_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/DublinCore/Entry.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Content_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/Content/Entry.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Atom_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_WellformedWeb_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Slash_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/Slash/Entry.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Thread_Entry
- */
-require_once 'Zend/Feed/Reader/Extension/Thread/Entry.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Feed_Reader_Collection_Category
- */
-require_once 'Zend/Feed/Reader/Collection/Category.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Entry_Rss extends Zend_Feed_Reader_EntryAbstract implements Zend_Feed_Reader_EntryInterface
-{
-
-    /**
-     * XPath query for RDF
-     *
-     * @var string
-     */
-    protected $_xpathQueryRdf = '';
-
-    /**
-     * XPath query for RSS
-     *
-     * @var string
-     */
-    protected $_xpathQueryRss = '';
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Feed_Entry_Abstract $entry
-     * @param  string $entryKey
-     * @param  string $type
-     * @return void
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        parent::__construct($entry, $entryKey, $type);
-        $this->_xpathQueryRss = '//item[' . ($this->_entryKey+1) . ']';
-        $this->_xpathQueryRdf = '//rss:item[' . ($this->_entryKey+1) . ']';
-
-        $pluginLoader = Zend_Feed_Reader::getPluginLoader();
-
-        $dublinCoreClass = $pluginLoader->getClassName('DublinCore_Entry');
-        $this->_extensions['DublinCore_Entry'] = new $dublinCoreClass($entry, $entryKey, $type);
-
-        $contentClass   = $pluginLoader->getClassName('Content_Entry');
-        $this->_extensions['Content_Entry'] = new $contentClass($entry, $entryKey, $type);
-
-        $atomClass   = $pluginLoader->getClassName('Atom_Entry');
-        $this->_extensions['Atom_Entry'] = new $atomClass($entry, $entryKey, $type);
-
-        $wfwClass   = $pluginLoader->getClassName('WellFormedWeb_Entry');
-        $this->_extensions['WellFormedWeb_Entry'] = new $wfwClass($entry, $entryKey, $type);
-
-        $slashClass   = $pluginLoader->getClassName('Slash_Entry');
-        $this->_extensions['Slash_Entry'] = new $slashClass($entry, $entryKey, $type);
-
-        $threadClass   = $pluginLoader->getClassName('Thread_Entry');
-        $this->_extensions['Thread_Entry'] = new $threadClass($entry, $entryKey, $type);
-    }
-
-    /**
-     * Get an author entry
-     *
-     * @param DOMElement $element
-     * @return string
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-        
-        $authors = array();
-        $authors_dc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authors_dc)) {
-            foreach ($authors_dc as $author) {
-                $authors[] = array(
-                    'name' => $author['name']
-                );
-            }
-        }
-        
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-        && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $list = $this->_xpath->query($this->_xpathQueryRss . '//author');
-        } else {
-            $list = $this->_xpath->query($this->_xpathQueryRdf . '//rss:author');
-        }
-        if ($list->length) {
-            foreach ($list as $author) {
-                $string = trim($author->nodeValue);
-                $email = null;
-                $name = null;
-                $data = array();
-                // Pretty rough parsing - but it's a catchall
-                if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
-                    $data['email'] = trim($matches[0]);
-                    if (preg_match("/\((.*)\)$/", $string, $matches)) {
-                        $data['name'] = $matches[1];
-                    }
-                    $authors[] = $data;
-                } 
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = $this->getExtension('Atom')->getAuthors();
-        } else {
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        }
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->_data)) {
-            return $this->_data['content'];
-        }
-
-        $content = $this->getExtension('Content')->getContent();
-
-        if (!$content) {
-            $content = $this->getDescription();
-        }
-
-        if (empty($content)) {
-            $content = $this->getExtension('Atom')->getContent();
-        }
-
-        $this->_data['content'] = $content;
-
-        return $this->_data['content'];
-    }
-
-    /**
-     * Get the entry's date of creation
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        return $this->getDateModified();
-    }
-
-    /**
-     * Get the entry's date of modification
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $dateModified = null;
-        $date = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $dateModified = $this->_xpath->evaluate('string('.$this->_xpathQueryRss.'/pubDate)');
-            if ($dateModified) {
-                $dateStandards = array(Zend_Date::RSS, Zend_Date::RFC_822,
-                Zend_Date::RFC_2822, Zend_Date::DATES);
-                $date = new Zend_Date;
-                foreach ($dateStandards as $standard) {
-                    try {
-                        $date->set($dateModified, $standard);
-                        break;
-                    } catch (Zend_Date_Exception $e) {
-                        if ($standard == Zend_Date::DATES) {
-                            require_once 'Zend/Feed/Exception.php';
-                            throw new Zend_Feed_Exception(
-                                'Could not load date due to unrecognised'
-                                .' format (should follow RFC 822 or 2822):'
-                                . $e->getMessage(),
-                                0, $e
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('DublinCore')->getDate();
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('Atom')->getDateModified();
-        }
-
-        if (!$date) {
-            $date = null;
-        }
-
-        $this->_data['datemodified'] = $date;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $description = $this->_xpath->evaluate('string('.$this->_xpathQueryRss.'/description)');
-        } else {
-            $description = $this->_xpath->evaluate('string('.$this->_xpathQueryRdf.'/rss:description)');
-        }
-
-        if (!$description) {
-            $description = $this->getExtension('DublinCore')->getDescription();
-        }
-
-        if (empty($description)) {
-            $description = $this->getExtension('Atom')->getDescription();
-        }
-
-        if (!$description) {
-            $description = null;
-        } else {
-            $description = html_entity_decode($description, ENT_QUOTES, $this->getEncoding());
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->_data)) {
-            return $this->_data['enclosure'];
-        }
-
-        $enclosure = null;
-
-        if ($this->getType() == Zend_Feed_Reader::TYPE_RSS_20) {
-            $nodeList = $this->_xpath->query($this->_xpathQueryRss . '/enclosure');
-
-            if ($nodeList->length > 0) {
-                $enclosure = new stdClass();
-                $enclosure->url    = $nodeList->item(0)->getAttribute('url');
-                $enclosure->length = $nodeList->item(0)->getAttribute('length');
-                $enclosure->type   = $nodeList->item(0)->getAttribute('type');
-            }
-        }
-
-        if (!$enclosure) {
-            $enclosure = $this->getExtension('Atom')->getEnclosure();
-        }
-
-        $this->_data['enclosure'] = $enclosure;
-
-        return $this->_data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $id = $this->_xpath->evaluate('string('.$this->_xpathQueryRss.'/guid)');
-        }
-
-        if (!$id) {
-            $id = $this->getExtension('DublinCore')->getId();
-        }
-
-        if (empty($id)) {
-            $id = $this->getExtension('Atom')->getId();
-        }
-
-        if (!$id) {
-            if ($this->getPermalink()) {
-                $id = $this->getPermalink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->_data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->_data['links'][$index])) {
-            return $this->_data['links'][$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->_data)) {
-            return $this->_data['links'];
-        }
-
-        $links = array();
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $list = $this->_xpath->query($this->_xpathQueryRss.'//link');
-        } else {
-            $list = $this->_xpath->query($this->_xpathQueryRdf.'//rss:link');
-        }
-
-        if (!$list->length) {
-            $links = $this->getExtension('Atom')->getLinks();
-        } else {
-            foreach ($list as $link) {
-                $links[] = $link->nodeValue;
-            }
-        }
-
-        $this->_data['links'] = $links;
-
-        return $this->_data['links'];
-    }
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $list = $this->_xpath->query($this->_xpathQueryRss.'//category');
-        } else {
-            $list = $this->_xpath->query($this->_xpathQueryRdf.'//rss:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->nodeValue,
-                    'scheme' => $category->getAttribute('domain'),
-                    'label' => $category->nodeValue,
-                );
-            }
-        } else {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-        
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('Atom')->getCategories();
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $title = $this->_xpath->evaluate('string('.$this->_xpathQueryRss.'/title)');
-        } else {
-            $title = $this->_xpath->evaluate('string('.$this->_xpathQueryRdf.'/rss:title)');
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('DublinCore')->getTitle();
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('Atom')->getTitle();
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return string|null
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->_data)) {
-            return $this->_data['commentcount'];
-        }
-
-        $commentcount = $this->getExtension('Slash')->getCommentCount();
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Thread')->getCommentCount();
-        }
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Atom')->getCommentCount();
-        }
-
-        if (!$commentcount) {
-            $commentcount = null;
-        }
-
-        $this->_data['commentcount'] = $commentcount;
-
-        return $this->_data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->_data)) {
-            return $this->_data['commentlink'];
-        }
-
-        $commentlink = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $commentlink = $this->_xpath->evaluate('string('.$this->_xpathQueryRss.'/comments)');
-        }
-
-        if (!$commentlink) {
-            $commentlink = $this->getExtension('Atom')->getCommentLink();
-        }
-
-        if (!$commentlink) {
-            $commentlink = null;
-        }
-
-        $this->_data['commentlink'] = $commentlink;
-
-        return $this->_data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink()
-    {
-        if (array_key_exists('commentfeedlink', $this->_data)) {
-            return $this->_data['commentfeedlink'];
-        }
-
-        $commentfeedlink = $this->getExtension('WellFormedWeb')->getCommentFeedLink();
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rss');
-        }
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rdf');
-        }
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = null;
-        }
-
-        $this->_data['commentfeedlink'] = $commentfeedlink;
-
-        return $this->_data['commentfeedlink'];
-    }
-
-    /**
-     * Set the XPath query (incl. on all Extensions)
-     *
-     * @param DOMXPath $xpath
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        parent::setXpath($xpath);
-        foreach ($this->_extensions as $extension) {
-            $extension->setXpath($this->_xpath);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/EntryAbstract.php b/airtime_mvc/library/Zend/Feed/Reader/EntryAbstract.php
deleted file mode 100644
index 193bb65c5..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/EntryAbstract.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Reader_EntryAbstract
-{
-    /**
-     * Feed entry data
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * DOM document object
-     *
-     * @var DOMDocument
-     */
-    protected $_domDocument = null;
-
-    /**
-     * Entry instance
-     *
-     * @var Zend_Feed_Entry_Interface
-     */
-    protected $_entry = null;
-
-    /**
-     * Pointer to the current entry
-     *
-     * @var int
-     */
-    protected $_entryKey = 0;
-
-    /**
-     * XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath = null;
-
-    /**
-     * Registered extensions
-     *
-     * @var array
-     */
-    protected $_extensions = array();
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  int $entryKey
-     * @param  string $type
-     * @return void
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        $this->_entry       = $entry;
-        $this->_entryKey    = $entryKey;
-        $this->_domDocument = $entry->ownerDocument;
-        if ($type !== null) {
-            $this->_data['type'] = $type;
-        } else {
-            $this->_data['type'] = Zend_Feed_Reader::detectType($feed);
-        }
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->_domDocument;
-    }
-
-    /**
-     * Get the entry element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->_entry;
-    }
-
-    /**
-     * Get the Entry's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get entry as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        $entry = $dom->importNode($this->getElement(), true);
-        $dom->appendChild($entry);
-        return $dom->saveXml();
-    }
-
-    /**
-     * Get the entry type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_data['type'];
-    }
-
-    /**
-     * Get the XPath query object
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        if (!$this->_xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-        return $this->_xpath;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return Zend_Feed_Reader_Entry_EntryAbstract
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->_xpath = $xpath;
-        return $this;
-    }
-
-    /**
-     * Get registered extensions
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->_extensions;
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Entry)
-     *
-     * @param string $name
-     * @return Zend_Feed_Reader_Extension_EntryAbstract
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '_Entry', $this->_extensions)) {
-            return $this->_extensions[$name . '_Entry'];
-        }
-        return null;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Feed_Exception if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->_extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array(array($extension, $method), $args);
-            }
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Method: ' . $method
-            . 'does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Load extensions from Zend_Feed_Reader
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all = Zend_Feed_Reader::getExtensions();
-        $feed = $all['entry'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            $className = Zend_Feed_Reader::getPluginLoader()->getClassName($extension);
-            $this->_extensions[$extension] = new $className(
-                $this->getElement(), $this->_entryKey, $this->_data['type']
-            );
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/EntryInterface.php b/airtime_mvc/library/Zend/Feed/Reader/EntryInterface.php
deleted file mode 100644
index 392a533a3..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/EntryInterface.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Reader_EntryInterface
-{
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0);
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors();
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent();
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated();
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified();
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription();
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return stdClass
-     */
-    public function getEnclosure();
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId();
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0);
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks();
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink();
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle();
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return integer
-     */
-    public function getCommentCount();
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink();
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink();
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Entry.php
deleted file mode 100644
index 57c12e2d1..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ /dev/null
@@ -1,665 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20507 2010-01-21 22:21:07Z padraic $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Feed_Reader_Collection_Category
- */
-require_once 'Zend/Feed/Reader/Collection/Category.php';
-
-/**
- * @see Zend_Feed_Reader_Feed_Atom_Source
- */
-require_once 'Zend/Feed/Reader/Feed/Atom/Source.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Atom_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $authors = array();
-        $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
-
-        if (!$list->length) {
-            /**
-             * TODO: Limit query to feed level els only!
-             */
-            $list = $this->getXpath()->query('//atom:author');
-        }
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $author = $this->_getAuthor($author);
-                if (!empty($author)) {
-                    $authors[] = $author;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        } else {
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        }
-
-        $this->_data['authors'] = $authors;
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->_data)) {
-            return $this->_data['content'];
-        }
-        
-        $content = null;
-        
-        $el = $this->getXpath()->query($this->getXpathPrefix() . '/atom:content');
-        if($el->length > 0) {
-            $el = $el->item(0);
-            $type = $el->getAttribute('type');
-            switch ($type) {
-                case '':
-                case 'text':
-                case 'text/plain':
-                case 'html':
-                case 'text/html':
-                    $content = $el->nodeValue;
-                break;
-                case 'xhtml':
-                    $this->getXpath()->registerNamespace('xhtml', 'http://www.w3.org/1999/xhtml');
-                    $xhtml = $this->getXpath()->query(
-                        $this->getXpathPrefix() . '/atom:content/xhtml:div'
-                    )->item(0);
-                    //$xhtml->setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-                    $d = new DOMDocument('1.0', $this->getEncoding());
-                    $xhtmls = $d->importNode($xhtml, true);
-                    $d->appendChild($xhtmls);
-                    $content = $this->_collectXhtml(
-                        $d->saveXML(),
-                        $d->lookupPrefix('http://www.w3.org/1999/xhtml')
-                    );
-                break;
-            }
-        }
-        
-        //var_dump($content); exit;
-
-        if (!$content) {
-            $content = $this->getDescription();
-        }
-
-        $this->_data['content'] = trim($content);
-
-        return $this->_data['content'];
-    }
-    
-    /**
-     * Parse out XHTML to remove the namespacing
-     */
-    protected function _collectXhtml($xhtml, $prefix)
-    {
-        if (!empty($prefix)) $prefix = $prefix . ':';
-        $matches = array(
-            "/<\?xml[^<]*>[^<]*<" . $prefix . "div[^<]*/",
-            "/<\/" . $prefix . "div>\s*$/"
-        );
-        $xhtml = preg_replace($matches, '', $xhtml);
-        if (!empty($prefix)) {
-            $xhtml = preg_replace("/(<[\/]?)" . $prefix . "([a-zA-Z]+)/", '$1$2', $xhtml);
-        }
-        return $xhtml;
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->_data)) {
-            return $this->_data['datecreated'];
-        }
-
-        $date = null;
-
-        if ($this->_getAtomType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $dateCreated = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:created)');
-        } else {
-            $dateCreated = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:published)');
-        }
-
-        if ($dateCreated) {
-            $date = new Zend_Date;
-            $date->set($dateCreated, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['datecreated'] = $date;
-
-        return $this->_data['datecreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->_getAtomType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $dateModified = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:modified)');
-        } else {
-            $dateModified = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:updated)');
-        }
-
-        if ($dateModified) {
-            $date = new Zend_Date;
-            $date->set($dateModified, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['datemodified'] = $date;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:summary)');
-
-        if (!$description) {
-            $description = null;
-        } else {
-            $description = html_entity_decode($description, ENT_QUOTES, $this->getEncoding());
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->_data)) {
-            return $this->_data['enclosure'];
-        }
-
-        $enclosure = null;
-
-        $nodeList = $this->getXpath()->query($this->getXpathPrefix() . '/atom:link[@rel="enclosure"]');
-
-        if ($nodeList->length > 0) {
-            $enclosure = new stdClass();
-            $enclosure->url    = $nodeList->item(0)->getAttribute('href');
-            $enclosure->length = $nodeList->item(0)->getAttribute('length');
-            $enclosure->type   = $nodeList->item(0)->getAttribute('type');
-        }
-
-        $this->_data['enclosure'] = $enclosure;
-
-        return $this->_data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
-
-        if (!$id) {
-            if ($this->getPermalink()) {
-                $id = $this->getPermalink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the base URI of the feed (if set).
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->_data)) {
-            return $this->_data['baseUrl'];
-        }
-
-        $baseUrl = $this->getXpath()->evaluate('string('
-            . $this->getXpathPrefix() . '/@xml:base[1]'
-        . ')');
-
-        if (!$baseUrl) {
-            $baseUrl = $this->getXpath()->evaluate('string(//@xml:base[1])');
-        }
-
-        if (!$baseUrl) {
-            $baseUrl = null;
-        }
-
-        $this->_data['baseUrl'] = $baseUrl;
-
-        return $this->_data['baseUrl'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->_data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->_data['links'][$index])) {
-            return $this->_data['links'][$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->_data)) {
-            return $this->_data['links'];
-        }
-
-        $links = array();
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="alternate"]/@href' . '|' .
-            $this->getXpathPrefix() . '//atom:link[not(@rel)]/@href'
-        );
-
-        if ($list->length) {
-            foreach ($list as $link) {
-                $links[] = $this->_absolutiseUri($link->value);
-            }
-        }
-
-        $this->_data['links'] = $links;
-
-        return $this->_data['links'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
-
-        if (!$title) {
-            $title = null;
-        } else {
-            $title = html_entity_decode($title, ENT_QUOTES, $this->getEncoding());
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return integer
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->_data)) {
-            return $this->_data['commentcount'];
-        }
-
-        $count = null;
-
-        $this->getXpath()->registerNamespace('thread10', 'http://purl.org/syndication/thread/1.0');
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies"]/@thread10:count'
-        );
-
-        if ($list->length) {
-            $count = $list->item(0)->value;
-        }
-
-        $this->_data['commentcount'] = $count;
-
-        return $this->_data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->_data)) {
-            return $this->_data['commentlink'];
-        }
-
-        $link = null;
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="text/html"]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->value;
-            $link = $this->_absolutiseUri($link);
-        }
-
-        $this->_data['commentlink'] = $link;
-
-        return $this->_data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink($type = 'atom')
-    {
-        if (array_key_exists('commentfeedlink', $this->_data)) {
-            return $this->_data['commentfeedlink'];
-        }
-
-        $link = null;
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="application/'.$type.'+xml"]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->value;
-            $link = $this->_absolutiseUri($link);
-        }
-
-        $this->_data['commentfeedlink'] = $link;
-
-        return $this->_data['commentfeedlink'];
-    }
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        if ($this->_getAtomType() == Zend_Feed_Reader::TYPE_ATOM_10) {
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:category');
-        } else {
-            /**
-             * Since Atom 0.3 did not support categories, it would have used the
-             * Dublin Core extension. However there is a small possibility Atom 0.3
-             * may have been retrofittied to use Atom 1.0 instead.
-             */
-            $this->getXpath()->registerNamespace('atom10', Zend_Feed_Reader::NAMESPACE_ATOM_10);
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom10:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->getAttribute('term'),
-                    'scheme' => $category->getAttribute('scheme'),
-                    'label' => html_entity_decode($category->getAttribute('label'))
-                );
-            }
-        } else {
-            return new Zend_Feed_Reader_Collection_Category;
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-    
-    /**
-     * Get source feed metadata from the entry
-     *
-     * @return Zend_Feed_Reader_Feed_Atom_Source|null
-     */
-    public function getSource()
-    {
-        if (array_key_exists('source', $this->_data)) {
-            return $this->_data['source'];
-        }
-        
-        $source = null;
-        // TODO: Investigate why _getAtomType() fails here. Is it even needed?
-        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) {
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '/atom:source[1]');
-            if ($list->length) {
-                $element = $list->item(0);
-                $source = new Zend_Feed_Reader_Feed_Atom_Source($element, $this->getXpathPrefix());
-            }
-        }
-        
-        $this->_data['source'] = $source;
-        return $this->_data['source']; 
-    }
-
-    /**
-     *  Attempt to absolutise the URI, i.e. if a relative URI apply the
-     *  xml:base value as a prefix to turn into an absolute URI.
-     */
-    protected function _absolutiseUri($link)
-    {
-        if (!Zend_Uri::check($link)) {
-            if (!is_null($this->getBaseUrl())) {
-                $link = $this->getBaseUrl() . $link;
-                if (!Zend_Uri::check($link)) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-
-    /**
-     * Get an author entry
-     *
-     * @param DOMElement $element
-     * @return string
-     */
-    protected function _getAuthor(DOMElement $element)
-    {
-        $author = array();
-
-        $emailNode = $element->getElementsByTagName('email');
-        $nameNode  = $element->getElementsByTagName('name');
-        $uriNode   = $element->getElementsByTagName('uri');
-        
-        if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) {
-            $author['email'] = $emailNode->item(0)->nodeValue;
-        }
-
-        if ($nameNode->length && strlen($nameNode->item(0)->nodeValue) > 0) {
-            $author['name'] = $nameNode->item(0)->nodeValue;
-        }
-
-        if ($uriNode->length && strlen($uriNode->item(0)->nodeValue) > 0) {
-            $author['uri'] = $uriNode->item(0)->nodeValue;
-        }
-
-        if (empty($author)) {
-            return null;
-        }
-        return $author;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    protected function _registerNamespaces()
-    {
-        switch ($this->_getAtomType()) {
-            case Zend_Feed_Reader::TYPE_ATOM_03:
-                $this->getXpath()->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_03);
-                break;
-            default:
-                $this->getXpath()->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_10);
-                break;
-        }
-    }
-
-    /**
-     * Detect the presence of any Atom namespaces in use
-     */
-    protected function _getAtomType()
-    {
-        $dom = $this->getDomDocument();
-        $prefixAtom03 = $dom->lookupPrefix(Zend_Feed_Reader::NAMESPACE_ATOM_03);
-        $prefixAtom10 = $dom->lookupPrefix(Zend_Feed_Reader::NAMESPACE_ATOM_10);
-        if ($dom->isDefaultNamespace(Zend_Feed_Reader::NAMESPACE_ATOM_03)
-        || !empty($prefixAtom03)) {
-            return Zend_Feed_Reader::TYPE_ATOM_03;
-        }
-        if ($dom->isDefaultNamespace(Zend_Feed_Reader::NAMESPACE_ATOM_10)
-        || !empty($prefixAtom10)) {
-            return Zend_Feed_Reader::TYPE_ATOM_10;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Feed.php
deleted file mode 100644
index 502e9a9c1..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Atom/Feed.php
+++ /dev/null
@@ -1,544 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Feed_Reader_Collection_Author
- */
-require_once 'Zend/Feed/Reader/Collection/Author.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Atom_Feed
-    extends Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $list = $this->_xpath->query('//atom:author');
-
-        $authors = array();
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $author = $this->_getAuthor($author);
-                if (!empty($author)) {
-                    $authors[] = $author;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        } else {
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        }
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->_data)) {
-            return $this->_data['copyright'];
-        }
-
-        $copyright = null;
-
-        if ($this->getType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $copyright = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:copyright)');
-        } else {
-            $copyright = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:rights)');
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->_data['copyright'] = $copyright;
-
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return Zend_Date|null
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->_data)) {
-            return $this->_data['datecreated'];
-        }
-
-        $date = null;
-
-        if ($this->getType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $dateCreated = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:created)');
-        } else {
-            $dateCreated = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:published)');
-        }
-
-        if ($dateCreated) {
-            $date = new Zend_Date;
-            $date->set($dateCreated, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['datecreated'] = $date;
-
-        return $this->_data['datecreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return Zend_Date|null
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->getType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $dateModified = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:modified)');
-        } else {
-            $dateModified = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:updated)');
-        }
-
-        if ($dateModified) {
-            $date = new Zend_Date;
-            $date->set($dateModified, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['datemodified'] = $date;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = null;
-
-        if ($this->getType() === Zend_Feed_Reader::TYPE_ATOM_03) {
-            $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:tagline)'); // TODO: Is this the same as subtitle?
-        } else {
-            $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:subtitle)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->_data)) {
-            return $this->_data['generator'];
-        }
-        // TODO: Add uri support
-        $generator = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:generator)');
-
-        if (!$generator) {
-            $generator = null;
-        } else {
-            $generator = html_entity_decode($generator, ENT_QUOTES, $this->getEncoding());
-        }
-
-        $this->_data['generator'] = $generator;
-
-        return $this->_data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
-
-        if (!$id) {
-            if ($this->getLink()) {
-                $id = $this->getLink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->_data)) {
-            return $this->_data['language'];
-        }
-
-        $language = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:lang)');
-
-        if (!$language) {
-            $language = $this->_xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->_data['language'] = $language;
-
-        return $this->_data['language'];
-    }
-
-    /**
-     * Get the base URI of the feed (if set).
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->_data)) {
-            return $this->_data['baseUrl'];
-        }
-
-        $baseUrl = $this->_xpath->evaluate('string(//@xml:base[1])');
-
-        if (!$baseUrl) {
-            $baseUrl = null;
-        }
-        $this->_data['baseUrl'] = $baseUrl;
-
-        return $this->_data['baseUrl'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->_data)) {
-            return $this->_data['link'];
-        }
-
-        $link = null;
-
-        $list = $this->_xpath->query(
-            $this->getXpathPrefix() . '/atom:link[@rel="alternate"]/@href' . '|' .
-            $this->getXpathPrefix() . '/atom:link[not(@rel)]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->nodeValue;
-            $link = $this->_absolutiseUri($link);
-        }
-
-        $this->_data['link'] = $link;
-
-        return $this->_data['link'];
-    }
-
-    /**
-     * Get a link to the feed's XML Url
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->_data)) {
-            return $this->_data['feedlink'];
-        }
-
-        $link = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:link[@rel="self"]/@href)');
-
-        $link = $this->_absolutiseUri($link);
-
-        $this->_data['feedlink'] = $link;
-
-        return $this->_data['feedlink'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->_data)) {
-            return $this->_data['hubs'];
-        }
-        $hubs = array();
-        
-        $list = $this->_xpath->query($this->getXpathPrefix()
-            . '//atom:link[@rel="hub"]/@href');
-
-        if ($list->length) {
-            foreach ($list as $uri) {
-                $hubs[] = $this->_absolutiseUri($uri->nodeValue);
-            }
-        } else {
-            $hubs = null;
-        }
-
-        $this->_data['hubs'] = $hubs;
-
-        return $this->_data['hubs'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) {
-            $list = $this->_xpath->query($this->getXpathPrefix() . '/atom:category');
-        } else {
-            /**
-             * Since Atom 0.3 did not support categories, it would have used the
-             * Dublin Core extension. However there is a small possibility Atom 0.3
-             * may have been retrofittied to use Atom 1.0 instead.
-             */
-            $this->_xpath->registerNamespace('atom10', Zend_Feed_Reader::NAMESPACE_ATOM_10);
-            $list = $this->_xpath->query($this->getXpathPrefix() . '/atom10:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->getAttribute('term'),
-                    'scheme' => $category->getAttribute('scheme'),
-                    'label' => html_entity_decode($category->getAttribute('label'))
-                );
-            }
-        } else {
-            return new Zend_Feed_Reader_Collection_Category;
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Get an author entry in RSS format
-     *
-     * @param  DOMElement $element
-     * @return string
-     */
-    protected function _getAuthor(DOMElement $element)
-    {
-        $author = array();
-
-        $emailNode = $element->getElementsByTagName('email');
-        $nameNode  = $element->getElementsByTagName('name');
-        $uriNode   = $element->getElementsByTagName('uri');
-        
-        if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) {
-            $author['email'] = $emailNode->item(0)->nodeValue;
-        }
-
-        if ($nameNode->length && strlen($nameNode->item(0)->nodeValue) > 0) {
-            $author['name'] = $nameNode->item(0)->nodeValue;
-        }
-
-        if ($uriNode->length && strlen($uriNode->item(0)->nodeValue) > 0) {
-            $author['uri'] = $uriNode->item(0)->nodeValue;
-        }
-
-        if (empty($author)) {
-            return null;
-        }
-        return $author;
-    }
-
-    /**
-     *  Attempt to absolutise the URI, i.e. if a relative URI apply the
-     *  xml:base value as a prefix to turn into an absolute URI.
-     */
-    protected function _absolutiseUri($link)
-    {
-        if (!Zend_Uri::check($link)) {
-            if (!is_null($this->getBaseUrl())) {
-                $link = $this->getBaseUrl() . $link;
-                if (!Zend_Uri::check($link)) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    protected function _registerNamespaces()
-    {
-        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10
-            || $this->getType() == Zend_Feed_Reader::TYPE_ATOM_03
-        ) {
-            return; // pre-registered at Feed level
-        }
-        $atomDetected = $this->_getAtomType();
-        switch ($atomDetected) {
-            case Zend_Feed_Reader::TYPE_ATOM_03:
-                $this->_xpath->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_03);
-                break;
-            default:
-                $this->_xpath->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_10);
-                break;
-        }
-    }
-
-    /**
-     * Detect the presence of any Atom namespaces in use
-     */
-    protected function _getAtomType()
-    {
-        $dom = $this->getDomDocument();
-        $prefixAtom03 = $dom->lookupPrefix(Zend_Feed_Reader::NAMESPACE_ATOM_03);
-        $prefixAtom10 = $dom->lookupPrefix(Zend_Feed_Reader::NAMESPACE_ATOM_10);
-        if ($dom->isDefaultNamespace(Zend_Feed_Reader::NAMESPACE_ATOM_10)
-        || !empty($prefixAtom10)) {
-            return Zend_Feed_Reader::TYPE_ATOM_10;
-        }
-        if ($dom->isDefaultNamespace(Zend_Feed_Reader::NAMESPACE_ATOM_03)
-        || !empty($prefixAtom03)) {
-            return Zend_Feed_Reader::TYPE_ATOM_03;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Content/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Content/Entry.php
deleted file mode 100644
index c6375b224..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Content/Entry.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Entry_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Content_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-
-    public function getContent()
-    {
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-            && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $content = $this->_xpath->evaluate('string('.$this->getXpathPrefix().'/content:encoded)');
-        } else {
-            $content = $this->_xpath->evaluate('string('.$this->getXpathPrefix().'/content:encoded)');
-        }
-        if ($content) {
-            $content = html_entity_decode($content, ENT_QUOTES, $this->getEncoding());
-        }
-        return $content;
-    }
-
-    /**
-     * Register RSS Content Module namespace
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
deleted file mode 100644
index 9c8cd4da7..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_CreativeCommons_Feed
- */
-require_once 'Zend/Feed/Reader/Extension/CreativeCommons/Feed.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_CreativeCommons_Entry extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the entry license
-     *
-     * @return string|null
-     */
-    public function getLicense($index = 0)
-    {
-        $licenses = $this->getLicenses();
-
-        if (isset($licenses[$index])) {
-            return $licenses[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the entry licenses
-     *
-     * @return array
-     */
-    public function getLicenses()
-    {
-        $name = 'licenses';
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $licenses = array();
-        $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//cc:license');
-
-        if ($list->length) {
-            foreach ($list as $license) {
-                    $licenses[] = $license->nodeValue;
-            }
-
-            $licenses = array_unique($licenses);
-        } else {
-            $cc = new Zend_Feed_Reader_Extension_CreativeCommons_Feed(
-                $this->_domDocument, $this->_data['type'], $this->_xpath
-            );
-            $licenses = $cc->getLicenses();
-        }
-
-        $this->_data[$name] = $licenses;
-
-        return $this->_data[$name];
-    }
-
-    /**
-     * Register Creative Commons namespaces
-     *
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('cc', 'http://backend.userland.com/creativeCommonsRssModule');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
deleted file mode 100644
index 4b1c7a9fb..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_CreativeCommons_Feed
-    extends Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Get the entry license
-     *
-     * @return string|null
-     */
-    public function getLicense($index = 0)
-    {
-        $licenses = $this->getLicenses();
-
-        if (isset($licenses[$index])) {
-            return $licenses[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the entry licenses
-     *
-     * @return array
-     */
-    public function getLicenses()
-    {
-        $name = 'licenses';
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $licenses = array();
-        $list = $this->_xpath->evaluate('channel/cc:license');
-
-        if ($list->length) {
-            foreach ($list as $license) {
-                $licenses[] = $license->nodeValue;
-            }
-
-            $licenses = array_unique($licenses);
-        }
-
-        $this->_data[$name] = $licenses;
-
-        return $this->_data[$name];
-    }
-
-    /**
-     * Register Creative Commons namespaces
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('cc', 'http://backend.userland.com/creativeCommonsRssModule');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
deleted file mode 100644
index c20394594..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_DublinCore_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get an author entry
-     *
-     * @param DOMElement $element
-     * @return string
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $authors = array();
-        $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:creator');
-
-        if (!$list->length) {
-            $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:creator');
-        }
-        if (!$list->length) {
-            $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:publisher');
-
-            if (!$list->length) {
-                $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:publisher');
-            }
-        }
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $authors[] = array(
-                    'name' => $author->nodeValue
-                );
-            }
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        } else {
-            $authors = null;
-        }
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-    
-    /**
-     * Get categories (subjects under DC)
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-        
-        $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:subject');
-
-        if (!$list->length) {
-            $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:subject');
-        }
-        
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->nodeValue,
-                    'scheme' => null,
-                    'label' => $category->nodeValue,
-                );
-            }
-        } else {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-        }
-        
-        $this->_data['categories'] = $categoryCollection;
-        return $this->_data['categories'];  
-    }
-    
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->getDescription();
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = null;
-        $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
-
-        if (!$description) {
-            $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = null;
-        $id = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
-
-        if (!$id) {
-            $id = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = null;
-        $title = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
-
-        if (!$title) {
-            $title = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     *
-     *
-     * @return Zend_Date|null
-     */
-    public function getDate()
-    {
-        if (array_key_exists('date', $this->_data)) {
-            return $this->_data['date'];
-        }
-
-        $d    = null;
-        $date = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
-
-        if (!$date) {
-            $date = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
-        }
-
-        if ($date) {
-            $d = new Zend_Date;
-            $d->set($date, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['date'] = $d;
-
-        return $this->_data['date'];
-    }
-
-    /**
-     * Register DC namespaces
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
-        $this->_xpath->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
deleted file mode 100644
index 5b7816f54..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Feed_Reader_Collection_Author
- */
-require_once 'Zend/Feed/Reader/Collection/Author.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_DublinCore_Feed
-    extends Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $authors = array();
-        $list    = $this->_xpath->query('//dc11:creator');
-
-        if (!$list->length) {
-            $list = $this->_xpath->query('//dc10:creator');
-        }
-        if (!$list->length) {
-            $list = $this->_xpath->query('//dc11:publisher');
-
-            if (!$list->length) {
-                $list = $this->_xpath->query('//dc10:publisher');
-            }
-        }
-        
-        if ($list->length) {
-            foreach ($list as $author) {
-                $authors[] = array(
-                    'name' => $author->nodeValue
-                );
-            }
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        } else {
-            $authors = null;
-        }
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->_data)) {
-            return $this->_data['copyright'];
-        }
-
-        $copyright = null;
-        $copyright = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');
-
-        if (!$copyright) {
-            $copyright = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:rights)');
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->_data['copyright'] = $copyright;
-
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = null;
-        $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
-
-        if (!$description) {
-            $description = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = null;
-        $id = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
-
-        if (!$id) {
-            $id = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->_data)) {
-            return $this->_data['language'];
-        }
-
-        $language = null;
-        $language = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');
-
-        if (!$language) {
-            $language = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:language)');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->_data['language'] = $language;
-
-        return $this->_data['language'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = null;
-        $title = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
-
-        if (!$title) {
-            $title = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     *
-     *
-     * @return Zend_Date|null
-     */
-    public function getDate()
-    {
-        if (array_key_exists('date', $this->_data)) {
-            return $this->_data['date'];
-        }
-
-        $d = null;
-        $date = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
-
-        if (!$date) {
-            $date = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
-        }
-
-        if ($date) {
-            $d = new Zend_Date;
-            $d->set($date, Zend_Date::ISO_8601);
-        }
-
-        $this->_data['date'] = $d;
-
-        return $this->_data['date'];
-    }
-    
-    /**
-     * Get categories (subjects under DC)
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-        
-        $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc11:subject');
-
-        if (!$list->length) {
-            $list = $this->_xpath->evaluate($this->getXpathPrefix() . '//dc10:subject');
-        }
-        
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->nodeValue,
-                    'scheme' => null,
-                    'label' => $category->nodeValue,
-                );
-            }
-        } else {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-        }
-        
-        $this->_data['categories'] = $categoryCollection;
-        return $this->_data['categories'];  
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
-        $this->_xpath->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/EntryAbstract.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/EntryAbstract.php
deleted file mode 100644
index 299c1bfba..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/EntryAbstract.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Feed entry data
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * DOM document object
-     *
-     * @var DOMDocument
-     */
-    protected $_domDocument = null;
-
-    /**
-     * Entry instance
-     *
-     * @var Zend_Feed_Entry_Abstract
-     */
-    protected $_entry = null;
-
-    /**
-     * Pointer to the current entry
-     *
-     * @var int
-     */
-    protected $_entryKey = 0;
-
-    /**
-     * XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath = null;
-
-    /**
-     * XPath query
-     *
-     * @var string
-     */
-    protected $_xpathPrefix = '';
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Feed_Entry_Abstract $entry
-     * @param  int $entryKey
-     * @param  string $type
-     * @return void
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        $this->_entry       = $entry;
-        $this->_entryKey    = $entryKey;
-        $this->_domDocument = $entry->ownerDocument;
-
-        if (!is_null($type)) {
-            $this->_data['type'] = $type;
-        } else {
-            $this->_data['type'] = Zend_Feed_Reader::detectType($entry->ownerDocument, true);
-        }
-        // set the XPath query prefix for the entry being queried
-        if ($this->getType() == Zend_Feed_Reader::TYPE_RSS_10
-            || $this->getType() == Zend_Feed_Reader::TYPE_RSS_090
-        ) {
-            $this->setXpathPrefix('//rss:item[' . ($this->_entryKey+1) . ']');
-        } elseif ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10
-                  || $this->getType() == Zend_Feed_Reader::TYPE_ATOM_03
-        ) {
-            $this->setXpathPrefix('//atom:entry[' . ($this->_entryKey+1) . ']');
-        } else {
-            $this->setXpathPrefix('//item[' . ($this->_entryKey+1) . ']');
-        }
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->_domDocument;
-    }
-
-    /**
-     * Get the Entry's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        return $assumed;
-    }
-
-    /**
-     * Get the entry type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_data['type'];
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return Zend_Feed_Reader_Extension_EntryAbstract
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->_xpath = $xpath;
-        $this->_registerNamespaces();
-        return $this;
-    }
-
-    /**
-     * Get the XPath query object
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        if (!$this->_xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-        return $this->_xpath;
-    }
-
-    /**
-     * Serialize the entry to an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Get the XPath prefix
-     *
-     * @return string
-     */
-    public function getXpathPrefix()
-    {
-        return $this->_xpathPrefix;
-    }
-
-    /**
-     * Set the XPath prefix
-     *
-     * @param  string $prefix
-     * @return Zend_Feed_Reader_Extension_EntryAbstract
-     */
-    public function setXpathPrefix($prefix)
-    {
-        $this->_xpathPrefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * Register XML namespaces
-     *
-     * @return void
-     */
-    protected abstract function _registerNamespaces();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/FeedAbstract.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/FeedAbstract.php
deleted file mode 100644
index 73aa8c90e..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/FeedAbstract.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Entry_Atom
- */
-require_once 'Zend/Feed/Reader/Entry/Atom.php';
-
-
-/**
- * @see Zend_Feed_Reader_Entry_Rss
- */
-require_once 'Zend/Feed/Reader/Entry/Rss.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Parsed feed data
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * Parsed feed data in the shape of a DOMDocument
-     *
-     * @var DOMDocument
-     */
-    protected $_domDocument = null;
-
-    /**
-     * The base XPath query used to retrieve feed data
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath = null;
-
-    /**
-     * The XPath prefix
-     *
-     * @var string
-     */
-    protected $_xpathPrefix = '';
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Feed_Abstract $feed The source Zend_Feed object
-     * @param  string $type Feed type
-     * @return void
-     */
-    public function __construct(DomDocument $dom, $type = null, DOMXPath $xpath = null)
-    {
-        $this->_domDocument = $dom;
-
-        if ($type !== null) {
-            $this->_data['type'] = $type;
-        } else {
-            $this->_data['type'] = Zend_Feed_Reader::detectType($dom);
-        }
-
-        if ($xpath !== null) {
-            $this->_xpath = $xpath;
-        } else {
-            $this->_xpath = new DOMXPath($this->_domDocument);
-        }
-
-        $this->_registerNamespaces();
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->_domDocument;
-    }
-
-    /**
-     * Get the Feed's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        return $assumed;
-    }
-
-    /**
-     * Get the feed type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_data['type'];
-    }
-
-
-    /**
-     * Return the feed as an array
-     *
-     * @return array
-     */
-    public function toArray() // untested
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return Zend_Feed_Reader_Extension_EntryAbstract
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->_xpath = $xpath;
-        $this->_registerNamespaces();
-        return $this;
-    }
-
-    /**
-     * Get the DOMXPath object
-     *
-     * @return string
-     */
-    public function getXpath()
-    {
-        return $this->_xpath;
-    }
-
-    /**
-     * Get the XPath prefix
-     *
-     * @return string
-     */
-    public function getXpathPrefix()
-    {
-        return $this->_xpathPrefix;
-    }
-
-    /**
-     * Set the XPath prefix
-     *
-     * @return Zend_Feed_Reader_Feed_Atom
-     */
-    public function setXpathPrefix($prefix)
-    {
-        $this->_xpathPrefix = $prefix;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    abstract protected function _registerNamespaces();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
deleted file mode 100644
index eeffed2b1..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Podcast_Entry extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the entry author
-     *
-     * @return string
-     */
-    public function getCastAuthor()
-    {
-        if (isset($this->_data['author'])) {
-            return $this->_data['author'];
-        }
-
-        $author = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
-
-        if (!$author) {
-            $author = null;
-        }
-
-        $this->_data['author'] = $author;
-
-        return $this->_data['author'];
-    }
-
-    /**
-     * Get the entry block
-     *
-     * @return string
-     */
-    public function getBlock()
-    {
-        if (isset($this->_data['block'])) {
-            return $this->_data['block'];
-        }
-
-        $block = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
-
-        if (!$block) {
-            $block = null;
-        }
-
-        $this->_data['block'] = $block;
-
-        return $this->_data['block'];
-    }
-
-    /**
-     * Get the entry duration
-     *
-     * @return string
-     */
-    public function getDuration()
-    {
-        if (isset($this->_data['duration'])) {
-            return $this->_data['duration'];
-        }
-
-        $duration = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:duration)');
-
-        if (!$duration) {
-            $duration = null;
-        }
-
-        $this->_data['duration'] = $duration;
-
-        return $this->_data['duration'];
-    }
-
-    /**
-     * Get the entry explicit
-     *
-     * @return string
-     */
-    public function getExplicit()
-    {
-        if (isset($this->_data['explicit'])) {
-            return $this->_data['explicit'];
-        }
-
-        $explicit = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
-
-        if (!$explicit) {
-            $explicit = null;
-        }
-
-        $this->_data['explicit'] = $explicit;
-
-        return $this->_data['explicit'];
-    }
-
-    /**
-     * Get the entry keywords
-     *
-     * @return string
-     */
-    public function getKeywords()
-    {
-        if (isset($this->_data['keywords'])) {
-            return $this->_data['keywords'];
-        }
-
-        $keywords = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
-
-        if (!$keywords) {
-            $keywords = null;
-        }
-
-        $this->_data['keywords'] = $keywords;
-
-        return $this->_data['keywords'];
-    }
-
-    /**
-     * Get the entry subtitle
-     *
-     * @return string
-     */
-    public function getSubtitle()
-    {
-        if (isset($this->_data['subtitle'])) {
-            return $this->_data['subtitle'];
-        }
-
-        $subtitle = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
-
-        if (!$subtitle) {
-            $subtitle = null;
-        }
-
-        $this->_data['subtitle'] = $subtitle;
-
-        return $this->_data['subtitle'];
-    }
-
-    /**
-     * Get the entry summary
-     *
-     * @return string
-     */
-    public function getSummary()
-    {
-        if (isset($this->_data['summary'])) {
-            return $this->_data['summary'];
-        }
-
-        $summary = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
-
-        if (!$summary) {
-            $summary = null;
-        }
-
-        $this->_data['summary'] = $summary;
-
-        return $this->_data['summary'];
-    }
-
-    /**
-     * Register iTunes namespace
-     *
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Feed.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
deleted file mode 100644
index 01a5a191d..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Podcast_Feed extends Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Get the entry author
-     *
-     * @return string
-     */
-    public function getCastAuthor()
-    {
-        if (isset($this->_data['author'])) {
-            return $this->_data['author'];
-        }
-
-        $author = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
-
-        if (!$author) {
-            $author = null;
-        }
-
-        $this->_data['author'] = $author;
-
-        return $this->_data['author'];
-    }
-
-    /**
-     * Get the entry block
-     *
-     * @return string
-     */
-    public function getBlock()
-    {
-        if (isset($this->_data['block'])) {
-            return $this->_data['block'];
-        }
-
-        $block = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
-
-        if (!$block) {
-            $block = null;
-        }
-
-        $this->_data['block'] = $block;
-
-        return $this->_data['block'];
-    }
-
-    /**
-     * Get the entry category
-     *
-     * @return string
-     */
-    public function getCategories()
-    {
-        if (isset($this->_data['categories'])) {
-            return $this->_data['categories'];
-        }
-
-        $categoryList = $this->_xpath->query($this->getXpathPrefix() . '/itunes:category');
-
-        $categories = array();
-
-        if ($categoryList->length > 0) {
-            foreach ($categoryList as $node) {
-                $children = null;
-
-                if ($node->childNodes->length > 0) {
-                    $children = array();
-
-                    foreach ($node->childNodes as $childNode) {
-                        if (!($childNode instanceof DOMText)) {
-                            $children[$childNode->getAttribute('text')] = null;
-                        }
-                    }
-                }
-
-                $categories[$node->getAttribute('text')] = $children;
-            }
-        }
-
-
-        if (!$categories) {
-            $categories = null;
-        }
-
-        $this->_data['categories'] = $categories;
-
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Get the entry explicit
-     *
-     * @return string
-     */
-    public function getExplicit()
-    {
-        if (isset($this->_data['explicit'])) {
-            return $this->_data['explicit'];
-        }
-
-        $explicit = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
-
-        if (!$explicit) {
-            $explicit = null;
-        }
-
-        $this->_data['explicit'] = $explicit;
-
-        return $this->_data['explicit'];
-    }
-
-    /**
-     * Get the entry image
-     *
-     * @return string
-     */
-    public function getImage()
-    {
-        if (isset($this->_data['image'])) {
-            return $this->_data['image'];
-        }
-
-        $image = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:image/@href)');
-
-        if (!$image) {
-            $image = null;
-        }
-
-        $this->_data['image'] = $image;
-
-        return $this->_data['image'];
-    }
-
-    /**
-     * Get the entry keywords
-     *
-     * @return string
-     */
-    public function getKeywords()
-    {
-        if (isset($this->_data['keywords'])) {
-            return $this->_data['keywords'];
-        }
-
-        $keywords = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
-
-        if (!$keywords) {
-            $keywords = null;
-        }
-
-        $this->_data['keywords'] = $keywords;
-
-        return $this->_data['keywords'];
-    }
-
-    /**
-     * Get the entry's new feed url
-     *
-     * @return string
-     */
-    public function getNewFeedUrl()
-    {
-        if (isset($this->_data['new-feed-url'])) {
-            return $this->_data['new-feed-url'];
-        }
-
-        $newFeedUrl = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:new-feed-url)');
-
-        if (!$newFeedUrl) {
-            $newFeedUrl = null;
-        }
-
-        $this->_data['new-feed-url'] = $newFeedUrl;
-
-        return $this->_data['new-feed-url'];
-    }
-
-    /**
-     * Get the entry owner
-     *
-     * @return string
-     */
-    public function getOwner()
-    {
-        if (isset($this->_data['owner'])) {
-            return $this->_data['owner'];
-        }
-
-        $owner = null;
-
-        $email = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:email)');
-        $name  = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:name)');
-
-        if (!empty($email)) {
-            $owner = $email . (empty($name) ? '' : ' (' . $name . ')');
-        } else if (!empty($name)) {
-            $owner = $name;
-        }
-
-        if (!$owner) {
-            $owner = null;
-        }
-
-        $this->_data['owner'] = $owner;
-
-        return $this->_data['owner'];
-    }
-
-    /**
-     * Get the entry subtitle
-     *
-     * @return string
-     */
-    public function getSubtitle()
-    {
-        if (isset($this->_data['subtitle'])) {
-            return $this->_data['subtitle'];
-        }
-
-        $subtitle = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
-
-        if (!$subtitle) {
-            $subtitle = null;
-        }
-
-        $this->_data['subtitle'] = $subtitle;
-
-        return $this->_data['subtitle'];
-    }
-
-    /**
-     * Get the entry summary
-     *
-     * @return string
-     */
-    public function getSummary()
-    {
-        if (isset($this->_data['summary'])) {
-            return $this->_data['summary'];
-        }
-
-        $summary = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
-
-        if (!$summary) {
-            $summary = null;
-        }
-
-        $this->_data['summary'] = $summary;
-
-        return $this->_data['summary'];
-    }
-
-    /**
-     * Register iTunes namespace
-     *
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Slash/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Slash/Entry.php
deleted file mode 100644
index c5f259fb3..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Slash/Entry.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Slash_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the entry section
-     *
-     * @return string|null
-     */
-    public function getSection()
-    {
-        return $this->_getData('section');
-    }
-
-    /**
-     * Get the entry department
-     *
-     * @return string|null
-     */
-    public function getDepartment()
-    {
-        return $this->_getData('department');
-    }
-
-    /**
-     * Get the entry hit_parade
-     *
-     * @return array
-     */
-    public function getHitParade()
-    {
-        $name = 'hit_parade';
-
-        if (isset($this->_data[$name])) {
-            return $this->_data[$name];
-        }
-
-        $stringParade = $this->_getData($name);
-        $hitParade    = array();
-
-        if (!empty($stringParade)) {
-            $stringParade = explode(',', $stringParade);
-
-            foreach ($stringParade as $hit)
-                $hitParade[] = $hit + 0; //cast to integer
-        }
-
-        $this->_data[$name] = $hitParade;
-        return $hitParade;
-    }
-
-    /**
-     * Get the entry comments
-     *
-     * @return int
-     */
-    public function getCommentCount()
-    {
-        $name = 'comments';
-
-        if (isset($this->_data[$name])) {
-            return $this->_data[$name];
-        }
-
-        $comments = $this->_getData($name, 'string');
-
-        if (!$comments) {
-            $this->_data[$name] = null;
-            return $this->_data[$name];
-        }
-
-        return $comments;
-    }
-
-    /**
-     * Get the entry data specified by name
-     * @param string $name
-     * @param string $type
-     *
-     * @return mixed|null
-     */
-    protected function _getData($name, $type = 'string')
-    {
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $data = $this->_xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/slash10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->_data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Slash namespaces
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('slash10', 'http://purl.org/rss/1.0/modules/slash/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
deleted file mode 100644
index 910448652..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php';
-
-require_once 'Zend/Date.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Syndication_Feed
-    extends Zend_Feed_Reader_Extension_FeedAbstract
-{
-    /**
-     * Get update period
-     * @return string
-     */
-    public function getUpdatePeriod()
-    {
-        $name = 'updatePeriod';
-        $period = $this->_getData($name);
-
-        if ($period === null) {
-            $this->_data[$name] = 'daily';
-            return 'daily'; //Default specified by spec
-        }
-
-        switch ($period)
-        {
-            case 'hourly':
-            case 'daily':
-            case 'weekly':
-            case 'yearly':
-                return $period;
-            default:
-                throw new Zend_Feed_Exception("Feed specified invalid update period: '$period'."
-                    .  " Must be one of hourly, daily, weekly or yearly"
-                );
-        }
-    }
-
-    /**
-     * Get update frequency
-     * @return int
-     */
-    public function getUpdateFrequency()
-    {
-        $name = 'updateFrequency';
-        $freq = $this->_getData($name, 'number');
-
-        if (!$freq || $freq < 1) {
-            $this->_data[$name] = 1;
-            return 1;
-        }
-
-        return $freq;
-    }
-
-    /**
-     * Get update frequency as ticks
-     * @return int
-     */
-    public function getUpdateFrequencyAsTicks()
-    {
-        $name = 'updateFrequency';
-        $freq = $this->_getData($name, 'number');
-
-        if (!$freq || $freq < 1) {
-            $this->_data[$name] = 1;
-            $freq = 1;
-        }
-
-        $period = $this->getUpdatePeriod();
-        $ticks = 1;
-
-        switch ($period)
-        {
-            //intentional fall through
-            case 'yearly':
-                $ticks *= 52; //TODO: fix generalisation, how?
-            case 'weekly':
-                $ticks *= 7;
-            case 'daily':
-                $ticks *= 24;
-            case 'hourly':
-                $ticks *= 3600;
-                break;
-            default: //Never arrive here, exception thrown in getPeriod()
-                break;
-        }
-
-        return $ticks / $freq;
-    }
-
-    /**
-     * Get update base
-     *
-     * @return Zend_Date|null
-     */
-    public function getUpdateBase()
-    {
-        $updateBase = $this->_getData('updateBase');
-        $date = null;
-        if ($updateBase) {
-            $date = new Zend_Date;
-            $date->set($updateBase, Zend_Date::W3C);
-        }
-        return $date;
-    }
-
-    /**
-     * Get the entry data specified by name
-     *
-     * @param string $name
-     * @param string $type
-     * @return mixed|null
-     */
-    private function _getData($name, $type = 'string')
-    {
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $data = $this->_xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/syn10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->_data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Syndication namespaces
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('syn10', 'http://purl.org/rss/1.0/modules/syndication/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/Thread/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/Thread/Entry.php
deleted file mode 100644
index 7b397de76..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/Thread/Entry.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_Thread_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the "in-reply-to" value
-     *
-     * @return string
-     */
-    public function getInReplyTo()
-    {
-        // TODO: to be implemented
-    }
-
-    // TODO: Implement "replies" and "updated" constructs from standard
-
-    /**
-     * Get the total number of threaded responses (i.e comments)
-     *
-     * @return int|null
-     */
-    public function getCommentCount()
-    {
-        return $this->_getData('total');
-    }
-
-    /**
-     * Get the entry data specified by name
-     *
-     * @param  string $name
-     * @param  string $type
-     * @return mixed|null
-     */
-    protected function _getData($name)
-    {
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $data = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/thread10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->_data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Atom Thread Extension 1.0 namespace
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('thread10', 'http://purl.org/syndication/thread/1.0');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/airtime_mvc/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
deleted file mode 100644
index 24832fee6..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_EntryAbstract
- */
-require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Extension_WellFormedWeb_Entry
-    extends Zend_Feed_Reader_Extension_EntryAbstract
-{
-    /**
-     * Get the entry comment Uri
-     *
-     * @return string|null
-     */
-    public function getCommentFeedLink()
-    {
-        $name = 'commentRss';
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        }
-
-        $data = $this->_xpath->evaluate('string(' . $this->getXpathPrefix() . '/wfw:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->_data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Slash namespaces
-     *
-     * @return void
-     */
-    protected function _registerNamespaces()
-    {
-        $this->_xpath->registerNamespace('wfw', 'http://wellformedweb.org/CommentAPI/');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom.php b/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom.php
deleted file mode 100644
index fb1e53e21..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/FeedAbstract.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_Atom_Feed
- */
-require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Feed_Atom extends Zend_Feed_Reader_FeedAbstract
-{
-
-    /**
-     * Constructor
-     *
-     * @param  DOMDocument $dom
-     * @param  string $type
-     */
-    public function __construct(DOMDocument $dom, $type = null)
-    {
-        parent::__construct($dom, $type);
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Feed');
-        $this->_extensions['Atom_Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed');
-        $this->_extensions['DublinCore_Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
-        foreach ($this->_extensions as $extension) {
-            $extension->setXpathPrefix('/atom:feed');
-        }
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-
-        $authors = $this->getExtension('Atom')->getAuthors();
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->_data)) {
-            return $this->_data['copyright'];
-        }
-
-        $copyright = $this->getExtension('Atom')->getCopyright();
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->_data['copyright'] = $copyright;
-
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->_data)) {
-            return $this->_data['datecreated'];
-        }
-
-        $dateCreated = $this->getExtension('Atom')->getDateCreated();
-
-        if (!$dateCreated) {
-            $dateCreated = null;
-        }
-
-        $this->_data['datecreated'] = $dateCreated;
-
-        return $this->_data['datecreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $dateModified = $this->getExtension('Atom')->getDateModified();
-
-        if (!$dateModified) {
-            $dateModified = null;
-        }
-
-        $this->_data['datemodified'] = $dateModified;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = $this->getExtension('Atom')->getDescription();
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->_data)) {
-            return $this->_data['generator'];
-        }
-
-        $generator = $this->getExtension('Atom')->getGenerator();
-
-        $this->_data['generator'] = $generator;
-
-        return $this->_data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = $this->getExtension('Atom')->getId();
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->_data)) {
-            return $this->_data['language'];
-        }
-
-        $language = $this->getExtension('Atom')->getLanguage();
-
-        if (!$language) {
-            $language = $this->_xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->_data['language'] = $language;
-
-        return $this->_data['language'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->_data)) {
-            return $this->_data['baseUrl'];
-        }
-
-        $baseUrl = $this->getExtension('Atom')->getBaseUrl();
-
-        $this->_data['baseUrl'] = $baseUrl;
-
-        return $this->_data['baseUrl'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->_data)) {
-            return $this->_data['link'];
-        }
-
-        $link = $this->getExtension('Atom')->getLink();
-
-        $this->_data['link'] = $link;
-
-        return $this->_data['link'];
-    }
-
-    /**
-     * Get a link to the feed's XML Url
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->_data)) {
-            return $this->_data['feedlink'];
-        }
-
-        $link = $this->getExtension('Atom')->getFeedLink();
-
-        $this->_data['feedlink'] = $link;
-
-        return $this->_data['feedlink'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = $this->getExtension('Atom')->getTitle();
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->_data)) {
-            return $this->_data['hubs'];
-        }
-
-        $hubs = $this->getExtension('Atom')->getHubs();
-
-        $this->_data['hubs'] = $hubs;
-
-        return $this->_data['hubs'];
-    }
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        $categoryCollection = $this->getExtension('Atom')->getCategories();
-        
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     * @return void
-     */
-    protected function _indexEntries()
-    {
-        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10 ||
-            $this->getType() == Zend_Feed_Reader::TYPE_ATOM_03) {
-            $entries = array();
-            $entries = $this->_xpath->evaluate('//atom:entry');
-
-            foreach($entries as $index=>$entry) {
-                $this->_entries[$index] = $entry;
-            }
-        }
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    protected function _registerNamespaces()
-    {
-        switch ($this->_data['type']) {
-            case Zend_Feed_Reader::TYPE_ATOM_03:
-                $this->_xpath->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_03);
-                break;
-            case Zend_Feed_Reader::TYPE_ATOM_10:
-            default:
-                $this->_xpath->registerNamespace('atom', Zend_Feed_Reader::NAMESPACE_ATOM_10);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom/Source.php b/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom/Source.php
deleted file mode 100644
index 8d5fe0c94..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Feed/Atom/Source.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 19165 2009-11-21 16:46:40Z padraic $
- */
-
-/**
- * @see Zend_Feed_Reader_Feed_Atom
- */
-require_once 'Zend/Feed/Reader/Feed/Atom.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Feed_Atom_Source extends Zend_Feed_Reader_Feed_Atom
-{
-
-    /**
-     * Constructor: Create a Source object which is largely just a normal
-     * Zend_Feed_Reader_FeedAbstract object only designed to retrieve feed level
-     * metadata from an Atom entry's source element.
-     *
-     * @param DOMElement $source
-     * @param string $xpathPrefix Passed from parent Entry object
-     * @param string $type Nearly always Atom 1.0
-     */
-    public function __construct(DOMElement $source, $xpathPrefix, $type = Zend_Feed_Reader::TYPE_ATOM_10)
-    {
-        $this->_domDocument = $source->ownerDocument;
-        $this->_xpath = new DOMXPath($this->_domDocument);
-        $this->_data['type'] = $type;
-        $this->_registerNamespaces();
-        $this->_loadExtensions();
-        
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Feed');
-        $this->_extensions['Atom_Feed'] = new $atomClass($this->_domDocument, $this->_data['type'], $this->_xpath);
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed');
-        $this->_extensions['DublinCore_Feed'] = new $atomClass($this->_domDocument, $this->_data['type'], $this->_xpath);
-        foreach ($this->_extensions as $extension) {
-            $extension->setXpathPrefix(rtrim($xpathPrefix, '/') . '/atom:source');
-        }
-    }
-    
-    /**
-     * Since this is not an Entry carrier but a vehicle for Feed metadata, any
-     * applicable Entry methods are stubbed out and do nothing.
-     */
-     
-    /**
-     * @return void
-     */
-    public function count() {}
-
-    /**
-     * @return void
-     */
-    public function current() {}
-    
-    /**
-     * @return void
-     */
-    public function key() {}
-
-    /**
-     * @return void
-     */
-    public function next() {}
-
-    /**
-     * @return void
-     */
-    public function rewind() {}
-    
-    /**
-     * @return void
-     */
-    public function valid() {}
-    
-    /**
-     * @return void
-     */
-    protected function _indexEntries() {}
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/Feed/Rss.php b/airtime_mvc/library/Zend/Feed/Reader/Feed/Rss.php
deleted file mode 100644
index dcb619260..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/Feed/Rss.php
+++ /dev/null
@@ -1,623 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader_FeedAbstract
- */
-require_once 'Zend/Feed/Reader/FeedAbstract.php';
-
-/**
- * @see Zend_feed_Reader_Extension_Atom_Feed
- */
-require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php';
-
-/**
- * @see Zend_Feed_Reader_Extension_DublinCore_Feed
- */
-require_once 'Zend/Feed/Reader/Extension/DublinCore/Feed.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Feed_Reader_Collection_Author
- */
-require_once 'Zend/Feed/Reader/Collection/Author.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_FeedAbstract
-{
-
-    /**
-     * Constructor
-     *
-     * @param  DOMDocument $dom
-     * @param  string $type
-     */
-    public function __construct(DomDocument $dom, $type = null)
-    {
-        parent::__construct($dom, $type);
-
-        $dublinCoreClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed');
-        $this->_extensions['DublinCore_Feed'] = new $dublinCoreClass($dom, $this->_data['type'], $this->_xpath);
-        $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('Atom_Feed');
-        $this->_extensions['Atom_Feed'] = new $atomClass($dom, $this->_data['type'], $this->_xpath);
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $xpathPrefix = '/rss/channel';
-        } else {
-            $xpathPrefix = '/rdf:RDF/rss:channel';
-        }
-        foreach ($this->_extensions as $extension) {
-            $extension->setXpathPrefix($xpathPrefix);
-        }
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->_data)) {
-            return $this->_data['authors'];
-        }
-        
-        $authors = array();
-        $authors_dc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authors_dc)) {
-            foreach ($authors_dc as $author) {
-                $authors[] = array(
-                    'name' => $author['name']
-                );
-            }
-        }
-
-        /**
-         * Technically RSS doesn't specific author element use at the feed level
-         * but it's supported on a "just in case" basis.
-         */
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10
-        && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $list = $this->_xpath->query('//author');
-        } else {
-            $list = $this->_xpath->query('//rss:author');
-        }
-        if ($list->length) {
-            foreach ($list as $author) {
-                $string = trim($author->nodeValue);
-                $email = null;
-                $name = null;
-                $data = array();
-                // Pretty rough parsing - but it's a catchall
-                if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
-                    $data['email'] = trim($matches[0]);
-                    if (preg_match("/\((.*)\)$/", $string, $matches)) {
-                        $data['name'] = $matches[1];
-                    }
-                    $authors[] = $data;
-                } 
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = $this->getExtension('Atom')->getAuthors();
-        } else {
-            $authors = new Zend_Feed_Reader_Collection_Author(
-                Zend_Feed_Reader::arrayUnique($authors)
-            );
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        }
-
-        $this->_data['authors'] = $authors;
-
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->_data)) {
-            return $this->_data['copyright'];
-        }
-
-        $copyright = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $copyright = $this->_xpath->evaluate('string(/rss/channel/copyright)');
-        }
-
-        if (!$copyright && !is_null($this->getExtension('DublinCore'))) {
-            $copyright = $this->getExtension('DublinCore')->getCopyright();
-        }
-
-        if (empty($copyright)) {
-            $copyright = $this->getExtension('Atom')->getCopyright();
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->_data['copyright'] = $copyright;
-
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        return $this->getDateModified();
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return Zend_Date
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->_data)) {
-            return $this->_data['datemodified'];
-        }
-
-        $dateModified = null;
-        $date = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $dateModified = $this->_xpath->evaluate('string(/rss/channel/pubDate)');
-            if (!$dateModified) {
-                $dateModified = $this->_xpath->evaluate('string(/rss/channel/lastBuildDate)');
-            }
-            if ($dateModified) {
-                $dateStandards = array(Zend_Date::RSS, Zend_Date::RFC_822,
-                Zend_Date::RFC_2822, Zend_Date::DATES);
-                $date = new Zend_Date;
-                foreach ($dateStandards as $standard) {
-                    try {
-                        $date->set($dateModified, $standard);
-                        break;
-                    } catch (Zend_Date_Exception $e) {
-                        if ($standard == Zend_Date::DATES) {
-                            require_once 'Zend/Feed/Exception.php';
-                            throw new Zend_Feed_Exception(
-                                'Could not load date due to unrecognised'
-                                .' format (should follow RFC 822 or 2822):'
-                                . $e->getMessage(),
-                                0, $e
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('DublinCore')->getDate();
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('Atom')->getDateModified();
-        }
-
-        if (!$date) {
-            $date = null;
-        }
-
-        $this->_data['datemodified'] = $date;
-
-        return $this->_data['datemodified'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->_data)) {
-            return $this->_data['description'];
-        }
-
-        $description = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $description = $this->_xpath->evaluate('string(/rss/channel/description)');
-        } else {
-            $description = $this->_xpath->evaluate('string(/rdf:RDF/rss:channel/rss:description)');
-        }
-
-        if (!$description && !is_null($this->getExtension('DublinCore'))) {
-            $description = $this->getExtension('DublinCore')->getDescription();
-        }
-
-        if (empty($description)) {
-            $description = $this->getExtension('Atom')->getDescription();
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->_data['description'] = $description;
-
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->_data)) {
-            return $this->_data['id'];
-        }
-
-        $id = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $id = $this->_xpath->evaluate('string(/rss/channel/guid)');
-        }
-
-        if (!$id && !is_null($this->getExtension('DublinCore'))) {
-            $id = $this->getExtension('DublinCore')->getId();
-        }
-
-        if (empty($id)) {
-            $id = $this->getExtension('Atom')->getId();
-        }
-
-        if (!$id) {
-            if ($this->getLink()) {
-                $id = $this->getLink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->_data['id'] = $id;
-
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->_data)) {
-            return $this->_data['language'];
-        }
-
-        $language = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $language = $this->_xpath->evaluate('string(/rss/channel/language)');
-        }
-
-        if (!$language && !is_null($this->getExtension('DublinCore'))) {
-            $language = $this->getExtension('DublinCore')->getLanguage();
-        }
-
-        if (empty($language)) {
-            $language = $this->getExtension('Atom')->getLanguage();
-        }
-
-        if (!$language) {
-            $language = $this->_xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->_data['language'] = $language;
-
-        return $this->_data['language'];
-    }
-
-    /**
-     * Get a link to the feed
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->_data)) {
-            return $this->_data['link'];
-        }
-
-        $link = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $link = $this->_xpath->evaluate('string(/rss/channel/link)');
-        } else {
-            $link = $this->_xpath->evaluate('string(/rdf:RDF/rss:channel/rss:link)');
-        }
-
-        if (empty($link)) {
-            $link = $this->getExtension('Atom')->getLink();
-        }
-
-        if (!$link) {
-            $link = null;
-        }
-
-        $this->_data['link'] = $link;
-
-        return $this->_data['link'];
-    }
-
-    /**
-     * Get a link to the feed XML
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->_data)) {
-            return $this->_data['feedlink'];
-        }
-
-        $link = null;
-
-        $link = $this->getExtension('Atom')->getFeedLink();
-
-        if (!$link) {
-            $link = null;
-        }
-
-        $this->_data['feedlink'] = $link;
-
-        return $this->_data['feedlink'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->_data)) {
-            return $this->_data['generator'];
-        }
-
-        $generator = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $generator = $this->_xpath->evaluate('string(/rss/channel/generator)');
-        }
-
-        if (!$generator) {
-            if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-                $generator = $this->_xpath->evaluate('string(/rss/channel/atom:generator)');
-            } else {
-                $generator = $this->_xpath->evaluate('string(/rdf:RDF/rss:channel/atom:generator)');
-            }
-            if ($generator) {
-                $generator = html_entity_decode($generator, ENT_QUOTES, $this->getEncoding());
-            }
-        }
-
-        if (empty($generator)) {
-            $generator = $this->getExtension('Atom')->getGenerator();
-        }
-
-        if (!$generator) {
-            $generator = null;
-        }
-
-        $this->_data['generator'] = $generator;
-
-        return $this->_data['generator'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_data)) {
-            return $this->_data['title'];
-        }
-
-        $title = null;
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $title = $this->_xpath->evaluate('string(/rss/channel/title)');
-        } else {
-            $title = $this->_xpath->evaluate('string(/rdf:RDF/rss:channel/rss:title)');
-        }
-
-        if (!$title && !is_null($this->getExtension('DublinCore'))) {
-            $title = $this->getExtension('DublinCore')->getTitle();
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('Atom')->getTitle();
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->_data['title'] = $title;
-
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->_data)) {
-            return $this->_data['hubs'];
-        }
-
-        $hubs = $this->getExtension('Atom')->getHubs();
-
-        if (empty($hubs)) {
-            $hubs = null;
-        } else {
-            $hubs = array_unique($hubs);
-        }
-
-        $this->_data['hubs'] = $hubs;
-
-        return $this->_data['hubs'];
-    }
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->_data)) {
-            return $this->_data['categories'];
-        }
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 &&
-            $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $list = $this->_xpath->query('/rss/channel//category');
-        } else {
-            $list = $this->_xpath->query('/rdf:RDF/rss:channel//rss:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Zend_Feed_Reader_Collection_Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = array(
-                    'term' => $category->nodeValue,
-                    'scheme' => $category->getAttribute('domain'),
-                    'label' => $category->nodeValue,
-                );
-            }
-        } else {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-        
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('Atom')->getCategories();
-        }
-
-        $this->_data['categories'] = $categoryCollection;
-
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     */
-    protected function _indexEntries()
-    {
-        $entries = array();
-
-        if ($this->getType() !== Zend_Feed_Reader::TYPE_RSS_10 && $this->getType() !== Zend_Feed_Reader::TYPE_RSS_090) {
-            $entries = $this->_xpath->evaluate('//item');
-        } else {
-            $entries = $this->_xpath->evaluate('//rss:item');
-        }
-
-        foreach($entries as $index=>$entry) {
-            $this->_entries[$index] = $entry;
-        }
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    protected function _registerNamespaces()
-    {
-        switch ($this->_data['type']) {
-            case Zend_Feed_Reader::TYPE_RSS_10:
-                $this->_xpath->registerNamespace('rdf', Zend_Feed_Reader::NAMESPACE_RDF);
-                $this->_xpath->registerNamespace('rss', Zend_Feed_Reader::NAMESPACE_RSS_10);
-                break;
-
-            case Zend_Feed_Reader::TYPE_RSS_090:
-                $this->_xpath->registerNamespace('rdf', Zend_Feed_Reader::NAMESPACE_RDF);
-                $this->_xpath->registerNamespace('rss', Zend_Feed_Reader::NAMESPACE_RSS_090);
-                break;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/FeedAbstract.php b/airtime_mvc/library/Zend/Feed/Reader/FeedAbstract.php
deleted file mode 100644
index 6ec899a72..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/FeedAbstract.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_feed_Reader_FeedInterface
- */
-require_once 'Zend/Feed/Reader/FeedInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Reader_FeedAbstract implements Zend_Feed_Reader_FeedInterface
-{
-    /**
-     * Parsed feed data
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * Parsed feed data in the shape of a DOMDocument
-     *
-     * @var DOMDocument
-     */
-    protected $_domDocument = null;
-
-    /**
-     * An array of parsed feed entries
-     *
-     * @var array
-     */
-    protected $_entries = array();
-
-    /**
-     * A pointer for the iterator to keep track of the entries array
-     *
-     * @var int
-     */
-    protected $_entriesKey = 0;
-
-    /**
-     * The base XPath query used to retrieve feed data
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath = null;
-
-    /**
-     * Array of loaded extensions
-     *
-     * @var array
-     */
-    protected $_extensions = array();
-
-    /**
-     * Constructor
-     *
-     * @param DomDocument The DOM object for the feed's XML
-     * @param string $type Feed type
-     */
-    public function __construct(DomDocument $domDocument, $type = null)
-    {
-        $this->_domDocument = $domDocument;
-        $this->_xpath = new DOMXPath($this->_domDocument);
-
-        if ($type !== null) {
-            $this->_data['type'] = $type;
-        } else {
-            $this->_data['type'] = Zend_Feed_Reader::detectType($this->_domDocument);
-        }
-        $this->_registerNamespaces();
-        $this->_indexEntries();
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Get the number of feed entries.
-     * Required by the Iterator interface.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_entries);
-    }
-
-    /**
-     * Return the current entry
-     *
-     * @return Zend_Feed_Reader_EntryInterface
-     */
-    public function current()
-    {
-        if (substr($this->getType(), 0, 3) == 'rss') {
-            $reader = new Zend_Feed_Reader_Entry_Rss($this->_entries[$this->key()], $this->key(), $this->getType());
-        } else {
-            $reader = new Zend_Feed_Reader_Entry_Atom($this->_entries[$this->key()], $this->key(), $this->getType());
-        }
-
-        $reader->setXpath($this->_xpath);
-
-        return $reader;
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->_domDocument;
-    }
-
-    /**
-     * Get the Feed's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get feed as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-          return $this->getDomDocument()->saveXml();
-    }
-
-    /**
-     * Get the DOMElement representing the items/feed element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-          return $this->getDomDocument()->documentElement;
-    }
-
-    /**
-     * Get the DOMXPath object for this feed
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-          return $this->_xpath;
-    }
-
-    /**
-     * Get the feed type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_data['type'];
-    }
-
-    /**
-     * Return the current feed key
-     *
-     * @return unknown
-     */
-    public function key()
-    {
-        return $this->_entriesKey;
-    }
-
-    /**
-     * Move the feed pointer forward
-     *
-     */
-    public function next()
-    {
-        ++$this->_entriesKey;
-    }
-
-    /**
-     * Reset the pointer in the feed object
-     *
-     */
-    public function rewind()
-    {
-        $this->_entriesKey = 0;
-    }
-
-    /**
-     * Check to see if the iterator is still valid
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return 0 <= $this->_entriesKey && $this->_entriesKey < $this->count();
-    }
-
-    public function getExtensions()
-    {
-        return $this->_extensions;
-    }
-
-    public function __call($method, $args)
-    {
-        foreach ($this->_extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array(array($extension, $method), $args);
-            }
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Method: ' . $method
-        . 'does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Feed)
-     *
-     * @param string $name
-     * @return Zend_Feed_Reader_Extension_FeedAbstract
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '_Feed', $this->_extensions)) {
-            return $this->_extensions[$name . '_Feed'];
-        }
-        return null;
-    }
-
-    protected function _loadExtensions()
-    {
-        $all = Zend_Feed_Reader::getExtensions();
-        $feed = $all['feed'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            $className = Zend_Feed_Reader::getPluginLoader()->getClassName($extension);
-            $this->_extensions[$extension] = new $className(
-                $this->getDomDocument(), $this->_data['type'], $this->_xpath
-            );
-        }
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     */
-    abstract protected function _indexEntries();
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    abstract protected function _registerNamespaces();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/FeedInterface.php b/airtime_mvc/library/Zend/Feed/Reader/FeedInterface.php
deleted file mode 100644
index 35060bafc..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/FeedInterface.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Reader_FeedInterface extends Iterator, Countable
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0);
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors();
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright();
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated();
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified();
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription();
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator();
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId();
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage();
-
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink();
-
-    /**
-     * Get a link to the XML feed
-     *
-     * @return string|null
-     */
-    public function getFeedLink();
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle();
-    
-    /**
-     * Get all categories
-     *
-     * @return Zend_Feed_Reader_Collection_Category
-     */
-    public function getCategories();
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Reader/FeedSet.php b/airtime_mvc/library/Zend/Feed/Reader/FeedSet.php
deleted file mode 100644
index 3d073c732..000000000
--- a/airtime_mvc/library/Zend/Feed/Reader/FeedSet.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Feed_Reader
- */
-require_once 'Zend/Feed/Reader.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Reader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Reader_FeedSet extends ArrayObject
-{
-
-    public $rss = null;
-
-    public $rdf = null;
-
-    public $atom = null;
-
-    /**
-     * Import a DOMNodeList from any document containing a set of links
-     * for alternate versions of a document, which will normally refer to
-     * RSS/RDF/Atom feeds for the current document.
-     *
-     * All such links are stored internally, however the first instance of
-     * each RSS, RDF or Atom type has its URI stored as a public property
-     * as a shortcut where the use case is simply to get a quick feed ref.
-     *
-     * Note that feeds are not loaded at this point, but will be lazy
-     * loaded automatically when each links 'feed' array key is accessed.
-     *
-     * @param DOMNodeList $links
-     * @param string $uri
-     * @return void
-     */
-    public function addLinks(DOMNodeList $links, $uri)
-    {
-        foreach ($links as $link) {
-            if (strtolower($link->getAttribute('rel')) !== 'alternate'
-                || !$link->getAttribute('type') || !$link->getAttribute('href')) {
-                continue;
-            }
-            if (!isset($this->rss) && $link->getAttribute('type') == 'application/rss+xml') {
-                $this->rss = $this->_absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif(!isset($this->atom) && $link->getAttribute('type') == 'application/atom+xml') {
-                $this->atom = $this->_absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif(!isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
-                $this->rdf = $this->_absolutiseUri(trim($link->getAttribute('href')), $uri);
-            }
-            $this[] = new self(array(
-                'rel' => 'alternate',
-                'type' => $link->getAttribute('type'),
-                'href' => $this->_absolutiseUri(trim($link->getAttribute('href')), $uri),
-            ));
-        }
-    }
-    
-    /**
-     *  Attempt to turn a relative URI into an absolute URI
-     */
-    protected function _absolutiseUri($link, $uri = null)
-    {
-        if (!Zend_Uri::check($link)) {
-            if (!is_null($uri)) {
-                $uri = Zend_Uri::factory($uri);
-
-                if ($link[0] !== '/') {
-                    $link = $uri->getPath() . '/' . $link;
-                }
-
-                $link = $uri->getScheme() . '://' . $uri->getHost() . '/' . $this->_canonicalizePath($link);
-                if (!Zend_Uri::check($link)) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-    
-    /**
-     *  Canonicalize relative path
-     */
-    protected function _canonicalizePath($path)
-    {
-        $parts = array_filter(explode('/', $path));
-        $absolutes = array();
-        foreach ($parts as $part) {
-            if ('.' == $part) {
-                continue;
-            }
-            if ('..' == $part) {
-                array_pop($absolutes);
-            } else {
-                $absolutes[] = $part;
-            }
-        }
-        return implode('/', $absolutes);
-    }
-
-    /**
-     * Supports lazy loading of feeds using Zend_Feed_Reader::import() but
-     * delegates any other operations to the parent class.
-     *
-     * @param string $offset
-     * @return mixed
-     * @uses Zend_Feed_Reader
-     */
-    public function offsetGet($offset)
-    {
-        if ($offset == 'feed' && !$this->offsetExists('feed')) {
-            if (!$this->offsetExists('href')) {
-                return null;
-            }
-            $feed = Zend_Feed_Reader::import($this->offsetGet('href'));
-            $this->offsetSet('feed', $feed);
-            return $feed;
-        }
-        return parent::offsetGet($offset);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Rss.php b/airtime_mvc/library/Zend/Feed/Rss.php
deleted file mode 100644
index 4ff62db35..000000000
--- a/airtime_mvc/library/Zend/Feed/Rss.php
+++ /dev/null
@@ -1,529 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Abstract
- */
-require_once 'Zend/Feed/Abstract.php';
-
-/**
- * @see Zend_Feed_Entry_Rss
- */
-require_once 'Zend/Feed/Entry/Rss.php';
-
-
-/**
- * RSS channel class
- *
- * The Zend_Feed_Rss class is a concrete subclass of
- * Zend_Feed_Abstract meant for representing RSS channels. It does not
- * add any methods to its parent, just provides a classname to check
- * against with the instanceof operator, and expects to be handling
- * RSS-formatted data instead of Atom.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Rss extends Zend_Feed_Abstract
-{
-    /**
-     * The classname for individual channel elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Feed_Entry_Rss';
-
-    /**
-     * The element name for individual channel elements (RSS <item>s).
-     *
-     * @var string
-     */
-    protected $_entryElementName = 'item';
-
-    /**
-     * The default namespace for RSS channels.
-     *
-     * @var string
-     */
-    protected $_defaultNamespace = 'rss';
-
-    /**
-     * Override Zend_Feed_Abstract to set up the $_element and $_entries aliases.
-     *
-     * @return void
-     * @throws Zend_Feed_Exception
-     */
-    public function __wakeup()
-    {
-        parent::__wakeup();
-
-        // Find the base channel element and create an alias to it.
-        $rdfTags = $this->_element->getElementsByTagNameNS('http://www.w3.org/1999/02/22-rdf-syntax-ns#', 'RDF');
-        if ($rdfTags->length != 0) {
-            $this->_element = $rdfTags->item(0);
-        } else  {
-            $this->_element = $this->_element->getElementsByTagName('channel')->item(0);
-        }
-        if (!$this->_element) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('No root <channel> element found, cannot parse channel.');
-        }
-
-        // Find the entries and save a pointer to them for speed and
-        // simplicity.
-        $this->_buildEntryCache();
-    }
-
-
-    /**
-     * Make accessing some individual elements of the channel easier.
-     *
-     * Special accessors 'item' and 'items' are provided so that if
-     * you wish to iterate over an RSS channel's items, you can do so
-     * using foreach ($channel->items as $item) or foreach
-     * ($channel->item as $item).
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'item':
-                // fall through to the next case
-            case 'items':
-                return $this;
-
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Generate the header of the feed when working in write mode
-     *
-     * @param  array $array the data to use
-     * @return DOMElement root node
-     */
-    protected function _mapFeedHeaders($array)
-    {
-        $channel = $this->_element->createElement('channel');
-
-        $title = $this->_element->createElement('title');
-        $title->appendChild($this->_element->createCDATASection($array->title));
-        $channel->appendChild($title);
-
-        $link = $this->_element->createElement('link', $array->link);
-        $channel->appendChild($link);
-
-        $desc = isset($array->description) ? $array->description : '';
-        $description = $this->_element->createElement('description');
-        $description->appendChild($this->_element->createCDATASection($desc));
-        $channel->appendChild($description);
-
-        $pubdate = isset($array->lastUpdate) ? $array->lastUpdate : time();
-        $pubdate = $this->_element->createElement('pubDate', date(DATE_RSS, $pubdate));
-        $channel->appendChild($pubdate);
-
-        if (isset($array->published)) {
-            $lastBuildDate = $this->_element->createElement('lastBuildDate', date(DATE_RSS, $array->published));
-            $channel->appendChild($lastBuildDate);
-        }
-
-        $editor = '';
-        if (!empty($array->email)) {
-            $editor .= $array->email;
-        }
-        if (!empty($array->author)) {
-            $editor .= ' (' . $array->author . ')';
-        }
-        if (!empty($editor)) {
-            $author = $this->_element->createElement('managingEditor', ltrim($editor));
-            $channel->appendChild($author);
-        }
-        if (isset($array->webmaster)) {
-            $channel->appendChild($this->_element->createElement('webMaster', $array->webmaster));
-        }
-
-        if (!empty($array->copyright)) {
-            $copyright = $this->_element->createElement('copyright', $array->copyright);
-            $channel->appendChild($copyright);
-        }
-
-        if (isset($array->category)) {
-            $category = $this->_element->createElement('category', $array->category);
-            $channel->appendChild($category);
-        }
-
-        if (!empty($array->image)) {
-            $image = $this->_element->createElement('image');
-            $url = $this->_element->createElement('url', $array->image);
-            $image->appendChild($url);
-            $imagetitle = $this->_element->createElement('title');
-            $imagetitle->appendChild($this->_element->createCDATASection($array->title));
-            $image->appendChild($imagetitle);
-            $imagelink = $this->_element->createElement('link', $array->link);
-            $image->appendChild($imagelink);
-
-            $channel->appendChild($image);
-        }
-
-        $generator = !empty($array->generator) ? $array->generator : 'Zend_Feed';
-        $generator = $this->_element->createElement('generator', $generator);
-        $channel->appendChild($generator);
-
-        if (!empty($array->language)) {
-            $language = $this->_element->createElement('language', $array->language);
-            $channel->appendChild($language);
-        }
-
-        $doc = $this->_element->createElement('docs', 'http://blogs.law.harvard.edu/tech/rss');
-        $channel->appendChild($doc);
-
-        if (isset($array->cloud)) {
-            $cloud = $this->_element->createElement('cloud');
-            $cloud->setAttribute('domain', $array->cloud['uri']->getHost());
-            $cloud->setAttribute('port', $array->cloud['uri']->getPort());
-            $cloud->setAttribute('path', $array->cloud['uri']->getPath());
-            $cloud->setAttribute('registerProcedure', $array->cloud['procedure']);
-            $cloud->setAttribute('protocol', $array->cloud['protocol']);
-            $channel->appendChild($cloud);
-        }
-
-        if (isset($array->ttl)) {
-            $ttl = $this->_element->createElement('ttl', $array->ttl);
-            $channel->appendChild($ttl);
-        }
-
-        if (isset($array->rating)) {
-            $rating = $this->_element->createElement('rating', $array->rating);
-            $channel->appendChild($rating);
-        }
-
-        if (isset($array->textInput)) {
-            $textinput = $this->_element->createElement('textInput');
-            $textinput->appendChild($this->_element->createElement('title', $array->textInput['title']));
-            $textinput->appendChild($this->_element->createElement('description', $array->textInput['description']));
-            $textinput->appendChild($this->_element->createElement('name', $array->textInput['name']));
-            $textinput->appendChild($this->_element->createElement('link', $array->textInput['link']));
-            $channel->appendChild($textinput);
-        }
-
-        if (isset($array->skipHours)) {
-            $skipHours = $this->_element->createElement('skipHours');
-            foreach ($array->skipHours as $hour) {
-                $skipHours->appendChild($this->_element->createElement('hour', $hour));
-            }
-            $channel->appendChild($skipHours);
-        }
-
-        if (isset($array->skipDays)) {
-            $skipDays = $this->_element->createElement('skipDays');
-            foreach ($array->skipDays as $day) {
-                $skipDays->appendChild($this->_element->createElement('day', $day));
-            }
-            $channel->appendChild($skipDays);
-        }
-
-        if (isset($array->itunes)) {
-            $this->_buildiTunes($channel, $array);
-        }
-
-        return $channel;
-    }
-
-    /**
-     * Adds the iTunes extensions to a root node
-     *
-     * @param  DOMElement $root
-     * @param  array $array
-     * @return void
-     */
-    private function _buildiTunes(DOMElement $root, $array)
-    {
-        /* author node */
-        $author = '';
-        if (isset($array->itunes->author)) {
-            $author = $array->itunes->author;
-        } elseif (isset($array->author)) {
-            $author = $array->author;
-        }
-        if (!empty($author)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:author', $author);
-            $root->appendChild($node);
-        }
-
-        /* owner node */
-        $author = '';
-        $email = '';
-        if (isset($array->itunes->owner)) {
-            if (isset($array->itunes->owner['name'])) {
-                $author = $array->itunes->owner['name'];
-            }
-            if (isset($array->itunes->owner['email'])) {
-                $email = $array->itunes->owner['email'];
-            }
-        }
-        if (empty($author) && isset($array->author)) {
-            $author = $array->author;
-        }
-        if (empty($email) && isset($array->email)) {
-            $email = $array->email;
-        }
-        if (!empty($author) || !empty($email)) {
-            $owner = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:owner');
-            if (!empty($author)) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:name', $author);
-                $owner->appendChild($node);
-            }
-            if (!empty($email)) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:email', $email);
-                $owner->appendChild($node);
-            }
-            $root->appendChild($owner);
-        }
-        $image = '';
-        if (isset($array->itunes->image)) {
-            $image = $array->itunes->image;
-        } elseif (isset($array->image)) {
-            $image = $array->image;
-        }
-        if (!empty($image)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:image');
-            $node->setAttribute('href', $image);
-            $root->appendChild($node);
-        }
-        $subtitle = '';
-        if (isset($array->itunes->subtitle)) {
-            $subtitle = $array->itunes->subtitle;
-        } elseif (isset($array->description)) {
-            $subtitle = $array->description;
-        }
-        if (!empty($subtitle)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:subtitle', $subtitle);
-            $root->appendChild($node);
-        }
-        $summary = '';
-        if (isset($array->itunes->summary)) {
-            $summary = $array->itunes->summary;
-        } elseif (isset($array->description)) {
-            $summary = $array->description;
-        }
-        if (!empty($summary)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:summary', $summary);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->block)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:block', $array->itunes->block);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->explicit)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:explicit', $array->itunes->explicit);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->keywords)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:keywords', $array->itunes->keywords);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->new_feed_url)) {
-            $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:new-feed-url', $array->itunes->new_feed_url);
-            $root->appendChild($node);
-        }
-        if (isset($array->itunes->category)) {
-            foreach ($array->itunes->category as $i => $category) {
-                $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                $node->setAttribute('text', $category['main']);
-                $root->appendChild($node);
-                $add_end_category = false;
-                if (!empty($category['sub'])) {
-                    $add_end_category = true;
-                    $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                    $node->setAttribute('text', $category['sub']);
-                    $root->appendChild($node);
-                }
-                if ($i > 0 || $add_end_category) {
-                    $node = $this->_element->createElementNS('http://www.itunes.com/DTDs/Podcast-1.0.dtd', 'itunes:category');
-                    $root->appendChild($node);
-                }
-            }
-        }
-    }
-
-    /**
-     * Generate the entries of the feed when working in write mode
-     *
-     * The following nodes are constructed for each feed entry
-     * <item>
-     *    <title>entry title</title>
-     *    <link>url to feed entry</link>
-     *    <guid>url to feed entry</guid>
-     *    <description>short text</description>
-     *    <content:encoded>long version, can contain html</content:encoded>
-     * </item>
-     *
-     * @param  DOMElement $root the root node to use
-     * @param  array $array the data to use
-     * @return void
-     */
-    protected function _mapFeedEntries(DOMElement $root, $array)
-    {
-        Zend_Feed::registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-
-        foreach ($array as $dataentry) {
-            $item = $this->_element->createElement('item');
-
-            $title = $this->_element->createElement('title');
-            $title->appendChild($this->_element->createCDATASection($dataentry->title));
-            $item->appendChild($title);
-
-            if (isset($dataentry->author)) {
-                $author = $this->_element->createElement('author', $dataentry->author);
-                $item->appendChild($author);
-            }
-
-            $link = $this->_element->createElement('link', $dataentry->link);
-            $item->appendChild($link);
-
-            if (isset($dataentry->guid)) {
-                $guid = $this->_element->createElement('guid', $dataentry->guid);
-                if (!Zend_Uri::check($dataentry->guid)) {
-                    $guid->setAttribute('isPermaLink', 'false');
-                }
-                $item->appendChild($guid);
-            }
-
-            $description = $this->_element->createElement('description');
-            $description->appendChild($this->_element->createCDATASection($dataentry->description));
-            $item->appendChild($description);
-
-            if (isset($dataentry->content)) {
-                $content = $this->_element->createElement('content:encoded');
-                $content->appendChild($this->_element->createCDATASection($dataentry->content));
-                $item->appendChild($content);
-            }
-
-            $pubdate = isset($dataentry->lastUpdate) ? $dataentry->lastUpdate : time();
-            $pubdate = $this->_element->createElement('pubDate', date(DATE_RSS, $pubdate));
-            $item->appendChild($pubdate);
-
-            if (isset($dataentry->category)) {
-                foreach ($dataentry->category as $category) {
-                    $node = $this->_element->createElement('category', $category['term']);
-                    if (isset($category['scheme'])) {
-                        $node->setAttribute('domain', $category['scheme']);
-                    }
-                    $item->appendChild($node);
-                }
-            }
-
-            if (isset($dataentry->source)) {
-                $source = $this->_element->createElement('source', $dataentry->source['title']);
-                $source->setAttribute('url', $dataentry->source['url']);
-                $item->appendChild($source);
-            }
-
-            if (isset($dataentry->comments)) {
-                $comments = $this->_element->createElement('comments', $dataentry->comments);
-                $item->appendChild($comments);
-            }
-            if (isset($dataentry->commentRss)) {
-                $comments = $this->_element->createElementNS('http://wellformedweb.org/CommentAPI/',
-                                                             'wfw:commentRss',
-                                                             $dataentry->commentRss);
-                $item->appendChild($comments);
-            }
-
-
-            if (isset($dataentry->enclosure)) {
-                foreach ($dataentry->enclosure as $enclosure) {
-                    $node = $this->_element->createElement('enclosure');
-                    $node->setAttribute('url', $enclosure['url']);
-                    if (isset($enclosure['type'])) {
-                        $node->setAttribute('type', $enclosure['type']);
-                    }
-                    if (isset($enclosure['length'])) {
-                        $node->setAttribute('length', $enclosure['length']);
-                    }
-                    $item->appendChild($node);
-                }
-            }
-
-            $root->appendChild($item);
-        }
-    }
-
-    /**
-     * Override Zend_Feed_Element to include <rss> root node
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Return a complete document including XML prologue.
-        $doc = new DOMDocument($this->_element->ownerDocument->version,
-                               $this->_element->ownerDocument->actualEncoding);
-        $root = $doc->createElement('rss');
-
-        // Use rss version 2.0
-        $root->setAttribute('version', '2.0');
-
-        // Content namespace
-        $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:content', 'http://purl.org/rss/1.0/modules/content/');
-        $root->appendChild($doc->importNode($this->_element, true));
-
-        // Append root node
-        $doc->appendChild($root);
-
-        // Format output
-        $doc->formatOutput = true;
-
-        return $doc->saveXML();
-    }
-
-    /**
-     * Send feed to a http client with the correct header
-     *
-     * @return void
-     * @throws Zend_Feed_Exception if headers have already been sent
-     */
-    public function send()
-    {
-        if (headers_sent()) {
-            /**
-             * @see Zend_Feed_Exception
-             */
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Cannot send RSS because headers have already been sent.');
-        }
-
-        header('Content-Type: application/rss+xml; charset=' . $this->_element->ownerDocument->actualEncoding);
-
-        echo $this->saveXml();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer.php b/airtime_mvc/library/Zend/Feed/Writer.php
deleted file mode 100644
index 8653af8d0..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer
-{
-	/**
-	 * Namespace constants
-	 */
-	const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
-    const NAMESPACE_ATOM_10  = 'http://www.w3.org/2005/Atom';
-    const NAMESPACE_RDF      = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    const NAMESPACE_RSS_090  = 'http://my.netscape.com/rdf/simple/0.9/';
-    const NAMESPACE_RSS_10   = 'http://purl.org/rss/1.0/';
-
-    /**
-	 * Feed type constants
-	 */
-	const TYPE_ANY              = 'any';
-	const TYPE_ATOM_03          = 'atom-03';
-    const TYPE_ATOM_10          = 'atom-10';
-    const TYPE_ATOM_ANY         = 'atom';
-    const TYPE_RSS_090          = 'rss-090';
-    const TYPE_RSS_091          = 'rss-091';
-    const TYPE_RSS_091_NETSCAPE = 'rss-091n';
-    const TYPE_RSS_091_USERLAND = 'rss-091u';
-    const TYPE_RSS_092          = 'rss-092';
-    const TYPE_RSS_093          = 'rss-093';
-    const TYPE_RSS_094          = 'rss-094';
-    const TYPE_RSS_10           = 'rss-10';
-    const TYPE_RSS_20           = 'rss-20';
-    const TYPE_RSS_ANY          = 'rss';
-    
-    /**
-     * PluginLoader instance used by component
-     *
-     * @var Zend_Loader_PluginLoader_Interface
-     */
-    protected static $_pluginLoader = null;
-
-    /**
-     * Path on which to search for Extension classes
-     *
-     * @var array
-     */
-    protected static $_prefixPaths = array();
-
-    /**
-     * Array of registered extensions by class postfix (after the base class
-     * name) across four categories - data containers and renderers for entry
-     * and feed levels.
-     *
-     * @var array
-     */
-    protected static $_extensions = array(
-        'entry'         => array(),
-        'feed'          => array(),
-        'entryRenderer' => array(),
-        'feedRenderer'  => array(),
-    );
-    
-    /**
-     * Set plugin loader for use with Extensions
-     *
-     * @param  Zend_Loader_PluginLoader_Interface
-     */
-    public static function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader)
-    {
-        self::$_pluginLoader = $loader;
-    }
-
-    /**
-     * Get plugin loader for use with Extensions
-     *
-     * @return  Zend_Loader_PluginLoader_Interface
-     */
-    public static function getPluginLoader()
-    {
-        if (!isset(self::$_pluginLoader)) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            self::$_pluginLoader = new Zend_Loader_PluginLoader(array(
-                'Zend_Feed_Writer_Extension_' => 'Zend/Feed/Writer/Extension/',
-            ));
-        }
-        return self::$_pluginLoader;
-    }
-
-    /**
-     * Add prefix path for loading Extensions
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return void
-     */
-    public static function addPrefixPath($prefix, $path)
-    {
-        $prefix = rtrim($prefix, '_');
-        $path   = rtrim($path, DIRECTORY_SEPARATOR);
-        self::getPluginLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Add multiple Extension prefix paths at once
-     *
-     * @param  array $spec
-     * @return void
-     */
-    public static function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            self::addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $prefixPath) {
-            if (isset($prefixPath['prefix']) && isset($prefixPath['path'])) {
-                self::addPrefixPath($prefixPath['prefix'], $prefixPath['path']);
-            }
-        }
-    }
-
-    /**
-     * Register an Extension by name
-     *
-     * @param  string $name
-     * @return void
-     * @throws Zend_Feed_Exception if unable to resolve Extension class
-     */
-    public static function registerExtension($name)
-    {
-        $feedName  = $name . '_Feed';
-        $entryName = $name . '_Entry';
-        $feedRendererName  = $name . '_Renderer_Feed';
-        $entryRendererName = $name . '_Renderer_Entry';
-        if (self::isRegistered($name)) {
-            if (self::getPluginLoader()->isLoaded($feedName)
-                || self::getPluginLoader()->isLoaded($entryName)
-                || self::getPluginLoader()->isLoaded($feedRendererName)
-                || self::getPluginLoader()->isLoaded($entryRendererName)
-            ) {
-                return;
-            }
-        }
-        try {
-            self::getPluginLoader()->load($feedName);
-            self::$_extensions['feed'][] = $feedName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        try {
-            self::getPluginLoader()->load($entryName);
-            self::$_extensions['entry'][] = $entryName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        try {
-            self::getPluginLoader()->load($feedRendererName);
-            self::$_extensions['feedRenderer'][] = $feedRendererName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        try {
-            self::getPluginLoader()->load($entryRendererName);
-            self::$_extensions['entryRenderer'][] = $entryRendererName;
-        } catch (Zend_Loader_PluginLoader_Exception $e) {
-        }
-        if (!self::getPluginLoader()->isLoaded($feedName)
-            && !self::getPluginLoader()->isLoaded($entryName)
-            && !self::getPluginLoader()->isLoaded($feedRendererName)
-            && !self::getPluginLoader()->isLoaded($entryRendererName)
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Could not load extension: ' . $name
-                . 'using Plugin Loader. Check prefix paths are configured and extension exists.');
-        }
-    }
-
-    /**
-     * Is a given named Extension registered?
-     *
-     * @param  string $extensionName
-     * @return boolean
-     */
-    public static function isRegistered($extensionName)
-    {
-        $feedName  = $extensionName . '_Feed';
-        $entryName = $extensionName . '_Entry';
-        $feedRendererName  = $extensionName . '_Renderer_Feed';
-        $entryRendererName = $extensionName . '_Renderer_Entry';
-        if (in_array($feedName, self::$_extensions['feed'])
-            || in_array($entryName, self::$_extensions['entry'])
-            || in_array($feedRendererName, self::$_extensions['feedRenderer'])
-            || in_array($entryRendererName, self::$_extensions['entryRenderer'])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get a list of extensions
-     *
-     * @return array
-     */
-    public static function getExtensions()
-    {
-        return self::$_extensions;
-    }
-
-    /**
-     * Reset class state to defaults
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        self::$_pluginLoader = null;
-        self::$_prefixPaths  = array();
-        self::$_extensions   = array(
-            'entry'         => array(),
-            'feed'          => array(),
-            'entryRenderer' => array(),
-            'feedRenderer'  => array(),
-        );
-    }
-
-    /**
-     * Register core (default) extensions
-     *
-     * @return void
-     */
-    public static function registerCoreExtensions()
-    {
-        self::registerExtension('DublinCore');
-        self::registerExtension('Content');
-        self::registerExtension('Atom');
-        self::registerExtension('Slash');
-        self::registerExtension('WellFormedWeb');
-        self::registerExtension('Threading');
-        self::registerExtension('ITunes');
-    }
-    
-    public static function lcfirst($str)
-    {
-        $str[0] = strtolower($str[0]);
-        return $str;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Deleted.php b/airtime_mvc/library/Zend/Feed/Writer/Deleted.php
deleted file mode 100644
index 4f17c9d7a..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Deleted.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php';
- 
- /**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Deleted
-{
-
-    /**
-     * Internal array containing all data associated with this entry or item.
-     *
-     * @var array
-     */
-    protected $_data = array();
-    
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $_type = null;
-    
-    /**
-     * Set the feed character encoding
-     *
-     * @return string|null
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['encoding'] = $encoding;
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->_data)) {
-            return 'UTF-8';
-        }
-        return $this->_data['encoding'];
-    }
-    
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     */
-    public function remove($name)
-    {
-        if (isset($this->_data[$name])) {
-            unset($this->_data[$name]);
-        }
-    }
-    
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-    }
-    
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-    
-    public function setReference($reference)
-    {
-        if (empty($reference) || !is_string($reference)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: reference must be a non-empty string');
-        }
-        $this->_data['reference'] = $reference;
-    }
-    
-    public function getReference()
-    {
-        if (!array_key_exists('reference', $this->_data)) {
-            return null;
-        }
-        return $this->_data['reference'];
-    }
-    
-    public function setWhen($date = null)
-    {
-        $zdate = null;
-        if (is_null($date)) {
-            $zdate = new Zend_Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
-            $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
-        } elseif ($date instanceof Zend_Date) {
-            $zdate = $date;
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
-        }
-        $this->_data['when'] = $zdate;
-    }
-    
-    public function getWhen()
-    {
-        if (!array_key_exists('when', $this->_data)) {
-            return null;
-        }
-        return $this->_data['when'];
-    }
-    
-    public function setBy(array $by)
-    {
-        $author = array();
-        if (!array_key_exists('name', $by) 
-            || empty($by['name']) 
-            || !is_string($by['name'])
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value');
-        }
-        $author['name'] = $by['name'];
-        if (isset($by['email'])) {
-            if (empty($by['email']) || !is_string($by['email'])) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string');
-            }
-            $author['email'] = $by['email'];
-        }
-        if (isset($by['uri'])) {
-            if (empty($by['uri']) 
-                || !is_string($by['uri']) 
-                || !Zend_Uri::check($by['uri'])
-            ) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
-            }
-            $author['uri'] = $by['uri'];
-        }
-        $this->_data['by'] = $author;
-    }
-    
-    public function getBy()
-    {
-        if (!array_key_exists('by', $this->_data)) {
-            return null;
-        }
-        return $this->_data['by'];
-    }
-    
-    public function setComment($comment)
-    {
-        $this->_data['comment'] = $comment;
-    }
-    
-    public function getComment()
-    {
-        if (!array_key_exists('comment', $this->_data)) {
-            return null;
-        }
-        return $this->_data['comment'];
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Entry.php
deleted file mode 100644
index ff9550b52..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Entry.php
+++ /dev/null
@@ -1,771 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20519 2010-01-22 14:06:24Z padraic $
- */
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Uri.php';
-
-require_once 'Zend/Feed/Writer/Source.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Entry
-{
-
-    /**
-     * Internal array containing all data associated with this entry or item.
-     *
-     * @var array
-     */
-    protected $_data = array();
-    
-    /**
-     * Registered extensions
-     *
-     * @var array
-     */
-    protected $_extensions = array();
-    
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $_type = null;
-    
-    /**
-     * Constructor: Primarily triggers the registration of core extensions and
-     * loads those appropriate to this data container.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        Zend_Feed_Writer::registerCoreExtensions();
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Set a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function addAuthor($name, $email = null, $uri = null)
-    {
-        $author = array();
-        if (is_array($name)) {
-            if (!array_key_exists('name', $name) 
-                || empty($name['name']) 
-                || !is_string($name['name'])
-            ) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value');
-            }
-            $author['name'] = $name['name'];
-            if (isset($name['email'])) {
-                if (empty($name['email']) || !is_string($name['email'])) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string');
-                }
-                $author['email'] = $name['email'];
-            }
-            if (isset($name['uri'])) {
-                if (empty($name['uri']) 
-                    || !is_string($name['uri']) 
-                    || !Zend_Uri::check($name['uri'])
-                ) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
-                }
-                $author['uri'] = $name['uri'];
-            }
-        /**
-         * @deprecated
-         * Array notation (above) is preferred and will be the sole supported input from ZF 2.0
-         */
-        } else {
-            if (empty($name['name']) || !is_string($name['name'])) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value');
-            }
-            $author['name'] = $name;
-            if (isset($email)) {
-                if (empty($email) || !is_string($email)) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string');
-                }
-                $author['email'] = $email;
-            }
-            if (isset($uri)) {
-                if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI');
-                }
-                $author['uri'] = $uri;
-            }
-        }
-        $this->_data['authors'][] = $author;
-    }
-
-    /**
-     * Set an array with feed authors
-     *
-     * @return array
-     */
-    public function addAuthors(array $authors)
-    {
-        foreach($authors as $author) {
-            $this->addAuthor($author);
-        }
-    }
-    
-    /**
-     * Set the feed character encoding
-     *
-     * @return string|null
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['encoding'] = $encoding;
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->_data)) {
-            return 'UTF-8';
-        }
-        return $this->_data['encoding'];
-    }
-
-    /**
-     * Set the copyright entry
-     *
-     * @return string|null
-     */
-    public function setCopyright($copyright)
-    {
-        if (empty($copyright) || !is_string($copyright)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['copyright'] = $copyright;
-    }
-
-    /**
-     * Set the entry's content
-     *
-     * @return string|null
-     */
-    public function setContent($content)
-    {
-        if (empty($content) || !is_string($content)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['content'] = $content;
-    }
-
-    /**
-     * Set the feed creation date
-     *
-     * @return string|null
-     */
-    public function setDateCreated($date = null)
-    {
-        $zdate = null;
-        if (is_null($date)) {
-            $zdate = new Zend_Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
-            $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
-        } elseif ($date instanceof Zend_Date) {
-            $zdate = $date;
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
-        }
-        $this->_data['dateCreated'] = $zdate;
-    }
-
-    /**
-     * Set the feed modification date
-     *
-     * @return string|null
-     */
-    public function setDateModified($date = null)
-    {
-        $zdate = null;
-        if (is_null($date)) {
-            $zdate = new Zend_Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
-            $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
-        } elseif ($date instanceof Zend_Date) {
-            $zdate = $date;
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
-        }
-        $this->_data['dateModified'] = $zdate;
-    }
-
-    /**
-     * Set the feed description
-     *
-     * @return string|null
-     */
-    public function setDescription($description)
-    {
-        if (empty($description) || !is_string($description)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['description'] = $description;
-    }
-
-    /**
-     * Set the feed ID
-     *
-     * @return string|null
-     */
-    public function setId($id)
-    {
-        if (empty($id) || !is_string($id)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['id'] = $id;
-    }
-
-    /**
-     * Set a link to the HTML source of this entry
-     *
-     * @return string|null
-     */
-    public function setLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->_data['link'] = $link;
-    }
-
-    /**
-     * Set the number of comments associated with this entry
-     *
-     * @return string|null
-     */
-    public function setCommentCount($count)
-    {
-        if (empty($count) || !is_numeric($count) || (int) $count < 0) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "count" must be a non-empty integer number');
-        }
-        $this->_data['commentCount'] = (int) $count;
-    }
-
-    /**
-     * Set a link to a HTML page containing comments associated with this entry
-     *
-     * @return string|null
-     */
-    public function setCommentLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
-        }
-        $this->_data['commentLink'] = $link;
-    }
-
-    /**
-     * Set a link to an XML feed for any comments associated with this entry
-     *
-     * @return string|null
-     */
-    public function setCommentFeedLink(array $link)
-    {
-        if (!isset($link['uri']) || !is_string($link['uri']) || !Zend_Uri::check($link['uri'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
-        }
-        if (!isset($link['type']) || !in_array($link['type'], array('atom', 'rss', 'rdf'))) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "type" must be one'
-            . ' of "atom", "rss" or "rdf"');
-        }
-        if (!isset($this->_data['commentFeedLinks'])) {
-            $this->_data['commentFeedLinks'] = array();
-        }
-        $this->_data['commentFeedLinks'][] = $link;
-    }
-    
-    /**
-     * Set a links to an XML feed for any comments associated with this entry.
-     * Each link is an array with keys "uri" and "type", where type is one of:
-     * "atom", "rss" or "rdf".
-     *
-     * @return string|null
-     */
-    public function setCommentFeedLinks(array $links)
-    {
-        foreach ($links as $link) {
-            $this->setCommentFeedLink($link);
-        }
-    }
-
-    /**
-     * Set the feed title
-     *
-     * @return string|null
-     */
-    public function setTitle($title)
-    {
-        if (empty($title) || !is_string($title)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['title'] = $title;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (!array_key_exists('authors', $this->_data)) {
-            return null;
-        }
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (!array_key_exists('content', $this->_data)) {
-            return null;
-        }
-        return $this->_data['content'];
-    }
-
-    /**
-     * Get the entry copyright information
-     *
-     * @return string
-     */
-    public function getCopyright()
-    {
-        if (!array_key_exists('copyright', $this->_data)) {
-            return null;
-        }
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (!array_key_exists('dateCreated', $this->_data)) {
-            return null;
-        }
-        return $this->_data['dateCreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (!array_key_exists('dateModified', $this->_data)) {
-            return null;
-        }
-        return $this->_data['dateModified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (!array_key_exists('description', $this->_data)) {
-            return null;
-        }
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (!array_key_exists('id', $this->_data)) {
-            return null;
-        }
-        return $this->_data['id'];
-    }
-    
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (!array_key_exists('link', $this->_data)) {
-            return null;
-        }
-        return $this->_data['link'];
-    }
-
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (!array_key_exists('links', $this->_data)) {
-            return null;
-        }
-        return $this->_data['links'];
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (!array_key_exists('title', $this->_data)) {
-            return null;
-        }
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return integer
-     */
-    public function getCommentCount()
-    {
-        if (!array_key_exists('commentCount', $this->_data)) {
-            return null;
-        }
-        return $this->_data['commentCount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (!array_key_exists('commentLink', $this->_data)) {
-            return null;
-        }
-        return $this->_data['commentLink'];
-    }
-
-    /**
-     * Returns an array of URIs pointing to a feed of all comments for this entry
-     * where the array keys indicate the feed type (atom, rss or rdf).
-     *
-     * @return string
-     */
-    public function getCommentFeedLinks()
-    {
-        if (!array_key_exists('commentFeedLinks', $this->_data)) {
-            return null;
-        }
-        return $this->_data['commentFeedLinks'];
-    }
-    
-    /**
-     * Add a entry category
-     *
-     * @param string $category
-     */ 
-    public function addCategory(array $category)
-    {
-        if (!isset($category['term'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Each category must be an array and '
-            . 'contain at least a "term" element containing the machine '
-            . ' readable category name');
-        }
-        if (isset($category['scheme'])) {
-            if (empty($category['scheme']) 
-                || !is_string($category['scheme'])
-                || !Zend_Uri::check($category['scheme'])
-            ) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('The Atom scheme or RSS domain of'
-                . ' a category must be a valid URI');
-            }
-        }
-        if (!isset($this->_data['categories'])) {
-            $this->_data['categories'] = array();
-        }
-        $this->_data['categories'][] = $category;
-    }
-    
-    /**
-     * Set an array of entry categories
-     *
-     * @param array $categories
-     */
-    public function addCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-    }
-    
-    /**
-     * Get the entry categories
-     *
-     * @return string|null
-     */
-    public function getCategories()
-    {
-        if (!array_key_exists('categories', $this->_data)) {
-            return null;
-        }
-        return $this->_data['categories'];
-    }
-    
-    /**
-     * Adds an enclosure to the entry.
-     *
-     * @param array $enclosures
-     */
-    public function setEnclosure(array $enclosure)
-    {
-        if (!isset($enclosure['type'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Enclosure "type" is not set');
-        }
-        if (!isset($enclosure['length'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Enclosure "length" is not set');
-        }
-        if (!isset($enclosure['uri'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Enclosure "uri" is not set');
-        }
-        if (!Zend_Uri::check($enclosure['uri'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Enclosure "uri" is not a valid URI/IRI');
-        }
-        if ((int) $enclosure['length'] <= 0) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Enclosure "length" must be an integer'
-            . ' indicating the content\'s length in bytes');
-        }
-        $this->_data['enclosure'] = $enclosure;
-    }
-    
-    /**
-     * Retrieve an array of all enclosures to be added to entry.
-     *
-     * @return array
-     */
-    public function getEnclosure()
-    {
-        if (!array_key_exists('enclosure', $this->_data)) {
-            return null;
-        }
-        return $this->_data['enclosure'];
-    }
-    
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     */
-    public function remove($name)
-    {
-        if (isset($this->_data[$name])) {
-            unset($this->_data[$name]);
-        }
-    }
-    
-    /**
-     * Get registered extensions
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->_extensions;
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Entry)
-     *
-     * @param string $name
-     * @return object
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '_Entry', $this->_extensions)) {
-            return $this->_extensions[$name . '_Entry'];
-        }
-        return null;
-    }
-    
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-    }
-    
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Feed_Exception if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->_extensions as $extension) {
-            try {
-                return call_user_func_array(array($extension, $method), $args);
-            } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) {
-            }
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Method: ' . $method
-            . ' does not exist and could not be located on a registered Extension');
-    }
-    
-    /**
-     * Creates a new Zend_Feed_Writer_Source data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return Zend_Feed_Writer_Source
-     */
-    public function createSource()
-    {
-        $source = new Zend_Feed_Writer_Source;
-        if ($this->getEncoding()) {
-            $source->setEncoding($this->getEncoding());
-        }
-        $source->setType($this->getType());
-        return $source;
-    }
-
-    /**
-     * Appends a Zend_Feed_Writer_Entry object representing a new entry/item
-     * the feed data container's internal group of entries.
-     *
-     * @param Zend_Feed_Writer_Source $source
-     */
-    public function setSource(Zend_Feed_Writer_Source $source)
-    {
-        $this->_data['source'] = $source;
-    }
-    
-    /**
-     * @return Zend_Feed_Writer_Source
-     */
-    public function getSource()
-    {
-        if (isset($this->_data['source'])) {
-            return $this->_data['source'];
-        }
-        return null;
-    }
-
-    /**
-     * Load extensions from Zend_Feed_Writer
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all = Zend_Feed_Writer::getExtensions();
-        $exts = $all['entry'];
-        foreach ($exts as $ext) {
-            $className = Zend_Feed_Writer::getPluginLoader()->getClassName($ext);
-            $this->_extensions[$ext] = new $className();
-            $this->_extensions[$ext]->setEncoding($this->getEncoding());
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Exception/InvalidMethodException.php b/airtime_mvc/library/Zend/Feed/Writer/Exception/InvalidMethodException.php
deleted file mode 100644
index f6c4f9331..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Exception/InvalidMethodException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InvalidMethodException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Feed_Exception
- */
-require_once 'Zend/Feed/Exception.php';
-
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- *
- * @category   Zend
- * @package    Zend_Feed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Exception_InvalidMethodException extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
deleted file mode 100644
index f23901d7e..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_Atom_Renderer_Feed
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render feed
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        /**
-         * RSS 2.0 only. Used mainly to include Atom links and
-         * Pubsubhubbub Hub endpoint URIs under the Atom namespace
-         */
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setFeedLinks($this->_dom, $this->_base);
-        $this->_setHubs($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append namespaces to root element of feed
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:atom',
-            'http://www.w3.org/2005/Atom');  
-    }
-
-    /**
-     * Set feed link elements
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $flinks = $this->getDataContainer()->getFeedLinks();
-        if(!$flinks || empty($flinks)) {
-            return;
-        }
-        foreach ($flinks as $type => $href) {
-            $mime  = 'application/' . strtolower($type) . '+xml';
-            $flink = $dom->createElement('atom:link');
-            $root->appendChild($flink);
-            $flink->setAttribute('rel', 'self');
-            $flink->setAttribute('type', $mime);
-            $flink->setAttribute('href', $href);
-        }
-        $this->_called = true;
-    }
-    
-    /**
-     * Set PuSH hubs
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setHubs(DOMDocument $dom, DOMElement $root)
-    {
-        $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs || empty($hubs)) {
-            return;
-        }
-        foreach ($hubs as $hubUrl) {
-            $hub = $dom->createElement('atom:link');
-            $hub->setAttribute('rel', 'hub');
-            $hub->setAttribute('href', $hubUrl);
-            $root->appendChild($hub);
-        }
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
deleted file mode 100644
index 7960f4cdf..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_Content_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setContent($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append namespaces to root element
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:content',
-            'http://purl.org/rss/1.0/modules/content/');  
-    }
-
-    /**
-     * Set entry content
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setContent(DOMDocument $dom, DOMElement $root)
-    {
-        $content = $this->getDataContainer()->getContent();
-        if (!$content) {
-            return;
-        }
-        $element = $dom->createElement('content:encoded');
-        $root->appendChild($element);
-        $cdata = $dom->createCDATASection($content);
-        $element->appendChild($cdata);
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
deleted file mode 100644
index 6a7227781..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_DublinCore_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setAuthors($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append namespaces to entry
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');  
-    }
-
-    /**
-     * Set entry author elements
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('dc:creator');
-            if (array_key_exists('name', $data)) {
-                $text = $dom->createTextNode($data['name']);
-                $author->appendChild($text);
-                $root->appendChild($author);   
-            }
-        }
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
deleted file mode 100644
index bfa4de49a..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_DublinCore_Renderer_Feed
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render feed
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setAuthors($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append namespaces to feed element
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');  
-    }
-
-    /**
-     * Set feed authors
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('dc:creator');
-            if (array_key_exists('name', $data)) {
-                $text = $dom->createTextNode($data['name']);
-                $author->appendChild($text);
-                $root->appendChild($author);  
-            }
-        }
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
deleted file mode 100644
index 49eecb713..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_ITunes_Entry
-{
-    /**
-     * Array of Feed data for rendering by Extension's renderers
-     *
-     * @var array
-     */
-    protected $_data = array();
-    
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-    
-    /**
-     * Set feed encoding
-     * 
-     * @param  string $enc 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setEncoding($enc)
-    {
-        $this->_encoding = $enc;
-        return $this;
-    }
-    
-    /**
-     * Get feed encoding
-     * 
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-    
-    /**
-     * Set a block value of "yes" or "no". You may also set an empty string.
-     *
-     * @param  string
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesBlock($value)
-    {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "block" may only'
-            . ' contain alphabetic characters');
-        }
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "block" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->_data['block'] = $value;
-    }
-    
-    /**
-     * Add authors to itunes entry
-     * 
-     * @param  array $values 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function addItunesAuthors(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesAuthor($value);
-        }
-        return $this;
-    }
-    
-    /**
-     * Add author to itunes entry
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function addItunesAuthor($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: any "author" may only'
-            . ' contain a maximum of 255 characters each');
-        }
-        if (!isset($this->_data['authors'])) {
-            $this->_data['authors'] = array();
-        }
-        $this->_data['authors'][] = $value;   
-        return $this;
-    }
-    
-    /**
-     * Set duration
-     * 
-     * @param  int $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesDuration($value)
-    {
-        $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "duration" may only'
-            . ' be of a specified [[HH:]MM:]SS format');
-        }
-        $this->_data['duration'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set "explicit" flag
-     * 
-     * @param  bool $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesExplicit($value)
-    {
-        if (!in_array($value, array('yes','no','clean'))) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "explicit" may only'
-            . ' be one of "yes", "no" or "clean"');
-        }
-        $this->_data['explicit'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set keywords
-     * 
-     * @param  array $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesKeywords(array $value)
-    {
-        if (count($value) > 12) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "keywords" may only'
-            . ' contain a maximum of 12 terms');
-        }
-        $concat = implode(',', $value);
-        if (iconv_strlen($concat, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "keywords" may only'
-            . ' have a concatenated length of 255 chars where terms are delimited'
-            . ' by a comma');
-        }
-        $this->_data['keywords'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set subtitle
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesSubtitle($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "subtitle" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->_data['subtitle'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set summary
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Entry
-     */
-    public function setItunesSummary($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 4000) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "summary" may only'
-            . ' contain a maximum of 4000 characters');
-        }
-        $this->_data['summary'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Overloading to itunes specific setters
-     * 
-     * @param  string $method 
-     * @param  array $params 
-     * @return mixed
-     */
-    public function __call($method, array $params)
-    {
-        $point = Zend_Feed_Writer::lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
-        ) {
-            require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php';
-            throw new Zend_Feed_Writer_Exception_InvalidMethodException(
-                'invalid method: ' . $method
-            );
-        }
-        if (!array_key_exists($point, $this->_data) 
-            || empty($this->_data[$point])
-        ) {
-            return null;
-        }
-        return $this->_data[$point];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
deleted file mode 100644
index 565fdc5c7..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_ITunes_Feed
-{
-    /**
-     * Array of Feed data for rendering by Extension's renderers
-     *
-     * @var array
-     */
-    protected $_data = array();
-    
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-    
-    /**
-     * Set feed encoding
-     * 
-     * @param  string $enc 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setEncoding($enc)
-    {
-        $this->_encoding = $enc;
-        return $this;
-    }
-    
-    /**
-     * Get feed encoding
-     * 
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-    
-    /**
-     * Set a block value of "yes" or "no". You may also set an empty string.
-     *
-     * @param  string
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesBlock($value)
-    {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "block" may only'
-            . ' contain alphabetic characters');
-        }
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "block" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->_data['block'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Add feed authors
-     * 
-     * @param  array $values 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function addItunesAuthors(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesAuthor($value);
-        }
-        return $this;
-    }
-    
-    /**
-     * Add feed author
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function addItunesAuthor($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: any "author" may only'
-            . ' contain a maximum of 255 characters each');
-        }
-        if (!isset($this->_data['authors'])) {
-            $this->_data['authors'] = array();
-        }
-        $this->_data['authors'][] = $value;   
-        return $this;
-    }
-    
-    /**
-     * Set feed categories
-     * 
-     * @param  array $values 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesCategories(array $values)
-    {
-        if (!isset($this->_data['categories'])) {
-            $this->_data['categories'] = array();
-        }
-        foreach ($values as $key=>$value) {
-            if (!is_array($value)) {
-                if (iconv_strlen($value, $this->getEncoding()) > 255) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('invalid parameter: any "category" may only'
-                    . ' contain a maximum of 255 characters each');
-                }
-                $this->_data['categories'][] = $value;
-            } else {
-                if (iconv_strlen($key, $this->getEncoding()) > 255) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('invalid parameter: any "category" may only'
-                    . ' contain a maximum of 255 characters each');
-                }
-                $this->_data['categories'][$key] = array();
-                foreach ($value as $val) {
-                    if (iconv_strlen($val, $this->getEncoding()) > 255) {
-                        require_once 'Zend/Feed/Exception.php';
-                        throw new Zend_Feed_Exception('invalid parameter: any "category" may only'
-                        . ' contain a maximum of 255 characters each');
-                    }
-                    $this->_data['categories'][$key][] = $val;
-                } 
-            }
-        }
-        return $this;
-    }
-    
-    /**
-     * Set feed image (icon)
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesImage($value)
-    {
-        if (!Zend_Uri::check($value)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "image" may only'
-            . ' be a valid URI/IRI');
-        }
-        if (!in_array(substr($value, -3), array('jpg','png'))) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "image" may only'
-            . ' use file extension "jpg" or "png" which must be the last three'
-            . ' characters of the URI (i.e. no query string or fragment)');
-        }
-        $this->_data['image'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set feed cumulative duration
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesDuration($value)
-    {
-        $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "duration" may only'
-            . ' be of a specified [[HH:]MM:]SS format');
-        }
-        $this->_data['duration'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set "explicit" flag
-     * 
-     * @param  bool $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesExplicit($value)
-    {
-        if (!in_array($value, array('yes','no','clean'))) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "explicit" may only'
-            . ' be one of "yes", "no" or "clean"');
-        }
-        $this->_data['explicit'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set feed keywords
-     * 
-     * @param  array $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesKeywords(array $value)
-    {
-        if (count($value) > 12) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "keywords" may only'
-            . ' contain a maximum of 12 terms');
-        }
-        $concat = implode(',', $value);
-        if (iconv_strlen($concat, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "keywords" may only'
-            . ' have a concatenated length of 255 chars where terms are delimited'
-            . ' by a comma');
-        }
-        $this->_data['keywords'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set new feed URL
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesNewFeedUrl($value)
-    {
-        if (!Zend_Uri::check($value)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "newFeedUrl" may only'
-            . ' be a valid URI/IRI');
-        }
-        $this->_data['newFeedUrl'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Add feed owners
-     * 
-     * @param  array $values 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function addItunesOwners(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesOwner($value); 
-        }
-        return $this;
-    }
-    
-    /**
-     * Add feed owner
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function addItunesOwner(array $value)
-    {
-        if (!isset($value['name']) || !isset($value['email'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: any "owner" must'
-            . ' be an array containing keys "name" and "email"');
-        }
-        if (iconv_strlen($value['name'], $this->getEncoding()) > 255
-            || iconv_strlen($value['email'], $this->getEncoding()) > 255
-        ) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: any "owner" may only'
-            . ' contain a maximum of 255 characters each for "name" and "email"');
-        }
-        if (!isset($this->_data['owners'])) {
-            $this->_data['owners'] = array();
-        }
-        $this->_data['owners'][] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set feed subtitle
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesSubtitle($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 255) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "subtitle" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->_data['subtitle'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Set feed summary
-     * 
-     * @param  string $value 
-     * @return Zend_Feed_Writer_Extension_ITunes_Feed
-     */
-    public function setItunesSummary($value)
-    {
-        if (iconv_strlen($value, $this->getEncoding()) > 4000) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('invalid parameter: "summary" may only'
-            . ' contain a maximum of 4000 characters');
-        }
-        $this->_data['summary'] = $value;
-        return $this;
-    }
-    
-    /**
-     * Overloading: proxy to internal setters
-     * 
-     * @param  string $method 
-     * @param  array $params 
-     * @return mixed
-     */
-    public function __call($method, array $params)
-    {
-        $point = Zend_Feed_Writer::lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
-        ) {
-            require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php';
-            throw new Zend_Feed_Writer_Exception_InvalidMethodException(
-                'invalid method: ' . $method
-            );
-        }
-        if (!array_key_exists($point, $this->_data) || empty($this->_data[$point])) {
-            return null;
-        }
-        return $this->_data[$point];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
deleted file mode 100644
index fc6b98d3a..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_ITunes_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        $this->_setAuthors($this->_dom, $this->_base);
-        $this->_setBlock($this->_dom, $this->_base);
-        $this->_setDuration($this->_dom, $this->_base);
-        $this->_setExplicit($this->_dom, $this->_base);
-        $this->_setKeywords($this->_dom, $this->_base);
-        $this->_setSubtitle($this->_dom, $this->_base);
-        $this->_setSummary($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append namespaces to entry root
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');  
-    }
-
-    /**
-     * Set entry authors
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $author) {
-            $el = $dom->createElement('itunes:author');
-            $text = $dom->createTextNode($author);
-            $el->appendChild($text);
-            $root->appendChild($el);
-            $this->_called = true;
-        }
-    }
-    
-    /**
-     * Set itunes block
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setBlock(DOMDocument $dom, DOMElement $root)
-    {
-        $block = $this->getDataContainer()->getItunesBlock();
-        if (is_null($block)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:block');
-        $text = $dom->createTextNode($block);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set entry duration
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDuration(DOMDocument $dom, DOMElement $root)
-    {
-        $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
-            return;
-        }
-        $el = $dom->createElement('itunes:duration');
-        $text = $dom->createTextNode($duration);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set explicit flag
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setExplicit(DOMDocument $dom, DOMElement $root)
-    {
-        $explicit = $this->getDataContainer()->getItunesExplicit();
-        if (is_null($explicit)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:explicit');
-        $text = $dom->createTextNode($explicit);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set entry keywords
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setKeywords(DOMDocument $dom, DOMElement $root)
-    {
-        $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:keywords');
-        $text = $dom->createTextNode(implode(',', $keywords));
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set entry subtitle
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
-    {
-        $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
-            return;
-        }
-        $el = $dom->createElement('itunes:subtitle');
-        $text = $dom->createTextNode($subtitle);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set entry summary
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setSummary(DOMDocument $dom, DOMElement $root)
-    {
-        $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
-            return;
-        }
-        $el = $dom->createElement('itunes:summary');
-        $text = $dom->createTextNode($summary);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
deleted file mode 100644
index 1fafdaa13..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_ITunes_Renderer_Feed
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-    
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render feed
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        $this->_setAuthors($this->_dom, $this->_base);
-        $this->_setBlock($this->_dom, $this->_base);
-        $this->_setCategories($this->_dom, $this->_base);
-        $this->_setImage($this->_dom, $this->_base);
-        $this->_setDuration($this->_dom, $this->_base);
-        $this->_setExplicit($this->_dom, $this->_base);
-        $this->_setKeywords($this->_dom, $this->_base);
-        $this->_setNewFeedUrl($this->_dom, $this->_base);
-        $this->_setOwners($this->_dom, $this->_base);
-        $this->_setSubtitle($this->_dom, $this->_base);
-        $this->_setSummary($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append feed namespaces
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');  
-    }
-
-    /**
-     * Set feed authors
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $author) {
-            $el = $dom->createElement('itunes:author');
-            $text = $dom->createTextNode($author);
-            $el->appendChild($text);
-            $root->appendChild($el);
-        }
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed itunes block
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setBlock(DOMDocument $dom, DOMElement $root)
-    {
-        $block = $this->getDataContainer()->getItunesBlock();
-        if (is_null($block)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:block');
-        $text = $dom->createTextNode($block);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed categories
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $cats = $this->getDataContainer()->getItunesCategories();
-        if (!$cats || empty($cats)) {
-            return;
-        }
-        foreach ($cats as $key=>$cat) {
-            if (!is_array($cat)) {
-                $el = $dom->createElement('itunes:category');
-                $el->setAttribute('text', $cat);
-                $root->appendChild($el);
-            } else {
-                $el = $dom->createElement('itunes:category');
-                $el->setAttribute('text', $key);
-                $root->appendChild($el);
-                foreach ($cat as $subcat) {
-                    $el2 = $dom->createElement('itunes:category');
-                    $el2->setAttribute('text', $subcat);
-                    $el->appendChild($el2);
-                }
-            }
-        }
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed image (icon)
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setImage(DOMDocument $dom, DOMElement $root)
-    {
-        $image = $this->getDataContainer()->getItunesImage();
-        if (!$image) {
-            return;
-        }
-        $el = $dom->createElement('itunes:image');
-        $el->setAttribute('href', $image);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed cumulative duration
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDuration(DOMDocument $dom, DOMElement $root)
-    {
-        $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
-            return;
-        }
-        $el = $dom->createElement('itunes:duration');
-        $text = $dom->createTextNode($duration);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set explicit flag
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setExplicit(DOMDocument $dom, DOMElement $root)
-    {
-        $explicit = $this->getDataContainer()->getItunesExplicit();
-        if (is_null($explicit)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:explicit');
-        $text = $dom->createTextNode($explicit);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed keywords
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setKeywords(DOMDocument $dom, DOMElement $root)
-    {
-        $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:keywords');
-        $text = $dom->createTextNode(implode(',', $keywords));
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed's new URL
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setNewFeedUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $url = $this->getDataContainer()->getItunesNewFeedUrl();
-        if (!$url) {
-            return;
-        }
-        $el = $dom->createElement('itunes:new-feed-url');
-        $text = $dom->createTextNode($url);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed owners 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setOwners(DOMDocument $dom, DOMElement $root)
-    {
-        $owners = $this->getDataContainer()->getItunesOwners();
-        if (!$owners || empty($owners)) {
-            return;
-        }
-        foreach ($owners as $owner) {
-            $el = $dom->createElement('itunes:owner');
-            $name = $dom->createElement('itunes:name');
-            $text = $dom->createTextNode($owner['name']);
-            $name->appendChild($text);
-            $email = $dom->createElement('itunes:email');
-            $text = $dom->createTextNode($owner['email']);
-            $email->appendChild($text);
-            $root->appendChild($el);
-            $el->appendChild($name);
-            $el->appendChild($email);
-        }
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed subtitle
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
-    {
-        $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
-            return;
-        }
-        $el = $dom->createElement('itunes:subtitle');
-        $text = $dom->createTextNode($subtitle);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set feed summary
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setSummary(DOMDocument $dom, DOMElement $root)
-    {
-        $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
-            return;
-        }
-        $el = $dom->createElement('itunes:summary');
-        $text = $dom->createTextNode($summary);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererAbstract.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererAbstract.php
deleted file mode 100644
index 9a0f93dfe..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererAbstract.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to padraic dot brady at yahoo dot com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer_Entry_Rss
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererInterface
- */
-require_once 'Zend/Feed/Writer/Extension/RendererInterface.php';
- 
- /**
- * @category   Zend
- * @package    Zend_Feed_Writer_Entry_Rss
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Feed_Writer_Extension_RendererAbstract
-    implements Zend_Feed_Writer_Extension_RendererInterface
-{
-    /**
-     * @var DOMDocument
-     */
-    protected $_dom = null;
-    
-    /**
-     * @var mixed
-     */
-    protected $_entry = null;
-    
-    /**
-     * @var DOMElement
-     */
-    protected $_base = null;
-    
-    /**
-     * @var mixed
-     */
-    protected $_container = null;
-    
-    /**
-     * @var string
-     */
-    protected $_type = null;
-    
-    /**
-     * @var DOMElement
-     */
-    protected $_rootElement = null;
-    
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Constructor
-     * 
-     * @param  mixed $container 
-     * @return void
-     */
-    public function __construct($container)
-    {
-        $this->_container = $container;
-    }
-    
-    /**
-     * Set feed encoding
-     * 
-     * @param  string $enc 
-     * @return Zend_Feed_Writer_Extension_RendererAbstract
-     */
-    public function setEncoding($enc)
-    {
-        $this->_encoding = $enc;
-        return $this;
-    }
-    
-    /**
-     * Get feed encoding
-     * 
-     * @return void
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-    
-    /**
-     * Set DOMDocument and DOMElement on which to operate
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $base 
-     * @return Zend_Feed_Writer_Extension_RendererAbstract
-     */
-    public function setDomDocument(DOMDocument $dom, DOMElement $base)
-    {
-        $this->_dom  = $dom;
-        $this->_base = $base;
-        return $this;
-    }
-    
-    /**
-     * Get data container being rendered
-     * 
-     * @return mixed
-     */
-    public function getDataContainer()
-    {
-        return $this->_container;
-    }
-    
-    /**
-     * Set feed type
-     * 
-     * @param  string $type 
-     * @return Zend_Feed_Writer_Extension_RendererAbstract
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-    
-    /**
-     * Get feedtype
-     * 
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-    
-    /**
-     * Set root element of document 
-     * 
-     * @param  DOMElement $root 
-     * @return Zend_Feed_Writer_Extension_RendererAbstract
-     */
-    public function setRootElement(DOMElement $root)
-    {
-        $this->_rootElement = $root;
-        return $this;
-    }
-    
-    /**
-     * Get root element
-     * 
-     * @return DOMElement
-     */
-    public function getRootElement()
-    {
-        return $this->_rootElement;
-    }
-    
-    /**
-     * Append namespaces to feed
-     * 
-     * @return void
-     */
-    abstract protected function _appendNamespaces();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererInterface.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererInterface.php
deleted file mode 100644
index e9c901417..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/RendererInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to padraic dot brady at yahoo dot com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Writer_Extension_RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  mixed $container 
-     * @return void
-     */
-    public function __construct($container);
-    
-    /**
-     * Set DOMDocument and DOMElement on which to operate
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $base 
-     * @return void
-     */
-    public function setDomDocument(DOMDocument $dom, DOMElement $base);
-    
-    /**
-     * Render
-     * 
-     * @return void
-     */
-    public function render();
-    
-    /**
-     * Retrieve container
-     * 
-     * @return mixed
-     */
-    public function getDataContainer();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
deleted file mode 100644
index aae81fbbd..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_Slash_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return; // RSS 2.0 only
-        }
-        $this->_setCommentCount($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append entry namespaces
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:slash',
-            'http://purl.org/rss/1.0/modules/slash/');  
-    }
-
-    /**
-     * Set entry comment count
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
-    {
-        $count = $this->getDataContainer()->getCommentCount();
-        if (!$count) {
-            $count = 0;
-        }
-        $tcount = $this->_dom->createElement('slash:comments');
-        $tcount->nodeValue = $count;
-        $root->appendChild($tcount);
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
deleted file mode 100644
index 1900ec459..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_Threading_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'rss') {
-            return; // Atom 1.0 only
-        }
-        $this->_setCommentLink($this->_dom, $this->_base);
-        $this->_setCommentFeedLinks($this->_dom, $this->_base);
-        $this->_setCommentCount($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append entry namespaces
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:thr',
-            'http://purl.org/syndication/thread/1.0');  
-    }
-    
-    /**
-     * Set comment link
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
-    {
-        $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
-            return;
-        }
-        $clink = $this->_dom->createElement('link');
-        $clink->setAttribute('rel', 'replies');
-        $clink->setAttribute('type', 'text/html');
-        $clink->setAttribute('href', $link);
-        $count = $this->getDataContainer()->getCommentCount();
-        if (!is_null($count)) {
-            $clink->setAttribute('thr:count', $count);
-        }
-        $root->appendChild($clink);
-        $this->_called = true;
-    }
-    
-    /**
-     * Set comment feed links
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
-            return;
-        }
-        foreach ($links as $link) {
-            $flink = $this->_dom->createElement('link');
-            $flink->setAttribute('rel', 'replies');
-            $flink->setAttribute('type', 'application/'. $link['type'] .'+xml');
-            $flink->setAttribute('href', $link['uri']);
-            $count = $this->getDataContainer()->getCommentCount();
-            if (!is_null($count)) {
-                $flink->setAttribute('thr:count', $count);
-            }
-            $root->appendChild($flink);
-            $this->_called = true;
-        }
-    }
-
-    /**
-     * Set entry comment count
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
-    {
-        $count = $this->getDataContainer()->getCommentCount();
-        if (is_null($count)) {
-            return;
-        }
-        $tcount = $this->_dom->createElement('thr:total');
-        $tcount->nodeValue = $count;
-        $root->appendChild($tcount);
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/airtime_mvc/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
deleted file mode 100644
index d6a17454d..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20326 2010-01-16 00:20:43Z padraic $
- */
- 
-/**
- * @see Zend_Feed_Writer_Extension_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Extension_WellFormedWeb_Renderer_Entry
-    extends Zend_Feed_Writer_Extension_RendererAbstract
-{
-
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $_called = false;
-    
-    /**
-     * Render entry
-     * 
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return; // RSS 2.0 only
-        }
-        $this->_setCommentFeedLinks($this->_dom, $this->_base);
-        if ($this->_called) {
-            $this->_appendNamespaces();
-        }
-    }
-    
-    /**
-     * Append entry namespaces
-     * 
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:wfw',
-            'http://wellformedweb.org/CommentAPI/');  
-    }
-    
-    /**
-     * Set entry comment feed links
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
-            return;
-        }
-        foreach ($links as $link) {
-            if ($link['type'] == 'rss') {
-                $flink = $this->_dom->createElement('wfw:commentRss');
-                $text = $dom->createTextNode($link['uri']);
-                $flink->appendChild($text);
-                $root->appendChild($flink);
-            }
-        }
-        $this->_called = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Feed.php b/airtime_mvc/library/Zend/Feed/Writer/Feed.php
deleted file mode 100644
index dd69dde83..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Feed.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20519 2010-01-22 14:06:24Z padraic $
- */
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Feed_Writer
- */
-require_once 'Zend/Feed/Writer.php';
-
-/**
- * @see Zend_Feed_Writer_Entry
- */
-require_once 'Zend/Feed/Writer/Entry.php';
-
-/**
- * @see Zend_Feed_Writer_Deleted
- */
-require_once 'Zend/Feed/Writer/Deleted.php';
-
-/**
- * @see Zend_Feed_Writer_Renderer_Feed_Atom
- */
-require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php';
-
-/**
- * @see Zend_Feed_Writer_Renderer_Feed_Rss
- */
-require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php';
-
-require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Feed extends Zend_Feed_Writer_Feed_FeedAbstract
-implements Iterator, Countable
-{
-
-    /**
-     * Contains all entry objects
-     *
-     * @var array
-     */
-    protected $_entries = array();
-
-    /**
-     * A pointer for the iterator to keep track of the entries array
-     *
-     * @var int
-     */
-    protected $_entriesKey = 0;
-
-    /**
-     * Creates a new Zend_Feed_Writer_Entry data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return Zend_Feed_Writer_Entry
-     */
-    public function createEntry()
-    {
-        $entry = new Zend_Feed_Writer_Entry;
-        if ($this->getEncoding()) {
-            $entry->setEncoding($this->getEncoding());
-        }
-        $entry->setType($this->getType());
-        return $entry;
-    }
-
-    /**
-     * Appends a Zend_Feed_Writer_Deleted object representing a new entry tombstone
-     * to the feed data container's internal group of entries.
-     *
-     * @param Zend_Feed_Writer_Deleted $entry
-     */
-    public function addTombstone(Zend_Feed_Writer_Deleted $deleted)
-    {
-        $this->_entries[] = $deleted;
-    }
-    
-    /**
-     * Creates a new Zend_Feed_Writer_Deleted data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return Zend_Feed_Writer_Deleted
-     */
-    public function createTombstone()
-    {
-        $deleted = new Zend_Feed_Writer_Deleted;
-        if ($this->getEncoding()) {
-            $deleted->setEncoding($this->getEncoding());
-        }
-        $deleted->setType($this->getType());
-        return $deleted;
-    }
-
-    /**
-     * Appends a Zend_Feed_Writer_Entry object representing a new entry/item
-     * the feed data container's internal group of entries.
-     *
-     * @param Zend_Feed_Writer_Entry $entry
-     */
-    public function addEntry(Zend_Feed_Writer_Entry $entry)
-    {
-        $this->_entries[] = $entry;
-    }
-
-    /**
-     * Removes a specific indexed entry from the internal queue. Entries must be
-     * added to a feed container in order to be indexed.
-     *
-     * @param int $index
-     */
-    public function removeEntry($index)
-    {
-        if (isset($this->_entries[$index])) {
-            unset($this->_entries[$index]);
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Undefined index: ' . $index . '. Entry does not exist.');
-    }
-
-    /**
-     * Retrieve a specific indexed entry from the internal queue. Entries must be
-     * added to a feed container in order to be indexed.
-     *
-     * @param int $index
-     */
-    public function getEntry($index = 0)
-    {
-        if (isset($this->_entries[$index])) {
-            return $this->_entries[$index];
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Undefined index: ' . $index . '. Entry does not exist.');
-    }
-
-    /**
-     * Orders all indexed entries by date, thus offering date ordered readable
-     * content where a parser (or Homo Sapien) ignores the generic rule that
-     * XML element order is irrelevant and has no intrinsic meaning.
-     *
-     * Using this method will alter the original indexation.
-     *
-     * @return void
-     */
-    public function orderByDate()
-    {
-        /**
-         * Could do with some improvement for performance perhaps
-         */
-        $timestamp = time();
-        $entries = array();
-        foreach ($this->_entries as $entry) {
-            if ($entry->getDateModified()) {
-                $timestamp = (int) $entry->getDateModified()->get(Zend_Date::TIMESTAMP);
-            } elseif ($entry->getDateCreated()) {
-                $timestamp = (int) $entry->getDateCreated()->get(Zend_Date::TIMESTAMP);
-            }
-            $entries[$timestamp] = $entry;
-        }
-        krsort($entries, SORT_NUMERIC);
-        $this->_entries = array_values($entries);
-    }
-
-    /**
-     * Get the number of feed entries.
-     * Required by the Iterator interface.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_entries);
-    }
-
-	/**
-     * Return the current entry
-     *
-     * @return Zend_Feed_Reader_Entry_Interface
-     */
-    public function current()
-    {
-        return $this->_entries[$this->key()];
-    }
-
-    /**
-     * Return the current feed key
-     *
-     * @return unknown
-     */
-    public function key()
-    {
-        return $this->_entriesKey;
-    }
-
-	/**
-     * Move the feed pointer forward
-     *
-     * @return void
-     */
-    public function next()
-    {
-        ++$this->_entriesKey;
-    }
-
-    /**
-     * Reset the pointer in the feed object
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_entriesKey = 0;
-    }
-
-    /**
-     * Check to see if the iterator is still valid
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return 0 <= $this->_entriesKey && $this->_entriesKey < $this->count();
-    }
-
-    /**
-     * Attempt to build and return the feed resulting from the data set
-     *
-     * @param $type The feed type "rss" or "atom" to export as
-     * @return string
-     */
-    public function export($type, $ignoreExceptions = false)
-    {
-        $this->setType(strtolower($type));
-        $type = ucfirst($this->getType());
-        if ($type !== 'Rss' && $type !== 'Atom') {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid feed type specified: ' . $type . '.'
-            . ' Should be one of "rss" or "atom".');
-        }
-        $renderClass = 'Zend_Feed_Writer_Renderer_Feed_' . $type;
-        $renderer = new $renderClass($this);
-        if ($ignoreExceptions) {
-            $renderer->ignoreExceptions();
-        }
-        return $renderer->render()->saveXml();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Feed/FeedAbstract.php b/airtime_mvc/library/Zend/Feed/Writer/Feed/FeedAbstract.php
deleted file mode 100644
index 24fbe7302..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Feed/FeedAbstract.php
+++ /dev/null
@@ -1,716 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Feed_Writer
- */
-require_once 'Zend/Feed/Writer.php';
-
-/**
- * @see Zend_Feed_Writer_Entry
- */
-require_once 'Zend/Feed/Writer/Entry.php';
-
-/**
- * @see Zend_Feed_Writer_Renderer_Feed_Atom
- */
-require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php';
-
-/**
- * @see Zend_Feed_Writer_Renderer_Feed_Rss
- */
-require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Feed_FeedAbstract
-{
-    /**
-     * Contains all Feed level date to append in feed output
-     *
-     * @var array
-     */
-    protected $_data = array();
-    
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $_type = null;
-    
-    /**
-     * Constructor: Primarily triggers the registration of core extensions and
-     * loads those appropriate to this data container.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        Zend_Feed_Writer::registerCoreExtensions();
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Set a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function addAuthor($name, $email = null, $uri = null)
-    {
-        $author = array();
-        if (is_array($name)) {
-            if (!array_key_exists('name', $name) || empty($name['name']) || !is_string($name['name'])) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value');
-            }
-            $author['name'] = $name['name'];
-            if (isset($name['email'])) {
-                if (empty($name['email']) || !is_string($name['email'])) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string');
-                }
-                $author['email'] = $name['email'];
-            }
-            if (isset($name['uri'])) {
-                if (empty($name['uri']) || !is_string($name['uri']) || !Zend_Uri::check($name['uri'])) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
-                }
-                $author['uri'] = $name['uri'];
-            }
-        } else {
-            if (empty($name['name']) || !is_string($name['name'])) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value');
-            }
-            $author['name'] = $name;
-            if (isset($email)) {
-                if (empty($email) || !is_string($email)) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string');
-                }
-                $author['email'] = $email;
-            }
-            if (isset($uri)) {
-                if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) {
-                    require_once 'Zend/Feed/Exception.php';
-                    throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI');
-                }
-                $author['uri'] = $uri;
-            }
-        }
-        $this->_data['authors'][] = $author;
-    }
-
-    /**
-     * Set an array with feed authors
-     *
-     * @return array
-     */
-    public function addAuthors(array $authors)
-    {
-        foreach($authors as $author) {
-            $this->addAuthor($author);
-        }
-    }
-
-    /**
-     * Set the copyright entry
-     *
-     * @return string|null
-     */
-    public function setCopyright($copyright)
-    {
-        if (empty($copyright) || !is_string($copyright)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['copyright'] = $copyright;
-    }
-
-    /**
-     * Set the feed creation date
-     *
-     * @param null|integer|Zend_Date
-     */
-    public function setDateCreated($date = null)
-    {
-        $zdate = null;
-        if (is_null($date)) {
-            $zdate = new Zend_Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
-            $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
-        } elseif ($date instanceof Zend_Date) {
-            $zdate = $date;
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
-        }
-        $this->_data['dateCreated'] = $zdate;
-    }
-
-    /**
-     * Set the feed modification date
-     *
-     * @param null|integer|Zend_Date
-     */
-    public function setDateModified($date = null)
-    {
-        $zdate = null;
-        if (is_null($date)) {
-            $zdate = new Zend_Date;
-        } elseif (ctype_digit($date) && strlen($date) == 10) {
-            $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP);
-        } elseif ($date instanceof Zend_Date) {
-            $zdate = $date;
-        } else {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter');
-        }
-        $this->_data['dateModified'] = $zdate;
-    }
-
-    /**
-     * Set the feed description
-     *
-     * @return string|null
-     */
-    public function setDescription($description)
-    {
-        if (empty($description) || !is_string($description)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['description'] = $description;
-    }
-
-    /**
-     * Set the feed generator entry
-     *
-     * @return string|null
-     */
-    public function setGenerator($name, $version = null, $uri = null)
-    {
-        if (empty($name) || !is_string($name)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string');
-        }
-        $generator = array('name' => $name);
-        if (isset($version)) {
-            if (empty($version) || !is_string($version)) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "version" must be a non-empty string');
-            }
-            $generator['version'] = $version;
-        }
-        if (isset($uri)) {
-            if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
-            }
-            $generator['uri'] = $uri;
-        }
-        $this->_data['generator'] = $generator;
-    }
-
-    /**
-     * Set the feed ID - URI or URN (via PCRE pattern) supported
-     *
-     * @return string|null
-     */
-    public function setId($id)
-    {
-        if ((empty($id) || !is_string($id) || !Zend_Uri::check($id)) &&
-        !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->_data['id'] = $id;
-    }
-
-    /**
-     * Set the feed language
-     *
-     * @return string|null
-     */
-    public function setLanguage($language)
-    {
-        if (empty($language) || !is_string($language)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['language'] = $language;
-    }
-
-    /**
-     * Set a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function setLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->_data['link'] = $link;
-    }
-
-    /**
-     * Set a link to an XML feed for any feed type/version
-     *
-     * @return string|null
-     */
-    public function setFeedLink($link, $type)
-    {
-        if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI');
-        }
-        if (!in_array(strtolower($type), array('rss', 'rdf', 'atom'))) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom');
-        }
-        $this->_data['feedLinks'][strtolower($type)] = $link;
-    }
-
-    /**
-     * Set the feed title
-     *
-     * @return string|null
-     */
-    public function setTitle($title)
-    {
-        if (empty($title) || !is_string($title)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['title'] = $title;
-    }
-
-    /**
-     * Set the feed character encoding
-     *
-     * @param string $encoding
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->_data['encoding'] = $encoding;
-    }
-    
-    /**
-     * Set the feed's base URL
-     *
-     * @param string $url
-     */
-    public function setBaseUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "url" array value'
-            . ' must be a non-empty string and valid URI/IRI');
-        }
-        $this->_data['baseUrl'] = $url;
-    }
-    
-    /**
-     * Add a Pubsubhubbub hub endpoint URL
-     *
-     * @param string $url
-     */
-    public function addHub($url)
-    {
-        if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: "url" array value'
-            . ' must be a non-empty string and valid URI/IRI');
-        }
-        if (!isset($this->_data['hubs'])) {
-            $this->_data['hubs'] = array();
-        }
-        $this->_data['hubs'][] = $url;
-    }
-    
-    /**
-     * Add Pubsubhubbub hub endpoint URLs
-     *
-     * @param array $urls
-     */
-    public function addHubs(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHub($url);
-        }
-    }
-    
-    /**
-     * Add a feed category
-     *
-     * @param string $category
-     */ 
-    public function addCategory(array $category)
-    {
-        if (!isset($category['term'])) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Each category must be an array and '
-            . 'contain at least a "term" element containing the machine '
-            . ' readable category name');
-        }
-        if (isset($category['scheme'])) {
-            if (empty($category['scheme']) 
-                || !is_string($category['scheme'])
-                || !Zend_Uri::check($category['scheme'])
-            ) {
-                require_once 'Zend/Feed/Exception.php';
-                throw new Zend_Feed_Exception('The Atom scheme or RSS domain of'
-                . ' a category must be a valid URI');
-            }
-        }
-        if (!isset($this->_data['categories'])) {
-            $this->_data['categories'] = array();
-        }
-        $this->_data['categories'][] = $category;
-    }
-    
-    /**
-     * Set an array of feed categories
-     *
-     * @param array $categories
-     */
-    public function addCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        if (isset($this->_data['authors'][$index])) {
-            return $this->_data['authors'][$index];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (!array_key_exists('authors', $this->_data)) {
-            return null;
-        }
-        return $this->_data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (!array_key_exists('copyright', $this->_data)) {
-            return null;
-        }
-        return $this->_data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        if (!array_key_exists('dateCreated', $this->_data)) {
-            return null;
-        }
-        return $this->_data['dateCreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified()
-    {
-        if (!array_key_exists('dateModified', $this->_data)) {
-            return null;
-        }
-        return $this->_data['dateModified'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (!array_key_exists('description', $this->_data)) {
-            return null;
-        }
-        return $this->_data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (!array_key_exists('generator', $this->_data)) {
-            return null;
-        }
-        return $this->_data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (!array_key_exists('id', $this->_data)) {
-            return null;
-        }
-        return $this->_data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (!array_key_exists('language', $this->_data)) {
-            return null;
-        }
-        return $this->_data['language'];
-    }
-
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (!array_key_exists('link', $this->_data)) {
-            return null;
-        }
-        return $this->_data['link'];
-    }
-
-    /**
-     * Get a link to the XML feed
-     *
-     * @return string|null
-     */
-    public function getFeedLinks()
-    {
-        if (!array_key_exists('feedLinks', $this->_data)) {
-            return null;
-        }
-        return $this->_data['feedLinks'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (!array_key_exists('title', $this->_data)) {
-            return null;
-        }
-        return $this->_data['title'];
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->_data)) {
-            return 'UTF-8';
-        }
-        return $this->_data['encoding'];
-    }
-    
-    /**
-     * Get the feed's base url
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (!array_key_exists('baseUrl', $this->_data)) {
-            return null;
-        }
-        return $this->_data['baseUrl'];
-    }
-    
-    /**
-     * Get the URLs used as Pubsubhubbub hubs endpoints
-     *
-     * @return string|null
-     */
-    public function getHubs()
-    {
-        if (!array_key_exists('hubs', $this->_data)) {
-            return null;
-        }
-        return $this->_data['hubs'];
-    }
-    
-    /**
-     * Get the feed categories
-     *
-     * @return string|null
-     */
-    public function getCategories()
-    {
-        if (!array_key_exists('categories', $this->_data)) {
-            return null;
-        }
-        return $this->_data['categories'];
-    }
-
-    /**
-     * Resets the instance and deletes all data
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->_data = array();
-    }
-    
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-    }
-    
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-    
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     */
-    public function remove($name)
-    {
-        if (isset($this->_data[$name])) {
-            unset($this->_data[$name]);
-        }
-    }
-    
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Feed_Exception if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->_extensions as $extension) {
-            try {
-                return call_user_func_array(array($extension, $method), $args);
-            } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) {
-            }
-        }
-        require_once 'Zend/Feed/Exception.php';
-        throw new Zend_Feed_Exception('Method: ' . $method
-            . ' does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Load extensions from Zend_Feed_Writer
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all = Zend_Feed_Writer::getExtensions();
-        $exts = $all['feed'];
-        foreach ($exts as $ext) {
-            $className = Zend_Feed_Writer::getPluginLoader()->getClassName($ext);
-            $this->_extensions[$ext] = new $className();
-            $this->_extensions[$ext]->setEncoding($this->getEncoding());
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
deleted file mode 100644
index b029dede4..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20507 2010-01-21 22:21:07Z padraic $
- */
-
-/**
- * @see Zend_Feed_Writer_Renderer_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/Source.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Entry_Atom
-    extends Zend_Feed_Writer_Renderer_RendererAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Entry $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Entry $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render atom entry
-     * 
-     * @return Zend_Feed_Writer_Renderer_Entry_Atom
-     */
-    public function render()
-    {
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $entry = $this->_dom->createElementNS(Zend_Feed_Writer::NAMESPACE_ATOM_10, 'entry');
-        $this->_dom->appendChild($entry);
-        
-        $this->_setSource($this->_dom, $entry);
-        $this->_setTitle($this->_dom, $entry);
-        $this->_setDescription($this->_dom, $entry);
-        $this->_setDateCreated($this->_dom, $entry);
-        $this->_setDateModified($this->_dom, $entry);
-        $this->_setLink($this->_dom, $entry);
-        $this->_setId($this->_dom, $entry);
-        $this->_setAuthors($this->_dom, $entry);
-        $this->_setEnclosure($this->_dom, $entry);
-        $this->_setContent($this->_dom, $entry);
-        $this->_setCategories($this->_dom, $entry);
-
-        foreach ($this->_extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $entry);
-            $ext->render();
-        }
-        
-        return $this;
-    }
-    
-    /**
-     * Set entry title
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getTitle()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 entry elements MUST contain exactly one'
-            . ' atom:title element but a title has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $title->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection($this->getDataContainer()->getTitle());
-        $title->appendChild($cdata);
-    }
-    
-    /**
-     * Set entry description
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDescription()) {
-            return; // unless src content or base64
-        }
-        $subtitle = $dom->createElement('summary');
-        $root->appendChild($subtitle);
-        $subtitle->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection(
-            $this->getDataContainer()->getDescription()
-        );
-        $subtitle->appendChild($cdata);
-    }
-    
-    /**
-     * Set date entry was modified
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateModified()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 entry elements MUST contain exactly one'
-            . ' atom:updated element but a modification date has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $updated = $dom->createElement('updated');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->get(Zend_Date::ISO_8601)
-        );
-        $updated->appendChild($text);
-    }
-    
-    /**
-     * Set date entry was created
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        $el = $dom->createElement('published');
-        $root->appendChild($el);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateCreated()->get(Zend_Date::ISO_8601)
-        );
-        $el->appendChild($text);
-    }
-    
-    /**
-     * Set entry authors 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->_container->getAuthors();
-        if ((!$authors || empty($authors))) {
-            /**
-             * This will actually trigger an Exception at the feed level if
-             * a feed level author is not set.
-             */
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('author');
-            $name = $this->_dom->createElement('name');
-            $author->appendChild($name);
-            $root->appendChild($author);
-            $text = $dom->createTextNode($data['name']);
-            $name->appendChild($text);
-            if (array_key_exists('email', $data)) {
-                $email = $this->_dom->createElement('email');
-                $author->appendChild($email);
-                $text = $dom->createTextNode($data['email']);
-                $email->appendChild($text);
-            }
-            if (array_key_exists('uri', $data)) {
-                $uri = $this->_dom->createElement('uri');
-                $author->appendChild($uri);
-                $text = $dom->createTextNode($data['uri']);
-                $uri->appendChild($text);
-            }
-        }
-    }
-    
-    /**
-     * Set entry enclosure
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->_container->getEnclosure();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $enclosure = $this->_dom->createElement('link');
-        $enclosure->setAttribute('rel', 'enclosure');
-        $enclosure->setAttribute('type', $data['type']);
-        $enclosure->setAttribute('length', $data['length']);
-        $enclosure->setAttribute('href', $data['uri']);
-        $root->appendChild($enclosure);
-    }
-    
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $link->setAttribute('rel', 'alternate');
-        $link->setAttribute('type', 'text/html');
-        $link->setAttribute('href', $this->getDataContainer()->getLink());
-    }
-    
-    /**
-     * Set entry identifier 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 entry elements MUST contain exactly one '
-            . 'atom:id element, or as an alternative, we can use the same '
-            . 'value as atom:link however neither a suitable link nor an '
-            . 'id have been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        if (!Zend_Uri::check($this->getDataContainer()->getId()) &&
-        !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $this->getDataContainer()->getId())) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Atom 1.0 IDs must be a valid URI/IRI');
-        }
-        $id = $dom->createElement('id');
-        $root->appendChild($id);
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-    }
-    
-    /**
-     * Set entry content 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setContent(DOMDocument $dom, DOMElement $root)
-    {
-        $content = $this->getDataContainer()->getContent();
-        if (!$content && !$this->getDataContainer()->getLink()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 entry elements MUST contain exactly one '
-            . 'atom:content element, or as an alternative, at least one link '
-            . 'with a rel attribute of "alternate" to indicate an alternate '
-            . 'method to consume the content.';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        if (!$content) {
-            return;
-        }
-        $element = $dom->createElement('content');
-        $element->setAttribute('type', 'xhtml');
-        $xhtmlElement = $this->_loadXhtml($content);
-        $xhtml = $dom->importNode($xhtmlElement, true);
-        $element->appendChild($xhtml);
-        $root->appendChild($element);
-    }
-    
-    /**
-     * Load a HTML string and attempt to normalise to XML
-     */
-    protected function _loadXhtml($content)
-    {
-        $xhtml = '';
-        if (class_exists('tidy', false)) {
-            $tidy = new tidy;
-            $config = array(
-                'output-xhtml' => true,
-                'show-body-only' => true
-            );
-            $encoding = str_replace('-', '', $this->getEncoding());
-            $tidy->parseString($content, $config, $encoding);
-            $tidy->cleanRepair();
-            $xhtml = (string) $tidy;
-        } else {
-            $xhtml = $content;
-        }
-        $xhtml = preg_replace(array(
-            "/(<[\/]?)([a-zA-Z]+)/"   
-        ), '$1xhtml:$2', $xhtml);
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        $dom->loadXML('<xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">'
-            . $xhtml . '</xhtml:div>');
-        return $dom->documentElement;
-    }
-    
-    /**
-     * Set entry cateories 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            $category->setAttribute('term', $cat['term']);
-            if (isset($cat['label'])) {
-                $category->setAttribute('label', $cat['label']);
-            } else {
-                $category->setAttribute('label', $cat['term']);
-            }
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('scheme', $cat['scheme']);
-            }
-            $root->appendChild($category);
-        }
-    }
-    
-    /**
-     * Append Source element (Atom 1.0 Feed Metadata)
-     *
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setSource(DOMDocument $dom, DOMElement $root)
-    {
-        $source = $this->getDataContainer()->getSource();
-        if (!$source) {
-            return;
-        }
-        $renderer = new Zend_Feed_Writer_Renderer_Feed_Atom_Source($source);
-        $renderer->setType($this->getType());
-        $element = $renderer->render()->getElement();
-        $imported = $dom->importNode($element, true);
-        $root->appendChild($imported); 
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
deleted file mode 100644
index f7baf60c5..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20506 2010-01-21 22:19:05Z padraic $
- */
-
-/**
- * @see Zend_Feed_Writer_Renderer_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Entry_Atom_Deleted
-    extends Zend_Feed_Writer_Renderer_RendererAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Deleted $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Deleted $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render atom entry
-     * 
-     * @return Zend_Feed_Writer_Renderer_Entry_Atom
-     */
-    public function render()
-    {
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $entry = $this->_dom->createElement('at:deleted-entry');
-        $this->_dom->appendChild($entry);
-        
-        $entry->setAttribute('ref', $this->_container->getReference());
-        $entry->setAttribute('when', $this->_container->getWhen()->get(Zend_Date::ISO_8601));
-        
-        $this->_setBy($this->_dom, $entry);
-        $this->_setComment($this->_dom, $entry);
-        
-        return $this;
-    }
-    
-    /**
-     * Set tombstone comment
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setComment(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getComment()) {
-            return;
-        }
-        $c = $dom->createElement('at:comment');
-        $root->appendChild($c);
-        $c->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection($this->getDataContainer()->getComment());
-        $c->appendChild($cdata);
-    }
-    
-    /**
-     * Set entry authors 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setBy(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->_container->getBy();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $author = $this->_dom->createElement('at:by');
-        $name = $this->_dom->createElement('name');
-        $author->appendChild($name);
-        $root->appendChild($author);
-        $text = $dom->createTextNode($data['name']);
-        $name->appendChild($text);
-        if (array_key_exists('email', $data)) {
-            $email = $this->_dom->createElement('email');
-            $author->appendChild($email);
-            $text = $dom->createTextNode($data['email']);
-            $email->appendChild($text);
-        }
-        if (array_key_exists('uri', $data)) {
-            $uri = $this->_dom->createElement('uri');
-            $author->appendChild($uri);
-            $text = $dom->createTextNode($data['uri']);
-            $uri->appendChild($text);
-        }
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
deleted file mode 100644
index 6f2c349d5..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20241 2010-01-12 20:19:46Z padraic $
- */
-
-/**
- * @see Zend_Feed_Writer_Renderer_RendererAbstract
- */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Entry_Rss
-    extends Zend_Feed_Writer_Renderer_RendererAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Entry $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Entry $container)
-    {
-        parent::__construct($container);
-    }
-    
-    /**
-     * Render RSS entry
-     * 
-     * @return Zend_Feed_Writer_Renderer_Entry_Rss
-     */
-    public function render()
-    {
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $this->_dom->substituteEntities = false;
-        $entry = $this->_dom->createElement('item');
-        $this->_dom->appendChild($entry);
-        
-        $this->_setTitle($this->_dom, $entry);
-        $this->_setDescription($this->_dom, $entry);
-        $this->_setDateCreated($this->_dom, $entry);
-        $this->_setDateModified($this->_dom, $entry);
-        $this->_setLink($this->_dom, $entry);
-        $this->_setId($this->_dom, $entry);
-        $this->_setAuthors($this->_dom, $entry);
-        $this->_setEnclosure($this->_dom, $entry);
-        $this->_setCommentLink($this->_dom, $entry);
-        $this->_setCategories($this->_dom, $entry);
-        foreach ($this->_extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $entry);
-            $ext->render();
-        }
-
-        return $this;
-    }
-    
-    /**
-     * Set entry title
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
-            . ' title element but a title has not been set. In addition, there'
-            . ' is no description as required in the absence of a title.';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-    
-    /**
-     * Set entry description
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
-            . ' description element but a description has not been set. In'
-            . ' addition, there is no title element as required in the absence'
-            . ' of a description.';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        if (!$this->getDataContainer()->getDescription()) {
-            return;
-        }
-        $subtitle = $dom->createElement('description');
-        $root->appendChild($subtitle);
-        $text = $dom->createCDATASection($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-    
-    /**
-     * Set date entry was last modified
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateModified()) {
-            return;
-        }
-
-        $updated = $dom->createElement('pubDate');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->get(Zend_Date::RSS)
-        );
-        $updated->appendChild($text);
-    }
-    
-    /**
-     * Set date entry was created
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if (!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-    
-    /**
-     * Set entry authors
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->_container->getAuthors();
-        if ((!$authors || empty($authors))) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('author');
-            $name = $data['name'];
-            if (array_key_exists('email', $data)) {
-                $name = $data['email'] . ' (' . $data['name'] . ')';
-            }
-            $text = $dom->createTextNode($name);
-            $author->appendChild($text);
-            $root->appendChild($author);
-        }
-    }
-    
-    /**
-     * Set entry enclosure
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->_container->getEnclosure();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $enclosure = $this->_dom->createElement('enclosure');
-        $enclosure->setAttribute('type', $data['type']);
-        $enclosure->setAttribute('length', $data['length']);
-        $enclosure->setAttribute('url', $data['uri']);
-        $root->appendChild($enclosure);
-    }
-    
-    /**
-     * Set link to entry
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $text = $dom->createTextNode($this->getDataContainer()->getLink());
-        $link->appendChild($text);
-    }
-    
-    /**
-     * Set entry identifier
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            return;
-        }
-
-        $id = $dom->createElement('guid');
-        $root->appendChild($id);
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-        if (!Zend_Uri::check($this->getDataContainer()->getId())) {
-            $id->setAttribute('isPermaLink', 'false');
-        }
-    }
-    
-    /**
-     * Set link to entry comments
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
-    {
-        $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
-            return;
-        }
-        $clink = $this->_dom->createElement('comments');
-        $text = $dom->createTextNode($link);
-        $clink->appendChild($text);
-        $root->appendChild($clink);
-    }
-    
-    /**
-     * Set entry categories
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('domain', $cat['scheme']);
-            }
-            $text = $dom->createCDATASection($cat['term']);
-            $category->appendChild($text);
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
deleted file mode 100644
index ed080c151..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20519 2010-01-22 14:06:24Z padraic $
- */
-
-/** @see Zend_Feed_Writer_Feed */
-require_once 'Zend/Feed/Writer/Feed.php';
-
-/** @see Zend_Version */
-require_once 'Zend/Version.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererInterface */
-require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php';
-
-/** @see Zend_Feed_Writer_Renderer_Entry_Atom */
-require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php';
-
-/** @see Zend_Feed_Writer_Renderer_Entry_Atom_Deleted */
-require_once 'Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererAbstract */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Feed_Atom
-    extends Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Feed $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Feed $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render Atom feed
-     * 
-     * @return Zend_Feed_Writer_Renderer_Feed_Atom
-     */
-    public function render()
-    {
-        if (!$this->_container->getEncoding()) {
-            $this->_container->setEncoding('UTF-8');
-        }
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $root = $this->_dom->createElementNS(
-            Zend_Feed_Writer::NAMESPACE_ATOM_10, 'feed'
-        );
-        $this->setRootElement($root);
-        $this->_dom->appendChild($root);
-        $this->_setLanguage($this->_dom, $root);
-        $this->_setBaseUrl($this->_dom, $root);
-        $this->_setTitle($this->_dom, $root);
-        $this->_setDescription($this->_dom, $root);
-        $this->_setDateCreated($this->_dom, $root);
-        $this->_setDateModified($this->_dom, $root);
-        $this->_setGenerator($this->_dom, $root);
-        $this->_setLink($this->_dom, $root);
-        $this->_setFeedLinks($this->_dom, $root);
-        $this->_setId($this->_dom, $root);
-        $this->_setAuthors($this->_dom, $root);
-        $this->_setCopyright($this->_dom, $root);
-        $this->_setCategories($this->_dom, $root);
-        $this->_setHubs($this->_dom, $root);
-        
-        foreach ($this->_extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $root);
-            $ext->render();
-        }
-        
-        foreach ($this->_container as $entry) {
-            if ($this->getDataContainer()->getEncoding()) {
-                $entry->setEncoding($this->getDataContainer()->getEncoding());
-            }
-            if ($entry instanceof Zend_Feed_Writer_Entry) {
-                $renderer = new Zend_Feed_Writer_Renderer_Entry_Atom($entry);
-            } else {
-                if (!$this->_dom->documentElement->hasAttribute('xmlns:at')) {
-                    $this->_dom->documentElement->setAttribute(
-                        'xmlns:at', 'http://purl.org/atompub/tombstones/1.0'
-                    );
-                }
-                $renderer = new Zend_Feed_Writer_Renderer_Entry_Atom_Deleted($entry);
-            }
-            if ($this->_ignoreExceptions === true) {
-                $renderer->ignoreExceptions();
-            }
-            $renderer->setType($this->getType());
-            $renderer->setRootElement($this->_dom->documentElement);
-            $renderer->render();
-            $element = $renderer->getElement();
-            $imported = $this->_dom->importNode($element, true);
-            $root->appendChild($imported);
-        }
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php
deleted file mode 100644
index 35be0464d..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Feed_Writer_Feed */
-require_once 'Zend/Feed/Writer/Feed.php';
-
-/** @see Zend_Version */
-require_once 'Zend/Version.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererInterface */
-require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php';
-
-/** @see Zend_Feed_Writer_Renderer_Entry_Atom */
-require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererAbstract */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract
-    extends Zend_Feed_Writer_Renderer_RendererAbstract
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Feed $container 
-     * @return void
-     */
-    public function __construct ($container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Set feed language
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setLanguage(DOMDocument $dom, DOMElement $root)
-    {
-        if ($this->getDataContainer()->getLanguage()) {
-            $root->setAttribute('xml:lang', $this->getDataContainer()
-                ->getLanguage());
-        }
-    }
-
-    /**
-     * Set feed title
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getTitle()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-            . ' atom:title element but a title has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $title->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set feed description
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDescription()) {
-            return;
-        }
-        $subtitle = $dom->createElement('subtitle');
-        $root->appendChild($subtitle);
-        $subtitle->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date feed was last modified
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateModified()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-            . ' atom:updated element but a modification date has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $updated = $dom->createElement('updated');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->get(Zend_Date::ISO_8601)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set feed generator string
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Zend_Version::VERSION, 'http://framework.zend.com');
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-
-    /**
-     * Set link to feed
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $link->setAttribute('rel', 'alternate');
-        $link->setAttribute('type', 'text/html');
-        $link->setAttribute('href', $this->getDataContainer()->getLink());
-    }
-
-    /**
-     * Set feed links
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $flinks = $this->getDataContainer()->getFeedLinks();
-        if(!$flinks || !array_key_exists('atom', $flinks)) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
-            . 'element with a rel attribute value of "self".  This is the '
-            . 'preferred URI for retrieving Atom Feed Documents representing '
-            . 'this Atom feed but a feed link has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        foreach ($flinks as $type => $href) {
-            $mime = 'application/' . strtolower($type) . '+xml';
-            $flink = $dom->createElement('link');
-            $root->appendChild($flink);
-            $flink->setAttribute('rel', 'self');
-            $flink->setAttribute('type', $mime);
-            $flink->setAttribute('href', $href);
-        }
-    }
-    
-    /**
-     * Set feed authors 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->_container->getAuthors();
-        if (!$authors || empty($authors)) {
-            /**
-             * Technically we should defer an exception until we can check
-             * that all entries contain an author. If any entry is missing
-             * an author, then a missing feed author element is invalid
-             */
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('author');
-            $name = $this->_dom->createElement('name');
-            $author->appendChild($name);
-            $root->appendChild($author);
-            $text = $dom->createTextNode($data['name']);
-            $name->appendChild($text);
-            if (array_key_exists('email', $data)) {
-                $email = $this->_dom->createElement('email');
-                $author->appendChild($email);
-                $text = $dom->createTextNode($data['email']);
-                $email->appendChild($text);
-            }
-            if (array_key_exists('uri', $data)) {
-                $uri = $this->_dom->createElement('uri');
-                $author->appendChild($uri);
-                $text = $dom->createTextNode($data['uri']);
-                $uri->appendChild($text);
-            }
-        }
-    }
-
-    /**
-     * Set feed identifier
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'Atom 1.0 feed elements MUST contain exactly one '
-            . 'atom:id element, or as an alternative, we can use the same '
-            . 'value as atom:link however neither a suitable link nor an '
-            . 'id have been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        $id = $dom->createElement('id');
-        $root->appendChild($id);
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-    }
-    
-    /**
-     * Set feed copyright
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCopyright(DOMDocument $dom, DOMElement $root)
-    {
-        $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
-            return;
-        }
-        $copy = $dom->createElement('rights');
-        $root->appendChild($copy);
-        $text = $dom->createTextNode($copyright);
-        $copy->appendChild($text);
-    }
-    
-    /**
-     * Set date feed was created 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if(!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-    
-    /**
-     * Set base URL to feed links
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
-            return;
-        }
-        $root->setAttribute('xml:base', $baseUrl);
-    }
-    
-    /**
-     * Set hubs to which this feed pushes 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setHubs(DOMDocument $dom, DOMElement $root)
-    {
-        $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs) {
-            return;
-        }
-        foreach ($hubs as $hubUrl) {
-            $hub = $dom->createElement('link');
-            $hub->setAttribute('rel', 'hub');
-            $hub->setAttribute('href', $hubUrl);
-            $root->appendChild($hub);
-        }
-    }
-    
-    /**
-     * Set feed cateories 
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            $category->setAttribute('term', $cat['term']);
-            if (isset($cat['label'])) {
-                $category->setAttribute('label', $cat['label']);
-            } else {
-                $category->setAttribute('label', $cat['term']);
-            }
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('scheme', $cat['scheme']);
-            }
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
deleted file mode 100644
index 2fda14a06..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
- 
-require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Feed_Atom_Source
-    extends Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Feed_Source $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Source $container)
-    {
-        parent::__construct($container);
-    }
-    
-    /**
-     * Render Atom Feed Metadata (Source element)
-     * 
-     * @return Zend_Feed_Writer_Renderer_Feed_Atom
-     */
-    public function render()
-    {
-        if (!$this->_container->getEncoding()) {
-            $this->_container->setEncoding('UTF-8');
-        }
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $root = $this->_dom->createElement('source');
-        $this->setRootElement($root);
-        $this->_dom->appendChild($root);
-        $this->_setLanguage($this->_dom, $root);
-        $this->_setBaseUrl($this->_dom, $root);
-        $this->_setTitle($this->_dom, $root);
-        $this->_setDescription($this->_dom, $root);
-        $this->_setDateCreated($this->_dom, $root);
-        $this->_setDateModified($this->_dom, $root);
-        $this->_setGenerator($this->_dom, $root);
-        $this->_setLink($this->_dom, $root);
-        $this->_setFeedLinks($this->_dom, $root);
-        $this->_setId($this->_dom, $root);
-        $this->_setAuthors($this->_dom, $root);
-        $this->_setCopyright($this->_dom, $root);
-        $this->_setCategories($this->_dom, $root);
-        
-        foreach ($this->_extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $root);
-            $ext->render();
-        }
-        return $this;
-    }
-    
-    /**
-     * Set feed generator string
-     * 
-     * @param  DOMDocument $dom 
-     * @param  DOMElement $root 
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getGenerator()) {
-            return;
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
deleted file mode 100644
index 2d8ab5c8a..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rss.php 20519 2010-01-22 14:06:24Z padraic $
- */
-
-/** @see Zend_Feed_Writer_Feed */
-require_once 'Zend/Feed/Writer/Feed.php';
-
-/** @see Zend_Version */
-require_once 'Zend/Version.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererInterface */
-require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php';
-
-/** @see Zend_Feed_Writer_Renderer_Entry_Rss */
-require_once 'Zend/Feed/Writer/Renderer/Entry/Rss.php';
-
-/** @see Zend_Feed_Writer_Renderer_RendererAbstract */
-require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_Feed_Rss
-    extends Zend_Feed_Writer_Renderer_RendererAbstract
-    implements Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Constructor
-     * 
-     * @param  Zend_Feed_Writer_Feed $container 
-     * @return void
-     */
-    public function __construct (Zend_Feed_Writer_Feed $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render RSS feed
-     * 
-     * @return Zend_Feed_Writer_Renderer_Feed_Rss
-     */
-    public function render()
-    {
-        if (!$this->_container->getEncoding()) {
-            $this->_container->setEncoding('UTF-8');
-        }
-        $this->_dom = new DOMDocument('1.0', $this->_container->getEncoding());
-        $this->_dom->formatOutput = true;
-        $this->_dom->substituteEntities = false;
-        $rss = $this->_dom->createElement('rss');
-        $this->setRootElement($rss);
-        $rss->setAttribute('version', '2.0');
-        
-        $channel = $this->_dom->createElement('channel');
-        $rss->appendChild($channel);
-        $this->_dom->appendChild($rss);
-        $this->_setLanguage($this->_dom, $channel);
-        $this->_setBaseUrl($this->_dom, $channel);
-        $this->_setTitle($this->_dom, $channel);
-        $this->_setDescription($this->_dom, $channel);
-        $this->_setDateCreated($this->_dom, $channel);
-        $this->_setDateModified($this->_dom, $channel);
-        $this->_setGenerator($this->_dom, $channel);
-        $this->_setLink($this->_dom, $channel);
-        $this->_setAuthors($this->_dom, $channel);
-        $this->_setCopyright($this->_dom, $channel);
-        $this->_setCategories($this->_dom, $channel);
-        
-        foreach ($this->_extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $channel);
-            $ext->render();
-        }
-        
-        foreach ($this->_container as $entry) {
-            if ($this->getDataContainer()->getEncoding()) {
-                $entry->setEncoding($this->getDataContainer()->getEncoding());
-            }
-            if ($entry instanceof Zend_Feed_Writer_Entry) {
-                $renderer = new Zend_Feed_Writer_Renderer_Entry_Rss($entry);
-            } else {
-                continue;
-            }
-            if ($this->_ignoreExceptions === true) {
-                $renderer->ignoreExceptions();
-            }
-            $renderer->setType($this->getType());
-            $renderer->setRootElement($this->_dom->documentElement);
-            $renderer->render();
-            $element = $renderer->getElement();
-            $imported = $this->_dom->importNode($element, true);
-            $channel->appendChild($imported);
-        }
-        return $this;
-    }
-
-    /**
-     * Set feed language
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setLanguage(DOMDocument $dom, DOMElement $root)
-    {
-        $lang = $this->getDataContainer()->getLanguage();
-        if (!$lang) {
-            return;
-        }
-        $language = $dom->createElement('language');
-        $root->appendChild($language);
-        $language->nodeValue = $lang;
-    }
-
-    /**
-     * Set feed title
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getTitle()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' title element but a title has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set feed description
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDescription()) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' description element but one has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        $subtitle = $dom->createElement('description');
-        $root->appendChild($subtitle);
-        $text = $dom->createTextNode($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date feed was last modified
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateModified()) {
-            return;
-        }
-
-        $updated = $dom->createElement('pubDate');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->get(Zend_Date::RSS)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set feed generator string
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Zend_Version::VERSION, 'http://framework.zend.com');
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $name = $gdata['name'];
-        if (array_key_exists('version', $gdata)) {
-            $name .= ' ' . $gdata['version'];
-        }
-        if (array_key_exists('uri', $gdata)) {
-            $name .= ' (' . $gdata['uri'] . ')';
-        }
-        $text = $dom->createTextNode($name);
-        $generator->appendChild($text);
-    }
-
-    /**
-     * Set link to feed
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        $value = $this->getDataContainer()->getLink();
-        if(!$value) {
-            require_once 'Zend/Feed/Exception.php';
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' link element but one has not been set';
-            $exception = new Zend_Feed_Exception($message);
-            if (!$this->_ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->_exceptions[] = $exception;
-                return;
-            }
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $text = $dom->createTextNode($value);
-        $link->appendChild($text);
-        if (!Zend_Uri::check($value)) {
-            $link->setAttribute('isPermaLink', 'false');
-        }
-    }
-    
-    /**
-     * Set feed authors
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->_dom->createElement('author');
-            $name = $data['name'];
-            if (array_key_exists('email', $data)) {
-                $name = $data['email'] . ' (' . $data['name'] . ')';
-            }
-            $text = $dom->createTextNode($name);
-            $author->appendChild($text);
-            $root->appendChild($author);
-        }
-    }
-    
-    /**
-     * Set feed copyright
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setCopyright(DOMDocument $dom, DOMElement $root)
-    {
-        $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
-            return;
-        }
-        $copy = $dom->createElement('copyright');
-        $root->appendChild($copy);
-        $text = $dom->createTextNode($copyright);
-        $copy->appendChild($text);
-    }
-    
-    /**
-     * Set date feed was created
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if(!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if(!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-    
-    /**
-     * Set base URL to feed links
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
-            return;
-        }
-        $root->setAttribute('xml:base', $baseUrl);
-    }
-    
-    /**
-     * Set feed categories
-     * 
-     * @param DOMDocument $dom 
-     * @param DOMElement $root 
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('domain', $cat['scheme']);
-            }
-            $text = $dom->createTextNode($cat['term']);
-            $category->appendChild($text);
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererAbstract.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererAbstract.php
deleted file mode 100644
index 0778e435c..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererAbstract.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
- 
-/** @see Zend_Feed_Writer */
-require_once 'Zend/Feed/Writer.php';
-
-/** @see Zend_Version */
-require_once 'Zend/Version.php';
- 
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Renderer_RendererAbstract
-{
-    /**
-     * Extensions
-     * @var array
-     */
-    protected $_extensions = array();
-    
-    /**
-     * @var mixed
-     */
-    protected $_container = null;
-
-    /**
-     * @var DOMDocument
-     */
-    protected $_dom = null;
-
-    /**
-     * @var bool
-     */
-    protected $_ignoreExceptions = false;
-
-    /**
-     * @var array
-     */
-    protected $_exceptions = array();
-    
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-    
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $_type = null;
-    
-    /**
-     * @var DOMElement
-     */
-    protected $_rootElement = null;
-
-    /**
-     * Constructor
-     * 
-     * @param  mixed $container 
-     * @return void
-     */
-    public function __construct($container)
-    {
-        $this->_container = $container;
-        $this->setType($container->getType());
-        $this->_loadExtensions();
-    }
-    
-    /**
-     * Save XML to string
-     * 
-     * @return string
-     */
-    public function saveXml()
-    {
-        return $this->getDomDocument()->saveXml();
-    }
-
-    /**
-     * Get DOM document
-     * 
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->_dom;
-    }
-
-    /**
-     * Get document element from DOM
-     * 
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->getDomDocument()->documentElement;
-    }
-
-    /**
-     * Get data container of items being rendered
-     * 
-     * @return mixed
-     */
-    public function getDataContainer()
-    {
-        return $this->_container;
-    }
-    
-    /**
-     * Set feed encoding
-     * 
-     * @param  string $enc 
-     * @return Zend_Feed_Writer_Renderer_RendererAbstract
-     */
-    public function setEncoding($enc)
-    {
-        $this->_encoding = $enc;
-        return $this;
-    }
-    
-    /**
-     * Get feed encoding
-     * 
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Indicate whether or not to ignore exceptions
-     * 
-     * @param  bool $bool 
-     * @return Zend_Feed_Writer_Renderer_RendererAbstract
-     */
-    public function ignoreExceptions($bool = true)
-    {
-        if (!is_bool($bool)) {
-            require_once 'Zend/Feed/Exception.php';
-            throw new Zend_Feed_Exception('Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)');
-        }
-        $this->_ignoreExceptions = $bool;
-        return $this;
-    }
-
-    /**
-     * Get exception list
-     * 
-     * @return array
-     */
-    public function getExceptions()
-    {
-        return $this->_exceptions;
-    }
-    
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-    }
-    
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-    
-    /**
-     * Sets the absolute root element for the XML feed being generated. This
-     * helps simplify the appending of namespace declarations, but also ensures
-     * namespaces are added to the root element - not scattered across the entire
-     * XML file - may assist namespace unsafe parsers and looks pretty ;).
-     *
-     * @param DOMElement $root
-     */
-    public function setRootElement(DOMElement $root)
-    {
-        $this->_rootElement = $root;
-    }
-    
-    /**
-     * Retrieve the absolute root element for the XML feed being generated.
-     *
-     * @return DOMElement
-     */
-    public function getRootElement()
-    {
-        return $this->_rootElement;
-    }
-    
-    /**
-     * Load extensions from Zend_Feed_Writer
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        Zend_Feed_Writer::registerCoreExtensions();
-        $all = Zend_Feed_Writer::getExtensions();
-        if (stripos(get_class($this), 'entry')) {
-            $exts = $all['entryRenderer'];
-        } else {
-            $exts = $all['feedRenderer'];
-        }
-        foreach ($exts as $extension) {
-            $className = Zend_Feed_Writer::getPluginLoader()->getClassName($extension);
-            $this->_extensions[$extension] = new $className(
-                $this->getDataContainer()
-            );
-            $this->_extensions[$extension]->setEncoding($this->getEncoding());
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererInterface.php b/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererInterface.php
deleted file mode 100644
index 89b429441..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Renderer/RendererInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Feed_Writer_Renderer_RendererInterface
-{
-    /**
-     * Render feed/entry
-     * 
-     * @return void
-     */
-    public function render();
-
-    /**
-     * Save feed and/or entry to XML and return string
-     * 
-     * @return string
-     */
-    public function saveXml();
-
-    /**
-     * Get DOM document
-     * 
-     * @return DOMDocument
-     */
-    public function getDomDocument();
-
-    /**
-     * Get document element from DOM
-     * 
-     * @return DOMElement
-     */
-    public function getElement();
-
-    /**
-     * Get data container containing feed items
-     * 
-     * @return mixed
-     */
-    public function getDataContainer();
-
-    /**
-     * Should exceptions be ignored?
-     * 
-     * @return mixed
-     */
-    public function ignoreExceptions();
-    
-    /**
-     * Get list of thrown exceptions
-     * 
-     * @return array
-     */
-    public function getExceptions();
-    
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type);
-    
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType();
-    
-    /**
-     * Sets the absolute root element for the XML feed being generated. This
-     * helps simplify the appending of namespace declarations, but also ensures
-     * namespaces are added to the root element - not scattered across the entire
-     * XML file - may assist namespace unsafe parsers and looks pretty ;).
-     *
-     * @param DOMElement $root
-     */
-    public function setRootElement(DOMElement $root);
-    
-    /**
-     * Retrieve the absolute root element for the XML feed being generated.
-     *
-     * @return DOMElement
-     */
-    public function getRootElement();
-}
diff --git a/airtime_mvc/library/Zend/Feed/Writer/Source.php b/airtime_mvc/library/Zend/Feed/Writer/Source.php
deleted file mode 100644
index 37fcd4833..000000000
--- a/airtime_mvc/library/Zend/Feed/Writer/Source.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php';
- 
- /**
- * @category   Zend
- * @package    Zend_Feed_Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Feed_Writer_Source extends Zend_Feed_Writer_Feed_FeedAbstract
-{
-
-}
diff --git a/airtime_mvc/library/Zend/File/Transfer.php b/airtime_mvc/library/Zend/File/Transfer.php
deleted file mode 100644
index 895bc4e32..000000000
--- a/airtime_mvc/library/Zend/File/Transfer.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Transfer.php 21202 2010-02-24 22:16:44Z thomas $
- */
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
- * Base class for all protocols supporting file transfers
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_File_Transfer
-{
-    /**
-     * Array holding all directions
-     *
-     * @var array
-     */
-    protected $_adapter = array();
-
-    /**
-     * Creates a file processing handler
-     *
-     * @param  string  $adapter   Adapter to use
-     * @param  boolean $direction OPTIONAL False means Download, true means upload
-     * @param  array   $options   OPTIONAL Options to set for this adapter
-     * @throws Zend_File_Transfer_Exception
-     */
-    public function __construct($adapter = 'Http', $direction = false, $options = array())
-    {
-        $this->setAdapter($adapter, $direction, $options);
-    }
-
-    /**
-     * Sets a new adapter
-     *
-     * @param  string  $adapter   Adapter to use
-     * @param  boolean $direction OPTIONAL False means Download, true means upload
-     * @param  array   $options   OPTIONAL Options to set for this adapter
-     * @throws Zend_File_Transfer_Exception
-     */
-    public function setAdapter($adapter, $direction = false, $options = array())
-    {
-        if (Zend_Loader::isReadable('Zend/File/Transfer/Adapter/' . ucfirst($adapter). '.php')) {
-            $adapter = 'Zend_File_Transfer_Adapter_' . ucfirst($adapter);
-        }
-
-        if (!class_exists($adapter)) {
-            Zend_Loader::loadClass($adapter);
-        }
-
-        $direction = (integer) $direction;
-        $this->_adapter[$direction] = new $adapter($options);
-        if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter_Abstract) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception("Adapter " . $adapter . " does not extend Zend_File_Transfer_Adapter_Abstract");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns all set adapters
-     *
-     * @param boolean $direction On null, all directions are returned
-     *                           On false, download direction is returned
-     *                           On true, upload direction is returned
-     * @return array|Zend_File_Transfer_Adapter
-     */
-    public function getAdapter($direction = null)
-    {
-        if ($direction === null) {
-            return $this->_adapter;
-        }
-
-        $direction = (integer) $direction;
-        return $this->_adapter[$direction];
-    }
-
-    /**
-     * Calls all methods from the adapter
-     *
-     * @param  string $method  Method to call
-     * @param  array  $options Options for this method
-     * @return mixed
-     */
-    public function __call($method, array $options)
-    {
-        if (array_key_exists('direction', $options)) {
-            $direction = (integer) $options['direction'];
-        } else {
-            $direction = 0;
-        }
-
-        if (method_exists($this->_adapter[$direction], $method)) {
-            return call_user_func_array(array($this->_adapter[$direction], $method), $options);
-        }
-
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception("Unknown method '" . $method . "' called!");
-    }
-}
diff --git a/airtime_mvc/library/Zend/File/Transfer/Adapter/Abstract.php b/airtime_mvc/library/Zend/File/Transfer/Adapter/Abstract.php
deleted file mode 100644
index faec40906..000000000
--- a/airtime_mvc/library/Zend/File/Transfer/Adapter/Abstract.php
+++ /dev/null
@@ -1,1556 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Abstract.php 21468 2010-03-11 21:21:55Z thomas $
- */
-
-/**
- * Abstract class for file transfers (Downloads and Uploads)
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_File_Transfer_Adapter_Abstract
-{
-    /**@+
-     * Plugin loader Constants
-     */
-    const FILTER    = 'FILTER';
-    const VALIDATE  = 'VALIDATE';
-    /**@-*/
-
-    /**
-     * Internal list of breaks
-     *
-     * @var array
-     */
-    protected $_break = array();
-
-    /**
-     * Internal list of filters
-     *
-     * @var array
-     */
-    protected $_filters = array();
-
-    /**
-     * Plugin loaders for filter and validation chains
-     *
-     * @var array
-     */
-    protected $_loaders = array();
-
-    /**
-     * Internal list of messages
-     *
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Is translation disabled?
-     *
-     * @var bool
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * Internal list of validators
-     * @var array
-     */
-    protected $_validators = array();
-
-    /**
-     * Internal list of files
-     * This array looks like this:
-     *     array(form => array( - Form is the name within the form or, if not set the filename
-     *         name,            - Original name of this file
-     *         type,            - Mime type of this file
-     *         size,            - Filesize in bytes
-     *         tmp_name,        - Internalally temporary filename for uploaded files
-     *         error,           - Error which has occured
-     *         destination,     - New destination for this file
-     *         validators,      - Set validator names for this file
-     *         files            - Set file names for this file
-     *     ))
-     *
-     * @var array
-     */
-    protected $_files = array();
-
-    /**
-     * TMP directory
-     * @var string
-     */
-    protected $_tmpDir;
-
-    /**
-     * Available options for file transfers
-     */
-    protected $_options = array(
-        'ignoreNoFile'  => false,
-        'useByteString' => true,
-        'magicFile'     => null,
-        'detectInfos'   => true,
-    );
-
-    /**
-     * Send file
-     *
-     * @param  mixed $options
-     * @return bool
-     */
-    abstract public function send($options = null);
-
-    /**
-     * Receive file
-     *
-     * @param  mixed $options
-     * @return bool
-     */
-    abstract public function receive($options = null);
-
-    /**
-     * Is file sent?
-     *
-     * @param  array|string|null $files
-     * @return bool
-     */
-    abstract public function isSent($files = null);
-
-    /**
-     * Is file received?
-     *
-     * @param  array|string|null $files
-     * @return bool
-     */
-    abstract public function isReceived($files = null);
-
-    /**
-     * Has a file been uploaded ?
-     *
-     * @param  array|string|null $files
-     * @return bool
-     */
-    abstract public function isUploaded($files = null);
-
-    /**
-     * Has the file been filtered ?
-     *
-     * @param array|string|null $files
-     * @return bool
-     */
-    abstract public function isFiltered($files = null);
-
-    /**
-     * Retrieve progress of transfer
-     *
-     * @return float
-     */
-    public static function getProgress()
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method must be implemented within the adapter');
-    }
-
-    /**
-     * Set plugin loader to use for validator or filter chain
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @param  string $type 'filter', or 'validate'
-     * @return Zend_File_Transfer_Adapter_Abstract
-     * @throws Zend_File_Transfer_Exception on invalid type
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::FILTER:
-            case self::VALIDATE:
-                $this->_loaders[$type] = $loader;
-                return $this;
-            default:
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Retrieve plugin loader for validator or filter chain
-     *
-     * Instantiates with default rules if none available for that type. Use
-     * 'filter' or 'validate' for $type.
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader
-     * @throws Zend_File_Transfer_Exception on invalid type.
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::FILTER:
-            case self::VALIDATE:
-                $prefixSegment = ucfirst(strtolower($type));
-                $pathSegment   = $prefixSegment;
-                if (!isset($this->_loaders[$type])) {
-                    $paths         = array(
-                        'Zend_' . $prefixSegment . '_'     => 'Zend/' . $pathSegment . '/',
-                        'Zend_' . $prefixSegment . '_File' => 'Zend/' . $pathSegment . '/File',
-                    );
-
-                    require_once 'Zend/Loader/PluginLoader.php';
-                    $this->_loaders[$type] = new Zend_Loader_PluginLoader($paths);
-                } else {
-                    $loader = $this->_loaders[$type];
-                    $prefix = 'Zend_' . $prefixSegment . '_File_';
-                    if (!$loader->getPaths($prefix)) {
-                        $loader->addPrefixPath($prefix, str_replace('_', '/', $prefix));
-                    }
-                }
-                return $this->_loaders[$type];
-            default:
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Add prefix path for plugin loader
-     *
-     * If no $type specified, assumes it is a base path for both filters and
-     * validators, and sets each according to the following rules:
-     * - filters:    $prefix = $prefix . '_Filter'
-     * - validators: $prefix = $prefix . '_Validate'
-     *
-     * Otherwise, the path prefix is set on the appropriate plugin loader.
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_File_Transfer_Adapter_Abstract
-     * @throws Zend_File_Transfer_Exception for invalid type
-     */
-    public function addPrefixPath($prefix, $path, $type = null)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::FILTER:
-            case self::VALIDATE:
-                $loader = $this->getPluginLoader($type);
-                $loader->addPrefixPath($prefix, $path);
-                return $this;
-            case null:
-                $prefix = rtrim($prefix, '_');
-                $path   = rtrim($path, DIRECTORY_SEPARATOR);
-                foreach (array(self::FILTER, self::VALIDATE) as $type) {
-                    $cType        = ucfirst(strtolower($type));
-                    $pluginPath   = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR;
-                    $pluginPrefix = $prefix . '_' . $cType;
-                    $loader       = $this->getPluginLoader($type);
-                    $loader->addPrefixPath($pluginPrefix, $pluginPath);
-                }
-                return $this;
-            default:
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Add many prefix paths at once
-     *
-     * @param  array $spec
-     * @return Zend_File_Transfer_Exception
-     */
-    public function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            return $this->addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $type => $paths) {
-            if (is_numeric($type) && is_array($paths)) {
-                $type = null;
-                if (isset($paths['prefix']) && isset($paths['path'])) {
-                    if (isset($paths['type'])) {
-                        $type = $paths['type'];
-                    }
-                    $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-                }
-            } elseif (!is_numeric($type)) {
-                if (!isset($paths['prefix']) || !isset($paths['path'])) {
-                    foreach ($paths as $prefix => $spec) {
-                        if (is_array($spec)) {
-                            foreach ($spec as $path) {
-                                if (!is_string($path)) {
-                                    continue;
-                                }
-                                $this->addPrefixPath($prefix, $path, $type);
-                            }
-                        } elseif (is_string($spec)) {
-                            $this->addPrefixPath($prefix, $spec, $type);
-                        }
-                    }
-                } else {
-                    $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Adds a new validator for this class
-     *
-     * @param  string|array $validator           Type of validator to add
-     * @param  boolean      $breakChainOnFailure If the validation chain should stop an failure
-     * @param  string|array $options             Options to set for the validator
-     * @param  string|array $files               Files to limit this validator to
-     * @return Zend_File_Transfer_Adapter
-     */
-    public function addValidator($validator, $breakChainOnFailure = false, $options = null, $files = null)
-    {
-        if ($validator instanceof Zend_Validate_Interface) {
-            $name = get_class($validator);
-        } elseif (is_string($validator)) {
-            $name      = $this->getPluginLoader(self::VALIDATE)->load($validator);
-            $validator = new $name($options);
-            if (is_array($options) && isset($options['messages'])) {
-                if (is_array($options['messages'])) {
-                    $validator->setMessages($options['messages']);
-                } elseif (is_string($options['messages'])) {
-                    $validator->setMessage($options['messages']);
-                }
-
-                unset($options['messages']);
-            }
-        } else {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface');
-        }
-
-        $this->_validators[$name] = $validator;
-        $this->_break[$name]      = $breakChainOnFailure;
-        $files                    = $this->_getFiles($files, true, true);
-        foreach ($files as $file) {
-            $this->_files[$file]['validators'][] = $name;
-            $this->_files[$file]['validated']    = false;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add Multiple validators at once
-     *
-     * @param  array $validators
-     * @param  string|array $files
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function addValidators(array $validators, $files = null)
-    {
-        foreach ($validators as $name => $validatorInfo) {
-            if ($validatorInfo instanceof Zend_Validate_Interface) {
-                $this->addValidator($validatorInfo, null, null, $files);
-            } else if (is_string($validatorInfo)) {
-                if (!is_int($name)) {
-                    $this->addValidator($name, null, $validatorInfo, $files);
-                } else {
-                    $this->addValidator($validatorInfo, null, null, $files);
-                }
-            } else if (is_array($validatorInfo)) {
-                $argc                = count($validatorInfo);
-                $breakChainOnFailure = false;
-                $options             = array();
-                if (isset($validatorInfo['validator'])) {
-                    $validator = $validatorInfo['validator'];
-                    if (isset($validatorInfo['breakChainOnFailure'])) {
-                        $breakChainOnFailure = $validatorInfo['breakChainOnFailure'];
-                    }
-
-                    if (isset($validatorInfo['options'])) {
-                        $options = $validatorInfo['options'];
-                    }
-
-                    $this->addValidator($validator, $breakChainOnFailure, $options, $files);
-                } else {
-                    if (is_string($name)) {
-                        $validator = $name;
-                        $options   = $validatorInfo;
-                        $this->addValidator($validator, $breakChainOnFailure, $options, $files);
-                    } else {
-                        $file = $files;
-                        switch (true) {
-                            case (0 == $argc):
-                                break;
-                            case (1 <= $argc):
-                                $validator  = array_shift($validatorInfo);
-                            case (2 <= $argc):
-                                $breakChainOnFailure = array_shift($validatorInfo);
-                            case (3 <= $argc):
-                                $options = array_shift($validatorInfo);
-                            case (4 <= $argc):
-                                if (!empty($validatorInfo)) {
-                                    $file = array_shift($validatorInfo);
-                                }
-                            default:
-                                $this->addValidator($validator, $breakChainOnFailure, $options, $file);
-                                break;
-                        }
-                    }
-                }
-            } else {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception('Invalid validator passed to addValidators()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a validator for the class, erasing all previous set
-     *
-     * @param  string|array $validator Validator to set
-     * @param  string|array $files     Files to limit this validator to
-     * @return Zend_File_Transfer_Adapter
-     */
-    public function setValidators(array $validators, $files = null)
-    {
-        $this->clearValidators();
-        return $this->addValidators($validators, $files);
-    }
-
-    /**
-     * Determine if a given validator has already been registered
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasValidator($name)
-    {
-        return (false !== $this->_getValidatorIdentifier($name));
-    }
-
-    /**
-     * Retrieve individual validator
-     *
-     * @param  string $name
-     * @return Zend_Validate_Interface|null
-     */
-    public function getValidator($name)
-    {
-        if (false === ($identifier = $this->_getValidatorIdentifier($name))) {
-            return null;
-        }
-        return $this->_validators[$identifier];
-    }
-
-    /**
-     * Returns all set validators
-     *
-     * @param  string|array $files (Optional) Returns the validator for this files
-     * @return null|array List of set validators
-     */
-    public function getValidators($files = null)
-    {
-        if ($files == null) {
-            return $this->_validators;
-        }
-
-        $files      = $this->_getFiles($files, true, true);
-        $validators = array();
-        foreach ($files as $file) {
-            if (!empty($this->_files[$file]['validators'])) {
-                $validators += $this->_files[$file]['validators'];
-            }
-        }
-
-        $validators = array_unique($validators);
-        $result     = array();
-        foreach ($validators as $validator) {
-            $result[$validator] = $this->_validators[$validator];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Remove an individual validator
-     *
-     * @param  string $name
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function removeValidator($name)
-    {
-        if (false === ($key = $this->_getValidatorIdentifier($name))) {
-            return $this;
-        }
-
-        unset($this->_validators[$key]);
-        foreach (array_keys($this->_files) as $file) {
-            if (empty($this->_files[$file]['validators'])) {
-                continue;
-            }
-
-            $index = array_search($key, $this->_files[$file]['validators']);
-            if ($index === false) {
-                continue;
-            }
-
-            unset($this->_files[$file]['validators'][$index]);
-            $this->_files[$file]['validated'] = false;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove all validators
-     *
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function clearValidators()
-    {
-        $this->_validators = array();
-        foreach (array_keys($this->_files) as $file) {
-            $this->_files[$file]['validators'] = array();
-            $this->_files[$file]['validated']  = false;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets Options for adapters
-     *
-     * @param array $options Options to set
-     * @param array $files   (Optional) Files to set the options for
-     */
-    public function setOptions($options = array(), $files = null) {
-        $file = $this->_getFiles($files, false, true);
-
-        if (is_array($options)) {
-            if (empty($file)) {
-                $this->_options = array_merge($this->_options, $options);
-            }
-
-            foreach ($options as $name => $value) {
-                foreach ($file as $key => $content) {
-                    switch ($name) {
-                        case 'magicFile' :
-                            $this->_files[$key]['options'][$name] = (string) $value;
-                            break;
-
-                        case 'ignoreNoFile' :
-                        case 'useByteString' :
-                        case 'detectInfos' :
-                            $this->_files[$key]['options'][$name] = (boolean) $value;
-                            break;
-
-                        default:
-                            require_once 'Zend/File/Transfer/Exception.php';
-                            throw new Zend_File_Transfer_Exception("Unknown option: $name = $value");
-                    }
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns set options for adapters or files
-     *
-     * @param  array $files (Optional) Files to return the options for
-     * @return array Options for given files
-     */
-    public function getOptions($files = null) {
-        $file = $this->_getFiles($files, false, true);
-
-        foreach ($file as $key => $content) {
-            if (isset($this->_files[$key]['options'])) {
-                $options[$key] = $this->_files[$key]['options'];
-            } else {
-                $options[$key] = array();
-            }
-        }
-
-        return $options;
-    }
-
-    /**
-     * Checks if the files are valid
-     *
-     * @param  string|array $files (Optional) Files to check
-     * @return boolean True if all checks are valid
-     */
-    public function isValid($files = null)
-    {
-        $check = $this->_getFiles($files, false, true);
-        if (empty($check)) {
-            return false;
-        }
-
-        $translator      = $this->getTranslator();
-        $this->_messages = array();
-        $break           = false;
-        foreach($check as $key => $content) {
-            if (array_key_exists('validators', $content) &&
-                in_array('Zend_Validate_File_Count', $content['validators'])) {
-                $validator = $this->_validators['Zend_Validate_File_Count'];
-                $count     = $content;
-                if (empty($content['tmp_name'])) {
-                    continue;
-                }
-
-                if (array_key_exists('destination', $content)) {
-                    $checkit = $content['destination'];
-                } else {
-                    $checkit = dirname($content['tmp_name']);
-                }
-
-                $checkit .= DIRECTORY_SEPARATOR . $content['name'];
-                    $validator->addFile($checkit);
-            }
-        }
-
-        if (isset($count)) {
-            if (!$validator->isValid($count['tmp_name'], $count)) {
-                $this->_messages += $validator->getMessages();
-            }
-        }
-
-        foreach ($check as $key => $content) {
-            $fileerrors  = array();
-            if (array_key_exists('validators', $content) && $content['validated']) {
-                continue;
-            }
-
-            if (array_key_exists('validators', $content)) {
-                foreach ($content['validators'] as $class) {
-                    $validator = $this->_validators[$class];
-                    if (method_exists($validator, 'setTranslator')) {
-                        $validator->setTranslator($translator);
-                    }
-
-                    if (($class === 'Zend_Validate_File_Upload') and (empty($content['tmp_name']))) {
-                        $tocheck = $key;
-                    } else {
-                        $tocheck = $content['tmp_name'];
-                    }
-
-                    if (!$validator->isValid($tocheck, $content)) {
-                        $fileerrors += $validator->getMessages();
-                    }
-
-                    if (!empty($content['options']['ignoreNoFile']) and (isset($fileerrors['fileUploadErrorNoFile']))) {
-                        unset($fileerrors['fileUploadErrorNoFile']);
-                        break;
-                    }
-
-                    if (($class === 'Zend_Validate_File_Upload') and (count($fileerrors) > 0)) {
-                        break;
-                    }
-
-                    if (($this->_break[$class]) and (count($fileerrors) > 0)) {
-                        $break = true;
-                        break;
-                    }
-                }
-            }
-
-            if (count($fileerrors) > 0) {
-                $this->_files[$key]['validated'] = false;
-            } else {
-                $this->_files[$key]['validated'] = true;
-            }
-
-            $this->_messages += $fileerrors;
-            if ($break) {
-                break;
-            }
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns found validation messages
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->_messages;
-    }
-
-    /**
-     * Retrieve error codes
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return array_keys($this->_messages);
-    }
-
-    /**
-     * Are there errors registered?
-     *
-     * @return boolean
-     */
-    public function hasErrors()
-    {
-        return (!empty($this->_messages));
-    }
-
-    /**
-     * Adds a new filter for this class
-     *
-     * @param  string|array $filter Type of filter to add
-     * @param  string|array $options   Options to set for the filter
-     * @param  string|array $files     Files to limit this filter to
-     * @return Zend_File_Transfer_Adapter
-     */
-    public function addFilter($filter, $options = null, $files = null)
-    {
-        if ($filter instanceof Zend_Filter_Interface) {
-            $class = get_class($filter);
-        } elseif (is_string($filter)) {
-            $class  = $this->getPluginLoader(self::FILTER)->load($filter);
-            $filter = new $class($options);
-        } else {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('Invalid filter specified');
-        }
-
-        $this->_filters[$class] = $filter;
-        $files                  = $this->_getFiles($files, true, true);
-        foreach ($files as $file) {
-            $this->_files[$file]['filters'][] = $class;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add Multiple filters at once
-     *
-     * @param  array $filters
-     * @param  string|array $files
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function addFilters(array $filters, $files = null)
-    {
-        foreach ($filters as $key => $spec) {
-            if ($spec instanceof Zend_Filter_Interface) {
-                $this->addFilter($spec, null, $files);
-                continue;
-            }
-
-            if (is_string($key)) {
-                $this->addFilter($key, $spec, $files);
-                continue;
-            }
-
-            if (is_int($key)) {
-                if (is_string($spec)) {
-                    $this->addFilter($spec, null, $files);
-                    continue;
-                }
-
-                if (is_array($spec)) {
-                    if (!array_key_exists('filter', $spec)) {
-                        continue;
-                    }
-
-                    $filter = $spec['filter'];
-                    unset($spec['filter']);
-                    $this->addFilter($filter, $spec, $files);
-                    continue;
-                }
-
-                continue;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a filter for the class, erasing all previous set
-     *
-     * @param  string|array $filter Filter to set
-     * @param  string|array $files     Files to limit this filter to
-     * @return Zend_File_Transfer_Adapter
-     */
-    public function setFilters(array $filters, $files = null)
-    {
-        $this->clearFilters();
-        return $this->addFilters($filters, $files);
-    }
-
-    /**
-     * Determine if a given filter has already been registered
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasFilter($name)
-    {
-        return (false !== $this->_getFilterIdentifier($name));
-    }
-
-    /**
-     * Retrieve individual filter
-     *
-     * @param  string $name
-     * @return Zend_Filter_Interface|null
-     */
-    public function getFilter($name)
-    {
-        if (false === ($identifier = $this->_getFilterIdentifier($name))) {
-            return null;
-        }
-        return $this->_filters[$identifier];
-    }
-
-    /**
-     * Returns all set filters
-     *
-     * @param  string|array $files (Optional) Returns the filter for this files
-     * @return array List of set filters
-     * @throws Zend_File_Transfer_Exception When file not found
-     */
-    public function getFilters($files = null)
-    {
-        if ($files === null) {
-            return $this->_filters;
-        }
-
-        $files   = $this->_getFiles($files, true, true);
-        $filters = array();
-        foreach ($files as $file) {
-            if (!empty($this->_files[$file]['filters'])) {
-                $filters += $this->_files[$file]['filters'];
-            }
-        }
-
-        $filters = array_unique($filters);
-        $result  = array();
-        foreach ($filters as $filter) {
-            $result[] = $this->_filters[$filter];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Remove an individual filter
-     *
-     * @param  string $name
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function removeFilter($name)
-    {
-        if (false === ($key = $this->_getFilterIdentifier($name))) {
-            return $this;
-        }
-
-        unset($this->_filters[$key]);
-        foreach (array_keys($this->_files) as $file) {
-            if (empty($this->_files[$file]['filters'])) {
-                continue;
-            }
-
-            $index = array_search($key, $this->_files[$file]['filters']);
-            if ($index === false) {
-                continue;
-            }
-
-            unset($this->_files[$file]['filters'][$index]);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove all filters
-     *
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function clearFilters()
-    {
-        $this->_filters = array();
-        foreach (array_keys($this->_files) as $file) {
-            $this->_files[$file]['filters'] = array();
-        }
-        return $this;
-    }
-
-    /**
-     * Returns all set files
-     *
-     * @return array List of set files
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function getFile()
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Retrieves the filename of transferred files.
-     *
-     * @param  string  $fileelement (Optional) Element to return the filename for
-     * @param  boolean $path        (Optional) Should the path also be returned ?
-     * @return string|array
-     */
-    public function getFileName($file = null, $path = true)
-    {
-        $files     = $this->_getFiles($file, true, true);
-        $result    = array();
-        $directory = "";
-        foreach($files as $file) {
-            if (empty($this->_files[$file]['name'])) {
-                continue;
-            }
-
-            if ($path === true) {
-                $directory = $this->getDestination($file) . DIRECTORY_SEPARATOR;
-            }
-
-            $result[$file] = $directory . $this->_files[$file]['name'];
-        }
-
-        if (count($result) == 1) {
-            return current($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Retrieve additional internal file informations for files
-     *
-     * @param  string $file (Optional) File to get informations for
-     * @return array
-     */
-    public function getFileInfo($file = null)
-    {
-        return $this->_getFiles($file);
-    }
-
-    /**
-     * Adds one or more files
-     *
-     * @param  string|array $file      File to add
-     * @param  string|array $validator Validators to use for this file, must be set before
-     * @param  string|array $filter    Filters to use for this file, must be set before
-     * @return Zend_File_Transfer_Adapter_Abstract
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function addFile($file, $validator = null, $filter = null)
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Returns all set types
-     *
-     * @return array List of set types
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function getType()
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Adds one or more type of files
-     *
-     * @param  string|array $type Type of files to add
-     * @param  string|array $validator Validators to use for this file, must be set before
-     * @param  string|array $filter    Filters to use for this file, must be set before
-     * @return Zend_File_Transfer_Adapter_Abstract
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function addType($type, $validator = null, $filter = null)
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Sets a new destination for the given files
-     *
-     * @deprecated Will be changed to be a filter!!!
-     * @param  string       $destination New destination directory
-     * @param  string|array $files       Files to set the new destination for
-     * @return Zend_File_Transfer_Abstract
-     * @throws Zend_File_Transfer_Exception when the given destination is not a directory or does not exist
-     */
-    public function setDestination($destination, $files = null)
-    {
-        $orig = $files;
-        $destination = rtrim($destination, "/\\");
-        if (!is_dir($destination)) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('The given destination is not a directory or does not exist');
-        }
-
-        if (!is_writable($destination)) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('The given destination is not writeable');
-        }
-
-        if ($files === null) {
-            foreach ($this->_files as $file => $content) {
-                $this->_files[$file]['destination'] = $destination;
-            }
-        } else {
-            $files = $this->_getFiles($files, true, true);
-            if (empty($files) and is_string($orig)) {
-                $this->_files[$orig]['destination'] = $destination;
-            }
-
-            foreach ($files as $file) {
-                $this->_files[$file]['destination'] = $destination;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve destination directory value
-     *
-     * @param  null|string|array $files
-     * @return null|string|array
-     */
-    public function getDestination($files = null)
-    {
-        $orig  = $files;
-        $files = $this->_getFiles($files, false, true);
-        $destinations = array();
-        if (empty($files) and is_string($orig)) {
-            if (isset($this->_files[$orig]['destination'])) {
-                $destinations[$orig] = $this->_files[$orig]['destination'];
-            } else {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $orig));
-            }
-        }
-
-        foreach ($files as $key => $content) {
-            if (isset($this->_files[$key]['destination'])) {
-                $destinations[$key] = $this->_files[$key]['destination'];
-            } else {
-                $tmpdir = $this->_getTmpDir();
-                $this->setDestination($tmpdir, $key);
-                $destinations[$key] = $tmpdir;
-            }
-        }
-
-        if (empty($destinations)) {
-            $destinations = $this->_getTmpDir();
-        } else if (count($destinations) == 1) {
-            $destinations = current($destinations);
-        }
-
-        return $destinations;
-    }
-
-    /**
-     * Set translator object for localization
-     *
-     * @param  Zend_Translate|null $translator
-     * @return Zend_File_Transfer_Abstract
-     */
-    public function setTranslator($translator = null)
-    {
-        if (null === $translator) {
-            $this->_translator = null;
-        } elseif ($translator instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('Invalid translator specified');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve localization translator object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_File_Transfer_Abstract
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    /**
-     * Returns the hash for a given file
-     *
-     * @param  string       $hash  Hash algorithm to use
-     * @param  string|array $files Files to return the hash for
-     * @return string|array Hashstring
-     * @throws Zend_File_Transfer_Exception On unknown hash algorithm
-     */
-    public function getHash($hash = 'crc32', $files = null)
-    {
-        if (!in_array($hash, hash_algos())) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('Unknown hash algorithm');
-        }
-
-        $files  = $this->_getFiles($files);
-        $result = array();
-        foreach($files as $key => $value) {
-            if (file_exists($value['name'])) {
-                $result[$key] = hash_file($hash, $value['name']);
-            } else if (file_exists($value['tmp_name'])) {
-                $result[$key] = hash_file($hash, $value['tmp_name']);
-            } else if (empty($value['options']['ignoreNoFile'])) {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist");
-            }
-        }
-
-        if (count($result) == 1) {
-            return current($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the real filesize of the file
-     *
-     * @param string|array $files Files to get the filesize from
-     * @throws Zend_File_Transfer_Exception When the file does not exist
-     * @return string|array Filesize
-     */
-    public function getFileSize($files = null)
-    {
-        $files  = $this->_getFiles($files);
-        $result = array();
-        foreach($files as $key => $value) {
-            if (file_exists($value['name']) || file_exists($value['tmp_name'])) {
-                if ($value['options']['useByteString']) {
-                    $result[$key] = self::_toByteString($value['size']);
-                } else {
-                    $result[$key] = $value['size'];
-                }
-            } else if (empty($value['options']['ignoreNoFile'])) {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist");
-            } else {
-                continue;
-            }
-        }
-
-        if (count($result) == 1) {
-            return current($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Internal method to detect the size of a file
-     *
-     * @param  array $value File infos
-     * @return string Filesize of given file
-     */
-    protected function _detectFileSize($value)
-    {
-        if (file_exists($value['name'])) {
-            $result = sprintf("%u", @filesize($value['name']));
-        } else if (file_exists($value['tmp_name'])) {
-            $result = sprintf("%u", @filesize($value['tmp_name']));
-        } else {
-            return null;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the real mimetype of the file
-     * Uses fileinfo, when not available mime_magic and as last fallback a manual given mimetype
-     *
-     * @param string|array $files Files to get the mimetype from
-     * @throws Zend_File_Transfer_Exception When the file does not exist
-     * @return string|array MimeType
-     */
-    public function getMimeType($files = null)
-    {
-        $files  = $this->_getFiles($files);
-        $result = array();
-        foreach($files as $key => $value) {
-            if (file_exists($value['name']) || file_exists($value['tmp_name'])) {
-                $result[$key] = $value['type'];
-            } else if (empty($value['options']['ignoreNoFile'])) {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist");
-            } else {
-                continue;
-            }
-        }
-
-        if (count($result) == 1) {
-            return current($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Internal method to detect the mime type of a file
-     *
-     * @param  array $value File infos
-     * @return string Mimetype of given file
-     */
-    protected function _detectMimeType($value)
-    {
-        if (file_exists($value['name'])) {
-            $file = $value['name'];
-        } else if (file_exists($value['tmp_name'])) {
-            $file = $value['tmp_name'];
-        } else {
-            return null;
-        }
-
-        if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            if (!empty($value['options']['magicFile'])) {
-                $mime = @finfo_open($const, $value['options']['magicFile']);
-            }
-
-            if (empty($mime)) {
-                $mime = @finfo_open($const);
-            }
-
-            if ($mime !== false) {
-                $result = finfo_file($mime, $file);
-            }
-
-            unset($mime);
-        }
-
-        if (empty($result) && (function_exists('mime_content_type')
-            && ini_get('mime_magic.magicfile'))) {
-            $result = mime_content_type($file);
-        }
-
-        if (empty($result)) {
-            $result = 'application/octet-stream';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the formatted size
-     *
-     * @param  integer $size
-     * @return string
-     */
-    protected static function _toByteString($size)
-    {
-        $sizes = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-        for ($i=0; $size >= 1024 && $i < 9; $i++) {
-            $size /= 1024;
-        }
-
-        return round($size, 2) . $sizes[$i];
-    }
-
-    /**
-     * Internal function to filter all given files
-     *
-     * @param  string|array $files (Optional) Files to check
-     * @return boolean False on error
-     */
-    protected function _filter($files = null)
-    {
-        $check           = $this->_getFiles($files);
-        foreach ($check as $name => $content) {
-            if (array_key_exists('filters', $content)) {
-                foreach ($content['filters'] as $class) {
-                    $filter = $this->_filters[$class];
-                    try {
-                        $result = $filter->filter($this->getFileName($name));
-
-                        $this->_files[$name]['destination'] = dirname($result);
-                        $this->_files[$name]['name']        = basename($result);
-                    } catch (Zend_Filter_Exception $e) {
-                        $this->_messages += array($e->getMessage());
-                    }
-                }
-            }
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine system TMP directory and detect if we have read access
-     *
-     * @return string
-     * @throws Zend_File_Transfer_Exception if unable to determine directory
-     */
-    protected function _getTmpDir()
-    {
-        if (null === $this->_tmpDir) {
-            $tmpdir = array();
-            if (function_exists('sys_get_temp_dir')) {
-                $tmpdir[] = sys_get_temp_dir();
-            }
-
-            if (!empty($_ENV['TMP'])) {
-                $tmpdir[] = realpath($_ENV['TMP']);
-            }
-
-            if (!empty($_ENV['TMPDIR'])) {
-                $tmpdir[] = realpath($_ENV['TMPDIR']);
-            }
-
-            if (!empty($_ENV['TEMP'])) {
-                $tmpdir[] = realpath($_ENV['TEMP']);
-            }
-
-            $upload = ini_get('upload_tmp_dir');
-            if ($upload) {
-                $tmpdir[] = realpath($upload);
-            }
-
-            foreach($tmpdir as $directory) {
-                if ($this->_isPathWriteable($directory)) {
-                    $this->_tmpDir = $directory;
-                }
-            }
-
-            if (empty($this->_tmpDir)) {
-                // Attemp to detect by creating a temporary file
-                $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
-                if ($tempFile) {
-                    $this->_tmpDir = realpath(dirname($tempFile));
-                    unlink($tempFile);
-                } else {
-                    require_once 'Zend/File/Transfer/Exception.php';
-                    throw new Zend_File_Transfer_Exception('Could not determine a temporary directory');
-                }
-            }
-
-            $this->_tmpDir = rtrim($this->_tmpDir, "/\\");
-        }
-        return $this->_tmpDir;
-    }
-
-    /**
-     * Tries to detect if we can read and write to the given path
-     *
-     * @param string $path
-     */
-    protected function _isPathWriteable($path)
-    {
-        $tempFile = rtrim($path, "/\\");
-        $tempFile .= '/' . 'test.1';
-
-        $result = @file_put_contents($tempFile, 'TEST');
-
-        if ($result == false) {
-            return false;
-        }
-
-        $result = @unlink($tempFile);
-
-        if ($result == false) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns found files based on internal file array and given files
-     *
-     * @param  string|array $files       (Optional) Files to return
-     * @param  boolean      $names       (Optional) Returns only names on true, else complete info
-     * @param  boolean      $noexception (Optional) Allows throwing an exception, otherwise returns an empty array
-     * @return array Found files
-     * @throws Zend_File_Transfer_Exception On false filename
-     */
-    protected function _getFiles($files, $names = false, $noexception = false)
-    {
-        $check = array();
-
-        if (is_string($files)) {
-            $files = array($files);
-        }
-
-        if (is_array($files)) {
-            foreach ($files as $find) {
-                $found = array();
-                foreach ($this->_files as $file => $content) {
-                    if (!isset($content['name'])) {
-                        continue;
-                    }
-
-                    if (($content['name'] === $find) && isset($content['multifiles'])) {
-                        foreach ($content['multifiles'] as $multifile) {
-                            $found[] = $multifile;
-                        }
-                        break;
-                    }
-
-                    if ($file === $find) {
-                        $found[] = $file;
-                        break;
-                    }
-
-                    if ($content['name'] === $find) {
-                        $found[] = $file;
-                        break;
-                    }
-                }
-
-                if (empty($found)) {
-                    if ($noexception !== false) {
-                        return array();
-                    }
-
-                    require_once 'Zend/File/Transfer/Exception.php';
-                    throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $find));
-                }
-
-                foreach ($found as $checked) {
-                    $check[$checked] = $this->_files[$checked];
-                }
-            }
-        }
-
-        if ($files === null) {
-            $check = $this->_files;
-            $keys  = array_keys($check);
-            foreach ($keys as $key) {
-                if (isset($check[$key]['multifiles'])) {
-                    unset($check[$key]);
-                }
-            }
-        }
-
-        if ($names) {
-            $check = array_keys($check);
-        }
-
-        return $check;
-    }
-
-    /**
-     * Retrieve internal identifier for a named validator
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _getValidatorIdentifier($name)
-    {
-        if (array_key_exists($name, $this->_validators)) {
-            return $name;
-        }
-
-        foreach (array_keys($this->_validators) as $test) {
-            if (preg_match('/' . preg_quote($name) . '$/i', $test)) {
-                return $test;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve internal identifier for a named filter
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _getFilterIdentifier($name)
-    {
-        if (array_key_exists($name, $this->_filters)) {
-            return $name;
-        }
-
-        foreach (array_keys($this->_filters) as $test) {
-            if (preg_match('/' . preg_quote($name) . '$/i', $test)) {
-                return $test;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/File/Transfer/Adapter/Http.php b/airtime_mvc/library/Zend/File/Transfer/Adapter/Http.php
deleted file mode 100644
index 53ab82aef..000000000
--- a/airtime_mvc/library/Zend/File/Transfer/Adapter/Http.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Http.php 20911 2010-02-04 19:40:57Z thomas $
- */
-
-/**
- * @see Zend_File_Transfer_Adapter_Abstract
- */
-require_once 'Zend/File/Transfer/Adapter/Abstract.php';
-
-/**
- * File transfer adapter class for the HTTP protocol
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstract
-{
-    protected static $_callbackApc            = 'apc_fetch';
-    protected static $_callbackUploadProgress = 'uploadprogress_get_info';
-
-    /**
-     * Constructor for Http File Transfers
-     *
-     * @param array $options OPTIONAL Options to set
-     */
-    public function __construct($options = array())
-    {
-        if (ini_get('file_uploads') == false) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('File uploads are not allowed in your php config!');
-        }
-
-        $this->setOptions($options);
-        $this->_prepareFiles();
-        $this->addValidator('Upload', false, $this->_files);
-    }
-
-    /**
-     * Sets a validator for the class, erasing all previous set
-     *
-     * @param  string|array $validator Validator to set
-     * @param  string|array $files     Files to limit this validator to
-     * @return Zend_File_Transfer_Adapter
-     */
-    public function setValidators(array $validators, $files = null)
-    {
-        $this->clearValidators();
-        return $this->addValidators($validators, $files);
-    }
-
-    /**
-     * Remove an individual validator
-     *
-     * @param  string $name
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function removeValidator($name)
-    {
-        if ($name == 'Upload') {
-            return $this;
-        }
-
-        return parent::removeValidator($name);
-    }
-
-    /**
-     * Remove an individual validator
-     *
-     * @param  string $name
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function clearValidators()
-    {
-        parent::clearValidators();
-        $this->addValidator('Upload', false, $this->_files);
-
-        return $this;
-    }
-
-    /**
-     * Send the file to the client (Download)
-     *
-     * @param  string|array $options Options for the file(s) to send
-     * @return void
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function send($options = null)
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Checks if the files are valid
-     *
-     * @param  string|array $files (Optional) Files to check
-     * @return boolean True if all checks are valid
-     */
-    public function isValid($files = null)
-    {
-        // Workaround for WebServer not conforming HTTP and omitting CONTENT_LENGTH
-        $content = 0;
-        if (isset($_SERVER['CONTENT_LENGTH'])) {
-            $content = $_SERVER['CONTENT_LENGTH'];
-        } else if (!empty($_POST)) {
-            $content = serialize($_POST);
-        }
-
-        // Workaround for a PHP error returning empty $_FILES when form data exceeds php settings
-        if (empty($this->_files) && ($content > 0)) {
-            if (is_array($files)) {
-                $files = current($files);
-            }
-
-            $temp = array($files => array(
-                'name'  => $files,
-                'error' => 1));
-            $validator = $this->_validators['Zend_Validate_File_Upload'];
-            $validator->setFiles($temp)
-                      ->isValid($files, null);
-            $this->_messages += $validator->getMessages();
-            return false;
-        }
-
-        return parent::isValid($files);
-    }
-
-    /**
-     * Receive the file from the client (Upload)
-     *
-     * @param  string|array $files (Optional) Files to receive
-     * @return bool
-     */
-    public function receive($files = null)
-    {
-        if (!$this->isValid($files)) {
-            return false;
-        }
-
-        $check = $this->_getFiles($files);
-        foreach ($check as $file => $content) {
-            if (!$content['received']) {
-                $directory   = '';
-                $destination = $this->getDestination($file);
-                if ($destination !== null) {
-                    $directory = $destination . DIRECTORY_SEPARATOR;
-                }
-
-                $filename = $directory . $content['name'];
-                $rename   = $this->getFilter('Rename');
-                if ($rename !== null) {
-                    $tmp = $rename->getNewName($content['tmp_name']);
-                    if ($tmp != $content['tmp_name']) {
-                        $filename = $tmp;
-                    }
-
-                    if (dirname($filename) == '.') {
-                        $filename = $directory . $filename;
-                    }
-
-                    $key = array_search(get_class($rename), $this->_files[$file]['filters']);
-                    unset($this->_files[$file]['filters'][$key]);
-                }
-
-                // Should never return false when it's tested by the upload validator
-                if (!move_uploaded_file($content['tmp_name'], $filename)) {
-                    if ($content['options']['ignoreNoFile']) {
-                        $this->_files[$file]['received'] = true;
-                        $this->_files[$file]['filtered'] = true;
-                        continue;
-                    }
-
-                    $this->_files[$file]['received'] = false;
-                    return false;
-                }
-
-                if ($rename !== null) {
-                    $this->_files[$file]['destination'] = dirname($filename);
-                    $this->_files[$file]['name']        = basename($filename);
-                }
-
-                $this->_files[$file]['tmp_name'] = $filename;
-                $this->_files[$file]['received'] = true;
-            }
-
-            if (!$content['filtered']) {
-                if (!$this->_filter($file)) {
-                    $this->_files[$file]['filtered'] = false;
-                    return false;
-                }
-
-                $this->_files[$file]['filtered'] = true;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks if the file was already sent
-     *
-     * @param  string|array $file Files to check
-     * @return bool
-     * @throws Zend_File_Transfer_Exception Not implemented
-     */
-    public function isSent($files = null)
-    {
-        require_once 'Zend/File/Transfer/Exception.php';
-        throw new Zend_File_Transfer_Exception('Method not implemented');
-    }
-
-    /**
-     * Checks if the file was already received
-     *
-     * @param  string|array $files (Optional) Files to check
-     * @return bool
-     */
-    public function isReceived($files = null)
-    {
-        $files = $this->_getFiles($files, false, true);
-        if (empty($files)) {
-            return false;
-        }
-
-        foreach ($files as $content) {
-            if ($content['received'] !== true) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks if the file was already filtered
-     *
-     * @param  string|array $files (Optional) Files to check
-     * @return bool
-     */
-    public function isFiltered($files = null)
-    {
-        $files = $this->_getFiles($files, false, true);
-        if (empty($files)) {
-            return false;
-        }
-
-        foreach ($files as $content) {
-            if ($content['filtered'] !== true) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Has a file been uploaded ?
-     *
-     * @param  array|string|null $file
-     * @return bool
-     */
-    public function isUploaded($files = null)
-    {
-        $files = $this->_getFiles($files, false, true);
-        if (empty($files)) {
-            return false;
-        }
-
-        foreach ($files as $file) {
-            if (empty($file['name'])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the actual progress of file up-/downloads
-     *
-     * @param  string $id The upload to get the progress for
-     * @return array|null
-     */
-    public static function getProgress($id = null)
-    {
-        if (!function_exists('apc_fetch') and !function_exists('uploadprogress_get_info')) {
-            require_once 'Zend/File/Transfer/Exception.php';
-            throw new Zend_File_Transfer_Exception('Wether APC nor uploadprogress extension installed');
-        }
-
-        $session = 'Zend_File_Transfer_Adapter_Http_ProgressBar';
-        $status  = array(
-            'total'    => 0,
-            'current'  => 0,
-            'rate'     => 0,
-            'message'  => '',
-            'done'     => false
-        );
-
-        if (is_array($id)) {
-            if (isset($id['progress'])) {
-                $adapter = $id['progress'];
-            }
-
-            if (isset($id['session'])) {
-                $session = $id['session'];
-            }
-
-            if (isset($id['id'])) {
-                $id = $id['id'];
-            } else {
-                unset($id);
-            }
-        }
-
-        if (!empty($id) && (($id instanceof Zend_ProgressBar_Adapter) || ($id instanceof Zend_ProgressBar))) {
-            $adapter = $id;
-            unset($id);
-        }
-
-        if (empty($id)) {
-            if (!isset($_GET['progress_key'])) {
-                $status['message'] = 'No upload in progress';
-                $status['done']    = true;
-            } else {
-                $id = $_GET['progress_key'];
-            }
-        }
-
-        if (!empty($id)) {
-            if (self::isApcAvailable()) {
-
-                $call = call_user_func(self::$_callbackApc, ini_get('apc.rfc1867_prefix') . $id);
-                if (is_array($call)) {
-                    $status = $call + $status;
-                }
-            } else if (self::isUploadProgressAvailable()) {
-                $call = call_user_func(self::$_callbackUploadProgress, $id);
-                if (is_array($call)) {
-                    $status = $call + $status;
-                    $status['total']   = $status['bytes_total'];
-                    $status['current'] = $status['bytes_uploaded'];
-                    $status['rate']    = $status['speed_average'];
-                    if ($status['total'] == $status['current']) {
-                        $status['done'] = true;
-                    }
-                }
-            }
-
-            if (!is_array($call)) {
-                $status['done']    = true;
-                $status['message'] = 'Failure while retrieving the upload progress';
-            } else if (!empty($status['cancel_upload'])) {
-                $status['done']    = true;
-                $status['message'] = 'The upload has been canceled';
-            } else {
-                $status['message'] = self::_toByteString($status['current']) . " - " . self::_toByteString($status['total']);
-            }
-
-            $status['id'] = $id;
-        }
-
-        if (isset($adapter) && isset($status['id'])) {
-            if ($adapter instanceof Zend_ProgressBar_Adapter) {
-                require_once 'Zend/ProgressBar.php';
-                $adapter = new Zend_ProgressBar($adapter, 0, $status['total'], $session);
-            }
-
-            if (!($adapter instanceof Zend_ProgressBar)) {
-                require_once 'Zend/File/Transfer/Exception.php';
-                throw new Zend_File_Transfer_Exception('Unknown Adapter given');
-            }
-
-            if ($status['done']) {
-                $adapter->finish();
-            } else {
-                $adapter->update($status['current'], $status['message']);
-            }
-
-            $status['progress'] = $adapter;
-        }
-
-        return $status;
-    }
-
-    /**
-     * Checks the APC extension for progress information
-     *
-     * @return boolean
-     */
-    public static function isApcAvailable()
-    {
-        return (bool) ini_get('apc.enabled') && (bool) ini_get('apc.rfc1867') && is_callable(self::$_callbackApc);
-    }
-
-    /**
-     * Checks the UploadProgress extension for progress information
-     *
-     * @return boolean
-     */
-    public static function isUploadProgressAvailable()
-    {
-        return is_callable(self::$_callbackUploadProgress);
-    }
-
-    /**
-     * Prepare the $_FILES array to match the internal syntax of one file per entry
-     *
-     * @param  array $files
-     * @return array
-     */
-    protected function _prepareFiles()
-    {
-        $this->_files = array();
-        foreach ($_FILES as $form => $content) {
-            if (is_array($content['name'])) {
-                foreach ($content as $param => $file) {
-                    foreach ($file as $number => $target) {
-                        $this->_files[$form . '_' . $number . '_'][$param]      = $target;
-                        $this->_files[$form]['multifiles'][$number] = $form . '_' . $number . '_';
-                    }
-                }
-
-                $this->_files[$form]['name'] = $form;
-                foreach($this->_files[$form]['multifiles'] as $key => $value) {
-                    $this->_files[$value]['options']   = $this->_options;
-                    $this->_files[$value]['validated'] = false;
-                    $this->_files[$value]['received']  = false;
-                    $this->_files[$value]['filtered']  = false;
-
-                    $mimetype = $this->_detectMimeType($this->_files[$value]);
-                    $this->_files[$value]['type'] = $mimetype;
-
-                    $filesize = $this->_detectFileSize($this->_files[$value]);
-                    $this->_files[$value]['size'] = $filesize;
-
-                    if ($this->_options['detectInfos']) {
-                        $_FILES[$form]['type'][$key] = $mimetype;
-                        $_FILES[$form]['size'][$key] = $filesize;
-                    }
-                }
-            } else {
-                $this->_files[$form]              = $content;
-                $this->_files[$form]['options']   = $this->_options;
-                $this->_files[$form]['validated'] = false;
-                $this->_files[$form]['received']  = false;
-                $this->_files[$form]['filtered']  = false;
-
-                $mimetype = $this->_detectMimeType($this->_files[$form]);
-                $this->_files[$form]['type'] = $mimetype;
-
-                $filesize = $this->_detectFileSize($this->_files[$form]);
-                $this->_files[$form]['size'] = $filesize;
-
-                if ($this->_options['detectInfos']) {
-                    $_FILES[$form]['type'] = $mimetype;
-                    $_FILES[$form]['size'] = $filesize;
-                }
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/File/Transfer/Exception.php b/airtime_mvc/library/Zend/File/Transfer/Exception.php
deleted file mode 100644
index 5aafd4583..000000000
--- a/airtime_mvc/library/Zend/File/Transfer/Exception.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_File_Transfer
- *
- * @category   Zend
- * @package    Zend_File_Transfer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_File_Transfer_Exception extends Zend_Exception
-{
-    protected $_fileerror = null;
-
-    public function __construct($message, $fileerror = 0)
-    {
-        $this->_fileerror = $fileerror;
-        parent::__construct($message);
-    }
-
-    /**
-     * Returns the transfer error code for the exception
-     * This is not the exception code !!!
-     *
-     * @return integer
-     */
-    public function getFileError()
-    {
-        return $this->_fileerror;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter.php b/airtime_mvc/library/Zend/Filter.php
deleted file mode 100644
index 803d8fa47..000000000
--- a/airtime_mvc/library/Zend/Filter.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Filter.php 21097 2010-02-19 20:11:34Z thomas $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter implements Zend_Filter_Interface
-{
-
-    const CHAIN_APPEND  = 'append';
-    const CHAIN_PREPEND = 'prepend';
-
-    /**
-     * Filter chain
-     *
-     * @var array
-     */
-    protected $_filters = array();
-
-    /**
-     * Default Namespaces
-     *
-     * @var array
-     */
-    protected static $_defaultNamespaces = array();
-
-    /**
-     * Adds a filter to the chain
-     *
-     * @param  Zend_Filter_Interface $filter
-     * @param  string $placement
-     * @return Zend_Filter Provides a fluent interface
-     */
-    public function addFilter(Zend_Filter_Interface $filter, $placement = self::CHAIN_APPEND)
-    {
-        if ($placement == self::CHAIN_PREPEND) {
-            array_unshift($this->_filters, $filter);
-        } else {
-            $this->_filters[] = $filter;
-        }
-        return $this;
-    }
-
-    /**
-     * Add a filter to the end of the chain
-     *
-     * @param  Zend_Filter_Interface $filter
-     * @return Zend_Filter Provides a fluent interface
-     */
-    public function appendFilter(Zend_Filter_Interface $filter)
-    {
-        return $this->addFilter($filter, self::CHAIN_APPEND);
-    }
-
-    /**
-     * Add a filter to the start of the chain
-     *
-     * @param  Zend_Filter_Interface $filter
-     * @return Zend_Filter Provides a fluent interface
-     */
-    public function prependFilter(Zend_Filter_Interface $filter)
-    {
-        return $this->addFilter($filter, self::CHAIN_PREPEND);
-    }
-
-    /**
-     * Get all the filters
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        return $this->_filters;
-    }
-
-    /**
-     * Returns $value filtered through each filter in the chain
-     *
-     * Filters are run in the order in which they were added to the chain (FIFO)
-     *
-     * @param  mixed $value
-     * @return mixed
-     */
-    public function filter($value)
-    {
-        $valueFiltered = $value;
-        foreach ($this->_filters as $filter) {
-            $valueFiltered = $filter->filter($valueFiltered);
-        }
-        return $valueFiltered;
-    }
-
-    /**
-     * Returns the set default namespaces
-     *
-     * @return array
-     */
-    public static function getDefaultNamespaces()
-    {
-        return self::$_defaultNamespaces;
-    }
-
-    /**
-     * Sets new default namespaces
-     *
-     * @param array|string $namespace
-     * @return null
-     */
-    public static function setDefaultNamespaces($namespace)
-    {
-        if (!is_array($namespace)) {
-            $namespace = array((string) $namespace);
-        }
-
-        self::$_defaultNamespaces = $namespace;
-    }
-
-    /**
-     * Adds a new default namespace
-     *
-     * @param array|string $namespace
-     * @return null
-     */
-    public static function addDefaultNamespaces($namespace)
-    {
-        if (!is_array($namespace)) {
-            $namespace = array((string) $namespace);
-        }
-
-        self::$_defaultNamespaces = array_unique(array_merge(self::$_defaultNamespaces, $namespace));
-    }
-
-    /**
-     * Returns true when defaultNamespaces are set
-     *
-     * @return boolean
-     */
-    public static function hasDefaultNamespaces()
-    {
-        return (!empty(self::$_defaultNamespaces));
-    }
-
-    /**
-     * @deprecated
-     * @see Zend_Filter::filterStatic()
-     *
-     * @param  mixed        $value
-     * @param  string       $classBaseName
-     * @param  array        $args          OPTIONAL
-     * @param  array|string $namespaces    OPTIONAL
-     * @return mixed
-     * @throws Zend_Filter_Exception
-     */
-    public static function get($value, $classBaseName, array $args = array(), $namespaces = array())
-    {
-        trigger_error(
-            'Zend_Filter::get() is deprecated as of 1.9.0; please update your code to utilize Zend_Filter::filterStatic()',
-            E_USER_NOTICE
-        );
-
-        return self::filterStatic($value, $classBaseName, $args, $namespaces);
-    }
-
-    /**
-     * Returns a value filtered through a specified filter class, without requiring separate
-     * instantiation of the filter object.
-     *
-     * The first argument of this method is a data input value, that you would have filtered.
-     * The second argument is a string, which corresponds to the basename of the filter class,
-     * relative to the Zend_Filter namespace. This method automatically loads the class,
-     * creates an instance, and applies the filter() method to the data input. You can also pass
-     * an array of constructor arguments, if they are needed for the filter class.
-     *
-     * @param  mixed        $value
-     * @param  string       $classBaseName
-     * @param  array        $args          OPTIONAL
-     * @param  array|string $namespaces    OPTIONAL
-     * @return mixed
-     * @throws Zend_Filter_Exception
-     */
-    public static function filterStatic($value, $classBaseName, array $args = array(), $namespaces = array())
-    {
-        require_once 'Zend/Loader.php';
-        $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Filter'));
-        foreach ($namespaces as $namespace) {
-            $className = $namespace . '_' . ucfirst($classBaseName);
-            if (!class_exists($className, false)) {
-                try {
-                    $file = str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-                    if (Zend_Loader::isReadable($file)) {
-                        Zend_Loader::loadClass($className);
-                    } else {
-                        continue;
-                    }
-                } catch (Zend_Exception $ze) {
-                    continue;
-                }
-            }
-
-            $class = new ReflectionClass($className);
-            if ($class->implementsInterface('Zend_Filter_Interface')) {
-                if ($class->hasMethod('__construct')) {
-                    $object = $class->newInstanceArgs($args);
-                } else {
-                    $object = $class->newInstance();
-                }
-                return $object->filter($value);
-            }
-        }
-        require_once 'Zend/Filter/Exception.php';
-        throw new Zend_Filter_Exception("Filter class not found from basename '$classBaseName'");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Alnum.php b/airtime_mvc/library/Zend/Filter/Alnum.php
deleted file mode 100644
index 6739772ce..000000000
--- a/airtime_mvc/library/Zend/Filter/Alnum.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Alnum.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-/**
- * @see Zend_Locale
- */
-require_once 'Zend/Locale.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Alnum implements Zend_Filter_Interface
-{
-    /**
-     * Whether to allow white space characters; off by default
-     *
-     * @var boolean
-     * @deprecated
-     */
-    public $allowWhiteSpace;
-
-    /**
-     * Is PCRE is compiled with UTF-8 and Unicode support
-     *
-     * @var mixed
-     **/
-    protected static $_unicodeEnabled;
-
-    /**
-     * Locale in browser.
-     *
-     * @var Zend_Locale object
-     */
-    protected $_locale;
-
-    /**
-     * The Alphabet means english alphabet.
-     *
-     * @var boolean
-     */
-    protected static $_meansEnglishAlphabet;
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        if ($allowWhiteSpace instanceof Zend_Config) {
-            $allowWhiteSpace = $allowWhiteSpace->toArray();
-        } else if (is_array($allowWhiteSpace)) {
-            if (array_key_exists('allowwhitespace', $allowWhiteSpace)) {
-                $allowWhiteSpace = $allowWhiteSpace['allowwhitespace'];
-            } else {
-                $allowWhiteSpace = false;
-            }
-        }
-
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        if (null === self::$_unicodeEnabled) {
-            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
-        }
-
-        if (null === self::$_meansEnglishAlphabet) {
-            $this->_locale = new Zend_Locale('auto');
-            self::$_meansEnglishAlphabet = in_array($this->_locale->getLanguage(),
-                                                    array('ja', 'ko', 'zh')
-                                                    );
-        }
-
-    }
-
-    /**
-     * Returns the allowWhiteSpace option
-     *
-     * @return boolean
-     */
-    public function getAllowWhiteSpace()
-    {
-        return $this->allowWhiteSpace;
-    }
-
-    /**
-     * Sets the allowWhiteSpace option
-     *
-     * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alnum Provides a fluent interface
-     */
-    public function setAllowWhiteSpace($allowWhiteSpace)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, removing all but alphabetic and digit characters
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $whiteSpace = $this->allowWhiteSpace ? '\s' : '';
-        if (!self::$_unicodeEnabled) {
-            // POSIX named classes are not supported, use alternative a-zA-Z0-9 match
-            $pattern = '/[^a-zA-Z0-9' . $whiteSpace . ']/';
-        } else if (self::$_meansEnglishAlphabet) {
-            //The Alphabet means english alphabet.
-            $pattern = '/[^a-zA-Z0-9'  . $whiteSpace . ']/u';
-        } else {
-            //The Alphabet means each language's alphabet.
-            $pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
-        }
-
-        return preg_replace($pattern, '', (string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Alpha.php b/airtime_mvc/library/Zend/Filter/Alpha.php
deleted file mode 100644
index b42622e2f..000000000
--- a/airtime_mvc/library/Zend/Filter/Alpha.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Alpha.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-/**
- * @see Zend_Locale
- */
-require_once 'Zend/Locale.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Alpha implements Zend_Filter_Interface
-{
-    /**
-     * Whether to allow white space characters; off by default
-     *
-     * @var boolean
-     * @deprecated
-     */
-    public $allowWhiteSpace;
-
-    /**
-     * Is PCRE is compiled with UTF-8 and Unicode support
-     *
-     * @var mixed
-     **/
-    protected static $_unicodeEnabled;
-
-    /**
-     * Locale in browser.
-     *
-     * @var Zend_Locale object
-     */
-    protected $_locale;
-
-    /**
-     * The Alphabet means english alphabet.
-     *
-     * @var boolean
-     */
-    protected static $_meansEnglishAlphabet;
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        if ($allowWhiteSpace instanceof Zend_Config) {
-            $allowWhiteSpace = $allowWhiteSpace->toArray();
-        } else if (is_array($allowWhiteSpace)) {
-            if (array_key_exists('allowwhitespace', $allowWhiteSpace)) {
-                $allowWhiteSpace = $allowWhiteSpace['allowwhitespace'];
-            } else {
-                $allowWhiteSpace = false;
-            }
-        }
-
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        if (null === self::$_unicodeEnabled) {
-            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
-        }
-
-        if (null === self::$_meansEnglishAlphabet) {
-            $this->_locale = new Zend_Locale('auto');
-            self::$_meansEnglishAlphabet = in_array($this->_locale->getLanguage(),
-                                                    array('ja', 'ko', 'zh')
-                                                    );
-        }
-
-    }
-
-    /**
-     * Returns the allowWhiteSpace option
-     *
-     * @return boolean
-     */
-    public function getAllowWhiteSpace()
-    {
-        return $this->allowWhiteSpace;
-    }
-
-    /**
-     * Sets the allowWhiteSpace option
-     *
-     * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alpha Provides a fluent interface
-     */
-    public function setAllowWhiteSpace($allowWhiteSpace)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, removing all but alphabetic characters
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $whiteSpace = $this->allowWhiteSpace ? '\s' : '';
-        if (!self::$_unicodeEnabled) {
-            // POSIX named classes are not supported, use alternative a-zA-Z match
-            $pattern = '/[^a-zA-Z' . $whiteSpace . ']/';
-        } else if (self::$_meansEnglishAlphabet) {
-            //The Alphabet means english alphabet.
-            $pattern = '/[^a-zA-Z'  . $whiteSpace . ']/u';
-        } else {
-            //The Alphabet means each language's alphabet.
-            $pattern = '/[^\p{L}' . $whiteSpace . ']/u';
-        }
-
-        return preg_replace($pattern, '', (string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/BaseName.php b/airtime_mvc/library/Zend/Filter/BaseName.php
deleted file mode 100644
index 88e09ef4c..000000000
--- a/airtime_mvc/library/Zend/Filter/BaseName.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BaseName.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_BaseName implements Zend_Filter_Interface
-{
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns basename($value)
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        return basename((string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Boolean.php b/airtime_mvc/library/Zend/Filter/Boolean.php
deleted file mode 100644
index f9748125d..000000000
--- a/airtime_mvc/library/Zend/Filter/Boolean.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Boolean implements Zend_Filter_Interface
-{
-    const BOOLEAN      = 1;
-    const INTEGER      = 2;
-    const FLOAT        = 4;
-    const STRING       = 8;
-    const ZERO         = 16;
-    const EMPTY_ARRAY  = 32;
-    const NULL         = 64;
-    const PHP          = 127;
-    const FALSE_STRING = 128;
-    const YES          = 256;
-    const ALL          = 511;
-
-    protected $_constants = array(
-        self::BOOLEAN      => 'boolean',
-        self::INTEGER      => 'integer',
-        self::FLOAT        => 'float',
-        self::STRING       => 'string',
-        self::ZERO         => 'zero',
-        self::EMPTY_ARRAY  => 'array',
-        self::NULL         => 'null',
-        self::PHP          => 'php',
-        self::FALSE_STRING => 'false',
-        self::YES          => 'yes',
-        self::ALL          => 'all',
-    );
-
-    /**
-     * Internal type to detect
-     *
-     * @var integer
-     */
-    protected $_type = self::PHP;
-
-    /**
-     * Internal locale
-     *
-     * @var array
-     */
-    protected $_locale = array('auto');
-
-    /**
-     * Internal mode
-     *
-     * @var boolean
-     */
-    protected $_casting = true;
-
-    /**
-     * Constructor
-     *
-     * @param string|array|Zend_Config $options OPTIONAL
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp['type'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['casting'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['locale'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (array_key_exists('type', $options)) {
-            $this->setType($options['type']);
-        }
-
-        if (array_key_exists('casting', $options)) {
-            $this->setCasting($options['casting']);
-        }
-
-        if (array_key_exists('locale', $options)) {
-            $this->setLocale($options['locale']);
-        }
-    }
-
-    /**
-     * Returns the set null types
-     *
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set the null types
-     *
-     * @param  integer|array $type
-     * @throws Zend_Filter_Exception
-     * @return Zend_Filter_Boolean
-     */
-    public function setType($type = null)
-    {
-        if (is_array($type)) {
-            $detected = 0;
-            foreach($type as $value) {
-                if (is_int($value)) {
-                    $detected += $value;
-                } elseif (in_array($value, $this->_constants)) {
-                    $detected += array_search($value, $this->_constants);
-                }
-            }
-
-            $type = $detected;
-        } elseif (is_string($type) && in_array($type, $this->_constants)) {
-            $type = array_search($type, $this->_constants);
-        }
-
-        if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Unknown type');
-        }
-
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Returns the set locale
-     *
-     * @return array
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Set the locales which are accepted
-     *
-     * @param  string|array|Zend_Locale $locale
-     * @throws Zend_Filter_Exception
-     * @return Zend_Filter_Boolean
-     */
-    public function setLocale($locale = null)
-    {
-        if (is_string($locale)) {
-            $locale = array($locale);
-        } elseif ($locale instanceof Zend_Locale) {
-            $locale = array($locale->toString());
-        } elseif (!is_array($locale)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Locale has to be string, array or an instance of Zend_Locale');
-        }
-
-        require_once 'Zend/Locale.php';
-        foreach ($locale as $single) {
-            if (!Zend_Locale::isLocale($single)) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("Unknown locale '$single'");
-            }
-        }
-
-        $this->_locale = $locale;
-        return $this;
-    }
-
-    /**
-     * Returns the casting option
-     *
-     * @return boolean
-     */
-    public function getCasting()
-    {
-        return $this->_casting;
-    }
-
-    /**
-     * Set the working mode
-     *
-     * @param  boolean $locale When true this filter works like cast
-     *                         When false it recognises only true and false
-     *                         and all other values are returned as is
-     * @throws Zend_Filter_Exception
-     * @return Zend_Filter_Boolean
-     */
-    public function setCasting($casting = true)
-    {
-        $this->_casting = (boolean) $casting;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns a boolean representation of $value
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $type    = $this->getType();
-        $casting = $this->getCasting();
-
-        // STRING YES (Localized)
-        if ($type >= self::YES) {
-            $type -= self::YES;
-            if (is_string($value)) {
-                require_once 'Zend/Locale.php';
-                $locales = $this->getLocale();
-                foreach ($locales as $locale) {
-                    if ($this->_getLocalizedQuestion($value, false, $locale) === false) {
-                        return false;
-                    }
-
-                    if (!$casting && ($this->_getLocalizedQuestion($value, true, $locale) === true)) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        // STRING FALSE ('false')
-        if ($type >= self::FALSE_STRING) {
-            $type -= self::FALSE_STRING;
-            if (is_string($value) && (strtolower($value) == 'false')) {
-                return false;
-            }
-
-            if ((!$casting) && is_string($value) && (strtolower($value) == 'true')) {
-                return true;
-            }
-        }
-
-        // NULL (null)
-        if ($type >= self::NULL) {
-            $type -= self::NULL;
-            if (is_null($value)) {
-                return false;
-            }
-        }
-
-        // EMPTY_ARRAY (array())
-        if ($type >= self::EMPTY_ARRAY) {
-            $type -= self::EMPTY_ARRAY;
-            if (is_array($value) && ($value == array())) {
-                return false;
-            }
-        }
-
-        // ZERO ('0')
-        if ($type >= self::ZERO) {
-            $type -= self::ZERO;
-            if (is_string($value) && ($value == '0')) {
-                return false;
-            }
-
-            if ((!$casting) && (is_string($value)) && ($value == '1')) {
-                return true;
-            }
-        }
-
-        // STRING ('')
-        if ($type >= self::STRING) {
-            $type -= self::STRING;
-            if (is_string($value) && ($value == '')) {
-                return false;
-            }
-        }
-
-        // FLOAT (0.0)
-        if ($type >= self::FLOAT) {
-            $type -= self::FLOAT;
-            if (is_float($value) && ($value == 0.0)) {
-                return false;
-            }
-
-            if ((!$casting) && is_float($value) && ($value == 1.0)) {
-                return true;
-            }
-        }
-
-        // INTEGER (0)
-        if ($type >= self::INTEGER) {
-            $type -= self::INTEGER;
-            if (is_int($value) && ($value == 0)) {
-                return false;
-            }
-
-            if ((!$casting) && is_int($value) && ($value == 1)) {
-                return true;
-            }
-        }
-
-        // BOOLEAN (false)
-        if ($type >= self::BOOLEAN) {
-            $type -= self::BOOLEAN;
-            if (is_bool($value)) {
-                return $value;
-            }
-        }
-
-        if ($casting) {
-            return true;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Determine the value of a localized string, and compare it to a given value
-     *
-     * @param  string $value
-     * @param  boolean $yes
-     * @param  array $locale
-     * @return boolean
-     */
-    protected function _getLocalizedQuestion($value, $yes, $locale)
-    {
-        if ($yes == true) {
-            $question = 'yes';
-            $return   = true;
-        } else {
-            $question = 'no';
-            $return   = false;
-        }
-        $str = Zend_Locale::getTranslation($question, 'question', $locale);
-        $str = explode(':', $str);
-        if (!empty($str)) {
-            foreach($str as $no) {
-                if (($no == $value) || (strtolower($no) == strtolower($value))) {
-                    return $return;
-                }
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Callback.php b/airtime_mvc/library/Zend/Filter/Callback.php
deleted file mode 100644
index f7edb69c2..000000000
--- a/airtime_mvc/library/Zend/Filter/Callback.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Callback implements Zend_Filter_Interface
-{
-    /**
-     * Callback in a call_user_func format
-     *
-     * @var string|array
-     */
-    protected $_callback = null;
-
-    /**
-     * Default options to set for the filter
-     *
-     * @var mixed
-     */
-    protected $_options = null;
-
-    /**
-     * Constructor
-     *
-     * @param string|array $callback Callback in a call_user_func format
-     * @param mixed        $options  (Optional) Default options for this filter
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options) || !array_key_exists('callback', $options)) {
-            $options          = func_get_args();
-            $temp['callback'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['options'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!array_key_exists('callback', $options)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Missing callback to use');
-        }
-
-        $this->setCallback($options['callback']);
-        if (array_key_exists('options', $options)) {
-            $this->setOptions($options['options']);
-        }
-    }
-
-    /**
-     * Returns the set callback
-     *
-     * @return string|array Set callback
-     */
-    public function getCallback()
-    {
-        return $this->_callback;
-    }
-
-    /**
-     * Sets a new callback for this filter
-     *
-     * @param unknown_type $callback
-     * @return unknown
-     */
-    public function setCallback($callback, $options = null)
-    {
-        if (!is_callable($callback)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Callback can not be accessed');
-        }
-
-        $this->_callback = $callback;
-        $this->setOptions($options);
-        return $this;
-    }
-
-    /**
-     * Returns the set default options
-     *
-     * @return mixed
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets new default options to the callback filter
-     *
-     * @param mixed $options Default options to set
-     * @return Zend_Filter_Callback
-     */
-    public function setOptions($options)
-    {
-        $this->_options = $options;
-        return $this;
-    }
-
-    /**
-     * Calls the filter per callback
-     *
-     * @param $value mixed Options for the set callback
-     * @return mixed       Result from the filter which was callbacked
-     */
-    public function filter($value)
-    {
-        $options = array();
-
-        if ($this->_options !== null) {
-            if (!is_array($this->_options)) {
-                $options = array($this->_options);
-            } else {
-                $options = $this->_options;
-            }
-        }
-
-        array_unshift($options, $value);
-
-        return call_user_func_array($this->_callback, $options);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Compress.php b/airtime_mvc/library/Zend/Filter/Compress.php
deleted file mode 100644
index 69f8805c0..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Compress.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * Compresses a given string
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress implements Zend_Filter_Interface
-{
-    /**
-     * Compression adapter
-     */
-    protected $_adapter = 'Gz';
-
-    /**
-     * Compression adapter constructor options
-     */
-    protected $_adapterOptions = array();
-
-    /**
-     * Class constructor
-     *
-     * @param string|array $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (is_string($options)) {
-            $this->setAdapter($options);
-        } elseif ($options instanceof Zend_Filter_Compress_CompressInterface) {
-            $this->setAdapter($options);
-        } elseif (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set filter setate
-     *
-     * @param  array $options
-     * @return Zend_Filter_Compress
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if ($key == 'options') {
-                $key = 'adapterOptions';
-            }
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the current adapter, instantiating it if necessary
-     *
-     * @return string
-     */
-    public function getAdapter()
-    {
-        if ($this->_adapter instanceof Zend_Filter_Compress_CompressInterface) {
-            return $this->_adapter;
-        }
-
-        $adapter = $this->_adapter;
-        $options = $this->getAdapterOptions();
-        if (!class_exists($adapter)) {
-            require_once 'Zend/Loader.php';
-            if (Zend_Loader::isReadable('Zend/Filter/Compress/' . ucfirst($adapter) . '.php')) {
-                $adapter = 'Zend_Filter_Compress_' . ucfirst($adapter);
-            }
-            Zend_Loader::loadClass($adapter);
-        }
-
-        $this->_adapter = new $adapter($options);
-        if (!$this->_adapter instanceof Zend_Filter_Compress_CompressInterface) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Compression adapter '" . $adapter . "' does not implement Zend_Filter_Compress_CompressInterface");
-        }
-        return $this->_adapter;
-    }
-
-    /**
-     * Retrieve adapter name
-     *
-     * @return string
-     */
-    public function getAdapterName()
-    {
-        return $this->getAdapter()->toString();
-    }
-
-    /**
-     * Sets compression adapter
-     *
-     * @param  string|Zend_Filter_Compress_CompressInterface $adapter Adapter to use
-     * @return Zend_Filter_Compress
-     */
-    public function setAdapter($adapter)
-    {
-        if ($adapter instanceof Zend_Filter_Compress_CompressInterface) {
-            $this->_adapter = $adapter;
-            return $this;
-        }
-        if (!is_string($adapter)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Invalid adapter provided; must be string or instance of Zend_Filter_Compress_CompressInterface');
-        }
-        $this->_adapter = $adapter;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve adapter options
-     *
-     * @return array
-     */
-    public function getAdapterOptions()
-    {
-        return $this->_adapterOptions;
-    }
-
-    /**
-     * Set adapter options
-     *
-     * @param  array $options
-     * @return void
-     */
-    public function setAdapterOptions(array $options)
-    {
-        $this->_adapterOptions = $options;
-        return $this;
-    }
-
-    /**
-     * Calls adapter methods
-     *
-     * @param string       $method  Method to call
-     * @param string|array $options Options for this method
-     */
-    public function __call($method, $options)
-    {
-        $adapter = $this->getAdapter();
-        if (!method_exists($adapter, $method)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Unknown method '{$method}'");
-        }
-
-        return call_user_func_array(array($adapter, $method), $options);
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Compresses the content $value with the defined settings
-     *
-     * @param  string $value Content to compress
-     * @return string The compressed content
-     */
-    public function filter($value)
-    {
-        return $this->getAdapter()->compress($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Bz2.php b/airtime_mvc/library/Zend/Filter/Compress/Bz2.php
deleted file mode 100644
index d8822ebb5..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Bz2.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Bz2.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressAbstract
- */
-require_once 'Zend/Filter/Compress/CompressAbstract.php';
-
-/**
- * Compression adapter for Bz2
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract
-{
-    /**
-     * Compression Options
-     * array(
-     *     'blocksize' => Blocksize to use from 0-9
-     *     'archive'   => Archive to use
-     * )
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'blocksize' => 4,
-        'archive'   => null,
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param array|Zend_Config $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if (!extension_loaded('bz2')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the bz2 extension');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Returns the set blocksize
-     *
-     * @return integer
-     */
-    public function getBlocksize()
-    {
-        return $this->_options['blocksize'];
-    }
-
-    /**
-     * Sets a new blocksize
-     *
-     * @param integer $level
-     * @return Zend_Filter_Compress_Bz2
-     */
-    public function setBlocksize($blocksize)
-    {
-        if (($blocksize < 0) || ($blocksize > 9)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Blocksize must be between 0 and 9');
-        }
-
-        $this->_options['blocksize'] = (int) $blocksize;
-        return $this;
-    }
-
-    /**
-     * Returns the set archive
-     *
-     * @return string
-     */
-    public function getArchive()
-    {
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Sets the archive to use for de-/compression
-     *
-     * @param string $archive Archive to use
-     * @return Zend_Filter_Compress_Bz2
-     */
-    public function setArchive($archive)
-    {
-        $this->_options['archive'] = (string) $archive;
-        return $this;
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function compress($content)
-    {
-        $archive = $this->getArchive();
-        if (!empty($archive)) {
-            $file = bzopen($archive, 'w');
-            if (!$file) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'");
-            }
-
-            bzwrite($file, $content);
-            bzclose($file);
-            $compressed = true;
-        } else {
-            $compressed = bzcompress($content, $this->getBlocksize());
-        }
-
-        if (is_int($compressed)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during compression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function decompress($content)
-    {
-        $archive = $this->getArchive();
-        if (file_exists($content)) {
-            $archive = $content;
-        }
-
-        if (file_exists($archive)) {
-            $file = bzopen($archive, 'r');
-            if (!$file) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("Error opening the archive '" . $content . "'");
-            }
-
-            $compressed = bzread($file);
-            bzclose($file);
-        } else {
-            $compressed = bzdecompress($content);
-        }
-
-        if (is_int($compressed)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during decompression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Bz2';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/CompressAbstract.php b/airtime_mvc/library/Zend/Filter/Compress/CompressAbstract.php
deleted file mode 100644
index 4cd057248..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/CompressAbstract.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CompressAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressInterface
- */
-require_once 'Zend/Filter/Compress/CompressInterface.php';
-
-/**
- * Abstract compression adapter
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Filter_Compress_CompressAbstract implements Zend_Filter_Compress_CompressInterface
-{
-    /**
-     * Class constructor
-     *
-     * @param array|Zend_Config $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Returns one or all set options
-     *
-     * @param string $option (Optional) Option to return
-     * @return mixed
-     */
-    public function getOptions($option = null)
-    {
-        if ($option === null) {
-            return $this->_options;
-        }
-
-        if (!array_key_exists($option, $this->_options)) {
-            return null;
-        }
-
-        return $this->_options[$option];
-    }
-
-    /**
-     * Sets all or one option
-     *
-     * @param  array $options
-     * @return Zend_Filter_Compress_Bz2
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $option) {
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($option);
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/CompressInterface.php b/airtime_mvc/library/Zend/Filter/Compress/CompressInterface.php
deleted file mode 100644
index 250339881..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/CompressInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CompressInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Compression interface
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Filter_Compress_CompressInterface
-{
-    /**
-     * Compresses $value with the defined settings
-     *
-     * @param  string $value Data to compress
-     * @return string The compressed data
-     */
-    public function compress($value);
-
-    /**
-     * Decompresses $value with the defined settings
-     *
-     * @param  string $value Data to decompress
-     * @return string The decompressed data
-     */
-    public function decompress($value);
-
-    /**
-     * Return the adapter name
-     *
-     * @return string
-     */
-    public function toString();
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Gz.php b/airtime_mvc/library/Zend/Filter/Compress/Gz.php
deleted file mode 100644
index 6ae378050..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Gz.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gz.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressAbstract
- */
-require_once 'Zend/Filter/Compress/CompressAbstract.php';
-
-/**
- * Compression adapter for Gzip (ZLib)
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract
-{
-    /**
-     * Compression Options
-     * array(
-     *     'level'    => Compression level 0-9
-     *     'mode'     => Compression mode, can be 'compress', 'deflate'
-     *     'archive'  => Archive to use
-     * )
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'level'   => 9,
-        'mode'    => 'compress',
-        'archive' => null,
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param array|Zend_Config|null $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if (!extension_loaded('zlib')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the zlib extension');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Returns the set compression level
-     *
-     * @return integer
-     */
-    public function getLevel()
-    {
-        return $this->_options['level'];
-    }
-
-    /**
-     * Sets a new compression level
-     *
-     * @param integer $level
-     * @return Zend_Filter_Compress_Gz
-     */
-    public function setLevel($level)
-    {
-        if (($level < 0) || ($level > 9)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Level must be between 0 and 9');
-        }
-
-        $this->_options['level'] = (int) $level;
-        return $this;
-    }
-
-    /**
-     * Returns the set compression mode
-     *
-     * @return string
-     */
-    public function getMode()
-    {
-        return $this->_options['mode'];
-    }
-
-    /**
-     * Sets a new compression mode
-     *
-     * @param string $mode Supported are 'compress', 'deflate' and 'file'
-     */
-    public function setMode($mode)
-    {
-        if (($mode != 'compress') && ($mode != 'deflate')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Given compression mode not supported');
-        }
-
-        $this->_options['mode'] = $mode;
-        return $this;
-    }
-
-    /**
-     * Returns the set archive
-     *
-     * @return string
-     */
-    public function getArchive()
-    {
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Sets the archive to use for de-/compression
-     *
-     * @param string $archive Archive to use
-     * @return Zend_Filter_Compress_Gz
-     */
-    public function setArchive($archive)
-    {
-        $this->_options['archive'] = (string) $archive;
-        return $this;
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function compress($content)
-    {
-        $archive = $this->getArchive();
-        if (!empty($archive)) {
-            $file = gzopen($archive, 'w' . $this->getLevel());
-            if (!$file) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("Error opening the archive '" . $this->_options['archive'] . "'");
-            }
-
-            gzwrite($file, $content);
-            gzclose($file);
-            $compressed = true;
-        } else if ($this->_options['mode'] == 'deflate') {
-            $compressed = gzdeflate($content, $this->getLevel());
-        } else {
-            $compressed = gzcompress($content, $this->getLevel());
-        }
-
-        if (!$compressed) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during compression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function decompress($content)
-    {
-        $archive = $this->getArchive();
-        $mode    = $this->getMode();
-        if (file_exists($content)) {
-            $archive = $content;
-        }
-
-        if (file_exists($archive)) {
-            $handler = fopen($archive, "rb");
-            if (!$handler) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'");
-            }
-
-            fseek($handler, -4, SEEK_END);
-            $packet = fread($handler, 4);
-            $bytes  = unpack("V", $packet);
-            $size   = end($bytes);
-            fclose($handler);
-
-            $file       = gzopen($archive, 'r');
-            $compressed = gzread($file, $size);
-            gzclose($file);
-        } else if ($mode == 'deflate') {
-            $compressed = gzinflate($content);
-        } else {
-            $compressed = gzuncompress($content);
-        }
-
-        if (!$compressed) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during compression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Gz';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Lzf.php b/airtime_mvc/library/Zend/Filter/Compress/Lzf.php
deleted file mode 100644
index 9e40dee15..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Lzf.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Lzf.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressInterface
- */
-require_once 'Zend/Filter/Compress/CompressInterface.php';
-
-/**
- * Compression adapter for Lzf
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface
-{
-    /**
-     * Class constructor
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('lzf')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the lzf extension');
-        }
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function compress($content)
-    {
-        $compressed = lzf_compress($content);
-        if (!$compressed) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during compression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function decompress($content)
-    {
-        $compressed = lzf_decompress($content);
-        if (!$compressed) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error during compression');
-        }
-
-        return $compressed;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Lzf';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Rar.php b/airtime_mvc/library/Zend/Filter/Compress/Rar.php
deleted file mode 100644
index 923ee536a..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Rar.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rar.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressAbstract
- */
-require_once 'Zend/Filter/Compress/CompressAbstract.php';
-
-/**
- * Compression adapter for Rar
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract
-{
-    /**
-     * Compression Options
-     * array(
-     *     'callback' => Callback for compression
-     *     'archive'  => Archive to use
-     *     'password' => Password to use
-     *     'target'   => Target to write the files to
-     * )
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'callback' => null,
-        'archive'  => null,
-        'password' => null,
-        'target'   => '.',
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param array $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if (!extension_loaded('rar')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the rar extension');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Returns the set callback for compression
-     *
-     * @return string
-     */
-    public function getCallback()
-    {
-        return $this->_options['callback'];
-    }
-
-    /**
-     * Sets the callback to use
-     *
-     * @param string $callback
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Callback can not be accessed');
-        }
-
-        $this->_options['callback'] = $callback;
-        return $this;
-    }
-
-    /**
-     * Returns the set archive
-     *
-     * @return string
-     */
-    public function getArchive()
-    {
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Sets the archive to use for de-/compression
-     *
-     * @param string $archive Archive to use
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setArchive($archive)
-    {
-        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
-        $this->_options['archive'] = (string) $archive;
-
-        return $this;
-    }
-
-    /**
-     * Returns the set password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->_options['password'];
-    }
-
-    /**
-     * Sets the password to use
-     *
-     * @param string $password
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setPassword($password)
-    {
-        $this->_options['password'] = (string) $password;
-        return $this;
-    }
-
-    /**
-     * Returns the set targetpath
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_options['target'];
-    }
-
-    /**
-     * Sets the targetpath to use
-     *
-     * @param string $target
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setTarget($target)
-    {
-        if (!file_exists(dirname($target))) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The directory '$target' does not exist");
-        }
-
-        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
-        $this->_options['target'] = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string|array $content
-     * @return string
-     */
-    public function compress($content)
-    {
-        $callback = $this->getCallback();
-        if (is_null($callback)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('No compression callback available');
-        }
-
-        $options = $this->getOptions();
-        unset($options['callback']);
-
-        $result = call_user_func($callback, $options, $content);
-        if ($result !== true) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error compressing the RAR Archive');
-        }
-
-        return $this->getArchive();
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return boolean
-     */
-    public function decompress($content)
-    {
-        $archive = $this->getArchive();
-        if (file_exists($content)) {
-            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
-        } elseif (empty($archive) || !file_exists($archive)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('RAR Archive not found');
-        }
-
-        $password = $this->getPassword();
-        if (!is_null($password)) {
-            $archive = rar_open($archive, $password);
-        } else {
-            $archive = rar_open($archive);
-        }
-
-        if (!$archive) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Error opening the RAR Archive");
-        }
-
-        $target = $this->getTarget();
-        if (!is_dir($target)) {
-            $target = dirname($target);
-        }
-
-        $filelist = rar_list($archive);
-        if (!$filelist) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Error reading the RAR Archive");
-        }
-
-        foreach($filelist as $file) {
-            $file->extract($target);
-        }
-
-        rar_close($archive);
-        return true;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Rar';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Tar.php b/airtime_mvc/library/Zend/Filter/Compress/Tar.php
deleted file mode 100644
index 74a6f9a90..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Tar.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tar.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressAbstract
- */
-require_once 'Zend/Filter/Compress/CompressAbstract.php';
-
-/**
- * Compression adapter for Tar
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract
-{
-    /**
-     * Compression Options
-     * array(
-     *     'archive'  => Archive to use
-     *     'target'   => Target to write the files to
-     * )
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'archive'  => null,
-        'target'   => '.',
-        'mode'     => null,
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param array $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if (!class_exists('Archive_Tar')) {
-            require_once 'Zend/Loader.php';
-            try {
-                Zend_Loader::loadClass('Archive_Tar');
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception('This filter needs PEARs Archive_Tar', 0, $e);
-            }
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * Returns the set archive
-     *
-     * @return string
-     */
-    public function getArchive()
-    {
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Sets the archive to use for de-/compression
-     *
-     * @param string $archive Archive to use
-     * @return Zend_Filter_Compress_Tar
-     */
-    public function setArchive($archive)
-    {
-        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
-        $this->_options['archive'] = (string) $archive;
-
-        return $this;
-    }
-
-    /**
-     * Returns the set targetpath
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_options['target'];
-    }
-
-    /**
-     * Sets the targetpath to use
-     *
-     * @param string $target
-     * @return Zend_Filter_Compress_Tar
-     */
-    public function setTarget($target)
-    {
-        if (!file_exists(dirname($target))) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The directory '$target' does not exist");
-        }
-
-        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
-        $this->_options['target'] = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Returns the set compression mode
-     */
-    public function getMode()
-    {
-        return $this->_options['mode'];
-    }
-
-    /**
-     * Compression mode to use
-     * Eighter Gz or Bz2
-     *
-     * @param string $mode
-     */
-    public function setMode($mode)
-    {
-        $mode = ucfirst(strtolower($mode));
-        if (($mode != 'Bz2') && ($mode != 'Gz')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The mode '$mode' is unknown");
-        }
-
-        if (($mode == 'Bz2') && (!extension_loaded('bz2'))) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This mode needs the bz2 extension');
-        }
-
-        if (($mode == 'Gz') && (!extension_loaded('zlib'))) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This mode needs the zlib extension');
-        }
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function compress($content)
-    {
-        $archive = new Archive_Tar($this->getArchive(), $this->getMode());
-        if (!file_exists($content)) {
-            $file = $this->getTarget();
-            if (is_dir($file)) {
-                $file .= DIRECTORY_SEPARATOR . "tar.tmp";
-            }
-
-            $result = file_put_contents($file, $content);
-            if ($result === false) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception('Error creating the temporary file');
-            }
-
-            $content = $file;
-        }
-
-        if (is_dir($content)) {
-            // collect all file infos
-            foreach (new RecursiveIteratorIterator(
-                        new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
-                        RecursiveIteratorIterator::SELF_FIRST
-                    ) as $directory => $info
-            ) {
-                if ($info->isFile()) {
-                    $file[] = $directory;
-                }
-            }
-
-            $content = $file;
-        }
-
-        $result  = $archive->create($content);
-        if ($result === false) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error creating the Tar archive');
-        }
-
-        return $this->getArchive();
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return boolean
-     */
-    public function decompress($content)
-    {
-        $archive = $this->getArchive();
-        if (file_exists($content)) {
-            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
-        } elseif (empty($archive) || !file_exists($archive)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Tar Archive not found');
-        }
-
-        $archive = new Archive_Tar($archive, $this->getMode());
-        $target  = $this->getTarget();
-        if (!is_dir($target)) {
-            $target = dirname($target);
-        }
-
-        $result = $archive->extract($target);
-        if ($result === false) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Error while extracting the Tar archive');
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Tar';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Compress/Zip.php b/airtime_mvc/library/Zend/Filter/Compress/Zip.php
deleted file mode 100644
index d77b9ca15..000000000
--- a/airtime_mvc/library/Zend/Filter/Compress/Zip.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Zip.php 20126 2010-01-07 18:10:58Z ralph $
- */
-
-/**
- * @see Zend_Filter_Compress_CompressAbstract
- */
-require_once 'Zend/Filter/Compress/CompressAbstract.php';
-
-/**
- * Compression adapter for zip
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract
-{
-    /**
-     * Compression Options
-     * array(
-     *     'archive'  => Archive to use
-     *     'password' => Password to use
-     *     'target'   => Target to write the files to
-     * )
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'archive' => null,
-        'target'  => null,
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param string|array $options (Optional) Options to set
-     */
-    public function __construct($options = null)
-    {
-        if (!extension_loaded('zip')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the zip extension');
-        }
-        parent::__construct($options);
-    }
-
-    /**
-     * Returns the set archive
-     *
-     * @return string
-     */
-    public function getArchive()
-    {
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Sets the archive to use for de-/compression
-     *
-     * @param string $archive Archive to use
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setArchive($archive)
-    {
-        $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $archive);
-        $this->_options['archive'] = (string) $archive;
-
-        return $this;
-    }
-
-    /**
-     * Returns the set targetpath
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_options['target'];
-    }
-
-    /**
-     * Sets the target to use
-     *
-     * @param string $target
-     * @return Zend_Filter_Compress_Rar
-     */
-    public function setTarget($target)
-    {
-        if (!file_exists(dirname($target))) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The directory '$target' does not exist");
-        }
-
-        $target = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $target);
-        $this->_options['target'] = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Compresses the given content
-     *
-     * @param  string $content
-     * @return string Compressed archive
-     */
-    public function compress($content)
-    {
-        $zip = new ZipArchive();
-        $res = $zip->open($this->getArchive(), ZipArchive::CREATE | ZipArchive::OVERWRITE);
-
-        if ($res !== true) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception($this->_errorString($res));
-        }
-
-        if (file_exists($content)) {
-            $content  = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
-            $basename = substr($content, strrpos($content, DIRECTORY_SEPARATOR) + 1);
-            if (is_dir($content)) {
-                $index    = strrpos($content, DIRECTORY_SEPARATOR) + 1;
-                $content .= DIRECTORY_SEPARATOR;
-                $stack    = array($content);
-                while (!empty($stack)) {
-                    $current = array_pop($stack);
-                    $files   = array();
-
-                    $dir = dir($current);
-                    while (false !== ($node = $dir->read())) {
-                        if (($node == '.') || ($node == '..')) {
-                            continue;
-                        }
-
-                        if (is_dir($current . $node)) {
-                            array_push($stack, $current . $node . DIRECTORY_SEPARATOR);
-                        }
-
-                        if (is_file($current . $node)) {
-                            $files[] = $node;
-                        }
-                    }
-
-                    $local = substr($current, $index);
-                    $zip->addEmptyDir(substr($local, 0, -1));
-
-                    foreach ($files as $file) {
-                        $zip->addFile($current . $file, $local . $file);
-                        if ($res !== true) {
-                            require_once 'Zend/Filter/Exception.php';
-                            throw new Zend_Filter_Exception($this->_errorString($res));
-                        }
-                    }
-                }
-            } else {
-                $res = $zip->addFile($content, $basename);
-                if ($res !== true) {
-                    require_once 'Zend/Filter/Exception.php';
-                    throw new Zend_Filter_Exception($this->_errorString($res));
-                }
-            }
-        } else {
-            $file = $this->getTarget();
-            if (!is_dir($file)) {
-                $file = basename($file);
-            } else {
-                $file = "zip.tmp";
-            }
-
-            $res = $zip->addFromString($file, $content);
-            if ($res !== true) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception($this->_errorString($res));
-            }
-        }
-
-        $zip->close();
-        return $this->_options['archive'];
-    }
-
-    /**
-     * Decompresses the given content
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function decompress($content)
-    {
-        $archive = $this->getArchive();
-        if (file_exists($content)) {
-            $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
-        } elseif (empty($archive) || !file_exists($archive)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('ZIP Archive not found');
-        }
-
-        $zip = new ZipArchive();
-        $res = $zip->open($archive);
-
-        $target = $this->getTarget();
-
-        if (!empty($target) && !is_dir($target)) {
-            $target = dirname($target);
-        }
-        
-        if (!empty($target)) {
-            $target = rtrim($target, '/\\') . DIRECTORY_SEPARATOR;
-        }
-
-        if (empty($target) || !is_dir($target)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('No target for ZIP decompression set');
-        }
-
-        if ($res !== true) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception($this->_errorString($res));
-        }
-
-        if (version_compare(PHP_VERSION, '5.2.8', '<')) {
-            for ($i = 0; $i < $zip->numFiles; $i++) {
-                $statIndex = $zip->statIndex($i);
-                $currName = $statIndex['name'];
-                if (($currName{0} == '/') ||
-                    (substr($currName, 0, 2) == '..') ||
-                    (substr($currName, 0, 4) == './..')
-                    )
-                {
-                    require_once 'Zend/Filter/Exception.php';
-                    throw new Zend_Filter_Exception('Upward directory traversal was detected inside ' . $archive
-                        . ' please use PHP 5.2.8 or greater to take advantage of path resolution features of '
-                        . 'the zip extension in this decompress() method.'
-                        );
-                }
-            }
-        }    
-        
-        $res = @$zip->extractTo($target);
-        if ($res !== true) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception($this->_errorString($res));
-        }
-
-        $zip->close();
-        return $target;
-    }
-
-    /**
-     * Returns the proper string based on the given error constant
-     *
-     * @param string $error
-     */
-    protected function _errorString($error)
-    {
-        switch($error) {
-            case ZipArchive::ER_MULTIDISK :
-                return 'Multidisk ZIP Archives not supported';
-
-            case ZipArchive::ER_RENAME :
-                return 'Failed to rename the temporary file for ZIP';
-
-            case ZipArchive::ER_CLOSE :
-                return 'Failed to close the ZIP Archive';
-
-            case ZipArchive::ER_SEEK :
-                return 'Failure while seeking the ZIP Archive';
-
-            case ZipArchive::ER_READ :
-                return 'Failure while reading the ZIP Archive';
-
-            case ZipArchive::ER_WRITE :
-                return 'Failure while writing the ZIP Archive';
-
-            case ZipArchive::ER_CRC :
-                return 'CRC failure within the ZIP Archive';
-
-            case ZipArchive::ER_ZIPCLOSED :
-                return 'ZIP Archive already closed';
-
-            case ZipArchive::ER_NOENT :
-                return 'No such file within the ZIP Archive';
-
-            case ZipArchive::ER_EXISTS :
-                return 'ZIP Archive already exists';
-
-            case ZipArchive::ER_OPEN :
-                return 'Can not open ZIP Archive';
-
-            case ZipArchive::ER_TMPOPEN :
-                return 'Failure creating temporary ZIP Archive';
-
-            case ZipArchive::ER_ZLIB :
-                return 'ZLib Problem';
-
-            case ZipArchive::ER_MEMORY :
-                return 'Memory allocation problem while working on a ZIP Archive';
-
-            case ZipArchive::ER_CHANGED :
-                return 'ZIP Entry has been changed';
-
-            case ZipArchive::ER_COMPNOTSUPP :
-                return 'Compression method not supported within ZLib';
-
-            case ZipArchive::ER_EOF :
-                return 'Premature EOF within ZIP Archive';
-
-            case ZipArchive::ER_INVAL :
-                return 'Invalid argument for ZLIB';
-
-            case ZipArchive::ER_NOZIP :
-                return 'Given file is no zip archive';
-
-            case ZipArchive::ER_INTERNAL :
-                return 'Internal error while working on a ZIP Archive';
-
-            case ZipArchive::ER_INCONS :
-                return 'Inconsistent ZIP archive';
-
-            case ZipArchive::ER_REMOVE :
-                return 'Can not remove ZIP Archive';
-
-            case ZipArchive::ER_DELETED :
-                return 'ZIP Entry has been deleted';
-
-            default :
-                return 'Unknown error within ZIP Archive';
-        }
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Zip';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Decompress.php b/airtime_mvc/library/Zend/Filter/Decompress.php
deleted file mode 100644
index e9241599f..000000000
--- a/airtime_mvc/library/Zend/Filter/Decompress.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decompress.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Compress
- */
-require_once 'Zend/Filter/Compress.php';
-
-/**
- * Decompresses a given string
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Decompress extends Zend_Filter_Compress
-{
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Decompresses the content $value with the defined settings
-     *
-     * @param  string $value Content to decompress
-     * @return string The decompressed content
-     */
-    public function filter($value)
-    {
-        return $this->getAdapter()->decompress($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Decrypt.php b/airtime_mvc/library/Zend/Filter/Decrypt.php
deleted file mode 100644
index e16556dd2..000000000
--- a/airtime_mvc/library/Zend/Filter/Decrypt.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decrypt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Encrypt
- */
-require_once 'Zend/Filter/Encrypt.php';
-
-/**
- * Decrypts a given string
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Decrypt extends Zend_Filter_Encrypt
-{
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Decrypts the content $value with the defined settings
-     *
-     * @param  string $value Content to decrypt
-     * @return string The decrypted content
-     */
-    public function filter($value)
-    {
-        return $this->_adapter->decrypt($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Digits.php b/airtime_mvc/library/Zend/Filter/Digits.php
deleted file mode 100644
index 5072f66af..000000000
--- a/airtime_mvc/library/Zend/Filter/Digits.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Digits.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Digits implements Zend_Filter_Interface
-{
-    /**
-     * Is PCRE is compiled with UTF-8 and Unicode support
-     *
-     * @var mixed
-     **/
-    protected static $_unicodeEnabled;
-
-    /**
-     * Class constructor
-     *
-     * Checks if PCRE is compiled with UTF-8 and Unicode support
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        if (null === self::$_unicodeEnabled) {
-            self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
-        }
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, removing all but digit characters
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        if (!self::$_unicodeEnabled) {
-            // POSIX named classes are not supported, use alternative 0-9 match
-            $pattern = '/[^0-9]/';
-        } else if (extension_loaded('mbstring')) {
-            // Filter for the value with mbstring
-            $pattern = '/[^[:digit:]]/';
-        } else {
-            // Filter for the value without mbstring
-            $pattern = '/[\p{^N}]/';
-        }
-
-        return preg_replace($pattern, '', (string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Dir.php b/airtime_mvc/library/Zend/Filter/Dir.php
deleted file mode 100644
index 108a337b0..000000000
--- a/airtime_mvc/library/Zend/Filter/Dir.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dir.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Dir implements Zend_Filter_Interface
-{
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns dirname($value)
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        return dirname((string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Encrypt.php b/airtime_mvc/library/Zend/Filter/Encrypt.php
deleted file mode 100644
index d35d01db2..000000000
--- a/airtime_mvc/library/Zend/Filter/Encrypt.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Encrypt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
- * Encrypts a given string
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Encrypt implements Zend_Filter_Interface
-{
-    /**
-     * Encryption adapter
-     */
-    protected $_adapter;
-
-    /**
-     * Class constructor
-     *
-     * @param string|array $options (Optional) Options to set, if null mcrypt is used
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        $this->setAdapter($options);
-    }
-
-    /**
-     * Returns the name of the set adapter
-     *
-     * @return string
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter->toString();
-    }
-
-    /**
-     * Sets new encryption options
-     *
-     * @param  string|array $options (Optional) Encryption options
-     * @return Zend_Filter_Encrypt
-     */
-    public function setAdapter($options = null)
-    {
-        if (is_string($options)) {
-            $adapter = $options;
-        } else if (isset($options['adapter'])) {
-            $adapter = $options['adapter'];
-            unset($options['adapter']);
-        } else {
-            $adapter = 'Mcrypt';
-        }
-
-        if (!is_array($options)) {
-            $options = array();
-        }
-
-        if (Zend_Loader::isReadable('Zend/Filter/Encrypt/' . ucfirst($adapter). '.php')) {
-            $adapter = 'Zend_Filter_Encrypt_' . ucfirst($adapter);
-        }
-
-        if (!class_exists($adapter)) {
-            Zend_Loader::loadClass($adapter);
-        }
-
-        $this->_adapter = new $adapter($options);
-        if (!$this->_adapter instanceof Zend_Filter_Encrypt_Interface) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Encoding adapter '" . $adapter . "' does not implement Zend_Filter_Encrypt_Interface");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Calls adapter methods
-     *
-     * @param string       $method  Method to call
-     * @param string|array $options Options for this method
-     */
-    public function __call($method, $options)
-    {
-        $part = substr($method, 0, 3);
-        if ((($part != 'get') and ($part != 'set')) or !method_exists($this->_adapter, $method)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Unknown method '{$method}'");
-        }
-
-        return call_user_func_array(array($this->_adapter, $method), $options);
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Encrypts the content $value with the defined settings
-     *
-     * @param  string $value Content to encrypt
-     * @return string The encrypted content
-     */
-    public function filter($value)
-    {
-        return $this->_adapter->encrypt($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Encrypt/Interface.php b/airtime_mvc/library/Zend/Filter/Encrypt/Interface.php
deleted file mode 100644
index 949d3d6f5..000000000
--- a/airtime_mvc/library/Zend/Filter/Encrypt/Interface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Encryption interface
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Filter_Encrypt_Interface
-{
-    /**
-     * Encrypts $value with the defined settings
-     *
-     * @param  string $value Data to encrypt
-     * @return string The encrypted data
-     */
-    public function encrypt($value);
-
-    /**
-     * Decrypts $value with the defined settings
-     *
-     * @param  string $value Data to decrypt
-     * @return string The decrypted data
-     */
-    public function decrypt($value);
-}
diff --git a/airtime_mvc/library/Zend/Filter/Encrypt/Mcrypt.php b/airtime_mvc/library/Zend/Filter/Encrypt/Mcrypt.php
deleted file mode 100644
index 9a21a92f5..000000000
--- a/airtime_mvc/library/Zend/Filter/Encrypt/Mcrypt.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mcrypt.php 20132 2010-01-07 21:33:50Z ralph $
- */
-
-/**
- * @see Zend_Filter_Encrypt_Interface
- */
-require_once 'Zend/Filter/Encrypt/Interface.php';
-
-/**
- * Encryption adapter for mcrypt
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface
-{
-    /**
-     * Definitions for encryption
-     * array(
-     *     'key' => encryption key string
-     *     'algorithm' => algorithm to use
-     *     'algorithm_directory' => directory where to find the algorithm
-     *     'mode' => encryption mode to use
-     *     'modedirectory' => directory where to find the mode
-     * )
-     */
-    protected $_encryption = array(
-        'key'                 => 'ZendFramework',
-        'algorithm'           => 'blowfish',
-        'algorithm_directory' => '',
-        'mode'                => 'cbc',
-        'mode_directory'      => '',
-        'vector'              => null,
-        'salt'                => false
-    );
-
-    protected static $_srandCalled = false;
-    
-    /**
-     * Class constructor
-     *
-     * @param string|array|Zend_Config $options Cryption Options
-     */
-    public function __construct($options)
-    {
-        if (!extension_loaded('mcrypt')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the mcrypt extension');
-        }
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_string($options)) {
-            $options = array('key' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
-        }
-
-        $this->setEncryption($options);
-    }
-
-    /**
-     * Returns the set encryption options
-     *
-     * @return array
-     */
-    public function getEncryption()
-    {
-        return $this->_encryption;
-    }
-
-    /**
-     * Sets new encryption options
-     *
-     * @param  string|array $options Encryption options
-     * @return Zend_Filter_File_Encryption
-     */
-    public function setEncryption($options)
-    {
-        if (is_string($options)) {
-            $options = array('key' => $options);
-        }
-
-        if (!is_array($options)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
-        }
-
-        $options = $options + $this->getEncryption();
-        $algorithms = mcrypt_list_algorithms($options['algorithm_directory']);
-        if (!in_array($options['algorithm'], $algorithms)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The algorithm '{$options['algorithm']}' is not supported");
-        }
-
-        $modes = mcrypt_list_modes($options['mode_directory']);
-        if (!in_array($options['mode'], $modes)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("The mode '{$options['mode']}' is not supported");
-        }
-
-        if (!mcrypt_module_self_test($options['algorithm'], $options['algorithm_directory'])) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('The given algorithm can not be used due an internal mcrypt problem');
-        }
-
-        if (!isset($options['vector'])) {
-            $options['vector'] = null;
-        }
-
-        $this->_encryption = $options;
-        $this->setVector($options['vector']);
-
-        return $this;
-    }
-
-    /**
-     * Returns the set vector
-     *
-     * @return string
-     */
-    public function getVector()
-    {
-        return $this->_encryption['vector'];
-    }
-
-    /**
-     * Sets the initialization vector
-     *
-     * @param string $vector (Optional) Vector to set
-     * @return Zend_Filter_Encrypt_Mcrypt
-     */
-    public function setVector($vector = null)
-    {
-        $cipher = $this->_openCipher();
-        $size   = mcrypt_enc_get_iv_size($cipher);
-        if (empty($vector)) {
-            $this->_srand();
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && version_compare(PHP_VERSION, '5.3.0', '<')) {
-                $method = MCRYPT_RAND;
-            } else {
-                if (file_exists('/dev/urandom') || (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')) {
-                    $method = MCRYPT_DEV_URANDOM;
-                } elseif (file_exists('/dev/random')) {
-                    $method = MCRYPT_DEV_RANDOM;
-                } else {
-                    $method = MCRYPT_RAND;
-                }
-            }
-            $vector = mcrypt_create_iv($size, $method);
-        } else if (strlen($vector) != $size) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('The given vector has a wrong size for the set algorithm');
-        }
-
-        $this->_encryption['vector'] = $vector;
-        $this->_closeCipher($cipher);
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Encrypts the file $value with the defined settings
-     *
-     * @param  string $value Full path of file to change
-     * @return string The filename which has been set, or false when there were errors
-     */
-    public function encrypt($value)
-    {
-        $cipher  = $this->_openCipher();
-        $this->_initCipher($cipher);
-        $encrypted = mcrypt_generic($cipher, $value);
-        mcrypt_generic_deinit($cipher);
-        $this->_closeCipher($cipher);
-
-        return $encrypted;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Decrypts the file $value with the defined settings
-     *
-     * @param  string $value Full path of file to change
-     * @return string The filename which has been set, or false when there were errors
-     */
-    public function decrypt($value)
-    {
-        $cipher = $this->_openCipher();
-        $this->_initCipher($cipher);
-        $decrypted = mdecrypt_generic($cipher, $value);
-        mcrypt_generic_deinit($cipher);
-        $this->_closeCipher($cipher);
-
-        return $decrypted;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Mcrypt';
-    }
-
-    /**
-     * Open a cipher
-     *
-     * @throws Zend_Filter_Exception When the cipher can not be opened
-     * @return resource Returns the opened cipher
-     */
-    protected function _openCipher()
-    {
-        $cipher = mcrypt_module_open(
-            $this->_encryption['algorithm'],
-            $this->_encryption['algorithm_directory'],
-            $this->_encryption['mode'],
-            $this->_encryption['mode_directory']);
-
-        if ($cipher === false) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Mcrypt can not be opened with your settings');
-        }
-
-        return $cipher;
-    }
-
-    /**
-     * Close a cipher
-     *
-     * @param  resource $cipher Cipher to close
-     * @return Zend_Filter_Encrypt_Mcrypt
-     */
-    protected function _closeCipher($cipher)
-    {
-        mcrypt_module_close($cipher);
-
-        return $this;
-    }
-
-    /**
-     * Initialises the cipher with the set key
-     *
-     * @param  resource $cipher
-     * @throws
-     * @return resource
-     */
-    protected function _initCipher($cipher)
-    {
-        $key = $this->_encryption['key'];
-
-        $keysizes = mcrypt_enc_get_supported_key_sizes($cipher);
-        if (empty($keysizes) || ($this->_encryption['salt'] == true)) {
-            $this->_srand();
-            $keysize = mcrypt_enc_get_key_size($cipher);
-            $key     = substr(md5($key), 0, $keysize);
-        } else if (!in_array(strlen($key), $keysizes)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('The given key has a wrong size for the set algorithm');
-        }
-
-        $result = mcrypt_generic_init($cipher, $key, $this->_encryption['vector']);
-        if ($result < 0) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Mcrypt could not be initialize with the given setting');
-        }
-
-        return $this;
-    }
-    
-    /**
-     * _srand() interception
-     * 
-     * @see ZF-8742
-     */
-    protected function _srand()
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-            return;
-        }
-        
-        if (!self::$_srandCalled) {
-            srand((double) microtime() * 1000000);
-            self::$_srandCalled = true;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Encrypt/Openssl.php b/airtime_mvc/library/Zend/Filter/Encrypt/Openssl.php
deleted file mode 100644
index a572373e0..000000000
--- a/airtime_mvc/library/Zend/Filter/Encrypt/Openssl.php
+++ /dev/null
@@ -1,353 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Openssl.php 20288 2010-01-14 20:15:43Z thomas $
- */
-
-/**
- * @see Zend_Filter_Encrypt_Interface
- */
-require_once 'Zend/Filter/Encrypt/Interface.php';
-
-/**
- * Encryption adapter for openssl
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface
-{
-    /**
-     * Definitions for encryption
-     * array(
-     *     'public'   => public keys
-     *     'private'  => private keys
-     *     'envelope' => resulting envelope keys
-     * )
-     */
-    protected $_keys = array(
-        'public'   => array(),
-        'private'  => array(),
-        'envelope' => array()
-    );
-
-    /**
-     * Internal passphrase
-     *
-     * @var string
-     */
-    protected $_passphrase;
-
-    /**
-     * Class constructor
-     * Available options
-     *   'public'     => public key
-     *   'private'    => private key
-     *   'envelope'   => envelope key
-     *   'passphrase' => passphrase
-     *
-     * @param string|array $options Options for this adapter
-     */
-    public function __construct($options = array())
-    {
-        if (!extension_loaded('openssl')) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('This filter needs the openssl extension');
-        }
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (!is_array($options)) {
-            $options = array('public' => $options);
-        }
-
-        if (array_key_exists('passphrase', $options)) {
-            $this->setPassphrase($options['passphrase']);
-            unset($options['passphrase']);
-        }
-
-        $this->_setKeys($options);
-    }
-
-    /**
-     * Sets the encryption keys
-     *
-     * @param  string|array $keys Key with type association
-     * @return Zend_Filter_Encrypt_Openssl
-     */
-    protected function _setKeys($keys)
-    {
-        if (!is_array($keys)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
-        }
-
-        foreach ($keys as $type => $key) {
-            if (is_file($key) and is_readable($key)) {
-                $file = fopen($key, 'r');
-                $cert = fread($file, 8192);
-                fclose($file);
-            } else {
-                $cert = $key;
-                $key  = count($this->_keys[$type]);
-            }
-
-            switch ($type) {
-                case 'public':
-                    $test = openssl_pkey_get_public($cert);
-                    if ($test === false) {
-                        require_once 'Zend/Filter/Exception.php';
-                        throw new Zend_Filter_Exception("Public key '{$cert}' not valid");
-                    }
-
-                    openssl_free_key($test);
-                    $this->_keys['public'][$key] = $cert;
-                    break;
-                case 'private':
-                    $test = openssl_pkey_get_private($cert, $this->_passphrase);
-                    if ($test === false) {
-                        require_once 'Zend/Filter/Exception.php';
-                        throw new Zend_Filter_Exception("Private key '{$cert}' not valid");
-                    }
-
-                    openssl_free_key($test);
-                    $this->_keys['private'][$key] = $cert;
-                    break;
-                case 'envelope':
-                    $this->_keys['envelope'][$key] = $cert;
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns all public keys
-     *
-     * @return array
-     */
-    public function getPublicKey()
-    {
-        return $this->_keys['public'];
-    }
-
-    /**
-     * Sets public keys
-     *
-     * @param  string|array $key Public keys
-     * @return Zend_Filter_Encrypt_Openssl
-     */
-    public function setPublicKey($key)
-    {
-        if (is_array($key)) {
-            foreach($key as $type => $option) {
-                if ($type !== 'public') {
-                    $key['public'] = $option;
-                    unset($key[$type]);
-                }
-            }
-        } else {
-            $key = array('public' => $key);
-        }
-
-        return $this->_setKeys($key);
-    }
-
-    /**
-     * Returns all private keys
-     *
-     * @return array
-     */
-    public function getPrivateKey()
-    {
-        return $this->_keys['private'];
-    }
-
-    /**
-     * Sets private keys
-     *
-     * @param  string $key Private key
-     * @param  string $passphrase
-     * @return Zend_Filter_Encrypt_Openssl
-     */
-    public function setPrivateKey($key, $passphrase = null)
-    {
-        if (is_array($key)) {
-            foreach($key as $type => $option) {
-                if ($type !== 'private') {
-                    $key['private'] = $option;
-                    unset($key[$type]);
-                }
-            }
-        } else {
-            $key = array('private' => $key);
-        }
-
-        if ($passphrase !== null) {
-            $this->setPassphrase($passphrase);
-        }
-
-        return $this->_setKeys($key);
-    }
-
-    /**
-     * Returns all envelope keys
-     *
-     * @return array
-     */
-    public function getEnvelopeKey()
-    {
-        return $this->_keys['envelope'];
-    }
-
-    /**
-     * Sets envelope keys
-     *
-     * @param  string|array $options Envelope keys
-     * @return Zend_Filter_Encrypt_Openssl
-     */
-    public function setEnvelopeKey($key)
-    {
-        if (is_array($key)) {
-            foreach($key as $type => $option) {
-                if ($type !== 'envelope') {
-                    $key['envelope'] = $option;
-                    unset($key[$type]);
-                }
-            }
-        } else {
-            $key = array('envelope' => $key);
-        }
-
-        return $this->_setKeys($key);
-    }
-
-    /**
-     * Returns the passphrase
-     *
-     * @return string
-     */
-    public function getPassphrase()
-    {
-        return $this->_passphrase;
-    }
-
-    /**
-     * Sets a new passphrase
-     *
-     * @param string $passphrase
-     * @return Zend_Filter_Encrypt_Openssl
-     */
-    public function setPassphrase($passphrase)
-    {
-        $this->_passphrase = $passphrase;
-        return $this;
-    }
-
-    /**
-     * Encrypts the file $value with the defined settings
-     * Note that you also need the "encrypted" keys to be able to decrypt
-     *
-     * @param  string $value Content to encrypt
-     * @return string The encrypted content
-     * @throws Zend_Filter_Exception
-     */
-    public function encrypt($value)
-    {
-        $encrypted     = array();
-        $encryptedkeys = array();
-
-        if (count($this->_keys['public']) == 0) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Openssl can not encrypt without public keys');
-        }
-
-        foreach($this->_keys['public'] as $key => $cert) {
-            $keys[$key] = openssl_pkey_get_public($cert);
-        }
-
-        $crypt  = openssl_seal($value, $encrypted, $encryptedkeys, $keys);
-        foreach ($keys as $key) {
-            openssl_free_key($key);
-        }
-
-        if ($crypt === false) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Openssl was not able to encrypt you content with the given options');
-        }
-
-        $this->_keys['envelope'] = $encryptedkeys;
-        return $encrypted;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Decrypts the file $value with the defined settings
-     *
-     * @param  string $value Content to decrypt
-     * @return string The decrypted content
-     * @throws Zend_Filter_Exception
-     */
-    public function decrypt($value)
-    {
-        $decrypted = "";
-        $envelope  = current($this->getEnvelopeKey());
-
-        if (count($this->_keys['private']) !== 1) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Openssl can only decrypt with one private key');
-        }
-
-        if (empty($envelope)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Openssl can only decrypt with one envelope key');
-        }
-
-        foreach($this->_keys['private'] as $key => $cert) {
-            $keys = openssl_pkey_get_private($cert, $this->getPassphrase());
-        }
-
-        $crypt  = openssl_open($value, $decrypted, $envelope, $keys);
-        openssl_free_key($keys);
-
-        if ($crypt === false) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Openssl was not able to decrypt you content with the given options');
-        }
-
-        return $decrypted;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'Openssl';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Exception.php b/airtime_mvc/library/Zend/Filter/Exception.php
deleted file mode 100644
index d8391862c..000000000
--- a/airtime_mvc/library/Zend/Filter/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Filter/File/Decrypt.php b/airtime_mvc/library/Zend/Filter/File/Decrypt.php
deleted file mode 100644
index ce3678466..000000000
--- a/airtime_mvc/library/Zend/Filter/File/Decrypt.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decrypt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Decrypt
- */
-require_once 'Zend/Filter/Decrypt.php';
-
-/**
- * Decrypts a given file and stores the decrypted file content
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt
-{
-    /**
-     * New filename to set
-     *
-     * @var string
-     */
-    protected $_filename;
-
-    /**
-     * Returns the new filename where the content will be stored
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
-
-    /**
-     * Sets the new filename where the content will be stored
-     *
-     * @param  string $filename (Optional) New filename to set
-     * @return Zend_Filter_File_Encryt
-     */
-    public function setFilename($filename = null)
-    {
-        $this->_filename = $filename;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Decrypts the file $value with the defined settings
-     *
-     * @param  string $value Full path of file to change
-     * @return string The filename which has been set, or false when there were errors
-     */
-    public function filter($value)
-    {
-        if (!file_exists($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' not found");
-        }
-
-        if (!isset($this->_filename)) {
-            $this->_filename = $value;
-        }
-
-        if (file_exists($this->_filename) and !is_writable($this->_filename)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable");
-        }
-
-        $content = file_get_contents($value);
-        if (!$content) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while reading file '$value'");
-        }
-
-        $decrypted = parent::filter($content);
-        $result    = file_put_contents($this->_filename, $decrypted);
-
-        if (!$result) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'");
-        }
-
-        return $this->_filename;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/File/Encrypt.php b/airtime_mvc/library/Zend/Filter/File/Encrypt.php
deleted file mode 100644
index 7a14a3193..000000000
--- a/airtime_mvc/library/Zend/Filter/File/Encrypt.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Encrypt.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Encrypt
- */
-require_once 'Zend/Filter/Encrypt.php';
-
-/**
- * Encrypts a given file and stores the encrypted file content
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt
-{
-    /**
-     * New filename to set
-     *
-     * @var string
-     */
-    protected $_filename;
-
-    /**
-     * Returns the new filename where the content will be stored
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
-
-    /**
-     * Sets the new filename where the content will be stored
-     *
-     * @param  string $filename (Optional) New filename to set
-     * @return Zend_Filter_File_Encryt
-     */
-    public function setFilename($filename = null)
-    {
-        $this->_filename = $filename;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Encrypts the file $value with the defined settings
-     *
-     * @param  string $value Full path of file to change
-     * @return string The filename which has been set, or false when there were errors
-     */
-    public function filter($value)
-    {
-        if (!file_exists($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' not found");
-        }
-
-        if (!isset($this->_filename)) {
-            $this->_filename = $value;
-        }
-
-        if (file_exists($this->_filename) and !is_writable($this->_filename)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable");
-        }
-
-        $content = file_get_contents($value);
-        if (!$content) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while reading file '$value'");
-        }
-
-        $encrypted = parent::filter($content);
-        $result    = file_put_contents($this->_filename, $encrypted);
-
-        if (!$result) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'");
-        }
-
-        return $this->_filename;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/File/LowerCase.php b/airtime_mvc/library/Zend/Filter/File/LowerCase.php
deleted file mode 100644
index d936d8096..000000000
--- a/airtime_mvc/library/Zend/Filter/File/LowerCase.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LowerCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_StringToLower
- */
-require_once 'Zend/Filter/StringToLower.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_File_LowerCase extends Zend_Filter_StringToLower
-{
-    /**
-     * Adds options to the filter at initiation
-     *
-     * @param string $options
-     */
-    public function __construct($options = null)
-    {
-        if (!empty($options)) {
-            $this->setEncoding($options);
-        }
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Does a lowercase on the content of the given file
-     *
-     * @param  string $value Full path of file to change
-     * @return string The given $value
-     * @throws Zend_Filter_Exception
-     */
-    public function filter($value)
-    {
-        if (!file_exists($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' not found");
-        }
-
-        if (!is_writable($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' is not writable");
-        }
-
-        $content = file_get_contents($value);
-        if (!$content) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while reading file '$value'");
-        }
-
-        $content = parent::filter($content);
-        $result  = file_put_contents($value, $content);
-
-        if (!$result) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while writing file '$value'");
-        }
-
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/File/Rename.php b/airtime_mvc/library/Zend/Filter/File/Rename.php
deleted file mode 100644
index b3ee91a77..000000000
--- a/airtime_mvc/library/Zend/Filter/File/Rename.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rename.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_File_Rename implements Zend_Filter_Interface
-{
-    /**
-     * Internal array of array(source, target, overwrite)
-     */
-    protected $_files = array();
-
-    /**
-     * Class constructor
-     *
-     * Options argument may be either a string, a Zend_Config object, or an array.
-     * If an array or Zend_Config object, it accepts the following keys:
-     * 'source'    => Source filename or directory which will be renamed
-     * 'target'    => Target filename or directory, the new name of the sourcefile
-     * 'overwrite' => Shall existing files be overwritten ?
-     *
-     * @param  string|array $options Target file or directory to be renamed
-     * @param  string $target Source filename or directory (deprecated)
-     * @param  bool $overwrite Should existing files be overwritten (deprecated)
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_string($options)) {
-            $options = array('target' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Invalid options argument provided to filter');
-        }
-
-        if (1 < func_num_args()) {
-            $argv = func_get_args();
-            array_shift($argv);
-            $source    = array_shift($argv);
-            $overwrite = false;
-            if (!empty($argv)) {
-                $overwrite = array_shift($argv);
-            }
-            $options['source']    = $source;
-            $options['overwrite'] = $overwrite;
-        }
-
-        $this->setFile($options);
-    }
-
-    /**
-     * Returns the files to rename and their new name and location
-     *
-     * @return array
-     */
-    public function getFile()
-    {
-        return $this->_files;
-    }
-
-    /**
-     * Sets a new file or directory as target, deleting existing ones
-     *
-     * Array accepts the following keys:
-     * 'source'    => Source filename or directory which will be renamed
-     * 'target'    => Target filename or directory, the new name of the sourcefile
-     * 'overwrite' => Shall existing files be overwritten ?
-     *
-     * @param  string|array $options Old file or directory to be rewritten
-     * @return Zend_Filter_File_Rename
-     */
-    public function setFile($options)
-    {
-        $this->_files = array();
-        $this->addFile($options);
-
-        return $this;
-    }
-
-    /**
-     * Adds a new file or directory as target to the existing ones
-     *
-     * Array accepts the following keys:
-     * 'source'    => Source filename or directory which will be renamed
-     * 'target'    => Target filename or directory, the new name of the sourcefile
-     * 'overwrite' => Shall existing files be overwritten ?
-     *
-     * @param  string|array $options Old file or directory to be rewritten
-     * @return Zend_Filter_File_Rename
-     */
-    public function addFile($options)
-    {
-        if (is_string($options)) {
-            $options = array('target' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception ('Invalid options to rename filter provided');
-        }
-
-        $this->_convertOptions($options);
-
-        return $this;
-    }
-
-    /**
-     * Returns only the new filename without moving it
-     * But existing files will be erased when the overwrite option is true
-     *
-     * @param  string  $value  Full path of file to change
-     * @param  boolean $source Return internal informations
-     * @return string The new filename which has been set
-     */
-    public function getNewName($value, $source = false)
-    {
-        $file = $this->_getFileName($value);
-        if ($file['source'] == $file['target']) {
-            return $value;
-        }
-
-        if (!file_exists($file['source'])) {
-            return $value;
-        }
-
-        if (($file['overwrite'] == true) && (file_exists($file['target']))) {
-            unlink($file['target']);
-        }
-
-        if (file_exists($file['target'])) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. It already exists.", $value));
-        }
-
-        if ($source) {
-            return $file;
-        }
-
-        return $file['target'];
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Renames the file $value to the new name set before
-     * Returns the file $value, removing all but digit characters
-     *
-     * @param  string $value Full path of file to change
-     * @throws Zend_Filter_Exception
-     * @return string The new filename which has been set, or false when there were errors
-     */
-    public function filter($value)
-    {
-        $file   = $this->getNewName($value, true);
-        if (is_string($file)) {
-            return $file;
-        }
-
-        $result = rename($file['source'], $file['target']);
-
-        if ($result === true) {
-            return $file['target'];
-        }
-
-        require_once 'Zend/Filter/Exception.php';
-        throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. An error occured while processing the file.", $value));
-    }
-
-    /**
-     * Internal method for creating the file array
-     * Supports single and nested arrays
-     *
-     * @param  array $options
-     * @return array
-     */
-    protected function _convertOptions($options) {
-        $files = array();
-        foreach ($options as $key => $value) {
-            if (is_array($value)) {
-                $this->_convertOptions($value);
-                continue;
-            }
-
-            switch ($key) {
-                case "source":
-                    $files['source'] = (string) $value;
-                    break;
-
-                case 'target' :
-                    $files['target'] = (string) $value;
-                    break;
-
-                case 'overwrite' :
-                    $files['overwrite'] = (boolean) $value;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        if (empty($files)) {
-            return $this;
-        }
-
-        if (empty($files['source'])) {
-            $files['source'] = '*';
-        }
-
-        if (empty($files['target'])) {
-            $files['target'] = '*';
-        }
-
-        if (empty($files['overwrite'])) {
-            $files['overwrite'] = false;
-        }
-
-        $found = false;
-        foreach ($this->_files as $key => $value) {
-            if ($value['source'] == $files['source']) {
-                $this->_files[$key] = $files;
-                $found              = true;
-            }
-        }
-
-        if (!$found) {
-            $count                = count($this->_files);
-            $this->_files[$count] = $files;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Internal method to resolve the requested source
-     * and return all other related parameters
-     *
-     * @param  string $file Filename to get the informations for
-     * @return array
-     */
-    protected function _getFileName($file)
-    {
-        $rename = array();
-        foreach ($this->_files as $value) {
-            if ($value['source'] == '*') {
-                if (!isset($rename['source'])) {
-                    $rename           = $value;
-                    $rename['source'] = $file;
-                }
-            }
-
-            if ($value['source'] == $file) {
-                $rename = $value;
-            }
-        }
-
-        if (!isset($rename['source'])) {
-            return $file;
-        }
-
-        if (!isset($rename['target']) or ($rename['target'] == '*')) {
-            $rename['target'] = $rename['source'];
-        }
-
-        if (is_dir($rename['target'])) {
-            $name = basename($rename['source']);
-            $last = $rename['target'][strlen($rename['target']) - 1];
-            if (($last != '/') and ($last != '\\')) {
-                $rename['target'] .= DIRECTORY_SEPARATOR;
-            }
-
-            $rename['target'] .= $name;
-        }
-
-        return $rename;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/File/UpperCase.php b/airtime_mvc/library/Zend/Filter/File/UpperCase.php
deleted file mode 100644
index 31dbe8c26..000000000
--- a/airtime_mvc/library/Zend/Filter/File/UpperCase.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpperCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_StringToUpper
- */
-require_once 'Zend/Filter/StringToUpper.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_File_UpperCase extends Zend_Filter_StringToUpper
-{
-    /**
-     * Adds options to the filter at initiation
-     *
-     * @param string $options
-     */
-    public function __construct($options = null)
-    {
-        if (!empty($options)) {
-            $this->setEncoding($options);
-        }
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Does a lowercase on the content of the given file
-     *
-     * @param  string $value Full path of file to change
-     * @return string The given $value
-     * @throws Zend_Filter_Exception
-     */
-    public function filter($value)
-    {
-        if (!file_exists($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' not found");
-        }
-
-        if (!is_writable($value)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("File '$value' is not writable");
-        }
-
-        $content = file_get_contents($value);
-        if (!$content) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while reading file '$value'");
-        }
-
-        $content = parent::filter($content);
-        $result  = file_put_contents($value, $content);
-
-        if (!$result) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Problem while writing file '$value'");
-        }
-
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/HtmlEntities.php b/airtime_mvc/library/Zend/Filter/HtmlEntities.php
deleted file mode 100644
index d5d1e409b..000000000
--- a/airtime_mvc/library/Zend/Filter/HtmlEntities.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlEntities.php 21061 2010-02-15 21:56:54Z thomas $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_HtmlEntities implements Zend_Filter_Interface
-{
-    /**
-     * Corresponds to the second htmlentities() argument
-     *
-     * @var integer
-     */
-    protected $_quoteStyle;
-
-    /**
-     * Corresponds to the third htmlentities() argument
-     *
-     * @var string
-     */
-    protected $_encoding;
-
-    /**
-     * Corresponds to the forth htmlentities() argument
-     *
-     * @var unknown_type
-     */
-    protected $_doubleQuote;
-
-    /**
-     * Sets filter options
-     *
-     * @param  integer|array $quoteStyle
-     * @param  string  $charSet
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['quotestyle'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['charset'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!isset($options['quotestyle'])) {
-            $options['quotestyle'] = ENT_COMPAT;
-        }
-
-        if (!isset($options['encoding'])) {
-            $options['encoding'] = 'UTF-8';
-        }
-        if (isset($options['charset'])) {
-            $options['encoding'] = $options['charset'];
-        }
-
-        if (!isset($options['doublequote'])) {
-            $options['doublequote'] = true;
-        }
-
-        $this->setQuoteStyle($options['quotestyle']);
-        $this->setEncoding($options['encoding']);
-        $this->setDoubleQuote($options['doublequote']);
-    }
-
-    /**
-     * Returns the quoteStyle option
-     *
-     * @return integer
-     */
-    public function getQuoteStyle()
-    {
-        return $this->_quoteStyle;
-    }
-
-    /**
-     * Sets the quoteStyle option
-     *
-     * @param  integer $quoteStyle
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
-     */
-    public function setQuoteStyle($quoteStyle)
-    {
-        $this->_quoteStyle = $quoteStyle;
-        return $this;
-    }
-
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-         return $this->_encoding;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $value
-     * @return Zend_Filter_HtmlEntities
-     */
-    public function setEncoding($value)
-    {
-        $this->_encoding = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Returns the charSet option
-     *
-     * Proxies to {@link getEncoding()}
-     *
-     * @return string
-     */
-    public function getCharSet()
-    {
-        return $this->getEncoding();
-    }
-
-    /**
-     * Sets the charSet option
-     *
-     * Proxies to {@link setEncoding()}
-     *
-     * @param  string $charSet
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
-     */
-    public function setCharSet($charSet)
-    {
-        return $this->setEncoding($charSet);
-    }
-
-    /**
-     * Returns the doubleQuote option
-     *
-     * @return boolean
-     */
-    public function getDoubleQuote()
-    {
-        return $this->_doubleQuote;
-    }
-
-    /**
-     * Sets the doubleQuote option
-     *
-     * @param boolean $doubleQuote
-     * @return Zend_Filter_HtmlEntities Provides a fluent interface
-     */
-    public function setDoubleQuote($doubleQuote)
-    {
-        $this->_doubleQuote = (boolean) $doubleQuote;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, converting characters to their corresponding HTML entity
-     * equivalents where they exist
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        return htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Inflector.php b/airtime_mvc/library/Zend/Filter/Inflector.php
deleted file mode 100644
index f79bacc79..000000000
--- a/airtime_mvc/library/Zend/Filter/Inflector.php
+++ /dev/null
@@ -1,527 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Inflector.php 21372 2010-03-07 19:58:08Z thomas $
- */
-
-/**
- * @see Zend_Filter
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter.php';
-
-/**
- * @see Zend_Loader_PluginLoader
- */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/**
- * Filter chain for string inflection
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Inflector implements Zend_Filter_Interface
-{
-    /**
-     * @var Zend_Loader_PluginLoader_Interface
-     */
-    protected $_pluginLoader = null;
-
-    /**
-     * @var string
-     */
-    protected $_target = null;
-
-    /**
-     * @var bool
-     */
-    protected $_throwTargetExceptionsOn = true;
-
-    /**
-     * @var string
-     */
-    protected $_targetReplacementIdentifier = ':';
-
-    /**
-     * @var array
-     */
-    protected $_rules = array();
-
-    /**
-     * Constructor
-     *
-     * @param string|array $options Options to set
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-
-            if (!empty($options)) {
-                $temp['target'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['rules'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['throwTargetExceptionsOn'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['targetReplacementIdentifier'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        $this->setOptions($options);
-    }
-
-    /**
-     * Retreive PluginLoader
-     *
-     * @return Zend_Loader_PluginLoader_Interface
-     */
-    public function getPluginLoader()
-    {
-        if (!$this->_pluginLoader instanceof Zend_Loader_PluginLoader_Interface) {
-            $this->_pluginLoader = new Zend_Loader_PluginLoader(array('Zend_Filter_' => 'Zend/Filter/'), __CLASS__);
-        }
-
-        return $this->_pluginLoader;
-    }
-
-    /**
-     * Set PluginLoader
-     *
-     * @param Zend_Loader_PluginLoader_Interface $pluginLoader
-     * @return Zend_Filter_Inflector
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $pluginLoader)
-    {
-        $this->_pluginLoader = $pluginLoader;
-        return $this;
-    }
-
-    /**
-     * Use Zend_Config object to set object state
-     *
-     * @deprecated Use setOptions() instead
-     * @param  Zend_Config $config
-     * @return Zend_Filter_Inflector
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config);
-    }
-
-    /**
-     * Set options
-     *
-     * @param  array $options
-     * @return Zend_Filter_Inflector
-     */
-    public function setOptions($options) {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        // Set Präfix Path
-        if (array_key_exists('filterPrefixPath', $options)) {
-            if (!is_scalar($options['filterPrefixPath'])) {
-                foreach ($options['filterPrefixPath'] as $prefix => $path) {
-                    $this->addFilterPrefixPath($prefix, $path);
-                }
-            }
-        }
-
-        if (array_key_exists('throwTargetExceptionsOn', $options)) {
-            $this->setThrowTargetExceptionsOn($options['throwTargetExceptionsOn']);
-        }
-
-        if (array_key_exists('targetReplacementIdentifier', $options)) {
-            $this->setTargetReplacementIdentifier($options['targetReplacementIdentifier']);
-        }
-
-        if (array_key_exists('target', $options)) {
-            $this->setTarget($options['target']);
-        }
-
-        if (array_key_exists('rules', $options)) {
-            $this->addRules($options['rules']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Convienence method to add prefix and path to PluginLoader
-     *
-     * @param string $prefix
-     * @param string $path
-     * @return Zend_Filter_Inflector
-     */
-    public function addFilterPrefixPath($prefix, $path)
-    {
-        $this->getPluginLoader()->addPrefixPath($prefix, $path);
-        return $this;
-    }
-
-    /**
-     * Set Whether or not the inflector should throw an exception when a replacement
-     * identifier is still found within an inflected target.
-     *
-     * @param bool $throwTargetExceptions
-     * @return Zend_Filter_Inflector
-     */
-    public function setThrowTargetExceptionsOn($throwTargetExceptionsOn)
-    {
-        $this->_throwTargetExceptionsOn = ($throwTargetExceptionsOn == true) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Will exceptions be thrown?
-     *
-     * @return bool
-     */
-    public function isThrowTargetExceptionsOn()
-    {
-        return $this->_throwTargetExceptionsOn;
-    }
-
-    /**
-     * Set the Target Replacement Identifier, by default ':'
-     *
-     * @param string $targetReplacementIdentifier
-     * @return Zend_Filter_Inflector
-     */
-    public function setTargetReplacementIdentifier($targetReplacementIdentifier)
-    {
-        if ($targetReplacementIdentifier) {
-            $this->_targetReplacementIdentifier = (string) $targetReplacementIdentifier;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get Target Replacement Identifier
-     *
-     * @return string
-     */
-    public function getTargetReplacementIdentifier()
-    {
-        return $this->_targetReplacementIdentifier;
-    }
-
-    /**
-     * Set a Target
-     * ex: 'scripts/:controller/:action.:suffix'
-     *
-     * @param string
-     * @return Zend_Filter_Inflector
-     */
-    public function setTarget($target)
-    {
-        $this->_target = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Retrieve target
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_target;
-    }
-
-    /**
-     * Set Target Reference
-     *
-     * @param reference $target
-     * @return Zend_Filter_Inflector
-     */
-    public function setTargetReference(&$target)
-    {
-        $this->_target =& $target;
-        return $this;
-    }
-
-    /**
-     * SetRules() is the same as calling addRules() with the exception that it
-     * clears the rules before adding them.
-     *
-     * @param array $rules
-     * @return Zend_Filter_Inflector
-     */
-    public function setRules(Array $rules)
-    {
-        $this->clearRules();
-        $this->addRules($rules);
-        return $this;
-    }
-
-    /**
-     * AddRules(): multi-call to setting filter rules.
-     *
-     * If prefixed with a ":" (colon), a filter rule will be added.  If not
-     * prefixed, a static replacement will be added.
-     *
-     * ex:
-     * array(
-     *     ':controller' => array('CamelCaseToUnderscore','StringToLower'),
-     *     ':action'     => array('CamelCaseToUnderscore','StringToLower'),
-     *     'suffix'      => 'phtml'
-     *     );
-     *
-     * @param array
-     * @return Zend_Filter_Inflector
-     */
-    public function addRules(Array $rules)
-    {
-        $keys = array_keys($rules);
-        foreach ($keys as $spec) {
-            if ($spec[0] == ':') {
-                $this->addFilterRule($spec, $rules[$spec]);
-            } else {
-                $this->setStaticRule($spec, $rules[$spec]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get rules
-     *
-     * By default, returns all rules. If a $spec is provided, will return those
-     * rules if found, false otherwise.
-     *
-     * @param  string $spec
-     * @return array|false
-     */
-    public function getRules($spec = null)
-    {
-        if (null !== $spec) {
-            $spec = $this->_normalizeSpec($spec);
-            if (isset($this->_rules[$spec])) {
-                return $this->_rules[$spec];
-            }
-            return false;
-        }
-
-        return $this->_rules;
-    }
-
-    /**
-     * getRule() returns a rule set by setFilterRule(), a numeric index must be provided
-     *
-     * @param string $spec
-     * @param int $index
-     * @return Zend_Filter_Interface|false
-     */
-    public function getRule($spec, $index)
-    {
-        $spec = $this->_normalizeSpec($spec);
-        if (isset($this->_rules[$spec]) && is_array($this->_rules[$spec])) {
-            if (isset($this->_rules[$spec][$index])) {
-                return $this->_rules[$spec][$index];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * ClearRules() clears the rules currently in the inflector
-     *
-     * @return Zend_Filter_Inflector
-     */
-    public function clearRules()
-    {
-        $this->_rules = array();
-        return $this;
-    }
-
-    /**
-     * Set a filtering rule for a spec.  $ruleSet can be a string, Filter object
-     * or an array of strings or filter objects.
-     *
-     * @param string $spec
-     * @param array|string|Zend_Filter_Interface $ruleSet
-     * @return Zend_Filter_Inflector
-     */
-    public function setFilterRule($spec, $ruleSet)
-    {
-        $spec = $this->_normalizeSpec($spec);
-        $this->_rules[$spec] = array();
-        return $this->addFilterRule($spec, $ruleSet);
-    }
-
-    /**
-     * Add a filter rule for a spec
-     *
-     * @param mixed $spec
-     * @param mixed $ruleSet
-     * @return void
-     */
-    public function addFilterRule($spec, $ruleSet)
-    {
-        $spec = $this->_normalizeSpec($spec);
-        if (!isset($this->_rules[$spec])) {
-            $this->_rules[$spec] = array();
-        }
-
-        if (!is_array($ruleSet)) {
-            $ruleSet = array($ruleSet);
-        }
-
-        if (is_string($this->_rules[$spec])) {
-            $temp = $this->_rules[$spec];
-            $this->_rules[$spec] = array();
-            $this->_rules[$spec][] = $temp;
-        }
-
-        foreach ($ruleSet as $rule) {
-            $this->_rules[$spec][] = $this->_getRule($rule);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a static rule for a spec.  This is a single string value
-     *
-     * @param string $name
-     * @param string $value
-     * @return Zend_Filter_Inflector
-     */
-    public function setStaticRule($name, $value)
-    {
-        $name = $this->_normalizeSpec($name);
-        $this->_rules[$name] = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Set Static Rule Reference.
-     *
-     * This allows a consuming class to pass a property or variable
-     * in to be referenced when its time to build the output string from the
-     * target.
-     *
-     * @param string $name
-     * @param mixed $reference
-     * @return Zend_Filter_Inflector
-     */
-    public function setStaticRuleReference($name, &$reference)
-    {
-        $name = $this->_normalizeSpec($name);
-        $this->_rules[$name] =& $reference;
-        return $this;
-    }
-
-    /**
-     * Inflect
-     *
-     * @param  string|array $source
-     * @return string
-     */
-    public function filter($source)
-    {
-        // clean source
-        foreach ( (array) $source as $sourceName => $sourceValue) {
-            $source[ltrim($sourceName, ':')] = $sourceValue;
-        }
-
-        $pregQuotedTargetReplacementIdentifier = preg_quote($this->_targetReplacementIdentifier, '#');
-        $processedParts = array();
-
-        foreach ($this->_rules as $ruleName => $ruleValue) {
-            if (isset($source[$ruleName])) {
-                if (is_string($ruleValue)) {
-                    // overriding the set rule
-                    $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $source[$ruleName]);
-                } elseif (is_array($ruleValue)) {
-                    $processedPart = $source[$ruleName];
-                    foreach ($ruleValue as $ruleFilter) {
-                        $processedPart = $ruleFilter->filter($processedPart);
-                    }
-                    $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $processedPart);
-                }
-            } elseif (is_string($ruleValue)) {
-                $processedParts['#'.$pregQuotedTargetReplacementIdentifier.$ruleName.'#'] = str_replace('\\', '\\\\', $ruleValue);
-            }
-        }
-
-        // all of the values of processedParts would have been str_replace('\\', '\\\\', ..)'d to disable preg_replace backreferences
-        $inflectedTarget = preg_replace(array_keys($processedParts), array_values($processedParts), $this->_target);
-
-        if ($this->_throwTargetExceptionsOn && (preg_match('#(?='.$pregQuotedTargetReplacementIdentifier.'[A-Za-z]{1})#', $inflectedTarget) == true)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('A replacement identifier ' . $this->_targetReplacementIdentifier . ' was found inside the inflected target, perhaps a rule was not satisfied with a target source?  Unsatisfied inflected target: ' . $inflectedTarget);
-        }
-
-        return $inflectedTarget;
-    }
-
-    /**
-     * Normalize spec string
-     *
-     * @param  string $spec
-     * @return string
-     */
-    protected function _normalizeSpec($spec)
-    {
-        return ltrim((string) $spec, ':&');
-    }
-
-    /**
-     * Resolve named filters and convert them to filter objects.
-     *
-     * @param  string $rule
-     * @return Zend_Filter_Interface
-     */
-    protected function _getRule($rule)
-    {
-        if ($rule instanceof Zend_Filter_Interface) {
-            return $rule;
-        }
-
-        $rule = (string) $rule;
-
-        $className  = $this->getPluginLoader()->load($rule);
-        $ruleObject = new $className();
-        if (!$ruleObject instanceof Zend_Filter_Interface) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('No class named ' . $rule . ' implementing Zend_Filter_Interface could be found');
-        }
-
-        return $ruleObject;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Input.php b/airtime_mvc/library/Zend/Filter/Input.php
deleted file mode 100644
index 52daa03cc..000000000
--- a/airtime_mvc/library/Zend/Filter/Input.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Input.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
- * @see Zend_Filter
- */
-require_once 'Zend/Filter.php';
-
-/**
- * @see Zend_Validate
- */
-require_once 'Zend/Validate.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Input
-{
-
-    const ALLOW_EMPTY           = 'allowEmpty';
-    const BREAK_CHAIN           = 'breakChainOnFailure';
-    const DEFAULT_VALUE         = 'default';
-    const MESSAGES              = 'messages';
-    const ESCAPE_FILTER         = 'escapeFilter';
-    const FIELDS                = 'fields';
-    const FILTER                = 'filter';
-    const FILTER_CHAIN          = 'filterChain';
-    const MISSING_MESSAGE       = 'missingMessage';
-    const INPUT_NAMESPACE       = 'inputNamespace';
-    const VALIDATOR_NAMESPACE   = 'validatorNamespace';
-    const FILTER_NAMESPACE      = 'filterNamespace';
-    const NOT_EMPTY_MESSAGE     = 'notEmptyMessage';
-    const PRESENCE              = 'presence';
-    const PRESENCE_OPTIONAL     = 'optional';
-    const PRESENCE_REQUIRED     = 'required';
-    const RULE                  = 'rule';
-    const RULE_WILDCARD         = '*';
-    const VALIDATE              = 'validate';
-    const VALIDATOR             = 'validator';
-    const VALIDATOR_CHAIN       = 'validatorChain';
-    const VALIDATOR_CHAIN_COUNT = 'validatorChainCount';
-
-    /**
-     * @var array Input data, before processing.
-     */
-    protected $_data = array();
-
-    /**
-     * @var array Association of rules to filters.
-     */
-    protected $_filterRules = array();
-
-    /**
-     * @var array Association of rules to validators.
-     */
-    protected $_validatorRules = array();
-
-    /**
-     * @var array After processing data, this contains mapping of valid fields
-     * to field values.
-     */
-    protected $_validFields = array();
-
-    /**
-     * @var array After processing data, this contains mapping of validation
-     * rules that did not pass validation to the array of messages returned
-     * by the validator chain.
-     */
-    protected $_invalidMessages = array();
-
-    /**
-     * @var array After processing data, this contains mapping of validation
-     * rules that did not pass validation to the array of error identifiers
-     * returned by the validator chain.
-     */
-    protected $_invalidErrors = array();
-
-    /**
-     * @var array After processing data, this contains mapping of validation
-     * rules in which some fields were missing to the array of messages
-     * indicating which fields were missing.
-     */
-    protected $_missingFields = array();
-
-    /**
-     * @var array After processing, this contains a copy of $_data elements
-     * that were not mentioned in any validation rule.
-     */
-    protected $_unknownFields = array();
-
-    /**
-     * @var Zend_Filter_Interface The filter object that is run on values
-     * returned by the getEscaped() method.
-     */
-    protected $_defaultEscapeFilter = null;
-
-    /**
-     * Plugin loaders
-     * @var array
-     */
-    protected $_loaders = array();
-
-    /**
-     * @var array Default values to use when processing filters and validators.
-     */
-    protected $_defaults = array(
-        self::ALLOW_EMPTY         => false,
-        self::BREAK_CHAIN         => false,
-        self::ESCAPE_FILTER       => 'HtmlEntities',
-        self::MISSING_MESSAGE     => "Field '%field%' is required by rule '%rule%', but the field is missing",
-        self::NOT_EMPTY_MESSAGE   => "You must give a non-empty value for field '%field%'",
-        self::PRESENCE            => self::PRESENCE_OPTIONAL
-    );
-
-    /**
-     * @var boolean Set to False initially, this is set to True after the
-     * input data have been processed.  Reset to False in setData() method.
-     */
-    protected $_processed = false;
-
-    /**
-     * Translation object
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Is translation disabled?
-     * @var Boolean
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * @param array $filterRules
-     * @param array $validatorRules
-     * @param array $data       OPTIONAL
-     * @param array $options    OPTIONAL
-     */
-    public function __construct($filterRules, $validatorRules, array $data = null, array $options = null)
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-
-        $this->_filterRules = (array) $filterRules;
-        $this->_validatorRules = (array) $validatorRules;
-
-        if ($data) {
-            $this->setData($data);
-        }
-    }
-
-    /**
-     * @param mixed $namespaces
-     * @return Zend_Filter_Input
-     * @deprecated since 1.5.0RC1 - use addFilterPrefixPath() or addValidatorPrefixPath instead.
-     */
-    public function addNamespace($namespaces)
-    {
-        if (!is_array($namespaces)) {
-            $namespaces = array($namespaces);
-        }
-
-        foreach ($namespaces as $namespace) {
-            $prefix = $namespace;
-            $path = str_replace('_', DIRECTORY_SEPARATOR, $prefix);
-            $this->addFilterPrefixPath($prefix, $path);
-            $this->addValidatorPrefixPath($prefix, $path);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add prefix path for all elements
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Filter_Input
-     */
-    public function addFilterPrefixPath($prefix, $path)
-    {
-        $this->getPluginLoader(self::FILTER)->addPrefixPath($prefix, $path);
-
-        return $this;
-    }
-
-    /**
-     * Add prefix path for all elements
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Filter_Input
-     */
-    public function addValidatorPrefixPath($prefix, $path)
-    {
-        $this->getPluginLoader(self::VALIDATE)->addPrefixPath($prefix, $path);
-
-        return $this;
-    }
-
-    /**
-     * Set plugin loaders for use with decorators and elements
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @param  string $type 'filter' or 'validate'
-     * @return Zend_Filter_Input
-     * @throws Zend_Filter_Exception on invalid type
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)
-    {
-        $type = strtolower($type);
-        switch ($type) {
-            case self::FILTER:
-            case self::VALIDATE:
-                $this->_loaders[$type] = $loader;
-                return $this;
-            default:
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve plugin loader for given type
-     *
-     * $type may be one of:
-     * - filter
-     * - validator
-     *
-     * If a plugin loader does not exist for the given type, defaults are
-     * created.
-     *
-     * @param  string $type 'filter' or 'validate'
-     * @return Zend_Loader_PluginLoader_Interface
-     * @throws Zend_Filter_Exception on invalid type
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtolower($type);
-        if (!isset($this->_loaders[$type])) {
-            switch ($type) {
-                case self::FILTER:
-                    $prefixSegment = 'Zend_Filter_';
-                    $pathSegment   = 'Zend/Filter/';
-                    break;
-                case self::VALIDATE:
-                    $prefixSegment = 'Zend_Validate_';
-                    $pathSegment   = 'Zend/Validate/';
-                    break;
-                default:
-                    require_once 'Zend/Filter/Exception.php';
-                    throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-            }
-
-            require_once 'Zend/Loader/PluginLoader.php';
-            $this->_loaders[$type] = new Zend_Loader_PluginLoader(
-                array($prefixSegment => $pathSegment)
-            );
-        }
-
-        return $this->_loaders[$type];
-    }
-
-    /**
-     * @return array
-     */
-    public function getMessages()
-    {
-        $this->_process();
-        return array_merge($this->_invalidMessages, $this->_missingFields);
-    }
-
-    /**
-     * @return array
-     */
-    public function getErrors()
-    {
-        $this->_process();
-        return $this->_invalidErrors;
-    }
-
-    /**
-     * @return array
-     */
-    public function getInvalid()
-    {
-        $this->_process();
-        return $this->_invalidMessages;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMissing()
-    {
-        $this->_process();
-        return $this->_missingFields;
-    }
-
-    /**
-     * @return array
-     */
-    public function getUnknown()
-    {
-        $this->_process();
-        return $this->_unknownFields;
-    }
-
-    /**
-     * @param string $fieldName OPTIONAL
-     * @return mixed
-     */
-    public function getEscaped($fieldName = null)
-    {
-        $this->_process();
-        $this->_getDefaultEscapeFilter();
-
-        if ($fieldName === null) {
-            return $this->_escapeRecursive($this->_validFields);
-        }
-        if (array_key_exists($fieldName, $this->_validFields)) {
-            return $this->_escapeRecursive($this->_validFields[$fieldName]);
-        }
-        return null;
-    }
-
-    /**
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function _escapeRecursive($data)
-    {
-        if($data === null) {
-            return $data;
-        }
-
-        if (!is_array($data)) {
-            return $this->_getDefaultEscapeFilter()->filter($data);
-        }
-        foreach ($data as &$element) {
-            $element = $this->_escapeRecursive($element);
-        }
-        return $data;
-    }
-
-    /**
-     * @param string $fieldName OPTIONAL
-     * @return mixed
-     */
-    public function getUnescaped($fieldName = null)
-    {
-        $this->_process();
-        if ($fieldName === null) {
-            return $this->_validFields;
-        }
-        if (array_key_exists($fieldName, $this->_validFields)) {
-            return $this->_validFields[$fieldName];
-        }
-        return null;
-    }
-
-    /**
-     * @param string $fieldName
-     * @return mixed
-     */
-    public function __get($fieldName)
-    {
-        return $this->getEscaped($fieldName);
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasInvalid()
-    {
-        $this->_process();
-        return !(empty($this->_invalidMessages));
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasMissing()
-    {
-        $this->_process();
-        return !(empty($this->_missingFields));
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasUnknown()
-    {
-        $this->_process();
-        return !(empty($this->_unknownFields));
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasValid()
-    {
-        $this->_process();
-        return !(empty($this->_validFields));
-    }
-
-    /**
-     * @param string $fieldName
-     * @return boolean
-     */
-    public function isValid($fieldName = null)
-    {
-        $this->_process();
-        if ($fieldName === null) {
-            return !($this->hasMissing() || $this->hasInvalid());
-        }
-        return array_key_exists($fieldName, $this->_validFields);
-    }
-
-    /**
-     * @param string $fieldName
-     * @return boolean
-     */
-    public function __isset($fieldName)
-    {
-        $this->_process();
-        return isset($this->_validFields[$fieldName]);
-    }
-
-    /**
-     * @return Zend_Filter_Input
-     * @throws Zend_Filter_Exception
-     */
-    public function process()
-    {
-        $this->_process();
-        if ($this->hasInvalid()) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Input has invalid fields");
-        }
-        if ($this->hasMissing()) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Input has missing fields");
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param array $data
-     * @return Zend_Filter_Input
-     */
-    public function setData(array $data)
-    {
-        $this->_data = $data;
-
-        /**
-         * Reset to initial state
-         */
-        $this->_validFields = array();
-        $this->_invalidMessages = array();
-        $this->_invalidErrors = array();
-        $this->_missingFields = array();
-        $this->_unknownFields = array();
-
-        $this->_processed = false;
-
-        return $this;
-    }
-
-    /**
-     * @param mixed $escapeFilter
-     * @return Zend_Filter_Interface
-     */
-    public function setDefaultEscapeFilter($escapeFilter)
-    {
-        if (is_string($escapeFilter) || is_array($escapeFilter)) {
-            $escapeFilter = $this->_getFilter($escapeFilter);
-        }
-        if (!$escapeFilter instanceof Zend_Filter_Interface) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Escape filter specified does not implement Zend_Filter_Interface');
-        }
-        $this->_defaultEscapeFilter = $escapeFilter;
-        return $escapeFilter;
-    }
-
-    /**
-     * @param array $options
-     * @return Zend_Filter_Input
-     * @throws Zend_Filter_Exception if an unknown option is given
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $option => $value) {
-            switch ($option) {
-                case self::ESCAPE_FILTER:
-                    $this->setDefaultEscapeFilter($value);
-                    break;
-                case self::INPUT_NAMESPACE:
-                    $this->addNamespace($value);
-                    break;
-                case self::VALIDATOR_NAMESPACE:
-                    if(is_string($value)) {
-                        $value = array($value);
-                    }
-
-                    foreach($value AS $prefix) {
-                        $this->addValidatorPrefixPath(
-                                $prefix,
-                                str_replace('_', DIRECTORY_SEPARATOR, $prefix)
-                        );
-                    }
-                    break;
-                case self::FILTER_NAMESPACE:
-                    if(is_string($value)) {
-                        $value = array($value);
-                    }
-
-                    foreach($value AS $prefix) {
-                        $this->addFilterPrefixPath(
-                                $prefix,
-                                str_replace('_', DIRECTORY_SEPARATOR, $prefix)
-                        );
-                    }
-                    break;
-                case self::ALLOW_EMPTY:
-                case self::BREAK_CHAIN:
-                case self::MISSING_MESSAGE:
-                case self::NOT_EMPTY_MESSAGE:
-                case self::PRESENCE:
-                    $this->_defaults[$option] = $value;
-                    break;
-                default:
-                    require_once 'Zend/Filter/Exception.php';
-                    throw new Zend_Filter_Exception("Unknown option '$option'");
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set translation object
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return Zend_Filter_Input
-     */
-    public function setTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid translator specified');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return translation object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        if ($this->_translator === null) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $translator = Zend_Registry::get('Zend_Translate');
-                if ($translator instanceof Zend_Translate_Adapter) {
-                    return $translator;
-                } elseif ($translator instanceof Zend_Translate) {
-                    return $translator->getAdapter();
-                }
-            }
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Filter_Input
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    /*
-     * Protected methods
-     */
-
-    /**
-     * @return void
-     */
-    protected function _filter()
-    {
-        foreach ($this->_filterRules as $ruleName => &$filterRule) {
-            /**
-             * Make sure we have an array representing this filter chain.
-             * Don't typecast to (array) because it might be a Zend_Filter object
-             */
-            if (!is_array($filterRule)) {
-                $filterRule = array($filterRule);
-            }
-
-            /**
-             * Filters are indexed by integer, metacommands are indexed by string.
-             * Pick out the filters.
-             */
-            $filterList = array();
-            foreach ($filterRule as $key => $value) {
-                if (is_int($key)) {
-                    $filterList[] = $value;
-                }
-            }
-
-            /**
-             * Use defaults for filter metacommands.
-             */
-            $filterRule[self::RULE] = $ruleName;
-            if (!isset($filterRule[self::FIELDS])) {
-                $filterRule[self::FIELDS] = $ruleName;
-            }
-
-            /**
-             * Load all the filter classes and add them to the chain.
-             */
-            if (!isset($filterRule[self::FILTER_CHAIN])) {
-                $filterRule[self::FILTER_CHAIN] = new Zend_Filter();
-                foreach ($filterList as $filter) {
-                    if (is_string($filter) || is_array($filter)) {
-                        $filter = $this->_getFilter($filter);
-                    }
-                    $filterRule[self::FILTER_CHAIN]->addFilter($filter);
-                }
-            }
-
-            /**
-             * If the ruleName is the special wildcard rule,
-             * then apply the filter chain to all input data.
-             * Else just process the field named by the rule.
-             */
-            if ($ruleName == self::RULE_WILDCARD) {
-                foreach (array_keys($this->_data) as $field)  {
-                    $this->_filterRule(array_merge($filterRule, array(self::FIELDS => $field)));
-                }
-            } else {
-                $this->_filterRule($filterRule);
-            }
-        }
-    }
-
-    /**
-     * @param array $filterRule
-     * @return void
-     */
-    protected function _filterRule(array $filterRule)
-    {
-        $field = $filterRule[self::FIELDS];
-        if (!array_key_exists($field, $this->_data)) {
-            return;
-        }
-        if (is_array($this->_data[$field])) {
-            foreach ($this->_data[$field] as $key => $value) {
-                $this->_data[$field][$key] = $filterRule[self::FILTER_CHAIN]->filter($value);
-            }
-        } else {
-            $this->_data[$field] =
-                $filterRule[self::FILTER_CHAIN]->filter($this->_data[$field]);
-        }
-    }
-
-    /**
-     * @return Zend_Filter_Interface
-     */
-    protected function _getDefaultEscapeFilter()
-    {
-        if ($this->_defaultEscapeFilter !== null) {
-            return $this->_defaultEscapeFilter;
-        }
-        return $this->setDefaultEscapeFilter($this->_defaults[self::ESCAPE_FILTER]);
-    }
-
-    /**
-     * @param string $rule
-     * @param string $field
-     * @return string
-     */
-    protected function _getMissingMessage($rule, $field)
-    {
-        $message = $this->_defaults[self::MISSING_MESSAGE];
-
-        if (null !== ($translator = $this->getTranslator())) {
-            if ($translator->isTranslated($message)) {
-                $message = $translator->translate($message);
-            } elseif ($translator->isTranslated(self::MISSING_MESSAGE)) {
-                $message = $translator->translate(self::MISSING_MESSAGE);
-            }
-        }
-
-        $message = str_replace('%rule%', $rule, $message);
-        $message = str_replace('%field%', $field, $message);
-        return $message;
-    }
-
-    /**
-     * @return string
-     */
-    protected function _getNotEmptyMessage($rule, $field)
-    {
-        $message = $this->_defaults[self::NOT_EMPTY_MESSAGE];
-
-        if (null !== ($translator = $this->getTranslator())) {
-            if ($translator->isTranslated($message)) {
-                $message = $translator->translate($message);
-            } elseif ($translator->isTranslated(self::NOT_EMPTY_MESSAGE)) {
-                $message = $translator->translate(self::NOT_EMPTY_MESSAGE);
-            }
-        }
-
-        $message = str_replace('%rule%', $rule, $message);
-        $message = str_replace('%field%', $field, $message);
-        return $message;
-    }
-
-    /**
-     * @return void
-     */
-    protected function _process()
-    {
-        if ($this->_processed === false) {
-            $this->_filter();
-            $this->_validate();
-            $this->_processed = true;
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function _validate()
-    {
-        /**
-         * Special case: if there are no validators, treat all fields as valid.
-         */
-        if (!$this->_validatorRules) {
-            $this->_validFields = $this->_data;
-            $this->_data = array();
-            return;
-        }
-
-        foreach ($this->_validatorRules as $ruleName => &$validatorRule) {
-            /**
-             * Make sure we have an array representing this validator chain.
-             * Don't typecast to (array) because it might be a Zend_Validate object
-             */
-            if (!is_array($validatorRule)) {
-                $validatorRule = array($validatorRule);
-            }
-
-            /**
-             * Validators are indexed by integer, metacommands are indexed by string.
-             * Pick out the validators.
-             */
-            $validatorList = array();
-            foreach ($validatorRule as $key => $value) {
-                if (is_int($key)) {
-                    $validatorList[$key] = $value;
-                }
-            }
-
-            /**
-             * Use defaults for validation metacommands.
-             */
-            $validatorRule[self::RULE] = $ruleName;
-            if (!isset($validatorRule[self::FIELDS])) {
-                $validatorRule[self::FIELDS] = $ruleName;
-            }
-            if (!isset($validatorRule[self::BREAK_CHAIN])) {
-                $validatorRule[self::BREAK_CHAIN] = $this->_defaults[self::BREAK_CHAIN];
-            }
-            if (!isset($validatorRule[self::PRESENCE])) {
-                $validatorRule[self::PRESENCE] = $this->_defaults[self::PRESENCE];
-            }
-            if (!isset($validatorRule[self::ALLOW_EMPTY])) {
-                $validatorRule[self::ALLOW_EMPTY] = $this->_defaults[self::ALLOW_EMPTY];
-            }
-
-            if (!isset($validatorRule[self::MESSAGES])) {
-                $validatorRule[self::MESSAGES] = array();
-            } else if (!is_array($validatorRule[self::MESSAGES])) {
-                $validatorRule[self::MESSAGES] = array($validatorRule[self::MESSAGES]);
-            } else if (array_intersect_key($validatorList, $validatorRule[self::MESSAGES])) {
-                // There are now corresponding numeric keys in the validation rule messages array
-                // Treat it as a named messages list for all rule validators
-                $unifiedMessages = $validatorRule[self::MESSAGES];
-                $validatorRule[self::MESSAGES] = array();
-
-                foreach ($validatorList as $key => $validator) {
-                    if (array_key_exists($key, $unifiedMessages)) {
-                        $validatorRule[self::MESSAGES][$key] = $unifiedMessages[$key];
-                    }
-                }
-            }
-
-            /**
-             * Load all the validator classes and add them to the chain.
-             */
-            if (!isset($validatorRule[self::VALIDATOR_CHAIN])) {
-                $validatorRule[self::VALIDATOR_CHAIN] = new Zend_Validate();
-
-                foreach ($validatorList as $key => $validator) {
-                    if (is_string($validator) || is_array($validator)) {
-                        $validator = $this->_getValidator($validator);
-                    }
-
-                    if (isset($validatorRule[self::MESSAGES][$key])) {
-                        $value = $validatorRule[self::MESSAGES][$key];
-                        if (is_array($value)) {
-                            $validator->setMessages($value);
-                        } else {
-                            $validator->setMessage($value);
-                        }
-
-                        if ($validator instanceof Zend_Validate_NotEmpty) {
-                            $this->_defaults[self::NOT_EMPTY_MESSAGE] = $value;
-                        }
-                    }
-
-                    $validatorRule[self::VALIDATOR_CHAIN]->addValidator($validator, $validatorRule[self::BREAK_CHAIN]);
-                }
-                $validatorRule[self::VALIDATOR_CHAIN_COUNT] = count($validatorList);
-            }
-
-            /**
-             * If the ruleName is the special wildcard rule,
-             * then apply the validator chain to all input data.
-             * Else just process the field named by the rule.
-             */
-            if ($ruleName == self::RULE_WILDCARD) {
-                foreach (array_keys($this->_data) as $field)  {
-                    $this->_validateRule(array_merge($validatorRule, array(self::FIELDS => $field)));
-                }
-            } else {
-                $this->_validateRule($validatorRule);
-            }
-        }
-
-        /**
-         * Unset fields in $_data that have been added to other arrays.
-         * We have to wait until all rules have been processed because
-         * a given field may be referenced by multiple rules.
-         */
-        foreach (array_merge(array_keys($this->_missingFields), array_keys($this->_invalidMessages)) as $rule) {
-            foreach ((array) $this->_validatorRules[$rule][self::FIELDS] as $field) {
-                unset($this->_data[$field]);
-            }
-        }
-        foreach ($this->_validFields as $field => $value) {
-            unset($this->_data[$field]);
-        }
-
-        /**
-         * Anything left over in $_data is an unknown field.
-         */
-        $this->_unknownFields = $this->_data;
-    }
-
-    /**
-     * @param array $validatorRule
-     * @return void
-     */
-    protected function _validateRule(array $validatorRule)
-    {
-        /**
-         * Get one or more data values from input, and check for missing fields.
-         * Apply defaults if fields are missing.
-         */
-        $data = array();
-        foreach ((array) $validatorRule[self::FIELDS] as $key => $field) {
-            if (array_key_exists($field, $this->_data)) {
-                $data[$field] = $this->_data[$field];
-            } else if (isset($validatorRule[self::DEFAULT_VALUE])) {
-                /** @todo according to this code default value can't be an array. It has to be reviewed */
-                if (!is_array($validatorRule[self::DEFAULT_VALUE])) {
-                    // Default value is a scalar
-                    $data[$field] = $validatorRule[self::DEFAULT_VALUE];
-                } else {
-                    // Default value is an array. Search for corresponding key
-                    if (isset($validatorRule[self::DEFAULT_VALUE][$key])) {
-                        $data[$field] = $validatorRule[self::DEFAULT_VALUE][$key];
-                    } else if ($validatorRule[self::PRESENCE] == self::PRESENCE_REQUIRED) {
-                        // Default value array is provided, but it doesn't have an entry for current field
-                        // and presence is required
-                        $this->_missingFields[$validatorRule[self::RULE]][] =
-                           $this->_getMissingMessage($validatorRule[self::RULE], $field);
-                    }
-                }
-            } else if ($validatorRule[self::PRESENCE] == self::PRESENCE_REQUIRED) {
-                $this->_missingFields[$validatorRule[self::RULE]][] =
-                    $this->_getMissingMessage($validatorRule[self::RULE], $field);
-            }
-        }
-
-        /**
-         * If any required fields are missing, break the loop.
-         */
-        if (isset($this->_missingFields[$validatorRule[self::RULE]]) && count($this->_missingFields[$validatorRule[self::RULE]]) > 0) {
-            return;
-        }
-
-        /**
-         * Evaluate the inputs against the validator chain.
-         */
-        if (count((array) $validatorRule[self::FIELDS]) > 1) {
-            if (!$validatorRule[self::ALLOW_EMPTY]) {
-                $emptyFieldsFound = false;
-                $errorsList       = array();
-                $messages         = array();
-
-                foreach ($data as $fieldKey => $field) {
-                    $notEmptyValidator = $this->_getValidator('NotEmpty');
-                    $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldKey));
-
-                    if (!$notEmptyValidator->isValid($field)) {
-                        foreach ($notEmptyValidator->getMessages() as $messageKey => $message) {
-                            if (!isset($messages[$messageKey])) {
-                                $messages[$messageKey] = $message;
-                            } else {
-                                $messages[] = $message;
-                            }
-                        }
-                        $errorsList[] = $notEmptyValidator->getErrors();
-                        $emptyFieldsFound = true;
-                    }
-                }
-
-                if ($emptyFieldsFound) {
-                    $this->_invalidMessages[$validatorRule[self::RULE]] = $messages;
-                    $this->_invalidErrors[$validatorRule[self::RULE]]   = array_unique(call_user_func_array('array_merge', $errorsList));
-                    return;
-                }
-            }
-
-            if (!$validatorRule[self::VALIDATOR_CHAIN]->isValid($data)) {
-                $this->_invalidMessages[$validatorRule[self::RULE]] = $validatorRule[self::VALIDATOR_CHAIN]->getMessages();
-                $this->_invalidErrors[$validatorRule[self::RULE]] = $validatorRule[self::VALIDATOR_CHAIN]->getErrors();
-                return;
-            }
-        } else if (count($data) > 0) {
-            // $data is actually a one element array
-            $fieldNames = array_keys($data);
-            $fieldName = reset($fieldNames);
-            $field     = reset($data);
-
-            $failed = false;
-            if (!is_array($field)) {
-                $field = array($field);
-            }
-
-            $notEmptyValidator = $this->_getValidator('NotEmpty');
-            $notEmptyValidator->setMessage($this->_getNotEmptyMessage($validatorRule[self::RULE], $fieldName));
-            if ($validatorRule[self::ALLOW_EMPTY]) {
-                $validatorChain = $validatorRule[self::VALIDATOR_CHAIN];
-            } else {
-                $validatorChain = new Zend_Validate();
-                $validatorChain->addValidator($notEmptyValidator, true /* Always break on failure */);
-                $validatorChain->addValidator($validatorRule[self::VALIDATOR_CHAIN]);
-            }
-
-            foreach ($field as $value) {
-                if ($validatorRule[self::ALLOW_EMPTY]  &&  !$notEmptyValidator->isValid($value)) {
-                    // Field is empty AND it's allowed. Do nothing.
-                    continue;
-                }
-
-                if (!$validatorChain->isValid($value)) {
-                    if (isset($this->_invalidMessages[$validatorRule[self::RULE]])) {
-                        $collectedMessages = $this->_invalidMessages[$validatorRule[self::RULE]];
-                    } else {
-                        $collectedMessages = array();
-                    }
-
-                    foreach ($validatorChain->getMessages() as $messageKey => $message) {
-                        if (!isset($collectedMessages[$messageKey])) {
-                            $collectedMessages[$messageKey] = $message;
-                        } else {
-                            $collectedMessages[] = $message;
-                        }
-                    }
-
-                    $this->_invalidMessages[$validatorRule[self::RULE]] = $collectedMessages;
-                    if (isset($this->_invalidErrors[$validatorRule[self::RULE]])) {
-                        $this->_invalidErrors[$validatorRule[self::RULE]] = array_merge($this->_invalidErrors[$validatorRule[self::RULE]],
-                                                                                        $validatorChain->getErrors());
-                    } else {
-                        $this->_invalidErrors[$validatorRule[self::RULE]] = $validatorChain->getErrors();
-                    }
-                    unset($this->_validFields[$fieldName]);
-                    $failed = true;
-                    if ($validatorRule[self::BREAK_CHAIN]) {
-                        return;
-                    }
-                }
-            }
-            if ($failed) {
-                return;
-            }
-        }
-
-        /**
-         * If we got this far, the inputs for this rule pass validation.
-         */
-        foreach ((array) $validatorRule[self::FIELDS] as $field) {
-            if (array_key_exists($field, $data)) {
-                $this->_validFields[$field] = $data[$field];
-            }
-        }
-    }
-
-    /**
-     * @param mixed $classBaseName
-     * @return Zend_Filter_Interface
-     */
-    protected function _getFilter($classBaseName)
-    {
-        return $this->_getFilterOrValidator(self::FILTER, $classBaseName);
-    }
-
-    /**
-     * @param mixed $classBaseName
-     * @return Zend_Validate_Interface
-     */
-    protected function _getValidator($classBaseName)
-    {
-        return $this->_getFilterOrValidator(self::VALIDATE, $classBaseName);
-    }
-
-    /**
-     * @param string $type
-     * @param mixed $classBaseName
-     * @return Zend_Filter_Interface|Zend_Validate_Interface
-     * @throws Zend_Filter_Exception
-     */
-    protected function _getFilterOrValidator($type, $classBaseName)
-    {
-        $args = array();
-
-        if (is_array($classBaseName)) {
-            $args = $classBaseName;
-            $classBaseName = array_shift($args);
-        }
-
-        $interfaceName = 'Zend_' . ucfirst($type) . '_Interface';
-        $className = $this->getPluginLoader($type)->load(ucfirst($classBaseName));
-
-        $class = new ReflectionClass($className);
-
-        if (!$class->implementsInterface($interfaceName)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception("Class '$className' based on basename '$classBaseName' must implement the '$interfaceName' interface");
-        }
-
-        if ($class->hasMethod('__construct')) {
-            $object = $class->newInstanceArgs($args);
-        } else {
-            $object = $class->newInstance();
-        }
-
-        return $object;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Filter/Int.php b/airtime_mvc/library/Zend/Filter/Int.php
deleted file mode 100644
index 84999d3ea..000000000
--- a/airtime_mvc/library/Zend/Filter/Int.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Int.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Int implements Zend_Filter_Interface
-{
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns (int) $value
-     *
-     * @param  string $value
-     * @return integer
-     */
-    public function filter($value)
-    {
-        return (int) ((string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Interface.php b/airtime_mvc/library/Zend/Filter/Interface.php
deleted file mode 100644
index c059967f7..000000000
--- a/airtime_mvc/library/Zend/Filter/Interface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Filter_Interface
-{
-    /**
-     * Returns the result of filtering $value
-     *
-     * @param  mixed $value
-     * @throws Zend_Filter_Exception If filtering $value is impossible
-     * @return mixed
-     */
-    public function filter($value);
-}
diff --git a/airtime_mvc/library/Zend/Filter/LocalizedToNormalized.php b/airtime_mvc/library/Zend/Filter/LocalizedToNormalized.php
deleted file mode 100644
index 0ef70f2cc..000000000
--- a/airtime_mvc/library/Zend/Filter/LocalizedToNormalized.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalizedToNormalized.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * Normalizes given localized input
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_LocalizedToNormalized implements Zend_Filter_Interface
-{
-    /**
-     * Set options
-     * @var array
-     */
-    protected $_options = array(
-        'locale'      => null,
-        'date_format' => null,
-        'precision'   => null
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param string|Zend_Locale $locale (Optional) Locale to set
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (null !== $options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Returns the set options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets options to use
-     *
-     * @param  array $options (Optional) Options to use
-     * @return Zend_Filter_LocalizedToNormalized
-     */
-    public function setOptions(array $options = null)
-    {
-        $this->_options = $options + $this->_options;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Normalizes the given input
-     *
-     * @param  string $value Value to normalized
-     * @return string|array The normalized value
-     */
-    public function filter($value)
-    {
-        if (Zend_Locale_Format::isNumber($value, $this->_options)) {
-            return Zend_Locale_Format::getNumber($value, $this->_options);
-        } else if (($this->_options['date_format'] === null) && (strpos($value, ':') !== false)) {
-            // Special case, no date format specified, detect time input
-            return Zend_Locale_Format::getTime($value, $this->_options);
-        } else if (Zend_Locale_Format::checkDateFormat($value, $this->_options)) {
-            // Detect date or time input
-            return Zend_Locale_Format::getDate($value, $this->_options);
-        }
-
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/NormalizedToLocalized.php b/airtime_mvc/library/Zend/Filter/NormalizedToLocalized.php
deleted file mode 100644
index 53158389c..000000000
--- a/airtime_mvc/library/Zend/Filter/NormalizedToLocalized.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NormalizedToLocalized.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * Localizes given normalized input
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_NormalizedToLocalized implements Zend_Filter_Interface
-{
-    /**
-     * Set options
-     */
-    protected $_options = array(
-        'locale'      => null,
-        'date_format' => null,
-        'precision'   => null
-    );
-
-    /**
-     * Class constructor
-     *
-     * @param string|Zend_Locale $locale (Optional) Locale to set
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (null !== $options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Returns the set options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets options to use
-     *
-     * @param  array $options (Optional) Options to use
-     * @return Zend_Filter_LocalizedToNormalized
-     */
-    public function setOptions(array $options = null)
-    {
-        $this->_options = $options + $this->_options;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Normalizes the given input
-     *
-     * @param  string $value Value to normalized
-     * @return string|array The normalized value
-     */
-    public function filter($value)
-    {
-        if (is_array($value)) {
-            require_once 'Zend/Date.php';
-            $date = new Zend_Date($value, $this->_options['locale']);
-            return $date->toString($this->_options['date_format']);
-        } else if ($this->_options['precision'] === 0) {
-            return Zend_Locale_Format::toInteger($value, $this->_options);
-        } else if ($this->_options['precision'] === null) {
-            return Zend_Locale_Format::toFloat($value, $this->_options);
-        }
-
-        return Zend_Locale_Format::toNumber($value, $this->_options);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Null.php b/airtime_mvc/library/Zend/Filter/Null.php
deleted file mode 100644
index b98931c11..000000000
--- a/airtime_mvc/library/Zend/Filter/Null.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Null implements Zend_Filter_Interface
-{
-    const BOOLEAN      = 1;
-    const INTEGER      = 2;
-    const EMPTY_ARRAY  = 4;
-    const STRING       = 8;
-    const ZERO         = 16;
-    const ALL          = 31;
-
-    protected $_constants = array(
-        self::BOOLEAN     => 'boolean',
-        self::INTEGER     => 'integer',
-        self::EMPTY_ARRAY => 'array',
-        self::STRING      => 'string',
-        self::ZERO        => 'zero',
-        self::ALL         => 'all'
-    );
-
-    /**
-     * Internal type to detect
-     *
-     * @var integer
-     */
-    protected $_type = self::ALL;
-
-    /**
-     * Constructor
-     *
-     * @param string|array|Zend_Config $options OPTIONAL
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp = array_shift($options);
-            }
-            $options = $temp;
-        } else if (is_array($options) && array_key_exists('type', $options)) {
-            $options = $options['type'];
-        }
-
-        if (!empty($options)) {
-            $this->setType($options);
-        }
-    }
-
-    /**
-     * Returns the set null types
-     *
-     * @return array
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set the null types
-     *
-     * @param  integer|array $type
-     * @throws Zend_Filter_Exception
-     * @return Zend_Filter_Null
-     */
-    public function setType($type = null)
-    {
-        if (is_array($type)) {
-            $detected = 0;
-            foreach($type as $value) {
-                if (is_int($value)) {
-                    $detected += $value;
-                } else if (in_array($value, $this->_constants)) {
-                    $detected += array_search($value, $this->_constants);
-                }
-            }
-
-            $type = $detected;
-        } else if (is_string($type)) {
-            if (in_array($type, $this->_constants)) {
-                $type = array_search($type, $this->_constants);
-            }
-        }
-
-        if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('Unknown type');
-        }
-
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns null representation of $value, if value is empty and matches
-     * types that should be considered null.
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $type = $this->getType();
-
-        // STRING ZERO ('0')
-        if ($type >= self::ZERO) {
-            $type -= self::ZERO;
-            if (is_string($value) && ($value == '0')) {
-                return null;
-            }
-        }
-
-        // STRING ('')
-        if ($type >= self::STRING) {
-            $type -= self::STRING;
-            if (is_string($value) && ($value == '')) {
-                return null;
-            }
-        }
-
-        // EMPTY_ARRAY (array())
-        if ($type >= self::EMPTY_ARRAY) {
-            $type -= self::EMPTY_ARRAY;
-            if (is_array($value) && ($value == array())) {
-                return null;
-            }
-        }
-
-        // INTEGER (0)
-        if ($type >= self::INTEGER) {
-            $type -= self::INTEGER;
-            if (is_int($value) && ($value == 0)) {
-                return null;
-            }
-        }
-
-        // BOOLEAN (false)
-        if ($type >= self::BOOLEAN) {
-            $type -= self::BOOLEAN;
-            if (is_bool($value) && ($value == false)) {
-                return null;
-            }
-        }
-
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/PregReplace.php b/airtime_mvc/library/Zend/Filter/PregReplace.php
deleted file mode 100644
index 5bcb581d4..000000000
--- a/airtime_mvc/library/Zend/Filter/PregReplace.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PregReplace.php 21086 2010-02-18 21:10:39Z thomas $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_PregReplace implements Zend_Filter_Interface
-{
-    /**
-     * Pattern to match
-     * @var mixed
-     */
-    protected $_matchPattern = null;
-
-    /**
-     * Replacement pattern
-     * @var mixed
-     */
-    protected $_replacement = '';
-
-    /**
-     * Is unicode enabled?
-     *
-     * @var bool
-     */
-    static protected $_unicodeSupportEnabled = null;
-
-    /**
-     * Is Unicode Support Enabled Utility function
-     *
-     * @return bool
-     */
-    static public function isUnicodeSupportEnabled()
-    {
-        if (self::$_unicodeSupportEnabled === null) {
-            self::_determineUnicodeSupport();
-        }
-
-        return self::$_unicodeSupportEnabled;
-    }
-
-    /**
-     * Method to cache the regex needed to determine if unicode support is available
-     *
-     * @return bool
-     */
-    static protected function _determineUnicodeSupport()
-    {
-        self::$_unicodeSupportEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
-    }
-
-    /**
-     * Constructor
-     * Supported options are
-     *     'match'   => matching pattern
-     *     'replace' => replace with this
-     *
-     * @param  string|array $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp['match'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['replace'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (array_key_exists('match', $options)) {
-            $this->setMatchPattern($options['match']);
-        }
-
-        if (array_key_exists('replace', $options)) {
-            $this->setReplacement($options['replace']);
-        }
-    }
-
-    /**
-     * Set the match pattern for the regex being called within filter()
-     *
-     * @param mixed $match - same as the first argument of preg_replace
-     * @return Zend_Filter_PregReplace
-     */
-    public function setMatchPattern($match)
-    {
-        $this->_matchPattern = $match;
-        return $this;
-    }
-
-    /**
-     * Get currently set match pattern
-     *
-     * @return string
-     */
-    public function getMatchPattern()
-    {
-        return $this->_matchPattern;
-    }
-
-    /**
-     * Set the Replacement pattern/string for the preg_replace called in filter
-     *
-     * @param mixed $replacement - same as the second argument of preg_replace
-     * @return Zend_Filter_PregReplace
-     */
-    public function setReplacement($replacement)
-    {
-        $this->_replacement = $replacement;
-        return $this;
-    }
-
-    /**
-     * Get currently set replacement value
-     *
-     * @return string
-     */
-    public function getReplacement()
-    {
-        return $this->_replacement;
-    }
-
-    /**
-     * Perform regexp replacement as filter
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        if ($this->_matchPattern == null) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception(get_class($this) . ' does not have a valid MatchPattern set.');
-        }
-
-        return preg_replace($this->_matchPattern, $this->_replacement, $value);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Filter/RealPath.php b/airtime_mvc/library/Zend/Filter/RealPath.php
deleted file mode 100644
index 4bbcb9560..000000000
--- a/airtime_mvc/library/Zend/Filter/RealPath.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RealPath.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_RealPath implements Zend_Filter_Interface
-{
-    /**
-     * @var boolean $_pathExists
-     */
-    protected $_exists = true;
-
-    /**
-     * Class constructor
-     *
-     * @param boolean|Zend_Config $options Options to set
-     */
-    public function __construct($options = true)
-    {
-        $this->setExists($options);
-    }
-
-    /**
-     * Returns true if the filtered path must exist
-     *
-     * @return boolean
-     */
-    public function getExists()
-    {
-        return $this->_exists;
-    }
-
-    /**
-     * Sets if the path has to exist
-     * TRUE when the path must exist
-     * FALSE when not existing paths can be given
-     *
-     * @param boolean|Zend_Config $exists Path must exist
-     * @return Zend_Filter_RealPath
-     */
-    public function setExists($exists)
-    {
-        if ($exists instanceof Zend_Config) {
-            $exists = $exists->toArray();
-        }
-
-        if (is_array($exists)) {
-            if (isset($exists['exists'])) {
-                $exists = (boolean) $exists['exists'];
-            }
-        }
-
-        $this->_exists = (boolean) $exists;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns realpath($value)
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $path = (string) $value;
-        if ($this->_exists) {
-            return realpath($path);
-        }
-
-        $realpath = @realpath($path);
-        if ($realpath) {
-            return $realpath;
-        }
-
-        $drive = '';
-        if (substr(PHP_OS, 0, 3) == 'WIN') {
-            $path = preg_replace('/[\\\\\/]/', DIRECTORY_SEPARATOR, $path);
-            if (preg_match('/([a-zA-Z]\:)(.*)/', $path, $matches)) {
-                list($fullMatch, $drive, $path) = $matches;
-            } else {
-                $cwd   = getcwd();
-                $drive = substr($cwd, 0, 2);
-                if (substr($path, 0, 1) != DIRECTORY_SEPARATOR) {
-                    $path = substr($cwd, 3) . DIRECTORY_SEPARATOR . $path;
-                }
-            }
-        } elseif (substr($path, 0, 1) != DIRECTORY_SEPARATOR) {
-            $path = getcwd() . DIRECTORY_SEPARATOR . $path;
-        }
-
-        $stack = array();
-        $parts = explode(DIRECTORY_SEPARATOR, $path);
-        foreach ($parts as $dir) {
-            if (strlen($dir) && $dir !== '.') {
-                if ($dir == '..') {
-                    array_pop($stack);
-                } else {
-                    array_push($stack, $dir);
-                }
-            }
-        }
-
-        return $drive . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $stack);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/StringToLower.php b/airtime_mvc/library/Zend/Filter/StringToLower.php
deleted file mode 100644
index 7ad606dda..000000000
--- a/airtime_mvc/library/Zend/Filter/StringToLower.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StringToLower.php 20912 2010-02-04 19:44:42Z thomas $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_StringToLower implements Zend_Filter_Interface
-{
-    /**
-     * Encoding for the input string
-     *
-     * @var string
-     */
-    protected $_encoding = null;
-
-    /**
-     * Constructor
-     *
-     * @param string|array|Zend_Config $options OPTIONAL
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp['encoding'] = array_shift($options);
-            }
-            $options = $temp;
-        }
-
-        if (array_key_exists('encoding', $options)) {
-            $this->setEncoding($options['encoding']);
-        }
-    }
-
-    /**
-     * Returns the set encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set the input encoding for the given string
-     *
-     * @param  string $encoding
-     * @return Zend_Filter_StringToLower Provides a fluent interface
-     * @throws Zend_Filter_Exception
-     */
-    public function setEncoding($encoding = null)
-    {
-        if ($encoding !== null) {
-            if (!function_exists('mb_strtolower')) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception('mbstring is required for this feature');
-            }
-
-            $encoding = (string) $encoding;
-            if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring");
-            }
-        }
-
-        $this->_encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, converting characters to lowercase as necessary
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        if ($this->_encoding !== null) {
-            return mb_strtolower((string) $value, $this->_encoding);
-        }
-
-        return strtolower((string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/StringToUpper.php b/airtime_mvc/library/Zend/Filter/StringToUpper.php
deleted file mode 100644
index 3f3391467..000000000
--- a/airtime_mvc/library/Zend/Filter/StringToUpper.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StringToUpper.php 20912 2010-02-04 19:44:42Z thomas $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_StringToUpper implements Zend_Filter_Interface
-{
-    /**
-     * Encoding for the input string
-     *
-     * @var string
-     */
-    protected $_encoding = null;
-
-    /**
-     * Constructor
-     *
-     * @param string|array $options OPTIONAL
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp['encoding'] = array_shift($options);
-            }
-            $options = $temp;
-        }
-
-        if (array_key_exists('encoding', $options)) {
-            $this->setEncoding($options['encoding']);
-        }
-    }
-
-    /**
-     * Returns the set encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set the input encoding for the given string
-     *
-     * @param  string $encoding
-     * @return Zend_Filter_StringToUpper Provides a fluent interface
-     * @throws Zend_Filter_Exception
-     */
-    public function setEncoding($encoding = null)
-    {
-        if ($encoding !== null) {
-            if (!function_exists('mb_strtoupper')) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception('mbstring is required for this feature');
-            }
-
-            $encoding = (string) $encoding;
-            if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) {
-                require_once 'Zend/Filter/Exception.php';
-                throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring");
-            }
-        }
-
-        $this->_encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, converting characters to uppercase as necessary
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        if ($this->_encoding) {
-            return mb_strtoupper((string) $value, $this->_encoding);
-        }
-
-        return strtoupper((string) $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/StringTrim.php b/airtime_mvc/library/Zend/Filter/StringTrim.php
deleted file mode 100644
index 82edf286f..000000000
--- a/airtime_mvc/library/Zend/Filter/StringTrim.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StringTrim.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_StringTrim implements Zend_Filter_Interface
-{
-    /**
-     * List of characters provided to the trim() function
-     *
-     * If this is null, then trim() is called with no specific character list,
-     * and its default behavior will be invoked, trimming whitespace.
-     *
-     * @var string|null
-     */
-    protected $_charList;
-
-    /**
-     * Sets filter options
-     *
-     * @param  string|array|Zend_Config $charList
-     * @return void
-     */
-    public function __construct($charList = null)
-    {
-        if ($charList instanceof Zend_Config) {
-            $charList = $charList->toArray();
-        } else if (!is_array($charList)) {
-            $options          = func_get_args();
-            $temp['charlist'] = array_shift($options);
-            $options          = $temp;
-        }
-
-        if (array_key_exists('charlist', $options)) {
-            $this->setCharList($options['charlist']);
-        }
-    }
-
-    /**
-     * Returns the charList option
-     *
-     * @return string|null
-     */
-    public function getCharList()
-    {
-        return $this->_charList;
-    }
-
-    /**
-     * Sets the charList option
-     *
-     * @param  string|null $charList
-     * @return Zend_Filter_StringTrim Provides a fluent interface
-     */
-    public function setCharList($charList)
-    {
-        $this->_charList = $charList;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value with characters stripped from the beginning and end
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        if (null === $this->_charList) {
-            return $this->_unicodeTrim((string) $value);
-        } else {
-            return $this->_unicodeTrim((string) $value, $this->_charList);
-        }
-    }
-
-    /**
-     * Unicode aware trim method
-     * Fixes a PHP problem
-     *
-     * @param string $value
-     * @param string $charlist
-     * @return string
-     */
-    protected function _unicodeTrim($value, $charlist = '\\\\s')
-    {
-        $chars = preg_replace(
-            array( '/[\^\-\]\\\]/S', '/\\\{4}/S', '/\//'),
-            array( '\\\\\\0', '\\', '\/' ),
-            $charlist
-        );
-
-        $pattern = '^[' . $chars . ']*|[' . $chars . ']*$';
-        return preg_replace("/$pattern/sSD", '', $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/StripNewlines.php b/airtime_mvc/library/Zend/Filter/StripNewlines.php
deleted file mode 100644
index 6554acb35..000000000
--- a/airtime_mvc/library/Zend/Filter/StripNewlines.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StripNewlines.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_StripNewlines implements Zend_Filter_Interface
-{
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns $value without newline control characters
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter ($value)
-    {
-        return str_replace(array("\n", "\r"), '', $value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/StripTags.php b/airtime_mvc/library/Zend/Filter/StripTags.php
deleted file mode 100644
index ba4d7dca1..000000000
--- a/airtime_mvc/library/Zend/Filter/StripTags.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StripTags.php 21553 2010-03-18 18:49:26Z thomas $
- */
-
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_StripTags implements Zend_Filter_Interface
-{
-    /**
-     * Unique ID prefix used for allowing comments
-     */
-    const UNIQUE_ID_PREFIX = '__Zend_Filter_StripTags__';
-
-    /**
-     * Whether comments are allowed
-     *
-     * If false (the default), then comments are removed from the input string.
-     *
-     * This setting is now deprecated, and ignored internally.
-     *
-     * @deprecated
-     * @var boolean
-     */
-    public $commentsAllowed = false;
-
-    /**
-     * Array of allowed tags and allowed attributes for each allowed tag
-     *
-     * Tags are stored in the array keys, and the array values are themselves
-     * arrays of the attributes allowed for the corresponding tag.
-     *
-     * @var array
-     */
-    protected $_tagsAllowed = array();
-
-    /**
-     * Array of allowed attributes for all allowed tags
-     *
-     * Attributes stored here are allowed for all of the allowed tags.
-     *
-     * @var array
-     */
-    protected $_attributesAllowed = array();
-
-    /**
-     * Sets the filter options
-     * Allowed options are
-     *     'allowTags'     => Tags which are allowed
-     *     'allowAttribs'  => Attributes which are allowed
-     *     'allowComments' => Are comments allowed ?
-     *
-     * @param  string|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['allowTags'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['allowAttribs'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['allowComments'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (array_key_exists('allowTags', $options)) {
-            $this->setTagsAllowed($options['allowTags']);
-        }
-
-        if (array_key_exists('allowAttribs', $options)) {
-            $this->setAttributesAllowed($options['allowAttribs']);
-        }
-
-        if (array_key_exists('allowComments', $options)) {
-            $this->setCommentsAllowed($options['allowComments']);
-        }
-    }
-
-    /**
-     * Returns the commentsAllowed option
-     *
-     * This setting is now deprecated and ignored internally.
-     *
-     * @deprecated
-     * @return bool
-     */
-    public function getCommentsAllowed()
-    {
-        return $this->commentsAllowed;
-    }
-
-    /**
-     * Sets the commentsAllowed option
-     *
-     * This setting is now deprecated and ignored internally.
-     *
-     * @deprecated
-     * @param  boolean $commentsAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
-     */
-    public function setCommentsAllowed($commentsAllowed)
-    {
-       $this->commentsAllowed = (boolean) $commentsAllowed;
-       return $this;
-    }
-
-    /**
-     * Returns the tagsAllowed option
-     *
-     * @return array
-     */
-    public function getTagsAllowed()
-    {
-        return $this->_tagsAllowed;
-    }
-
-    /**
-     * Sets the tagsAllowed option
-     *
-     * @param  array|string $tagsAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
-     */
-    public function setTagsAllowed($tagsAllowed)
-    {
-        if (!is_array($tagsAllowed)) {
-            $tagsAllowed = array($tagsAllowed);
-        }
-
-        foreach ($tagsAllowed as $index => $element) {
-            // If the tag was provided without attributes
-            if (is_int($index) && is_string($element)) {
-                // Canonicalize the tag name
-                $tagName = strtolower($element);
-                // Store the tag as allowed with no attributes
-                $this->_tagsAllowed[$tagName] = array();
-            }
-            // Otherwise, if a tag was provided with attributes
-            else if (is_string($index) && (is_array($element) || is_string($element))) {
-                // Canonicalize the tag name
-                $tagName = strtolower($index);
-                // Canonicalize the attributes
-                if (is_string($element)) {
-                    $element = array($element);
-                }
-                // Store the tag as allowed with the provided attributes
-                $this->_tagsAllowed[$tagName] = array();
-                foreach ($element as $attribute) {
-                    if (is_string($attribute)) {
-                        // Canonicalize the attribute name
-                        $attributeName = strtolower($attribute);
-                        $this->_tagsAllowed[$tagName][$attributeName] = null;
-                    }
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the attributesAllowed option
-     *
-     * @return array
-     */
-    public function getAttributesAllowed()
-    {
-        return $this->_attributesAllowed;
-    }
-
-    /**
-     * Sets the attributesAllowed option
-     *
-     * @param  array|string $attributesAllowed
-     * @return Zend_Filter_StripTags Provides a fluent interface
-     */
-    public function setAttributesAllowed($attributesAllowed)
-    {
-        if (!is_array($attributesAllowed)) {
-            $attributesAllowed = array($attributesAllowed);
-        }
-
-        // Store each attribute as allowed
-        foreach ($attributesAllowed as $attribute) {
-            if (is_string($attribute)) {
-                // Canonicalize the attribute name
-                $attributeName = strtolower($attribute);
-                $this->_attributesAllowed[$attributeName] = null;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * @todo improve docblock descriptions
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        $value = (string) $value;
-
-        // Strip HTML comments first
-        while (strpos($value, '<!--') !== false) {
-            $pos   = strrpos($value, '<!--');
-            $start = substr($value, 0, $pos);
-            $value = substr($value, $pos);
-            $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/us', '',  $value);
-            $value = $start . $value;
-        }
-
-        // Initialize accumulator for filtered data
-        $dataFiltered = '';
-        // Parse the input data iteratively as regular pre-tag text followed by a
-        // tag; either may be empty strings
-        preg_match_all('/([^<]*)(<?[^>]*>?)/', (string) $value, $matches);
-        // Iterate over each set of matches
-        foreach ($matches[1] as $index => $preTag) {
-            // If the pre-tag text is non-empty, strip any ">" characters from it
-            if (strlen($preTag)) {
-                $preTag = str_replace('>', '', $preTag);
-            }
-            // If a tag exists in this match, then filter the tag
-            $tag = $matches[2][$index];
-            if (strlen($tag)) {
-                $tagFiltered = $this->_filterTag($tag);
-            } else {
-                $tagFiltered = '';
-            }
-            // Add the filtered pre-tag text and filtered tag to the data buffer
-            $dataFiltered .= $preTag . $tagFiltered;
-        }
-
-        // Return the filtered data
-        return $dataFiltered;
-    }
-
-    /**
-     * Filters a single tag against the current option settings
-     *
-     * @param  string $tag
-     * @return string
-     */
-    protected function _filterTag($tag)
-    {
-        // Parse the tag into:
-        // 1. a starting delimiter (mandatory)
-        // 2. a tag name (if available)
-        // 3. a string of attributes (if available)
-        // 4. an ending delimiter (if available)
-        $isMatch = preg_match('~(</?)(\w*)((/(?!>)|[^/>])*)(/?>)~', $tag, $matches);
-
-        // If the tag does not match, then strip the tag entirely
-        if (!$isMatch) {
-            return '';
-        }
-
-        // Save the matches to more meaningfully named variables
-        $tagStart      = $matches[1];
-        $tagName       = strtolower($matches[2]);
-        $tagAttributes = $matches[3];
-        $tagEnd        = $matches[5];
-
-        // If the tag is not an allowed tag, then remove the tag entirely
-        if (!isset($this->_tagsAllowed[$tagName])) {
-            return '';
-        }
-
-        // Trim the attribute string of whitespace at the ends
-        $tagAttributes = trim($tagAttributes);
-
-        // If there are non-whitespace characters in the attribute string
-        if (strlen($tagAttributes)) {
-            // Parse iteratively for well-formed attributes
-            preg_match_all('/(\w+)\s*=\s*(?:(")(.*?)"|(\')(.*?)\')/s', $tagAttributes, $matches);
-
-            // Initialize valid attribute accumulator
-            $tagAttributes = '';
-
-            // Iterate over each matched attribute
-            foreach ($matches[1] as $index => $attributeName) {
-                $attributeName      = strtolower($attributeName);
-                $attributeDelimiter = $matches[2][$index];
-                $attributeValue     = $matches[3][$index];
-
-                // If the attribute is not allowed, then remove it entirely
-                if (!array_key_exists($attributeName, $this->_tagsAllowed[$tagName])
-                    && !array_key_exists($attributeName, $this->_attributesAllowed)) {
-                    continue;
-                }
-                // Add the attribute to the accumulator
-                $tagAttributes .= " $attributeName=" . $attributeDelimiter
-                                . $attributeValue . $attributeDelimiter;
-            }
-        }
-
-        // Reconstruct tags ending with "/>" as backwards-compatible XHTML tag
-        if (strpos($tagEnd, '/') !== false) {
-            $tagEnd = " $tagEnd";
-        }
-
-        // Return the filtered tag
-        return $tagStart . $tagName . $tagAttributes . $tagEnd;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToDash.php b/airtime_mvc/library/Zend/Filter/Word/CamelCaseToDash.php
deleted file mode 100644
index 123637b98..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToDash.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CamelCaseToDash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_CamelCaseToDash extends Zend_Filter_Word_CamelCaseToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('-');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToSeparator.php b/airtime_mvc/library/Zend/Filter/Word/CamelCaseToSeparator.php
deleted file mode 100644
index 36157ae26..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToSeparator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CamelCaseToSeparator.php 21089 2010-02-19 06:49:15Z thomas $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/Separator/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_CamelCaseToSeparator extends Zend_Filter_Word_Separator_Abstract
-{
-
-    public function filter($value)
-    {
-        if (self::isUnicodeSupportEnabled()) {
-            parent::setMatchPattern(array('#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#','#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#'));
-            parent::setReplacement(array($this->_separator . '\1', $this->_separator . '\1'));
-        } else {
-            parent::setMatchPattern(array('#(?<=(?:[A-Z]))([A-Z]+)([A-Z][A-z])#', '#(?<=(?:[a-z0-9]))([A-Z])#'));
-            parent::setReplacement(array('\1' . $this->_separator . '\2', $this->_separator . '\1'));
-        }
-
-        return parent::filter($value);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToUnderscore.php b/airtime_mvc/library/Zend/Filter/Word/CamelCaseToUnderscore.php
deleted file mode 100644
index fed622963..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/CamelCaseToUnderscore.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CamelCaseToUnderscore.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_CamelCaseToSeparator
- */
-require_once 'Zend/Filter/Word/CamelCaseToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_CamelCaseToUnderscore extends Zend_Filter_Word_CamelCaseToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('_');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/DashToCamelCase.php b/airtime_mvc/library/Zend/Filter/Word/DashToCamelCase.php
deleted file mode 100644
index f71a20861..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/DashToCamelCase.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DashToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_DashToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('-');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/DashToSeparator.php b/airtime_mvc/library/Zend/Filter/Word/DashToSeparator.php
deleted file mode 100644
index 0de3fe2f8..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/DashToSeparator.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DashToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/Separator/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_DashToSeparator extends Zend_Filter_Word_Separator_Abstract
-{
-
-    public function filter($value)
-    {
-        $this->setMatchPattern('#-#');
-        $this->setReplacement($this->_separator);
-        return parent::filter($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/DashToUnderscore.php b/airtime_mvc/library/Zend/Filter/Word/DashToUnderscore.php
deleted file mode 100644
index 12e1b7680..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/DashToUnderscore.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DashToUnderscore.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_DashToUnderscore extends Zend_Filter_Word_SeparatorToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @param  string $separator Space by default
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('-', '_');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Word/Separator/Abstract.php b/airtime_mvc/library/Zend/Filter/Word/Separator/Abstract.php
deleted file mode 100644
index b2baebcdb..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/Separator/Abstract.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/PregReplace.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @uses       Zend_Filter_PregReplace
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Filter_Word_Separator_Abstract extends Zend_Filter_PregReplace
-{
-
-    protected $_separator = null;
-
-    /**
-     * Constructor
-     *
-     * @param  string $separator Space by default
-     * @return void
-     */
-    public function __construct($separator = ' ')
-    {
-        $this->setSeparator($separator);
-    }
-
-    /**
-     * Sets a new seperator
-     *
-     * @param  string  $separator  Seperator
-     * @return $this
-     */
-    public function setSeparator($separator)
-    {
-        if ($separator == null) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('"' . $separator . '" is not a valid separator.');
-        }
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * Returns the actual set seperator
-     *
-     * @return  string
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Word/SeparatorToCamelCase.php b/airtime_mvc/library/Zend/Filter/Word/SeparatorToCamelCase.php
deleted file mode 100644
index 1d03b5805..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/SeparatorToCamelCase.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SeparatorToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/Separator/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_SeparatorToCamelCase extends Zend_Filter_Word_Separator_Abstract
-{
-
-    public function filter($value)
-    {
-        // a unicode safe way of converting characters to \x00\x00 notation
-        $pregQuotedSeparator = preg_quote($this->_separator, '#');
-
-        if (self::isUnicodeSupportEnabled()) {
-            parent::setMatchPattern(array('#('.$pregQuotedSeparator.')(\p{L}{1})#e','#(^\p{Ll}{1})#e'));
-            parent::setReplacement(array("strtoupper('\\2')","strtoupper('\\1')"));
-        } else {
-            parent::setMatchPattern(array('#('.$pregQuotedSeparator.')([A-Za-z]{1})#e','#(^[A-Za-z]{1})#e'));
-            parent::setReplacement(array("strtoupper('\\2')","strtoupper('\\1')"));
-        }
-
-        return parent::filter($value);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/SeparatorToDash.php b/airtime_mvc/library/Zend/Filter/Word/SeparatorToDash.php
deleted file mode 100644
index 7dbe07871..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/SeparatorToDash.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SeparatorToDash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_SeperatorToSeparator
- */
-require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_SeparatorToDash extends Zend_Filter_Word_SeparatorToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @param  string  $searchSeparator  Seperator to search for change
-     * @return void
-     */
-    public function __construct($searchSeparator = ' ')
-    {
-        parent::__construct($searchSeparator, '-');
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Word/SeparatorToSeparator.php b/airtime_mvc/library/Zend/Filter/Word/SeparatorToSeparator.php
deleted file mode 100644
index 8b8206540..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/SeparatorToSeparator.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SeparatorToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/PregReplace.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_SeparatorToSeparator extends Zend_Filter_PregReplace
-{
-
-    protected $_searchSeparator = null;
-    protected $_replacementSeparator = null;
-
-    /**
-     * Constructor
-     *
-     * @param  string  $searchSeparator      Seperator to search for
-     * @param  string  $replacementSeperator Seperator to replace with
-     * @return void
-     */
-    public function __construct($searchSeparator = ' ', $replacementSeparator = '-')
-    {
-        $this->setSearchSeparator($searchSeparator);
-        $this->setReplacementSeparator($replacementSeparator);
-    }
-
-    /**
-     * Sets a new seperator to search for
-     *
-     * @param  string  $separator  Seperator to search for
-     * @return $this
-     */
-    public function setSearchSeparator($separator)
-    {
-        $this->_searchSeparator = $separator;
-        return $this;
-    }
-
-    /**
-     * Returns the actual set seperator to search for
-     *
-     * @return  string
-     */
-    public function getSearchSeparator()
-    {
-        return $this->_searchSeparator;
-    }
-
-    /**
-     * Sets a new seperator which replaces the searched one
-     *
-     * @param  string  $separator  Seperator which replaces the searched one
-     * @return $this
-     */
-    public function setReplacementSeparator($separator)
-    {
-        $this->_replacementSeparator = $separator;
-        return $this;
-    }
-
-    /**
-     * Returns the actual set seperator which replaces the searched one
-     *
-     * @return  string
-     */
-    public function getReplacementSeparator()
-    {
-        return $this->_replacementSeparator;
-    }
-
-    /**
-     * Defined by Zend_Filter_Interface
-     *
-     * Returns the string $value, replacing the searched seperators with the defined ones
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filter($value)
-    {
-        return $this->_separatorToSeparatorFilter($value);
-    }
-
-    /**
-     * Do the real work, replaces the seperator to search for with the replacement seperator
-     *
-     * Returns the replaced string
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _separatorToSeparatorFilter($value)
-    {
-        if ($this->_searchSeparator == null) {
-            require_once 'Zend/Filter/Exception.php';
-            throw new Zend_Filter_Exception('You must provide a search separator for this filter to work.');
-        }
-
-        $this->setMatchPattern('#' . preg_quote($this->_searchSeparator, '#') . '#');
-        $this->setReplacement($this->_replacementSeparator);
-        return parent::filter($value);
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToCamelCase.php b/airtime_mvc/library/Zend/Filter/Word/UnderscoreToCamelCase.php
deleted file mode 100644
index d79e29d5a..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToCamelCase.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UnderscoreToCamelCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_Interface
- */
-require_once 'Zend/Filter/Word/SeparatorToCamelCase.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_UnderscoreToCamelCase extends Zend_Filter_Word_SeparatorToCamelCase
-{
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('_');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToDash.php b/airtime_mvc/library/Zend/Filter/Word/UnderscoreToDash.php
deleted file mode 100644
index 821a648d2..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToDash.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UnderscoreToDash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_UnderscoreToDash extends Zend_Filter_Word_SeparatorToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @param  string $separator Space by default
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct('_', '-');
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToSeparator.php b/airtime_mvc/library/Zend/Filter/Word/UnderscoreToSeparator.php
deleted file mode 100644
index 12b8f71b9..000000000
--- a/airtime_mvc/library/Zend/Filter/Word/UnderscoreToSeparator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UnderscoreToSeparator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/Word/SeparatorToSeparator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Filter_Word_UnderscoreToSeparator extends Zend_Filter_Word_SeparatorToSeparator
-{
-    /**
-     * Constructor
-     *
-     * @param  string $separator Space by default
-     * @return void
-     */
-    public function __construct($replacementSeparator = ' ')
-    {
-        parent::__construct('_', $replacementSeparator);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form.php b/airtime_mvc/library/Zend/Form.php
deleted file mode 100644
index 87b7126c8..000000000
--- a/airtime_mvc/library/Zend/Form.php
+++ /dev/null
@@ -1,3135 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Validate_Interface */
-require_once 'Zend/Validate/Interface.php';
-
-/**
- * Zend_Form
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 21704 2010-03-31 16:32:29Z matthew $
- */
-class Zend_Form implements Iterator, Countable, Zend_Validate_Interface
-{
-    /**#@+
-     * Plugin loader type constants
-     */
-    const DECORATOR = 'DECORATOR';
-    const ELEMENT = 'ELEMENT';
-    /**#@-*/
-
-    /**#@+
-     * Method type constants
-     */
-    const METHOD_DELETE = 'delete';
-    const METHOD_GET    = 'get';
-    const METHOD_POST   = 'post';
-    const METHOD_PUT    = 'put';
-    /**#@-*/
-
-    /**#@+
-     * Encoding type constants
-     */
-    const ENCTYPE_URLENCODED = 'application/x-www-form-urlencoded';
-    const ENCTYPE_MULTIPART  = 'multipart/form-data';
-    /**#@-*/
-
-    /**
-     * Form metadata and attributes
-     * @var array
-     */
-    protected $_attribs = array();
-
-    /**
-     * Decorators for rendering
-     * @var array
-     */
-    protected $_decorators = array();
-
-    /**
-     * Default display group class
-     * @var string
-     */
-    protected $_defaultDisplayGroupClass = 'Zend_Form_DisplayGroup';
-
-    /**
-     * Form description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Should we disable loading the default decorators?
-     * @var bool
-     */
-    protected $_disableLoadDefaultDecorators = false;
-
-    /**
-     * Display group prefix paths
-     * @var array
-     */
-    protected $_displayGroupPrefixPaths = array();
-
-    /**
-     * Groups of elements grouped for display purposes
-     * @var array
-     */
-    protected $_displayGroups = array();
-
-    /**
-     * Global decorators to apply to all elements
-     * @var null|array
-     */
-    protected $_elementDecorators;
-
-    /**
-     * Prefix paths to use when creating elements
-     * @var array
-     */
-    protected $_elementPrefixPaths = array();
-
-    /**
-     * Form elements
-     * @var array
-     */
-    protected $_elements = array();
-
-    /**
-     * Array to which elements belong (if any)
-     * @var string
-     */
-    protected $_elementsBelongTo;
-
-    /**
-     * Custom form-level error messages
-     * @var array
-     */
-    protected $_errorMessages = array();
-
-    /**
-     * Are there errors in the form?
-     * @var bool
-     */
-    protected $_errorsExist = false;
-
-    /**
-     * Has the form been manually flagged as an error?
-     * @var bool
-     */
-    protected $_errorsForced = false;
-
-    /**
-     * Form order
-     * @var int|null
-     */
-    protected $_formOrder;
-
-    /**
-     * Whether or not form elements are members of an array
-     * @var bool
-     */
-    protected $_isArray = false;
-
-    /**
-     * Form legend
-     * @var string
-     */
-    protected $_legend;
-
-    /**
-     * Plugin loaders
-     * @var array
-     */
-    protected $_loaders = array();
-
-    /**
-     * Allowed form methods
-     * @var array
-     */
-    protected $_methods = array('delete', 'get', 'post', 'put');
-
-    /**
-     * Order in which to display and iterate elements
-     * @var array
-     */
-    protected $_order = array();
-
-    /**
-     * Whether internal order has been updated or not
-     * @var bool
-     */
-    protected $_orderUpdated = false;
-
-    /**
-     * Sub form prefix paths
-     * @var array
-     */
-    protected $_subFormPrefixPaths = array();
-
-    /**
-     * Sub forms
-     * @var array
-     */
-    protected $_subForms = array();
-
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Global default translation adapter
-     * @var Zend_Translate
-     */
-    protected static $_translatorDefault;
-
-    /**
-     * is the translator disabled?
-     * @var bool
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * Constructor
-     *
-     * Registers form view helper as decorator
-     *
-     * @param mixed $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } elseif ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        // Extensions...
-        $this->init();
-
-        $this->loadDefaultDecorators();
-    }
-
-    /**
-     * Clone form object and all children
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        $elements = array();
-        foreach ($this->getElements() as $name => $element) {
-            $elements[] = clone $element;
-        }
-        $this->setElements($elements);
-
-        $subForms = array();
-        foreach ($this->getSubForms() as $name => $subForm) {
-            $subForms[$name] = clone $subForm;
-        }
-        $this->setSubForms($subForms);
-
-        $displayGroups = array();
-        foreach ($this->_displayGroups as $group)  {
-            $clone    = clone $group;
-            $elements = array();
-            foreach ($clone->getElements() as $name => $e) {
-                $elements[] = $this->getElement($name);
-            }
-            $clone->setElements($elements);
-            $displayGroups[] = $clone;
-        }
-        $this->setDisplayGroups($displayGroups);
-    }
-
-    /**
-     * Reset values of form
-     *
-     * @return Zend_Form
-     */
-    public function reset()
-    {
-        foreach ($this->getElements() as $element) {
-            $element->setValue(null);
-        }
-        foreach ($this->getSubForms() as $subForm) {
-            $subForm->reset();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Initialize form (used by extending classes)
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Set form state from options array
-     *
-     * @param  array $options
-     * @return Zend_Form
-     */
-    public function setOptions(array $options)
-    {
-        if (isset($options['prefixPath'])) {
-            $this->addPrefixPaths($options['prefixPath']);
-            unset($options['prefixPath']);
-        }
-
-        if (isset($options['elementPrefixPath'])) {
-            $this->addElementPrefixPaths($options['elementPrefixPath']);
-            unset($options['elementPrefixPath']);
-        }
-
-        if (isset($options['displayGroupPrefixPath'])) {
-            $this->addDisplayGroupPrefixPaths($options['displayGroupPrefixPath']);
-            unset($options['displayGroupPrefixPath']);
-        }
-
-        if (isset($options['elementDecorators'])) {
-            $this->_elementDecorators = $options['elementDecorators'];
-            unset($options['elementDecorators']);
-        }
-
-        if (isset($options['elements'])) {
-            $this->setElements($options['elements']);
-            unset($options['elements']);
-        }
-
-        if (isset($options['defaultDisplayGroupClass'])) {
-            $this->setDefaultDisplayGroupClass($options['defaultDisplayGroupClass']);
-            unset($options['defaultDisplayGroupClass']);
-        }
-
-        if (isset($options['displayGroupDecorators'])) {
-            $displayGroupDecorators = $options['displayGroupDecorators'];
-            unset($options['displayGroupDecorators']);
-        }
-
-        if (isset($options['elementsBelongTo'])) {
-            $elementsBelongTo = $options['elementsBelongTo'];
-            unset($options['elementsBelongTo']);
-        }
-
-        if (isset($options['attribs'])) {
-            $this->addAttribs($options['attribs']);
-            unset($options['attribs']);
-        }
-
-        $forbidden = array(
-            'Options', 'Config', 'PluginLoader', 'SubForms', 'View', 'Translator',
-            'Attrib', 'Default',
-        );
-
-        foreach ($options as $key => $value) {
-            $normalized = ucfirst($key);
-            if (in_array($normalized, $forbidden)) {
-                continue;
-            }
-
-            $method = 'set' . $normalized;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            } else {
-                $this->setAttrib($key, $value);
-            }
-        }
-
-        if (isset($displayGroupDecorators)) {
-            $this->setDisplayGroupDecorators($displayGroupDecorators);
-        }
-
-        if (isset($elementsBelongTo)) {
-            $this->setElementsBelongTo($elementsBelongTo);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set form state from config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Form
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-
-    // Loaders
-
-    /**
-     * Set plugin loaders for use with decorators and elements
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @param  string $type 'decorator' or 'element'
-     * @return Zend_Form
-     * @throws Zend_Form_Exception on invalid type
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type = null)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::DECORATOR:
-            case self::ELEMENT:
-                $this->_loaders[$type] = $loader;
-                return $this;
-            default:
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Retrieve plugin loader for given type
-     *
-     * $type may be one of:
-     * - decorator
-     * - element
-     *
-     * If a plugin loader does not exist for the given type, defaults are
-     * created.
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader_Interface
-     */
-    public function getPluginLoader($type = null)
-    {
-        $type = strtoupper($type);
-        if (!isset($this->_loaders[$type])) {
-            switch ($type) {
-                case self::DECORATOR:
-                    $prefixSegment = 'Form_Decorator';
-                    $pathSegment   = 'Form/Decorator';
-                    break;
-                case self::ELEMENT:
-                    $prefixSegment = 'Form_Element';
-                    $pathSegment   = 'Form/Element';
-                    break;
-                default:
-                    require_once 'Zend/Form/Exception.php';
-                    throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-            }
-
-            require_once 'Zend/Loader/PluginLoader.php';
-            $this->_loaders[$type] = new Zend_Loader_PluginLoader(
-                array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/')
-            );
-        }
-
-        return $this->_loaders[$type];
-    }
-
-    /**
-     * Add prefix path for plugin loader
-     *
-     * If no $type specified, assumes it is a base path for both filters and
-     * validators, and sets each according to the following rules:
-     * - decorators: $prefix = $prefix . '_Decorator'
-     * - elements: $prefix = $prefix . '_Element'
-     *
-     * Otherwise, the path prefix is set on the appropriate plugin loader.
-     *
-     * If $type is 'decorators', sets the path in the decorator plugin loader
-     * for all elements. Additionally, if no $type is provided,
-     * {@link Zend_Form_Element::addPrefixPath()} is called on each element.
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_Form
-     * @throws Zend_Form_Exception for invalid type
-     */
-    public function addPrefixPath($prefix, $path, $type = null)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::DECORATOR:
-            case self::ELEMENT:
-                $loader = $this->getPluginLoader($type);
-                $loader->addPrefixPath($prefix, $path);
-                return $this;
-            case null:
-                $prefix = rtrim($prefix, '_');
-                $path   = rtrim($path, DIRECTORY_SEPARATOR);
-                foreach (array(self::DECORATOR, self::ELEMENT) as $type) {
-                    $cType        = ucfirst(strtolower($type));
-                    $pluginPath   = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR;
-                    $pluginPrefix = $prefix . '_' . $cType;
-                    $loader       = $this->getPluginLoader($type);
-                    $loader->addPrefixPath($pluginPrefix, $pluginPath);
-                }
-                return $this;
-            default:
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Add many prefix paths at once
-     *
-     * @param  array $spec
-     * @return Zend_Form
-     */
-    public function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            return $this->addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $type => $paths) {
-            if (is_numeric($type) && is_array($paths)) {
-                $type = null;
-                if (isset($paths['prefix']) && isset($paths['path'])) {
-                    if (isset($paths['type'])) {
-                        $type = $paths['type'];
-                    }
-                    $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-                }
-            } elseif (!is_numeric($type)) {
-                if (!isset($paths['prefix']) || !isset($paths['path'])) {
-                    continue;
-                }
-                $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Add prefix path for all elements
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_Form
-     */
-    public function addElementPrefixPath($prefix, $path, $type = null)
-    {
-        $this->_elementPrefixPaths[] = array(
-            'prefix' => $prefix,
-            'path'   => $path,
-            'type'   => $type,
-        );
-
-        foreach ($this->getElements() as $element) {
-            $element->addPrefixPath($prefix, $path, $type);
-        }
-
-        foreach ($this->getSubForms() as $subForm) {
-            $subForm->addElementPrefixPath($prefix, $path, $type);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add prefix paths for all elements
-     *
-     * @param  array $spec
-     * @return Zend_Form
-     */
-    public function addElementPrefixPaths(array $spec)
-    {
-        $this->_elementPrefixPaths = $this->_elementPrefixPaths + $spec;
-
-        foreach ($this->getElements() as $element) {
-            $element->addPrefixPaths($spec);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add prefix path for all display groups
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Form
-     */
-    public function addDisplayGroupPrefixPath($prefix, $path)
-    {
-        $this->_displayGroupPrefixPaths[] = array(
-            'prefix' => $prefix,
-            'path'   => $path,
-        );
-
-        foreach ($this->getDisplayGroups() as $group) {
-            $group->addPrefixPath($prefix, $path);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add multiple display group prefix paths at once
-     *
-     * @param  array $spec
-     * @return Zend_Form
-     */
-    public function addDisplayGroupPrefixPaths(array $spec)
-    {
-        foreach ($spec as $key => $value) {
-            if (is_string($value) && !is_numeric($key)) {
-                $this->addDisplayGroupPrefixPath($key, $value);
-                continue;
-            }
-
-            if (is_string($value) && is_numeric($key)) {
-                continue;
-            }
-
-            if (is_array($value)) {
-                $count = count($value);
-                if (array_keys($value) === range(0, $count - 1)) {
-                    if ($count < 2) {
-                        continue;
-                    }
-                    $prefix = array_shift($value);
-                    $path   = array_shift($value);
-                    $this->addDisplayGroupPrefixPath($prefix, $path);
-                    continue;
-                }
-                if (array_key_exists('prefix', $value) && array_key_exists('path', $value)) {
-                    $this->addDisplayGroupPrefixPath($value['prefix'], $value['path']);
-                }
-            }
-        }
-        return $this;
-    }
-
-    // Form metadata:
-
-    /**
-     * Set form attribute
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Form
-     */
-    public function setAttrib($key, $value)
-    {
-        $key = (string) $key;
-        $this->_attribs[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * Add multiple form attributes at once
-     *
-     * @param  array $attribs
-     * @return Zend_Form
-     */
-    public function addAttribs(array $attribs)
-    {
-        foreach ($attribs as $key => $value) {
-            $this->setAttrib($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple form attributes at once
-     *
-     * Overwrites any previously set attributes.
-     *
-     * @param  array $attribs
-     * @return Zend_Form
-     */
-    public function setAttribs(array $attribs)
-    {
-        $this->clearAttribs();
-        return $this->addAttribs($attribs);
-    }
-
-    /**
-     * Retrieve a single form attribute
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getAttrib($key)
-    {
-        $key = (string) $key;
-        if (!isset($this->_attribs[$key])) {
-            return null;
-        }
-
-        return $this->_attribs[$key];
-    }
-
-    /**
-     * Retrieve all form attributes/metadata
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        return $this->_attribs;
-    }
-
-    /**
-     * Remove attribute
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function removeAttrib($key)
-    {
-        if (isset($this->_attribs[$key])) {
-            unset($this->_attribs[$key]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all form attributes
-     *
-     * @return Zend_Form
-     */
-    public function clearAttribs()
-    {
-        $this->_attribs = array();
-        return $this;
-    }
-
-    /**
-     * Set form action
-     *
-     * @param  string $action
-     * @return Zend_Form
-     */
-    public function setAction($action)
-    {
-        return $this->setAttrib('action', (string) $action);
-    }
-
-    /**
-     * Get form action
-     *
-     * Sets default to '' if not set.
-     *
-     * @return string
-     */
-    public function getAction()
-    {
-        $action = $this->getAttrib('action');
-        if (null === $action) {
-            $action = '';
-            $this->setAction($action);
-        }
-        return $action;
-    }
-
-    /**
-     * Set form method
-     *
-     * Only values in {@link $_methods()} allowed
-     *
-     * @param  string $method
-     * @return Zend_Form
-     * @throws Zend_Form_Exception
-     */
-    public function setMethod($method)
-    {
-        $method = strtolower($method);
-        if (!in_array($method, $this->_methods)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('"%s" is an invalid form method', $method));
-        }
-        $this->setAttrib('method', $method);
-        return $this;
-    }
-
-    /**
-     * Retrieve form method
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        if (null === ($method = $this->getAttrib('method'))) {
-            $method = self::METHOD_POST;
-            $this->setAttrib('method', $method);
-        }
-        return strtolower($method);
-    }
-
-    /**
-     * Set encoding type
-     *
-     * @param  string $value
-     * @return Zend_Form
-     */
-    public function setEnctype($value)
-    {
-        $this->setAttrib('enctype', $value);
-        return $this;
-    }
-
-    /**
-     * Get encoding type
-     *
-     * @return string
-     */
-    public function getEnctype()
-    {
-        if (null === ($enctype = $this->getAttrib('enctype'))) {
-            $enctype = self::ENCTYPE_URLENCODED;
-            $this->setAttrib('enctype', $enctype);
-        }
-        return $this->getAttrib('enctype');
-    }
-
-    /**
-     * Filter a name to only allow valid variable characters
-     *
-     * @param  string $value
-     * @param  bool $allowBrackets
-     * @return string
-     */
-    public function filterName($value, $allowBrackets = false)
-    {
-        $charset = '^a-zA-Z0-9_\x7f-\xff';
-        if ($allowBrackets) {
-            $charset .= '\[\]';
-        }
-        return preg_replace('/[' . $charset . ']/', '', (string) $value);
-    }
-
-    /**
-     * Set form name
-     *
-     * @param  string $name
-     * @return Zend_Form
-     */
-    public function setName($name)
-    {
-        $name = $this->filterName($name);
-        if (('0' !== $name) && empty($name)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty');
-        }
-
-        return $this->setAttrib('name', $name);
-    }
-
-    /**
-     * Get name attribute
-     *
-     * @return null|string
-     */
-    public function getName()
-    {
-        return $this->getAttrib('name');
-    }
-
-    /**
-     * Get fully qualified name
-     *
-     * Places name as subitem of array and/or appends brackets.
-     *
-     * @return string
-     */
-    public function getFullyQualifiedName()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Get element id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (null !== ($id = $this->getAttrib('id'))) {
-            return $id;
-        }
-
-        $id = $this->getFullyQualifiedName();
-
-        // Bail early if no array notation detected
-        if (!strstr($id, '[')) {
-            return $id;
-        }
-
-        // Strip array notation
-        if ('[]' == substr($id, -2)) {
-            $id = substr($id, 0, strlen($id) - 2);
-        }
-        $id = str_replace('][', '-', $id);
-        $id = str_replace(array(']', '['), '-', $id);
-        $id = trim($id, '-');
-
-        return $id;
-    }
-
-    /**
-     * Set form legend
-     *
-     * @param  string $value
-     * @return Zend_Form
-     */
-    public function setLegend($value)
-    {
-        $this->_legend = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Get form legend
-     *
-     * @return string
-     */
-    public function getLegend()
-    {
-        return $this->_legend;
-    }
-
-    /**
-     * Set form description
-     *
-     * @param  string $value
-     * @return Zend_Form
-     */
-    public function setDescription($value)
-    {
-        $this->_description = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Retrieve form description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set form order
-     *
-     * @param  int $index
-     * @return Zend_Form
-     */
-    public function setOrder($index)
-    {
-        $this->_formOrder = (int) $index;
-        return $this;
-    }
-
-    /**
-     * Get form order
-     *
-     * @return int|null
-     */
-    public function getOrder()
-    {
-        return $this->_formOrder;
-    }
-
-    // Element interaction:
-
-    /**
-     * Add a new element
-     *
-     * $element may be either a string element type, or an object of type
-     * Zend_Form_Element. If a string element type is provided, $name must be
-     * provided, and $options may be optionally provided for configuring the
-     * element.
-     *
-     * If a Zend_Form_Element is provided, $name may be optionally provided,
-     * and any provided $options will be ignored.
-     *
-     * @param  string|Zend_Form_Element $element
-     * @param  string $name
-     * @param  array|Zend_Config $options
-     * @return Zend_Form
-     */
-    public function addElement($element, $name = null, $options = null)
-    {
-        if (is_string($element)) {
-            if (null === $name) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Elements specified by string must have an accompanying name');
-            }
-
-            if (is_array($this->_elementDecorators)) {
-                if (null === $options) {
-                    $options = array('decorators' => $this->_elementDecorators);
-                } elseif ($options instanceof Zend_Config) {
-                    $options = $options->toArray();
-                }
-                if (is_array($options)
-                    && !array_key_exists('decorators', $options)
-                ) {
-                    $options['decorators'] = $this->_elementDecorators;
-                }
-            }
-
-            $this->_elements[$name] = $this->createElement($element, $name, $options);
-        } elseif ($element instanceof Zend_Form_Element) {
-            $prefixPaths              = array();
-            $prefixPaths['decorator'] = $this->getPluginLoader('decorator')->getPaths();
-            if (!empty($this->_elementPrefixPaths)) {
-                $prefixPaths = array_merge($prefixPaths, $this->_elementPrefixPaths);
-            }
-
-            if (null === $name) {
-                $name = $element->getName();
-            }
-
-            $this->_elements[$name] = $element;
-            $this->_elements[$name]->addPrefixPaths($prefixPaths);
-        }
-
-        $this->_order[$name] = $this->_elements[$name]->getOrder();
-        $this->_orderUpdated = true;
-        $this->_setElementsBelongTo($name);
-
-        return $this;
-    }
-
-    /**
-     * Create an element
-     *
-     * Acts as a factory for creating elements. Elements created with this
-     * method will not be attached to the form, but will contain element
-     * settings as specified in the form object (including plugin loader
-     * prefix paths, default decorators, etc.).
-     *
-     * @param  string $type
-     * @param  string $name
-     * @param  array|Zend_Config $options
-     * @return Zend_Form_Element
-     */
-    public function createElement($type, $name, $options = null)
-    {
-        if (!is_string($type)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Element type must be a string indicating type');
-        }
-
-        if (!is_string($name)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Element name must be a string');
-        }
-
-        $prefixPaths              = array();
-        $prefixPaths['decorator'] = $this->getPluginLoader('decorator')->getPaths();
-        if (!empty($this->_elementPrefixPaths)) {
-            $prefixPaths = array_merge($prefixPaths, $this->_elementPrefixPaths);
-        }
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if ((null === $options) || !is_array($options)) {
-            $options = array('prefixPath' => $prefixPaths);
-        } elseif (is_array($options)) {
-            if (array_key_exists('prefixPath', $options)) {
-                $options['prefixPath'] = array_merge($prefixPaths, $options['prefixPath']);
-            } else {
-                $options['prefixPath'] = $prefixPaths;
-            }
-        }
-
-        $class = $this->getPluginLoader(self::ELEMENT)->load($type);
-        $element = new $class($name, $options);
-
-        return $element;
-    }
-
-    /**
-     * Add multiple elements at once
-     *
-     * @param  array $elements
-     * @return Zend_Form
-     */
-    public function addElements(array $elements)
-    {
-        foreach ($elements as $key => $spec) {
-            $name = null;
-            if (!is_numeric($key)) {
-                $name = $key;
-            }
-
-            if (is_string($spec) || ($spec instanceof Zend_Form_Element)) {
-                $this->addElement($spec, $name);
-                continue;
-            }
-
-            if (is_array($spec)) {
-                $argc = count($spec);
-                $options = array();
-                if (isset($spec['type'])) {
-                    $type = $spec['type'];
-                    if (isset($spec['name'])) {
-                        $name = $spec['name'];
-                    }
-                    if (isset($spec['options'])) {
-                        $options = $spec['options'];
-                    }
-                    $this->addElement($type, $name, $options);
-                } else {
-                    switch ($argc) {
-                        case 0:
-                            continue;
-                        case (1 <= $argc):
-                            $type = array_shift($spec);
-                        case (2 <= $argc):
-                            if (null === $name) {
-                                $name = array_shift($spec);
-                            } else {
-                                $options = array_shift($spec);
-                            }
-                        case (3 <= $argc):
-                            if (empty($options)) {
-                                $options = array_shift($spec);
-                            }
-                        default:
-                            $this->addElement($type, $name, $options);
-                    }
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set form elements (overwrites existing elements)
-     *
-     * @param  array $elements
-     * @return Zend_Form
-     */
-    public function setElements(array $elements)
-    {
-        $this->clearElements();
-        return $this->addElements($elements);
-    }
-
-    /**
-     * Retrieve a single element
-     *
-     * @param  string $name
-     * @return Zend_Form_Element|null
-     */
-    public function getElement($name)
-    {
-        if (array_key_exists($name, $this->_elements)) {
-            return $this->_elements[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all elements
-     *
-     * @return array
-     */
-    public function getElements()
-    {
-        return $this->_elements;
-    }
-
-    /**
-     * Remove element
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function removeElement($name)
-    {
-        $name = (string) $name;
-        if (isset($this->_elements[$name])) {
-            unset($this->_elements[$name]);
-            if (array_key_exists($name, $this->_order)) {
-                unset($this->_order[$name]);
-                $this->_orderUpdated = true;
-            } else {
-                foreach ($this->_displayGroups as $group) {
-                    if (null !== $group->getElement($name)) {
-                        $group->removeElement($name);
-                    }
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove all form elements
-     *
-     * @return Zend_Form
-     */
-    public function clearElements()
-    {
-        foreach (array_keys($this->_elements) as $key) {
-            if (array_key_exists($key, $this->_order)) {
-                unset($this->_order[$key]);
-            }
-        }
-        $this->_elements     = array();
-        $this->_orderUpdated = true;
-        return $this;
-    }
-
-    /**
-     * Set default values for elements
-     *
-     * Sets values for all elements specified in the array of $defaults.
-     *
-     * @param  array $defaults
-     * @return Zend_Form
-     */
-    public function setDefaults(array $defaults)
-    {
-        if ($this->isArray()) {
-            $defaults = $this->_dissolveArrayValue($defaults, $this->getElementsBelongTo());
-        }
-        foreach ($this->getElements() as $name => $element) {
-            if (array_key_exists($name, $defaults)) {
-                $this->setDefault($name, $defaults[$name]);
-            }
-        }
-        foreach ($this->getSubForms() as $name => $form) {
-            if (!$form->isArray() && array_key_exists($name, $defaults)) {
-                $form->setDefaults($defaults[$name]);
-            } else {
-                $form->setDefaults($defaults);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set default value for an element
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Form
-     */
-    public function setDefault($name, $value)
-    {
-        $name = (string) $name;
-        if ($element = $this->getElement($name)) {
-            $element->setValue($value);
-        } else {
-            if (is_scalar($value)) {
-                foreach ($this->getSubForms() as $subForm) {
-                    $subForm->setDefault($name, $value);
-                }
-            } elseif (is_array($value) && ($subForm = $this->getSubForm($name))) {
-                $subForm->setDefaults($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve value for single element
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getValue($name)
-    {
-        if ($element = $this->getElement($name)) {
-            return $element->getValue();
-        }
-
-        if ($subForm = $this->getSubForm($name)) {
-            return $subForm->getValues(true);
-        }
-
-        foreach ($this->getSubForms() as $subForm) {
-            if ($name == $subForm->getElementsBelongTo()) {
-                return $subForm->getValues(true);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all form element values
-     *
-     * @param  bool $suppressArrayNotation
-     * @return array
-     */
-    public function getValues($suppressArrayNotation = false)
-    {
-        $values = array();
-        foreach ($this->getElements() as $key => $element) {
-            if (!$element->getIgnore()) {
-                $values[$key] = $element->getValue();
-            }
-        }
-        foreach ($this->getSubForms() as $key => $subForm) {
-            $fValues = $this->_attachToArray($subForm->getValues(true), $subForm->getElementsBelongTo());
-            $values = array_merge($values, $fValues);
-        }
-
-        if (!$suppressArrayNotation && $this->isArray()) {
-            $values = $this->_attachToArray($values, $this->getElementsBelongTo());
-        }
-
-        return $values;
-    }
-
-    /**
-     * Returns only the valid values from the given form input.
-     *
-     * For models that can be saved in a partially valid state, for example when following the builder,
-     * prototype or state patterns it is particularly interessting to retrieve all the current valid
-     * values to persist them.
-     *
-     * @param  array $data
-     * @param  bool $suppressArrayNotation
-     * @return array
-     */
-    public function getValidValues($data, $suppressArrayNotation = false)
-    {
-        if ($this->isArray()) {
-            $data = $this->_dissolveArrayValue($data, $this->getElementsBelongTo());
-        }
-        $values = array();
-        foreach ($this->getElements() as $key => $element) {
-            if (isset($data[$key])) {
-                if($element->isValid($data[$key], $data)) {
-                    $values[$key] = $element->getValue();
-                }
-            }
-        }
-        foreach ($this->getSubForms() as $key => $form) {
-            if (isset($data[$key]) && !$form->isArray()) {
-                $tmp = $form->getValidValues($data[$key]);
-                if (!empty($tmp)) {
-                    $values[$key] = $tmp;
-                }
-            } else {
-                $tmp = $form->getValidValues($data, true);
-                if (!empty($tmp)) {
-                    $fValues = $this->_attachToArray($tmp, $form->getElementsBelongTo());
-                    $values = array_merge($values, $fValues);
-                }
-            }
-        }
-        if (!$suppressArrayNotation && $this->isArray() && !empty($values)) {
-            $values = $this->_attachToArray($values, $this->getElementsBelongTo());
-        }
-
-        return $values;
-    }
-
-    /**
-     * Get unfiltered element value
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getUnfilteredValue($name)
-    {
-        if ($element = $this->getElement($name)) {
-            return $element->getUnfilteredValue();
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all unfiltered element values
-     *
-     * @return array
-     */
-    public function getUnfilteredValues()
-    {
-        $values = array();
-        foreach ($this->getElements() as $key => $element) {
-            $values[$key] = $element->getUnfilteredValue();
-        }
-
-        return $values;
-    }
-
-    /**
-     * Set all elements' filters
-     *
-     * @param  array $filters
-     * @return Zend_Form
-     */
-    public function setElementFilters(array $filters)
-    {
-        foreach ($this->getElements() as $element) {
-            $element->setFilters($filters);
-        }
-        return $this;
-    }
-
-    /**
-     * Set name of array elements belong to
-     *
-     * @param  string $array
-     * @return Zend_Form
-     */
-    public function setElementsBelongTo($array)
-    {
-        $origName = $this->getElementsBelongTo();
-        $name = $this->filterName($array, true);
-        if (empty($name)) {
-            $name = null;
-        }
-        $this->_elementsBelongTo = $name;
-
-        if (null === $name) {
-            $this->setIsArray(false);
-            if (null !== $origName) {
-                $this->_setElementsBelongTo();
-            }
-        } else {
-            $this->setIsArray(true);
-            $this->_setElementsBelongTo();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set array to which elements belong
-     *
-     * @param  string $name Element name
-     * @return void
-     */
-    protected function _setElementsBelongTo($name = null)
-    {
-        $array = $this->getElementsBelongTo();
-
-        if (null === $array) {
-            return;
-        }
-
-        if (null === $name) {
-            foreach ($this->getElements() as $element) {
-                $element->setBelongsTo($array);
-            }
-        } else {
-            if (null !== ($element = $this->getElement($name))) {
-                $element->setBelongsTo($array);
-            }
-        }
-    }
-
-    /**
-     * Get name of array elements belong to
-     *
-     * @return string|null
-     */
-    public function getElementsBelongTo()
-    {
-        if ((null === $this->_elementsBelongTo) && $this->isArray()) {
-            $name = $this->getName();
-            if (!empty($name)) {
-                return $name;
-            }
-        }
-        return $this->_elementsBelongTo;
-    }
-
-    /**
-     * Set flag indicating elements belong to array
-     *
-     * @param  bool $flag Value of flag
-     * @return Zend_Form
-     */
-    public function setIsArray($flag)
-    {
-        $this->_isArray = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get flag indicating if elements belong to an array
-     *
-     * @return bool
-     */
-    public function isArray()
-    {
-        return $this->_isArray;
-    }
-
-    // Element groups:
-
-    /**
-     * Add a form group/subform
-     *
-     * @param  Zend_Form $form
-     * @param  string $name
-     * @param  int $order
-     * @return Zend_Form
-     */
-    public function addSubForm(Zend_Form $form, $name, $order = null)
-    {
-        $name = (string) $name;
-        foreach ($this->_loaders as $type => $loader) {
-            $loaderPaths = $loader->getPaths();
-            foreach ($loaderPaths as $prefix => $paths) {
-                foreach ($paths as $path) {
-                    $form->addPrefixPath($prefix, $path, $type);
-                }
-            }
-        }
-
-        if (!empty($this->_elementPrefixPaths)) {
-            foreach ($this->_elementPrefixPaths as $spec) {
-                list($prefix, $path, $type) = array_values($spec);
-                $form->addElementPrefixPath($prefix, $path, $type);
-            }
-        }
-
-        if (!empty($this->_displayGroupPrefixPaths)) {
-            foreach ($this->_displayGroupPrefixPaths as $spec) {
-                list($prefix, $path) = array_values($spec);
-                $form->addDisplayGroupPrefixPath($prefix, $path);
-            }
-        }
-
-        if (null !== $order) {
-            $form->setOrder($order);
-        }
-
-        $form->setName($name);
-        $this->_subForms[$name] = $form;
-        $this->_order[$name]    = $order;
-        $this->_orderUpdated    = true;
-        return $this;
-    }
-
-    /**
-     * Add multiple form subForms/subforms at once
-     *
-     * @param  array $subForms
-     * @return Zend_Form
-     */
-    public function addSubForms(array $subForms)
-    {
-        foreach ($subForms as $key => $spec) {
-            $name = null;
-            if (!is_numeric($key)) {
-                $name = $key;
-            }
-
-            if ($spec instanceof Zend_Form) {
-                $this->addSubForm($spec, $name);
-                continue;
-            }
-
-            if (is_array($spec)) {
-                $argc  = count($spec);
-                $order = null;
-                switch ($argc) {
-                    case 0:
-                        continue;
-                    case (1 <= $argc):
-                        $subForm = array_shift($spec);
-                    case (2 <= $argc):
-                        $name  = array_shift($spec);
-                    case (3 <= $argc):
-                        $order = array_shift($spec);
-                    default:
-                        $this->addSubForm($subForm, $name, $order);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple form subForms/subforms (overwrites)
-     *
-     * @param  array $subForms
-     * @return Zend_Form
-     */
-    public function setSubForms(array $subForms)
-    {
-        $this->clearSubForms();
-        return $this->addSubForms($subForms);
-    }
-
-    /**
-     * Retrieve a form subForm/subform
-     *
-     * @param  string $name
-     * @return Zend_Form|null
-     */
-    public function getSubForm($name)
-    {
-        $name = (string) $name;
-        if (isset($this->_subForms[$name])) {
-            return $this->_subForms[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve all form subForms/subforms
-     *
-     * @return array
-     */
-    public function getSubForms()
-    {
-        return $this->_subForms;
-    }
-
-    /**
-     * Remove form subForm/subform
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function removeSubForm($name)
-    {
-        $name = (string) $name;
-        if (array_key_exists($name, $this->_subForms)) {
-            unset($this->_subForms[$name]);
-            if (array_key_exists($name, $this->_order)) {
-                unset($this->_order[$name]);
-                $this->_orderUpdated = true;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove all form subForms/subforms
-     *
-     * @return Zend_Form
-     */
-    public function clearSubForms()
-    {
-        foreach (array_keys($this->_subForms) as $key) {
-            if (array_key_exists($key, $this->_order)) {
-                unset($this->_order[$key]);
-            }
-        }
-        $this->_subForms     = array();
-        $this->_orderUpdated = true;
-        return $this;
-    }
-
-
-    // Display groups:
-
-    /**
-     * Set default display group class
-     *
-     * @param  string $class
-     * @return Zend_Form
-     */
-    public function setDefaultDisplayGroupClass($class)
-    {
-        $this->_defaultDisplayGroupClass = (string) $class;
-        return $this;
-    }
-
-    /**
-     * Retrieve default display group class
-     *
-     * @return string
-     */
-    public function getDefaultDisplayGroupClass()
-    {
-        return $this->_defaultDisplayGroupClass;
-    }
-
-    /**
-     * Add a display group
-     *
-     * Groups named elements for display purposes.
-     *
-     * If a referenced element does not yet exist in the form, it is omitted.
-     *
-     * @param  array $elements
-     * @param  string $name
-     * @param  array|Zend_Config $options
-     * @return Zend_Form
-     * @throws Zend_Form_Exception if no valid elements provided
-     */
-    public function addDisplayGroup(array $elements, $name, $options = null)
-    {
-        $group = array();
-        foreach ($elements as $element) {
-            if (isset($this->_elements[$element])) {
-                $add = $this->getElement($element);
-                if (null !== $add) {
-                    unset($this->_order[$element]);
-                    $group[] = $add;
-                }
-            }
-        }
-        if (empty($group)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('No valid elements specified for display group');
-        }
-
-        $name = (string) $name;
-
-        if (is_array($options)) {
-            $options['elements'] = $group;
-        } elseif ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-            $options['elements'] = $group;
-        } else {
-            $options = array('elements' => $group);
-        }
-
-        if (isset($options['displayGroupClass'])) {
-            $class = $options['displayGroupClass'];
-            unset($options['displayGroupClass']);
-        } else {
-            $class = $this->getDefaultDisplayGroupClass();
-        }
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-        $this->_displayGroups[$name] = new $class(
-            $name,
-            $this->getPluginLoader(self::DECORATOR),
-            $options
-        );
-
-        if (!empty($this->_displayGroupPrefixPaths)) {
-            $this->_displayGroups[$name]->addPrefixPaths($this->_displayGroupPrefixPaths);
-        }
-
-        $this->_order[$name] = $this->_displayGroups[$name]->getOrder();
-        $this->_orderUpdated = true;
-        return $this;
-    }
-
-    /**
-     * Add a display group object (used with cloning)
-     *
-     * @param  Zend_Form_DisplayGroup $group
-     * @param  string|null $name
-     * @return Zend_Form
-     */
-    protected function _addDisplayGroupObject(Zend_Form_DisplayGroup $group, $name = null)
-    {
-        if (null === $name) {
-            $name = $group->getName();
-            if (empty($name)) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid display group added; requires name');
-            }
-        }
-
-        $this->_displayGroups[$name] = $group;
-
-        if (!empty($this->_displayGroupPrefixPaths)) {
-            $this->_displayGroups[$name]->addPrefixPaths($this->_displayGroupPrefixPaths);
-        }
-
-        $this->_order[$name] = $this->_displayGroups[$name]->getOrder();
-        $this->_orderUpdated = true;
-        return $this;
-    }
-
-    /**
-     * Add multiple display groups at once
-     *
-     * @param  array $groups
-     * @return Zend_Form
-     */
-    public function addDisplayGroups(array $groups)
-    {
-        foreach ($groups as $key => $spec) {
-            $name = null;
-            if (!is_numeric($key)) {
-                $name = $key;
-            }
-
-            if ($spec instanceof Zend_Form_DisplayGroup) {
-                $this->_addDisplayGroupObject($spec);
-            }
-
-            if (!is_array($spec) || empty($spec)) {
-                continue;
-            }
-
-            $argc    = count($spec);
-            $options = array();
-
-            if (isset($spec['elements'])) {
-                $elements = $spec['elements'];
-                if (isset($spec['name'])) {
-                    $name = $spec['name'];
-                }
-                if (isset($spec['options'])) {
-                    $options = $spec['options'];
-                }
-                $this->addDisplayGroup($elements, $name, $options);
-            } else {
-                switch ($argc) {
-                    case (1 <= $argc):
-                        $elements = array_shift($spec);
-                        if (!is_array($elements) && (null !== $name)) {
-                            $elements = array_merge((array) $elements, $spec);
-                            $this->addDisplayGroup($elements, $name);
-                            break;
-                        }
-                    case (2 <= $argc):
-                        if (null !== $name) {
-                            $options = array_shift($spec);
-                            $this->addDisplayGroup($elements, $name, $options);
-                            break;
-                        }
-                        $name = array_shift($spec);
-                    case (3 <= $argc):
-                        $options = array_shift($spec);
-                    default:
-                        $this->addDisplayGroup($elements, $name, $options);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Add multiple display groups (overwrites)
-     *
-     * @param  array $groups
-     * @return Zend_Form
-     */
-    public function setDisplayGroups(array $groups)
-    {
-        return $this->clearDisplayGroups()
-                    ->addDisplayGroups($groups);
-    }
-
-    /**
-     * Return a display group
-     *
-     * @param  string $name
-     * @return Zend_Form_DisplayGroup|null
-     */
-    public function getDisplayGroup($name)
-    {
-        $name = (string) $name;
-        if (isset($this->_displayGroups[$name])) {
-            return $this->_displayGroups[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Return all display groups
-     *
-     * @return array
-     */
-    public function getDisplayGroups()
-    {
-        return $this->_displayGroups;
-    }
-
-    /**
-     * Remove a display group by name
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function removeDisplayGroup($name)
-    {
-        $name = (string) $name;
-        if (array_key_exists($name, $this->_displayGroups)) {
-            foreach ($this->_displayGroups[$name] as $key => $element) {
-                if (array_key_exists($key, $this->_elements)) {
-                    $this->_order[$key]  = $element->getOrder();
-                    $this->_orderUpdated = true;
-                }
-            }
-            unset($this->_displayGroups[$name]);
-
-            if (array_key_exists($name, $this->_order)) {
-                unset($this->_order[$name]);
-                $this->_orderUpdated = true;
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove all display groups
-     *
-     * @return Zend_Form
-     */
-    public function clearDisplayGroups()
-    {
-        foreach ($this->_displayGroups as $key => $group) {
-            if (array_key_exists($key, $this->_order)) {
-                unset($this->_order[$key]);
-            }
-            foreach ($group as $name => $element) {
-                if (isset($this->_elements[$name])) {
-                    $this->_order[$name] = $element->getOrder();
-                }
-                $this->_order[$name] = $element->getOrder();
-            }
-        }
-        $this->_displayGroups = array();
-        $this->_orderUpdated  = true;
-        return $this;
-    }
-
-
-    // Processing
-
-    /**
-     * Populate form
-     *
-     * Proxies to {@link setDefaults()}
-     *
-     * @param  array $values
-     * @return Zend_Form
-     */
-    public function populate(array $values)
-    {
-        return $this->setDefaults($values);
-    }
-
-    /**
-     * Determine array key name from given value
-     *
-     * Given a value such as foo[bar][baz], returns the last element (in this case, 'baz').
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _getArrayName($value)
-    {
-        if (empty($value) || !is_string($value)) {
-            return $value;
-        }
-
-        if (!strstr($value, '[')) {
-            return $value;
-        }
-
-        $endPos = strlen($value) - 1;
-        if (']' != $value[$endPos]) {
-            return $value;
-        }
-
-        $start = strrpos($value, '[') + 1;
-        $name = substr($value, $start, $endPos - $start);
-        return $name;
-    }
-
-    /**
-     * Extract the value by walking the array using given array path.
-     *
-     * Given an array path such as foo[bar][baz], returns the value of the last
-     * element (in this case, 'baz').
-     *
-     * @param  array $value Array to walk
-     * @param  string $arrayPath Array notation path of the part to extract
-     * @return string
-     */
-    protected function _dissolveArrayValue($value, $arrayPath)
-    {
-        // As long as we have more levels
-        while ($arrayPos = strpos($arrayPath, '[')) {
-            // Get the next key in the path
-            $arrayKey = trim(substr($arrayPath, 0, $arrayPos), ']');
-
-            // Set the potentially final value or the next search point in the array
-            if (isset($value[$arrayKey])) {
-                $value = $value[$arrayKey];
-            }
-
-            // Set the next search point in the path
-            $arrayPath = trim(substr($arrayPath, $arrayPos + 1), ']');
-        }
-
-        if (isset($value[$arrayPath])) {
-            $value = $value[$arrayPath];
-        }
-
-        return $value;
-    }
-
-    /**
-     * Converts given arrayPath to an array and attaches given value at the end of it.
-     *
-     * @param  mixed $value The value to attach
-     * @param  string $arrayPath Given array path to convert and attach to.
-     * @return array
-     */
-    protected function _attachToArray($value, $arrayPath)
-    {
-        // As long as we have more levels
-        while ($arrayPos = strrpos($arrayPath, '[')) {
-            // Get the next key in the path
-            $arrayKey = trim(substr($arrayPath, $arrayPos + 1), ']');
-
-            // Attach
-            $value = array($arrayKey => $value);
-
-            // Set the next search point in the path
-            $arrayPath = trim(substr($arrayPath, 0, $arrayPos), ']');
-        }
-
-        $value = array($arrayPath => $value);
-
-        return $value;
-    }
-
-    /**
-     * Validate the form
-     *
-     * @param  array $data
-     * @return boolean
-     */
-    public function isValid($data)
-    {
-        if (!is_array($data)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(__CLASS__ . '::' . __METHOD__ . ' expects an array');
-        }
-        $translator = $this->getTranslator();
-        $valid      = true;
-
-        if ($this->isArray()) {
-            $data = $this->_dissolveArrayValue($data, $this->getElementsBelongTo());
-        }
-
-        foreach ($this->getElements() as $key => $element) {
-            if (null !== $translator && !$element->hasTranslator()) {
-                $element->setTranslator($translator);
-            }
-            if (!isset($data[$key])) {
-                $valid = $element->isValid(null, $data) && $valid;
-            } else {
-                $valid = $element->isValid($data[$key], $data) && $valid;
-            }
-        }
-        foreach ($this->getSubForms() as $key => $form) {
-            if (null !== $translator && !$form->hasTranslator()) {
-                $form->setTranslator($translator);
-            }
-            if (isset($data[$key]) && !$form->isArray()) {
-                $valid = $form->isValid($data[$key]) && $valid;
-            } else {
-                $valid = $form->isValid($data) && $valid;
-            }
-        }
-
-        $this->_errorsExist = !$valid;
-
-        // If manually flagged as an error, return invalid status
-        if ($this->_errorsForced) {
-            return false;
-        }
-
-        return $valid;
-    }
-
-    /**
-     * Validate a partial form
-     *
-     * Does not check for required flags.
-     *
-     * @param  array $data
-     * @return boolean
-     */
-    public function isValidPartial(array $data)
-    {
-        if ($this->isArray()) {
-            $data = $this->_dissolveArrayValue($data, $this->getElementsBelongTo());
-        }
-
-        $translator        = $this->getTranslator();
-        $valid             = true;
-
-        foreach ($this->getElements() as $key => $element) {
-            if (isset($data[$key])) {
-                if (null !== $translator && !$element->hasTranslator()) {
-                    $element->setTranslator($translator);
-                }
-                $valid = $element->isValid($data[$key], $data) && $valid;
-            }
-        }
-        foreach ($this->getSubForms() as $key => $form) {
-            if (null !== $translator && !$form->hasTranslator()) {
-                $form->setTranslator($translator);
-            }
-            if (isset($data[$key]) && !$form->isArray()) {
-                $valid = $form->isValidPartial($data[$key]) && $valid;
-            } else {
-                $valid = $form->isValidPartial($data) && $valid;
-            }
-        }
-
-        $this->_errorsExist = !$valid;
-        return $valid;
-    }
-
-    /**
-     * Process submitted AJAX data
-     *
-     * Checks if provided $data is valid, via {@link isValidPartial()}. If so,
-     * it returns JSON-encoded boolean true. If not, it returns JSON-encoded
-     * error messages (as returned by {@link getMessages()}).
-     *
-     * @param  array $data
-     * @return string JSON-encoded boolean true or error messages
-     */
-    public function processAjax(array $data)
-    {
-        require_once 'Zend/Json.php';
-        if ($this->isValidPartial($data)) {
-            return Zend_Json::encode(true);
-        }
-        $messages = $this->getMessages();
-        return Zend_Json::encode($messages);
-    }
-
-    /**
-     * Add a custom error message to return in the event of failed validation
-     *
-     * @param  string $message
-     * @return Zend_Form
-     */
-    public function addErrorMessage($message)
-    {
-        $this->_errorMessages[] = (string) $message;
-        return $this;
-    }
-
-    /**
-     * Add multiple custom error messages to return in the event of failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form
-     */
-    public function addErrorMessages(array $messages)
-    {
-        foreach ($messages as $message) {
-            $this->addErrorMessage($message);
-        }
-        return $this;
-    }
-
-    /**
-     * Same as addErrorMessages(), but clears custom error message stack first
-     *
-     * @param  array $messages
-     * @return Zend_Form
-     */
-    public function setErrorMessages(array $messages)
-    {
-        $this->clearErrorMessages();
-        return $this->addErrorMessages($messages);
-    }
-
-    /**
-     * Retrieve custom error messages
-     *
-     * @return array
-     */
-    public function getErrorMessages()
-    {
-        return $this->_errorMessages;
-    }
-
-    /**
-     * Clear custom error messages stack
-     *
-     * @return Zend_Form
-     */
-    public function clearErrorMessages()
-    {
-        $this->_errorMessages = array();
-        return $this;
-    }
-
-    /**
-     * Mark the element as being in a failed validation state
-     *
-     * @return Zend_Form
-     */
-    public function markAsError()
-    {
-        $this->_errorsExist  = true;
-        $this->_errorsForced = true;
-        return $this;
-    }
-
-    /**
-     * Add an error message and mark element as failed validation
-     *
-     * @param  string $message
-     * @return Zend_Form
-     */
-    public function addError($message)
-    {
-        $this->addErrorMessage($message);
-        $this->markAsError();
-        return $this;
-    }
-
-    /**
-     * Add multiple error messages and flag element as failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form
-     */
-    public function addErrors(array $messages)
-    {
-        foreach ($messages as $message) {
-            $this->addError($message);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite any previously set error messages and flag as failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form
-     */
-    public function setErrors(array $messages)
-    {
-        $this->clearErrorMessages();
-        return $this->addErrors($messages);
-    }
-
-
-    public function persistData()
-    {
-    }
-
-    /**
-     * Are there errors in the form?
-     *
-     * @return bool
-     */
-    public function isErrors()
-    {
-        return $this->_errorsExist;
-    }
-
-    /**
-     * Get error codes for all elements failing validation
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getErrors($name = null)
-    {
-        $errors = array();
-        if ((null !== $name) && isset($this->_elements[$name])) {
-            $errors = $this->getElement($name)->getErrors();
-        } elseif ((null !== $name) && isset($this->_subForms[$name])) {
-            $errors = $this->getSubForm($name)->getErrors();
-        } else {
-            foreach ($this->_elements as $key => $element) {
-                $errors[$key] = $element->getErrors();
-            }
-            foreach ($this->getSubForms() as $key => $subForm) {
-                $fErrors = $this->_attachToArray($subForm->getErrors(), $subForm->getElementsBelongTo());
-                $errors = array_merge($errors, $fErrors);
-            }
-        }
-        return $errors;
-    }
-
-    /**
-     * Retrieve error messages from elements failing validations
-     *
-     * @param  string $name
-     * @param  bool $suppressArrayNotation
-     * @return array
-     */
-    public function getMessages($name = null, $suppressArrayNotation = false)
-    {
-        if ((null !== $name) && isset($this->_elements[$name])) {
-            return $this->getElement($name)->getMessages();
-        }
-
-        if ((null !== $name) && isset($this->_subForms[$name])) {
-            return $this->getSubForm($name)->getMessages(null, true);
-        }
-
-        $arrayKeys = array();
-        foreach ($this->getSubForms() as $key => $subForm) {
-            $array = $this->_getArrayName($subForm->getElementsBelongTo());
-            if (!empty($array)) {
-                if ($name == $array) {
-                    return $subForm->getMessages(null, true);
-                }
-                $arrayKeys[$key] = $subForm->getElementsBelongTo();
-            }
-        }
-
-        $customMessages = $this->_getErrorMessages();
-        if ($this->isErrors() && !empty($customMessages)) {
-            return $customMessages;
-        }
-
-        $messages = array();
-
-        foreach ($this->getElements() as $name => $element) {
-            $eMessages = $element->getMessages();
-            if (!empty($eMessages)) {
-                $messages[$name] = $eMessages;
-            }
-        }
-
-        foreach ($this->getSubForms() as $key => $subForm) {
-            $fMessages = $subForm->getMessages(null, true);
-            if (!empty($fMessages)) {
-                if (array_key_exists($key, $arrayKeys)) {
-                    $fMessages = $this->_attachToArray($fMessages, $arrayKeys[$key]);
-                    $messages = array_merge($messages, $fMessages);
-                } else {
-                    $messages[$key] = $fMessages;
-                }
-            }
-        }
-
-        if (!$suppressArrayNotation && $this->isArray()) {
-            $messages = $this->_attachToArray($messages, $this->getElementsBelongTo());
-        }
-
-        return $messages;
-    }
-
-
-    // Rendering
-
-    /**
-     * Set view object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Form
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        $this->_view = $view;
-        return $this;
-    }
-
-    /**
-     * Retrieve view object
-     *
-     * If none registered, attempts to pull from ViewRenderer.
-     *
-     * @return Zend_View_Interface|null
-     */
-    public function getView()
-    {
-        if (null === $this->_view) {
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            $this->setView($viewRenderer->view);
-        }
-
-        return $this->_view;
-    }
-
-    /**
-     * Instantiate a decorator based on class name or class name fragment
-     *
-     * @param  string $name
-     * @param  null|array $options
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _getDecorator($name, $options)
-    {
-        $class = $this->getPluginLoader(self::DECORATOR)->load($name);
-        if (null === $options) {
-            $decorator = new $class;
-        } else {
-            $decorator = new $class($options);
-        }
-
-        return $decorator;
-    }
-
-    /**
-     * Add a decorator for rendering the element
-     *
-     * @param  string|Zend_Form_Decorator_Interface $decorator
-     * @param  array|Zend_Config $options Options with which to initialize decorator
-     * @return Zend_Form
-     */
-    public function addDecorator($decorator, $options = null)
-    {
-        if ($decorator instanceof Zend_Form_Decorator_Interface) {
-            $name = get_class($decorator);
-        } elseif (is_string($decorator)) {
-            $name      = $decorator;
-            $decorator = array(
-                'decorator' => $name,
-                'options'   => $options,
-            );
-        } elseif (is_array($decorator)) {
-            foreach ($decorator as $name => $spec) {
-                break;
-            }
-            if (is_numeric($name)) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string');
-            }
-            if (is_string($spec)) {
-                $decorator = array(
-                    'decorator' => $spec,
-                    'options'   => $options,
-                );
-            } elseif ($spec instanceof Zend_Form_Decorator_Interface) {
-                $decorator = $spec;
-            }
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface');
-        }
-
-        $this->_decorators[$name] = $decorator;
-
-        return $this;
-    }
-
-    /**
-     * Add many decorators at once
-     *
-     * @param  array $decorators
-     * @return Zend_Form
-     */
-    public function addDecorators(array $decorators)
-    {
-        foreach ($decorators as $decoratorInfo) {
-            if (is_string($decoratorInfo)) {
-                $this->addDecorator($decoratorInfo);
-            } elseif ($decoratorInfo instanceof Zend_Form_Decorator_Interface) {
-                $this->addDecorator($decoratorInfo);
-            } elseif (is_array($decoratorInfo)) {
-                $argc    = count($decoratorInfo);
-                $options = array();
-                if (isset($decoratorInfo['decorator'])) {
-                    $decorator = $decoratorInfo['decorator'];
-                    if (isset($decoratorInfo['options'])) {
-                        $options = $decoratorInfo['options'];
-                    }
-                    $this->addDecorator($decorator, $options);
-                } else {
-                    switch (true) {
-                        case (0 == $argc):
-                            break;
-                        case (1 <= $argc):
-                            $decorator  = array_shift($decoratorInfo);
-                        case (2 <= $argc):
-                            $options = array_shift($decoratorInfo);
-                        default:
-                            $this->addDecorator($decorator, $options);
-                            break;
-                    }
-                }
-            } else {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Overwrite all decorators
-     *
-     * @param  array $decorators
-     * @return Zend_Form
-     */
-    public function setDecorators(array $decorators)
-    {
-        $this->clearDecorators();
-        return $this->addDecorators($decorators);
-    }
-
-    /**
-     * Retrieve a registered decorator
-     *
-     * @param  string $name
-     * @return false|Zend_Form_Decorator_Abstract
-     */
-    public function getDecorator($name)
-    {
-        if (!isset($this->_decorators[$name])) {
-            $len = strlen($name);
-            foreach ($this->_decorators as $localName => $decorator) {
-                if ($len > strlen($localName)) {
-                    continue;
-                }
-
-                if (0 === substr_compare($localName, $name, -$len, $len, true)) {
-                    if (is_array($decorator)) {
-                        return $this->_loadDecorator($decorator, $localName);
-                    }
-                    return $decorator;
-                }
-            }
-            return false;
-        }
-
-        if (is_array($this->_decorators[$name])) {
-            return $this->_loadDecorator($this->_decorators[$name], $name);
-        }
-
-        return $this->_decorators[$name];
-    }
-
-    /**
-     * Retrieve all decorators
-     *
-     * @return array
-     */
-    public function getDecorators()
-    {
-        foreach ($this->_decorators as $key => $value) {
-            if (is_array($value)) {
-                $this->_loadDecorator($value, $key);
-            }
-        }
-        return $this->_decorators;
-    }
-
-    /**
-     * Remove a single decorator
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function removeDecorator($name)
-    {
-        $decorator = $this->getDecorator($name);
-        if ($decorator) {
-            if (array_key_exists($name, $this->_decorators)) {
-                unset($this->_decorators[$name]);
-            } else {
-                $class = get_class($decorator);
-                if (!array_key_exists($class, $this->_decorators)) {
-                    return false;
-                }
-                unset($this->_decorators[$class]);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all decorators
-     *
-     * @return Zend_Form
-     */
-    public function clearDecorators()
-    {
-        $this->_decorators = array();
-        return $this;
-    }
-
-    /**
-     * Set all element decorators as specified
-     *
-     * @param  array $decorators
-     * @param  array|null $elements Specific elements to decorate or exclude from decoration
-     * @param  bool $include Whether $elements is an inclusion or exclusion list
-     * @return Zend_Form
-     */
-    public function setElementDecorators(array $decorators, array $elements = null, $include = true)
-    {
-        if (is_array($elements)) {
-            if ($include) {
-                $elementObjs = array();
-                foreach ($elements as $name) {
-                    if (null !== ($element = $this->getElement($name))) {
-                        $elementObjs[] = $element;
-                    }
-                }
-            } else {
-                $elementObjs = $this->getElements();
-                foreach ($elements as $name) {
-                    if (array_key_exists($name, $elementObjs)) {
-                        unset($elementObjs[$name]);
-                    }
-                }
-            }
-        } else {
-            $elementObjs = $this->getElements();
-        }
-
-        foreach ($elementObjs as $element) {
-            $element->setDecorators($decorators);
-        }
-
-        $this->_elementDecorators = $decorators;
-
-        return $this;
-    }
-
-    /**
-     * Set all display group decorators as specified
-     *
-     * @param  array $decorators
-     * @return Zend_Form
-     */
-    public function setDisplayGroupDecorators(array $decorators)
-    {
-        foreach ($this->getDisplayGroups() as $group) {
-            $group->setDecorators($decorators);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set all subform decorators as specified
-     *
-     * @param  array $decorators
-     * @return Zend_Form
-     */
-    public function setSubFormDecorators(array $decorators)
-    {
-        foreach ($this->getSubForms() as $form) {
-            $form->setDecorators($decorators);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Render form
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            $this->setView($view);
-        }
-
-        $content = '';
-        foreach ($this->getDecorators() as $decorator) {
-            $decorator->setElement($this);
-            $content = $decorator->render($content);
-        }
-        return $content;
-    }
-
-    /**
-     * Serialize as string
-     *
-     * Proxies to {@link render()}.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->render();
-            return $return;
-        } catch (Exception $e) {
-            $message = "Exception caught by form: " . $e->getMessage()
-                     . "\nStack Trace:\n" . $e->getTraceAsString();
-            trigger_error($message, E_USER_WARNING);
-            return '';
-        }
-    }
-
-
-    // Localization:
-
-    /**
-     * Set translator object
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return Zend_Form
-     */
-    public function setTranslator($translator = null)
-    {
-        if (null === $translator) {
-            $this->_translator = null;
-        } elseif ($translator instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid translator specified');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set global default translator object
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return void
-     */
-    public static function setDefaultTranslator($translator = null)
-    {
-        if (null === $translator) {
-            self::$_translatorDefault = null;
-        } elseif ($translator instanceof Zend_Translate_Adapter) {
-            self::$_translatorDefault = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            self::$_translatorDefault = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid translator specified');
-        }
-    }
-
-    /**
-     * Retrieve translator object
-     *
-     * @return Zend_Translate|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        if (null === $this->_translator) {
-            return self::getDefaultTranslator();
-        }
-
-        return $this->_translator;
-    }
-    
-    /**
-     * Does this form have its own specific translator?
-     * 
-     * @return bool
-     */
-    public function hasTranslator()
-    {
-        return (bool)$this->_translator;
-    }    
-
-    /**
-     * Get global default translator object
-     *
-     * @return null|Zend_Translate
-     */
-    public static function getDefaultTranslator()
-    {
-        if (null === self::$_translatorDefault) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $translator = Zend_Registry::get('Zend_Translate');
-                if ($translator instanceof Zend_Translate_Adapter) {
-                    return $translator;
-                } elseif ($translator instanceof Zend_Translate) {
-                    return $translator->getAdapter();
-                }
-            }
-        }
-        return self::$_translatorDefault;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Form
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    /**
-     * Overloading: access to elements, form groups, and display groups
-     *
-     * @param  string $name
-     * @return Zend_Form_Element|Zend_Form|null
-     */
-    public function __get($name)
-    {
-        if (isset($this->_elements[$name])) {
-            return $this->_elements[$name];
-        } elseif (isset($this->_subForms[$name])) {
-            return $this->_subForms[$name];
-        } elseif (isset($this->_displayGroups[$name])) {
-            return $this->_displayGroups[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Overloading: access to elements, form groups, and display groups
-     *
-     * @param  string $name
-     * @param  Zend_Form_Element|Zend_Form $value
-     * @return void
-     * @throws Zend_Form_Exception for invalid $value
-     */
-    public function __set($name, $value)
-    {
-        if ($value instanceof Zend_Form_Element) {
-            $this->addElement($value, $name);
-            return;
-        } elseif ($value instanceof Zend_Form) {
-            $this->addSubForm($value, $name);
-            return;
-        } elseif (is_array($value)) {
-            $this->addDisplayGroup($value, $name);
-            return;
-        }
-
-        require_once 'Zend/Form/Exception.php';
-        if (is_object($value)) {
-            $type = get_class($value);
-        } else {
-            $type = gettype($value);
-        }
-        throw new Zend_Form_Exception('Only form elements and groups may be overloaded; variable of type "' . $type . '" provided');
-    }
-
-    /**
-     * Overloading: access to elements, form groups, and display groups
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        if (isset($this->_elements[$name])
-            || isset($this->_subForms[$name])
-            || isset($this->_displayGroups[$name]))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Overloading: access to elements, form groups, and display groups
-     *
-     * @param  string $name
-     * @return void
-     */
-    public function __unset($name)
-    {
-        if (isset($this->_elements[$name])) {
-            unset($this->_elements[$name]);
-        } elseif (isset($this->_subForms[$name])) {
-            unset($this->_subForms[$name]);
-        } elseif (isset($this->_displayGroups[$name])) {
-            unset($this->_displayGroups[$name]);
-        }
-    }
-
-    /**
-     * Overloading: allow rendering specific decorators
-     *
-     * Call renderDecoratorName() to render a specific decorator.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return string
-     * @throws Zend_Form_Exception for invalid decorator or invalid method call
-     */
-    public function __call($method, $args)
-    {
-        if ('render' == substr($method, 0, 6)) {
-            $decoratorName = substr($method, 6);
-            if (false !== ($decorator = $this->getDecorator($decoratorName))) {
-                $decorator->setElement($this);
-                $seed = '';
-                if (0 < count($args)) {
-                    $seed = array_shift($args);
-                }
-                return $decorator->render($seed);
-            }
-
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName));
-        }
-
-        require_once 'Zend/Form/Exception.php';
-        throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method));
-    }
-
-    // Interfaces: Iterator, Countable
-
-    /**
-     * Current element/subform/display group
-     *
-     * @return Zend_Form_Element|Zend_Form_DisplayGroup|Zend_Form
-     */
-    public function current()
-    {
-        $this->_sort();
-        current($this->_order);
-        $key = key($this->_order);
-
-        if (isset($this->_elements[$key])) {
-            return $this->getElement($key);
-        } elseif (isset($this->_subForms[$key])) {
-            return $this->getSubForm($key);
-        } elseif (isset($this->_displayGroups[$key])) {
-            return $this->getDisplayGroup($key);
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Corruption detected in form; invalid key ("%s") found in internal iterator', (string) $key));
-        }
-    }
-
-    /**
-     * Current element/subform/display group name
-     *
-     * @return string
-     */
-    public function key()
-    {
-        $this->_sort();
-        return key($this->_order);
-    }
-
-    /**
-     * Move pointer to next element/subform/display group
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_sort();
-        next($this->_order);
-    }
-
-    /**
-     * Move pointer to beginning of element/subform/display group loop
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_sort();
-        reset($this->_order);
-    }
-
-    /**
-     * Determine if current element/subform/display group is valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        $this->_sort();
-        return (current($this->_order) !== false);
-    }
-
-    /**
-     * Count of elements/subforms that are iterable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_order);
-    }
-
-    /**
-     * Set flag to disable loading default decorators
-     *
-     * @param  bool $flag
-     * @return Zend_Form
-     */
-    public function setDisableLoadDefaultDecorators($flag)
-    {
-        $this->_disableLoadDefaultDecorators = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Should we load the default decorators?
-     *
-     * @return bool
-     */
-    public function loadDefaultDecoratorsIsDisabled()
-    {
-        return $this->_disableLoadDefaultDecorators;
-    }
-
-    /**
-     * Load the default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                 ->addDecorator('HtmlTag', array('tag' => 'dl', 'class' => 'zend_form'))
-                 ->addDecorator('Form');
-        }
-    }
-
-    /**
-     * Sort items according to their order
-     *
-     * @return void
-     */
-    protected function _sort()
-    {
-        if ($this->_orderUpdated) {
-            $items = array();
-            $index = 0;
-            foreach ($this->_order as $key => $order) {
-                if (null === $order) {
-                    if (null === ($order = $this->{$key}->getOrder())) {
-                        while (array_search($index, $this->_order, true)) {
-                            ++$index;
-                        }
-                        $items[$index] = $key;
-                        ++$index;
-                    } else {
-                        $items[$order] = $key;
-                    }
-                } else {
-                    $items[$order] = $key;
-                }
-            }
-
-            $items = array_flip($items);
-            asort($items);
-            $this->_order = $items;
-            $this->_orderUpdated = false;
-        }
-    }
-
-    /**
-     * Lazy-load a decorator
-     *
-     * @param  array $decorator Decorator type and options
-     * @param  mixed $name Decorator name or alias
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _loadDecorator(array $decorator, $name)
-    {
-        $sameName = false;
-        if ($name == $decorator['decorator']) {
-            $sameName = true;
-        }
-
-        $instance = $this->_getDecorator($decorator['decorator'], $decorator['options']);
-        if ($sameName) {
-            $newName            = get_class($instance);
-            $decoratorNames     = array_keys($this->_decorators);
-            $order              = array_flip($decoratorNames);
-            $order[$newName]    = $order[$name];
-            $decoratorsExchange = array();
-            unset($order[$name]);
-            asort($order);
-            foreach ($order as $key => $index) {
-                if ($key == $newName) {
-                    $decoratorsExchange[$key] = $instance;
-                    continue;
-                }
-                $decoratorsExchange[$key] = $this->_decorators[$key];
-            }
-            $this->_decorators = $decoratorsExchange;
-        } else {
-            $this->_decorators[$name] = $instance;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * Retrieve optionally translated custom error messages
-     *
-     * @return array
-     */
-    protected function _getErrorMessages()
-    {
-        $messages   = $this->getErrorMessages();
-        $translator = $this->getTranslator();
-        if (null !== $translator) {
-            foreach ($messages as $key => $message) {
-                $messages[$key] = $translator->translate($message);
-            }
-        }
-        return $messages;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Abstract.php b/airtime_mvc/library/Zend/Form/Decorator/Abstract.php
deleted file mode 100644
index 6a73dd774..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Abstract.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Interface */
-require_once 'Zend/Form/Decorator/Interface.php';
-
-/**
- * Zend_Form_Decorator_Abstract
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21147 2010-02-23 14:42:04Z yoshida@zend.co.jp $
- */
-abstract class Zend_Form_Decorator_Abstract implements Zend_Form_Decorator_Interface
-{
-    /**
-     * Placement constants
-     */
-    const APPEND  = 'APPEND';
-    const PREPEND = 'PREPEND';
-
-    /**
-     * Default placement: append
-     * @var string
-     */
-    protected $_placement = 'APPEND';
-
-    /**
-     * @var Zend_Form_Element|Zend_Form
-     */
-    protected $_element;
-
-    /**
-     * Decorator options
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Separator between new content and old
-     * @var string
-     */
-    protected $_separator = PHP_EOL;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } elseif ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-    }
-
-    /**
-     * Set options
-     *
-     * @param  array $options
-     * @return Zend_Form_Decorator_Abstract
-     */
-    public function setOptions(array $options)
-    {
-        $this->_options = $options;
-        return $this;
-    }
-
-    /**
-     * Set options from config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Form_Decorator_Abstract
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set option
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Form_Decorator_Abstract
-     */
-    public function setOption($key, $value)
-    {
-        $this->_options[(string) $key] = $value;
-        return $this;
-    }
-
-    /**
-     * Get option
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getOption($key)
-    {
-        $key = (string) $key;
-        if (isset($this->_options[$key])) {
-            return $this->_options[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Remove single option
-     *
-     * @param mixed $key
-     * @return void
-     */
-    public function removeOption($key)
-    {
-        if (null !== $this->getOption($key)) {
-            unset($this->_options[$key]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all options
-     *
-     * @return Zend_Form_Decorator_Abstract
-     */
-    public function clearOptions()
-    {
-        $this->_options = array();
-        return $this;
-    }
-
-    /**
-     * Set current form element
-     *
-     * @param  Zend_Form_Element|Zend_Form $element
-     * @return Zend_Form_Decorator_Abstract
-     * @throws Zend_Form_Decorator_Exception on invalid element type
-     */
-    public function setElement($element)
-    {
-        if ((!$element instanceof Zend_Form_Element)
-            && (!$element instanceof Zend_Form)
-            && (!$element instanceof Zend_Form_DisplayGroup))
-        {
-            require_once 'Zend/Form/Decorator/Exception.php';
-            throw new Zend_Form_Decorator_Exception('Invalid element type passed to decorator');
-        }
-
-        $this->_element = $element;
-        return $this;
-    }
-
-    /**
-     * Retrieve current element
-     *
-     * @return Zend_Form_Element|Zend_Form
-     */
-    public function getElement()
-    {
-        return $this->_element;
-    }
-
-    /**
-     * Determine if decorator should append or prepend content
-     *
-     * @return string
-     */
-    public function getPlacement()
-    {
-        $placement = $this->_placement;
-        if (null !== ($placementOpt = $this->getOption('placement'))) {
-            $placementOpt = strtoupper($placementOpt);
-            switch ($placementOpt) {
-                case self::APPEND:
-                case self::PREPEND:
-                    $placement = $this->_placement = $placementOpt;
-                    break;
-                case false:
-                    $placement = $this->_placement = null;
-                    break;
-                default:
-                    break;
-            }
-            $this->removeOption('placement');
-        }
-
-        return $placement;
-    }
-
-    /**
-     * Retrieve separator to use between old and new content
-     *
-     * @return string
-     */
-    public function getSeparator()
-    {
-        $separator = $this->_separator;
-        if (null !== ($separatorOpt = $this->getOption('separator'))) {
-            $separator = $this->_separator = (string) $separatorOpt;
-            $this->removeOption('separator');
-        }
-        return $separator;
-    }
-
-    /**
-     * Decorate content and/or element
-     *
-     * @param  string $content
-     * @return string
-     * @throws Zend_Form_Decorator_Exception when unimplemented
-     */
-    public function render($content)
-    {
-        require_once 'Zend/Form/Decorator/Exception.php';
-        throw new Zend_Form_Decorator_Exception('render() not implemented');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Callback.php b/airtime_mvc/library/Zend/Form/Decorator/Callback.php
deleted file mode 100644
index 3bb795f53..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Callback.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Callback
- *
- * Execute an arbitrary callback to decorate an element. Callbacks should take
- * three arguments, $content, $element, and $options:
- *
- * function mycallback($content, $element, array $options)
- * {
- * }
- *
- * and should return a string. ($options are whatever options were provided to
- * the decorator.)
- *
- * To specify a callback, pass a valid callback as the 'callback' option.
- *
- * Callback results will be either appended, prepended, or replace the provided
- * content. To replace the content, specify a placement of boolean false;
- * defaults to append content.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Callback extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Callback
-     * @var string|array
-     */
-    protected $_callback;
-
-    /**
-     * Set callback
-     *
-     * @param  callback $callback
-     * @return Zend_Form_Decorator_Callback
-     * @throws Zend_Form_Exception
-     */
-    public function setCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid callback provided to callback decorator');
-        }
-        $this->_callback = $callback;
-        return $this;
-    }
-
-    /**
-     * Get registered callback
-     *
-     * If not previously registered, checks to see if it exists in registered
-     * options.
-     *
-     * @return null|string|array
-     */
-    public function getCallback()
-    {
-        if (null === $this->_callback) {
-            if (null !== ($callback = $this->getOption('callback'))) {
-                $this->setCallback($callback);
-                $this->removeOption('callback');
-            }
-        }
-
-        return $this->_callback;
-    }
-
-    /**
-     * Render
-     *
-     * If no callback registered, returns callback. Otherwise, gets return
-     * value of callback and either appends, prepends, or replaces passed in
-     * content.
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $callback = $this->getCallback();
-        if (null === $callback) {
-            return $content;
-        }
-
-        $placement = $this->getPlacement();
-        $separator = $this->getSeparator();
-
-        $response = call_user_func($callback, $content, $this->getElement(), $this->getOptions());
-
-        switch ($placement) {
-            case self::APPEND:
-                return $content . $separator . $response;
-            case self::PREPEND:
-                return $response . $separator . $content;
-            default:
-                // replace content
-                return $response;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Captcha.php b/airtime_mvc/library/Zend/Form/Decorator/Captcha.php
deleted file mode 100644
index 908fe4918..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Captcha.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Captcha generic decorator
- *
- * Adds captcha adapter output
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Captcha.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Captcha extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Render captcha
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        if (!method_exists($element, 'getCaptcha')) {
-            return $content;
-        }
-
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $placement = $this->getPlacement();
-        $separator = $this->getSeparator();
-
-        $captcha = $element->getCaptcha();
-        $markup  = $captcha->render($view, $element);
-        switch ($placement) {
-            case 'PREPEND':
-                $content = $markup . $separator .  $content;
-                break;
-            case 'APPEND':
-            default:
-                $content = $content . $separator . $markup;
-        }
-        return $content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Captcha/Word.php b/airtime_mvc/library/Zend/Form/Decorator/Captcha/Word.php
deleted file mode 100644
index 596dfe80f..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Captcha/Word.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Word-based captcha decorator
- *
- * Adds hidden field for ID and text input field for captcha text
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Word.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Captcha_Word extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Render captcha
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $name = $element->getFullyQualifiedName();
-
-        $hiddenName = $name . '[id]';
-        $textName   = $name . '[input]';
-
-        $label = $element->getDecorator("Label");
-        if($label) {
-            $label->setOption("id", $element->getId()."-input");
-        }
-
-        $placement = $this->getPlacement();
-        $separator = $this->getSeparator();
-
-        $hidden = $view->formHidden($hiddenName, $element->getValue(), $element->getAttribs());
-        $text   = $view->formText($textName, '', $element->getAttribs());
-        switch ($placement) {
-            case 'PREPEND':
-                $content = $hidden . $separator . $text . $separator . $content;
-                break;
-            case 'APPEND':
-            default:
-                $content = $content . $separator . $hidden . $separator . $text;
-        }
-        return $content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Description.php b/airtime_mvc/library/Zend/Form/Decorator/Description.php
deleted file mode 100644
index aa697afc4..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Description.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Description
- *
- * Accepts the options:
- * - separator: separator to use between label and content (defaults to PHP_EOL)
- * - placement: whether to append or prepend label to content (defaults to prepend)
- * - tag: if set, used to wrap the label in an additional HTML tag
- * - class: if set, override default class used with HTML tag
- * - escape: whether or not to escape description (true by default)
- *
- * Any other options passed will be used as HTML attributes of the HTML tag used.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Description extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Whether or not to escape the description
-     * @var bool
-     */
-    protected $_escape;
-
-    /**
-     * Default placement: append
-     * @var string
-     */
-    protected $_placement = 'APPEND';
-
-    /**
-     * HTML tag with which to surround description
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Set HTML tag with which to surround description
-     *
-     * @param  string $tag
-     * @return Zend_Form_Decorator_Description
-     */
-    public function setTag($tag)
-    {
-        $this->_tag = (string) $tag;
-        return $this;
-    }
-
-    /**
-     * Get HTML tag, if any, with which to surround description
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        if (null === $this->_tag) {
-            $tag = $this->getOption('tag');
-            if (null !== $tag) {
-                $this->removeOption('tag');
-            } else {
-                $tag = 'p';
-            }
-
-            $this->setTag($tag);
-            return $tag;
-        }
-
-        return $this->_tag;
-    }
-
-    /**
-     * Get class with which to define description
-     *
-     * Defaults to 'hint'
-     *
-     * @return string
-     */
-    public function getClass()
-    {
-        $class = $this->getOption('class');
-        if (null === $class) {
-            $class = 'hint';
-            $this->setOption('class', $class);
-        }
-
-        return $class;
-    }
-
-    /**
-     * Set whether or not to escape description
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Decorator_Description
-     */
-    public function setEscape($flag)
-    {
-        $this->_escape = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get escape flag
-     *
-     * @return true
-     */
-    public function getEscape()
-    {
-        if (null === $this->_escape) {
-            if (null !== ($escape = $this->getOption('escape'))) {
-                $this->setEscape($escape);
-                $this->removeOption('escape');
-            } else {
-                $this->setEscape(true);
-            }
-        }
-
-        return $this->_escape;
-    }
-
-    /**
-     * Render a description
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $description = $element->getDescription();
-        $description = trim($description);
-
-        if (!empty($description) && (null !== ($translator = $element->getTranslator()))) {
-            $description = $translator->translate($description);
-        }
-
-        if (empty($description)) {
-            return $content;
-        }
-
-        $separator = $this->getSeparator();
-        $placement = $this->getPlacement();
-        $tag       = $this->getTag();
-        $class     = $this->getClass();
-        $escape    = $this->getEscape();
-
-        $options   = $this->getOptions();
-
-        if ($escape) {
-            $description = $view->escape($description);
-        }
-
-        if (!empty($tag)) {
-            require_once 'Zend/Form/Decorator/HtmlTag.php';
-            $options['tag'] = $tag;
-            $decorator = new Zend_Form_Decorator_HtmlTag($options);
-            $description = $decorator->render($description);
-        }
-
-        switch ($placement) {
-            case self::PREPEND:
-                return $description . $separator . $content;
-            case self::APPEND:
-            default:
-                return $content . $separator . $description;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/DtDdWrapper.php b/airtime_mvc/library/Zend/Form/Decorator/DtDdWrapper.php
deleted file mode 100644
index 4765ecd4a..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/DtDdWrapper.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_DtDdWrapper
- *
- * Creates an empty <dt> item, and wraps the content in a <dd>. Used as a
- * default decorator for subforms and display groups.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DtDdWrapper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_DtDdWrapper extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Default placement: surround content
-     * @var string
-     */
-    protected $_placement = null;
-
-    /**
-     * Render
-     *
-     * Renders as the following:
-     * <dt></dt>
-     * <dd>$content</dd>
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $elementName = $this->getElement()->getName();
-
-        return '<dt id="' . $elementName . '-label">&nbsp;</dt>' .
-               '<dd id="' . $elementName . '-element">' . $content . '</dd>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Errors.php b/airtime_mvc/library/Zend/Form/Decorator/Errors.php
deleted file mode 100644
index 6d82d5346..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Errors.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Errors
- *
- * Any options passed will be used as HTML attributes of the ul tag for the errors.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Errors.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Errors extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Render errors
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $errors = $element->getMessages();
-        if (empty($errors)) {
-            return $content;
-        }
-
-        $separator = $this->getSeparator();
-        $placement = $this->getPlacement();
-        $errors    = $view->formErrors($errors, $this->getOptions());
-
-        switch ($placement) {
-            case self::APPEND:
-                return $content . $separator . $errors;
-            case self::PREPEND:
-                return $errors . $separator . $content;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Exception.php b/airtime_mvc/library/Zend/Form/Decorator/Exception.php
deleted file mode 100644
index 11a42f4a2..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Exception */
-require_once 'Zend/Form/Exception.php';
-
-/**
- * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Form_Decorator_Exception extends Zend_Form_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Fieldset.php b/airtime_mvc/library/Zend/Form/Decorator/Fieldset.php
deleted file mode 100644
index db828a275..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Fieldset.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Fieldset
- *
- * Any options passed will be used as HTML attributes of the fieldset tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fieldset.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Fieldset extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Attribs that should be removed prior to rendering
-     * @var array
-     */
-    public $stripAttribs = array(
-        'action',
-        'enctype',
-        'helper',
-        'method',
-        'name',
-    );
-
-    /**
-     * Fieldset legend
-     * @var string
-     */
-    protected $_legend;
-
-    /**
-     * Default placement: surround content
-     * @var string
-     */
-    protected $_placement = null;
-
-    /**
-     * Get options
-     *
-     * Merges in element attributes as well.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        $options = parent::getOptions();
-        if (null !== ($element = $this->getElement())) {
-            $attribs = $element->getAttribs();
-            $options = array_merge($options, $attribs);
-            $this->setOptions($options);
-        }
-        return $options;
-    }
-
-    /**
-     * Set legend
-     *
-     * @param  string $value
-     * @return Zend_Form_Decorator_Fieldset
-     */
-    public function setLegend($value)
-    {
-        $this->_legend = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Get legend
-     *
-     * @return string
-     */
-    public function getLegend()
-    {
-        $legend = $this->_legend;
-        if ((null === $legend) && (null !== ($element = $this->getElement()))) {
-            if (method_exists($element, 'getLegend')) {
-                $legend = $element->getLegend();
-                $this->setLegend($legend);
-            }
-        }
-        if ((null === $legend) && (null !== ($legend = $this->getOption('legend')))) {
-            $this->setLegend($legend);
-            $this->removeOption('legend');
-        }
-
-        return $legend;
-    }
-
-    /**
-     * Render a fieldset
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $legend        = $this->getLegend();
-        $attribs       = $this->getOptions();
-        $name          = $element->getFullyQualifiedName();
-
-        $id = $element->getId();
-        if (!empty($id)) {
-            $attribs['id'] = 'fieldset-' . $id;
-        }
-
-        if (null !== $legend) {
-            if (null !== ($translator = $element->getTranslator())) {
-                $legend = $translator->translate($legend);
-            }
-
-            $attribs['legend'] = $legend;
-        }
-
-        foreach (array_keys($attribs) as $attrib) {
-            $testAttrib = strtolower($attrib);
-            if (in_array($testAttrib, $this->stripAttribs)) {
-                unset($attribs[$attrib]);
-            }
-        }
-
-        return $view->fieldset($name, $content, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/File.php b/airtime_mvc/library/Zend/Form/Decorator/File.php
deleted file mode 100644
index 01c74233f..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/File.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/** Zend_Form_Decorator_Marker_File_Interface */
-require_once 'Zend/Form/Decorator/Marker/File/Interface.php';
-
-/** Zend_File_Transfer_Adapter_Http */
-require_once 'Zend/File/Transfer/Adapter/Http.php';
-
-/**
- * Zend_Form_Decorator_File
- *
- * Fixes the rendering for all subform and multi file elements
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_File
-    extends Zend_Form_Decorator_Abstract
-    implements Zend_Form_Decorator_Marker_File_Interface
-{
-    /**
-     * Attributes that should not be passed to helper
-     * @var array
-     */
-    protected $_attribBlacklist = array('helper', 'placement', 'separator', 'value');
-
-    /**
-     * Default placement: append
-     * @var string
-     */
-    protected $_placement = 'APPEND';
-
-    /**
-     * Get attributes to pass to file helper
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        $attribs   = $this->getOptions();
-
-        if (null !== ($element = $this->getElement())) {
-            $attribs = array_merge($attribs, $element->getAttribs());
-        }
-
-        foreach ($this->_attribBlacklist as $key) {
-            if (array_key_exists($key, $attribs)) {
-                unset($attribs[$key]);
-            }
-        }
-
-        return $attribs;
-    }
-
-    /**
-     * Render a form file
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        if (!$element instanceof Zend_Form_Element) {
-            return $content;
-        }
-
-        $view = $element->getView();
-        if (!$view instanceof Zend_View_Interface) {
-            return $content;
-        }
-
-        $name      = $element->getName();
-        $attribs   = $this->getAttribs();
-        if (!array_key_exists('id', $attribs)) {
-            $attribs['id'] = $name;
-        }
-
-        $separator = $this->getSeparator();
-        $placement = $this->getPlacement();
-        $markup    = array();
-        $size      = $element->getMaxFileSize();
-        if ($size > 0) {
-            $element->setMaxFileSize(0);
-            $markup[] = $view->formHidden('MAX_FILE_SIZE', $size);
-        }
-
-        if (Zend_File_Transfer_Adapter_Http::isApcAvailable()) {
-            $markup[] = $view->formHidden(ini_get('apc.rfc1867_name'), uniqid(), array('id' => 'progress_key'));
-        } else if (Zend_File_Transfer_Adapter_Http::isUploadProgressAvailable()) {
-            $markup[] = $view->formHidden('UPLOAD_IDENTIFIER', uniqid(), array('id' => 'progress_key'));
-        }
-
-        if ($element->isArray()) {
-            $name .= "[]";
-            $count = $element->getMultiFile();
-            for ($i = 0; $i < $count; ++$i) {
-                $htmlAttribs        = $attribs;
-                $htmlAttribs['id'] .= '-' . $i;
-                $markup[] = $view->formFile($name, $htmlAttribs);
-            }
-        } else {
-            $markup[] = $view->formFile($name, $attribs);
-        }
-
-        $markup = implode($separator, $markup);
-
-        switch ($placement) {
-            case self::PREPEND:
-                return $markup . $separator . $content;
-            case self::APPEND:
-            default:
-                return $content . $separator . $markup;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Form.php b/airtime_mvc/library/Zend/Form/Decorator/Form.php
deleted file mode 100644
index cc13c3827..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Form.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Form
- *
- * Render a Zend_Form object.
- *
- * Accepts following options:
- * - separator: Separator to use between elements
- * - helper: which view helper to use when rendering form. Should accept three
- *   arguments, string content, a name, and an array of attributes.
- *
- * Any other options passed will be used as HTML attributes of the form tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Form extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Default view helper
-     * @var string
-     */
-    protected $_helper = 'form';
-
-    /**
-     * Set view helper for rendering form
-     *
-     * @param  string $helper
-     * @return Zend_Form_Decorator_Form
-     */
-    public function setHelper($helper)
-    {
-        $this->_helper = (string) $helper;
-        return $this;
-    }
-
-    /**
-     * Get view helper for rendering form
-     *
-     * @return string
-     */
-    public function getHelper()
-    {
-        if (null !== ($helper = $this->getOption('helper'))) {
-            $this->setHelper($helper);
-            $this->removeOption('helper');
-        }
-        return $this->_helper;
-    }
-
-    /**
-     * Retrieve decorator options
-     *
-     * Assures that form action and method are set, and sets appropriate
-     * encoding type if current method is POST.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        if (null !== ($element = $this->getElement())) {
-            if ($element instanceof Zend_Form) {
-                $element->getAction();
-                $method = $element->getMethod();
-                if ($method == Zend_Form::METHOD_POST) {
-                    $this->setOption('enctype', 'application/x-www-form-urlencoded');
-                }
-                foreach ($element->getAttribs() as $key => $value) {
-                    $this->setOption($key, $value);
-                }
-            } elseif ($element instanceof Zend_Form_DisplayGroup) {
-                foreach ($element->getAttribs() as $key => $value) {
-                    $this->setOption($key, $value);
-                }
-            }
-        }
-
-        if (isset($this->_options['method'])) {
-            $this->_options['method'] = strtolower($this->_options['method']);
-        }
-
-        return $this->_options;
-    }
-
-    /**
-     * Render a form
-     *
-     * Replaces $content entirely from currently set element.
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $form    = $this->getElement();
-        $view    = $form->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $helper        = $this->getHelper();
-        $attribs       = $this->getOptions();
-        $name          = $form->getFullyQualifiedName();
-        $attribs['id'] = $form->getId();
-        return $view->$helper($name, $attribs, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/FormElements.php b/airtime_mvc/library/Zend/Form/Decorator/FormElements.php
deleted file mode 100644
index 1d0e10c16..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/FormElements.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_FormElements
- *
- * Render all form elements registered with current form
- *
- * Accepts following options:
- * - separator: Separator to use between elements
- *
- * Any other options passed will be used as HTML attributes of the form tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormElements.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_FormElements extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Merges given two belongsTo (array notation) strings
-     *
-     * @param  string $baseBelongsTo
-     * @param  string $belongsTo
-     * @return string
-     */
-    public function mergeBelongsTo($baseBelongsTo, $belongsTo)
-    {
-        $endOfArrayName = strpos($belongsTo, '[');
-
-        if ($endOfArrayName === false) {
-            return $baseBelongsTo . '[' . $belongsTo . ']';
-        }
-
-        $arrayName = substr($belongsTo, 0, $endOfArrayName);
-
-        return $baseBelongsTo . '[' . $arrayName . ']' . substr($belongsTo, $endOfArrayName);
-    }
-
-    /**
-     * Render form elements
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $form    = $this->getElement();
-        if ((!$form instanceof Zend_Form) && (!$form instanceof Zend_Form_DisplayGroup)) {
-            return $content;
-        }
-
-        $belongsTo      = ($form instanceof Zend_Form) ? $form->getElementsBelongTo() : null;
-        $elementContent = '';
-        $separator      = $this->getSeparator();
-        $translator     = $form->getTranslator();
-        $items          = array();
-        $view           = $form->getView();
-        foreach ($form as $item) {
-            $item->setView($view)
-                 ->setTranslator($translator);
-            if ($item instanceof Zend_Form_Element) {
-                $item->setBelongsTo($belongsTo);
-            } elseif (!empty($belongsTo) && ($item instanceof Zend_Form)) {
-                if ($item->isArray()) {
-                    $name = $this->mergeBelongsTo($belongsTo, $item->getElementsBelongTo());
-                    $item->setElementsBelongTo($name, true);
-                } else {
-                    $item->setElementsBelongTo($belongsTo, true);
-                }
-            } elseif (!empty($belongsTo) && ($item instanceof Zend_Form_DisplayGroup)) {
-                foreach ($item as $element) {
-                    $element->setBelongsTo($belongsTo);
-                }
-            }
-
-            $items[] = $item->render();
-
-            if (($item instanceof Zend_Form_Element_File)
-                || (($item instanceof Zend_Form)
-                    && (Zend_Form::ENCTYPE_MULTIPART == $item->getEnctype()))
-                || (($item instanceof Zend_Form_DisplayGroup)
-                    && (Zend_Form::ENCTYPE_MULTIPART == $item->getAttrib('enctype')))
-            ) {
-                if ($form instanceof Zend_Form) {
-                    $form->setEnctype(Zend_Form::ENCTYPE_MULTIPART);
-                } elseif ($form instanceof Zend_Form_DisplayGroup) {
-                    $form->setAttrib('enctype', Zend_Form::ENCTYPE_MULTIPART);
-                }
-            }
-        }
-        $elementContent = implode($separator, $items);
-
-        switch ($this->getPlacement()) {
-            case self::PREPEND:
-                return $elementContent . $separator . $content;
-            case self::APPEND:
-            default:
-                return $content . $separator . $elementContent;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/FormErrors.php b/airtime_mvc/library/Zend/Form/Decorator/FormErrors.php
deleted file mode 100644
index d8c356f5d..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/FormErrors.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_FormErrors
- *
- * Displays all form errors in one view.
- *
- * Any options passed will be used as HTML attributes of the ul tag for the errors.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormErrors.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_FormErrors extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Default values for markup options
-     * @var array
-     */
-    protected $_defaults = array(
-        'ignoreSubForms'          => false,
-        'markupElementLabelEnd'   => '</b>',
-        'markupElementLabelStart' => '<b>',
-        'markupListEnd'           => '</ul>',
-        'markupListItemEnd'       => '</li>',
-        'markupListItemStart'     => '<li>',
-        'markupListStart'         => '<ul class="form-errors">',
-    );
-
-    /**#@+
-     * Markup options
-     * @var string
-     */
-    protected $_ignoreSubForms;
-    protected $_markupElementLabelEnd;
-    protected $_markupElementLabelStart;
-    protected $_markupListEnd;
-    protected $_markupListItemEnd;
-    protected $_markupListItemStart;
-    protected $_markupListStart;
-    /**#@-*/
-
-    /**
-     * Render errors
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $form = $this->getElement();
-        if (!$form instanceof Zend_Form) {
-            return $content;
-        }
-
-        $view = $form->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $this->initOptions();
-        $markup = $this->_recurseForm($form, $view);
-
-        if (empty($markup)) {
-            return $content;
-        }
-
-        $markup = $this->getMarkupListStart()
-                . $markup
-                . $this->getMarkupListEnd();
-
-        switch ($this->getPlacement()) {
-            case self::APPEND:
-                return $content . $this->getSeparator() . $markup;
-            case self::PREPEND:
-                return $markup . $this->getSeparator() . $content;
-        }
-    }
-
-    /**
-     * Initialize options
-     *
-     * @return void
-     */
-    public function initOptions()
-    {
-        $this->getMarkupElementLabelEnd();
-        $this->getMarkupElementLabelStart();
-        $this->getMarkupListEnd();
-        $this->getMarkupListItemEnd();
-        $this->getMarkupListItemStart();
-        $this->getMarkupListStart();
-        $this->getPlacement();
-        $this->getSeparator();
-        $this->ignoreSubForms();
-    }
-
-    /**
-     * Retrieve markupElementLabelStart
-     *
-     * @return string
-     */
-    public function getMarkupElementLabelStart()
-    {
-        if (null === $this->_markupElementLabelStart) {
-            if (null === ($markupElementLabelStart = $this->getOption('markupElementLabelStart'))) {
-                $this->setMarkupElementLabelStart($this->_defaults['markupElementLabelStart']);
-            } else {
-                $this->setMarkupElementLabelStart($markupElementLabelStart);
-                $this->removeOption('markupElementLabelStart');
-            }
-        }
-
-        return $this->_markupElementLabelStart;
-    }
-
-    /**
-     * Set markupElementLabelStart
-     *
-     * @param  string $markupElementLabelStart
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupElementLabelStart($markupElementLabelStart)
-    {
-        $this->_markupElementLabelStart = $markupElementLabelStart;
-        return $this;
-    }
-
-    /**
-     * Retrieve markupElementLabelEnd
-     *
-     * @return string
-     */
-    public function getMarkupElementLabelEnd()
-    {
-        if (null === $this->_markupElementLabelEnd) {
-            if (null === ($markupElementLabelEnd = $this->getOption('markupElementLabelEnd'))) {
-                $this->setMarkupElementLabelEnd($this->_defaults['markupElementLabelEnd']);
-            } else {
-                $this->setMarkupElementLabelEnd($markupElementLabelEnd);
-                $this->removeOption('markupElementLabelEnd');
-            }
-        }
-
-        return $this->_markupElementLabelEnd;
-    }
-
-    /**
-     * Set markupElementLabelEnd
-     *
-     * @param  string $markupElementLabelEnd
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupElementLabelEnd($markupElementLabelEnd)
-    {
-        $this->_markupElementLabelEnd = $markupElementLabelEnd;
-        return $this;
-    }
-
-    /**
-     * Retrieve markupListStart
-     *
-     * @return string
-     */
-    public function getMarkupListStart()
-    {
-        if (null === $this->_markupListStart) {
-            if (null === ($markupListStart = $this->getOption('markupListStart'))) {
-                $this->setMarkupListStart($this->_defaults['markupListStart']);
-            } else {
-                $this->setMarkupListStart($markupListStart);
-                $this->removeOption('markupListStart');
-            }
-        }
-
-        return $this->_markupListStart;
-    }
-
-    /**
-     * Set markupListStart
-     *
-     * @param  string $markupListStart
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupListStart($markupListStart)
-    {
-        $this->_markupListStart = $markupListStart;
-        return $this;
-    }
-
-    /**
-     * Retrieve markupListEnd
-     *
-     * @return string
-     */
-    public function getMarkupListEnd()
-    {
-        if (null === $this->_markupListEnd) {
-            if (null === ($markupListEnd = $this->getOption('markupListEnd'))) {
-                $this->setMarkupListEnd($this->_defaults['markupListEnd']);
-            } else {
-                $this->setMarkupListEnd($markupListEnd);
-                $this->removeOption('markupListEnd');
-            }
-        }
-
-        return $this->_markupListEnd;
-    }
-
-    /**
-     * Set markupListEnd
-     *
-     * @param  string $markupListEnd
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupListEnd($markupListEnd)
-    {
-        $this->_markupListEnd = $markupListEnd;
-        return $this;
-    }
-
-    /**
-     * Retrieve markupListItemStart
-     *
-     * @return string
-     */
-    public function getMarkupListItemStart()
-    {
-        if (null === $this->_markupListItemStart) {
-            if (null === ($markupListItemStart = $this->getOption('markupListItemStart'))) {
-                $this->setMarkupListItemStart($this->_defaults['markupListItemStart']);
-            } else {
-                $this->setMarkupListItemStart($markupListItemStart);
-                $this->removeOption('markupListItemStart');
-            }
-        }
-
-        return $this->_markupListItemStart;
-    }
-
-    /**
-     * Set markupListItemStart
-     *
-     * @param  string $markupListItemStart
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupListItemStart($markupListItemStart)
-    {
-        $this->_markupListItemStart = $markupListItemStart;
-        return $this;
-    }
-
-    /**
-     * Retrieve markupListItemEnd
-     *
-     * @return string
-     */
-    public function getMarkupListItemEnd()
-    {
-        if (null === $this->_markupListItemEnd) {
-            if (null === ($markupListItemEnd = $this->getOption('markupListItemEnd'))) {
-                $this->setMarkupListItemEnd($this->_defaults['markupListItemEnd']);
-            } else {
-                $this->setMarkupListItemEnd($markupListItemEnd);
-                $this->removeOption('markupListItemEnd');
-            }
-        }
-
-        return $this->_markupListItemEnd;
-    }
-
-    /**
-     * Set markupListItemEnd
-     *
-     * @param  string $markupListItemEnd
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setMarkupListItemEnd($markupListItemEnd)
-    {
-        $this->_markupListItemEnd = $markupListItemEnd;
-        return $this;
-    }
-
-    /**
-     * Retrieve ignoreSubForms
-     *
-     * @return bool
-     */
-    public function ignoreSubForms()
-    {
-        if (null === $this->_ignoreSubForms) {
-            if (null === ($ignoreSubForms = $this->getOption('ignoreSubForms'))) {
-                $this->setIgnoreSubForms($this->_defaults['ignoreSubForms']);
-            } else {
-                $this->setIgnoreSubForms($ignoreSubForms);
-                $this->removeOption('ignoreSubForms');
-            }
-        }
-
-        return $this->_ignoreSubForms;
-    }
-
-    /**
-     * Set ignoreSubForms
-     *
-     * @param  bool $ignoreSubForms
-     * @return Zend_Form_Decorator_FormErrors
-     */
-    public function setIgnoreSubForms($ignoreSubForms)
-    {
-        $this->_ignoreSubForms = (bool) $ignoreSubForms;
-        return $this;
-    }
-
-    /**
-     * Render element label
-     *
-     * @param  Zend_Form_Element $element
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function renderLabel(Zend_Form_Element $element, Zend_View_Interface $view)
-    {
-        $label = $element->getLabel();
-        if (empty($label)) {
-            $label = $element->getName();
-        }
-
-        return $this->getMarkupElementLabelStart()
-             . $view->escape($label)
-             . $this->getMarkupElementLabelEnd();
-    }
-
-    /**
-     * Recurse through a form object, rendering errors
-     *
-     * @param  Zend_Form $form
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    protected function _recurseForm(Zend_Form $form, Zend_View_Interface $view)
-    {
-        $content = '';
-        $errors  = $form->getMessages();
-        if ($form instanceof Zend_Form_SubForm) {
-            $name = $form->getName();
-            if ((1 == count($errors)) && array_key_exists($name, $errors)) {
-                $errors = $errors[$name];
-            }
-        }
-        if (empty($errors)) {
-            return $content;
-        }
-
-        foreach ($errors as $name => $list) {
-            $element = $form->$name;
-            if ($element instanceof Zend_Form_Element) {
-                $element->setView($view);
-                $content .= $this->getMarkupListItemStart()
-                         .  $this->renderLabel($element, $view)
-                         .  $view->formErrors($list, $this->getOptions())
-                         .  $this->getMarkupListItemEnd();
-            } elseif (!$this->ignoreSubForms() && ($element instanceof Zend_Form)) {
-                $content .= $this->getMarkupListStart()
-                          . $this->_recurseForm($element, $view)
-                          . $this->getMarkupListEnd();
-            }
-        }
-
-        return $content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/HtmlTag.php b/airtime_mvc/library/Zend/Form/Decorator/HtmlTag.php
deleted file mode 100644
index b4ecfe782..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/HtmlTag.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Form_Decorator_Abstract
- */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Element_HtmlTag
- *
- * Wraps content in an HTML block tag.
- *
- * Options accepted are:
- * - tag: tag to use in decorator
- * - noAttribs: do not render attributes in the opening tag
- * - placement: 'append' or 'prepend'. If 'append', renders opening and
- *   closing tag after content; if prepend, renders opening and closing tag
- *   before content.
- * - openOnly: render opening tag only
- * - closeOnly: render closing tag only
- *
- * Any other options passed are processed as HTML attributes of the tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlTag.php 20104 2010-01-06 21:26:01Z matthew $
- */
-class Zend_Form_Decorator_HtmlTag extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Character encoding to use when escaping attributes
-     * @var string
-     */
-    protected $_encoding;
-
-    /**
-     * Placement; default to surround content
-     * @var string
-     */
-    protected $_placement = null;
-
-    /**
-     * HTML tag to use
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * @var Zend_Filter
-     */
-    protected $_tagFilter;
-
-    /**
-     * Convert options to tag attributes
-     *
-     * @return string
-     */
-    protected function _htmlAttribs(array $attribs)
-    {
-        $xhtml = '';
-        $enc   = $this->_getEncoding();
-        foreach ((array) $attribs as $key => $val) {
-            $key = htmlspecialchars($key, ENT_COMPAT, $enc);
-            if (is_array($val)) {
-                $val = implode(' ', $val);
-            }
-            $val    = htmlspecialchars($val, ENT_COMPAT, $enc);
-            $xhtml .= " $key=\"$val\"";
-        }
-        return $xhtml;
-    }
-
-    /**
-     * Normalize tag
-     *
-     * Ensures tag is alphanumeric characters only, and all lowercase.
-     *
-     * @param  string $tag
-     * @return string
-     */
-    public function normalizeTag($tag)
-    {
-        if (!isset($this->_tagFilter)) {
-            require_once 'Zend/Filter.php';
-            require_once 'Zend/Filter/Alnum.php';
-            require_once 'Zend/Filter/StringToLower.php';
-            $this->_tagFilter = new Zend_Filter();
-            $this->_tagFilter->addFilter(new Zend_Filter_Alnum())
-                             ->addFilter(new Zend_Filter_StringToLower());
-        }
-        return $this->_tagFilter->filter($tag);
-    }
-
-    /**
-     * Set tag to use
-     *
-     * @param  string $tag
-     * @return Zend_Form_Decorator_HtmlTag
-     */
-    public function setTag($tag)
-    {
-        $this->_tag = $this->normalizeTag($tag);
-        return $this;
-    }
-
-    /**
-     * Get tag
-     *
-     * If no tag is registered, either via setTag() or as an option, uses 'div'.
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        if (null === $this->_tag) {
-            if (null === ($tag = $this->getOption('tag'))) {
-                $this->setTag('div');
-            } else {
-                $this->setTag($tag);
-                $this->removeOption('tag');
-            }
-        }
-
-        return $this->_tag;
-    }
-
-    /**
-     * Get the formatted open tag
-     *
-     * @param  string $tag
-     * @param  array $attribs
-     * @return string
-     */
-    protected function _getOpenTag($tag, array $attribs = null)
-    {
-        $html = '<' . $tag;
-        if (null !== $attribs) {
-            $html .= $this->_htmlAttribs($attribs);
-        }
-        $html .= '>';
-        return $html;
-    }
-
-    /**
-     * Get formatted closing tag
-     *
-     * @param  string $tag
-     * @return string
-     */
-    protected function _getCloseTag($tag)
-    {
-        return '</' . $tag . '>';
-    }
-
-    /**
-     * Render content wrapped in an HTML tag
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $tag       = $this->getTag();
-        $placement = $this->getPlacement();
-        $noAttribs = $this->getOption('noAttribs');
-        $openOnly  = $this->getOption('openOnly');
-        $closeOnly = $this->getOption('closeOnly');
-        $this->removeOption('noAttribs');
-        $this->removeOption('openOnly');
-        $this->removeOption('closeOnly');
-
-        $attribs = null;
-        if (!$noAttribs) {
-            $attribs = $this->getOptions();
-        }
-
-        switch ($placement) {
-            case self::APPEND:
-                if ($closeOnly) {
-                    return $content . $this->_getCloseTag($tag);
-                }
-                if ($openOnly) {
-                    return $content . $this->_getOpenTag($tag, $attribs);
-                }
-                return $content
-                     . $this->_getOpenTag($tag, $attribs)
-                     . $this->_getCloseTag($tag);
-            case self::PREPEND:
-                if ($closeOnly) {
-                    return $this->_getCloseTag($tag) . $content;
-                }
-                if ($openOnly) {
-                    return $this->_getOpenTag($tag, $attribs) . $content;
-                }
-                return $this->_getOpenTag($tag, $attribs)
-                     . $this->_getCloseTag($tag)
-                     . $content;
-            default:
-                return (($openOnly || !$closeOnly) ? $this->_getOpenTag($tag, $attribs) : '')
-                     . $content
-                     . (($closeOnly || !$openOnly) ? $this->_getCloseTag($tag) : '');
-        }
-    }
-
-    /**
-     * Get encoding for use with htmlspecialchars()
-     * 
-     * @return string
-     */
-    protected function _getEncoding()
-    {
-        if (null !== $this->_encoding) {
-            return $this->_encoding;
-        }
-
-        if (null === ($element = $this->getElement())) {
-            $this->_encoding = 'UTF-8';
-        } elseif (null === ($view = $element->getView())) {
-            $this->_encoding = 'UTF-8';
-        } elseif (!$view instanceof Zend_View_Abstract
-            && !method_exists($view, 'getEncoding')
-        ) {
-            $this->_encoding = 'UTF-8';
-        } else {
-            $this->_encoding = $view->getEncoding();
-        }
-        return $this->_encoding;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Image.php b/airtime_mvc/library/Zend/Form/Decorator/Image.php
deleted file mode 100644
index 43171f8bc..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Image.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Image
- *
- * Accepts the options:
- * - separator: separator to use between image and content (defaults to PHP_EOL)
- * - placement: whether to append or prepend label to content (defaults to append)
- * - tag: if set, used to wrap the label in an additional HTML tag
- *
- * Any other options passed will be used as HTML attributes of the image tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Image extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Attributes that should not be passed to helper
-     * @var array
-     */
-    protected $_attribBlacklist = array('helper', 'placement', 'separator', 'tag');
-
-    /**
-     * Default placement: append
-     * @var string
-     */
-    protected $_placement = 'APPEND';
-
-    /**
-     * HTML tag with which to surround image
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Set HTML tag with which to surround label
-     *
-     * @param  string $tag
-     * @return Zend_Form_Decorator_Image
-     */
-    public function setTag($tag)
-    {
-        $this->_tag = (string) $tag;
-        return $this;
-    }
-
-    /**
-     * Get HTML tag, if any, with which to surround label
-     *
-     * @return void
-     */
-    public function getTag()
-    {
-        if (null === $this->_tag) {
-            $tag = $this->getOption('tag');
-            if (null !== $tag) {
-                $this->removeOption('tag');
-                $this->setTag($tag);
-            }
-            return $tag;
-        }
-
-        return $this->_tag;
-    }
-
-    /**
-     * Get attributes to pass to image helper
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        $attribs = $this->getOptions();
-
-        if (null !== ($element = $this->getElement())) {
-            $attribs['alt'] = $element->getLabel();
-            $attribs = array_merge($attribs, $element->getAttribs());
-        }
-
-        foreach ($this->_attribBlacklist as $key) {
-            if (array_key_exists($key, $attribs)) {
-                unset($attribs[$key]);
-            }
-        }
-
-        return $attribs;
-    }
-
-    /**
-     * Render a form image
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $tag           = $this->getTag();
-        $placement     = $this->getPlacement();
-        $separator     = $this->getSeparator();
-        $name          = $element->getFullyQualifiedName();
-        $attribs       = $this->getAttribs();
-        $attribs['id'] = $element->getId();
-
-        $image = $view->formImage($name, $element->getImageValue(), $attribs);
-
-        if (null !== $tag) {
-            require_once 'Zend/Form/Decorator/HtmlTag.php';
-            $decorator = new Zend_Form_Decorator_HtmlTag();
-            $decorator->setOptions(array('tag' => $tag));
-            $image = $decorator->render($image);
-        }
-
-        switch ($placement) {
-            case self::PREPEND:
-                return $image . $separator . $content;
-            case self::APPEND:
-            default:
-                return $content . $separator . $image;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Interface.php b/airtime_mvc/library/Zend/Form/Decorator/Interface.php
deleted file mode 100644
index 4a7d37263..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Interface.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Form_Decorator_Interface
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Form_Decorator_Interface
-{
-    /**
-     * Constructor
-     *
-     * Accept options during initialization.
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null);
-
-    /**
-     * Set an element to decorate
-     *
-     * While the name is "setElement", a form decorator could decorate either
-     * an element or a form object.
-     *
-     * @param  mixed $element
-     * @return Zend_Form_Decorator_Interface
-     */
-    public function setElement($element);
-
-    /**
-     * Retrieve current element
-     *
-     * @return mixed
-     */
-    public function getElement();
-
-    /**
-     * Set decorator options from an array
-     *
-     * @param  array $options
-     * @return Zend_Form_Decorator_Interface
-     */
-    public function setOptions(array $options);
-
-    /**
-     * Set decorator options from a config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Form_Decorator_Interface
-     */
-    public function setConfig(Zend_Config $config);
-
-    /**
-     * Set a single option
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Form_Decorator_Interface
-     */
-    public function setOption($key, $value);
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getOption($key);
-
-    /**
-     * Retrieve decorator options
-     *
-     * @return array
-     */
-    public function getOptions();
-
-    /**
-     * Delete a single option
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function removeOption($key);
-
-    /**
-     * Clear all options
-     *
-     * @return Zend_Form_Decorator_Interface
-     */
-    public function clearOptions();
-
-    /**
-     * Render the element
-     *
-     * @param  string $content Content to decorate
-     * @return string
-     */
-    public function render($content);
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Label.php b/airtime_mvc/library/Zend/Form/Decorator/Label.php
deleted file mode 100644
index 49723e425..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Label.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Label
- *
- * Accepts the options:
- * - separator: separator to use between label and content (defaults to PHP_EOL)
- * - placement: whether to append or prepend label to content (defaults to prepend)
- * - tag: if set, used to wrap the label in an additional HTML tag
- * - opt(ional)Prefix: a prefix to the label to use when the element is optional
- * - opt(iona)lSuffix: a suffix to the label to use when the element is optional
- * - req(uired)Prefix: a prefix to the label to use when the element is required
- * - req(uired)Suffix: a suffix to the label to use when the element is required
- *
- * Any other options passed will be used as HTML attributes of the label tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Label.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Default placement: prepend
-     * @var string
-     */
-    protected $_placement = 'PREPEND';
-
-    /**
-     * HTML tag with which to surround label
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Set element ID
-     *
-     * @param  string $id
-     * @return Zend_Form_Decorator_Label
-     */
-    public function setId($id)
-    {
-        $this->setOption('id', $id);
-        return $this;
-    }
-
-    /**
-     * Retrieve element ID (used in 'for' attribute)
-     *
-     * If none set in decorator, looks first for element 'id' attribute, and
-     * defaults to element name.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        $id = $this->getOption('id');
-        if (null === $id) {
-            if (null !== ($element = $this->getElement())) {
-                $id = $element->getId();
-                $this->setId($id);
-            }
-        }
-
-        return $id;
-    }
-
-    /**
-     * Set HTML tag with which to surround label
-     *
-     * @param  string $tag
-     * @return Zend_Form_Decorator_Label
-     */
-    public function setTag($tag)
-    {
-        if (empty($tag)) {
-            $this->_tag = null;
-        } else {
-            $this->_tag = (string) $tag;
-        }
-
-        $this->removeOption('tag');
-
-        return $this;
-    }
-
-    /**
-     * Get HTML tag, if any, with which to surround label
-     *
-     * @return void
-     */
-    public function getTag()
-    {
-        if (null === $this->_tag) {
-            $tag = $this->getOption('tag');
-            if (null !== $tag) {
-                $this->removeOption('tag');
-                $this->setTag($tag);
-            }
-            return $tag;
-        }
-
-        return $this->_tag;
-    }
-
-    /**
-     * Get class with which to define label
-     *
-     * Appends either 'optional' or 'required' to class, depending on whether
-     * or not the element is required.
-     *
-     * @return string
-     */
-    public function getClass()
-    {
-        $class   = '';
-        $element = $this->getElement();
-
-        $decoratorClass = $this->getOption('class');
-        if (!empty($decoratorClass)) {
-            $class .= ' ' . $decoratorClass;
-        }
-
-        $type  = $element->isRequired() ? 'required' : 'optional';
-
-        if (!strstr($class, $type)) {
-            $class .= ' ' . $type;
-            $class = trim($class);
-        }
-
-        return $class;
-    }
-
-    /**
-     * Load an optional/required suffix/prefix key
-     *
-     * @param  string $key
-     * @return void
-     */
-    protected function _loadOptReqKey($key)
-    {
-        if (!isset($this->$key)) {
-            $value = $this->getOption($key);
-            $this->$key = (string) $value;
-            if (null !== $value) {
-                $this->removeOption($key);
-            }
-        }
-    }
-
-    /**
-     * Overloading
-     *
-     * Currently overloads:
-     *
-     * - getOpt(ional)Prefix()
-     * - getOpt(ional)Suffix()
-     * - getReq(uired)Prefix()
-     * - getReq(uired)Suffix()
-     * - setOpt(ional)Prefix()
-     * - setOpt(ional)Suffix()
-     * - setReq(uired)Prefix()
-     * - setReq(uired)Suffix()
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Form_Exception for unsupported methods
-     */
-    public function __call($method, $args)
-    {
-        $tail = substr($method, -6);
-        $head = substr($method, 0, 3);
-        if (in_array($head, array('get', 'set'))
-            && (('Prefix' == $tail) || ('Suffix' == $tail))
-        ) {
-            $position = substr($method, -6);
-            $type     = strtolower(substr($method, 3, 3));
-            switch ($type) {
-                case 'req':
-                    $key = 'required' . $position;
-                    break;
-                case 'opt':
-                    $key = 'optional' . $position;
-                    break;
-                default:
-                    require_once 'Zend/Form/Exception.php';
-                    throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator, and detected as type %s', $method, $type));
-            }
-
-            switch ($head) {
-                case 'set':
-                    if (0 === count($args)) {
-                        require_once 'Zend/Form/Exception.php';
-                        throw new Zend_Form_Exception(sprintf('Method "%s" requires at least one argument; none provided', $method));
-                    }
-                    $value = array_shift($args);
-                    $this->$key = $value;
-                    return $this;
-                case 'get':
-                default:
-                    if (null === ($element = $this->getElement())) {
-                        $this->_loadOptReqKey($key);
-                    } elseif (isset($element->$key)) {
-                        $this->$key = (string) $element->$key;
-                    } else {
-                        $this->_loadOptReqKey($key);
-                    }
-                    return $this->$key;
-            }
-        }
-
-        require_once 'Zend/Form/Exception.php';
-        throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator', $method));
-    }
-
-    /**
-     * Get label to render
-     *
-     * @return void
-     */
-    public function getLabel()
-    {
-        if (null === ($element = $this->getElement())) {
-            return '';
-        }
-
-        $label = $element->getLabel();
-        $label = trim($label);
-
-        if (empty($label)) {
-            return '';
-        }
-
-        if (null !== ($translator = $element->getTranslator())) {
-            $label = $translator->translate($label);
-        }
-
-        $optPrefix = $this->getOptPrefix();
-        $optSuffix = $this->getOptSuffix();
-        $reqPrefix = $this->getReqPrefix();
-        $reqSuffix = $this->getReqSuffix();
-        $separator = $this->getSeparator();
-
-        if (!empty($label)) {
-            if ($element->isRequired()) {
-                $label = $reqPrefix . $label . $reqSuffix;
-            } else {
-                $label = $optPrefix . $label . $optSuffix;
-            }
-        }
-
-        return $label;
-    }
-
-
-    /**
-     * Render a label
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $label     = $this->getLabel();
-        $separator = $this->getSeparator();
-        $placement = $this->getPlacement();
-        $tag       = $this->getTag();
-        $id        = $this->getId();
-        $class     = $this->getClass();
-        $options   = $this->getOptions();
-
-
-        if (empty($label) && empty($tag)) {
-            return $content;
-        }
-
-        if (!empty($label)) {
-            $options['class'] = $class;
-            $label = $view->formLabel($element->getFullyQualifiedName(), trim($label), $options);
-        } else {
-            $label = '&nbsp;';
-        }
-
-        if (null !== $tag) {
-            require_once 'Zend/Form/Decorator/HtmlTag.php';
-            $decorator = new Zend_Form_Decorator_HtmlTag();
-            $decorator->setOptions(array('tag' => $tag,
-                                         'id'  => $this->getElement()->getName() . '-label'));
-
-            $label = $decorator->render($label);
-        }
-
-        switch ($placement) {
-            case self::APPEND:
-                return $content . $separator . $label;
-            case self::PREPEND:
-                return $label . $separator . $content;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Marker/File/Interface.php b/airtime_mvc/library/Zend/Form/Decorator/Marker/File/Interface.php
deleted file mode 100644
index 47f9b75af..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Marker/File/Interface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Form_Decorator_Marker_File_Interface
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Form_Decorator_Marker_File_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/PrepareElements.php b/airtime_mvc/library/Zend/Form/Decorator/PrepareElements.php
deleted file mode 100644
index 008326a08..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/PrepareElements.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_FormElements */
-require_once 'Zend/Form/Decorator/FormElements.php';
-
-/**
- * Zend_Form_Decorator_PrepareElements
- *
- * Render all form elements registered with current form
- *
- * Accepts following options:
- * - separator: Separator to use between elements
- *
- * Any other options passed will be used as HTML attributes of the form tag.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PrepareElements.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_PrepareElements extends Zend_Form_Decorator_FormElements
-{
-    /**
-     * Render form elements
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $form = $this->getElement();
-        if ((!$form instanceof Zend_Form) && (!$form instanceof Zend_Form_DisplayGroup)) {
-            return $content;
-        }
-
-        $this->_recursivelyPrepareForm($form);
-
-        return $content;
-    }
-
-    protected function _recursivelyPrepareForm(Zend_Form $form)
-    {
-        $belongsTo      = ($form instanceof Zend_Form) ? $form->getElementsBelongTo() : null;
-        $elementContent = '';
-        $separator      = $this->getSeparator();
-        $translator     = $form->getTranslator();
-        $view           = $form->getView();
-
-        foreach ($form as $item) {
-            $item->setView($view)
-                 ->setTranslator($translator);
-            if ($item instanceof Zend_Form_Element) {
-                $item->setBelongsTo($belongsTo);
-            } elseif (!empty($belongsTo) && ($item instanceof Zend_Form)) {
-                if ($item->isArray()) {
-                    $name = $this->mergeBelongsTo($belongsTo, $item->getElementsBelongTo());
-                    $item->setElementsBelongTo($name, true);
-                } else {
-                    $item->setElementsBelongTo($belongsTo, true);
-                }
-                $this->_recursivelyPrepareForm($item);
-            } elseif (!empty($belongsTo) && ($item instanceof Zend_Form_DisplayGroup)) {
-                foreach ($item as $element) {
-                    $element->setBelongsTo($belongsTo);
-                }
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/Tooltip.php b/airtime_mvc/library/Zend/Form/Decorator/Tooltip.php
deleted file mode 100644
index 37a5e249d..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/Tooltip.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_Tooltip
- *
- * Will translate the title attribute, if available
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tooltip.php$
- */
-class Zend_Form_Decorator_Tooltip extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Translates the title attribute if it is available, if the translator is available
-     * and if the translator is not disable on the element being rendered.
-     *
-     * @param string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        if (null !== ($title = $this->getElement()->getAttrib('title'))) {
-            if (null !== ($translator = $this->getElement()->getTranslator())) {
-                $title = $translator->translate($title);
-            }
-        }
-
-        $this->getElement()->setAttrib('title', $title);
-        return $content;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Form/Decorator/ViewHelper.php b/airtime_mvc/library/Zend/Form/Decorator/ViewHelper.php
deleted file mode 100644
index 50ece1065..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/ViewHelper.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_ViewHelper
- *
- * Decorate an element by using a view helper to render it.
- *
- * Accepts the following options:
- * - separator: string with which to separate passed in content and generated content
- * - placement: whether to append or prepend the generated content to the passed in content
- * - helper:    the name of the view helper to use
- *
- * Assumes the view helper accepts three parameters, the name, value, and
- * optional attributes; these will be provided by the element.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewHelper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_ViewHelper extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Element types that represent buttons
-     * @var array
-     */
-    protected $_buttonTypes = array(
-        'Zend_Form_Element_Button',
-        'Zend_Form_Element_Reset',
-        'Zend_Form_Element_Submit',
-    );
-
-    /**
-     * View helper to use when rendering
-     * @var string
-     */
-    protected $_helper;
-
-    /**
-     * Set view helper to use when rendering
-     *
-     * @param  string $helper
-     * @return Zend_Form_Decorator_Element_ViewHelper
-     */
-    public function setHelper($helper)
-    {
-        $this->_helper = (string) $helper;
-        return $this;
-    }
-
-    /**
-     * Retrieve view helper for rendering element
-     *
-     * @return string
-     */
-    public function getHelper()
-    {
-        if (null === $this->_helper) {
-            $options = $this->getOptions();
-            if (isset($options['helper'])) {
-                $this->setHelper($options['helper']);
-                $this->removeOption('helper');
-            } else {
-                $element = $this->getElement();
-                if (null !== $element) {
-                    if (null !== ($helper = $element->getAttrib('helper'))) {
-                        $this->setHelper($helper);
-                    } else {
-                        $type = $element->getType();
-                        if ($pos = strrpos($type, '_')) {
-                            $type = substr($type, $pos + 1);
-                        }
-                        $this->setHelper('form' . ucfirst($type));
-                    }
-                }
-            }
-        }
-
-        return $this->_helper;
-    }
-
-    /**
-     * Get name
-     *
-     * If element is a Zend_Form_Element, will attempt to namespace it if the
-     * element belongs to an array.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        if (null === ($element = $this->getElement())) {
-            return '';
-        }
-
-        $name = $element->getName();
-
-        if (!$element instanceof Zend_Form_Element) {
-            return $name;
-        }
-
-        if (null !== ($belongsTo = $element->getBelongsTo())) {
-            $name = $belongsTo . '['
-                  . $name
-                  . ']';
-        }
-
-        if ($element->isArray()) {
-            $name .= '[]';
-        }
-
-        return $name;
-    }
-
-    /**
-     * Retrieve element attributes
-     *
-     * Set id to element name and/or array item.
-     *
-     * @return array
-     */
-    public function getElementAttribs()
-    {
-        if (null === ($element = $this->getElement())) {
-            return null;
-        }
-
-        $attribs = $element->getAttribs();
-        if (isset($attribs['helper'])) {
-            unset($attribs['helper']);
-        }
-
-        if (method_exists($element, 'getSeparator')) {
-            if (null !== ($listsep = $element->getSeparator())) {
-                $attribs['listsep'] = $listsep;
-            }
-        }
-
-        if (isset($attribs['id'])) {
-            return $attribs;
-        }
-
-        $id = $element->getName();
-
-        if ($element instanceof Zend_Form_Element) {
-            if (null !== ($belongsTo = $element->getBelongsTo())) {
-                $belongsTo = preg_replace('/\[([^\]]+)\]/', '-$1', $belongsTo);
-                $id = $belongsTo . '-' . $id;
-            }
-        }
-
-        $element->setAttrib('id', $id);
-        $attribs['id'] = $id;
-
-        return $attribs;
-    }
-
-    /**
-     * Get value
-     *
-     * If element type is one of the button types, returns the label.
-     *
-     * @param  Zend_Form_Element $element
-     * @return string|null
-     */
-    public function getValue($element)
-    {
-        if (!$element instanceof Zend_Form_Element) {
-            return null;
-        }
-
-        foreach ($this->_buttonTypes as $type) {
-            if ($element instanceof $type) {
-                if (stristr($type, 'button')) {
-                    $element->content = $element->getLabel();
-                    return null;
-                }
-                return $element->getLabel();
-            }
-        }
-
-        return $element->getValue();
-    }
-
-    /**
-     * Render an element using a view helper
-     *
-     * Determine view helper from 'viewHelper' option, or, if none set, from
-     * the element type. Then call as
-     * helper($element->getName(), $element->getValue(), $element->getAttribs())
-     *
-     * @param  string $content
-     * @return string
-     * @throws Zend_Form_Decorator_Exception if element or view are not registered
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-
-        $view = $element->getView();
-        if (null === $view) {
-            require_once 'Zend/Form/Decorator/Exception.php';
-            throw new Zend_Form_Decorator_Exception('ViewHelper decorator cannot render without a registered view object');
-        }
-
-        if (method_exists($element, 'getMultiOptions')) {
-            $element->getMultiOptions();
-        }
-
-        $helper        = $this->getHelper();
-        $separator     = $this->getSeparator();
-        $value         = $this->getValue($element);
-        $attribs       = $this->getElementAttribs();
-        $name          = $element->getFullyQualifiedName();
-        $id            = $element->getId();
-        $attribs['id'] = $id;
-
-        $helperObject  = $view->getHelper($helper);
-        if (method_exists($helperObject, 'setTranslator')) {
-            $helperObject->setTranslator($element->getTranslator());
-        }
-
-        $elementContent = $view->$helper($name, $value, $attribs, $element->options);
-        switch ($this->getPlacement()) {
-            case self::APPEND:
-                return $content . $separator . $elementContent;
-            case self::PREPEND:
-                return $elementContent . $separator . $content;
-            default:
-                return $elementContent;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Decorator/ViewScript.php b/airtime_mvc/library/Zend/Form/Decorator/ViewScript.php
deleted file mode 100644
index 32f25ac2d..000000000
--- a/airtime_mvc/library/Zend/Form/Decorator/ViewScript.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Decorator_Abstract */
-require_once 'Zend/Form/Decorator/Abstract.php';
-
-/**
- * Zend_Form_Decorator_ViewScript
- *
- * Render a view script as a decorator
- *
- * Accepts the options:
- * - separator: separator to use between view script content and provided content (defaults to PHP_EOL)
- * - placement: whether to append or prepend view script content to provided content (defaults to prepend)
- * - viewScript: view script to use
- *
- * The view script is rendered as a partial; the element being decorated is
- * passed in as the 'element' variable:
- * <code>
- * // in view script:
- * echo $this->element->getLabel();
- * </code>
- *
- * Any options other than separator, placement, and viewScript are passed to
- * the partial as local variables.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Decorator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewScript.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Decorator_ViewScript extends Zend_Form_Decorator_Abstract
-{
-    /**
-     * Default placement: append
-     * @var string
-     */
-    protected $_placement = 'APPEND';
-
-    /**
-     * View script to render
-     * @var string
-     */
-    protected $_viewScript;
-
-    /**
-     * Set view script
-     *
-     * @param  string $script
-     * @return Zend_Form_Decorator_ViewScript
-     */
-    public function setViewScript($script)
-    {
-        $this->_viewScript = (string) $script;
-        return $this;
-    }
-
-    /**
-     * Get view script
-     *
-     * @return string|null
-     */
-    public function getViewScript()
-    {
-        if (null === $this->_viewScript) {
-            if (null !== ($element = $this->getElement())) {
-                if (null !== ($viewScript = $element->getAttrib('viewScript'))) {
-                    $this->setViewScript($viewScript);
-                    return $viewScript;
-                }
-            }
-
-            if (null !== ($viewScript = $this->getOption('viewScript'))) {
-                $this->setViewScript($viewScript)
-                     ->removeOption('viewScript');
-            }
-        }
-
-        return $this->_viewScript;
-    }
-
-    /**
-     * Render a view script
-     *
-     * @param  string $content
-     * @return string
-     */
-    public function render($content)
-    {
-        $element = $this->getElement();
-        $view    = $element->getView();
-        if (null === $view) {
-            return $content;
-        }
-
-        $viewScript = $this->getViewScript();
-        if (empty($viewScript)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('No view script registered with ViewScript decorator');
-        }
-
-        $separator = $this->getSeparator();
-        $placement = $this->getPlacement();
-
-        $vars              = $this->getOptions();
-        $vars['element']   = $element;
-        $vars['content']   = $content;
-        $vars['decorator'] = $this;
-
-        $renderedContent = $view->partial($viewScript, $vars);
-
-        // Get placement again to see if it has changed
-        $placement = $this->getPlacement();
-
-        switch ($placement) {
-            case self::PREPEND:
-                return $renderedContent . $separator . $content;
-            case self::APPEND:
-                return $content . $separator . $renderedContent;
-            default:
-                return $renderedContent;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/DisplayGroup.php b/airtime_mvc/library/Zend/Form/DisplayGroup.php
deleted file mode 100644
index 772f0e4a6..000000000
--- a/airtime_mvc/library/Zend/Form/DisplayGroup.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Form_DisplayGroup
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DisplayGroup.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_DisplayGroup implements Iterator,Countable
-{
-    /**
-     * Group attributes
-     * @var array
-     */
-    protected $_attribs = array();
-
-    /**
-     * Display group decorators
-     * @var array
-     */
-    protected $_decorators = array();
-
-    /**
-     * Description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Should we disable loading the default decorators?
-     * @var bool
-     */
-    protected $_disableLoadDefaultDecorators = false;
-
-    /**
-     * Element order
-     * @var array
-     */
-    protected $_elementOrder = array();
-
-    /**
-     * Elements
-     * @var array
-     */
-    protected $_elements = array();
-
-    /**
-     * Whether or not a new element has been added to the group
-     * @var bool
-     */
-    protected $_groupUpdated = false;
-
-    /**
-     * Plugin loader for decorators
-     * @var Zend_Loader_PluginLoader
-     */
-    protected $_loader;
-
-    /**
-     * Group name
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Group order
-     * @var int
-     */
-    protected $_order;
-
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Is translation disabled?
-     * @var bool
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * Constructor
-     *
-     * @param  string $name
-     * @param  Zend_Loader_PluginLoader $loader
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($name, Zend_Loader_PluginLoader $loader, $options = null)
-    {
-        $this->setName($name);
-
-        $this->setPluginLoader($loader);
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } elseif ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        // Extensions...
-        $this->init();
-
-        $this->loadDefaultDecorators();
-    }
-
-    /**
-     * Initialize object; used by extending classes
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Set options
-     *
-     * @param  array $options
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setOptions(array $options)
-    {
-        $forbidden = array(
-            'Options', 'Config', 'PluginLoader', 'View',
-            'Translator', 'Attrib'
-        );
-        foreach ($options as $key => $value) {
-            $normalized = ucfirst($key);
-
-            if (in_array($normalized, $forbidden)) {
-                continue;
-            }
-
-            $method = 'set' . $normalized;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            } else {
-                $this->setAttrib($key, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set options from config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set group attribute
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setAttrib($key, $value)
-    {
-        $key = (string) $key;
-        $this->_attribs[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * Add multiple form attributes at once
-     *
-     * @param  array $attribs
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addAttribs(array $attribs)
-    {
-        foreach ($attribs as $key => $value) {
-            $this->setAttrib($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple form attributes at once
-     *
-     * Overwrites any previously set attributes.
-     *
-     * @param  array $attribs
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setAttribs(array $attribs)
-    {
-        $this->clearAttribs();
-        return $this->addAttribs($attribs);
-    }
-
-    /**
-     * Retrieve a single form attribute
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getAttrib($key)
-    {
-        $key = (string) $key;
-        if (!isset($this->_attribs[$key])) {
-            return null;
-        }
-
-        return $this->_attribs[$key];
-    }
-
-    /**
-     * Retrieve all form attributes/metadata
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        return $this->_attribs;
-    }
-
-    /**
-     * Remove attribute
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function removeAttrib($key)
-    {
-        if (array_key_exists($key, $this->_attribs)) {
-            unset($this->_attribs[$key]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all form attributes
-     *
-     * @return Zend_Form
-     */
-    public function clearAttribs()
-    {
-        $this->_attribs = array();
-        return $this;
-    }
-
-    /**
-     * Filter a name to only allow valid variable characters
-     *
-     * @param  string $value
-     * @return string
-     */
-    public function filterName($value)
-    {
-        return preg_replace('/[^a-zA-Z0-9_\x7f-\xff]/', '', (string) $value);
-    }
-
-    /**
-     * Set group name
-     *
-     * @param  string $name
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setName($name)
-    {
-        $name = $this->filtername($name);
-        if (('0' !== $name) && empty($name)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty');
-        }
-
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve group name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get fully qualified name
-     *
-     * Places name as subitem of array and/or appends brackets.
-     *
-     * @return string
-     */
-    public function getFullyQualifiedName()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Get element id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (isset($this->id)) {
-            return $this->id;
-        }
-
-        $id = $this->getFullyQualifiedName();
-
-        // Bail early if no array notation detected
-        if (!strstr($id, '[')) {
-            return $id;
-        }
-
-        // Strip array notation
-        if ('[]' == substr($id, -2)) {
-            $id = substr($id, 0, strlen($id) - 2);
-        }
-        $id = str_replace('][', '-', $id);
-        $id = str_replace(array(']', '['), '-', $id);
-        $id = trim($id, '-');
-
-        return $id;
-    }
-
-    /**
-     * Set group legend
-     *
-     * @param  string $legend
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setLegend($legend)
-    {
-        return $this->setAttrib('legend', (string) $legend);
-    }
-
-    /**
-     * Retrieve group legend
-     *
-     * @return string
-     */
-    public function getLegend()
-    {
-        return $this->getAttrib('legend');
-    }
-
-    /**
-     * Set description
-     *
-     * @param  string $value
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setDescription($value)
-    {
-        $this->_description = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Get description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set group order
-     *
-     * @param  int $order
-     * @return Zend_Form_Element
-     */
-    public function setOrder($order)
-    {
-        $this->_order = (int) $order;
-        return $this;
-    }
-
-    /**
-     * Retrieve group order
-     *
-     * @return int
-     */
-    public function getOrder()
-    {
-        return $this->_order;
-    }
-
-    // Elements
-
-    /**
-     * Add element to stack
-     *
-     * @param  Zend_Form_Element $element
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addElement(Zend_Form_Element $element)
-    {
-        $this->_elements[$element->getName()] = $element;
-        $this->_groupUpdated = true;
-        return $this;
-    }
-
-    /**
-     * Add multiple elements at once
-     *
-     * @param  array $elements
-     * @return Zend_Form_DisplayGroup
-     * @throws Zend_Form_Exception if any element is not a Zend_Form_Element
-     */
-    public function addElements(array $elements)
-    {
-        foreach ($elements as $element) {
-            if (!$element instanceof Zend_Form_Element) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('elements passed via array to addElements() must be Zend_Form_Elements only');
-            }
-            $this->addElement($element);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple elements at once (overwrites)
-     *
-     * @param  array $elements
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setElements(array $elements)
-    {
-        $this->clearElements();
-        return $this->addElements($elements);
-    }
-
-    /**
-     * Retrieve element
-     *
-     * @param  string $name
-     * @return Zend_Form_Element|null
-     */
-    public function getElement($name)
-    {
-        $name = (string) $name;
-        if (isset($this->_elements[$name])) {
-            return $this->_elements[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve elements
-     * @return array
-     */
-    public function getElements()
-    {
-        return $this->_elements;
-    }
-
-    /**
-     * Remove a single element
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function removeElement($name)
-    {
-        $name = (string) $name;
-        if (array_key_exists($name, $this->_elements)) {
-            unset($this->_elements[$name]);
-            $this->_groupUpdated = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove all elements
-     *
-     * @return Zend_Form_DisplayGroup
-     */
-    public function clearElements()
-    {
-        $this->_elements = array();
-        $this->_groupUpdated = true;
-        return $this;
-    }
-
-    // Plugin loader (for decorators)
-
-    /**
-     * Set plugin loader
-     *
-     * @param  Zend_Loader_PluginLoader $loader
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader $loader)
-    {
-        $this->_loader = $loader;
-        return $this;
-    }
-
-    /**
-     * Retrieve plugin loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader()
-    {
-        return $this->_loader;
-    }
-
-    /**
-     * Add a prefix path for the plugin loader
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addPrefixPath($prefix, $path)
-    {
-        $this->getPluginLoader()->addPrefixPath($prefix, $path);
-        return $this;
-    }
-
-    /**
-     * Add several prefix paths at once
-     *
-     * @param  array $spec
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            return $this->addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $prefix => $paths) {
-            if (is_numeric($prefix) && is_array($paths)) {
-                $prefix = null;
-                if (isset($paths['prefix']) && isset($paths['path'])) {
-                    $this->addPrefixPath($paths['prefix'], $paths['path']);
-                }
-            } elseif (!is_numeric($prefix)) {
-                if (is_string($paths)) {
-                    $this->addPrefixPath($prefix, $paths);
-                } elseif (is_array($paths)) {
-                    foreach ($paths as $path) {
-                        $this->addPrefixPath($prefix, $path);
-                    }
-                }
-            }
-        }
-        return $this;
-    }
-
-    // Decorators
-
-    /**
-     * Set flag to disable loading default decorators
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setDisableLoadDefaultDecorators($flag)
-    {
-        $this->_disableLoadDefaultDecorators = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Should we load the default decorators?
-     *
-     * @return bool
-     */
-    public function loadDefaultDecoratorsIsDisabled()
-    {
-        return $this->_disableLoadDefaultDecorators;
-    }
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                 ->addDecorator('HtmlTag', array('tag' => 'dl'))
-                 ->addDecorator('Fieldset')
-                 ->addDecorator('DtDdWrapper');
-        }
-    }
-
-    /**
-     * Instantiate a decorator based on class name or class name fragment
-     *
-     * @param  string $name
-     * @param  null|array $options
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _getDecorator($name, $options = null)
-    {
-        $class = $this->getPluginLoader()->load($name);
-        if (null === $options) {
-            $decorator = new $class;
-        } else {
-            $decorator = new $class($options);
-        }
-
-        return $decorator;
-    }
-
-    /**
-     * Add a decorator for rendering the group
-     *
-     * @param  string|Zend_Form_Decorator_Interface $decorator
-     * @param  array|Zend_Config $options Options with which to initialize decorator
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addDecorator($decorator, $options = null)
-    {
-        if ($decorator instanceof Zend_Form_Decorator_Interface) {
-            $name = get_class($decorator);
-        } elseif (is_string($decorator)) {
-            $name      = $decorator;
-            $decorator = array(
-                'decorator' => $name,
-                'options'   => $options,
-            );
-        } elseif (is_array($decorator)) {
-            foreach ($decorator as $name => $spec) {
-                break;
-            }
-            if (is_numeric($name)) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string');
-            }
-            if (is_string($spec)) {
-                $decorator = array(
-                    'decorator' => $spec,
-                    'options'   => $options,
-                );
-            } elseif ($spec instanceof Zend_Form_Decorator_Interface) {
-                $decorator = $spec;
-            }
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface');
-        }
-
-        $this->_decorators[$name] = $decorator;
-
-        return $this;
-    }
-
-    /**
-     * Add many decorators at once
-     *
-     * @param  array $decorators
-     * @return Zend_Form_DisplayGroup
-     */
-    public function addDecorators(array $decorators)
-    {
-        foreach ($decorators as $decoratorInfo) {
-            if (is_string($decoratorInfo)) {
-                $this->addDecorator($decoratorInfo);
-            } elseif ($decoratorInfo instanceof Zend_Form_Decorator_Interface) {
-                $this->addDecorator($decoratorInfo);
-            } elseif (is_array($decoratorInfo)) {
-                $argc    = count($decoratorInfo);
-                $options = array();
-                if (isset($decoratorInfo['decorator'])) {
-                    $decorator = $decoratorInfo['decorator'];
-                    if (isset($decoratorInfo['options'])) {
-                        $options = $decoratorInfo['options'];
-                    }
-                    $this->addDecorator($decorator, $options);
-                } else {
-                    switch (true) {
-                        case (0 == $argc):
-                            break;
-                        case (1 <= $argc):
-                            $decorator  = array_shift($decoratorInfo);
-                        case (2 <= $argc):
-                            $options = array_shift($decoratorInfo);
-                        default:
-                            $this->addDecorator($decorator, $options);
-                            break;
-                    }
-                }
-            } else {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Overwrite all decorators
-     *
-     * @param  array $decorators
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setDecorators(array $decorators)
-    {
-        $this->clearDecorators();
-        return $this->addDecorators($decorators);
-    }
-
-    /**
-     * Retrieve a registered decorator
-     *
-     * @param  string $name
-     * @return false|Zend_Form_Decorator_Abstract
-     */
-    public function getDecorator($name)
-    {
-        if (!isset($this->_decorators[$name])) {
-            $len = strlen($name);
-            foreach ($this->_decorators as $localName => $decorator) {
-                if ($len > strlen($localName)) {
-                    continue;
-                }
-
-                if (0 === substr_compare($localName, $name, -$len, $len, true)) {
-                    if (is_array($decorator)) {
-                        return $this->_loadDecorator($decorator, $localName);
-                    }
-                    return $decorator;
-                }
-            }
-            return false;
-        }
-
-        if (is_array($this->_decorators[$name])) {
-            return $this->_loadDecorator($this->_decorators[$name], $name);
-        }
-
-        return $this->_decorators[$name];
-    }
-
-    /**
-     * Retrieve all decorators
-     *
-     * @return array
-     */
-    public function getDecorators()
-    {
-        foreach ($this->_decorators as $key => $value) {
-            if (is_array($value)) {
-                $this->_loadDecorator($value, $key);
-            }
-        }
-        return $this->_decorators;
-    }
-
-    /**
-     * Remove a single decorator
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function removeDecorator($name)
-    {
-        $decorator = $this->getDecorator($name);
-        if ($decorator) {
-            if (array_key_exists($name, $this->_decorators)) {
-                unset($this->_decorators[$name]);
-            } else {
-                $class = get_class($decorator);
-                unset($this->_decorators[$class]);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all decorators
-     *
-     * @return Zend_Form_DisplayGroup
-     */
-    public function clearDecorators()
-    {
-        $this->_decorators = array();
-        return $this;
-    }
-
-    /**
-     * Set view
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        $this->_view = $view;
-        return $this;
-    }
-
-    /**
-     * Retrieve view
-     *
-     * @return Zend_View_Interface
-     */
-    public function getView()
-    {
-        if (null === $this->_view) {
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            $this->setView($viewRenderer->view);
-        }
-
-        return $this->_view;
-    }
-
-    /**
-     * Render display group
-     *
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            $this->setView($view);
-        }
-        $content = '';
-        foreach ($this->getDecorators() as $decorator) {
-            $decorator->setElement($this);
-            $content = $decorator->render($content);
-        }
-        return $content;
-    }
-
-    /**
-     * String representation of group
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->render();
-            return $return;
-        } catch (Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            return '';
-        }
-    }
-
-    /**
-     * Set translator object
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid translator specified');
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve translator object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        if (null === $this->_translator) {
-            require_once 'Zend/Form.php';
-            return Zend_Form::getDefaultTranslator();
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Form_DisplayGroup
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    /**
-     * Overloading: allow rendering specific decorators
-     *
-     * Call renderDecoratorName() to render a specific decorator.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return string
-     * @throws Zend_Form_Exception for invalid decorator or invalid method call
-     */
-    public function __call($method, $args)
-    {
-        if ('render' == substr($method, 0, 6)) {
-            $decoratorName = substr($method, 6);
-            if (false !== ($decorator = $this->getDecorator($decoratorName))) {
-                $decorator->setElement($this);
-                $seed = '';
-                if (0 < count($args)) {
-                    $seed = array_shift($args);
-                }
-                return $decorator->render($seed);
-            }
-
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName));
-        }
-
-        require_once 'Zend/Form/Exception.php';
-        throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method));
-    }
-
-    // Interfaces: Iterator, Countable
-
-    /**
-     * Current element
-     *
-     * @return Zend_Form_Element
-     */
-    public function current()
-    {
-        $this->_sort();
-        current($this->_elementOrder);
-        $key = key($this->_elementOrder);
-        return $this->getElement($key);
-    }
-
-    /**
-     * Current element
-     *
-     * @return string
-     */
-    public function key()
-    {
-        $this->_sort();
-        return key($this->_elementOrder);
-    }
-
-    /**
-     * Move pointer to next element
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_sort();
-        next($this->_elementOrder);
-    }
-
-    /**
-     * Move pointer to beginning of element loop
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_sort();
-        reset($this->_elementOrder);
-    }
-
-    /**
-     * Determine if current element/subform/display group is valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        $this->_sort();
-        return (current($this->_elementOrder) !== false);
-    }
-
-    /**
-     * Count of elements/subforms that are iterable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_elements);
-    }
-
-    /**
-     * Sort items according to their order
-     *
-     * @return void
-     */
-    protected function _sort()
-    {
-        if ($this->_groupUpdated || !is_array($this->_elementOrder)) {
-            $elementOrder = array();
-            foreach ($this->getElements() as $key => $element) {
-                $elementOrder[$key] = $element->getOrder();
-            }
-
-            $items = array();
-            $index = 0;
-            foreach ($elementOrder as $key => $order) {
-                if (null === $order) {
-                    while (array_search($index, $elementOrder, true)) {
-                        ++$index;
-                    }
-                    $items[$index] = $key;
-                    ++$index;
-                } else {
-                    $items[$order] = $key;
-                }
-            }
-
-            $items = array_flip($items);
-            asort($items);
-            $this->_elementOrder = $items;
-            $this->_groupUpdated = false;
-        }
-    }
-
-    /**
-     * Lazy-load a decorator
-     *
-     * @param  array $decorator Decorator type and options
-     * @param  mixed $name Decorator name or alias
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _loadDecorator(array $decorator, $name)
-    {
-        $sameName = false;
-        if ($name == $decorator['decorator']) {
-            $sameName = true;
-        }
-
-        $instance = $this->_getDecorator($decorator['decorator'], $decorator['options']);
-        if ($sameName) {
-            $newName            = get_class($instance);
-            $decoratorNames     = array_keys($this->_decorators);
-            $order              = array_flip($decoratorNames);
-            $order[$newName]    = $order[$name];
-            $decoratorsExchange = array();
-            unset($order[$name]);
-            asort($order);
-            foreach ($order as $key => $index) {
-                if ($key == $newName) {
-                    $decoratorsExchange[$key] = $instance;
-                    continue;
-                }
-                $decoratorsExchange[$key] = $this->_decorators[$key];
-            }
-            $this->_decorators = $decoratorsExchange;
-        } else {
-            $this->_decorators[$name] = $instance;
-        }
-
-        return $instance;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element.php b/airtime_mvc/library/Zend/Form/Element.php
deleted file mode 100644
index 72024e8f6..000000000
--- a/airtime_mvc/library/Zend/Form/Element.php
+++ /dev/null
@@ -1,2219 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Filter */
-require_once 'Zend/Filter.php';
-
-/** @see Zend_Form */
-require_once 'Zend/Form.php';
-
-/** @see Zend_Validate_Interface */
-require_once 'Zend/Validate/Interface.php';
-
-/**
- * Zend_Form_Element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Element.php 21649 2010-03-25 21:49:06Z rob $
- */
-class Zend_Form_Element implements Zend_Validate_Interface
-{
-    /**
-     * Element Constants
-     */
-    const DECORATOR = 'DECORATOR';
-    const FILTER    = 'FILTER';
-    const VALIDATE  = 'VALIDATE';
-
-    /**
-     * Default view helper to use
-     * @var string
-     */
-    public $helper = 'formText';
-
-    /**
-     * 'Allow empty' flag
-     * @var bool
-     */
-    protected $_allowEmpty = true;
-
-    /**
-     * Flag indicating whether or not to insert NotEmpty validator when element is required
-     * @var bool
-     */
-    protected $_autoInsertNotEmptyValidator = true;
-
-    /**
-     * Array to which element belongs
-     * @var string
-     */
-    protected $_belongsTo;
-
-    /**
-     * Element decorators
-     * @var array
-     */
-    protected $_decorators = array();
-
-    /**
-     * Element description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Should we disable loading the default decorators?
-     * @var bool
-     */
-    protected $_disableLoadDefaultDecorators = false;
-
-    /**
-     * Custom error messages
-     * @var array
-     */
-    protected $_errorMessages = array();
-
-    /**
-     * Validation errors
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * Separator to use when concatenating aggregate error messages (for
-     * elements having array values)
-     * @var string
-     */
-    protected $_errorMessageSeparator = '; ';
-
-    /**
-     * Element filters
-     * @var array
-     */
-    protected $_filters = array();
-
-    /**
-     * Ignore flag (used when retrieving values at form level)
-     * @var bool
-     */
-    protected $_ignore = false;
-
-    /**
-     * Does the element represent an array?
-     * @var bool
-     */
-    protected $_isArray = false;
-
-    /**
-     * Is the error marked as in an invalid state?
-     * @var bool
-     */
-    protected $_isError = false;
-
-    /**
-     * Has the element been manually marked as invalid?
-     * @var bool
-     */
-    protected $_isErrorForced = false;
-
-    /**
-     * Element label
-     * @var string
-     */
-    protected $_label;
-
-    /**
-     * Plugin loaders for filter and validator chains
-     * @var array
-     */
-    protected $_loaders = array();
-
-    /**
-     * Formatted validation error messages
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * Element name
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Order of element
-     * @var int
-     */
-    protected $_order;
-
-    /**
-     * Required flag
-     * @var bool
-     */
-    protected $_required = false;
-
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Is translation disabled?
-     * @var bool
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * Element type
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Array of initialized validators
-     * @var array Validators
-     */
-    protected $_validators = array();
-
-    /**
-     * Array of un-initialized validators
-     * @var array
-     */
-    protected $_validatorRules = array();
-
-    /**
-     * Element value
-     * @var mixed
-     */
-    protected $_value;
-
-    /**
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * Is a specific decorator being rendered via the magic renderDecorator()?
-     *
-     * This is to allow execution of logic inside the render() methods of child
-     * elements during the magic call while skipping the parent render() method.
-     *
-     * @var bool
-     */
-    protected $_isPartialRendering = false;
-
-    /**
-     * Constructor
-     *
-     * $spec may be:
-     * - string: name of element
-     * - array: options with which to configure element
-     * - Zend_Config: Zend_Config with options for configuring element
-     *
-     * @param  string|array|Zend_Config $spec
-     * @param  array|Zend_Config $options
-     * @return void
-     * @throws Zend_Form_Exception if no element name after initialization
-     */
-    public function __construct($spec, $options = null)
-    {
-        if (is_string($spec)) {
-            $this->setName($spec);
-        } elseif (is_array($spec)) {
-            $this->setOptions($spec);
-        } elseif ($spec instanceof Zend_Config) {
-            $this->setConfig($spec);
-        }
-
-        if (is_string($spec) && is_array($options)) {
-            $this->setOptions($options);
-        } elseif (is_string($spec) && ($options instanceof Zend_Config)) {
-            $this->setConfig($options);
-        }
-
-        if (null === $this->getName()) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Zend_Form_Element requires each element to have a name');
-        }
-
-        /**
-         * Extensions
-         */
-        $this->init();
-
-        /**
-         * Register ViewHelper decorator by default
-         */
-        $this->loadDefaultDecorators();
-    }
-
-    /**
-     * Initialize object; used by extending classes
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Set flag to disable loading default decorators
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setDisableLoadDefaultDecorators($flag)
-    {
-        $this->_disableLoadDefaultDecorators = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Should we load the default decorators?
-     *
-     * @return bool
-     */
-    public function loadDefaultDecoratorsIsDisabled()
-    {
-        return $this->_disableLoadDefaultDecorators;
-    }
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('ViewHelper')
-                ->addDecorator('Errors')
-                ->addDecorator('Description', array('tag' => 'p', 'class' => 'description'))
-                ->addDecorator('HtmlTag', array('tag' => 'dd',
-                                                'id'  => $this->getName() . '-element'))
-                ->addDecorator('Label', array('tag' => 'dt'));
-        }
-    }
-
-    /**
-     * Set object state from options array
-     *
-     * @param  array $options
-     * @return Zend_Form_Element
-     */
-    public function setOptions(array $options)
-    {
-        if (isset($options['prefixPath'])) {
-            $this->addPrefixPaths($options['prefixPath']);
-            unset($options['prefixPath']);
-        }
-
-        if (isset($options['disableTranslator'])) {
-            $this->setDisableTranslator($options['disableTranslator']);
-            unset($options['disableTranslator']);
-        }
-
-        unset($options['options']);
-        unset($options['config']);
-
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-
-            if (in_array($method, array('setTranslator', 'setPluginLoader', 'setView'))) {
-                if (!is_object($value)) {
-                    continue;
-                }
-            }
-
-            if (method_exists($this, $method)) {
-                // Setter exists; use it
-                $this->$method($value);
-            } else {
-                // Assume it's metadata
-                $this->setAttrib($key, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set object state from Zend_Config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Form_Element
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-
-    // Localization:
-
-    /**
-     * Set translator object for localization
-     *
-     * @param  Zend_Translate|null $translator
-     * @return Zend_Form_Element
-     */
-    public function setTranslator($translator = null)
-    {
-        if (null === $translator) {
-            $this->_translator = null;
-        } elseif ($translator instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid translator specified');
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve localization translator object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        if (null === $this->_translator) {
-            return Zend_Form::getDefaultTranslator();
-        }
-        return $this->_translator;
-    }
-    
-    /**
-     * Does this element have its own specific translator?
-     * 
-     * @return bool
-     */
-    public function hasTranslator()
-    {
-        return (bool)$this->_translator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    // Metadata
-
-    /**
-     * Filter a name to only allow valid variable characters
-     *
-     * @param  string $value
-     * @param  bool $allowBrackets
-     * @return string
-     */
-    public function filterName($value, $allowBrackets = false)
-    {
-        $charset = '^a-zA-Z0-9_\x7f-\xff';
-        if ($allowBrackets) {
-            $charset .= '\[\]';
-        }
-        return preg_replace('/[' . $charset . ']/', '', (string) $value);
-    }
-
-    /**
-     * Set element name
-     *
-     * @param  string $name
-     * @return Zend_Form_Element
-     */
-    public function setName($name)
-    {
-        $name = $this->filterName($name);
-        if ('' === $name) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty');
-        }
-
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * Return element name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get fully qualified name
-     *
-     * Places name as subitem of array and/or appends brackets.
-     *
-     * @return string
-     */
-    public function getFullyQualifiedName()
-    {
-        $name = $this->getName();
-
-        if (null !== ($belongsTo = $this->getBelongsTo())) {
-            $name = $belongsTo . '[' . $name . ']';
-        }
-
-        if ($this->isArray()) {
-            $name .= '[]';
-        }
-
-        return $name;
-    }
-
-    /**
-     * Get element id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (isset($this->id)) {
-            return $this->id;
-        }
-
-        $id = $this->getFullyQualifiedName();
-
-        // Bail early if no array notation detected
-        if (!strstr($id, '[')) {
-            return $id;
-        }
-
-        // Strip array notation
-        if ('[]' == substr($id, -2)) {
-            $id = substr($id, 0, strlen($id) - 2);
-        }
-        $id = str_replace('][', '-', $id);
-        $id = str_replace(array(']', '['), '-', $id);
-        $id = trim($id, '-');
-
-        return $id;
-    }
-
-    /**
-     * Set element value
-     *
-     * @param  mixed $value
-     * @return Zend_Form_Element
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Filter a value
-     *
-     * @param  string $value
-     * @param  string $key
-     * @return void
-     */
-    protected function _filterValue(&$value, &$key)
-    {
-        foreach ($this->getFilters() as $filter) {
-            $value = $filter->filter($value);
-        }
-    }
-
-    /**
-     * Retrieve filtered element value
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        $valueFiltered = $this->_value;
-
-        if ($this->isArray() && is_array($valueFiltered)) {
-            array_walk_recursive($valueFiltered, array($this, '_filterValue'));
-        } else {
-            $this->_filterValue($valueFiltered, $valueFiltered);
-        }
-
-        return $valueFiltered;
-    }
-
-    /**
-     * Retrieve unfiltered element value
-     *
-     * @return mixed
-     */
-    public function getUnfilteredValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set element label
-     *
-     * @param  string $label
-     * @return Zend_Form_Element
-     */
-    public function setLabel($label)
-    {
-        $this->_label = (string) $label;
-        return $this;
-    }
-
-    /**
-     * Retrieve element label
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        $translator = $this->getTranslator();
-        if (null !== $translator) {
-            return $translator->translate($this->_label);
-        }
-
-        return $this->_label;
-    }
-
-    /**
-     * Set element order
-     *
-     * @param  int $order
-     * @return Zend_Form_Element
-     */
-    public function setOrder($order)
-    {
-        $this->_order = (int) $order;
-        return $this;
-    }
-
-    /**
-     * Retrieve element order
-     *
-     * @return int
-     */
-    public function getOrder()
-    {
-        return $this->_order;
-    }
-
-    /**
-     * Set required flag
-     *
-     * @param  bool $flag Default value is true
-     * @return Zend_Form_Element
-     */
-    public function setRequired($flag = true)
-    {
-        $this->_required = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is the element required?
-     *
-     * @return bool
-     */
-    public function isRequired()
-    {
-        return $this->_required;
-    }
-
-    /**
-     * Set flag indicating whether a NotEmpty validator should be inserted when element is required
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setAutoInsertNotEmptyValidator($flag)
-    {
-        $this->_autoInsertNotEmptyValidator = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get flag indicating whether a NotEmpty validator should be inserted when element is required
-     *
-     * @return bool
-     */
-    public function autoInsertNotEmptyValidator()
-    {
-        return $this->_autoInsertNotEmptyValidator;
-    }
-
-    /**
-     * Set element description
-     *
-     * @param  string $description
-     * @return Zend_Form_Element
-     */
-    public function setDescription($description)
-    {
-        $this->_description = (string) $description;
-        return $this;
-    }
-
-    /**
-     * Retrieve element description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set 'allow empty' flag
-     *
-     * When the allow empty flag is enabled and the required flag is false, the
-     * element will validate with empty values.
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setAllowEmpty($flag)
-    {
-        $this->_allowEmpty = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get 'allow empty' flag
-     *
-     * @return bool
-     */
-    public function getAllowEmpty()
-    {
-        return $this->_allowEmpty;
-    }
-
-    /**
-     * Set ignore flag (used when retrieving values at form level)
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setIgnore($flag)
-    {
-        $this->_ignore = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get ignore flag (used when retrieving values at form level)
-     *
-     * @return bool
-     */
-    public function getIgnore()
-    {
-        return $this->_ignore;
-    }
-
-    /**
-     * Set flag indicating if element represents an array
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element
-     */
-    public function setIsArray($flag)
-    {
-        $this->_isArray = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is the element representing an array?
-     *
-     * @return bool
-     */
-    public function isArray()
-    {
-        return $this->_isArray;
-    }
-
-    /**
-     * Set array to which element belongs
-     *
-     * @param  string $array
-     * @return Zend_Form_Element
-     */
-    public function setBelongsTo($array)
-    {
-        $array = $this->filterName($array, true);
-        if (!empty($array)) {
-            $this->_belongsTo = $array;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return array name to which element belongs
-     *
-     * @return string
-     */
-    public function getBelongsTo()
-    {
-        return $this->_belongsTo;
-    }
-
-    /**
-     * Return element type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        if (null === $this->_type) {
-            $this->_type = get_class($this);
-        }
-
-        return $this->_type;
-    }
-
-    /**
-     * Set element attribute
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Form_Element
-     * @throws Zend_Form_Exception for invalid $name values
-     */
-    public function setAttrib($name, $value)
-    {
-        $name = (string) $name;
-        if ('_' == $name[0]) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Invalid attribute "%s"; must not contain a leading underscore', $name));
-        }
-
-        if (null === $value) {
-            unset($this->$name);
-        } else {
-            $this->$name = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set multiple attributes at once
-     *
-     * @param  array $attribs
-     * @return Zend_Form_Element
-     */
-    public function setAttribs(array $attribs)
-    {
-        foreach ($attribs as $key => $value) {
-            $this->setAttrib($key, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve element attribute
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function getAttrib($name)
-    {
-        $name = (string) $name;
-        if (isset($this->$name)) {
-            return $this->$name;
-        }
-
-        return null;
-    }
-
-    /**
-     * Return all attributes
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        $attribs = get_object_vars($this);
-        foreach ($attribs as $key => $value) {
-            if ('_' == substr($key, 0, 1)) {
-                unset($attribs[$key]);
-            }
-        }
-
-        return $attribs;
-    }
-
-    /**
-     * Overloading: retrieve object property
-     *
-     * Prevents access to properties beginning with '_'.
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if ('_' == $key[0]) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Cannot retrieve value for protected/private property "%s"', $key));
-        }
-
-        if (!isset($this->$key)) {
-            return null;
-        }
-
-        return $this->$key;
-    }
-
-    /**
-     * Overloading: set object property
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return voide
-     */
-    public function __set($key, $value)
-    {
-        $this->setAttrib($key, $value);
-    }
-
-    /**
-     * Overloading: allow rendering specific decorators
-     *
-     * Call renderDecoratorName() to render a specific decorator.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return string
-     * @throws Zend_Form_Exception for invalid decorator or invalid method call
-     */
-    public function __call($method, $args)
-    {
-        if ('render' == substr($method, 0, 6)) {
-            $this->_isPartialRendering = true;
-            $this->render();
-            $this->_isPartialRendering = false;
-            $decoratorName = substr($method, 6);
-            if (false !== ($decorator = $this->getDecorator($decoratorName))) {
-                $decorator->setElement($this);
-                $seed = '';
-                if (0 < count($args)) {
-                    $seed = array_shift($args);
-                }
-                return $decorator->render($seed);
-            }
-
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception(sprintf('Decorator by name %s does not exist', $decoratorName));
-        }
-
-        require_once 'Zend/Form/Element/Exception.php';
-        throw new Zend_Form_Element_Exception(sprintf('Method %s does not exist', $method));
-    }
-
-    // Loaders
-
-    /**
-     * Set plugin loader to use for validator or filter chain
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @param  string $type 'decorator', 'filter', or 'validate'
-     * @return Zend_Form_Element
-     * @throws Zend_Form_Exception on invalid type
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::DECORATOR:
-            case self::FILTER:
-            case self::VALIDATE:
-                $this->_loaders[$type] = $loader;
-                return $this;
-            default:
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Retrieve plugin loader for validator or filter chain
-     *
-     * Instantiates with default rules if none available for that type. Use
-     * 'decorator', 'filter', or 'validate' for $type.
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader
-     * @throws Zend_Loader_Exception on invalid type.
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::FILTER:
-            case self::VALIDATE:
-                $prefixSegment = ucfirst(strtolower($type));
-                $pathSegment   = $prefixSegment;
-            case self::DECORATOR:
-                if (!isset($prefixSegment)) {
-                    $prefixSegment = 'Form_Decorator';
-                    $pathSegment   = 'Form/Decorator';
-                }
-                if (!isset($this->_loaders[$type])) {
-                    require_once 'Zend/Loader/PluginLoader.php';
-                    $this->_loaders[$type] = new Zend_Loader_PluginLoader(
-                        array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/')
-                    );
-                }
-                return $this->_loaders[$type];
-            default:
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Add prefix path for plugin loader
-     *
-     * If no $type specified, assumes it is a base path for both filters and
-     * validators, and sets each according to the following rules:
-     * - decorators: $prefix = $prefix . '_Decorator'
-     * - filters: $prefix = $prefix . '_Filter'
-     * - validators: $prefix = $prefix . '_Validate'
-     *
-     * Otherwise, the path prefix is set on the appropriate plugin loader.
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_Form_Element
-     * @throws Zend_Form_Exception for invalid type
-     */
-    public function addPrefixPath($prefix, $path, $type = null)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case self::DECORATOR:
-            case self::FILTER:
-            case self::VALIDATE:
-                $loader = $this->getPluginLoader($type);
-                $loader->addPrefixPath($prefix, $path);
-                return $this;
-            case null:
-                $prefix = rtrim($prefix, '_');
-                $path   = rtrim($path, DIRECTORY_SEPARATOR);
-                foreach (array(self::DECORATOR, self::FILTER, self::VALIDATE) as $type) {
-                    $cType        = ucfirst(strtolower($type));
-                    $pluginPath   = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR;
-                    $pluginPrefix = $prefix . '_' . $cType;
-                    $loader       = $this->getPluginLoader($type);
-                    $loader->addPrefixPath($pluginPrefix, $pluginPath);
-                }
-                return $this;
-            default:
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
-        }
-    }
-
-    /**
-     * Add many prefix paths at once
-     *
-     * @param  array $spec
-     * @return Zend_Form_Element
-     */
-    public function addPrefixPaths(array $spec)
-    {
-        if (isset($spec['prefix']) && isset($spec['path'])) {
-            return $this->addPrefixPath($spec['prefix'], $spec['path']);
-        }
-        foreach ($spec as $type => $paths) {
-            if (is_numeric($type) && is_array($paths)) {
-                $type = null;
-                if (isset($paths['prefix']) && isset($paths['path'])) {
-                    if (isset($paths['type'])) {
-                        $type = $paths['type'];
-                    }
-                    $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-                }
-            } elseif (!is_numeric($type)) {
-                if (!isset($paths['prefix']) || !isset($paths['path'])) {
-                    foreach ($paths as $prefix => $spec) {
-                        if (is_array($spec)) {
-                            foreach ($spec as $path) {
-                                if (!is_string($path)) {
-                                    continue;
-                                }
-                                $this->addPrefixPath($prefix, $path, $type);
-                            }
-                        } elseif (is_string($spec)) {
-                            $this->addPrefixPath($prefix, $spec, $type);
-                        }
-                    }
-                } else {
-                    $this->addPrefixPath($paths['prefix'], $paths['path'], $type);
-                }
-            }
-        }
-        return $this;
-    }
-
-    // Validation
-
-    /**
-     * Add validator to validation chain
-     *
-     * Note: will overwrite existing validators if they are of the same class.
-     *
-     * @param  string|Zend_Validate_Interface $validator
-     * @param  bool $breakChainOnFailure
-     * @param  array $options
-     * @return Zend_Form_Element
-     * @throws Zend_Form_Exception if invalid validator type
-     */
-    public function addValidator($validator, $breakChainOnFailure = false, $options = array())
-    {
-        if ($validator instanceof Zend_Validate_Interface) {
-            $name = get_class($validator);
-
-            if (!isset($validator->zfBreakChainOnFailure)) {
-                $validator->zfBreakChainOnFailure = $breakChainOnFailure;
-            }
-        } elseif (is_string($validator)) {
-            $name      = $validator;
-            $validator = array(
-                'validator' => $validator,
-                'breakChainOnFailure' => $breakChainOnFailure,
-                'options'             => $options,
-            );
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface');
-        }
-
-
-        $this->_validators[$name] = $validator;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple validators
-     *
-     * @param  array $validators
-     * @return Zend_Form_Element
-     */
-    public function addValidators(array $validators)
-    {
-        foreach ($validators as $validatorInfo) {
-            if (is_string($validatorInfo)) {
-                $this->addValidator($validatorInfo);
-            } elseif ($validatorInfo instanceof Zend_Validate_Interface) {
-                $this->addValidator($validatorInfo);
-            } elseif (is_array($validatorInfo)) {
-                $argc                = count($validatorInfo);
-                $breakChainOnFailure = false;
-                $options             = array();
-                if (isset($validatorInfo['validator'])) {
-                    $validator = $validatorInfo['validator'];
-                    if (isset($validatorInfo['breakChainOnFailure'])) {
-                        $breakChainOnFailure = $validatorInfo['breakChainOnFailure'];
-                    }
-                    if (isset($validatorInfo['options'])) {
-                        $options = $validatorInfo['options'];
-                    }
-                    $this->addValidator($validator, $breakChainOnFailure, $options);
-                } else {
-                    switch (true) {
-                        case (0 == $argc):
-                            break;
-                        case (1 <= $argc):
-                            $validator  = array_shift($validatorInfo);
-                        case (2 <= $argc):
-                            $breakChainOnFailure = array_shift($validatorInfo);
-                        case (3 <= $argc):
-                            $options = array_shift($validatorInfo);
-                        default:
-                            $this->addValidator($validator, $breakChainOnFailure, $options);
-                            break;
-                    }
-                }
-            } else {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid validator passed to addValidators()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set multiple validators, overwriting previous validators
-     *
-     * @param  array $validators
-     * @return Zend_Form_Element
-     */
-    public function setValidators(array $validators)
-    {
-        $this->clearValidators();
-        return $this->addValidators($validators);
-    }
-
-    /**
-     * Retrieve a single validator by name
-     *
-     * @param  string $name
-     * @return Zend_Validate_Interface|false False if not found, validator otherwise
-     */
-    public function getValidator($name)
-    {
-        if (!isset($this->_validators[$name])) {
-            $len = strlen($name);
-            foreach ($this->_validators as $localName => $validator) {
-                if ($len > strlen($localName)) {
-                    continue;
-                }
-                if (0 === substr_compare($localName, $name, -$len, $len, true)) {
-                    if (is_array($validator)) {
-                        return $this->_loadValidator($validator);
-                    }
-                    return $validator;
-                }
-            }
-            return false;
-        }
-
-        if (is_array($this->_validators[$name])) {
-            return $this->_loadValidator($this->_validators[$name]);
-        }
-
-        return $this->_validators[$name];
-    }
-
-    /**
-     * Retrieve all validators
-     *
-     * @return array
-     */
-    public function getValidators()
-    {
-        $validators = array();
-        foreach ($this->_validators as $key => $value) {
-            if ($value instanceof Zend_Validate_Interface) {
-                $validators[$key] = $value;
-                continue;
-            }
-            $validator = $this->_loadValidator($value);
-            $validators[get_class($validator)] = $validator;
-        }
-        return $validators;
-    }
-
-    /**
-     * Remove a single validator by name
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function removeValidator($name)
-    {
-        if (isset($this->_validators[$name])) {
-            unset($this->_validators[$name]);
-        } else {
-            $len = strlen($name);
-            foreach (array_keys($this->_validators) as $validator) {
-                if ($len > strlen($validator)) {
-                    continue;
-                }
-                if (0 === substr_compare($validator, $name, -$len, $len, true)) {
-                    unset($this->_validators[$validator]);
-                    break;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all validators
-     *
-     * @return Zend_Form_Element
-     */
-    public function clearValidators()
-    {
-        $this->_validators = array();
-        return $this;
-    }
-
-    /**
-     * Validate element value
-     *
-     * If a translation adapter is registered, any error messages will be
-     * translated according to the current locale, using the given error code;
-     * if no matching translation is found, the original message will be
-     * utilized.
-     *
-     * Note: The *filtered* value is validated.
-     *
-     * @param  mixed $value
-     * @param  mixed $context
-     * @return boolean
-     */
-    public function isValid($value, $context = null)
-    {
-        $this->setValue($value);
-        $value = $this->getValue();
-
-        if ((('' === $value) || (null === $value))
-            && !$this->isRequired()
-            && $this->getAllowEmpty()
-        ) {
-            return true;
-        }
-
-        if ($this->isRequired()
-            && $this->autoInsertNotEmptyValidator()
-            && !$this->getValidator('NotEmpty'))
-        {
-            $validators = $this->getValidators();
-            $notEmpty   = array('validator' => 'NotEmpty', 'breakChainOnFailure' => true);
-            array_unshift($validators, $notEmpty);
-            $this->setValidators($validators);
-        }
-
-        $this->_messages = array();
-        $this->_errors   = array();
-        $result          = true;
-        $isArray         = $this->isArray();
-        foreach ($this->getValidators() as $key => $validator) {
-            if (method_exists($validator, 'setTranslator')) {
-                $validator->setTranslator($this->getTranslator());
-            }
-
-            if (method_exists($validator, 'setDisableTranslator')) {
-                $validator->setDisableTranslator($this->translatorIsDisabled());
-            }
-
-            if ($isArray && is_array($value)) {
-                $messages = array();
-                $errors   = array();
-                foreach ($value as $val) {
-                    if (!$validator->isValid($val, $context)) {
-                        $result = false;
-                        if ($this->_hasErrorMessages()) {
-                            $messages = $this->_getErrorMessages();
-                            $errors   = $messages;
-                        } else {
-                            $messages = array_merge($messages, $validator->getMessages());
-                            $errors   = array_merge($errors,   $validator->getErrors());
-                        }
-                    }
-                }
-                if ($result) {
-                    continue;
-                }
-            } elseif ($validator->isValid($value, $context)) {
-                continue;
-            } else {
-                $result = false;
-                if ($this->_hasErrorMessages()) {
-                    $messages = $this->_getErrorMessages();
-                    $errors   = $messages;
-                } else {
-                    $messages = $validator->getMessages();
-                    $errors   = array_keys($messages);
-                }
-            }
-
-            $result          = false;
-            $this->_messages = array_merge($this->_messages, $messages);
-            $this->_errors   = array_merge($this->_errors,   $errors);
-
-            if ($validator->zfBreakChainOnFailure) {
-                break;
-            }
-        }
-
-        // If element manually flagged as invalid, return false
-        if ($this->_isErrorForced) {
-            return false;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Add a custom error message to return in the event of failed validation
-     *
-     * @param  string $message
-     * @return Zend_Form_Element
-     */
-    public function addErrorMessage($message)
-    {
-        $this->_errorMessages[] = (string) $message;
-        return $this;
-    }
-
-    /**
-     * Add multiple custom error messages to return in the event of failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form_Element
-     */
-    public function addErrorMessages(array $messages)
-    {
-        foreach ($messages as $message) {
-            $this->addErrorMessage($message);
-        }
-        return $this;
-    }
-
-    /**
-     * Same as addErrorMessages(), but clears custom error message stack first
-     *
-     * @param  array $messages
-     * @return Zend_Form_Element
-     */
-    public function setErrorMessages(array $messages)
-    {
-        $this->clearErrorMessages();
-        return $this->addErrorMessages($messages);
-    }
-
-    /**
-     * Retrieve custom error messages
-     *
-     * @return array
-     */
-    public function getErrorMessages()
-    {
-        return $this->_errorMessages;
-    }
-
-    /**
-     * Clear custom error messages stack
-     *
-     * @return Zend_Form_Element
-     */
-    public function clearErrorMessages()
-    {
-        $this->_errorMessages = array();
-        return $this;
-    }
-
-    /**
-     * Get errorMessageSeparator
-     *
-     * @return string
-     */
-    public function getErrorMessageSeparator()
-    {
-        return $this->_errorMessageSeparator;
-    }
-
-    /**
-     * Set errorMessageSeparator
-     *
-     * @param  string $separator
-     * @return Zend_Form_Element
-     */
-    public function setErrorMessageSeparator($separator)
-    {
-        $this->_errorMessageSeparator = $separator;
-        return $this;
-    }
-
-    /**
-     * Mark the element as being in a failed validation state
-     *
-     * @return Zend_Form_Element
-     */
-    public function markAsError()
-    {
-        $messages       = $this->getMessages();
-        $customMessages = $this->_getErrorMessages();
-        $messages       = $messages + $customMessages;
-        if (empty($messages)) {
-            $this->_isError = true;
-        } else {
-            $this->_messages = $messages;
-        }
-        $this->_isErrorForced = true;
-        return $this;
-    }
-
-    /**
-     * Add an error message and mark element as failed validation
-     *
-     * @param  string $message
-     * @return Zend_Form_Element
-     */
-    public function addError($message)
-    {
-        $this->addErrorMessage($message);
-        $this->markAsError();
-        return $this;
-    }
-
-    /**
-     * Add multiple error messages and flag element as failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form_Element
-     */
-    public function addErrors(array $messages)
-    {
-        foreach ($messages as $message) {
-            $this->addError($message);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite any previously set error messages and flag as failed validation
-     *
-     * @param  array $messages
-     * @return Zend_Form_Element
-     */
-    public function setErrors(array $messages)
-    {
-        $this->clearErrorMessages();
-        return $this->addErrors($messages);
-    }
-
-    /**
-     * Are there errors registered?
-     *
-     * @return bool
-     */
-    public function hasErrors()
-    {
-        return (!empty($this->_messages) || $this->_isError);
-    }
-
-    /**
-     * Retrieve validator chain errors
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Retrieve error messages
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->_messages;
-    }
-
-
-    // Filtering
-
-    /**
-     * Add a filter to the element
-     *
-     * @param  string|Zend_Filter_Interface $filter
-     * @return Zend_Form_Element
-     */
-    public function addFilter($filter, $options = array())
-    {
-        if ($filter instanceof Zend_Filter_Interface) {
-            $name = get_class($filter);
-        } elseif (is_string($filter)) {
-            $name = $filter;
-            $filter = array(
-                'filter'  => $filter,
-                'options' => $options,
-            );
-            $this->_filters[$name] = $filter;
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid filter provided to addFilter; must be string or Zend_Filter_Interface');
-        }
-
-        $this->_filters[$name] = $filter;
-
-        return $this;
-    }
-
-    /**
-     * Add filters to element
-     *
-     * @param  array $filters
-     * @return Zend_Form_Element
-     */
-    public function addFilters(array $filters)
-    {
-        foreach ($filters as $filterInfo) {
-            if (is_string($filterInfo)) {
-                $this->addFilter($filterInfo);
-            } elseif ($filterInfo instanceof Zend_Filter_Interface) {
-                $this->addFilter($filterInfo);
-            } elseif (is_array($filterInfo)) {
-                $argc                = count($filterInfo);
-                $options             = array();
-                if (isset($filterInfo['filter'])) {
-                    $filter = $filterInfo['filter'];
-                    if (isset($filterInfo['options'])) {
-                        $options = $filterInfo['options'];
-                    }
-                    $this->addFilter($filter, $options);
-                } else {
-                    switch (true) {
-                        case (0 == $argc):
-                            break;
-                        case (1 <= $argc):
-                            $filter  = array_shift($filterInfo);
-                        case (2 <= $argc):
-                            $options = array_shift($filterInfo);
-                        default:
-                            $this->addFilter($filter, $options);
-                            break;
-                    }
-                }
-            } else {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid filter passed to addFilters()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add filters to element, overwriting any already existing
-     *
-     * @param  array $filters
-     * @return Zend_Form_Element
-     */
-    public function setFilters(array $filters)
-    {
-        $this->clearFilters();
-        return $this->addFilters($filters);
-    }
-
-    /**
-     * Retrieve a single filter by name
-     *
-     * @param  string $name
-     * @return Zend_Filter_Interface
-     */
-    public function getFilter($name)
-    {
-        if (!isset($this->_filters[$name])) {
-            $len = strlen($name);
-            foreach ($this->_filters as $localName => $filter) {
-                if ($len > strlen($localName)) {
-                    continue;
-                }
-
-                if (0 === substr_compare($localName, $name, -$len, $len, true)) {
-                    if (is_array($filter)) {
-                        return $this->_loadFilter($filter);
-                    }
-                    return $filter;
-                }
-            }
-            return false;
-        }
-
-        if (is_array($this->_filters[$name])) {
-            return $this->_loadFilter($this->_filters[$name]);
-        }
-
-        return $this->_filters[$name];
-    }
-
-    /**
-     * Get all filters
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        $filters = array();
-        foreach ($this->_filters as $key => $value) {
-            if ($value instanceof Zend_Filter_Interface) {
-                $filters[$key] = $value;
-                continue;
-            }
-            $filter = $this->_loadFilter($value);
-            $filters[get_class($filter)] = $filter;
-        }
-        return $filters;
-    }
-
-    /**
-     * Remove a filter by name
-     *
-     * @param  string $name
-     * @return Zend_Form_Element
-     */
-    public function removeFilter($name)
-    {
-        if (isset($this->_filters[$name])) {
-            unset($this->_filters[$name]);
-        } else {
-            $len = strlen($name);
-            foreach (array_keys($this->_filters) as $filter) {
-                if ($len > strlen($filter)) {
-                    continue;
-                }
-                if (0 === substr_compare($filter, $name, -$len, $len, true)) {
-                    unset($this->_filters[$filter]);
-                    break;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all filters
-     *
-     * @return Zend_Form_Element
-     */
-    public function clearFilters()
-    {
-        $this->_filters = array();
-        return $this;
-    }
-
-    // Rendering
-
-    /**
-     * Set view object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Form_Element
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        $this->_view = $view;
-        return $this;
-    }
-
-    /**
-     * Retrieve view object
-     *
-     * Retrieves from ViewRenderer if none previously set.
-     *
-     * @return null|Zend_View_Interface
-     */
-    public function getView()
-    {
-        if (null === $this->_view) {
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            $this->setView($viewRenderer->view);
-        }
-        return $this->_view;
-    }
-
-    /**
-     * Instantiate a decorator based on class name or class name fragment
-     *
-     * @param  string $name
-     * @param  null|array $options
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _getDecorator($name, $options)
-    {
-        $class = $this->getPluginLoader(self::DECORATOR)->load($name);
-        if (null === $options) {
-            $decorator = new $class;
-        } else {
-            $decorator = new $class($options);
-        }
-
-        return $decorator;
-    }
-
-    /**
-     * Add a decorator for rendering the element
-     *
-     * @param  string|Zend_Form_Decorator_Interface $decorator
-     * @param  array|Zend_Config $options Options with which to initialize decorator
-     * @return Zend_Form_Element
-     */
-    public function addDecorator($decorator, $options = null)
-    {
-        if ($decorator instanceof Zend_Form_Decorator_Interface) {
-            $name = get_class($decorator);
-        } elseif (is_string($decorator)) {
-            $name      = $decorator;
-            $decorator = array(
-                'decorator' => $name,
-                'options'   => $options,
-            );
-        } elseif (is_array($decorator)) {
-            foreach ($decorator as $name => $spec) {
-                break;
-            }
-            if (is_numeric($name)) {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string');
-            }
-            if (is_string($spec)) {
-                $decorator = array(
-                    'decorator' => $spec,
-                    'options'   => $options,
-                );
-            } elseif ($spec instanceof Zend_Form_Decorator_Interface) {
-                $decorator = $spec;
-            }
-        } else {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface');
-        }
-
-        $this->_decorators[$name] = $decorator;
-
-        return $this;
-    }
-
-    /**
-     * Add many decorators at once
-     *
-     * @param  array $decorators
-     * @return Zend_Form_Element
-     */
-    public function addDecorators(array $decorators)
-    {
-        foreach ($decorators as $decoratorInfo) {
-            if (is_string($decoratorInfo)) {
-                $this->addDecorator($decoratorInfo);
-            } elseif ($decoratorInfo instanceof Zend_Form_Decorator_Interface) {
-                $this->addDecorator($decoratorInfo);
-            } elseif (is_array($decoratorInfo)) {
-                $argc    = count($decoratorInfo);
-                $options = array();
-                if (isset($decoratorInfo['decorator'])) {
-                    $decorator = $decoratorInfo['decorator'];
-                    if (isset($decoratorInfo['options'])) {
-                        $options = $decoratorInfo['options'];
-                    }
-                    $this->addDecorator($decorator, $options);
-                } else {
-                    switch (true) {
-                        case (0 == $argc):
-                            break;
-                        case (1 <= $argc):
-                            $decorator  = array_shift($decoratorInfo);
-                        case (2 <= $argc):
-                            $options = array_shift($decoratorInfo);
-                        default:
-                            $this->addDecorator($decorator, $options);
-                            break;
-                    }
-                }
-            } else {
-                require_once 'Zend/Form/Exception.php';
-                throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Overwrite all decorators
-     *
-     * @param  array $decorators
-     * @return Zend_Form_Element
-     */
-    public function setDecorators(array $decorators)
-    {
-        $this->clearDecorators();
-        return $this->addDecorators($decorators);
-    }
-
-    /**
-     * Retrieve a registered decorator
-     *
-     * @param  string $name
-     * @return false|Zend_Form_Decorator_Abstract
-     */
-    public function getDecorator($name)
-    {
-        if (!isset($this->_decorators[$name])) {
-            $len = strlen($name);
-            foreach ($this->_decorators as $localName => $decorator) {
-                if ($len > strlen($localName)) {
-                    continue;
-                }
-
-                if (0 === substr_compare($localName, $name, -$len, $len, true)) {
-                    if (is_array($decorator)) {
-                        return $this->_loadDecorator($decorator, $localName);
-                    }
-                    return $decorator;
-                }
-            }
-            return false;
-        }
-
-        if (is_array($this->_decorators[$name])) {
-            return $this->_loadDecorator($this->_decorators[$name], $name);
-        }
-
-        return $this->_decorators[$name];
-    }
-
-    /**
-     * Retrieve all decorators
-     *
-     * @return array
-     */
-    public function getDecorators()
-    {
-        foreach ($this->_decorators as $key => $value) {
-            if (is_array($value)) {
-                $this->_loadDecorator($value, $key);
-            }
-        }
-        return $this->_decorators;
-    }
-
-    /**
-     * Remove a single decorator
-     *
-     * @param  string $name
-     * @return Zend_Form_Element
-     */
-    public function removeDecorator($name)
-    {
-        if (isset($this->_decorators[$name])) {
-            unset($this->_decorators[$name]);
-        } else {
-            $len = strlen($name);
-            foreach (array_keys($this->_decorators) as $decorator) {
-                if ($len > strlen($decorator)) {
-                    continue;
-                }
-                if (0 === substr_compare($decorator, $name, -$len, $len, true)) {
-                    unset($this->_decorators[$decorator]);
-                    break;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all decorators
-     *
-     * @return Zend_Form_Element
-     */
-    public function clearDecorators()
-    {
-        $this->_decorators = array();
-        return $this;
-    }
-
-    /**
-     * Render form element
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        if ($this->_isPartialRendering) {
-            return '';
-        }
-
-        if (null !== $view) {
-            $this->setView($view);
-        }
-
-        $content = '';
-        foreach ($this->getDecorators() as $decorator) {
-            $decorator->setElement($this);
-            $content = $decorator->render($content);
-        }
-        return $content;
-    }
-
-    /**
-     * String representation of form element
-     *
-     * Proxies to {@link render()}.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->render();
-            return $return;
-        } catch (Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            return '';
-        }
-    }
-
-    /**
-     * Lazy-load a filter
-     *
-     * @param  array $filter
-     * @return Zend_Filter_Interface
-     */
-    protected function _loadFilter(array $filter)
-    {
-        $origName = $filter['filter'];
-        $name     = $this->getPluginLoader(self::FILTER)->load($filter['filter']);
-
-        if (array_key_exists($name, $this->_filters)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Filter instance already exists for filter "%s"', $origName));
-        }
-
-        if (empty($filter['options'])) {
-            $instance = new $name;
-        } else {
-            $r = new ReflectionClass($name);
-            if ($r->hasMethod('__construct')) {
-                $instance = $r->newInstanceArgs((array) $filter['options']);
-            } else {
-                $instance = $r->newInstance();
-            }
-        }
-
-        if ($origName != $name) {
-            $filterNames  = array_keys($this->_filters);
-            $order        = array_flip($filterNames);
-            $order[$name] = $order[$origName];
-            $filtersExchange = array();
-            unset($order[$origName]);
-            asort($order);
-            foreach ($order as $key => $index) {
-                if ($key == $name) {
-                    $filtersExchange[$key] = $instance;
-                    continue;
-                }
-                $filtersExchange[$key] = $this->_filters[$key];
-            }
-            $this->_filters = $filtersExchange;
-        } else {
-            $this->_filters[$name] = $instance;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * Lazy-load a validator
-     *
-     * @param  array $validator Validator definition
-     * @return Zend_Validate_Interface
-     */
-    protected function _loadValidator(array $validator)
-    {
-        $origName = $validator['validator'];
-        $name     = $this->getPluginLoader(self::VALIDATE)->load($validator['validator']);
-
-        if (array_key_exists($name, $this->_validators)) {
-            require_once 'Zend/Form/Exception.php';
-            throw new Zend_Form_Exception(sprintf('Validator instance already exists for validator "%s"', $origName));
-        }
-
-        $messages = false;
-        if (isset($validator['options']['messages'])) {
-            $messages = $validator['options']['messages'];
-            unset($validator['options']['messages']);
-        }
-
-        if (empty($validator['options'])) {
-            $instance = new $name;
-        } else {
-            $r = new ReflectionClass($name);
-            if ($r->hasMethod('__construct')) {
-                $numeric = false;
-                if (is_array($validator['options'])) {
-                    $keys    = array_keys($validator['options']);
-                    foreach($keys as $key) {
-                        if (is_numeric($key)) {
-                            $numeric = true;
-                            break;
-                        }
-                    }
-                }
-
-                if ($numeric) {
-                    $instance = $r->newInstanceArgs((array) $validator['options']);
-                } else {
-                    $instance = $r->newInstance($validator['options']);
-                }
-            } else {
-                $instance = $r->newInstance();
-            }
-        }
-
-        if ($messages) {
-            if (is_array($messages)) {
-                $instance->setMessages($messages);
-            } elseif (is_string($messages)) {
-                $instance->setMessage($messages);
-            }
-        }
-        $instance->zfBreakChainOnFailure = $validator['breakChainOnFailure'];
-
-        if ($origName != $name) {
-            $validatorNames     = array_keys($this->_validators);
-            $order              = array_flip($validatorNames);
-            $order[$name]       = $order[$origName];
-            $validatorsExchange = array();
-            unset($order[$origName]);
-            asort($order);
-            foreach ($order as $key => $index) {
-                if ($key == $name) {
-                    $validatorsExchange[$key] = $instance;
-                    continue;
-                }
-                $validatorsExchange[$key] = $this->_validators[$key];
-            }
-            $this->_validators = $validatorsExchange;
-        } else {
-            $this->_validators[$name] = $instance;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * Lazy-load a decorator
-     *
-     * @param  array $decorator Decorator type and options
-     * @param  mixed $name Decorator name or alias
-     * @return Zend_Form_Decorator_Interface
-     */
-    protected function _loadDecorator(array $decorator, $name)
-    {
-        $sameName = false;
-        if ($name == $decorator['decorator']) {
-            $sameName = true;
-        }
-
-        $instance = $this->_getDecorator($decorator['decorator'], $decorator['options']);
-        if ($sameName) {
-            $newName            = get_class($instance);
-            $decoratorNames     = array_keys($this->_decorators);
-            $order              = array_flip($decoratorNames);
-            $order[$newName]    = $order[$name];
-            $decoratorsExchange = array();
-            unset($order[$name]);
-            asort($order);
-            foreach ($order as $key => $index) {
-                if ($key == $newName) {
-                    $decoratorsExchange[$key] = $instance;
-                    continue;
-                }
-                $decoratorsExchange[$key] = $this->_decorators[$key];
-            }
-            $this->_decorators = $decoratorsExchange;
-        } else {
-            $this->_decorators[$name] = $instance;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * Retrieve error messages and perform translation and value substitution
-     *
-     * @return array
-     */
-    protected function _getErrorMessages()
-    {
-        $translator = $this->getTranslator();
-        $messages   = $this->getErrorMessages();
-        $value      = $this->getValue();
-        foreach ($messages as $key => $message) {
-            if (null !== $translator) {
-                $message = $translator->translate($message);
-            }
-            if (($this->isArray() || is_array($value))
-                && !empty($value)
-            ) {
-                $aggregateMessages = array();
-                foreach ($value as $val) {
-                    $aggregateMessages[] = str_replace('%value%', $val, $message);
-                }
-                $messages[$key] = implode($this->getErrorMessageSeparator(), $aggregateMessages);
-            } else {
-                $messages[$key] = str_replace('%value%', $value, $message);
-            }
-        }
-        return $messages;
-    }
-
-    /**
-     * Are there custom error messages registered?
-     *
-     * @return bool
-     */
-    protected function _hasErrorMessages()
-    {
-        return !empty($this->_errorMessages);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Button.php b/airtime_mvc/library/Zend/Form/Element/Button.php
deleted file mode 100644
index 9a4c4843f..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Button.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Submit */
-require_once 'Zend/Form/Element/Submit.php';
-
-/**
- * Button form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Button extends Zend_Form_Element_Submit
-{
-    /**
-     * Use formButton view helper by default
-     * @var string
-     */
-    public $helper = 'formButton';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Captcha.php b/airtime_mvc/library/Zend/Form/Element/Captcha.php
deleted file mode 100644
index e20140a57..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Captcha.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Captcha.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/** @see Zend_Captcha_Adapter */
-require_once 'Zend/Captcha/Adapter.php';
-
-/**
- * Generic captcha element
- *
- * This element allows to insert CAPTCHA into the form in order
- * to validate that human is submitting the form. The actual
- * logic is contained in the captcha adapter.
- *
- * @see http://en.wikipedia.org/wiki/Captcha
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Form_Element_Captcha extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Captcha plugin type constant
-     */
-    const CAPTCHA = 'CAPTCHA';
-
-    /**
-     * Captcha adapter
-     *
-     * @var Zend_Captcha_Adapter
-     */
-    protected $_captcha;
-
-    /**
-     * Get captcha adapter
-     *
-     * @return Zend_Captcha_Adapter
-     */
-    public function getCaptcha()
-    {
-        return $this->_captcha;
-    }
-
-    /**
-     * Set captcha adapter
-     *
-     * @param string|array|Zend_Captcha_Adapter $captcha
-     * @param array $options
-     */
-    public function setCaptcha($captcha, $options = array())
-    {
-        if ($captcha instanceof Zend_Captcha_Adapter) {
-            $instance = $captcha;
-        } else {
-            if (is_array($captcha)) {
-                if (array_key_exists('captcha', $captcha)) {
-                    $name = $captcha['captcha'];
-                    unset($captcha['captcha']);
-                } else {
-                    $name = array_shift($captcha);
-                }
-                $options = array_merge($options, $captcha);
-            } else {
-                $name = $captcha;
-            }
-
-            $name = $this->getPluginLoader(self::CAPTCHA)->load($name);
-            if (empty($options)) {
-                $instance = new $name;
-            } else {
-                $r = new ReflectionClass($name);
-                if ($r->hasMethod('__construct')) {
-                    $instance = $r->newInstanceArgs(array($options));
-                } else {
-                    $instance = $r->newInstance();
-                }
-            }
-        }
-
-        $this->_captcha = $instance;
-        $this->_captcha->setName($this->getName());
-        return $this;
-    }
-
-    /**
-     * Constructor
-     *
-     * $spec may be:
-     * - string: name of element
-     * - array: options with which to configure element
-     * - Zend_Config: Zend_Config with options for configuring element
-     *
-     * @param  string|array|Zend_Config $spec
-     * @return void
-     */
-    public function __construct($spec, $options = null)
-    {
-        parent::__construct($spec, $options);
-        $this->setAllowEmpty(true)
-             ->setRequired(true)
-             ->setAutoInsertNotEmptyValidator(false)
-             ->addValidator($this->getCaptcha(), true);
-    }
-
-    /**
-     * Return all attributes
-     *
-     * @return array
-     */
-    public function getAttribs()
-    {
-        $attribs = get_object_vars($this);
-        unset($attribs['helper']);
-        foreach ($attribs as $key => $value) {
-            if ('_' == substr($key, 0, 1)) {
-                unset($attribs[$key]);
-            }
-        }
-
-        return $attribs;
-    }
-
-    /**
-     * Set options
-     *
-     * Overrides to allow passing captcha options
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Captcha
-     */
-    public function setOptions(array $options)
-    {
-        parent::setOptions($options);
-        if (array_key_exists('captcha', $options)) {
-            if (array_key_exists('captchaOptions', $options)) {
-                $this->setCaptcha($options['captcha'], $options['captchaOptions']);
-                unset($options['captchaOptions']);
-            } else {
-                $this->setCaptcha($options['captcha']);
-            }
-            unset($options['captcha']);
-        }
-        return $this;
-    }
-
-    /**
-     * Render form element
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        $captcha    = $this->getCaptcha();
-        $captcha->setName($this->getFullyQualifiedName());
-
-        $decorators = $this->getDecorators();
-
-        $decorator  = $captcha->getDecorator();
-        if (!empty($decorator)) {
-            array_unshift($decorators, $decorator);
-        }
-
-        $decorator = array('Captcha', array('captcha' => $captcha));
-        array_unshift($decorators, $decorator);
-
-        $this->setDecorators($decorators);
-
-        $this->setValue($this->getCaptcha()->generate());
-
-        return parent::render($view);
-    }
-
-    /**
-     * Retrieve plugin loader for validator or filter chain
-     *
-     * Support for plugin loader for Captcha adapters
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader
-     * @throws Zend_Loader_Exception on invalid type.
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtoupper($type);
-        if ($type == self::CAPTCHA) {
-            if (!isset($this->_loaders[$type])) {
-                require_once 'Zend/Loader/PluginLoader.php';
-                $this->_loaders[$type] = new Zend_Loader_PluginLoader(
-                    array('Zend_Captcha' => 'Zend/Captcha/')
-                );
-            }
-            return $this->_loaders[$type];
-        } else {
-            return parent::getPluginLoader($type);
-        }
-    }
-
-    /**
-     * Add prefix path for plugin loader for captcha adapters
-     *
-     * This method handles the captcha type, the rest is handled by
-     * the parent
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_Form_Element
-     * @see Zend_Form_Element::addPrefixPath
-     */
-    public function addPrefixPath($prefix, $path, $type = null)
-    {
-        $type = strtoupper($type);
-        switch ($type) {
-            case null:
-                $loader = $this->getPluginLoader(self::CAPTCHA);
-                $cPrefix = rtrim($prefix, '_') . '_Captcha';
-                $cPath   = rtrim($path, '/\\') . '/Captcha';
-                $loader->addPrefixPath($cPrefix, $cPath);
-                return parent::addPrefixPath($prefix, $path);
-            case self::CAPTCHA:
-                $loader = $this->getPluginLoader($type);
-                $loader->addPrefixPath($prefix, $path);
-                return $this;
-            default:
-                return parent::addPrefixPath($prefix, $path, $type);
-        }
-    }
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('Errors')
-                 ->addDecorator('Description', array('tag' => 'p', 'class' => 'description'))
-                 ->addDecorator('HtmlTag', array('tag' => 'dd'))
-                 ->addDecorator('Label', array('tag' => 'dt'));
-        }
-    }
-
-    /**
-     * Is the captcha valid?
-     *
-     * @param  mixed $value
-     * @param  mixed $context
-     * @return boolean
-     */
-    public function isValid($value, $context = null)
-    {
-        $this->getCaptcha()->setName($this->getName());
-        $belongsTo = $this->getBelongsTo();
-        if (empty($belongsTo) || !is_array($context)) {
-            return parent::isValid($value, $context);
-        }
-
-        $name     = $this->getFullyQualifiedName();
-        $root     = substr($name, 0, strpos($name, '['));
-        $segments = substr($name, strpos($name, '['));
-        $segments = ltrim($segments, '[');
-        $segments = rtrim($segments, ']');
-        $segments = explode('][', $segments);
-        array_unshift($segments, $root);
-        array_pop($segments);
-        $newContext = $context;
-        foreach ($segments as $segment) {
-            if (array_key_exists($segment, $newContext)) {
-                $newContext = $newContext[$segment];
-            }
-        }
-
-        return parent::isValid($value, $newContext);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Checkbox.php b/airtime_mvc/library/Zend/Form/Element/Checkbox.php
deleted file mode 100644
index 723976726..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Checkbox.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Checkbox form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Checkbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Checkbox extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Is the checkbox checked?
-     * @var bool
-     */
-    public $checked = false;
-
-    /**
-     * Use formCheckbox view helper by default
-     * @var string
-     */
-    public $helper = 'formCheckbox';
-
-    /**
-     * Options that will be passed to the view helper
-     * @var array
-     */
-    public $options = array(
-        'checkedValue'   => '1',
-        'uncheckedValue' => '0',
-    );
-
-    /**
-     * Value when checked
-     * @var string
-     */
-    protected $_checkedValue = '1';
-
-    /**
-     * Value when not checked
-     * @var string
-     */
-    protected $_uncheckedValue = '0';
-
-    /**
-     * Current value
-     * @var string 0 or 1
-     */
-    protected $_value = '0';
-
-    /**
-     * Set options
-     *
-     * Intercept checked and unchecked values and set them early; test stored
-     * value against checked and unchecked values after configuration.
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setOptions(array $options)
-    {
-        if (array_key_exists('checkedValue', $options)) {
-            $this->setCheckedValue($options['checkedValue']);
-            unset($options['checkedValue']);
-        }
-        if (array_key_exists('uncheckedValue', $options)) {
-            $this->setUncheckedValue($options['uncheckedValue']);
-            unset($options['uncheckedValue']);
-        }
-        parent::setOptions($options);
-
-        $curValue = $this->getValue();
-        $test     = array($this->getCheckedValue(), $this->getUncheckedValue());
-        if (!in_array($curValue, $test)) {
-            $this->setValue($curValue);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set value
-     *
-     * If value matches checked value, sets to that value, and sets the checked
-     * flag to true.
-     *
-     * Any other value causes the unchecked value to be set as the current
-     * value, and the checked flag to be set as false.
-     *
-     *
-     * @param  mixed $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setValue($value)
-    {
-        if ($value == $this->getCheckedValue()) {
-            parent::setValue($value);
-            $this->checked = true;
-        } else {
-            parent::setValue($this->getUncheckedValue());
-            $this->checked = false;
-        }
-        return $this;
-    }
-
-    /**
-     * Set checked value
-     *
-     * @param  string $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setCheckedValue($value)
-    {
-        $this->_checkedValue = (string) $value;
-        $this->options['checkedValue'] = $value;
-        return $this;
-    }
-
-    /**
-     * Get value when checked
-     *
-     * @return string
-     */
-    public function getCheckedValue()
-    {
-        return $this->_checkedValue;
-    }
-
-    /**
-     * Set unchecked value
-     *
-     * @param  string $value
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setUncheckedValue($value)
-    {
-        $this->_uncheckedValue = (string) $value;
-        $this->options['uncheckedValue'] = $value;
-        return $this;
-    }
-
-    /**
-     * Get value when not checked
-     *
-     * @return string
-     */
-    public function getUncheckedValue()
-    {
-        return $this->_uncheckedValue;
-    }
-
-    /**
-     * Set checked flag
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element_Checkbox
-     */
-    public function setChecked($flag)
-    {
-        $this->checked = (bool) $flag;
-        if ($this->checked) {
-            $this->setValue($this->getCheckedValue());
-        } else {
-            $this->setValue($this->getUncheckedValue());
-        }
-        return $this;
-    }
-
-    /**
-     * Get checked flag
-     *
-     * @return bool
-     */
-    public function isChecked()
-    {
-        return $this->checked;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Exception.php b/airtime_mvc/library/Zend/Form/Element/Exception.php
deleted file mode 100644
index 6170bff80..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Exception */
-require_once 'Zend/Form/Exception.php';
-
-/**
- * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Form_Element_Exception extends Zend_Form_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/File.php b/airtime_mvc/library/Zend/Form/Element/File.php
deleted file mode 100644
index 4d3bf9fd5..000000000
--- a/airtime_mvc/library/Zend/Form/Element/File.php
+++ /dev/null
@@ -1,911 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Zend_Form_Element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_File extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Plugin loader type
-     */
-    const TRANSFER_ADAPTER = 'TRANSFER_ADAPTER';
-
-    /**
-     * @var string Default view helper
-     */
-    public $helper = 'formFile';
-
-    /**
-     * @var Zend_File_Transfer_Adapter_Abstract
-     */
-    protected $_adapter;
-
-    /**
-     * @var boolean Already validated ?
-     */
-    protected $_validated = false;
-
-    /**
-     * @var boolean Disable value to be equal to file content
-     */
-    protected $_valueDisabled = false;
-
-    /**
-     * @var integer Internal multifile counter
-     */
-    protected $_counter = 1;
-
-    /**
-     * @var integer Maximum file size for MAX_FILE_SIZE attribut of form
-     */
-    protected static $_maxFileSize = -1;
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('File')
-                 ->addDecorator('Errors')
-                 ->addDecorator('Description', array('tag' => 'p', 'class' => 'description'))
-                 ->addDecorator('HtmlTag', array('tag' => 'dd'))
-                 ->addDecorator('Label', array('tag' => 'dt'));
-        }
-    }
-
-    /**
-     * Set plugin loader
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @param  string $type
-     * @return Zend_Form_Element_File
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $type)
-    {
-        $type = strtoupper($type);
-
-        if ($type != self::TRANSFER_ADAPTER) {
-            return parent::setPluginLoader($loader, $type);
-        }
-
-        $this->_loaders[$type] = $loader;
-        return $this;
-    }
-
-    /**
-     * Get Plugin Loader
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader_Interface
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtoupper($type);
-
-        if ($type != self::TRANSFER_ADAPTER) {
-            return parent::getPluginLoader($type);
-        }
-
-        if (!array_key_exists($type, $this->_loaders)) {
-            require_once 'Zend/Loader/PluginLoader.php';
-            $loader = new Zend_Loader_PluginLoader(array(
-                'Zend_File_Transfer_Adapter' => 'Zend/File/Transfer/Adapter/',
-            ));
-            $this->setPluginLoader($loader, self::TRANSFER_ADAPTER);
-        }
-
-        return $this->_loaders[$type];
-    }
-
-    /**
-     * Add prefix path for plugin loader
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @param  string $type
-     * @return Zend_Form_Element_File
-     */
-    public function addPrefixPath($prefix, $path, $type = null)
-    {
-        $type = strtoupper($type);
-        if (!empty($type) && ($type != self::TRANSFER_ADAPTER)) {
-            return parent::addPrefixPath($prefix, $path, $type);
-        }
-
-        if (empty($type)) {
-            $pluginPrefix = rtrim($prefix, '_') . '_Transfer_Adapter';
-            $pluginPath   = rtrim($path, DIRECTORY_SEPARATOR) . '/Transfer/Adapter/';
-            $loader       = $this->getPluginLoader(self::TRANSFER_ADAPTER);
-            $loader->addPrefixPath($pluginPrefix, $pluginPath);
-            return parent::addPrefixPath($prefix, $path, null);
-        }
-
-        $loader = $this->getPluginLoader($type);
-        $loader->addPrefixPath($prefix, $path);
-        return $this;
-    }
-
-    /**
-     * Set transfer adapter
-     *
-     * @param  string|Zend_File_Transfer_Adapter_Abstract $adapter
-     * @return Zend_Form_Element_File
-     */
-    public function setTransferAdapter($adapter)
-    {
-        if ($adapter instanceof Zend_File_Transfer_Adapter_Abstract) {
-            $this->_adapter = $adapter;
-        } elseif (is_string($adapter)) {
-            $loader = $this->getPluginLoader(self::TRANSFER_ADAPTER);
-            $class  = $loader->load($adapter);
-            $this->_adapter = new $class;
-        } else {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception('Invalid adapter specified');
-        }
-
-        foreach (array('filter', 'validate') as $type) {
-            $loader = $this->getPluginLoader($type);
-            $this->_adapter->setPluginLoader($loader, $type);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get transfer adapter
-     *
-     * Lazy loads HTTP transfer adapter when no adapter registered.
-     *
-     * @return Zend_File_Transfer_Adapter_Abstract
-     */
-    public function getTransferAdapter()
-    {
-        if (null === $this->_adapter) {
-            $this->setTransferAdapter('Http');
-        }
-        return $this->_adapter;
-    }
-
-    /**
-     * Add Validator; proxy to adapter
-     *
-     * @param  string|Zend_Validate_Interface $validator
-     * @param  bool $breakChainOnFailure
-     * @param  mixed $options
-     * @return Zend_Form_Element_File
-     */
-    public function addValidator($validator, $breakChainOnFailure = false, $options = array())
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->addValidator($validator, $breakChainOnFailure, $options, $this->getName());
-        $this->_validated = false;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple validators at once; proxy to adapter
-     *
-     * @param  array $validators
-     * @return Zend_Form_Element_File
-     */
-    public function addValidators(array $validators)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->addValidators($validators, $this->getName());
-        $this->_validated = false;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple validators at once, overwriting; proxy to adapter
-     *
-     * @param  array $validators
-     * @return Zend_Form_Element_File
-     */
-    public function setValidators(array $validators)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->setValidators($validators, $this->getName());
-        $this->_validated = false;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve validator by name; proxy to adapter
-     *
-     * @param  string $name
-     * @return Zend_Validate_Interface|null
-     */
-    public function getValidator($name)
-    {
-        $adapter    = $this->getTransferAdapter();
-        return $adapter->getValidator($name);
-    }
-
-    /**
-     * Retrieve all validators; proxy to adapter
-     *
-     * @return array
-     */
-    public function getValidators()
-    {
-        $adapter = $this->getTransferAdapter();
-        $validators = $adapter->getValidators($this->getName());
-        if ($validators === null) {
-            $validators = array();
-        }
-
-        return $validators;
-    }
-
-    /**
-     * Remove validator by name; proxy to adapter
-     *
-     * @param  string $name
-     * @return Zend_Form_Element_File
-     */
-    public function removeValidator($name)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->removeValidator($name);
-        $this->_validated = false;
-
-        return $this;
-    }
-
-    /**
-     * Remove all validators; proxy to adapter
-     *
-     * @return Zend_Form_Element_File
-     */
-    public function clearValidators()
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->clearValidators();
-        $this->_validated = false;
-
-        return $this;
-    }
-
-    /**
-     * Add Filter; proxy to adapter
-     *
-     * @param  string|array $filter  Type of filter to add
-     * @param  string|array $options Options to set for the filter
-     * @return Zend_Form_Element_File
-     */
-    public function addFilter($filter, $options = null)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->addFilter($filter, $options, $this->getName());
-
-        return $this;
-    }
-
-    /**
-     * Add Multiple filters at once; proxy to adapter
-     *
-     * @param  array $filters
-     * @return Zend_Form_Element_File
-     */
-    public function addFilters(array $filters)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->addFilters($filters, $this->getName());
-
-        return $this;
-    }
-
-    /**
-     * Sets a filter for the class, erasing all previous set; proxy to adapter
-     *
-     * @param  string|array $filter Filter to set
-     * @return Zend_Form_Element_File
-     */
-    public function setFilters(array $filters)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->setFilters($filters, $this->getName());
-
-        return $this;
-    }
-
-    /**
-     * Retrieve individual filter; proxy to adapter
-     *
-     * @param  string $name
-     * @return Zend_Filter_Interface|null
-     */
-    public function getFilter($name)
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->getFilter($name);
-    }
-
-    /**
-     * Returns all set filters; proxy to adapter
-     *
-     * @return array List of set filters
-     */
-    public function getFilters()
-    {
-        $adapter = $this->getTransferAdapter();
-        $filters = $adapter->getFilters($this->getName());
-
-        if ($filters === null) {
-            $filters = array();
-        }
-        return $filters;
-    }
-
-    /**
-     * Remove an individual filter; proxy to adapter
-     *
-     * @param  string $name
-     * @return Zend_Form_Element_File
-     */
-    public function removeFilter($name)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->removeFilter($name);
-
-        return $this;
-    }
-
-    /**
-     * Remove all filters; proxy to adapter
-     *
-     * @return Zend_Form_Element_File
-     */
-    public function clearFilters()
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->clearFilters();
-
-        return $this;
-    }
-
-    /**
-     * Validate upload
-     *
-     * @param  string $value   File, can be optional, give null to validate all files
-     * @param  mixed  $context
-     * @return bool
-     */
-    public function isValid($value, $context = null)
-    {
-        if ($this->_validated) {
-            return true;
-        }
-
-        $adapter    = $this->getTransferAdapter();
-        $translator = $this->getTranslator();
-        if ($translator !== null) {
-            $adapter->setTranslator($translator);
-        }
-
-        if (!$this->isRequired()) {
-            $adapter->setOptions(array('ignoreNoFile' => true), $this->getName());
-        } else {
-            $adapter->setOptions(array('ignoreNoFile' => false), $this->getName());
-            if ($this->autoInsertNotEmptyValidator() and
-                   !$this->getValidator('NotEmpty'))
-            {
-                $validators = $this->getValidators();
-                $notEmpty   = array('validator' => 'NotEmpty', 'breakChainOnFailure' => true);
-                array_unshift($validators, $notEmpty);
-                $this->setValidators($validators);
-            }
-        }
-
-        if($adapter->isValid($this->getName())) {
-            $this->_validated = true;
-            return true;
-        }
-
-        $this->_validated = false;
-        return false;
-    }
-
-    /**
-     * Receive the uploaded file
-     *
-     * @return boolean
-     */
-    public function receive()
-    {
-        if (!$this->_validated) {
-            if (!$this->isValid($this->getName())) {
-                return false;
-            }
-        }
-
-        $adapter = $this->getTransferAdapter();
-        if ($adapter->receive($this->getName())) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve error codes; proxy to transfer adapter
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return parent::getErrors() + $this->getTransferAdapter()->getErrors();
-    }
-
-    /**
-     * Are there errors registered?
-     *
-     * @return bool
-     */
-    public function hasErrors()
-    {
-        return (parent::hasErrors() || $this->getTransferAdapter()->hasErrors());
-    }
-
-    /**
-     * Retrieve error messages; proxy to transfer adapter
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return parent::getMessages() + $this->getTransferAdapter()->getMessages();
-    }
-
-    /**
-     * Set the upload destination
-     *
-     * @param  string $path
-     * @return Zend_Form_Element_File
-     */
-    public function setDestination($path)
-    {
-        $this->getTransferAdapter()->setDestination($path, $this->getName());
-        return $this;
-    }
-
-    /**
-     * Get the upload destination
-     *
-     * @return string
-     */
-    public function getDestination()
-    {
-        return $this->getTransferAdapter()->getDestination($this->getName());
-    }
-
-    /**
-     * Get the final filename
-     *
-     * @param  string  $value (Optional) Element or file to return
-     * @param  boolean $path  (Optional) Return also the path, defaults to true
-     * @return string
-     */
-    public function getFileName($value = null, $path = true)
-    {
-        if (empty($value)) {
-            $value = $this->getName();
-        }
-
-        return $this->getTransferAdapter()->getFileName($value, $path);
-    }
-
-    /**
-     * Get internal file informations
-     *
-     * @param  string $value (Optional) Element or file to return
-     * @return array
-     */
-    public function getFileInfo($value = null)
-    {
-        if (empty($value)) {
-            $value = $this->getName();
-        }
-
-        return $this->getTransferAdapter()->getFileInfo($value);
-    }
-
-    /**
-     * Set a multifile element
-     *
-     * @param integer $count Number of file elements
-     * @return Zend_Form_Element_File Provides fluent interface
-     */
-    public function setMultiFile($count)
-    {
-        if ((integer) $count < 2) {
-            $this->setIsArray(false);
-            $this->_counter = 1;
-        } else {
-            $this->setIsArray(true);
-            $this->_counter = (integer) $count;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the multifile element number
-     *
-     * @return integer
-     */
-    public function getMultiFile()
-    {
-        return $this->_counter;
-    }
-
-    /**
-     * Sets the maximum file size of the form
-     *
-     * @return integer
-     */
-    public function getMaxFileSize()
-    {
-        if (self::$_maxFileSize < 0) {
-            $ini = $this->_convertIniToInteger(trim(ini_get('post_max_size')));
-            $max = $this->_convertIniToInteger(trim(ini_get('upload_max_filesize')));
-            $min = max($ini, $max);
-            if ($ini > 0) {
-                $min = min($min, $ini);
-            }
-
-            if ($max > 0) {
-                $min = min($min, $max);
-            }
-
-            self::$_maxFileSize = $min;
-        }
-
-        return self::$_maxFileSize;
-    }
-
-    /**
-     * Sets the maximum file size of the form
-     *
-     * @param  integer $size
-     * @return integer
-     */
-    public function setMaxFileSize($size)
-    {
-        $ini = $this->_convertIniToInteger(trim(ini_get('post_max_size')));
-        $max = $this->_convertIniToInteger(trim(ini_get('upload_max_filesize')));
-
-        if (($max > -1) && ($size > $max)) {
-            trigger_error("Your 'upload_max_filesize' config setting limits the maximum filesize to '$max'. You tried to set '$size'.", E_USER_NOTICE);
-            $size = $max;
-        }
-
-        if (($ini > -1) && ($size > $ini)) {
-            trigger_error("Your 'post_max_size' config setting limits the maximum filesize to '$ini'. You tried to set '$size'.", E_USER_NOTICE);
-            $size = $ini;
-        }
-
-        self::$_maxFileSize = $size;
-        return $this;
-    }
-
-    /**
-     * Converts a ini setting to a integer value
-     *
-     * @param  string $setting
-     * @return integer
-     */
-    private function _convertIniToInteger($setting)
-    {
-        if (!is_numeric($setting)) {
-            $type = strtoupper(substr($setting, -1));
-            $setting = (integer) substr($setting, 0, -1);
-
-            switch ($type) {
-                case 'K' :
-                    $setting *= 1024;
-                    break;
-
-                case 'M' :
-                    $setting *= 1024 * 1024;
-                    break;
-
-                case 'G' :
-                    $setting *= 1024 * 1024 * 1024;
-                    break;
-
-                default :
-                    break;
-            }
-        }
-
-        return (integer) $setting;
-    }
-
-    /**
-     * Set if the file will be uploaded when getting the value
-     * This defaults to false which will force receive() when calling getValues()
-     *
-     * @param boolean $flag Sets if the file is handled as the elements value
-     * @return Zend_Form_Element_File
-     */
-    public function setValueDisabled($flag)
-    {
-        $this->_valueDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Returns if the file will be uploaded when calling getValues()
-     *
-     * @return boolean Receive the file on calling getValues()?
-     */
-    public function isValueDisabled()
-    {
-        return $this->_valueDisabled;
-    }
-
-    /**
-     * Processes the file, returns null or the filename only
-     * For the complete path, use getFileName
-     *
-     * @return null|string
-     */
-    public function getValue()
-    {
-        if ($this->_value !== null) {
-            return $this->_value;
-        }
-
-        $content = $this->getTransferAdapter()->getFileName($this->getName());
-        if (empty($content)) {
-            return null;
-        }
-
-        if (!$this->isValid(null)) {
-            return null;
-        }
-
-        if (!$this->_valueDisabled && !$this->receive()) {
-            return null;
-        }
-
-        return $this->getFileName(null, false);
-    }
-
-    /**
-     * Disallow setting the value
-     *
-     * @param  mixed $value
-     * @return Zend_Form_Element_File
-     */
-    public function setValue($value)
-    {
-        return $this;
-    }
-
-    /**
-     * Set translator object for localization
-     *
-     * @param  Zend_Translate|null $translator
-     * @return Zend_Form_Element_File
-     */
-    public function setTranslator($translator = null)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->setTranslator($translator);
-        parent::setTranslator($translator);
-
-        return $this;
-    }
-
-    /**
-     * Retrieve localization translator object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        $translator = $this->getTransferAdapter()->getTranslator();
-        if (null === $translator) {
-            require_once 'Zend/Form.php';
-            return Zend_Form::getDefaultTranslator();
-        }
-
-        return $translator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element_File
-     */
-    public function setDisableTranslator($flag)
-    {
-        $adapter = $this->getTransferAdapter();
-        $adapter->setDisableTranslator($flag);
-        $this->_translatorDisabled = (bool) $flag;
-
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->translatorIsDisabled();
-    }
-
-    /**
-     * Was the file received?
-     *
-     * @return bool
-     */
-    public function isReceived()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->isReceived($this->getName());
-    }
-
-    /**
-     * Was the file uploaded?
-     *
-     * @return bool
-     */
-    public function isUploaded()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->isUploaded($this->getName());
-    }
-
-    /**
-     * Has the file been filtered?
-     *
-     * @return bool
-     */
-    public function isFiltered()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->isFiltered($this->getName());
-    }
-
-    /**
-     * Returns the hash for this file element
-     *
-     * @param string $hash (Optional) Hash algorithm to use
-     * @return string|array Hashstring
-     */
-    public function getHash($hash = 'crc32')
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->getHash($hash, $this->getName());
-    }
-
-    /**
-     * Returns the filesize for this file element
-     *
-     * @return string|array Filesize
-     */
-    public function getFileSize()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->getFileSize($this->getName());
-    }
-
-    /**
-     * Returns the mimetype for this file element
-     *
-     * @return string|array Mimetype
-     */
-    public function getMimeType()
-    {
-        $adapter = $this->getTransferAdapter();
-        return $adapter->getMimeType($this->getName());
-    }
-
-    /**
-     * Render form element
-     * Checks for decorator interface to prevent errors
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        $marker = false;
-        foreach ($this->getDecorators() as $decorator) {
-            if ($decorator instanceof Zend_Form_Decorator_Marker_File_Interface) {
-                $marker = true;
-            }
-        }
-
-        if (!$marker) {
-            require_once 'Zend/Form/Element/Exception.php';
-            throw new Zend_Form_Element_Exception('No file decorator found... unable to render file element');
-        }
-
-        return parent::render($view);
-    }
-
-    /**
-     * Retrieve error messages and perform translation and value substitution
-     *
-     * @return array
-     */
-    protected function _getErrorMessages()
-    {
-        $translator = $this->getTranslator();
-        $messages   = $this->getErrorMessages();
-        $value      = $this->getFileName();
-        foreach ($messages as $key => $message) {
-            if (null !== $translator) {
-                $message = $translator->translate($message);
-            }
-
-            if ($this->isArray() || is_array($value)) {
-                $aggregateMessages = array();
-                foreach ($value as $val) {
-                    $aggregateMessages[] = str_replace('%value%', $val, $message);
-                }
-
-                if (!empty($aggregateMessages)) {
-                    $messages[$key] = $aggregateMessages;
-                }
-            } else {
-                $messages[$key] = str_replace('%value%', $value, $message);
-            }
-        }
-
-        return $messages;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Hash.php b/airtime_mvc/library/Zend/Form/Element/Hash.php
deleted file mode 100644
index 4fa41c99e..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Hash.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * CSRF form protection
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Hash extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Use formHidden view helper by default
-     * @var string
-     */
-    public $helper = 'formHidden';
-
-    /**
-     * Actual hash used.
-     *
-     * @var mixed
-     */
-    protected $_hash;
-
-    /**
-     * Salt for CSRF token
-     * @var string
-     */
-    protected $_salt = 'salt';
-
-    /**
-     * @var Zend_Session_Namespace
-     */
-    protected $_session;
-
-    /**
-     * TTL for CSRF token
-     * @var int
-     */
-    protected $_timeout = 300;
-
-    /**
-     * Constructor
-     *
-     * Creates session namespace for CSRF token, and adds validator for CSRF
-     * token.
-     *
-     * @param  string|array|Zend_Config $spec
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($spec, $options = null)
-    {
-        parent::__construct($spec, $options);
-
-        $this->setAllowEmpty(false)
-             ->setRequired(true)
-             ->initCsrfValidator();
-    }
-
-    /**
-     * Set session object
-     *
-     * @param  Zend_Session_Namespace $session
-     * @return Zend_Form_Element_Hash
-     */
-    public function setSession($session)
-    {
-        $this->_session = $session;
-        return $this;
-    }
-
-    /**
-     * Get session object
-     *
-     * Instantiate session object if none currently exists
-     *
-     * @return Zend_Session_Namespace
-     */
-    public function getSession()
-    {
-        if (null === $this->_session) {
-            require_once 'Zend/Session/Namespace.php';
-            $this->_session = new Zend_Session_Namespace($this->getSessionName());
-        }
-        return $this->_session;
-    }
-
-    /**
-     * Initialize CSRF validator
-     *
-     * Creates Session namespace, and initializes CSRF token in session.
-     * Additionally, adds validator for validating CSRF token.
-     *
-     * @return Zend_Form_Element_Hash
-     */
-    public function initCsrfValidator()
-    {
-        $session = $this->getSession();
-        if (isset($session->hash)) {
-            $rightHash = $session->hash;
-        } else {
-            $rightHash = null;
-        }
-
-        $this->addValidator('Identical', true, array($rightHash));
-        return $this;
-    }
-
-    /**
-     * Salt for CSRF token
-     *
-     * @param  string $salt
-     * @return Zend_Form_Element_Hash
-     */
-    public function setSalt($salt)
-    {
-        $this->_salt = (string) $salt;
-        return $this;
-    }
-
-    /**
-     * Retrieve salt for CSRF token
-     *
-     * @return string
-     */
-    public function getSalt()
-    {
-        return $this->_salt;
-    }
-
-    /**
-     * Retrieve CSRF token
-     *
-     * If no CSRF token currently exists, generates one.
-     *
-     * @return string
-     */
-    public function getHash()
-    {
-        if (null === $this->_hash) {
-            $this->_generateHash();
-        }
-        return $this->_hash;
-    }
-
-    /**
-     * Get session namespace for CSRF token
-     *
-     * Generates a session namespace based on salt, element name, and class.
-     *
-     * @return string
-     */
-    public function getSessionName()
-    {
-        return __CLASS__ . '_' . $this->getSalt() . '_' . $this->getName();
-    }
-
-    /**
-     * Set timeout for CSRF session token
-     *
-     * @param  int $ttl
-     * @return Zend_Form_Element_Hash
-     */
-    public function setTimeout($ttl)
-    {
-        $this->_timeout = (int) $ttl;
-        return $this;
-    }
-
-    /**
-     * Get CSRF session token timeout
-     *
-     * @return int
-     */
-    public function getTimeout()
-    {
-        return $this->_timeout;
-    }
-
-    /**
-     * Override getLabel() to always be empty
-     *
-     * @return null
-     */
-    public function getLabel()
-    {
-        return null;
-    }
-
-    /**
-     * Initialize CSRF token in session
-     *
-     * @return void
-     */
-    public function initCsrfToken()
-    {
-        $session = $this->getSession();
-        $session->setExpirationHops(1, null, true);
-        $session->setExpirationSeconds($this->getTimeout());
-        $session->hash = $this->getHash();
-    }
-
-    /**
-     * Render CSRF token in form
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        $this->initCsrfToken();
-        return parent::render($view);
-    }
-
-    /**
-     * Generate CSRF token
-     *
-     * Generates CSRF token and stores both in {@link $_hash} and element
-     * value.
-     *
-     * @return void
-     */
-    protected function _generateHash()
-    {
-        $this->_hash = md5(
-            mt_rand(1,1000000)
-            .  $this->getSalt()
-            .  $this->getName()
-            .  mt_rand(1,1000000)
-        );
-        $this->setValue($this->_hash);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Hidden.php b/airtime_mvc/library/Zend/Form/Element/Hidden.php
deleted file mode 100644
index 4e0f59119..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Hidden.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Hidden form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Hidden extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Use formHidden view helper by default
-     * @var string
-     */
-    public $helper = 'formHidden';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Image.php b/airtime_mvc/library/Zend/Form/Element/Image.php
deleted file mode 100644
index 01c951b54..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Image.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Image form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Image extends Zend_Form_Element_Xhtml
-{
-    /**
-     * What view helper to use when using view helper decorator
-     * @var string
-     */
-    public $helper = 'formImage';
-
-    /**
-     * Image source
-     * @var string
-     */
-    public $src;
-
-    /**
-     * Image value
-     * @var mixed
-     */
-    protected $_imageValue;
-
-    /**
-     * Load default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('Tooltip')
-                 ->addDecorator('Image')
-                 ->addDecorator('Errors')
-                 ->addDecorator('HtmlTag', array('tag' => 'dd'))
-                 ->addDecorator('Label', array('tag' => 'dt'));
-        }
-    }
-
-    /**
-     * Set image path
-     *
-     * @param  string $path
-     * @return Zend_Form_Element_Image
-     */
-    public function setImage($path)
-    {
-        $this->src = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Get image path
-     *
-     * @return string
-     */
-    public function getImage()
-    {
-        return $this->src;
-    }
-
-    /**
-     * Set image value to use when submitted
-     *
-     * @param  mixed $value
-     * @return Zend_Form_Element_Image
-     */
-    public function setImageValue($value)
-    {
-        $this->_imageValue = $value;
-        return $this;
-    }
-
-    /**
-     * Get image value to use when submitted
-     *
-     * @return mixed
-     */
-    public function getImageValue()
-    {
-        return $this->_imageValue;
-    }
-
-    /**
-     * Was this element used to submit the form?
-     *
-     * @return bool
-     */
-    public function isChecked()
-    {
-        $imageValue = $this->getImageValue();
-        return ((null !== $imageValue) && ($this->getValue() == $imageValue));
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Multi.php b/airtime_mvc/library/Zend/Form/Element/Multi.php
deleted file mode 100644
index bc9526185..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Multi.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Base class for multi-option form elements
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Multi.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Form_Element_Multi extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Array of options for multi-item
-     * @var array
-     */
-    public $options = array();
-
-    /**
-     * Flag: autoregister inArray validator?
-     * @var bool
-     */
-    protected $_registerInArrayValidator = true;
-
-    /**
-     * Separator to use between options; defaults to '<br />'.
-     * @var string
-     */
-    protected $_separator = '<br />';
-
-    /**
-     * Which values are translated already?
-     * @var array
-     */
-    protected $_translated = array();
-
-    /**
-     * Retrieve separator
-     *
-     * @return mixed
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Set separator
-     *
-     * @param mixed $separator
-     * @return self
-     */
-    public function setSeparator($separator)
-    {
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * Retrieve options array
-     *
-     * @return array
-     */
-    protected function _getMultiOptions()
-    {
-        if (null === $this->options || !is_array($this->options)) {
-            $this->options = array();
-        }
-
-        return $this->options;
-    }
-
-    /**
-     * Add an option
-     *
-     * @param  string $option
-     * @param  string $value
-     * @return Zend_Form_Element_Multi
-     */
-    public function addMultiOption($option, $value = '')
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (!$this->_translateOption($option, $value)) {
-            $this->options[$option] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add many options at once
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Multi
-     */
-    public function addMultiOptions(array $options)
-    {
-        foreach ($options as $option => $value) {
-            if (is_array($value)
-                && array_key_exists('key', $value)
-                && array_key_exists('value', $value)
-            ) {
-                $this->addMultiOption($value['key'], $value['value']);
-            } else {
-                $this->addMultiOption($option, $value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set all options at once (overwrites)
-     *
-     * @param  array $options
-     * @return Zend_Form_Element_Multi
-     */
-    public function setMultiOptions(array $options)
-    {
-        $this->clearMultiOptions();
-        return $this->addMultiOptions($options);
-    }
-
-    /**
-     * Retrieve single multi option
-     *
-     * @param  string $option
-     * @return mixed
-     */
-    public function getMultiOption($option)
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (isset($this->options[$option])) {
-            $this->_translateOption($option, $this->options[$option]);
-            return $this->options[$option];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve options
-     *
-     * @return array
-     */
-    public function getMultiOptions()
-    {
-        $this->_getMultiOptions();
-        foreach ($this->options as $option => $value) {
-            $this->_translateOption($option, $value);
-        }
-        return $this->options;
-    }
-
-    /**
-     * Remove a single multi option
-     *
-     * @param  string $option
-     * @return bool
-     */
-    public function removeMultiOption($option)
-    {
-        $option  = (string) $option;
-        $this->_getMultiOptions();
-        if (isset($this->options[$option])) {
-            unset($this->options[$option]);
-            if (isset($this->_translated[$option])) {
-                unset($this->_translated[$option]);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Clear all options
-     *
-     * @return Zend_Form_Element_Multi
-     */
-    public function clearMultiOptions()
-    {
-        $this->options = array();
-        $this->_translated = array();
-        return $this;
-    }
-
-    /**
-     * Set flag indicating whether or not to auto-register inArray validator
-     *
-     * @param  bool $flag
-     * @return Zend_Form_Element_Multi
-     */
-    public function setRegisterInArrayValidator($flag)
-    {
-        $this->_registerInArrayValidator = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get status of auto-register inArray validator flag
-     *
-     * @return bool
-     */
-    public function registerInArrayValidator()
-    {
-        return $this->_registerInArrayValidator;
-    }
-
-    /**
-     * Is the value provided valid?
-     *
-     * Autoregisters InArray validator if necessary.
-     *
-     * @param  string $value
-     * @param  mixed $context
-     * @return bool
-     */
-    public function isValid($value, $context = null)
-    {
-        if ($this->registerInArrayValidator()) {
-            if (!$this->getValidator('InArray')) {
-                $multiOptions = $this->getMultiOptions();
-                $options      = array();
-
-                foreach ($multiOptions as $opt_value => $opt_label) {
-                    // optgroup instead of option label
-                    if (is_array($opt_label)) {
-                        $options = array_merge($options, array_keys($opt_label));
-                    }
-                    else {
-                        $options[] = $opt_value;
-                    }
-                }
-
-                $this->addValidator(
-                    'InArray',
-                    true,
-                    array($options)
-                );
-            }
-        }
-        return parent::isValid($value, $context);
-    }
-
-    /**
-     * Translate an option
-     *
-     * @param  string $option
-     * @param  string $value
-     * @return bool
-     */
-    protected function _translateOption($option, $value)
-    {
-        if ($this->translatorIsDisabled()) {
-            return false;
-        }
-
-        if (!isset($this->_translated[$option]) && !empty($value)) {
-            $this->options[$option] = $this->_translateValue($value);
-            if ($this->options[$option] === $value) {
-                return false;
-            }
-            $this->_translated[$option] = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Translate a multi option value
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _translateValue($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $key => $val) {
-                $value[$key] = $this->_translateValue($val);
-            }
-            return $value;
-        } else {
-            if (null !== ($translator = $this->getTranslator())) {
-                if ($translator->isTranslated($value)) {
-                    return $translator->translate($value);
-                }
-            }
-            return $value;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/MultiCheckbox.php b/airtime_mvc/library/Zend/Form/Element/MultiCheckbox.php
deleted file mode 100644
index c2242b66a..000000000
--- a/airtime_mvc/library/Zend/Form/Element/MultiCheckbox.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Multi */
-require_once 'Zend/Form/Element/Multi.php';
-
-/**
- * MultiCheckbox form element
- *
- * Allows specifyinc a (multi-)dimensional associative array of values to use
- * as labelled checkboxes; these will return an array of values for those
- * checkboxes selected.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_MultiCheckbox extends Zend_Form_Element_Multi
-{
-    /**
-     * Use formMultiCheckbox view helper by default
-     * @var string
-     */
-    public $helper = 'formMultiCheckbox';
-
-    /**
-     * MultiCheckbox is an array of values by default
-     * @var bool
-     */
-    protected $_isArray = true;
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Multiselect.php b/airtime_mvc/library/Zend/Form/Element/Multiselect.php
deleted file mode 100644
index e9c5a8734..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Multiselect.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Select */
-require_once 'Zend/Form/Element/Select.php';
-
-/**
- * Multiselect form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Multiselect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Multiselect extends Zend_Form_Element_Select
-{
-    /**
-     * 'multiple' attribute
-     * @var string
-     */
-    public $multiple = 'multiple';
-
-    /**
-     * Use formSelect view helper by default
-     * @var string
-     */
-    public $helper = 'formSelect';
-
-    /**
-     * Multiselect is an array of values by default
-     * @var bool
-     */
-    protected $_isArray = true;
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Password.php b/airtime_mvc/library/Zend/Form/Element/Password.php
deleted file mode 100644
index 61e4495a5..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Password.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Password form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Password.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Password extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Use formPassword view helper by default
-     * @var string
-     */
-    public $helper = 'formPassword';
-
-    /**
-     * Whether or not to render the password
-     * @var bool
-     */
-    public $renderPassword = false;
-
-    /**
-     * Set flag indicating whether or not to render the password
-     * @param  bool $flag
-     * @return Zend_Form_Element_Password
-     */
-    public function setRenderPassword($flag)
-    {
-        $this->renderPassword = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Get value of renderPassword flag
-     *
-     * @return bool
-     */
-    public function renderPassword()
-    {
-        return $this->renderPassword;
-    }
-
-    /**
-     * Override isValid()
-     *
-     * Ensure that validation error messages mask password value.
-     *
-     * @param  string $value
-     * @param  mixed $context
-     * @return bool
-     */
-    public function isValid($value, $context = null)
-    {
-        foreach ($this->getValidators() as $validator) {
-            if ($validator instanceof Zend_Validate_Abstract) {
-                $validator->setObscureValue(true);
-            }
-        }
-        return parent::isValid($value, $context);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Radio.php b/airtime_mvc/library/Zend/Form/Element/Radio.php
deleted file mode 100644
index 7b2c6c205..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Radio.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Multi */
-require_once 'Zend/Form/Element/Multi.php';
-
-/**
- * Radio form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Radio.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Radio extends Zend_Form_Element_Multi
-{
-    /**
-     * Use formRadio view helper by default
-     * @var string
-     */
-    public $helper = 'formRadio';
-
-    /**
-     * Load default decorators
-     *
-     * Disables "for" attribute of label if label decorator enabled.
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        parent::loadDefaultDecorators();
-        if (false !== $decorator = $this->getDecorator('Label')) {
-            $decorator->setOption('disableFor', true);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Reset.php b/airtime_mvc/library/Zend/Form/Element/Reset.php
deleted file mode 100644
index 1ebaf08dd..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Reset.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Submit */
-require_once 'Zend/Form/Element/Submit.php';
-
-/**
- * Reset form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reset.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Reset extends Zend_Form_Element_Submit
-{
-    /**
-     * Use formReset view helper by default
-     * @var string
-     */
-    public $helper = 'formReset';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Select.php b/airtime_mvc/library/Zend/Form/Element/Select.php
deleted file mode 100644
index 7c1a3f40d..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Select.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Multi */
-require_once 'Zend/Form/Element/Multi.php';
-
-/**
- * Select.php form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Select extends Zend_Form_Element_Multi
-{
-    /**
-     * Use formSelect view helper by default
-     * @var string
-     */
-    public $helper = 'formSelect';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Submit.php b/airtime_mvc/library/Zend/Form/Element/Submit.php
deleted file mode 100644
index aef6c98e8..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Submit.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Submit form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Submit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Submit extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Default view helper to use
-     * @var string
-     */
-    public $helper = 'formSubmit';
-
-    /**
-     * Constructor
-     *
-     * @param  string|array|Zend_Config $spec Element name or configuration
-     * @param  string|array|Zend_Config $options Element value or configuration
-     * @return void
-     */
-    public function __construct($spec, $options = null)
-    {
-        if (is_string($spec) && ((null !== $options) && is_string($options))) {
-            $options = array('label' => $options);
-        }
-        
-        if (!isset($options['ignore'])) {
-            $options['ignore'] = true;
-        }
-
-        parent::__construct($spec, $options);
-    }
-
-    /**
-     * Return label
-     *
-     * If no label is present, returns the currently set name.
-     *
-     * If a translator is present, returns the translated label.
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        $value = parent::getLabel();
-
-        if (null === $value) {
-            $value = $this->getName();
-        }
-
-        if (null !== ($translator = $this->getTranslator())) {
-            return $translator->translate($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Has this submit button been selected?
-     *
-     * @return bool
-     */
-    public function isChecked()
-    {
-        $value = $this->getValue();
-
-        if (empty($value)) {
-            return false;
-        }
-        if ($value != $this->getLabel()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Default decorators
-     *
-     * Uses only 'Submit' and 'DtDdWrapper' decorators by default.
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('Tooltip')
-                 ->addDecorator('ViewHelper')
-                 ->addDecorator('DtDdWrapper');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Text.php b/airtime_mvc/library/Zend/Form/Element/Text.php
deleted file mode 100644
index 7144d1323..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Text.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Text form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Text extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Default form view helper to use for rendering
-     * @var string
-     */
-    public $helper = 'formText';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Textarea.php b/airtime_mvc/library/Zend/Form/Element/Textarea.php
deleted file mode 100644
index 44d02011e..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Textarea.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element_Xhtml */
-require_once 'Zend/Form/Element/Xhtml.php';
-
-/**
- * Textarea form element
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_Element_Textarea extends Zend_Form_Element_Xhtml
-{
-    /**
-     * Use formTextarea view helper by default
-     * @var string
-     */
-    public $helper = 'formTextarea';
-}
diff --git a/airtime_mvc/library/Zend/Form/Element/Xhtml.php b/airtime_mvc/library/Zend/Form/Element/Xhtml.php
deleted file mode 100644
index 1c8683ad8..000000000
--- a/airtime_mvc/library/Zend/Form/Element/Xhtml.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form_Element */
-require_once 'Zend/Form/Element.php';
-
-/**
- * Base element for XHTML elements
- *
- * @category   Zend
- * @package    Zend_Form
- * @subpackage Element
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xhtml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Form_Element_Xhtml extends Zend_Form_Element
-{
-}
diff --git a/airtime_mvc/library/Zend/Form/Exception.php b/airtime_mvc/library/Zend/Form/Exception.php
deleted file mode 100644
index 5e07c76b2..000000000
--- a/airtime_mvc/library/Zend/Form/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Form_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Form/SubForm.php b/airtime_mvc/library/Zend/Form/SubForm.php
deleted file mode 100644
index 36225aa99..000000000
--- a/airtime_mvc/library/Zend/Form/SubForm.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Form */
-require_once 'Zend/Form.php';
-
-/**
- * Zend_Form_SubForm
- *
- * @category   Zend
- * @package    Zend_Form
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubForm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Form_SubForm extends Zend_Form
-{
-    /**
-     * Whether or not form elements are members of an array
-     * @var bool
-     */
-    protected $_isArray = true;
-
-    /**
-     * Load the default decorators
-     *
-     * @return void
-     */
-    public function loadDefaultDecorators()
-    {
-        if ($this->loadDefaultDecoratorsIsDisabled()) {
-            return;
-        }
-
-        $decorators = $this->getDecorators();
-        if (empty($decorators)) {
-            $this->addDecorator('FormElements')
-                 ->addDecorator('HtmlTag', array('tag' => 'dl'))
-                 ->addDecorator('Fieldset')
-                 ->addDecorator('DtDdWrapper');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata.php b/airtime_mvc/library/Zend/Gdata.php
deleted file mode 100644
index f2a2b5b5f..000000000
--- a/airtime_mvc/library/Zend/Gdata.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gdata.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App
- */
-require_once 'Zend/Gdata/App.php';
-
-/**
- * Provides functionality to interact with Google data APIs
- * Subclasses exist to implement service-specific features
- *
- * As the Google data API protocol is based upon the Atom Publishing Protocol
- * (APP), Gdata functionality extends the appropriate Zend_Gdata_App classes
- *
- * @link http://code.google.com/apis/gdata/overview.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata extends Zend_Gdata_App
-{
-
-    /**
-     * Service name for use with Google's authentication mechanisms
-     *
-     * @var string
-     */
-    const AUTH_SERVICE_NAME = 'xapi';
-
-    /**
-     * Default URI to which to POST.
-     *
-     * @var string
-     */
-    protected $_defaultPostUri = null;
-
-    /**
-     * Packages to search for classes when using magic __call method, in order.
-     *
-     * @var array
-     */
-    protected $_registeredPackages = array(
-            'Zend_Gdata_Kind',
-            'Zend_Gdata_Extension',
-            'Zend_Gdata',
-            'Zend_Gdata_App_Extension',
-            'Zend_Gdata_App');
-
-    /**
-     * Namespaces used for Gdata data
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('gd', 'http://schemas.google.com/g/2005', 1, 0),
-        array('openSearch', 'http://a9.com/-/spec/opensearchrss/1.0/', 1, 0),
-        array('openSearch', 'http://a9.com/-/spec/opensearch/1.1/', 2, 0),
-        array('rss', 'http://blogs.law.harvard.edu/tech/rss', 1, 0)
-    );
-
-    /**
-     * Client object used to communicate
-     *
-     * @var Zend_Gdata_HttpClient
-     */
-    protected $_httpClient;
-
-    /**
-     * Client object used to communicate in static context
-     *
-     * @var Zend_Gdata_HttpClient
-     */
-    protected static $_staticHttpClient = null;
-
-    /**
-     * Create Gdata object
-     *
-     * @param Zend_Http_Client $client
-     * @param string $applicationId The identity of the app in the form of
-     *          Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        parent::__construct($client, $applicationId);
-    }
-
-    /**
-     * Imports a feed located at $uri.
-     *
-     * @param  string $uri
-     * @param  Zend_Http_Client $client The client used for communication
-     * @param  string $className The class which is used as the return type
-     * @throws Zend_Gdata_App_Exception
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
-     */
-    public static function import($uri, $client = null,
-        $className='Zend_Gdata_Feed')
-    {
-        $app = new Zend_Gdata($client);
-        $requestData = $app->decodeRequest('GET', $uri);
-        $response = $app->performHttpRequest($requestData['method'], $requestData['url']);
-
-        $feedContent = $response->getBody();
-
-        $feed = self::importString($feedContent, $className);
-        if ($client != null) {
-            $feed->setHttpClient($client);
-        }
-        return $feed;
-    }
-
-    /**
-     * Retrieve feed as string or object
-     *
-     * @param mixed $location The location as string or Zend_Gdata_Query
-     * @param string $className The class type to use for returning the feed
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
-     */
-    public function getFeed($location, $className='Zend_Gdata_Feed')
-    {
-        if (is_string($location)) {
-            $uri = $location;
-        } elseif ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'You must specify the location as either a string URI ' .
-                    'or a child of Zend_Gdata_Query');
-        }
-        return parent::getFeed($uri, $className);
-    }
-
-    /**
-     * Retrieve entry as string or object
-     *
-     * @param mixed $location The location as string or Zend_Gdata_Query
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return string|Zend_Gdata_App_Entry Returns string only if the object
-     *                                     mapping has been disabled explicitly
-     *                                     by passing false to the
-     *                                     useObjectMapping() function.
-     */
-    public function getEntry($location, $className='Zend_Gdata_Entry')
-    {
-        if (is_string($location)) {
-            $uri = $location;
-        } elseif ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'You must specify the location as either a string URI ' .
-                    'or a child of Zend_Gdata_Query');
-        }
-        return parent::getEntry($uri, $className);
-    }
-
-    /**
-     * Performs a HTTP request using the specified method.
-     *
-     * Overrides the definition in the parent (Zend_Gdata_App)
-     * and uses the Zend_Gdata_HttpClient functionality
-     * to filter the HTTP requests and responses.
-     *
-     * @param string $method The HTTP method for the request -
-     *                       'GET', 'POST', 'PUT', 'DELETE'
-     * @param string $url The URL to which this request is being performed,
-     *                    or null if found in $data
-     * @param array $headers An associative array of HTTP headers
-     *                       for this request
-     * @param string $body The body of the HTTP request
-     * @param string $contentType The value for the content type of the
-     *                            request body
-     * @param int $remainingRedirects Number of redirects to follow
-     *                                if requests results in one
-     * @return Zend_Http_Response The response object
-     */
-    public function performHttpRequest($method, $url, $headers = array(), $body = null, $contentType = null, $remainingRedirects = null)
-    {
-        if ($this->_httpClient instanceof Zend_Gdata_HttpClient) {
-            $filterResult = $this->_httpClient->filterHttpRequest($method, $url, $headers, $body, $contentType);
-            $method = $filterResult['method'];
-            $url = $filterResult['url'];
-            $body = $filterResult['body'];
-            $headers = $filterResult['headers'];
-            $contentType = $filterResult['contentType'];
-            return $this->_httpClient->filterHttpResponse(parent::performHttpRequest($method, $url, $headers, $body, $contentType, $remainingRedirects));
-        } else {
-            return parent::performHttpRequest($method, $url, $headers, $body, $contentType, $remainingRedirects);
-        }
-    }
-
-    /**
-     * Determines whether service object is authenticated.
-     *
-     * @return boolean True if service object is authenticated, false otherwise.
-     */
-    public function isAuthenticated()
-    {
-        $client = parent::getHttpClient();
-        if ($client->getClientLoginToken() ||
-            $client->getAuthSubToken()) {
-                return true;
-        }
-
-        return false;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App.php b/airtime_mvc/library/Zend/Gdata/App.php
deleted file mode 100644
index 8a0809862..000000000
--- a/airtime_mvc/library/Zend/Gdata/App.php
+++ /dev/null
@@ -1,1211 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: App.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/App/Feed.php';
-
-/**
- * Zend_Gdata_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * Zend_Gdata_App_MediaSource
- */
-require_once 'Zend/Gdata/App/MediaSource.php';
-
-/**
- * Provides Atom Publishing Protocol (APP) functionality.  This class and all
- * other components of Zend_Gdata_App are designed to work independently from
- * other Zend_Gdata components in order to interact with generic APP services.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App
-{
-
-    /** Default major protocol version.
-      *
-      * @see _majorProtocolVersion
-      */
-    const DEFAULT_MAJOR_PROTOCOL_VERSION = 1;
-
-    /** Default minor protocol version.
-      *
-      * @see _minorProtocolVersion
-      */
-    const DEFAULT_MINOR_PROTOCOL_VERSION = null;
-
-    /**
-     * Client object used to communicate
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient;
-
-    /**
-     * Client object used to communicate in static context
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $_staticHttpClient = null;
-
-    /**
-     * Override HTTP PUT and DELETE request methods?
-     *
-     * @var boolean
-     */
-    protected static $_httpMethodOverride = false;
-
-    /**
-     * Enable gzipped responses?
-     *
-     * @var boolean
-     */
-    protected static $_gzipEnabled = false;
-
-    /**
-     * Use verbose exception messages.  In the case of HTTP errors,
-     * use the body of the HTTP response in the exception message.
-     *
-     * @var boolean
-     */
-    protected static $_verboseExceptionMessages = true;
-
-    /**
-     * Default URI to which to POST.
-     *
-     * @var string
-     */
-    protected $_defaultPostUri = null;
-
-    /**
-     * Packages to search for classes when using magic __call method, in order.
-     *
-     * @var array
-     */
-    protected $_registeredPackages = array(
-            'Zend_Gdata_App_Extension',
-            'Zend_Gdata_App');
-
-    /**
-     * Maximum number of redirects to follow during HTTP operations
-     *
-     * @var int
-     */
-    protected static $_maxRedirects = 5;
-
-    /**
-      * Indicates the major protocol version that should be used.
-      * At present, recognized values are either 1 or 2. However, any integer
-      * value >= 1 is considered valid.
-      *
-      * Under most circumtances, this will be automatically set by
-      * Zend_Gdata_App subclasses.
-      *
-      * @see setMajorProtocolVersion()
-      * @see getMajorProtocolVersion()
-      */
-    protected $_majorProtocolVersion;
-
-    /**
-      * Indicates the minor protocol version that should be used. Can be set
-      * to either an integer >= 0, or NULL if no minor version should be sent
-      * to the server.
-      *
-      * At present, this field is not used by any Google services, but may be
-      * used in the future.
-      *
-      * Under most circumtances, this will be automatically set by
-      * Zend_Gdata_App subclasses.
-      *
-      * @see setMinorProtocolVersion()
-      * @see getMinorProtocolVersion()
-      */
-    protected $_minorProtocolVersion;
-
-    /**
-     * Whether we want to use XML to object mapping when fetching data.
-     *
-     * @var boolean
-     */
-    protected $_useObjectMapping = true;
-
-    /**
-     * Create Gdata object
-     *
-     * @param Zend_Http_Client $client
-     * @param string $applicationId
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->setHttpClient($client, $applicationId);
-        // Set default protocol version. Subclasses should override this as
-        // needed once a given service supports a new version.
-        $this->setMajorProtocolVersion(self::DEFAULT_MAJOR_PROTOCOL_VERSION);
-        $this->setMinorProtocolVersion(self::DEFAULT_MINOR_PROTOCOL_VERSION);
-    }
-
-    /**
-     * Adds a Zend Framework package to the $_registeredPackages array.
-     * This array is searched when using the magic __call method below
-     * to instantiante new objects.
-     *
-     * @param string $name The name of the package (eg Zend_Gdata_App)
-     * @return void
-     */
-    public function registerPackage($name)
-    {
-        array_unshift($this->_registeredPackages, $name);
-    }
-
-    /**
-     * Retrieve feed as string or object
-     *
-     * @param string $uri The uri from which to retrieve the feed
-     * @param string $className The class which is used as the return type
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
-     */
-    public function getFeed($uri, $className='Zend_Gdata_App_Feed')
-    {
-        return $this->importUrl($uri, $className, null);
-    }
-
-    /**
-     * Retrieve entry as string or object
-     *
-     * @param string $uri
-     * @param string $className The class which is used as the return type
-     * @return string|Zend_Gdata_App_Entry Returns string only if the object
-     *                                     mapping has been disabled explicitly
-     *                                     by passing false to the
-     *                                     useObjectMapping() function.
-     */
-    public function getEntry($uri, $className='Zend_Gdata_App_Entry')
-    {
-        return $this->importUrl($uri, $className, null);
-    }
-
-    /**
-     * Get the Zend_Http_Client object used for communication
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_httpClient;
-    }
-
-    /**
-     * Set the Zend_Http_Client object used for communication
-     *
-     * @param Zend_Http_Client $client The client to use for communication
-     * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Gdata_App Provides a fluent interface
-     */
-    public function setHttpClient($client,
-        $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        if ($client === null) {
-            $client = new Zend_Http_Client();
-        }
-        if (!$client instanceof Zend_Http_Client) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException(
-                'Argument is not an instance of Zend_Http_Client.');
-        }
-        $userAgent = $applicationId . ' Zend_Framework_Gdata/' .
-            Zend_Version::VERSION;
-        $client->setHeaders('User-Agent', $userAgent);
-        $client->setConfig(array(
-            'strictredirects' => true
-            )
-        );
-        $this->_httpClient = $client;
-        self::setStaticHttpClient($client);
-        return $this;
-    }
-
-    /**
-     * Set the static HTTP client instance
-     *
-     * Sets the static HTTP client object to use for retrieving the feed.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setStaticHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$_staticHttpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object. If none is set, a new Zend_Http_Client will be used.
-     *
-     * @return Zend_Http_Client
-     */
-    public static function getStaticHttpClient()
-    {
-        if (!self::$_staticHttpClient instanceof Zend_Http_Client) {
-            $client = new Zend_Http_Client();
-            $userAgent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION;
-            $client->setHeaders('User-Agent', $userAgent);
-            $client->setConfig(array(
-                'strictredirects' => true
-                )
-            );
-            self::$_staticHttpClient = $client;
-        }
-        return self::$_staticHttpClient;
-    }
-
-    /**
-     * Toggle using POST instead of PUT and DELETE HTTP methods
-     *
-     * Some feed implementations do not accept PUT and DELETE HTTP
-     * methods, or they can't be used because of proxies or other
-     * measures. This allows turning on using POST where PUT and
-     * DELETE would normally be used; in addition, an
-     * X-Method-Override header will be sent with a value of PUT or
-     * DELETE as appropriate.
-     *
-     * @param  boolean $override Whether to override PUT and DELETE with POST.
-     * @return void
-     */
-    public static function setHttpMethodOverride($override = true)
-    {
-        self::$_httpMethodOverride = $override;
-    }
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return boolean
-     */
-    public static function getHttpMethodOverride()
-    {
-        return self::$_httpMethodOverride;
-    }
-
-    /**
-     * Toggle requesting gzip encoded responses
-     *
-     * @param  boolean $enabled Whether or not to enable gzipped responses
-     * @return void
-     */
-    public static function setGzipEnabled($enabled = false)
-    {
-        if ($enabled && !function_exists('gzinflate')) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'You cannot enable gzipped responses if the zlib module ' .
-                    'is not enabled in your PHP installation.');
-
-        }
-        self::$_gzipEnabled = $enabled;
-    }
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return boolean
-     */
-    public static function getGzipEnabled()
-    {
-        return self::$_gzipEnabled;
-    }
-
-    /**
-     * Get whether to use verbose exception messages
-     *
-     * In the case of HTTP errors,  use the body of the HTTP response
-     * in the exception message.
-     *
-     * @return boolean
-     */
-    public static function getVerboseExceptionMessages()
-    {
-        return self::$_verboseExceptionMessages;
-    }
-
-    /**
-     * Set whether to use verbose exception messages
-     *
-     * In the case of HTTP errors, use the body of the HTTP response
-     * in the exception message.
-     *
-     * @param boolean $verbose Whether to use verbose exception messages
-     */
-    public static function setVerboseExceptionMessages($verbose)
-    {
-        self::$_verboseExceptionMessages = $verbose;
-    }
-
-    /**
-     * Set the maximum number of redirects to follow during HTTP operations
-     *
-     * @param int $maxRedirects Maximum number of redirects to follow
-     * @return void
-     */
-    public static function setMaxRedirects($maxRedirects)
-    {
-        self::$_maxRedirects = $maxRedirects;
-    }
-
-    /**
-     * Get the maximum number of redirects to follow during HTTP operations
-     *
-     * @return int Maximum number of redirects to follow
-     */
-    public static function getMaxRedirects()
-    {
-        return self::$_maxRedirects;
-    }
-
-    /**
-     * Set the major protocol version that should be used. Values < 1 will
-     * cause a Zend_Gdata_App_InvalidArgumentException to be thrown.
-     *
-     * @see _majorProtocolVersion
-     * @param int $value The major protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMajorProtocolVersion($value)
-    {
-        if (!($value >= 1)) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Major protocol version must be >= 1');
-        }
-        $this->_majorProtocolVersion = $value;
-    }
-
-    /**
-     * Get the major protocol version that is in use.
-     *
-     * @see _majorProtocolVersion
-     * @return int The major protocol version in use.
-     */
-    public function getMajorProtocolVersion()
-    {
-        return $this->_majorProtocolVersion;
-    }
-
-    /**
-     * Set the minor protocol version that should be used. If set to NULL, no
-     * minor protocol version will be sent to the server. Values < 0 will
-     * cause a Zend_Gdata_App_InvalidArgumentException to be thrown.
-     *
-     * @see _minorProtocolVersion
-     * @param (int|NULL) $value The minor protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMinorProtocolVersion($value)
-    {
-        if (!($value >= 0)) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Minor protocol version must be >= 0');
-        }
-        $this->_minorProtocolVersion = $value;
-    }
-
-    /**
-     * Get the minor protocol version that is in use.
-     *
-     * @see _minorProtocolVersion
-     * @return (int|NULL) The major protocol version in use, or NULL if no
-     *         minor version is specified.
-     */
-    public function getMinorProtocolVersion()
-    {
-        return $this->_minorProtocolVersion;
-    }
-
-    /**
-     * Provides pre-processing for HTTP requests to APP services.
-     *
-     * 1. Checks the $data element and, if it's an entry, extracts the XML,
-     *    multipart data, edit link (PUT,DELETE), etc.
-     * 2. If $data is a string, sets the default content-type  header as
-     *    'application/atom+xml' if it's not already been set.
-     * 3. Adds a x-http-method override header and changes the HTTP method
-     *    to 'POST' if necessary as per getHttpMethodOverride()
-     *
-     * @param string $method The HTTP method for the request - 'GET', 'POST',
-     *                       'PUT', 'DELETE'
-     * @param string $url The URL to which this request is being performed,
-     *                    or null if found in $data
-     * @param array $headers An associative array of HTTP headers for this
-     *                       request
-     * @param mixed $data The Zend_Gdata_App_Entry or XML for the
-     *                    body of the request
-     * @param string $contentTypeOverride The override value for the
-     *                                    content type of the request body
-     * @return array An associative array containing the determined
-     *               'method', 'url', 'data', 'headers', 'contentType'
-     */
-    public function prepareRequest($method,
-                                   $url = null,
-                                   $headers = array(),
-                                   $data = null,
-                                   $contentTypeOverride = null)
-    {
-        // As a convenience, if $headers is null, we'll convert it back to
-        // an empty array.
-        if ($headers === null) {
-            $headers = array();
-        }
-
-        $rawData = null;
-        $finalContentType = null;
-        if ($url == null) {
-            $url = $this->_defaultPostUri;
-        }
-
-        if (is_string($data)) {
-            $rawData = $data;
-            if ($contentTypeOverride === null) {
-                $finalContentType = 'application/atom+xml';
-            }
-        } elseif ($data instanceof Zend_Gdata_App_MediaEntry) {
-            $rawData = $data->encode();
-            if ($data->getMediaSource() !== null) {
-                $finalContentType = $rawData->getContentType();
-                $headers['MIME-version'] = '1.0';
-                $headers['Slug'] = $data->getMediaSource()->getSlug();
-            } else {
-                $finalContentType = 'application/atom+xml';
-            }
-            if ($method == 'PUT' || $method == 'DELETE') {
-                $editLink = $data->getEditLink();
-                if ($editLink != null && $url == null) {
-                    $url = $editLink->getHref();
-                }
-            }
-        } elseif ($data instanceof Zend_Gdata_App_Entry) {
-            $rawData = $data->saveXML();
-            $finalContentType = 'application/atom+xml';
-            if ($method == 'PUT' || $method == 'DELETE') {
-                $editLink = $data->getEditLink();
-                if ($editLink != null) {
-                    $url = $editLink->getHref();
-                }
-            }
-        } elseif ($data instanceof Zend_Gdata_App_MediaSource) {
-            $rawData = $data->encode();
-            if ($data->getSlug() !== null) {
-                $headers['Slug'] = $data->getSlug();
-            }
-            $finalContentType = $data->getContentType();
-        }
-
-        if ($method == 'DELETE') {
-            $rawData = null;
-        }
-
-        // Set an If-Match header if:
-        //   - This isn't a DELETE
-        //   - If this isn't a GET, the Etag isn't weak
-        //   - A similar header (If-Match/If-None-Match) hasn't already been
-        //     set.
-        if ($method != 'DELETE' && (
-                !array_key_exists('If-Match', $headers) &&
-                !array_key_exists('If-None-Match', $headers)
-                ) ) {
-            $allowWeak = $method == 'GET';
-            if ($ifMatchHeader = $this->generateIfMatchHeaderData(
-                    $data, $allowWeak)) {
-                $headers['If-Match'] = $ifMatchHeader;
-            }
-        }
-
-        if ($method != 'POST' && $method != 'GET' && Zend_Gdata_App::getHttpMethodOverride()) {
-            $headers['x-http-method-override'] = $method;
-            $method = 'POST';
-        } else {
-            $headers['x-http-method-override'] = null;
-        }
-
-        if ($contentTypeOverride != null) {
-            $finalContentType = $contentTypeOverride;
-        }
-
-        return array('method' => $method, 'url' => $url,
-            'data' => $rawData, 'headers' => $headers,
-            'contentType' => $finalContentType);
-    }
-
-    /**
-     * Performs a HTTP request using the specified method
-     *
-     * @param string $method The HTTP method for the request - 'GET', 'POST',
-     *                       'PUT', 'DELETE'
-     * @param string $url The URL to which this request is being performed
-     * @param array $headers An associative array of HTTP headers
-     *                       for this request
-     * @param string $body The body of the HTTP request
-     * @param string $contentType The value for the content type
-     *                                of the request body
-     * @param int $remainingRedirects Number of redirects to follow if request
-     *                              s results in one
-     * @return Zend_Http_Response The response object
-     */
-    public function performHttpRequest($method, $url, $headers = null,
-        $body = null, $contentType = null, $remainingRedirects = null)
-    {
-        require_once 'Zend/Http/Client/Exception.php';
-        if ($remainingRedirects === null) {
-            $remainingRedirects = self::getMaxRedirects();
-        }
-        if ($headers === null) {
-            $headers = array();
-        }
-        // Append a Gdata version header if protocol v2 or higher is in use.
-        // (Protocol v1 does not use this header.)
-        $major = $this->getMajorProtocolVersion();
-        $minor = $this->getMinorProtocolVersion();
-        if ($major >= 2) {
-            $headers['GData-Version'] = $major +
-                    (($minor === null) ? '.' + $minor : '');
-        }
-
-        // check the overridden method
-        if (($method == 'POST' || $method == 'PUT') && $body === null &&
-            $headers['x-http-method-override'] != 'DELETE') {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                        'You must specify the data to post as either a ' .
-                        'string or a child of Zend_Gdata_App_Entry');
-        }
-        if ($url === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'You must specify an URI to which to post.');
-        }
-        $headers['Content-Type'] = $contentType;
-        if (Zend_Gdata_App::getGzipEnabled()) {
-            // some services require the word 'gzip' to be in the user-agent
-            // header in addition to the accept-encoding header
-            if (strpos($this->_httpClient->getHeader('User-Agent'),
-                'gzip') === false) {
-                $headers['User-Agent'] =
-                    $this->_httpClient->getHeader('User-Agent') . ' (gzip)';
-            }
-            $headers['Accept-encoding'] = 'gzip, deflate';
-        } else {
-            $headers['Accept-encoding'] = 'identity';
-        }
-
-        // Make sure the HTTP client object is 'clean' before making a request
-        // In addition to standard headers to reset via resetParameters(),
-        // also reset the Slug and If-Match headers
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setHeaders(array('Slug', 'If-Match'));
-
-        // Set the params for the new request to be performed
-        $this->_httpClient->setHeaders($headers);
-        $this->_httpClient->setUri($url);
-        $this->_httpClient->setConfig(array('maxredirects' => 0));
-
-        // Set the proper adapter if we are handling a streaming upload
-        $usingMimeStream = false;
-        $oldHttpAdapter = null;
-
-        if ($body instanceof Zend_Gdata_MediaMimeStream) {
-            $usingMimeStream = true;
-            $this->_httpClient->setRawDataStream($body, $contentType);
-            $oldHttpAdapter = $this->_httpClient->getAdapter();
-
-            if ($oldHttpAdapter instanceof Zend_Http_Client_Adapter_Proxy) {
-                require_once 'Zend/Gdata/HttpAdapterStreamingProxy.php';
-                $newAdapter = new Zend_Gdata_HttpAdapterStreamingProxy();
-            } else {
-                require_once 'Zend/Gdata/HttpAdapterStreamingSocket.php';
-                $newAdapter = new Zend_Gdata_HttpAdapterStreamingSocket();
-            }
-            $this->_httpClient->setAdapter($newAdapter);
-        } else {
-            $this->_httpClient->setRawData($body, $contentType);
-        }
-
-        try {
-            $response = $this->_httpClient->request($method);
-            // reset adapter
-            if ($usingMimeStream) {
-                $this->_httpClient->setAdapter($oldHttpAdapter);
-            }
-        } catch (Zend_Http_Client_Exception $e) {
-            // reset adapter
-            if ($usingMimeStream) {
-                $this->_httpClient->setAdapter($oldHttpAdapter);
-            }
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
-        }
-        if ($response->isRedirect() && $response->getStatus() != '304') {
-            if ($remainingRedirects > 0) {
-                $newUrl = $response->getHeader('Location');
-                $response = $this->performHttpRequest(
-                    $method, $newUrl, $headers, $body,
-                    $contentType, $remainingRedirects);
-            } else {
-                require_once 'Zend/Gdata/App/HttpException.php';
-                throw new Zend_Gdata_App_HttpException(
-                        'Number of redirects exceeds maximum', null, $response);
-            }
-        }
-        if (!$response->isSuccessful()) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            $exceptionMessage = 'Expected response code 200, got ' .
-                $response->getStatus();
-            if (self::getVerboseExceptionMessages()) {
-                $exceptionMessage .= "\n" . $response->getBody();
-            }
-            $exception = new Zend_Gdata_App_HttpException($exceptionMessage);
-            $exception->setResponse($response);
-            throw $exception;
-        }
-        return $response;
-    }
-
-    /**
-     * Imports a feed located at $uri.
-     *
-     * @param  string $uri
-     * @param  Zend_Http_Client $client The client used for communication
-     * @param  string $className The class which is used as the return type
-     * @throws Zend_Gdata_App_Exception
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
-     */
-    public static function import($uri, $client = null,
-        $className='Zend_Gdata_App_Feed')
-    {
-        $app = new Zend_Gdata_App($client);
-        $requestData = $app->prepareRequest('GET', $uri);
-        $response = $app->performHttpRequest(
-            $requestData['method'], $requestData['url']);
-
-        $feedContent = $response->getBody();
-        if (!$this->_useObjectMapping) {
-            return $feedContent;
-        }
-        $feed = self::importString($feedContent, $className);
-        if ($client != null) {
-            $feed->setHttpClient($client);
-        }
-        return $feed;
-    }
-
-    /**
-     * Imports the specified URL (non-statically).
-     *
-     * @param  string $url The URL to import
-     * @param  string $className The class which is used as the return type
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @throws Zend_Gdata_App_Exception
-     * @return string|Zend_Gdata_App_Feed Returns string only if the object
-     *                                    mapping has been disabled explicitly
-     *                                    by passing false to the
-     *                                    useObjectMapping() function.
-     */
-    public function importUrl($url, $className='Zend_Gdata_App_Feed',
-        $extraHeaders = array())
-    {
-        $response = $this->get($url, $extraHeaders);
-
-        $feedContent = $response->getBody();
-        if (!$this->_useObjectMapping) {
-            return $feedContent;
-        }
-
-        $protocolVersionStr = $response->getHeader('GData-Version');
-        $majorProtocolVersion = null;
-        $minorProtocolVersion = null;
-        if ($protocolVersionStr !== null) {
-            // Extract protocol major and minor version from header
-            $delimiterPos = strpos($protocolVersionStr, '.');
-            $length = strlen($protocolVersionStr);
-            $major = substr($protocolVersionStr, 0, $delimiterPos);
-            $minor = substr($protocolVersionStr, $delimiterPos + 1, $length);
-            $majorProtocolVersion = $major;
-            $minorProtocolVersion = $minor;
-        }
-
-        $feed = self::importString($feedContent, $className,
-            $majorProtocolVersion, $minorProtocolVersion);
-        if ($this->getHttpClient() != null) {
-            $feed->setHttpClient($this->getHttpClient());
-        }
-        $etag = $response->getHeader('ETag');
-        if ($etag !== null) {
-            $feed->setEtag($etag);
-        }
-        return $feed;
-    }
-
-
-    /**
-     * Imports a feed represented by $string.
-     *
-     * @param string $string
-     * @param string $className The class which is used as the return type
-     * @param integer $majorProcolVersion (optional) The major protocol version
-     *        of the data model object that is to be created.
-     * @param integer $minorProcolVersion (optional) The minor protocol version
-     *        of the data model object that is to be created.
-     * @throws Zend_Gdata_App_Exception
-     * @return Zend_Gdata_App_Feed
-     */
-    public static function importString($string,
-        $className='Zend_Gdata_App_Feed', $majorProtocolVersion = null,
-        $minorProtocolVersion = null)
-    {
-        // Load the feed as an XML DOMDocument object
-        @ini_set('track_errors', 1);
-        $doc = new DOMDocument();
-        $success = @$doc->loadXML($string);
-        @ini_restore('track_errors');
-
-        if (!$success) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                "DOMDocument cannot parse XML: $php_errormsg");
-        }
-
-        $feed = new $className();
-        $feed->setMajorProtocolVersion($majorProtocolVersion);
-        $feed->setMinorProtocolVersion($minorProtocolVersion);
-        $feed->transferFromXML($string);
-        $feed->setHttpClient(self::getstaticHttpClient());
-        return $feed;
-    }
-
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @param  string $className The class which is used as the return type
-     * @param  string $useIncludePath Whether the include_path should be searched
-     * @throws Zend_Gdata_App_Exception
-     * @return Zend_Gdata_App_Feed
-     */
-    public static function importFile($filename,
-            $className='Zend_Gdata_App_Feed', $useIncludePath = false)
-    {
-        @ini_set('track_errors', 1);
-        $feed = @file_get_contents($filename, $useIncludePath);
-        @ini_restore('track_errors');
-        if ($feed === false) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                "File could not be loaded: $php_errormsg");
-        }
-        return self::importString($feed, $className);
-    }
-
-    /**
-     * GET a URI using client object.
-     *
-     * @param string $uri GET URI
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Http_Response
-     */
-    public function get($uri, $extraHeaders = array())
-    {
-        $requestData = $this->prepareRequest('GET', $uri, $extraHeaders);
-        return $this->performHttpRequest(
-            $requestData['method'], $requestData['url'],
-            $requestData['headers']);
-    }
-
-    /**
-     * POST data with client object
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or XML to post
-     * @param string $uri POST URI
-     * @param array $headers Additional HTTP headers to insert.
-     * @param string $contentType Content-type of the data
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Http_Response
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function post($data, $uri = null, $remainingRedirects = null,
-            $contentType = null, $extraHeaders = null)
-    {
-        $requestData = $this->prepareRequest(
-            'POST', $uri, $extraHeaders, $data, $contentType);
-        return $this->performHttpRequest(
-                $requestData['method'], $requestData['url'],
-                $requestData['headers'], $requestData['data'],
-                $requestData['contentType']);
-    }
-
-    /**
-     * PUT data with client object
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or XML to post
-     * @param string $uri PUT URI
-     * @param array $headers Additional HTTP headers to insert.
-     * @param string $contentType Content-type of the data
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Http_Response
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function put($data, $uri = null, $remainingRedirects = null,
-            $contentType = null, $extraHeaders = null)
-    {
-        $requestData = $this->prepareRequest(
-            'PUT', $uri, $extraHeaders, $data, $contentType);
-        return $this->performHttpRequest(
-                $requestData['method'], $requestData['url'],
-                $requestData['headers'], $requestData['data'],
-                $requestData['contentType']);
-    }
-
-    /**
-     * DELETE entry with client object
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or URL to delete
-     * @return void
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function delete($data, $remainingRedirects = null)
-    {
-        if (is_string($data)) {
-            $requestData = $this->prepareRequest('DELETE', $data);
-        } else {
-            $headers = array();
-
-            $requestData = $this->prepareRequest(
-                'DELETE', null, $headers, $data);
-        }
-        return $this->performHttpRequest($requestData['method'],
-                                         $requestData['url'],
-                                         $requestData['headers'],
-                                         '',
-                                         $requestData['contentType'],
-                                         $remainingRedirects);
-    }
-
-    /**
-     * Inserts an entry to a given URI and returns the response as a
-     * fully formed Entry.
-     *
-     * @param mixed  $data The Zend_Gdata_App_Entry or XML to post
-     * @param string $uri POST URI
-     * @param string $className The class of entry to be returned.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Gdata_App_Entry The entry returned by the service after
-     *         insertion.
-     */
-    public function insertEntry($data, $uri, $className='Zend_Gdata_App_Entry',
-        $extraHeaders = array())
-    {
-        $response = $this->post($data, $uri, null, null, $extraHeaders);
-
-        $returnEntry = new $className($response->getBody());
-        $returnEntry->setHttpClient(self::getstaticHttpClient());
-
-        $etag = $response->getHeader('ETag');
-        if ($etag !== null) {
-            $returnEntry->setEtag($etag);
-        }
-
-        return $returnEntry;
-    }
-
-    /**
-     * Update an entry
-     *
-     * @param mixed $data Zend_Gdata_App_Entry or XML (w/ID and link rel='edit')
-     * @param string|null The URI to send requests to, or null if $data
-     *        contains the URI.
-     * @param string|null The name of the class that should be deserialized
-     *        from the server response. If null, then 'Zend_Gdata_App_Entry'
-     *        will be used.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Gdata_App_Entry The entry returned from the server
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function updateEntry($data, $uri = null, $className = null,
-        $extraHeaders = array())
-    {
-        if ($className === null && $data instanceof Zend_Gdata_App_Entry) {
-            $className = get_class($data);
-        } elseif ($className === null) {
-            $className = 'Zend_Gdata_App_Entry';
-        }
-
-        $response = $this->put($data, $uri, null, null, $extraHeaders);
-        $returnEntry = new $className($response->getBody());
-        $returnEntry->setHttpClient(self::getstaticHttpClient());
-
-        $etag = $response->getHeader('ETag');
-        if ($etag !== null) {
-            $returnEntry->setEtag($etag);
-        }
-
-        return $returnEntry;
-    }
-
-    /**
-     * Provides a magic factory method to instantiate new objects with
-     * shorter syntax than would otherwise be required by the Zend Framework
-     * naming conventions.  For instance, to construct a new
-     * Zend_Gdata_Calendar_Extension_Color, a developer simply needs to do
-     * $gCal->newColor().  For this magic constructor, packages are searched
-     * in the same order as which they appear in the $_registeredPackages
-     * array
-     *
-     * @param string $method The method name being called
-     * @param array $args The arguments passed to the call
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^new(\w+)/', $method, $matches)) {
-            $class = $matches[1];
-            $foundClassName = null;
-            foreach ($this->_registeredPackages as $name) {
-                 try {
-                     // Autoloading disabled on next line for compatibility
-                     // with magic factories. See ZF-6660.
-                     if (!class_exists($name . '_' . $class, false)) {
-                        require_once 'Zend/Loader.php';
-                        @Zend_Loader::loadClass($name . '_' . $class);
-                     }
-                     $foundClassName = $name . '_' . $class;
-                     break;
-                 } catch (Zend_Exception $e) {
-                     // package wasn't here- continue searching
-                 }
-            }
-            if ($foundClassName != null) {
-                $reflectionObj = new ReflectionClass($foundClassName);
-                $instance = $reflectionObj->newInstanceArgs($args);
-                if ($instance instanceof Zend_Gdata_App_FeedEntryParent) {
-                    $instance->setHttpClient($this->_httpClient);
-
-                    // Propogate version data
-                    $instance->setMajorProtocolVersion(
-                            $this->_majorProtocolVersion);
-                    $instance->setMinorProtocolVersion(
-                            $this->_minorProtocolVersion);
-                }
-                return $instance;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception(
-                        "Unable to find '${class}' in registered packages");
-            }
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception("No such method ${method}");
-        }
-    }
-
-    /**
-     * Retrieve all entries for a feed, iterating through pages as necessary.
-     * Be aware that calling this function on a large dataset will take a
-     * significant amount of time to complete. In some cases this may cause
-     * execution to timeout without proper precautions in place.
-     *
-     * @param $feed The feed to iterate through.
-     * @return mixed A new feed of the same type as the one originally
-     *          passed in, containing all relevent entries.
-     */
-    public function retrieveAllEntriesForFeed($feed) {
-        $feedClass = get_class($feed);
-        $reflectionObj = new ReflectionClass($feedClass);
-        $result = $reflectionObj->newInstance();
-        do {
-            foreach ($feed as $entry) {
-                $result->addEntry($entry);
-            }
-
-            $next = $feed->getLink('next');
-            if ($next !== null) {
-                $feed = $this->getFeed($next->href, $feedClass);
-            } else {
-                $feed = null;
-            }
-        }
-        while ($feed != null);
-        return $result;
-    }
-
-    /**
-     * This method enables logging of requests by changing the
-     * Zend_Http_Client_Adapter used for performing the requests.
-     * NOTE: This will not work if you have customized the adapter
-     * already to use a proxy server or other interface.
-     *
-     * @param $logfile The logfile to use when logging the requests
-     */
-    public function enableRequestDebugLogging($logfile)
-    {
-        $this->_httpClient->setConfig(array(
-            'adapter' => 'Zend_Gdata_App_LoggingHttpClientAdapterSocket',
-            'logfile' => $logfile
-            ));
-    }
-
-    /**
-     * Retrieve next set of results based on a given feed.
-     *
-     * @param Zend_Gdata_App_Feed $feed The feed from which to
-     *          retreive the next set of results.
-     * @param string $className (optional) The class of feed to be returned.
-     *          If null, the next feed (if found) will be the same class as
-     *          the feed that was given as the first argument.
-     * @return Zend_Gdata_App_Feed|null Returns a
-     *          Zend_Gdata_App_Feed or null if no next set of results
-     *          exists.
-     */
-    public function getNextFeed($feed, $className = null)
-    {
-        $nextLink = $feed->getNextLink();
-        if (!$nextLink) {
-            return null;
-        }
-        $nextLinkHref = $nextLink->getHref();
-
-        if ($className === null) {
-            $className = get_class($feed);
-        }
-
-        return $this->getFeed($nextLinkHref, $className);
-    }
-
-    /**
-     * Retrieve previous set of results based on a given feed.
-     *
-     * @param Zend_Gdata_App_Feed $feed The feed from which to
-     *          retreive the previous set of results.
-     * @param string $className (optional) The class of feed to be returned.
-     *          If null, the previous feed (if found) will be the same class as
-     *          the feed that was given as the first argument.
-     * @return Zend_Gdata_App_Feed|null Returns a
-     *          Zend_Gdata_App_Feed or null if no previous set of results
-     *          exists.
-     */
-    public function getPreviousFeed($feed, $className = null)
-    {
-        $previousLink = $feed->getPreviousLink();
-        if (!$previousLink) {
-            return null;
-        }
-        $previousLinkHref = $previousLink->getHref();
-
-        if ($className === null) {
-            $className = get_class($feed);
-        }
-
-        return $this->getFeed($previousLinkHref, $className);
-    }
-
-    /**
-     * Returns the data for an If-Match header based on the current Etag
-     * property. If Etags are not supported by the server or cannot be
-     * extracted from the data, then null will be returned.
-     *
-     * @param boolean $allowWeak If false, then if a weak Etag is detected,
-     *        then return null rather than the Etag.
-     * @return string|null $data
-     */
-    public function generateIfMatchHeaderData($data, $allowWeek)
-    {
-        $result = '';
-        // Set an If-Match header if an ETag has been set (version >= 2 only)
-        if ($this->_majorProtocolVersion >= 2 &&
-                $data instanceof Zend_Gdata_App_Entry) {
-            $etag = $data->getEtag();
-            if (($etag !== null) &&
-                    ($allowWeek || substr($etag, 0, 2) != 'W/')) {
-                $result = $data->getEtag();
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Determine whether service object is using XML to object mapping.
-     *
-     * @return boolean True if service object is using XML to object mapping,
-     *                 false otherwise.
-     */
-    public function usingObjectMapping()
-    {
-        return $this->_useObjectMapping;
-    }
-
-    /**
-     * Enable/disable the use of XML to object mapping.
-     *
-     * @param boolean $value Pass in true to use the XML to object mapping.
-     *                       Pass in false or null to disable it.
-     * @return void
-     */
-    public function useObjectMapping($value)
-    {
-        if ($value === True) {
-            $this->_useObjectMapping = true;
-        } else {
-            $this->_useObjectMapping = false;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/AuthException.php b/airtime_mvc/library/Zend/Gdata/App/AuthException.php
deleted file mode 100644
index 8ac26245e..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/AuthException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AuthException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Gdata exceptions
- *
- * Class to represent exceptions that occur during Gdata operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_AuthException extends Zend_Gdata_App_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/BadMethodCallException.php b/airtime_mvc/library/Zend/Gdata/App/BadMethodCallException.php
deleted file mode 100644
index 9f228a279..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/BadMethodCallException.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BadMethodCallException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Gdata APP exceptions
- *
- * Class to represent exceptions that occur during Gdata APP operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_BadMethodCallException extends Zend_Gdata_App_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Base.php b/airtime_mvc/library/Zend/Gdata/App/Base.php
deleted file mode 100644
index 67c8062ad..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Base.php
+++ /dev/null
@@ -1,572 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Util
- */
-require_once 'Zend/Gdata/App/Util.php';
-
-/**
- * Abstract class for all XML elements
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_Base
-{
-
-    /**
-     * @var string The XML element name, including prefix if desired
-     */
-    protected $_rootElement = null;
-
-    /**
-     * @var string The XML namespace prefix
-     */
-    protected $_rootNamespace = 'atom';
-
-    /**
-     * @var string The XML namespace URI - takes precedence over lookup up the
-     * corresponding URI for $_rootNamespace
-     */
-    protected $_rootNamespaceURI = null;
-
-    /**
-     * @var array Leftover elements which were not handled
-     */
-    protected $_extensionElements = array();
-
-    /**
-     * @var array Leftover attributes which were not handled
-     */
-    protected $_extensionAttributes = array();
-
-    /**
-     * @var string XML child text node content
-     */
-    protected $_text = null;
-
-    /**
-     * @var array Memoized results from calls to lookupNamespace() to avoid
-     *      expensive calls to getGreatestBoundedValue(). The key is in the
-     *      form 'prefix-majorVersion-minorVersion', and the value is the
-     *      output from getGreatestBoundedValue().
-     */
-    protected static $_namespaceLookupCache = array();
-
-    /**
-     * List of namespaces, as a three-dimensional array. The first dimension
-     * represents the namespace prefix, the second dimension represents the
-     * minimum major protocol version, and the third dimension is the minimum
-     * minor protocol version. Null keys are NOT allowed.
-     *
-     * When looking up a namespace for a given prefix, the greatest version
-     * number (both major and minor) which is less than the effective version
-     * should be used.
-     *
-     * @see lookupNamespace()
-     * @see registerNamespace()
-     * @see registerAllNamespaces()
-     * @var array
-     */
-   protected $_namespaces = array(
-        'atom'      => array(
-            1 => array(
-                0 => 'http://www.w3.org/2005/Atom'
-                )
-            ),
-        'app'       => array(
-            1 => array(
-                0 => 'http://purl.org/atom/app#'
-                ),
-            2 => array(
-                0 => 'http://www.w3.org/2007/app'
-                )
-            )
-        );
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * Returns the child text node of this element
-     * This represents any raw text contained within the XML element
-     *
-     * @return string Child text node
-     */
-    public function getText($trim = true)
-    {
-        if ($trim) {
-            return trim($this->_text);
-        } else {
-            return $this->_text;
-        }
-    }
-
-    /**
-     * Sets the child text node of this element
-     * This represents any raw text contained within the XML element
-     *
-     * @param string $value Child text node
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
-     */
-    public function setText($value)
-    {
-        $this->_text = $value;
-        return $this;
-    }
-
-    /**
-     * Returns an array of all elements not matched to data model classes
-     * during the parsing of the XML
-     *
-     * @return array All elements not matched to data model classes during parsing
-     */
-    public function getExtensionElements()
-    {
-        return $this->_extensionElements;
-    }
-
-    /**
-     * Sets an array of all elements not matched to data model classes
-     * during the parsing of the XML.  This method can be used to add arbitrary
-     * child XML elements to any data model class.
-     *
-     * @param array $value All extension elements
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
-     */
-    public function setExtensionElements($value)
-    {
-        $this->_extensionElements = $value;
-        return $this;
-    }
-
-    /**
-     * Returns an array of all extension attributes not transformed into data
-     * model properties during parsing of the XML.  Each element of the array
-     * is a hashed array of the format:
-     *     array('namespaceUri' => string, 'name' => string, 'value' => string);
-     *
-     * @return array All extension attributes
-     */
-    public function getExtensionAttributes()
-    {
-        return $this->_extensionAttributes;
-    }
-
-    /**
-     * Sets an array of all extension attributes not transformed into data
-     * model properties during parsing of the XML.  Each element of the array
-     * is a hashed array of the format:
-     *     array('namespaceUri' => string, 'name' => string, 'value' => string);
-     * This can be used to add arbitrary attributes to any data model element
-     *
-     * @param array $value All extension attributes
-     * @return Zend_Gdata_App_Base Returns an object of the same type as 'this' to provide a fluent interface.
-     */
-    public function setExtensionAttributes($value)
-    {
-        $this->_extensionAttributes = $value;
-        return $this;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        if ($doc === null) {
-            $doc = new DOMDocument('1.0', 'utf-8');
-        }
-        if ($this->_rootNamespaceURI != null) {
-            $element = $doc->createElementNS($this->_rootNamespaceURI, $this->_rootElement);
-        } elseif ($this->_rootNamespace !== null) {
-            if (strpos($this->_rootElement, ':') === false) {
-                $elementName = $this->_rootNamespace . ':' . $this->_rootElement;
-            } else {
-                $elementName = $this->_rootElement;
-            }
-            $element = $doc->createElementNS($this->lookupNamespace($this->_rootNamespace), $elementName);
-        } else {
-            $element = $doc->createElement($this->_rootElement);
-        }
-        if ($this->_text != null) {
-            $element->appendChild($element->ownerDocument->createTextNode($this->_text));
-        }
-        foreach ($this->_extensionElements as $extensionElement) {
-            $element->appendChild($extensionElement->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_extensionAttributes as $attribute) {
-            $element->setAttribute($attribute['name'], $attribute['value']);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a child DOMNode, tries to determine how to map the data into
-     * object instance members.  If no mapping is defined, Extension_Element
-     * objects are created and stored in an array.
-     *
-     * @param DOMNode $child The DOMNode needed to be handled
-     */
-    protected function takeChildFromDOM($child)
-    {
-        if ($child->nodeType == XML_TEXT_NODE) {
-            $this->_text = $child->nodeValue;
-        } else {
-            $extensionElement = new Zend_Gdata_App_Extension_Element();
-            $extensionElement->transferFromDOM($child);
-            $this->_extensionElements[] = $extensionElement;
-        }
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        $arrayIndex = ($attribute->namespaceURI != '')?(
-                $attribute->namespaceURI . ':' . $attribute->name):
-                $attribute->name;
-        $this->_extensionAttributes[$arrayIndex] =
-                array('namespaceUri' => $attribute->namespaceURI,
-                      'name' => $attribute->localName,
-                      'value' => $attribute->nodeValue);
-    }
-
-    /**
-     * Transfers each child and attribute into member variables.
-     * This is called when XML is received over the wire and the data
-     * model needs to be built to represent this XML.
-     *
-     * @param DOMNode $node The DOMNode that represents this object's data
-     */
-    public function transferFromDOM($node)
-    {
-        foreach ($node->childNodes as $child) {
-            $this->takeChildFromDOM($child);
-        }
-        foreach ($node->attributes as $attribute) {
-            $this->takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Parses the provided XML text and generates data model classes for
-     * each know element by turning the XML text into a DOM tree and calling
-     * transferFromDOM($element).  The first data model element with the same
-     * name as $this->_rootElement is used and the child elements are
-     * recursively parsed.
-     *
-     * @param string $xml The XML text to parse
-     */
-    public function transferFromXML($xml)
-    {
-        if ($xml) {
-            // Load the feed as an XML DOMDocument object
-            @ini_set('track_errors', 1);
-            $doc = new DOMDocument();
-            $success = @$doc->loadXML($xml);
-            @ini_restore('track_errors');
-            if (!$success) {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg");
-            }
-            $element = $doc->getElementsByTagName($this->_rootElement)->item(0);
-            if (!$element) {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element');
-            }
-            $this->transferFromDOM($element);
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null');
-        }
-    }
-
-    /**
-     * Converts this element and all children into XML text using getDOM()
-     *
-     * @return string XML content
-     */
-    public function saveXML()
-    {
-        $element = $this->getDOM();
-        return $element->ownerDocument->saveXML($element);
-    }
-
-    /**
-     * Alias for saveXML() returns XML content for this element and all
-     * children
-     *
-     * @return string XML content
-     */
-    public function getXML()
-    {
-        return $this->saveXML();
-    }
-
-    /**
-     * Alias for saveXML()
-     *
-     * Can be overridden by children to provide more complex representations
-     * of entries.
-     *
-     * @return string Encoded string content
-     */
-    public function encode()
-    {
-        return $this->saveXML();
-    }
-
-    /**
-     * Get the full version of a namespace prefix
-     *
-     * Looks up a prefix (atom:, etc.) in the list of registered
-     * namespaces and returns the full namespace URI if
-     * available. Returns the prefix, unmodified, if it's not
-     * registered.
-     *
-     * @param string $prefix The namespace prefix to lookup.
-     * @param integer $majorVersion The major protocol version in effect.
-     *        Defaults to '1'.
-     * @param integer $minorVersion The minor protocol version in effect.
-     *        Defaults to null (use latest).
-     * @return string
-     */
-    public function lookupNamespace($prefix,
-                                    $majorVersion = 1,
-                                    $minorVersion = null)
-    {
-        // Check for a memoized result
-        $key = $prefix . ' ' .
-               (is_null($majorVersion) ? 'NULL' : $majorVersion) .
-               ' '. (is_null($minorVersion) ? 'NULL' : $minorVersion);
-        if (array_key_exists($key, self::$_namespaceLookupCache))
-          return self::$_namespaceLookupCache[$key];
-        // If no match, return the prefix by default
-        $result = $prefix;
-
-        // Find tuple of keys that correspond to the namespace we should use
-        if (isset($this->_namespaces[$prefix])) {
-            // Major version search
-            $nsData = $this->_namespaces[$prefix];
-            $foundMajorV = Zend_Gdata_App_Util::findGreatestBoundedValue(
-                    $majorVersion, $nsData);
-            // Minor version search
-            $nsData = $nsData[$foundMajorV];
-            $foundMinorV = Zend_Gdata_App_Util::findGreatestBoundedValue(
-                    $minorVersion, $nsData);
-            // Extract NS
-            $result = $nsData[$foundMinorV];
-        }
-
-        // Memoize result
-        self::$_namespaceLookupCache[$key] = $result;
-
-        return $result;
-    }
-
-    /**
-     * Add a namespace and prefix to the registered list
-     *
-     * Takes a prefix and a full namespace URI and adds them to the
-     * list of registered namespaces for use by
-     * $this->lookupNamespace().
-     *
-     * WARNING: Currently, registering a namespace will NOT invalidate any
-     *          memoized data stored in $_namespaceLookupCache. Under normal
-     *          use, this behavior is acceptable. If you are adding
-     *          contradictory data to the namespace lookup table, you must
-     *          call flushNamespaceLookupCache().
-     *
-     * @param  string $prefix The namespace prefix
-     * @param  string $namespaceUri The full namespace URI
-     * @param integer $majorVersion The major protocol version in effect.
-     *        Defaults to '1'.
-     * @param integer $minorVersion The minor protocol version in effect.
-     *        Defaults to null (use latest).
-     * @return void
-     */
-    public function registerNamespace($prefix,
-                                      $namespaceUri,
-                                      $majorVersion = 1,
-                                      $minorVersion = 0)
-    {
-        $this->_namespaces[$prefix][$majorVersion][$minorVersion] =
-        $namespaceUri;
-    }
-
-    /**
-     * Flush namespace lookup cache.
-     *
-     * Empties the namespace lookup cache. Call this function if you have
-     * added data to the namespace lookup table that contradicts values that
-     * may have been cached during a previous call to lookupNamespace().
-     */
-    public static function flushNamespaceLookupCache()
-    {
-        self::$_namespaceLookupCache = array();
-    }
-
-    /**
-     * Add an array of namespaces to the registered list.
-     *
-     * Takes an array in the format of:
-     * namespace prefix, namespace URI, major protocol version,
-     * minor protocol version and adds them with calls to ->registerNamespace()
-     *
-     * @param array $namespaceArray An array of namespaces.
-     * @return void
-     */
-    public function registerAllNamespaces($namespaceArray)
-    {
-        foreach($namespaceArray as $namespace) {
-                $this->registerNamespace(
-                    $namespace[0], $namespace[1], $namespace[2], $namespace[3]);
-        }
-    }
-
-
-    /**
-     * Magic getter to allow access like $entry->foo to call $entry->getFoo()
-     * Alternatively, if no getFoo() is defined, but a $_foo protected variable
-     * is defined, this is returned.
-     *
-     * TODO Remove ability to bypass getFoo() methods??
-     *
-     * @param string $name The variable name sought
-     */
-    public function __get($name)
-    {
-        $method = 'get'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method));
-        } else if (property_exists($this, "_${name}")) {
-            return $this->{'_' . $name};
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . ' does not exist');
-        }
-    }
-
-    /**
-     * Magic setter to allow acces like $entry->foo='bar' to call
-     * $entry->setFoo('bar') automatically.
-     *
-     * Alternatively, if no setFoo() is defined, but a $_foo protected variable
-     * is defined, this is returned.
-     *
-     * TODO Remove ability to bypass getFoo() methods??
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __set($name, $val)
-    {
-        $method = 'set'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method), $val);
-        } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) {
-            $this->{'_' . $name} = $val;
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . '  does not exist');
-        }
-    }
-
-    /**
-     * Magic __isset method
-     *
-     * @param string $name
-     */
-    public function __isset($name)
-    {
-        $rc = new ReflectionClass(get_class($this));
-        $privName = '_' . $name;
-        if (!($rc->hasProperty($privName))) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . ' does not exist');
-        } else {
-            if (isset($this->{$privName})) {
-                if (is_array($this->{$privName})) {
-                    if (count($this->{$privName}) > 0) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Magic __unset method
-     *
-     * @param string $name
-     */
-    public function __unset($name)
-    {
-        if (isset($this->{'_' . $name})) {
-            if (is_array($this->{'_' . $name})) {
-                $this->{'_' . $name} = array();
-            } else {
-                $this->{'_' . $name} = null;
-            }
-        }
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string The text representation of this object
-     */
-    public function __toString()
-    {
-        return $this->getText();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/BaseMediaSource.php b/airtime_mvc/library/Zend/Gdata/App/BaseMediaSource.php
deleted file mode 100644
index 131f75e9c..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/BaseMediaSource.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BaseMediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_MediaSource
- */
-require_once 'Zend/Gdata/App/MediaSource.php';
-
-/**
- * Concrete class to use a file handle as an attachment within a MediaEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSource
-{
-
-    /**
-     * The content type for the attached file (example image/png)
-     *
-     * @var string
-     */
-    protected $_contentType = null;
-
-    /**
-     * The slug header value representing the attached file title, or null if
-     * no slug should be used.  The slug header is only necessary in some cases,
-     * usually when a multipart upload is not being performed.
-     *
-     * @var string
-     */
-    protected $_slug = null;
-
-    /**
-     * The content type for the attached file (example image/png)
-     *
-     * @return string The content type
-     */
-    public function getContentType()
-    {
-        return $this->_contentType;
-    }
-
-    /**
-     * Set the content type for the file attached (example image/png)
-     *
-     * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
-     */
-    public function setContentType($value)
-    {
-        $this->_contentType = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the Slug header value.  Used by some services to determine the
-     * title for the uploaded file.  Returns null if no slug should be used.
-     *
-     * @return string
-     */
-    public function getSlug(){
-        return $this->_slug;
-    }
-
-    /**
-     * Sets the Slug header value.  Used by some services to determine the
-     * title for the uploaded file.  A null value indicates no slug header.
-     *
-     * @var string The slug value
-     * @return Zend_Gdata_App_MediaSource Provides a fluent interface
-     */
-    public function setSlug($value){
-        $this->_slug = $value;
-        return $this;
-    }
-
-
-    /**
-     * Magic getter to allow acces like $source->foo to call $source->getFoo()
-     * Alternatively, if no getFoo() is defined, but a $_foo protected variable
-     * is defined, this is returned.
-     *
-     * TODO Remove ability to bypass getFoo() methods??
-     *
-     * @param string $name The variable name sought
-     */
-    public function __get($name)
-    {
-        $method = 'get'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method));
-        } else if (property_exists($this, "_${name}")) {
-            return $this->{'_' . $name};
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . ' does not exist');
-        }
-    }
-
-    /**
-     * Magic setter to allow acces like $source->foo='bar' to call
-     * $source->setFoo('bar') automatically.
-     *
-     * Alternatively, if no setFoo() is defined, but a $_foo protected variable
-     * is defined, this is returned.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __set($name, $val)
-    {
-        $method = 'set'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method), $val);
-        } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) {
-            $this->{'_' . $name} = $val;
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . '  does not exist');
-        }
-    }
-
-    /**
-     * Magic __isset method
-     *
-     * @param string $name
-     */
-    public function __isset($name)
-    {
-        $rc = new ReflectionClass(get_class($this));
-        $privName = '_' . $name;
-        if (!($rc->hasProperty($privName))) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Property ' . $name . ' does not exist');
-        } else {
-            if (isset($this->{$privName})) {
-                if (is_array($this->{$privName})) {
-                    if (count($this->{$privName}) > 0) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/CaptchaRequiredException.php b/airtime_mvc/library/Zend/Gdata/App/CaptchaRequiredException.php
deleted file mode 100644
index 2503790d8..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/CaptchaRequiredException.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CaptchaRequiredException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_CaptchaRequiredException
- */
-require_once 'Zend/Gdata/App/AuthException.php';
-
-/**
- * Gdata exceptions
- *
- * Class to represent an exception that occurs during the use of ClientLogin.
- * This particular exception happens when a CAPTCHA challenge is issued. This
- * challenge is a visual puzzle presented to the user to prove that they are
- * not an automated system.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthException
-{
-    /**
-     * The Google Accounts URL prefix.
-     */
-    const ACCOUNTS_URL = 'https://www.google.com/accounts/';
-
-    /**
-     * The token identifier from the server.
-     *
-     * @var string
-     */
-    private $captchaToken;
-
-    /**
-     * The URL of the CAPTCHA image.
-     *
-     * @var string
-     */
-    private $captchaUrl;
-
-    /**
-     * Constructs the exception to handle a CAPTCHA required response.
-     *
-     * @param string $captchaToken The CAPTCHA token ID provided by the server.
-     * @param string $captchaUrl The URL to the CAPTCHA challenge image.
-     */
-    public function __construct($captchaToken, $captchaUrl) {
-        $this->captchaToken = $captchaToken;
-        $this->captchaUrl = Zend_Gdata_App_CaptchaRequiredException::ACCOUNTS_URL . $captchaUrl;
-        parent::__construct('CAPTCHA challenge issued by server');
-    }
-
-    /**
-     * Retrieves the token identifier as provided by the server.
-     *
-     * @return string
-     */
-    public function getCaptchaToken() {
-        return $this->captchaToken;
-    }
-
-    /**
-     * Retrieves the URL CAPTCHA image as provided by the server.
-     *
-     * @return string
-     */
-    public function getCaptchaUrl() {
-        return $this->captchaUrl;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Entry.php b/airtime_mvc/library/Zend/Gdata/App/Entry.php
deleted file mode 100644
index 1729d6ffb..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Entry.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_FeedEntryParent
- */
-require_once 'Zend/Gdata/App/FeedEntryParent.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Content
- */
-require_once 'Zend/Gdata/App/Extension/Content.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Edited
- */
-require_once 'Zend/Gdata/App/Extension/Edited.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Published
- */
-require_once 'Zend/Gdata/App/Extension/Published.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Source
- */
-require_once 'Zend/Gdata/App/Extension/Source.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Summary
- */
-require_once 'Zend/Gdata/App/Extension/Summary.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Control
- */
-require_once 'Zend/Gdata/App/Extension/Control.php';
-
-/**
- * Concrete class for working with Atom entries.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent
-{
-
-    /**
-     * Root XML element for Atom entries.
-     *
-     * @var string
-     */
-    protected $_rootElement = 'entry';
-
-    /**
-     * Class name for each entry in this feed*
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_App_Entry';
-
-    /**
-     * atom:content element
-     *
-     * @var Zend_Gdata_App_Extension_Content
-     */
-    protected $_content = null;
-
-    /**
-     * atom:published element
-     *
-     * @var Zend_Gdata_App_Extension_Published
-     */
-    protected $_published = null;
-
-    /**
-     * atom:source element
-     *
-     * @var Zend_Gdata_App_Extension_Source
-     */
-    protected $_source = null;
-
-    /**
-     * atom:summary element
-     *
-     * @var Zend_Gdata_App_Extension_Summary
-     */
-    protected $_summary = null;
-
-    /**
-     * app:control element
-     *
-     * @var Zend_Gdata_App_Extension_Control
-     */
-    protected $_control = null;
-
-    /**
-     * app:edited element
-     *
-     * @var Zend_Gdata_App_Extension_Edited
-     */
-    protected $_edited = null;
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_content != null) {
-            $element->appendChild($this->_content->getDOM($element->ownerDocument));
-        }
-        if ($this->_published != null) {
-            $element->appendChild($this->_published->getDOM($element->ownerDocument));
-        }
-        if ($this->_source != null) {
-            $element->appendChild($this->_source->getDOM($element->ownerDocument));
-        }
-        if ($this->_summary != null) {
-            $element->appendChild($this->_summary->getDOM($element->ownerDocument));
-        }
-        if ($this->_control != null) {
-            $element->appendChild($this->_control->getDOM($element->ownerDocument));
-        }
-        if ($this->_edited != null) {
-            $element->appendChild($this->_edited->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'content':
-            $content = new Zend_Gdata_App_Extension_Content();
-            $content->transferFromDOM($child);
-            $this->_content = $content;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'published':
-            $published = new Zend_Gdata_App_Extension_Published();
-            $published->transferFromDOM($child);
-            $this->_published = $published;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'source':
-            $source = new Zend_Gdata_App_Extension_Source();
-            $source->transferFromDOM($child);
-            $this->_source = $source;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'summary':
-            $summary = new Zend_Gdata_App_Extension_Summary();
-            $summary->transferFromDOM($child);
-            $this->_summary = $summary;
-            break;
-        case $this->lookupNamespace('app') . ':' . 'control':
-            $control = new Zend_Gdata_App_Extension_Control();
-            $control->transferFromDOM($child);
-            $this->_control = $control;
-            break;
-        case $this->lookupNamespace('app') . ':' . 'edited':
-            $edited = new Zend_Gdata_App_Extension_Edited();
-            $edited->transferFromDOM($child);
-            $this->_edited = $edited;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Uploads changes in this entry to the server using Zend_Gdata_App
-     *
-     * @param string|null $uri The URI to send requests to, or null if $data
-     *        contains the URI.
-     * @param string|null $className The name of the class that should we
-     *        deserializing the server response. If null, then
-     *        'Zend_Gdata_App_Entry' will be used.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Gdata_App_Entry The updated entry.
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function save($uri = null, $className = null, $extraHeaders = array())
-    {
-        return $this->getService()->updateEntry($this,
-                                                $uri,
-                                                $className,
-                                                $extraHeaders);
-    }
-
-    /**
-     * Deletes this entry to the server using the referenced
-     * Zend_Http_Client to do a HTTP DELETE to the edit link stored in this
-     * entry's link collection.
-     *
-     * @return void
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function delete()
-    {
-        $this->getService()->delete($this);
-    }
-
-    /**
-     * Reload the current entry. Returns a new copy of the entry as returned
-     * by the server, or null if no changes exist. This does not
-     * modify the current entry instance.
-     *
-     * @param string|null The URI to send requests to, or null if $data
-     *        contains the URI.
-     * @param string|null The name of the class that should we deserializing
-     *        the server response. If null, then 'Zend_Gdata_App_Entry' will
-     *        be used.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return mixed A new instance of the current entry with updated data, or
-     *         null if the server reports that no changes have been made.
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function reload($uri = null, $className = null, $extraHeaders = array())
-    {
-        // Get URI
-        $editLink = $this->getEditLink();
-        if (($uri === null) && $editLink != null) {
-            $uri = $editLink->getHref();
-        }
-
-        // Set classname to current class, if not otherwise set
-        if ($className === null) {
-            $className = get_class($this);
-        }
-
-        // Append ETag, if present (Gdata v2 and above, only) and doesn't
-        // conflict with existing headers
-        if ($this->_etag != null
-                && !array_key_exists('If-Match', $extraHeaders)
-                && !array_key_exists('If-None-Match', $extraHeaders)) {
-            $extraHeaders['If-None-Match'] = $this->_etag;
-        }
-
-        // If an HTTP 304 status (Not Modified)is returned, then we return
-        // null.
-        $result = null;
-        try {
-            $result = $this->service->importUrl($uri, $className, $extraHeaders);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            if ($e->getResponse()->getStatus() != '304')
-                throw $e;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the value of the atom:content element
-     *
-     * @return Zend_Gdata_App_Extension_Content
-     */
-    public function getContent()
-    {
-        return $this->_content;
-    }
-
-    /**
-     * Sets the value of the atom:content element
-     *
-     * @param Zend_Gdata_App_Extension_Content $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setContent($value)
-    {
-        $this->_content = $value;
-        return $this;
-    }
-
-    /**
-     * Sets the value of the atom:published element
-     * This represents the publishing date for an entry
-     *
-     * @return Zend_Gdata_App_Extension_Published
-     */
-    public function getPublished()
-    {
-        return $this->_published;
-    }
-
-    /**
-     * Sets the value of the atom:published element
-     * This represents the publishing date for an entry
-     *
-     * @param Zend_Gdata_App_Extension_Published $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setPublished($value)
-    {
-        $this->_published = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the value of the atom:source element
-     *
-     * @return Zend_Gdata_App_Extension_Source
-     */
-    public function getSource()
-    {
-        return $this->_source;
-    }
-
-    /**
-     * Sets the value of the atom:source element
-     *
-     * @param Zend_Gdata_App_Extension_Source $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setSource($value)
-    {
-        $this->_source = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the value of the atom:summary element
-     * This represents a textual summary of this entry's content
-     *
-     * @return Zend_Gdata_App_Extension_Summary
-     */
-    public function getSummary()
-    {
-        return $this->_summary;
-    }
-
-    /**
-     * Sets the value of the atom:summary element
-     * This represents a textual summary of this entry's content
-     *
-     * @param Zend_Gdata_App_Extension_Summary $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setSummary($value)
-    {
-        $this->_summary = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the value of the app:control element
-     *
-     * @return Zend_Gdata_App_Extension_Control
-     */
-    public function getControl()
-    {
-        return $this->_control;
-    }
-
-    /**
-     * Sets the value of the app:control element
-     *
-     * @param Zend_Gdata_App_Extension_Control $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setControl($value)
-    {
-        $this->_control = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Exception.php b/airtime_mvc/library/Zend/Gdata/App/Exception.php
deleted file mode 100644
index 08b67b6f4..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Exception.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Gdata App exceptions
- *
- * Class to represent exceptions that occur during Gdata App operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension.php b/airtime_mvc/library/Zend/Gdata/App/Extension.php
deleted file mode 100644
index f93c86830..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Base
- */
-require_once 'Zend/Gdata/App/Base.php';
-
-/**
- * Gdata App extensions
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_Extension extends Zend_Gdata_App_Base
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Author.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Author.php
deleted file mode 100644
index 70dccb685..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Author.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension/Person.php';
-
-/**
- * Represents the atom:author element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Author extends Zend_Gdata_App_Extension_Person
-{
-
-    protected $_rootElement = 'author';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Category.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Category.php
deleted file mode 100644
index 982369409..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Category.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Category.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:category element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Category extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'category';
-    protected $_term = null;
-    protected $_scheme = null;
-    protected $_label = null;
-
-    public function __construct($term = null, $scheme = null, $label=null)
-    {
-        parent::__construct();
-        $this->_term = $term;
-        $this->_scheme = $scheme;
-        $this->_label = $label;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_term !== null) {
-            $element->setAttribute('term', $this->_term);
-        }
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        if ($this->_label !== null) {
-            $element->setAttribute('label', $this->_label);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'term':
-            $this->_term = $attribute->nodeValue;
-            break;
-        case 'scheme':
-            $this->_scheme = $attribute->nodeValue;
-            break;
-        case 'label':
-            $this->_label = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getTerm()
-    {
-        return $this->_term;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
-     */
-    public function setTerm($value)
-    {
-        $this->_term = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Extension_Category Provides a fluent interface
-     */
-    public function setLabel($value)
-    {
-        $this->_label = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Content.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Content.php
deleted file mode 100644
index 37fc82e11..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Content.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Content.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Text
- */
-require_once 'Zend/Gdata/App/Extension/Text.php';
-
-/**
- * Represents the atom:content element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Content extends Zend_Gdata_App_Extension_Text
-{
-
-    protected $_rootElement = 'content';
-    protected $_src = null;
-
-    public function __construct($text = null, $type = 'text', $src = null)
-    {
-        parent::__construct($text, $type);
-        $this->_src = $src;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_src !== null) {
-            $element->setAttribute('src', $this->_src);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'src':
-            $this->_src = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getSrc()
-    {
-        return $this->_src;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setSrc($value)
-    {
-        $this->_src = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Contributor.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Contributor.php
deleted file mode 100644
index 79e3bacdf..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Contributor.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Contributor.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension/Person.php';
-
-/**
- * Represents the atom:contributor element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Contributor extends Zend_Gdata_App_Extension_Person
-{
-
-    protected $_rootElement = 'contributor';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Control.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Control.php
deleted file mode 100644
index 90f13f5fd..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Control.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Draft
- */
-require_once 'Zend/Gdata/App/Extension/Draft.php';
-
-/**
- * Represents the app:control element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Control extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootNamespace = 'app';
-    protected $_rootElement = 'control';
-    protected $_draft = null;
-
-    public function __construct($draft = null)
-    {
-        parent::__construct();
-        $this->_draft = $draft;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_draft != null) {
-            $element->appendChild($this->_draft->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('app') . ':' . 'draft':
-            $draft = new Zend_Gdata_App_Extension_Draft();
-            $draft->transferFromDOM($child);
-            $this->_draft = $draft;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Draft
-     */
-    public function getDraft()
-    {
-        return $this->_draft;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Draft $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setDraft($value)
-    {
-        $this->_draft = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Draft.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Draft.php
deleted file mode 100644
index abeb714aa..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Draft.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Draft.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the app:draft element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Draft extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootNamespace = 'app';
-    protected $_rootElement = 'draft';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Edited.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Edited.php
deleted file mode 100644
index e7b95a7e8..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Edited.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Edited.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the app:edited element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Edited extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'edited';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Element.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Element.php
deleted file mode 100644
index d6be78ef5..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Element.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Class that represents elements which were not handled by other parsing
- * code in the library.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Element extends Zend_Gdata_App_Extension
-{
-
-    public function __construct($rootElement=null, $rootNamespace=null, $rootNamespaceURI=null, $text=null){
-        parent::__construct();
-        $this->_rootElement = $rootElement;
-        $this->_rootNamespace = $rootNamespace;
-        $this->_rootNamespaceURI = $rootNamespaceURI;
-        $this->_text = $text;
-    }
-
-    public function transferFromDOM($node)
-    {
-        parent::transferFromDOM($node);
-        $this->_rootNamespace = null;
-        $this->_rootNamespaceURI = $node->namespaceURI;
-        $this->_rootElement = $node->localName;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Email.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Email.php
deleted file mode 100644
index 40c051289..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Email.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Email.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:email element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Email extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'email';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Generator.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Generator.php
deleted file mode 100644
index 9fe056eb7..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Generator.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:generator element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Generator extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'generator';
-    protected $_uri = null;
-    protected $_version = null;
-
-    public function __construct($text = null, $uri = null, $version = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-        $this->_uri = $uri;
-        $this->_version = $version;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_uri !== null) {
-            $element->setAttribute('uri', $this->_uri);
-        }
-        if ($this->_version !== null) {
-            $element->setAttribute('version', $this->_version);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'uri':
-            $this->_uri = $attribute->nodeValue;
-            break;
-        case 'version':
-            $this->_version= $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Uri
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Uri $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setUri($value)
-    {
-        $this->_uri = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Version
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Version $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setVersion($value)
-    {
-        $this->_version = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Icon.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Icon.php
deleted file mode 100644
index 7f7fdb5a4..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Icon.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Icon.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:icon element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Icon extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'icon';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Id.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Id.php
deleted file mode 100644
index 61a35dde7..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Id.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:id element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Id extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'id';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Link.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Link.php
deleted file mode 100644
index 456e9a463..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Link.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model for representing an atom:link element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Link extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'link';
-    protected $_href = null;
-    protected $_rel = null;
-    protected $_type = null;
-    protected $_hrefLang = null;
-    protected $_title = null;
-    protected $_length = null;
-
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        parent::__construct();
-        $this->_href = $href;
-        $this->_rel = $rel;
-        $this->_type = $type;
-        $this->_hrefLang = $hrefLang;
-        $this->_title = $title;
-        $this->_length = $length;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_href !== null) {
-            $element->setAttribute('href', $this->_href);
-        }
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        if ($this->_hrefLang !== null) {
-            $element->setAttribute('hreflang', $this->_hrefLang);
-        }
-        if ($this->_title !== null) {
-            $element->setAttribute('title', $this->_title);
-        }
-        if ($this->_length !== null) {
-            $element->setAttribute('length', $this->_length);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'href':
-            $this->_href = $attribute->nodeValue;
-            break;
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        case 'hreflang':
-            $this->_hrefLang = $attribute->nodeValue;
-            break;
-        case 'title':
-            $this->_title = $attribute->nodeValue;
-            break;
-        case 'length':
-            $this->_length = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getHref()
-    {
-        return $this->_href;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setHref($value)
-    {
-        $this->_href = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getHrefLang()
-    {
-        return $this->_hrefLang;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setHrefLang($value)
-    {
-        $this->_hrefLang = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setTitle($value)
-    {
-        $this->_title = $value;
-        return $this;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getLength()
-    {
-        return $this->_length;
-    }
-
-    /**
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setLength($value)
-    {
-        $this->_length = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Logo.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Logo.php
deleted file mode 100644
index c547fec0f..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Logo.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Logo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:logo element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Logo extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'logo';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Name.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Name.php
deleted file mode 100644
index bfcefbdcd..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Name.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:name element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Name extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'name';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Person.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Person.php
deleted file mode 100644
index 6d134f4bc..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Person.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Person.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Name
- */
-require_once 'Zend/Gdata/App/Extension/Name.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Email
- */
-require_once 'Zend/Gdata/App/Extension/Email.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Uri
- */
-require_once 'Zend/Gdata/App/Extension/Uri.php';
-
-/**
- * Base class for people (currently used by atom:author, atom:contributor)
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_Extension_Person extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = null;
-    protected $_name = null;
-    protected $_email = null;
-    protected $_uri = null;
-
-    public function __construct($name = null, $email = null, $uri = null)
-    {
-        parent::__construct();
-        $this->_name = $name;
-        $this->_email = $email;
-        $this->_uri = $uri;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_name != null) {
-            $element->appendChild($this->_name->getDOM($element->ownerDocument));
-        }
-        if ($this->_email != null) {
-            $element->appendChild($this->_email->getDOM($element->ownerDocument));
-        }
-        if ($this->_uri != null) {
-            $element->appendChild($this->_uri->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'name':
-            $name = new Zend_Gdata_App_Extension_Name();
-            $name->transferFromDOM($child);
-            $this->_name = $name;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'email':
-            $email = new Zend_Gdata_App_Extension_Email();
-            $email->transferFromDOM($child);
-            $this->_email = $email;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'uri':
-            $uri = new Zend_Gdata_App_Extension_Uri();
-            $uri->transferFromDOM($child);
-            $this->_uri = $uri;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Name
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Name $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Email
-     */
-    public function getEmail()
-    {
-        return $this->_email;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Email $value
-     * @return Zend_Gdata_App_Extension_Person Provides a fluent interface
-     */
-    public function setEmail($value)
-    {
-        $this->_email = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Uri
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Uri $value
-     * @return Zend_Gdata_App_Extension_Person Provides a fluent interface
-     */
-    public function setUri($value)
-    {
-        $this->_uri = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Published.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Published.php
deleted file mode 100644
index f1f07b28b..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Published.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Published.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:published element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Published extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'published';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Rights.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Rights.php
deleted file mode 100644
index b4f2f4ade..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Rights.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Text
- */
-require_once 'Zend/Gdata/App/Extension/Text.php';
-
-/**
- * Represents the atom:rights element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Rights extends Zend_Gdata_App_Extension_Text
-{
-
-    protected $_rootElement = 'rights';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Source.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Source.php
deleted file mode 100644
index fde84d443..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Source.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Source.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Entry
- */
-require_once 'Zend/Gdata/App/Entry.php';
-
-/**
- * @see Zend_Gdata_App_FeedSourceParent
- */
-require_once 'Zend/Gdata/App/FeedSourceParent.php';
-
-/**
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Source extends Zend_Gdata_App_FeedSourceParent
-{
-
-    protected $_rootElement = 'source';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Subtitle.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Subtitle.php
deleted file mode 100644
index a15e17e11..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Subtitle.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Subtitle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Text
- */
-require_once 'Zend/Gdata/App/Extension/Text.php';
-
-/**
- * Represents the atom:subtitle element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Subtitle extends Zend_Gdata_App_Extension_Text
-{
-
-    protected $_rootElement = 'subtitle';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Summary.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Summary.php
deleted file mode 100644
index c1c43be87..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Summary.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Summary.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Text
- */
-require_once 'Zend/Gdata/App/Extension/Text.php';
-
-/**
- * Represents the atom:summary element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Summary extends Zend_Gdata_App_Extension_Text
-{
-
-    protected $_rootElement = 'summary';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Text.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Text.php
deleted file mode 100644
index 894f24a4b..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Text.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Abstract class for data models that require only text and type-- such as:
- * title, summary, etc.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_Extension_Text extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = null;
-    protected $_type = 'text';
-
-    public function __construct($text = null, $type = 'text')
-    {
-        parent::__construct();
-        $this->_text = $text;
-        $this->_type = $type;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /*
-     * @return Zend_Gdata_App_Extension_Type
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /*
-     * @param string $value
-     * @return Zend_Gdata_App_Extension_Text Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Title.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Title.php
deleted file mode 100644
index 1287f0f51..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Title.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Text
- */
-require_once 'Zend/Gdata/App/Extension/Text.php';
-
-/**
- * Represents the atom:title element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Title extends Zend_Gdata_App_Extension_Text
-{
-
-    protected $_rootElement = 'title';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Updated.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Updated.php
deleted file mode 100644
index 723f19aa5..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Updated.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Updated.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:updated element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Updated extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'updated';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Extension/Uri.php b/airtime_mvc/library/Zend/Gdata/App/Extension/Uri.php
deleted file mode 100644
index 56357c2f7..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Extension/Uri.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an uri
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the atom:uri element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Extension_Uri extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootElement = 'uri';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Feed.php b/airtime_mvc/library/Zend/Gdata/App/Feed.php
deleted file mode 100644
index 1bc3f271a..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Feed.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Entry
- */
-require_once 'Zend/Gdata/App/Entry.php';
-
-/**
- * @see Zend_Gdata_App_FeedSourceParent
- */
-require_once 'Zend/Gdata/App/FeedSourceParent.php';
-
-/**
- * Atom feed class
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent
-        implements Iterator, ArrayAccess
-{
-
-    /**
-     * The root xml element of this data element
-     *
-     * @var string
-     */
-    protected $_rootElement = 'feed';
-
-    /**
-     * Cache of feed entries.
-     *
-     * @var array
-     */
-    protected $_entry = array();
-
-    /**
-     * Current location in $_entry array
-     *
-     * @var int
-     */
-    protected $_entryIndex = 0;
-
-    /**
-     * Make accessing some individual elements of the feed easier.
-     *
-     * Special accessors 'entry' and 'entries' are provided so that if
-     * you wish to iterate over an Atom feed's entries, you can do so
-     * using foreach ($feed->entries as $entry) or foreach
-     * ($feed->entry as $entry).
-     *
-     * @param  string $var The property to get.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            case 'entries':
-                return $this;
-            default:
-                return parent::__get($var);
-        }
-    }
-
-    /**
-     * Retrieves the DOM model representing this object and all children
-     *
-     * @param DOMDocument $doc
-     * @return DOMElement
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        foreach ($this->_entry as $entry) {
-            $element->appendChild($entry->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'entry':
-            $newEntry = new $this->_entryClassName($child);
-            $newEntry->setHttpClient($this->getHttpClient());
-            $newEntry->setMajorProtocolVersion($this->getMajorProtocolVersion());
-            $newEntry->setMinorProtocolVersion($this->getMinorProtocolVersion());
-            $this->_entry[] = $newEntry;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Get the number of entries in this feed object.
-     *
-     * @return integer Entry count.
-     */
-    public function count()
-    {
-        return count($this->_entry);
-    }
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_entryIndex = 0;
-    }
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row, or null if no rows.
-     */
-    public function current()
-    {
-        return $this->_entry[$this->_entryIndex];
-    }
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The current row number (starts at 0), or NULL if no rows
-     */
-    public function key()
-    {
-        return $this->_entryIndex;
-    }
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return mixed The next row, or null if no more rows.
-     */
-    public function next()
-    {
-        ++$this->_entryIndex;
-    }
-
-    /**
-     * Required by the Iterator interface.
-     *
-     * @return boolean Whether the iteration is valid
-     */
-    public function valid()
-    {
-        return 0 <= $this->_entryIndex && $this->_entryIndex < $this->count();
-    }
-
-    /**
-     * Gets the array of atom:entry elements contained within this
-     * atom:feed representation
-     *
-     * @return array Zend_Gdata_App_Entry array
-     */
-    public function getEntry()
-    {
-        return $this->_entry;
-    }
-
-    /**
-     * Sets the array of atom:entry elements contained within this
-     * atom:feed representation
-     *
-     * @param array $value The array of Zend_Gdata_App_Entry elements
-     * @return Zend_Gdata_App_Feed Provides a fluent interface
-     */
-    public function setEntry($value)
-    {
-        $this->_entry = $value;
-        return $this;
-    }
-
-    /**
-     * Adds an entry representation to the array of entries
-     * contained within this feed
-     *
-     * @param Zend_Gdata_App_Entry An individual entry to add.
-     * @return Zend_Gdata_App_Feed Provides a fluent interface
-     */
-    public function addEntry($value)
-    {
-        $this->_entry[] = $value;
-        return $this;
-    }
-
-    /**
-     * Required by the ArrayAccess interface
-     *
-     * @param int $key The index to set
-     * @param Zend_Gdata_App_Entry $value The value to set
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        $this->_entry[$key] = $value;
-    }
-
-    /**
-     * Required by the ArrayAccess interface
-     *
-     * @param int $key The index to get
-     * @param Zend_Gdata_App_Entry $value The value to set
-     */
-    public function offsetGet($key)
-    {
-        if (array_key_exists($key, $this->_entry)) {
-            return $this->_entry[$key];
-        }
-    }
-
-    /**
-     * Required by the ArrayAccess interface
-     *
-     * @param int $key The index to set
-     * @param Zend_Gdata_App_Entry $value The value to set
-     */
-    public function offsetUnset($key)
-    {
-        if (array_key_exists($key, $this->_entry)) {
-            unset($this->_entry[$key]);
-        }
-    }
-
-    /**
-     * Required by the ArrayAccess interface
-     *
-     * @param int $key The index to check for existence
-     * @return boolean
-     */
-    public function offsetExists($key)
-    {
-        return (array_key_exists($key, $this->_entry));
-    }
-
-   /**
-     * Retrieve the next set of results from this feed.
-     *
-     * @throws Zend_Gdata_App_Exception
-     * @return mixed|null Returns the next set of results as a feed of the same
-     *          class as this feed, or null if no results exist.
-     */
-    public function getNextFeed()
-    {
-        $nextLink = $this->getNextLink();
-        if (!$nextLink) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_Exception('No link to next set ' .
-            'of results found.');
-        }
-        $nextLinkHref = $nextLink->getHref();
-        $service = new Zend_Gdata_App($this->getHttpClient());
-
-        return $service->getFeed($nextLinkHref, get_class($this));
-    }
-
-   /**
-     * Retrieve the previous set of results from this feed.
-     *
-     * @throws Zend_Gdata_App_Exception
-     * @return mixed|null Returns the previous set of results as a feed of
-     *          the same class as this feed, or null if no results exist.
-     */
-    public function getPreviousFeed()
-    {
-        $previousLink = $this->getPreviousLink();
-        if (!$previousLink) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_Exception('No link to previous set ' .
-            'of results found.');
-        }
-        $previousLinkHref = $previousLink->getHref();
-        $service = new Zend_Gdata_App($this->getHttpClient());
-
-        return $service->getFeed($previousLinkHref, get_class($this));
-    }
-
-    /**
-     * Set the major protocol version that should be used. Values < 1 will
-     * cause a Zend_Gdata_App_InvalidArgumentException to be thrown.
-     *
-     * This value will be propogated to all child entries.
-     *
-     * @see _majorProtocolVersion
-     * @param (int|NULL) $value The major protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMajorProtocolVersion($value)
-    {
-        parent::setMajorProtocolVersion($value);
-        foreach ($this->entries as $entry) {
-            $entry->setMajorProtocolVersion($value);
-        }
-    }
-
-    /**
-     * Set the minor protocol version that should be used. If set to NULL, no
-     * minor protocol version will be sent to the server. Values < 0 will
-     * cause a Zend_Gdata_App_InvalidArgumentException to be thrown.
-     *
-     * This value will be propogated to all child entries.
-     *
-     * @see _minorProtocolVersion
-     * @param (int|NULL) $value The minor protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMinorProtocolVersion($value)
-    {
-        parent::setMinorProtocolVersion($value);
-        foreach ($this->entries as $entry) {
-            $entry->setMinorProtocolVersion($value);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/FeedEntryParent.php b/airtime_mvc/library/Zend/Gdata/App/FeedEntryParent.php
deleted file mode 100644
index a01348141..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/FeedEntryParent.php
+++ /dev/null
@@ -1,681 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedEntryParent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Element
-*/
-require_once 'Zend/Gdata/App/Extension/Element.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Author
-*/
-require_once 'Zend/Gdata/App/Extension/Author.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
-*/
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Contributor
-*/
-require_once 'Zend/Gdata/App/Extension/Contributor.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Id
- */
-require_once 'Zend/Gdata/App/Extension/Id.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Link
- */
-require_once 'Zend/Gdata/App/Extension/Link.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Rights
- */
-require_once 'Zend/Gdata/App/Extension/Rights.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Title
- */
-require_once 'Zend/Gdata/App/Extension/Title.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Updated
- */
-require_once 'Zend/Gdata/App/Extension/Updated.php';
-
-/**
- * Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * Abstract class for common functionality in entries and feeds
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base
-{
-    /**
-     * Service instance used to make network requests.
-     *
-     * @see setService(), getService()
-     */
-    protected $_service = null;
-
-    /**
-     * The HTTP ETag associated with this entry. Used for optimistic
-     * concurrency in protoco v2 or greater.
-     *
-     * @var string|null
-     */
-    protected $_etag = NULL;
-
-    protected $_author = array();
-    protected $_category = array();
-    protected $_contributor = array();
-    protected $_id = null;
-    protected $_link = array();
-    protected $_rights = null;
-    protected $_title = null;
-    protected $_updated = null;
-
-    /**
-      * Indicates the major protocol version that should be used.
-      * At present, recognized values are either 1 or 2. However, any integer
-      * value >= 1 is considered valid.
-      *
-      * @see setMajorProtocolVersion()
-      * @see getMajorProtocolVersion()
-      */
-    protected $_majorProtocolVersion = 1;
-
-    /**
-      * Indicates the minor protocol version that should be used. Can be set
-      * to either an integer >= 0, or NULL if no minor version should be sent
-      * to the server.
-      *
-      * @see setMinorProtocolVersion()
-      * @see getMinorProtocolVersion()
-      */
-    protected $_minorProtocolVersion = null;
-
-    /**
-     * Constructs a Feed or Entry
-     */
-    public function __construct($element = null)
-    {
-        if (!($element instanceof DOMElement)) {
-            if ($element) {
-                $this->transferFromXML($element);
-            }
-        } else {
-            $this->transferFromDOM($element);
-        }
-    }
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feed.
-     *
-     * @deprecated Deprecated as of Zend Framework 1.7. Use
-     *             setService() instead.
-     * @param  Zend_Http_Client $httpClient
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        if (!$this->_service) {
-            $this->_service = new Zend_Gdata_App();
-        }
-        $this->_service->setHttpClient($httpClient);
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP client object. If none is set, a new Zend_Http_Client
-     * will be used.
-     *
-     * @deprecated Deprecated as of Zend Framework 1.7. Use
-     *             getService() instead.
-     * @return Zend_Http_Client_Abstract
-     */
-    public function getHttpClient()
-    {
-        if (!$this->_service) {
-            $this->_service = new Zend_Gdata_App();
-        }
-        $client = $this->_service->getHttpClient();
-        return $client;
-    }
-
-    /**
-     * Set the active service instance for this object. This will be used to
-     * perform network requests, such as when calling save() and delete().
-     *
-     * @param Zend_Gdata_App $instance The new service instance.
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface.
-     */
-    public function setService($instance)
-    {
-        $this->_service = $instance;
-        return $this;
-    }
-
-    /**
-     * Get the active service instance for this object. This will be used to
-     * perform network requests, such as when calling save() and delete().
-     *
-     * @return Zend_Gdata_App|null The current service instance, or null if
-     *         not set.
-     */
-    public function getService()
-    {
-        return $this->_service;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        foreach ($this->_author as $author) {
-            $element->appendChild($author->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_category as $category) {
-            $element->appendChild($category->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_contributor as $contributor) {
-            $element->appendChild($contributor->getDOM($element->ownerDocument));
-        }
-        if ($this->_id != null) {
-            $element->appendChild($this->_id->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_link as $link) {
-            $element->appendChild($link->getDOM($element->ownerDocument));
-        }
-        if ($this->_rights != null) {
-            $element->appendChild($this->_rights->getDOM($element->ownerDocument));
-        }
-        if ($this->_title != null) {
-            $element->appendChild($this->_title->getDOM($element->ownerDocument));
-        }
-        if ($this->_updated != null) {
-            $element->appendChild($this->_updated->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'author':
-            $author = new Zend_Gdata_App_Extension_Author();
-            $author->transferFromDOM($child);
-            $this->_author[] = $author;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'category':
-            $category = new Zend_Gdata_App_Extension_Category();
-            $category->transferFromDOM($child);
-            $this->_category[] = $category;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'contributor':
-            $contributor = new Zend_Gdata_App_Extension_Contributor();
-            $contributor->transferFromDOM($child);
-            $this->_contributor[] = $contributor;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'id':
-            $id = new Zend_Gdata_App_Extension_Id();
-            $id->transferFromDOM($child);
-            $this->_id = $id;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'link':
-            $link = new Zend_Gdata_App_Extension_Link();
-            $link->transferFromDOM($child);
-            $this->_link[] = $link;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'rights':
-            $rights = new Zend_Gdata_App_Extension_Rights();
-            $rights->transferFromDOM($child);
-            $this->_rights = $rights;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'title':
-            $title = new Zend_Gdata_App_Extension_Title();
-            $title->transferFromDOM($child);
-            $this->_title = $title;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'updated':
-            $updated = new Zend_Gdata_App_Extension_Updated();
-            $updated->transferFromDOM($child);
-            $this->_updated = $updated;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Author
-     */
-    public function getAuthor()
-    {
-        return $this->_author;
-    }
-
-    /**
-     * Sets the list of the authors of this feed/entry.  In an atom feed, each
-     * author is represented by an atom:author element
-     *
-     * @param array $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setAuthor($value)
-    {
-        $this->_author = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the array of categories that classify this feed/entry.  Each
-     * category is represented in an atom feed by an atom:category element.
-     *
-     * @return array Array of Zend_Gdata_App_Extension_Category
-     */
-    public function getCategory()
-    {
-        return $this->_category;
-    }
-
-    /**
-     * Sets the array of categories that classify this feed/entry.  Each
-     * category is represented in an atom feed by an atom:category element.
-     *
-     * @param array $value Array of Zend_Gdata_App_Extension_Category
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setCategory($value)
-    {
-        $this->_category = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the array of contributors to this feed/entry.  Each contributor
-     * is represented in an atom feed by an atom:contributor XML element
-     *
-     * @return array An array of Zend_Gdata_App_Extension_Contributor
-     */
-    public function getContributor()
-    {
-        return $this->_contributor;
-    }
-
-    /**
-     * Sets the array of contributors to this feed/entry.  Each contributor
-     * is represented in an atom feed by an atom:contributor XML element
-     *
-     * @param array $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setContributor($value)
-    {
-        $this->_contributor = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Id
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Id $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setId($value)
-    {
-        $this->_id = $value;
-        return $this;
-    }
-
-    /**
-     * Given a particular 'rel' value, this method returns a matching
-     * Zend_Gdata_App_Extension_Link element.  If the 'rel' value
-     * is not provided, the full array of Zend_Gdata_App_Extension_Link
-     * elements is returned.  In an atom feed, each link is represented
-     * by an atom:link element.  The 'rel' value passed to this function
-     * is the atom:link/@rel attribute.  Example rel values include 'self',
-     * 'edit', and 'alternate'.
-     *
-     * @param string $rel The rel value of the link to be found.  If null,
-     *     the array of Zend_Gdata_App_Extension_link elements is returned
-     * @return mixed Either a single Zend_Gdata_App_Extension_link element,
-     *     an array of the same or null is returned depending on the rel value
-     *     supplied as the argument to this function
-     */
-    public function getLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_link;
-        } else {
-            foreach ($this->_link as $link) {
-                if ($link->rel == $rel) {
-                    return $link;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Returns the Zend_Gdata_App_Extension_Link element which represents
-     * the URL used to edit this resource.  This link is in the atom feed/entry
-     * as an atom:link with a rel attribute value of 'edit'.
-     *
-     * @return Zend_Gdata_App_Extension_Link The link, or null if not found
-     */
-    public function getEditLink()
-    {
-        return $this->getLink('edit');
-    }
-
-    /**
-     * Returns the Zend_Gdata_App_Extension_Link element which represents
-     * the URL used to retrieve the next chunk of results when paging through
-     * a feed.  This link is in the atom feed as an atom:link with a
-     * rel attribute value of 'next'.
-     *
-     * @return Zend_Gdata_App_Extension_Link The link, or null if not found
-     */
-    public function getNextLink()
-    {
-        return $this->getLink('next');
-    }
-
-    /**
-     * Returns the Zend_Gdata_App_Extension_Link element which represents
-     * the URL used to retrieve the previous chunk of results when paging
-     * through a feed.  This link is in the atom feed as an atom:link with a
-     * rel attribute value of 'previous'.
-     *
-     * @return Zend_Gdata_App_Extension_Link The link, or null if not found
-     */
-    public function getPreviousLink()
-    {
-        return $this->getLink('previous');
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Link
-     */
-    public function getLicenseLink()
-    {
-        return $this->getLink('license');
-    }
-
-    /**
-     * Returns the Zend_Gdata_App_Extension_Link element which represents
-     * the URL used to retrieve the entry or feed represented by this object
-     * This link is in the atom feed/entry as an atom:link with a
-     * rel attribute value of 'self'.
-     *
-     * @return Zend_Gdata_App_Extension_Link The link, or null if not found
-     */
-    public function getSelfLink()
-    {
-        return $this->getLink('self');
-    }
-
-    /**
-     * Returns the Zend_Gdata_App_Extension_Link element which represents
-     * the URL for an alternate view of the data represented by this feed or
-     * entry.  This alternate view is commonly a user-facing webpage, blog
-     * post, etc.  The MIME type for the data at the URL is available from the
-     * returned Zend_Gdata_App_Extension_Link element.
-     * This link is in the atom feed/entry as an atom:link with a
-     * rel attribute value of 'self'.
-     *
-     * @return Zend_Gdata_App_Extension_Link The link, or null if not found
-     */
-    public function getAlternateLink()
-    {
-        return $this->getLink('alternate');
-    }
-
-    /**
-     * @param array $value The array of Zend_Gdata_App_Extension_Link elements
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setLink($value)
-    {
-        $this->_link = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_AppExtension_Rights
-     */
-    public function getRights()
-    {
-        return $this->_rights;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Rights $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setRights($value)
-    {
-        $this->_rights = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the title of this feed or entry.  The title is an extremely
-     * short textual representation of this resource and is found as
-     * an atom:title element in a feed or entry
-     *
-     * @return Zend_Gdata_App_Extension_Title
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns a string representation of the title of this feed or entry.
-     * The title is an extremely short textual representation of this
-     * resource and is found as an atom:title element in a feed or entry
-     *
-     * @return string
-     */
-    public function getTitleValue()
-    {
-        if (($titleObj = $this->getTitle()) != null) {
-            return $titleObj->getText();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the title of this feed or entry.  The title is an extremely
-     * short textual representation of this resource and is found as
-     * an atom:title element in a feed or entry
-     *
-     * @param Zend_Gdata_App_Extension_Title $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setTitle($value)
-    {
-        $this->_title = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_App_Extension_Updated
-     */
-    public function getUpdated()
-    {
-        return $this->_updated;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Updated $value
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface
-     */
-    public function setUpdated($value)
-    {
-        $this->_updated = $value;
-        return $this;
-    }
-
-    /**
-     * Set the Etag for the current entry to $value. Setting $value to null
-     * unsets the Etag.
-     *
-     * @param string|null $value
-     * @return Zend_Gdata_App_Entry Provides a fluent interface
-     */
-    public function setEtag($value) {
-        $this->_etag = $value;
-        return $this;
-    }
-
-    /**
-     * Return the Etag for the current entry, or null if not set.
-     *
-     * @return string|null
-     */
-    public function getEtag() {
-        return $this->_etag;
-    }
-
-    /**
-     * Set the major protocol version that should be used. Values < 1
-     * (excluding NULL) will cause a Zend_Gdata_App_InvalidArgumentException
-     * to be thrown.
-     *
-     * @see _majorProtocolVersion
-     * @param (int|NULL) $value The major protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMajorProtocolVersion($value)
-    {
-        if (!($value >= 1) && ($value !== null)) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Major protocol version must be >= 1');
-        }
-        $this->_majorProtocolVersion = $value;
-    }
-
-    /**
-     * Get the major protocol version that is in use.
-     *
-     * @see _majorProtocolVersion
-     * @return (int|NULL) The major protocol version in use.
-     */
-    public function getMajorProtocolVersion()
-    {
-        return $this->_majorProtocolVersion;
-    }
-
-    /**
-     * Set the minor protocol version that should be used. If set to NULL, no
-     * minor protocol version will be sent to the server. Values < 0 will
-     * cause a Zend_Gdata_App_InvalidArgumentException to be thrown.
-     *
-     * @see _minorProtocolVersion
-     * @param (int|NULL) $value The minor protocol version to use.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setMinorProtocolVersion($value)
-    {
-        if (!($value >= 0)) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Minor protocol version must be >= 0 or null');
-        }
-        $this->_minorProtocolVersion = $value;
-    }
-
-    /**
-     * Get the minor protocol version that is in use.
-     *
-     * @see _minorProtocolVersion
-     * @return (int|NULL) The major protocol version in use, or NULL if no
-     *         minor version is specified.
-     */
-    public function getMinorProtocolVersion()
-    {
-        return $this->_minorProtocolVersion;
-    }
-
-    /**
-     * Get the full version of a namespace prefix
-     *
-     * Looks up a prefix (atom:, etc.) in the list of registered
-     * namespaces and returns the full namespace URI if
-     * available. Returns the prefix, unmodified, if it's not
-     * registered.
-     *
-     * The current entry or feed's version will be used when performing the
-     * namespace lookup unless overridden using $majorVersion and
-     * $minorVersion. If the entry/fee has a null version, then the latest
-     * protocol version will be used by default.
-     *
-     * @param string $prefix The namespace prefix to lookup.
-     * @param integer $majorVersion The major protocol version in effect.
-     *        Defaults to null (auto-select).
-     * @param integer $minorVersion The minor protocol version in effect.
-     *        Defaults to null (auto-select).
-     * @return string
-     */
-    public function lookupNamespace($prefix,
-                                    $majorVersion = null,
-                                    $minorVersion = null)
-    {
-        // Auto-select current version
-        if ($majorVersion === null) {
-            $majorVersion = $this->getMajorProtocolVersion();
-        }
-        if ($minorVersion === null) {
-            $minorVersion = $this->getMinorProtocolVersion();
-        }
-
-        // Perform lookup
-        return parent::lookupNamespace($prefix, $majorVersion, $minorVersion);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/FeedSourceParent.php b/airtime_mvc/library/Zend/Gdata/App/FeedSourceParent.php
deleted file mode 100644
index 885abfc34..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/FeedSourceParent.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedSourceParent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Entry
- */
-require_once 'Zend/Gdata/App/Entry.php';
-
-/**
- * @see Zend_Gdata_App_FeedSourceParent
- */
-require_once 'Zend/Gdata/App/FeedEntryParent.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Generator
- */
-require_once 'Zend/Gdata/App/Extension/Generator.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Icon
- */
-require_once 'Zend/Gdata/App/Extension/Icon.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Logo
- */
-require_once 'Zend/Gdata/App/Extension/Logo.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Subtitle
- */
-require_once 'Zend/Gdata/App/Extension/Subtitle.php';
-
-/**
- * Atom feed class
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryParent
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_App_Entry';
-
-    /**
-     * Root XML element for Atom entries.
-     *
-     * @var string
-     */
-    protected $_rootElement = null;
-
-    protected $_generator = null;
-    protected $_icon = null;
-    protected $_logo = null;
-    protected $_subtitle = null;
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feed.
-     *
-     * @deprecated Deprecated as of Zend Framework 1.7. Use
-     *             setService() instead.
-     * @param  Zend_Http_Client $httpClient
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
-     */
-    public function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        parent::setHttpClient($httpClient);
-        foreach ($this->_entry as $entry) {
-            $entry->setHttpClient($httpClient);
-        }
-        return $this;
-    }
-
-    /**
-     * Set the active service instance for this feed and all enclosed entries.
-     * This will be used to perform network requests, such as when calling
-     * save() and delete().
-     *
-     * @param Zend_Gdata_App $instance The new service instance.
-     * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface.
-     */
-    public function setService($instance)
-    {
-        parent::setService($instance);
-        foreach ($this->_entry as $entry) {
-            $entry->setService($instance);
-        }
-        return $this;
-    }
-
-    /**
-     * Make accessing some individual elements of the feed easier.
-     *
-     * Special accessors 'entry' and 'entries' are provided so that if
-     * you wish to iterate over an Atom feed's entries, you can do so
-     * using foreach ($feed->entries as $entry) or foreach
-     * ($feed->entry as $entry).
-     *
-     * @param  string $var The property to access.
-     * @return mixed
-     */
-    public function __get($var)
-    {
-        switch ($var) {
-            default:
-                return parent::__get($var);
-        }
-    }
-
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_generator != null) {
-            $element->appendChild($this->_generator->getDOM($element->ownerDocument));
-        }
-        if ($this->_icon != null) {
-            $element->appendChild($this->_icon->getDOM($element->ownerDocument));
-        }
-        if ($this->_logo != null) {
-            $element->appendChild($this->_logo->getDOM($element->ownerDocument));
-        }
-        if ($this->_subtitle != null) {
-            $element->appendChild($this->_subtitle->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'generator':
-            $generator = new Zend_Gdata_App_Extension_Generator();
-            $generator->transferFromDOM($child);
-            $this->_generator = $generator;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'icon':
-            $icon = new Zend_Gdata_App_Extension_Icon();
-            $icon->transferFromDOM($child);
-            $this->_icon = $icon;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'logo':
-            $logo = new Zend_Gdata_App_Extension_Logo();
-            $logo->transferFromDOM($child);
-            $this->_logo = $logo;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'subtitle':
-            $subtitle = new Zend_Gdata_App_Extension_Subtitle();
-            $subtitle->transferFromDOM($child);
-            $this->_subtitle = $subtitle;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * @return Zend_Gdata_AppExtension_Generator
-     */
-    public function getGenerator()
-    {
-        return $this->_generator;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Generator $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
-     */
-    public function setGenerator($value)
-    {
-        $this->_generator = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_AppExtension_Icon
-     */
-    public function getIcon()
-    {
-        return $this->_icon;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Icon $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
-     */
-    public function setIcon($value)
-    {
-        $this->_icon = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_AppExtension_logo
-     */
-    public function getlogo()
-    {
-        return $this->_logo;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_logo $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
-     */
-    public function setlogo($value)
-    {
-        $this->_logo = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_AppExtension_Subtitle
-     */
-    public function getSubtitle()
-    {
-        return $this->_subtitle;
-    }
-
-    /**
-     * @param Zend_Gdata_App_Extension_Subtitle $value
-     * @return Zend_Gdata_App_FeedSourceParent Provides a fluent interface
-     */
-    public function setSubtitle($value)
-    {
-        $this->_subtitle = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/HttpException.php b/airtime_mvc/library/Zend/Gdata/App/HttpException.php
deleted file mode 100644
index e6f886fb9..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/HttpException.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Zend_Http_Client_Exception
- */
-require_once 'Zend/Http/Client/Exception.php';
-
-/**
- * Gdata exceptions
- *
- * Class to represent exceptions that occur during Gdata operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_HttpException extends Zend_Gdata_App_Exception
-{
-
-    protected $_httpClientException = null;
-    protected $_response = null;
-
-    /**
-     * Create a new Zend_Gdata_App_HttpException
-     *
-     * @param  string $message Optionally set a message
-     * @param Zend_Http_Client_Exception Optionally pass in a Zend_Http_Client_Exception
-     * @param Zend_Http_Response Optionally pass in a Zend_Http_Response
-     */
-    public function __construct($message = null, $e = null, $response = null)
-    {
-        $this->_httpClientException = $e;
-        $this->_response = $response;
-        parent::__construct($message);
-    }
-
-    /**
-     * Get the Zend_Http_Client_Exception.
-     *
-     * @return Zend_Http_Client_Exception
-     */
-    public function getHttpClientException()
-    {
-        return $this->_httpClientException;
-    }
-
-    /**
-     * Set the Zend_Http_Client_Exception.
-     *
-     * @param Zend_Http_Client_Exception $value
-     */
-    public function setHttpClientException($value)
-    {
-        $this->_httpClientException = $value;
-        return $this;
-    }
-
-    /**
-     * Set the Zend_Http_Response.
-     *
-     * @param Zend_Http_Response $response
-     */
-    public function setResponse($response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Get the Zend_Http_Response.
-     *
-     * @return Zend_Http_Response
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Get the body of the Zend_Http_Response
-     *
-     * @return string
-     */
-    public function getRawResponseBody()
-    {
-        if ($this->getResponse()) {
-            $response = $this->getResponse();
-            return $response->getRawBody();
-        }
-        return null;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/IOException.php b/airtime_mvc/library/Zend/Gdata/App/IOException.php
deleted file mode 100644
index f597dc168..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/IOException.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IOException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Gdata App IO exceptions.
- *
- * Class to represent IO exceptions that occur during Gdata App operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_IOException extends Zend_Gdata_App_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/InvalidArgumentException.php b/airtime_mvc/library/Zend/Gdata/App/InvalidArgumentException.php
deleted file mode 100644
index 57de1a7b2..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/InvalidArgumentException.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InvalidArgumentException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Gdata exceptions
- *
- * Class to represent exceptions that occur during Gdata operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_InvalidArgumentException extends Zend_Gdata_App_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/airtime_mvc/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
deleted file mode 100644
index 9ec715413..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @version    $Id: LoggingHttpClientAdapterSocket.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Http_Client_Adapter_Socket
- */
-require_once 'Zend/Http/Client/Adapter/Socket.php';
-
-/**
- * Overrides the traditional socket-based adapter class for Zend_Http_Client to
- * enable logging of requests.  All requests are logged to a location specified
- * in the config as $config['logfile'].  Requests and responses are logged after
- * they are sent and received/processed, thus an error could prevent logging.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_LoggingHttpClientAdapterSocket extends Zend_Http_Client_Adapter_Socket
-{
-
-    /**
-     * The file handle for writing logs
-     *
-     * @var resource|null
-     */
-    protected $log_handle = null;
-
-    /**
-     * Log the given message to the log file.  The log file is configured
-     * as the config param 'logfile'.  This method opens the file for
-     * writing if necessary.
-     *
-     * @param string $message The message to log
-     */
-    protected function log($message)
-    {
-        if ($this->log_handle == null) {
-            $this->log_handle = fopen($this->config['logfile'], 'a');
-        }
-        fwrite($this->log_handle, $message);
-    }
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     * @param int     $timeout
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        $this->log("Connecting to: ${host}:${port}");
-        return parent::connect($host, $port, $secure);
-    }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        $request = parent::write($method, $uri, $http_ver, $headers, $body);
-        $this->log("\n\n" . $request);
-        return $request;
-    }
-
-    /**
-     * Read response from server
-     *
-     * @return string
-     */
-    public function read()
-    {
-        $response = parent::read();
-        $this->log("${response}\n\n");
-        return $response;
-    }
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        $this->log("Closing socket\n\n");
-        parent::close();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/MediaEntry.php b/airtime_mvc/library/Zend/Gdata/App/MediaEntry.php
deleted file mode 100644
index 2ca9c3e96..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/MediaEntry.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Entry
- */
-require_once 'Zend/Gdata/App/Entry.php';
-
-/**
- * @see Zend_Gdata_App_MediaSource
- */
-require_once 'Zend/Gdata/App/MediaSource.php';
-
-/**
- * @see Zend_Gdata_MediaMimeStream
- */
-require_once 'Zend/Gdata/MediaMimeStream.php';
-
-/**
- * Concrete class for working with Atom entries containing multi-part data.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry
-{
-    /**
-     * The attached MediaSource/file
-     *
-     * @var Zend_Gdata_App_MediaSource
-     */
-    protected $_mediaSource = null;
-
-    /**
-     * Constructs a new MediaEntry, representing XML data and optional
-     * file to upload
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null, $mediaSource = null)
-    {
-        parent::__construct($element);
-        $this->_mediaSource = $mediaSource;
-    }
-
-    /**
-     * Return the MIME multipart representation of this MediaEntry.
-     *
-     * @return string|Zend_Gdata_MediaMimeStream The MIME multipart
-     *         representation of this MediaEntry. If the entry consisted only
-     *         of XML, a string is returned.
-     */
-    public function encode()
-    {
-        $xmlData = $this->saveXML();
-        $mediaSource = $this->getMediaSource();
-        if ($mediaSource === null) {
-            // No attachment, just send XML for entry
-            return $xmlData;
-        } else {
-            return new Zend_Gdata_MediaMimeStream($xmlData,
-                $mediaSource->getFilename(), $mediaSource->getContentType());
-        }
-    }
-
-    /**
-     * Return the MediaSource object representing the file attached to this
-     * MediaEntry.
-     *
-     * @return Zend_Gdata_App_MediaSource The attached MediaSource/file
-     */
-    public function getMediaSource()
-    {
-        return $this->_mediaSource;
-    }
-
-    /**
-     * Set the MediaSource object (file) for this MediaEntry
-     *
-     * @param Zend_Gdata_App_MediaSource $value The attached MediaSource/file
-     * @return Zend_Gdata_App_MediaEntry Provides a fluent interface
-     */
-    public function setMediaSource($value)
-    {
-        if ($value instanceof Zend_Gdata_App_MediaSource) {
-            $this->_mediaSource = $value;
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'You must specify the media data as a class that conforms to Zend_Gdata_App_MediaSource.');
-        }
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/MediaFileSource.php b/airtime_mvc/library/Zend/Gdata/App/MediaFileSource.php
deleted file mode 100644
index fd64b93f4..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/MediaFileSource.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaFileSource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_MediaData
- */
-require_once 'Zend/Gdata/App/BaseMediaSource.php';
-
-/**
- * Concrete class to use a file handle as an attachment within a MediaEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
-{
-    /**
-     * The filename which is represented
-     *
-     * @var string
-     */
-    protected $_filename = null;
-
-    /**
-     * The content type for the file attached (example image/png)
-     *
-     * @var string
-     */
-    protected $_contentType = null;
-
-    /**
-     * Create a new Zend_Gdata_App_MediaFileSource object.
-     *
-     * @param string $filename The name of the file to read from.
-     */
-    public function __construct($filename)
-    {
-        $this->setFilename($filename);
-    }
-
-    /**
-     * Return the MIME multipart representation of this MediaEntry.
-     *
-     * @return string
-     * @throws Zend_Gdata_App_IOException
-     */
-    public function encode()
-    {
-        if ($this->getFilename() !== null &&
-            is_readable($this->getFilename())) {
-
-            // Retrieves the file, using the include path
-            $fileHandle = fopen($this->getFilename(), 'r', true);
-            $result = fread($fileHandle, filesize($this->getFilename()));
-            if ($result === false) {
-                require_once 'Zend/Gdata/App/IOException.php';
-                throw new Zend_Gdata_App_IOException("Error reading file - " .
-                        $this->getFilename() . '. Read failed.');
-            }
-            fclose($fileHandle);
-            return $result;
-        } else {
-            require_once 'Zend/Gdata/App/IOException.php';
-            throw new Zend_Gdata_App_IOException("Error reading file - " .
-                    $this->getFilename() . '. File is not readable.');
-        }
-    }
-
-    /**
-     * Get the filename associated with this reader.
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->_filename;
-    }
-
-    /**
-     * Set the filename which is to be read.
-     *
-     * @param string $value The desired file handle.
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface.
-     */
-    public function setFilename($value)
-    {
-        $this->_filename = $value;
-        return $this;
-    }
-
-    /**
-     * The content type for the file attached (example image/png)
-     *
-     * @return string The content type
-     */
-    public function getContentType()
-    {
-        return $this->_contentType;
-    }
-
-    /**
-     * Set the content type for the file attached (example image/png)
-     *
-     * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
-     */
-    public function setContentType($value)
-    {
-        $this->_contentType = $value;
-        return $this;
-    }
-
-    /**
-     * Alias for getFilename().
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getFilename();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/MediaSource.php b/airtime_mvc/library/Zend/Gdata/App/MediaSource.php
deleted file mode 100644
index ddab69710..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/MediaSource.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for defining data that can be encoded and sent over the network.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Gdata_App_MediaSource
-{
-    /**
-     * Return a byte stream representation of this object.
-     *
-     * @return string
-     */
-    public function encode();
-
-    /**
-     * Set the content type for the file attached (example image/png)
-     *
-     * @param string $value The content type
-     * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface
-     */
-    public function setContentType($value);
-
-    /**
-     * The content type for the file attached (example image/png)
-     *
-     * @return string The content type
-     */
-    public function getContentType();
-
-    /**
-     * Sets the Slug header value.  Used by some services to determine the
-     * title for the uploaded file.  A null value indicates no slug header.
-     *
-     * @var string The slug value
-     * @return Zend_Gdata_App_MediaSource Provides a fluent interface
-     */
-    public function setSlug($value);
-
-    /**
-     * Returns the Slug header value.  Used by some services to determine the
-     * title for the uploaded file.  Returns null if no slug should be used.
-     *
-     * @return string The slug value
-     */
-    public function getSlug();
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/Util.php b/airtime_mvc/library/Zend/Gdata/App/Util.php
deleted file mode 100644
index 388e0f741..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/Util.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Util.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Utility class for static functions needed by Zend_Gdata_App
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_Util
-{
-
-    /**
-     *  Convert timestamp into RFC 3339 date string.
-     *  2005-04-19T15:30:00
-     *
-     * @param int $timestamp
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public static function formatTimestamp($timestamp)
-    {
-        $rfc3339 = '/^(\d{4})\-?(\d{2})\-?(\d{2})((T|t)(\d{2})\:?(\d{2})' .
-                   '\:?(\d{2})(\.\d{1,})?((Z|z)|([\+\-])(\d{2})\:?(\d{2})))?$/';
-
-        if (ctype_digit($timestamp)) {
-            return gmdate('Y-m-d\TH:i:sP', $timestamp);
-        } elseif (preg_match($rfc3339, $timestamp) > 0) {
-            // timestamp is already properly formatted
-            return $timestamp;
-        } else {
-            $ts = strtotime($timestamp);
-            if ($ts === false) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException("Invalid timestamp: $timestamp.");
-            }
-            return date('Y-m-d\TH:i:s', $ts);
-        }
-    }
-
-    /** Find the greatest key that is less than or equal to a given upper
-      * bound, and return the value associated with that key.
-      *
-      * @param integer|null $maximumKey The upper bound for keys. If null, the
-      *        maxiumum valued key will be found.
-      * @param array $collection An two-dimensional array of key/value pairs
-      *        to search through.
-      * @returns mixed The value corresponding to the located key.
-      * @throws Zend_Gdata_App_Exception Thrown if $collection is empty.
-      */
-    public static function findGreatestBoundedValue($maximumKey, $collection)
-    {
-        $found = false;
-        $foundKey = $maximumKey;
-
-        // Sanity check: Make sure that the collection isn't empty
-        if (sizeof($collection) == 0) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception("Empty namespace collection encountered.");
-        }
-
-        if ($maximumKey === null) {
-            // If the key is null, then we return the maximum available
-            $keys = array_keys($collection);
-            sort($keys);
-            $found = true;
-            $foundKey = end($keys);
-        } else {
-            // Otherwise, we optimistically guess that the current version
-            // will have a matching namespce. If that fails, we decrement the
-            // version until we find a match.
-            while (!$found && $foundKey >= 0) {
-                if (array_key_exists($foundKey, $collection))
-                    $found = true;
-                else
-                    $foundKey--;
-            }
-        }
-
-        // Guard: A namespace wasn't found. Either none were registered, or
-        // the current protcol version is lower than the maximum namespace.
-        if (!$found) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception("Namespace compatible with current protocol not found.");
-        }
-
-        return $foundKey;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/App/VersionException.php b/airtime_mvc/library/Zend/Gdata/App/VersionException.php
deleted file mode 100644
index 30b10c3fe..000000000
--- a/airtime_mvc/library/Zend/Gdata/App/VersionException.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VersionException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_Exception
- */
-require_once 'Zend/Gdata/App/Exception.php';
-
-/**
- * Gdata APP exceptions
- *
- * Class to represent version exceptions that occur during Gdata APP operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage App
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_App_VersionException extends Zend_Gdata_App_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Gdata/AuthSub.php b/airtime_mvc/library/Zend/Gdata/AuthSub.php
deleted file mode 100644
index 4650e2786..000000000
--- a/airtime_mvc/library/Zend/Gdata/AuthSub.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AuthSub.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_HttpClient
- */
-require_once 'Zend/Gdata/HttpClient.php';
-
-/**
- * Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * Wrapper around Zend_Http_Client to facilitate Google's "Account Authentication
- * Proxy for Web-Based Applications".
- *
- * @see http://code.google.com/apis/accounts/AuthForWebApps.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_AuthSub
-{
-
-    const AUTHSUB_REQUEST_URI      = 'https://www.google.com/accounts/AuthSubRequest';
-
-    const AUTHSUB_SESSION_TOKEN_URI = 'https://www.google.com/accounts/AuthSubSessionToken';
-
-    const AUTHSUB_REVOKE_TOKEN_URI  = 'https://www.google.com/accounts/AuthSubRevokeToken';
-
-    const AUTHSUB_TOKEN_INFO_URI    = 'https://www.google.com/accounts/AuthSubTokenInfo';
-
-     /**
-      * Creates a URI to request a single-use AuthSub token.
-      *
-      * @param string $next (required) URL identifying the service to be
-      *                     accessed.
-      *  The resulting token will enable access to the specified service only.
-      *  Some services may limit scope further, such as read-only access.
-      * @param string $scope (required) URL identifying the service to be
-      *                      accessed.  The resulting token will enable
-      *                      access to the specified service only.
-      *                      Some services may limit scope further, such
-      *                      as read-only access.
-      * @param int $secure (optional) Boolean flag indicating whether the
-      *                    authentication transaction should issue a secure
-      *                    token (1) or a non-secure token (0). Secure tokens
-      *                    are available to registered applications only.
-      * @param int $session (optional) Boolean flag indicating whether
-      *                     the one-time-use  token may be exchanged for
-      *                     a session token (1) or not (0).
-      * @param string $request_uri (optional) URI to which to direct the
-      *                            authentication request.
-      */
-     public static function getAuthSubTokenUri($next, $scope, $secure=0, $session=0,
-                                               $request_uri = self::AUTHSUB_REQUEST_URI)
-     {
-         $querystring = '?next=' . urlencode($next)
-             . '&scope=' . urldecode($scope)
-             . '&secure=' . urlencode($secure)
-             . '&session=' . urlencode($session);
-         return $request_uri . $querystring;
-     }
-
-
-    /**
-     * Upgrades a single use token to a session token
-     *
-     * @param string $token The single use token which is to be upgraded
-     * @param Zend_Http_Client $client (optional) HTTP client to use to
-     *                                 make the request
-     * @param string $request_uri (optional) URI to which to direct
-     *                            the session token upgrade
-     * @return string The upgraded token value
-     * @throws Zend_Gdata_App_AuthException
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public static function getAuthSubSessionToken(
-            $token, $client = null,
-            $request_uri = self::AUTHSUB_SESSION_TOKEN_URI)
-    {
-        $client = self::getHttpClient($token, $client);
-
-        if ($client instanceof Zend_Gdata_HttpClient) {
-            $filterResult = $client->filterHttpRequest('GET', $request_uri);
-            $url = $filterResult['url'];
-            $headers = $filterResult['headers'];
-            $client->setHeaders($headers);
-            $client->setUri($url);
-        } else {
-            $client->setUri($request_uri);
-        }
-
-        try {
-            $response = $client->request('GET');
-        } catch (Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
-        }
-
-        // Parse Google's response
-        if ($response->isSuccessful()) {
-            $goog_resp = array();
-            foreach (explode("\n", $response->getBody()) as $l) {
-                $l = chop($l);
-                if ($l) {
-                    list($key, $val) = explode('=', chop($l), 2);
-                    $goog_resp[$key] = $val;
-                }
-            }
-            return $goog_resp['Token'];
-        } else {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                    'Token upgrade failed. Reason: ' . $response->getBody());
-        }
-    }
-
-    /**
-     * Revoke a token
-     *
-     * @param string $token The token to revoke
-     * @param Zend_Http_Client $client (optional) HTTP client to use to make the request
-     * @param string $request_uri (optional) URI to which to direct the revokation request
-     * @return boolean Whether the revokation was successful
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public static function AuthSubRevokeToken($token, $client = null,
-                                              $request_uri = self::AUTHSUB_REVOKE_TOKEN_URI)
-    {
-        $client = self::getHttpClient($token, $client);
-
-        if ($client instanceof Zend_Gdata_HttpClient) {
-            $filterResult = $client->filterHttpRequest('GET', $request_uri);
-            $url = $filterResult['url'];
-            $headers = $filterResult['headers'];
-            $client->setHeaders($headers);
-            $client->setUri($url);
-            $client->resetParameters();
-        } else {
-            $client->setUri($request_uri);
-        }
-
-        ob_start();
-        try {
-            $response = $client->request('GET');
-        } catch (Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
-        }
-        ob_end_clean();
-        // Parse Google's response
-        if ($response->isSuccessful()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * get token information
-     *
-     * @param string $token The token to retrieve information about
-     * @param Zend_Http_Client $client (optional) HTTP client to use to
-     *                                 make the request
-     * @param string $request_uri (optional) URI to which to direct
-     *                            the information request
-     */
-    public static function getAuthSubTokenInfo(
-            $token, $client = null, $request_uri = self::AUTHSUB_TOKEN_INFO_URI)
-    {
-        $client = self::getHttpClient($token, $client);
-
-        if ($client instanceof Zend_Gdata_HttpClient) {
-            $filterResult = $client->filterHttpRequest('GET', $request_uri);
-            $url = $filterResult['url'];
-            $headers = $filterResult['headers'];
-            $client->setHeaders($headers);
-            $client->setUri($url);
-        } else {
-            $client->setUri($request_uri);
-        }
-
-        ob_start();
-        try {
-            $response = $client->request('GET');
-        } catch (Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
-        }
-        ob_end_clean();
-        return $response->getBody();
-    }
-
-    /**
-     * Retrieve a HTTP client object with AuthSub credentials attached
-     * as the Authorization header
-     *
-     * @param string $token The token to retrieve information about
-     * @param Zend_Gdata_HttpClient $client (optional) HTTP client to use to make the request
-     */
-    public static function getHttpClient($token, $client = null)
-    {
-        if ($client == null) {
-            $client = new Zend_Gdata_HttpClient();
-        }
-        if (!$client instanceof Zend_Http_Client) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Http_Client.');
-        }
-        $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION;
-        $client->setConfig(array(
-                'strictredirects' => true,
-                'useragent' => $useragent
-            )
-        );
-        $client->setAuthSubToken($token);
-        return $client;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books.php b/airtime_mvc/library/Zend/Gdata/Books.php
deleted file mode 100644
index 11501575c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_DublinCore
- */
-require_once 'Zend/Gdata/DublinCore.php';
-
-/**
- * @see Zend_Gdata_Books_CollectionEntry
- */
-require_once 'Zend/Gdata/Books/CollectionEntry.php';
-
-/**
- * @see Zend_Gdata_Books_CollectionFeed
- */
-require_once 'Zend/Gdata/Books/CollectionFeed.php';
-
-/**
- * @see Zend_Gdata_Books_VolumeEntry
- */
-require_once 'Zend/Gdata/Books/VolumeEntry.php';
-
-/**
- * @see Zend_Gdata_Books_VolumeFeed
- */
-require_once 'Zend/Gdata/Books/VolumeFeed.php';
-
-/**
- * Service class for interacting with the Books service
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books extends Zend_Gdata
-{
-    const VOLUME_FEED_URI = 'http://books.google.com/books/feeds/volumes';
-    const MY_LIBRARY_FEED_URI = 'http://books.google.com/books/feeds/users/me/collections/library/volumes';
-    const MY_ANNOTATION_FEED_URI = 'http://books.google.com/books/feeds/users/me/volumes';
-    const AUTH_SERVICE_NAME = 'print';
-
-    /**
-     * Namespaces used for Zend_Gdata_Books
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('gbs', 'http://schemas.google.com/books/2008', 1, 0),
-        array('dc', 'http://purl.org/dc/terms', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_Books object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Books');
-        $this->registerPackage('Zend_Gdata_Books_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-     }
-
-    /**
-     * Retrieves a feed of volumes.
-     *
-     * @param Zend_Gdata_Query|string|null $location (optional) The URL to
-     *        query or a Zend_Gdata_Query object from which a URL can be
-     *        determined.
-     * @return Zend_Gdata_Books_VolumeFeed The feed of volumes found at the
-     *         specified URL.
-     */
-    public function getVolumeFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::VOLUME_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Books_VolumeFeed');
-    }
-
-    /**
-     * Retrieves a specific volume entry.
-     *
-     * @param string|null $volumeId The volumeId of interest.
-     * @param Zend_Gdata_Query|string|null $location (optional) The URL to
-     *        query or a Zend_Gdata_Query object from which a URL can be
-     *        determined.
-     * @return Zend_Gdata_Books_VolumeEntry The feed of volumes found at the
-     *         specified URL.
-     */
-    public function getVolumeEntry($volumeId = null, $location = null)
-    {
-        if ($volumeId !== null) {
-            $uri = self::VOLUME_FEED_URI . "/" . $volumeId;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Books_VolumeEntry');
-    }
-
-    /**
-     * Retrieves a feed of volumes, by default the User library feed.
-     *
-     * @param Zend_Gdata_Query|string|null $location (optional) The URL to
-     *        query.
-     * @return Zend_Gdata_Books_VolumeFeed The feed of volumes found at the
-     *         specified URL.
-     */
-    public function getUserLibraryFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::MY_LIBRARY_FEED_URI;
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Books_VolumeFeed');
-    }
-
-    /**
-     * Retrieves a feed of volumes, by default the User annotation feed
-     *
-     * @param Zend_Gdata_Query|string|null $location (optional) The URL to
-     *        query.
-     * @return Zend_Gdata_Books_VolumeFeed The feed of volumes found at the
-     *         specified URL.
-     */
-    public function getUserAnnotationFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::MY_ANNOTATION_FEED_URI;
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Books_VolumeFeed');
-    }
-
-    /**
-     * Insert a Volume / Annotation
-     *
-     * @param Zend_Gdata_Books_VolumeEntry $entry
-     * @param Zend_Gdata_Query|string|null $location (optional) The URL to
-     *        query
-     * @return Zend_Gdata_Books_VolumeEntry The inserted volume entry.
-     */
-    public function insertVolume($entry, $location = null)
-    {
-        if ($location == null) {
-            $uri = self::MY_LIBRARY_FEED_URI;
-        } else {
-            $uri = $location;
-        }
-        return parent::insertEntry(
-            $entry, $uri, 'Zend_Gdata_Books_VolumeEntry');
-    }
-
-    /**
-     * Delete a Volume
-     *
-     * @param Zend_Gdata_Books_VolumeEntry $entry
-     * @return void
-     */
-    public function deleteVolume($entry)
-    {
-        $entry->delete();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/CollectionEntry.php b/airtime_mvc/library/Zend/Gdata/Books/CollectionEntry.php
deleted file mode 100644
index 505efaf08..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/CollectionEntry.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CollectionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * Describes an entry in a feed of collections
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_CollectionEntry extends Zend_Gdata_Entry
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_CollectionEntry which
-     * Describes an entry in a feed of collections
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($element);
-    }
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/CollectionFeed.php b/airtime_mvc/library/Zend/Gdata/Books/CollectionFeed.php
deleted file mode 100644
index e975562dc..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/CollectionFeed.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CollectionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Describes a Book Search collection feed
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_CollectionFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_CollectionFeed which
-     * Describes a Book Search collection feed
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Books_CollectionEntry';
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/AnnotationLink.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/AnnotationLink.php
deleted file mode 100644
index 1260767e7..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/AnnotationLink.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AnnotationLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Books_Extension_BooksLink
- */
-require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
-
-/**
- * Describes an annotation link
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_AnnotationLink extends
-    Zend_Gdata_Books_Extension_BooksLink
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_AnnotationLink which
-     * Describes an annotation link
-     *
-     * @param string|null $href Linked resource URI
-     * @param string|null $rel Forward relationship
-     * @param string|null $type Resource MIME type
-     * @param string|null $hrefLang Resource language
-     * @param string|null $title Human-readable resource title
-     * @param string|null $length Resource length in octets
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksCategory.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksCategory.php
deleted file mode 100644
index 9f8369b0f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksCategory.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BooksCategory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Describes a books category
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_BooksCategory extends
-    Zend_Gdata_App_Extension_Category
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_BooksCategory which
-     * Describes a books category
-     *
-     * @param string|null $term An identifier representing the category within
-     *        the categorization scheme.
-     * @param string|null $scheme A string containing a URI identifying the
-     *        categorization scheme.
-     * @param string|null $label A human-readable label for display in
-     *        end-user applications.
-     */
-    public function __construct($term = null, $scheme = null, $label = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($term, $scheme, $label);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksLink.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksLink.php
deleted file mode 100644
index 0be768e52..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/BooksLink.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BooksLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Link
- */
-require_once 'Zend/Gdata/App/Extension/Link.php';
-
-/**
- * Extends the base Link class with Books extensions
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_BooksLink extends Zend_Gdata_App_Extension_Link
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_BooksLink which
-     * Extends the base Link class with Books extensions
-     *
-     * @param string|null $href Linked resource URI
-     * @param string|null $rel Forward relationship
-     * @param string|null $type Resource MIME type
-     * @param string|null $hrefLang Resource language
-     * @param string|null $title Human-readable resource title
-     * @param string|null $length Resource length in octets
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-    }
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/Embeddability.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/Embeddability.php
deleted file mode 100644
index b3082b22b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/Embeddability.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Embeddability.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Describes an embeddability
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_Embeddability extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gbs';
-    protected $_rootElement = 'embeddability';
-    protected $_value = null;
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_Embeddability which
-     * Describes an embeddability.
-     *
-     * @param string|null $value A programmatic value representing the book's
-     *        embeddability.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves DOMElement which corresponds to this element and all
-     * child properties. This is used to build this object back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistance.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Extracts XML attributes from the DOM and converts them to the
-     * appropriate object members.
-     *
-     * @param DOMNode $attribute The DOMNode attribute to be handled.
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the programmatic value that describes the embeddability of a
-     * volume in Google Book Search
-     *
-     * @return string|null The value
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Sets the programmatic value that describes the embeddability of a
-     * volume in Google Book Search
-     *
-     * @param string|null $value Programmatic value that describes the
-     *        embeddability of a volume in Google Book Search
-     * @return Zend_Gdata_Books_Extension_Embeddability Provides a fluent
-     *     interface
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/InfoLink.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/InfoLink.php
deleted file mode 100644
index 0c7f2963d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/InfoLink.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InfoLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Books_Extension_BooksLink
- */
-require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
-
-/**
- * Describes an info link
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_InfoLink extends
-    Zend_Gdata_Books_Extension_BooksLink
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_InfoLink which
-     * Describes an info link
-     *
-     * @param string|null $href Linked resource URI
-     * @param string|null $rel Forward relationship
-     * @param string|null $type Resource MIME type
-     * @param string|null $hrefLang Resource language
-     * @param string|null $title Human-readable resource title
-     * @param string|null $length Resource length in octets
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/PreviewLink.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/PreviewLink.php
deleted file mode 100644
index 5bca33e09..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/PreviewLink.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PreviewLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Books_Extension_BooksLink
- */
-require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
-
-/**
- * Describes a preview link
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_PreviewLink extends
-    Zend_Gdata_Books_Extension_BooksLink
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_PreviewLink which
-     * Describes a preview link
-     *
-     * @param string|null $href Linked resource URI
-     * @param string|null $rel Forward relationship
-     * @param string|null $type Resource MIME type
-     * @param string|null $hrefLang Resource language
-     * @param string|null $title Human-readable resource title
-     * @param string|null $length Resource length in octets
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/Review.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/Review.php
deleted file mode 100644
index fa43bb4c7..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/Review.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Review.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * User-provided review
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_Review extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gbs';
-    protected $_rootElement = 'review';
-    protected $_lang = null;
-    protected $_type = null;
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_Review which
-     * User-provided review
-     *
-     * @param string|null $lang Review language.
-     * @param string|null $type Type of text construct (typically text, html,
-     *        or xhtml).
-     * @param string|null $value Text content of the review.
-     */
-    public function __construct($lang = null, $type = null, $value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct();
-        $this->_lang = $lang;
-        $this->_type = $type;
-        $this->_text = $value;
-    }
-
-    /**
-     * Retrieves DOMElement which corresponds to this element and all
-     * child properties. This is used to build this object back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistance.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc);
-        if ($this->_lang !== null) {
-            $element->setAttribute('lang', $this->_lang);
-        }
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        return $element;
-    }
-
-    /**
-     * Extracts XML attributes from the DOM and converts them to the
-     * appropriate object members.
-     *
-     * @param DOMNode $attribute The DOMNode attribute to be handled.
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'lang':
-            $this->_lang = $attribute->nodeValue;
-            break;
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the language of link title
-     *
-     * @return string The lang
-     */
-    public function getLang()
-    {
-        return $this->_lang;
-    }
-
-    /**
-     * Returns the type of text construct (typically 'text', 'html' or 'xhtml')
-     *
-     * @return string The type
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Sets the language of link title
-     *
-     * @param string $lang language of link title
-     * @return Zend_Gdata_Books_Extension_Review Provides a fluent interface
-     */
-    public function setLang($lang)
-    {
-        $this->_lang = $lang;
-        return $this;
-    }
-
-    /**
-     * Sets the type of text construct (typically 'text', 'html' or 'xhtml')
-     *
-     * @param string $type type of text construct (typically 'text', 'html' or 'xhtml')
-     * @return Zend_Gdata_Books_Extension_Review Provides a fluent interface
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/ThumbnailLink.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/ThumbnailLink.php
deleted file mode 100644
index 8b9c36d43..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/ThumbnailLink.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ThumbnailLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Books_Extension_BooksLink
- */
-require_once 'Zend/Gdata/Books/Extension/BooksLink.php';
-
-/**
- * Describes a thumbnail link
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_ThumbnailLink extends
-    Zend_Gdata_Books_Extension_BooksLink
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_ThumbnailLink which
-     * Describes a thumbnail link
-     *
-     * @param string|null $href Linked resource URI
-     * @param string|null $rel Forward relationship
-     * @param string|null $type Resource MIME type
-     * @param string|null $hrefLang Resource language
-     * @param string|null $title Human-readable resource title
-     * @param string|null $length Resource length in octets
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/Extension/Viewability.php b/airtime_mvc/library/Zend/Gdata/Books/Extension/Viewability.php
deleted file mode 100644
index 83ce25595..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/Extension/Viewability.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Viewability.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Describes a viewability
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_Extension_Viewability extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gbs';
-    protected $_rootElement = 'viewability';
-    protected $_value = null;
-
-    /**
-     * Constructor for Zend_Gdata_Books_Extension_Viewability which
-     * Describes a viewability
-     *
-     * @param string|null $value A programmatic value representing the book's
-     *        viewability mode.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves DOMElement which corresponds to this element and all
-     * child properties. This is used to build this object back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistance.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Extracts XML attributes from the DOM and converts them to the
-     * appropriate object members.
-     *
-     * @param DOMNode $attribute The DOMNode attribute to be handled.
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the programmatic value that describes the viewability of a volume
-     * in Google Book Search
-     *
-     * @return string The value
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Sets the programmatic value that describes the viewability of a volume in
-     * Google Book Search
-     *
-     * @param string $value programmatic value that describes the viewability
-     *     of a volume in Googl eBook Search
-     * @return Zend_Gdata_Books_Extension_Viewability Provides a fluent
-     *     interface
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/VolumeEntry.php b/airtime_mvc/library/Zend/Gdata/Books/VolumeEntry.php
deleted file mode 100644
index 788fbe40d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/VolumeEntry.php
+++ /dev/null
@@ -1,687 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VolumeEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_Comments
- */
-require_once 'Zend/Gdata/Extension/Comments.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Creator
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Creator.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Date
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Date.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Description
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Description.php';
-
-/**
- * @see Zend_Gdata_Books_Extension_Embeddability
- */
-require_once 'Zend/Gdata/Books/Extension/Embeddability.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Format
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Format.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Identifier
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Identifier.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Language
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Language.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Publisher
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Publisher.php';
-
-/**
- * @see Zend_Gdata_Extension_Rating
- */
-require_once 'Zend/Gdata/Extension/Rating.php';
-
-/**
- * @see Zend_Gdata_Books_Extension_Review
- */
-require_once 'Zend/Gdata/Books/Extension/Review.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Subject
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Subject.php';
-
-/**
- * @see Zend_Gdata_DublinCore_Extension_Title
- */
-require_once 'Zend/Gdata/DublinCore/Extension/Title.php';
-
-/**
- * @see Zend_Gdata_Books_Extension_Viewability
- */
-require_once 'Zend/Gdata/Books/Extension/Viewability.php';
-
-/**
- * Describes an entry in a feed of Book Search volumes
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry
-{
-
-    const THUMBNAIL_LINK_REL = 'http://schemas.google.com/books/2008/thumbnail';
-    const PREVIEW_LINK_REL = 'http://schemas.google.com/books/2008/preview';
-    const INFO_LINK_REL = 'http://schemas.google.com/books/2008/info';
-    const ANNOTATION_LINK_REL = 'http://schemas.google.com/books/2008/annotation';
-
-    protected $_comments = null;
-    protected $_creators = array();
-    protected $_dates = array();
-    protected $_descriptions = array();
-    protected $_embeddability = null;
-    protected $_formats = array();
-    protected $_identifiers = array();
-    protected $_languages = array();
-    protected $_publishers = array();
-    protected $_rating = null;
-    protected $_review = null;
-    protected $_subjects = array();
-    protected $_titles = array();
-    protected $_viewability = null;
-
-    /**
-     * Constructor for Zend_Gdata_Books_VolumeEntry which
-     * Describes an entry in a feed of Book Search volumes
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves DOMElement which corresponds to this element and all
-     * child properties. This is used to build this object back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistance.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc);
-        if ($this->_creators !== null) {
-            foreach ($this->_creators as $creators) {
-                $element->appendChild($creators->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_dates !== null) {
-            foreach ($this->_dates as $dates) {
-                $element->appendChild($dates->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_descriptions !== null) {
-            foreach ($this->_descriptions as $descriptions) {
-                $element->appendChild($descriptions->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_formats !== null) {
-            foreach ($this->_formats as $formats) {
-                $element->appendChild($formats->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_identifiers !== null) {
-            foreach ($this->_identifiers as $identifiers) {
-                $element->appendChild($identifiers->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_languages !== null) {
-            foreach ($this->_languages as $languages) {
-                $element->appendChild($languages->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_publishers !== null) {
-            foreach ($this->_publishers as $publishers) {
-                $element->appendChild($publishers->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_subjects !== null) {
-            foreach ($this->_subjects as $subjects) {
-                $element->appendChild($subjects->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_titles !== null) {
-            foreach ($this->_titles as $titles) {
-                $element->appendChild($titles->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_comments !== null) {
-            $element->appendChild($this->_comments->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_embeddability !== null) {
-            $element->appendChild($this->_embeddability->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_rating !== null) {
-            $element->appendChild($this->_rating->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_review !== null) {
-            $element->appendChild($this->_review->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_viewability !== null) {
-            $element->appendChild($this->_viewability->getDOM(
-                $element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual objects of the appropriate type and stores
-     * them in this object based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process.
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('dc') . ':' . 'creator':
-            $creators = new Zend_Gdata_DublinCore_Extension_Creator();
-            $creators->transferFromDOM($child);
-            $this->_creators[] = $creators;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'date':
-            $dates = new Zend_Gdata_DublinCore_Extension_Date();
-            $dates->transferFromDOM($child);
-            $this->_dates[] = $dates;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'description':
-            $descriptions = new Zend_Gdata_DublinCore_Extension_Description();
-            $descriptions->transferFromDOM($child);
-            $this->_descriptions[] = $descriptions;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'format':
-            $formats = new Zend_Gdata_DublinCore_Extension_Format();
-            $formats->transferFromDOM($child);
-            $this->_formats[] = $formats;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'identifier':
-            $identifiers = new Zend_Gdata_DublinCore_Extension_Identifier();
-            $identifiers->transferFromDOM($child);
-            $this->_identifiers[] = $identifiers;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'language':
-            $languages = new Zend_Gdata_DublinCore_Extension_Language();
-            $languages->transferFromDOM($child);
-            $this->_languages[] = $languages;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'publisher':
-            $publishers = new Zend_Gdata_DublinCore_Extension_Publisher();
-            $publishers->transferFromDOM($child);
-            $this->_publishers[] = $publishers;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'subject':
-            $subjects = new Zend_Gdata_DublinCore_Extension_Subject();
-            $subjects->transferFromDOM($child);
-            $this->_subjects[] = $subjects;
-            break;
-        case $this->lookupNamespace('dc') . ':' . 'title':
-            $titles = new Zend_Gdata_DublinCore_Extension_Title();
-            $titles->transferFromDOM($child);
-            $this->_titles[] = $titles;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'comments':
-            $comments = new Zend_Gdata_Extension_Comments();
-            $comments->transferFromDOM($child);
-            $this->_comments = $comments;
-            break;
-        case $this->lookupNamespace('gbs') . ':' . 'embeddability':
-            $embeddability = new Zend_Gdata_Books_Extension_Embeddability();
-            $embeddability->transferFromDOM($child);
-            $this->_embeddability = $embeddability;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'rating':
-            $rating = new Zend_Gdata_Extension_Rating();
-            $rating->transferFromDOM($child);
-            $this->_rating = $rating;
-            break;
-        case $this->lookupNamespace('gbs') . ':' . 'review':
-            $review = new Zend_Gdata_Books_Extension_Review();
-            $review->transferFromDOM($child);
-            $this->_review = $review;
-            break;
-        case $this->lookupNamespace('gbs') . ':' . 'viewability':
-            $viewability = new Zend_Gdata_Books_Extension_Viewability();
-            $viewability->transferFromDOM($child);
-            $this->_viewability = $viewability;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Returns the Comments class
-     *
-     * @return Zend_Gdata_Extension_Comments|null The comments
-     */
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * Returns the creators
-     *
-     * @return array The creators
-     */
-    public function getCreators()
-    {
-        return $this->_creators;
-    }
-
-    /**
-     * Returns the dates
-     *
-     * @return array The dates
-     */
-    public function getDates()
-    {
-        return $this->_dates;
-    }
-
-    /**
-     * Returns the descriptions
-     *
-     * @return array The descriptions
-     */
-    public function getDescriptions()
-    {
-        return $this->_descriptions;
-    }
-
-    /**
-     * Returns the embeddability
-     *
-     * @return Zend_Gdata_Books_Extension_Embeddability|null The embeddability
-     */
-    public function getEmbeddability()
-    {
-        return $this->_embeddability;
-    }
-
-    /**
-     * Returns the formats
-     *
-     * @return array The formats
-     */
-    public function getFormats()
-    {
-        return $this->_formats;
-    }
-
-    /**
-     * Returns the identifiers
-     *
-     * @return array The identifiers
-     */
-    public function getIdentifiers()
-    {
-        return $this->_identifiers;
-    }
-
-    /**
-     * Returns the languages
-     *
-     * @return array The languages
-     */
-    public function getLanguages()
-    {
-        return $this->_languages;
-    }
-
-    /**
-     * Returns the publishers
-     *
-     * @return array The publishers
-     */
-    public function getPublishers()
-    {
-        return $this->_publishers;
-    }
-
-    /**
-     * Returns the rating
-     *
-     * @return Zend_Gdata_Extension_Rating|null The rating
-     */
-    public function getRating()
-    {
-        return $this->_rating;
-    }
-
-    /**
-     * Returns the review
-     *
-     * @return Zend_Gdata_Books_Extension_Review|null The review
-     */
-    public function getReview()
-    {
-        return $this->_review;
-    }
-
-    /**
-     * Returns the subjects
-     *
-     * @return array The subjects
-     */
-    public function getSubjects()
-    {
-        return $this->_subjects;
-    }
-
-    /**
-     * Returns the titles
-     *
-     * @return array The titles
-     */
-    public function getTitles()
-    {
-        return $this->_titles;
-    }
-
-    /**
-     * Returns the viewability
-     *
-     * @return Zend_Gdata_Books_Extension_Viewability|null The viewability
-     */
-    public function getViewability()
-    {
-        return $this->_viewability;
-    }
-
-    /**
-     * Sets the Comments class
-     *
-     * @param Zend_Gdata_Extension_Comments|null $comments Comments class
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setComments($comments)
-    {
-        $this->_comments = $comments;
-        return $this;
-    }
-
-    /**
-     * Sets the creators
-     *
-     * @param array $creators Creators|null
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setCreators($creators)
-    {
-        $this->_creators = $creators;
-        return $this;
-    }
-
-    /**
-     * Sets the dates
-     *
-     * @param array $dates dates
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setDates($dates)
-    {
-        $this->_dates = $dates;
-        return $this;
-    }
-
-    /**
-     * Sets the descriptions
-     *
-     * @param array $descriptions descriptions
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setDescriptions($descriptions)
-    {
-        $this->_descriptions = $descriptions;
-        return $this;
-    }
-
-    /**
-     * Sets the embeddability
-     *
-     * @param Zend_Gdata_Books_Extension_Embeddability|null $embeddability
-     *        embeddability
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setEmbeddability($embeddability)
-    {
-        $this->_embeddability = $embeddability;
-        return $this;
-    }
-
-    /**
-     * Sets the formats
-     *
-     * @param array $formats formats
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setFormats($formats)
-    {
-        $this->_formats = $formats;
-        return $this;
-    }
-
-    /**
-     * Sets the identifiers
-     *
-     * @param array $identifiers identifiers
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setIdentifiers($identifiers)
-    {
-        $this->_identifiers = $identifiers;
-        return $this;
-    }
-
-    /**
-     * Sets the languages
-     *
-     * @param array $languages languages
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setLanguages($languages)
-    {
-        $this->_languages = $languages;
-        return $this;
-    }
-
-    /**
-     * Sets the publishers
-     *
-     * @param array $publishers publishers
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setPublishers($publishers)
-    {
-        $this->_publishers = $publishers;
-        return $this;
-    }
-
-    /**
-     * Sets the rating
-     *
-     * @param Zend_Gdata_Extension_Rating|null $rating rating
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setRating($rating)
-    {
-        $this->_rating = $rating;
-        return $this;
-    }
-
-    /**
-     * Sets the review
-     *
-     * @param Zend_Gdata_Books_Extension_Review|null $review review
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setReview($review)
-    {
-        $this->_review = $review;
-        return $this;
-    }
-
-    /**
-     * Sets the subjects
-     *
-     * @param array $subjects subjects
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setSubjects($subjects)
-    {
-        $this->_subjects = $subjects;
-        return $this;
-    }
-
-    /**
-     * Sets the titles
-     *
-     * @param array $titles titles
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setTitles($titles)
-    {
-        $this->_titles = $titles;
-        return $this;
-    }
-
-    /**
-     * Sets the viewability
-     *
-     * @param Zend_Gdata_Books_Extension_Viewability|null $viewability
-     *        viewability
-     * @return Zend_Gdata_Books_VolumeEntry Provides a fluent interface
-     */
-    public function setViewability($viewability)
-    {
-        $this->_viewability = $viewability;
-        return $this;
-    }
-
-
-    /**
-     * Gets the volume ID based upon the atom:id value
-     *
-     * @return string The volume ID
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function getVolumeId()
-    {
-        $fullId = $this->getId()->getText();
-        $position = strrpos($fullId, '/');
-        if ($position === false) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('Slash not found in atom:id');
-        } else {
-            return substr($fullId, strrpos($fullId,'/') + 1);
-        }
-    }
-
-    /**
-     * Gets the thumbnail link
-     *
-     * @return Zend_Gdata_App_Extension_link|null The thumbnail link
-     */
-    public function getThumbnailLink()
-    {
-        return $this->getLink(self::THUMBNAIL_LINK_REL);
-    }
-
-    /**
-     * Gets the preview link
-     *
-     * @return Zend_Gdata_App_Extension_Link|null The preview link
-     */
-    public function getPreviewLink()
-    {
-        return $this->getLink(self::PREVIEW_LINK_REL);
-    }
-
-    /**
-     * Gets the info link
-     *
-     * @return Zend_Gdata_App_Extension_Link|null The info link
-     */
-    public function getInfoLink()
-    {
-        return $this->getLink(self::INFO_LINK_REL);
-    }
-
-    /**
-     * Gets the annotations link
-     *
-     * @return Zend_Gdata_App_Extension_Link|null The annotations link
-     */
-    public function getAnnotationLink()
-    {
-        return $this->getLink(self::ANNOTATION_LINK_REL);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Books/VolumeFeed.php b/airtime_mvc/library/Zend/Gdata/Books/VolumeFeed.php
deleted file mode 100644
index 8c04eb303..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/VolumeFeed.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VolumeFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Describes a Book Search volume feed
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_VolumeFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * Constructor for Zend_Gdata_Books_VolumeFeed which
-     * Describes a Book Search volume feed
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Books::$namespaces);
-        parent::__construct($element);
-    }
-
-     /**
-      * The classname for individual feed elements.
-      *
-      * @var string
-      */
-     protected $_entryClassName = 'Zend_Gdata_Books_VolumeEntry';
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Books/VolumeQuery.php b/airtime_mvc/library/Zend/Gdata/Books/VolumeQuery.php
deleted file mode 100644
index 28dc55123..000000000
--- a/airtime_mvc/library/Zend/Gdata/Books/VolumeQuery.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VolumeQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_Books
- */
-require_once('Zend/Gdata/Books.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Books volumes
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Books
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Books_VolumeQuery extends Zend_Gdata_Query
-{
-
-    /**
-     * Create Gdata_Books_VolumeQuery object
-     *
-     * @param string|null $url If non-null, pre-initializes the instance to
-     *        use a given URL.
-     */
-    public function __construct($url = null)
-    {
-        parent::__construct($url);
-    }
-
-    /**
-     * Sets the minimum level of viewability of volumes to return in the search results
-     *
-     * @param string|null $value The minimum viewability - 'full' or 'partial'
-     * @return Zend_Gdata_Books_VolumeQuery Provides a fluent interface
-     */
-    public function setMinViewability($value = null)
-    {
-        switch ($value) {
-            case 'full_view':
-                $this->_params['min-viewability'] = 'full';
-                break;
-            case 'partial_view':
-                $this->_params['min-viewability'] = 'partial';
-                break;
-            case null:
-                unset($this->_params['min-viewability']);
-                break;
-        }
-        return $this;
-    }
-
-    /**
-     * Minimum viewability of volumes to include in search results
-     *
-     * @return string|null min-viewability
-     */
-    public function getMinViewability()
-    {
-        if (array_key_exists('min-viewability', $this->_params)) {
-            return $this->_params['min-viewability'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the generated full query URL
-     *
-     * @return string The URL
-     */
-    public function getQueryUrl()
-    {
-        if (isset($this->_url)) {
-            $url = $this->_url;
-        } else {
-            $url = Zend_Gdata_Books::VOLUME_FEED_URI;
-        }
-        if ($this->getCategory() !== null) {
-            $url .= '/-/' . $this->getCategory();
-        }
-        $url = $url . $this->getQueryString();
-        return $url;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar.php b/airtime_mvc/library/Zend/Gdata/Calendar.php
deleted file mode 100644
index 30bcaf04b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Calendar.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Calendar_EventFeed
- */
-require_once 'Zend/Gdata/Calendar/EventFeed.php';
-
-/**
- * @see Zend_Gdata_Calendar_EventEntry
- */
-require_once 'Zend/Gdata/Calendar/EventEntry.php';
-
-/**
- * @see Zend_Gdata_Calendar_ListFeed
- */
-require_once 'Zend/Gdata/Calendar/ListFeed.php';
-
-/**
- * @see Zend_Gdata_Calendar_ListEntry
- */
-require_once 'Zend/Gdata/Calendar/ListEntry.php';
-
-/**
- * Service class for interacting with the Google Calendar data API
- * @link http://code.google.com/apis/gdata/calendar.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar extends Zend_Gdata
-{
-
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
-    const CALENDAR_EVENT_FEED_URI = 'http://www.google.com/calendar/feeds/default/private/full';
-    const AUTH_SERVICE_NAME = 'cl';
-
-    protected $_defaultPostUri = self::CALENDAR_EVENT_FEED_URI;
-
-    /**
-     * Namespaces used for Zend_Gdata_Calendar
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('gCal', 'http://schemas.google.com/gCal/2005', 1, 0)
-    );
-
-    /**
-     * Create Gdata_Calendar object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Calendar');
-        $this->registerPackage('Zend_Gdata_Calendar_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-    }
-
-    /**
-     * Retreive feed object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Calendar_EventFeed
-     */
-    public function getCalendarEventFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::CALENDAR_EVENT_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Calendar_EventFeed');
-    }
-
-    /**
-     * Retreive entry object
-     *
-     * @return Zend_Gdata_Calendar_EventEntry
-     */
-    public function getCalendarEventEntry($location = null)
-    {
-        if ($location == null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Calendar_EventEntry');
-    }
-
-
-    /**
-     * Retrieve feed object
-     *
-     * @return Zend_Gdata_Calendar_ListFeed
-     */
-    public function getCalendarListFeed()
-    {
-        $uri = self::CALENDAR_FEED_URI . '/default';
-        return parent::getFeed($uri,'Zend_Gdata_Calendar_ListFeed');
-    }
-
-    /**
-     * Retreive entryobject
-     *
-     * @return Zend_Gdata_Calendar_ListEntry
-     */
-    public function getCalendarListEntry($location = null)
-    {
-        if ($location == null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri,'Zend_Gdata_Calendar_ListEntry');
-    }
-
-    public function insertEvent($event, $uri=null)
-    {
-        if ($uri == null) {
-            $uri = $this->_defaultPostUri;
-        }
-        $newEvent = $this->insertEntry($event, $uri, 'Zend_Gdata_Calendar_EventEntry');
-        return $newEvent;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/EventEntry.php b/airtime_mvc/library/Zend/Gdata/Calendar/EventEntry.php
deleted file mode 100644
index 554259f4f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/EventEntry.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Kind_EventEntry
- */
-require_once 'Zend/Gdata/Kind/EventEntry.php';
-
-/**
- * @see Zend_Gdata_Calendar_Extension_SendEventNotifications
- */
-require_once 'Zend/Gdata/Calendar/Extension/SendEventNotifications.php';
-
-/**
- * @see Zend_Gdata_Calendar_Extension_Timezone
- */
-require_once 'Zend/Gdata/Calendar/Extension/Timezone.php';
-
-/**
- * @see Zend_Gdata_Calendar_Extension_Link
- */
-require_once 'Zend/Gdata/Calendar/Extension/Link.php';
-
-/**
- * @see Zend_Gdata_Calendar_Extension_QuickAdd
- */
-require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php';
-
-/**
- * Data model class for a Google Calendar Event Entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_EventEntry extends Zend_Gdata_Kind_EventEntry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Calendar_EventEntry';
-    protected $_sendEventNotifications = null;
-    protected $_timezone = null;
-    protected $_quickadd = null;
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_sendEventNotifications != null) {
-            $element->appendChild($this->_sendEventNotifications->getDOM($element->ownerDocument));
-        }
-        if ($this->_timezone != null) {
-            $element->appendChild($this->_timezone->getDOM($element->ownerDocument));
-        }
-        if ($this->_quickadd != null) {
-            $element->appendChild($this->_quickadd->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gCal') . ':' . 'sendEventNotifications';
-                $sendEventNotifications = new Zend_Gdata_Calendar_Extension_SendEventNotifications();
-                $sendEventNotifications->transferFromDOM($child);
-                $this->_sendEventNotifications = $sendEventNotifications;
-                break;
-            case $this->lookupNamespace('gCal') . ':' . 'timezone';
-                $timezone = new Zend_Gdata_Calendar_Extension_Timezone();
-                $timezone->transferFromDOM($child);
-                $this->_timezone = $timezone;
-                break;
-            case $this->lookupNamespace('atom') . ':' . 'link';
-                $link = new Zend_Gdata_Calendar_Extension_Link();
-                $link->transferFromDOM($child);
-                $this->_link[] = $link;
-                break;
-            case $this->lookupNamespace('gCal') . ':' . 'quickadd';
-                $quickadd = new Zend_Gdata_Calendar_Extension_QuickAdd();
-                $quickadd->transferFromDOM($child);
-                $this->_quickadd = $quickadd;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    public function getSendEventNotifications()
-    {
-        return $this->_sendEventNotifications;
-    }
-
-    public function setSendEventNotifications($value)
-    {
-        $this->_sendEventNotifications = $value;
-        return $this;
-    }
-
-    public function getTimezone()
-    {
-        return $this->_timezone;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Extension_EventEntry Provides a fluent interface
-     */
-    public function setTimezone($value)
-    {
-        $this->_timezone = $value;
-        return $this;
-    }
-
-    public function getQuickAdd()
-    {
-        return $this->_quickadd;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_QuickAdd $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setQuickAdd($value)
-    {
-        $this->_quickadd = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/EventFeed.php b/airtime_mvc/library/Zend/Gdata/Calendar/EventFeed.php
deleted file mode 100644
index 235bc4261..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/EventFeed.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EventFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Extension_Timezone
- */
-require_once 'Zend/Gdata/Calendar/Extension/Timezone.php';
-
-/**
- * Data model for a Google Calendar feed of events
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_EventFeed extends Zend_Gdata_Feed
-{
-
-    protected $_timezone = null;
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Calendar_EventEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Calendar_EventFeed';
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_timezone != null) {
-            $element->appendChild($this->_timezone->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gCal') . ':' . 'timezone';
-                $timezone = new Zend_Gdata_Calendar_Extension_Timezone();
-                $timezone->transferFromDOM($child);
-                $this->_timezone = $timezone;
-                break;
-
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    public function getTimezone()
-    {
-        return $this->_timezone;
-    }
-
-    public function setTimezone($value)
-    {
-        $this->_timezone = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/EventQuery.php b/airtime_mvc/library/Zend/Gdata/Calendar/EventQuery.php
deleted file mode 100644
index bdc2ecd8d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/EventQuery.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EventQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_util
- */
-require_once('Zend/Gdata/App/Util.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Calendar events
- *
- * @link http://code.google.com/apis/gdata/calendar/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query
-{
-
-    const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds';
-
-    /**
-     * The default URI used for feeds.
-     */
-    protected $_defaultFeedUri = self::CALENDAR_FEED_URI;
-
-    /**
-     * The comment ID to retrieve. If null, no specific comment will be
-     * retrieved unless already included in the query URI. The event ID
-     * ($_event) must be set, otherwise this property is ignored.
-     */
-    protected $_comments = null;
-
-    /**
-     * The calendar address to be requested by queries. This may be an email
-     * address if requesting the primary calendar for a user. Defaults to
-     * "default" (the currently authenticated user). A null value should be
-     * used when the calendar address has already been set as part of the
-     * query URI.
-     */
-    protected $_user = 'default';
-
-    /*
-     * The visibility to be requested by queries. Defaults to "public". A
-     * null value should be used when the calendar address has already been
-     * set as part of the query URI.
-     */
-    protected $_visibility = 'public';
-
-    /**
-     * Projection to be requested by queries. Defaults to "full". A null value
-     * should be used when the calendar address has already been set as part
-     * of the query URI.
-     */
-    protected $_projection = 'full';
-
-    /**
-     * The event ID to retrieve. If null, no specific event will be retrieved
-     * unless already included in the query URI.
-     */
-    protected $_event = null;
-
-    /**
-     * Create Gdata_Calendar_EventQuery object.  If a URL is provided,
-     * it becomes the base URL, and additional URL components may be
-     * appended.  For instance, if $url is 'http://www.google.com/calendar',
-     * the default URL constructed will be
-     * 'http://www.google.com/calendar/default/public/full'.
-     *
-     * If the URL already contains a calendar ID, projection, visibility,
-     * event ID, or comment ID, you will need to set these fields to null
-     * to prevent them from being inserted. See this class's properties for
-     * more information.
-     *
-     * @param string $url The URL to use as the base path for requests
-     */
-    public function __construct($url = null)
-    {
-        parent::__construct($url);
-    }
-
-    /**
-     * @see $_comments
-     * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setComments($value)
-    {
-        $this->_comments = $value;
-        return $this;
-    }
-
-    /**
-     * @see $_event
-     * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setEvent($value)
-    {
-        $this->_event = $value;
-        return $this;
-    }
-
-    /**
-     * @see $_projection
-     * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * @see $_user
-     * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setUser($value)
-    {
-        $this->_user = $value;
-        return $this;
-    }
-
-    /**
-     * @see $_visibility
-     * @param bool $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    /**
-     * @see $_comments;
-     * @return string comments
-     */
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * @see $_event;
-     * @return string event
-     */
-    public function getEvent()
-    {
-        return $this->_event;
-    }
-
-    /**
-     * @see $_projection
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * @see $_user
-     * @return string user
-     */
-    public function getUser()
-    {
-        return $this->_user;
-    }
-
-    /**
-     * @see $_visibility
-     * @return string visibility
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setStartMax($value)
-    {
-        if ($value != null) {
-            $this->_params['start-max'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['start-max']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setStartMin($value)
-    {
-        if ($value != null) {
-            $this->_params['start-min'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['start-min']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setOrderBy($value)
-    {
-        if ($value != null) {
-            $this->_params['orderby'] = $value;
-        } else {
-            unset($this->_params['orderby']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return int start-max
-     */
-    public function getStartMax()
-    {
-        if (array_key_exists('start-max', $this->_params)) {
-            return $this->_params['start-max'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return int start-min
-     */
-    public function getStartMin()
-    {
-        if (array_key_exists('start-min', $this->_params)) {
-            return $this->_params['start-min'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string orderby
-     */
-    public function getOrderBy()
-    {
-        if (array_key_exists('orderby', $this->_params)) {
-            return $this->_params['orderby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string sortorder
-     */
-    public function getSortOrder()
-    {
-        if (array_key_exists('sortorder', $this->_params)) {
-            return $this->_params['sortorder'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string sortorder
-     */
-    public function setSortOrder($value)
-    {
-        if ($value != null) {
-            $this->_params['sortorder'] = $value;
-        } else {
-            unset($this->_params['sortorder']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string recurrence-expansion-start
-     */
-    public function getRecurrenceExpansionStart()
-    {
-        if (array_key_exists('recurrence-expansion-start', $this->_params)) {
-            return $this->_params['recurrence-expansion-start'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string recurrence-expansion-start
-     */
-    public function setRecurrenceExpansionStart($value)
-    {
-        if ($value != null) {
-            $this->_params['recurrence-expansion-start'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['recurrence-expansion-start']);
-        }
-        return $this;
-    }
-
-
-    /**
-     * @return string recurrence-expansion-end
-     */
-    public function getRecurrenceExpansionEnd()
-    {
-        if (array_key_exists('recurrence-expansion-end', $this->_params)) {
-            return $this->_params['recurrence-expansion-end'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string recurrence-expansion-end
-     */
-    public function setRecurrenceExpansionEnd($value)
-    {
-        if ($value != null) {
-            $this->_params['recurrence-expansion-end'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['recurrence-expansion-end']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value Also accepts bools.
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function getSingleEvents()
-    {
-        if (array_key_exists('singleevents', $this->_params)) {
-            $value = $this->_params['singleevents'];
-            switch ($value) {
-                case 'true':
-                    return true;
-                    break;
-                case 'false':
-                    return false;
-                    break;
-                default:
-                    require_once 'Zend/Gdata/App/Exception.php';
-                    throw new Zend_Gdata_App_Exception(
-                            'Invalid query param value for futureevents: ' .
-                            $value . ' It must be a boolean.');
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @param string $value Also accepts bools. If using a string, must be either "true" or "false".
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setSingleEvents($value)
-    {
-        if ($value !== null) {
-            if (is_bool($value)) {
-                $this->_params['singleevents'] = ($value?'true':'false');
-            } elseif ($value == 'true' | $value == 'false') {
-                $this->_params['singleevents'] = $value;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception(
-                        'Invalid query param value for futureevents: ' .
-                        $value . ' It must be a boolean.');
-            }
-        } else {
-            unset($this->_params['singleevents']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string futureevents
-     */
-    public function getFutureEvents()
-    {
-        if (array_key_exists('futureevents', $this->_params)) {
-            $value = $this->_params['futureevents'];
-            switch ($value) {
-                case 'true':
-                    return true;
-                    break;
-                case 'false':
-                    return false;
-                    break;
-                default:
-                    require_once 'Zend/Gdata/App/Exception.php';
-                    throw new Zend_Gdata_App_Exception(
-                            'Invalid query param value for futureevents: ' .
-                            $value . ' It must be a boolean.');
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @param string $value Also accepts bools. If using a string, must be either "true" or "false" or
-     *                      an exception will be thrown on retrieval.
-     * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface
-     */
-    public function setFutureEvents($value)
-    {
-        if ($value !== null) {
-            if (is_bool($value)) {
-                $this->_params['futureevents'] = ($value?'true':'false');
-            } elseif ($value == 'true' | $value == 'false') {
-                $this->_params['futureevents'] = $value;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception(
-                        'Invalid query param value for futureevents: ' .
-                        $value . ' It must be a boolean.');
-            }
-        } else {
-            unset($this->_params['futureevents']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-        if (isset($this->_url)) {
-            $uri = $this->_url;
-        } else {
-            $uri = $this->_defaultFeedUri;
-        }
-        if ($this->getUser() != null) {
-            $uri .= '/' . $this->getUser();
-        }
-        if ($this->getVisibility() != null) {
-            $uri .= '/' . $this->getVisibility();
-        }
-        if ($this->getProjection() != null) {
-            $uri .= '/' . $this->getProjection();
-        }
-        if ($this->getEvent() != null) {
-            $uri .= '/' . $this->getEvent();
-            if ($this->getComments() != null) {
-                $uri .= '/comments/' . $this->getComments();
-            }
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/AccessLevel.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/AccessLevel.php
deleted file mode 100644
index ccd4f6aef..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/AccessLevel.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccessLevel.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:accessLevel element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_AccessLevel extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'accesslevel';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_AccessLevel object.
-     * @param string $value (optional) The text content of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value != null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return string The attribute being modified.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Selected The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Color.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Color.php
deleted file mode 100644
index 3ed7fdebb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Color.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:color element used by the Calendar data API
- * to define the color of a calendar in the UI.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_Color extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'color';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Color object.
-     * @param string $value (optional) The text content of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value != null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return string The value associated with this attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Color The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->_value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Hidden.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Hidden.php
deleted file mode 100644
index 679b64160..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Hidden.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:hidden element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'hidden';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Hidden object.
-     * @param bool $value (optional) The value of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', ($this->_value ? "true" : "false"));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            if ($attribute->nodeValue == "true") {
-                $this->_value = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_value = false;
-            }
-            else {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Hidden The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->_value;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Link.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Link.php
deleted file mode 100644
index 3e6a5f142..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Link.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/App/Extension/Link.php';
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Calendar/Extension/WebContent.php';
-
-
-/**
- * Specialized Link class for use with Calendar. Enables use of gCal extension elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_Link extends Zend_Gdata_App_Extension_Link
-{
-
-    protected $_webContent = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Link object.
-     * @see Zend_Gdata_App_Extension_Link#__construct
-     * @param Zend_Gdata_Calendar_Extension_Webcontent $webContent
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null, $webContent = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-        $this->_webContent = $webContent;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_webContent != null) {
-            $element->appendChild($this->_webContent->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gCal') . ':' . 'webContent':
-            $webContent = new Zend_Gdata_Calendar_Extension_WebContent();
-            $webContent->transferFromDOM($child);
-            $this->_webContent = $webContent;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Get the value for this element's WebContent attribute.
-     *
-     * @return Zend_Gdata_Calendar_Extension_Webcontent The WebContent value
-     */
-    public function getWebContent()
-    {
-        return $this->_webContent;
-    }
-
-    /**
-     * Set the value for this element's WebContent attribute.
-     *
-     * @param Zend_Gdata_Calendar_Extension_WebContent $value The desired value for this attribute.
-     * @return Zend_Calendar_Extension_Link The element being modified.  Provides a fluent interface.
-     */
-    public function setWebContent($value)
-    {
-        $this->_webContent = $value;
-        return $this;
-    }
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/QuickAdd.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/QuickAdd.php
deleted file mode 100644
index d56b142ec..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/QuickAdd.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QuickAdd.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:quickAdd element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_QuickAdd extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'quickadd';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_QuickAdd object.
-     * @param string $value (optional) The text content of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', ($this->_value ? "true" : "false"));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            if ($attribute->nodeValue == "true") {
-                $this->_value = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_value = false;
-            }
-            else {
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return string The value associated with this attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_QuickAdd The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Selected.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Selected.php
deleted file mode 100644
index ff8ebdb35..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Selected.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Selected.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:selected element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'selected';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Selected object.
-     * @param bool $value (optional) The value of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', ($this->_value ? "true" : "false"));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            if ($attribute->nodeValue == "true") {
-                $this->_value = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_value = false;
-            }
-            else {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return bool The value associated with this attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Selected The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->_value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
deleted file mode 100644
index c0f210b4d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendEventNotifications.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent an entry's sendEventNotifications
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_SendEventNotifications extends Zend_Gdata_Extension
-{
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'sendEventNotifications';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_SendEventNotifications object.
-     * @param bool $value (optional) SendEventNotifications value as URI.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', ($this->_value ? "true" : "false"));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            if ($attribute->nodeValue == "true") {
-                $this->_value = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_value = false;
-            }
-            else {
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_SendEventNotifications The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Timezone.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Timezone.php
deleted file mode 100644
index d13594c26..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/Timezone.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Timezone.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:timezone element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_Timezone extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'timezone';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Timezone object.
-     * @param string $value (optional) The text content of the element.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value != null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return string The value associated with this attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_Timezone The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/WebContent.php b/airtime_mvc/library/Zend/Gdata/Calendar/Extension/WebContent.php
deleted file mode 100644
index 97eb5336f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/Extension/WebContent.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WebContent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gCal:webContent element used by the Calendar data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_Extension_WebContent extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootNamespace = 'gCal';
-    protected $_rootElement = 'webContent';
-    protected $_url = null;
-    protected $_height = null;
-    protected $_width = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_WebContent object.
-     * @param string $url (optional) The value for this element's URL attribute.
-     * @param string $height (optional) The value for this element's height attribute.
-     * @param string $width (optional) The value for this element's width attribute.
-     */
-    public function __construct($url = null, $height = null, $width = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct();
-        $this->_url = $url;
-        $this->_height = $height;
-        $this->_width = $width;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->url != null) {
-            $element->setAttribute('url', $this->_url);
-        }
-        if ($this->height != null) {
-            $element->setAttribute('height', $this->_height);
-        }
-        if ($this->width != null) {
-            $element->setAttribute('width', $this->_width);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-                case 'url':
-                        $this->_url = $attribute->nodeValue;
-                        break;
-                case 'height':
-                        $this->_height = $attribute->nodeValue;
-                        break;
-                case 'width':
-                        $this->_width = $attribute->nodeValue;
-                        break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's URL attribute.
-     *
-     * @return string The desired value for this attribute.
-     */
-    public function getURL()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Set the value for this element's URL attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_WebContent The element being modified.
-     */
-    public function setURL($value)
-    {
-        $this->_url = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's height attribute.
-     *
-     * @return int The desired value for this attribute.
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
-
-    /**
-     * Set the value for this element's height attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_WebContent The element being modified.
-     */
-    public function setHeight($value)
-    {
-        $this->_height = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's height attribute.
-     *
-     * @return int The desired value for this attribute.
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
-
-    /**
-     * Set the value for this element's height attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_Calendar_Extension_WebContent The element being modified.
-     */
-    public function setWidth($value)
-    {
-        $this->_width = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/ListEntry.php b/airtime_mvc/library/Zend/Gdata/Calendar/ListEntry.php
deleted file mode 100644
index 4c7629d9f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/ListEntry.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Calendar_Extension_AccessLevel
- */
-require_once 'Zend/Gdata/Calendar/Extension/AccessLevel.php';
-
-/**
- * @see Zend_Calendar_Extension_Color
- */
-require_once 'Zend/Gdata/Calendar/Extension/Color.php';
-
-/**
- * @see Zend_Calendar_Extension_Hidden
- */
-require_once 'Zend/Gdata/Calendar/Extension/Hidden.php';
-
-/**
- * @see Zend_Calendar_Extension_Selected
- */
-require_once 'Zend/Gdata/Calendar/Extension/Selected.php';
-
-/**
- * @see Zend_Gdata_Extension_EventStatus
- */
-require_once 'Zend/Gdata/Extension/EventStatus.php';
-
-/**
- * @see Zend_Gdata_Extension_Visibility
- */
-require_once 'Zend/Gdata/Extension/Visibility.php';
-
-
-/**
- * @see Zend_Extension_Where
- */
-require_once 'Zend/Gdata/Extension/Where.php';
-
-/**
- * Represents a Calendar entry in the Calendar data API meta feed of a user's
- * calendars.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_ListEntry extends Zend_Gdata_Entry
-{
-
-    protected $_color = null;
-    protected $_accessLevel = null;
-    protected $_hidden = null;
-    protected $_selected = null;
-    protected $_timezone = null;
-    protected $_where = array();
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_accessLevel != null) {
-            $element->appendChild($this->_accessLevel->getDOM($element->ownerDocument));
-        }
-        if ($this->_color != null) {
-            $element->appendChild($this->_color->getDOM($element->ownerDocument));
-        }
-        if ($this->_hidden != null) {
-            $element->appendChild($this->_hidden->getDOM($element->ownerDocument));
-        }
-        if ($this->_selected != null) {
-            $element->appendChild($this->_selected->getDOM($element->ownerDocument));
-        }
-        if ($this->_timezone != null) {
-            $element->appendChild($this->_timezone->getDOM($element->ownerDocument));
-        }
-        if ($this->_where != null) {
-            foreach ($this->_where as $where) {
-                $element->appendChild($where->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gCal') . ':' . 'accesslevel';
-            $accessLevel = new Zend_Gdata_Calendar_Extension_AccessLevel();
-            $accessLevel->transferFromDOM($child);
-            $this->_accessLevel = $accessLevel;
-            break;
-        case $this->lookupNamespace('gCal') . ':' . 'color';
-            $color = new Zend_Gdata_Calendar_Extension_Color();
-            $color->transferFromDOM($child);
-            $this->_color = $color;
-            break;
-        case $this->lookupNamespace('gCal') . ':' . 'hidden';
-            $hidden = new Zend_Gdata_Calendar_Extension_Hidden();
-            $hidden->transferFromDOM($child);
-            $this->_hidden = $hidden;
-            break;
-        case $this->lookupNamespace('gCal') . ':' . 'selected';
-            $selected = new Zend_Gdata_Calendar_Extension_Selected();
-            $selected->transferFromDOM($child);
-            $this->_selected = $selected;
-            break;
-        case $this->lookupNamespace('gCal') . ':' . 'timezone';
-            $timezone = new Zend_Gdata_Calendar_Extension_Timezone();
-            $timezone->transferFromDOM($child);
-            $this->_timezone = $timezone;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'where';
-            $where = new Zend_Gdata_Extension_Where();
-            $where->transferFromDOM($child);
-            $this->_where[] = $where;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function getAccessLevel()
-    {
-        return $this->_accessLevel;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_AccessLevel $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setAccessLevel($value)
-    {
-        $this->_accessLevel = $value;
-        return $this;
-    }
-    public function getColor()
-    {
-        return $this->_color;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Color $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setColor($value)
-    {
-        $this->_color = $value;
-        return $this;
-    }
-
-    public function getHidden()
-    {
-        return $this->_hidden;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Hidden $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setHidden($value)
-    {
-        $this->_hidden = $value;
-        return $this;
-    }
-
-    public function getSelected()
-    {
-        return $this->_selected;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Selected $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setSelected($value)
-    {
-        $this->_selected = $value;
-        return $this;
-    }
-
-    public function getTimezone()
-    {
-        return $this->_timezone;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setTimezone($value)
-    {
-        $this->_timezone = $value;
-        return $this;
-    }
-
-    public function getWhere()
-    {
-        return $this->_where;
-    }
-
-    /**
-     * @param Zend_Gdata_Extension_Where $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setWhere($value)
-    {
-        $this->_where = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Calendar/ListFeed.php b/airtime_mvc/library/Zend/Gdata/Calendar/ListFeed.php
deleted file mode 100644
index 1447ee115..000000000
--- a/airtime_mvc/library/Zend/Gdata/Calendar/ListFeed.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Extension_Timezone
- */
-require_once 'Zend/Gdata/Calendar/Extension/Timezone.php';
-
-/**
- * Represents the meta-feed list of calendars
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Calendar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Calendar_ListFeed extends Zend_Gdata_Feed
-{
-    protected $_timezone = null;
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Calendar_ListEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Calendar_ListFeed';
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Calendar::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_timezone != null) {
-            $element->appendChild($this->_timezone->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gCal') . ':' . 'timezone';
-            $timezone = new Zend_Gdata_Calendar_Extension_Timezone();
-            $timezone->transferFromDOM($child);
-            $this->_timezone = $timezone;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function getTimezone()
-    {
-        return $this->_timezone;
-    }
-
-    /**
-     * @param Zend_Gdata_Calendar_Extension_Timezone $value
-     * @return Zend_Gdata_Extension_ListEntry Provides a fluent interface
-     */
-    public function setTimezone($value)
-    {
-        $this->_timezone = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/ClientLogin.php b/airtime_mvc/library/Zend/Gdata/ClientLogin.php
deleted file mode 100644
index ddbb5d3b1..000000000
--- a/airtime_mvc/library/Zend/Gdata/ClientLogin.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ClientLogin.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_HttpClient
- */
-require_once 'Zend/Gdata/HttpClient.php';
-
-/**
- * Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * Class to facilitate Google's "Account Authentication
- * for Installed Applications" also known as "ClientLogin".
- * @see http://code.google.com/apis/accounts/AuthForInstalledApps.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_ClientLogin
-{
-
-    /**
-     * The Google client login URI
-     *
-     */
-    const CLIENTLOGIN_URI = 'https://www.google.com/accounts/ClientLogin';
-
-    /**
-     * The default 'source' parameter to send to Google
-     *
-     */
-    const DEFAULT_SOURCE = 'Zend-ZendFramework';
-
-    /**
-     * Set Google authentication credentials.
-     * Must be done before trying to do any Google Data operations that
-     * require authentication.
-     * For example, viewing private data, or posting or deleting entries.
-     *
-     * @param string $email
-     * @param string $password
-     * @param string $service
-     * @param Zend_Gdata_HttpClient $client
-     * @param string $source
-     * @param string $loginToken The token identifier as provided by the server.
-     * @param string $loginCaptcha The user's response to the CAPTCHA challenge.
-     * @param string $accountType An optional string to identify whether the
-     * account to be authenticated is a google or a hosted account. Defaults to
-     * 'HOSTED_OR_GOOGLE'. See: http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html#Request
-     * @throws Zend_Gdata_App_AuthException
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_CaptchaRequiredException
-     * @return Zend_Gdata_HttpClient
-     */
-    public static function getHttpClient($email, $password, $service = 'xapi',
-        $client = null,
-        $source = self::DEFAULT_SOURCE,
-        $loginToken = null,
-        $loginCaptcha = null,
-        $loginUri = self::CLIENTLOGIN_URI,
-        $accountType = 'HOSTED_OR_GOOGLE')
-    {
-        if (! ($email && $password)) {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                   'Please set your Google credentials before trying to ' .
-                   'authenticate');
-        }
-
-        if ($client == null) {
-            $client = new Zend_Gdata_HttpClient();
-        }
-        if (!$client instanceof Zend_Http_Client) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException(
-                    'Client is not an instance of Zend_Http_Client.');
-        }
-
-        // Build the HTTP client for authentication
-        $client->setUri($loginUri);
-        $useragent = $source . ' Zend_Framework_Gdata/' . Zend_Version::VERSION;
-        $client->setConfig(array(
-                'maxredirects'    => 0,
-                'strictredirects' => true,
-                'useragent' => $useragent
-            )
-        );
-        $client->setParameterPost('accountType', $accountType);
-        $client->setParameterPost('Email', (string) $email);
-        $client->setParameterPost('Passwd', (string) $password);
-        $client->setParameterPost('service', (string) $service);
-        $client->setParameterPost('source', (string) $source);
-        if ($loginToken || $loginCaptcha) {
-            if($loginToken && $loginCaptcha) {
-                $client->setParameterPost('logintoken', (string) $loginToken);
-                $client->setParameterPost('logincaptcha',
-                        (string) $loginCaptcha);
-            }
-            else {
-                require_once 'Zend/Gdata/App/AuthException.php';
-                throw new Zend_Gdata_App_AuthException(
-                    'Please provide both a token ID and a user\'s response ' .
-                    'to the CAPTCHA challenge.');
-            }
-        }
-
-        // Send the authentication request
-        // For some reason Google's server causes an SSL error. We use the
-        // output buffer to supress an error from being shown. Ugly - but works!
-        ob_start();
-        try {
-            $response = $client->request('POST');
-        } catch (Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException($e->getMessage(), $e);
-        }
-        ob_end_clean();
-
-        // Parse Google's response
-        $goog_resp = array();
-        foreach (explode("\n", $response->getBody()) as $l) {
-            $l = chop($l);
-            if ($l) {
-                list($key, $val) = explode('=', chop($l), 2);
-                $goog_resp[$key] = $val;
-            }
-        }
-
-        if ($response->getStatus() == 200) {
-            $client->setClientLoginToken($goog_resp['Auth']);
-            $useragent = $source . ' Zend_Framework_Gdata/' . Zend_Version::VERSION;
-            $client->setConfig(array(
-                    'strictredirects' => true,
-                    'useragent' => $useragent
-                )
-            );
-            return $client;
-
-        } elseif ($response->getStatus() == 403) {
-            // Check if the server asked for a CAPTCHA
-            if (array_key_exists('Error', $goog_resp) &&
-                $goog_resp['Error'] == 'CaptchaRequired') {
-                require_once 'Zend/Gdata/App/CaptchaRequiredException.php';
-                throw new Zend_Gdata_App_CaptchaRequiredException(
-                    $goog_resp['CaptchaToken'], $goog_resp['CaptchaUrl']);
-            }
-            else {
-                require_once 'Zend/Gdata/App/AuthException.php';
-                throw new Zend_Gdata_App_AuthException('Authentication with Google failed. Reason: ' .
-                    (isset($goog_resp['Error']) ? $goog_resp['Error'] : 'Unspecified.'));
-            }
-        }
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Docs.php b/airtime_mvc/library/Zend/Gdata/Docs.php
deleted file mode 100644
index 5fa4908aa..000000000
--- a/airtime_mvc/library/Zend/Gdata/Docs.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Docs.php 20112 2010-01-07 02:39:32Z tjohns $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Docs_DocumentListFeed
- */
-require_once 'Zend/Gdata/Docs/DocumentListFeed.php';
-
-/**
- * @see Zend_Gdata_Docs_DocumentListEntry
- */
-require_once 'Zend/Gdata/Docs/DocumentListEntry.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Title
- */
-require_once 'Zend/Gdata/App/Extension/Title.php';
-
-/**
- * Service class for interacting with the Google Document List data API
- * @link http://code.google.com/apis/documents/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Docs extends Zend_Gdata
-{
-
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full';
-    const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full';
-    const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind';
-    const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder';
-    const AUTH_SERVICE_NAME = 'writely';
-
-    protected $_defaultPostUri = self::DOCUMENTS_LIST_FEED_URI;
-
-    private static $SUPPORTED_FILETYPES = array(
-      'TXT'=>'text/plain',
-      'CSV'=>'text/csv',
-      'TSV'=>'text/tab-separated-values',
-      'TAB'=>'text/tab-separated-values',
-      'HTML'=>'text/html',
-      'HTM'=>'text/html',
-      'DOC'=>'application/msword',
-      'ODS'=>'application/vnd.oasis.opendocument.spreadsheet',
-      'ODT'=>'application/vnd.oasis.opendocument.text',
-      'RTF'=>'application/rtf',
-      'SXW'=>'application/vnd.sun.xml.writer',
-      'XLS'=>'application/vnd.ms-excel',
-      'XLSX'=>'application/vnd.ms-excel',
-      'PPT'=>'application/vnd.ms-powerpoint',
-      'PPS'=>'application/vnd.ms-powerpoint');
-
-    /**
-     * Create Gdata_Docs object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Docs');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-    }
-
-    /**
-     * Looks up the mime type based on the file name extension. For example,
-     * calling this method with 'csv' would return
-     * 'text/comma-separated-values'. The Mime type is sent as a header in
-     * the upload HTTP POST request.
-     *
-     * @param string $fileExtension
-     * @return string The mime type to be sent to the server to tell it how the
-     *          multipart mime data should be interpreted.
-     */
-    public static function lookupMimeType($fileExtension) {
-      return self::$SUPPORTED_FILETYPES[strtoupper($fileExtension)];
-    }
-
-    /**
-     * Retreive feed object containing entries for the user's documents.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Docs_DocumentListFeed
-     */
-    public function getDocumentListFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::DOCUMENTS_LIST_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Docs_DocumentListFeed');
-    }
-
-    /**
-     * Retreive entry object representing a single document.
-     *
-     * @param mixed $location The location for the entry, as a URL or Query
-     * @return Zend_Gdata_Docs_DocumentListEntry
-     */
-    public function getDocumentListEntry($location = null)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Docs_DocumentListEntry');
-    }
-
-    /**
-     * Retreive entry object representing a single document.
-     *
-     * This method builds the URL where this item is stored using the type
-     * and the id of the document.
-     * @param string $docId The URL key for the document. Examples:
-     *     dcmg89gw_62hfjj8m, pKq0CzjiF3YmGd0AIlHKqeg
-     * @param string $docType The type of the document as used in the Google
-     *     Document List URLs. Examples: document, spreadsheet, presentation
-     * @return Zend_Gdata_Docs_DocumentListEntry
-     */
-    public function getDoc($docId, $docType) {
-        $location = 'http://docs.google.com/feeds/documents/private/full/' .
-            $docType . '%3A' . $docId;
-        return $this->getDocumentListEntry($location);
-    }
-
-    /**
-     * Retreive entry object for the desired word processing document.
-     *
-     * @param string $id The URL id for the document. Example:
-     *     dcmg89gw_62hfjj8m
-     */
-    public function getDocument($id) {
-      return $this->getDoc($id, 'document');
-    }
-
-    /**
-     * Retreive entry object for the desired spreadsheet.
-     *
-     * @param string $id The URL id for the document. Example:
-     *     pKq0CzjiF3YmGd0AIlHKqeg
-     */
-    public function getSpreadsheet($id) {
-      return $this->getDoc($id, 'spreadsheet');
-    }
-
-    /**
-     * Retreive entry object for the desired presentation.
-     *
-     * @param string $id The URL id for the document. Example:
-     *     dcmg89gw_21gtrjcn
-     */
-    public function getPresentation($id) {
-      return $this->getDoc($id, 'presentation');
-    }
-
-    /**
-     * Upload a local file to create a new Google Document entry.
-     *
-     * @param string $fileLocation The full or relative path of the file to
-     *         be uploaded.
-     * @param string $title The name that this document should have on the
-     *         server. If set, the title is used as the slug header in the
-     *         POST request. If no title is provided, the location of the
-     *         file will be used as the slug header in the request. If no
-     *         mimeType is provided, this method attempts to determine the
-     *         mime type based on the slugHeader by looking for .doc,
-     *         .csv, .txt, etc. at the end of the file name.
-     *         Example value: 'test.doc'.
-     * @param string $mimeType Describes the type of data which is being sent
-     *         to the server. This must be one of the accepted mime types
-     *         which are enumerated in SUPPORTED_FILETYPES.
-     * @param string $uri (optional) The URL to which the upload should be
-     *         made.
-     *         Example: 'http://docs.google.com/feeds/documents/private/full'.
-     * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly
-     *         created Google Document.
-     */
-    public function uploadFile($fileLocation, $title=null, $mimeType=null,
-                               $uri=null)
-    {
-        // Set the URI to which the file will be uploaded.
-        if ($uri === null) {
-            $uri = $this->_defaultPostUri;
-        }
-
-        // Create the media source which describes the file.
-        $fs = $this->newMediaFileSource($fileLocation);
-        if ($title !== null) {
-            $slugHeader = $title;
-        } else {
-            $slugHeader = $fileLocation;
-        }
-
-        // Set the slug header to tell the Google Documents server what the
-        // title of the document should be and what the file extension was
-        // for the original file.
-        $fs->setSlug($slugHeader);
-
-        // Set the mime type of the data.
-        if ($mimeType === null) {
-          $filenameParts = explode('.', $fileLocation);
-          $fileExtension = end($filenameParts);
-          $mimeType = self::lookupMimeType($fileExtension);
-        }
-
-        // Set the mime type for the upload request.
-        $fs->setContentType($mimeType);
-
-        // Send the data to the server.
-        return $this->insertDocument($fs, $uri);
-    }
-
-    /**
-     * Creates a new folder in Google Docs
-     *
-     * @param string $folderName The folder name to create
-     * @param string|null $folderResourceId The parent folder to create it in
-     *        ("folder%3Amy_parent_folder")
-     * @return Zend_Gdata_Entry The folder entry created.
-     * @todo ZF-8732: This should return a *subclass* of Zend_Gdata_Entry, but
-     *       the appropriate type doesn't exist yet.
-     */
-    public function createFolder($folderName, $folderResourceId=null) {
-        $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, 
-                                                          self::DOCUMENTS_CATEGORY_SCHEMA);
-        $title = new Zend_Gdata_App_Extension_Title($folderName);
-        $entry = new Zend_Gdata_Entry();
-
-        $entry->setCategory(array($category));
-        $entry->setTitle($title);
-
-        $uri = self::DOCUMENTS_LIST_FEED_URI;
-        if ($folderResourceId != null) {
-            $uri = self::DOCUMENTS_FOLDER_FEED_URI . '/' . $folderResourceId;
-        }
-
-        return $this->insertEntry($entry, $uri);
-    }
-
-    /**
-     * Inserts an entry to a given URI and returns the response as an Entry.
-     *
-     * @param mixed  $data The Zend_Gdata_Docs_DocumentListEntry or media
-     *         source to post. If it is a DocumentListEntry, the mediaSource
-     *         should already have been set. If $data is a mediaSource, it
-     *         should have the correct slug header and mime type.
-     * @param string $uri POST URI
-     * @param string $className (optional) The class of entry to be returned.
-     *         The default is a 'Zend_Gdata_Docs_DocumentListEntry'.
-     * @return Zend_Gdata_Docs_DocumentListEntry The entry returned by the
-     *     service after insertion.
-     */
-    public function insertDocument($data, $uri,
-        $className='Zend_Gdata_Docs_DocumentListEntry')
-    {
-        return $this->insertEntry($data, $uri, $className);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Docs/DocumentListEntry.php b/airtime_mvc/library/Zend/Gdata/Docs/DocumentListEntry.php
deleted file mode 100644
index d8f9261e4..000000000
--- a/airtime_mvc/library/Zend/Gdata/Docs/DocumentListEntry.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocumentListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_EntryAtom
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * Represents a Documents List entry in the Documents List data API meta feed
- * of a user's documents.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Docs_DocumentListEntry extends Zend_Gdata_Entry
-{
-
-    /**
-     * Create a new instance of an entry representing a document.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Docs::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Docs/DocumentListFeed.php b/airtime_mvc/library/Zend/Gdata/Docs/DocumentListFeed.php
deleted file mode 100644
index 6d620229d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Docs/DocumentListFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocumentListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-
-/**
- * Data model for a Google Documents List feed of documents
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Docs_DocumentListFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Docs_DocumentListEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Docs_DocumentListFeed';
-
-    /**
-     * Create a new instance of a feed for a list of documents.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Docs::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Docs/Query.php b/airtime_mvc/library/Zend/Gdata/Docs/Query.php
deleted file mode 100644
index 97b0157eb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Docs/Query.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Document List documents
- *
- * @link http://code.google.com/apis/gdata/spreadsheets/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Docs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
-{
-
-    /**
-     * The base URL for retrieving a document list
-     *
-     * @var string
-     */
-    const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents';
-
-    /**
-     * The generic base URL used by some inherited methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::DOCUMENTS_LIST_FEED_URI;
-
-    /**
-     * The visibility to be used when querying for the feed. A request for a
-     * feed with private visbility requires the user to be authenricated.
-     * Private is the only avilable visibility for the documents list.
-     *
-     * @var string
-     */
-    protected $_visibility = 'private';
-
-    /**
-     * The projection determines how much detail should be given in the
-     * result of the query. Full is the only valid projection for the
-     * documents list.
-     *
-     * @var string
-     */
-    protected $_projection = 'full';
-
-    /**
-     * Constructs a new instance of a Zend_Gdata_Docs_Query object.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Sets the projection for this query. Common values for projection
-     * include 'full'.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * Sets the visibility for this query. Common values for visibility
-     * include 'private'.
-     *
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the projection for this query.
-     *
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * Gets the visibility for this query.
-     *
-     * @return string visibility
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * Sets the title attribute for this query. The title parameter is used
-     * to restrict the results to documents whose titles either contain or
-     * completely match the title.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
-     */
-    public function setTitle($value)
-    {
-        if ($value !== null) {
-            $this->_params['title'] = $value;
-        } else {
-            unset($this->_params['title']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the title attribute for this query.
-     *
-     * @return string title
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_params)) {
-            return $this->_params['title'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the title-exact attribute for this query.
-     * If title-exact is set to true, the title query parameter will be used
-     * in an exact match. Only documents with a title identical to the
-     * title parameter will be returned.
-     *
-     * @param boolean $value Use either true or false
-     * @return Zend_Gdata_Docs_Query Provides a fluent interface
-     */
-    public function setTitleExact($value)
-    {
-        if ($value) {
-            $this->_params['title-exact'] = $value;
-        } else {
-            unset($this->_params['title-exact']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the title-exact attribute for this query.
-     *
-     * @return string title-exact
-     */
-    public function getTitleExact()
-    {
-        if (array_key_exists('title-exact', $this->_params)) {
-            return $this->_params['title-exact'];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Gets the full query URL for this query.
-     *
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-
-        if ($this->_visibility !== null) {
-            $uri .= '/' . $this->_visibility;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                'A visibility must be provided for cell queries.');
-        }
-
-        if ($this->_projection !== null) {
-            $uri .= '/' . $this->_projection;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                'A projection must be provided for cell queries.');
-        }
-
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore.php b/airtime_mvc/library/Zend/Gdata/DublinCore.php
deleted file mode 100644
index 7ecdf2d7d..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DublinCore.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * Service class for interacting with the services which use the
- * DublinCore extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore extends Zend_Gdata
-{
-
-    /**
-     * Namespaces used for Zend_Gdata_DublinCore
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('dc', 'http://purl.org/dc/terms', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_DublinCore object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_DublinCore');
-        $this->registerPackage('Zend_Gdata_DublinCore_Extension');
-        parent::__construct($client, $applicationId);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Creator.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Creator.php
deleted file mode 100644
index b9e5bb697..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Creator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Creator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Entity primarily responsible for making the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Creator extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'creator';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Creator which
-     * Entity primarily responsible for making the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Date.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Date.php
deleted file mode 100644
index dc78479f1..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Date.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Date.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Point or period of time associated with an event in the lifecycle of the
- * resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Date extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'date';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Date which
-     * Point or period of time associated with an event in the lifecycle of the
-     * resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Description.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Description.php
deleted file mode 100644
index f2b62164b..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Description.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Account of the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Description extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'description';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Description which
-     * Account of the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Format.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Format.php
deleted file mode 100644
index c0d703fd9..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Format.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Format.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * File format, physical medium, or dimensions of the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Format extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'format';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Format which
-     * File format, physical medium, or dimensions of the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Identifier.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Identifier.php
deleted file mode 100644
index 4e8e75df0..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Identifier.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Identifier.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * An unambiguous reference to the resource within a given context
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Identifier extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'identifier';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Identifier which
-     * An unambiguous reference to the resource within a given context
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Language.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Language.php
deleted file mode 100644
index b39452977..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Language.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Language.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Language of the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Language extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'language';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Language which
-     * Language of the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Publisher.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Publisher.php
deleted file mode 100644
index 05435d651..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Publisher.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Publisher.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Entity responsible for making the resource available
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Publisher extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'publisher';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Publisher which
-     * Entity responsible for making the resource available
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Rights.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Rights.php
deleted file mode 100644
index f8c74b5bf..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Rights.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Information about rights held in and over the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Rights extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'rights';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Rights which
-     * Information about rights held in and over the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Subject.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Subject.php
deleted file mode 100644
index 60e99cdf1..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Subject.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Subject.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Topic of the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Subject extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'subject';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Subject which
-     * Topic of the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Title.php b/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Title.php
deleted file mode 100644
index 1baacf662..000000000
--- a/airtime_mvc/library/Zend/Gdata/DublinCore/Extension/Title.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Name given to the resource
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage DublinCore
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_DublinCore_Extension_Title extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'dc';
-    protected $_rootElement = 'title';
-
-    /**
-     * Constructor for Zend_Gdata_DublinCore_Extension_Title which
-     * Name given to the resource
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_DublinCore::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Entry.php b/airtime_mvc/library/Zend/Gdata/Entry.php
deleted file mode 100644
index 105464859..000000000
--- a/airtime_mvc/library/Zend/Gdata/Entry.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_App_MediaEntry
- */
-require_once 'Zend/Gdata/App/MediaEntry.php';
-
-/**
- * Represents the Gdata flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Entry';
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        // ETags are special. We only support them in protocol >= 2.X.
-        // This will be duplicated by the HTTP ETag header.
-        if ($majorVersion >= 2) {
-            if ($this->_etag != null) {
-                $element->setAttributeNS($this->lookupNamespace('gd'),
-                                         'gd:etag',
-                                         $this->_etag);
-            }
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('atom') . ':' . 'content':
-            $content = new Zend_Gdata_App_Extension_Content();
-            $content->transferFromDOM($child);
-            $this->_content = $content;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'published':
-            $published = new Zend_Gdata_App_Extension_Published();
-            $published->transferFromDOM($child);
-            $this->_published = $published;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'source':
-            $source = new Zend_Gdata_App_Extension_Source();
-            $source->transferFromDOM($child);
-            $this->_source = $source;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'summary':
-            $summary = new Zend_Gdata_App_Extension_Summary();
-            $summary->transferFromDOM($child);
-            $this->_summary = $summary;
-            break;
-        case $this->lookupNamespace('app') . ':' . 'control':
-            $control = new Zend_Gdata_App_Extension_Control();
-            $control->transferFromDOM($child);
-            $this->_control = $control;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'etag':
-            // ETags are special, since they can be conveyed by either the
-            // HTTP ETag header or as an XML attribute.
-            $etag = $attribute->nodeValue;
-            if ($this->_etag === null) {
-                $this->_etag = $etag;
-            }
-            elseif ($this->_etag != $etag) {
-                require_once('Zend/Gdata/App/IOException.php');
-                throw new Zend_Gdata_App_IOException("ETag mismatch");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-            break;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif.php b/airtime_mvc/library/Zend/Gdata/Exif.php
deleted file mode 100644
index b333e88f8..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exif.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * Service class for interacting with the services which use the EXIF extensions
- * @link http://code.google.com/apis/picasaweb/reference.html#exif_reference
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif extends Zend_Gdata
-{
-
-    /**
-     * Namespaces used for Zend_Gdata_Exif
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('exif', 'http://schemas.google.com/photos/exif/2007', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_Exif object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Exif');
-        $this->registerPackage('Zend_Gdata_Exif_Extension');
-        parent::__construct($client, $applicationId);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Entry.php b/airtime_mvc/library/Zend/Gdata/Exif/Entry.php
deleted file mode 100644
index 5f5afece4..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Entry.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Tags
- */
-require_once 'Zend/Gdata/Exif/Extension/Tags.php';
-
-/**
- * An Atom entry containing EXIF metadata.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Entry extends Zend_Gdata_Entry
-{
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Exif_Entry';
-
-    /**
-     * The tags that belong to the Exif group.
-     *
-     * @var string
-     */
-    protected $_tags = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_tags != null) {
-            $element->appendChild($this->_tags->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('exif') . ':' . 'tags':
-            $tags = new Zend_Gdata_Exif_Extension_Tags();
-            $tags->transferFromDOM($child);
-            $this->_tags = $tags;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Retrieve the tags for this entry.
-     *
-     * @see setTags
-     * @return Zend_Gdata_Exif_Extension_Tags The requested object
-     *              or null if not set.
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Set the tags property for this entry. This property contains
-     * various Exif data.
-     *
-     * This corresponds to the <exif:tags> property in the Google Data
-     * protocol.
-     *
-     * @param Zend_Gdata_Exif_Extension_Tags $value The desired value
-     *              this element, or null to unset.
-     * @return Zend_Gdata_Exif_Entry Provides a fluent interface
-     */
-    public function setTags($value)
-    {
-        $this->_tags = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Distance.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Distance.php
deleted file mode 100644
index 1aaffc4e5..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Distance.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Distance.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:distance element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Distance extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'distance';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Distance object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Exposure.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Exposure.php
deleted file mode 100644
index d894ab9e3..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Exposure.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exposure.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:exposure element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Exposure extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'exposure';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Exposure object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/FStop.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/FStop.php
deleted file mode 100644
index 30741e23c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/FStop.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FStop.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:fStop element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_FStop extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'fstop';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_FStop object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Flash.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Flash.php
deleted file mode 100644
index c7386a947..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Flash.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Flash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:flash element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Flash extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'flash';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Flash object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/FocalLength.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/FocalLength.php
deleted file mode 100644
index 144860050..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/FocalLength.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FocalLength.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:focalLength element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_FocalLength extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'focallength';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_FocalLength object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php
deleted file mode 100644
index 4518934be..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ImageUniqueId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:imageUniqueId element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_ImageUniqueId extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'imageUniqueID';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_ImageUniqueId object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Iso.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Iso.php
deleted file mode 100644
index 11a59ac60..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Iso.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Iso.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:iso element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Iso extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'iso';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Iso object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Make.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Make.php
deleted file mode 100644
index b6e8b09d6..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Make.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Make.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:make element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Make extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'make';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Make object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Model.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Model.php
deleted file mode 100644
index 7e388a71e..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Model.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Model.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:model element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Model extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'model';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Model object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Tags.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Tags.php
deleted file mode 100644
index 13cba3f6f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Tags.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tags.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Distance
- */
-require_once 'Zend/Gdata/Exif/Extension/Distance.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Exposure
- */
-require_once 'Zend/Gdata/Exif/Extension/Exposure.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Flash
- */
-require_once 'Zend/Gdata/Exif/Extension/Flash.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_FocalLength
- */
-require_once 'Zend/Gdata/Exif/Extension/FocalLength.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_FStop
- */
-require_once 'Zend/Gdata/Exif/Extension/FStop.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_ImageUniqueId
- */
-require_once 'Zend/Gdata/Exif/Extension/ImageUniqueId.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Iso
- */
-require_once 'Zend/Gdata/Exif/Extension/Iso.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Make
- */
-require_once 'Zend/Gdata/Exif/Extension/Make.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Model
- */
-require_once 'Zend/Gdata/Exif/Extension/Model.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Time
- */
-require_once 'Zend/Gdata/Exif/Extension/Time.php';
-
-/**
- * Represents the exif:tags element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Tags extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'tags';
-
-    /**
-     * exif:distance value
-     *
-     * @var Zend_Gdata_Exif_Extension_Distance
-     */
-    protected $_distance = null;
-
-    /**
-     * exif:exposure value
-     *
-     * @var Zend_Gdata_Exif_Extension_Exposure
-     */
-    protected $_exposure = null;
-
-    /**
-     * exif:flash value
-     *
-     * @var Zend_Gdata_Exif_Extension_Flash
-     */
-    protected $_flash = null;
-
-    /**
-     * exif:focalLength value
-     *
-     * @var Zend_Gdata_Exif_Extension_FocalLength
-     */
-    protected $_focalLength = null;
-
-    /**
-     * exif:fStop value
-     *
-     * @var Zend_Gdata_Exif_Extension_FStop
-     */
-    protected $_fStop = null;
-
-    /**
-     * exif:imageUniqueID value
-     *
-     * @var Zend_Gdata_Exif_Extension_ImageUniqueId
-     */
-    protected $_imageUniqueId = null;
-
-    /**
-     * exif:iso value
-     *
-     * @var Zend_Gdata_Exif_Extension_Iso
-     */
-    protected $_iso = null;
-
-    /**
-     * exif:make value
-     *
-     * @var Zend_Gdata_Exif_Extension_Make
-     */
-    protected $_make = null;
-
-    /**
-     * exif:model value
-     *
-     * @var Zend_Gdata_Exif_Extension_Model
-     */
-    protected $_model = null;
-
-    /**
-     * exif:time value
-     *
-     * @var Zend_Gdata_Exif_Extension_Time
-     */
-    protected $_time = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Tags object.
-     *
-     * @param Zend_Gdata_Exif_Extension_Distance $distance (optional) The exif:distance
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Exposure $exposure (optional) The exif:exposure
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Flash $flash (optional) The exif:flash
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_FocalLength$focalLength (optional) The exif:focallength
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_FStop $fStop (optional) The exif:fstop
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_ImageUniqueId $imageUniqueId (optional) The exif:imageUniqueID
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Iso $iso (optional) The exif:iso
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Make $make (optional) The exif:make
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Model $model (optional) The exif:model
-     *          value to be set in the constructed object.
-     * @param Zend_Gdata_Exif_Extension_Time $time (optional) The exif:time
-     *          value to be set in the constructed object.
-     */
-    public function __construct($distance = null, $exposure = null,
-            $flash = null, $focalLength = null, $fStop = null,
-            $imageUniqueId = null, $iso = null, $make = null,
-            $model = null, $time = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setDistance($distance);
-        $this->setExposure($exposure);
-        $this->setFlash($flash);
-        $this->setFocalLength($focalLength);
-        $this->setFStop($fStop);
-        $this->setImageUniqueId($imageUniqueId);
-        $this->setIso($iso);
-        $this->setMake($make);
-        $this->setModel($model);
-        $this->setTime($time);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_distance !== null) {
-            $element->appendChild($this->_distance->getDOM($element->ownerDocument));
-        }
-        if ($this->_exposure !== null) {
-            $element->appendChild($this->_exposure->getDOM($element->ownerDocument));
-        }
-        if ($this->_flash !== null) {
-            $element->appendChild($this->_flash->getDOM($element->ownerDocument));
-        }
-        if ($this->_focalLength !== null) {
-            $element->appendChild($this->_focalLength->getDOM($element->ownerDocument));
-        }
-        if ($this->_fStop !== null) {
-            $element->appendChild($this->_fStop->getDOM($element->ownerDocument));
-        }
-        if ($this->_imageUniqueId !== null) {
-            $element->appendChild($this->_imageUniqueId->getDOM($element->ownerDocument));
-        }
-        if ($this->_iso !== null) {
-            $element->appendChild($this->_iso->getDOM($element->ownerDocument));
-        }
-        if ($this->_make !== null) {
-            $element->appendChild($this->_make->getDOM($element->ownerDocument));
-        }
-        if ($this->_model !== null) {
-            $element->appendChild($this->_model->getDOM($element->ownerDocument));
-        }
-        if ($this->_time !== null) {
-            $element->appendChild($this->_time->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('exif') . ':' . 'distance';
-                $distance = new Zend_Gdata_Exif_Extension_Distance();
-                $distance->transferFromDOM($child);
-                $this->_distance = $distance;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'exposure';
-                $exposure = new Zend_Gdata_Exif_Extension_Exposure();
-                $exposure->transferFromDOM($child);
-                $this->_exposure = $exposure;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'flash';
-                $flash = new Zend_Gdata_Exif_Extension_Flash();
-                $flash->transferFromDOM($child);
-                $this->_flash = $flash;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'focallength';
-                $focalLength = new Zend_Gdata_Exif_Extension_FocalLength();
-                $focalLength->transferFromDOM($child);
-                $this->_focalLength = $focalLength;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'fstop';
-                $fStop = new Zend_Gdata_Exif_Extension_FStop();
-                $fStop->transferFromDOM($child);
-                $this->_fStop = $fStop;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'imageUniqueID';
-                $imageUniqueId = new Zend_Gdata_Exif_Extension_ImageUniqueId();
-                $imageUniqueId->transferFromDOM($child);
-                $this->_imageUniqueId = $imageUniqueId;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'iso';
-                $iso = new Zend_Gdata_Exif_Extension_Iso();
-                $iso->transferFromDOM($child);
-                $this->_iso = $iso;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'make';
-                $make = new Zend_Gdata_Exif_Extension_Make();
-                $make->transferFromDOM($child);
-                $this->_make = $make;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'model';
-                $model = new Zend_Gdata_Exif_Extension_Model();
-                $model->transferFromDOM($child);
-                $this->_model = $model;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'time';
-                $time = new Zend_Gdata_Exif_Extension_Time();
-                $time->transferFromDOM($child);
-                $this->_time = $time;
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's distance attribute.
-     *
-     * @see setDistance
-     * @return Zend_Gdata_Exif_Extension_Distance The requested attribute.
-     */
-    public function getDistance()
-    {
-        return $this->_distance;
-    }
-
-    /**
-     * Set the value for this element's distance attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Distance $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setDistance($value)
-    {
-        $this->_distance = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's exposure attribute.
-     *
-     * @see setExposure
-     * @return Zend_Gdata_Exif_Extension_Exposure The requested attribute.
-     */
-    public function getExposure()
-    {
-        return $this->_exposure;
-    }
-
-    /**
-     * Set the value for this element's exposure attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Exposure $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setExposure($value)
-    {
-        $this->_exposure = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's flash attribute.
-     *
-     * @see setFlash
-     * @return Zend_Gdata_Exif_Extension_Flash The requested attribute.
-     */
-    public function getFlash()
-    {
-        return $this->_flash;
-    }
-
-    /**
-     * Set the value for this element's flash attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Flash $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setFlash($value)
-    {
-        $this->_flash = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's name attribute.
-     *
-     * @see setFocalLength
-     * @return Zend_Gdata_Exif_Extension_FocalLength The requested attribute.
-     */
-    public function getFocalLength()
-    {
-        return $this->_focalLength;
-    }
-
-    /**
-     * Set the value for this element's focalLength attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_FocalLength $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setFocalLength($value)
-    {
-        $this->_focalLength = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's fStop attribute.
-     *
-     * @see setFStop
-     * @return Zend_Gdata_Exif_Extension_FStop The requested attribute.
-     */
-    public function getFStop()
-    {
-        return $this->_fStop;
-    }
-
-    /**
-     * Set the value for this element's fStop attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_FStop $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setFStop($value)
-    {
-        $this->_fStop = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's imageUniqueId attribute.
-     *
-     * @see setImageUniqueId
-     * @return Zend_Gdata_Exif_Extension_ImageUniqueId The requested attribute.
-     */
-    public function getImageUniqueId()
-    {
-        return $this->_imageUniqueId;
-    }
-
-    /**
-     * Set the value for this element's imageUniqueId attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_ImageUniqueId $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setImageUniqueId($value)
-    {
-        $this->_imageUniqueId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's iso attribute.
-     *
-     * @see setIso
-     * @return Zend_Gdata_Exif_Extension_Iso The requested attribute.
-     */
-    public function getIso()
-    {
-        return $this->_iso;
-    }
-
-    /**
-     * Set the value for this element's iso attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Iso $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setIso($value)
-    {
-        $this->_iso = $value;
-        return $this;
-    }
-    /**
-     * Get the value for this element's make attribute.
-     *
-     * @see setMake
-     * @return Zend_Gdata_Exif_Extension_Make The requested attribute.
-     */
-    public function getMake()
-    {
-        return $this->_make;
-    }
-
-    /**
-     * Set the value for this element's make attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Make $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setMake($value)
-    {
-        $this->_make = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's model attribute.
-     *
-     * @see setModel
-     * @return Zend_Gdata_Exif_Extension_Model The requested attribute.
-     */
-    public function getModel()
-    {
-        return $this->_model;
-    }
-
-    /**
-     * Set the value for this element's model attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Model $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setModel($value)
-    {
-        $this->_model = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's time attribute.
-     *
-     * @see setTime
-     * @return Zend_Gdata_Exif_Extension_Time The requested attribute.
-     */
-    public function getTime()
-    {
-        return $this->_time;
-    }
-
-    /**
-     * Set the value for this element's time attribute.
-     *
-     * @param Zend_Gdata_Exif_Extension_Time $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags Provides a fluent interface
-     */
-    public function setTime($value)
-    {
-        $this->_time = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Time.php b/airtime_mvc/library/Zend/Gdata/Exif/Extension/Time.php
deleted file mode 100644
index f411696e0..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Extension/Time.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * Represents the exif:time element used by the Gdata Exif extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Extension_Time extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'exif';
-    protected $_rootElement = 'time';
-
-    /**
-     * Constructs a new Zend_Gdata_Exif_Extension_Time object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Exif/Feed.php b/airtime_mvc/library/Zend/Gdata/Exif/Feed.php
deleted file mode 100644
index d72b990a1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Exif/Feed.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_eed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Exif
- */
-require_once 'Zend/Gdata/Exif.php';
-
-/**
- * @see Zend_Gdata_Exif_Entry
- */
-require_once 'Zend/Gdata/Exif/Entry.php';
-
-/**
- * Feed for Gdata EXIF data entries.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Exif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Exif_Feed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Exif_Entry';
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Exif::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension.php b/airtime_mvc/library/Zend/Gdata/Extension.php
deleted file mode 100644
index 73491dbe8..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents a Gdata extension
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootNamespace = 'gd';
-
-    public function __construct()
-    {
-        /* NOTE: namespaces must be registered before calling parent */
-        $this->registerNamespace('gd',
-                'http://schemas.google.com/g/2005');
-        $this->registerNamespace('openSearch',
-                'http://a9.com/-/spec/opensearchrss/1.0/', 1, 0);
-        $this->registerNamespace('openSearch',
-                'http://a9.com/-/spec/opensearch/1.1/', 2, 0);
-        $this->registerNamespace('rss',
-                'http://blogs.law.harvard.edu/tech/rss');
-
-        parent::__construct();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/AttendeeStatus.php b/airtime_mvc/library/Zend/Gdata/Extension/AttendeeStatus.php
deleted file mode 100644
index b1a8b2ea1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/AttendeeStatus.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AttendeeStatus.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent an attendee's status (gd:attendeeStatus)
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_AttendeeStatus extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'attendeeStatus';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_AttendeeStatus object.
-     * @param string $value (optional) Visibility value as URI.
-     */
-    public function __construct($value = null)
-    {
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Visibility The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/AttendeeType.php b/airtime_mvc/library/Zend/Gdata/Extension/AttendeeType.php
deleted file mode 100644
index d1a5384d5..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/AttendeeType.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AttendeeType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent an attendee's type (gd:attendeeType)
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_AttendeeType extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'attendeeType';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_AttendeeType object.
-     * @param string $value (optional) This entry's 'value' attribute.
-     */
-    public function __construct($value = null)
-    {
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Visibility The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Comments.php b/airtime_mvc/library/Zend/Gdata/Extension/Comments.php
deleted file mode 100644
index fd5602727..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Comments.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Comments.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * Represents the gd:comments element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Comments extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'comments';
-    protected $_rel = null;
-    protected $_feedLink = null;
-
-    public function __construct($rel = null, $feedLink = null)
-    {
-        parent::__construct();
-        $this->_rel = $rel;
-        $this->_feedLink = $feedLink;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_feedLink !== null) {
-            $element->appendChild($this->_feedLink->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gd') . ':' . 'feedLink';
-                $feedLink = new Zend_Gdata_Extension_FeedLink();
-                $feedLink->transferFromDOM($child);
-                $this->_feedLink = $feedLink;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    public function getFeedLink()
-    {
-        return $this->_feedLink;
-    }
-
-    public function setFeedLink($value)
-    {
-        $this->_feedLink = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/EntryLink.php b/airtime_mvc/library/Zend/Gdata/Extension/EntryLink.php
deleted file mode 100644
index 8fc79f57a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/EntryLink.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EntryLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * Represents the gd:entryLink element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_EntryLink extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'entryLink';
-    protected $_href = null;
-    protected $_readOnly = null;
-    protected $_rel = null;
-    protected $_entry = null;
-
-    public function __construct($href = null, $rel = null,
-            $readOnly = null, $entry = null)
-    {
-        parent::__construct();
-        $this->_href = $href;
-        $this->_readOnly = $readOnly;
-        $this->_rel = $rel;
-        $this->_entry = $entry;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_href !== null) {
-            $element->setAttribute('href', $this->_href);
-        }
-        if ($this->_readOnly !== null) {
-            $element->setAttribute('readOnly', ($this->_readOnly ? "true" : "false"));
-        }
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_entry !== null) {
-            $element->appendChild($this->_entry->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('atom') . ':' . 'entry';
-                $entry = new Zend_Gdata_Entry();
-                $entry->transferFromDOM($child);
-                $this->_entry = $entry;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'href':
-            $this->_href = $attribute->nodeValue;
-            break;
-        case 'readOnly':
-            if ($attribute->nodeValue == "true") {
-                $this->_readOnly = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_readOnly = false;
-            }
-            else {
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getHref()
-    {
-        return $this->_href;
-    }
-
-    public function setHref($value)
-    {
-        $this->_href = $value;
-        return $this;
-    }
-
-    public function getReadOnly()
-    {
-        return $this->_readOnly;
-    }
-
-    public function setReadOnly($value)
-    {
-        $this->_readOnly = $value;
-        return $this;
-    }
-
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    public function getEntry()
-    {
-        return $this->_entry;
-    }
-
-    public function setEntry($value)
-    {
-        $this->_entry = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/EventStatus.php b/airtime_mvc/library/Zend/Gdata/Extension/EventStatus.php
deleted file mode 100644
index f6aa64882..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/EventStatus.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EventStatus.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gd:eventStatus element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_EventStatus extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'eventStatus';
-    protected $_value = null;
-
-    public function __construct($value = null)
-    {
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Visibility The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/ExtendedProperty.php b/airtime_mvc/library/Zend/Gdata/Extension/ExtendedProperty.php
deleted file mode 100644
index 9f40eb586..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/ExtendedProperty.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ExtendedProperty.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model for gd:extendedProperty element, used by some Gdata
- * services to implement arbitrary name/value pair storage
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_ExtendedProperty extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'extendedProperty';
-    protected $_name = null;
-    protected $_value = null;
-
-    public function __construct($name = null, $value = null)
-    {
-        parent::__construct();
-        $this->_name = $name;
-        $this->_value = $value;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_name !== null) {
-            $element->setAttribute('name', $this->_name);
-        }
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'name':
-            $this->_name = $attribute->nodeValue;
-            break;
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    public function __toString()
-    {
-        return $this->getName() . '=' . $this->getValue();
-    }
-
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/FeedLink.php b/airtime_mvc/library/Zend/Gdata/Extension/FeedLink.php
deleted file mode 100644
index 3551610b3..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/FeedLink.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FeedLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Represents the gd:feedLink element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_FeedLink extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'feedLink';
-    protected $_countHint = null;
-    protected $_href = null;
-    protected $_readOnly = null;
-    protected $_rel = null;
-    protected $_feed = null;
-
-    public function __construct($href = null, $rel = null,
-            $countHint = null, $readOnly = null, $feed = null)
-    {
-        parent::__construct();
-        $this->_countHint = $countHint;
-        $this->_href = $href;
-        $this->_readOnly = $readOnly;
-        $this->_rel = $rel;
-        $this->_feed = $feed;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_countHint !== null) {
-            $element->setAttribute('countHint', $this->_countHint);
-        }
-        if ($this->_href !== null) {
-            $element->setAttribute('href', $this->_href);
-        }
-        if ($this->_readOnly !== null) {
-            $element->setAttribute('readOnly', ($this->_readOnly ? "true" : "false"));
-        }
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_feed !== null) {
-            $element->appendChild($this->_feed->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('atom') . ':' . 'feed';
-                $feed = new Zend_Gdata_Feed();
-                $feed->transferFromDOM($child);
-                $this->_feed = $feed;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'countHint':
-            $this->_countHint = $attribute->nodeValue;
-            break;
-        case 'href':
-            $this->_href = $attribute->nodeValue;
-            break;
-        case 'readOnly':
-            if ($attribute->nodeValue == "true") {
-                $this->_readOnly = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_readOnly = false;
-            }
-            else {
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getHref()
-    {
-        return $this->_href;
-    }
-
-    public function setHref($value)
-    {
-        $this->_href = $value;
-        return $this;
-    }
-
-    public function getReadOnly()
-    {
-        return $this->_readOnly;
-    }
-
-    public function setReadOnly($value)
-    {
-        $this->_readOnly = $value;
-        return $this;
-    }
-
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    public function getFeed()
-    {
-        return $this->_feed;
-    }
-
-    public function setFeed($value)
-    {
-        $this->_feed = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
deleted file mode 100644
index 210e672fa..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenSearchItemsPerPage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the openSearch:itemsPerPage element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_OpenSearchItemsPerPage extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'itemsPerPage';
-    protected $_rootNamespace = 'openSearch';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchStartIndex.php b/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchStartIndex.php
deleted file mode 100644
index 9f1ecad29..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchStartIndex.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenSearchStartIndex.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the openSeach:startIndex element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_OpenSearchStartIndex extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'startIndex';
-    protected $_rootNamespace = 'openSearch';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchTotalResults.php b/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchTotalResults.php
deleted file mode 100644
index b11d6ad59..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/OpenSearchTotalResults.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenSearchTotalResults.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the openSearch:totalResults element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_OpenSearchTotalResults extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'totalResults';
-    protected $_rootNamespace = 'openSearch';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/OriginalEvent.php b/airtime_mvc/library/Zend/Gdata/Extension/OriginalEvent.php
deleted file mode 100644
index ef665c072..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/OriginalEvent.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OriginalEvent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_When
- */
-require_once 'Zend/Gdata/Extension/When.php';
-
-/**
- * Represents the gd:originalEvent element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_OriginalEvent extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'originalEvent';
-    protected $_id = null;
-    protected $_href = null;
-    protected $_when = null;
-
-    public function __construct($id = null, $href = null, $when = null)
-    {
-        parent::__construct();
-        $this->_id = $id;
-        $this->_href = $href;
-        $this->_when = $when;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_id !== null) {
-            $element->setAttribute('id', $this->_id);
-        }
-        if ($this->_href !== null) {
-            $element->setAttribute('href', $this->_href);
-        }
-        if ($this->_when !== null) {
-            $element->appendChild($this->_when->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'id':
-            $this->_id = $attribute->nodeValue;
-            break;
-        case 'href':
-            $this->_href = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gd') . ':' . 'when';
-                $when = new Zend_Gdata_Extension_When();
-                $when->transferFromDOM($child);
-                $this->_when = $when;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    public function setId($value)
-    {
-        $this->_id = $value;
-        return $this;
-    }
-
-    public function getHref()
-    {
-        return $this->_href;
-    }
-
-    public function setHref($value)
-    {
-        $this->_href = $value;
-        return $this;
-    }
-
-    public function getWhen()
-    {
-        return $this->_when;
-    }
-
-    public function setWhen($value)
-    {
-        $this->_when = $value;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Rating.php b/airtime_mvc/library/Zend/Gdata/Extension/Rating.php
deleted file mode 100644
index c71d9ac0c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Rating.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rating.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Implements the gd:rating element
- *
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Rating extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'rating';
-    protected $_min = null;
-    protected $_max = null;
-    protected $_numRaters = null;
-    protected $_average = null;
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_Rating object.
-     *
-     * @param integer $average (optional) Average rating.
-     * @param integer $min (optional) Minimum rating.
-     * @param integer $max (optional) Maximum rating.
-     * @param integer $numRaters (optional) Number of raters.
-     * @param integer $value (optional) The value of the rating.
-     */
-    public function __construct($average = null, $min = null,
-            $max = null, $numRaters = null, $value = null)
-    {
-        parent::__construct();
-        $this->_average = $average;
-        $this->_min = $min;
-        $this->_max = $max;
-        $this->_numRaters = $numRaters;
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_min !== null) {
-            $element->setAttribute('min', $this->_min);
-        }
-        if ($this->_max !== null) {
-            $element->setAttribute('max', $this->_max);
-        }
-        if ($this->_numRaters !== null) {
-            $element->setAttribute('numRaters', $this->_numRaters);
-        }
-        if ($this->_average !== null) {
-            $element->setAttribute('average', $this->_average);
-        }
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-            case 'min':
-                $this->_min = $attribute->nodeValue;
-                break;
-            case 'max':
-                $this->_max = $attribute->nodeValue;
-                break;
-            case 'numRaters':
-                $this->_numRaters = $attribute->nodeValue;
-                break;
-            case 'average':
-                $this->_average = $attribute->nodeValue;
-                break;
-            case 'value':
-                $this->_value = $attribute->nodeValue;
-            default:
-                parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's min attribute.
-     *
-     * @return integer The requested attribute.
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Set the value for this element's min attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Rating The element being modified.
-     */
-    public function setMin($value)
-    {
-        $this->_min = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's numRaters attribute.
-     *
-     * @return integer The requested attribute.
-     */
-    public function getNumRaters()
-    {
-        return $this->_numRaters;
-    }
-
-    /**
-     * Set the value for this element's numRaters attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Rating The element being modified.
-     */
-    public function setNumRaters($value)
-    {
-        $this->_numRaters = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's average attribute.
-     *
-     * @return integer The requested attribute.
-     */
-    public function getAverage()
-    {
-        return $this->_average;
-    }
-
-    /**
-     * Set the value for this element's average attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Rating The element being modified.
-     */
-    public function setAverage($value)
-    {
-        $this->_average = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's max attribute.
-     *
-     * @return integer The requested attribute.
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Set the value for this element's max attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Rating The element being modified.
-     */
-    public function setMax($value)
-    {
-        $this->_max = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's value attribute.
-     *
-     * @return integer The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's value attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Rating The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Recurrence.php b/airtime_mvc/library/Zend/Gdata/Extension/Recurrence.php
deleted file mode 100644
index b08d41d7a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Recurrence.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Recurrence.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the gd:recurrence element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Recurrence extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'recurrence';
-
-    public function __construct($text = null)
-    {
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/RecurrenceException.php b/airtime_mvc/library/Zend/Gdata/Extension/RecurrenceException.php
deleted file mode 100644
index 6433680e0..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/RecurrenceException.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RecurrenceException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_EntryLink
- */
-require_once 'Zend/Gdata/Extension/EntryLink.php';
-
-/**
- * @see Zend_Gdata_Extension_OriginalEvent
- */
-require_once 'Zend/Gdata/Extension/OriginalEvent.php';
-
-/**
- * Data model class to represent an entry's recurrenceException
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_RecurrenceException extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'recurrenceException';
-    protected $_specialized = null;
-    protected $_entryLink = null;
-    protected $_originalEvent = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_RecurrenceException object.
-     * @param bool $specialized (optional) Whether this is a specialized exception or not.
-     * @param Zend_Gdata_EntryLink (optional) An Event entry with details about the exception.
-     * @param Zend_Gdata_OriginalEvent (optional) The origianl recurrent event this is an exeption to.
-     */
-    public function __construct($specialized = null, $entryLink = null,
-            $originalEvent = null)
-    {
-        parent::__construct();
-        $this->_specialized = $specialized;
-        $this->_entryLink = $entryLink;
-        $this->_originalEvent = $originalEvent;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_specialized !== null) {
-            $element->setAttribute('specialized', ($this->_specialized ? "true" : "false"));
-        }
-        if ($this->_entryLink !== null) {
-            $element->appendChild($this->_entryLink->getDOM($element->ownerDocument));
-        }
-        if ($this->_originalEvent !== null) {
-            $element->appendChild($this->_originalEvent->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'specialized':
-            if ($attribute->nodeValue == "true") {
-                $this->_specialized = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_specialized = false;
-            }
-            else {
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gd') . ':' . 'entryLink':
-            $entryLink = new Zend_Gdata_Extension_EntryLink();
-            $entryLink->transferFromDOM($child);
-            $this->_entryLink = $entryLink;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'originalEvent':
-            $originalEvent = new Zend_Gdata_Extension_OriginalEvent();
-            $originalEvent->transferFromDOM($child);
-            $this->_originalEvent = $originalEvent;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Get the value for this element's Specialized attribute.
-     *
-     * @return bool The requested attribute.
-     */
-    public function getSpecialized()
-    {
-        return $this->_specialized;
-    }
-
-    /**
-     * Set the value for this element's Specialized attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_RecurrenceException The element being modified.
-     */
-    public function setSpecialized($value)
-    {
-        $this->_specialized = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's EntryLink attribute.
-     *
-     * @return Zend_Gdata_Extension_EntryLink The requested attribute.
-     */
-    public function getEntryLink()
-    {
-        return $this->_entryLink;
-    }
-
-    /**
-     * Set the value for this element's EntryLink attribute.
-     *
-     * @param Zend_Gdata_Extension_EntryLink $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_RecurrenceException The element being modified.
-     */
-    public function setEntryLink($value)
-    {
-        $this->_entryLink = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's Specialized attribute.
-     *
-     * @return Zend_Gdata_Extension_OriginalEvent The requested attribute.
-     */
-    public function getOriginalEvent()
-    {
-        return $this->_originalEvent;
-    }
-
-    /**
-     * Set the value for this element's Specialized attribute.
-     *
-     * @param Zend_Gdata_Extension_OriginalEvent $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_RecurrenceException The element being modified.
-     */
-    public function setOriginalEvent($value)
-    {
-        $this->_originalEvent = $value;
-        return $this;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Reminder.php b/airtime_mvc/library/Zend/Gdata/Extension/Reminder.php
deleted file mode 100644
index c5bfa94c2..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Reminder.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reminder.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Implements the gd:reminder element used to set/retrieve notifications
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'reminder';
-    protected $_absoluteTime = null;
-    protected $_method = null;
-    protected $_days = null;
-    protected $_hours = null;
-    protected $_minutes = null;
-
-    public function __construct($absoluteTime = null, $method = null, $days = null,
-            $hours = null, $minutes = null)
-    {
-        parent::__construct();
-        $this->_absoluteTime = $absoluteTime;
-        $this->_method = $method;
-        $this->_days = $days;
-        $this->_hours = $hours;
-        $this->_minutes = $minutes;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_absoluteTime !== null) {
-            $element->setAttribute('absoluteTime', $this->_absoluteTime);
-        }
-        if ($this->_method !== null) {
-            $element->setAttribute('method', $this->_method);
-        }
-        if ($this->_days !== null) {
-            $element->setAttribute('days', $this->_days);
-        }
-        if ($this->_hours !== null) {
-            $element->setAttribute('hours', $this->_hours);
-        }
-        if ($this->_minutes !== null) {
-            $element->setAttribute('minutes', $this->_minutes);
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-            case 'absoluteTime':
-                $this->_absoluteTime = $attribute->nodeValue;
-                break;
-            case 'method':
-                $this->_method = $attribute->nodeValue;
-                break;
-            case 'days':
-                $this->_days = $attribute->nodeValue;
-                break;
-            case 'hours':
-                $this->_hours = $attribute->nodeValue;
-                break;
-            case 'minutes':
-                $this->_minutes = $attribute->nodeValue;
-                break;
-            default:
-                parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    public function __toString()
-    {
-        $s = '';
-        if ($this->_absoluteTime)
-            $s = " at " . $this->_absoluteTime;
-        else if ($this->_days)
-            $s = " in " . $this->_days . " days";
-        else if ($this->_hours)
-            $s = " in " . $this->_hours . " hours";
-        else if ($this->_minutes)
-            $s = " in " . $this->_minutes . " minutes";
-        return $this->_method . $s;
-    }
-
-    public function getAbsoluteTime()
-    {
-        return $this->_absoluteTime;
-    }
-
-    public function setAbsoluteTime($value)
-    {
-        $this->_absoluteTime = $value;
-        return $this;
-    }
-
-    public function getDays()
-    {
-        return $this->_days;
-    }
-
-    public function setDays($value)
-    {
-        $this->_days = $value;
-        return $this;
-    }
-    public function getHours()
-    {
-        return $this->_hours;
-    }
-
-    public function setHours($value)
-    {
-        $this->_hours = $value;
-        return $this;
-    }
-
-    public function getMinutes()
-    {
-        return $this->_minutes;
-    }
-
-    public function setMinutes($value)
-    {
-        $this->_minutes = $value;
-        return $this;
-    }
-
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-
-    public function setMethod($value)
-    {
-        $this->_method = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Transparency.php b/airtime_mvc/library/Zend/Gdata/Extension/Transparency.php
deleted file mode 100644
index 55f4763d8..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Transparency.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Transparency.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent an entry's transparency
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Transparency extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'transparency';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_Transparency object.
-     * @param bool $value (optional) Transparency value as URI
-     */
-    public function __construct($value = null)
-    {
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return bool The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Transparency The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Visibility.php b/airtime_mvc/library/Zend/Gdata/Extension/Visibility.php
deleted file mode 100644
index eac441471..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Visibility.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Visibility.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent an entry's visibility
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Visibility extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'visibility';
-    protected $_value = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_Visibility object.
-     * @param bool $value (optional) Visibility value as URI.
-     */
-    public function __construct($value = null)
-    {
-        parent::__construct();
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_value !== null) {
-            $element->setAttribute('value', $this->_value);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'value':
-            $this->_value = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's Value attribute.
-     *
-     * @return bool The requested attribute.
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the value for this element's Value attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Visibility The element being modified.
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/When.php b/airtime_mvc/library/Zend/Gdata/Extension/When.php
deleted file mode 100644
index 13c568889..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/When.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: When.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_Reminder
- */
-require_once 'Zend/Gdata/Extension/Reminder.php';
-
-/**
- * Represents the gd:when element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_When extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'when';
-    protected $_reminders = array();
-    protected $_startTime = null;
-    protected $_valueString = null;
-    protected $_endTime = null;
-
-    public function __construct($startTime = null, $endTime = null,
-            $valueString = null, $reminders = null)
-    {
-        parent::__construct();
-        $this->_startTime = $startTime;
-        $this->_endTime = $endTime;
-        $this->_valueString = $valueString;
-        $this->_reminders = $reminders;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_startTime !== null) {
-            $element->setAttribute('startTime', $this->_startTime);
-        }
-        if ($this->_endTime !== null) {
-            $element->setAttribute('endTime', $this->_endTime);
-        }
-        if ($this->_valueString !== null) {
-            $element->setAttribute('valueString', $this->_valueString);
-        }
-        if ($this->_reminders !== null) {
-            foreach ($this->_reminders as $reminder) {
-                $element->appendChild(
-                        $reminder->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gd') . ':' . 'reminder';
-                $reminder = new Zend_Gdata_Extension_Reminder();
-                $reminder->transferFromDOM($child);
-                $this->_reminders[] = $reminder;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-            case 'startTime':
-                $this->_startTime = $attribute->nodeValue;
-                break;
-            case 'endTime':
-                $this->_endTime = $attribute->nodeValue;
-                break;
-            case 'valueString':
-                $this->_valueString = $attribute->nodeValue;
-                break;
-            default:
-                parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    public function __toString()
-    {
-        if ($this->_valueString)
-            return $this->_valueString;
-        else {
-            return 'Starts: ' . $this->getStartTime() . ' ' .
-                   'Ends: ' .  $this->getEndTime();
-        }
-    }
-
-    public function getStartTime()
-    {
-        return $this->_startTime;
-    }
-
-    public function setStartTime($value)
-    {
-        $this->_startTime = $value;
-        return $this;
-    }
-
-    public function getEndTime()
-    {
-        return $this->_endTime;
-    }
-
-    public function setEndTime($value)
-    {
-        $this->_endTime = $value;
-        return $this;
-    }
-
-    public function getValueString()
-    {
-        return $this->_valueString;
-    }
-
-    public function setValueString($value)
-    {
-        $this->_valueString = $value;
-        return $this;
-    }
-
-    public function getReminders()
-    {
-        return $this->_reminders;
-    }
-
-    public function setReminders($value)
-    {
-        $this->_reminders = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Where.php b/airtime_mvc/library/Zend/Gdata/Extension/Where.php
deleted file mode 100644
index 6821fec78..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Where.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Where.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_EntryLink
- */
-require_once 'Zend/Gdata/Extension/EntryLink.php';
-
-/**
- * Data model class to represent a location (gd:where element)
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Where extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'where';
-    protected $_label = null;
-    protected $_rel = null;
-    protected $_valueString = null;
-    protected $_entryLink = null;
-
-    public function __construct($valueString = null, $label = null, $rel = null, $entryLink = null)
-    {
-        parent::__construct();
-        $this->_valueString = $valueString;
-        $this->_label = $label;
-        $this->_rel = $rel;
-        $this->_entryLink = $entryLink;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_label !== null) {
-            $element->setAttribute('label', $this->_label);
-        }
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_valueString !== null) {
-            $element->setAttribute('valueString', $this->_valueString);
-        }
-        if ($this->entryLink !== null) {
-            $element->appendChild($this->_entryLink->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'label':
-            $this->_label = $attribute->nodeValue;
-            break;
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        case 'valueString':
-            $this->_valueString = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gd') . ':' . 'entryLink':
-            $entryLink = new Zend_Gdata_Extension_EntryLink();
-            $entryLink->transferFromDOM($child);
-            $this->_entryLink = $entryLink;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function __toString()
-    {
-        if ($this->_valueString != null) {
-            return $this->_valueString;
-        }
-        else {
-            return parent::__toString();
-        }
-    }
-
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    public function setLabel($value)
-    {
-        $this->_label = $value;
-        return $this;
-    }
-
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    public function getValueString()
-    {
-        return $this->_valueString;
-    }
-
-    public function setValueString($value)
-    {
-        $this->_valueString = $value;
-        return $this;
-    }
-
-    public function getEntryLink()
-    {
-        return $this->_entryLink;
-    }
-
-    public function setEntryLink($value)
-    {
-        $this->_entryLink = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Extension/Who.php b/airtime_mvc/library/Zend/Gdata/Extension/Who.php
deleted file mode 100644
index 0586a9072..000000000
--- a/airtime_mvc/library/Zend/Gdata/Extension/Who.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Who.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_AttendeeStatus
- */
-require_once 'Zend/Gdata/Extension/AttendeeStatus.php';
-
-/**
- * @see Zend_Gdata_Extension_AttendeeType
- */
-require_once 'Zend/Gdata/Extension/AttendeeType.php';
-
-/**
- * @see Zend_Gdata_Extension_EntryLink
- */
-require_once 'Zend/Gdata/Extension/EntryLink.php';
-
-/**
- * Data model class to represent a participant
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Extension_Who extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'who';
-    protected $_email = null;
-    protected $_rel = null;
-    protected $_valueString = null;
-    protected $_attendeeStatus = null;
-    protected $_attendeeType = null;
-    protected $_entryLink = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Extension_Who object.
-     * @param string $email (optional) Email address.
-     * @param string $rel (optional) Relationship description.
-     * @param string $valueString (optional) Simple string describing this person.
-     * @param Zend_Gdata_Extension_AttendeeStatus $attendeeStatus (optional) The status of the attendee.
-     * @param Zend_Gdata_Extension_AttendeeType $attendeeType (optional) The type of the attendee.
-     * @param string $entryLink URL pointing to an associated entry (Contact kind) describing this person.
-     */
-    public function __construct($email = null, $rel = null, $valueString = null,
-        $attendeeStatus = null, $attendeeType = null, $entryLink = null)
-    {
-        parent::__construct();
-        $this->_email = $email;
-        $this->_rel = $rel;
-        $this->_valueString = $valueString;
-        $this->_attendeeStatus = $attendeeStatus;
-        $this->_attendeeType = $attendeeType;
-        $this->_entryLink = $entryLink;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_email !== null) {
-            $element->setAttribute('email', $this->_email);
-        }
-        if ($this->_rel !== null) {
-            $element->setAttribute('rel', $this->_rel);
-        }
-        if ($this->_valueString !== null) {
-            $element->setAttribute('valueString', $this->_valueString);
-        }
-        if ($this->_attendeeStatus !== null) {
-            $element->appendChild($this->_attendeeStatus->getDOM($element->ownerDocument));
-        }
-        if ($this->_attendeeType !== null) {
-            $element->appendChild($this->_attendeeType->getDOM($element->ownerDocument));
-        }
-        if ($this->_entryLink !== null) {
-            $element->appendChild($this->_entryLink->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'email':
-            $this->_email = $attribute->nodeValue;
-            break;
-        case 'rel':
-            $this->_rel = $attribute->nodeValue;
-            break;
-        case 'valueString':
-            $this->_valueString = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gd') . ':' . 'attendeeStatus':
-            $attendeeStatus = new Zend_Gdata_Extension_AttendeeStatus();
-            $attendeeStatus->transferFromDOM($child);
-            $this->_attendeeStatus = $attendeeStatus;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'attendeeType':
-            $attendeeType = new Zend_Gdata_Extension_AttendeeType();
-            $attendeeType->transferFromDOM($child);
-            $this->_attendeeType = $attendeeType;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'entryLink':
-            $entryLink = new Zend_Gdata_Extension_EntryLink();
-            $entryLink->transferFromDOM($child);
-            $this->_entryLink = $entryLink;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Retrieves a human readable string describing this attribute's value.
-     *
-     * @return string The attribute value.
-     */
-    public function __toString()
-    {
-        if ($this->_valueString != null) {
-            return $this->_valueString;
-        }
-        else {
-            return parent::__toString();
-        }
-    }
-
-    /**
-     * Get the value for this element's ValueString attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getValueString()
-    {
-        return $this->_valueString;
-    }
-
-    /**
-     * Set the value for this element's ValueString attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setValueString($value)
-    {
-        $this->_valueString = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's Email attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getEmail()
-    {
-        return $this->_email;
-    }
-
-    /**
-     * Set the value for this element's Email attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setEmail($value)
-    {
-        $this->_email = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's Rel attribute.
-     *
-     * @return string The requested attribute.
-     */
-    public function getRel()
-    {
-        return $this->_rel;
-    }
-
-    /**
-     * Set the value for this element's Rel attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setRel($value)
-    {
-        $this->_rel = $value;
-        return $this;
-    }
-
-    /**
-     * Get this entry's AttendeeStatus element.
-     *
-     * @return Zend_Gdata_Extension_AttendeeStatus The requested entry.
-     */
-    public function getAttendeeStatus()
-    {
-        return $this->_attendeeStatus;
-    }
-
-    /**
-     * Set the child's AttendeeStatus element.
-     *
-     * @param Zend_Gdata_Extension_AttendeeStatus $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setAttendeeStatus($value)
-    {
-        $this->_attendeeStatus = $value;
-        return $this;
-    }
-
-    /**
-     * Get this entry's AttendeeType element.
-     *
-     * @return Zend_Gdata_Extension_AttendeeType The requested entry.
-     */
-    public function getAttendeeType()
-    {
-        return $this->_attendeeType;
-    }
-
-    /**
-     * Set the child's AttendeeType element.
-     *
-     * @param Zend_Gdata_Extension_AttendeeType $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setAttendeeType($value)
-    {
-        $this->_attendeeType = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Feed.php b/airtime_mvc/library/Zend/Gdata/Feed.php
deleted file mode 100644
index 18d539162..000000000
--- a/airtime_mvc/library/Zend/Gdata/Feed.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_App_Feed
- */
-require_once 'Zend/Gdata/App/Feed.php';
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_OpenSearchTotalResults
- */
-require_once 'Zend/Gdata/Extension/OpenSearchTotalResults.php';
-
-/**
- * @see Zend_Gdata_Extension_OpenSearchStartIndex
- */
-require_once 'Zend/Gdata/Extension/OpenSearchStartIndex.php';
-
-/**
- * @see Zend_Gdata_Extension_OpenSearchItemsPerPage
- */
-require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php';
-
-/**
- * The Gdata flavor of an Atom Feed
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Feed extends Zend_Gdata_App_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Entry';
-
-    /**
-     * The openSearch:totalResults element
-     *
-     * @var Zend_Gdata_Extension_OpenSearchTotalResults|null
-     */
-    protected $_totalResults = null;
-
-    /**
-     * The openSearch:startIndex element
-     *
-     * @var Zend_Gdata_Extension_OpenSearchStartIndex|null
-     */
-    protected $_startIndex = null;
-
-    /**
-     * The openSearch:itemsPerPage element
-     *
-     * @var Zend_Gdata_Extension_OpenSearchItemsPerPage|null
-     */
-    protected $_itemsPerPage = null;
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_totalResults != null) {
-            $element->appendChild($this->_totalResults->getDOM($element->ownerDocument));
-        }
-        if ($this->_startIndex != null) {
-            $element->appendChild($this->_startIndex->getDOM($element->ownerDocument));
-        }
-        if ($this->_itemsPerPage != null) {
-            $element->appendChild($this->_itemsPerPage->getDOM($element->ownerDocument));
-        }
-
-        // ETags are special. We only support them in protocol >= 2.X.
-        // This will be duplicated by the HTTP ETag header.
-        if ($majorVersion >= 2) {
-            if ($this->_etag != null) {
-                $element->setAttributeNS($this->lookupNamespace('gd'),
-                                         'gd:etag',
-                                         $this->_etag);
-            }
-        }
-
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('openSearch') . ':' . 'totalResults':
-            $totalResults = new Zend_Gdata_Extension_OpenSearchTotalResults();
-            $totalResults->transferFromDOM($child);
-            $this->_totalResults = $totalResults;
-            break;
-        case $this->lookupNamespace('openSearch') . ':' . 'startIndex':
-            $startIndex = new Zend_Gdata_Extension_OpenSearchStartIndex();
-            $startIndex->transferFromDOM($child);
-            $this->_startIndex = $startIndex;
-            break;
-        case $this->lookupNamespace('openSearch') . ':' . 'itemsPerPage':
-            $itemsPerPage = new Zend_Gdata_Extension_OpenSearchItemsPerPage();
-            $itemsPerPage->transferFromDOM($child);
-            $this->_itemsPerPage = $itemsPerPage;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'etag':
-            // ETags are special, since they can be conveyed by either the
-            // HTTP ETag header or as an XML attribute.
-            $etag = $attribute->nodeValue;
-            if ($this->_etag === null) {
-                $this->_etag = $etag;
-            }
-            elseif ($this->_etag != $etag) {
-                require_once('Zend/Gdata/App/IOException.php');
-                throw new Zend_Gdata_App_IOException("ETag mismatch");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-            break;
-        }
-    }
-
-    /**
-     *  Set the value of the totalResults property.
-     *
-     * @param Zend_Gdata_Extension_OpenSearchTotalResults|null $value The
-     *        value of the totalResults property. Use null to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
-     */
-    function setTotalResults($value) {
-        $this->_totalResults = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the totalResults property.
-     *
-     * @return Zend_Gdata_Extension_OpenSearchTotalResults|null The value of
-     *         the totalResults property, or null if unset.
-     */
-    function getTotalResults() {
-        return $this->_totalResults;
-    }
-
-    /**
-     * Set the start index property for feed paging.
-     *
-     * @param Zend_Gdata_Extension_OpenSearchStartIndex|null $value The value
-     *        for the startIndex property. Use null to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
-     */
-    function setStartIndex($value) {
-        $this->_startIndex = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the startIndex property.
-     *
-     * @return Zend_Gdata_Extension_OpenSearchStartIndex|null The value of the
-     *         startIndex property, or null if unset.
-     */
-    function getStartIndex() {
-        return $this->_startIndex;
-    }
-
-    /**
-     * Set the itemsPerPage property.
-     *
-     * @param Zend_Gdata_Extension_OpenSearchItemsPerPage|null $value The
-     *        value for the itemsPerPage property. Use nul to unset.
-     * @return Zend_Gdata_Feed Provides a fluent interface.
-     */
-    function setItemsPerPage($value) {
-        $this->_itemsPerPage = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the itemsPerPage property.
-     *
-     * @return Zend_Gdata_Extension_OpenSearchItemsPerPage|null The value of
-     *         the itemsPerPage property, or null if unset.
-     */
-    function getItemsPerPage() {
-        return $this->_itemsPerPage;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps.php b/airtime_mvc/library/Zend/Gdata/Gapps.php
deleted file mode 100644
index d7c118edb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps.php
+++ /dev/null
@@ -1,1097 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gapps.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Gapps_UserFeed
- */
-require_once 'Zend/Gdata/Gapps/UserFeed.php';
-
-/**
- * @see Zend_Gdata_Gapps_NicknameFeed
- */
-require_once 'Zend/Gdata/Gapps/NicknameFeed.php';
-
-/**
- * @see Zend_Gdata_Gapps_EmailListFeed
- */
-require_once 'Zend/Gdata/Gapps/EmailListFeed.php';
-
-/**
- * @see Zend_Gdata_Gapps_EmailListRecipientFeed
- */
-require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php';
-
-
-/**
- * Service class for interacting with the Google Apps Provisioning API.
- *
- * Like other service classes in this module, this class provides access via
- * an HTTP client to Google servers for working with entries and feeds.
- *
- * Because of the nature of this API, all access must occur over an
- * authenticated connection.
- *
- * @link http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps extends Zend_Gdata
-{
-
-    const APPS_BASE_FEED_URI = 'https://apps-apis.google.com/a/feeds';
-    const AUTH_SERVICE_NAME = 'apps';
-
-    /**
-     * Path to user feeds on the Google Apps server.
-     */
-    const APPS_USER_PATH = '/user/2.0';
-
-    /**
-     * Path to nickname feeds on the Google Apps server.
-     */
-    const APPS_NICKNAME_PATH = '/nickname/2.0';
-
-    /**
-     * Path to email list feeds on the Google Apps server.
-     */
-    const APPS_EMAIL_LIST_PATH = '/emailList/2.0';
-
-    /**
-     * Path to email list recipient feeds on the Google Apps server.
-     */
-    const APPS_EMAIL_LIST_RECIPIENT_POSTFIX = '/recipient';
-
-    /**
-     * The domain which is being administered via the Provisioning API.
-     *
-     * @var string
-     */
-    protected $_domain = null;
-
-    /**
-     * Namespaces used for Zend_Gdata_Gapps
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('apps', 'http://schemas.google.com/apps/2006', 1, 0)
-    );
-
-    /**
-     * Create Gdata_Gapps object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google Apps servers.
-     * @param string $domain (optional) The Google Apps domain which is to be
-     *          accessed.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $domain = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Gapps');
-        $this->registerPackage('Zend_Gdata_Gapps_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-        $this->_domain = $domain;
-    }
-
-    /**
-     * Convert an exception to an ServiceException if an AppsForYourDomain
-     * XML document is contained within the original exception's HTTP
-     * response. If conversion fails, throw the original error.
-     *
-     * @param Zend_Gdata_Exception $e The exception to convert.
-     * @throws Zend_Gdata_Gapps_ServiceException
-     * @throws mixed
-     */
-    public static function throwServiceExceptionIfDetected($e) {
-        // Check to make sure that there actually response!
-        // This can happen if the connection dies before the request
-        // completes. (See ZF-5949)
-        $response = $e->getResponse();
-        if (!$response) {
-          require_once('Zend/Gdata/App/IOException.php');
-          throw new Zend_Gdata_App_IOException('No HTTP response received (possible connection failure)');
-        }
-
-        try {
-            // Check to see if there is an AppsForYourDomainErrors
-            // datastructure in the response. If so, convert it to
-            // an exception and throw it.
-            require_once 'Zend/Gdata/Gapps/ServiceException.php';
-            $error = new Zend_Gdata_Gapps_ServiceException();
-            $error->importFromString($response->getBody());
-            throw $error;
-        } catch (Zend_Gdata_App_Exception $e2) {
-            // Unable to convert the response to a ServiceException,
-            // most likely because the server didn't return an
-            // AppsForYourDomainErrors document. Throw the original
-            // exception.
-            throw $e;
-        }
-    }
-
-    /**
-     * Imports a feed located at $uri.
-     * This method overrides the default behavior of Zend_Gdata_App,
-     * providing support for Zend_Gdata_Gapps_ServiceException.
-     *
-     * @param  string $uri
-     * @param  Zend_Http_Client $client (optional) The client used for
-     *          communication
-     * @param  string $className (optional) The class which is used as the
-     *          return type
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     * @return Zend_Gdata_App_Feed
-     */
-    public static function import($uri, $client = null, $className='Zend_Gdata_App_Feed')
-    {
-        try {
-            return parent::import($uri, $client, $className);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            self::throwServiceExceptionIfDetected($e);
-        }
-    }
-
-    /**
-     * GET a URI using client object.
-     * This method overrides the default behavior of Zend_Gdata_App,
-     * providing support for Zend_Gdata_Gapps_ServiceException.
-     *
-     * @param string $uri GET URI
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     * @return Zend_Http_Response
-     */
-    public function get($uri, $extraHeaders = array())
-    {
-        try {
-            return parent::get($uri, $extraHeaders);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            self::throwServiceExceptionIfDetected($e);
-        }
-    }
-
-    /**
-     * POST data with client object.
-     * This method overrides the default behavior of Zend_Gdata_App,
-     * providing support for Zend_Gdata_Gapps_ServiceException.
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or XML to post
-     * @param string $uri (optional) POST URI
-     * @param integer $remainingRedirects (optional)
-     * @param string $contentType Content-type of the data
-     * @param array $extraHaders Extra headers to add tot he request
-     * @return Zend_Http_Response
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function post($data, $uri = null, $remainingRedirects = null,
-            $contentType = null, $extraHeaders = null)
-    {
-        try {
-            return parent::post($data, $uri, $remainingRedirects, $contentType, $extraHeaders);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            self::throwServiceExceptionIfDetected($e);
-        }
-    }
-
-    /**
-     * PUT data with client object
-     * This method overrides the default behavior of Zend_Gdata_App,
-     * providing support for Zend_Gdata_Gapps_ServiceException.
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or XML to post
-     * @param string $uri (optional) PUT URI
-     * @param integer $remainingRedirects (optional)
-     * @param string $contentType Content-type of the data
-     * @param array $extraHaders Extra headers to add tot he request
-     * @return Zend_Http_Response
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function put($data, $uri = null, $remainingRedirects = null,
-            $contentType = null, $extraHeaders = null)
-    {
-        try {
-            return parent::put($data, $uri, $remainingRedirects, $contentType, $extraHeaders);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            self::throwServiceExceptionIfDetected($e);
-        }
-    }
-
-    /**
-     * DELETE entry with client object
-     * This method overrides the default behavior of Zend_Gdata_App,
-     * providing support for Zend_Gdata_Gapps_ServiceException.
-     *
-     * @param mixed $data The Zend_Gdata_App_Entry or URL to delete
-     * @param integer $remainingRedirects (optional)
-     * @return void
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function delete($data, $remainingRedirects = null)
-    {
-        try {
-            return parent::delete($data, $remainingRedirects);
-        } catch (Zend_Gdata_App_HttpException $e) {
-            self::throwServiceExceptionIfDetected($e);
-        }
-    }
-
-    /**
-     * Set domain for this service instance. This should be a fully qualified
-     * domain, such as 'foo.example.com'.
-     *
-     * This value is used when calculating URLs for retrieving and posting
-     * entries. If no value is specified, a URL will have to be manually
-     * constructed prior to using any methods which interact with the Google
-     * Apps provisioning service.
-     *
-     * @param string $value The domain to be used for this session.
-     */
-    public function setDomain($value)
-    {
-        $this->_domain = $value;
-    }
-
-    /**
-     * Get domain for this service instance. This should be a fully qualified
-     * domain, such as 'foo.example.com'. If no domain is set, null will be
-     * returned.
-     *
-     * @return string The domain to be used for this session, or null if not
-     *          set.
-     */
-    public function getDomain()
-    {
-        return $this->_domain;
-    }
-
-    /**
-     * Returns the base URL used to access the Google Apps service, based
-     * on the current domain. The current domain can be temporarily
-     * overridden by providing a fully qualified domain as $domain.
-     *
-     * @param string $domain (optional) A fully-qualified domain to use
-     *          instead of the default domain for this service instance.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-     public function getBaseUrl($domain = null)
-     {
-         if ($domain !== null) {
-             return self::APPS_BASE_FEED_URI . '/' . $domain;
-         } else if ($this->_domain !== null) {
-             return self::APPS_BASE_FEED_URI . '/' . $this->_domain;
-         } else {
-             require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-             throw new Zend_Gdata_App_InvalidArgumentException(
-                     'Domain must be specified.');
-         }
-     }
-
-    /**
-     * Retrieve a UserFeed containing multiple UserEntry objects.
-     *
-     * @param mixed $location (optional) The location for the feed, as a URL
-     *          or Query.
-     * @return Zend_Gdata_Gapps_UserFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getUserFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = $this->getBaseUrl() . self::APPS_USER_PATH;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gapps_UserFeed');
-    }
-
-    /**
-     * Retreive NicknameFeed object containing multiple NicknameEntry objects.
-     *
-     * @param mixed $location (optional) The location for the feed, as a URL
-     *          or Query.
-     * @return Zend_Gdata_Gapps_NicknameFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getNicknameFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = $this->getBaseUrl() . self::APPS_NICKNAME_PATH;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gapps_NicknameFeed');
-    }
-
-    /**
-     * Retreive EmailListFeed object containing multiple EmailListEntry
-     * objects.
-     *
-     * @param mixed $location (optional) The location for the feed, as a URL
-     *          or Query.
-     * @return Zend_Gdata_Gapps_EmailListFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getEmailListFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = $this->getBaseUrl() . self::APPS_NICKNAME_PATH;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gapps_EmailListFeed');
-    }
-
-    /**
-     * Retreive EmailListRecipientFeed object containing multiple
-     * EmailListRecipientEntry objects.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Gapps_EmailListRecipientFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getEmailListRecipientFeed($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gapps_EmailListRecipientFeed');
-    }
-
-    /**
-     * Retreive a single UserEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Gapps_UserEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getUserEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gapps_UserEntry');
-    }
-
-    /**
-     * Retreive a single NicknameEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Gapps_NicknameEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getNicknameEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gapps_NicknameEntry');
-    }
-
-    /**
-     * Retreive a single EmailListEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Gapps_EmailListEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getEmailListEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gapps_EmailListEntry');
-    }
-
-    /**
-     * Retreive a single EmailListRecipientEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Gapps_EmailListRecipientEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function getEmailListRecipientEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gapps_EmailListRecipientEntry');
-    }
-
-    /**
-     * Create a new user from a UserEntry.
-     *
-     * @param Zend_Gdata_Gapps_UserEntry $user The user entry to insert.
-     * @param string $uri (optional) The URI where the user should be
-     *          uploaded to. If null, the default user creation URI for
-     *          this domain will be used.
-     * @return Zend_Gdata_Gapps_UserEntry The inserted user entry as
-     *          returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function insertUser($user, $uri = null)
-    {
-        if ($uri === null) {
-            $uri = $this->getBaseUrl() . self::APPS_USER_PATH;
-        }
-        $newEntry = $this->insertEntry($user, $uri, 'Zend_Gdata_Gapps_UserEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new nickname from a NicknameEntry.
-     *
-     * @param Zend_Gdata_Gapps_NicknameEntry $nickname The nickname entry to
-     *          insert.
-     * @param string $uri (optional) The URI where the nickname should be
-     *          uploaded to. If null, the default nickname creation URI for
-     *          this domain will be used.
-     * @return Zend_Gdata_Gapps_NicknameEntry The inserted nickname entry as
-     *          returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function insertNickname($nickname, $uri = null)
-    {
-        if ($uri === null) {
-            $uri = $this->getBaseUrl() . self::APPS_NICKNAME_PATH;
-        }
-        $newEntry = $this->insertEntry($nickname, $uri, 'Zend_Gdata_Gapps_NicknameEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new email list from an EmailListEntry.
-     *
-     * @param Zend_Gdata_Gapps_EmailListEntry $emailList The email list entry
-     *          to insert.
-     * @param string $uri (optional) The URI where the email list should be
-     *          uploaded to. If null, the default email list creation URI for
-     *          this domain will be used.
-     * @return Zend_Gdata_Gapps_EmailListEntry The inserted email list entry
-     *          as returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function insertEmailList($emailList, $uri = null)
-    {
-        if ($uri === null) {
-            $uri = $this->getBaseUrl() . self::APPS_EMAIL_LIST_PATH;
-        }
-        $newEntry = $this->insertEntry($emailList, $uri, 'Zend_Gdata_Gapps_EmailListEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new email list recipient from an EmailListRecipientEntry.
-     *
-     * @param Zend_Gdata_Gapps_EmailListRecipientEntry $recipient The recipient
-     *          entry to insert.
-     * @param string $uri (optional) The URI where the recipient should be
-     *          uploaded to. If null, the default recipient creation URI for
-     *          this domain will be used.
-     * @return Zend_Gdata_Gapps_EmailListRecipientEntry The inserted
-     *          recipient entry as returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function insertEmailListRecipient($recipient, $uri = null)
-    {
-        if ($uri === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'URI must not be null');
-        } elseif ($uri instanceof Zend_Gdata_Gapps_EmailListEntry) {
-            $uri = $uri->getLink('edit')->href;
-        }
-        $newEntry = $this->insertEntry($recipient, $uri, 'Zend_Gdata_Gapps_EmailListRecipientEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Provides a magic factory method to instantiate new objects with
-     * shorter syntax than would otherwise be required by the Zend Framework
-     * naming conventions. For more information, see Zend_Gdata_App::__call().
-     *
-     * This overrides the default behavior of __call() so that query classes
-     * do not need to have their domain manually set when created with
-     * a magic factory method.
-     *
-     * @see Zend_Gdata_App::__call()
-     * @param string $method The method name being called
-     * @param array $args The arguments passed to the call
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function __call($method, $args) {
-        if (preg_match('/^new(\w+Query)/', $method, $matches)) {
-            $class = $matches[1];
-            $foundClassName = null;
-            foreach ($this->_registeredPackages as $name) {
-                 try {
-                     // Autoloading disabled on next line for compatibility
-                     // with magic factories. See ZF-6660.
-                     if (!class_exists($name . '_' . $class, false)) {
-                        require_once 'Zend/Loader.php';
-                        @Zend_Loader::loadClass($name . '_' . $class);
-                     }
-                     $foundClassName = $name . '_' . $class;
-                     break;
-                 } catch (Zend_Exception $e) {
-                     // package wasn't here- continue searching
-                 }
-            }
-            if ($foundClassName != null) {
-                $reflectionObj = new ReflectionClass($foundClassName);
-                // Prepend the domain to the query
-                $args = array_merge(array($this->getDomain()), $args);
-                return $reflectionObj->newInstanceArgs($args);
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception(
-                        "Unable to find '${class}' in registered packages");
-            }
-        } else {
-            return parent::__call($method, $args);
-        }
-
-    }
-
-    // Convenience methods
-    // Specified at http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_e
-
-    /**
-     * Create a new user entry and send it to the Google Apps servers.
-     *
-     * @param string $username The username for the new user.
-     * @param string $givenName The given name for the new user.
-     * @param string $familyName The family name for the new user.
-     * @param string $password The password for the new user as a plaintext string
-     *                 (if $passwordHashFunction is null) or a SHA-1 hashed
-     *                 value (if $passwordHashFunction = 'SHA-1').
-     * @param string $quotaLimitInMB (optional) The quota limit for the new user in MB.
-     * @return Zend_Gdata_Gapps_UserEntry (optional) The new user entry as returned by
-     *                 server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function createUser ($username, $givenName, $familyName, $password,
-            $passwordHashFunction = null, $quotaLimitInMB = null) {
-        $user = $this->newUserEntry();
-        $user->login = $this->newLogin();
-        $user->login->username = $username;
-        $user->login->password = $password;
-        $user->login->hashFunctionName = $passwordHashFunction;
-        $user->name = $this->newName();
-        $user->name->givenName = $givenName;
-        $user->name->familyName = $familyName;
-        if ($quotaLimitInMB !== null) {
-            $user->quota = $this->newQuota();
-            $user->quota->limit = $quotaLimitInMB;
-        }
-        return $this->insertUser($user);
-    }
-
-    /**
-     * Retrieve a user based on their username.
-     *
-     * @param string $username The username to search for.
-     * @return Zend_Gdata_Gapps_UserEntry The username to search for, or null
-     *              if no match found.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function retrieveUser ($username) {
-        $query = $this->newUserQuery($username);
-        try {
-            $user = $this->getUserEntry($query);
-        } catch (Zend_Gdata_Gapps_ServiceException $e) {
-            // Set the user to null if not found
-            if ($e->hasError(Zend_Gdata_Gapps_Error::ENTITY_DOES_NOT_EXIST)) {
-                $user = null;
-            } else {
-                throw $e;
-            }
-        }
-        return $user;
-    }
-
-    /**
-     * Retrieve a page of users in alphabetical order, starting with the
-     * provided username.
-     *
-     * @param string $startUsername (optional) The first username to retrieve.
-     *          If null or not declared, the page will begin with the first
-     *          user in the domain.
-     * @return Zend_Gdata_Gapps_UserFeed Collection of Zend_Gdata_UserEntry
-     *              objects representing all users in the domain.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrievePageOfUsers ($startUsername = null) {
-        $query = $this->newUserQuery();
-        $query->setStartUsername($startUsername);
-        return $this->getUserFeed($query);
-    }
-
-    /**
-     * Retrieve all users in the current domain. Be aware that
-     * calling this function on a domain with many users will take a
-     * signifigant amount of time to complete. On larger domains this may
-     * may cause execution to timeout without proper precautions in place.
-     *
-     * @return Zend_Gdata_Gapps_UserFeed Collection of Zend_Gdata_UserEntry
-     *              objects representing all users in the domain.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveAllUsers () {
-        return $this->retrieveAllEntriesForFeed($this->retrievePageOfUsers());
-    }
-
-    /**
-     * Overwrite a specified username with the provided UserEntry.  The
-     * UserEntry does not need to contain an edit link.
-     *
-     * This method is provided for compliance with the Google Apps
-     * Provisioning API specification. Normally users will instead want to
-     * call UserEntry::save() instead.
-     *
-     * @see Zend_Gdata_App_Entry::save
-     * @param string $username The username whose data will be overwritten.
-     * @param Zend_Gdata_Gapps_UserEntry $userEntry The user entry which
-     *          will be overwritten.
-     * @return Zend_Gdata_Gapps_UserEntry The UserEntry returned by the
-     *          server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function updateUser($username, $userEntry) {
-        return $this->updateEntry($userEntry, $this->getBaseUrl() .
-            self::APPS_USER_PATH . '/' . $username);
-    }
-
-    /**
-     * Mark a given user as suspended.
-     *
-     * @param string $username The username associated with the user who
-     *          should be suspended.
-     * @return Zend_Gdata_Gapps_UserEntry The UserEntry for the modified
-     *          user.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function suspendUser($username) {
-        $user = $this->retrieveUser($username);
-        $user->login->suspended = true;
-        return $user->save();
-    }
-
-    /**
-     * Mark a given user as not suspended.
-     *
-     * @param string $username The username associated with the user who
-     *          should be restored.
-     * @return Zend_Gdata_Gapps_UserEntry The UserEntry for the modified
-     *          user.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function restoreUser($username) {
-        $user = $this->retrieveUser($username);
-        $user->login->suspended = false;
-        return $user->save();
-    }
-
-    /**
-     * Delete a user by username.
-     *
-     * @param string $username The username associated with the user who
-     *          should be deleted.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function deleteUser($username) {
-        $this->delete($this->getBaseUrl() . self::APPS_USER_PATH . '/' .
-            $username);
-    }
-
-    /**
-     * Create a nickname for a given user.
-     *
-     * @param string $username The username to which the new nickname should
-     *          be associated.
-     * @param string $nickname The new nickname to be created.
-     * @return Zend_Gdata_Gapps_NicknameEntry The nickname entry which was
-     *          created by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function createNickname($username, $nickname) {
-        $entry = $this->newNicknameEntry();
-        $nickname = $this->newNickname($nickname);
-        $login = $this->newLogin($username);
-        $entry->nickname = $nickname;
-        $entry->login = $login;
-        return $this->insertNickname($entry);
-    }
-
-    /**
-     * Retrieve the entry for a specified nickname.
-     *
-     * @param string $nickname The nickname to be retrieved.
-     * @return Zend_Gdata_Gapps_NicknameEntry The requested nickname entry.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveNickname($nickname) {
-        $query = $this->newNicknameQuery();
-        $query->setNickname($nickname);
-        try {
-            $nickname = $this->getNicknameEntry($query);
-        } catch (Zend_Gdata_Gapps_ServiceException $e) {
-            // Set the nickname to null if not found
-            if ($e->hasError(Zend_Gdata_Gapps_Error::ENTITY_DOES_NOT_EXIST)) {
-                $nickname = null;
-            } else {
-                throw $e;
-            }
-        }
-        return $nickname;
-    }
-
-    /**
-     * Retrieve all nicknames associated with a specific username.
-     *
-     * @param string $username The username whose nicknames should be
-     *          returned.
-     * @return Zend_Gdata_Gapps_NicknameFeed A feed containing all nicknames
-     *          for the given user, or null if
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveNicknames($username) {
-        $query = $this->newNicknameQuery();
-        $query->setUsername($username);
-        $nicknameFeed = $this->retrieveAllEntriesForFeed(
-            $this->getNicknameFeed($query));
-        return $nicknameFeed;
-    }
-
-    /**
-     * Retrieve a page of nicknames in alphabetical order, starting with the
-     * provided nickname.
-     *
-     * @param string $startNickname (optional) The first nickname to
-     *          retrieve. If null or not declared, the page will begin with
-     *          the first nickname in the domain.
-     * @return Zend_Gdata_Gapps_NicknameFeed Collection of Zend_Gdata_NicknameEntry
-     *              objects representing all nicknames in the domain.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrievePageOfNicknames ($startNickname = null) {
-        $query = $this->newNicknameQuery();
-        $query->setStartNickname($startNickname);
-        return $this->getNicknameFeed($query);
-    }
-
-    /**
-     * Retrieve all nicknames in the current domain. Be aware that
-     * calling this function on a domain with many nicknames will take a
-     * signifigant amount of time to complete. On larger domains this may
-     * may cause execution to timeout without proper precautions in place.
-     *
-     * @return Zend_Gdata_Gapps_NicknameFeed Collection of Zend_Gdata_NicknameEntry
-     *              objects representing all nicknames in the domain.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveAllNicknames () {
-        return $this->retrieveAllEntriesForFeed($this->retrievePageOfNicknames());
-    }
-
-    /**
-     * Delete a specified nickname.
-     *
-     * @param string $nickname The name of the nickname to be deleted.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function deleteNickname($nickname) {
-        $this->delete($this->getBaseUrl() . self::APPS_NICKNAME_PATH . '/' . $nickname);
-    }
-
-    /**
-     * Create a new email list.
-     *
-     * @param string $emailList The name of the email list to be created.
-     * @return Zend_Gdata_Gapps_EmailListEntry The email list entry
-     *          as created on the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function createEmailList($emailList) {
-        $entry = $this->newEmailListEntry();
-        $list = $this->newEmailList();
-        $list->name = $emailList;
-        $entry->emailList = $list;
-        return $this->insertEmailList($entry);
-    }
-
-    /**
-     * Retrieve all email lists associated with a recipient.
-     *
-     * @param string $username The recipient whose associated email lists
-     *          should be returned.
-     * @return Zend_Gdata_Gapps_EmailListFeed The list of email lists found as
-     *          Zend_Gdata_EmailListEntry objects.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveEmailLists($recipient) {
-        $query = $this->newEmailListQuery();
-        $query->recipient = $recipient;
-        return $this->getEmailListFeed($query);
-    }
-
-    /**
-     * Retrieve a page of email lists in alphabetical order, starting with the
-     * provided email list.
-     *
-     * @param string $startEmailListName (optional) The first list to
-     *              retrieve. If null or not defined, the page will begin
-     *              with the first email list in the domain.
-     * @return Zend_Gdata_Gapps_EmailListFeed Collection of Zend_Gdata_EmailListEntry
-     *              objects representing all nicknames in the domain.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrievePageOfEmailLists ($startNickname = null) {
-        $query = $this->newEmailListQuery();
-        $query->setStartEmailListName($startNickname);
-        return $this->getEmailListFeed($query);
-    }
-
-    /**
-     * Retrieve all email lists associated with the curent domain. Be aware that
-     * calling this function on a domain with many email lists will take a
-     * signifigant amount of time to complete. On larger domains this may
-     * may cause execution to timeout without proper precautions in place.
-     *
-     * @return Zend_Gdata_Gapps_EmailListFeed The list of email lists found
-     *              as Zend_Gdata_Gapps_EmailListEntry objects.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveAllEmailLists() {
-        return $this->retrieveAllEntriesForFeed($this->retrievePageOfEmailLists());
-    }
-
-    /**
-     * Delete a specified email list.
-     *
-     * @param string $emailList The name of the emailList to be deleted.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function deleteEmailList($emailList) {
-        $this->delete($this->getBaseUrl() . self::APPS_EMAIL_LIST_PATH . '/'
-            . $emailList);
-    }
-
-    /**
-     * Add a specified recipient to an existing emailList.
-     *
-     * @param string $recipientAddress The address of the recipient to be
-     *              added to the email list.
-     * @param string $emailList The name of the email address to which the
-     *              recipient should be added.
-     * @return Zend_Gdata_Gapps_EmailListRecipientEntry The recipient entry
-     *              created by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function addRecipientToEmailList($recipientAddress, $emailList) {
-        $entry = $this->newEmailListRecipientEntry();
-        $who = $this->newWho();
-        $who->email = $recipientAddress;
-        $entry->who = $who;
-        $address = $this->getBaseUrl() .  self::APPS_EMAIL_LIST_PATH . '/' .
-            $emailList . self::APPS_EMAIL_LIST_RECIPIENT_POSTFIX . '/';
-        return $this->insertEmailListRecipient($entry, $address);
-    }
-
-    /**
-     * Retrieve a page of email list recipients in alphabetical order,
-     * starting with the provided email list recipient.
-     *
-     * @param string $emaiList The email list which should be searched.
-     * @param string $startRecipient (optinal) The address of the first
-     *              recipient, or null to start with the first recipient in
-     *              the list.
-     * @return Zend_Gdata_Gapps_EmailListRecipientFeed Collection of
-     *              Zend_Gdata_EmailListRecipientEntry objects representing all
-     *              recpients in the specified list.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrievePageOfRecipients ($emailList,
-            $startRecipient = null) {
-        $query = $this->newEmailListRecipientQuery();
-        $query->setEmailListName($emailList);
-        $query->setStartRecipient($startRecipient);
-        return $this->getEmailListRecipientFeed($query);
-    }
-
-    /**
-     * Retrieve all recipients associated with an email list. Be aware that
-     * calling this function on a domain with many email lists will take a
-     * signifigant amount of time to complete. On larger domains this may
-     * may cause execution to timeout without proper precautions in place.
-     *
-     * @param string $emaiList The email list which should be searched.
-     * @return Zend_Gdata_Gapps_EmailListRecipientFeed The list of email lists
-     *              found as Zend_Gdata_Gapps_EmailListRecipientEntry objects.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function retrieveAllRecipients($emailList) {
-        return $this->retrieveAllEntriesForFeed(
-                $this->retrievePageOfRecipients($emailList));
-    }
-
-    /**
-     * Remove a specified recipient from an email list.
-     *
-     * @param string $recipientAddress The recipient to be removed.
-     * @param string $emailList The list from which the recipient should
-     *              be removed.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     * @throws Zend_Gdata_Gapps_ServiceException
-     */
-    public function removeRecipientFromEmailList($recipientAddress, $emailList) {
-        $this->delete($this->getBaseUrl() . self::APPS_EMAIL_LIST_PATH . '/'
-            . $emailList . self::APPS_EMAIL_LIST_RECIPIENT_POSTFIX . '/'
-            . $recipientAddress);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListEntry.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListEntry.php
deleted file mode 100644
index ea7126288..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListEntry.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_EmailList
- */
-require_once 'Zend/Gdata/Gapps/Extension/EmailList.php';
-
-/**
- * Data model class for a Google Apps Email List Entry.
- *
- * Each email list entry describes a single email list within a Google Apps
- * hosted domain. Email lists may contain multiple recipients, as
- * described by instances of Zend_Gdata_Gapps_EmailListRecipient. Multiple
- * entries are contained within instances of Zend_Gdata_Gapps_EmailListFeed.
- *
- * To transfer email list entries to and from the Google Apps servers,
- * including creating new entries, refer to the Google Apps service class,
- * Zend_Gdata_Gapps.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListEntry';
-
-    /**
-     * <apps:emailList> child element containing general information about
-     * this email list.
-     *
-     * @var Zend_Gdata_Gapps_Extension_EmailList
-     */
-    protected $_emailList = null;
-
-    /**
-     * <gd:feedLink> element containing information about other feeds
-     * relevant to this entry.
-     *
-     * @var Zend_Gdata_Extension_FeedLink
-     */
-    protected $_feedLink = array();
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_emailList !== null) {
-            $element->appendChild($this->_emailList->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_feedLink as $feedLink) {
-            $element->appendChild($feedLink->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('apps') . ':' . 'emailList';
-                $emailList = new Zend_Gdata_Gapps_Extension_EmailList();
-                $emailList->transferFromDOM($child);
-                $this->_emailList = $emailList;
-                break;
-            case $this->lookupNamespace('gd') . ':' . 'feedLink';
-                $feedLink = new Zend_Gdata_Extension_FeedLink();
-                $feedLink->transferFromDOM($child);
-                $this->_feedLink[] = $feedLink;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Retrieve the email list property for this entry.
-     *
-     * @see setEmailList
-     * @return Zend_Gdata_Gapps_Extension_EmailList The requested object
-     *              or null if not set.
-     */
-    public function getEmailList()
-    {
-        return $this->_emailList;
-    }
-
-    /**
-     * Set the email list property for this entry. This property contains
-     * information such as the name of this email list.
-     *
-     * This corresponds to the <apps:emailList> property in the Google Data
-     * protocol.
-     *
-     * @param Zend_Gdata_Gapps_Extension_EmailList $value The desired value
-     *              this element, or null to unset.
-     * @return Zend_Gdata_Gapps_EventEntry Provides a fluent interface
-     */
-    public function setEmailList($value)
-    {
-        $this->_emailList = $value;
-        return $this;
-    }
-
-    /**
-     * Get the feed link property for this entry.
-     *
-     * @see setFeedLink
-     * @param string $rel (optional) The rel value of the link to be found.
-     *          If null, the array of links is returned.
-     * @return mixed If $rel is specified, a Zend_Gdata_Extension_FeedLink
-     *          object corresponding to the requested rel value is returned
-     *          if found, or null if the requested value is not found. If
-     *          $rel is null or not specified, an array of all available
-     *          feed links for this entry is returned, or null if no feed
-     *          links are set.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Set the feed link property for this entry. Feed links provide
-     * information about other feeds associated with this entry.
-     *
-     * This corresponds to the <gd:feedLink> property in the Google Data
-     * protocol.
-     *
-     * @param array $value A collection of Zend_Gdata_Gapps_Extension_FeedLink
-     *          instances representing all feed links for this entry, or
-     *          null to unset.
-     * @return Zend_Gdata_Gapps_EventEntry Provides a fluent interface
-     */
-    public function setFeedLink($value)
-    {
-        $this->_feedLink = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListFeed.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListFeed.php
deleted file mode 100644
index 8c1223bfb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListFeed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Gapps_EmailListEntry
- */
-require_once 'Zend/Gdata/Gapps/EmailListEntry.php';
-
-/**
- * Data model for a collection of Google Apps email list entries, usually
- * provided by the Google Apps servers.
- *
- * For information on requesting this feed from a server, see the Google
- * Apps service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListFeed extends Zend_Gdata_Feed
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListEntry';
-    protected $_feedClassName = 'Zend_Gdata_Gapps_EmailListFeed';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListQuery.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListQuery.php
deleted file mode 100644
index 2a46e5260..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListQuery.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Query
- */
-require_once('Zend/Gdata/Gapps/Query.php');
-
-/**
- * Assists in constructing queries for Google Apps email list entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the Google Apps
- * service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query
-{
-
-    /**
-     * A string which, if not null, indicates which email list should
-     * be retrieved by this query.
-     *
-     * @var string
-     */
-    protected $_emailListName = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $domain (optional) The Google Apps-hosted domain to use
-     *          when constructing query URIs.
-     * @param string $emailListName (optional) Value for the emailListName
-     *          property.
-     * @param string $recipient (optional) Value for the recipient
-     *          property.
-     * @param string $startEmailListName (optional) Value for the
-     *          startEmailListName property.
-     */
-    public function __construct($domain = null, $emailListName = null,
-            $recipient = null, $startEmailListName = null)
-    {
-        parent::__construct($domain);
-        $this->setEmailListName($emailListName);
-        $this->setRecipient($recipient);
-        $this->setStartEmailListName($startEmailListName);
-    }
-
-    /**
-     * Set the email list name to query for. When set, only lists with a name
-     * matching this value will be returned in search results. Set to
-     * null to disable filtering by list name.
-     *
-     * @param string $value The email list name to filter search results by,
-     *          or null to disable.
-     */
-     public function setEmailListName($value)
-     {
-         $this->_emailListName = $value;
-     }
-
-    /**
-     * Get the email list name to query for. If no name is set, null will be
-     * returned.
-     *
-     * @see setEmailListName
-     * @return string The email list name to filter search results by, or null
-     *              if disabled.
-     */
-    public function getEmailListName()
-    {
-        return $this->_emailListName;
-    }
-
-    /**
-     * Set the recipient to query for. When set, only subscribers with an
-     * email address matching this value will be returned in search results.
-     * Set to null to disable filtering by username.
-     *
-     * @param string $value The recipient email address to filter search
-     *              results by, or null to  disable.
-     */
-    public function setRecipient($value)
-    {
-        if ($value !== null) {
-            $this->_params['recipient'] = $value;
-        }
-        else {
-            unset($this->_params['recipient']);
-        }
-    }
-
-    /**
-     * Get the recipient email address to query for. If no recipient is set,
-     * null will be returned.
-     *
-     * @see setRecipient
-     * @return string The recipient email address to filter search results by,
-     *              or null if disabled.
-     */
-    public function getRecipient()
-    {
-        if (array_key_exists('recipient', $this->_params)) {
-            return $this->_params['recipient'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set the first email list which should be displayed when retrieving
-     * a list of email lists.
-     *
-     * @param string $value The first email list to be returned, or null to
-     *              disable.
-     */
-    public function setStartEmailListName($value)
-    {
-        if ($value !== null) {
-            $this->_params['startEmailListName'] = $value;
-        } else {
-            unset($this->_params['startEmailListName']);
-        }
-    }
-
-    /**
-     * Get the first email list which should be displayed when retrieving
-     * a list of email lists.
-     *
-     * @return string The first email list to be returned, or null to
-     *              disable.
-     */
-    public function getStartEmailListName()
-    {
-        if (array_key_exists('startEmailListName', $this->_params)) {
-            return $this->_params['startEmailListName'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getQueryUrl()
-    {
-
-        $uri = $this->getBaseUrl();
-        $uri .= Zend_Gdata_Gapps::APPS_EMAIL_LIST_PATH;
-        if ($this->_emailListName !== null) {
-            $uri .= '/' . $this->_emailListName;
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
deleted file mode 100644
index e486231d1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListRecipientEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_Who
- */
-require_once 'Zend/Gdata/Extension/Who.php';
-
-/**
- * Data model class for a Google Apps Email List Recipient Entry.
- *
- * Each instance of this class represents a recipient of an email list
- * hosted on a Google Apps domain. Each email list may contain multiple
- * recipients. Email lists themselves are described by
- * Zend_Gdata_EmailListEntry. Multiple recipient entries are contained within
- * instances of Zend_Gdata_Gapps_EmailListRecipientFeed.
- *
- * To transfer email list recipients to and from the Google Apps servers,
- * including creating new recipients, refer to the Google Apps service class,
- * Zend_Gdata_Gapps.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListRecipientEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListRecipientEntry';
-
-    /**
-     * <gd:who> element used to store the email address of the current
-     * recipient. Only the email property of this element should be
-     * populated.
-     *
-     * @var Zend_Gdata_Extension_Who
-     */
-    protected $_who = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_who !== null) {
-            $element->appendChild($this->_who->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gd') . ':' . 'who';
-                $who = new Zend_Gdata_Extension_Who();
-                $who->transferFromDOM($child);
-                $this->_who = $who;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value of the who property for this object.
-     *
-     * @see setWho
-     * @return Zend_Gdata_Extension_Who The requested object.
-     */
-    public function getWho()
-    {
-        return $this->_who;
-    }
-
-    /**
-     * Set the value of the who property for this object. This property
-     * is used to store the email address of the current recipient.
-     *
-     * @param Zend_Gdata_Extension_Who $value The desired value for this
-     *          instance's who property.
-     * @return Zend_Gdata_Gapps_EventEntry Provides a fluent interface.
-     */
-    public function setWho($value)
-    {
-        $this->_who = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php
deleted file mode 100644
index 987dd54ad..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListRecipientFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Gapps_EmailListRecipientEntry
- */
-require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php';
-
-/**
- * Data model for a collection of Google Apps email list recipient entries,
- * usually provided by the Google Apps servers.
- *
- * For information on requesting this feed from a server, see the Google
- * Apps service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListRecipientFeed extends Zend_Gdata_Feed
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListRecipientEntry';
-    protected $_feedClassName = 'Zend_Gdata_Gapps_EmailListRecipientFeed';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php
deleted file mode 100644
index 8da065b8f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailListRecipientQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Query
- */
-require_once('Zend/Gdata/Gapps/Query.php');
-
-/**
- * Assists in constructing queries for Google Apps email list recipient
- * entries. Instances of this class can be provided in many places where a
- * URL is required.
- *
- * For information on submitting queries to a server, see the Google Apps
- * service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query
-{
-
-    /**
-     * If not null, specifies the name of the email list which
-     * should be requested by this query.
-     *
-     * @var string
-     */
-    protected $_emailListName = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $domain (optional) The Google Apps-hosted domain to use
-     *          when constructing query URIs.
-     * @param string $emailListName (optional) Value for the emailListName
-     *          property.
-     * @param string $startRecipient (optional) Value for the
-     *          startRecipient property.
-     */
-    public function __construct($domain = null, $emailListName = null,
-            $startRecipient = null)
-    {
-        parent::__construct($domain);
-        $this->setEmailListName($emailListName);
-        $this->setStartRecipient($startRecipient);
-    }
-
-    /**
-     * Set the email list name to query for. When set, only lists with a name
-     * matching this value will be returned in search results. Set to
-     * null to disable filtering by list name.
-     *
-     * @param string $value The email list name to filter search results by,
-     *          or null to disable.
-     */
-     public function setEmailListName($value)
-     {
-         $this->_emailListName = $value;
-     }
-
-    /**
-     * Get the email list name to query for. If no name is set, null will be
-     * returned.
-     *
-     * @param string $value The email list name to filter search results by,
-     *          or null if disabled.
-     */
-    public function getEmailListName()
-    {
-        return $this->_emailListName;
-    }
-
-    /**
-     * Set the first recipient which should be displayed when retrieving
-     * a list of email list recipients.
-     *
-     * @param string $value The first recipient to be returned, or null to
-     *              disable.
-     */
-    public function setStartRecipient($value)
-    {
-        if ($value !== null) {
-            $this->_params['startRecipient'] = $value;
-        } else {
-            unset($this->_params['startRecipient']);
-        }
-    }
-
-    /**
-     * Get the first recipient which should be displayed when retrieving
-     * a list of email list recipients.
-     *
-     * @return string The first recipient to be returned, or null if
-     *              disabled.
-     */
-    public function getStartRecipient()
-    {
-        if (array_key_exists('startRecipient', $this->_params)) {
-            return $this->_params['startRecipient'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getQueryUrl()
-    {
-
-        $uri = $this->getBaseUrl();
-        $uri .= Zend_Gdata_Gapps::APPS_EMAIL_LIST_PATH;
-        if ($this->_emailListName !== null) {
-            $uri .= '/' . $this->_emailListName;
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'EmailListName must not be null');
-        }
-        $uri .= Zend_Gdata_Gapps::APPS_EMAIL_LIST_RECIPIENT_POSTFIX . '/';
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Error.php b/airtime_mvc/library/Zend/Gdata/Gapps/Error.php
deleted file mode 100644
index 9056286b1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Error.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Gdata_App_Base
- */
-require_once 'Zend/Gdata/App/Base.php';
-
-/**
- * Gdata Gapps Error class. This class is used to represent errors returned
- * within an AppsForYourDomainErrors message received from the Google Apps
- * servers.
- *
- * Several different errors may be represented by this class, determined by
- * the error code returned by the server. For a list of error codes
- * available at the time of this writing, see getErrorCode.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base
-{
-
-    // Error codes as defined at
-    // http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_d
-
-    const UNKNOWN_ERROR = 1000;
-    const USER_DELETED_RECENTLY = 1100;
-    const USER_SUSPENDED = 1101;
-    const DOMAIN_USER_LIMIT_EXCEEDED = 1200;
-    const DOMAIN_ALIAS_LIMIT_EXCEEDED = 1201;
-    const DOMAIN_SUSPENDED = 1202;
-    const DOMAIN_FEATURE_UNAVAILABLE = 1203;
-    const ENTITY_EXISTS = 1300;
-    const ENTITY_DOES_NOT_EXIST = 1301;
-    const ENTITY_NAME_IS_RESERVED = 1302;
-    const ENTITY_NAME_NOT_VALID = 1303;
-    const INVALID_GIVEN_NAME = 1400;
-    const INVALID_FAMILY_NAME = 1401;
-    const INVALID_PASSWORD = 1402;
-    const INVALID_USERNAME = 1403;
-    const INVALID_HASH_FUNCTION_NAME = 1404;
-    const INVALID_HASH_DIGEST_LENGTH = 1405;
-    const INVALID_EMAIL_ADDRESS = 1406;
-    const INVALID_QUERY_PARAMETER_VALUE = 1407;
-    const TOO_MANY_RECIPIENTS_ON_EMAIL_LIST = 1500;
-
-    protected $_errorCode = null;
-    protected $_reason = null;
-    protected $_invalidInput = null;
-
-    public function __construct($errorCode = null, $reason = null,
-            $invalidInput = null) {
-        parent::__construct("Google Apps error received: $errorCode ($reason)");
-        $this->_errorCode = $errorCode;
-        $this->_reason = $reason;
-        $this->_invalidInput = $invalidInput;
-    }
-
-    /**
-     * Set the error code for this exception. For more information about
-     * error codes, see getErrorCode.
-     *
-     * @see getErrorCode
-     * @param integer $value The new value for the error code.
-     */
-    public function setErrorCode($value) {
-       $this->_errorCode = $value;
-    }
-
-    /**
-     * Get the error code for this exception. Currently valid values are
-     * available as constants within this class. These values are:
-     *
-     *   UNKNOWN_ERROR (1000)
-     *   USER_DELETED_RECENTLY (1100)
-     *   USER_SUSPENDED (1101)
-     *   DOMAIN_USER_LIMIT_EXCEEDED (1200)
-     *   DOMAIN_ALIAS_LIMIT_EXCEEDED (1201)
-     *   DOMAIN_SUSPENDED (1202)
-     *   DOMAIN_FEATURE_UNAVAILABLE (1203)
-     *   ENTITY_EXISTS (1300)
-     *   ENTITY_DOES_NOT_EXIST (1301)
-     *   ENTITY_NAME_IS_RESERVED (1302)
-     *   ENTITY_NAME_NOT_VALID (1303)
-     *   INVALID_GIVEN_NAME (1400)
-     *   INVALID_FAMILY_NAME (1401)
-     *   INVALID_PASSWORD (1402)
-     *   INVALID_USERNAME (1403)
-     *   INVALID_HASH_FUNCTION_NAME (1404)
-     *   INVALID_HASH_DIGEST_LENGTH (1405)
-     *   INVALID_EMAIL_ADDRESS (1406)
-     *   INVALID_QUERY_PARAMETER_VALUE (1407)
-     *   TOO_MANY_RECIPIENTS_ON_EMAIL_LIST (1500)
-     *
-     * Numbers in parenthesis indicate the actual integer value of the
-     * constant. This list should not be treated as exhaustive, as additional
-     * error codes may be added at any time.
-     *
-     * For more information about these codes and their meaning, please
-     * see Appendix D of the Google Apps Provisioning API Reference.
-     *
-     * @link http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_d Google Apps Provisioning API Reference: Appendix D - Gdata Error Codes
-     * @see setErrorCode
-     * @return integer The error code returned by the Google Apps server.
-     */
-    public function getErrorCode() {
-        return $this->_errorCode;
-    }
-
-    /**
-     * Set human-readable text describing the reason this exception occurred.
-     *
-     * @see getReason
-     * @param string $value The reason this exception occurred.
-     */
-    public function setReason($value) {
-       $this->_reason = $value;
-    }
-
-    /**
-     * Get human-readable text describing the reason this exception occurred.
-     *
-     * @see setReason
-     * @return string The reason this exception occurred.
-     */
-    public function getReason() {
-       return $this->_reason;
-    }
-
-    /**
-     * Set the invalid input which caused this exception.
-     *
-     * @see getInvalidInput
-     * @param string $value The invalid input that triggered this exception.
-     */
-    public function setInvalidInput($value) {
-       $this->_invalidInput = $value;
-    }
-
-    /**
-     * Set the invalid input which caused this exception.
-     *
-     * @see setInvalidInput
-     * @return string The reason this exception occurred.
-     */
-    public function getInvalidInput() {
-       return $this->_invalidInput;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_errorCode !== null) {
-            $element->setAttribute('errorCode', $this->_errorCode);
-        }
-        if ($this->_reason !== null) {
-            $element->setAttribute('reason', $this->_reason);
-        }
-        if ($this->_invalidInput !== null) {
-            $element->setAttribute('invalidInput', $this->_invalidInput);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'errorCode':
-            $this->_errorCode = $attribute->nodeValue;
-            break;
-        case 'reason':
-            $this->_reason = $attribute->nodeValue;
-            break;
-        case 'invalidInput':
-            $this->_invalidInput = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get a human readable version of this exception.
-     *
-     * @return string
-     */
-    public function __toString() {
-        return "Error " . $this->getErrorCode() . ": " . $this->getReason() .
-            "\n\tInvalid Input: \"" . $this->getInvalidInput() . "\"";
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/EmailList.php b/airtime_mvc/library/Zend/Gdata/Gapps/Extension/EmailList.php
deleted file mode 100644
index 1ee73cc64..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/EmailList.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * Represents the apps:emailList element used by the Apps data API. This
- * class represents properties of an email list and is usually contained
- * within an instance of Zend_Gdata_Gapps_EmailListEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Extension_EmailList extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'apps';
-    protected $_rootElement = 'emailList';
-
-    /**
-     * The name of the email list. This name is used as the email address
-     * for this list.
-     *
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Gapps_Extension_EmailList object.
-     *
-     * @param string $name (optional) The name to be used for this email list.
-     */
-    public function __construct($name = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct();
-        $this->_name = $name;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_name !== null) {
-            $element->setAttribute('name', $this->_name);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'name':
-            $this->_name = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's name attribute.
-     *
-     * @see setName
-     * @return string The requested attribute.
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set the value for this element's name attribute. This is the unique
-     * name which will be used to identify this email list within this
-     * domain, and will be used to form this email list's email address.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_EmailList The element being modified.
-     */
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getName();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Login.php b/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Login.php
deleted file mode 100644
index 364bcaa30..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Login.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * Represents the apps:login element used by the Apps data API. This
- * class is used to describe properties of a user, and is usually contained
- * within instances of Zene_Gdata_Gapps_UserEntry or any other class
- * which is linked to a particular username.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'apps';
-    protected $_rootElement = 'login';
-
-    /**
-     * The username for this user. This is used as the user's email address
-     * and when logging in to Google Apps-hosted services.
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * The password for the user. May be in cleartext or as an SHA-1
-     * digest, depending on the value of _hashFunctionName.
-     *
-     * @var string
-     */
-    protected $_password = null;
-
-    /**
-     * Specifies whether the password stored in _password is in cleartext
-     * or is an SHA-1 digest of a password. If the password is cleartext,
-     * then this should be null. If the password is an SHA-1 digest, then
-     * this should be set to 'SHA-1'.
-     *
-     * At the time of writing, no other hash functions are supported
-     *
-     * @var string
-     */
-    protected $_hashFunctionName = null;
-
-    /**
-     * True if the user has administrative rights for this domain, false
-     * otherwise.
-     *
-     * @var boolean
-     */
-    protected $_admin = null;
-
-    /**
-     * True if the user has agreed to the terms of service for Google Apps,
-     * false otherwise.
-     *
-     * @var boolean.
-     */
-    protected $_agreedToTerms = null;
-
-    /**
-     * True if this user has been suspended, false otherwise.
-     *
-     * @var boolean
-     */
-    protected $_suspended = null;
-
-    /**
-     * True if the user will be required to change their password at
-     * their next login, false otherwise.
-     *
-     * @var boolean
-     */
-    protected $_changePasswordAtNextLogin = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Gapps_Extension_Login object.
-     *
-     * @param string $username (optional) The username to be used for this
-     *          login.
-     * @param string $password (optional) The password to be used for this
-     *          login.
-     * @param string $hashFunctionName (optional) The name of the hash
-     *          function used to protect the password, or null if no
-     *          has function has been applied. As of this writing,
-     *          the only valid values are 'SHA-1' or null.
-     * @param boolean $admin (optional) Whether the user is an administrator
-     *          or not.
-     * @param boolean $suspended (optional) Whether this login is suspended or not.
-     * @param boolean $changePasswordAtNextLogin (optional) Whether
-     *          the user is required to change their password at their
-     *          next login.
-     * @param boolean $agreedToTerms (optional) Whether the user has
-     *          agreed to the terms of service.
-     */
-    public function __construct($username = null, $password = null,
-        $hashFunctionName = null, $admin = null, $suspended = null,
-        $changePasswordAtNextLogin = null, $agreedToTerms = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct();
-        $this->_username = $username;
-        $this->_password = $password;
-        $this->_hashFunctionName = $hashFunctionName;
-        $this->_admin = $admin;
-        $this->_agreedToTerms = $agreedToTerms;
-        $this->_suspended = $suspended;
-        $this->_changePasswordAtNextLogin = $changePasswordAtNextLogin;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_username !== null) {
-            $element->setAttribute('userName', $this->_username);
-        }
-        if ($this->_password !== null) {
-            $element->setAttribute('password', $this->_password);
-        }
-        if ($this->_hashFunctionName !== null) {
-            $element->setAttribute('hashFunctionName', $this->_hashFunctionName);
-        }
-        if ($this->_admin !== null) {
-            $element->setAttribute('admin', ($this->_admin ? "true" : "false"));
-        }
-        if ($this->_agreedToTerms !== null) {
-            $element->setAttribute('agreedToTerms', ($this->_agreedToTerms ? "true" : "false"));
-        }
-        if ($this->_suspended !== null) {
-            $element->setAttribute('suspended', ($this->_suspended ? "true" : "false"));
-        }
-        if ($this->_changePasswordAtNextLogin !== null) {
-            $element->setAttribute('changePasswordAtNextLogin', ($this->_changePasswordAtNextLogin ? "true" : "false"));
-        }
-
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'userName':
-            $this->_username = $attribute->nodeValue;
-            break;
-        case 'password':
-            $this->_password = $attribute->nodeValue;
-            break;
-        case 'hashFunctionName':
-            $this->_hashFunctionName = $attribute->nodeValue;
-            break;
-        case 'admin':
-            if ($attribute->nodeValue == "true") {
-                $this->_admin = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_admin = false;
-            }
-            else {
-                require_once('Zend/Gdata/App/InvalidArgumentException.php');
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#admin.");
-            }
-            break;
-        case 'agreedToTerms':
-            if ($attribute->nodeValue == "true") {
-                $this->_agreedToTerms = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_agreedToTerms = false;
-            }
-            else {
-                require_once('Zend/Gdata/App/InvalidArgumentException.php');
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#agreedToTerms.");
-            }
-            break;
-        case 'suspended':
-            if ($attribute->nodeValue == "true") {
-                $this->_suspended = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_suspended = false;
-            }
-            else {
-                require_once('Zend/Gdata/App/InvalidArgumentException.php');
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#suspended.");
-            }
-            break;
-        case 'changePasswordAtNextLogin':
-            if ($attribute->nodeValue == "true") {
-                $this->_changePasswordAtNextLogin = true;
-            }
-            else if ($attribute->nodeValue == "false") {
-                $this->_changePasswordAtNextLogin = false;
-            }
-            else {
-                require_once('Zend/Gdata/App/InvalidArgumentException.php');
-                throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#changePasswordAtNextLogin.");
-            }
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's username attribute.
-     *
-     * @see setUsername
-     * @return string The attribute being modified.
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Set the value for this element's username attribute. This string
-     * is used to uniquely identify the user in this domian and is used
-     * to form this user's email address.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     */
-    public function setUsername($value)
-    {
-        $this->_username = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's password attribute.
-     *
-     * @see setPassword
-     * @return string The requested attribute.
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Set the value for this element's password attribute. As of this
-     * writing, this can be either be provided as plaintext or hashed using
-     * the SHA-1 algorithm for protection. If using a hash function,
-     * this must be indicated by calling setHashFunctionName().
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     */
-    public function setPassword($value)
-    {
-        $this->_password = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's hashFunctionName attribute.
-     *
-     * @see setHashFunctionName
-     * @return string The requested attribute.
-     */
-    public function getHashFunctionName()
-    {
-        return $this->_hashFunctionName;
-    }
-
-    /**
-     * Set the value for this element's hashFunctionName attribute. This
-     * indicates whether the password supplied with setPassword() is in
-     * plaintext or has had a hash function applied to it. If null,
-     * plaintext is assumed. As of this writing, the only valid hash
-     * function is 'SHA-1'.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     */
-    public function setHashFunctionName($value)
-    {
-        $this->_hashFunctionName = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's admin attribute.
-     *
-     * @see setAdmin
-     * @return boolean The requested attribute.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getAdmin()
-    {
-        if (!(is_bool($this->_admin))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for admin.');
-        }
-        return $this->_admin;
-    }
-
-    /**
-     * Set the value for this element's admin attribute. This indicates
-     * whether this user is an administrator for this domain.
-     *
-     * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setAdmin($value)
-    {
-        if (!(is_bool($value))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.');
-        }
-        $this->_admin = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's agreedToTerms attribute.
-     *
-     * @see setAgreedToTerms
-     * @return boolean The requested attribute.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getAgreedToTerms()
-    {
-        if (!(is_bool($this->_agreedToTerms))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for agreedToTerms.');
-        }
-        return $this->_agreedToTerms;
-    }
-
-    /**
-     * Set the value for this element's agreedToTerms attribute. This
-     * indicates whether this user has agreed to the terms of service.
-     *
-     * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setAgreedToTerms($value)
-    {
-        if (!(is_bool($value))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.');
-        }
-        $this->_agreedToTerms = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's suspended attribute.
-     *
-     * @see setSuspended
-     * @return boolean The requested attribute.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getSuspended()
-    {
-        if (!(is_bool($this->_suspended))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for suspended.');
-        }
-        return $this->_suspended;
-    }
-
-    /**
-     * Set the value for this element's suspended attribute. If true, the
-     * user will not be able to login to this domain until unsuspended.
-     *
-     * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setSuspended($value)
-    {
-        if (!(is_bool($value))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.');
-        }
-        $this->_suspended = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's changePasswordAtNextLogin attribute.
-     *
-     * @see setChangePasswordAtNextLogin
-     * @return boolean The requested attribute.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getChangePasswordAtNextLogin()
-    {
-        if (!(is_bool($this->_changePasswordAtNextLogin))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for changePasswordAtNextLogin.');
-        }
-        return $this->_changePasswordAtNextLogin;
-    }
-
-    /**
-     * Set the value for this element's changePasswordAtNextLogin attribute.
-     * If true, the user will be forced to set a new password the next
-     * time they login.
-     *
-     * @param boolean $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Login Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function setChangePasswordAtNextLogin($value)
-    {
-        if (!(is_bool($value))) {
-            require_once('Zend/Gdata/App/InvalidArgumentException.php');
-            throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.');
-        }
-        $this->_changePasswordAtNextLogin = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return "Username: " . $this->getUsername() .
-            "\nPassword: " . (($this->getPassword() === null) ? "NOT SET" : "SET") .
-            "\nPassword Hash Function: " . $this->getHashFunctionName() .
-            "\nAdministrator: " . ($this->getAdmin() ? "Yes" : "No") .
-            "\nAgreed To Terms: " . ($this->getAgreedToTerms() ? "Yes" : "No") .
-            "\nSuspended: " . ($this->getSuspended() ? "Yes" : "No");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Name.php b/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Name.php
deleted file mode 100644
index 4226d6fa1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Name.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * Represents the apps:name element used by the Apps data API. This is used
- * to represent a user's full name. This class is usually contained within
- * instances of Zend_Gdata_Gapps_UserEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Extension_Name extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'apps';
-    protected $_rootElement = 'name';
-
-    /**
-     * The associated user's family name.
-     *
-     * @var string
-     */
-    protected $_familyName = null;
-
-    /**
-     * The associated user's given name.
-     *
-     * @var string
-     */
-    protected $_givenName = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Gapps_Extension_Name object.
-     *
-     * @param string $familyName (optional) The familyName to be set for this
-     *          object.
-     * @param string $givenName (optional) The givenName to be set for this
-     *          object.
-     */
-    public function __construct($familyName = null, $givenName = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct();
-        $this->_familyName = $familyName;
-        $this->_givenName = $givenName;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_familyName !== null) {
-            $element->setAttribute('familyName', $this->_familyName);
-        }
-        if ($this->_givenName !== null) {
-            $element->setAttribute('givenName', $this->_givenName);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'familyName':
-            $this->_familyName = $attribute->nodeValue;
-            break;
-        case 'givenName':
-            $this->_givenName = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's familyName attribute.
-     *
-     * @see setFamilyName
-     * @return string The requested attribute.
-     */
-    public function getFamilyName()
-    {
-        return $this->_familyName;
-    }
-
-    /**
-     * Set the value for this element's familyName attribute. This
-     * represents a user's family name.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Name Provides a fluent interface..
-     */
-    public function setFamilyName($value)
-    {
-        $this->_familyName = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's givenName attribute.
-     *
-     * @see setGivenName
-     * @return string The requested attribute.
-     */
-    public function getGivenName()
-    {
-        return $this->_givenName;
-    }
-
-    /**
-     * Set the value for this element's givenName attribute. This
-     * represents a user's given name.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Name Provides a fluent interface.
-     */
-    public function setGivenName($value)
-    {
-        $this->_givenName = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getGivenName() . ' ' . $this->getFamilyName();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Nickname.php b/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Nickname.php
deleted file mode 100644
index ee91c5f2f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Nickname.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * Represents the apps:nickname element used by the Apps data API. This
- * is used to describe a nickname's properties, and is usually contained
- * within instances of Zend_Gdata_Gapps_NicknameEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Extension_Nickname extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'apps';
-    protected $_rootElement = 'nickname';
-
-    /**
-     * The name of the nickname. This name is used as the email address
-     * for this nickname.
-     *
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Gapps_Extension_Nickname object.
-     * @param string $name (optional) The nickname being represented.
-     */
-    public function __construct($name = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct();
-        $this->_name = $name;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_name !== null) {
-            $element->setAttribute('name', $this->_name);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'name':
-            $this->_name = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's name attribute.
-     *
-     * @see setName
-     * @return string The requested attribute.
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set the value for this element's name attribute. This name uniquely
-     * describes this nickname within the domain. Emails addressed to this
-     * name will be delivered to the user who owns this nickname.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Nickname Provides a fluent
-     *          interface.
-     */
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getName();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Quota.php b/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Quota.php
deleted file mode 100644
index 34af8ab04..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Extension/Quota.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Quota.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * Represents the apps:quota element used by the Apps data API. This is
- * used to indicate the amount of storage space available to a user. Quotas
- * may not be able to be set, depending on the domain used. This class
- * is usually contained within an instance of Zend_Gdata_Gapps_UserEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_Extension_Quota extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'apps';
-    protected $_rootElement = 'quota';
-
-    /**
-     * The amount of storage space available to the user in megabytes.
-     *
-     * @var integer
-     */
-    protected $_limit = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Gapps_Extension_Quota object.
-     *
-     * @param string $limit (optional) The limit, in bytes, for this quota.
-     */
-    public function __construct($limit = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct();
-        $this->_limit = $limit;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_limit !== null) {
-            $element->setAttribute('limit', $this->_limit);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'limit':
-            $this->_limit = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's limit attribute.
-     *
-     * @see setLimit
-     * @return string The requested attribute.
-     */
-    public function getLimit()
-    {
-        return $this->_limit;
-    }
-
-    /**
-     * Set the value for this element's limit attribute. This is the amount
-     * of storage space, in bytes, that should be made available to
-     * the associated user.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Gapps_Extension_Quota Provides a fluent interface.
-     */
-    public function setLimit($value)
-    {
-        $this->_limit = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->getLimit();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameEntry.php b/airtime_mvc/library/Zend/Gdata/Gapps/NicknameEntry.php
deleted file mode 100644
index 315774a1d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameEntry.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NicknameEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_Login
- */
-require_once 'Zend/Gdata/Gapps/Extension/Login.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_Nickname
- */
-require_once 'Zend/Gdata/Gapps/Extension/Nickname.php';
-
-/**
- * Data model class for a Google Apps Nickname Entry.
- *
- * Each nickname entry describes a single nickname within a Google Apps
- * hosted domain. Each user may own several nicknames, but each nickname may
- * only belong to one user. Multiple entries are contained within instances
- * of Zend_Gdata_Gapps_NicknameFeed.
- *
- * To transfer nickname entries to and from the Google Apps servers,
- * including creating new entries, refer to the Google Apps service class,
- * Zend_Gdata_Gapps.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_NicknameEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_NicknameEntry';
-
-    /**
-     * <apps:login> element used to hold information about the owner
-     * of this nickname, including their username.
-     *
-     * @var Zend_Gdata_Gapps_Extension_Login
-     */
-    protected $_login = null;
-
-    /**
-     * <apps:nickname> element used to hold the name of this nickname.
-     *
-     * @var Zend_Gdata_Gapps_Extension_Nickname
-     */
-    protected $_nickname = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_login !== null) {
-            $element->appendChild($this->_login->getDOM($element->ownerDocument));
-        }
-        if ($this->_nickname !== null) {
-            $element->appendChild($this->_nickname->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('apps') . ':' . 'login';
-                $login = new Zend_Gdata_Gapps_Extension_Login();
-                $login->transferFromDOM($child);
-                $this->_login = $login;
-                break;
-            case $this->lookupNamespace('apps') . ':' . 'nickname';
-                $nickname = new Zend_Gdata_Gapps_Extension_Nickname();
-                $nickname->transferFromDOM($child);
-                $this->_nickname = $nickname;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value of the login property for this object.
-     *
-     * @see setLogin
-     * @return Zend_Gdata_Gapps_Extension_Login The requested object.
-     */
-    public function getLogin()
-    {
-        return $this->_login;
-    }
-
-    /**
-     * Set the value of the login property for this object. This property
-     * is used to store the username address of the current user.
-     *
-     * @param Zend_Gdata_Gapps_Extension_Login $value The desired value for
-     *          this instance's login property.
-     * @return Zend_Gdata_Gapps_NicknameEntry Provides a fluent interface.
-     */
-    public function setLogin($value)
-    {
-        $this->_login = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the nickname property for this object.
-     *
-     * @see setNickname
-     * @return Zend_Gdata_Gapps_Extension_Nickname The requested object.
-     */
-    public function getNickname()
-    {
-        return $this->_nickname;
-    }
-
-    /**
-     * Set the value of the nickname property for this object. This property
-     * is used to store the the name of the current nickname.
-     *
-     * @param Zend_Gdata_Gapps_Extension_Nickname $value The desired value for
-     *          this instance's nickname property.
-     * @return Zend_Gdata_Gapps_NicknameEntry Provides a fluent interface.
-     */
-    public function setNickname($value)
-    {
-        $this->_nickname = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameFeed.php b/airtime_mvc/library/Zend/Gdata/Gapps/NicknameFeed.php
deleted file mode 100644
index 9e2d54051..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameFeed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NicknameFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Gapps_NicknameEntry
- */
-require_once 'Zend/Gdata/Gapps/NicknameEntry.php';
-
-/**
- * Data model for a collection of Google Apps nickname entries, usually
- * provided by the Google Apps servers.
- *
- * For information on requesting this feed from a server, see the Google
- * Apps service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_NicknameFeed extends Zend_Gdata_Feed
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_NicknameEntry';
-    protected $_feedClassName = 'Zend_Gdata_Gapps_NicknameFeed';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameQuery.php b/airtime_mvc/library/Zend/Gdata/Gapps/NicknameQuery.php
deleted file mode 100644
index f7a88fd3b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/NicknameQuery.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NicknameQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Query
- */
-require_once('Zend/Gdata/Gapps/Query.php');
-
-/**
- * Assists in constructing queries for Google Apps nickname entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the Google Apps
- * service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query
-{
-
-    /**
-     * If not null, indicates the name of the nickname entry which
-     * should be returned by this query.
-     *
-     * @var string
-     */
-    protected $_nickname = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $domain (optional) The Google Apps-hosted domain to use
-     *          when constructing query URIs.
-     * @param string $nickname (optional) Value for the nickname
-     *          property.
-     * @param string $username (optional) Value for the username
-     *          property.
-     * @param string $startNickname (optional) Value for the
-     *          startNickname property.
-     */
-    public function __construct($domain = null, $nickname = null,
-            $username = null, $startNickname = null)
-    {
-        parent::__construct($domain);
-        $this->setNickname($nickname);
-        $this->setUsername($username);
-        $this->setStartNickname($startNickname);
-    }
-
-    /**
-     * Set the nickname to query for. When set, only users with a nickname
-     * matching this value will be returned in search results. Set to
-     * null to disable filtering by username.
-     *
-     * @param string $value The nickname to filter search results by, or null
-     *          to  disable.
-     */
-     public function setNickname($value)
-     {
-         $this->_nickname = $value;
-     }
-
-    /**
-     * Get the nickname to query for. If no nickname is set, null will be
-     * returned.
-     *
-     * @see setNickname
-     * @return string The nickname to filter search results by, or null if
-     *              disabled.
-     */
-    public function getNickname()
-    {
-        return $this->_nickname;
-    }
-
-    /**
-     * Set the username to query for. When set, only users with a username
-     * matching this value will be returned in search results. Set to
-     * null to disable filtering by username.
-     *
-     * @param string $value The username to filter search results by, or null
-     *          to disable.
-     */
-    public function setUsername($value)
-    {
-        if ($value !== null) {
-            $this->_params['username'] = $value;
-        }
-        else {
-            unset($this->_params['username']);
-        }
-    }
-
-    /**
-     * Get the username to query for. If no username is set, null will be
-     * returned.
-     *
-     * @see setUsername
-     * @return string The username to filter search results by, or null if
-     *              disabled.
-     */
-    public function getUsername()
-    {
-        if (array_key_exists('username', $this->_params)) {
-            return $this->_params['username'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set the first nickname which should be displayed when retrieving
-     * a list of nicknames.
-     *
-     * @param string $value The first nickname to be returned, or null to
-     *              disable.
-     */
-    public function setStartNickname($value)
-    {
-        if ($value !== null) {
-            $this->_params['startNickname'] = $value;
-        } else {
-            unset($this->_params['startNickname']);
-        }
-    }
-
-    /**
-     * Get the first nickname which should be displayed when retrieving
-     * a list of nicknames.
-     *
-     * @return string The first nickname to be returned, or null to
-     *              disable.
-     */
-    public function getStartNickname()
-    {
-        if (array_key_exists('startNickname', $this->_params)) {
-            return $this->_params['startNickname'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     */
-    public function getQueryUrl()
-    {
-
-        $uri = $this->getBaseUrl();
-        $uri .= Zend_Gdata_Gapps::APPS_NICKNAME_PATH;
-        if ($this->_nickname !== null) {
-            $uri .= '/' . $this->_nickname;
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/Query.php b/airtime_mvc/library/Zend/Gdata/Gapps/Query.php
deleted file mode 100644
index e5d656763..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/Query.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Zend_Gdata_Gapps
- */
-require_once('Zend/Gdata/Gapps.php');
-
-/**
- * Assists in constructing queries for Google Apps entries. This class
- * provides common methods used by all other Google Apps query classes.
- *
- * This class should never be instantiated directly. Instead, instantiate a
- * class which inherits from this class.
-  *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query
-{
-
-    /**
-     * The domain which is being administered via the Provisioning API.
-     *
-     * @var string
-     */
-    protected $_domain = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $domain (optional) The Google Apps-hosted domain to use
-     *          when constructing query URIs.
-     */
-    public function __construct($domain = null)
-    {
-        parent::__construct();
-        $this->_domain = $domain;
-    }
-
-    /**
-     * Set domain for this service instance. This should be a fully qualified
-     * domain, such as 'foo.example.com'.
-     *
-     * This value is used when calculating URLs for retrieving and posting
-     * entries. If no value is specified, a URL will have to be manually
-     * constructed prior to using any methods which interact with the Google
-     * Apps provisioning service.
-     *
-     * @param string $value The domain to be used for this session.
-     */
-    public function setDomain($value)
-    {
-        $this->_domain = $value;
-    }
-
-    /**
-     * Get domain for this service instance. This should be a fully qualified
-     * domain, such as 'foo.example.com'. If no domain is set, null will be
-     * returned.
-     *
-     * @see setDomain
-     * @return string The domain to be used for this session, or null if not
-     *          set.
-     */
-    public function getDomain()
-    {
-        return $this->_domain;
-    }
-
-    /**
-     * Returns the base URL used to access the Google Apps service, based
-     * on the current domain. The current domain can be temporarily
-     * overridden by providing a fully qualified domain as $domain.
-     *
-     * @see setDomain
-     * @param string $domain (optional) A fully-qualified domain to use
-     *          instead of the default domain for this service instance.
-     */
-     public function getBaseUrl($domain = null)
-     {
-         if ($domain !== null) {
-             return Zend_Gdata_Gapps::APPS_BASE_FEED_URI . '/' . $domain;
-         }
-         else if ($this->_domain !== null) {
-             return Zend_Gdata_Gapps::APPS_BASE_FEED_URI . '/' . $this->_domain;
-         }
-         else {
-             require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-             throw new Zend_Gdata_App_InvalidArgumentException(
-                 'Domain must be specified.');
-         }
-     }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/ServiceException.php b/airtime_mvc/library/Zend/Gdata/Gapps/ServiceException.php
deleted file mode 100644
index cd6b562b2..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/ServiceException.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ServiceException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Zend_Gdata_Gapps_Error
- */
-require_once 'Zend/Gdata/Gapps/Error.php';
-
-/**
- * Gdata Gapps Exception class. This is thrown when an
- * AppsForYourDomainErrors message is received from the Google Apps
- * servers.
- *
- * Several different errors may be represented by this exception. For a list
- * of error codes available, see getErrorCode.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_ServiceException extends Zend_Exception
-{
-
-    protected $_rootElement = "AppsForYourDomainErrors";
-
-    /**
-     * Array of Zend_Gdata_Error objects indexed by error code.
-     *
-     * @var array
-     */
-    protected $_errors = array();
-
-    /**
-     * Create a new ServiceException.
-     *
-     * @return array An array containing a collection of
-     *          Zend_Gdata_Gapps_Error objects.
-     */
-    public function __construct($errors = null) {
-        parent::__construct("Server errors encountered");
-        if ($errors !== null) {
-            $this->setErrors($errors);
-        }
-    }
-
-    /**
-     * Add a single Error object to the list of errors received by the
-     * server.
-     *
-     * @param Zend_Gdata_Gapps_Error $error An instance of an error returned
-     *          by the server. The error's errorCode must be set.
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function addError($error) {
-        // Make sure that we don't try to index an error that doesn't
-        // contain an index value.
-        if ($error->getErrorCode() == null) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception("Error encountered without corresponding error code.");
-        }
-
-        $this->_errors[$error->getErrorCode()] = $error;
-    }
-
-    /**
-     * Set the list of errors as sent by the server inside of an
-     * AppsForYourDomainErrors tag.
-     *
-     * @param array $array An associative array containing a collection of
-     *          Zend_Gdata_Gapps_Error objects. All errors must have their
-     *          errorCode value set.
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function setErrors($array) {
-        $this->_errors = array();
-        foreach ($array as $error) {
-            $this->addError($error);
-        }
-    }
-
-    /**
-     * Get the list of errors as sent by the server inside of an
-     * AppsForYourDomainErrors tag.
-     *
-     * @return array An associative array containing a collection of
-     *          Zend_Gdata_Gapps_Error objects, indexed by error code.
-     */
-    public function getErrors() {
-        return $this->_errors;
-    }
-
-    /**
-     * Return the Error object associated with a specific error code.
-     *
-     * @return Zend_Gdata_Gapps_Error The Error object requested, or null
-     *              if not found.
-     */
-    public function getError($errorCode) {
-        if (array_key_exists($errorCode, $this->_errors)) {
-            $result = $this->_errors[$errorCode];
-            return $result;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Check whether or not a particular error code was returned by the
-     * server.
-     *
-     * @param integer $errorCode The error code to check against.
-     * @return boolean Whether or not the supplied error code was returned
-     *          by the server.
-     */
-    public function hasError($errorCode) {
-        return array_key_exists($errorCode, $this->_errors);
-    }
-
-    /**
-     * Import an AppsForYourDomain error from XML.
-     *
-     * @param string $string The XML data to be imported
-     * @return Zend_Gdata_Gapps_ServiceException Provides a fluent interface.
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function importFromString($string) {
-        if ($string) {
-            // Check to see if an AppsForYourDomainError exists
-            //
-            // track_errors is temporarily enabled so that if an error
-            // occurs while parsing the XML we can append it to an
-            // exception by referencing $php_errormsg
-            @ini_set('track_errors', 1);
-            $doc = new DOMDocument();
-            $success = @$doc->loadXML($string);
-            @ini_restore('track_errors');
-
-            if (!$success) {
-                require_once 'Zend/Gdata/App/Exception.php';
-                // $php_errormsg is automatically generated by PHP if
-                // an error occurs while calling loadXML(), above.
-                throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg");
-            }
-
-            // Ensure that the outermost node is an AppsForYourDomain error.
-            // If it isn't, something has gone horribly wrong.
-            $rootElement = $doc->getElementsByTagName($this->_rootElement)->item(0);
-            if (!$rootElement) {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.');
-            }
-
-            foreach ($rootElement->childNodes as $errorNode) {
-                if (!($errorNode instanceof DOMText)) {
-                    $error = new Zend_Gdata_Gapps_Error();
-                    $error->transferFromDom($errorNode);
-                    $this->addError($error);
-                }
-            }
-            return $this;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null');
-        }
-
-    }
-
-    /**
-     * Get a human readable version of this exception.
-     *
-     * @return string
-     */
-    public function __toString() {
-        $result = "The server encountered the following errors processing the request:";
-        foreach ($this->_errors as $error) {
-            $result .= "\n" . $error->__toString();
-        }
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/UserEntry.php b/airtime_mvc/library/Zend/Gdata/Gapps/UserEntry.php
deleted file mode 100644
index ef643cdee..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/UserEntry.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_Login
- */
-require_once 'Zend/Gdata/Gapps/Extension/Login.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_Name
- */
-require_once 'Zend/Gdata/Gapps/Extension/Name.php';
-
-/**
- * @see Zend_Gdata_Gapps_Extension_Quota
- */
-require_once 'Zend/Gdata/Gapps/Extension/Quota.php';
-
-/**
- * Data model class for a Google Apps User Entry.
- *
- * Each user entry describes a single user within a Google Apps hosted
- * domain.
- *
- * To transfer user entries to and from the Google Apps servers, including
- * creating new entries, refer to the Google Apps service class,
- * Zend_Gdata_Gapps.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_UserEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_UserEntry';
-
-    /**
-     * <apps:login> element containing information about this user's
-     * account, including their username and permissions.
-     *
-     * @var Zend_Gdata_Gapps_Extension_Login
-     */
-    protected $_login = null;
-
-    /**
-     * <apps:name> element containing the user's actual name.
-     *
-     * @var Zend_Gdata_Gapps_Extension_Name
-     */
-    protected $_name = null;
-
-    /**
-     * <apps:quotq> element describing any storage quotas in place for
-     * this user.
-     *
-     * @var Zend_Gdata_Gapps_Extension_Quota
-     */
-    protected $_quota = null;
-
-    /**
-     * <gd:feedLink> element containing information about other feeds
-     * relevant to this entry.
-     *
-     * @var Zend_Gdata_Extension_FeedLink
-     */
-    protected $_feedLink = array();
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gapps::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_login !== null) {
-            $element->appendChild($this->_login->getDOM($element->ownerDocument));
-        }
-        if ($this->_name !== null) {
-            $element->appendChild($this->_name->getDOM($element->ownerDocument));
-        }
-        if ($this->_quota !== null) {
-            $element->appendChild($this->_quota->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_feedLink as $feedLink) {
-            $element->appendChild($feedLink->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('apps') . ':' . 'login';
-                $login = new Zend_Gdata_Gapps_Extension_Login();
-                $login->transferFromDOM($child);
-                $this->_login = $login;
-                break;
-            case $this->lookupNamespace('apps') . ':' . 'name';
-                $name = new Zend_Gdata_Gapps_Extension_Name();
-                $name->transferFromDOM($child);
-                $this->_name = $name;
-                break;
-            case $this->lookupNamespace('apps') . ':' . 'quota';
-                $quota = new Zend_Gdata_Gapps_Extension_Quota();
-                $quota->transferFromDOM($child);
-                $this->_quota = $quota;
-                break;
-            case $this->lookupNamespace('gd') . ':' . 'feedLink';
-                $feedLink = new Zend_Gdata_Extension_FeedLink();
-                $feedLink->transferFromDOM($child);
-                $this->_feedLink[] = $feedLink;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value of the login property for this object.
-     *
-     * @see setLogin
-     * @return Zend_Gdata_Gapps_Extension_Login The requested object.
-     */
-    public function getLogin()
-    {
-        return $this->_login;
-    }
-
-    /**
-     * Set the value of the login property for this object. This property
-     * is used to store the username address of the current user.
-     *
-     * @param Zend_Gdata_Gapps_Extension_Login $value The desired value for
-     *          this instance's login property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
-     */
-    public function setLogin($value)
-    {
-        $this->_login = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the name property for this object.
-     *
-     * @see setName
-     * @return Zend_Gdata_Gapps_Extension_Name The requested object.
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set the value of the name property for this object. This property
-     * is used to store the full name of the current user.
-     *
-     * @param Zend_Gdata_Gapps_Extension_Name $value The desired value for
-     *          this instance's name property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
-     */
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value of the quota property for this object.
-     *
-     * @see setQuota
-     * @return Zend_Gdata_Gapps_Extension_Quota The requested object.
-     */
-    public function getQuota()
-    {
-        return $this->_quota;
-    }
-
-    /**
-     * Set the value of the quota property for this object. This property
-     * is used to store the amount of storage available for the current
-     * user. Quotas may not be modifiable depending on the domain used.
-     *
-     * @param Zend_Gdata_Gapps_Extension_Quota $value The desired value for
-     *          this instance's quota property.
-     * @return Zend_Gdata_Gapps_UserEntry Provides a fluent interface.
-     */
-    public function setQuota($value)
-    {
-        $this->_quota = $value;
-        return $this;
-    }
-
-    /**
-     * Returns all feed links for this entry, or if a rel value is
-     * specified, the feed link associated with that value is returned.
-     *
-     * @param string $rel The rel value of the link to be found. If null,
-     *          the array of links is returned instead.
-     * @return mixed Either an array of Zend_Gdata_Extension_FeedLink
-     *          objects if $rel is null, a single
-     *          Zend_Gdata_Extension_FeedLink object if $rel is specified
-     *          and a matching feed link is found, or null if $rel is
-     *          specified and no matching feed link is found.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Set the value of the feed link property for this object. This property
-     * is used to provide links to alternative feeds relevant to this entry.
-     *
-     * @param array $value A collection of
-     *          Zend_Gdata_Gapps_Extension_FeedLink objects.
-     * @return Zend_Gdata_Gapps_EventEntry Provides a fluent interface.
-     */
-    public function setFeedLink($value)
-    {
-        $this->_feedLink = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/UserFeed.php b/airtime_mvc/library/Zend/Gdata/Gapps/UserFeed.php
deleted file mode 100644
index 1399c3d2d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/UserFeed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Gapps_UserEntry
- */
-require_once 'Zend/Gdata/Gapps/UserEntry.php';
-
-/**
- * Data model for a collection of Google Apps user entries, usually
- * provided by the Google Apps servers.
- *
- * For information on requesting this feed from a server, see the Google
- * Apps service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_UserFeed extends Zend_Gdata_Feed
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Gapps_UserEntry';
-    protected $_feedClassName = 'Zend_Gdata_Gapps_UserFeed';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gapps/UserQuery.php b/airtime_mvc/library/Zend/Gdata/Gapps/UserQuery.php
deleted file mode 100644
index d1528f141..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gapps/UserQuery.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Query
- */
-require_once('Zend/Gdata/Gapps/Query.php');
-
-/**
- * Assists in constructing queries for Google Apps user entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the Google Apps
- * service class, Zend_Gdata_Gapps.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gapps
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query
-{
-
-    /**
-     * If not null, specifies the username of the user who should be
-     * retrieved by this query.
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $domain (optional) The Google Apps-hosted domain to use
-     *          when constructing query URIs.
-     * @param string $username (optional) Value for the username
-     *          property.
-     * @param string $startUsername (optional) Value for the
-     *          startUsername property.
-     */
-    public function __construct($domain = null, $username = null,
-            $startUsername = null)
-    {
-        parent::__construct($domain);
-        $this->setUsername($username);
-        $this->setStartUsername($startUsername);
-    }
-
-    /**
-     * Set the username to query for. When set, only users with a username
-     * matching this value will be returned in search results. Set to
-     * null to disable filtering by username.
-     *
-     * @see getUsername
-     * @param string $value The username to filter search results by, or null to
-     *              disable.
-     */
-    public function setUsername($value)
-    {
-        $this->_username = $value;
-    }
-
-    /**
-     * Get the username to query for. If no username is set, null will be
-     * returned.
-     *
-     * @param string $value The username to filter search results by, or
-     *          null if disabled.
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Set the first username which should be displayed when retrieving
-     * a list of users.
-     *
-     * @param string $value The first username to be returned, or null to
-     *          disable.
-     */
-    public function setStartUsername($value)
-    {
-        if ($value !== null) {
-            $this->_params['startUsername'] = $value;
-        } else {
-            unset($this->_params['startUsername']);
-        }
-    }
-
-    /**
-     * Get the first username which should be displayed when retrieving
-     * a list of users.
-     *
-     * @see setStartUsername
-     * @return string The first username to be returned, or null if
-     *          disabled.
-     */
-    public function getStartUsername()
-    {
-        if (array_key_exists('startUsername', $this->_params)) {
-            return $this->_params['startUsername'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the query URL generated by this query instance.
-     *
-     * @return string The query URL for this instance.
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->getBaseUrl();
-        $uri .= Zend_Gdata_Gapps::APPS_USER_PATH;
-        if ($this->_username !== null) {
-            $uri .= '/' . $this->_username;
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase.php b/airtime_mvc/library/Zend/Gdata/Gbase.php
deleted file mode 100644
index 9bb8a9ec9..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gbase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Gbase_ItemFeed
- */
-require_once 'Zend/Gdata/Gbase/ItemFeed.php';
-
-/**
- * @see Zend_Gdata_Gbase_ItemEntry
- */
-require_once 'Zend/Gdata/Gbase/ItemEntry.php';
-
-/**
- * @see Zend_Gdata_Gbase_SnippetEntry
- */
-require_once 'Zend/Gdata/Gbase/SnippetEntry.php';
-
-/**
- * @see Zend_Gdata_Gbase_SnippetFeed
- */
-require_once 'Zend/Gdata/Gbase/SnippetFeed.php';
-
-/**
- * Service class for interacting with the Google Base data API
- *
- * @link http://code.google.com/apis/base
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase extends Zend_Gdata
-{
-
-    /**
-     * Path to the customer items feeds on the Google Base server.
-     */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
-
-    /**
-     * Path to the snippets feeds on the Google Base server.
-     */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
-
-    /**
-     * Authentication service name for Google Base
-     */
-    const AUTH_SERVICE_NAME = 'gbase';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultPostUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * Namespaces used for Zend_Gdata_Gbase
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('g', 'http://base.google.com/ns/1.0', 1, 0),
-        array('batch', 'http://schemas.google.com/gdata/batch', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_Gbase object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google Apps servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Gbase');
-        $this->registerPackage('Zend_Gdata_Gbase_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-    }
-
-    /**
-     * Retreive feed object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function getGbaseItemFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::GBASE_ITEM_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gbase_ItemFeed');
-    }
-
-    /**
-     * Retreive entry object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_ItemEntry
-     */
-    public function getGbaseItemEntry($location = null)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Gbase_ItemEntry');
-    }
-
-    /**
-     * Insert an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to upload
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function insertGbaseItem($entry, $dryRun = false)
-    {
-        if ($dryRun == false) {
-            $uri = $this->_defaultPostUri;
-        } else {
-            $uri = $this->_defaultPostUri . '?dry-run=true';
-        }
-        $newitem = $this->insertEntry($entry, $uri, 'Zend_Gdata_Gbase_ItemEntry');
-        return $newitem;
-    }
-
-    /**
-     * Update an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to be updated
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemEntry
-     */
-    public function updateGbaseItem($entry, $dryRun = false)
-    {
-        $returnedEntry = $entry->save($dryRun);
-        return $returnedEntry;
-    }
-
-    /**
-     * Delete an entry
-     *
-     * @param Zend_Gdata_Gbase_ItemEntry $entry The Base entry to remove
-     * @param boolean $dryRun Flag for the 'dry-run' parameter
-     * @return Zend_Gdata_Gbase_ItemFeed
-     */
-    public function deleteGbaseItem($entry, $dryRun = false)
-    {
-        $entry->delete($dryRun);
-        return $this;
-    }
-
-    /**
-     * Retrieve feed object
-     *
-     * @param mixed $location The location for the feed, as a URL or Query
-     * @return Zend_Gdata_Gbase_SnippetFeed
-     */
-    public function getGbaseSnippetFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::GBASE_SNIPPET_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Gbase_SnippetFeed');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/Entry.php b/airtime_mvc/library/Zend/Gdata/Gbase/Entry.php
deleted file mode 100644
index 8741a8f85..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/Entry.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Gbase_Extension_BaseAttribute
- */
-require_once 'Zend/Gdata/Gbase/Extension/BaseAttribute.php';
-
-/**
- * Base class for working with Google Base entries.
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_Entry extends Zend_Gdata_Entry
-{
-
-    /**
-     * Name of the base class for Google Base entries
-     *
-     * var @string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_Entry';
-
-    /**
-     * Google Base attribute elements in the 'g' namespace
-     *
-     * @var array
-     */
-    protected $_baseAttributes = array();
-
-    /**
-     * Constructs a new Zend_Gdata_Gbase_ItemEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        foreach ($this->_baseAttributes as $baseAttribute) {
-            $element->appendChild($baseAttribute->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        if (strstr($absoluteNodeName, $this->lookupNamespace('g') . ':')) {
-            $baseAttribute = new Zend_Gdata_Gbase_Extension_BaseAttribute();
-            $baseAttribute->transferFromDOM($child);
-            $this->_baseAttributes[] = $baseAttribute;
-        } else {
-            parent::takeChildFromDOM($child);
-        }
-    }
-
-    /**
-     * Get the value of the itme_type
-     *
-     * @return Zend_Gdata_Gbase_Extension_ItemType The requested object.
-     */
-    public function getItemType()
-    {
-        $itemType = $this->getGbaseAttribute('item_type');
-        if (is_object($itemType[0])) {
-          return $itemType[0];
-        } else {
-          return null;
-        }
-    }
-
-    /**
-     * Return all the Base attributes
-     * @return Zend_Gdata_Gbase_Extension_BaseAttribute
-     */
-    public function getGbaseAttributes() {
-        return $this->_baseAttributes;
-    }
-
-    /**
-     * Return an array of Base attributes that match the given attribute name
-     *
-     * @param string $name The name of the Base attribute to look for
-     * @return array $matches Array that contains the matching list of Base attributes
-     */
-    public function getGbaseAttribute($name)
-    {
-        $matches = array();
-        for ($i = 0; $i < count($this->_baseAttributes); $i++) {
-            $baseAttribute = $this->_baseAttributes[$i];
-            if ($baseAttribute->rootElement == $name &&
-                $baseAttribute->rootNamespaceURI == $this->lookupNamespace('g')) {
-                $matches[] = &$this->_baseAttributes[$i];
-            }
-        }
-        return $matches;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/airtime_mvc/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php
deleted file mode 100644
index 85b2986ed..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BaseAttribute.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Element
- */
-require_once 'Zend/Gdata/App/Extension/Element.php';
-
-/**
- * Concrete class for working with ItemType elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_Element
-{
-
-    /**
-     * Namespace for Google Base elements
-     *
-     * var @string
-     */
-    protected $_rootNamespace = 'g';
-
-    /**
-     * Create a new instance.
-     *
-     * @param string $name (optional) The name of the Base attribute
-     * @param string $text (optional) The text value of the Base attribute
-     * @param string $text (optional) The type of the Base attribute
-     */
-    public function __construct($name = null, $text = null, $type = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        if ($type !== null) {
-          $attr = array('name' => 'type', 'value' => $type);
-          $typeAttr = array('type' => $attr);
-          $this->setExtensionAttributes($typeAttr);
-        }
-        parent::__construct($name,
-                            $this->_rootNamespace,
-                            $this->lookupNamespace($this->_rootNamespace),
-                            $text);
-    }
-
-    /**
-     * Get the name of the attribute
-     *
-     * @return attribute name The requested object.
-     */
-    public function getName() {
-      return $this->_rootElement;
-    }
-
-    /**
-     * Get the type of the attribute
-     *
-     * @return attribute type The requested object.
-     */
-    public function getType() {
-      $typeAttr = $this->getExtensionAttributes();
-      return $typeAttr['type']['value'];
-    }
-
-    /**
-     * Set the 'name' of the Base attribute object:
-     *     &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param Zend_Gdata_App_Extension_Element $attribute The attribute object
-     * @param string $name The name of the Base attribute
-     * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface
-     */
-    public function setName($name) {
-      $this->_rootElement = $name;
-      return $this;
-    }
-
-    /**
-     * Set the 'type' of the Base attribute object:
-     *     &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param Zend_Gdata_App_Extension_Element $attribute The attribute object
-     * @param string $type The type of the Base attribute
-     * @return Zend_Gdata_Extension_ItemEntry Provides a fluent interface
-     */
-    public function setType($type) {
-      $attr = array('name' => 'type', 'value' => $type);
-      $typeAttr = array('type' => $attr);
-      $this->setExtensionAttributes($typeAttr);
-      return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/Feed.php b/airtime_mvc/library/Zend/Gdata/Gbase/Feed.php
deleted file mode 100644
index 95f734c26..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/Feed.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Base class for the Google Base Feed
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed
-{
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Gbase_Feed';
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Gbase::$namespaces);
-        parent::__construct($element);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/ItemEntry.php b/airtime_mvc/library/Zend/Gdata/Gbase/ItemEntry.php
deleted file mode 100644
index 56249a865..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/ItemEntry.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ItemEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gbase_Entry
- */
-require_once 'Zend/Gdata/Gbase/Entry.php';
-
-/**
- * Concrete class for working with Item entries.
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry
-{
-    /**
-     * The classname for individual item entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry';
-
-    /**
-     * Set the value of the itme_type
-     *
-     * @param Zend_Gdata_Gbase_Extension_ItemType $value The desired value for the item_type
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function setItemType($value)
-    {
-        $this->addGbaseAttribute('item_type', $value, 'text');
-        return $this;
-    }
-
-    /**
-     * Adds a custom attribute to the entry in the following format:
-     * &lt;g:[$name] type='[$type]'&gt;[$value]&lt;/g:[$name]&gt;
-     *
-     * @param string $name The name of the attribute
-     * @param string $value The text value of the attribute
-     * @param string $type (optional) The type of the attribute.
-     *          e.g.: 'text', 'number', 'floatUnit'
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function addGbaseAttribute($name, $text, $type = null) {
-        $newBaseAttribute =  new Zend_Gdata_Gbase_Extension_BaseAttribute($name, $text, $type);
-        $this->_baseAttributes[] = $newBaseAttribute;
-        return $this;
-    }
-
-    /**
-     * Removes a Base attribute from the current list of Base attributes
-     *
-     * @param Zend_Gdata_Gbase_Extension_BaseAttribute $baseAttribute The attribute to be removed
-     * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface
-     */
-    public function removeGbaseAttribute($baseAttribute) {
-        $baseAttributes = $this->_baseAttributes;
-        for ($i = 0; $i < count($this->_baseAttributes); $i++) {
-            if ($this->_baseAttributes[$i] == $baseAttribute) {
-                array_splice($baseAttributes, $i, 1);
-                break;
-            }
-        }
-        $this->_baseAttributes = $baseAttributes;
-        return $this;
-    }
-
-    /**
-     * Uploads changes in this entry to the server using Zend_Gdata_App
-     *
-     * @param boolean $dryRun Whether the transaction is dry run or not.
-     * @param string|null $uri The URI to send requests to, or null if $data
-     *        contains the URI.
-     * @param string|null $className The name of the class that should we
-     *        deserializing the server response. If null, then
-     *        'Zend_Gdata_App_Entry' will be used.
-     * @param array $extraHeaders Extra headers to add to the request, as an
-     *        array of string-based key/value pairs.
-     * @return Zend_Gdata_App_Entry The updated entry
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function save($dryRun = false,
-                         $uri = null,
-                         $className = null,
-                         $extraHeaders = array())
-    {
-        if ($dryRun == true) {
-            $editLink = $this->getEditLink();
-            if ($uri == null && $editLink !== null) {
-                $uri = $editLink->getHref() . '?dry-run=true';
-            }
-            if ($uri === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.');
-            }
-            $service = new Zend_Gdata_App($this->getHttpClient());
-            return $service->updateEntry($this,
-                                         $uri,
-                                         $className,
-                                         $extraHeaders);
-        } else {
-            parent::save($uri, $className, $extraHeaders);
-        }
-    }
-
-    /**
-     * Deletes this entry to the server using the referenced
-     * Zend_Http_Client to do a HTTP DELETE to the edit link stored in this
-     * entry's link collection.
-     *
-     * @param boolean $dyrRun Whether the transaction is dry run or not
-     * @return void
-     * @throws Zend_Gdata_App_Exception
-     */
-    public function delete($dryRun = false)
-    {
-        $uri = null;
-
-        if ($dryRun == true) {
-            $editLink = $this->getEditLink();
-            if ($editLink !== null) {
-                $uri = $editLink->getHref() . '?dry-run=true';
-            }
-            if ($uri === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException('You must specify an URI which needs deleted.');
-            }
-            parent::delete($uri);
-        } else {
-            parent::delete();
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/ItemFeed.php b/airtime_mvc/library/Zend/Gdata/Gbase/ItemFeed.php
deleted file mode 100644
index 7f2f73f15..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/ItemFeed.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ItemFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gbase_Feed
- */
-require_once 'Zend/Gdata/Gbase/Feed.php';
-
-/**
- * Represents the Google Base Customer Items Feed
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_ItemFeed extends Zend_Gdata_Feed
-{
-    /**
-     * The classname for individual item feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_ItemEntry';
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/ItemQuery.php b/airtime_mvc/library/Zend/Gdata/Gbase/ItemQuery.php
deleted file mode 100644
index a7e0f2c75..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/ItemQuery.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ItemQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * @see Zend_Gdata_Gbase_Query
- */
-require_once('Zend/Gdata/Gbase/Query.php');
-
-
-/**
- * Assists in constructing queries for Google Base Customer Items Feed
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query
-{
-    /**
-     * Path to the customer items feeds on the Google Base server.
-     */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * The id of an item
-     *
-     * @var string
-     */
-    protected $_id = null;
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setId($value)
-    {
-        $this->_id = $value;
-        return $this;
-    }
-
-    /*
-     * @return string id
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the query URL generated by this query instance.
-     *
-     * @return string The query URL for this instance.
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-        if ($this->getId() !== null) {
-            $uri .= '/' . $this->getId();
-        } else {
-            $uri .= $this->getQueryString();
-        }
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/Query.php b/airtime_mvc/library/Zend/Gdata/Gbase/Query.php
deleted file mode 100644
index a55002524..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/Query.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Base
- *
- * @link http://code.google.com/apis/base
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query
-{
-
-    /**
-     * Path to the customer items feeds on the Google Base server.
-     */
-    const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items';
-
-    /**
-     * Path to the snippets feeds on the Google Base server.
-     */
-    const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI;
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_Query Provides a fluent interface
-     */
-    public function setKey($value)
-    {
-        if ($value !== null) {
-            $this->_params['key'] = $value;
-        } else {
-            unset($this->_params['key']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setBq($value)
-    {
-        if ($value !== null) {
-            $this->_params['bq'] = $value;
-        } else {
-            unset($this->_params['bq']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setRefine($value)
-    {
-        if ($value !== null) {
-            $this->_params['refine'] = $value;
-        } else {
-            unset($this->_params['refine']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setContent($value)
-    {
-        if ($value !== null) {
-            $this->_params['content'] = $value;
-        } else {
-            unset($this->_params['content']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setOrderBy($value)
-    {
-        if ($value !== null) {
-            $this->_params['orderby'] = $value;
-        } else {
-            unset($this->_params['orderby']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setSortOrder($value)
-    {
-        if ($value !== null) {
-            $this->_params['sortorder'] = $value;
-        } else {
-            unset($this->_params['sortorder']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setCrowdBy($value)
-    {
-        if ($value !== null) {
-            $this->_params['crowdby'] = $value;
-        } else {
-            unset($this->_params['crowdby']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Gbase_ItemQuery Provides a fluent interface
-     */
-    public function setAdjust($value)
-    {
-        if ($value !== null) {
-            $this->_params['adjust'] = $value;
-        } else {
-            unset($this->_params['adjust']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string key
-     */
-    public function getKey()
-    {
-        if (array_key_exists('key', $this->_params)) {
-            return $this->_params['key'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string bq
-     */
-    public function getBq()
-    {
-        if (array_key_exists('bq', $this->_params)) {
-            return $this->_params['bq'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string refine
-     */
-    public function getRefine()
-    {
-        if (array_key_exists('refine', $this->_params)) {
-            return $this->_params['refine'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string content
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->_params)) {
-            return $this->_params['content'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string orderby
-     */
-    public function getOrderBy()
-    {
-        if (array_key_exists('orderby', $this->_params)) {
-            return $this->_params['orderby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string sortorder
-     */
-    public function getSortOrder()
-    {
-        if (array_key_exists('sortorder', $this->_params)) {
-            return $this->_params['sortorder'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string crowdby
-     */
-    public function getCrowdBy()
-    {
-        if (array_key_exists('crowdby', $this->_params)) {
-            return $this->_params['crowdby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string adjust
-     */
-    public function getAdjust()
-    {
-        if (array_key_exists('adjust', $this->_params)) {
-            return $this->_params['adjust'];
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetEntry.php b/airtime_mvc/library/Zend/Gdata/Gbase/SnippetEntry.php
deleted file mode 100644
index 99431ec02..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetEntry.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SnippetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gbase_Entry
- */
-require_once 'Zend/Gdata/Gbase/Entry.php';
-
-/**
- * Concrete class for working with Snippet entries.
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_SnippetEntry extends Zend_Gdata_Gbase_Entry
-{
-    /**
-     * The classname for individual snippet entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry';
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetFeed.php b/airtime_mvc/library/Zend/Gdata/Gbase/SnippetFeed.php
deleted file mode 100644
index 3d3162a04..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetFeed.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SnippetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gbase_Feed
- */
-require_once 'Zend/Gdata/Gbase/Feed.php';
-
-/**
- * Represents the Google Base Snippets Feed
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_SnippetFeed extends Zend_Gdata_Feed
-{
-    /**
-     * The classname for individual snippet feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Gbase_SnippetEntry';
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetQuery.php b/airtime_mvc/library/Zend/Gdata/Gbase/SnippetQuery.php
deleted file mode 100644
index 52debcfa2..000000000
--- a/airtime_mvc/library/Zend/Gdata/Gbase/SnippetQuery.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SnippetQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Zend_Gdata_Gbase_Query
- */
-require_once('Zend/Gdata/Gbase/Query.php');
-
-/**
- * Assists in constructing queries for Google Base Snippets Feed
- *
- * @link http://code.google.com/apis/base/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gbase
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query
-{
-    /**
-     * Path to the snippets feeds on the Google Base server.
-     */
-    const BASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::BASE_SNIPPET_FEED_URI;
-
-    /**
-     * Returns the query URL generated by this query instance.
-     *
-     * @return string The query URL for this instance.
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-        if ($this->getCategory() !== null) {
-            $uri .= '/-/' . $this->getCategory();
-        }
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo.php b/airtime_mvc/library/Zend/Gdata/Geo.php
deleted file mode 100644
index 12a7d67bd..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Geo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * Service class for interacting with the services which use the
- * GeoRSS + GML extensions.
- * @link http://georss.org/
- * @link http://www.opengis.net/gml/
- * @link http://code.google.com/apis/picasaweb/reference.html#georss_reference
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo extends Zend_Gdata
-{
-
-    /**
-     * Namespaces used for Zend_Gdata_Geo
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('georss', 'http://www.georss.org/georss', 1, 0),
-        array('gml', 'http://www.opengis.net/gml', 1, 0)
-    );
-
-
-    /**
-     * Create Zend_Gdata_Geo object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google Apps servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Geo');
-        $this->registerPackage('Zend_Gdata_Geo_Extension');
-        parent::__construct($client, $applicationId);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo/Entry.php b/airtime_mvc/library/Zend/Gdata/Geo/Entry.php
deleted file mode 100644
index b6baefbef..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo/Entry.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Geo
- */
-require_once 'Zend/Gdata/Geo.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GeoRssWhere
- */
-require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php';
-
-/**
- * An Atom entry containing Geograpic data.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo_Entry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Geo_Entry';
-
-    protected $_where = null;
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Geo::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_where != null) {
-            $element->appendChild($this->_where->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('georss') . ':' . 'where':
-            $where = new Zend_Gdata_Geo_Extension_GeoRssWhere();
-            $where->transferFromDOM($child);
-            $this->_where = $where;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function getWhere()
-    {
-        return $this->_where;
-    }
-
-    public function setWhere($value)
-    {
-        $this->_where = $value;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/airtime_mvc/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
deleted file mode 100644
index 11e7b5e86..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GeoRssWhere.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Geo
- */
-require_once 'Zend/Gdata/Geo.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GmlPoint
- */
-require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php';
-
-
-/**
- * Represents the georss:where element used by the Gdata Geo extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo_Extension_GeoRssWhere extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'georss';
-    protected $_rootElement = 'where';
-
-    /**
-     * The point location for this geo element
-     *
-     * @var Zend_Gdata_Geo_Extension_GmlPoint
-     */
-    protected $_point = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param Zend_Gdata_Geo_Extension_GmlPoint $point (optional) Point to which
-     *          object should be initialized.
-     */
-    public function __construct($point = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Geo::$namespaces);
-        parent::__construct();
-        $this->setPoint($point);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_point !== null) {
-            $element->appendChild($this->_point->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gml') . ':' . 'Point';
-                $point = new Zend_Gdata_Geo_Extension_GmlPoint();
-                $point->transferFromDOM($child);
-                $this->_point = $point;
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's point attribute.
-     *
-     * @see setPoint
-     * @return Zend_Gdata_Geo_Extension_GmlPoint The requested attribute.
-     */
-    public function getPoint()
-    {
-        return $this->_point;
-    }
-
-    /**
-     * Set the value for this element's point attribute.
-     *
-     * @param Zend_Gdata_Geo_Extension_GmlPoint $value The desired value for this attribute.
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere Provides a fluent interface
-     */
-    public function setPoint($value)
-    {
-        $this->_point = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPoint.php b/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPoint.php
deleted file mode 100644
index 7312a492a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPoint.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GmlPoint.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Geo
- */
-require_once 'Zend/Gdata/Geo.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GmlPos
- */
-require_once 'Zend/Gdata/Geo/Extension/GmlPos.php';
-
-
-/**
- * Represents the gml:point element used by the Gdata Geo extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo_Extension_GmlPoint extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gml';
-    protected $_rootElement = 'Point';
-
-    /**
-     * The position represented by this GmlPoint
-     *
-     * @var Zend_Gdata_Geo_Extension_GmlPos
-     */
-    protected $_pos = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param Zend_Gdata_Geo_Extension_GmlPos $pos (optional) Pos to which this
-     *          object should be initialized.
-     */
-    public function __construct($pos = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Geo::$namespaces);
-        parent::__construct();
-        $this->setPos($pos);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_pos !== null) {
-            $element->appendChild($this->_pos->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gml') . ':' . 'pos';
-                $pos = new Zend_Gdata_Geo_Extension_GmlPos();
-                $pos->transferFromDOM($child);
-                $this->_pos = $pos;
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's pos attribute.
-     *
-     * @see setPos
-     * @return Zend_Gdata_Geo_Extension_GmlPos The requested attribute.
-     */
-    public function getPos()
-    {
-        return $this->_pos;
-    }
-
-    /**
-     * Set the value for this element's distance attribute.
-     *
-     * @param Zend_Gdata_Geo_Extension_GmlPos $value The desired value for this attribute
-     * @return Zend_Gdata_Geo_Extension_GmlPoint Provides a fluent interface
-     */
-    public function setPos($value)
-    {
-        $this->_pos = $value;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPos.php b/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPos.php
deleted file mode 100644
index de8012752..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo/Extension/GmlPos.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GmlPos.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Geo
- */
-require_once 'Zend/Gdata/Geo.php';
-
-/**
- * Represents the gml:pos element used by the Gdata Geo extensions.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo_Extension_GmlPos extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gml';
-    protected $_rootElement = 'pos';
-
-    /**
-     * Constructs a new Zend_Gdata_Geo_Extension_GmlPos object.
-     *
-     * @param string $text (optional) The value to use for this element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Geo::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Geo/Feed.php b/airtime_mvc/library/Zend/Gdata/Geo/Feed.php
deleted file mode 100644
index 88aae3bcb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Geo/Feed.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_eed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Geo
- */
-require_once 'Zend/Gdata/Geo.php';
-
-/**
- * @see Zend_Gdata_Geo_Entry
- */
-require_once 'Zend/Gdata/Geo/Entry.php';
-
-/**
- * Feed for Gdata Geographic data entries.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Geo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Geo_Feed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Geo_Entry';
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Geo::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health.php b/airtime_mvc/library/Zend/Gdata/Health.php
deleted file mode 100644
index 3551f16d8..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Health.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileFeed
- */
-require_once 'Zend/Gdata/Health/ProfileFeed.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileListFeed
- */
-require_once 'Zend/Gdata/Health/ProfileListFeed.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileListEntry
- */
-require_once 'Zend/Gdata/Health/ProfileListEntry.php';
-
-/**
- * @see Zend_Gdata_Health_ProfileEntry
- */
-require_once 'Zend/Gdata/Health/ProfileEntry.php';
-
-/**
- * Service class for interacting with the Google Health Data API
- *
- * @link http://code.google.com/apis/health
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health extends Zend_Gdata
-{
-    /**
-     * URIs of the AuthSub/OAuth feeds.
-     */
-    const AUTHSUB_PROFILE_FEED_URI =
-        'https://www.google.com/health/feeds/profile/default';
-    const AUTHSUB_REGISTER_FEED_URI =
-        'https://www.google.com/health/feeds/register/default';
-
-    /**
-     * URIs of the ClientLogin feeds.
-     */
-    const CLIENTLOGIN_PROFILELIST_FEED_URI =
-        'https://www.google.com/health/feeds/profile/list';
-    const CLIENTLOGIN_PROFILE_FEED_URI =
-        'https://www.google.com/health/feeds/profile/ui';
-    const CLIENTLOGIN_REGISTER_FEED_URI =
-        'https://www.google.com/health/feeds/register/ui';
-
-    /**
-     * Authentication service names for Google Health and the H9 Sandbox.
-     */
-    const HEALTH_SERVICE_NAME = 'health';
-    const H9_SANDBOX_SERVICE_NAME = 'weaver';
-
-    /**
-     * Profile ID used for all API interactions.  This can only be set when
-     * using ClientLogin for authentication.
-     *
-     * @var string
-     */
-    private $_profileID = null;
-
-    /**
-     * True if API calls should be made to the H9 developer sandbox at /h9
-     * rather than /health
-     *
-     * @var bool
-     */
-    private $_useH9Sandbox = false;
-
-    public static $namespaces =
-        array('ccr' => 'urn:astm-org:CCR',
-              'batch' => 'http://schemas.google.com/gdata/batch',
-              'h9m' => 'http://schemas.google.com/health/metadata',
-              'gAcl' => 'http://schemas.google.com/acl/2007',
-              'gd' => 'http://schemas.google.com/g/2005');
-
-    /**
-     * Create Zend_Gdata_Health object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *     when communicating with the Google Health servers.
-     * @param string $applicationId The identity of the application in the form
-     *     of Company-AppName-Version
-     * @param bool $useH9Sandbox True if the H9 Developer's Sandbox should be
-     *     used instead of production Google Health.
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0', $useH9Sandbox = false)
-    {
-        $this->registerPackage('Zend_Gdata_Health');
-        $this->registerPackage('Zend_Gdata_Health_Extension_Ccr');
-        parent::__construct($client, $applicationId);
-        $this->_useH9Sandbox = $useH9Sandbox;
-    }
-
-    /**
-     * Gets the id of the user's profile
-     *
-     * @return string The profile id
-     */
-    public function getProfileID()
-    {
-        return $this->_profileID;
-    }
-
-    /**
-     * Sets which of the user's profiles will be used
-     *
-     * @param string $id The profile ID
-     * @return Zend_Gdata_Health Provides a fluent interface
-     */
-    public function setProfileID($id) {
-        $this->_profileID = $id;
-        return $this;
-    }
-
-     /**
-     * Retrieves the list of profiles associated with the user's ClientLogin
-     * credentials.
-     *
-     * @param string $query The query of the feed as a URL or Query object
-     * @return Zend_Gdata_Feed
-     */
-    public function getHealthProfileListFeed($query = null)
-    {
-        if ($this->_httpClient->getClientLoginToken() === null) {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                'Profiles list feed is only available when using ClientLogin');
-        }
-
-        if($query === null)  {
-            $uri = self::CLIENTLOGIN_PROFILELIST_FEED_URI;
-        } else if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else {
-            $uri = $query;
-        }
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileListFeed');
-    }
-
-    /**
-     * Retrieve a user's profile as a feed object.  If ClientLogin is used, the
-     * profile associated with $this->_profileID is returned, otherwise
-     * the profile associated with the AuthSub token is read.
-     *
-     * @param mixed $query The query for the feed, as a URL or Query
-     * @return Zend_Gdata_Health_ProfileFeed
-     */
-    public function getHealthProfileFeed($query = null)
-    {
-        if ($this->_httpClient->getClientLoginToken() !== null &&
-            $this->getProfileID() == null) {
-            require_once 'Zend/Gdata/App/AuthException.php';
-            throw new Zend_Gdata_App_AuthException(
-                'Profile ID must not be null. Did you call setProfileID()?');
-        }
-
-        if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else if ($this->_httpClient->getClientLoginToken() !== null &&
-                   $query == null) {
-            $uri = self::CLIENTLOGIN_PROFILE_FEED_URI . '/' . $this->getProfileID();
-        } else if ($query === null) {
-            $uri = self::AUTHSUB_PROFILE_FEED_URI;
-        } else {
-            $uri = $query;
-        }
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Health_ProfileFeed');
-    }
-
-    /**
-     * Retrieve a profile entry object
-     *
-     * @param mixed $query The query for the feed, as a URL or Query
-     * @return Zend_Gdata_Health_ProfileEntry
-     */
-    public function getHealthProfileEntry($query = null)
-    {
-        if ($query === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Query must not be null');
-        } else if ($query instanceof Zend_Gdata_Query) {
-            $uri = $query->getQueryUrl();
-        } else {
-            $uri = $query;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Health_ProfileEntry');
-    }
-
-    /**
-     * Posts a new notice using the register feed.  This function constructs
-     * the atom profile entry.
-     *
-     * @param string $subject The subject line of the notice
-     * @param string $body The message body of the notice
-     * @param string $bodyType The (optional) type of message body
-     *     (text, xhtml, html, etc.)
-     * @param string $ccrXML The (optional) CCR to add to the user's profile
-     * @return Zend_Gdata_Health_ProfileEntry
-     */
-    public function sendHealthNotice($subject, $body, $bodyType = null, $ccrXML = null)
-    {
-        if ($this->_httpClient->getClientLoginToken()) {
-            $profileID = $this->getProfileID();
-            if ($profileID !== null) {
-                $uri = self::CLIENTLOGIN_REGISTER_FEED_URI . '/' . $profileID;
-            } else {
-                require_once 'Zend/Gdata/App/AuthException.php';
-                throw new Zend_Gdata_App_AuthException(
-                    'Profile ID must not be null. Did you call setProfileID()?');
-            }
-        } else {
-            $uri = self::AUTHSUB_REGISTER_FEED_URI;
-        }
-
-        $entry = new Zend_Gdata_Health_ProfileEntry();
-        $entry->title = $this->newTitle($subject);
-        $entry->content = $this->newContent($body);
-        $entry->content->type = $bodyType ? $bodyType : 'text';
-        $entry->setCcr($ccrXML);
-
-        // use correct feed for /h9 or /health
-        if ($this->_useH9Sandbox) {
-            $uri = preg_replace('/\/health\//', '/h9/', $uri);
-        }
-
-        return $this->insertEntry($entry, $uri, 'Zend_Gdata_Health_ProfileEntry');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/Extension/Ccr.php b/airtime_mvc/library/Zend/Gdata/Health/Extension/Ccr.php
deleted file mode 100644
index c51bacb8d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/Extension/Ccr.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ccr.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Element
- */
-require_once 'Zend/Gdata/App/Extension/Element.php';
-
-/**
- * Concrete class for working with CCR elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element
-{
-    protected $_rootNamespace = 'ccr';
-    protected $_rootElement = 'ContinuityOfCareRecord';
-    protected $_ccrDom = null;
-
-    /**
-     * Creates a Zend_Gdata_Health_Extension_Ccr entry, representing CCR data
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-    }
-
-    /**
-     * Transfers each child and attribute into member variables.
-     * This is called when XML is received over the wire and the data
-     * model needs to be built to represent this XML.
-     *
-     * @param DOMNode $node The DOMNode that represents this object's data
-     */
-    public function transferFromDOM($node)
-    {
-        $this->_ccrDom = $node;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        if ($doc === null) {
-            $doc = new DOMDocument('1.0', 'utf-8');
-        }
-        $domElement = $doc->importNode($this->_ccrDom, true);
-        return $domElement;
-    }
-
-    /**
-     * Magic helper that allows drilling down and returning specific elements
-     * in the CCR. For example, to retrieve the users medications
-     * (/ContinuityOfCareRecord/Body/Medications) from the entry's CCR, call
-     * $entry->getCcr()->getMedications().  Similarly, getConditions() would
-     * return extract the user's conditions.
-     *
-     * @param string $name Name of the function to call
-     * @param unknown $args
-     * @return array.<DOMElement> A list of the appropriate CCR data
-     */
-    public function __call($name, $args)
-    {
-        if (substr($name, 0, 3) === 'get') {
-            $category = substr($name, 3);
-
-            switch ($category) {
-                case 'Conditions':
-                    $category = 'Problems';
-                    break;
-                case 'Allergies':
-                    $category = 'Alerts';
-                    break;
-                case 'TestResults':
-                    // TestResults is an alias for LabResults
-                case 'LabResults':
-                    $category = 'Results';
-                    break;
-                default:
-                    // $category is already well formatted
-            }
-
-            return $this->_ccrDom->getElementsByTagNameNS($this->lookupNamespace('ccr'), $category);
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/ProfileEntry.php b/airtime_mvc/library/Zend/Gdata/Health/ProfileEntry.php
deleted file mode 100644
index b60b848bb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/ProfileEntry.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Health_Extension_Ccr
- */
-require_once 'Zend/Gdata/Health/Extension/Ccr.php';
-
-/**
- * Concrete class for working with Health profile entries.
- *
- * @link http://code.google.com/apis/health/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry
-{
-    /**
-     * The classname for individual profile entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry';
-
-    /**
-     * Google Health CCR data
-     *
-     * @var Zend_Gdata_Health_Extension_Ccr
-     */
-    protected $_ccrData = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Health_ProfileEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_ccrData !== null) {
-          $element->appendChild($this->_ccrData->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        if (strstr($absoluteNodeName, $this->lookupNamespace('ccr') . ':')) {
-            $ccrElement = new Zend_Gdata_Health_Extension_Ccr();
-            $ccrElement->transferFromDOM($child);
-            $this->_ccrData = $ccrElement;
-        } else {
-            parent::takeChildFromDOM($child);
-
-        }
-    }
-
-    /**
-     * Sets the profile entry's CCR data
-     * @param string $ccrXMLStr The CCR as an xml string
-     * @return Zend_Gdata_Health_Extension_Ccr
-     */
-    public function setCcr($ccrXMLStr) {
-        $ccrElement = null;
-        if ($ccrXMLStr != null) {
-          $ccrElement = new Zend_Gdata_Health_Extension_Ccr();
-          $ccrElement->transferFromXML($ccrXMLStr);
-          $this->_ccrData = $ccrElement;
-        }
-        return $ccrElement;
-    }
-
-
-    /**
-     * Returns all the CCR data in a profile entry
-     * @return Zend_Gdata_Health_Extension_Ccr
-     */
-    public function getCcr() {
-        return $this->_ccrData;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/ProfileFeed.php b/airtime_mvc/library/Zend/Gdata/Health/ProfileFeed.php
deleted file mode 100644
index 2938c0e09..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/ProfileFeed.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProfileFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Represents a Google Health user's Profile Feed
- *
- * @link http://code.google.com/apis/health/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed
-{
-    /**
-     * The class name for individual profile feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry';
-
-    /**
-     * Creates a Health Profile feed, representing a user's Health profile
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        foreach (Zend_Gdata_Health::$namespaces as $nsPrefix => $nsUri) {
-            $this->registerNamespace($nsPrefix, $nsUri);
-        }
-        parent::__construct($element);
-    }
-
-    public function getEntries()
-    {
-        return $this->entry;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/ProfileListEntry.php b/airtime_mvc/library/Zend/Gdata/Health/ProfileListEntry.php
deleted file mode 100644
index 601426898..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/ProfileListEntry.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProfileListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * Concrete class for working with Health profile list entries.
- *
- * @link http://code.google.com/apis/health/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry
-{
-    /**
-     * The classname for individual profile list entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry';
-
-    /**
-     * Constructs a new Zend_Gdata_Health_ProfileListEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        parent::takeChildFromDOM($child);
-    }
-
-    /**
-     * Retrieves the profile ID for the entry, which is contained in <atom:content>
-     * @return string The profile id
-     */
-    public function getProfileID() {
-        return $this->getContent()->text;
-    }
-
-    /**
-     * Retrieves the profile's title, which is contained in <atom:title>
-     * @return string The profile name
-     */
-    public function getProfileName() {
-        return $this->getTitle()->text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/ProfileListFeed.php b/airtime_mvc/library/Zend/Gdata/Health/ProfileListFeed.php
deleted file mode 100644
index e9165f245..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/ProfileListFeed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProfileListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * Represents a Google Health user's Profile List Feed
- *
- * @link http://code.google.com/apis/health/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed
-{
-    /**
-     * The class name for individual profile feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry';
-
-    public function getEntries()
-    {
-        return $this->entry;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Health/Query.php b/airtime_mvc/library/Zend/Gdata/Health/Query.php
deleted file mode 100644
index b581f6f4a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Health/Query.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Health
- *
- * @link http://code.google.com/apis/health
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Health_Query extends Zend_Gdata_Query
-{
-    /**
-     * URI of a user's profile feed.
-     */
-    const HEALTH_PROFILE_FEED_URI =
-        'https://www.google.com/health/feeds/profile/default';
-
-    /**
-     * URI of register (notices) feed.
-     */
-    const HEALTH_REGISTER_FEED_URI =
-        'https://www.google.com/health/feeds/register/default';
-
-    /**
-     * Namespace for an item category
-     */
-    const ITEM_CATEGORY_NS = 'http://schemas.google.com/health/item';
-
-    /**
-     * The default URI for POST methods
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = self::HEALTH_PROFILE_FEED_URI;
-
-    /**
-     * Sets the digest parameter's value.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setDigest($value)
-    {
-        if ($value !== null) {
-            $this->_params['digest'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the digest parameter's value.
-     *
-     * @return string The value set for the digest parameter.
-     */
-    public function getDigest()
-    {
-        if (array_key_exists('digest', $this->_params)) {
-            return $this->_params['digest'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for category queries.
-     *
-     * @param string $item A category to query.
-     * @param string $name (optional) A specific item to search a category for.
-     *     An example would be 'Lipitor' if $item is set to 'medication'.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setCategory($item, $name = null)
-    {
-        $this->_category = $item .
-            ($name ? '/' . urlencode('{' . self::ITEM_CATEGORY_NS . '}' . $name) : null);
-        return $this;
-    }
-
-    /**
-     * Returns the query object's category.
-     *
-     * @return string id
-     */
-    public function getCategory()
-    {
-        return $this->_category;
-    }
-
-    /**
-     * Setter for the grouped parameter.
-     *
-     * @param string $value setting a count of results per group.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setGrouped($value)
-    {
-        if ($value !== null) {
-            $this->_params['grouped'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the value set for the grouped parameter.
-     *
-     * @return string grouped parameter.
-     */
-    public function getGrouped()
-    {
-        if (array_key_exists('grouped', $this->_params)) {
-            return $this->_params['grouped'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for the max-results-group parameter.
-     *
-     * @param int $value Specifies the maximum number of groups to be
-     *     retrieved. Must be an integer value greater than zero. This parameter
-     *     is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setMaxResultsGroup($value)
-    {
-        if ($value !== null) {
-            if ($value <= 0 || $this->getGrouped() !== 'true') {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'The max-results-group parameter must be set to a value
-                    greater than 0 and can only be used if grouped=true');
-            } else {
-              $this->_params['max-results-group'] = $value;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for max-results-group.
-     *
-     * @return int Returns max-results-group parameter.
-     */
-    public function getMaxResultsGroup()
-    {
-        if (array_key_exists('max-results-group', $this->_params)) {
-            return $this->_params['max-results-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     *  Setter for the max-results-group parameter.
-     *
-     * @param int $value Specifies the maximum number of records to be
-     *     retrieved from each group.  The limits that you specify with this
-     *     parameter apply to all groups. Must be an integer value greater than
-     *     zero. This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setMaxResultsInGroup($value)
-    {
-        if ($value !== null) {
-            if ($value <= 0 || $this->getGrouped() !== 'true') {
-              throw new Zend_Gdata_App_InvalidArgumentException(
-                  'The max-results-in-group parameter must be set to a value
-                  greater than 0 and can only be used if grouped=true');
-            } else {
-              $this->_params['max-results-in-group'] = $value;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for max-results-in-group.
-     *
-     * @return int Returns max-results-in-group parameter.
-     */
-    public function getMaxResultsInGroup()
-    {
-        if (array_key_exists('max-results-in-group', $this->_params)) {
-            return $this->_params['max-results-in-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Setter for the start-index-group parameter.
-     *
-     * @param int $value Retrieves only items whose group ranking is at
-     *     least start-index-group. This should be set to a 1-based index of the
-     *     first group to be retrieved. The range is applied per category.
-     *     This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setStartIndexGroup($value)
-    {
-        if ($value !== null && $this->getGrouped() !== 'true') {
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'The start-index-group can only be used if grouped=true');
-        } else {
-          $this->_params['start-index-group'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     *  Returns the value set for start-index-group.
-     *
-     * @return int Returns start-index-group parameter.
-     */
-    public function getStartIndexGroup()
-    {
-        if (array_key_exists('start-index-group', $this->_params)) {
-            return $this->_params['start-index-group'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     *  Setter for the start-index-in-group parameter.
-     *
-     * @param int $value  A 1-based index of the records to be retrieved from
-     *     each group. This parameter is only valid if grouped=true.
-     * @return Zend_Gdata_Health_Query Provides a fluent interface
-     */
-    public function setStartIndexInGroup($value)
-    {
-        if ($value !== null && $this->getGrouped() !== 'true') {
-            throw new Zend_Gdata_App_InvalidArgumentException('start-index-in-group');
-        } else {
-          $this->_params['start-index-in-group'] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the value set for start-index-in-group.
-     *
-     * @return int Returns start-index-in-group parameter.
-     */
-    public function getStartIndexInGroup()
-    {
-        if (array_key_exists('start-index-in-group', $this->_params)) {
-            return $this->_params['start-index-in-group'];
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingProxy.php b/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingProxy.php
deleted file mode 100644
index 334d7ea11..000000000
--- a/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingProxy.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpAdapterStreamingProxy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client_Adapter_Proxy
- */
-require_once 'Zend/Http/Client/Adapter/Proxy.php';
-
-/**
- * Extends the proxy HTTP adapter to handle streams instead of discrete body
- * strings.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Proxy
-{
-    /**
-     * The amount read from a stream source at a time.
-     *
-     * @var integer
-     */
-    const CHUNK_SIZE = 1024;
-
-    /**
-     * Send request to the proxy server with streaming support
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        // If no proxy is set, throw an error
-        if (! $this->config['proxy_host']) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('No proxy host set!');
-        }
-
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Trying to write but we are not connected');
-        }
-
-        $host = $this->config['proxy_host'];
-        $port = $this->config['proxy_port'];
-
-        if ($this->connected_to[0] != $host || $this->connected_to[1] != $port) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Trying to write but we are connected to the wrong proxy ' .
-                'server');
-        }
-
-        // Add Proxy-Authorization header
-        if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization'])) {
-            $headers['proxy-authorization'] = Zend_Http_Client::encodeAuthHeader(
-                $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth']
-            );
-        }
-
-        // if we are proxying HTTPS, preform CONNECT handshake with the proxy
-        if ($uri->getScheme() == 'https' && (! $this->negotiated)) {
-            $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers);
-            $this->negotiated = true;
-        }
-
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        $request = "{$method} {$uri->__toString()} HTTP/{$http_ver}\r\n";
-
-        // Add all headers to the request string
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = "$k: $v";
-            $request .= "$v\r\n";
-        }
-
-        $request .= "\r\n";
-
-        // Send the request headers
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Error writing request to proxy server');
-        }
-
-        //read from $body, write to socket
-        while ($body->hasData()) {
-            if (! @fwrite($this->socket, $body->read(self::CHUNK_SIZE))) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception(
-                    'Error writing request to server');
-            }
-        }
-        return 'Large upload, request is not cached.';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingSocket.php b/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingSocket.php
deleted file mode 100644
index f8223fde1..000000000
--- a/airtime_mvc/library/Zend/Gdata/HttpAdapterStreamingSocket.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpAdapterStreamingSocket.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client_Adapter_Socket
- */
-require_once 'Zend/Http/Client/Adapter/Socket.php';
-
-/**
- * Extends the default HTTP adapter to handle streams instead of discrete body
- * strings.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Socket
-{
-
-    /**
-     * The amount read from a stream source at a time.
-     *
-     * @var integer
-     */
-    const CHUNK_SIZE = 1024;
-
-    /**
-     * Send request to the remote server with streaming support.
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(),
-        $body = '')
-    {
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Trying to write but we are not connected');
-        }
-
-        $host = $uri->getHost();
-        $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
-        if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Trying to write but we are connected to the wrong host');
-        }
-
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        $path = $uri->getPath();
-        if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
-        $request = "{$method} {$path} HTTP/{$http_ver}\r\n";
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = ucfirst($k) . ": $v";
-            $request .= "$v\r\n";
-        }
-
-        // Send the headers over
-        $request .= "\r\n";
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Error writing request to server');
-        }
-
-
-        //read from $body, write to socket
-        $chunk = $body->read(self::CHUNK_SIZE);
-        while ($chunk !== FALSE) {
-            if (! @fwrite($this->socket, $chunk)) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception(
-                    'Error writing request to server');
-            }
-            $chunk = $body->read(self::CHUNK_SIZE);
-        }
-        $body->closeFileHandle();
-        return 'Large upload, request is not cached.';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/HttpClient.php b/airtime_mvc/library/Zend/Gdata/HttpClient.php
deleted file mode 100644
index 82003ea25..000000000
--- a/airtime_mvc/library/Zend/Gdata/HttpClient.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpClient.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * Gdata Http Client object.
- *
- * Class to extend the generic Zend Http Client with the ability to perform
- * secure AuthSub requests
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_HttpClient extends Zend_Http_Client
-{
-
-    /**
-     * OpenSSL private key resource id
-     * This key is used for AuthSub authentication.  If this value is set,
-     * it is assuemd that secure AuthSub is desired.
-     *
-     * @var resource
-     */
-    private $_authSubPrivateKeyId = null;
-
-    /**
-     * Token for AuthSub authentication.
-     * If this token is set, AuthSub authentication is used.
-     *
-     * @var string
-     */
-    private $_authSubToken = null;
-
-    /**
-     * Token for ClientLogin authentication.
-     * If only this token is set, ClientLogin authentication is used.
-     *
-     * @var string
-     */
-    private $_clientLoginToken = null;
-
-    /**
-     * Token for ClientLogin authentication.
-     * If this token is set, and the AuthSub key is not set,
-     * ClientLogin authentication is used
-     *
-     * @var string
-     */
-    private $_clientLoginKey = null;
-
-    /**
-     * True if this request is being made with data supplied by
-     * a stream object instead of a raw encoded string.
-     *
-     * @var bool
-     */
-    protected $_streamingRequest = null;
-
-    /**
-     * Sets the PEM formatted private key, as read from a file.
-     *
-     * This method reads the file and then calls setAuthSubPrivateKey()
-     * with the file contents.
-     *
-     * @param string $file The location of the file containing the PEM key
-     * @param string $passphrase The optional private key passphrase
-     * @param bool $useIncludePath Whether to search the include_path
-     *                             for the file
-     * @return void
-     */
-    public function setAuthSubPrivateKeyFile($file, $passphrase = null,
-                                             $useIncludePath = false) {
-        $fp = @fopen($file, "r", $useIncludePath);
-        if (!$fp) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException('Failed to open private key file for AuthSub.');
-        }
-
-        $key = '';
-        while (!feof($fp)) {
-            $key .= fread($fp, 8192);
-        }
-        $this->setAuthSubPrivateKey($key, $passphrase);
-        fclose($fp);
-    }
-
-    /**
-     * Sets the PEM formatted private key to be used for secure AuthSub auth.
-     *
-     * In order to call this method, openssl must be enabled in your PHP
-     * installation.  Otherwise, a Zend_Gdata_App_InvalidArgumentException
-     * will be thrown.
-     *
-     * @param string $key The private key
-     * @param string $passphrase The optional private key passphrase
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
-     */
-    public function setAuthSubPrivateKey($key, $passphrase = null) {
-        if ($key != null && !function_exists('openssl_pkey_get_private')) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'You cannot enable secure AuthSub if the openssl module ' .
-                    'is not enabled in your PHP installation.');
-        }
-        $this->_authSubPrivateKeyId = openssl_pkey_get_private(
-                $key, $passphrase);
-        return $this;
-    }
-
-    /**
-     * Gets the openssl private key id
-     *
-     * @return string The private key
-     */
-    public function getAuthSubPrivateKeyId() {
-        return $this->_authSubPrivateKeyId;
-    }
-
-    /**
-     * Gets the AuthSub token used for authentication
-     *
-     * @return string The token
-     */
-    public function getAuthSubToken() {
-        return $this->_authSubToken;
-    }
-
-    /**
-     * Sets the AuthSub token used for authentication
-     *
-     * @param string $token The token
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
-     */
-    public function setAuthSubToken($token) {
-        $this->_authSubToken = $token;
-        return $this;
-    }
-
-    /**
-     * Gets the ClientLogin token used for authentication
-     *
-     * @return string The token
-     */
-    public function getClientLoginToken() {
-        return $this->_clientLoginToken;
-    }
-
-    /**
-     * Sets the ClientLogin token used for authentication
-     *
-     * @param string $token The token
-     * @return Zend_Gdata_HttpClient Provides a fluent interface
-     */
-    public function setClientLoginToken($token) {
-        $this->_clientLoginToken = $token;
-        return $this;
-    }
-
-    /**
-     * Filters the HTTP requests being sent to add the Authorization header.
-     *
-     * If both AuthSub and ClientLogin tokens are set,
-     * AuthSub takes precedence.  If an AuthSub key is set, then
-     * secure AuthSub authentication is used, and the request is signed.
-     * Requests must be signed only with the private key corresponding to the
-     * public key registered with Google.  If an AuthSub key is set, but
-     * openssl support is not enabled in the PHP installation, an exception is
-     * thrown.
-     *
-     * @param string $method The HTTP method
-     * @param string $url The URL
-     * @param array $headers An associate array of headers to be
-     *                       sent with the request or null
-     * @param string $body The body of the request or null
-     * @param string $contentType The MIME content type of the body or null
-     * @throws Zend_Gdata_App_Exception if there was a signing failure
-     * @return array The processed values in an associative array,
-     *               using the same names as the params
-     */
-    public function filterHttpRequest($method, $url, $headers = array(), $body = null, $contentType = null) {
-        if ($this->getAuthSubToken() != null) {
-            // AuthSub authentication
-            if ($this->getAuthSubPrivateKeyId() != null) {
-                // secure AuthSub
-                $time = time();
-                $nonce = mt_rand(0, 999999999);
-                $dataToSign = $method . ' ' . $url . ' ' . $time . ' ' . $nonce;
-
-                // compute signature
-                $pKeyId = $this->getAuthSubPrivateKeyId();
-                $signSuccess = openssl_sign($dataToSign, $signature, $pKeyId,
-                                            OPENSSL_ALGO_SHA1);
-                if (!$signSuccess) {
-                    require_once 'Zend/Gdata/App/Exception.php';
-                    throw new Zend_Gdata_App_Exception(
-                            'openssl_signing failure - returned false');
-                }
-                // encode signature
-                $encodedSignature = base64_encode($signature);
-
-                // final header
-                $headers['authorization'] = 'AuthSub token="' . $this->getAuthSubToken() . '" ' .
-                                            'data="' . $dataToSign . '" ' .
-                                            'sig="' . $encodedSignature . '" ' .
-                                            'sigalg="rsa-sha1"';
-            } else {
-                // AuthSub without secure tokens
-                $headers['authorization'] = 'AuthSub token="' . $this->getAuthSubToken() . '"';
-            }
-        } elseif ($this->getClientLoginToken() != null) {
-            $headers['authorization'] = 'GoogleLogin auth=' . $this->getClientLoginToken();
-        }
-        return array('method' => $method, 'url' => $url, 'body' => $body, 'headers' => $headers, 'contentType' => $contentType);
-    }
-
-    /**
-     * Method for filtering the HTTP response, though no filtering is
-     * currently done.
-     *
-     * @param Zend_Http_Response $response The response object to filter
-     * @return Zend_Http_Response The filterd response object
-     */
-    public function filterHttpResponse($response) {
-        return $response;
-    }
-
-    /**
-     * Return the current connection adapter
-     *
-     * @return Zend_Http_Client_Adapter_Interface|string $adapter
-     */
-    public function getAdapter()
-    {
-        return $this->adapter;
-    }
-
-   /**
-     * Load the connection adapter
-     *
-     * @param Zend_Http_Client_Adapter_Interface $adapter
-     * @return void
-     */
-    public function setAdapter($adapter)
-    {
-        if ($adapter == null) {
-            $this->adapter = $adapter;
-        } else {
-              parent::setAdapter($adapter);
-        }
-    }
-
-    /**
-     * Set the streamingRequest variable which controls whether we are
-     * sending the raw (already encoded) POST data from a stream source.
-     *
-     * @param boolean $value The value to set.
-     * @return void
-     */
-    public function setStreamingRequest($value)
-    {
-        $this->_streamingRequest = $value;
-    }
-
-    /**
-     * Check whether the client is set to perform streaming requests.
-     *
-     * @return boolean True if yes, false otherwise.
-     */
-    public function getStreamingRequest()
-    {
-        if ($this->_streamingRequest()) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Prepare the request body (for POST and PUT requests)
-     *
-     * @return string
-     * @throws Zend_Http_Client_Exception
-     */
-    protected function _prepareBody()
-    {
-        if($this->_streamingRequest) {
-            $this->setHeaders(self::CONTENT_LENGTH,
-                $this->raw_post_data->getTotalSize());
-            return $this->raw_post_data;
-        }
-        else {
-            return parent::_prepareBody();
-        }
-    }
-
-    /**
-     * Clear all custom parameters we set.
-     *
-     * @return Zend_Http_Client
-     */
-    public function resetParameters($clearAll = false)
-    {
-        $this->_streamingRequest = false;
-
-        return parent::resetParameters($clearAll);
-    }
-
-    /**
-     * Set the raw (already encoded) POST data from a stream source.
-     *
-     * This is used to support POSTing from open file handles without
-     * caching the entire body into memory. It is a wrapper around
-     * Zend_Http_Client::setRawData().
-     *
-     * @param string $data The request data
-     * @param string $enctype The encoding type
-     * @return Zend_Http_Client
-     */
-    public function setRawDataStream($data, $enctype = null)
-    {
-        $this->_streamingRequest = true;
-        return $this->setRawData($data, $enctype);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Kind/EventEntry.php b/airtime_mvc/library/Zend/Gdata/Kind/EventEntry.php
deleted file mode 100644
index 5597d076b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Kind/EventEntry.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * @see Zend_Gdata_Extension_Where
- */
-require_once 'Zend/Gdata/Extension/Where.php';
-
-/**
- * @see Zend_Gdata_Extension_When
- */
-require_once 'Zend/Gdata/Extension/When.php';
-
-/**
- * @see Zend_Gdata_Extension_Who
- */
-require_once 'Zend/Gdata/Extension/Who.php';
-
-/**
- * @see Zend_Gdata_Extension_Recurrence
- */
-require_once 'Zend/Gdata/Extension/Recurrence.php';
-
-/**
- * @see Zend_Gdata_Extension_EventStatus
- */
-require_once 'Zend/Gdata/Extension/EventStatus.php';
-
-/**
- * @see Zend_Gdata_Extension_Comments
- */
-require_once 'Zend/Gdata/Extension/Comments.php';
-
-/**
- * @see Zend_Gdata_Extension_Transparency
- */
-require_once 'Zend/Gdata/Extension/Transparency.php';
-
-/**
- * @see Zend_Gdata_Extension_Visibility
- */
-require_once 'Zend/Gdata/Extension/Visibility.php';
-
-/**
- * @see Zend_Gdata_Extension_ExtendedProperty
- */
-require_once 'Zend/Gdata/Extension/ExtendedProperty.php';
-
-/**
- * @see Zend_Gdata_Extension_OriginalEvent
- */
-require_once 'Zend/Gdata/Extension/OriginalEvent.php';
-
-/**
- * @see Zend_Gdata_Extension_EntryLink
- */
-require_once 'Zend/Gdata/Extension/EntryLink.php';
-
-/**
- * Data model for the Gdata Event "Kind".  Google Calendar has a separate
- * EventEntry class which extends this.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry
-{
-    protected $_who = array();
-    protected $_when = array();
-    protected $_where = array();
-    protected $_recurrence = null;
-    protected $_eventStatus = null;
-    protected $_comments = null;
-    protected $_transparency = null;
-    protected $_visibility = null;
-    protected $_recurrenceException = array();
-    protected $_extendedProperty = array();
-    protected $_originalEvent = null;
-    protected $_entryLink = null;
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_who != null) {
-            foreach ($this->_who as $who) {
-                $element->appendChild($who->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_when != null) {
-            foreach ($this->_when as $when) {
-                $element->appendChild($when->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_where != null) {
-            foreach ($this->_where as $where) {
-                $element->appendChild($where->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_recurrenceException != null) {
-            foreach ($this->_recurrenceException as $recurrenceException) {
-                $element->appendChild($recurrenceException->getDOM($element->ownerDocument));
-            }
-        }
-        if ($this->_extendedProperty != null) {
-            foreach ($this->_extendedProperty as $extProp) {
-                $element->appendChild($extProp->getDOM($element->ownerDocument));
-            }
-        }
-
-        if ($this->_recurrence != null) {
-            $element->appendChild($this->_recurrence->getDOM($element->ownerDocument));
-        }
-        if ($this->_eventStatus != null) {
-            $element->appendChild($this->_eventStatus->getDOM($element->ownerDocument));
-        }
-        if ($this->_comments != null) {
-            $element->appendChild($this->_comments->getDOM($element->ownerDocument));
-        }
-        if ($this->_transparency != null) {
-            $element->appendChild($this->_transparency->getDOM($element->ownerDocument));
-        }
-        if ($this->_visibility != null) {
-            $element->appendChild($this->_visibility->getDOM($element->ownerDocument));
-        }
-        if ($this->_originalEvent != null) {
-            $element->appendChild($this->_originalEvent->getDOM($element->ownerDocument));
-        }
-        if ($this->_entryLink != null) {
-            $element->appendChild($this->_entryLink->getDOM($element->ownerDocument));
-        }
-
-
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gd') . ':' . 'where';
-            $where = new Zend_Gdata_Extension_Where();
-            $where->transferFromDOM($child);
-            $this->_where[] = $where;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'when';
-            $when = new Zend_Gdata_Extension_When();
-            $when->transferFromDOM($child);
-            $this->_when[] = $when;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'who';
-            $who = new Zend_Gdata_Extension_Who();
-            $who ->transferFromDOM($child);
-            $this->_who[] = $who;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'recurrence';
-            $recurrence = new Zend_Gdata_Extension_Recurrence();
-            $recurrence->transferFromDOM($child);
-            $this->_recurrence = $recurrence;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'eventStatus';
-            $eventStatus = new Zend_Gdata_Extension_EventStatus();
-            $eventStatus->transferFromDOM($child);
-            $this->_eventStatus = $eventStatus;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'comments';
-            $comments = new Zend_Gdata_Extension_Comments();
-            $comments->transferFromDOM($child);
-            $this->_comments = $comments;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'transparency';
-            $transparency = new Zend_Gdata_Extension_Transparency();
-            $transparency ->transferFromDOM($child);
-            $this->_transparency = $transparency;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'visibility';
-            $visiblity = new Zend_Gdata_Extension_Visibility();
-            $visiblity ->transferFromDOM($child);
-            $this->_visibility = $visiblity;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'recurrenceException';
-            require_once 'Zend/Gdata/Extension/RecurrenceException.php';
-            $recurrenceException = new Zend_Gdata_Extension_RecurrenceException();
-            $recurrenceException ->transferFromDOM($child);
-            $this->_recurrenceException[] = $recurrenceException;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'originalEvent';
-            $originalEvent = new Zend_Gdata_Extension_OriginalEvent();
-            $originalEvent ->transferFromDOM($child);
-            $this->_originalEvent = $originalEvent;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'extendedProperty';
-            $extProp = new Zend_Gdata_Extension_ExtendedProperty();
-            $extProp->transferFromDOM($child);
-            $this->_extendedProperty[] = $extProp;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'entryLink':
-            $entryLink = new Zend_Gdata_Extension_EntryLink();
-            $entryLink->transferFromDOM($child);
-            $this->_entryLink = $entryLink;
-            break;
-
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    public function getWhen()
-    {
-        return $this->_when;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setWhen($value)
-    {
-        $this->_when = $value;
-        return $this;
-    }
-
-    public function getWhere()
-    {
-        return $this->_where;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setWhere($value)
-    {
-        $this->_where = $value;
-        return $this;
-    }
-
-    public function getWho()
-    {
-        return $this->_who;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setWho($value)
-    {
-        $this->_who = $value;
-        return $this;
-    }
-
-    public function getRecurrence()
-    {
-        return $this->_recurrence;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setRecurrence($value)
-    {
-        $this->_recurrence = $value;
-        return $this;
-    }
-
-    public function getEventStatus()
-    {
-        return $this->_eventStatus;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setEventStatus($value)
-    {
-        $this->_eventStatus = $value;
-        return $this;
-    }
-
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setComments($value)
-    {
-        $this->_comments = $value;
-        return $this;
-    }
-
-    public function getTransparency()
-    {
-        return $this->_transparency;
-    }
-
-    /**
-     * @param Zend_Gdata_Transparency $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setTransparency($value)
-    {
-        $this->_transparency = $value;
-        return $this;
-    }
-
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * @param Zend_Gdata_Visibility $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    public function getRecurrenceExcption()
-    {
-        return $this->_recurrenceException;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setRecurrenceException($value)
-    {
-        $this->_recurrenceException = $value;
-        return $this;
-    }
-
-    public function getExtendedProperty()
-    {
-        return $this->_extendedProperty;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setExtendedProperty($value)
-    {
-        $this->_extendedProperty = $value;
-        return $this;
-    }
-
-    public function getOriginalEvent()
-    {
-        return $this->_originalEvent;
-    }
-
-    /**
-     * @param Zend_Gdata_Extension_OriginalEvent $value
-     * @return Zend_Gdata_Kind_EventEntry Provides a fluent interface
-     */
-    public function setOriginalEvent($value)
-    {
-        $this->_originalEvent = $value;
-        return $this;
-    }
-
-    /**
-     * Get this entry's EntryLink element.
-     *
-     * @return Zend_Gdata_Extension_EntryLink The requested entry.
-     */
-    public function getEntryLink()
-    {
-        return $this->_entryLink;
-    }
-
-    /**
-     * Set the child's EntryLink element.
-     *
-     * @param Zend_Gdata_Extension_EntryLink $value The desired value for this attribute.
-     * @return Zend_Gdata_Extension_Who The element being modified.
-     */
-    public function setEntryLink($value)
-    {
-        $this->_entryLink = $value;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media.php b/airtime_mvc/library/Zend/Gdata/Media.php
deleted file mode 100644
index 6f51b084c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Media.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * Service class for interacting with the services which use the media extensions
- * @link http://code.google.com/apis/gdata/calendar.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media extends Zend_Gdata
-{
-
-    /**
-     * Namespaces used for Zend_Gdata_Photos
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('media', 'http://search.yahoo.com/mrss/', 1, 0)
-    );
-
-    /**
-     * Create Gdata_Media object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google Apps servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Media');
-        $this->registerPackage('Zend_Gdata_Media_Extension');
-        parent::__construct($client, $applicationId);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Entry.php b/airtime_mvc/library/Zend/Gdata/Media/Entry.php
deleted file mode 100644
index 92a23337a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Entry.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Media
- */
-require_once 'Zend/Gdata/Media.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaGroup
- */
-require_once 'Zend/Gdata/Media/Extension/MediaGroup.php';
-
-/**
- * Represents the Gdata flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Entry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Media_Entry';
-
-    /**
-     * media:group element
-     *
-     * @var Zend_Gdata_Media_Extension_MediaGroup
-     */
-    protected $_mediaGroup = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_mediaGroup != null) {
-            $element->appendChild($this->_mediaGroup->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('media') . ':' . 'group':
-            $mediaGroup = new Zend_Gdata_Media_Extension_MediaGroup();
-            $mediaGroup->transferFromDOM($child);
-            $this->_mediaGroup = $mediaGroup;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Returns the entry's mediaGroup object.
-     *
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-    */
-    public function getMediaGroup()
-    {
-        return $this->_mediaGroup;
-    }
-
-    /**
-     * Sets the entry's mediaGroup object.
-     *
-     * @param Zend_Gdata_Media_Extension_MediaGroup $mediaGroup
-     * @return Zend_Gdata_Media_Entry Provides a fluent interface
-     */
-    public function setMediaGroup($mediaGroup)
-    {
-        $this->_mediaGroup = $mediaGroup;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCategory.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCategory.php
deleted file mode 100644
index 1afd8419a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCategory.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaCategory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:category element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaCategory extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'category';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_scheme = null;
-    protected $_label = null;
-
-    /**
-     * Creates an individual MediaCategory object.
-     *
-     * @param string $text      Indication of the type and content of the media
-     * @param string $scheme    URI that identifies the categorization scheme
-     * @param string $label     Human-readable label to be displayed in applications
-     */
-    public function __construct($text = null, $scheme = null, $label = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_scheme = $scheme;
-        $this->_label = $label;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        if ($this->_label !== null) {
-            $element->setAttribute('label', $this->_label);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'scheme':
-            $this->_scheme = $attribute->nodeValue;
-            break;
-        case 'label':
-            $this->_label = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the URI that identifies the categorization scheme
-     * Optional.
-     *
-     * @return string URI that identifies the categorization scheme
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string $value     URI that identifies the categorization scheme
-     * @return Zend_Gdata_Media_Extension_MediaCategory Provides a fluent interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-    /**
-     * @return string Human-readable label to be displayed in applications
-     */
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    /**
-     * @param string $value     Human-readable label to be displayed in applications
-     * @return Zend_Gdata_Media_Extension_MediaCategory Provides a fluent interface
-     */
-    public function setLabel($value)
-    {
-        $this->_label = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaContent.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaContent.php
deleted file mode 100644
index f0655cb43..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaContent.php
+++ /dev/null
@@ -1,522 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the media:content element of Media RSS.
- * Represents media objects.  Multiple media objects representing
- * the same content can be represented using a
- * media:group (Zend_Gdata_Media_Extension_MediaGroup) element.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaContent extends Zend_Gdata_Extension
-{
-    protected $_rootElement = 'content';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * @var int
-     */
-    protected $_fileSize = null;
-
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * @var string
-     */
-    protected $_medium = null;
-
-    /**
-     * @var string
-     */
-    protected $_isDefault = null;
-
-    /**
-     * @var string
-     */
-    protected $_expression = null;
-
-    /**
-     * @var int
-     */
-    protected $_bitrate = null;
-
-    /**
-     * @var int
-     */
-    protected $_framerate = null;
-
-    /**
-     * @var int
-     */
-    protected $_samplingrate = null;
-
-    /**
-     * @var int
-     */
-    protected $_channels = null;
-
-    /**
-     * @var int
-     */
-    protected $_duration = null;
-
-    /**
-     * @var int
-     */
-    protected $_height = null;
-
-    /**
-     * @var int
-     */
-    protected $_width = null;
-
-    /**
-     * @var string
-     */
-    protected $_lang = null;
-
-    /**
-     * Creates an individual MediaContent object.
-     */
-    public function __construct($url = null, $fileSize = null, $type = null,
-            $medium = null, $isDefault = null, $expression = null,
-            $bitrate = null, $framerate = null, $samplingrate = null,
-            $channels = null, $duration = null, $height = null, $width = null,
-            $lang = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_url = $url;
-        $this->_fileSize = $fileSize;
-        $this->_type = $type;
-        $this->_medium = $medium;
-        $this->_isDefault = $isDefault;
-        $this->_expression = $expression;
-        $this->_bitrate = $bitrate;
-        $this->_framerate = $framerate;
-        $this->_samplingrate = $samplingrate;
-        $this->_channels = $channels;
-        $this->_duration = $duration;
-        $this->_height = $height;
-        $this->_width = $width;
-        $this->_lang = $lang;
-    }
-
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_url !== null) {
-            $element->setAttribute('url', $this->_url);
-        }
-        if ($this->_fileSize !== null) {
-            $element->setAttribute('fileSize', $this->_fileSize);
-        }
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        if ($this->_medium !== null) {
-            $element->setAttribute('medium', $this->_medium);
-        }
-        if ($this->_isDefault !== null) {
-            $element->setAttribute('isDefault', $this->_isDefault);
-        }
-        if ($this->_expression !== null) {
-            $element->setAttribute('expression', $this->_expression);
-        }
-        if ($this->_bitrate !== null) {
-            $element->setAttribute('bitrate', $this->_bitrate);
-        }
-        if ($this->_framerate !== null) {
-            $element->setAttribute('framerate', $this->_framerate);
-        }
-        if ($this->_samplingrate !== null) {
-            $element->setAttribute('samplingrate', $this->_samplingrate);
-        }
-        if ($this->_channels !== null) {
-            $element->setAttribute('channels', $this->_channels);
-        }
-        if ($this->_duration !== null) {
-            $element->setAttribute('duration', $this->_duration);
-        }
-        if ($this->_height !== null) {
-            $element->setAttribute('height', $this->_height);
-        }
-        if ($this->_width !== null) {
-            $element->setAttribute('width', $this->_width);
-        }
-        if ($this->_lang !== null) {
-            $element->setAttribute('lang', $this->_lang);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-            case 'url':
-                $this->_url = $attribute->nodeValue;
-                break;
-            case 'fileSize':
-                $this->_fileSize = $attribute->nodeValue;
-                break;
-            case 'type':
-                $this->_type = $attribute->nodeValue;
-                break;
-            case 'medium':
-                $this->_medium = $attribute->nodeValue;
-                break;
-            case 'isDefault':
-                $this->_isDefault = $attribute->nodeValue;
-                break;
-            case 'expression':
-                $this->_expression = $attribute->nodeValue;
-                break;
-            case 'bitrate':
-                $this->_bitrate = $attribute->nodeValue;
-                break;
-            case 'framerate':
-                $this->_framerate = $attribute->nodeValue;
-                break;
-            case 'samplingrate':
-                $this->_samplingrate = $attribute->nodeValue;
-                break;
-            case 'channels':
-                $this->_channels = $attribute->nodeValue;
-                break;
-            case 'duration':
-                $this->_duration = $attribute->nodeValue;
-                break;
-            case 'height':
-                $this->_height = $attribute->nodeValue;
-                break;
-            case 'width':
-                $this->_width = $attribute->nodeValue;
-                break;
-            case 'lang':
-                $this->_lang = $attribute->nodeValue;
-                break;
-            default:
-                parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the URL representing this MediaContent object
-     *
-     * @return string   The URL representing this MediaContent object.
-     */
-    public function __toString()
-    {
-        return $this->getUrl();
-    }
-
-    /**
-     * @return string   The direct URL to the media object
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * @param string $value     The direct URL to the media object
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setUrl($value)
-    {
-        $this->_url = $value;
-        return $this;
-    }
-
-    /**
-     * @return int  The size of the media in bytes
-     */
-    public function getFileSize()
-    {
-        return $this->_fileSize;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setFileSize($value)
-    {
-        $this->_fileSize = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMedium()
-    {
-        return $this->_medium;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setMedium($value)
-    {
-        $this->_medium = $value;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getIsDefault()
-    {
-        return $this->_isDefault;
-    }
-
-    /**
-     * @param bool $value
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setIsDefault($value)
-    {
-        $this->_isDefault = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getExpression()
-    {
-        return $this->_expression;
-    }
-
-    /**
-     * @param string
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setExpression($value)
-    {
-        $this->_expression = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBitrate()
-    {
-        return $this->_bitrate;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setBitrate($value)
-    {
-        $this->_bitrate = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getFramerate()
-    {
-        return $this->_framerate;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setFramerate($value)
-    {
-        $this->_framerate = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSamplingrate()
-    {
-        return $this->_samplingrate;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setSamplingrate($value)
-    {
-        $this->_samplingrate = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getChannels()
-    {
-        return $this->_channels;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setChannels($value)
-    {
-        $this->_channels = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDuration()
-    {
-        return $this->_duration;
-    }
-
-    /**
-     *
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setDuration($value)
-    {
-        $this->_duration = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setHeight($value)
-    {
-        $this->_height = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
-
-    /**
-     * @param int
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setWidth($value)
-    {
-        $this->_width = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLang()
-    {
-        return $this->_lang;
-    }
-
-    /**
-     * @param string
-     * @return Zend_Gdata_Media_Extension_MediaContent  Provides a fluent interface
-     */
-    public function setLang($value)
-    {
-        $this->_lang = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCopyright.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCopyright.php
deleted file mode 100644
index 737f0c3aa..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCopyright.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaCopyright.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:copyright element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaCopyright extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'copyright';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * @param string $text
-     * @param string $url
-     */
-    public function __construct($text = null, $url = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_url = $url;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_url !== null) {
-            $element->setAttribute('url', $this->_url);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'url':
-            $this->_url = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCopyright Provides a fluent interface
-     */
-    public function setUrl($value)
-    {
-        $this->_url = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCredit.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCredit.php
deleted file mode 100644
index 66ac282d4..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaCredit.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:credit element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaCredit extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'credit';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_role = null;
-
-    /**
-     * @var string
-     */
-    protected $_scheme = null;
-
-    /**
-     * Creates an individual MediaCredit object.
-     *
-     * @param string $text
-     * @param string $role
-     * @param string $scheme
-     */
-    public function __construct($text = null, $role = null,  $scheme = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_role = $role;
-        $this->_scheme = $scheme;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_role !== null) {
-            $element->setAttribute('role', $this->_role);
-        }
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'role':
-            $this->_role = $attribute->nodeValue;
-            break;
-        case 'scheme':
-            $this->_scheme = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getRole()
-    {
-        return $this->_role;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent interface
-     */
-    public function setRole($value)
-    {
-        $this->_role = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaDescription.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaDescription.php
deleted file mode 100644
index b98b830ca..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaDescription.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaDescription.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:description element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaDescription extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'description';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * @param string $text
-     * @param string $type
-     */
-    public function __construct($text = null, $type = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_type = $type;
-        $this->_text = $text;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaDescription Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaGroup.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaGroup.php
deleted file mode 100644
index 413365e2c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaGroup.php
+++ /dev/null
@@ -1,566 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaContent
- */
-require_once 'Zend/Gdata/Media/Extension/MediaContent.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaCategory
- */
-require_once 'Zend/Gdata/Media/Extension/MediaCategory.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaCopyright
- */
-require_once 'Zend/Gdata/Media/Extension/MediaCopyright.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaCredit
- */
-require_once 'Zend/Gdata/Media/Extension/MediaCredit.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaDescription
- */
-require_once 'Zend/Gdata/Media/Extension/MediaDescription.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaHash
- */
-require_once 'Zend/Gdata/Media/Extension/MediaHash.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaKeywords
- */
-require_once 'Zend/Gdata/Media/Extension/MediaKeywords.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaPlayer
- */
-require_once 'Zend/Gdata/Media/Extension/MediaPlayer.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaRating
- */
-require_once 'Zend/Gdata/Media/Extension/MediaRating.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaRestriction
- */
-require_once 'Zend/Gdata/Media/Extension/MediaRestriction.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaText
- */
-require_once 'Zend/Gdata/Media/Extension/MediaText.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaThumbnail
- */
-require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaTitle
- */
-require_once 'Zend/Gdata/Media/Extension/MediaTitle.php';
-
-
-/**
- * This class represents the media:group element of Media RSS.
- * It allows the grouping of media:content elements that are
- * different representations of the same content.  When it exists,
- * it is a child of an Entry (Atom) or Item (RSS).
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'group';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var array
-     */
-    protected $_content = array();
-
-    /**
-     * @var array
-     */
-    protected $_category = array();
-
-    /**
-     * @var Zend_Gdata_Media_Extension_MediaCopyright
-     */
-    protected $_copyright = null;
-
-    /**
-     * @var array
-     */
-    protected $_credit = array();
-
-    /**
-     * @var Zend_Gdata_Media_Extension_MediaDescription
-     */
-    protected $_description = null;
-
-    /**
-     * @var array
-     */
-    protected $_hash = array();
-
-    /**
-     * @var Zend_Gdata_Media_Extension_MediaKeywords
-     */
-    protected $_keywords = null;
-
-    /**
-     * @var array
-     */
-    protected $_player = array();
-
-    /**
-     * @var array
-     */
-    protected $_rating = array();
-
-    /**
-     * @var array
-     */
-    protected $_restriction = array();
-
-    /**
-     * @var array
-     */
-    protected $_mediaText = array();
-
-    /**
-     * @var array
-     */
-    protected $_thumbnail = array();
-
-    /**
-     * @var string
-     */
-    protected $_title = null;
-
-    /**
-     * Creates an individual MediaGroup object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        foreach ($this->_content as $content) {
-            $element->appendChild($content->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_category as $category) {
-            $element->appendChild($category->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_credit as $credit) {
-            $element->appendChild($credit->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_player as $player) {
-            $element->appendChild($player->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_rating as $rating) {
-            $element->appendChild($rating->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_restriction as $restriction) {
-            $element->appendChild($restriction->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_mediaText as $text) {
-            $element->appendChild($text->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_thumbnail as $thumbnail) {
-            $element->appendChild($thumbnail->getDOM($element->ownerDocument));
-        }
-        if ($this->_copyright != null) {
-            $element->appendChild(
-                    $this->_copyright->getDOM($element->ownerDocument));
-        }
-        if ($this->_description != null) {
-            $element->appendChild(
-                    $this->_description->getDOM($element->ownerDocument));
-        }
-        foreach ($this->_hash as $hash) {
-            $element->appendChild($hash->getDOM($element->ownerDocument));
-        }
-        if ($this->_keywords != null) {
-            $element->appendChild(
-                    $this->_keywords->getDOM($element->ownerDocument));
-        }
-        if ($this->_title != null) {
-            $element->appendChild(
-                    $this->_title->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('media') . ':' . 'content';
-                $content = new Zend_Gdata_Media_Extension_MediaContent();
-                $content->transferFromDOM($child);
-                $this->_content[] = $content;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'category';
-                $category = new Zend_Gdata_Media_Extension_MediaCategory();
-                $category->transferFromDOM($child);
-                $this->_category[] = $category;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'copyright';
-                $copyright = new Zend_Gdata_Media_Extension_MediaCopyright();
-                $copyright->transferFromDOM($child);
-                $this->_copyright = $copyright;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'credit';
-                $credit = new Zend_Gdata_Media_Extension_MediaCredit();
-                $credit->transferFromDOM($child);
-                $this->_credit[] = $credit;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'description';
-                $description = new Zend_Gdata_Media_Extension_MediaDescription();
-                $description->transferFromDOM($child);
-                $this->_description = $description;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'hash';
-                $hash = new Zend_Gdata_Media_Extension_MediaHash();
-                $hash->transferFromDOM($child);
-                $this->_hash[] = $hash;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'keywords';
-                $keywords = new Zend_Gdata_Media_Extension_MediaKeywords();
-                $keywords->transferFromDOM($child);
-                $this->_keywords = $keywords;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'player';
-                $player = new Zend_Gdata_Media_Extension_MediaPlayer();
-                $player->transferFromDOM($child);
-                $this->_player[] = $player;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'rating';
-                $rating = new Zend_Gdata_Media_Extension_MediaRating();
-                $rating->transferFromDOM($child);
-                $this->_rating[] = $rating;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'restriction';
-                $restriction = new Zend_Gdata_Media_Extension_MediaRestriction();
-                $restriction->transferFromDOM($child);
-                $this->_restriction[] = $restriction;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'text';
-                $text = new Zend_Gdata_Media_Extension_MediaText();
-                $text->transferFromDOM($child);
-                $this->_mediaText[] = $text;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'thumbnail';
-                $thumbnail = new Zend_Gdata_Media_Extension_MediaThumbnail();
-                $thumbnail->transferFromDOM($child);
-                $this->_thumbnail[] = $thumbnail;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'title';
-                $title = new Zend_Gdata_Media_Extension_MediaTitle();
-                $title->transferFromDOM($child);
-                $this->_title = $title;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getContent()
-    {
-        return $this->_content;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Media_MediaGroup Provides a fluent interface
-     */
-    public function setContent($value)
-    {
-        $this->_content = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCategory()
-    {
-        return $this->_category;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setCategory($value)
-    {
-        $this->_category = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_Media_Extension_MediaCopyright
-     */
-    public function getCopyright()
-    {
-        return $this->_copyright;
-    }
-
-    /**
-     * @param Zend_Gdata_Media_Extension_MediaCopyright $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setCopyright($value)
-    {
-        $this->_copyright = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getCredit()
-    {
-        return $this->_credit;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setCredit($value)
-    {
-        $this->_credit = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_Media_Extension_MediaTitle
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * @param Zend_Gdata_Media_Extension_MediaTitle $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setTitle($value)
-    {
-        $this->_title = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_Media_Extension_MediaDescription
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * @param Zend_Gdata_Media_Extension_MediaDescription $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setDescription($value)
-    {
-        $this->_description = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getHash()
-    {
-        return $this->_hash;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setHash($value)
-    {
-        $this->_hash = $value;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Gdata_Media_Extension_MediaKeywords
-     */
-    public function getKeywords()
-    {
-        return $this->_keywords;
-    }
-
-    /**
-     * @param array $value
-     * @return Zend_Gdata_Media_Extension_MediaGroup Provides a fluent interface
-     */
-    public function setKeywords($value)
-    {
-        $this->_keywords = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPlayer()
-    {
-        return $this->_player;
-    }
-
-    /**
-     * @param array
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setPlayer($value)
-    {
-        $this->_player = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRating()
-    {
-        return $this->_rating;
-    }
-
-    /**
-     * @param array
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setRating($value)
-    {
-        $this->_rating = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRestriction()
-    {
-        return $this->_restriction;
-    }
-
-    /**
-     * @param array
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setRestriction($value)
-    {
-        $this->_restriction = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getThumbnail()
-    {
-        return $this->_thumbnail;
-    }
-
-    /**
-     * @param array
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setThumbnail($value)
-    {
-        $this->_thumbnail = $value;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getMediaText()
-    {
-        return $this->_mediaText;
-    }
-
-    /**
-     * @param array
-     * @return Zend_Gdata_Media_Extension_MediaGroup
-     */
-    public function setMediaText($value)
-    {
-        $this->_mediaText = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaHash.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaHash.php
deleted file mode 100644
index a7d1c8932..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaHash.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaHash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:hash element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaHash extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'hash';
-    protected $_rootNamespace = 'media';
-    protected $_algo = null;
-
-    /**
-     * Constructs a new MediaHash element
-     *
-     * @param string $text
-     * @param string $algo
-     */
-    public function __construct($text = null, $algo = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_algo = $algo;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_algo !== null) {
-            $element->setAttribute('algo', $this->_algo);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'algo':
-            $this->_algo = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string The algo
-     */
-    public function getAlgo()
-    {
-        return $this->_algo;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaHash Provides a fluent interface
-     */
-    public function setAlgo($value)
-    {
-        $this->_algo = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaKeywords.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaKeywords.php
deleted file mode 100644
index 094feb871..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaKeywords.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaKeywords.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:keywords element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaKeywords extends Zend_Gdata_Extension
-{
-    protected $_rootElement = 'keywords';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * Constructs a new MediaKeywords element
-     */
-    public function __construct()
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaPlayer.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaPlayer.php
deleted file mode 100644
index 992340086..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaPlayer.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaPlayer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:player element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaPlayer extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'player';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * @var int
-     */
-    protected $_width = null;
-
-    /**
-     * @var int
-     */
-    protected $_height = null;
-
-    /**
-     * Constructs a new MediaPlayer element
-     *
-     * @param string $url
-     * @param int $width
-     * @param int $height
-     */
-    public function __construct($url = null, $width = null, $height = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_url = $url;
-        $this->_width = $width;
-        $this->_height = $height;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_url !== null) {
-            $element->setAttribute('url', $this->_url);
-        }
-        if ($this->_width !== null) {
-            $element->setAttribute('width', $this->_width);
-        }
-        if ($this->_height !== null) {
-            $element->setAttribute('height', $this->_height);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'url':
-            $this->_url = $attribute->nodeValue;
-            break;
-        case 'width':
-            $this->_width = $attribute->nodeValue;
-            break;
-        case 'height':
-            $this->_height = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
-     */
-    public function setUrl($value)
-    {
-        $this->_url = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
-     */
-    public function setWidth($value)
-    {
-        $this->_width = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaPlayer Provides a fluent interface
-     */
-    public function setHeight($value)
-    {
-        $this->_height = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRating.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRating.php
deleted file mode 100644
index 4228480fe..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRating.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:rating element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaRating extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'rating';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_scheme = null;
-
-    /**
-     * Constructs a new MediaRating element
-     *
-     * @param string $text
-     * @param string $scheme
-     */
-    public function __construct($text = null, $scheme = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_scheme = $scheme;
-        $this->_text = $text;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'scheme':
-            $this->_scheme = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRating Provides a fluent interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRestriction.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRestriction.php
deleted file mode 100644
index 80df52862..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaRestriction.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaRestriction.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:restriction element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaRestriction extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'restriction';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_relationship = null;
-
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * Constructs a new MediaRestriction element
-     *
-     * @param string $text
-     * @param string $relationship
-     * @param string $type
-     */
-    public function __construct($text = null, $relationship = null,  $type = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_relationship = $relationship;
-        $this->_type = $type;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_relationship !== null) {
-            $element->setAttribute('relationship', $this->_relationship);
-        }
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'relationship':
-            $this->_relationship = $attribute->nodeValue;
-            break;
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getRelationship()
-    {
-        return $this->_relationship;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRestriction Provides a fluent interface
-     */
-    public function setRelationship($value)
-    {
-        $this->_relationship = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaRestriction Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaText.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaText.php
deleted file mode 100644
index 33a951880..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaText.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaText.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:text element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'text';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * @var string
-     */
-    protected $_lang = null;
-
-    /**
-     * @var string
-     */
-    protected $_start = null;
-
-    /**
-     * @var string
-     */
-    protected $_end = null;
-
-    /**
-     * Constructs a new MediaText element
-     *
-     * @param $text string
-     * @param $type string
-     * @param $lang string
-     * @param $start string
-     * @param $end string
-     */
-    public function __construct($text = null, $type = null, $lang = null,
-            $start = null, $end = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_type = $type;
-        $this->_lang = $lang;
-        $this->_start = $start;
-        $this->_end = $end;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        if ($this->_lang !== null) {
-            $element->setAttribute('lang', $this->_lang);
-        }
-        if ($this->_start !== null) {
-            $element->setAttribute('start', $this->_start);
-        }
-        if ($this->_end !== null) {
-            $element->setAttribute('end', $this->_end);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        case 'lang':
-            $this->_lang = $attribute->nodeValue;
-            break;
-        case 'start':
-            $this->_start = $attribute->nodeValue;
-            break;
-        case 'end':
-            $this->_end = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLang()
-    {
-        return $this->_lang;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
-     */
-    public function setLang($value)
-    {
-        $this->_lang = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStart()
-    {
-        return $this->_start;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
-     */
-    public function setStart($value)
-    {
-        $this->_start = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEnd()
-    {
-        return $this->_end;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaText Provides a fluent interface
-     */
-    public function setEnd($value)
-    {
-        $this->_end = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaThumbnail.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
deleted file mode 100644
index d785702e5..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaThumbnail.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaThumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:thumbnail element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaThumbnail extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'thumbnail';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * @var int
-     */
-    protected $_width = null;
-
-    /**
-     * @var int
-     */
-    protected $_height = null;
-
-    /**
-     * @var string
-     */
-    protected $_time = null;
-
-    /**
-     * Constructs a new MediaThumbnail element
-     *
-     * @param string $url
-     * @param int $width
-     * @param int $height
-     * @param string $time
-     */
-    public function __construct($url = null, $width = null, $height = null,
-            $time = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_url = $url;
-        $this->_width = $width;
-        $this->_height = $height;
-        $this->_time = $time ;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_url !== null) {
-            $element->setAttribute('url', $this->_url);
-        }
-        if ($this->_width !== null) {
-            $element->setAttribute('width', $this->_width);
-        }
-        if ($this->_height !== null) {
-            $element->setAttribute('height', $this->_height);
-        }
-        if ($this->_time !== null) {
-            $element->setAttribute('time', $this->_time);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'url':
-            $this->_url = $attribute->nodeValue;
-            break;
-        case 'width':
-            $this->_width = $attribute->nodeValue;
-            break;
-        case 'height':
-            $this->_height = $attribute->nodeValue;
-            break;
-        case 'time':
-            $this->_time = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
-     */
-    public function setUrl($value)
-    {
-        $this->_url = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->_width;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
-     */
-    public function setWidth($value)
-    {
-        $this->_width = $value;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->_height;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
-     */
-    public function setHeight($value)
-    {
-        $this->_height = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTime()
-    {
-        return $this->_time;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail Provides a fluent interface
-     */
-    public function setTime($value)
-    {
-        $this->_time = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaTitle.php b/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaTitle.php
deleted file mode 100644
index 735d391db..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Extension/MediaTitle.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaTitle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the media:title element in MediaRSS
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Extension_MediaTitle extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'title';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * Constructs a MediaTitle element
-     *
-     * @param string $text
-     * @param string $type
-     */
-    public function __construct($text = null, $type = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_type = $type;
-        $this->_text = $text;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_type !== null) {
-            $element->setAttribute('type', $this->_type);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'type':
-            $this->_type = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaTitle Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Media/Feed.php b/airtime_mvc/library/Zend/Gdata/Media/Feed.php
deleted file mode 100644
index 85ad72ea2..000000000
--- a/airtime_mvc/library/Zend/Gdata/Media/Feed.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_eed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Media
- */
-require_once 'Zend/Gdata/Media.php';
-
-/**
- * @see Zend_Gdata_Media_Entry
- */
-require_once 'Zend/Gdata/Media/Entry.php';
-
-/**
- * The Gdata flavor of an Atom Feed with media support
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Media_Feed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Media_Entry';
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/MediaMimeStream.php b/airtime_mvc/library/Zend/Gdata/MediaMimeStream.php
deleted file mode 100644
index 53778cffb..000000000
--- a/airtime_mvc/library/Zend/Gdata/MediaMimeStream.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaMimeStream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
-*  @see Zend_Gdata_MimeFile
-*/
-require_once 'Zend/Gdata/MimeFile.php';
-
-/**
-* @see Zend_Gdata_MimeBodyString
-*/
-require_once 'Zend/Gdata/MimeBodyString.php';
-
-
-/**
- * A streaming Media MIME class that allows for buffered read operations.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_MediaMimeStream
-{
-
-    /**
-     * A valid MIME boundary.
-     *
-     * @var string
-     */
-    protected $_boundaryString = null;
-
-    /**
-     * A handle to the file that is part of the message.
-     *
-     * @var resource
-     */
-    protected $_fileHandle = null;
-
-    /**
-     * The current part being read from.
-     * @var integer
-     */
-    protected $_currentPart = 0;
-
-    /**
-     * The size of the MIME message.
-     * @var integer
-     */
-    protected $_totalSize = 0;
-
-    /**
-     * An array of all the parts to be sent. Array members are either a
-     * MimeFile or a MimeBodyString object.
-     * @var array
-     */
-    protected $_parts = null;
-
-    /**
-     * Create a new MimeMediaStream object.
-     *
-     * @param string $xmlString The string corresponding to the XML section
-     *               of the message, typically an atom entry or feed.
-     * @param string $filePath The path to the file that constitutes the binary
-     *               part of the message.
-     * @param string $fileContentType The valid internet media type of the file.
-     * @throws Zend_Gdata_App_IOException If the file cannot be read or does
-     *         not exist. Also if mbstring.func_overload has been set > 1.
-     */
-    public function __construct($xmlString = null, $filePath = null,
-        $fileContentType = null)
-    {
-        if (!file_exists($filePath) || !is_readable($filePath)) {
-            require_once 'Zend/Gdata/App/IOException.php';
-            throw new Zend_Gdata_App_IOException('File to be uploaded at ' .
-                $filePath . ' does not exist or is not readable.');
-        }
-
-        $this->_fileHandle = fopen($filePath, 'rb', TRUE);
-        $this->_boundaryString = '=_' . md5(microtime(1) . rand(1,20));
-        $entry = $this->wrapEntry($xmlString, $fileContentType);
-        $closingBoundary = new Zend_Gdata_MimeBodyString("\r\n--{$this->_boundaryString}--\r\n");
-        $file = new Zend_Gdata_MimeFile($this->_fileHandle);
-        $this->_parts = array($entry, $file, $closingBoundary);
-
-        $fileSize = filesize($filePath);
-        $this->_totalSize = $entry->getSize() + $fileSize
-          + $closingBoundary->getSize();
-
-    }
-
-    /**
-     * Sandwiches the entry body into a MIME message
-     *
-     * @return void
-     */
-    private function wrapEntry($entry, $fileMimeType)
-    {
-        $wrappedEntry = "--{$this->_boundaryString}\r\n";
-        $wrappedEntry .= "Content-Type: application/atom+xml\r\n\r\n";
-        $wrappedEntry .= $entry;
-        $wrappedEntry .= "\r\n--{$this->_boundaryString}\r\n";
-        $wrappedEntry .= "Content-Type: $fileMimeType\r\n\r\n";
-        return new Zend_Gdata_MimeBodyString($wrappedEntry);
-    }
-
-    /**
-     * Read a specific chunk of the the MIME multipart message.
-     *
-     * @param integer $bufferSize The size of the chunk that is to be read,
-     *                            must be lower than MAX_BUFFER_SIZE.
-     * @return string A corresponding piece of the message. This could be
-     *                binary or regular text.
-     */
-    public function read($bytesRequested)
-    {
-        if($this->_currentPart >= count($this->_parts)) {
-          return FALSE;
-        }
-
-        $activePart = $this->_parts[$this->_currentPart];
-        $buffer = $activePart->read($bytesRequested);
-
-        while(strlen($buffer) < $bytesRequested) {
-          $this->_currentPart += 1;
-          $nextBuffer = $this->read($bytesRequested - strlen($buffer));
-          if($nextBuffer === FALSE) {
-            break;
-          }
-          $buffer .= $nextBuffer;
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Return the total size of the mime message.
-     *
-     * @return integer Total size of the message to be sent.
-     */
-    public function getTotalSize()
-    {
-        return $this->_totalSize;
-    }
-
-    /**
-     * Close the internal file that we are streaming to the socket.
-     *
-     * @return void
-     */
-    public function closeFileHandle()
-    {
-        if ($this->_fileHandle !== null) {
-            fclose($this->_fileHandle);
-        }
-    }
-
-    /**
-     * Return a Content-type header that includes the current boundary string.
-     *
-     * @return string A valid HTTP Content-Type header.
-     */
-    public function getContentType()
-    {
-        return 'multipart/related;boundary="' .
-            $this->_boundaryString . '"' . "\r\n";
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/MimeBodyString.php b/airtime_mvc/library/Zend/Gdata/MimeBodyString.php
deleted file mode 100644
index 24466a510..000000000
--- a/airtime_mvc/library/Zend/Gdata/MimeBodyString.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MimeBodyString.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * A wrapper for strings for buffered reading.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_MimeBodyString
-{
-
-    /**
-     * The source string.
-     *
-     * @var string
-     */
-    protected $_sourceString = '';
-
-    /**
-     * The size of the MIME message.
-     * @var integer
-     */
-    protected $_bytesRead = 0;
-
-    /**
-     * Create a new MimeBodyString object.
-     *
-     * @param string $sourceString The string we are wrapping.
-     */
-    public function __construct($sourceString)
-    {
-        $this->_sourceString = $sourceString;
-        $this->_bytesRead = 0;
-    }
-
-    /**
-     * Read the next chunk of the string.
-     *
-     * @param integer $bytesRequested The size of the chunk that is to be read.
-     * @return string A corresponding piece of the string.
-     */
-    public function read($bytesRequested)
-    {
-      $len = strlen($this->_sourceString);
-      if($this->_bytesRead == $len) {
-          return FALSE;
-      } else if($bytesRequested > $len - $this->_bytesRead) {
-          $bytesRequested = $len - $this->_bytesRead;
-      }
-
-      $buffer = substr($this->_sourceString, $this->_bytesRead, $bytesRequested);
-      $this->_bytesRead += $bytesRequested;
-
-      return $buffer;
-    }
-
-    /**
-     * The length of the string.
-     *
-     * @return int The length of the string contained in the object.
-     */
-    public function getSize()
-    {
-      return strlen($this->_sourceString);
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/MimeFile.php b/airtime_mvc/library/Zend/Gdata/MimeFile.php
deleted file mode 100644
index 9ccdc1ab1..000000000
--- a/airtime_mvc/library/Zend/Gdata/MimeFile.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MimeFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * A wrapper for strings for buffered reading.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_MimeFile
-{
-
-    /**
-     * A handle to the file that is part of the message.
-     *
-     * @var resource
-     */
-    protected $_fileHandle = null;
-
-    /**
-     * Create a new MimeFile object.
-     *
-     * @param string $fileHandle An open file handle to the file being
-     *               read.
-     */
-    public function __construct($fileHandle)
-    {
-        $this->_fileHandle = $fileHandle;
-    }
-
-    /**
-     * Read the next chunk of the file.
-     *
-     * @param integer $bytesRequested The size of the chunk that is to be read.
-     * @return string A corresponding piece of the message. This could be
-     *                binary or regular text.
-     */
-    public function read($bytesRequested)
-    {
-      return fread($this->_fileHandle, $bytesRequested);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos.php b/airtime_mvc/library/Zend/Gdata/Photos.php
deleted file mode 100644
index 410ecbed6..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Photos.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata
- */
-require_once 'Zend/Gdata.php';
-
-/**
- * @see Zend_Gdata_Photos_UserFeed
- */
-require_once 'Zend/Gdata/Photos/UserFeed.php';
-
-/**
- * @see Zend_Gdata_Photos_AlbumFeed
- */
-require_once 'Zend/Gdata/Photos/AlbumFeed.php';
-
-/**
- * @see Zend_Gdata_Photos_PhotoFeed
- */
-require_once 'Zend/Gdata/Photos/PhotoFeed.php';
-
-/**
- * Service class for interacting with the Google Photos Data API.
- *
- * Like other service classes in this module, this class provides access via
- * an HTTP client to Google servers for working with entries and feeds.
- *
- * @link http://code.google.com/apis/picasaweb/gdata.html
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos extends Zend_Gdata
-{
-
-    const PICASA_BASE_URI = 'http://picasaweb.google.com/data';
-    const PICASA_BASE_FEED_URI = 'http://picasaweb.google.com/data/feed';
-    const AUTH_SERVICE_NAME = 'lh2';
-
-    /**
-     * Default projection when interacting with the Picasa server.
-     */
-    const DEFAULT_PROJECTION = 'api';
-
-    /**
-     * The default visibility to filter events by.
-     */
-    const DEFAULT_VISIBILITY = 'all';
-
-    /**
-     * The default user to retrieve feeds for.
-     */
-    const DEFAULT_USER = 'default';
-
-    /**
-     * Path to the user feed on the Picasa server.
-     */
-    const USER_PATH = 'user';
-
-    /**
-     * Path to album feeds on the Picasa server.
-     */
-    const ALBUM_PATH = 'albumid';
-
-    /**
-     * Path to photo feeds on the Picasa server.
-     */
-    const PHOTO_PATH = 'photoid';
-
-    /**
-     * The path to the community search feed on the Picasa server.
-     */
-    const COMMUNITY_SEARCH_PATH = 'all';
-
-    /**
-     * The path to use for finding links to feeds within entries
-     */
-    const FEED_LINK_PATH = 'http://schemas.google.com/g/2005#feed';
-
-    /**
-     * The path to use for the determining type of an entry
-     */
-    const KIND_PATH = 'http://schemas.google.com/g/2005#kind';
-
-    /**
-     * Namespaces used for Zend_Gdata_Photos
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('gphoto', 'http://schemas.google.com/photos/2007', 1, 0),
-        array('photo', 'http://www.pheed.com/pheed/', 1, 0),
-        array('exif', 'http://schemas.google.com/photos/exif/2007', 1, 0),
-        array('georss', 'http://www.georss.org/georss', 1, 0),
-        array('gml', 'http://www.opengis.net/gml', 1, 0),
-        array('media', 'http://search.yahoo.com/mrss/', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_Photos object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Photos');
-        $this->registerPackage('Zend_Gdata_Photos_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-    }
-
-    /**
-     * Retrieve a UserFeed containing AlbumEntries, PhotoEntries and
-     * TagEntries associated with a given user.
-     *
-     * @param string $userName The userName of interest
-     * @param mixed $location (optional) The location for the feed, as a URL
-     *          or Query. If not provided, a default URL will be used instead.
-     * @return Zend_Gdata_Photos_UserFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getUserFeed($userName = null, $location = null)
-    {
-        if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('feed');
-            if ($userName !== null) {
-                $location->setUser($userName);
-            }
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            if ($userName !== null) {
-                $location->setUser($userName);
-            }
-            $uri = $location->getQueryUrl();
-        } else if ($location !== null) {
-            $uri = $location;
-        } else if ($userName !== null) {
-            $uri = self::PICASA_BASE_FEED_URI . '/' .
-                self::DEFAULT_PROJECTION . '/' . self::USER_PATH . '/' .
-                $userName;
-        } else {
-            $uri = self::PICASA_BASE_FEED_URI . '/' .
-                self::DEFAULT_PROJECTION . '/' . self::USER_PATH . '/' .
-                self::DEFAULT_USER;
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Photos_UserFeed');
-    }
-
-    /**
-     * Retreive AlbumFeed object containing multiple PhotoEntry or TagEntry
-     * objects.
-     *
-     * @param mixed $location (optional) The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_AlbumFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getAlbumFeed($location = null)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('feed');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Photos_AlbumFeed');
-    }
-
-    /**
-     * Retreive PhotoFeed object containing comments and tags associated
-     * with a given photo.
-     *
-     * @param mixed $location (optional) The location for the feed, as a URL
-     *          or Query. If not specified, the community search feed will
-     *          be returned instead.
-     * @return Zend_Gdata_Photos_PhotoFeed
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getPhotoFeed($location = null)
-    {
-        if ($location === null) {
-            $uri = self::PICASA_BASE_FEED_URI . '/' .
-                self::DEFAULT_PROJECTION . '/' .
-                self::COMMUNITY_SEARCH_PATH;
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('feed');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Photos_PhotoFeed');
-    }
-
-    /**
-     * Retreive a single UserEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_UserEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getUserEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('entry');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Photos_UserEntry');
-    }
-
-    /**
-     * Retreive a single AlbumEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_AlbumEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getAlbumEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('entry');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Photos_AlbumEntry');
-    }
-
-    /**
-     * Retreive a single PhotoEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_PhotoEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getPhotoEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('entry');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Photos_PhotoEntry');
-    }
-
-    /**
-     * Retreive a single TagEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_TagEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getTagEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('entry');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Photos_TagEntry');
-    }
-
-    /**
-     * Retreive a single CommentEntry object.
-     *
-     * @param mixed $location The location for the feed, as a URL or Query.
-     * @return Zend_Gdata_Photos_CommentEntry
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function getCommentEntry($location)
-    {
-        if ($location === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Location must not be null');
-        } else if ($location instanceof Zend_Gdata_Photos_UserQuery) {
-            $location->setType('entry');
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_Photos_CommentEntry');
-    }
-
-    /**
-     * Create a new album from a AlbumEntry.
-     *
-     * @param Zend_Gdata_Photos_AlbumEntry $album The album entry to
-     *          insert.
-     * @param string $url (optional) The URI that the album should be
-     *          uploaded to. If null, the default album creation URI for
-     *          this domain will be used.
-     * @return Zend_Gdata_Photos_AlbumEntry The inserted album entry as
-     *          returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function insertAlbumEntry($album, $uri = null)
-    {
-        if ($uri === null) {
-            $uri = self::PICASA_BASE_FEED_URI . '/' .
-                self::DEFAULT_PROJECTION . '/' . self::USER_PATH . '/' .
-                self::DEFAULT_USER;
-        }
-        $newEntry = $this->insertEntry($album, $uri, 'Zend_Gdata_Photos_AlbumEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new photo from a PhotoEntry.
-     *
-     * @param Zend_Gdata_Photos_PhotoEntry $photo The photo to insert.
-     * @param string $url The URI that the photo should be uploaded
-     *          to. Alternatively, an AlbumEntry can be provided and the
-     *          photo will be added to that album.
-     * @return Zend_Gdata_Photos_PhotoEntry The inserted photo entry
-     *          as returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function insertPhotoEntry($photo, $uri = null)
-    {
-        if ($uri instanceof Zend_Gdata_Photos_AlbumEntry) {
-            $uri = $uri->getLink(self::FEED_LINK_PATH)->href;
-        }
-        if ($uri === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'URI must not be null');
-        }
-        $newEntry = $this->insertEntry($photo, $uri, 'Zend_Gdata_Photos_PhotoEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new tag from a TagEntry.
-     *
-     * @param Zend_Gdata_Photos_TagEntry $tag The tag entry to insert.
-     * @param string $url The URI where the tag should be
-     *          uploaded to. Alternatively, a PhotoEntry can be provided and
-     *          the tag will be added to that photo.
-     * @return Zend_Gdata_Photos_TagEntry The inserted tag entry as returned
-     *          by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function insertTagEntry($tag, $uri = null)
-    {
-        if ($uri instanceof Zend_Gdata_Photos_PhotoEntry) {
-            $uri = $uri->getLink(self::FEED_LINK_PATH)->href;
-        }
-        if ($uri === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'URI must not be null');
-        }
-        $newEntry = $this->insertEntry($tag, $uri, 'Zend_Gdata_Photos_TagEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Create a new comment from a CommentEntry.
-     *
-     * @param Zend_Gdata_Photos_CommentEntry $comment The comment entry to
-     *          insert.
-     * @param string $url The URI where the comment should be uploaded to.
-     *          Alternatively, a PhotoEntry can be provided and
-     *          the comment will be added to that photo.
-     * @return Zend_Gdata_Photos_CommentEntry The inserted comment entry
-     *          as returned by the server.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function insertCommentEntry($comment, $uri = null)
-    {
-        if ($uri instanceof Zend_Gdata_Photos_PhotoEntry) {
-            $uri = $uri->getLink(self::FEED_LINK_PATH)->href;
-        }
-        if ($uri === null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'URI must not be null');
-        }
-        $newEntry = $this->insertEntry($comment, $uri, 'Zend_Gdata_Photos_CommentEntry');
-        return $newEntry;
-    }
-
-    /**
-     * Delete an AlbumEntry.
-     *
-     * @param Zend_Gdata_Photos_AlbumEntry $album The album entry to
-     *          delete.
-     * @param boolean $catch Whether to catch an exception when
-     *            modified and re-delete or throw
-     * @return void.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function deleteAlbumEntry($album, $catch)
-    {
-        if ($catch) {
-            try {
-                $this->delete($album);
-            } catch (Zend_Gdata_App_HttpException $e) {
-                if ($e->getResponse()->getStatus() === 409) {
-                    $entry = new Zend_Gdata_Photos_AlbumEntry($e->getResponse()->getBody());
-                    $this->delete($entry->getLink('edit')->href);
-                } else {
-                    throw $e;
-                }
-            }
-        } else {
-            $this->delete($album);
-        }
-    }
-
-    /**
-     * Delete a PhotoEntry.
-     *
-     * @param Zend_Gdata_Photos_PhotoEntry $photo The photo entry to
-     *          delete.
-     * @param boolean $catch Whether to catch an exception when
-     *            modified and re-delete or throw
-     * @return void.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function deletePhotoEntry($photo, $catch)
-    {
-        if ($catch) {
-            try {
-                $this->delete($photo);
-            } catch (Zend_Gdata_App_HttpException $e) {
-                if ($e->getResponse()->getStatus() === 409) {
-                    $entry = new Zend_Gdata_Photos_PhotoEntry($e->getResponse()->getBody());
-                    $this->delete($entry->getLink('edit')->href);
-                } else {
-                    throw $e;
-                }
-            }
-        } else {
-            $this->delete($photo);
-        }
-    }
-
-    /**
-     * Delete a CommentEntry.
-     *
-     * @param Zend_Gdata_Photos_CommentEntry $comment The comment entry to
-     *          delete.
-     * @param boolean $catch Whether to catch an exception when
-     *            modified and re-delete or throw
-     * @return void.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function deleteCommentEntry($comment, $catch)
-    {
-        if ($catch) {
-            try {
-                $this->delete($comment);
-            } catch (Zend_Gdata_App_HttpException $e) {
-                if ($e->getResponse()->getStatus() === 409) {
-                    $entry = new Zend_Gdata_Photos_CommentEntry($e->getResponse()->getBody());
-                    $this->delete($entry->getLink('edit')->href);
-                } else {
-                    throw $e;
-                }
-            }
-        } else {
-            $this->delete($comment);
-        }
-    }
-
-    /**
-     * Delete a TagEntry.
-     *
-     * @param Zend_Gdata_Photos_TagEntry $tag The tag entry to
-     *          delete.
-     * @param boolean $catch Whether to catch an exception when
-     *            modified and re-delete or throw
-     * @return void.
-     * @throws Zend_Gdata_App_Exception
-     * @throws Zend_Gdata_App_HttpException
-     */
-    public function deleteTagEntry($tag, $catch)
-    {
-        if ($catch) {
-            try {
-                $this->delete($tag);
-            } catch (Zend_Gdata_App_HttpException $e) {
-                if ($e->getResponse()->getStatus() === 409) {
-                    $entry = new Zend_Gdata_Photos_TagEntry($e->getResponse()->getBody());
-                    $this->delete($entry->getLink('edit')->href);
-                } else {
-                    throw $e;
-                }
-            }
-        } else {
-            $this->delete($tag);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/AlbumEntry.php b/airtime_mvc/library/Zend/Gdata/Photos/AlbumEntry.php
deleted file mode 100644
index 73de6c765..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/AlbumEntry.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AlbumEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Access
- */
-require_once 'Zend/Gdata/Photos/Extension/Access.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_BytesUsed
- */
-require_once 'Zend/Gdata/Photos/Extension/BytesUsed.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Location
- */
-require_once 'Zend/Gdata/Photos/Extension/Location.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Name
- */
-require_once 'Zend/Gdata/Photos/Extension/Name.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_NumPhotos
- */
-require_once 'Zend/Gdata/Photos/Extension/NumPhotos.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_NumPhotosRemaining
- */
-require_once 'Zend/Gdata/Photos/Extension/NumPhotosRemaining.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_CommentCount
- */
-require_once 'Zend/Gdata/Photos/Extension/CommentCount.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_CommentingEnabled
- */
-require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Id
- */
-require_once 'Zend/Gdata/Photos/Extension/Id.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GeoRssWhere
- */
-require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaGroup
- */
-require_once 'Zend/Gdata/Media/Extension/MediaGroup.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Data model class for a Photo Album Entry.
- *
- * To transfer user entries to and from the servers, including
- * creating new entries, refer to the service class,
- * Zend_Gdata_Photos.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_AlbumEntry';
-
-    /**
-     * gphoto:id element
-     *
-     * @var Zend_Gdata_Photos_Extension_Id
-     */
-    protected $_gphotoId = null;
-
-    /**
-     * gphoto:access element
-     *
-     * @var Zend_Gdata_Photos_Extension_Access
-     */
-    protected $_gphotoAccess = null;
-
-    /**
-     * gphoto:location element
-     *
-     * @var Zend_Gdata_Photos_Extension_Location
-     */
-    protected $_gphotoLocation = null;
-
-    /**
-     * gphoto:user element
-     *
-     * @var Zend_Gdata_Photos_Extension_User
-     */
-    protected $_gphotoUser = null;
-
-    /**
-     * gphoto:nickname element
-     *
-     * @var Zend_Gdata_Photos_Extension_Nickname
-     */
-    protected $_gphotoNickname = null;
-
-    /**
-     * gphoto:timestamp element
-     *
-     * @var Zend_Gdata_Photos_Extension_Timestamp
-     */
-    protected $_gphotoTimestamp = null;
-
-    /**
-     * gphoto:name element
-     *
-     * @var Zend_Gdata_Photos_Extension_Name
-     */
-    protected $_gphotoName = null;
-
-    /**
-     * gphoto:numphotos element
-     *
-     * @var Zend_Gdata_Photos_Extension_NumPhotos
-     */
-    protected $_gphotoNumPhotos = null;
-
-    /**
-     * gphoto:commentCount element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentCount
-     */
-    protected $_gphotoCommentCount = null;
-
-    /**
-     * gphoto:commentingEnabled element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentingEnabled
-     */
-    protected $_gphotoCommentingEnabled = null;
-
-    /**
-     * media:group element
-     *
-     * @var Zend_Gdata_Media_MediaGroup
-     */
-    protected $_mediaGroup = null;
-
-    /**
-     * georss:where element
-     *
-     * @var Zend_Gdata_Geo_Extension_GeoRssWhere
-     */
-    protected $_geoRssWhere = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-
-        $category = new Zend_Gdata_App_Extension_Category(
-            'http://schemas.google.com/photos/2007#album',
-            'http://schemas.google.com/g/2005#kind');
-        $this->setCategory(array($category));
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoTimestamp !== null) {
-            $element->appendChild($this->_gphotoTimestamp->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoUser !== null) {
-            $element->appendChild($this->_gphotoUser->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoNickname !== null) {
-            $element->appendChild($this->_gphotoNickname->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoAccess !== null) {
-            $element->appendChild($this->_gphotoAccess->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoLocation !== null) {
-            $element->appendChild($this->_gphotoLocation->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoName !== null) {
-            $element->appendChild($this->_gphotoName->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoNumPhotos !== null) {
-            $element->appendChild($this->_gphotoNumPhotos->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentCount !== null) {
-            $element->appendChild($this->_gphotoCommentCount->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentingEnabled !== null) {
-            $element->appendChild($this->_gphotoCommentingEnabled->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoId !== null) {
-            $element->appendChild($this->_gphotoId->getDOM($element->ownerDocument));
-        }
-        if ($this->_mediaGroup !== null) {
-            $element->appendChild($this->_mediaGroup->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'access';
-                $access = new Zend_Gdata_Photos_Extension_Access();
-                $access->transferFromDOM($child);
-                $this->_gphotoAccess = $access;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'location';
-                $location = new Zend_Gdata_Photos_Extension_Location();
-                $location->transferFromDOM($child);
-                $this->_gphotoLocation = $location;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'name';
-                $name = new Zend_Gdata_Photos_Extension_Name();
-                $name->transferFromDOM($child);
-                $this->_gphotoName = $name;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'numphotos';
-                $numPhotos = new Zend_Gdata_Photos_Extension_NumPhotos();
-                $numPhotos->transferFromDOM($child);
-                $this->_gphotoNumPhotos = $numPhotos;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentCount';
-                $commentCount = new Zend_Gdata_Photos_Extension_CommentCount();
-                $commentCount->transferFromDOM($child);
-                $this->_gphotoCommentCount = $commentCount;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled';
-                $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled();
-                $commentingEnabled->transferFromDOM($child);
-                $this->_gphotoCommentingEnabled = $commentingEnabled;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'id';
-                $id = new Zend_Gdata_Photos_Extension_Id();
-                $id->transferFromDOM($child);
-                $this->_gphotoId = $id;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'user';
-                $user = new Zend_Gdata_Photos_Extension_User();
-                $user->transferFromDOM($child);
-                $this->_gphotoUser = $user;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'timestamp';
-                $timestamp = new Zend_Gdata_Photos_Extension_Timestamp();
-                $timestamp->transferFromDOM($child);
-                $this->_gphotoTimestamp = $timestamp;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'nickname';
-                $nickname = new Zend_Gdata_Photos_Extension_Nickname();
-                $nickname->transferFromDOM($child);
-                $this->_gphotoNickname = $nickname;
-                break;
-            case $this->lookupNamespace('georss') . ':' . 'where';
-                $geoRssWhere = new Zend_Gdata_Geo_Extension_GeoRssWhere();
-                $geoRssWhere->transferFromDOM($child);
-                $this->_geoRssWhere = $geoRssWhere;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'group';
-                $mediaGroup = new Zend_Gdata_Media_Extension_MediaGroup();
-                $mediaGroup->transferFromDOM($child);
-                $this->_mediaGroup = $mediaGroup;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:access attribute.
-     *
-     * @see setGphotoAccess
-     * @return string The requested attribute.
-     */
-    public function getGphotoAccess()
-    {
-        return $this->_gphotoAccess;
-    }
-
-    /**
-     * Set the value for this element's gphoto:access attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Access The element being modified.
-     */
-    public function setGphotoAccess($value)
-    {
-        $this->_gphotoAccess = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:location attribute.
-     *
-     * @see setGphotoLocation
-     * @return string The requested attribute.
-     */
-    public function getGphotoLocation()
-    {
-        return $this->_gphotoLocation;
-    }
-
-    /**
-     * Set the value for this element's gphoto:location attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Location The element being modified.
-     */
-    public function setGphotoLocation($value)
-    {
-        $this->_location = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:name attribute.
-     *
-     * @see setGphotoName
-     * @return string The requested attribute.
-     */
-    public function getGphotoName()
-    {
-        return $this->_gphotoName;
-    }
-
-    /**
-     * Set the value for this element's gphoto:name attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Name The element being modified.
-     */
-    public function setGphotoName($value)
-    {
-        $this->_gphotoName = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:numphotos attribute.
-     *
-     * @see setGphotoNumPhotos
-     * @return string The requested attribute.
-     */
-    public function getGphotoNumPhotos()
-    {
-        return $this->_gphotoNumPhotos;
-    }
-
-    /**
-     * Set the value for this element's gphoto:numphotos attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_NumPhotos The element being modified.
-     */
-    public function setGphotoNumPhotos($value)
-    {
-        $this->_gphotoNumPhotos = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentCount attribute.
-     *
-     * @see setGphotoCommentCount
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentCount()
-    {
-        return $this->_gphotoCommentCount;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentCount attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentCount The element being modified.
-     */
-    public function setGphotoCommentCount($value)
-    {
-        $this->_gphotoCommentCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @see setGphotoCommentingEnabled
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentingEnabled()
-    {
-        return $this->_gphotoCommentingEnabled;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentingEnabled The element being modified.
-     */
-    public function setGphotoCommentingEnabled($value)
-    {
-        $this->_gphotoCommentingEnabled = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:id attribute.
-     *
-     * @see setGphotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoId()
-    {
-        return $this->_gphotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:id attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Id The element being modified.
-     */
-    public function setGphotoId($value)
-    {
-        $this->_gphotoId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's georss:where attribute.
-     *
-     * @see setGeoRssWhere
-     * @return string The requested attribute.
-     */
-    public function getGeoRssWhere()
-    {
-        return $this->_geoRssWhere;
-    }
-
-    /**
-     * Set the value for this element's georss:where attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere The element being modified.
-     */
-    public function setGeoRssWhere($value)
-    {
-        $this->_geoRssWhere = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's media:group attribute.
-     *
-     * @see setMediaGroup
-     * @return string The requested attribute.
-     */
-    public function getMediaGroup()
-    {
-        return $this->_mediaGroup;
-    }
-
-    /**
-     * Set the value for this element's media:group attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Media_Extension_MediaGroup The element being modified.
-     */
-    public function setMediaGroup($value)
-    {
-        $this->_mediaGroup = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:user attribute.
-     *
-     * @see setGphotoUser
-     * @return string The requested attribute.
-     */
-    public function getGphotoUser()
-    {
-        return $this->_gphotoUser;
-    }
-
-    /**
-     * Set the value for this element's gphoto:user attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_User The element being modified.
-     */
-    public function setGphotoUser($value)
-    {
-        $this->_gphotoUser = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:nickname attribute.
-     *
-     * @see setGphotoNickname
-     * @return string The requested attribute.
-     */
-    public function getGphotoNickname()
-    {
-        return $this->_gphotoNickname;
-    }
-
-    /**
-     * Set the value for this element's gphoto:nickname attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Nickname The element being modified.
-     */
-    public function setGphotoNickname($value)
-    {
-        $this->_gphotoNickname = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:timestamp attribute.
-     *
-     * @see setGphotoTimestamp
-     * @return string The requested attribute.
-     */
-    public function getGphotoTimestamp()
-    {
-        return $this->_gphotoTimestamp;
-    }
-
-    /**
-     * Set the value for this element's gphoto:timestamp attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Timestamp The element being modified.
-     */
-    public function setGphotoTimestamp($value)
-    {
-        $this->_gphotoTimestamp = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/AlbumFeed.php b/airtime_mvc/library/Zend/Gdata/Photos/AlbumFeed.php
deleted file mode 100644
index f6c6fb50b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/AlbumFeed.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AlbumFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Photos_AlbumEntry
- */
-require_once 'Zend/Gdata/Photos/AlbumEntry.php';
-
-/**
- * Data model for a collection of album entries, usually
- * provided by the servers.
- *
- * For information on requesting this feed from a server, see the
- * service class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed
-{
-    protected $_entryClassName = 'Zend_Gdata_Photos_AlbumEntry';
-    protected $_feedClassName = 'Zend_Gdata_Photos_AlbumFeed';
-
-    /**
-     * gphoto:id element
-     *
-     * @var Zend_Gdata_Photos_Extension_Id
-     */
-    protected $_gphotoId = null;
-
-    /**
-     * gphoto:user element
-     *
-     * @var Zend_Gdata_Photos_Extension_User
-     */
-    protected $_gphotoUser = null;
-
-    /**
-     * gphoto:access element
-     *
-     * @var Zend_Gdata_Photos_Extension_Access
-     */
-    protected $_gphotoAccess = null;
-
-    /**
-     * gphoto:location element
-     *
-     * @var Zend_Gdata_Photos_Extension_Location
-     */
-    protected $_gphotoLocation = null;
-
-    /**
-     * gphoto:nickname element
-     *
-     * @var Zend_Gdata_Photos_Extension_Nickname
-     */
-    protected $_gphotoNickname = null;
-
-    /**
-     * gphoto:timestamp element
-     *
-     * @var Zend_Gdata_Photos_Extension_Timestamp
-     */
-    protected $_gphotoTimestamp = null;
-
-    /**
-     * gphoto:name element
-     *
-     * @var Zend_Gdata_Photos_Extension_Name
-     */
-    protected $_gphotoName = null;
-
-    /**
-     * gphoto:numphotos element
-     *
-     * @var Zend_Gdata_Photos_Extension_NumPhotos
-     */
-    protected $_gphotoNumPhotos = null;
-
-    /**
-     * gphoto:commentCount element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentCount
-     */
-    protected $_gphotoCommentCount = null;
-
-    /**
-     * gphoto:commentingEnabled element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentingEnabled
-     */
-    protected $_gphotoCommentingEnabled = null;
-
-    protected $_entryKindClassMapping = array(
-        'http://schemas.google.com/photos/2007#photo' => 'Zend_Gdata_Photos_PhotoEntry',
-        'http://schemas.google.com/photos/2007#comment' => 'Zend_Gdata_Photos_CommentEntry',
-        'http://schemas.google.com/photos/2007#tag' => 'Zend_Gdata_Photos_TagEntry'
-    );
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoId != null) {
-            $element->appendChild($this->_gphotoId->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoUser != null) {
-            $element->appendChild($this->_gphotoUser->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoNickname != null) {
-            $element->appendChild($this->_gphotoNickname->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoName != null) {
-            $element->appendChild($this->_gphotoName->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoLocation != null) {
-            $element->appendChild($this->_gphotoLocation->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoAccess != null) {
-            $element->appendChild($this->_gphotoAccess->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoTimestamp != null) {
-            $element->appendChild($this->_gphotoTimestamp->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoNumPhotos != null) {
-            $element->appendChild($this->_gphotoNumPhotos->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentingEnabled != null) {
-            $element->appendChild($this->_gphotoCommentingEnabled->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentCount != null) {
-            $element->appendChild($this->_gphotoCommentCount->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'id';
-                $id = new Zend_Gdata_Photos_Extension_Id();
-                $id->transferFromDOM($child);
-                $this->_gphotoId = $id;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'user';
-                $user = new Zend_Gdata_Photos_Extension_User();
-                $user->transferFromDOM($child);
-                $this->_gphotoUser = $user;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'nickname';
-                $nickname = new Zend_Gdata_Photos_Extension_Nickname();
-                $nickname->transferFromDOM($child);
-                $this->_gphotoNickname = $nickname;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'name';
-                $name = new Zend_Gdata_Photos_Extension_Name();
-                $name->transferFromDOM($child);
-                $this->_gphotoName = $name;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'location';
-                $location = new Zend_Gdata_Photos_Extension_Location();
-                $location->transferFromDOM($child);
-                $this->_gphotoLocation = $location;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'access';
-                $access = new Zend_Gdata_Photos_Extension_Access();
-                $access->transferFromDOM($child);
-                $this->_gphotoAccess = $access;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'timestamp';
-                $timestamp = new Zend_Gdata_Photos_Extension_Timestamp();
-                $timestamp->transferFromDOM($child);
-                $this->_gphotoTimestamp = $timestamp;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'numphotos';
-                $numphotos = new Zend_Gdata_Photos_Extension_NumPhotos();
-                $numphotos->transferFromDOM($child);
-                $this->_gphotoNumPhotos = $numphotos;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled';
-                $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled();
-                $commentingEnabled->transferFromDOM($child);
-                $this->_gphotoCommentingEnabled = $commentingEnabled;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentCount';
-                $commentCount = new Zend_Gdata_Photos_Extension_CommentCount();
-                $commentCount->transferFromDOM($child);
-                $this->_gphotoCommentCount = $commentCount;
-                break;
-            case $this->lookupNamespace('atom') . ':' . 'entry':
-                $entryClassName = $this->_entryClassName;
-                $tmpEntry = new Zend_Gdata_App_Entry($child);
-                $categories = $tmpEntry->getCategory();
-                foreach ($categories as $category) {
-                    if ($category->scheme == Zend_Gdata_Photos::KIND_PATH &&
-                        $this->_entryKindClassMapping[$category->term] != "") {
-                            $entryClassName = $this->_entryKindClassMapping[$category->term];
-                            break;
-                    } else {
-                        require_once 'Zend/Gdata/App/Exception.php';
-                        throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.');
-                    }
-                }
-
-                $newEntry = new $entryClassName($child);
-                $newEntry->setHttpClient($this->getHttpClient());
-                $this->_entry[] = $newEntry;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:user attribute.
-     *
-     * @see setGphotoUser
-     * @return string The requested attribute.
-     */
-    public function getGphotoUser()
-    {
-        return $this->_gphotoUser;
-    }
-
-    /**
-     * Set the value for this element's gphoto:user attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_User The element being modified.
-     */
-    public function setGphotoUser($value)
-    {
-        $this->_gphotoUser = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:access attribute.
-     *
-     * @see setGphotoAccess
-     * @return string The requested attribute.
-     */
-    public function getGphotoAccess()
-    {
-        return $this->_gphotoAccess;
-    }
-
-    /**
-     * Set the value for this element's gphoto:access attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Access The element being modified.
-     */
-    public function setGphotoAccess($value)
-    {
-        $this->_gphotoAccess = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:location attribute.
-     *
-     * @see setGphotoLocation
-     * @return string The requested attribute.
-     */
-    public function getGphotoLocation()
-    {
-        return $this->_gphotoLocation;
-    }
-
-    /**
-     * Set the value for this element's gphoto:location attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Location The element being modified.
-     */
-    public function setGphotoLocation($value)
-    {
-        $this->_gphotoLocation = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:name attribute.
-     *
-     * @see setGphotoName
-     * @return string The requested attribute.
-     */
-    public function getGphotoName()
-    {
-        return $this->_gphotoName;
-    }
-
-    /**
-     * Set the value for this element's gphoto:name attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Name The element being modified.
-     */
-    public function setGphotoName($value)
-    {
-        $this->_gphotoName = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:numphotos attribute.
-     *
-     * @see setGphotoNumPhotos
-     * @return string The requested attribute.
-     */
-    public function getGphotoNumPhotos()
-    {
-        return $this->_gphotoNumPhotos;
-    }
-
-    /**
-     * Set the value for this element's gphoto:numphotos attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_NumPhotos The element being modified.
-     */
-    public function setGphotoNumPhotos($value)
-    {
-        $this->_gphotoNumPhotos = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentCount attribute.
-     *
-     * @see setGphotoCommentCount
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentCount()
-    {
-        return $this->_gphotoCommentCount;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentCount attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentCount The element being modified.
-     */
-    public function setGphotoCommentCount($value)
-    {
-        $this->_gphotoCommentCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @see setGphotoCommentingEnabled
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentingEnabled()
-    {
-        return $this->_gphotoCommentingEnabled;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentingEnabled The element being modified.
-     */
-    public function setGphotoCommentingEnabled($value)
-    {
-        $this->_gphotoCommentingEnabled = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:id attribute.
-     *
-     * @see setGphotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoId()
-    {
-        return $this->_gphotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:id attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Id The element being modified.
-     */
-    public function setGphotoId($value)
-    {
-        $this->_gphotoId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's georss:where attribute.
-     *
-     * @see setGeoRssWhere
-     * @return string The requested attribute.
-     */
-    public function getGeoRssWhere()
-    {
-        return $this->_geoRssWhere;
-    }
-
-    /**
-     * Set the value for this element's georss:where attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere The element being modified.
-     */
-    public function setGeoRssWhere($value)
-    {
-        $this->_geoRssWhere = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:nickname attribute.
-     *
-     * @see setGphotoNickname
-     * @return string The requested attribute.
-     */
-    public function getGphotoNickname()
-    {
-        return $this->_gphotoNickname;
-    }
-
-    /**
-     * Set the value for this element's gphoto:nickname attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Nickname The element being modified.
-     */
-    public function setGphotoNickname($value)
-    {
-        $this->_gphotoNickname = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:timestamp attribute.
-     *
-     * @see setGphotoTimestamp
-     * @return string The requested attribute.
-     */
-    public function getGphotoTimestamp()
-    {
-        return $this->_gphotoTimestamp;
-    }
-
-    /**
-     * Set the value for this element's gphoto:timestamp attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Timestamp The element being modified.
-     */
-    public function setGphotoTimestamp($value)
-    {
-        $this->_gphotoTimestamp = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/AlbumQuery.php b/airtime_mvc/library/Zend/Gdata/Photos/AlbumQuery.php
deleted file mode 100644
index 77a05663f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/AlbumQuery.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AlbumQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Photos_UserQuery
- */
-require_once('Zend/Gdata/Photos/UserQuery.php');
-
-/**
- * Assists in constructing album queries for various entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the service
- * class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery
-{
-
-    /**
-     * The name of the album to query for. Mutually exclusive with AlbumId.
-     *
-     * @var string
-     */
-    protected $_albumName = null;
-
-    /**
-     * The ID of the album to query for. Mutually exclusive with AlbumName.
-     *
-     * @var string
-     */
-    protected $_albumId = null;
-
-    /**
-     * Set the album name to query for. When set, this album's photographs
-     * be returned. If not set or null, the default user's feed will be
-     * returned instead.
-     *
-     * NOTE: AlbumName and AlbumId are mutually exclusive. Setting one will
-     *       automatically set the other to null.
-     *
-     * @param string $value The name of the album to retrieve, or null to
-     *          clear.
-     * @return Zend_Gdata_Photos_AlbumQuery The query object.
-     */
-     public function setAlbumName($value)
-     {
-         $this->_albumId = null;
-         $this->_albumName = $value;
-
-         return $this;
-     }
-
-    /**
-     * Get the album name which is to be returned.
-     *
-     * @see setAlbumName
-     * @return string The name of the album to retrieve.
-     */
-    public function getAlbumName()
-    {
-        return $this->_albumName;
-    }
-
-    /**
-     * Set the album ID to query for. When set, this album's photographs
-     * be returned. If not set or null, the default user's feed will be
-     * returned instead.
-     *
-     * NOTE: Album and AlbumId are mutually exclusive. Setting one will
-     *       automatically set the other to null.
-     *
-     * @param string $value The ID of the album to retrieve, or null to
-     *          clear.
-     * @return Zend_Gdata_Photos_AlbumQuery The query object.
-     */
-     public function setAlbumId($value)
-     {
-         $this->_albumName = null;
-         $this->_albumId = $value;
-
-         return $this;
-     }
-
-    /**
-     * Get the album ID which is to be returned.
-     *
-     * @see setAlbum
-     * @return string The ID of the album to retrieve.
-     */
-    public function getAlbumId()
-    {
-        return $this->_albumId;
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getQueryUrl($incomingUri = '')
-    {
-        $uri = '';
-        if ($this->getAlbumName() !== null && $this->getAlbumId() === null) {
-            $uri .= '/album/' . $this->getAlbumName();
-        } elseif ($this->getAlbumName() === null && $this->getAlbumId() !== null) {
-            $uri .= '/albumid/' . $this->getAlbumId();
-        } elseif ($this->getAlbumName() !== null && $this->getAlbumId() !== null) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'AlbumName and AlbumId cannot both be non-null');
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'AlbumName and AlbumId cannot both be null');
-        }
-        $uri .= $incomingUri;
-        return parent::getQueryUrl($uri);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/CommentEntry.php b/airtime_mvc/library/Zend/Gdata/Photos/CommentEntry.php
deleted file mode 100644
index aea12f4b6..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/CommentEntry.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Id
- */
-require_once 'Zend/Gdata/Photos/Extension/Id.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_PhotoId
- */
-require_once 'Zend/Gdata/Photos/Extension/PhotoId.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Weight
- */
-require_once 'Zend/Gdata/Photos/Extension/Weight.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Data model class for a Comment Entry.
- *
- * To transfer user entries to and from the servers, including
- * creating new entries, refer to the service class,
- * Zend_Gdata_Photos.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_CommentEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_CommentEntry';
-
-    /**
-     * gphoto:id element
-     *
-     * @var Zend_Gdata_Photos_Extension_Id
-     */
-    protected $_gphotoId = null;
-
-    /**
-     * gphoto:photoid element, differs from gphoto:id as this is an
-     * actual identification number unique exclusively to photo entries,
-     * whereas gphoto:id can refer to all gphoto objects
-     *
-     * @var Zend_Gdata_Photos_Extension_PhotoId
-     */
-    protected $_gphotoPhotoId = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-
-        $category = new Zend_Gdata_App_Extension_Category(
-            'http://schemas.google.com/photos/2007#comment',
-            'http://schemas.google.com/g/2005#kind');
-        $this->setCategory(array($category));
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoId !== null) {
-            $element->appendChild($this->_gphotoId->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoPhotoId !== null) {
-            $element->appendChild($this->_gphotoPhotoId->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'id';
-                $id = new Zend_Gdata_Photos_Extension_Id();
-                $id->transferFromDOM($child);
-                $this->_gphotoId = $id;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'photoid';
-                $photoid = new Zend_Gdata_Photos_Extension_PhotoId();
-                $photoid->transferFromDOM($child);
-                $this->_gphotoPhotoId = $photoid;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:photoid attribute.
-     *
-     * @see setGphotoPhotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoPhotoId()
-    {
-        return $this->_gphotoPhotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:photoid attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_PhotoId The element being modified.
-     */
-    public function setGphotoPhotoId($value)
-    {
-        $this->_gphotoPhotoId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:id attribute.
-     *
-     * @see setGphotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoId()
-    {
-        return $this->_gphotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:id attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Id The element being modified.
-     */
-    public function setGphotoId($value)
-    {
-        $this->_gphotoId = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Access.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Access.php
deleted file mode 100644
index 8dc8f2602..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Access.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Access.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:access element used by the API.
- * This determines the visibility for an album, and can be either
- * the strings 'private' or 'public'.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Access extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'access';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Access object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/AlbumId.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/AlbumId.php
deleted file mode 100644
index b554db63f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/AlbumId.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AlbumId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:albumid element used by the API. This
- * class represents the ID of an album and is usually contained
- * within an instance of Zend_Gdata_Photos_AlbumEntry or CommentEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_AlbumId extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'albumid';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_AlbumId object.
-     *
-     * @param string $text (optional) The value to use for the Album ID.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/BytesUsed.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/BytesUsed.php
deleted file mode 100644
index b16675823..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/BytesUsed.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BytesUsed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:bytesUsed element used by the API.
- * This indicates the number of bytes of storage used by an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_BytesUsed extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'bytesUsed';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_BytesUsed object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Checksum.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Checksum.php
deleted file mode 100644
index a349ab8df..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Checksum.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Checksum.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:checksum element used by the API.
- * This is an optional field that can be used to store a photo's
- * checksum to ease duplicate checking.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Checksum extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'checksum';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Checksum object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Client.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Client.php
deleted file mode 100644
index 0c438bccf..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Client.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:client element used by the API.
- * This is an optional field that can be used to indicate the
- * client which created a photo.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Client extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'client';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Client object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentCount.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentCount.php
deleted file mode 100644
index fa038d9f3..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentCount.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommentCount.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:commentCount element used by the API. This
- * class represents the number of comments attached to an entry and is usually contained
- * within an instance of Zend_Gdata_Photos_PhotoEntry or AlbumEntry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_CommentCount extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'commentCount';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_CommentCount object.
-     *
-     * @param string $text (optional) The value to use for the count.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php
deleted file mode 100644
index 80e301db4..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommentingEnabled.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:commentingEnabled element used by the API.
- * This class represents whether commenting is enabled for a given
- * entry.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_CommentingEnabled extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'commentingEnabled';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_CommentingEnabled object.
-     *
-     * @param string $text (optional) Whether commenting should be enabled
-     *          or not.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Height.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Height.php
deleted file mode 100644
index a81642e74..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Height.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Height.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:height element used by the API.
- * The height of a photo in pixels.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Height extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'height';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Height object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Id.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Id.php
deleted file mode 100644
index 3acec2190..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Id.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:id element used by the API. This class
- * represents the unique ID assigned to an element by the servers.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Id extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'id';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Id object.
-     *
-     * @param string $text (optional) The ID being represented.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Location.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Location.php
deleted file mode 100644
index 02cb6151b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Location.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:location element used by the API.
- * This indicates the number of bytes of storage used by an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Location extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'location';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Location object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
deleted file mode 100644
index 7679ee8b1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MaxPhotosPerAlbum.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:maxPhotosPerAlbum element used by the API.
- * This class represents the maximum number of photos allowed in an
- * album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'maxPhotosPerAlbum';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum object.
-     *
-     * @param string $text (optional) The value being represented.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Name.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Name.php
deleted file mode 100644
index 1e81655ab..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Name.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:name element used by the API.
- * This indicates the URL-usable name for an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Name extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'name';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Name object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Nickname.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Nickname.php
deleted file mode 100644
index 3556b9482..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Nickname.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:nickname element used by the API.
- * This class represents the nickname for a user.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Nickname extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'nickname';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Nickname object.
-     *
-     * @param string $text (optional) The value being represented.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotos.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotos.php
deleted file mode 100644
index bb4b26810..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotos.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumPhotos.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:numphotos element used by the API.
- * This indicates the number of photos in an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_NumPhotos extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'numphotos';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_NumPhotos object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
deleted file mode 100644
index 2b77cd395..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NumPhotosRemaining.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:numphotosremaining element used by the API.
- * This indicates the number of photos remaining in an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_NumPhotosRemaining extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'numphotosremaining';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_NumPhotosRemaining object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/PhotoId.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/PhotoId.php
deleted file mode 100644
index 5fe369df1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/PhotoId.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhotoId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:id element used by the Picasa API.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_PhotoId extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'id';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_PhotoId object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Position.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Position.php
deleted file mode 100644
index e23537a72..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Position.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:position element used by the API.
- * The ordinal position of a photo within an album.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Position extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'position';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Position object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php
deleted file mode 100644
index 56a562723..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QuotaCurrent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:quotaCurrent element used by the API.
- * This class represents the number of bytes of storage used by a user.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_QuotaCurrent extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'quotaCurrent';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_QuotaCurrent object.
-     *
-     * @param string $text (optional) The value being represented.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaLimit.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaLimit.php
deleted file mode 100644
index 250e558b6..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/QuotaLimit.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QuotaLimit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:quotaLimit element used by the API.
- * This class represents the number of bytes of storage available for
- * a user.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_QuotaLimit extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'quotaLimit';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_QuotaLimit object.
-     *
-     * @param string $text (optional) The value being represented.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Rotation.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Rotation.php
deleted file mode 100644
index 5533d348b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Rotation.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rotation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:rotation element used by the API.
- * The rotation of a photo in degrees. Will only be shown if the
- * rotation has not already been applied to the image.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Rotation extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'rotation';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Rotation object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Size.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Size.php
deleted file mode 100644
index 83a9f4943..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Size.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Size.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:size element used by the API.
- * The size of a photo in bytes.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Size extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'size';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Size object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Thumbnail.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Thumbnail.php
deleted file mode 100644
index b2cfe1d01..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Thumbnail.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Thumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:thumbnail element used by the API.
- * This class represents the URI for a thumbnail image.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Thumbnail extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'thumbnail';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Thumbnail object.
-     *
-     * @param string $text (optional) The thumbnail URI to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Timestamp.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Timestamp.php
deleted file mode 100644
index c02aae33d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Timestamp.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Timestamp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:timestamp element used by the API.
- * The timestamp of a photo in milliseconds since January 1, 1970.
- * This date is either set externally or based on EXIF data.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Timestamp extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'timestamp';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Timestamp object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/User.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/User.php
deleted file mode 100644
index a61ec6306..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/User.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:user element used by the API.
- * This class represents the username for a user.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_User extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'user';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_User object.
-     *
-     * @param string $text (optional) The username to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Version.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Version.php
deleted file mode 100644
index 13abfb6fb..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Version.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Version.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:version element used by the API.
- * This number is used for optimistic concurrency, and does not
- * increase linearly.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Version extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'version';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Version object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Weight.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Weight.php
deleted file mode 100644
index e8084d289..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Weight.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:weight element used by the API.
- * This indicates the weight of a tag, based on the number of times
- * it appears in photos under the current element.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Weight extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'weight';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Weight object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Width.php b/airtime_mvc/library/Zend/Gdata/Photos/Extension/Width.php
deleted file mode 100644
index 3f67ca2de..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/Extension/Width.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Width.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * Represents the gphoto:width element used by the API.
- * This indicates the width of a photo in pixels.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_Extension_Width extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'gphoto';
-    protected $_rootElement = 'width';
-
-    /**
-     * Constructs a new Zend_Gdata_Photos_Extension_Width object.
-     *
-     * @param string $text (optional) The value to represent.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct();
-        $this->setText($text);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/PhotoEntry.php b/airtime_mvc/library/Zend/Gdata/Photos/PhotoEntry.php
deleted file mode 100644
index 55b6bde5d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/PhotoEntry.php
+++ /dev/null
@@ -1,691 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhotoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_MediaEntry
- */
-require_once 'Zend/Gdata/Media/Entry.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_PhotoId
- */
-require_once 'Zend/Gdata/Photos/Extension/PhotoId.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Version
- */
-require_once 'Zend/Gdata/Photos/Extension/Version.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_AlbumId
- */
-require_once 'Zend/Gdata/Photos/Extension/AlbumId.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Id
- */
-require_once 'Zend/Gdata/Photos/Extension/Id.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Width
- */
-require_once 'Zend/Gdata/Photos/Extension/Width.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Height
- */
-require_once 'Zend/Gdata/Photos/Extension/Height.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Size
- */
-require_once 'Zend/Gdata/Photos/Extension/Size.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Client
- */
-require_once 'Zend/Gdata/Photos/Extension/Client.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Checksum
- */
-require_once 'Zend/Gdata/Photos/Extension/Checksum.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Timestamp
- */
-require_once 'Zend/Gdata/Photos/Extension/Timestamp.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_CommentingEnabled
- */
-require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_CommentCount
- */
-require_once 'Zend/Gdata/Photos/Extension/CommentCount.php';
-
-/**
- * @see Zend_Gdata_Exif_Extension_Tags
- */
-require_once 'Zend/Gdata/Exif/Extension/Tags.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GeoRssWhere
- */
-require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Data model class for a Comment Entry.
- *
- * To transfer user entries to and from the servers, including
- * creating new entries, refer to the service class,
- * Zend_Gdata_Photos.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_PhotoEntry';
-
-    /**
-     * gphoto:id element
-     *
-     * @var Zend_Gdata_Photos_Extension_Id
-     */
-    protected $_gphotoId = null;
-
-    /**
-     * gphoto:albumid element
-     *
-     * @var Zend_Gdata_Photos_Extension_AlbumId
-     */
-    protected $_gphotoAlbumId = null;
-
-    /**
-     * gphoto:version element
-     *
-     * @var Zend_Gdata_Photos_Extension_Version
-     */
-    protected $_gphotoVersion = null;
-
-    /**
-     * gphoto:width element
-     *
-     * @var Zend_Gdata_Photos_Extension_Width
-     */
-    protected $_gphotoWidth = null;
-
-    /**
-     * gphoto:height element
-     *
-     * @var Zend_Gdata_Photos_Extension_Height
-     */
-    protected $_gphotoHeight = null;
-
-    /**
-     * gphoto:size element
-     *
-     * @var Zend_Gdata_Photos_Extension_Size
-     */
-    protected $_gphotoSize = null;
-
-    /**
-     * gphoto:client element
-     *
-     * @var Zend_Gdata_Photos_Extension_Client
-     */
-    protected $_gphotoClient = null;
-
-    /**
-     * gphoto:checksum element
-     *
-     * @var Zend_Gdata_Photos_Extension_Checksum
-     */
-    protected $_gphotoChecksum = null;
-
-    /**
-     * gphoto:timestamp element
-     *
-     * @var Zend_Gdata_Photos_Extension_Timestamp
-     */
-    protected $_gphotoTimestamp = null;
-
-    /**
-     * gphoto:commentCount element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentCount
-     */
-    protected $_gphotoCommentCount = null;
-
-    /**
-     * gphoto:commentingEnabled element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentingEnabled
-     */
-    protected $_gphotoCommentingEnabled = null;
-
-    /**
-     * exif:tags element
-     *
-     * @var Zend_Gdata_Exif_Extension_Tags
-     */
-    protected $_exifTags = null;
-
-    /**
-     * georss:where element
-     *
-     * @var Zend_Gdata_Geo_Extension_GeoRssWhere
-     */
-    protected $_geoRssWhere = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-
-        $category = new Zend_Gdata_App_Extension_Category(
-            'http://schemas.google.com/photos/2007#photo',
-            'http://schemas.google.com/g/2005#kind');
-        $this->setCategory(array($category));
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoAlbumId !== null) {
-            $element->appendChild($this->_gphotoAlbumId->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoId !== null) {
-            $element->appendChild($this->_gphotoId->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoVersion !== null) {
-            $element->appendChild($this->_gphotoVersion->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoWidth !== null) {
-            $element->appendChild($this->_gphotoWidth->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoHeight !== null) {
-            $element->appendChild($this->_gphotoHeight->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoSize !== null) {
-            $element->appendChild($this->_gphotoSize->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoClient !== null) {
-            $element->appendChild($this->_gphotoClient->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoChecksum !== null) {
-            $element->appendChild($this->_gphotoChecksum->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoTimestamp !== null) {
-            $element->appendChild($this->_gphotoTimestamp->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentingEnabled !== null) {
-            $element->appendChild($this->_gphotoCommentingEnabled->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentCount !== null) {
-            $element->appendChild($this->_gphotoCommentCount->getDOM($element->ownerDocument));
-        }
-        if ($this->_exifTags !== null) {
-            $element->appendChild($this->_exifTags->getDOM($element->ownerDocument));
-        }
-        if ($this->_geoRssWhere !== null) {
-            $element->appendChild($this->_geoRssWhere->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'albumid';
-                $albumId = new Zend_Gdata_Photos_Extension_AlbumId();
-                $albumId->transferFromDOM($child);
-                $this->_gphotoAlbumId = $albumId;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'id';
-                $id = new Zend_Gdata_Photos_Extension_Id();
-                $id->transferFromDOM($child);
-                $this->_gphotoId = $id;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'version';
-                $version = new Zend_Gdata_Photos_Extension_Version();
-                $version->transferFromDOM($child);
-                $this->_gphotoVersion = $version;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'width';
-                $width = new Zend_Gdata_Photos_Extension_Width();
-                $width->transferFromDOM($child);
-                $this->_gphotoWidth = $width;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'height';
-                $height = new Zend_Gdata_Photos_Extension_Height();
-                $height->transferFromDOM($child);
-                $this->_gphotoHeight = $height;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'size';
-                $size = new Zend_Gdata_Photos_Extension_Size();
-                $size->transferFromDOM($child);
-                $this->_gphotoSize = $size;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'client';
-                $client = new Zend_Gdata_Photos_Extension_Client();
-                $client->transferFromDOM($child);
-                $this->_gphotoClient = $client;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'checksum';
-                $checksum = new Zend_Gdata_Photos_Extension_Checksum();
-                $checksum->transferFromDOM($child);
-                $this->_gphotoChecksum = $checksum;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'timestamp';
-                $timestamp = new Zend_Gdata_Photos_Extension_Timestamp();
-                $timestamp->transferFromDOM($child);
-                $this->_gphotoTimestamp = $timestamp;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled';
-                $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled();
-                $commentingEnabled->transferFromDOM($child);
-                $this->_gphotoCommentingEnabled = $commentingEnabled;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentCount';
-                $commentCount = new Zend_Gdata_Photos_Extension_CommentCount();
-                $commentCount->transferFromDOM($child);
-                $this->_gphotoCommentCount = $commentCount;
-                break;
-            case $this->lookupNamespace('exif') . ':' . 'tags';
-                $exifTags = new Zend_Gdata_Exif_Extension_Tags();
-                $exifTags->transferFromDOM($child);
-                $this->_exifTags = $exifTags;
-                break;
-            case $this->lookupNamespace('georss') . ':' . 'where';
-                $geoRssWhere = new Zend_Gdata_Geo_Extension_GeoRssWhere();
-                $geoRssWhere->transferFromDOM($child);
-                $this->_geoRssWhere = $geoRssWhere;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:albumid attribute.
-     *
-     * @see setGphotoAlbumId
-     * @return string The requested attribute.
-     */
-    public function getGphotoAlbumId()
-    {
-        return $this->_gphotoAlbumId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:albumid attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_AlbumId The element being modified.
-     */
-    public function setGphotoAlbumId($value)
-    {
-        $this->_gphotoAlbumId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:id attribute.
-     *
-     * @see setGphotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoId()
-    {
-        return $this->_gphotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:id attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Id The element being modified.
-     */
-    public function setGphotoId($value)
-    {
-        $this->_gphotoId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:version attribute.
-     *
-     * @see setGphotoVersion
-     * @return string The requested attribute.
-     */
-    public function getGphotoVersion()
-    {
-        return $this->_gphotoVersion;
-    }
-
-    /**
-     * Set the value for this element's gphoto:version attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Version The element being modified.
-     */
-    public function setGphotoVersion($value)
-    {
-        $this->_gphotoVersion = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:width attribute.
-     *
-     * @see setGphotoWidth
-     * @return string The requested attribute.
-     */
-    public function getGphotoWidth()
-    {
-        return $this->_gphotoWidth;
-    }
-
-    /**
-     * Set the value for this element's gphoto:width attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Width The element being modified.
-     */
-    public function setGphotoWidth($value)
-    {
-        $this->_gphotoWidth = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:height attribute.
-     *
-     * @see setGphotoHeight
-     * @return string The requested attribute.
-     */
-    public function getGphotoHeight()
-    {
-        return $this->_gphotoHeight;
-    }
-
-    /**
-     * Set the value for this element's gphoto:height attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Height The element being modified.
-     */
-    public function setGphotoHeight($value)
-    {
-        $this->_gphotoHeight = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:size attribute.
-     *
-     * @see setGphotoSize
-     * @return string The requested attribute.
-     */
-    public function getGphotoSize()
-    {
-        return $this->_gphotoSize;
-    }
-
-    /**
-     * Set the value for this element's gphoto:size attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Size The element being modified.
-     */
-    public function setGphotoSize($value)
-    {
-        $this->_gphotoSize = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:client attribute.
-     *
-     * @see setGphotoClient
-     * @return string The requested attribute.
-     */
-    public function getGphotoClient()
-    {
-        return $this->_gphotoClient;
-    }
-
-    /**
-     * Set the value for this element's gphoto:client attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Client The element being modified.
-     */
-    public function setGphotoClient($value)
-    {
-        $this->_gphotoClient = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:checksum attribute.
-     *
-     * @see setGphotoChecksum
-     * @return string The requested attribute.
-     */
-    public function getGphotoChecksum()
-    {
-        return $this->_gphotoChecksum;
-    }
-
-    /**
-     * Set the value for this element's gphoto:checksum attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Checksum The element being modified.
-     */
-    public function setGphotoChecksum($value)
-    {
-        $this->_gphotoChecksum = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:timestamp attribute.
-     *
-     * @see setGphotoTimestamp
-     * @return string The requested attribute.
-     */
-    public function getGphotoTimestamp()
-    {
-        return $this->_gphotoTimestamp;
-    }
-
-    /**
-     * Set the value for this element's gphoto:timestamp attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Timestamp The element being modified.
-     */
-    public function setGphotoTimestamp($value)
-    {
-        $this->_gphotoTimestamp = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentCount attribute.
-     *
-     * @see setGphotoCommentCount
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentCount()
-    {
-        return $this->_gphotoCommentCount;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentCount attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentCount The element being modified.
-     */
-    public function setGphotoCommentCount($value)
-    {
-        $this->_gphotoCommentCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @see setGphotoCommentingEnabled
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentingEnabled()
-    {
-        return $this->_gphotoCommentingEnabled;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentingEnabled The element being modified.
-     */
-    public function setGphotoCommentingEnabled($value)
-    {
-        $this->_gphotoCommentingEnabled = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's exif:tags attribute.
-     *
-     * @see setExifTags
-     * @return string The requested attribute.
-     */
-    public function getExifTags()
-    {
-        return $this->_exifTags;
-    }
-
-    /**
-     * Set the value for this element's exif:tags attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Exif_Extension_Tags The element being modified.
-     */
-    public function setExifTags($value)
-    {
-        $this->_exifTags = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's georss:where attribute.
-     *
-     * @see setGeoRssWhere
-     * @return string The requested attribute.
-     */
-    public function getGeoRssWhere()
-    {
-        return $this->_geoRssWhere;
-    }
-
-    /**
-     * Set the value for this element's georss:where attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere The element being modified.
-     */
-    public function setGeoRssWhere($value)
-    {
-        $this->_geoRssWhere = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's media:group attribute.
-     *
-     * @see setMediaGroup
-     * @return string The requested attribute.
-     */
-    public function getMediaGroup()
-    {
-        return $this->_mediaGroup;
-    }
-
-    /**
-     * Set the value for this element's media:group attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Media_Extension_MediaGroup The element being modified.
-     */
-    public function setMediaGroup($value)
-    {
-        $this->_mediaGroup = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/PhotoFeed.php b/airtime_mvc/library/Zend/Gdata/Photos/PhotoFeed.php
deleted file mode 100644
index 011adbad1..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/PhotoFeed.php
+++ /dev/null
@@ -1,559 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhotoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Photos_PhotoEntry
- */
-require_once 'Zend/Gdata/Photos/PhotoEntry.php';
-
-/**
- * Data model for a collection of photo entries, usually
- * provided by the Picasa servers.
- *
- * For information on requesting this feed from a server, see the
- * service class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * gphoto:id element
-     *
-     * @var Zend_Gdata_Photos_Extension_Id
-     */
-    protected $_gphotoId = null;
-
-    /**
-     * gphoto:albumid element
-     *
-     * @var Zend_Gdata_Photos_Extension_AlbumId
-     */
-    protected $_gphotoAlbumId = null;
-
-    /**
-     * gphoto:version element
-     *
-     * @var Zend_Gdata_Photos_Extension_Version
-     */
-    protected $_gphotoVersion = null;
-
-    /**
-     * gphoto:width element
-     *
-     * @var Zend_Gdata_Photos_Extension_Width
-     */
-    protected $_gphotoWidth = null;
-
-    /**
-     * gphoto:height element
-     *
-     * @var Zend_Gdata_Photos_Extension_Height
-     */
-    protected $_gphotoHeight = null;
-
-    /**
-     * gphoto:size element
-     *
-     * @var Zend_Gdata_Photos_Extension_Size
-     */
-    protected $_gphotoSize = null;
-
-    /**
-     * gphoto:client element
-     *
-     * @var Zend_Gdata_Photos_Extension_Client
-     */
-    protected $_gphotoClient = null;
-
-    /**
-     * gphoto:checksum element
-     *
-     * @var Zend_Gdata_Photos_Extension_Checksum
-     */
-    protected $_gphotoChecksum = null;
-
-    /**
-     * gphoto:timestamp element
-     *
-     * @var Zend_Gdata_Photos_Extension_Timestamp
-     */
-    protected $_gphotoTimestamp = null;
-
-    /**
-     * gphoto:commentCount element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentCount
-     */
-    protected $_gphotoCommentCount = null;
-
-    /**
-     * gphoto:commentingEnabled element
-     *
-     * @var Zend_Gdata_Photos_Extension_CommentingEnabled
-     */
-    protected $_gphotoCommentingEnabled = null;
-
-    /**
-     * media:group element
-     *
-     * @var Zend_Gdata_Media_Extension_MediaGroup
-     */
-    protected $_mediaGroup = null;
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_PhotoEntry';
-    protected $_feedClassName = 'Zend_Gdata_Photos_PhotoFeed';
-
-    protected $_entryKindClassMapping = array(
-        'http://schemas.google.com/photos/2007#comment' => 'Zend_Gdata_Photos_CommentEntry',
-        'http://schemas.google.com/photos/2007#tag' => 'Zend_Gdata_Photos_TagEntry'
-    );
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoId != null) {
-            $element->appendChild($this->_gphotoId->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoVersion != null) {
-            $element->appendChild($this->_gphotoVersion->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoWidth != null) {
-            $element->appendChild($this->_gphotoWidth->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoHeight != null) {
-            $element->appendChild($this->_gphotoHeight->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoSize != null) {
-            $element->appendChild($this->_gphotoSize->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoClient != null) {
-            $element->appendChild($this->_gphotoClient->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoChecksum != null) {
-            $element->appendChild($this->_gphotoChecksum->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoTimestamp != null) {
-            $element->appendChild($this->_gphotoTimestamp->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentingEnabled != null) {
-            $element->appendChild($this->_gphotoCommentingEnabled->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoCommentCount != null) {
-            $element->appendChild($this->_gphotoCommentCount->getDOM($element->ownerDocument));
-        }
-        if ($this->_mediaGroup != null) {
-            $element->appendChild($this->_mediaGroup->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'id';
-                $id = new Zend_Gdata_Photos_Extension_Id();
-                $id->transferFromDOM($child);
-                $this->_gphotoId = $id;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'version';
-                $version = new Zend_Gdata_Photos_Extension_Version();
-                $version->transferFromDOM($child);
-                $this->_gphotoVersion = $version;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'albumid';
-                $albumid = new Zend_Gdata_Photos_Extension_AlbumId();
-                $albumid->transferFromDOM($child);
-                $this->_gphotoAlbumId = $albumid;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'width';
-                $width = new Zend_Gdata_Photos_Extension_Width();
-                $width->transferFromDOM($child);
-                $this->_gphotoWidth = $width;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'height';
-                $height = new Zend_Gdata_Photos_Extension_Height();
-                $height->transferFromDOM($child);
-                $this->_gphotoHeight = $height;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'size';
-                $size = new Zend_Gdata_Photos_Extension_Size();
-                $size->transferFromDOM($child);
-                $this->_gphotoSize = $size;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'client';
-                $client = new Zend_Gdata_Photos_Extension_Client();
-                $client->transferFromDOM($child);
-                $this->_gphotoClient = $client;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'checksum';
-                $checksum = new Zend_Gdata_Photos_Extension_Checksum();
-                $checksum->transferFromDOM($child);
-                $this->_gphotoChecksum = $checksum;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'timestamp';
-                $timestamp = new Zend_Gdata_Photos_Extension_Timestamp();
-                $timestamp->transferFromDOM($child);
-                $this->_gphotoTimestamp = $timestamp;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentingEnabled';
-                $commentingEnabled = new Zend_Gdata_Photos_Extension_CommentingEnabled();
-                $commentingEnabled->transferFromDOM($child);
-                $this->_gphotoCommentingEnabled = $commentingEnabled;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'commentCount';
-                $commentCount = new Zend_Gdata_Photos_Extension_CommentCount();
-                $commentCount->transferFromDOM($child);
-                $this->_gphotoCommentCount = $commentCount;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'group';
-                $mediaGroup = new Zend_Gdata_Media_Extension_MediaGroup();
-                $mediaGroup->transferFromDOM($child);
-                $this->_mediaGroup = $mediaGroup;
-                break;
-            case $this->lookupNamespace('atom') . ':' . 'entry':
-                $entryClassName = $this->_entryClassName;
-                $tmpEntry = new Zend_Gdata_App_Entry($child);
-                $categories = $tmpEntry->getCategory();
-                foreach ($categories as $category) {
-                    if ($category->scheme == Zend_Gdata_Photos::KIND_PATH &&
-                        $this->_entryKindClassMapping[$category->term] != "") {
-                            $entryClassName = $this->_entryKindClassMapping[$category->term];
-                            break;
-                    } else {
-                        require_once 'Zend/Gdata/App/Exception.php';
-                        throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.');
-                    }
-                }
-
-                $newEntry = new $entryClassName($child);
-                $newEntry->setHttpClient($this->getHttpClient());
-                $this->_entry[] = $newEntry;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:id attribute.
-     *
-     * @see setGphotoId
-     * @return string The requested attribute.
-     */
-    public function getGphotoId()
-    {
-        return $this->_gphotoId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:id attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Id The element being modified.
-     */
-    public function setGphotoId($value)
-    {
-        $this->_gphotoId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:version attribute.
-     *
-     * @see setGphotoVersion
-     * @return string The requested attribute.
-     */
-    public function getGphotoVersion()
-    {
-        return $this->_gphotoVersion;
-    }
-
-    /**
-     * Set the value for this element's gphoto:version attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Version The element being modified.
-     */
-    public function setGphotoVersion($value)
-    {
-        $this->_gphotoVersion = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:albumid attribute.
-     *
-     * @see setGphotoAlbumId
-     * @return string The requested attribute.
-     */
-    public function getGphotoAlbumId()
-    {
-        return $this->_gphotoAlbumId;
-    }
-
-    /**
-     * Set the value for this element's gphoto:albumid attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_AlbumId The element being modified.
-     */
-    public function setGphotoAlbumId($value)
-    {
-        $this->_gphotoAlbumId = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:width attribute.
-     *
-     * @see setGphotoWidth
-     * @return string The requested attribute.
-     */
-    public function getGphotoWidth()
-    {
-        return $this->_gphotoWidth;
-    }
-
-    /**
-     * Set the value for this element's gphoto:width attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Width The element being modified.
-     */
-    public function setGphotoWidth($value)
-    {
-        $this->_gphotoWidth = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:height attribute.
-     *
-     * @see setGphotoHeight
-     * @return string The requested attribute.
-     */
-    public function getGphotoHeight()
-    {
-        return $this->_gphotoHeight;
-    }
-
-    /**
-     * Set the value for this element's gphoto:height attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Height The element being modified.
-     */
-    public function setGphotoHeight($value)
-    {
-        $this->_gphotoHeight = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:size attribute.
-     *
-     * @see setGphotoSize
-     * @return string The requested attribute.
-     */
-    public function getGphotoSize()
-    {
-        return $this->_gphotoSize;
-    }
-
-    /**
-     * Set the value for this element's gphoto:size attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Size The element being modified.
-     */
-    public function setGphotoSize($value)
-    {
-        $this->_gphotoSize = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:client attribute.
-     *
-     * @see setGphotoClient
-     * @return string The requested attribute.
-     */
-    public function getGphotoClient()
-    {
-        return $this->_gphotoClient;
-    }
-
-    /**
-     * Set the value for this element's gphoto:client attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Client The element being modified.
-     */
-    public function setGphotoClient($value)
-    {
-        $this->_gphotoClient = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:checksum attribute.
-     *
-     * @see setGphotoChecksum
-     * @return string The requested attribute.
-     */
-    public function getGphotoChecksum()
-    {
-        return $this->_gphotoChecksum;
-    }
-
-    /**
-     * Set the value for this element's gphoto:checksum attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Checksum The element being modified.
-     */
-    public function setGphotoChecksum($value)
-    {
-        $this->_gphotoChecksum = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:timestamp attribute.
-     *
-     * @see setGphotoTimestamp
-     * @return string The requested attribute.
-     */
-    public function getGphotoTimestamp()
-    {
-        return $this->_gphotoTimestamp;
-    }
-
-    /**
-     * Set the value for this element's gphoto:timestamp attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Timestamp The element being modified.
-     */
-    public function setGphotoTimestamp($value)
-    {
-        $this->_gphotoTimestamp = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentCount attribute.
-     *
-     * @see setGphotoCommentCount
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentCount()
-    {
-        return $this->_gphotoCommentCount;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentCount attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentCount The element being modified.
-     */
-    public function setGphotoCommentCount($value)
-    {
-        $this->_gphotoCommentCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @see setGphotoCommentingEnabled
-     * @return string The requested attribute.
-     */
-    public function getGphotoCommentingEnabled()
-    {
-        return $this->_gphotoCommentingEnabled;
-    }
-
-    /**
-     * Set the value for this element's gphoto:commentingEnabled attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_CommentingEnabled The element being modified.
-     */
-    public function setGphotoCommentingEnabled($value)
-    {
-        $this->_gphotoCommentingEnabled = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's media:group attribute.
-     *
-     * @see setMediaGroup
-     * @return string The requested attribute.
-     */
-    public function getMediaGroup()
-    {
-        return $this->_mediaGroup;
-    }
-
-    /**
-     * Set the value for this element's media:group attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Media_Extension_MediaGroup The element being modified.
-     */
-    public function setMediaGroup($value)
-    {
-        $this->_mediaGroup = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/PhotoQuery.php b/airtime_mvc/library/Zend/Gdata/Photos/PhotoQuery.php
deleted file mode 100644
index 1ce6daa3b..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/PhotoQuery.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhotoQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Picasa_AlbumQuery
- */
-require_once('Zend/Gdata/Photos/AlbumQuery.php');
-
-/**
- * Assists in constructing queries for comment/tag entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the
- * service class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery
-{
-
-    /**
-     * The ID of the photo to query for.
-     *
-     * @var string
-     */
-    protected $_photoId = null;
-
-    /**
-     * Set the photo ID to query for. When set, this photo's comments/tags
-     * will be returned. If not set or null, the default user's feed will be
-     * returned instead.
-     *
-     * @param string $value The ID of the photo to retrieve, or null to
-     *          clear.
-     */
-     public function setPhotoId($value)
-     {
-         $this->_photoId = $value;
-     }
-
-    /**
-     * Get the photo ID which is to be returned.
-     *
-     * @see setPhoto
-     * @return string The ID of the photo to retrieve.
-     */
-    public function getPhotoId()
-    {
-        return $this->_photoId;
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getQueryUrl($incomingUri = '')
-    {
-        $uri = '';
-        if ($this->getPhotoId() !== null) {
-            $uri .= '/photoid/' . $this->getPhotoId();
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'PhotoId cannot be null');
-        }
-        $uri .= $incomingUri;
-        return parent::getQueryUrl($uri);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/TagEntry.php b/airtime_mvc/library/Zend/Gdata/Photos/TagEntry.php
deleted file mode 100644
index 2ccbdb7e7..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/TagEntry.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Weight
- */
-require_once 'Zend/Gdata/Photos/Extension/Weight.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Data model class for a Tag Entry.
- *
- * To transfer user entries to and from the servers, including
- * creating new entries, refer to the service class,
- * Zend_Gdata_Photos.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_TagEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_TagEntry';
-
-    protected $_gphotoWeight = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-
-        $category = new Zend_Gdata_App_Extension_Category(
-            'http://schemas.google.com/photos/2007#tag',
-            'http://schemas.google.com/g/2005#kind');
-        $this->setCategory(array($category));
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoWeight !== null) {
-            $element->appendChild($this->_gphotoWeight->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'weight';
-                $weight = new Zend_Gdata_Photos_Extension_Weight();
-                $weight->transferFromDOM($child);
-                $this->_gphotoWeight = $weight;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:weight attribute.
-     *
-     * @see setGphotoWeight
-     * @return string The requested attribute.
-     */
-    public function getGphotoWeight()
-    {
-        return $this->_gphotoWeight;
-    }
-
-    /**
-     * Set the value for this element's gphoto:weight attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Weight The element being modified.
-     */
-    public function setGphotoWeight($value)
-    {
-        $this->_gphotoWeight = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/UserEntry.php b/airtime_mvc/library/Zend/Gdata/Photos/UserEntry.php
deleted file mode 100644
index 58ed8dcc8..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/UserEntry.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Gapps
- */
-require_once 'Zend/Gdata/Gapps.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Nickname
- */
-require_once 'Zend/Gdata/Photos/Extension/Nickname.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_Thumbnail
- */
-require_once 'Zend/Gdata/Photos/Extension/Thumbnail.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_QuotaCurrent
- */
-require_once 'Zend/Gdata/Photos/Extension/QuotaCurrent.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_QuotaLimit
- */
-require_once 'Zend/Gdata/Photos/Extension/QuotaLimit.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum
- */
-require_once 'Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php';
-
-/**
- * @see Zend_Gdata_Photos_Extension_User
- */
-require_once 'Zend/Gdata/Photos/Extension/User.php';
-
-/**
- * @see Zend_Gdata_App_Extension_Category
- */
-require_once 'Zend/Gdata/App/Extension/Category.php';
-
-/**
- * Data model class for a User Entry.
- *
- * To transfer user entries to and from the servers, including
- * creating new entries, refer to the service class,
- * Zend_Gdata_Photos.
- *
- * This class represents <atom:entry> in the Google Data protocol.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_UserEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_UserEntry';
-
-    /**
-     * gphoto:nickname element
-     *
-     * @var Zend_Gdata_Photos_Extension_Nickname
-     */
-    protected $_gphotoNickname = null;
-
-    /**
-     * gphoto:user element
-     *
-     * @var Zend_Gdata_Photos_Extension_User
-     */
-    protected $_gphotoUser = null;
-
-    /**
-     * gphoto:thumbnail element
-     *
-     * @var Zend_Gdata_Photos_Extension_Thumbnail
-     */
-    protected $_gphotoThumbnail = null;
-
-    /**
-     * gphoto:quotalimit element
-     *
-     * @var Zend_Gdata_Photos_Extension_QuotaLimit
-     */
-    protected $_gphotoQuotaLimit = null;
-
-    /**
-     * gphoto:quotacurrent element
-     *
-     * @var Zend_Gdata_Photos_Extension_QuotaCurrent
-     */
-    protected $_gphotoQuotaCurrent = null;
-
-    /**
-     * gphoto:maxPhotosPerAlbum element
-     *
-     * @var Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum
-     */
-    protected $_gphotoMaxPhotosPerAlbum = null;
-
-    /**
-     * Create a new instance.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-
-        $category = new Zend_Gdata_App_Extension_Category(
-            'http://schemas.google.com/photos/2007#user',
-            'http://schemas.google.com/g/2005#kind');
-        $this->setCategory(array($category));
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoNickname !== null) {
-            $element->appendChild($this->_gphotoNickname->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoThumbnail !== null) {
-            $element->appendChild($this->_gphotoThumbnail->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoUser !== null) {
-            $element->appendChild($this->_gphotoUser->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoQuotaCurrent !== null) {
-            $element->appendChild($this->_gphotoQuotaCurrent->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoQuotaLimit !== null) {
-            $element->appendChild($this->_gphotoQuotaLimit->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoMaxPhotosPerAlbum !== null) {
-            $element->appendChild($this->_gphotoMaxPhotosPerAlbum->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'nickname';
-                $nickname = new Zend_Gdata_Photos_Extension_Nickname();
-                $nickname->transferFromDOM($child);
-                $this->_gphotoNickname = $nickname;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'thumbnail';
-                $thumbnail = new Zend_Gdata_Photos_Extension_Thumbnail();
-                $thumbnail->transferFromDOM($child);
-                $this->_gphotoThumbnail = $thumbnail;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'user';
-                $user = new Zend_Gdata_Photos_Extension_User();
-                $user->transferFromDOM($child);
-                $this->_gphotoUser = $user;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'quotacurrent';
-                $quotaCurrent = new Zend_Gdata_Photos_Extension_QuotaCurrent();
-                $quotaCurrent->transferFromDOM($child);
-                $this->_gphotoQuotaCurrent = $quotaCurrent;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'quotalimit';
-                $quotaLimit = new Zend_Gdata_Photos_Extension_QuotaLimit();
-                $quotaLimit->transferFromDOM($child);
-                $this->_gphotoQuotaLimit = $quotaLimit;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'maxPhotosPerAlbum';
-                $maxPhotosPerAlbum = new Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum();
-                $maxPhotosPerAlbum->transferFromDOM($child);
-                $this->_gphotoMaxPhotosPerAlbum = $maxPhotosPerAlbum;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the value for this element's gphoto:nickname attribute.
-     *
-     * @see setGphotoNickname
-     * @return string The requested attribute.
-     */
-    public function getGphotoNickname()
-    {
-        return $this->_gphotoNickname;
-    }
-
-    /**
-     * Set the value for this element's gphoto:nickname attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Nickname The element being modified.
-     */
-    public function setGphotoNickname($value)
-    {
-        $this->_gphotoNickname = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:thumbnail attribute.
-     *
-     * @see setGphotoThumbnail
-     * @return string The requested attribute.
-     */
-    public function getGphotoThumbnail()
-    {
-        return $this->_gphotoThumbnail;
-    }
-
-    /**
-     * Set the value for this element's gphoto:thumbnail attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Thumbnail The element being modified.
-     */
-    public function setGphotoThumbnail($value)
-    {
-        $this->_gphotoThumbnail = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:quotacurrent attribute.
-     *
-     * @see setGphotoQuotaCurrent
-     * @return string The requested attribute.
-     */
-    public function getGphotoQuotaCurrent()
-    {
-        return $this->_gphotoQuotaCurrent;
-    }
-
-    /**
-     * Set the value for this element's gphoto:quotacurrent attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_QuotaCurrent The element being modified.
-     */
-    public function setGphotoQuotaCurrent($value)
-    {
-        $this->_gphotoQuotaCurrent = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:quotalimit attribute.
-     *
-     * @see setGphotoQuotaLimit
-     * @return string The requested attribute.
-     */
-    public function getGphotoQuotaLimit()
-    {
-        return $this->_gphotoQuotaLimit;
-    }
-
-    /**
-     * Set the value for this element's gphoto:quotalimit attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_QuotaLimit The element being modified.
-     */
-    public function setGphotoQuotaLimit($value)
-    {
-        $this->_gphotoQuotaLimit = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:maxPhotosPerAlbum attribute.
-     *
-     * @see setGphotoMaxPhotosPerAlbum
-     * @return string The requested attribute.
-     */
-    public function getGphotoMaxPhotosPerAlbum()
-    {
-        return $this->_gphotoMaxPhotosPerAlbum;
-    }
-
-    /**
-     * Set the value for this element's gphoto:maxPhotosPerAlbum attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum The element being modified.
-     */
-    public function setGphotoMaxPhotosPerAlbum($value)
-    {
-        $this->_gphotoMaxPhotosPerAlbum = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:user attribute.
-     *
-     * @see setGphotoUser
-     * @return string The requested attribute.
-     */
-    public function getGphotoUser()
-    {
-        return $this->_gphotoUser;
-    }
-
-    /**
-     * Set the value for this element's gphoto:user attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_User The element being modified.
-     */
-    public function setGphotoUser($value)
-    {
-        $this->_gphotoUser = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/UserFeed.php b/airtime_mvc/library/Zend/Gdata/Photos/UserFeed.php
deleted file mode 100644
index f1ca1f4fe..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/UserFeed.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Photos
- */
-require_once 'Zend/Gdata/Photos.php';
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Photos_UserEntry
- */
-require_once 'Zend/Gdata/Photos/UserEntry.php';
-
-/**
- * @see Zend_Gdata_Photos_AlbumEntry
- */
-require_once 'Zend/Gdata/Photos/AlbumEntry.php';
-
-/**
- * @see Zend_Gdata_Photos_PhotoEntry
- */
-require_once 'Zend/Gdata/Photos/PhotoEntry.php';
-
-/**
- * @see Zend_Gdata_Photos_TagEntry
- */
-require_once 'Zend/Gdata/Photos/TagEntry.php';
-
-/**
- * @see Zend_Gdata_Photos_CommentEntry
- */
-require_once 'Zend/Gdata/Photos/CommentEntry.php';
-
-/**
- * Data model for a collection of entries for a specific user, usually
- * provided by the servers.
- *
- * For information on requesting this feed from a server, see the
- * service class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * gphoto:user element
-     *
-     * @var Zend_Gdata_Photos_Extension_User
-     */
-    protected $_gphotoUser = null;
-
-    /**
-     * gphoto:thumbnail element
-     *
-     * @var Zend_Gdata_Photos_Extension_Thumbnail
-     */
-    protected $_gphotoThumbnail = null;
-
-    /**
-     * gphoto:nickname element
-     *
-     * @var Zend_Gdata_Photos_Extension_Nickname
-     */
-    protected $_gphotoNickname = null;
-
-    protected $_entryClassName = 'Zend_Gdata_Photos_UserEntry';
-    protected $_feedClassName = 'Zend_Gdata_Photos_UserFeed';
-
-    protected $_entryKindClassMapping = array(
-        'http://schemas.google.com/photos/2007#album' => 'Zend_Gdata_Photos_AlbumEntry',
-        'http://schemas.google.com/photos/2007#photo' => 'Zend_Gdata_Photos_PhotoEntry',
-        'http://schemas.google.com/photos/2007#comment' => 'Zend_Gdata_Photos_CommentEntry',
-        'http://schemas.google.com/photos/2007#tag' => 'Zend_Gdata_Photos_TagEntry'
-    );
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Photos::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gphoto') . ':' . 'user';
-                $user = new Zend_Gdata_Photos_Extension_User();
-                $user->transferFromDOM($child);
-                $this->_gphotoUser = $user;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'nickname';
-                $nickname = new Zend_Gdata_Photos_Extension_Nickname();
-                $nickname->transferFromDOM($child);
-                $this->_gphotoNickname = $nickname;
-                break;
-            case $this->lookupNamespace('gphoto') . ':' . 'thumbnail';
-                $thumbnail = new Zend_Gdata_Photos_Extension_Thumbnail();
-                $thumbnail->transferFromDOM($child);
-                $this->_gphotoThumbnail = $thumbnail;
-                break;
-            case $this->lookupNamespace('atom') . ':' . 'entry':
-                $entryClassName = $this->_entryClassName;
-                $tmpEntry = new Zend_Gdata_App_Entry($child);
-                $categories = $tmpEntry->getCategory();
-                foreach ($categories as $category) {
-                    if ($category->scheme == Zend_Gdata_Photos::KIND_PATH &&
-                        $this->_entryKindClassMapping[$category->term] != "") {
-                            $entryClassName = $this->_entryKindClassMapping[$category->term];
-                            break;
-                    } else {
-                        require_once 'Zend/Gdata/App/Exception.php';
-                        throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.');
-                    }
-                }
-
-                $newEntry = new $entryClassName($child);
-                $newEntry->setHttpClient($this->getHttpClient());
-                $this->_entry[] = $newEntry;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_gphotoUser != null) {
-            $element->appendChild($this->_gphotoUser->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoNickname != null) {
-            $element->appendChild($this->_gphotoNickname->getDOM($element->ownerDocument));
-        }
-        if ($this->_gphotoThumbnail != null) {
-            $element->appendChild($this->_gphotoThumbnail->getDOM($element->ownerDocument));
-        }
-
-        return $element;
-    }
-
-    /**
-     * Get the value for this element's gphoto:user attribute.
-     *
-     * @see setGphotoUser
-     * @return string The requested attribute.
-     */
-    public function getGphotoUser()
-    {
-        return $this->_gphotoUser;
-    }
-
-    /**
-     * Set the value for this element's gphoto:user attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_User The element being modified.
-     */
-    public function setGphotoUser($value)
-    {
-        $this->_gphotoUser = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:nickname attribute.
-     *
-     * @see setGphotoNickname
-     * @return string The requested attribute.
-     */
-    public function getGphotoNickname()
-    {
-        return $this->_gphotoNickname;
-    }
-
-    /**
-     * Set the value for this element's gphoto:nickname attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Nickname The element being modified.
-     */
-    public function setGphotoNickname($value)
-    {
-        $this->_gphotoNickname = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's gphoto:thumbnail attribute.
-     *
-     * @see setGphotoThumbnail
-     * @return string The requested attribute.
-     */
-    public function getGphotoThumbnail()
-    {
-        return $this->_gphotoThumbnail;
-    }
-
-    /**
-     * Set the value for this element's gphoto:thumbnail attribute.
-     *
-     * @param string $value The desired value for this attribute.
-     * @return Zend_Gdata_Photos_Extension_Thumbnail The element being modified.
-     */
-    public function setGphotoThumbnail($value)
-    {
-        $this->_gphotoThumbnail = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Photos/UserQuery.php b/airtime_mvc/library/Zend/Gdata/Photos/UserQuery.php
deleted file mode 100644
index e5f806034..000000000
--- a/airtime_mvc/library/Zend/Gdata/Photos/UserQuery.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Gapps_Query
- */
-require_once('Zend/Gdata/Gapps/Query.php');
-
-/**
- * Assists in constructing queries for user entries.
- * Instances of this class can be provided in many places where a URL is
- * required.
- *
- * For information on submitting queries to a server, see the
- * service class, Zend_Gdata_Photos.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Photos
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query
-{
-
-    /**
-     * Indicates the format of data returned in Atom feeds. Can be either
-     * 'api' or 'base'. Default value is 'api'.
-     *
-     * @var string
-     */
-    protected $_projection = 'api';
-
-    /**
-     * Indicates whether to request a feed or entry in queries. Default
-     * value is 'feed';
-     *
-     * @var string
-     */
-    protected $_type = 'feed';
-
-    /**
-     * A string which, if not null, indicates which user should
-     * be retrieved by this query. If null, the default user will be used
-     * instead.
-     *
-     * @var string
-     */
-    protected $_user = Zend_Gdata_Photos::DEFAULT_USER;
-
-    /**
-     * Create a new Query object with default values.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Set's the format of data returned in Atom feeds. Can be either
-     * 'api' or 'base'. Normally, 'api' will be desired. Default is 'api'.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Photos_UserQuery Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the format of data in returned in Atom feeds.
-     *
-     * @see setProjection
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * Set's the type of data returned in queries. Can be either
-     * 'feed' or 'entry'. Normally, 'feed' will be desired. Default is 'feed'.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Photos_UserQuery Provides a fluent interface
-     */
-    public function setType($value)
-    {
-        $this->_type = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the type of data in returned in queries.
-     *
-     * @see setType
-     * @return string type
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set the user to query for. When set, this user's feed will be
-     * returned. If not set or null, the default user's feed will be returned
-     * instead.
-     *
-     * @param string $value The user to retrieve, or null for the default
-     *          user.
-     */
-     public function setUser($value)
-     {
-         if ($value !== null) {
-             $this->_user = $value;
-         } else {
-             $this->_user = Zend_Gdata_Photos::DEFAULT_USER;
-         }
-     }
-
-    /**
-     * Get the user which is to be returned.
-     *
-     * @see setUser
-     * @return string The visibility to retrieve.
-     */
-    public function getUser()
-    {
-        return $this->_user;
-    }
-
-    /**
-     * Set the visibility filter for entries returned. Only entries which
-     * match this value will be returned. If null or unset, the default
-     * value will be used instead.
-     *
-     * Valid values are 'all' (default), 'public', and 'private'.
-     *
-     * @param string $value The visibility to filter by, or null to use the
-     *          default value.
-     */
-     public function setAccess($value)
-     {
-         if ($value !== null) {
-             $this->_params['access'] = $value;
-         } else {
-             unset($this->_params['access']);
-         }
-     }
-
-    /**
-     * Get the visibility filter for entries returned.
-     *
-     * @see setAccess
-     * @return string The visibility to filter by, or null for the default
-     *          user.
-     */
-    public function getAccess()
-    {
-        return $this->_params['access'];
-    }
-
-    /**
-     * Set the tag for entries that are returned. Only entries which
-     * match this value will be returned. If null or unset, this filter will
-     * not be applied.
-     *
-     * See http://code.google.com/apis/picasaweb/reference.html#Parameters
-     * for a list of valid values.
-     *
-     * @param string $value The tag to filter by, or null if no
-     *          filter is to be applied.
-     */
-     public function setTag($value)
-     {
-         if ($value !== null) {
-             $this->_params['tag'] = $value;
-         } else {
-             unset($this->_params['tag']);
-         }
-     }
-
-    /**
-     * Get the tag filter for entries returned.
-     *
-     * @see setTag
-     * @return string The tag to filter by, or null if no filter
-     *          is to be applied.
-     */
-    public function getTag()
-    {
-        return $this->_params['tag'];
-    }
-
-    /**
-     * Set the kind of entries that are returned. Only entries which
-     * match this value will be returned. If null or unset, this filter will
-     * not be applied.
-     *
-     * See http://code.google.com/apis/picasaweb/reference.html#Parameters
-     * for a list of valid values.
-     *
-     * @param string $value The kind to filter by, or null if no
-     *          filter is to be applied.
-     */
-     public function setKind($value)
-     {
-         if ($value !== null) {
-             $this->_params['kind'] = $value;
-         } else {
-             unset($this->_params['kind']);
-         }
-     }
-
-    /**
-     * Get the kind of entries to be returned.
-     *
-     * @see setKind
-     * @return string The kind to filter by, or null if no filter
-     *          is to be applied.
-     */
-    public function getKind()
-    {
-        return $this->_params['kind'];
-    }
-
-    /**
-     * Set the maximum image size for entries returned. Only entries which
-     * match this value will be returned. If null or unset, this filter will
-     * not be applied.
-     *
-     * See http://code.google.com/apis/picasaweb/reference.html#Parameters
-     * for a list of valid values.
-     *
-     * @param string $value The image size to filter by, or null if no
-     *          filter is to be applied.
-     */
-     public function setImgMax($value)
-     {
-         if ($value !== null) {
-             $this->_params['imgmax'] = $value;
-         } else {
-             unset($this->_params['imgmax']);
-         }
-     }
-
-    /**
-     * Get the maximum image size filter for entries returned.
-     *
-     * @see setImgMax
-     * @return string The image size size to filter by, or null if no filter
-     *          is to be applied.
-     */
-    public function getImgMax()
-    {
-        return $this->_params['imgmax'];
-    }
-
-    /**
-     * Set the thumbnail size filter for entries returned. Only entries which
-     * match this value will be returned. If null or unset, this filter will
-     * not be applied.
-     *
-     * See http://code.google.com/apis/picasaweb/reference.html#Parameters
-     * for a list of valid values.
-     *
-     * @param string $value The thumbnail size to filter by, or null if no
-     *          filter is to be applied.
-     */
-     public function setThumbsize($value)
-     {
-         if ($value !== null) {
-             $this->_params['thumbsize'] = $value;
-         } else {
-             unset($this->_params['thumbsize']);
-         }
-     }
-
-    /**
-     * Get the thumbnail size filter for entries returned.
-     *
-     * @see setThumbsize
-     * @return string The thumbnail size to filter by, or null if no filter
-     *          is to be applied.
-     */
-    public function getThumbsize()
-    {
-        return $this->_params['thumbsize'];
-    }
-
-    /**
-     * Returns the URL generated for this query, based on it's current
-     * parameters.
-     *
-     * @return string A URL generated based on the state of this query.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function getQueryUrl($incomingUri = null)
-    {
-        $uri = Zend_Gdata_Photos::PICASA_BASE_URI;
-
-        if ($this->getType() !== null) {
-            $uri .= '/' . $this->getType();
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Type must be feed or entry, not null');
-        }
-
-        if ($this->getProjection() !== null) {
-            $uri .= '/' . $this->getProjection();
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Projection must not be null');
-        }
-
-        if ($this->getUser() !== null) {
-            $uri .= '/user/' . $this->getUser();
-        } else {
-            // Should never occur due to setter behavior
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                    'User must not be null');
-        }
-
-        $uri .= $incomingUri;
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Query.php b/airtime_mvc/library/Zend/Gdata/Query.php
deleted file mode 100644
index 9e4cdb71f..000000000
--- a/airtime_mvc/library/Zend/Gdata/Query.php
+++ /dev/null
@@ -1,418 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_Util
- */
-require_once 'Zend/Gdata/App/Util.php';
-
-/**
- * Provides a mechanism to build a query URL for Gdata services.
- * Queries are not defined for APP, but are provided by Gdata services
- * as an extension.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Gdata
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Query
-{
-
-    /**
-     * Query parameters.
-     *
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Default URL
-     *
-     * @var string
-     */
-    protected $_defaultFeedUri = null;
-
-    /**
-     * Base URL
-     * TODO: Add setters and getters
-     *
-     * @var string
-     */
-    protected $_url = null;
-
-    /**
-     * Category for the query
-     *
-     * @var string
-     */
-    protected $_category = null;
-
-    /**
-     * Create Gdata_Query object
-     */
-    public function __construct($url = null)
-    {
-        $this->_url = $url;
-    }
-
-    /**
-     * @return string querystring
-     */
-    public function getQueryString()
-    {
-        $queryArray = array();
-        foreach ($this->_params as $name => $value) {
-            if (substr($name, 0, 1) == '_') {
-                continue;
-            }
-            $queryArray[] = urlencode($name) . '=' . urlencode($value);
-        }
-        if (count($queryArray) > 0) {
-            return '?' . implode('&', $queryArray);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     *
-     */
-    public function resetParameters()
-    {
-        $this->_params = array();
-    }
-
-    /**
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-        if ($this->_url == null) {
-            $url = $this->_defaultFeedUri;
-        } else {
-            $url = $this->_url;
-        }
-        if ($this->getCategory() !== null) {
-            $url .= '/-/' . $this->getCategory();
-        }
-        $url .= $this->getQueryString();
-        return $url;
-    }
-
-    /**
-     * @param string $name
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setParam($name, $value)
-    {
-        $this->_params[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * @param string $name
-     */
-    public function getParam($name)
-    {
-        return $this->_params[$name];
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setAlt($value)
-    {
-        if ($value != null) {
-            $this->_params['alt'] = $value;
-        } else {
-            unset($this->_params['alt']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setMaxResults($value)
-    {
-        if ($value != null) {
-            $this->_params['max-results'] = $value;
-        } else {
-            unset($this->_params['max-results']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setQuery($value)
-    {
-        if ($value != null) {
-            $this->_params['q'] = $value;
-        } else {
-            unset($this->_params['q']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param int $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setStartIndex($value)
-    {
-        if ($value != null) {
-            $this->_params['start-index'] = $value;
-        } else {
-            unset($this->_params['start-index']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setUpdatedMax($value)
-    {
-        if ($value != null) {
-            $this->_params['updated-max'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['updated-max']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setUpdatedMin($value)
-    {
-        if ($value != null) {
-            $this->_params['updated-min'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['updated-min']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setPublishedMax($value)
-    {
-        if ($value !== null) {
-            $this->_params['published-max'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['published-max']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setPublishedMin($value)
-    {
-        if ($value != null) {
-            $this->_params['published-min'] = Zend_Gdata_App_Util::formatTimestamp($value);
-        } else {
-            unset($this->_params['published-min']);
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setAuthor($value)
-    {
-        if ($value != null) {
-            $this->_params['author'] = $value;
-        } else {
-            unset($this->_params['author']);
-        }
-        return $this;
-    }
-
-    /**
-     * @return string rss or atom
-     */
-    public function getAlt()
-    {
-        if (array_key_exists('alt', $this->_params)) {
-            return $this->_params['alt'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return int maxResults
-     */
-    public function getMaxResults()
-    {
-        if (array_key_exists('max-results', $this->_params)) {
-            return intval($this->_params['max-results']);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string query
-     */
-    public function getQuery()
-    {
-        if (array_key_exists('q', $this->_params)) {
-            return $this->_params['q'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return int startIndex
-     */
-    public function getStartIndex()
-    {
-        if (array_key_exists('start-index', $this->_params)) {
-            return intval($this->_params['start-index']);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string updatedMax
-     */
-    public function getUpdatedMax()
-    {
-        if (array_key_exists('updated-max', $this->_params)) {
-            return $this->_params['updated-max'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string updatedMin
-     */
-    public function getUpdatedMin()
-    {
-        if (array_key_exists('updated-min', $this->_params)) {
-            return $this->_params['updated-min'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string publishedMax
-     */
-    public function getPublishedMax()
-    {
-        if (array_key_exists('published-max', $this->_params)) {
-            return $this->_params['published-max'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string publishedMin
-     */
-    public function getPublishedMin()
-    {
-        if (array_key_exists('published-min', $this->_params)) {
-            return $this->_params['published-min'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @return string author
-     */
-    public function getAuthor()
-    {
-        if (array_key_exists('author', $this->_params)) {
-            return $this->_params['author'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Query Provides a fluent interface
-     */
-    public function setCategory($value)
-    {
-        $this->_category = $value;
-        return $this;
-    }
-
-    /*
-     * @return string id
-     */
-    public function getCategory()
-    {
-        return $this->_category;
-    }
-
-
-    public function __get($name)
-    {
-        $method = 'get'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method));
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('Property ' . $name . '  does not exist');
-        }
-    }
-
-    public function __set($name, $val)
-    {
-        $method = 'set'.ucfirst($name);
-        if (method_exists($this, $method)) {
-            return call_user_func(array(&$this, $method), $val);
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('Property ' . $name . '  does not exist');
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets.php
deleted file mode 100644
index ff1db62f7..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Spreadsheets.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata
- */
-require_once('Zend/Gdata.php');
-
-/**
- * Zend_Gdata_Spreadsheets_SpreadsheetFeed
- */
-require_once('Zend/Gdata/Spreadsheets/SpreadsheetFeed.php');
-
-/**
- * Zend_Gdata_Spreadsheets_WorksheetFeed
- */
-require_once('Zend/Gdata/Spreadsheets/WorksheetFeed.php');
-
-/**
- * Zend_Gdata_Spreadsheets_CellFeed
- */
-require_once('Zend/Gdata/Spreadsheets/CellFeed.php');
-
-/**
- * Zend_Gdata_Spreadsheets_ListFeed
- */
-require_once('Zend/Gdata/Spreadsheets/ListFeed.php');
-
-/**
- * Zend_Gdata_Spreadsheets_SpreadsheetEntry
- */
-require_once('Zend/Gdata/Spreadsheets/SpreadsheetEntry.php');
-
-/**
- * Zend_Gdata_Spreadsheets_WorksheetEntry
- */
-require_once('Zend/Gdata/Spreadsheets/WorksheetEntry.php');
-
-/**
- * Zend_Gdata_Spreadsheets_CellEntry
- */
-require_once('Zend/Gdata/Spreadsheets/CellEntry.php');
-
-/**
- * Zend_Gdata_Spreadsheets_ListEntry
- */
-require_once('Zend/Gdata/Spreadsheets/ListEntry.php');
-
-/**
- * Zend_Gdata_Spreadsheets_DocumentQuery
- */
-require_once('Zend/Gdata/Spreadsheets/DocumentQuery.php');
-
-/**
- * Zend_Gdata_Spreadsheets_ListQuery
- */
-require_once('Zend/Gdata/Spreadsheets/ListQuery.php');
-
-/**
- * Zend_Gdata_Spreadsheets_CellQuery
- */
-require_once('Zend/Gdata/Spreadsheets/CellQuery.php');
-
-/**
- * Gdata Spreadsheets
- *
- * @link http://code.google.com/apis/gdata/spreadsheets.html
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets extends Zend_Gdata
-{
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds/spreadsheets';
-    const SPREADSHEETS_POST_URI = 'http://spreadsheets.google.com/feeds/spreadsheets/private/full';
-    const WORKSHEETS_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#worksheetsfeed';
-    const LIST_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#listfeed';
-    const CELL_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#cellsfeed';
-    const AUTH_SERVICE_NAME = 'wise';
-
-    /**
-     * Namespaces used for Zend_Gdata_Photos
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('gs', 'http://schemas.google.com/spreadsheets/2006', 1, 0),
-        array(
-            'gsx', 'http://schemas.google.com/spreadsheets/2006/extended', 1, 0)
-    );
-
-    /**
-     * Create Gdata_Spreadsheets object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of Company-AppName-Version
-     */
-    public function __construct($client = null, $applicationId = 'MyCompany-MyApp-1.0')
-    {
-        $this->registerPackage('Zend_Gdata_Spreadsheets');
-        $this->registerPackage('Zend_Gdata_Spreadsheets_Extension');
-        parent::__construct($client, $applicationId);
-        $this->_httpClient->setParameterPost('service', self::AUTH_SERVICE_NAME);
-        $this->_server = 'spreadsheets.google.com';
-    }
-
-    /**
-     * Gets a spreadsheet feed.
-     *
-     * @param mixed $location A DocumentQuery or a string URI specifying the feed location.
-     * @return Zend_Gdata_Spreadsheets_SpreadsheetFeed
-     */
-    public function getSpreadsheetFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::SPREADSHEETS_FEED_URI;
-        } else if ($location instanceof Zend_Gdata_Spreadsheets_DocumentQuery) {
-            if ($location->getDocumentType() == null) {
-                $location->setDocumentType('spreadsheets');
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Spreadsheets_SpreadsheetFeed');
-    }
-
-    /**
-     * Gets a spreadsheet entry.
-     *
-     * @param string $location A DocumentQuery or a URI specifying the entry location.
-     * @return SpreadsheetEntry
-     */
-    public function getSpreadsheetEntry($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_DocumentQuery) {
-            if ($location->getDocumentType() == null) {
-                $location->setDocumentType('spreadsheets');
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getEntry($uri, 'Zend_Gdata_Spreadsheets_SpreadsheetEntry');
-    }
-
-    /**
-     * Gets a worksheet feed.
-     *
-     * @param mixed $location A DocumentQuery, SpreadsheetEntry, or a string URI
-     * @return Zend_Gdata_Spreadsheets_WorksheetFeed The feed of worksheets
-     */
-    public function getWorksheetFeed($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_DocumentQuery) {
-            if ($location->getDocumentType() == null) {
-                $location->setDocumentType('worksheets');
-            }
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Spreadsheets_SpreadsheetEntry) {
-            $uri = $location->getLink(self::WORKSHEETS_FEED_LINK_URI)->href;
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Spreadsheets_WorksheetFeed');
-    }
-
-    /**
-     * Gets a worksheet entry.
-     *
-     * @param string $location A DocumentQuery or a URI specifying the entry location.
-     * @return WorksheetEntry
-     */
-    public function GetWorksheetEntry($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_DocumentQuery) {
-            if ($location->getDocumentType() == null) {
-                $location->setDocumentType('worksheets');
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getEntry($uri, 'Zend_Gdata_Spreadsheets_WorksheetEntry');
-    }
-
-    /**
-     * Gets a cell feed.
-     *
-     * @param string $location A CellQuery, WorksheetEntry or a URI specifying the feed location.
-     * @return CellFeed
-     */
-    public function getCellFeed($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_CellQuery) {
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Spreadsheets_WorksheetEntry) {
-            $uri = $location->getLink(self::CELL_FEED_LINK_URI)->href;
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_Spreadsheets_CellFeed');
-    }
-
-    /**
-     * Gets a cell entry.
-     *
-     * @param string $location A CellQuery or a URI specifying the entry location.
-     * @return CellEntry
-     */
-    public function getCellEntry($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_CellQuery) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getEntry($uri, 'Zend_Gdata_Spreadsheets_CellEntry');
-    }
-
-    /**
-     * Gets a list feed.
-     *
-     * @param mixed $location A ListQuery, WorksheetEntry or string URI specifying the feed location.
-     * @return ListFeed
-     */
-    public function getListFeed($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_ListQuery) {
-            $uri = $location->getQueryUrl();
-        } else if ($location instanceof Zend_Gdata_Spreadsheets_WorksheetEntry) {
-            $uri = $location->getLink(self::LIST_FEED_LINK_URI)->href;
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_Spreadsheets_ListFeed');
-    }
-
-    /**
-     * Gets a list entry.
-     *
-     * @param string $location A ListQuery or a URI specifying the entry location.
-     * @return ListEntry
-     */
-    public function getListEntry($location)
-    {
-        if ($location instanceof Zend_Gdata_Spreadsheets_ListQuery) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-
-        return parent::getEntry($uri, 'Zend_Gdata_Spreadsheets_ListEntry');
-    }
-
-    /**
-     * Updates an existing cell.
-     *
-     * @param int $row The row containing the cell to update
-     * @param int $col The column containing the cell to update
-     * @param int $inputValue The new value for the cell
-     * @param string $key The key for the spreadsheet to be updated
-     * @param string $wkshtId (optional) The worksheet to be updated
-     * @return CellEntry The updated cell entry.
-     */
-    public function updateCell($row, $col, $inputValue, $key, $wkshtId = 'default')
-    {
-        $cell = 'R'.$row.'C'.$col;
-
-        $query = new Zend_Gdata_Spreadsheets_CellQuery();
-        $query->setSpreadsheetKey($key);
-        $query->setWorksheetId($wkshtId);
-        $query->setCellId($cell);
-
-        $entry = $this->getCellEntry($query);
-        $entry->setCell(new Zend_Gdata_Spreadsheets_Extension_Cell(null, $row, $col, $inputValue));
-        $response = $entry->save();
-        return $response;
-    }
-
-    /**
-     * Inserts a new row with provided data.
-     *
-     * @param array $rowData An array of column header to row data
-     * @param string $key The key of the spreadsheet to modify
-     * @param string $wkshtId (optional) The worksheet to modify
-     * @return ListEntry The inserted row
-     */
-    public function insertRow($rowData, $key, $wkshtId = 'default')
-    {
-        $newEntry = new Zend_Gdata_Spreadsheets_ListEntry();
-        $newCustomArr = array();
-        foreach ($rowData as $k => $v) {
-            $newCustom = new Zend_Gdata_Spreadsheets_Extension_Custom();
-            $newCustom->setText($v)->setColumnName($k);
-            $newEntry->addCustom($newCustom);
-        }
-
-        $query = new Zend_Gdata_Spreadsheets_ListQuery();
-        $query->setSpreadsheetKey($key);
-        $query->setWorksheetId($wkshtId);
-
-        $feed = $this->getListFeed($query);
-        $editLink = $feed->getLink('http://schemas.google.com/g/2005#post');
-
-        return $this->insertEntry($newEntry->saveXML(), $editLink->href, 'Zend_Gdata_Spreadsheets_ListEntry');
-    }
-
-    /**
-     * Updates an existing row with provided data.
-     *
-     * @param ListEntry $entry The row entry to update
-     * @param array $newRowData An array of column header to row data
-     */
-    public function updateRow($entry, $newRowData)
-    {
-        $newCustomArr = array();
-        foreach ($newRowData as $k => $v) {
-            $newCustom = new Zend_Gdata_Spreadsheets_Extension_Custom();
-            $newCustom->setText($v)->setColumnName($k);
-            $newCustomArr[] = $newCustom;
-        }
-        $entry->setCustom($newCustomArr);
-
-        return $entry->save();
-    }
-
-    /**
-     * Deletes an existing row .
-     *
-     * @param ListEntry $entry The row to delete
-     */
-    public function deleteRow($entry)
-    {
-        $entry->delete();
-    }
-
-    /**
-     * Returns the content of all rows as an associative array
-     *
-     * @param mixed $location A ListQuery or string URI specifying the feed location.
-     * @return array An array of rows.  Each element of the array is an associative array of data
-     */
-    public function getSpreadsheetListFeedContents($location)
-    {
-        $listFeed = $this->getListFeed($location);
-        $listFeed = $this->retrieveAllEntriesForFeed($listFeed);
-        $spreadsheetContents = array();
-        foreach ($listFeed as $listEntry) {
-            $rowContents = array();
-            $customArray = $listEntry->getCustom();
-            foreach ($customArray as $custom) {
-                $rowContents[$custom->getColumnName()] = $custom->getText();
-            }
-            $spreadsheetContents[] = $rowContents;
-        }
-        return $spreadsheetContents;
-    }
-
-    /**
-     * Returns the content of all cells as an associative array, indexed
-     * off the cell location  (ie 'A1', 'D4', etc).  Each element of
-     * the array is an associative array with a 'value' and a 'function'.
-     * Only non-empty cells are returned by default.  'range' is the
-     * value of the 'range' query parameter specified at:
-     * http://code.google.com/apis/spreadsheets/reference.html#cells_Parameters
-     *
-     * @param mixed $location A CellQuery, WorksheetEntry or a URL (w/o query string) specifying the feed location.
-     * @param string $range The range of cells to retrieve
-     * @param boolean $empty Whether to retrieve empty cells
-     * @return array An associative array of cells
-     */
-    public function getSpreadsheetCellFeedContents($location, $range = null, $empty = false)
-    {
-        $cellQuery = null;
-        if ($location instanceof Zend_Gdata_Spreadsheets_CellQuery) {
-            $cellQuery = $location;
-        } else if ($location instanceof Zend_Gdata_Spreadsheets_WorksheetEntry) {
-            $url = $location->getLink(self::CELL_FEED_LINK_URI)->href;
-            $cellQuery = new Zend_Gdata_Spreadsheets_CellQuery($url);
-        } else {
-            $url = $location;
-            $cellQuery = new Zend_Gdata_Spreadsheets_CellQuery($url);
-        }
-
-        if ($range != null) {
-            $cellQuery->setRange($range);
-        }
-        $cellQuery->setReturnEmpty($empty);
-
-        $cellFeed = $this->getCellFeed($cellQuery);
-        $cellFeed = $this->retrieveAllEntriesForFeed($cellFeed);
-        $spreadsheetContents = array();
-        foreach ($cellFeed as $cellEntry) {
-            $cellContents = array();
-            $cell = $cellEntry->getCell();
-            $cellContents['formula'] = $cell->getInputValue();
-            $cellContents['value'] = $cell->getText();
-            $spreadsheetContents[$cellEntry->getTitle()->getText()] = $cellContents;
-        }
-        return $spreadsheetContents;
-    }
-
-    /**
-     * Alias for getSpreadsheetFeed
-     *
-     * @param mixed $location A DocumentQuery or a string URI specifying the feed location.
-     * @return Zend_Gdata_Spreadsheets_SpreadsheetFeed
-     */
-    public function getSpreadsheets($location = null)
-    {
-        return $this->getSpreadsheetFeed($location = null);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellEntry.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellEntry.php
deleted file mode 100644
index 2a6a248ac..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellEntry.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CellEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_Cell
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php';
-
-/**
- * Concrete class for working with Cell entries.
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_CellEntry';
-    protected $_cell;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_CellEntry object.
-     * @param string $uri (optional)
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_cell != null) {
-            $element->appendChild($this->_cell->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gs') . ':' . 'cell';
-            $cell = new Zend_Gdata_Spreadsheets_Extension_Cell();
-            $cell->transferFromDOM($child);
-            $this->_cell = $cell;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Gets the Cell element of this Cell Entry.
-     * @return Zend_Gdata_Spreadsheets_Extension_Cell
-     */
-    public function getCell()
-    {
-        return $this->_cell;
-    }
-
-    /**
-     * Sets the Cell element of this Cell Entry.
-     * @param $cell Zend_Gdata_Spreadsheets_Extension_Cell $cell
-     */
-    public function setCell($cell)
-    {
-        $this->_cell = $cell;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellFeed.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellFeed.php
deleted file mode 100644
index 1629b10cf..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellFeed.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CellFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_RowCount
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_ColCount
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php';
-
-/**
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_CellFeed extends Zend_Gdata_Feed
-{
-
-    /**
-    * The classname for individual feed elements.
-    *
-    * @var string
-    */
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_CellEntry';
-
-    /**
-    * The classname for the feed.
-    *
-    * @var string
-    */
-    protected $_feedClassName = 'Zend_Gdata_Spreadsheets_CellFeed';
-
-    /**
-    * The row count for the feed.
-    *
-    * @var Zend_Gdata_Spreadsheets_Extension_RowCount
-    */
-    protected $_rowCount = null;
-
-    /**
-    * The column count for the feed.
-    *
-    * @var Zend_Gdata_Spreadsheets_Extension_ColCount
-    */
-    protected $_colCount = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_CellFeed object.
-     * @param DOMElement $element (optional) The XML Element on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->rowCount != null) {
-            $element->appendChild($this->_rowCount->getDOM($element->ownerDocument));
-        }
-        if ($this->colCount != null) {
-            $element->appendChild($this->_colCount->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gs') . ':' . 'rowCount';
-                $rowCount = new Zend_Gdata_Spreadsheets_Extension_RowCount();
-                $rowCount->transferFromDOM($child);
-                $this->_rowCount = $rowCount;
-                break;
-            case $this->lookupNamespace('gs') . ':' . 'colCount';
-                $colCount = new Zend_Gdata_Spreadsheets_Extension_ColCount();
-                $colCount->transferFromDOM($child);
-                $this->_colCount = $colCount;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Gets the row count for this feed.
-     * @return string The row count for the feed.
-     */
-    public function getRowCount()
-    {
-        return $this->_rowCount;
-    }
-
-    /**
-     * Gets the column count for this feed.
-     * @return string The column count for the feed.
-     */
-    public function getColumnCount()
-    {
-        return $this->_colCount;
-    }
-
-    /**
-     * Sets the row count for this feed.
-     * @param string $rowCount The new row count for the feed.
-     */
-    public function setRowCount($rowCount)
-    {
-        $this->_rowCount = $rowCount;
-        return $this;
-    }
-
-    /**
-     * Sets the column count for this feed.
-     * @param string $colCount The new column count for the feed.
-     */
-    public function setColumnCount($colCount)
-    {
-        $this->_colCount = $colCount;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellQuery.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellQuery.php
deleted file mode 100644
index 9dc94f128..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/CellQuery.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CellQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_util
- */
-require_once('Zend/Gdata/App/Util.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Spreadsheets cells
- *
- * @link http://code.google.com/apis/gdata/spreadsheets/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query
-{
-
-    const SPREADSHEETS_CELL_FEED_URI = 'http://spreadsheets.google.com/feeds/cells';
-
-    protected $_defaultFeedUri = self::SPREADSHEETS_CELL_FEED_URI;
-    protected $_visibility = 'private';
-    protected $_projection = 'full';
-    protected $_spreadsheetKey = null;
-    protected $_worksheetId = 'default';
-    protected $_cellId = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_CellQuery object.
-     *
-     * @param string $url Base URL to use for queries
-     */
-    public function __construct($url = null)
-    {
-        parent::__construct($url);
-    }
-
-    /**
-     * Sets the spreadsheet key for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setSpreadsheetKey($value)
-    {
-        $this->_spreadsheetKey = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the spreadsheet key for this query.
-     *
-     * @return string spreadsheet key
-     */
-    public function getSpreadsheetKey()
-    {
-        return $this->_spreadsheetKey;
-    }
-
-    /**
-     * Sets the worksheet id for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setWorksheetId($value)
-    {
-        $this->_worksheetId = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the worksheet id for this query.
-     *
-     * @return string worksheet id
-     */
-    public function getWorksheetId()
-    {
-        return $this->_worksheetId;
-    }
-
-    /**
-     * Sets the cell id for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setCellId($value)
-    {
-        $this->_cellId = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the cell id for this query.
-     *
-     * @return string cell id
-     */
-    public function getCellId()
-    {
-        return $this->_cellId;
-    }
-
-    /**
-     * Sets the projection for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * Sets the visibility for this query.
-     *
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the projection for this query.
-     *
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * Gets the visibility for this query.
-     *
-     * @return string visibility
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * Sets the min-row attribute for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setMinRow($value)
-    {
-        if ($value != null) {
-            $this->_params['min-row'] = $value;
-        } else {
-            unset($this->_params['min-row']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the min-row attribute for this query.
-     *
-     * @return string min-row
-     */
-    public function getMinRow()
-    {
-        if (array_key_exists('min-row', $this->_params)) {
-            return $this->_params['min-row'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the max-row attribute for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setMaxRow($value)
-    {
-        if ($value != null) {
-            $this->_params['max-row'] = $value;
-        } else {
-            unset($this->_params['max-row']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the max-row attribute for this query.
-     *
-     * @return string max-row
-     */
-    public function getMaxRow()
-    {
-        if (array_key_exists('max-row', $this->_params)) {
-            return $this->_params['max-row'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the min-col attribute for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setMinCol($value)
-    {
-        if ($value != null) {
-            $this->_params['min-col'] = $value;
-        } else {
-            unset($this->_params['min-col']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the min-col attribute for this query.
-     *
-     * @return string min-col
-     */
-    public function getMinCol()
-    {
-        if (array_key_exists('min-col', $this->_params)) {
-            return $this->_params['min-col'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the max-col attribute for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setMaxCol($value)
-    {
-        if ($value != null) {
-            $this->_params['max-col'] = $value;
-        } else {
-            unset($this->_params['max-col']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the max-col attribute for this query.
-     *
-     * @return string max-col
-     */
-    public function getMaxCol()
-    {
-        if (array_key_exists('max-col', $this->_params)) {
-            return $this->_params['max-col'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the range attribute for this query.
-     *
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setRange($value)
-    {
-        if ($value != null) {
-            $this->_params['range'] = $value;
-        } else {
-            unset($this->_params['range']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the range attribute for this query.
-     *
-     * @return string range
-     */
-    public function getRange()
-    {
-        if (array_key_exists('range', $this->_params)) {
-            return $this->_params['range'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the return-empty attribute for this query.
-     *
-     * @param mixed $value String or bool value for whether to return empty cells
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setReturnEmpty($value)
-    {
-        if (is_bool($value)) {
-            $this->_params['return-empty'] = ($value?'true':'false');
-        } else if ($value != null) {
-            $this->_params['return-empty'] = $value;
-        } else {
-            unset($this->_params['return-empty']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the return-empty attribute for this query.
-     *
-     * @return string return-empty
-     */
-    public function getReturnEmpty()
-    {
-        if (array_key_exists('return-empty', $this->_params)) {
-            return $this->_params['return-empty'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the full query URL for this query.
-     *
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-        if ($this->_url == null) {
-            $uri = $this->_defaultFeedUri;
-
-            if ($this->_spreadsheetKey != null) {
-                $uri .= '/'.$this->_spreadsheetKey;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for cell queries.');
-            }
-
-            if ($this->_worksheetId != null) {
-                $uri .= '/'.$this->_worksheetId;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('A worksheet id must be provided for cell queries.');
-            }
-
-            if ($this->_visibility != null) {
-                $uri .= '/'.$this->_visibility;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('A visibility must be provided for cell queries.');
-            }
-
-            if ($this->_projection != null) {
-                $uri .= '/'.$this->_projection;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('A projection must be provided for cell queries.');
-            }
-
-            if ($this->_cellId != null) {
-                $uri .= '/'.$this->_cellId;
-            }
-        } else {
-            $uri = $this->_url;
-        }
-
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-    /**
-     * Gets the attribute query string for this query.
-     *
-     * @return string query string
-     */
-    public function getQueryString()
-    {
-        return parent::getQueryString();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/DocumentQuery.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
deleted file mode 100644
index c7664dc8d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/DocumentQuery.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocumentQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_util
- */
-require_once('Zend/Gdata/App/Util.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Spreadsheets documents
- *
- * @link http://code.google.com/apis/gdata/spreadsheets/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query
-{
-
-    const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds';
-
-    protected $_defaultFeedUri = self::SPREADSHEETS_FEED_URI;
-    protected $_documentType;
-    protected $_visibility = 'private';
-    protected $_projection = 'full';
-    protected $_spreadsheetKey = null;
-    protected $_worksheetId = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_DocumentQuery object.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Sets the spreadsheet key for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setSpreadsheetKey($value)
-    {
-        $this->_spreadsheetKey = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the spreadsheet key for this query.
-     * @return string spreadsheet key
-     */
-    public function getSpreadsheetKey()
-    {
-        return $this->_spreadsheetKey;
-    }
-
-    /**
-     * Sets the worksheet id for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setWorksheetId($value)
-    {
-        $this->_worksheetId = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the worksheet id for this query.
-     * @return string worksheet id
-     */
-    public function getWorksheetId()
-    {
-        return $this->_worksheetId;
-    }
-
-    /**
-     * Sets the document type for this query.
-     * @param string $value spreadsheets or worksheets
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setDocumentType($value)
-    {
-        $this->_documentType = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the document type for this query.
-     * @return string document type
-     */
-    public function getDocumentType()
-    {
-        return $this->_documentType;
-    }
-
-    /**
-     * Sets the projection for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * Sets the visibility for this query.
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the projection for this query.
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * Gets the visibility for this query.
-     * @return string visibility
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * Sets the title attribute for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setTitle($value)
-    {
-        if ($value != null) {
-            $this->_params['title'] = $value;
-        } else {
-            unset($this->_params['title']);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the title-exact attribute for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setTitleExact($value)
-    {
-        if ($value != null) {
-            $this->_params['title-exact'] = $value;
-        } else {
-            unset($this->_params['title-exact']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the title attribute for this query.
-     * @return string title
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->_params)) {
-            return $this->_params['title'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the title-exact attribute for this query.
-     * @return string title-exact
-     */
-    public function getTitleExact()
-    {
-        if (array_key_exists('title-exact', $this->_params)) {
-            return $this->_params['title-exact'];
-        } else {
-            return null;
-        }
-    }
-
-    private function appendVisibilityProjection()
-    {
-        $uri = '';
-
-        if ($this->_visibility != null) {
-            $uri .= '/'.$this->_visibility;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A visibility must be provided for document queries.');
-        }
-
-        if ($this->_projection != null) {
-            $uri .= '/'.$this->_projection;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A projection must be provided for document queries.');
-        }
-
-        return $uri;
-    }
-
-
-    /**
-     * Gets the full query URL for this query.
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-        $uri = $this->_defaultFeedUri;
-
-        if ($this->_documentType != null) {
-            $uri .= '/'.$this->_documentType;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A document type must be provided for document queries.');
-        }
-
-        if ($this->_documentType == 'spreadsheets') {
-            $uri .= $this->appendVisibilityProjection();
-            if ($this->_spreadsheetKey != null) {
-                $uri .= '/'.$this->_spreadsheetKey;
-            }
-        } else if ($this->_documentType == 'worksheets') {
-            if ($this->_spreadsheetKey != null) {
-                $uri .= '/'.$this->_spreadsheetKey;
-            } else {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for worksheet document queries.');
-            }
-            $uri .= $this->appendVisibilityProjection();
-            if ($this->_worksheetId != null) {
-                $uri .= '/'.$this->_worksheetId;
-            }
-        }
-
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-    /**
-     * Gets the attribute query string for this query.
-     * @return string query string
-     */
-    public function getQueryString()
-    {
-        return parent::getQueryString();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Cell.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Cell.php
deleted file mode 100644
index d9361ebdf..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Cell.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cell.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-
-/**
- * Concrete class for working with cell elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_Extension_Cell extends Zend_Gdata_Extension
-{
-    protected $_rootElement = 'cell';
-    protected $_rootNamespace = 'gs';
-
-    /**
-     * The row attribute of this cell
-     *
-     * @var string
-     */
-    protected $_row = null;
-
-    /**
-     * The column attribute of this cell
-     *
-     * @var string
-     */
-    protected $_col = null;
-
-    /**
-     * The inputValue attribute of this cell
-     *
-     * @var string
-     */
-    protected $_inputValue = null;
-
-    /**
-     * The numericValue attribute of this cell
-     *
-     * @var string
-     */
-    protected $_numericValue = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_Extension_Cell element.
-     *
-     * @param string $text (optional) Text contents of the element.
-     * @param string $row (optional) Row attribute of the element.
-     * @param string $col (optional) Column attribute of the element.
-     * @param string $inputValue (optional) Input value attribute of the element.
-     * @param string $numericValue (optional) Numeric value attribute of the element.
-     */
-    public function __construct($text = null, $row = null, $col = null, $inputValue = null, $numericValue = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_row = $row;
-        $this->_col = $col;
-        $this->_inputValue = $inputValue;
-        $this->_numericValue = $numericValue;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        $element->setAttribute('row', $this->_row);
-        $element->setAttribute('col', $this->_col);
-        if ($this->_inputValue) $element->setAttribute('inputValue', $this->_inputValue);
-        if ($this->_numericValue) $element->setAttribute('numericValue', $this->_numericValue);
-        return $element;
-    }
-
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'row':
-            $this->_row = $attribute->nodeValue;
-            break;
-        case 'col':
-            $this->_col = $attribute->nodeValue;
-            break;
-        case 'inputValue':
-            $this->_inputValue = $attribute->nodeValue;
-            break;
-        case 'numericValue':
-            $this->_numericValue = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Gets the row attribute of the Cell element.
-     * @return string Row of the Cell.
-     */
-    public function getRow()
-    {
-        return $this->_row;
-    }
-
-    /**
-     * Gets the column attribute of the Cell element.
-     * @return string Column of the Cell.
-     */
-    public function getColumn()
-    {
-        return $this->_col;
-    }
-
-    /**
-     * Gets the input value attribute of the Cell element.
-     * @return string Input value of the Cell.
-     */
-    public function getInputValue()
-    {
-        return $this->_inputValue;
-    }
-
-    /**
-     * Gets the numeric value attribute of the Cell element.
-     * @return string Numeric value of the Cell.
-     */
-    public function getNumericValue()
-    {
-        return $this->_numericValue;
-    }
-
-    /**
-     * Sets the row attribute of the Cell element.
-     * @param string $row New row of the Cell.
-     */
-    public function setRow($row)
-    {
-        $this->_row = $row;
-        return $this;
-    }
-
-    /**
-     * Sets the column attribute of the Cell element.
-     * @param string $col New column of the Cell.
-     */
-    public function setColumn($col)
-    {
-        $this->_col = $col;
-        return $this;
-    }
-
-    /**
-     * Sets the input value attribute of the Cell element.
-     * @param string $inputValue New input value of the Cell.
-     */
-    public function setInputValue($inputValue)
-    {
-        $this->_inputValue = $inputValue;
-        return $this;
-    }
-
-    /**
-     * Sets the numeric value attribute of the Cell element.
-     * @param string $numericValue New numeric value of the Cell.
-     */
-    public function setNumericValue($numericValue)
-    {
-        $this->_numericValue = $numericValue;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php
deleted file mode 100644
index cf3e8de33..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ColCount.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-
-/**
- * Concrete class for working with colCount elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_Extension_ColCount extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'colCount';
-    protected $_rootNamespace = 'gs';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_Extension_ColCount element.
-     * @param string $text (optional) Text contents of the element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Custom.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Custom.php
deleted file mode 100644
index d9c072b48..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/Custom.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Custom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-
-/**
- * Concrete class for working with custom gsx elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_Extension_Custom extends Zend_Gdata_Extension
-{
-    // custom elements have custom names.
-    protected $_rootElement = null; // The name of the column
-    protected $_rootNamespace = 'gsx';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_Extension_Custom object.
-     * @param string $column (optional) The column/tag name of the element.
-     * @param string $value (optional) The text content of the element.
-     */
-    public function __construct($column = null, $value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-        $this->_rootElement = $column;
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        return $element;
-    }
-
-    /**
-     * Transfers each child and attribute into member variables.
-     * This is called when XML is received over the wire and the data
-     * model needs to be built to represent this XML.
-     *
-     * @param DOMNode $node The DOMNode that represents this object's data
-     */
-    public function transferFromDOM($node)
-    {
-        parent::transferFromDOM($node);
-        $this->_rootElement = $node->localName;
-    }
-
-    /**
-     * Sets the column/tag name of the element.
-     * @param string $column The new column name.
-     */
-    public function setColumnName($column)
-    {
-        $this->_rootElement = $column;
-        return $this;
-    }
-
-    /**
-     * Gets the column name of the element
-     * @return string The column name.
-     */
-    public function getColumnName()
-    {
-        return $this->_rootElement;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php
deleted file mode 100644
index 3acb8a118..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RowCount.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-
-/**
- * Concrete class for working with RowCount elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_Extension_RowCount extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'rowCount';
-    protected $_rootNamespace = 'gs';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_Extension_RowCount object.
-     * @param string $text (optional) The text content of the element.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListEntry.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListEntry.php
deleted file mode 100644
index e2d5059ef..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListEntry.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_Custom
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php';
-
-/**
- * Concrete class for working with List entries.
- *
- * @category     Zend
- * @package      Zend_Gdata
- * @subpackage   Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_ListEntry';
-
-    /**
-     * List of custom row elements (Zend_Gdata_Spreadsheets_Extension_Custom),
-     * indexed by order added to this entry.
-     * @var array
-     */
-    protected $_custom = array();
-
-    /**
-     * List of custom row elements (Zend_Gdata_Spreadsheets_Extension_Custom),
-     * indexed by element name.
-     * @var array
-     */
-    protected $_customByName = array();
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_ListEntry object.
-     * @param DOMElement $element An existing XML element on which to base this new object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if (!empty($this->_custom)) {
-            foreach ($this->_custom as $custom) {
-                $element->appendChild($custom->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    protected function takeChildFromDOM($child)
-    {
-        switch ($child->namespaceURI) {
-        case $this->lookupNamespace('gsx');
-            $custom = new Zend_Gdata_Spreadsheets_Extension_Custom($child->localName);
-            $custom->transferFromDOM($child);
-            $this->addCustom($custom);
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Gets the row elements contained by this list entry.
-     * @return array The custom row elements in this list entry
-     */
-    public function getCustom()
-    {
-        return $this->_custom;
-    }
-
-    /**
-     * Gets a single row element contained by this list entry using its name.
-     * @param string $name The name of a custom element to return. If null
-     *          or not defined, an array containing all custom elements
-     *          indexed by name will be returned.
-     * @return mixed If a name is specified, the
-     *          Zend_Gdata_Spreadsheets_Extension_Custom element requested,
-     *          is returned or null if not found. Otherwise, an array of all
-     *          Zend_Gdata_Spreadsheets_Extension_Custom elements is returned
-     *          indexed by name.
-     */
-    public function getCustomByName($name = null)
-    {
-        if ($name === null) {
-            return $this->_customByName;
-        } else {
-            if (array_key_exists($name, $this->customByName)) {
-                return $this->_customByName[$name];
-            } else {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Sets the row elements contained by this list entry. If any
-     * custom row elements were previously stored, they will be overwritten.
-     * @param array $custom The custom row elements to be contained in this
-     *          list entry.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
-     */
-    public function setCustom($custom)
-    {
-        $this->_custom = array();
-        foreach ($custom as $c) {
-            $this->addCustom($c);
-        }
-        return $this;
-    }
-
-    /**
-     * Add an individual custom row element to this list entry.
-     * @param Zend_Gdata_Spreadsheets_Extension_Custom $custom The custom
-     *             element to be added.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
-     */
-    public function addCustom($custom)
-    {
-        $this->_custom[] = $custom;
-        $this->_customByName[$custom->getColumnName()] = $custom;
-        return $this;
-    }
-
-    /**
-     * Remove an individual row element from this list entry by index. This
-     * will cause the array to be re-indexed.
-     * @param int $index The index of the custom element to be deleted.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function removeCustom($index)
-    {
-        if (array_key_exists($index, $this->_custom)) {
-            $element = $this->_custom[$index];
-            // Remove element
-            unset($this->_custom[$index]);
-            // Re-index the array
-            $this->_custom = array_values($this->_custom);
-            // Be sure to delete form both arrays!
-            $key = array_search($element, $this->_customByName);
-            unset($this->_customByName[$key]);
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Element does not exist.');
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an individual row element from this list entry by name.
-     * @param string $name The name of the custom element to be deleted.
-     * @return Zend_Gdata_Spreadsheets_ListEntry Provides a fluent interface.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     */
-    public function removeCustomByName($name)
-    {
-        if (array_key_exists($name, $this->_customByName)) {
-            $element = $this->_customByName[$name];
-            // Remove element
-            unset($this->_customByName[$name]);
-            // Be sure to delete from both arrays!
-            $key = array_search($element, $this->_custom);
-            unset($this->_custom[$key]);
-        } else {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Element does not exist.');
-        }
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListFeed.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListFeed.php
deleted file mode 100644
index ea7d9f14a..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListFeed.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_ListFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_ListEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Spreadsheets_ListFeed';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_ListFeed object.
-     * @param DOMElement $element An existing XML element on which to base this new object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListQuery.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListQuery.php
deleted file mode 100644
index 8f9650090..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/ListQuery.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Gdata_App_util
- */
-require_once('Zend/Gdata/App/Util.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for Google Spreadsheets lists
- *
- * @link http://code.google.com/apis/gdata/calendar/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query
-{
-
-    const SPREADSHEETS_LIST_FEED_URI = 'http://spreadsheets.google.com/feeds/list';
-
-    protected $_defaultFeedUri = self::SPREADSHEETS_LIST_FEED_URI;
-    protected $_visibility = 'private';
-    protected $_projection = 'full';
-    protected $_spreadsheetKey = null;
-    protected $_worksheetId = 'default';
-    protected $_rowId = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_ListQuery object.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Sets the spreadsheet key for the query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setSpreadsheetKey($value)
-    {
-        $this->_spreadsheetKey = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the spreadsheet key for the query.
-     * @return string spreadsheet key
-     */
-    public function getSpreadsheetKey()
-    {
-        return $this->_spreadsheetKey;
-    }
-
-    /**
-     * Sets the worksheet id for the query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setWorksheetId($value)
-    {
-        $this->_worksheetId = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the worksheet id for the query.
-     * @return string worksheet id
-     */
-    public function getWorksheetId()
-    {
-        return $this->_worksheetId;
-    }
-
-    /**
-     * Sets the row id for the query.
-     * @param string $value row id
-     * @return Zend_Gdata_Spreadsheets_CellQuery Provides a fluent interface
-     */
-    public function setRowId($value)
-    {
-        $this->_rowId = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the row id for the query.
-     * @return string row id
-     */
-    public function getRowId()
-    {
-        return $this->_rowId;
-    }
-
-    /**
-     * Sets the projection for the query.
-     * @param string $value Projection
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
-     */
-    public function setProjection($value)
-    {
-        $this->_projection = $value;
-        return $this;
-    }
-
-    /**
-     * Sets the visibility for this query.
-     * @param string $value visibility
-     * @return Zend_Gdata_Spreadsheets_ListQuery Provides a fluent interface
-     */
-    public function setVisibility($value)
-    {
-        $this->_visibility = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the projection for this query.
-     * @return string projection
-     */
-    public function getProjection()
-    {
-        return $this->_projection;
-    }
-
-    /**
-     * Gets the visibility for this query.
-     * @return string visibility
-     */
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
-
-    /**
-     * Sets the spreadsheet key for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setSpreadsheetQuery($value)
-    {
-        if ($value != null) {
-            $this->_params['sq'] = $value;
-        } else {
-            unset($this->_params['sq']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the spreadsheet key for this query.
-     * @return string spreadsheet query
-     */
-    public function getSpreadsheetQuery()
-    {
-        if (array_key_exists('sq', $this->_params)) {
-            return $this->_params['sq'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the orderby attribute for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setOrderBy($value)
-    {
-        if ($value != null) {
-            $this->_params['orderby'] = $value;
-        } else {
-            unset($this->_params['orderby']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the orderby attribute for this query.
-     * @return string orderby
-     */
-    public function getOrderBy()
-    {
-        if (array_key_exists('orderby', $this->_params)) {
-            return $this->_params['orderby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the reverse attribute for this query.
-     * @param string $value
-     * @return Zend_Gdata_Spreadsheets_DocumentQuery Provides a fluent interface
-     */
-    public function setReverse($value)
-    {
-        if ($value != null) {
-            $this->_params['reverse'] = $value;
-        } else {
-            unset($this->_params['reverse']);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the reverse attribute for this query.
-     * @return string reverse
-     */
-    public function getReverse()
-    {
-
-
-        if (array_key_exists('reverse', $this->_params)) {
-            return $this->_params['reverse'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the full query URL for this query.
-     * @return string url
-     */
-    public function getQueryUrl()
-    {
-
-        $uri = $this->_defaultFeedUri;
-
-        if ($this->_spreadsheetKey != null) {
-            $uri .= '/'.$this->_spreadsheetKey;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for list queries.');
-        }
-
-        if ($this->_worksheetId != null) {
-            $uri .= '/'.$this->_worksheetId;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A worksheet id must be provided for list queries.');
-        }
-
-        if ($this->_visibility != null) {
-            $uri .= '/'.$this->_visibility;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A visibility must be provided for list queries.');
-        }
-
-        if ($this->_projection != null) {
-            $uri .= '/'.$this->_projection;
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('A projection must be provided for list queries.');
-        }
-
-        if ($this->_rowId != null) {
-            $uri .= '/'.$this->_rowId;
-        }
-
-        $uri .= $this->getQueryString();
-        return $uri;
-    }
-
-    /**
-     * Gets the attribute query string for this query.
-     * @return string query string
-     */
-    public function getQueryString()
-    {
-        return parent::getQueryString();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
deleted file mode 100644
index ce145ab1c..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SpreadsheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * Concrete class for working with Atom entries.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_SpreadsheetEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_SpreadsheetEntry';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_SpreadsheetEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Returns the worksheets in this spreadsheet
-     *
-     * @return Zend_Gdata_Spreadsheets_WorksheetFeed The worksheets
-     */
-    public function getWorksheets()
-    {
-        $service = new Zend_Gdata_Spreadsheets($this->getHttpClient());
-        return $service->getWorksheetFeed($this);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
deleted file mode 100644
index aa4bb3a7d..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SpreadsheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_SpreadsheetFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_SpreadsheetEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Spreadsheets_SpreadsheetFeed';
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_SpreadsheetFeed object.
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php
deleted file mode 100644
index fe2d44be4..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WorksheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_RowCount
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php';
-
-/**
- * @see Zend_Gdata_Spreadsheets_Extension_ColCount
- */
-require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php';
-
-/**
- * Concrete class for working with Worksheet entries.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_WorksheetEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_WorksheetEntry';
-
-    protected $_rowCount = null;
-    protected $_colCount = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_WorksheetEntry object.
-     *
-     * @param DOMElement $element (optional) The DOMElement on which to base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_rowCount != null) {
-            $element->appendChild($this->_rowCount->getDOM($element->ownerDocument));
-        }
-        if ($this->_colCount != null) {
-            $element->appendChild($this->_colCount->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gs') . ':' . 'rowCount';
-                $rowCount = new Zend_Gdata_Spreadsheets_Extension_RowCount();
-                $rowCount->transferFromDOM($child);
-                $this->_rowCount = $rowCount;
-                break;
-            case $this->lookupNamespace('gs') . ':' . 'colCount';
-                $colCount = new Zend_Gdata_Spreadsheets_Extension_ColCount();
-                $colCount->transferFromDOM($child);
-                $this->_colCount = $colCount;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-
-    /**
-     * Gets the row count for this entry.
-     *
-     * @return string The row count for the entry.
-     */
-    public function getRowCount()
-    {
-        return $this->_rowCount;
-    }
-
-    /**
-     * Gets the column count for this entry.
-     *
-     * @return string The column count for the entry.
-     */
-    public function getColumnCount()
-    {
-        return $this->_colCount;
-    }
-
-    /**
-     * Sets the row count for this entry.
-     *
-     * @param string $rowCount The new row count for the entry.
-     */
-    public function setRowCount($rowCount)
-    {
-        $this->_rowCount = $rowCount;
-        return $this;
-    }
-
-    /**
-     * Sets the column count for this entry.
-     *
-     * @param string $colCount The new column count for the entry.
-     */
-    public function setColumnCount($colCount)
-    {
-        $this->_colCount = $colCount;
-        return $this;
-    }
-
-    /**
-     * Returns the content of all rows as an associative array
-     *
-     * @return array An array of rows.  Each element of the array is an associative array of data
-     */
-    public function getContentsAsRows()
-    {
-        $service = new Zend_Gdata_Spreadsheets($this->getHttpClient());
-        return $service->getSpreadsheetListFeedContents($this);
-    }
-
-    /**
-     * Returns the content of all cells as an associative array, indexed
-     * off the cell location  (ie 'A1', 'D4', etc).  Each element of
-     * the array is an associative array with a 'value' and a 'function'.
-     * Only non-empty cells are returned by default.  'range' is the
-     * value of the 'range' query parameter specified at:
-     * http://code.google.com/apis/spreadsheets/reference.html#cells_Parameters
-     *
-     * @param string $range The range of cells to retrieve
-     * @param boolean $empty Whether to retrieve empty cells
-     * @return array An associative array of cells
-     */
-    public function getContentsAsCells($range = null, $empty = false)
-    {
-        $service = new Zend_Gdata_Spreadsheets($this->getHttpClient());
-        return $service->getSpreadsheetCellFeedContents($this, $range, $empty);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php
deleted file mode 100644
index 5b3b159aa..000000000
--- a/airtime_mvc/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WorksheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Spreadsheets
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_Spreadsheets_WorksheetFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * Constructs a new Zend_Gdata_Spreadsheets_WorksheetFeed object.
-     * @param DOMElement $element (optional) The DOMElement on whick to base this element.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Spreadsheets::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_Spreadsheets_WorksheetEntry';
-
-    /**
-     * The classname for the feed.
-     *
-     * @var string
-     */
-    protected $_feedClassName = 'Zend_Gdata_Spreadsheets_WorksheetFeed';
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube.php b/airtime_mvc/library/Zend/Gdata/YouTube.php
deleted file mode 100644
index 2479bb114..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube.php
+++ /dev/null
@@ -1,874 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: YouTube.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media
- */
-require_once 'Zend/Gdata/Media.php';
-
-/**
- * @see Zend_Gdata_YouTube_VideoEntry
- */
-require_once 'Zend/Gdata/YouTube/VideoEntry.php';
-
-/**
- * @see Zend_Gdata_YouTube_VideoFeed
- */
-require_once 'Zend/Gdata/YouTube/VideoFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_CommentFeed
- */
-require_once 'Zend/Gdata/YouTube/CommentFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_PlaylistListFeed
- */
-require_once 'Zend/Gdata/YouTube/PlaylistListFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_SubscriptionFeed
- */
-require_once 'Zend/Gdata/YouTube/SubscriptionFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_ContactFeed
- */
-require_once 'Zend/Gdata/YouTube/ContactFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_PlaylistVideoFeed
- */
-require_once 'Zend/Gdata/YouTube/PlaylistVideoFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_ActivityFeed
- */
-require_once 'Zend/Gdata/YouTube/ActivityFeed.php';
-
-/**
- * @see Zend_Gdata_YouTube_InboxFeed
- */
-require_once 'Zend/Gdata/YouTube/InboxFeed.php';
-
-
-/**
- * Service class for interacting with the YouTube Data API.
- * @link http://code.google.com/apis/youtube/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube extends Zend_Gdata_Media
-{
-
-    const AUTH_SERVICE_NAME = 'youtube';
-    const CLIENTLOGIN_URL = 'https://www.google.com/youtube/accounts/ClientLogin';
-
-    const STANDARD_TOP_RATED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
-    const STANDARD_MOST_VIEWED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
-    const STANDARD_RECENTLY_FEATURED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
-    const STANDARD_WATCH_ON_MOBILE_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
-
-    const STANDARD_TOP_RATED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated';
-    const STANDARD_MOST_VIEWED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed';
-    const STANDARD_RECENTLY_FEATURED_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured';
-    const STANDARD_WATCH_ON_MOBILE_URI_V2 =
-        'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile';
-
-    const USER_URI = 'http://gdata.youtube.com/feeds/api/users';
-    const VIDEO_URI = 'http://gdata.youtube.com/feeds/api/videos';
-    const PLAYLIST_REL = 'http://gdata.youtube.com/schemas/2007#playlist';
-    const USER_UPLOADS_REL = 'http://gdata.youtube.com/schemas/2007#user.uploads';
-    const USER_PLAYLISTS_REL = 'http://gdata.youtube.com/schemas/2007#user.playlists';
-    const USER_SUBSCRIPTIONS_REL = 'http://gdata.youtube.com/schemas/2007#user.subscriptions';
-    const USER_CONTACTS_REL = 'http://gdata.youtube.com/schemas/2007#user.contacts';
-    const USER_FAVORITES_REL = 'http://gdata.youtube.com/schemas/2007#user.favorites';
-    const VIDEO_RESPONSES_REL = 'http://gdata.youtube.com/schemas/2007#video.responses';
-    const VIDEO_RATINGS_REL = 'http://gdata.youtube.com/schemas/2007#video.ratings';
-    const VIDEO_COMPLAINTS_REL = 'http://gdata.youtube.com/schemas/2007#video.complaints';
-    const ACTIVITY_FEED_URI = 'http://gdata.youtube.com/feeds/api/events';
-    const FRIEND_ACTIVITY_FEED_URI =
-        'http://gdata.youtube.com/feeds/api/users/default/friendsactivity';
-
-    /**
-     * The URI of the in-reply-to schema for comments in reply to
-     * other comments.
-     *
-     * @var string
-     */
-     const IN_REPLY_TO_SCHEME =
-         'http://gdata.youtube.com/schemas/2007#in-reply-to';
-
-    /**
-     * The URI of the inbox feed for the currently authenticated user.
-     *
-     * @var string
-     */
-    const INBOX_FEED_URI =
-        'http://gdata.youtube.com/feeds/api/users/default/inbox';
-
-    /**
-     * The maximum number of users for which activity can be requested for,
-     * as enforced by the API.
-     *
-     * @var integer
-     */
-    const ACTIVITY_FEED_MAX_USERS = 20;
-
-    /**
-     * The suffix for a feed of favorites.
-     *
-     * @var string
-     */
-    const FAVORITES_URI_SUFFIX = 'favorites';
-
-    /**
-     * The suffix for the user's upload feed.
-     *
-     * @var string
-     */
-    const UPLOADS_URI_SUFFIX = 'uploads';
-
-    /**
-     * The suffix for a feed of video responses.
-     *
-     * @var string
-     */
-    const RESPONSES_URI_SUFFIX = 'responses';
-
-    /**
-     * The suffix for a feed of related videos.
-     *
-     * @var string
-     */
-    const RELATED_URI_SUFFIX = 'related';
-
-    /**
-     * The suffix for a feed of messages (inbox entries).
-     *
-     * @var string
-     */
-    const INBOX_URI_SUFFIX = 'inbox';
-
-    /**
-     * Namespaces used for Zend_Gdata_YouTube
-     *
-     * @var array
-     */
-    public static $namespaces = array(
-        array('yt', 'http://gdata.youtube.com/schemas/2007', 1, 0),
-        array('georss', 'http://www.georss.org/georss', 1, 0),
-        array('gml', 'http://www.opengis.net/gml', 1, 0),
-        array('media', 'http://search.yahoo.com/mrss/', 1, 0)
-    );
-
-    /**
-     * Create Zend_Gdata_YouTube object
-     *
-     * @param Zend_Http_Client $client (optional) The HTTP client to use when
-     *          when communicating with the Google servers.
-     * @param string $applicationId The identity of the app in the form of
-     *        Company-AppName-Version
-     * @param string $clientId The clientId issued by the YouTube dashboard
-     * @param string $developerKey The developerKey issued by the YouTube dashboard
-     */
-    public function __construct($client = null,
-        $applicationId = 'MyCompany-MyApp-1.0', $clientId = null,
-        $developerKey = null)
-    {
-        $this->registerPackage('Zend_Gdata_YouTube');
-        $this->registerPackage('Zend_Gdata_YouTube_Extension');
-        $this->registerPackage('Zend_Gdata_Media');
-        $this->registerPackage('Zend_Gdata_Media_Extension');
-
-        // NOTE This constructor no longer calls the parent constructor
-        $this->setHttpClient($client, $applicationId, $clientId, $developerKey);
-    }
-
-    /**
-     * Set the Zend_Http_Client object used for communication
-     *
-     * @param Zend_Http_Client $client The client to use for communication
-     * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Gdata_App Provides a fluent interface
-     */
-    public function setHttpClient($client,
-        $applicationId = 'MyCompany-MyApp-1.0', $clientId = null,
-        $developerKey = null)
-    {
-        if ($client === null) {
-            $client = new Zend_Http_Client();
-        }
-        if (!$client instanceof Zend_Http_Client) {
-            require_once 'Zend/Gdata/App/HttpException.php';
-            throw new Zend_Gdata_App_HttpException(
-                'Argument is not an instance of Zend_Http_Client.');
-        }
-
-        if ($clientId != null) {
-            $client->setHeaders('X-GData-Client', $clientId);
-        }
-
-        if ($developerKey != null) {
-            $client->setHeaders('X-GData-Key', 'key='. $developerKey);
-        }
-
-        return parent::setHttpClient($client, $applicationId);
-    }
-
-    /**
-     * Retrieves a feed of videos.
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getVideoFeed($location = null)
-    {
-        if ($location == null) {
-            $uri = self::VIDEO_URI;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a specific video entry.
-     *
-     * @param mixed $videoId The ID of the video to retrieve.
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined.
-     * @param boolean $fullEntry (optional) Retrieve the full metadata for the
-     *         entry. Only possible if entry belongs to currently authenticated
-     *         user. An exception will be thrown otherwise.
-     * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Gdata_YouTube_VideoEntry The video entry found at the
-     *         specified URL.
-     */
-    public function getVideoEntry($videoId = null, $location = null,
-        $fullEntry = false)
-    {
-        if ($videoId !== null) {
-            if ($fullEntry) {
-                return $this->getFullVideoEntry($videoId);
-            } else {
-                $uri = self::VIDEO_URI . "/" . $videoId;
-            }
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_YouTube_VideoEntry');
-    }
-
-    /**
-     * Retrieves a video entry from the user's upload feed.
-     *
-     * @param mixed $videoID The ID of the video to retrieve.
-     * @throws Zend_Gdata_App_HttpException
-     * @return Zend_Gdata_YouTube_VideoEntry|null The video entry to be
-     *          retrieved, or null if it was not found or the user requesting it
-     *          did not have the appropriate permissions.
-     */
-    public function getFullVideoEntry($videoId)
-    {
-        $uri = self::USER_URI . "/default/" .
-            self::UPLOADS_URI_SUFFIX . "/$videoId";
-        return parent::getEntry($uri, 'Zend_Gdata_YouTube_VideoEntry');
-    }
-
-    /**
-     * Retrieves a feed of videos related to the specified video ID.
-     *
-     * @param string $videoId The videoId of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getRelatedVideoFeed($videoId = null, $location = null)
-    {
-        if ($videoId !== null) {
-            $uri = self::VIDEO_URI . "/" . $videoId . "/" .
-                self::RELATED_URI_SUFFIX;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a feed of video responses related to the specified video ID.
-     *
-     * @param string $videoId The videoId of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getVideoResponseFeed($videoId = null, $location = null)
-    {
-        if ($videoId !== null) {
-            $uri = self::VIDEO_URI . "/" . $videoId . "/" .
-                self::RESPONSES_URI_SUFFIX;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a feed of comments related to the specified video ID.
-     *
-     * @param string $videoId The videoId of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_CommentFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getVideoCommentFeed($videoId = null, $location = null)
-    {
-        if ($videoId !== null) {
-            $uri = self::VIDEO_URI . "/" . $videoId . "/comments";
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_CommentFeed');
-    }
-
-    /**
-     * Retrieves a feed of comments related to the specified video ID.
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_CommentFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getTopRatedVideoFeed($location = null)
-    {
-        $standardFeedUri = self::STANDARD_TOP_RATED_URI;
-
-        if ($this->getMajorProtocolVersion() == 2) {
-            $standardFeedUri = self::STANDARD_TOP_RATED_URI_V2;
-        }
-
-        if ($location == null) {
-            $uri = $standardFeedUri;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            if ($location instanceof Zend_Gdata_YouTube_VideoQuery) {
-                if (!isset($location->url)) {
-                    $location->setFeedType('top rated');
-                }
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-
-    /**
-     * Retrieves a feed of the most viewed videos.
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getMostViewedVideoFeed($location = null)
-    {
-        $standardFeedUri = self::STANDARD_MOST_VIEWED_URI;
-
-        if ($this->getMajorProtocolVersion() == 2) {
-            $standardFeedUri = self::STANDARD_MOST_VIEWED_URI_V2;
-        }
-
-        if ($location == null) {
-            $uri = $standardFeedUri;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            if ($location instanceof Zend_Gdata_YouTube_VideoQuery) {
-                if (!isset($location->url)) {
-                    $location->setFeedType('most viewed');
-                }
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a feed of recently featured videos.
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getRecentlyFeaturedVideoFeed($location = null)
-    {
-        $standardFeedUri = self::STANDARD_RECENTLY_FEATURED_URI;
-
-        if ($this->getMajorProtocolVersion() == 2) {
-            $standardFeedUri = self::STANDARD_RECENTLY_FEATURED_URI_V2;
-        }
-
-        if ($location == null) {
-            $uri = $standardFeedUri;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            if ($location instanceof Zend_Gdata_YouTube_VideoQuery) {
-                if (!isset($location->url)) {
-                    $location->setFeedType('recently featured');
-                }
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a feed of videos recently featured for mobile devices.
-     * These videos will have RTSP links in the $entry->mediaGroup->content
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The feed of videos found at the
-     *         specified URL.
-     */
-    public function getWatchOnMobileVideoFeed($location = null)
-    {
-        $standardFeedUri = self::STANDARD_WATCH_ON_MOBILE_URI;
-
-        if ($this->getMajorProtocolVersion() == 2) {
-            $standardFeedUri = self::STANDARD_WATCH_ON_MOBILE_URI_V2;
-        }
-
-        if ($location == null) {
-            $uri = $standardFeedUri;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            if ($location instanceof Zend_Gdata_YouTube_VideoQuery) {
-                if (!isset($location->url)) {
-                    $location->setFeedType('watch on mobile');
-                }
-            }
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a feed which lists a user's playlist
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_PlaylistListFeed The feed of playlists
-     */
-    public function getPlaylistListFeed($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user . '/playlists';
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_PlaylistListFeed');
-    }
-
-    /**
-     * Retrieves a feed of videos in a particular playlist
-     *
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_PlaylistVideoFeed The feed of videos found at
-     *         the specified URL.
-     */
-    public function getPlaylistVideoFeed($location)
-    {
-        if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_PlaylistVideoFeed');
-    }
-
-    /**
-     * Retrieves a feed of a user's subscriptions
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_SubscriptionListFeed The feed of subscriptions
-     */
-    public function getSubscriptionFeed($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user . '/subscriptions';
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_SubscriptionFeed');
-    }
-
-    /**
-     * Retrieves a feed of a user's contacts
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_ContactFeed The feed of contacts
-     */
-    public function getContactFeed($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user . '/contacts';
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_ContactFeed');
-    }
-
-    /**
-     * Retrieves a user's uploads
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The videos uploaded by the user
-     */
-    public function getUserUploads($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user . '/' .
-                   self::UPLOADS_URI_SUFFIX;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a user's favorites
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_VideoFeed The videos favorited by the user
-     */
-    public function getUserFavorites($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user . '/' .
-                   self::FAVORITES_URI_SUFFIX;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_VideoFeed');
-    }
-
-    /**
-     * Retrieves a user's profile as an entry
-     *
-     * @param string $user (optional) The username of interest
-     * @param mixed $location (optional) The URL to query or a
-     *         Zend_Gdata_Query object from which a URL can be determined
-     * @return Zend_Gdata_YouTube_UserProfileEntry The user profile entry
-     */
-    public function getUserProfile($user = null, $location = null)
-    {
-        if ($user !== null) {
-            $uri = self::USER_URI . '/' . $user;
-        } else if ($location instanceof Zend_Gdata_Query) {
-            $uri = $location->getQueryUrl();
-        } else {
-            $uri = $location;
-        }
-        return parent::getEntry($uri, 'Zend_Gdata_YouTube_UserProfileEntry');
-    }
-
-    /**
-     * Helper function for parsing a YouTube token response
-     *
-     * @param string $response The service response
-     * @throws Zend_Gdata_App_Exception
-     * @return array An array containing the token and URL
-     */
-    public static function parseFormUploadTokenResponse($response)
-    {
-        // Load the feed as an XML DOMDocument object
-        @ini_set('track_errors', 1);
-        $doc = new DOMDocument();
-        $success = @$doc->loadXML($response);
-        @ini_restore('track_errors');
-
-        if (!$success) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                "Zend_Gdata_YouTube::parseFormUploadTokenResponse - " .
-                "DOMDocument cannot parse XML: $php_errormsg");
-        }
-        $responseElement = $doc->getElementsByTagName('response')->item(0);
-
-        $urlText = null;
-        $tokenText = null;
-        if ($responseElement != null) {
-            $urlElement =
-                $responseElement->getElementsByTagName('url')->item(0);
-            $tokenElement =
-                $responseElement->getElementsByTagName('token')->item(0);
-
-            if ($urlElement && $urlElement->hasChildNodes() &&
-                $tokenElement && $tokenElement->hasChildNodes()) {
-
-                $urlText = $urlElement->firstChild->nodeValue;
-                $tokenText = $tokenElement->firstChild->nodeValue;
-            }
-        }
-
-        if ($tokenText != null && $urlText != null) {
-            return array('token' => $tokenText, 'url' => $urlText);
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                'Form upload token not found in response');
-        }
-    }
-
-    /**
-     * Retrieves a YouTube token
-     *
-     * @param Zend_Gdata_YouTube_VideoEntry $videoEntry The video entry
-     * @param string $url The location as a string URL
-     * @throws Zend_Gdata_App_Exception
-     * @return array An array containing a token and URL
-     */
-    public function getFormUploadToken($videoEntry,
-        $url='http://gdata.youtube.com/action/GetUploadToken')
-    {
-        if ($url != null && is_string($url)) {
-            // $response is a Zend_Http_response object
-            $response = $this->post($videoEntry, $url);
-            return self::parseFormUploadTokenResponse($response->getBody());
-        } else {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception(
-                'Url must be provided as a string URL');
-        }
-    }
-
-    /**
-     * Retrieves the activity feed for users
-     *
-     * @param mixed $usernames A string identifying the usernames for which to
-     *              retrieve activity for. This can also be a Zend_Gdata_Query
-     *              object from which a URL can be determined.
-     * @throws Zend_Gdata_App_VersionException if using version less than 2.
-     * @return Zend_Gdata_YouTube_ActivityFeed
-     */
-    public function getActivityForUser($username)
-    {
-        if ($this->getMajorProtocolVersion() == 1) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('User activity feeds ' .
-                'are not available in API version 1.');
-        }
-
-        $uri = null;
-        if ($username instanceof Zend_Gdata_Query) {
-            $uri = $username->getQueryUrl();
-        } else {
-            if (count(explode(',', $username)) >
-                self::ACTIVITY_FEED_MAX_USERS) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Activity feed can only retrieve for activity for up to ' .
-                    self::ACTIVITY_FEED_MAX_USERS .  ' users per request');
-            }
-            $uri = self::ACTIVITY_FEED_URI . '?author=' . $username;
-        }
-
-        return parent::getFeed($uri, 'Zend_Gdata_YouTube_ActivityFeed');
-    }
-
-    /**
-     * Retrieve the activity of the currently authenticated users friend.
-     *
-     * @throws Zend_Gdata_App_Exception if not logged in.
-     * @return Zend_Gdata_YouTube_ActivityFeed
-     */
-    public function getFriendActivityForCurrentUser()
-    {
-        if (!$this->isAuthenticated()) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('You must be authenticated to ' .
-                'use the getFriendActivityForCurrentUser function in Zend_' .
-                'Gdata_YouTube.');
-        }
-        return parent::getFeed(self::FRIEND_ACTIVITY_FEED_URI,
-            'Zend_Gdata_YouTube_ActivityFeed');
-    }
-
-    /**
-     * Retrieve a feed of messages in the currently authenticated user's inbox.
-     *
-     * @throws Zend_Gdata_App_Exception if not logged in.
-     * @return Zend_Gdata_YouTube_InboxFeed|null
-     */
-    public function getInboxFeedForCurrentUser()
-    {
-        if (!$this->isAuthenticated()) {
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('You must be authenticated to ' .
-                'use the getInboxFeedForCurrentUser function in Zend_' .
-                'Gdata_YouTube.');
-        }
-
-        return parent::getFeed(self::INBOX_FEED_URI,
-            'Zend_Gdata_YouTube_InboxFeed');
-    }
-
-    /**
-     * Send a video message.
-     *
-     * Note: Either a Zend_Gdata_YouTube_VideoEntry or a valid video ID must
-     * be provided.
-     *
-     * @param string $body The body of the message
-     * @param Zend_Gdata_YouTube_VideoEntry (optional) The video entry to send
-     * @param string $videoId The id of the video to send
-     * @param string $recipientUserName The username of the recipient
-     * @throws Zend_Gdata_App_InvalidArgumentException if no valid
-     *         Zend_Gdata_YouTube_VideoEntry or videoId were provided
-     * @return Zend_Gdata_YouTube_InboxEntry|null The
-     *         Zend_Gdata_YouTube_Inbox_Entry representing the sent message.
-     *
-     */
-    public function sendVideoMessage($body, $videoEntry = null,
-        $videoId = null, $recipientUserName)
-    {
-        if (!$videoId && !$videoEntry) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Expecting either a valid videoID or a videoEntry object in ' .
-                'Zend_Gdata_YouTube->sendVideoMessage().');
-        }
-
-        $messageEntry = new Zend_Gdata_YouTube_InboxEntry();
-
-        if ($this->getMajorProtocolVersion() == null ||
-            $this->getMajorProtocolVersion() == 1) {
-
-            if (!$videoId) {
-                $videoId = $videoEntry->getVideoId();
-            } elseif (strlen($videoId) < 12) {
-                //Append the full URI
-                $videoId = self::VIDEO_URI . '/' . $videoId;
-            }
-
-            $messageEntry->setId($this->newId($videoId));
-            // TODO there seems to be a bug where v1 inbox entries dont
-            // retain their description...
-            $messageEntry->setDescription(
-                new Zend_Gdata_YouTube_Extension_Description($body));
-
-        } else {
-            if (!$videoId) {
-                $videoId = $videoEntry->getVideoId();
-                $videoId = substr($videoId, strrpos($videoId, ':'));
-            }
-            $messageEntry->setId($this->newId($videoId));
-            $messageEntry->setSummary($this->newSummary($body));
-        }
-
-        $insertUrl = 'http://gdata.youtube.com/feeds/api/users/' .
-            $recipientUserName . '/inbox';
-        $response = $this->insertEntry($messageEntry, $insertUrl,
-            'Zend_Gdata_YouTube_InboxEntry');
-        return $response;
-    }
-
-    /**
-     * Post a comment in reply to an existing comment
-     *
-     * @param $commentEntry Zend_Gdata_YouTube_CommentEntry The comment entry
-     *        to reply to
-     * @param $commentText string The text of the comment to post
-     * @return A Zend_Gdata_YouTube_CommentEntry representing the posted
-     *         comment
-     */
-    public function replyToCommentEntry($commentEntry, $commentText)
-    {
-        $newComment = $this->newCommentEntry();
-        $newComment->content = $this->newContent()->setText($commentText);
-        $commentId = $commentEntry->getId();
-        $commentIdArray = explode(':', $commentId);
-
-        // create a new link element
-        $inReplyToLinkHref = self::VIDEO_URI . '/' . $commentIdArray[3] .
-            '/comments/' . $commentIdArray[5];
-        $inReplyToLink = $this->newLink($inReplyToLinkHref,
-            self::IN_REPLY_TO_SCHEME, $type="application/atom+xml");
-        $links = $newComment->getLink();
-        $links[] = $inReplyToLink;
-        $newComment->setLink($links);
-        $commentFeedPostUrl = self::VIDEO_URI . '/' . $commentIdArray[3] .
-            '/comments';
-        return $this->insertEntry($newComment,
-            $commentFeedPostUrl, 'Zend_Gdata_YouTube_CommentEntry');
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/ActivityEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/ActivityEntry.php
deleted file mode 100644
index c7e6ae8c0..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/ActivityEntry.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Health
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActivityEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_VideoId
- */
-require_once 'Zend/Gdata/YouTube/Extension/VideoId.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Username
- */
-require_once 'Zend/Gdata/YouTube/Extension/Username.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Rating
- */
-require_once 'Zend/Gdata/Extension/Rating.php';
-
-/**
- * A concrete class for working with YouTube user activity entries.
- *
- * @link http://code.google.com/apis/youtube/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_ActivityEntry extends Zend_Gdata_Entry
-{
-    const ACTIVITY_CATEGORY_SCHEME =
-        'http://gdata.youtube.com/schemas/2007/userevents.cat';
-
-    /**
-     * The classname for individual user activity entry elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_ActivityEntry';
-
-    /**
-     * The ID of the video that was part of the activity
-     *
-     * @var Zend_Gdata_YouTube_VideoId
-     */
-    protected $_videoId = null;
-
-    /**
-     * The username for the user that was part of the activity
-     *
-     * @var Zend_Gdata_YouTube_Username
-     */
-    protected $_username = null;
-
-    /**
-     * The rating element that was part of the activity
-     *
-     * @var Zend_Gdata_Extension_Rating
-     */
-    protected $_rating = null;
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_ActivityEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to
-     * base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *          child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_videoId !== null) {
-          $element->appendChild($this->_videoId->getDOM(
-              $element->ownerDocument));
-        }
-        if ($this->_username !== null) {
-          $element->appendChild($this->_username->getDOM(
-              $element->ownerDocument));
-        }
-        if ($this->_rating !== null) {
-          $element->appendChild($this->_rating->getDOM(
-              $element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('yt') . ':' . 'videoid':
-                $videoId = new Zend_Gdata_YouTube_Extension_VideoId();
-                $videoId->transferFromDOM($child);
-                $this->_videoId = $videoId;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'username':
-                $username = new Zend_Gdata_YouTube_Extension_Username();
-                $username->transferFromDOM($child);
-                $this->_username = $username;
-                break;
-            case $this->lookupNamespace('gd') . ':' . 'rating':
-                $rating = new Zend_Gdata_Extension_Rating();
-                $rating->transferFromDOM($child);
-                $this->_rating = $rating;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Returns the video ID for this activity entry.
-     *
-     * @return null|Zend_Gdata_YouTube_Extension_VideoId
-     */
-    public function getVideoId()
-    {
-        return $this->_videoId;
-    }
-
-    /**
-     * Returns the username for this activity entry.
-     *
-     * @return null|Zend_Gdata_YouTube_Extension_Username
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Returns the rating for this activity entry.
-     *
-     * @return null|Zend_Gdata_YouTube_Extension_Rating
-     */
-    public function getRating()
-    {
-        return $this->_rating;
-    }
-
-    /**
-     * Return the value of the rating for this video entry.
-     *
-     * Convenience method to save needless typing.
-     *
-     * @return integer|null The value of the rating that was created, if found.
-     */
-    public function getRatingValue()
-    {
-        $rating = $this->_rating;
-        if ($rating) {
-            return $rating->getValue();
-        }
-        return null;
-    }
-
-    /**
-     * Return the activity type that was performed.
-     *
-     * Convenience method that inspects category where scheme is
-     * http://gdata.youtube.com/schemas/2007/userevents.cat.
-     *
-     * @return string|null The activity category if found.
-     */
-    public function getActivityType()
-    {
-        $categories = $this->getCategory();
-        foreach($categories as $category) {
-            if ($category->getScheme() == self::ACTIVITY_CATEGORY_SCHEME) {
-                return $category->getTerm();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Convenience method to quickly get access to the author of the activity
-     *
-     * @return string The author of the activity
-     */
-    public function getAuthorName()
-    {
-        $authors = $this->getAuthor();
-        return $authors[0]->getName()->getText();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/ActivityFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/ActivityFeed.php
deleted file mode 100644
index 1e4ebab64..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/ActivityFeed.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActivityFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_ActivityEntry
- */
-require_once 'Zend/Gdata/YouTube/ActivityEntry.php';
-
-/**
- * A feed of user activity entries for YouTube
- *
- * @link http://code.google.com/apis/youtube/
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_ActivityFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_ActivityEntry';
-
-    /**
-     * Creates an Activity feed, representing a list of activity entries
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/CommentEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/CommentEntry.php
deleted file mode 100644
index 8fd3411aa..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/CommentEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * The YouTube comments flavor of an Atom Entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_CommentEntry extends Zend_Gdata_Entry
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_CommentEntry';
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_CommentEntry object.
-     * @param DOMElement $element (optional) The DOMElement on which to
-     * base this object.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/CommentFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/CommentFeed.php
deleted file mode 100644
index 0c53255af..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/CommentFeed.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommentFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_feed
- */
-require_once 'Zend/Gdata/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_CommentEntry
- */
-require_once 'Zend/Gdata/YouTube/CommentEntry.php';
-
-/**
- * The YouTube comments flavor of an Atom Feed
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_CommentFeed extends Zend_Gdata_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_CommentEntry';
-
-    /**
-     * Constructs a new YouTube Comment Feed object, to represent
-     * a feed of comments for an individual video
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/ContactEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/ContactEntry.php
deleted file mode 100644
index 4814ad177..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/ContactEntry.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContactEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_YouTube_UserProfileEntry
- */
-require_once 'Zend/Gdata/YouTube/UserProfileEntry.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Status
- */
-require_once 'Zend/Gdata/YouTube/Extension/Status.php';
-
-/**
- * The YouTube contacts flavor of an Atom Entry with media support
- * Represents a an individual contact
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_ContactEntry extends Zend_Gdata_YouTube_UserProfileEntry
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_ContactEntry';
-
-    /**
-     * Status of the user as a contact
-     *
-     * @var string
-     */
-    protected $_status = null;
-
-    /**
-     * Constructs a new Contact Entry object, to represent
-     * an individual contact for a user
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_status != null) {
-            $element->appendChild($this->_status->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'status':
-            $status = new Zend_Gdata_YouTube_Extension_Status();
-            $status->transferFromDOM($child);
-            $this->_status = $status;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Sets the status
-     *
-     * @param Zend_Gdata_YouTube_Extension_Status $status The status
-     * @return Zend_Gdata_YouTube_ContactEntry Provides a fluent interface
-     */
-    public function setStatus($status = null)
-    {
-        $this->_status = $status;
-        return $this;
-    }
-
-    /**
-     * Returns the status
-     *
-     * @return Zend_Gdata_YouTube_Extension_Status  The status
-     */
-    public function getStatus()
-    {
-        return $this->_status;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/ContactFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/ContactFeed.php
deleted file mode 100644
index 4f4df1b1c..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/ContactFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContactFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_ContactEntry
- */
-require_once 'Zend/Gdata/YouTube/ContactEntry.php';
-
-/**
- * The YouTube contacts flavor of an Atom Feed with media support
- * Represents a list of individual contacts, where each contained entry is
- * a contact.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_ContactFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_ContactEntry';
-
-    /**
-     * Constructs a new YouTube Contact Feed object, to represent
-     * a feed of contacts for a user
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/AboutMe.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/AboutMe.php
deleted file mode 100644
index d1fecd957..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/AboutMe.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AboutMe.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:aboutMe element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_AboutMe extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'aboutMe';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Age.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Age.php
deleted file mode 100644
index 49cf64376..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Age.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Age.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:age element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Age extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'age';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Books.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Books.php
deleted file mode 100644
index 24f636179..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Books.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:books element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Books extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'books';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Company.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Company.php
deleted file mode 100644
index 65d0f6433..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Company.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Company.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:company element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Company extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'company';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Control.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Control.php
deleted file mode 100644
index 111cc4363..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Control.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Control
- */
-require_once 'Zend/Gdata/App/Extension/Control.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_State
- */
-require_once 'Zend/Gdata/YouTube/Extension/State.php';
-
-
-/**
- * Specialized Control class for use with YouTube. Enables use of yt extension elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Control extends Zend_Gdata_App_Extension_Control
-{
-
-    protected $_state = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Control object.
-     * @see Zend_Gdata_App_Extension_Control#__construct
-     * @param Zend_Gdata_App_Extension_Draft $draft
-     * @param Zend_Gdata_YouTube_Extension_State $state
-     */
-    public function __construct($draft = null, $state = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($draft);
-        $this->_state = $state;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_state != null) {
-            $element->appendChild($this->_state->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'state':
-            $state = new Zend_Gdata_YouTube_Extension_State();
-            $state->transferFromDOM($child);
-            $this->_state = $state;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Get the value for this element's state attribute.
-     *
-     * @return Zend_Gdata_YouTube_Extension_State The state element.
-     */
-    public function getState()
-    {
-        return $this->_state;
-    }
-
-    /**
-     * Set the value for this element's state attribute.
-     *
-     * @param Zend_Gdata_YouTube_Extension_State $value The desired value for this attribute.
-     * @return Zend_YouTube_Extension_Control The element being modified.
-     */
-    public function setState($value)
-    {
-        $this->_state = $value;
-        return $this;
-    }
-
-    /**
-    * Get the value of this element's state attribute.
-    *
-    * @return string The state's text value
-    */
-    public function getStateValue()
-    {
-      return $this->getState()->getText();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/CountHint.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/CountHint.php
deleted file mode 100644
index af2447d53..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/CountHint.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CountHint.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:countHint element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_CountHint extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'countHint';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Description.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Description.php
deleted file mode 100644
index 0ba77bce4..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Description.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:description element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Description extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'description';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Duration.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Duration.php
deleted file mode 100644
index e873f6d94..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Duration.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Duration.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:duration element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Duration extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'duration';
-    protected $_seconds = null;
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Duration object.
-     * @param bool $seconds(optional) The seconds value of the element.
-     */
-    public function __construct($seconds = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_seconds = $seconds;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_seconds !== null) {
-            $element->setAttribute('seconds', $this->_seconds);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and valueare
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'seconds':
-            $this->_seconds = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's seconds attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getSeconds()
-    {
-        return $this->_seconds;
-    }
-
-    /**
-     * Set the value for this element's seconds attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Duration The element being modified.
-     */
-    public function setSeconds($value)
-    {
-        $this->_seconds = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string The duration in seconds
-     */
-    public function __toString()
-    {
-        return $this->_seconds;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/FirstName.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/FirstName.php
deleted file mode 100644
index b644decfb..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/FirstName.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FirstName.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:firstName element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_FirstName extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'firstName';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Gender.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Gender.php
deleted file mode 100644
index 13e21e876..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Gender.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Gender.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:gender element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Gender extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'gender';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hobbies.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hobbies.php
deleted file mode 100644
index a2390ebff..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hobbies.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hobbies.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:hobbies element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Hobbies extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'hobbies';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hometown.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hometown.php
deleted file mode 100644
index 8dc9ff16f..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Hometown.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hometown.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:hometown element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Hometown extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'hometown';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/LastName.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/LastName.php
deleted file mode 100644
index 30680fcc9..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/LastName.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LastName.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:lastName element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_LastName extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'lastName';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Link.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Link.php
deleted file mode 100644
index 24274e1ed..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Link.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension_Link
- */
-require_once 'Zend/Gdata/App/Extension/Link.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Token
- */
-require_once 'Zend/Gdata/YouTube/Extension/Token.php';
-
-
-/**
- * Specialized Link class for use with YouTube. Enables use of yt extension elements.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Link extends Zend_Gdata_App_Extension_Link
-{
-
-    protected $_token = null;
-
-    /**
-     * Constructs a new Zend_Gdata_Calendar_Extension_Link object.
-     * @see Zend_Gdata_App_Extension_Link#__construct
-     * @param Zend_Gdata_YouTube_Extension_Token $token
-     */
-    public function __construct($href = null, $rel = null, $type = null,
-            $hrefLang = null, $title = null, $length = null, $token = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($href, $rel, $type, $hrefLang, $title, $length);
-        $this->_token = $token;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_token != null) {
-            $element->appendChild($this->_token->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'token':
-            $token = new Zend_Gdata_YouTube_Extension_Token();
-            $token->transferFromDOM($child);
-            $this->_token = $token;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Get the value for this element's token attribute.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Token The token element.
-     */
-    public function getToken()
-    {
-        return $this->_token;
-    }
-
-    /**
-     * Set the value for this element's token attribute.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Token $value The desired value for this attribute.
-     * @return Zend_YouTube_Extension_Link The element being modified.
-     */
-    public function setToken($value)
-    {
-        $this->_token = $value;
-        return $this;
-    }
-
-    /**
-    * Get the value of this element's token attribute.
-    *
-    * @return string The token's text value
-    */
-    public function getTokenValue()
-    {
-      return $this->getToken()->getText();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Location.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Location.php
deleted file mode 100644
index d24da54d9..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Location.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:location element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Location extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'location';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaContent.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaContent.php
deleted file mode 100644
index a9875ce64..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaContent.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaContent
- */
-require_once 'Zend/Gdata/Media/Extension/MediaContent.php';
-
-/**
- * Represents the media:content element of Media RSS.
- * Represents media objects.  Multiple media objects representing
- * the same content can be represented using a
- * media:group (Zend_Gdata_Media_Extension_MediaGroup) element.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_MediaContent extends Zend_Gdata_Media_Extension_MediaContent
-{
-    protected $_rootElement = 'content';
-    protected $_rootNamespace = 'media';
-
-    /*
-     * Format of the video
-     * Optional.
-     *
-     * @var int
-     */
-    protected $_format = null;
-
-
-    function __construct() {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_format!= null) {
-            $element->setAttributeNS($this->lookupNamespace('yt'), 'yt:format', $this->_format);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        $absoluteAttrName = $attribute->namespaceURI . ':' . $attribute->localName;
-        if ($absoluteAttrName == $this->lookupNamespace('yt') . ':' . 'format') {
-            $this->_format = $attribute->nodeValue;
-        } else {
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Returns the format of the media
-     * Optional.
-     *
-     * @return int  The format of the media
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * Sets the format of the media
-     *
-     * @param int $value    Format of the media
-     * @return Zend_Gdata_YouTube_Extension_MediaContent  Provides a fluent interface
-     *
-     */
-    public function setFormat($value)
-    {
-        $this->_format = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaCredit.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaCredit.php
deleted file mode 100644
index 00b5006df..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaCredit.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_App_Extension
- */
-require_once 'Zend/Gdata/App/Extension.php';
-
-/**
- * Represents the YouTube specific media:credit element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_MediaCredit extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'credit';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_role = null;
-
-    /**
-     * @var string
-     */
-    protected $_scheme = null;
-
-    /**
-     * Represents the value of the yt:type attribute.
-     *
-     * Set to 'partner' if the uploader of this video is a YouTube
-     * partner.
-     *
-     * @var string
-     */
-    protected $_yttype = null;
-
-    /**
-     * Creates an individual MediaCredit object.
-     *
-     * @param string $text
-     * @param string $role
-     * @param string $scheme
-     */
-    public function __construct($text = null, $role = null,  $scheme = null,
-        $yttype = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-        $this->_role = $role;
-        $this->_scheme = $scheme;
-        $this->_yttype = $yttype;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_role !== null) {
-            $element->setAttribute('role', $this->_role);
-        }
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        if ($this->_yttype !== null) {
-            $element->setAttributeNS('http://gdata.youtube.com/schemas/2007',
-                'yt:type', $this->_yttype);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-            case 'role':
-                $this->_role = $attribute->nodeValue;
-                break;
-            case 'scheme':
-                $this->_scheme = $attribute->nodeValue;
-                break;
-            case 'type':
-                $this->_yttype = $attribute->nodeValue;
-                break;
-            default:
-                parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getRole()
-    {
-        return $this->_role;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent
-     *         interface
-     */
-    public function setRole($value)
-    {
-        $this->_role = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent
-     *         interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getYTtype()
-    {
-        return $this->_yttype;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_Media_Extension_MediaCredit Provides a fluent
-     *         interface
-     */
-    public function setYTtype($value)
-    {
-        $this->_yttype = $value;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaGroup.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaGroup.php
deleted file mode 100644
index 1d41dd517..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaGroup.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaGroup
- */
-require_once 'Zend/Gdata/Media/Extension/MediaGroup.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_MediaContent
- */
-require_once 'Zend/Gdata/YouTube/Extension/MediaContent.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Duration
- */
-require_once 'Zend/Gdata/YouTube/Extension/Duration.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_MediaRating
- */
-require_once 'Zend/Gdata/YouTube/Extension/MediaRating.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_MediaCredit
- */
-require_once 'Zend/Gdata/YouTube/Extension/MediaCredit.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Private
- */
-require_once 'Zend/Gdata/YouTube/Extension/Private.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_VideoId
- */
-require_once 'Zend/Gdata/YouTube/Extension/VideoId.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Uploaded
- */
-require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php';
-
-/**
- * This class represents the media:group element of Media RSS.
- * It allows the grouping of media:content elements that are
- * different representations of the same content.  When it exists,
- * it is a child of an Entry (Atom) or Item (RSS).
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_MediaGroup extends Zend_Gdata_Media_Extension_MediaGroup
-{
-
-    protected $_rootElement = 'group';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_Duration
-     */
-    protected $_duration = null;
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_Private
-     */
-    protected $_private = null;
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_VideoId
-     */
-    protected $_videoid = null;
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_MediaRating
-     */
-    protected $_mediarating = null;
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_MediaCredit
-     */
-    protected $_mediacredit = null;
-
-    /**
-     * @var Zend_Gdata_YouTube_Extension_Uploaded
-     */
-    protected $_uploaded = null;
-
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_duration !== null) {
-            $element->appendChild(
-                $this->_duration->getDOM($element->ownerDocument));
-        }
-        if ($this->_private !== null) {
-            $element->appendChild(
-                $this->_private->getDOM($element->ownerDocument));
-        }
-        if ($this->_videoid != null) {
-            $element->appendChild(
-                $this->_videoid->getDOM($element->ownerDocument));
-        }
-        if ($this->_uploaded != null) {
-            $element->appendChild(
-                $this->_uploaded->getDOM($element->ownerDocument));
-        }
-        if ($this->_mediacredit != null) {
-            $element->appendChild(
-                $this->_mediacredit->getDOM($element->ownerDocument));
-        }
-        if ($this->_mediarating != null) {
-            $element->appendChild(
-                $this->_mediarating->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('media') . ':' . 'content':
-                $content = new Zend_Gdata_YouTube_Extension_MediaContent();
-                $content->transferFromDOM($child);
-                $this->_content[] = $content;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'rating':
-                $mediarating = new Zend_Gdata_YouTube_Extension_MediaRating();
-                $mediarating->transferFromDOM($child);
-                $this->_mediarating = $mediarating;
-                break;
-            case $this->lookupNamespace('media') . ':' . 'credit':
-                $mediacredit = new Zend_Gdata_YouTube_Extension_MediaCredit();
-                $mediacredit->transferFromDOM($child);
-                $this->_mediacredit = $mediacredit;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'duration':
-                $duration = new Zend_Gdata_YouTube_Extension_Duration();
-                $duration->transferFromDOM($child);
-                $this->_duration = $duration;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'private':
-                $private = new Zend_Gdata_YouTube_Extension_Private();
-                $private->transferFromDOM($child);
-                $this->_private = $private;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'videoid':
-                $videoid = new Zend_Gdata_YouTube_Extension_VideoId();
-                $videoid ->transferFromDOM($child);
-                $this->_videoid = $videoid;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'uploaded':
-                $uploaded = new Zend_Gdata_YouTube_Extension_Uploaded();
-                $uploaded ->transferFromDOM($child);
-                $this->_uploaded = $uploaded;
-                break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Returns the duration value of this element
-     *
-     * @return Zend_Gdata_YouTube_Extension_Duration
-     */
-    public function getDuration()
-    {
-        return $this->_duration;
-    }
-
-    /**
-     * Sets the duration value of this element
-     *
-     * @param Zend_Gdata_YouTube_Extension_Duration $value The duration value
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setDuration($value)
-    {
-        $this->_duration = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the videoid value of this element
-     *
-     * @return Zend_Gdata_YouTube_Extension_VideoId
-     */
-    public function getVideoId()
-    {
-        return $this->_videoid;
-    }
-
-    /**
-     * Sets the videoid value of this element
-     *
-     * @param Zend_Gdata_YouTube_Extension_VideoId $value The video id value
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setVideoId($value)
-    {
-        $this->_videoid = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the yt:uploaded element
-     *
-     * @return Zend_Gdata_YouTube_Extension_Uploaded
-     */
-    public function getUploaded()
-    {
-        return $this->_uploaded;
-    }
-
-    /**
-     * Sets the yt:uploaded element
-     *
-     * @param Zend_Gdata_YouTube_Extension_Uploaded $value The uploaded value
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setUploaded($value)
-    {
-        $this->_uploaded = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the private value of this element
-     *
-     * @return Zend_Gdata_YouTube_Extension_Private
-     */
-    public function getPrivate()
-    {
-        return $this->_private;
-    }
-
-    /**
-     * Sets the private value of this element
-     *
-     * @param Zend_Gdata_YouTube_Extension_Private $value The private value
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setPrivate($value)
-    {
-        $this->_private = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the rating value of this element
-     *
-     * @return Zend_Gdata_YouTube_Extension_MediaRating
-     */
-    public function getMediaRating()
-    {
-        return $this->_mediarating;
-    }
-
-    /**
-     * Sets the media:rating value of this element
-     *
-     * @param Zend_Gdata_YouTube_Extension_MediaRating $value The rating element
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setMediaRating($value)
-    {
-        $this->_mediarating = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the media:credit value of this element
-     *
-     * @return Zend_Gdata_YouTube_Extension_MediaCredit
-     */
-    public function getMediaCredit()
-    {
-        return $this->_mediacredit;
-    }
-
-    /**
-     * Sets the media:credit value of this element
-     *
-     * @param Zend_Gdata_YouTube_Extension_MediaCredit $value The credit element
-     * @return Zend_Gdata_YouTube_Extension_MediaGroup Provides a fluent
-     *         interface
-     */
-    public function setMediaCredit($value)
-    {
-        $this->_mediacredit = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaRating.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaRating.php
deleted file mode 100644
index 4800e29e4..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/MediaRating.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage Media
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the media:rating element specific to YouTube.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_MediaRating extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'rating';
-    protected $_rootNamespace = 'media';
-
-    /**
-     * @var string
-     */
-    protected $_scheme = null;
-
-    /**
-     * @var string
-     */
-    protected $_country = null;
-
-    /**
-     * Constructs a new MediaRating element
-     *
-     * @param string $text
-     * @param string $scheme
-     * @param string $country
-     */
-    public function __construct($text = null, $scheme = null, $country = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_Media::$namespaces);
-        parent::__construct();
-        $this->_scheme = $scheme;
-        $this->_country = $country;
-        $this->_text = $text;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     *         child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_scheme !== null) {
-            $element->setAttribute('scheme', $this->_scheme);
-        }
-        if ($this->_country != null) {
-            $element->setAttribute('country', $this->_country);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'scheme':
-            $this->_scheme = $attribute->nodeValue;
-            break;
-        case 'country':
-            $this->_country = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_YouTube_Extension_MediaRating Provides a fluent interface
-     */
-    public function setScheme($value)
-    {
-        $this->_scheme = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCountry()
-    {
-        return $this->_country;
-    }
-
-    /**
-     * @param string $value
-     * @return Zend_Gdata_YouTube_Extension_MediaRating Provides a fluent interface
-     */
-    public function setCountry($value)
-    {
-        $this->_country = $value;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Movies.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Movies.php
deleted file mode 100644
index 76dee6f65..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Movies.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Movies.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:movies element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Movies extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'movies';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Music.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Music.php
deleted file mode 100644
index dab1e030a..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Music.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Music.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:music element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Music extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'music';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/NoEmbed.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/NoEmbed.php
deleted file mode 100644
index e13815907..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/NoEmbed.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NoEmbed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:noembed element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_NoEmbed extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'noembed';
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_VideoShare object.
-     * @param bool $enabled(optional) The enabled value of the element.
-     */
-    public function __construct($enabled = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Occupation.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Occupation.php
deleted file mode 100644
index 5d625f0fb..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Occupation.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Occupation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:occupation element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Occupation extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'occupation';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistId.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistId.php
deleted file mode 100644
index fc4d21616..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistId.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:playlistId element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_PlaylistId extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'playlistId';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
deleted file mode 100644
index e50165c51..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistTitle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:playlistTitle element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_PlaylistTitle extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'playlistTitle';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Position.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Position.php
deleted file mode 100644
index 6d0e840c4..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Position.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Data model class to represent a playlist item's position in the list (yt:position)
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Position extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'position';
-    protected $_rootNamespace = 'yt';
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Position object.
-     *
-     * @param string $value (optional) The 1-based position in the playlist
-     */
-    public function __construct($value = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $value;
-    }
-
-    /**
-     * Get the value for the position in the playlist
-     *
-     * @return int The 1-based position in the playlist
-     */
-    public function getValue()
-    {
-        return $this->_text;
-    }
-
-    /**
-     * Set the value for the position in the playlist
-     *
-     * @param int $value The 1-based position in the playlist
-     * @return Zend_Gdata_Extension_Visibility The element being modified
-     */
-    public function setValue($value)
-    {
-        $this->_text = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Private.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Private.php
deleted file mode 100644
index 26a464fb5..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Private.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Private.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:private element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Private extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'private';
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Private object.
-     */
-    public function __construct()
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and valueare
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        parent::takeAttributeFromDOM($attribute);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/QueryString.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/QueryString.php
deleted file mode 100644
index c0b8c1e85..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/QueryString.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryString.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:queryString element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_QueryString extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'queryString';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Racy.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Racy.php
deleted file mode 100644
index 048da3f46..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Racy.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Racy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:racy element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Racy extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'racy';
-    protected $_state = null;
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Racy object.
-     * @param bool $state(optional) The state value of the element.
-     */
-    public function __construct($state = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_state = $state;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_state !== null) {
-            $element->setAttribute('state', $this->_state);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and value are
-     * stored in an array.
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'state':
-            $this->_state = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's state attribute.
-     *
-     * @return bool The value associated with this attribute.
-     */
-    public function getState()
-    {
-        return $this->_state;
-    }
-
-    /**
-     * Set the value for this element's state attribute.
-     *
-     * @param bool $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Racy The element being modified.
-     */
-    public function setState($value)
-    {
-        $this->_state = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     */
-    public function __toString()
-    {
-        return $this->_state;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Recorded.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Recorded.php
deleted file mode 100644
index 3ba464e3e..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Recorded.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Recorded.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:recorded element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Recorded extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'recorded';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Relationship.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Relationship.php
deleted file mode 100644
index 57f94f755..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Relationship.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Relationship.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:relationship element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Relationship extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'relationship';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php
deleted file mode 100644
index caa0ce53c..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ReleaseDate.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:releaseDate element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_ReleaseDate extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'releaseDate';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/School.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/School.php
deleted file mode 100644
index 7c2626ae1..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/School.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: School.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:school element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_School extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'school';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/State.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/State.php
deleted file mode 100644
index bf8184096..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/State.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: State.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:state element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_State extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'state';
-    protected $_name = null;
-    protected $_reasonCode = null;
-    protected $_helpUrl = null;
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_State object.
-     *
-     * @param string $explanation(optional) The explanation of this state
-     * @param string $name(optional) The name value
-     * @param string $reasonCode(optional) The reasonCode value
-     * @param string $helpUrl(optional) The helpUrl value
-     */
-    public function __construct($explanation = null, $name = null,
-                                $reasonCode = null, $helpUrl = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $explanation;
-        $this->_name = $name;
-        $this->_reasonCode = $reasonCode;
-        $this->_helpUrl = $reasonCode;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_name !== null) {
-            $element->setAttribute('name', $this->_name);
-        }
-        if ($this->_reasonCode !== null) {
-            $element->setAttribute('reasonCode', $this->_reasonCode);
-        }
-        if ($this->_helpUrl !== null) {
-            $element->setAttribute('helpUrl', $this->_helpUrl);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and valueare
-     * stored in an array.
-     * TODO: Convert attributes to proper types
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'name':
-            $this->_name = $attribute->nodeValue;
-            break;
-        case 'reasonCode':
-            $this->_reasonCode = $attribute->nodeValue;
-            break;
-        case 'helpUrl':
-            $this->_helpUrl = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's name attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set the value for this element's name attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_State The element being modified.
-     */
-    public function setName($value)
-    {
-        $this->_name = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's reasonCode attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getReasonCode()
-    {
-        return $this->_reasonCode;
-    }
-
-    /**
-     * Set the value for this element's reasonCode attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_State The element being modified.
-     */
-    public function setReasonCode($value)
-    {
-        $this->_reasonCode = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's helpUrl attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getHelpUrl()
-    {
-        return $this->_helpUrl;
-    }
-
-    /**
-     * Set the value for this element's helpUrl attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_State The element being modified.
-     */
-    public function setHelpUrl($value)
-    {
-        $this->_helpUrl = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Statistics.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Statistics.php
deleted file mode 100644
index b1291ae4f..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Statistics.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Statistics.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:statistics element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'statistics';
-
-    /**
-     * The videoWatchCount attribute specifies the number of videos
-     * that a user has watched on YouTube. The videoWatchCount attribute
-     * is only specified when the <yt:statistics> tag appears within a
-     * user profile entry.
-     *
-     * @var integer
-     */
-    protected $_videoWatchCount = null;
-
-    /**
-     * When the viewCount attribute refers to a video entry, the attribute
-     * specifies the number of times that the video has been viewed.
-     * When the viewCount attribute refers to a user profile, the attribute
-     * specifies the number of times that the user's profile has been
-     * viewed.
-     *
-     * @var integer
-     */
-    protected $_viewCount = null;
-
-    /**
-     * The subscriberCount attribute specifies the number of YouTube users
-     * who have subscribed to a particular user's YouTube channel.
-     * The subscriberCount attribute is only specified when the
-     * <yt:statistics> tag appears within a user profile entry.
-     *
-     * @var integer
-     */
-    protected $_subscriberCount = null;
-
-    /**
-     * The lastWebAccess attribute indicates the most recent time that
-     * a particular user used YouTube.
-     *
-     * @var string
-     */
-    protected $_lastWebAccess = null;
-
-    /**
-     * The favoriteCount attribute specifies the number of YouTube users
-     * who have added a video to their list of favorite videos. The
-     * favoriteCount attribute is only specified when the
-     * <yt:statistics> tag appears within a video entry.
-     *
-     * @var integer
-     */
-    protected $_favoriteCount = null;
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Statistics object.
-     * @param string $viewCount(optional) The viewCount value
-     * @param string $videoWatchCount(optional) The videoWatchCount value
-     * @param string $subscriberCount(optional) The subscriberCount value
-     * @param string $lastWebAccess(optional) The lastWebAccess value
-     * @param string $favoriteCount(optional) The favoriteCount value
-     */
-    public function __construct($viewCount = null, $videoWatchCount = null,
-        $subscriberCount = null, $lastWebAccess = null,
-        $favoriteCount = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_viewCount = $viewCount;
-        $this->_videoWatchCount = $videoWatchCount;
-        $this->_subscriberCount = $subscriberCount;
-        $this->_lastWebAccess = $lastWebAccess;
-        $this->_favoriteCount = $favoriteCount;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_videoWatchCount !== null) {
-            $element->setAttribute('watchCount', $this->_videoWatchCount);
-        }
-        if ($this->_viewCount !== null) {
-            $element->setAttribute('viewCount', $this->_viewCount);
-        }
-        if ($this->_subscriberCount !== null) {
-            $element->setAttribute('subscriberCount',
-                $this->_subscriberCount);
-        }
-        if ($this->_lastWebAccess !== null) {
-            $element->setAttribute('lastWebAccess',
-                $this->_lastWebAccess);
-        }
-        if ($this->_favoriteCount !== null) {
-            $element->setAttribute('favoriteCount',
-                $this->_favoriteCount);
-        }
-        return $element;
-    }
-
-    /**
-     * Given a DOMNode representing an attribute, tries to map the data into
-     * instance members.  If no mapping is defined, the name and valueare
-     * stored in an array.
-     * TODO: Convert attributes to proper types
-     *
-     * @param DOMNode $attribute The DOMNode attribute needed to be handled
-     */
-    protected function takeAttributeFromDOM($attribute)
-    {
-        switch ($attribute->localName) {
-        case 'videoWatchCount':
-            $this->_videoWatchCount = $attribute->nodeValue;
-            break;
-        case 'viewCount':
-            $this->_viewCount = $attribute->nodeValue;
-            break;
-        case 'subscriberCount':
-            $this->_subscriberCount = $attribute->nodeValue;
-            break;
-        case 'lastWebAccess':
-            $this->_lastWebAccess = $attribute->nodeValue;
-            break;
-        case 'favoriteCount':
-            $this->_favoriteCount = $attribute->nodeValue;
-            break;
-        default:
-            parent::takeAttributeFromDOM($attribute);
-        }
-    }
-
-    /**
-     * Get the value for this element's viewCount attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getViewCount()
-    {
-        return $this->_viewCount;
-    }
-
-    /**
-     * Set the value for this element's viewCount attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Statistics The element being
-     * modified.
-     */
-    public function setViewCount($value)
-    {
-        $this->_viewCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's videoWatchCount attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getVideoWatchCount()
-    {
-        return $this->_videoWatchCount;
-    }
-
-    /**
-     * Set the value for this element's videoWatchCount attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Statistics The element being
-     * modified.
-     */
-    public function setVideoWatchCount($value)
-    {
-        $this->_videoWatchCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's subscriberCount attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getSubscriberCount()
-    {
-        return $this->_subscriberCount;
-    }
-
-    /**
-     * Set the value for this element's subscriberCount attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Statistics The element being
-     * modified.
-     */
-    public function setSubscriberCount($value)
-    {
-        $this->_subscriberCount = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's lastWebAccess attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getLastWebAccess()
-    {
-        return $this->_lastWebAccess;
-    }
-
-    /**
-     * Set the value for this element's lastWebAccess attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Statistics The element being
-     * modified.
-     */
-    public function setLastWebAccess($value)
-    {
-        $this->_lastWebAccess = $value;
-        return $this;
-    }
-
-    /**
-     * Get the value for this element's favoriteCount attribute.
-     *
-     * @return int The value associated with this attribute.
-     */
-    public function getFavoriteCount()
-    {
-        return $this->_favoriteCount;
-    }
-
-    /**
-     * Set the value for this element's favoriteCount attribute.
-     *
-     * @param int $value The desired value for this attribute.
-     * @return Zend_Gdata_YouTube_Extension_Statistics The element being
-     * modified.
-     */
-    public function setFavoriteCount($value)
-    {
-        $this->_favoriteCount = $value;
-        return $this;
-    }
-
-    /**
-     * Magic toString method allows using this directly via echo
-     * Works best in PHP >= 4.2.0
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return 'View Count=' . $this->_viewCount .
-            ' VideoWatchCount=' . $this->_videoWatchCount .
-            ' SubscriberCount=' . $this->_subscriberCount .
-            ' LastWebAccess=' . $this->_lastWebAccess .
-            ' FavoriteCount=' . $this->_favoriteCount;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Status.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Status.php
deleted file mode 100644
index 45b042218..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Status.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Status.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:status element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Status extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'status';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Token.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Token.php
deleted file mode 100644
index f561ff7be..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Token.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:token element used by the YouTube data API
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Token extends Zend_Gdata_App_Extension
-{
-
-    protected $_rootNamespace = 'yt';
-    protected $_rootElement = 'token';
-
-    /**
-     * Constructs a new Zend_Gdata_YouTube_Extension_Token object.
-     */
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        return $element;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Uploaded.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Uploaded.php
deleted file mode 100644
index 25396f90b..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Uploaded.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Uploaded.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:uploaded element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Uploaded extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'uploaded';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Username.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Username.php
deleted file mode 100644
index 85c6e5631..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/Username.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Username.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:username element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_Username extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'username';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/VideoId.php b/airtime_mvc/library/Zend/Gdata/YouTube/Extension/VideoId.php
deleted file mode 100644
index 5491a3f13..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/Extension/VideoId.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension
- */
-require_once 'Zend/Gdata/Extension.php';
-
-/**
- * Represents the yt:videoid element
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_Extension_VideoId extends Zend_Gdata_Extension
-{
-
-    protected $_rootElement = 'videoid';
-    protected $_rootNamespace = 'yt';
-
-    public function __construct($text = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct();
-        $this->_text = $text;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/InboxEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/InboxEntry.php
deleted file mode 100644
index 48ee55843..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/InboxEntry.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InboxEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Entry
- */
-require_once 'Zend/Gdata/Media/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_Rating
- */
-require_once 'Zend/Gdata/Extension/Rating.php';
-
-/**
- * @see Zend_Gdata_Extension_Comments
- */
-require_once 'Zend/Gdata/Extension/Comments.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Statistics
- */
-require_once 'Zend/Gdata/YouTube/Extension/Statistics.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Description
- */
-require_once 'Zend/Gdata/YouTube/Extension/Description.php';
-
-
-/**
- * Represents the YouTube message flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_InboxEntry';
-
-    /**
-     * The gd:comments element of this entry.
-     *
-     * @var Zend_Gdata_Extension_Comments
-     */
-    protected $_comments = null;
-
-    /**
-     * The gd:rating element of this entry.
-     *
-     * @var Zend_Gdata_Extension_Rating
-     */
-    protected $_rating = null;
-
-    /**
-     * The yt:statistics element of this entry.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Statistics
-     */
-    protected $_statistics = null;
-
-    /**
-     * The yt:description element of this entry.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Description
-     */
-    protected $_description = null;
-
-    /**
-     * Creates a subscription entry, representing an individual subscription
-     * in a list of subscriptions, usually associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_description != null) {
-            $element->appendChild(
-                $this->_description->getDOM($element->ownerDocument));
-        }
-        if ($this->_rating != null) {
-            $element->appendChild(
-                $this->_rating->getDOM($element->ownerDocument));
-        }
-        if ($this->_statistics != null) {
-            $element->appendChild(
-                $this->_statistics->getDOM($element->ownerDocument));
-        }
-        if ($this->_comments != null) {
-            $element->appendChild(
-                $this->_comments->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-            case $this->lookupNamespace('gd') . ':' . 'comments':
-                $comments = new Zend_Gdata_Extension_Comments();
-                $comments->transferFromDOM($child);
-                $this->_comments = $comments;
-                break;
-            case $this->lookupNamespace('gd') . ':' . 'rating':
-                $rating = new Zend_Gdata_Extension_Rating();
-                $rating->transferFromDOM($child);
-                $this->_rating = $rating;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'description':
-                $description = new Zend_Gdata_YouTube_Extension_Description();
-                $description->transferFromDOM($child);
-                $this->_description = $description;
-                break;
-            case $this->lookupNamespace('yt') . ':' . 'statistics':
-                $statistics = new Zend_Gdata_YouTube_Extension_Statistics();
-                $statistics->transferFromDOM($child);
-                $this->_statistics = $statistics;
-                break;
-            default:
-                parent::takeChildFromDOM($child);
-                break;
-        }
-    }
-
-    /**
-     * Get the yt:description
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_Description|null
-     */
-    public function getDescription()
-    {
-        if ($this->getMajorProtocolVersion() == 2) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getDescription ' .
-                ' method is only supported in version 1 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_description;
-        }
-    }
-
-    /**
-     * Sets the yt:description element for a new inbox entry.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Description $description The
-     *        description.
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_InboxEntry Provides a fluent interface
-     */
-    public function setDescription($description = null)
-    {
-        if ($this->getMajorProtocolVersion() == 2) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setDescription ' .
-                ' method is only supported in version 1 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_description = $description;
-            return $this;
-        }
-    }
-
-    /**
-     * Get the gd:rating element for the inbox entry
-     *
-     * @return Zend_Gdata_Extension_Rating|null
-     */
-    public function getRating()
-    {
-        return $this->_rating;
-    }
-
-    /**
-     * Sets the gd:rating element for the inbox entry
-     *
-     * @param Zend_Gdata_Extension_Rating $rating The rating for the video in
-     *        the message
-     * @return Zend_Gdata_YouTube_InboxEntry Provides a fluent interface
-     */
-    public function setRating($rating = null)
-    {
-        $this->_rating = $rating;
-        return $this;
-    }
-
-    /**
-     * Get the gd:comments element of the inbox entry.
-     *
-     * @return Zend_Gdata_Extension_Comments|null
-     */
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * Sets the gd:comments element for the inbox entry
-     *
-     * @param Zend_Gdata_Extension_Comments $comments The comments feed link
-     * @return Zend_Gdata_YouTube_InboxEntry Provides a fluent interface
-     */
-    public function setComments($comments = null)
-    {
-        $this->_comments = $comments;
-        return $this;
-    }
-
-    /**
-     * Get the yt:statistics element for the inbox entry
-     *
-     * @return Zend_Gdata_YouTube_Extension_Statistics|null
-     */
-    public function getStatistics()
-    {
-        return $this->_statistics;
-    }
-
-    /**
-     * Sets the yt:statistics element for the inbox entry
-     *
-     * @param Zend_Gdata_YouTube_Extension_Statistics $statistics The
-     *        statistics element for the video in the message
-     * @return Zend_Gdata_YouTube_InboxEntry Provides a fluent interface
-     */
-    public function setStatistics($statistics = null)
-    {
-        $this->_statistics = $statistics;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/InboxFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/InboxFeed.php
deleted file mode 100644
index a811f092d..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/InboxFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InboxFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_InboxEntry
- */
-require_once 'Zend/Gdata/YouTube/InboxEntry.php';
-
-/**
- * The YouTube inbox feed list flavor of an Atom Feed with media support
- * Represents a list of individual inbox entries, where each contained entry is
- * a message.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_InboxFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_InboxEntry';
-
-    /**
-     * Creates an Inbox feed, representing a list of messages,
-     * associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/MediaEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/MediaEntry.php
deleted file mode 100644
index 94304dec8..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/MediaEntry.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media
- */
-require_once 'Zend/Gdata/Media.php';
-
-/**
- * @see Zend_Gdata_Media_Entry
- */
-require_once 'Zend/Gdata/Media/Entry.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_MediaGroup
- */
-require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php';
-
-/**
- * Represents the YouTube flavor of a Gdata Media Entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_MediaEntry extends Zend_Gdata_Media_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_MediaEntry';
-
-    /**
-     * media:group element
-     *
-     * @var Zend_Gdata_YouTube_Extension_MediaGroup
-     */
-    protected $_mediaGroup = null;
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them as members of this entry based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('media') . ':' . 'group':
-            $mediaGroup = new Zend_Gdata_YouTube_Extension_MediaGroup();
-            $mediaGroup->transferFromDOM($child);
-            $this->_mediaGroup = $mediaGroup;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListEntry.php
deleted file mode 100644
index 398a79ab6..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListEntry.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_YouTube
- */
-require_once 'Zend/Gdata/YouTube.php';
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Description
- */
-require_once 'Zend/Gdata/YouTube/Extension/Description.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_PlaylistId
- */
-require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_CountHint
- */
-require_once 'Zend/Gdata/YouTube/Extension/CountHint.php';
-
-/**
- * Represents the YouTube video playlist flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_PlaylistListEntry';
-
-    /**
-     * Nested feed links
-     *
-     * @var array
-     */
-    protected $_feedLink = array();
-
-    /**
-     * Description of this playlist
-     *
-     * @deprecated Deprecated as of version 2 of the YouTube API.
-     * @var Zend_Gdata_YouTube_Extension_Description
-     */
-    protected $_description = null;
-
-    /**
-     * Id of this playlist
-     *
-     * @var Zend_Gdata_YouTube_Extension_PlaylistId
-     */
-    protected $_playlistId = null;
-
-    /**
-     * CountHint for this playlist.
-     *
-     * @var Zend_Gdata_YouTube_Extension_CountHint
-     */
-    protected $_countHint = null;
-
-    /**
-     * Creates a Playlist list entry, representing an individual playlist
-     * in a list of playlists, usually associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_description != null) {
-            $element->appendChild($this->_description->getDOM($element->ownerDocument));
-        }
-        if ($this->_countHint != null) {
-            $element->appendChild($this->_countHint->getDOM($element->ownerDocument));
-        }
-        if ($this->_playlistId != null) {
-            $element->appendChild($this->_playlistId->getDOM($element->ownerDocument));
-        }
-        if ($this->_feedLink != null) {
-            foreach ($this->_feedLink as $feedLink) {
-                $element->appendChild($feedLink->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'description':
-            $description = new Zend_Gdata_YouTube_Extension_Description();
-            $description->transferFromDOM($child);
-            $this->_description = $description;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'countHint':
-            $countHint = new Zend_Gdata_YouTube_Extension_CountHint();
-            $countHint->transferFromDOM($child);
-            $this->_countHint = $countHint;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'playlistId':
-            $playlistId = new Zend_Gdata_YouTube_Extension_PlaylistId();
-            $playlistId->transferFromDOM($child);
-            $this->_playlistId = $playlistId;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'feedLink':
-            $feedLink = new Zend_Gdata_Extension_FeedLink();
-            $feedLink->transferFromDOM($child);
-            $this->_feedLink[] = $feedLink;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Sets the description relating to the playlist.
-     *
-     * @deprecated Deprecated as of version 2 of the YouTube API.
-     * @param Zend_Gdata_YouTube_Extension_Description $description The description relating to the video
-     * @return Zend_Gdata_YouTube_PlaylistListEntry Provides a fluent interface
-     */
-    public function setDescription($description = null)
-    {
-        if ($this->getMajorProtocolVersion() >= 2) {
-            $this->setSummary($description);
-        } else {
-            $this->_description = $description;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the description relating to the video.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Description  The description
-     *         relating to the video
-     */
-    public function getDescription()
-    {
-        if ($this->getMajorProtocolVersion() >= 2) {
-            return $this->getSummary();
-        } else {
-            return $this->_description;
-        }
-    }
-
-    /**
-     * Returns the countHint relating to the playlist.
-     *
-     * The countHint is the number of videos on a playlist.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_CountHint  The count of videos on
-     *         a playlist.
-     */
-    public function getCountHint()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-            ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The yt:countHint ' .
-                'element is not supported in versions earlier than 2.');
-        } else {
-            return $this->_countHint;
-        }
-    }
-
-    /**
-     * Returns the Id relating to the playlist.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_PlaylistId  The id of this playlist.
-     */
-    public function getPlaylistId()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-            ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The yt:playlistId ' .
-                'element is not supported in versions earlier than 2.');
-        } else {
-            return $this->_playlistId;
-        }
-    }
-
-    /**
-     * Sets the array of embedded feeds related to the playlist
-     *
-     * @param array $feedLink The array of embedded feeds relating to the video
-     * @return Zend_Gdata_YouTube_PlaylistListEntry Provides a fluent interface
-     */
-    public function setFeedLink($feedLink = null)
-    {
-        $this->_feedLink = $feedLink;
-        return $this;
-    }
-
-    /**
-     * Get the feed link property for this entry.
-     *
-     * @see setFeedLink
-     * @param string $rel (optional) The rel value of the link to be found.
-     *          If null, the array of links is returned.
-     * @return mixed If $rel is specified, a Zend_Gdata_Extension_FeedLink
-     *          object corresponding to the requested rel value is returned
-     *          if found, or null if the requested value is not found. If
-     *          $rel is null or not specified, an array of all available
-     *          feed links for this entry is returned, or null if no feed
-     *          links are set.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL of the playlist video feed
-     *
-     * @return string The URL of the playlist video feed
-     */
-    public function getPlaylistVideoFeedUrl()
-    {
-        if ($this->getMajorProtocolVersion() >= 2) {
-            return $this->getContent()->getSrc();
-        } else {
-            return $this->getFeedLink(Zend_Gdata_YouTube::PLAYLIST_REL)->href;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListFeed.php
deleted file mode 100644
index 54fdee2d2..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistListFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_PlaylistListEntry
- */
-require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php';
-
-/**
- * The YouTube video playlist flavor of an Atom Feed with media support
- * Represents a list of individual playlists, where each contained entry is
- * a playlist.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_PlaylistListFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_PlaylistListEntry';
-
-    /**
-     * Creates a Playlist list feed, representing a list of playlists,
-     * usually associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php
deleted file mode 100644
index 1cef164ef..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistVideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_YouTube_VideoEntry
- */
-require_once 'Zend/Gdata/YouTube/VideoEntry.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Position
- */
-require_once 'Zend/Gdata/YouTube/Extension/Position.php';
-
-/**
- * Represents the YouTube video playlist flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_PlaylistVideoEntry extends Zend_Gdata_YouTube_VideoEntry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_PlaylistVideoEntry';
-
-    /**
-     * Position of the entry in the feed, as specified by the user
-     *
-     * @var Zend_Gdata_YouTube_Extension_Position
-     */
-    protected $_position = null;
-
-    /**
-     * Creates a Playlist video entry, representing an individual video
-     * in a list of videos contained within a specific playlist
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_position !== null) {
-            $element->appendChild($this->_position->getDOM($element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'position':
-            $position = new Zend_Gdata_YouTube_Extension_Position();
-            $position->transferFromDOM($child);
-            $this->_position = $position;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-
-    /**
-     * Sets the array of embedded feeds related to the video
-     *
-     * @param Zend_Gdata_YouTube_Extension_Position $position
-     *     The position of the entry in the feed, as specified by the user.
-     * @return Zend_Gdata_YouTube_PlaylistVideoEntry Provides a fluent interface
-     */
-    public function setPosition($position = null)
-    {
-        $this->_position = $position;
-        return $this;
-    }
-
-    /**
-     * Returns the position of the entry in the feed, as specified by the user
-     *
-     * @return Zend_Gdata_YouTube_Extension_Position The position
-     */
-    public function getPosition()
-    {
-        return $this->_position;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php
deleted file mode 100644
index 4c8ac591b..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlaylistVideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_PlaylistVideoEntry
- */
-require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php';
-
-/**
- * The YouTube video playlist flavor of an Atom Feed with media support
- * Represents a list of videos contained in a playlist.  Each entry in this
- * feed represents an individual video.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_PlaylistVideoFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_PlaylistVideoEntry';
-
-    /**
-     * Creates a Play Video feed, representing a list of videos contained
-     * within a single playlist.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionEntry.php
deleted file mode 100644
index 6a88b22be..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionEntry.php
+++ /dev/null
@@ -1,446 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubscriptionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Description
- */
-require_once 'Zend/Gdata/YouTube/Extension/Description.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_PlaylistTitle
- */
-require_once 'Zend/Gdata/YouTube/Extension/PlaylistTitle.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_PlaylistId
- */
-require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaThumbnail
- */
-require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Username
- */
-require_once 'Zend/Gdata/YouTube/Extension/Username.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_CountHint
- */
-require_once 'Zend/Gdata/YouTube/Extension/CountHint.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_QueryString
- */
-require_once 'Zend/Gdata/YouTube/Extension/QueryString.php';
-
-/**
- * Represents the YouTube video subscription flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_SubscriptionEntry';
-
-    /**
-     * Nested feed links
-     *
-     * @var array
-     */
-    protected $_feedLink = array();
-
-    /**
-     * The username of this entry.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Username
-     */
-    protected $_username = null;
-
-    /**
-     * The playlist title for this entry.
-     *
-     * This element is only used on subscriptions to playlists.
-     *
-     * @var Zend_Gdata_YouTube_Extension_PlaylistTitle
-     */
-    protected $_playlistTitle = null;
-
-    /**
-     * The playlist id for this entry.
-     *
-     * This element is only used on subscriptions to playlists.
-     *
-     * @var Zend_Gdata_YouTube_Extension_PlaylistId
-     */
-    protected $_playlistId = null;
-
-    /**
-     * The media:thumbnail element for this entry.
-     *
-     * This element is only used on subscriptions to playlists.
-     *
-     * @var Zend_Gdata_Media_Extension_MediaThumbnail
-     */
-    protected $_mediaThumbnail = null;
-
-    /**
-     * The countHint for this entry.
-     *
-     * @var Zend_Gdata_YouTube_Extension_CountHint
-     */
-    protected $_countHint = null;
-
-    /**
-     * The queryString for this entry.
-     *
-     * @var Zend_Gdata_YouTube_Extension_QueryString
-     */
-    protected $_queryString = null;
-
-    /**
-     * Creates a subscription entry, representing an individual subscription
-     * in a list of subscriptions, usually associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_countHint != null) {
-            $element->appendChild($this->_countHint->getDOM($element->ownerDocument));
-        }
-        if ($this->_playlistTitle != null) {
-            $element->appendChild($this->_playlistTitle->getDOM($element->ownerDocument));
-        }
-        if ($this->_playlistId != null) {
-            $element->appendChild($this->_playlistId->getDOM($element->ownerDocument));
-        }
-        if ($this->_mediaThumbnail != null) {
-            $element->appendChild($this->_mediaThumbnail->getDOM($element->ownerDocument));
-        }
-        if ($this->_username != null) {
-            $element->appendChild($this->_username->getDOM($element->ownerDocument));
-        }
-        if ($this->_queryString != null) {
-            $element->appendChild($this->_queryString->getDOM($element->ownerDocument));
-        }
-        if ($this->_feedLink != null) {
-            foreach ($this->_feedLink as $feedLink) {
-                $element->appendChild($feedLink->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('gd') . ':' . 'feedLink':
-            $feedLink = new Zend_Gdata_Extension_FeedLink();
-            $feedLink->transferFromDOM($child);
-            $this->_feedLink[] = $feedLink;
-            break;
-        case $this->lookupNamespace('media') . ':' . 'thumbnail':
-            $mediaThumbnail = new Zend_Gdata_Media_Extension_MediaThumbnail();
-            $mediaThumbnail->transferFromDOM($child);
-            $this->_mediaThumbnail = $mediaThumbnail;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'countHint':
-            $countHint = new Zend_Gdata_YouTube_Extension_CountHint();
-            $countHint->transferFromDOM($child);
-            $this->_countHint = $countHint;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'playlistTitle':
-            $playlistTitle = new Zend_Gdata_YouTube_Extension_PlaylistTitle();
-            $playlistTitle->transferFromDOM($child);
-            $this->_playlistTitle = $playlistTitle;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'playlistId':
-            $playlistId = new Zend_Gdata_YouTube_Extension_PlaylistId();
-            $playlistId->transferFromDOM($child);
-            $this->_playlistId = $playlistId;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'queryString':
-            $queryString = new Zend_Gdata_YouTube_Extension_QueryString();
-            $queryString->transferFromDOM($child);
-            $this->_queryString = $queryString;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'username':
-            $username = new Zend_Gdata_YouTube_Extension_Username();
-            $username->transferFromDOM($child);
-            $this->_username = $username;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Sets the array of embedded feeds related to the video
-     *
-     * @param array $feedLink The array of embedded feeds relating to the video
-     * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface
-     */
-    public function setFeedLink($feedLink = null)
-    {
-        $this->_feedLink = $feedLink;
-        return $this;
-    }
-
-    /**
-     * Get the feed link property for this entry.
-     *
-     * @see setFeedLink
-     * @param string $rel (optional) The rel value of the link to be found.
-     *          If null, the array of links is returned.
-     * @return mixed If $rel is specified, a Zend_Gdata_Extension_FeedLink
-     *          object corresponding to the requested rel value is returned
-     *          if found, or null if the requested value is not found. If
-     *          $rel is null or not specified, an array of all available
-     *          feed links for this entry is returned, or null if no feed
-     *          links are set.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Get the playlist title for a 'playlist' subscription.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_PlaylistId
-     */
-    public function getPlaylistId()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getPlaylistId ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_playlistId;
-        }
-    }
-
-    /**
-     * Sets the yt:playlistId element for a new playlist subscription.
-     *
-     * @param Zend_Gdata_YouTube_Extension_PlaylistId $id The id of
-     *        the playlist to which to subscribe to.
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface
-     */
-    public function setPlaylistId($id = null)
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_playlistId = $id;
-            return $this;
-        }
-    }
-
-    /**
-     * Get the queryString of the subscription
-     *
-     * @return Zend_Gdata_YouTube_Extension_QueryString
-     */
-    public function getQueryString()
-    {
-        return $this->_queryString;
-    }
-
-    /**
-     * Sets the yt:queryString element for a new keyword subscription.
-     *
-     * @param Zend_Gdata_YouTube_Extension_QueryString $queryString The query
-     *        string to subscribe to
-     * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface
-     */
-    public function setQueryString($queryString = null)
-    {
-        $this->_queryString = $queryString;
-        return $this;
-    }
-
-    /**
-     * Get the playlist title for a 'playlist' subscription.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_PlaylistTitle
-     */
-    public function getPlaylistTitle()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getPlaylistTitle ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_playlistTitle;
-        }
-    }
-
-    /**
-     * Sets the yt:playlistTitle element for a new playlist subscription.
-     *
-     * @param Zend_Gdata_YouTube_Extension_PlaylistTitle $title The title of
-     *        the playlist to which to subscribe to.
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface
-     */
-    public function setPlaylistTitle($title = null)
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_playlistTitle = $title;
-            return $this;
-        }
-    }
-
-    /**
-     * Get the counthint for a subscription.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_CountHint
-     */
-    public function getCountHint()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getCountHint ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_countHint;
-        }
-    }
-
-    /**
-     * Get the thumbnail for a subscription.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail
-     */
-    public function getMediaThumbnail()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getMediaThumbnail ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_mediaThumbnail;
-        }
-    }
-
-    /**
-     * Get the username for a channel subscription.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Username
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Sets the username for a new channel subscription.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Username $username The username of
-     *        the channel to which to subscribe to.
-     * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface
-     */
-    public function setUsername($username = null)
-    {
-        $this->_username = $username;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionFeed.php
deleted file mode 100644
index e49a15f9c..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/SubscriptionFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubscriptionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_SubscriptionEntry
- */
-require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php';
-
-/**
- * The YouTube video subscription list flavor of an Atom Feed with media support
- * Represents a list of individual subscriptions, where each contained entry is
- * a subscription.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_SubscriptionFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_SubscriptionEntry';
-
-    /**
-     * Creates a Subscription feed, representing a list of subscriptions,
-     * usually associated with an individual user.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/UserProfileEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/UserProfileEntry.php
deleted file mode 100644
index 51803f58e..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/UserProfileEntry.php
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Entry
- */
-require_once 'Zend/Gdata/Entry.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Description
- */
-require_once 'Zend/Gdata/YouTube/Extension/Description.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_AboutMe
- */
-require_once 'Zend/Gdata/YouTube/Extension/AboutMe.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Age
- */
-require_once 'Zend/Gdata/YouTube/Extension/Age.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Username
- */
-require_once 'Zend/Gdata/YouTube/Extension/Username.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Books
- */
-require_once 'Zend/Gdata/YouTube/Extension/Books.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Company
- */
-require_once 'Zend/Gdata/YouTube/Extension/Company.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Hobbies
- */
-require_once 'Zend/Gdata/YouTube/Extension/Hobbies.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Hometown
- */
-require_once 'Zend/Gdata/YouTube/Extension/Hometown.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Location
- */
-require_once 'Zend/Gdata/YouTube/Extension/Location.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Movies
- */
-require_once 'Zend/Gdata/YouTube/Extension/Movies.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Music
- */
-require_once 'Zend/Gdata/YouTube/Extension/Music.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Occupation
- */
-require_once 'Zend/Gdata/YouTube/Extension/Occupation.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_School
- */
-require_once 'Zend/Gdata/YouTube/Extension/School.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Gender
- */
-require_once 'Zend/Gdata/YouTube/Extension/Gender.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Relationship
- */
-require_once 'Zend/Gdata/YouTube/Extension/Relationship.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_FirstName
- */
-require_once 'Zend/Gdata/YouTube/Extension/FirstName.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_LastName
- */
-require_once 'Zend/Gdata/YouTube/Extension/LastName.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Statistics
- */
-require_once 'Zend/Gdata/YouTube/Extension/Statistics.php';
-
-/**
- * @see Zend_Gdata_Media_Extension_MediaThumbnail
- */
-require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php';
-
-/**
- * Represents the YouTube video playlist flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry
-{
-
-    protected $_entryClassName = 'Zend_Gdata_YouTube_UserProfileEntry';
-
-    /**
-     * Nested feed links
-     *
-     * @var array
-     */
-    protected $_feedLink = array();
-
-    /**
-     * The username for this profile entry
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * The description of the user
-     *
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * The contents of the 'About Me' field.
-     *
-     * @var string
-     */
-    protected $_aboutMe = null;
-
-    /**
-     * The age of the user
-     *
-     * @var int
-     */
-    protected $_age = null;
-
-    /**
-     * Books of interest to the user
-     *
-     * @var string
-     */
-    protected $_books = null;
-
-    /**
-     * Company
-     *
-     * @var string
-     */
-    protected $_company = null;
-
-    /**
-     * Hobbies
-     *
-     * @var string
-     */
-    protected $_hobbies = null;
-
-    /**
-     * Hometown
-     *
-     * @var string
-     */
-    protected $_hometown = null;
-
-    /**
-     * Location
-     *
-     * @var string
-     */
-    protected $_location = null;
-
-    /**
-     * Movies
-     *
-     * @var string
-     */
-    protected $_movies = null;
-
-    /**
-     * Music
-     *
-     * @var string
-     */
-    protected $_music = null;
-
-    /**
-     * Occupation
-     *
-     * @var string
-     */
-    protected $_occupation = null;
-
-    /**
-     * School
-     *
-     * @var string
-     */
-    protected $_school = null;
-
-    /**
-     * Gender
-     *
-     * @var string
-     */
-    protected $_gender = null;
-
-    /**
-     * Relationship
-     *
-     * @var string
-     */
-    protected $_relationship = null;
-
-    /**
-     * First name
-     *
-     * @var string
-     */
-    protected $_firstName = null;
-
-    /**
-     * Last name
-     *
-     * @var string
-     */
-    protected $_lastName = null;
-
-    /**
-     * Statistics
-     *
-     * @var Zend_Gdata_YouTube_Extension_Statistics
-     */
-    protected $_statistics = null;
-
-    /**
-     * Thumbnail
-     *
-     * @var Zend_Gdata_Media_Extension_MediaThumbnail
-     */
-    protected $_thumbnail = null;
-
-    /**
-     * Creates a User Profile entry, representing an individual user
-     * and their attributes.
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_description != null) {
-            $element->appendChild($this->_description->getDOM($element->ownerDocument));
-        }
-        if ($this->_aboutMe != null) {
-            $element->appendChild($this->_aboutMe->getDOM($element->ownerDocument));
-        }
-        if ($this->_age != null) {
-            $element->appendChild($this->_age->getDOM($element->ownerDocument));
-        }
-        if ($this->_username != null) {
-            $element->appendChild($this->_username->getDOM($element->ownerDocument));
-        }
-        if ($this->_books != null) {
-            $element->appendChild($this->_books->getDOM($element->ownerDocument));
-        }
-        if ($this->_company != null) {
-            $element->appendChild($this->_company->getDOM($element->ownerDocument));
-        }
-        if ($this->_hobbies != null) {
-            $element->appendChild($this->_hobbies->getDOM($element->ownerDocument));
-        }
-        if ($this->_hometown != null) {
-            $element->appendChild($this->_hometown->getDOM($element->ownerDocument));
-        }
-        if ($this->_location != null) {
-            $element->appendChild($this->_location->getDOM($element->ownerDocument));
-        }
-        if ($this->_movies != null) {
-            $element->appendChild($this->_movies->getDOM($element->ownerDocument));
-        }
-        if ($this->_music != null) {
-            $element->appendChild($this->_music->getDOM($element->ownerDocument));
-        }
-        if ($this->_occupation != null) {
-            $element->appendChild($this->_occupation->getDOM($element->ownerDocument));
-        }
-        if ($this->_school != null) {
-            $element->appendChild($this->_school->getDOM($element->ownerDocument));
-        }
-        if ($this->_gender != null) {
-            $element->appendChild($this->_gender->getDOM($element->ownerDocument));
-        }
-        if ($this->_relationship != null) {
-            $element->appendChild($this->_relationship->getDOM($element->ownerDocument));
-        }
-        if ($this->_firstName != null) {
-            $element->appendChild($this->_firstName->getDOM($element->ownerDocument));
-        }
-        if ($this->_lastName != null) {
-            $element->appendChild($this->_lastName->getDOM($element->ownerDocument));
-        }
-        if ($this->_statistics != null) {
-            $element->appendChild($this->_statistics->getDOM($element->ownerDocument));
-        }
-        if ($this->_thumbnail != null) {
-            $element->appendChild($this->_thumbnail->getDOM($element->ownerDocument));
-        }
-        if ($this->_feedLink != null) {
-            foreach ($this->_feedLink as $feedLink) {
-                $element->appendChild($feedLink->getDOM($element->ownerDocument));
-            }
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'description':
-            $description = new Zend_Gdata_YouTube_Extension_Description();
-            $description->transferFromDOM($child);
-            $this->_description = $description;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'aboutMe':
-            $aboutMe = new Zend_Gdata_YouTube_Extension_AboutMe();
-            $aboutMe->transferFromDOM($child);
-            $this->_aboutMe = $aboutMe;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'age':
-            $age = new Zend_Gdata_YouTube_Extension_Age();
-            $age->transferFromDOM($child);
-            $this->_age = $age;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'username':
-            $username = new Zend_Gdata_YouTube_Extension_Username();
-            $username->transferFromDOM($child);
-            $this->_username = $username;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'books':
-            $books = new Zend_Gdata_YouTube_Extension_Books();
-            $books->transferFromDOM($child);
-            $this->_books = $books;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'company':
-            $company = new Zend_Gdata_YouTube_Extension_Company();
-            $company->transferFromDOM($child);
-            $this->_company = $company;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'hobbies':
-            $hobbies = new Zend_Gdata_YouTube_Extension_Hobbies();
-            $hobbies->transferFromDOM($child);
-            $this->_hobbies = $hobbies;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'hometown':
-            $hometown = new Zend_Gdata_YouTube_Extension_Hometown();
-            $hometown->transferFromDOM($child);
-            $this->_hometown = $hometown;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'location':
-            $location = new Zend_Gdata_YouTube_Extension_Location();
-            $location->transferFromDOM($child);
-            $this->_location = $location;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'movies':
-            $movies = new Zend_Gdata_YouTube_Extension_Movies();
-            $movies->transferFromDOM($child);
-            $this->_movies = $movies;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'music':
-            $music = new Zend_Gdata_YouTube_Extension_Music();
-            $music->transferFromDOM($child);
-            $this->_music = $music;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'occupation':
-            $occupation = new Zend_Gdata_YouTube_Extension_Occupation();
-            $occupation->transferFromDOM($child);
-            $this->_occupation = $occupation;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'school':
-            $school = new Zend_Gdata_YouTube_Extension_School();
-            $school->transferFromDOM($child);
-            $this->_school = $school;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'gender':
-            $gender = new Zend_Gdata_YouTube_Extension_Gender();
-            $gender->transferFromDOM($child);
-            $this->_gender = $gender;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'relationship':
-            $relationship = new Zend_Gdata_YouTube_Extension_Relationship();
-            $relationship->transferFromDOM($child);
-            $this->_relationship = $relationship;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'firstName':
-            $firstName = new Zend_Gdata_YouTube_Extension_FirstName();
-            $firstName->transferFromDOM($child);
-            $this->_firstName = $firstName;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'lastName':
-            $lastName = new Zend_Gdata_YouTube_Extension_LastName();
-            $lastName->transferFromDOM($child);
-            $this->_lastName = $lastName;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'statistics':
-            $statistics = new Zend_Gdata_YouTube_Extension_Statistics();
-            $statistics->transferFromDOM($child);
-            $this->_statistics = $statistics;
-            break;
-        case $this->lookupNamespace('media') . ':' . 'thumbnail':
-            $thumbnail = new Zend_Gdata_Media_Extension_MediaThumbnail();
-            $thumbnail->transferFromDOM($child);
-            $this->_thumbnail = $thumbnail;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'feedLink':
-            $feedLink = new Zend_Gdata_Extension_FeedLink();
-            $feedLink->transferFromDOM($child);
-            $this->_feedLink[] = $feedLink;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Sets the content of the 'about me' field.
-     *
-     * @param Zend_Gdata_YouTube_Extension_AboutMe $aboutMe The 'about me'
-     *        information.
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setAboutMe($aboutMe = null)
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setAboutMe ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_aboutMe = $aboutMe;
-            return $this;
-        }
-    }
-
-    /**
-     * Returns the contents of the 'about me' field.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_AboutMe  The 'about me' information
-     */
-    public function getAboutMe()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getAboutMe ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_aboutMe;
-        }
-    }
-
-    /**
-     * Sets the content of the 'first name' field.
-     *
-     * @param Zend_Gdata_YouTube_Extension_FirstName $firstName The first name
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setFirstName($firstName = null)
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setFirstName ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_firstName = $firstName;
-            return $this;
-        }
-    }
-
-    /**
-     * Returns the first name
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_FirstName  The first name
-     */
-    public function getFirstName()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getFirstName ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_firstName;
-        }
-    }
-
-    /**
-     * Sets the content of the 'last name' field.
-     *
-     * @param Zend_Gdata_YouTube_Extension_LastName $lastName The last name
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setLastName($lastName = null)
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The setLastName ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            $this->_lastName = $lastName;
-            return $this;
-        }
-    }
-
-    /**
-     * Returns the last name
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_LastName  The last name
-     */
-    public function getLastName()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getLastName ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_lastName;
-        }
-    }
-
-    /**
-     * Returns the statistics
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_Statistics  The profile statistics
-     */
-    public function getStatistics()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getStatistics ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_statistics;
-        }
-    }
-
-    /**
-     * Returns the thumbnail
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_Media_Extension_MediaThumbnail The profile thumbnail
-     */
-    public function getThumbnail()
-    {
-        if (($this->getMajorProtocolVersion() == null) ||
-           ($this->getMajorProtocolVersion() == 1)) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException('The getThumbnail ' .
-                ' method is only supported as of version 2 of the YouTube ' .
-                'API.');
-        } else {
-            return $this->_thumbnail;
-        }
-    }
-
-    /**
-     * Sets the age
-     *
-     * @param Zend_Gdata_YouTube_Extension_Age $age The age
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setAge($age = null)
-    {
-        $this->_age = $age;
-        return $this;
-    }
-
-    /**
-     * Returns the age
-     *
-     * @return Zend_Gdata_YouTube_Extension_Age  The age
-     */
-    public function getAge()
-    {
-        return $this->_age;
-    }
-
-    /**
-     * Sets the username
-     *
-     * @param Zend_Gdata_YouTube_Extension_Username $username The username
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setUsername($username = null)
-    {
-        $this->_username = $username;
-        return $this;
-    }
-
-    /**
-     * Returns the username
-     *
-     * @return Zend_Gdata_YouTube_Extension_Username  The username
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Sets the books
-     *
-     * @param Zend_Gdata_YouTube_Extension_Books $books The books
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setBooks($books = null)
-    {
-        $this->_books = $books;
-        return $this;
-    }
-
-    /**
-     * Returns the books
-     *
-     * @return Zend_Gdata_YouTube_Extension_Books  The books
-     */
-    public function getBooks()
-    {
-        return $this->_books;
-    }
-
-    /**
-     * Sets the company
-     *
-     * @param Zend_Gdata_YouTube_Extension_Company $company The company
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setCompany($company = null)
-    {
-        $this->_company = $company;
-        return $this;
-    }
-
-    /**
-     * Returns the company
-     *
-     * @return Zend_Gdata_YouTube_Extension_Company  The company
-     */
-    public function getCompany()
-    {
-        return $this->_company;
-    }
-
-    /**
-     * Sets the hobbies
-     *
-     * @param Zend_Gdata_YouTube_Extension_Hobbies $hobbies The hobbies
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setHobbies($hobbies = null)
-    {
-        $this->_hobbies = $hobbies;
-        return $this;
-    }
-
-    /**
-     * Returns the hobbies
-     *
-     * @return Zend_Gdata_YouTube_Extension_Hobbies  The hobbies
-     */
-    public function getHobbies()
-    {
-        return $this->_hobbies;
-    }
-
-    /**
-     * Sets the hometown
-     *
-     * @param Zend_Gdata_YouTube_Extension_Hometown $hometown The hometown
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setHometown($hometown = null)
-    {
-        $this->_hometown = $hometown;
-        return $this;
-    }
-
-    /**
-     * Returns the hometown
-     *
-     * @return Zend_Gdata_YouTube_Extension_Hometown  The hometown
-     */
-    public function getHometown()
-    {
-        return $this->_hometown;
-    }
-
-    /**
-     * Sets the location
-     *
-     * @param Zend_Gdata_YouTube_Extension_Location $location The location
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setLocation($location = null)
-    {
-        $this->_location = $location;
-        return $this;
-    }
-
-    /**
-     * Returns the location
-     *
-     * @return Zend_Gdata_YouTube_Extension_Location  The location
-     */
-    public function getLocation()
-    {
-        return $this->_location;
-    }
-
-    /**
-     * Sets the movies
-     *
-     * @param Zend_Gdata_YouTube_Extension_Movies $movies The movies
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setMovies($movies = null)
-    {
-        $this->_movies = $movies;
-        return $this;
-    }
-
-    /**
-     * Returns the movies
-     *
-     * @return Zend_Gdata_YouTube_Extension_Movies  The movies
-     */
-    public function getMovies()
-    {
-        return $this->_movies;
-    }
-
-    /**
-     * Sets the music
-     *
-     * @param Zend_Gdata_YouTube_Extension_Music $music The music
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setMusic($music = null)
-    {
-        $this->_music = $music;
-        return $this;
-    }
-
-    /**
-     * Returns the music
-     *
-     * @return Zend_Gdata_YouTube_Extension_Music  The music
-     */
-    public function getMusic()
-    {
-        return $this->_music;
-    }
-
-    /**
-     * Sets the occupation
-     *
-     * @param Zend_Gdata_YouTube_Extension_Occupation $occupation The occupation
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setOccupation($occupation = null)
-    {
-        $this->_occupation = $occupation;
-        return $this;
-    }
-
-    /**
-     * Returns the occupation
-     *
-     * @return Zend_Gdata_YouTube_Extension_Occupation  The occupation
-     */
-    public function getOccupation()
-    {
-        return $this->_occupation;
-    }
-
-    /**
-     * Sets the school
-     *
-     * @param Zend_Gdata_YouTube_Extension_School $school The school
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setSchool($school = null)
-    {
-        $this->_school = $school;
-        return $this;
-    }
-
-    /**
-     * Returns the school
-     *
-     * @return Zend_Gdata_YouTube_Extension_School  The school
-     */
-    public function getSchool()
-    {
-        return $this->_school;
-    }
-
-    /**
-     * Sets the gender
-     *
-     * @param Zend_Gdata_YouTube_Extension_Gender $gender The gender
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setGender($gender = null)
-    {
-        $this->_gender = $gender;
-        return $this;
-    }
-
-    /**
-     * Returns the gender
-     *
-     * @return Zend_Gdata_YouTube_Extension_Gender  The gender
-     */
-    public function getGender()
-    {
-        return $this->_gender;
-    }
-
-    /**
-     * Sets the relationship
-     *
-     * @param Zend_Gdata_YouTube_Extension_Relationship $relationship The relationship
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setRelationship($relationship = null)
-    {
-        $this->_relationship = $relationship;
-        return $this;
-    }
-
-    /**
-     * Returns the relationship
-     *
-     * @return Zend_Gdata_YouTube_Extension_Relationship  The relationship
-     */
-    public function getRelationship()
-    {
-        return $this->_relationship;
-    }
-
-    /**
-     * Sets the array of embedded feeds related to the video
-     *
-     * @param array $feedLink The array of embedded feeds relating to the video
-     * @return Zend_Gdata_YouTube_UserProfileEntry Provides a fluent interface
-     */
-    public function setFeedLink($feedLink = null)
-    {
-        $this->_feedLink = $feedLink;
-        return $this;
-    }
-
-    /**
-     * Get the feed link property for this entry.
-     *
-     * @see setFeedLink
-     * @param string $rel (optional) The rel value of the link to be found.
-     *          If null, the array of links is returned.
-     * @return mixed If $rel is specified, a Zend_Gdata_Extension_FeedLink
-     *          object corresponding to the requested rel value is returned
-     *          if found, or null if the requested value is not found. If
-     *          $rel is null or not specified, an array of all available
-     *          feed links for this entry is returned, or null if no feed
-     *          links are set.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL in the gd:feedLink with the provided rel value
-     *
-     * @param string $rel The rel value to find
-     * @return mixed Either the URL as a string or null if a feedLink wasn't
-     *     found with the provided rel value
-     */
-    public function getFeedLinkHref($rel)
-    {
-        $feedLink = $this->getFeedLink($rel);
-        if ($feedLink !== null) {
-            return $feedLink->href;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the URL of the playlist list feed
-     *
-     * @return string The URL of the playlist video feed
-     */
-    public function getPlaylistListFeedUrl()
-    {
-        return $this->getFeedLinkHref(Zend_Gdata_YouTube::USER_PLAYLISTS_REL);
-    }
-
-    /**
-     * Returns the URL of the uploads feed
-     *
-     * @return string The URL of the uploads video feed
-     */
-    public function getUploadsFeedUrl()
-    {
-        return $this->getFeedLinkHref(Zend_Gdata_YouTube::USER_UPLOADS_REL);
-    }
-
-    /**
-     * Returns the URL of the subscriptions feed
-     *
-     * @return string The URL of the subscriptions feed
-     */
-    public function getSubscriptionsFeedUrl()
-    {
-        return $this->getFeedLinkHref(Zend_Gdata_YouTube::USER_SUBSCRIPTIONS_REL);
-    }
-
-    /**
-     * Returns the URL of the contacts feed
-     *
-     * @return string The URL of the contacts feed
-     */
-    public function getContactsFeedUrl()
-    {
-        return $this->getFeedLinkHref(Zend_Gdata_YouTube::USER_CONTACTS_REL);
-    }
-
-    /**
-     * Returns the URL of the favorites feed
-     *
-     * @return string The URL of the favorites feed
-     */
-    public function getFavoritesFeedUrl()
-    {
-        return $this->getFeedLinkHref(Zend_Gdata_YouTube::USER_FAVORITES_REL);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/VideoEntry.php b/airtime_mvc/library/Zend/Gdata/YouTube/VideoEntry.php
deleted file mode 100644
index 207106b4b..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/VideoEntry.php
+++ /dev/null
@@ -1,1095 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Extension_Comments
- */
-require_once 'Zend/Gdata/Extension/Comments.php';
-
-/**
- * @see Zend_Gdata_Extension_FeedLink
- */
-require_once 'Zend/Gdata/Extension/FeedLink.php';
-
-/**
- * @see Zend_Gdata_YouTube_MediaEntry
- */
-require_once 'Zend/Gdata/YouTube/MediaEntry.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_MediaGroup
- */
-require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_NoEmbed
- */
-require_once 'Zend/Gdata/YouTube/Extension/NoEmbed.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Statistics
- */
-require_once 'Zend/Gdata/YouTube/Extension/Statistics.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Link
- */
-require_once 'Zend/Gdata/YouTube/Extension/Link.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Racy
- */
-require_once 'Zend/Gdata/YouTube/Extension/Racy.php';
-
-/**
- * @see Zend_Gdata_Extension_Rating
- */
-require_once 'Zend/Gdata/Extension/Rating.php';
-
-/**
- * @see Zend_Gdata_Geo_Extension_GeoRssWhere
- */
-require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Control
- */
-require_once 'Zend/Gdata/YouTube/Extension/Control.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Recorded
- */
-require_once 'Zend/Gdata/YouTube/Extension/Recorded.php';
-
-/**
- * @see Zend_Gdata_YouTube_Extension_Location
- */
-require_once 'Zend/Gdata/YouTube/Extension/Location.php';
-
-/**
- * Represents the YouTube video flavor of an Atom entry
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry
-{
-
-    const YOUTUBE_DEVELOPER_TAGS_SCHEMA = 'http://gdata.youtube.com/schemas/2007/developertags.cat';
-    const YOUTUBE_CATEGORY_SCHEMA = 'http://gdata.youtube.com/schemas/2007/categories.cat';
-    protected $_entryClassName = 'Zend_Gdata_YouTube_VideoEntry';
-
-    /**
-     * If null, the video can be embedded
-     *
-     * @var Zend_Gdata_YouTube_Extension_NoEmbed|null
-     */
-    protected $_noEmbed = null;
-
-    /**
-     * Specifies the statistics relating to the video.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Statistics
-     */
-    protected $_statistics = null;
-
-    /**
-     * If not null, specifies that the video has racy content.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Racy|null
-     */
-    protected $_racy = null;
-
-    /**
-     * If not null, specifies that the video is private.
-     *
-     * @var Zend_Gdata_YouTube_Extension_Private|null
-     */
-    protected $_private = null;
-
-    /**
-     * Specifies the video's rating.
-     *
-     * @var Zend_Gdata_Extension_Rating
-     */
-    protected $_rating = null;
-
-    /**
-     * Specifies the comments associated with a video.
-     *
-     * @var Zend_Gdata_Extensions_Comments
-     */
-    protected $_comments = null;
-
-    /**
-     * Nested feed links
-     *
-     * @var array
-     */
-    protected $_feedLink = array();
-
-    /**
-     * Geo location for the video
-     *
-     * @var Zend_Gdata_Geo_Extension_GeoRssWhere
-     */
-    protected $_where = null;
-
-    /**
-     * Recording date for the video
-     *
-     * @var Zend_Gdata_YouTube_Extension_Recorded|null
-     */
-    protected $_recorded = null;
-
-    /**
-     * Location informtion for the video
-     *
-     * @var Zend_Gdata_YouTube_Extension_Location|null
-     */
-    protected $_location = null;
-
-    /**
-     * Creates a Video entry, representing an individual video
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-    /**
-     * Retrieves a DOMElement which corresponds to this element and all
-     * child properties.  This is used to build an entry back into a DOM
-     * and eventually XML text for sending to the server upon updates, or
-     * for application storage/persistence.
-     *
-     * @param DOMDocument $doc The DOMDocument used to construct DOMElements
-     * @return DOMElement The DOMElement representing this element and all
-     * child properties.
-     */
-    public function getDOM($doc = null, $majorVersion = 1, $minorVersion = null)
-    {
-        $element = parent::getDOM($doc, $majorVersion, $minorVersion);
-        if ($this->_noEmbed != null) {
-            $element->appendChild($this->_noEmbed->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_statistics != null) {
-            $element->appendChild($this->_statistics->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_racy != null) {
-            $element->appendChild($this->_racy->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_recorded != null) {
-            $element->appendChild($this->_recorded->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_location != null) {
-            $element->appendChild($this->_location->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_rating != null) {
-            $element->appendChild($this->_rating->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_comments != null) {
-            $element->appendChild($this->_comments->getDOM(
-                $element->ownerDocument));
-        }
-        if ($this->_feedLink != null) {
-            foreach ($this->_feedLink as $feedLink) {
-                $element->appendChild($feedLink->getDOM(
-                    $element->ownerDocument));
-            }
-        }
-        if ($this->_where != null) {
-           $element->appendChild($this->_where->getDOM(
-                $element->ownerDocument));
-        }
-        return $element;
-    }
-
-    /**
-     * Creates individual Entry objects of the appropriate type and
-     * stores them in the $_entry array based upon DOM data.
-     *
-     * @param DOMNode $child The DOMNode to process
-     */
-    protected function takeChildFromDOM($child)
-    {
-        $absoluteNodeName = $child->namespaceURI . ':' . $child->localName;
-
-        switch ($absoluteNodeName) {
-        case $this->lookupNamespace('yt') . ':' . 'statistics':
-            $statistics = new Zend_Gdata_YouTube_Extension_Statistics();
-            $statistics->transferFromDOM($child);
-            $this->_statistics = $statistics;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'racy':
-            $racy = new Zend_Gdata_YouTube_Extension_Racy();
-            $racy->transferFromDOM($child);
-            $this->_racy = $racy;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'recorded':
-            $recorded = new Zend_Gdata_YouTube_Extension_Recorded();
-            $recorded->transferFromDOM($child);
-            $this->_recorded = $recorded;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'location':
-            $location = new Zend_Gdata_YouTube_Extension_Location();
-            $location->transferFromDOM($child);
-            $this->_location = $location;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'rating':
-            $rating = new Zend_Gdata_Extension_Rating();
-            $rating->transferFromDOM($child);
-            $this->_rating = $rating;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'comments':
-            $comments = new Zend_Gdata_Extension_Comments();
-            $comments->transferFromDOM($child);
-            $this->_comments = $comments;
-            break;
-        case $this->lookupNamespace('yt') . ':' . 'noembed':
-            $noEmbed = new Zend_Gdata_YouTube_Extension_NoEmbed();
-            $noEmbed->transferFromDOM($child);
-            $this->_noEmbed = $noEmbed;
-            break;
-        case $this->lookupNamespace('gd') . ':' . 'feedLink':
-            $feedLink = new Zend_Gdata_Extension_FeedLink();
-            $feedLink->transferFromDOM($child);
-            $this->_feedLink[] = $feedLink;
-            break;
-        case $this->lookupNamespace('georss') . ':' . 'where':
-            $where = new Zend_Gdata_Geo_Extension_GeoRssWhere();
-            $where->transferFromDOM($child);
-            $this->_where = $where;
-            break;
-        case $this->lookupNamespace('atom') . ':' . 'link';
-            $link = new Zend_Gdata_YouTube_Extension_Link();
-            $link->transferFromDOM($child);
-            $this->_link[] = $link;
-            break;
-        case $this->lookupNamespace('app') . ':' . 'control':
-            $control = new Zend_Gdata_YouTube_Extension_Control();
-            $control->transferFromDOM($child);
-            $this->_control = $control;
-            break;
-        default:
-            parent::takeChildFromDOM($child);
-            break;
-        }
-    }
-
-    /**
-     * Sets when the video was recorded.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Recorded $recorded When the video was recorded
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setRecorded($recorded = null)
-    {
-        $this->_recorded = $recorded;
-        return $this;
-    }
-
-    /**
-     * Gets the date that the video was recorded.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Recorded|null
-     */
-    public function getRecorded()
-    {
-        return $this->_recorded;
-    }
-
-    /**
-     * Sets the location information.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Location $location Where the video
-     *        was recorded
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setLocation($location = null)
-    {
-        $this->_location = $location;
-        return $this;
-    }
-
-    /**
-     * Gets the location where the video was recorded.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Location|null
-     */
-    public function getLocation()
-    {
-        return $this->_location;
-    }
-
-    /**
-     * If an instance of Zend_Gdata_YouTube_Extension_NoEmbed is passed in,
-     * the video cannot be embedded.  Otherwise, if null is passsed in, the
-     * video is able to be embedded.
-     *
-     * @param Zend_Gdata_YouTube_Extension_NoEmbed $noEmbed Whether or not the
-     *          video can be embedded.
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setNoEmbed($noEmbed = null)
-    {
-        $this->_noEmbed = $noEmbed;
-        return $this;
-    }
-
-    /**
-     * If the return value is an instance of
-     * Zend_Gdata_YouTube_Extension_NoEmbed, this video cannot be embedded.
-     *
-     * @return Zend_Gdata_YouTube_Extension_NoEmbed|null Whether or not the video can be embedded
-     */
-    public function getNoEmbed()
-    {
-        return $this->_noEmbed;
-    }
-
-    /**
-     * Checks whether the video is embeddable.
-     *
-     * @return bool Returns true if the video is embeddable.
-     */
-    public function isVideoEmbeddable()
-    {
-        if ($this->getNoEmbed() == null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets the statistics relating to the video.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Statistics $statistics The statistics relating to the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setStatistics($statistics = null)
-    {
-        $this->_statistics = $statistics;
-        return $this;
-    }
-
-    /**
-     * Returns the statistics relating to the video.
-     *
-     * @return Zend_Gdata_YouTube_Extension_Statistics  The statistics relating to the video
-     */
-    public function getStatistics()
-    {
-        return $this->_statistics;
-    }
-
-    /**
-     * Specifies that the video has racy content.
-     *
-     * @param Zend_Gdata_YouTube_Extension_Racy $racy The racy flag object
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setRacy($racy = null)
-    {
-        if ($this->getMajorProtocolVersion() == 2) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException(
-                'Calling getRacy() on a YouTube VideoEntry is deprecated ' .
-                'as of version 2 of the API.');
-        }
-
-        $this->_racy = $racy;
-        return $this;
-    }
-
-    /**
-     * Returns the racy flag object.
-     *
-     * @throws Zend_Gdata_App_VersionException
-     * @return Zend_Gdata_YouTube_Extension_Racy|null  The racy flag object
-     */
-    public function getRacy()
-    {
-        if ($this->getMajorProtocolVersion() == 2) {
-            require_once 'Zend/Gdata/App/VersionException.php';
-            throw new Zend_Gdata_App_VersionException(
-                'Calling getRacy() on a YouTube VideoEntry is deprecated ' .
-                'as of version 2 of the API.');
-        }
-        return $this->_racy;
-    }
-
-    /**
-     * Sets the rating relating to the video.
-     *
-     * @param Zend_Gdata_Extension_Rating $rating The rating relating to the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setRating($rating = null)
-    {
-        $this->_rating = $rating;
-        return $this;
-    }
-
-    /**
-     * Returns the rating relating to the video.
-     *
-     * @return Zend_Gdata_Extension_Rating  The rating relating to the video
-     */
-    public function getRating()
-    {
-        return $this->_rating;
-    }
-
-    /**
-     * Sets the comments relating to the video.
-     *
-     * @param Zend_Gdata_Extension_Comments $comments The comments relating to the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setComments($comments = null)
-    {
-        $this->_comments = $comments;
-        return $this;
-    }
-
-    /**
-     * Returns the comments relating to the video.
-     *
-     * @return Zend_Gdata_Extension_Comments  The comments relating to the video
-     */
-    public function getComments()
-    {
-        return $this->_comments;
-    }
-
-    /**
-     * Sets the array of embedded feeds related to the video
-     *
-     * @param array $feedLink The array of embedded feeds relating to the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setFeedLink($feedLink = null)
-    {
-        $this->_feedLink = $feedLink;
-        return $this;
-    }
-
-    /**
-     * Get the feed link property for this entry.
-     *
-     * @see setFeedLink
-     * @param string $rel (optional) The rel value of the link to be found.
-     *          If null, the array of links is returned.
-     * @return mixed If $rel is specified, a Zend_Gdata_Extension_FeedLink
-     *          object corresponding to the requested rel value is returned
-     *          if found, or null if the requested value is not found. If
-     *          $rel is null or not specified, an array of all available
-     *          feed links for this entry is returned, or null if no feed
-     *          links are set.
-     */
-    public function getFeedLink($rel = null)
-    {
-        if ($rel == null) {
-            return $this->_feedLink;
-        } else {
-            foreach ($this->_feedLink as $feedLink) {
-                if ($feedLink->rel == $rel) {
-                    return $feedLink;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Returns the link element relating to video responses.
-     *
-     * @return Zend_Gdata_App_Extension_Link
-     */
-    public function getVideoResponsesLink()
-    {
-        return $this->getLink(Zend_Gdata_YouTube::VIDEO_RESPONSES_REL);
-    }
-
-    /**
-     * Returns the link element relating to video ratings.
-     *
-     * @return Zend_Gdata_App_Extension_Link
-     */
-    public function getVideoRatingsLink()
-    {
-        return $this->getLink(Zend_Gdata_YouTube::VIDEO_RATINGS_REL);
-    }
-
-    /**
-     * Returns the link element relating to video complaints.
-     *
-     * @return Zend_Gdata_App_Extension_Link
-     */
-    public function getVideoComplaintsLink()
-    {
-        return $this->getLink(Zend_Gdata_YouTube::VIDEO_COMPLAINTS_REL);
-    }
-
-    /**
-     * Gets the YouTube video ID based upon the atom:id value
-     *
-     * @return string The video ID
-     */
-    public function getVideoId()
-    {
-        if ($this->getMajorProtocolVersion() == 2) {
-            $videoId = $this->getMediaGroup()->getVideoId()->text;
-        } else {
-            $fullId = $this->getId()->getText();
-            $position = strrpos($fullId, '/');
-            if ($position === false) {
-                require_once 'Zend/Gdata/App/Exception.php';
-                throw new Zend_Gdata_App_Exception(
-                    'Slash not found in atom:id of ' . $fullId);
-            } else {
-                $videoId = substr($fullId, $position + 1);
-            }
-        }
-        return $videoId;
-    }
-
-    /**
-     * Gets the date that the video was recorded.
-     *
-     * @return string|null The date that the video was recorded
-     */
-    public function getVideoRecorded()
-    {
-        $recorded = $this->getRecorded();
-        if ($recorded != null) {
-          return $recorded->getText();
-        } else {
-          return null;
-        }
-    }
-
-    /**
-     * Sets the date that the video was recorded.
-     *
-     * @param string $recorded The date that the video was recorded, in the
-     *          format of '2001-06-19'
-     */
-    public function setVideoRecorded($recorded)
-    {
-        $this->setRecorded(
-            new Zend_Gdata_YouTube_Extension_Recorded($recorded));
-        return $this;
-    }
-
-    /**
-     * Gets the georss:where element
-     *
-     * @return Zend_Gdata_Geo_Extension_GeoRssWhere
-     */
-    public function getWhere()
-    {
-        return $this->_where;
-    }
-
-    /**
-     * Sets the georss:where element
-     *
-     * @param Zend_Gdata_Geo_Extension_GeoRssWhere $value The georss:where class value
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setWhere($value)
-    {
-        $this->_where = $value;
-        return $this;
-    }
-
-    /**
-     * Gets the title of the video as a string.  null is returned
-     * if the video title is not available.
-     *
-     * @return string|null The title of the video
-     */
-    public function getVideoTitle()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getTitle() != null) {
-            return $this->getMediaGroup()->getTitle()->getText();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the title of the video as a string.
-     *
-     * @param string $title Title for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoTitle($title)
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $this->getMediaGroup()->setTitle(
-            new Zend_Gdata_Media_Extension_MediaTitle($title));
-        return $this;
-    }
-
-    /**
-     * Sets the description of the video as a string.
-     *
-     * @param string $description Description for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoDescription($description)
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $this->getMediaGroup()->setDescription(
-            new Zend_Gdata_Media_Extension_MediaDescription($description));
-        return $this;
-    }
-
-
-    /**
-     * Gets the description  of the video as a string.  null is returned
-     * if the video description is not available.
-     *
-     * @return string|null The description of the video
-     */
-    public function getVideoDescription()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getDescription() != null) {
-            return $this->getMediaGroup()->getDescription()->getText();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the URL of the YouTube video watch page.  null is returned
-     * if the video watch page URL is not available.
-     *
-     * @return string|null The URL of the YouTube video watch page
-     */
-    public function getVideoWatchPageUrl()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getPlayer() != null &&
-             array_key_exists(0, $this->getMediaGroup()->getPlayer())) {
-            $players = $this->getMediaGroup()->getPlayer();
-            return $players[0]->getUrl();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets an array of the thumbnails representing the video.
-     * Each thumbnail is an element of the array, and is an
-     * array of the thumbnail properties - time, height, width,
-     * and url.  For convient usage inside a foreach loop, an
-     * empty array is returned if there are no thumbnails.
-     *
-     * @return array An array of video thumbnails.
-     */
-    public function getVideoThumbnails()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getThumbnail() != null) {
-
-            $thumbnailArray = array();
-
-            foreach ($this->getMediaGroup()->getThumbnail() as $thumbnailObj) {
-                $thumbnail = array();
-                $thumbnail['time'] = $thumbnailObj->time;
-                $thumbnail['height'] = $thumbnailObj->height;
-                $thumbnail['width'] = $thumbnailObj->width;
-                $thumbnail['url'] = $thumbnailObj->url;
-                $thumbnailArray[] = $thumbnail;
-            }
-            return $thumbnailArray;
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Gets the URL of the flash player SWF.  null is returned if the
-     * duration value is not available.
-     *
-     * @return string|null The URL of the flash player SWF
-     */
-    public function getFlashPlayerUrl()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        foreach ($this->getMediaGroup()->getContent() as $content) {
-                if ($content->getType() === 'application/x-shockwave-flash') {
-                    return $content->getUrl();
-                }
-            }
-        return null;
-    }
-
-    /**
-     * Gets the duration of the video, in seconds.  null is returned
-     * if the duration value is not available.
-     *
-     * @return string|null The duration of the video, in seconds.
-     */
-    public function getVideoDuration()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getDuration() != null) {
-            return $this->getMediaGroup()->getDuration()->getSeconds();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Checks whether the video is private.
-     *
-     * @return bool Return true if video is private
-     */
-    public function isVideoPrivate()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getPrivate() != null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets video to private.
-     *
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoPrivate()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $this->getMediaGroup()->setPrivate(new Zend_Gdata_YouTube_Extension_Private());
-        return $this;
-    }
-
-    /**
-     * Sets a private video to be public.
-     *
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoPublic()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $this->getMediaGroup()->private = null;
-        return $this;
-    }
-
-    /**
-     * Gets an array of the tags assigned to this video.  For convient
-     * usage inside a foreach loop, an empty array is returned when there
-     * are no tags assigned.
-     *
-     * @return array An array of the tags assigned to this video
-     */
-    public function getVideoTags()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        if ($this->getMediaGroup()->getKeywords() != null) {
-
-            $keywords = $this->getMediaGroup()->getKeywords();
-            $keywordsString = $keywords->getText();
-            if (strlen(trim($keywordsString)) > 0) {
-                return preg_split('/(, *)|,/', $keywordsString);
-            }
-        }
-        return array();
-    }
-
-    /**
-     * Sets the keyword tags for a video.
-     *
-     * @param mixed $tags Either a comma-separated string or an array
-     * of tags for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoTags($tags)
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $keywords = new Zend_Gdata_Media_Extension_MediaKeywords();
-        if (is_array($tags)) {
-            $tags = implode(', ', $tags);
-        }
-        $keywords->setText($tags);
-        $this->getMediaGroup()->setKeywords($keywords);
-        return $this;
-    }
-
-    /**
-     * Gets the number of views for this video.  null is returned if the
-     * number of views is not available.
-     *
-     * @return string|null The number of views for this video
-     */
-    public function getVideoViewCount()
-    {
-        if ($this->getStatistics() != null) {
-            return $this->getStatistics()->getViewCount();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the location specified for this video, if available.  The location
-     * is returned as an array containing the keys 'longitude' and 'latitude'.
-     * null is returned if the location is not available.
-     *
-     * @return array|null The location specified for this video
-     */
-    public function getVideoGeoLocation()
-    {
-        if ($this->getWhere() != null &&
-            $this->getWhere()->getPoint() != null &&
-            ($position = $this->getWhere()->getPoint()->getPos()) != null) {
-
-            $positionString = $position->__toString();
-
-            if (strlen(trim($positionString)) > 0) {
-                $positionArray = explode(' ', trim($positionString));
-                if (count($positionArray) == 2) {
-                    $returnArray = array();
-                    $returnArray['latitude'] = $positionArray[0];
-                    $returnArray['longitude'] = $positionArray[1];
-                    return $returnArray;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Gets the rating information for this video, if available.  The rating
-     * is returned as an array containing the keys 'average' and 'numRaters'.
-     * null is returned if the rating information is not available.
-     *
-     * @return array|null The rating information for this video
-     */
-    public function getVideoRatingInfo()
-    {
-        if ($this->getRating() != null) {
-            $returnArray = array();
-            $returnArray['average'] = $this->getRating()->getAverage();
-            $returnArray['numRaters'] = $this->getRating()->getNumRaters();
-            return $returnArray;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the category of this video, if available.  The category is returned
-     * as a string. Valid categories are found at:
-     * http://gdata.youtube.com/schemas/2007/categories.cat
-     * If the category is not set, null is returned.
-     *
-     * @return string|null The category of this video
-     */
-    public function getVideoCategory()
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $categories = $this->getMediaGroup()->getCategory();
-        if ($categories != null) {
-            foreach($categories as $category) {
-                if ($category->getScheme() == self::YOUTUBE_CATEGORY_SCHEMA) {
-                    return $category->getText();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets the category of the video as a string.
-     *
-     * @param string $category Categories for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoCategory($category)
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $this->getMediaGroup()->setCategory(array(new Zend_Gdata_Media_Extension_MediaCategory($category, self::YOUTUBE_CATEGORY_SCHEMA)));
-        return $this;
-    }
-
-    /**
-     * Gets the developer tags for the video, if available and if client is
-     * authenticated with a valid developerKey. The tags are returned
-     * as an array.
-     * If no tags are set, null is returned.
-     *
-     * @return array|null The developer tags for this video or null if none were set.
-     */
-    public function getVideoDeveloperTags()
-    {
-        $developerTags = null;
-        $this->ensureMediaGroupIsNotNull();
-
-        $categoryArray = $this->getMediaGroup()->getCategory();
-        if ($categoryArray != null) {
-            foreach ($categoryArray as $category) {
-                if ($category instanceof Zend_Gdata_Media_Extension_MediaCategory) {
-                    if ($category->getScheme() == self::YOUTUBE_DEVELOPER_TAGS_SCHEMA) {
-                        $developerTags[] = $category->getText();
-                    }
-                }
-            }
-            return $developerTags;
-        }
-        return null;
-    }
-
-    /**
-     * Adds a developer tag to array of tags for the video.
-     *
-     * @param string $developerTag DeveloperTag for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function addVideoDeveloperTag($developerTag)
-    {
-        $this->ensureMediaGroupIsNotNull();
-        $newCategory = new Zend_Gdata_Media_Extension_MediaCategory($developerTag, self::YOUTUBE_DEVELOPER_TAGS_SCHEMA);
-
-        if ($this->getMediaGroup()->getCategory() == null) {
-            $this->getMediaGroup()->setCategory($newCategory);
-        } else {
-            $categories = $this->getMediaGroup()->getCategory();
-            $categories[] = $newCategory;
-            $this->getMediaGroup()->setCategory($categories);
-        }
-        return $this;
-    }
-
-    /**
-     * Set multiple developer tags for the video as strings.
-     *
-     * @param array $developerTags Array of developerTag for the video
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface
-     */
-    public function setVideoDeveloperTags($developerTags)
-    {
-        foreach($developerTags as $developerTag) {
-            $this->addVideoDeveloperTag($developerTag);
-        }
-        return $this;
-    }
-
-
-    /**
-     * Get the current publishing state of the video.
-     *
-     * @return Zend_Gdata_YouTube_Extension_State|null The publishing state of this video
-     */
-    public function getVideoState()
-    {
-        $control = $this->getControl();
-        if ($control != null &&
-            $control->getDraft() != null &&
-            $control->getDraft()->getText() == 'yes') {
-
-            return $control->getState();
-        }
-        return null;
-    }
-
-    /**
-     * Get the VideoEntry's Zend_Gdata_YouTube_Extension_MediaGroup object.
-     * If the mediaGroup does not exist, then set it.
-     *
-     * @return void
-     */
-    public function ensureMediaGroupIsNotNull()
-    {
-        if ($this->getMediagroup() == null) {
-            $this->setMediagroup(new Zend_Gdata_YouTube_Extension_MediaGroup());
-        }
-    }
-
-    /**
-     * Helper function to conveniently set a video's rating.
-     *
-     * @param integer $ratingValue A number representing the rating. Must
-     *          be between 1 and 5 inclusive.
-     * @throws Zend_Gdata_Exception
-     * @return Zend_Gdata_YouTube_VideoEntry Provides a fluent interface.
-     */
-    public function setVideoRating($ratingValue)
-    {
-        if ($ratingValue < 1 || $ratingValue > 5) {
-            require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-            throw new Zend_Gdata_App_InvalidArgumentException(
-                'Rating for video entry must be between 1 and 5 inclusive.');
-        }
-
-         require_once 'Zend/Gdata/Extension/Rating.php';
-         $rating = new Zend_Gdata_Extension_Rating(null, 1, 5, null,
-            $ratingValue);
-        $this->setRating($rating);
-        return $this;
-    }
-
-    /**
-     * Retrieve the URL for a video's comment feed.
-     *
-     * @return string|null The URL if found, or null if not found.
-     */
-    public function getVideoCommentFeedUrl()
-    {
-        $commentsExtension = $this->getComments();
-        $commentsFeedUrl = null;
-        if ($commentsExtension) {
-            $commentsFeedLink = $commentsExtension->getFeedLink();
-            if ($commentsFeedLink) {
-                $commentsFeedUrl = $commentsFeedLink->getHref();
-            }
-        }
-        return $commentsFeedUrl;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/VideoFeed.php b/airtime_mvc/library/Zend/Gdata/YouTube/VideoFeed.php
deleted file mode 100644
index 4f51bbd3d..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/VideoFeed.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Gdata_Media_Feed
- */
-require_once 'Zend/Gdata/Media/Feed.php';
-
-/**
- * @see Zend_Gdata_YouTube_VideoEntry
- */
-require_once 'Zend/Gdata/YouTube/VideoEntry.php';
-
-/**
- * The YouTube video flavor of an Atom Feed with media support
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_VideoFeed extends Zend_Gdata_Media_Feed
-{
-
-    /**
-     * The classname for individual feed elements.
-     *
-     * @var string
-     */
-    protected $_entryClassName = 'Zend_Gdata_YouTube_VideoEntry';
-
-    /**
-     * Creates a Video feed, representing a list of videos
-     *
-     * @param DOMElement $element (optional) DOMElement from which this
-     *          object should be constructed.
-     */
-    public function __construct($element = null)
-    {
-        $this->registerAllNamespaces(Zend_Gdata_YouTube::$namespaces);
-        parent::__construct($element);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Gdata/YouTube/VideoQuery.php b/airtime_mvc/library/Zend/Gdata/YouTube/VideoQuery.php
deleted file mode 100644
index 75d8ed99d..000000000
--- a/airtime_mvc/library/Zend/Gdata/YouTube/VideoQuery.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoQuery.php 20097 2010-01-06 15:40:27Z bate $
- */
-
-/**
- * Zend_Gdata_YouTube
- */
-require_once('Zend/Gdata/YouTube.php');
-
-/**
- * Zend_Gdata_Query
- */
-require_once('Zend/Gdata/Query.php');
-
-/**
- * Assists in constructing queries for YouTube videos
- *
- * @link http://code.google.com/apis/youtube/
- *
- * @category   Zend
- * @package    Zend_Gdata
- * @subpackage YouTube
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query
-{
-
-    /**
-     * Create Gdata_YouTube_VideoQuery object
-     */
-    public function __construct($url = null)
-    {
-        parent::__construct($url);
-    }
-
-    /**
-     * Sets the type of feed this query should be used to search
-     *
-     * @param string $feedType The type of feed
-     * @param string $videoId The ID of the video associated with this query
-     * @param string $entry The ID of the entry associated with this query
-     */
-    public function setFeedType($feedType, $videoId = null, $entry = null)
-    {
-        switch ($feedType) {
-        case 'top rated':
-            $this->_url = Zend_Gdata_YouTube::STANDARD_TOP_RATED_URI;
-            break;
-        case 'most viewed':
-            $this->_url = Zend_Gdata_YouTube::STANDARD_MOST_VIEWED_URI;
-            break;
-        case 'recently featured':
-            $this->_url = Zend_Gdata_YouTube::STANDARD_RECENTLY_FEATURED_URI;
-            break;
-        case 'mobile':
-            $this->_url = Zend_Gdata_YouTube::STANDARD_WATCH_ON_MOBILE_URI;
-            break;
-        case 'related':
-            if ($videoId === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Video ID must be set for feed of type: ' . $feedType);
-            } else {
-                $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' . $videoId .
-                    '/related';
-            }
-            break;
-        case 'responses':
-            if ($videoId === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_Exception(
-                    'Video ID must be set for feed of type: ' . $feedType);
-            } else {
-                $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' . $videoId .
-                    'responses';
-            }
-            break;
-        case 'comments':
-            if ($videoId === null) {
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_Exception(
-                    'Video ID must be set for feed of type: ' . $feedType);
-            } else {
-                $this->_url = Zend_Gdata_YouTube::VIDEO_URI . '/' .
-                    $videoId . 'comments';
-                if ($entry !== null) {
-                    $this->_url .= '/' . $entry;
-                }
-            }
-            break;
-        default:
-            require_once 'Zend/Gdata/App/Exception.php';
-            throw new Zend_Gdata_App_Exception('Unknown feed type');
-            break;
-        }
-    }
-
-    /**
-     * Sets the location parameter for the query
-     *
-     * @param string $value
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setLocation($value)
-    {
-        switch($value) {
-            case null:
-                unset($this->_params['location']);
-            default:
-                $parameters = explode(',', $value);
-                if (count($parameters) != 2) {
-                    require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                    throw new Zend_Gdata_App_InvalidArgumentException(
-                        'You must provide 2 coordinates to the location ' .
-                        'URL parameter');
-                }
-
-                foreach($parameters as $param) {
-                    $temp = trim($param);
-                    // strip off the optional exclamation mark for numeric check
-                    if (substr($temp, -1) == '!') {
-                        $temp = substr($temp, 0, -1);
-                    }
-                    if (!is_numeric($temp)) {
-                        require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                        throw new Zend_Gdata_App_InvalidArgumentException(
-                            'Value provided to location parameter must' .
-                            ' be in the form of two coordinates');
-                    }
-                }
-                $this->_params['location'] = $value;
-        }
-    }
-
-    /**
-     * Get the value of the location parameter
-     *
-     * @return string|null Return the location if it exists, null otherwise.
-     */
-    public function getLocation()
-    {
-        if (array_key_exists('location', $this->_params)) {
-            return $this->_params['location'];
-        } else {
-            return null;
-        }
-    }
-
-
-    /**
-     * Sets the location-radius parameter for the query
-     *
-     * @param string $value
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setLocationRadius($value)
-    {
-        switch($value) {
-            case null:
-                unset($this->_params['location-radius']);
-            default:
-                $this->_params['location-radius'] = $value;
-        }
-    }
-
-    /**
-     * Get the value of the location-radius parameter
-     *
-     * @return string|null Return the location-radius if it exists,
-     * null otherwise.
-     */
-    public function getLocationRadius()
-    {
-        if (array_key_exists('location-radius', $this->_params)) {
-            return $this->_params['location-radius'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the time period over which this query should apply
-     *
-     * @param string $value
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setTime($value = null)
-    {
-        switch ($value) {
-            case 'today':
-                $this->_params['time'] = 'today';
-                break;
-            case 'this_week':
-                $this->_params['time'] = 'this_week';
-                break;
-            case 'this_month':
-                $this->_params['time'] = 'this_month';
-                break;
-            case 'all_time':
-                $this->_params['time'] = 'all_time';
-                break;
-            case null:
-                unset($this->_params['time']);
-            default:
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Unknown time value');
-                break;
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the value of the uploader parameter
-     *
-     * @param string $value The value of the uploader parameter. Currently this
-     *        can only be set to the value of 'partner'.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setUploader($value = null)
-    {
-        switch ($value) {
-            case 'partner':
-                $this->_params['uploader'] = 'partner';
-                break;
-            case null:
-                unset($this->_params['uploader']);
-                break;
-            default:
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'Unknown value for uploader');
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the formatted video query (vq) URL param value
-     *
-     * @param string $value
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setVideoQuery($value = null)
-    {
-        if ($value != null) {
-            $this->_params['vq'] = $value;
-        } else {
-            unset($this->_params['vq']);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the param to return videos of a specific format
-     *
-     * @param string $value
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setFormat($value = null)
-    {
-        if ($value != null) {
-            $this->_params['format'] = $value;
-        } else {
-            unset($this->_params['format']);
-        }
-        return $this;
-    }
-
-    /**
-     * Sets whether or not to include racy videos in the search results
-     *
-     * @param string $value
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setRacy($value = null)
-    {
-        switch ($value) {
-            case 'include':
-                $this->_params['racy'] = $value;
-                break;
-            case 'exclude':
-                $this->_params['racy'] = $value;
-                break;
-            case null:
-                unset($this->_params['racy']);
-                break;
-        }
-        return $this;
-    }
-
-    /**
-     * Whether or not to include racy videos in the search results
-     *
-     * @return string|null The value of racy if it exists, null otherwise.
-     */
-    public function getRacy()
-    {
-        if (array_key_exists('racy', $this->_params)) {
-            return $this->_params['racy'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set the safeSearch parameter
-     *
-     * @param string $value The value of the parameter, currently only 'none',
-     *        'moderate' or 'strict' are allowed values.
-     * @throws Zend_Gdata_App_InvalidArgumentException
-     * @return Zend_Gdata_YouTube_VideoQuery Provides a fluent interface
-     */
-    public function setSafeSearch($value)
-    {
-        switch ($value) {
-            case 'none':
-                $this->_params['safeSearch'] = 'none';
-                break;
-            case 'moderate':
-                $this->_params['safeSearch'] = 'moderate';
-                break;
-            case 'strict':
-                $this->_params['safeSearch'] = 'strict';
-                break;
-            case null:
-                unset($this->_params['safeSearch']);
-            default:
-                require_once 'Zend/Gdata/App/InvalidArgumentException.php';
-                throw new Zend_Gdata_App_InvalidArgumentException(
-                    'The safeSearch parameter only supports the values '.
-                    '\'none\', \'moderate\' or \'strict\'.');
-        }
-    }
-
-    /**
-     * Return the value of the safeSearch parameter
-     *
-     * @return string|null The value of the safeSearch parameter if it has been
-     *         set, null otherwise.
-     */
-    public function getSafeSearch()
-    {
-        if (array_key_exists('safeSearch', $this->_params)) {
-            return $this->_params['safeSearch'];
-        }
-        return $this;
-    }
-
-    /**
-     * Set the value of the orderby parameter
-     *
-     * @param string $value
-     * @return Zend_Gdata_YouTube_Query Provides a fluent interface
-     */
-    public function setOrderBy($value)
-    {
-        if ($value != null) {
-            $this->_params['orderby'] = $value;
-        } else {
-            unset($this->_params['orderby']);
-        }
-        return $this;
-    }
-
-    /**
-     * Return the value of the format parameter
-     *
-     * @return string|null The value of format if it exists, null otherwise.
-     */
-    public function getFormat()
-    {
-        if (array_key_exists('format', $this->_params)) {
-            return $this->_params['format'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the value of the video query that has been set
-     *
-     * @return string|null The value of the video query if it exists,
-     *         null otherwise.
-     */
-    public function getVideoQuery()
-    {
-        if (array_key_exists('vq', $this->_params)) {
-            return $this->_params['vq'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the value of the time parameter
-     *
-     * @return string|null The time parameter if it exists, null otherwise.
-     */
-    public function getTime()
-    {
-        if (array_key_exists('time', $this->_params)) {
-            return $this->_params['time'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the value of the orderby parameter if it exists
-     *
-     * @return string|null The value of orderby if it exists, null otherwise.
-     */
-    public function getOrderBy()
-    {
-        if (array_key_exists('orderby', $this->_params)) {
-            return $this->_params['orderby'];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Generate the query string from the URL parameters, optionally modifying
-     * them based on protocol version.
-     *
-     * @param integer $majorProtocolVersion The major protocol version
-     * @param integer $minorProtocolVersion The minor protocol version
-     * @throws Zend_Gdata_App_VersionException
-     * @return string querystring
-     */
-    public function getQueryString($majorProtocolVersion = null,
-        $minorProtocolVersion = null)
-    {
-        $queryArray = array();
-
-        foreach ($this->_params as $name => $value) {
-            if (substr($name, 0, 1) == '_') {
-                continue;
-            }
-
-            switch($name) {
-                case 'location-radius':
-                    if ($majorProtocolVersion == 1) {
-                        require_once 'Zend/Gdata/App/VersionException.php';
-                        throw new Zend_Gdata_App_VersionException("The $name " .
-                            "parameter is only supported in version 2.");
-                    }
-                    break;
-
-                case 'racy':
-                    if ($majorProtocolVersion == 2) {
-                        require_once 'Zend/Gdata/App/VersionException.php';
-                        throw new Zend_Gdata_App_VersionException("The $name " .
-                            "parameter is not supported in version 2. " .
-                            "Please use 'safeSearch'.");
-                    }
-                    break;
-
-                case 'safeSearch':
-                    if ($majorProtocolVersion == 1) {
-                        require_once 'Zend/Gdata/App/VersionException.php';
-                        throw new Zend_Gdata_App_VersionException("The $name " .
-                            "parameter is only supported in version 2. " .
-                            "Please use 'racy'.");
-                    }
-                    break;
-
-                case 'uploader':
-                    if ($majorProtocolVersion == 1) {
-                        require_once 'Zend/Gdata/App/VersionException.php';
-                        throw new Zend_Gdata_App_VersionException("The $name " .
-                            "parameter is only supported in version 2.");
-                    }
-                    break;
-
-                case 'vq':
-                    if ($majorProtocolVersion == 2) {
-                        $name = 'q';
-                    }
-                    break;
-            }
-
-            $queryArray[] = urlencode($name) . '=' . urlencode($value);
-
-        }
-        if (count($queryArray) > 0) {
-            return '?' . implode('&', $queryArray);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Returns the generated full query URL, optionally modifying it based on
-     * the protocol version.
-     *
-     * @param integer $majorProtocolVersion The major protocol version
-     * @param integer $minorProtocolVersion The minor protocol version
-     * @return string The URL
-     */
-    public function getQueryUrl($majorProtocolVersion = null,
-        $minorProtocolVersion = null)
-    {
-        if (isset($this->_url)) {
-            $url = $this->_url;
-        } else {
-            $url = Zend_Gdata_YouTube::VIDEO_URI;
-        }
-        if ($this->getCategory() !== null) {
-            $url .= '/-/' . $this->getCategory();
-        }
-        $url = $url . $this->getQueryString($majorProtocolVersion,
-            $minorProtocolVersion);
-        return $url;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Http/Client.php b/airtime_mvc/library/Zend/Http/Client.php
deleted file mode 100644
index d765f51f6..000000000
--- a/airtime_mvc/library/Zend/Http/Client.php
+++ /dev/null
@@ -1,1459 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- * @version    $Id: Client.php 21020 2010-02-11 17:27:23Z shahar $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-
-/**
- * @see Zend_Http_Client_Adapter_Interface
- */
-require_once 'Zend/Http/Client/Adapter/Interface.php';
-
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Http_Response_Stream
- */
-require_once 'Zend/Http/Response/Stream.php';
-
-/**
- * Zend_Http_Client is an implemetation of an HTTP client in PHP. The client
- * supports basic features like sending different HTTP requests and handling
- * redirections, as well as more advanced features like proxy settings, HTTP
- * authentication and cookie persistance (using a Zend_Http_CookieJar object)
- *
- * @todo Implement proxy settings
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- * @throws     Zend_Http_Client_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client
-{
-    /**
-     * HTTP request methods
-     */
-    const GET     = 'GET';
-    const POST    = 'POST';
-    const PUT     = 'PUT';
-    const HEAD    = 'HEAD';
-    const DELETE  = 'DELETE';
-    const TRACE   = 'TRACE';
-    const OPTIONS = 'OPTIONS';
-    const CONNECT = 'CONNECT';
-    const MERGE   = 'MERGE';
-
-    /**
-     * Supported HTTP Authentication methods
-     */
-    const AUTH_BASIC = 'basic';
-    //const AUTH_DIGEST = 'digest'; <-- not implemented yet
-
-    /**
-     * HTTP protocol versions
-     */
-    const HTTP_1 = '1.1';
-    const HTTP_0 = '1.0';
-
-    /**
-     * Content attributes
-     */
-    const CONTENT_TYPE   = 'Content-Type';
-    const CONTENT_LENGTH = 'Content-Length';
-
-    /**
-     * POST data encoding methods
-     */
-    const ENC_URLENCODED = 'application/x-www-form-urlencoded';
-    const ENC_FORMDATA   = 'multipart/form-data';
-
-    /**
-     * Configuration array, set using the constructor or using ::setConfig()
-     *
-     * @var array
-     */
-    protected $config = array(
-        'maxredirects'    => 5,
-        'strictredirects' => false,
-        'useragent'       => 'Zend_Http_Client',
-        'timeout'         => 10,
-        'adapter'         => 'Zend_Http_Client_Adapter_Socket',
-        'httpversion'     => self::HTTP_1,
-        'keepalive'       => false,
-        'storeresponse'   => true,
-        'strict'          => true,
-        'output_stream'   => false,
-        'encodecookies'   => true,
-    );
-
-    /**
-     * The adapter used to preform the actual connection to the server
-     *
-     * @var Zend_Http_Client_Adapter_Interface
-     */
-    protected $adapter = null;
-
-    /**
-     * Request URI
-     *
-     * @var Zend_Uri_Http
-     */
-    protected $uri = null;
-
-    /**
-     * Associative array of request headers
-     *
-     * @var array
-     */
-    protected $headers = array();
-
-    /**
-     * HTTP request method
-     *
-     * @var string
-     */
-    protected $method = self::GET;
-
-    /**
-     * Associative array of GET parameters
-     *
-     * @var array
-     */
-    protected $paramsGet = array();
-
-    /**
-     * Assiciative array of POST parameters
-     *
-     * @var array
-     */
-    protected $paramsPost = array();
-
-    /**
-     * Request body content type (for POST requests)
-     *
-     * @var string
-     */
-    protected $enctype = null;
-
-    /**
-     * The raw post data to send. Could be set by setRawData($data, $enctype).
-     *
-     * @var string
-     */
-    protected $raw_post_data = null;
-
-    /**
-     * HTTP Authentication settings
-     *
-     * Expected to be an associative array with this structure:
-     * $this->auth = array('user' => 'username', 'password' => 'password', 'type' => 'basic')
-     * Where 'type' should be one of the supported authentication types (see the AUTH_*
-     * constants), for example 'basic' or 'digest'.
-     *
-     * If null, no authentication will be used.
-     *
-     * @var array|null
-     */
-    protected $auth;
-
-    /**
-     * File upload arrays (used in POST requests)
-     *
-     * An associative array, where each element is of the format:
-     *   'name' => array('filename.txt', 'text/plain', 'This is the actual file contents')
-     *
-     * @var array
-     */
-    protected $files = array();
-
-    /**
-     * The client's cookie jar
-     *
-     * @var Zend_Http_CookieJar
-     */
-    protected $cookiejar = null;
-
-    /**
-     * The last HTTP request sent by the client, as string
-     *
-     * @var string
-     */
-    protected $last_request = null;
-
-    /**
-     * The last HTTP response received by the client
-     *
-     * @var Zend_Http_Response
-     */
-    protected $last_response = null;
-
-    /**
-     * Redirection counter
-     *
-     * @var int
-     */
-    protected $redirectCounter = 0;
-
-    /**
-     * Fileinfo magic database resource
-     *
-     * This varaiable is populated the first time _detectFileMimeType is called
-     * and is then reused on every call to this method
-     *
-     * @var resource
-     */
-    static protected $_fileInfoDb = null;
-
-    /**
-     * Contructor method. Will create a new HTTP client. Accepts the target
-     * URL and optionally configuration array.
-     *
-     * @param Zend_Uri_Http|string $uri
-     * @param array $config Configuration key-value pairs.
-     */
-    public function __construct($uri = null, $config = null)
-    {
-        if ($uri !== null) {
-            $this->setUri($uri);
-        }
-        if ($config !== null) {
-            $this->setConfig($config);
-        }
-    }
-
-    /**
-     * Set the URI for the next request
-     *
-     * @param  Zend_Uri_Http|string $uri
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setUri($uri)
-    {
-        if (is_string($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-
-        if (!$uri instanceof Zend_Uri_Http) {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.');
-        }
-
-        // Set auth if username and password has been specified in the uri
-        if ($uri->getUsername() && $uri->getPassword()) {
-            $this->setAuth($uri->getUsername(), $uri->getPassword());
-        }
-
-        // We have no ports, set the defaults
-        if (! $uri->getPort()) {
-            $uri->setPort(($uri->getScheme() == 'https' ? 443 : 80));
-        }
-
-        $this->uri = $uri;
-
-        return $this;
-    }
-
-    /**
-     * Get the URI for the next request
-     *
-     * @param boolean $as_string If true, will return the URI as a string
-     * @return Zend_Uri_Http|string
-     */
-    public function getUri($as_string = false)
-    {
-        if ($as_string && $this->uri instanceof Zend_Uri_Http) {
-            return $this->uri->__toString();
-        } else {
-            return $this->uri;
-        }
-    }
-
-    /**
-     * Set configuration parameters for this HTTP client
-     *
-     * @param  Zend_Config | array $config
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setConfig($config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-
-        } elseif (! is_array($config)) {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Array or Zend_Config object expected, got ' . gettype($config));
-        }
-
-        foreach ($config as $k => $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-
-        // Pass configuration options to the adapter if it exists
-        if ($this->adapter instanceof Zend_Http_Client_Adapter_Interface) {
-            $this->adapter->setConfig($config);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the next request's method
-     *
-     * Validated the passed method and sets it. If we have files set for
-     * POST requests, and the new method is not POST, the files are silently
-     * dropped.
-     *
-     * @param string $method
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setMethod($method = self::GET)
-    {
-        if (! preg_match('/^[^\x00-\x1f\x7f-\xff\(\)<>@,;:\\\\"\/\[\]\?={}\s]+$/', $method)) {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method.");
-        }
-
-        if ($method == self::POST && $this->enctype === null) {
-            $this->setEncType(self::ENC_URLENCODED);
-        }
-
-        $this->method = $method;
-
-        return $this;
-    }
-
-    /**
-     * Set one or more request headers
-     *
-     * This function can be used in several ways to set the client's request
-     * headers:
-     * 1. By providing two parameters: $name as the header to set (eg. 'Host')
-     *    and $value as it's value (eg. 'www.example.com').
-     * 2. By providing a single header string as the only parameter
-     *    eg. 'Host: www.example.com'
-     * 3. By providing an array of headers as the first parameter
-     *    eg. array('host' => 'www.example.com', 'x-foo: bar'). In This case
-     *    the function will call itself recursively for each array item.
-     *
-     * @param string|array $name Header name, full header string ('Header: value')
-     *     or an array of headers
-     * @param mixed $value Header value or null
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setHeaders($name, $value = null)
-    {
-        // If we got an array, go recusive!
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeaders($k, $v);
-                } else {
-                    $this->setHeaders($v, null);
-                }
-            }
-        } else {
-            // Check if $name needs to be split
-            if ($value === null && (strpos($name, ':') > 0)) {
-                list($name, $value) = explode(':', $name, 2);
-            }
-
-            // Make sure the name is valid if we are in strict mode
-            if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name");
-            }
-
-            $normalized_name = strtolower($name);
-
-            // If $value is null or false, unset the header
-            if ($value === null || $value === false) {
-                unset($this->headers[$normalized_name]);
-
-            // Else, set the header
-            } else {
-                // Header names are stored lowercase internally.
-                if (is_string($value)) {
-                    $value = trim($value);
-                }
-                $this->headers[$normalized_name] = array($name, $value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the value of a specific header
-     *
-     * Note that if the header has more than one value, an array
-     * will be returned.
-     *
-     * @param string $key
-     * @return string|array|null The header value or null if it is not set
-     */
-    public function getHeader($key)
-    {
-        $key = strtolower($key);
-        if (isset($this->headers[$key])) {
-            return $this->headers[$key][1];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set a GET parameter for the request. Wrapper around _setParameter
-     *
-     * @param string|array $name
-     * @param string $value
-     * @return Zend_Http_Client
-     */
-    public function setParameterGet($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v)
-                $this->_setParameter('GET', $k, $v);
-        } else {
-            $this->_setParameter('GET', $name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a POST parameter for the request. Wrapper around _setParameter
-     *
-     * @param string|array $name
-     * @param string $value
-     * @return Zend_Http_Client
-     */
-    public function setParameterPost($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v)
-                $this->_setParameter('POST', $k, $v);
-        } else {
-            $this->_setParameter('POST', $name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a GET or POST parameter - used by SetParameterGet and SetParameterPost
-     *
-     * @param string $type GET or POST
-     * @param string $name
-     * @param string $value
-     * @return null
-     */
-    protected function _setParameter($type, $name, $value)
-    {
-        $parray = array();
-        $type = strtolower($type);
-        switch ($type) {
-            case 'get':
-                $parray = &$this->paramsGet;
-                break;
-            case 'post':
-                $parray = &$this->paramsPost;
-                break;
-        }
-
-        if ($value === null) {
-            if (isset($parray[$name])) unset($parray[$name]);
-        } else {
-            $parray[$name] = $value;
-        }
-    }
-
-    /**
-     * Get the number of redirections done on the last request
-     *
-     * @return int
-     */
-    public function getRedirectionsCount()
-    {
-        return $this->redirectCounter;
-    }
-
-    /**
-     * Set HTTP authentication parameters
-     *
-     * $type should be one of the supported types - see the self::AUTH_*
-     * constants.
-     *
-     * To enable authentication:
-     * <code>
-     * $this->setAuth('shahar', 'secret', Zend_Http_Client::AUTH_BASIC);
-     * </code>
-     *
-     * To disable authentication:
-     * <code>
-     * $this->setAuth(false);
-     * </code>
-     *
-     * @see http://www.faqs.org/rfcs/rfc2617.html
-     * @param string|false $user User name or false disable authentication
-     * @param string $password Password
-     * @param string $type Authentication type
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setAuth($user, $password = '', $type = self::AUTH_BASIC)
-    {
-        // If we got false or null, disable authentication
-        if ($user === false || $user === null) {
-            $this->auth = null;
-
-            // Clear the auth information in the uri instance as well
-            if ($this->uri instanceof Zend_Uri_Http) {
-                $this->getUri()->setUsername('');
-                $this->getUri()->setPassword('');
-            }
-        // Else, set up authentication
-        } else {
-            // Check we got a proper authentication type
-            if (! defined('self::AUTH_' . strtoupper($type))) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Invalid or not supported authentication type: '$type'");
-            }
-
-            $this->auth = array(
-                'user' => (string) $user,
-                'password' => (string) $password,
-                'type' => $type
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the HTTP client's cookie jar.
-     *
-     * A cookie jar is an object that holds and maintains cookies across HTTP requests
-     * and responses.
-     *
-     * @param Zend_Http_CookieJar|boolean $cookiejar Existing cookiejar object, true to create a new one, false to disable
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setCookieJar($cookiejar = true)
-    {
-        if (! class_exists('Zend_Http_CookieJar')) {
-            require_once 'Zend/Http/CookieJar.php';
-        }
-
-        if ($cookiejar instanceof Zend_Http_CookieJar) {
-            $this->cookiejar = $cookiejar;
-        } elseif ($cookiejar === true) {
-            $this->cookiejar = new Zend_Http_CookieJar();
-        } elseif (! $cookiejar) {
-            $this->cookiejar = null;
-        } else {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Invalid parameter type passed as CookieJar');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the current cookie jar or null if none.
-     *
-     * @return Zend_Http_CookieJar|null
-     */
-    public function getCookieJar()
-    {
-        return $this->cookiejar;
-    }
-
-    /**
-     * Add a cookie to the request. If the client has no Cookie Jar, the cookies
-     * will be added directly to the headers array as "Cookie" headers.
-     *
-     * @param Zend_Http_Cookie|string $cookie
-     * @param string|null $value If "cookie" is a string, this is the cookie value.
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setCookie($cookie, $value = null)
-    {
-        if (! class_exists('Zend_Http_Cookie')) {
-            require_once 'Zend/Http/Cookie.php';
-        }
-
-        if (is_array($cookie)) {
-            foreach ($cookie as $c => $v) {
-                if (is_string($c)) {
-                    $this->setCookie($c, $v);
-                } else {
-                    $this->setCookie($v);
-                }
-            }
-
-            return $this;
-        }
-
-        if ($value !== null && $this->config['encodecookies']) {
-            $value = urlencode($value);
-        }
-
-        if (isset($this->cookiejar)) {
-            if ($cookie instanceof Zend_Http_Cookie) {
-                $this->cookiejar->addCookie($cookie);
-            } elseif (is_string($cookie) && $value !== null) {
-                $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}",
-                                                       $this->uri,
-                                                       $this->config['encodecookies']);
-                $this->cookiejar->addCookie($cookie);
-            }
-        } else {
-            if ($cookie instanceof Zend_Http_Cookie) {
-                $name = $cookie->getName();
-                $value = $cookie->getValue();
-                $cookie = $name;
-            }
-
-            if (preg_match("/[=,; \t\r\n\013\014]/", $cookie)) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Cookie name cannot contain these characters: =,; \t\r\n\013\014 ({$cookie})");
-            }
-
-            $value = addslashes($value);
-
-            if (! isset($this->headers['cookie'])) {
-                $this->headers['cookie'] = array('Cookie', '');
-            }
-            $this->headers['cookie'][1] .= $cookie . '=' . $value . '; ';
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a file to upload (using a POST request)
-     *
-     * Can be used in two ways:
-     *
-     * 1. $data is null (default): $filename is treated as the name if a local file which
-     *    will be read and sent. Will try to guess the content type using mime_content_type().
-     * 2. $data is set - $filename is sent as the file name, but $data is sent as the file
-     *    contents and no file is read from the file system. In this case, you need to
-     *    manually set the Content-Type ($ctype) or it will default to
-     *    application/octet-stream.
-     *
-     * @param string $filename Name of file to upload, or name to save as
-     * @param string $formname Name of form element to send as
-     * @param string $data Data to send (if null, $filename is read and sent)
-     * @param string $ctype Content type to use (if $data is set and $ctype is
-     *     null, will be application/octet-stream)
-     * @return Zend_Http_Client
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setFileUpload($filename, $formname, $data = null, $ctype = null)
-    {
-        if ($data === null) {
-            if (($data = @file_get_contents($filename)) === false) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Unable to read file '{$filename}' for upload");
-            }
-
-            if (! $ctype) {
-                $ctype = $this->_detectFileMimeType($filename);
-            }
-        }
-
-        // Force enctype to multipart/form-data
-        $this->setEncType(self::ENC_FORMDATA);
-
-        $this->files[] = array(
-            'formname' => $formname,
-            'filename' => basename($filename),
-            'ctype'    => $ctype,
-            'data'     => $data
-        );
-
-        return $this;
-    }
-
-    /**
-     * Set the encoding type for POST data
-     *
-     * @param string $enctype
-     * @return Zend_Http_Client
-     */
-    public function setEncType($enctype = self::ENC_URLENCODED)
-    {
-        $this->enctype = $enctype;
-
-        return $this;
-    }
-
-    /**
-     * Set the raw (already encoded) POST data.
-     *
-     * This function is here for two reasons:
-     * 1. For advanced user who would like to set their own data, already encoded
-     * 2. For backwards compatibilty: If someone uses the old post($data) method.
-     *    this method will be used to set the encoded data.
-     *
-     * $data can also be stream (such as file) from which the data will be read.
-     *
-     * @param string|resource $data
-     * @param string $enctype
-     * @return Zend_Http_Client
-     */
-    public function setRawData($data, $enctype = null)
-    {
-        $this->raw_post_data = $data;
-        $this->setEncType($enctype);
-        if (is_resource($data)) {
-            // We've got stream data
-            $stat = @fstat($data);
-            if($stat) {
-                $this->setHeaders(self::CONTENT_LENGTH, $stat['size']);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all GET and POST parameters
-     *
-     * Should be used to reset the request parameters if the client is
-     * used for several concurrent requests.
-     *
-     * clearAll parameter controls if we clean just parameters or also
-     * headers and last_*
-     *
-     * @param bool $clearAll Should all data be cleared?
-     * @return Zend_Http_Client
-     */
-    public function resetParameters($clearAll = false)
-    {
-        // Reset parameter data
-        $this->paramsGet     = array();
-        $this->paramsPost    = array();
-        $this->files         = array();
-        $this->raw_post_data = null;
-
-        if($clearAll) {
-            $this->headers = array();
-            $this->last_request = null;
-            $this->last_response = null;
-        } else {
-            // Clear outdated headers
-            if (isset($this->headers[strtolower(self::CONTENT_TYPE)])) {
-                unset($this->headers[strtolower(self::CONTENT_TYPE)]);
-            }
-            if (isset($this->headers[strtolower(self::CONTENT_LENGTH)])) {
-                unset($this->headers[strtolower(self::CONTENT_LENGTH)]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the last HTTP request as string
-     *
-     * @return string
-     */
-    public function getLastRequest()
-    {
-        return $this->last_request;
-    }
-
-    /**
-     * Get the last HTTP response received by this client
-     *
-     * If $config['storeresponse'] is set to false, or no response was
-     * stored yet, will return null
-     *
-     * @return Zend_Http_Response or null if none
-     */
-    public function getLastResponse()
-    {
-        return $this->last_response;
-    }
-
-    /**
-     * Load the connection adapter
-     *
-     * While this method is not called more than one for a client, it is
-     * seperated from ->request() to preserve logic and readability
-     *
-     * @param Zend_Http_Client_Adapter_Interface|string $adapter
-     * @return null
-     * @throws Zend_Http_Client_Exception
-     */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (!class_exists($adapter)) {
-                try {
-                    require_once 'Zend/Loader.php';
-                    Zend_Loader::loadClass($adapter);
-                } catch (Zend_Exception $e) {
-                    /** @see Zend_Http_Client_Exception */
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e);
-                }
-            }
-
-            $adapter = new $adapter;
-        }
-
-        if (! $adapter instanceof Zend_Http_Client_Adapter_Interface) {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Passed adapter is not a HTTP connection adapter');
-        }
-
-        $this->adapter = $adapter;
-        $config = $this->config;
-        unset($config['adapter']);
-        $this->adapter->setConfig($config);
-    }
-
-    /**
-     * Load the connection adapter
-     *
-     * @return Zend_Http_Client_Adapter_Interface $adapter
-     */
-    public function getAdapter()
-    {
-        return $this->adapter;
-    }
-
-    /**
-     * Set streaming for received data
-     *
-     * @param string|boolean $streamfile Stream file, true for temp file, false/null for no streaming
-     * @return Zend_Http_Client
-     */
-    public function setStream($streamfile = true)
-    {
-        $this->setConfig(array("output_stream" => $streamfile));
-        return $this;
-    }
-
-    /**
-     * Get status of streaming for received data
-     * @return boolean|string
-     */
-    public function getStream()
-    {
-        return $this->config["output_stream"];
-    }
-
-    /**
-     * Create temporary stream
-     *
-     * @return resource
-     */
-    protected function _openTempStream()
-    {
-        $this->_stream_name = $this->config['output_stream'];
-        if(!is_string($this->_stream_name)) {
-            // If name is not given, create temp name
-            $this->_stream_name = tempnam(isset($this->config['stream_tmp_dir'])?$this->config['stream_tmp_dir']:sys_get_temp_dir(),
-                 'Zend_Http_Client');
-        }
-
-        $fp = fopen($this->_stream_name, "w+b");
-        if(!$fp) {
-                $this->close();
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Could not open temp file $name");
-
-        }
-        return $fp;
-    }
-
-    /**
-     * Send the HTTP request and return an HTTP response object
-     *
-     * @param string $method
-     * @return Zend_Http_Response
-     * @throws Zend_Http_Client_Exception
-     */
-    public function request($method = null)
-    {
-        if (! $this->uri instanceof Zend_Uri_Http) {
-            /** @see Zend_Http_Client_Exception */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('No valid URI has been passed to the client');
-        }
-
-        if ($method) {
-            $this->setMethod($method);
-        }
-        $this->redirectCounter = 0;
-        $response = null;
-
-        // Make sure the adapter is loaded
-        if ($this->adapter == null) {
-            $this->setAdapter($this->config['adapter']);
-        }
-
-        // Send the first request. If redirected, continue.
-        do {
-            // Clone the URI and add the additional GET parameters to it
-            $uri = clone $this->uri;
-            if (! empty($this->paramsGet)) {
-                $query = $uri->getQuery();
-                   if (! empty($query)) {
-                       $query .= '&';
-                   }
-                $query .= http_build_query($this->paramsGet, null, '&');
-
-                $uri->setQuery($query);
-            }
-
-            $body = $this->_prepareBody();
-            $headers = $this->_prepareHeaders();
-
-            // check that adapter supports streaming before using it
-            if(is_resource($body) && !($this->adapter instanceof Zend_Http_Client_Adapter_Stream)) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception('Adapter does not support streaming');
-            }
-
-            // Open the connection, send the request and read the response
-            $this->adapter->connect($uri->getHost(), $uri->getPort(),
-                ($uri->getScheme() == 'https' ? true : false));
-
-            if($this->config['output_stream']) {
-                if($this->adapter instanceof Zend_Http_Client_Adapter_Stream) {
-                    $stream = $this->_openTempStream();
-                    $this->adapter->setOutputStream($stream);
-                } else {
-                    /** @see Zend_Http_Client_Exception */
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception('Adapter does not support streaming');
-                }
-            }
-
-            $this->last_request = $this->adapter->write($this->method,
-                $uri, $this->config['httpversion'], $headers, $body);
-
-            $response = $this->adapter->read();
-            if (! $response) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception('Unable to read response, or response is empty');
-            }
-
-            if($this->config['output_stream']) {
-                rewind($stream);
-                // cleanup the adapter
-                $this->adapter->setOutputStream(null);
-                $response = Zend_Http_Response_Stream::fromStream($response, $stream);
-                $response->setStreamName($this->_stream_name);
-                if(!is_string($this->config['output_stream'])) {
-                    // we used temp name, will need to clean up
-                    $response->setCleanup(true);
-                }
-            } else {
-                $response = Zend_Http_Response::fromString($response);
-            }
-
-            if ($this->config['storeresponse']) {
-                $this->last_response = $response;
-            }
-
-            // Load cookies into cookie jar
-            if (isset($this->cookiejar)) {
-                $this->cookiejar->addCookiesFromResponse($response, $uri);
-            }
-
-            // If we got redirected, look for the Location header
-            if ($response->isRedirect() && ($location = $response->getHeader('location'))) {
-
-                // Check whether we send the exact same request again, or drop the parameters
-                // and send a GET request
-                if ($response->getStatus() == 303 ||
-                   ((! $this->config['strictredirects']) && ($response->getStatus() == 302 ||
-                       $response->getStatus() == 301))) {
-
-                    $this->resetParameters();
-                    $this->setMethod(self::GET);
-                }
-
-                // If we got a well formed absolute URI
-                if (Zend_Uri_Http::check($location)) {
-                    $this->setHeaders('host', null);
-                    $this->setUri($location);
-
-                } else {
-
-                    // Split into path and query and set the query
-                    if (strpos($location, '?') !== false) {
-                        list($location, $query) = explode('?', $location, 2);
-                    } else {
-                        $query = '';
-                    }
-                    $this->uri->setQuery($query);
-
-                    // Else, if we got just an absolute path, set it
-                    if(strpos($location, '/') === 0) {
-                        $this->uri->setPath($location);
-
-                        // Else, assume we have a relative path
-                    } else {
-                        // Get the current path directory, removing any trailing slashes
-                        $path = $this->uri->getPath();
-                        $path = rtrim(substr($path, 0, strrpos($path, '/')), "/");
-                        $this->uri->setPath($path . '/' . $location);
-                    }
-                }
-                ++$this->redirectCounter;
-
-            } else {
-                // If we didn't get any location, stop redirecting
-                break;
-            }
-
-        } while ($this->redirectCounter < $this->config['maxredirects']);
-
-        return $response;
-    }
-
-    /**
-     * Prepare the request headers
-     *
-     * @return array
-     */
-    protected function _prepareHeaders()
-    {
-        $headers = array();
-
-        // Set the host header
-        if (! isset($this->headers['host'])) {
-            $host = $this->uri->getHost();
-
-            // If the port is not default, add it
-            if (! (($this->uri->getScheme() == 'http' && $this->uri->getPort() == 80) ||
-                  ($this->uri->getScheme() == 'https' && $this->uri->getPort() == 443))) {
-                $host .= ':' . $this->uri->getPort();
-            }
-
-            $headers[] = "Host: {$host}";
-        }
-
-        // Set the connection header
-        if (! isset($this->headers['connection'])) {
-            if (! $this->config['keepalive']) {
-                $headers[] = "Connection: close";
-            }
-        }
-
-        // Set the Accept-encoding header if not set - depending on whether
-        // zlib is available or not.
-        if (! isset($this->headers['accept-encoding'])) {
-            if (function_exists('gzinflate')) {
-                $headers[] = 'Accept-encoding: gzip, deflate';
-            } else {
-                $headers[] = 'Accept-encoding: identity';
-            }
-        }
-
-        // Set the Content-Type header
-        if ($this->method == self::POST &&
-           (! isset($this->headers[strtolower(self::CONTENT_TYPE)]) && isset($this->enctype))) {
-
-            $headers[] = self::CONTENT_TYPE . ': ' . $this->enctype;
-        }
-
-        // Set the user agent header
-        if (! isset($this->headers['user-agent']) && isset($this->config['useragent'])) {
-            $headers[] = "User-Agent: {$this->config['useragent']}";
-        }
-
-        // Set HTTP authentication if needed
-        if (is_array($this->auth)) {
-            $auth = self::encodeAuthHeader($this->auth['user'], $this->auth['password'], $this->auth['type']);
-            $headers[] = "Authorization: {$auth}";
-        }
-
-        // Load cookies from cookie jar
-        if (isset($this->cookiejar)) {
-            $cookstr = $this->cookiejar->getMatchingCookies($this->uri,
-                true, Zend_Http_CookieJar::COOKIE_STRING_CONCAT);
-
-            if ($cookstr) {
-                $headers[] = "Cookie: {$cookstr}";
-            }
-        }
-
-        // Add all other user defined headers
-        foreach ($this->headers as $header) {
-            list($name, $value) = $header;
-            if (is_array($value)) {
-                $value = implode(', ', $value);
-            }
-
-            $headers[] = "$name: $value";
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Prepare the request body (for POST and PUT requests)
-     *
-     * @return string
-     * @throws Zend_Http_Client_Exception
-     */
-    protected function _prepareBody()
-    {
-        // According to RFC2616, a TRACE request should not have a body.
-        if ($this->method == self::TRACE) {
-            return '';
-        }
-
-        if (isset($this->raw_post_data) && is_resource($this->raw_post_data)) {
-            return $this->raw_post_data;
-        }
-        // If mbstring overloads substr and strlen functions, we have to
-        // override it's internal encoding
-        if (function_exists('mb_internal_encoding') &&
-           ((int) ini_get('mbstring.func_overload')) & 2) {
-
-            $mbIntEnc = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        // If we have raw_post_data set, just use it as the body.
-        if (isset($this->raw_post_data)) {
-            $this->setHeaders(self::CONTENT_LENGTH, strlen($this->raw_post_data));
-            if (isset($mbIntEnc)) {
-                mb_internal_encoding($mbIntEnc);
-            }
-
-            return $this->raw_post_data;
-        }
-
-        $body = '';
-
-        // If we have files to upload, force enctype to multipart/form-data
-        if (count ($this->files) > 0) {
-            $this->setEncType(self::ENC_FORMDATA);
-        }
-
-        // If we have POST parameters or files, encode and add them to the body
-        if (count($this->paramsPost) > 0 || count($this->files) > 0) {
-            switch($this->enctype) {
-                case self::ENC_FORMDATA:
-                    // Encode body as multipart/form-data
-                    $boundary = '---ZENDHTTPCLIENT-' . md5(microtime());
-                    $this->setHeaders(self::CONTENT_TYPE, self::ENC_FORMDATA . "; boundary={$boundary}");
-
-                    // Get POST parameters and encode them
-                    $params = self::_flattenParametersArray($this->paramsPost);
-                    foreach ($params as $pp) {
-                        $body .= self::encodeFormData($boundary, $pp[0], $pp[1]);
-                    }
-
-                    // Encode files
-                    foreach ($this->files as $file) {
-                        $fhead = array(self::CONTENT_TYPE => $file['ctype']);
-                        $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead);
-                    }
-
-                    $body .= "--{$boundary}--\r\n";
-                    break;
-
-                case self::ENC_URLENCODED:
-                    // Encode body as application/x-www-form-urlencoded
-                    $this->setHeaders(self::CONTENT_TYPE, self::ENC_URLENCODED);
-                    $body = http_build_query($this->paramsPost, '', '&');
-                    break;
-
-                default:
-                    if (isset($mbIntEnc)) {
-                        mb_internal_encoding($mbIntEnc);
-                    }
-
-                    /** @see Zend_Http_Client_Exception */
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("Cannot handle content type '{$this->enctype}' automatically." .
-                        " Please use Zend_Http_Client::setRawData to send this kind of content.");
-                    break;
-            }
-        }
-
-        // Set the Content-Length if we have a body or if request is POST/PUT
-        if ($body || $this->method == self::POST || $this->method == self::PUT) {
-            $this->setHeaders(self::CONTENT_LENGTH, strlen($body));
-        }
-
-        if (isset($mbIntEnc)) {
-            mb_internal_encoding($mbIntEnc);
-        }
-
-        return $body;
-    }
-
-    /**
-     * Helper method that gets a possibly multi-level parameters array (get or
-     * post) and flattens it.
-     *
-     * The method returns an array of (key, value) pairs (because keys are not
-     * necessarily unique. If one of the parameters in as array, it will also
-     * add a [] suffix to the key.
-     *
-     * This method is deprecated since Zend Framework 1.9 in favour of
-     * self::_flattenParametersArray() and will be dropped in 2.0
-     *
-     * @deprecated since 1.9
-     *
-     * @param  array $parray    The parameters array
-     * @param  bool  $urlencode Whether to urlencode the name and value
-     * @return array
-     */
-    protected function _getParametersRecursive($parray, $urlencode = false)
-    {
-        // Issue a deprecated notice
-        trigger_error("The " .  __METHOD__ . " method is deprecated and will be dropped in 2.0.",
-            E_USER_NOTICE);
-
-        if (! is_array($parray)) {
-            return $parray;
-        }
-        $parameters = array();
-
-        foreach ($parray as $name => $value) {
-            if ($urlencode) {
-                $name = urlencode($name);
-            }
-
-            // If $value is an array, iterate over it
-            if (is_array($value)) {
-                $name .= ($urlencode ? '%5B%5D' : '[]');
-                foreach ($value as $subval) {
-                    if ($urlencode) {
-                        $subval = urlencode($subval);
-                    }
-                    $parameters[] = array($name, $subval);
-                }
-            } else {
-                if ($urlencode) {
-                    $value = urlencode($value);
-                }
-                $parameters[] = array($name, $value);
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * Attempt to detect the MIME type of a file using available extensions
-     *
-     * This method will try to detect the MIME type of a file. If the fileinfo
-     * extension is available, it will be used. If not, the mime_magic
-     * extension which is deprected but is still available in many PHP setups
-     * will be tried.
-     *
-     * If neither extension is available, the default application/octet-stream
-     * MIME type will be returned
-     *
-     * @param  string $file File path
-     * @return string       MIME type
-     */
-    protected function _detectFileMimeType($file)
-    {
-        $type = null;
-
-        // First try with fileinfo functions
-        if (function_exists('finfo_open')) {
-            if (self::$_fileInfoDb === null) {
-                self::$_fileInfoDb = @finfo_open(FILEINFO_MIME);
-            }
-
-            if (self::$_fileInfoDb) {
-                $type = finfo_file(self::$_fileInfoDb, $file);
-            }
-
-        } elseif (function_exists('mime_content_type')) {
-            $type = mime_content_type($file);
-        }
-
-        // Fallback to the default application/octet-stream
-        if (! $type) {
-            $type = 'application/octet-stream';
-        }
-
-        return $type;
-    }
-
-    /**
-     * Encode data to a multipart/form-data part suitable for a POST request.
-     *
-     * @param string $boundary
-     * @param string $name
-     * @param mixed $value
-     * @param string $filename
-     * @param array $headers Associative array of optional headers @example ("Content-Transfer-Encoding" => "binary")
-     * @return string
-     */
-    public static function encodeFormData($boundary, $name, $value, $filename = null, $headers = array()) {
-        $ret = "--{$boundary}\r\n" .
-            'Content-Disposition: form-data; name="' . $name .'"';
-
-        if ($filename) {
-            $ret .= '; filename="' . $filename . '"';
-        }
-        $ret .= "\r\n";
-
-        foreach ($headers as $hname => $hvalue) {
-            $ret .= "{$hname}: {$hvalue}\r\n";
-        }
-        $ret .= "\r\n";
-
-        $ret .= "{$value}\r\n";
-
-        return $ret;
-    }
-
-    /**
-     * Create a HTTP authentication "Authorization:" header according to the
-     * specified user, password and authentication method.
-     *
-     * @see http://www.faqs.org/rfcs/rfc2617.html
-     * @param string $user
-     * @param string $password
-     * @param string $type
-     * @return string
-     * @throws Zend_Http_Client_Exception
-     */
-    public static function encodeAuthHeader($user, $password, $type = self::AUTH_BASIC)
-    {
-        $authHeader = null;
-
-        switch ($type) {
-            case self::AUTH_BASIC:
-                // In basic authentication, the user name cannot contain ":"
-                if (strpos($user, ':') !== false) {
-                    /** @see Zend_Http_Client_Exception */
-                    require_once 'Zend/Http/Client/Exception.php';
-                    throw new Zend_Http_Client_Exception("The user name cannot contain ':' in 'Basic' HTTP authentication");
-                }
-
-                $authHeader = 'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            //case self::AUTH_DIGEST:
-                /**
-                 * @todo Implement digest authentication
-                 */
-            //    break;
-
-            default:
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Not a supported HTTP authentication type: '$type'");
-        }
-
-        return $authHeader;
-    }
-
-    /**
-     * Convert an array of parameters into a flat array of (key, value) pairs
-     *
-     * Will flatten a potentially multi-dimentional array of parameters (such
-     * as POST parameters) into a flat array of (key, value) paris. In case
-     * of multi-dimentional arrays, square brackets ([]) will be added to the
-     * key to indicate an array.
-     *
-     * @since  1.9
-     *
-     * @param  array  $parray
-     * @param  string $prefix
-     * @return array
-     */
-    static protected function _flattenParametersArray($parray, $prefix = null)
-    {
-        if (! is_array($parray)) {
-            return $parray;
-        }
-
-        $parameters = array();
-
-        foreach($parray as $name => $value) {
-
-            // Calculate array key
-            if ($prefix) {
-                if (is_int($name)) {
-                    $key = $prefix . '[]';
-                } else {
-                    $key = $prefix . "[$name]";
-                }
-            } else {
-                $key = $name;
-            }
-
-            if (is_array($value)) {
-                $parameters = array_merge($parameters, self::_flattenParametersArray($value, $key));
-
-            } else {
-                $parameters[] = array($key, $value);
-            }
-        }
-
-        return $parameters;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Curl.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Curl.php
deleted file mode 100644
index 79e78e77f..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Curl.php
+++ /dev/null
@@ -1,501 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Curl.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri_Http
- */
-require_once 'Zend/Uri/Http.php';
-
-/**
- * @see Zend_Http_Client_Adapter_Interface
- */
-require_once 'Zend/Http/Client/Adapter/Interface.php';
-/**
- * @see Zend_Http_Client_Adapter_Stream
- */
-require_once 'Zend/Http/Client/Adapter/Stream.php';
-
-/**
- * An adapter class for Zend_Http_Client based on the curl extension.
- * Curl requires libcurl. See for full requirements the PHP manual: http://php.net/curl
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream
-{
-    /**
-     * Parameters array
-     *
-     * @var array
-     */
-    protected $_config = array();
-
-    /**
-     * What host/port are we connected to?
-     *
-     * @var array
-     */
-    protected $_connected_to = array(null, null);
-
-    /**
-     * The curl session handle
-     *
-     * @var resource|null
-     */
-    protected $_curl = null;
-
-    /**
-     * List of cURL options that should never be overwritten
-     *
-     * @var array
-     */
-    protected $_invalidOverwritableCurlOptions = array(
-        CURLOPT_HTTPGET,
-        CURLOPT_POST,
-        CURLOPT_PUT,
-        CURLOPT_CUSTOMREQUEST,
-        CURLOPT_HEADER,
-        CURLOPT_RETURNTRANSFER,
-        CURLOPT_HTTPHEADER,
-        CURLOPT_POSTFIELDS,
-        CURLOPT_INFILE,
-        CURLOPT_INFILESIZE,
-        CURLOPT_PORT,
-        CURLOPT_MAXREDIRS,
-        CURLOPT_CONNECTTIMEOUT,
-        CURL_HTTP_VERSION_1_1,
-        CURL_HTTP_VERSION_1_0,
-    );
-
-    /**
-     * Response gotten from server
-     *
-     * @var string
-     */
-    protected $_response = null;
-
-    /**
-     * Stream for storing output
-     *
-     * @var resource
-     */
-    protected $out_stream;
-
-    /**
-     * Adapter constructor
-     *
-     * Config is set using setConfig()
-     *
-     * @return void
-     * @throws Zend_Http_Client_Adapter_Exception
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('curl')) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.');
-        }
-    }
-
-    /**
-     * Set the configuration array for the adapter
-     *
-     * @throws Zend_Http_Client_Adapter_Exception
-     * @param  Zend_Config | array $config
-     * @return Zend_Http_Client_Adapter_Curl
-     */
-    public function setConfig($config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-
-        } elseif (! is_array($config)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Array or Zend_Config object expected, got ' . gettype($config)
-            );
-        }
-
-        if(isset($config['proxy_user']) && isset($config['proxy_pass'])) {
-            $this->setCurlOption(CURLOPT_PROXYUSERPWD, $config['proxy_user'].":".$config['proxy_pass']);
-            unset($config['proxy_user'], $config['proxy_pass']);
-        }
-
-        foreach ($config as $k => $v) {
-            $option = strtolower($k);
-            switch($option) {
-                case 'proxy_host':
-                    $this->setCurlOption(CURLOPT_PROXY, $v);
-                    break;
-                case 'proxy_port':
-                    $this->setCurlOption(CURLOPT_PROXYPORT, $v);
-                    break;
-                default:
-                    $this->_config[$option] = $v;
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-      * Retrieve the array of all configuration options
-      *
-      * @return array
-      */
-     public function getConfig()
-     {
-         return $this->_config;
-     }
-
-    /**
-     * Direct setter for cURL adapter related options.
-     *
-     * @param  string|int $option
-     * @param  mixed $value
-     * @return Zend_Http_Adapter_Curl
-     */
-    public function setCurlOption($option, $value)
-    {
-        if (!isset($this->_config['curloptions'])) {
-            $this->_config['curloptions'] = array();
-        }
-        $this->_config['curloptions'][$option] = $value;
-        return $this;
-    }
-
-    /**
-     * Initialize curl
-     *
-     * @param  string  $host
-     * @param  int     $port
-     * @param  boolean $secure
-     * @return void
-     * @throws Zend_Http_Client_Adapter_Exception if unable to connect
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        // If we're already connected, disconnect first
-        if ($this->_curl) {
-            $this->close();
-        }
-
-        // If we are connected to a different server or port, disconnect first
-        if ($this->_curl
-            && is_array($this->_connected_to)
-            && ($this->_connected_to[0] != $host
-            || $this->_connected_to[1] != $port)
-        ) {
-            $this->close();
-        }
-
-        // Do the actual connection
-        $this->_curl = curl_init();
-        if ($port != 80) {
-            curl_setopt($this->_curl, CURLOPT_PORT, intval($port));
-        }
-
-        // Set timeout
-        curl_setopt($this->_curl, CURLOPT_CONNECTTIMEOUT, $this->_config['timeout']);
-
-        // Set Max redirects
-        curl_setopt($this->_curl, CURLOPT_MAXREDIRS, $this->_config['maxredirects']);
-
-        if (!$this->_curl) {
-            $this->close();
-
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Unable to Connect to ' .  $host . ':' . $port);
-        }
-
-        if ($secure !== false) {
-            // Behave the same like Zend_Http_Adapter_Socket on SSL options.
-            if (isset($this->_config['sslcert'])) {
-                curl_setopt($this->_curl, CURLOPT_SSLCERT, $this->_config['sslcert']);
-            }
-            if (isset($this->_config['sslpassphrase'])) {
-                curl_setopt($this->_curl, CURLOPT_SSLCERTPASSWD, $this->_config['sslpassphrase']);
-            }
-        }
-
-        // Update connected_to
-        $this->_connected_to = array($host, $port);
-    }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param  string        $method
-     * @param  Zend_Uri_Http $uri
-     * @param  float         $http_ver
-     * @param  array         $headers
-     * @param  string        $body
-     * @return string        $request
-     * @throws Zend_Http_Client_Adapter_Exception If connection fails, connected to wrong host, no PUT file defined, unsupported method, or unsupported cURL option
-     */
-    public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $body = '')
-    {
-        // Make sure we're properly connected
-        if (!$this->_curl) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected");
-        }
-
-        if ($this->_connected_to[0] != $uri->getHost() || $this->_connected_to[1] != $uri->getPort()) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong host");
-        }
-
-        // set URL
-        curl_setopt($this->_curl, CURLOPT_URL, $uri->__toString());
-
-        // ensure correct curl call
-        $curlValue = true;
-        switch ($method) {
-            case Zend_Http_Client::GET:
-                $curlMethod = CURLOPT_HTTPGET;
-                break;
-
-            case Zend_Http_Client::POST:
-                $curlMethod = CURLOPT_POST;
-                break;
-
-            case Zend_Http_Client::PUT:
-                // There are two different types of PUT request, either a Raw Data string has been set
-                // or CURLOPT_INFILE and CURLOPT_INFILESIZE are used.
-                if(is_resource($body)) {
-                    $this->_config['curloptions'][CURLOPT_INFILE] = $body;
-                }
-                if (isset($this->_config['curloptions'][CURLOPT_INFILE])) {
-                    // Now we will probably already have Content-Length set, so that we have to delete it
-                    // from $headers at this point:
-                    foreach ($headers AS $k => $header) {
-                        if (preg_match('/Content-Length:\s*(\d+)/i', $header, $m)) {
-                            if(is_resource($body)) {
-                                $this->_config['curloptions'][CURLOPT_INFILESIZE] = (int)$m[1];
-                            }
-                            unset($headers[$k]);
-                        }
-                    }
-
-                    if (!isset($this->_config['curloptions'][CURLOPT_INFILESIZE])) {
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE.");
-                    }
-
-                    if(is_resource($body)) {
-                        $body = '';
-                    }
-
-                    $curlMethod = CURLOPT_PUT;
-                } else {
-                    $curlMethod = CURLOPT_CUSTOMREQUEST;
-                    $curlValue = "PUT";
-                }
-                break;
-
-            case Zend_Http_Client::DELETE:
-                $curlMethod = CURLOPT_CUSTOMREQUEST;
-                $curlValue = "DELETE";
-                break;
-
-            case Zend_Http_Client::OPTIONS:
-                $curlMethod = CURLOPT_CUSTOMREQUEST;
-                $curlValue = "OPTIONS";
-                break;
-
-            case Zend_Http_Client::TRACE:
-                $curlMethod = CURLOPT_CUSTOMREQUEST;
-                $curlValue = "TRACE";
-                break;
-
-            default:
-                // For now, through an exception for unsupported request methods
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception("Method currently not supported");
-        }
-
-        if(is_resource($body) && $curlMethod != CURLOPT_PUT) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Streaming requests are allowed only with PUT");
-        }
-
-        // get http version to use
-        $curlHttp = ($httpVersion == 1.1) ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
-
-        // mark as HTTP request and set HTTP method
-        curl_setopt($this->_curl, $curlHttp, true);
-        curl_setopt($this->_curl, $curlMethod, $curlValue);
-
-        if($this->out_stream) {
-            // headers will be read into the response
-            curl_setopt($this->_curl, CURLOPT_HEADER, false);
-            curl_setopt($this->_curl, CURLOPT_HEADERFUNCTION, array($this, "readHeader"));
-            // and data will be written into the file
-            curl_setopt($this->_curl, CURLOPT_FILE, $this->out_stream);
-        } else {
-            // ensure headers are also returned
-            curl_setopt($this->_curl, CURLOPT_HEADER, true);
-
-            // ensure actual response is returned
-            curl_setopt($this->_curl, CURLOPT_RETURNTRANSFER, true);
-        }
-
-        // set additional headers
-        $headers['Accept'] = '';
-        curl_setopt($this->_curl, CURLOPT_HTTPHEADER, $headers);
-
-        /**
-         * Make sure POSTFIELDS is set after $curlMethod is set:
-         * @link http://de2.php.net/manual/en/function.curl-setopt.php#81161
-         */
-        if ($method == Zend_Http_Client::POST) {
-            curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
-        } elseif ($curlMethod == CURLOPT_PUT) {
-            // this covers a PUT by file-handle:
-            // Make the setting of this options explicit (rather than setting it through the loop following a bit lower)
-            // to group common functionality together.
-            curl_setopt($this->_curl, CURLOPT_INFILE, $this->_config['curloptions'][CURLOPT_INFILE]);
-            curl_setopt($this->_curl, CURLOPT_INFILESIZE, $this->_config['curloptions'][CURLOPT_INFILESIZE]);
-            unset($this->_config['curloptions'][CURLOPT_INFILE]);
-            unset($this->_config['curloptions'][CURLOPT_INFILESIZE]);
-        } elseif ($method == Zend_Http_Client::PUT) {
-            // This is a PUT by a setRawData string, not by file-handle
-            curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body);
-        }
-
-        // set additional curl options
-        if (isset($this->_config['curloptions'])) {
-            foreach ((array)$this->_config['curloptions'] as $k => $v) {
-                if (!in_array($k, $this->_invalidOverwritableCurlOptions)) {
-                    if (curl_setopt($this->_curl, $k, $v) == false) {
-                        require_once 'Zend/Http/Client/Exception.php';
-                        throw new Zend_Http_Client_Exception(sprintf("Unknown or erroreous cURL option '%s' set", $k));
-                    }
-                }
-            }
-        }
-
-        // send the request
-        $response = curl_exec($this->_curl);
-
-        // if we used streaming, headers are already there
-        if(!is_resource($this->out_stream)) {
-            $this->_response = $response;
-        }
-
-        $request  = curl_getinfo($this->_curl, CURLINFO_HEADER_OUT);
-        $request .= $body;
-
-        if (empty($this->_response)) {
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception("Error in cURL request: " . curl_error($this->_curl));
-        }
-
-        // cURL automatically decodes chunked-messages, this means we have to disallow the Zend_Http_Response to do it again
-        if (stripos($this->_response, "Transfer-Encoding: chunked\r\n")) {
-            $this->_response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $this->_response);
-        }
-
-        // Eliminate multiple HTTP responses.
-        do {
-            $parts  = preg_split('|(?:\r?\n){2}|m', $this->_response, 2);
-            $again  = false;
-
-            if (isset($parts[1]) && preg_match("|^HTTP/1\.[01](.*?)\r\n|mi", $parts[1])) {
-                $this->_response    = $parts[1];
-                $again              = true;
-            }
-        } while ($again);
-
-        // cURL automatically handles Proxy rewrites, remove the "HTTP/1.0 200 Connection established" string:
-        if (stripos($this->_response, "HTTP/1.0 200 Connection established\r\n\r\n") !== false) {
-            $this->_response = str_ireplace("HTTP/1.0 200 Connection established\r\n\r\n", '', $this->_response);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Return read response from server
-     *
-     * @return string
-     */
-    public function read()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        if(is_resource($this->_curl)) {
-            curl_close($this->_curl);
-        }
-        $this->_curl         = null;
-        $this->_connected_to = array(null, null);
-    }
-
-    /**
-     * Get cUrl Handle
-     *
-     * @return resource
-     */
-    public function getHandle()
-    {
-        return $this->_curl;
-    }
-
-    /**
-     * Set output stream for the response
-     *
-     * @param resource $stream
-     * @return Zend_Http_Client_Adapter_Socket
-     */
-    public function setOutputStream($stream)
-    {
-        $this->out_stream = $stream;
-        return $this;
-    }
-
-    /**
-     * Header reader function for CURL
-     *
-     * @param resource $curl
-     * @param string $header
-     * @return int
-     */
-    public function readHeader($curl, $header)
-    {
-        $this->_response .= $header;
-        return strlen($header);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Exception.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Exception.php
deleted file mode 100644
index c744c54ab..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter_Exception
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Http_Client_Exception
- */
-require_once 'Zend/Http/Client/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception
-{
-    const READ_TIMEOUT = 1000;
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Interface.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Interface.php
deleted file mode 100644
index be9d18794..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Interface.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * An interface description for Zend_Http_Client_Adapter classes.
- *
- * These classes are used as connectors for Zend_Http_Client, performing the
- * tasks of connecting, writing, reading and closing connection to the server.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Http_Client_Adapter_Interface
-{
-    /**
-     * Set the configuration array for the adapter
-     *
-     * @param array $config
-     */
-    public function setConfig($config = array());
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     */
-    public function connect($host, $port = 80, $secure = false);
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $url
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as text
-     */
-    public function write($method, $url, $http_ver = '1.1', $headers = array(), $body = '');
-
-    /**
-     * Read response from server
-     *
-     * @return string
-     */
-    public function read();
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close();
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Proxy.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Proxy.php
deleted file mode 100644
index aaec6f658..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Proxy.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Proxy.php 20947 2010-02-06 17:09:07Z padraic $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri_Http
- */
-require_once 'Zend/Uri/Http.php';
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-/**
- * @see Zend_Http_Client_Adapter_Socket
- */
-require_once 'Zend/Http/Client/Adapter/Socket.php';
-
-/**
- * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default
- * socket based adapter.
- *
- * Should be used if proxy HTTP access is required. If no proxy is set, will
- * fall back to Zend_Http_Client_Adapter_Socket behavior. Just like the
- * default Socket adapter, this adapter does not require any special extensions
- * installed.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket
-{
-    /**
-     * Parameters array
-     *
-     * @var array
-     */
-    protected $config = array(
-        'ssltransport'  => 'ssl',
-        'sslcert'       => null,
-        'sslpassphrase' => null,
-        'proxy_host'    => '',
-        'proxy_port'    => 8080,
-        'proxy_user'    => '',
-        'proxy_pass'    => '',
-        'proxy_auth'    => Zend_Http_Client::AUTH_BASIC,
-        'persistent'    => false
-    );
-
-    /**
-     * Whether HTTPS CONNECT was already negotiated with the proxy or not
-     *
-     * @var boolean
-     */
-    protected $negotiated = false;
-
-    /**
-     * Connect to the remote server
-     *
-     * Will try to connect to the proxy server. If no proxy was set, will
-     * fall back to the target server (behave like regular Socket adapter)
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        // If no proxy is set, fall back to Socket adapter
-        if (! $this->config['proxy_host']) {
-            return parent::connect($host, $port, $secure);
-        }
-        
-        /* Url might require stream context even if proxy connection doesn't */
-        if ($secure) {
-        	$this->config['sslusecontext'] = true;
-        }
-
-        // Connect (a non-secure connection) to the proxy server
-        return parent::connect(
-            $this->config['proxy_host'],
-            $this->config['proxy_port'],
-            false
-        );
-    }
-
-    /**
-     * Send request to the proxy server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        // If no proxy is set, fall back to default Socket adapter
-        if (! $this->config['proxy_host']) return parent::write($method, $uri, $http_ver, $headers, $body);
-
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected");
-        }
-
-        $host = $this->config['proxy_host'];
-        $port = $this->config['proxy_port'];
-
-        if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong proxy server");
-        }
-
-        // Add Proxy-Authorization header
-        if ($this->config['proxy_user'] && ! isset($headers['proxy-authorization'])) {
-            $headers['proxy-authorization'] = Zend_Http_Client::encodeAuthHeader(
-                $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth']
-            );
-        }
-
-        // if we are proxying HTTPS, preform CONNECT handshake with the proxy
-        if ($uri->getScheme() == 'https' && (! $this->negotiated)) {
-            $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers);
-            $this->negotiated = true;
-        }
-
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        if ($this->negotiated) {
-            $path = $uri->getPath();
-            if ($uri->getQuery()) {
-                $path .= '?' . $uri->getQuery();
-            }
-            $request = "$method $path HTTP/$http_ver\r\n";
-        } else {
-            $request = "$method $uri HTTP/$http_ver\r\n";
-        }
-
-        // Add all headers to the request string
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = "$k: $v";
-            $request .= "$v\r\n";
-        }
-
-        // Add the request body
-        $request .= "\r\n" . $body;
-
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
-        }
-
-        return $request;
-    }
-
-    /**
-     * Preform handshaking with HTTPS proxy using CONNECT method
-     *
-     * @param string  $host
-     * @param integer $port
-     * @param string  $http_ver
-     * @param array   $headers
-     */
-    protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array &$headers = array())
-    {
-        $request = "CONNECT $host:$port HTTP/$http_ver\r\n" .
-                   "Host: " . $this->config['proxy_host'] . "\r\n";
-
-        // Add the user-agent header
-        if (isset($this->config['useragent'])) {
-            $request .= "User-agent: " . $this->config['useragent'] . "\r\n";
-        }
-
-        // If the proxy-authorization header is set, send it to proxy but remove
-        // it from headers sent to target host
-        if (isset($headers['proxy-authorization'])) {
-            $request .= "Proxy-authorization: " . $headers['proxy-authorization'] . "\r\n";
-            unset($headers['proxy-authorization']);
-        }
-
-        $request .= "\r\n";
-
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server");
-        }
-
-        // Read response headers only
-        $response = '';
-        $gotStatus = false;
-        while ($line = @fgets($this->socket)) {
-            $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
-            if ($gotStatus) {
-                $response .= $line;
-                if (!chop($line)) break;
-            }
-        }
-
-        // Check that the response from the proxy is 200
-        if (Zend_Http_Response::extractCode($response) != 200) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception("Unable to connect to HTTPS proxy. Server response: " . $response);
-        }
-
-        // If all is good, switch socket to secure mode. We have to fall back
-        // through the different modes
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        $success = false;
-        foreach($modes as $mode) {
-            $success = stream_socket_enable_crypto($this->socket, true, $mode);
-            if ($success) break;
-        }
-
-        if (! $success) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" .
-                    " HTTPS server through proxy: could not negotiate secure connection.");
-        }
-    }
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        parent::close();
-        $this->negotiated = false;
-    }
-
-    /**
-     * Destructor: make sure the socket is disconnected
-     *
-     */
-    public function __destruct()
-    {
-        if ($this->socket) $this->close();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Socket.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Socket.php
deleted file mode 100644
index 1a8f0d6ac..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Socket.php
+++ /dev/null
@@ -1,535 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Socket.php 20947 2010-02-06 17:09:07Z padraic $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri_Http
- */
-require_once 'Zend/Uri/Http.php';
-/**
- * @see Zend_Http_Client_Adapter_Interface
- */
-require_once 'Zend/Http/Client/Adapter/Interface.php';
-/**
- * @see Zend_Http_Client_Adapter_Stream
- */
-require_once 'Zend/Http/Client/Adapter/Stream.php';
-
-/**
- * A sockets based (stream_socket_client) adapter class for Zend_Http_Client. Can be used
- * on almost every PHP environment, and does not require any special extensions.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream
-{
-    /**
-     * The socket for server connection
-     *
-     * @var resource|null
-     */
-    protected $socket = null;
-
-    /**
-     * What host/port are we connected to?
-     *
-     * @var array
-     */
-    protected $connected_to = array(null, null);
-
-    /**
-     * Stream for storing output
-     * 
-     * @var resource
-     */
-    protected $out_stream = null;
-    
-    /**
-     * Parameters array
-     *
-     * @var array
-     */
-    protected $config = array(
-        'persistent'    => false,
-        'ssltransport'  => 'ssl',
-        'sslcert'       => null,
-        'sslpassphrase' => null,
-        'sslusecontext' => false
-    );
-
-    /**
-     * Request method - will be set by write() and might be used by read()
-     *
-     * @var string
-     */
-    protected $method = null;
-
-    /**
-     * Stream context
-     *
-     * @var resource
-     */
-    protected $_context = null;
-
-    /**
-     * Adapter constructor, currently empty. Config is set using setConfig()
-     *
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Set the configuration array for the adapter
-     *
-     * @param Zend_Config | array $config
-     */
-    public function setConfig($config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-
-        } elseif (! is_array($config)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Array or Zend_Config object expected, got ' . gettype($config)
-            );
-        }
-
-        foreach ($config as $k => $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-    }
-
-	/**
- 	 * Retrieve the array of all configuration options
- 	 *
- 	 * @return array
- 	 */
- 	public function getConfig()
- 	{
- 	    return $this->config;
- 	}
-
- 	/**
-     * Set the stream context for the TCP connection to the server
-     *
-     * Can accept either a pre-existing stream context resource, or an array
-     * of stream options, similar to the options array passed to the
-     * stream_context_create() PHP function. In such case a new stream context
-     * will be created using the passed options.
-     *
-     * @since  Zend Framework 1.9
-     *
-     * @param  mixed $context Stream context or array of context options
-     * @return Zend_Http_Client_Adapter_Socket
-     */
-    public function setStreamContext($context)
-    {
-        if (is_resource($context) && get_resource_type($context) == 'stream-context') {
-            $this->_context = $context;
-
-        } elseif (is_array($context)) {
-            $this->_context = stream_context_create($context);
-
-        } else {
-            // Invalid parameter
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                "Expecting either a stream context resource or array, got " . gettype($context)
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the stream context for the TCP connection to the server.
-     *
-     * If no stream context is set, will create a default one.
-     *
-     * @return resource
-     */
-    public function getStreamContext()
-    {
-        if (! $this->_context) {
-            $this->_context = stream_context_create();
-        }
-
-        return $this->_context;
-    }
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        // If the URI should be accessed via SSL, prepend the Hostname with ssl://
-        $host = ($secure ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
-
-        // If we are connected to the wrong host, disconnect first
-        if (($this->connected_to[0] != $host || $this->connected_to[1] != $port)) {
-            if (is_resource($this->socket)) $this->close();
-        }
-
-        // Now, if we are not connected, connect
-        if (! is_resource($this->socket) || ! $this->config['keepalive']) {
-            $context = $this->getStreamContext();
-            if ($secure || $this->config['sslusecontext']) {
-                if ($this->config['sslcert'] !== null) {
-                    if (! stream_context_set_option($context, 'ssl', 'local_cert',
-                                                    $this->config['sslcert'])) {
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option');
-                    }
-                }
-                if ($this->config['sslpassphrase'] !== null) {
-                    if (! stream_context_set_option($context, 'ssl', 'passphrase',
-                                                    $this->config['sslpassphrase'])) {
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option');
-                    }
-                }
-            }
-
-            $flags = STREAM_CLIENT_CONNECT;
-            if ($this->config['persistent']) $flags |= STREAM_CLIENT_PERSISTENT;
-
-            $this->socket = @stream_socket_client($host . ':' . $port,
-                                                  $errno,
-                                                  $errstr,
-                                                  (int) $this->config['timeout'],
-                                                  $flags,
-                                                  $context);
-
-            if (! $this->socket) {
-                $this->close();
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception(
-                    'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
-            }
-
-            // Set the stream timeout
-            if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout');
-            }
-
-            // Update connected_to
-            $this->connected_to = array($host, $port);
-        }
-    }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        // Make sure we're properly connected
-        if (! $this->socket) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected');
-        }
-
-        $host = $uri->getHost();
-        $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host;
-        if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host');
-        }
-
-        // Save request method for later
-        $this->method = $method;
-
-        // Build request headers
-        $path = $uri->getPath();
-        if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
-        $request = "{$method} {$path} HTTP/{$http_ver}\r\n";
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = ucfirst($k) . ": $v";
-            $request .= "$v\r\n";
-        }
-
-        if(is_resource($body)) {
-            $request .= "\r\n";
-        } else {
-            // Add the request body
-            $request .= "\r\n" . $body;
-        }
-        
-        // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
-        }
-        
-        if(is_resource($body)) {
-            if(stream_copy_to_stream($body, $this->socket) == 0) {
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception('Error writing request to server');
-            }
-        }
-
-        return $request;
-    }
-
-    /**
-     * Read response from server
-     *
-     * @return string
-     */
-    public function read()
-    {
-        // First, read headers only
-        $response = '';
-        $gotStatus = false;
-        $stream = !empty($this->config['stream']);
-
-        while (($line = @fgets($this->socket)) !== false) {
-            $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
-            if ($gotStatus) {
-                $response .= $line;
-                if (rtrim($line) === '') break;
-            }
-        }
-        
-        $this->_checkSocketReadTimeout();
-
-        $statusCode = Zend_Http_Response::extractCode($response);
-
-        // Handle 100 and 101 responses internally by restarting the read again
-        if ($statusCode == 100 || $statusCode == 101) return $this->read();
-
-        // Check headers to see what kind of connection / transfer encoding we have
-        $headers = Zend_Http_Response::extractHeaders($response);
-
-        /**
-         * Responses to HEAD requests and 204 or 304 responses are not expected
-         * to have a body - stop reading here
-         */
-        if ($statusCode == 304 || $statusCode == 204 ||
-            $this->method == Zend_Http_Client::HEAD) {
-
-            // Close the connection if requested to do so by the server
-            if (isset($headers['connection']) && $headers['connection'] == 'close') {
-                $this->close();
-            }
-            return $response;
-        }
-
-        // If we got a 'transfer-encoding: chunked' header
-        if (isset($headers['transfer-encoding'])) {
-            
-            if (strtolower($headers['transfer-encoding']) == 'chunked') {
-
-                do {
-                    $line  = @fgets($this->socket);
-                    $this->_checkSocketReadTimeout();
-
-                    $chunk = $line;
-
-                    // Figure out the next chunk size
-                    $chunksize = trim($line);
-                    if (! ctype_xdigit($chunksize)) {
-                        $this->close();
-                        require_once 'Zend/Http/Client/Adapter/Exception.php';
-                        throw new Zend_Http_Client_Adapter_Exception('Invalid chunk size "' .
-                            $chunksize . '" unable to read chunked body');
-                    }
-
-                    // Convert the hexadecimal value to plain integer
-                    $chunksize = hexdec($chunksize);
-
-                    // Read next chunk
-                    $read_to = ftell($this->socket) + $chunksize;
-
-                    do {
-                        $current_pos = ftell($this->socket);
-                        if ($current_pos >= $read_to) break;
-
-                        if($this->out_stream) {
-                            if(stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
-                              $this->_checkSocketReadTimeout();
-                              break;   
-                             }
-                        } else {
-                            $line = @fread($this->socket, $read_to - $current_pos);
-                            if ($line === false || strlen($line) === 0) {
-                                $this->_checkSocketReadTimeout();
-                                break;
-                            }
-                                    $chunk .= $line;
-                        }
-                    } while (! feof($this->socket));
-
-                    $chunk .= @fgets($this->socket);
-                    $this->_checkSocketReadTimeout();
-
-                    if(!$this->out_stream) {
-                        $response .= $chunk;
-                    }
-                } while ($chunksize > 0);
-            } else {
-                $this->close();
-                throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' .
-                    $headers['transfer-encoding'] . '" transfer encoding');
-            }
-            
-            // We automatically decode chunked-messages when writing to a stream
-            // this means we have to disallow the Zend_Http_Response to do it again
-            if ($this->out_stream) {
-                $response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $response);
-            }
-        // Else, if we got the content-length header, read this number of bytes
-        } elseif (isset($headers['content-length'])) {
-
-            $current_pos = ftell($this->socket);
-            $chunk = '';
-
-            for ($read_to = $current_pos + $headers['content-length'];
-                 $read_to > $current_pos;
-                 $current_pos = ftell($this->socket)) {
-
-                 if($this->out_stream) {
-                     if(@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
-                          $this->_checkSocketReadTimeout();
-                          break;   
-                     }
-                 } else {
-                    $chunk = @fread($this->socket, $read_to - $current_pos);
-                    if ($chunk === false || strlen($chunk) === 0) {
-                        $this->_checkSocketReadTimeout();
-                        break;
-                    }
-
-                    $response .= $chunk;
-                }
-
-                // Break if the connection ended prematurely
-                if (feof($this->socket)) break;
-            }
-
-        // Fallback: just read the response until EOF
-        } else {
-
-            do {
-                if($this->out_stream) {
-                    if(@stream_copy_to_stream($this->socket, $this->out_stream) == 0) {
-                          $this->_checkSocketReadTimeout();
-                          break;   
-                     }
-                }  else {
-                    $buff = @fread($this->socket, 8192);
-                    if ($buff === false || strlen($buff) === 0) {
-                        $this->_checkSocketReadTimeout();
-                        break;
-                    } else {
-                        $response .= $buff;
-                    }
-                }
-
-            } while (feof($this->socket) === false);
-
-            $this->close();
-        }
-
-        // Close the connection if requested to do so by the server
-        if (isset($headers['connection']) && $headers['connection'] == 'close') {
-            $this->close();
-        }
-
-        return $response;
-    }
-
-    /**
-     * Close the connection to the server
-     *
-     */
-    public function close()
-    {
-        if (is_resource($this->socket)) @fclose($this->socket);
-        $this->socket = null;
-        $this->connected_to = array(null, null);
-    }
-
-    /**
-     * Check if the socket has timed out - if so close connection and throw
-     * an exception
-     *
-     * @throws Zend_Http_Client_Adapter_Exception with READ_TIMEOUT code
-     */
-    protected function _checkSocketReadTimeout()
-    {
-        if ($this->socket) {
-            $info = stream_get_meta_data($this->socket);
-            $timedout = $info['timed_out'];
-            if ($timedout) {
-                $this->close();
-                require_once 'Zend/Http/Client/Adapter/Exception.php';
-                throw new Zend_Http_Client_Adapter_Exception(
-                    "Read timed out after {$this->config['timeout']} seconds",
-                    Zend_Http_Client_Adapter_Exception::READ_TIMEOUT
-                );
-            }
-        }
-    }
-    
-    /**
-     * Set output stream for the response
-     * 
-     * @param resource $stream
-     * @return Zend_Http_Client_Adapter_Socket
-     */
-    public function setOutputStream($stream) 
-    {
-        $this->out_stream = $stream;
-        return $this;
-    }
-    
-    /**
-     * Destructor: make sure the socket is disconnected
-     *
-     * If we are in persistent TCP mode, will not close the connection
-     *
-     */
-    public function __destruct()
-    {
-        if (! $this->config['persistent']) {
-            if ($this->socket) $this->close();
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Stream.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Stream.php
deleted file mode 100644
index 58dd921f2..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Stream.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Interface.php 16214 2009-06-21 19:34:03Z thomas $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * An interface description for Zend_Http_Client_Adapter_Stream classes.
- *
- * This interface decribes Zend_Http_Client_Adapter which supports streaming.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Http_Client_Adapter_Stream
-{
-    /**
-     * Set output stream
-     * 
-     * This function sets output stream where the result will be stored.
-     * 
-     * @param resource $stream Stream to write the output to
-     * 
-     */
-    function setOutputStream($stream);
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Adapter/Test.php b/airtime_mvc/library/Zend/Http/Client/Adapter/Test.php
deleted file mode 100644
index 82e9f0411..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Adapter/Test.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @version    $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri_Http
- */
-require_once 'Zend/Uri/Http.php';
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-/**
- * @see Zend_Http_Client_Adapter_Interface
- */
-require_once 'Zend/Http/Client/Adapter/Interface.php';
-
-/**
- * A testing-purposes adapter.
- *
- * Should be used to test all components that rely on Zend_Http_Client,
- * without actually performing an HTTP request. You should instantiate this
- * object manually, and then set it as the client's adapter. Then, you can
- * set the expected response using the setResponse() method.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface
-{
-    /**
-     * Parameters array
-     *
-     * @var array
-     */
-    protected $config = array();
-
-    /**
-     * Buffer of responses to be returned by the read() method.  Can be
-     * set using setResponse() and addResponse().
-     *
-     * @var array
-     */
-    protected $responses = array("HTTP/1.1 400 Bad Request\r\n\r\n");
-
-    /**
-     * Current position in the response buffer
-     *
-     * @var integer
-     */
-    protected $responseIndex = 0;
-
-    /**
-     * Wether or not the next request will fail with an exception
-     *
-     * @var boolean
-     */
-    protected $_nextRequestWillFail = false;
-
-    /**
-     * Adapter constructor, currently empty. Config is set using setConfig()
-     *
-     */
-    public function __construct()
-    { }
-
-    /**
-     * Set the nextRequestWillFail flag
-     *
-     * @param boolean $flag
-     * @return Zend_Http_Client_Adapter_Test
-     */
-    public function setNextRequestWillFail($flag)
-    {
-        $this->_nextRequestWillFail = (bool) $flag;
-
-        return $this;
-    }
-
-    /**
-     * Set the configuration array for the adapter
-     *
-     * @param Zend_Config | array $config
-     */
-    public function setConfig($config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-
-        } elseif (! is_array($config)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Array or Zend_Config object expected, got ' . gettype($config)
-            );
-        }
-
-        foreach ($config as $k => $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-    }
-
-
-    /**
-     * Connect to the remote server
-     *
-     * @param string  $host
-     * @param int     $port
-     * @param boolean $secure
-     * @param int     $timeout
-     * @throws Zend_Http_Client_Adapter_Exception
-     */
-    public function connect($host, $port = 80, $secure = false)
-    {
-        if ($this->_nextRequestWillFail) {
-            $this->_nextRequestWillFail = false;
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception('Request failed');
-        }
-    }
-
-    /**
-     * Send request to the remote server
-     *
-     * @param string        $method
-     * @param Zend_Uri_Http $uri
-     * @param string        $http_ver
-     * @param array         $headers
-     * @param string        $body
-     * @return string Request as string
-     */
-    public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '')
-    {
-        $host = $uri->getHost();
-            $host = (strtolower($uri->getScheme()) == 'https' ? 'sslv2://' . $host : $host);
-
-        // Build request headers
-        $path = $uri->getPath();
-        if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
-        $request = "{$method} {$path} HTTP/{$http_ver}\r\n";
-        foreach ($headers as $k => $v) {
-            if (is_string($k)) $v = ucfirst($k) . ": $v";
-            $request .= "$v\r\n";
-        }
-
-        // Add the request body
-        $request .= "\r\n" . $body;
-
-        // Do nothing - just return the request as string
-
-        return $request;
-    }
-
-    /**
-     * Return the response set in $this->setResponse()
-     *
-     * @return string
-     */
-    public function read()
-    {
-        if ($this->responseIndex >= count($this->responses)) {
-            $this->responseIndex = 0;
-        }
-        return $this->responses[$this->responseIndex++];
-    }
-
-    /**
-     * Close the connection (dummy)
-     *
-     */
-    public function close()
-    { }
-
-    /**
-     * Set the HTTP response(s) to be returned by this adapter
-     *
-     * @param Zend_Http_Response|array|string $response
-     */
-    public function setResponse($response)
-    {
-        if ($response instanceof Zend_Http_Response) {
-            $response = $response->asString("\r\n");
-        }
-
-        $this->responses = (array)$response;
-        $this->responseIndex = 0;
-    }
-
-    /**
-     * Add another response to the response buffer.
-     *
-     * @param string Zend_Http_Response|$response
-     */
-    public function addResponse($response)
-    {
-         if ($response instanceof Zend_Http_Response) {
-            $response = $response->asString("\r\n");
-        }
-
-        $this->responses[] = $response;
-    }
-
-    /**
-     * Sets the position of the response buffer.  Selects which
-     * response will be returned on the next call to read().
-     *
-     * @param integer $index
-     */
-    public function setResponseIndex($index)
-    {
-        if ($index < 0 || $index >= count($this->responses)) {
-            require_once 'Zend/Http/Client/Adapter/Exception.php';
-            throw new Zend_Http_Client_Adapter_Exception(
-                'Index out of range of response buffer size');
-        }
-        $this->responseIndex = $index;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Client/Exception.php b/airtime_mvc/library/Zend/Http/Client/Exception.php
deleted file mode 100644
index 8d47dcbff..000000000
--- a/airtime_mvc/library/Zend/Http/Client/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Exception
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Http_Exception
- */
-require_once 'Zend/Http/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Client_Exception extends Zend_Http_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Http/Cookie.php b/airtime_mvc/library/Zend/Http/Cookie.php
deleted file mode 100644
index 987d7951a..000000000
--- a/airtime_mvc/library/Zend/Http/Cookie.php
+++ /dev/null
@@ -1,424 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Cookie
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Cookie.php 21020 2010-02-11 17:27:23Z shahar $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri_Http
- */
-require_once 'Zend/Uri/Http.php';
-
-
-/**
- * Zend_Http_Cookie is a class describing an HTTP cookie and all it's parameters.
- *
- * Zend_Http_Cookie is a class describing an HTTP cookie and all it's parameters. The
- * class also enables validating whether the cookie should be sent to the server in
- * a specified scenario according to the request URI, the expiry time and whether
- * session cookies should be used or not. Generally speaking cookies should be
- * contained in a Cookiejar object, or instantiated manually and added to an HTTP
- * request.
- *
- * See http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend_Http
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Cookie
-{
-    /**
-     * Cookie name
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Cookie value
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Cookie expiry date
-     *
-     * @var int
-     */
-    protected $expires;
-
-    /**
-     * Cookie domain
-     *
-     * @var string
-     */
-    protected $domain;
-
-    /**
-     * Cookie path
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Whether the cookie is secure or not
-     *
-     * @var boolean
-     */
-    protected $secure;
-
-    /**
-     * Whether the cookie value has been encoded/decoded
-     *
-     * @var boolean
-     */
-    protected $encodeValue;
-
-    /**
-     * Cookie object constructor
-     *
-     * @todo Add validation of each one of the parameters (legal domain, etc.)
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $domain
-     * @param int $expires
-     * @param string $path
-     * @param bool $secure
-     */
-    public function __construct($name, $value, $domain, $expires = null, $path = null, $secure = false)
-    {
-        if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})");
-        }
-
-        if (! $this->name = (string) $name) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Cookies must have a name');
-        }
-
-        if (! $this->domain = (string) $domain) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Cookies must have a domain');
-        }
-
-        $this->value = (string) $value;
-        $this->expires = ($expires === null ? null : (int) $expires);
-        $this->path = ($path ? $path : '/');
-        $this->secure = $secure;
-    }
-
-    /**
-     * Get Cookie name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get cookie value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Get cookie domain
-     *
-     * @return string
-     */
-    public function getDomain()
-    {
-        return $this->domain;
-    }
-
-    /**
-     * Get the cookie path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Get the expiry time of the cookie, or null if no expiry time is set
-     *
-     * @return int|null
-     */
-    public function getExpiryTime()
-    {
-        return $this->expires;
-    }
-
-    /**
-     * Check whether the cookie should only be sent over secure connections
-     *
-     * @return boolean
-     */
-    public function isSecure()
-    {
-        return $this->secure;
-    }
-
-    /**
-     * Check whether the cookie has expired
-     *
-     * Always returns false if the cookie is a session cookie (has no expiry time)
-     *
-     * @param int $now Timestamp to consider as "now"
-     * @return boolean
-     */
-    public function isExpired($now = null)
-    {
-        if ($now === null) $now = time();
-        if (is_int($this->expires) && $this->expires < $now) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check whether the cookie is a session cookie (has no expiry time set)
-     *
-     * @return boolean
-     */
-    public function isSessionCookie()
-    {
-        return ($this->expires === null);
-    }
-
-    /**
-     * Checks whether the cookie should be sent or not in a specific scenario
-     *
-     * @param string|Zend_Uri_Http $uri URI to check against (secure, domain, path)
-     * @param boolean $matchSessionCookies Whether to send session cookies
-     * @param int $now Override the current time when checking for expiry time
-     * @return boolean
-     */
-    public function match($uri, $matchSessionCookies = true, $now = null)
-    {
-        if (is_string ($uri)) {
-            $uri = Zend_Uri_Http::factory($uri);
-        }
-
-        // Make sure we have a valid Zend_Uri_Http object
-        if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI');
-        }
-
-        // Check that the cookie is secure (if required) and not expired
-        if ($this->secure && $uri->getScheme() != 'https') return false;
-        if ($this->isExpired($now)) return false;
-        if ($this->isSessionCookie() && ! $matchSessionCookies) return false;
-
-        // Check if the domain matches
-        if (! self::matchCookieDomain($this->getDomain(), $uri->getHost())) {
-            return false;
-        }
-
-        // Check that path matches using prefix match
-        if (! self::matchCookiePath($this->getPath(), $uri->getPath())) {
-            return false;
-        }
-
-        // If we didn't die until now, return true.
-        return true;
-    }
-
-    /**
-     * Get the cookie as a string, suitable for sending as a "Cookie" header in an
-     * HTTP request
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if ($this->encodeValue) {
-            return $this->name . '=' . urlencode($this->value) . ';';
-        }
-        return $this->name . '=' . $this->value . ';';
-    }
-
-    /**
-     * Generate a new Cookie object from a cookie string
-     * (for example the value of the Set-Cookie HTTP header)
-     *
-     * @param string $cookieStr
-     * @param Zend_Uri_Http|string $refUri Reference URI for default values (domain, path)
-     * @param boolean $encodeValue Weither or not the cookie's value should be
-     *                             passed through urlencode/urldecode
-     * @return Zend_Http_Cookie A new Zend_Http_Cookie object or false on failure.
-     */
-    public static function fromString($cookieStr, $refUri = null, $encodeValue = true)
-    {
-        // Set default values
-        if (is_string($refUri)) {
-            $refUri = Zend_Uri_Http::factory($refUri);
-        }
-
-        $name    = '';
-        $value   = '';
-        $domain  = '';
-        $path    = '';
-        $expires = null;
-        $secure  = false;
-        $parts   = explode(';', $cookieStr);
-
-        // If first part does not include '=', fail
-        if (strpos($parts[0], '=') === false) return false;
-
-        // Get the name and value of the cookie
-        list($name, $value) = explode('=', trim(array_shift($parts)), 2);
-        $name  = trim($name);
-        if ($encodeValue) {
-            $value = urldecode(trim($value));
-        }
-
-        // Set default domain and path
-        if ($refUri instanceof Zend_Uri_Http) {
-            $domain = $refUri->getHost();
-            $path = $refUri->getPath();
-            $path = substr($path, 0, strrpos($path, '/'));
-        }
-
-        // Set other cookie parameters
-        foreach ($parts as $part) {
-            $part = trim($part);
-            if (strtolower($part) == 'secure') {
-                $secure = true;
-                continue;
-            }
-
-            $keyValue = explode('=', $part, 2);
-            if (count($keyValue) == 2) {
-                list($k, $v) = $keyValue;
-                switch (strtolower($k))    {
-                    case 'expires':
-                        if(($expires = strtotime($v)) === false) {
-                            /**
-                             * The expiration is past Tue, 19 Jan 2038 03:14:07 UTC
-                             * the maximum for 32-bit signed integer. Zend_Date
-                             * can get around that limit.
-                             *
-                             * @see Zend_Date
-                             */
-                            require_once 'Zend/Date.php';
-
-                            $expireDate = new Zend_Date($v);
-                            $expires = $expireDate->getTimestamp();
-                        }
-                        break;
-
-                    case 'path':
-                        $path = $v;
-                        break;
-
-                    case 'domain':
-                        $domain = $v;
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-        }
-
-        if ($name !== '') {
-            $ret = new self($name, $value, $domain, $expires, $path, $secure);
-            $ret->encodeValue = ($encodeValue) ? true : false;
-            return $ret;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check if a cookie's domain matches a host name.
-     *
-     * Used by Zend_Http_Cookie and Zend_Http_CookieJar for cookie matching
-     *
-     * @param  string $cookieDomain
-     * @param  string $host
-     *
-     * @return boolean
-     */
-    public static function matchCookieDomain($cookieDomain, $host)
-    {
-        if (! $cookieDomain) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("\$cookieDomain is expected to be a cookie domain");
-        }
-
-        if (! $host) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("\$host is expected to be a host name");
-        }
-
-        $cookieDomain = strtolower($cookieDomain);
-        $host = strtolower($host);
-
-        if ($cookieDomain[0] == '.') {
-            $cookieDomain = substr($cookieDomain, 1);
-        }
-
-        // Check for either exact match or suffix match
-        return ($cookieDomain == $host ||
-                preg_match("/\.$cookieDomain$/", $host));
-    }
-
-    /**
-     * Check if a cookie's path matches a URL path
-     *
-     * Used by Zend_Http_Cookie and Zend_Http_CookieJar for cookie matching
-     *
-     * @param  string $cookiePath
-     * @param  string $path
-     * @return boolean
-     */
-    public static function matchCookiePath($cookiePath, $path)
-    {
-        if (! $cookiePath) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("\$cookiePath is expected to be a cookie path");
-        }
-
-        if (! $path) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("\$path is expected to be a host name");
-        }
-
-        return (strpos($path, $cookiePath) === 0);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/CookieJar.php b/airtime_mvc/library/Zend/Http/CookieJar.php
deleted file mode 100644
index 9253479cf..000000000
--- a/airtime_mvc/library/Zend/Http/CookieJar.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage CookieJar
- * @version    $Id: CookieJar.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Uri
- */
-require_once "Zend/Uri.php";
-/**
- * @see Zend_Http_Cookie
- */
-require_once "Zend/Http/Cookie.php";
-/**
- * @see Zend_Http_Response
- */
-require_once "Zend/Http/Response.php";
-
-/**
- * A Zend_Http_CookieJar object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend_Http_Client in order to manage cookies across HTTP requests and
- * responses.
- *
- * The class contains an array of Zend_Http_Cookie objects. Cookies can be added to the jar
- * automatically from a request or manually. Then, the jar can find and return the cookies
- * needed for a specific HTTP request.
- *
- * A special parameter can be passed to all methods of this class that return cookies: Cookies
- * can be returned either in their native form (as Zend_Http_Cookie objects) or as strings -
- * the later is suitable for sending as the value of the "Cookie" header in an HTTP request.
- * You can also choose, when returning more than one cookie, whether to get an array of strings
- * (by passing Zend_Http_CookieJar::COOKIE_STRING_ARRAY) or one unified string for all cookies
- * (by passing Zend_Http_CookieJar::COOKIE_STRING_CONCAT).
- *
- * @link       http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage CookieJar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_CookieJar implements Countable, IteratorAggregate
-{
-    /**
-     * Return cookie(s) as a Zend_Http_Cookie object
-     *
-     */
-    const COOKIE_OBJECT = 0;
-
-    /**
-     * Return cookie(s) as a string (suitable for sending in an HTTP request)
-     *
-     */
-    const COOKIE_STRING_ARRAY = 1;
-
-    /**
-     * Return all cookies as one long string (suitable for sending in an HTTP request)
-     *
-     */
-    const COOKIE_STRING_CONCAT = 2;
-
-    /**
-     * Array storing cookies
-     *
-     * Cookies are stored according to domain and path:
-     * $cookies
-     *  + www.mydomain.com
-     *    + /
-     *      - cookie1
-     *      - cookie2
-     *    + /somepath
-     *      - othercookie
-     *  + www.otherdomain.net
-     *    + /
-     *      - alsocookie
-     *
-     * @var array
-     */
-    protected $cookies = array();
-
-    /**
-     * The Zend_Http_Cookie array
-     *
-     * @var array
-     */
-    protected $_rawCookies = array();
-
-    /**
-     * Construct a new CookieJar object
-     *
-     */
-    public function __construct()
-    { }
-
-    /**
-     * Add a cookie to the jar. Cookie should be passed either as a Zend_Http_Cookie object
-     * or as a string - in which case an object is created from the string.
-     *
-     * @param Zend_Http_Cookie|string $cookie
-     * @param Zend_Uri_Http|string    $ref_uri Optional reference URI (for domain, path, secure)
-     */
-    public function addCookie($cookie, $ref_uri = null)
-    {
-        if (is_string($cookie)) {
-            $cookie = Zend_Http_Cookie::fromString($cookie, $ref_uri);
-        }
-
-        if ($cookie instanceof Zend_Http_Cookie) {
-            $domain = $cookie->getDomain();
-            $path = $cookie->getPath();
-            if (! isset($this->cookies[$domain])) $this->cookies[$domain] = array();
-            if (! isset($this->cookies[$domain][$path])) $this->cookies[$domain][$path] = array();
-            $this->cookies[$domain][$path][$cookie->getName()] = $cookie;
-            $this->_rawCookies[] = $cookie;
-        } else {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Supplient argument is not a valid cookie string or object');
-        }
-    }
-
-    /**
-     * Parse an HTTP response, adding all the cookies set in that response
-     * to the cookie jar.
-     *
-     * @param Zend_Http_Response $response
-     * @param Zend_Uri_Http|string $ref_uri Requested URI
-     */
-    public function addCookiesFromResponse($response, $ref_uri)
-    {
-        if (! $response instanceof Zend_Http_Response) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('$response is expected to be a Response object, ' .
-                gettype($response) . ' was passed');
-        }
-
-        $cookie_hdrs = $response->getHeader('Set-Cookie');
-
-        if (is_array($cookie_hdrs)) {
-            foreach ($cookie_hdrs as $cookie) {
-                $this->addCookie($cookie, $ref_uri);
-            }
-        } elseif (is_string($cookie_hdrs)) {
-            $this->addCookie($cookie_hdrs, $ref_uri);
-        }
-    }
-
-    /**
-     * Get all cookies in the cookie jar as an array
-     *
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @return array|string
-     */
-    public function getAllCookies($ret_as = self::COOKIE_OBJECT)
-    {
-        $cookies = $this->_flattenCookiesArray($this->cookies, $ret_as);
-        return $cookies;
-    }
-
-    /**
-     * Return an array of all cookies matching a specific request according to the request URI,
-     * whether session cookies should be sent or not, and the time to consider as "now" when
-     * checking cookie expiry time.
-     *
-     * @param string|Zend_Uri_Http $uri URI to check against (secure, domain, path)
-     * @param boolean $matchSessionCookies Whether to send session cookies
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @param int $now Override the current time when checking for expiry time
-     * @return array|string
-     */
-    public function getMatchingCookies($uri, $matchSessionCookies = true,
-        $ret_as = self::COOKIE_OBJECT, $now = null)
-    {
-        if (is_string($uri)) $uri = Zend_Uri::factory($uri);
-        if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("Invalid URI string or object passed");
-        }
-
-        // First, reduce the array of cookies to only those matching domain and path
-        $cookies = $this->_matchDomain($uri->getHost());
-        $cookies = $this->_matchPath($cookies, $uri->getPath());
-        $cookies = $this->_flattenCookiesArray($cookies, self::COOKIE_OBJECT);
-
-        // Next, run Cookie->match on all cookies to check secure, time and session mathcing
-        $ret = array();
-        foreach ($cookies as $cookie)
-            if ($cookie->match($uri, $matchSessionCookies, $now))
-                $ret[] = $cookie;
-
-        // Now, use self::_flattenCookiesArray again - only to convert to the return format ;)
-        $ret = $this->_flattenCookiesArray($ret, $ret_as);
-
-        return $ret;
-    }
-
-    /**
-     * Get a specific cookie according to a URI and name
-     *
-     * @param Zend_Uri_Http|string $uri The uri (domain and path) to match
-     * @param string $cookie_name The cookie's name
-     * @param int $ret_as Whether to return cookies as objects of Zend_Http_Cookie or as strings
-     * @return Zend_Http_Cookie|string
-     */
-    public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
-    {
-        if (is_string($uri)) {
-            $uri = Zend_Uri::factory($uri);
-        }
-
-        if (! $uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('Invalid URI specified');
-        }
-
-        // Get correct cookie path
-        $path = $uri->getPath();
-        $path = substr($path, 0, strrpos($path, '/'));
-        if (! $path) $path = '/';
-
-        if (isset($this->cookies[$uri->getHost()][$path][$cookie_name])) {
-            $cookie = $this->cookies[$uri->getHost()][$path][$cookie_name];
-
-            switch ($ret_as) {
-                case self::COOKIE_OBJECT:
-                    return $cookie;
-                    break;
-
-                case self::COOKIE_STRING_ARRAY:
-                case self::COOKIE_STRING_CONCAT:
-                    return $cookie->__toString();
-                    break;
-
-                default:
-                    require_once 'Zend/Http/Exception.php';
-                    throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}");
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Helper function to recursivly flatten an array. Shoud be used when exporting the
-     * cookies array (or parts of it)
-     *
-     * @param Zend_Http_Cookie|array $ptr
-     * @param int $ret_as What value to return
-     * @return array|string
-     */
-    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) {
-        if (is_array($ptr)) {
-            $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array());
-            foreach ($ptr as $item) {
-                if ($ret_as == self::COOKIE_STRING_CONCAT) {
-                    $ret .= $this->_flattenCookiesArray($item, $ret_as);
-                } else {
-                    $ret = array_merge($ret, $this->_flattenCookiesArray($item, $ret_as));
-                }
-            }
-            return $ret;
-        } elseif ($ptr instanceof Zend_Http_Cookie) {
-            switch ($ret_as) {
-                case self::COOKIE_STRING_ARRAY:
-                    return array($ptr->__toString());
-                    break;
-
-                case self::COOKIE_STRING_CONCAT:
-                    return $ptr->__toString();
-                    break;
-
-                case self::COOKIE_OBJECT:
-                default:
-                    return array($ptr);
-                    break;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Return a subset of the cookies array matching a specific domain
-     *
-     * @param string $domain
-     * @return array
-     */
-    protected function _matchDomain($domain)
-    {
-        $ret = array();
-
-        foreach (array_keys($this->cookies) as $cdom) {
-            if (Zend_Http_Cookie::matchCookieDomain($cdom, $domain)) {
-                $ret[$cdom] = $this->cookies[$cdom];
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return a subset of a domain-matching cookies that also match a specified path
-     *
-     * @param array $dom_array
-     * @param string $path
-     * @return array
-     */
-    protected function _matchPath($domains, $path)
-    {
-        $ret = array();
-
-        foreach ($domains as $dom => $paths_array) {
-            foreach (array_keys($paths_array) as $cpath) {
-                if (Zend_Http_Cookie::matchCookiePath($cpath, $path)) {
-                    if (! isset($ret[$dom])) {
-                        $ret[$dom] = array();
-                    }
-
-                    $ret[$dom][$cpath] = $paths_array[$cpath];
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Create a new CookieJar object and automatically load into it all the
-     * cookies set in an Http_Response object. If $uri is set, it will be
-     * considered as the requested URI for setting default domain and path
-     * of the cookie.
-     *
-     * @param Zend_Http_Response $response HTTP Response object
-     * @param Zend_Uri_Http|string $uri The requested URI
-     * @return Zend_Http_CookieJar
-     * @todo Add the $uri functionality.
-     */
-    public static function fromResponse(Zend_Http_Response $response, $ref_uri)
-    {
-        $jar = new self();
-        $jar->addCookiesFromResponse($response, $ref_uri);
-        return $jar;
-    }
-
-    /**
-     * Required by Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_rawCookies);
-    }
-
-    /**
-     * Required by IteratorAggregate interface
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_rawCookies);
-    }
-
-    /**
-     * Tells if the jar is empty of any cookie
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return count($this) == 0;
-    }
-
-    /**
-     * Empties the cookieJar of any cookie
-     *
-     * @return Zend_Http_CookieJar
-     */
-    public function reset()
-    {
-        $this->cookies = $this->_rawCookies = array();
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Exception.php b/airtime_mvc/library/Zend/Http/Exception.php
deleted file mode 100644
index 099dfde48..000000000
--- a/airtime_mvc/library/Zend/Http/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Exception
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Http/Response.php b/airtime_mvc/library/Zend/Http/Response.php
deleted file mode 100644
index b4d8847ba..000000000
--- a/airtime_mvc/library/Zend/Http/Response.php
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Response
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Http_Response represents an HTTP 1.0 / 1.1 response message. It
- * includes easy access to all the response's different elemts, as well as some
- * convenience methods for parsing and validating HTTP responses.
- *
- * @package    Zend_Http
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Response
-{
-    /**
-     * List of all known HTTP response codes - used by responseCodeAsText() to
-     * translate numeric codes to messages.
-     *
-     * @var array
-     */
-    protected static $messages = array(
-        // Informational 1xx
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // Success 2xx
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // Redirection 3xx
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        // 306 is deprecated but reserved
-        307 => 'Temporary Redirect',
-
-        // Client Error 4xx
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // Server Error 5xx
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded'
-    );
-
-    /**
-     * The HTTP version (1.0, 1.1)
-     *
-     * @var string
-     */
-    protected $version;
-
-    /**
-     * The HTTP response code
-     *
-     * @var int
-     */
-    protected $code;
-
-    /**
-     * The HTTP response code as string
-     * (e.g. 'Not Found' for 404 or 'Internal Server Error' for 500)
-     *
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * The HTTP response headers array
-     *
-     * @var array
-     */
-    protected $headers = array();
-
-    /**
-     * The HTTP response body
-     *
-     * @var string
-     */
-    protected $body;
-
-    /**
-     * HTTP response constructor
-     *
-     * In most cases, you would use Zend_Http_Response::fromString to parse an HTTP
-     * response string and create a new Zend_Http_Response object.
-     *
-     * NOTE: The constructor no longer accepts nulls or empty values for the code and
-     * headers and will throw an exception if the passed values do not form a valid HTTP
-     * responses.
-     *
-     * If no message is passed, the message will be guessed according to the response code.
-     *
-     * @param int $code Response code (200, 404, ...)
-     * @param array $headers Headers array
-     * @param string $body Response body
-     * @param string $version HTTP version
-     * @param string $message Response code as text
-     * @throws Zend_Http_Exception
-     */
-    public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
-    {
-        // Make sure the response code is valid and set it
-        if (self::responseCodeAsText($code) === null) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("{$code} is not a valid HTTP response code");
-        }
-
-        $this->code = $code;
-
-        // Make sure we got valid headers and set them
-        if (! is_array($headers)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception('No valid headers were passed');
-    }
-
-        foreach ($headers as $name => $value) {
-            if (is_int($name))
-                list($name, $value) = explode(": ", $value, 1);
-
-            $this->headers[ucwords(strtolower($name))] = $value;
-        }
-
-        // Set the body
-        $this->body = $body;
-
-        // Set the HTTP version
-        if (! preg_match('|^\d\.\d$|', $version)) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception("Invalid HTTP response version: $version");
-        }
-
-        $this->version = $version;
-
-        // If we got the response message, set it. Else, set it according to
-        // the response code
-        if (is_string($message)) {
-            $this->message = $message;
-        } else {
-            $this->message = self::responseCodeAsText($code);
-        }
-    }
-
-    /**
-     * Check whether the response is an error
-     *
-     * @return boolean
-     */
-    public function isError()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 4 || $restype == 5) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether the response in successful
-     *
-     * @return boolean
-     */
-    public function isSuccessful()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 2 || $restype == 1) { // Shouldn't 3xx count as success as well ???
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether the response is a redirection
-     *
-     * @return boolean
-     */
-    public function isRedirect()
-    {
-        $restype = floor($this->code / 100);
-        if ($restype == 3) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the response body as string
-     *
-     * This method returns the body of the HTTP response (the content), as it
-     * should be in it's readable version - that is, after decoding it (if it
-     * was decoded), deflating it (if it was gzip compressed), etc.
-     *
-     * If you want to get the raw body (as transfered on wire) use
-     * $this->getRawBody() instead.
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        $body = '';
-
-        // Decode the body if it was transfer-encoded
-        switch (strtolower($this->getHeader('transfer-encoding'))) {
-
-            // Handle chunked body
-            case 'chunked':
-                $body = self::decodeChunkedBody($this->body);
-                break;
-
-            // No transfer encoding, or unknown encoding extension:
-            // return body as is
-            default:
-                $body = $this->body;
-                break;
-        }
-
-        // Decode any content-encoding (gzip or deflate) if needed
-        switch (strtolower($this->getHeader('content-encoding'))) {
-
-            // Handle gzip encoding
-            case 'gzip':
-                $body = self::decodeGzip($body);
-                break;
-
-            // Handle deflate encoding
-            case 'deflate':
-                $body = self::decodeDeflate($body);
-                break;
-
-            default:
-                break;
-        }
-
-        return $body;
-    }
-
-    /**
-     * Get the raw response body (as transfered "on wire") as string
-     *
-     * If the body is encoded (with Transfer-Encoding, not content-encoding -
-     * IE "chunked" body), gzip compressed, etc. it will not be decoded.
-     *
-     * @return string
-     */
-    public function getRawBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Get the HTTP version of the response
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Get the HTTP response status code
-     *
-     * @return int
-     */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Return a message describing the HTTP response code
-     * (Eg. "OK", "Not Found", "Moved Permanently")
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Get the response headers
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Get a specific header as string, or null if it is not set
-     *
-     * @param string$header
-     * @return string|array|null
-     */
-    public function getHeader($header)
-    {
-        $header = ucwords(strtolower($header));
-        if (! is_string($header) || ! isset($this->headers[$header])) return null;
-
-        return $this->headers[$header];
-    }
-
-    /**
-     * Get all headers as string
-     *
-     * @param boolean $status_line Whether to return the first status line (IE "HTTP 200 OK")
-     * @param string $br Line breaks (eg. "\n", "\r\n", "<br />")
-     * @return string
-     */
-    public function getHeadersAsString($status_line = true, $br = "\n")
-    {
-        $str = '';
-
-        if ($status_line) {
-            $str = "HTTP/{$this->version} {$this->code} {$this->message}{$br}";
-        }
-
-        // Iterate over the headers and stringify them
-        foreach ($this->headers as $name => $value)
-        {
-            if (is_string($value))
-                $str .= "{$name}: {$value}{$br}";
-
-            elseif (is_array($value)) {
-                foreach ($value as $subval) {
-                    $str .= "{$name}: {$subval}{$br}";
-                }
-            }
-        }
-
-        return $str;
-    }
-
-    /**
-     * Get the entire response as string
-     *
-     * @param string $br Line breaks (eg. "\n", "\r\n", "<br />")
-     * @return string
-     */
-    public function asString($br = "\n")
-    {
-        return $this->getHeadersAsString(true, $br) . $br . $this->getRawBody();
-    }
-
-    /**
-     * Implements magic __toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->asString();
-    }
-
-    /**
-     * A convenience function that returns a text representation of
-     * HTTP response codes. Returns 'Unknown' for unknown codes.
-     * Returns array of all codes, if $code is not specified.
-     *
-     * Conforms to HTTP/1.1 as defined in RFC 2616 (except for 'Unknown')
-     * See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10 for reference
-     *
-     * @param int $code HTTP response code
-     * @param boolean $http11 Use HTTP version 1.1
-     * @return string
-     */
-    public static function responseCodeAsText($code = null, $http11 = true)
-    {
-        $messages = self::$messages;
-        if (! $http11) $messages[302] = 'Moved Temporarily';
-
-        if ($code === null) {
-            return $messages;
-        } elseif (isset($messages[$code])) {
-            return $messages[$code];
-        } else {
-            return 'Unknown';
-        }
-    }
-
-    /**
-     * Extract the response code from a response string
-     *
-     * @param string $response_str
-     * @return int
-     */
-    public static function extractCode($response_str)
-    {
-        preg_match("|^HTTP/[\d\.x]+ (\d+)|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return (int) $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the HTTP message from a response
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractMessage($response_str)
-    {
-        preg_match("|^HTTP/[\d\.x]+ \d+ ([^\r\n]+)|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the HTTP version from a response
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractVersion($response_str)
-    {
-        preg_match("|^HTTP/([\d\.x]+) \d+|", $response_str, $m);
-
-        if (isset($m[1])) {
-            return $m[1];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Extract the headers from a response string
-     *
-     * @param string $response_str
-     * @return array
-     */
-    public static function extractHeaders($response_str)
-    {
-        $headers = array();
-
-        // First, split body and headers
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
-        if (! $parts[0]) return $headers;
-
-        // Split headers part to lines
-        $lines = explode("\n", $parts[0]);
-        unset($parts);
-        $last_header = null;
-
-        foreach($lines as $line) {
-            $line = trim($line, "\r\n");
-            if ($line == "") break;
-
-            if (preg_match("|^([\w-]+):\s+(.+)|", $line, $m)) {
-                unset($last_header);
-                $h_name = strtolower($m[1]);
-                $h_value = $m[2];
-
-                if (isset($headers[$h_name])) {
-                    if (! is_array($headers[$h_name])) {
-                        $headers[$h_name] = array($headers[$h_name]);
-                    }
-
-                    $headers[$h_name][] = $h_value;
-                } else {
-                    $headers[$h_name] = $h_value;
-                }
-                $last_header = $h_name;
-            } elseif (preg_match("|^\s+(.+)$|", $line, $m) && $last_header !== null) {
-                if (is_array($headers[$last_header])) {
-                    end($headers[$last_header]);
-                    $last_header_key = key($headers[$last_header]);
-                    $headers[$last_header][$last_header_key] .= $m[1];
-                } else {
-                    $headers[$last_header] .= $m[1];
-                }
-            }
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Extract the body from a response string
-     *
-     * @param string $response_str
-     * @return string
-     */
-    public static function extractBody($response_str)
-    {
-        $parts = preg_split('|(?:\r?\n){2}|m', $response_str, 2);
-        if (isset($parts[1])) {
-            return $parts[1];
-        }
-        return '';
-    }
-
-    /**
-     * Decode a "chunked" transfer-encoded body and return the decoded text
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeChunkedBody($body)
-    {
-        $decBody = '';
-
-        // If mbstring overloads substr and strlen functions, we have to
-        // override it's internal encoding
-        if (function_exists('mb_internal_encoding') &&
-           ((int) ini_get('mbstring.func_overload')) & 2) {
-
-            $mbIntEnc = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        while (trim($body)) {
-            if (! preg_match("/^([\da-fA-F]+)[^\r\n]*\r\n/sm", $body, $m)) {
-                require_once 'Zend/Http/Exception.php';
-                throw new Zend_Http_Exception("Error parsing body - doesn't seem to be a chunked message");
-            }
-
-            $length = hexdec(trim($m[1]));
-            $cut = strlen($m[0]);
-            $decBody .= substr($body, $cut, $length);
-            $body = substr($body, $cut + $length + 2);
-        }
-
-        if (isset($mbIntEnc)) {
-            mb_internal_encoding($mbIntEnc);
-        }
-
-        return $decBody;
-    }
-
-    /**
-     * Decode a gzip encoded message (when Content-encoding = gzip)
-     *
-     * Currently requires PHP with zlib support
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeGzip($body)
-    {
-        if (! function_exists('gzinflate')) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception(
-                'zlib extension is required in order to decode "gzip" encoding'
-            );
-        }
-
-        return gzinflate(substr($body, 10));
-    }
-
-    /**
-     * Decode a zlib deflated message (when Content-encoding = deflate)
-     *
-     * Currently requires PHP with zlib support
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeDeflate($body)
-    {
-        if (! function_exists('gzuncompress')) {
-            require_once 'Zend/Http/Exception.php';
-            throw new Zend_Http_Exception(
-                'zlib extension is required in order to decode "deflate" encoding'
-            );
-        }
-
-        /**
-         * Some servers (IIS ?) send a broken deflate response, without the
-         * RFC-required zlib header.
-         *
-         * We try to detect the zlib header, and if it does not exsit we
-         * teat the body is plain DEFLATE content.
-         *
-         * This method was adapted from PEAR HTTP_Request2 by (c) Alexey Borzov
-         *
-         * @link http://framework.zend.com/issues/browse/ZF-6040
-         */
-        $zlibHeader = unpack('n', substr($body, 0, 2));
-        if ($zlibHeader[1] % 31 == 0) {
-            return gzuncompress($body);
-        } else {
-            return gzinflate($body);
-        }
-    }
-
-    /**
-     * Create a new Zend_Http_Response object from a string
-     *
-     * @param string $response_str
-     * @return Zend_Http_Response
-     */
-    public static function fromString($response_str)
-    {
-        $code    = self::extractCode($response_str);
-        $headers = self::extractHeaders($response_str);
-        $body    = self::extractBody($response_str);
-        $version = self::extractVersion($response_str);
-        $message = self::extractMessage($response_str);
-
-        return new Zend_Http_Response($code, $headers, $body, $version, $message);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Http/Response/Stream.php b/airtime_mvc/library/Zend/Http/Response/Stream.php
deleted file mode 100644
index 667ca321a..000000000
--- a/airtime_mvc/library/Zend/Http/Response/Stream.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Response
- * @version    $Id: Response.php 17131 2009-07-26 10:03:39Z shahar $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Http_Response represents an HTTP 1.0 / 1.1 response message. It
- * includes easy access to all the response's different elemts, as well as some
- * convenience methods for parsing and validating HTTP responses.
- *
- * @package    Zend_Http
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Http_Response_Stream extends Zend_Http_Response
-{
-    /**
-     * Response as stream
-     *
-     * @var resource
-     */
-    protected $stream;
-
-    /**
-     * The name of the file containing the stream
-     *
-     * Will be empty if stream is not file-based.
-     *
-     * @var string
-     */
-    protected $stream_name;
-
-    /**
-     * Should we clean up the stream file when this response is closed?
-     *
-     * @var boolean
-     */
-    protected $_cleanup;
-
-    /**
-     * Get the response as stream
-     *
-     * @return resourse
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Set the response stream
-     *
-     * @param resourse $stream
-     * @return Zend_Http_Response_Stream
-     */
-    public function setStream($stream)
-    {
-        $this->stream = $stream;
-        return $this;
-    }
-
-    /**
-     * Get the cleanup trigger
-     *
-     * @return boolean
-     */
-    public function getCleanup() {
-        return $this->_cleanup;
-    }
-
-    /**
-     * Set the cleanup trigger
-     *
-     * @param $cleanup Set cleanup trigger
-     */
-    public function setCleanup($cleanup = true) {
-        $this->_cleanup = $cleanup;
-    }
-
-    /**
-     * Get file name associated with the stream
-     *
-     * @return string
-     */
-    public function getStreamName() {
-        return $this->stream_name;
-    }
-
-    /**
-     * Set file name associated with the stream
-     *
-     * @param string $stream_name Name to set
-     * @return Zend_Http_Response_Stream
-     */
-    public function setStreamName($stream_name) {
-        $this->stream_name = $stream_name;
-        return $this;
-    }
-
-
-    /**
-     * HTTP response constructor
-     *
-     * In most cases, you would use Zend_Http_Response::fromString to parse an HTTP
-     * response string and create a new Zend_Http_Response object.
-     *
-     * NOTE: The constructor no longer accepts nulls or empty values for the code and
-     * headers and will throw an exception if the passed values do not form a valid HTTP
-     * responses.
-     *
-     * If no message is passed, the message will be guessed according to the response code.
-     *
-     * @param int $code Response code (200, 404, ...)
-     * @param array $headers Headers array
-     * @param string $body Response body
-     * @param string $version HTTP version
-     * @param string $message Response code as text
-     * @throws Zend_Http_Exception
-     */
-    public function __construct($code, $headers, $body = null, $version = '1.1', $message = null)
-    {
-
-        if(is_resource($body)) {
-            $this->setStream($body);
-            $body = '';
-        }
-        parent::__construct($code, $headers, $body, $version, $message);
-    }
-
-    /**
-     * Create a new Zend_Http_Response_Stream object from a string
-     *
-     * @param string $response_str
-     * @param resource $stream
-     * @return Zend_Http_Response_Stream
-     */
-    public static function fromStream($response_str, $stream)
-    {
-        $code    = self::extractCode($response_str);
-        $headers = self::extractHeaders($response_str);
-        $version = self::extractVersion($response_str);
-        $message = self::extractMessage($response_str);
-
-        return new self($code, $headers, $stream, $version, $message);
-    }
-
-    /**
-     * Get the response body as string
-     *
-     * This method returns the body of the HTTP response (the content), as it
-     * should be in it's readable version - that is, after decoding it (if it
-     * was decoded), deflating it (if it was gzip compressed), etc.
-     *
-     * If you want to get the raw body (as transfered on wire) use
-     * $this->getRawBody() instead.
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        if($this->stream != null) {
-            $this->readStream();
-        }
-        return parent::getBody();
-    }
-
-    /**
-     * Get the raw response body (as transfered "on wire") as string
-     *
-     * If the body is encoded (with Transfer-Encoding, not content-encoding -
-     * IE "chunked" body), gzip compressed, etc. it will not be decoded.
-     *
-     * @return string
-     */
-    public function getRawBody()
-    {
-        if($this->stream) {
-            $this->readStream();
-        }
-        return $this->body;
-    }
-
-    /**
-     * Read stream content and return it as string
-     *
-     * Function reads the remainder of the body from the stream and closes the stream.
-     *
-     * @return string
-     */
-    protected function readStream()
-    {
-        if(!is_resource($this->stream)) {
-            return '';
-        }
-
-        if(isset($headers['content-length'])) {
-            $this->body = stream_get_contents($this->stream, $headers['content-length']);
-        } else {
-            $this->body = stream_get_contents($this->stream);
-        }
-        fclose($this->stream);
-        $this->stream = null;
-    }
-
-    public function __destruct()
-    {
-        if(is_resource($this->stream)) {
-            fclose($this->stream);
-            $this->stream = null;
-        }
-        if($this->_cleanup) {
-            @unlink($this->stream_name);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/InfoCard.php b/airtime_mvc/library/Zend/InfoCard.php
deleted file mode 100644
index 810b47875..000000000
--- a/airtime_mvc/library/Zend/InfoCard.php
+++ /dev/null
@@ -1,497 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_EncryptedData
- */
-require_once 'Zend/InfoCard/Xml/EncryptedData.php';
-
-/**
- * Zend_InfoCard_Xml_Assertion
- */
-require_once 'Zend/InfoCard/Xml/Assertion.php';
-
-/**
- * Zend_InfoCard_Cipher
- */
-require_once 'Zend/InfoCard/Cipher.php';
-
-/**
- * Zend_InfoCard_Xml_Security
- */
-require_once 'Zend/InfoCard/Xml/Security.php';
-
-/**
- * Zend_InfoCard_Adapter_Interface
- */
-require_once 'Zend/InfoCard/Adapter/Interface.php';
-
-/**
- * Zend_InfoCard_Claims
- */
-require_once 'Zend/InfoCard/Claims.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard
-{
-    /**
-     * URI for XML Digital Signature SHA1 Digests
-     */
-    const DIGEST_SHA1        = 'http://www.w3.org/2000/09/xmldsig#sha1';
-
-    /**
-     * An array of certificate pair files and optional passwords for them to search
-     * when trying to determine which certificate was used to encrypt the transient key
-     *
-     * @var Array
-     */
-    protected $_keyPairs;
-
-    /**
-     * The instance to use to decrypt public-key encrypted data
-     *
-     * @var Zend_InfoCard_Cipher_Pki_Interface
-     */
-    protected $_pkiCipherObj;
-
-    /**
-     * The instance to use to decrypt symmetric encrypted data
-     *
-     * @var Zend_InfoCard_Cipher_Symmetric_Interface
-     */
-    protected $_symCipherObj;
-
-    /**
-     * The InfoCard Adapter to use for callbacks into the application using the component
-     * such as when storing assertions, etc.
-     *
-     * @var Zend_InfoCard_Adapter_Interface
-     */
-    protected $_adapter;
-
-
-    /**
-     * InfoCard Constructor
-     *
-     * @throws Zend_InfoCard_Exception
-     */
-    public function __construct()
-    {
-        $this->_keyPairs = array();
-
-        if(!extension_loaded('mcrypt')) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Use of the Zend_InfoCard component requires the mcrypt extension to be enabled in PHP");
-        }
-
-        if(!extension_loaded('openssl')) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Use of the Zend_InfoCard component requires the openssl extension to be enabled in PHP");
-        }
-    }
-
-    /**
-     * Sets the adapter uesd for callbacks into the application using the component, used
-     * when doing things such as storing / retrieving assertions, etc.
-     *
-     * @param Zend_InfoCard_Adapter_Interface $a The Adapter instance
-     * @return Zend_InfoCard The instnace
-     */
-    public function setAdapter(Zend_InfoCard_Adapter_Interface $a)
-    {
-        $this->_adapter = $a;
-        return $this;
-    }
-
-    /**
-     * Retrieves the adapter used for callbacks into the application using the component.
-     * If no adapter was set then an instance of Zend_InfoCard_Adapter_Default is used
-     *
-     * @return Zend_InfoCard_Adapter_Interface The Adapter instance
-     */
-    public function getAdapter()
-    {
-        if($this->_adapter === null) {
-            require_once 'Zend/InfoCard/Adapter/Default.php';
-            $this->setAdapter(new Zend_InfoCard_Adapter_Default());
-        }
-
-        return $this->_adapter;
-    }
-
-    /**
-     * Gets the Public Key Cipher object used in this instance
-     *
-     * @return Zend_InfoCard_Cipher_Pki_Interface
-     */
-    public function getPkiCipherObject()
-    {
-        return $this->_pkiCipherObj;
-    }
-
-    /**
-     * Sets the Public Key Cipher Object used in this instance
-     *
-     * @param Zend_InfoCard_Cipher_Pki_Interface $cipherObj
-     * @return Zend_InfoCard
-     */
-    public function setPkiCipherObject(Zend_InfoCard_Cipher_Pki_Interface $cipherObj)
-    {
-        $this->_pkiCipherObj = $cipherObj;
-        return $this;
-    }
-
-    /**
-     * Get the Symmetric Cipher Object used in this instance
-     *
-     * @return Zend_InfoCard_Cipher_Symmetric_Interface
-     */
-    public function getSymCipherObject()
-    {
-        return $this->_symCipherObj;
-    }
-
-    /**
-     * Sets the Symmetric Cipher Object used in this instance
-     *
-     * @param Zend_InfoCard_Cipher_Symmetric_Interface $cipherObj
-     * @return Zend_InfoCard
-     */
-    public function setSymCipherObject($cipherObj)
-    {
-        $this->_symCipherObj = $cipherObj;
-        return $this;
-    }
-
-    /**
-     * Remove a Certificate Pair by Key ID from the search list
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $key_id The Certificate Key ID returned from adding the certificate pair
-     * @return Zend_InfoCard
-     */
-    public function removeCertificatePair($key_id)
-    {
-
-        if(!key_exists($key_id, $this->_keyPairs)) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Attempted to remove unknown key id: $key_id");
-        }
-
-        unset($this->_keyPairs[$key_id]);
-        return $this;
-    }
-
-    /**
-     * Add a Certificate Pair to the list of certificates searched by the component
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $private_key_file The path to the private key file for the pair
-     * @param string $public_key_file The path to the certificate / public key for the pair
-     * @param string $type (optional) The URI for the type of key pair this is (default RSA with OAEP padding)
-     * @param string $password (optional) The password for the private key file if necessary
-     * @return string A key ID representing this key pair in the component
-     */
-    public function addCertificatePair($private_key_file, $public_key_file, $type = Zend_InfoCard_Cipher::ENC_RSA_OAEP_MGF1P, $password = null)
-    {
-        if(!file_exists($private_key_file) ||
-           !file_exists($public_key_file)) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Could not locate the public and private certificate pair files: $private_key_file, $public_key_file");
-        }
-
-        if(!is_readable($private_key_file) ||
-           !is_readable($public_key_file)) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Could not read the public and private certificate pair files (check permissions): $private_key_file, $public_key_file");
-        }
-
-        $key_id = md5($private_key_file.$public_key_file);
-
-        if(key_exists($key_id, $this->_keyPairs)) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Attempted to add previously existing certificate pair: $private_key_file, $public_key_file");
-        }
-
-        switch($type) {
-            case Zend_InfoCard_Cipher::ENC_RSA:
-            case Zend_InfoCard_Cipher::ENC_RSA_OAEP_MGF1P:
-                $this->_keyPairs[$key_id] = array('private' => $private_key_file,
-                                'public'      => $public_key_file,
-                                'type_uri'    => $type);
-
-                if($password !== null) {
-                    $this->_keyPairs[$key_id]['password'] = $password;
-                } else {
-                    $this->_keyPairs[$key_id]['password'] = null;
-                }
-
-                return $key_id;
-                break;
-            default:
-                require_once 'Zend/InfoCard/Exception.php';
-                throw new Zend_InfoCard_Exception("Invalid Certificate Pair Type specified: $type");
-        }
-    }
-
-    /**
-     * Return a Certificate Pair from a key ID
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $key_id The Key ID of the certificate pair in the component
-     * @return array An array containing the path to the private/public key files,
-     *               the type URI and the password if provided
-     */
-    public function getCertificatePair($key_id)
-    {
-        if(key_exists($key_id, $this->_keyPairs)) {
-            return $this->_keyPairs[$key_id];
-        }
-
-        require_once 'Zend/InfoCard/Exception.php';
-        throw new Zend_InfoCard_Exception("Invalid Certificate Pair ID provided: $key_id");
-    }
-
-    /**
-     * Retrieve the digest of a given public key / certificate using the provided digest
-     * method
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $key_id The certificate key id in the component
-     * @param string $digestMethod The URI of the digest method to use (default SHA1)
-     * @return string The digest value in binary format
-     */
-    protected function _getPublicKeyDigest($key_id, $digestMethod = self::DIGEST_SHA1)
-    {
-        $certificatePair = $this->getCertificatePair($key_id);
-
-        $temp = file($certificatePair['public']);
-        unset($temp[count($temp)-1]);
-        unset($temp[0]);
-        $certificateData = base64_decode(implode("\n", $temp));
-
-        switch($digestMethod) {
-            case self::DIGEST_SHA1:
-                $digest_retval = sha1($certificateData, true);
-                break;
-            default:
-                require_once 'Zend/InfoCard/Exception.php';
-                throw new Zend_InfoCard_Exception("Invalid Digest Type Provided: $digestMethod");
-        }
-
-        return $digest_retval;
-    }
-
-    /**
-     * Find a certificate pair based on a digest of its public key / certificate file
-     *
-     * @param string $digest The digest value of the public key wanted in binary form
-     * @param string $digestMethod The URI of the digest method used to calculate the digest
-     * @return mixed The Key ID of the matching certificate pair or false if not found
-     */
-    protected function _findCertifiatePairByDigest($digest, $digestMethod = self::DIGEST_SHA1)
-    {
-
-        foreach($this->_keyPairs as $key_id => $certificate_data) {
-
-            $cert_digest = $this->_getPublicKeyDigest($key_id, $digestMethod);
-
-            if($cert_digest == $digest) {
-                return $key_id;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Extracts the Signed Token from an EncryptedData block
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $strXmlToken The EncryptedData XML block
-     * @return string The XML of the Signed Token inside of the EncryptedData block
-     */
-    protected function _extractSignedToken($strXmlToken)
-    {
-        $encryptedData = Zend_InfoCard_Xml_EncryptedData::getInstance($strXmlToken);
-
-        // Determine the Encryption Method used to encrypt the token
-
-        switch($encryptedData->getEncryptionMethod()) {
-            case Zend_InfoCard_Cipher::ENC_AES128CBC:
-            case Zend_InfoCard_Cipher::ENC_AES256CBC:
-                break;
-            default:
-                require_once 'Zend/InfoCard/Exception.php';
-                throw new Zend_InfoCard_Exception("Unknown Encryption Method used in the secure token");
-        }
-
-        // Figure out the Key we are using to decrypt the token
-
-        $keyinfo = $encryptedData->getKeyInfo();
-
-        if(!($keyinfo instanceof Zend_InfoCard_Xml_KeyInfo_XmlDSig)) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Expected a XML digital signature KeyInfo, but was not found");
-        }
-
-
-        $encryptedKey = $keyinfo->getEncryptedKey();
-
-        switch($encryptedKey->getEncryptionMethod()) {
-            case Zend_InfoCard_Cipher::ENC_RSA:
-            case Zend_InfoCard_Cipher::ENC_RSA_OAEP_MGF1P:
-                break;
-            default:
-                require_once 'Zend/InfoCard/Exception.php';
-                throw new Zend_InfoCard_Exception("Unknown Key Encryption Method used in secure token");
-        }
-
-        $securityTokenRef = $encryptedKey->getKeyInfo()->getSecurityTokenReference();
-
-        $key_id = $this->_findCertifiatePairByDigest($securityTokenRef->getKeyReference());
-
-        if(!$key_id) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Unable to find key pair used to encrypt symmetric InfoCard Key");
-        }
-
-        $certificate_pair = $this->getCertificatePair($key_id);
-
-        // Santity Check
-
-        if($certificate_pair['type_uri'] != $encryptedKey->getEncryptionMethod()) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Certificate Pair which matches digest is not of same algorithm type as document, check addCertificate()");
-        }
-
-        $PKcipher = Zend_InfoCard_Cipher::getInstanceByURI($encryptedKey->getEncryptionMethod());
-
-        $base64DecodeSupportsStrictParam = version_compare(PHP_VERSION, '5.2.0', '>=');
-
-        if ($base64DecodeSupportsStrictParam) {
-            $keyCipherValueBase64Decoded = base64_decode($encryptedKey->getCipherValue(), true);
-        } else {
-            $keyCipherValueBase64Decoded = base64_decode($encryptedKey->getCipherValue());
-        }
-
-        $symmetricKey = $PKcipher->decrypt(
-            $keyCipherValueBase64Decoded,
-            file_get_contents($certificate_pair['private']),
-            $certificate_pair['password']
-            );
-
-        $symCipher = Zend_InfoCard_Cipher::getInstanceByURI($encryptedData->getEncryptionMethod());
-
-        if ($base64DecodeSupportsStrictParam) {
-            $dataCipherValueBase64Decoded = base64_decode($encryptedData->getCipherValue(), true);
-        } else {
-            $dataCipherValueBase64Decoded = base64_decode($encryptedData->getCipherValue());
-        }
-
-        $signedToken = $symCipher->decrypt($dataCipherValueBase64Decoded, $symmetricKey);
-
-        return $signedToken;
-    }
-
-    /**
-     * Process an input Infomation Card EncryptedData block sent from the client,
-     * validate it, and return the claims contained within it on success or an error message on error
-     *
-     * @param string $strXmlToken The XML token sent to the server from the client
-     * @return Zend_Infocard_Claims The Claims object containing the claims, or any errors which occurred
-     */
-    public function process($strXmlToken)
-    {
-
-        $retval = new Zend_InfoCard_Claims();
-
-        require_once 'Zend/InfoCard/Exception.php';
-        try {
-            $signedAssertionsXml = $this->_extractSignedToken($strXmlToken);
-        } catch(Zend_InfoCard_Exception $e) {
-            $retval->setError('Failed to extract assertion document');
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_PROCESSING_FAILURE);
-            return $retval;
-        }
-
-        try {
-            $assertions = Zend_InfoCard_Xml_Assertion::getInstance($signedAssertionsXml);
-        } catch(Zend_InfoCard_Exception $e) {
-            $retval->setError('Failure processing assertion document');
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_PROCESSING_FAILURE);
-            return $retval;
-        }
-
-        if(!($assertions instanceof Zend_InfoCard_Xml_Assertion_Interface)) {
-            throw new Zend_InfoCard_Exception("Invalid Assertion Object returned");
-        }
-
-        if(!($reference_id = Zend_InfoCard_Xml_Security::validateXMLSignature($assertions->asXML()))) {
-            $retval->setError("Failure Validating the Signature of the assertion document");
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_VALIDATION_FAILURE);
-            return $retval;
-        }
-
-        // The reference id should be locally scoped as far as I know
-        if($reference_id[0] == '#') {
-            $reference_id = substr($reference_id, 1);
-        } else {
-            $retval->setError("Reference of document signature does not reference the local document");
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_VALIDATION_FAILURE);
-            return $retval;
-        }
-
-        // Make sure the signature is in reference to the same document as the assertions
-        if($reference_id != $assertions->getAssertionID()) {
-            $retval->setError("Reference of document signature does not reference the local document");
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_VALIDATION_FAILURE);
-        }
-
-        // Validate we haven't seen this before and the conditions are acceptable
-        $conditions = $this->getAdapter()->retrieveAssertion($assertions->getAssertionURI(), $assertions->getAssertionID());
-
-        if($conditions === false) {
-            $conditions = $assertions->getConditions();
-        }
-
-
-        if(is_array($condition_error = $assertions->validateConditions($conditions))) {
-            $retval->setError("Conditions of assertion document are not met: {$condition_error[1]} ({$condition_error[0]})");
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_VALIDATION_FAILURE);
-        }
-
-        $attributes = $assertions->getAttributes();
-
-        $retval->setClaims($attributes);
-
-        if($retval->getCode() == 0) {
-            $retval->setCode(Zend_InfoCard_Claims::RESULT_SUCCESS);
-        }
-
-        return $retval;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Adapter/Default.php b/airtime_mvc/library/Zend/InfoCard/Adapter/Default.php
deleted file mode 100644
index 5400c4370..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Adapter/Default.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Adapter_Interface
- */
-require_once 'Zend/InfoCard/Adapter/Interface.php';
-
-/**
- * The default InfoCard component Adapter which serves as a pass-thru placeholder
- * for developers. Initially developed to provide a callback mechanism to store and retrieve
- * assertions as part of the validation process it can be used anytime callback facilities
- * are necessary
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Adapter_Default implements Zend_InfoCard_Adapter_Interface
-{
-    /**
-     * Store the assertion (pass-thru does nothing)
-     *
-     * @param string $assertionURI The assertion type URI
-     * @param string $assertionID The specific assertion ID
-     * @param array $conditions An array of claims to store associated with the assertion
-     * @return bool Always returns true (would return false on store failure)
-     */
-    public function storeAssertion($assertionURI, $assertionID, $conditions)
-    {
-        return true;
-    }
-
-    /**
-     * Retrieve an assertion (pass-thru does nothing)
-     *
-     * @param string $assertionURI The assertion type URI
-     * @param string $assertionID The assertion ID to retrieve
-     * @return mixed False if the assertion ID was not found for that URI, or an array of
-     *               conditions associated with that assertion if found (always returns false)
-     */
-    public function retrieveAssertion($assertionURI, $assertionID)
-    {
-        return false;
-    }
-
-    /**
-     * Remove an assertion (pass-thru does nothing)
-     *
-     * @param string $assertionURI The assertion type URI
-     * @param string $assertionID The assertion ID to remove
-     * @return bool Always returns true (false on removal failure)
-     */
-    public function removeAssertion($assertionURI, $assertionID)
-    {
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Adapter/Exception.php b/airtime_mvc/library/Zend/InfoCard/Adapter/Exception.php
deleted file mode 100644
index 803f9955e..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Adapter/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_InfoCard_Exception
- */
-require_once 'Zend/InfoCard/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Adapter_Exception extends Zend_InfoCard_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Adapter/Interface.php b/airtime_mvc/library/Zend/InfoCard/Adapter/Interface.php
deleted file mode 100644
index d19d66082..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Adapter/Interface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The interface required by all Zend_InfoCard Adapter classes to implement. It represents
- * a series of callback methods used by the component during processing of an information card
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Adapter_Interface
-{
-    /**
-     * Store the assertion's claims in persistent storage
-     *
-     * @param string $assertionURI The assertion type URI
-     * @param string $assertionID The specific assertion ID
-     * @param array $conditions An array of claims to store associated with the assertion
-     * @return bool True on success, false on failure
-     */
-    public function storeAssertion($assertionURI, $assertionID, $conditions);
-
-    /**
-     * Retrieve the claims of a given assertion from persistent storage
-     *
-     * @param string $assertionURI The assertion type URI
-     * @param string $assertionID The assertion ID to retrieve
-     * @return mixed False if the assertion ID was not found for that URI, or an array of
-     *               conditions associated with that assertion if found in the same format
-     *                  provided
-     */
-    public function retrieveAssertion($assertionURI, $assertionID);
-
-    /**
-     * Remove the claims of a given assertion from persistent storage
-     *
-     * @param string $asserionURI The assertion type URI
-     * @param string $assertionID The assertion ID to remove
-     * @return bool True on success, false on failure
-     */
-    public function removeAssertion($asserionURI, $assertionID);
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher.php b/airtime_mvc/library/Zend/InfoCard/Cipher.php
deleted file mode 100644
index 3bed59f35..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cipher.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Provides an abstraction for encryption ciphers used in an Information Card
- * implementation
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Cipher
-{
-    /**
-     * AES 256 Encryption with CBC
-     */
-    const ENC_AES256CBC      = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-
-    /**
-     * AES 128 Encryption with CBC
-     */
-    const ENC_AES128CBC      = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-
-    /**
-     * RSA Public Key Encryption with OAEP Padding
-     */
-    const ENC_RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-
-    /**
-     * RSA Public Key Encryption with no padding
-     */
-    const ENC_RSA            = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-
-    /**
-     * Constructor (disabled)
-     *
-     * @return void
-     * @codeCoverageIgnoreStart
-     */
-    protected function __construct()
-    {
-    }
-    // @codeCoverageIgnoreEnd
-    /**
-     * Returns an instance of a cipher object supported based on the URI provided
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     * @param string $uri The URI of the encryption method wantde
-     * @return mixed an Instance of Zend_InfoCard_Cipher_Symmetric_Interface or Zend_InfoCard_Cipher_Pki_Interface
-     *               depending on URI
-     */
-    static public function getInstanceByURI($uri)
-    {
-        switch($uri) {
-            case self::ENC_AES256CBC:
-                include_once 'Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php';
-                return new Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc();
-
-            case self::ENC_AES128CBC:
-                include_once 'Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php';
-                return new Zend_InfoCard_Cipher_Symmetric_Adapter_Aes128cbc();
-
-            case self::ENC_RSA_OAEP_MGF1P:
-                include_once 'Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php';
-                return new Zend_InfoCard_Cipher_Pki_Adapter_Rsa(Zend_InfoCard_Cipher_Pki_Adapter_Rsa::OAEP_PADDING);
-                break;
-
-            case self::ENC_RSA:
-                include_once 'Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php';
-                return new Zend_InfoCard_Cipher_Pki_Adapter_Rsa(Zend_InfoCard_Cipher_Pki_Adapter_Rsa::NO_PADDING);
-                break;
-
-            default:
-                require_once 'Zend/InfoCard/Cipher/Exception.php';
-                throw new Zend_InfoCard_Cipher_Exception("Unknown Cipher URI");
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Exception.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Exception.php
deleted file mode 100644
index 9b5ba16a8..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Exception
- */
-require_once 'Zend/InfoCard/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Cipher_Exception extends Zend_InfoCard_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php
deleted file mode 100644
index 6ab2e7cc8..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Pki_Interface
- */
-require_once 'Zend/InfoCard/Cipher/Pki/Interface.php';
-
-/**
- * An abstract class for public-key ciphers
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_InfoCard_Cipher_Pki_Adapter_Abstract implements Zend_InfoCard_Cipher_Pki_Interface
-{
-    /**
-     * OAEP Padding public key encryption
-     */
-    const OAEP_PADDING = 1;
-
-    /**
-     * No padding public key encryption
-     */
-    const NO_PADDING = 2;
-
-    /**
-     * The type of padding to use
-     *
-     * @var integer one of the padding constants in this class
-     */
-    protected $_padding;
-
-    /**
-     * Set the padding of the public key encryption
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     * @param integer $padding One of the constnats in this class
-     * @return Zend_InfoCard_Pki_Adapter_Abstract
-     */
-    public function setPadding($padding)
-    {
-        switch($padding) {
-            case self::OAEP_PADDING:
-            case self::NO_PADDING:
-                $this->_padding = $padding;
-                break;
-            default:
-                require_once 'Zend/InfoCard/Cipher/Exception.php';
-                throw new Zend_InfoCard_Cipher_Exception("Invalid Padding Type Provided");
-                break;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retruns the public-key padding used
-     *
-     * @return integer One of the padding constants in this class
-     */
-    public function getPadding()
-    {
-        return $this->_padding;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php
deleted file mode 100644
index a4eead456..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rsa.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Pki_Adapter_Abstract
- */
-require_once 'Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php';
-
-/**
- * Zend_InfoCard_Cipher_Pki_Rsa_Interface
- */
-require_once 'Zend/InfoCard/Cipher/Pki/Rsa/Interface.php';
-
-/**
- * RSA Public Key Encryption Cipher Object for the InfoCard component. Relies on OpenSSL
- * to implement the RSA algorithm
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Cipher_Pki_Adapter_Rsa
-    extends Zend_InfoCard_Cipher_Pki_Adapter_Abstract
-    implements Zend_InfoCard_Cipher_Pki_Rsa_Interface
-{
-
-    /**
-     * Object Constructor
-     *
-     * @param integer $padding The type of Padding to use
-     */
-    public function __construct($padding = Zend_InfoCard_Cipher_Pki_Adapter_Abstract::NO_PADDING)
-    {
-        // Can't test this..
-        // @codeCoverageIgnoreStart
-        if(!extension_loaded('openssl')) {
-            require_once 'Zend/InfoCard/Cipher/Exception.php';
-            throw new Zend_InfoCard_Cipher_Exception("Use of this PKI RSA Adapter requires the openssl extension loaded");
-        }
-        // @codeCoverageIgnoreEnd
-
-        $this->setPadding($padding);
-    }
-
-    /**
-     * Decrypts RSA encrypted data using the given private key
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     * @param string $encryptedData The encrypted data in binary format
-     * @param string $privateKey The private key in binary format
-     * @param string $password The private key passphrase
-     * @param integer $padding The padding to use during decryption (of not provided object value will be used)
-     * @return string The decrypted data
-     */
-    public function decrypt($encryptedData, $privateKey, $password = null, $padding = null)
-    {
-        $private_key = openssl_pkey_get_private(array($privateKey, $password));
-
-        if(!$private_key) {
-            require_once 'Zend/InfoCard/Cipher/Exception.php';
-            throw new Zend_InfoCard_Cipher_Exception("Failed to load private key");
-        }
-
-        if($padding !== null) {
-            try {
-                $this->setPadding($padding);
-            } catch(Exception $e) {
-                openssl_free_key($private_key);
-                throw $e;
-            }
-        }
-
-        switch($this->getPadding()) {
-            case self::NO_PADDING:
-                $openssl_padding = OPENSSL_NO_PADDING;
-                break;
-            case self::OAEP_PADDING:
-                $openssl_padding = OPENSSL_PKCS1_OAEP_PADDING;
-                break;
-        }
-
-        $result = openssl_private_decrypt($encryptedData, $decryptedData, $private_key, $openssl_padding);
-
-        openssl_free_key($private_key);
-
-        if(!$result) {
-            require_once 'Zend/InfoCard/Cipher/Exception.php';
-            throw new Zend_InfoCard_Cipher_Exception("Unable to Decrypt Value using provided private key");
-        }
-
-        if($this->getPadding() == self::NO_PADDING) {
-            $decryptedData = substr($decryptedData, 2);
-            $start = strpos($decryptedData, 0) + 1;
-            $decryptedData = substr($decryptedData, $start);
-        }
-
-        return $decryptedData;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Interface.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Interface.php
deleted file mode 100644
index 757ac92fa..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Interface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Empty Interface represents a Pki cipher object
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Cipher_Pki_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php
deleted file mode 100644
index 6ff95114e..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_PKI_Adapter_Abstract
- */
-require_once 'Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php';
-
-/**
- * The interface which defines the RSA Public-key encryption object
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Cipher_Pki_Rsa_Interface
-{
-    /**
-     * Decrypts RSA encrypted data using the given private key
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     * @param string $encryptedData The encrypted data in binary format
-     * @param string $privateKey The private key in binary format
-     * @param string $password The private key passphrase
-     * @param integer $padding The padding to use during decryption (of not provided object value will be used)
-     * @return string The decrypted data
-     */
-    public function decrypt($encryptedData, $privateKey, $password = null, $padding = Zend_InfoCard_Cipher_Pki_Adapter_Abstract::NO_PADDING);
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php
deleted file mode 100644
index e5718f79e..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Symmetric_Interface
- */
-require_once 'Zend/InfoCard/Cipher/Symmetric/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_InfoCard_Cipher_Symmetric_Adapter_Abstract
-    implements Zend_InfoCard_Cipher_Symmetric_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php
deleted file mode 100644
index c0930b70c..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Aes128cbc.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc
- */
-require_once 'Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php';
-
-/**
- * Implements AES128 with CBC encryption implemented using the mCrypt extension
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes128cbc
-    extends Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php
deleted file mode 100644
index b0d9f2187..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Aes256cbc.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Symmetric_Adapter_Abstract
- */
-require_once 'Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php';
-
-/**
- * Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface
- */
-require_once 'Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php';
-
-/**
- * Implements AES256 with CBC encryption implemented using the mCrypt extension
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc
-    extends Zend_InfoCard_Cipher_Symmetric_Adapter_Abstract
-    implements Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface
-{
-    /**
-     * The MCRYPT Cipher constant for this encryption
-     */
-    const MCRYPT_CIPHER = MCRYPT_RIJNDAEL_128;
-
-    /**
-     * The MCRYPT Mode constant for this encryption
-     */
-    const MCRYPT_MODE   = MCRYPT_MODE_CBC;
-
-    /**
-     * The default length of the IV to use
-     */
-    const IV_LENGTH     = 16;
-
-    /**
-     * The object constructor
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     */
-    public function __construct()
-    {
-        // Can't test for this
-        // @codeCoverageIgnoreStart
-        if(!extension_loaded('mcrypt')) {
-            require_once 'Zend/InfoCard/Cipher/Exception.php';
-            throw new Zend_InfoCard_Cipher_Exception("Use of the AES256CBC Cipher requires the mcrypt extension");
-        }
-        // @codeCoveregIgnoreEnd
-    }
-
-    /**
-     * Decrypts data using the AES Algorithm using the mCrypt extension
-     *
-     * @throws Zend_InfoCard_Cipher_Exception
-     * @param string $encryptedData The encrypted data in binary format
-     * @param string $decryptionKey The decryption key
-     * @param integer $iv_length The IV length to use
-     * @return string the decrypted data with any terminating nulls removed
-     */
-    public function decrypt($encryptedData, $decryptionKey, $iv_length = null)
-    {
-
-        $iv_length = ($iv_length === null) ? self::IV_LENGTH : $iv_length;
-
-        $mcrypt_iv = null;
-
-        if($iv_length > 0) {
-             $mcrypt_iv = substr($encryptedData, 0, $iv_length);
-            $encryptedData = substr($encryptedData, $iv_length);
-        }
-
-        $decrypted = mcrypt_decrypt(self::MCRYPT_CIPHER, $decryptionKey, $encryptedData, self::MCRYPT_MODE, $mcrypt_iv);
-
-        if(!$decrypted) {
-            require_once 'Zend/InfoCard/Cipher/Exception.php';
-            throw new Zend_InfoCard_Cipher_Exception("Failed to decrypt data using AES256CBC Algorithm");
-        }
-
-        $decryptedLength = strlen($decrypted);
-        $paddingLength = substr($decrypted, $decryptedLength -1, 1);
-        $decrypted = substr($decrypted, 0, $decryptedLength - ord($paddingLength));
-
-        return rtrim($decrypted, "\0");
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php
deleted file mode 100644
index ca0d2b3f4..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface
- */
-require_once 'Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Cipher_Symmetric_Aes128cbc_Interface
-    extends Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php
deleted file mode 100644
index 0c1b6452c..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface
-{
-    public function decrypt($encryptedData, $decryptionKey, $iv_length = null);
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Interface.php b/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Interface.php
deleted file mode 100644
index 72da65d0f..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Cipher/Symmetric/Interface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Cipher
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Cipher_Symmetric_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Claims.php b/airtime_mvc/library/Zend/InfoCard/Claims.php
deleted file mode 100644
index b246347d5..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Claims.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Claims.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Result value of the InfoCard component, contains any error messages and claims
- * from the processing of an information card.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Claims
-{
-    /**
-     * Successful validation and extraion of claims
-     */
-    const RESULT_SUCCESS = 1;
-
-    /**
-     * Indicates there was an error processing the XML document
-     */
-    const RESULT_PROCESSING_FAILURE = 2;
-
-    /**
-     * Indicates that the signature values within the XML document failed verification
-     */
-    const RESULT_VALIDATION_FAILURE = 3;
-
-    /**
-     * The default namespace to assume in these claims
-     *
-     * @var string
-     */
-    protected $_defaultNamespace  = null;
-
-    /**
-     * A boolean indicating if the claims should be consider "valid" or not based on processing
-     *
-     * @var bool
-     */
-    protected $_isValid = true;
-
-    /**
-     * The error message if any
-     *
-     * @var string
-     */
-    protected $_error = "";
-
-    /**
-     * An array of claims taken from the information card
-     *
-     * @var array
-     */
-    protected $_claims;
-
-    /**
-     * The result code of processing the information card as defined by the constants of this class
-     *
-     * @var integer
-     */
-    protected $_code;
-
-    /**
-     * Override for the safeguard which ensures that you don't use claims which failed validation.
-     * Used in situations when there was a validation error you'd like to ignore
-     *
-     * @return Zend_InfoCard_Claims
-     */
-    public function forceValid()
-    {
-        trigger_error("Forcing Claims to be valid although it is a security risk", E_USER_WARNING);
-        $this->_isValid = true;
-        return $this;
-    }
-
-    /**
-     * Retrieve the PPI (Private Personal Identifier) associated with the information card
-     *
-     * @return string the private personal identifier
-     */
-    public function getCardID()
-    {
-        return $this->getClaim('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier');
-    }
-
-    /**
-     * Retrieves the default namespace used in this information card. If a default namespace was not
-     * set, it figures out which one to consider 'default' by taking the first namespace sorted by use-count
-     * in claims
-     *
-     * @throws Zend_InfoCard_Exception
-     * @return string The default namespace
-     */
-    public function getDefaultNamespace()
-    {
-        if($this->_defaultNamespace === null) {
-            $namespaces = array();
-            $leader = '';
-            foreach($this->_claims as $claim) {
-                if(!isset($namespaces[$claim['namespace']])) {
-                    $namespaces[$claim['namespace']] = 1;
-                } else {
-                    $namespaces[$claim['namespace']]++;
-                }
-
-                if(empty($leader) || ($namespaces[$claim['namespace']] > $leader)) {
-                    $leader = $claim['namespace'];
-                }
-            }
-
-            if(empty($leader)) {
-                require_once 'Zend/InfoCard/Exception.php';
-                throw new Zend_InfoCard_Exception("Failed to determine default namespace");
-            }
-
-            $this->setDefaultNamespace($leader);
-        }
-
-        return $this->_defaultNamespace;
-    }
-
-    /**
-     * Set the default namespace, overriding any existing default
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param string $namespace The default namespace to use
-     * @return Zend_InfoCard_Claims
-     */
-    public function setDefaultNamespace($namespace)
-    {
-
-        foreach($this->_claims as $claim) {
-            if($namespace == $claim['namespace']) {
-                $this->_defaultNamespace = $namespace;
-                return $this;
-            }
-        }
-
-        require_once 'Zend/InfoCard/Exception.php';
-        throw new Zend_InfoCard_Exception("At least one claim must exist in specified namespace to make it the default namespace");
-    }
-
-    /**
-     * Indicates if this claim object contains validated claims or not
-     *
-     * @return bool
-     */
-    public function isValid()
-    {
-        return $this->_isValid;
-    }
-
-    /**
-     * Set the error message contained within the claims object
-     *
-     * @param string $error The error message
-     * @return Zend_InfoCard_Claims
-     */
-    public function setError($error)
-    {
-        $this->_error = $error;
-        $this->_isValid = false;
-        return $this;
-    }
-
-    /**
-     * Retrieve the error message contained within the claims object
-     *
-     * @return string The error message
-     */
-    public function getErrorMsg()
-    {
-        return $this->_error;
-    }
-
-    /**
-     * Set the claims for the claims object. Can only be set once and is done
-     * by the component itself. Internal use only.
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param array $claims
-     * @return Zend_InfoCard_Claims
-     */
-    public function setClaims(Array $claims)
-    {
-        if($this->_claims !== null) {
-            require_once 'Zend/InfoCard/Exception.php';
-            throw new Zend_InfoCard_Exception("Claim objects are read-only");
-        }
-
-        $this->_claims = $claims;
-        return $this;
-    }
-
-    /**
-     * Set the result code of the claims object.
-     *
-     * @throws Zend_InfoCard_Exception
-     * @param int $code The result code
-     * @return Zend_InfoCard_Claims
-     */
-    public function setCode($code)
-    {
-        switch($code) {
-            case self::RESULT_PROCESSING_FAILURE:
-            case self::RESULT_SUCCESS:
-            case self::RESULT_VALIDATION_FAILURE:
-                $this->_code = $code;
-                return $this;
-        }
-
-        require_once 'Zend/InfoCard/Exception.php';
-        throw new Zend_InfoCard_Exception("Attempted to set unknown error code");
-    }
-
-    /**
-     * Gets the result code of the claims object
-     *
-     * @return integer The result code
-     */
-    public function getCode()
-    {
-        return $this->_code;
-    }
-
-    /**
-     * Get a claim by providing its complete claim URI
-     *
-     * @param string $claimURI The complete claim URI to retrieve
-     * @return mixed The claim matching that specific URI or null if not found
-     */
-    public function getClaim($claimURI)
-    {
-        if($this->claimExists($claimURI)) {
-            return $this->_claims[$claimURI]['value'];
-        }
-
-        return null;
-    }
-
-    /**
-     * Indicates if a specific claim URI exists or not within the object
-     *
-     * @param string $claimURI The complete claim URI to check
-     * @return bool true if the claim exists, false if not found
-     */
-    public function claimExists($claimURI)
-    {
-        return isset($this->_claims[$claimURI]);
-    }
-
-    /**
-     * Magic helper function
-     * @throws Zend_InfoCard_Exception
-     */
-    public function __unset($k)
-    {
-        require_once 'Zend/InfoCard/Exception.php';
-        throw new Zend_InfoCard_Exception("Claim objects are read-only");
-    }
-
-    /**
-     * Magic helper function
-     */
-    public function __isset($k)
-    {
-        return $this->claimExists("{$this->getDefaultNamespace()}/$k");
-    }
-
-    /**
-     * Magic helper function
-     */
-    public function __get($k)
-    {
-        return $this->getClaim("{$this->getDefaultNamespace()}/$k");
-    }
-
-    /**
-     * Magic helper function
-     * @throws Zend_InfoCard_Exception
-     */
-    public function __set($k, $v)
-    {
-        require_once 'Zend/InfoCard/Exception.php';
-        throw new Zend_InfoCard_Exception("Claim objects are read-only");
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Exception.php b/airtime_mvc/library/Zend/InfoCard/Exception.php
deleted file mode 100644
index e185be5e3..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Exception.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-if (class_exists("Zend_Exception")) {
-    abstract class Zend_InfoCard_Exception_Abstract extends Zend_Exception
-    {
-    }
-} else {
-    abstract class Zend_InfoCard_Exception_Abstract extends Exception
-    {
-    }
-}
-
-/**
- * Base Exception class for the InfoCard component
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Exception extends Zend_InfoCard_Exception_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion.php b/airtime_mvc/library/Zend/InfoCard/Xml/Assertion.php
deleted file mode 100644
index 8b74b6fd2..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Assertion.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Assertion_Interface
- */
-require_once 'Zend/InfoCard/Xml/Assertion/Interface.php';
-
-/**
- * Factory object to retrieve an Assertion object based on the type of XML document provided
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-final class Zend_InfoCard_Xml_Assertion
-{
-    /**
-     * The namespace for a SAML-formatted Assertion document
-     */
-    const TYPE_SAML = 'urn:oasis:names:tc:SAML:1.0:assertion';
-
-    /**
-     * Constructor (disabled)
-     *
-     * @return void
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns an instance of a InfoCard Assertion object based on the XML data provided
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @param string $xmlData The XML-Formatted Assertion
-     * @return Zend_InfoCard_Xml_Assertion_Interface
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    static public function getInstance($xmlData)
-    {
-
-        if($xmlData instanceof Zend_InfoCard_Xml_Element) {
-            $strXmlData = $xmlData->asXML();
-        } else if (is_string($xmlData)) {
-            $strXmlData = $xmlData;
-        } else {
-            require_once 'Zend/InfoCard/Xml/Exception.php';
-            throw new Zend_InfoCard_Xml_Exception("Invalid Data provided to create instance");
-        }
-
-        $sxe = simplexml_load_string($strXmlData);
-
-        $namespaces = $sxe->getDocNameSpaces();
-
-        foreach($namespaces as $namespace) {
-            switch($namespace) {
-                case self::TYPE_SAML:
-                    include_once 'Zend/InfoCard/Xml/Assertion/Saml.php';
-                    return simplexml_load_string($strXmlData, 'Zend_InfoCard_Xml_Assertion_Saml', null);
-            }
-        }
-
-        require_once 'Zend/InfoCard/Xml/Exception.php';
-        throw new Zend_InfoCard_Xml_Exception("Unable to determine Assertion type by Namespace");
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Interface.php b/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Interface.php
deleted file mode 100644
index 0677f4270..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Interface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The Interface required by any InfoCard Assertion Object implemented within the component
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Xml_Assertion_Interface
-{
-    /**
-     * Get the Assertion ID of the assertion
-     *
-     * @return string The Assertion ID
-     */
-    public function getAssertionID();
-
-    /**
-     * Return an array of attributes (claims) contained within the assertion
-     *
-     * @return array An array of attributes / claims within the assertion
-     */
-    public function getAttributes();
-
-    /**
-     * Get the Assertion URI for this type of Assertion
-     *
-     * @return string the Assertion URI
-     */
-    public function getAssertionURI();
-
-    /**
-     * Return an array of conditions which the assertions are predicated on
-     *
-     * @return array an array of conditions
-     */
-    public function getConditions();
-
-    /**
-     * Validate the conditions array returned from the getConditions() call
-     *
-     * @param array $conditions An array of condtions for the assertion taken from getConditions()
-     * @return mixed Boolean true on success, an array of condition, error message on failure
-     */
-    public function validateConditions(Array $conditions);
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Saml.php b/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Saml.php
deleted file mode 100644
index c5af6dcb1..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Assertion/Saml.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Saml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * Zend_InfoCard_Xml_Assertion_Interface
- */
-require_once 'Zend/InfoCard/Xml/Assertion/Interface.php';
-
-/**
- * A Xml Assertion Document in SAML Token format
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Assertion_Saml
-    extends Zend_InfoCard_Xml_Element
-    implements Zend_InfoCard_Xml_Assertion_Interface
-{
-
-    /**
-     * Audience Restriction Condition
-     */
-    const CONDITION_AUDIENCE = 'AudienceRestrictionCondition';
-
-    /**
-     * The URI for a 'bearer' confirmation
-     */
-    const CONFIRMATION_BEARER = 'urn:oasis:names:tc:SAML:1.0:cm:bearer';
-
-    /**
-     * The amount of time in seconds to buffer when checking conditions to ensure
-     * that differences between client/server clocks don't interfer too much
-     */
-    const CONDITION_TIME_ADJ = 3600; // +- 5 minutes
-
-    protected function _getServerName() {
-        return $_SERVER['SERVER_NAME'];
-    }
-
-    protected function _getServerPort() {
-        return $_SERVER['SERVER_PORT'];
-    }
-
-    /**
-     * Validate the conditions array returned from the getConditions() call
-     *
-     * @param array $conditions An array of condtions for the assertion taken from getConditions()
-     * @return mixed Boolean true on success, an array of condition, error message on failure
-     */
-    public function validateConditions(Array $conditions)
-    {
-
-        $currentTime = time();
-
-        if(!empty($conditions)) {
-
-            foreach($conditions as $condition => $conditionValue) {
-                switch(strtolower($condition)) {
-                    case 'audiencerestrictioncondition':
-
-                        $serverName = $this->_getServerName();
-                        $serverPort = $this->_getServerPort();
-
-                        $self_aliases[] = $serverName;
-                        $self_aliases[] = "{{$serverName}:{$serverPort}";
-
-                        $found = false;
-                        if(is_array($conditionValue)) {
-                            foreach($conditionValue as $audience) {
-
-                                list(,,$audience) = explode('/', $audience);
-                                if(in_array($audience, $self_aliases)) {
-                                    $found = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        if(!$found) {
-                            return array($condition, 'Could not find self in allowed audience list');
-                        }
-
-                        break;
-                    case 'notbefore':
-                        $notbeforetime = strtotime($conditionValue);
-
-                        if($currentTime < $notbeforetime) {
-                            if($currentTime + self::CONDITION_TIME_ADJ < $notbeforetime) {
-                                return array($condition, 'Current time is before specified window');
-                            }
-                        }
-
-                        break;
-                    case 'notonorafter':
-                        $notonoraftertime = strtotime($conditionValue);
-
-                        if($currentTime >= $notonoraftertime) {
-                            if($currentTime - self::CONDITION_TIME_ADJ >= $notonoraftertime) {
-                                return array($condition, 'Current time is after specified window');
-                            }
-                        }
-
-                        break;
-
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the Assertion URI for this type of Assertion
-     *
-     * @return string the Assertion URI
-     */
-    public function getAssertionURI()
-    {
-        return Zend_InfoCard_Xml_Assertion::TYPE_SAML;
-    }
-
-    /**
-     * Get the Major Version of the SAML Assertion
-     *
-     * @return integer The major version number
-     */
-    public function getMajorVersion()
-    {
-        return (int)(string)$this['MajorVersion'];
-    }
-
-    /**
-     * The Minor Version of the SAML Assertion
-     *
-     * @return integer The minor version number
-     */
-    public function getMinorVersion()
-    {
-        return (int)(string)$this['MinorVersion'];
-    }
-
-    /**
-     * Get the Assertion ID of the assertion
-     *
-     * @return string The Assertion ID
-     */
-    public function getAssertionID()
-    {
-        return (string)$this['AssertionID'];
-    }
-
-    /**
-     * Get the Issuer URI of the assertion
-     *
-     * @return string the URI of the assertion Issuer
-     */
-    public function getIssuer()
-    {
-        return (string)$this['Issuer'];
-    }
-
-    /**
-     * Get the Timestamp of when the assertion was issued
-     *
-     * @return integer a UNIX timestamp representing when the assertion was issued
-     */
-    public function getIssuedTimestamp()
-    {
-        return strtotime((string)$this['IssueInstant']);
-    }
-
-    /**
-     * Return an array of conditions which the assertions are predicated on
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return array an array of conditions
-     */
-    public function getConditions()
-    {
-
-        list($conditions) = $this->xpath("//saml:Conditions");
-
-        if(!($conditions instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the saml:Conditions block");
-        }
-
-        $retval = array();
-
-        foreach($conditions->children('urn:oasis:names:tc:SAML:1.0:assertion') as $key => $value) {
-            switch($key) {
-                case self::CONDITION_AUDIENCE:
-                    foreach($value->children('urn:oasis:names:tc:SAML:1.0:assertion') as $audience_key => $audience_value) {
-                        if($audience_key == 'Audience') {
-                            $retval[$key][] = (string)$audience_value;
-                        }
-                    }
-                    break;
-            }
-        }
-
-        $retval['NotBefore'] = (string)$conditions['NotBefore'];
-        $retval['NotOnOrAfter'] = (string)$conditions['NotOnOrAfter'];
-
-        return $retval;
-    }
-
-    /**
-     * Get they KeyInfo element for the Subject KeyInfo block
-     *
-     * @todo Not Yet Implemented
-     * @ignore
-     */
-    public function getSubjectKeyInfo()
-    {
-        /**
-         * @todo Not sure if this is part of the scope for now..
-         */
-
-        if($this->getConfirmationMethod() == self::CONFIRMATION_BEARER) {
-            throw new Zend_InfoCard_Xml_Exception("Cannot get Subject Key Info when Confirmation Method was Bearer");
-        }
-    }
-
-    /**
-     * Return the Confirmation Method URI used in the Assertion
-     *
-     * @return string The confirmation method URI
-     */
-    public function getConfirmationMethod()
-    {
-        list($confirmation) = $this->xPath("//saml:ConfirmationMethod");
-        return (string)$confirmation;
-    }
-
-    /**
-     * Return an array of attributes (claims) contained within the assertion
-     *
-     * @return array An array of attributes / claims within the assertion
-     */
-    public function getAttributes()
-    {
-        $attributes = $this->xPath('//saml:Attribute');
-
-        $retval = array();
-        foreach($attributes as $key => $value) {
-
-            $retkey = (string)$value['AttributeNamespace'].'/'.(string)$value['AttributeName'];
-
-            $retval[$retkey]['name'] = (string)$value['AttributeName'];
-            $retval[$retkey]['namespace'] = (string)$value['AttributeNamespace'];
-
-            list($aValue) = $value->children('urn:oasis:names:tc:SAML:1.0:assertion');
-            $retval[$retkey]['value'] = (string)$aValue;
-        }
-
-        return $retval;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Element.php b/airtime_mvc/library/Zend/InfoCard/Xml/Element.php
deleted file mode 100644
index 27cdd9b7c..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Element.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element_Interface
- */
-require_once 'Zend/InfoCard/Xml/Element/Interface.php';
-
-/**
- * An abstract class representing a an XML data block
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_InfoCard_Xml_Element
-    extends SimpleXMLElement
-    implements Zend_InfoCard_Xml_Element_Interface
-{
-    /**
-     * Convert the object to a string by displaying its XML content
-     *
-     * @return string an XML representation of the object
-     */
-    public function __toString()
-    {
-        return $this->asXML();
-    }
-
-    /**
-     * Converts an XML Element object into a DOM object
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @param Zend_InfoCard_Xml_Element $e The object to convert
-     * @return DOMElement A DOMElement representation of the same object
-     */
-    static public function convertToDOM(Zend_InfoCard_Xml_Element $e)
-    {
-        $dom = dom_import_simplexml($e);
-
-        if(!($dom instanceof DOMElement)) {
-            // Zend_InfoCard_Xml_Element exntes SimpleXMLElement, so this should *never* fail
-            // @codeCoverageIgnoreStart
-            require_once 'Zend/InfoCard/Xml/Exception.php';
-            throw new Zend_InfoCard_Xml_Exception("Failed to convert between SimpleXML and DOM");
-            // @codeCoverageIgnoreEnd
-        }
-
-        return $dom;
-    }
-
-    /**
-     * Converts a DOMElement object into the specific class
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @param DOMElement $e The DOMElement object to convert
-     * @param string $classname The name of the class to convert it to (must inhert from Zend_InfoCard_Xml_Element)
-     * @return Zend_InfoCard_Xml_Element a Xml Element object from the DOM element
-     */
-    static public function convertToObject(DOMElement $e, $classname)
-    {
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-
-        $reflection = new ReflectionClass($classname);
-
-        if(!$reflection->isSubclassOf('Zend_InfoCard_Xml_Element')) {
-            require_once 'Zend/InfoCard/Xml/Exception.php';
-            throw new Zend_InfoCard_Xml_Exception("DOM element must be converted to an instance of Zend_InfoCard_Xml_Element");
-        }
-
-        $sxe = simplexml_import_dom($e, $classname);
-
-        if(!($sxe instanceof Zend_InfoCard_Xml_Element)) {
-            // Since we just checked to see if this was a subclass of Zend_infoCard_Xml_Element this shoudl never fail
-            // @codeCoverageIgnoreStart
-            require_once 'Zend/InfoCard/Xml/Exception.php';
-            throw new Zend_InfoCard_Xml_Exception("Failed to convert between DOM and SimpleXML");
-            // @codeCoverageIgnoreEnd
-        }
-
-        return $sxe;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Element/Interface.php b/airtime_mvc/library/Zend/InfoCard/Xml/Element/Interface.php
deleted file mode 100644
index 66c600442..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Element/Interface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The Interface used to represent an XML Data Type
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Xml_Element_Interface
-{
-    /**
-     * Return the data within the object as an XML document
-     */
-    public function asXML();
-
-    /**
-     * Magic function which allows us to treat the object as a string to return XML
-     * (same as the asXML() method)
-     */
-    public function __toString();
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData.php b/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData.php
deleted file mode 100644
index 1547f1b49..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EncryptedData.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * A factory class for producing Zend_InfoCard_Xml_EncryptedData objects based on
- * the type of XML document provided
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-final class Zend_InfoCard_Xml_EncryptedData
-{
-    /**
-     * Constructor (disabled)
-     *
-     * @return void
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns an instance of the class
-     *
-     * @param string $xmlData The XML EncryptedData String
-     * @return Zend_InfoCard_Xml_EncryptedData_Abstract
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    static public function getInstance($xmlData)
-    {
-
-        if($xmlData instanceof Zend_InfoCard_Xml_Element) {
-            $strXmlData = $xmlData->asXML();
-        } else if (is_string($xmlData)) {
-            $strXmlData = $xmlData;
-        } else {
-            require_once 'Zend/InfoCard/Xml/Exception.php';
-            throw new Zend_InfoCard_Xml_Exception("Invalid Data provided to create instance");
-        }
-
-        $sxe = simplexml_load_string($strXmlData);
-
-        switch($sxe['Type']) {
-            case 'http://www.w3.org/2001/04/xmlenc#Element':
-                include_once 'Zend/InfoCard/Xml/EncryptedData/XmlEnc.php';
-                return simplexml_load_string($strXmlData, 'Zend_InfoCard_Xml_EncryptedData_XmlEnc');
-            default:
-                require_once 'Zend/InfoCard/Xml/Exception.php';
-                throw new Zend_InfoCard_Xml_Exception("Unknown EncryptedData type found");
-                break;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php b/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php
deleted file mode 100644
index 15dbe37f0..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * Zend_InfoCard_Xml_KeyInfo
- */
-require_once 'Zend/InfoCard/Xml/KeyInfo.php';
-
-/**
- * An abstract class representing a generic EncryptedData XML block. This class is extended
- * into a specific type of EncryptedData XML block (i.e. XmlEnc) as necessary
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_InfoCard_Xml_EncryptedData_Abstract extends Zend_InfoCard_Xml_Element
-{
-
-    /**
-     * Returns the KeyInfo Block
-     *
-     * @return Zend_InfoCard_Xml_KeyInfo_Abstract
-     */
-    public function getKeyInfo()
-    {
-        return Zend_InfoCard_Xml_KeyInfo::getInstance($this->KeyInfo[0]);
-    }
-
-    /**
-     * Return the Encryption method used to encrypt the assertion document
-     * (the symmetric cipher)
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return string The URI of the Symmetric Encryption Method used
-     */
-    public function getEncryptionMethod()
-    {
-
-        /**
-         * @todo This is pretty hacky unless we can always be confident that the first
-         * EncryptionMethod block is the correct one (the AES or compariable symetric algorithm)..
-         * the second is the PK method if provided.
-         */
-        list($encryption_method) = $this->xpath("//enc:EncryptionMethod");
-
-        if(!($encryption_method instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the enc:EncryptionMethod symmetric encryption block");
-        }
-
-        $dom = self::convertToDOM($encryption_method);
-
-        if(!$dom->hasAttribute('Algorithm')) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to determine the encryption algorithm in the Symmetric enc:EncryptionMethod XML block");
-        }
-
-        return $dom->getAttribute('Algorithm');
-    }
-
-    /**
-     * Returns the value of the encrypted block
-     *
-     * @return string the value of the encrypted CipherValue block
-     */
-    abstract function getCipherValue();
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php b/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php
deleted file mode 100644
index ed4684533..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: XmlEnc.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_EncryptedData/Abstract.php
- */
-require_once 'Zend/InfoCard/Xml/EncryptedData/Abstract.php';
-
-/**
- * An XmlEnc formatted EncryptedData XML block
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_EncryptedData_XmlEnc extends Zend_InfoCard_Xml_EncryptedData_Abstract
-{
-
-    /**
-     * Returns the Encrypted CipherValue block from the EncryptedData XML document
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return string The value of the CipherValue block base64 encoded
-     */
-    public function getCipherValue()
-    {
-        $this->registerXPathNamespace('enc', 'http://www.w3.org/2001/04/xmlenc#');
-
-        list(,$cipherdata) = $this->xpath("//enc:CipherData");
-
-        if(!($cipherdata instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the enc:CipherData block");
-        }
-
-        list(,$ciphervalue) = $cipherdata->xpath("//enc:CipherValue");
-
-        if(!($ciphervalue instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to fidn the enc:CipherValue block");
-        }
-
-        return (string)$ciphervalue;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedKey.php b/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedKey.php
deleted file mode 100644
index 536b25c55..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/EncryptedKey.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EncryptedKey.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * Zend_InfoCard_Xml_EncryptedKey
- */
-require_once 'Zend/InfoCard/Xml/EncryptedKey.php';
-
-/**
- * Zend_InfoCard_Xml_KeyInfo_Interface
- */
-require_once 'Zend/InfoCard/Xml/KeyInfo/Interface.php';
-
-/**
- * An object representing an Xml EncryptedKEy block
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_EncryptedKey
-    extends Zend_InfoCard_Xml_Element
-    implements Zend_InfoCard_Xml_KeyInfo_Interface
-{
-    /**
-     * Return an instance of the object based on input XML Data
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @param string $xmlData The EncryptedKey XML Block
-     * @return Zend_InfoCard_Xml_EncryptedKey
-     */
-    static public function getInstance($xmlData)
-    {
-        if($xmlData instanceof Zend_InfoCard_Xml_Element) {
-            $strXmlData = $xmlData->asXML();
-        } else if (is_string($xmlData)) {
-            $strXmlData = $xmlData;
-        } else {
-            throw new Zend_InfoCard_Xml_Exception("Invalid Data provided to create instance");
-        }
-
-        $sxe = simplexml_load_string($strXmlData);
-
-        if($sxe->getName() != "EncryptedKey") {
-            throw new Zend_InfoCard_Xml_Exception("Invalid XML Block provided for EncryptedKey");
-        }
-
-        return simplexml_load_string($strXmlData, "Zend_InfoCard_Xml_EncryptedKey");
-    }
-
-    /**
-     * Returns the Encyption Method Algorithm URI of the block
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return string the Encryption method algorithm URI
-     */
-    public function getEncryptionMethod()
-    {
-
-        $this->registerXPathNamespace('e', 'http://www.w3.org/2001/04/xmlenc#');
-        list($encryption_method) = $this->xpath("//e:EncryptionMethod");
-
-        if(!($encryption_method instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the e:EncryptionMethod KeyInfo encryption block");
-        }
-
-        $dom = self::convertToDOM($encryption_method);
-
-        if(!$dom->hasAttribute('Algorithm')) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to determine the encryption algorithm in the Symmetric enc:EncryptionMethod XML block");
-        }
-
-        return $dom->getAttribute('Algorithm');
-
-    }
-
-    /**
-     * Returns the Digest Method Algorithm URI used
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return string the Digest Method Algorithm URI
-     */
-    public function getDigestMethod()
-    {
-        $this->registerXPathNamespace('e', 'http://www.w3.org/2001/04/xmlenc#');
-        list($encryption_method) = $this->xpath("//e:EncryptionMethod");
-
-        if(!($encryption_method instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the e:EncryptionMethod KeyInfo encryption block");
-        }
-
-        if(!($encryption_method->DigestMethod instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the DigestMethod block");
-        }
-
-        $dom = self::convertToDOM($encryption_method->DigestMethod);
-
-        if(!$dom->hasAttribute('Algorithm')) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to determine the digest algorithm for the symmetric Keyinfo");
-        }
-
-        return $dom->getAttribute('Algorithm');
-
-    }
-
-    /**
-     * Returns the KeyInfo block object
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return Zend_InfoCard_Xml_KeyInfo_Abstract
-     */
-    public function getKeyInfo()
-    {
-
-        if(isset($this->KeyInfo)) {
-            return Zend_InfoCard_Xml_KeyInfo::getInstance($this->KeyInfo);
-        }
-
-        throw new Zend_InfoCard_Xml_Exception("Unable to locate a KeyInfo block");
-    }
-
-    /**
-     * Return the encrypted value of the block in base64 format
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return string The Value of the CipherValue block in base64 format
-     */
-    public function getCipherValue()
-    {
-
-        $this->registerXPathNamespace('e', 'http://www.w3.org/2001/04/xmlenc#');
-
-        list($cipherdata) = $this->xpath("//e:CipherData");
-
-        if(!($cipherdata instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to find the e:CipherData block");
-        }
-
-        $cipherdata->registerXPathNameSpace('enc', 'http://www.w3.org/2001/04/xmlenc#');
-        list($ciphervalue) = $cipherdata->xpath("//enc:CipherValue");
-
-        if(!($ciphervalue instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to fidn the enc:CipherValue block");
-        }
-
-        return (string)$ciphervalue;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Exception.php b/airtime_mvc/library/Zend/InfoCard/Xml/Exception.php
deleted file mode 100644
index d961190ac..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Exception
- */
-require_once 'Zend/InfoCard/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Exception extends Zend_InfoCard_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo.php b/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo.php
deleted file mode 100644
index b850ec6f2..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: KeyInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * Factory class to return a XML KeyInfo block based on input XML
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_KeyInfo
-{
-    /**
-     * Constructor (disabled)
-     *
-     * @return void
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns an instance of KeyInfo object based on the input KeyInfo XML block
-     *
-     * @param string $xmlData The KeyInfo XML Block
-     * @return Zend_InfoCard_Xml_KeyInfo_Abstract
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    static public function getInstance($xmlData)
-    {
-
-        if($xmlData instanceof Zend_InfoCard_Xml_Element) {
-            $strXmlData = $xmlData->asXML();
-        } else if (is_string($xmlData)) {
-            $strXmlData = $xmlData;
-        } else {
-            throw new Zend_InfoCard_Xml_Exception("Invalid Data provided to create instance");
-        }
-
-        $sxe = simplexml_load_string($strXmlData);
-
-        $namespaces = $sxe->getDocNameSpaces();
-
-        if(!empty($namespaces)) {
-            foreach($sxe->getDocNameSpaces() as $namespace) {
-                switch($namespace) {
-                    case 'http://www.w3.org/2000/09/xmldsig#':
-                        include_once 'Zend/InfoCard/Xml/KeyInfo/XmlDSig.php';
-                        return simplexml_load_string($strXmlData, 'Zend_InfoCard_Xml_KeyInfo_XmlDSig');
-                    default:
-
-                        throw new Zend_InfoCard_Xml_Exception("Unknown KeyInfo Namespace provided");
-                    // We are ignoring these lines, as XDebug reports each as a "non executed" line
-                    // which breaks my coverage %
-                    // @codeCoverageIgnoreStart
-                }
-            }
-        }
-        // @codeCoverageIgnoreEnd
-
-        include_once 'Zend/InfoCard/Xml/KeyInfo/Default.php';
-        return simplexml_load_string($strXmlData, 'Zend_InfoCard_Xml_KeyInfo_Default');
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php b/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php
deleted file mode 100644
index 4ed3f2241..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_InfoCard_Xml_KeyInfo_Abstract extends Zend_InfoCard_Xml_Element
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Default.php b/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Default.php
deleted file mode 100644
index a56b1c81a..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Default.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_KeyInfo_Abstract
- */
-require_once 'Zend/InfoCard/Xml/KeyInfo/Abstract.php';
-
-/**
- * Zend_InfoCard_Xml_SecurityTokenReference
- */
-require_once 'Zend/InfoCard/Xml/SecurityTokenReference.php';
-
-/**
- * An object representation of a XML <KeyInfo> block which doesn't provide a namespace
- * In this context, it is assumed to mean that it is the type of KeyInfo block which
- * contains the SecurityTokenReference
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_KeyInfo_Default extends Zend_InfoCard_Xml_KeyInfo_Abstract
-{
-    /**
-     * Returns the object representation of the SecurityTokenReference block
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return Zend_InfoCard_Xml_SecurityTokenReference
-     */
-    public function getSecurityTokenReference()
-    {
-        $this->registerXPathNamespace('o', 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd');
-
-        list($sectokenref) = $this->xpath('//o:SecurityTokenReference');
-
-        if(!($sectokenref instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception('Could not locate the Security Token Reference');
-        }
-
-        return Zend_InfoCard_Xml_SecurityTokenReference::getInstance($sectokenref);
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Interface.php b/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Interface.php
deleted file mode 100644
index eda475ccf..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/Interface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Xml_KeyInfo_Interface
-{
-    /**
-     * Return an object representing a KeyInfo data type
-     *
-     * @return Zend_InfoCard_Xml_KeyInfo
-     */
-    public function getKeyInfo();
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php b/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php
deleted file mode 100644
index 378656c04..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: XmlDSig.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_KeyInfo_Abstract
- */
-require_once 'Zend/InfoCard/Xml/KeyInfo/Abstract.php';
-
-/**
- * Zend_InfoCard_Xml_EncryptedKey
- */
-require_once 'Zend/InfoCard/Xml/EncryptedKey.php';
-
-/**
- * Zend_InfoCard_Xml_KeyInfo_Interface
- */
-require_once 'Zend/InfoCard/Xml/KeyInfo/Interface.php';
-
-/**
- * Represents a Xml Digital Signature XML Data Block
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_KeyInfo_XmlDSig
-    extends Zend_InfoCard_Xml_KeyInfo_Abstract
-    implements Zend_InfoCard_Xml_KeyInfo_Interface
-{
-    /**
-     * Returns an instance of the EncryptedKey Data Block
-     *
-     * @throws Zend_InfoCard_Xml_Exception
-     * @return Zend_InfoCard_Xml_EncryptedKey
-     */
-    public function getEncryptedKey()
-    {
-        $this->registerXPathNamespace('e', 'http://www.w3.org/2001/04/xmlenc#');
-        list($encryptedkey) = $this->xpath('//e:EncryptedKey');
-
-        if(!($encryptedkey instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Failed to retrieve encrypted key");
-        }
-
-        return Zend_InfoCard_Xml_EncryptedKey::getInstance($encryptedkey);
-    }
-
-    /**
-     * Returns the KeyInfo Block within the encrypted key
-     *
-     * @return Zend_InfoCard_Xml_KeyInfo_Default
-     */
-    public function getKeyInfo()
-    {
-        return $this->getEncryptedKey()->getKeyInfo();
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security.php
deleted file mode 100644
index d36cfd5ca..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Security.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Security_Transform
- */
-require_once 'Zend/InfoCard/Xml/Security/Transform.php';
-
-/**
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security
-{
-    /**
-     * ASN.1 type INTEGER class
-     */
-    const ASN_TYPE_INTEGER = 0x02;
-
-    /**
-     * ASN.1 type BIT STRING class
-     */
-    const ASN_TYPE_BITSTRING = 0x03;
-
-    /**
-     * ASN.1 type SEQUENCE class
-     */
-    const ASN_TYPE_SEQUENCE = 0x30;
-
-    /**
-     * The URI for Canonical Method C14N Exclusive
-     */
-    const CANONICAL_METHOD_C14N_EXC = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-
-    /**
-     * The URI for Signature Method SHA1
-     */
-    const SIGNATURE_METHOD_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-
-    /**
-     * The URI for Digest Method SHA1
-     */
-    const DIGEST_METHOD_SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
-
-    /**
-     * The Identifier for RSA Keys
-     */
-    const RSA_KEY_IDENTIFIER = '300D06092A864886F70D0101010500';
-
-    /**
-     * Constructor  (disabled)
-     *
-     * @return void
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Validates the signature of a provided XML block
-     *
-     * @param  string $strXMLInput An XML block containing a Signature
-     * @return bool True if the signature validated, false otherwise
-     * @throws Zend_InfoCard_Xml_Security_Exception
-     */
-    static public function validateXMLSignature($strXMLInput)
-    {
-        if(!extension_loaded('openssl')) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("You must have the openssl extension installed to use this class");
-        }
-
-        $sxe = simplexml_load_string($strXMLInput);
-
-        if(!isset($sxe->Signature)) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Could not identify XML Signature element");
-        }
-
-        if(!isset($sxe->Signature->SignedInfo)) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Signature is missing a SignedInfo block");
-        }
-
-        if(!isset($sxe->Signature->SignatureValue)) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Signature is missing a SignatureValue block");
-        }
-
-        if(!isset($sxe->Signature->KeyInfo)) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Signature is missing a KeyInfo block");
-        }
-
-        if(!isset($sxe->Signature->KeyInfo->KeyValue)) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Signature is missing a KeyValue block");
-        }
-
-        switch((string)$sxe->Signature->SignedInfo->CanonicalizationMethod['Algorithm']) {
-            case self::CANONICAL_METHOD_C14N_EXC:
-                $cMethod = (string)$sxe->Signature->SignedInfo->CanonicalizationMethod['Algorithm'];
-                break;
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Unknown or unsupported CanonicalizationMethod Requested");
-                break;
-        }
-
-        switch((string)$sxe->Signature->SignedInfo->SignatureMethod['Algorithm']) {
-            case self::SIGNATURE_METHOD_SHA1:
-                $sMethod = (string)$sxe->Signature->SignedInfo->SignatureMethod['Algorithm'];
-                break;
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Unknown or unsupported SignatureMethod Requested");
-                break;
-        }
-
-        switch((string)$sxe->Signature->SignedInfo->Reference->DigestMethod['Algorithm']) {
-            case self::DIGEST_METHOD_SHA1:
-                $dMethod = (string)$sxe->Signature->SignedInfo->Reference->DigestMethod['Algorithm'];
-                break;
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Unknown or unsupported DigestMethod Requested");
-                break;
-        }
-
-        $base64DecodeSupportsStrictParam = version_compare(PHP_VERSION, '5.2.0', '>=');
-
-        if ($base64DecodeSupportsStrictParam) {
-            $dValue = base64_decode((string)$sxe->Signature->SignedInfo->Reference->DigestValue, true);
-        } else {
-            $dValue = base64_decode((string)$sxe->Signature->SignedInfo->Reference->DigestValue);
-        }
-
-        if ($base64DecodeSupportsStrictParam) {
-            $signatureValue = base64_decode((string)$sxe->Signature->SignatureValue, true);
-        } else {
-            $signatureValue = base64_decode((string)$sxe->Signature->SignatureValue);
-        }
-
-        $transformer = new Zend_InfoCard_Xml_Security_Transform();
-
-        foreach($sxe->Signature->SignedInfo->Reference->Transforms->children() as $transform) {
-            $transformer->addTransform((string)$transform['Algorithm']);
-        }
-
-        $transformed_xml = $transformer->applyTransforms($strXMLInput);
-
-        $transformed_xml_binhash = pack("H*", sha1($transformed_xml));
-
-        if($transformed_xml_binhash != $dValue) {
-            require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Exception("Locally Transformed XML does not match XML Document. Cannot Verify Signature");
-        }
-
-        $public_key = null;
-
-        switch(true) {
-            case isset($sxe->Signature->KeyInfo->KeyValue->X509Certificate):
-
-                $certificate = (string)$sxe->Signature->KeyInfo->KeyValue->X509Certificate;
-
-
-                $pem = "-----BEGIN CERTIFICATE-----\n" .
-                       wordwrap($certificate, 64, "\n", true) .
-                       "\n-----END CERTIFICATE-----";
-
-                $public_key = openssl_pkey_get_public($pem);
-
-                if(!$public_key) {
-                    require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                    throw new Zend_InfoCard_Xml_Security_Exception("Unable to extract and prcoess X509 Certificate from KeyValue");
-                }
-
-                break;
-            case isset($sxe->Signature->KeyInfo->KeyValue->RSAKeyValue):
-
-                if(!isset($sxe->Signature->KeyInfo->KeyValue->RSAKeyValue->Modulus) ||
-                   !isset($sxe->Signature->KeyInfo->KeyValue->RSAKeyValue->Exponent)) {
-                       require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                       throw new Zend_InfoCard_Xml_Security_Exception("RSA Key Value not in Modulus/Exponent form");
-                }
-
-                $modulus = base64_decode((string)$sxe->Signature->KeyInfo->KeyValue->RSAKeyValue->Modulus);
-                $exponent = base64_decode((string)$sxe->Signature->KeyInfo->KeyValue->RSAKeyValue->Exponent);
-
-                $pem_public_key = self::_getPublicKeyFromModExp($modulus, $exponent);
-
-                $public_key = openssl_pkey_get_public ($pem_public_key);
-
-                break;
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Unable to determine or unsupported representation of the KeyValue block");
-        }
-
-        $transformer = new Zend_InfoCard_Xml_Security_Transform();
-        $transformer->addTransform((string)$sxe->Signature->SignedInfo->CanonicalizationMethod['Algorithm']);
-
-        // The way we are doing our XML processing requires that we specifically add this
-        // (even though it's in the <Signature> parent-block).. otherwise, our canonical form
-        // fails signature verification
-        $sxe->Signature->SignedInfo->addAttribute('xmlns', 'http://www.w3.org/2000/09/xmldsig#');
-
-        $canonical_signedinfo = $transformer->applyTransforms($sxe->Signature->SignedInfo->asXML());
-
-        if(@openssl_verify($canonical_signedinfo, $signatureValue, $public_key)) {
-            return (string)$sxe->Signature->SignedInfo->Reference['URI'];
-        }
-
-        return false;
-    }
-
-    /**
-     * Transform an RSA Key in Modulus/Exponent format into a PEM encoding and
-     * return an openssl resource for it
-     *
-     * @param string $modulus The RSA Modulus in binary format
-     * @param string $exponent The RSA exponent in binary format
-     * @return string The PEM encoded version of the key
-     */
-    static protected function _getPublicKeyFromModExp($modulus, $exponent)
-    {
-        $modulusInteger  = self::_encodeValue($modulus, self::ASN_TYPE_INTEGER);
-        $exponentInteger = self::_encodeValue($exponent, self::ASN_TYPE_INTEGER);
-        $modExpSequence  = self::_encodeValue($modulusInteger . $exponentInteger, self::ASN_TYPE_SEQUENCE);
-        $modExpBitString = self::_encodeValue($modExpSequence, self::ASN_TYPE_BITSTRING);
-
-        $binRsaKeyIdentifier = pack( "H*", self::RSA_KEY_IDENTIFIER );
-
-        $publicKeySequence = self::_encodeValue($binRsaKeyIdentifier . $modExpBitString, self::ASN_TYPE_SEQUENCE);
-
-        $publicKeyInfoBase64 = base64_encode( $publicKeySequence );
-
-        $publicKeyString = "-----BEGIN PUBLIC KEY-----\n";
-        $publicKeyString .= wordwrap($publicKeyInfoBase64, 64, "\n", true);
-        $publicKeyString .= "\n-----END PUBLIC KEY-----\n";
-
-        return $publicKeyString;
-    }
-
-    /**
-     * Encode a limited set of data types into ASN.1 encoding format
-     * which is used in X.509 certificates
-     *
-     * @param string $data The data to encode
-     * @param const $type The encoding format constant
-     * @return string The encoded value
-     * @throws Zend_InfoCard_Xml_Security_Exception
-     */
-    static protected function _encodeValue($data, $type)
-    {
-        // Null pad some data when we get it (integer values > 128 and bitstrings)
-        if( (($type == self::ASN_TYPE_INTEGER) && (ord($data) > 0x7f)) ||
-            ($type == self::ASN_TYPE_BITSTRING)) {
-                $data = "\0$data";
-        }
-
-        $len = strlen($data);
-
-        // encode the value based on length of the string
-        // I'm fairly confident that this is by no means a complete implementation
-        // but it is enough for our purposes
-        switch(true) {
-            case ($len < 128):
-                return sprintf("%c%c%s", $type, $len, $data);
-            case ($len < 0x0100):
-                return sprintf("%c%c%c%s", $type, 0x81, $len, $data);
-            case ($len < 0x010000):
-                return sprintf("%c%c%c%c%s", $type, 0x82, $len / 0x0100, $len % 0x0100, $data);
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Could not encode value");
-        }
-
-        require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-        throw new Zend_InfoCard_Xml_Security_Exception("Invalid code path");
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Exception.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Exception.php
deleted file mode 100644
index 6f413d4f8..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Exception
- */
-require_once 'Zend/InfoCard/Xml/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security_Exception extends Zend_InfoCard_Xml_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform.php
deleted file mode 100644
index 2b32418f8..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Transform.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * A class to create a transform rule set based on XML URIs and then apply those rules
- * in the correct order to a given XML input
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security_Transform
-{
-    /**
-     * A list of transforms to apply
-     *
-     * @var array
-     */
-    protected $_transformList = array();
-
-    /**
-     * Returns the name of the transform class based on a given URI
-     *
-     * @throws Zend_InfoCard_Xml_Security_Exception
-     * @param string $uri The transform URI
-     * @return string The transform implementation class name
-     */
-    protected function _findClassbyURI($uri)
-    {
-        switch($uri) {
-            case 'http://www.w3.org/2000/09/xmldsig#enveloped-signature':
-                return 'Zend_InfoCard_Xml_Security_Transform_EnvelopedSignature';
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                return 'Zend_InfoCard_Xml_Security_Transform_XmlExcC14N';
-            default:
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Unknown or Unsupported Transformation Requested");
-        }
-    }
-
-    /**
-     * Add a Transform URI to the list of transforms to perform
-     *
-     * @param string $uri The Transform URI
-     * @return Zend_InfoCard_Xml_Security_Transform
-     */
-    public function addTransform($uri)
-    {
-        $class = $this->_findClassbyURI($uri);
-
-        $this->_transformList[] = array('uri' => $uri,
-                                        'class' => $class);
-        return $this;
-    }
-
-    /**
-     * Return the list of transforms to perform
-     *
-     * @return array The list of transforms
-     */
-    public function getTransformList()
-    {
-        return $this->_transformList;
-    }
-
-    /**
-     * Apply the transforms in the transform list to the input XML document
-     *
-     * @param string $strXmlDocument The input XML
-     * @return string The XML after the transformations have been applied
-     */
-    public function applyTransforms($strXmlDocument)
-    {
-        foreach($this->_transformList as $transform) {
-            if (!class_exists($transform['class'])) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($transform['class']);
-            }
-
-            $transformer = new $transform['class'];
-
-            // We can't really test this check because it would require logic changes in the component itself
-            // @codeCoverageIgnoreStart
-            if(!($transformer instanceof Zend_InfoCard_Xml_Security_Transform_Interface)) {
-                require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-                throw new Zend_InfoCard_Xml_Security_Exception("Transforms must implement the Transform Interface");
-            }
-            // @codeCoverageIgnoreEnd
-
-            $strXmlDocument = $transformer->transform($strXmlDocument);
-        }
-
-        return $strXmlDocument;
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php
deleted file mode 100644
index 50c9c1c93..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EnvelopedSignature.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Security_Transform_Interface
- */
-require_once 'Zend/InfoCard/Xml/Security/Transform/Interface.php';
-
-/**
- * A object implementing the EnvelopedSignature XML Transform
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security_Transform_EnvelopedSignature
-    implements Zend_InfoCard_Xml_Security_Transform_Interface
-{
-    /**
-     * Transforms the XML Document according to the EnvelopedSignature Transform
-     *
-     * @throws Zend_InfoCard_Xml_Security_Transform_Exception
-     * @param string $strXMLData The input XML data
-     * @return string the transformed XML data
-     */
-    public function transform($strXMLData)
-    {
-        $sxe = simplexml_load_string($strXMLData);
-
-        if(!$sxe->Signature) {
-            require_once 'Zend/InfoCard/Xml/Security/Transform/Exception.php';
-            throw new Zend_InfoCard_Xml_Security_Transform_Exception("Unable to locate Signature Block for EnvelopedSignature Transform");
-        }
-
-        unset($sxe->Signature);
-
-        return $sxe->asXML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Exception.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Exception.php
deleted file mode 100644
index 0ba2ff605..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Security_Exception
- */
-require_once 'Zend/InfoCard/Xml/Security/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security_Transform_Exception extends Zend_InfoCard_Xml_Security_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Interface.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Interface.php
deleted file mode 100644
index 9864c750b..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/Interface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for XML Security Transforms
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_InfoCard_Xml_Security_Transform_Interface
-{
-    /**
-     * Transform the given XML string according to the transform rules
-     * implemented by the object using this interface
-     *
-     * @throws Zend_InfoCard_Xml_Security_Transform_Exception
-     * @param string $strXmlData the input XML
-     * @return string the output XML
-     */
-    public function transform($strXmlData);
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php b/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php
deleted file mode 100644
index 8203f61dc..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: XmlExcC14N.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Security_Transform_Interface
- */
-require_once 'Zend/InfoCard/Xml/Security/Transform/Interface.php';
-
-/**
- * A Transform to perform C14n XML Exclusive Canonicalization
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml_Security
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_Security_Transform_XmlExcC14N
-    implements Zend_InfoCard_Xml_Security_Transform_Interface
-{
-    /**
-     * Transform the input XML based on C14n XML Exclusive Canonicalization rules
-     *
-     * @throws Zend_InfoCard_Xml_Security_Transform_Exception
-     * @param string $strXMLData The input XML
-     * @return string The output XML
-     */
-    public function transform($strXMLData)
-    {
-        $dom = new DOMDocument();
-        $dom->loadXML($strXMLData);
-
-        if(method_exists($dom, 'C14N')) {
-            return $dom->C14N(true, false);
-        }
-
-        require_once 'Zend/InfoCard/Xml/Security/Transform/Exception.php';
-        throw new Zend_InfoCard_Xml_Security_Transform_Exception("This transform requires the C14N() method to exist in the DOM extension");
-    }
-}
diff --git a/airtime_mvc/library/Zend/InfoCard/Xml/SecurityTokenReference.php b/airtime_mvc/library/Zend/InfoCard/Xml/SecurityTokenReference.php
deleted file mode 100644
index ae4c82b0c..000000000
--- a/airtime_mvc/library/Zend/InfoCard/Xml/SecurityTokenReference.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SecurityTokenReference.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_InfoCard_Xml_Element
- */
-require_once 'Zend/InfoCard/Xml/Element.php';
-
-/**
- * Represents a SecurityTokenReference XML block
- *
- * @category   Zend
- * @package    Zend_InfoCard
- * @subpackage Zend_InfoCard_Xml
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_InfoCard_Xml_SecurityTokenReference extends Zend_InfoCard_Xml_Element
-{
-    /**
-     * Base64 Binary Encoding URI
-     */
-    const ENCODING_BASE64BIN = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary';
-
-    /**
-     * Return an instance of the object based on the input XML
-     *
-     * @param string $xmlData The SecurityTokenReference XML Block
-     * @return Zend_InfoCard_Xml_SecurityTokenReference
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    static public function getInstance($xmlData)
-    {
-        if($xmlData instanceof Zend_InfoCard_Xml_Element) {
-            $strXmlData = $xmlData->asXML();
-        } else if (is_string($xmlData)) {
-            $strXmlData = $xmlData;
-        } else {
-            throw new Zend_InfoCard_Xml_Exception("Invalid Data provided to create instance");
-        }
-
-        $sxe = simplexml_load_string($strXmlData);
-
-        if($sxe->getName() != "SecurityTokenReference") {
-            throw new Zend_InfoCard_Xml_Exception("Invalid XML Block provided for SecurityTokenReference");
-        }
-
-        return simplexml_load_string($strXmlData, "Zend_InfoCard_Xml_SecurityTokenReference");
-    }
-
-    /**
-     * Return the Key Identifier XML Object
-     *
-     * @return Zend_InfoCard_Xml_Element
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    protected function _getKeyIdentifier()
-    {
-        $this->registerXPathNamespace('o', 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd');
-        list($keyident) = $this->xpath('//o:KeyIdentifier');
-
-        if(!($keyident instanceof Zend_InfoCard_Xml_Element)) {
-            throw new Zend_InfoCard_Xml_Exception("Failed to retrieve Key Identifier");
-        }
-
-        return $keyident;
-    }
-
-    /**
-     * Return the Key URI identifying the thumbprint type used
-     *
-     * @return string The thumbprint type URI
-     * @throws  Zend_InfoCard_Xml_Exception
-     */
-    public function getKeyThumbprintType()
-    {
-
-        $keyident = $this->_getKeyIdentifier();
-
-        $dom = self::convertToDOM($keyident);
-
-        if(!$dom->hasAttribute('ValueType')) {
-            throw new Zend_InfoCard_Xml_Exception("Key Identifier did not provide a type for the value");
-        }
-
-        return $dom->getAttribute('ValueType');
-    }
-
-
-    /**
-     * Return the thumbprint encoding type used as a URI
-     *
-     * @return string the URI of the thumbprint encoding used
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    public function getKeyThumbprintEncodingType()
-    {
-
-        $keyident = $this->_getKeyIdentifier();
-
-        $dom = self::convertToDOM($keyident);
-
-        if(!$dom->hasAttribute('EncodingType')) {
-            throw new Zend_InfoCard_Xml_Exception("Unable to determine the encoding type for the key identifier");
-        }
-
-        return $dom->getAttribute('EncodingType');
-    }
-
-    /**
-     * Get the key reference data used to identify the public key
-     *
-     * @param bool $decode if true, will return a decoded version of the key
-     * @return string the key reference thumbprint, either in binary or encoded form
-     * @throws Zend_InfoCard_Xml_Exception
-     */
-    public function getKeyReference($decode = true)
-    {
-        $keyIdentifier = $this->_getKeyIdentifier();
-
-        $dom = self::convertToDOM($keyIdentifier);
-        $encoded = $dom->nodeValue;
-
-        if(empty($encoded)) {
-            throw new Zend_InfoCard_Xml_Exception("Could not find the Key Reference Encoded Value");
-        }
-
-        if($decode) {
-
-            $decoded = "";
-            switch($this->getKeyThumbprintEncodingType()) {
-                case self::ENCODING_BASE64BIN:
-
-                    if(version_compare(PHP_VERSION, "5.2.0", ">=")) {
-                        $decoded = base64_decode($encoded, true);
-                    } else {
-                        $decoded = base64_decode($encoded);
-                    }
-
-                    break;
-                default:
-                    throw new Zend_InfoCard_Xml_Exception("Unknown Key Reference Encoding Type: {$this->getKeyThumbprintEncodingType()}");
-            }
-
-            if(!$decoded || empty($decoded)) {
-                throw new Zend_InfoCard_Xml_Exception("Failed to decode key reference");
-            }
-
-            return $decoded;
-        }
-
-        return $encoded;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json.php b/airtime_mvc/library/Zend/Json.php
deleted file mode 100644
index b8dcfc8ec..000000000
--- a/airtime_mvc/library/Zend/Json.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Json.php 20616 2010-01-25 19:56:04Z matthew $
- */
-
-/**
- * Zend_Json_Expr.
- *
- * @see Zend_Json_Expr
- */
-require_once 'Zend/Json/Expr.php';
-
-
-/**
- * Class for encoding to and decoding from JSON.
- *
- * @category   Zend
- * @package    Zend_Json
- * @uses       Zend_Json_Expr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json
-{
-    /**
-     * How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
-     * so that it is a boolean true value, allowing it to be used with
-     * ext/json's functions.
-     */
-    const TYPE_ARRAY  = 1;
-    const TYPE_OBJECT = 0;
-
-     /**
-      * To check the allowed nesting depth of the XML tree during xml2json conversion.
-      *
-      * @var int
-      */
-    public static $maxRecursionDepthAllowed=25;
-
-    /**
-     * @var bool
-     */
-    public static $useBuiltinEncoderDecoder = false;
-
-    /**
-     * Decodes the given $encodedValue string which is
-     * encoded in the JSON format
-     *
-     * Uses ext/json's json_decode if available.
-     *
-     * @param string $encodedValue Encoded in JSON format
-     * @param int $objectDecodeType Optional; flag indicating how to decode
-     * objects. See {@link Zend_Json_Decoder::decode()} for details.
-     * @return mixed
-     */
-    public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
-    {
-        $encodedValue = (string) $encodedValue;
-        if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
-            $decode = json_decode($encodedValue, $objectDecodeType);
-
-            // php < 5.3
-            if (!function_exists('json_last_error')) {
-                if ($decode === $encodedValue) {
-                    require_once 'Zend/Json/Exception.php';
-                    throw new Zend_Json_Exception('Decoding failed');
-                }
-            // php >= 5.3
-            } elseif (($jsonLastErr = json_last_error()) != JSON_ERROR_NONE) {
-                require_once 'Zend/Json/Exception.php';
-                switch ($jsonLastErr) {
-                    case JSON_ERROR_DEPTH:
-                        throw new Zend_Json_Exception('Decoding failed: Maximum stack depth exceeded');
-                    case JSON_ERROR_CTRL_CHAR:
-                        throw new Zend_Json_Exception('Decoding failed: Unexpected control character found');
-                    case JSON_ERROR_SYNTAX:
-                        throw new Zend_Json_Exception('Decoding failed: Syntax error');
-                    default:
-                        throw new Zend_Json_Exception('Decoding failed');
-                }
-            }
-
-            return $decode;
-        }
-
-        require_once 'Zend/Json/Decoder.php';
-        return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
-    }
-
-    /**
-     * Encode the mixed $valueToEncode into the JSON format
-     *
-     * Encodes using ext/json's json_encode() if available.
-     *
-     * NOTE: Object should not contain cycles; the JSON format
-     * does not allow object reference.
-     *
-     * NOTE: Only public variables will be encoded
-     *
-     * NOTE: Encoding native javascript expressions are possible using Zend_Json_Expr.
-     *       You can enable this by setting $options['enableJsonExprFinder'] = true
-     *
-     * @see Zend_Json_Expr
-     *
-     * @param  mixed $valueToEncode
-     * @param  boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-     * @param  array $options Additional options used during encoding
-     * @return string JSON encoded object
-     */
-    public static function encode($valueToEncode, $cycleCheck = false, $options = array())
-    {
-        if (is_object($valueToEncode) && method_exists($valueToEncode, 'toJson')) {
-            return $valueToEncode->toJson();
-        }
-
-        // Pre-encoding look for Zend_Json_Expr objects and replacing by tmp ids
-        $javascriptExpressions = array();
-        if(isset($options['enableJsonExprFinder'])
-           && ($options['enableJsonExprFinder'] == true)
-        ) {
-            /**
-             * @see Zend_Json_Encoder
-             */
-            require_once "Zend/Json/Encoder.php";
-            $valueToEncode = self::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions);
-        }
-
-        // Encoding
-        if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
-            $encodedResult = json_encode($valueToEncode);
-        } else {
-            require_once 'Zend/Json/Encoder.php';
-            $encodedResult = Zend_Json_Encoder::encode($valueToEncode, $cycleCheck, $options);
-        }
-
-        //only do post-proccessing to revert back the Zend_Json_Expr if any.
-        if (count($javascriptExpressions) > 0) {
-            $count = count($javascriptExpressions);
-            for($i = 0; $i < $count; $i++) {
-                $magicKey = $javascriptExpressions[$i]['magicKey'];
-                $value    = $javascriptExpressions[$i]['value'];
-
-                $encodedResult = str_replace(
-                    //instead of replacing "key:magicKey", we replace directly magicKey by value because "key" never changes.
-                    '"' . $magicKey . '"',
-                    $value,
-                    $encodedResult
-                );
-            }
-        }
-
-         return $encodedResult;
-    }
-
-    /**
-     * Check & Replace Zend_Json_Expr for tmp ids in the valueToEncode
-     *
-     * Check if the value is a Zend_Json_Expr, and if replace its value
-     * with a magic key and save the javascript expression in an array.
-     *
-     * NOTE this method is recursive.
-     *
-     * NOTE: This method is used internally by the encode method.
-     *
-     * @see encode
-     * @param mixed $valueToCheck a string - object property to be encoded
-     * @return void
-     */
-    protected static function _recursiveJsonExprFinder(
-        &$value, array &$javascriptExpressions, $currentKey = null
-    ) {
-         if ($value instanceof Zend_Json_Expr) {
-            // TODO: Optimize with ascii keys, if performance is bad
-            $magicKey = "____" . $currentKey . "_" . (count($javascriptExpressions));
-            $javascriptExpressions[] = array(
-
-                //if currentKey is integer, encodeUnicodeString call is not required.
-                "magicKey" => (is_int($currentKey)) ? $magicKey : Zend_Json_Encoder::encodeUnicodeString($magicKey),
-                "value"    => $value->__toString(),
-            );
-            $value = $magicKey;
-        } elseif (is_array($value)) {
-            foreach ($value as $k => $v) {
-                $value[$k] = self::_recursiveJsonExprFinder($value[$k], $javascriptExpressions, $k);
-            }
-        } elseif (is_object($value)) {
-            foreach ($value as $k => $v) {
-                $value->$k = self::_recursiveJsonExprFinder($value->$k, $javascriptExpressions, $k);
-            }
-        }
-        return $value;
-    }
-
-    /**
-     * fromXml - Converts XML to JSON
-     *
-     * Converts a XML formatted string into a JSON formatted string.
-     * The value returned will be a string in JSON format.
-     *
-     * The caller of this function needs to provide only the first parameter,
-     * which is an XML formatted String. The second parameter is optional, which
-     * lets the user to select if the XML attributes in the input XML string
-     * should be included or ignored in xml2json conversion.
-     *
-     * This function converts the XML formatted string into a PHP array by
-     * calling a recursive (protected static) function in this class. Then, it
-     * converts that PHP array into JSON by calling the "encode" static funcion.
-     *
-     * Throws a Zend_Json_Exception if the input not a XML formatted string.
-     * NOTE: Encoding native javascript expressions via Zend_Json_Expr is not possible.
-     *
-     * @static
-     * @access public
-     * @param string $xmlStringContents XML String to be converted
-     * @param boolean $ignoreXmlAttributes Include or exclude XML attributes in
-     * the xml2json conversion process.
-     * @return mixed - JSON formatted string on success
-     * @throws Zend_Json_Exception
-     */
-    public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true) {
-        // Load the XML formatted string into a Simple XML Element object.
-        $simpleXmlElementObject = simplexml_load_string($xmlStringContents);
-
-        // If it is not a valid XML content, throw an exception.
-        if ($simpleXmlElementObject == null) {
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception('Function fromXml was called with an invalid XML formatted string.');
-        } // End of if ($simpleXmlElementObject == null)
-
-        $resultArray = null;
-
-        // Call the recursive function to convert the XML into a PHP array.
-        $resultArray = self::_processXml($simpleXmlElementObject, $ignoreXmlAttributes);
-
-        // Convert the PHP array to JSON using Zend_Json encode method.
-        // It is just that simple.
-        $jsonStringOutput = self::encode($resultArray);
-        return($jsonStringOutput);
-    } // End of function fromXml.
-
-    /**
-     * _processXml - Contains the logic for xml2json
-     *
-     * The logic in this function is a recursive one.
-     *
-     * The main caller of this function (i.e. fromXml) needs to provide
-     * only the first two parameters i.e. the SimpleXMLElement object and
-     * the flag for ignoring or not ignoring XML attributes. The third parameter
-     * will be used internally within this function during the recursive calls.
-     *
-     * This function converts the SimpleXMLElement object into a PHP array by
-     * calling a recursive (protected static) function in this class. Once all
-     * the XML elements are stored in the PHP array, it is returned to the caller.
-     *
-     * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit.
-     *
-     * @static
-     * @access protected
-     * @param SimpleXMLElement $simpleXmlElementObject XML element to be converted
-     * @param boolean $ignoreXmlAttributes Include or exclude XML attributes in
-     * the xml2json conversion process.
-     * @param int $recursionDepth Current recursion depth of this function
-     * @return mixed - On success, a PHP associative array of traversed XML elements
-     * @throws Zend_Json_Exception
-     */
-    protected static function _processXml ($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0) {
-        // Keep an eye on how deeply we are involved in recursion.
-        if ($recursionDepth > self::$maxRecursionDepthAllowed) {
-            // XML tree is too deep. Exit now by throwing an exception.
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception(
-                "Function _processXml exceeded the allowed recursion depth of " .
-                self::$maxRecursionDepthAllowed);
-        } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed)
-
-        if ($recursionDepth == 0) {
-            // Store the original SimpleXmlElementObject sent by the caller.
-            // We will need it at the very end when we return from here for good.
-            $callerProvidedSimpleXmlElementObject = $simpleXmlElementObject;
-        } // End of if ($recursionDepth == 0)
-
-        if ($simpleXmlElementObject instanceof SimpleXMLElement) {
-            // Get a copy of the simpleXmlElementObject
-            $copyOfSimpleXmlElementObject = $simpleXmlElementObject;
-            // Get the object variables in the SimpleXmlElement object for us to iterate.
-            $simpleXmlElementObject = get_object_vars($simpleXmlElementObject);
-        } // End of if (get_class($simpleXmlElementObject) == "SimpleXMLElement")
-
-        // It needs to be an array of object variables.
-        if (is_array($simpleXmlElementObject)) {
-            // Initialize a result array.
-            $resultArray = array();
-            // Is the input array size 0? Then, we reached the rare CDATA text if any.
-            if (count($simpleXmlElementObject) <= 0) {
-                // Let us return the lonely CDATA. It could even be
-                // an empty element or just filled with whitespaces.
-                return (trim(strval($copyOfSimpleXmlElementObject)));
-            } // End of if (count($simpleXmlElementObject) <= 0)
-
-            // Let us walk through the child elements now.
-            foreach($simpleXmlElementObject as $key=>$value) {
-                // Check if we need to ignore the XML attributes.
-                // If yes, you can skip processing the XML attributes.
-                // Otherwise, add the XML attributes to the result array.
-                if(($ignoreXmlAttributes == true) && (is_string($key)) && ($key == "@attributes")) {
-                    continue;
-                } // End of if(($ignoreXmlAttributes == true) && ($key == "@attributes"))
-
-                // Let us recursively process the current XML element we just visited.
-                // Increase the recursion depth by one.
-                $recursionDepth++;
-                $resultArray[$key] = self::_processXml ($value, $ignoreXmlAttributes, $recursionDepth);
-
-                // Decrease the recursion depth by one.
-                $recursionDepth--;
-            } // End of foreach($simpleXmlElementObject as $key=>$value) {
-
-            if ($recursionDepth == 0) {
-                // That is it. We are heading to the exit now.
-                // Set the XML root element name as the root [top-level] key of
-                // the associative array that we are going to return to the original
-                // caller of this recursive function.
-                $tempArray = $resultArray;
-                $resultArray = array();
-                $resultArray[$callerProvidedSimpleXmlElementObject->getName()] = $tempArray;
-            } // End of if ($recursionDepth == 0)
-
-            return($resultArray);
-        } else {
-            // We are now looking at either the XML attribute text or
-            // the text between the XML tags.
-
-            // In order to allow Zend_Json_Expr from xml, we check if the node
-            // matchs the pattern that try to detect if it is a new Zend_Json_Expr
-            // if it matches, we return a new Zend_Json_Expr instead of a text node
-            $pattern = '/^[\s]*new Zend_Json_Expr[\s]*\([\s]*[\"\']{1}(.*)[\"\']{1}[\s]*\)[\s]*$/';
-            $matchings = array();
-            $match = preg_match ($pattern, $simpleXmlElementObject, $matchings);
-            if ($match) {
-                return new Zend_Json_Expr($matchings[1]);
-            } else {
-                return (trim(strval($simpleXmlElementObject)));
-            }
-
-        } // End of if (is_array($simpleXmlElementObject))
-    } // End of function _processXml.
-    
-    /**
-     * Pretty-print JSON string
-     * 
-     * Use 'indent' option to select indentation string - by default it's a tab
-     * 
-     * @param string $json Original JSON string
-     * @param array $options Encoding options
-     * @return string
-     */
-    public static function prettyPrint($json, $options = array())
-    {
-        $tokens = preg_split('|([\{\}\]\[,])|', $json, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $result = "";
-        $indent = 0;
-        
-        $ind = "\t";
-        if(isset($options['indent'])) {
-            $ind = $options['indent'];
-        }
-        
-        foreach($tokens as $token) {
-            if($token == "") continue;
-            
-            $prefix = str_repeat($ind, $indent);
-            if($token == "{" || $token == "[") {
-                $indent++;
-                if($result != "" && $result[strlen($result)-1] == "\n") {
-                    $result .= $prefix;
-                }
-                $result .= "$token\n";
-            } else if($token == "}" || $token == "]") {
-                $indent--;
-                $prefix = str_repeat($ind, $indent);
-                $result .= "\n$prefix$token";                
-            } else if($token == ",") {
-                $result .= "$token\n";
-            } else {
-                $result .= $prefix.$token;
-            }
-        }
-        return $result;
-   }
-}
diff --git a/airtime_mvc/library/Zend/Json/Decoder.php b/airtime_mvc/library/Zend/Json/Decoder.php
deleted file mode 100644
index 8795e868b..000000000
--- a/airtime_mvc/library/Zend/Json/Decoder.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decoder.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * Decode JSON encoded string to PHP variable constructs
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Decoder
-{
-    /**
-     * Parse tokens used to decode the JSON object. These are not
-     * for public consumption, they are just used internally to the
-     * class.
-     */
-    const EOF         = 0;
-    const DATUM        = 1;
-    const LBRACE    = 2;
-    const LBRACKET    = 3;
-    const RBRACE     = 4;
-    const RBRACKET    = 5;
-    const COMMA       = 6;
-    const COLON        = 7;
-
-    /**
-     * Use to maintain a "pointer" to the source being decoded
-     *
-     * @var string
-     */
-    protected $_source;
-
-    /**
-     * Caches the source length
-     *
-     * @var int
-     */
-    protected $_sourceLength;
-
-    /**
-     * The offset within the souce being decoded
-     *
-     * @var int
-     *
-     */
-    protected $_offset;
-
-    /**
-     * The current token being considered in the parser cycle
-     *
-     * @var int
-     */
-    protected $_token;
-
-    /**
-     * Flag indicating how objects should be decoded
-     *
-     * @var int
-     * @access protected
-     */
-    protected $_decodeType;
-
-    /**
-     * Constructor
-     *
-     * @param string $source String source to decode
-     * @param int $decodeType How objects should be decoded -- see
-     * {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
-     * valid values
-     * @return void
-     */
-    protected function __construct($source, $decodeType)
-    {
-        // Set defaults
-        $this->_source       = self::decodeUnicodeString($source);
-        $this->_sourceLength = strlen($this->_source);
-        $this->_token        = self::EOF;
-        $this->_offset       = 0;
-
-        // Normalize and set $decodeType
-        if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
-        {
-            $decodeType = Zend_Json::TYPE_ARRAY;
-        }
-        $this->_decodeType   = $decodeType;
-
-        // Set pointer at first token
-        $this->_getNextToken();
-    }
-
-    /**
-     * Decode a JSON source string
-     *
-     * Decodes a JSON encoded string. The value returned will be one of the
-     * following:
-     *        - integer
-     *        - float
-     *        - boolean
-     *        - null
-     *      - StdClass
-     *      - array
-     *         - array of one or more of the above types
-     *
-     * By default, decoded objects will be returned as associative arrays; to
-     * return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
-     * the $objectDecodeType parameter.
-     *
-     * Throws a Zend_Json_Exception if the source string is null.
-     *
-     * @static
-     * @access public
-     * @param string $source String to be decoded
-     * @param int $objectDecodeType How objects should be decoded; should be
-     * either or {@link Zend_Json::TYPE_ARRAY} or
-     * {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
-     * @return mixed
-     * @throws Zend_Json_Exception
-     */
-    public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
-    {
-        if (null === $source) {
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
-        } elseif (!is_string($source)) {
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception('Can only decode JSON encoded strings');
-        }
-
-        $decoder = new self($source, $objectDecodeType);
-
-        return $decoder->_decodeValue();
-    }
-
-
-    /**
-     * Recursive driving rountine for supported toplevel tops
-     *
-     * @return mixed
-     */
-    protected function _decodeValue()
-    {
-        switch ($this->_token) {
-            case self::DATUM:
-                $result  = $this->_tokenValue;
-                $this->_getNextToken();
-                return($result);
-                break;
-            case self::LBRACE:
-                return($this->_decodeObject());
-                break;
-            case self::LBRACKET:
-                return($this->_decodeArray());
-                break;
-            default:
-                return null;
-                break;
-        }
-    }
-
-    /**
-     * Decodes an object of the form:
-     *  { "attribute: value, "attribute2" : value,...}
-     *
-     * If Zend_Json_Encoder was used to encode the original object then
-     * a special attribute called __className which specifies a class
-     * name that should wrap the data contained within the encoded source.
-     *
-     * Decodes to either an array or StdClass object, based on the value of
-     * {@link $_decodeType}. If invalid $_decodeType present, returns as an
-     * array.
-     *
-     * @return array|StdClass
-     */
-    protected function _decodeObject()
-    {
-        $members = array();
-        $tok = $this->_getNextToken();
-
-        while ($tok && $tok != self::RBRACE) {
-            if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
-                require_once 'Zend/Json/Exception.php';
-                throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
-            }
-
-            $key = $this->_tokenValue;
-            $tok = $this->_getNextToken();
-
-            if ($tok != self::COLON) {
-                require_once 'Zend/Json/Exception.php';
-                throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
-            }
-
-            $tok = $this->_getNextToken();
-            $members[$key] = $this->_decodeValue();
-            $tok = $this->_token;
-
-            if ($tok == self::RBRACE) {
-                break;
-            }
-
-            if ($tok != self::COMMA) {
-                require_once 'Zend/Json/Exception.php';
-                throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
-            }
-
-            $tok = $this->_getNextToken();
-        }
-
-        switch ($this->_decodeType) {
-            case Zend_Json::TYPE_OBJECT:
-                // Create new StdClass and populate with $members
-                $result = new StdClass();
-                foreach ($members as $key => $value) {
-                    $result->$key = $value;
-                }
-                break;
-            case Zend_Json::TYPE_ARRAY:
-            default:
-                $result = $members;
-                break;
-        }
-
-        $this->_getNextToken();
-        return $result;
-    }
-
-    /**
-     * Decodes a JSON array format:
-     *    [element, element2,...,elementN]
-     *
-     * @return array
-     */
-    protected function _decodeArray()
-    {
-        $result = array();
-        $starttok = $tok = $this->_getNextToken(); // Move past the '['
-        $index  = 0;
-
-        while ($tok && $tok != self::RBRACKET) {
-            $result[$index++] = $this->_decodeValue();
-
-            $tok = $this->_token;
-
-            if ($tok == self::RBRACKET || !$tok) {
-                break;
-            }
-
-            if ($tok != self::COMMA) {
-                require_once 'Zend/Json/Exception.php';
-                throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
-            }
-
-            $tok = $this->_getNextToken();
-        }
-
-        $this->_getNextToken();
-        return($result);
-    }
-
-
-    /**
-     * Removes whitepsace characters from the source input
-     */
-    protected function _eatWhitespace()
-    {
-        if (preg_match(
-                '/([\t\b\f\n\r ])*/s',
-                $this->_source,
-                $matches,
-                PREG_OFFSET_CAPTURE,
-                $this->_offset)
-            && $matches[0][1] == $this->_offset)
-        {
-            $this->_offset += strlen($matches[0][0]);
-        }
-    }
-
-
-    /**
-     * Retrieves the next token from the source stream
-     *
-     * @return int Token constant value specified in class definition
-     */
-    protected function _getNextToken()
-    {
-        $this->_token      = self::EOF;
-        $this->_tokenValue = null;
-        $this->_eatWhitespace();
-
-        if ($this->_offset >= $this->_sourceLength) {
-            return(self::EOF);
-        }
-
-        $str        = $this->_source;
-        $str_length = $this->_sourceLength;
-        $i          = $this->_offset;
-        $start      = $i;
-
-        switch ($str{$i}) {
-            case '{':
-               $this->_token = self::LBRACE;
-               break;
-            case '}':
-                $this->_token = self::RBRACE;
-                break;
-            case '[':
-                $this->_token = self::LBRACKET;
-                break;
-            case ']':
-                $this->_token = self::RBRACKET;
-                break;
-            case ',':
-                $this->_token = self::COMMA;
-                break;
-            case ':':
-                $this->_token = self::COLON;
-                break;
-            case  '"':
-                $result = '';
-                do {
-                    $i++;
-                    if ($i >= $str_length) {
-                        break;
-                    }
-
-                    $chr = $str{$i};
-
-                    if ($chr == '\\') {
-                        $i++;
-                        if ($i >= $str_length) {
-                            break;
-                        }
-                        $chr = $str{$i};
-                        switch ($chr) {
-                            case '"' :
-                                $result .= '"';
-                                break;
-                            case '\\':
-                                $result .= '\\';
-                                break;
-                            case '/' :
-                                $result .= '/';
-                                break;
-                            case 'b' :
-                                $result .= chr(8);
-                                break;
-                            case 'f' :
-                                $result .= chr(12);
-                                break;
-                            case 'n' :
-                                $result .= chr(10);
-                                break;
-                            case 'r' :
-                                $result .= chr(13);
-                                break;
-                            case 't' :
-                                $result .= chr(9);
-                                break;
-                            case '\'' :
-                                $result .= '\'';
-                                break;
-                            default:
-                                require_once 'Zend/Json/Exception.php';
-                                throw new Zend_Json_Exception("Illegal escape "
-                                    .  "sequence '" . $chr . "'");
-                        }
-                    } elseif($chr == '"') {
-                        break;
-                    } else {
-                        $result .= $chr;
-                    }
-                } while ($i < $str_length);
-
-                $this->_token = self::DATUM;
-                //$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
-                $this->_tokenValue = $result;
-                break;
-            case 't':
-                if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
-                    $this->_token = self::DATUM;
-                }
-                $this->_tokenValue = true;
-                $i += 3;
-                break;
-            case 'f':
-                if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
-                    $this->_token = self::DATUM;
-                }
-                $this->_tokenValue = false;
-                $i += 4;
-                break;
-            case 'n':
-                if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
-                    $this->_token = self::DATUM;
-                }
-                $this->_tokenValue = NULL;
-                $i += 3;
-                break;
-        }
-
-        if ($this->_token != self::EOF) {
-            $this->_offset = $i + 1; // Consume the last token character
-            return($this->_token);
-        }
-
-        $chr = $str{$i};
-        if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
-            if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
-                $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
-
-                $datum = $matches[0][0];
-
-                if (is_numeric($datum)) {
-                    if (preg_match('/^0\d+$/', $datum)) {
-                        require_once 'Zend/Json/Exception.php';
-                        throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
-                    } else {
-                        $val  = intval($datum);
-                        $fVal = floatval($datum);
-                        $this->_tokenValue = ($val == $fVal ? $val : $fVal);
-                    }
-                } else {
-                    require_once 'Zend/Json/Exception.php';
-                    throw new Zend_Json_Exception("Illegal number format: $datum");
-                }
-
-                $this->_token = self::DATUM;
-                $this->_offset = $start + strlen($datum);
-            }
-        } else {
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception('Illegal Token');
-        }
-
-        return($this->_token);
-    }
-
-    /**
-     * Decode Unicode Characters from \u0000 ASCII syntax.
-     *
-     * This algorithm was originally developed for the
-     * Solar Framework by Paul M. Jones
-     *
-     * @link   http://solarphp.com/
-     * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
-     * @param  string $value
-     * @return string
-     */
-    public static function decodeUnicodeString($chrs)
-    {
-        $delim       = substr($chrs, 0, 1);
-        $utf8        = '';
-        $strlen_chrs = strlen($chrs);
-
-        for($i = 0; $i < $strlen_chrs; $i++) {
-
-            $substr_chrs_c_2 = substr($chrs, $i, 2);
-            $ord_chrs_c = ord($chrs[$i]);
-
-            switch (true) {
-                case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $i, 6)):
-                    // single, escaped unicode character
-                    $utf16 = chr(hexdec(substr($chrs, ($i + 2), 2)))
-                           . chr(hexdec(substr($chrs, ($i + 4), 2)));
-                    $utf8 .= self::_utf162utf8($utf16);
-                    $i += 5;
-                    break;
-                case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                    $utf8 .= $chrs{$i};
-                    break;
-                case ($ord_chrs_c & 0xE0) == 0xC0:
-                    // characters U-00000080 - U-000007FF, mask 110XXXXX
-                    //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $utf8 .= substr($chrs, $i, 2);
-                    ++$i;
-                    break;
-                case ($ord_chrs_c & 0xF0) == 0xE0:
-                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $utf8 .= substr($chrs, $i, 3);
-                    $i += 2;
-                    break;
-                case ($ord_chrs_c & 0xF8) == 0xF0:
-                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $utf8 .= substr($chrs, $i, 4);
-                    $i += 3;
-                    break;
-                case ($ord_chrs_c & 0xFC) == 0xF8:
-                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $utf8 .= substr($chrs, $i, 5);
-                    $i += 4;
-                    break;
-                case ($ord_chrs_c & 0xFE) == 0xFC:
-                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $utf8 .= substr($chrs, $i, 6);
-                    $i += 5;
-                    break;
-            }
-        }
-
-        return $utf8;
-    }
-
-    /**
-     * Convert a string from one UTF-16 char to one UTF-8 char.
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * This method is from the Solar Framework by Paul M. Jones
-     *
-     * @link   http://solarphp.com
-     * @param  string $utf16 UTF-16 character
-     * @return string UTF-8 character
-     */
-    protected static function _utf162utf8($utf16)
-    {
-        // Check for mb extension otherwise do by hand.
-        if( function_exists('mb_convert_encoding') ) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch (true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Json/Encoder.php b/airtime_mvc/library/Zend/Json/Encoder.php
deleted file mode 100644
index 28004990d..000000000
--- a/airtime_mvc/library/Zend/Json/Encoder.php
+++ /dev/null
@@ -1,574 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Encoder.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Encode PHP constructs to JSON
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Encoder
-{
-    /**
-     * Whether or not to check for possible cycling
-     *
-     * @var boolean
-     */
-    protected $_cycleCheck;
-
-    /**
-     * Additional options used during encoding
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Array of visited objects; used to prevent cycling.
-     *
-     * @var array
-     */
-    protected $_visited = array();
-
-    /**
-     * Constructor
-     *
-     * @param boolean $cycleCheck Whether or not to check for recursion when encoding
-     * @param array $options Additional options used during encoding
-     * @return void
-     */
-    protected function __construct($cycleCheck = false, $options = array())
-    {
-        $this->_cycleCheck = $cycleCheck;
-        $this->_options = $options;
-    }
-
-    /**
-     * Use the JSON encoding scheme for the value specified
-     *
-     * @param mixed $value The value to be encoded
-     * @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
-     * @param array $options Additional options used during encoding
-     * @return string  The encoded value
-     */
-    public static function encode($value, $cycleCheck = false, $options = array())
-    {
-        $encoder = new self(($cycleCheck) ? true : false, $options);
-
-        return $encoder->_encodeValue($value);
-    }
-
-    /**
-     * Recursive driver which determines the type of value to be encoded
-     * and then dispatches to the appropriate method. $values are either
-     *    - objects (returns from {@link _encodeObject()})
-     *    - arrays (returns from {@link _encodeArray()})
-     *    - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
-     *
-     * @param $value mixed The value to be encoded
-     * @return string Encoded value
-     */
-    protected function _encodeValue(&$value)
-    {
-        if (is_object($value)) {
-            return $this->_encodeObject($value);
-        } else if (is_array($value)) {
-            return $this->_encodeArray($value);
-        }
-
-        return $this->_encodeDatum($value);
-    }
-
-
-
-    /**
-     * Encode an object to JSON by encoding each of the public properties
-     *
-     * A special property is added to the JSON object called '__className'
-     * that contains the name of the class of $value. This is used to decode
-     * the object on the client into a specific class.
-     *
-     * @param $value object
-     * @return string
-     * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
-     */
-    protected function _encodeObject(&$value)
-    {
-        if ($this->_cycleCheck) {
-            if ($this->_wasVisited($value)) {
-
-                if (isset($this->_options['silenceCyclicalExceptions'])
-                    && $this->_options['silenceCyclicalExceptions']===true) {
-
-                    return '"* RECURSION (' . get_class($value) . ') *"';
-
-                } else {
-                    require_once 'Zend/Json/Exception.php';
-                    throw new Zend_Json_Exception(
-                        'Cycles not supported in JSON encoding, cycle introduced by '
-                        . 'class "' . get_class($value) . '"'
-                    );
-                }
-            }
-
-            $this->_visited[] = $value;
-        }
-
-        $props = '';
-
-        if ($value instanceof Iterator) {
-            $propCollection = $value;
-        } else {
-            $propCollection = get_object_vars($value);
-        }
-
-        foreach ($propCollection as $name => $propValue) {
-            if (isset($propValue)) {
-                $props .= ','
-                        . $this->_encodeValue($name)
-                        . ':'
-                        . $this->_encodeValue($propValue);
-            }
-        }
-
-        return '{"__className":"' . get_class($value) . '"'
-                . $props . '}';
-    }
-
-
-    /**
-     * Determine if an object has been serialized already
-     *
-     * @param mixed $value
-     * @return boolean
-     */
-    protected function _wasVisited(&$value)
-    {
-        if (in_array($value, $this->_visited, true)) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * JSON encode an array value
-     *
-     * Recursively encodes each value of an array and returns a JSON encoded
-     * array string.
-     *
-     * Arrays are defined as integer-indexed arrays starting at index 0, where
-     * the last index is (count($array) -1); any deviation from that is
-     * considered an associative array, and will be encoded as such.
-     *
-     * @param $array array
-     * @return string
-     */
-    protected function _encodeArray(&$array)
-    {
-        $tmpArray = array();
-
-        // Check for associative array
-        if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
-            // Associative array
-            $result = '{';
-            foreach ($array as $key => $value) {
-                $key = (string) $key;
-                $tmpArray[] = $this->_encodeString($key)
-                            . ':'
-                            . $this->_encodeValue($value);
-            }
-            $result .= implode(',', $tmpArray);
-            $result .= '}';
-        } else {
-            // Indexed array
-            $result = '[';
-            $length = count($array);
-            for ($i = 0; $i < $length; $i++) {
-                $tmpArray[] = $this->_encodeValue($array[$i]);
-            }
-            $result .= implode(',', $tmpArray);
-            $result .= ']';
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * JSON encode a basic data type (string, number, boolean, null)
-     *
-     * If value type is not a string, number, boolean, or null, the string
-     * 'null' is returned.
-     *
-     * @param $value mixed
-     * @return string
-     */
-    protected function _encodeDatum(&$value)
-    {
-        $result = 'null';
-
-        if (is_int($value) || is_float($value)) {
-            $result = (string) $value;
-            $result = str_replace(",", ".", $result);
-        } elseif (is_string($value)) {
-            $result = $this->_encodeString($value);
-        } elseif (is_bool($value)) {
-            $result = $value ? 'true' : 'false';
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * JSON encode a string value by escaping characters as necessary
-     *
-     * @param $value string
-     * @return string
-     */
-    protected function _encodeString(&$string)
-    {
-        // Escape these characters with a backslash:
-        // " \ / \n \r \t \b \f
-        $search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"', '/');
-        $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"', '\\/');
-        $string  = str_replace($search, $replace, $string);
-
-        // Escape certain ASCII characters:
-        // 0x08 => \b
-        // 0x0c => \f
-        $string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
-        $string = self::encodeUnicodeString($string);
-
-        return '"' . $string . '"';
-    }
-
-
-    /**
-     * Encode the constants associated with the ReflectionClass
-     * parameter. The encoding format is based on the class2 format
-     *
-     * @param $cls ReflectionClass
-     * @return string Encoded constant block in class2 format
-     */
-    private static function _encodeConstants(ReflectionClass $cls)
-    {
-        $result    = "constants : {";
-        $constants = $cls->getConstants();
-
-        $tmpArray = array();
-        if (!empty($constants)) {
-            foreach ($constants as $key => $value) {
-                $tmpArray[] = "$key: " . self::encode($value);
-            }
-
-            $result .= implode(', ', $tmpArray);
-        }
-
-        return $result . "}";
-    }
-
-
-    /**
-     * Encode the public methods of the ReflectionClass in the
-     * class2 format
-     *
-     * @param $cls ReflectionClass
-     * @return string Encoded method fragment
-     *
-     */
-    private static function _encodeMethods(ReflectionClass $cls)
-    {
-        $methods = $cls->getMethods();
-        $result = 'methods:{';
-
-        $started = false;
-        foreach ($methods as $method) {
-            if (! $method->isPublic() || !$method->isUserDefined()) {
-                continue;
-            }
-
-            if ($started) {
-                $result .= ',';
-            }
-            $started = true;
-
-            $result .= '' . $method->getName(). ':function(';
-
-            if ('__construct' != $method->getName()) {
-                $parameters  = $method->getParameters();
-                $paramCount  = count($parameters);
-                $argsStarted = false;
-
-                $argNames = "var argNames=[";
-                foreach ($parameters as $param) {
-                    if ($argsStarted) {
-                        $result .= ',';
-                    }
-
-                    $result .= $param->getName();
-
-                    if ($argsStarted) {
-                        $argNames .= ',';
-                    }
-
-                    $argNames .= '"' . $param->getName() . '"';
-
-                    $argsStarted = true;
-                }
-                $argNames .= "];";
-
-                $result .= "){"
-                         . $argNames
-                         . 'var result = ZAjaxEngine.invokeRemoteMethod('
-                         . "this, '" . $method->getName()
-                         . "',argNames,arguments);"
-                         . 'return(result);}';
-            } else {
-                $result .= "){}";
-            }
-        }
-
-        return $result . "}";
-    }
-
-
-    /**
-     * Encode the public properties of the ReflectionClass in the class2
-     * format.
-     *
-     * @param $cls ReflectionClass
-     * @return string Encode properties list
-     *
-     */
-    private static function _encodeVariables(ReflectionClass $cls)
-    {
-        $properties = $cls->getProperties();
-        $propValues = get_class_vars($cls->getName());
-        $result = "variables:{";
-        $cnt = 0;
-
-        $tmpArray = array();
-        foreach ($properties as $prop) {
-            if (! $prop->isPublic()) {
-                continue;
-            }
-
-            $tmpArray[] = $prop->getName()
-                        . ':'
-                        . self::encode($propValues[$prop->getName()]);
-        }
-        $result .= implode(',', $tmpArray);
-
-        return $result . "}";
-    }
-
-    /**
-     * Encodes the given $className into the class2 model of encoding PHP
-     * classes into JavaScript class2 classes.
-     * NOTE: Currently only public methods and variables are proxied onto
-     * the client machine
-     *
-     * @param $className string The name of the class, the class must be
-     * instantiable using a null constructor
-     * @param $package string Optional package name appended to JavaScript
-     * proxy class name
-     * @return string The class2 (JavaScript) encoding of the class
-     * @throws Zend_Json_Exception
-     */
-    public static function encodeClass($className, $package = '')
-    {
-        $cls = new ReflectionClass($className);
-        if (! $cls->isInstantiable()) {
-            require_once 'Zend/Json/Exception.php';
-            throw new Zend_Json_Exception("$className must be instantiable");
-        }
-
-        return "Class.create('$package$className',{"
-                . self::_encodeConstants($cls)    .","
-                . self::_encodeMethods($cls)      .","
-                . self::_encodeVariables($cls)    .'});';
-    }
-
-
-    /**
-     * Encode several classes at once
-     *
-     * Returns JSON encoded classes, using {@link encodeClass()}.
-     *
-     * @param array $classNames
-     * @param string $package
-     * @return string
-     */
-    public static function encodeClasses(array $classNames, $package = '')
-    {
-        $result = '';
-        foreach ($classNames as $className) {
-            $result .= self::encodeClass($className, $package);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Encode Unicode Characters to \u0000 ASCII syntax.
-     *
-     * This algorithm was originally developed for the
-     * Solar Framework by Paul M. Jones
-     *
-     * @link   http://solarphp.com/
-     * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
-     * @param  string $value
-     * @return string
-     */
-    public static function encodeUnicodeString($value)
-    {
-        $strlen_var = strlen($value);
-        $ascii = "";
-
-        /**
-         * Iterate over every character in the string,
-         * escaping with a slash or encoding to UTF-8 where necessary
-         */
-        for($i = 0; $i < $strlen_var; $i++) {
-            $ord_var_c = ord($value[$i]);
-
-            switch (true) {
-                case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                    // characters U-00000000 - U-0000007F (same as ASCII)
-                    $ascii .= $value[$i];
-                    break;
-
-                case (($ord_var_c & 0xE0) == 0xC0):
-                    // characters U-00000080 - U-000007FF, mask 110XXXXX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ord_var_c, ord($value[$i + 1]));
-                    $i += 1;
-                    $utf16 = self::_utf82utf16($char);
-                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                    break;
-
-                case (($ord_var_c & 0xF0) == 0xE0):
-                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ord_var_c,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]));
-                    $i += 2;
-                    $utf16 = self::_utf82utf16($char);
-                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                    break;
-
-                case (($ord_var_c & 0xF8) == 0xF0):
-                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ord_var_c,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]));
-                    $i += 3;
-                    $utf16 = self::_utf82utf16($char);
-                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                    break;
-
-                case (($ord_var_c & 0xFC) == 0xF8):
-                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ord_var_c,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]),
-                                 ord($value[$i + 4]));
-                    $i += 4;
-                    $utf16 = self::_utf82utf16($char);
-                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                    break;
-
-                case (($ord_var_c & 0xFE) == 0xFC):
-                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ord_var_c,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]),
-                                 ord($value[$i + 4]),
-                                 ord($value[$i + 5]));
-                    $i += 5;
-                    $utf16 = self::_utf82utf16($char);
-                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                    break;
-            }
-        }
-
-        return $ascii;
-     }
-
-    /**
-     * Convert a string from one UTF-8 char to one UTF-16 char.
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * This method is from the Solar Framework by Paul M. Jones
-     *
-     * @link   http://solarphp.com
-     * @param string $utf8 UTF-8 character
-     * @return string UTF-16 character
-     */
-    protected static function _utf82utf16($utf8)
-    {
-        // Check for mb extension otherwise do by hand.
-        if( function_exists('mb_convert_encoding') ) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch (strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Json/Exception.php b/airtime_mvc/library/Zend/Json/Exception.php
deleted file mode 100644
index 58a35ea54..000000000
--- a/airtime_mvc/library/Zend/Json/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Json/Expr.php b/airtime_mvc/library/Zend/Json/Expr.php
deleted file mode 100644
index 2d403c9b2..000000000
--- a/airtime_mvc/library/Zend/Json/Expr.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Expr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for Zend_Json encode method.
- *
- * This class simply holds a string with a native Javascript Expression,
- * so objects | arrays to be encoded with Zend_Json can contain native
- * Javascript Expressions.
- *
- * Example:
- * <code>
- * $foo = array(
- *     'integer'  =>9,
- *     'string'   =>'test string',
- *     'function' => Zend_Json_Expr(
- *         'function(){ window.alert("javascript function encoded by Zend_Json") }'
- *     ),
- * );
- *
- * Zend_Json::encode($foo, false, array('enableJsonExprFinder' => true));
- * // it will returns json encoded string:
- * // {"integer":9,"string":"test string","function":function(){window.alert("javascript function encoded by Zend_Json")}}
- * </code>
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Expr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Expr
-{
-    /**
-     * Storage for javascript expression.
-     *
-     * @var string
-     */
-    protected $_expression;
-
-    /**
-     * Constructor
-     *
-     * @param  string $expression the expression to hold.
-     * @return void
-     */
-    public function __construct($expression)
-    {
-        $this->_expression = (string) $expression;
-    }
-
-    /**
-     * Cast to string
-     *
-     * @return string holded javascript expression.
-     */
-    public function __toString()
-    {
-        return $this->_expression;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server.php b/airtime_mvc/library/Zend/Json/Server.php
deleted file mode 100644
index 461212e99..000000000
--- a/airtime_mvc/library/Zend/Json/Server.php
+++ /dev/null
@@ -1,537 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Server_Abstract
- */
-require_once 'Zend/Server/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server extends Zend_Server_Abstract
-{
-    /**#@+
-     * Version Constants
-     */
-    const VERSION_1 = '1.0';
-    const VERSION_2 = '2.0';
-    /**#@-*/
-
-    /**
-     * Flag: whether or not to auto-emit the response
-     * @var bool
-     */
-    protected $_autoEmitResponse = true;
-
-    /**
-     * @var bool Flag; allow overwriting existing methods when creating server definition
-     */
-    protected $_overwriteExistingMethods = true;
-
-    /**
-     * Request object
-     * @var Zend_Json_Server_Request
-     */
-    protected $_request;
-
-    /**
-     * Response object
-     * @var Zend_Json_Server_Response
-     */
-    protected $_response;
-
-    /**
-     * SMD object
-     * @var Zend_Json_Server_Smd
-     */
-    protected $_serviceMap;
-
-    /**
-     * SMD class accessors
-     * @var array
-     */
-    protected $_smdMethods;
-
-    /**
-     * @var Zend_Server_Description
-     */
-    protected $_table;
-
-    /**
-     * Attach a function or callback to the server
-     *
-     * @param  string|array $function Valid PHP callback
-     * @param  string $namespace  Ignored
-     * @return Zend_Json_Server
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        if (!is_string($function) && (!is_array($function) || (2 > count($function)))) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Unable to attach function; invalid');
-        }
-
-        if (!is_callable($function)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Unable to attach function; does not exist');
-        }
-
-        $argv = null;
-        if (2 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 2);
-        }
-
-        require_once 'Zend/Server/Reflection.php';
-        if (is_string($function)) {
-            $method = Zend_Server_Reflection::reflectFunction($function, $argv, $namespace);
-        } else {
-            $class  = array_shift($function);
-            $action = array_shift($function);
-            $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
-            $methods = $reflection->getMethods();
-            $found   = false;
-            foreach ($methods as $method) {
-                if ($action == $method->getName()) {
-                    $found = true;
-                    break;
-                }
-            }
-            if (!$found) {
-                $this->fault('Method not found', -32601);
-                return $this;
-            }
-        }
-
-        $definition = $this->_buildSignature($method);
-        $this->_addMethodServiceMap($definition);
-
-        return $this;
-    }
-
-    /**
-     * Register a class with the server
-     *
-     * @param  string $class
-     * @param  string $namespace Ignored
-     * @param  mixed $argv Ignored
-     * @return Zend_Json_Server
-     */
-    public function setClass($class, $namespace = '', $argv = null)
-    {
-        $argv = null;
-        if (3 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 3);
-        }
-
-        require_once 'Zend/Server/Reflection.php';
-        $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
-
-        foreach ($reflection->getMethods() as $method) {
-            $definition = $this->_buildSignature($method, $class);
-            $this->_addMethodServiceMap($definition);
-        }
-        return $this;
-    }
-
-    /**
-     * Indicate fault response
-     *
-     * @param  string $fault
-     * @param  int $code
-     * @return false
-     */
-    public function fault($fault = null, $code = 404, $data = null)
-    {
-        require_once 'Zend/Json/Server/Error.php';
-        $error = new Zend_Json_Server_Error($fault, $code, $data);
-        $this->getResponse()->setError($error);
-        return $error;
-    }
-
-    /**
-     * Handle request
-     *
-     * @param  Zend_Json_Server_Request $request
-     * @return null|Zend_Json_Server_Response
-     */
-    public function handle($request = false)
-    {
-        if ((false !== $request) && (!$request instanceof Zend_Json_Server_Request)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid request type provided; cannot handle');
-        } elseif ($request) {
-            $this->setRequest($request);
-        }
-
-        // Handle request
-        $this->_handle();
-
-        // Get response
-        $response = $this->_getReadyResponse();
-
-        // Emit response?
-        if ($this->autoEmitResponse()) {
-            echo $response;
-            return;
-        }
-
-        // or return it?
-        return $response;
-    }
-
-    /**
-     * Load function definitions
-     *
-     * @param  array|Zend_Server_Definition $definition
-     * @return void
-     */
-    public function loadFunctions($definition)
-    {
-        if (!is_array($definition) && (!$definition instanceof Zend_Server_Definition)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid definition provided to loadFunctions()');
-        }
-
-        foreach ($definition as $key => $method) {
-            $this->_table->addMethod($method, $key);
-            $this->_addMethodServiceMap($method);
-        }
-    }
-
-    public function setPersistence($mode)
-    {
-    }
-
-    /**
-     * Set request object
-     *
-     * @param  Zend_Json_Server_Request $request
-     * @return Zend_Json_Server
-     */
-    public function setRequest(Zend_Json_Server_Request $request)
-    {
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * Get JSON-RPC request object
-     *
-     * @return Zend_Json_Server_Request
-     */
-    public function getRequest()
-    {
-        if (null === ($request = $this->_request)) {
-            require_once 'Zend/Json/Server/Request/Http.php';
-            $this->setRequest(new Zend_Json_Server_Request_Http());
-        }
-        return $this->_request;
-    }
-
-    /**
-     * Set response object
-     *
-     * @param  Zend_Json_Server_Response $response
-     * @return Zend_Json_Server
-     */
-    public function setResponse(Zend_Json_Server_Response $response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * Get response object
-     *
-     * @return Zend_Json_Server_Response
-     */
-    public function getResponse()
-    {
-        if (null === ($response = $this->_response)) {
-            require_once 'Zend/Json/Server/Response/Http.php';
-            $this->setResponse(new Zend_Json_Server_Response_Http());
-        }
-        return $this->_response;
-    }
-
-    /**
-     * Set flag indicating whether or not to auto-emit response
-     *
-     * @param  bool $flag
-     * @return Zend_Json_Server
-     */
-    public function setAutoEmitResponse($flag)
-    {
-        $this->_autoEmitResponse = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Will we auto-emit the response?
-     *
-     * @return bool
-     */
-    public function autoEmitResponse()
-    {
-        return $this->_autoEmitResponse;
-    }
-
-    // overloading for SMD metadata
-    /**
-     * Overload to accessors of SMD object
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^(set|get)/', $method, $matches)) {
-            if (in_array($method, $this->_getSmdMethods())) {
-                if ('set' == $matches[1]) {
-                    $value = array_shift($args);
-                    $this->getServiceMap()->$method($value);
-                    return $this;
-                } else {
-                    return $this->getServiceMap()->$method();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve SMD object
-     *
-     * @return Zend_Json_Server_Smd
-     */
-    public function getServiceMap()
-    {
-        if (null === $this->_serviceMap) {
-            require_once 'Zend/Json/Server/Smd.php';
-            $this->_serviceMap = new Zend_Json_Server_Smd();
-        }
-        return $this->_serviceMap;
-    }
-
-    /**
-     * Add service method to service map
-     *
-     * @param  Zend_Server_Reflection_Function $method
-     * @return void
-     */
-    protected function _addMethodServiceMap(Zend_Server_Method_Definition $method)
-    {
-        $serviceInfo = array(
-            'name'   => $method->getName(),
-            'return' => $this->_getReturnType($method),
-        );
-        $params = $this->_getParams($method);
-        $serviceInfo['params'] = $params;
-        $serviceMap = $this->getServiceMap();
-        if (false !== $serviceMap->getService($serviceInfo['name'])) {
-            $serviceMap->removeService($serviceInfo['name']);
-        }
-        $serviceMap->addService($serviceInfo);
-    }
-
-    /**
-     * Translate PHP type to JSON type
-     *
-     * @param  string $type
-     * @return string
-     */
-    protected function _fixType($type)
-    {
-        return $type;
-    }
-
-    /**
-     * Get default params from signature
-     *
-     * @param  array $args
-     * @param  array $params
-     * @return array
-     */
-    protected function _getDefaultParams(array $args, array $params)
-    {
-        $defaultParams = array_slice($params, count($args));
-        foreach ($defaultParams as $param) {
-            $value = null;
-            if (array_key_exists('default', $param)) {
-                $value = $param['default'];
-            }
-            array_push($args, $value);
-        }
-        return $args;
-    }
-
-    /**
-     * Get method param type
-     *
-     * @param  Zend_Server_Reflection_Function_Abstract $method
-     * @return string|array
-     */
-    protected function _getParams(Zend_Server_Method_Definition $method)
-    {
-        $params = array();
-        foreach ($method->getPrototypes() as $prototype) {
-            foreach ($prototype->getParameterObjects() as $key => $parameter) {
-                if (!isset($params[$key])) {
-                    $params[$key] = array(
-                        'type'     => $parameter->getType(),
-                        'name'     => $parameter->getName(),
-                        'optional' => $parameter->isOptional(),
-                    );
-                    if (null !== ($default = $parameter->getDefaultValue())) {
-                        $params[$key]['default'] = $default;
-                    }
-                    $description = $parameter->getDescription();
-                    if (!empty($description)) {
-                        $params[$key]['description'] = $description;
-                    }
-                    continue;
-                }
-                $newType = $parameter->getType();
-                if (!is_array($params[$key]['type'])) {
-                    if ($params[$key]['type'] == $newType) {
-                        continue;
-                    }
-                    $params[$key]['type'] = (array) $params[$key]['type'];
-                } elseif (in_array($newType, $params[$key]['type'])) {
-                    continue;
-                }
-                array_push($params[$key]['type'], $parameter->getType());
-            }
-        }
-        return $params;
-    }
-
-    /**
-     * Set response state
-     *
-     * @return Zend_Json_Server_Response
-     */
-    protected function _getReadyResponse()
-    {
-        $request  = $this->getRequest();
-        $response = $this->getResponse();
-
-        $response->setServiceMap($this->getServiceMap());
-        if (null !== ($id = $request->getId())) {
-            $response->setId($id);
-        }
-        if (null !== ($version = $request->getVersion())) {
-            $response->setVersion($version);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Get method return type
-     *
-     * @param  Zend_Server_Reflection_Function_Abstract $method
-     * @return string|array
-     */
-    protected function _getReturnType(Zend_Server_Method_Definition $method)
-    {
-        $return = array();
-        foreach ($method->getPrototypes() as $prototype) {
-            $return[] = $prototype->getReturnType();
-        }
-        if (1 == count($return)) {
-            return $return[0];
-        }
-        return $return;
-    }
-
-    /**
-     * Retrieve list of allowed SMD methods for proxying
-     *
-     * @return array
-     */
-    protected function _getSmdMethods()
-    {
-        if (null === $this->_smdMethods) {
-            $this->_smdMethods = array();
-            require_once 'Zend/Json/Server/Smd.php';
-            $methods = get_class_methods('Zend_Json_Server_Smd');
-            foreach ($methods as $key => $method) {
-                if (!preg_match('/^(set|get)/', $method)) {
-                    continue;
-                }
-                if (strstr($method, 'Service')) {
-                    continue;
-                }
-                $this->_smdMethods[] = $method;
-            }
-        }
-        return $this->_smdMethods;
-    }
-
-    /**
-     * Internal method for handling request
-     *
-     * @return void
-     */
-    protected function _handle()
-    {
-        $request = $this->getRequest();
-
-        if (!$request->isMethodError() && (null === $request->getMethod())) {
-            return $this->fault('Invalid Request', -32600);
-        }
-
-        if ($request->isMethodError()) {
-            return $this->fault('Invalid Request', -32600);
-        }
-
-        $method = $request->getMethod();
-        if (!$this->_table->hasMethod($method)) {
-            return $this->fault('Method not found', -32601);
-        }
-
-        $params        = $request->getParams();
-        $invocable     = $this->_table->getMethod($method);
-        $serviceMap    = $this->getServiceMap();
-        $service       = $serviceMap->getService($method);
-        $serviceParams = $service->getParams();
-
-        if (count($params) < count($serviceParams)) {
-            $params = $this->_getDefaultParams($params, $serviceParams);
-        }
-
-        try {
-            $result = $this->_dispatch($invocable, $params);
-        } catch (Exception $e) {
-            return $this->fault($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $this->getResponse()->setResult($result);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Cache.php b/airtime_mvc/library/Zend/Json/Server/Cache.php
deleted file mode 100644
index 44026e4f4..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Cache.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Server_Cache */
-require_once 'Zend/Server/Cache.php';
-
-/**
- * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Cache extends Zend_Server_Cache
-{
-    /**
-     * Cache a service map description (SMD) to a file
-     *
-     * Returns true on success, false on failure
-     *
-     * @param  string $filename
-     * @param  Zend_Json_Server $server
-     * @return boolean
-     */
-    public static function saveSmd($filename, Zend_Json_Server $server)
-    {
-        if (!is_string($filename)
-            || (!file_exists($filename) && !is_writable(dirname($filename))))
-        {
-            return false;
-        }
-
-        if (0 === @file_put_contents($filename, $server->getServiceMap()->toJson())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieve a cached SMD
-     *
-     * On success, returns the cached SMD (a JSON string); an failure, returns
-     * boolean false.
-     *
-     * @param  string $filename
-     * @return string|false
-     */
-    public static function getSmd($filename)
-    {
-        if (!is_string($filename)
-            || !file_exists($filename)
-            || !is_readable($filename))
-        {
-            return false;
-        }
-
-
-        if (false === ($smd = @file_get_contents($filename))) {
-            return false;
-        }
-
-        return $smd;
-    }
-
-    /**
-     * Delete a file containing a cached SMD
-     *
-     * @param  string $filename
-     * @return bool
-     */
-    public static function deleteSmd($filename)
-    {
-        if (is_string($filename) && file_exists($filename)) {
-            unlink($filename);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Error.php b/airtime_mvc/library/Zend/Json/Server/Error.php
deleted file mode 100644
index e5e6dbc03..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Error.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Error
-{
-    const ERROR_PARSE           = -32768;
-    const ERROR_INVALID_REQUEST = -32600;
-    const ERROR_INVALID_METHOD  = -32601;
-    const ERROR_INVALID_PARAMS  = -32602;
-    const ERROR_INTERNAL        = -32603;
-    const ERROR_OTHER           = -32000;
-
-    /**
-     * Allowed error codes
-     * @var array
-     */
-    protected $_allowedCodes = array(
-        self::ERROR_PARSE,
-        self::ERROR_INVALID_REQUEST,
-        self::ERROR_INVALID_METHOD,
-        self::ERROR_INVALID_PARAMS,
-        self::ERROR_INTERNAL,
-        self::ERROR_OTHER,
-    );
-
-    /**
-     * Current code
-     * @var int
-     */
-    protected $_code = -32000;
-
-    /**
-     * Error data
-     * @var mixed
-     */
-    protected $_data;
-
-    /**
-     * Error message
-     * @var string
-     */
-    protected $_message;
-
-    /**
-     * Constructor
-     *
-     * @param  string $message
-     * @param  int $code
-     * @param  mixed $data
-     * @return void
-     */
-    public function __construct($message = null, $code = -32000, $data = null)
-    {
-        $this->setMessage($message)
-             ->setCode($code)
-             ->setData($data);
-    }
-
-    /**
-     * Set error code
-     *
-     * @param  int $code
-     * @return Zend_Json_Server_Error
-     */
-    public function setCode($code)
-    {
-        if (!is_scalar($code)) {
-            return $this;
-        }
-
-        $code = (int) $code;
-        if (in_array($code, $this->_allowedCodes)) {
-            $this->_code = $code;
-        } elseif (in_array($code, range(-32099, -32000))) {
-            $this->_code = $code;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get error code
-     *
-     * @return int|null
-     */
-    public function getCode()
-    {
-        return $this->_code;
-    }
-
-    /**
-     * Set error message
-     *
-     * @param  string $message
-     * @return Zend_Json_Server_Error
-     */
-    public function setMessage($message)
-    {
-        if (!is_scalar($message)) {
-            return $this;
-        }
-
-        $this->_message = (string) $message;
-        return $this;
-    }
-
-    /**
-     * Get error message
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->_message;
-    }
-
-    /**
-     * Set error data
-     *
-     * @param  mixed $data
-     * @return Zend_Json_Server_Error
-     */
-    public function setData($data)
-    {
-        $this->_data = $data;
-        return $this;
-    }
-
-    /**
-     * Get error data
-     *
-     * @return mixed
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Cast error to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return array(
-            'code'    => $this->getCode(),
-            'message' => $this->getMessage(),
-            'data'    => $this->getData(),
-        );
-    }
-
-    /**
-     * Cast error to JSON
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($this->toArray());
-    }
-
-    /**
-     * Cast to string (JSON)
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Json/Server/Exception.php b/airtime_mvc/library/Zend/Json/Server/Exception.php
deleted file mode 100644
index 39d796d22..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Json_Exception */
-require_once 'Zend/Json/Exception.php';
-
-/**
- * Zend_Json_Server exceptions
- *
- * @uses       Zend_Json_Exception
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Exception extends Zend_Json_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Request.php b/airtime_mvc/library/Zend/Json/Server/Request.php
deleted file mode 100644
index 16036eb44..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Request.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Request
-{
-    /**
-     * Request ID
-     * @var mixed
-     */
-    protected $_id;
-
-    /**
-     * Flag
-     * @var bool
-     */
-    protected $_isMethodError = false;
-
-    /**
-     * Requested method
-     * @var string
-     */
-    protected $_method;
-
-    /**
-     * Regex for method
-     * @var string
-     */
-    protected $_methodRegex = '/^[a-z][a-z0-9_.]*$/i';
-
-    /**
-     * Request parameters
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * JSON-RPC version of request
-     * @var string
-     */
-    protected $_version = '1.0';
-
-    /**
-     * Set request state
-     *
-     * @param  array $options
-     * @return Zend_Json_Server_Request
-     */
-    public function setOptions(array $options)
-    {
-        $methods = get_class_methods($this);
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            } elseif ($key == 'jsonrpc') {
-                $this->setVersion($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Add a parameter to the request
-     *
-     * @param  mixed $value
-     * @param  string $key
-     * @return Zend_Json_Server_Request
-     */
-    public function addParam($value, $key = null)
-    {
-        if ((null === $key) || !is_string($key)) {
-            $index = count($this->_params);
-            $this->_params[$index] = $value;
-        } else {
-            $this->_params[$key] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add many params
-     *
-     * @param  array $params
-     * @return Zend_Json_Server_Request
-     */
-    public function addParams(array $params)
-    {
-        foreach ($params as $key => $value) {
-            $this->addParam($value, $key);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite params
-     *
-     * @param  array $params
-     * @return Zend_Json_Server_Request
-     */
-    public function setParams(array $params)
-    {
-        $this->_params = array();
-        return $this->addParams($params);
-    }
-
-    /**
-     * Retrieve param by index or key
-     *
-     * @param  int|string $index
-     * @return mixed|null Null when not found
-     */
-    public function getParam($index)
-    {
-        if (array_key_exists($index, $this->_params)) {
-            return $this->_params[$index];
-        }
-
-        return null;
-    }
-
-    /**
-     * Retrieve parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Set request method
-     *
-     * @param  string $name
-     * @return Zend_Json_Server_Request
-     */
-    public function setMethod($name)
-    {
-        if (!preg_match($this->_methodRegex, $name)) {
-            $this->_isMethodError = true;
-        } else {
-            $this->_method = $name;
-        }
-        return $this;
-    }
-
-    /**
-     * Get request method name
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-
-    /**
-     * Was a bad method provided?
-     *
-     * @return bool
-     */
-    public function isMethodError()
-    {
-        return $this->_isMethodError;
-    }
-
-    /**
-     * Set request identifier
-     *
-     * @param  mixed $name
-     * @return Zend_Json_Server_Request
-     */
-    public function setId($name)
-    {
-        $this->_id = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve request identifier
-     *
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Set JSON-RPC version
-     *
-     * @param  string $version
-     * @return Zend_Json_Server_Request
-     */
-    public function setVersion($version)
-    {
-        if ('2.0' == $version) {
-            $this->_version = '2.0';
-        } else {
-            $this->_version = '1.0';
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve JSON-RPC version
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-
-    /**
-     * Set request state based on JSON
-     *
-     * @param  string $json
-     * @return void
-     */
-    public function loadJson($json)
-    {
-        require_once 'Zend/Json.php';
-        $options = Zend_Json::decode($json);
-        $this->setOptions($options);
-    }
-
-    /**
-     * Cast request to JSON
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $jsonArray = array(
-            'method' => $this->getMethod()
-        );
-        if (null !== ($id = $this->getId())) {
-            $jsonArray['id'] = $id;
-        }
-        $params = $this->getParams();
-        if (!empty($params)) {
-            $jsonArray['params'] = $params;
-        }
-        if ('2.0' == $this->getVersion()) {
-            $jsonArray['jsonrpc'] = '2.0';
-        }
-
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($jsonArray);
-    }
-
-    /**
-     * Cast request to string (JSON)
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Request/Http.php b/airtime_mvc/library/Zend/Json/Server/Request/Http.php
deleted file mode 100644
index 31b07d788..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Request/Http.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Json_Server_Request
- */
-require_once 'Zend/Json/Server/Request.php';
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Request_Http extends Zend_Json_Server_Request
-{
-    /**
-     * Raw JSON pulled from POST body
-     * @var string
-     */
-    protected $_rawJson;
-
-    /**
-     * Constructor
-     *
-     * Pull JSON request from raw POST body and use to populate request.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $json = file_get_contents('php://input');
-        $this->_rawJson = $json;
-        if (!empty($json)) {
-            $this->loadJson($json);
-        }
-    }
-
-    /**
-     * Get JSON from raw POST body
-     *
-     * @return string
-     */
-    public function getRawJson()
-    {
-        return $this->_rawJson;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Response.php b/airtime_mvc/library/Zend/Json/Server/Response.php
deleted file mode 100644
index 6a15fa698..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Response.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Response
-{
-    /**
-     * Response error
-     * @var null|Zend_Json_Server_Error
-     */
-    protected $_error;
-
-    /**
-     * Request ID
-     * @var mixed
-     */
-    protected $_id;
-
-    /**
-     * Result
-     * @var mixed
-     */
-    protected $_result;
-
-    /**
-     * Service map
-     * @var Zend_Json_Server_Smd
-     */
-    protected $_serviceMap;
-
-    /**
-     * JSON-RPC version
-     * @var string
-     */
-    protected $_version;
-
-    /**
-     * Set result
-     *
-     * @param  mixed $value
-     * @return Zend_Json_Server_Response
-     */
-    public function setResult($value)
-    {
-        $this->_result = $value;
-        return $this;
-    }
-
-    /**
-     * Get result
-     *
-     * @return mixed
-     */
-    public function getResult()
-    {
-        return $this->_result;
-    }
-
-    // RPC error, if response results in fault
-    /**
-     * Set result error
-     *
-     * @param  Zend_Json_Server_Error $error
-     * @return Zend_Json_Server_Response
-     */
-    public function setError(Zend_Json_Server_Error $error)
-    {
-        $this->_error = $error;
-        return $this;
-    }
-
-    /**
-     * Get response error
-     *
-     * @return null|Zend_Json_Server_Error
-     */
-    public function getError()
-    {
-        return $this->_error;
-    }
-
-    /**
-     * Is the response an error?
-     *
-     * @return bool
-     */
-    public function isError()
-    {
-        return $this->getError() instanceof Zend_Json_Server_Error;
-    }
-
-    /**
-     * Set request ID
-     *
-     * @param  mixed $name
-     * @return Zend_Json_Server_Response
-     */
-    public function setId($name)
-    {
-        $this->_id = $name;
-        return $this;
-    }
-
-    /**
-     * Get request ID
-     *
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Set JSON-RPC version
-     *
-     * @param  string $version
-     * @return Zend_Json_Server_Response
-     */
-    public function setVersion($version)
-    {
-        $version = (string) $version;
-        if ('2.0' == $version) {
-            $this->_version = '2.0';
-        } else {
-            $this->_version = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve JSON-RPC version
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-
-    /**
-     * Cast to JSON
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        if ($this->isError()) {
-            $response = array(
-                'result' => null,
-                'error'  => $this->getError()->toArray(),
-                'id'     => $this->getId(),
-            );
-        } else {
-            $response = array(
-                'result' => $this->getResult(),
-                'id'     => $this->getId(),
-                'error'  => null,
-            );
-        }
-
-        if (null !== ($version = $this->getVersion())) {
-            $response['jsonrpc'] = $version;
-        }
-
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($response);
-    }
-
-    /**
-     * Retrieve args
-     *
-     * @return mixed
-     */
-    public function getArgs()
-    {
-        return $this->_args;
-    }
-
-    /**
-     * Set args
-     *
-     * @param mixed $args
-     * @return self
-     */
-    public function setArgs($args)
-    {
-        $this->_args = $args;
-        return $this;
-    }
-
-    /**
-     * Set service map object
-     *
-     * @param  Zend_Json_Server_Smd $serviceMap
-     * @return Zend_Json_Server_Response
-     */
-    public function setServiceMap($serviceMap)
-    {
-        $this->_serviceMap = $serviceMap;
-        return $this;
-    }
-
-    /**
-     * Retrieve service map
-     *
-     * @return Zend_Json_Server_Smd|null
-     */
-    public function getServiceMap()
-    {
-        return $this->_serviceMap;
-    }
-
-    /**
-     * Cast to string (JSON)
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Json/Server/Response/Http.php b/airtime_mvc/library/Zend/Json/Server/Response/Http.php
deleted file mode 100644
index a665ca6c7..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Response/Http.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Json_Server_Response
- */
-require_once 'Zend/Json/Server/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Response_Http extends Zend_Json_Server_Response
-{
-    /**
-     * Emit JSON
-     *
-     * Send appropriate HTTP headers. If no Id, then return an empty string.
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $this->sendHeaders();
-        if (!$this->isError() && null === $this->getId()) {
-            return '';
-        }
-
-        return parent::toJson();
-    }
-
-    /**
-     * Send headers
-     *
-     * If headers are already sent, do nothing. If null ID, send HTTP 204
-     * header. Otherwise, send content type header based on content type of
-     * service map.
-     *
-     * @return void
-     */
-    public function sendHeaders()
-    {
-        if (headers_sent()) {
-            return;
-        }
-
-        if (!$this->isError() && (null === $this->getId())) {
-            header('HTTP/1.1 204 No Content');
-            return;
-        }
-
-        if (null === ($smd = $this->getServiceMap())) {
-            return;
-        }
-
-        $contentType = $smd->getContentType();
-        if (!empty($contentType)) {
-            header('Content-Type: ' . $contentType);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Json/Server/Smd.php b/airtime_mvc/library/Zend/Json/Server/Smd.php
deleted file mode 100644
index d5489785f..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Smd.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Smd.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Json
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Smd
-{
-    const ENV_JSONRPC_1 = 'JSON-RPC-1.0';
-    const ENV_JSONRPC_2 = 'JSON-RPC-2.0';
-    const SMD_VERSION   = '2.0';
-
-    /**
-     * Content type
-     * @var string
-     */
-    protected $_contentType = 'application/json';
-
-    /**
-     * Content type regex
-     * @var string
-     */
-    protected $_contentTypeRegex = '#[a-z]+/[a-z][a-z-]+#i';
-
-    /**
-     * Service description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Generate Dojo-compatible SMD
-     * @var bool
-     */
-    protected $_dojoCompatible = false;
-
-    /**
-     * Current envelope
-     * @var string
-     */
-    protected $_envelope = self::ENV_JSONRPC_1;
-
-    /**
-     * Allowed envelope types
-     * @var array
-     */
-    protected $_envelopeTypes = array(
-        self::ENV_JSONRPC_1,
-        self::ENV_JSONRPC_2,
-    );
-
-    /**
-     * Service id
-     * @var string
-     */
-    protected $_id;
-
-    /**
-     * Services offerred
-     * @var array
-     */
-    protected $_services = array();
-
-    /**
-     * Service target
-     * @var string
-     */
-    protected $_target;
-
-    /**
-     * Global transport
-     * @var string
-     */
-    protected $_transport = 'POST';
-
-    /**
-     * Allowed transport types
-     * @var array
-     */
-    protected $_transportTypes = array('POST');
-
-    /**
-     * Set object state via options
-     *
-     * @param  array $options
-     * @return Zend_Json_Server_Smd
-     */
-    public function setOptions(array $options)
-    {
-        $methods = get_class_methods($this);
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set transport
-     *
-     * @param  string $transport
-     * @return Zend_Json_Server_Smd
-     */
-    public function setTransport($transport)
-    {
-        if (!in_array($transport, $this->_transportTypes)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s" specified', $transport));
-        }
-        $this->_transport = $transport;
-        return $this;
-    }
-
-    /**
-     * Get transport
-     *
-     * @return string
-     */
-    public function getTransport()
-    {
-        return $this->_transport;
-    }
-
-    /**
-     * Set envelope
-     *
-     * @param  string $envelopeType
-     * @return Zend_Json_Server_Smd
-     */
-    public function setEnvelope($envelopeType)
-    {
-        if (!in_array($envelopeType, $this->_envelopeTypes)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"', $envelopeType));
-        }
-        $this->_envelope = $envelopeType;
-        return $this;
-    }
-
-    /**
-     * Retrieve envelope
-     *
-     * @return string
-     */
-    public function getEnvelope()
-    {
-        return $this->_envelope;
-    }
-
-    // Content-Type of response; default to application/json
-    /**
-     * Set content type
-     *
-     * @param  string $type
-     * @return Zend_Json_Server_Smd
-     */
-    public function setContentType($type)
-    {
-        if (!preg_match($this->_contentTypeRegex, $type)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid content type "%s" specified', $type));
-        }
-        $this->_contentType = $type;
-        return $this;
-    }
-
-    /**
-     * Retrieve content type
-     *
-     * @return string
-     */
-    public function getContentType()
-    {
-        return $this->_contentType;
-    }
-
-    /**
-     * Set service target
-     *
-     * @param  string $target
-     * @return Zend_Json_Server_Smd
-     */
-    public function setTarget($target)
-    {
-        $this->_target = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Retrieve service target
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_target;
-    }
-
-    /**
-     * Set service ID
-     *
-     * @param  string $Id
-     * @return Zend_Json_Server_Smd
-     */
-    public function setId($id)
-    {
-        $this->_id = (string) $id;
-        return $this->_id;
-    }
-
-    /**
-     * Get service id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Set service description
-     *
-     * @param  string $description
-     * @return Zend_Json_Server_Smd
-     */
-    public function setDescription($description)
-    {
-        $this->_description = (string) $description;
-        return $this->_description;
-    }
-
-    /**
-     * Get service description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Indicate whether or not to generate Dojo-compatible SMD
-     *
-     * @param  bool $flag
-     * @return Zend_Json_Server_Smd
-     */
-    public function setDojoCompatible($flag)
-    {
-        $this->_dojoCompatible = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is this a Dojo compatible SMD?
-     *
-     * @return bool
-     */
-    public function isDojoCompatible()
-    {
-        return $this->_dojoCompatible;
-    }
-
-    /**
-     * Add Service
-     *
-     * @param Zend_Json_Server_Smd_Service|array $service
-     * @return void
-     */
-    public function addService($service)
-    {
-        require_once 'Zend/Json/Server/Smd/Service.php';
-
-        if ($service instanceof Zend_Json_Server_Smd_Service) {
-            $name = $service->getName();
-        } elseif (is_array($service)) {
-            $service = new Zend_Json_Server_Smd_Service($service);
-            $name = $service->getName();
-        } else {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid service passed to addService()');
-        }
-
-        if (array_key_exists($name, $this->_services)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Attempt to register a service already registered detected');
-        }
-        $this->_services[$name] = $service;
-        return $this;
-    }
-
-    /**
-     * Add many services
-     *
-     * @param  array $services
-     * @return Zend_Json_Server_Smd
-     */
-    public function addServices(array $services)
-    {
-        foreach ($services as $service) {
-            $this->addService($service);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite existing services with new ones
-     *
-     * @param  array $services
-     * @return Zend_Json_Server_Smd
-     */
-    public function setServices(array $services)
-    {
-        $this->_services = array();
-        return $this->addServices($services);
-    }
-
-    /**
-     * Get service object
-     *
-     * @param  string $name
-     * @return false|Zend_Json_Server_Smd_Service
-     */
-    public function getService($name)
-    {
-        if (array_key_exists($name, $this->_services)) {
-            return $this->_services[$name];
-        }
-        return false;
-    }
-
-    /**
-     * Return services
-     *
-     * @return array
-     */
-    public function getServices()
-    {
-        return $this->_services;
-    }
-
-    /**
-     * Remove service
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function removeService($name)
-    {
-        if (array_key_exists($name, $this->_services)) {
-            unset($this->_services[$name]);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Cast to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        if ($this->isDojoCompatible()) {
-            return $this->toDojoArray();
-        }
-
-        $transport   = $this->getTransport();
-        $envelope    = $this->getEnvelope();
-        $contentType = $this->getContentType();
-        $SMDVersion  = self::SMD_VERSION;
-        $service = compact('transport', 'envelope', 'contentType', 'SMDVersion');
-
-        if (null !== ($target = $this->getTarget())) {
-            $service['target']     = $target;
-        }
-        if (null !== ($id = $this->getId())) {
-            $service['id'] = $id;
-        }
-
-        $services = $this->getServices();
-        if (!empty($services)) {
-            $service['services'] = array();
-            foreach ($services as $name => $svc) {
-                $svc->setEnvelope($envelope);
-                $service['services'][$name] = $svc->toArray();
-            }
-            $service['methods'] = $service['services'];
-        }
-
-        return $service;
-    }
-
-    /**
-     * Export to DOJO-compatible SMD array
-     *
-     * @return array
-     */
-    public function toDojoArray()
-    {
-        $SMDVersion  = '.1';
-        $serviceType = 'JSON-RPC';
-        $service = compact('SMDVersion', 'serviceType');
-
-        $target = $this->getTarget();
-
-        $services = $this->getServices();
-        if (!empty($services)) {
-            $service['methods'] = array();
-            foreach ($services as $name => $svc) {
-                $method = array(
-                    'name'       => $name,
-                    'serviceURL' => $target,
-                );
-                $params = array();
-                foreach ($svc->getParams() as $param) {
-                    $paramName = array_key_exists('name', $param) ? $param['name'] : $param['type'];
-                    $params[] = array(
-                        'name' => $paramName,
-                        'type' => $param['type'],
-                    );
-                }
-                if (!empty($params)) {
-                    $method['parameters'] = $params;
-                }
-                $service['methods'][] = $method;
-            }
-        }
-
-        return $service;
-    }
-
-    /**
-     * Cast to JSON
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($this->toArray());
-    }
-
-    /**
-     * Cast to string (JSON)
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Json/Server/Smd/Service.php b/airtime_mvc/library/Zend/Json/Server/Smd/Service.php
deleted file mode 100644
index d46f31fd6..000000000
--- a/airtime_mvc/library/Zend/Json/Server/Smd/Service.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Json
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Json_Server_Smd
- */
-require_once 'Zend/Json/Server/Smd.php';
-
-/**
- * Create Service Mapping Description for a method
- *
- * @package    Zend_Json
- * @subpackage Server
- * @version    $Id: Service.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Json_Server_Smd_Service
-{
-    /**#@+
-     * Service metadata
-     * @var string
-     */
-    protected $_envelope  = Zend_Json_Server_Smd::ENV_JSONRPC_1;
-    protected $_name;
-    protected $_return;
-    protected $_target;
-    protected $_transport = 'POST';
-    /**#@-*/
-
-    /**
-     * Allowed envelope types
-     * @var array
-     */
-    protected $_envelopeTypes = array(
-        Zend_Json_Server_Smd::ENV_JSONRPC_1,
-        Zend_Json_Server_Smd::ENV_JSONRPC_2,
-    );
-
-    /**
-     * Regex for names
-     * @var string
-     */
-    protected $_nameRegex = '/^[a-z][a-z0-9._]+$/i';
-
-    /**
-     * Parameter option types
-     * @var array
-     */
-    protected $_paramOptionTypes = array(
-        'name'        => 'is_string',
-        'optional'    => 'is_bool',
-        'default'     => null,
-        'description' => 'is_string',
-    );
-
-    /**
-     * Service params
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Mapping of parameter types to JSON-RPC types
-     * @var array
-     */
-    protected $_paramMap = array(
-        'any'     => 'any',
-        'arr'     => 'array',
-        'array'   => 'array',
-        'assoc'   => 'object',
-        'bool'    => 'boolean',
-        'boolean' => 'boolean',
-        'dbl'     => 'float',
-        'double'  => 'float',
-        'false'   => 'boolean',
-        'float'   => 'float',
-        'hash'    => 'object',
-        'integer' => 'integer',
-        'int'     => 'integer',
-        'mixed'   => 'any',
-        'nil'     => 'null',
-        'null'    => 'null',
-        'object'  => 'object',
-        'string'  => 'string',
-        'str'     => 'string',
-        'struct'  => 'object',
-        'true'    => 'boolean',
-        'void'    => 'null',
-    );
-
-    /**
-     * Allowed transport types
-     * @var array
-     */
-    protected $_transportTypes = array(
-        'POST',
-    );
-
-    /**
-     * Constructor
-     *
-     * @param  string|array $spec
-     * @return void
-     * @throws Zend_Json_Server_Exception if no name provided
-     */
-    public function __construct($spec)
-    {
-        if (is_string($spec)) {
-            $this->setName($spec);
-        } elseif (is_array($spec)) {
-            $this->setOptions($spec);
-        }
-
-        if (null == $this->getName()) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('SMD service description requires a name; none provided');
-        }
-    }
-
-    /**
-     * Set object state
-     *
-     * @param  array $options
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setOptions(array $options)
-    {
-        $methods = get_class_methods($this);
-        foreach ($options as $key => $value) {
-            if ('options' == strtolower($key)) {
-                continue;
-            }
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set service name
-     *
-     * @param  string $name
-     * @return Zend_Json_Server_Smd_Service
-     * @throws Zend_Json_Server_Exception
-     */
-    public function setName($name)
-    {
-        $name = (string) $name;
-        if (!preg_match($this->_nameRegex, $name)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid name "%s" provided for service; must follow PHP method naming conventions', $name));
-        }
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set Transport
-     *
-     * Currently limited to POST
-     *
-     * @param  string $transport
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setTransport($transport)
-    {
-        if (!in_array($transport, $this->_transportTypes)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s"; please select one of (%s)', $transport, implode(', ', $this->_transportTypes)));
-        }
-
-        $this->_transport = $transport;
-        return $this;
-    }
-
-    /**
-     * Get transport
-     *
-     * @return string
-     */
-    public function getTransport()
-    {
-        return $this->_transport;
-    }
-
-    /**
-     * Set service target
-     *
-     * @param  string $target
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setTarget($target)
-    {
-        $this->_target = (string) $target;
-        return $this;
-    }
-
-    /**
-     * Get service target
-     *
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->_target;
-    }
-
-    /**
-     * Set envelope type
-     *
-     * @param  string $envelopeType
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setEnvelope($envelopeType)
-    {
-        if (!in_array($envelopeType, $this->_envelopeTypes)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"; please specify one of (%s)', $envelopeType, implode(', ', $this->_envelopeTypes)));
-        }
-
-        $this->_envelope = $envelopeType;
-        return $this;
-    }
-
-    /**
-     * Get envelope type
-     *
-     * @return string
-     */
-    public function getEnvelope()
-    {
-        return $this->_envelope;
-    }
-
-    /**
-     * Add a parameter to the service
-     *
-     * @param  string|array $type
-     * @param  array $options
-     * @param  int|null $order
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function addParam($type, array $options = array(), $order = null)
-    {
-        if (is_string($type)) {
-            $type = $this->_validateParamType($type);
-        } elseif (is_array($type)) {
-            foreach ($type as $key => $paramType) {
-                $type[$key] = $this->_validateParamType($paramType);
-            }
-        } else {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid param type provided');
-        }
-
-        $paramOptions = array(
-            'type' => $type,
-        );
-        foreach ($options as $key => $value) {
-            if (in_array($key, array_keys($this->_paramOptionTypes))) {
-                if (null !== ($callback = $this->_paramOptionTypes[$key])) {
-                    if (!$callback($value)) {
-                        continue;
-                    }
-                }
-                $paramOptions[$key] = $value;
-            }
-        }
-
-        $this->_params[] = array(
-            'param' => $paramOptions,
-            'order' => $order,
-        );
-
-        return $this;
-    }
-
-    /**
-     * Add params
-     *
-     * Each param should be an array, and should include the key 'type'.
-     *
-     * @param  array $params
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function addParams(array $params)
-    {
-        ksort($params);
-        foreach ($params as $options) {
-            if (!is_array($options)) {
-                continue;
-            }
-            if (!array_key_exists('type', $options)) {
-                continue;
-            }
-            $type  = $options['type'];
-            $order = (array_key_exists('order', $options)) ? $options['order'] : null;
-            $this->addParam($type, $options, $order);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite all parameters
-     *
-     * @param  array $params
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setParams(array $params)
-    {
-        $this->_params = array();
-        return $this->addParams($params);
-    }
-
-    /**
-     * Get all parameters
-     *
-     * Returns all params in specified order.
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        $params = array();
-        $index  = 0;
-        foreach ($this->_params as $param) {
-            if (null === $param['order']) {
-                if (array_search($index, array_keys($params), true)) {
-                    ++$index;
-                }
-                $params[$index] = $param['param'];
-                ++$index;
-            } else {
-                $params[$param['order']] = $param['param'];
-            }
-        }
-        ksort($params);
-        return $params;
-    }
-
-    /**
-     * Set return type
-     *
-     * @param  string|array $type
-     * @return Zend_Json_Server_Smd_Service
-     */
-    public function setReturn($type)
-    {
-        if (is_string($type)) {
-            $type = $this->_validateParamType($type, true);
-        } elseif (is_array($type)) {
-            foreach ($type as $key => $returnType) {
-                $type[$key] = $this->_validateParamType($returnType, true);
-            }
-        } else {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . gettype($type) .'")');
-        }
-        $this->_return = $type;
-        return $this;
-    }
-
-    /**
-     * Get return type
-     *
-     * @return string|array
-     */
-    public function getReturn()
-    {
-        return $this->_return;
-    }
-
-    /**
-     * Cast service description to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $name       = $this->getName();
-        $envelope   = $this->getEnvelope();
-        $target     = $this->getTarget();
-        $transport  = $this->getTransport();
-        $parameters = $this->getParams();
-        $returns    = $this->getReturn();
-
-        if (empty($target)) {
-            return compact('envelope', 'transport', 'parameters', 'returns');
-        }
-
-        return $paramInfo = compact('envelope', 'target', 'transport', 'parameters', 'returns');
-    }
-
-    /**
-     * Return JSON encoding of service
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $service = array($this->getName() => $this->toArray());
-
-        require_once 'Zend/Json.php';
-        return Zend_Json::encode($service);
-    }
-
-    /**
-     * Cast to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJson();
-    }
-
-    /**
-     * Validate parameter type
-     *
-     * @param  string $type
-     * @return true
-     * @throws Zend_Json_Server_Exception
-     */
-    protected function _validateParamType($type, $isReturn = false)
-    {
-        if (!is_string($type)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type .'")');
-        }
-
-        if (!array_key_exists($type, $this->_paramMap)) {
-            $type = 'object';
-        }
-
-        $paramType = $this->_paramMap[$type];
-        if (!$isReturn && ('null' == $paramType)) {
-            require_once 'Zend/Json/Server/Exception.php';
-            throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type . '")');
-        }
-
-        return $paramType;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Layout.php b/airtime_mvc/library/Zend/Layout.php
deleted file mode 100644
index 9a7c4d5ef..000000000
--- a/airtime_mvc/library/Zend/Layout.php
+++ /dev/null
@@ -1,798 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Provide Layout support for MVC applications
- *
- * @category   Zend
- * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Layout
-{
-    /**
-     * Placeholder container for layout variables
-     * @var Zend_View_Helper_Placeholder_Container
-     */
-    protected $_container;
-
-    /**
-     * Key used to store content from 'default' named response segment
-     * @var string
-     */
-    protected $_contentKey = 'content';
-
-    /**
-     * Are layouts enabled?
-     * @var bool
-     */
-    protected $_enabled = true;
-
-    /**
-     * Helper class
-     * @var string
-     */
-    protected $_helperClass = 'Zend_Layout_Controller_Action_Helper_Layout';
-
-    /**
-     * Inflector used to resolve layout script
-     * @var Zend_Filter_Inflector
-     */
-    protected $_inflector;
-
-    /**
-     * Flag: is inflector enabled?
-     * @var bool
-     */
-    protected $_inflectorEnabled = true;
-
-    /**
-     * Inflector target
-     * @var string
-     */
-    protected $_inflectorTarget = ':script.:suffix';
-
-    /**
-     * Layout view
-     * @var string
-     */
-    protected $_layout = 'layout';
-
-    /**
-     * Layout view script path
-     * @var string
-     */
-    protected $_viewScriptPath = null;
-
-    protected $_viewBasePath = null;
-    protected $_viewBasePrefix = 'Layout_View';
-
-    /**
-     * Flag: is MVC integration enabled?
-     * @var bool
-     */
-    protected $_mvcEnabled = true;
-
-    /**
-     * Instance registered with MVC, if any
-     * @var Zend_Layout
-     */
-    protected static $_mvcInstance;
-
-    /**
-     * Flag: is MVC successful action only flag set?
-     * @var bool
-     */
-    protected $_mvcSuccessfulActionOnly = true;
-
-    /**
-     * Plugin class
-     * @var string
-     */
-    protected $_pluginClass = 'Zend_Layout_Controller_Plugin_Layout';
-
-    /**
-     * @var Zend_View_Interface
-     */
-    protected $_view;
-
-    /**
-     * View script suffix for layout script
-     * @var string
-     */
-    protected $_viewSuffix = 'phtml';
-
-    /**
-     * Constructor
-     *
-     * Accepts either:
-     * - A string path to layouts
-     * - An array of options
-     * - A Zend_Config object with options
-     *
-     * Layout script path, either as argument or as key in options, is
-     * required.
-     *
-     * If mvcEnabled flag is false from options, simply sets layout script path.
-     * Otherwise, also instantiates and registers action helper and controller
-     * plugin.
-     *
-     * @param  string|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null, $initMvc = false)
-    {
-        if (null !== $options) {
-            if (is_string($options)) {
-                $this->setLayoutPath($options);
-            } elseif (is_array($options)) {
-                $this->setOptions($options);
-            } elseif ($options instanceof Zend_Config) {
-                $this->setConfig($options);
-            } else {
-                require_once 'Zend/Layout/Exception.php';
-                throw new Zend_Layout_Exception('Invalid option provided to constructor');
-            }
-        }
-
-        $this->_initVarContainer();
-
-        if ($initMvc) {
-            $this->_setMvcEnabled(true);
-            $this->_initMvc();
-        } else {
-            $this->_setMvcEnabled(false);
-        }
-    }
-
-    /**
-     * Static method for initialization with MVC support
-     *
-     * @param  string|array|Zend_Config $options
-     * @return Zend_Layout
-     */
-    public static function startMvc($options = null)
-    {
-        if (null === self::$_mvcInstance) {
-            self::$_mvcInstance = new self($options, true);
-        }
-
-        if (is_string($options)) {
-            self::$_mvcInstance->setLayoutPath($options);
-        } elseif (is_array($options) || $options instanceof Zend_Config) {
-            self::$_mvcInstance->setOptions($options);
-        }
-
-        return self::$_mvcInstance;
-    }
-
-    /**
-     * Retrieve MVC instance of Zend_Layout object
-     *
-     * @return Zend_Layout|null
-     */
-    public static function getMvcInstance()
-    {
-        return self::$_mvcInstance;
-    }
-
-    /**
-     * Reset MVC instance
-     *
-     * Unregisters plugins and helpers, and destroys MVC layout instance.
-     *
-     * @return void
-     */
-    public static function resetMvcInstance()
-    {
-        if (null !== self::$_mvcInstance) {
-            $layout = self::$_mvcInstance;
-            $pluginClass = $layout->getPluginClass();
-            $front = Zend_Controller_Front::getInstance();
-            if ($front->hasPlugin($pluginClass)) {
-                $front->unregisterPlugin($pluginClass);
-            }
-
-            if (Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
-                Zend_Controller_Action_HelperBroker::removeHelper('layout');
-            }
-
-            unset($layout);
-            self::$_mvcInstance = null;
-        }
-    }
-
-    /**
-     * Set options en masse
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Layout/Exception.php';
-            throw new Zend_Layout_Exception('setOptions() expects either an array or a Zend_Config object');
-        }
-
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-    }
-
-    /**
-     * Initialize MVC integration
-     *
-     * @return void
-     */
-    protected function _initMvc()
-    {
-        $this->_initPlugin();
-        $this->_initHelper();
-    }
-
-    /**
-     * Initialize front controller plugin
-     *
-     * @return void
-     */
-    protected function _initPlugin()
-    {
-        $pluginClass = $this->getPluginClass();
-        require_once 'Zend/Controller/Front.php';
-        $front = Zend_Controller_Front::getInstance();
-        if (!$front->hasPlugin($pluginClass)) {
-            if (!class_exists($pluginClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($pluginClass);
-            }
-            $front->registerPlugin(
-                // register to run last | BUT before the ErrorHandler (if its available)
-                new $pluginClass($this),
-                99
-            );
-        }
-    }
-
-    /**
-     * Initialize action helper
-     *
-     * @return void
-     */
-    protected function _initHelper()
-    {
-        $helperClass = $this->getHelperClass();
-        require_once 'Zend/Controller/Action/HelperBroker.php';
-        if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
-            if (!class_exists($helperClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($helperClass);
-            }
-            Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this));
-        }
-    }
-
-    /**
-     * Set options from a config object
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Layout
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->setOptions($config->toArray());
-        return $this;
-    }
-
-    /**
-     * Initialize placeholder container for layout vars
-     *
-     * @return Zend_View_Helper_Placeholder_Container
-     */
-    protected function _initVarContainer()
-    {
-        if (null === $this->_container) {
-            require_once 'Zend/View/Helper/Placeholder/Registry.php';
-            $this->_container = Zend_View_Helper_Placeholder_Registry::getRegistry()->getContainer(__CLASS__);
-        }
-
-        return $this->_container;
-    }
-
-    /**
-     * Set layout script to use
-     *
-     * Note: enables layout by default, can be disabled
-     *
-     * @param  string $name
-     * @param  boolean $enabled
-     * @return Zend_Layout
-     */
-    public function setLayout($name, $enabled = true)
-    {
-        $this->_layout = (string) $name;
-        if ($enabled) {
-            $this->enableLayout();
-        }
-        return $this;
-    }
-
-    /**
-     * Get current layout script
-     *
-     * @return string
-     */
-    public function getLayout()
-    {
-        return $this->_layout;
-    }
-
-    /**
-     * Disable layout
-     *
-     * @return Zend_Layout
-     */
-    public function disableLayout()
-    {
-        $this->_enabled = false;
-        return $this;
-    }
-
-    /**
-     * Enable layout
-     *
-     * @return Zend_Layout
-     */
-    public function enableLayout()
-    {
-        $this->_enabled = true;
-        return $this;
-    }
-
-    /**
-     * Is layout enabled?
-     *
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->_enabled;
-    }
-
-
-    public function setViewBasePath($path, $prefix = 'Layout_View')
-    {
-        $this->_viewBasePath = $path;
-        $this->_viewBasePrefix = $prefix;
-        return $this;
-    }
-
-    public function getViewBasePath()
-    {
-        return $this->_viewBasePath;
-    }
-
-    public function setViewScriptPath($path)
-    {
-        $this->_viewScriptPath = $path;
-        return $this;
-    }
-
-    public function getViewScriptPath()
-    {
-        return $this->_viewScriptPath;
-    }
-
-    /**
-     * Set layout script path
-     *
-     * @param  string $path
-     * @return Zend_Layout
-     */
-    public function setLayoutPath($path)
-    {
-        return $this->setViewScriptPath($path);
-    }
-
-    /**
-     * Get current layout script path
-     *
-     * @return string
-     */
-    public function getLayoutPath()
-    {
-        return $this->getViewScriptPath();
-    }
-
-    /**
-     * Set content key
-     *
-     * Key in namespace container denoting default content
-     *
-     * @param  string $contentKey
-     * @return Zend_Layout
-     */
-    public function setContentKey($contentKey)
-    {
-        $this->_contentKey = (string) $contentKey;
-        return $this;
-    }
-
-    /**
-     * Retrieve content key
-     *
-     * @return string
-     */
-    public function getContentKey()
-    {
-        return $this->_contentKey;
-    }
-
-    /**
-     * Set MVC enabled flag
-     *
-     * @param  bool $mvcEnabled
-     * @return Zend_Layout
-     */
-    protected function _setMvcEnabled($mvcEnabled)
-    {
-        $this->_mvcEnabled = ($mvcEnabled) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve MVC enabled flag
-     *
-     * @return bool
-     */
-    public function getMvcEnabled()
-    {
-        return $this->_mvcEnabled;
-    }
-
-    /**
-     * Set MVC Successful Action Only flag
-     *
-     * @param bool $successfulActionOnly
-     * @return Zend_Layout
-     */
-    public function setMvcSuccessfulActionOnly($successfulActionOnly)
-    {
-        $this->_mvcSuccessfulActionOnly = ($successfulActionOnly) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Get MVC Successful Action Only Flag
-     *
-     * @return bool
-     */
-    public function getMvcSuccessfulActionOnly()
-    {
-        return $this->_mvcSuccessfulActionOnly;
-    }
-
-    /**
-     * Set view object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Layout
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->_view = $view;
-        return $this;
-    }
-
-    /**
-     * Retrieve helper class
-     *
-     * @return string
-     */
-    public function getHelperClass()
-    {
-        return $this->_helperClass;
-    }
-
-    /**
-     * Set helper class
-     *
-     * @param  string $helperClass
-     * @return Zend_Layout
-     */
-    public function setHelperClass($helperClass)
-    {
-        $this->_helperClass = (string) $helperClass;
-        return $this;
-    }
-
-    /**
-     * Retrieve plugin class
-     *
-     * @return string
-     */
-    public function getPluginClass()
-    {
-        return $this->_pluginClass;
-    }
-
-    /**
-     * Set plugin class
-     *
-     * @param  string $pluginClass
-     * @return Zend_Layout
-     */
-    public function setPluginClass($pluginClass)
-    {
-        $this->_pluginClass = (string) $pluginClass;
-        return $this;
-    }
-
-    /**
-     * Get current view object
-     *
-     * If no view object currently set, retrieves it from the ViewRenderer.
-     *
-     * @todo Set inflector from view renderer at same time
-     * @return Zend_View_Interface
-     */
-    public function getView()
-    {
-        if (null === $this->_view) {
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            if (null === $viewRenderer->view) {
-                $viewRenderer->initView();
-            }
-            $this->setView($viewRenderer->view);
-        }
-        return $this->_view;
-    }
-
-    /**
-     * Set layout view script suffix
-     *
-     * @param  string $viewSuffix
-     * @return Zend_Layout
-     */
-    public function setViewSuffix($viewSuffix)
-    {
-        $this->_viewSuffix = (string) $viewSuffix;
-        return $this;
-    }
-
-    /**
-     * Retrieve layout view script suffix
-     *
-     * @return string
-     */
-    public function getViewSuffix()
-    {
-        return $this->_viewSuffix;
-    }
-
-    /**
-     * Retrieve inflector target
-     *
-     * @return string
-     */
-    public function getInflectorTarget()
-    {
-        return $this->_inflectorTarget;
-    }
-
-    /**
-     * Set inflector target
-     *
-     * @param  string $inflectorTarget
-     * @return Zend_Layout
-     */
-    public function setInflectorTarget($inflectorTarget)
-    {
-        $this->_inflectorTarget = (string) $inflectorTarget;
-        return $this;
-    }
-
-    /**
-     * Set inflector to use when resolving layout names
-     *
-     * @param  Zend_Filter_Inflector $inflector
-     * @return Zend_Layout
-     */
-    public function setInflector(Zend_Filter_Inflector $inflector)
-    {
-        $this->_inflector = $inflector;
-        return $this;
-    }
-
-    /**
-     * Retrieve inflector
-     *
-     * @return Zend_Filter_Inflector
-     */
-    public function getInflector()
-    {
-        if (null === $this->_inflector) {
-            require_once 'Zend/Filter/Inflector.php';
-            $inflector = new Zend_Filter_Inflector();
-            $inflector->setTargetReference($this->_inflectorTarget)
-                      ->addRules(array(':script' => array('Word_CamelCaseToDash', 'StringToLower')))
-                      ->setStaticRuleReference('suffix', $this->_viewSuffix);
-            $this->setInflector($inflector);
-        }
-
-        return $this->_inflector;
-    }
-
-    /**
-     * Enable inflector
-     *
-     * @return Zend_Layout
-     */
-    public function enableInflector()
-    {
-        $this->_inflectorEnabled = true;
-        return $this;
-    }
-
-    /**
-     * Disable inflector
-     *
-     * @return Zend_Layout
-     */
-    public function disableInflector()
-    {
-        $this->_inflectorEnabled = false;
-        return $this;
-    }
-
-    /**
-     * Return status of inflector enabled flag
-     *
-     * @return bool
-     */
-    public function inflectorEnabled()
-    {
-        return $this->_inflectorEnabled;
-    }
-
-    /**
-     * Set layout variable
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this->_container[$key] = $value;
-    }
-
-    /**
-     * Get layout variable
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if (isset($this->_container[$key])) {
-            return $this->_container[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Is a layout variable set?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        return (isset($this->_container[$key]));
-    }
-
-    /**
-     * Unset a layout variable?
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if (isset($this->_container[$key])) {
-            unset($this->_container[$key]);
-        }
-    }
-
-    /**
-     * Assign one or more layout variables
-     *
-     * @param  mixed $spec Assoc array or string key; if assoc array, sets each
-     * key as a layout variable
-     * @param  mixed $value Value if $spec is a key
-     * @return Zend_Layout
-     * @throws Zend_Layout_Exception if non-array/string value passed to $spec
-     */
-    public function assign($spec, $value = null)
-    {
-        if (is_array($spec)) {
-            $orig = $this->_container->getArrayCopy();
-            $merged = array_merge($orig, $spec);
-            $this->_container->exchangeArray($merged);
-            return $this;
-        }
-
-        if (is_string($spec)) {
-            $this->_container[$spec] = $value;
-            return $this;
-        }
-
-        require_once 'Zend/Layout/Exception.php';
-        throw new Zend_Layout_Exception('Invalid values passed to assign()');
-    }
-
-    /**
-     * Render layout
-     *
-     * Sets internal script path as last path on script path stack, assigns
-     * layout variables to view, determines layout name using inflector, and
-     * renders layout view script.
-     *
-     * $name will be passed to the inflector as the key 'script'.
-     *
-     * @param  mixed $name
-     * @return mixed
-     */
-    public function render($name = null)
-    {
-        if (null === $name) {
-            $name = $this->getLayout();
-        }
-
-        if ($this->inflectorEnabled() && (null !== ($inflector = $this->getInflector())))
-        {
-            $name = $this->_inflector->filter(array('script' => $name));
-        }
-
-        $view = $this->getView();
-
-        if (null !== ($path = $this->getViewScriptPath())) {
-            if (method_exists($view, 'addScriptPath')) {
-                $view->addScriptPath($path);
-            } else {
-                $view->setScriptPath($path);
-            }
-        } elseif (null !== ($path = $this->getViewBasePath())) {
-            $view->addBasePath($path, $this->_viewBasePrefix);
-        }
-
-        return $view->render($name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Layout/Controller/Action/Helper/Layout.php b/airtime_mvc/library/Zend/Layout/Controller/Action/Helper/Layout.php
deleted file mode 100644
index efd086424..000000000
--- a/airtime_mvc/library/Zend/Layout/Controller/Action/Helper/Layout.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Action_Helper_Abstract */
-require_once 'Zend/Controller/Action/Helper/Abstract.php';
-
-/**
- * Helper for interacting with Zend_Layout objects
- *
- * @uses       Zend_Controller_Action_Helper_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Zend_Controller_Action
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action_Helper_Abstract
-{
-    /**
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
-     * @var Zend_Layout
-     */
-    protected $_layout;
-
-    /**
-     * @var bool
-     */
-    protected $_isActionControllerSuccessful = false;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Layout $layout
-     * @return void
-     */
-    public function __construct(Zend_Layout $layout = null)
-    {
-        if (null !== $layout) {
-            $this->setLayoutInstance($layout);
-        } else {
-            /**
-             * @see Zend_Layout
-             */
-            require_once 'Zend/Layout.php';
-            $layout = Zend_Layout::getMvcInstance();
-        }
-
-        if (null !== $layout) {
-            $pluginClass = $layout->getPluginClass();
-            $front = $this->getFrontController();
-            if ($front->hasPlugin($pluginClass)) {
-                $plugin = $front->getPlugin($pluginClass);
-                $plugin->setLayoutActionHelper($this);
-            }
-        }
-    }
-
-    public function init()
-    {
-        $this->_isActionControllerSuccessful = false;
-    }
-
-    /**
-     * Get front controller instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        if (null === $this->_frontController) {
-            /**
-             * @see Zend_Controller_Front
-             */
-            require_once 'Zend/Controller/Front.php';
-            $this->_frontController = Zend_Controller_Front::getInstance();
-        }
-
-        return $this->_frontController;
-    }
-
-    /**
-     * Get layout object
-     *
-     * @return Zend_Layout
-     */
-    public function getLayoutInstance()
-    {
-        if (null === $this->_layout) {
-            /**
-             * @see Zend_Layout
-             */
-            require_once 'Zend/Layout.php';
-            if (null === ($this->_layout = Zend_Layout::getMvcInstance())) {
-                $this->_layout = new Zend_Layout();
-            }
-        }
-
-        return $this->_layout;
-    }
-
-    /**
-     * Set layout object
-     *
-     * @param  Zend_Layout $layout
-     * @return Zend_Layout_Controller_Action_Helper_Layout
-     */
-    public function setLayoutInstance(Zend_Layout $layout)
-    {
-        $this->_layout = $layout;
-        return $this;
-    }
-
-    /**
-     * Mark Action Controller (according to this plugin) as Running successfully
-     *
-     * @return Zend_Layout_Controller_Action_Helper_Layout
-     */
-    public function postDispatch()
-    {
-        $this->_isActionControllerSuccessful = true;
-        return $this;
-    }
-
-    /**
-     * Did the previous action successfully complete?
-     *
-     * @return bool
-     */
-    public function isActionControllerSuccessful()
-    {
-        return $this->_isActionControllerSuccessful;
-    }
-
-    /**
-     * Strategy pattern; call object as method
-     *
-     * Returns layout object
-     *
-     * @return Zend_Layout
-     */
-    public function direct()
-    {
-        return $this->getLayoutInstance();
-    }
-
-    /**
-     * Proxy method calls to layout object
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        $layout = $this->getLayoutInstance();
-        if (method_exists($layout, $method)) {
-            return call_user_func_array(array($layout, $method), $args);
-        }
-
-        require_once 'Zend/Layout/Exception.php';
-        throw new Zend_Layout_Exception(sprintf("Invalid method '%s' called on layout action helper", $method));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Layout/Controller/Plugin/Layout.php b/airtime_mvc/library/Zend/Layout/Controller/Plugin/Layout.php
deleted file mode 100644
index a17953942..000000000
--- a/airtime_mvc/library/Zend/Layout/Controller/Plugin/Layout.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Controller_Plugin_Abstract */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/**
- * Render layouts
- *
- * @uses       Zend_Controller_Plugin_Abstract
- * @category   Zend
- * @package    Zend_Controller
- * @subpackage Plugins
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Layout_Controller_Plugin_Layout extends Zend_Controller_Plugin_Abstract
-{
-    protected $_layoutActionHelper = null;
-
-    /**
-     * @var Zend_Layout
-     */
-    protected $_layout;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Layout $layout
-     * @return void
-     */
-    public function __construct(Zend_Layout $layout = null)
-    {
-        if (null !== $layout) {
-            $this->setLayout($layout);
-        }
-    }
-
-    /**
-     * Retrieve layout object
-     *
-     * @return Zend_Layout
-     */
-    public function getLayout()
-    {
-        return $this->_layout;
-    }
-
-    /**
-     * Set layout object
-     *
-     * @param  Zend_Layout $layout
-     * @return Zend_Layout_Controller_Plugin_Layout
-     */
-    public function setLayout(Zend_Layout $layout)
-    {
-        $this->_layout = $layout;
-        return $this;
-    }
-
-    /**
-     * Set layout action helper
-     *
-     * @param  Zend_Layout_Controller_Action_Helper_Layout $layoutActionHelper
-     * @return Zend_Layout_Controller_Plugin_Layout
-     */
-    public function setLayoutActionHelper(Zend_Layout_Controller_Action_Helper_Layout $layoutActionHelper)
-    {
-        $this->_layoutActionHelper = $layoutActionHelper;
-        return $this;
-    }
-
-    /**
-     * Retrieve layout action helper
-     *
-     * @return Zend_Layout_Controller_Action_Helper_Layout
-     */
-    public function getLayoutActionHelper()
-    {
-        return $this->_layoutActionHelper;
-    }
-
-    /**
-     * postDispatch() plugin hook -- render layout
-     *
-     * @param  Zend_Controller_Request_Abstract $request
-     * @return void
-     */
-    public function postDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        $layout = $this->getLayout();
-        $helper = $this->getLayoutActionHelper();
-
-        // Return early if forward detected
-        if (!$request->isDispatched()
-            || $this->getResponse()->isRedirect()
-            || ($layout->getMvcSuccessfulActionOnly()
-                && (!empty($helper) && !$helper->isActionControllerSuccessful())))
-        {
-            return;
-        }
-
-        // Return early if layout has been disabled
-        if (!$layout->isEnabled()) {
-            return;
-        }
-
-        $response   = $this->getResponse();
-        $content    = $response->getBody(true);
-        $contentKey = $layout->getContentKey();
-
-        if (isset($content['default'])) {
-            $content[$contentKey] = $content['default'];
-        }
-        if ('default' != $contentKey) {
-            unset($content['default']);
-        }
-
-        $layout->assign($content);
-
-        $fullContent = null;
-        $obStartLevel = ob_get_level();
-        try {
-            $fullContent = $layout->render();
-            $response->setBody($fullContent);
-        } catch (Exception $e) {
-            while (ob_get_level() > $obStartLevel) {
-                $fullContent .= ob_get_clean();
-            }
-            $request->setParam('layoutFullContent', $fullContent);
-            $request->setParam('layoutContent', $layout->content);
-            $response->setBody(null);
-            throw $e;
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Layout/Exception.php b/airtime_mvc/library/Zend/Layout/Exception.php
deleted file mode 100644
index 8b3eb9c06..000000000
--- a/airtime_mvc/library/Zend/Layout/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Layout
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Layout_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Ldap.php b/airtime_mvc/library/Zend/Ldap.php
deleted file mode 100644
index a1bf0c94c..000000000
--- a/airtime_mvc/library/Zend/Ldap.php
+++ /dev/null
@@ -1,1564 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ldap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap
-{
-    const SEARCH_SCOPE_SUB  = 1;
-    const SEARCH_SCOPE_ONE  = 2;
-    const SEARCH_SCOPE_BASE = 3;
-
-    const ACCTNAME_FORM_DN        = 1;
-    const ACCTNAME_FORM_USERNAME  = 2;
-    const ACCTNAME_FORM_BACKSLASH = 3;
-    const ACCTNAME_FORM_PRINCIPAL = 4;
-
-    /**
-     * String used with ldap_connect for error handling purposes.
-     *
-     * @var string
-     */
-    private $_connectString;
-
-    /**
-     * The options used in connecting, binding, etc.
-     *
-     * @var array
-     */
-    protected $_options = null;
-
-    /**
-     * The raw LDAP extension resource.
-     *
-     * @var resource
-     */
-    protected $_resource = null;
-
-    /**
-     * FALSE if no user is bound to the LDAP resource
-     * NULL if there has been an anonymous bind
-     * username of the currently bound user
-     *
-     * @var boolean|null|string
-     */
-    protected $_boundUser = false;
-
-    /**
-     * Caches the RootDSE
-     *
-     * @var Zend_Ldap_Node
-     */
-    protected $_rootDse = null;
-
-    /**
-     * Caches the schema
-     *
-     * @var Zend_Ldap_Node
-     */
-    protected $_schema = null;
-
-    /**
-     * @deprecated will be removed, use {@see Zend_Ldap_Filter_Abstract::escapeValue()}
-     * @param  string $str The string to escape.
-     * @return string The escaped string
-     */
-    public static function filterEscape($str)
-    {
-        /**
-         * @see Zend_Ldap_Filter_Abstract
-         */
-        require_once 'Zend/Ldap/Filter/Abstract.php';
-        return Zend_Ldap_Filter_Abstract::escapeValue($str);
-    }
-
-    /**
-     * @deprecated will be removed, use {@see Zend_Ldap_Dn::checkDn()}
-     * @param  string $dn   The DN to parse
-     * @param  array  $keys An optional array to receive DN keys (e.g. CN, OU, DC, ...)
-     * @param  array  $vals An optional array to receive DN values
-     * @return boolean True if the DN was successfully parsed or false if the string is
-     * not a valid DN.
-     */
-    public static function explodeDn($dn, array &$keys = null, array &$vals = null)
-    {
-        /**
-         * @see Zend_Ldap_Dn
-         */
-        require_once 'Zend/Ldap/Dn.php';
-        return Zend_Ldap_Dn::checkDn($dn, $keys, $vals);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param  array|Zend_Config $options Options used in connecting, binding, etc.
-     * @return void
-     * @throws Zend_Ldap_Exception if ext/ldap is not installed
-     */
-    public function __construct($options = array())
-    {
-        if (!extension_loaded('ldap')) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'LDAP extension not loaded',
-                Zend_Ldap_Exception::LDAP_X_EXTENSION_NOT_LOADED);
-        }
-        $this->setOptions($options);
-    }
-
-    /**
-     * Destructor.
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        $this->disconnect();
-    }
-
-    /**
-     * @return resource The raw LDAP extension resource.
-     */
-    public function getResource()
-    {
-        if (!is_resource($this->_resource) || $this->_boundUser === false) {
-            $this->bind();
-        }
-        return $this->_resource;
-    }
-
-    /**
-     * Return the LDAP error number of the last LDAP command
-     *
-     * @return int
-     */
-    public function getLastErrorCode()
-    {
-        $ret = @ldap_get_option($this->_resource, LDAP_OPT_ERROR_NUMBER, $err);
-        if ($ret === true) {
-            if ($err <= -1 && $err >= -17) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                /* For some reason draft-ietf-ldapext-ldap-c-api-xx.txt error
-                 * codes in OpenLDAP are negative values from -1 to -17.
-                 */
-                $err = Zend_Ldap_Exception::LDAP_SERVER_DOWN + (-$err - 1);
-            }
-            return $err;
-        }
-        return 0;
-    }
-
-    /**
-     * Return the LDAP error message of the last LDAP command
-     *
-     * @param  int   $errorCode
-     * @param  array $errorMessages
-     * @return string
-     */
-    public function getLastError(&$errorCode = null, array &$errorMessages = null)
-    {
-        $errorCode = $this->getLastErrorCode();
-        $errorMessages = array();
-
-        /* The various error retrieval functions can return
-         * different things so we just try to collect what we
-         * can and eliminate dupes.
-         */
-        $estr1 = @ldap_error($this->_resource);
-        if ($errorCode !== 0 && $estr1 === 'Success') {
-            $estr1 = @ldap_err2str($errorCode);
-        }
-        if (!empty($estr1)) {
-            $errorMessages[] = $estr1;
-        }
-
-        @ldap_get_option($this->_resource, LDAP_OPT_ERROR_STRING, $estr2);
-        if (!empty($estr2) && !in_array($estr2, $errorMessages)) {
-            $errorMessages[] = $estr2;
-        }
-
-        $message = '';
-        if ($errorCode > 0) {
-            $message = '0x' . dechex($errorCode) . ' ';
-        } else {
-            $message = '';
-        }
-        if (count($errorMessages) > 0) {
-            $message .= '(' . implode('; ', $errorMessages) . ')';
-        } else {
-            $message .= '(no error message from LDAP)';
-        }
-        return $message;
-    }
-
-    /**
-     * Get the currently bound user
-     *
-     * FALSE if no user is bound to the LDAP resource
-     * NULL if there has been an anonymous bind
-     * username of the currently bound user
-     *
-     * @return false|null|string
-     */
-    public function getBoundUser()
-    {
-        return $this->_boundUser;
-    }
-
-    /**
-     * Sets the options used in connecting, binding, etc.
-     *
-     * Valid option keys:
-     *  host
-     *  port
-     *  useSsl
-     *  username
-     *  password
-     *  bindRequiresDn
-     *  baseDn
-     *  accountCanonicalForm
-     *  accountDomainName
-     *  accountDomainNameShort
-     *  accountFilterFormat
-     *  allowEmptyPassword
-     *  useStartTls
-     *  optRefferals
-     *  tryUsernameSplit
-     *
-     * @param  array|Zend_Config $options Options used in connecting, binding, etc.
-     * @return Zend_Ldap Provides a fluent interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        $permittedOptions = array(
-            'host'                   => null,
-            'port'                   => 0,
-            'useSsl'                 => false,
-            'username'               => null,
-            'password'               => null,
-            'bindRequiresDn'         => false,
-            'baseDn'                 => null,
-            'accountCanonicalForm'   => null,
-            'accountDomainName'      => null,
-            'accountDomainNameShort' => null,
-            'accountFilterFormat'    => null,
-            'allowEmptyPassword'     => false,
-            'useStartTls'            => false,
-            'optReferrals'           => false,
-            'tryUsernameSplit'       => true,
-        );
-
-        foreach ($permittedOptions as $key => $val) {
-            if (array_key_exists($key, $options)) {
-                $val = $options[$key];
-                unset($options[$key]);
-                /* Enforce typing. This eliminates issues like Zend_Config_Ini
-                 * returning '1' as a string (ZF-3163).
-                 */
-                switch ($key) {
-                    case 'port':
-                    case 'accountCanonicalForm':
-                        $permittedOptions[$key] = (int)$val;
-                        break;
-                    case 'useSsl':
-                    case 'bindRequiresDn':
-                    case 'allowEmptyPassword':
-                    case 'useStartTls':
-                    case 'optReferrals':
-                    case 'tryUsernameSplit':
-                        $permittedOptions[$key] = ($val === true ||
-                                $val === '1' || strcasecmp($val, 'true') == 0);
-                        break;
-                    default:
-                        $permittedOptions[$key] = trim($val);
-                        break;
-                }
-            }
-        }
-        if (count($options) > 0) {
-            $key = key($options);
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, "Unknown Zend_Ldap option: $key");
-        }
-        $this->_options = $permittedOptions;
-        return $this;
-    }
-
-    /**
-     * @return array The current options.
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * @return string The hostname of the LDAP server being used to authenticate accounts
-     */
-    protected function _getHost()
-    {
-        return $this->_options['host'];
-    }
-
-    /**
-     * @return int The port of the LDAP server or 0 to indicate that no port value is set
-     */
-    protected function _getPort()
-    {
-        return $this->_options['port'];
-    }
-
-    /**
-     * @return boolean The default SSL / TLS encrypted transport control
-     */
-    protected function _getUseSsl()
-    {
-        return $this->_options['useSsl'];
-    }
-
-    /**
-     * @return string The default acctname for binding
-     */
-    protected function _getUsername()
-    {
-        return $this->_options['username'];
-    }
-
-    /**
-     * @return string The default password for binding
-     */
-    protected function _getPassword()
-    {
-        return $this->_options['password'];
-    }
-
-    /**
-     * @return boolean Bind requires DN
-     */
-    protected function _getBindRequiresDn()
-    {
-        return $this->_options['bindRequiresDn'];
-    }
-
-    /**
-     * Gets the base DN under which objects of interest are located
-     *
-     * @return string
-     */
-    public function getBaseDn()
-    {
-        return $this->_options['baseDn'];
-    }
-
-    /**
-     * @return integer Either ACCTNAME_FORM_BACKSLASH, ACCTNAME_FORM_PRINCIPAL or
-     * ACCTNAME_FORM_USERNAME indicating the form usernames should be canonicalized to.
-     */
-    protected function _getAccountCanonicalForm()
-    {
-        /* Account names should always be qualified with a domain. In some scenarios
-         * using non-qualified account names can lead to security vulnerabilities. If
-         * no account canonical form is specified, we guess based in what domain
-         * names have been supplied.
-         */
-
-        $accountCanonicalForm = $this->_options['accountCanonicalForm'];
-        if (!$accountCanonicalForm) {
-            $accountDomainName = $this->_getAccountDomainName();
-            $accountDomainNameShort = $this->_getAccountDomainNameShort();
-            if ($accountDomainNameShort) {
-                $accountCanonicalForm = Zend_Ldap::ACCTNAME_FORM_BACKSLASH;
-            } else if ($accountDomainName) {
-                $accountCanonicalForm = Zend_Ldap::ACCTNAME_FORM_PRINCIPAL;
-            } else {
-                $accountCanonicalForm = Zend_Ldap::ACCTNAME_FORM_USERNAME;
-            }
-        }
-
-        return $accountCanonicalForm;
-    }
-
-    /**
-     * @return string The account domain name
-     */
-    protected function _getAccountDomainName()
-    {
-        return $this->_options['accountDomainName'];
-    }
-
-    /**
-     * @return string The short account domain name
-     */
-    protected function _getAccountDomainNameShort()
-    {
-        return $this->_options['accountDomainNameShort'];
-    }
-
-    /**
-     * @return string A format string for building an LDAP search filter to match
-     * an account
-     */
-    protected function _getAccountFilterFormat()
-    {
-        return $this->_options['accountFilterFormat'];
-    }
-
-    /**
-     * @return boolean Allow empty passwords
-     */
-    protected function _getAllowEmptyPassword()
-    {
-        return $this->_options['allowEmptyPassword'];
-    }
-
-    /**
-     * @return boolean The default SSL / TLS encrypted transport control
-     */
-    protected function _getUseStartTls()
-    {
-        return $this->_options['useStartTls'];
-    }
-
-    /**
-     * @return boolean Opt. Referrals
-     */
-    protected function _getOptReferrals()
-    {
-        return $this->_options['optReferrals'];
-    }
-
-    /**
-     * @return boolean Try splitting the username into username and domain
-     */
-    protected function _getTryUsernameSplit()
-    {
-        return $this->_options['tryUsernameSplit'];
-    }
-
-    /**
-     * @return string The LDAP search filter for matching directory accounts
-     */
-    protected function _getAccountFilter($acctname)
-    {
-        /**
-         * @see Zend_Ldap_Filter_Abstract
-         */
-        require_once 'Zend/Ldap/Filter/Abstract.php';
-        $this->_splitName($acctname, $dname, $aname);
-        $accountFilterFormat = $this->_getAccountFilterFormat();
-        $aname = Zend_Ldap_Filter_Abstract::escapeValue($aname);
-        if ($accountFilterFormat) {
-            return sprintf($accountFilterFormat, $aname);
-        }
-        if (!$this->_getBindRequiresDn()) {
-            // is there a better way to detect this?
-            return sprintf("(&(objectClass=user)(sAMAccountName=%s))", $aname);
-        }
-        return sprintf("(&(objectClass=posixAccount)(uid=%s))", $aname);
-    }
-
-    /**
-     * @param string $name  The name to split
-     * @param string $dname The resulting domain name (this is an out parameter)
-     * @param string $aname The resulting account name (this is an out parameter)
-     * @return void
-     */
-    protected function _splitName($name, &$dname, &$aname)
-    {
-        $dname = null;
-        $aname = $name;
-
-        if (!$this->_getTryUsernameSplit()) {
-            return;
-        }
-
-        $pos = strpos($name, '@');
-        if ($pos) {
-            $dname = substr($name, $pos + 1);
-            $aname = substr($name, 0, $pos);
-        } else {
-            $pos = strpos($name, '\\');
-            if ($pos) {
-                $dname = substr($name, 0, $pos);
-                $aname = substr($name, $pos + 1);
-            }
-        }
-    }
-
-    /**
-     * @param  string $acctname The name of the account
-     * @return string The DN of the specified account
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _getAccountDn($acctname)
-    {
-        /**
-         * @see Zend_Ldap_Dn
-         */
-        require_once 'Zend/Ldap/Dn.php';
-        if (Zend_Ldap_Dn::checkDn($acctname)) return $acctname;
-        $acctname = $this->getCanonicalAccountName($acctname, Zend_Ldap::ACCTNAME_FORM_USERNAME);
-        $acct = $this->_getAccount($acctname, array('dn'));
-        return $acct['dn'];
-    }
-
-    /**
-     * @param  string $dname The domain name to check
-     * @return boolean
-     */
-    protected function _isPossibleAuthority($dname)
-    {
-        if ($dname === null) {
-            return true;
-        }
-        $accountDomainName = $this->_getAccountDomainName();
-        $accountDomainNameShort = $this->_getAccountDomainNameShort();
-        if ($accountDomainName === null && $accountDomainNameShort === null) {
-            return true;
-        }
-        if (strcasecmp($dname, $accountDomainName) == 0) {
-            return true;
-        }
-        if (strcasecmp($dname, $accountDomainNameShort) == 0) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param  string $acctname The name to canonicalize
-     * @param  int    $type     The desired form of canonicalization
-     * @return string The canonicalized name in the desired form
-     * @throws Zend_Ldap_Exception
-     */
-    public function getCanonicalAccountName($acctname, $form = 0)
-    {
-        $this->_splitName($acctname, $dname, $uname);
-
-        if (!$this->_isPossibleAuthority($dname)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null,
-                "Binding domain is not an authority for user: $acctname",
-                Zend_Ldap_Exception::LDAP_X_DOMAIN_MISMATCH);
-        }
-
-        if (!$uname) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, "Invalid account name syntax: $acctname");
-        }
-
-        if (function_exists('mb_strtolower')) {
-            $uname = mb_strtolower($uname, 'UTF-8');
-        } else {
-            $uname = strtolower($uname);
-        }
-
-        if ($form === 0) {
-            $form = $this->_getAccountCanonicalForm();
-        }
-
-        switch ($form) {
-            case Zend_Ldap::ACCTNAME_FORM_DN:
-                return $this->_getAccountDn($acctname);
-            case Zend_Ldap::ACCTNAME_FORM_USERNAME:
-                return $uname;
-            case Zend_Ldap::ACCTNAME_FORM_BACKSLASH:
-                $accountDomainNameShort = $this->_getAccountDomainNameShort();
-                if (!$accountDomainNameShort) {
-                    /**
-                     * @see Zend_Ldap_Exception
-                     */
-                    require_once 'Zend/Ldap/Exception.php';
-                    throw new Zend_Ldap_Exception(null, 'Option required: accountDomainNameShort');
-                }
-                return "$accountDomainNameShort\\$uname";
-            case Zend_Ldap::ACCTNAME_FORM_PRINCIPAL:
-                $accountDomainName = $this->_getAccountDomainName();
-                if (!$accountDomainName) {
-                    /**
-                     * @see Zend_Ldap_Exception
-                     */
-                    require_once 'Zend/Ldap/Exception.php';
-                    throw new Zend_Ldap_Exception(null, 'Option required: accountDomainName');
-                }
-                return "$uname@$accountDomainName";
-            default:
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception(null, "Unknown canonical name form: $form");
-        }
-    }
-
-    /**
-     * @param  array $attrs An array of names of desired attributes
-     * @return array An array of the attributes representing the account
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _getAccount($acctname, array $attrs = null)
-    {
-        $baseDn = $this->getBaseDn();
-        if (!$baseDn) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Base DN not set');
-        }
-
-        $accountFilter = $this->_getAccountFilter($acctname);
-        if (!$accountFilter) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Invalid account filter');
-        }
-
-        if (!is_resource($this->getResource())) {
-            $this->bind();
-        }
-
-        $accounts = $this->search($accountFilter, $baseDn, self::SEARCH_SCOPE_SUB, $attrs);
-        $count = $accounts->count();
-        if ($count === 1) {
-            $acct = $accounts->getFirst();
-            $accounts->close();
-            return $acct;
-        } else if ($count === 0) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            $code = Zend_Ldap_Exception::LDAP_NO_SUCH_OBJECT;
-            $str = "No object found for: $accountFilter";
-        } else {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            $code = Zend_Ldap_Exception::LDAP_OPERATIONS_ERROR;
-            $str = "Unexpected result count ($count) for: $accountFilter";
-        }
-        $accounts->close();
-        /**
-         * @see Zend_Ldap_Exception
-         */
-        require_once 'Zend/Ldap/Exception.php';
-        throw new Zend_Ldap_Exception($this, $str, $code);
-    }
-
-    /**
-     * @return Zend_Ldap Provides a fluent interface
-     */
-    public function disconnect()
-    {
-        if (is_resource($this->_resource)) {
-            @ldap_unbind($this->_resource);
-        }
-        $this->_resource = null;
-        $this->_boundUser = false;
-        return $this;
-    }
-
-    /**
-     * To connect using SSL it seems the client tries to verify the server
-     * certificate by default. One way to disable this behavior is to set
-     * 'TLS_REQCERT never' in OpenLDAP's ldap.conf and restarting Apache. Or,
-     * if you really care about the server's cert you can put a cert on the
-     * web server.
-     *
-     * @param  string  $host        The hostname of the LDAP server to connect to
-     * @param  int     $port        The port number of the LDAP server to connect to
-     * @param  boolean $useSsl      Use SSL
-     * @param  boolean $useStartTls Use STARTTLS
-     * @return Zend_Ldap Provides a fluent interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function connect($host = null, $port = null, $useSsl = null, $useStartTls = null)
-    {
-        if ($host === null) {
-            $host = $this->_getHost();
-        }
-        if ($port === null) {
-            $port = $this->_getPort();
-        } else {
-            $port = (int)$port;
-        }
-        if ($useSsl === null) {
-            $useSsl = $this->_getUseSsl();
-        } else {
-            $useSsl = (bool)$useSsl;
-        }
-        if ($useStartTls === null) {
-            $useStartTls = $this->_getUseStartTls();
-        } else {
-            $useStartTls = (bool)$useStartTls;
-        }
-
-        if (!$host) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'A host parameter is required');
-        }
-
-        $useUri = false;
-        /* Because ldap_connect doesn't really try to connect, any connect error
-         * will actually occur during the ldap_bind call. Therefore, we save the
-         * connect string here for reporting it in error handling in bind().
-         */
-        $hosts = array();
-        if (preg_match_all('~ldap(?:i|s)?://~', $host, $hosts, PREG_SET_ORDER) > 0) {
-            $this->_connectString = $host;
-            $useUri = true;
-            $useSsl = false;
-        } else {
-            if ($useSsl) {
-                $this->_connectString = 'ldaps://' . $host;
-                $useUri = true;
-            } else {
-                $this->_connectString = 'ldap://' . $host;
-            }
-            if ($port) {
-                $this->_connectString .= ':' . $port;
-            }
-        }
-
-        $this->disconnect();
-
-        /* Only OpenLDAP 2.2 + supports URLs so if SSL is not requested, just
-         * use the old form.
-         */
-        $resource = ($useUri) ? @ldap_connect($this->_connectString) : @ldap_connect($host, $port);
-
-        if (is_resource($resource) === true) {
-            $this->_resource = $resource;
-            $this->_boundUser = false;
-
-            $optReferrals = ($this->_getOptReferrals()) ? 1 : 0;
-            if (@ldap_set_option($resource, LDAP_OPT_PROTOCOL_VERSION, 3) &&
-                        @ldap_set_option($resource, LDAP_OPT_REFERRALS, $optReferrals)) {
-                if ($useSsl || !$useStartTls || @ldap_start_tls($resource)) {
-                    return $this;
-                }
-            }
-
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            $zle = new Zend_Ldap_Exception($this, "$host:$port");
-            $this->disconnect();
-            throw $zle;
-        }
-        /**
-         * @see Zend_Ldap_Exception
-         */
-        require_once 'Zend/Ldap/Exception.php';
-        throw new Zend_Ldap_Exception(null, "Failed to connect to LDAP server: $host:$port");
-    }
-
-    /**
-     * @param  string $username The username for authenticating the bind
-     * @param  string $password The password for authenticating the bind
-     * @return Zend_Ldap Provides a fluent interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function bind($username = null, $password = null)
-    {
-        $moreCreds = true;
-
-        if ($username === null) {
-            $username = $this->_getUsername();
-            $password = $this->_getPassword();
-            $moreCreds = false;
-        }
-
-        if (empty($username)) {
-            /* Perform anonymous bind
-             */
-            $username = null;
-            $password = null;
-        } else {
-            /* Check to make sure the username is in DN form.
-             */
-            /**
-             * @see Zend_Ldap_Dn
-             */
-            require_once 'Zend/Ldap/Dn.php';
-            if (!Zend_Ldap_Dn::checkDn($username)) {
-                if ($this->_getBindRequiresDn()) {
-                    /* moreCreds stops an infinite loop if _getUsername does not
-                     * return a DN and the bind requires it
-                     */
-                    if ($moreCreds) {
-                        try {
-                            $username = $this->_getAccountDn($username);
-                        } catch (Zend_Ldap_Exception $zle) {
-                            switch ($zle->getCode()) {
-                                case Zend_Ldap_Exception::LDAP_NO_SUCH_OBJECT:
-                                case Zend_Ldap_Exception::LDAP_X_DOMAIN_MISMATCH:
-                                case Zend_Ldap_Exception::LDAP_X_EXTENSION_NOT_LOADED:
-                                    throw $zle;
-                            }
-                            throw new Zend_Ldap_Exception(null,
-                                'Failed to retrieve DN for account: ' . $username .
-                                ' [' . $zle->getMessage() . ']',
-                                Zend_Ldap_Exception::LDAP_OPERATIONS_ERROR);
-                        }
-                    } else {
-                        /**
-                         * @see Zend_Ldap_Exception
-                         */
-                        require_once 'Zend/Ldap/Exception.php';
-                        throw new Zend_Ldap_Exception(null, 'Binding requires username in DN form');
-                    }
-                } else {
-                    $username = $this->getCanonicalAccountName($username,
-                        $this->_getAccountCanonicalForm());
-                }
-            }
-        }
-
-        if (!is_resource($this->_resource)) {
-            $this->connect();
-        }
-
-        if ($username !== null && $password === '' && $this->_getAllowEmptyPassword() !== true) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            $zle = new Zend_Ldap_Exception(null,
-                'Empty password not allowed - see allowEmptyPassword option.');
-        } else {
-            if (@ldap_bind($this->_resource, $username, $password)) {
-                $this->_boundUser = $username;
-                return $this;
-            }
-
-            $message = ($username === null) ? $this->_connectString : $username;
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            switch ($this->getLastErrorCode()) {
-                case Zend_Ldap_Exception::LDAP_SERVER_DOWN:
-                    /* If the error is related to establishing a connection rather than binding,
-                     * the connect string is more informative than the username.
-                     */
-                    $message = $this->_connectString;
-            }
-
-            $zle = new Zend_Ldap_Exception($this, $message);
-        }
-        $this->disconnect();
-        throw $zle;
-    }
-
-    /**
-     * A global LDAP search routine for finding information.
-     *
-     * Options can be either passed as single parameters according to the
-     * method signature or as an array with one or more of the following keys
-     * - filter
-     * - baseDn
-     * - scope
-     * - attributes
-     * - sort
-     * - collectionClass
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract|array $filter
-     * @param  string|Zend_Ldap_Dn|null               $basedn
-     * @param  integer                                $scope
-     * @param  array                                  $attributes
-     * @param  string|null                            $sort
-     * @param  string|null                            $collectionClass
-     * @return Zend_Ldap_Collection
-     * @throws Zend_Ldap_Exception
-     */
-    public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
-        array $attributes = array(), $sort = null, $collectionClass = null)
-    {
-        if (is_array($filter)) {
-            $options = array_change_key_case($filter, CASE_LOWER);
-            foreach ($options as $key => $value) {
-                switch ($key) {
-                    case 'filter':
-                    case 'basedn':
-                    case 'scope':
-                    case 'sort':
-                        $$key = $value;
-                        break;
-                    case 'attributes':
-                        if (is_array($value)) {
-                            $attributes = $value;
-                        }
-                        break;
-                    case 'collectionclass':
-                        $collectionClass = $value;
-                        break;
-                }
-            }
-        }
-
-        if ($basedn === null) {
-            $basedn = $this->getBaseDn();
-        }
-        else if ($basedn instanceof Zend_Ldap_Dn) {
-            $basedn = $basedn->toString();
-        }
-
-        if ($filter instanceof Zend_Ldap_Filter_Abstract) {
-            $filter = $filter->toString();
-        }
-
-        switch ($scope) {
-            case self::SEARCH_SCOPE_ONE:
-                $search = @ldap_list($this->getResource(), $basedn, $filter, $attributes);
-                break;
-            case self::SEARCH_SCOPE_BASE:
-                $search = @ldap_read($this->getResource(), $basedn, $filter, $attributes);
-                break;
-            case self::SEARCH_SCOPE_SUB:
-            default:
-                $search = @ldap_search($this->getResource(), $basedn, $filter, $attributes);
-                break;
-        }
-
-        if($search === false) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception($this, 'searching: ' . $filter);
-        }
-        if (!is_null($sort) && is_string($sort)) {
-            $isSorted = @ldap_sort($this->getResource(), $search, $sort);
-            if($isSorted === false) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception($this, 'sorting: ' . $sort);
-            }
-        }
-
-        /**
-         * Zend_Ldap_Collection_Iterator_Default
-         */
-        require_once 'Zend/Ldap/Collection/Iterator/Default.php';
-        $iterator = new Zend_Ldap_Collection_Iterator_Default($this, $search);
-        if ($collectionClass === null) {
-            /**
-             * Zend_Ldap_Collection
-             */
-            require_once 'Zend/Ldap/Collection.php';
-            return new Zend_Ldap_Collection($iterator);
-        } else {
-            $collectionClass = (string)$collectionClass;
-            if (!class_exists($collectionClass)) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception(null,
-                    "Class '$collectionClass' can not be found");
-            }
-            if (!is_subclass_of($collectionClass, 'Zend_Ldap_Collection')) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception(null,
-                    "Class '$collectionClass' must subclass 'Zend_Ldap_Collection'");
-            }
-            return new $collectionClass($iterator);
-        }
-    }
-
-    /**
-     * Count items found by given filter.
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract $filter
-     * @param  string|Zend_Ldap_Dn|null         $basedn
-     * @param  integer                          $scope
-     * @return integer
-     * @throws Zend_Ldap_Exception
-     */
-    public function count($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB)
-    {
-        try {
-            $result = $this->search($filter, $basedn, $scope, array('dn'), null);
-        } catch (Zend_Ldap_Exception $e) {
-            if ($e->getCode() === Zend_Ldap_Exception::LDAP_NO_SUCH_OBJECT) return 0;
-            else throw $e;
-        }
-        return $result->count();
-    }
-
-    /**
-     * Count children for a given DN.
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @return integer
-     * @throws Zend_Ldap_Exception
-     */
-    public function countChildren($dn)
-    {
-        return $this->count('(objectClass=*)', $dn, self::SEARCH_SCOPE_ONE);
-    }
-
-    /**
-     * Check if a given DN exists.
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    public function exists($dn)
-    {
-        return ($this->count('(objectClass=*)', $dn, self::SEARCH_SCOPE_BASE) == 1);
-    }
-
-    /**
-     * Search LDAP registry for entries matching filter and optional attributes
-     *
-     * Options can be either passed as single parameters according to the
-     * method signature or as an array with one or more of the following keys
-     * - filter
-     * - baseDn
-     * - scope
-     * - attributes
-     * - sort
-     * - reverseSort
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract|array $filter
-     * @param  string|Zend_Ldap_Dn|null               $basedn
-     * @param  integer                                $scope
-     * @param  array                                  $attributes
-     * @param  string|null                            $sort
-     * @param  boolean                                $reverseSort
-     * @return array
-     * @throws Zend_Ldap_Exception
-     */
-    public function searchEntries($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB,
-        array $attributes = array(), $sort = null, $reverseSort = false)
-    {
-        if (is_array($filter)) {
-            $filter = array_change_key_case($filter, CASE_LOWER);
-            if (isset($filter['collectionclass'])) {
-                unset($filter['collectionclass']);
-            }
-            if (isset($filter['reversesort'])) {
-                $reverseSort = $filter['reversesort'];
-                unset($filter['reversesort']);
-            }
-        }
-        $result = $this->search($filter, $basedn, $scope, $attributes, $sort);
-        $items = $result->toArray();
-        if ((bool)$reverseSort === true) {
-            $items = array_reverse($items, false);
-        }
-        return $items;
-    }
-
-    /**
-     * Get LDAP entry by DN
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @param  array               $attributes
-     * @param  boolean             $throwOnNotFound
-     * @return array
-     * @throws Zend_Ldap_Exception
-     */
-    public function getEntry($dn, array $attributes = array(), $throwOnNotFound = false)
-    {
-        try {
-            $result = $this->search("(objectClass=*)", $dn, self::SEARCH_SCOPE_BASE,
-                $attributes, null);
-            return $result->getFirst();
-        } catch (Zend_Ldap_Exception $e){
-            if ($throwOnNotFound !== false) throw $e;
-        }
-        return null;
-    }
-
-    /**
-     * Prepares an ldap data entry array for insert/update operation
-     *
-     * @param  array $entry
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    public static function prepareLdapEntryArray(array &$entry)
-    {
-        if (array_key_exists('dn', $entry)) unset($entry['dn']);
-        foreach ($entry as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $i => $v) {
-                    if (is_null($v)) unset($value[$i]);
-                    else if (!is_scalar($v)) {
-                        throw new InvalidArgumentException('Only scalar values allowed in LDAP data');
-                    } else {
-                        $v = (string)$v;
-                        if (strlen($v) == 0) {
-                            unset($value[$i]);
-                        } else {
-                            $value[$i] = $v;
-                        }
-                    }
-                }
-                $entry[$key] = array_values($value);
-            } else {
-                if (is_null($value)) $entry[$key] = array();
-                else if (!is_scalar($value)) {
-                    throw new InvalidArgumentException('Only scalar values allowed in LDAP data');
-                } else {
-                    $value = (string)$value;
-                    if (strlen($value) == 0) {
-                        $entry[$key] = array();
-                    } else {
-                        $entry[$key] = array($value);
-                    }
-                }
-            }
-        }
-        $entry = array_change_key_case($entry, CASE_LOWER);
-    }
-
-    /**
-     * Add new information to the LDAP repository
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @param  array               $entry
-     * @return Zend_Ldap                  Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function add($dn, array $entry)
-    {
-        if (!($dn instanceof Zend_Ldap_Dn)) {
-            $dn = Zend_Ldap_Dn::factory($dn, null);
-        }
-        self::prepareLdapEntryArray($entry);
-        foreach ($entry as $key => $value) {
-            if (is_array($value) && count($value) === 0) {
-                unset($entry[$key]);
-            }
-        }
-
-        $rdnParts = $dn->getRdn(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-        foreach ($rdnParts as $key => $value) {
-            $value = Zend_Ldap_Dn::unescapeValue($value);
-            if (!array_key_exists($key, $entry) ||
-                    !in_array($value, $entry[$key]) ||
-                    count($entry[$key]) !== 1) {
-                $entry[$key] = array($value);
-            }
-        }
-        $adAttributes = array('distinguishedname', 'instancetype', 'name', 'objectcategory',
-            'objectguid', 'usnchanged', 'usncreated', 'whenchanged', 'whencreated');
-        foreach ($adAttributes as $attr) {
-            if (array_key_exists($attr, $entry)) {
-                unset($entry[$attr]);
-            }
-        }
-
-        $isAdded = @ldap_add($this->getResource(), $dn->toString(), $entry);
-        if($isAdded === false) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception($this, 'adding: ' . $dn->toString());
-        }
-        return $this;
-    }
-
-    /**
-     * Update LDAP registry
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @param  array               $entry
-     * @return Zend_Ldap                  Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function update($dn, array $entry)
-    {
-        if (!($dn instanceof Zend_Ldap_Dn)) {
-            $dn = Zend_Ldap_Dn::factory($dn, null);
-        }
-        self::prepareLdapEntryArray($entry);
-
-        $rdnParts = $dn->getRdn(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-        $adAttributes = array('distinguishedname', 'instancetype', 'name', 'objectcategory',
-            'objectguid', 'usnchanged', 'usncreated', 'whenchanged', 'whencreated');
-        $stripAttributes = array_merge(array_keys($rdnParts), $adAttributes);
-        foreach ($stripAttributes as $attr) {
-            if (array_key_exists($attr, $entry)) {
-                unset($entry[$attr]);
-            }
-        }
-
-        if (count($entry) > 0) {
-            $isModified = @ldap_modify($this->getResource(), $dn->toString(), $entry);
-            if($isModified === false) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception($this, 'updating: ' . $dn->toString());
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Save entry to LDAP registry.
-     *
-     * Internally decides if entry will be updated to added by calling
-     * {@link exists()}.
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @param  array               $entry
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function save($dn, array $entry)
-    {
-        if ($dn instanceof Zend_Ldap_Dn) {
-            $dn = $dn->toString();
-        }
-        if ($this->exists($dn)) $this->update($dn, $entry);
-        else $this->add($dn, $entry);
-        return $this;
-    }
-
-    /**
-     * Delete an LDAP entry
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function delete($dn, $recursively = false)
-    {
-        if ($dn instanceof Zend_Ldap_Dn) {
-            $dn = $dn->toString();
-        }
-        if ($recursively === true) {
-            if ($this->countChildren($dn)>0) {
-                $children = $this->_getChildrenDns($dn);
-                foreach ($children as $c) {
-                    $this->delete($c, true);
-                }
-            }
-        }
-        $isDeleted = @ldap_delete($this->getResource(), $dn);
-        if($isDeleted === false) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception($this, 'deleting: ' . $dn);
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve the immediate children DNs of the given $parentDn
-     *
-     * This method is used in recursive methods like {@see delete()}
-     * or {@see copy()}
-     *
-     * @param  string|Zend_Ldap_Dn $parentDn
-     * @return array of DNs
-     */
-    protected function _getChildrenDns($parentDn)
-    {
-        if ($parentDn instanceof Zend_Ldap_Dn) {
-            $parentDn = $parentDn->toString();
-        }
-        $children = array();
-        $search = @ldap_list($this->getResource(), $parentDn, '(objectClass=*)', array('dn'));
-        for ($entry = @ldap_first_entry($this->getResource(), $search);
-                $entry !== false;
-                $entry = @ldap_next_entry($this->getResource(), $entry)) {
-            $childDn = @ldap_get_dn($this->getResource(), $entry);
-            if ($childDn === false) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception($this, 'getting dn');
-            }
-            $children[] = $childDn;
-        }
-        @ldap_free_result($search);
-        return $children;
-    }
-
-    /**
-     * Moves a LDAP entry from one DN to another subtree.
-     *
-     * @param  string|Zend_Ldap_Dn $from
-     * @param  string|Zend_Ldap_Dn $to
-     * @param  boolean             $recursively
-     * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate = false)
-    {
-        if ($from instanceof Zend_Ldap_Dn) {
-            $orgDnParts = $from->toArray();
-        } else {
-            $orgDnParts = Zend_Ldap_Dn::explodeDn($from);
-        }
-
-        if ($to instanceof Zend_Ldap_Dn) {
-            $newParentDnParts = $to->toArray();
-        } else {
-            $newParentDnParts = Zend_Ldap_Dn::explodeDn($to);
-        }
-
-        $newDnParts = array_merge(array(array_shift($orgDnParts)), $newParentDnParts);
-        $newDn = Zend_Ldap_Dn::fromArray($newDnParts);
-        return $this->rename($from, $newDn, $recursively, $alwaysEmulate);
-    }
-
-    /**
-     * Moves a LDAP entry from one DN to another DN.
-     *
-     * This is an alias for {@link rename()}
-     *
-     * @param  string|Zend_Ldap_Dn $from
-     * @param  string|Zend_Ldap_Dn $to
-     * @param  boolean             $recursively
-     * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function move($from, $to, $recursively = false, $alwaysEmulate = false)
-    {
-        return $this->rename($from, $to, $recursively, $alwaysEmulate);
-    }
-
-    /**
-     * Renames a LDAP entry from one DN to another DN.
-     *
-     * This method implicitely moves the entry to another location within the tree.
-     *
-     * @param  string|Zend_Ldap_Dn $from
-     * @param  string|Zend_Ldap_Dn $to
-     * @param  boolean             $recursively
-     * @param  boolean             $alwaysEmulate
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
-    {
-        $emulate = (bool)$alwaysEmulate;
-        if (!function_exists('ldap_rename')) $emulate = true;
-        else if ($recursively) $emulate = true;
-
-        if ($emulate === false) {
-            if ($from instanceof Zend_Ldap_Dn) {
-                $from = $from->toString();
-            }
-
-            if ($to instanceof Zend_Ldap_Dn) {
-                $newDnParts = $to->toArray();
-            } else {
-                $newDnParts = Zend_Ldap_Dn::explodeDn($to);
-            }
-
-            $newRdn = Zend_Ldap_Dn::implodeRdn(array_shift($newDnParts));
-            $newParent = Zend_Ldap_Dn::implodeDn($newDnParts);
-            $isOK = @ldap_rename($this->getResource(), $from, $newRdn, $newParent, true);
-            if($isOK === false) {
-                /**
-                 * @see Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception($this, 'renaming ' . $from . ' to ' . $to);
-            }
-            else if (!$this->exists($to)) $emulate = true;
-        }
-        if ($emulate) {
-            $this->copy($from, $to, $recursively);
-            $this->delete($from, $recursively);
-        }
-        return $this;
-    }
-
-    /**
-     * Copies a LDAP entry from one DN to another subtree.
-     *
-     * @param  string|Zend_Ldap_Dn $from
-     * @param  string|Zend_Ldap_Dn $to
-     * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function copyToSubtree($from, $to, $recursively = false)
-    {
-        if ($from instanceof Zend_Ldap_Dn) {
-            $orgDnParts = $from->toArray();
-        } else {
-            $orgDnParts = Zend_Ldap_Dn::explodeDn($from);
-        }
-
-        if ($to instanceof Zend_Ldap_Dn) {
-            $newParentDnParts = $to->toArray();
-        } else {
-            $newParentDnParts = Zend_Ldap_Dn::explodeDn($to);
-        }
-
-        $newDnParts = array_merge(array(array_shift($orgDnParts)), $newParentDnParts);
-        $newDn = Zend_Ldap_Dn::fromArray($newDnParts);
-        return $this->copy($from, $newDn, $recursively);
-    }
-
-    /**
-     * Copies a LDAP entry from one DN to another DN.
-     *
-     * @param  string|Zend_Ldap_Dn $from
-     * @param  string|Zend_Ldap_Dn $to
-     * @param  boolean             $recursively
-     * @return Zend_Ldap Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function copy($from, $to, $recursively = false)
-    {
-        $entry = $this->getEntry($from, array(), true);
-
-        if ($to instanceof Zend_Ldap_Dn) {
-            $toDnParts = $to->toArray();
-        } else {
-            $toDnParts = Zend_Ldap_Dn::explodeDn($to);
-        }
-        $this->add($to, $entry);
-
-        if ($recursively === true && $this->countChildren($from)>0) {
-            $children = $this->_getChildrenDns($from);
-            foreach ($children as $c) {
-                $cDnParts = Zend_Ldap_Dn::explodeDn($c);
-                $newChildParts = array_merge(array(array_shift($cDnParts)), $toDnParts);
-                $newChild = Zend_Ldap_Dn::implodeDn($newChildParts);
-                $this->copy($c, $newChild, true);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the specified DN as a Zend_Ldap_Node
-     *
-     * @param  string|Zend_Ldap_Dn $dn
-     * @return Zend_Ldap_Node|null
-     * @throws Zend_Ldap_Exception
-     */
-    public function getNode($dn)
-    {
-        /**
-         * Zend_Ldap_Node
-         */
-        require_once 'Zend/Ldap/Node.php';
-        return Zend_Ldap_Node::fromLdap($dn, $this);
-    }
-
-    /**
-     * Returns the base node as a Zend_Ldap_Node
-     *
-     * @return Zend_Ldap_Node
-     * @throws Zend_Ldap_Exception
-     */
-    public function getBaseNode()
-    {
-        return $this->getNode($this->getBaseDn(), $this);
-    }
-
-    /**
-     * Returns the RootDSE
-     *
-     * @return Zend_Ldap_Node_RootDse
-     * @throws Zend_Ldap_Exception
-     */
-    public function getRootDse()
-    {
-        if ($this->_rootDse === null) {
-            /**
-             * @see Zend_Ldap_Node_Schema
-             */
-            require_once 'Zend/Ldap/Node/RootDse.php';
-            $this->_rootDse = Zend_Ldap_Node_RootDse::create($this);
-        }
-        return $this->_rootDse;
-    }
-
-    /**
-     * Returns the schema
-     *
-     * @return Zend_Ldap_Node_Schema
-     * @throws Zend_Ldap_Exception
-     */
-    public function getSchema()
-    {
-        if ($this->_schema === null) {
-            /**
-             * @see Zend_Ldap_Node_Schema
-             */
-            require_once 'Zend/Ldap/Node/Schema.php';
-            $this->_schema = Zend_Ldap_Node_Schema::create($this);
-        }
-        return $this->_schema;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Ldap/Attribute.php b/airtime_mvc/library/Zend/Ldap/Attribute.php
deleted file mode 100644
index a17d3abc1..000000000
--- a/airtime_mvc/library/Zend/Ldap/Attribute.php
+++ /dev/null
@@ -1,423 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Attribute.php 21532 2010-03-17 12:18:23Z sgehrig $
- */
-
-/**
- * Zend_Ldap_Attribute is a collection of LDAP attribute related functions.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Attribute
-{
-    const PASSWORD_HASH_MD5   = 'md5';
-    const PASSWORD_HASH_SMD5  = 'smd5';
-    const PASSWORD_HASH_SHA   = 'sha';
-    const PASSWORD_HASH_SSHA  = 'ssha';
-    const PASSWORD_UNICODEPWD = 'unicodePwd';
-
-    /**
-     * Sets a LDAP attribute.
-     *
-     * @param  array                    $data
-     * @param  string                   $attribName
-     * @param  scalar|array|Traversable $value
-     * @param  boolean                  $append
-     * @return void
-     */
-    public static function setAttribute(array &$data, $attribName, $value, $append = false)
-    {
-        $attribName = strtolower($attribName);
-        $valArray = array();
-        if (is_array($value) || ($value instanceof Traversable))
-        {
-            foreach ($value as $v)
-            {
-                $v = self::_valueToLdap($v);
-                if (!is_null($v)) $valArray[] = $v;
-            }
-        }
-        else if (!is_null($value))
-        {
-            $value = self::_valueToLdap($value);
-            if (!is_null($value)) $valArray[] = $value;
-        }
-
-        if ($append === true && isset($data[$attribName]))
-        {
-            if (is_string($data[$attribName])) $data[$attribName] = array($data[$attribName]);
-            $data[$attribName] = array_merge($data[$attribName], $valArray);
-        }
-        else
-        {
-            $data[$attribName] = $valArray;
-        }
-    }
-
-    /**
-     * Gets a LDAP attribute.
-     *
-     * @param  array   $data
-     * @param  string  $attribName
-     * @param  integer $index
-     * @return array|mixed
-     */
-    public static function getAttribute(array $data, $attribName, $index = null)
-    {
-        $attribName = strtolower($attribName);
-        if (is_null($index)) {
-            if (!isset($data[$attribName])) return array();
-            $retArray = array();
-            foreach ($data[$attribName] as $v)
-            {
-                $retArray[] = self::_valueFromLdap($v);
-            }
-            return $retArray;
-        } else if (is_int($index)) {
-            if (!isset($data[$attribName])) {
-                return null;
-            } else if ($index >= 0 && $index<count($data[$attribName])) {
-                return self::_valueFromLdap($data[$attribName][$index]);
-            } else {
-                return null;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Checks if the given value(s) exist in the attribute
-     *
-     * @param array       $data
-     * @param string      $attribName
-     * @param mixed|array $value
-     * @return boolean
-     */
-    public static function attributeHasValue(array &$data, $attribName, $value)
-    {
-        $attribName = strtolower($attribName);
-        if (!isset($data[$attribName])) return false;
-
-        if (is_scalar($value)) {
-            $value = array($value);
-        }
-
-        foreach ($value as $v) {
-            $v = self::_valueToLdap($v);
-            if (!in_array($v, $data[$attribName], true)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Removes duplicate values from a LDAP attribute
-     *
-     * @param array  $data
-     * @param string $attribName
-     * @return void
-     */
-    public static function removeDuplicatesFromAttribute(array &$data, $attribName)
-    {
-        $attribName = strtolower($attribName);
-        if (!isset($data[$attribName])) return;
-        $data[$attribName] = array_values(array_unique($data[$attribName]));
-    }
-
-    /**
-     * Remove given values from a LDAP attribute
-     *
-     * @param array       $data
-     * @param string      $attribName
-     * @param mixed|array $value
-     * @return void
-     */
-    public static function removeFromAttribute(array &$data, $attribName, $value)
-    {
-        $attribName = strtolower($attribName);
-        if (!isset($data[$attribName])) return;
-
-        if (is_scalar($value)) {
-            $value = array($value);
-        }
-
-        $valArray = array();
-        foreach ($value as $v)
-        {
-            $v = self::_valueToLdap($v);
-            if ($v !== null) $valArray[] = $v;
-        }
-
-        $resultArray = $data[$attribName];
-        foreach ($valArray as $rv) {
-            $keys = array_keys($resultArray, $rv);
-            foreach ($keys as $k) {
-                unset($resultArray[$k]);
-            }
-        }
-        $resultArray = array_values($resultArray);
-        $data[$attribName] = $resultArray;
-    }
-
-    /**
-     * @param  mixed $value
-     * @return string|null
-     */
-    private static function _valueToLdap($value)
-    {
-        if (is_string($value)) return $value;
-        else if (is_int($value) || is_float($value)) return (string)$value;
-        else if (is_bool($value)) return ($value === true) ? 'TRUE' : 'FALSE';
-        else if (is_object($value) || is_array($value)) return serialize($value);
-        else if (is_resource($value) && get_resource_type($value) === 'stream')
-            return stream_get_contents($value);
-        else return null;
-    }
-
-    /**
-     * @param  string $value
-     * @return string|boolean
-     */
-    private static function _valueFromLdap($value)
-    {
-        $value = (string)$value;
-        if ($value === 'TRUE') return true;
-        else if ($value === 'FALSE') return false;
-        else return $value;
-    }
-
-    /**
-     * Converts a PHP data type into its LDAP representation
-     *
-     * @param  mixed $value
-     * @return string|null - null if the PHP data type cannot be converted.
-     */
-    public static function convertToLdapValue($value)
-    {
-        return self::_valueToLdap($value);
-    }
-
-    /**
-     * Converts an LDAP value into its PHP data type
-     *
-     * @param  string $value
-     * @return mixed
-     */
-    public static function convertFromLdapValue($value)
-    {
-        return self::_valueFromLdap($value);
-    }
-
-    /**
-     * Converts a timestamp into its LDAP date/time representation
-     *
-     * @param  integer $value
-     * @param  boolean $utc
-     * @return string|null - null if the value cannot be converted.
-     */
-    public static function convertToLdapDateTimeValue($value, $utc = false)
-    {
-        return self::_valueToLdapDateTime($value, $utc);
-    }
-
-    /**
-     * Converts LDAP date/time representation into a timestamp
-     *
-     * @param  string $value
-     * @return integer|null - null if the value cannot be converted.
-     */
-    public static function convertFromLdapDateTimeValue($value)
-    {
-        return self::_valueFromLdapDateTime($value);
-    }
-
-    /**
-     * Sets a LDAP password.
-     *
-     * @param  array       $data
-     * @param  string      $password
-     * @param  string      $hashType
-     * @param  string|null $attribName
-     * @return null
-     */
-    public static function setPassword(array &$data, $password, $hashType = self::PASSWORD_HASH_MD5,
-        $attribName = null)
-    {
-        if ($attribName === null) {
-            if ($hashType === self::PASSWORD_UNICODEPWD) {
-                $attribName = 'unicodePwd';
-            } else {
-                $attribName = 'userPassword';
-            }
-        }
-
-        $hash = self::createPassword($password, $hashType);
-        self::setAttribute($data, $attribName, $hash, false);
-    }
-
-    /**
-     * Creates a LDAP password.
-     *
-     * @param  string $password
-     * @param  string $hashType
-     * @return string
-     */
-    public static function createPassword($password, $hashType = self::PASSWORD_HASH_MD5)
-    {
-        switch ($hashType) {
-            case self::PASSWORD_UNICODEPWD:
-                /* see:
-                 * http://msdn.microsoft.com/en-us/library/cc223248(PROT.10).aspx
-                 */
-                $password = '"' . $password . '"';
-                if (function_exists('mb_convert_encoding')) {
-                    $password = mb_convert_encoding($password, 'UTF-16LE', 'UTF-8');
-                } else if (function_exists('iconv')) {
-                    $password = iconv('UTF-8', 'UTF-16LE', $password);
-                } else {
-                    $len = strlen($password);
-                    $new = '';
-                    for($i=0; $i < $len; $i++) {
-                        $new .= $password[$i] . "\x00";
-                    }
-                    $password = $new;
-                }
-                return $password;
-            case self::PASSWORD_HASH_SSHA:
-                $salt    = substr(sha1(uniqid(mt_rand(), true), true), 0, 4);
-                $rawHash = sha1($password . $salt, true) . $salt;
-                $method  = '{SSHA}';
-                break;
-            case self::PASSWORD_HASH_SHA:
-                $rawHash = sha1($password, true);
-                $method  = '{SHA}';
-                break;
-            case self::PASSWORD_HASH_SMD5:
-                $salt    = substr(sha1(uniqid(mt_rand(), true), true), 0, 4);
-                $rawHash = md5($password . $salt, true) . $salt;
-                $method  = '{SMD5}';
-                break;
-            case self::PASSWORD_HASH_MD5:
-            default:
-                $rawHash = md5($password, true);
-                $method  = '{MD5}';
-                break;
-        }
-        return $method . base64_encode($rawHash);
-    }
-
-    /**
-     * Sets a LDAP date/time attribute.
-     *
-     * @param  array                     $data
-     * @param  string                    $attribName
-     * @param  integer|array|Traversable $value
-     * @param  boolean                   $utc
-     * @param  boolean                   $append
-     * @return null
-     */
-    public static function setDateTimeAttribute(array &$data, $attribName, $value, $utc = false,
-        $append = false)
-    {
-        $convertedValues = array();
-        if (is_array($value) || ($value instanceof Traversable))
-        {
-            foreach ($value as $v) {
-                $v = self::_valueToLdapDateTime($v, $utc);
-                if (!is_null($v)) $convertedValues[] = $v;
-            }
-        }
-        else if (!is_null($value)) {
-            $value = self::_valueToLdapDateTime($value, $utc);
-            if (!is_null($value)) $convertedValues[] = $value;
-        }
-        self::setAttribute($data, $attribName, $convertedValues, $append);
-    }
-
-    /**
-     * @param  integer $value
-     * @param  boolean $utc
-     * @return string|null
-     */
-    private static function _valueToLdapDateTime($value, $utc)
-    {
-        if (is_int($value)) {
-            if ($utc === true) return gmdate('YmdHis', $value) . 'Z';
-            else return date('YmdHisO', $value);
-        }
-        else return null;
-    }
-
-    /**
-     * Gets a LDAP date/time attribute.
-     *
-     * @param  array   $data
-     * @param  string  $attribName
-     * @param  integer $index
-     * @return array|integer
-     */
-    public static function getDateTimeAttribute(array $data, $attribName, $index = null)
-    {
-        $values = self::getAttribute($data, $attribName, $index);
-        if (is_array($values)) {
-            for ($i = 0; $i<count($values); $i++) {
-                $newVal = self::_valueFromLdapDateTime($values[$i]);
-                if ($newVal !== null) $values[$i] = $newVal;
-            }
-        }
-        else {
-			$newVal = self::_valueFromLdapDateTime($values);
-			if ($newVal !== null) $values = $newVal;
-		}
-        return $values;
-    }
-
-    /**
-     * @param  string $value
-     * @return integer|null
-     */
-    private static function _valueFromLdapDateTime($value)
-    {
-        $matches = array();
-        if (preg_match('/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})([+-]\d{4}|Z)$/', $value, $matches)) {
-            $year = $matches[1];
-            $month = $matches[2];
-            $day = $matches[3];
-            $hour = $matches[4];
-            $minute = $matches[5];
-            $second = $matches[6];
-            $timezone = $matches[7];
-            $date = gmmktime($hour, $minute, $second, $month, $day, $year);
-            if ($timezone !== 'Z') {
-                $tzDirection = substr($timezone, 0, 1);
-                $tzOffsetHour = substr($timezone, 1, 2);
-                $tzOffsetMinute = substr($timezone, 3, 2);
-                $tzOffset = ($tzOffsetHour*60*60) + ($tzOffsetMinute*60);
-                if ($tzDirection == '+') $date -= $tzOffset;
-                else if ($tzDirection == '-') $date += $tzOffset;
-            }
-            return $date;
-        }
-        else return null;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Collection.php b/airtime_mvc/library/Zend/Ldap/Collection.php
deleted file mode 100644
index f6a08c1f3..000000000
--- a/airtime_mvc/library/Zend/Ldap/Collection.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Collection wraps a list of LDAP entries.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Collection implements Iterator, Countable
-{
-    /**
-     * Iterator
-     *
-     * @var Zend_Ldap_Collection_Iterator_Default
-     */
-    protected $_iterator = null;
-
-    /**
-     * Current item number
-     *
-     * @var integer
-     */
-    protected $_current = -1;
-
-    /**
-     * Container for item caching to speed up multiple iterations
-     *
-     * @var array
-     */
-    protected $_cache = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Zend_Ldap_Collection_Iterator_Default $iterator
-     */
-    public function __construct(Zend_Ldap_Collection_Iterator_Default $iterator)
-    {
-        $this->_iterator = $iterator;
-    }
-
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    /**
-     * Closes the current result set
-     *
-     * @return boolean
-     */
-    public function close()
-    {
-        return $this->_iterator->close();
-    }
-
-    /**
-     * Get all entries as an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $data = array();
-        foreach ($this as $item) {
-            $data[] = $item;
-        }
-        return $data;
-    }
-
-    /**
-     * Get first entry
-     *
-     * @return array
-     */
-    public function getFirst()
-    {
-        if ($this->count() > 0) {
-            $this->rewind();
-            return $this->current();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the underlying iterator
-     *
-     * @return Zend_Ldap_Collection_Iterator_Default
-     */
-    public function getInnerIterator()
-    {
-        return $this->_iterator;
-    }
-
-    /**
-     * Returns the number of items in current result
-     * Implements Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->_iterator->count();
-    }
-
-    /**
-     * Return the current result item
-     * Implements Iterator
-     *
-     * @return array|null
-     * @throws Zend_Ldap_Exception
-     */
-    public function current()
-    {
-        if ($this->count() > 0) {
-            if ($this->_current < 0) {
-                $this->rewind();
-            }
-            if (!array_key_exists($this->_current, $this->_cache)) {
-                $current = $this->_iterator->current();
-                if ($current === null) {
-                    return null;
-                }
-                $this->_cache[$this->_current] = $this->_createEntry($current);
-            }
-            return $this->_cache[$this->_current];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Creates the data structure for the given entry data
-     *
-     * @param  array $data
-     * @return array
-     */
-    protected function _createEntry(array $data)
-    {
-        return $data;
-    }
-
-    /**
-     * Return the current result item DN
-     *
-     * @return string|null
-     */
-    public function dn()
-    {
-        if ($this->count() > 0) {
-            if ($this->_current < 0) {
-                $this->rewind();
-            }
-            return $this->_iterator->key();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the current result item key
-     * Implements Iterator
-     *
-     * @return int|null
-     */
-    public function key()
-    {
-        if ($this->count() > 0) {
-            if ($this->_current < 0) {
-                $this->rewind();
-            }
-            return $this->_current;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Move forward to next result item
-     * Implements Iterator
-     *
-     * @throws Zend_Ldap_Exception
-     */
-    public function next()
-    {
-        $this->_iterator->next();
-        $this->_current++;
-    }
-
-    /**
-     * Rewind the Iterator to the first result item
-     * Implements Iterator
-     *
-     * @throws Zend_Ldap_Exception
-     */
-    public function rewind()
-    {
-        $this->_iterator->rewind();
-        $this->_current = 0;
-    }
-
-    /**
-     * Check if there is a current result item
-     * after calls to rewind() or next()
-     * Implements Iterator
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        if (isset($this->_cache[$this->_current])) {
-            return true;
-        } else {
-            return $this->_iterator->valid();
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Collection/Iterator/Default.php b/airtime_mvc/library/Zend/Ldap/Collection/Iterator/Default.php
deleted file mode 100644
index 3920e8b49..000000000
--- a/airtime_mvc/library/Zend/Ldap/Collection/Iterator/Default.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Collection_Iterator_Default is the default collection iterator implementation
- * using ext/ldap
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Collection_Iterator_Default implements Iterator, Countable
-{
-    const ATTRIBUTE_TO_LOWER  = 1;
-    const ATTRIBUTE_TO_UPPER  = 2;
-    const ATTRIBUTE_NATIVE    = 3;
-
-    /**
-     * LDAP Connection
-     *
-     * @var Zend_Ldap
-     */
-    protected $_ldap = null;
-
-    /**
-     * Result identifier resource
-     *
-     * @var resource
-     */
-    protected $_resultId = null;
-
-    /**
-     * Current result entry identifier
-     *
-     * @var resource
-     */
-    protected $_current = null;
-
-    /**
-     * Number of items in query result
-     *
-     * @var integer
-     */
-    protected $_itemCount = -1;
-
-    /**
-     * The method that will be applied to the attribute's names.
-     *
-     * @var  integer|callback
-     */
-    protected $_attributeNameTreatment = self::ATTRIBUTE_TO_LOWER;
-
-    /**
-     * Constructor.
-     *
-     * @param  Zend_Ldap $ldap
-     * @param  resource  $resultId
-     * @return void
-     */
-    public function __construct(Zend_Ldap $ldap, $resultId)
-    {
-        $this->_ldap = $ldap;
-        $this->_resultId = $resultId;
-        $this->_itemCount = @ldap_count_entries($ldap->getResource(), $resultId);
-        if ($this->_itemCount === false) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception($this->_ldap, 'counting entries');
-        }
-    }
-
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    /**
-     * Closes the current result set
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        $isClosed = false;
-        if (is_resource($this->_resultId)) {
-             $isClosed = @ldap_free_result($this->_resultId);
-             $this->_resultId = null;
-             $this->_current = null;
-        }
-        return $isClosed;
-    }
-
-    /**
-     * Gets the current LDAP connection.
-     *
-     * @return Zend_Ldap
-     */
-    public function getLdap()
-    {
-        return $this->_ldap;
-    }
-
-    /**
-     * Sets the attribute name treatment.
-     *
-     * Can either be one of the following constants
-     * - Zend_Ldap_Collection_Iterator_Default::ATTRIBUTE_TO_LOWER
-     * - Zend_Ldap_Collection_Iterator_Default::ATTRIBUTE_TO_UPPER
-     * - Zend_Ldap_Collection_Iterator_Default::ATTRIBUTE_NATIVE
-     * or a valid callback accepting the attribute's name as it's only
-     * argument and returning the new attribute's name.
-     *
-     * @param  integer|callback $attributeNameTreatment
-     * @return Zend_Ldap_Collection_Iterator_Default Provides a fluent interface
-     */
-    public function setAttributeNameTreatment($attributeNameTreatment)
-    {
-        if (is_callable($attributeNameTreatment)) {
-            if (is_string($attributeNameTreatment) && !function_exists($attributeNameTreatment)) {
-                $this->_attributeNameTreatment = self::ATTRIBUTE_TO_LOWER;
-            } else if (is_array($attributeNameTreatment) &&
-                    !method_exists($attributeNameTreatment[0], $attributeNameTreatment[1])) {
-                $this->_attributeNameTreatment = self::ATTRIBUTE_TO_LOWER;
-            } else {
-                $this->_attributeNameTreatment = $attributeNameTreatment;
-            }
-        } else {
-            $attributeNameTreatment = (int)$attributeNameTreatment;
-            switch ($attributeNameTreatment) {
-                case self::ATTRIBUTE_TO_LOWER:
-                case self::ATTRIBUTE_TO_UPPER:
-                case self::ATTRIBUTE_NATIVE:
-                    $this->_attributeNameTreatment = $attributeNameTreatment;
-                    break;
-                default:
-                    $this->_attributeNameTreatment = self::ATTRIBUTE_TO_LOWER;
-                    break;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the currently set attribute name treatment
-     *
-     * @return integer|callback
-     */
-    public function getAttributeNameTreatment()
-    {
-        return $this->_attributeNameTreatment;
-    }
-
-    /**
-     * Returns the number of items in current result
-     * Implements Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->_itemCount;
-    }
-
-    /**
-     * Return the current result item
-     * Implements Iterator
-     *
-     * @return array|null
-     * @throws Zend_Ldap_Exception
-     */
-    public function current()
-    {
-        if (!is_resource($this->_current)) {
-            $this->rewind();
-        }
-        if (!is_resource($this->_current)) {
-            return null;
-        }
-
-        $entry = array('dn' => $this->key());
-        $ber_identifier = null;
-        $name = @ldap_first_attribute($this->_ldap->getResource(), $this->_current,
-            $ber_identifier);
-        while ($name) {
-            $data = @ldap_get_values_len($this->_ldap->getResource(), $this->_current, $name);
-            unset($data['count']);
-
-            switch($this->_attributeNameTreatment) {
-                case self::ATTRIBUTE_TO_LOWER:
-                    $attrName = strtolower($name);
-                    break;
-                case self::ATTRIBUTE_TO_UPPER:
-                    $attrName = strtoupper($name);
-                    break;
-                case self::ATTRIBUTE_NATIVE:
-                    $attrName = $name;
-                    break;
-                default:
-                    $attrName = call_user_func($this->_attributeNameTreatment, $name);
-                    break;
-            }
-            $entry[$attrName] = $data;
-            $name = @ldap_next_attribute($this->_ldap->getResource(), $this->_current,
-                $ber_identifier);
-        }
-        ksort($entry, SORT_LOCALE_STRING);
-        return $entry;
-    }
-
-    /**
-     * Return the result item key
-     * Implements Iterator
-     *
-     * @return string|null
-     */
-    public function key()
-    {
-        if (!is_resource($this->_current)) {
-            $this->rewind();
-        }
-        if (is_resource($this->_current)) {
-            $currentDn = @ldap_get_dn($this->_ldap->getResource(), $this->_current);
-            if ($currentDn === false) {
-                /** @see Zend_Ldap_Exception */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception($this->_ldap, 'getting dn');
-            }
-            return $currentDn;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Move forward to next result item
-     * Implements Iterator
-     *
-     * @throws Zend_Ldap_Exception
-     */
-    public function next()
-    {
-        if (is_resource($this->_current)) {
-            $this->_current = @ldap_next_entry($this->_ldap->getResource(), $this->_current);
-            /** @see Zend_Ldap_Exception */
-            require_once 'Zend/Ldap/Exception.php';
-            if ($this->_current === false) {
-                $msg = $this->_ldap->getLastError($code);
-                if ($code === Zend_Ldap_Exception::LDAP_SIZELIMIT_EXCEEDED) {
-                    // we have reached the size limit enforced by the server
-                    return;
-                } else if ($code > Zend_Ldap_Exception::LDAP_SUCCESS) {
-                     throw new Zend_Ldap_Exception($this->_ldap, 'getting next entry (' . $msg . ')');
-                }
-            }
-        }
-    }
-
-    /**
-     * Rewind the Iterator to the first result item
-     * Implements Iterator
-     *
-     * @throws Zend_Ldap_Exception
-     */
-    public function rewind()
-    {
-        if (is_resource($this->_resultId)) {
-            $this->_current = @ldap_first_entry($this->_ldap->getResource(), $this->_resultId);
-            /** @see Zend_Ldap_Exception */
-            require_once 'Zend/Ldap/Exception.php';
-            if ($this->_current === false &&
-                    $this->_ldap->getLastErrorCode() > Zend_Ldap_Exception::LDAP_SUCCESS) {
-                throw new Zend_Ldap_Exception($this->_ldap, 'getting first entry');
-            }
-        }
-    }
-
-    /**
-     * Check if there is a current result item
-     * after calls to rewind() or next()
-     * Implements Iterator
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return (is_resource($this->_current));
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Converter.php b/airtime_mvc/library/Zend/Ldap/Converter.php
deleted file mode 100644
index 07b1bc1fd..000000000
--- a/airtime_mvc/library/Zend/Ldap/Converter.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Converter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Converter is a collection of useful LDAP related conversion functions.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Converter
-{
-    /**
-     * Converts all ASCII chars < 32 to "\HEX"
-     *
-     * @see Net_LDAP2_Util::asc2hex32() from Benedikt Hallinger <beni@php.net>
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>
-     *
-     * @param  string $string String to convert
-     * @return string
-     */
-    public static function ascToHex32($string)
-    {
-        for ($i = 0; $i<strlen($string); $i++) {
-            $char = substr($string, $i, 1);
-            if (ord($char)<32) {
-                $hex = dechex(ord($char));
-                if (strlen($hex) == 1) $hex = '0' . $hex;
-                $string = str_replace($char, '\\' . $hex, $string);
-            }
-        }
-        return $string;
-    }
-
-    /**
-     * Converts all Hex expressions ("\HEX") to their original ASCII characters
-     *
-     * @see Net_LDAP2_Util::hex2asc() from Benedikt Hallinger <beni@php.net>,
-     * heavily based on work from DavidSmith@byu.net
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>, heavily based on work from DavidSmith@byu.net
-     *
-     * @param  string $string String to convert
-     * @return string
-     */
-    public static function hex32ToAsc($string)
-    {
-        $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
-        return $string;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Dn.php b/airtime_mvc/library/Zend/Ldap/Dn.php
deleted file mode 100644
index e1ea1af93..000000000
--- a/airtime_mvc/library/Zend/Ldap/Dn.php
+++ /dev/null
@@ -1,794 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dn.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Dn provides an API for DN manipulation
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Dn implements ArrayAccess
-{
-    const ATTR_CASEFOLD_NONE  = 'none';
-    const ATTR_CASEFOLD_UPPER = 'upper';
-    const ATTR_CASEFOLD_LOWER = 'lower';
-
-    /**
-     * The default case fold to use
-     *
-     * @var string
-     */
-    protected static $_defaultCaseFold = self::ATTR_CASEFOLD_NONE;
-
-    /**
-     * The case fold used for this instance
-     *
-     * @var string
-     */
-    protected $_caseFold;
-
-    /**
-     * The DN data
-     *
-     * @var array
-     */
-    protected $_dn;
-
-    /**
-     * Creates a DN from an array or a string
-     *
-     * @param  string|array $dn
-     * @param  string|null  $caseFold
-     * @return Zend_Ldap_Dn
-     * @throws Zend_Ldap_Exception
-     */
-    public static function factory($dn, $caseFold = null)
-    {
-        if (is_array($dn)) {
-            return self::fromArray($dn, $caseFold);
-        } else if (is_string($dn)) {
-            return self::fromString($dn, $caseFold);
-        } else {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Invalid argument type for $dn');
-        }
-    }
-
-    /**
-     * Creates a DN from a string
-     *
-     * @param  string      $dn
-     * @param  string|null $caseFold
-     * @return Zend_Ldap_Dn
-     * @throws Zend_Ldap_Exception
-     */
-    public static function fromString($dn, $caseFold = null)
-    {
-        $dn = trim($dn);
-        if (empty($dn)) {
-            $dnArray = array();
-        } else {
-            $dnArray = self::explodeDn((string)$dn);
-        }
-        return new self($dnArray, $caseFold);
-    }
-
-    /**
-     * Creates a DN from an array
-     *
-     * @param  array       $dn
-     * @param  string|null $caseFold
-     * @return Zend_Ldap_Dn
-     * @throws Zend_Ldap_Exception
-     */
-    public static function fromArray(array $dn, $caseFold = null)
-    {
-         return new self($dn, $caseFold);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param array       $dn
-     * @param string|null $caseFold
-     */
-    protected function __construct(array $dn, $caseFold)
-    {
-        $this->_dn = $dn;
-        $this->setCaseFold($caseFold);
-    }
-
-    /**
-     * Gets the RDN of the current DN
-     *
-     * @param  string $caseFold
-     * @return array
-     * @throws Zend_Ldap_Exception if DN has no RDN (empty array)
-     */
-    public function getRdn($caseFold = null)
-    {
-        $caseFold = self::_sanitizeCaseFold($caseFold, $this->_caseFold);
-        return self::_caseFoldRdn($this->get(0, 1, $caseFold), null);
-    }
-
-    /**
-     * Gets the RDN of the current DN as a string
-     *
-     * @param  string $caseFold
-     * @return string
-     * @throws Zend_Ldap_Exception if DN has no RDN (empty array)
-     */
-    public function getRdnString($caseFold = null)
-    {
-        $caseFold = self::_sanitizeCaseFold($caseFold, $this->_caseFold);
-        return self::implodeRdn($this->getRdn(), $caseFold);
-    }
-
-    /**
-     * Get the parent DN $levelUp levels up the tree
-     *
-     * @param  int $levelUp
-     * @return Zend_Ldap_Dn
-     */
-    public function getParentDn($levelUp = 1)
-    {
-        $levelUp = (int)$levelUp;
-        if ($levelUp < 1 || $levelUp >= count($this->_dn)) {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Cannot retrieve parent DN with given $levelUp');
-        }
-        $newDn = array_slice($this->_dn, $levelUp);
-        return new self($newDn, $this->_caseFold);
-    }
-
-    /**
-     * Get a DN part
-     *
-     * @param  int    $index
-     * @param  int    $length
-     * @param  string $caseFold
-     * @return array
-     * @throws Zend_Ldap_Exception if index is illegal
-     */
-    public function get($index, $length = 1, $caseFold = null)
-    {
-        $caseFold = self::_sanitizeCaseFold($caseFold, $this->_caseFold);
-        $this->_assertIndex($index);
-        $length = (int)$length;
-        if ($length <= 0) {
-            $length = 1;
-        }
-        if ($length === 1) {
-            return self::_caseFoldRdn($this->_dn[$index], $caseFold);
-        }
-        else {
-            return self::_caseFoldDn(array_slice($this->_dn, $index, $length, false), $caseFold);
-        }
-    }
-
-    /**
-     * Set a DN part
-     *
-     * @param  int   $index
-     * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
-     * @throws Zend_Ldap_Exception if index is illegal
-     */
-    public function set($index, array $value)
-    {
-        $this->_assertIndex($index);
-        self::_assertRdn($value);
-        $this->_dn[$index] = $value;
-        return $this;
-    }
-
-    /**
-     * Remove a DN part
-     *
-     * @param  int $index
-     * @param  int $length
-     * @return Zend_Ldap_Dn Provides a fluent interface
-     * @throws Zend_Ldap_Exception if index is illegal
-     */
-    public function remove($index, $length = 1)
-    {
-        $this->_assertIndex($index);
-        $length = (int)$length;
-        if ($length <= 0) {
-            $length = 1;
-        }
-        array_splice($this->_dn, $index, $length, null);
-        return $this;
-    }
-
-    /**
-     * Append a DN part
-     *
-     * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
-     */
-    public function append(array $value)
-    {
-        self::_assertRdn($value);
-        $this->_dn[] = $value;
-        return $this;
-    }
-
-    /**
-     * Prepend a DN part
-     *
-     * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
-     */
-    public function prepend(array $value)
-    {
-        self::_assertRdn($value);
-        array_unshift($this->_dn, $value);
-        return $this;
-    }
-
-    /**
-     * Insert a DN part
-     *
-     * @param  int   $index
-     * @param  array $value
-     * @return Zend_Ldap_Dn Provides a fluent interface
-     * @throws Zend_Ldap_Exception if index is illegal
-     */
-    public function insert($index, array $value)
-    {
-        $this->_assertIndex($index);
-        self::_assertRdn($value);
-        $first = array_slice($this->_dn, 0, $index + 1);
-        $second = array_slice($this->_dn, $index + 1);
-        $this->_dn = array_merge($first, array($value), $second);
-        return $this;
-    }
-
-    /**
-     * Assert index is correct and usable
-     *
-     * @param  mixed $index
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _assertIndex($index)
-    {
-        if (!is_int($index)) {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Parameter $index must be an integer');
-        }
-        if ($index < 0 || $index >= count($this->_dn)) {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Parameter $index out of bounds');
-        }
-        return true;
-    }
-
-    /**
-     * Assert if value is in a correct RDN format
-     *
-     * @param  array $value
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    protected static function _assertRdn(array $value)
-    {
-        if (count($value)<1) {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'RDN Array is malformed: it must have at least one item');
-        }
-
-        foreach (array_keys($value) as $key) {
-            if (!is_string($key)) {
-                /**
-                 * Zend_Ldap_Exception
-                 */
-                require_once 'Zend/Ldap/Exception.php';
-                throw new Zend_Ldap_Exception(null, 'RDN Array is malformed: it must use string keys');
-            }
-        }
-    }
-
-    /**
-     * Sets the case fold
-     *
-     * @param string|null $caseFold
-     */
-    public function setCaseFold($caseFold)
-    {
-        $this->_caseFold = self::_sanitizeCaseFold($caseFold, self::$_defaultCaseFold);
-    }
-
-    /**
-     * Return DN as a string
-     *
-     * @param  string $caseFold
-     * @return string
-     * @throws Zend_Ldap_Exception
-     */
-    public function toString($caseFold = null)
-    {
-        $caseFold = self::_sanitizeCaseFold($caseFold, $this->_caseFold);
-        return self::implodeDn($this->_dn, $caseFold);
-    }
-
-    /**
-     * Return DN as an array
-     *
-     * @param  string $caseFold
-     * @return array
-     */
-    public function toArray($caseFold = null)
-    {
-        $caseFold = self::_sanitizeCaseFold($caseFold, $this->_caseFold);
-
-        if ($caseFold === self::ATTR_CASEFOLD_NONE) {
-            return $this->_dn;
-        } else {
-            return self::_caseFoldDn($this->_dn, $caseFold);
-        }
-    }
-
-    /**
-     * Do a case folding on a RDN
-     *
-     * @param  array  $part
-     * @param  string $caseFold
-     * @return array
-     */
-    protected static function _caseFoldRdn(array $part, $caseFold)
-    {
-        switch ($caseFold) {
-            case self::ATTR_CASEFOLD_UPPER:
-                return array_change_key_case($part, CASE_UPPER);
-            case self::ATTR_CASEFOLD_LOWER:
-                return array_change_key_case($part, CASE_LOWER);
-            case self::ATTR_CASEFOLD_NONE:
-            default:
-                return $part;
-        }
-    }
-
-    /**
-     * Do a case folding on a DN ort part of it
-     *
-     * @param  array  $dn
-     * @param  string $caseFold
-     * @return array
-     */
-    protected static function _caseFoldDn(array $dn, $caseFold)
-    {
-        $return = array();
-        foreach ($dn as $part) {
-            $return[] = self::_caseFoldRdn($part, $caseFold);
-        }
-        return $return;
-    }
-
-    /**
-     * Cast to string representation {@see toString()}
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Required by the ArrayAccess implementation
-     *
-     * @param  int $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        $offset = (int)$offset;
-        if ($offset < 0 || $offset >= count($this->_dn)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Proxy to {@see get()}
-     * Required by the ArrayAccess implementation
-     *
-     * @param  int $offset
-     * @return array
-     */
-     public function offsetGet($offset)
-     {
-         return $this->get($offset, 1, null);
-     }
-
-     /**
-      * Proxy to {@see set()}
-      * Required by the ArrayAccess implementation
-      *
-      * @param int   $offset
-      * @param array $value
-      */
-     public function offsetSet($offset, $value)
-     {
-         $this->set($offset, $value);
-     }
-
-     /**
-      * Proxy to {@see remove()}
-      * Required by the ArrayAccess implementation
-      *
-      * @param int $offset
-      */
-     public function offsetUnset($offset)
-     {
-         $this->remove($offset, 1);
-     }
-
-    /**
-     * Sets the default case fold
-     *
-     * @param string $caseFold
-     */
-    public static function setDefaultCaseFold($caseFold)
-    {
-        self::$_defaultCaseFold = self::_sanitizeCaseFold($caseFold, self::ATTR_CASEFOLD_NONE);
-    }
-
-    /**
-     * Sanitizes the case fold
-     *
-     * @param  string $caseFold
-     * @return string
-     */
-    protected static function _sanitizeCaseFold($caseFold, $default)
-    {
-        switch ($caseFold) {
-            case self::ATTR_CASEFOLD_NONE:
-            case self::ATTR_CASEFOLD_UPPER:
-            case self::ATTR_CASEFOLD_LOWER:
-                return $caseFold;
-                break;
-            default:
-                return $default;
-                break;
-        }
-    }
-
-    /**
-     * Escapes a DN value according to RFC 2253
-     *
-     * Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
-     * The characters ",", "+", """, "\", "<", ">", ";", "#", " = " with a special meaning in RFC 2252
-     * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
-     * Finally all leading and trailing spaces are converted to sequences of \20.
-     * @see Net_LDAP2_Util::escape_dn_value() from Benedikt Hallinger <beni@php.net>
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>
-     *
-     * @param  string|array $values An array containing the DN values that should be escaped
-     * @return array The array $values, but escaped
-     */
-    public static function escapeValue($values = array())
-    {
-        /**
-         * @see Zend_Ldap_Converter
-         */
-        require_once 'Zend/Ldap/Converter.php';
-
-        if (!is_array($values)) $values = array($values);
-        foreach ($values as $key => $val) {
-            // Escaping of filter meta characters
-            $val = str_replace(array('\\', ',', '+', '"', '<', '>', ';', '#', '=', ),
-                array('\\\\', '\,', '\+', '\"', '\<', '\>', '\;', '\#', '\='), $val);
-            $val = Zend_Ldap_Converter::ascToHex32($val);
-
-            // Convert all leading and trailing spaces to sequences of \20.
-            if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) {
-                $val = $matches[2];
-                for ($i = 0; $i<strlen($matches[1]); $i++) {
-                    $val = '\20' . $val;
-                }
-                for ($i = 0; $i<strlen($matches[3]); $i++) {
-                    $val = $val . '\20';
-                }
-            }
-            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
-            $values[$key] = $val;
-        }
-        return (count($values) == 1) ? $values[0] : $values;
-    }
-
-    /**
-     * Undoes the conversion done by {@link escapeValue()}.
-     *
-     * Any escape sequence starting with a baskslash - hexpair or special character -
-     * will be transformed back to the corresponding character.
-     * @see Net_LDAP2_Util::escape_dn_value() from Benedikt Hallinger <beni@php.net>
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>
-     *
-     * @param  string|array $values Array of DN Values
-     * @return array Same as $values, but unescaped
-     */
-    public static function unescapeValue($values = array())
-    {
-        /**
-         * @see Zend_Ldap_Converter
-         */
-        require_once 'Zend/Ldap/Converter.php';
-
-        if (!is_array($values)) $values = array($values);
-        foreach ($values as $key => $val) {
-            // strip slashes from special chars
-            $val = str_replace(array('\\\\', '\,', '\+', '\"', '\<', '\>', '\;', '\#', '\='),
-                array('\\', ',', '+', '"', '<', '>', ';', '#', '=', ), $val);
-            $values[$key] = Zend_Ldap_Converter::hex32ToAsc($val);
-        }
-        return (count($values) == 1) ? $values[0] : $values;
-    }
-
-    /**
-     * Creates an array containing all parts of the given DN.
-     *
-     * Array will be of type
-     * array(
-     *      array("cn" => "name1", "uid" => "user"),
-     *      array("cn" => "name2"),
-     *      array("dc" => "example"),
-     *      array("dc" => "org")
-     * )
-     * for a DN of cn=name1+uid=user,cn=name2,dc=example,dc=org.
-     *
-     * @param  string $dn
-     * @param  array  $keys     An optional array to receive DN keys (e.g. CN, OU, DC, ...)
-     * @param  array  $vals     An optional array to receive DN values
-     * @param  string $caseFold
-     * @return array
-     * @throws Zend_Ldap_Exception
-     */
-    public static function explodeDn($dn, array &$keys = null, array &$vals = null,
-        $caseFold = self::ATTR_CASEFOLD_NONE)
-    {
-        $k = array();
-        $v = array();
-        if (!self::checkDn($dn, $k, $v, $caseFold)) {
-            /**
-             * Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'DN is malformed');
-        }
-        $ret = array();
-        for ($i = 0; $i < count($k); $i++) {
-            if (is_array($k[$i]) && is_array($v[$i]) && (count($k[$i]) === count($v[$i]))) {
-                $multi = array();
-                for ($j = 0; $j < count($k[$i]); $j++) {
-                    $key=$k[$i][$j];
-                    $val=$v[$i][$j];
-                    $multi[$key] = $val;
-                }
-                $ret[] = $multi;
-            } else if (is_string($k[$i]) && is_string($v[$i])) {
-                $ret[] = array($k[$i] => $v[$i]);
-            }
-        }
-        if (!is_null($keys)) $keys = $k;
-        if (!is_null($vals)) $vals = $v;
-        return $ret;
-    }
-
-    /**
-     * @param  string $dn       The DN to parse
-     * @param  array  $keys     An optional array to receive DN keys (e.g. CN, OU, DC, ...)
-     * @param  array  $vals     An optional array to receive DN values
-     * @param  string $caseFold
-     * @return boolean True if the DN was successfully parsed or false if the string is not a valid DN.
-     */
-    public static function checkDn($dn, array &$keys = null, array &$vals = null,
-        $caseFold = self::ATTR_CASEFOLD_NONE)
-    {
-        /* This is a classic state machine parser. Each iteration of the
-         * loop processes one character. State 1 collects the key. When equals ( = )
-         * is encountered the state changes to 2 where the value is collected
-         * until a comma (,) or semicolon (;) is encountered after which we switch back
-         * to state 1. If a backslash (\) is encountered, state 3 is used to collect the
-         * following character without engaging the logic of other states.
-         */
-        $key = null;
-        $value = null;
-        $slen = strlen($dn);
-        $state = 1;
-        $ko = $vo = 0;
-        $multi = false;
-        $ka = array();
-        $va = array();
-        for ($di = 0; $di <= $slen; $di++) {
-            $ch = ($di == $slen) ? 0 : $dn[$di];
-            switch ($state) {
-                case 1: // collect key
-                    if ($ch === '=') {
-                        $key = trim(substr($dn, $ko, $di - $ko));
-                        if ($caseFold == self::ATTR_CASEFOLD_LOWER) $key = strtolower($key);
-                        else if ($caseFold == self::ATTR_CASEFOLD_UPPER) $key = strtoupper($key);
-                        if (is_array($multi)) {
-                            $keyId = strtolower($key);
-                            if (in_array($keyId, $multi)) {
-                                return false;
-                            }
-                            $ka[count($ka)-1][] = $key;
-                            $multi[] = $keyId;
-                        } else {
-                            $ka[] = $key;
-                        }
-                        $state = 2;
-                        $vo = $di + 1;
-                    } else if ($ch === ',' || $ch === ';' || $ch === '+') {
-                        return false;
-                    }
-                    break;
-                case 2: // collect value
-                    if ($ch === '\\') {
-                        $state = 3;
-                    } else if ($ch === ',' || $ch === ';' || $ch === 0 || $ch === '+') {
-                        $value = self::unescapeValue(trim(substr($dn, $vo, $di - $vo)));
-                        if (is_array($multi)) {
-                            $va[count($va)-1][] = $value;
-                        } else {
-                            $va[] = $value;
-                        }
-                        $state = 1;
-                        $ko = $di + 1;
-                        if ($ch === '+' && $multi === false) {
-                            $lastKey = array_pop($ka);
-                            $lastVal = array_pop($va);
-                            $ka[] = array($lastKey);
-                            $va[] = array($lastVal);
-                            $multi = array(strtolower($lastKey));
-                        } else if ($ch === ','|| $ch === ';' || $ch === 0) {
-                            $multi = false;
-                        }
-                    } else if ($ch === '=') {
-                        return false;
-                    }
-                    break;
-                case 3: // escaped
-                    $state = 2;
-                    break;
-            }
-        }
-
-        if ($keys !== null) {
-            $keys = $ka;
-        }
-        if ($vals !== null) {
-            $vals = $va;
-        }
-
-        return ($state === 1 && $ko > 0);
-    }
-
-    /**
-     * Returns a DN part in the form $attribute = $value
-     *
-     * This method supports the creation of multi-valued RDNs
-     * $part must contain an even number of elemets.
-     *
-     * @param  array  $attribute
-     * @param  string $caseFold
-     * @return string
-     * @throws Zend_Ldap_Exception
-     */
-    public static function implodeRdn(array $part, $caseFold = null)
-    {
-        self::_assertRdn($part);
-        $part = self::_caseFoldRdn($part, $caseFold);
-        $rdnParts = array();
-        foreach ($part as $key => $value) {
-            $value = self::escapeValue($value);
-            $keyId = strtolower($key);
-            $rdnParts[$keyId] =  implode('=', array($key, $value));
-        }
-        ksort($rdnParts, SORT_STRING);
-        return implode('+', $rdnParts);
-    }
-
-    /**
-     * Implodes an array in the form delivered by {@link explodeDn()}
-     * to a DN string.
-     *
-     * $dnArray must be of type
-     * array(
-     *      array("cn" => "name1", "uid" => "user"),
-     *      array("cn" => "name2"),
-     *      array("dc" => "example"),
-     *      array("dc" => "org")
-     * )
-     *
-     * @param  array  $dnArray
-     * @param  string $caseFold
-     * @param  string $separator
-     * @return string
-     * @throws Zend_Ldap_Exception
-     */
-    public static function implodeDn(array $dnArray, $caseFold = null, $separator = ',')
-    {
-        $parts = array();
-        foreach ($dnArray as $p) {
-            $parts[] = self::implodeRdn($p, $caseFold);
-        }
-        return implode($separator, $parts);
-    }
-
-    /**
-     * Checks if given $childDn is beneath $parentDn subtree.
-     *
-     * @param  string|Zend_Ldap_Dn $childDn
-     * @param  string|Zend_Ldap_Dn $parentDn
-     * @return boolean
-     */
-    public static function isChildOf($childDn, $parentDn)
-    {
-        try {
-            $keys = array();
-            $vals = array();
-            if ($childDn instanceof Zend_Ldap_Dn) {
-                $cdn = $childDn->toArray(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-            } else {
-                $cdn = self::explodeDn($childDn, $keys, $vals, Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-            }
-            if ($parentDn instanceof Zend_Ldap_Dn) {
-                $pdn = $parentDn->toArray(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-            } else {
-                $pdn = self::explodeDn($parentDn, $keys, $vals, Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-            }
-        }
-        catch (Zend_Ldap_Exception $e) {
-            return false;
-        }
-
-        $startIndex = count($cdn)-count($pdn);
-        if ($startIndex<0) return false;
-        for ($i = 0; $i<count($pdn); $i++) {
-            if ($cdn[$i+$startIndex] != $pdn[$i]) return false;
-        }
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Exception.php b/airtime_mvc/library/Zend/Ldap/Exception.php
deleted file mode 100644
index e215c898b..000000000
--- a/airtime_mvc/library/Zend/Ldap/Exception.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Ldap
- * @uses       Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Exception extends Zend_Exception
-{
-    const LDAP_SUCCESS                        = 0x00;
-    const LDAP_OPERATIONS_ERROR               = 0x01;
-    const LDAP_PROTOCOL_ERROR                 = 0x02;
-    const LDAP_TIMELIMIT_EXCEEDED             = 0x03;
-    const LDAP_SIZELIMIT_EXCEEDED             = 0x04;
-    const LDAP_COMPARE_FALSE                  = 0x05;
-    const LDAP_COMPARE_TRUE                   = 0x06;
-    const LDAP_AUTH_METHOD_NOT_SUPPORTED      = 0x07;
-    const LDAP_STRONG_AUTH_REQUIRED           = 0x08;
-    const LDAP_PARTIAL_RESULTS                = 0x09;
-    const LDAP_REFERRAL                       = 0x0a;
-    const LDAP_ADMINLIMIT_EXCEEDED            = 0x0b;
-    const LDAP_UNAVAILABLE_CRITICAL_EXTENSION = 0x0c;
-    const LDAP_CONFIDENTIALITY_REQUIRED       = 0x0d;
-    const LDAP_SASL_BIND_IN_PROGRESS          = 0x0e;
-    const LDAP_NO_SUCH_ATTRIBUTE              = 0x10;
-    const LDAP_UNDEFINED_TYPE                 = 0x11;
-    const LDAP_INAPPROPRIATE_MATCHING         = 0x12;
-    const LDAP_CONSTRAINT_VIOLATION           = 0x13;
-    const LDAP_TYPE_OR_VALUE_EXISTS           = 0x14;
-    const LDAP_INVALID_SYNTAX                 = 0x15;
-    const LDAP_NO_SUCH_OBJECT                 = 0x20;
-    const LDAP_ALIAS_PROBLEM                  = 0x21;
-    const LDAP_INVALID_DN_SYNTAX              = 0x22;
-    const LDAP_IS_LEAF                        = 0x23;
-    const LDAP_ALIAS_DEREF_PROBLEM            = 0x24;
-    const LDAP_PROXY_AUTHZ_FAILURE            = 0x2F;
-    const LDAP_INAPPROPRIATE_AUTH             = 0x30;
-    const LDAP_INVALID_CREDENTIALS            = 0x31;
-    const LDAP_INSUFFICIENT_ACCESS            = 0x32;
-    const LDAP_BUSY                           = 0x33;
-    const LDAP_UNAVAILABLE                    = 0x34;
-    const LDAP_UNWILLING_TO_PERFORM           = 0x35;
-    const LDAP_LOOP_DETECT                    = 0x36;
-    const LDAP_NAMING_VIOLATION               = 0x40;
-    const LDAP_OBJECT_CLASS_VIOLATION         = 0x41;
-    const LDAP_NOT_ALLOWED_ON_NONLEAF         = 0x42;
-    const LDAP_NOT_ALLOWED_ON_RDN             = 0x43;
-    const LDAP_ALREADY_EXISTS                 = 0x44;
-    const LDAP_NO_OBJECT_CLASS_MODS           = 0x45;
-    const LDAP_RESULTS_TOO_LARGE              = 0x46;
-    const LDAP_AFFECTS_MULTIPLE_DSAS          = 0x47;
-    const LDAP_OTHER                          = 0x50;
-    const LDAP_SERVER_DOWN                    = 0x51;
-    const LDAP_LOCAL_ERROR                    = 0x52;
-    const LDAP_ENCODING_ERROR                 = 0x53;
-    const LDAP_DECODING_ERROR                 = 0x54;
-    const LDAP_TIMEOUT                        = 0x55;
-    const LDAP_AUTH_UNKNOWN                   = 0x56;
-    const LDAP_FILTER_ERROR                   = 0x57;
-    const LDAP_USER_CANCELLED                 = 0x58;
-    const LDAP_PARAM_ERROR                    = 0x59;
-    const LDAP_NO_MEMORY                      = 0x5a;
-    const LDAP_CONNECT_ERROR                  = 0x5b;
-    const LDAP_NOT_SUPPORTED                  = 0x5c;
-    const LDAP_CONTROL_NOT_FOUND              = 0x5d;
-    const LDAP_NO_RESULTS_RETURNED            = 0x5e;
-    const LDAP_MORE_RESULTS_TO_RETURN         = 0x5f;
-    const LDAP_CLIENT_LOOP                    = 0x60;
-    const LDAP_REFERRAL_LIMIT_EXCEEDED        = 0x61;
-    const LDAP_CUP_RESOURCES_EXHAUSTED        = 0x71;
-    const LDAP_CUP_SECURITY_VIOLATION         = 0x72;
-    const LDAP_CUP_INVALID_DATA               = 0x73;
-    const LDAP_CUP_UNSUPPORTED_SCHEME         = 0x74;
-    const LDAP_CUP_RELOAD_REQUIRED            = 0x75;
-    const LDAP_CANCELLED                      = 0x76;
-    const LDAP_NO_SUCH_OPERATION              = 0x77;
-    const LDAP_TOO_LATE                       = 0x78;
-    const LDAP_CANNOT_CANCEL                  = 0x79;
-    const LDAP_ASSERTION_FAILED               = 0x7A;
-    const LDAP_SYNC_REFRESH_REQUIRED          = 0x1000;
-    const LDAP_X_SYNC_REFRESH_REQUIRED        = 0x4100;
-    const LDAP_X_NO_OPERATION                 = 0x410e;
-    const LDAP_X_ASSERTION_FAILED             = 0x410f;
-    const LDAP_X_NO_REFERRALS_FOUND           = 0x4110;
-    const LDAP_X_CANNOT_CHAIN                 = 0x4111;
-
-    /* internal error code constants */
-
-    const LDAP_X_DOMAIN_MISMATCH              = 0x7001;
-    const LDAP_X_EXTENSION_NOT_LOADED         = 0x7002;
-
-    /**
-     * @param Zend_Ldap $ldap A Zend_Ldap object
-     * @param string    $str  An informtive exception message
-     * @param int       $code An LDAP error code
-     */
-    public function __construct(Zend_Ldap $ldap = null, $str = null, $code = 0)
-    {
-        $errorMessages = array();
-        $message = '';
-        if ($ldap !== null) {
-            $oldCode = $code;
-            $message = $ldap->getLastError($code, $errorMessages) . ': ';
-            if ($code === 0) {
-                $message = '';
-                $code = $oldCode;
-            }
-        }
-        if (empty($message)) {
-            if ($code > 0) {
-                $message = '0x' . dechex($code) . ': ';
-            }
-        }
-
-        if (!empty($str)) {
-            $message .= $str;
-        } else {
-            $message .= 'no exception message';
-        }
-
-        parent::__construct($message, $code);
-    }
-
-
-    /**
-     * @deprecated not necessary any more - will be removed
-     * @param Zend_Ldap $ldap A Zend_Ldap object
-     * @return int The current error code for the resource
-     */
-    public static function getLdapCode(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            return $ldap->getLastErrorCode();
-        }
-        return 0;
-    }
-
-    /**
-     * @deprecated will be removed
-     * @return int The current error code for this exception
-     */
-    public function getErrorCode()
-    {
-        return $this->getCode();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Ldap/Filter.php b/airtime_mvc/library/Zend/Ldap/Filter.php
deleted file mode 100644
index 013a63cf0..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Filter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_String
- */
-require_once 'Zend/Ldap/Filter/String.php';
-
-/**
- * Zend_Ldap_Filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter extends Zend_Ldap_Filter_String
-{
-    const TYPE_EQUALS         = '=';
-    const TYPE_GREATER        = '>';
-    const TYPE_GREATEROREQUAL = '>=';
-    const TYPE_LESS           = '<';
-    const TYPE_LESSOREQUAL    = '<=';
-    const TYPE_APPROX         = '~=';
-
-    /**
-     * Creates an 'equals' filter.
-     * (attr=value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function equals($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_EQUALS, null, null);
-    }
-
-    /**
-     * Creates a 'begins with' filter.
-     * (attr=value*)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function begins($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_EQUALS, null, '*');
-    }
-
-    /**
-     * Creates an 'ends with' filter.
-     * (attr=*value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function ends($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_EQUALS, '*', null);
-    }
-
-    /**
-     * Creates a 'contains' filter.
-     * (attr=*value*)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function contains($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_EQUALS, '*', '*');
-    }
-
-    /**
-     * Creates a 'greater' filter.
-     * (attr>value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function greater($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_GREATER, null, null);
-    }
-
-    /**
-     * Creates a 'greater or equal' filter.
-     * (attr>=value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function greaterOrEqual($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_GREATEROREQUAL, null, null);
-    }
-
-    /**
-     * Creates a 'less' filter.
-     * (attr<value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function less($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_LESS, null, null);
-    }
-
-    /**
-     * Creates an 'less or equal' filter.
-     * (attr<=value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function lessOrEqual($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_LESSOREQUAL, null, null);
-    }
-
-    /**
-     * Creates an 'approx' filter.
-     * (attr~=value)
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @return Zend_Ldap_Filter
-     */
-    public static function approx($attr, $value)
-    {
-        return new self($attr, $value, self::TYPE_APPROX, null, null);
-    }
-
-    /**
-     * Creates an 'any' filter.
-     * (attr=*)
-     *
-     * @param  string $attr
-     * @return Zend_Ldap_Filter
-     */
-    public static function any($attr)
-    {
-        return new self($attr, '', self::TYPE_EQUALS, '*', null);
-    }
-
-    /**
-     * Creates a simple custom string filter.
-     *
-     * @param  string $filter
-     * @return Zend_Ldap_Filter_String
-     */
-    public static function string($filter)
-    {
-        return new Zend_Ldap_Filter_String($filter);
-    }
-
-    /**
-     * Creates a simple string filter to be used with a mask.
-     *
-     * @param string $mask
-     * @param string $value
-     * @return Zend_Ldap_Filter_Mask
-     */
-    public static function mask($mask, $value)
-    {
-        /**
-         * Zend_Ldap_Filter_Mask
-         */
-        require_once 'Zend/Ldap/Filter/Mask.php';
-        return new Zend_Ldap_Filter_Mask($mask, $value);
-    }
-
-    /**
-     * Creates an 'and' filter.
-     *
-     * @param  Zend_Ldap_Filter_Abstract $filter,...
-     * @return Zend_Ldap_Filter_And
-     */
-    public static function andFilter($filter)
-    {
-        /**
-         * Zend_Ldap_Filter_And
-         */
-        require_once 'Zend/Ldap/Filter/And.php';
-        return new Zend_Ldap_Filter_And(func_get_args());
-    }
-
-    /**
-     * Creates an 'or' filter.
-     *
-     * @param  Zend_Ldap_Filter_Abstract $filter,...
-     * @return Zend_Ldap_Filter_Or
-     */
-    public static function orFilter($filter)
-    {
-        /**
-         * Zend_Ldap_Filter_Or
-         */
-        require_once 'Zend/Ldap/Filter/Or.php';
-        return new Zend_Ldap_Filter_Or(func_get_args());
-    }
-
-    /**
-     * Create a filter string.
-     *
-     * @param  string $attr
-     * @param  string $value
-     * @param  string $filtertype
-     * @param  string $prepend
-     * @param  string $append
-     * @return string
-     */
-    private static function _createFilterString($attr, $value, $filtertype, $prepend = null, $append = null)
-    {
-        $str = $attr . $filtertype;
-        if (!is_null($prepend)) $str .= $prepend;
-        $str .= self::escapeValue($value);
-        if (!is_null($append)) $str .= $append;
-        return $str;
-    }
-
-    /**
-     * Creates a new Zend_Ldap_Filter.
-     *
-     * @param string $attr
-     * @param string $value
-     * @param string $filtertype
-     * @param string $prepend
-     * @param string $append
-     */
-    public function __construct($attr, $value, $filtertype, $prepend = null, $append = null)
-    {
-        $filter = self::_createFilterString($attr, $value, $filtertype, $prepend, $append);
-        parent::__construct($filter);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Abstract.php b/airtime_mvc/library/Zend/Ldap/Filter/Abstract.php
deleted file mode 100644
index 7423d650d..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Abstract.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Filter_Abstract provides a base implementation for filters.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Ldap_Filter_Abstract
-{
-    /**
-     * Returns a string representation of the filter.
-     *
-     * @return string
-     */
-    abstract public function toString();
-
-    /**
-     * Returns a string representation of the filter.
-     * @see toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Negates the filter.
-     *
-     * @return Zend_Ldap_Filter_Abstract
-     */
-    public function negate()
-    {
-        /**
-         * Zend_Ldap_Filter_Not
-         */
-        require_once 'Zend/Ldap/Filter/Not.php';
-        return new Zend_Ldap_Filter_Not($this);
-    }
-
-    /**
-     * Creates an 'and' filter.
-     *
-     * @param  Zend_Ldap_Filter_Abstract $filter,...
-     * @return Zend_Ldap_Filter_And
-     */
-    public function addAnd($filter)
-    {
-        /**
-         * Zend_Ldap_Filter_And
-         */
-        require_once 'Zend/Ldap/Filter/And.php';
-        $fa = func_get_args();
-        $args = array_merge(array($this), $fa);
-        return new Zend_Ldap_Filter_And($args);
-    }
-
-    /**
-     * Creates an 'or' filter.
-     *
-     * @param  Zend_Ldap_Filter_Abstract $filter,...
-     * @return Zend_Ldap_Filter_Or
-     */
-    public function addOr($filter)
-    {
-        /**
-         * Zend_Ldap_Filter_Or
-         */
-        require_once 'Zend/Ldap/Filter/Or.php';
-        $fa = func_get_args();
-        $args = array_merge(array($this), $fa);
-        return new Zend_Ldap_Filter_Or($args);
-    }
-
-    /**
-     * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters.
-     *
-     * Any control characters with an ACII code < 32 as well as the characters with special meaning in
-     * LDAP filters "*", "(", ")", and "\" (the backslash) are converted into the representation of a
-     * backslash followed by two hex digits representing the hexadecimal value of the character.
-     * @see Net_LDAP2_Util::escape_filter_value() from Benedikt Hallinger <beni@php.net>
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>
-     *
-     * @param  string|array $values Array of values to escape
-     * @return array Array $values, but escaped
-     */
-    public static function escapeValue($values = array())
-    {
-        /**
-         * @see Zend_Ldap_Converter
-         */
-        require_once 'Zend/Ldap/Converter.php';
-
-        if (!is_array($values)) $values = array($values);
-        foreach ($values as $key => $val) {
-            // Escaping of filter meta characters
-            $val = str_replace(array('\\', '*', '(', ')'), array('\5c', '\2a', '\28', '\29'), $val);
-            // ASCII < 32 escaping
-            $val = Zend_Ldap_Converter::ascToHex32($val);
-            if (null === $val) $val = '\0';  // apply escaped "null" if string is empty
-            $values[$key] = $val;
-        }
-        return (count($values) == 1) ? $values[0] : $values;
-    }
-
-    /**
-     * Undoes the conversion done by {@link escapeValue()}.
-     *
-     * Converts any sequences of a backslash followed by two hex digits into the corresponding character.
-     * @see Net_LDAP2_Util::escape_filter_value() from Benedikt Hallinger <beni@php.net>
-     * @link http://pear.php.net/package/Net_LDAP2
-     * @author Benedikt Hallinger <beni@php.net>
-     *
-     * @param  string|array $values Array of values to escape
-     * @return array Array $values, but unescaped
-     */
-    public static function unescapeValue($values = array())
-    {
-        /**
-         * @see Zend_Ldap_Converter
-         */
-        require_once 'Zend/Ldap/Converter.php';
-
-        if (!is_array($values)) $values = array($values);
-        foreach ($values as $key => $value) {
-            // Translate hex code into ascii
-            $values[$key] = Zend_Ldap_Converter::hex32ToAsc($value);
-        }
-        return (count($values) == 1) ? $values[0] : $values;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/And.php b/airtime_mvc/library/Zend/Ldap/Filter/And.php
deleted file mode 100644
index 378a38577..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/And.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: And.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_Logical
- */
-require_once 'Zend/Ldap/Filter/Logical.php';
-
-/**
- * Zend_Ldap_Filter_And provides an 'and' filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_And extends Zend_Ldap_Filter_Logical
-{
-    /**
-     * Creates an 'and' grouping filter.
-     *
-     * @param array $subfilters
-     */
-    public function __construct(array $subfilters)
-    {
-        parent::__construct($subfilters, self::TYPE_AND);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Exception.php b/airtime_mvc/library/Zend/Ldap/Filter/Exception.php
deleted file mode 100644
index a13a84039..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Logical.php b/airtime_mvc/library/Zend/Ldap/Filter/Logical.php
deleted file mode 100644
index 5b683af1f..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Logical.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Logical.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_Abstract
- */
-require_once 'Zend/Ldap/Filter/Abstract.php';
-/**
- * @see Zend_Ldap_Filter_String
- */
-require_once 'Zend/Ldap/Filter/String.php';
-
-/**
- * Zend_Ldap_Filter_Logical provides a base implementation for a grouping filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract
-{
-    const TYPE_AND = '&';
-    const TYPE_OR  = '|';
-
-    /**
-     * All the sub-filters for this grouping filter.
-     *
-     * @var array
-     */
-    private $_subfilters;
-
-    /**
-     * The grouping symbol.
-     *
-     * @var string
-     */
-    private $_symbol;
-
-    /**
-     * Creates a new grouping filter.
-     *
-     * @param array  $subfilters
-     * @param string $symbol
-     */
-    protected function __construct(array $subfilters, $symbol)
-    {
-        foreach ($subfilters as $key => $s) {
-            if (is_string($s)) $subfilters[$key] = new Zend_Ldap_Filter_String($s);
-            else if (!($s instanceof Zend_Ldap_Filter_Abstract)) {
-                /**
-                 * @see Zend_Ldap_Filter_Exception
-                 */
-                require_once 'Zend/Ldap/Filter/Exception.php';
-                throw new Zend_Ldap_Filter_Exception('Only strings or Zend_Ldap_Filter_Abstract allowed.');
-            }
-        }
-        $this->_subfilters = $subfilters;
-        $this->_symbol = $symbol;
-    }
-
-    /**
-     * Adds a filter to this grouping filter.
-     *
-     * @param  Zend_Ldap_Filter_Abstract $filter
-     * @return Zend_Ldap_Filter_Logical
-     */
-    public function addFilter(Zend_Ldap_Filter_Abstract $filter)
-    {
-        $new = clone $this;
-        $new->_subfilters[] = $filter;
-        return $new;
-    }
-
-    /**
-     * Returns a string representation of the filter.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $return = '(' . $this->_symbol;
-        foreach ($this->_subfilters as $sub) $return .= $sub->toString();
-        $return .= ')';
-        return $return;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Mask.php b/airtime_mvc/library/Zend/Ldap/Filter/Mask.php
deleted file mode 100644
index 1a6b6b9bb..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Mask.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mask.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_String
- */
-require_once 'Zend/Ldap/Filter/String.php';
-
-
-/**
- * Zend_Ldap_Filter_Mask provides a simple string filter to be used with a mask.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_Mask extends Zend_Ldap_Filter_String
-{
-    /**
-     * Creates a Zend_Ldap_Filter_String.
-     *
-     * @param string $mask
-     * @param string $value,...
-     */
-    public function __construct($mask, $value)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        for ($i = 0; $i<count($args); $i++) {
-            $args[$i] = self::escapeValue($args[$i]);
-        }
-        $filter = vsprintf($mask, $args);
-        parent::__construct($filter);
-    }
-
-    /**
-     * Returns a string representation of the filter.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->_filter;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Not.php b/airtime_mvc/library/Zend/Ldap/Filter/Not.php
deleted file mode 100644
index 105a83c3b..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Not.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Not.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_Abstract
- */
-require_once 'Zend/Ldap/Filter/Abstract.php';
-
-/**
- * Zend_Ldap_Filter_Not provides a negation filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_Not extends Zend_Ldap_Filter_Abstract
-{
-    /**
-     * The underlying filter.
-     *
-     * @var Zend_Ldap_Filter_Abstract
-     */
-    private $_filter;
-
-    /**
-     * Creates a Zend_Ldap_Filter_Not.
-     *
-     * @param Zend_Ldap_Filter_Abstract $filter
-     */
-    public function __construct(Zend_Ldap_Filter_Abstract $filter)
-    {
-        $this->_filter = $filter;
-    }
-
-    /**
-     * Negates the filter.
-     *
-     * @return Zend_Ldap_Filter_Abstract
-     */
-    public function negate()
-    {
-        return $this->_filter;
-    }
-
-    /**
-     * Returns a string representation of the filter.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return '(!' . $this->_filter->toString() . ')';
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/Or.php b/airtime_mvc/library/Zend/Ldap/Filter/Or.php
deleted file mode 100644
index 0da4cc4e5..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/Or.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Or.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_Logical
- */
-require_once 'Zend/Ldap/Filter/Logical.php';
-
-/**
- * Zend_Ldap_Filter_Or provides an 'or' filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_Or extends Zend_Ldap_Filter_Logical
-{
-    /**
-     * Creates an 'or' grouping filter.
-     *
-     * @param array $subfilters
-     */
-    public function __construct(array $subfilters)
-    {
-        parent::__construct($subfilters, self::TYPE_OR);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Filter/String.php b/airtime_mvc/library/Zend/Ldap/Filter/String.php
deleted file mode 100644
index b1c677afa..000000000
--- a/airtime_mvc/library/Zend/Ldap/Filter/String.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Filter_Abstract
- */
-require_once 'Zend/Ldap/Filter/Abstract.php';
-
-/**
- * Zend_Ldap_Filter_String provides a simple custom string filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Filter_String extends Zend_Ldap_Filter_Abstract
-{
-    /**
-     * The filter.
-     *
-     * @var string
-     */
-    protected $_filter;
-
-    /**
-     * Creates a Zend_Ldap_Filter_String.
-     *
-     * @param string $filter
-     */
-    public function __construct($filter)
-    {
-        $this->_filter = $filter;
-    }
-
-    /**
-     * Returns a string representation of the filter.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return '(' . $this->_filter . ')';
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Ldif/Encoder.php b/airtime_mvc/library/Zend/Ldap/Ldif/Encoder.php
deleted file mode 100644
index fcc613a24..000000000
--- a/airtime_mvc/library/Zend/Ldap/Ldif/Encoder.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Ldif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Encoder.php 21007 2010-02-09 13:40:16Z sgehrig $
- */
-
-/**
- * Zend_Ldap_Ldif_Encoder provides methods to encode and decode LDAP data into/from LDIF.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Ldif
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Ldif_Encoder
-{
-    /**
-     * Additional options used during encoding
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'sort'    => true,
-        'version' => 1,
-        'wrap'    => 78
-    );
-
-    /**
-     * @var boolean
-     */
-    protected $_versionWritten = false;
-
-    /**
-     * Constructor.
-     *
-     * @param  array $options Additional options used during encoding
-     * @return void
-     */
-    protected function __construct(array $options = array())
-    {
-        $this->_options = array_merge($this->_options, $options);
-    }
-
-    /**
-     * Decodes the string $string into an array of LDIF items
-     *
-     * @param  string $string
-     * @return array
-     */
-    public static function decode($string)
-    {
-        $encoder = new self(array());
-        return $encoder->_decode($string);
-    }
-
-    /**
-     * Decodes the string $string into an array of LDIF items
-     *
-     * @param  string $string
-     * @return array
-     */
-    protected function _decode($string)
-    {
-        $items = array();
-        $item = array();
-        $last = null;
-        foreach (explode("\n", $string) as $line) {
-            $line = rtrim($line, "\x09\x0A\x0D\x00\x0B");
-            $matches = array();
-            if (substr($line, 0, 1) === ' ' && $last !== null) {
-                $last[2] .= substr($line, 1);
-            } else if (substr($line, 0, 1) === '#') {
-                continue;
-            } else if (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^:<]*)$/i', $line, $matches)) {
-                $name = strtolower($matches[1]);
-                $type = trim($matches[2]);
-                $value = $matches[3];
-                if ($last !== null) {
-                    $this->_pushAttribute($last, $item);
-                }
-                if ($name === 'version') {
-                    continue;
-                } else if (count($item) > 0 && $name === 'dn') {
-                    $items[] = $item;
-                    $item = array();
-                    $last = null;
-                }
-                $last = array($name, $type, $value);
-            } else if (trim($line) === '') {
-                continue;
-            }
-        }
-        if ($last !== null) {
-            $this->_pushAttribute($last, $item);
-        }
-        $items[] = $item;
-        return (count($items)>1) ? $items : $items[0];
-    }
-
-    /**
-     * Pushes a decoded attribute to the stack
-     *
-     * @param array $attribute
-     * @param array $entry
-     */
-    protected function _pushAttribute(array $attribute, array &$entry)
-    {
-        $name = $attribute[0];
-        $type = $attribute[1];
-        $value = $attribute[2];
-        if ($type === '::') {
-            $value = base64_decode($value);
-        }
-        if ($name === 'dn') {
-            $entry[$name] = $value;
-        } else if (isset($entry[$name]) && $value !== '') {
-            $entry[$name][] = $value;
-        } else {
-            $entry[$name] = ($value !== '') ? array($value) : array();
-        }
-    }
-
-    /**
-     * Encode $value into a LDIF representation
-     *
-     * @param  mixed $value   The value to be encoded
-     * @param  array $options Additional options used during encoding
-     * @return string The encoded value
-     */
-    public static function encode($value, array $options = array())
-    {
-        $encoder = new self($options);
-        return $encoder->_encode($value);
-    }
-
-    /**
-     * Recursive driver which determines the type of value to be encoded
-     * and then dispatches to the appropriate method.
-     *
-     * @param  mixed $value The value to be encoded
-     * @return string Encoded value
-     */
-    protected function _encode($value)
-    {
-        if (is_scalar($value)) {
-            return $this->_encodeString($value);
-        } else if (is_array($value)) {
-            return $this->_encodeAttributes($value);
-        } else if ($value instanceof Zend_Ldap_Node) {
-            return $value->toLdif($this->_options);
-        }
-        return null;
-    }
-
-    /**
-     * Encodes $string according to RFC2849
-     *
-     * @link http://www.faqs.org/rfcs/rfc2849.html
-     *
-     * @param  string $string
-     * @param  boolen $base64
-     * @return string
-     */
-    protected function _encodeString($string, &$base64 = null)
-    {
-        $string = (string)$string;
-        if (!is_numeric($string) && empty($string)) {
-            return '';
-        }
-
-        /*
-         * SAFE-INIT-CHAR = %x01-09 / %x0B-0C / %x0E-1F /
-         *                  %x21-39 / %x3B / %x3D-7F
-         *                ; any value <= 127 except NUL, LF, CR,
-         *                ; SPACE, colon (":", ASCII 58 decimal)
-         *                ; and less-than ("<" , ASCII 60 decimal)
-         *
-         */
-        $unsafe_init_char = array(0, 10, 13, 32, 58, 60);
-        /*
-         * SAFE-CHAR      = %x01-09 / %x0B-0C / %x0E-7F
-         *                ; any value <= 127 decimal except NUL, LF,
-         *                ; and CR
-         */
-        $unsafe_char      = array(0, 10, 13);
-
-        $base64 = false;
-        for ($i = 0; $i < strlen($string); $i++) {
-            $char = ord(substr($string, $i, 1));
-            if ($char >= 127) {
-                $base64 = true;
-                break;
-            } else if ($i === 0 && in_array($char, $unsafe_init_char)) {
-                $base64 = true;
-                break;
-            } else if (in_array($char, $unsafe_char)) {
-                $base64 = true;
-                break;
-            }
-        }
-        // Test for ending space
-        if (substr($string, -1) == ' ') {
-            $base64 = true;
-        }
-
-        if ($base64 === true) {
-            $string = base64_encode($string);
-        }
-
-        return $string;
-    }
-
-    /**
-     * Encodes an attribute with $name and $value according to RFC2849
-     *
-     * @link http://www.faqs.org/rfcs/rfc2849.html
-     *
-     * @param  string       $name
-     * @param  array|string $value
-     * @return string
-     */
-    protected function _encodeAttribute($name, $value)
-    {
-        if (!is_array($value)) {
-            $value = array($value);
-        }
-
-        $output = '';
-
-        if (count($value) < 1) {
-            return $name . ': ';
-        }
-
-        foreach ($value as $v) {
-            $base64 = null;
-            $v = $this->_encodeString($v, $base64);
-            $attribute = $name . ':';
-            if ($base64 === true) {
-                $attribute .= ': ' . $v;
-            } else {
-                $attribute .= ' ' . $v;
-            }
-            if (isset($this->_options['wrap']) && strlen($attribute) > $this->_options['wrap']) {
-                $attribute = trim(chunk_split($attribute, $this->_options['wrap'], PHP_EOL . ' '));
-            }
-            $output .= $attribute . PHP_EOL;
-        }
-        return trim($output, PHP_EOL);
-    }
-
-    /**
-     * Encodes a collection of attributes according to RFC2849
-     *
-     * @link http://www.faqs.org/rfcs/rfc2849.html
-     *
-     * @param  array $attributes
-     * @return string
-     */
-    protected function _encodeAttributes(array $attributes)
-    {
-        $string = '';
-        $attributes = array_change_key_case($attributes, CASE_LOWER);
-        if (!$this->_versionWritten && array_key_exists('dn', $attributes) && isset($this->_options['version'])
-                && array_key_exists('objectclass', $attributes)) {
-            $string .= sprintf('version: %d', $this->_options['version']) . PHP_EOL;
-            $this->_versionWritten = true;
-        }
-
-        if (isset($this->_options['sort']) && $this->_options['sort'] === true) {
-            ksort($attributes, SORT_STRING);
-            if (array_key_exists('objectclass', $attributes)) {
-                $oc = $attributes['objectclass'];
-                unset($attributes['objectclass']);
-                $attributes = array_merge(array('objectclass' => $oc), $attributes);
-            }
-            if (array_key_exists('dn', $attributes)) {
-                $dn = $attributes['dn'];
-                unset($attributes['dn']);
-                $attributes = array_merge(array('dn' => $dn), $attributes);
-            }
-        }
-        foreach ($attributes as $key => $value) {
-            $string .= $this->_encodeAttribute($key, $value) . PHP_EOL;
-        }
-        return trim($string, PHP_EOL);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node.php b/airtime_mvc/library/Zend/Ldap/Node.php
deleted file mode 100644
index 0b20d1d85..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node.php
+++ /dev/null
@@ -1,1101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Node.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap
- */
-require_once 'Zend/Ldap.php';
-/**
- * @see Zend_Ldap_Node_Abstract
- */
-require_once 'Zend/Ldap/Node/Abstract.php';
-
-/**
- * Zend_Ldap_Node provides an object oriented view into a LDAP node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, RecursiveIterator
-{
-    /**
-     * Holds the node's new DN if node is renamed.
-     *
-     * @var Zend_Ldap_Dn
-     */
-    protected $_newDn;
-    /**
-     * Holds the node's orginal attributes (as loaded).
-     *
-     * @var array
-     */
-    protected $_originalData;
-    /**
-     * This node will be added
-     *
-     * @var boolean
-     */
-    protected $_new;
-    /**
-     * This node will be deleted
-     *
-     * @var boolean
-     */
-    protected $_delete;
-    /**
-     * Holds the connection to the LDAP server if in connected mode.
-     *
-     * @var Zend_Ldap
-     */
-    protected $_ldap;
-
-    /**
-     * Holds an array of the current node's children.
-     *
-     * @var array
-     */
-    protected $_children;
-
-    /**
-     * Controls iteration status
-     *
-     * @var boolean
-     */
-    private $_iteratorRewind = false;
-
-    /**
-     * Constructor.
-     *
-     * Constructor is protected to enforce the use of factory methods.
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  array        $data
-     * @param  boolean      $fromDataSource
-     * @param  Zend_Ldap    $ldap
-     * @throws Zend_Ldap_Exception
-     */
-    protected function __construct(Zend_Ldap_Dn $dn, array $data, $fromDataSource, Zend_Ldap $ldap = null)
-    {
-        parent::__construct($dn, $data, $fromDataSource);
-        if (!is_null($ldap)) $this->attachLdap($ldap);
-        else $this->detachLdap();
-    }
-
-    /**
-     * Serialization callback
-     *
-     * Only DN and attributes will be serialized.
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_dn', '_currentData', '_newDn', '_originalData',
-            '_new', '_delete', '_children');
-    }
-
-    /**
-     * Deserialization callback
-     *
-     * Enforces a detached node.
-     *
-     * @return null
-     */
-    public function __wakeup()
-    {
-        $this->detachLdap();
-    }
-
-    /**
-     * Gets the current LDAP connection.
-     *
-     * @return Zend_Ldap
-     * @throws Zend_Ldap_Exception
-     */
-    public function getLdap()
-    {
-        if (is_null($this->_ldap)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'No LDAP connection specified.', Zend_Ldap_Exception::LDAP_OTHER);
-        }
-        else return $this->_ldap;
-    }
-
-    /**
-     * Attach node to an LDAP connection
-     *
-     * This is an offline method.
-     *
-     * @uses   Zend_Ldap_Dn::isChildOf()
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function attachLdap(Zend_Ldap $ldap)
-    {
-        if (!Zend_Ldap_Dn::isChildOf($this->_getDn(), $ldap->getBaseDn())) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'LDAP connection is not responsible for given node.',
-                Zend_Ldap_Exception::LDAP_OTHER);
-        }
-
-        if ($ldap !== $this->_ldap) {
-            $this->_ldap = $ldap;
-            if (is_array($this->_children)) {
-                foreach ($this->_children as $child) {
-                    $child->attachLdap($ldap);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Detach node from LDAP connection
-     *
-     * This is an offline method.
-     *
-     * @return Zend_Ldap_Node Provides a fluid interface
-     */
-    public function detachLdap()
-    {
-        $this->_ldap = null;
-        if (is_array($this->_children)) {
-            foreach ($this->_children as $child) {
-                $child->detachLdap();
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Checks if the current node is attached to a LDAP server.
-     *
-     * This is an offline method.
-     *
-     * @return boolean
-     */
-    public function isAttached()
-    {
-        return (!is_null($this->_ldap));
-    }
-
-    /**
-     * @param  array   $data
-     * @param  boolean $fromDataSource
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _loadData(array $data, $fromDataSource)
-    {
-        parent::_loadData($data, $fromDataSource);
-        if ($fromDataSource === true) {
-            $this->_originalData = $data;
-        } else {
-            $this->_originalData = array();
-        }
-        $this->_children = null;
-        $this->_markAsNew(($fromDataSource === true) ? false : true);
-        $this->_markAsToBeDeleted(false);
-    }
-
-    /**
-     * Factory method to create a new detached Zend_Ldap_Node for a given DN.
-     *
-     * @param  string|array|Zend_Ldap_Dn $dn
-     * @param  array                     $objectClass
-     * @return Zend_Ldap_Node
-     * @throws Zend_Ldap_Exception
-     */
-    public static function create($dn, array $objectClass = array())
-    {
-        if (is_string($dn) || is_array($dn)) {
-            $dn = Zend_Ldap_Dn::factory($dn);
-        } else if ($dn instanceof Zend_Ldap_Dn) {
-            $dn = clone $dn;
-        } else {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, '$dn is of a wrong data type.');
-        }
-        $new = new self($dn, array(), false, null);
-        $new->_ensureRdnAttributeValues();
-        $new->setAttribute('objectClass', $objectClass);
-        return $new;
-    }
-
-    /**
-     * Factory method to create an attached Zend_Ldap_Node for a given DN.
-     *
-     * @param  string|array|Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap                 $ldap
-     * @return Zend_Ldap_Node|null
-     * @throws Zend_Ldap_Exception
-     */
-    public static function fromLdap($dn, Zend_Ldap $ldap)
-    {
-        if (is_string($dn) || is_array($dn)) {
-            $dn = Zend_Ldap_Dn::factory($dn);
-        } else if ($dn instanceof Zend_Ldap_Dn) {
-            $dn = clone $dn;
-        } else {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, '$dn is of a wrong data type.');
-        }
-        $data = $ldap->getEntry($dn, array('*', '+'), true);
-        if ($data === null) {
-            return null;
-        }
-        $entry = new self($dn, $data, true, $ldap);
-        return $entry;
-    }
-
-    /**
-     * Factory method to create a detached Zend_Ldap_Node from array data.
-     *
-     * @param  array   $data
-     * @param  boolean $fromDataSource
-     * @return Zend_Ldap_Node
-     * @throws Zend_Ldap_Exception
-     */
-    public static function fromArray(array $data, $fromDataSource = false)
-    {
-        if (!array_key_exists('dn', $data)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, '\'dn\' key is missing in array.');
-        }
-        if (is_string($data['dn']) || is_array($data['dn'])) {
-            $dn = Zend_Ldap_Dn::factory($data['dn']);
-        } else if ($data['dn'] instanceof Zend_Ldap_Dn) {
-            $dn = clone $data['dn'];
-        } else {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, '\'dn\' key is of a wrong data type.');
-        }
-        $fromDataSource = ($fromDataSource === true) ? true : false;
-        $new = new self($dn, $data, $fromDataSource, null);
-        $new->_ensureRdnAttributeValues();
-        return $new;
-    }
-
-    /**
-     * Ensures that teh RDN attributes are correctly set.
-     *
-     * @return void
-     */
-    protected function _ensureRdnAttributeValues()
-    {
-        foreach ($this->getRdnArray() as $key => $value) {
-            Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, false);
-        }
-    }
-
-    /**
-     * Marks this node as new.
-     *
-     * Node will be added (instead of updated) on calling update() if $new is true.
-     *
-     * @param boolean $new
-     */
-    protected function _markAsNew($new)
-    {
-        $this->_new = ($new === false) ? false : true;
-    }
-
-    /**
-     * Tells if the node is consiedered as new (not present on the server)
-     *
-     * Please note, that this doesn't tell you if the node is present on the server.
-     * Use {@link exits()} to see if a node is already there.
-     *
-     * @return boolean
-     */
-    public function isNew()
-    {
-        return $this->_new;
-    }
-
-    /**
-     * Marks this node as to be deleted.
-     *
-     * Node will be deleted on calling update() if $delete is true.
-     *
-     * @param boolean $delete
-     */
-    protected function _markAsToBeDeleted($delete)
-    {
-        $this->_delete = ($delete === true) ? true : false;
-    }
-
-
-    /**
-    * Is this node going to be deleted once update() is called?
-    *
-    * @return boolean
-    */
-    public function willBeDeleted()
-    {
-        return $this->_delete;
-    }
-
-    /**
-     * Marks this node as to be deleted
-     *
-     * Node will be deleted on calling update() if $delete is true.
-     *
-     * @return Zend_Ldap_Node Provides a fluid interface
-     */
-    public function delete()
-    {
-        $this->_markAsToBeDeleted(true);
-        return $this;
-    }
-
-    /**
-    * Is this node going to be moved once update() is called?
-    *
-    * @return boolean
-    */
-    public function willBeMoved()
-    {
-        if ($this->isNew() || $this->willBeDeleted()) {
-            return false;
-        } else if ($this->_newDn !== null) {
-            return ($this->_dn != $this->_newDn);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sends all pending changes to the LDAP server
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function update(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            $this->attachLdap($ldap);
-        }
-        $ldap = $this->getLdap();
-        if (!($ldap instanceof Zend_Ldap)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'No LDAP connection available');
-        }
-
-        if ($this->willBeDeleted()) {
-            if ($ldap->exists($this->_dn)) {
-                $ldap->delete($this->_dn);
-            }
-            return $this;
-        }
-
-        if ($this->isNew()) {
-            $data = $this->getData();
-            $ldap->add($this->_getDn(), $data);
-            $this->_loadData($data, true);
-            return $this;
-        }
-
-        $changedData = $this->getChangedData();
-        if ($this->willBeMoved()) {
-            $recursive = $this->hasChildren();
-            $ldap->rename($this->_dn, $this->_newDn, $recursive, false);
-            foreach ($this->_newDn->getRdn() as $key => $value) {
-                if (array_key_exists($key, $changedData)) {
-                    unset($changedData[$key]);
-                }
-            }
-            $this->_dn = $this->_newDn;
-            $this->_newDn = null;
-        }
-        if (count($changedData) > 0) {
-            $ldap->update($this->_getDn(), $changedData);
-        }
-        $this->_originalData = $this->_currentData;
-        return $this;
-    }
-
-    /**
-     * Gets the DN of the current node as a Zend_Ldap_Dn.
-     *
-     * This is an offline method.
-     *
-     * @return Zend_Ldap_Dn
-     */
-    protected function _getDn()
-    {
-        return ($this->_newDn === null) ? parent::_getDn() : $this->_newDn;
-    }
-
-    /**
-     * Gets the current DN of the current node as a Zend_Ldap_Dn.
-     * The method returns a clone of the node's DN to prohibit modification.
-     *
-     * This is an offline method.
-     *
-     * @return Zend_Ldap_Dn
-     */
-    public function getCurrentDn()
-    {
-        $dn = clone parent::_getDn();
-        return $dn;
-    }
-
-    /**
-     * Sets the new DN for this node
-     *
-     * This is an offline method.
-     *
-     * @param  Zend_Ldap_Dn|string|array $newDn
-     * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluid interface
-     */
-    public function setDn($newDn)
-    {
-        if ($newDn instanceof Zend_Ldap_Dn) {
-            $this->_newDn = clone $newDn;
-        } else {
-            $this->_newDn = Zend_Ldap_Dn::factory($newDn);
-        }
-        $this->_ensureRdnAttributeValues();
-        return $this;
-    }
-
-    /**
-     * {@see setDn()}
-     *
-     * This is an offline method.
-     *
-     * @param  Zend_Ldap_Dn|string|array $newDn
-     * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluid interface
-     */
-    public function move($newDn)
-    {
-        return $this->setDn($newDn);
-    }
-
-    /**
-     * {@see setDn()}
-     *
-     * This is an offline method.
-     *
-     * @param  Zend_Ldap_Dn|string|array $newDn
-     * @throws Zend_Ldap_Exception
-     * @return Zend_Ldap_Node Provides a fluid interface
-     */
-    public function rename($newDn)
-    {
-        return $this->setDn($newDn);
-    }
-
-    /**
-     * Sets the objectClass.
-     *
-     * This is an offline method.
-     *
-     * @param  array|string $value
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function setObjectClass($value)
-    {
-        $this->setAttribute('objectClass', $value);
-        return $this;
-    }
-
-    /**
-     * Appends to the objectClass.
-     *
-     * This is an offline method.
-     *
-     * @param  array|string $value
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function appendObjectClass($value)
-    {
-        $this->appendToAttribute('objectClass', $value);
-        return $this;
-    }
-
-    /**
-     * Returns a LDIF representation of the current node
-     *
-     * @param  array $options Additional options used during encoding
-     * @return string
-     */
-    public function toLdif(array $options = array())
-    {
-        $attributes = array_merge(array('dn' => $this->getDnString()), $this->getData(false));
-        /**
-         * Zend_Ldap_Ldif_Encoder
-         */
-        require_once 'Zend/Ldap/Ldif/Encoder.php';
-        return Zend_Ldap_Ldif_Encoder::encode($attributes, $options);
-    }
-
-    /**
-     * Gets changed node data.
-     *
-     * The array contains all changed attributes.
-     * This format can be used in {@link Zend_Ldap::add()} and {@link Zend_Ldap::update()}.
-     *
-     * This is an offline method.
-     *
-     * @return array
-     */
-    public function getChangedData()
-    {
-        $changed = array();
-        foreach ($this->_currentData as $key => $value) {
-            if (!array_key_exists($key, $this->_originalData) && !empty($value)) {
-                $changed[$key] = $value;
-            } else if ($this->_originalData[$key] !== $this->_currentData[$key]) {
-                $changed[$key] = $value;
-            }
-        }
-        return $changed;
-    }
-
-    /**
-     * Returns all changes made.
-     *
-     * This is an offline method.
-     *
-     * @return array
-     */
-    public function getChanges()
-    {
-        $changes = array(
-            'add'     => array(),
-            'delete'  => array(),
-            'replace' => array());
-        foreach ($this->_currentData as $key => $value) {
-            if (!array_key_exists($key, $this->_originalData) && !empty($value)) {
-                $changes['add'][$key] = $value;
-            } else if (count($this->_originalData[$key]) === 0 && !empty($value)) {
-                $changes['add'][$key] = $value;
-            } else if ($this->_originalData[$key] !== $this->_currentData[$key]) {
-                if (empty($value)) {
-                    $changes['delete'][$key] = $value;
-                } else {
-                    $changes['replace'][$key] = $value;
-                }
-            }
-        }
-        return $changes;
-    }
-
-    /**
-     * Sets a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->_setAttribute($name, $value, false);
-        return $this;
-    }
-
-    /**
-     * Appends to a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function appendToAttribute($name, $value)
-    {
-        $this->_setAttribute($name, $value, true);
-        return $this;
-    }
-
-    /**
-     * Checks if the attribute can be set and sets it accordingly.
-     *
-     * @param  string  $name
-     * @param  mixed   $value
-     * @param  boolean $append
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _setAttribute($name, $value, $append)
-    {
-        $this->_assertChangeableAttribute($name);
-        Zend_Ldap_Attribute::setAttribute($this->_currentData, $name, $value, $append);
-    }
-
-    /**
-     * Sets a LDAP date/time attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string        $name
-     * @param  integer|array $value
-     * @param  boolean       $utc
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function setDateTimeAttribute($name, $value, $utc = false)
-    {
-        $this->_setDateTimeAttribute($name, $value, $utc, false);
-        return $this;
-    }
-
-    /**
-     * Appends to a LDAP date/time attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string        $name
-     * @param  integer|array $value
-     * @param  boolean       $utc
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function appendToDateTimeAttribute($name, $value, $utc = false)
-    {
-        $this->_setDateTimeAttribute($name, $value, $utc, true);
-        return $this;
-    }
-
-    /**
-     * Checks if the attribute can be set and sets it accordingly.
-     *
-     * @param  string        $name
-     * @param  integer|array $value
-     * @param  boolean       $utc
-     * @param  boolean       $append
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _setDateTimeAttribute($name, $value, $utc, $append)
-    {
-        $this->_assertChangeableAttribute($name);
-        Zend_Ldap_Attribute::setDateTimeAttribute($this->_currentData, $name, $value, $utc, $append);
-    }
-
-    /**
-     * Sets a LDAP password.
-     *
-     * @param  string $password
-     * @param  string $hashType
-     * @param  string $attribName
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute::PASSWORD_HASH_MD5,
-        $attribName = 'userPassword')
-    {
-        $this->_assertChangeableAttribute($attribName);
-        Zend_Ldap_Attribute::setPassword($this->_currentData, $password, $hashType, $attribName);
-        return $this;
-    }
-
-    /**
-     * Deletes a LDAP attribute.
-     *
-     * This method deletes the attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function deleteAttribute($name)
-    {
-        if ($this->existsAttribute($name, true)) {
-            $this->_setAttribute($name, null, false);
-        }
-        return $this;
-    }
-
-    /**
-     * Removes duplicate values from a LDAP attribute
-     *
-     * @param  string $attribName
-     * @return void
-     */
-    public function removeDuplicatesFromAttribute($attribName)
-    {
-        Zend_Ldap_Attribute::removeDuplicatesFromAttribute($this->_currentData, $attribName);
-    }
-
-    /**
-     * Remove given values from a LDAP attribute
-     *
-     * @param  string      $attribName
-     * @param  mixed|array $value
-     * @return void
-     */
-    public function removeFromAttribute($attribName, $value)
-    {
-        Zend_Ldap_Attribute::removeFromAttribute($this->_currentData, $attribName, $value);
-    }
-
-    /**
-     * @param  string $name
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _assertChangeableAttribute($name)
-    {
-        $name = strtolower($name);
-        $rdn = $this->getRdnArray(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER);
-        if ($name == 'dn') {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'DN cannot be changed.');
-        }
-        else if (array_key_exists($name, $rdn)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Cannot change attribute because it\'s part of the RDN');
-        } else if (in_array($name, self::$_systemAttributes)) {
-            /**
-             * @see Zend_Ldap_Exception
-             */
-            require_once 'Zend/Ldap/Exception.php';
-            throw new Zend_Ldap_Exception(null, 'Cannot change attribute because it\'s read-only');
-        }
-        else return true;
-    }
-
-    /**
-     * Sets a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return null
-     * @throws Zend_Ldap_Exception
-     */
-    public function __set($name, $value)
-    {
-        $this->setAttribute($name, $value);
-    }
-
-    /**
-     * Deletes a LDAP attribute.
-     *
-     * This method deletes the attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return null
-     * @throws Zend_Ldap_Exception
-     */
-    public function __unset($name)
-    {
-        $this->deleteAttribute($name);
-    }
-
-    /**
-     * Sets a LDAP attribute.
-     * Implements ArrayAccess.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return null
-     * @throws Zend_Ldap_Exception
-     */
-    public function offsetSet($name, $value)
-    {
-        $this->setAttribute($name, $value);
-    }
-
-    /**
-     * Deletes a LDAP attribute.
-     * Implements ArrayAccess.
-     *
-     * This method deletes the attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return null
-     * @throws Zend_Ldap_Exception
-     */
-    public function offsetUnset($name)
-    {
-        $this->deleteAttribute($name);
-    }
-
-    /**
-     * Check if node exists on LDAP.
-     *
-     * This is an online method.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    public function exists(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            $this->attachLdap($ldap);
-        }
-        $ldap = $this->getLdap();
-        return $ldap->exists($this->_getDn());
-    }
-
-    /**
-     * Reload node attributes from LDAP.
-     *
-     * This is an online method.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function reload(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            $this->attachLdap($ldap);
-        }
-        $ldap = $this->getLdap();
-        parent::reload($ldap);
-        return $this;
-    }
-
-    /**
-     * Search current subtree with given options.
-     *
-     * This is an online method.
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract $filter
-     * @param  integer                          $scope
-     * @param  string                           $sort
-     * @return Zend_Ldap_Node_Collection
-     * @throws Zend_Ldap_Exception
-     */
-    public function searchSubtree($filter, $scope = Zend_Ldap::SEARCH_SCOPE_SUB, $sort = null)
-    {
-        /**
-         * @see Zend_Ldap_Node_Collection
-         */
-        require_once 'Zend/Ldap/Node/Collection.php';
-        return $this->getLdap()->search($filter, $this->_getDn(), $scope, array('*', '+'), $sort,
-            'Zend_Ldap_Node_Collection');
-    }
-
-    /**
-     * Count items in current subtree found by given filter.
-     *
-     * This is an online method.
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract $filter
-     * @param  integer                          $scope
-     * @return integer
-     * @throws Zend_Ldap_Exception
-     */
-    public function countSubtree($filter, $scope = Zend_Ldap::SEARCH_SCOPE_SUB)
-    {
-        return $this->getLdap()->count($filter, $this->_getDn(), $scope);
-    }
-
-    /**
-     * Count children of current node.
-     *
-     * This is an online method.
-     *
-     * @return integer
-     * @throws Zend_Ldap_Exception
-     */
-    public function countChildren()
-    {
-        return $this->countSubtree('(objectClass=*)', Zend_Ldap::SEARCH_SCOPE_ONE);
-    }
-
-    /**
-     * Gets children of current node.
-     *
-     * This is an online method.
-     *
-     * @param  string|Zend_Ldap_Filter_Abstract $filter
-     * @param  string                           $sort
-     * @return Zend_Ldap_Node_Collection
-     * @throws Zend_Ldap_Exception
-     */
-    public function searchChildren($filter, $sort = null)
-    {
-        return $this->searchSubtree($filter, Zend_Ldap::SEARCH_SCOPE_ONE, $sort);
-    }
-
-    /**
-     * Checks if current node has children.
-     * Returns whether the current element has children.
-     *
-     * Can be used offline but returns false if children have not been retrieved yet.
-     *
-     * @return boolean
-     * @throws Zend_Ldap_Exception
-     */
-    public function hasChildren()
-    {
-        if (!is_array($this->_children)) {
-            if ($this->isAttached()) {
-                return ($this->countChildren() > 0);
-            } else {
-                return false;
-            }
-        } else {
-            return (count($this->_children) > 0);
-        }
-    }
-
-    /**
-     * Returns the children for the current node.
-     *
-     * Can be used offline but returns an empty array if children have not been retrieved yet.
-     *
-     * @return Zend_Ldap_Node_ChildrenIterator
-     * @throws Zend_Ldap_Exception
-     */
-    public function getChildren()
-    {
-        if (!is_array($this->_children)) {
-            $this->_children = array();
-            if ($this->isAttached()) {
-                $children = $this->searchChildren('(objectClass=*)', null);
-                foreach ($children as $child) {
-                    $this->_children[$child->getRdnString(Zend_Ldap_Dn::ATTR_CASEFOLD_LOWER)] = $child;
-                }
-            }
-        }
-        /**
-         * @see Zend_Ldap_Node_ChildrenIterator
-         */
-        require_once 'Zend/Ldap/Node/ChildrenIterator.php';
-        return new Zend_Ldap_Node_ChildrenIterator($this->_children);
-    }
-
-    /**
-     * Returns the parent of the current node.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node
-     * @throws Zend_Ldap_Exception
-     */
-    public function getParent(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            $this->attachLdap($ldap);
-        }
-        $ldap = $this->getLdap();
-        $parentDn = $this->_getDn()->getParentDn(1);
-        return self::fromLdap($parentDn, $ldap);
-    }
-
-    /**
-     * Return the current attribute.
-     * Implements Iterator
-     *
-     * @return array
-     */
-    public function current()
-    {
-        return $this;
-    }
-
-    /**
-     * Return the attribute name.
-     * Implements Iterator
-     *
-     * @return string
-     */
-    public function key()
-    {
-        return $this->getRdnString();
-    }
-
-    /**
-     * Move forward to next attribute.
-     * Implements Iterator
-     */
-    public function next()
-    {
-        $this->_iteratorRewind = false;
-    }
-
-    /**
-     * Rewind the Iterator to the first attribute.
-     * Implements Iterator
-     */
-    public function rewind()
-    {
-        $this->_iteratorRewind = true;
-    }
-
-    /**
-     * Check if there is a current attribute
-     * after calls to rewind() or next().
-     * Implements Iterator
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return $this->_iteratorRewind;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Abstract.php b/airtime_mvc/library/Zend/Ldap/Node/Abstract.php
deleted file mode 100644
index 7c08538a4..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Abstract.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Attribute
- */
-require_once 'Zend/Ldap/Attribute.php';
-/**
- * @see Zend_Ldap_Dn
- */
-require_once 'Zend/Ldap/Dn.php';
-
-/**
- * Zend_Ldap_Node_Abstract provides a bas eimplementation for LDAP nodes
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable
-{
-    protected static $_systemAttributes=array('createtimestamp', 'creatorsname',
-        'entrycsn', 'entrydn', 'entryuuid', 'hassubordinates', 'modifiersname',
-        'modifytimestamp', 'structuralobjectclass', 'subschemasubentry',
-        'distinguishedname', 'instancetype', 'name', 'objectcategory', 'objectguid',
-        'usnchanged', 'usncreated', 'whenchanged', 'whencreated');
-
-    /**
-     * Holds the node's DN.
-     *
-     * @var Zend_Ldap_Dn
-     */
-    protected $_dn;
-
-    /**
-     * Holds the node's current data.
-     *
-     * @var array
-     */
-    protected $_currentData;
-
-    /**
-     * Constructor.
-     *
-     * Constructor is protected to enforce the use of factory methods.
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  array        $data
-     * @param  boolean      $fromDataSource
-     */
-    protected function __construct(Zend_Ldap_Dn $dn, array $data, $fromDataSource)
-    {
-        $this->_dn = $dn;
-        $this->_loadData($data, $fromDataSource);
-    }
-
-    /**
-     * @param  array   $data
-     * @param  boolean $fromDataSource
-     * @throws Zend_Ldap_Exception
-     */
-    protected function _loadData(array $data, $fromDataSource)
-    {
-        if (array_key_exists('dn', $data)) {
-            unset($data['dn']);
-        }
-        ksort($data, SORT_STRING);
-        $this->_currentData = $data;
-    }
-
-    /**
-     * Reload node attributes from LDAP.
-     *
-     * This is an online method.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Abstract Provides a fluid interface
-     * @throws Zend_Ldap_Exception
-     */
-    public function reload(Zend_Ldap $ldap = null)
-    {
-        if ($ldap !== null) {
-            $data = $ldap->getEntry($this->_getDn(), array('*', '+'), true);
-            $this->_loadData($data, true);
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the DN of the current node as a Zend_Ldap_Dn.
-     *
-     * This is an offline method.
-     *
-     * @return Zend_Ldap_Dn
-     */
-    protected function _getDn()
-    {
-        return $this->_dn;
-    }
-
-    /**
-     * Gets the DN of the current node as a Zend_Ldap_Dn.
-     * The method returns a clone of the node's DN to prohibit modification.
-     *
-     * This is an offline method.
-     *
-     * @return Zend_Ldap_Dn
-     */
-    public function getDn()
-    {
-        $dn = clone $this->_getDn();
-        return $dn;
-    }
-
-    /**
-     * Gets the DN of the current node as a string.
-     *
-     * This is an offline method.
-     *
-     * @param  string $caseFold
-     * @return string
-     */
-    public function getDnString($caseFold = null)
-    {
-        return $this->_getDn()->toString($caseFold);
-    }
-
-    /**
-     * Gets the DN of the current node as an array.
-     *
-     * This is an offline method.
-     *
-     * @param  string $caseFold
-     * @return array
-     */
-    public function getDnArray($caseFold = null)
-    {
-        return $this->_getDn()->toArray($caseFold);
-    }
-
-    /**
-     * Gets the RDN of the current node as a string.
-     *
-     * This is an offline method.
-     *
-     * @param  string $caseFold
-     * @return string
-     */
-    public function getRdnString($caseFold = null)
-    {
-        return $this->_getDn()->getRdnString($caseFold);
-    }
-
-    /**
-     * Gets the RDN of the current node as an array.
-     *
-     * This is an offline method.
-     *
-     * @param  string $caseFold
-     * @return array
-     */
-    public function getRdnArray($caseFold = null)
-    {
-        return $this->_getDn()->getRdn($caseFold);
-    }
-
-    /**
-     * Gets the objectClass of the node
-     *
-     * @return array
-     */
-    public function getObjectClass()
-    {
-        return $this->getAttribute('objectClass', null);
-    }
-
-    /**
-     * Gets all attributes of node.
-     *
-     * The collection contains all attributes.
-     *
-     * This is an offline method.
-     *
-     * @param  boolean $includeSystemAttributes
-     * @return array
-     */
-    public function getAttributes($includeSystemAttributes = true)
-    {
-        $data = array();
-        foreach ($this->getData($includeSystemAttributes) as $name => $value) {
-            $data[$name] = $this->getAttribute($name, null);
-        }
-        return $data;
-    }
-
-    /**
-     * Returns the DN of the current node. {@see getDnString()}
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getDnString();
-    }
-
-    /**
-     * Cast to string representation {@see toString()}
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Returns an array representation of the current node
-     *
-     * @param  boolean $includeSystemAttributes
-     * @return array
-     */
-    public function toArray($includeSystemAttributes = true)
-    {
-        $attributes = $this->getAttributes($includeSystemAttributes);
-        return array_merge(array('dn' => $this->getDnString()), $attributes);
-    }
-
-    /**
-     * Returns a JSON representation of the current node
-     *
-     * @param  boolean $includeSystemAttributes
-     * @return string
-     */
-    public function toJson($includeSystemAttributes = true)
-    {
-        return json_encode($this->toArray($includeSystemAttributes));
-    }
-
-    /**
-     * Gets node attributes.
-     *
-     * The array contains all attributes in its internal format (no conversion).
-     *
-     * This is an offline method.
-     *
-     * @param  boolean $includeSystemAttributes
-     * @return array
-     */
-    public function getData($includeSystemAttributes = true)
-    {
-        if ($includeSystemAttributes === false) {
-            $data = array();
-            foreach ($this->_currentData as $key => $value) {
-                if (!in_array($key, self::$_systemAttributes)) {
-                    $data[$key] = $value;
-                }
-            }
-            return $data;
-        } else {
-            return $this->_currentData;
-        }
-    }
-
-    /**
-     * Checks whether a given attribute exists.
-     *
-     * If $emptyExists is false empty attributes (containing only array()) are
-     * treated as non-existent returning false.
-     * If $emptyExists is true empty attributes are treated as existent returning
-     * true. In this case method returns false only if the attribute name is
-     * missing in the key-collection.
-     *
-     * @param  string  $name
-     * @param  boolean $emptyExists
-     * @return boolean
-     */
-    public function existsAttribute($name, $emptyExists = false)
-    {
-        $name = strtolower($name);
-        if (isset($this->_currentData[$name])) {
-            if ($emptyExists) return true;
-            return count($this->_currentData[$name])>0;
-        }
-        else return false;
-    }
-
-    /**
-     * Checks if the given value(s) exist in the attribute
-     *
-     * @param  string      $attribName
-     * @param  mixed|array $value
-     * @return boolean
-     */
-    public function attributeHasValue($attribName, $value)
-    {
-        return Zend_Ldap_Attribute::attributeHasValue($this->_currentData, $attribName, $value);
-    }
-
-    /**
-     * Gets a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string  $name
-     * @param  integer $index
-     * @return mixed
-     * @throws Zend_Ldap_Exception
-     */
-    public function getAttribute($name, $index = null)
-    {
-        if ($name == 'dn') {
-            return $this->getDnString();
-        }
-        else {
-            return Zend_Ldap_Attribute::getAttribute($this->_currentData, $name, $index);
-        }
-    }
-
-    /**
-     * Gets a LDAP date/time attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string  $name
-     * @param  integer $index
-     * @return array|integer
-     * @throws Zend_Ldap_Exception
-     */
-    public function getDateTimeAttribute($name, $index = null)
-    {
-        return Zend_Ldap_Attribute::getDateTimeAttribute($this->_currentData, $name, $index);
-    }
-
-    /**
-     * Sets a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function __set($name, $value)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Gets a LDAP attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return array
-     * @throws Zend_Ldap_Exception
-     */
-    public function __get($name)
-    {
-        return $this->getAttribute($name, null);
-    }
-
-    /**
-     * Deletes a LDAP attribute.
-     *
-     * This method deletes the attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function __unset($name)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Checks whether a given attribute exists.
-     *
-     * Empty attributes will be treated as non-existent.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        return $this->existsAttribute($name, false);
-    }
-
-    /**
-     * Sets a LDAP attribute.
-     * Implements ArrayAccess.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function offsetSet($name, $value)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Gets a LDAP attribute.
-     * Implements ArrayAccess.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return array
-     * @throws Zend_Ldap_Exception
-     */
-    public function offsetGet($name)
-    {
-        return $this->getAttribute($name, null);
-    }
-
-    /**
-     * Deletes a LDAP attribute.
-     * Implements ArrayAccess.
-     *
-     * This method deletes the attribute.
-     *
-     * This is an offline method.
-     *
-     * @param  string $name
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function offsetUnset($name)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Checks whether a given attribute exists.
-     * Implements ArrayAccess.
-     *
-     * Empty attributes will be treated as non-existent.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function offsetExists($name)
-    {
-        return $this->existsAttribute($name, false);
-    }
-
-    /**
-     * Returns the number of attributes in node.
-     * Implements Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_currentData);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/ChildrenIterator.php b/airtime_mvc/library/Zend/Ldap/Node/ChildrenIterator.php
deleted file mode 100644
index 186199381..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/ChildrenIterator.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ChildrenIterator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node
- */
-require_once 'Zend/Ldap/Node.php';
-
-/**
- * Zend_Ldap_Node_ChildrenIterator provides an iterator to a collection of children nodes.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_ChildrenIterator implements Iterator, Countable, RecursiveIterator, ArrayAccess
-{
-    /**
-     * An array of Zend_Ldap_Node objects
-     *
-     * @var array
-     */
-    private $_data;
-
-    /**
-     * Constructor.
-     *
-     * @param  array $data
-     * @return void
-     */
-    public function __construct(array $data)
-    {
-        $this->_data = $data;
-    }
-
-    /**
-     * Returns the number of child nodes.
-     * Implements Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_data);
-    }
-
-    /**
-     * Return the current child.
-     * Implements Iterator
-     *
-     * @return Zend_Ldap_Node
-     */
-    public function current()
-    {
-        return current($this->_data);
-    }
-
-    /**
-     * Return the child'd RDN.
-     * Implements Iterator
-     *
-     * @return string
-     */
-    public function key()
-    {
-        return key($this->_data);
-    }
-
-    /**
-     * Move forward to next child.
-     * Implements Iterator
-     */
-    public function next()
-    {
-        next($this->_data);
-    }
-
-    /**
-     * Rewind the Iterator to the first child.
-     * Implements Iterator
-     */
-    public function rewind()
-    {
-        reset($this->_data);
-    }
-
-    /**
-     * Check if there is a current child
-     * after calls to rewind() or next().
-     * Implements Iterator
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return (current($this->_data)!==false);
-    }
-
-    /**
-     * Checks if current node has children.
-     * Returns whether the current element has children.
-     *
-     * @return boolean
-     */
-    public function hasChildren()
-    {
-        if ($this->current() instanceof Zend_Ldap_Node) {
-            return $this->current()->hasChildren();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the children for the current node.
-     *
-     * @return Zend_Ldap_Node_ChildrenIterator
-     */
-    public function getChildren()
-    {
-        if ($this->current() instanceof Zend_Ldap_Node) {
-            return $this->current()->getChildren();
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a child with a given RDN.
-     * Implements ArrayAccess.
-     *
-     * @param  string $rdn
-     * @return Zend_Ldap_node
-     */
-    public function offsetGet($rdn)
-    {
-        if ($this->offsetExists($rdn)) {
-            return $this->_data[$rdn];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Checks whether a given rdn exists.
-     * Implements ArrayAccess.
-     *
-     * @param  string $rdn
-     * @return boolean
-     */
-    public function offsetExists($rdn)
-    {
-        return (array_key_exists($rdn, $this->_data));
-    }
-
-    /**
-     * Does nothing.
-     * Implements ArrayAccess.
-     *
-     * @param  string $name
-     * @return null
-     */
-    public function offsetUnset($name) { }
-
-    /**
-     * Does nothing.
-     * Implements ArrayAccess.
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return null
-     */
-    public function offsetSet($name, $value) { }
-
-    /**
-     * Get all children as an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $data = array();
-        foreach ($this as $rdn => $node) {
-            $data[$rdn] = $node;
-        }
-        return $data;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Collection.php b/airtime_mvc/library/Zend/Ldap/Node/Collection.php
deleted file mode 100644
index ed3396df0..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Collection.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Collection
- */
-require_once 'Zend/Ldap/Collection.php';
-
-
-/**
- * Zend_Ldap_Node_Collection provides a collecion of nodes.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Collection extends Zend_Ldap_Collection
-{
-    /**
-     * Creates the data structure for the given entry data
-     *
-     * @param  array $data
-     * @return Zend_Ldap_Node
-     */
-    protected function _createEntry(array $data)
-    {
-        /**
-         * @see Zend_Ldap_Node
-         */
-        require_once 'Zend/Ldap/Node.php';
-        $node = Zend_Ldap_Node::fromArray($data, true);
-        $node->attachLdap($this->_iterator->getLdap());
-        return $node;
-    }
-
-    /**
-     * Return the child key (DN).
-     * Implements Iterator and RecursiveIterator
-     *
-     * @return string
-     */
-    public function key()
-    {
-        return $this->_iterator->key();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/RootDse.php b/airtime_mvc/library/Zend/Ldap/Node/RootDse.php
deleted file mode 100644
index 2a32b482b..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/RootDse.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RootDse.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Abstract
- */
-require_once 'Zend/Ldap/Node/Abstract.php';
-
-/**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract
-{
-    const SERVER_TYPE_GENERIC         = 1;
-    const SERVER_TYPE_OPENLDAP        = 2;
-    const SERVER_TYPE_ACTIVEDIRECTORY = 3;
-    const SERVER_TYPE_EDIRECTORY      = 4;
-
-    /**
-     * Factory method to create the RootDSE.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_RootDse
-     * @throws Zend_Ldap_Exception
-     */
-    public static function create(Zend_Ldap $ldap)
-    {
-        $dn = Zend_Ldap_Dn::fromString('');
-        $data = $ldap->getEntry($dn, array('*', '+'), true);
-        if (isset($data['domainfunctionality'])) {
-            /**
-             * @see Zend_Ldap_Node_RootDse_ActiveDirectory
-             */
-            require_once 'Zend/Ldap/Node/RootDse/ActiveDirectory.php';
-            return new Zend_Ldap_Node_RootDse_ActiveDirectory($dn, $data);
-        } else if (isset($data['dsaname'])) {
-            /**
-             * @see Zend_Ldap_Node_RootDse_ActiveDirectory
-             */
-            require_once 'Zend/Ldap/Node/RootDse/eDirectory.php';
-            return new Zend_Ldap_Node_RootDse_eDirectory($dn, $data);
-        } else if (isset($data['structuralobjectclass']) &&
-                $data['structuralobjectclass'][0] === 'OpenLDAProotDSE') {
-            /**
-             * @see Zend_Ldap_Node_RootDse_OpenLdap
-             */
-            require_once 'Zend/Ldap/Node/RootDse/OpenLdap.php';
-            return new Zend_Ldap_Node_RootDse_OpenLdap($dn, $data);
-        } else {
-            return new self($dn, $data);
-        }
-    }
-
-    /**
-     * Constructor.
-     *
-     * Constructor is protected to enforce the use of factory methods.
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  array        $data
-     */
-    protected function __construct(Zend_Ldap_Dn $dn, array $data)
-    {
-        parent::__construct($dn, $data, true);
-    }
-
-    /**
-     * Gets the namingContexts.
-     *
-     * @return array
-     */
-    public function getNamingContexts()
-    {
-        return $this->getAttribute('namingContexts', null);
-    }
-
-    /**
-     * Gets the subschemaSubentry.
-     *
-     * @return string|null
-     */
-    public function getSubschemaSubentry()
-    {
-        return $this->getAttribute('subschemaSubentry', 0);
-    }
-
-    /**
-     * Determines if the version is supported
-     *
-     * @param  string|int|array $versions version(s) to check
-     * @return boolean
-     */
-    public function supportsVersion($versions)
-    {
-        return $this->attributeHasValue('supportedLDAPVersion', $versions);
-    }
-
-    /**
-     * Determines if the sasl mechanism is supported
-     *
-     * @param  string|array $mechlist SASL mechanisms to check
-     * @return boolean
-     */
-    public function supportsSaslMechanism($mechlist)
-    {
-        return $this->attributeHasValue('supportedSASLMechanisms', $mechlist);
-    }
-
-    /**
-     * Gets the server type
-     *
-     * @return int
-     */
-    public function getServerType()
-    {
-        return self::SERVER_TYPE_GENERIC;
-    }
-
-    /**
-     * Returns the schema DN
-     *
-     * @return Zend_Ldap_Dn
-     */
-    public function getSchemaDn()
-    {
-        $schemaDn = $this->getSubschemaSubentry();
-        /**
-         * @see Zend_Ldap_Dn
-         */
-        require_once 'Zend/Ldap/Dn.php';
-        return Zend_Ldap_Dn::fromString($schemaDn);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/airtime_mvc/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
deleted file mode 100644
index 34525647e..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_RootDse
- */
-require_once 'Zend/Ldap/Node/RootDse.php';
-
-/**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
- * an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_RootDse_ActiveDirectory extends Zend_Ldap_Node_RootDse
-{
-    /**
-     * Gets the configurationNamingContext.
-     *
-     * @return string|null
-     */
-    public function getConfigurationNamingContext()
-    {
-        return $this->getAttribute('configurationNamingContext', 0);
-    }
-
-    /**
-     * Gets the currentTime.
-     *
-     * @return string|null
-     */
-    public function getCurrentTime()
-    {
-        return $this->getAttribute('currentTime', 0);
-    }
-
-    /**
-     * Gets the defaultNamingContext.
-     *
-     * @return string|null
-     */
-    public function getDefaultNamingContext()
-    {
-        return $this->getAttribute('defaultNamingContext', 0);
-    }
-
-    /**
-     * Gets the dnsHostName.
-     *
-     * @return string|null
-     */
-    public function getDnsHostName()
-    {
-        return $this->getAttribute('dnsHostName', 0);
-    }
-
-    /**
-     * Gets the domainControllerFunctionality.
-     *
-     * @return string|null
-     */
-    public function getDomainControllerFunctionality()
-    {
-        return $this->getAttribute('domainControllerFunctionality', 0);
-    }
-
-    /**
-     * Gets the domainFunctionality.
-     *
-     * @return string|null
-     */
-    public function getDomainFunctionality()
-    {
-        return $this->getAttribute('domainFunctionality', 0);
-    }
-
-    /**
-     * Gets the dsServiceName.
-     *
-     * @return string|null
-     */
-    public function getDsServiceName()
-    {
-        return $this->getAttribute('dsServiceName', 0);
-    }
-
-    /**
-     * Gets the forestFunctionality.
-     *
-     * @return string|null
-     */
-    public function getForestFunctionality()
-    {
-        return $this->getAttribute('forestFunctionality', 0);
-    }
-
-    /**
-     * Gets the highestCommittedUSN.
-     *
-     * @return string|null
-     */
-    public function getHighestCommittedUSN()
-    {
-        return $this->getAttribute('highestCommittedUSN', 0);
-    }
-
-    /**
-     * Gets the isGlobalCatalogReady.
-     *
-     * @return string|null
-     */
-    public function getIsGlobalCatalogReady()
-    {
-        return $this->getAttribute('isGlobalCatalogReady', 0);
-    }
-
-    /**
-     * Gets the isSynchronized.
-     *
-     * @return string|null
-     */
-    public function getIsSynchronized()
-    {
-        return $this->getAttribute('isSynchronized', 0);
-    }
-
-    /**
-     * Gets the ldapServiceName.
-     *
-     * @return string|null
-     */
-    public function getLdapServiceName()
-    {
-        return $this->getAttribute('ldapServiceName', 0);
-    }
-
-    /**
-     * Gets the rootDomainNamingContext.
-     *
-     * @return string|null
-     */
-    public function getRootDomainNamingContext()
-    {
-        return $this->getAttribute('rootDomainNamingContext', 0);
-    }
-
-    /**
-     * Gets the schemaNamingContext.
-     *
-     * @return string|null
-     */
-    public function getSchemaNamingContext()
-    {
-        return $this->getAttribute('schemaNamingContext', 0);
-    }
-
-    /**
-     * Gets the serverName.
-     *
-     * @return string|null
-     */
-    public function getServerName()
-    {
-        return $this->getAttribute('serverName', 0);
-    }
-
-    /**
-     * Determines if the capability is supported
-     *
-     * @param string|string|array $oids capability(s) to check
-     * @return boolean
-     */
-    public function supportsCapability($oids)
-    {
-        return $this->attributeHasValue('supportedCapabilities', $oids);
-    }
-
-    /**
-     * Determines if the control is supported
-     *
-     * @param string|array $oids control oid(s) to check
-     * @return boolean
-     */
-    public function supportsControl($oids)
-    {
-        return $this->attributeHasValue('supportedControl', $oids);
-    }
-
-    /**
-     * Determines if the version is supported
-     *
-     * @param string|array $policies policy(s) to check
-     * @return boolean
-     */
-    public function supportsPolicy($policies)
-    {
-        return $this->attributeHasValue('supportedLDAPPolicies', $policies);
-    }
-
-    /**
-     * Gets the server type
-     *
-     * @return int
-     */
-    public function getServerType()
-    {
-        return self::SERVER_TYPE_ACTIVEDIRECTORY;
-    }
-
-    /**
-     * Returns the schema DN
-     *
-     * @return Zend_Ldap_Dn
-     */
-    public function getSchemaDn()
-    {
-        $schemaDn = $this->getSchemaNamingContext();
-        /**
-         * @see Zend_Ldap_Dn
-         */
-        require_once 'Zend/Ldap/Dn.php';
-        return Zend_Ldap_Dn::fromString($schemaDn);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/airtime_mvc/library/Zend/Ldap/Node/RootDse/OpenLdap.php
deleted file mode 100644
index 5a4e30981..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/RootDse/OpenLdap.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_RootDse
- */
-require_once 'Zend/Ldap/Node/RootDse.php';
-
-/**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
- * an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse
-{
-    /**
-     * Gets the configContext.
-     *
-     * @return string|null
-     */
-    public function getConfigContext()
-    {
-        return $this->getAttribute('configContext', 0);
-    }
-
-    /**
-     * Gets the monitorContext.
-     *
-     * @return string|null
-     */
-    public function getMonitorContext()
-    {
-        return $this->getAttribute('monitorContext', 0);
-    }
-
-    /**
-     * Determines if the control is supported
-     *
-     * @param  string|array $oids control oid(s) to check
-     * @return boolean
-     */
-    public function supportsControl($oids)
-    {
-        return $this->attributeHasValue('supportedControl', $oids);
-    }
-
-    /**
-     * Determines if the extension is supported
-     *
-     * @param  string|array $oids oid(s) to check
-     * @return boolean
-     */
-    public function supportsExtension($oids)
-    {
-        return $this->attributeHasValue('supportedExtension', $oids);
-    }
-
-    /**
-     * Determines if the feature is supported
-     *
-     * @param  string|array $oids feature oid(s) to check
-     * @return boolean
-     */
-    public function supportsFeature($oids)
-    {
-        return $this->attributeHasValue('supportedFeatures', $oids);
-    }
-
-    /**
-     * Gets the server type
-     *
-     * @return int
-     */
-    public function getServerType()
-    {
-        return self::SERVER_TYPE_OPENLDAP;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/RootDse/eDirectory.php b/airtime_mvc/library/Zend/Ldap/Node/RootDse/eDirectory.php
deleted file mode 100644
index 0188bd01e..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/RootDse/eDirectory.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: eDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_RootDse
- */
-require_once 'Zend/Ldap/Node/RootDse.php';
-
-/**
- * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of
- * a Novell eDirectory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDSE
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_RootDse_eDirectory extends Zend_Ldap_Node_RootDse
-{
-    /**
-     * Determines if the extension is supported
-     *
-     * @param  string|array $oids oid(s) to check
-     * @return boolean
-     */
-    public function supportsExtension($oids)
-    {
-        return $this->attributeHasValue('supportedExtension', $oids);
-    }
-
-    /**
-     * Gets the vendorName.
-     *
-     * @return string|null
-     */
-    public function getVendorName()
-    {
-        return $this->getAttribute('vendorName', 0);
-    }
-
-    /**
-     * Gets the vendorVersion.
-     *
-     * @return string|null
-     */
-    public function getVendorVersion()
-    {
-        return $this->getAttribute('vendorVersion', 0);
-    }
-
-    /**
-     * Gets the dsaName.
-     *
-     * @return string|null
-     */
-    public function getDsaName()
-    {
-        return $this->getAttribute('dsaName', 0);
-    }
-
-    /**
-     * Gets the server statistics "errors".
-     *
-     * @return string|null
-     */
-    public function getStatisticsErrors()
-    {
-        return $this->getAttribute('errors', 0);
-    }
-
-    /**
-     * Gets the server statistics "securityErrors".
-     *
-     * @return string|null
-     */
-    public function getStatisticsSecurityErrors()
-    {
-        return $this->getAttribute('securityErrors', 0);
-    }
-
-    /**
-     * Gets the server statistics "chainings".
-     *
-     * @return string|null
-     */
-    public function getStatisticsChainings()
-    {
-        return $this->getAttribute('chainings', 0);
-    }
-
-    /**
-     * Gets the server statistics "referralsReturned".
-     *
-     * @return string|null
-     */
-    public function getStatisticsReferralsReturned()
-    {
-        return $this->getAttribute('referralsReturned', 0);
-    }
-
-    /**
-     * Gets the server statistics "extendedOps".
-     *
-     * @return string|null
-     */
-    public function getStatisticsExtendedOps()
-    {
-        return $this->getAttribute('extendedOps', 0);
-    }
-
-    /**
-     * Gets the server statistics "abandonOps".
-     *
-     * @return string|null
-     */
-    public function getStatisticsAbandonOps()
-    {
-        return $this->getAttribute('abandonOps', 0);
-    }
-
-    /**
-     * Gets the server statistics "wholeSubtreeSearchOps".
-     *
-     * @return string|null
-     */
-    public function getStatisticsWholeSubtreeSearchOps()
-    {
-        return $this->getAttribute('wholeSubtreeSearchOps', 0);
-    }
-
-    /**
-     * Gets the server type
-     *
-     * @return int
-     */
-    public function getServerType()
-    {
-        return self::SERVER_TYPE_EDIRECTORY;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema.php b/airtime_mvc/library/Zend/Ldap/Node/Schema.php
deleted file mode 100644
index 21f79f5ec..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Schema.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Abstract
- */
-require_once 'Zend/Ldap/Node/Abstract.php';
-
-/**
- * Zend_Ldap_Node_Schema provides a simple data-container for the Schema node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema extends Zend_Ldap_Node_Abstract
-{
-    const OBJECTCLASS_TYPE_UNKNOWN    = 0;
-    const OBJECTCLASS_TYPE_STRUCTURAL = 1;
-    const OBJECTCLASS_TYPE_ABSTRACT   = 3;
-    const OBJECTCLASS_TYPE_AUXILIARY  = 4;
-
-    /**
-     * Factory method to create the Schema node.
-     *
-     * @param  Zend_Ldap $ldap
-     * @return Zend_Ldap_Node_Schema
-     * @throws Zend_Ldap_Exception
-     */
-    public static function create(Zend_Ldap $ldap)
-    {
-        $dn = $ldap->getRootDse()->getSchemaDn();
-        $data = $ldap->getEntry($dn, array('*', '+'), true);
-        switch ($ldap->getRootDse()->getServerType()) {
-            case Zend_Ldap_Node_RootDse::SERVER_TYPE_ACTIVEDIRECTORY:
-                /**
-                 * @see Zend_Ldap_Node_Schema_ActiveDirectory
-                 */
-                require_once 'Zend/Ldap/Node/Schema/ActiveDirectory.php';
-                return new Zend_Ldap_Node_Schema_ActiveDirectory($dn, $data, $ldap);
-            case Zend_Ldap_Node_RootDse::SERVER_TYPE_OPENLDAP:
-                /**
-                 * @see Zend_Ldap_Node_RootDse_ActiveDirectory
-                 */
-                require_once 'Zend/Ldap/Node/Schema/OpenLdap.php';
-                return new Zend_Ldap_Node_Schema_OpenLdap($dn, $data, $ldap);
-            case Zend_Ldap_Node_RootDse::SERVER_TYPE_EDIRECTORY:
-            default:
-                return new self($dn, $data, $ldap);
-        }
-    }
-
-    /**
-     * Constructor.
-     *
-     * Constructor is protected to enforce the use of factory methods.
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  array        $data
-     * @param  Zend_Ldap    $ldap
-     */
-    protected function __construct(Zend_Ldap_Dn $dn, array $data, Zend_Ldap $ldap)
-    {
-        parent::__construct($dn, $data, true);
-        $this->_parseSchema($dn, $ldap);
-    }
-
-    /**
-     * Parses the schema
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluid interface
-     */
-    protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
-    {
-        return $this;
-    }
-
-    /**
-     * Gets the attribute Types
-     *
-     * @return array
-     */
-    public function getAttributeTypes()
-    {
-        return array();
-    }
-
-    /**
-     * Gets the object classes
-     *
-     * @return array
-     */
-    public function getObjectClasses()
-    {
-        return array();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
deleted file mode 100644
index 0b17a2781..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema
- */
-require_once 'Zend/Ldap/Node/Schema.php';
-/**
- * @see Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory
- */
-require_once 'Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php';
-/**
- * @see Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory
- */
-require_once 'Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php';
-
-/**
- * Zend_Ldap_Node_Schema_ActiveDirectory provides a simple data-container for the Schema node of
- * an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema
-{
-    /**
-     * The attribute Types
-     *
-     * @var array
-     */
-    protected $_attributeTypes = array();
-    /**
-     * The object classes
-     *
-     * @var array
-     */
-    protected $_objectClasses = array();
-
-    /**
-     * Parses the schema
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluid interface
-     */
-    protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
-    {
-        parent::_parseSchema($dn, $ldap);
-        foreach ($ldap->search('(objectClass=classSchema)', $dn,
-                Zend_Ldap::SEARCH_SCOPE_ONE) as $node) {
-            $val = new Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory($node);
-            $this->_objectClasses[$val->getName()] = $val;
-        }
-        foreach ($ldap->search('(objectClass=attributeSchema)', $dn,
-                Zend_Ldap::SEARCH_SCOPE_ONE) as $node) {
-            $val = new Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory($node);
-            $this->_attributeTypes[$val->getName()] = $val;
-        }
-        return $this;
-    }
-
-    /**
-     * Gets the attribute Types
-     *
-     * @return array
-     */
-    public function getAttributeTypes()
-    {
-        return $this->_attributeTypes;
-    }
-
-    /**
-     * Gets the object classes
-     *
-     * @return array
-     */
-    public function getObjectClasses()
-    {
-        return $this->_objectClasses;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
deleted file mode 100644
index 824a91e46..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema_Item
- */
-require_once 'Zend/Ldap/Node/Schema/Item.php';
-/**
- * @see Zend_Ldap_Node_Schema_AttributeType_Interface
- */
-require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php';
-
-/**
- * Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory provides access to the attribute type
- * schema information on an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory extends Zend_Ldap_Node_Schema_Item
-    implements Zend_Ldap_Node_Schema_AttributeType_Interface
-{
-    /**
-     * Gets the attribute name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->ldapdisplayname[0];
-    }
-
-    /**
-     * Gets the attribute OID
-     *
-     * @return string
-     */
-    public function getOid()
-    {
-
-    }
-
-    /**
-     * Gets the attribute syntax
-     *
-     * @return string
-     */
-    public function getSyntax()
-    {
-
-    }
-
-    /**
-     * Gets the attribute maximum length
-     *
-     * @return int|null
-     */
-    public function getMaxLength()
-    {
-
-    }
-
-    /**
-     * Returns if the attribute is single-valued.
-     *
-     * @return boolean
-     */
-    public function isSingleValued()
-    {
-
-    }
-
-    /**
-     * Gets the attribute description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php
deleted file mode 100644
index c24d07720..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Node_Schema_AttributeType_Interface provides a contract for schema attribute-types.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Ldap_Node_Schema_AttributeType_Interface
-{
-    /**
-     * Gets the attribute name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Gets the attribute OID
-     *
-     * @return string
-     */
-    public function getOid();
-
-    /**
-     * Gets the attribute syntax
-     *
-     * @return string
-     */
-    public function getSyntax();
-
-    /**
-     * Gets the attribute maximum length
-     *
-     * @return int|null
-     */
-    public function getMaxLength();
-
-    /**
-     * Returns if the attribute is single-valued.
-     *
-     * @return boolean
-     */
-    public function isSingleValued();
-
-    /**
-     * Gets the attribute description
-     *
-     * @return string
-     */
-    public function getDescription();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
deleted file mode 100644
index 2152428f7..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema_Item
- */
-require_once 'Zend/Ldap/Node/Schema/Item.php';
-/**
- * @see Zend_Ldap_Node_Schema_AttributeType_Interface
- */
-require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php';
-
-/**
- * Zend_Ldap_Node_Schema_AttributeType_OpenLdap provides access to the attribute type
- * schema information on an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_AttributeType_OpenLdap extends Zend_Ldap_Node_Schema_Item
-    implements Zend_Ldap_Node_Schema_AttributeType_Interface
-{
-    /**
-     * Gets the attribute name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the attribute OID
-     *
-     * @return string
-     */
-    public function getOid()
-    {
-        return $this->oid;
-    }
-
-    /**
-     * Gets the attribute syntax
-     *
-     * @return string
-     */
-    public function getSyntax()
-    {
-        if ($this->syntax === null) {
-            $parent = $this->getParent();
-            if ($parent === null) return null;
-            else return $parent->getSyntax();
-        } else {
-            return $this->syntax;
-        }
-    }
-
-    /**
-     * Gets the attribute maximum length
-     *
-     * @return int|null
-     */
-    public function getMaxLength()
-    {
-        $maxLength = $this->{'max-length'};
-        if ($maxLength === null) {
-            $parent = $this->getParent();
-            if ($parent === null) return null;
-            else return $parent->getMaxLength();
-        } else {
-            return (int)$maxLength;
-        }
-    }
-
-    /**
-     * Returns if the attribute is single-valued.
-     *
-     * @return boolean
-     */
-    public function isSingleValued()
-    {
-        return $this->{'single-value'};
-    }
-
-    /**
-     * Gets the attribute description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->desc;
-    }
-
-    /**
-     * Returns the parent attribute type in the inhertitance tree if one exists
-     *
-     * @return Zend_Ldap_Node_Schema_AttributeType_OpenLdap|null
-     */
-    public function getParent()
-    {
-        if (count($this->_parents) === 1) {
-            return $this->_parents[0];
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/Item.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/Item.php
deleted file mode 100644
index ed3e26a34..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/Item.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Node_Schema_Item provides a base implementation for managing schema
- * items like objectClass and attribute.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Ldap_Node_Schema_Item implements ArrayAccess, Countable
-{
-    /**
-     * The underlying data
-     *
-     * @var array
-     */
-    protected $_data;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data
-     */
-    public function __construct(array $data)
-    {
-        $this->setData($data);
-    }
-
-    /**
-     * Sets the data
-     *
-     * @param  array $data
-     * @return Zend_Ldap_Node_Schema_Item Provides a fluid interface
-     */
-    public function setData(array $data)
-    {
-        $this->_data = $data;
-        return $this;
-    }
-
-    /**
-     * Gets the data
-     *
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Gets a specific attribute from this item
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->_data)) {
-            return $this->_data[$name];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Checks whether a specific attribute exists.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        return (array_key_exists($name, $this->_data));
-    }
-
-    /**
-     * Always throws BadMethodCallException
-     * Implements ArrayAccess.
-     *
-     * This method is needed for a full implementation of ArrayAccess
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function offsetSet($name, $value)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Gets a specific attribute from this item
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function offsetGet($name)
-    {
-        return $this->__get($name);
-    }
-
-    /**
-     * Always throws BadMethodCallException
-     * Implements ArrayAccess.
-     *
-     * This method is needed for a full implementation of ArrayAccess
-     *
-     * @param  string $name
-     * @return null
-     * @throws BadMethodCallException
-     */
-    public function offsetUnset($name)
-    {
-        throw new BadMethodCallException();
-    }
-
-    /**
-     * Checks whether a specific attribute exists.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function offsetExists($name)
-    {
-        return $this->__isset($name);
-    }
-
-    /**
-     * Returns the number of attributes.
-     * Implements Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_data);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
deleted file mode 100644
index cc8611edd..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema_Item
- */
-require_once 'Zend/Ldap/Node/Schema/Item.php';
-/**
- * @see Zend_Ldap_Node_Schema_ObjectClass_Interface
- */
-require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php';
-
-/**
- * Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory provides access to the objectClass
- * schema information on an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory extends Zend_Ldap_Node_Schema_Item
-    implements Zend_Ldap_Node_Schema_ObjectClass_Interface
-{
-    /**
-     * Gets the objectClass name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->ldapdisplayname[0];
-    }
-
-    /**
-     * Gets the objectClass OID
-     *
-     * @return string
-     */
-    public function getOid()
-    {
-
-    }
-
-    /**
-     * Gets the attributes that this objectClass must contain
-     *
-     * @return array
-     */
-    public function getMustContain()
-    {
-
-    }
-
-    /**
-     * Gets the attributes that this objectClass may contain
-     *
-     * @return array
-     */
-    public function getMayContain()
-    {
-
-    }
-
-    /**
-     * Gets the objectClass description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-
-    }
-
-    /**
-     * Gets the objectClass type
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-
-    }
-
-    /**
-     * Returns the parent objectClasses of this class.
-     * This includes structural, abstract and auxiliary objectClasses
-     *
-     * @return array
-     */
-    public function getParentClasses()
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
deleted file mode 100644
index fceafdd80..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Ldap_Node_Schema_ObjectClass_Interface provides a contract for schema objectClasses.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Ldap_Node_Schema_ObjectClass_Interface
-{
-    /**
-     * Gets the objectClass name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Gets the objectClass OID
-     *
-     * @return string
-     */
-    public function getOid();
-
-    /**
-     * Gets the attributes that this objectClass must contain
-     *
-     * @return array
-     */
-    public function getMustContain();
-
-    /**
-     * Gets the attributes that this objectClass may contain
-     *
-     * @return array
-     */
-    public function getMayContain();
-
-    /**
-     * Gets the objectClass description
-     *
-     * @return string
-     */
-    public function getDescription();
-
-    /**
-     * Gets the objectClass type
-     *
-     * @return integer
-     */
-    public function getType();
-
-    /**
-     * Returns the parent objectClasses of this class.
-     * This includes structural, abstract and auxiliary objectClasses
-     *
-     * @return array
-     */
-    public function getParentClasses();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
deleted file mode 100644
index 4ca8b3f09..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema_Item
- */
-require_once 'Zend/Ldap/Node/Schema/Item.php';
-/**
- * @see Zend_Ldap_Node_Schema_ObjectClass_Interface
- */
-require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php';
-
-/**
- * Zend_Ldap_Node_Schema_ObjectClass_OpenLdap provides access to the objectClass
- * schema information on an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_ObjectClass_OpenLdap extends Zend_Ldap_Node_Schema_Item
-    implements Zend_Ldap_Node_Schema_ObjectClass_Interface
-{
-    /**
-     * All inherited "MUST" attributes
-     *
-     * @var array
-     */
-    protected $_inheritedMust = null;
-    /**
-     * All inherited "MAY" attributes
-     *
-     * @var array
-     */
-    protected $_inheritedMay = null;
-
-
-    /**
-     * Gets the objectClass name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the objectClass OID
-     *
-     * @return string
-     */
-    public function getOid()
-    {
-        return $this->oid;
-    }
-
-    /**
-     * Gets the attributes that this objectClass must contain
-     *
-     * @return array
-     */
-    public function getMustContain()
-    {
-        if ($this->_inheritedMust === null) {
-            $this->_resolveInheritance();
-        }
-        return $this->_inheritedMust;
-    }
-
-    /**
-     * Gets the attributes that this objectClass may contain
-     *
-     * @return array
-     */
-    public function getMayContain()
-    {
-        if ($this->_inheritedMay === null) {
-            $this->_resolveInheritance();
-        }
-        return $this->_inheritedMay;
-    }
-
-    /**
-     * Resolves the inheritance tree
-     *
-     * @return void
-     */
-    protected function _resolveInheritance()
-    {
-        $must = $this->must;
-        $may = $this->may;
-        foreach ($this->getParents() as $p) {
-            $must = array_merge($must, $p->getMustContain());
-            $may = array_merge($may, $p->getMayContain());
-        }
-        $must = array_unique($must);
-        $may = array_unique($may);
-        $may = array_diff($may, $must);
-        sort($must, SORT_STRING);
-        sort($may, SORT_STRING);
-        $this->_inheritedMust = $must;
-        $this->_inheritedMay = $may;
-    }
-
-    /**
-     * Gets the objectClass description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->desc;
-    }
-
-    /**
-     * Gets the objectClass type
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        if ($this->structural) {
-            return Zend_Ldap_Node_Schema::OBJECTCLASS_TYPE_STRUCTURAL;
-        } else if ($this->abstract) {
-            return Zend_Ldap_Node_Schema::OBJECTCLASS_TYPE_ABSTRACT;
-        } else if ($this->auxiliary) {
-            return Zend_Ldap_Node_Schema::OBJECTCLASS_TYPE_AUXILIARY;
-        } else {
-            return Zend_Ldap_Node_Schema::OBJECTCLASS_TYPE_UNKNOWN;
-        }
-    }
-
-    /**
-     * Returns the parent objectClasses of this class.
-     * This includes structural, abstract and auxiliary objectClasses
-     *
-     * @return array
-     */
-    public function getParentClasses()
-    {
-        return $this->sup;
-    }
-
-    /**
-     * Returns the parent object classes in the inhertitance tree if one exists
-     *
-     * @return array of Zend_Ldap_Node_Schema_ObjectClass_OpenLdap
-     */
-    public function getParents()
-    {
-        return $this->_parents;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Ldap/Node/Schema/OpenLdap.php b/airtime_mvc/library/Zend/Ldap/Node/Schema/OpenLdap.php
deleted file mode 100644
index 690df3c0a..000000000
--- a/airtime_mvc/library/Zend/Ldap/Node/Schema/OpenLdap.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Ldap_Node_Schema
- */
-require_once 'Zend/Ldap/Node/Schema.php';
-/**
- * @see Zend_Ldap_Node_Schema_AttributeType_OpenLdap
- */
-require_once 'Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php';
-/**
- * @see Zend_Ldap_Node_Schema_ObjectClass_OpenLdap
- */
-require_once 'Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php';
-
-/**
- * Zend_Ldap_Node_Schema_OpenLdap provides a simple data-container for the Schema node of
- * an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
-{
-    /**
-     * The attribute Types
-     *
-     * @var array
-     */
-    protected $_attributeTypes = null;
-    /**
-     * The object classes
-     *
-     * @var array
-     */
-    protected $_objectClasses = null;
-    /**
-     * The LDAP syntaxes
-     *
-     * @var array
-     */
-    protected $_ldapSyntaxes = null;
-    /**
-     * The matching rules
-     *
-     * @var array
-     */
-    protected $_matchingRules = null;
-    /**
-     * The matching rule use
-     *
-     * @var array
-     */
-    protected $_matchingRuleUse = null;
-
-    /**
-     * Parses the schema
-     *
-     * @param  Zend_Ldap_Dn $dn
-     * @param  Zend_Ldap    $ldap
-     * @return Zend_Ldap_Node_Schema Provides a fluid interface
-     */
-    protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
-    {
-        parent::_parseSchema($dn, $ldap);
-        $this->_loadAttributeTypes();
-        $this->_loadLdapSyntaxes();
-        $this->_loadMatchingRules();
-        $this->_loadMatchingRuleUse();
-        $this->_loadObjectClasses();
-        return $this;
-    }
-
-    /**
-     * Gets the attribute Types
-     *
-     * @return array
-     */
-    public function getAttributeTypes()
-    {
-        return $this->_attributeTypes;
-    }
-
-    /**
-     * Gets the object classes
-     *
-     * @return array
-     */
-    public function getObjectClasses()
-    {
-        return $this->_objectClasses;
-    }
-
-    /**
-     * Gets the LDAP syntaxes
-     *
-     * @return array
-     */
-    public function getLdapSyntaxes()
-    {
-        return $this->_ldapSyntaxes;
-    }
-
-    /**
-     * Gets the matching rules
-     *
-     * @return array
-     */
-    public function getMatchingRules()
-    {
-        return $this->_matchingRules;
-    }
-
-    /**
-     * Gets the matching rule use
-     *
-     * @return array
-     */
-    public function getMatchingRuleUse()
-    {
-        return $this->_matchingRuleUse;
-    }
-
-    /**
-     * Loads the attribute Types
-     *
-     * @return void
-     */
-    protected function _loadAttributeTypes()
-    {
-        $this->_attributeTypes = array();
-        foreach ($this->getAttribute('attributeTypes') as $value) {
-            $val = $this->_parseAttributeType($value);
-            $val = new Zend_Ldap_Node_Schema_AttributeType_OpenLdap($val);
-            $this->_attributeTypes[$val->getName()] = $val;
-
-        }
-        foreach ($this->_attributeTypes as $val) {
-            if (count($val->sup) > 0) {
-                $this->_resolveInheritance($val, $this->_attributeTypes);
-            }
-            foreach ($val->aliases as $alias) {
-                $this->_attributeTypes[$alias] = $val;
-            }
-        }
-        ksort($this->_attributeTypes, SORT_STRING);
-    }
-
-    /**
-     * Parses an attributeType value
-     *
-     * @param  string $value
-     * @return array
-     */
-    protected function _parseAttributeType($value)
-    {
-        $attributeType = array(
-            'oid'                  => null,
-            'name'                 => null,
-            'desc'                 => null,
-            'obsolete'             => false,
-            'sup'                  => null,
-            'equality'             => null,
-            'ordering'             => null,
-            'substr'               => null,
-            'syntax'               => null,
-            'max-length'           => null,
-            'single-value'         => false,
-            'collective'           => false,
-            'no-user-modification' => false,
-            'usage'                => 'userApplications',
-            '_string'              => $value,
-            '_parents'             => array());
-
-        $tokens = $this->_tokenizeString($value);
-        $attributeType['oid'] = array_shift($tokens); // first token is the oid
-        $this->_parseLdapSchemaSyntax($attributeType, $tokens);
-
-        if (array_key_exists('syntax', $attributeType)) {
-            // get max length from syntax
-            if (preg_match('/^(.+){(\d+)}$/', $attributeType['syntax'], $matches)) {
-                $attributeType['syntax'] = $matches[1];
-                $attributeType['max-length'] = $matches[2];
-            }
-        }
-
-        $this->_ensureNameAttribute($attributeType);
-
-        return $attributeType;
-    }
-
-    /**
-     * Loads the object classes
-     *
-     * @return void
-     */
-    protected function _loadObjectClasses()
-    {
-        $this->_objectClasses = array();
-        foreach ($this->getAttribute('objectClasses') as $value) {
-            $val = $this->_parseObjectClass($value);
-            $val = new Zend_Ldap_Node_Schema_ObjectClass_OpenLdap($val);
-            $this->_objectClasses[$val->getName()] = $val;
-        }
-        foreach ($this->_objectClasses as $val) {
-            if (count($val->sup) > 0) {
-                $this->_resolveInheritance($val, $this->_objectClasses);
-            }
-            foreach ($val->aliases as $alias) {
-                $this->_objectClasses[$alias] = $val;
-            }
-        }
-        ksort($this->_objectClasses, SORT_STRING);
-    }
-
-    /**
-     * Parses an objectClasses value
-     *
-     * @param string $value
-     * @return array
-     */
-    protected function _parseObjectClass($value)
-    {
-        $objectClass = array(
-            'oid'        => null,
-            'name'       => null,
-            'desc'       => null,
-            'obsolete'   => false,
-            'sup'        => array(),
-            'abstract'   => false,
-            'structural' => false,
-            'auxiliary'  => false,
-            'must'       => array(),
-            'may'        => array(),
-            '_string'    => $value,
-            '_parents'   => array());
-
-        $tokens = $this->_tokenizeString($value);
-        $objectClass['oid'] = array_shift($tokens); // first token is the oid
-        $this->_parseLdapSchemaSyntax($objectClass, $tokens);
-
-        $this->_ensureNameAttribute($objectClass);
-
-        return $objectClass;
-    }
-
-    /**
-     * Resolves inheritance in objectClasses and attributes
-     *
-     * @param Zend_Ldap_Node_Schema_Item $node
-     * @param array                      $repository
-     */
-    protected function _resolveInheritance(Zend_Ldap_Node_Schema_Item $node, array $repository)
-    {
-        $data = $node->getData();
-        $parents = $data['sup'];
-        if ($parents === null || !is_array($parents) || count($parents) < 1) return;
-        foreach ($parents as $parent) {
-            if (!array_key_exists($parent, $repository)) continue;
-            if (!array_key_exists('_parents', $data) || !is_array($data['_parents'])) {
-               $data['_parents'] = array();
-           }
-           $data['_parents'][] = $repository[$parent];
-        }
-        $node->setData($data);
-    }
-
-    /**
-     * Loads the LDAP syntaxes
-     *
-     * @return void
-     */
-    protected function _loadLdapSyntaxes()
-    {
-        $this->_ldapSyntaxes = array();
-        foreach ($this->getAttribute('ldapSyntaxes') as $value) {
-            $val = $this->_parseLdapSyntax($value);
-            $this->_ldapSyntaxes[$val['oid']] = $val;
-        }
-        ksort($this->_ldapSyntaxes, SORT_STRING);
-    }
-
-    /**
-     * Parses an ldapSyntaxes value
-     *
-     * @param  string $value
-     * @return array
-     */
-    protected function _parseLdapSyntax($value)
-    {
-        $ldapSyntax = array(
-            'oid'      => null,
-            'desc'     => null,
-            '_string' => $value);
-
-        $tokens = $this->_tokenizeString($value);
-        $ldapSyntax['oid'] = array_shift($tokens); // first token is the oid
-        $this->_parseLdapSchemaSyntax($ldapSyntax, $tokens);
-
-        return $ldapSyntax;
-    }
-
-    /**
-     * Loads the matching rules
-     *
-     * @return void
-     */
-    protected function _loadMatchingRules()
-    {
-        $this->_matchingRules = array();
-        foreach ($this->getAttribute('matchingRules') as $value) {
-            $val = $this->_parseMatchingRule($value);
-            $this->_matchingRules[$val['name']] = $val;
-        }
-        ksort($this->_matchingRules, SORT_STRING);
-    }
-
-    /**
-     * Parses an matchingRules value
-     *
-     * @param  string $value
-     * @return array
-     */
-    protected function _parseMatchingRule($value)
-    {
-        $matchingRule = array(
-            'oid'      => null,
-            'name'     => null,
-            'desc'     => null,
-            'obsolete' => false,
-            'syntax'   => null,
-            '_string'  => $value);
-
-        $tokens = $this->_tokenizeString($value);
-        $matchingRule['oid'] = array_shift($tokens); // first token is the oid
-        $this->_parseLdapSchemaSyntax($matchingRule, $tokens);
-
-        $this->_ensureNameAttribute($matchingRule);
-
-        return $matchingRule;
-    }
-
-    /**
-     * Loads the matching rule use
-     *
-     * @return void
-     */
-    protected function _loadMatchingRuleUse()
-    {
-        $this->_matchingRuleUse = array();
-        foreach ($this->getAttribute('matchingRuleUse') as $value) {
-            $val = $this->_parseMatchingRuleUse($value);
-            $this->_matchingRuleUse[$val['name']] = $val;
-        }
-        ksort($this->_matchingRuleUse, SORT_STRING);
-    }
-
-    /**
-     * Parses an matchingRuleUse value
-     *
-     * @param  string $value
-     * @return array
-     */
-    protected function _parseMatchingRuleUse($value)
-    {
-        $matchingRuleUse = array(
-            'oid'      => null,
-            'name'     => null,
-            'desc'     => null,
-            'obsolete' => false,
-            'applies'  => array(),
-            '_string'  => $value);
-
-        $tokens = $this->_tokenizeString($value);
-        $matchingRuleUse['oid'] = array_shift($tokens); // first token is the oid
-        $this->_parseLdapSchemaSyntax($matchingRuleUse, $tokens);
-
-        $this->_ensureNameAttribute($matchingRuleUse);
-
-        return $matchingRuleUse;
-    }
-
-    /**
-     * Ensures that a name element is present and that it is single-values.
-     *
-     * @param array $data
-     */
-    protected function _ensureNameAttribute(array &$data)
-    {
-        if (!array_key_exists('name', $data) || empty($data['name'])) {
-            // force a name
-            $data['name'] = $data['oid'];
-        }
-        if (is_array($data['name'])) {
-            // make one name the default and put the other ones into aliases
-            $aliases = $data['name'];
-            $data['name'] = array_shift($aliases);
-            $data['aliases'] = $aliases;
-        } else {
-            $data['aliases'] = array();
-        }
-    }
-
-    /**
-     * Parse the given tokens into a data structure
-     *
-     * @param  array $data
-     * @param  array $tokens
-     * @return void
-     */
-    protected function _parseLdapSchemaSyntax(array &$data, array $tokens)
-    {
-        // tokens that have no value associated
-        $noValue = array('single-value',
-            'obsolete',
-            'collective',
-            'no-user-modification',
-            'abstract',
-            'structural',
-            'auxiliary');
-        // tokens that can have multiple values
-        $multiValue = array('must', 'may', 'sup');
-
-        while (count($tokens) > 0) {
-            $token = strtolower(array_shift($tokens));
-            if (in_array($token, $noValue)) {
-                $data[$token] = true; // single value token
-            } else {
-                $data[$token] = array_shift($tokens);
-                // this one follows a string or a list if it is multivalued
-                if ($data[$token] == '(') {
-                    // this creates the list of values and cycles through the tokens
-                    // until the end of the list is reached ')'
-                    $data[$token] = array();
-                    while ($tmp = array_shift($tokens)) {
-                        if ($tmp == ')') break;
-                        if ($tmp != '$') {
-                            $data[$token][] = Zend_Ldap_Attribute::convertFromLdapValue($tmp);
-                        }
-                    }
-                } else {
-                    $data[$token] = Zend_Ldap_Attribute::convertFromLdapValue($data[$token]);
-                }
-                // create a array if the value should be multivalued but was not
-                if (in_array($token, $multiValue) && !is_array($data[$token])) {
-                    $data[$token] = array($data[$token]);
-                }
-            }
-        }
-    }
-
-    /**
-    * Tokenizes the given value into an array
-    *
-    * @param  string $value
-    * @return array tokens
-    */
-    protected function _tokenizeString($value)
-    {
-        $tokens = array();
-        $matches = array();
-        // this one is taken from PEAR::Net_LDAP2
-        $pattern = "/\s* (?:([()]) | ([^'\s()]+) | '((?:[^']+|'[^\s)])*)') \s*/x";
-        preg_match_all($pattern, $value, $matches);
-        $cMatches = count($matches[0]);
-        $cPattern = count($matches);
-        for ($i = 0; $i < $cMatches; $i++) {     // number of tokens (full pattern match)
-            for ($j = 1; $j < $cPattern; $j++) { // each subpattern
-                $tok = trim($matches[$j][$i]);
-                if (!empty($tok)) {              // pattern match in this subpattern
-                    $tokens[$i] = $tok;          // this is the token
-                }
-            }
-        }
-        if ($tokens[0] == '(') array_shift($tokens);
-        if ($tokens[count($tokens) - 1] == ')') array_pop($tokens);
-        return $tokens;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Loader.php b/airtime_mvc/library/Zend/Loader.php
deleted file mode 100644
index 4647abde5..000000000
--- a/airtime_mvc/library/Zend/Loader.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Loader.php 20990 2010-02-08 18:20:39Z matthew $
- */
-
-/**
- * Static methods for loading classes and files.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader
-{
-    /**
-     * Loads a class from a PHP file.  The filename must be formatted
-     * as "$class.php".
-     *
-     * If $dirs is a string or an array, it will search the directories
-     * in the order supplied, and attempt to load the first matching file.
-     *
-     * If $dirs is null, it will split the class name at underscores to
-     * generate a path hierarchy (e.g., "Zend_Example_Class" will map
-     * to "Zend/Example/Class.php").
-     *
-     * If the file was not found in the $dirs, or if no $dirs were specified,
-     * it will attempt to load it from PHP's include_path.
-     *
-     * @param string $class      - The full class name of a Zend component.
-     * @param string|array $dirs - OPTIONAL Either a path or an array of paths
-     *                             to search.
-     * @return void
-     * @throws Zend_Exception
-     */
-    public static function loadClass($class, $dirs = null)
-    {
-        if (class_exists($class, false) || interface_exists($class, false)) {
-            return;
-        }
-
-        if ((null !== $dirs) && !is_string($dirs) && !is_array($dirs)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('Directory argument must be a string or an array');
-        }
-
-        // Autodiscover the path from the class name
-        // Implementation is PHP namespace-aware, and based on 
-        // Framework Interop Group reference implementation:
-        // http://groups.google.com/group/php-standards/web/psr-0-final-proposal
-        $className = ltrim($class, '\\');
-        $file      = '';
-        $namespace = '';
-        if ($lastNsPos = strripos($className, '\\')) {
-            $namespace = substr($className, 0, $lastNsPos);
-            $className = substr($className, $lastNsPos + 1);
-            $file      = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
-        }
-        $file .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-
-        if (!empty($dirs)) {
-            // use the autodiscovered path
-            $dirPath = dirname($file);
-            if (is_string($dirs)) {
-                $dirs = explode(PATH_SEPARATOR, $dirs);
-            }
-            foreach ($dirs as $key => $dir) {
-                if ($dir == '.') {
-                    $dirs[$key] = $dirPath;
-                } else {
-                    $dir = rtrim($dir, '\\/');
-                    $dirs[$key] = $dir . DIRECTORY_SEPARATOR . $dirPath;
-                }
-            }
-            $file = basename($file);
-            self::loadFile($file, $dirs, true);
-        } else {
-            self::loadFile($file, null, true);
-        }
-
-        if (!class_exists($class, false) && !interface_exists($class, false)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("File \"$file\" does not exist or class \"$class\" was not found in the file");
-        }
-    }
-
-    /**
-     * Loads a PHP file.  This is a wrapper for PHP's include() function.
-     *
-     * $filename must be the complete filename, including any
-     * extension such as ".php".  Note that a security check is performed that
-     * does not permit extended characters in the filename.  This method is
-     * intended for loading Zend Framework files.
-     *
-     * If $dirs is a string or an array, it will search the directories
-     * in the order supplied, and attempt to load the first matching file.
-     *
-     * If the file was not found in the $dirs, or if no $dirs were specified,
-     * it will attempt to load it from PHP's include_path.
-     *
-     * If $once is TRUE, it will use include_once() instead of include().
-     *
-     * @param  string        $filename
-     * @param  string|array  $dirs - OPTIONAL either a path or array of paths
-     *                       to search.
-     * @param  boolean       $once
-     * @return boolean
-     * @throws Zend_Exception
-     */
-    public static function loadFile($filename, $dirs = null, $once = false)
-    {
-        self::_securityCheck($filename);
-
-        /**
-         * Search in provided directories, as well as include_path
-         */
-        $incPath = false;
-        if (!empty($dirs) && (is_array($dirs) || is_string($dirs))) {
-            if (is_array($dirs)) {
-                $dirs = implode(PATH_SEPARATOR, $dirs);
-            }
-            $incPath = get_include_path();
-            set_include_path($dirs . PATH_SEPARATOR . $incPath);
-        }
-
-        /**
-         * Try finding for the plain filename in the include_path.
-         */
-        if ($once) {
-            include_once $filename;
-        } else {
-            include $filename;
-        }
-
-        /**
-         * If searching in directories, reset include_path
-         */
-        if ($incPath) {
-            set_include_path($incPath);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns TRUE if the $filename is readable, or FALSE otherwise.
-     * This function uses the PHP include_path, where PHP's is_readable()
-     * does not.
-     *
-     * Note from ZF-2900:
-     * If you use custom error handler, please check whether return value
-     *  from error_reporting() is zero or not.
-     * At mark of fopen() can not suppress warning if the handler is used.
-     *
-     * @param string   $filename
-     * @return boolean
-     */
-    public static function isReadable($filename)
-    {
-        if (is_readable($filename)) {
-            // Return early if the filename is readable without needing the 
-            // include_path
-            return true;
-        }
-
-        foreach (self::explodeIncludePath() as $path) {
-            if ($path == '.') {
-                if (is_readable($filename)) {
-                    return true;
-                }
-                continue;
-            }
-            $file = $path . '/' . $filename;
-            if (is_readable($file)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Explode an include path into an array
-     *
-     * If no path provided, uses current include_path. Works around issues that
-     * occur when the path includes stream schemas.
-     * 
-     * @param  string|null $path 
-     * @return array
-     */
-    public static function explodeIncludePath($path = null)
-    {
-        if (null === $path) {
-            $path = get_include_path();
-        }
-
-        if (PATH_SEPARATOR == ':') {
-            // On *nix systems, include_paths which include paths with a stream 
-            // schema cannot be safely explode'd, so we have to be a bit more
-            // intelligent in the approach.
-            $paths = preg_split('#:(?!//)#', $path);
-        } else {
-            $paths = explode(PATH_SEPARATOR, $path);
-        }
-        return $paths;
-    }
-
-    /**
-     * spl_autoload() suitable implementation for supporting class autoloading.
-     *
-     * Attach to spl_autoload() using the following:
-     * <code>
-     * spl_autoload_register(array('Zend_Loader', 'autoload'));
-     * </code>
-     *
-     * @deprecated Since 1.8.0
-     * @param  string $class
-     * @return string|false Class name on success; false on failure
-     */
-    public static function autoload($class)
-    {
-        trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated as of 1.8.0 and will be removed with 2.0.0; use Zend_Loader_Autoloader instead', E_USER_NOTICE);
-        try {
-            @self::loadClass($class);
-            return $class;
-        } catch (Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Register {@link autoload()} with spl_autoload()
-     *
-     * @deprecated Since 1.8.0
-     * @param string $class (optional)
-     * @param boolean $enabled (optional)
-     * @return void
-     * @throws Zend_Exception if spl_autoload() is not found
-     * or if the specified class does not have an autoload() method.
-     */
-    public static function registerAutoload($class = 'Zend_Loader', $enabled = true)
-    {
-        trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated as of 1.8.0 and will be removed with 2.0.0; use Zend_Loader_Autoloader instead', E_USER_NOTICE);
-        require_once 'Zend/Loader/Autoloader.php';
-        $autoloader = Zend_Loader_Autoloader::getInstance();
-        $autoloader->setFallbackAutoloader(true);
-
-        if ('Zend_Loader' != $class) {
-            self::loadClass($class);
-            $methods = get_class_methods($class);
-            if (!in_array('autoload', (array) $methods)) {
-                require_once 'Zend/Exception.php';
-                throw new Zend_Exception("The class \"$class\" does not have an autoload() method");
-            }
-
-            $callback = array($class, 'autoload');
-
-            if ($enabled) {
-                $autoloader->pushAutoloader($callback);
-            } else {
-                $autoloader->removeAutoloader($callback);
-            }
-        }
-    }
-
-    /**
-     * Ensure that filename does not contain exploits
-     *
-     * @param  string $filename
-     * @return void
-     * @throws Zend_Exception
-     */
-    protected static function _securityCheck($filename)
-    {
-        /**
-         * Security check
-         */
-        if (preg_match('/[^a-z0-9\\/\\\\_.:-]/i', $filename)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('Security check: Illegal character in filename');
-        }
-    }
-
-    /**
-     * Attempt to include() the file.
-     *
-     * include() is not prefixed with the @ operator because if
-     * the file is loaded and contains a parse error, execution
-     * will halt silently and this is difficult to debug.
-     *
-     * Always set display_errors = Off on production servers!
-     *
-     * @param  string  $filespec
-     * @param  boolean $once
-     * @return boolean
-     * @deprecated Since 1.5.0; use loadFile() instead
-     */
-    protected static function _includeFile($filespec, $once = false)
-    {
-        if ($once) {
-            return include_once $filespec;
-        } else {
-            return include $filespec ;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Loader/Autoloader.php b/airtime_mvc/library/Zend/Loader/Autoloader.php
deleted file mode 100644
index 11ddf6eca..000000000
--- a/airtime_mvc/library/Zend/Loader/Autoloader.php
+++ /dev/null
@@ -1,584 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Autoloader.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/**
- * Autoloader stack and namespace autoloader
- *
- * @uses       Zend_Loader_Autoloader
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader_Autoloader
-{
-    /**
-     * @var Zend_Loader_Autoloader Singleton instance
-     */
-    protected static $_instance;
-
-    /**
-     * @var array Concrete autoloader callback implementations
-     */
-    protected $_autoloaders = array();
-
-    /**
-     * @var array Default autoloader callback
-     */
-    protected $_defaultAutoloader = array('Zend_Loader', 'loadClass');
-
-    /**
-     * @var bool Whether or not to act as a fallback autoloader
-     */
-    protected $_fallbackAutoloader = false;
-
-    /**
-     * @var array Callback for internal autoloader implementation
-     */
-    protected $_internalAutoloader;
-
-    /**
-     * @var array Supported namespaces 'Zend' and 'ZendX' by default.
-     */
-    protected $_namespaces = array(
-        'Zend_'  => true,
-        'ZendX_' => true,
-    );
-
-    /**
-     * @var array Namespace-specific autoloaders
-     */
-    protected $_namespaceAutoloaders = array();
-
-    /**
-     * @var bool Whether or not to suppress file not found warnings
-     */
-    protected $_suppressNotFoundWarnings = false;
-
-    /**
-     * @var null|string
-     */
-    protected $_zfPath;
-
-    /**
-     * Retrieve singleton instance
-     *
-     * @return Zend_Loader_Autoloader
-     */
-    public static function getInstance()
-    {
-        if (null === self::$_instance) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Reset the singleton instance
-     *
-     * @return void
-     */
-    public static function resetInstance()
-    {
-        self::$_instance = null;
-    }
-
-    /**
-     * Autoload a class
-     *
-     * @param  string $class
-     * @return bool
-     */
-    public static function autoload($class)
-    {
-        $self = self::getInstance();
-
-        foreach ($self->getClassAutoloaders($class) as $autoloader) {
-            if ($autoloader instanceof Zend_Loader_Autoloader_Interface) {
-                if ($autoloader->autoload($class)) {
-                    return true;
-                }
-            } elseif (is_string($autoloader)) {
-                if ($autoloader($class)) {
-                    return true;
-                }
-            } elseif (is_array($autoloader)) {
-                $object = array_shift($autoloader);
-                $method = array_shift($autoloader);
-                if (call_user_func(array($object, $method), $class)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the default autoloader implementation
-     *
-     * @param  string|array $callback PHP callback
-     * @return void
-     */
-    public function setDefaultAutoloader($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new Zend_Loader_Exception('Invalid callback specified for default autoloader');
-        }
-
-        $this->_defaultAutoloader = $callback;
-        return $this;
-    }
-
-    /**
-     * Retrieve the default autoloader callback
-     *
-     * @return string|array PHP Callback
-     */
-    public function getDefaultAutoloader()
-    {
-        return $this->_defaultAutoloader;
-    }
-
-    /**
-     * Set several autoloader callbacks at once
-     *
-     * @param  array $autoloaders Array of PHP callbacks (or Zend_Loader_Autoloader_Interface implementations) to act as autoloaders
-     * @return Zend_Loader_Autoloader
-     */
-    public function setAutoloaders(array $autoloaders)
-    {
-        $this->_autoloaders = $autoloaders;
-        return $this;
-    }
-
-    /**
-     * Get attached autoloader implementations
-     *
-     * @return array
-     */
-    public function getAutoloaders()
-    {
-        return $this->_autoloaders;
-    }
-
-    /**
-     * Return all autoloaders for a given namespace
-     *
-     * @param  string $namespace
-     * @return array
-     */
-    public function getNamespaceAutoloaders($namespace)
-    {
-        $namespace = (string) $namespace;
-        if (!array_key_exists($namespace, $this->_namespaceAutoloaders)) {
-            return array();
-        }
-        return $this->_namespaceAutoloaders[$namespace];
-    }
-
-    /**
-     * Register a namespace to autoload
-     *
-     * @param  string|array $namespace
-     * @return Zend_Loader_Autoloader
-     */
-    public function registerNamespace($namespace)
-    {
-        if (is_string($namespace)) {
-            $namespace = (array) $namespace;
-        } elseif (!is_array($namespace)) {
-            throw new Zend_Loader_Exception('Invalid namespace provided');
-        }
-
-        foreach ($namespace as $ns) {
-            if (!isset($this->_namespaces[$ns])) {
-                $this->_namespaces[$ns] = true;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Unload a registered autoload namespace
-     *
-     * @param  string|array $namespace
-     * @return Zend_Loader_Autoloader
-     */
-    public function unregisterNamespace($namespace)
-    {
-        if (is_string($namespace)) {
-            $namespace = (array) $namespace;
-        } elseif (!is_array($namespace)) {
-            throw new Zend_Loader_Exception('Invalid namespace provided');
-        }
-
-        foreach ($namespace as $ns) {
-            if (isset($this->_namespaces[$ns])) {
-                unset($this->_namespaces[$ns]);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get a list of registered autoload namespaces
-     *
-     * @return array
-     */
-    public function getRegisteredNamespaces()
-    {
-        return array_keys($this->_namespaces);
-    }
-
-    public function setZfPath($spec, $version = 'latest')
-    {
-        $path = $spec;
-        if (is_array($spec)) {
-            if (!isset($spec['path'])) {
-                throw new Zend_Loader_Exception('No path specified for ZF');
-            }
-            $path = $spec['path'];
-            if (isset($spec['version'])) {
-                $version = $spec['version'];
-            }
-        }
-
-        $this->_zfPath = $this->_getVersionPath($path, $version);
-        set_include_path(implode(PATH_SEPARATOR, array(
-            $this->_zfPath,
-            get_include_path(),
-        )));
-        return $this;
-    }
-
-    public function getZfPath()
-    {
-        return $this->_zfPath;
-    }
-
-    /**
-     * Get or set the value of the "suppress not found warnings" flag
-     *
-     * @param  null|bool $flag
-     * @return bool|Zend_Loader_Autoloader Returns boolean if no argument is passed, object instance otherwise
-     */
-    public function suppressNotFoundWarnings($flag = null)
-    {
-        if (null === $flag) {
-            return $this->_suppressNotFoundWarnings;
-        }
-        $this->_suppressNotFoundWarnings = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Indicate whether or not this autoloader should be a fallback autoloader
-     *
-     * @param  bool $flag
-     * @return Zend_Loader_Autoloader
-     */
-    public function setFallbackAutoloader($flag)
-    {
-        $this->_fallbackAutoloader = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is this instance acting as a fallback autoloader?
-     *
-     * @return bool
-     */
-    public function isFallbackAutoloader()
-    {
-        return $this->_fallbackAutoloader;
-    }
-
-    /**
-     * Get autoloaders to use when matching class
-     *
-     * Determines if the class matches a registered namespace, and, if so,
-     * returns only the autoloaders for that namespace. Otherwise, it returns
-     * all non-namespaced autoloaders.
-     *
-     * @param  string $class
-     * @return array Array of autoloaders to use
-     */
-    public function getClassAutoloaders($class)
-    {
-        $namespace   = false;
-        $autoloaders = array();
-
-        // Add concrete namespaced autoloaders
-        foreach (array_keys($this->_namespaceAutoloaders) as $ns) {
-            if ('' == $ns) {
-                continue;
-            }
-            if (0 === strpos($class, $ns)) {
-                $namespace   = $ns;
-                $autoloaders = $autoloaders + $this->getNamespaceAutoloaders($ns);
-                break;
-            }
-        }
-
-        // Add internal namespaced autoloader
-        foreach ($this->getRegisteredNamespaces() as $ns) {
-            if (0 === strpos($class, $ns)) {
-                $namespace     = $ns;
-                $autoloaders[] = $this->_internalAutoloader;
-                break;
-            }
-        }
-
-        // Add non-namespaced autoloaders
-        $autoloaders = $autoloaders + $this->getNamespaceAutoloaders('');
-
-        // Add fallback autoloader
-        if (!$namespace && $this->isFallbackAutoloader()) {
-            $autoloaders[] = $this->_internalAutoloader;
-        }
-
-        return $autoloaders;
-    }
-
-    /**
-     * Add an autoloader to the beginning of the stack
-     *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
-     * @param  string|array $namespace Specific namespace(s) under which to register callback
-     * @return Zend_Loader_Autoloader
-     */
-    public function unshiftAutoloader($callback, $namespace = '')
-    {
-        $autoloaders = $this->getAutoloaders();
-        array_unshift($autoloaders, $callback);
-        $this->setAutoloaders($autoloaders);
-
-        $namespace = (array) $namespace;
-        foreach ($namespace as $ns) {
-            $autoloaders = $this->getNamespaceAutoloaders($ns);
-            array_unshift($autoloaders, $callback);
-            $this->_setNamespaceAutoloaders($autoloaders, $ns);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Append an autoloader to the autoloader stack
-     *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
-     * @param  string|array $namespace Specific namespace(s) under which to register callback
-     * @return Zend_Loader_Autoloader
-     */
-    public function pushAutoloader($callback, $namespace = '')
-    {
-        $autoloaders = $this->getAutoloaders();
-        array_push($autoloaders, $callback);
-        $this->setAutoloaders($autoloaders);
-
-        $namespace = (array) $namespace;
-        foreach ($namespace as $ns) {
-            $autoloaders = $this->getNamespaceAutoloaders($ns);
-            array_push($autoloaders, $callback);
-            $this->_setNamespaceAutoloaders($autoloaders, $ns);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove an autoloader from the autoloader stack
-     *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
-     * @param  null|string|array $namespace Specific namespace(s) from which to remove autoloader
-     * @return Zend_Loader_Autoloader
-     */
-    public function removeAutoloader($callback, $namespace = null)
-    {
-        if (null === $namespace) {
-            $autoloaders = $this->getAutoloaders();
-            if (false !== ($index = array_search($callback, $autoloaders, true))) {
-                unset($autoloaders[$index]);
-                $this->setAutoloaders($autoloaders);
-            }
-
-            foreach ($this->_namespaceAutoloaders as $ns => $autoloaders) {
-                if (false !== ($index = array_search($callback, $autoloaders, true))) {
-                    unset($autoloaders[$index]);
-                    $this->_setNamespaceAutoloaders($autoloaders, $ns);
-                }
-            }
-        } else {
-            $namespace = (array) $namespace;
-            foreach ($namespace as $ns) {
-                $autoloaders = $this->getNamespaceAutoloaders($ns);
-                if (false !== ($index = array_search($callback, $autoloaders, true))) {
-                    unset($autoloaders[$index]);
-                    $this->_setNamespaceAutoloaders($autoloaders, $ns);
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Constructor
-     *
-     * Registers instance with spl_autoload stack
-     *
-     * @return void
-     */
-    protected function __construct()
-    {
-        spl_autoload_register(array(__CLASS__, 'autoload'));
-        $this->_internalAutoloader = array($this, '_autoload');
-    }
-
-    /**
-     * Internal autoloader implementation
-     *
-     * @param  string $class
-     * @return bool
-     */
-    protected function _autoload($class)
-    {
-        $callback = $this->getDefaultAutoloader();
-        try {
-            if ($this->suppressNotFoundWarnings()) {
-                @call_user_func($callback, $class);
-            } else {
-                call_user_func($callback, $class);
-            }
-            return $class;
-        } catch (Zend_Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Set autoloaders for a specific namespace
-     *
-     * @param  array $autoloaders
-     * @param  string $namespace
-     * @return Zend_Loader_Autoloader
-     */
-    protected function _setNamespaceAutoloaders(array $autoloaders, $namespace = '')
-    {
-        $namespace = (string) $namespace;
-        $this->_namespaceAutoloaders[$namespace] = $autoloaders;
-        return $this;
-    }
-
-    /**
-     * Retrieve the filesystem path for the requested ZF version
-     *
-     * @param  string $path
-     * @param  string $version
-     * @return void
-     */
-    protected function _getVersionPath($path, $version)
-    {
-        $type = $this->_getVersionType($version);
-
-        if ($type == 'latest') {
-            $version = 'latest';
-        }
-
-        $availableVersions = $this->_getAvailableVersions($path, $version);
-        if (empty($availableVersions)) {
-            throw new Zend_Loader_Exception('No valid ZF installations discovered');
-        }
-
-        $matchedVersion = array_pop($availableVersions);
-        return $matchedVersion;
-    }
-
-    /**
-     * Retrieve the ZF version type
-     *
-     * @param  string $version
-     * @return string "latest", "major", "minor", or "specific"
-     * @throws Zend_Loader_Exception if version string contains too many dots
-     */
-    protected function _getVersionType($version)
-    {
-        if (strtolower($version) == 'latest') {
-            return 'latest';
-        }
-
-        $parts = explode('.', $version);
-        $count = count($parts);
-        if (1 == $count) {
-            return 'major';
-        }
-        if (2 == $count) {
-            return 'minor';
-        }
-        if (3 < $count) {
-            throw new Zend_Loader_Exception('Invalid version string provided');
-        }
-        return 'specific';
-    }
-
-    /**
-     * Get available versions for the version type requested
-     *
-     * @param  string $path
-     * @param  string $version
-     * @return array
-     */
-    protected function _getAvailableVersions($path, $version)
-    {
-        if (!is_dir($path)) {
-            throw new Zend_Loader_Exception('Invalid ZF path provided');
-        }
-
-        $path       = rtrim($path, '/');
-        $path       = rtrim($path, '\\');
-        $versionLen = strlen($version);
-        $versions   = array();
-        $dirs       = glob("$path/*", GLOB_ONLYDIR);
-        foreach ($dirs as $dir) {
-            $dirName = substr($dir, strlen($path) + 1);
-            if (!preg_match('/^(?:ZendFramework-)?(\d+\.\d+\.\d+((a|b|pl|pr|p|rc)\d+)?)(?:-minimal)?$/i', $dirName, $matches)) {
-                continue;
-            }
-
-            $matchedVersion = $matches[1];
-
-            if (('latest' == $version)
-                || ((strlen($matchedVersion) >= $versionLen)
-                    && (0 === strpos($matchedVersion, $version)))
-            ) {
-                $versions[$matchedVersion] = $dir . '/library';
-            }
-        }
-
-        uksort($versions, 'version_compare');
-        return $versions;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Loader/Autoloader/Interface.php b/airtime_mvc/library/Zend/Loader/Autoloader/Interface.php
deleted file mode 100644
index 8bcaf14fb..000000000
--- a/airtime_mvc/library/Zend/Loader/Autoloader/Interface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Autoloader interface
- *
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Loader_Autoloader_Interface
-{
-    public function autoload($class);
-}
diff --git a/airtime_mvc/library/Zend/Loader/Autoloader/Resource.php b/airtime_mvc/library/Zend/Loader/Autoloader/Resource.php
deleted file mode 100644
index 8eddbbcec..000000000
--- a/airtime_mvc/library/Zend/Loader/Autoloader/Resource.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Loader_Autoloader_Interface */
-require_once 'Zend/Loader/Autoloader/Interface.php';
-
-/**
- * Resource loader
- *
- * @uses       Zend_Loader_Autoloader_Interface
- * @package    Zend_Loader
- * @subpackage Autoloader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface
-{
-    /**
-     * @var string Base path to resource classes
-     */
-    protected $_basePath;
-
-    /**
-     * @var array Components handled within this resource
-     */
-    protected $_components = array();
-
-    /**
-     * @var string Default resource/component to use when using object registry
-     */
-    protected $_defaultResourceType;
-
-    /**
-     * @var string Namespace of classes within this resource
-     */
-    protected $_namespace;
-
-    /**
-     * @var array Available resource types handled by this resource autoloader
-     */
-    protected $_resourceTypes = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options Configuration options for resource autoloader
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (!is_array($options)) {
-            require_once 'Zend/Loader/Exception.php';
-            throw new Zend_Loader_Exception('Options must be passed to resource loader constructor');
-        }
-
-        $this->setOptions($options);
-
-        $namespace = $this->getNamespace();
-        if ((null === $namespace)
-            || (null === $this->getBasePath())
-        ) {
-            require_once 'Zend/Loader/Exception.php';
-            throw new Zend_Loader_Exception('Resource loader requires both a namespace and a base path for initialization');
-        }
-
-        if (!empty($namespace)) {
-            $namespace .= '_';
-        }
-        Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace);
-    }
-
-    /**
-     * Overloading: methods
-     *
-     * Allow retrieving concrete resource object instances using 'get<Resourcename>()'
-     * syntax. Example:
-     * <code>
-     * $loader = new Zend_Loader_Autoloader_Resource(array(
-     *     'namespace' => 'Stuff_',
-     *     'basePath'  => '/path/to/some/stuff',
-     * ))
-     * $loader->addResourceType('Model', 'models', 'Model');
-     *
-     * $foo = $loader->getModel('Foo'); // get instance of Stuff_Model_Foo class
-     * </code>
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Loader_Exception if method not beginning with 'get' or not matching a valid resource type is called
-     */
-    public function __call($method, $args)
-    {
-        if ('get' == substr($method, 0, 3)) {
-            $type  = strtolower(substr($method, 3));
-            if (!$this->hasResourceType($type)) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception("Invalid resource type $type; cannot load resource");
-            }
-            if (empty($args)) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception("Cannot load resources; no resource specified");
-            }
-            $resource = array_shift($args);
-            return $this->load($resource, $type);
-        }
-
-        require_once 'Zend/Loader/Exception.php';
-        throw new Zend_Loader_Exception("Method '$method' is not supported");
-    }
-
-    /**
-     * Helper method to calculate the correct class path
-     *
-     * @param string $class
-     * @return False if not matched other wise the correct path
-     */
-    public function getClassPath($class)
-    {
-        $segments          = explode('_', $class);
-        $namespaceTopLevel = $this->getNamespace();
-        $namespace         = '';
-
-        if (!empty($namespaceTopLevel)) {
-            $namespace = array_shift($segments);
-            if ($namespace != $namespaceTopLevel) {
-                // wrong prefix? we're done
-                return false;
-            }
-        }
-
-        if (count($segments) < 2) {
-            // assumes all resources have a component and class name, minimum
-            return false;
-        }
-
-        $final     = array_pop($segments);
-        $component = $namespace;
-        $lastMatch = false;
-        do {
-            $segment    = array_shift($segments);
-            $component .= empty($component) ? $segment : '_' . $segment;
-            if (isset($this->_components[$component])) {
-                $lastMatch = $component;
-            }
-        } while (count($segments));
-
-        if (!$lastMatch) {
-            return false;
-        }
-
-        $final = substr($class, strlen($lastMatch) + 1);
-        $path = $this->_components[$lastMatch];
-        $classPath = $path . '/' . str_replace('_', '/', $final) . '.php';
-
-        if (Zend_Loader::isReadable($classPath)) {
-            return $classPath;
-        }
-
-        return false;
-    }
-
-    /**
-     * Attempt to autoload a class
-     *
-     * @param  string $class
-     * @return mixed False if not matched, otherwise result if include operation
-     */
-    public function autoload($class)
-    {
-        $classPath = $this->getClassPath($class);
-        if (false !== $classPath) {
-            return include $classPath;
-        }
-        return false;
-    }
-
-    /**
-     * Set class state from options
-     *
-     * @param  array $options
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function setOptions(array $options)
-    {
-        $methods = get_class_methods($this);
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (in_array($method, $methods)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set namespace that this autoloader handles
-     *
-     * @param  string $namespace
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function setNamespace($namespace)
-    {
-        $this->_namespace = rtrim((string) $namespace, '_');
-        return $this;
-    }
-
-    /**
-     * Get namespace this autoloader handles
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_namespace;
-    }
-
-    /**
-     * Set base path for this set of resources
-     *
-     * @param  string $path
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function setBasePath($path)
-    {
-        $this->_basePath = (string) $path;
-        return $this;
-    }
-
-    /**
-     * Get base path to this set of resources
-     *
-     * @return string
-     */
-    public function getBasePath()
-    {
-        return $this->_basePath;
-    }
-
-    /**
-     * Add resource type
-     *
-     * @param  string $type identifier for the resource type being loaded
-     * @param  string $path path relative to resource base path containing the resource types
-     * @param  null|string $namespace sub-component namespace to append to base namespace that qualifies this resource type
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function addResourceType($type, $path, $namespace = null)
-    {
-        $type = strtolower($type);
-        if (!isset($this->_resourceTypes[$type])) {
-            if (null === $namespace) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception('Initial definition of a resource type must include a namespace');
-            }
-            $namespaceTopLevel = $this->getNamespace();
-            $namespace = ucfirst(trim($namespace, '_'));
-            $this->_resourceTypes[$type] = array(
-                'namespace' => empty($namespaceTopLevel) ? $namespace : $namespaceTopLevel . '_' . $namespace,
-            );
-        }
-        if (!is_string($path)) {
-            require_once 'Zend/Loader/Exception.php';
-            throw new Zend_Loader_Exception('Invalid path specification provided; must be string');
-        }
-        $this->_resourceTypes[$type]['path'] = $this->getBasePath() . '/' . rtrim($path, '\/');
-
-        $component = $this->_resourceTypes[$type]['namespace'];
-        $this->_components[$component] = $this->_resourceTypes[$type]['path'];
-        return $this;
-    }
-
-    /**
-     * Add multiple resources at once
-     *
-     * $types should be an associative array of resource type => specification
-     * pairs. Each specification should be an associative array containing
-     * minimally the 'path' key (specifying the path relative to the resource
-     * base path) and optionally the 'namespace' key (indicating the subcomponent
-     * namespace to append to the resource namespace).
-     *
-     * As an example:
-     * <code>
-     * $loader->addResourceTypes(array(
-     *     'model' => array(
-     *         'path'      => 'models',
-     *         'namespace' => 'Model',
-     *     ),
-     *     'form' => array(
-     *         'path'      => 'forms',
-     *         'namespace' => 'Form',
-     *     ),
-     * ));
-     * </code>
-     *
-     * @param  array $types
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function addResourceTypes(array $types)
-    {
-        foreach ($types as $type => $spec) {
-            if (!is_array($spec)) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception('addResourceTypes() expects an array of arrays');
-            }
-            if (!isset($spec['path'])) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception('addResourceTypes() expects each array to include a paths element');
-            }
-            $paths  = $spec['path'];
-            $namespace = null;
-            if (isset($spec['namespace'])) {
-                $namespace = $spec['namespace'];
-            }
-            $this->addResourceType($type, $paths, $namespace);
-        }
-        return $this;
-    }
-
-    /**
-     * Overwrite existing and set multiple resource types at once
-     *
-     * @see    Zend_Loader_Autoloader_Resource::addResourceTypes()
-     * @param  array $types
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function setResourceTypes(array $types)
-    {
-        $this->clearResourceTypes();
-        return $this->addResourceTypes($types);
-    }
-
-    /**
-     * Retrieve resource type mappings
-     *
-     * @return array
-     */
-    public function getResourceTypes()
-    {
-        return $this->_resourceTypes;
-    }
-
-    /**
-     * Is the requested resource type defined?
-     *
-     * @param  string $type
-     * @return bool
-     */
-    public function hasResourceType($type)
-    {
-        return isset($this->_resourceTypes[$type]);
-    }
-
-    /**
-     * Remove the requested resource type
-     *
-     * @param  string $type
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function removeResourceType($type)
-    {
-        if ($this->hasResourceType($type)) {
-            $namespace = $this->_resourceTypes[$type]['namespace'];
-            unset($this->_components[$namespace]);
-            unset($this->_resourceTypes[$type]);
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all resource types
-     *
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function clearResourceTypes()
-    {
-        $this->_resourceTypes = array();
-        $this->_components    = array();
-        return $this;
-    }
-
-    /**
-     * Set default resource type to use when calling load()
-     *
-     * @param  string $type
-     * @return Zend_Loader_Autoloader_Resource
-     */
-    public function setDefaultResourceType($type)
-    {
-        if ($this->hasResourceType($type)) {
-            $this->_defaultResourceType = $type;
-        }
-        return $this;
-    }
-
-    /**
-     * Get default resource type to use when calling load()
-     *
-     * @return string|null
-     */
-    public function getDefaultResourceType()
-    {
-        return $this->_defaultResourceType;
-    }
-
-    /**
-     * Object registry and factory
-     *
-     * Loads the requested resource of type $type (or uses the default resource
-     * type if none provided). If the resource has been loaded previously,
-     * returns the previous instance; otherwise, instantiates it.
-     *
-     * @param  string $resource
-     * @param  string $type
-     * @return object
-     * @throws Zend_Loader_Exception if resource type not specified or invalid
-     */
-    public function load($resource, $type = null)
-    {
-        if (null === $type) {
-            $type = $this->getDefaultResourceType();
-            if (empty($type)) {
-                require_once 'Zend/Loader/Exception.php';
-                throw new Zend_Loader_Exception('No resource type specified');
-            }
-        }
-        if (!$this->hasResourceType($type)) {
-            require_once 'Zend/Loader/Exception.php';
-            throw new Zend_Loader_Exception('Invalid resource type specified');
-        }
-        $namespace = $this->_resourceTypes[$type]['namespace'];
-        $class     = $namespace . '_' . ucfirst($resource);
-        if (!isset($this->_resources[$class])) {
-            $this->_resources[$class] = new $class;
-        }
-        return $this->_resources[$class];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Loader/Exception.php b/airtime_mvc/library/Zend/Loader/Exception.php
deleted file mode 100644
index 0b1f683d0..000000000
--- a/airtime_mvc/library/Zend/Loader/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @uses       Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader_Exception extends Zend_Exception
-{}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Loader/PluginLoader.php b/airtime_mvc/library/Zend/Loader/PluginLoader.php
deleted file mode 100644
index 0c63bae36..000000000
--- a/airtime_mvc/library/Zend/Loader/PluginLoader.php
+++ /dev/null
@@ -1,484 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PluginLoader.php 21170 2010-02-23 19:50:16Z matthew $
- */
-
-/** Zend_Loader_PluginLoader_Interface */
-require_once 'Zend/Loader/PluginLoader/Interface.php';
-
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/**
- * Generic plugin class loader
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
-{
-    /**
-     * Class map cache file
-     * @var string
-     */
-    protected static $_includeFileCache;
-
-    /**
-     * Instance loaded plugin paths
-     *
-     * @var array
-     */
-    protected $_loadedPluginPaths = array();
-
-    /**
-     * Instance loaded plugins
-     *
-     * @var array
-     */
-    protected $_loadedPlugins = array();
-
-    /**
-     * Instance registry property
-     *
-     * @var array
-     */
-    protected $_prefixToPaths = array();
-
-    /**
-     * Statically loaded plugin path mappings
-     *
-     * @var array
-     */
-    protected static $_staticLoadedPluginPaths = array();
-
-    /**
-     * Statically loaded plugins
-     *
-     * @var array
-     */
-    protected static $_staticLoadedPlugins = array();
-
-    /**
-     * Static registry property
-     *
-     * @var array
-     */
-    protected static $_staticPrefixToPaths = array();
-
-    /**
-     * Whether to use a statically named registry for loading plugins
-     *
-     * @var string|null
-     */
-    protected $_useStaticRegistry = null;
-
-    /**
-     * Constructor
-     *
-     * @param array $prefixToPaths
-     * @param string $staticRegistryName OPTIONAL
-     */
-    public function __construct(Array $prefixToPaths = array(), $staticRegistryName = null)
-    {
-        if (is_string($staticRegistryName) && !empty($staticRegistryName)) {
-            $this->_useStaticRegistry = $staticRegistryName;
-            if(!isset(self::$_staticPrefixToPaths[$staticRegistryName])) {
-                self::$_staticPrefixToPaths[$staticRegistryName] = array();
-            }
-            if(!isset(self::$_staticLoadedPlugins[$staticRegistryName])) {
-                self::$_staticLoadedPlugins[$staticRegistryName] = array();
-            }
-        }
-
-        foreach ($prefixToPaths as $prefix => $path) {
-            $this->addPrefixPath($prefix, $path);
-        }
-    }
-
-    /**
-     * Format prefix for internal use
-     *
-     * @param  string $prefix
-     * @return string
-     */
-    protected function _formatPrefix($prefix)
-    {
-        if($prefix == "") {
-            return $prefix;
-        }
-
-        $last = strlen($prefix) - 1;
-        if ($prefix{$last} == '\\') {
-            return $prefix;
-        }
-
-        return rtrim($prefix, '_') . '_';
-    }
-
-    /**
-     * Add prefixed paths to the registry of paths
-     *
-     * @param string $prefix
-     * @param string $path
-     * @return Zend_Loader_PluginLoader
-     */
-    public function addPrefixPath($prefix, $path)
-    {
-        if (!is_string($prefix) || !is_string($path)) {
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception('Zend_Loader_PluginLoader::addPrefixPath() method only takes strings for prefix and path.');
-        }
-
-        $prefix = $this->_formatPrefix($prefix);
-        $path   = rtrim($path, '/\\') . '/';
-
-        if ($this->_useStaticRegistry) {
-            self::$_staticPrefixToPaths[$this->_useStaticRegistry][$prefix][] = $path;
-        } else {
-            if (!isset($this->_prefixToPaths[$prefix])) {
-                $this->_prefixToPaths[$prefix] = array();
-            }
-            if (!in_array($path, $this->_prefixToPaths[$prefix])) {
-                $this->_prefixToPaths[$prefix][] = $path;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Get path stack
-     *
-     * @param  string $prefix
-     * @return false|array False if prefix does not exist, array otherwise
-     */
-    public function getPaths($prefix = null)
-    {
-        if ((null !== $prefix) && is_string($prefix)) {
-            $prefix = $this->_formatPrefix($prefix);
-            if ($this->_useStaticRegistry) {
-                if (isset(self::$_staticPrefixToPaths[$this->_useStaticRegistry][$prefix])) {
-                    return self::$_staticPrefixToPaths[$this->_useStaticRegistry][$prefix];
-                }
-
-                return false;
-            }
-
-            if (isset($this->_prefixToPaths[$prefix])) {
-                return $this->_prefixToPaths[$prefix];
-            }
-
-            return false;
-        }
-
-        if ($this->_useStaticRegistry) {
-            return self::$_staticPrefixToPaths[$this->_useStaticRegistry];
-        }
-
-        return $this->_prefixToPaths;
-    }
-
-    /**
-     * Clear path stack
-     *
-     * @param  string $prefix
-     * @return bool False only if $prefix does not exist
-     */
-    public function clearPaths($prefix = null)
-    {
-        if ((null !== $prefix) && is_string($prefix)) {
-            $prefix = $this->_formatPrefix($prefix);
-            if ($this->_useStaticRegistry) {
-                if (isset(self::$_staticPrefixToPaths[$this->_useStaticRegistry][$prefix])) {
-                    unset(self::$_staticPrefixToPaths[$this->_useStaticRegistry][$prefix]);
-                    return true;
-                }
-
-                return false;
-            }
-
-            if (isset($this->_prefixToPaths[$prefix])) {
-                unset($this->_prefixToPaths[$prefix]);
-                return true;
-            }
-
-            return false;
-        }
-
-        if ($this->_useStaticRegistry) {
-            self::$_staticPrefixToPaths[$this->_useStaticRegistry] = array();
-        } else {
-            $this->_prefixToPaths = array();
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove a prefix (or prefixed-path) from the registry
-     *
-     * @param string $prefix
-     * @param string $path OPTIONAL
-     * @return Zend_Loader_PluginLoader
-     */
-    public function removePrefixPath($prefix, $path = null)
-    {
-        $prefix = $this->_formatPrefix($prefix);
-        if ($this->_useStaticRegistry) {
-            $registry =& self::$_staticPrefixToPaths[$this->_useStaticRegistry];
-        } else {
-            $registry =& $this->_prefixToPaths;
-        }
-
-        if (!isset($registry[$prefix])) {
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' was not found in the PluginLoader.');
-        }
-
-        if ($path != null) {
-            $pos = array_search($path, $registry[$prefix]);
-            if ($pos === null) {
-                require_once 'Zend/Loader/PluginLoader/Exception.php';
-                throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' / Path ' . $path . ' was not found in the PluginLoader.');
-            }
-            unset($registry[$prefix][$pos]);
-        } else {
-            unset($registry[$prefix]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Normalize plugin name
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _formatName($name)
-    {
-        return ucfirst((string) $name);
-    }
-
-    /**
-     * Whether or not a Plugin by a specific name is loaded
-     *
-     * @param string $name
-     * @return Zend_Loader_PluginLoader
-     */
-    public function isLoaded($name)
-    {
-        $name = $this->_formatName($name);
-        if ($this->_useStaticRegistry) {
-            return isset(self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name]);
-        }
-
-        return isset($this->_loadedPlugins[$name]);
-    }
-
-    /**
-     * Return full class name for a named plugin
-     *
-     * @param string $name
-     * @return string|false False if class not found, class name otherwise
-     */
-    public function getClassName($name)
-    {
-        $name = $this->_formatName($name);
-        if ($this->_useStaticRegistry
-            && isset(self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name])
-        ) {
-            return self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name];
-        } elseif (isset($this->_loadedPlugins[$name])) {
-            return $this->_loadedPlugins[$name];
-        }
-
-        return false;
-    }
-
-    /**
-     * Get path to plugin class
-     *
-     * @param  mixed $name
-     * @return string|false False if not found
-     */
-    public function getClassPath($name)
-    {
-        $name = $this->_formatName($name);
-        if ($this->_useStaticRegistry
-            && !empty(self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name])
-        ) {
-            return self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name];
-        } elseif (!empty($this->_loadedPluginPaths[$name])) {
-            return $this->_loadedPluginPaths[$name];
-        }
-
-        if ($this->isLoaded($name)) {
-            $class = $this->getClassName($name);
-            $r     = new ReflectionClass($class);
-            $path  = $r->getFileName();
-            if ($this->_useStaticRegistry) {
-                self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name] = $path;
-            } else {
-                $this->_loadedPluginPaths[$name] = $path;
-            }
-            return $path;
-        }
-
-        return false;
-    }
-
-    /**
-     * Load a plugin via the name provided
-     *
-     * @param  string $name
-     * @param  bool $throwExceptions Whether or not to throw exceptions if the
-     * class is not resolved
-     * @return string|false Class name of loaded class; false if $throwExceptions
-     * if false and no class found
-     * @throws Zend_Loader_Exception if class not found
-     */
-    public function load($name, $throwExceptions = true)
-    {
-        $name = $this->_formatName($name);
-        if ($this->isLoaded($name)) {
-            return $this->getClassName($name);
-        }
-
-        if ($this->_useStaticRegistry) {
-            $registry = self::$_staticPrefixToPaths[$this->_useStaticRegistry];
-        } else {
-            $registry = $this->_prefixToPaths;
-        }
-
-        $registry  = array_reverse($registry, true);
-        $found     = false;
-        $classFile = str_replace('_', DIRECTORY_SEPARATOR, $name) . '.php';
-        $incFile   = self::getIncludeFileCache();
-        foreach ($registry as $prefix => $paths) {
-            $className = $prefix . $name;
-
-            if (class_exists($className, false)) {
-                $found = true;
-                break;
-            }
-
-            $paths     = array_reverse($paths, true);
-
-            foreach ($paths as $path) {
-                $loadFile = $path . $classFile;
-                if (Zend_Loader::isReadable($loadFile)) {
-                    include_once $loadFile;
-                    if (class_exists($className, false)) {
-                        if (null !== $incFile) {
-                            self::_appendIncFile($loadFile);
-                        }
-                        $found = true;
-                        break 2;
-                    }
-                }
-            }
-        }
-
-        if (!$found) {
-            if (!$throwExceptions) {
-                return false;
-            }
-
-            $message = "Plugin by name '$name' was not found in the registry; used paths:";
-            foreach ($registry as $prefix => $paths) {
-                $message .= "\n$prefix: " . implode(PATH_SEPARATOR, $paths);
-            }
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception($message);
-       }
-
-        if ($this->_useStaticRegistry) {
-            self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name]     = $className;
-        } else {
-            $this->_loadedPlugins[$name]     = $className;
-        }
-        return $className;
-    }
-
-    /**
-     * Set path to class file cache
-     *
-     * Specify a path to a file that will add include_once statements for each
-     * plugin class loaded. This is an opt-in feature for performance purposes.
-     *
-     * @param  string $file
-     * @return void
-     * @throws Zend_Loader_PluginLoader_Exception if file is not writeable or path does not exist
-     */
-    public static function setIncludeFileCache($file)
-    {
-        if (null === $file) {
-            self::$_includeFileCache = null;
-            return;
-        }
-
-        if (!file_exists($file) && !file_exists(dirname($file))) {
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception('Specified file does not exist and/or directory does not exist (' . $file . ')');
-        }
-        if (file_exists($file) && !is_writable($file)) {
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')');
-        }
-        if (!file_exists($file) && file_exists(dirname($file)) && !is_writable(dirname($file))) {
-            require_once 'Zend/Loader/PluginLoader/Exception.php';
-            throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')');
-        }
-
-        self::$_includeFileCache = $file;
-    }
-
-    /**
-     * Retrieve class file cache path
-     *
-     * @return string|null
-     */
-    public static function getIncludeFileCache()
-    {
-        return self::$_includeFileCache;
-    }
-
-    /**
-     * Append an include_once statement to the class file cache
-     *
-     * @param  string $incFile
-     * @return void
-     */
-    protected static function _appendIncFile($incFile)
-    {
-        if (!file_exists(self::$_includeFileCache)) {
-            $file = '<?php';
-        } else {
-            $file = file_get_contents(self::$_includeFileCache);
-        }
-        if (!strstr($file, $incFile)) {
-            $file .= "\ninclude_once '$incFile';";
-            file_put_contents(self::$_includeFileCache, $file);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Loader/PluginLoader/Exception.php b/airtime_mvc/library/Zend/Loader/PluginLoader/Exception.php
deleted file mode 100644
index 4388313fc..000000000
--- a/airtime_mvc/library/Zend/Loader/PluginLoader/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Loader_Exception
- */
-require_once 'Zend/Loader/Exception.php';
-
-/**
- * Plugin class loader exceptions
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Loader_PluginLoader_Exception extends Zend_Loader_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Loader/PluginLoader/Interface.php b/airtime_mvc/library/Zend/Loader/PluginLoader/Interface.php
deleted file mode 100644
index bfbbe50e3..000000000
--- a/airtime_mvc/library/Zend/Loader/PluginLoader/Interface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Plugin class loader interface
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage PluginLoader
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Loader_PluginLoader_Interface
-{
-    /**
-     * Add prefixed paths to the registry of paths
-     *
-     * @param string $prefix
-     * @param string $path
-     * @return Zend_Loader_PluginLoader
-     */
-    public function addPrefixPath($prefix, $path);
-
-    /**
-     * Remove a prefix (or prefixed-path) from the registry
-     *
-     * @param string $prefix
-     * @param string $path OPTIONAL
-     * @return Zend_Loader_PluginLoader
-     */
-    public function removePrefixPath($prefix, $path = null);
-
-    /**
-     * Whether or not a Helper by a specific name
-     *
-     * @param string $name
-     * @return Zend_Loader_PluginLoader
-     */
-    public function isLoaded($name);
-
-    /**
-     * Return full class name for a named helper
-     *
-     * @param string $name
-     * @return string
-     */
-    public function getClassName($name);
-
-    /**
-     * Load a helper via the name provided
-     *
-     * @param string $name
-     * @return string
-     */
-    public function load($name);
-}
diff --git a/airtime_mvc/library/Zend/Locale.php b/airtime_mvc/library/Zend/Locale.php
deleted file mode 100644
index 76a60d59b..000000000
--- a/airtime_mvc/library/Zend/Locale.php
+++ /dev/null
@@ -1,1016 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Locale.php 20731 2010-01-28 22:29:28Z thomas $
- */
-
-/**
- * Base class for localization
- *
- * @category  Zend
- * @package   Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale
-{
-    /**
-     * Class wide Locale Constants
-     *
-     * @var array $_localeData
-     */
-    private static $_localeData = array(
-        'root'  => true, 'aa_DJ' => true, 'aa_ER' => true, 'aa_ET' => true, 'aa'    => true,
-        'af_NA' => true, 'af_ZA' => true, 'af'    => true, 'ak_GH' => true, 'ak'    => true,
-        'am_ET' => true, 'am'    => true, 'ar_AE' => true, 'ar_BH' => true, 'ar_DZ' => true,
-        'ar_EG' => true, 'ar_IQ' => true, 'ar_JO' => true, 'ar_KW' => true, 'ar_LB' => true,
-        'ar_LY' => true, 'ar_MA' => true, 'ar_OM' => true, 'ar_QA' => true, 'ar_SA' => true,
-        'ar_SD' => true, 'ar_SY' => true, 'ar_TN' => true, 'ar_YE' => true, 'ar'    => true,
-        'as_IN' => true, 'as'    => true, 'az_AZ' => true, 'az'    => true, 'be_BY' => true,
-        'be'    => true, 'bg_BG' => true, 'bg'    => true, 'bn_BD' => true, 'bn_IN' => true,
-        'bn'    => true, 'bo_CN' => true, 'bo_IN' => true, 'bo'    => true, 'bs_BA' => true,
-        'bs'    => true, 'byn_ER'=> true, 'byn'   => true, 'ca_ES' => true, 'ca'    => true,
-        'cch_NG'=> true, 'cch'   => true, 'cop'   => true, 'cs_CZ' => true, 'cs'    => true,
-        'cy_GB' => true, 'cy'    => true, 'da_DK' => true, 'da'    => true, 'de_AT' => true,
-        'de_BE' => true, 'de_CH' => true, 'de_DE' => true, 'de_LI' => true, 'de_LU' => true,
-        'de'    => true, 'dv_MV' => true, 'dv'    => true, 'dz_BT' => true, 'dz'    => true,
-        'ee_GH' => true, 'ee_TG' => true, 'ee'    => true, 'el_CY' => true, 'el_GR' => true,
-        'el'    => true, 'en_AS' => true, 'en_AU' => true, 'en_BE' => true, 'en_BW' => true,
-        'en_BZ' => true, 'en_CA' => true, 'en_GB' => true, 'en_GU' => true, 'en_HK' => true,
-        'en_IE' => true, 'en_IN' => true, 'en_JM' => true, 'en_MH' => true, 'en_MP' => true,
-        'en_MT' => true, 'en_NA' => true, 'en_NZ' => true, 'en_PH' => true, 'en_PK' => true,
-        'en_SG' => true, 'en_TT' => true, 'en_UM' => true, 'en_US' => true, 'en_VI' => true,
-        'en_ZA' => true, 'en_ZW' => true, 'en'    => true, 'eo'    => true, 'es_AR' => true,
-        'es_BO' => true, 'es_CL' => true, 'es_CO' => true, 'es_CR' => true, 'es_DO' => true,
-        'es_EC' => true, 'es_ES' => true, 'es_GT' => true, 'es_HN' => true, 'es_MX' => true,
-        'es_NI' => true, 'es_PA' => true, 'es_PE' => true, 'es_PR' => true, 'es_PY' => true,
-        'es_SV' => true, 'es_US' => true, 'es_UY' => true, 'es_VE' => true, 'es'    => true,
-        'et_EE' => true, 'et'    => true, 'eu_ES' => true, 'eu'    => true, 'fa_AF' => true,
-        'fa_IR' => true, 'fa'    => true, 'fi_FI' => true, 'fi'    => true, 'fil_PH'=> true,
-        'fil'   => true, 'fo_FO' => true, 'fo'    => true, 'fr_BE' => true, 'fr_CA' => true,
-        'fr_CH' => true, 'fr_FR' => true, 'fr_LU' => true, 'fr_MC' => true, 'fr_SN' => true,
-        'fr'    => true, 'fur_IT'=> true, 'fur'   => true, 'ga_IE' => true, 'ga'    => true,
-        'gaa_GH'=> true, 'gaa'   => true, 'gez_ER'=> true, 'gez_ET'=> true, 'gez'   => true,
-        'gl_ES' => true, 'gl'    => true, 'gsw_CH'=> true, 'gsw'   => true, 'gu_IN' => true,
-        'gu'    => true, 'gv_GB' => true, 'gv'    => true, 'ha_GH' => true, 'ha_NE' => true,
-        'ha_NG' => true, 'ha_SD' => true, 'ha'    => true, 'haw_US'=> true, 'haw'   => true,
-        'he_IL' => true, 'he'    => true, 'hi_IN' => true, 'hi'    => true, 'hr_HR' => true,
-        'hr'    => true, 'hu_HU' => true, 'hu'    => true, 'hy_AM' => true, 'hy'    => true,
-        'ia'    => true, 'id_ID' => true, 'id'    => true, 'ig_NG' => true, 'ig'    => true,
-        'ii_CN' => true, 'ii'    => true, 'in'    => true, 'is_IS' => true, 'is'    => true,
-        'it_CH' => true, 'it_IT' => true, 'it'    => true, 'iu'    => true, 'iw'    => true,
-        'ja_JP' => true, 'ja'    => true, 'ka_GE' => true, 'ka'    => true, 'kaj_NG'=> true,
-        'kaj'   => true, 'kam_KE'=> true, 'kam'   => true, 'kcg_NG'=> true, 'kcg'   => true,
-        'kfo_CI'=> true, 'kfo'   => true, 'kk_KZ' => true, 'kk'    => true, 'kl_GL' => true,
-        'kl'    => true, 'km_KH' => true, 'km'    => true, 'kn_IN' => true, 'kn'    => true,
-        'ko_KR' => true, 'ko'    => true, 'kok_IN'=> true, 'kok'   => true, 'kpe_GN'=> true,
-        'kpe_LR'=> true, 'kpe'   => true, 'ku_IQ' => true, 'ku_IR' => true, 'ku_SY' => true,
-        'ku_TR' => true, 'ku'    => true, 'kw_GB' => true, 'kw'    => true, 'ky_KG' => true,
-        'ky'    => true, 'ln_CD' => true, 'ln_CG' => true, 'ln'    => true, 'lo_LA' => true,
-        'lo'    => true, 'lt_LT' => true, 'lt'    => true, 'lv_LV' => true, 'lv'    => true,
-        'mk_MK' => true, 'mk'    => true, 'ml_IN' => true, 'ml'    => true, 'mn_CN' => true,
-        'mn_MN' => true, 'mn'    => true, 'mo'    => true, 'mr_IN' => true, 'mr'    => true,
-        'ms_BN' => true, 'ms_MY' => true, 'ms'    => true, 'mt_MT' => true, 'mt'    => true,
-        'my_MM' => true, 'my'    => true, 'nb_NO' => true, 'nb'    => true, 'nds_DE'=> true,
-        'nds'   => true, 'ne_IN' => true, 'ne_NP' => true, 'ne'    => true, 'nl_BE' => true,
-        'nl_NL' => true, 'nl'    => true, 'nn_NO' => true, 'nn'    => true, 'no'    => true,
-        'nr_ZA' => true, 'nr'    => true, 'nso_ZA'=> true, 'nso'   => true, 'ny_MW' => true,
-        'ny'    => true, 'oc_FR' => true, 'oc'    => true, 'om_ET' => true, 'om_KE' => true,
-        'om'    => true, 'or_IN' => true, 'or'    => true, 'pa_IN' => true, 'pa_PK' => true,
-        'pa'    => true, 'pl_PL' => true, 'pl'    => true, 'ps_AF' => true, 'ps'    => true,
-        'pt_BR' => true, 'pt_PT' => true, 'pt'    => true, 'ro_MD' => true, 'ro_RO' => true,
-        'ro'    => true, 'ru_RU' => true, 'ru_UA' => true, 'ru'    => true, 'rw_RW' => true,
-        'rw'    => true, 'sa_IN' => true, 'sa'    => true, 'se_FI' => true, 'se_NO' => true,
-        'se'    => true, 'sh_BA' => true, 'sh_CS' => true, 'sh_YU' => true, 'sh'    => true,
-        'si_LK' => true, 'si'    => true, 'sid_ET'=> true, 'sid'   => true, 'sk_SK' => true,
-        'sk'    => true, 'sl_SI' => true, 'sl'    => true, 'so_DJ' => true, 'so_ET' => true,
-        'so_KE' => true, 'so_SO' => true, 'so'    => true, 'sq_AL' => true, 'sq'    => true,
-        'sr_BA' => true, 'sr_CS' => true, 'sr_ME' => true, 'sr_RS' => true, 'sr_YU' => true,
-        'sr'    => true, 'ss_SZ' => true, 'ss_ZA' => true, 'ss'    => true, 'st_LS' => true,
-        'st_ZA' => true, 'st'    => true, 'sv_FI' => true, 'sv_SE' => true, 'sv'    => true,
-        'sw_KE' => true, 'sw_TZ' => true, 'sw'    => true, 'syr_SY'=> true, 'syr'   => true,
-        'ta_IN' => true, 'ta'    => true, 'te_IN' => true, 'te'    => true, 'tg_TJ' => true,
-        'tg'    => true, 'th_TH' => true, 'th'    => true, 'ti_ER' => true, 'ti_ET' => true,
-        'ti'    => true, 'tig_ER'=> true, 'tig'   => true, 'tl'    => true, 'tn_ZA' => true,
-        'tn'    => true, 'to_TO' => true, 'to'    => true, 'tr_TR' => true, 'tr'    => true,
-        'trv_TW'=> true, 'trv'   => true, 'ts_ZA' => true, 'ts'    => true, 'tt_RU' => true,
-        'tt'    => true, 'ug_CN' => true, 'ug'    => true, 'uk_UA' => true, 'uk'    => true,
-        'ur_IN' => true, 'ur_PK' => true, 'ur'    => true, 'uz_AF' => true, 'uz_UZ' => true,
-        'uz'    => true, 've_ZA' => true, 've'    => true, 'vi_VN' => true, 'vi'    => true,
-        'wal_ET'=> true, 'wal'   => true, 'wo_SN' => true, 'wo'    => true, 'xh_ZA' => true,
-        'xh'    => true, 'yo_NG' => true, 'yo'    => true, 'zh_CN' => true, 'zh_HK' => true,
-        'zh_MO' => true, 'zh_SG' => true, 'zh_TW' => true, 'zh'    => true, 'zu_ZA' => true,
-        'zu'    => true
-    );
-
-    /**
-     * Autosearch constants
-     */
-    const BROWSER     = 'browser';
-    const ENVIRONMENT = 'environment';
-    const ZFDEFAULT   = 'default';
-
-    /**
-     * Defines if old behaviour should be supported
-     * Old behaviour throws notices and will be deleted in future releases
-     *
-     * @var boolean
-     */
-    public static $compatibilityMode = false;
-
-    /**
-     * Internal variable
-     *
-     * @var boolean
-     */
-    private static $_breakChain = false;
-
-    /**
-     * Actual set locale
-     *
-     * @var string Locale
-     */
-    protected $_locale;
-
-    /**
-     * Automatic detected locale
-     *
-     * @var string Locales
-     */
-    protected static $_auto;
-
-    /**
-     * Browser detected locale
-     *
-     * @var string Locales
-     */
-    protected static $_browser;
-
-    /**
-     * Environment detected locale
-     *
-     * @var string Locales
-     */
-    protected static $_environment;
-
-    /**
-     * Default locale
-     *
-     * @var string Locales
-     */
-    protected static $_default = array('en' => true);
-
-    /**
-     * Generates a locale object
-     * If no locale is given a automatic search is done
-     * Then the most probable locale will be automatically set
-     * Search order is
-     *  1. Given Locale
-     *  2. HTTP Client
-     *  3. Server Environment
-     *  4. Framework Standard
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for parsing input
-     * @throws Zend_Locale_Exception When autodetection has been failed
-     */
-    public function __construct($locale = null)
-    {
-        $locale = self::_prepareLocale($locale);
-        $this->setLocale((string) $locale);
-    }
-
-    /**
-     * Serialization Interface
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize($this);
-    }
-
-    /**
-     * Returns a string representation of the object
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return (string) $this->_locale;
-    }
-
-    /**
-     * Returns a string representation of the object
-     * Alias for toString
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Return the default locale
-     *
-     * @return array Returns an array of all locale string
-     */
-    public static function getDefault()
-    {
-        if ((self::$compatibilityMode === true) or (func_num_args() > 0)) {
-            if (!self::$_breakChain) {
-                self::$_breakChain = true;
-                trigger_error('You are running Zend_Locale in compatibility mode... please migrate your scripts', E_USER_NOTICE);
-                $params = func_get_args();
-                $param = null;
-                if (isset($params[0])) {
-                    $param = $params[0];
-                }
-                return self::getOrder($param);
-            }
-
-            self::$_breakChain = false;
-        }
-
-        return self::$_default;
-    }
-
-    /**
-     * Sets a new default locale which will be used when no locale can be detected
-     * If provided you can set a quality between 0 and 1 (or 2 and 100)
-     * which represents the percent of quality the browser
-     * requested within HTTP
-     *
-     * @param  string|Zend_Locale $locale  Locale to set
-     * @param  float              $quality The quality to set from 0 to 1
-     * @throws Zend_Locale_Exception When a autolocale was given
-     * @throws Zend_Locale_Exception When a unknown locale was given
-     * @return void
-     */
-    public static function setDefault($locale, $quality = 1)
-    {
-        if (($locale === 'auto') or ($locale === 'root') or ($locale === 'default') or
-            ($locale === 'environment') or ($locale === 'browser')) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception('Only full qualified locales can be used as default!');
-        }
-
-        if (($quality < 0.1) or ($quality > 100)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("Quality must be between 0.1 and 100");
-        }
-
-        if ($quality > 1) {
-            $quality /= 100;
-        }
-
-        $locale = self::_prepareLocale($locale);
-        if (isset(self::$_localeData[(string) $locale]) === true) {
-            self::$_default = array((string) $locale => $quality);
-        } else {
-            $elocale = explode('_', (string) $locale);
-            if (isset(self::$_localeData[$elocale[0]]) === true) {
-                self::$_default = array($elocale[0] => $quality);
-            } else {
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("Unknown locale '" . (string) $locale . "' can not be set as default!");
-            }
-        }
-
-        self::$_auto = self::getBrowser() + self::getEnvironment() + self::getDefault();
-    }
-
-    /**
-     * Expects the Systems standard locale
-     *
-     * For Windows:
-     * f.e.: LC_COLLATE=C;LC_CTYPE=German_Austria.1252;LC_MONETARY=C
-     * would be recognised as de_AT
-     *
-     * @return array
-     */
-    public static function getEnvironment()
-    {
-        if (self::$_environment !== null) {
-            return self::$_environment;
-        }
-
-        require_once 'Zend/Locale/Data/Translation.php';
-
-        $language      = setlocale(LC_ALL, 0);
-        $languages     = explode(';', $language);
-        $languagearray = array();
-
-        foreach ($languages as $locale) {
-            if (strpos($locale, '=') !== false) {
-                $language = substr($locale, strpos($locale, '='));
-                $language = substr($language, 1);
-            }
-
-            if ($language !== 'C') {
-                if (strpos($language, '.') !== false) {
-                    $language = substr($language, 0, strpos($language, '.'));
-                } else if (strpos($language, '@') !== false) {
-                    $language = substr($language, 0, strpos($language, '@'));
-                }
-
-                $language = str_ireplace(
-                    array_keys(Zend_Locale_Data_Translation::$languageTranslation),
-                    array_values(Zend_Locale_Data_Translation::$languageTranslation),
-                    (string) $language
-                );
-
-                $language = str_ireplace(
-                    array_keys(Zend_Locale_Data_Translation::$regionTranslation),
-                    array_values(Zend_Locale_Data_Translation::$regionTranslation),
-                    $language
-                );
-
-                if (isset(self::$_localeData[$language]) === true) {
-                    $languagearray[$language] = 1;
-                    if (strpos($language, '_') !== false) {
-                        $languagearray[substr($language, 0, strpos($language, '_'))] = 1;
-                    }
-                }
-            }
-        }
-
-        self::$_environment = $languagearray;
-        return $languagearray;
-    }
-
-    /**
-     * Return an array of all accepted languages of the client
-     * Expects RFC compilant Header !!
-     *
-     * The notation can be :
-     * de,en-UK-US;q=0.5,fr-FR;q=0.2
-     *
-     * @return array - list of accepted languages including quality
-     */
-    public static function getBrowser()
-    {
-        if (self::$_browser !== null) {
-            return self::$_browser;
-        }
-
-        $httplanguages = getenv('HTTP_ACCEPT_LANGUAGE');
-        $languages     = array();
-        if (empty($httplanguages) === true) {
-            return $languages;
-        }
-
-        $accepted = preg_split('/,\s*/', $httplanguages);
-
-        foreach ($accepted as $accept) {
-            $match  = null;
-            $result = preg_match('/^([a-z]{1,8}(?:[-_][a-z]{1,8})*)(?:;\s*q=(0(?:\.[0-9]{1,3})?|1(?:\.0{1,3})?))?$/i',
-                                 $accept, $match);
-
-            if ($result < 1) {
-                continue;
-            }
-
-            if (isset($match[2]) === true) {
-                $quality = (float) $match[2];
-            } else {
-                $quality = 1.0;
-            }
-
-            $countrys = explode('-', $match[1]);
-            $region   = array_shift($countrys);
-
-            $country2 = explode('_', $region);
-            $region   = array_shift($country2);
-
-            foreach ($countrys as $country) {
-                $languages[$region . '_' . strtoupper($country)] = $quality;
-            }
-
-            foreach ($country2 as $country) {
-                $languages[$region . '_' . strtoupper($country)] = $quality;
-            }
-
-            if ((isset($languages[$region]) === false) || ($languages[$region] < $quality)) {
-                $languages[$region] = $quality;
-            }
-        }
-
-        self::$_browser = $languages;
-        return $languages;
-    }
-
-    /**
-     * Sets a new locale
-     *
-     * @param  string|Zend_Locale $locale (Optional) New locale to set
-     * @return void
-     */
-    public function setLocale($locale = null)
-    {
-        $locale = self::_prepareLocale($locale);
-
-        if (isset(self::$_localeData[(string) $locale]) === false) {
-            $region = substr((string) $locale, 0, 3);
-            if (isset($region[2]) === true) {
-                if (($region[2] === '_') or ($region[2] === '-')) {
-                    $region = substr($region, 0, 2);
-                }
-            }
-
-            if (isset(self::$_localeData[(string) $region]) === true) {
-                $this->_locale = $region;
-            } else {
-                $this->_locale = 'root';
-            }
-        } else {
-            $this->_locale = $locale;
-        }
-    }
-
-    /**
-     * Returns the language part of the locale
-     *
-     * @return string
-     */
-    public function getLanguage()
-    {
-        $locale = explode('_', $this->_locale);
-        return $locale[0];
-    }
-
-    /**
-     * Returns the region part of the locale if available
-     *
-     * @return string|false - Regionstring
-     */
-    public function getRegion()
-    {
-        $locale = explode('_', $this->_locale);
-        if (isset($locale[1]) === true) {
-            return $locale[1];
-        }
-
-        return false;
-    }
-
-    /**
-     * Return the accepted charset of the client
-     *
-     * @return string
-     */
-    public static function getHttpCharset()
-    {
-        $httpcharsets = getenv('HTTP_ACCEPT_CHARSET');
-
-        $charsets = array();
-        if ($httpcharsets === false) {
-            return $charsets;
-        }
-
-        $accepted = preg_split('/,\s*/', $httpcharsets);
-        foreach ($accepted as $accept) {
-            if (empty($accept) === true) {
-                continue;
-            }
-
-            if (strpos($accept, ';') !== false) {
-                $quality        = (float) substr($accept, (strpos($accept, '=') + 1));
-                $pos            = substr($accept, 0, strpos($accept, ';'));
-                $charsets[$pos] = $quality;
-            } else {
-                $quality           = 1.0;
-                $charsets[$accept] = $quality;
-            }
-        }
-
-        return $charsets;
-    }
-
-    /**
-     * Returns true if both locales are equal
-     *
-     * @param  Zend_Locale $object Locale to check for equality
-     * @return boolean
-     */
-    public function equals(Zend_Locale $object)
-    {
-        if ($object->toString() === $this->toString()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns localized informations as array, supported are several
-     * types of informations.
-     * For detailed information about the types look into the documentation
-     *
-     * @param  string             $path   (Optional) Type of information to return
-     * @param  string|Zend_Locale $locale (Optional) Locale|Language for which this informations should be returned
-     * @param  string             $value  (Optional) Value for detail list
-     * @return array Array with the wished information in the given language
-     */
-    public static function getTranslationList($path = null, $locale = null, $value = null)
-    {
-        require_once 'Zend/Locale/Data.php';
-        $locale = self::findLocale($locale);
-        $result = Zend_Locale_Data::getList($locale, $path, $value);
-        if (empty($result) === true) {
-            return false;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns an array with the name of all languages translated to the given language
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for language translation
-     * @return array
-     * @deprecated
-     */
-    public static function getLanguageTranslationList($locale = null)
-    {
-        trigger_error("The method getLanguageTranslationList is deprecated. Use getTranslationList('language', $locale) instead", E_USER_NOTICE);
-        return self::getTranslationList('language', $locale);
-    }
-
-    /**
-     * Returns an array with the name of all scripts translated to the given language
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for script translation
-     * @return array
-     * @deprecated
-     */
-    public static function getScriptTranslationList($locale = null)
-    {
-        trigger_error("The method getScriptTranslationList is deprecated. Use getTranslationList('script', $locale) instead", E_USER_NOTICE);
-        return self::getTranslationList('script', $locale);
-    }
-
-    /**
-     * Returns an array with the name of all countries translated to the given language
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for country translation
-     * @return array
-     * @deprecated
-     */
-    public static function getCountryTranslationList($locale = null)
-    {
-        trigger_error("The method getCountryTranslationList is deprecated. Use getTranslationList('territory', $locale, 2) instead", E_USER_NOTICE);
-        return self::getTranslationList('territory', $locale, 2);
-    }
-
-    /**
-     * Returns an array with the name of all territories translated to the given language
-     * All territories contains other countries.
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for territory translation
-     * @return array
-     * @deprecated
-     */
-    public static function getTerritoryTranslationList($locale = null)
-    {
-        trigger_error("The method getTerritoryTranslationList is deprecated. Use getTranslationList('territory', $locale, 1) instead", E_USER_NOTICE);
-        return self::getTranslationList('territory', $locale, 1);
-    }
-
-    /**
-     * Returns a localized information string, supported are several types of informations.
-     * For detailed information about the types look into the documentation
-     *
-     * @param  string             $value  Name to get detailed information about
-     * @param  string             $path   (Optional) Type of information to return
-     * @param  string|Zend_Locale $locale (Optional) Locale|Language for which this informations should be returned
-     * @return string|false The wished information in the given language
-     */
-    public static function getTranslation($value = null, $path = null, $locale = null)
-    {
-        require_once 'Zend/Locale/Data.php';
-        $locale = self::findLocale($locale);
-        $result = Zend_Locale_Data::getContent($locale, $path, $value);
-        if (empty($result) === true) {
-            return false;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the localized language name
-     *
-     * @param  string $value  Name to get detailed information about
-     * @param  string $locale (Optional) Locale for language translation
-     * @return array
-     * @deprecated
-     */
-    public static function getLanguageTranslation($value, $locale = null)
-    {
-        trigger_error("The method getLanguageTranslation is deprecated. Use getTranslation($value, 'language', $locale) instead", E_USER_NOTICE);
-        return self::getTranslation($value, 'language', $locale);
-    }
-
-    /**
-     * Returns the localized script name
-     *
-     * @param  string $value  Name to get detailed information about
-     * @param  string $locale (Optional) locale for script translation
-     * @return array
-     * @deprecated
-     */
-    public static function getScriptTranslation($value, $locale = null)
-    {
-        trigger_error("The method getScriptTranslation is deprecated. Use getTranslation($value, 'script', $locale) instead", E_USER_NOTICE);
-        return self::getTranslation($value, 'script', $locale);
-    }
-
-    /**
-     * Returns the localized country name
-     *
-     * @param  string             $value  Name to get detailed information about
-     * @param  string|Zend_Locale $locale (Optional) Locale for country translation
-     * @return array
-     * @deprecated
-     */
-    public static function getCountryTranslation($value, $locale = null)
-    {
-        trigger_error("The method getCountryTranslation is deprecated. Use getTranslation($value, 'country', $locale) instead", E_USER_NOTICE);
-        return self::getTranslation($value, 'country', $locale);
-    }
-
-    /**
-     * Returns the localized territory name
-     * All territories contains other countries.
-     *
-     * @param  string             $value  Name to get detailed information about
-     * @param  string|Zend_Locale $locale (Optional) Locale for territory translation
-     * @return array
-     * @deprecated
-     */
-    public static function getTerritoryTranslation($value, $locale = null)
-    {
-        trigger_error("The method getTerritoryTranslation is deprecated. Use getTranslation($value, 'territory', $locale) instead", E_USER_NOTICE);
-        return self::getTranslation($value, 'territory', $locale);
-    }
-
-    /**
-     * Returns an array with translated yes strings
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale for language translation (defaults to $this locale)
-     * @return array
-     */
-    public static function getQuestion($locale = null)
-    {
-        require_once 'Zend/Locale/Data.php';
-        $locale            = self::findLocale($locale);
-        $quest             = Zend_Locale_Data::getList($locale, 'question');
-        $yes               = explode(':', $quest['yes']);
-        $no                = explode(':', $quest['no']);
-        $quest['yes']      = $yes[0];
-        $quest['yesarray'] = $yes;
-        $quest['no']       = $no[0];
-        $quest['noarray']  = $no;
-        $quest['yesexpr']  = self::_prepareQuestionString($yes);
-        $quest['noexpr']   = self::_prepareQuestionString($no);
-
-        return $quest;
-    }
-
-    /**
-     * Internal function for preparing the returned question regex string
-     *
-     * @param  string $input Regex to parse
-     * @return string
-     */
-    private static function _prepareQuestionString($input)
-    {
-        $regex = '';
-        if (is_array($input) === true) {
-            $regex = '^';
-            $start = true;
-            foreach ($input as $row) {
-                if ($start === false) {
-                    $regex .= '|';
-                }
-
-                $start  = false;
-                $regex .= '(';
-                $one    = null;
-                if (strlen($row) > 2) {
-                    $one = true;
-                }
-
-                foreach (str_split($row, 1) as $char) {
-                    $regex .= '[' . $char;
-                    $regex .= strtoupper($char) . ']';
-                    if ($one === true) {
-                        $one    = false;
-                        $regex .= '(';
-                    }
-                }
-
-                if ($one === false) {
-                    $regex .= ')';
-                }
-
-                $regex .= '?)';
-            }
-        }
-
-        return $regex;
-    }
-
-    /**
-     * Checks if a locale identifier is a real locale or not
-     * Examples:
-     * "en_XX" refers to "en", which returns true
-     * "XX_yy" refers to "root", which returns false
-     *
-     * @param  string|Zend_Locale $locale     Locale to check for
-     * @param  boolean            $strict     (Optional) If true, no rerouting will be done when checking
-     * @param  boolean            $compatible (DEPRECATED) Only for internal usage, brakes compatibility mode
-     * @return boolean If the locale is known dependend on the settings
-     */
-    public static function isLocale($locale, $strict = false, $compatible = true)
-    {
-        if ($locale instanceof Zend_Locale) {
-            return true;
-        }
-
-        if (($locale === null) || (!is_string($locale) and !is_array($locale))) {
-            return false;
-        }
-
-        try {
-            $locale = self::_prepareLocale($locale, $strict);
-        } catch (Zend_Locale_Exception $e) {
-            return false;
-        }
-
-        if (($compatible === true) and (self::$compatibilityMode === true)) {
-            trigger_error('You are running Zend_Locale in compatibility mode... please migrate your scripts', E_USER_NOTICE);
-            if (isset(self::$_localeData[$locale]) === true) {
-                return $locale;
-            } else if (!$strict) {
-                $locale = explode('_', $locale);
-                if (isset(self::$_localeData[$locale[0]]) === true) {
-                    return $locale[0];
-                }
-            }
-        } else {
-            if (isset(self::$_localeData[$locale]) === true) {
-                return true;
-            } else if (!$strict) {
-                $locale = explode('_', $locale);
-                if (isset(self::$_localeData[$locale[0]]) === true) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Finds the proper locale based on the input
-     * Checks if it exists, degrades it when necessary
-     * Detects registry locale and when all fails tries to detect a automatic locale
-     * Returns the found locale as string
-     *
-     * @param string $locale
-     * @throws Zend_Locale_Exception When the given locale is no locale or the autodetection fails
-     * @return string
-     */
-    public static function findLocale($locale = null)
-    {
-        if ($locale === null) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $locale = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        if ($locale === null) {
-            $locale = new Zend_Locale();
-        }
-
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, false, false)) {
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("The locale '$locale' is no known locale");
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        $locale = self::_prepareLocale($locale);
-        return $locale;
-    }
-
-    /**
-     * Returns a list of all known locales where the locale is the key
-     * Only real locales are returned, the internal locales 'root', 'auto', 'browser'
-     * and 'environment' are suppressed
-     *
-     * @return array List of all Locales
-     */
-    public static function getLocaleList()
-    {
-        $list = self::$_localeData;
-        unset($list['root']);
-        unset($list['auto']);
-        unset($list['browser']);
-        unset($list['environment']);
-        return $list;
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        require_once 'Zend/Locale/Data.php';
-        $cache = Zend_Locale_Data::getCache();
-
-        return $cache;
-    }
-
-    /**
-     * Sets a cache
-     *
-     * @param  Zend_Cache_Core $cache Cache to set
-     * @return void
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        require_once 'Zend/Locale/Data.php';
-        Zend_Locale_Data::setCache($cache);
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        require_once 'Zend/Locale/Data.php';
-        return Zend_Locale_Data::hasCache();
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        require_once 'Zend/Locale/Data.php';
-        Zend_Locale_Data::removeCache();
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        require_once 'Zend/Locale/Data.php';
-        Zend_Locale_Data::clearCache();
-    }
-
-    /**
-     * Disables the set cache
-     *
-     * @param  boolean $flag True disables any set cache, default is false
-     * @return void
-     */
-    public static function disableCache($flag)
-    {
-        require_once 'Zend/Locale/Data.php';
-        Zend_Locale_Data::disableCache($flag);
-    }
-
-    /**
-     * Internal function, returns a single locale on detection
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale to work on
-     * @param  boolean            $strict (Optional) Strict preparation
-     * @throws Zend_Locale_Exception When no locale is set which is only possible when the class was wrong extended
-     * @return string
-     */
-    private static function _prepareLocale($locale, $strict = false)
-    {
-        if ($locale instanceof Zend_Locale) {
-            $locale = $locale->toString();
-        }
-
-        if (is_array($locale)) {
-            return '';
-        }
-
-        if (empty(self::$_auto) === true) {
-            self::$_browser     = self::getBrowser();
-            self::$_environment = self::getEnvironment();
-            self::$_breakChain  = true;
-            self::$_auto        = self::getBrowser() + self::getEnvironment() + self::getDefault();
-        }
-
-        if (!$strict) {
-            if ($locale === 'browser') {
-                $locale = self::$_browser;
-            }
-
-            if ($locale === 'environment') {
-                $locale = self::$_environment;
-            }
-
-            if ($locale === 'default') {
-                $locale = self::$_default;
-            }
-
-            if (($locale === 'auto') or ($locale === null)) {
-                $locale = self::$_auto;
-            }
-
-            if (is_array($locale) === true) {
-                $locale = key($locale);
-            }
-        }
-
-        // This can only happen when someone extends Zend_Locale and erases the default
-        if ($locale === null) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception('Autodetection of Locale has been failed!');
-        }
-
-        if (strpos($locale, '-') !== false) {
-            $locale = strtr($locale, '-', '_');
-        }
-
-        $parts = explode('_', $locale);
-        if (!isset(self::$_localeData[$parts[0]])) {
-            return '';
-        }
-
-        foreach($parts as $key => $value) {
-            if ((strlen($value) < 2) || (strlen($value) > 3)) {
-                unset($parts[$key]);
-            }
-        }
-
-        $locale = implode('_', $parts);
-        return (string) $locale;
-    }
-
-    /**
-     * Search the locale automatically and return all used locales
-     * ordered by quality
-     *
-     * Standard Searchorder is Browser, Environment, Default
-     *
-     * @param  string  $searchorder (Optional) Searchorder
-     * @return array Returns an array of all detected locales
-     */
-    public static function getOrder($order = null)
-    {
-        switch ($order) {
-            case self::ENVIRONMENT:
-                self::$_breakChain = true;
-                $languages         = self::getEnvironment() + self::getBrowser() + self::getDefault();
-                break;
-
-            case self::ZFDEFAULT:
-                self::$_breakChain = true;
-                $languages         = self::getDefault() + self::getEnvironment() + self::getBrowser();
-                break;
-
-            default:
-                self::$_breakChain = true;
-                $languages         = self::getBrowser() + self::getEnvironment() + self::getDefault();
-                break;
-        }
-
-        return $languages;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Locale/Data.php b/airtime_mvc/library/Zend/Locale/Data.php
deleted file mode 100644
index d9e1361e5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data.php
+++ /dev/null
@@ -1,1476 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @subpackage Data
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Data.php 21065 2010-02-16 06:31:59Z thomas $
- */
-
-/**
- * include needed classes
- */
-require_once 'Zend/Locale.php';
-
-/**
- * Locale data reader, handles the CLDR
- *
- * @category   Zend
- * @package    Zend_Locale
- * @subpackage Data
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Data
-{
-    /**
-     * Locale files
-     *
-     * @var ressource
-     * @access private
-     */
-    private static $_ldml = array();
-
-    /**
-     * List of values which are collected
-     *
-     * @var array
-     * @access private
-     */
-    private static $_list = array();
-
-    /**
-     * Internal cache for ldml values
-     *
-     * @var Zend_Cache_Core
-     * @access private
-     */
-    private static $_cache = null;
-
-    /**
-     * Internal option, cache disabled
-     *
-     * @var    boolean
-     * @access private
-     */
-    private static $_cacheDisabled = false;
-
-    /**
-     * Read the content from locale
-     *
-     * Can be called like:
-     * <ldml>
-     *     <delimiter>test</delimiter>
-     *     <second type='myone'>content</second>
-     *     <second type='mysecond'>content2</second>
-     *     <third type='mythird' />
-     * </ldml>
-     *
-     * Case 1: _readFile('ar','/ldml/delimiter')             -> returns [] = test
-     * Case 1: _readFile('ar','/ldml/second[@type=myone]')   -> returns [] = content
-     * Case 2: _readFile('ar','/ldml/second','type')         -> returns [myone] = content; [mysecond] = content2
-     * Case 3: _readFile('ar','/ldml/delimiter',,'right')    -> returns [right] = test
-     * Case 4: _readFile('ar','/ldml/third','type','myone')  -> returns [myone] = mythird
-     *
-     * @param  string $locale
-     * @param  string $path
-     * @param  string $attribute
-     * @param  string $value
-     * @access private
-     * @return array
-     */
-    private static function _readFile($locale, $path, $attribute, $value, $temp)
-    {
-        // without attribute - read all values
-        // with attribute    - read only this value
-        if (!empty(self::$_ldml[(string) $locale])) {
-
-            $result = self::$_ldml[(string) $locale]->xpath($path);
-            if (!empty($result)) {
-                foreach ($result as &$found) {
-
-                    if (empty($value)) {
-
-                        if (empty($attribute)) {
-                            // Case 1
-                            $temp[] = (string) $found;
-                        } else if (empty($temp[(string) $found[$attribute]])){
-                            // Case 2
-                            $temp[(string) $found[$attribute]] = (string) $found;
-                        }
-
-                    } else if (empty ($temp[$value])) {
-
-                        if (empty($attribute)) {
-                            // Case 3
-                            $temp[$value] = (string) $found;
-                        } else {
-                            // Case 4
-                            $temp[$value] = (string) $found[$attribute];
-                        }
-
-                    }
-                }
-            }
-        }
-        return $temp;
-    }
-
-    /**
-     * Find possible routing to other path or locale
-     *
-     * @param  string $locale
-     * @param  string $path
-     * @param  string $attribute
-     * @param  string $value
-     * @param  array  $temp
-     * @throws Zend_Locale_Exception
-     * @access private
-     */
-    private static function _findRoute($locale, $path, $attribute, $value, &$temp)
-    {
-        // load locale file if not already in cache
-        // needed for alias tag when referring to other locale
-        if (empty(self::$_ldml[(string) $locale])) {
-            $filename = dirname(__FILE__) . '/Data/' . $locale . '.xml';
-            if (!file_exists($filename)) {
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("Missing locale file '$filename' for '$locale' locale.");
-            }
-
-            self::$_ldml[(string) $locale] = simplexml_load_file($filename);
-        }
-
-        // search for 'alias' tag in the search path for redirection
-        $search = '';
-        $tok = strtok($path, '/');
-
-        // parse the complete path
-        if (!empty(self::$_ldml[(string) $locale])) {
-            while ($tok !== false) {
-                $search .=  '/' . $tok;
-                if (strpos($search, '[@') !== false) {
-                    while (strrpos($search, '[@') > strrpos($search, ']')) {
-                        $tok = strtok('/');
-                        if (empty($tok)) {
-                            $search .= '/';
-                        }
-                        $search = $search . '/' . $tok;
-                    }
-                }
-                $result = self::$_ldml[(string) $locale]->xpath($search . '/alias');
-
-                // alias found
-                if (!empty($result)) {
-
-                    $source = $result[0]['source'];
-                    $newpath = $result[0]['path'];
-
-                    // new path - path //ldml is to ignore
-                    if ($newpath != '//ldml') {
-                        // other path - parse to make real path
-
-                        while (substr($newpath,0,3) == '../') {
-                            $newpath = substr($newpath, 3);
-                            $search = substr($search, 0, strrpos($search, '/'));
-                        }
-
-                        // truncate ../ to realpath otherwise problems with alias
-                        $path = $search . '/' . $newpath;
-                        while (($tok = strtok('/'))!== false) {
-                            $path = $path . '/' . $tok;
-                        }
-                    }
-
-                    // reroute to other locale
-                    if ($source != 'locale') {
-                        $locale = $source;
-                    }
-
-                    $temp = self::_getFile($locale, $path, $attribute, $value, $temp);
-                    return false;
-                }
-
-                $tok = strtok('/');
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Read the right LDML file
-     *
-     * @param  string $locale
-     * @param  string $path
-     * @param  string $attribute
-     * @param  string $value
-     * @access private
-     */
-    private static function _getFile($locale, $path, $attribute = false, $value = false, $temp = array())
-    {
-        $result = self::_findRoute($locale, $path, $attribute, $value, $temp);
-        if ($result) {
-            $temp = self::_readFile($locale, $path, $attribute, $value, $temp);
-        }
-
-        // parse required locales reversive
-        // example: when given zh_Hans_CN
-        // 1. -> zh_Hans_CN
-        // 2. -> zh_Hans
-        // 3. -> zh
-        // 4. -> root
-        if (($locale != 'root') && ($result)) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-            if (!empty($locale)) {
-                $temp = self::_getFile($locale, $path, $attribute, $value, $temp);
-            } else {
-                $temp = self::_getFile('root', $path, $attribute, $value, $temp);
-            }
-        }
-        return $temp;
-    }
-
-    /**
-     * Find the details for supplemental calendar datas
-     *
-     * @param  string $locale Locale for Detaildata
-     * @param  array  $list   List to search
-     * @return string         Key for Detaildata
-     */
-    private static function _calendarDetail($locale, $list)
-    {
-        $ret = "001";
-        foreach ($list as $key => $value) {
-            if (strpos($locale, '_') !== false) {
-                $locale = substr($locale, strpos($locale, '_') + 1);
-            }
-            if (strpos($key, $locale) !== false) {
-                $ret = $key;
-                break;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Internal function for checking the locale
-     *
-     * @param string|Zend_Locale $locale Locale to check
-     * @return string
-     */
-    private static function _checkLocale($locale)
-    {
-        if (empty($locale)) {
-            $locale = new Zend_Locale();
-        }
-
-        if (!(Zend_Locale::isLocale((string) $locale, null, false))) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("Locale (" . (string) $locale . ") is a unknown locale");
-        }
-
-        return (string) $locale;
-    }
-
-    /**
-     * Read the LDML file, get a array of multipath defined value
-     *
-     * @param  string $locale
-     * @param  string $path
-     * @param  string $value
-     * @return array
-     * @access public
-     */
-    public static function getList($locale, $path, $value = false)
-    {
-        $locale = self::_checkLocale($locale);
-
-        if (!isset(self::$_cache) && !self::$_cacheDisabled) {
-            require_once 'Zend/Cache.php';
-            self::$_cache = Zend_Cache::factory(
-                'Core',
-                'File',
-                array('automatic_serialization' => true),
-                array());
-        }
-
-        $val = $value;
-        if (is_array($value)) {
-            $val = implode('_' , $value);
-        }
-
-        $val = urlencode($val);
-        $id = strtr('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
-        if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
-            return unserialize($result);
-        }
-
-        $temp = array();
-        switch(strtolower($path)) {
-            case 'language':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language', 'type');
-                break;
-
-            case 'script':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/scripts/script', 'type');
-                break;
-
-            case 'territory':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/territories/territory', 'type');
-                if ($value === 1) {
-                    foreach($temp as $key => $value) {
-                        if ((is_numeric($key) === false) and ($key != 'QO') and ($key != 'QU')) {
-                            unset($temp[$key]);
-                        }
-                    }
-                } else if ($value === 2) {
-                    foreach($temp as $key => $value) {
-                        if (is_numeric($key) or ($key == 'QO') or ($key == 'QU')) {
-                            unset($temp[$key]);
-                        }
-                    }
-                }
-                break;
-
-            case 'variant':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/variants/variant', 'type');
-                break;
-
-            case 'key':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/keys/key', 'type');
-                break;
-
-            case 'type':
-                if (empty($type)) {
-                    $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type');
-                } else {
-                    if (($value == 'calendar') or
-                        ($value == 'collation') or
-                        ($value == 'currency')) {
-                        $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type[@key=\'' . $value . '\']', 'type');
-                    } else {
-                        $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type[@type=\'' . $value . '\']', 'type');
-                    }
-                }
-                break;
-
-            case 'layout':
-                $temp  = self::_getFile($locale, '/ldml/layout/orientation',                 'lines',      'lines');
-                $temp += self::_getFile($locale, '/ldml/layout/orientation',                 'characters', 'characters');
-                $temp += self::_getFile($locale, '/ldml/layout/inList',                      '',           'inList');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'currency\']',  '',           'currency');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'dayWidth\']',  '',           'dayWidth');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'fields\']',    '',           'fields');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'keys\']',      '',           'keys');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'languages\']', '',           'languages');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'long\']',      '',           'long');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'measurementSystemNames\']', '', 'measurementSystemNames');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'monthWidth\']',   '',        'monthWidth');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'quarterWidth\']', '',        'quarterWidth');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'scripts\']',   '',           'scripts');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'territories\']',  '',        'territories');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'types\']',     '',           'types');
-                $temp += self::_getFile($locale, '/ldml/layout/inText[@type=\'variants\']',  '',           'variants');
-                break;
-
-            case 'characters':
-                $temp  = self::_getFile($locale, '/ldml/characters/exemplarCharacters',                           '', 'characters');
-                $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'auxiliary\']',      '', 'auxiliary');
-                $temp += self::_getFile($locale, '/ldml/characters/exemplarCharacters[@type=\'currencySymbol\']', '', 'currencySymbol');
-                break;
-
-            case 'delimiters':
-                $temp  = self::_getFile($locale, '/ldml/delimiters/quotationStart',          '', 'quoteStart');
-                $temp += self::_getFile($locale, '/ldml/delimiters/quotationEnd',            '', 'quoteEnd');
-                $temp += self::_getFile($locale, '/ldml/delimiters/alternateQuotationStart', '', 'quoteStartAlt');
-                $temp += self::_getFile($locale, '/ldml/delimiters/alternateQuotationEnd',   '', 'quoteEndAlt');
-                break;
-
-            case 'measurement':
-                $temp  = self::_getFile('supplementalData', '/supplementalData/measurementData/measurementSystem[@type=\'metric\']', 'territories', 'metric');
-                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/measurementSystem[@type=\'US\']',     'territories', 'US');
-                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/paperSize[@type=\'A4\']',             'territories', 'A4');
-                $temp += self::_getFile('supplementalData', '/supplementalData/measurementData/paperSize[@type=\'US-Letter\']',      'territories', 'US-Letter');
-                break;
-
-            case 'months':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/default', 'choice', 'context');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/default', 'choice', 'default');
-                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'abbreviated\']/month', 'type');
-                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'narrow\']/month', 'type');
-                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/monthWidth[@type=\'wide\']/month', 'type');
-                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'abbreviated\']/month', 'type');
-                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'narrow\']/month', 'type');
-                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'stand-alone\']/monthWidth[@type=\'wide\']/month', 'type');
-                break;
-
-            case 'month':
-                if (empty($value)) {
-                    $value = array("gregorian", "format", "wide");
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/months/monthContext[@type=\'' . $value[1] . '\']/monthWidth[@type=\'' . $value[2] . '\']/month', 'type');
-                break;
-
-            case 'days':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/default', 'choice', 'context');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/default', 'choice', 'default');
-                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'abbreviated\']/day', 'type');
-                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'narrow\']/day', 'type');
-                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/dayWidth[@type=\'wide\']/day', 'type');
-                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'abbreviated\']/day', 'type');
-                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'narrow\']/day', 'type');
-                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'stand-alone\']/dayWidth[@type=\'wide\']/day', 'type');
-                break;
-
-            case 'day':
-                if (empty($value)) {
-                    $value = array("gregorian", "format", "wide");
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/days/dayContext[@type=\'' . $value[1] . '\']/dayWidth[@type=\'' . $value[2] . '\']/day', 'type');
-                break;
-
-            case 'week':
-                $minDays   = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/minDays', 'territories'));
-                $firstDay  = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/firstDay', 'territories'));
-                $weekStart = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/weekendStart', 'territories'));
-                $weekEnd   = self::_calendarDetail($locale, self::_getFile('supplementalData', '/supplementalData/weekData/weekendEnd', 'territories'));
-
-                $temp  = self::_getFile('supplementalData', "/supplementalData/weekData/minDays[@territories='" . $minDays . "']", 'count', 'minDays');
-                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/firstDay[@territories='" . $firstDay . "']", 'day', 'firstDay');
-                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/weekendStart[@territories='" . $weekStart . "']", 'day', 'weekendStart');
-                $temp += self::_getFile('supplementalData', "/supplementalData/weekData/weekendEnd[@territories='" . $weekEnd . "']", 'day', 'weekendEnd');
-                break;
-
-            case 'quarters':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp['format']['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'abbreviated\']/quarter', 'type');
-                $temp['format']['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'narrow\']/quarter', 'type');
-                $temp['format']['wide']        = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'format\']/quarterWidth[@type=\'wide\']/quarter', 'type');
-                $temp['stand-alone']['abbreviated']  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'abbreviated\']/quarter', 'type');
-                $temp['stand-alone']['narrow']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'narrow\']/quarter', 'type');
-                $temp['stand-alone']['wide']         = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/quarters/quarterContext[@type=\'stand-alone\']/quarterWidth[@type=\'wide\']/quarter', 'type');
-                break;
-
-            case 'quarter':
-                if (empty($value)) {
-                    $value = array("gregorian", "format", "wide");
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/quarters/quarterContext[@type=\'' . $value[1] . '\']/quarterWidth[@type=\'' . $value[2] . '\']/quarter', 'type');
-                break;
-
-            case 'eras':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp['names']       = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraNames/era', 'type');
-                $temp['abbreviated'] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraAbbr/era', 'type');
-                $temp['narrow']      = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/eras/eraNarrow/era', 'type');
-                break;
-
-            case 'era':
-                if (empty($value)) {
-                    $value = array("gregorian", "Abbr");
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/eras/era' . $value[1] . '/era', 'type');
-                break;
-
-            case 'date':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'full\']/dateFormat/pattern', '', 'full');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'long\']/dateFormat/pattern', '', 'long');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'medium\']/dateFormat/pattern', '', 'medium');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'short\']/dateFormat/pattern', '', 'short');
-                break;
-
-            case 'time':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp  = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'full\']/timeFormat/pattern', '', 'full');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'long\']/timeFormat/pattern', '', 'long');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'medium\']/timeFormat/pattern', '', 'medium');
-                $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'short\']/timeFormat/pattern', '', 'short');
-                break;
-
-            case 'datetime':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-
-                $timefull = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'full\']/timeFormat/pattern', '', 'full');
-                $timelong = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'long\']/timeFormat/pattern', '', 'long');
-                $timemedi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'medium\']/timeFormat/pattern', '', 'medi');
-                $timeshor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/timeFormatLength[@type=\'short\']/timeFormat/pattern', '', 'shor');
-
-                $datefull = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'full\']/dateFormat/pattern', '', 'full');
-                $datelong = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'long\']/dateFormat/pattern', '', 'long');
-                $datemedi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'medium\']/dateFormat/pattern', '', 'medi');
-                $dateshor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/dateFormatLength[@type=\'short\']/dateFormat/pattern', '', 'shor');
-
-                $full = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'full\']/dateTimeFormat/pattern', '', 'full');
-                $long = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'long\']/dateTimeFormat/pattern', '', 'long');
-                $medi = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'medium\']/dateTimeFormat/pattern', '', 'medi');
-                $shor = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'short\']/dateTimeFormat/pattern', '', 'shor');
-
-                $temp['full']   = str_replace(array('{0}', '{1}'), array($timefull['full'], $datefull['full']), $full['full']);
-                $temp['long']   = str_replace(array('{0}', '{1}'), array($timelong['long'], $datelong['long']), $long['long']);
-                $temp['medium'] = str_replace(array('{0}', '{1}'), array($timemedi['medi'], $datemedi['medi']), $medi['medi']);
-                $temp['short']  = str_replace(array('{0}', '{1}'), array($timeshor['shor'], $dateshor['shor']), $shor['shor']);
-                break;
-
-            case 'dateitem':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $_temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/availableFormats/dateFormatItem', 'id');
-                foreach($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/availableFormats/dateFormatItem[@id=\'' . $key . '\']', '', $key);
-                }
-                break;
-
-            case 'dateinterval':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $_temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/intervalFormats/intervalFormatItem', 'id');
-                foreach($_temp as $key => $found) {
-                    $temp[$key] = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateTimeFormats/intervalFormats/intervalFormatItem[@id=\'' . $key . '\']/greatestDifference', 'id');
-                }
-                break;
-
-            case 'field':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp2 = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field', 'type');
-                foreach ($temp2 as $key => $keyvalue) {
-                    $temp += self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field[@type=\'' . $key . '\']/displayName', '', $key);
-                }
-                break;
-
-            case 'relative':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/fields/field/relative', 'type');
-                break;
-
-            case 'symbols':
-                $temp  = self::_getFile($locale, '/ldml/numbers/symbols/decimal',         '', 'decimal');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/group',           '', 'group');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/list',            '', 'list');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/percentSign',     '', 'percent');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/nativeZeroDigit', '', 'zero');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/patternDigit',    '', 'pattern');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/plusSign',        '', 'plus');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/minusSign',       '', 'minus');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/exponential',     '', 'exponent');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/perMille',        '', 'mille');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/infinity',        '', 'infinity');
-                $temp += self::_getFile($locale, '/ldml/numbers/symbols/nan',             '', 'nan');
-                break;
-
-            case 'nametocurrency':
-                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
-                }
-                break;
-
-            case 'currencytoname':
-                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
-                foreach ($_temp as $key => $keyvalue) {
-                    $val = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
-                    if (!isset($val[$key])) {
-                        continue;
-                    }
-                    if (!isset($temp[$val[$key]])) {
-                        $temp[$val[$key]] = $key;
-                    } else {
-                        $temp[$val[$key]] .= " " . $key;
-                    }
-                }
-                break;
-
-            case 'currencysymbol':
-                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/symbol', '', $key);
-                }
-                break;
-
-            case 'question':
-                $temp  = self::_getFile($locale, '/ldml/posix/messages/yesstr',  '', 'yes');
-                $temp += self::_getFile($locale, '/ldml/posix/messages/nostr',   '', 'no');
-                break;
-
-            case 'currencyfraction':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info', 'iso4217');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $key . '\']', 'digits', $key);
-                }
-                break;
-
-            case 'currencyrounding':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info', 'iso4217');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $key . '\']', 'rounding', $key);
-                }
-                break;
-
-            case 'currencytoregion':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
-                }
-                break;
-
-            case 'regiontocurrency':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
-                foreach ($_temp as $key => $keyvalue) {
-                    $val = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
-                    if (!isset($val[$key])) {
-                        continue;
-                    }
-                    if (!isset($temp[$val[$key]])) {
-                        $temp[$val[$key]] = $key;
-                    } else {
-                        $temp[$val[$key]] .= " " . $key;
-                    }
-                }
-                break;
-
-            case 'regiontoterritory':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
-                }
-                break;
-
-            case 'territorytoregion':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
-                }
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'scripttolanguage':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
-                    if (empty($temp[$key])) {
-                        unset($temp[$key]);
-                    }
-                }
-                break;
-
-            case 'languagetoscript':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
-                }
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if (empty($found3)) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'territorytolanguage':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
-                    if (empty($temp[$key])) {
-                        unset($temp[$key]);
-                    }
-                }
-                break;
-
-            case 'languagetoterritory':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
-                }
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if (empty($found3)) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'timezonetowindows':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone', 'other');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@other=\'' . $key . '\']', 'type', $key);
-                }
-                break;
-
-            case 'windowstotimezone':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@type=\'' .$key . '\']', 'other', $key);
-                }
-                break;
-
-            case 'territorytotimezone':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem', 'type');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@type=\'' . $key . '\']', 'territory', $key);
-                }
-                break;
-
-            case 'timezonetoterritory':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem', 'territory');
-                foreach ($_temp as $key => $found) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@territory=\'' . $key . '\']', 'type', $key);
-                }
-                break;
-
-            case 'citytotimezone':
-                $_temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
-                foreach($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
-                }
-                break;
-
-            case 'timezonetocity':
-                $_temp  = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
-                    if (!empty($temp[$key])) {
-                        $temp[$temp[$key]] = $key;
-                    }
-                    unset($temp[$key]);
-                }
-                break;
-
-            case 'phonetoterritory':
-                $_temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
-                }
-                break;
-
-            case 'territorytophone':
-                $_temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
-                foreach ($_temp as $key => $keyvalue) {
-                    $val = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
-                    if (!isset($val[$key])) {
-                        continue;
-                    }
-                    if (!isset($temp[$val[$key]])) {
-                        $temp[$val[$key]] = $key;
-                    } else {
-                        $temp[$val[$key]] .= " " . $key;
-                    }
-                }
-                break;
-
-            case 'numerictoterritory':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'type');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\'' . $key . '\']', 'numeric', $key);
-                }
-                break;
-
-            case 'territorytonumeric':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'numeric');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@numeric=\'' . $key . '\']', 'type', $key);
-                }
-                break;
-
-            case 'alpha3toterritory':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'type');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\'' . $key . '\']', 'alpha3', $key);
-                }
-                break;
-
-            case 'territorytoalpha3':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes', 'alpha3');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@alpha3=\'' . $key . '\']', 'type', $key);
-                }
-                break;
-
-            case 'postaltoterritory':
-                $_temp = self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex', 'territoryId');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex[@territoryId=\'' . $key . '\']', 'territoryId');
-                }
-                break;
-
-            case 'numberingsystem':
-                $_temp = self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem', 'id');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem[@id=\'' . $key . '\']', 'digits', $key);
-                    if (empty($temp[$key])) {
-                        unset($temp[$key]);
-                    }
-                }
-                break;
-
-            case 'chartofallback':
-                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp2 = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
-                    $temp[current($temp2)] = $key;
-                }
-                break;
-
-            case 'fallbacktochar':
-                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
-                }
-                break;
-
-            case 'localeupgrade':
-                $_temp = self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag', 'from');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp += self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $key . '\']', 'to', $key);
-                }
-                break;
-
-            case 'unit':
-                $_temp = self::_getFile($locale, '/ldml/units/unit', 'type');
-                foreach($_temp as $key => $keyvalue) {
-                    $_temp2 = self::_getFile($locale, '/ldml/units/unit[@type=\'' . $key . '\']/unitPattern', 'count');
-                    $temp[$key] = $_temp2;
-                }
-                break;
-
-            default :
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("Unknown list ($path) for parsing locale data.");
-                break;
-        }
-
-        if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($temp), $id);
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Read the LDML file, get a single path defined value
-     *
-     * @param  string $locale
-     * @param  string $path
-     * @param  string $value
-     * @return string
-     * @access public
-     */
-    public static function getContent($locale, $path, $value = false)
-    {
-        $locale = self::_checkLocale($locale);
-
-        if (!isset(self::$_cache) && !self::$_cacheDisabled) {
-            require_once 'Zend/Cache.php';
-            self::$_cache = Zend_Cache::factory(
-                'Core',
-                'File',
-                array('automatic_serialization' => true),
-                array());
-        }
-
-        $val = $value;
-        if (is_array($value)) {
-            $val = implode('_' , $value);
-        }
-        $val = urlencode($val);
-        $id = strtr('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val, array('-' => '_', '%' => '_', '+' => '_'));
-        if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
-            return unserialize($result);
-        }
-
-        switch(strtolower($path)) {
-            case 'language':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language[@type=\'' . $value . '\']', 'type');
-                break;
-
-            case 'script':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/scripts/script[@type=\'' . $value . '\']', 'type');
-                break;
-
-            case 'country':
-            case 'territory':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/territories/territory[@type=\'' . $value . '\']', 'type');
-                break;
-
-            case 'variant':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/variants/variant[@type=\'' . $value . '\']', 'type');
-                break;
-
-            case 'key':
-                $temp = self::_getFile($locale, '/ldml/localeDisplayNames/keys/key[@type=\'' . $value . '\']', 'type');
-                break;
-
-            case 'defaultcalendar':
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/default', 'choice', 'default');
-                break;
-
-            case 'monthcontext':
-                if (empty ($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/default', 'choice', 'context');
-                break;
-
-            case 'defaultmonth':
-                if (empty ($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/months/monthContext[@type=\'format\']/default', 'choice', 'default');
-                break;
-
-            case 'month':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", "format", "wide", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/months/monthContext[@type=\'' . $value[1] . '\']/monthWidth[@type=\'' . $value[2] . '\']/month[@type=\'' . $value[3] . '\']', 'type');
-                break;
-
-            case 'daycontext':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/default', 'choice', 'context');
-                break;
-
-            case 'defaultday':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/days/dayContext[@type=\'format\']/default', 'choice', 'default');
-                break;
-
-            case 'day':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", "format", "wide", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/days/dayContext[@type=\'' . $value[1] . '\']/dayWidth[@type=\'' . $value[2] . '\']/day[@type=\'' . $value[3] . '\']', 'type');
-                break;
-
-            case 'quarter':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", "format", "wide", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/quarters/quarterContext[@type=\'' . $value[1] . '\']/quarterWidth[@type=\'' . $value[2] . '\']/quarter[@type=\'' . $value[3] . '\']', 'type');
-                break;
-
-            case 'am':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/am', '', 'am');
-                break;
-
-            case 'pm':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/pm', '', 'pm');
-                break;
-
-            case 'era':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", "Abbr", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/eras/era' . $value[1] . '/era[@type=\'' . $value[2] . '\']', 'type');
-                break;
-
-            case 'defaultdate':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/dateFormats/default', 'choice', 'default');
-                break;
-
-            case 'date':
-                if (empty($value)) {
-                    $value = array("gregorian", "medium");
-                }
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateFormats/dateFormatLength[@type=\'' . $value[1] . '\']/dateFormat/pattern', '', 'pattern');
-                break;
-
-            case 'defaulttime':
-                if (empty($value)) {
-                    $value = "gregorian";
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value . '\']/timeFormats/default', 'choice', 'default');
-                break;
-
-            case 'time':
-                if (empty($value)) {
-                    $value = array("gregorian", "medium");
-                }
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/timeFormats/timeFormatLength[@type=\'' . $value[1] . '\']/timeFormat/pattern', '', 'pattern');
-                break;
-
-            case 'datetime':
-                if (empty($value)) {
-                    $value = array("gregorian", "medium");
-                }
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-
-                $date     = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateFormats/dateFormatLength[@type=\'' . $value[1] . '\']/dateFormat/pattern', '', 'pattern');
-                $time     = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/timeFormats/timeFormatLength[@type=\'' . $value[1] . '\']/timeFormat/pattern', '', 'pattern');
-                $datetime = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/dateTimeFormatLength[@type=\'' . $value[1] . '\']/dateTimeFormat/pattern', '', 'pattern');
-                $temp = str_replace(array('{0}', '{1}'), array(current($time), current($date)), current($datetime));
-                break;
-
-            case 'dateitem':
-                if (empty($value)) {
-                    $value = array("gregorian", "yyMMdd");
-                }
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/availableFormats/dateFormatItem[@id=\'' . $value[1] . '\']', '');
-                break;
-
-            case 'dateinterval':
-                if (empty($value)) {
-                    $value = array("gregorian", "yMd", "y");
-                }
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp, $temp[0]);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/dateTimeFormats/intervalFormats/intervalFormatItem[@id=\'' . $value[1] . '\']/greatestDifference[@id=\'' . $value[2] . '\']', '');
-                break;
-
-            case 'field':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field[@type=\'' . $value[1] . '\']/displayName', '', $value[1]);
-                break;
-
-            case 'relative':
-                if (!is_array($value)) {
-                    $temp = $value;
-                    $value = array("gregorian", $temp);
-                }
-                $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]);
-                break;
-
-            case 'decimalnumber':
-                $temp = self::_getFile($locale, '/ldml/numbers/decimalFormats/decimalFormatLength/decimalFormat/pattern', '', 'default');
-                break;
-
-            case 'scientificnumber':
-                $temp = self::_getFile($locale, '/ldml/numbers/scientificFormats/scientificFormatLength/scientificFormat/pattern', '', 'default');
-                break;
-
-            case 'percentnumber':
-                $temp = self::_getFile($locale, '/ldml/numbers/percentFormats/percentFormatLength/percentFormat/pattern', '', 'default');
-                break;
-
-            case 'currencynumber':
-                $temp = self::_getFile($locale, '/ldml/numbers/currencyFormats/currencyFormatLength/currencyFormat/pattern', '', 'default');
-                break;
-
-            case 'nametocurrency':
-                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/displayName', '', $value);
-                break;
-
-            case 'currencytoname':
-                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/displayName', '', $value);
-                $_temp = self::_getFile($locale, '/ldml/numbers/currencies/currency', 'type');
-                $temp = array();
-                foreach ($_temp as $key => $keyvalue) {
-                    $val = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $key . '\']/displayName', '', $key);
-                    if (!isset($val[$key]) or ($val[$key] != $value)) {
-                        continue;
-                    }
-                    if (!isset($temp[$val[$key]])) {
-                        $temp[$val[$key]] = $key;
-                    } else {
-                        $temp[$val[$key]] .= " " . $key;
-                    }
-                }
-                break;
-
-            case 'currencysymbol':
-                $temp = self::_getFile($locale, '/ldml/numbers/currencies/currency[@type=\'' . $value . '\']/symbol', '', $value);
-                break;
-
-            case 'question':
-                $temp = self::_getFile($locale, '/ldml/posix/messages/' . $value . 'str',  '', $value);
-                break;
-
-            case 'currencyfraction':
-                if (empty($value)) {
-                    $value = "DEFAULT";
-                }
-                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $value . '\']', 'digits', 'digits');
-                break;
-
-            case 'currencyrounding':
-                if (empty($value)) {
-                    $value = "DEFAULT";
-                }
-                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/fractions/info[@iso4217=\'' . $value . '\']', 'rounding', 'rounding');
-                break;
-
-            case 'currencytoregion':
-                $temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $value . '\']/currency', 'iso4217', $value);
-                break;
-
-            case 'regiontocurrency':
-                $_temp = self::_getFile('supplementalData', '/supplementalData/currencyData/region', 'iso3166');
-                $temp = array();
-                foreach ($_temp as $key => $keyvalue) {
-                    $val = self::_getFile('supplementalData', '/supplementalData/currencyData/region[@iso3166=\'' . $key . '\']/currency', 'iso4217', $key);
-                    if (!isset($val[$key]) or ($val[$key] != $value)) {
-                        continue;
-                    }
-                    if (!isset($temp[$val[$key]])) {
-                        $temp[$val[$key]] = $key;
-                    } else {
-                        $temp[$val[$key]] .= " " . $key;
-                    }
-                }
-                break;
-
-            case 'regiontoterritory':
-                $temp = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $value . '\']', 'contains', $value);
-                break;
-
-            case 'territorytoregion':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/territoryContainment/group', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/territoryContainment/group[@type=\'' . $key . '\']', 'contains', $key);
-                }
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if ($found3 !== $value) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'scripttolanguage':
-                $temp = self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $value . '\']', 'scripts', $value);
-                break;
-
-            case 'languagetoscript':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'scripts', $key);
-                }
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if ($found3 !== $value) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'territorytolanguage':
-                $temp = self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $value . '\']', 'territories', $value);
-                break;
-
-            case 'languagetoterritory':
-                $_temp2 = self::_getFile('supplementalData', '/supplementalData/languageData/language', 'type');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('supplementalData', '/supplementalData/languageData/language[@type=\'' . $key . '\']', 'territories', $key);
-                }
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if ($found3 !== $value) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'timezonetowindows':
-                $temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@other=\''.$value.'\']', 'type', $value);
-                break;
-
-            case 'windowstotimezone':
-                $temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/mapTimezones[@type=\'windows\']/mapZone[@type=\''.$value.'\']', 'other', $value);
-                break;
-
-            case 'territorytotimezone':
-                $temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@type=\'' . $value . '\']', 'territory', $value);
-                break;
-
-            case 'timezonetoterritory':
-                $temp = self::_getFile('supplementalData', '/supplementalData/timezoneData/zoneFormatting/zoneItem[@territory=\'' . $value . '\']', 'type', $value);
-                break;
-
-            case 'citytotimezone':
-                $temp = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $value . '\']/exemplarCity', '', $value);
-                break;
-
-            case 'timezonetocity':
-                $_temp  = self::_getFile($locale, '/ldml/dates/timeZoneNames/zone', 'type');
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $temp += self::_getFile($locale, '/ldml/dates/timeZoneNames/zone[@type=\'' . $key . '\']/exemplarCity', '', $key);
-                    if (!empty($temp[$key])) {
-                        if ($temp[$key] == $value) {
-                            $temp[$temp[$key]] = $key;
-                        }
-                    }
-                    unset($temp[$key]);
-                }
-                break;
-
-            case 'phonetoterritory':
-                $temp = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $value . '\']/telephoneCountryCode', 'code', $value);
-                break;
-
-            case 'territorytophone':
-                $_temp2 = self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory', 'territory');
-                $_temp = array();
-                foreach ($_temp2 as $key => $found) {
-                    $_temp += self::_getFile('telephoneCodeData', '/supplementalData/telephoneCodeData/codesByTerritory[@territory=\'' . $key . '\']/telephoneCountryCode', 'code', $key);
-                }
-                $temp = array();
-                foreach($_temp as $key => $found) {
-                    $_temp3 = explode(" ", $found);
-                    foreach($_temp3 as $found3) {
-                        if ($found3 !== $value) {
-                            continue;
-                        }
-                        if (!isset($temp[$found3])) {
-                            $temp[$found3] = (string) $key;
-                        } else {
-                            $temp[$found3] .= " " . $key;
-                        }
-                    }
-                }
-                break;
-
-            case 'numerictoterritory':
-                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\''.$value.'\']', 'numeric', $value);
-                break;
-
-            case 'territorytonumeric':
-                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@numeric=\''.$value.'\']', 'type', $value);
-                break;
-
-            case 'alpha3toterritory':
-                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@type=\''.$value.'\']', 'alpha3', $value);
-                break;
-
-            case 'territorytoalpha3':
-                $temp = self::_getFile('supplementalData', '/supplementalData/codeMappings/territoryCodes[@alpha3=\''.$value.'\']', 'type', $value);
-                break;
-
-            case 'postaltoterritory':
-                $temp = self::_getFile('postalCodeData', '/supplementalData/postalCodeData/postCodeRegex[@territoryId=\'' . $value . '\']', 'territoryId');
-                break;
-
-            case 'numberingsystem':
-                $temp = self::_getFile('numberingSystems', '/supplementalData/numberingSystems/numberingSystem[@id=\'' . strtolower($value) . '\']', 'digits', $value);
-                break;
-
-            case 'chartofallback':
-                $_temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character', 'value');
-                foreach ($_temp as $key => $keyvalue) {
-                    $temp2 = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $key . '\']/substitute', '', $key);
-                    if (current($temp2) == $value) {
-                        $temp = $key;
-                    }
-                }
-                break;
-
-                $temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $value . '\']/substitute', '', $value);
-                break;
-
-            case 'fallbacktochar':
-                $temp = self::_getFile('characters', '/supplementalData/characters/character-fallback/character[@value=\'' . $value . '\']/substitute', '');
-                break;
-
-            case 'localeupgrade':
-                $temp = self::_getFile('likelySubtags', '/supplementalData/likelySubtags/likelySubtag[@from=\'' . $value . '\']', 'to', $value);
-                break;
-
-            case 'unit':
-                $temp = self::_getFile($locale, '/ldml/units/unit[@type=\'' . $value[0] . '\']/unitPattern[@count=\'' . $value[1] . '\']', '');
-                break;
-
-            default :
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("Unknown detail ($path) for parsing locale data.");
-                break;
-        }
-
-        if (is_array($temp)) {
-            $temp = current($temp);
-        }
-        if (isset(self::$_cache)) {
-            self::$_cache->save( serialize($temp), $id);
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Set a cache for Zend_Locale_Data
-     *
-     * @param Zend_Cache_Core $cache A cache frontend
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        if (self::$_cache !== null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        self::$_cache->clean();
-    }
-
-    /**
-     * Disables the cache
-     *
-     * @param unknown_type $flag
-     */
-    public static function disableCache($flag)
-    {
-        self::$_cacheDisabled = (boolean) $flag;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Locale/Data/Translation.php b/airtime_mvc/library/Zend/Locale/Data/Translation.php
deleted file mode 100644
index 9dfa87ee3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/Translation.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Translation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Definition class for all Windows locales
- * Based on this two lists:
- * @link http://msdn.microsoft.com/en-us/library/39cwe7zf.aspx
- * @link http://msdn.microsoft.com/en-us/library/cdax410z.aspx
- * @link http://msdn.microsoft.com/en-us/goglobal/bb964664.aspx
- * @link http://msdn.microsoft.com/en-us/goglobal/bb895996.aspx
- *
- * @category  Zend
- * @package   Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Data_Translation
-{
-    /**
-     * Locale Translation for Full Named Locales
-     *
-     * @var array $localeTranslation
-     */
-    public static $languageTranslation = array(
-        'Afrikaans'         => 'af',
-        'Albanian'          => 'sq',
-        'Amharic'           => 'am',
-        'Arabic'            => 'ar',
-        'Armenian'          => 'hy',
-        'Assamese'          => 'as',
-        'Azeri'             => 'az',
-        'Azeri Latin'       => 'az_Latn',
-        'Azeri Cyrillic'    => 'az_Cyrl',
-        'Basque'            => 'eu',
-        'Belarusian'        => 'be',
-        'Bengali'           => 'bn',
-        'Bengali Latin'     => 'bn_Latn',
-        'Bosnian'           => 'bs',
-        'Bulgarian'         => 'bg',
-        'Burmese'           => 'my',
-        'Catalan'           => 'ca',
-        'Cherokee'          => 'chr',
-        'Chinese'           => 'zh',
-        'Croatian'          => 'hr',
-        'Czech'             => 'cs',
-        'Danish'            => 'da',
-        'Divehi'            => 'dv',
-        'Dutch'             => 'nl',
-        'English'           => 'en',
-        'Estonian'          => 'et',
-        'Faroese'           => 'fo',
-        'Faeroese'          => 'fo',
-        'Farsi'             => 'fa',
-        'Filipino'          => 'fil',
-        'Finnish'           => 'fi',
-        'French'            => 'fr',
-        'Frisian'           => 'fy',
-        'Macedonian'        => 'mk',
-        'Gaelic'            => 'gd',
-        'Galician'          => 'gl',
-        'Georgian'          => 'ka',
-        'German'            => 'de',
-        'Greek'             => 'el',
-        'Guarani'           => 'gn',
-        'Gujarati'          => 'gu',
-        'Hausa'             => 'ha',
-        'Hawaiian'          => 'haw',
-        'Hebrew'            => 'he',
-        'Hindi'             => 'hi',
-        'Hungarian'         => 'hu',
-        'Icelandic'         => 'is',
-        'Igbo'              => 'ig',
-        'Indonesian'        => 'id',
-        'Inuktitut'         => 'iu',
-        'Italian'           => 'it',
-        'Japanese'          => 'ja',
-        'Kannada'           => 'kn',
-        'Kanuri'            => 'kr',
-        'Kashmiri'          => 'ks',
-        'Kazakh'            => 'kk',
-        'Khmer'             => 'km',
-        'Konkani'           => 'kok',
-        'Korean'            => 'ko',
-        'Kyrgyz'            => 'ky',
-        'Lao'               => 'lo',
-        'Latin'             => 'la',
-        'Latvian'           => 'lv',
-        'Lithuanian'        => 'lt',
-        'Macedonian'        => 'mk',
-        'Malay'             => 'ms',
-        'Malayalam'         => 'ml',
-        'Maltese'           => 'mt',
-        'Manipuri'          => 'mni',
-        'Maori'             => 'mi',
-        'Marathi'           => 'mr',
-        'Mongolian'         => 'mn',
-        'Nepali'            => 'ne',
-        'Norwegian'         => 'no',
-        'Norwegian Bokmal'  => 'nb',
-        'Norwegian Nynorsk' => 'nn',
-        'Oriya'             => 'or',
-        'Oromo'             => 'om',
-        'Papiamentu'        => 'pap',
-        'Pashto'            => 'ps',
-        'Polish'            => 'pl',
-        'Portuguese'        => 'pt',
-        'Punjabi'           => 'pa',
-        'Quecha'            => 'qu',
-        'Quechua'           => 'qu',
-        'Rhaeto-Romanic'    => 'rm',
-        'Romanian'          => 'ro',
-        'Russian'           => 'ru',
-        'Sami'              => 'smi',
-        'Sami Inari'        => 'smn',
-        'Sami Lule'         => 'smj',
-        'Sami Northern'     => 'se',
-        'Sami Skolt'        => 'sms',
-        'Sami Southern'     => 'sma',
-        'Sanskrit'          => 'sa',
-        'Serbian'           => 'sr',
-        'Serbian Latin'     => 'sr_Latn',
-        'Serbian Cyrillic'  => 'sr_Cyrl',
-        'Sindhi'            => 'sd',
-        'Sinhalese'         => 'si',
-        'Slovak'            => 'sk',
-        'Slovenian'         => 'sl',
-        'Somali'            => 'so',
-        'Sorbian'           => 'wen',
-        'Spanish'           => 'es',
-        'Swahili'           => 'sw',
-        'Swedish'           => 'sv',
-        'Syriac'            => 'syr',
-        'Tajik'             => 'tg',
-        'Tamazight'         => 'tmh',
-        'Tamil'             => 'ta',
-        'Tatar'             => 'tt',
-        'Telugu'            => 'te',
-        'Thai'              => 'th',
-        'Tibetan'           => 'bo',
-        'Tigrigna'          => 'ti',
-        'Tsonga'            => 'ts',
-        'Tswana'            => 'tn',
-        'Turkish'           => 'tr',
-        'Turkmen'           => 'tk',
-        'Uighur'            => 'ug',
-        'Ukrainian'         => 'uk',
-        'Urdu'              => 'ur',
-        'Uzbek'             => 'uz',
-        'Uzbek Latin'       => 'uz_Latn',
-        'Uzbek Cyrillic'    => 'uz_Cyrl',
-        'Venda'             => 've',
-        'Vietnamese'        => 'vi',
-        'Welsh'             => 'cy',
-        'Xhosa'             => 'xh',
-        'Yiddish'           => 'yi',
-        'Yoruba'            => 'yo',
-        'Zulu'              => 'zu',
-    );
-
-    public static $regionTranslation = array(
-        'Albania'                    => 'AL',
-        'Algeria'                    => 'DZ',
-        'Argentina'                  => 'AR',
-        'Armenia'                    => 'AM',
-        'Australia'                  => 'AU',
-        'Austria'                    => 'AT',
-        'Bahrain'                    => 'BH',
-        'Bangladesh'                 => 'BD',
-        'Belgium'                    => 'BE',
-        'Belize'                     => 'BZ',
-        'Bhutan'                     => 'BT',
-        'Bolivia'                    => 'BO',
-        'Bosnia Herzegovina'         => 'BA',
-        'Brazil'                     => 'BR',
-        'Brazilian'                  => 'BR',
-        'Brunei Darussalam'          => 'BN',
-        'Cameroon'                   => 'CM',
-        'Canada'                     => 'CA',
-        'Chile'                      => 'CL',
-        'China'                      => 'CN',
-        'Colombia'                   => 'CO',
-        'Costa Rica'                 => 'CR',
-        "Cote d'Ivoire"              => 'CI',
-        'Czech Republic'             => 'CZ',
-        'Dominican Republic'         => 'DO',
-        'Denmark'                    => 'DK',
-        'Ecuador'                    => 'EC',
-        'Egypt'                      => 'EG',
-        'El Salvador'                => 'SV',
-        'Eritrea'                    => 'ER',
-        'Ethiopia'                   => 'ET',
-        'Finland'                    => 'FI',
-        'France'                     => 'FR',
-        'Germany'                    => 'DE',
-        'Greece'                     => 'GR',
-        'Guatemala'                  => 'GT',
-        'Haiti'                      => 'HT',
-        'Honduras'                   => 'HN',
-        'Hong Kong'                  => 'HK',
-        'Hong Kong SAR'              => 'HK',
-        'Hungary'                    => 'HU',
-        'Iceland'                    => 'IS',
-        'India'                      => 'IN',
-        'Indonesia'                  => 'ID',
-        'Iran'                       => 'IR',
-        'Iraq'                       => 'IQ',
-        'Ireland'                    => 'IE',
-        'Italy'                      => 'IT',
-        'Jamaica'                    => 'JM',
-        'Japan'                      => 'JP',
-        'Jordan'                     => 'JO',
-        'Korea'                      => 'KR',
-        'Kuwait'                     => 'KW',
-        'Lebanon'                    => 'LB',
-        'Libya'                      => 'LY',
-        'Liechtenstein'              => 'LI',
-        'Luxembourg'                 => 'LU',
-        'Macau'                      => 'MO',
-        'Macao SAR'                  => 'MO',
-        'Malaysia'                   => 'MY',
-        'Mali'                       => 'ML',
-        'Mexico'                     => 'MX',
-        'Moldava'                    => 'MD',
-        'Monaco'                     => 'MC',
-        'Morocco'                    => 'MA',
-        'Netherlands'                => 'NL',
-        'New Zealand'                => 'NZ',
-        'Nicaragua'                  => 'NI',
-        'Nigeria'                    => 'NG',
-        'Norway'                     => 'NO',
-        'Oman'                       => 'OM',
-        'Pakistan'                   => 'PK',
-        'Panama'                     => 'PA',
-        'Paraguay'                   => 'PY',
-        "People's Republic of China" => 'CN',
-        'Peru'                       => 'PE',
-        'Philippines'                => 'PH',
-        'Poland'                     => 'PL',
-        'Portugal'                   => 'PT',
-        'PRC'                        => 'CN',
-        'Puerto Rico'                => 'PR',
-        'Qatar'                      => 'QA',
-        'Reunion'                    => 'RE',
-        'Russia'                     => 'RU',
-        'Saudi Arabia'               => 'SA',
-        'Senegal'                    => 'SN',
-        'Singapore'                  => 'SG',
-        'Slovakia'                   => 'SK',
-        'South Africa'               => 'ZA',
-        'Spain'                      => 'ES',
-        'Sri Lanka'                  => 'LK',
-        'Sweden'                     => 'SE',
-        'Switzerland'                => 'CH',
-        'Syria'                      => 'SY',
-        'Taiwan'                     => 'TW',
-        'The Netherlands'            => 'NL',
-        'Trinidad'                   => 'TT',
-        'Tunisia'                    => 'TN',
-        'UAE'                        => 'AE',
-        'United Kingdom'             => 'GB',
-        'United States'              => 'US',
-        'Uruguay'                    => 'UY',
-        'Venezuela'                  => 'VE',
-        'Yemen'                      => 'YE',
-        'Zimbabwe'                   => 'ZW',
-    );
-}
diff --git a/airtime_mvc/library/Zend/Locale/Data/aa.xml b/airtime_mvc/library/Zend/Locale/Data/aa.xml
deleted file mode 100644
index 3cf1d20f8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/aa.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="aa"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">Qafar</language>
-			<language type="ar">Arabic</language>
-			<language type="de">German</language>
-			<language type="en">English</language>
-			<language type="es">Spanish</language>
-			<language type="fr">French</language>
-			<language type="hi">Hindi</language>
-			<language type="it">Italian</language>
-			<language type="ja">Japanese</language>
-			<language type="pt">Portuguese</language>
-			<language type="ru">Russian</language>
-			<language type="zh">Chinese</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Latin</script>
-		</scripts>
-		<territories>
-			<territory type="BR">Brazil</territory>
-			<territory type="CN">China</territory>
-			<territory type="DE">Germany</territory>
-			<territory type="DJ">Yabuuti</territory>
-			<territory type="ER">Eretria</territory>
-			<territory type="ET">Otobbia</territory>
-			<territory type="FR">France</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="IN">India</territory>
-			<territory type="IT">Italy</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="US">United States</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Qun</month>
-							<month type="2">Nah</month>
-							<month type="3">Cig</month>
-							<month type="4">Agd</month>
-							<month type="5">Cax</month>
-							<month type="6">Qas</month>
-							<month type="7">Qad</month>
-							<month type="8">Leq</month>
-							<month type="9">Way</month>
-							<month type="10">Dit</month>
-							<month type="11">Xim</month>
-							<month type="12">Kax</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Qunxa Garablu</month>
-							<month type="2">Kudo</month>
-							<month type="3">Ciggilta Kudo</month>
-							<month type="4">Agda Baxis</month>
-							<month type="5">Caxah Alsa</month>
-							<month type="6">Qasa Dirri</month>
-							<month type="7">Qado Dirri</month>
-							<month type="8">Liiqen</month>
-							<month type="9">Waysu</month>
-							<month type="10">Diteli</month>
-							<month type="11">Ximoli</month>
-							<month type="12">Kaxxa Garablu</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Q</month>
-							<month type="2">N</month>
-							<month type="3">C</month>
-							<month type="4">A</month>
-							<month type="5">C</month>
-							<month type="6">Q</month>
-							<month type="7">Q</month>
-							<month type="8">L</month>
-							<month type="9">W</month>
-							<month type="10">D</month>
-							<month type="11">X</month>
-							<month type="12">K</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Aca</day>
-							<day type="mon">Etl</day>
-							<day type="tue">Tal</day>
-							<day type="wed">Arb</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Gum</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Acaada</day>
-							<day type="mon">Etleeni</day>
-							<day type="tue">Talaata</day>
-							<day type="wed">Arbaqa</day>
-							<day type="thu">Kamiisi</day>
-							<day type="fri">Gumqata</day>
-							<day type="sat">Sabti</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">A</day>
-							<day type="mon">E</day>
-							<day type="tue">T</day>
-							<day type="wed">A</day>
-							<day type="thu">K</day>
-							<day type="fri">G</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>saaku</am>
-				<pm>carra</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Yaasuusuk Duma</era>
-						<era type="1">Yaasuusuk Wadir</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/aa_DJ.xml b/airtime_mvc/library/Zend/Locale/Data/aa_DJ.xml
deleted file mode 100644
index 06c67553d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/aa_DJ.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="aa"/>
-		<territory type="DJ"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="2">Naharsi Kudo</month>
-							<month type="4">Agda Baxisso</month>
-							<month type="8">Leqeeni</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/aa_ER.xml b/airtime_mvc/library/Zend/Locale/Data/aa_ER.xml
deleted file mode 100644
index 013ed481a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/aa_ER.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="aa"/>
-		<territory type="ER"/>
-	</identity>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/aa_ER_SAAHO.xml b/airtime_mvc/library/Zend/Locale/Data/aa_ER_SAAHO.xml
deleted file mode 100644
index cb2b1dfcb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/aa_ER_SAAHO.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="aa"/>
-		<territory type="ER"/>
-		<variant type="SAAHO"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Nab</day>
-							<day type="mon">San</day>
-							<day type="tue">Sal</day>
-							<day type="wed">Rab</day>
-							<day type="thu">Cam</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Qun</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Naba Sambat</day>
-							<day type="mon">Sani</day>
-							<day type="tue">Salus</day>
-							<day type="wed">Rabuq</day>
-							<day type="thu">Camus</day>
-							<day type="fri">Jumqata</day>
-							<day type="sat">Qunxa Sambat</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/aa_ET.xml b/airtime_mvc/library/Zend/Locale/Data/aa_ET.xml
deleted file mode 100644
index c5cad99bb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/aa_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="aa"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/af.xml b/airtime_mvc/library/Zend/Locale/Data/af.xml
deleted file mode 100644
index ff7d99ec8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/af.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.78 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="af"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Ander Afro-Asiaties</language>
-			<language type="am">Amharies</language>
-			<language type="ar">Arabies</language>
-			<language type="arc">Aramees</language>
-			<language type="art">Ander Kunsmatig</language>
-			<language type="as">Assamees</language>
-			<language type="az">Aserbeidjaans</language>
-			<language type="bat">Ander Balties</language>
-			<language type="be">Wit-Russies</language>
-			<language type="ber">Berbers</language>
-			<language type="bg">Bulgaars</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Bengaals</language>
-			<language type="bnt">Bantoe</language>
-			<language type="br">Bretons</language>
-			<language type="bs">Bosnies</language>
-			<language type="ca">Katalaans</language>
-			<language type="cel">Ander Kelties</language>
-			<language type="chr">Cherokees</language>
-			<language type="cop">Kopties</language>
-			<language type="cs">Tsjeggies</language>
-			<language type="cu">Kerkslawies</language>
-			<language type="cy">Wallies</language>
-			<language type="da">Deens</language>
-			<language type="de">Duits</language>
-			<language type="egy">Antieke Egipties</language>
-			<language type="el">Grieks</language>
-			<language type="en">Engels</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spaans</language>
-			<language type="es_419">Latyns-Amerikaanse Spaans</language>
-			<language type="et">Estnies</language>
-			<language type="eu">Baskies</language>
-			<language type="fa">Persies</language>
-			<language type="fi">Fins</language>
-			<language type="fil">Filippyns</language>
-			<language type="fj">Fidjiaans</language>
-			<language type="fo">Faroëes</language>
-			<language type="fr">Frans</language>
-			<language type="fy">Fries</language>
-			<language type="ga">Iers</language>
-			<language type="gd">Skots-Gaelies</language>
-			<language type="gem">Ander Germaans</language>
-			<language type="gl">Galicies</language>
-			<language type="gn">Guarani</language>
-			<language type="got">Goties</language>
-			<language type="grc">Antieke Grieks</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="he">Hebreeus</language>
-			<language type="hi">Hindi</language>
-			<language type="hit">Hetities</language>
-			<language type="hr">Kroaties</language>
-			<language type="hu">Hongaars</language>
-			<language type="hy">Armeens</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesies</language>
-			<language type="ie">Interlingue</language>
-			<language type="ine">Ander Indo-Europees</language>
-			<language type="is">Yslands</language>
-			<language type="it">Italiaans</language>
-			<language type="ja">Japannees</language>
-			<language type="jv">Javaans</language>
-			<language type="ka">Georgies</language>
-			<language type="khi">Ander Khoi-San</language>
-			<language type="km">Khmer</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Koreaans</language>
-			<language type="kru">kru</language>
-			<language type="ku">Koerdies</language>
-			<language type="kw">Kornies</language>
-			<language type="ky">Kirgisies</language>
-			<language type="la">Latyn</language>
-			<language type="li">Limburgs</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laotanees</language>
-			<language type="lt">Litaus</language>
-			<language type="lv">Letties</language>
-			<language type="mas">Masai</language>
-			<language type="mg">Malgassies</language>
-			<language type="mk">Macedonies</language>
-			<language type="ml">Malabaars</language>
-			<language type="mn">Mongalees</language>
-			<language type="mr">Mahratti</language>
-			<language type="ms">Maleisies</language>
-			<language type="mt">Maltees</language>
-			<language type="mul">Veelvuldige tale</language>
-			<language type="my">Birmaans</language>
-			<language type="nd">Noord-Ndebele</language>
-			<language type="ne">Nepalees</language>
-			<language type="nl">Nederlands</language>
-			<language type="nl_BE">Vlaams</language>
-			<language type="nn">Noorweegse Nynorsk</language>
-			<language type="no">Noors</language>
-			<language type="nr">Suid-Ndebele</language>
-			<language type="nso">Sepedi</language>
-			<language type="oc">Occitaans</language>
-			<language type="or">Oria</language>
-			<language type="pa">Pandjabi</language>
-			<language type="phn">Fenisies</language>
-			<language type="pl">Pools</language>
-			<language type="ps">Pasjtoe</language>
-			<language type="pt">Portugees</language>
-			<language type="pt_BR">Brasiliaanse Portugees</language>
-			<language type="ro">Roemeens</language>
-			<language type="ru">Russies</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sco">Skots</language>
-			<language type="sd">Sindhi</language>
-			<language type="sem">Ander Semities</language>
-			<language type="sgn">Gebaretaal</language>
-			<language type="sh">Serwo-Kroaties</language>
-			<language type="si">Singalees</language>
-			<language type="sk">Slowaaks</language>
-			<language type="sl">Sloweens</language>
-			<language type="sla">Ander Slawies</language>
-			<language type="sn">Shona</language>
-			<language type="so">Somalies</language>
-			<language type="sq">Albanees</language>
-			<language type="sr">Serwies</language>
-			<language type="ss">Swazi</language>
-			<language type="st">Suid-Sotho</language>
-			<language type="su">Soedanees</language>
-			<language type="sv">Sweeds</language>
-			<language type="sw">Swahili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugees</language>
-			<language type="th">Thais</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Turkmeens</language>
-			<language type="tlh">Klingon</language>
-			<language type="tn">Tswana</language>
-			<language type="tr">Turks</language>
-			<language type="ts">Tsonga</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighoers</language>
-			<language type="uk">Oekraïens</language>
-			<language type="und">Onbepaald</language>
-			<language type="ur">Oerdoe</language>
-			<language type="uz">Oesbekies</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Viëtnamees</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Jiddisj</language>
-			<language type="zh">Sjinees</language>
-			<language type="zh_Hans">Vereenvoudigde Sjinees</language>
-			<language type="zh_Hant">Tradisionele Sjinees</language>
-			<language type="zu">Zoeloe</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabies</script>
-			<script type="Armn">Armeens</script>
-			<script type="Brai">braille</script>
-			<script type="Copt">Kopties</script>
-			<script type="Cyrl">Cyrillies</script>
-			<script type="Cyrs">Cyrillies (Ou Kerkslawiese variant)</script>
-			<script type="Egyp">Egiptiese hiërogliewe</script>
-			<script type="Ethi">Etiopies</script>
-			<script type="Goth">Goties</script>
-			<script type="Grek">Grieks</script>
-			<script type="Hans">Vereenvoudigde Sjinees</script>
-			<script type="Hant">Tradisionele Sjinees</script>
-			<script type="Hebr">Hebreeus</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Latn">Latyn</script>
-			<script type="Mong">Mongools</script>
-			<script type="Phnx">Fenisies</script>
-			<script type="Ugar">Ugarities</script>
-			<script type="Visp">Sigbare spraak</script>
-			<script type="Zxxx">Ongeskrewe</script>
-			<script type="Zyyy">Algemeen</script>
-			<script type="Zzzz">Kode vir ongekodeerde alfabette</script>
-		</scripts>
-		<territories>
-			<territory type="001">Wêreld</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="005">Suid-Amerika</territory>
-			<territory type="009">Oseanië</territory>
-			<territory type="011">Wes-Afrika</territory>
-			<territory type="013">Sentraal-Amerika</territory>
-			<territory type="014">Oos-Afrika</territory>
-			<territory type="015">Noord-Afrika</territory>
-			<territory type="017">Midde-Afrika</territory>
-			<territory type="018">Suider-Afrika</territory>
-			<territory type="019">Amerikas</territory>
-			<territory type="021">Noord-Amerika</territory>
-			<territory type="029">Karibies</territory>
-			<territory type="030">Oos-Asië</territory>
-			<territory type="034">Suid-Asië</territory>
-			<territory type="035">Suidoos-Asië</territory>
-			<territory type="039">Suid-Europa</territory>
-			<territory type="053">Australië en Nieu-Seeland</territory>
-			<territory type="054">Melanesië</territory>
-			<territory type="061">Polinesië</territory>
-			<territory type="142">Asië</territory>
-			<territory type="143">Sentraal-Asië</territory>
-			<territory type="145">Wes-Asië</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Oos-Europa</territory>
-			<territory type="154">Noord-Europa</territory>
-			<territory type="155">Wes-Europa</territory>
-			<territory type="172">Statebond</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Verenigde Arabiese Emirate</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua en Barbuda</territory>
-			<territory type="AL">Albanië</territory>
-			<territory type="AM">Armenië</territory>
-			<territory type="AN">Nederlands-Antille</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Argentinië</territory>
-			<territory type="AS">Amerikaans Samoa</territory>
-			<territory type="AT">Oostenryk</territory>
-			<territory type="AU">Australië</territory>
-			<territory type="AZ">Aserbeidjan</territory>
-			<territory type="BA">Bosnië en Herzegowina</territory>
-			<territory type="BD">Bangladesj</territory>
-			<territory type="BE">België</territory>
-			<territory type="BF">Boerkina Fasso</territory>
-			<territory type="BG">Bulgarye</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BN">Broenei</territory>
-			<territory type="BO">Bolivië</territory>
-			<territory type="BR">Brasilië</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhoetan</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Wit-Rusland</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CF">Sentraal-Afrikaanse Republiek</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Switserland</territory>
-			<territory type="CI">Ivoorkus</territory>
-			<territory type="CL">Chili</territory>
-			<territory type="CM">Kameroen</territory>
-			<territory type="CN">Sjina</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serwië en Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kaap Verde</territory>
-			<territory type="CY">Ciprus</territory>
-			<territory type="CZ">Tjeggiese Republiek</territory>
-			<territory type="DE">Duitsland</territory>
-			<territory type="DJ">Djiboeti</territory>
-			<territory type="DK">Denemarke</territory>
-			<territory type="DO">Dominikaanse Republiek</territory>
-			<territory type="DZ">Algerië</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egipte</territory>
-			<territory type="EH">Wes-Sahara</territory>
-			<territory type="ES">Spanje</territory>
-			<territory type="ET">Ethiopië</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fidji</territory>
-			<territory type="FK">Falklandeilande</territory>
-			<territory type="FM">Mikronesië</territory>
-			<territory type="FO">Faroëreilande</territory>
-			<territory type="FR">Frankryk</territory>
-			<territory type="GA">Gaboen</territory>
-			<territory type="GB">Groot-Brittanje</territory>
-			<territory type="GE">Georgië</territory>
-			<territory type="GF">Frans-Guyana</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GL">Groenland</territory>
-			<territory type="GM">Gambië</territory>
-			<territory type="GN">Guinee</territory>
-			<territory type="GQ">Ekwatoriaal-Guinee</territory>
-			<territory type="GR">Griekeland</territory>
-			<territory type="GW">Guinee-Bissau</territory>
-			<territory type="HK">Hongkong</territory>
-			<territory type="HR">Kroasië</territory>
-			<territory type="HT">Haïti</territory>
-			<territory type="HU">Hongarye</territory>
-			<territory type="ID">Indonesië</territory>
-			<territory type="IE">Ierland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IN">Indië</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Ysland</territory>
-			<territory type="IT">Italië</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordanië</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgisië</territory>
-			<territory type="KH">Kambodja</territory>
-			<territory type="KM">Comore</territory>
-			<territory type="KN">Saint Kitts en Nevis</territory>
-			<territory type="KP">Noord-Korea</territory>
-			<territory type="KR">Suid-Korea</territory>
-			<territory type="KW">Koeweit</territory>
-			<territory type="KY">Kaaimanseilande</territory>
-			<territory type="KZ">Kasakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberië</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litaue</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Letland</territory>
-			<territory type="LY">Libië</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshall-eilande</territory>
-			<territory type="MK">Macedonië</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MN">Mongolië</territory>
-			<territory type="MO">Macao</territory>
-			<territory type="MR">Mouritanië</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldive</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Maleisië</territory>
-			<territory type="MZ">Mosambiek</territory>
-			<territory type="NA">Namibië</territory>
-			<territory type="NC">Nieu-Kaledonië</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NG">Nigerië</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederland</territory>
-			<territory type="NO">Noorweë</territory>
-			<territory type="NR">Naoeroe</territory>
-			<territory type="NZ">Nieu-Seeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PG">Papoea Nieu-Guinee</territory>
-			<territory type="PH">Filippyne</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Pole</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Roemenië</territory>
-			<territory type="RU">Rusland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saoedi-Arabië</territory>
-			<territory type="SB">Solomon Eilande</territory>
-			<territory type="SC">Seychelle</territory>
-			<territory type="SD">Soedan</territory>
-			<territory type="SE">Swede</territory>
-			<territory type="SG">Singapoer</territory>
-			<territory type="SI">Slowenië</territory>
-			<territory type="SK">Slowakye</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalië</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tome en Principe</territory>
-			<territory type="SV">Salvador</territory>
-			<territory type="SY">Sirië</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TD">Tsjaad</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TM">Turkmenië</territory>
-			<territory type="TN">Tunisië</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkye</territory>
-			<territory type="TT">Trinidad en Tobago</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzanië</territory>
-			<territory type="UA">Oekraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="US">Verenigde State van Amerika</territory>
-			<territory type="UZ">Oesbekistan</territory>
-			<territory type="VA">Vatikaan</territory>
-			<territory type="VC">Saint Vincent en die Grenadine</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VN">Viëtnam</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="ZA">Suid-Afrika</territory>
-			<territory type="ZM">Zambië</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Tradisionele Duitse ortografie</variant>
-			<variant type="1996">Duitse ortografie van 1996</variant>
-			<variant type="REVISED">Hersiene ortografie</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalender</key>
-			<key type="collation">Vergelyking</key>
-			<key type="currency">Geldeenheid</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Tradisionele Sjinees (Groot5)</type>
-			<type type="chinese" key="calendar">Sjinese kalender</type>
-			<type type="gb2312han" key="collation">Vereenvoudigde Sjinees</type>
-			<type type="gregorian" key="calendar">Gregoriaanse kalender</type>
-			<type type="hebrew" key="calendar">Hebreeuse kalender</type>
-			<type type="islamic" key="calendar">Islamitiese kalender</type>
-			<type type="japanese" key="calendar">Japannese kalender</type>
-			<type type="phonebook" key="collation">Telefoongidsvolgorde</type>
-			<type type="traditional" key="collation">Tradisioneel</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metriek</measurementSystemName>
-			<measurementSystemName type="US">VSA</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Taal: {0}</codePattern>
-			<codePattern type="script">Skrif: {0}</codePattern>
-			<codePattern type="territory">Omgewing: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á â b-e é è ê ë f-i î ï j-o ô ö p-u û v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[à å-ç ñ ø œ ß]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januarie</month>
-							<month type="2">Februarie</month>
-							<month type="3">Maart</month>
-							<month type="4">April</month>
-							<month type="5">Mei</month>
-							<month type="6">Junie</month>
-							<month type="7">Julie</month>
-							<month type="8">Augustus</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">Desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">So</day>
-							<day type="mon">Ma</day>
-							<day type="tue">Di</day>
-							<day type="wed">Wo</day>
-							<day type="thu">Do</day>
-							<day type="fri">Vr</day>
-							<day type="sat">Sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sondag</day>
-							<day type="mon">Maandag</day>
-							<day type="tue">Dinsdag</day>
-							<day type="wed">Woensdag</day>
-							<day type="thu">Donderdag</day>
-							<day type="fri">Vrydag</day>
-							<day type="sat">Saterdag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1ste kwartaal</quarter>
-							<quarter type="2">2de kwartaal</quarter>
-							<quarter type="3">3de kwartaal</quarter>
-							<quarter type="4">4de kwartaal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>vm.</am>
-				<pm>nm.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">voor Christus</era>
-						<era type="1">na Christus</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">v.C.</era>
-						<era type="1">n.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM - yyyy-MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM - yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="M">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="y">E, y MMM dd - E, y MMM dd</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Tydperk</displayName>
-					</field>
-					<field type="year">
-						<displayName>Jaar</displayName>
-					</field>
-					<field type="month">
-						<displayName>Maand</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dag</displayName>
-					</field>
-					<field type="weekday">
-						<displayName>Dag van die week</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Uur</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuut</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekonde</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Tydsone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Suidpool</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bagrein</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Sjanghai</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexikostad</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskou</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Reaal</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Switserse frank</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Joean</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Britse pond</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italiaanse lier</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japannese jen</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibiese dollar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Roebel</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Ou Turkse lier</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Turkse lier</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Amerikaanse dollar</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Onbekende of ongeldige geldeenheid</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nee:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/af_NA.xml b/airtime_mvc/library/Zend/Locale/Data/af_NA.xml
deleted file mode 100644
index f42124646..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/af_NA.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="af"/>
-		<territory type="NA"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy-MM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/af_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/af_ZA.xml
deleted file mode 100644
index 2ef8e423d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/af_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="af"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ak.xml b/airtime_mvc/library/Zend/Locale/Data/ak.xml
deleted file mode 100644
index 2eb7d728f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ak.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:33 $"/>
-		<language type="ak"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a b d e É› f-i k-o É” p r-u w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c j q v z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">S-Ɔ</month>
-							<month type="2">K-Ɔ</month>
-							<month type="3">E-Ɔ</month>
-							<month type="4">E-O</month>
-							<month type="5">E-K</month>
-							<month type="6">O-A</month>
-							<month type="7">A-K</month>
-							<month type="8">D-Ɔ</month>
-							<month type="9">F-�</month>
-							<month type="10">Ɔ-A</month>
-							<month type="11">Ɔ-O</month>
-							<month type="12">M-Ɔ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Sanda-Ɔpɛpɔn</month>
-							<month type="2">Kwakwar-Ɔgyefuo</month>
-							<month type="3">Ebɔw-Ɔbenem</month>
-							<month type="4">Ebɔbira-Oforisuo</month>
-							<month type="5">Esusow Aketseaba-Kɔtɔnimba</month>
-							<month type="6">Obirade-Ayɛwohomumu</month>
-							<month type="7">Ayɛwoho-Kitawonsa</month>
-							<month type="8">Difuu-Ɔsandaa</month>
-							<month type="9">Fankwa-�bɔ</month>
-							<month type="10">Ɔbɛsɛ-Ahinime</month>
-							<month type="11">Ɔberɛfɛw-Obubuo</month>
-							<month type="12">Mumu-Ɔpɛnimba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Kwe</day>
-							<day type="mon">Dwo</day>
-							<day type="tue">Ben</day>
-							<day type="wed">Wuk</day>
-							<day type="thu">Yaw</day>
-							<day type="fri">Fia</day>
-							<day type="sat">Mem</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Kwesida</day>
-							<day type="mon">Dwowda</day>
-							<day type="tue">Benada</day>
-							<day type="wed">Wukuda</day>
-							<day type="thu">Yawda</day>
-							<day type="fri">Fida</day>
-							<day type="sat">Memeneda</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">K</day>
-							<day type="mon">D</day>
-							<day type="tue">B</day>
-							<day type="wed">W</day>
-							<day type="thu">Y</day>
-							<day type="fri">F</day>
-							<day type="sat">M</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AN</am>
-				<pm>EW</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Ansa Kristo</era>
-						<era type="1">Kristo Ekyiri</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">AK</era>
-						<era type="1">KE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="GHC">
-				<displayName>Sidi</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ak_GH.xml b/airtime_mvc/library/Zend/Locale/Data/ak_GH.xml
deleted file mode 100644
index aed59f84e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ak_GH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ak"/>
-		<territory type="GH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/am.xml b/airtime_mvc/library/Zend/Locale/Data/am.xml
deleted file mode 100644
index ab582d79b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/am.xml
+++ /dev/null
@@ -1,1409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.88 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="am"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">አ�ርኛ</language>
-			<language type="ab">አብ�ዚኛ</language>
-			<language type="af">አ�ሪካንስኛ</language>
-			<language type="am">አማርኛ</language>
-			<language type="ar">�ርቢኛ</language>
-			<language type="as">አሳሜዛዊ</language>
-			<language type="ay">አያማርኛ</language>
-			<language type="az">አዜርባይጃንኛ</language>
-			<language type="ba">ባስኪርኛ</language>
-			<language type="be">ቤላራሻኛ</language>
-			<language type="bg">ቡ�ጋሪኛ</language>
-			<language type="bh">ቢሃሪ</language>
-			<language type="bi">ቢስላ�ኛ</language>
-			<language type="bn">በንጋሊኛ</language>
-			<language type="bo">ትበትንኛ</language>
-			<language type="br">ብሬቶንኛ</language>
-			<language type="bs">ቦስኒያንኛ</language>
-			<language type="byn">ብሊን</language>
-			<language type="ca">ካታላንኛ</language>
-			<language type="co">ኮርሲካኛ</language>
-			<language type="cs">ቼክኛ</language>
-			<language type="cy">ወ�ሽ</language>
-			<language type="da">ዴኒሽ</language>
-			<language type="de">ጀርመን</language>
-			<language type="dz">ድዞን�ኻኛ</language>
-			<language type="el">�ሪክኛ</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="eo">ኤስ�ራንቶ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="et">ኤስቶኒአን</language>
-			<language type="eu">ባስክኛ</language>
-			<language type="fa">�ርሲያኛ</language>
-			<language type="fi">�ኒሽ</language>
-			<language type="fil">�ሊ�ንኛ</language>
-			<language type="fj">�ጂኛ</language>
-			<language type="fo">�ሮኛ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="fy">�ሪስኛ</language>
-			<language type="ga">አይሪሽ</language>
-			<language type="gd">እስኮትስ ጌ�ክኛ</language>
-			<language type="gez">�ዕ�ኛ</language>
-			<language type="gl">ጋለጋኛ</language>
-			<language type="gn">ጓራኒኛ</language>
-			<language type="gu">ጉጃርቲኛ</language>
-			<language type="ha">ሃ�ሳኛ</language>
-			<language type="he">ዕብራስጥ</language>
-			<language type="hi">�ንድኛ</language>
-			<language type="hr">ክሮሽያንኛ</language>
-			<language type="hu">ሀንጋሪኛ</language>
-			<language type="hy">አርመናዊ</language>
-			<language type="ia">ኢንቴርሊንጓ</language>
-			<language type="id">እንዶኒሲኛ</language>
-			<language type="ie">እንተርሊን�ወ</language>
-			<language type="ik">እኑ�ያቅኛ</language>
-			<language type="is">አይስላንድኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="iu">እኑክቲቱትኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="jv">ጃቫንኛ</language>
-			<language type="ka">ጊዮርጊያን</language>
-			<language type="kk">ካዛክኛ</language>
-			<language type="kl">ካላሊሱትኛ</language>
-			<language type="km">ክመርኛ</language>
-			<language type="kn">ካናዳኛ</language>
-			<language type="ko">ኮሪያኛ</language>
-			<language type="ks">ካሽሚርኛ</language>
-			<language type="ku">ኩርድሽኛ</language>
-			<language type="ky">ኪርጊ�ኛ</language>
-			<language type="la">ላቲንኛ</language>
-			<language type="ln">ሊንጋላኛ</language>
-			<language type="lo">ላ�ስኛ</language>
-			<language type="lt">ሊቱአኒያን</language>
-			<language type="lv">ላትቪያን</language>
-			<language type="mg">ማላጋስኛ</language>
-			<language type="mi">ማዮሪኛ</language>
-			<language type="mk">ማከዶኒኛ</language>
-			<language type="ml">ማላያላ�ኛ</language>
-			<language type="mn">ሞንጎላዊኛ</language>
-			<language type="mo">ሞ�ዳቫዊና</language>
-			<language type="mr">ማራዚኛ</language>
-			<language type="ms">ማላይኛ</language>
-			<language type="mt">ማ�ቲስኛ</language>
-			<language type="my">ቡርማኛ</language>
-			<language type="na">ናኡሩ</language>
-			<language type="ne">ኔ�ሊኛ</language>
-			<language type="nl">ደች</language>
-			<language type="nn">የኖርዌ አዲሱ ኖርዌጅያንኛ</language>
-			<language type="no">ኖርዌጂያን</language>
-			<language type="oc">ኦኪታንኛ</language>
-			<language type="om">ኦሮ�ኛ</language>
-			<language type="or">ኦሪያኛ</language>
-			<language type="pa">�ንጃቢኛ</language>
-			<language type="pl">�ሊሽ</language>
-			<language type="ps">�ሽቶኛ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="pt_BR">�ርቱጋሊኛ (የብራዚ�)</language>
-			<language type="pt_PT">�ርቱጋሊኛ (የ�ርቱጋ�)</language>
-			<language type="qu">ኵቿኛ</language>
-			<language type="rm">ሮማንስ</language>
-			<language type="rn">ሩንዲኛ</language>
-			<language type="ro">ሮማኒያን</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="rw">ኪንያርዋንድኛ</language>
-			<language type="sa">ሳንስክሪትኛ</language>
-			<language type="sd">ሲንድሂኛ</language>
-			<language type="sg">ሳንጎኛ</language>
-			<language type="sh">ሰርቦ-ክሮኤሽያኛ</language>
-			<language type="si">ስንሃ�ኛ</language>
-			<language type="sid">ሲዳ�ኛ</language>
-			<language type="sk">ስሎቫክኛ</language>
-			<language type="sl">ስሎቪኛ</language>
-			<language type="sm">ሳሞአኛ</language>
-			<language type="sn">ሾናኛ</language>
-			<language type="so">ሱማ�ኛ</language>
-			<language type="sq">�ቤኒኛ</language>
-			<language type="sr">ሰርቢኛ</language>
-			<language type="ss">ስዋቲኛ</language>
-			<language type="st">ሶዞኛ</language>
-			<language type="su">ሱዳንኛ</language>
-			<language type="sv">ስዊድንኛ</language>
-			<language type="sw">ስዋሂሊኛ</language>
-			<language type="ta">ታሚ�ኛ</language>
-			<language type="te">ተሉጉኛ</language>
-			<language type="tg">ታጂኪኛ</language>
-			<language type="th">ታይኛ</language>
-			<language type="ti">ት�ርኛ</language>
-			<language type="tig">ት�ረ</language>
-			<language type="tk">ቱርክመንኛ</language>
-			<language type="tl">ታጋሎገኛ</language>
-			<language type="tlh">ክሊን�ኦንኛ</language>
-			<language type="tn">ጽዋናዊኛ</language>
-			<language type="to">ቶንጋ</language>
-			<language type="tr">ቱርክኛ</language>
-			<language type="ts">ጾንጋኛ</language>
-			<language type="tt">ታታርኛ</language>
-			<language type="tw">ትዊኛ</language>
-			<language type="ug">ኡዊ��ርኛ</language>
-			<language type="uk">ዩክረኒኛ</language>
-			<language type="und">ያ�ተወሰ�</language>
-			<language type="ur">ኡርዱኛ</language>
-			<language type="uz">ኡ�በክኛ</language>
-			<language type="vi">ቪትና�ኛ</language>
-			<language type="vo">ቮላ�ክኛ</language>
-			<language type="wo">ዎሎ�ኛ</language>
-			<language type="xh">ዞሳኛ</language>
-			<language type="yi">ይዲሻዊኛ</language>
-			<language type="yo">ዮሩባዊኛ</language>
-			<language type="za">ዡዋን�ኛ</language>
-			<language type="zh">ቻይንኛ</language>
-			<language type="zu">ዙሉኛ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">አረቢክ</script>
-			<script type="Armn">የአርማኒያ �ደ�</script>
-			<script type="Beng">ቤንጃሊ</script>
-			<script type="Bopo">ቡ�ሞ�</script>
-			<script type="Brai">ብሬይ�</script>
-			<script type="Buhd">ቡሂድ</script>
-			<script type="Cans">የተዋ�ዱ የካናዳ ጥንታዊ ��ክቶች</script>
-			<script type="Cher">ቼሮኪ</script>
-			<script type="Copt">ኮ�ቲክ</script>
-			<script type="Cprt">ሲ�ሪኦት</script>
-			<script type="Cyrl">ሲርሊክ</script>
-			<script type="Deva">ዴቫናጋሪ</script>
-			<script type="Dsrt">ዴዘረት</script>
-			<script type="Ethi">�ደ�</script>
-			<script type="Geor">የጆርጂያ �ደ�</script>
-			<script type="Goth">�ቲክ</script>
-			<script type="Grek">�ሪክ</script>
-			<script type="Gujr">ጉጃራቲ</script>
-			<script type="Guru">ጉርሙኪ</script>
-			<script type="Hang">ሀንጉ�</script>
-			<script type="Hani">ሀን</script>
-			<script type="Hano">ሀኑኦ</script>
-			<script type="Hans">ቀላ� ሀን</script>
-			<script type="Hant">ባሕላዊ ሀን</script>
-			<script type="Hebr">እብራይስጥ</script>
-			<script type="Hira">ሂራጋና</script>
-			<script type="Hrkt">ካታካና ወይን� ሂራጋና</script>
-			<script type="Kana">ክአታካና</script>
-			<script type="Khmr">ካኽሜር</script>
-			<script type="Knda">ካናዳ</script>
-			<script type="Laoo">ላኦ</script>
-			<script type="Latn">ላቲን</script>
-			<script type="Limb">ሊ�ቡ</script>
-			<script type="Lina">ሊኒያር ኤ</script>
-			<script type="Linb">ሊኒያር ቢ</script>
-			<script type="Mlym">ማላያላ�</script>
-			<script type="Mong">የሞንጎሊያ �ደ�</script>
-			<script type="Mymr">ሚአንማር</script>
-			<script type="Ogam">ኦ�ሀ�</script>
-			<script type="Orya">ኦሪያ</script>
-			<script type="Osma">ኦስማኒያ</script>
-			<script type="Qaai">የተወረሰ</script>
-			<script type="Runr">ሩኒክ</script>
-			<script type="Shaw">የሻቪያ �ደ�</script>
-			<script type="Sinh">ሲንሃላ</script>
-			<script type="Syrc">ሲሪክ</script>
-			<script type="Tagb">ትአ�ባንዋ</script>
-			<script type="Tale">ታኢ ለ</script>
-			<script type="Talu">አዲስ ታኢ ሉ</script>
-			<script type="Taml">ታሚ�</script>
-			<script type="Telu">ቴሉጉ</script>
-			<script type="Tglg">ታጋሎ�</script>
-			<script type="Thaa">ታኸና</script>
-			<script type="Thai">ታኢ</script>
-			<script type="Tibt">ቲቤታን</script>
-			<script type="Ugar">ኡጋሪቲክ</script>
-			<script type="Vaii">ቫይ</script>
-			<script type="Yiii">ዪ</script>
-		</scripts>
-		<territories>
-			<territory type="001">ዓለ�</territory>
-			<territory type="002">አ�ሪካ</territory>
-			<territory type="005">ደቡባዊ አሜሪካ</territory>
-			<territory type="009">ኦሽኒያ</territory>
-			<territory type="011">�ዕራባዊ አ�ሪካ</territory>
-			<territory type="013">መካከለኛ አሜሪካ [013]</territory>
-			<territory type="014">�ስራቃዊ አ�ሪካ</territory>
-			<territory type="015">ሰሜናዊ አ�ሪካ</territory>
-			<territory type="017">መካከለኛ አ�ሪካ</territory>
-			<territory type="018">ደቡባዊ አ�ሪካ</territory>
-			<territory type="019">አሜሪካዎች</territory>
-			<territory type="021">ሰሜናዊ አሜሪካ</territory>
-			<territory type="029">ካሪቢያን</territory>
-			<territory type="030">ደቡብ-�ሥራቃዊ እስያ [030]</territory>
-			<territory type="034">�ሥራቃዊ እስያ</territory>
-			<territory type="035">ደቡብ-�ሥራቃዊ እስያ [035]</territory>
-			<territory type="039">ደቡባዊ አ�ሮ�</territory>
-			<territory type="053">አ�ስትራሊያ እና ኒ� ዚላንድ</territory>
-			<territory type="054">ሜላኔሲያ</territory>
-			<territory type="057">ሚክሮኔዢያ [057]</territory>
-			<territory type="061">�ሊኔዢያ</territory>
-			<territory type="142">እስያ</territory>
-			<territory type="143">መካከለኛ አሜሪካ [143]</territory>
-			<territory type="145">�ዕራባዊ እስያ</territory>
-			<territory type="150">አ�ሮ�</territory>
-			<territory type="151">�ስራቃዊ አ�ሮ�</territory>
-			<territory type="154">ሰሜናዊ አ�ሮ�</territory>
-			<territory type="155">�ዕራባዊ አ�ሮ�</territory>
-			<territory type="AD">አንዶራ</territory>
-			<territory type="AE">የተባበሩት አረብ ኤ�ሬትስ</territory>
-			<territory type="AF">አ�ጋኒስታን</territory>
-			<territory type="AG">አንቲጓ እና ባሩዳ</territory>
-			<territory type="AI">አንጉኢላ</territory>
-			<territory type="AL">አ�ባኒያ</territory>
-			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ አንቲ�ስ</territory>
-			<territory type="AO">አን�ላ</territory>
-			<territory type="AQ">አንታርክቲካ</territory>
-			<territory type="AR">አርጀንቲና</territory>
-			<territory type="AS">የአሜሪካ ሳሞአ</territory>
-			<territory type="AT">ኦስትሪያ</territory>
-			<territory type="AU">አ�ስትሬሊያ</territory>
-			<territory type="AW">አሩባ</territory>
-			<territory type="AX">የአላንድ ደሴቶች</territory>
-			<territory type="AZ">አዘርባጃን</territory>
-			<territory type="BA">ቦስኒያ እና ሄርዞጎቪኒያ</territory>
-			<territory type="BB">ባርቤዶስ</territory>
-			<territory type="BD">ባን�ላዲሽ</territory>
-			<territory type="BE">ቤ�ጄ�</territory>
-			<territory type="BF">ቡርኪና �ሶ</territory>
-			<territory type="BG">ቡ�ጌሪያ</territory>
-			<territory type="BH">ባህሬን</territory>
-			<territory type="BI">ብሩንዲ</territory>
-			<territory type="BJ">ቤኒን</territory>
-			<territory type="BM">ቤርሙዳ</territory>
-			<territory type="BN">ብሩኒ</territory>
-			<territory type="BO">ቦሊቪያ</territory>
-			<territory type="BR">ብራዚ�</territory>
-			<territory type="BS">ባሃማስ</territory>
-			<territory type="BT">ቡህታን</territory>
-			<territory type="BV">የቦ�ቬት ደሴት</territory>
-			<territory type="BW">ቦትስዋና</territory>
-			<territory type="BY">ቤላሩስ</territory>
-			<territory type="BZ">ቤሊዘ</territory>
-			<territory type="CA">ካናዳ</territory>
-			<territory type="CC">ኮኮስ ኬሊን� ደሴቶች</territory>
-			<territory type="CD">ኮንጎ</territory>
-			<territory type="CF">የመካከለኛ� አ�ሪካ ሪ�ብሊክ</territory>
-			<territory type="CG">ኮን�</territory>
-			<territory type="CH">ስዊዘርላንድ</territory>
-			<territory type="CI">ኮት ዲቯር</territory>
-			<territory type="CK">ኩክ ደሴቶች</territory>
-			<territory type="CL">ቺሊ</territory>
-			<territory type="CM">ካሜሩን</territory>
-			<territory type="CN">ቻይና</territory>
-			<territory type="CO">ኮሎ�ቢያ</territory>
-			<territory type="CR">ኮስታ ሪካ</territory>
-			<territory type="CS">ሰርቢያ</territory>
-			<territory type="CU">ኩባ</territory>
-			<territory type="CV">ኬ� ቬርዴ</territory>
-			<territory type="CX">የገና ደሴቶች</territory>
-			<territory type="CY">ሳይ�ረስ</territory>
-			<territory type="CZ">ቼክ ሪ�ብሊክ</territory>
-			<territory type="DE">ጀርመን</territory>
-			<territory type="DJ">ጂቡቲ</territory>
-			<territory type="DK">ዴንማርክ</territory>
-			<territory type="DM">ዶሚኒካ</territory>
-			<territory type="DO">ዶሚኒክ ሪ�ብሊክ</territory>
-			<territory type="DZ">አ�ጄሪያ</territory>
-			<territory type="EC">ኢኳዶር</territory>
-			<territory type="EE">ኤስቶኒያ</territory>
-			<territory type="EG">�ብጽ</territory>
-			<territory type="EH">�ዕራባዊ ሳህራ</territory>
-			<territory type="ER">ኤርትራ</territory>
-			<territory type="ES">ስ�ን</territory>
-			<territory type="ET">ኢትዮጵያ</territory>
-			<territory type="FI">�ንላንድ</territory>
-			<territory type="FJ">�ጂ</territory>
-			<territory type="FK">የ��ክላንድ ደሴቶች</territory>
-			<territory type="FM">ሚክሮኔዢያ</territory>
-			<territory type="FO">የ�ሮይ ደሴቶች</territory>
-			<territory type="FR">�ረንሳይ</territory>
-			<territory type="GA">ጋቦን</territory>
-			<territory type="GB">እን�ሊ�</territory>
-			<territory type="GD">�ሬናዳ</territory>
-			<territory type="GE">ጆርጂያ</territory>
-			<territory type="GF">የ�ረንሳይ ጉዊአና</territory>
-			<territory type="GH">ጋና</territory>
-			<territory type="GI">ጊብራ�ታር</territory>
-			<territory type="GL">�ሪንላንድ</territory>
-			<territory type="GM">ጋ�ቢያ</territory>
-			<territory type="GN">ጊኒ</territory>
-			<territory type="GP">ጉዋደሉ�</territory>
-			<territory type="GQ">ኢኳቶሪያ� ጊኒ</territory>
-			<territory type="GR">�ሪክ</territory>
-			<territory type="GS">ደቡብ ጆርጂያ እና የደቡድ ሳንድዊች ደሴቶች</territory>
-			<territory type="GT">ጉዋቲማላ</territory>
-			<territory type="GU">ጉዋ�</territory>
-			<territory type="GW">ቢሳዎ</territory>
-			<territory type="GY">ጉያና</territory>
-			<territory type="HK">ሆን� ኮን�</territory>
-			<territory type="HM">የኧርድ እና የማክዶና�ድ ደሴቶች</territory>
-			<territory type="HN">ሆንዱራስ</territory>
-			<territory type="HR">ክሮኤሽያ</territory>
-			<territory type="HT">ሀይቲ</territory>
-			<territory type="HU">ሀንጋሪ</territory>
-			<territory type="ID">ኢንዶኔዢያ</territory>
-			<territory type="IE">አየርላንድ</territory>
-			<territory type="IL">እስራኤ�</territory>
-			<territory type="IN">ህንድ</territory>
-			<territory type="IO">የብሪታኒያ ህንድ �ቂያኖስ �ዛት</territory>
-			<territory type="IQ">ኢራቅ</territory>
-			<territory type="IR">ኢራን</territory>
-			<territory type="IS">አይስላንድ</territory>
-			<territory type="IT">ጣሊያን</territory>
-			<territory type="JM">ጃማይካ</territory>
-			<territory type="JO">ጆርዳን</territory>
-			<territory type="JP">ጃ�ን</territory>
-			<territory type="KE">ኬንያ</territory>
-			<territory type="KH">ካ�ቦዲያ</territory>
-			<territory type="KI">ኪሪባቲ</territory>
-			<territory type="KM">ኮሞሮስ</territory>
-			<territory type="KN">ቅዱስ ኪትስ እና ኔቪስ</territory>
-			<territory type="KP">ሰሜን ኮሪያ</territory>
-			<territory type="KR">ደቡብ ኮሪያ</territory>
-			<territory type="KW">ክዌት</territory>
-			<territory type="KY">ካይማን ደሴቶች</territory>
-			<territory type="LA">ላኦስ</territory>
-			<territory type="LB">ሊባኖስ</territory>
-			<territory type="LC">ሴንት ሉቺያ</territory>
-			<territory type="LI">ሊችተንስታይን</territory>
-			<territory type="LK">ሲሪላንካ</territory>
-			<territory type="LR">ላይቤሪያ</territory>
-			<territory type="LS">ሌሶቶ</territory>
-			<territory type="LT">ሊቱዌኒያ</territory>
-			<territory type="LU">ሉክሰ�በር�</territory>
-			<territory type="LV">ላትቪያ</territory>
-			<territory type="LY">ሊቢያ</territory>
-			<territory type="MA">ሞሮኮ</territory>
-			<territory type="MC">ሞናኮ</territory>
-			<territory type="MD">ሞ�ዶቫ</territory>
-			<territory type="MG">ማዳጋስካር</territory>
-			<territory type="MH">ማርሻ� አይላንድ</territory>
-			<territory type="MK">ማከዶኒያ</territory>
-			<territory type="ML">ማሊ</territory>
-			<territory type="MM">ማያንማር</territory>
-			<territory type="MN">ሞንጎሊያ</territory>
-			<territory type="MO">ማካዎ</territory>
-			<territory type="MP">የሰሜናዊ ማሪያና ደሴቶች</territory>
-			<territory type="MQ">ማርቲኒክ</territory>
-			<territory type="MR">ሞሪቴኒያ</territory>
-			<territory type="MS">ሞንትሴራት</territory>
-			<territory type="MT">ማ�ታ</territory>
-			<territory type="MU">ማሩሸስ</territory>
-			<territory type="MV">ማ�ዲቭስ</territory>
-			<territory type="MW">ማላዊ</territory>
-			<territory type="MX">ሜክሲኮ</territory>
-			<territory type="MY">ማሌዢያ</territory>
-			<territory type="MZ">ሞዛ�ቢክ</territory>
-			<territory type="NA">ናሚቢያ</territory>
-			<territory type="NC">ኒ� ካሌዶኒያ</territory>
-			<territory type="NE">ኒጀር</territory>
-			<territory type="NF">ኖር��ክ ደሴት</territory>
-			<territory type="NG">ናይጄሪያ</territory>
-			<territory type="NI">ኒካራጓ</territory>
-			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
-			<territory type="NP">ኔ��</territory>
-			<territory type="NR">ናኡሩ</territory>
-			<territory type="NU">ኒኡይ</territory>
-			<territory type="NZ">ኒ� ዚላንድ</territory>
-			<territory type="OM">ኦማን</territory>
-			<territory type="PA">�ናማ</territory>
-			<territory type="PE">�ሩ</territory>
-			<territory type="PF">የ�ረንሳይ �ሊኔዢያ</territory>
-			<territory type="PG">��ዋ ኒ� ጊኒ</territory>
-			<territory type="PH">�ሊ�ንስ</territory>
-			<territory type="PK">�ኪስታን</territory>
-			<territory type="PL">�ላንድ</territory>
-			<territory type="PM">ቅዱስ �ዬር እና ሚኩኤሎን</territory>
-			<territory type="PN">�ትካኢርን</territory>
-			<territory type="PR">�ርታ ሪኮ</territory>
-			<territory type="PS">የ��ስጤ� �ዛት</territory>
-			<territory type="PT">�ርቱጋ�</territory>
-			<territory type="PW">�ላ�</territory>
-			<territory type="PY">�ራጓይ</territory>
-			<territory type="QA">ኳታር</territory>
-			<territory type="QO">ወጣ ያለ ኦሽኒያ</territory>
-			<territory type="RE">ሪዩኒየን</territory>
-			<territory type="RO">ሮሜኒያ</territory>
-			<territory type="RU">ራሺያ</territory>
-			<territory type="RW">ሩዋንዳ</territory>
-			<territory type="SA">ሳ�ድአረቢያ</territory>
-			<territory type="SB">ሰሎሞን ደሴት</territory>
-			<territory type="SC">ሲሼ�ስ</territory>
-			<territory type="SD">ሱዳን</territory>
-			<territory type="SE">ስዊድን</territory>
-			<territory type="SG">ሲንጋ�ር</territory>
-			<territory type="SH">ሴንት ሄለና</territory>
-			<territory type="SI">ስሎቬኒያ</territory>
-			<territory type="SJ">የስቫ�ባርድ እና ዣን ማየን ደሴቶች</territory>
-			<territory type="SK">ስሎቫኪያ</territory>
-			<territory type="SL">ሴራሊዮን</territory>
-			<territory type="SM">ሳን ማሪኖ</territory>
-			<territory type="SN">ሴኔጋ�</territory>
-			<territory type="SO">ሱማሌ</territory>
-			<territory type="SR">ሱሪና�</territory>
-			<territory type="ST">ሳኦ ቶሜ እና �ሪንሲ�</territory>
-			<territory type="SV">ኤ� ሳ�ቫዶር</territory>
-			<territory type="SY">ሲሪያ</territory>
-			<territory type="SZ">ሱዋዚላንድ</territory>
-			<territory type="TC">የቱርኮችና የካኢኮስ ደሴቶች</territory>
-			<territory type="TD">ቻድ</territory>
-			<territory type="TF">የ�ረንሳይ ደቡባዊ �ዛቶች</territory>
-			<territory type="TG">ቶ�</territory>
-			<territory type="TH">ታይላንድ</territory>
-			<territory type="TJ">ታጃኪስታን</territory>
-			<territory type="TK">ቶክላ�</territory>
-			<territory type="TL">�ስራቅ ቲሞር</territory>
-			<territory type="TM">ቱርክሜኒስታን</territory>
-			<territory type="TN">ቱኒዚያ</territory>
-			<territory type="TO">ቶንጋ</territory>
-			<territory type="TR">ቱርክ</territory>
-			<territory type="TT">ትሪኒዳድ እና ቶባጎ</territory>
-			<territory type="TV">ቱቫሉ</territory>
-			<territory type="TW">ታይዋን</territory>
-			<territory type="TZ">ታንዛኒያ</territory>
-			<territory type="UA">ዩክሬን</territory>
-			<territory type="UG">ዩጋንዳ</territory>
-			<territory type="UM">የአሜሪካ ራቅ ያሉ አናሳ ደሴቶች</territory>
-			<territory type="US">አሜሪካ</territory>
-			<territory type="UY">ኡራጓይ</territory>
-			<territory type="UZ">ዩ�በኪስታን</territory>
-			<territory type="VA">ቫቲካን</territory>
-			<territory type="VC">ቅዱስ ቪንሴንት እና �ሬናዲንስ</territory>
-			<territory type="VE">ቬንዙዌላ</territory>
-			<territory type="VG">የእን�ሊ� ድን�� ደሴቶች</territory>
-			<territory type="VI">የአሜሪካ ቨርጂን ደሴቶች</territory>
-			<territory type="VN">ቬትና�</territory>
-			<territory type="VU">ቫኑአቱ</territory>
-			<territory type="WF">ዋሊስ እና �ቱና ደሴቶች</territory>
-			<territory type="WS">ሳሞአ</territory>
-			<territory type="YE">የመን</territory>
-			<territory type="YT">ሜይኦቴ</territory>
-			<territory type="ZA">ደቡብ አ�ሪካ</territory>
-			<territory type="ZM">ዛ�ቢያ</territory>
-			<territory type="ZW">ዚ�ቧቤ</territory>
-		</territories>
-		<keys>
-			<key type="calendar">የቀን መ�ጠሪያ</key>
-			<key type="collation">የጽሑ�ች ን��ር</key>
-			<key type="currency">ገንዘብ</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">የቻይና ባህላዊ ቅደ� ተከተ� (Big5)</type>
-			<type type="buddhist" key="calendar">የቡድ� የቀን መ�ጠሪያ</type>
-			<type type="chinese" key="calendar">የቻይና የቀን መ�ጠሪያ</type>
-			<type type="direct" key="collation">ቀጥታ የቃላት ን��ር</type>
-			<type type="gb2312han" key="collation">የቀለ� ያለ ቻይንኛ (GB2312) ቅደ� ተከተ�</type>
-			<type type="gregorian" key="calendar">የ�ሪ�ሪ የቀን መ�ጠሪያ</type>
-			<type type="hebrew" key="calendar">የእብራይስጥ የቀን መ�ጠሪያ</type>
-			<type type="islamic" key="calendar">የእስላ� የቀን መ�ጠሪያ</type>
-			<type type="islamic-civil" key="calendar">የእስላ� ሕ�ባዊ የቀን መ�ጠሪያ</type>
-			<type type="japanese" key="calendar">የጃ�ን የቀን መ�ጠሪያ</type>
-			<type type="phonebook" key="collation">የስ�ክ ማ�ጫ ቅደ� ተከተ�</type>
-			<type type="pinyin" key="collation">የ�ንዪን ቅደ� ተከተ�</type>
-			<type type="stroke" key="collation">የጭረት/የመቀቢያ ቅደ� ተከተ�</type>
-			<type type="traditional" key="collation">ባህላዊ ቅደ� ተከተ�</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">ሜትሪክ</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F ሀ-ሆ ለ-ቆ ቈ ቊ-� በ-ኆ ኈ ኊ-� �-ኮ ኰ ኲ-ኵ ኸ-ኾ ወ-ዎ �-ዖ ዘ-ዷ ጀ-ጎ � ጒ-ጕ ጠ-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[�-᎙ ሇ ⶀ ᎀ-ᎃ �-ⶄ ቇ �-ቖ ቘ ቚ-� ᎄ-ᎇ ⶅ-ⶇ ኇ ⶈ-ⶊ ኯ ዀ ዂ-ዅ � ⶋ ⶌ ዸ-ዿ � ⶎ � ጘ-ጟ ⶓ-ⶖ �-ⶑ ᎈ-� ⶒ ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="coptic">
-				<eras>
-					<eraAbbr>
-						<era type="0">á‹“/á‹“</era>
-						<era type="1">ዓ/�</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">መስከ</month>
-							<month type="2">ጥቅ�</month>
-							<month type="3">ኅዳር</month>
-							<month type="4">ታኅሣ</month>
-							<month type="5">ጥር</month>
-							<month type="6">የካቲ</month>
-							<month type="7">መጋቢ</month>
-							<month type="8">ሚያ�</month>
-							<month type="9">�ንቦ</month>
-							<month type="10">ሰኔ</month>
-							<month type="11">��ሌ</month>
-							<month type="12">��ሴ</month>
-							<month type="13">ጳጉሜ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">መስከረ�</month>
-							<month type="2">ጥቅ�ት</month>
-							<month type="3">ኅዳር</month>
-							<month type="4">ታኅሣሥ</month>
-							<month type="5">ጥር</month>
-							<month type="6">የካቲት</month>
-							<month type="7">መጋቢት</month>
-							<month type="8">ሚያ�ያ</month>
-							<month type="9">�ንቦት</month>
-							<month type="10">ሰኔ</month>
-							<month type="11">��ሌ</month>
-							<month type="12">��ሴ</month>
-							<month type="13">ጳጉሜን</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጃንዩ</month>
-							<month type="2">�ብሩ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስ</month>
-							<month type="9">ሴ�ቴ</month>
-							<month type="10">ኦክተ</month>
-							<month type="11">ኖቬ�</month>
-							<month type="12">ዲሴ�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጃንዩወሪ</month>
-							<month type="2">�ብሩወሪ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ�</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስት</month>
-							<month type="9">ሴ�ቴ�በር</month>
-							<month type="10">ኦክተ�በር</month>
-							<month type="11">ኖቬ�በር</month>
-							<month type="12">ዲሴ�በር</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ጃ</month>
-							<month type="2">�</month>
-							<month type="3">ማ</month>
-							<month type="4">ኤ</month>
-							<month type="5">ሜ</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">ኦ</month>
-							<month type="9">ሴ</month>
-							<month type="10">ኦ</month>
-							<month type="11">ኖ</month>
-							<month type="12">ዲ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">እሑድ</day>
-							<day type="mon">ሰኞ</day>
-							<day type="tue">ማክሰ</day>
-							<day type="wed">ረቡዕ</day>
-							<day type="thu">�ሙስ</day>
-							<day type="fri">ዓርብ</day>
-							<day type="sat">ቅዳሜ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">እሑድ</day>
-							<day type="mon">ሰኞ</day>
-							<day type="tue">ማክሰኞ</day>
-							<day type="wed">ረቡዕ</day>
-							<day type="thu">�ሙስ</day>
-							<day type="fri">ዓርብ</day>
-							<day type="sat">ቅዳሜ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">እ</day>
-							<day type="mon">ሰ</day>
-							<day type="tue">ማ</day>
-							<day type="wed">ረ</day>
-							<day type="thu">�</day>
-							<day type="fri">á‹“</day>
-							<day type="sat">ቅ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ጡዋት</am>
-				<pm>ከሳዓት</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">á‹“/á‹“</era>
-						<era type="1">ዓ/�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM ቀን y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>hh:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>hh:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM - yyyy-MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM - yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd - E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="M">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="y">E, y MMM dd - E, y MMM dd</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ዘመን</displayName>
-					</field>
-					<field type="year">
-						<displayName>ዓመት</displayName>
-					</field>
-					<field type="month">
-						<displayName>ወር</displayName>
-					</field>
-					<field type="week">
-						<displayName>ሳ�ንት</displayName>
-					</field>
-					<field type="day">
-						<displayName>ቀን</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ሰዓት</displayName>
-					</field>
-					<field type="minute">
-						<displayName>ደቂቃ</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">ሙሀረ�</month>
-							<month type="2">ሳ�ር</month>
-							<month type="3">ረቢዑ� አወ�</month>
-							<month type="4">ረቢዑ� አኺር</month>
-							<month type="5">ጀማደ� አወ�</month>
-							<month type="6">ጀማደ� አኺር</month>
-							<month type="7">ረጀብ</month>
-							<month type="8">ሻእባን</month>
-							<month type="9">ረመዳን</month>
-							<month type="10">ሸዋ�</month>
-							<month type="11">ዙ�ቂዳህ</month>
-							<month type="12">ዙ�ሂጃህ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>ሮተራ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>��መር</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>South_Pole</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>ስዮዋ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>ማ�ሰን</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>ዴቪስ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ቮስቱክ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>ቼሲ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>ዱሞንትዱርቪ�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>ማክሙርዶ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio_Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>ሜንዶዛ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San_Juan</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La_Rioja</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>ካታማርካ</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>��ይ</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>ኮርዶባ</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ቡኤኖስ-ኤይሪስ</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>�ር�</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>ዳርዊን</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>አዴላኢደ</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ብሮከን ሂ�</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>ሜ�ቦኡመ</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>ሆባርት</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>ሊንደማን</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>ሲድኒ</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ቢሪስባን</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>ሎርድ ሆዌ</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>ኢሩኔ�</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>ሪኦ ብራንኮ</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>�ርቶ ቨ�ሆ</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>ቦአ ቪስታ</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>ማናኡስ</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>ኩባ</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Campo_Grande</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>በለ�</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>አራጉአኢና</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>ሳኦ ��ሎ</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>America/Bahia</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>�ርታለዛ</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>ማቺዎ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>ሪሲ�ይ</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>ኖሮሃ</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>ዳ�ሰን</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>�ዋይትሆርስ</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>ኢኑቪክ</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>ቫንኩቨር</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>ዳ�ሰን ክሪክ</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>የሎ�ናይ�</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>ኤድመንተን</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>ስዊ�ት ከረንት</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>ካ�ብሪጅ ቤይ</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>ሬጂና</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>ዊኒ��</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>ሬኒ ሪቨር</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>ራንኪን ኢንሌት</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ተንደር ቤይ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ኒ�ጎን</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>ቶሮንቶ</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>ሞንትሪያ�</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>ኢካሊኡት</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>�ን�ኒርቱን�</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>ሀሊ�ክስ</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>ጉ� ቤይ</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>�ሌስ ቤይ</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>ሴንት ጆንስ</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>ኪንሻሳ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ሉቡ�ባሺ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ኢስተር</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>ሳንቲያጎ</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>ካሽጋር</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>ኡሩ�ኪ</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ቾን�ኪን�</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>ሻንጋይ</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>ባርቢን</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>ጋላ�ጎስ</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>ጓያኪ�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>ካናሪ</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>ኬ�ታ</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>ማርድሪድ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ትሩክ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>�ኔ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>ኮስራይ</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>ሎንዶን</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>ቱለ</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>�ድታኽብ</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>ስኮረስቢሱንድ</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>ዴንማርክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>ጃካርታ</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>�ንቲአንካ</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>ማካሳር</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ጃያ�ራ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>እንደርቡርይ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>ኪሪቲማቲ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>ታራዋ</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>አክታ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ኦራ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>አክቶቤ</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>ኪ�ያሎርዳ</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>አ�ማቲ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>ክዋጃላይን</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>ማ�ሮ</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>ባማኮ</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>ሆቭድ</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>ኡላንባታር</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ቾይባ�ሳን</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>ቲ�አና</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>ሄርሞሲሎ</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>ማዛቲአን</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ቺኽዋኽዋ</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>ሞንተሪ</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>ሜክሲኮ ሲቲ</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>ሜሪዳ</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>ካንኩን</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>ኳላ���ር</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>ኩቺን�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>ቻትሃ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>ኦክላንድ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>ታሂቲ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>ማሩኩሳስ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>ጋ�ባየር</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>አዞረስ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>ማዴኢራ</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>ሊስቦን</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>ካሊኒንጋርድ</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>ማስኮ</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>ሳማራ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>የካተሪንበር�</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>ኦ�ስክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>ኖቮሲቢርስክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>ክራስኖያሽክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ኢርኩትስክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ያኩትስክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ቭላዲቮስቱክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>ሳክሃሊን</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>ማጋዳን</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>ካ�ቻትካ</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>አናዲር</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ኡ�ጎሩድ</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>ካይቭ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>ሲ��ሮ��</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ዛ�ሮ�ሂይ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>ሚድዌ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ጆንስቶን</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>ዌክ</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>አዳክ</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>ኖሜ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>ሆኖሉሉ</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>አንኮራጅ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ያኩታት</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>��አኡ</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>ሎስ አንጀለስ</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>ቦይስ</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>�ኔክስ</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>ዴንቨር</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>መካከ�</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ቺካ�</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>መኖሚኔ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>ክኖክስ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>ማሬንጎ</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>ኢንዲያና�ሊስ</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ሉዊስቪለ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>ቬቫይ</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>ሞንቲሴሎ</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>ዲትሮይት</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>ኒ�ዮርክ</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>ሳማርካንድ</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>ታሽኬንት</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-				<symbol>ብር</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName>ዩሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>አዎን:y</yesstr>
-			<nostr>አይ:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/am_ET.xml b/airtime_mvc/library/Zend/Locale/Data/am_ET.xml
deleted file mode 100644
index 78f219352..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/am_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="am"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar.xml b/airtime_mvc/library/Zend/Locale/Data/ar.xml
deleted file mode 100644
index b6d58adde..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar.xml
+++ /dev/null
@@ -1,3118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.126 $"/>
-		<generation date="$Date: 2009/06/16 21:53:37 $"/>
-		<language type="ar"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>،</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">الأ�ارية</language>
-			<language type="ab">الأبخازية</language>
-			<language type="ace">الأتشينيزية</language>
-			<language type="ach">الأكولية</language>
-			<language type="ada">الأدانجمية</language>
-			<language type="ady">الأديجه</language>
-			<language type="ae">الأ�ستية</language>
-			<language type="af">الأ�ريقية</language>
-			<language type="afa">لغة أ�رو آسيوية</language>
-			<language type="afh">الأ�ريهيلية</language>
-			<language type="ain">الآينوية</language>
-			<language type="ak">الأكانية</language>
-			<language type="akk">الأكادية</language>
-			<language type="ale">الأليوتية</language>
-			<language type="alg">اللغات الأمريكية الهندية</language>
-			<language type="alt">الألطائية الجنوبية</language>
-			<language type="am">الأمهرية</language>
-			<language type="an">الأراجونية</language>
-			<language type="ang">الانجليزية القديمة</language>
-			<language type="anp">الأنجيكا</language>
-			<language type="apa">اللغات الأباتشية</language>
-			<language type="ar">العربية</language>
-			<language type="arc">الآرامية</language>
-			<language type="arn">الأروكانية</language>
-			<language type="arp">الأراباهو</language>
-			<language type="art">الصناعية - أخرى</language>
-			<language type="arw">الأراواكية</language>
-			<language type="as">الأسامية</language>
-			<language type="ast">الأسترية</language>
-			<language type="ath">اللغات الأزباسكانية</language>
-			<language type="aus">اللغات الأسترالية</language>
-			<language type="av">الأ�اريكية</language>
-			<language type="awa">الأوادية</language>
-			<language type="ay">الأيمارا</language>
-			<language type="az">الأذرية</language>
-			<language type="ba">الباشكيرية</language>
-			<language type="bad">الباندا</language>
-			<language type="bai">اللغات الباميليكية</language>
-			<language type="bal">البلوشية</language>
-			<language type="ban">اللغة البالية</language>
-			<language type="bas">الباسا</language>
-			<language type="bat">البلطيقية - أخرى</language>
-			<language type="be">البيلوروسية</language>
-			<language type="bej">البيجا</language>
-			<language type="bem">البيمبا</language>
-			<language type="ber">البربرية</language>
-			<language type="bg">البلغارية</language>
-			<language type="bh">البيهارية</language>
-			<language type="bho">البهوجبرية</language>
-			<language type="bi">البيسلامية</language>
-			<language type="bik">البيكولية</language>
-			<language type="bin">البينية</language>
-			<language type="bla">السيكسيكية</language>
-			<language type="bm">البامبارا</language>
-			<language type="bn">البنغالية</language>
-			<language type="bnt">البانتو</language>
-			<language type="bo">التبتية</language>
-			<language type="br">البريتونية</language>
-			<language type="bra">البراجية</language>
-			<language type="bs">البوسنية</language>
-			<language type="btk">الباتاكية</language>
-			<language type="bua">البرياتية</language>
-			<language type="bug">البجينيزية</language>
-			<language type="byn">البلينية</language>
-			<language type="ca">الكاتالوينية</language>
-			<language type="cad">الكادو</language>
-			<language type="cai">الهندية الأمريكية الوسطى - أخرى</language>
-			<language type="car">الكاريبية</language>
-			<language type="cau">القوقازية - أخرى</language>
-			<language type="cch">الأتسام</language>
-			<language type="ce">الشيشانية</language>
-			<language type="ceb">السيبيونو</language>
-			<language type="cel">السلتية - أخرى</language>
-			<language type="ch">التشامورو</language>
-			<language type="chb">التشيبشا</language>
-			<language type="chg">التشاجاتاى</language>
-			<language type="chk">التشكيزية</language>
-			<language type="chm">الماري</language>
-			<language type="chn">الشينوك جارجون</language>
-			<language type="cho">الشوكتو</language>
-			<language type="chp">الشيباوايان</language>
-			<language type="chr">الشيروكى</language>
-			<language type="chy">الشايان</language>
-			<language type="cmc">اللغات التشاميكية</language>
-			<language type="co">الكورسيكية</language>
-			<language type="cop">قبطية</language>
-			<language type="cpe">الكرييولى و اللغات المبسطة الأخرى للت�اهم بين الشعوب على أساس الأنجليزية</language>
-			<language type="cpf">الكرييولى و اللغات المبسطة الأخرى للت�اهم بين الشعوب على أساس ال�رنسية</language>
-			<language type="cpp">الكرييولى و اللغات المبسطة الأخرى للت�اهم بين الشعوب على أساس البرتغالية</language>
-			<language type="cr">الكرى</language>
-			<language type="crh">تركى كريمين، لغة توركية كريمينية</language>
-			<language type="crp">الكرييولى و اللغات المبسطة الأخرى للت�اهم بين الشعوب - أخرى</language>
-			<language type="cs">التشيكية</language>
-			<language type="csb">الكاشبايان</language>
-			<language type="cu">سلا�ية كنسية</language>
-			<language type="cus">الكشيتيك - أخرى</language>
-			<language type="cv">التش�اش</language>
-			<language type="cy">الولزية</language>
-			<language type="da">الدانماركية</language>
-			<language type="dak">الداكوتا</language>
-			<language type="dar">الدارجوا</language>
-			<language type="day">الدياك</language>
-			<language type="de">الألمانية</language>
-			<language type="de_AT">الألمانية النمساوية</language>
-			<language type="de_CH">الألمانية العليا السويسرية</language>
-			<language type="del">الديلوير</language>
-			<language type="den">السلا�ية</language>
-			<language type="dgr">الدوجريب</language>
-			<language type="din">الدنكا</language>
-			<language type="doi">الدوجرى</language>
-			<language type="dra">الدرا�يدين - أخرى</language>
-			<language type="dsb">الصربية الس�لى</language>
-			<language type="dua">الديولا</language>
-			<language type="dum">الهولندية الوسطى</language>
-			<language type="dv">المالدي�ية</language>
-			<language type="dyu">الدايلا</language>
-			<language type="dz">الزونخاية</language>
-			<language type="ee">الايوي</language>
-			<language type="efi">الا�يك</language>
-			<language type="egy">المصرية القديمة</language>
-			<language type="eka">الاكاجك</language>
-			<language type="el">اليونانية</language>
-			<language type="elx">الامايت</language>
-			<language type="en">الانجليزية</language>
-			<language type="en_AU">الانجليزية الأسترالية</language>
-			<language type="en_CA">الإنجليزية الكندية</language>
-			<language type="en_GB">الانجليزية البريطانية</language>
-			<language type="en_US">إنجليزية الولايات المتحدة</language>
-			<language type="enm">الانجليزية الوسطى</language>
-			<language type="eo">اسبرانتو</language>
-			<language type="es">الأسبانية</language>
-			<language type="es_419">أسبانية أمريكا اللاتينية</language>
-			<language type="es_ES">الأسبانية الأيبيرية</language>
-			<language type="et">الأستونية</language>
-			<language type="eu">لغة الباسك</language>
-			<language type="ewo">الايوندو</language>
-			<language type="fa">ال�ارسية</language>
-			<language type="fan">ال�انج</language>
-			<language type="fat">ال�انتى</language>
-			<language type="ff">ال�لة</language>
-			<language type="fi">ال�نلندية</language>
-			<language type="fil">ال�لبينية</language>
-			<language type="fiu">�ينو أجرايان - أخرى</language>
-			<language type="fj">ال�يجية</language>
-			<language type="fo">ال�ارويز</language>
-			<language type="fon">ال�ون</language>
-			<language type="fr">ال�رنسية</language>
-			<language type="fr_CA">ال�رنسية الكندية</language>
-			<language type="fr_CH">ال�رنسية السويسرية</language>
-			<language type="frm">ال�رنسية الوسطى</language>
-			<language type="fro">ال�رنسية القديمة</language>
-			<language type="frr">ال�ريزينية الشمالية</language>
-			<language type="frs">ال�ريزينية الشرقية</language>
-			<language type="fur">ال�ريلايان</language>
-			<language type="fy">ال�ريزيان</language>
-			<language type="ga">الأيرلندية</language>
-			<language type="gaa">الجا</language>
-			<language type="gay">الجايو</language>
-			<language type="gba">الجبيا</language>
-			<language type="gd">الغيلية الأسكتلندية</language>
-			<language type="gem">لغة جرمانية</language>
-			<language type="gez">الجيز</language>
-			<language type="gil">لغة أهل جبل طارق</language>
-			<language type="gl">الجاليكية</language>
-			<language type="gmh">الألمانية العليا الوسطى</language>
-			<language type="gn">الجوارانى</language>
-			<language type="goh">الألمانية العليا القديمة</language>
-			<language type="gon">الجندى</language>
-			<language type="gor">الجورونتالو</language>
-			<language type="got">القوطية</language>
-			<language type="grb">الجريبو</language>
-			<language type="grc">اليونانية القديمة</language>
-			<language type="gsw">الألمانية السويسرية</language>
-			<language type="gu">الغوجاراتية</language>
-			<language type="gv">المنكية</language>
-			<language type="ha">الهوسا</language>
-			<language type="hai">الهيدا</language>
-			<language type="haw">لغة أهل الهاواى</language>
-			<language type="he">العبرية</language>
-			<language type="hi">الهندية</language>
-			<language type="hil">الهيليجينون</language>
-			<language type="him">الهيماتشالى</language>
-			<language type="hit">الحثية</language>
-			<language type="hmn">الهمونجية</language>
-			<language type="ho">الهيرى موتو</language>
-			<language type="hr">الكرواتية</language>
-			<language type="hsb">الصربية العليا</language>
-			<language type="ht">الهايتية</language>
-			<language type="hu">الهنغارية</language>
-			<language type="hup">الهبا</language>
-			<language type="hy">الأرمينية</language>
-			<language type="hz">الهيريرو</language>
-			<language type="ia">اللّغة الوسيطة</language>
-			<language type="iba">الايبان</language>
-			<language type="id">الأندونيسية</language>
-			<language type="ie">الانترلينج</language>
-			<language type="ig">الايجبو</language>
-			<language type="ii">السيتشيون يى</language>
-			<language type="ijo">الايجو</language>
-			<language type="ik">الاينبياك</language>
-			<language type="ilo">الايلوكو</language>
-			<language type="inc">الهندية - أخرى</language>
-			<language type="ine">الهندية الأوروبية - أخرى</language>
-			<language type="inh">الانجوشية</language>
-			<language type="io">الايدو</language>
-			<language type="ira">الايرانية</language>
-			<language type="iro">اللغات الايروكويانية</language>
-			<language type="is">الأيسلاندية</language>
-			<language type="it">الايطالية</language>
-			<language type="iu">الاينكتيتت</language>
-			<language type="ja">اليابانية</language>
-			<language type="jbo">اللوجبان</language>
-			<language type="jpr">الجيدو ال�ارسى</language>
-			<language type="jrb">الجيدو العربى</language>
-			<language type="jv">الجاوية</language>
-			<language type="ka">الجورجية</language>
-			<language type="kaa">الكارا-كالباك</language>
-			<language type="kab">القبيلية</language>
-			<language type="kac">الكاتشين</language>
-			<language type="kaj">الجو</language>
-			<language type="kam">الكامبا</language>
-			<language type="kar">الكاريين</language>
-			<language type="kaw">الكوي</language>
-			<language type="kbd">الكاباردايان</language>
-			<language type="kfo">الكورو</language>
-			<language type="kg">الكونغو</language>
-			<language type="kha">الكازية</language>
-			<language type="khi">الخويسان - أخرى</language>
-			<language type="kho">الخوتانيز</language>
-			<language type="ki">الكيكيو</language>
-			<language type="kj">الكيونياما</language>
-			<language type="kk">الكازاخستانية</language>
-			<language type="kl">الكالاليست</language>
-			<language type="km">الخميرية</language>
-			<language type="kmb">الكيمبندو</language>
-			<language type="kn">الكانادا</language>
-			<language type="ko">الكورية</language>
-			<language type="kok">الكونكانية</language>
-			<language type="kos">الكوسراين</language>
-			<language type="kpe">الكبيل</language>
-			<language type="kr">الكانيوري</language>
-			<language type="krc">الكاراتشاي-بالكار</language>
-			<language type="krl">الكريلية</language>
-			<language type="kro">الكرو</language>
-			<language type="ks">الكاشميرية</language>
-			<language type="ku">الكردية</language>
-			<language type="kum">الكميك</language>
-			<language type="kut">الكتيناي</language>
-			<language type="kv">الكومي</language>
-			<language type="kw">الكورنية</language>
-			<language type="ky">القيرغستانية</language>
-			<language type="la">اللاتينية</language>
-			<language type="lad">الاسباعبرية</language>
-			<language type="lah">اللاهندا</language>
-			<language type="lam">اللامبا</language>
-			<language type="lb">اللوكسمبرجية</language>
-			<language type="lez">الليزجهايانية</language>
-			<language type="lg">الجاندا</language>
-			<language type="li">الليمبرجيشية</language>
-			<language type="ln">اللينجالا</language>
-			<language type="lo">اللاوية</language>
-			<language type="lol">منغولى</language>
-			<language type="loz">اللوزى</language>
-			<language type="lt">اللتوانية</language>
-			<language type="lu">اللبا-كاتانجا</language>
-			<language type="lua">اللبا-لؤلؤ</language>
-			<language type="lui">اللوسينو</language>
-			<language type="lun">اللوندا</language>
-			<language type="luo">اللو</language>
-			<language type="lus">اللشاي</language>
-			<language type="lv">اللات�ية</language>
-			<language type="mad">المادريز</language>
-			<language type="mag">الماجا</language>
-			<language type="mai">المايثيلي</language>
-			<language type="mak">الماكاسار</language>
-			<language type="man">الماندينغ</language>
-			<language type="map">الأوسترونيسيان</language>
-			<language type="mas">الماساي</language>
-			<language type="mdf">الموكشا</language>
-			<language type="mdr">الماندار</language>
-			<language type="men">الميند</language>
-			<language type="mg">المالاجاشية</language>
-			<language type="mga">الأيرلندية الوسطى</language>
-			<language type="mh">المارشالية</language>
-			<language type="mi">الماورية</language>
-			<language type="mic">الميكماكيونية</language>
-			<language type="min">المينانجكاباو</language>
-			<language type="mis">اللغات المتنوعة</language>
-			<language type="mk">المقدونية</language>
-			<language type="mkh">المون خمير- أخرى</language>
-			<language type="ml">الماليالام</language>
-			<language type="mn">المنغولية</language>
-			<language type="mnc">المانشو</language>
-			<language type="mni">المانيبرى</language>
-			<language type="mno">لغات مانوبو</language>
-			<language type="mo">المولدو�ية</language>
-			<language type="moh">الموهوك</language>
-			<language type="mos">الموسي</language>
-			<language type="mr">الماراثى</language>
-			<language type="ms">لغة الملايو</language>
-			<language type="mt">المالطية</language>
-			<language type="mul">اللغات المتعددة</language>
-			<language type="mun">لغات المندا</language>
-			<language type="mus">الكريك</language>
-			<language type="mwl">الميرانديز</language>
-			<language type="mwr">الماروارى</language>
-			<language type="my">البورمية</language>
-			<language type="myn">لغات المايا</language>
-			<language type="myv">اللغة الارزية</language>
-			<language type="na">النورو</language>
-			<language type="nah">الناهيوتل</language>
-			<language type="nai">الهندية الأمريكية الشمالية - أخرى</language>
-			<language type="nap">اللغة النابولية</language>
-			<language type="nb">البوكمالية النرويجية</language>
-			<language type="nd">النديبيل الشمالى</language>
-			<language type="nds">الألمانية الس�لى</language>
-			<language type="ne">النيبالية</language>
-			<language type="new">النيواري</language>
-			<language type="ng">الندونجا</language>
-			<language type="nia">النياس</language>
-			<language type="nic">النيجر - كوردو�انايان</language>
-			<language type="niu">النيوي</language>
-			<language type="nl">الهولندية</language>
-			<language type="nn">النينورسك النرويجي</language>
-			<language type="no">النرويجية</language>
-			<language type="nog">النوجاى</language>
-			<language type="non">النورس القديم</language>
-			<language type="nqo">انكو</language>
-			<language type="nr">النديبيل الجنوبى</language>
-			<language type="nso">السوتو الشمالية</language>
-			<language type="nub">اللغات النوبية</language>
-			<language type="nv">النا�اجو</language>
-			<language type="nwc">النوارية التقليدية</language>
-			<language type="ny">النيانجا، التشيتشوا، التشوا</language>
-			<language type="nym">النيامويزى</language>
-			<language type="nyn">النيانكول</language>
-			<language type="nyo">النيورو</language>
-			<language type="nzi">النزيما</language>
-			<language type="oc">الأوكيتانية</language>
-			<language type="oj">الأوجيبوا</language>
-			<language type="om">الأورومو</language>
-			<language type="or">الأورييا</language>
-			<language type="os">الأوسيتيك</language>
-			<language type="osa">الأوساج</language>
-			<language type="ota">التركية العثمانية</language>
-			<language type="oto">اللغات الأوتومية</language>
-			<language type="pa">البنجابية</language>
-			<language type="paa">الغينية - أخرى</language>
-			<language type="pag">البانجاسينان</language>
-			<language type="pal">البهلوية</language>
-			<language type="pam">البامبانجا</language>
-			<language type="pap">البابيامينتو</language>
-			<language type="pau">البالوان</language>
-			<language type="peo">ال�ارسية القديمة</language>
-			<language type="phi">ال�ليبينية - أخرى</language>
-			<language type="phn">ال�ينيقية</language>
-			<language type="pi">البالية</language>
-			<language type="pl">البولندية</language>
-			<language type="pon">البوهنبيايان</language>
-			<language type="pra">اللغات البراقريطية</language>
-			<language type="pro">البرو�انسية القديمة</language>
-			<language type="ps">البشتونية</language>
-			<language type="pt">البرتغالية</language>
-			<language type="pt_BR">البرتغالية البرازيلية</language>
-			<language type="pt_PT">البرتغالية الأيبيرية</language>
-			<language type="qu">الكويتشوا</language>
-			<language type="raj">الراجاسثانية</language>
-			<language type="rap">الرابانى</language>
-			<language type="rar">الراروتونجانى</language>
-			<language type="rm">الرهايتو-رومانس</language>
-			<language type="rn">الرندى</language>
-			<language type="ro">الرومانية</language>
-			<language type="roa">الرومانسية - أخرى</language>
-			<language type="rom">rom</language>
-			<language type="root">الجذر</language>
-			<language type="ru">الروسية</language>
-			<language type="rup">الأرومانيان</language>
-			<language type="rw">الكينيارواندا</language>
-			<language type="sa">السنسكريتية</language>
-			<language type="sad">السانداوى</language>
-			<language type="sah">الياكت</language>
-			<language type="sai">الهندية الأمريكية الجنوبية - أخرى</language>
-			<language type="sal">لغات ساليشان</language>
-			<language type="sam">الآرامية السومارية</language>
-			<language type="sas">الساساك</language>
-			<language type="sat">السانتالى</language>
-			<language type="sc">السردينية</language>
-			<language type="scn">الصقلية</language>
-			<language type="sco">الأسكتلندية</language>
-			<language type="sd">السيندى</language>
-			<language type="se">السامي الشمالى</language>
-			<language type="sel">السيلكب</language>
-			<language type="sem">السامية - أخرى</language>
-			<language type="sg">السانجو</language>
-			<language type="sga">الأيرلندية القديمة</language>
-			<language type="sgn">لغات الإشارة</language>
-			<language type="shn">الشانية</language>
-			<language type="si">السريلانكية</language>
-			<language type="sid">السيدامو</language>
-			<language type="sio">لغات السيويون</language>
-			<language type="sit">الصينية التيبتية - أخرى</language>
-			<language type="sk">السلو�اكية</language>
-			<language type="sl">السلو�انية</language>
-			<language type="sla">السلا�ية - أخرى</language>
-			<language type="sm">الساموائية</language>
-			<language type="sma">السامي الجنوبى</language>
-			<language type="smi">اللغات السامية - أخرى</language>
-			<language type="smj">اللول سامى</language>
-			<language type="smn">الاينارى سامى</language>
-			<language type="sms">السكولت سامى</language>
-			<language type="sn">الشونا</language>
-			<language type="snk">السونينك</language>
-			<language type="so">الصومالية</language>
-			<language type="sog">السوجدين</language>
-			<language type="son">السونجهاى</language>
-			<language type="sq">الألبانية</language>
-			<language type="sr">الصربية</language>
-			<language type="srn">السرانان تونجو</language>
-			<language type="srr">السرر</language>
-			<language type="ss">السواتى</language>
-			<language type="ssa">النيلية الصحراوية - أخرى</language>
-			<language type="st">السوتو الجنوبية</language>
-			<language type="su">السودانية</language>
-			<language type="suk">السوكوما</language>
-			<language type="sus">السوسو</language>
-			<language type="sux">السومارية</language>
-			<language type="sv">السويدية</language>
-			<language type="sw">السواحلية</language>
-			<language type="syc">سريانية تقليدية</language>
-			<language type="syr">السريانية</language>
-			<language type="ta">التاميلية</language>
-			<language type="tai">تاى - أخرى</language>
-			<language type="te">التيلجو</language>
-			<language type="tem">التيمن</language>
-			<language type="ter">التيرينو</language>
-			<language type="tet">التيتم</language>
-			<language type="tg">الطاجيكية</language>
-			<language type="th">التايلاندية</language>
-			<language type="ti">التيجرينيا</language>
-			<language type="tig">التيجر</language>
-			<language type="tiv">التي�</language>
-			<language type="tk">التركمانية</language>
-			<language type="tkl">التوكيلاو</language>
-			<language type="tl">التاغالوغية</language>
-			<language type="tlh">الكلينجون</language>
-			<language type="tli">التلينغيتية</language>
-			<language type="tmh">التاماشيك</language>
-			<language type="tn">التسوانية</language>
-			<language type="to">تونجا - جزر تونجا</language>
-			<language type="tog">تونجا - نياسا</language>
-			<language type="tpi">التوك بيسين</language>
-			<language type="tr">التركية</language>
-			<language type="ts">السونجا</language>
-			<language type="tsi">التسيمشيان</language>
-			<language type="tt">التتارية</language>
-			<language type="tum">التامبوكا</language>
-			<language type="tup">اللغات التوبية</language>
-			<language type="tut">الألطائية - أخرى</language>
-			<language type="tvl">التو�الو</language>
-			<language type="tw">التوي</language>
-			<language type="ty">التاهيتية</language>
-			<language type="udm">الأدمرت</language>
-			<language type="ug">الأغورية</language>
-			<language type="uga">اليجاريتيك</language>
-			<language type="uk">الأوكرانية</language>
-			<language type="umb">الأمبندو</language>
-			<language type="und">غير محدده</language>
-			<language type="ur">الأردية</language>
-			<language type="uz">الاوزباكية</language>
-			<language type="vai">ال�اى</language>
-			<language type="ve">ال�يندا</language>
-			<language type="vi">ال�يتنامية</language>
-			<language type="vot">ال�وتيك</language>
-			<language type="wa">الولونية</language>
-			<language type="wak">لغات الواكاشان</language>
-			<language type="wal">الوالامو</language>
-			<language type="war">الواراى</language>
-			<language type="was">الواشو</language>
-			<language type="wen">اللغات الصربية</language>
-			<language type="wo">الولو�</language>
-			<language type="xal">الكالميك</language>
-			<language type="yao">الياو</language>
-			<language type="yap">اليابيز</language>
-			<language type="yi">اليديشية</language>
-			<language type="yo">اليوروبية</language>
-			<language type="ypk">اللغات اليوبيكية</language>
-			<language type="za">الزهيونج</language>
-			<language type="zap">الزابوتيك</language>
-			<language type="zen">الزيناجا</language>
-			<language type="zh">الصينية</language>
-			<language type="zh_Hans">الصينية المبسطة</language>
-			<language type="zh_Hant">الصينية التقليدية</language>
-			<language type="znd">الزاند</language>
-			<language type="zu">الزولو</language>
-			<language type="zun">الزونية</language>
-			<language type="zxx">بدون محتوى لغوي</language>
-		</languages>
-		<scripts>
-			<script type="Arab">العربية</script>
-			<script type="Armn">الأرمينية</script>
-			<script type="Bali">البالية</script>
-			<script type="Batk">الباتاك</script>
-			<script type="Beng">البنغالية</script>
-			<script type="Blis">رموز بليس</script>
-			<script type="Bopo">البوبومو�و</script>
-			<script type="Brah">الهندوسية</script>
-			<script type="Brai">البرايل</script>
-			<script type="Bugi">البجينيز</script>
-			<script type="Buhd">البهيدية</script>
-			<script type="Cans">مقطعيات أصلية كندية موحدة</script>
-			<script type="Cari">الكارية</script>
-			<script type="Cham">التشامية</script>
-			<script type="Cher">الشيروكى</script>
-			<script type="Cirt">السيرث</script>
-			<script type="Copt">القبطية</script>
-			<script type="Cprt">القبرصية</script>
-			<script type="Cyrl">السيريلية</script>
-			<script type="Cyrs">السيريلية - متغير السلا�ية الكنسية القديمة</script>
-			<script type="Deva">الدي�اناجارى</script>
-			<script type="Dsrt">الديسيريت</script>
-			<script type="Egyd">الديموطيقية</script>
-			<script type="Egyh">الهيراطيقية</script>
-			<script type="Egyp">الهيروغلي�ية</script>
-			<script type="Ethi">الاثيوبية</script>
-			<script type="Geok">الأبجدية الجورجية - أسومتا�رلى و نسخرى</script>
-			<script type="Geor">الجورجية</script>
-			<script type="Glag">الجلاجوليتيك</script>
-			<script type="Goth">القوطية</script>
-			<script type="Grek">اليونانية</script>
-			<script type="Gujr">التاغجراتية</script>
-			<script type="Guru">الجرمخى</script>
-			<script type="Hang">الهانجل</script>
-			<script type="Hani">الهان</script>
-			<script type="Hano">الهانونو</script>
-			<script type="Hans">الهان المبسطة</script>
-			<script type="Hant">الهان التقليدية</script>
-			<script type="Hebr">العبرية</script>
-			<script type="Hira">الهيراجانا</script>
-			<script type="Hmng">الباهوه همونج</script>
-			<script type="Hrkt">الكتكانا أو الهيراجانا</script>
-			<script type="Hung">المجرية القديمة</script>
-			<script type="Inds">اندس - هارابان</script>
-			<script type="Ital">الإيطالية القديمة</script>
-			<script type="Java">الجاوية</script>
-			<script type="Jpan">اليابانية</script>
-			<script type="Kali">الكياه لى</script>
-			<script type="Kana">الكتكانا</script>
-			<script type="Khar">الخاروشتى</script>
-			<script type="Khmr">الخميرية</script>
-			<script type="Knda">الكانادا</script>
-			<script type="Kore">الكورية</script>
-			<script type="Lana">الانا</script>
-			<script type="Laoo">اللاو</script>
-			<script type="Latf">اللاتينية - متغير �راكتر</script>
-			<script type="Latg">اللاتينية - متغير غيلى</script>
-			<script type="Latn">اللاتينية</script>
-			<script type="Lepc">الليبتشا - رونج</script>
-			<script type="Limb">الليمبو</script>
-			<script type="Lina">الخطية أ</script>
-			<script type="Linb">الخطية ب</script>
-			<script type="Lyci">الليسية</script>
-			<script type="Lydi">الليدية</script>
-			<script type="Mand">المانداينية</script>
-			<script type="Maya">المايا الهيروغلي�ية</script>
-			<script type="Mero">الميرويتيك</script>
-			<script type="Mlym">الماليالام</script>
-			<script type="Mong">المغولية</script>
-			<script type="Moon">مون</script>
-			<script type="Mymr">الميانمار</script>
-			<script type="Nkoo">انكو</script>
-			<script type="Ogam">الأوجهام</script>
-			<script type="Orkh">الأورخون</script>
-			<script type="Orya">الأوريا</script>
-			<script type="Osma">الأوسمانيا</script>
-			<script type="Perm">البيرميكية القديمة</script>
-			<script type="Phag">ال�اجسبا</script>
-			<script type="Phnx">ال�ينيقية</script>
-			<script type="Plrd">الصوتيات الجماء</script>
-			<script type="Qaai">الموروث</script>
-			<script type="Roro">رنجورنجو</script>
-			<script type="Runr">الروني</script>
-			<script type="Sara">الساراتي</script>
-			<script type="Shaw">الشواني</script>
-			<script type="Sinh">السينهالا</script>
-			<script type="Sund">السوندانية</script>
-			<script type="Sylo">السيلوتى ناجرى</script>
-			<script type="Syrc">السريانية</script>
-			<script type="Syre">السريانية الاسترنجيلية</script>
-			<script type="Syrj">السريانية - متغير غربى</script>
-			<script type="Syrn">السريانية - متغير شرقى</script>
-			<script type="Tagb">التاجبانوا</script>
-			<script type="Tale">التاى لى</script>
-			<script type="Talu">التاى لى الجديد</script>
-			<script type="Taml">التاميلية</script>
-			<script type="Telu">التيلجو</script>
-			<script type="Teng">التينجوار</script>
-			<script type="Tfng">التي�يناغ - البربر</script>
-			<script type="Tglg">التغالوغية</script>
-			<script type="Thaa">الثعنة</script>
-			<script type="Thai">التايلاندية</script>
-			<script type="Tibt">التبتية</script>
-			<script type="Ugar">الأجاريتيكية</script>
-			<script type="Vaii">ال�اى</script>
-			<script type="Visp">الكلام المرئي</script>
-			<script type="Xpeo">ال�ارسية القديمة</script>
-			<script type="Xsux">الكتابة المسمارية الأكادية السومارية</script>
-			<script type="Yiii">اليى</script>
-			<script type="Zxxx">ش�رة للغات الغير مكتوبة</script>
-			<script type="Zyyy">عام</script>
-			<script type="Zzzz">ش�رة للنصوص الغير مش�رة</script>
-		</scripts>
-		<territories>
-			<territory type="001">العالم</territory>
-			<territory type="002">ا�ريقيا</territory>
-			<territory type="003">أمريكا الشمالية</territory>
-			<territory type="005">أمريكا الجنوبية</territory>
-			<territory type="009">أوقيانوسيا</territory>
-			<territory type="011">غرب ا�ريقيا</territory>
-			<territory type="013">أمريكا الوسطى</territory>
-			<territory type="014">شرق ا�ريقيا</territory>
-			<territory type="015">شمال ا�ريقيا</territory>
-			<territory type="017">وسط ا�ريقيا</territory>
-			<territory type="018">جنوب ا�ريقيا</territory>
-			<territory type="019">الأمريكتين</territory>
-			<territory type="021">شمال أمريكا</territory>
-			<territory type="029">الكاريبي</territory>
-			<territory type="030">شرق آسيا</territory>
-			<territory type="034">جنوب آسيا</territory>
-			<territory type="035">جنوب شرق آسيا</territory>
-			<territory type="039">جنوب أوروبا</territory>
-			<territory type="053">أستراليا ونيوزيلندا</territory>
-			<territory type="054">ميلانيزيا</territory>
-			<territory type="057">الجزر الميكرونيزية</territory>
-			<territory type="061">بولينيزيا</territory>
-			<territory type="062">جنوب وسط آسيا</territory>
-			<territory type="142">آسيا</territory>
-			<territory type="143">وسط آسيا</territory>
-			<territory type="145">غرب آسيا</territory>
-			<territory type="150">أوروبا</territory>
-			<territory type="151">شرق أوروبا</territory>
-			<territory type="154">شمال أوروبا</territory>
-			<territory type="155">غرب أوروبا</territory>
-			<territory type="172">كومنولث الدول المستقلة</territory>
-			<territory type="419">أمريكا اللاتينية و الكاريبي</territory>
-			<territory type="AD">أندورا</territory>
-			<territory type="AE">الامارات العربية المتحدة</territory>
-			<territory type="AF">أ�غانستان</territory>
-			<territory type="AG">أنتيجوا وبربودا</territory>
-			<territory type="AI">أنجويلا</territory>
-			<territory type="AL">ألبانيا</territory>
-			<territory type="AM">أرمينيا</territory>
-			<territory type="AN">جزر الأنتيل الهولندية</territory>
-			<territory type="AO">أنجولا</territory>
-			<territory type="AQ">القطب الجنوبي</territory>
-			<territory type="AR">الأرجنتين</territory>
-			<territory type="AS">ساموا الأمريكية</territory>
-			<territory type="AT">النمسا</territory>
-			<territory type="AU">أستراليا</territory>
-			<territory type="AW">آروبا</territory>
-			<territory type="AX">جزر أولان</territory>
-			<territory type="AZ">أذربيجان</territory>
-			<territory type="BA">البوسنة والهرسك</territory>
-			<territory type="BB">بربادوس</territory>
-			<territory type="BD">بنجلاديش</territory>
-			<territory type="BE">بلجيكا</territory>
-			<territory type="BF">بوركينا �اسو</territory>
-			<territory type="BG">بلغاريا</territory>
-			<territory type="BH">البحرين</territory>
-			<territory type="BI">بوروندي</territory>
-			<territory type="BJ">بنين</territory>
-			<territory type="BM">برمودا</territory>
-			<territory type="BN">بروناي</territory>
-			<territory type="BO">بولي�يا</territory>
-			<territory type="BR">البرازيل</territory>
-			<territory type="BS">الباهاما</territory>
-			<territory type="BT">بوتان</territory>
-			<territory type="BV">جزيرة بو�يه</territory>
-			<territory type="BW">بتسوانا</territory>
-			<territory type="BY">روسيا البيضاء</territory>
-			<territory type="BZ">بليز</territory>
-			<territory type="CA">كندا</territory>
-			<territory type="CC">جزر كوكوس</territory>
-			<territory type="CD">جمهورية الكونغو الديمقراطية</territory>
-			<territory type="CF">جمهورية ا�ريقيا الوسطى</territory>
-			<territory type="CG">الكونغو - برازا�يل</territory>
-			<territory type="CH">سويسرا</territory>
-			<territory type="CI">ساحل العاج</territory>
-			<territory type="CK">جزر كوك</territory>
-			<territory type="CL">شيلي</territory>
-			<territory type="CM">الكاميرون</territory>
-			<territory type="CN">الصين</territory>
-			<territory type="CO">كولومبيا</territory>
-			<territory type="CR">كوستاريكا</territory>
-			<territory type="CS">صربيا والجبل الأسود</territory>
-			<territory type="CU">كوبا</territory>
-			<territory type="CV">الرأس الأخضر</territory>
-			<territory type="CX">جزيرة الكريسماس</territory>
-			<territory type="CY">قبرص</territory>
-			<territory type="CZ">جمهورية التشيك</territory>
-			<territory type="DE">ألمانيا</territory>
-			<territory type="DJ">جيبوتي</territory>
-			<territory type="DK">الدانمرك</territory>
-			<territory type="DM">دومينيكا</territory>
-			<territory type="DO">جمهورية الدومينيك</territory>
-			<territory type="DZ">الجزائر</territory>
-			<territory type="EC">الاكوادور</territory>
-			<territory type="EE">استونيا</territory>
-			<territory type="EG">مصر</territory>
-			<territory type="EH">الصحراء الغربية</territory>
-			<territory type="ER">اريتريا</territory>
-			<territory type="ES">أسبانيا</territory>
-			<territory type="ET">اثيوبيا</territory>
-			<territory type="FI">�نلندا</territory>
-			<territory type="FJ">�يجي</territory>
-			<territory type="FK">جزر �وكلاند</territory>
-			<territory type="FM">ميكرونيزيا</territory>
-			<territory type="FO">جزر �ارو</territory>
-			<territory type="FR">�رنسا</territory>
-			<territory type="GA">الجابون</territory>
-			<territory type="GB">المملكة المتحدة</territory>
-			<territory type="GD">جرينادا</territory>
-			<territory type="GE">جورجيا</territory>
-			<territory type="GF">غويانا</territory>
-			<territory type="GH">غانا</territory>
-			<territory type="GI">جبل طارق</territory>
-			<territory type="GL">جرينلاند</territory>
-			<territory type="GM">غامبيا</territory>
-			<territory type="GN">غينيا</territory>
-			<territory type="GP">جوادلوب</territory>
-			<territory type="GQ">غينيا الاستوائية</territory>
-			<territory type="GR">اليونان</territory>
-			<territory type="GS">جورجيا الجنوبية وجزر ساندويتش الجنوبية</territory>
-			<territory type="GT">جواتيمالا</territory>
-			<territory type="GU">جوام</territory>
-			<territory type="GW">غينيا بيساو</territory>
-			<territory type="GY">غيانا</territory>
-			<territory type="HK">هونج كونج الصينية</territory>
-			<territory type="HM">جزيرة هيرد وماكدونالد</territory>
-			<territory type="HN">هندوراس</territory>
-			<territory type="HR">كرواتيا</territory>
-			<territory type="HT">هايتي</territory>
-			<territory type="HU">المجر</territory>
-			<territory type="ID">اندونيسيا</territory>
-			<territory type="IE">أيرلندا</territory>
-			<territory type="IL">اسرائيل</territory>
-			<territory type="IM">جزيرة مان</territory>
-			<territory type="IN">الهند</territory>
-			<territory type="IO">المحيط الهندي البريطاني</territory>
-			<territory type="IQ">العراق</territory>
-			<territory type="IR">ايران</territory>
-			<territory type="IS">أيسلندا</territory>
-			<territory type="IT">ايطاليا</territory>
-			<territory type="JE">جيرسي</territory>
-			<territory type="JM">جامايكا</territory>
-			<territory type="JO">الأردن</territory>
-			<territory type="JP">اليابان</territory>
-			<territory type="KE">كينيا</territory>
-			<territory type="KG">قرغيزستان</territory>
-			<territory type="KH">كمبوديا</territory>
-			<territory type="KI">كيريباتي</territory>
-			<territory type="KM">جزر القمر</territory>
-			<territory type="KN">سانت كيتس وني�يس</territory>
-			<territory type="KP">كوريا الشمالية</territory>
-			<territory type="KR">كوريا الجنوبية</territory>
-			<territory type="KW">الكويت</territory>
-			<territory type="KY">جزر الكايمن</territory>
-			<territory type="KZ">كازاخستان</territory>
-			<territory type="LA">لاوس</territory>
-			<territory type="LB">لبنان</territory>
-			<territory type="LC">سانت لوسيا</territory>
-			<territory type="LI">ليختنشتاين</territory>
-			<territory type="LK">سريلانكا</territory>
-			<territory type="LR">ليبيريا</territory>
-			<territory type="LS">ليسوتو</territory>
-			<territory type="LT">ليتوانيا</territory>
-			<territory type="LU">لوكسمبورج</territory>
-			<territory type="LV">لات�يا</territory>
-			<territory type="LY">ليبيا</territory>
-			<territory type="MA">المغرب</territory>
-			<territory type="MC">موناكو</territory>
-			<territory type="MD">مولدا�يا</territory>
-			<territory type="ME">الجبل الأسود</territory>
-			<territory type="MF">سانت مارتين</territory>
-			<territory type="MG">مدغشقر</territory>
-			<territory type="MH">جزر المارشال</territory>
-			<territory type="MK">مقدونيا</territory>
-			<territory type="ML">مالي</territory>
-			<territory type="MM">ميانمار</territory>
-			<territory type="MN">منغوليا</territory>
-			<territory type="MO">ماكاو الصينية</territory>
-			<territory type="MP">جزر ماريانا الشمالية</territory>
-			<territory type="MQ">مارتينيك</territory>
-			<territory type="MR">موريتانيا</territory>
-			<territory type="MS">مونتسرات</territory>
-			<territory type="MT">مالطا</territory>
-			<territory type="MU">موريشيوس</territory>
-			<territory type="MV">جزر الملدي�</territory>
-			<territory type="MW">ملاوي</territory>
-			<territory type="MX">المكسيك</territory>
-			<territory type="MY">ماليزيا</territory>
-			<territory type="MZ">موزمبيق</territory>
-			<territory type="NA">ناميبيا</territory>
-			<territory type="NC">كاليدونيا الجديدة</territory>
-			<territory type="NE">النيجر</territory>
-			<territory type="NF">جزيرة نور�وك</territory>
-			<territory type="NG">نيجيريا</territory>
-			<territory type="NI">نيكاراجوا</territory>
-			<territory type="NL">هولندا</territory>
-			<territory type="NO">النرويج</territory>
-			<territory type="NP">نيبال</territory>
-			<territory type="NR">نورو</territory>
-			<territory type="NU">نيوي</territory>
-			<territory type="NZ">نيوزيلاندا</territory>
-			<territory type="OM">عمان</territory>
-			<territory type="PA">بنما</territory>
-			<territory type="PE">بيرو</territory>
-			<territory type="PF">بولينيزيا ال�رنسية</territory>
-			<territory type="PG">بابوا غينيا الجديدة</territory>
-			<territory type="PH">ال�يلبين</territory>
-			<territory type="PK">باكستان</territory>
-			<territory type="PL">بولندا</territory>
-			<territory type="PM">سانت بيير وميكولون</territory>
-			<territory type="PN">بتكايرن</territory>
-			<territory type="PR">بورتوريكو</territory>
-			<territory type="PS">�لسطين</territory>
-			<territory type="PT">البرتغال</territory>
-			<territory type="PW">بالاو</territory>
-			<territory type="PY">باراجواي</territory>
-			<territory type="QA">قطر</territory>
-			<territory type="QO">أوقيانوسيا النائية</territory>
-			<territory type="QU">الاتحاد الاوروبي</territory>
-			<territory type="RE">روينيون</territory>
-			<territory type="RO">رومانيا</territory>
-			<territory type="RS">صربيا</territory>
-			<territory type="RU">روسيا</territory>
-			<territory type="RW">رواندا</territory>
-			<territory type="SA">المملكة العربية السعودية</territory>
-			<territory type="SB">جزر سليمان</territory>
-			<territory type="SC">سيشل</territory>
-			<territory type="SD">السودان</territory>
-			<territory type="SE">السويد</territory>
-			<territory type="SG">سنغا�ورة</territory>
-			<territory type="SH">سانت هيلنا</territory>
-			<territory type="SI">سلو�ينيا</territory>
-			<territory type="SJ">س�البارد وجان مايان</territory>
-			<territory type="SK">سلو�اكيا</territory>
-			<territory type="SL">سيراليون</territory>
-			<territory type="SM">سان مارينو</territory>
-			<territory type="SN">السنغال</territory>
-			<territory type="SO">الصومال</territory>
-			<territory type="SR">سورينام</territory>
-			<territory type="ST">ساو تومي وبرينسيبي</territory>
-			<territory type="SV">السل�ادور</territory>
-			<territory type="SY">سوريا</territory>
-			<territory type="SZ">سوازيلاند</territory>
-			<territory type="TC">جزر الترك وجايكوس</territory>
-			<territory type="TD">تشاد</territory>
-			<territory type="TF">المقاطعات الجنوبية ال�رنسية</territory>
-			<territory type="TG">توجو</territory>
-			<territory type="TH">تايلند</territory>
-			<territory type="TJ">طاجكستان</territory>
-			<territory type="TK">توكيلو</territory>
-			<territory type="TL">تيمور الشرقية</territory>
-			<territory type="TM">تركمانستان</territory>
-			<territory type="TN">تونس</territory>
-			<territory type="TO">تونجا</territory>
-			<territory type="TR">تركيا</territory>
-			<territory type="TT">ترينيداد وتوباغو</territory>
-			<territory type="TV">تو�الو</territory>
-			<territory type="TW">تايوان</territory>
-			<territory type="TZ">تانزانيا</territory>
-			<territory type="UA">أوكرانيا</territory>
-			<territory type="UG">أوغندا</territory>
-			<territory type="UM">جزر الولايات المتحدة البعيدة الصغيرة</territory>
-			<territory type="US">الولايات المتحدة الأمريكية</territory>
-			<territory type="UY">أورجواي</territory>
-			<territory type="UZ">أوزبكستان</territory>
-			<territory type="VA">ال�اتيكان</territory>
-			<territory type="VC">سانت �نسنت وغرنادين</territory>
-			<territory type="VE">�نزويلا</territory>
-			<territory type="VG">جزر �رجين البريطانية</territory>
-			<territory type="VI">جزر �رجين الأمريكية</territory>
-			<territory type="VN">�يتنام</territory>
-			<territory type="VU">�انواتو</territory>
-			<territory type="WF">جزر والس و�وتونا</territory>
-			<territory type="WS">ساموا</territory>
-			<territory type="YE">اليمن</territory>
-			<territory type="YT">مايوت</territory>
-			<territory type="ZA">جمهورية جنوب ا�ريقيا</territory>
-			<territory type="ZM">زامبيا</territory>
-			<territory type="ZW">زيمبابوي</territory>
-			<territory type="ZZ">منطقة غير معر�ة</territory>
-		</territories>
-		<variants>
-			<variant type="1901">التهجئة الألمانية التقليدية</variant>
-			<variant type="1996">التهجئة الألمانية لعام 1996</variant>
-			<variant type="AREVELA">أرمنية شرقية</variant>
-			<variant type="AREVMDA">أرمنية غربية</variant>
-			<variant type="BAKU1926">الأبجدية التركية اللاتينية الموحدة</variant>
-			<variant type="MONOTON">أحادي النغمة</variant>
-			<variant type="NEDIS">لهجة ناتيسون</variant>
-			<variant type="POLYTON">متعدد النغمات</variant>
-			<variant type="POSIX">حاسب آلي</variant>
-			<variant type="REVISED">تهجئة تم مراجعتها</variant>
-			<variant type="VALENCIA">بلنسية</variant>
-		</variants>
-		<keys>
-			<key type="calendar">التقويم</key>
-			<key type="collation">الترتيب</key>
-			<key type="currency">العملات</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">الترتيب الصيني التقليدي - Big5</type>
-			<type type="buddhist" key="calendar">التقويم البوذي</type>
-			<type type="chinese" key="calendar">التقويم الصيني</type>
-			<type type="direct" key="collation">ترتيب مباشر</type>
-			<type type="gb2312han" key="collation">الترتيب الصيني المبسط - GB2312</type>
-			<type type="gregorian" key="calendar">التقويم الميلادي</type>
-			<type type="hebrew" key="calendar">التقويم العبري</type>
-			<type type="islamic" key="calendar">التقويم الهجري</type>
-			<type type="islamic-civil" key="calendar">تقويم اسلامي مدني</type>
-			<type type="japanese" key="calendar">التقويم الياباني</type>
-			<type type="phonebook" key="collation">ترتيب دليل الهات�</type>
-			<type type="traditional" key="collation">ترتيب تقليدي</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">النظام المتري</measurementSystemName>
-			<measurementSystemName type="US">النظام الأمريكي</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">اللغة: {0}</codePattern>
-			<codePattern type="script">نظام الكتابة: {0}</codePattern>
-			<codePattern type="territory">المنطقة: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064B-\u0652 ء-غ �-ي]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u0640 \u200C-\u200F]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraAbbr>
-						<era type="0">التقويم البوذي</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">توت</month>
-							<month type="2">بابه</month>
-							<month type="3">هاتور</month>
-							<month type="4">كيهك</month>
-							<month type="5">طوبة</month>
-							<month type="6">أمشير</month>
-							<month type="7">برمهات</month>
-							<month type="8">برمودة</month>
-							<month type="9">بشنس</month>
-							<month type="10">بؤونة</month>
-							<month type="11">أبيب</month>
-							<month type="12">مسرى</month>
-							<month type="13">نسيئ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">توت</month>
-							<month type="2">بابه</month>
-							<month type="3">هاتور</month>
-							<month type="4">كيهك</month>
-							<month type="5">طوبة</month>
-							<month type="6">أمشير</month>
-							<month type="7">برمهات</month>
-							<month type="8">برمودة</month>
-							<month type="9">بشنس</month>
-							<month type="10">بؤونة</month>
-							<month type="11">أبيب</month>
-							<month type="12">مسرى</month>
-							<month type="13">نسيئ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">مسكريم</month>
-							<month type="2">تكمت</month>
-							<month type="3">هدار</month>
-							<month type="4">تهساس</month>
-							<month type="5">تر</month>
-							<month type="6">يكتت</month>
-							<month type="7">مجابيت</month>
-							<month type="8">ميازيا</month>
-							<month type="9">جنبت</month>
-							<month type="10">سين</month>
-							<month type="11">هامل</month>
-							<month type="12">نهاس</month>
-							<month type="13">باجمن</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">مسكريم</month>
-							<month type="2">تكمت</month>
-							<month type="3">هدار</month>
-							<month type="4">تهساس</month>
-							<month type="5">تر</month>
-							<month type="6">يكتت</month>
-							<month type="7">مجابيت</month>
-							<month type="8">ميازيا</month>
-							<month type="9">جنبت</month>
-							<month type="10">سين</month>
-							<month type="11">هامل</month>
-							<month type="12">نهاس</month>
-							<month type="13">باجمن</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">يناير</month>
-							<month type="2">�براير</month>
-							<month type="3">مارس</month>
-							<month type="4">أبريل</month>
-							<month type="5">مايو</month>
-							<month type="6">يونيو</month>
-							<month type="7">يوليو</month>
-							<month type="8">أغسطس</month>
-							<month type="9">سبتمبر</month>
-							<month type="10">أكتوبر</month>
-							<month type="11">نو�مبر</month>
-							<month type="12">ديسمبر</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">يناير</month>
-							<month type="2">�براير</month>
-							<month type="3">مارس</month>
-							<month type="4">أبريل</month>
-							<month type="5">مايو</month>
-							<month type="6">يونيو</month>
-							<month type="7">يوليو</month>
-							<month type="8">أغسطس</month>
-							<month type="9">سبتمبر</month>
-							<month type="10">أكتوبر</month>
-							<month type="11">نو�مبر</month>
-							<month type="12">ديسمبر</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ÙŠ</month>
-							<month type="2">Ù�</month>
-							<month type="3">Ù…</month>
-							<month type="4">Ø£</month>
-							<month type="5">Ùˆ</month>
-							<month type="6">Ù†</month>
-							<month type="7">Ù„</month>
-							<month type="8">غ</month>
-							<month type="9">س</month>
-							<month type="10">Ùƒ</month>
-							<month type="11">ب</month>
-							<month type="12">د</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">أحد</day>
-							<day type="mon">إثنين</day>
-							<day type="tue">ثلاثاء</day>
-							<day type="wed">أربعاء</day>
-							<day type="thu">خميس</day>
-							<day type="fri">جمعة</day>
-							<day type="sat">سبت</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">الأحد</day>
-							<day type="mon">الإثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Ø­</day>
-							<day type="mon">Ù†</day>
-							<day type="tue">Ø«</day>
-							<day type="wed">ر</day>
-							<day type="thu">Ø®</day>
-							<day type="fri">ج</day>
-							<day type="sat">س</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">الربع الأول</quarter>
-							<quarter type="2">الربع الثاني</quarter>
-							<quarter type="3">الربع الثالث</quarter>
-							<quarter type="4">الربع الرابع</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">الربع الأول</quarter>
-							<quarter type="2">الربع الثاني</quarter>
-							<quarter type="3">الربع الثالث</quarter>
-							<quarter type="4">الربع الرابع</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">Ù¡</quarter>
-							<quarter type="2">Ù¢</quarter>
-							<quarter type="3">Ù£</quarter>
-							<quarter type="4">Ù¤</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ص</am>
-				<pm>Ù…</pm>
-				<eras>
-					<eraNames>
-						<era type="0">قبل الميلاد</era>
-						<era type="1">ميلادي</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Ù‚.Ù…</era>
-						<era type="1">Ù…</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE، d MMMM، y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM، y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd�/MM�/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d�/M�/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>zzzz h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>z h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/�M</dateFormatItem>
-						<dateFormatItem id="MEd">E، d-M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd�/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M�/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE، d/�M/�yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE، d MMMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM�/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM، y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">v h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">v h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">v h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">v h a - h a</greatestDifference>
-							<greatestDifference id="h">v h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d�/M - d�/M</greatestDifference>
-							<greatestDifference id="M">d�/M - d�/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E، d/�M -� E، d/�M</greatestDifference>
-							<greatestDifference id="M">E، d/�M - E، d/�M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E، d - E، d MMM</greatestDifference>
-							<greatestDifference id="M">E، d MMM - E، d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M�/yyyy - M�/yyyy</greatestDifference>
-							<greatestDifference id="y">M�/yyyy - M�/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d�/M�/yyyy - d�/M�/yyyy</greatestDifference>
-							<greatestDifference id="M">d�/M�/yyyy - d�/M�/yyyy</greatestDifference>
-							<greatestDifference id="y">d�/M�/yyyy - d�/M�/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E، dd�/MM�/yyyy - E، dd�/MM�/yyyy</greatestDifference>
-							<greatestDifference id="M">E، d�/M�/yyyy - E، d�/M�/yyyy</greatestDifference>
-							<greatestDifference id="y">E، d�/M�/yyyy - E، d�/M�/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM - MMM، y</greatestDifference>
-							<greatestDifference id="y">MMM، y - MMM، y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM، y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM، yyyy</greatestDifference>
-							<greatestDifference id="y">d MMM، y - d MMM، y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E، d - �E، d MMM، yyyy</greatestDifference>
-							<greatestDifference id="M">E، d MMM - E، d MMM، y</greatestDifference>
-							<greatestDifference id="y">E، d MMM، y - E، d MMM، y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM �– MM�-yyyy�</greatestDifference>
-							<greatestDifference id="y">MM -� MM–�yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>العصر</displayName>
-					</field>
-					<field type="year">
-						<displayName>السنة</displayName>
-					</field>
-					<field type="month">
-						<displayName>الشهر</displayName>
-					</field>
-					<field type="week">
-						<displayName>الأسبوع</displayName>
-					</field>
-					<field type="day">
-						<displayName>يوم</displayName>
-						<relative type="-1">أمس</relative>
-						<relative type="0">اليوم</relative>
-						<relative type="1">غدًا</relative>
-						<relative type="2">بعد الغد</relative>
-					</field>
-					<field type="weekday">
-						<displayName>اليوم</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ص/م</displayName>
-					</field>
-					<field type="hour">
-						<displayName>الساعات</displayName>
-					</field>
-					<field type="minute">
-						<displayName>الدقائق</displayName>
-					</field>
-					<field type="second">
-						<displayName>الثواني</displayName>
-					</field>
-					<field type="zone">
-						<displayName>التوقيت</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">تشري</month>
-							<month type="2">مرحشوان</month>
-							<month type="3">كيسلو</month>
-							<month type="4">طي�ت</month>
-							<month type="5">شباط</month>
-							<month type="6">آذار الأول</month>
-							<month type="7">آذار الثاني</month>
-							<month type="8">نيسان</month>
-							<month type="9">أيار</month>
-							<month type="10">سي�ان</month>
-							<month type="11">تموز</month>
-							<month type="12">آب</month>
-							<month type="13">أيلول</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">تشري</month>
-							<month type="2">مرحشوان</month>
-							<month type="3">كيسلو</month>
-							<month type="4">طي�ت</month>
-							<month type="5">شباط</month>
-							<month type="6">آذار الأول</month>
-							<month type="7">آذار الثاني</month>
-							<month type="8">نيسان</month>
-							<month type="9">أيار</month>
-							<month type="10">سي�ان</month>
-							<month type="11">تموز</month>
-							<month type="12">آب</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">محرم</month>
-							<month type="2">ص�ر</month>
-							<month type="3">ربيع الأول</month>
-							<month type="4">ربيع الآخر</month>
-							<month type="5">جمادى الأولى</month>
-							<month type="6">جمادى الآخرة</month>
-							<month type="7">رجب</month>
-							<month type="8">شعبان</month>
-							<month type="9">رمضان</month>
-							<month type="10">شوال</month>
-							<month type="11">ذو القعدة</month>
-							<month type="12">ذو الحجة</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ù…</month>
-							<month type="2">ص</month>
-							<month type="3">ر</month>
-							<month type="4">ر</month>
-							<month type="5">ج</month>
-							<month type="6">ج</month>
-							<month type="7">ر</month>
-							<month type="8">Ø´</month>
-							<month type="9">ر</month>
-							<month type="10">Ø´</month>
-							<month type="11">Ø°</month>
-							<month type="12">Ø°</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>ص</am>
-				<pm>Ù…</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">هـ</era>
-					</eraAbbr>
-				</eras>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d�/M</dateFormatItem>
-						<dateFormatItem id="yM">M�/yyyy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="japanese">
-				<eras>
-					<eraAbbr>
-						<era type="0">تيكا</era>
-						<era type="1">هاكتشي</era>
-						<era type="2">هاكهو</era>
-						<era type="3">شتشو</era>
-						<era type="4">تيهو</era>
-						<era type="5">كيين</era>
-						<era type="6">وادو</era>
-						<era type="7">رييكي</era>
-						<era type="8">يورو</era>
-						<era type="9">جينكي</era>
-						<era type="10">تمبيو</era>
-						<era type="11">تمبيو-كامبو</era>
-						<era type="12">تمبيو-شوهو</era>
-						<era type="13">تمبيو-هوجي</era>
-						<era type="14">تم�و-جينجو</era>
-						<era type="15">جينجو-كيين</era>
-						<era type="16">هوكي</era>
-						<era type="17">تن-أو</era>
-						<era type="18">إنرياكو</era>
-						<era type="19">ديدو</era>
-						<era type="20">كونين</era>
-						<era type="21">تنتشو</era>
-						<era type="22">شووا</era>
-						<era type="23">كاجو</era>
-						<era type="24">نينجو</era>
-						<era type="25">سيكو</era>
-						<era type="26">تنان</era>
-						<era type="27">جوجان</era>
-						<era type="28">جينكيي</era>
-						<era type="29">نينا</era>
-						<era type="30">كامبيو</era>
-						<era type="31">شوتاي</era>
-						<era type="32">انجي</era>
-						<era type="33">انتشو</era>
-						<era type="34">شوهيي</era>
-						<era type="35">تنجيو</era>
-						<era type="36">تنرياكو</era>
-						<era type="37">تنتوكو</era>
-						<era type="38">أووا</era>
-						<era type="39">كوهو</era>
-						<era type="40">آنا</era>
-						<era type="41">تينروكو</era>
-						<era type="42">تن-ان</era>
-						<era type="43">جوجن</era>
-						<era type="44">تنجن</era>
-						<era type="45">إيكان</era>
-						<era type="46">كانا</era>
-						<era type="47">اي-ان</era>
-						<era type="48">ايسو</era>
-						<era type="49">شورياكو</era>
-						<era type="50">تشوتوكو</era>
-						<era type="51">تشوهو</era>
-						<era type="52">كانكو</era>
-						<era type="53">تشووا</era>
-						<era type="54">كانين</era>
-						<era type="55">جاين</era>
-						<era type="56">مانجو</era>
-						<era type="57">تشوجين</era>
-						<era type="58">تشورياكو</era>
-						<era type="59">تشوكيو</era>
-						<era type="60">كانتوكو</era>
-						<era type="61">ايشو</era>
-						<era type="62">تينجي</era>
-						<era type="63">كوهيي</era>
-						<era type="64">جيرياكو</era>
-						<era type="65">انكيو</era>
-						<era type="66">شوهو</era>
-						<era type="67">شورياكو</era>
-						<era type="68">ايهو</era>
-						<era type="69">أوتوكو</era>
-						<era type="70">كانجي</era>
-						<era type="71">كاهو</era>
-						<era type="72">ايتشو</era>
-						<era type="73">شوتوكو</era>
-						<era type="74">كووا</era>
-						<era type="75">تشوجي</era>
-						<era type="76">كاشو</era>
-						<era type="77">تنين</era>
-						<era type="78">تن-اي</era>
-						<era type="79">ايكيو</era>
-						<era type="80">جن-اي</era>
-						<era type="81">هوان</era>
-						<era type="82">تنجي</era>
-						<era type="83">ديجي</era>
-						<era type="84">تنشو</era>
-						<era type="85">تشوشو</era>
-						<era type="86">هوين</era>
-						<era type="87">ايجي</era>
-						<era type="88">كوجي</era>
-						<era type="89">تنيو</era>
-						<era type="90">كيوان</era>
-						<era type="91">نينبيي</era>
-						<era type="92">كيوجو</era>
-						<era type="93">هجين</era>
-						<era type="94">هيجي</era>
-						<era type="95">ايرياكو</era>
-						<era type="96">أوهو</era>
-						<era type="97">تشوكان</era>
-						<era type="98">ايمان</era>
-						<era type="99">نين-ان</era>
-						<era type="100">كاو</era>
-						<era type="101">شون</era>
-						<era type="102">أنجين</era>
-						<era type="103">جيشو</era>
-						<era type="104">يووا</era>
-						<era type="105">جيي</era>
-						<era type="106">جنريوكو</era>
-						<era type="107">بنجي</era>
-						<era type="108">كنكيو</era>
-						<era type="109">شوجي</era>
-						<era type="110">كنين</era>
-						<era type="111">جنكيو</era>
-						<era type="112">كن-اي</era>
-						<era type="113">شوجن</era>
-						<era type="114">كنرياكو</era>
-						<era type="115">كنبو</era>
-						<era type="116">شوكيو</era>
-						<era type="117">جو</era>
-						<era type="118">جيننين</era>
-						<era type="119">كروكو</era>
-						<era type="120">أنتيي</era>
-						<era type="121">كنكي</era>
-						<era type="122">جويي</era>
-						<era type="123">تمبكو</era>
-						<era type="124">بنرياكو</era>
-						<era type="125">كاتيي</era>
-						<era type="126">رياكنين</era>
-						<era type="127">ان-أو</era>
-						<era type="128">نينجي</era>
-						<era type="129">كنجين</era>
-						<era type="130">هوجي</era>
-						<era type="131">كنتشو</era>
-						<era type="132">كوجن</era>
-						<era type="133">شوكا</era>
-						<era type="134">شوجن</era>
-						<era type="135">بن-أو</era>
-						<era type="136">كوتشو</era>
-						<era type="137">بن-اي</era>
-						<era type="138">كنجي</era>
-						<era type="139">كوان</era>
-						<era type="140">شوو</era>
-						<era type="141">اينين</era>
-						<era type="142">شوان</era>
-						<era type="143">كنجن</era>
-						<era type="144">كجن</era>
-						<era type="145">توكجي</era>
-						<era type="146">انكي</era>
-						<era type="147">أوتشو</era>
-						<era type="148">شووا</era>
-						<era type="149">بنبو</era>
-						<era type="150">جنو</era>
-						<era type="151">جنكيو</era>
-						<era type="152">شوتشو</era>
-						<era type="153">كريكي</era>
-						<era type="154">جنتكو</era>
-						<era type="155">جنكو</era>
-						<era type="156">كمو</era>
-						<era type="157">إنجن</era>
-						<era type="158">كوككو</era>
-						<era type="159">شوهي</era>
-						<era type="160">كنتكو</era>
-						<era type="161">بنتشو</era>
-						<era type="162">تنجو</era>
-						<era type="163">كورياكو</era>
-						<era type="164">كووا</era>
-						<era type="165">جنتشو</era>
-						<era type="166">مييتكو</era>
-						<era type="167">كاكي</era>
-						<era type="168">كو</era>
-						<era type="169">مييتكو</era>
-						<era type="170">أويي</era>
-						<era type="171">شوتشو</era>
-						<era type="172">ايكيو</era>
-						<era type="173">ككيتسو</era>
-						<era type="174">بن-أن</era>
-						<era type="175">هوتكو</era>
-						<era type="176">كيوتكو</era>
-						<era type="177">كوشو</era>
-						<era type="178">تشوركو</era>
-						<era type="179">كنشو</era>
-						<era type="180">بنشو</era>
-						<era type="181">أونين</era>
-						<era type="182">بنمي</era>
-						<era type="183">تشوكيو</era>
-						<era type="184">انتكو</era>
-						<era type="185">ميو</era>
-						<era type="186">بنكي</era>
-						<era type="187">ايشو</era>
-						<era type="188">تييي</era>
-						<era type="189">كيوركو</era>
-						<era type="190">تنمن</era>
-						<era type="191">كوجي</era>
-						<era type="192">ايركو</era>
-						<era type="193">جنكي</era>
-						<era type="194">تنشو</era>
-						<era type="195">بنركو</era>
-						<era type="196">كيتشو</era>
-						<era type="197">جنوا</era>
-						<era type="198">كان-اي</era>
-						<era type="199">شوهو</era>
-						<era type="200">كيان</era>
-						<era type="201">شوو</era>
-						<era type="202">ميرياكو</era>
-						<era type="203">منجي</era>
-						<era type="204">كنبن</era>
-						<era type="205">انبو</era>
-						<era type="206">تنوا</era>
-						<era type="207">جوكيو</era>
-						<era type="208">جنركو</era>
-						<era type="209">هويي</era>
-						<era type="210">شوتكو</era>
-						<era type="211">كيوهو</era>
-						<era type="212">جنبن</era>
-						<era type="213">كنبو</era>
-						<era type="214">انكيو</era>
-						<era type="215">كان-ان</era>
-						<era type="216">هورياكو</era>
-						<era type="217">مييوا</era>
-						<era type="218">ان-اي</era>
-						<era type="219">تنمي</era>
-						<era type="220">كنسي</era>
-						<era type="221">كيووا</era>
-						<era type="222">بنكا</era>
-						<era type="223">بنسي</era>
-						<era type="224">تنبو</era>
-						<era type="225">كوكا</era>
-						<era type="226">كاي</era>
-						<era type="227">أنسي</era>
-						<era type="228">من-ان</era>
-						<era type="229">بنكيو</era>
-						<era type="230">جنجي</era>
-						<era type="231">كيو</era>
-						<era type="232">ميجي</era>
-						<era type="233">تيشو</era>
-						<era type="234">شووا</era>
-						<era type="235">هيسي</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�ر�ردن</month>
-							<month type="2">أذربيهشت</month>
-							<month type="3">خرداد</month>
-							<month type="4">تار</month>
-							<month type="5">مرداد</month>
-							<month type="6">شهر�ار</month>
-							<month type="7">مهر</month>
-							<month type="8">آيان</month>
-							<month type="9">آذر</month>
-							<month type="10">دي</month>
-							<month type="11">بهمن</month>
-							<month type="12">اس�ندار</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�ر�ردن</month>
-							<month type="2">أذربيهشت</month>
-							<month type="3">خرداد</month>
-							<month type="4">تار</month>
-							<month type="5">مرداد</month>
-							<month type="6">شهر�ار</month>
-							<month type="7">مهر</month>
-							<month type="8">آيان</month>
-							<month type="9">آذر</month>
-							<month type="10">دي</month>
-							<month type="11">بهمن</month>
-							<month type="12">اس�ندار</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">ه�.ش</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>غير معرو�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>روثيرا</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>بالمير</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>القطب الجنوبي</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>سايووا</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>ماوسون</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>دا�يز</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>�وستوك</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>كاساي</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>دي مونت دو رو�يل</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>ماك موردو</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>ريو جالييوس</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>ميندوزا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>سان خوان</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>أشوا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>لا ريوجا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>سان لويس</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>كاتاماركا</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>جوجو</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>تاكمان</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>كوردوبا</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>بوينوس أيرس</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>برثا</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>دارون</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>استراليا(توقيت أدليادا</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>بروكن هيل</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>ميلبورن</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>هوبارت</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>ليندمان</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>سيدني</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>برسيبان</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>لورد هاو</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>ايرونبي</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>ريوبرانكو</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>بورتو �يلو</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>باو �يستا</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>ماناوس</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>كيابا</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>كومبو جراند</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>بلم</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>أروجوانيا</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>ساو باولو</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>باهيا</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>�ورتاليزا</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>ماشيو</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>ريسي�</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>نوروناه</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>داوسان</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>وايت هورس</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>اينو�يك</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>�انكو�ر</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>داوسن كريك</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>يلوني�</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>ايدمونتون</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>سو�ت كارنت</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>كامبرديج باي</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>ريجينا</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>وينيبيج</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>راني ري�ر</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>رانكن انلت</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>كورال هاربر</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ثندر باي</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نيبيجون</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>تورونتو</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>مونتريال</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>اكويلت</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>بانجينتينج</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>وينكتون</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>هالي�اكس</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>جوس باي</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>جلاس باي</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>سانت جونس</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>كينشاسا</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>لومبباشا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>استر</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>سانتيجو</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>كاشجار</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>أرومكي</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>تشونجكينج</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>العالمية</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>هاربين</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>جلاباجوس</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>جواياكيل</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>كناري</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>سيتا</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>مدريد</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ترك</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>باناب</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>كوسرا</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>لندن</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>جيرونسى</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>ثيل</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>جودثاب</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>سكورسبيسند</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>دانمرك شا�ن</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>جاكرتا</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>بونتيانك</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>ماكسار</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>جايابيورا</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>إيطاليا</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>جيرسى</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>اندربيرج</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>كيريتي ماتي</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>تاراوا</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>أكتاو</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>أورال</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>أكتوب</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>كيزيلوردا</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>ألماتي</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>الجبل الأسود</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>كواجالين</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>ماجورو</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>باماكو</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>هو�د</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>آلانباتار</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>تشوبالسان</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>تيخوانا</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>هيرموسيلو</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>مازاتلان</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>تشيواوا</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>مونتيري</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>مدينة المكسيك</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>ميريدا</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>كانكن</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>كوالالمبور</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>كيشينج</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>تشاثام</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>أوكلاند</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>تاهيتي</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>ماركيساس</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>جامبير</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>أزورس</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>ماديرا</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>ليسبون</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>صربيا</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>كالينجراد</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>موسكو</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>�ولوجراد</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>سمراء</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>يكاترنبيرج</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>أومسك</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>نو�وسبيرسك</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>كراسنويارسك</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ايركيتسك</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ياكتسك</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>�لادي�وستك</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>سكالين</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>مجادن</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>كامتشاتكا</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>أندير</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>لونجيربن</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>أوزجرود</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>كيي�</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>سيم�روبول</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زابوروزي</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>ميدواي</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جونستون</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>واك</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>أداك</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>نوم</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>هونولولو</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>أنشوراج</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ياكوتات</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>جوني</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>لوس انجلوس</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>بويس</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>�ينكس</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>شيبروك</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>دن�ر</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>نيو ساليم</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>سنتر</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>شيكاغو</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>مينوميني</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>�ينسينس</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>بيترسبرغ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>كونكس</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>ويناماك</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>مارنجو</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>إنديانابوليس</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>لويس �يل</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>�ي�اي</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>مونتيسيلو</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>ديترويت</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>نيويورك</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>سمرقند</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>طشقند</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###;#,##0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤ #,##0.00-</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="many">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-			<unitPattern count="two">{0} {1}</unitPattern>
-			<unitPattern count="zero">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>بيستا أندوري</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>درهم إماراتي</displayName>
-				<symbol>د.إ.�</symbol>
-			</currency>
-			<currency type="AFA">
-				<displayName>أ�غاني - 1927-2002</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>أ�غاني</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>ليك ألباني</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>درام أرميني</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>جلدر هولندي [ANG]</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>كوانزا أنجولي</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>كوانزا أنجولي - 1977-1990</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>كوانزا أنجولي جديدة - 1990-2000</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>كوانزا أنجولي معدلة - 1995 - 1999</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>استرال أرجنتيني</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>بيزو أرجنتيني - 1983-1985</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>بيزو أرجنتيني</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>شلن نمساوي</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>دولار أسترالي</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>جلدر أروبي</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>مانات أذريبجاني</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>دينار البوسنة والهرسك</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>مارك البوسنة والهرسك قابل للتحويل</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>دولار بربادوسي</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>تاكا بنجلاديشي</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>(�رنك بلجيكي قابل للتحويل)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>�رنك بلجيكي</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>(�رنك بلجيكي مالي)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>لي� بلغاري</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>لي� بلغاري جديد</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>دينار بحريني</displayName>
-				<symbol>د.ب.�</symbol>
-			</currency>
-			<currency type="BIF">
-				<displayName>�رنك بروندي</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>دولار برمودي</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>دولار بروناي</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>بولي�اريو</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>بيزو بولي�ي</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>م�دول بولي�ي</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>نو�و كروزايرو برازيلي - 1967-1986</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>كروزادو برازيلي</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>كروزايرو برازيلي - 1990-1993</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ريال برازيلي</displayName>
-				<symbol>ر.ب.�</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>دولار باهامي</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>نولتوم بوتاني</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>كيات بورمي</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>بولا بتسواني</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>روبل بيلاروسي جديد - 1994-1999</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>روبل بيلاروسي</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>دولار بليزي</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>دولار كندي</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>�نك كونغولي</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>�رنك سويسري</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>بيزو شيلي</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>يوان صيني</displayName>
-				<symbol>ي.ص</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>بيزو كولومبي</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>كولن كوستا ريكي</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>دينار صربي</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>كرونة تشيكوسلو�اكيا</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>بيزو كوبي</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>اسكودو الرأس الخضراء</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>جنيه قبرصي</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>كرونة تشيكية</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>أوستمارك ألماني شرقي</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>مارك ألماني</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>�رنك جيبوتي</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>كرونة دانماركي</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>بيزو الدومنيكان</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>دينار جزائري</displayName>
-				<symbol>د.ج.�</symbol>
-			</currency>
-			<currency type="EEK">
-				<displayName>كرونة استونية</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>جنيه مصري</displayName>
-				<symbol>ج.م.�</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>ناك�ا أريتري</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>بيزيتا إسباني</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>بير أثيوبي</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>يورو</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>ماركا �نلندي</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>دولار �يجي</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>جنيه جزر �وكلاند</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>�رنك �رنسي</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>جنيه إسترليني</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>لارى جورجي</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>سيدي غاني</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>جنيه جبل طارق</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>دلاسي جامبي</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>�رنك غينيا</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>سيلي غينيا</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>اكويل جونينا غينيا الاستوائيّة</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>دراخما يوناني</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>كوتزال جواتيمالا</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>اسكود برتغالي غينيا</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>بيزو غينيا بيساو</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>دولار غيانا</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>دولار هونج كونج</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>ليمبيرا هنداروس</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>دينار كرواتي</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>كونا كرواتي</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>جوردى هايتي</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>�ورينت مجري</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>روبية إندونيسية</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>جنيه إيرلندي</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>جنيه إسرائيلي</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>شيكل إسرائيلي جديد</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>روبيه هندي</displayName>
-				<symbol>ر.ه.�</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>دينار عراقي</displayName>
-				<symbol>د.ع.�</symbol>
-			</currency>
-			<currency type="IRR">
-				<displayName>ريال إيراني</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>كرونه أيسلندي</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>ليرة إيطالية</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>دولار جامايكي</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>دينار أردني</displayName>
-				<symbol>د.أ.�</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>ين ياباني</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>شلن كينيي</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>سوم قيرغستاني</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>رييال كمبودي</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>�رنك جزر القمر</displayName>
-				<symbol>�.ج.ق.�</symbol>
-			</currency>
-			<currency type="KPW">
-				<displayName>وون كوريا الشمالية</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>وون كوريا الجنوبية</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>دينار كويتي</displayName>
-				<symbol>د.ك.�</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName>دولار جزر كيمن</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>تينغ كازاخستاني</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>كيب لاوسي</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>جنية لبناني</displayName>
-				<symbol>ل.ل.�</symbol>
-			</currency>
-			<currency type="LKR">
-				<displayName>روبية سريلانكية</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>دولار ليبيري</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>لوتي ليسوتو</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>الليتا الليتوانية</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>تالوناس ليتواني</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>�رنك لوكسمبرج قابل للتحويل</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>�رنك لوكسمبرج</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>�رنك لوكسمبرج المالي</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>لاتس لات�يا</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>روبل لات�يا</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>دينار ليبي</displayName>
-				<symbol>د.ل.�</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>درهم مغربي</displayName>
-				<symbol>د.م.�</symbol>
-			</currency>
-			<currency type="MAF">
-				<displayName>�رنك مغربي</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>لاو مولدو�ي</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>أرياري مدغشقر</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>�رنك مدغشقر</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>دينار مقدوني</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>�رنك مالي</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>كيات ميانمار</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>توغروغ منغولي</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>باتاكا ماكاوي</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>أوقية موريتانية</displayName>
-				<symbol>أ.م.�</symbol>
-			</currency>
-			<currency type="MTL">
-				<displayName>ليرة مالطية</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>جنيه مالطي</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>روبي موريشي</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>رو�يه جزر المالدي�</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>كواشا مالاوي</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>بيزو مكسيكي</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>بيزو �ضي مكسيكي - 1861-1992</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>رينغيت ماليزي</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>اسكود موزمبيقي</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>دولار نامبيا</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>نايرا نيجيري</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>كوردوبة نيكاراجوا</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>جلدر هولندي</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>كرونة نرويجية</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>روبية نيبالي</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>دولار نيوزيلندي</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>ريال عماني</displayName>
-				<symbol>ر.ع.�</symbol>
-			</currency>
-			<currency type="PAB">
-				<displayName>بالبوا بنمي</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>كينا بابوا غينيا الجديدة</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>بيزو �لبيني</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>روبية باكستاني</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>زلوتي بولندي</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>زلوتي بولندي - 1950-1995</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>اسكود برتغالي</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>جواراني باراجواي</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>ريال قطري</displayName>
-				<symbol>ر.ق.�</symbol>
-			</currency>
-			<currency type="RHD">
-				<displayName>دولار روديسي</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>ليو روماني قديم</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>روبل روسي</displayName>
-				<symbol>ر.ر.�</symbol>
-			</currency>
-			<currency type="RUR">
-				<displayName>روبل روسي - 1991-1998</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>�رنك رواندي</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>ريال سعودي</displayName>
-				<symbol>ر.س.�</symbol>
-			</currency>
-			<currency type="SBD">
-				<displayName>دولار جزر سليمان</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>روبية سيشيلية</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>دينار سوداني</displayName>
-				<symbol>د.س.�</symbol>
-			</currency>
-			<currency type="SDP">
-				<displayName>جنيه سوداني</displayName>
-				<symbol>ج.س.�</symbol>
-			</currency>
-			<currency type="SEK">
-				<displayName>كرونة سويدية</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>دولار سنغا�وري</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>جنيه سانت هيلين</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>تولار سلو�يني</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>كرونة سلو�اكية</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>ليون سيراليوني</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>شلن صومالي</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>دولار سورينامي</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>جلدر سورينامي</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>دوبرا ساو تومي وبرينسيبي</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>روبل سو�يتي</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>كولون سل�ادوري</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>جنيه سوري</displayName>
-				<symbol>ل.س.�</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>ليلانجيني سوازيلندي</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>باخت تايلاندي</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>روبل طاجيكستاني</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>سوموني طاجيكستاني</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>مانات تركمنستاني</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>دينارتونسي</displayName>
-				<symbol>د.ت.�</symbol>
-			</currency>
-			<currency type="TPE">
-				<displayName>اسكود تيموري</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>ليرة تركي</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ليرة تركية جديدة</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>دولار ترينداد وتوباجو</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>دولار تايواني</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>شلن تنزاني</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>هري�نيا أوكراني</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>شلن أوغندي - 1966-1987</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>شلن أوغندي</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>دولار أمريكي</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>دولار أمريكي (اليوم التالي)�</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>دولار أمريكي (ن�س اليوم)�</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>بيزو أوروجواي - 1975-1993</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>سوم أوزبكستاني</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>بولي�ار �نزويلي</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>دونج �يتنامي</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>�رنك أ�ريقي</displayName>
-				<symbol>�.ا.�</symbol>
-			</currency>
-			<currency type="XAG">
-				<displayName>�ضة</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>ذهب</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>الوحدة الأوروبية المركبة</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>الوحدة المالية الأوروبية</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>الوحدة الحسابية الأوروبية</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>XBD</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>دولار شرق الكاريبي</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>حقوق السحب الخاصة</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>وحدة النقد الأوروبية</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>�رنك �رنسي ذهبي</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>XFU</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>البلاتين</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>كود اختبار العملة</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>بدون عملة</displayName>
-				<symbol>***</symbol>
-			</currency>
-			<currency type="YDD">
-				<displayName>دينار يمني</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>ريال يمني</displayName>
-				<symbol>ر.ي.�</symbol>
-			</currency>
-			<currency type="YUD">
-				<displayName>دينار يوغسلا�ي</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>دينار يوغسلا�ي قابل للتحويل</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>راند جنوب أ�ريقيا -مالي</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>راند جنوب أ�ريقيا</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>كواشا زامبي</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>زائير زائيري جديد</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>زائير زائيري</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>دولار زمبابوي</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} أيام</unitPattern>
-			<unitPattern count="many">{0} يوماً</unitPattern>
-			<unitPattern count="one">يوم</unitPattern>
-			<unitPattern count="other">{0} يوم</unitPattern>
-			<unitPattern count="two">يومان</unitPattern>
-			<unitPattern count="zero">لا أيام</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} ساعات</unitPattern>
-			<unitPattern count="many">{0} ساعةً</unitPattern>
-			<unitPattern count="one">ساعة</unitPattern>
-			<unitPattern count="other">{0} ساعة</unitPattern>
-			<unitPattern count="two">ساعتان</unitPattern>
-			<unitPattern count="zero">لا ساعات</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} دقائق</unitPattern>
-			<unitPattern count="many">{0} دقيقةً</unitPattern>
-			<unitPattern count="one">دقيقة</unitPattern>
-			<unitPattern count="other">{0} دقيقة</unitPattern>
-			<unitPattern count="two">دقيقتان</unitPattern>
-			<unitPattern count="zero">لا دقائق</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} أشهر</unitPattern>
-			<unitPattern count="many">{0} شهراً</unitPattern>
-			<unitPattern count="one">شهر</unitPattern>
-			<unitPattern count="other">{0} شهر</unitPattern>
-			<unitPattern count="two">شهران</unitPattern>
-			<unitPattern count="zero">لا أشهر</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} ثوان</unitPattern>
-			<unitPattern count="many">{0} ثانيةً</unitPattern>
-			<unitPattern count="one">ثانية</unitPattern>
-			<unitPattern count="other">{0} ثانية</unitPattern>
-			<unitPattern count="two">ثانيتان</unitPattern>
-			<unitPattern count="zero">لا ثوان</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} أسابيع</unitPattern>
-			<unitPattern count="many">{0} أسبوعاً</unitPattern>
-			<unitPattern count="one">أسبوع</unitPattern>
-			<unitPattern count="other">{0} أسبوع</unitPattern>
-			<unitPattern count="two">أسبوعان</unitPattern>
-			<unitPattern count="zero">لا أسابيع</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} سنوات</unitPattern>
-			<unitPattern count="many">{0} سنةً</unitPattern>
-			<unitPattern count="one">سنة</unitPattern>
-			<unitPattern count="other">{0} سنة</unitPattern>
-			<unitPattern count="two">سنتان</unitPattern>
-			<unitPattern count="zero">لا سنوات</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>نعم:ن</yesstr>
-			<nostr>لا:ل</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_AE.xml b/airtime_mvc/library/Zend/Locale/Data/ar_AE.xml
deleted file mode 100644
index 8c15d502f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_AE.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="AE"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_BH.xml b/airtime_mvc/library/Zend/Locale/Data/ar_BH.xml
deleted file mode 100644
index 9ca5e624c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_BH.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="BH"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_DZ.xml b/airtime_mvc/library/Zend/Locale/Data/ar_DZ.xml
deleted file mode 100644
index 6018ac838..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_DZ.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ar"/>
-		<territory type="DZ"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d�-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M�-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d�-d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y�-y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_EG.xml b/airtime_mvc/library/Zend/Locale/Data/ar_EG.xml
deleted file mode 100644
index 601c2fae9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_EG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="EG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_IQ.xml b/airtime_mvc/library/Zend/Locale/Data/ar_IQ.xml
deleted file mode 100644
index e1bd17b1e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_IQ.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="IQ"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_JO.xml b/airtime_mvc/library/Zend/Locale/Data/ar_JO.xml
deleted file mode 100644
index 6a9dacf20..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_JO.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="JO"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_KW.xml b/airtime_mvc/library/Zend/Locale/Data/ar_KW.xml
deleted file mode 100644
index e4b4213a1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_KW.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="KW"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_LB.xml b/airtime_mvc/library/Zend/Locale/Data/ar_LB.xml
deleted file mode 100644
index aefa5a6af..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_LB.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="LB"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">نوار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">نوار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_LY.xml b/airtime_mvc/library/Zend/Locale/Data/ar_LY.xml
deleted file mode 100644
index 843807cd6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_LY.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="LY"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_MA.xml b/airtime_mvc/library/Zend/Locale/Data/ar_MA.xml
deleted file mode 100644
index 955a6e087..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_MA.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ar"/>
-		<territory type="MA"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d�-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d�-d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y�-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d�–d MMM، y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM �- MM �–yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_OM.xml b/airtime_mvc/library/Zend/Locale/Data/ar_OM.xml
deleted file mode 100644
index 553deddbd..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_OM.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="OM"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_QA.xml b/airtime_mvc/library/Zend/Locale/Data/ar_QA.xml
deleted file mode 100644
index b7024a030..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_QA.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="QA"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###;#0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_SA.xml b/airtime_mvc/library/Zend/Locale/Data/ar_SA.xml
deleted file mode 100644
index 9c45bf665..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_SA.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="SA"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###;#0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_SD.xml b/airtime_mvc/library/Zend/Locale/Data/ar_SD.xml
deleted file mode 100644
index 5f0d2f8b4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_SD.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.45 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="SD"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_SY.xml b/airtime_mvc/library/Zend/Locale/Data/ar_SY.xml
deleted file mode 100644
index c6efcb03a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_SY.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="SY"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">نوار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">نوار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###;#0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_TN.xml b/airtime_mvc/library/Zend/Locale/Data/ar_TN.xml
deleted file mode 100644
index 9276e25a0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_TN.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ar"/>
-		<territory type="TN"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d�-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M�-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d�-d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y�-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d�-d MMM، y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<exponential>E</exponential>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###;#0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ar_YE.xml b/airtime_mvc/library/Zend/Locale/Data/ar_YE.xml
deleted file mode 100644
index 2e285179b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ar_YE.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ar"/>
-		<territory type="YE"/>
-	</identity>
-	<localeDisplayNames>
-		<scripts>
-			<script type="Ital">اللأيطالية القديمة</script>
-		</scripts>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">الأحد</day>
-							<day type="mon">الاثنين</day>
-							<day type="tue">الثلاثاء</day>
-							<day type="wed">الأربعاء</day>
-							<day type="thu">الخميس</day>
-							<day type="fri">الجمعة</day>
-							<day type="sat">السبت</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###;#0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/as.xml b/airtime_mvc/library/Zend/Locale/Data/as.xml
deleted file mode 100644
index fdda8b7c9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/as.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="as"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="as">অসমীয়া</language>
-			<language type="ie">উপস�থাপন ভাষা</language>
-			<language type="km">কম�বোডিয়ান</language>
-		</languages>
-		<scripts>
-			<script type="Beng">বঙালী</script>
-		</scripts>
-		<territories>
-			<territory type="AQ">�ন�টাৰ�টিকা</territory>
-			<territory type="BR">ব�ৰাজিল</territory>
-			<territory type="BV">বভেট দ�বীপ</territory>
-			<territory type="CN">চীন</territory>
-			<territory type="DE">জাৰ�মানি</territory>
-			<territory type="FR">ফ�ৰান�স</territory>
-			<territory type="GB">সংয�ক�ত ৰাজ�য</territory>
-			<territory type="GS">দক�ষিণ জৰ�জিয়া আৰ� দক�ষিণ চেণ�ডৱিচ�‌ দ�বীপ</territory>
-			<territory type="HM">হাৰ�ড দ�বীপ আৰ� মেক�‌ডোনাল�ড দ�বীপ</territory>
-			<territory type="IN">ভাৰত</territory>
-			<territory type="IO">ব�ৰিটিশ�ব ইণ�ডিয়ান মহাসাগৰৰ অঞ�চল</territory>
-			<territory type="IT">ইটালি</territory>
-			<territory type="JP">জাপান</territory>
-			<territory type="RU">ৰ�চ</territory>
-			<territory type="TF">দক�ষিণ ফ�ৰান�সৰ অঞ�চল</territory>
-			<territory type="US">য�ক�তৰাষ�ট�ৰ</territory>
-			<territory type="ZZ">অজ�ঞাত বা অবৈধ অঞ�চল</territory>
-		</territories>
-		<keys>
-			<key type="calendar">পঞ�জিকা</key>
-			<key type="collation">শৰীকৰণ</key>
-			<key type="currency">ম�দ�ৰা</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">পৰম�পৰাগত চীনা শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম - Big5</type>
-			<type type="buddhist" key="calendar">বৌদ�ধ পঞ�জিকা</type>
-			<type type="chinese" key="calendar">চীনা পঞ�জিকা</type>
-			<type type="direct" key="collation">পোনপটীয়াকৈ শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম</type>
-			<type type="gb2312han" key="collation">সৰল চীনা শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম - GB2312</type>
-			<type type="gregorian" key="calendar">গ�ৰিগোৰীয় পঞ�জিকা</type>
-			<type type="hebrew" key="calendar">হীব�ৰ� পঞ�জিকা</type>
-			<type type="indian" key="calendar">ভাৰতীয় ৰাষ�ট�ৰীয় পঞ�জিকা</type>
-			<type type="islamic" key="calendar">ইচলামী পঞ�জিকা</type>
-			<type type="islamic-civil" key="calendar">ইচলামী-নাগৰিকৰ পঞ�জিকা</type>
-			<type type="japanese" key="calendar">জাপানী পঞ�জিকা</type>
-			<type type="phonebook" key="collation">টেলিফোন বহিৰ মতেশৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম</type>
-			<type type="pinyin" key="collation">পিন�‌য়িন শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম</type>
-			<type type="roc" key="calendar">চীনা গণৰাজ�যৰ পঞ�জিকা</type>
-			<type type="stroke" key="collation">স�ট�ৰোক শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম</type>
-			<type type="traditional" key="collation">পৰম�পৰাগতভাবে শৃঙ�খলাবদ�ধ কৰাৰ ক�ৰম</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[় অ-ঋ ৠ ঌ ৡ � � ও ঔ ং � ঃ ক-ড {ড়} ঢ {ঢ়} ণ ত ৎ থ-ন প-য {য়} ৰ ল ৱ শ-হ ঽ-ৄ ৢ ৣ ে ৈ ো-� ৗ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D ৲]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">জান�</month>
-							<month type="2">ফেব�ৰ�</month>
-							<month type="3">মাৰ�চ</month>
-							<month type="4">�প�ৰিল</month>
-							<month type="5">মে</month>
-							<month type="6">জ�ন</month>
-							<month type="7">জ�লাই</month>
-							<month type="8">আগ</month>
-							<month type="9">সেপ�ট</month>
-							<month type="10">অক�টো</month>
-							<month type="11">নভে</month>
-							<month type="12">ডিসে</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">জান�য়াৰী</month>
-							<month type="2">ফেব�ৰ�য়াৰী</month>
-							<month type="3">মাৰ�চ</month>
-							<month type="4">�প�ৰিল</month>
-							<month type="5">মে</month>
-							<month type="6">জ�ন</month>
-							<month type="7">জ�লাই</month>
-							<month type="8">আগষ�ট</month>
-							<month type="9">সেপ�টেম�বৰ</month>
-							<month type="10">অক�টোবৰ</month>
-							<month type="11">নভেম�বৰ</month>
-							<month type="12">ডিসেম�বৰ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ৰবি</day>
-							<day type="mon">সোম</day>
-							<day type="tue">মঙ�গল</day>
-							<day type="wed">ব�ধ</day>
-							<day type="thu">বৃহষ�পতি</day>
-							<day type="fri">শ�ক�ৰ</day>
-							<day type="sat">শনি</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">দেওবাৰ</day>
-							<day type="mon">সোমবাৰ</day>
-							<day type="tue">মঙ�গলবাৰ</day>
-							<day type="wed">ব�ধবাৰ</day>
-							<day type="thu">বৃহষ�পতিবাৰ</day>
-							<day type="fri">শ�ক�ৰবাৰ</day>
-							<day type="sat">শনিবাৰ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>পূৰ�বা</am>
-				<pm>অপ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h.mm.ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h.mm.ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h.mm.ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h.mm. a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM, y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>�লাহাৱাদ</exemplarCity>
-			</zone>
-			<metazone type="India">
-				<long>
-					<standard>ভাৰতীয় সময়</standard>
-				</long>
-				<short>
-					<standard>ভা. স.</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>টকা</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/as_IN.xml b/airtime_mvc/library/Zend/Locale/Data/as_IN.xml
deleted file mode 100644
index ff640e078..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/as_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.39 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="as"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/az.xml b/airtime_mvc/library/Zend/Locale/Data/az.xml
deleted file mode 100644
index bf92de96c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az.xml
+++ /dev/null
@@ -1,2715 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.77 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="az"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afarca</language>
-			<language type="ab">abxazca</language>
-			<language type="ace">akin dili</language>
-			<language type="ach">akoli dili</language>
-			<language type="ada">adangme dili</language>
-			<language type="ady">aduge dili</language>
-			<language type="ae">avestanca</language>
-			<language type="af">Afrikaanca</language>
-			<language type="afa">afro-aziat dili</language>
-			<language type="afh">afrihili dili</language>
-			<language type="ain">aynuca</language>
-			<language type="ak">akanca</language>
-			<language type="akk">akadianca</language>
-			<language type="ale">aleutca</language>
-			<language type="alg">algonguyan dili</language>
-			<language type="alt">cənub altay dili</language>
-			<language type="am">amarikcÉ™</language>
-			<language type="an">aragonca</language>
-			<language type="ang">qədimi ingiliscə</language>
-			<language type="anp">angikÉ™ dili</language>
-			<language type="apa">apaçi dili</language>
-			<language type="ar">�rəbcə</language>
-			<language type="arc">aramik dili</language>
-			<language type="arn">araukanca</language>
-			<language type="arp">arapaho dili</language>
-			<language type="art">suni dil</language>
-			<language type="arw">aravakça</language>
-			<language type="as">as</language>
-			<language type="ast">asturicÉ™</language>
-			<language type="ath">atapaskanca</language>
-			<language type="aus">avstraliyca</language>
-			<language type="av">avarikcÉ™</language>
-			<language type="awa">avadicÉ™</language>
-			<language type="ay">aymarca</language>
-			<language type="az">azərbaycanca</language>
-			<language type="ba">baÅŸkir dili</language>
-			<language type="bad">banda dili</language>
-			<language type="bai">bamilek dili</language>
-			<language type="bal">baluc dili</language>
-			<language type="ban">balincÉ™</language>
-			<language type="bas">basa dili</language>
-			<language type="bat">baltik dili</language>
-			<language type="be">belarusca</language>
-			<language type="bej">beja dili</language>
-			<language type="bem">bemba dili</language>
-			<language type="ber">berber dili</language>
-			<language type="bg">bolqarca</language>
-			<language type="bh">biharicÉ™</language>
-			<language type="bho">bxoçpuri dili</language>
-			<language type="bi">bislama dili</language>
-			<language type="bik">bikolca</language>
-			<language type="bin">bini dili</language>
-			<language type="bla">siksikÉ™ dili</language>
-			<language type="bm">bambara dili</language>
-			<language type="bn">Benqal dili</language>
-			<language type="bnt">bantu dili</language>
-			<language type="bo">tibet dili</language>
-			<language type="br">Bretonca</language>
-			<language type="bra">braj dili</language>
-			<language type="bs">bosniya dili</language>
-			<language type="btk">batak dili</language>
-			<language type="bua">buryat dili</language>
-			<language type="bug">bugin dili</language>
-			<language type="byn">bilincÉ™</language>
-			<language type="ca">katalanca</language>
-			<language type="cad">kado dili</language>
-			<language type="cai">mərkəzi amerika indus dili</language>
-			<language type="car">karib dili</language>
-			<language type="cau">qavqaz dili</language>
-			<language type="cch">atsamca</language>
-			<language type="ce">çeçen dili</language>
-			<language type="ceb">kebuano dili</language>
-			<language type="cel">kelt dili</language>
-			<language type="ch">çamoro dili</language>
-			<language type="chb">çibçə dili</language>
-			<language type="chg">çağatay dili</language>
-			<language type="chk">çukiz dili</language>
-			<language type="chm">mari dili</language>
-			<language type="chn">çinuk ləhçəsi</language>
-			<language type="cho">çoktau dili</language>
-			<language type="chp">çipevyan dili</language>
-			<language type="chr">çiroki dili</language>
-			<language type="chy">çeyen dili</language>
-			<language type="cmc">çamik dili</language>
-			<language type="co">korsikan dili</language>
-			<language type="cop">kopt dili</language>
-			<language type="cpe">inglis kreol dili</language>
-			<language type="cpf">fransız kreol dili</language>
-			<language type="cpp">portugal kreol dili</language>
-			<language type="cr">kri dili</language>
-			<language type="crh">krım türkçə</language>
-			<language type="crp">kreol dili</language>
-			<language type="cs">çex dili</language>
-			<language type="csb">kaÅŸubyan dili</language>
-			<language type="cu">kilsÉ™ slav dili</language>
-			<language type="cus">kuÅŸitik dili</language>
-			<language type="cv">çuvaş dili</language>
-			<language type="cy">uelscÉ™</language>
-			<language type="da">danimarka dili</language>
-			<language type="dak">dakota dili</language>
-			<language type="dar">darqva dili</language>
-			<language type="day">dayak dili</language>
-			<language type="de">almanca</language>
-			<language type="de_AT">almanca (AT)</language>
-			<language type="de_CH">isveç yüksək almancası</language>
-			<language type="del">delaver dili</language>
-			<language type="den">slavey</language>
-			<language type="dgr">doqrib dili</language>
-			<language type="din">dinka dili</language>
-			<language type="doi">doqri dili</language>
-			<language type="dra">dravid dili</language>
-			<language type="dsb">aşağı sorbca</language>
-			<language type="dua">duala dili</language>
-			<language type="dum">ortacaq hollandca</language>
-			<language type="dv">diveh dili</language>
-			<language type="dyu">dyula dili</language>
-			<language type="dz">dzonqa dili</language>
-			<language type="ee">eve dili</language>
-			<language type="efi">efik dili</language>
-			<language type="egy">qədimi misir dili</language>
-			<language type="eka">ekacuk dili</language>
-			<language type="el">yunanca</language>
-			<language type="elx">elamit dili</language>
-			<language type="en">ingiliscÉ™</language>
-			<language type="en_AU">ingiliscÉ™ (AU)</language>
-			<language type="en_CA">ingiliscÉ™ (CA)</language>
-			<language type="en_GB">ingiliscÉ™ (GB)</language>
-			<language type="en_US">ingiliscÉ™ (ABÅž)</language>
-			<language type="enm">ortacaq ingiliscÉ™</language>
-			<language type="eo">esperanto dili</language>
-			<language type="es">ispanca</language>
-			<language type="es_419">latın amerika ispancası</language>
-			<language type="es_ES">iber-ispanca</language>
-			<language type="et">estonca</language>
-			<language type="eu">bask dili</language>
-			<language type="ewo">evondo dili</language>
-			<language type="fa">farsca</language>
-			<language type="fan">fang dili</language>
-			<language type="fat">fanti dili</language>
-			<language type="ff">fula dili</language>
-			<language type="fi">fincÉ™</language>
-			<language type="fil">taqaloqca</language>
-			<language type="fiu">fin-uÄŸri dili</language>
-			<language type="fj">fiji dili</language>
-			<language type="fo">farer dili</language>
-			<language type="fon">fon dili</language>
-			<language type="fr">fransızca</language>
-			<language type="fr_CA">fransızca (CA)</language>
-			<language type="fr_CH">isveç fransızca</language>
-			<language type="frm">ortacaq fransızca</language>
-			<language type="fro">qədimi fransızca</language>
-			<language type="frr">ÅŸimal fris dili</language>
-			<language type="fur">friul dili</language>
-			<language type="fy">frisk dili</language>
-			<language type="ga">irlandca</language>
-			<language type="gaa">qa dili</language>
-			<language type="gay">qayo dili</language>
-			<language type="gba">qabaya dili</language>
-			<language type="gd">skot gaelik dili</language>
-			<language type="gem">Alman dili</language>
-			<language type="gez">qez dili</language>
-			<language type="gil">qilbert gili</language>
-			<language type="gl">qalisian dili</language>
-			<language type="gmh">ortacaq yüksək almanca</language>
-			<language type="gn">quaranicÉ™</language>
-			<language type="goh">qədimi almanca</language>
-			<language type="gon">qondi dili</language>
-			<language type="gor">qorontalo dili</language>
-			<language type="got">gotça</language>
-			<language type="grb">qrebo dili</language>
-			<language type="grc">qədimi yunanca</language>
-			<language type="gsw">isveç almanca</language>
-			<language type="gu">gujarati dili</language>
-			<language type="gv">manks dili</language>
-			<language type="gwi">qviçin dili</language>
-			<language type="ha">Hausa dili</language>
-			<language type="hai">hayda dili</language>
-			<language type="haw">Qavayca</language>
-			<language type="he">ivritcÉ™</language>
-			<language type="hi">hindi dili</language>
-			<language type="hil">hiliqaynon dili</language>
-			<language type="him">himaçali dili</language>
-			<language type="hit">hittit dili</language>
-			<language type="hmn">monq dili</language>
-			<language type="ho">hiri motu dili</language>
-			<language type="hr">xorvatca</language>
-			<language type="hsb">yuxarı sorbca</language>
-			<language type="ht">haiti dili</language>
-			<language type="hu">macarca</language>
-			<language type="hup">hupa dili</language>
-			<language type="hy">Ermənicə</language>
-			<language type="hz">Herer dili</language>
-			<language type="ia">interlingua dili</language>
-			<language type="iba">iban dili</language>
-			<language type="id">indoneziya dili</language>
-			<language type="ie">interlingue dili</language>
-			<language type="ig">iqbo dili</language>
-			<language type="ii">siçuan yi dili</language>
-			<language type="ijo">ico dili</language>
-			<language type="ik">inupiaq dili</language>
-			<language type="ilo">iloko dili</language>
-			<language type="inc">diqər hint dili</language>
-			<language type="ine">hint-yevropa dili</language>
-			<language type="inh">inquÅŸ dili</language>
-			<language type="io">ido dili</language>
-			<language type="ira">iranca</language>
-			<language type="iro">irokuay dili</language>
-			<language type="is">isləndcə</language>
-			<language type="it">italyanca</language>
-			<language type="iu">inuktikut dili</language>
-			<language type="ja">yaponca</language>
-			<language type="jbo">loÄŸban dili</language>
-			<language type="jpr">judo-farsca</language>
-			<language type="jrb">jude-ərəbcə</language>
-			<language type="jv">yavaca dili</language>
-			<language type="ka">gürcü dili</language>
-			<language type="kaa">qara-qalpaq dili</language>
-			<language type="kab">kabule dili</language>
-			<language type="kac">kaçinca</language>
-			<language type="kaj">ju dili</language>
-			<language type="kam">kamba dili</language>
-			<language type="kar">karen dili</language>
-			<language type="kaw">kavi dili</language>
-			<language type="kbd">kabardca</language>
-			<language type="kcg">tiyap dili</language>
-			<language type="kfo">koro dili</language>
-			<language type="kg">konqo dili</language>
-			<language type="kha">xazi dili</language>
-			<language type="khi">xoyzan dili</language>
-			<language type="kho">xotan dili</language>
-			<language type="ki">kikuyu dili</language>
-			<language type="kj">kuanyama dili</language>
-			<language type="kk">qazax dili</language>
-			<language type="kl">kalalisut dili</language>
-			<language type="km">kambodiya dili</language>
-			<language type="kmb">kimbundu dili</language>
-			<language type="kn">kannada dili</language>
-			<language type="ko">koreya dili</language>
-			<language type="kok">konkan dili</language>
-			<language type="kos">kosreyan dili</language>
-			<language type="kpe">kpelle dili</language>
-			<language type="kr">kanur dili</language>
-			<language type="krc">qaraçay-balkar dili</language>
-			<language type="krl">karelyan dili</language>
-			<language type="kro">kru dili</language>
-			<language type="kru">kurux dili</language>
-			<language type="ks">kəşmir dili</language>
-			<language type="ku">kürdcə</language>
-			<language type="kum">kumuk dili</language>
-			<language type="kut">kutenay dili</language>
-			<language type="kv">komi dili</language>
-			<language type="kw">korniÅŸ dili</language>
-			<language type="ky">qırğızca</language>
-			<language type="la">latınca</language>
-			<language type="lad">ladin dili</language>
-			<language type="lah">laxnda dili</language>
-			<language type="lam">lamba dili</language>
-			<language type="lb">luksemburq dili</language>
-			<language type="lez">ləzqi dili</language>
-			<language type="lg">qanda dili</language>
-			<language type="li">limburqiÅŸ dili</language>
-			<language type="ln">Linqala dili</language>
-			<language type="lo">laos dili</language>
-			<language type="lol">monqo dili</language>
-			<language type="loz">lozi dili</language>
-			<language type="lt">litva dili</language>
-			<language type="lu">luba-katanqa dili</language>
-			<language type="lua">luba-lulua dili</language>
-			<language type="lui">luyseno dili</language>
-			<language type="lun">lunda dili</language>
-			<language type="luo">luo dili</language>
-			<language type="lus">lushayca</language>
-			<language type="lv">latışca</language>
-			<language type="mad">maduriz dili</language>
-			<language type="mag">maqahi dili</language>
-			<language type="mai">maitili dili</language>
-			<language type="mak">makasar dili</language>
-			<language type="man">məndinqo dili</language>
-			<language type="map">avstronezicÉ™</language>
-			<language type="mas">masay dili</language>
-			<language type="mdf">mokÅŸa dili</language>
-			<language type="mdr">mandar dili</language>
-			<language type="men">mende dili</language>
-			<language type="mg">malaqas dili</language>
-			<language type="mga">ortacaq irlandca</language>
-			<language type="mh">marÅŸal dili</language>
-			<language type="mi">maori dili</language>
-			<language type="mic">mikmak dili</language>
-			<language type="min">minanqkaban dili</language>
-			<language type="mis">çeşitli diller</language>
-			<language type="mk">makedoniya dili</language>
-			<language type="mkh">mon-xmer dili</language>
-			<language type="ml">malayalamca</language>
-			<language type="mn">monqolca</language>
-			<language type="mnc">mançu dili</language>
-			<language type="mni">manipüri dili</language>
-			<language type="mno">manobo dili</language>
-			<language type="mo">moldavca</language>
-			<language type="moh">moxak dili</language>
-			<language type="mos">mosi dili</language>
-			<language type="mr">marati dili</language>
-			<language type="ms">malayca</language>
-			<language type="mt">malta dili</language>
-			<language type="mul">digər dillər</language>
-			<language type="mun">munda dili</language>
-			<language type="mus">krik dili</language>
-			<language type="mwl">mirand dili</language>
-			<language type="mwr">maruari dili</language>
-			<language type="my">burmis dili</language>
-			<language type="myn">maya dili</language>
-			<language type="myv">erzya dili</language>
-			<language type="na">nauru dili</language>
-			<language type="nah">nahuatl dili</language>
-			<language type="nai">ÅŸimal amerika yerli dili</language>
-			<language type="nap">neapolital dili</language>
-			<language type="nb">norvec bokmal dili</language>
-			<language type="nd">ÅŸimal ndebele dili</language>
-			<language type="nds">aşağı almanca</language>
-			<language type="ne">nepalca</language>
-			<language type="new">nevari dili</language>
-			<language type="ng">nqonka dili</language>
-			<language type="nia">nyas dili</language>
-			<language type="nic">niger-kordofyan dili</language>
-			<language type="niu">niyuan dili</language>
-			<language type="nl">hollandca</language>
-			<language type="nl_BE">flem dili</language>
-			<language type="nn">norveç ninorsk dili</language>
-			<language type="no">norveç dili</language>
-			<language type="nog">noqay dili</language>
-			<language type="non">qədimi norsca</language>
-			<language type="nqo">nqo dili</language>
-			<language type="nr">cənub ndebele dili</language>
-			<language type="nso">ÅŸimal soto dili</language>
-			<language type="nub">nubiy dili</language>
-			<language type="nv">navayo dili</language>
-			<language type="ny">nyanca dili</language>
-			<language type="nym">nyamvezi dili</language>
-			<language type="nyn">nyankol dili</language>
-			<language type="nyo">niyoro dili</language>
-			<language type="nzi">nizima dili</language>
-			<language type="oc">oksitanca</language>
-			<language type="oj">ocibva dili</language>
-			<language type="om">oromo dili</language>
-			<language type="or">OriyÉ™ dili</language>
-			<language type="os">osetik dili</language>
-			<language type="osa">osage dili</language>
-			<language type="ota">osman dili</language>
-			<language type="oto">otomian dili</language>
-			<language type="pa">puncab dili</language>
-			<language type="paa">papua dili</language>
-			<language type="pag">panqasinan dili</language>
-			<language type="pal">paxlavi dili</language>
-			<language type="pam">pampanqa dili</language>
-			<language type="pap">papyamento dili</language>
-			<language type="pau">palayanca</language>
-			<language type="peo">qədimi farsca</language>
-			<language type="phi">filipin dili</language>
-			<language type="phn">foyenik dili</language>
-			<language type="pi">pali dili</language>
-			<language type="pl">Polish dili</language>
-			<language type="pon">ponpeyan dili</language>
-			<language type="pra">prakrit dili</language>
-			<language type="pro">qədimi provensialca</language>
-			<language type="ps">PuÅŸtu dili</language>
-			<language type="pt">portuqalca</language>
-			<language type="pt_PT">Ä°ber portuqalca</language>
-			<language type="qu">kuechya dili</language>
-			<language type="raj">racastan dili</language>
-			<language type="rap">rapanu dili</language>
-			<language type="rar">rarotonqan dili</language>
-			<language type="rn">rundi dili</language>
-			<language type="ro">rumın</language>
-			<language type="rom">roman dili</language>
-			<language type="root">rut dili</language>
-			<language type="ru">rusca</language>
-			<language type="rup">aromanca</language>
-			<language type="rw">kinyarvanda dili</language>
-			<language type="sa">Sanskrit dili</language>
-			<language type="sad">sandave dili</language>
-			<language type="sah">yakut dili</language>
-			<language type="sai">cənub amerika yerli dili</language>
-			<language type="sal">saliÅŸan dili</language>
-			<language type="sam">samaritan dili</language>
-			<language type="sas">sasak dili</language>
-			<language type="sat">santal dili</language>
-			<language type="sc">sardin dili</language>
-			<language type="scn">sisili dili</language>
-			<language type="sco">skots dili</language>
-			<language type="sd">sindhi dili</language>
-			<language type="se">ÅŸimal sami dili</language>
-			<language type="sel">selkup dili</language>
-			<language type="sem">ivrit dili</language>
-			<language type="sg">sanqo dili</language>
-			<language type="sga">qədimi irlandca</language>
-			<language type="sgn">işarət dili</language>
-			<language type="sh">serb-xorvatca</language>
-			<language type="shn">ÅŸan dili</language>
-			<language type="si">sinhaliscÉ™</language>
-			<language type="sid">sidamo dili</language>
-			<language type="sio">sioyan dili</language>
-			<language type="sit">sino-tibet dili</language>
-			<language type="sk">slovakca</language>
-			<language type="sl">slovencÉ™</language>
-			<language type="sla">slav dili</language>
-			<language type="sm">samoa dili</language>
-			<language type="sma">cənub sami dili</language>
-			<language type="smi">səmi dili</language>
-			<language type="smj">lule sami dili</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt dili</language>
-			<language type="sn">ÅŸona dili</language>
-			<language type="snk">soninke dili</language>
-			<language type="so">somali dili</language>
-			<language type="sog">soqdiyen dili</language>
-			<language type="son">sonqay dili</language>
-			<language type="sq">Albanca</language>
-			<language type="sr">serb dili</language>
-			<language type="srn">sranan tonqo dili</language>
-			<language type="srr">serer dilii</language>
-			<language type="ss">svati dili</language>
-			<language type="ssa">nilo-sahara dili</language>
-			<language type="st">Sesoto dili</language>
-			<language type="su">sundanca</language>
-			<language type="suk">sukuma dili</language>
-			<language type="sus">susu dili</language>
-			<language type="sux">sumeryan dili</language>
-			<language type="sv">isveçcə</language>
-			<language type="sw">suahilicÉ™</language>
-			<language type="syr">siryak dili</language>
-			<language type="ta">tamilcÉ™</language>
-			<language type="tai">tay dili</language>
-			<language type="te">teluqu dili</language>
-			<language type="tem">timne dili</language>
-			<language type="ter">tereno dili</language>
-			<language type="tet">tetum dili</language>
-			<language type="tg">tacik dili</language>
-			<language type="th">tayca</language>
-			<language type="ti">tiqrin dili</language>
-			<language type="tig">tiqre dili</language>
-			<language type="tiv">tiv dili</language>
-			<language type="tk">türkməncə</language>
-			<language type="tkl">tokelay dili</language>
-			<language type="tl">taqaloq dili</language>
-			<language type="tlh">klinqon</language>
-			<language type="tli">tlinqit dili</language>
-			<language type="tmh">tamaÅŸek dili</language>
-			<language type="tn">svana dili</language>
-			<language type="to">tonqa dili</language>
-			<language type="tog">niyasa tonga dili</language>
-			<language type="tpi">tok pisin dili</language>
-			<language type="tr">türkcə</language>
-			<language type="ts">sonqa dili</language>
-			<language type="tsi">simÅŸyan dili</language>
-			<language type="tt">tatarca</language>
-			<language type="tum">tumbuka dili</language>
-			<language type="tup">tupi dili</language>
-			<language type="tut">altaik dili</language>
-			<language type="tvl">tuvalu dili</language>
-			<language type="tw">Tvi dili</language>
-			<language type="ty">taxiti dili</language>
-			<language type="tyv">tuvinyan dili</language>
-			<language type="udm">udmurt dili</language>
-			<language type="ug">uyÄŸurca</language>
-			<language type="uga">uqaritik dili</language>
-			<language type="uk">ukraynaca</language>
-			<language type="umb">umbundu dili</language>
-			<language type="und">bilinməyən vəya gəcərsiz dil</language>
-			<language type="ur">urduca</language>
-			<language type="uz">özbəkcə</language>
-			<language type="vai">vay dili</language>
-			<language type="ve">venda dili</language>
-			<language type="vi">vyetnamca</language>
-			<language type="vo">volapük dili</language>
-			<language type="vot">votik dili</language>
-			<language type="wa">valun dili</language>
-			<language type="wak">vakaÅŸan dili</language>
-			<language type="wal">valamo dili</language>
-			<language type="war">varay dili</language>
-			<language type="was">vaÅŸo dili</language>
-			<language type="wen">sorb dili</language>
-			<language type="wo">volof dili</language>
-			<language type="xal">kalmıqca</language>
-			<language type="xh">xosa dili</language>
-			<language type="yao">yao dili</language>
-			<language type="yap">yapiz dili</language>
-			<language type="yi">Yahudi dili</language>
-			<language type="yo">yoruba dili</language>
-			<language type="ypk">yupik dili</language>
-			<language type="za">juənq dili</language>
-			<language type="zap">zapotek dili</language>
-			<language type="zbl">blisimbols dili</language>
-			<language type="zen">zenaqa dili</language>
-			<language type="zh">çincə</language>
-			<language type="zh_Hans">adi çincə</language>
-			<language type="zh_Hant">gələnəksəl çincə</language>
-			<language type="znd">zande dili</language>
-			<language type="zu">zulu dili</language>
-			<language type="zun">zuni dili</language>
-			<language type="zza">zaza dili</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ərəb</script>
-			<script type="Armi">armi</script>
-			<script type="Armn">erməni</script>
-			<script type="Avst">avestan</script>
-			<script type="Bali">bali</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">benqal</script>
-			<script type="Blis">blissymbols</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">kor yazısı</script>
-			<script type="Bugi">buqin</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">kakm</script>
-			<script type="Cans">birləşmiş kanada yerli yazısı</script>
-			<script type="Cari">kariyan</script>
-			<script type="Cham">çam</script>
-			<script type="Cher">çiroki</script>
-			<script type="Cirt">sirt</script>
-			<script type="Copt">koptik</script>
-			<script type="Cprt">kipr</script>
-			<script type="Cyrl">kiril</script>
-			<script type="Cyrs">qədimi kilsa kirili</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">misir demotik</script>
-			<script type="Egyh">misir hiyeratik</script>
-			<script type="Egyp">misir hiyeroqlif</script>
-			<script type="Ethi">efiopiya</script>
-			<script type="Geok">gürcü xutsuri</script>
-			<script type="Geor">gürcü</script>
-			<script type="Glag">qlaqolitik</script>
-			<script type="Goth">qotik</script>
-			<script type="Grek">yunan</script>
-			<script type="Gujr">qucarat</script>
-			<script type="Guru">qurmuxi</script>
-			<script type="Hang">hanqul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunu</script>
-			<script type="Hans">basitləştirilmiş han</script>
-			<script type="Hant">qədimi han</script>
-			<script type="Hebr">yahudi</script>
-			<script type="Hira">iragana</script>
-			<script type="Hmng">pahav monq</script>
-			<script type="Hrkt">katakana vəya hiraqana</script>
-			<script type="Hung">qədimi macar</script>
-			<script type="Inds">hindistan</script>
-			<script type="Ital">qədimi italyalı</script>
-			<script type="Java">cava</script>
-			<script type="Jpan">yapon</script>
-			<script type="Kali">kayax li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">xaroÅŸti</script>
-			<script type="Khmr">xmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">korean</script>
-			<script type="Kthi">kti</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">fraktur latını</script>
-			<script type="Latg">gael latını</script>
-			<script type="Latn">latın</script>
-			<script type="Lepc">lepçə</script>
-			<script type="Limb">limbu</script>
-			<script type="Lyci">lusian</script>
-			<script type="Lydi">ludian</script>
-			<script type="Mand">mandayen</script>
-			<script type="Mani">maniçayen</script>
-			<script type="Maya">maya hiyeroqlifi</script>
-			<script type="Mero">meroytik</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">monqol</script>
-			<script type="Moon">mun</script>
-			<script type="Mtei">meytey mayek</script>
-			<script type="Mymr">miyanmar</script>
-			<script type="Nkoo">nko</script>
-			<script type="Ogam">oÄŸam</script>
-			<script type="Olck">ol çiki</script>
-			<script type="Orkh">orxon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">qədimi permik</script>
-			<script type="Phag">faqs-pa</script>
-			<script type="Phli">fli</script>
-			<script type="Phlp">flp</script>
-			<script type="Phlv">kitab paxlavi</script>
-			<script type="Phnx">foenik</script>
-			<script type="Plrd">polard fonetik</script>
-			<script type="Prti">prti</script>
-			<script type="Rjng">recəng</script>
-			<script type="Roro">ronqoronqo</script>
-			<script type="Runr">runik</script>
-			<script type="Samr">samaritan</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurastra</script>
-			<script type="Sgnw">işarət yazısı</script>
-			<script type="Shaw">ÅŸavyan</script>
-			<script type="Sinh">sinhala</script>
-			<script type="Sund">sundan</script>
-			<script type="Sylo">siloti nəqri</script>
-			<script type="Syrc">siryak</script>
-			<script type="Syre">estrangela süryanice</script>
-			<script type="Syrn">Syrn</script>
-			<script type="Tagb">taqbanva</script>
-			<script type="Tale">tay le</script>
-			<script type="Talu">təzə tay lu</script>
-			<script type="Taml">tamil</script>
-			<script type="Tavt">tavt</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengvar</script>
-			<script type="Tfng">tifinaq</script>
-			<script type="Tglg">taqaloq</script>
-			<script type="Thaa">txana</script>
-			<script type="Thai">tay</script>
-			<script type="Tibt">tibet</script>
-			<script type="Ugar">uqarit</script>
-			<script type="Vaii">vay</script>
-			<script type="Visp">danışma səsləri</script>
-			<script type="Xpeo">qədimi fars</script>
-			<script type="Xsux">sumer-akadyan kuneyform</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">zmth</script>
-			<script type="Zsym">zsym</script>
-			<script type="Zxxx">yazısız</script>
-			<script type="Zyyy">adi yazi</script>
-			<script type="Zzzz">bilinməyən veya gəcərsiz</script>
-		</scripts>
-		<territories>
-			<territory type="001">Dünya</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Åžimal Amerika</territory>
-			<territory type="005">Cənub Amerika</territory>
-			<territory type="009">Okeyaniya</territory>
-			<territory type="011">Qərb afrika</territory>
-			<territory type="013">Orta Amerika</territory>
-			<territory type="014">Şərq Afrika</territory>
-			<territory type="015">Åžimal Afrika</territory>
-			<territory type="017">Orta Afrika</territory>
-			<territory type="018">018</territory>
-			<territory type="019">Amerikalar</territory>
-			<territory type="021">021</territory>
-			<territory type="029">Kariyıplar</territory>
-			<territory type="030">Şərq Asiya</territory>
-			<territory type="034">Cənub Asiya</territory>
-			<territory type="035">Cənub Şərq Asiya</territory>
-			<territory type="039">Cənub Avropa</territory>
-			<territory type="053">Avstraliya vÉ™ Yeni Zelandiya</territory>
-			<territory type="054">Melanesya</territory>
-			<territory type="057">Mikronesiya reqionu</territory>
-			<territory type="061">Polineziya</territory>
-			<territory type="062">Cənub Orta Asiya</territory>
-			<territory type="142">Aziya</territory>
-			<territory type="143">Orta Aziya</territory>
-			<territory type="145">Qərb Asiya</territory>
-			<territory type="150">Avropa</territory>
-			<territory type="151">Şərq Avropa</territory>
-			<territory type="154">Åžimal Avropa</territory>
-			<territory type="155">Qərb Avropa</territory>
-			<territory type="172">172</territory>
-			<territory type="419">Latın Amerikası və Kariblər</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Birləşmiş �rəb Emiratları</territory>
-			<territory type="AF">�fqənistan</territory>
-			<territory type="AG">Antiqua vÉ™ Barbuda</territory>
-			<territory type="AI">Anquila</territory>
-			<territory type="AL">Albaniya</territory>
-			<territory type="AM">Ermənistan</territory>
-			<territory type="AN">Hollandiya antilleri</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Arqentina</territory>
-			<territory type="AS">Amerika Samoası</territory>
-			<territory type="AT">Avstriya</territory>
-			<territory type="AU">Avstraliya</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Aland Adaları</territory>
-			<territory type="AZ">Azərbaycan</territory>
-			<territory type="BA">Bosniya vÉ™ Herzokovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">BanqladeÅŸ</territory>
-			<territory type="BE">Belçika</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bolqariya</territory>
-			<territory type="BH">Bahreyn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Seynt Bartelemey</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Bruney</territory>
-			<territory type="BO">Boliviya</territory>
-			<territory type="BR">Braziliya</territory>
-			<territory type="BS">Bahamalar</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Bove Adası</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Beliz</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos Adaları</territory>
-			<territory type="CD">Konqo - KinÅŸasa</territory>
-			<territory type="CF">Orta Afrika respublikası</territory>
-			<territory type="CG">Konqo - Brazavil</territory>
-			<territory type="CH">isveçriya</territory>
-			<territory type="CI">Ä°vori Sahili</territory>
-			<territory type="CK">Kuk Adaları</territory>
-			<territory type="CL">Çile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Çin</territory>
-			<territory type="CO">Kolumbiya</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kape Verde</territory>
-			<territory type="CX">Çristmas Adası</territory>
-			<territory type="CY">Kipr</territory>
-			<territory type="CZ">Çex respublikası</territory>
-			<territory type="DE">Almaniya</territory>
-			<territory type="DJ">Ciboti</territory>
-			<territory type="DK">Danemarka</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominik Respublikası</territory>
-			<territory type="DZ">Cezayır</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estoniya</territory>
-			<territory type="EG">Misir</territory>
-			<territory type="EH">Qərb Sahara</territory>
-			<territory type="ER">Eritreya</territory>
-			<territory type="ES">Ä°spaniya</territory>
-			<territory type="ET">Efiopiya</territory>
-			<territory type="FI">Finlandiya</territory>
-			<territory type="FJ">Fici</territory>
-			<territory type="FK">Folkland Adaları</territory>
-			<territory type="FM">Mikronesiya</territory>
-			<territory type="FO">Faro Adaları</territory>
-			<territory type="FR">Fransa</territory>
-			<territory type="GA">Qabon</territory>
-			<territory type="GB">Birləşmiş Krallıq</territory>
-			<territory type="GD">Qrenada</territory>
-			<territory type="GE">Gürcüstan</territory>
-			<territory type="GF">Fransız Quyanası</territory>
-			<territory type="GG">Görnsey</territory>
-			<territory type="GH">Qana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Qrinland</territory>
-			<territory type="GM">Qambiya</territory>
-			<territory type="GN">Qvineya</territory>
-			<territory type="GP">Qvadalup</territory>
-			<territory type="GQ">Ekvator Qineya</territory>
-			<territory type="GR">Yunanıstan</territory>
-			<territory type="GS">Cənub Gürcüstan və Cənub Sandvilç Adaları</territory>
-			<territory type="GT">Qvatemala</territory>
-			<territory type="GU">Quam</territory>
-			<territory type="GW">Qvineya-Bisau</territory>
-			<territory type="GY">Quyana</territory>
-			<territory type="HK">Honk Konq çina</territory>
-			<territory type="HM">Hörd və Makdonald Adaları</territory>
-			<territory type="HN">Qonduras</territory>
-			<territory type="HR">Xorvatiya</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Macaristan</territory>
-			<territory type="ID">Ä°ndoneziya</territory>
-			<territory type="IE">Ä°rlandiya</territory>
-			<territory type="IL">Ä°zrail</territory>
-			<territory type="IM">Man Adası</territory>
-			<territory type="IN">Hindistan</territory>
-			<territory type="IO">Britaniya-Hindistan Okeanik territoriyası</territory>
-			<territory type="IQ">Ä°rak</territory>
-			<territory type="IR">Ä°ran</territory>
-			<territory type="IS">Ä°slandiya</territory>
-			<territory type="IT">Ä°taliya</territory>
-			<territory type="JE">Cörsi</territory>
-			<territory type="JM">Yamayka</territory>
-			<territory type="JO">Ürdün</territory>
-			<territory type="JP">Yaponiya</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kırqızstan</territory>
-			<territory type="KH">Kambodiya</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoros</territory>
-			<territory type="KN">Seynt Kits vÉ™ Nevis</territory>
-			<territory type="KP">Åžimal Koreya</territory>
-			<territory type="KR">Cənub Koreya</territory>
-			<territory type="KW">Kuveyt</territory>
-			<territory type="KY">Kayman Adaları</territory>
-			<territory type="KZ">Kazaxstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lebanon</territory>
-			<territory type="LC">Seynt Lusiya</territory>
-			<territory type="LI">LixtenÅŸteyn</territory>
-			<territory type="LK">Åžri Lanka</territory>
-			<territory type="LR">Liberiya</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litva</territory>
-			<territory type="LU">Lüksemburq</territory>
-			<territory type="LV">Latviya</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Morokko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Monteneqro</territory>
-			<territory type="MF">Seynt Martin</territory>
-			<territory type="MG">Madaqaskar</territory>
-			<territory type="MH">Marşal Adaları</territory>
-			<territory type="MK">Masedoniya</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Monqoliya</territory>
-			<territory type="MO">Makao Çina</territory>
-			<territory type="MP">Şimal Mariana Adaları</territory>
-			<territory type="MQ">Martiniqu</territory>
-			<territory type="MR">Mavritaniya</territory>
-			<territory type="MS">Montserat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mavritis</territory>
-			<territory type="MV">Maldiv</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksika</territory>
-			<territory type="MY">Malaysiya</territory>
-			<territory type="MZ">Mazambik</territory>
-			<territory type="NA">Namibiya</territory>
-			<territory type="NC">Yeni Kaledoniya</territory>
-			<territory type="NE">nijer</territory>
-			<territory type="NF">Norfolk Adası</territory>
-			<territory type="NG">Nijeriya</territory>
-			<territory type="NI">Nikaraqua</territory>
-			<territory type="NL">Hollandiya</territory>
-			<territory type="NO">Norvec</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niye</territory>
-			<territory type="NZ">Yeni Zelandiya</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fransız Polineziya</territory>
-			<territory type="PG">Papua Yeni Qvineya</territory>
-			<territory type="PH">Filipin</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">PolÅŸa</territory>
-			<territory type="PM">Seynt Piyer vÉ™ Mikelon</territory>
-			<territory type="PN">Pitkarn</territory>
-			<territory type="PR">Puerto Riko</territory>
-			<territory type="PS">Fələstin Bölqüsü</territory>
-			<territory type="PT">Portuqal</territory>
-			<territory type="PW">Palav</territory>
-			<territory type="PY">Paraqvay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Uzak Okeyaniya</territory>
-			<territory type="QU">Avropa Birləşliyi</territory>
-			<territory type="RE">Reyunion</territory>
-			<territory type="RO">Romaniya</territory>
-			<territory type="RS">Serbiya</territory>
-			<territory type="RU">Rusiya</territory>
-			<territory type="RW">Rvanda</territory>
-			<territory type="SA">Saudi �rəbistan</territory>
-			<territory type="SB">Solomon Adaları</territory>
-			<territory type="SC">Seyçels</territory>
-			<territory type="SD">sudan</territory>
-			<territory type="SE">isveç</territory>
-			<territory type="SG">Sinqapur</territory>
-			<territory type="SH">Seynt Elena</territory>
-			<territory type="SI">Sloveniya</territory>
-			<territory type="SJ">svalbard vÉ™ yan mayen</territory>
-			<territory type="SK">Slovakiya</territory>
-			<territory type="SL">Siyera Leon</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Seneqal</territory>
-			<territory type="SO">Somaliya</territory>
-			<territory type="SR">surinamÉ™</territory>
-			<territory type="ST">Sao Tom vÉ™ Prinsip</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">siriya</territory>
-			<territory type="SZ">svazilənd</territory>
-			<territory type="TC">Türk və Kaykos Adaları</territory>
-			<territory type="TD">Çad</territory>
-			<territory type="TF">Fransız Cənub teritoriyası</territory>
-			<territory type="TG">Toqo</territory>
-			<territory type="TH">tayland</territory>
-			<territory type="TJ">tacikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Şərq Timor</territory>
-			<territory type="TM">Türkmənistan</territory>
-			<territory type="TN">Tunisiya</territory>
-			<territory type="TO">Tonqa</territory>
-			<territory type="TR">Türkiya</territory>
-			<territory type="TT">Trinidan vÉ™ Tobaqo</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">tayvan</territory>
-			<territory type="TZ">tanzaniya</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uqanda</territory>
-			<territory type="UM">Birləşmiş Ştatların uzaq adaları</territory>
-			<territory type="US">Amerika Birləşmiş Ştatları</territory>
-			<territory type="UY">Uruqvay</territory>
-			<territory type="UZ">Özbəkistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Seynt Vinsent vÉ™ Qrenada</territory>
-			<territory type="VE">Venesuela</territory>
-			<territory type="VG">Britaniya Virgin Adaları</territory>
-			<territory type="VI">ABŞ Virqin Adaları</territory>
-			<territory type="VN">Vyetnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Valis vÉ™ Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayot</territory>
-			<territory type="ZA">Cənub Afrika</territory>
-			<territory type="ZM">Zambiya</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">bilinmir</territory>
-		</territories>
-		<types>
-			<type type="buddhist" key="calendar">Budist təqvimi</type>
-			<type type="chinese" key="calendar">Çin təqvimi</type>
-			<type type="gregorian" key="calendar">Qreqoriy təqvimi</type>
-			<type type="hebrew" key="calendar">Yahudi təqvimi</type>
-			<type type="indian" key="calendar">Hindi təqvimi</type>
-			<type type="islamic" key="calendar">Müsəlman təqvimi</type>
-			<type type="islamic-civil" key="calendar">Ivrit təqvimi</type>
-			<type type="japanese" key="calendar">Yapon təqvimi</type>
-			<type type="pinyin" key="collation">Pinyin təqvimi</type>
-			<type type="roc" key="calendar">Çin respublikası təqvimi</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metr</measurementSystemName>
-			<measurementSystemName type="US">ABÅž</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Dil: {0}</codePattern>
-			<codePattern type="script">Yazı: {0}</codePattern>
-			<codePattern type="territory">Rayon: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ç d e ə f g ğ h x ı i İ {i\u0307} j k q l-o ö p r s ş t u ü v y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[w]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">yan</month>
-							<month type="2">fev</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">may</month>
-							<month type="6">iyn</month>
-							<month type="7">iyl</month>
-							<month type="8">avq</month>
-							<month type="9">sen</month>
-							<month type="10">okt</month>
-							<month type="11">noy</month>
-							<month type="12">dek</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Yanvar</month>
-							<month type="2">Fevral</month>
-							<month type="3">Mart</month>
-							<month type="4">Aprel</month>
-							<month type="5">May</month>
-							<month type="6">Ä°yun</month>
-							<month type="7">Ä°yul</month>
-							<month type="8">Avqust</month>
-							<month type="9">Sentyabr</month>
-							<month type="10">Oktyabr</month>
-							<month type="11">Noyabr</month>
-							<month type="12">Dekabr</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">B.</day>
-							<day type="mon">B.E.</day>
-							<day type="tue">Ç.A.</day>
-							<day type="wed">Ç.</day>
-							<day type="thu">C.A.</day>
-							<day type="fri">C</day>
-							<day type="sat">Åž.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">bazar</day>
-							<day type="mon">bazar ertəsi</day>
-							<day type="tue">çərşənbə axşamı</day>
-							<day type="wed">çərşənbə</day>
-							<day type="thu">cümə axşamı</day>
-							<day type="fri">cümə</day>
-							<day type="sat">şənbə</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">7</day>
-							<day type="mon">1</day>
-							<day type="tue">2</day>
-							<day type="wed">3</day>
-							<day type="thu">4</day>
-							<day type="fri">5</day>
-							<day type="sat">6</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1-ci kv.</quarter>
-							<quarter type="2">2-ci kv.</quarter>
-							<quarter type="3">3-cü kv.</quarter>
-							<quarter type="4">4-cü kv.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-ci kvartal</quarter>
-							<quarter type="2">2-ci kvartal</quarter>
-							<quarter type="3">3-cü kvartal</quarter>
-							<quarter type="4">4-cü kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">eramızdan əvvəl</era>
-						<era type="1">bizim eramızın</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">e.É™.</era>
-						<era type="1">b.e.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d, MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM , y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>il</displayName>
-					</field>
-					<field type="month">
-						<displayName>ay</displayName>
-					</field>
-					<field type="week">
-						<displayName>həftə</displayName>
-					</field>
-					<field type="day">
-						<displayName>bu gün</displayName>
-						<relative type="-3">üç gün əvvəl</relative>
-						<relative type="-1">dünən</relative>
-						<relative type="0">bu gün</relative>
-						<relative type="1">sabah</relative>
-						<relative type="3">üç gün sonra</relative>
-					</field>
-					<field type="weekday">
-						<displayName>həftə günü</displayName>
-					</field>
-					<field type="hour">
-						<displayName>saat</displayName>
-					</field>
-					<field type="minute">
-						<displayName>dəqiqə</displayName>
-					</field>
-					<field type="second">
-						<displayName>saniyÉ™</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Bilinmir</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>rofera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>çənub polus</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>syova</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>moson</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Deyvis</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>vostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Keysi</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont de Urvile</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>makmurdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>rio qayegos</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>mendoza</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>san xuan</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>uÅŸuya</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La Rioha</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>san luis</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Katamarka</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Cucuy</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>tukuman</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos Ayres</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>perf</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Yukla</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Darvin</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelayd</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Broken Hil</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kuriye</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>melburn</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>sidney</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Brisbeyn</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lord Hove</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Ä°runepe</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branko</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>porto velo</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Kuyaba</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Kampo Qrande</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguayna</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>sao paulo</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Bahiya</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maseyo</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>resif</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>noronha</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Douson</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>vaythors</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Ä°nuvik</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>vənkuver</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Douson Krik</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>yelounayf</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Edmondton</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>svift kurent</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Kəmbric Bey</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>recina</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>vinipeq</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>resolut</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>reyni river</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>rankin inlet</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Koral Harbor</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>funder bey</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>nipiqon</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>toronto</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>montreal</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ä°qalut</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>panqnirtanq</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>monkton</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Halifaks</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Qus Bey</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Qleys Bey</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Blank-Sablon</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St Johns</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>KinÅŸasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>LubumbaÅŸi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Ä°ster</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>KaÅŸqar</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>urumçi</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Conqinq</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Qalapaqos</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanari</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Seuta</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>ponape</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Kosraye</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>tul</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>skoresbisund</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>DanmarkÅŸavn</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Cakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>pontiyanak</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Cayapura</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderböri</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Kirimati</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>tarava</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>qüzülorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almati</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kvajaleyn</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Maxiro</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>ulanbatar</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Coybalsan</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>tixuana</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Hermosilo</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>mazaltan</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Cihuvava</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>monterey</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>mexiko</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Kankun</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Kuçinq</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Çatam</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markuyesas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Qambiyer</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Madeyra</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kalininqrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>moskva</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>volqoqrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>samara</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>yekaterinburq</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>novosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Ä°rkutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>yakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>vladivostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>saxalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Maqadan</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamçatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadır</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ujgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiyev</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>simferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>zaporojye</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>midvey</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Conston</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>veyk</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>nom</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Ankorac</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>yakutat</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Cüneau</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Los Anceles</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Boyse</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>finiks</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>ÅŸiprok</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>nyu salem</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Orta, Åžimal Dakota</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Cikaqo</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>menomini</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>vinsenes</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>pitersburq</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>tell şəhəri</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Noks</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>vinamak</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marenqo</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Ä°ndianapolis</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Luisvil</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>vevey</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>montiçelo</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Detroyt</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>nyu york</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>səmərkənd</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Orta Avropa</standard>
-					<daylight>Orta Avropa/yay</daylight>
-				</long>
-				<short>
-					<standard>Orta Avropa/standart</standard>
-					<daylight>Orta Avropa/yaz</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Şərq Avropa</standard>
-					<daylight>Şərq Avropa/yay</daylight>
-				</long>
-				<short>
-					<standard>Şərq Avropa/standart</standard>
-					<daylight>Şərq Avropa/yaz</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>KuybuÅŸev</standard>
-					<daylight>KuybuÅŸev/yay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskva</generic>
-					<standard>Moskva/standart</standard>
-					<daylight>Moskva/yay</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara</standard>
-					<daylight>Samara/yay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Türkiya</standard>
-					<daylight>Türkiya/yay</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volqoqrad</standard>
-					<daylight>Volqoqrad/yay</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andora pesetası</displayName>
-				<displayName count="other">Andora pesetası</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Birləşmiş ərəb emiratlar dirhamı</displayName>
-				<displayName count="other">B�E dirhamı</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�fgəni (AFA)</displayName>
-				<displayName count="other">�fgən (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�fgəni</displayName>
-				<displayName count="other">�fgən</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Alban leki</displayName>
-				<displayName count="other">Alban leki</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Erməni dramı</displayName>
-				<displayName count="other">Erməni dramı</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Hollandiya antila gilderi</displayName>
-				<displayName count="other">Hollandiya Antila gilderi</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Anqola kvanzası</displayName>
-				<displayName count="other">Anqola kvanzasi</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Anqola kvanzasi (1977-1990)</displayName>
-				<displayName count="other">Anqola kvanzasi (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Anqola yeni kvanzası (1990-2000)</displayName>
-				<displayName count="other">Anqola yeni kvanzasi (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Anqola kvanzası (1995-1999)</displayName>
-				<displayName count="other">Anqola kvanzasi (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentina avstralı</displayName>
-				<displayName count="other">Argentina avstralı</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentina pesosu (1983-1985)</displayName>
-				<displayName count="other">Argentina pesosu (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentina pesosu</displayName>
-				<displayName count="other">Argentina pesosu</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Avstriya ÅŸilingi</displayName>
-				<displayName count="other">Avstriya ÅŸilingi</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Avstraliya dolları</displayName>
-				<displayName count="other">Avstraliya dolları</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba qilderi</displayName>
-				<displayName count="other">Aruba qilderi</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Manat</displayName>
-				<displayName count="other">Azərbaycan manatı (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azərbaycan manatı</displayName>
-				<displayName count="other">Azərbaycan manatı</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosniya-Herzeqovina dinarı</displayName>
-				<displayName count="other">Bosniya-Herzeqovina dinarı</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosniya-Herzeqovina markası</displayName>
-				<displayName count="other">Bosniya-Herzeqovina markası</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbados dolları</displayName>
-				<displayName count="other">Barbados dolları</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Banqladeş takası</displayName>
-				<displayName count="other">Banqladeş takası</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belçika frankı (deyşirik)</displayName>
-				<displayName count="other">Belçika frankı (deyşirik)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belçika frankı</displayName>
-				<displayName count="other">Belçika frankı</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belçika frankı (finans)</displayName>
-				<displayName count="other">Belçika frankı (finans)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bolqariya levası</displayName>
-				<displayName count="other">Bolqariya levası</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bolqariya yeni levası</displayName>
-				<displayName count="other">Bolqariya yeni levası</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreyn dinarı</displayName>
-				<displayName count="other">Bahreyn dinarı</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi frankası</displayName>
-				<displayName count="other">Burundi frankası</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda dolları</displayName>
-				<displayName count="other">Bermuda dolları</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Bruney dolları</displayName>
-				<displayName count="other">Bruney dolları</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="other">Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Boliviya pesosu</displayName>
-				<displayName count="other">Boliviya pesosu</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Boliviya mvdolı</displayName>
-				<displayName count="other">Boliviya mvdolı</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Braziliya kruzeyro novası</displayName>
-				<displayName count="other">Braziliya kruzeyro novası</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Braziliya kruzadosu</displayName>
-				<displayName count="other">Braziliya kruzadosu</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Braziliya kruzeyrosu (1990-1993)</displayName>
-				<displayName count="other">Braziliya kruzeyrosu (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Braziliya realı</displayName>
-				<displayName count="other">Braziliya realı</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Braziliya kruzado novası</displayName>
-				<displayName count="other">Braziliya kruzado novası</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Braziliya kruzeyrosu</displayName>
-				<displayName count="other">Braziliya kruzeyrosu</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahama dolları</displayName>
-				<displayName count="other">Bahama dolları</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Butan ngultrumu</displayName>
-				<displayName count="other">Butan ngultrumu</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmis kyatı</displayName>
-				<displayName count="other">Burmis kyatı</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botsvana pulası</displayName>
-				<displayName count="other">Botsvana pulası</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Belarusiya yeni rublu</displayName>
-				<displayName count="other">Belarusiya yeni rublu</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Belarusiya rublu</displayName>
-				<displayName count="other">Belarusiya rublu</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Beliz dolları</displayName>
-				<displayName count="other">Beliz dolları</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadiya dolları</displayName>
-				<displayName count="other">Kanada dolları</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Konqoliz frank konqolaysı</displayName>
-				<displayName count="other">Konqoliz frank konqolaysı</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR Yevrosu</displayName>
-				<displayName count="other">WIR Yevrosu</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>İsveçriya frankası</displayName>
-				<displayName count="other">İsveçriya frankası</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR frankası</displayName>
-				<displayName count="other">WIR frankası</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Çili pesosu</displayName>
-				<displayName count="other">Çili pesosu</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Çin yuan renminbi</displayName>
-				<displayName count="other">Çin yuanı</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolombiya pesosu</displayName>
-				<displayName count="other">Kolombiya pesosu</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kosta rika kolonu</displayName>
-				<displayName count="other">Kosta Rika kolonu</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Qədimi Serb dinarı</displayName>
-				<displayName count="other">Qədimi serb dinarı</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Çexoslavakiya korunası</displayName>
-				<displayName count="other">Çexoslavakiya korunası</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kuba pesosu</displayName>
-				<displayName count="other">Kuba pesosu</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kape Verde eskudosu</displayName>
-				<displayName count="other">Kape Verde eskudosu</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kipr paundu</displayName>
-				<displayName count="other">Kipr paundu</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Çex respublikası korunası</displayName>
-				<displayName count="other">Cex respublika korunası</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>şərq almaniya ostmarkı</displayName>
-				<displayName count="other">Şərq Almaniya ostmarkı</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>alman markası</displayName>
-				<displayName count="other">Alman markası</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>jibouti frankası</displayName>
-				<displayName count="other">Jibouti frankası</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Danemarka kronası</displayName>
-				<displayName count="other">Danemarka kronası</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominika pesosu</displayName>
-				<displayName count="other">Dominika pesosu</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alcəzir dinarı</displayName>
-				<displayName count="other">Alcəzir dinarı</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ekvador sukresi</displayName>
-				<displayName count="other">Ekvador sukresi</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estoniya krunu</displayName>
-				<displayName count="other">Estoniya krunu</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>misir paundu</displayName>
-				<displayName count="other">Misir paundu</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eirtreya nakfası</displayName>
-				<displayName count="other">Eritreya nakfası</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>İspan pesetası (A)</displayName>
-				<displayName count="other">İspan pesetası (A account)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>İspan pesetası (dəyşirik)</displayName>
-				<displayName count="other">İspan pesetası (dəyşirik)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>İspan pesetası</displayName>
-				<displayName count="other">İspan pesetası</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Efiopiya birası</displayName>
-				<displayName count="other">Efiopiya birası</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Yevro</displayName>
-				<displayName count="other">yevro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Fin markası</displayName>
-				<displayName count="other">Fin markası</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fici dolları</displayName>
-				<displayName count="other">Fici dolları</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Folkland Adası paundu</displayName>
-				<displayName count="other">Folkland adası paundu</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Fransız markası</displayName>
-				<displayName count="other">Fransız markası</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Britaniya paund sterlingi</displayName>
-				<displayName count="other">Britaniya paund sterlingi</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Gürcüstan kupon lariti</displayName>
-				<displayName count="other">Gürcüstan kupon lariti</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gürcüstan larisi</displayName>
-				<displayName count="other">Gürcüstan larisi</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Qana sedisi (1979-2007)</displayName>
-				<displayName count="other">Qana sedisi (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Qana sedisi</displayName>
-				<displayName count="other">Qana sedisi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltar paundu</displayName>
-				<displayName count="other">Gibraltar paundu</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Qambiya dalasi</displayName>
-				<displayName count="other">Qambiya dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Qvineya frankası</displayName>
-				<displayName count="other">qvineya frankası</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Qvineya sulisi</displayName>
-				<displayName count="other">Gineya sulisi</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekvatoriya Gvineya ekvele quneanası</displayName>
-				<displayName count="other">Ekvatoriya Gvineya ekvele quneanası</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Yunan draçması</displayName>
-				<displayName count="other">Yunan draxması</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Qvatemala küetzalı</displayName>
-				<displayName count="other">Qvatemala küetzalı</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugal Qvineya eskudosu</displayName>
-				<displayName count="other">Portugal Qvineya eskudosu</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Qvineya-Bisau pesosu</displayName>
-				<displayName count="other">Qvineya-Bisau pesosu</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Quyana dolları</displayName>
-				<displayName count="other">Quyana dolları</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Honk Konq dolları</displayName>
-				<displayName count="other">Honk Konq dolları</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduras lempirası</displayName>
-				<displayName count="other">Honduras lempirası</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Xorvatiya dinarı</displayName>
-				<displayName count="other">Xorvatiya dinarı</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Xorvatiya kunu</displayName>
-				<displayName count="other">Xorvatiya kunu</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haiti qourdu</displayName>
-				<displayName count="other">Haiti qourdu</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Macarıstan forinti</displayName>
-				<displayName count="other">Macarıstan forinti</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Ä°ndoneziya rupisi</displayName>
-				<displayName count="other">Ä°ndoneziya rupisi</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ä°rlandiya paundu</displayName>
-				<displayName count="other">Ä°rlandiya paundu</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Ä°zrail paundu</displayName>
-				<displayName count="other">Ä°zrail paundu</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Ä°zrail yeni ÅŸekeli</displayName>
-				<displayName count="other">Ä°zrail ail yeni ÅŸekeli</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Hindistan rupisi</displayName>
-				<displayName count="other">Hindistan rupisi</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>İraq dinarı</displayName>
-				<displayName count="other">İraq dinarı</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>İran rialı</displayName>
-				<displayName count="other">İran rialı</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Aysland kronası</displayName>
-				<displayName count="other">Aysland kronası</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>İtaliya lirası</displayName>
-				<displayName count="other">İtaliya lirası</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Yamayka dolları</displayName>
-				<displayName count="other">Yamayka dolları</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>İordaniya dinarı</displayName>
-				<displayName count="other">İordaniya dinarı</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yapon yeni</displayName>
-				<displayName count="other">Yapon yeni</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenya ÅŸillingi</displayName>
-				<displayName count="other">Kenya ÅŸillingi</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kırğızstan somu</displayName>
-				<displayName count="other">Kırğızstan somu</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodiya riyeli</displayName>
-				<displayName count="other">Kambodiya riyeli</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komoro frankı</displayName>
-				<displayName count="other">Komoro frankı</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Åžimal koreya vonu</displayName>
-				<displayName count="other">Åžimal Koreya vonu</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Cənub koreya vonu</displayName>
-				<displayName count="other">Cənub Koreya vonu</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuveyt dinarı</displayName>
-				<displayName count="other">Kuveyt dinarı</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Keyman Adaları dolları</displayName>
-				<displayName count="other">Keyman Adaları dolları</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazaxstan tenqesi</displayName>
-				<displayName count="other">Kazaxstan tenqesi</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laotiya kipi</displayName>
-				<displayName count="other">Laotiya kipi</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Lebanon paundu</displayName>
-				<displayName count="other">Lebanon paundu</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Åžri Lanka rupisi</displayName>
-				<displayName count="other">Åžri Lanka rupisi</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberiya dolları</displayName>
-				<displayName count="other">Liberiya dolları</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesoto lotisi</displayName>
-				<displayName count="other">Lesoto lotisi</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litva litası</displayName>
-				<displayName count="other">Litva litası</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litva talonası</displayName>
-				<displayName count="other">Litva talonası</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luksemburq frankası (dəyişik)</displayName>
-				<displayName count="other">Luksemburq dəyişik frankası</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luksemburq frankası</displayName>
-				<displayName count="other">Luksemburq frankası</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luksemburq frankası (finans)</displayName>
-				<displayName count="other">Luksemburq finans frankası</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latviya latsı</displayName>
-				<displayName count="other">Latviya latsı</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latviya rublu</displayName>
-				<displayName count="other">Latviya rublu</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Liviya dinarı</displayName>
-				<displayName count="other">Liviya dinarı</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Morokko dirhamı</displayName>
-				<displayName count="other">Morokko dirhamı</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Morokko frankası</displayName>
-				<displayName count="other">Morokko frankası</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldova leyusu</displayName>
-				<displayName count="other">Moldova leyusu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madaqaskar ariarisi</displayName>
-				<displayName count="other">Madaqaskar ariarisi</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madaqaskar frankası</displayName>
-				<displayName count="other">Madaqaskar frankası</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Masedoniya denarı</displayName>
-				<displayName count="other">Masedoniya denarı</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Mali frankı</displayName>
-				<displayName count="other">Mali frankı</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmar kiyatı</displayName>
-				<displayName count="other">Myanmar kiyatı</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Monqoliya tuqriki</displayName>
-				<displayName count="other">Monqoliya tuqriki</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Makao patakası</displayName>
-				<displayName count="other">Makao patakası</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mavritaniya oyuquyası</displayName>
-				<displayName count="other">Mavritaniya oyuquyası</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltiz paundu</displayName>
-				<displayName count="other">Maltiz paundu</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mavritis rupiyi</displayName>
-				<displayName count="other">Mavritis rupiyi</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldiv Adaları rufiyi</displayName>
-				<displayName count="other">Maldiv adaları rufiyi</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malavi kvaçası</displayName>
-				<displayName count="other">Malavi kvaçası</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksika pesosu</displayName>
-				<displayName count="other">Meksika pesosu</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Meksika gümüş pesosu</displayName>
-				<displayName count="other">Meksika gümüş pesosu</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysiya rinqiti</displayName>
-				<displayName count="other">Malaysiya rinqiti</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambik eskudosu</displayName>
-				<displayName count="other">Mozambik eskudosu</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Qədim Mozambik metikalı</displayName>
-				<displayName count="other">Qədim mozambik metikalı</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambik metikalı</displayName>
-				<displayName count="other">Mozambik metikalı</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibiya dolları</displayName>
-				<displayName count="other">Namibiya dolları</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigeriya nairi</displayName>
-				<displayName count="other">Nigeriya nairi</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaraqua kordobu</displayName>
-				<displayName count="other">Nikaraqua kordobu</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Hollandiya gilderi</displayName>
-				<displayName count="other">Hollandiya gilderi</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norveç kronu</displayName>
-				<displayName count="other">Norveç kronu</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepal rupiyi</displayName>
-				<displayName count="other">Nepal rupiyi</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Yeni Zelandiya dolları</displayName>
-				<displayName count="other">Yeni Zelandiya dolları</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Mman rialı</displayName>
-				<displayName count="other">Oman rialı</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamaniya balboa</displayName>
-				<displayName count="other">Panamaniya balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peru inti</displayName>
-				<displayName count="other">Peru inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peru sol nuyevosu</displayName>
-				<displayName count="other">Peru sol nuyevosu</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peru solu</displayName>
-				<displayName count="other">Peru solu</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua Yeni Qvineya kini</displayName>
-				<displayName count="other">Papua Yeni Qvineya kini</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipin pesosu</displayName>
-				<displayName count="other">Filipin pesosu</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistan rupiyi</displayName>
-				<displayName count="other">Pakistan rupiyi</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polsha zlotisi</displayName>
-				<displayName count="other">Polsha zlotisi</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Polsha zlotisi (1950-1995)</displayName>
-				<displayName count="other">Polsha zlotisi (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portuqal eskudosu</displayName>
-				<displayName count="other">Portuqal eskudosu</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraqvay quarani</displayName>
-				<displayName count="other">Paraqvay quarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatar rialı</displayName>
-				<displayName count="other">Qatar rialı</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rodezian dolları</displayName>
-				<displayName count="other">Rodezian dolları</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Qədim Roman leyu</displayName>
-				<displayName count="other">Roman qədimi leyu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Roman leyu</displayName>
-				<displayName count="other">Roman leyu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbiya dinarı</displayName>
-				<displayName count="other">Serbiya dinarı</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rusiya rublu</displayName>
-				<displayName count="other">Rusiya rublu</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rusiya rublu (1991-1998)</displayName>
-				<displayName count="other">Rusiya rublu (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rvanda frankı</displayName>
-				<displayName count="other">Rvanda frankı</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi riyalı</displayName>
-				<displayName count="other">Saudi riyalı</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Solomon Adaları dolları</displayName>
-				<displayName count="other">Solomon Adaları dolları</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seyçel rupiyi</displayName>
-				<displayName count="other">Seyçel rupiyi</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudan paundu</displayName>
-				<displayName count="other">Sudan paundu</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>İsveç kronu</displayName>
-				<displayName count="other">İsveç kronu</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Sinqapur dolları</displayName>
-				<displayName count="other">Sinqapur dolları</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Sloveniya toları</displayName>
-				<displayName count="other">Sloveniya toları</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovak korunası</displayName>
-				<displayName count="other">Slovak korunası</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somaliya ÅŸillingi</displayName>
-				<displayName count="other">Somaliya ÅŸillingi</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinam dolları</displayName>
-				<displayName count="other">Surinam dolları</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovet rublu</displayName>
-				<displayName count="other">Sovet rublu</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>el salvador kolonu</displayName>
-				<displayName count="other">El Salvador kolonu</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Siriya paundu</displayName>
-				<displayName count="other">Siriya paundu</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Svazilənd lilangeni</displayName>
-				<displayName count="other">Svazilənd lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>tay bahtı</displayName>
-				<displayName count="other">Tay bahtı</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tacikistan rublu</displayName>
-				<displayName count="other">Tacikistan rublu</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tacikistan somoni</displayName>
-				<displayName count="other">Tacikistan somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Türkmənistan manatı</displayName>
-				<displayName count="other">Türkmənistan manatı</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunis dinarı</displayName>
-				<displayName count="other">Tunis dinarı</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tonqa panqası</displayName>
-				<displayName count="other">Tonqa panqası</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timor eskudu</displayName>
-				<displayName count="other">Timor eskudu</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Türk köhnə lirası</displayName>
-				<displayName count="other">Türk köhnə lirası</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Türk lirası</displayName>
-				<displayName count="other">Türk lira</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Tayvan yeni dolları</displayName>
-				<displayName count="other">Tayvan yeni dolları</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzaniya ÅŸilingi</displayName>
-				<displayName count="other">Tanzaniya ÅŸilingi</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukraina hrivnyası</displayName>
-				<displayName count="other">Ukraina hrivnyası</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukraina karbovenesası</displayName>
-				<displayName count="other">Ukraina karbovenesası</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Uqanda ÅŸelingi (1966-1987)</displayName>
-				<displayName count="other">Uqanda ÅŸelingi (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Uqanda ÅŸelingi</displayName>
-				<displayName count="other">Uqanda ÅŸelingi</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ABŞ dolları</displayName>
-				<displayName count="other">ABŞ dolları</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>ABŞ dolları (yeni gün)</displayName>
-				<displayName count="other">ABŞ dolları (yeni gün)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>ABŞ dolları (həmin gün)</displayName>
-				<displayName count="other">ABŞ dolları (həmin gün)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruqvay pesosu Unidades Indexadas</displayName>
-				<displayName count="other">Uruqvay pesosu unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruqvay pesosu (1975-1993)</displayName>
-				<displayName count="other">Uruqvay pesosu (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruqvay pesosu (Uruguayo)</displayName>
-				<displayName count="other">Uruqvay pesosu</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>özbəkistan sumu</displayName>
-				<displayName count="other">Özbəkistan sumu</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venesuela bolivarı</displayName>
-				<displayName count="other">Venesuela bolivarı</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>venesuela bolivar fuerti</displayName>
-				<displayName count="other">Venesuela Bolivar fuerti</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>vyetnam donqu</displayName>
-				<displayName count="other">Vyetnam donqu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>qərb samoa talası</displayName>
-				<displayName count="other">Qərb Samoa talası</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>gümüş</displayName>
-				<displayName count="other">gümüş</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>qızıl</displayName>
-				<displayName count="other">qızıl</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>şərq karib dolları</displayName>
-				<displayName count="other">Şərq karib dolları</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Fransız gızıl frankı</displayName>
-				<displayName count="other">Fransız gızıl frankı</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Fransız UİC frankı</displayName>
-				<displayName count="other">Fransız UİC frankı</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA franka BCEAO</displayName>
-				<displayName count="other">CFA franka BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladium</displayName>
-				<displayName count="other">Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP frankı</displayName>
-				<displayName count="other">CFP frankı</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platinum</displayName>
-				<displayName count="other">platinum</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>bilinməyən vəya gəcərsiz</displayName>
-				<displayName count="other">bilinməyən vəya gəcərsiz</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>yemen dinarı</displayName>
-				<displayName count="other">Yemen dinarı</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>yemen rialı</displayName>
-				<displayName count="other">Yemen rialı</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Yuqoslaviya dinarı (hard)</displayName>
-				<displayName count="other">Yuqoslaviya dinarı (hard)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Yuqoslaviya yeni dinarı (hard)</displayName>
-				<displayName count="other">Yuqoslaviya yeni dinarı (hard)</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Yuqoslaviya dinarı (dəyişik)</displayName>
-				<displayName count="other">Yuqoslaviya dinarı (dəyişik)</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Cənub afrika randı (finans)</displayName>
-				<displayName count="other">Cənub Afrika randı (finans)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Cənub afrika randı</displayName>
-				<displayName count="other">Cənub Afrika randı</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambiya kvaçı</displayName>
-				<displayName count="other">Zambiya kvaçı</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zair yeni zairi</displayName>
-				<displayName count="other">Zair yeni zairi</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zair zairi</displayName>
-				<displayName count="other">Zair zairi</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabve dolları</displayName>
-				<displayName count="other">Zimbabve dolları</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} gün</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} saat</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} dəqiqə</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} ay</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} saniyÉ™</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} həftə</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} il</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>hÉ™:h</yesstr>
-			<nostr>yox:y</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/az_AZ.xml b/airtime_mvc/library/Zend/Locale/Data/az_AZ.xml
deleted file mode 100644
index 7f6ee7c7c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az_AZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.42 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="az"/>
-		<territory type="AZ"/>
-	</identity>
-	<alias source="az_Latn_AZ" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/az_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/az_Cyrl.xml
deleted file mode 100644
index 00a781f6f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az_Cyrl.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="az"/>
-		<script type="Cyrl"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="az">�зәрбајҹан</language>
-			<language type="de">алманҹа</language>
-			<language type="en">ин�или�ҹә</language>
-			<language type="es">и�панҹа</language>
-			<language type="fr">фран�ызҹа</language>
-			<language type="it">италјанҹа</language>
-			<language type="ja">јапонҹа</language>
-			<language type="pt">португалҹа</language>
-			<language type="ru">ру�ҹа</language>
-			<language type="zh">чинҹә</language>
-		</languages>
-		<territories>
-			<territory type="AZ">�зәрбајҹан</territory>
-			<territory type="BR">Бразилија</territory>
-			<territory type="CN">Чин</territory>
-			<territory type="DE">�лманија</territory>
-			<territory type="FR">Фран�а</territory>
-			<territory type="IN">Һинди�тан</territory>
-			<territory type="IT">Италија</territory>
-			<territory type="JP">Јапонија</territory>
-			<territory type="RU">Ру�ија</territory>
-			<territory type="US">�мерика Бирләшмиш Штатлары</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а ә б-г ғ д-й ј к � л-о ө п-у ү ф х һ ч ҹ ш ы]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ц щ ъ ь-�]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">јанвар</month>
-							<month type="2">феврал</month>
-							<month type="3">март</month>
-							<month type="4">апрел</month>
-							<month type="5">май</month>
-							<month type="6">ијун</month>
-							<month type="7">ијул</month>
-							<month type="8">авгу�т</month>
-							<month type="9">�ентјабр</month>
-							<month type="10">октјабр</month>
-							<month type="11">нојабр</month>
-							<month type="12">декабр</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun">базар</day>
-							<day type="mon">базар ертә�и</day>
-							<day type="tue">чәршәнбә ахшамы</day>
-							<day type="wed">чәршәнбә</day>
-							<day type="thu">ҹүмә ахшамы</day>
-							<day type="fri">ҹүмә</day>
-							<day type="sat">шәнбә</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="AZN">
-				<displayName>манат</displayName>
-				<symbol>ман.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/az_Cyrl_AZ.xml b/airtime_mvc/library/Zend/Locale/Data/az_Cyrl_AZ.xml
deleted file mode 100644
index 1a1ffdf33..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az_Cyrl_AZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.24 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="az"/>
-		<script type="Cyrl"/>
-		<territory type="AZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/az_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/az_Latn.xml
deleted file mode 100644
index 8a9e70541..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az_Latn.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="az"/>
-		<script type="Latn"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/az_Latn_AZ.xml b/airtime_mvc/library/Zend/Locale/Data/az_Latn_AZ.xml
deleted file mode 100644
index 9dbba4ebd..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/az_Latn_AZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.26 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="az"/>
-		<script type="Latn"/>
-		<territory type="AZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/be.xml b/airtime_mvc/library/Zend/Locale/Data/be.xml
deleted file mode 100644
index ff82b7deb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/be.xml
+++ /dev/null
@@ -1,1090 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.93 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="be"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ab">абхаз�ка�</language>
-			<language type="ady">адыгей�ка�</language>
-			<language type="af">афрыкаан�</language>
-			<language type="afa">афра-азі�цка� мова</language>
-			<language type="akk">акадзка�</language>
-			<language type="ale">алеуцка�</language>
-			<language type="am">амхар�ка�</language>
-			<language type="an">арагон�ка�</language>
-			<language type="ang">�тараанглій�ка�</language>
-			<language type="ar">араб�ка�</language>
-			<language type="arc">арамей�ка�</language>
-			<language type="art">штучна� мова</language>
-			<language type="as">а�ам�ка�</language>
-			<language type="ast">а�турый�ка�</language>
-			<language type="aus">аў�тралій�ка�</language>
-			<language type="av">авар�ка�</language>
-			<language type="ay">аймара</language>
-			<language type="az">азербайджан�ка�</language>
-			<language type="ba">башкір�ка�</language>
-			<language type="be">белару�ка�</language>
-			<language type="bg">балгар�ка�</language>
-			<language type="bh">біхары</language>
-			<language type="bn">бенгаль�ка�</language>
-			<language type="br">бр�тон�ка�</language>
-			<language type="bs">ба�ній�ка�</language>
-			<language type="bua">бурацка�</language>
-			<language type="ca">каталон�ка�</language>
-			<language type="cai">мова індзейцаў Ц�нтральнай �мерыкі</language>
-			<language type="cau">каўказ�ка� мова</language>
-			<language type="ce">чач�н�ка�</language>
-			<language type="cel">кельцка� мова</language>
-			<language type="chb">чыбча</language>
-			<language type="cop">копцка�</language>
-			<language type="cs">ч�ш�ка�</language>
-			<language type="cus">кушыцка� мова</language>
-			<language type="cv">чуваш�ка�</language>
-			<language type="cy">валій�ка�</language>
-			<language type="da">дацка�</language>
-			<language type="de">н�мецка�</language>
-			<language type="de_AT">н�мецка� (аў�тр.)</language>
-			<language type="de_CH">н�мецка� (швейц.)</language>
-			<language type="egy">�тара�гіпецка�</language>
-			<language type="el">гр�цка�</language>
-			<language type="en">англій�ка�</language>
-			<language type="en_AU">англій�ка� (аў�трал.)</language>
-			<language type="en_CA">англій�ка� (канад.)</language>
-			<language type="en_GB">англій�ка� (В�лікабрытані�)</language>
-			<language type="en_US">англій�ка� (ЗШ�)</language>
-			<language type="eo">��перанта</language>
-			<language type="es">і�пан�ка�</language>
-			<language type="es_419">і�пан�ка� (лацінаамер.)</language>
-			<language type="et">��тон�ка�</language>
-			<language type="eu">ба�к�ка�</language>
-			<language type="fa">фар�і</language>
-			<language type="fi">фін�ка�</language>
-			<language type="fil">тагаль�ка�</language>
-			<language type="fo">фар�р�ка�</language>
-			<language type="fr">француз�ка�</language>
-			<language type="fr_CA">француз�ка� (канад.)</language>
-			<language type="fr_CH">француз�ка� (швейц.)</language>
-			<language type="fro">�тарафранцуз�ка�</language>
-			<language type="fy">фрыз�ка�</language>
-			<language type="ga">ірланд�ка�</language>
-			<language type="gd">шатланд�ка� г�ль�ка�</language>
-			<language type="gl">галі�ій�ка�</language>
-			<language type="gn">гуарані</language>
-			<language type="grc">�тарагр�цка�</language>
-			<language type="gu">гу�раці</language>
-			<language type="he">іўрыт</language>
-			<language type="hi">хіндзі</language>
-			<language type="hr">харвацка�</language>
-			<language type="hu">венгер�ка�</language>
-			<language type="hy">арм�н�ка�</language>
-			<language type="ia">інт�рлінгва</language>
-			<language type="id">інданезій�ка�</language>
-			<language type="ie">інт�рлінгве</language>
-			<language type="is">і�ланд�ка�</language>
-			<language type="it">італь�н�ка�</language>
-			<language type="ja">�пон�ка�</language>
-			<language type="jv">�ван�ка�</language>
-			<language type="ka">грузін�ка�</language>
-			<language type="kk">казах�ка�</language>
-			<language type="kn">каннада</language>
-			<language type="ko">кар�й�ка�</language>
-			<language type="ku">курд�ка�</language>
-			<language type="la">лацін�ка�</language>
-			<language type="ln">лінгала</language>
-			<language type="lo">лао�ка�</language>
-			<language type="lol">монга</language>
-			<language type="lt">літоў�ка�</language>
-			<language type="luo">луо</language>
-			<language type="lv">латыш�ка�</language>
-			<language type="man">мандынга</language>
-			<language type="map">аў�транезій�ка�</language>
-			<language type="mas">ма�аі</language>
-			<language type="men">менд�</language>
-			<language type="mg">мальгаш�ка�</language>
-			<language type="mk">македон�ка�</language>
-			<language type="ml">мала�лам�ка�</language>
-			<language type="mn">манголь�ка�</language>
-			<language type="mo">малдаў�ка�</language>
-			<language type="mos">мо�і</language>
-			<language type="mr">маратхі</language>
-			<language type="ms">малай�ка�</language>
-			<language type="mt">мальтый�ка�</language>
-			<language type="nai">мова індзейцаў Паўночнай �мерыкі</language>
-			<language type="nb">нарв��ка� букмал</language>
-			<language type="ne">непаль�ка�</language>
-			<language type="nl">галанд�ка�</language>
-			<language type="nl_BE">фламанд�ка�</language>
-			<language type="nn">нарвеж�ка� (нюнор�к)</language>
-			<language type="no">нарвеж�ка�</language>
-			<language type="nog">нагай�ка�</language>
-			<language type="non">�таранарвеж�ка�</language>
-			<language type="nub">нубій�ка� мова</language>
-			<language type="oc">праван�аль�ка�</language>
-			<language type="oj">аджыбве</language>
-			<language type="or">оры�</language>
-			<language type="os">а�ецін�ка�</language>
-			<language type="pa">панджабі</language>
-			<language type="peo">�тарапер�ід�ка�</language>
-			<language type="phn">фінікій�ка�</language>
-			<language type="pl">поль�ка�</language>
-			<language type="pro">�тараправан�аль�ка�</language>
-			<language type="ps">пушту</language>
-			<language type="pt">партугаль�ка�</language>
-			<language type="pt_BR">партугаль�ка� (бразіл.)</language>
-			<language type="qu">кечуа</language>
-			<language type="raj">раджа�тхан�ка�</language>
-			<language type="rm">р�та-раман�ка�</language>
-			<language type="ro">румын�ка�</language>
-			<language type="ru">ру�ка�</language>
-			<language type="sa">�ан�крыт</language>
-			<language type="sah">�куцка�</language>
-			<language type="sai">мова індзейцаў Паўднёвай �мерыкі</language>
-			<language type="sd">�індхі</language>
-			<language type="sem">�еміцка� мова</language>
-			<language type="sga">�тараірланд�ка�</language>
-			<language type="sgn">знакава� мова</language>
-			<language type="sh">�ерб�ка-харвацка�</language>
-			<language type="si">�інгаль�ка�</language>
-			<language type="sit">кітай�ка-тыбецка� мова</language>
-			<language type="sk">�лавацка�</language>
-			<language type="sl">�лавен�ка�</language>
-			<language type="sla">�лав�н�ка� мова</language>
-			<language type="so">�амалій�ка�</language>
-			<language type="sq">албан�ка�</language>
-			<language type="sr">�ерб�ка�</language>
-			<language type="su">�удан�ка�</language>
-			<language type="sux">шумер�ка�</language>
-			<language type="sv">швед�ка�</language>
-			<language type="sw">�уахілі</language>
-			<language type="ta">таміль�ка�</language>
-			<language type="tai">мова таі</language>
-			<language type="te">т�лугу</language>
-			<language type="tg">таджык�ка�</language>
-			<language type="th">тай�ка�</language>
-			<language type="ti">тыгрынь�</language>
-			<language type="tk">туркмен�ка�</language>
-			<language type="tlh">клінгон</language>
-			<language type="tr">тур�цка�</language>
-			<language type="tt">татар�ка�</language>
-			<language type="tup">мова тупі</language>
-			<language type="tut">алтай�ка� мова</language>
-			<language type="tyv">тувін�ка�</language>
-			<language type="ug">уйгур�ка�</language>
-			<language type="uk">украін�ка�</language>
-			<language type="und">нев�дома� мова</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбек�ка�</language>
-			<language type="vi">в'етнам�ка�</language>
-			<language type="vo">валапюк</language>
-			<language type="xh">хо�а</language>
-			<language type="yi">ідыш</language>
-			<language type="zap">�апат�каў</language>
-			<language type="zh">кітай�ка�</language>
-			<language type="zh_Hans">�прошчана� кітай�ка�</language>
-			<language type="zh_Hant">традыцыйна� кітай�ка�</language>
-			<language type="zu">зулу</language>
-		</languages>
-		<scripts>
-			<script type="Arab">араб�кае</script>
-			<script type="Armn">арм�н�кае</script>
-			<script type="Cyrl">кірылічны</script>
-			<script type="Geor">грузін�кае</script>
-			<script type="Hans">�прошчанае кітай�кае</script>
-			<script type="Hant">традыцыйнае кітай�кае</script>
-			<script type="Hebr">габр�й�кае</script>
-			<script type="Jpan">�пон�кае</script>
-			<script type="Latn">лацін�кі</script>
-			<script type="Zxxx">чы�ты</script>
-			<script type="Zzzz">нев�домы або недапушчальны пераклад</script>
-		</scripts>
-		<territories>
-			<territory type="001">Свет</territory>
-			<territory type="002">�фрыка</territory>
-			<territory type="003">Паўночна� �м�рыка</territory>
-			<territory type="005">Паўднёва� �м�рыка</territory>
-			<territory type="009">�кі�ні�</territory>
-			<territory type="011">Заходн�� �фрыка</territory>
-			<territory type="013">Ц�нтральна� �м�рыка</territory>
-			<territory type="014">У�ходн�� �фрыка</territory>
-			<territory type="015">Паўночна� �фрыка</territory>
-			<territory type="017">Ц�нтральна� �фрыка</territory>
-			<territory type="018">Паўднёва� �фрыка</territory>
-			<territory type="019">Паўночна� і Паўднёва� �мерыкі</territory>
-			<territory type="021">ЗШ� і Канада</territory>
-			<territory type="029">Карыб�кі� а�травы</territory>
-			<territory type="030">У�ходн�� �зі�</territory>
-			<territory type="034">Паўднёва� �зі�</territory>
-			<territory type="035">Паўднёва-У�ходн�� �зі�</territory>
-			<territory type="039">Паўднёва� Еўропа</territory>
-			<territory type="053">�ў�тралі� і �ова� З�ланды�</territory>
-			<territory type="061">Палінезі�</territory>
-			<territory type="062">Паўднёва-Ц�нтральна� �зі�</territory>
-			<territory type="142">�зі�</territory>
-			<territory type="143">Ц�нтральна� �зі�</territory>
-			<territory type="145">Заходн�� �зі�</territory>
-			<territory type="150">Еўропа</territory>
-			<territory type="151">У�ходн�� Еўропа</territory>
-			<territory type="154">Паўночна� Еўропа</territory>
-			<territory type="155">Заходн�� Еўропа</territory>
-			<territory type="172">Садружна�ць �езалежных Дз�ржаў</territory>
-			<territory type="AD">�ндора</territory>
-			<territory type="AE">�б'�днаны� �раб�кі� Эміраты</territory>
-			<territory type="AF">�фгані�тан</territory>
-			<territory type="AG">�нтыгуа і Барбуда</territory>
-			<territory type="AI">�нгуілл�</territory>
-			<territory type="AL">�лбані�</territory>
-			<territory type="AM">�рмені�</territory>
-			<territory type="AN">�ід�рланд�кі� �нтылы</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктыка</territory>
-			<territory type="AR">�ргенціна</territory>
-			<territory type="AS">�мерыкан�кае Самоа</territory>
-			<territory type="AT">�ў�тры�</territory>
-			<territory type="AU">�ў�тралі�</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�кі� а�травы</territory>
-			<territory type="AZ">�зербайджан</territory>
-			<territory type="BA">Бо�ні� і Герцагавіна</territory>
-			<territory type="BB">Барбада�</territory>
-			<territory type="BD">Банглад�ш</territory>
-			<territory type="BE">Бельгі�</territory>
-			<territory type="BF">Буркіна-Фа�о</territory>
-			<territory type="BG">Балгары�</territory>
-			<territory type="BH">Бахр�йн</territory>
-			<territory type="BI">Бурундзі</territory>
-			<territory type="BJ">Бенін</territory>
-			<territory type="BM">Бермуд�кі� а�травы</territory>
-			<territory type="BN">Бруней-Дару�алам</territory>
-			<territory type="BO">Баліві�</territory>
-			<territory type="BR">Бразілі�</territory>
-			<territory type="BS">Багам�кі� ��травы</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">Був� во�траў</territory>
-			<territory type="BW">Бат�вана</territory>
-			<territory type="BY">Белару�ь</territory>
-			<territory type="BZ">Беліз</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Како�авы� а�травы</territory>
-			<territory type="CD">Конга, Д�макратычна� Р��публіка</territory>
-			<territory type="CF">Ц�нтральна-�фрыкан�ка� Р��публіка</territory>
-			<territory type="CG">Конга</territory>
-			<territory type="CH">Швейцары�</territory>
-			<territory type="CK">Кука а�травы</territory>
-			<territory type="CL">Чылі</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Кітай</territory>
-			<territory type="CO">Калумбі�</territory>
-			<territory type="CR">Ко�та-Рыка</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Каба-Верд�</territory>
-			<territory type="CX">Кал�даў во�траў</territory>
-			<territory type="CY">Кіпр</territory>
-			<territory type="CZ">Ч�хі�</territory>
-			<territory type="DE">Германі�</territory>
-			<territory type="DJ">Джыбуці</territory>
-			<territory type="DK">Дані�</territory>
-			<territory type="DM">Дамініка</territory>
-			<territory type="DO">Дамінікан�ка� Р��публіка</territory>
-			<territory type="DZ">�лжыр</territory>
-			<territory type="EC">Эквадор</territory>
-			<territory type="EE">Э�тоні�</territory>
-			<territory type="EG">Егіпет</territory>
-			<territory type="EH">Заходн�� Сахара</territory>
-			<territory type="ER">Эрытр��</territory>
-			<territory type="ES">І�пані�</territory>
-			<territory type="ET">Эфіопі�</territory>
-			<territory type="FI">Фінл�нды�</territory>
-			<territory type="FJ">Фіджы</territory>
-			<territory type="FK">Фолкл�нд�кі� а�травы</territory>
-			<territory type="FM">Мікранезі�</territory>
-			<territory type="FR">Францы�</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Велікабрытані�</territory>
-			<territory type="GD">Гр�нада</territory>
-			<territory type="GE">Грузі�</territory>
-			<territory type="GF">Француз�ка� Гві�на</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гібралтар</territory>
-			<territory type="GL">Гр�нланды�</territory>
-			<territory type="GM">Гамбі�</territory>
-			<territory type="GN">Гвіне�</territory>
-			<territory type="GP">Гвад�лупа</territory>
-			<territory type="GQ">Экватары�льна� Гвіне�</territory>
-			<territory type="GR">Гр�цы�</territory>
-			<territory type="GS">Паўднёва� Джорджы� і Паўднёвы� Сандвічавы а�травы</territory>
-			<territory type="GT">Гват�мала</territory>
-			<territory type="GW">Гвіне�-Бі�аў</territory>
-			<territory type="GY">Га�на</territory>
-			<territory type="HK">Гон-Конг, Кітай (С�Р)</territory>
-			<territory type="HM">Г�рда во�траў і МакДоналда а�травы</territory>
-			<territory type="HN">Гандура�</territory>
-			<territory type="HR">Харваты�</territory>
-			<territory type="HT">Гаіці</territory>
-			<territory type="HU">Венгры�</territory>
-			<territory type="ID">Інданезі�</territory>
-			<territory type="IE">Ірланды�</territory>
-			<territory type="IL">Ізраіль</territory>
-			<territory type="IN">Інды�</territory>
-			<territory type="IO">Брытан�ка� т�рыторы� Індый�кага акі�ну</territory>
-			<territory type="IQ">Ірак</territory>
-			<territory type="IR">Іран, І�лам�ка� Р��публіка</territory>
-			<territory type="IS">І�ланды�</territory>
-			<territory type="IT">Італі�</territory>
-			<territory type="JM">Ямайка</territory>
-			<territory type="JO">Іардані�</territory>
-			<territory type="JP">Японі�</territory>
-			<territory type="KE">Кені�</territory>
-			<territory type="KG">Кыргыз�тан</territory>
-			<territory type="KH">Камбоджа</territory>
-			<territory type="KI">Кірыбаці</territory>
-			<territory type="KM">Камор�кі� ��травы</territory>
-			<territory type="KN">С�нт-Кіт� і ��ві�</territory>
-			<territory type="KP">Паўночна� Кар��</territory>
-			<territory type="KR">Паўднёва� Кар��</territory>
-			<territory type="KW">Кувейт</territory>
-			<territory type="KY">Кайманавы а�травы</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">Лао�ка� �ародна-Д�макратычна� Р��публіка</territory>
-			<territory type="LB">Ліван</territory>
-			<territory type="LC">С�нт-Лю�і�</territory>
-			<territory type="LI">Ліхт�ншт�йн</territory>
-			<territory type="LK">Шры-Ланка</territory>
-			<territory type="LR">Ліберы�</territory>
-			<territory type="LS">Ле�ота</territory>
-			<territory type="LT">Літва</territory>
-			<territory type="LU">Люк�ембург</territory>
-			<territory type="LV">Латві�</territory>
-			<territory type="LY">Лівій�ка� �раб�ка� Джамахіры�</territory>
-			<territory type="MA">Марока</territory>
-			<territory type="MC">Манака</territory>
-			<territory type="MD">Малдова</territory>
-			<territory type="ME">Чарнагоры�</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршалавы ��травы</territory>
-			<territory type="MK">Македоні�, БЮР</territory>
-			<territory type="ML">Малі</territory>
-			<territory type="MM">М'�нма</territory>
-			<territory type="MN">Манголі�</territory>
-			<territory type="MO">Макао, Кітай (С�Р)</territory>
-			<territory type="MP">Паўночны� Мары�н�кі� а�травы</territory>
-			<territory type="MQ">Марцініка</territory>
-			<territory type="MR">Маўрытані�</territory>
-			<territory type="MS">Мон��рат</territory>
-			<territory type="MT">Мальта</territory>
-			<territory type="MU">Маўрыкій</territory>
-			<territory type="MV">Мальдыў�кі� ��травы</territory>
-			<territory type="MW">Малаві</territory>
-			<territory type="MX">Мек�іка</territory>
-			<territory type="MY">Малайзі�</territory>
-			<territory type="MZ">Мазамбік</territory>
-			<territory type="NA">�амібі�</territory>
-			<territory type="NC">�ова� Каледоні�</territory>
-			<territory type="NE">�ігер</territory>
-			<territory type="NF">�орфалк�кі� а�травы</territory>
-			<territory type="NG">�ігеры�</territory>
-			<territory type="NI">�ікарагуа</territory>
-			<territory type="NL">�ід�рланды</territory>
-			<territory type="NO">�арвегі�</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�іу�</territory>
-			<territory type="NZ">�ова� Зеланды�</territory>
-			<territory type="OM">�ман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Франуз�ка� Палін�зі�</territory>
-			<territory type="PG">Папуа-�ова� Гвіне�</territory>
-			<territory type="PH">Філіпіны</territory>
-			<territory type="PK">Пакі�тан</territory>
-			<territory type="PL">Польшча</territory>
-			<territory type="PS">Пале�тын�кі� т�рыторыі</territory>
-			<territory type="PT">Партугалі�</territory>
-			<territory type="PW">Палаў</territory>
-			<territory type="PY">Парагвай</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Вонкава� �кі�ні�</territory>
-			<territory type="QU">Еўрапей�кі Зв�з</territory>
-			<territory type="RE">Р�юньён</territory>
-			<territory type="RO">Румыні�</territory>
-			<territory type="RS">Сербі�</territory>
-			<territory type="RU">Ра�і�</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудаў�ка� �раві�</territory>
-			<territory type="SB">Саламонавы ��травы</territory>
-			<territory type="SC">Сейш�ль�кі� ��травы</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швецы�</territory>
-			<territory type="SG">Сінгапур</territory>
-			<territory type="SH">Св�той �лены, Во�траў</territory>
-			<territory type="SI">Славені�</territory>
-			<territory type="SJ">Свальбард (Паўночна-У�ходн�� З�мл�) і Ян-Маен</territory>
-			<territory type="SK">Славакі�</territory>
-			<territory type="SL">Сьера-Леон�</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Самалі</territory>
-			<territory type="SR">Сурынам</territory>
-			<territory type="ST">Сан-Том� і Прын�іпі</territory>
-			<territory type="SV">Сальвадор</territory>
-			<territory type="SY">Сірый�ка� �раб�ка� Р��публіка</territory>
-			<territory type="SZ">Свазіленд</territory>
-			<territory type="TC">Т�рк� і Кайка� а�травы</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Француз�кі� Паўднёвы� т�рыторыі</territory>
-			<territory type="TG">Тога</territory>
-			<territory type="TH">Тайланд</territory>
-			<territory type="TJ">Таджыкі�тан</territory>
-			<territory type="TK">Такелаў</territory>
-			<territory type="TL">У�ходні Тымор</territory>
-			<territory type="TM">Туркмені�тан</territory>
-			<territory type="TN">Туні�</territory>
-			<territory type="TO">Тангій�ка�</territory>
-			<territory type="TR">Турцы�</territory>
-			<territory type="TT">Трынідад і Табага</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тайвань</territory>
-			<territory type="TZ">Танзані�, �б'�днана� Р��публіка</territory>
-			<territory type="UA">Украіна</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="US">Злучаны� Штаты</territory>
-			<territory type="UY">Уругвай</territory>
-			<territory type="UZ">Узбекі�тан</territory>
-			<territory type="VA">Ватыкан</territory>
-			<territory type="VC">С�нт-Він��нт і Гр�надыны</territory>
-			<territory type="VE">Вене�у�ла</territory>
-			<territory type="VG">Віргін�кі� а�травы</territory>
-			<territory type="VI">Віргін�кі� а�травы, ЗШ�</territory>
-			<territory type="VN">В'етнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уолі� і Футуна</territory>
-			<territory type="WS">Самоа (Заходн�е)</territory>
-			<territory type="YE">Емен</territory>
-			<territory type="ZA">Паўднёва-�фрыкан�ка� Р��публіка</territory>
-			<territory type="ZM">Замбі�</territory>
-			<territory type="ZW">Зімбабв�</territory>
-			<territory type="ZZ">�ев�домы р�гіён</territory>
-		</territories>
-		<keys>
-			<key type="calendar">кал�ндар</key>
-			<key type="collation">параўнаньне т�к�ту</key>
-			<key type="currency">валюта</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">буды�цкі кал�ндар</type>
-			<type type="chinese" key="calendar">кітай�кі кал�ндар</type>
-			<type type="gregorian" key="calendar">гр�гары�н�кі кал�ндар</type>
-			<type type="hebrew" key="calendar">іуд�й�кі кал�ндар</type>
-			<type type="islamic" key="calendar">му�ульман�кі кал�ндар</type>
-			<type type="islamic-civil" key="calendar">му�ульман�кі �вецкі кал�ндар</type>
-			<type type="japanese" key="calendar">�пон�кі кал�ндар</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">метрычна�</measurementSystemName>
-			<measurementSystemName type="US">ЗШ�</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Мова: {0}</codePattern>
-			<codePattern type="script">Пі�ьмо: {0}</codePattern>
-			<codePattern type="territory">Р�гіён: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[а-д {дж} {дз} е ё ж з і й-у ў ф-ш ы-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>«</alternateQuotationStart>
-		<alternateQuotationEnd>»</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�ту</month>
-							<month type="2">лют</month>
-							<month type="3">�ак</month>
-							<month type="4">кра</month>
-							<month type="5">май</month>
-							<month type="6">ч�р</month>
-							<month type="7">ліп</month>
-							<month type="8">жні</month>
-							<month type="9">вер</month>
-							<month type="10">ка�</month>
-							<month type="11">лі�</month>
-							<month type="12">�не</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="5">Ñ‚</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�тудзень</month>
-							<month type="2">люты</month>
-							<month type="3">�акавік</month>
-							<month type="4">кра�авік</month>
-							<month type="5">май</month>
-							<month type="6">ч�рвень</month>
-							<month type="7">ліпень</month>
-							<month type="8">жнівень</month>
-							<month type="9">вера�ень</month>
-							<month type="10">ка�трычнік</month>
-							<month type="11">лі�тапад</month>
-							<month type="12">�нежань</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="5">тра</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">л</month>
-							<month type="3">�</month>
-							<month type="4">к</month>
-							<month type="5">м</month>
-							<month type="6">ч</month>
-							<month type="7">л</month>
-							<month type="8">ж</month>
-							<month type="9">в</month>
-							<month type="10">к</month>
-							<month type="11">л</month>
-							<month type="12">�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="5">травень</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">нд</day>
-							<day type="mon">пн</day>
-							<day type="tue">аў</day>
-							<day type="wed">�р</day>
-							<day type="thu">чц</day>
-							<day type="fri">пт</day>
-							<day type="sat">�б</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">н�дзел�</day>
-							<day type="mon">пан�дзелак</day>
-							<day type="tue">аўторак</day>
-							<day type="wed">�ерада</day>
-							<day type="thu">чацвер</day>
-							<day type="fri">п�тніца</day>
-							<day type="sat">�убота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">н</day>
-							<day type="mon">п</day>
-							<day type="tue">а</day>
-							<day type="wed">�</day>
-							<day type="thu">ч</day>
-							<day type="fri">п</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1-шы кв.</quarter>
-							<quarter type="2">2-гі кв.</quarter>
-							<quarter type="3">3-ці кв.</quarter>
-							<quarter type="4">4-ты кв.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-шы квартал</quarter>
-							<quarter type="2">2-гі квартал</quarter>
-							<quarter type="3">3-ці квартал</quarter>
-							<quarter type="4">4-ты квартал</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>да палудн�</am>
-				<pm>па�л� палудн�</pm>
-				<eras>
-					<eraNames>
-						<era type="0">да н.�.</era>
-						<era type="1">н.�.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">да н.е.</era>
-						<era type="1">н.е.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">да н.�.</era>
-						<era type="1">н.�.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMM d, EEEE</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, dd/MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q 'кв'. y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH.mm-HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH.mm-HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M - d.M</greatestDifference>
-							<greatestDifference id="M">d.M - d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M - E, d.M</greatestDifference>
-							<greatestDifference id="M">E, d.M - E, d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yy - M.yy</greatestDifference>
-							<greatestDifference id="y">M.yy - M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="M">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="y">d.M.yy - d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="M">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="y">E, d.M.yy - E, d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>�ра</displayName>
-					</field>
-					<field type="year">
-						<displayName>год</displayName>
-					</field>
-					<field type="month">
-						<displayName>ме��ц</displayName>
-					</field>
-					<field type="week">
-						<displayName>тыдзень</displayName>
-					</field>
-					<field type="day">
-						<displayName>дзень</displayName>
-						<relative type="-2">пазаўчора</relative>
-						<relative type="-1">учора</relative>
-						<relative type="0">�ённ�</relative>
-						<relative type="1">заўтра</relative>
-						<relative type="2">па�л�заўтра</relative>
-					</field>
-					<field type="weekday">
-						<displayName>дзень тыдн�</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>гадзіна</displayName>
-					</field>
-					<field type="minute">
-						<displayName>хвіліна</displayName>
-					</field>
-					<field type="second">
-						<displayName>�екунда</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Ча�: {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�ев�домы</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Рыё Бранка</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампа Гранд�</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сан-Паўлу</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Ганалулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�нкорыдж</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло�-�ндж�ла�</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Ф�нік�</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Д�нв�р</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чыкага</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Інды�напалі�</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�ью-�рк</exemplarCity>
-			</zone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Паўночнаам�рыкан�кі ц�нтральны ча�</generic>
-					<standard>Паўночнаам�рыкан�кі ц�нтральны �тандартны ча�</standard>
-					<daylight>Паўночнаам�рыкан�кі ц�нтральны летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Паўночнаам�рыкан�кі у�ходні ча�</generic>
-					<standard>Паўночнаам�рыкан�кі у�ходні �тандартны ча�</standard>
-					<daylight>Паўночнаам�рыкан�кі у�ходні летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Паўночнаам�рыкан�кі горны ча�</generic>
-					<standard>Паўночнаам�рыкан�кі горны �тандартны ча�</standard>
-					<daylight>Паўночнаам�рыкан�кі горны летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Ціхаакі�н�кі ча�</generic>
-					<standard>Ціхаакі�н�кі �тандартны ча�</standard>
-					<daylight>Ціхаакі�н�кі летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>�тл�нтычны ча�</generic>
-					<standard>�тл�нтычны �тандартны ча�</standard>
-					<daylight>�тл�нтычны летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ц�нтральна�ўрапей�кі ча�</standard>
-					<daylight>Ц�нтральна�ўрапей�кі летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>У�ходне�ўрапей�кі ча�</standard>
-					<daylight>У�ходне�ўрапей�кі летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Заходне�ўрапей�кі ча�</standard>
-					<daylight>Заходне�ўрапей�кі летні ча�</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Грынвіч�кі ча�</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AUD">
-				<displayName>аў�тралій�кі дал�р</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>бразіль�кі р�ал</displayName>
-			</currency>
-			<currency type="BYB">
-				<symbol>Руб</symbol>
-			</currency>
-			<currency type="BYR">
-				<displayName>белару�кі рубель</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>кітай�кі юань Renminbi</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�рытр�й�ка� накфа</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>еўра</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>англій�кі фунт</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>індый�ка� рупі�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>�пон�ка� іена</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName>нарв��ка� крона</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ру�кі рубель</displayName>
-				<symbol>ра�. руб.</symbol>
-			</currency>
-			<currency type="USD">
-				<displayName>долар ЗШ�</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="XXX">
-				<displayName>нев�дома� або недапушчальна� валюта</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} дні</unitPattern>
-			<unitPattern count="many">{0} дзён</unitPattern>
-			<unitPattern count="one">{0} дзень</unitPattern>
-			<unitPattern count="other">{0} дн�</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} гадзіны</unitPattern>
-			<unitPattern count="many">{0} гадзін</unitPattern>
-			<unitPattern count="one">{0} гадзіна</unitPattern>
-			<unitPattern count="other">{0} гадзіны</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} хвіліны</unitPattern>
-			<unitPattern count="many">{0} хвілін</unitPattern>
-			<unitPattern count="one">{0} хвіліна</unitPattern>
-			<unitPattern count="other">{0} хвіліны</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} ме��ца</unitPattern>
-			<unitPattern count="many">{0} ме��цаў</unitPattern>
-			<unitPattern count="one">{0} ме��ц</unitPattern>
-			<unitPattern count="other">{0} ме��ца</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} ��кунды</unitPattern>
-			<unitPattern count="many">{0} ��кунд</unitPattern>
-			<unitPattern count="one">{0} ��кунда</unitPattern>
-			<unitPattern count="other">{0} ��кунды</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} тыдні</unitPattern>
-			<unitPattern count="many">{0} тыдн�ў</unitPattern>
-			<unitPattern count="one">{0} тыдзень</unitPattern>
-			<unitPattern count="other">{0} тыдн�</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} гады</unitPattern>
-			<unitPattern count="many">{0} гадоў</unitPattern>
-			<unitPattern count="one">{0} год</unitPattern>
-			<unitPattern count="other">{0} году</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>так:т</yesstr>
-			<nostr>не:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/be_BY.xml b/airtime_mvc/library/Zend/Locale/Data/be_BY.xml
deleted file mode 100644
index b53d712e8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/be_BY.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="be"/>
-		<territory type="BY"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bg.xml b/airtime_mvc/library/Zend/Locale/Data/bg.xml
deleted file mode 100644
index fb1ad0af4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bg.xml
+++ /dev/null
@@ -1,3960 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.122 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="bg"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">афар</language>
-			<language type="ab">абхаз�ки</language>
-			<language type="ace">ачин�ки</language>
-			<language type="ach">аколи</language>
-			<language type="ada">адангме</language>
-			<language type="ady">адиге</language>
-			<language type="ae">аве�т�ки</language>
-			<language type="af">африкан�</language>
-			<language type="afa">афро-азиат�ки</language>
-			<language type="afh">африхили</language>
-			<language type="ain">айну</language>
-			<language type="ak">акан</language>
-			<language type="akk">акад�ки</language>
-			<language type="ale">алеут�ки</language>
-			<language type="alg">алгонквин</language>
-			<language type="alt">южноалтай�ки</language>
-			<language type="am">амхар�ки</language>
-			<language type="an">арагон�ки</language>
-			<language type="ang">�тароанглий�ки</language>
-			<language type="anp">ангика</language>
-			<language type="apa">езици на апахите</language>
-			<language type="ar">араб�ки</language>
-			<language type="arc">арамей�ки</language>
-			<language type="arn">мапуче</language>
-			<language type="arp">арапахо</language>
-			<language type="art">изку�твен</language>
-			<language type="arw">аравак</language>
-			<language type="as">а�ам�ки</language>
-			<language type="ast">а�тур�ки</language>
-			<language type="ath">атаба�ки езици</language>
-			<language type="aus">ав�тралий�ки езици</language>
-			<language type="av">авар�ки</language>
-			<language type="awa">авади</language>
-			<language type="ay">аймара</language>
-			<language type="az">азърбайджан�ки</language>
-			<language type="ba">башкир�ки</language>
-			<language type="bad">банда</language>
-			<language type="bai">бамикеле</language>
-			<language type="bal">балучи</language>
-			<language type="ban">балиней�ки</language>
-			<language type="bas">ба�а</language>
-			<language type="bat">балтий�ки</language>
-			<language type="be">белару�ки</language>
-			<language type="bej">бе�</language>
-			<language type="bem">бемба</language>
-			<language type="ber">бербер�ки</language>
-			<language type="bg">българ�ки</language>
-			<language type="bh">бихари</language>
-			<language type="bho">божпури</language>
-			<language type="bi">би�лама</language>
-			<language type="bik">бикол�ки</language>
-			<language type="bin">бини</language>
-			<language type="bla">�ик�ика</language>
-			<language type="bm">бамбара</language>
-			<language type="bn">бенгал�ки</language>
-			<language type="bnt">банту</language>
-			<language type="bo">тибет�ки</language>
-			<language type="br">бретон�ки</language>
-			<language type="bra">брадж</language>
-			<language type="bs">бо�нен�ки</language>
-			<language type="btk">батак</language>
-			<language type="bua">бур�т�ки</language>
-			<language type="bug">бугин�ки</language>
-			<language type="byn">билен�ки</language>
-			<language type="ca">каталон�ки</language>
-			<language type="cad">каддо</language>
-			<language type="cai">централноамерикан�ки индиан�ки</language>
-			<language type="car">кариб�ки</language>
-			<language type="cau">кавказ�ки</language>
-			<language type="cch">ат�ам</language>
-			<language type="ce">чечен�ки</language>
-			<language type="ceb">�ебуано</language>
-			<language type="cel">келт�ки</language>
-			<language type="ch">чаморо</language>
-			<language type="chb">чибча</language>
-			<language type="chg">чагатай</language>
-			<language type="chk">чуук</language>
-			<language type="chm">марий�ки</language>
-			<language type="chn">жаргон чинуук</language>
-			<language type="cho">чокто</language>
-			<language type="chp">чиипув�ки</language>
-			<language type="chr">чероки</language>
-			<language type="chy">чейен�ки</language>
-			<language type="cmc">чам�ки</language>
-			<language type="co">кор�икан�ки</language>
-			<language type="cop">копт�ки</language>
-			<language type="cpe">креол�ки или пиджин от англий�ки</language>
-			<language type="cpf">креол�ки и пиджин от френ�ки</language>
-			<language type="cpp">креол�ки или пиджин от португал�ки</language>
-			<language type="cr">крии</language>
-			<language type="crh">крим�котатар�ки</language>
-			<language type="crp">креол�ки или пиджини</language>
-			<language type="cs">чешки</language>
-			<language type="csb">кашуб�ки</language>
-			<language type="cu">църковно �лав�н�ки</language>
-			<language type="cus">кушит�ки езици</language>
-			<language type="cv">чувашки</language>
-			<language type="cy">уел�ки</language>
-			<language type="da">дат�ки</language>
-			<language type="dak">дакот�ки</language>
-			<language type="dar">даргва</language>
-			<language type="day">да�к�ки</language>
-			<language type="de">нем�ки</language>
-			<language type="de_AT">ав�трий�ки нем�ки</language>
-			<language type="de_CH">швейцар�ки горногерман�ки</language>
-			<language type="del">делауер</language>
-			<language type="den">�лейви</language>
-			<language type="dgr">догриб</language>
-			<language type="din">динка</language>
-			<language type="doi">догри</language>
-			<language type="dra">дравид�ки езици</language>
-			<language type="dsb">долно�ерб�ки</language>
-			<language type="dua">дуала</language>
-			<language type="dum">�редновековен холанд�ки</language>
-			<language type="dv">дивехи</language>
-			<language type="dyu">диула</language>
-			<language type="dz">дзонха</language>
-			<language type="ee">еуе</language>
-			<language type="efi">ефик</language>
-			<language type="egy">египет�ки</language>
-			<language type="eka">екажук</language>
-			<language type="el">гръцки</language>
-			<language type="elx">еламит�ки</language>
-			<language type="en">англий�ки</language>
-			<language type="en_AU">ав�тралий�ки англий�ки</language>
-			<language type="en_CA">канад�ки англий�ки</language>
-			<language type="en_GB">британ�ки англий�ки</language>
-			<language type="en_US">американ�ки англий�ки</language>
-			<language type="enm">�редновековен англий�ки</language>
-			<language type="eo">е�перанто</language>
-			<language type="es">и�пан�ки</language>
-			<language type="es_419">латиноамерикан�ки и�пан�ки</language>
-			<language type="es_ES">иберий�ки и�пан�ки</language>
-			<language type="et">е�тон�ки</language>
-			<language type="eu">ба�ки</language>
-			<language type="ewo">евондо</language>
-			<language type="fa">пер�ий�ки</language>
-			<language type="fan">фанг</language>
-			<language type="fat">фанти</language>
-			<language type="ff">фула</language>
-			<language type="fi">фин�ки</language>
-			<language type="fil">филипин�ки</language>
-			<language type="fiu">угрофин�ки</language>
-			<language type="fj">фиджий�ки</language>
-			<language type="fo">фарьор�ки</language>
-			<language type="fon">фон</language>
-			<language type="fr">френ�ки</language>
-			<language type="fr_CA">канад�ки френ�ки</language>
-			<language type="fr_CH">швейцар�ки френ�ки</language>
-			<language type="frm">�редновековен френ�ки</language>
-			<language type="fro">�тарофрен�ки</language>
-			<language type="frr">�еверен фриз�ки</language>
-			<language type="frs">източен фриз�ки</language>
-			<language type="fur">фриулиан�ки</language>
-			<language type="fy">фризий�ки</language>
-			<language type="ga">ирланд�ки</language>
-			<language type="gaa">га</language>
-			<language type="gay">гайо</language>
-			<language type="gba">гба�</language>
-			<language type="gd">шотланд�ки гал�ки</language>
-			<language type="gem">герман�ки</language>
-			<language type="gez">гииз</language>
-			<language type="gil">гилберт�ки</language>
-			<language type="gl">гали�ий�ки</language>
-			<language type="gmh">�редновековен нем�ки</language>
-			<language type="gn">гуарани</language>
-			<language type="goh">�тарови�оконем�ки</language>
-			<language type="gon">гонди</language>
-			<language type="gor">горонтало</language>
-			<language type="got">готиче�ки</language>
-			<language type="grb">гребо</language>
-			<language type="grc">древногръцки</language>
-			<language type="gsw">швейцар�ки нем�ки</language>
-			<language type="gu">гуджарати</language>
-			<language type="gv">манк�ки</language>
-			<language type="gwi">гвичин</language>
-			<language type="ha">хауза</language>
-			<language type="hai">хайда</language>
-			<language type="haw">хавай�ки</language>
-			<language type="he">иврит</language>
-			<language type="hi">хинди</language>
-			<language type="hil">хилигайнон</language>
-			<language type="him">химачали</language>
-			<language type="hit">хит�ки</language>
-			<language type="hmn">хмонг</language>
-			<language type="ho">хири моту</language>
-			<language type="hr">хърват�ки</language>
-			<language type="hsb">горно�ерб�ки</language>
-			<language type="ht">хаит�н�ки</language>
-			<language type="hu">унгар�ки</language>
-			<language type="hup">хупа</language>
-			<language type="hy">армен�ки</language>
-			<language type="hz">хереро</language>
-			<language type="ia">интерлингва</language>
-			<language type="iba">ибан</language>
-			<language type="id">индонезий�ки</language>
-			<language type="ie">ок�идентал</language>
-			<language type="ig">игбо</language>
-			<language type="ii">�ечуан�ки</language>
-			<language type="ijo">иджо</language>
-			<language type="ik">инупиак</language>
-			<language type="ilo">илоко</language>
-			<language type="inc">индий�ка група</language>
-			<language type="ine">индо-европей�ки</language>
-			<language type="inh">ингушет�ки</language>
-			<language type="io">идо</language>
-			<language type="ira">иран�ки</language>
-			<language type="iro">ироквиан�ки езици</language>
-			<language type="is">и�ланд�ки</language>
-			<language type="it">италиан�ки</language>
-			<language type="iu">инуктитут</language>
-			<language type="ja">�пон�ки</language>
-			<language type="jbo">лоджбан</language>
-			<language type="jpr">еврей�ко-пер�ий�ки</language>
-			<language type="jrb">еврей�ко-араб�ки</language>
-			<language type="jv">�ван�ки</language>
-			<language type="ka">грузин�ки</language>
-			<language type="kaa">каракалпашки</language>
-			<language type="kab">кабил�ки</language>
-			<language type="kac">качин�ки</language>
-			<language type="kaj">жжи</language>
-			<language type="kam">камба</language>
-			<language type="kar">карен�ки</language>
-			<language type="kaw">кави</language>
-			<language type="kbd">кабардиан</language>
-			<language type="kcg">туап</language>
-			<language type="kfo">коро</language>
-			<language type="kg">конгоан�ки</language>
-			<language type="kha">кха�и</language>
-			<language type="khi">езици кои�ан</language>
-			<language type="kho">кот�ки</language>
-			<language type="ki">кикуйу</language>
-			<language type="kj">кван�ма</language>
-			<language type="kk">казах�ки</language>
-			<language type="kl">гренланд�ки е�кимо�ки</language>
-			<language type="km">кхмер�ки</language>
-			<language type="kmb">кимбунду</language>
-			<language type="kn">каннада</language>
-			<language type="ko">корей�ки</language>
-			<language type="kok">конкани</language>
-			<language type="kos">ко�раен</language>
-			<language type="kpe">кпеле</language>
-			<language type="kr">канури</language>
-			<language type="krc">карачай-балкар�ки</language>
-			<language type="krl">карел�ки</language>
-			<language type="kro">кру</language>
-			<language type="kru">курук</language>
-			<language type="ks">кашмир�ки</language>
-			<language type="ku">кюрд�ки</language>
-			<language type="kum">кумик�ки</language>
-			<language type="kut">кутенай</language>
-			<language type="kv">Коми</language>
-			<language type="kw">корнуол�ки келт�ки</language>
-			<language type="ky">киргиз�ки</language>
-			<language type="la">латин�ки</language>
-			<language type="lad">ладино</language>
-			<language type="lah">лахнда</language>
-			<language type="lam">ламба</language>
-			<language type="lb">люк�ембург�ки</language>
-			<language type="lez">лезгин�ки</language>
-			<language type="lg">ганда</language>
-			<language type="li">лимбург�ки</language>
-			<language type="ln">лингала</language>
-			<language type="lo">лао�ки</language>
-			<language type="lol">монго</language>
-			<language type="loz">лози</language>
-			<language type="lt">литов�ки</language>
-			<language type="lu">луба катанга</language>
-			<language type="lua">луба-лулуа</language>
-			<language type="lui">луи�еньо</language>
-			<language type="lun">лунда</language>
-			<language type="luo">луо</language>
-			<language type="lus">лушаи</language>
-			<language type="lv">латвий�ки</language>
-			<language type="mad">мадур�ки</language>
-			<language type="mag">магахи</language>
-			<language type="mai">майтхили</language>
-			<language type="mak">мака�ар</language>
-			<language type="man">мандинго</language>
-			<language type="map">ав�тронезий�ки</language>
-			<language type="mas">ма�ай�ки</language>
-			<language type="mdf">мокша</language>
-			<language type="mdr">мандар</language>
-			<language type="men">менде</language>
-			<language type="mg">малгашки</language>
-			<language type="mga">�редновековен ирланд�ки</language>
-			<language type="mh">маршалезе</language>
-			<language type="mi">маор�ки</language>
-			<language type="mic">микмак</language>
-			<language type="min">минангбау</language>
-			<language type="mis">други езици</language>
-			<language type="mk">македон�ки</language>
-			<language type="mkh">мон-кхмер�ки език</language>
-			<language type="ml">мала�лам</language>
-			<language type="mn">монгол�ки</language>
-			<language type="mnc">манчжур�ки</language>
-			<language type="mni">манипури</language>
-			<language type="mno">манобо</language>
-			<language type="mo">молдов�ки</language>
-			<language type="moh">мохавк</language>
-			<language type="mos">мо�и</language>
-			<language type="mr">маратхи</language>
-			<language type="ms">малай�ки</language>
-			<language type="mt">малтий�ки</language>
-			<language type="mul">многоезични</language>
-			<language type="mun">мунда</language>
-			<language type="mus">крик</language>
-			<language type="mwl">мирандий�ки</language>
-			<language type="mwr">марвари</language>
-			<language type="my">бирман�ки</language>
-			<language type="myn">май� език</language>
-			<language type="myv">ерзиа</language>
-			<language type="na">науру</language>
-			<language type="nah">нахуатл</language>
-			<language type="nai">�еверноамерикан�ки индиан�ки</language>
-			<language type="nap">неаполитан�ки</language>
-			<language type="nb">норвежки бокмал</language>
-			<language type="nd">�еверен ндебеле</language>
-			<language type="nds">долно�ак�он�ки</language>
-			<language type="ne">непал�ки</language>
-			<language type="new">невар�ки</language>
-			<language type="ng">ндонга</language>
-			<language type="nia">ниа�</language>
-			<language type="nic">нигер-кордофан�ки</language>
-			<language type="niu">ниуеан</language>
-			<language type="nl">холанд�ки</language>
-			<language type="nl_BE">фламанд�ки</language>
-			<language type="nn">�ъвременен норвежки</language>
-			<language type="no">норвежки</language>
-			<language type="nog">ногаи</language>
-			<language type="non">�таронорвеж�ки</language>
-			<language type="nqo">н’ко</language>
-			<language type="nr">южен ндебеле</language>
-			<language type="nso">�еверен �ото</language>
-			<language type="nub">нубий�ки езици</language>
-			<language type="nv">навахо</language>
-			<language type="nwc">кла�иче�ки невари</language>
-			<language type="ny">чин�нджа</language>
-			<language type="nym">ниамвези</language>
-			<language type="nyn">нианколе</language>
-			<language type="nyo">нуоро</language>
-			<language type="nzi">нзима</language>
-			<language type="oc">ок�итан�ки</language>
-			<language type="oj">оджибва</language>
-			<language type="om">оромо</language>
-			<language type="or">ори�</language>
-			<language type="os">о�ет�ки</language>
-			<language type="osa">о�еджи</language>
-			<language type="ota">отоман�ки тур�ки</language>
-			<language type="oto">�таротур�ки езици</language>
-			<language type="pa">пенджаб�ки</language>
-			<language type="paa">папуа�ки</language>
-			<language type="pag">панга�инан</language>
-			<language type="pal">пехлевий�ки</language>
-			<language type="pam">пампанга</language>
-			<language type="pap">папиаменту</language>
-			<language type="pau">палауан</language>
-			<language type="peo">�таропер�ий�ки</language>
-			<language type="phi">филипин�ки (други)</language>
-			<language type="phn">финикий�ки</language>
-			<language type="pi">пали</language>
-			<language type="pl">пол�ки</language>
-			<language type="pon">похнпеиан</language>
-			<language type="pra">пракрит�ки език</language>
-			<language type="pro">прован�ал�ки</language>
-			<language type="ps">пущу</language>
-			<language type="pt">португал�ки</language>
-			<language type="qu">кечуа</language>
-			<language type="raj">раджа�тан�ки</language>
-			<language type="rap">рапа нуи</language>
-			<language type="rar">рапотонган</language>
-			<language type="rm">ретороман�ки</language>
-			<language type="rn">рунди</language>
-			<language type="ro">румън�ки</language>
-			<language type="roa">роман�ки</language>
-			<language type="rom">циган�ки език</language>
-			<language type="root">роот</language>
-			<language type="ru">ру�ки</language>
-			<language type="rup">арумън�ки</language>
-			<language type="rw">кин�руанда</language>
-			<language type="sa">�анк�крит�ки</language>
-			<language type="sad">�андве</language>
-			<language type="sah">�кут�ки</language>
-			<language type="sai">южноамерикан�ки индиан�ки</language>
-			<language type="sal">�алишан�ки език</language>
-			<language type="sam">�амаритан�ки арамей�ки</language>
-			<language type="sas">�а�ак</language>
-			<language type="sat">�антали</language>
-			<language type="sc">�ардин�ки</language>
-			<language type="scn">�ицилиан�ки</language>
-			<language type="sco">шотланд�ки</language>
-			<language type="sd">�индхи</language>
-			<language type="se">�еверен �ами</language>
-			<language type="sel">�елкуп</language>
-			<language type="sem">�емит�ки</language>
-			<language type="sg">�анго</language>
-			<language type="sga">�тароирланд�ки</language>
-			<language type="sgn">же�томимичен език</language>
-			<language type="sh">�ърбохърват�ки</language>
-			<language type="shn">шан</language>
-			<language type="si">�инхал�ки</language>
-			<language type="sid">�идамо</language>
-			<language type="sio">език �иу</language>
-			<language type="sit">�инотибет�ки</language>
-			<language type="sk">�ловашки</language>
-			<language type="sl">�ловен�ки</language>
-			<language type="sla">�лав�н�ки</language>
-			<language type="sm">�амоан�ки</language>
-			<language type="sma">южно�аам�ки</language>
-			<language type="smi">�аам�ки езици</language>
-			<language type="smj">луле-�аам�ки</language>
-			<language type="smn">инари-�аам�ки</language>
-			<language type="sms">�колт-�аам�ки</language>
-			<language type="sn">шона</language>
-			<language type="snk">�онинке</language>
-			<language type="so">�омалий�ки</language>
-			<language type="sog">�огдий�ки</language>
-			<language type="son">�онгхай</language>
-			<language type="sq">албан�ки</language>
-			<language type="sr">�ръб�ки</language>
-			<language type="srn">�ранан тонго</language>
-			<language type="srr">�ерер</language>
-			<language type="ss">�уази</language>
-			<language type="ssa">нило-�ахар�ки език</language>
-			<language type="st">�е�уто</language>
-			<language type="su">�ундан�ки</language>
-			<language type="suk">�укума</language>
-			<language type="sus">�у�у</language>
-			<language type="sux">шумер�ки</language>
-			<language type="sv">швед�ки</language>
-			<language type="sw">�уахили</language>
-			<language type="syc">кла�иче�ки �ирий�ки</language>
-			<language type="syr">�ирий�ки</language>
-			<language type="ta">тамил�ки</language>
-			<language type="tai">тайланд�ки</language>
-			<language type="te">телугу</language>
-			<language type="tem">темне</language>
-			<language type="ter">терено</language>
-			<language type="tet">тетум</language>
-			<language type="tg">таджик�ки</language>
-			<language type="th">таи</language>
-			<language type="ti">тигрин�</language>
-			<language type="tig">тигре</language>
-			<language type="tiv">тив</language>
-			<language type="tk">туркмен�ки</language>
-			<language type="tkl">токелай�ки</language>
-			<language type="tl">тагалог</language>
-			<language type="tlh">клингон</language>
-			<language type="tli">тлингит</language>
-			<language type="tmh">тамашек</language>
-			<language type="tn">т�вана</language>
-			<language type="to">тонга</language>
-			<language type="tog">ниан�а тонга</language>
-			<language type="tpi">ток пи�ин</language>
-			<language type="tr">тур�ки</language>
-			<language type="ts">т�онга</language>
-			<language type="tsi">цимшиан�ки</language>
-			<language type="tt">татар�ки</language>
-			<language type="tum">тумбука</language>
-			<language type="tup">тупи</language>
-			<language type="tut">алтай�ки</language>
-			<language type="tvl">тувалуан�ки</language>
-			<language type="tw">туи</language>
-			<language type="ty">таит�н�ки</language>
-			<language type="tyv">тувин�ки</language>
-			<language type="udm">удмурт�ки</language>
-			<language type="ug">уйгур�ки</language>
-			<language type="uga">угарит�ки</language>
-			<language type="uk">украин�ки</language>
-			<language type="umb">умбунду</language>
-			<language type="und">неопределен</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбек�ки</language>
-			<language type="vai">ваи</language>
-			<language type="ve">венда</language>
-			<language type="vi">виетнам�ки</language>
-			<language type="vo">волапюк</language>
-			<language type="vot">вотик</language>
-			<language type="wa">валон�ки</language>
-			<language type="wak">вакашан�ки език</language>
-			<language type="wal">валамо</language>
-			<language type="war">варай</language>
-			<language type="was">уашо</language>
-			<language type="wen">лужишки език</language>
-			<language type="wo">волоф</language>
-			<language type="xal">калмик</language>
-			<language type="xh">к�о�а</language>
-			<language type="yao">�о</language>
-			<language type="yap">�пезе</language>
-			<language type="yi">идиш</language>
-			<language type="yo">йоруба</language>
-			<language type="ypk">юпик</language>
-			<language type="za">зуанг</language>
-			<language type="zap">запотек</language>
-			<language type="zbl">бли� �имволи</language>
-			<language type="zen">зенага</language>
-			<language type="zh">китай�ки</language>
-			<language type="zh_Hans">опро�тен китай�ки</language>
-			<language type="zh_Hant">традиционен китай�ки</language>
-			<language type="znd">занде</language>
-			<language type="zu">зулу�ки</language>
-			<language type="zun">зуни</language>
-			<language type="zxx">без лингви�тично �ъдържание</language>
-			<language type="zza">заза</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�раб�ка</script>
-			<script type="Armi">�рамей�ка</script>
-			<script type="Armn">�рмен�ка</script>
-			<script type="Avst">�ве�тан�ка</script>
-			<script type="Bali">Балий�ки</script>
-			<script type="Batk">Батак�ка</script>
-			<script type="Beng">Бенгал�ка</script>
-			<script type="Blis">Бли� �имволи</script>
-			<script type="Bopo">Бопомофо</script>
-			<script type="Brah">Брахми</script>
-			<script type="Brai">Брайлова</script>
-			<script type="Bugi">Бугин�ка</script>
-			<script type="Buhd">Бухид</script>
-			<script type="Cakm">Чакма</script>
-			<script type="Cans">Унифицирани �имволи на канад�ки аборигени</script>
-			<script type="Cari">Карий�ка</script>
-			<script type="Cham">Хамит�ка</script>
-			<script type="Cher">Чероки</script>
-			<script type="Cirt">Кирт</script>
-			<script type="Copt">Копт�ка</script>
-			<script type="Cprt">Кипър�ка</script>
-			<script type="Cyrl">Кирилица</script>
-			<script type="Cyrs">Кирилица (Стар църковно-�лав�н�ки вариант)</script>
-			<script type="Deva">Деванагари</script>
-			<script type="Dsrt">Дезерет</script>
-			<script type="Egyd">Египет�ко демотично пи�мо</script>
-			<script type="Egyh">Египет�ко йератично пи�мо</script>
-			<script type="Egyp">Египет�ки йероглифи</script>
-			<script type="Ethi">Етиоп�ка</script>
-			<script type="Geok">Грузин�ка хуцури</script>
-			<script type="Geor">Грузин�ка</script>
-			<script type="Glag">Глаголиче�ка</script>
-			<script type="Goth">Готиче�ка</script>
-			<script type="Grek">Гръцка</script>
-			<script type="Gujr">Гуджарати</script>
-			<script type="Guru">Гурмукхи</script>
-			<script type="Hang">Хангул</script>
-			<script type="Hani">Китай�ка</script>
-			<script type="Hano">Хануну</script>
-			<script type="Hans">Опро�тен китай�ки</script>
-			<script type="Hant">Традиционен китай�ки</script>
-			<script type="Hebr">Иврит</script>
-			<script type="Hira">Япон�ки хирагана</script>
-			<script type="Hmng">Пахау хмонг</script>
-			<script type="Hrkt">Катакана или Хирагана</script>
-			<script type="Hung">Староунгар�ка</script>
-			<script type="Inds">Харап�ка</script>
-			<script type="Ital">Древно италий�ка</script>
-			<script type="Java">Яван�ка</script>
-			<script type="Jpan">Япон�ка</script>
-			<script type="Kali">Ка� Ли</script>
-			<script type="Kana">Япон�ки катакана</script>
-			<script type="Khar">Кхароштхи</script>
-			<script type="Khmr">Кхмер�ка</script>
-			<script type="Knda">Каннада</script>
-			<script type="Kore">Корей�ка</script>
-			<script type="Kthi">Кайтхи</script>
-			<script type="Lana">Ланна</script>
-			<script type="Laoo">Лао�ка</script>
-			<script type="Latf">Латин�ка фрактура</script>
-			<script type="Latg">Гал�ка латин�ка</script>
-			<script type="Latn">Латин�ка</script>
-			<script type="Lepc">Лепча</script>
-			<script type="Limb">Лимбу</script>
-			<script type="Lina">Линейна �</script>
-			<script type="Linb">Линейна Б</script>
-			<script type="Lyci">Лиций�ка</script>
-			<script type="Lydi">Лидий�ка</script>
-			<script type="Mand">Мандарин�ка</script>
-			<script type="Mani">Манихей�ка</script>
-			<script type="Maya">Йероглифи на Маите</script>
-			<script type="Mero">Мероит�ка</script>
-			<script type="Mlym">Мала�лам</script>
-			<script type="Mong">Монгол�ка</script>
-			<script type="Moon">Мун</script>
-			<script type="Mtei">Манипури</script>
-			<script type="Mymr">Бирман�ка</script>
-			<script type="Nkoo">�'Ко</script>
-			<script type="Ogam">Огамиче�ка</script>
-			<script type="Olck">Ол Чики</script>
-			<script type="Orkh">Орхоно-ени�ей�ка</script>
-			<script type="Orya">Ори�</script>
-			<script type="Osma">О�ман�ка</script>
-			<script type="Perm">Древно перм�ка</script>
-			<script type="Phag">Фаг�-па</script>
-			<script type="Phlv">Пахлав�ка</script>
-			<script type="Phnx">Финикий�ка</script>
-			<script type="Plrd">Пи�мено�т Полард</script>
-			<script type="Roro">Ронго-ронго</script>
-			<script type="Runr">Руниче�ка</script>
-			<script type="Samr">Самаритан�ка</script>
-			<script type="Sara">Сарати</script>
-			<script type="Saur">Саураштра</script>
-			<script type="Sinh">Синхал�ка</script>
-			<script type="Sund">Сундан�ка</script>
-			<script type="Sylo">Силоти �агри</script>
-			<script type="Syrc">Сирий�ка</script>
-			<script type="Syre">Сирий�ка е�трангело</script>
-			<script type="Syrj">Западна �ирий�ка</script>
-			<script type="Syrn">Източна �ирий�ка</script>
-			<script type="Tagb">Тагбанва</script>
-			<script type="Tale">Тай Ле</script>
-			<script type="Talu">�ова Тай Ле</script>
-			<script type="Taml">Тамил�ка</script>
-			<script type="Telu">Телугу</script>
-			<script type="Tglg">Тагалог</script>
-			<script type="Thaa">Таана</script>
-			<script type="Thai">Таи</script>
-			<script type="Tibt">Тибет�ка</script>
-			<script type="Ugar">Угарит�ка</script>
-			<script type="Vaii">Вай�ка</script>
-			<script type="Visp">Видима реч</script>
-			<script type="Xpeo">Старопер�ий�ка</script>
-			<script type="Xsux">Шумеро-акад�ки клинопи�</script>
-			<script type="Yiii">Йи</script>
-			<script type="Zmth">Математиче�ки �имволи</script>
-			<script type="Zsym">Символи</script>
-			<script type="Zxxx">Без пи�мено�т</script>
-			<script type="Zyyy">Обща</script>
-			<script type="Zzzz">�епозната или недей�твителна пи�мено�т</script>
-		</scripts>
-		<territories>
-			<territory type="001">Зем�та</territory>
-			<territory type="002">�фрика</territory>
-			<territory type="003">Северноамерикан�ки континент</territory>
-			<territory type="005">Южна �мерика</territory>
-			<territory type="009">Океани�</territory>
-			<territory type="011">Западна �фирка</territory>
-			<territory type="013">Централна �мерика</territory>
-			<territory type="014">Източна �фрика</territory>
-			<territory type="015">Северна �фрика</territory>
-			<territory type="017">Централна �фрика</territory>
-			<territory type="018">Южноафрикан�ки регион</territory>
-			<territory type="019">�мерика</territory>
-			<territory type="021">Северна �мерика</territory>
-			<territory type="029">Кариб�ки о-ви</territory>
-			<territory type="030">Източна �зи�</territory>
-			<territory type="034">Южна �зи�</territory>
-			<territory type="035">Югоизточна �зи�</territory>
-			<territory type="039">Южна Европа</territory>
-			<territory type="053">�в�трали� и �ова Зеланди�</territory>
-			<territory type="054">Меланези�</territory>
-			<territory type="057">Микронези�</territory>
-			<territory type="061">Полинези�</territory>
-			<territory type="062">Южна �зи� [062]</territory>
-			<territory type="142">�зи�</territory>
-			<territory type="143">Централна �зи�</territory>
-			<territory type="145">Западна �зи�</territory>
-			<territory type="150">Европа</territory>
-			<territory type="151">Източна Европа</territory>
-			<territory type="154">Северна Европа</territory>
-			<territory type="155">Западна Европа</territory>
-			<territory type="172">Общно�т на незави�имите държави</territory>
-			<territory type="419">Латин�ка �мерика и Кариб�ки ба�ейн</territory>
-			<territory type="830">�орманд�ки о-ви</territory>
-			<territory type="AD">�ндора</territory>
-			<territory type="AE">Обединени араб�ки емир�тва</territory>
-			<territory type="AF">�фгани�тан</territory>
-			<territory type="AG">�нтигуа и Барбуда</territory>
-			<territory type="AI">�нгуила</territory>
-			<territory type="AL">�лбани�</territory>
-			<territory type="AM">�рмени�</territory>
-			<territory type="AN">Холанд�ки �нтили</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктика</territory>
-			<territory type="AR">�ржентина</territory>
-			<territory type="AS">�мерикан�ко Самоа</territory>
-			<territory type="AT">�в�три�</territory>
-			<territory type="AU">�в�трали�</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�ки о-ви</territory>
-			<territory type="AZ">�зербайджан</territory>
-			<territory type="BA">Бо�на и Херцеговина</territory>
-			<territory type="BB">Барбадо�</territory>
-			<territory type="BD">Бангладеш</territory>
-			<territory type="BE">Белги�</territory>
-			<territory type="BF">Буркина Фа�о</territory>
-			<territory type="BG">Българи�</territory>
-			<territory type="BH">Бахрейн</territory>
-			<territory type="BI">Бурунди</territory>
-			<territory type="BJ">Бенин</territory>
-			<territory type="BL">Сейнт Бартоломей</territory>
-			<territory type="BM">Бермуда</territory>
-			<territory type="BN">Бруней Дару�алам</territory>
-			<territory type="BO">Боливи�</territory>
-			<territory type="BR">Бразили�</territory>
-			<territory type="BS">Бахами</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">О�тров Буве</territory>
-			<territory type="BW">Бот�уана</territory>
-			<territory type="BY">Белару�</territory>
-			<territory type="BZ">Белиз</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Коко�ови (Кийлинг) о�трови</territory>
-			<territory type="CD">Демократична република Конго</territory>
-			<territory type="CF">Централноафрикан�ка Република</territory>
-			<territory type="CG">Конго</territory>
-			<territory type="CH">Швейцари�</territory>
-			<territory type="CI">Бр�г на �лоновата ко�т</territory>
-			<territory type="CK">О�трови Кук</territory>
-			<territory type="CL">Чили</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Китай</territory>
-			<territory type="CO">Колумби�</territory>
-			<territory type="CR">Ко�та Рика</territory>
-			<territory type="CS">Сърби� и Черна гора</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Кабо Верде</territory>
-			<territory type="CX">О�тров Кри�тма�</territory>
-			<territory type="CY">Кипър</territory>
-			<territory type="CZ">Чешка република</territory>
-			<territory type="DE">Германи�</territory>
-			<territory type="DJ">Джибути</territory>
-			<territory type="DK">Дани�</territory>
-			<territory type="DM">Доминика</territory>
-			<territory type="DO">Доминикан�ка република</territory>
-			<territory type="DZ">�лжир</territory>
-			<territory type="EC">Еквадор</territory>
-			<territory type="EE">Е�тони�</territory>
-			<territory type="EG">Египет</territory>
-			<territory type="EH">Западна Сахара</territory>
-			<territory type="ER">Еритре�</territory>
-			<territory type="ES">И�пани�</territory>
-			<territory type="ET">Етиопи�</territory>
-			<territory type="FI">Финланди�</territory>
-			<territory type="FJ">Фиджи</territory>
-			<territory type="FK">Фолкленд�ки о�трови</territory>
-			<territory type="FM">Микронези�, Обединени Щати</territory>
-			<territory type="FO">Фарьор�ки о�трови</territory>
-			<territory type="FR">Франци�</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Обединено крал�тво</territory>
-			<territory type="GD">Гренада</territory>
-			<territory type="GE">Грузи�</territory>
-			<territory type="GF">Френ�ка Гвиана</territory>
-			<territory type="GG">о. Гърнзи</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гибралтар</territory>
-			<territory type="GL">Гренланди�</territory>
-			<territory type="GM">Гамби�</territory>
-			<territory type="GN">Гвине�</territory>
-			<territory type="GP">Гваделупа</territory>
-			<territory type="GQ">Екваториална Гвине�</territory>
-			<territory type="GR">Гърци�</territory>
-			<territory type="GS">Южна Джорджи� и Южни Сандвичеви О�трови</territory>
-			<territory type="GT">Гватемала</territory>
-			<territory type="GU">Гуам</territory>
-			<territory type="GW">Гвине�-Би�ау</territory>
-			<territory type="GY">Гвиана</territory>
-			<territory type="HK">Хонг-Конг О.�.Р. на Китай</territory>
-			<territory type="HM">О�тров Хърд и О�трови Макдоналд</territory>
-			<territory type="HN">Хондура�</territory>
-			<territory type="HR">Хърват�ка</territory>
-			<territory type="HT">Хаити</territory>
-			<territory type="HU">Унгари�</territory>
-			<territory type="ID">Индонези�</territory>
-			<territory type="IE">Ирланди�</territory>
-			<territory type="IL">Израел</territory>
-			<territory type="IM">О�трови Ман</territory>
-			<territory type="IN">Инди�</territory>
-			<territory type="IO">Британ�ки територии в Индий�ки� океан</territory>
-			<territory type="IQ">Ирак</territory>
-			<territory type="IR">Иран, И�л�м�ка република</territory>
-			<territory type="IS">И�ланди�</territory>
-			<territory type="IT">Итали�</territory>
-			<territory type="JE">о. Джързи</territory>
-			<territory type="JM">Ямайка</territory>
-			<territory type="JO">Йордани�</territory>
-			<territory type="JP">Япони�</territory>
-			<territory type="KE">Кени�</territory>
-			<territory type="KG">Киргиз�тан</territory>
-			<territory type="KH">Камбоджа</territory>
-			<territory type="KI">Кирибати</territory>
-			<territory type="KM">Комори</territory>
-			<territory type="KN">Сейнт Кит� и �еви�</territory>
-			<territory type="KP">Коре�, Северна</territory>
-			<territory type="KR">Коре�, Южна</territory>
-			<territory type="KW">Кувейт</territory>
-			<territory type="KY">Кайманови о�трови</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">�ародна демократична република Лао�</territory>
-			<territory type="LB">Ливан</territory>
-			<territory type="LC">Сейнт Лу�и�</territory>
-			<territory type="LI">Лихтенщайн</territory>
-			<territory type="LK">Шри Ланка</territory>
-			<territory type="LR">Либери�</territory>
-			<territory type="LS">Ле�ото</territory>
-			<territory type="LT">Литва</territory>
-			<territory type="LU">Люк�ембург</territory>
-			<territory type="LV">Латви�</territory>
-			<territory type="LY">Либий�ка араб�ка джамахири�</territory>
-			<territory type="MA">Мароко</territory>
-			<territory type="MC">Монако</territory>
-			<territory type="MD">Молдова, Република</territory>
-			<territory type="ME">Черна гора</territory>
-			<territory type="MF">Сейнт Мартин</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршалови о�трови</territory>
-			<territory type="MK">Македони�, Република</territory>
-			<territory type="ML">Мали</territory>
-			<territory type="MM">Мианмар</territory>
-			<territory type="MN">Монголи�</territory>
-			<territory type="MO">Макао О.�.Р. на Китай</territory>
-			<territory type="MP">Северни Мариан�ки О�трови</territory>
-			<territory type="MQ">Мартиника</territory>
-			<territory type="MR">Мавритани�</territory>
-			<territory type="MS">Мон�ерат</territory>
-			<territory type="MT">Малта</territory>
-			<territory type="MU">Мавриций</territory>
-			<territory type="MV">Малдиви</territory>
-			<territory type="MW">Малави</territory>
-			<territory type="MX">Мек�ико</territory>
-			<territory type="MY">Малайзи�</territory>
-			<territory type="MZ">Мозамбик</territory>
-			<territory type="NA">�амиби�</territory>
-			<territory type="NC">�ова Каледони�</territory>
-			<territory type="NE">�игер</territory>
-			<territory type="NF">О�тров �орфолк</territory>
-			<territory type="NG">�игери�</territory>
-			<territory type="NI">�икарагуа</territory>
-			<territory type="NL">Холанди�</territory>
-			<territory type="NO">�орвеги�</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�иуе</territory>
-			<territory type="NZ">�ова Зеланди�</territory>
-			<territory type="OM">Оман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Френ�ка Полинези�</territory>
-			<territory type="PG">Папуа �ова Гвине�</territory>
-			<territory type="PH">Филипини</territory>
-			<territory type="PK">Паки�тан</territory>
-			<territory type="PL">Полша</territory>
-			<territory type="PM">Сен Пиер и Мигелон</territory>
-			<territory type="PN">Питкайрн</territory>
-			<territory type="PR">Пуерто Рико</territory>
-			<territory type="PS">Пале�тин�ки територии</territory>
-			<territory type="PT">Португали�</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвай</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Океани� [QO]</territory>
-			<territory type="QU">Европей�ки �ъюз</territory>
-			<territory type="RE">Реюниън</territory>
-			<territory type="RO">Румъни�</territory>
-			<territory type="RS">Сърби�</territory>
-			<territory type="RU">Ру�ка федераци�</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудит�ка �раби�</territory>
-			<territory type="SB">Соломонови о�трови</territory>
-			<territory type="SC">Сейшели</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швеци�</territory>
-			<territory type="SG">Сингапур</territory>
-			<territory type="SH">Света Елена</territory>
-			<territory type="SI">Словени�</territory>
-			<territory type="SJ">Свалбард и Ян Майен</territory>
-			<territory type="SK">Словаки�</territory>
-			<territory type="SL">Сиера Леоне</territory>
-			<territory type="SM">Сан Марино</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Сомали�</territory>
-			<territory type="SR">Суринам</territory>
-			<territory type="ST">Сао Томе и Принципе</territory>
-			<territory type="SV">Ел Салвадор</territory>
-			<territory type="SY">Сирий�ка араб�ка република</territory>
-			<territory type="SZ">Суазиленд</territory>
-			<territory type="TC">О�трови Турк� и Кайко�</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Френ�ки южни територии</territory>
-			<territory type="TG">Того</territory>
-			<territory type="TH">Тайланд</territory>
-			<territory type="TJ">Таджики�тан</territory>
-			<territory type="TK">Токелау</territory>
-			<territory type="TL">Източен Тимор</territory>
-			<territory type="TM">Туркмени�тан</territory>
-			<territory type="TN">Туни�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Турци�</territory>
-			<territory type="TT">Тринидад и Тобаго</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тайван</territory>
-			<territory type="TZ">Танзани�</territory>
-			<territory type="UA">Украйна</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="UM">С�Щ - външни о�трови</territory>
-			<territory type="US">С�Щ</territory>
-			<territory type="UY">Уругвай</territory>
-			<territory type="UZ">Узбеки�тан</territory>
-			<territory type="VA">Свещено море (Ватикан�ка държава)</territory>
-			<territory type="VC">Сейнт Вин�ънт и Гренадини</territory>
-			<territory type="VE">Венецуела</territory>
-			<territory type="VG">Британ�ки Вирджин�ки о�трони</territory>
-			<territory type="VI">С�Щ, Вирджин�ки о�трови</territory>
-			<territory type="VN">Виетнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уоли� и Футуна</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Йемен</territory>
-			<territory type="YT">Мейот</territory>
-			<territory type="ZA">Южна �фрика</territory>
-			<territory type="ZM">Замби�</territory>
-			<territory type="ZW">Зимбабве</territory>
-			<territory type="ZZ">�епозната или не�ъще�твуваща обла�т</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Традиционен нем�ки правопи�</variant>
-			<variant type="1994">Стандартен резиан�ки правопи�</variant>
-			<variant type="1996">�ем�ки правопи� от 1996</variant>
-			<variant type="1606NICT">Къ�ен �редновековен френ�ки до 1606</variant>
-			<variant type="1694ACAD">Ранен �ъвременен френ�ки</variant>
-			<variant type="AREVELA">Източно армен�ки</variant>
-			<variant type="AREVMDA">Западно армен�ки</variant>
-			<variant type="BAKU1926">Унифицирана тюрк�ка азбука</variant>
-			<variant type="BISKE">Диалект Сан Джорджио/Била</variant>
-			<variant type="BOONT">Бунтлинг</variant>
-			<variant type="FONIPA">Международна фонетична азбука</variant>
-			<variant type="FONUPA">Урал�ка фонетична азбука</variant>
-			<variant type="LIPAW">Диалект Липовац</variant>
-			<variant type="MONOTON">Монотонично</variant>
-			<variant type="NEDIS">Диалект �ати�оне</variant>
-			<variant type="NJIVA">Диалект �джива</variant>
-			<variant type="OSOJS">Диалект О�еако/О�о�не</variant>
-			<variant type="POLYTON">Политонично</variant>
-			<variant type="POSIX">Компютърен</variant>
-			<variant type="REVISED">Променен правопи�</variant>
-			<variant type="ROZAJ">Резиан�ки</variant>
-			<variant type="SAAHO">Сахо</variant>
-			<variant type="SCOTLAND">Шотланд�ки англий�ки</variant>
-			<variant type="SCOUSE">Ливърпул�ки диалект</variant>
-			<variant type="SOLBA">Диалект Столвиза</variant>
-			<variant type="TARASK">Тарашкевица</variant>
-			<variant type="VALENCIA">Вален�иан�ки</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Календар</key>
-			<key type="collation">Сортиране</key>
-			<key type="currency">Валута</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Традиционен китай�ки (Big5)</type>
-			<type type="buddhist" key="calendar">Буди�тки календар</type>
-			<type type="chinese" key="calendar">Китай�ки календар</type>
-			<type type="direct" key="collation">Директно</type>
-			<type type="gb2312han" key="collation">Опро�тен китай�ки (GB2312)</type>
-			<type type="gregorian" key="calendar">Григориан�ки календар</type>
-			<type type="hebrew" key="calendar">Еврей�ки календар</type>
-			<type type="indian" key="calendar">Индий�ки граждан�ки календар</type>
-			<type type="islamic" key="calendar">И�л�м�ки календар</type>
-			<type type="islamic-civil" key="calendar">И�л�м�ки цивилен календар</type>
-			<type type="japanese" key="calendar">Япон�ки календар</type>
-			<type type="phonebook" key="collation">�збучен ред</type>
-			<type type="pinyin" key="collation">Сортиране Пинин</type>
-			<type type="roc" key="calendar">Календар на Република Китай</type>
-			<type type="stroke" key="collation">Сортиране по щрих</type>
-			<type type="traditional" key="collation">Традиционно</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Метрична</measurementSystemName>
-			<measurementSystemName type="US">�мерикан�ка</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[а-ъ ь ю �]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[i v x {а\u0300} � � {о\u0300} {у\u0300} {ъ\u0300} ѣ {ю\u0300} {�\u0300} ѫ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�н.</month>
-							<month type="2">февр.</month>
-							<month type="3">март</month>
-							<month type="4">апр.</month>
-							<month type="5">май</month>
-							<month type="6">юни</month>
-							<month type="7">юли</month>
-							<month type="8">авг.</month>
-							<month type="9">�епт.</month>
-							<month type="10">окт.</month>
-							<month type="11">ноем.</month>
-							<month type="12">дек.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�нуари</month>
-							<month type="2">февруари</month>
-							<month type="3">март</month>
-							<month type="4">април</month>
-							<month type="5">май</month>
-							<month type="6">юни</month>
-							<month type="7">юли</month>
-							<month type="8">авгу�т</month>
-							<month type="9">�ептември</month>
-							<month type="10">октомври</month>
-							<month type="11">ноември</month>
-							<month type="12">декември</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">Ñ„</month>
-							<month type="3">м</month>
-							<month type="4">а</month>
-							<month type="5">м</month>
-							<month type="6">ÑŽ</month>
-							<month type="7">ÑŽ</month>
-							<month type="8">а</month>
-							<month type="9">�</month>
-							<month type="10">о</month>
-							<month type="11">н</month>
-							<month type="12">д</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">нд</day>
-							<day type="mon">пн</day>
-							<day type="tue">вт</day>
-							<day type="wed">�р</day>
-							<day type="thu">чт</day>
-							<day type="fri">пт</day>
-							<day type="sat">�б</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">недел�</day>
-							<day type="mon">понеделник</day>
-							<day type="tue">вторник</day>
-							<day type="wed">�р�да</day>
-							<day type="thu">четвъртък</day>
-							<day type="fri">петък</day>
-							<day type="sat">�ъбота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">н</day>
-							<day type="mon">п</day>
-							<day type="tue">в</day>
-							<day type="wed">�</day>
-							<day type="thu">ч</day>
-							<day type="fri">п</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">I трим.</quarter>
-							<quarter type="2">II трим.</quarter>
-							<quarter type="3">III трим.</quarter>
-							<quarter type="4">IV трим.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-во триме�ечие</quarter>
-							<quarter type="2">2-ро триме�ечие</quarter>
-							<quarter type="3">3-то триме�ечие</quarter>
-							<quarter type="4">4-то триме�ечие</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>пр. об.</am>
-				<pm>�л. об.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">пр.Хр.</era>
-						<era type="1">�л.Хр.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">пр. н. е.</era>
-						<era type="1">от н. е.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="1">�л.н.е.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>dd MMMM y, EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="hmm">h:mm a</dateFormatItem>
-						<dateFormatItem id="hmmss">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMEd">d MMM, E</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y 'г'.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">dd.MM, E - dd.MM, E</greatestDifference>
-							<greatestDifference id="M">dd.MM, E - dd.MM, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">d MMM, E - d MMM, E</greatestDifference>
-							<greatestDifference id="M">d MMM, E - d MMM, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">dd.MM.yy, E - dd.MM.yy, E</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy, E - dd.MM.yy, E</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy, E - dd.MM.yy, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d MMM y, E - d MMM y, E</greatestDifference>
-							<greatestDifference id="M">d MMM y, E - d MMM y, E</greatestDifference>
-							<greatestDifference id="y">d MMM y, E - d MMM y, E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ера</displayName>
-					</field>
-					<field type="year">
-						<displayName>година</displayName>
-					</field>
-					<field type="month">
-						<displayName>ме�ец</displayName>
-					</field>
-					<field type="week">
-						<displayName>�едмица</displayName>
-					</field>
-					<field type="day">
-						<displayName>Ден</displayName>
-						<relative type="-2">Онзи ден</relative>
-						<relative type="-1">Вчера</relative>
-						<relative type="0">Дне�</relative>
-						<relative type="1">Утре</relative>
-						<relative type="2">Вдругиден</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Ден от �едмицата</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ден</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ча�</displayName>
-					</field>
-					<field type="minute">
-						<displayName>минута</displayName>
-					</field>
-					<field type="second">
-						<displayName>�екунда</displayName>
-					</field>
-					<field type="zone">
-						<displayName>зона</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">тишри</month>
-							<month type="2">хешван</month>
-							<month type="3">ки�лев</month>
-							<month type="4">тебет</month>
-							<month type="5">шебат</month>
-							<month type="6">адар I</month>
-							<month type="7">адар</month>
-							<month type="8">ни�ан</month>
-							<month type="9">иар</month>
-							<month type="10">�иван</month>
-							<month type="11">тамуз</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">тишри</month>
-							<month type="2">хешван</month>
-							<month type="3">ки�лев</month>
-							<month type="4">тебет</month>
-							<month type="5">шебат</month>
-							<month type="6">адар I</month>
-							<month type="7">адар</month>
-							<month type="8">ни�ан</month>
-							<month type="9">иар</month>
-							<month type="10">�иван</month>
-							<month type="11">тамуз</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="wide">
-							<month type="1">тишри</month>
-							<month type="2">хешван</month>
-							<month type="3">ки�лев</month>
-							<month type="4">тебет</month>
-							<month type="5">шебат</month>
-							<month type="6">адар I</month>
-							<month type="7">адар</month>
-							<month type="8">ни�ан</month>
-							<month type="9">иар</month>
-							<month type="10">�иван</month>
-							<month type="11">тамуз</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">чайтра</month>
-							<month type="2">вай�акха</month>
-							<month type="3">джаинтха</month>
-							<month type="4">а�адха</month>
-							<month type="5">�равана</month>
-							<month type="6">бхада</month>
-							<month type="7">азвина</month>
-							<month type="8">картика</month>
-							<month type="9">аграхайана</month>
-							<month type="10">пауза</month>
-							<month type="11">магха</month>
-							<month type="12">пхалгуна</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">чайтра</month>
-							<month type="2">вай�акха</month>
-							<month type="3">джаинтха</month>
-							<month type="4">а�адха</month>
-							<month type="5">�равана</month>
-							<month type="6">бхада</month>
-							<month type="7">азвина</month>
-							<month type="8">картика</month>
-							<month type="9">аграхайана</month>
-							<month type="10">пауза</month>
-							<month type="12">пхалгуна</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="wide">
-							<month type="1">чайтра</month>
-							<month type="2">вай�акха</month>
-							<month type="3">джаинтха</month>
-							<month type="4">а�адха</month>
-							<month type="5">�равана</month>
-							<month type="6">бхада</month>
-							<month type="7">азвина</month>
-							<month type="8">картика</month>
-							<month type="9">аграхайана</month>
-							<month type="10">пауза</month>
-							<month type="11">магха</month>
-							<month type="12">пхалгуна</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">мухарам</month>
-							<month type="2">�афар</month>
-							<month type="3">раби-1</month>
-							<month type="4">раби-2</month>
-							<month type="5">джумада-1</month>
-							<month type="6">джумада-2</month>
-							<month type="7">раджаб</month>
-							<month type="8">шабан</month>
-							<month type="9">рамазан</month>
-							<month type="10">Шавал</month>
-							<month type="11">Дхул-Каада</month>
-							<month type="12">Дхул-хиджа</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">мухарам</month>
-							<month type="2">�афар</month>
-							<month type="3">раби-1</month>
-							<month type="4">раби-2</month>
-							<month type="5">джумада-1</month>
-							<month type="6">джумада-2</month>
-							<month type="7">раджаб</month>
-							<month type="8">шабан</month>
-							<month type="9">рамазан</month>
-							<month type="10">Шавал</month>
-							<month type="11">Дхул-Каада</month>
-							<month type="12">Дхул-хиджа</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="3">раби-1</month>
-							<month type="4">раби-2</month>
-							<month type="5">джумада-1</month>
-							<month type="6">джумада-2</month>
-							<month type="7">раджаб</month>
-							<month type="8">шабан</month>
-							<month type="9">рамазан</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">мухарам</month>
-							<month type="2">�афар</month>
-							<month type="3">раби-1</month>
-							<month type="4">раби-2</month>
-							<month type="5">джумада-1</month>
-							<month type="6">джумада-2</month>
-							<month type="7">раджаб</month>
-							<month type="8">шабан</month>
-							<month type="9">Рамазан</month>
-							<month type="10">Шавал</month>
-							<month type="11">Дхул-Каада</month>
-							<month type="12">Дхул-хиджа</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>Гриинуич{0}</gmtFormat>
-			<gmtZeroFormat>Гриинуич</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�еизве�тен</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>�ндора</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Дубай</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Кабул</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�нтигуа</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�нгила</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Тирана</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Ереван</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Кюра�ао</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Луанда</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ротера</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Палмър</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Южен полю�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Суова</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Моу�ън</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>База Дейви�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Во�ток</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Кей�и</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Дюмон Дюрвил</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Мак Мърдоу</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Рио Галего�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Мендо�а</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Сан Хуан</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуа�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла Риоха</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан Луи�</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Катамарка</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Салта</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Джуджую</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Тукуман</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Кордоба</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Буено� �йре�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Паго Паго</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Виена</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Пърт</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Юкла</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Даруин</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�делаида</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Броукън Хил</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Кери</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Мелбърн</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Хоубарт</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Линдеман</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Сидни</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Бризбейн</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд Хов</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�руба</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Баку</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Бриджтаун</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Дака</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Брюк�ел</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Уагадугу</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Софи�</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Бахрейн</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Бужумбура</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Порто �ово</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуд�ки О-ви</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Бруней</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Ла Па�</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Ейрунепе</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Рио Бранко</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Порту Вельо</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Буа Ви�та</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Мануа�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Чу�ба</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Сантарем</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампо Гранде</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Белем</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�рагуайна</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сао Пауло</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Бахиа</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Фортацела</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Ма�ейо</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ре�ифе</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�оронха</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�а�ау</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Тхимпу</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Габороне</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Мин�к</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Белмопан</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Доу�ън</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Уайтхор�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Инувик</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Ванкувър</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Доу�ън Крийк</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йелоунайф</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Едмънтън</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Суифт Кърент</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кеймбридж Бей</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Регина</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Уинипег</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Резолют</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни Ривър</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ранкин Инлет</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал Харбър</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тъндър Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�ипигон</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Торонто</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Монреал</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Иквалуит</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Монктон</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Халифак�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Гу� Бей</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Глей� Бей</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Блан-Саблон</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Сейнт Джоун�</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Коко�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Кинша�а</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Лубумбаши</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Банги</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Бразавил</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Цюрих</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>�биджан</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Раротонга</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Великден�ки о-ви</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Сантиаго</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Дуала</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Кашгар</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Урумчи</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Чунцин</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Шанхай</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Харбин</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Богота</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Сан Хо�е</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Хавана</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Кабо Верде</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Коледни о-ви</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>�икози�</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Берлин</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Джибути</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Копенхаген</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Доминика</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Санто Доминго</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�лжир</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>о-ви Галапаго�</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Гуа�кил</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Талин</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Кайро</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Ел �юн</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>��мера</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Канар�ки о-ви</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Сеута</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Мадрид</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�ди� �беба</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Хелзинки</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Фиджи</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Стенли</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>о-ви Трук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>о. Понапе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>о. Ко�рае</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Фарьорите</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Париж</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Либървил</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Лондон</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Сент Джордже�</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Тбили�и</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Кайен</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�кра</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Гибралтар</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Туле</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Готхоб</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Сгор�би�он</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Данмаркшавн</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Банджул</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Конакри</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Ба� Тер</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Малабо</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�тина</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Южна Джорджи�</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Гватемала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Гуам</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Би�ау</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Джорджтаун</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Хонг Конг</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Порт-о-Прен�</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Будапеща</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Джакарта</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Понтианак</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Мака�ар�ки проток</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Джа�пура</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Дъблин</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Йеру�алим</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Чаго�</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Багдад</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Техеран</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Рейк�вик</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Рим</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Кинг�тън</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>�ман</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Токио</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>�айроби</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Бишкек</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Пном Пен</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>о. Ендърбъри</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>о. Рожде�тво</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>о. Тарава</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Комор�ки о-ви</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Сейнт Кит�</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Пхен�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Сеул</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Кувейт</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Кайманите</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ктау</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>�рал</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�ктобе</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Язилорда</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�лма �та</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Виент�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Бейрут</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Св. Лучи�</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Вадуц</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Коломбо</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Монрови�</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Ма�еру</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Вилню�</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Люк�ембург</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Рига</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Триполи</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Казабланка</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Монако</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Кишинев</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�нтананариво</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Квайджален</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Мажуро</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Бамако</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Рангун</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Кобдо</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Уланбатор</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Чойбал�ан</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Макау</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Сайпан</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Мартиник</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>�уакшот</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Мон�ерат</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Ла Валета</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Мавриций</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Малдив�ки О-ви</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Блантайр</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Тихуана</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Хермо�ило</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Мацатлан</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Чиуауа</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Монтерей</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Мек�ико</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Мерида</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Канкун</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Куала Лумпур</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Кучин</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Мапуту</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Виндхук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>�умеа</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>�иамей</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�орфолк</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Лаго�</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Манагуа</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�м�тердам</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>О�ло</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Катманду</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>�ауру</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�иуе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>о-ви Чатам</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Окланд</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Му�кат</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Панама</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Лима</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Таити</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Маркизки о-ви</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбиер</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Порт Мор�би</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Манила</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Карачи</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Варшава</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Микелон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Питкерн</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Пуерто Рико</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Газа</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�зор�ки о-ви</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Мадейра</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Ли�абон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Палау</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>��ун�ион</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Катар</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Реюнион</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Букурещ</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Калининград</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Мо�ква</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Волгоград</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Екатерининбург</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ом�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�ово�ибир�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Кра�но�р�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Иркут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Якут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Владиво�ток</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сахалин</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Магадан</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>п-в Камчатка</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�надир</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Кигали</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Ри�д</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Гуадалканал</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Махе</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Хартум</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Стокхолм</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Сингапур</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Св. Елена</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Лонгирбюен</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Фрийтаун</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Дакар</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Могадишо</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Парамарибо</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сао Томе</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Сан Салвадор</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Дама�к</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Мбабане</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Гранд Тюрк</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�джамена</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Кергелен</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Ломе</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Бангкок</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Душанбе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Факаофо</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Дили</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>�шхабад</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Туни�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Тонгатапу</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>И�танбул</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Порт ъф Спейн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Фунафути</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Тайпей</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Дар е� Салаам</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Киев</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Сева�топол</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожие</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Кампала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>о. Мидуей</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>о. Джон�ън</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>о. Уейк</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�дак</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�оум</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Хонолулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�нкоридж</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Якутат</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Джуно</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло� �нжели�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Буаз</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Финик�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Шипрок</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Денвър</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�ю Салем, Северна Дакота</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Сентър</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чикаго</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Меномнии</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Вин�ен�, Индиана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Петер�бург, Индиана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Тел Сити, Индиана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�ок�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Уинамак, Индиана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Маренго</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Индианополи�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Луизвил</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Веве</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монтичело</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Детройт</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�ю Йорк</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Монтевидео</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Самарканд</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Ташкент</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Св. Вин�ент</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Карака�</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Тортола</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Св. Тома�</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Сайгон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Ефате</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Уоли�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�пиа</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>�ден</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Майоте</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Йохане�бург</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Лу�ака</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Хараре</exemplarCity>
-			</zone>
-			<metazone type="Alaska">
-				<long>
-					<standard>Ча�ова зона �л��ка</standard>
-					<daylight>Л�тна ча�ова зона �л��ка</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<standard>�мерикан�ка централна ча�ова зона</standard>
-					<daylight>�мерикан�ка централна л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<standard>�мерикан�ка източна ча�ова зона</standard>
-					<daylight>�мерикан�ка източна л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<standard>�мерикан�ка планин�ка ча�ова зона</standard>
-					<daylight>�мерикан�ка планин�ка л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<standard>Тихоокеан�ка ча�ова зона</standard>
-					<daylight>Тихоокеан�ка л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (�ктау)</standard>
-					<daylight>AQTST (�ктау)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (�ктобе)</standard>
-					<daylight>AQTST (�ктобе)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<short>
-					<standard>AST (Саудит�ка �раби�)</standard>
-					<daylight>ADT (Саудит�ка �раби�)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Armenia">
-				<short>
-					<standard>AMT (�рмени�)</standard>
-					<daylight>AMST (�рмени�)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<standard>�тлантиче�ка ча�ова зона</standard>
-					<daylight>�тлантиче�ка л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Китай�ка ча�ова зона</standard>
-				</long>
-				<short>
-					<standard>CST (Китай)</standard>
-					<daylight>CDT (Китай)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cuba">
-				<short>
-					<standard>CST (Куба)</standard>
-					<daylight>CDT (Куба)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Централноевропей�ка ча�ова зона</standard>
-					<daylight>Централноевропей�ка л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Източноевропей�ка ча�ова зона</standard>
-					<daylight>Източноевропей�ка л�тна ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Ча�ова зона Гринуич</standard>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<short>
-					<standard>GST (Гуам)</standard>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Ча�ова зона Израел</standard>
-					<daylight>Л�тна ча�ова зона Израел</daylight>
-				</long>
-				<short>
-					<standard>IST (Израел)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Япон�ка ча�ова зона</standard>
-					<daylight>Япон�ка ча�ова зона</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>Ча�ова зона �юфаундленд</standard>
-					<daylight>Л�тна ча�ова зона �юфаундленд</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (Самарканд)</standard>
-					<daylight>SAMST (Самарканд)</daylight>
-				</short>
-			</metazone>
-			<metazone type="South_Georgia">
-				<short>
-					<standard>GST (Южна Джорджи�)</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>�/Ч</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ндор�ка пе�ета</displayName>
-				<displayName count="one">андор�ка пе�ета</displayName>
-				<displayName count="other">андор�ки пе�ети</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Обединени араб�ки емир�тва-дирхам</displayName>
-				<displayName count="one">Обединени араб�ки емир�тва-дирхам</displayName>
-				<displayName count="other">Обединени араб�ки емир�тва-дирхама</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�фгани�тан�ки афган (1927-2002)</displayName>
-				<displayName count="one">афгани�тан�ки афган (AFA)</displayName>
-				<displayName count="other">афгани�тан�ки афгана (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�фгани�тан�ки афган</displayName>
-				<displayName count="one">афгани�тан�ки афган</displayName>
-				<displayName count="other">афгани�тан�ки афгана</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�лбан�ки лек</displayName>
-				<displayName count="one">албан�ки лек</displayName>
-				<displayName count="other">албан�ки лека</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>�рмен�ки драм</displayName>
-				<displayName count="one">армен�ки драм</displayName>
-				<displayName count="other">армен�ки драма</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>�нтил�ки гулден</displayName>
-				<displayName count="one">антил�ки гулден</displayName>
-				<displayName count="other">антил�ки гулдена</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�нгол�ка кванца</displayName>
-				<displayName count="one">ангол�ка кванца</displayName>
-				<displayName count="other">ангол�ки кванци</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�нгол�ка кванца (1977-1990)</displayName>
-				<displayName count="one">ангол�ка кванца (AOK)</displayName>
-				<displayName count="other">ангол�ки кванци (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�нгол�ка нова кванца (1990-2000)</displayName>
-				<displayName count="one">ангол�ка нова кванца (AON)</displayName>
-				<displayName count="other">ангол�ки нови кванци (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�нгол�ка нова кванца (1995-1999)</displayName>
-				<displayName count="one">ангол�ка нова кванца (AOR)</displayName>
-				<displayName count="other">ангол�ки нови кванци (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>�ржентин�ки ав�трал</displayName>
-				<displayName count="one">аржентин�ки ав�трал</displayName>
-				<displayName count="other">аржентин�ки ав�трала</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>�ржентин�ко пе�о (1983-1985)</displayName>
-				<displayName count="one">аржентин�ко пе�о (ARP)</displayName>
-				<displayName count="other">аржентин�ки пе�о (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>�ржентин�ко пе�о</displayName>
-				<displayName count="one">аржентин�ко пе�о</displayName>
-				<displayName count="other">аржентин�ки пе�о</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�в�трий�ки шилинг</displayName>
-				<displayName count="one">ав�трий�ки шилинг</displayName>
-				<displayName count="other">ав�трий�ки шилинга</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�в�тралий�ки долар</displayName>
-				<displayName count="one">ав�тралий�ки долар</displayName>
-				<displayName count="other">ав�тралий�ки долара</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�руб�ки гилдер - о. �руба</displayName>
-				<displayName count="one">аруб�ки гилдер</displayName>
-				<displayName count="other">аруб�ки гилдера</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>�зербайджан�ки манат (1993-2006)</displayName>
-				<displayName count="one">азербайджан�ки манат (AZM)</displayName>
-				<displayName count="other">азербайджан�ки маната (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>�зербайджан�ки манат</displayName>
-				<displayName count="one">азербайджан�ки манат</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Бо�на и Херцеговина-динар</displayName>
-				<displayName count="one">Бо�на и Херцеговина-динар</displayName>
-				<displayName count="other">Бо�на и Херцеговина-динара</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Бо�нен�ка конвертируема марка</displayName>
-				<displayName count="one">бо�нен�ка конвертируема марка</displayName>
-				<displayName count="other">бо�нен�ки конвертируеми марки</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Барбейдо�ки долар</displayName>
-				<displayName count="one">барбейдо�ки долар</displayName>
-				<displayName count="other">барбейдо�ки долара</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Бангладешка така</displayName>
-				<displayName count="one">бангладешка така</displayName>
-				<displayName count="other">бангладешки таки</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Белгий�ки франк (конвертируем)</displayName>
-				<displayName count="one">белгий�ки франк (конвертируем)</displayName>
-				<displayName count="other">белгий�ки франка (конвертируеми)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Белгий�ки франк</displayName>
-				<displayName count="one">белгий�ки франк</displayName>
-				<displayName count="other">белгий�ки франка</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Белгий�ки франк (финан�ов)</displayName>
-				<displayName count="one">белгий�ки франк (финан�ов)</displayName>
-				<displayName count="other">белгий�ки франка (финан�ови)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Българ�ки конвертируем лев (1962-1999)</displayName>
-				<displayName count="one">българ�ки конвертируем лев</displayName>
-				<displayName count="other">българ�ки конвертируеми лева</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Българ�ки лев</displayName>
-				<displayName count="one">българ�ки лев</displayName>
-				<displayName count="other">българ�ки лева</displayName>
-				<symbol>лв.</symbol>
-			</currency>
-			<currency type="BHD">
-				<displayName>Бахрейн�ки динар</displayName>
-				<displayName count="one">бахрейн�ки динар</displayName>
-				<displayName count="other">бахрейн�ки динара</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Бурундий�ки франк</displayName>
-				<displayName count="one">бурундий�ки франк</displayName>
-				<displayName count="other">бурундий�ки франка</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Бермуд�ки долар</displayName>
-				<displayName count="one">бермуд�ки долар</displayName>
-				<displayName count="other">бермуд�ки долара</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Бруней�ки долар</displayName>
-				<displayName count="one">бруней�ки долар</displayName>
-				<displayName count="other">бруней�ки долара</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Боливий�ко боливиано</displayName>
-				<displayName count="one">боливий�ко боливиано</displayName>
-				<displayName count="other">боливий�ки боливиано</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Боливий�ко пе�о</displayName>
-				<displayName count="one">боливий�ко пе�о</displayName>
-				<displayName count="other">боливий�ки пе�о</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Боливий�ки мвдол</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Бразил�ко ново крузейро (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Бразил�ко крозадо</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Бразил�ко крузейро (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Бразил�ки реал</displayName>
-				<displayName count="one">бразил�ки реал</displayName>
-				<displayName count="other">бразил�ки реала</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Бразил�ко ново крозадо</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Бразил�ко крузейро</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Бахам�ки долар</displayName>
-				<displayName count="one">бахам�ки долар</displayName>
-				<displayName count="other">бахам�ки дол»ара</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Бутан�ки нгултрум</displayName>
-				<displayName count="one">бутан�ки нгултрум</displayName>
-				<displayName count="other">бутан�ки нгултрума</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Киат</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Бот�уан�ка пула</displayName>
-				<displayName count="one">бот�уан�ка пула</displayName>
-				<displayName count="other">бот�уан�ки пули</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Белару�ка нова рубла (1994-1999)</displayName>
-				<displayName count="one">белару�ка нова рубла (BYB)</displayName>
-				<displayName count="other">белару�ки нови рубли (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Белару�ка рубла</displayName>
-				<displayName count="one">белару�ка рубла</displayName>
-				<displayName count="other">белару�ки рубли</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Белизий�ки долар</displayName>
-				<displayName count="one">белизий�ки долар</displayName>
-				<displayName count="other">белизий�ки долара</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Канад�ки долар</displayName>
-				<displayName count="one">канад�ки долар</displayName>
-				<displayName count="other">канад�ки долара</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Конгоан�ки франк</displayName>
-				<displayName count="one">конгоан�ки франк</displayName>
-				<displayName count="other">конгоан�ки франка</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR евро</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Швейцар�ки франк</displayName>
-				<displayName count="one">швейцар�ки франк</displayName>
-				<displayName count="other">швейцар�ки франка</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR франк</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>У�ловна разчетна единица на Чили</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Чилий�ко пе�о</displayName>
-				<displayName count="one">чилий�ко пе�о</displayName>
-				<displayName count="other">чилий�ки пе�о</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Китай�ки ренминби юан</displayName>
-				<displayName count="one">китай�ки ренминби юан</displayName>
-				<displayName count="other">китай�ки ренминби юана</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Колумбий�ко пе�о</displayName>
-				<displayName count="one">колумбий�ко пе�о</displayName>
-				<displayName count="other">колумбий�ки пе�о</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Колумбий�ка единица на реалната �тойно�т</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Ко�тарикан�ки колон</displayName>
-				<displayName count="one">ко�тарикан�ки колон</displayName>
-				<displayName count="other">ко�тарикан�ки колона</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Стар �ръб�ки динар</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Чехо�ловашка конвертируема крона</displayName>
-				<displayName count="one">чехо�ловашка конвертируема крона</displayName>
-				<displayName count="other">чехо�ловашки конвертируеми крони</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Кубин�ко пе�о</displayName>
-				<displayName count="one">кубин�ко пе�о</displayName>
-				<displayName count="other">кубин�ки пе�о</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Кабо Верде е�кудо</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Кипър�ка лира</displayName>
-				<displayName count="one">кипър�ка лира</displayName>
-				<displayName count="other">кипър�ки лири</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Чешка крона</displayName>
-				<displayName count="one">чешка крона</displayName>
-				<displayName count="other">чешки крони</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Източногерман�ка марка</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Герман�ка марка</displayName>
-				<displayName count="one">герман�ка марка</displayName>
-				<displayName count="other">герман�ки марки</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Джибут�ки франк</displayName>
-				<displayName count="one">джибут�ки франк</displayName>
-				<displayName count="other">джибут�ки франка</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Дат�ка крона</displayName>
-				<displayName count="one">дат�ка крона</displayName>
-				<displayName count="other">дат�ки крони</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Доминикан�ко пе�о</displayName>
-				<displayName count="one">доминикан�ко пе�о</displayName>
-				<displayName count="other">доминикан�ки пе�о</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�лжир�ки динар</displayName>
-				<displayName count="one">алжир�ки динар</displayName>
-				<displayName count="other">алжир�ки динара</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Еквадор�ко �укре</displayName>
-				<displayName count="one">еквадор�ко �укре</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Еквадор�ка банкова единица</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Е�тон�ка крона</displayName>
-				<displayName count="one">е�тон�ка крона</displayName>
-				<displayName count="other">е�тон�ки крони</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Египет�ка лира</displayName>
-				<displayName count="one">египет�ка лира</displayName>
-				<displayName count="other">египет�ки лири</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Еритрей�ка накфа</displayName>
-				<displayName count="one">еритрей�ка накфа</displayName>
-				<displayName count="other">еритрей�ки накфи</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>И�пан�ка пе�ета</displayName>
-				<displayName count="one">и�пан�ка пе�ета</displayName>
-				<displayName count="other">и�пан�ки пе�ети</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Етиоп�ки бир</displayName>
-				<displayName count="one">етиоп�ки бир</displayName>
-				<displayName count="other">етиоп�ки бира</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Евро</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Финланд�ка марка</displayName>
-				<displayName count="one">финланд�ка марка</displayName>
-				<displayName count="other">финланд�ки марки</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Фиджи - долар</displayName>
-				<displayName count="one">Фиджи - долар</displayName>
-				<displayName count="other">Фиджи - долара</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Фолкланд�ка лира</displayName>
-				<displayName count="one">фолкланд�ка лира</displayName>
-				<displayName count="other">фолкланд�ки лири</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Френ�ки франк</displayName>
-				<displayName count="one">френ�ки франк</displayName>
-				<displayName count="other">френ�ки франка</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Британ�ка лира</displayName>
-				<displayName count="one">британ�ка лира</displayName>
-				<displayName count="other">британ�ки лири</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Грузин�ки купон</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Грузин�ки лари</displayName>
-				<displayName count="one">грузин�ки лари</displayName>
-				<displayName count="other">грузин�ки лари</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ганай�ко �еди (1979-2007)</displayName>
-				<displayName count="one">ганай�ко �еди (GHC)</displayName>
-				<displayName count="other">ганай�ки �еди (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ганай�ко �еди</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Гибралтар�ка лира</displayName>
-				<displayName count="one">гибралтар�ка лира</displayName>
-				<displayName count="other">гибралтар�ки лири</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Гамбий�ки дала�и</displayName>
-				<displayName count="one">гамбий�ки дала�и</displayName>
-				<displayName count="other">гамбий�ки дала�и</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Гвиней�ки франк</displayName>
-				<displayName count="one">гвиней�ки франк</displayName>
-				<displayName count="other">гвиней�ки франка</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Гвиней�ка �или</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Екваториално гвиней�ко еквеле</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Гръцка драхма</displayName>
-				<displayName count="one">гръцка драхма</displayName>
-				<displayName count="other">гръцки драхми</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Гватемал�ки кветзал</displayName>
-				<displayName count="one">гватемал�ки кветзал</displayName>
-				<displayName count="other">гватемал�ки кветзала</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Е�кудо от Португал�ка Гвине�</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Гвине�-Би�ау пе�о</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Га�н�ки долар</displayName>
-				<displayName count="one">га�н�ки долар</displayName>
-				<displayName count="other">га�н�ки долара</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Хонгконг�ки долар</displayName>
-				<displayName count="one">хонгконг�ки долар</displayName>
-				<displayName count="other">хонгконг�ки долара</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Хондура�ка лемпира</displayName>
-				<displayName count="one">хондура�ка лемпира</displayName>
-				<displayName count="other">хондура�ки лемпири</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Хърват�ки динар</displayName>
-				<displayName count="one">хърват�ки динар</displayName>
-				<displayName count="other">хърват�ки динара</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Хърват�ка куна</displayName>
-				<displayName count="one">хърват�ка куна</displayName>
-				<displayName count="other">хърват�ки куни</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Хаит�ки гурд</displayName>
-				<displayName count="one">хаит�ки гурд</displayName>
-				<displayName count="other">хаит�ки гурда</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Унгар�ки форинт</displayName>
-				<displayName count="one">унгар�ки форинт</displayName>
-				<displayName count="other">унгар�ки форинта</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Индонезий�ка рупи�</displayName>
-				<displayName count="one">индонезий�ка рупи�</displayName>
-				<displayName count="other">индонезий�ки рупии</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ирланд�ка лира</displayName>
-				<displayName count="one">ирланд�ка лира</displayName>
-				<displayName count="other">ирланд�ки лири</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Израел�ка лира</displayName>
-				<displayName count="one">израел�ка лира</displayName>
-				<displayName count="other">израел�ки лири</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Израел�ки нов шекел</displayName>
-				<displayName count="one">израел�ки нов шекел</displayName>
-				<displayName count="other">израел�ки нови шекела</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Индий�ка рупи�</displayName>
-				<displayName count="one">индий�ка рупи�</displayName>
-				<displayName count="other">индий�ки рупии</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ирак�ки динар</displayName>
-				<displayName count="one">ирак�ки динар</displayName>
-				<displayName count="other">ирак�ки динара</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Иран�ки риал</displayName>
-				<displayName count="one">иран�ки риал</displayName>
-				<displayName count="other">иран�ки риала</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>И�ланд�ка крона</displayName>
-				<displayName count="one">и�ланд�ка крона</displayName>
-				<displayName count="other">и�ланд�ки крони</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Италиан�ка лира</displayName>
-				<displayName count="one">италиан�ка лира</displayName>
-				<displayName count="other">италиан�ки лири</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Ямай�ки долар</displayName>
-				<displayName count="one">�май�ки долар</displayName>
-				<displayName count="other">�май�ки долара</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Йордан�ки динар</displayName>
-				<displayName count="one">йордан�ки динар</displayName>
-				<displayName count="other">йордан�ки динара</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Япон�ка йена</displayName>
-				<displayName count="one">�пон�ка йена</displayName>
-				<displayName count="other">�пон�ки йени</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Кений�ки шилинг</displayName>
-				<displayName count="one">кений�ки шилинг</displayName>
-				<displayName count="other">кений�ки шилинга</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Кирги�тан�ки �ом</displayName>
-				<displayName count="one">кирги�тан�ки �ом</displayName>
-				<displayName count="other">кирги�тан�ки �ома</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Камбоджан�ки риел</displayName>
-				<displayName count="one">камбоджан�ки риел</displayName>
-				<displayName count="other">камбоджан�ки риела</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Комор�ки франк</displayName>
-				<displayName count="one">комор�ки франк</displayName>
-				<displayName count="other">комор�ки франка</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Севернокорей�ки вон</displayName>
-				<displayName count="one">�евернокорей�ки вон</displayName>
-				<displayName count="other">�евернокорей�ки вона</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>К�ДР вон</displayName>
-				<displayName count="other">К�ДР вона</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Кувейт�ки динар</displayName>
-				<displayName count="one">кувейт�ки динар</displayName>
-				<displayName count="other">кувейт�ки динара</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Кайманови о�трови - долар</displayName>
-				<displayName count="other">Кайманови о�трови - долара</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Казах�тан�ко тенге</displayName>
-				<displayName count="one">казах�тан�ко тенге</displayName>
-				<displayName count="other">казах�тан�ки тенге</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Лао�ки кип</displayName>
-				<displayName count="one">лао�ки кип</displayName>
-				<displayName count="other">лао�ки кипа</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Ливан�ка лира</displayName>
-				<displayName count="one">ливан�ка лира</displayName>
-				<displayName count="other">ливан�ки лири</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Шриланк�ка рупи�</displayName>
-				<displayName count="one">шриланк�ка рупи�</displayName>
-				<displayName count="other">шриланк�ки рупии</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Либерий�ки долар</displayName>
-				<displayName count="one">либерий�ки долар</displayName>
-				<displayName count="other">либерий�ки долара</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Ле�от�ко лоти</displayName>
-				<displayName count="one">ле�от�ко лоти</displayName>
-				<displayName count="other">ле�от�ки лоти</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Литов�ки литаз</displayName>
-				<displayName count="one">литов�ки литаз</displayName>
-				<displayName count="other">литов�ки литаза</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Литов�ки талон</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Люк�ембург�ки франк</displayName>
-				<displayName count="one">люк�ембург�ки франк</displayName>
-				<displayName count="other">люк�ембург�ки франка</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Латвий�ки лат</displayName>
-				<displayName count="one">латвий�ки лат</displayName>
-				<displayName count="other">латвий�ки лата</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Латвий�ка рубла</displayName>
-				<displayName count="one">латвий�ка рубла</displayName>
-				<displayName count="other">латвий�ки рубли</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Либий�ки динар</displayName>
-				<displayName count="one">либий�ки динар</displayName>
-				<displayName count="other">либий�ки динара</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Марокан�ки дирхам</displayName>
-				<displayName count="one">марокан�ки дирхам</displayName>
-				<displayName count="other">марокан�ки дирхама</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Марокан�ки франк</displayName>
-				<displayName count="one">марокан�ки франк</displayName>
-				<displayName count="other">марокан�ки франка</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Молдов�ко леу</displayName>
-				<displayName count="one">молдов�ко леу</displayName>
-				<displayName count="other">молдов�ки леу</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Малага�ий�ки ариари</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Малгашки франк - Мадага�кар</displayName>
-				<displayName count="one">малгашки франк - Мадага�кар</displayName>
-				<displayName count="other">малгашки франка - Мадага�кар</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Македон�ки денар</displayName>
-				<displayName count="one">македон�ки денар</displayName>
-				<displayName count="other">македон�ки денара</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Малий�ки франк</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Ми�нмар�ки (Бирма) ки�т</displayName>
-				<displayName count="one">ми�нмар�ки ки�т</displayName>
-				<displayName count="other">ми�нмар�ки ки�та</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Монгол�ки тугрик</displayName>
-				<displayName count="one">монгол�ки тугрик</displayName>
-				<displayName count="other">монгол�ки тугрика</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Макао - патака</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Мавритан�ка оги�</displayName>
-				<displayName count="one">мавритан�ка оги�</displayName>
-				<displayName count="other">мавритан�ки огии</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Малтий�ка лира</displayName>
-				<displayName count="one">малтий�ка лира</displayName>
-				<displayName count="other">малтий�ки лири</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Мавриций�ка рупи�</displayName>
-				<displayName count="one">мавриций�ка рупи�</displayName>
-				<displayName count="other">мавриций�ки рупии</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Малдив�ка руфи�</displayName>
-				<displayName count="one">малдив�ка руфи�</displayName>
-				<displayName count="other">малдив�ки руфии</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Малавий�ка квача</displayName>
-				<displayName count="one">малавий�ка квача</displayName>
-				<displayName count="other">малавий�ки квачи</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Мек�икан�ко ново пе�о</displayName>
-				<displayName count="one">мек�икан�ко ново пе�о</displayName>
-				<displayName count="other">мек�икан�ки нови пе�о</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Мек�икан�ко �ребърно пе�о (1861-1992)</displayName>
-				<displayName count="one">мек�икан�ко �ребърно пе�о (MXP)</displayName>
-				<displayName count="other">мек�икан�ки �ребърни пе�о (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Мек�икан�ка конвертируема единица (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Малайзий�ки рингит</displayName>
-				<displayName count="one">малайзий�ки рингит</displayName>
-				<displayName count="other">малайзий�ки рингити</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Мозамбик�ко е�кудо</displayName>
-				<displayName count="one">мозамбик�ко е�кудо</displayName>
-				<displayName count="other">мозамбик�ки е�кудо</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Мозамбик�ки метикал</displayName>
-				<displayName count="one">мозамбик�ки метикал</displayName>
-				<displayName count="other">мозамбик�ки метикала</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Мозамбишки метикал</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>�амибий�ки долар</displayName>
-				<displayName count="one">намибий�ки долар</displayName>
-				<displayName count="other">намибий�ки долара</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�игерий�ка найра</displayName>
-				<displayName count="one">нигерий�ка найра</displayName>
-				<displayName count="other">нигерий�ки найри</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>�икарагуан�ка кордоба</displayName>
-				<displayName count="one">никарагуан�ка кордоба</displayName>
-				<displayName count="other">никарагуан�ки кордоби</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>�икарагуан�ка златна кордоба</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Холанд�ки гулден</displayName>
-				<displayName count="one">холанд�ки гулден</displayName>
-				<displayName count="other">холанд�ки гулдена</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>�орвежка крона</displayName>
-				<displayName count="one">норвежка крона</displayName>
-				<displayName count="other">норвежки крони</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�епал�ка рупи�</displayName>
-				<displayName count="one">непал�ка рупи�</displayName>
-				<displayName count="other">непал�ки рупии</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�овозеланд�ки долар</displayName>
-				<displayName count="one">новозеланд�ки долар</displayName>
-				<displayName count="other">новозеланд�ки долара</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Оман�ки риал</displayName>
-				<displayName count="one">оман�ки риал</displayName>
-				<displayName count="other">оман�ки риала</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Панам�ки балбоа</displayName>
-				<displayName count="one">панам�ки балбоа</displayName>
-				<displayName count="other">панам�ки балбоа</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Перуан�ко инти</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Перуан�ки нов �ол</displayName>
-				<displayName count="one">перуан�ки нов �ол</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Перуан�ки �ол</displayName>
-				<displayName count="one">перуан�ки �ол</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Папуа-новогвиней�ка кина</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Филипин�ко пе�о</displayName>
-				<displayName count="one">филипин�ко пе�о</displayName>
-				<displayName count="other">филипин�ки пе�о</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Паки�тан�ка рупи�</displayName>
-				<displayName count="one">паки�тан�ка рупи�</displayName>
-				<displayName count="other">паки�тан�ки рупии</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Пол�ка злота</displayName>
-				<displayName count="one">пол�ка злота</displayName>
-				<displayName count="other">пол�ки злоти</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Пол�ка злота (1950-1995)</displayName>
-				<displayName count="one">пол�ка злота (PLZ)</displayName>
-				<displayName count="other">пол�ки злоти (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Португал�ко е�кудо</displayName>
-				<displayName count="one">португал�ко е�кудо</displayName>
-				<displayName count="other">португал�ки е�кудо</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Парагвай�ко гуарани</displayName>
-				<displayName count="one">парагвай�ко гуарани</displayName>
-				<displayName count="other">парагвай�ки гуарани</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Катар�ки риал</displayName>
-				<displayName count="one">катар�ки риал</displayName>
-				<displayName count="other">катар�ки риала</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Родезий�ки долар</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Стара румън�ка ле�</displayName>
-				<displayName count="one">�тара румън�ка ле�</displayName>
-				<displayName count="other">�тари румън�ки леи</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Румън�ка ле�</displayName>
-				<displayName count="one">румън�ка ле�</displayName>
-				<displayName count="other">румън�ки леи</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Сръб�ки динар</displayName>
-				<displayName count="one">�ръб�ки динар</displayName>
-				<displayName count="other">�ръб�ки динара</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ру�ка рубла</displayName>
-				<displayName count="one">ру�ка рубла</displayName>
-				<displayName count="other">ру�ки рубли</displayName>
-				<symbol>Руб.</symbol>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ру�ка рубла (1991-1998)</displayName>
-				<displayName count="one">ру�ка рубла (RUR)</displayName>
-				<displayName count="other">ру�ки рубли (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Руанд�ки франк</displayName>
-				<displayName count="one">руанд�ки франк</displayName>
-				<displayName count="other">руанд�ки франка</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Саудит�коараб�ки риал</displayName>
-				<displayName count="one">�аудит�коараб�ки риал</displayName>
-				<displayName count="other">�аудит�коараб�ки риала</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Соломонови о�трови - долар</displayName>
-				<displayName count="other">Соломонови о�трови - долара</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Сейшел�ка рупи�</displayName>
-				<displayName count="one">�ейшел�ка рупи�</displayName>
-				<displayName count="other">�ейшел�ки рупии</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Судан�ки динар</displayName>
-				<displayName count="one">�удан�ки динар</displayName>
-				<displayName count="other">�удан�ки динара</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Судан�ка лира</displayName>
-				<displayName count="one">�удан�ка лира</displayName>
-				<displayName count="other">�удан�ки лири</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Швед�ка крона</displayName>
-				<displayName count="one">швед�ка крона</displayName>
-				<displayName count="other">швед�ки крони</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Сингапур�ки долар</displayName>
-				<displayName count="one">�ингапур�ки долар</displayName>
-				<displayName count="other">�ингапур�ки долара</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Света Елена лира</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Словен�ки толар</displayName>
-				<displayName count="one">�ловен�ки толар</displayName>
-				<displayName count="other">�ловен�ки толара</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Словашка крона</displayName>
-				<displayName count="one">�ловашка крона</displayName>
-				<displayName count="other">�ловашки крони</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Сиералеон�ко леоне</displayName>
-				<displayName count="one">�иералеон�ко леоне</displayName>
-				<displayName count="other">�иералеон�ки леоне</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Сомалий�ки шилинг</displayName>
-				<displayName count="one">�омалий�ки шилинг</displayName>
-				<displayName count="other">�омалий�ки шилинга</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Суринам�ки долар</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Суринам�ки гилдер</displayName>
-				<displayName count="one">�уринам�ки гилдер</displayName>
-				<displayName count="other">�уринам�ки гилдера</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Сао Томе и Прин�ипи - добра</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Съвет�ка рубла</displayName>
-				<displayName count="one">�ъвет�ка рубла</displayName>
-				<displayName count="other">�ъвет�ки рубли</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Салвадор�ки колон</displayName>
-				<displayName count="one">�алвадор�ки колон</displayName>
-				<displayName count="other">�алвадор�ки колона</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Сирий�ка лира</displayName>
-				<displayName count="one">�ирий�ка лира</displayName>
-				<displayName count="other">�ирий�ки лири</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Свазиленд�ки лилангени</displayName>
-				<displayName count="one">�вазиленд�ки лилангени</displayName>
-				<displayName count="other">�вазиленд�ки лилангени</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Тайланд�ки бат</displayName>
-				<displayName count="one">тайланд�ки бат</displayName>
-				<displayName count="other">тайланд�ки бата</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Таджики�тан�ка рубла</displayName>
-				<displayName count="one">таджики�тан�ка рубла</displayName>
-				<displayName count="other">таджики�тан�ки рубли</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Таджики�тан�ки �омони</displayName>
-				<displayName count="one">таджики�тан�ки �омони</displayName>
-				<displayName count="other">таджики�тан�ки �омони</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Туркмени�тан�ки манат</displayName>
-				<displayName count="one">туркмени�тан�ки манат</displayName>
-				<displayName count="other">туркмени�тан�ки маната</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Тунизий�ки динар</displayName>
-				<displayName count="one">тунизий�ки динар</displayName>
-				<displayName count="other">тунизий�ки динара</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Тонга - па анга</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Тимор�ко е�кудо</displayName>
-				<displayName count="one">тимор�ко е�кудо</displayName>
-				<displayName count="other">тимор�ки е�кудо</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Тур�ка лира</displayName>
-				<displayName count="one">тур�ка лира</displayName>
-				<displayName count="other">тур�ки лири</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>�ова тур�ка лира</displayName>
-				<displayName count="one">нова тур�ка лира</displayName>
-				<displayName count="other">нови тур�ки лири</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Тринидат и Тобаго - долар</displayName>
-				<displayName count="other">Тринидат и Тобаго - долара</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Тайван�ки долар</displayName>
-				<displayName count="one">тайван�ки долар</displayName>
-				<displayName count="other">тайван�ки долара</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Танзаний�ки шилинг</displayName>
-				<displayName count="one">танзаний�ки шилинг</displayName>
-				<displayName count="other">танзаний�ки шилинга</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Украин�ка хривн�</displayName>
-				<displayName count="one">украин�ка хривн�</displayName>
-				<displayName count="other">украин�ки хривни</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Украин�ки карбованец</displayName>
-				<displayName count="one">украин�ки карбованец</displayName>
-				<displayName count="other">украин�ки карбованеца</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Угандий�ки шилинг (1966-1987)</displayName>
-				<displayName count="one">угандий�ки шилинг (UGS)</displayName>
-				<displayName count="other">угандий�ки шилинга (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Угандий�ки нов шилинг</displayName>
-				<displayName count="one">угандий�ки нов шилинг</displayName>
-				<displayName count="other">угандий�ки нови шилинга</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>С�Щ долар</displayName>
-				<displayName count="other">С�Щ долара</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Уругвай�ко пе�о (индек� на инфлаци�та)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Уругвай�ко пе�о (1975-1993)</displayName>
-				<displayName count="one">уругвай�ко пе�о (UYP)</displayName>
-				<displayName count="other">уругвай�ки пе�о (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Уругвай�ко пе�о</displayName>
-				<displayName count="one">уругвай�ко пе�о</displayName>
-				<displayName count="other">уругвай�ки пе�о</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Узбеки�тан�ки �ум</displayName>
-				<displayName count="one">узбеки�тан�ки �ум</displayName>
-				<displayName count="other">узбеки�тан�ки �ума</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Венецуел�ки боливар</displayName>
-				<displayName count="one">венецуел�ки боливар</displayName>
-				<displayName count="other">венецуел�ки боливара</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Венецуел�ки боливар фуерте</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Виетнам�ки донг</displayName>
-				<displayName count="one">виетнам�ки донг</displayName>
-				<displayName count="other">виетнам�ки донга</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Вануату - вату</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Самоа - тала</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Буркина Фа�о - CFA - франк</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Злато</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Източнокариб�ки долар - �нтигуа</displayName>
-				<displayName count="one">източнокариб�ки долар</displayName>
-				<displayName count="other">източнокариб�ки долара</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Еку на ЕИО</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Френ�ки златен франк</displayName>
-				<displayName count="one">френ�ки златен франк</displayName>
-				<displayName count="other">френ�ки златна франка</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Бенин - CFA франк</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Френ�кополинезий�ки франк</displayName>
-				<displayName count="one">френ�кополинезий�ки франк</displayName>
-				<displayName count="other">френ�кополинезий�ки франка</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>�епозната или невалидна валута</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Йемен�ки динар</displayName>
-				<displayName count="one">йемен�ки динар</displayName>
-				<displayName count="other">йемен�ки динара</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Йемен�ки риал</displayName>
-				<displayName count="one">йемен�ки риал</displayName>
-				<displayName count="other">йемен�ки риала</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Юго�лав�ки твърд динар</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Юго�лав�ки динар</displayName>
-				<displayName count="one">юго�лав�ки динар</displayName>
-				<displayName count="other">юго�лав�ки динара</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Юго�лав�ки конвертируем динар</displayName>
-				<displayName count="one">юго�лав�ки конвертируем динар</displayName>
-				<displayName count="other">юго�лав�ки конвертируеми динара</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Южноафрикан�ки ранд (финан�ов)</displayName>
-				<displayName count="one">южноафрикан�ки ранд (финан�ов)</displayName>
-				<displayName count="other">южноафрикан�ки ранда (финан�ови)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Южноафрикан�ки ранд</displayName>
-				<displayName count="one">южноафрикан�ки ранд</displayName>
-				<displayName count="other">южноафрикан�ки ранда</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Замбий�ка квача</displayName>
-				<displayName count="one">замбий�ка квача</displayName>
-				<displayName count="other">замбий�ки квачи</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Заир�ко ново зайре</displayName>
-				<displayName count="one">заир�ко ново зайре</displayName>
-				<displayName count="other">заир�ки нови зайре</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Заир�ко зайре</displayName>
-				<displayName count="one">заир�ко зайре</displayName>
-				<displayName count="other">заир�ки зайре</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Зимбабвий�ки долар</displayName>
-				<displayName count="one">зимбабвий�ки долар</displayName>
-				<displayName count="other">зимбабвий�ки долара</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ден</unitPattern>
-			<unitPattern count="other">{0} дена</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ча�</unitPattern>
-			<unitPattern count="other">{0} ча�а</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} минута</unitPattern>
-			<unitPattern count="other">{0} минути</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} ме�ец</unitPattern>
-			<unitPattern count="other">{0} ме�еца</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} �екунда</unitPattern>
-			<unitPattern count="other">{0} �екунди</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} �едмица</unitPattern>
-			<unitPattern count="other">{0} �едмици</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} година</unitPattern>
-			<unitPattern count="other">{0} години</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>да:д</yesstr>
-			<nostr>не:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/bg_BG.xml b/airtime_mvc/library/Zend/Locale/Data/bg_BG.xml
deleted file mode 100644
index e6edfb639..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bg_BG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bg"/>
-		<territory type="BG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bn.xml b/airtime_mvc/library/Zend/Locale/Data/bn.xml
deleted file mode 100644
index 0e438ecb5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bn.xml
+++ /dev/null
@@ -1,2834 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.93 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="bn"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">আফার</language>
-			<language type="ab">আব�খাজিয়</language>
-			<language type="ace">আচিনিয়</language>
-			<language type="ach">আকোলী</language>
-			<language type="ada">অদাগ�মে</language>
-			<language type="ady">আদেগে</language>
-			<language type="ae">আবেস�তীয়</language>
-			<language type="af">আফ�রিকান�স</language>
-			<language type="afa">অফ�রো-�শিয়াটিক</language>
-			<language type="afh">আফ�রিহিলি</language>
-			<language type="ain">আইন�</language>
-			<language type="ak">আকান</language>
-			<language type="akk">আক�কাদিয়ান</language>
-			<language type="ale">আলেউত</language>
-			<language type="alg">আলগোঙক�ইআন</language>
-			<language type="alt">দক�ষিন আলতাই</language>
-			<language type="am">আমহারিক</language>
-			<language type="an">আর�গোনিজ</language>
-			<language type="ang">প�রাচীন ইংরেজী</language>
-			<language type="anp">আঙ�গীকা</language>
-			<language type="apa">অ�যাপাচি</language>
-			<language type="ar">আরবী</language>
-			<language type="arc">আরামাইক</language>
-			<language type="arn">অ�যারোকেনিয়</language>
-			<language type="arp">আরাপাহো</language>
-			<language type="art">কৃত�রিম</language>
-			<language type="arw">আরাওয়াক</language>
-			<language type="as">আসামি</language>
-			<language type="ast">আস�ত�রিয়</language>
-			<language type="ath">আথাপাস�কান</language>
-			<language type="aus">অস�ট�রেলিয়</language>
-			<language type="av">আভেরিক</language>
-			<language type="awa">আওয়াধি</language>
-			<language type="ay">আয়মারা</language>
-			<language type="az">আজারবাইজানীয়</language>
-			<language type="ba">বাশকির</language>
-			<language type="bad">বান�দা</language>
-			<language type="bai">বামিলেকে ভাষা</language>
-			<language type="bal">বেল�চী</language>
-			<language type="ban">বালিনীয়</language>
-			<language type="bas">বাসা</language>
-			<language type="bat">বাল�টিক ভাষা</language>
-			<language type="be">বেলার�শিয়</language>
-			<language type="bej">বেজা</language>
-			<language type="bem">বেম�বা</language>
-			<language type="ber">বেরবের</language>
-			<language type="bg">ব�লগেরিয়</language>
-			<language type="bh">বিহারি</language>
-			<language type="bho">ভোজপ�রি</language>
-			<language type="bi">বিসলামা</language>
-			<language type="bik">বিকোল</language>
-			<language type="bin">বিনি</language>
-			<language type="bla">সিকসিকা</language>
-			<language type="bm">বামবারা</language>
-			<language type="bn">বাংলা</language>
-			<language type="bnt">বান�ট�</language>
-			<language type="bo">তিব�বতি</language>
-			<language type="br">ব�রেটোন</language>
-			<language type="bra">ব�রাজ</language>
-			<language type="bs">বসনীয়</language>
-			<language type="btk">বাতাক</language>
-			<language type="bua">ব�রিয়াত</language>
-			<language type="bug">ব�গিনি</language>
-			<language type="byn">ব�লিন</language>
-			<language type="ca">কাতালান</language>
-			<language type="cad">ক�যাডো</language>
-			<language type="cai">মধ�য য�ক�তরাষ�ঠের আদিবাসীদের ভাষা</language>
-			<language type="car">ক�যারিব</language>
-			<language type="cau">ককেশীয</language>
-			<language type="cch">আত�সাম</language>
-			<language type="ce">চেচেন</language>
-			<language type="ceb">চেব�য়ানো</language>
-			<language type="cel">কেল�টিক</language>
-			<language type="ch">চামেরো</language>
-			<language type="chb">চিবচা</language>
-			<language type="chg">চাগাতাই</language>
-			<language type="chk">চ�কি</language>
-			<language type="chm">মারি</language>
-			<language type="chn">চিন�ক পরিভাষা</language>
-			<language type="cho">চক�টো</language>
-			<language type="chp">চিপেওয়ান</language>
-			<language type="chr">চেরোকি</language>
-			<language type="chy">শাইয়েন</language>
-			<language type="cmc">চামিক ভাষা</language>
-			<language type="co">কর�সিকান</language>
-			<language type="cop">কপটিক</language>
-			<language type="cpe">ইংরেজি জাত ক�রেওল অথবা পিজিন</language>
-			<language type="cpf">ফরাসি জাত ক�রেওল অথবা পিজিন</language>
-			<language type="cpp">পোর�ত�গিজ-ভিত�তিক ক�রেওল বা পিজন</language>
-			<language type="cr">ক�রি</language>
-			<language type="crh">ক�রিমিয়ান ত�র�কি</language>
-			<language type="crp">ক�রেওল অথবা পিজিন</language>
-			<language type="cs">চেক</language>
-			<language type="csb">কাশ�বিয়ান</language>
-			<language type="cu">চার�চ স�লাভিও</language>
-			<language type="cus">ক�শিতিক ভাষা</language>
-			<language type="cv">চ�বাস</language>
-			<language type="cy">ওয়েলশ</language>
-			<language type="da">ডেনিশ</language>
-			<language type="dak">ডাকোটা</language>
-			<language type="dar">দার�গওয়া</language>
-			<language type="day">দায়াক</language>
-			<language type="de">জার�মান</language>
-			<language type="de_AT">অস�ট�রিয়ান জার�মানি</language>
-			<language type="de_CH">স�ইস উচ�চ জার�মানি</language>
-			<language type="del">ডেলাওয়ের</language>
-			<language type="den">স�ল�যাভ</language>
-			<language type="dgr">দোগ�রীব</language>
-			<language type="din">ডিংকা</language>
-			<language type="doi">দোগরি</language>
-			<language type="dra">দ�রাবীড় ভাষা</language>
-			<language type="dsb">নিম�নতর সোর�বিয়ান</language>
-			<language type="dua">দ�য়ালা</language>
-			<language type="dum">মধ�য ডাচ</language>
-			<language type="dv">দিবেহি</language>
-			<language type="dyu">ডিউলা</language>
-			<language type="dz">ভ�টানি</language>
-			<language type="ee">ইওয়ে</language>
-			<language type="efi">�ফিক</language>
-			<language type="egy">প�রাচীন মিশরীয়</language>
-			<language type="eka">ইকাজ�ক</language>
-			<language type="el">গ�রিক</language>
-			<language type="elx">�লামাইট</language>
-			<language type="en">ইংরেজি</language>
-			<language type="en_AU">অস�ট�রেলীয় ইংরেজি</language>
-			<language type="en_CA">কানাডীয় ইংরেজি</language>
-			<language type="en_GB">ব�রিটিশ ইংরেজি</language>
-			<language type="en_US">য�ক�তরাষ�ট�র ইংরেজি</language>
-			<language type="enm">মধ�য ইংরেজি</language>
-			<language type="eo">�স�পেরান�তো</language>
-			<language type="es">স�পেনীয়</language>
-			<language type="es_419">ল�যাটিন আমেরিকান স�প�যানিশ</language>
-			<language type="es_ES">আইবেরিয়ান স�প�যানিশ</language>
-			<language type="et">�স�তোনীয়</language>
-			<language type="eu">বাস�ক</language>
-			<language type="ewo">ইওন�ডো</language>
-			<language type="fa">ফার�সি</language>
-			<language type="fan">ফ�যাঙ�গ</language>
-			<language type="fat">ফান�তি</language>
-			<language type="ff">ফ�লাহ�</language>
-			<language type="fi">ফিনিশ</language>
-			<language type="fil">ফিলিপিনো</language>
-			<language type="fiu">ফিনো-ইউগ�রিক</language>
-			<language type="fj">ফিজিও</language>
-			<language type="fo">ফেরাউনি</language>
-			<language type="fon">ফন</language>
-			<language type="fr">ফরাসি</language>
-			<language type="fr_CA">কানাডীয় ফরাসি</language>
-			<language type="fr_CH">স�ইস ফরাসি</language>
-			<language type="frm">মধ�য ফরাসি</language>
-			<language type="fro">প�রাচীন ফরাসি</language>
-			<language type="frr">উত�তরাঞ�চলীয় ফ�রিসিয়ান</language>
-			<language type="frs">পূর�ব ফ�রিসিয়</language>
-			<language type="fur">ফ�রিউলিয়ান</language>
-			<language type="fy">পশ�চিম ফ�রিসিয়</language>
-			<language type="ga">আইরিশ</language>
-			<language type="gaa">গা</language>
-			<language type="gay">গায়ো</language>
-			<language type="gba">বায়া</language>
-			<language type="gd">স�কটস-গ�যেলিক</language>
-			<language type="gem">জার�মানিক ভাষা</language>
-			<language type="gez">গীজ</language>
-			<language type="gil">গিলবার�টিজ</language>
-			<language type="gl">গ�যালিশিয়</language>
-			<language type="gmh">মধ�য-উচ�চ জার�মানি</language>
-			<language type="gn">গ�য়ারানি</language>
-			<language type="goh">প�রাচীন উচ�চ জার�মানি</language>
-			<language type="gon">গোন�ডি</language>
-			<language type="gor">গোরোন�তালো</language>
-			<language type="got">গথিক</language>
-			<language type="grb">গ�রেবো</language>
-			<language type="grc">প�রাচীন গ�রীক</language>
-			<language type="gsw">স�ইস জার�মান</language>
-			<language type="gu">গ�জরাটি</language>
-			<language type="gv">ম�যাঙ�কস</language>
-			<language type="gwi">গওইচ�’ইন</language>
-			<language type="ha">হাউসা</language>
-			<language type="hai">হাইডা</language>
-			<language type="haw">হাওয়াইয়ান</language>
-			<language type="he">হিব�র�</language>
-			<language type="hi">হিন�দি</language>
-			<language type="hil">হিলিগ�যায়নোন</language>
-			<language type="him">হিমাচালি</language>
-			<language type="hit">হিট�টিট</language>
-			<language type="hmn">হ�‌মোঙ</language>
-			<language type="ho">হিরি মোত�</language>
-			<language type="hr">ক�রোয়েশীয়</language>
-			<language type="hsb">উচ�চ সোর�বিয়ান</language>
-			<language type="ht">হাইতিয়ান</language>
-			<language type="hu">হাঙ�গেরীয়</language>
-			<language type="hup">হ�পা</language>
-			<language type="hy">আর�মেনিয়</language>
-			<language type="hz">হেরেরো</language>
-			<language type="ia">ইন�টারলিঙ�গ�য়া</language>
-			<language type="iba">ইবান</language>
-			<language type="id">ইন�দোনেশীয়</language>
-			<language type="ie">ইন�টারলিঙ�গ</language>
-			<language type="ig">ইগ�‌বো</language>
-			<language type="ii">সিচ�য়ান য়ি</language>
-			<language type="ijo">ইজো</language>
-			<language type="ik">ইন�পিয়াক</language>
-			<language type="ilo">ইলোকো</language>
-			<language type="inc">ভারতীয় ভাষা</language>
-			<language type="ine">ইন�দো-ইউরোপীয় ভাষা</language>
-			<language type="inh">ইঙ�গ�শ</language>
-			<language type="io">ইডো</language>
-			<language type="ira">ইরানী ভাষা</language>
-			<language type="iro">ইরোকোইয়ান ভাষা</language>
-			<language type="is">আইসল�যান�ডীয়</language>
-			<language type="it">ইতালীয়</language>
-			<language type="iu">ইন�ক�টিট�ট</language>
-			<language type="ja">জাপানি</language>
-			<language type="jbo">লোজবান</language>
-			<language type="jpr">জ�দেও ফার�সি</language>
-			<language type="jrb">জ�দেও আরবি</language>
-			<language type="jv">জাভানি</language>
-			<language type="ka">জর�জিয়ান</language>
-			<language type="kaa">কারা-কাল�পাক</language>
-			<language type="kab">কাবাইলে</language>
-			<language type="kac">কাচিন</language>
-			<language type="kaj">অজ�জ�</language>
-			<language type="kam">কাম�বা</language>
-			<language type="kar">কারেন</language>
-			<language type="kaw">কাউই</language>
-			<language type="kbd">কাবার�ডিয়ান</language>
-			<language type="kcg">টাইয়াপ</language>
-			<language type="kfo">কোরো</language>
-			<language type="kg">কোঙ�গো</language>
-			<language type="kha">খাশি</language>
-			<language type="khi">খোয়েশান ভাষা</language>
-			<language type="kho">খোটানিজ</language>
-			<language type="ki">কিক��ইয়�</language>
-			<language type="kj">কোয়ানিয়ামা</language>
-			<language type="kk">কাজাখ</language>
-			<language type="kl">ক�যালাল�লিস�ট</language>
-			<language type="km">খমের</language>
-			<language type="kmb">কিম�ব�ন�দ�</language>
-			<language type="kn">কান�নাড়ী</language>
-			<language type="ko">কোরিয়ান</language>
-			<language type="kok">কোঙ�কানি</language>
-			<language type="kos">কোস�রাইন</language>
-			<language type="kpe">ক�‌পেল�লে</language>
-			<language type="kr">কান�রি</language>
-			<language type="krc">কারচে-বাল�কার</language>
-			<language type="krl">কারেলিয়ান</language>
-			<language type="kro">ক�র�</language>
-			<language type="kru">ক�র�খ</language>
-			<language type="ks">কাশ�মীরী</language>
-			<language type="ku">ক�র�দি</language>
-			<language type="kum">ক�মিক</language>
-			<language type="kut">ক�টেনাই</language>
-			<language type="kv">কোমি</language>
-			<language type="kw">কর�ণিশ</language>
-			<language type="ky">কির�গিজ</language>
-			<language type="la">লাটিন</language>
-			<language type="lad">লাডিনো</language>
-			<language type="lah">লান�ডা</language>
-			<language type="lam">লাম�বা</language>
-			<language type="lb">ল�ক�সেমবার�গীয়</language>
-			<language type="lez">লেজঘিয়ান</language>
-			<language type="lg">গ�যান�ডা</language>
-			<language type="li">লিম�ব�র�গিশ</language>
-			<language type="ln">লিঙ�গালা</language>
-			<language type="lo">লাও</language>
-			<language type="lol">মোঙ�গো</language>
-			<language type="loz">লোজি</language>
-			<language type="lt">লিথ�য়েনীয</language>
-			<language type="lu">ল�বা-কাটাঙ�গা</language>
-			<language type="lua">ল�বা-ল�ল�য়া</language>
-			<language type="lui">ল�ইসেনো</language>
-			<language type="lun">ল�ন�ডা</language>
-			<language type="luo">ল�য়ো</language>
-			<language type="lus">ল�শাই</language>
-			<language type="lv">লাত�‌ভীয়</language>
-			<language type="mad">মাদ�রেসে</language>
-			<language type="mag">মাগাহি</language>
-			<language type="mai">মৈথিলি</language>
-			<language type="mak">ম�যাকাসার</language>
-			<language type="man">ম�যান�ডিঙ�গো</language>
-			<language type="map">অস�ট�রোনেশীয়</language>
-			<language type="mas">মাসাই</language>
-			<language type="mdf">মোকশা</language>
-			<language type="mdr">ম�যাণ�ডার</language>
-			<language type="men">মেন�ডে</language>
-			<language type="mg">মালাগাসি</language>
-			<language type="mga">মধ�য আইরিশ</language>
-			<language type="mh">মার�শালিজ</language>
-			<language type="mi">মাওরি</language>
-			<language type="mic">মিকম�যাক</language>
-			<language type="min">মিনাঙ�গ�‌কাবাউ</language>
-			<language type="mis">বিবিধ ভাষা</language>
-			<language type="mk">ম�যাসেডোনীয</language>
-			<language type="mkh">মন-খমের ভাষা</language>
-			<language type="ml">মালেয়ালাম</language>
-			<language type="mn">মঙ�গোলিয়</language>
-			<language type="mnc">মাঞ�চ�</language>
-			<language type="mni">মণিপ�রী</language>
-			<language type="mno">ম�যানোবো ভাষা</language>
-			<language type="mo">মলদাভিয়</language>
-			<language type="moh">মোহাওক</language>
-			<language type="mos">মসি</language>
-			<language type="mr">মারাঠি</language>
-			<language type="ms">মালে</language>
-			<language type="mt">মল�টিয়</language>
-			<language type="mul">বহ�গ�ণিতক ভাষাসমূহ</language>
-			<language type="mun">ম�ণ�ডা ভাষা</language>
-			<language type="mus">ক�রিক</language>
-			<language type="mwl">মিরান�ডিজ</language>
-			<language type="mwr">মারোয়ারি</language>
-			<language type="my">বর�মি</language>
-			<language type="myn">মায়ান ভাষা</language>
-			<language type="myv">�রজিয়া</language>
-			<language type="na">নাউর�</language>
-			<language type="nah">নাহ�ৎল</language>
-			<language type="nai">উত�তৱ আমেরিকার ইন�ডিয়ান ভাষা</language>
-			<language type="nap">নেয়াপোলিটান</language>
-			<language type="nb">নরওয়ে বোকমাল</language>
-			<language type="nd">উত�তর �ন�দেবিলি</language>
-			<language type="nds">নিম�ন জার�মানি</language>
-			<language type="ne">নেপালী</language>
-			<language type="new">নেওয়ারি</language>
-			<language type="ng">�ন�দোঙ�গা</language>
-			<language type="nia">নিয়াস</language>
-			<language type="nic">নাইজার-কোর�ডোফানিয়ান ভাষা</language>
-			<language type="niu">নিউয়ান</language>
-			<language type="nl">ডাচ</language>
-			<language type="nl_BE">ফ�লেমিশ</language>
-			<language type="nn">নরওয়েজীয়ান নিনর�স�ক</language>
-			<language type="no">নরওয়েজীয়</language>
-			<language type="nog">নোগাই</language>
-			<language type="non">প�রাচীন নর�স</language>
-			<language type="nqo">�ন’কো</language>
-			<language type="nr">দক�ষিণ �নডেবেলে</language>
-			<language type="nso">উত�তরাঞ�চলীয় সোথো</language>
-			<language type="nub">ন�বিয়ান ভাষা</language>
-			<language type="nv">নাভাজো</language>
-			<language type="nwc">প�রাচীন নেওয়ারী</language>
-			<language type="ny">নায়াঞ�জা</language>
-			<language type="nym">ন�যায়ামওয়েজি</language>
-			<language type="nyn">ন�যায়াঙ�কোলে</language>
-			<language type="nyo">ন�যোরো</language>
-			<language type="nzi">�ন�.জিমা</language>
-			<language type="oc">অক�সিটান</language>
-			<language type="oj">ওজিবওয়া</language>
-			<language type="om">অরোমো</language>
-			<language type="or">উড়িয়া</language>
-			<language type="os">ওসেটিক</language>
-			<language type="osa">ওসেজ</language>
-			<language type="ota">অটোমান ত�র�কি</language>
-			<language type="oto">অটোমান ভাষা</language>
-			<language type="pa">পাঞ�জাবী</language>
-			<language type="paa">পাপ�য়ান ভাষা</language>
-			<language type="pag">পাঙ�গাসিনান</language>
-			<language type="pal">পাহ�লাভি</language>
-			<language type="pam">পাম�পাঙ�গা</language>
-			<language type="pap">পাপিয়ামেন�টো</language>
-			<language type="pau">পালায়�য়ান</language>
-			<language type="peo">প�রাচীন ফার�সি</language>
-			<language type="phi">ফিলিপাইন ভাষা</language>
-			<language type="phn">ফোনিশীয়ান</language>
-			<language type="pi">পালি</language>
-			<language type="pl">পোলিশ</language>
-			<language type="pon">পোহ�নপেইয়ান</language>
-			<language type="pra">প�রাকৃত ভাষা</language>
-			<language type="pro">প�রাচীন প�রোভেনসাল</language>
-			<language type="ps">পশ�ত�</language>
-			<language type="pt">পর�ত�গীজ</language>
-			<language type="pt_BR">ব�রাজিলীয় পর�ত�গীজ</language>
-			<language type="pt_PT">আইবেরিয়ান পর�ত�গিজ</language>
-			<language type="qu">কেচ�য়া</language>
-			<language type="raj">রাজস�থানী</language>
-			<language type="rap">রাপান�ই</language>
-			<language type="rar">রারোটোংগান</language>
-			<language type="rm">রেটো-রোমানীয়</language>
-			<language type="rn">র�ন�দি</language>
-			<language type="ro">রোমানীয়</language>
-			<language type="roa">রোমান ভাষা</language>
-			<language type="rom">রোমানি</language>
-			<language type="root">মূল</language>
-			<language type="ru">র�শ</language>
-			<language type="rup">আরোমানিয়</language>
-			<language type="rw">কিনয়ারোয়ান�ডা</language>
-			<language type="sa">সংষ�কৃত</language>
-			<language type="sad">স�যান�ডাওয়ে</language>
-			<language type="sah">ইয়াক�ট</language>
-			<language type="sai">উত�তর আমেরিকান ইন�ডিয়ান ভাষা</language>
-			<language type="sal">শালিশান ভাষা</language>
-			<language type="sam">সামারিটান আরামিক</language>
-			<language type="sas">সাসাক</language>
-			<language type="sat">সা�ওতালি</language>
-			<language type="sc">সার�ডিনিয়ান</language>
-			<language type="scn">সিসিলিয়ান</language>
-			<language type="sco">স�কটস</language>
-			<language type="sd">সিন�ধি</language>
-			<language type="se">উত�তরাঞ�চলীয় সামি</language>
-			<language type="sel">সেল�ক�প</language>
-			<language type="sem">সেমেটিক ভাষা</language>
-			<language type="sg">সাঙ�গো</language>
-			<language type="sga">প�রাচীন আইরিশ</language>
-			<language type="sgn">চিহ�ন ভাষা</language>
-			<language type="sh">সার�বো-ক�রোয়েশিয়</language>
-			<language type="shn">শান</language>
-			<language type="si">সিংহলী</language>
-			<language type="sid">সিডামো</language>
-			<language type="sio">সিওয়�য়ান ভাষা</language>
-			<language type="sit">সিনো-তিব�বোতীয় ভাষা</language>
-			<language type="sk">স�লোভাক</language>
-			<language type="sl">স�লোভেনীয়</language>
-			<language type="sla">স�ল�যাভিক ভাষা</language>
-			<language type="sm">সামোয়ান</language>
-			<language type="sma">দক�ষিণাঞ�চলীয় সামি</language>
-			<language type="smi">সামি ভাষা</language>
-			<language type="smj">ল�লে সামি</language>
-			<language type="smn">ইনারি সামি</language>
-			<language type="sms">স�কোল�ট সামি</language>
-			<language type="sn">শোনা</language>
-			<language type="snk">সোনিঙ�কে</language>
-			<language type="so">সোমালী</language>
-			<language type="sog">সোগডিয়ান</language>
-			<language type="son">সোঙ�গহাই</language>
-			<language type="sq">আলবেনীয়</language>
-			<language type="sr">সার�বীয়</language>
-			<language type="srn">স�রানান টোঙ�গো</language>
-			<language type="srr">সেরের</language>
-			<language type="ss">সোয়াতি</language>
-			<language type="ssa">নিলো-সাহারান ভাষা</language>
-			<language type="st">দক�ষিন সোথো</language>
-			<language type="su">স�দানী</language>
-			<language type="suk">স�ক�মা</language>
-			<language type="sus">স�স�</language>
-			<language type="sux">স�মেরীয়</language>
-			<language type="sv">স�ইডিশ</language>
-			<language type="sw">সোয়াহিলি</language>
-			<language type="syc">প�রাচীন সিরিও</language>
-			<language type="syr">সিরিয়াক</language>
-			<language type="ta">তামিল</language>
-			<language type="tai">তাই ভাষা</language>
-			<language type="te">তেলেগ�</language>
-			<language type="tem">টাইম�নে</language>
-			<language type="ter">তেরেনো</language>
-			<language type="tet">তেত�ম</language>
-			<language type="tg">তাজিক</language>
-			<language type="th">থাই</language>
-			<language type="ti">তিগরিনিয়া</language>
-			<language type="tig">টাইগ�রে</language>
-			<language type="tiv">টিভ</language>
-			<language type="tk">ত�র�কমেনী</language>
-			<language type="tkl">টোকেলাউ</language>
-			<language type="tl">তাগালগ</language>
-			<language type="tlh">ক�লিঙ�গন</language>
-			<language type="tli">ত�লিঙ�গিট</language>
-			<language type="tmh">তামাশেক</language>
-			<language type="tn">সোয়ানা</language>
-			<language type="to">টঙ�গা</language>
-			<language type="tog">নায়াসা টোঙ�গা</language>
-			<language type="tpi">টোক পিসিন</language>
-			<language type="tr">ত�র�কী</language>
-			<language type="ts">সঙ�গা</language>
-			<language type="tsi">সিমশিয়ান</language>
-			<language type="tt">তাতার</language>
-			<language type="tum">ত�ম�ব�কা</language>
-			<language type="tup">ত�পি ভাষা</language>
-			<language type="tut">আলতায়ীক ভাষা</language>
-			<language type="tvl">ট�ভাল�</language>
-			<language type="tw">টোয়াই</language>
-			<language type="ty">তাহিতিয়ান</language>
-			<language type="tyv">ট�ভিনিয়ান</language>
-			<language type="udm">উডম�র�ট</language>
-			<language type="ug">উইঘ�র</language>
-			<language type="uga">উগারিটিক</language>
-			<language type="uk">ইউক�রেনীয়</language>
-			<language type="umb">উম�ব�ন�দ�</language>
-			<language type="und">অজানা বা ভ�ল ভাষা</language>
-			<language type="ur">উর�দ�</language>
-			<language type="uz">উজবেকীয়</language>
-			<language type="vai">ভাই</language>
-			<language type="ve">ভেন�ডা</language>
-			<language type="vi">ভিয়েতনামী</language>
-			<language type="vo">ভোলাপ�ক</language>
-			<language type="vot">ভোটিক</language>
-			<language type="wa">ওয়াল�ন</language>
-			<language type="wak">ওয়াকাশান ভাষা</language>
-			<language type="wal">ওয়ালামো</language>
-			<language type="war">ওয়ারে</language>
-			<language type="was">ওয়াশো</language>
-			<language type="wen">সোরবিয়ান ভাষা</language>
-			<language type="wo">উওলোফ</language>
-			<language type="xal">কাল�মইক</language>
-			<language type="xh">জোসা</language>
-			<language type="yao">ইয়াও</language>
-			<language type="yap">ইয়াপেসে</language>
-			<language type="yi">য়িদ�দিশ</language>
-			<language type="yo">ইওর�বা</language>
-			<language type="ypk">ইয়�পিক ভাষা</language>
-			<language type="za">���য়াঙ</language>
-			<language type="zap">জাপোটেক</language>
-			<language type="zbl">চিত�র ভাষা</language>
-			<language type="zen">জেনাগা</language>
-			<language type="zh">চীনা</language>
-			<language type="zh_Hans">সহজ চীনা</language>
-			<language type="zh_Hant">প�রথাগত চীনা</language>
-			<language type="znd">জান�ডে</language>
-			<language type="zu">জ�ল�</language>
-			<language type="zun">জ�নি</language>
-			<language type="zxx">ভাষাতাত�তিক বিষয়সূচী বহির�ভ�ত</language>
-			<language type="zza">জাজা</language>
-		</languages>
-		<scripts>
-			<script type="Arab">আরবি</script>
-			<script type="Armi">আরমি</script>
-			<script type="Armn">আর�মেনীয়</script>
-			<script type="Avst">আভেসতান</script>
-			<script type="Bali">বালীয়</script>
-			<script type="Batk">বাটাক</script>
-			<script type="Beng">বাংলা</script>
-			<script type="Blis">ব�লিসপ�রতীক</script>
-			<script type="Bopo">বোপোমোফো</script>
-			<script type="Brah">ব�রাহ�মী</script>
-			<script type="Brai">ব�রাইলে</script>
-			<script type="Bugi">ব�গি</script>
-			<script type="Buhd">ব�হিড</script>
-			<script type="Cakm">চাকমা</script>
-			<script type="Cans">সংয�ক�ত কানাডিয়ান অ�যাব�রোজিনিয়ান সিলেবিক�স</script>
-			<script type="Cari">ক�যারিয়ান</script>
-			<script type="Cham">চ�যাম</script>
-			<script type="Cher">চেরোকি</script>
-			<script type="Cirt">কির�ট</script>
-			<script type="Copt">কোপ�টিক</script>
-			<script type="Cprt">সাইপ�রোয়েট</script>
-			<script type="Cyrl">সিরিলিক</script>
-			<script type="Cyrs">প�রাচীন চার�চ স�লাভোনিক সিরিলিক</script>
-			<script type="Deva">দেবনাগরি</script>
-			<script type="Dsrt">দেসেরাত</script>
-			<script type="Egyd">মিশরীয় ডেমোটিক</script>
-			<script type="Egyh">মিশরীয় হায়রেটিক</script>
-			<script type="Egyp">মিশরীয় হায়ারোগ�লিপ</script>
-			<script type="Ethi">ইথিওপিয়</script>
-			<script type="Geok">জর�জিয় খ�ৎস�রি</script>
-			<script type="Geor">জর�জিয়ান</script>
-			<script type="Glag">গ�লাগোলিটিক</script>
-			<script type="Goth">গোথিক</script>
-			<script type="Grek">গ�রিক</script>
-			<script type="Gujr">গ�জরাটি</script>
-			<script type="Guru">গ�র�ম�খি</script>
-			<script type="Hang">হাঙ�গ�ল</script>
-			<script type="Hani">হ�যান</script>
-			<script type="Hano">হ�যান�ন�</script>
-			<script type="Hans">সরলীকৃত হ�যান</script>
-			<script type="Hant">প�রথাগত হ�যান</script>
-			<script type="Hebr">হিব�র�</script>
-			<script type="Hira">হিরাগানা</script>
-			<script type="Hmng">ফাহাও মঙ</script>
-			<script type="Hrkt">কাটাকানা অথবা হিরাগানা</script>
-			<script type="Hung">প�রোনো হাঙ�গেরীয়</script>
-			<script type="Inds">সিন�ধ�</script>
-			<script type="Ital">প�রাচীন ইতালি</script>
-			<script type="Java">জাভানিজ</script>
-			<script type="Jpan">জাপানী</script>
-			<script type="Kali">কায়াহ লি</script>
-			<script type="Kana">কাটাকানা</script>
-			<script type="Khar">খরোষ�ঠী</script>
-			<script type="Khmr">খমের</script>
-			<script type="Knda">কানাড়া</script>
-			<script type="Kore">কোরিয়ান</script>
-			<script type="Kthi">কাইথি</script>
-			<script type="Lana">লান�না</script>
-			<script type="Laoo">লাও</script>
-			<script type="Latf">ফ�রাক�ট�র ল�যাটিন</script>
-			<script type="Latg">গ�যালিক ল�যাটিন</script>
-			<script type="Latn">ল�যাটিন</script>
-			<script type="Lepc">লেপ�চা</script>
-			<script type="Limb">লিম�ব�</script>
-			<script type="Lina">লিনিয়ার �</script>
-			<script type="Linb">লিনিয়ার বি</script>
-			<script type="Lyci">লাইসিয়ান</script>
-			<script type="Lydi">লাইডিয়ান</script>
-			<script type="Mand">ম�যান�ডায়ীন</script>
-			<script type="Mani">ম�যানিচাইন</script>
-			<script type="Maya">মায়ান হায়ারোগ�লিপ</script>
-			<script type="Mero">মেরোইটিক</script>
-			<script type="Mlym">মালায়ালাম</script>
-			<script type="Mong">মোঙ�গোলীয়</script>
-			<script type="Moon">ম�ন</script>
-			<script type="Mtei">মেইটেই মায়েক</script>
-			<script type="Mymr">মায়ানমার</script>
-			<script type="Nkoo">�নকো</script>
-			<script type="Ogam">ওঘাম</script>
-			<script type="Olck">ওল চিকি</script>
-			<script type="Orkh">অর�খোন</script>
-			<script type="Orya">উড়িয়া</script>
-			<script type="Osma">ওসমানিয়</script>
-			<script type="Perm">প�রাচীন পার�মিক</script>
-			<script type="Phag">ফাগ�স-পা</script>
-			<script type="Phli">খদিত পাহলভি</script>
-			<script type="Phlp">সল�টার পাহলভি</script>
-			<script type="Phlv">প�স�তক পাহলভি</script>
-			<script type="Phnx">ফিনিশিয়</script>
-			<script type="Plrd">পোলার�ড ধ�বনিক</script>
-			<script type="Prti">পার�থিয়ন</script>
-			<script type="Qaai">কাই</script>
-			<script type="Rjng">রেজ�যাঙ�গ</script>
-			<script type="Roro">রোঙ�গোরোঙ�গো</script>
-			<script type="Runr">র�নিক</script>
-			<script type="Samr">সমেরিটন</script>
-			<script type="Sara">সারাতি</script>
-			<script type="Saur">সৌরাষ�ট�র</script>
-			<script type="Sgnw">চিহ�ন লিখন</script>
-			<script type="Shaw">সাভিয়ান</script>
-			<script type="Sinh">সিংহলি</script>
-			<script type="Sund">সান�দানিজ</script>
-			<script type="Sylo">সিলেটি নাগরি</script>
-			<script type="Syrc">সিরিয়াক</script>
-			<script type="Syre">�স�ট�রেঙ�গেলো সিরিয়াক</script>
-			<script type="Syrj">পশ�চিমাঞ�চলীয় সিরিয়াক</script>
-			<script type="Syrn">পূর�বাঞ�চলীয় সিরিয়াক</script>
-			<script type="Tagb">টাগোওয়ানা</script>
-			<script type="Tale">তাইলে</script>
-			<script type="Talu">নত�ন তাই ল�</script>
-			<script type="Taml">তামিল</script>
-			<script type="Tavt">তাই ভিয়েৎ</script>
-			<script type="Telu">তেলেগ�</script>
-			<script type="Teng">তেঙ�গোয়ার</script>
-			<script type="Tfng">তিফিনাগ</script>
-			<script type="Tglg">টাগালগ</script>
-			<script type="Thaa">থানা</script>
-			<script type="Thai">থাই</script>
-			<script type="Tibt">তিব�বতি</script>
-			<script type="Ugar">উগারিটিক</script>
-			<script type="Vaii">ভাই</script>
-			<script type="Visp">দৃশ�যমান ভাষা</script>
-			<script type="Xpeo">প�রাচীন ফার�সি</script>
-			<script type="Xsux">স�মের-আক�কাদীয় কীলকরূপ</script>
-			<script type="Yiii">উই</script>
-			<script type="Zmth">গানিতিক চিহ�ন</script>
-			<script type="Zsym">প�রতীকসম�হ</script>
-			<script type="Zxxx">অলিখিত</script>
-			<script type="Zyyy">সাধারন</script>
-			<script type="Zzzz">অজানা বা ভ�ল লিপি</script>
-		</scripts>
-		<territories>
-			<territory type="001">পৃথিবী</territory>
-			<territory type="002">আফ�রিকা</territory>
-			<territory type="003">উত�তর আমেরিক</territory>
-			<territory type="005">দক�ষিন আমেরিকা</territory>
-			<territory type="009">ওসানিয়া</territory>
-			<territory type="011">পশ�চিমাঞ�চলীয় আফ�রিকা</territory>
-			<territory type="013">মধ�য আমেরিকা</territory>
-			<territory type="014">পূর�ব আফ�রিকা</territory>
-			<territory type="015">উত�তর আফ�রিকা</territory>
-			<territory type="017">মধ�য আফ�রিকা</territory>
-			<territory type="018">দক�ষিণাঞ�চলীয় আফ�রিকা</territory>
-			<territory type="019">আমেরিকাস</territory>
-			<territory type="021">উত�তরাঞ�চলীয় আমেরিকা</territory>
-			<territory type="029">ক�যারাবিয়ান</territory>
-			<territory type="030">পূর�ব �শিয়া</territory>
-			<territory type="034">দক�ষিণাঞ�চলীয় �শিয়া</territory>
-			<territory type="035">দক�ষিন পূর�ব �শিয়া</territory>
-			<territory type="039">দক�ষিণাঞ�চলীয় ইউরোপ</territory>
-			<territory type="053">অস�ট�রেলিয়া �বং নিউজিল�যান�ড</territory>
-			<territory type="054">ম�যালেনেশিয়া</territory>
-			<territory type="057">ম�যালেনিশা অঞ�চল</territory>
-			<territory type="061">পলিনেশিয়া</territory>
-			<territory type="062">দক�ষিন মধ�য �শিয়া</territory>
-			<territory type="142">�শিয়া</territory>
-			<territory type="143">মধ�য �শিয়া</territory>
-			<territory type="145">পশ�চিমাঞ�চলীয় �শিয়া</territory>
-			<territory type="150">ইউরোপ</territory>
-			<territory type="151">পূর�ব ইউরোপ</territory>
-			<territory type="154">উত�তরাঞ�চলীয় ইউরোপ</territory>
-			<territory type="155">পশ�চিমাঞ�চলীয় ইউরোপ</territory>
-			<territory type="172">স�বাধীন রাষ�ট�রের কমনওয়েলথ</territory>
-			<territory type="200">চেকোস�লোভাকিয়া</territory>
-			<territory type="419">ল�যাটিন আমেরিকা �বং ক�যারাবিয়ান</territory>
-			<territory type="830">চ�যানেল দ�বীপপ�ঞ�জ</territory>
-			<territory type="AD">��যান�ডোরা</territory>
-			<territory type="AE">সংয�ক�ত আরব আমিরাত</territory>
-			<territory type="AF">আফগানিস�তান</territory>
-			<territory type="AG">�ন�টিগ�য়া ও বারব�ডা</territory>
-			<territory type="AI">��যাঙ�গ�ইলা</territory>
-			<territory type="AL">আলব�যানিয়া</territory>
-			<territory type="AM">আর�মেনিয়া</territory>
-			<territory type="AN">নেদারল�যান�ডস ��যান�টিলিস</territory>
-			<territory type="AO">��যাঙ�গোলা</territory>
-			<territory type="AQ">�ন�টার�কটিকা</territory>
-			<territory type="AR">আর�জেণ�টাইনা</territory>
-			<territory type="AS">আমেরিকান সামোয়া</territory>
-			<territory type="AT">অস�ট�রিয়া</territory>
-			<territory type="AU">অস�ট�রেলিয়া</territory>
-			<territory type="AW">আর�বা</territory>
-			<territory type="AX">আলান�ড দ�বীপপ�ঞ�জ</territory>
-			<territory type="AZ">আজারবাইজান</territory>
-			<territory type="BA">বসনিয়া ও হার�জেগোভিনা</territory>
-			<territory type="BB">বারবাদোস</territory>
-			<territory type="BD">বাংলাদেশ</territory>
-			<territory type="BE">বেলজিয়াম</territory>
-			<territory type="BF">ব�রকিনা ফাসো</territory>
-			<territory type="BG">ব�লগেরিয়া</territory>
-			<territory type="BH">বাহরাইন</territory>
-			<territory type="BI">ব�র�ন�ডি</territory>
-			<territory type="BJ">বেনিন</territory>
-			<territory type="BL">সেন�ট বারথেলিমি</territory>
-			<territory type="BM">বারম�ডা</territory>
-			<territory type="BN">ব�র�নেই</territory>
-			<territory type="BO">বোলিভিয়া</territory>
-			<territory type="BR">ব�রাজিল</territory>
-			<territory type="BS">বাহামা দ�বীপপ�ঞ�জ</territory>
-			<territory type="BT">ভ�টান</territory>
-			<territory type="BV">বোভেট দ�বীপ</territory>
-			<territory type="BW">বতসোয়ানা</territory>
-			<territory type="BY">বেলোর�শিয়া</territory>
-			<territory type="BZ">বেলিয</territory>
-			<territory type="CA">কানাডা</territory>
-			<territory type="CC">কোকোস দ�বীপপ�ঞ�জ</territory>
-			<territory type="CD">কঙ�গো - কিনসাসা</territory>
-			<territory type="CF">মধ�য আফ�রিকান প�রজাতন�ত�র</territory>
-			<territory type="CG">কঙ�গো</territory>
-			<territory type="CH">স�ইজর�লণ�ড</territory>
-			<territory type="CI">আইভরি কোস�ট</territory>
-			<territory type="CK">ক�ক দ�বীপপ�ঞ�জ</territory>
-			<territory type="CL">চিলি</territory>
-			<territory type="CM">ক�যামের�ন</territory>
-			<territory type="CN">চীন</territory>
-			<territory type="CO">কোলোম�বিয়া</territory>
-			<territory type="CR">কোস�টারিকা</territory>
-			<territory type="CS">সারবিয়ান �বং মন�টেনিগ�রো</territory>
-			<territory type="CU">কিউবা</territory>
-			<territory type="CV">কেপভার�দে</territory>
-			<territory type="CX">ক�রিসমাস দ�বীপ</territory>
-			<territory type="CY">সাইপ�রাস</territory>
-			<territory type="CZ">চেক প�রজাতন�ত�র</territory>
-			<territory type="DE">জার�মানি</territory>
-			<territory type="DJ">জিব�তি</territory>
-			<territory type="DK">ডেনমার�ক</territory>
-			<territory type="DM">ডোমিনিকা</territory>
-			<territory type="DO">ডোমেনিকান প�রজাতন�ত�র</territory>
-			<territory type="DZ">�লজিরিয়া</territory>
-			<territory type="EC">ইক�য়েডর</territory>
-			<territory type="EE">�স�তোনিয়া</territory>
-			<territory type="EG">মিশর</territory>
-			<territory type="EH">পশ�চিমী সাহারা</territory>
-			<territory type="ER">ইরিত�রিয়া</territory>
-			<territory type="ES">স�পেন</territory>
-			<territory type="ET">ইফিওপিয়া</territory>
-			<territory type="FI">ফিন�ল�যাণ�ড</territory>
-			<territory type="FJ">ফিজি</territory>
-			<territory type="FK">ফকল�যান�ড দ�বীপপ�ঞ�জ</territory>
-			<territory type="FM">মাইক�রোনেশিয়া</territory>
-			<territory type="FO">ফ�যারও দ�বীপপ�ঞ�জ</territory>
-			<territory type="FR">ফ�রান�স</territory>
-			<territory type="GA">গ�যাবন</territory>
-			<territory type="GB">গ�রেটবৃটেন</territory>
-			<territory type="GD">গ�রেনাডা</territory>
-			<territory type="GE">জর�জিয়া</territory>
-			<territory type="GF">ফরাসী গায়ানা</territory>
-			<territory type="GG">গ�রাঞ�জি</territory>
-			<territory type="GH">ঘানা</territory>
-			<territory type="GI">জিব�রাল�টার</territory>
-			<territory type="GL">গ�রীনল�যান�ড</territory>
-			<territory type="GM">গাম�বিয়া</territory>
-			<territory type="GN">গিনি</territory>
-			<territory type="GP">গ�য়াদেলৌপ</territory>
-			<territory type="GQ">নিরক�ষীয় গিনি</territory>
-			<territory type="GR">গ�রীস�</territory>
-			<territory type="GS">দক�ষিণ জর�জিয়া ও দক�ষিণ স�যান�ডউইচ দ�বীপপ�ঞ</territory>
-			<territory type="GT">গোয়াটিমালা</territory>
-			<territory type="GU">গ�য়াম</territory>
-			<territory type="GW">গিনি-বিসাউ</territory>
-			<territory type="GY">গিয়ানা</territory>
-			<territory type="HK">হংকং �স�আর চীনা</territory>
-			<territory type="HM">হার�ড দ�বীপ �বং ম�যাকডোনাল�ড দ�বীপপ�ঞ�জ</territory>
-			<territory type="HN">হণ�ড�রাস</territory>
-			<territory type="HR">ক�রোয়েশিয়া</territory>
-			<territory type="HT">হাইতি</territory>
-			<territory type="HU">হাঙ�গেরি</territory>
-			<territory type="ID">ইন�দোনেশিয়া</territory>
-			<territory type="IE">আয়ার�লণ�ড</territory>
-			<territory type="IL">ইস�রায়েল</territory>
-			<territory type="IM">ম�যানদ�বীপ</territory>
-			<territory type="IN">ভারত</territory>
-			<territory type="IO">ব�রিটিশ ভারত মহাসাগরীয় অঞ�চল</territory>
-			<territory type="IQ">ইরাক</territory>
-			<territory type="IR">ইরান</territory>
-			<territory type="IS">আইসলণ�ড</territory>
-			<territory type="IT">ইতালী</territory>
-			<territory type="JE">জার�সি</territory>
-			<territory type="JM">জ�যামেকা</territory>
-			<territory type="JO">জর�ডন</territory>
-			<territory type="JP">জাপান</territory>
-			<territory type="KE">কেনিয়া</territory>
-			<territory type="KG">কির�গিজিয়া</territory>
-			<territory type="KH">কাম�বোজ</territory>
-			<territory type="KI">কিরিবাতি</territory>
-			<territory type="KM">কমোরোস</territory>
-			<territory type="KN">সেন�ট কিটস ও নেভিস</territory>
-			<territory type="KP">উত�তর কোরিয়া</territory>
-			<territory type="KR">দক�ষিণ কোরিয়া</territory>
-			<territory type="KW">ক�য়েত</territory>
-			<territory type="KY">কেম�যান দ�বীপপ�ঞ�জ</territory>
-			<territory type="KZ">কাজাকস�থান</territory>
-			<territory type="LA">লাওস</territory>
-			<territory type="LB">লেবানন</territory>
-			<territory type="LC">সেন�ট ল�সিয়া</territory>
-			<territory type="LI">লিচেনস�টেইন</territory>
-			<territory type="LK">শ�রীলঙ�কা</territory>
-			<territory type="LR">লাইবেরিয়া</territory>
-			<territory type="LS">লেসোথো</territory>
-			<territory type="LT">লিত�ভা</territory>
-			<territory type="LU">লাক�সেমবার�গ</territory>
-			<territory type="LV">লাত�ভিয়া</territory>
-			<territory type="LY">লিবিয়া</territory>
-			<territory type="MA">মোরক�কো</territory>
-			<territory type="MC">মোনাকো</territory>
-			<territory type="MD">মোল�দাভিয়া</territory>
-			<territory type="ME">মন�টিনিগ�রো</territory>
-			<territory type="MF">সেন�ট মার�টিন</territory>
-			<territory type="MG">মাদাগাস�কার</territory>
-			<territory type="MH">মার�শাল দ�বীপপ�ঞ�জ</territory>
-			<territory type="MK">ম�যাসাডোনিয়া</territory>
-			<territory type="ML">মালি</territory>
-			<territory type="MM">মায়ানমার</territory>
-			<territory type="MN">মঙ�গোলিয়া</territory>
-			<territory type="MO">ম�যাকাও �স�আর চীনা</territory>
-			<territory type="MP">উত�তরাঞ�চলীয় মারিয়ানা দ�বীপপ�ঞ�জ</territory>
-			<territory type="MQ">মার�টিনিক</territory>
-			<territory type="MR">মরিতানিয়া</territory>
-			<territory type="MS">মন�টসেরাট</territory>
-			<territory type="MT">মাল�টা</territory>
-			<territory type="MU">মরিশাস</territory>
-			<territory type="MV">মালদ�বীপ</territory>
-			<territory type="MW">মালাউই</territory>
-			<territory type="MX">মক�সিকো</territory>
-			<territory type="MY">মাল�যাশিয়া</territory>
-			<territory type="MZ">মোজাম�বিক</territory>
-			<territory type="NA">নামিবিয়া</territory>
-			<territory type="NC">নিউ ক�যালেডোনিয়া</territory>
-			<territory type="NE">নাইজার</territory>
-			<territory type="NF">নিরফোক দ�বীপ</territory>
-			<territory type="NG">নাইজেরিয়া</territory>
-			<territory type="NI">নিকারাগ�য়া</territory>
-			<territory type="NL">হলণ�ড</territory>
-			<territory type="NO">নরওয়ে</territory>
-			<territory type="NP">নেপাল</territory>
-			<territory type="NR">নাউর�</territory>
-			<territory type="NU">নিউয়ে</territory>
-			<territory type="NZ">নিউ জিলণ�ড</territory>
-			<territory type="OM">ওমান</territory>
-			<territory type="PA">পানামা</territory>
-			<territory type="PE">পির�</territory>
-			<territory type="PF">ফরাসী পলিনেশিয়া</territory>
-			<territory type="PG">পাপ�য়া নিউ গিনি</territory>
-			<territory type="PH">ফিলিপাইন</territory>
-			<territory type="PK">পাকিস�তান</territory>
-			<territory type="PL">পোল�যাণ�ড</territory>
-			<territory type="PM">সেন�ট পিয়ের ও মিক�য়েলন</territory>
-			<territory type="PN">পিটকেয়ার�ন</territory>
-			<territory type="PR">প�য়ের�টোরিকো</territory>
-			<territory type="PS">ফিলিস�তিন অঞ�চল</territory>
-			<territory type="PT">পর�ত�গাল</territory>
-			<territory type="PW">পালাউ</territory>
-			<territory type="PY">প�যারাগোয়ে</territory>
-			<territory type="QA">কাতার</territory>
-			<territory type="QO">আউটলাইনিং ওসানিয়া</territory>
-			<territory type="QU">ইউরোপীয় ইউনিয়ন</territory>
-			<territory type="RE">রিইউনিয়ন</territory>
-			<territory type="RO">র�মানিয়া</territory>
-			<territory type="RS">সারবিয়া</territory>
-			<territory type="RU">রাশিয়া</territory>
-			<territory type="RW">র�য়ান�ডা</territory>
-			<territory type="SA">সাউদি আরব</territory>
-			<territory type="SB">সলোমন দ�বীপপ�ঞ�জ</territory>
-			<territory type="SC">সিসিলি</territory>
-			<territory type="SD">স�দান</territory>
-			<territory type="SE">স�ইডেন</territory>
-			<territory type="SG">সিঙ�গাপ�র</territory>
-			<territory type="SH">সেন�ট হেলেনা</territory>
-			<territory type="SI">স�লোভানিয়া</territory>
-			<territory type="SJ">স�বালবার�ড ও জান মেয়েন</territory>
-			<territory type="SK">শ�লোভাকিয়া</territory>
-			<territory type="SL">সিয়েরালিওন</territory>
-			<territory type="SM">সান মারিনো</territory>
-			<territory type="SN">সেনেগাল</territory>
-			<territory type="SO">সোমালি</territory>
-			<territory type="SR">স�রিনাম</territory>
-			<territory type="ST">সাওটোমা ও প�রিন�সিপি</territory>
-			<territory type="SV">�ল সালভেদর</territory>
-			<territory type="SY">সিরিয়া</territory>
-			<territory type="SZ">সোয়াজিল�যান�ড</territory>
-			<territory type="TC">ত�র�কস ও কাইকোস দ�বীপপ�ঞ�জ</territory>
-			<territory type="TD">চাদ</territory>
-			<territory type="TF">ফরাসী দক�ষিণাঞ�চল</territory>
-			<territory type="TG">টোগো</territory>
-			<territory type="TH">থাই</territory>
-			<territory type="TJ">তাজিকস�থান</territory>
-			<territory type="TK">টোকেলাউ</territory>
-			<territory type="TL">পূর�ব-তিম�র</territory>
-			<territory type="TM">ত�র�কমেনিয়া</territory>
-			<territory type="TN">টিউনিস�</territory>
-			<territory type="TO">টোঙ�গা</territory>
-			<territory type="TR">ত�রস�ক</territory>
-			<territory type="TT">ত�রিনিনাদ ও টোব�যাগো</territory>
-			<territory type="TV">ট�ভাল�</territory>
-			<territory type="TW">তাইওয়ান</territory>
-			<territory type="TZ">তাঞ�জানিয়া</territory>
-			<territory type="UA">ইউক�রেইন</territory>
-			<territory type="UG">উগান�ডা</territory>
-			<territory type="UM">য�ক�তরাষ�ট�রের ক�ষ�দ�র ও পার�শ�ববর�তী দ�বীপপ�ঞ�জ</territory>
-			<territory type="US">মার�কিন য�ক�তরাষ�ট�র</territory>
-			<territory type="UY">উর�গোয়ে</territory>
-			<territory type="UZ">উজ�বেকিস�থান</territory>
-			<territory type="VA">ভ�যাটিকান সিটি</territory>
-			<territory type="VC">সেন�ট ভিনসেন�ট ও দ�যা গ�রেনাডিনস</territory>
-			<territory type="VE">ভেনেজ�য়েলা</territory>
-			<territory type="VG">ব�রিটিশ ভার�জিন দ�বীপপ�ঞ�জ</territory>
-			<territory type="VI">মার�কিন ভার�জিন দ�বীপপ�ঞ�জ</territory>
-			<territory type="VN">ভিয়েতনাম</territory>
-			<territory type="VU">ভান�য়াট�</territory>
-			<territory type="WF">ওয়ালিস ও ফ�ট�না</territory>
-			<territory type="WS">সামোয়া</territory>
-			<territory type="YE">ইমেন</territory>
-			<territory type="YT">মায়োত�তে</territory>
-			<territory type="ZA">দক�ষিণ আফ�রিকা</territory>
-			<territory type="ZM">জাম�বিয়া</territory>
-			<territory type="ZW">জিম�বাব�য়ে</territory>
-			<territory type="ZZ">অজানা অথবা ভ�ল স�থান</territory>
-		</territories>
-		<keys>
-			<key type="calendar">ক�যালেন�ডার</key>
-			<key type="collation">সজ�জাক�রম</key>
-			<key type="currency">ম�দ�রা</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">প�রথাগত চীনা সজ�জাক�রম - বিগ৫</type>
-			<type type="buddhist" key="calendar">বৌদ�ধ বর�ষপঞ�জী</type>
-			<type type="chinese" key="calendar">চীনা বর�ষপঞ�জী</type>
-			<type type="direct" key="collation">প�রত�যক�ষ সজ�জাক�রম</type>
-			<type type="gb2312han" key="collation">সাধারণ চীনা সজ�জাক�রম - জিবি২৩১২</type>
-			<type type="gregorian" key="calendar">গ�রিগোরিয়ান বর�ষপঞ�জী</type>
-			<type type="hebrew" key="calendar">হিব�র� বর�ষপঞ�জী</type>
-			<type type="indian" key="calendar">ভারতীয় জাতীয় বর�ষপঞ�জী</type>
-			<type type="islamic" key="calendar">ইসলামিক বর�ষপঞ�জী</type>
-			<type type="islamic-civil" key="calendar">ইসলামিক-সিভিল বর�ষপঞ�জী</type>
-			<type type="japanese" key="calendar">জাপানি বর�ষপঞ�জী</type>
-			<type type="phonebook" key="collation">ফোনব�ক সজ�জাক�রম</type>
-			<type type="pinyin" key="collation">পিনিন সজ�জাক�রম</type>
-			<type type="roc" key="calendar">গণপ�রজাতন�ত�রী চীনা বর�ষপঞ�জী</type>
-			<type type="stroke" key="collation">আবর�তিত সজ�জাক�রম</type>
-			<type type="traditional" key="collation">প�রথাগত সজ�জাক�রম</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">মেট�রিক</measurementSystemName>
-			<measurementSystemName type="US">মার�কিন</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">ভাষা: {0}</codePattern>
-			<codePattern type="script">লিপি: {0}</codePattern>
-			<codePattern type="territory">অঞ�চল: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[় �-ঃ ৺ অ-ঋ ৠ ঌ ৡ � � ও-ড {ড়} ঢ {ঢ়} ণ ত ৎ থ-ন প-য {য়} র ল শ-হ ঽ-ৄ ৢ ৣ ে ৈ ো-� ৗ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D ৸ ৹ ৲-৷ a d e E h l L m M q Q s v y ৰ ৱ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[৳]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">জান�য়ারী</month>
-							<month type="2">ফেব�র�য়ারী</month>
-							<month type="3">মার�চ</month>
-							<month type="4">�প�রিল</month>
-							<month type="5">মে</month>
-							<month type="6">জ�ন</month>
-							<month type="7">জ�লাই</month>
-							<month type="8">আগস�ট</month>
-							<month type="9">সেপ�টেম�বর</month>
-							<month type="10">অক�টোবর</month>
-							<month type="11">নভেম�বর</month>
-							<month type="12">ডিসেম�বর</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">জান�য়ারী</month>
-							<month type="2">ফেব�র�য়ারী</month>
-							<month type="3">মার�চ</month>
-							<month type="4">�প�রিল</month>
-							<month type="5">মে</month>
-							<month type="6">জ�ন</month>
-							<month type="7">জ�লাই</month>
-							<month type="8">আগস�ট</month>
-							<month type="9">সেপ�টেম�বর</month>
-							<month type="10">অক�টোবর</month>
-							<month type="11">নভেম�বর</month>
-							<month type="12">ডিসেম�বর</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">জা</month>
-							<month type="2">ফে</month>
-							<month type="3">মা</month>
-							<month type="4">�</month>
-							<month type="5">মে</month>
-							<month type="6">জ�ন</month>
-							<month type="7">জ�</month>
-							<month type="8">আ</month>
-							<month type="9">সে</month>
-							<month type="10">অ</month>
-							<month type="11">ন</month>
-							<month type="12">ডি</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">রবি</day>
-							<day type="mon">সোম</day>
-							<day type="tue">মঙ�গল</day>
-							<day type="wed">ব�ধ</day>
-							<day type="thu">বৃহস�পতি</day>
-							<day type="fri">শ�ক�র</day>
-							<day type="sat">শনি</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">রবিবার</day>
-							<day type="mon">সোমবার</day>
-							<day type="tue">মঙ�গলবার</day>
-							<day type="wed">ব�ধবার</day>
-							<day type="thu">বৃহষ�পতিবার</day>
-							<day type="fri">শ�ক�রবার</day>
-							<day type="sat">শনিবার</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">র</day>
-							<day type="mon">সো</day>
-							<day type="tue">ম</day>
-							<day type="wed">ব�</day>
-							<day type="thu">বৃ</day>
-							<day type="fri">শ�</day>
-							<day type="sat">শ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">চত�র�থাংশ ১</quarter>
-							<quarter type="2">চত�র�থাংশ ২</quarter>
-							<quarter type="3">চত�র�থাংশ ৩</quarter>
-							<quarter type="4">চত�র�থাংশ ৪</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">প�রথম চত�র�থাংশ</quarter>
-							<quarter type="2">দ�বিতীয় চত�র�থাংশ</quarter>
-							<quarter type="3">তৃতীয় চত�র�থাংশ</quarter>
-							<quarter type="4">চত�র�থ চত�র�থাংশ</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">১</quarter>
-							<quarter type="2">২</quarter>
-							<quarter type="3">৩</quarter>
-							<quarter type="4">৪</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>পূর�বাহ�ণ</am>
-				<pm>অপরাহ�ণ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">খৃষ�টপূর�ব</era>
-						<era type="1">খৃষ�টাব�দ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M - d/M</greatestDifference>
-							<greatestDifference id="M">d/M - d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E,  d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy – d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/yy – E, d/M/yy</greatestDifference>
-							<greatestDifference id="M">E, d/M/yy – E, d/M/yy</greatestDifference>
-							<greatestDifference id="y">E, d/M/yy – E, d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM, y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
-							<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM, y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y – E, d MMM, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM -yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>য�গ</displayName>
-					</field>
-					<field type="year">
-						<displayName>বছর</displayName>
-					</field>
-					<field type="month">
-						<displayName>মাস</displayName>
-					</field>
-					<field type="week">
-						<displayName>সপ�তাহ</displayName>
-					</field>
-					<field type="day">
-						<displayName>দিন</displayName>
-						<relative type="-3">গত তরশ�</relative>
-						<relative type="-2">গত পরশ�</relative>
-						<relative type="-1">গতকাল</relative>
-						<relative type="0">আজ</relative>
-						<relative type="1">আগামীকাল</relative>
-						<relative type="2">আগামী পরশ�</relative>
-						<relative type="3">আগামী তরশ�</relative>
-					</field>
-					<field type="weekday">
-						<displayName>সপ�তাহের দিন</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>পূর�বাহ�ণ/অপরাহ�ণ</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ঘন�টা</displayName>
-					</field>
-					<field type="minute">
-						<displayName>মিনিট</displayName>
-					</field>
-					<field type="second">
-						<displayName>সেকেন�ড</displayName>
-					</field>
-					<field type="zone">
-						<displayName>�লাকা</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">চৈত�র</month>
-							<month type="2">বৈশাখ</month>
-							<month type="3">জৈষ�ঠ�য</month>
-							<month type="4">আষাঢ়</month>
-							<month type="5">শ�রাবণ</month>
-							<month type="6">ভাদ�র</month>
-							<month type="7">আশ�বিন</month>
-							<month type="8">কার�তিক</month>
-							<month type="9">অগ�রহায়ণ</month>
-							<month type="10">পৌষ</month>
-							<month type="11">মাঘ</month>
-							<month type="12">ফাল�গ�ন</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">চৈত�র</month>
-							<month type="2">বৈশাখ</month>
-							<month type="3">জৈষ�ঠ�য</month>
-							<month type="4">আষাঢ়</month>
-							<month type="5">শ�রাবণ</month>
-							<month type="6">ভাদ�র</month>
-							<month type="7">আশ�বিন</month>
-							<month type="8">কার�তিক</month>
-							<month type="9">অগ�রহায়ণ</month>
-							<month type="10">পৌষ</month>
-							<month type="11">মাঘ</month>
-							<month type="12">ফাল�গ�ন</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">১</month>
-							<month type="2">২</month>
-							<month type="3">৩</month>
-							<month type="4">৪</month>
-							<month type="5">৫</month>
-							<month type="6">৬</month>
-							<month type="7">৭</month>
-							<month type="8">৮</month>
-							<month type="9">৯</month>
-							<month type="10">১০</month>
-							<month type="11">১১</month>
-							<month type="12">১২</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>পূর�বাহ�ন</am>
-				<pm>অপরাহ�ন</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">সাল</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">মহরম</month>
-							<month type="2">সফর</month>
-							<month type="3">রবিউল আউয়াল</month>
-							<month type="4">রবিউস সানি</month>
-							<month type="5">জমাদিউল আউয়াল</month>
-							<month type="6">জমাদিউস সানি</month>
-							<month type="7">রজব</month>
-							<month type="8">শা'বান</month>
-							<month type="9">রমজান</month>
-							<month type="10">শাওয়াল</month>
-							<month type="11">জ�বিলকদ</month>
-							<month type="12">জ�বিলহজ�জ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">মহররম</month>
-							<month type="2">সফর</month>
-							<month type="3">রবিউল আউয়াল</month>
-							<month type="4">রবিউস সানি</month>
-							<month type="5">জমাদিউল আউয়াল</month>
-							<month type="6">জমাদিউস সানি</month>
-							<month type="7">রজব</month>
-							<month type="8">শা'বান</month>
-							<month type="9">রমজান</month>
-							<month type="10">শাওয়াল</month>
-							<month type="11">জ�বিলকদ</month>
-							<month type="12">জ�বিলহজ�জ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">১</month>
-							<month type="2">২</month>
-							<month type="3">৩</month>
-							<month type="4">৪</month>
-							<month type="5">৫</month>
-							<month type="6">৬</month>
-							<month type="7">৭</month>
-							<month type="8">৮</month>
-							<month type="9">৯</month>
-							<month type="10">১০</month>
-							<month type="11">১১</month>
-							<month type="12">১২</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>পূর�বাহ�ন</am>
-				<pm>অপরাহ�ন</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">য�গ</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>গ�রীনিচ মান সময় {0}</gmtFormat>
-			<gmtZeroFormat>গ�রীনিচ মান সময়</gmtZeroFormat>
-			<regionFormat>{0} সময়</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>অজানা</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>রথেরা</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>পামার</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>দক�ষিণ মের�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>সিওয়া</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>মসোন</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>ডেভিস</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ভস�টোক</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>কেইসি</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>ড�মন�ট ডি’উরভিল</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>ম�যাকম�র�ডো</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>রিও গায়েগোস</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>মেন�ডোজা</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>সান হ�য়ান</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>উশ�য়াইয়া</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>লা রিওহা</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>সান ল�ইস</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>ক�যাটামার�কা</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>হ�হ�ই</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>ট�ক�মান</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>কর�ডোবা</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ব�য়েনোস আয়েরেস</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>পার�থ</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>ইউক�লা</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>ডারউইন</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>��যাডেলেইড</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ব�রোকেন হিল</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>কিউরি</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>মেলবার�ন</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>হোবার�ট</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>লিনডেম�যান</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>সিডনি</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ব�রিসবেন</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>লর�ড হাও</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>আইর�নেপে</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>রিও ব�রাঙ�কো</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>পোর�তো ভেল�‌হো</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>বোয়া ভিস�তা</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>মানাউস</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>ক�ইয়াবা</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>কাম�পো গ�রান�ডে</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>বেলেম</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>আরাগ�য়াইনা</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>সাও পাউলো</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>বাহিয়া</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>ফোর�টালেজা</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>মাসেয়ো</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>রে‡সিফে</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>নরোন�‌হা</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>ডসোন</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>হো�য়াইট হর�স</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>ইন�ভ�যাক</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>ভ�যাঙ�ক�ভার</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>ডসোন ক�রিক</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>ইয়েলোনাইফ</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>�ডমন�টোন</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>স�ইফ�ট কারেন�ট</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>কেমব�রিজ বে</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>রেজিনা</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>উইনিপেগ</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>রেসোল�ট</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>রেইনি রিভার</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>র‌�যাঙ�কিন ইনলেট</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>কোরাল হার�বার</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>থান�ডার বে</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>নিপিগোন</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>টোরন�টো</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>মন�ট�রিয়াল</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>ইক�য়াল�ইট</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>প�যাঙ�গনির�ট�ং</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>মঙ�কটোন</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>হ�যালিফ�যাক�স</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>গ�স বে</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>গ�লাস বে</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ব�লাঙ�ক-সাব�লোন</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>সেন�ট জন�স</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>কিনশাসা</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ল�ব�ম�বাশি</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ইস�টার</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>ক�যাশগার</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>উর�মকি</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>চোঙকিং</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>হার�বিন</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>গ�যালাপ�যাগোস</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>কানেরি</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>সেউটা</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ট�র�ক</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>পোনাপে</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>কোসরায়</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>থ�লি</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>স�কোর�সবায়স�ন�ড</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>ডানমার�কশ�যাভন</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>জাকার�তা</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>পন�টিয়ান�যাক</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>মাকাসসার</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>জয়াপ�রা</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�ন�ডারবারি</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>কিরিতিমাতি</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>টারাওয়া</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>আকটাউ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ওরাল</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>আকটোবে</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>কিজিলর�ডা</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>আলমাটি</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>কোয়াজালেইন</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>মাজ�রো</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>হোভ�ড</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>উলানবাতার</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>চোইবাল�‌স�যান</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>তিয়াওয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>হারমোসিল�লো</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>মাজাটলান</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>চিহ�য়াহ�য়া</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>মন�টেরি</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>মেক�সিকো সিটি</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>মেরিডা</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>ক�যানক�ন</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>ক�চিং</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>চ�যাঠাম</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>মার�কেসাস</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>গাম�বিয়ের</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>আজোরেস</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>মাডেইরা</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>কালিনিঙগ�রাড</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>মস�কো</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>ভোল�গোগ�রাদ</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>সামারা</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>ইয়েকাটেরিনবার�গ</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>ওম�স�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>নভোসিবির�স�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>ক�রাসনোইয়ার�স�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ইর�ক�ট�স�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ইয়াক�ট�স�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ভ�লাদিভস�তোক</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>সাখালিন</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>ম�যাগাডান</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>কামচাটকা</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>অ�যানাডির</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>উ�গোরোড</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>কিয়েভ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>সিমফেরোপোল</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>জাপোরো�া</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>মিডওয়ে</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>জনস�টন</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>ওয়েক</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>আডাক</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>নোম</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>হনোল�ল�</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�নকোরেজ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ইয়াক�টাট</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>জ�নো</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>লস ��যাঞ�জেলেস</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>বয়জি</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ফিনিক�স</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>শিপ�রক</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>ডেনভার</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>নিউ সালেম, উত�তর ডাকোটা</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>মধ�য, উত�তর ডাকোটা</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>শিকাগো</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>মেনোমিনি</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>ভিনসেন�নেস, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>পিটারর�সবার�গ, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>টেলসিটি, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>নক�স, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>উইনাম�যাক, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>মারেঙ�গো, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>ইন�ডিয়ানাপোলিস</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ল�ইসভিল</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>ভেভেয়, ইন�ডিয়ানা</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>মন�টিচেলো, কেন�টাকি</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>ডেট�রোইট</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>নিউইয়র�ক</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>সমরখন�দ</exemplarCity>
-			</zone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>বাংলাদেশ সময়</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>beng</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##,##0.00¤;(#,##,##0.00¤)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>��যান�ডোরান পেসেতা</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>সংয�ক�ত আরব আমিরাত দিরহাম</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>আফগানি (১৯২৭-২০০২)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>আফগানি</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>আলবেনিয়ান লেক</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>আরমেনিয়ান দ�রাম</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>নেদারল�যান�ড ��যান�টিলিয়ান গ�ল�ডের</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>��যাঙ�গোলান কওয়ানজা</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>��যাঙ�গোলান কওয়ানজা (১৯৭৭-১৯৯০)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>��যাঙ�গোলান নত�ন কওয়ানজা (১৯৯৫-২০০০)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>��যাঙ�গোলান কওয়ানজা (১৯৯৫-১৯৯৯)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>আর�জেন�টিনা অস�ট�রাল</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>আর�জেন�টিনা পেসো (১৯৮৩-১৯৮৫)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>আর�জেন�টিনা পেসো</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>অস�ট�রিয়ান শিলিং</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>অস�ট�রেলিয়ান ডলার</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>আর�বা গিল�ডার</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>আজারবাইজান মানাত (১৯৯৩-২০০৬)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>আজারবাইজান মানাত</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>বসনিয়া �বং হার�জেগোভিনা দিনার</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>বসনিয়া �বং হার�জেগোভিনা মার�ক</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>বার�বেডোজ ডলার</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>বাংলাদেশী টাকা</displayName>
-				<symbol>৳</symbol>
-			</currency>
-			<currency type="BEC">
-				<displayName>বেলজিয়ান ফ�রাঙ�ক (রূপান�তরযোগ�য)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>বেলজিয়ান ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>বেলজিয়ান ফ�রাঙ�ক (আর�থিক)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>ব�লগেরীয় হার�ড লেভ</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>ব�লগেরীয় নিউ লেভ</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>বাহরাইনি দিনার</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ব�র�ন�ডি ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>বারমিউডান ডলার</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ব�র�নেই ডলার</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>বলিভিয়ানো</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>বলিভিয়ান পেসো</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>বলিভিয়ান মভডোল</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>ব�রাজিলিয়ান ক�র�জেয়রোনোভো (১৯৬৭-১৯৮৬)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>ব�রাজিলিয়ান ক�র�জেইডাউ</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>ব�রাজিলিয়ান ক�র�জেয়রো (১৯৯০-১৯৯৩)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ব�রাজিলিয়ান রিয়েল</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>ব�রাজিলিয়ান ক�র�জেইডো নোভো</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>ব�রাজিলিয়ান ক�র�জেয়রো</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>বাহামিয়ান ডলার</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ভ�টানি �নগ�ল�ট�র�ম</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>বর�মি কিয়াৎ</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>বতসোয়ানা প�লা</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>বেলার�শিয়ান নিউ র�বেল (১৯৯৪-১৯৯৯)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>বেলার�শিয়ান র�বেল</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>বেলিজ ডলার</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>কম�বোডিয়ান ডলার</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>কঙ�গো ফ�র�যাঙ�ক কঙ�গোলাইস</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>স�ইজারল�যান�ড ইউরো</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>স�ইস ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>স�ইজারল�যান�ড ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>চিলিয়ান উনিদাদেস দি ফোমেন�তো</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>চিলি পেসো</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>চীনা য়�য়ান রেন�মিন�‌বি</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>কলোম�বিয়ান পেসো</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>উনিদাদ দি ভ�যালোর রিয়েল</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>কোস�টা রিকা কোলোন</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>প�রাচীন সারবিয়ান দিনার</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>চেকোস�লোভাক হার�ড কোর�না</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>কিউবান পেসো</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>কেপ ভার�দে �সক�ডো</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>সাইপ�রাস পাউন�ড</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>চেকোস�লোভাক কোর�না</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>পূর�ব জার�মান মার�ক</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>ডয়চ� মার�ক</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>জিব�তি ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>ড�যানিশ ক�রৌন</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>ডোমিনিকান পেসো</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>আলজেরীয় দিনার</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ইক�য়াডোর স�ক�রে</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ইক�য়াডোর উনিদাদেস দি ভেলর কনসতান�তে (ইউভিসি)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>�স�তোনিয়া ক�র�নি</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>মিশরীয় পাউন�ড</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�রিট�রিয়েন নাকফা</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>স�প�যানিশ পেসেতা (�কই হিসাব)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>স�প�যানিশ পেসেতা (রূপান�তরযোগ�য হিসাব)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>স�প�যানিশ পেসেতা</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>ইথিওপিয়ান বির</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ইউরো</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>ফিনিস মার�কা</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>ফিজি ডলার</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>ফকল�যান�ড দ�বীপপ�ঞ�জ পাউন�ড</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>ফরাসি ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ব�রিটিশ পাউন�ড স�টার�লিং</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>জর�জিয়ান ক�পন লারিট</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>জর�জিয়ান লারি</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ঘানা সেডি (১৯৭৯-২০০৭)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>ঘানা সেডি</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>জিব�রাল�টার পাউন�ড</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>গাম�বিয়া ডালাসি</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>গিনি ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>গিনি সাইলি</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ইক�য়েটোরিয়াল গিনি ইক�য়িলি</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>গ�রীক দ�রাচমা</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>গ�য়াতেমালা ক�য়েৎজাল</displayName>
-				<displayName count="other">গ�য়াতেমালা ক�য়েৎজাল</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>পর�ত�গিজ গিনি �সক�ডো</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>গিনি বিসাউ পেসো</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>গাইয়েনা ডলার</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>হংকং ডলার</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>হন�ড�রাস লেম�পিরা</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>ক�রোয়েশিয়ান দিনার</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>ক�রোয়েশিয়ান ক�না</displayName>
-				<displayName count="other">ক�রোয়েশিয়ান ক�নাস</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>হাইতি গৌর�দে</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>হাঙ�গেরিয়ান ফোরিন�ট</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>ইন�দোনেশিয়ান র�পিয়াহ</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>ইরিশ পাউন�ড</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>ইস�রাইলি পাউন�ড</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>ইস�রাইলি নত�ন শেকেল</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>ভারতীয় র�পি</displayName>
-				<symbol>টাকা</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>ইরাকি দিনার</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>ইরানিয়ান রিয়াল</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>আইসল�যান�ড ক�রৌন</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>ইতালীয় লিরা</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>জ�যামাইকান ডলার</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>জর�ডানিয়ান দিনার</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>জাপানিজ ইয়েন</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>কেনিয়ান শিলিং</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>কিরগিজস�তান সোম</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>কম�বোডিয়ান রিয়েল</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>কম�বোরো ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>নাইজেরিয়ান পাউন�ড</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>দক�ষিণ কোরিয়ান ওন</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>ক�য়েতি দিনার</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>কেম�যান দ�বীপপ�ঞ�জের ডলার</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>কাজাক�সটান টেঙ�গে</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>লেউশান কিপ</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>লেবানিজ পাউন�ড</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>শ�রীলঙ�কান র�পি</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>লাইবেরিয়ান ডলার</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>লেস�ট� লোটি</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>লিথ�ইনিয়ান লিটা</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>লিথ�ইনিয়ান টালোন�যাস</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>ল�ক�সেমবার�গ র�পান�তযোগ�য ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>ল�ক�সেমবার�গ ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>ল�ক�সেমবার�গ ফাইনেনশিয়াল ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>ল�যাটভিয়ান ল�যাট�‌স</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>ল�যাটভিয়ান র�বল</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>লিবিয়ান ডলার</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>মোরোক�কান দিরহাম</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>মোরোক�কান ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>মোল�ডোভান লেয়�</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>মাদাগাস�কার আরিয়ারি</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>মাদাগাস�কার ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>ম�যাসেডোনিয়ান দিনার</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>মালি ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>মায়ানমার কিয়াত</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>মঙ�গোলিয়ান ত�গরিক</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>ম�যাক�যাও পাটাকা</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>মৌরিতানিয়ান ওউগ�ইয়া</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>মাল�টা লিরা</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>মাল�টা পাউন�ড</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>মৌরিতানিয়ান র�পি</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>মালদিভিয়ান র�ফিয়া</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>মালাউইয়ান কওয়াচ</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>ম�যাক�সিকান পেসো</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>ম�যাক�সিকান সিলভার পেসো (১৮৬১-১৯৯২)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>মেক�সিকান উনিদাদ দি ইনভার�সান (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>মালয়েশিয়ান রিঙ�গিৎ</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>মোজাম�বিক �সক�ডো</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>প�রাচীন মোজাম�বিক মেটিকেল</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>মোজাম�বিক মেটিকেল</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>নামিবিয়া ডলার</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>নাইজেরিয়ান নায়রা</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>নিকারাগ�য়ান কর�ডোবা</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>নিকারাগ�য়ান কর�ডোবা ওরো</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>নেদারল�যান�ড গ�ল�ডের</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>নরওয়ে ক�রৌন</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>নেপালি র�পি</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>নিউজিল�যান�ড ডলার</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>ওমানি রিয়াল</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>পানামা বেলবোয়া</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>পের�ভিয়ান ইন�তি</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>পের�ভিয়ান সোল ন�য়েভো</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>পের�ভিয়ান সোল</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>পপ�য়ানিউগিনি কিনা</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>ফিলিপাইন পেসো</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>পাকিস�তানি র�পি</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>পোলিশ জ�লোটি</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>পোলিশ জ�লোটি (১৯৫০-১৯৯৫)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>পর�ত�গিজ �সক�ডো</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>প�যারগ�য়ান</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>কাতার রিয়�যাল</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>রোডেশিয়ান ডলার</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>প�রাচীন র�মানিয়া লেয়�</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>র�মানিয়া লেয়�</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>সারবিয়ান দিনার</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>রাশিয়ান র�বেল</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>রাশিয়ান র�বল (১৯৯১-১৯৯৮)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>র�য়ান�ডান ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>সৌদি রিয়�যাল</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>সলোমন দ�বীপপ�ঞ�জ ডলার</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>সেয়চেল�লোইস র�পি</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>প�রাচীন স�দানি দিনার</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>স�দানি পাউন�ড</displayName>
-				<displayName count="one">স�দানি পাউন�ড</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>প�রাচীন স�দানি পাউন�ড</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>স�ইডিশ ক�রোনা</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>সিঙ�গাপ�র ডলার</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>সেন�ট হেলেনা পাউন�ড</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>স�লোভানিয়া টোলার</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>স�লোভাক কোর�না</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>সিয়েরালিয়ন লিয়ন</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>সোমালি শিলিং</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>স�রিনাম ডলার</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>স�রিনাম গিল�ডার</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>সাও টোমে �বং প�রিন�সিপে  ডোবরা</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>সোভিয়েত র�বল</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>�ল স�যালভোডোর কোলোন</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>সিরিয়ান পাউন�ড</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>সোয়াজিল�যান�ড লিলাঙ�গেনি</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>থাই বাত</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>তাজিকিস�তান র�বল</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>তাজিকিস�তান সোমোনি</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>ত�র�কমেনিস�টানি মানাত</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName>ত�র�কমেনিস�তান নত�ন মানত</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>তিউনেশিয়ান দিনার</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>টোঙ�গা পা’আঙ�গা</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>তিম�র �সক�ডো</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>প�রাচীন ত�র�কি লিরা</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ত�র�কি লিরা</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>ত�রিনিদাদ �বং টোবাগো ডলার</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>নূতন তাইওয়ান ক�যারাবিয়ান ডলার</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>তাঞ�জনিয়া শিলিং</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ইউক�রেইন হৃভনিয়া</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ইউক�রেইন কার�বোভ�যান�টস</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>উগান�ডান শিলিং (১৯৬৬-১৯৮৭)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>উগান�ডান শিলিং</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>মার�কিন ডলার</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>মার�কিন ডলার (পরবর�তী দিন)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>মার�কিন ডলার (�কই দিন)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>উর�গ�য়ায়ান পেসো �ন উনিদাদেস ইনডেক�সেডাস</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>উর�গ�য়ে পেসো (১৯৭৫-১৯৯৩)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>উর�গ�য়ে পেসো উর�গ�য়েও</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>উজবেকিস�তানি সোম</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>ভেনিজ�য়েলান বলিভার</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>ভেনিজ�য়েলীয় বলিভার র�ফ�তে</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>ভিয়েতনামি ডঙ�গ</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>ভান�য়াত� ভাত�</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>পশ�চিমাঞ�চলীয় সামোয়ান টালা</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>সি�ফ� ফ�র�যাঙ�ক বিই�সি</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>সিলভার</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>গোল�ড</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>ইউরোপীয় আর�থিক �কক</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>পূর�ব ক�যারাবিয়ান ডলার</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ইউরোপীয় ম�দ�রা �কক</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>ফরাসি গোল�ড ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>ফরাসি ইউআইসি - ফ�রাঙ�ক</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>সি�ফ� ফ�র�যাঙ�ক বিসিই�ও</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>প�যালেডিয়াম</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>সি�ফপি ফ�র�যাঙ�ক</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>প�লাটিনাম</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>অজানা বা ভ�ল ম�দ�রা</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>ইয়েমেনি দিনার</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>ইয়েমেনি রিয়াল</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>য�গোশ�লাভিয় হার�ড দিনার</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>য�গোশ�লাভিয় নোভি দিনার</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>য�গোশ�লাভিয় র�পান�তরযোগ�য দিনার</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>দক�ষিণ আফ�রিকান র‌�যান�ড</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>দক�ষিণ আফ�রিকান রেন�ড</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>জাম�বিয়ান কওয়াচা</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>জাইরিয়ান নিউ জাইরে</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>জাইরিয়ান জাইরে</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>জিম�বাব�য়ে ডলার</displayName>
-			</currency>
-			<currency type="ZWL">
-				<displayName>জিম�বাব�য়ে ডলার (২০০৯)</displayName>
-			</currency>
-			<currency type="ZWR">
-				<displayName>জিম�বাব�য়ে ডলার (২০০৮)</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} দিন</unitPattern>
-			<unitPattern count="other">{0} দিন</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ঘন�টা</unitPattern>
-			<unitPattern count="other">{0} ঘন�টা</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} মিনিট</unitPattern>
-			<unitPattern count="other">{0} মিনিট</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} মাস</unitPattern>
-			<unitPattern count="other">{0} মাস</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} সেকেন�ড</unitPattern>
-			<unitPattern count="other">{0} সেকেন�ড</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} সপ�তাহ</unitPattern>
-			<unitPattern count="other">{0} সপ�তাহ</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} বছর</unitPattern>
-			<unitPattern count="other">{0} বছর</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>হা�</yesstr>
-			<nostr>না</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/bn_BD.xml b/airtime_mvc/library/Zend/Locale/Data/bn_BD.xml
deleted file mode 100644
index 6a82c9cfc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bn_BD.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.25 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bn"/>
-		<territory type="BD"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bn_IN.xml b/airtime_mvc/library/Zend/Locale/Data/bn_IN.xml
deleted file mode 100644
index ed1fb15d5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bn_IN.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bn"/>
-		<territory type="IN"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ab">আবখাজিয়ান</language>
-			<language type="ace">অ�যাচাইনিজ</language>
-			<language type="ach">আকোলি</language>
-			<language type="afa">আফ�রো-�শিয়াটিক ভাষা</language>
-			<language type="alg">আলগোনকিউয়ান ভাষা</language>
-			<language type="anp">আঙ�গিকা</language>
-			<language type="ch">চামোরো</language>
-			<language type="chn">চিন�ক জার�গন</language>
-			<language type="cho">চকটোও</language>
-			<language type="chp">চিপেওয়াইয়ান</language>
-			<language type="chy">চেয়েনি</language>
-			<language type="cu">চার�চ স�লাভিক</language>
-			<language type="de_AT">অস�ট�রিয়ান জারমান</language>
-			<language type="doi">ডোগরি</language>
-			<language type="en_AU">অস�ট�রেলিয়ান ইংরাজী</language>
-			<language type="en_CA">ক�যানাডিয়ান ইংরেজি</language>
-			<language type="en_GB">ব�রিটিশ ইংরেজী</language>
-			<language type="fr_CA">ক�যানাডিয়ান ফরাসী</language>
-			<language type="map">অস�ট�রোনেসিয়ান</language>
-			<language type="rup">আরমেনিয়ান</language>
-			<language type="tut">আলটাইক</language>
-			<language type="zbl">ব�লিসসিম�বলস</language>
-		</languages>
-	</localeDisplayNames>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bo.xml b/airtime_mvc/library/Zend/Locale/Data/bo.xml
deleted file mode 100644
index 8e1e052b9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bo.xml
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="bo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="bo">པོད་ས�ད་</language>
-			<language type="de">འཇར་མན་གྱི�</language>
-			<language type="dz">རྫོང་�</language>
-			<language type="en">ཨིང་ལིཤ་ས�ད�</language>
-			<language type="en_CA">ཨིང་ལིཤ་ས�ད� (�ེ་ན་ཌ་)</language>
-			<language type="en_GB">ཨིང་ལིཤ་ས�ད� (རྦི་རི་ཊིཤ་)</language>
-			<language type="en_US">ཨིང་ལིཤ་ས�ད� (ཨ་རི་)</language>
-			<language type="es">ཞི་པན་ཡའི�</language>
-			<language type="fr">ཧྥ་རན་སིའི་�</language>
-			<language type="gaa">གཱ་ས�ད�</language>
-			<language type="gu">གུཇ་རཱ�ི་ས�ད�</language>
-			<language type="hi">ཧིན་དི</language>
-			<language type="it">དབྱི་�་་ལའི་མི�</language>
-			<language type="ja">རི་པིན་ས�ད་</language>
-			<language type="la">ལེ་ཊིན་ས�ད�</language>
-			<language type="ne">ནེ་པ་ལི</language>
-			<language type="pt">ཕི་�ོ་ཡའི�</language>
-			<language type="pt_BR">པ་ཞའི་མི�  ཕི་�ོ་ཡའི་མི�</language>
-			<language type="ru">ཨུ་རུ་སུ་ས�ད་</language>
-			<language type="und">མིའི་ཤེས་རྟོགས་མ་བྱུང་བ� ཡང་ན་ཆད་ལྷག་ཅན་གྱི་ས�ད་བརྡ�</language>
-			<language type="zen">ཟེ་ན་གཱ་ས�ད�</language>
-			<language type="zh">རྒྱ་ས�ད་</language>
-			<language type="zh_Hans">སྟབས་བརྡའི�  ཀྲུང་གོའི�</language>
-			<language type="zh_Hant">སྲོལ་རྒྱུན་གྱི�</language>
-			<language type="zu">ཟུ་ལུ་ས�ད�</language>
-			<language type="zun">ཟུ་ནི་ས�ད�</language>
-			<language type="zza">ཟ་ཟཱ་ས�ད�</language>
-		</languages>
-		<scripts>
-			<script type="Arab">འ་ལ་པོའི་ས�ད་ཡིག་�</script>
-			<script type="Cyrl">གོ་སའི་ལ་ཧྥུ་ས�ད་ཡིག་�</script>
-			<script type="Hans">སླ་བསྡུའི་རྒྱའི་ས�ད་ཡིག�</script>
-			<script type="Hant">གནའ་དུས་རྒྱའི་ས�ད་ཡིག�</script>
-			<script type="Latn">ལ་�ིན་ས�ད་ཡིག་�</script>
-			<script type="Tibt">བོད་ཡིག་</script>
-			<script type="Zxxx">སྙན་བརྒྱུད�  ཡིག་རིགས་སུ་མ་བཀོད་པའི་ཟིན་�ོ�་</script>
-			<script type="Zzzz">མིའི་ཤེས་རྟོགས་མ་བྱུང་བ� ཡང་ན་ཆད་ལྷག་ཅན་གྱི་ཟིན་བྲིས�</script>
-		</scripts>
-		<territories>
-			<territory type="001">འཛམ་གླིང་�</territory>
-			<territory type="002">ཨཕྲི་ཀ�</territory>
-			<territory type="019">ཨ་མེ་རི་ཀ�</territory>
-			<territory type="053">ཨསྟྲེ་ལི་ཡ་དང་� ནིའུ་ཛི་ལན྄ཌ�</territory>
-			<territory type="142">ཨེ་ཤི་ཡ�</territory>
-			<territory type="150">ཡུ་རོབ�</territory>
-			<territory type="AD">ཨེན་ཌོ་ར�</territory>
-			<territory type="AE">ཨ་རབ� ཨི་མི་རཊ྄� ཆིག་སྒྲིལ་རྒྱལ་�བ�</territory>
-			<territory type="AF">ཨཕ་ག་ནི་སྟཱན�</territory>
-			<territory type="AG">ཨེན་ཊི་གུ་དང་� བྷར་བུ་ཌ�</territory>
-			<territory type="AI">ཨང་གུའི་ལ�</territory>
-			<territory type="AL">ཨལ་བཱ་ནི་ཡ�</territory>
-			<territory type="AM">ཨར་མེ་ནི་ཡ�</territory>
-			<territory type="AO">ཨང་གཽ་ལ�</territory>
-			<territory type="AQ">ལྷོ་རྩེའི་མ�འ་གླིང་�</territory>
-			<territory type="AR">ཨར་ཇེན་ཊི་ན�</territory>
-			<territory type="AT">ཨསྟྲི་ཡ�</territory>
-			<territory type="AU">ཨསྟྲེ་ལི་ཡ�</territory>
-			<territory type="AW">ཨ་རུ་བ�</territory>
-			<territory type="AZ">ཨཛར་བཡེ་ཇན�</territory>
-			<territory type="BA">བོསྣི་ཡ་དང་ཧརྫོ་གོ་�ི་ན�</territory>
-			<territory type="BB">བཱརྦ་ཌོས྄�</territory>
-			<territory type="BD">བངྒ་ལ་དེཤ�</territory>
-			<territory type="BE">བེལ་ཇི་ཡམ�</territory>
-			<territory type="BF">བརཀི་ན� ཕསོ�</territory>
-			<territory type="BG">བུལ་ག་རི་ཡ�</territory>
-			<territory type="BH">བྷཱ་རེན�</territory>
-			<territory type="BI">བུ་རུན་ཌི�</territory>
-			<territory type="BJ">བཱེ་ནིན�</territory>
-			<territory type="BM">བར་མུ་ཌ�</territory>
-			<territory type="BN">བུ་རུ་ནེ�</territory>
-			<territory type="BO">བོ་ལི་�ིཡ�</territory>
-			<territory type="BR">བ་རཱ་ཛིལ�</territory>
-			<territory type="BS">བྷཱ་མས྄�</territory>
-			<territory type="BT">འབྲུག་ཡུལ�</territory>
-			<territory type="BW">བོཙ་�་ན�</territory>
-			<territory type="BY">བེ་ལུ་རུ་སུ�</territory>
-			<territory type="BZ">བེ་ལིཛ�</territory>
-			<territory type="CA">�ེ་ན་ཌ�</territory>
-			<territory type="CI">ཀོ་ཊེ་ཌི� ཨི་�ོ་རེ�</territory>
-			<territory type="CK">ཀཱུག གླིང་ཕྲེན་རྒྱལ་�བ�</territory>
-			<territory type="CL">ཅི་ལི�</territory>
-			<territory type="CM">ཀ་མེ་རུན�</territory>
-			<territory type="CN">རྒྱ་ནག</territory>
-			<territory type="CO">ཀོ་ལོམ་བི་ཡ�</territory>
-			<territory type="CR">ཀོ་ས྄ཊ་རི་ཀ�</territory>
-			<territory type="CU">�ྱུའུ་བ�</territory>
-			<territory type="CY">སཱཡེ་པ་རས྄�</territory>
-			<territory type="CZ">ཅཻག་སྤྱི་མ�ུན་རྒྱལ་�བ�</territory>
-			<territory type="DE">འཇར་མན་</territory>
-			<territory type="DJ">ཛི་བུ་�ི�</territory>
-			<territory type="DK">ཌེན་མཱར��</territory>
-			<territory type="DM">ཌོ་མིན་ནི་ཀ�</territory>
-			<territory type="DO">ཌོ་མིནནི་ཀན་སྤྱི་མ�ུན་རྒྱལ་�བ�</territory>
-			<territory type="DZ">ཨལ་ཇི་རི་ཡ�</territory>
-			<territory type="EC">ཨི་�ྭ་ཌོར�</territory>
-			<territory type="EE">ཨིསྟོ་ནི་ཡ�</territory>
-			<territory type="EG">ཨི་ཇིབྚ�</territory>
-			<territory type="ER">ཨེ་རི་�ྲེ་ཨ�</territory>
-			<territory type="ES">སི་པན�</territory>
-			<territory type="ET">ཨི་�ིའོ་པི་ཡ�</territory>
-			<territory type="FI">ཕིན་ལན྄ཌ�</territory>
-			<territory type="FJ">ཕི་ཇི�</territory>
-			<territory type="FK">ཕལ�་ལནྜ་གླིང་ཕྲན�</territory>
-			<territory type="FR">ཕ་རཱན་སི�</territory>
-			<territory type="GA">གེ་བཽན�</territory>
-			<territory type="GB">དབྱིན་ཇི་</territory>
-			<territory type="GD">གྷ་རི་ན་ཌ�</territory>
-			<territory type="GE">ཇོར་ཇི་ཡ�</territory>
-			<territory type="GH">གྷ་ན�</territory>
-			<territory type="GI">ཇིབ་རཱལ་ཊར�</territory>
-			<territory type="GM">གྷམ་བི་ཡ�</territory>
-			<territory type="GN">གྷི་ནི་ཡ�</territory>
-			<territory type="GR">གྷི་རཱི་སི�</territory>
-			<territory type="GT">གྷོ་ཊེ་མ་ལ�</territory>
-			<territory type="GW">གྷི་ནི་ཡ་བིས྄་སོ�</territory>
-			<territory type="GY">གྷུ་ཡཱ་ན�</territory>
-			<territory type="HK">ཧོང་ཀོང༌�</territory>
-			<territory type="HN">ཧོན་དུ་རས྄�</territory>
-			<territory type="HR">ཀུརོ་ཤི་ཡ�</territory>
-			<territory type="HT">ཧེ་�ི�</territory>
-			<territory type="HU">ཧངྒ་རི�</territory>
-			<territory type="ID">ཨིན་ཌོ་ནེ་ཤི་ཡ�</territory>
-			<territory type="IE">ཨ་ཡར་ལནཌ�</territory>
-			<territory type="IL">ཨི་ཛ྄་རེལ�</territory>
-			<territory type="IN">རྒྱ་གར་</territory>
-			<territory type="IQ">ཨི་རག�</territory>
-			<territory type="IR">ཨི་རཱན�</territory>
-			<territory type="IS">ཨ་ཨི་སི་ལནད�</territory>
-			<territory type="IT">ཨི་ཀྲར་ལི་</territory>
-			<territory type="JM">ཛ་མེ་ཀ�</territory>
-			<territory type="JO">ཇོར་ཌན�</territory>
-			<territory type="JP">རི་པིན་</territory>
-			<territory type="KE">�ེན་ཉི་ཡ�</territory>
-			<territory type="KG">�ིར་གིཛ་སྟཱན�</territory>
-			<territory type="KH">ཀམ་བོ་ཌི་ཡ�</territory>
-			<territory type="KI">ཀི་རི་བཱ་�ི�</territory>
-			<territory type="KN">སེནྚ� ཀིཊྚས྄� དང༌� ནེ་བིས྄�</territory>
-			<territory type="KR">ཀོ་རི་ཡ� ལྷོ་མ�</territory>
-			<territory type="KW">ཀུ་�ེད་རྒྱལ་�བ�</territory>
-			<territory type="KY">�ེ་མེན་གླིང་ཕྲན�</territory>
-			<territory type="KZ">�་ཛཱག་སྟཱན�</territory>
-			<territory type="LA">ལཱ་འོས�</territory>
-			<territory type="LB">ལེབ་ནོན�</territory>
-			<territory type="LC">སེནྚ� ལུ་ཤི་ཡ�</territory>
-			<territory type="LI">ལེག་�ེན་ཚིན�</territory>
-			<territory type="LK">ཤྲཱི་ལང་ཀ�</territory>
-			<territory type="LR">ལི་བེ་རི་ཡ�</territory>
-			<territory type="LS">ལེ་སོ་�ོ�</territory>
-			<territory type="LT">ལི་�ུ་ཨེ་ནི་ཡ�</territory>
-			<territory type="LU">ལཀ་ཛམ་བོརྒ�</territory>
-			<territory type="LV">ལ�་བི་ཡ�</territory>
-			<territory type="LY">ལི་བི་ཡ�</territory>
-			<territory type="MA">མོ་རོ་ཀ�ོ�</territory>
-			<territory type="MC">མོ་ན་ཀོ�</territory>
-			<territory type="MG">མ་དཱ་གྷས�ཱར�</territory>
-			<territory type="MH">མཱར་ཤལ་གླིང་ཕྲེན�</territory>
-			<territory type="ML">མ་ལི�</territory>
-			<territory type="MM">འབར་མ�</territory>
-			<territory type="MN">སོག་ཡུལ�</territory>
-			<territory type="MO">མེ་ཀའོ�</territory>
-			<territory type="MR">མཽ་རི་�་ནི་ཡ�</territory>
-			<territory type="MT">མལ་ཊ�</territory>
-			<territory type="MU">མཽ་རིཤས྄�</territory>
-			<territory type="MV">མལ་དྭིབ�</territory>
-			<territory type="MW">མཱ་ལཱ་�ི�</territory>
-			<territory type="MX">མེཀ་སི་ཀོ�</territory>
-			<territory type="MY">མ་ལེ་ཤི་ཡ�</territory>
-			<territory type="MZ">མོ་ཛམ་བིག�</territory>
-			<territory type="NA">ན་མི་བི་ཡ�</territory>
-			<territory type="NE">ནའི་ཇར�</territory>
-			<territory type="NG">ནཱའི་ཇི་རི་ཡ�</territory>
-			<territory type="NI">ནི་ཀ་ར་གུ་ཨ�</territory>
-			<territory type="NL">ནེ་�ར་ལནྜ�</territory>
-			<territory type="NO">ནོར་�ེ�</territory>
-			<territory type="NP">བར་ཡུལ་</territory>
-			<territory type="NR">ནཽ་རུ�</territory>
-			<territory type="NU">ནིའུ་��</territory>
-			<territory type="NZ">ནིའུ་ཛི་ལན྄ཌ�</territory>
-			<territory type="OM">ཨོ་མན�</territory>
-			<territory type="PA">པ་ནཱ་མ�</territory>
-			<territory type="PE">པེ་རུ�</territory>
-			<territory type="PG">པ་པུ་ཨ� ནིའུ� གྷི་ནི�</territory>
-			<territory type="PH">ཕི་ལི་པིནས྄�</territory>
-			<territory type="PK">པཀི་སྟཱན�</territory>
-			<territory type="PL">པོ་ལནྜ�</territory>
-			<territory type="PT">པོར་�ུ་གྷལ�</territory>
-			<territory type="PW">པ་ལཽ�</territory>
-			<territory type="PY">པཱ་ར་གེ�</territory>
-			<territory type="QA">ཀ་�ཱར�</territory>
-			<territory type="RO">རོ་མཱ་ནིཡ�</territory>
-			<territory type="RS">སེར་བི་ཡ�</territory>
-			<territory type="RU">ཨུ་རུ་སུ་</territory>
-			<territory type="RW">རུ་�ན་ཌ�</territory>
-			<territory type="SA">སཽ་དྷི་ཨ་རཱ་བི་ཡ�</territory>
-			<territory type="SB">སོ་ལོ་མོན� གླིང་ཕྲན་ཚོ་�ག�</territory>
-			<territory type="SC">སཱ་ཤཻལ�</territory>
-			<territory type="SD">སུ་དཱན�</territory>
-			<territory type="SG">སིངྒ་པུར�</territory>
-			<territory type="SH">སེནྚ� ཧེ་ལི་ན�</territory>
-			<territory type="SI">ས་ལཽ་�ེ་ནི་ཡ�</territory>
-			<territory type="SK">ས་ལཽ་�ཀྱ�</territory>
-			<territory type="SL">སེ་ཡར་ར� ལིའོན�</territory>
-			<territory type="SM">སན་མེ་རི་ནོ�</territory>
-			<territory type="SN">སེ་ནི་གྷལ�</territory>
-			<territory type="SO">སོ་མཱལི་ཡ�</territory>
-			<territory type="SR">སུ་རི་ནཱམ�</territory>
-			<territory type="ST">ས་འོ་�ོད་མད� དང༌� པ྄རིན་སི་པེ�</territory>
-			<territory type="SV">ཨེལ� སཱལ་�་ཌོར�</territory>
-			<territory type="TD">ཅཻཌ�</territory>
-			<territory type="TR">�ུརཀི�</territory>
-			<territory type="TV">�ུ་�་ལུ�</territory>
-			<territory type="UA">ཡུ་ཀརེན�</territory>
-			<territory type="UG">ཡུ་གན་ཌ�</territory>
-			<territory type="US">ཨ་མེ་རི་ཀ་</territory>
-			<territory type="UY">ཨུ་རུ་གྷེ�</territory>
-			<territory type="UZ">ཨུཛ་བེ་ཀིསྟཱན�</territory>
-			<territory type="VA">�ེ་ཊི་ཀན�</territory>
-			<territory type="VC">སེནྚ� �ིན་སན� དང༌� གྷིརིན་ཌིན�</territory>
-			<territory type="VE">�ེ་ནི་ཛུའེ་ལ�</territory>
-			<territory type="VN">�ེད་ནམ�</territory>
-			<territory type="VU">�་ནུ་ཨ་�ུ�</territory>
-			<territory type="WS">ནུ་བ་ས་མོ་འ�</territory>
-			<territory type="YE">ཡེ་མེན�</territory>
-			<territory type="ZA">ལྷོ་ ཨཕྲི་ཀ�</territory>
-			<territory type="ZM">ཛམ་བི་ཡ�</territory>
-			<territory type="ZW">ཛིམ་བྷཱ་བེ�</territory>
-			<territory type="ZZ">མིའི་ཤེས་རྟོགས་མ་བྱུང་བའི་�ོར་ཡུག</territory>
-		</territories>
-		<measurementSystemNames>
-			<measurementSystemName type="US">ཨ་མེ་རི་ཀའི�</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u0F7E ཿ ་ � ༎ ༠-༩ ཀ {ཀ\u0FB5} \u0F90 {\u0F90\u0FB5} � \u0F91 ག {ག\u0FB7} \u0F92 {\u0F92\u0FB7} ང \u0F94 ཅ \u0F95 ཆ \u0F96 ཇ \u0F97 ཉ \u0F99 ཊ \u0F9A ཋ \u0F9B ཌ {ཌ\u0FB7} \u0F9C {\u0F9C\u0FB7} ཎ \u0F9E � \u0F9F � \u0FA0 ད {ད\u0FB7} \u0FA1 {\u0FA1\u0FB7} ན \u0FA3 པ \u0FA4 ཕ \u0FA5 བ {བ\u0FB7} \u0FA6 {\u0FA6\u0FB7} མ \u0FA8 ཙ \u0FA9 ཚ \u0FAA ཛ {ཛ\u0FB7} \u0FAB {\u0FAB\u0FB7} � \u0FAD \u0FBA ཞ \u0FAE ཟ \u0FAF འ \u0FB0 ཡ \u0FB1 \u0FBB ར ཪ \u0FB2 \u0FBC ལ \u0FB3 ཤ \u0FB4 ཥ \u0FB5 ས \u0FB6 ཧ \u0FB7 ཨ \u0FB8 \u0F71 \u0F72 {\u0F71\u0F72} \u0F80 {\u0F71\u0F80} \u0F74 {\u0F71\u0F74} {\u0FB2\u0F80} \u0F77 {\u0FB3\u0F80} \u0F79-\u0F7D \u0F84]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ༀ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ཟླ་༡</month>
-							<month type="2">ཟླ་༢</month>
-							<month type="3">ཟླ་༣</month>
-							<month type="4">ཟླ་༤</month>
-							<month type="5">ཟླ་༥</month>
-							<month type="6">ཟླ་༦</month>
-							<month type="7">ཟླ་༧</month>
-							<month type="8">ཟླ་༨</month>
-							<month type="9">ཟླ་༩</month>
-							<month type="10">ཟླ་༡༠</month>
-							<month type="11">ཟླ་༡༡</month>
-							<month type="12">ཟླ་༡༢</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ཟླ་བ་དང་པོ་</month>
-							<month type="2">ཟླ་བ་གཉིས་པ་</month>
-							<month type="3">ཟླ་བ་སུམ་པ་</month>
-							<month type="4">ཟླ་བ་བཞི་པ་</month>
-							<month type="5">ཟླ་བ་ལྔ་པ་</month>
-							<month type="6">ཟླ་བ་དྲུག་པ་</month>
-							<month type="7">ཟླ་བ་བདུན་པ་</month>
-							<month type="8">ཟླ་བ་བརྒྱད་པ་</month>
-							<month type="9">ཟླ་བ་དགུ་པ་</month>
-							<month type="10">ཟླ་བ་བཅུ་པ་</month>
-							<month type="11">ཟླ་བ་བཅུ་གཅིག་པ་</month>
-							<month type="12">ཟླ་བ་བཅུ་གཉིས་པ་</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ཉི་མ་</day>
-							<day type="mon">ཟླ་བ་</day>
-							<day type="tue">མིག་དམར་</day>
-							<day type="wed">ཧླག་པ་</day>
-							<day type="thu">ཕུར་བུ་</day>
-							<day type="fri">སངས་</day>
-							<day type="sat">སྤེན་པ་</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">གཟའ་ཉི་མ་</day>
-							<day type="mon">གཟའ་ཟླ་བ་</day>
-							<day type="tue">གཟའ་མིག་དམར་</day>
-							<day type="wed">གཟའ་ཧླག་པ་</day>
-							<day type="thu">གཟའ་ཕུར་བུ་</day>
-							<day type="fri">གཟའ་སངས་</day>
-							<day type="sat">གཟའ་སྤེན་པ་</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ཉི</day>
-							<day type="mon">ཟླ</day>
-							<day type="tue">མི</day>
-							<day type="wed">ཧླ</day>
-							<day type="thu">ཕུ</day>
-							<day type="fri">ས</day>
-							<day type="sat">སྤེ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="wide">
-							<quarter type="1">དུས་ཚིགས་དང་པོ�</quarter>
-							<quarter type="2">དུས་ཚིགས་གཉིས་པ�</quarter>
-							<quarter type="3">་དུས་ཚིགས་གསུམ་པ�</quarter>
-							<quarter type="4">དུས་ཚིགས་བཞི་པ�</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>སྔ་དྲོ་</am>
-				<pm>ཕྱི་དྲོ་</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">སྤྱི་ལོ་སྔོན�</era>
-						<era type="1">སྤྱི་ལོ�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>སྦྱི་ལོ་y MMMMའི་ཙེས་dད</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y ལོ་འི་MMMཙེས་d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<fields>
-					<field type="era">
-						<displayName>ལོ་རིམ�</displayName>
-					</field>
-					<field type="year">
-						<displayName>ལོ�</displayName>
-					</field>
-					<field type="month">
-						<displayName>ཟླ་བ་</displayName>
-					</field>
-					<field type="week">
-						<displayName>གཟའ་འ�ོར�</displayName>
-					</field>
-					<field type="day">
-						<displayName>ཉིན�</displayName>
-						<relative type="-2">�ས་ཉིན་ཀ་</relative>
-						<relative type="-1">�ས་ས་</relative>
-						<relative type="0">དེ་རིང་</relative>
-						<relative type="1">སང་ཉིན་</relative>
-						<relative type="2">གནངས་ཉིན་ཀ་</relative>
-					</field>
-					<field type="weekday">
-						<displayName>གཟའ་འ�ོར་གཅིག</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>སྔ་དྲོ�   ཕྱི་དྲོ�</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ཆུ་ཙོ་</displayName>
-					</field>
-					<field type="minute">
-						<displayName>ས�ར་མ�</displayName>
-					</field>
-					<field type="second">
-						<displayName>ས�ར་ཆ�</displayName>
-					</field>
-					<field type="zone">
-						<displayName>དུས་ཚོད�</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<zone type="Etc/Unknown">
-				<exemplarCity>མ་རྟོགས་པ</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>tibt</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="CNY">
-				<displayName>ཡུ་ཨན་</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>རྒྱ་གར་སྒོར་མོ་</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>མ་རྟོགས་པའི་ནུས་མེད་དངུལ་ལོར</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ཡིན�:Y</yesstr>
-			<nostr>མེད�:N</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/bo_CN.xml b/airtime_mvc/library/Zend/Locale/Data/bo_CN.xml
deleted file mode 100644
index 184172e58..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bo_CN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.11 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bo"/>
-		<territory type="CN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bo_IN.xml b/airtime_mvc/library/Zend/Locale/Data/bo_IN.xml
deleted file mode 100644
index df49ae9a3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bo_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.8 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bo"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bs.xml b/airtime_mvc/library/Zend/Locale/Data/bs.xml
deleted file mode 100644
index acf09f1c5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bs.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bs"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">afrikaans</language>
-			<language type="am">amharski</language>
-			<language type="ar">arapski</language>
-			<language type="as">asameski</language>
-			<language type="az">azerbejdžanski</language>
-			<language type="be">bjeloruski</language>
-			<language type="bg">bugarski</language>
-			<language type="bh">bihari</language>
-			<language type="bn">bengalski</language>
-			<language type="bo">tibetanski</language>
-			<language type="br">bretonac</language>
-			<language type="bs">bosanski</language>
-			<language type="ca">katalonski</language>
-			<language type="cs">�eški</language>
-			<language type="cy">velški</language>
-			<language type="da">danski</language>
-			<language type="de">njema�ki</language>
-			<language type="el">gr�ki</language>
-			<language type="en">engleski</language>
-			<language type="eo">esperanto</language>
-			<language type="es">Å¡panjolski</language>
-			<language type="et">estonski</language>
-			<language type="eu">baskijski</language>
-			<language type="fa">perzijski</language>
-			<language type="fi">finski</language>
-			<language type="fil">filipinski</language>
-			<language type="fo">farski</language>
-			<language type="fr">francuski</language>
-			<language type="fy">frizijski</language>
-			<language type="ga">irski</language>
-			<language type="gd">Å¡kotski gelski</language>
-			<language type="gl">galicijski</language>
-			<language type="gn">guarani</language>
-			<language type="gu">gudžarati</language>
-			<language type="he">hebrejski</language>
-			<language type="hi">hindu</language>
-			<language type="hr">hrvatski</language>
-			<language type="hu">mađarski</language>
-			<language type="hy">armenski</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indonezijski</language>
-			<language type="ie">međujezi�ni</language>
-			<language type="is">islandski</language>
-			<language type="it">talijanski</language>
-			<language type="ja">japanski</language>
-			<language type="jv">javanski</language>
-			<language type="ka">gruzijski</language>
-			<language type="km">kambodžanski</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreanski</language>
-			<language type="ku">kurdski</language>
-			<language type="ky">kirgiski</language>
-			<language type="la">latinski</language>
-			<language type="ln">n/a</language>
-			<language type="lo">laothian</language>
-			<language type="lt">litvanski</language>
-			<language type="lv">latvijski</language>
-			<language type="mk">makedonski</language>
-			<language type="ml">malajalamski</language>
-			<language type="mn">mongolski</language>
-			<language type="mr">marati</language>
-			<language type="ms">malajski</language>
-			<language type="mt">malteški</language>
-			<language type="ne">nepalski</language>
-			<language type="nl">holandski</language>
-			<language type="nn">norveški (novonorveški)</language>
-			<language type="no">norveški</language>
-			<language type="oc">oksitanski</language>
-			<language type="or">indijski</language>
-			<language type="pa">pendžabi</language>
-			<language type="pl">poljski</language>
-			<language type="ps">pakistanski</language>
-			<language type="pt">portugalski</language>
-			<language type="pt_BR">portugalski (Brazil)</language>
-			<language type="pt_PT">portugalski (Portugal)</language>
-			<language type="ro">rumunski</language>
-			<language type="ru">ruski</language>
-			<language type="sa">sanskrit</language>
-			<language type="sd">sindi</language>
-			<language type="sh">srpsko-hrvatski</language>
-			<language type="si">sinhaleski</language>
-			<language type="sk">slova�ki</language>
-			<language type="sl">slovena�ki</language>
-			<language type="so">somalski</language>
-			<language type="sq">albanski</language>
-			<language type="sr">srpski</language>
-			<language type="st">sesoto</language>
-			<language type="su">sudanski</language>
-			<language type="sv">Å¡vedski</language>
-			<language type="sw">svahili</language>
-			<language type="ta">tamilski</language>
-			<language type="te">telugu</language>
-			<language type="th">tajlandski</language>
-			<language type="ti">tigrinya (eritrejski)</language>
-			<language type="tk">turkmenski</language>
-			<language type="tlh">klingonski</language>
-			<language type="tr">turski</language>
-			<language type="tw">twi</language>
-			<language type="ug">uighur</language>
-			<language type="uk">ukrajinski</language>
-			<language type="und">nepoznati ili nevažeći jezik</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbekistanski</language>
-			<language type="vi">vijetnamski</language>
-			<language type="xh">bantu</language>
-			<language type="yi">jidiš</language>
-			<language type="zh">kineski</language>
-			<language type="zu">zulu</language>
-		</languages>
-		<scripts>
-			<script type="Zxxx">nepisani jezik</script>
-			<script type="Zzzz">nepoznato ili nevažeće pismo</script>
-		</scripts>
-		<territories>
-			<territory type="BA">Bosna i Hercegovina</territory>
-			<territory type="ME">Crna Gora</territory>
-			<territory type="RS">Srbija</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="ZZ">Nepoznata ili nevažeća oblast</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ć � d đ {dž} e-l {lj} m n {nj} o p r s š t-v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q w-y]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">Maj</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Avg</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januar</month>
-							<month type="2">Februar</month>
-							<month type="3">Mart</month>
-							<month type="4">April</month>
-							<month type="5">Maj</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Avgust</month>
-							<month type="9">Septembar</month>
-							<month type="10">Oktobar</month>
-							<month type="11">Novembar</month>
-							<month type="12">Decembar</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ned</day>
-							<day type="mon">Pon</day>
-							<day type="tue">Uto</day>
-							<day type="wed">Sri</day>
-							<day type="thu">ÄŒet</day>
-							<day type="fri">Pet</day>
-							<day type="sat">Sub</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Nedjelja</day>
-							<day type="mon">Ponedjeljak</day>
-							<day type="tue">Utorak</day>
-							<day type="wed">Srijeda</day>
-							<day type="thu">ÄŒetvrtak</day>
-							<day type="fri">Petak</day>
-							<day type="sat">Subota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Prvi kvartal</quarter>
-							<quarter type="2">Drugi kvartal</quarter>
-							<quarter type="3">Treći kvartal</quarter>
-							<quarter type="4">ÄŒetvrti kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nepoznati ili nevažeći grad</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="BAM">
-				<displayName>Konvertibilna marka</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Nepoznata ili nevažeća valuta</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>da:d</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/bs_BA.xml b/airtime_mvc/library/Zend/Locale/Data/bs_BA.xml
deleted file mode 100644
index 0b303d031..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/bs_BA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.24 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="bs"/>
-		<territory type="BA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/byn.xml b/airtime_mvc/library/Zend/Locale/Data/byn.xml
deleted file mode 100644
index 68ac9b27f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/byn.xml
+++ /dev/null
@@ -1,501 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="byn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">አ�ርኛ</language>
-			<language type="ab">አብ�ዚኛ</language>
-			<language type="af">አ�ሪቃንስኛ</language>
-			<language type="am">አማርኛ</language>
-			<language type="ar">�ርቢኛ</language>
-			<language type="as">አሳሜዛዊ</language>
-			<language type="ay">አያማርኛ</language>
-			<language type="az">አዜርባይጃንኛ</language>
-			<language type="ba">ባስኪርኛ</language>
-			<language type="be">ቤላራሻኛ</language>
-			<language type="bg">ቡ�ጋሪኛ</language>
-			<language type="bh">ቢሃሪ</language>
-			<language type="bi">ቢስላ�ኛ</language>
-			<language type="bn">በንጋሊኛ</language>
-			<language type="bo">ትበትንኛ</language>
-			<language type="br">ብሬቶንኛ</language>
-			<language type="byn">ብሊን</language>
-			<language type="ca">ካታላንኛ</language>
-			<language type="co">ኮርሲካኛ</language>
-			<language type="cs">ቼክኛ</language>
-			<language type="cy">ወ�ሽ</language>
-			<language type="da">ዴኒሽ</language>
-			<language type="de">ጀርመን</language>
-			<language type="dz">ድዞን�ኻኛ</language>
-			<language type="el">�ሪክኛ</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="eo">ኤስ�ራንቶ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="et">ኤስቶኒአን</language>
-			<language type="eu">ባስክኛ</language>
-			<language type="fa">�ርሲያኛ</language>
-			<language type="fi">�ኒሽ</language>
-			<language type="fj">�ጂኛ</language>
-			<language type="fo">�ሮኛ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="fy">�ሪስኛ</language>
-			<language type="ga">አይሪሽ</language>
-			<language type="gd">እስኮትስ ጌ�ክኛ</language>
-			<language type="gez">�ዕ�ኛ</language>
-			<language type="gl">ጋለጋኛ</language>
-			<language type="gn">ጓራኒኛ</language>
-			<language type="gu">ጉጃርቲኛ</language>
-			<language type="ha">ሃ�ሳኛ</language>
-			<language type="he">ዕብራስጥ</language>
-			<language type="hi">�ንድኛ</language>
-			<language type="hr">ክሮሽያንኛ</language>
-			<language type="hu">ሀንጋሪኛ</language>
-			<language type="hy">አርመናዊ</language>
-			<language type="ia">ኢንቴርሊንጓ</language>
-			<language type="id">እንዶኒሲኛ</language>
-			<language type="ie">እንተርሊን�ወ</language>
-			<language type="ik">እኑ�ያቅኛ</language>
-			<language type="is">አይስላንድኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="iu">እኑክቲቱትኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="jv">ጃቫንኛ</language>
-			<language type="ka">ጊዮርጊያን</language>
-			<language type="kk">ካዛክኛ</language>
-			<language type="kl">ካላሊሱትኛ</language>
-			<language type="km">ክመርኛ</language>
-			<language type="kn">ካናዳኛ</language>
-			<language type="ko">ኮሪያኛ</language>
-			<language type="ks">ካሽሚርኛ</language>
-			<language type="ku">ኩርድሽኛ</language>
-			<language type="ky">ኪርጊ�ኛ</language>
-			<language type="la">ላቲንኛ</language>
-			<language type="ln">ሊንጋላኛ</language>
-			<language type="lo">ላ�ስኛ</language>
-			<language type="lt">ሊቱአኒያን</language>
-			<language type="lv">ላትቪያን</language>
-			<language type="mg">ማላጋስኛ</language>
-			<language type="mi">ማዮሪኛ</language>
-			<language type="mk">ማከዶኒኛ</language>
-			<language type="ml">ማላያላ�ኛ</language>
-			<language type="mn">ሞንጎላዊኛ</language>
-			<language type="mo">ሞ�ዳቫዊና</language>
-			<language type="mr">ማራዚኛ</language>
-			<language type="ms">ማላይኛ</language>
-			<language type="mt">ማ�ቲስኛ</language>
-			<language type="my">ቡርማኛ</language>
-			<language type="na">ናኡሩ</language>
-			<language type="ne">ኔ�ሊኛ</language>
-			<language type="nl">ደች</language>
-			<language type="no">ኖርዌጂያን</language>
-			<language type="oc">ኦኪታንኛ</language>
-			<language type="om">ኦሮ�ኛ</language>
-			<language type="or">ኦሪያኛ</language>
-			<language type="pa">�ንጃቢኛ</language>
-			<language type="pl">�ሊሽ</language>
-			<language type="ps">�ሽቶኛ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="qu">ኵቿኛ</language>
-			<language type="rm">ሮማንስ</language>
-			<language type="rn">ሩንዲኛ</language>
-			<language type="ro">ሮማኒያን</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="rw">ኪንያርዋንድኛ</language>
-			<language type="sa">ሳንስክሪትኛ</language>
-			<language type="sd">ሲንድሂኛ</language>
-			<language type="sg">ሳንጎኛ</language>
-			<language type="si">ስንሃ�ኛ</language>
-			<language type="sid">ሲዳ�ኛ</language>
-			<language type="sk">ስሎቫክኛ</language>
-			<language type="sl">ስሎቪኛ</language>
-			<language type="sm">ሳሞአኛ</language>
-			<language type="sn">ሾናኛ</language>
-			<language type="so">ሱማ�ኛ</language>
-			<language type="sq">�ቤኒኛ</language>
-			<language type="sr">ሰርቢኛ</language>
-			<language type="ss">ስዋቲኛ</language>
-			<language type="st">ሶዞኛ</language>
-			<language type="su">ሱዳንኛ</language>
-			<language type="sv">ስዊድንኛ</language>
-			<language type="sw">ስዋሂሊኛ</language>
-			<language type="ta">ታሚ�ኛ</language>
-			<language type="te">ተሉጉኛ</language>
-			<language type="tg">ታጂኪኛ</language>
-			<language type="th">ታይኛ</language>
-			<language type="ti">ት�ርኛ</language>
-			<language type="tig">ት�ረ</language>
-			<language type="tk">ቱርክመንኛ</language>
-			<language type="tl">ታጋሎገኛ</language>
-			<language type="tn">ጽዋናዊኛ</language>
-			<language type="to">ቶንጋ</language>
-			<language type="tr">ቱርክኛ</language>
-			<language type="ts">ጾንጋኛ</language>
-			<language type="tt">ታታርኛ</language>
-			<language type="tw">ትዊኛ</language>
-			<language type="ug">ኡዊ��ርኛ</language>
-			<language type="uk">ዩክረኒኛ</language>
-			<language type="ur">ኡርዱኛ</language>
-			<language type="uz">ኡ�በክኛ</language>
-			<language type="vi">ቪትና�ኛ</language>
-			<language type="vo">ቮላ�ክኛ</language>
-			<language type="wo">ዎሎ�ኛ</language>
-			<language type="xh">ዞሳኛ</language>
-			<language type="yi">ይዲሻዊኛ</language>
-			<language type="yo">ዮሩባዊኛ</language>
-			<language type="za">ዡዋን�ኛ</language>
-			<language type="zh">ቻይንኛ</language>
-			<language type="zu">ዙሉኛ</language>
-		</languages>
-		<scripts>
-			<script type="Latn">ላቲን</script>
-		</scripts>
-		<territories>
-			<territory type="AD">አንዶራ</territory>
-			<territory type="AE">የተባበሩት አረብ ኤ�ሬትስ</territory>
-			<territory type="AL">አ�ባኒያ</territory>
-			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ አንቲ�ስ</territory>
-			<territory type="AR">አርጀንቲና</territory>
-			<territory type="AT">ኦስትሪያ</territory>
-			<territory type="AU">አ�ስትሬሊያ</territory>
-			<territory type="AZ">አዘርባጃን</territory>
-			<territory type="BA">ቦስኒያ እና ሄርዞጎቪኒያ</territory>
-			<territory type="BB">ባርቤዶስ</territory>
-			<territory type="BE">ቤ�ጄ�</territory>
-			<territory type="BG">ቡ�ጌሪያ</territory>
-			<territory type="BH">ባህሬን</territory>
-			<territory type="BM">ቤርሙዳ</territory>
-			<territory type="BO">ቦሊቪያ</territory>
-			<territory type="BR">ብራዚ�</territory>
-			<territory type="BT">ቡህታን</territory>
-			<territory type="BY">ቤላሩስ</territory>
-			<territory type="BZ">ቤሊዘ</territory>
-			<territory type="CD">ኮንጎ</territory>
-			<territory type="CF">የመካከለኛ� አ�ሪካ ሪ�ብሊክ</territory>
-			<territory type="CH">ስዊዘርላንድ</territory>
-			<territory type="CL">ቺሊ</territory>
-			<territory type="CM">ካሜሩን</territory>
-			<territory type="CN">ቻይና</territory>
-			<territory type="CO">ኮሎ�ቢያ</territory>
-			<territory type="CS">ሰርቢያ</territory>
-			<territory type="CV">ኬ� ቬርዴ</territory>
-			<territory type="CY">ሳይ�ረስ</territory>
-			<territory type="CZ">ቼክ ሪ�ብሊክ</territory>
-			<territory type="DE">ጀርመን</territory>
-			<territory type="DK">ዴንማርክ</territory>
-			<territory type="DM">ዶሚኒካ</territory>
-			<territory type="DO">ዶሚኒክ ሪ�ብሊክ</territory>
-			<territory type="DZ">አ�ጄሪያ</territory>
-			<territory type="EC">ኢኳዶር</territory>
-			<territory type="EE">ኤስቶኒያ</territory>
-			<territory type="EG">�ብጽ</territory>
-			<territory type="EH">�ዕራባዊ ሳህራ</territory>
-			<territory type="ER">ኤርትራ</territory>
-			<territory type="ES">ስ�ን</territory>
-			<territory type="ET">ኢትዮጵያ</territory>
-			<territory type="FI">�ንላንድ</territory>
-			<territory type="FJ">�ጂ</territory>
-			<territory type="FM">ሚክሮኔዢያ</territory>
-			<territory type="FR">�ረንሳይ</territory>
-			<territory type="GB">እን�ሊ�</territory>
-			<territory type="GE">ጆርጂያ</territory>
-			<territory type="GF">የ�ረንሳይ ጉዊአና</territory>
-			<territory type="GM">ጋ�ቢያ</territory>
-			<territory type="GN">ጊኒ</territory>
-			<territory type="GQ">ኢኳቶሪያ� ጊኒ</territory>
-			<territory type="GR">�ሪክ</territory>
-			<territory type="GW">ቢሳዎ</territory>
-			<territory type="GY">ጉያና</territory>
-			<territory type="HK">ሆን� ኮን�</territory>
-			<territory type="HR">ክሮኤሽያ</territory>
-			<territory type="HT">ሀይቲ</territory>
-			<territory type="HU">ሀንጋሪ</territory>
-			<territory type="ID">ኢንዶኔዢያ</territory>
-			<territory type="IE">አየርላንድ</territory>
-			<territory type="IL">እስራኤ�</territory>
-			<territory type="IN">ህንድ</territory>
-			<territory type="IQ">ኢራቅ</territory>
-			<territory type="IS">አይስላንድ</territory>
-			<territory type="IT">ጣሊያን</territory>
-			<territory type="JM">ጃማይካ</territory>
-			<territory type="JO">ጆርዳን</territory>
-			<territory type="JP">ጃ�ን</territory>
-			<territory type="KH">ካ�ቦዲያ</territory>
-			<territory type="KM">ኮሞሮስ</territory>
-			<territory type="KP">ደቡብ ኮሪያ</territory>
-			<territory type="KR">ሰሜን ኮሪያ</territory>
-			<territory type="KW">ክዌት</territory>
-			<territory type="LB">ሊባኖስ</territory>
-			<territory type="LT">ሊቱዌኒያ</territory>
-			<territory type="LV">ላትቪያ</territory>
-			<territory type="LY">ሊቢያ</territory>
-			<territory type="MA">ሞሮኮ</territory>
-			<territory type="MD">ሞ�ዶቫ</territory>
-			<territory type="MK">ማከዶኒያ</territory>
-			<territory type="MN">ሞንጎሊያ</territory>
-			<territory type="MO">ማካዎ</territory>
-			<territory type="MR">ሞሪቴኒያ</territory>
-			<territory type="MT">ማ�ታ</territory>
-			<territory type="MU">ማሩሸስ</territory>
-			<territory type="MX">ሜክሲኮ</territory>
-			<territory type="MY">ማሌዢያ</territory>
-			<territory type="NA">ናሚቢያ</territory>
-			<territory type="NC">ኒ� ካሌዶኒያ</territory>
-			<territory type="NG">ናይጄሪያ</territory>
-			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
-			<territory type="NP">ኔ��</territory>
-			<territory type="NZ">ኒ� ዚላንድ</territory>
-			<territory type="PE">�ሩ</territory>
-			<territory type="PF">የ�ረንሳይ �ሊኔዢያ</territory>
-			<territory type="PG">��ዋ ኒ� ጊኒ</territory>
-			<territory type="PL">�ላንድ</territory>
-			<territory type="PR">�ርታ ሪኮ</territory>
-			<territory type="RO">ሮሜኒያ</territory>
-			<territory type="RU">ራሺያ</territory>
-			<territory type="SA">ሳ�ድአረቢያ</territory>
-			<territory type="SD">ሱዳን</territory>
-			<territory type="SE">ስዊድን</territory>
-			<territory type="SG">ሲንጋ�ር</territory>
-			<territory type="SI">ስሎቬኒያ</territory>
-			<territory type="SK">ስሎቫኪያ</territory>
-			<territory type="SN">ሴኔጋ�</territory>
-			<territory type="SO">ሱማሌ</territory>
-			<territory type="SY">ሲሪያ</territory>
-			<territory type="TD">ቻድ</territory>
-			<territory type="TF">የ�ረንሳይ ደቡባዊ �ዛቶች</territory>
-			<territory type="TH">ታይላንድ</territory>
-			<territory type="TJ">ታጃኪስታን</territory>
-			<territory type="TL">�ስራቅ ቲሞር</territory>
-			<territory type="TN">ቱኒዚያ</territory>
-			<territory type="TR">ቱርክ</territory>
-			<territory type="TT">ትሪኒዳድ እና ቶባጎ</territory>
-			<territory type="TZ">ታንዛኒያ</territory>
-			<territory type="UG">ዩጋንዳ</territory>
-			<territory type="US">አሜሪካ</territory>
-			<territory type="UZ">ዩ�በኪስታን</territory>
-			<territory type="VE">ቬንዙዌላ</territory>
-			<territory type="VG">የእን�ሊ� ድን�� ደሴቶች</territory>
-			<territory type="VI">የአሜሪካ ቨርጂን ደሴቶች</territory>
-			<territory type="YE">የመን</territory>
-			<territory type="ZA">ደቡብ አ�ሪካ</territory>
-			<territory type="ZM">ዛ�ቢያ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F ሀ-ሆ ለ-ሟ ረ-ቆ ቈ ቊ-� �-ቖ ቘ ቚ-� በ-ኆ ኈ ኊ-� �-ኮ ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዎ �-ዖ ዘ-ዮ ደ-ዷ ጀ-ጎ � ጒ-ጕ ጘ-ጟ ⶓ-ⶖ ጠ-ጯ ጸ-ጿ �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[�-᎙ ሇ ⶀ ᎀ-ᎃ � ሠ-ሧ ⶂ-ⶄ ቇ ᎄ-ᎇ ⶅ-ⶇ ኇ ⶈ-ⶊ ኯ � ⶋ ዯ ⶌ ዸ-ዿ � ⶎ � �-ⶑ � ᎈ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�ደት</month>
-							<month type="2">ካብኽ</month>
-							<month type="3">ክብላ</month>
-							<month type="4">�ጅኺ</month>
-							<month type="5">ክቢቅ</month>
-							<month type="6">�/ት</month>
-							<month type="7">ኰር</month>
-							<month type="8">ማርያ</month>
-							<month type="9">ያኸኒ</month>
-							<month type="10">መተሉ</month>
-							<month type="11">�/�</month>
-							<month type="12">ተሕሳ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�ደትሪ</month>
-							<month type="2">ካብኽብቲ</month>
-							<month type="3">ክብላ</month>
-							<month type="4">�ጅኺሪ</month>
-							<month type="5">ክቢቅሪ</month>
-							<month type="6">�ኪኤ� ትጟኒሪ</month>
-							<month type="7">ኰርኩ</month>
-							<month type="8">ማርያ� ትሪ</month>
-							<month type="9">ያኸኒ መሳቅለሪ</month>
-							<month type="10">መተሉ</month>
-							<month type="11">�ኪኤ� መሽወሪ</month>
-							<month type="12">ተሕሳስሪ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">ካ</month>
-							<month type="3">ክ</month>
-							<month type="4">�</month>
-							<month type="5">ክ</month>
-							<month type="6">�</month>
-							<month type="7">ኰ</month>
-							<month type="8">ማ</month>
-							<month type="9">á‹«</month>
-							<month type="10">መ</month>
-							<month type="11">�</month>
-							<month type="12">ተ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ሰ/ቅ</day>
-							<day type="mon">ሰኑ</day>
-							<day type="tue">ሰሊ�</day>
-							<day type="wed">ለጓ</day>
-							<day type="thu">ኣ�ድ</day>
-							<day type="fri">ኣርብ</day>
-							<day type="sat">ሰ/ሽ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ሰንበር ቅዳዅ</day>
-							<day type="mon">ሰኑ</day>
-							<day type="tue">ሰሊ�</day>
-							<day type="wed">ለጓ ወሪ ለብዋ</day>
-							<day type="thu">ኣ�ድ</day>
-							<day type="fri">ኣርብ</day>
-							<day type="sat">ሰንበር ሽጓዅ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ሰ</day>
-							<day type="mon">ሰ</day>
-							<day type="tue">ሰ</day>
-							<day type="wed">ለ</day>
-							<day type="thu">ኣ</day>
-							<day type="fri">ኣ</day>
-							<day type="sat">ሰ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>�ዱስ ጃብ</am>
-				<pm>�ዱስ ደ�ቢ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">ይጅ</era>
-						<era type="1">ኣድ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM �ርጋ y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>አ�ሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/byn_ER.xml b/airtime_mvc/library/Zend/Locale/Data/byn_ER.xml
deleted file mode 100644
index 4eb45bd6e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/byn_ER.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="byn"/>
-		<territory type="ER"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ca.xml b/airtime_mvc/library/Zend/Locale/Data/ca.xml
deleted file mode 100644
index 694809fcc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ca.xml
+++ /dev/null
@@ -1,3252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.109 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ca"/>
-	</identity>
-	<fallback>es_ES</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">àfar</language>
-			<language type="ab">abkhaz</language>
-			<language type="ace">atjeh</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adigué</language>
-			<language type="ae">avèstic</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">llengua afroasiàtica</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">àkan</language>
-			<language type="akk">accadi</language>
-			<language type="ale">aleuta</language>
-			<language type="alg">llengua algonquina</language>
-			<language type="alt">altaic meridional</language>
-			<language type="am">amhàric</language>
-			<language type="an">aragonès</language>
-			<language type="ang">anglès antic</language>
-			<language type="anp">angika</language>
-			<language type="apa">llengua apatxe</language>
-			<language type="ar">àrab</language>
-			<language type="arc">arameu</language>
-			<language type="arn">araucà</language>
-			<language type="arp">arapaho</language>
-			<language type="art">llengua artificial</language>
-			<language type="arw">arauac</language>
-			<language type="as">assamès</language>
-			<language type="ast">asturià</language>
-			<language type="ath">llengua atapascana</language>
-			<language type="aus">llengua australiana</language>
-			<language type="av">àvar</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aimara</language>
-			<language type="az">àzeri</language>
-			<language type="ba">baixkir</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileké</language>
-			<language type="bal">balutxi</language>
-			<language type="ban">balinès</language>
-			<language type="bas">basa</language>
-			<language type="bat">llengua bàltica</language>
-			<language type="be">bielorús</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berber</language>
-			<language type="bg">búlgar</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bicol</language>
-			<language type="bin">bini</language>
-			<language type="bla">blackfoot</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalí</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetà</language>
-			<language type="br">bretó</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnià</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriat</language>
-			<language type="bug">bugui</language>
-			<language type="byn">bilin</language>
-			<language type="ca">català</language>
-			<language type="cad">caddo</language>
-			<language type="cai">llengua ameríndia d'Amèrica Central</language>
-			<language type="car">carib</language>
-			<language type="cau">llengua caucàsica</language>
-			<language type="cch">atsam</language>
-			<language type="ce">txetxè</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">llengua cèltica</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">txibtxa</language>
-			<language type="chg">txagatai</language>
-			<language type="chk">chuuk</language>
-			<language type="chm">mari</language>
-			<language type="chn">pidgin chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">xeienne</language>
-			<language type="cmc">txam</language>
-			<language type="co">cors</language>
-			<language type="cop">copte</language>
-			<language type="cpe">llengua criolla o pidgin basada en l'anglès</language>
-			<language type="cpf">llengua criolla o pidgin basada en el francès</language>
-			<language type="cpp">llengua criolla o pidgin basada en el portuguès</language>
-			<language type="cr">cree</language>
-			<language type="crh">tàtar de Crimea</language>
-			<language type="crp">llengua criolla o pidgin</language>
-			<language type="cs">txec</language>
-			<language type="csb">caixubi</language>
-			<language type="cu">eslau eclesiàstic</language>
-			<language type="cus">llengua cuixítica</language>
-			<language type="cv">txuvaix</language>
-			<language type="cy">gal·lès</language>
-			<language type="da">danès</language>
-			<language type="dak">dakota</language>
-			<language type="dar">darguà</language>
-			<language type="day">daiak</language>
-			<language type="de">alemany</language>
-			<language type="de_AT">alemany austríac</language>
-			<language type="de_CH">alt alemany suís</language>
-			<language type="del">delaware</language>
-			<language type="den">slavey</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">llengua dravídica</language>
-			<language type="dsb">baix sòrab</language>
-			<language type="dua">duala</language>
-			<language type="dum">neerlandès mitjà</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">jula</language>
-			<language type="dz">dzongka</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">egipci antic</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grec</language>
-			<language type="elx">elamita</language>
-			<language type="en">anglès</language>
-			<language type="en_AU">anglès australià</language>
-			<language type="en_CA">anglès canadenc</language>
-			<language type="en_GB">anglès britànic</language>
-			<language type="en_US">anglès americà</language>
-			<language type="enm">anglès mitjà</language>
-			<language type="eo">esperanto</language>
-			<language type="es">espanyol</language>
-			<language type="es_419">espanyol d'Hispanoamèrica</language>
-			<language type="es_ES">espanyol d'Espanya</language>
-			<language type="et">estonià</language>
-			<language type="eu">basc</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persa</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">ful</language>
-			<language type="fi">finès</language>
-			<language type="fil">filipí</language>
-			<language type="fiu">llengua finoúgrica</language>
-			<language type="fj">fijià</language>
-			<language type="fo">feroès</language>
-			<language type="fon">fon</language>
-			<language type="fr">francès</language>
-			<language type="fr_CA">francès canadenc</language>
-			<language type="fr_CH">francès suís</language>
-			<language type="frm">francès mitjà</language>
-			<language type="fro">francès antic</language>
-			<language type="frr">frisó septentrional</language>
-			<language type="frs">frisó occidental</language>
-			<language type="fur">friülà</language>
-			<language type="fy">frisó oriental</language>
-			<language type="ga">irlandès</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">gaèlic escocès</language>
-			<language type="gem">llengua germànica</language>
-			<language type="gez">gueez</language>
-			<language type="gil">gilbertès</language>
-			<language type="gl">gallec</language>
-			<language type="gmh">alt alemany mitjà</language>
-			<language type="gn">guaraní</language>
-			<language type="goh">alt alemany antic</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gòtic</language>
-			<language type="grb">grebo</language>
-			<language type="grc">grec antic</language>
-			<language type="gsw">alemany suís</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichin</language>
-			<language type="ha">haussa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaià</language>
-			<language type="he">hebreu</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligainon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hitita</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croat</language>
-			<language type="hsb">alt sòrab</language>
-			<language type="ht">haitià</language>
-			<language type="hu">hongarès</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armeni</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesi</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">yi sichuan</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">ilocà</language>
-			<language type="inc">llengua índica</language>
-			<language type="ine">llengua indoeuropea</language>
-			<language type="inh">ingúix</language>
-			<language type="io">ido</language>
-			<language type="ira">llengua irànica</language>
-			<language type="iro">iroquès</language>
-			<language type="is">islandès</language>
-			<language type="it">italià</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japonès</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judeopersa</language>
-			<language type="jrb">judeoàrab</language>
-			<language type="jv">javanès</language>
-			<language type="ka">georgià</language>
-			<language type="kaa">karakalpak</language>
-			<language type="kab">cabilenc</language>
-			<language type="kac">katxin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardí</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">llengua khoisan</language>
-			<language type="kho">khotanès</language>
-			<language type="ki">kikuiu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazakh</language>
-			<language type="kl">grenlandès</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">coreà</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraeà</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karatxai</language>
-			<language type="krl">carelià</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">caixmiri</language>
-			<language type="ku">kurd</language>
-			<language type="kum">kúmik</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">còrnic</language>
-			<language type="ky">kirguís</language>
-			<language type="la">llatí</language>
-			<language type="lad">ladí</language>
-			<language type="lah">panjabi occidental</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburguès</language>
-			<language type="lez">lesguià</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburguès</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosià</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituà</language>
-			<language type="lu">luba katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luisenyo</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">mizo</language>
-			<language type="lv">letó</language>
-			<language type="mad">madurès</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makassar</language>
-			<language type="man">mandinga</language>
-			<language type="map">llengua austronèsia</language>
-			<language type="mas">massai</language>
-			<language type="mdf">mordovià moksa</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgaix</language>
-			<language type="mga">gaèlic irlandès mitjà</language>
-			<language type="mh">marshallès</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">llengua miscel·lània</language>
-			<language type="mk">macedoni</language>
-			<language type="mkh">llengua monkhmer</language>
-			<language type="ml">malaialam</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">manxú</language>
-			<language type="mni">manipurí</language>
-			<language type="mno">llengua manobo</language>
-			<language type="mo">moldau</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">moré</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malai</language>
-			<language type="mt">maltès</language>
-			<language type="mul">llengües vàries</language>
-			<language type="mun">llengua munda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandès</language>
-			<language type="mwr">marwari</language>
-			<language type="my">birmà</language>
-			<language type="myn">llengua maia</language>
-			<language type="myv">mordovià erza</language>
-			<language type="na">nauruà</language>
-			<language type="nah">nàhuatl</language>
-			<language type="nai">llengua ameríndia septentrional</language>
-			<language type="nap">napolità</language>
-			<language type="nb">noruec bokmål</language>
-			<language type="nd">ndebele septentrional</language>
-			<language type="nds">baix alemany</language>
-			<language type="ne">nepalès</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">llengua nigerokurdufaniana</language>
-			<language type="niu">niueà</language>
-			<language type="nl">neerlandès</language>
-			<language type="nl_BE">flamenc</language>
-			<language type="nn">noruec nynorsk</language>
-			<language type="no">noruec</language>
-			<language type="nog">nogai</language>
-			<language type="non">nòrdic antic</language>
-			<language type="nqo">n’Ko</language>
-			<language type="nr">ndebele meridional</language>
-			<language type="nso">sotho septentrional</language>
-			<language type="nub">llengua nubiana</language>
-			<language type="nv">navaho</language>
-			<language type="nwc">newari clàssic</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwesi</language>
-			<language type="nyn">nyankore</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzema</language>
-			<language type="oc">occità</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">osset</language>
-			<language type="osa">osage</language>
-			<language type="ota">turc otomà</language>
-			<language type="oto">llengua otomangueana</language>
-			<language type="pa">panjabi</language>
-			<language type="paa">llengua papú</language>
-			<language type="pag">pangasi</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampangà</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauà</language>
-			<language type="peo">persa antic</language>
-			<language type="phi">llengua filipina</language>
-			<language type="phn">fenici</language>
-			<language type="pi">pali</language>
-			<language type="pl">polonès</language>
-			<language type="pon">ponapeà</language>
-			<language type="pra">pràcrit</language>
-			<language type="pro">provençal antic</language>
-			<language type="ps">paixto</language>
-			<language type="pt">portuguès</language>
-			<language type="pt_BR">portuguès de Brasil</language>
-			<language type="pt_PT">portuguès de Portugal</language>
-			<language type="qu">quètxua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongà</language>
-			<language type="rm">retoromànic</language>
-			<language type="rn">rundi</language>
-			<language type="ro">romanès</language>
-			<language type="roa">llengua romànica</language>
-			<language type="rom">romaní</language>
-			<language type="root">arrel</language>
-			<language type="ru">rus</language>
-			<language type="rup">aromanès</language>
-			<language type="rw">ruandès</language>
-			<language type="sa">sànscrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">iacut</language>
-			<language type="sai">llengua ameríndia meridional</language>
-			<language type="sal">llengua salish</language>
-			<language type="sam">arameu samarità</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sard</language>
-			<language type="scn">sicilià</language>
-			<language type="sco">escocès</language>
-			<language type="sd">sindhi</language>
-			<language type="se">sami septentrional</language>
-			<language type="sel">selkup</language>
-			<language type="sem">llengua semítica</language>
-			<language type="sg">sango</language>
-			<language type="sga">irlandès antic</language>
-			<language type="sgn">llengua de signes</language>
-			<language type="sh">serbocroat</language>
-			<language type="shn">xan</language>
-			<language type="si">singalès</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">llengua sioux</language>
-			<language type="sit">llengua sinotibetana</language>
-			<language type="sk">eslovac</language>
-			<language type="sl">eslovè</language>
-			<language type="sla">llengua eslava</language>
-			<language type="sm">samoà</language>
-			<language type="sma">sami meridional</language>
-			<language type="smi">llengua sami</language>
-			<language type="smj">sami lule</language>
-			<language type="smn">sami d'Inari</language>
-			<language type="sms">sami skolt</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdià</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanès</language>
-			<language type="sr">serbi</language>
-			<language type="srn">sranan</language>
-			<language type="srr">serer</language>
-			<language type="ss">siswati</language>
-			<language type="ssa">llengua nilosahariana</language>
-			<language type="st">sotho meridional</language>
-			<language type="su">sundanès</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susú</language>
-			<language type="sux">sumeri</language>
-			<language type="sv">suec</language>
-			<language type="sw">suahili</language>
-			<language type="syc">siríac clàssic</language>
-			<language type="syr">siríac</language>
-			<language type="ta">tàmil</language>
-			<language type="tai">llengua tai</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">terena</language>
-			<language type="tet">tetun</language>
-			<language type="tg">tadjik</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinya</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turcman</language>
-			<language type="tkl">tokelauès</language>
-			<language type="tl">tagàlog</language>
-			<language type="tlh">klingonià</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamazight</language>
-			<language type="tn">tswana</language>
-			<language type="to">tongalès</language>
-			<language type="tog">tonga</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turc</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshià</language>
-			<language type="tt">tàtar</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">llengua tupí</language>
-			<language type="tut">llengua altaica</language>
-			<language type="tvl">tuvaluà</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitià</language>
-			<language type="tyv">tuvinià</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigur</language>
-			<language type="uga">ugarític</language>
-			<language type="uk">ucraïnès</language>
-			<language type="umb">umbundu</language>
-			<language type="und">idioma desconegut o no vàlid</language>
-			<language type="ur">urdú</language>
-			<language type="uz">uzbek</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamita</language>
-			<language type="vo">volapük</language>
-			<language type="vot">vòtic</language>
-			<language type="wa">való</language>
-			<language type="wak">llengua wakash</language>
-			<language type="wal">ameto</language>
-			<language type="war">waray-waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sòrab</language>
-			<language type="wo">wòlof</language>
-			<language type="xal">calmuc</language>
-			<language type="xh">xosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapeà</language>
-			<language type="yi">jiddisch</language>
-			<language type="yo">ioruba</language>
-			<language type="ypk">llengua iupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapoteca</language>
-			<language type="zbl">símbols Bliss</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">xinès</language>
-			<language type="zh_Hans">xinès simplificat</language>
-			<language type="zh_Hant">xinès tradicional</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">sense contingut lingüístic</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">àrab</script>
-			<script type="Armi">arameu imperial</script>
-			<script type="Armn">armeni</script>
-			<script type="Avst">avèstic</script>
-			<script type="Bali">balinès</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalí</script>
-			<script type="Blis">símbols Bliss</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginès</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">síl·labes dels aborígens canadencs unificats</script>
-			<script type="Cari">carià</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">copte</script>
-			<script type="Cprt">xipriota</script>
-			<script type="Cyrl">ciríl·lic</script>
-			<script type="Cyrs">ciríl·lic de l'antic eslau eclesiàstic</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">demòtic egipci</script>
-			<script type="Egyh">hieràtic egipci</script>
-			<script type="Egyp">jeroglífic egipci</script>
-			<script type="Ethi">etiòpic</script>
-			<script type="Geok">georgià hucuri</script>
-			<script type="Geor">georgià</script>
-			<script type="Glag">glagolític</script>
-			<script type="Goth">gòtic</script>
-			<script type="Grek">grec</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">xinès simplificat</script>
-			<script type="Hant">xinès tradicional</script>
-			<script type="Hebr">hebreu</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana o hiragana</script>
-			<script type="Hung">hongarès antic</script>
-			<script type="Inds">escriptura de la vall de l'Indus</script>
-			<script type="Ital">cursiva antiga</script>
-			<script type="Java">javanès</script>
-			<script type="Jpan">japonès</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharosthi</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">coreà</script>
-			<script type="Kthi">kaithi</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">llatí fraktur</script>
-			<script type="Latg">llatí gaèlic</script>
-			<script type="Latn">llatí</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineal A</script>
-			<script type="Linb">lineal B</script>
-			<script type="Lyci">lici</script>
-			<script type="Lydi">lidi</script>
-			<script type="Mand">mandaic</script>
-			<script type="Mani">maniqueu</script>
-			<script type="Maya">jeroglífics maies</script>
-			<script type="Mero">meroític</script>
-			<script type="Mlym">malaialam</script>
-			<script type="Mong">mongol</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">manipurí</script>
-			<script type="Mymr">birmà</script>
-			<script type="Nkoo">n’Ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">santali</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">antic pèrmic</script>
-			<script type="Phag">phagspa</script>
-			<script type="Phli">pahlavi inscripcional</script>
-			<script type="Phlp">psalter pahlavi</script>
-			<script type="Phlv">pahlavi</script>
-			<script type="Phnx">fenici</script>
-			<script type="Plrd">Pollard Miao</script>
-			<script type="Prti">parthià inscripcional</script>
-			<script type="Qaai">heretat</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongo-rongo</script>
-			<script type="Runr">rúnic</script>
-			<script type="Samr">samarità</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">shavià</script>
-			<script type="Sinh">singalès</script>
-			<script type="Sund">sundanès</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">siríac</script>
-			<script type="Syre">siríac estrangelo</script>
-			<script type="Syrj">siríac occidental</script>
-			<script type="Syrn">siríac oriental</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">nou tai lue</script>
-			<script type="Taml">tàmil</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagàlog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tailandès</script>
-			<script type="Tibt">tibetà</script>
-			<script type="Ugar">ugarític</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">llenguatge visible</script>
-			<script type="Xpeo">persa antic</script>
-			<script type="Xsux">cuneïforme sumeri-accadi</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">notació matemàtica</script>
-			<script type="Zsym">símbols</script>
-			<script type="Zxxx">sense escriptura</script>
-			<script type="Zyyy">comú</script>
-			<script type="Zzzz">escriptura desconeguda o no vàlida</script>
-		</scripts>
-		<territories>
-			<territory type="001">Món</territory>
-			<territory type="002">Àfrica</territory>
-			<territory type="003">Amèrica del Nord</territory>
-			<territory type="005">Amèrica del Sud</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Àfrica Occidental</territory>
-			<territory type="013">Amèrica Central</territory>
-			<territory type="014">Àfrica Oriental</territory>
-			<territory type="015">Àfrica septentrional</territory>
-			<territory type="017">Àfrica Central</territory>
-			<territory type="018">Àfrica meridional</territory>
-			<territory type="019">Amèrica</territory>
-			<territory type="021">Amèrica septentrional</territory>
-			<territory type="029">Carib</territory>
-			<territory type="030">Àsia Oriental</territory>
-			<territory type="034">Àsia meridional</territory>
-			<territory type="035">Àsia Sud-oriental</territory>
-			<territory type="039">Europa meridional</territory>
-			<territory type="053">Austràlia i Nova Zelanda</territory>
-			<territory type="054">Melanèsia</territory>
-			<territory type="057">Regió de la Micronèsia</territory>
-			<territory type="061">Polinèsia</territory>
-			<territory type="062">Àsia Sud-central</territory>
-			<territory type="142">Àsia</territory>
-			<territory type="143">Àsia Central</territory>
-			<territory type="145">Àsia Occidental</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa Oriental</territory>
-			<territory type="154">Europa septentrional</territory>
-			<territory type="155">Europa Occidental</territory>
-			<territory type="172">Comunitat d'Estats Independents</territory>
-			<territory type="419">Amèrica Llatina i Carib</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Unió dels Emirats Àrabs</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua i Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albània</territory>
-			<territory type="AM">Armènia</territory>
-			<territory type="AN">Antilles Neerlandeses</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antàrtida</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americana</territory>
-			<territory type="AT">Àustria</territory>
-			<territory type="AU">Austràlia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Illes Ã…land</territory>
-			<territory type="AZ">Azerbaidjan</territory>
-			<territory type="BA">Bòsnia i Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangla Desh</territory>
-			<territory type="BE">Bèlgica</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgària</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benín</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermudes</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolívia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahames</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Illa Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorússia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canadà</territory>
-			<territory type="CC">Illes Cocos</territory>
-			<territory type="CD">República Democràtica del Congo</territory>
-			<territory type="CF">República Centreafricana</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suïssa</territory>
-			<territory type="CI">Costa d’Ivori</territory>
-			<territory type="CK">Illes Cook</territory>
-			<territory type="CL">Xile</territory>
-			<territory type="CM">Camerun</territory>
-			<territory type="CN">Xina</territory>
-			<territory type="CO">Colòmbia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Sèrbia i Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cap Verd</territory>
-			<territory type="CX">Illa Christmas</territory>
-			<territory type="CY">Xipre</territory>
-			<territory type="CZ">República Txeca</territory>
-			<territory type="DE">Alemanya</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Dinamarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">República Dominicana</territory>
-			<territory type="DZ">Algèria</territory>
-			<territory type="EC">Equador</territory>
-			<territory type="EE">Estònia</territory>
-			<territory type="EG">Egipte</territory>
-			<territory type="EH">Sàhara Occidental</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Espanya</territory>
-			<territory type="ET">Etiòpia</territory>
-			<territory type="FI">Finlàndia</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Illes Malvines</territory>
-			<territory type="FM">Micronèsia</territory>
-			<territory type="FO">Illes Fèroe</territory>
-			<territory type="FR">França</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Regne Unit</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Geòrgia</territory>
-			<territory type="GF">Guaiana Francesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grenlàndia</territory>
-			<territory type="GM">Gàmbia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Guinea Equatorial</territory>
-			<territory type="GR">Grècia</territory>
-			<territory type="GS">Illes Geòrgia del Sud i Sandwich del Sud</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Regió administrativa especial xinesa de Hong Kong</territory>
-			<territory type="HM">Illa Heard i Illes McDonald</territory>
-			<territory type="HN">Hondures</territory>
-			<territory type="HR">Croàcia</territory>
-			<territory type="HT">Haití</territory>
-			<territory type="HU">Hongria</territory>
-			<territory type="ID">Indonèsia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Illa de Man</territory>
-			<territory type="IN">�ndia</territory>
-			<territory type="IO">Territori Britànic de l'Oceà �ndic</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islàndia</territory>
-			<territory type="IT">Itàlia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordània</territory>
-			<territory type="JP">Japó</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirguizistan</territory>
-			<territory type="KH">Cambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comores</territory>
-			<territory type="KN">Saint Christopher i Nevis</territory>
-			<territory type="KP">Corea del Nord</territory>
-			<territory type="KR">Corea del Sud</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Illes Caiman</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Líban</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Libèria</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituània</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Letònia</territory>
-			<territory type="LY">Líbia</territory>
-			<territory type="MA">Marroc</territory>
-			<territory type="MC">Mònaco</territory>
-			<territory type="MD">Moldàvia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Illes Marshall</territory>
-			<territory type="MK">Macedònia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongòlia</territory>
-			<territory type="MO">Regió administrativa especial xinesa de Macau</territory>
-			<territory type="MP">Illes Mariannes del Nord</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritània</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Maurici</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mèxic</territory>
-			<territory type="MY">Malàisia</territory>
-			<territory type="MZ">Moçambic</territory>
-			<territory type="NA">Namíbia</territory>
-			<territory type="NC">Nova Caledònia</territory>
-			<territory type="NE">Níger</territory>
-			<territory type="NF">Illa Norfolk</territory>
-			<territory type="NG">Nigèria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Països Baixos</territory>
-			<territory type="NO">Noruega</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nova Zelanda</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panamà</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Polinèsia Francesa</territory>
-			<territory type="PG">Papua Nova Guinea</territory>
-			<territory type="PH">Filipines</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polònia</territory>
-			<territory type="PM">Saint Pierre i Miquelon</territory>
-			<territory type="PN">Illes Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguai</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Territoris allunyats d'Oceania</territory>
-			<territory type="QU">Unió Europea</territory>
-			<territory type="RE">Illa de la Reunió</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Sèrbia</territory>
-			<territory type="RU">Rússia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Aràbia Saudita</territory>
-			<territory type="SB">Illes Salomó</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Suècia</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Eslovènia</territory>
-			<territory type="SJ">Svalbard i Jan Mayen</territory>
-			<territory type="SK">Eslovàquia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somàlia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé i Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Síria</territory>
-			<territory type="SZ">Swazilàndia</territory>
-			<territory type="TC">Illes Turks i Caicos</territory>
-			<territory type="TD">Txad</territory>
-			<territory type="TF">Territoris Francesos del Sud</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailàndia</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Oriental</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunísia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquia</territory>
-			<territory type="TT">Trinitat i Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzània</territory>
-			<territory type="UA">Ucraïna</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Illes Perifèriques Menors dels EUA</territory>
-			<territory type="US">Estats Units</territory>
-			<territory type="UY">Uruguai</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vaticà</territory>
-			<territory type="VC">Saint Vincent i les Grenadines</territory>
-			<territory type="VE">Veneçuela</territory>
-			<territory type="VG">Illes Verges Britàniques</territory>
-			<territory type="VI">Illes Verges Nord-americanes</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis i Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Iemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">República de Sud-àfrica</territory>
-			<territory type="ZM">Zàmbia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Regió desconeguda o no vàlida</territory>
-		</territories>
-		<variants>
-			<variant type="1901">ortografia alemanya tradicional</variant>
-			<variant type="1994">ortofrafia resiana estandarditzada</variant>
-			<variant type="1996">ortografia alemanya de 1996</variant>
-			<variant type="1606NICT">francès mitjà tardà fins el 1606</variant>
-			<variant type="1694ACAD">francès modern primerenc</variant>
-			<variant type="AREVELA">armeni oriental</variant>
-			<variant type="AREVMDA">armeni occidental</variant>
-			<variant type="BAKU1926">alfabet llatí turc unificat</variant>
-			<variant type="BISKE">dialecte de San Giorgio/Bila</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">alfabet fonètic internacional</variant>
-			<variant type="FONUPA">sistema fonètic UPA</variant>
-			<variant type="LIPAW">dialecte Lipovaz del resià</variant>
-			<variant type="MONOTON">monotònic</variant>
-			<variant type="NEDIS">dialecte de Natisone</variant>
-			<variant type="NJIVA">dialecte de Gniva/Njiva</variant>
-			<variant type="OSOJS">dialecte d'Oseacco/Osojane</variant>
-			<variant type="POLYTON">politònic</variant>
-			<variant type="POSIX">ordenador</variant>
-			<variant type="REVISED">ortografia revisada</variant>
-			<variant type="ROZAJ">resià</variant>
-			<variant type="SAAHO">saho</variant>
-			<variant type="SCOTLAND">anglès estàndard d'Escòcia</variant>
-			<variant type="SCOUSE">scouse</variant>
-			<variant type="SOLBA">dialecte de Stolvizza/Solbica</variant>
-			<variant type="TARASK">ortografia taraskievica</variant>
-			<variant type="VALENCIA">valencià</variant>
-		</variants>
-		<keys>
-			<key type="calendar">calendari</key>
-			<key type="collation">ordre alfabètic</key>
-			<key type="currency">moneda</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">ordre del xinès tradicional - Big5</type>
-			<type type="buddhist" key="calendar">calendari budista</type>
-			<type type="chinese" key="calendar">calendari xinès</type>
-			<type type="direct" key="collation">ordre directe</type>
-			<type type="gb2312han" key="collation">ordre del xinès simplificat - GB2312</type>
-			<type type="gregorian" key="calendar">calendari gregorià</type>
-			<type type="hebrew" key="calendar">calendari hebreu</type>
-			<type type="indian" key="calendar">calendari hindú</type>
-			<type type="islamic" key="calendar">calendari musulmà</type>
-			<type type="islamic-civil" key="calendar">calendari civil islàmic</type>
-			<type type="japanese" key="calendar">calendari japonès</type>
-			<type type="phonebook" key="collation">ordre de la guia telefònica</type>
-			<type type="pinyin" key="collation">ordre pinyin</type>
-			<type type="roc" key="calendar">calendari de la República Popular de Xina</type>
-			<type type="stroke" key="collation">ordre dels traços</type>
-			<type type="traditional" key="collation">ordre tradicional</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">mètric</measurementSystemName>
-			<measurementSystemName type="US">imperial</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Idioma: {0}</codePattern>
-			<codePattern type="script">Escriptura: {0}</codePattern>
-			<codePattern type="territory">Regió: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à b c ç d e é è f-i í ï j-l ŀ m-o ó ò p-u ú ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á ă â å ä ã � æ ĕ ê ë ē ì ĭ î ī ñ º � ô ö ø � œ ß ù ŭ û ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">gen.</month>
-							<month type="2">febr.</month>
-							<month type="3">març</month>
-							<month type="4">abr.</month>
-							<month type="5">maig</month>
-							<month type="6">juny</month>
-							<month type="7">jul.</month>
-							<month type="8">ag.</month>
-							<month type="9">set.</month>
-							<month type="10">oct.</month>
-							<month type="11">nov.</month>
-							<month type="12">des.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">gener</month>
-							<month type="2">febrer</month>
-							<month type="3">març</month>
-							<month type="4">abril</month>
-							<month type="5">maig</month>
-							<month type="6">juny</month>
-							<month type="7">juliol</month>
-							<month type="8">agost</month>
-							<month type="9">setembre</month>
-							<month type="10">octubre</month>
-							<month type="11">novembre</month>
-							<month type="12">desembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">g</month>
-							<month type="2">f</month>
-							<month type="3">m</month>
-							<month type="4">a</month>
-							<month type="5">m</month>
-							<month type="6">j</month>
-							<month type="7">j</month>
-							<month type="8">a</month>
-							<month type="9">s</month>
-							<month type="10">o</month>
-							<month type="11">n</month>
-							<month type="12">d</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dg.</day>
-							<day type="mon">dl.</day>
-							<day type="tue">dt.</day>
-							<day type="wed">dc.</day>
-							<day type="thu">dj.</day>
-							<day type="fri">dv.</day>
-							<day type="sat">ds.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">diumenge</day>
-							<day type="mon">dilluns</day>
-							<day type="tue">dimarts</day>
-							<day type="wed">dimecres</day>
-							<day type="thu">dijous</day>
-							<day type="fri">divendres</day>
-							<day type="sat">dissabte</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">dg</day>
-							<day type="mon">dl</day>
-							<day type="tue">dt</day>
-							<day type="wed">dc</day>
-							<day type="thu">dj</day>
-							<day type="fri">dv</day>
-							<day type="sat">ds</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">g</day>
-							<day type="mon">l</day>
-							<day type="tue">t</day>
-							<day type="wed">c</day>
-							<day type="thu">j</day>
-							<day type="fri">v</day>
-							<day type="sat">s</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1T</quarter>
-							<quarter type="2">2T</quarter>
-							<quarter type="3">3T</quarter>
-							<quarter type="4">4T</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1r trimestre</quarter>
-							<quarter type="2">2n trimestre</quarter>
-							<quarter type="3">3r trimestre</quarter>
-							<quarter type="4">4t trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">aC</era>
-						<era type="1">dC</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">E d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL 'del' y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM - d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM - E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y - MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM - d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y - d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM - E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y - E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM-yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>any</displayName>
-					</field>
-					<field type="month">
-						<displayName>mes</displayName>
-					</field>
-					<field type="week">
-						<displayName>setmana</displayName>
-					</field>
-					<field type="day">
-						<displayName>dia</displayName>
-						<relative type="-3">fa tres dies</relative>
-						<relative type="-2">abans d'ahir</relative>
-						<relative type="-1">ahir</relative>
-						<relative type="0">avui</relative>
-						<relative type="1">demà</relative>
-						<relative type="2">demà passat</relative>
-						<relative type="3">d'aquí a tres dies</relative>
-					</field>
-					<field type="weekday">
-						<displayName>dia de la setmana</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>a.m./p.m.</displayName>
-					</field>
-					<field type="hour">
-						<displayName>hora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minut</displayName>
-					</field>
-					<field type="second">
-						<displayName>segon</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Hora de: {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Zona desconeguda</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Pol sud</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brussel·les</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Río Branco</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belise</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zuric</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Illa de Pasqua</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumchi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotà</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cap Verd</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Pasqua</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Praga</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlín</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhaguen</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>El Caire</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Illes Canàries</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Hèlsinki</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Fèroe</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>París</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londres</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atenes</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Geòrgia del Sud</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Port Príncep</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublín</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tòquio</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seül</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caiman</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aqtaū</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aķtöbe</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Mònaco</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Maurici</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Les Maldives</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mèxic</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Numea</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Katmandú</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamà</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Tahití</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marqueses</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsòvia</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Açores</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunió</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscou</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnoiarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtxatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadyr'</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Estocolm</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damasc</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Illes Turks i Caicos</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunísia</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port Espanya</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kíev</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Dakota del Nord</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Dakota del Nord</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Nova York</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcanda</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Sant Vicenç</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Sant Tomàs</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Hora d'Àfrica Central</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Hora d'Àfrica Oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>Hora d'Àfrica Austral</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Hora d'Àfrica Occidental</standard>
-					<daylight>Hora d'estiu d'Àfrica Occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Hora central</generic>
-					<standard>Hora estàndard central</standard>
-					<daylight>Hora d'estiu central</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Hora oriental</generic>
-					<standard>Hora estàndard oriental</standard>
-					<daylight>Hora d'estiu oriental</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Hora de muntanya</generic>
-					<standard>Hora estàndard de muntanya</standard>
-					<daylight>Hora d'estiu de muntanya</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Hora del Pacífic</generic>
-					<standard>Hora estàndard del Pacífic</standard>
-					<daylight>Hora d'estiu del Pacífic</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Hora d'Aràbia</generic>
-					<standard>Hora estàndard d'Aràbia</standard>
-					<daylight>Hora d'estiu d'Aràbia</daylight>
-				</long>
-				<short>
-					<generic>AT (Aràbia)</generic>
-					<standard>AST (Aràbia)</standard>
-					<daylight>ADT (Aràbia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Hora de l'Atlàntic</generic>
-					<standard>Hora estàndard de l'Atlàntic</standard>
-					<daylight>Hora d'estiu de l'Atlàntic</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Hora estàndard de la Xina</standard>
-				</long>
-				<short>
-					<standard>CST (Xina)</standard>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>Hora d'Espanya</generic>
-					<standard>Hora Central Europea</standard>
-					<daylight>Hora Central Europea de l'estiu</daylight>
-				</long>
-				<short>
-					<generic>Hora d'Espanya</generic>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Hora d'Europa de l'Est</standard>
-					<daylight>Hora d'estiu d'Europa de l'Est</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Hora d'Europa Occidental</standard>
-					<daylight>Hora d'estiu d'Europa Occidental</daylight>
-				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Hora mitjana de Greenwich</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Hora estàndard de l'�ndia</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Hora estàndard d'Israel</standard>
-					<daylight>Hora d'estiu d'Israel</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Hora estàndard del Japó</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<standard>Hora estàndard de Corea</standard>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Hora de Kujbysev</standard>
-					<daylight>Hora d'estiu de Kujbysev</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Hora de Moscou</standard>
-					<daylight>Hora d'estiu de Moscou</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Hora de Samara</standard>
-					<daylight>Hora d'estiu de Samara</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Hora de Turquia</standard>
-					<daylight>Hora d'estiu de Turquia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Hora de Volgograd</standard>
-					<daylight>Hora d'estiu de Volgograd</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>pesseta andorrana</displayName>
-				<displayName count="one">pesseta andorrana</displayName>
-				<displayName count="other">pessetes andorranes</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>dirhem dels Emirats Àrabs Units</displayName>
-				<displayName count="one">dirhem dels Emirats Àrabs Units</displayName>
-				<displayName count="other">dirhems dels Emirats Àrabs Units</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afgani afganès (1927-2002)</displayName>
-				<displayName count="one">afgani afganès (AFA)</displayName>
-				<displayName count="other">afganis afganesos (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afgani afganès</displayName>
-				<displayName count="one">afgani afganès</displayName>
-				<displayName count="other">afganis afganesos</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>lek albanès</displayName>
-				<displayName count="one">lek albanès</displayName>
-				<displayName count="other">lekë albanesos</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram armeni</displayName>
-				<displayName count="one">dram armeni</displayName>
-				<displayName count="other">drams armenis</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>florí de les Antilles Neerlandeses</displayName>
-				<displayName count="one">florí de les Antilles Neerlandeses</displayName>
-				<displayName count="other">florins de les Antilles Neerlandeses</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>kwanza angolès</displayName>
-				<displayName count="one">kwanza angolès</displayName>
-				<displayName count="other">kwanzas angolesos</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>kwanza angolès (1977-1990)</displayName>
-				<displayName count="one">kwanza angolès (AOK)</displayName>
-				<displayName count="other">kwanzas angolesos (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>nou kwanza angolès (1990-2000)</displayName>
-				<displayName count="one">nou kwanza angolès (AON)</displayName>
-				<displayName count="other">nous kwanzas angolesos (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>kwanza angolès reajustat (1995-1999)</displayName>
-				<displayName count="one">kwanza angolès reajustat (AOR)</displayName>
-				<displayName count="other">kwanzas angolesos reajustats (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>austral argentí</displayName>
-				<displayName count="one">austral argentí</displayName>
-				<displayName count="other">australs argentins</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>peso argentí (1983-1985)</displayName>
-				<displayName count="one">peso argentí (ARP)</displayName>
-				<displayName count="other">pesos argentins (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>peso argentí</displayName>
-				<displayName count="one">peso argentí</displayName>
-				<displayName count="other">pesos argentins</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>xíling austríac</displayName>
-				<displayName count="one">xíling austríac</displayName>
-				<displayName count="other">xílings austríacs</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>dòlar australià</displayName>
-				<displayName count="one">dòlar australià</displayName>
-				<displayName count="other">dòlars australians</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>florí d'Aruba</displayName>
-				<displayName count="one">florí d'Aruba</displayName>
-				<displayName count="other">florins d'Aruba</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>manat azerbaidjanès (1993-2006)</displayName>
-				<displayName count="one">manat azerbaidjanès (AZM)</displayName>
-				<displayName count="other">manats azerbaidjanesos (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat azerbaidjanès</displayName>
-				<displayName count="one">manat azerbaidjanès</displayName>
-				<displayName count="other">manats azerbaidjanesos</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>dinar de Bòsnia i Hercegovina</displayName>
-				<displayName count="one">dinar de Bòsnia i Hercegovina</displayName>
-				<displayName count="other">dinars de Bòsnia i Hercegovina</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>marc convertible de Bòsnia i Hercegovina</displayName>
-				<displayName count="one">marc convertible de Bòsnia i Hercegovina</displayName>
-				<displayName count="other">marcs convertibles de Bòsnia i Hercegovina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>dòlar de Barbados</displayName>
-				<displayName count="one">dòlar de Barbados</displayName>
-				<displayName count="other">dòlars de Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka de Bangla Desh</displayName>
-				<displayName count="one">taka de Bangla Desh</displayName>
-				<displayName count="other">taka de Bangla Desh</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>franc belga (convertible)</displayName>
-				<displayName count="one">franc belga (convertible)</displayName>
-				<displayName count="other">francs belgues (convertibles)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>franc belga</displayName>
-				<displayName count="one">franc belga</displayName>
-				<displayName count="other">francs belgues</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>franc belga (financer)</displayName>
-				<displayName count="one">franc belga (financer)</displayName>
-				<displayName count="other">francs belgues (financers)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>lev fort búlgar</displayName>
-				<displayName count="one">lev fort búlgar</displayName>
-				<displayName count="other">leva forts búlgars</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>lev búlgar</displayName>
-				<displayName count="one">lev búlgar</displayName>
-				<displayName count="other">leva búlgars</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>dinar de Bahrain</displayName>
-				<displayName count="one">dinar de Bahrain</displayName>
-				<displayName count="other">dinars de Bahrain</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>franc de Burundi</displayName>
-				<displayName count="one">franc de Burundi</displayName>
-				<displayName count="other">francs de Burundi</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>dòlar de les Bermudes</displayName>
-				<displayName count="one">dòlar de les Bermudes</displayName>
-				<displayName count="other">dòlars de les Bermudes</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>dòlar de Brunei</displayName>
-				<displayName count="one">dòlar de Brunei</displayName>
-				<displayName count="other">dòlars de Brunei</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<displayName count="one">boliviano</displayName>
-				<displayName count="other">bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>peso bolivià</displayName>
-				<displayName count="one">peso bolivià</displayName>
-				<displayName count="other">pesos bolivians</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>MVDOL bolivià</displayName>
-				<displayName count="one">MVDOL bolivià</displayName>
-				<displayName count="other">MVDOL bolivians</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>cruzeiro novo brasiler (1967-1986)</displayName>
-				<displayName count="one">cruzeiro novo brasiler (BRB)</displayName>
-				<displayName count="other">cruzeiros novos brasilers (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>cruzado brasiler</displayName>
-				<displayName count="one">cruzado brasiler</displayName>
-				<displayName count="other">cruzados brasilers</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>cruzeiro brasiler (1990-1993)</displayName>
-				<displayName count="one">cruzeiro brasiler (BRE)</displayName>
-				<displayName count="other">cruzeiros brasilers (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>real brasiler</displayName>
-				<displayName count="one">real brasiler</displayName>
-				<displayName count="other">reais brasilers</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>cruzado novo brasiler</displayName>
-				<displayName count="one">cruzado novo brasiler</displayName>
-				<displayName count="other">cruzados novos brasilers</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>cruzeiro brasiler</displayName>
-				<displayName count="one">cruzeiro brasiler</displayName>
-				<displayName count="other">cruzeiros brasilers</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>dòlar de les Bahames</displayName>
-				<displayName count="one">dòlar de les Bahames</displayName>
-				<displayName count="other">dòlars de les Bahames</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum de Bhutan</displayName>
-				<displayName count="one">ngultrum de Bhutan</displayName>
-				<displayName count="other">ngultrums de Bhutan</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat birmà</displayName>
-				<displayName count="one">kyat birmà</displayName>
-				<displayName count="other">kyats birmans</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula de Botswana</displayName>
-				<displayName count="one">pula de Botswana</displayName>
-				<displayName count="other">pula de Botswana</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>nou ruble bielorús (1994-1999)</displayName>
-				<displayName count="one">nou ruble bielorús (BYB)</displayName>
-				<displayName count="other">nous rubles bielorussos (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>ruble bielorús</displayName>
-				<displayName count="one">ruble bielorús</displayName>
-				<displayName count="other">rubles bielorussos</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>dòlar de Belize</displayName>
-				<displayName count="one">dòlar de Belize</displayName>
-				<displayName count="other">dòlars de Belize</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>dòlar canadenc</displayName>
-				<displayName count="one">dòlar canadenc</displayName>
-				<displayName count="other">dòlars canadencs</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>franc congolès</displayName>
-				<displayName count="one">franc congolès</displayName>
-				<displayName count="other">francs congolesos</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>euro WIR</displayName>
-				<displayName count="one">euro WIR</displayName>
-				<displayName count="other">euros WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>franc suís</displayName>
-				<displayName count="one">franc suís</displayName>
-				<displayName count="other">francs suïssos</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>franc WIR</displayName>
-				<displayName count="one">franc WIR</displayName>
-				<displayName count="other">francs WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>unidad de fomento xilena</displayName>
-				<displayName count="one">unidad de fomento xilena</displayName>
-				<displayName count="other">unidades de fomento xilenes</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>peso xilè</displayName>
-				<displayName count="one">peso xilè</displayName>
-				<displayName count="other">pesos xilens</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>iuan renmimbi xinès</displayName>
-				<displayName count="one">iuan xinès</displayName>
-				<displayName count="other">iuan xinesos</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>peso colombià</displayName>
-				<displayName count="one">peso colombià</displayName>
-				<displayName count="other">pesos colombians</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>unidad de valor real colombiana</displayName>
-				<displayName count="one">unidad de valor real colombiana</displayName>
-				<displayName count="other">unidades de valor real colombianes</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>colón costa-riqueny</displayName>
-				<displayName count="one">colón costa-riqueny</displayName>
-				<displayName count="other">colones costa-riquenys</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>dinar serbi antic</displayName>
-				<displayName count="one">dinar serbi antic</displayName>
-				<displayName count="other">dinars serbis antics</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>corona forta txecoslovaca</displayName>
-				<displayName count="one">corona forta txecoslovaca</displayName>
-				<displayName count="other">corones fortes txecoslovaques</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>peso cubà</displayName>
-				<displayName count="one">peso cubà</displayName>
-				<displayName count="other">pesos cubans</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>escut de Cap Verd</displayName>
-				<displayName count="one">escut de Cap Verd</displayName>
-				<displayName count="other">escuts de Cap Verd</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>lliura xipriota</displayName>
-				<displayName count="one">lliura xipriota</displayName>
-				<displayName count="other">lliures xipriotes</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>corona txeca</displayName>
-				<displayName count="one">corona txeca</displayName>
-				<displayName count="other">corones txeques</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>marc de l'Alemanya Oriental</displayName>
-				<displayName count="one">marc de l'Alemanya Oriental</displayName>
-				<displayName count="other">marcs de l'Alemanya Oriental</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>marc alemany</displayName>
-				<displayName count="one">marc alemany</displayName>
-				<displayName count="other">marcs alemanys</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>franc de Djibouti</displayName>
-				<displayName count="one">franc de Djibouti</displayName>
-				<displayName count="other">francs de Djibouti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>corona danesa</displayName>
-				<displayName count="one">corona danesa</displayName>
-				<displayName count="other">corones daneses</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>peso dominicà</displayName>
-				<displayName count="one">peso dominicà</displayName>
-				<displayName count="other">pesos dominicans</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar algerià</displayName>
-				<displayName count="one">dinar algerià</displayName>
-				<displayName count="other">dinars algerians</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>sucre equatorià</displayName>
-				<displayName count="one">sucre equatorià</displayName>
-				<displayName count="other">sucres equatorians</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>unidad de valor constante (UVC) equatoriana</displayName>
-				<displayName count="one">unidad de valor constante (UVC) equatoriana</displayName>
-				<displayName count="other">unidades de valor constante (UVC) equatorianes</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>corona estoniana</displayName>
-				<displayName count="one">corona estoniana</displayName>
-				<displayName count="other">corones estonianes</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>lliura egípcia</displayName>
-				<displayName count="one">lliura egípcia</displayName>
-				<displayName count="other">lliures egípcies</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>nakfa eritreu</displayName>
-				<displayName count="one">nakfa eritreu</displayName>
-				<displayName count="other">nakfes eritreus</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>pesseta espanyola (compte A)</displayName>
-				<displayName count="one">pesseta espanyola (compte A)</displayName>
-				<displayName count="other">pessetes espanyoles (compte A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>pesseta espanyola (compte convertible)</displayName>
-				<displayName count="one">pesseta espanyola (compte convertible)</displayName>
-				<displayName count="other">pessetes espanyoles (compte convertible)</displayName>
-			</currency>
-			<currency type="ESP">
-				<pattern>¤ #,##0;-¤ #,##0</pattern>
-				<displayName>pesseta espanyola</displayName>
-				<displayName count="one">pesseta espanyola</displayName>
-				<displayName count="other">pessetes espanyoles</displayName>
-				<symbol>₧</symbol>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr etíop</displayName>
-				<displayName count="one">birr etíop</displayName>
-				<displayName count="other">birrs etíops</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>marc finlandès</displayName>
-				<displayName count="one">marc finlandès</displayName>
-				<displayName count="other">marcs finlandesos</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>dòlar fijià</displayName>
-				<displayName count="one">dòlar fijià</displayName>
-				<displayName count="other">dòlars fijians</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>lliura de les illes Malvines</displayName>
-				<displayName count="one">lliura de les illes Malvines</displayName>
-				<displayName count="other">lliures de les illes Malvines</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>franc francès</displayName>
-				<displayName count="one">franc francès</displayName>
-				<displayName count="other">francs francesos</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>lliura esterlina britànica</displayName>
-				<displayName count="one">lliura esterlina britànica</displayName>
-				<displayName count="other">lliures esterlines britàniques</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>cupó de lari georgià</displayName>
-				<displayName count="one">cupó de lari georgià</displayName>
-				<displayName count="other">cupons de lari georgians</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari georgià</displayName>
-				<displayName count="one">lari georgià</displayName>
-				<displayName count="other">laris georgians</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>cedi ghanès (1979-2007)</displayName>
-				<displayName count="one">cedi ghanès (GHC)</displayName>
-				<displayName count="other">cedis ghanesos (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>cedi ghanès</displayName>
-				<displayName count="one">cedi ghanès</displayName>
-				<displayName count="other">cedis ghanesos</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>lliura de Gibraltar</displayName>
-				<displayName count="one">lliura de Gibraltar</displayName>
-				<displayName count="other">lliures de Gibraltar</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi gambià</displayName>
-				<displayName count="one">dalasi gambià</displayName>
-				<displayName count="other">dalasis gambians</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>franc guineà</displayName>
-				<displayName count="one">franc guineà</displayName>
-				<displayName count="other">francs guineans</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>syli guineà</displayName>
-				<displayName count="one">syli guineà</displayName>
-				<displayName count="other">sylis guineans</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekwele de Guinea Equatorial</displayName>
-				<displayName count="one">ekwele de Guinea Equatorial</displayName>
-				<displayName count="other">bipkwele de Guinea Equatorial</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>dracma grega</displayName>
-				<displayName count="one">dracma grega</displayName>
-				<displayName count="other">dracmes gregues</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal guatemalenc</displayName>
-				<displayName count="one">quetzal guatemalenc</displayName>
-				<displayName count="other">quetzals guatemalencs</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>escut de la Guinea Portuguesa</displayName>
-				<displayName count="one">escut de la Guinea Portuguesa</displayName>
-				<displayName count="other">escuts de la Guinea Portuguesa</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso de Guinea Bissau</displayName>
-				<displayName count="one">peso de Guinea Bissau</displayName>
-				<displayName count="other">pesos de Guinea Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>dòlar de Guyana</displayName>
-				<displayName count="one">dòlar de Guyana</displayName>
-				<displayName count="other">dòlars de Guyana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>dòlar de Hong Kong</displayName>
-				<displayName count="one">dòlar de Hong Kong</displayName>
-				<displayName count="other">dòlars de Hong Kong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira hondurenya</displayName>
-				<displayName count="one">lempira hondurenya</displayName>
-				<displayName count="other">lempires hondurenyes</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>dinar croat</displayName>
-				<displayName count="one">dinar croat</displayName>
-				<displayName count="other">dinars croats</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna croata</displayName>
-				<displayName count="one">kuna croata</displayName>
-				<displayName count="other">kunes croates</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde haitià</displayName>
-				<displayName count="one">gourde haitià</displayName>
-				<displayName count="other">gourdes haitians</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>fòrint hongarès</displayName>
-				<displayName count="one">fòrint hongarès</displayName>
-				<displayName count="other">fòrints hongaresos</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>rupia indonèsia</displayName>
-				<displayName count="one">rupia indonèsia</displayName>
-				<displayName count="other">rupies indonèsies</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>lliura irlandesa</displayName>
-				<displayName count="one">lliura irlandesa</displayName>
-				<displayName count="other">lliures irlandeses</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>lliura israeliana</displayName>
-				<displayName count="one">lliura israeliana</displayName>
-				<displayName count="other">lliures israelianes</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>xéquel israelià</displayName>
-				<displayName count="one">xéquel israelià</displayName>
-				<displayName count="other">xéquel israelià</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>nou xéquel israelià</displayName>
-				<displayName count="one">nou xéquel israelià</displayName>
-				<displayName count="other">nous xéquels israelians</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>rupia índia</displayName>
-				<displayName count="one">rupia índia</displayName>
-				<displayName count="other">rupies índies</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar iraquià</displayName>
-				<displayName count="one">dinar iraquià</displayName>
-				<displayName count="other">dinars iraquians</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial iranià</displayName>
-				<displayName count="one">rial iranià</displayName>
-				<displayName count="other">rials iranians</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>corona islandesa antiga</displayName>
-				<displayName count="one">corona islandesa antiga</displayName>
-				<displayName count="other">corones islandeses antigues</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>corona islandesa</displayName>
-				<displayName count="one">corona islandesa</displayName>
-				<displayName count="other">corones islandeses</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>lira italiana</displayName>
-				<displayName count="one">lira italiana</displayName>
-				<displayName count="other">lires italianes</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>dòlar jamaicà</displayName>
-				<displayName count="one">dòlar jamaicà</displayName>
-				<displayName count="other">dòlars jamaicans</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar jordà</displayName>
-				<displayName count="one">dinar jordà</displayName>
-				<displayName count="other">dinars jordans</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ien japonès</displayName>
-				<displayName count="one">ien japonès</displayName>
-				<displayName count="other">iens japonesos</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>xíling kenyà</displayName>
-				<displayName count="one">xíling kenyà</displayName>
-				<displayName count="other">xílings kenyans</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>som kirguís</displayName>
-				<displayName count="one">som kirguís</displayName>
-				<displayName count="other">soms kirguisos</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel cambodjà</displayName>
-				<displayName count="one">riel cambodjà</displayName>
-				<displayName count="other">riels cambodjans</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>franc de les Comores</displayName>
-				<displayName count="one">franc de les Comores</displayName>
-				<displayName count="other">francs de les Comores</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>won nord-coreà</displayName>
-				<displayName count="one">won nord-coreà</displayName>
-				<displayName count="other">wons nord-coreans</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>won sud-coreà</displayName>
-				<displayName count="one">won sud-coreà</displayName>
-				<displayName count="other">wons sud-coreans</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar kuwaitià</displayName>
-				<displayName count="one">dinar kuwaitià</displayName>
-				<displayName count="other">dinars kuwaitians</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>dòlar de les illes Caiman</displayName>
-				<displayName count="one">dòlar de les illes Caiman</displayName>
-				<displayName count="other">dòlars de les illes Caiman</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>tenge kazakh</displayName>
-				<displayName count="one">tenge kazakh</displayName>
-				<displayName count="other">tenges kazakhs</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip laosià</displayName>
-				<displayName count="one">kip laosià</displayName>
-				<displayName count="other">kips laosians</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>lliura libanesa</displayName>
-				<displayName count="one">lliura libanesa</displayName>
-				<displayName count="other">lliures libaneses</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>rupia de Sri Lanka</displayName>
-				<displayName count="one">rupia de Sri Lanka</displayName>
-				<displayName count="other">rupies de Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>dòlar liberià</displayName>
-				<displayName count="one">dòlar liberià</displayName>
-				<displayName count="other">dòlars liberians</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>loti de Lesotho</displayName>
-				<displayName count="one">loti de Lesotho</displayName>
-				<displayName count="other">maloti de Lesotho</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litas lituà</displayName>
-				<displayName count="one">litas lituà</displayName>
-				<displayName count="other">litai lituans</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>talonas lituà</displayName>
-				<displayName count="one">talonas lituà</displayName>
-				<displayName count="other">talonai lituans</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>franc convertible luxemburguès</displayName>
-				<displayName count="one">franc convertible luxemburguès</displayName>
-				<displayName count="other">francs convertibles luxemburguesos</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>franc luxemburguès</displayName>
-				<displayName count="one">franc luxemburguès</displayName>
-				<displayName count="other">francs luxemburguesos</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>franc financer luxemburguès</displayName>
-				<displayName count="one">franc financer luxemburguès</displayName>
-				<displayName count="other">francs financers luxemburguesos</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>lats letó</displayName>
-				<displayName count="one">lats letó</displayName>
-				<displayName count="other">lati letons</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>ruble letó</displayName>
-				<displayName count="one">ruble letó</displayName>
-				<displayName count="other">rubles letons</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar libi</displayName>
-				<displayName count="one">dinar libi</displayName>
-				<displayName count="other">dinars libis</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>dírham marroquí</displayName>
-				<displayName count="one">dírham marroquí</displayName>
-				<displayName count="other">dírhams marroquins</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>franc marroquí</displayName>
-				<displayName count="one">franc marroquí</displayName>
-				<displayName count="other">francs marroquins</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>leu moldau</displayName>
-				<displayName count="one">leu moldau</displayName>
-				<displayName count="other">lei moldaus</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>ariary malgaix</displayName>
-				<displayName count="one">ariary malgaix</displayName>
-				<displayName count="other">ariarys malgaixos</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>franc malgaix</displayName>
-				<displayName count="one">franc malgaix</displayName>
-				<displayName count="other">francs malgaixos</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>denar macedoni</displayName>
-				<displayName count="one">denar macedoni</displayName>
-				<displayName count="other">denari macedonis</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>franc malià</displayName>
-				<displayName count="one">franc malià</displayName>
-				<displayName count="other">francs malians</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat de Myanmar</displayName>
-				<displayName count="one">kyat de Myanmar</displayName>
-				<displayName count="other">kyats de Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>tögrög mongol</displayName>
-				<displayName count="one">tögrög mongol</displayName>
-				<displayName count="other">tögrögs mongols</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>pataca de Macau</displayName>
-				<displayName count="one">pataca de Macau</displayName>
-				<displayName count="other">pataques de Macau</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>ouguiya maurità</displayName>
-				<displayName count="one">ouguiya maurità</displayName>
-				<displayName count="other">ouguiyas mauritans</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>lira maltesa</displayName>
-				<displayName count="one">lira maltesa</displayName>
-				<displayName count="other">lires malteses</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>lliura maltesa</displayName>
-				<displayName count="one">lliura maltesa</displayName>
-				<displayName count="other">lliures malteses</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>rupia de Maurici</displayName>
-				<displayName count="one">rupia de Maurici</displayName>
-				<displayName count="other">rupies de Maurici</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>rupia de les Maldives</displayName>
-				<displayName count="one">rupia de les Maldives</displayName>
-				<displayName count="other">rupies de les Maldives</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>kwacha malawià</displayName>
-				<displayName count="one">kwacha malawià</displayName>
-				<displayName count="other">kwachas malawians</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>peso mexicà</displayName>
-				<displayName count="one">peso mexicà</displayName>
-				<displayName count="other">pesos mexicans</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>peso de plata mexicà (1861-1992)</displayName>
-				<displayName count="one">peso de plata mexicà (MXP)</displayName>
-				<displayName count="other">pesos de plata mexicans (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>unidad de inversión (UDI) mexicana</displayName>
-				<displayName count="one">unidad de inversión (UDI) mexicana</displayName>
-				<displayName count="other">unidades de inversión (UDI) mexicanes</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit de Malàisia</displayName>
-				<displayName count="one">ringgit de Malàisia</displayName>
-				<displayName count="other">ringgits de Malàisia</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>escut moçambiquès</displayName>
-				<displayName count="one">escut moçambiquès</displayName>
-				<displayName count="other">escuts moçambiquesos</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>antic metical moçambiquès</displayName>
-				<displayName count="one">antic metical moçambiquès</displayName>
-				<displayName count="other">antics meticals moçambiquesos</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical moçambiquès</displayName>
-				<displayName count="one">metical moçambiquès</displayName>
-				<displayName count="other">meticals moçambiquesos</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>dòlar namibià</displayName>
-				<displayName count="one">dòlar namibià</displayName>
-				<displayName count="other">dòlars namibians</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>naira nigerià</displayName>
-				<displayName count="one">naira nigerià</displayName>
-				<displayName count="other">naires nigerians</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>córdoba nicaragüenca</displayName>
-				<displayName count="one">córdoba nicaragüenca</displayName>
-				<displayName count="other">córdobas nicaragüenques</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>córdoba oro nicaragüenca</displayName>
-				<displayName count="one">córdoba oro nicaragüenca</displayName>
-				<displayName count="other">córdobas oro nicaragüenques</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>florí neerlandès</displayName>
-				<displayName count="one">florí neerlandès</displayName>
-				<displayName count="other">florins neerlandesos</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>corona noruega</displayName>
-				<displayName count="one">corona noruega</displayName>
-				<displayName count="other">corones noruegues</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>rupia nepalesa</displayName>
-				<displayName count="one">rupia nepalesa</displayName>
-				<displayName count="other">rupies nepaleses</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>dòlar neozelandès</displayName>
-				<displayName count="one">dòlar neozelandès</displayName>
-				<displayName count="other">dòlars neozelandesos</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>rial omanita</displayName>
-				<displayName count="one">rial omanita</displayName>
-				<displayName count="other">rials omanites</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panameny</displayName>
-				<displayName count="one">balboa panameny</displayName>
-				<displayName count="other">balboes panamenys</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>inti peruà</displayName>
-				<displayName count="one">inti peruà</displayName>
-				<displayName count="other">intis peruans</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>nou sol peruà</displayName>
-				<displayName count="one">nou sol peruà</displayName>
-				<displayName count="other">nous sols peruans</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol peruà</displayName>
-				<displayName count="one">sol peruà</displayName>
-				<displayName count="other">sols peruans</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina de Papua Nova Guinea</displayName>
-				<displayName count="one">kina de Papua Nova Guinea</displayName>
-				<displayName count="other">kines de Papua Nova Guinea</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>peso filipí</displayName>
-				<displayName count="one">peso filipí</displayName>
-				<displayName count="other">pesos filipins</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>rupia pakistanesa</displayName>
-				<displayName count="one">rupia pakistanesa</displayName>
-				<displayName count="other">rupies pakistaneses</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>zloty polonès</displayName>
-				<displayName count="one">zloty polonès</displayName>
-				<displayName count="other">zlote polonesos</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>zloty polonès (1950-1995)</displayName>
-				<displayName count="one">zloty polonès (PLZ)</displayName>
-				<displayName count="other">zlote polonesos (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>escut portuguès</displayName>
-				<displayName count="one">escut portuguès</displayName>
-				<displayName count="other">escuts portuguesos</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guaraní paraguaià</displayName>
-				<displayName count="one">guaraní paraguaià</displayName>
-				<displayName count="other">guaranís paraguaians</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>riyal de Qatar</displayName>
-				<displayName count="one">riyal de Qatar</displayName>
-				<displayName count="other">riyals de Qatar</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>dòlar rhodesià</displayName>
-				<displayName count="one">dòlar rhodesià</displayName>
-				<displayName count="other">dòlars rhodesians</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>antic leu romanès</displayName>
-				<displayName count="one">antic leu romanès</displayName>
-				<displayName count="other">antics lei romanesos</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>leu romanès</displayName>
-				<displayName count="one">leu romanès</displayName>
-				<displayName count="other">lei romanesos</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar serbi</displayName>
-				<displayName count="one">dinar serbi</displayName>
-				<displayName count="other">dinars serbis</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ruble rus</displayName>
-				<displayName count="one">ruble rus</displayName>
-				<displayName count="other">rubles russos</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>ruble rus (1991-1998)</displayName>
-				<displayName count="one">ruble rus (RUR)</displayName>
-				<displayName count="other">rubles russos (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>franc rwandès</displayName>
-				<displayName count="one">franc rwandès</displayName>
-				<displayName count="other">francs rwandesos</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>riyal saudita</displayName>
-				<displayName count="one">riyal saudita</displayName>
-				<displayName count="other">riyals saudites</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>dòlar de les illes Salomó</displayName>
-				<displayName count="one">dòlar de les illes Salomó</displayName>
-				<displayName count="other">dòlars de les illes Salomó</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>rupia de les Seychelles</displayName>
-				<displayName count="one">rupia de les Seychelles</displayName>
-				<displayName count="other">rupies de les Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar sudanès</displayName>
-				<displayName count="one">dinar sudanès</displayName>
-				<displayName count="other">dinars sudanesos</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>lliura sudanesa</displayName>
-				<displayName count="one">lliura sudanesa</displayName>
-				<displayName count="other">lliures sudaneses</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>antiga lliura sudanesa</displayName>
-				<displayName count="one">antiga lliura sudanesa</displayName>
-				<displayName count="other">antigues lliures sudaneses</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>corona sueca</displayName>
-				<displayName count="one">corona sueca</displayName>
-				<displayName count="other">corones sueques</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>dòlar de Singapur</displayName>
-				<displayName count="one">dòlar de Singapur</displayName>
-				<displayName count="other">dòlars de Singapur</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>lliura de Santa Helena</displayName>
-				<displayName count="one">lliura de Santa Helena</displayName>
-				<displayName count="other">lliures de Santa Helena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>tolar eslovè</displayName>
-				<displayName count="one">tolar eslovè</displayName>
-				<displayName count="other">tolars eslovens</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>corona eslovaca</displayName>
-				<displayName count="one">corona eslovaca</displayName>
-				<displayName count="other">corones eslovaques</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leone de Sierra Leone</displayName>
-				<displayName count="one">leone de Sierra Leone</displayName>
-				<displayName count="other">leones de Sierra Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>xíling somali</displayName>
-				<displayName count="one">xíling somali</displayName>
-				<displayName count="other">xílings somalis</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>dòlar de Surinam</displayName>
-				<displayName count="one">dòlar de Surinam</displayName>
-				<displayName count="other">dòlars de Surinam</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>florí de Surinam</displayName>
-				<displayName count="one">florí de Surinam</displayName>
-				<displayName count="other">florins de Surinam</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra de São Tomé i Príncipe</displayName>
-				<displayName count="one">dobra de São Tomé i Príncipe</displayName>
-				<displayName count="other">dobras de São Tomé i Príncipe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>ruble soviètic</displayName>
-				<displayName count="one">ruble soviètic</displayName>
-				<displayName count="other">rubles soviètics</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>colón salvadorenc</displayName>
-				<displayName count="one">colón salvadorenc</displayName>
-				<displayName count="other">colones salvadorencs</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>lliura síria</displayName>
-				<displayName count="one">lliura síria</displayName>
-				<displayName count="other">lliures síries</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>lilangeni swazi</displayName>
-				<displayName count="one">lilangeni swazi</displayName>
-				<displayName count="other">emalangeni swazis</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>baht tailandès</displayName>
-				<displayName count="one">baht tailandès</displayName>
-				<displayName count="other">bahts tailandesos</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>ruble tadjik</displayName>
-				<displayName count="one">ruble tadjik</displayName>
-				<displayName count="other">rubles tadjiks</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>somoni tadjik</displayName>
-				<displayName count="one">somoni tadjik</displayName>
-				<displayName count="other">somonis tadjiks</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>manat turcman</displayName>
-				<displayName count="one">manat turcman</displayName>
-				<displayName count="other">manats turcmans</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunisià</displayName>
-				<displayName count="one">dinar tunisià</displayName>
-				<displayName count="other">dinars tunisians</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>pa‘anga tongà</displayName>
-				<displayName count="one">pa‘anga tongà</displayName>
-				<displayName count="other">pa‘angas tongans</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>escut de Timor</displayName>
-				<displayName count="one">escut de Timor</displayName>
-				<displayName count="other">escuts de Timor</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>antiga lira turca</displayName>
-				<displayName count="one">antiga lira turca</displayName>
-				<displayName count="other">antigues lires turques</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>lira turca</displayName>
-				<displayName count="one">lira turca</displayName>
-				<displayName count="other">lires turques</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dòlar de Trinitat i Tobago</displayName>
-				<displayName count="one">dòlar de Trinitat i Tobago</displayName>
-				<displayName count="other">dòlars de Trinitat i Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>nou dòlar de Taiwan</displayName>
-				<displayName count="one">nou dòlar de Taiwan</displayName>
-				<displayName count="other">nous dòlars de Taiwan</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>xíling tanzà</displayName>
-				<displayName count="one">xíling tanzà</displayName>
-				<displayName count="other">xílings tanzans</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>hrívnia ucraïnesa</displayName>
-				<displayName count="one">hrívnia ucraïnesa</displayName>
-				<displayName count="other">hrívnies ucraïneses</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>karbóvanets ucraïnès</displayName>
-				<displayName count="one">karbóvanets ucraïnès</displayName>
-				<displayName count="other">karbóvantsiv ucraïnesos</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>xíling ugandès (1966-1987)</displayName>
-				<displayName count="one">xíling ugandès (UGS)</displayName>
-				<displayName count="other">xílings ugandesos (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>xíling ugandès</displayName>
-				<displayName count="one">xíling ugandès</displayName>
-				<displayName count="other">xílings ugandesos</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>dòlar dels Estats Units</displayName>
-				<displayName count="one">dòlar dels Estats Units</displayName>
-				<displayName count="other">dòlars dels Estats Units</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>dòlar dels Estats Units (dia següent)</displayName>
-				<displayName count="one">dòlar dels Estats Units (dia següent)</displayName>
-				<displayName count="other">dòlars dels Estats Units (dia següent)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>dòlar dels Estats Units (mateix dia)</displayName>
-				<displayName count="one">dòlar dels Estats Units (mateix dia)</displayName>
-				<displayName count="other">dòlars dels Estats Units (mateix dia)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>peso uruguaià en unitats indexades</displayName>
-				<displayName count="one">peso uruguaià en unitats indexades</displayName>
-				<displayName count="other">pesos uruguaians en unitats indexades</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>peso uruguaià (1975-1993)</displayName>
-				<displayName count="one">peso uruguaià (UYP)</displayName>
-				<displayName count="other">pesos uruguaians (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>peso uruguaià</displayName>
-				<displayName count="one">peso uruguaià</displayName>
-				<displayName count="other">pesos uruguaians</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>som uzbek</displayName>
-				<displayName count="one">som uzbek</displayName>
-				<displayName count="other">soms uzbeks</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>bolívar veneçolà</displayName>
-				<displayName count="one">bolívar veneçolà</displayName>
-				<displayName count="other">bolívars veneçolans</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>bolívar fort veneçolà</displayName>
-				<displayName count="one">bolívar fort veneçolà</displayName>
-				<displayName count="other">bolívars forts veneçolans</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>dong vietnamita</displayName>
-				<displayName count="one">dong vietnamita</displayName>
-				<displayName count="other">dongs vietnamites</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vatu de Vanuatu</displayName>
-				<displayName count="one">vatu de Vanuatu</displayName>
-				<displayName count="other">vatus de Vanuatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>tala samoà</displayName>
-				<displayName count="one">tala samoà</displayName>
-				<displayName count="other">tales samoans</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>franc CFA BEAC</displayName>
-				<displayName count="one">franc CFA BEAC</displayName>
-				<displayName count="other">francs CFA BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>plata</displayName>
-				<displayName count="one">plata</displayName>
-				<displayName count="other">plata</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>or</displayName>
-				<displayName count="one">or</displayName>
-				<displayName count="other">or</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>unitat compensatòria europea</displayName>
-				<displayName count="one">unitat compensatòria europea</displayName>
-				<displayName count="other">unitats compensatòries europees</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>unitat monetària europea</displayName>
-				<displayName count="one">unitat monetària europea</displayName>
-				<displayName count="other">unitats monetàries europees</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>unitat de compte europea (XBC)</displayName>
-				<displayName count="one">unitat de compte europea (XBC)</displayName>
-				<displayName count="other">unitats de compte europees (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>unitat de compte europea (XBD)</displayName>
-				<displayName count="one">unitat de compte europea (XBD)</displayName>
-				<displayName count="other">unitats de compte europees (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>dòlar del Carib Oriental</displayName>
-				<displayName count="one">dòlar del Carib Oriental</displayName>
-				<displayName count="other">dòlars del Carib Oriental</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>drets especials de gir</displayName>
-				<displayName count="one">drets especials de gir</displayName>
-				<displayName count="other">drets especials de gir</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>unitat de moneda europea</displayName>
-				<displayName count="one">unitat de moneda europea</displayName>
-				<displayName count="other">unitats de moneda europees</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>franc or francès</displayName>
-				<displayName count="one">franc or francès</displayName>
-				<displayName count="other">francs or francesos</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>franc UIC francès</displayName>
-				<displayName count="one">franc UIC francès</displayName>
-				<displayName count="other">francs UIC francesos</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>franc CFA BCEAO</displayName>
-				<displayName count="one">franc CFA BCEAO</displayName>
-				<displayName count="other">francs CFA BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>pal·ladi</displayName>
-				<displayName count="one">pal·ladi</displayName>
-				<displayName count="other">pal·ladi</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>franc CFP</displayName>
-				<displayName count="one">franc CFP</displayName>
-				<displayName count="other">francs CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platí</displayName>
-				<displayName count="one">platí</displayName>
-				<displayName count="other">platí</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>fons RINET</displayName>
-				<displayName count="one">fons RINET</displayName>
-				<displayName count="other">fons RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>codi reservat per a proves</displayName>
-				<displayName count="one">codi reservat per a proves</displayName>
-				<displayName count="other">codi reservat per a proves</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>moneda desconeguda/no vàlida</displayName>
-				<displayName count="one">moneda desconeguda/no vàlida</displayName>
-				<displayName count="other">monedes desconegudes/no vàlides</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>dinar iemenita</displayName>
-				<displayName count="one">dinar iemenita</displayName>
-				<displayName count="other">dinars iemenites</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>rial iemenita</displayName>
-				<displayName count="one">rial iemenita</displayName>
-				<displayName count="other">rials iemenites</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>dinar fort iugoslau</displayName>
-				<displayName count="one">dinar fort iugoslau</displayName>
-				<displayName count="other">dinars forts iugoslaus</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>nou dinar iugoslau</displayName>
-				<displayName count="one">nou dinar iugoslau</displayName>
-				<displayName count="other">nous dinars iugoslaus</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>dinar convertible iugoslau</displayName>
-				<displayName count="one">dinar convertible iugoslau</displayName>
-				<displayName count="other">dinars convertibles iugoslaus</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>rand sud-africà (financer)</displayName>
-				<displayName count="one">rand sud-africà (financer)</displayName>
-				<displayName count="other">rands sud-africans (financers)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand sud-africà</displayName>
-				<displayName count="one">rand sud-africà</displayName>
-				<displayName count="other">rands sud-africans</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>kwacha zambià</displayName>
-				<displayName count="one">kwacha zambià</displayName>
-				<displayName count="other">kwacha zambians</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>nou zaire zairès</displayName>
-				<displayName count="one">nou zaire zairès</displayName>
-				<displayName count="other">nous zaires zairesos</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zaire zairès</displayName>
-				<displayName count="one">zaire zairès</displayName>
-				<displayName count="other">zaires zairesos</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>dòlar zimbabuès</displayName>
-				<displayName count="one">dòlar zimbabuès</displayName>
-				<displayName count="other">dòlars zimbabuesos</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dia</unitPattern>
-			<unitPattern count="other">{0} dies</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hora</unitPattern>
-			<unitPattern count="other">{0} hores</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minuts</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mes</unitPattern>
-			<unitPattern count="other">{0} mesos</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segon</unitPattern>
-			<unitPattern count="other">{0} segons</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} setmana</unitPattern>
-			<unitPattern count="other">{0} setmanes</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} any</unitPattern>
-			<unitPattern count="other">{0} anys</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>sí:s</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ca_ES.xml b/airtime_mvc/library/Zend/Locale/Data/ca_ES.xml
deleted file mode 100644
index 3f6f84b3c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ca_ES.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="ca"/>
-		<territory type="ES"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/cch.xml b/airtime_mvc/library/Zend/Locale/Data/cch.xml
deleted file mode 100644
index 8e79c0783..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cch.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="cch"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a {a\u0331} b c {ch} d {dy} e-g {g\u0331} {gb} {gw} {gy} h {hy} i-k ḵ {kp} {kw} l {ly} m n ṉ {ny} o p {ph} {py} r {ry} s {sh} t-w {wh} y {y\u0331} z ʼ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Dyon</month>
-							<month type="2">Baa</month>
-							<month type="3">Atat</month>
-							<month type="4">Anas</month>
-							<month type="5">Atyo</month>
-							<month type="6">Achi</month>
-							<month type="7">Atar</month>
-							<month type="8">Awur</month>
-							<month type="9">Shad</month>
-							<month type="10">Shak</month>
-							<month type="11">Naba</month>
-							<month type="12">Nata</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Pen Dyon</month>
-							<month type="2">Pen Ba'a</month>
-							<month type="3">Pen Atat</month>
-							<month type="4">Pen Anas</month>
-							<month type="5">Pen Atyon</month>
-							<month type="6">Pen Achirim</month>
-							<month type="7">Pen Atariba</month>
-							<month type="8">Pen Awurr</month>
-							<month type="9">Pen Shadon</month>
-							<month type="10">Pen Shakur</month>
-							<month type="11">Pen Kur Naba</month>
-							<month type="12">Pen Kur Natat</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Yok</day>
-							<day type="mon">Tung</day>
-							<day type="tue">T. Tung</day>
-							<day type="wed">Tsan</day>
-							<day type="thu">Nas</day>
-							<day type="fri">Nat</day>
-							<day type="sat">Chir</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Wai Yoka Bawai</day>
-							<day type="mon">Wai Tunga</day>
-							<day type="tue">Toki Gitung</day>
-							<day type="wed">Tsam Kasuwa</day>
-							<day type="thu">Wai Na Nas</day>
-							<day type="fri">Wai Na Tiyon</day>
-							<day type="sat">Wai Na Chirim</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Gabanin Miladi</era>
-						<era type="1">Miladi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">GM</era>
-						<era type="1">M</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>Aman</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/cch_NG.xml b/airtime_mvc/library/Zend/Locale/Data/cch_NG.xml
deleted file mode 100644
index 41b2dadae..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cch_NG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="cch"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/characters.xml b/airtime_mvc/library/Zend/Locale/Data/characters.xml
deleted file mode 100644
index 4ad542e2b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/characters.xml
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-	<version number="$Revision: 1.19 $"/>
-	<generation date="$Date: 2009/05/05 23:15:57 $"/>
-	<characters>
-		<character-fallback>
-			<character value = "©">
-				<substitute>(C)</substitute>
-			</character>
-			<character value = "«">
-				<substitute>&lt;&lt;</substitute>
-			</character>
-			<character value = "­">
-				<substitute>-</substitute>
-			</character>
-			<character value = "®">
-				<substitute>(R)</substitute>
-			</character>
-			<character value = "»">
-				<substitute>&gt;&gt;</substitute>
-			</character>
-			<character value = "¼">
-				<substitute> 1/4</substitute>
-			</character>
-			<character value = "½">
-				<substitute> 1/2</substitute>
-			</character>
-			<character value = "¾">
-				<substitute> 3/4</substitute>
-			</character>
-			<character value = "Æ">
-				<substitute>AE</substitute>
-			</character>
-			<character value = "ß">
-				<substitute>ss</substitute>
-			</character>
-			<character value = "æ">
-				<substitute>ae</substitute>
-			</character>
-			<character value = "ʼn">
-				<substitute>&apos;n</substitute>
-			</character>
-			<character value = "Å’">
-				<substitute>OE</substitute>
-			</character>
-			<character value = "Å“">
-				<substitute>oe</substitute>
-			</character>
-			<character value = "Ș">
-				<substitute>Åž</substitute>
-			</character>
-			<character value = "È™">
-				<substitute>ÅŸ</substitute>
-			</character>
-			<character value = "Èš">
-				<substitute>Å¢</substitute>
-			</character>
-			<character value = "È›">
-				<substitute>Å£</substitute>
-			</character>
-			<character value="Ö¾">
-				<substitute>�</substitute>
-				<substitute>-</substitute>
-			</character>
-			<character value="׳">
-				<substitute>&apos;</substitute>
-			</character>
-			<character value="×´">
-				<substitute>&quot;</substitute>
-			</character>
-			<character value = "Ù«">
-				<substitute>,</substitute>
-			</character>
-			<character value = "Ù¬">
-				<substitute>&apos;</substitute>
-			</character>
-			<character value = "�">
-				<substitute>-</substitute>
-			</character>
-			<character value = "‑">
-				<substitute>-</substitute>
-			</character>
-			<character value = "‒">
-				<substitute>-</substitute>
-			</character>
-			<character value = "–">
-				<substitute>-</substitute>
-			</character>
-			<character value = "—">
-				<substitute>-</substitute>
-			</character>
-			<character value = "―">
-				<substitute>—</substitute>
-				<substitute>-</substitute>
-			</character>
-			<character value = "‘">
-				<substitute>&apos;</substitute>
-			</character>
-			<character value = "’">
-				<substitute>&apos;</substitute>
-			</character>
-			<character value = "‚">
-				<substitute>,</substitute>
-			</character>
-			<character value = "‛">
-				<substitute>&apos;</substitute>
-			</character>
-			<character value = "“">
-				<substitute>&quot;</substitute>
-			</character>
-			<character value = "�">
-				<substitute>&quot;</substitute>
-			</character>
-			<character value = "„">
-				<substitute>,,</substitute>
-			</character>
-			<character value = "‟">
-				<substitute>&quot;</substitute>
-			</character>
-			<character value = "•">
-				<substitute>·</substitute>
-			</character>
-			<character value = "‧">
-				<substitute>·</substitute>
-			</character>
-			<character value = "�">
-				<substitute>/</substitute>
-			</character>
-			<character value = "â‚ ">
-				<substitute>CE</substitute>
-			</character>
-			<character value = "â‚¡">
-				<substitute>CRC</substitute>
-			</character>
-			<character value = "₵">
-				<substitute>¢</substitute>
-			</character>
-			<character value = "â‚¢">
-				<substitute>Cr</substitute>
-			</character>
-			<character value = "â‚£">
-				<substitute>Fr.</substitute>
-			</character>
-			<character value = "₤">
-				<substitute>L.</substitute>
-				<substitute>£</substitute>
-			</character>
-			<character value = "₦">
-				<substitute>NGN</substitute>
-			</character>
-			<character value = "₧">
-				<substitute>Pts</substitute>
-			</character>
-			<character value = "â‚©">
-				<substitute>KRW</substitute>
-			</character>
-			<character value = "₪">
-				<substitute>שח</substitute>
-				<substitute>ILS</substitute>
-			</character>
-			<character value = "â‚«">
-				<substitute>Ä‘</substitute>
-				<substitute>VND</substitute>
-			</character>
-			<character value = "€">
-				<substitute>EUR</substitute>
-			</character>
-			<character value = "â‚­">
-				<substitute>LAK</substitute>
-			</character>
-			<character value = "â‚®">
-				<substitute>MNT</substitute>
-			</character>
-			<character value = "₯">
-				<substitute>GRD</substitute>
-			</character>
-			<character value = "₱">
-				<substitute>PHP</substitute>
-			</character>
-			<character value = "₲">
-				<substitute>PYG</substitute>
-			</character>
-			<character value = "₵">
-				<substitute>È»</substitute>
-				<substitute>GHS</substitute>
-			</character>
-			<character value = "â„ž">
-				<substitute>Rx</substitute>
-			</character>
-			<character value = "â…“">
-				<substitute> 1/3</substitute>
-			</character>
-			<character value = "â…”">
-				<substitute> 2/3</substitute>
-			</character>
-			<character value = "â…•">
-				<substitute> 1/5</substitute>
-			</character>
-			<character value = "â…–">
-				<substitute> 2/5</substitute>
-			</character>
-			<character value = "â…—">
-				<substitute> 3/5</substitute>
-			</character>
-			<character value = "â…˜">
-				<substitute> 4/5</substitute>
-			</character>
-			<character value = "â…™">
-				<substitute> 1/6</substitute>
-			</character>
-			<character value = "â…š">
-				<substitute> 5/6</substitute>
-			</character>
-			<character value = "â…›">
-				<substitute> 1/8</substitute>
-			</character>
-			<character value = "⅜">
-				<substitute> 3/8</substitute>
-			</character>
-			<character value = "â…�">
-				<substitute> 5/8</substitute>
-			</character>
-			<character value = "â…ž">
-				<substitute> 7/8</substitute>
-			</character>
-			<character value = "â…Ÿ">
-				<substitute> 1/</substitute>
-			</character>
-			<character value = "�">
-				<substitute>Π</substitute>
-			</character>
-			<character value = "∑">
-				<substitute>Σ</substitute>
-			</character>
-			<character value = "−">
-				<substitute>-</substitute>
-			</character>
-			<character value = "∕">
-				<substitute>/</substitute>
-			</character>
-			<character value = "∖">
-				<substitute>\</substitute>
-			</character>
-			<character value = "∣">
-				<substitute>|</substitute>
-			</character>
-			<character value = "∥">
-				<substitute>‖</substitute>
-				<substitute>||</substitute>
-			</character>
-			<character value = "　">
-				<substitute>  </substitute>
-			</character>
-			<character value = "�">
-				<substitute>dm²</substitute>
-			</character>
-			<character value = "�">
-				<substitute>dm³</substitute>
-			</character>
-			<character value = "㎟">
-				<substitute>mm²</substitute>
-			</character>
-			<character value = "㎠">
-				<substitute>cm²</substitute>
-			</character>
-			<character value = "㎡">
-				<substitute>m²</substitute>
-			</character>
-			<character value = "㎢">
-				<substitute>km²</substitute>
-			</character>
-			<character value = "㎣">
-				<substitute>mm³</substitute>
-			</character>
-			<character value = "㎤">
-				<substitute>cm³</substitute>
-			</character>
-			<character value = "㎥">
-				<substitute>m³</substitute>
-			</character>
-			<character value = "㎦">
-				<substitute>km³</substitute>
-			</character>
-			<character value = "㎧">
-				<substitute>m/s</substitute>
-			</character>
-			<character value = "㎨">
-				<substitute>m∕s²</substitute>
-				<substitute>m/s²</substitute>
-			</character>
-			<character value = "㎮">
-				<substitute>rad/s</substitute>
-			</character>
-			<character value = "㎯">
-				<substitute>rad∕s²</substitute>
-				<substitute>rad/s²</substitute>
-			</character>
-			<character value = "�">
-				<substitute>CC</substitute>
-			</character>
-			<character value = "�">
-				<substitute>C/kg</substitute>
-			</character>
-			<character value = "�">
-				<substitute>pH</substitute>
-			</character>
-			<character value = "�">
-				<substitute>V/m</substitute>
-			</character>
-			<character value = "�">
-				<substitute>A/m</substitute>
-			</character>
-			<character value = "ſt">
-				<substitute>Å¿t</substitute>
-			</character>
-			<character value = "｟">
-				<substitute>((</substitute>
-			</character>
-			<character value = "ï½ ">
-				<substitute>))</substitute>
-			</character>
-			<character value = "ﾞ">
-				<substitute>ã‚›</substitute>
-			</character>
-			<character value = "ﾟ">
-				<substitute>゜</substitute>
-			</character>
-			<character value = "ï¾ ">
-				<substitute>ã…¤</substitute>
-			</character>
-			<character value = "ﾡ">
-				<substitute>ㄱ</substitute>
-			</character>
-			<character value = "ï¾¢">
-				<substitute>ㄲ</substitute>
-			</character>
-			<character value = "ï¾£">
-				<substitute>ㄳ</substitute>
-			</character>
-			<character value = "ﾤ">
-				<substitute>ã„´</substitute>
-			</character>
-			<character value = "ï¾¥">
-				<substitute>ㄵ</substitute>
-			</character>
-			<character value = "ﾦ">
-				<substitute>ㄶ</substitute>
-			</character>
-			<character value = "ﾧ">
-				<substitute>ã„·</substitute>
-			</character>
-			<character value = "ﾨ">
-				<substitute>ㄸ</substitute>
-			</character>
-			<character value = "ﾩ">
-				<substitute>ㄹ</substitute>
-			</character>
-			<character value = "ﾪ">
-				<substitute>ㄺ</substitute>
-			</character>
-			<character value = "ﾫ">
-				<substitute>ã„»</substitute>
-			</character>
-			<character value = "ﾬ">
-				<substitute>ㄼ</substitute>
-			</character>
-			<character value = "ï¾­">
-				<substitute>ㄽ</substitute>
-			</character>
-			<character value = "ï¾®">
-				<substitute>ㄾ</substitute>
-			</character>
-			<character value = "ﾯ">
-				<substitute>ã„¿</substitute>
-			</character>
-			<character value = "ï¾°">
-				<substitute>ã…€</substitute>
-			</character>
-			<character value = "ï¾±">
-				<substitute>ã…�</substitute>
-			</character>
-			<character value = "ï¾²">
-				<substitute>ã…‚</substitute>
-			</character>
-			<character value = "ï¾³">
-				<substitute>ã…ƒ</substitute>
-			</character>
-			<character value = "ï¾´">
-				<substitute>ã…„</substitute>
-			</character>
-			<character value = "ï¾µ">
-				<substitute>ã……</substitute>
-			</character>
-			<character value = "ﾶ">
-				<substitute>ã…†</substitute>
-			</character>
-			<character value = "ï¾·">
-				<substitute>ã…‡</substitute>
-			</character>
-			<character value = "ﾸ">
-				<substitute>ã…ˆ</substitute>
-			</character>
-			<character value = "ï¾¹">
-				<substitute>ã…‰</substitute>
-			</character>
-			<character value = "ﾺ">
-				<substitute>ã…Š</substitute>
-			</character>
-			<character value = "ï¾»">
-				<substitute>ã…‹</substitute>
-			</character>
-			<character value = "ï¾¼">
-				<substitute>ㅌ</substitute>
-			</character>
-			<character value = "ï¾½">
-				<substitute>ã…�</substitute>
-			</character>
-			<character value = "ï¾¾">
-				<substitute>ã…Ž</substitute>
-			</character>
-			<character value = "ï¿‚">
-				<substitute>ã…�</substitute>
-			</character>
-			<character value = "ￃ">
-				<substitute>ã…�</substitute>
-			</character>
-			<character value = "ï¿„">
-				<substitute>ã…‘</substitute>
-			</character>
-			<character value = "ï¿…">
-				<substitute>ã…’</substitute>
-			</character>
-			<character value = "ￆ">
-				<substitute>ã…“</substitute>
-			</character>
-			<character value = "ￇ">
-				<substitute>ã…”</substitute>
-			</character>
-			<character value = "ï¿Š">
-				<substitute>ã…•</substitute>
-			</character>
-			<character value = "ï¿‹">
-				<substitute>ã…–</substitute>
-			</character>
-			<character value = "ￌ">
-				<substitute>ã…—</substitute>
-			</character>
-			<character value = "�">
-				<substitute>ã…˜</substitute>
-			</character>
-			<character value = "ï¿Ž">
-				<substitute>ã…™</substitute>
-			</character>
-			<character value = "�">
-				<substitute>ã…š</substitute>
-			</character>
-			<character value = "ï¿’">
-				<substitute>ã…›</substitute>
-			</character>
-			<character value = "ï¿“">
-				<substitute>ㅜ</substitute>
-			</character>
-			<character value = "ï¿”">
-				<substitute>ã…�</substitute>
-			</character>
-			<character value = "ï¿•">
-				<substitute>ã…ž</substitute>
-			</character>
-			<character value = "ï¿–">
-				<substitute>ã…Ÿ</substitute>
-			</character>
-			<character value = "ï¿—">
-				<substitute>ã… </substitute>
-			</character>
-			<character value = "ï¿š">
-				<substitute>ã…¡</substitute>
-			</character>
-			<character value = "ï¿›">
-				<substitute>ã…¢</substitute>
-			</character>
-			<character value = "ￜ">
-				<substitute>ã…£</substitute>
-			</character>
-			<character value = "ï¿£">
-				<substitute>¯</substitute>
-			</character>
-		</character-fallback>
-	</characters>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/cop.xml b/airtime_mvc/library/Zend/Locale/Data/cop.xml
deleted file mode 100644
index 39ad5a620..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cop.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.27 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="cop"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[α-� σ ϲ τ-ω ϣ ϥ ϧ ϩ ϫ ϭ ϯ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">ωογτ</month>
-							<month type="2">Παοπι</month>
-							<month type="3">Αθο�</month>
-							<month type="4">Χοιακ</month>
-							<month type="5">Τωβι</month>
-							<month type="6">Μεϣι�</month>
-							<month type="7">Πα�εμϩατ</month>
-							<month type="8">Φα�μοθι</month>
-							<month type="9">Παϣαν</month>
-							<month type="10">Παωνι</month>
-							<month type="11">Επηπ</month>
-							<month type="12">Μεϲω�η</month>
-							<month type="13">Πικογϫι μαβοτ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/cs.xml b/airtime_mvc/library/Zend/Locale/Data/cs.xml
deleted file mode 100644
index 546c8653a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cs.xml
+++ /dev/null
@@ -1,2439 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.132 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="cs"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afarština</language>
-			<language type="ab">abcházština</language>
-			<language type="ace">acehština</language>
-			<language type="ach">a�oli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adygejština</language>
-			<language type="ae">avestánština</language>
-			<language type="af">afrikánština</language>
-			<language type="afa">afroasijské jazyky (jiné)</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainština</language>
-			<language type="ak">akanština</language>
-			<language type="akk">akkadština</language>
-			<language type="ale">aleutština</language>
-			<language type="alg">algonkinské jazyky (jiné)</language>
-			<language type="am">amharština</language>
-			<language type="an">aragonština</language>
-			<language type="ang">staroangli�tina</language>
-			<language type="anp">angika</language>
-			<language type="apa">apa�ské jazyky</language>
-			<language type="ar">arabština</language>
-			<language type="arc">aramejština</language>
-			<language type="arn">araukánština</language>
-			<language type="arp">arapažština</language>
-			<language type="art">umělé jazyky (jiné)</language>
-			<language type="arw">arawacké jazyky</language>
-			<language type="as">assaméština</language>
-			<language type="ath">athapaskánské jazyky</language>
-			<language type="aus">australské jazyky</language>
-			<language type="av">avarština</language>
-			<language type="awa">awadhština</language>
-			<language type="ay">aymárština</language>
-			<language type="az">azerbajdžánština</language>
-			<language type="ba">baskirština</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke (jiné)</language>
-			<language type="bal">balú�ština</language>
-			<language type="ban">balijština</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltské jazyky (jiné)</language>
-			<language type="be">běloruština</language>
-			<language type="bej">bedža</language>
-			<language type="bem">bembštiva</language>
-			<language type="ber">berberské jazyky (jiné)</language>
-			<language type="bg">bulharština</language>
-			<language type="bh">biharština</language>
-			<language type="bho">bhojpurština</language>
-			<language type="bi">bislámština</language>
-			<language type="bik">bikolština</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambarština</language>
-			<language type="bn">bengálština</language>
-			<language type="bnt">bantuské jazyky (jiné)</language>
-			<language type="bo">tibetština</language>
-			<language type="br">bretaňština</language>
-			<language type="bra">bradžština</language>
-			<language type="bs">bosenština</language>
-			<language type="btk">bata�tina</language>
-			<language type="bua">burjatština</language>
-			<language type="bug">bugiština</language>
-			<language type="ca">katalánština</language>
-			<language type="cad">caddo</language>
-			<language type="cai">středoamerické indiánské jazyky (jiné)</language>
-			<language type="car">karibština</language>
-			<language type="cau">kavkazské jazyky (jiné)</language>
-			<language type="ce">�e�enština</language>
-			<language type="ceb">cebuánština</language>
-			<language type="cel">keltské jazyky (jiné)</language>
-			<language type="ch">�amoro</language>
-			<language type="chb">�ib�a</language>
-			<language type="chg">�agatajština</language>
-			<language type="chk">�ukština</language>
-			<language type="chm">marijština</language>
-			<language type="chn">�inuk pidžin</language>
-			<language type="cho">choctawština</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">�ejenština</language>
-			<language type="cmc">�amština</language>
-			<language type="co">korsi�tina</language>
-			<language type="cop">koptština</language>
-			<language type="cpe">kreolština a jiné pidginy na základě angli�tiny</language>
-			<language type="cpf">kreolština a jiné pidginy na základě francouzštiny</language>
-			<language type="cpp">kreolština a jiné pidginy na základě portugalštiny</language>
-			<language type="cr">krí</language>
-			<language type="crh">krymská ture�tina</language>
-			<language type="crp">kreolština a jiné pidginy</language>
-			<language type="cs">�eština</language>
-			<language type="cu">staroslověnština</language>
-			<language type="cus">kúšitské jazyky (jiné)</language>
-			<language type="cv">�uvašština</language>
-			<language type="cy">velština</language>
-			<language type="da">dánština</language>
-			<language type="dak">dakotština</language>
-			<language type="day">dajá�tina</language>
-			<language type="de">něm�ina</language>
-			<language type="de_AT">německy (Rakousko)</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinkština</language>
-			<language type="doi">dórgí</language>
-			<language type="dra">drávidské jazyky (jiné)</language>
-			<language type="dua">dualština</language>
-			<language type="dum">středoholandština</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">djula</language>
-			<language type="dz">bhútánština</language>
-			<language type="ee">eweština</language>
-			<language type="efi">efik</language>
-			<language type="egy">egyptština stará</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">ře�tina</language>
-			<language type="elx">elamitština</language>
-			<language type="en">angli�tina</language>
-			<language type="en_CA">anglicky (Kanada)</language>
-			<language type="en_US">angli�tina (USA)</language>
-			<language type="enm">středoangli�tina</language>
-			<language type="eo">esperanto</language>
-			<language type="es">španělština</language>
-			<language type="et">estonština</language>
-			<language type="eu">baski�tina</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">perština</language>
-			<language type="fan">fang</language>
-			<language type="fat">fantština</language>
-			<language type="ff">fulahština</language>
-			<language type="fi">finština</language>
-			<language type="fil">tagalogština</language>
-			<language type="fiu">ugrofinské jazyky (jiné)</language>
-			<language type="fj">fidži</language>
-			<language type="fo">faerština</language>
-			<language type="fr">francouzština</language>
-			<language type="fr_CA">francouzsky (Kanada)</language>
-			<language type="frm">středofrancouzština</language>
-			<language type="fro">starofrancouzština</language>
-			<language type="fur">furlandština</language>
-			<language type="fy">fríština</language>
-			<language type="ga">irština</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">skotská galština</language>
-			<language type="gem">germánské jazyky (jiné)</language>
-			<language type="gez">geez</language>
-			<language type="gil">kiribatština</language>
-			<language type="gl">hali�ština</language>
-			<language type="gmh">hornoněm�ina stará</language>
-			<language type="gn">guaranština</language>
-			<language type="goh">stará hornoněm�ina</language>
-			<language type="gon">góndština</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gótština</language>
-			<language type="grb">grebo</language>
-			<language type="grc">staroře�tina</language>
-			<language type="gu">gujaratština</language>
-			<language type="gv">manština</language>
-			<language type="gwi">gwichʼin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">havajský</language>
-			<language type="he">hebrejština</language>
-			<language type="hi">hindština</language>
-			<language type="hil">hiligayonština</language>
-			<language type="him">himá�alština</language>
-			<language type="hit">chetitština</language>
-			<language type="hmn">hmongština</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">chorvatština</language>
-			<language type="hu">ma�arština</language>
-			<language type="hup">hupa</language>
-			<language type="hy">arménština</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonéština</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igboština</language>
-			<language type="ijo">idžo</language>
-			<language type="ik">inupiakština</language>
-			<language type="ilo">ilokánština</language>
-			<language type="inc">indické jazyky (jiné)</language>
-			<language type="ine">indoevropské jazyky (jiné)</language>
-			<language type="inh">inguština</language>
-			<language type="ira">íránské jazyky (jiné)</language>
-			<language type="iro">irokézské jazyky (jiné)</language>
-			<language type="is">islandština</language>
-			<language type="it">italština</language>
-			<language type="iu">inuktitutština</language>
-			<language type="ja">japonština</language>
-			<language type="jv">javánština</language>
-			<language type="ka">gruzínština</language>
-			<language type="kaa">karakalpa�tina</language>
-			<language type="kab">kabylština</language>
-			<language type="kac">ka�ijština</language>
-			<language type="kam">kambština</language>
-			<language type="kar">karenština</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardinština</language>
-			<language type="kg">konžština</language>
-			<language type="kha">khásí</language>
-			<language type="khi">khoisanské jazyky (jiné)</language>
-			<language type="kho">chotánština</language>
-			<language type="ki">kikujština</language>
-			<language type="kj">kuaňamština</language>
-			<language type="kk">kazachština</language>
-			<language type="kl">grónština</language>
-			<language type="km">kambodžština</language>
-			<language type="kmb">kimbundština</language>
-			<language type="kn">kannadština</language>
-			<language type="ko">korejština</language>
-			<language type="kok">kónkánština</language>
-			<language type="kos">kosrajština</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="kro">kru</language>
-			<language type="kru">krukukhština</language>
-			<language type="ks">kašmírština</language>
-			<language type="ku">kurdština</language>
-			<language type="kum">kumy�tina</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komijština</language>
-			<language type="kw">kornština</language>
-			<language type="ky">kirgizština</language>
-			<language type="la">latina</language>
-			<language type="lad">ladinština</language>
-			<language type="lah">lahndština</language>
-			<language type="lam">lambština</language>
-			<language type="lb">Lucemburština</language>
-			<language type="lez">lezginština</language>
-			<language type="lg">ganda</language>
-			<language type="ln">lingalština</language>
-			<language type="lo">laoština</language>
-			<language type="lol">mongština</language>
-			<language type="loz">lozština</language>
-			<language type="lt">litevština</language>
-			<language type="lu">lubu-katanžština</language>
-			<language type="lua">luba-luluaština</language>
-			<language type="lui">luiseňo</language>
-			<language type="lun">lundština</language>
-			<language type="luo">luoština</language>
-			<language type="lus">lišáí</language>
-			<language type="lv">lotyština</language>
-			<language type="mad">madurština</language>
-			<language type="mag">magadhiština</language>
-			<language type="mai">maithiliština</language>
-			<language type="mak">makasarština</language>
-			<language type="man">mandingština</language>
-			<language type="map">austronéské jazyky (jiné)</language>
-			<language type="mas">masajština</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgaština</language>
-			<language type="mga">středoirština</language>
-			<language type="mh">maršálština</language>
-			<language type="mi">maorština</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">různé jazyky</language>
-			<language type="mk">makedonština</language>
-			<language type="mkh">mon-khmerské jazyky (jiné)</language>
-			<language type="ml">malabarština</language>
-			<language type="mn">mongolština</language>
-			<language type="mnc">mandžuština</language>
-			<language type="mni">manipurština</language>
-			<language type="mno">manobo jazyky</language>
-			<language type="mo">moldavština</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mosi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malajština</language>
-			<language type="mt">maltština</language>
-			<language type="mul">více jazyků</language>
-			<language type="mun">mundské jazyky (jiné)</language>
-			<language type="mus">muskogee (creek)</language>
-			<language type="mwr">márvárština</language>
-			<language type="my">barmština</language>
-			<language type="myn">mayské jazyky</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">severoamerické indiánské jazyky (jiné)</language>
-			<language type="nap">neapolština</language>
-			<language type="nb">norština (Bokmål)</language>
-			<language type="nd">ndebele (Zimbabwe)</language>
-			<language type="nds">dolnoněm�ina</language>
-			<language type="ne">nepálština</language>
-			<language type="new">névárština</language>
-			<language type="ng">ndondština</language>
-			<language type="nia">nias</language>
-			<language type="nic">nigero-kordofánské jazyky (jiné)</language>
-			<language type="niu">niue</language>
-			<language type="nl">nizozemština</language>
-			<language type="nn">norština (nynorsk)</language>
-			<language type="no">norština</language>
-			<language type="non">norština historická</language>
-			<language type="nr">ndebele (Jižní Afrika)</language>
-			<language type="nso">severní sotho</language>
-			<language type="nub">núbijské jazyky</language>
-			<language type="nv">navažština</language>
-			<language type="ny">ňandžština</language>
-			<language type="nym">ňamwežština</language>
-			<language type="nyn">nyakolština</language>
-			<language type="nyo">nyorština</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitan</language>
-			<language type="oj">odžibvejština</language>
-			<language type="om">Oromo (Afan)</language>
-			<language type="or">oriya</language>
-			<language type="os">osetština</language>
-			<language type="osa">osage</language>
-			<language type="ota">osmanská ture�tina</language>
-			<language type="oto">otomijské jazyky</language>
-			<language type="pa">paňdžábština</language>
-			<language type="paa">papuánské jazyky (jiné)</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlaví</language>
-			<language type="pam">papangau</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauština</language>
-			<language type="peo">staroperština</language>
-			<language type="phi">filipínské jazyky (jiné)</language>
-			<language type="phn">féni�tina</language>
-			<language type="pi">pálí</language>
-			<language type="pl">polština</language>
-			<language type="pon">pohnpeiština</language>
-			<language type="pra">prákritské jazyky</language>
-			<language type="pro">provensálština</language>
-			<language type="ps">Pashto (Pushto)</language>
-			<language type="pt">portugalština</language>
-			<language type="qu">ke�uánština</language>
-			<language type="raj">rádžastánština</language>
-			<language type="rap">rapanuiština</language>
-			<language type="rar">rarotongaština</language>
-			<language type="rm">rétorománština</language>
-			<language type="rn">kirundi</language>
-			<language type="ro">rumunština</language>
-			<language type="roa">románské jazyky (jiné)</language>
-			<language type="rom">romština</language>
-			<language type="ru">ruština</language>
-			<language type="rw">kinyarwandština</language>
-			<language type="sa">sanskrt</language>
-			<language type="sad">sandawština</language>
-			<language type="sah">jakutština</language>
-			<language type="sai">jihoamerické indiánské jazyky (jiné)</language>
-			<language type="sal">salishské jazyky</language>
-			<language type="sam">samarština</language>
-			<language type="sas">sasakština</language>
-			<language type="sat">santálí</language>
-			<language type="sc">sardština</language>
-			<language type="sco">skotština</language>
-			<language type="sd">sindhi</language>
-			<language type="sel">selkupština</language>
-			<language type="sem">semitské jazyky (jiné)</language>
-			<language type="sg">sangho</language>
-			<language type="sga">staroirština</language>
-			<language type="sgn">znakové jazyky</language>
-			<language type="sh">srbochorvatština</language>
-			<language type="shn">šanština</language>
-			<language type="si">sinhálština</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouxské jazyky</language>
-			<language type="sit">tibeto�ínské jazyky (jiné)</language>
-			<language type="sk">slovenština</language>
-			<language type="sl">slovinština</language>
-			<language type="sla">slovanský jazyk</language>
-			<language type="sm">samoyština</language>
-			<language type="smi">sami jazyky</language>
-			<language type="sn">shona</language>
-			<language type="snk">sonikština</language>
-			<language type="so">somálština</language>
-			<language type="sog">sogdština</language>
-			<language type="son">songhajština</language>
-			<language type="sq">albánština</language>
-			<language type="sr">srbština</language>
-			<language type="srr">serer</language>
-			<language type="ss">siswatština</language>
-			<language type="ssa">nilo-saharské jazyky (jiné)</language>
-			<language type="st">sesotho</language>
-			<language type="su">sundanština</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerský</language>
-			<language type="sv">švédština</language>
-			<language type="sw">svahilština</language>
-			<language type="syr">syrština</language>
-			<language type="ta">tamilština</language>
-			<language type="tai">thajské jazyky (jiné)</language>
-			<language type="te">telugština</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetumština</language>
-			<language type="tg">tádži�tina</language>
-			<language type="th">thajština</language>
-			<language type="ti">tigrinijština</language>
-			<language type="tig">tigrejština</language>
-			<language type="tiv">tivština</language>
-			<language type="tk">turkmenština</language>
-			<language type="tkl">tokelauština</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingonština</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamašek</language>
-			<language type="tn">setswanština</language>
-			<language type="to">tonga</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">ture�tina</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshijské jazyky</language>
-			<language type="tt">tatarština</language>
-			<language type="tum">tumbukština</language>
-			<language type="tut">altajské jazyky (jiné)</language>
-			<language type="tvl">tuvalština</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitština</language>
-			<language type="tyv">tuvinština</language>
-			<language type="udm">udmurtština</language>
-			<language type="ug">uighurština</language>
-			<language type="uga">ugaritština</language>
-			<language type="uk">ukrajinština</language>
-			<language type="umb">umbundu</language>
-			<language type="und">neznámý nebo neplatný jazyk</language>
-			<language type="ur">urdština</language>
-			<language type="uz">uzbe�tina</language>
-			<language type="vai">vai</language>
-			<language type="ve">vendština</language>
-			<language type="vi">vietnamština</language>
-			<language type="vo">volapuk</language>
-			<language type="vot">votiatština</language>
-			<language type="wa">valonština</language>
-			<language type="wak">wakashské jazyky</language>
-			<language type="wal">walamština</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">lužickosrbské jazyky</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmy�tina</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">jaoština</language>
-			<language type="yap">yapese</language>
-			<language type="yi">jidiš</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">yupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapoté�tina</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">�ínština</language>
-			<language type="zh_Hans">�ínština (zjednodušená)</language>
-			<language type="zh_Hant">�ínština (tradi�ní)</language>
-			<language type="znd">zandština</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zunijština</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabský</script>
-			<script type="Armn">Arménský</script>
-			<script type="Bali">Balijský</script>
-			<script type="Batk">Batacký</script>
-			<script type="Beng">Bengálský</script>
-			<script type="Blis">Bliss</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Bráhmí</script>
-			<script type="Brai">Braillovo písmo</script>
-			<script type="Bugi">Buginský</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cans">Slabi�né písmo kanadských domorodců</script>
-			<script type="Cham">ÄŒam</script>
-			<script type="Cher">Čerokí</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptský</script>
-			<script type="Cyrl">Cyrilice</script>
-			<script type="Cyrs">Cyrilice (staroslověnská)</script>
-			<script type="Deva">Devanágarí</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Egyptský démotický</script>
-			<script type="Egyh">Egyptský hieratický</script>
-			<script type="Egyp">Egyptské hieroglyfy</script>
-			<script type="Ethi">Etiopský</script>
-			<script type="Geor">Gruzínský</script>
-			<script type="Glag">Hlaholice</script>
-			<script type="Goth">Gotický</script>
-			<script type="Grek">Řecký</script>
-			<script type="Gujr">Gudžarátí</script>
-			<script type="Guru">Gurmukhí</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hebr">Hebrejský</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Hmongský</script>
-			<script type="Hrkt">Katakana nebo Hiragana</script>
-			<script type="Hung">Staroma�arský</script>
-			<script type="Inds">Harappský</script>
-			<script type="Ital">Etruský</script>
-			<script type="Java">Jávský</script>
-			<script type="Jpan">Japonský</script>
-			<script type="Kali">Kayah li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kháróští</script>
-			<script type="Khmr">Khmerský</script>
-			<script type="Knda">Kannadský</script>
-			<script type="Laoo">Laoský</script>
-			<script type="Latf">Latinka (fraktura)</script>
-			<script type="Latg">Latinka (gaelská)</script>
-			<script type="Latn">Latinka</script>
-			<script type="Lepc">Lep�ský</script>
-			<script type="Lina">Lineární A</script>
-			<script type="Linb">Lineární B</script>
-			<script type="Mand">Mandejský</script>
-			<script type="Maya">Mayské hieroglyfy</script>
-			<script type="Mero">Meroitický</script>
-			<script type="Mlym">Malajálamský</script>
-			<script type="Mong">Mongolský</script>
-			<script type="Mymr">Barmský</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Orkh">Orchonský</script>
-			<script type="Orya">Urijský</script>
-			<script type="Osma">Osmanský</script>
-			<script type="Perm">Staropermský</script>
-			<script type="Phnx">Fénický</script>
-			<script type="Plrd">Pollardova fonetická abeceda</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runové písmo</script>
-			<script type="Shaw">Shaw</script>
-			<script type="Sinh">Sinhálský</script>
-			<script type="Syrc">Syrský</script>
-			<script type="Syre">Syrský (estrangelo)</script>
-			<script type="Syrj">Syrský (západní)</script>
-			<script type="Syrn">Syrský (východní)</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Taml">Tamilský</script>
-			<script type="Telu">Telužský</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Berberský</script>
-			<script type="Tglg">Tagalský</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thajský</script>
-			<script type="Tibt">Tibetský</script>
-			<script type="Ugar">Ugaritské klínové písmo</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Viditelná ře�</script>
-			<script type="Xpeo">Staroperské klínové písmo</script>
-			<script type="Xsux">Sumero-akkadské klínové písmo</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zyyy">Obecný</script>
-			<script type="Zzzz">Neznámý nebo neplatný skript</script>
-		</scripts>
-		<territories>
-			<territory type="001">Svět</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">003</territory>
-			<territory type="005">Jižní Amerika</territory>
-			<territory type="009">Oceánie</territory>
-			<territory type="011">Západní Afrika</territory>
-			<territory type="013">Střední Amerika</territory>
-			<territory type="014">Východní Afrika</territory>
-			<territory type="015">Severní Afrika</territory>
-			<territory type="017">Střední Afrika</territory>
-			<territory type="018">Jižní Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Severní Amerika</territory>
-			<territory type="029">Karibik</territory>
-			<territory type="030">Východní Asie</territory>
-			<territory type="034">Jižní Asie</territory>
-			<territory type="035">Jihovýchodní Asie</territory>
-			<territory type="039">Jižní Evropa</territory>
-			<territory type="053">Austrálie a Nový Zéland</territory>
-			<territory type="054">Melanésie</territory>
-			<territory type="057">Mikronésie</territory>
-			<territory type="061">Polynésie</territory>
-			<territory type="062">Jižní a centrální Asie</territory>
-			<territory type="142">Asie</territory>
-			<territory type="143">Střední Asie</territory>
-			<territory type="145">Západní Asie</territory>
-			<territory type="150">Evropa</territory>
-			<territory type="151">Východní Evropa</territory>
-			<territory type="154">Severní Evropa</territory>
-			<territory type="155">Západní Evropa</territory>
-			<territory type="172">Spole�enství nezávislých států</territory>
-			<territory type="200">ÄŒeskoslovensko</territory>
-			<territory type="419">Latinská Amerika a Karibské moře</territory>
-			<territory type="830">Normanské ostrovy</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Spojené arabské emiráty</territory>
-			<territory type="AF">Afghánistán</territory>
-			<territory type="AG">Antigua a Barbuda</territory>
-			<territory type="AI">Anguila</territory>
-			<territory type="AL">Albánie</territory>
-			<territory type="AM">Arménie</territory>
-			<territory type="AN">Nizozemské Antily</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktida</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Americká Samoa</territory>
-			<territory type="AT">Rakousko</territory>
-			<territory type="AU">Austrálie</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandy</territory>
-			<territory type="AZ">�zerbájdžán</territory>
-			<territory type="BA">Bosna a Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladéš</territory>
-			<territory type="BE">Belgie</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulharsko</territory>
-			<territory type="BH">Bahrajn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Svatý Bartoloměj</territory>
-			<territory type="BM">Bermudy</territory>
-			<territory type="BN">Brunej Darussalam</territory>
-			<territory type="BO">Bolívie</territory>
-			<territory type="BR">Brazílie</territory>
-			<territory type="BS">Bahamy</territory>
-			<territory type="BT">Bhútán</territory>
-			<territory type="BV">Ostrov Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bělorusko</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosové ostrovy</territory>
-			<territory type="CD">Demokratická republika Kongo</territory>
-			<territory type="CF">Středoafrická republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Švýcarsko</territory>
-			<territory type="CI">Pobřeží slonoviny</territory>
-			<territory type="CK">Cookovy ostrovy</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Čína</territory>
-			<territory type="CO">Kolumbie</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Srbsko a Černá Hora</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kapverdy</territory>
-			<territory type="CX">Váno�ní ostrovy</territory>
-			<territory type="CY">Kypr</territory>
-			<territory type="CZ">Česká republika</territory>
-			<territory type="DE">Německo</territory>
-			<territory type="DJ">Džibuti</territory>
-			<territory type="DK">Dánsko</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikánská republika</territory>
-			<territory type="DZ">Alžírsko</territory>
-			<territory type="EC">Ekvádor</territory>
-			<territory type="EE">Estonsko</territory>
-			<territory type="EG">Egypt</territory>
-			<territory type="EH">Západní Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Španělsko</territory>
-			<territory type="ET">Etiopie</territory>
-			<territory type="FI">Finsko</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandské ostrovy</territory>
-			<territory type="FM">Mikronézie</territory>
-			<territory type="FO">Faerské ostrovy</territory>
-			<territory type="FR">Francie</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Velká Británie</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzie</territory>
-			<territory type="GF">Francouzská Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grónsko</territory>
-			<territory type="GM">Gambie</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Rovníková Guinea</territory>
-			<territory type="GR">Řecko</territory>
-			<territory type="GS">Jižní Georgie a Jižní Sandwichovy ostrovy</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong, zvláštní administrativní oblast Číny</territory>
-			<territory type="HM">Ostrovy Heard a McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Chorvatsko</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ma�arsko</territory>
-			<territory type="ID">Indonésie</territory>
-			<territory type="IE">Irsko</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Ostrov Man</territory>
-			<territory type="IN">Indie</territory>
-			<territory type="IO">Britské území v Indickém oceánu</territory>
-			<territory type="IQ">Irák</territory>
-			<territory type="IR">�rán</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Itálie</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordánsko</territory>
-			<territory type="JP">Japonsko</territory>
-			<territory type="KE">Keňa</territory>
-			<territory type="KG">Kyrgyzstán</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komory</territory>
-			<territory type="KN">Svatý Kitts a Nevis</territory>
-			<territory type="KP">Severní Korea</territory>
-			<territory type="KR">Jižní Korea</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanské ostrovy</territory>
-			<territory type="KZ">Kazachstán</territory>
-			<territory type="LA">Lidově demokratická republika Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Svatá Lucie</territory>
-			<territory type="LI">Lichtenštejnsko</territory>
-			<territory type="LK">Srí Lanka</territory>
-			<territory type="LR">Libérie</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litva</territory>
-			<territory type="LU">Lucembursko</territory>
-			<territory type="LV">Lotyšsko</territory>
-			<territory type="LY">Libye</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavsko, republika</territory>
-			<territory type="ME">Černá Hora</territory>
-			<territory type="MF">Svatý Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallovy ostrovy</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolsko</territory>
-			<territory type="MO">Zvláštní administrativní oblast Číny Macao</territory>
-			<territory type="MP">Severní Mariany</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mauritánie</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricius</territory>
-			<territory type="MV">Maladivy</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malajsie</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibie</territory>
-			<territory type="NC">Nová Kaledonie</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk</territory>
-			<territory type="NG">Nigérie</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Nizozemsko</territory>
-			<territory type="NO">Norsko</territory>
-			<territory type="NP">Nepál</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nový Zéland</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francouzská Polynésie</territory>
-			<territory type="PG">Papua-Nová Guinea</territory>
-			<territory type="PH">Filipíny</territory>
-			<territory type="PK">Pákistán</territory>
-			<territory type="PL">Polsko</territory>
-			<territory type="PM">Svatý Pierre a Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portoriko</territory>
-			<territory type="PS">Palestinian Territory</territory>
-			<territory type="PT">Portugalsko</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Vnější Oceánie</territory>
-			<territory type="QU">Evropská unie</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumunsko</territory>
-			<territory type="RS">Srbsko</territory>
-			<territory type="RU">Rusko</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saúdská Arábie</territory>
-			<territory type="SB">Å alamounovy ostrovy</territory>
-			<territory type="SC">Seychely</territory>
-			<territory type="SD">Súdán</territory>
-			<territory type="SE">Švédsko</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Svatá Helena</territory>
-			<territory type="SI">Slovinsko</territory>
-			<territory type="SJ">Svalbard a Jan Mayen</territory>
-			<territory type="SK">Slovensko</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somálsko</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Svatý Tomáš</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Sýrie</territory>
-			<territory type="SZ">Svazijsko</territory>
-			<territory type="TC">Ostrovy Caicos a Turks</territory>
-			<territory type="TD">ÄŒad</territory>
-			<territory type="TF">Francouzská jižní teritoria</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thajsko</territory>
-			<territory type="TJ">Tádžikistán</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Východní Timor</territory>
-			<territory type="TM">Turkmenistán</territory>
-			<territory type="TN">Tunisko</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turecko</territory>
-			<territory type="TT">Trinidad a Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tchaj-wan</territory>
-			<territory type="TZ">Tanzanie</territory>
-			<territory type="UA">Ukrajina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Menší odlehlé ostrovy USA</territory>
-			<territory type="US">Spojené státy</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistán</territory>
-			<territory type="VA">Svatý stolec</territory>
-			<territory type="VC">Svatý Vincent a Grenadiny</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britské Panenské ostrovy</territory>
-			<territory type="VI">Americké Panenské ostrovy</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis a Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Jihoafrická republika</territory>
-			<territory type="ZM">Zambie</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Neznámá nebo neplatná oblast</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Kalendář</key>
-			<key type="collation">Třídění</key>
-			<key type="currency">Měna</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">Buddhistický kalendář</type>
-			<type type="chinese" key="calendar">Čínský kalendář</type>
-			<type type="gregorian" key="calendar">Gregoriánský kalendář</type>
-			<type type="hebrew" key="calendar">Hebrejský kalendář</type>
-			<type type="indian" key="calendar">Indický národní kalendář</type>
-			<type type="islamic" key="calendar">Muslimský kalendář</type>
-			<type type="islamic-civil" key="calendar">Muslimský ob�anský kalendář</type>
-			<type type="japanese" key="calendar">Japonský kalendář</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrický</measurementSystemName>
-			<measurementSystemName type="US">USA</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Jazyk: {0}</codePattern>
-			<codePattern type="script">Skript: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á b c � d � e é ě f-h {ch} i í j-n ň o ó p-r ř s š t ť u ú ů v-y ý z ž]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‚</alternateQuotationStart>
-		<alternateQuotationEnd>‘</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ledna</month>
-							<month type="2">února</month>
-							<month type="3">března</month>
-							<month type="4">dubna</month>
-							<month type="5">května</month>
-							<month type="6">�ervna</month>
-							<month type="7">�ervence</month>
-							<month type="8">srpna</month>
-							<month type="9">září</month>
-							<month type="10">října</month>
-							<month type="11">listopadu</month>
-							<month type="12">prosince</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">1.</month>
-							<month type="2">2.</month>
-							<month type="3">3.</month>
-							<month type="4">4.</month>
-							<month type="5">5.</month>
-							<month type="6">6.</month>
-							<month type="7">7.</month>
-							<month type="8">8.</month>
-							<month type="9">9.</month>
-							<month type="10">10.</month>
-							<month type="11">11.</month>
-							<month type="12">12.</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">l</month>
-							<month type="2">ú</month>
-							<month type="3">b</month>
-							<month type="4">d</month>
-							<month type="5">k</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">s</month>
-							<month type="9">z</month>
-							<month type="10">Å™</month>
-							<month type="11">l</month>
-							<month type="12">p</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">leden</month>
-							<month type="2">únor</month>
-							<month type="3">březen</month>
-							<month type="4">duben</month>
-							<month type="5">květen</month>
-							<month type="6">�erven</month>
-							<month type="7">�ervenec</month>
-							<month type="8">srpen</month>
-							<month type="9">září</month>
-							<month type="10">říjen</month>
-							<month type="11">listopad</month>
-							<month type="12">prosinec</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ne</day>
-							<day type="mon">po</day>
-							<day type="tue">út</day>
-							<day type="wed">st</day>
-							<day type="thu">�t</day>
-							<day type="fri">pá</day>
-							<day type="sat">so</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">neděle</day>
-							<day type="mon">pondělí</day>
-							<day type="tue">úterý</day>
-							<day type="wed">středa</day>
-							<day type="thu">�tvrtek</day>
-							<day type="fri">pátek</day>
-							<day type="sat">sobota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">N</day>
-							<day type="mon">P</day>
-							<day type="tue">Ú</day>
-							<day type="wed">S</day>
-							<day type="thu">Č</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. �tvrtletí</quarter>
-							<quarter type="2">2. �tvrtletí</quarter>
-							<quarter type="3">3. �tvrtletí</quarter>
-							<quarter type="4">4. �tvrtletí</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>dop.</am>
-				<pm>odp.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">pÅ™.Kr.</era>
-						<era type="1">po Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.-d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.-M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M. - d.M.</greatestDifference>
-							<greatestDifference id="M">d.M. - d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M. - E, d.M.</greatestDifference>
-							<greatestDifference id="M">E, d.M. - E, d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yy - M.yy</greatestDifference>
-							<greatestDifference id="y">M.yy - M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="M">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="y">d.M.yy - d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="M">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="y">E, d.M.yy - E, d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y - E, d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL-LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y - LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Epocha</displayName>
-					</field>
-					<field type="year">
-						<displayName>Rok</displayName>
-					</field>
-					<field type="month">
-						<displayName>Měsíc</displayName>
-					</field>
-					<field type="week">
-						<displayName>Týden</displayName>
-					</field>
-					<field type="day">
-						<displayName>Den</displayName>
-						<relative type="-2">Předev�írem</relative>
-						<relative type="-1">V�era</relative>
-						<relative type="0">Dnes</relative>
-						<relative type="1">Zítra</relative>
-						<relative type="2">Pozítří</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Den v týdnu</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Část dne</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hodina</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Pásmo</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Není známo</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kábul</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Jižní pól</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Vídeň</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dháka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brusel</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofie</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrajn</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudy</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Brunej</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Bahía</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Curych</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Velikono�ní ostrov</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kašghar</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urum�i</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Čchung-�ching</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Å anghaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Charbin</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kapverdy</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Váno�ní ostrov</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Lefkosía</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlín</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kodaň</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžír</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapágy</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Káhira</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanárské ostrovy</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Paříž</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londýn</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atény</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Jižní Georgia</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapešť</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jeruzalém</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdád</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teherán</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavík</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Řím</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Ammán</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biškek</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Phnompenh</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pchjongjang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Soul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvajt</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Bejrút</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Lucembursko</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripolis</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangún</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulánbátar</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinik</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricius</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maledivy</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Tichuana</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Kará�í</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšava</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portoriko</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorské ostrovy</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukurešť</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekatěrinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rijád</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Chartúm</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sv. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadišo</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Svatý Tomáš</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damašek</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dušanbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅ¡gabad</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kyjev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Záporoží</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Aljašský �as</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Alaska">
-				<long>
-					<standard>Aljašský standardní �as</standard>
-					<daylight>Aljašský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<standard>Centrální standardní �as</standard>
-					<daylight>Centrální letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<standard>Východní standardní �as</standard>
-					<daylight>Východní letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<standard>Horský standardní �as</standard>
-					<daylight>Horský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<standard>Pacifický standardní �as</standard>
-					<daylight>Pacifický letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<standard>Atlantický standardní �as</standard>
-					<daylight>Atlantický letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Čínský standardní �as</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Středoevropský standardní �as</standard>
-					<daylight>Středoevropský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Východoevropský standardní �as</standard>
-					<daylight>Východoevropský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwichský střední �as</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Izraelský standardní �as</standard>
-					<daylight>Izraelský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Japonský standardní �as</standard>
-					<daylight>Japonský letní �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>Newfoundlandský standardní �as</standard>
-					<daylight>Newfoundlandský letní �as</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Peseta andorrská</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Dirham SAE</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghán (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghán</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram arménský</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Zlatý Nizozemských Antil</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Kwanza nová (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Peso argentinské (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso argentinské</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Å ilink</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dolar australský</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Zlatý arubský</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Manat ázerbajdžánský</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Dinár Bosny a Hercegoviny</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marka konvertibilní</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Dolar barbadoský</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Frank konvertibilní belgický</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Frank belgický</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Frank finan�ní belgický</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lev Bulharský</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Dinár bahrajnský</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Frank burundský</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Dolar bermudský</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dolar brunejský</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Cruzeiro (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Cruzeiro (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real brazilský</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Cruzado nové</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Cruzeiro real</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Dolar bahamský</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Kyat barmský</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Rubl nový běloruský (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rubl běloruský</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Dolar belizský</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dolar kanadský</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Frank konžský</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Frank švýcarský</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso chilské</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Juan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso kolumbijské</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colón kostarický</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Koruna �eskoslovenská</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso kubánské</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Escudo kapverdské</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Libra kyperská</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Koruna �eská</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Marka NDR</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marka německá</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Frank džibutský</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Koruna dánská</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso dominikánské</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dinár alžírský</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre ekvádorský</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuador Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Libra egyptská</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Peseta španělská („A“ ú�et)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Konvertibilní pesetové ú�ty</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Peseta španělská</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr etiopský</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Markka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dolar fidžijský</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Libra falklandská</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Frank francouzský</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Libra šterlinků</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgian Kupon Larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Libra gibraltarská</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Frank guinejský</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinea Syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Equatorial Guinea Ekwele Guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Drachma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Escudo guinejské</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Peso Guinnea-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Dolar guyanský</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Dolar hongkongský</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Dinar chorvatský</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna chorvatská</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupie indonézská</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Libra irská</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Libra izraelská</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Šekel nový izraelský</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupie indická</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dinár irácký</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rijál íránský</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Koruna islandská</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lira italská</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Dolar jamajský</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dinár jordánský</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Šilink keňský</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Frank komorský</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Won severokorejský</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won jihokorejský</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dinár kuvajtský</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dolar Kajmanských ostrovů</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libra libanonská</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Rupie srílanská</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Dolar liberijský</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litus litevský</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Talon</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Frank konvertibilní lucemburský</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Frank lucemburský</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Frank finan�ní lucemburský</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lat lotyšský</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Rubl lotyšský</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Dinár lybijský</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham marocký</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Frank marocký</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Leu moldavský</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Ariary madagaskarský</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Frank madagaskarský</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Denár</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Frank malijský</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira maltská</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Libra maltská</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Rupie mauricijská</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Kwacha malawská</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso mexické</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso stříbrné mexické (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexican Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit malajskijský</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Escudo Mosambiku</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Dolar namibijský</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Cordoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Zlatý holandský</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Koruna norská</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Rupie nepálská</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dolar novozélandský</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rijál ománský</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Nuevo sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso filipínské</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupie pákistánská</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zlotý</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zlotý (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Escudo portugalské</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rijál katarský</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Lei</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Leu rumunské</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinár srbský</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rubl ruský</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rubl ruský (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Frank rwandský</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Rijál saudský</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Dolar Šalamounových ostrovů</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Rupie seychelská</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Dinár súdánský</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Libra súdánská</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Koruna švédská</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dolar singapurský</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Libra Svaté Heleny</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Koruna slovenská</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Šilink somálský</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Zlatý surinamský</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Rubl</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colon salvadorský</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Libra syrská</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tajikistan Ruble</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Dinár tuniský</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Escudo timorské</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lira turecká</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lira nová turecká</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Dolar Trinidad a Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Dolar tchajvanský nový</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Šilink tanzanský</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hřivna</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Karbovanec</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Šilink ugandský (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Šilink ugandský</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dolar americký</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Dolar americký (příští den)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Dolar americký (týž den)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Peso uruguayské (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso uruguayské</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Sum uzbecký</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong vietnamský</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Frank BEAC/CFA</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Stříbro</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Zlato</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Evropská smíšená jednotka</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Evropská peněžní jednotka</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Evropská jednotka ú�tu 9 (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Evropská jednotka ú�tu 17 (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Dolar východokaribský</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>SDR</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Evropská měnová jednotka</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Frank zlatý</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Frank UIC</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Frank BCEAO/CFA</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Frank CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>Kód fondů RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Kódy zvlášť vyhrazené pro testovací ú�ely</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Neznámá nebo neplatná měna</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Dinár jemenský</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rijál jemenský</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Dinár jugoslávský nový [YUD]</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Dinár jugoslávský nový [YUM]</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Dinár jugoslávský konvertibilní</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Rand finan�ní</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha zambijská</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zaire nový</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Dolar zimbabwský</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dny</unitPattern>
-			<unitPattern count="one">{0} den</unitPattern>
-			<unitPattern count="other">{0} dní</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} hodiny</unitPattern>
-			<unitPattern count="one">{0} hodina</unitPattern>
-			<unitPattern count="other">{0} hodin</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minuty</unitPattern>
-			<unitPattern count="one">{0} minuta</unitPattern>
-			<unitPattern count="other">{0} minut</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} měsíce</unitPattern>
-			<unitPattern count="one">{0} měsíc</unitPattern>
-			<unitPattern count="other">{0} měsíců</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekundy</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekund</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} týdny</unitPattern>
-			<unitPattern count="one">{0} týden</unitPattern>
-			<unitPattern count="other">{0} týdnů</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} roky</unitPattern>
-			<unitPattern count="one">{0} rok</unitPattern>
-			<unitPattern count="other">{0} let</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ano:a</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/cs_CZ.xml b/airtime_mvc/library/Zend/Locale/Data/cs_CZ.xml
deleted file mode 100644
index ea4798136..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cs_CZ.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="cs"/>
-		<territory type="CZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/cy.xml b/airtime_mvc/library/Zend/Locale/Data/cy.xml
deleted file mode 100644
index 71093e2dc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cy.xml
+++ /dev/null
@@ -1,782 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.66 $"/>
-		<generation date="$Date: 2009/06/17 20:51:02 $"/>
-		<language type="cy"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Affricaneg</language>
-			<language type="am">Amhareg</language>
-			<language type="ar">Arabeg</language>
-			<language type="as">Asameg</language>
-			<language type="az">Azerbaijani</language>
-			<language type="be">Belarwsiyn</language>
-			<language type="bg">Bwlgareg</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Bengali; Bangla</language>
-			<language type="br">Llydaweg</language>
-			<language type="bs">Bosnieg</language>
-			<language type="ca">Catalaneg</language>
-			<language type="cs">Tsiec</language>
-			<language type="cy">Cymraeg</language>
-			<language type="da">Daneg</language>
-			<language type="de">Almaeneg</language>
-			<language type="el">Groeg</language>
-			<language type="en">Saesneg</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Sbaeneg</language>
-			<language type="et">Estoneg</language>
-			<language type="eu">Basgeg</language>
-			<language type="fa">Persieg</language>
-			<language type="fi">Ffineg</language>
-			<language type="fil">Tagalog</language>
-			<language type="fo">Ffaroeg</language>
-			<language type="fr">Ffrangeg</language>
-			<language type="fy">Ffrisieg</language>
-			<language type="ga">Gwyddeleg</language>
-			<language type="gd">Gaeleg yr Alban</language>
-			<language type="gl">Galiseg</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Gwjarati</language>
-			<language type="he">Hebraeg</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Croateg</language>
-			<language type="hu">Hwngareg</language>
-			<language type="hy">Armeneg</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesieg</language>
-			<language type="ie">Interlingue</language>
-			<language type="is">Islandeg</language>
-			<language type="it">Eidaleg</language>
-			<language type="ja">Siapaneeg</language>
-			<language type="jv">Jafanaeg</language>
-			<language type="ka">Georgeg</language>
-			<language type="km">Cambodieg</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Corëeg</language>
-			<language type="ku">Cwrdeg</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Lladin</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laoeg</language>
-			<language type="lt">Lithwaneg</language>
-			<language type="lv">Latfieg</language>
-			<language type="mk">Macedoneg</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongoleg</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malai</language>
-			<language type="mt">Malteseg</language>
-			<language type="ne">Nepali</language>
-			<language type="nl">Iseldireg</language>
-			<language type="nn">Norwyeg (Nynorsk)</language>
-			<language type="no">Norwyeg</language>
-			<language type="oc">Ocsitaneg</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Pwnjabi</language>
-			<language type="pl">Pwyleg</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portiwgaleg</language>
-			<language type="ro">Rwmaneg</language>
-			<language type="ru">Rwsieg</language>
-			<language type="sa">Sansgrit</language>
-			<language type="sd">Sindhi</language>
-			<language type="sh">Serbo-Croateg</language>
-			<language type="si">Sinhaleg</language>
-			<language type="sk">Slofaceg</language>
-			<language type="sl">Slofeneg</language>
-			<language type="so">Somaleg</language>
-			<language type="sq">Albaneg</language>
-			<language type="sr">Serbeg</language>
-			<language type="st">Sesotheg</language>
-			<language type="su">Sundaneg</language>
-			<language type="sv">Swedeg</language>
-			<language type="sw">Swahili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Tyrcmeneg</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Twrceg</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Wcreineg</language>
-			<language type="und">anh</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Wsbeceg</language>
-			<language type="vi">Fietnameg</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Iddew-Almaeneg</language>
-			<language type="zh">Tseineeg</language>
-			<language type="zu">Zwlw</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Lladin</script>
-		</scripts>
-		<territories>
-			<territory type="001">Y Byd</territory>
-			<territory type="002">Affrica</territory>
-			<territory type="005">De America</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Gorllewin Affrica</territory>
-			<territory type="013">Canolbarth America</territory>
-			<territory type="014">Dwyrain Affrica</territory>
-			<territory type="015">Gogledd Affrica</territory>
-			<territory type="017">Canol Affrica</territory>
-			<territory type="018">De Affrica [018]</territory>
-			<territory type="019">Americas</territory>
-			<territory type="021">Gogledd America</territory>
-			<territory type="029">Y Caribî</territory>
-			<territory type="030">Dwyrain Asia</territory>
-			<territory type="035">De ddwyrain Asia</territory>
-			<territory type="039">De Ewrop</territory>
-			<territory type="053">Awstralia a Seland Newydd</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Micronesia [057]</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">De Canol Asia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="145">Gorllewin Asia</territory>
-			<territory type="150">Ewrop</territory>
-			<territory type="151">Dwyrain Ewrop</territory>
-			<territory type="154">Gogledd Ewrop</territory>
-			<territory type="155">Gorllewin Ewrop</territory>
-			<territory type="830">Ynysoedd y Sianel</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiraethau Arabaidd Unedig</territory>
-			<territory type="AF">Affganistan</territory>
-			<territory type="AG">Antigwa a Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Ynysoedd Caribî yr Iseldiroedd</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Yr Ariannin</territory>
-			<territory type="AS">Samoa Americanaidd</territory>
-			<territory type="AT">Awstria</territory>
-			<territory type="AU">Awstralia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ynysoedd Aland</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia a Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Gwlad Belg</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bwlgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermwda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolifia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Y Bahamas</territory>
-			<territory type="BT">Bhwtan</territory>
-			<territory type="BV">Ynys Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarws</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Ynysoedd Cocos (Keeling)</territory>
-			<territory type="CD">Gweriniaeth Ddemocrataidd y Congo</territory>
-			<territory type="CF">Gweriniaeth Canol Affrica</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Y Swistir</territory>
-			<territory type="CI">Côte d’Ivoire</territory>
-			<territory type="CK">Ynysoedd Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Y Camerŵn</territory>
-			<territory type="CN">Tseina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CU">Ciwba</territory>
-			<territory type="CV">Cape Verde</territory>
-			<territory type="CX">Ynys y Nadolig</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Gweriniaeth Tsiec</territory>
-			<territory type="DE">Yr Almaen</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Denmarc</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Y Weriniaeth Ddominicaidd</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecwador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Yr Aifft</territory>
-			<territory type="EH">Gorllewin Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Sbaen</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Y Ffindir</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Ynysoedd y Falkland</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Ynysoedd Ffaröe</territory>
-			<territory type="FR">Ffrainc</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Prydain Fawr</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Giana Ffrengig</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Yr Ynys Las</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Gini</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Gini Gyhydeddol</territory>
-			<territory type="GR">Gwlad Groeg</territory>
-			<territory type="GS">Ynysoedd De Georgia a De Sandwich</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong S.A.R., Tseina</territory>
-			<territory type="HM">Ynys Heard ac Ynysoedd McDonald</territory>
-			<territory type="HN">Hondwras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hwngari</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Iwerddon</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Ynys Manaw</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Tiriogaeth Cefnfor India Prydain</territory>
-			<territory type="IQ">Irac</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Gwlad yr Iâ</territory>
-			<territory type="IT">Yr Eidal</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Yr Iorddonen</territory>
-			<territory type="JP">Siapan</territory>
-			<territory type="KE">Cenia</territory>
-			<territory type="KG">Cirgistan</territory>
-			<territory type="KH">Cambodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts a Nevis</territory>
-			<territory type="KP">Gogledd Corea</territory>
-			<territory type="KR">De Corea</territory>
-			<territory type="KW">Coweit</territory>
-			<territory type="KY">Ynysoedd Cayman</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanus</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithwania</territory>
-			<territory type="LU">Lwcsembwrg</territory>
-			<territory type="LV">Latfia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Moroco</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldofa</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Ynysoedd Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao S.A.R., Tseina</territory>
-			<territory type="MP">Ynysoedd Gogledd Mariana</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mawritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mawrisiws</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mecsico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Caledonia Newydd</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Ynys Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragwa</territory>
-			<territory type="NL">Yr Iseldiroedd</territory>
-			<territory type="NO">Norwy</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nawrw</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Seland Newydd</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Perw</territory>
-			<territory type="PF">Polynesia Ffrainc</territory>
-			<territory type="PG">Papua Gini Newydd</territory>
-			<territory type="PH">Philipinau</territory>
-			<territory type="PK">Pacistan</territory>
-			<territory type="PL">Gwlad Pwyl</territory>
-			<territory type="PM">Saint Pierre a Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Tiriogaeth Palesteina</territory>
-			<territory type="PT">Portiwgal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Ynysoedd Pellenig y De</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rwmania</territory>
-			<territory type="RU">Rwsia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Sawdi-Arabia</territory>
-			<territory type="SB">Ynysoedd Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Y Swdan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slofenia</territory>
-			<territory type="SJ">Svalbard a Jan Mayen</territory>
-			<territory type="SK">Slofacia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Swrinam</territory>
-			<territory type="ST">Sao Tome a Principe</territory>
-			<territory type="SV">El Salfador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Ynysoedd Turks a Caicos</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">Tiriogaethau Ffrengig y De</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Gwlad Thai</territory>
-			<territory type="TJ">Tajicistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor-Leste</territory>
-			<territory type="TM">Tyrcmenistan</territory>
-			<territory type="TN">Tiwnisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Twrci</territory>
-			<territory type="TT">Trinidad a Thobago</territory>
-			<territory type="TV">Twfalw</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansanïa</territory>
-			<territory type="UA">Wcráin</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Mân Ynysoedd Pellenig yr Unol Daleithiau</territory>
-			<territory type="US">Yr Unol Daleithiau</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Wsbecistan</territory>
-			<territory type="VA">Y Fatican</territory>
-			<territory type="VC">Saint Vincent a’r Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Ynysoedd Prydeinig y Wyryf</territory>
-			<territory type="VI">Ynysoedd Americanaidd y Wyryf</territory>
-			<territory type="VN">Fietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis a Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">De Affrica</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabwe</territory>
-		</territories>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrig</measurementSystemName>
-			<measurementSystemName type="US">UD</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á à â ä b c {ch} d {dd} e é è ê ë f {ff} g-i í ì î ï l {ll} m n {ng} o ó ò ô ö p {ph} r {rh} s t {th} u ú ù û ü w ẃ � ŵ ẅ y ý ỳ ŷ ÿ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[j k q v x z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ion</month>
-							<month type="2">Chwef</month>
-							<month type="3">Mawrth</month>
-							<month type="4">Ebrill</month>
-							<month type="5">Mai</month>
-							<month type="6">Meh</month>
-							<month type="7">Gorff</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hyd</month>
-							<month type="11">Tach</month>
-							<month type="12">Rhag</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ionawr</month>
-							<month type="2">Chwefror</month>
-							<month type="3">Mawrth</month>
-							<month type="4">Ebrill</month>
-							<month type="5">Mai</month>
-							<month type="6">Mehefin</month>
-							<month type="7">Gorffenaf</month>
-							<month type="8">Awst</month>
-							<month type="9">Medi</month>
-							<month type="10">Hydref</month>
-							<month type="11">Tachwedd</month>
-							<month type="12">Rhagfyr</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="2">Chwe</month>
-							<month type="3">Maw</month>
-							<month type="4">Ebr</month>
-							<month type="7">Gor</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">I</month>
-							<month type="2">C</month>
-							<month type="3">M</month>
-							<month type="4">E</month>
-							<month type="5">M</month>
-							<month type="6">M</month>
-							<month type="7">G</month>
-							<month type="8">A</month>
-							<month type="9">M</month>
-							<month type="10">H</month>
-							<month type="11">T</month>
-							<month type="12">R</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="7">Gorffennaf</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sul</day>
-							<day type="mon">Llun</day>
-							<day type="tue">Maw</day>
-							<day type="wed">Mer</day>
-							<day type="thu">Iau</day>
-							<day type="fri">Gwen</day>
-							<day type="sat">Sad</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dydd Sul</day>
-							<day type="mon">Dydd Llun</day>
-							<day type="tue">Dydd Mawrth</day>
-							<day type="wed">Dydd Mercher</day>
-							<day type="thu">Dydd Iau</day>
-							<day type="fri">Dydd Gwener</day>
-							<day type="sat">Dydd Sadwrn</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="fri">Gwe</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">I</day>
-							<day type="fri">G</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Ch1</quarter>
-							<quarter type="2">Ch2</quarter>
-							<quarter type="3">Ch3</quarter>
-							<quarter type="4">Ch4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Chwarter 1af</quarter>
-							<quarter type="2">2il chwarter</quarter>
-							<quarter type="3">3ydd chwarter</quarter>
-							<quarter type="4">4ydd chwarter</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Cyn Crist</era>
-						<era type="1">Oed Crist</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">CC</era>
-						<era type="1">OC</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">C</era>
-						<era type="1">O</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMMdd">yy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yy - d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy - d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy - d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/yy - E, d/M/yy</greatestDifference>
-							<greatestDifference id="M">E, d/M/yy - E, d/M/yy</greatestDifference>
-							<greatestDifference id="y">E, d/M/yy - E, d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM - MMM, y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM, y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM, y</greatestDifference>
-							<greatestDifference id="y">d MMM, y - d MMM, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM - E, d MMM, y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM, y</greatestDifference>
-							<greatestDifference id="y">E, d MMM, y - E, d MMM, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Oes</displayName>
-					</field>
-					<field type="year">
-						<displayName>Blwyddyn</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mis</displayName>
-					</field>
-					<field type="week">
-						<displayName>Wythnos</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dydd</displayName>
-						<relative type="-3">Dridiau yn ôl</relative>
-						<relative type="-2">Echdoe</relative>
-						<relative type="2">Drennydd</relative>
-						<relative type="3">Ymhen tridiau</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Dydd o'r Wythnos</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Awr</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Munud</displayName>
-					</field>
-					<field type="second">
-						<displayName>Eiliad</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Cylchfa</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Pegwn y De</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. John’s</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Llundain</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Dinas Mecsico</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Efrog Newydd</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Real Brasil</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi Tseina</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Ewro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Punt Sterling Prydain</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rwpî India</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen Siapan</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rwbl Rwsia</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Doler yr UDA</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/cy_GB.xml b/airtime_mvc/library/Zend/Locale/Data/cy_GB.xml
deleted file mode 100644
index 74ebb64c1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/cy_GB.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="cy"/>
-		<territory type="GB"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/da.xml b/airtime_mvc/library/Zend/Locale/Data/da.xml
deleted file mode 100644
index 2712a1f00..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/da.xml
+++ /dev/null
@@ -1,3129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.124 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="da"/>
-	</identity>
-	<fallback>nb nn sv en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhasisk</language>
-			<language type="ace">achinesisk</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avestan</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afro-asiatisk sprog</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadisk</language>
-			<language type="ale">aleutisk</language>
-			<language type="alg">algonkisk sprog</language>
-			<language type="alt">sydaltaisk</language>
-			<language type="am">amharisk</language>
-			<language type="an">aragonesisk</language>
-			<language type="ang">oldengelsk</language>
-			<language type="anp">angika</language>
-			<language type="apa">apachesprog</language>
-			<language type="ar">arabisk</language>
-			<language type="arc">aramæisk</language>
-			<language type="arn">araukansk</language>
-			<language type="arp">arapaho</language>
-			<language type="art">kunstsprog</language>
-			<language type="arw">arawak</language>
-			<language type="as">assamesisk</language>
-			<language type="ast">asturisk</language>
-			<language type="ath">athapaskisk sprog</language>
-			<language type="aus">australsk sprog</language>
-			<language type="av">avarisk</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">aserbajdsjansk</language>
-			<language type="ba">bashkir</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamilekisk sprog</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinesisk</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltisk sprog</language>
-			<language type="be">hviderussisk</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberisk</language>
-			<language type="bg">bulgarsk</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalsk</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetansk</language>
-			<language type="br">bretonsk</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnisk</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriatisk</language>
-			<language type="bug">buginesisk</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalansk</language>
-			<language type="cad">caddo</language>
-			<language type="cai">mellemamerikansk indiansk sprog</language>
-			<language type="car">caribisk</language>
-			<language type="cau">kaukasisk sprog</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tjetjensk</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">keltisk sprog</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukese</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">chamiske sprog</language>
-			<language type="co">korsikansk</language>
-			<language type="cop">koptisk</language>
-			<language type="cpe">engelsk baseret kreolsk eller pidgin</language>
-			<language type="cpf">fransk baseret kreolsk eller pidginsprog</language>
-			<language type="cpp">portugisisk baseret kreolsk eller pidginsprog</language>
-			<language type="cr">cree</language>
-			<language type="crh">krim tyrkisk</language>
-			<language type="crp">kreolsk eller pidginsprog</language>
-			<language type="cs">tjekkisk</language>
-			<language type="csb">kasjubisk</language>
-			<language type="cu">kirkeslavisk</language>
-			<language type="cus">kusjitisk sprog</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">walisisk</language>
-			<language type="da">dansk</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">tysk</language>
-			<language type="de_AT">østrigsk tysk</language>
-			<language type="de_CH">schweizerhøjtysk</language>
-			<language type="del">delaware</language>
-			<language type="den">athapaskisk</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidisk sprog</language>
-			<language type="dsb">nedersorbisk</language>
-			<language type="dua">duala</language>
-			<language type="dum">middelhollandsk</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">oldegyptisk</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">græsk</language>
-			<language type="elx">elamitisk</language>
-			<language type="en">engelsk</language>
-			<language type="en_AU">australsk engelsk</language>
-			<language type="en_CA">canadisk engelsk</language>
-			<language type="en_GB">britisk engelsk</language>
-			<language type="en_US">amerikansk engelsk</language>
-			<language type="enm">middelengelsk</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spansk</language>
-			<language type="es_419">latinamerikansk spansk</language>
-			<language type="es_ES">castiliansk spansk</language>
-			<language type="et">estisk</language>
-			<language type="eu">baskisk</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persisk</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulah</language>
-			<language type="fi">finsk</language>
-			<language type="fil">filippinsk</language>
-			<language type="fiu">finsk-ugrisk sprog</language>
-			<language type="fj">fijiansk</language>
-			<language type="fo">færøsk</language>
-			<language type="fon">fon</language>
-			<language type="fr">fransk</language>
-			<language type="fr_CA">canadisk fransk</language>
-			<language type="fr_CH">schweizisk fransk</language>
-			<language type="frm">middelfransk</language>
-			<language type="fro">oldfransk</language>
-			<language type="frr">nordfrisisk</language>
-			<language type="frs">østfrisisk</language>
-			<language type="fur">friulian</language>
-			<language type="fy">frisisk</language>
-			<language type="ga">irsk</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">skotsk gælisk</language>
-			<language type="gem">germansk sprog</language>
-			<language type="gez">geez</language>
-			<language type="gil">gilbertesisk</language>
-			<language type="gl">galicisk</language>
-			<language type="gmh">middelhøjtysk</language>
-			<language type="gn">guarani</language>
-			<language type="goh">oldhøjtysk</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotisk</language>
-			<language type="grb">grebo</language>
-			<language type="grc">oldgræsk</language>
-			<language type="gsw">schweizertysk</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiiansk</language>
-			<language type="he">hebraisk</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hittitisk</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">kroatisk</language>
-			<language type="hsb">øvresorbisk</language>
-			<language type="ht">haitisk</language>
-			<language type="hu">ungarsk</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armensk</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesisk</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">sichuan yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaq</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indisk sprog</language>
-			<language type="ine">indo-europæisk sprog</language>
-			<language type="inh">ingush</language>
-			<language type="io">ido</language>
-			<language type="ira">iransk sprog</language>
-			<language type="iro">irokesisk sprog</language>
-			<language type="is">islandsk</language>
-			<language type="it">italiensk</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japansk</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">jødisk-persisk</language>
-			<language type="jrb">jødisk-arabisk</language>
-			<language type="jv">javanesisk</language>
-			<language type="ka">georgisk</language>
-			<language type="kaa">karakalpakisk</language>
-			<language type="kab">kabyle</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardian</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisansprog</language>
-			<language type="kho">khotanesisk</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kasakhisk</language>
-			<language type="kl">grønlandsk</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannaresisk</language>
-			<language type="ko">koreansk</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraean</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karatjai-balkar</language>
-			<language type="krl">karelsk</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kashmiri</language>
-			<language type="ku">kurdisk</language>
-			<language type="kum">kymyk</language>
-			<language type="kut">kutenaj</language>
-			<language type="kv">komi</language>
-			<language type="kw">cornisk</language>
-			<language type="ky">kirgisisk</language>
-			<language type="la">latin</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxembourgsk</language>
-			<language type="lez">lezghian</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgsk</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotisk</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litauisk</language>
-			<language type="lu">luba-Katanga</language>
-			<language type="lua">luba-Lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">lettisk</language>
-			<language type="mad">madurese</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronesisk sprog</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malagasy</language>
-			<language type="mga">middelirsk</language>
-			<language type="mh">marshallese</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">diverse sprog</language>
-			<language type="mk">makedonsk</language>
-			<language type="mkh">mon-khmer sprog</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolsk</language>
-			<language type="mnc">manchu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobo sprog</language>
-			<language type="mo">moldovisk</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathisk</language>
-			<language type="ms">malay</language>
-			<language type="mt">maltesisk</language>
-			<language type="mul">flere sprog</language>
-			<language type="mun">mundasprog</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandesisk</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burmesisk</language>
-			<language type="myn">mayasprog</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">nordamerikansk indiansk sprog</language>
-			<language type="nap">neapolitansk</language>
-			<language type="nb">norsk bokmål</language>
-			<language type="nd">nordndebele</language>
-			<language type="nds">nedertysk</language>
-			<language type="ne">nepalesisk</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">Niger-Congo sprog</language>
-			<language type="niu">niuean</language>
-			<language type="nl">hollandsk</language>
-			<language type="nl_BE">flamsk</language>
-			<language type="nn">nynorsk</language>
-			<language type="no">norsk</language>
-			<language type="nog">nogai</language>
-			<language type="non">oldislandsk</language>
-			<language type="nqo">n-ko</language>
-			<language type="nr">sydndebele</language>
-			<language type="nso">nordsotho</language>
-			<language type="nub">nubisk sprog</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">klassisk newarisk</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro sprog</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitansk</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetisk</language>
-			<language type="osa">osage</language>
-			<language type="ota">osmannisk-tyrkisk</language>
-			<language type="oto">otomi sprog</language>
-			<language type="pa">punjabi</language>
-			<language type="paa">papua-australsk sprog</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauansk</language>
-			<language type="peo">oldpersisk</language>
-			<language type="phi">filippinsk sprog</language>
-			<language type="phn">fønikisk</language>
-			<language type="pi">pali</language>
-			<language type="pl">polsk</language>
-			<language type="pon">ponape</language>
-			<language type="pra">prakritsprog</language>
-			<language type="pro">oldprovencalsk</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugisisk</language>
-			<language type="pt_BR">brasiliansk portugisisk</language>
-			<language type="pt_PT">iberisk portugisisk</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongan</language>
-			<language type="rm">rætoromansk</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumænsk</language>
-			<language type="roa">romansk sprog</language>
-			<language type="rom">romani</language>
-			<language type="root">rot</language>
-			<language type="ru">russisk</language>
-			<language type="rup">arumænsk</language>
-			<language type="rw">kinyarwanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">yakut</language>
-			<language type="sai">sydamerikansk indiansk sprog</language>
-			<language type="sal">salikisk sprog</language>
-			<language type="sam">samaritansk</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardinsk</language>
-			<language type="scn">siciliansk</language>
-			<language type="sco">skotsk</language>
-			<language type="sd">sindhi</language>
-			<language type="se">nordsamisk</language>
-			<language type="sel">selkupisk</language>
-			<language type="sem">semitisk sprog</language>
-			<language type="sg">sango</language>
-			<language type="sga">oldirsk</language>
-			<language type="sgn">tegnsprog</language>
-			<language type="sh">serbokroatisk</language>
-			<language type="shn">shan</language>
-			<language type="si">singalesisk</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">sioux sprog</language>
-			<language type="sit">sino-tibetansk sprog</language>
-			<language type="sk">slovakisk</language>
-			<language type="sl">slovensk</language>
-			<language type="sla">slavisk sprog</language>
-			<language type="sm">samoansk</language>
-			<language type="sma">sydsamisk</language>
-			<language type="smi">samisk sprog</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalisk</language>
-			<language type="sog">sogdiansk</language>
-			<language type="son">songhai</language>
-			<language type="sq">albansk</language>
-			<language type="sr">serbisk</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssa">nilo-saharansk sprog</language>
-			<language type="st">sydsotho</language>
-			<language type="su">sundanesisk</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerisk</language>
-			<language type="sv">svensk</language>
-			<language type="sw">swahili</language>
-			<language type="syc">klassisk syrisk</language>
-			<language type="syr">syrisk</language>
-			<language type="ta">tamilsk</language>
-			<language type="tai">thaisprog</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tajik</language>
-			<language type="th">thailandsk</language>
-			<language type="ti">tigrinya</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tivi</language>
-			<language type="tk">turkmensk</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tongansk</language>
-			<language type="tog">nyasa tongansk</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">tyrkisk</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshisk</language>
-			<language type="tt">tatarisk</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupisprog</language>
-			<language type="tut">altaisk sprog</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitiansk</language>
-			<language type="tyv">tuvinian</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigurisk</language>
-			<language type="uga">ugaristisk</language>
-			<language type="uk">ukrainsk</language>
-			<language type="umb">umbundu</language>
-			<language type="und">ukendt eller ugyldigt sprog</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbekisk</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamesisk</language>
-			<language type="vo">volapyk</language>
-			<language type="vot">votisk</language>
-			<language type="wa">vallonsk</language>
-			<language type="wak">wakashansk sprog</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">vendisk sprog</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yap</language>
-			<language type="yi">jiddisch</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">yupisk sprog</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotec</language>
-			<language type="zbl">blissymboler</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kinesisk</language>
-			<language type="zh_Hans">forenklet kinesisk</language>
-			<language type="zh_Hant">traditionelt kinesisk</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">intet sprogligt indhold</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabisk</script>
-			<script type="Armi">armi</script>
-			<script type="Armn">armensk</script>
-			<script type="Avst">avestansk</script>
-			<script type="Bali">balinesisk</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalesisk</script>
-			<script type="Blis">blissymboler</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">bramisk</script>
-			<script type="Brai">blindskrift</script>
-			<script type="Bugi">buginesisk</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">cakm</script>
-			<script type="Cans">oprindelige canadiske symboler</script>
-			<script type="Cari">kariansk</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirt</script>
-			<script type="Copt">koptisk</script>
-			<script type="Cprt">cypriotisk</script>
-			<script type="Cyrl">kyrillisk</script>
-			<script type="Cyrs">kyrillisk - oldkirkeslavisk variant</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egyptisk demotisk</script>
-			<script type="Egyh">egyptisk hieratisk</script>
-			<script type="Egyp">egyptiske hieroglyffer</script>
-			<script type="Ethi">etiopisk</script>
-			<script type="Geok">georgisk kutsuri</script>
-			<script type="Geor">georgisk</script>
-			<script type="Glag">glagolitisk</script>
-			<script type="Goth">gotisk</script>
-			<script type="Grek">græsk</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">forenklet han</script>
-			<script type="Hant">traditionelt han</script>
-			<script type="Hebr">hebraisk</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana eller hiragana</script>
-			<script type="Hung">oldungarsk</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">Olditalisk</script>
-			<script type="Java">javanesisk</script>
-			<script type="Jpan">japansk</script>
-			<script type="Kali">kaya li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshti</script>
-			<script type="Khmr">khmerisk</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">koreansk</script>
-			<script type="Kthi">kthi</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotisk</script>
-			<script type="Latf">latinsk - frakturvariant</script>
-			<script type="Latg">latinsk - gælisk variant</script>
-			<script type="Latn">latinsk</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineær A</script>
-			<script type="Linb">lineær B</script>
-			<script type="Lyci">lykisk</script>
-			<script type="Lydi">lydisk</script>
-			<script type="Mand">mandaisk</script>
-			<script type="Mani">manikæisk</script>
-			<script type="Maya">mayahieroglyffer</script>
-			<script type="Mero">meroitisk</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongolsk</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei-mayek</script>
-			<script type="Mymr">myanmarsk</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol-chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmannisk</script>
-			<script type="Perm">oldpermisk</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">phli</script>
-			<script type="Phlp">phlp</script>
-			<script type="Phlv">pahlavi</script>
-			<script type="Phnx">fønikisk</script>
-			<script type="Plrd">pollardtegn</script>
-			<script type="Prti">prti</script>
-			<script type="Qaai">arvet</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongo-rongo</script>
-			<script type="Runr">runer</script>
-			<script type="Samr">samaritansk</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">tegnskrift</script>
-			<script type="Shaw">shavisk</script>
-			<script type="Sinh">singalesisk</script>
-			<script type="Sund">sundanesisk</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syrisk</script>
-			<script type="Syre">syrisk - estrangelovariant</script>
-			<script type="Syrj">vestsyrisk</script>
-			<script type="Syrn">østsyriakisk</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">tai lue</script>
-			<script type="Taml">tamilsk</script>
-			<script type="Tavt">tavt</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">thailandsk</script>
-			<script type="Tibt">tibetanske</script>
-			<script type="Ugar">ugaritisk</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">synlig tale</script>
-			<script type="Xpeo">oldpersisk</script>
-			<script type="Xsux">sumero-akkadisk cuneiform</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">zmth</script>
-			<script type="Zsym">zsym</script>
-			<script type="Zxxx">ikke-skriftsprog</script>
-			<script type="Zyyy">fælles</script>
-			<script type="Zzzz">ukendt eller ugyldig skriftsprog</script>
-		</scripts>
-		<territories>
-			<territory type="001">Verden</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nordamerika</territory>
-			<territory type="005">Sydamerika</territory>
-			<territory type="009">Oceanien</territory>
-			<territory type="011">Vestafrika</territory>
-			<territory type="013">Mellemamerika</territory>
-			<territory type="014">Østafrika</territory>
-			<territory type="015">Nordafrika</territory>
-			<territory type="017">Centralafrika</territory>
-			<territory type="018">Det sydlige Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Det nordlige Amerika</territory>
-			<territory type="029">Caribien</territory>
-			<territory type="030">Østasien</territory>
-			<territory type="034">Sydasien</territory>
-			<territory type="035">Sydøstasien</territory>
-			<territory type="039">Sydeuropa</territory>
-			<territory type="053">Australien og New Zealand</territory>
-			<territory type="054">Melanesien</territory>
-			<territory type="057">Mikronesien</territory>
-			<territory type="061">Polynesien</territory>
-			<territory type="062">Sydcentralasien</territory>
-			<territory type="142">Asien</territory>
-			<territory type="143">Centralasien</territory>
-			<territory type="145">Vestasien</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Østeuropa</territory>
-			<territory type="154">Nordeuropa</territory>
-			<territory type="155">Vesteuropa</territory>
-			<territory type="172">Sammenslutningen af uafhængige stater</territory>
-			<territory type="419">Latinamerika og Caribien</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Forenede Arabiske Emirater</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua og Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanien</territory>
-			<territory type="AM">Armenien</territory>
-			<territory type="AN">Hollandske Antiller</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikansk Samoa</territory>
-			<territory type="AT">Østrig</territory>
-			<territory type="AU">Australien</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…land</territory>
-			<territory type="AZ">Aserbajdsjan</territory>
-			<territory type="BA">Bosnien-Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgien</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarien</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasilien</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvetø</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Hviderusland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Cocosøerne</territory>
-			<territory type="CD">Congo-Kinshasa</territory>
-			<territory type="CF">Centralafrikanske Republik</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Schweiz</territory>
-			<territory type="CI">Elfenbenskysten</territory>
-			<territory type="CK">Cook-øerne</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Cameroun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbien og Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Juleøen</territory>
-			<territory type="CY">Cypern</territory>
-			<territory type="CZ">Tjekkiet</territory>
-			<territory type="DE">Tyskland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Den Dominikanske Republik</territory>
-			<territory type="DZ">Algeriet</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egypten</territory>
-			<territory type="EH">Vestsahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanien</territory>
-			<territory type="ET">Etiopien</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji-øerne</territory>
-			<territory type="FK">Falklandsøerne</territory>
-			<territory type="FM">Mikronesiens Forenede Stater</territory>
-			<territory type="FO">Færøerne</territory>
-			<territory type="FR">Frankrig</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Storbritannien</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgien</territory>
-			<territory type="GF">Fransk Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grønland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ækvatorialguinea</territory>
-			<territory type="GR">Grækenland</territory>
-			<territory type="GS">South Georgia og De Sydlige Sandwichøer</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">SAR Hongkong</territory>
-			<territory type="HM">Heard- og McDonald-øerne</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatien</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesien</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">Indien</territory>
-			<territory type="IO">Det Britiske Territorium i Det Indiske Ocean</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italien</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Cambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comorerne</territory>
-			<territory type="KN">Saint Kitts og Nevis</territory>
-			<territory type="KP">Nordkorea</territory>
-			<territory type="KR">Sydkorea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Caymanøerne</territory>
-			<territory type="KZ">Kasakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Letland</territory>
-			<territory type="LY">Libyen</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Republikken Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalløerne</territory>
-			<territory type="MK">Republikken Makedonien</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongoliet</territory>
-			<territory type="MO">SAR Macao</territory>
-			<territory type="MP">Nordmarianerne</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauretanien</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldiverne</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Ny Caledonien</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Island</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Holland</territory>
-			<territory type="NO">Norge</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fransk Polynesien</territory>
-			<territory type="PG">Papua Ny Guinea</territory>
-			<territory type="PH">Filippinerne</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">Saint Pierre og Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">De palæstinensiske områder</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Ydre Oceanien</territory>
-			<territory type="QU">EU</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Rumænien</territory>
-			<territory type="RS">Serbien</territory>
-			<territory type="RU">Rusland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi-Arabien</territory>
-			<territory type="SB">Salomonøerne</territory>
-			<territory type="SC">Seychellerne</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sverige</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">St. Helena</territory>
-			<territory type="SI">Slovenien</territory>
-			<territory type="SJ">Svalbard og Jan Mayen</territory>
-			<territory type="SK">Slovakiet</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome og Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrien</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks- og Caicosøerne</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Franske Besiddelser i Det Sydlige Indiske Ocean</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor-Leste</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunesien</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tyrkiet</territory>
-			<territory type="TT">Trinidad og Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">De Mindre Amerikanske Oversøiske Øer</territory>
-			<territory type="US">USA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikanstaten</territory>
-			<territory type="VC">St. Vincent og Grenadinerne</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">De britiske jomfruøer</territory>
-			<territory type="VI">De amerikanske jomfruøer</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis og Futunaøerne</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sydafrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Ukendt eller ugyldigt område</territory>
-		</territories>
-		<variants>
-			<variant type="1901">traditionel tysk retskrivning</variant>
-			<variant type="1996">tysk retskrivning fra 1996</variant>
-			<variant type="AREVELA">østarmensk</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">det internationale fonetiske alfabet</variant>
-			<variant type="FONUPA">det uraliske fonetiske alfabet</variant>
-			<variant type="LIPAW">lipovaz</variant>
-			<variant type="POSIX">computer</variant>
-			<variant type="REVISED">revideret retskrivning</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalender</key>
-			<key type="collation">Sortering</key>
-			<key type="currency">Valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">sorteringsrækkefølge uforkortet kinesisk - Big5</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="direct" key="collation">direkte sorteringsrækkefølge</type>
-			<type type="gb2312han" key="collation">sorteringsrækkefølge forkortet kinesisk - GB2312</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="hebrew" key="calendar">jødisk kalender</type>
-			<type type="indian" key="calendar">indisk nationalkalender</type>
-			<type type="islamic" key="calendar">islamisk kalender</type>
-			<type type="islamic-civil" key="calendar">verdslig islamisk kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="phonebook" key="collation">sorteringsrækkefølge i telefonbøger</type>
-			<type type="pinyin" key="collation">pinyin-baseret sorteringsrækkefølge</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="stroke" key="collation">stregbaseret sorteringsrækkefølge</type>
-			<type type="traditional" key="collation">traditionel sorteringsrækkefølge</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Det metriske system</measurementSystemName>
-			<measurementSystemName type="US">De amerikanske målesystemer</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Sprog: {0}</codePattern>
-			<codePattern type="script">Instruks: {0}</codePattern>
-			<codePattern type="territory">Område: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="fields">titlecase-firstword</inText>
-		<inText type="keys">titlecase-firstword</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="long">lowercase-words</inText>
-		<inText type="measurementSystemNames">lowercase-words</inText>
-		<inText type="quarterWidth">titlecase-firstword</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="types">lowercase-words</inText>
-		<inText type="variants">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a-z æ ø å]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á é è ê ë ß ü ä ö]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>�</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>�</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan.</month>
-							<month type="2">feb.</month>
-							<month type="3">mar.</month>
-							<month type="4">apr.</month>
-							<month type="5">maj</month>
-							<month type="6">jun.</month>
-							<month type="7">jul.</month>
-							<month type="8">aug.</month>
-							<month type="9">sep.</month>
-							<month type="10">okt.</month>
-							<month type="11">nov.</month>
-							<month type="12">dec.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">marts</month>
-							<month type="4">april</month>
-							<month type="5">maj</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">søn</day>
-							<day type="mon">man</day>
-							<day type="tue">tir</day>
-							<day type="wed">ons</day>
-							<day type="thu">tor</day>
-							<day type="fri">fre</day>
-							<day type="sat">lør</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">søndag</day>
-							<day type="mon">mandag</day>
-							<day type="tue">tirsdag</day>
-							<day type="wed">onsdag</day>
-							<day type="thu">torsdag</day>
-							<day type="fri">fredag</day>
-							<day type="sat">lørdag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">O</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">L</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>f.m.</am>
-				<pm>e.m.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE 'den' d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d.</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="M">M</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E. d-M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">MMM</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE. d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE. d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q. 'kvartal' yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.-d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH.mm-HH.mm</greatestDifference>
-							<greatestDifference id="h">HH.mm-HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH.mm-HH.mm v</greatestDifference>
-							<greatestDifference id="h">HH.mm-HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E 'den' d. - E 'den' d. MMM</greatestDifference>
-							<greatestDifference id="M">E 'den' d. MMM - E 'den' d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">MMMM-MMMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E 'den' d. - E 'den' d. MMM y</greatestDifference>
-							<greatestDifference id="M">E 'den' d. MMM - E 'den' d. MMM y</greatestDifference>
-							<greatestDifference id="y">E 'den' d. MMM y - E 'den' d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM-MM yyyy</greatestDifference>
-							<greatestDifference id="y">MM yyyy - MM yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>æra</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ã¥r</displayName>
-					</field>
-					<field type="month">
-						<displayName>måned</displayName>
-					</field>
-					<field type="week">
-						<displayName>uge</displayName>
-					</field>
-					<field type="day">
-						<displayName>dag</displayName>
-						<relative type="-3">for tre dage siden</relative>
-						<relative type="-2">i forgårs</relative>
-						<relative type="-1">i går</relative>
-						<relative type="0">i dag</relative>
-						<relative type="1">i morgen</relative>
-						<relative type="2">i overmorgen</relative>
-						<relative type="3">om tre dage</relative>
-					</field>
-					<field type="weekday">
-						<displayName>ugedag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>dagtid</displayName>
-					</field>
-					<field type="hour">
-						<displayName>time</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minut</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH.mm;-HH.mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Ukendt</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Sydpolen</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelles</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Påskeøen</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kap Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Juleøen</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>København</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Algier</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>De Kanariske Øer</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Færøerne</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athen</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rom</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldiverne</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warszawa</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorerne</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre-tid</standard>
-					<daylight>Acre-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afghansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>centralafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>østafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>sydafrikansk tid</generic>
-					<standard>sydafrikansk normaltid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>vestafrikansk tid</standard>
-					<daylight>vestafrikansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk-tid</standard>
-					<daylight>Aktyubinsk-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska-tid</generic>
-					<standard>Alaska-normaltid</standard>
-					<daylight>Alaska-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii-tid</generic>
-					<standard>Alaska-Hawaii-normaltid</standard>
-					<daylight>Alaska-Hawaii-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almaty-tid</standard>
-					<daylight>Almaty-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazonas-tid</standard>
-					<daylight>Amazonas-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central-tid</generic>
-					<standard>Central-normaltid</standard>
-					<daylight>Central-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Eastern-tid</generic>
-					<standard>Eastern-normaltid</standard>
-					<daylight>Eastern-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Mountain-tid</generic>
-					<standard>Mountain-normaltid</standard>
-					<daylight>Mountain-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pacific-tid</generic>
-					<standard>Pacific-normaltid</standard>
-					<daylight>Pacific-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadyr-tid</standard>
-					<daylight>Anadyr-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aqtau-tid</standard>
-					<daylight>Aqtau-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aqtobe-tid</standard>
-					<daylight>Aqtobe-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabisk tid</generic>
-					<standard>Arabisk normaltid</standard>
-					<daylight>Arabisk sommertid</daylight>
-				</long>
-				<short>
-					<generic>AT (arabisk)</generic>
-					<standard>AST (arabisk)</standard>
-					<daylight>ADT (arabisk)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentinsk tid</standard>
-					<daylight>Argentinsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Vestargentinsk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armensk tid</standard>
-					<daylight>Armensk sommertid</daylight>
-				</long>
-				<short>
-					<daylight>AMST (Armenien)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashkhabad-tid</standard>
-					<daylight>Ashkhabad-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantic-tid</generic>
-					<standard>Atlantic-normaltid</standard>
-					<daylight>Atlantic-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Centralaustralsk tid</generic>
-					<standard>Centralaustralsk normaltid</standard>
-					<daylight>Centralaustralsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Vestlig centralaustralsk tid</generic>
-					<standard>Vestlig centralaustralsk normaltid</standard>
-					<daylight>Vestlig centralaustralsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Østaustralsk tid</generic>
-					<standard>Østaustralsk normaltid</standard>
-					<daylight>Østaustralsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Vestaustralsk tid</generic>
-					<standard>Vestaustralsk normaltid</standard>
-					<daylight>Vestaustralsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Aserbajdsjansk tid</standard>
-					<daylight>Aserbajdsjansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Baku-tid</standard>
-					<daylight>Baku-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladeshisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering-tid</generic>
-					<standard>Bering-normaltid</standard>
-					<daylight>Bering-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutanesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Boliviansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo-tid</standard>
-					<daylight>Borneo-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brasiliansk tid</standard>
-					<daylight>Brasiliansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunei Darussalam-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Chilensk tid</standard>
-					<daylight>Chilensk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Kinesisk tid</generic>
-					<standard>Kinesisk normaltid</standard>
-					<daylight>Kinesisk sommertid</daylight>
-				</long>
-				<short>
-					<generic>CT (Kina)</generic>
-					<standard>CST (Kina)</standard>
-					<daylight>CDT (Kina)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Choibalsan-tid</standard>
-					<daylight>Choibalsan-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Colombiansk tid</standard>
-					<daylight>Colombiansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Cubansk tid</generic>
-					<standard>Cubansk normaltid</standard>
-					<daylight>Cubansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dacca-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Davis-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dumont-d'Urville-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dushanbe-tid</standard>
-					<daylight>Dushanbe-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Hollandsk Guiana-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Østtimor-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ecuadoriansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>mellemeuropæisk tid</generic>
-					<standard>mellemeuropæisk normaltid</standard>
-					<daylight>mellemeuropæisk sommertid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>østeuropæisk tid</generic>
-					<standard>østeuropæisk normaltid</standard>
-					<daylight>østeuropæisk sommertid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic>vesteuropæisk tid</generic>
-					<standard>vesteuropæisk normaltid</standard>
-					<daylight>vesteuropæisk sommertid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Fransk Guiana-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze-tid</standard>
-					<daylight>Frunze-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Georgiansk tid</standard>
-					<daylight>Georgiansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Verdenstid</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Centralgrønlandsk tid</standard>
-					<daylight>Centralgrønlandsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Østgrønlandsk tid</standard>
-					<daylight>Østgrønlandsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Vestgrønlandsk tid</standard>
-					<daylight>Vestgrønlandsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Guyana-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hongkong-tid</standard>
-					<daylight>Hongkong-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hovd-tid</standard>
-					<daylight>Hovd-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Indisk normaltid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Indokinesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Centralindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Østindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Vestindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Israelsk normaltid</standard>
-					<daylight>Israelsk sommertid</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japansk tid</generic>
-					<standard>Japansk normaltid</standard>
-					<daylight>Japansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<standard>Koreansk normaltid</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howe-tid</generic>
-					<standard>Lord Howe-normaltid</standard>
-					<daylight>Lord Howe-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Mawson-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Moskva-normaltid</standard>
-					<daylight>Moskva-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Newzealandsk tid</generic>
-					<standard>Newzealandsk normaltid</standard>
-					<daylight>Newzealandsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Newfoundland-tid</generic>
-					<standard>Newfoundland-normaltid</standard>
-					<daylight>Newfoundland-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronha-tid</standard>
-					<daylight>Fernando de Noronha-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paraguayansk tid</standard>
-					<daylight>Paraguayansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peruviansk tid</standard>
-					<daylight>Peruviansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre- og Miquelon-tid</generic>
-					<standard>Pierre- og Miquelon-normaltid</standard>
-					<daylight>Pierre- og Miquelon-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Rothera-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Surinam-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Syowa-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Uruguayansk tid</standard>
-					<daylight>Uruguayansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venezuelansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vostok-tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon-tid</generic>
-					<standard>Yukon-normaltid</standard>
-					<daylight>Yukon-sommertid</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>,</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorransk peseta</displayName>
-				<displayName count="other">Andorranske pesetas</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Dirham fra de Forenede Arabiske Emirater</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albansk lek</displayName>
-				<displayName count="one">Albansk lek</displayName>
-				<displayName count="other">Albanske lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armensk dram</displayName>
-				<displayName count="other">Armenske dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Gylden fra De Hollandske Antiller</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolansk kwanza</displayName>
-				<displayName count="other">Angolanske kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolansk kwanza (1977-1990)</displayName>
-				<displayName count="other">Angolanske kwanza (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Ny angolansk kwanza (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolansk kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentinsk austral</displayName>
-				<displayName count="one">Argentinsk austral</displayName>
-				<displayName count="other">Argentinske austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinsk peso (1983-1985)</displayName>
-				<displayName count="one">Argentinsk pesos (APR)</displayName>
-				<displayName count="other">Argentinske pesos (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinsk peso</displayName>
-				<displayName count="one">Argentinsk pesos</displayName>
-				<displayName count="other">Argentinske pesos</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Østrigsk schilling</displayName>
-				<displayName count="one">Østrigsk schilling</displayName>
-				<displayName count="other">Østrigske schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australsk dollar</displayName>
-				<displayName count="one">Australsk dollar</displayName>
-				<displayName count="other">Australske dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubansk gylden</displayName>
-				<displayName count="other">Arubanske gylden</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Aserbajdsjansk manat 1993-2006</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Aserbajdsjansk manat</displayName>
-				<displayName count="one">Aserbajdsjansk manat</displayName>
-				<displayName count="other">Aserbajdsjanske manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnien-Hercegovinsk dinar</displayName>
-				<displayName count="other">Bosnien-Hercegovinske dinarer</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnien-Hercegovinsk konvertibel mark</displayName>
-				<displayName count="other">Bosnien-Hercegovinske konvertible mark</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadisk dollar</displayName>
-				<displayName count="other">Barbadiske dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeshisk taka</displayName>
-				<displayName count="other">Bangladeshiske taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgisk franc (konvertibel)</displayName>
-				<displayName count="one">Belgisk franc (konvertibel)</displayName>
-				<displayName count="other">Belgiske franc (konvertible)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgisk franc</displayName>
-				<displayName count="one">Belgisk franc</displayName>
-				<displayName count="other">Belgiske franc</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgisk franc (financial)</displayName>
-				<displayName count="one">Belgisk franc (financial)</displayName>
-				<displayName count="other">Belgiske franc (financial)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgarsk hard lev</displayName>
-				<displayName count="other">Bulgarske hard lev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Ny bulgarsk lev</displayName>
-				<displayName count="other">Ny bulgarske lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahrainsk dinar</displayName>
-				<displayName count="other">Bahrainske dinarer</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundisk franc</displayName>
-				<displayName count="other">Burundiske franc</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudansk dollar</displayName>
-				<displayName count="other">Bermudanske dollar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Bruneisk dollar</displayName>
-				<displayName count="other">Bruneiske dollar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviansk boliviano</displayName>
-				<displayName count="other">Bolivianske boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Boliviansk peso</displayName>
-				<displayName count="other">Bolivianske pesos</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Boliviansk mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brasiliansk cruzeiro novo (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brasiliansk cruzado</displayName>
-				<displayName count="other">Brasilianske cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brasiliansk cruzeiro (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brasiliansk real</displayName>
-				<displayName count="one">Brasiliansk real</displayName>
-				<displayName count="other">Brasilianske real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brasiliansk cruzado novo</displayName>
-				<displayName count="other">Brasilianske cruzado novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brasiliansk cruzeiro</displayName>
-				<displayName count="one">Brasiliansk cruzeiro</displayName>
-				<displayName count="other">Brasilianske cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamansk dollar</displayName>
-				<displayName count="other">Bahamanske dollar</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutansk ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmesisk kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswansk pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Ny hviderussisk rubel (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Hviderussisk rubel</displayName>
-				<displayName count="other">Hviderussiske rubler</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizisk dollar</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Canadisk dollar</displayName>
-				<displayName count="one">Canadisk dollar</displayName>
-				<displayName count="other">Canadiske dollar</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Congolesisk franc congolais</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Schweizisk franc</displayName>
-				<displayName count="one">Schweizisk franc</displayName>
-				<displayName count="other">Schweiziske franc</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franc</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilensk unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilensk peso</displayName>
-				<displayName count="one">Chilensk pesos</displayName>
-				<displayName count="other">Chilenske pesos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Kinesisk yuan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Colombiansk peso</displayName>
-				<displayName count="one">Colombiansk pesos</displayName>
-				<displayName count="other">Colombianske pesos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costaricansk colon</displayName>
-				<displayName count="one">Costaricansk colon</displayName>
-				<displayName count="other">Costaricanske colon</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Gammel serbisk dinar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Tjekkoslovakisk hard koruna</displayName>
-				<displayName count="one">Tjekkoslovakisk hard koruna</displayName>
-				<displayName count="other">Tjekkoslovakiske hard koruna</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Cubansk peso</displayName>
-				<displayName count="one">Cubansk pesos</displayName>
-				<displayName count="other">Cubanske pesos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kapverdisk escudo</displayName>
-				<displayName count="other">Kapverdiske escudos</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Cypriotisk pund</displayName>
-				<displayName count="one">Cypriotisk pund</displayName>
-				<displayName count="other">Cypriotiske pund</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Tjekkisk koruna</displayName>
-				<displayName count="one">Tjekkisk koruna</displayName>
-				<displayName count="other">Tjekkiske koruna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Østtysk mark</displayName>
-				<displayName count="other">Østtyske mark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Tysk mark</displayName>
-				<displayName count="one">Tysk mark</displayName>
-				<displayName count="other">Tyske mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Djiboutisk franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Dansk krone</displayName>
-				<displayName count="one">Dansk krone</displayName>
-				<displayName count="other">Danske kroner</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikansk peso</displayName>
-				<displayName count="other">Dominikanske pesos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algerisk dinar</displayName>
-				<displayName count="one">Algerisk dinar</displayName>
-				<displayName count="other">Algeriske dinarer</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadoriansk sucre</displayName>
-				<displayName count="other">Ecuadorianske sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuadoriansk Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estisk kroon</displayName>
-				<displayName count="one">Estisk kroon</displayName>
-				<displayName count="other">Estiske kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptisk pund</displayName>
-				<displayName count="one">Egyptisk pund</displayName>
-				<displayName count="other">Egyptiske pund</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritreisk nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Spansk peseta (A-konto)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Spansk peseta (konvertibel konto)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spansk peseta</displayName>
-				<displayName count="one">Spansk pesetas</displayName>
-				<displayName count="other">Spanske pesetas</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiopisk birr</displayName>
-				<displayName count="other">Etiopiske birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finsk mark</displayName>
-				<displayName count="one">Finsk mark</displayName>
-				<displayName count="other">Finske mar</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fijiansk dollar</displayName>
-				<displayName count="one">Fijiansk dollar</displayName>
-				<displayName count="other">Fijianske dollar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Pund fra Falklandsøerne</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Fransk franc</displayName>
-				<displayName count="one">Fransk franc</displayName>
-				<displayName count="other">Franske franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Britisk pund</displayName>
-				<displayName count="one">Britisk pund</displayName>
-				<displayName count="other">Britiske pund</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgisk kupon larit</displayName>
-				<displayName count="one">Georgisk kupon larit</displayName>
-				<displayName count="other">Georgiske kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgisk lari</displayName>
-				<displayName count="one">Georgisk lari</displayName>
-				<displayName count="other">Georgiske lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanesisk cedi 1979-2007</displayName>
-				<displayName count="other">Ghanesiske cedi</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanesisk cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltarisk pund</displayName>
-				<displayName count="one">Gibraltarisk pund</displayName>
-				<displayName count="other">Gibraltariske pund</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambisk dalasi</displayName>
-				<displayName count="other">Gambiske dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guineansk franc</displayName>
-				<displayName count="other">Guineanske franc</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guineansk syli</displayName>
-				<displayName count="other">Guineanske syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ækvatorialguineask ekwele guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Græsk drakme</displayName>
-				<displayName count="one">Græsk drakmer</displayName>
-				<displayName count="other">Græske drakmer</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalansk quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugisisk guinea escudo</displayName>
-				<displayName count="other">Portugisiske guinea escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guineansk peso</displayName>
-				<displayName count="other">Guinea-Bissau-pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyansk dollar</displayName>
-				<displayName count="other">Guyanske dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduransk lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroatisk dinar</displayName>
-				<displayName count="one">Kroatisk dinar</displayName>
-				<displayName count="other">Kroatiske dinarer</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kroatisk kuna</displayName>
-				<displayName count="one">Kroatisk kuna</displayName>
-				<displayName count="other">Kroatiske kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haitisk gourde</displayName>
-				<displayName count="other">Haitiske gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Ungarsk forint</displayName>
-				<displayName count="one">Ungarsk forint</displayName>
-				<displayName count="other">Ungarske forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonesisk pupiah</displayName>
-				<displayName count="other">Indonesiske rupiah</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Irsk pund</displayName>
-				<displayName count="other">Irske pund</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israelsk pund</displayName>
-				<displayName count="one">Israelsk pund</displayName>
-				<displayName count="other">Israelske pund</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Ny israelsk shekel</displayName>
-				<displayName count="one">Ny israelsk shekel</displayName>
-				<displayName count="other">Nye israelske shekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indisk rupee</displayName>
-				<displayName count="one">Indisk rupee</displayName>
-				<displayName count="other">Indiske rupees</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irakisk dinar</displayName>
-				<displayName count="one">Irakisk dinar</displayName>
-				<displayName count="other">Irakiske dinarer</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iransk rial</displayName>
-				<displayName count="one">Iransk rial</displayName>
-				<displayName count="other">Iranske rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islansk krone</displayName>
-				<displayName count="one">Islandsk krone</displayName>
-				<displayName count="other">Islandske kroner</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italiensk lire</displayName>
-				<displayName count="one">Italiensk lire</displayName>
-				<displayName count="other">Italienske lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaicansk dollar</displayName>
-				<displayName count="other">Jamaicanske dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordansk dinar</displayName>
-				<displayName count="other">Jordanske dinarer</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japansk yen</displayName>
-				<displayName count="one">Japansk yen</displayName>
-				<displayName count="other">Japanske yen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenyansk shilling</displayName>
-				<displayName count="other">Kenyanske shilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgisisk som</displayName>
-				<displayName count="other">Kirgisiske som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Cambodjansk riel</displayName>
-				<displayName count="other">Cambodjanske riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Comorisk franc</displayName>
-				<displayName count="other">Comoriske franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Nordkoreansk won</displayName>
-				<displayName count="one">Nordkoreansk won</displayName>
-				<displayName count="other">Nordkoreanske won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Sydkoreansk won</displayName>
-				<displayName count="one">Sydkoreansk won</displayName>
-				<displayName count="other">Sydkoreanske won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuwaitisk dinar</displayName>
-				<displayName count="other">Kuwaitiske dinarer</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dollar fra Caymanøerne</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kasakhisk tenge</displayName>
-				<displayName count="other">Kasakhiske tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laotisk kip</displayName>
-				<displayName count="other">Laotiske kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanesisk pund</displayName>
-				<displayName count="other">Libanesiske pund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Srilankansk rupee</displayName>
-				<displayName count="other">Srilankanske rupees</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberisk dollar</displayName>
-				<displayName count="other">Liberiske dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesothisk loti</displayName>
-				<displayName count="other">Lesothiske loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litauisk lita</displayName>
-				<displayName count="other">Litauiske lita</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litauisk talonas</displayName>
-				<displayName count="other">Litauiske talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxembourgsk konvertibel franc</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxembourgsk franc</displayName>
-				<displayName count="one">Luxembourgsk franc</displayName>
-				<displayName count="other">Luxembourgske franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxembourgsk finansiel franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lettisk lat</displayName>
-				<displayName count="one">Lettisk lat</displayName>
-				<displayName count="other">Lettiske lat</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lettisk rubel</displayName>
-				<displayName count="one">Lettisk rubel</displayName>
-				<displayName count="other">Lettiske rubler</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libysk dinar</displayName>
-				<displayName count="other">Libyske dinarer</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkansk dirham</displayName>
-				<displayName count="other">Marokkanske dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkansk franc</displayName>
-				<displayName count="other">Marokkanske franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovisk leu</displayName>
-				<displayName count="other">Moldoviske leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskisk ariary</displayName>
-				<displayName count="other">Madagaskiske ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskisk franc</displayName>
-				<displayName count="other">Madagaskiske franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedonsk denar</displayName>
-				<displayName count="other">Makedonske denarer</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malisk franc</displayName>
-				<displayName count="other">Maliske franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmarsk kyat</displayName>
-				<displayName count="other">Myanmarske kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolsk tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macaosk pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritansk ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltesisk lira</displayName>
-				<displayName count="other">Maltesiske lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltesisk pund</displayName>
-				<displayName count="other">Maltesiske pund</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritisk rupee</displayName>
-				<displayName count="other">Mauritiske rupees</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldivisk rufiyaa</displayName>
-				<displayName count="other">Maldiviske rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawisk kwacha</displayName>
-				<displayName count="other">Malawiske kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexicansk peso</displayName>
-				<displayName count="one">Mexicansk pesos</displayName>
-				<displayName count="other">Mexicanske pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexicansk silver peso (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexicansk Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysisk ringgit</displayName>
-				<displayName count="other">Malaysiske ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambiquisk escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Gammel mozambiquisk metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambiquisk metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibisk dollar</displayName>
-				<displayName count="other">Namibiske dollar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigeriansk naira</displayName>
-				<displayName count="other">Nigerianske naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nicaraguansk cordoba</displayName>
-				<displayName count="other">Nicaraguanske cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nicaraguansk cordoba oro</displayName>
-				<displayName count="other">Nicaraguanske cordoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Hollandsk guilder</displayName>
-				<displayName count="one">Hollandsk gylden</displayName>
-				<displayName count="other">Hollandske gylden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norsk krone</displayName>
-				<displayName count="one">Norsk krone</displayName>
-				<displayName count="other">Norske kroner</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalesisk rupee</displayName>
-				<displayName count="other">Nepalesiske rupees</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>New Zealandsk dollar</displayName>
-				<displayName count="one">New Zealandsk dollar</displayName>
-				<displayName count="other">New Zealandske dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omansk rial</displayName>
-				<displayName count="other">Omanske rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamansk balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruviansk inti</displayName>
-				<displayName count="other">Peruvianske inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruviansk sol nuevo</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruviansk sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papuansk kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filippinsk peso</displayName>
-				<displayName count="one">Filippinsk pesos</displayName>
-				<displayName count="other">Filippinske pesos</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistansk rupee</displayName>
-				<displayName count="other">Pakistanske rupees</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polsk zloty</displayName>
-				<displayName count="one">Polsk zloty</displayName>
-				<displayName count="other">Polske zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Polsk zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugisisk escudo</displayName>
-				<displayName count="other">Portugisiske escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguaysk guarani</displayName>
-				<displayName count="one">Paraguayske guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatarsk rial</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Gammel rumænsk leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumænsk leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbisk dinar</displayName>
-				<displayName count="other">Serbiske dinarer</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russisk rubel</displayName>
-				<displayName count="other">Russiske rubler</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Russisk rubel (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rwandisk franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudisk riyal</displayName>
-				<displayName count="other">Saudiske riyal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomonsk dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychellisk rupee</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Sudansk dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudanesisk pund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudansk pund</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Svensk krone</displayName>
-				<displayName count="one">Svensk krone</displayName>
-				<displayName count="other">Svenske kroner</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singaporeansk dollar</displayName>
-				<displayName count="other">Singaporeanske dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Pund fra Saint Helena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovensk tolar</displayName>
-				<displayName count="other">Slovenske tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovakisk koruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierraleonsk leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalisk shilling</displayName>
-				<displayName count="other">Somaliske shilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamsk dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamsk guilder</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra fra Sao Tome og Principe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovjetisk rubel</displayName>
-				<displayName count="one">Sovjetisk rubel</displayName>
-				<displayName count="other">Sovjetiske rubler</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadoransk colon</displayName>
-				<displayName count="other">Salvadoranske colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syrisk pund</displayName>
-				<displayName count="one">Syrisk pund</displayName>
-				<displayName count="other">Syriske pund</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Swazilandsk lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thailandsk baht</displayName>
-				<displayName count="one">Thailandsk baht</displayName>
-				<displayName count="other">Thailandske baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadsjikisk rubel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadsjikisk somoni</displayName>
-				<displayName count="other">Tadsjikiske somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmensk manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunesisk dinar</displayName>
-				<displayName count="other">Tunesiske dinarer</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongask paʻanga</displayName>
-				<displayName count="other">Tongaske paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Escudo fra Timor</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Tyrkisk lire</displayName>
-				<displayName count="one">Tyrkisk lire</displayName>
-				<displayName count="other">Tyrkiske lire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Ny tyrkisk lire</displayName>
-				<displayName count="other">Tyrkiske lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Dollar fra Trinidad og Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Ny taiwansk dollar</displayName>
-				<displayName count="other">Taiwanske dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanisk shilling</displayName>
-				<displayName count="other">Tanzaniske shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainsk grynia</displayName>
-				<displayName count="other">Ukrainske grynia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainsk karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandisk shilling (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandisk shilling</displayName>
-				<displayName count="other">Ugandiske shilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Amerikansk dollar</displayName>
-				<displayName count="one">Amerikansk dollar</displayName>
-				<displayName count="other">Amerikanske dollar</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>Amerikansk dollar (næste dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Amerikansk dollar (samme dag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayan Peso en Unidades Indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguaysk peso (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguaysk peso uruguayo</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Usbekisk sum</displayName>
-				<displayName count="other">Usbekiske sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelansk bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelansk bolivar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamesisk dong</displayName>
-				<displayName count="other">Vietnamesiske dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuaisk vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Samoansk tala</displayName>
-				<displayName count="other">Samoanske tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Beninsk CFA-franc</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Sølv</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Guld</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>EURCO</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>EMU</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Østkaribisk dollar</displayName>
-				<displayName count="other">Østkaribiske dollar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>SDR</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ECU</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Fransk guldfranc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Fransk UIC-franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA-franc BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP-franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platinum</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-fond</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>testvalutakode</displayName>
-				<displayName count="one">testvaluta</displayName>
-				<displayName count="other">testvaluta</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Ukendt eller ugyldig valuta</displayName>
-				<displayName count="one">ukendt valuta</displayName>
-				<displayName count="other">ukendt valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Yemenitisk dinar</displayName>
-				<displayName count="other">Yemenitiske dinarer</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Yemenitisk rial</displayName>
-				<displayName count="other">Yemenitiske rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoslavisk hard dinar</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoslavisk noviy dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslavisk konvertibel dinar</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Sydafrikansk rand (financial)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Sydafrikansk rand</displayName>
-				<displayName count="other">Sydafrikanske rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambisk kwacha</displayName>
-				<displayName count="other">Zambiske kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Ny zairisk zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairisk zaire</displayName>
-				<displayName count="other">Zairiske zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwisk dollar</displayName>
-				<displayName count="other">Zimbabwiske dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dage</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} time</unitPattern>
-			<unitPattern count="other">{0} timer</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minutter</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} måned</unitPattern>
-			<unitPattern count="other">{0} måneder</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekunder</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} uge</unitPattern>
-			<unitPattern count="other">{0} uger</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} år</unitPattern>
-			<unitPattern count="other">{0} år</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nej:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/da_DK.xml b/airtime_mvc/library/Zend/Locale/Data/da_DK.xml
deleted file mode 100644
index 48c8375de..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/da_DK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="da"/>
-		<territory type="DK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/de.xml b/airtime_mvc/library/Zend/Locale/Data/de.xml
deleted file mode 100644
index 93288d96e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de.xml
+++ /dev/null
@@ -1,2948 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.137 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="de"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abchasisch</language>
-			<language type="ace">Aceh-Sprache</language>
-			<language type="ach">Acholi-Sprache</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adygeisch</language>
-			<language type="ae">Avestisch</language>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Afroasiatische Sprachen</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu-Sprache</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadisch</language>
-			<language type="ale">Aleutisch</language>
-			<language type="alg">Algonkin-Sprachen</language>
-			<language type="alt">Süd-Altaisch</language>
-			<language type="am">Amharisch</language>
-			<language type="an">Aragonesisch</language>
-			<language type="ang">Altenglisch</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apachen-Sprache</language>
-			<language type="ar">Arabisch</language>
-			<language type="arc">Aramäisch</language>
-			<language type="arn">Araukanisch</language>
-			<language type="arp">Arapaho-Sprache</language>
-			<language type="art">Kunstsprache</language>
-			<language type="arw">Arawak-Sprachen</language>
-			<language type="as">Assamesisch</language>
-			<language type="ast">Asturianisch</language>
-			<language type="ath">Athapaskische Sprachen</language>
-			<language type="aus">Australische Sprachen</language>
-			<language type="av">Awarisch</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Aserbaidschanisch</language>
-			<language type="ba">Baschkirisch</language>
-			<language type="bad">Banda-Sprache</language>
-			<language type="bai">Bamileke-Sprache</language>
-			<language type="bal">Belutschisch</language>
-			<language type="ban">Balinesisch</language>
-			<language type="bas">Basaa-Sprache</language>
-			<language type="bat">Baltische Sprachen</language>
-			<language type="be">Weißrussisch</language>
-			<language type="bej">Bedauye</language>
-			<language type="bem">Bemba-Sprache</language>
-			<language type="ber">Berbersprache</language>
-			<language type="bg">Bulgarisch</language>
-			<language type="bh">Biharisch</language>
-			<language type="bho">Bhodschpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol-Sprache</language>
-			<language type="bin">Bini-Sprache</language>
-			<language type="bla">Blackfoot-Sprache</language>
-			<language type="bm">Bambara-Sprache</language>
-			<language type="bn">Bengalisch</language>
-			<language type="bnt">Bantusprachen</language>
-			<language type="bo">Tibetisch</language>
-			<language type="br">Bretonisch</language>
-			<language type="bra">Braj-Bhakha</language>
-			<language type="bs">Bosnisch</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Burjatisch</language>
-			<language type="bug">Buginesisch</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalanisch</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Zentralamerikanische Indianersprache</language>
-			<language type="car">Karibische Sprachen</language>
-			<language type="cau">Kaukasische Sprache</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Tschetschenisch</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Keltische Sprachen</language>
-			<language type="ch">Chamorro-Sprache</language>
-			<language type="chb">Chibcha-Sprache</language>
-			<language type="chg">Tschagataisch</language>
-			<language type="chk">Trukesisch</language>
-			<language type="chm">Tscheremissisch</language>
-			<language type="chn">Chinook</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Cham-Sprachen</language>
-			<language type="co">Korsisch</language>
-			<language type="cop">Koptisch</language>
-			<language type="cpe">Kreolisch-Englische Sprache</language>
-			<language type="cpf">Kreolisch-Französische Sprache</language>
-			<language type="cpp">Kreolisch-Portugiesische Sprache</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Krimtatarisch</language>
-			<language type="crp">Kreolische Sprache</language>
-			<language type="cs">Tschechisch</language>
-			<language type="csb">Kaschubisch</language>
-			<language type="cu">Kirchenslawisch</language>
-			<language type="cus">Kuschitische Sprachen</language>
-			<language type="cv">Tschuwaschisch</language>
-			<language type="cy">Walisisch</language>
-			<language type="da">Dänisch</language>
-			<language type="dak">Dakota-Sprache</language>
-			<language type="dar">Darginisch</language>
-			<language type="day">Dajak</language>
-			<language type="de">Deutsch</language>
-			<language type="de_AT">Österreichisches Deutsch</language>
-			<language type="de_CH">Schweizer Hochdeutsch</language>
-			<language type="del">Delaware-Sprache</language>
-			<language type="den">Slave</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka-Sprache</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Drawidische Sprache</language>
-			<language type="dsb">Niedersorbisch</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Mittelniederländisch</language>
-			<language type="dv">Maledivisch</language>
-			<language type="dyu">Dyula-Sprache</language>
-			<language type="dz">Bhutanisch</language>
-			<language type="ee">Ewe-Sprache</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Ägyptisch</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Griechisch</language>
-			<language type="elx">Elamisch</language>
-			<language type="en">Englisch</language>
-			<language type="en_AU">Australisches Englisch</language>
-			<language type="en_CA">Kanadisches Englisch</language>
-			<language type="en_GB">Britisches Englisch</language>
-			<language type="en_US">Amerikanisches Englisch</language>
-			<language type="enm">Mittelenglisch</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanisch</language>
-			<language type="es_419">Lateinamerikanisches Spanisch</language>
-			<language type="es_ES">Iberisches Spanisch</language>
-			<language type="et">Estnisch</language>
-			<language type="eu">Baskisch</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Persisch</language>
-			<language type="fan">Pangwe-Sprache</language>
-			<language type="fat">Fanti-Sprache</language>
-			<language type="ff">Ful</language>
-			<language type="fi">Finnisch</language>
-			<language type="fil">Filipino</language>
-			<language type="fiu">Finnougrische Sprachen</language>
-			<language type="fj">Fidschianisch</language>
-			<language type="fo">Färöisch</language>
-			<language type="fon">Fon-Sprache</language>
-			<language type="fr">Französisch</language>
-			<language type="fr_CA">Kanadisches Französisch</language>
-			<language type="fr_CH">Schweizer Französisch</language>
-			<language type="frm">Mittelfranzösisch</language>
-			<language type="fro">Altfranzösisch</language>
-			<language type="frr">Nordfriesisch</language>
-			<language type="frs">Ostfriesisch</language>
-			<language type="fur">Friulisch</language>
-			<language type="fy">Friesisch</language>
-			<language type="ga">Irisch</language>
-			<language type="gaa">Ga-Sprache</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya-Sprache</language>
-			<language type="gd">Schottisches Gälisch</language>
-			<language type="gem">Germanische Sprachen</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbertesisch</language>
-			<language type="gl">Galizisch</language>
-			<language type="gmh">Mittelhochdeutsch</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Althochdeutsch</language>
-			<language type="gon">Gondi-Sprache</language>
-			<language type="gor">Mongondou</language>
-			<language type="got">Gotisch</language>
-			<language type="grb">Grebo-Sprache</language>
-			<language type="grc">Altgriechisch</language>
-			<language type="gsw">Schweizerdeutsch</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="gwi">Kutchin-Sprache</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida-Sprache</language>
-			<language type="haw">Hawaiisch</language>
-			<language type="he">Hebräisch</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynon-Sprache</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hethitisch</language>
-			<language type="hmn">Miao-Sprachen</language>
-			<language type="ho">Hiri-Motu</language>
-			<language type="hr">Kroatisch</language>
-			<language type="hsb">Obersorbisch</language>
-			<language type="ht">Haitianisch</language>
-			<language type="hu">Ungarisch</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armenisch</language>
-			<language type="hz">Herero-Sprache</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indonesisch</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo-Sprache</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo-Sprache</language>
-			<language type="ik">Inupiak</language>
-			<language type="ilo">Ilokano-Sprache</language>
-			<language type="inc">Indoarische Sprache</language>
-			<language type="ine">Indogermanische Sprachen</language>
-			<language type="inh">Inguschisch</language>
-			<language type="io">Ido-Sprache</language>
-			<language type="ira">Iranische Sprachen</language>
-			<language type="iro">Irokesische Sprache</language>
-			<language type="is">Isländisch</language>
-			<language type="it">Italienisch</language>
-			<language type="iu">Inukitut</language>
-			<language type="ja">Japanisch</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Jüdisch-Persisch</language>
-			<language type="jrb">Jüdisch-Arabisch</language>
-			<language type="jv">Javanisch</language>
-			<language type="ka">Georgisch</language>
-			<language type="kaa">Karakalpakisch</language>
-			<language type="kab">Kabylisch</language>
-			<language type="kac">Kachin-Sprache</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karenisch</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardinisch</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi-Sprache</language>
-			<language type="khi">Khoisan-Sprache</language>
-			<language type="kho">Sakisch</language>
-			<language type="ki">Kikuyu-Sprache</language>
-			<language type="kj">Kwanyama</language>
-			<language type="kk">Kasachisch</language>
-			<language type="kl">Grönländisch</language>
-			<language type="km">Kambodschanisch</language>
-			<language type="kmb">Kimbundu-Sprache</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Koreanisch</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraeanisch</language>
-			<language type="kpe">Kpelle-Sprache</language>
-			<language type="kr">Kanuri-Sprache</language>
-			<language type="krc">Karatschaiisch-Balkarisch</language>
-			<language type="krl">Karelisch</language>
-			<language type="kro">Kru-Sprachen</language>
-			<language type="kru">Oraon-Sprache</language>
-			<language type="ks">Kaschmirisch</language>
-			<language type="ku">Kurdisch</language>
-			<language type="kum">Kumükisch</language>
-			<language type="kut">Kutenai-Sprache</language>
-			<language type="kv">Komi-Sprache</language>
-			<language type="kw">Kornisch</language>
-			<language type="ky">Kirgisisch</language>
-			<language type="la">Latein</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba-Sprache</language>
-			<language type="lb">Luxemburgisch</language>
-			<language type="lez">Lesgisch</language>
-			<language type="lg">Ganda-Sprache</language>
-			<language type="li">Limburgisch</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laotisch</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Rotse-Sprache</language>
-			<language type="lt">Litauisch</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno-Sprache</language>
-			<language type="lun">Lunda-Sprache</language>
-			<language type="luo">Luo-Sprache</language>
-			<language type="lus">Lushai-Sprache</language>
-			<language type="lv">Lettisch</language>
-			<language type="mad">Maduresisch</language>
-			<language type="mag">Khotta</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makassarisch</language>
-			<language type="man">Manding-Sprache</language>
-			<language type="map">Austronesische Sprachen</language>
-			<language type="mas">Massai-Sprache</language>
-			<language type="mdf">Moksha</language>
-			<language type="mdr">Mandaresisch</language>
-			<language type="men">Mende-Sprache</language>
-			<language type="mg">Malagassi-Sprache</language>
-			<language type="mga">Mittelirisch</language>
-			<language type="mh">Marschallesisch</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac-Sprache</language>
-			<language type="min">Minangkabau-Sprache</language>
-			<language type="mis">Verschiedene Sprachen</language>
-			<language type="mk">Mazedonisch</language>
-			<language type="mkh">Mon-Khmer-Sprache</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolisch</language>
-			<language type="mnc">Mandschurisch</language>
-			<language type="mni">Meithei-Sprache</language>
-			<language type="mno">Manobo-Sprache</language>
-			<language type="mo">Moldauisch</language>
-			<language type="moh">Mohawk-Sprache</language>
-			<language type="mos">Mossi-Sprache</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malaiisch</language>
-			<language type="mt">Maltesisch</language>
-			<language type="mul">Mehrsprachig</language>
-			<language type="mun">Munda-Sprachen</language>
-			<language type="mus">Muskogee-Sprachen</language>
-			<language type="mwl">Mirandesisch</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Birmanisch</language>
-			<language type="myn">Maya-Sprachen</language>
-			<language type="myv">Ersja-Mordwinisch</language>
-			<language type="na">Nauruisch</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Nordamerikanische Indianersprache</language>
-			<language type="nap">Neapolitanisch</language>
-			<language type="nb">Norwegisch Bokmål</language>
-			<language type="nd">Nord-Ndebele-Sprache</language>
-			<language type="nds">Niederdeutsch</language>
-			<language type="ne">Nepalesisch</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias-Sprache</language>
-			<language type="nic">Nigerkordofanische Sprachen</language>
-			<language type="niu">Niue-Sprache</language>
-			<language type="nl">Niederländisch</language>
-			<language type="nl_BE">Flämisch</language>
-			<language type="nn">Norwegisch Nynorsk</language>
-			<language type="no">Norwegisch</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Altnordisch</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">Süd-Ndebele-Sprache</language>
-			<language type="nso">Nord-Sotho-Sprache</language>
-			<language type="nub">Nubische Sprachen</language>
-			<language type="nv">Navajo-Sprache</language>
-			<language type="nwc">Alt-Newari</language>
-			<language type="ny">Nyanja-Sprache</language>
-			<language type="nym">Nyamwezi-Sprache</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Okzitanisch</language>
-			<language type="oj">Ojibwa-Sprache</language>
-			<language type="om">Oromo</language>
-			<language type="or">Orija</language>
-			<language type="os">Ossetisch</language>
-			<language type="osa">Osage-Sprache</language>
-			<language type="ota">Osmanisch</language>
-			<language type="oto">Otomangue-Sprachen</language>
-			<language type="pa">Pandschabisch</language>
-			<language type="paa">Papuasprachen</language>
-			<language type="pag">Pangasinan-Sprache</language>
-			<language type="pal">Mittelpersisch</language>
-			<language type="pam">Pampanggan-Sprache</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palau</language>
-			<language type="peo">Altpersisch</language>
-			<language type="phi">Philippinen-Austronesische Sprachen</language>
-			<language type="phn">Phönikisch</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Polnisch</language>
-			<language type="pon">Ponapeanisch</language>
-			<language type="pra">Prakrit</language>
-			<language type="pro">Altprovenzalisch</language>
-			<language type="ps">Paschtu</language>
-			<language type="pt">Portugiesisch</language>
-			<language type="pt_BR">Brasilianisches Portugiesisch</language>
-			<language type="pt_PT">Iberisches Portugiesisch</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Osterinsel-Sprache</language>
-			<language type="rar">Rarotonganisch</language>
-			<language type="rm">Rätoromanisch</language>
-			<language type="rn">Rundi-Sprache</language>
-			<language type="ro">Rumänisch</language>
-			<language type="roa">Romanische Sprachen</language>
-			<language type="rom">Romani</language>
-			<language type="root">Root</language>
-			<language type="ru">Russisch</language>
-			<language type="rup">Aromunisch</language>
-			<language type="rw">Ruandisch</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandawe-Sprache</language>
-			<language type="sah">Jakutisch</language>
-			<language type="sai">Südamerikanische Indianersprache</language>
-			<language type="sal">Salish-Sprache</language>
-			<language type="sam">Samaritanisch</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardisch</language>
-			<language type="scn">Sizilianisch</language>
-			<language type="sco">Schottisch</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Nord-Samisch</language>
-			<language type="sel">Selkupisch</language>
-			<language type="sem">Semitische Sprachen</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Altirisch</language>
-			<language type="sgn">Gebärdensprache</language>
-			<language type="sh">Serbo-Kroatisch</language>
-			<language type="shn">Schan-Sprache</language>
-			<language type="si">Singhalesisch</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Sioux-Sprachen</language>
-			<language type="sit">Sinotibetische Sprache</language>
-			<language type="sk">Slowakisch</language>
-			<language type="sl">Slowenisch</language>
-			<language type="sla">Slawische Sprachen</language>
-			<language type="sm">Samoanisch</language>
-			<language type="sma">Süd-Samisch</language>
-			<language type="smi">Lappisch</language>
-			<language type="smj">Lule-Lappisch</language>
-			<language type="smn">Inari-Lappisch</language>
-			<language type="sms">Skolt-Lappisch</language>
-			<language type="sn">Shona</language>
-			<language type="snk">Soninke-Sprache</language>
-			<language type="so">Somali</language>
-			<language type="sog">Sogdisch</language>
-			<language type="son">Songhai-Sprache</language>
-			<language type="sq">Albanisch</language>
-			<language type="sr">Serbisch</language>
-			<language type="srn">Srananisch</language>
-			<language type="srr">Serer-Sprache</language>
-			<language type="ss">Swazi</language>
-			<language type="ssa">Nilosaharanische Sprachen</language>
-			<language type="st">Süd-Sotho-Sprache</language>
-			<language type="su">Sundanesisch</language>
-			<language type="suk">Sukuma-Sprache</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumerisch</language>
-			<language type="sv">Schwedisch</language>
-			<language type="sw">Suaheli</language>
-			<language type="syc">Altsyrisch</language>
-			<language type="syr">Syrisch</language>
-			<language type="ta">Tamilisch</language>
-			<language type="tai">Thaisprache</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Temne</language>
-			<language type="ter">Tereno-Sprache</language>
-			<language type="tet">Tetum-Sprache</language>
-			<language type="tg">Tadschikisch</language>
-			<language type="th">Thailändisch</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv-Sprache</language>
-			<language type="tk">Turkmenisch</language>
-			<language type="tkl">Tokelauanisch</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingonisch</language>
-			<language type="tli">Tlingit-Sprache</language>
-			<language type="tmh">Tamaseq</language>
-			<language type="tn">Tswana-Sprache</language>
-			<language type="to">Tongaisch</language>
-			<language type="tog">Tsonga-Sprache</language>
-			<language type="tpi">Neumelanesisch</language>
-			<language type="tr">Türkisch</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian-Sprache</language>
-			<language type="tt">Tatarisch</language>
-			<language type="tum">Tumbuka-Sprache</language>
-			<language type="tup">Tupi-Sprachen</language>
-			<language type="tut">Altaische Sprache</language>
-			<language type="tvl">Elliceanisch</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitisch</language>
-			<language type="tyv">Tuwinisch</language>
-			<language type="udm">Udmurtisch</language>
-			<language type="ug">Uigurisch</language>
-			<language type="uga">Ugaritisch</language>
-			<language type="uk">Ukrainisch</language>
-			<language type="umb">Mbundu-Sprache</language>
-			<language type="und">Unbestimmte Sprache</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Usbekisch</language>
-			<language type="vai">Vai-Sprache</language>
-			<language type="ve">Venda-Sprache</language>
-			<language type="vi">Vietnamesisch</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Wotisch</language>
-			<language type="wa">Wallonisch</language>
-			<language type="wak">Wakashanisch</language>
-			<language type="wal">Walamo-Sprache</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo-Sprache</language>
-			<language type="wen">Sorbisch</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmückisch</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao-Sprache</language>
-			<language type="yap">Yapesisch</language>
-			<language type="yi">Jiddisch</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik-Sprache</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotekisch</language>
-			<language type="zbl">Bliss-Symbole</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Chinesisch</language>
-			<language type="zh_Hans">Chinesisch (vereinfacht)</language>
-			<language type="zh_Hant">Chinesisch (traditionell)</language>
-			<language type="znd">Zande-Sprache</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni-Sprache</language>
-			<language type="zxx">Keine Sprachinhalte</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabisch</script>
-			<script type="Armi">Armi</script>
-			<script type="Armn">Armenisch</script>
-			<script type="Avst">Avestisch</script>
-			<script type="Bali">Balinesisch</script>
-			<script type="Batk">Battakisch</script>
-			<script type="Beng">Bengalisch</script>
-			<script type="Blis">Bliss-Symbole</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Blindenschrift</script>
-			<script type="Bugi">Buginesisch</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Cakm</script>
-			<script type="Cans">UCAS</script>
-			<script type="Cari">Karisch</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptisch</script>
-			<script type="Cprt">Zypriotisch</script>
-			<script type="Cyrl">Kyrillisch</script>
-			<script type="Cyrs">Altkirchenslawisch</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Ägyptisch - Demotisch</script>
-			<script type="Egyh">Ägyptisch - Hieratisch</script>
-			<script type="Egyp">Ägyptische Hieroglyphen</script>
-			<script type="Ethi">Äthiopisch</script>
-			<script type="Geok">Khutsuri</script>
-			<script type="Geor">Georgisch</script>
-			<script type="Glag">Glagolitisch</script>
-			<script type="Goth">Gotisch</script>
-			<script type="Grek">Griechisch</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Chinesisch</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Vereinfachte Chinesische Schrift</script>
-			<script type="Hant">Traditionelle Chinesische Schrift</script>
-			<script type="Hebr">Hebräisch</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana oder Hiragana</script>
-			<script type="Hung">Altungarisch</script>
-			<script type="Inds">Indus-Schrift</script>
-			<script type="Ital">Altitalisch</script>
-			<script type="Java">Javanesisch</script>
-			<script type="Jpan">Japanisch</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreanisch</script>
-			<script type="Kthi">Kthi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Laotisch</script>
-			<script type="Latf">Lateinisch - Fraktur-Variante</script>
-			<script type="Latg">Lateinisch - Gälische Variante</script>
-			<script type="Latn">Lateinisch</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Linear A</script>
-			<script type="Linb">Linear B</script>
-			<script type="Lyci">Lykisch</script>
-			<script type="Lydi">Lydisch</script>
-			<script type="Mand">Mandäisch</script>
-			<script type="Mani">Manichäisch</script>
-			<script type="Maya">Maya-Hieroglyphen</script>
-			<script type="Mero">Meroitisch</script>
-			<script type="Mlym">Malaysisch</script>
-			<script type="Mong">Mongolisch</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Birmanisch</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orchon-Runen</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanisch</script>
-			<script type="Perm">Altpermisch</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Phli</script>
-			<script type="Phlp">Phlp</script>
-			<script type="Phlv">Pahlavi</script>
-			<script type="Phnx">Phönizisch</script>
-			<script type="Plrd">Pollard Phonetisch</script>
-			<script type="Prti">Prti</script>
-			<script type="Qaai">Geerbter Schriftwert</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runenschrift</script>
-			<script type="Samr">Samaritanisch</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">Gebärdensprache</script>
-			<script type="Shaw">Shaw-Alphabet</script>
-			<script type="Sinh">Singhalesisch</script>
-			<script type="Sund">Sundanesisch</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syrisch</script>
-			<script type="Syre">Syrisch - Estrangelo-Variante</script>
-			<script type="Syrj">Westsyrisch</script>
-			<script type="Syrn">Ostsyrisch</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Tai Lue</script>
-			<script type="Taml">Tamilisch</script>
-			<script type="Tavt">Tavt</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibetisch</script>
-			<script type="Ugar">Ugaritisch</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Sichtbare Sprache</script>
-			<script type="Xpeo">Altpersisch</script>
-			<script type="Xsux">Sumerisch-akkadische Keilschrift</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Zmth</script>
-			<script type="Zsym">Zsym</script>
-			<script type="Zxxx">Schriftlose Sprachen</script>
-			<script type="Zyyy">Unbestimmt</script>
-			<script type="Zzzz">Uncodierte Schrift</script>
-		</scripts>
-		<territories>
-			<territory type="001">Welt</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nordamerika</territory>
-			<territory type="005">Südamerika</territory>
-			<territory type="009">Ozeanien</territory>
-			<territory type="011">Westafrika</territory>
-			<territory type="013">Mittelamerika</territory>
-			<territory type="014">Ostafrika</territory>
-			<territory type="015">Nordafrika</territory>
-			<territory type="017">Zentralafrika</territory>
-			<territory type="018">Südliches Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Nördliches Amerika</territory>
-			<territory type="029">Karibik</territory>
-			<territory type="030">Ostasien</territory>
-			<territory type="034">Südasien</territory>
-			<territory type="035">Südostasien</territory>
-			<territory type="039">Südeuropa</territory>
-			<territory type="053">Australien und Neuseeland</territory>
-			<territory type="054">Melanesien</territory>
-			<territory type="057">Mikronesisches Inselgebiet</territory>
-			<territory type="061">Polynesien</territory>
-			<territory type="062">Süd-Zentralasien</territory>
-			<territory type="142">Asien</territory>
-			<territory type="143">Zentralasien</territory>
-			<territory type="145">Westasien</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Osteuropa</territory>
-			<territory type="154">Nordeuropa</territory>
-			<territory type="155">Westeuropa</territory>
-			<territory type="172">Gemeinschaft Unabhängiger Staaten</territory>
-			<territory type="419">Lateinamerika und Karibik</territory>
-			<territory type="830">Kanalinseln</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Vereinigte Arabische Emirate</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua und Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanien</territory>
-			<territory type="AM">Armenien</territory>
-			<territory type="AN">Niederländische Antillen</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentinien</territory>
-			<territory type="AS">Amerikanisch-Samoa</territory>
-			<territory type="AT">Österreich</territory>
-			<territory type="AU">Australien</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandinseln</territory>
-			<territory type="AZ">Aserbaidschan</territory>
-			<territory type="BA">Bosnien und Herzegowina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesch</territory>
-			<territory type="BE">Belgien</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarien</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">St. Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Bolivien</territory>
-			<territory type="BR">Brasilien</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvetinsel</territory>
-			<territory type="BW">Botsuana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosinseln</territory>
-			<territory type="CD">Demokratische Republik Kongo</territory>
-			<territory type="CF">Zentralafrikanische Republik</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Schweiz</territory>
-			<territory type="CI">Côte d’Ivoire</territory>
-			<territory type="CK">Cookinseln</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Kolumbien</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbien und Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Weihnachtsinsel</territory>
-			<territory type="CY">Zypern</territory>
-			<territory type="CZ">Tschechische Republik</territory>
-			<territory type="DE">Deutschland</territory>
-			<territory type="DJ">Dschibuti</territory>
-			<territory type="DK">Dänemark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominikanische Republik</territory>
-			<territory type="DZ">Algerien</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Ägypten</territory>
-			<territory type="EH">Westsahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanien</territory>
-			<territory type="ET">Äthiopien</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fidschi</territory>
-			<territory type="FK">Falklandinseln</territory>
-			<territory type="FM">Mikronesien</territory>
-			<territory type="FO">Färöer</territory>
-			<territory type="FR">Frankreich</territory>
-			<territory type="GA">Gabun</territory>
-			<territory type="GB">Vereinigtes Königreich</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgien</territory>
-			<territory type="GF">Französisch-Guayana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grönland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Äquatorialguinea</territory>
-			<territory type="GR">Griechenland</territory>
-			<territory type="GS">Südgeorgien und die Südlichen Sandwichinseln</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Sonderverwaltungszone Hongkong</territory>
-			<territory type="HM">Heard- und McDonald-Inseln</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatien</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesien</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">Indien</territory>
-			<territory type="IO">Britisches Territorium im Indischen Ozean</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italien</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordanien</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambodscha</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoren</territory>
-			<territory type="KN">St. Kitts und Nevis</territory>
-			<territory type="KP">Demokratische Volksrepublik Korea</territory>
-			<territory type="KR">Republik Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Kaimaninseln</territory>
-			<territory type="KZ">Kasachstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">St. Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Libyen</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Republik Moldau</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">St. Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallinseln</territory>
-			<territory type="MK">Mazedonien</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolei</territory>
-			<territory type="MO">Sonderverwaltungszone Macao</territory>
-			<territory type="MP">Nördliche Marianen</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauretanien</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Malediven</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Neukaledonien</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkinsel</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Niederlande</territory>
-			<territory type="NO">Norwegen</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Neuseeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Französisch-Polynesien</territory>
-			<territory type="PG">Papua-Neuguinea</territory>
-			<territory type="PH">Philippinen</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">St. Pierre und Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palästinensische Gebiete</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Äußeres Ozeanien</territory>
-			<territory type="QU">Europäische Union</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumänien</territory>
-			<territory type="RS">Serbien</territory>
-			<territory type="RU">Russische Föderation</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Arabien</territory>
-			<territory type="SB">Salomonen</territory>
-			<territory type="SC">Seychellen</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Schweden</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">St. Helena</territory>
-			<territory type="SI">Slowenien</territory>
-			<territory type="SJ">Svalbard und Jan Mayen</territory>
-			<territory type="SK">Slowakei</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">São Tomé und Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrien</territory>
-			<territory type="SZ">Swasiland</territory>
-			<territory type="TC">Turks- und Caicosinseln</territory>
-			<territory type="TD">Tschad</territory>
-			<territory type="TF">Französische Süd- und Antarktisgebiete</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadschikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Osttimor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunesien</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Türkei</territory>
-			<territory type="TT">Trinidad und Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerikanisch-Ozeanien</territory>
-			<territory type="US">Vereinigte Staaten</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikanstadt</territory>
-			<territory type="VC">St. Vincent und die Grenadinen</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britische Jungferninseln</territory>
-			<territory type="VI">Amerikanische Jungferninseln</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis und Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Südafrika</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabwe</territory>
-			<territory type="ZZ">Unbekannte oder ungültige Region</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Alte deutsche Rechtschreibung</variant>
-			<variant type="1994">Standardisierte Resianische Rechtschreibung</variant>
-			<variant type="1996">Neue deutsche Rechtschreibung</variant>
-			<variant type="1606NICT">Spätes Mittelfranzösisch</variant>
-			<variant type="1694ACAD">Klassisches Französisch</variant>
-			<variant type="AREVELA">Ostarmenisch</variant>
-			<variant type="AREVMDA">Westarmenisch</variant>
-			<variant type="BAKU1926">Einheitliches Türkisches Alphabet</variant>
-			<variant type="BISKE">Bela-Dialekt</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">IPA Phonetisch</variant>
-			<variant type="FONUPA">Phonetisch (UPA)</variant>
-			<variant type="LIPAW">Lipovaz-Dialekt</variant>
-			<variant type="MONOTON">Monotonisch</variant>
-			<variant type="NEDIS">Natisone-Dialekt</variant>
-			<variant type="NJIVA">Njiva-Dialekt</variant>
-			<variant type="OSOJS">Osojane-Dialekt</variant>
-			<variant type="POLYTON">Polytonisch</variant>
-			<variant type="POSIX">Posix</variant>
-			<variant type="REVISED">Revidierte Rechtschreibung</variant>
-			<variant type="ROZAJ">Resianisch</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Schottisches Standardenglisch</variant>
-			<variant type="SCOUSE">Scouse-Dialekt</variant>
-			<variant type="SOLBA">Solbica-Dialekt</variant>
-			<variant type="TARASK">Taraskievica-Orthographie</variant>
-			<variant type="VALENCIA">Valencianisch</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalender</key>
-			<key type="collation">Sortierung</key>
-			<key type="currency">Währung</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Traditionelles Chinesisch - Big5</type>
-			<type type="buddhist" key="calendar">Buddhistischer Kalender</type>
-			<type type="chinese" key="calendar">Chinesischer Kalender</type>
-			<type type="direct" key="collation">Direkte Sortierregeln</type>
-			<type type="gb2312han" key="collation">Vereinfachtes Chinesisch - GB2312</type>
-			<type type="gregorian" key="calendar">Gregorianischer Kalender</type>
-			<type type="hebrew" key="calendar">Hebräischer Kalender</type>
-			<type type="indian" key="calendar">Indischer Nationalkalender</type>
-			<type type="islamic" key="calendar">Islamischer Kalender</type>
-			<type type="islamic-civil" key="calendar">Bürgerlicher islamischer Kalender</type>
-			<type type="japanese" key="calendar">Japanischer Kalender</type>
-			<type type="phonebook" key="collation">Telefonbuch-Sortierregeln</type>
-			<type type="pinyin" key="collation">Pinyin-Sortierregeln</type>
-			<type type="roc" key="calendar">Kalender der Republik China</type>
-			<type type="stroke" key="collation">Strichfolge</type>
-			<type type="traditional" key="collation">Traditionelle Sortierregeln</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrisch</measurementSystemName>
-			<measurementSystemName type="US">Angloamerikanisch</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Sprache: {0}</codePattern>
-			<codePattern type="script">Schrift: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a ä b-o ö p-s ß t u ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å � æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ø � œ ú ù ŭ û ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‚</alternateQuotationStart>
-		<alternateQuotationEnd>‘</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}−{1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="chinese">
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-			</calendar>
-			<calendar type="coptic">
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mär</month>
-							<month type="4">Apr</month>
-							<month type="5">Mai</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dez</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januar</month>
-							<month type="2">Februar</month>
-							<month type="3">März</month>
-							<month type="4">April</month>
-							<month type="5">Mai</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">August</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">Dezember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="3">Mär</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dez</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">So.</day>
-							<day type="mon">Mo.</day>
-							<day type="tue">Di.</day>
-							<day type="wed">Mi.</day>
-							<day type="thu">Do.</day>
-							<day type="fri">Fr.</day>
-							<day type="sat">Sa.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sonntag</day>
-							<day type="mon">Montag</day>
-							<day type="tue">Dienstag</day>
-							<day type="wed">Mittwoch</day>
-							<day type="thu">Donnerstag</day>
-							<day type="fri">Freitag</day>
-							<day type="sat">Samstag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">D</day>
-							<day type="wed">M</day>
-							<day type="thu">D</day>
-							<day type="fri">F</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. Quartal</quarter>
-							<quarter type="2">2. Quartal</quarter>
-							<quarter type="3">3. Quartal</quarter>
-							<quarter type="4">4. Quartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">v. Chr.</era>
-						<era type="1">n. Chr.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">v. Chr.</era>
-						<era type="1">n. Chr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d.</dateFormatItem>
-						<dateFormatItem id="EEEd">d. EEE</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMd">d.MM.</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMdd">dd.MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.-d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.-M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM. - dd.MM.</greatestDifference>
-							<greatestDifference id="M">dd.MM. - dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM. - E, dd.MM.</greatestDifference>
-							<greatestDifference id="M">E, dd.MM. - E, dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y - E, d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy – MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Epoche</displayName>
-					</field>
-					<field type="year">
-						<displayName>Jahr</displayName>
-					</field>
-					<field type="month">
-						<displayName>Monat</displayName>
-					</field>
-					<field type="week">
-						<displayName>Woche</displayName>
-					</field>
-					<field type="day">
-						<displayName>Tag</displayName>
-						<relative type="-3">Vor drei Tagen</relative>
-						<relative type="-2">Vorgestern</relative>
-						<relative type="-1">Gestern</relative>
-						<relative type="0">Heute</relative>
-						<relative type="1">Morgen</relative>
-						<relative type="2">Ãœbermorgen</relative>
-						<relative type="3">In drei Tagen</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Wochentag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Tageshälfte</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Stunde</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunde</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-			</calendar>
-			<calendar type="islamic">
-				<am>vorm.</am>
-				<pm>nachm.</pm>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unbekannt</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erivan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Südpol</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Wostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brüssel</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Wagadugu</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudas</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Osterinsel</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kap Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Weihnachts-Inseln</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikosia</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Dschibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhagen</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Algier</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanaren</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidschi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Färöer</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tiflis</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akkra</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athen</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Süd-Georgien</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rom</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bischkek</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komoren</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pjöngjang</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kaimaninseln</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktobe</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Wilna</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripolis</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Kischinau</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Malediven</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexiko-Stadt</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Niger</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muskat</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warschau</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoren</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskau</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Nowosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Wladiwostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtschatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riad</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Khartum</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadischu</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskus</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Duschanbe</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port-of-Spain</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taipeh</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Daressalam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiew</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporischja</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taschkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre-Zeit</standard>
-					<daylight>Acre-Sommerzeit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afghanistan-Zeit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Zentralafrikanische Zeit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Ostafrikanische Zeit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Südafrikanische Zeit</generic>
-					<standard>Südafrikanische Standardzeit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Westafrikanische Zeit</standard>
-					<daylight>Westafrikanische Sommerzeit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk-Zeit</standard>
-					<daylight>Aktyubinsk-Sommerzeit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska-Zeit</generic>
-					<standard>Alaska-Standardzeit</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii-Zeit</generic>
-					<standard>Alaska-Hawaii-Standardzeit</standard>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almaty-Zeit</standard>
-					<daylight>Almaty-Sommerzeit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<daylight>Amazonas-Sommerzeit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Mitteleuropäische Zeit</standard>
-					<daylight>Mitteleuropäische Sommerzeit</daylight>
-				</long>
-				<short>
-					<standard>MEZ</standard>
-					<daylight>MESZ</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Osteuropäische Zeit</standard>
-					<daylight>Osteuropäische Sommerzeit</daylight>
-				</long>
-				<short>
-					<standard>OEZ</standard>
-					<daylight>OESZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Westeuropäische Zeit</standard>
-					<daylight>Westeuropäische Sommerzeit</daylight>
-				</long>
-				<short>
-					<standard>WEZ</standard>
-					<daylight>WESZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Moskauer Zeit</standard>
-					<daylight>Moskauer Sommerzeit</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorranische Pesete</displayName>
-				<displayName count="other">Andorranische Peseten</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE Dirham</displayName>
-				<displayName count="other">UAE Dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghani (1927-2002)</displayName>
-				<displayName count="other">Afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani</displayName>
-				<displayName count="other">Afghani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek</displayName>
-				<displayName count="other">Albanische Lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram</displayName>
-				<displayName count="other">Armenische Dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Niederl. Antillen Gulden</displayName>
-				<displayName count="other">Niederländische-Antillen-Gulden</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza</displayName>
-				<displayName count="other">Angolanische Kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolanischer Kwanza (1977-1990)</displayName>
-				<displayName count="other">Angolanische Kwanza (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Neuer Kwanza</displayName>
-				<displayName count="other">Angolanische Neue Kwanza (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza Reajustado</displayName>
-				<displayName count="other">Angolanische Kwanza Reajustado (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentinischer Austral</displayName>
-				<displayName count="other">Argentinische Austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinischer Peso (1983-1985)</displayName>
-				<displayName count="other">Argentinische Peso (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinischer Peso</displayName>
-				<displayName count="other">Argentinische Peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Österreichischer Schilling</displayName>
-				<displayName count="other">Österreichische Schilling</displayName>
-				<symbol>öS</symbol>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australischer Dollar</displayName>
-				<displayName count="other">Australische Dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba Florin</displayName>
-				<displayName count="other">Aruba Florin</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Aserbaidschan-Manat (1993-2006)</displayName>
-				<displayName count="other">Aserbaidschan-Manat (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Aserbaidschan-Manat</displayName>
-				<displayName count="other">Aserbaidschan-Manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnien und Herzegowina Dinar</displayName>
-				<displayName count="other">Bosnien und Herzegowina Dinar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Konvertierbare Mark</displayName>
-				<displayName count="other">Bosnien und Herzegowina Konvertierbare Mark</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbados-Dollar</displayName>
-				<displayName count="other">Barbados-Dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka</displayName>
-				<displayName count="other">Taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgischer Franc (konvertibel)</displayName>
-				<displayName count="other">Belgische Franc (konvertibel)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgischer Franc</displayName>
-				<displayName count="other">Belgische Franc</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgischer Finanz-Franc</displayName>
-				<displayName count="other">Belgische Finanz-Franc</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lew (1962-1999)</displayName>
-				<displayName count="other">Bulgarische Lew</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lew</displayName>
-				<displayName count="other">Bulgarische Lew (BGN)</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahrain-Dinar</displayName>
-				<displayName count="other">Bahrain-Dinar</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi-Franc</displayName>
-				<displayName count="other">Burundi-Franc</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda-Dollar</displayName>
-				<displayName count="other">Bermuda-Dollar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei-Dollar</displayName>
-				<displayName count="other">Brunei-Dollar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="other">Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivianischer Peso</displayName>
-				<displayName count="other">Bolivianische Peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Mvdol</displayName>
-				<displayName count="other">Bolivianische Mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brasilianischer Cruzeiro Novo (1967-1986)</displayName>
-				<displayName count="other">Brasilianische Cruzeiro Novo (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brasilianischer Cruzado</displayName>
-				<displayName count="other">Brasilianische Cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brasilianischer Cruzeiro (1990-1993)</displayName>
-				<displayName count="other">Brasilianische Cruzeiro (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real</displayName>
-				<displayName count="other">Brasilianische Real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brasilianischer Cruzado Novo</displayName>
-				<displayName count="other">Brasilianische Cruzado Novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brasilianischer Cruzeiro</displayName>
-				<displayName count="other">Brasilianische Cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahama-Dollar</displayName>
-				<displayName count="other">Bahama-Dollar</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum</displayName>
-				<displayName count="other">Bhutanische Ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Birmanischer Kyat</displayName>
-				<displayName count="other">Birmanische Kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula</displayName>
-				<displayName count="other">Botswanische Pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Belarus Rubel (alt)</displayName>
-				<displayName count="other">Belarus-Rubel (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Belarus Rubel (neu)</displayName>
-				<displayName count="other">Belarus-Rubel</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize-Dollar</displayName>
-				<displayName count="other">Belize-Dollar</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadischer Dollar</displayName>
-				<displayName count="other">Kanadische Dollar</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Franc congolais</displayName>
-				<displayName count="other">Franc congolais</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR-Euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Schweizer Franken</displayName>
-				<displayName count="other">Schweizer Franken</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR Franken</displayName>
-				<displayName count="other">WIR Franken</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento</displayName>
-				<displayName count="other">Chilenische Unidades de Fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilenischer Peso</displayName>
-				<displayName count="other">Chilenische Pesos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Renminbi Yuan</displayName>
-				<displayName count="other">Renminbi Yuan</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbianischer Peso</displayName>
-				<displayName count="other">Kolumbianische Pesos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-				<displayName count="other">Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costa Rica Colon</displayName>
-				<displayName count="other">Costa Rica Colon</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Alter Serbischer Dinar</displayName>
-				<displayName count="other">Alte Serbische Dinar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Tschechoslowakische Krone</displayName>
-				<displayName count="other">Tschechoslowakische Kronen</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubanischer Peso</displayName>
-				<displayName count="other">Kubanische Pesos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kap Verde Escudo</displayName>
-				<displayName count="other">Kap Verde Escudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Zypern-Pfund</displayName>
-				<displayName count="other">Zypern Pfund</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Tschechische Krone</displayName>
-				<displayName count="other">Tschechische Kronen</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Mark der DDR</displayName>
-				<displayName count="other">Mark der DDR</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Deutsche Mark</displayName>
-				<displayName count="other">Deutsche Mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Dschibuti-Franc</displayName>
-				<displayName count="other">Dschibuti-Franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Dänische Krone</displayName>
-				<displayName count="other">Dänische Kronen</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikanischer Peso</displayName>
-				<displayName count="other">Dominikanische Pesos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algerischer Dinar</displayName>
-				<displayName count="other">Algerische Dinar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadorianischer Sucre</displayName>
-				<displayName count="other">Ecuadorianische Sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Verrechnungseinheit für EC</displayName>
-				<displayName count="other">Verrechnungseinheiten für EC</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estnische Krone</displayName>
-				<displayName count="other">Estnische Kronen</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Ägyptisches Pfund</displayName>
-				<displayName count="other">Ägyptische Pfund</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa</displayName>
-				<displayName count="other">Eritreische Nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Spanische Peseta (A-Konten)</displayName>
-				<displayName count="other">Spanische Peseten (A-Konten)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Spanische Peseta (konvertibel)</displayName>
-				<displayName count="other">Spanische Peseten (konvertibel)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spanische Peseta</displayName>
-				<displayName count="other">Spanische Peseten</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr</displayName>
-				<displayName count="other">Äthiopische Birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-				<displayName count="other">Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finnische Mark</displayName>
-				<displayName count="other">Finnische Mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidschi-Dollar</displayName>
-				<displayName count="other">Fidschi Dollar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland-Pfund</displayName>
-				<displayName count="other">Falkland Pfund</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Französischer Franc</displayName>
-				<displayName count="other">Französische Franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Pfund Sterling</displayName>
-				<displayName count="other">Pfund Sterling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgischer Kupon Larit</displayName>
-				<displayName count="other">Georgische Kupon Larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgischer Lari</displayName>
-				<displayName count="other">Georgische Lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi</displayName>
-				<displayName count="other">Cedi</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanaische Cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltar-Pfund</displayName>
-				<displayName count="other">Gibraltar Pfund</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi</displayName>
-				<displayName count="other">Gambische Dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinea-Franc</displayName>
-				<displayName count="other">Guinea Franc</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guineischer Syli</displayName>
-				<displayName count="other">Guineische Syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele</displayName>
-				<displayName count="other">Äquatorialguinea-Ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Griechische Drachme</displayName>
-				<displayName count="other">Griechische Drachmen</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal</displayName>
-				<displayName count="other">Quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugiesisch Guinea Escudo</displayName>
-				<displayName count="other">Portugiesisch Guinea Escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea Bissau Peso</displayName>
-				<displayName count="other">Guinea-Bissau Pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyana-Dollar</displayName>
-				<displayName count="other">Guyana Dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong-Dollar</displayName>
-				<displayName count="other">Hongkong-Dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira</displayName>
-				<displayName count="other">Lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroatischer Dinar</displayName>
-				<displayName count="other">Kroatische Dinar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna</displayName>
-				<displayName count="other">Kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde</displayName>
-				<displayName count="other">Gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forint</displayName>
-				<displayName count="other">Forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupiah</displayName>
-				<displayName count="other">Rupiah</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Irisches Pfund</displayName>
-				<displayName count="other">Irische Pfund</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israelisches Pfund</displayName>
-				<displayName count="other">Israelische Pfund</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Schekel</displayName>
-				<displayName count="other">Neue Schekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indische Rupie</displayName>
-				<displayName count="other">Indische Rupien</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irak Dinar</displayName>
-				<displayName count="other">Irak Dinar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial</displayName>
-				<displayName count="other">Rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Isländische Krone</displayName>
-				<displayName count="other">Isländische Kronen</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italienische Lira</displayName>
-				<displayName count="other">Italienische Lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaika-Dollar</displayName>
-				<displayName count="other">Jamaika Dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordanischer Dinar</displayName>
-				<displayName count="other">Jordanische Dinar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen</displayName>
-				<displayName count="other">Yen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenia-Schilling</displayName>
-				<displayName count="other">Kenia Schilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som</displayName>
-				<displayName count="other">Som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel</displayName>
-				<displayName count="other">Riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komoren Franc</displayName>
-				<displayName count="other">Komoren-Franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Nordkoreanischer Won</displayName>
-				<displayName count="other">Nordkoreanische Won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Südkoreanischer Won</displayName>
-				<displayName count="other">Südkoreanische Won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuwait Dinar</displayName>
-				<displayName count="other">Kuwait Dinar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kaiman-Dollar</displayName>
-				<displayName count="other">Kaiman-Dollar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge</displayName>
-				<displayName count="other">Tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip</displayName>
-				<displayName count="other">Kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanesisches Pfund</displayName>
-				<displayName count="other">Libanesische Pfund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri Lanka Rupie</displayName>
-				<displayName count="other">Sri Lanka Rupie</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberianischer Dollar</displayName>
-				<displayName count="other">Liberianische Dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti</displayName>
-				<displayName count="other">Loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litauischer Litas</displayName>
-				<displayName count="other">Litauische Litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litauischer Talonas</displayName>
-				<displayName count="other">Litauische Talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxemburgischer Franc (konvertibel)</displayName>
-				<displayName count="other">Luxemburgische Franc (konvertibel)</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburgischer Franc</displayName>
-				<displayName count="other">Luxemburgische Franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxemburgischer Finanz-Franc</displayName>
-				<displayName count="other">Luxemburgische Finanz-Franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lettischer Lats</displayName>
-				<displayName count="other">Lettische Lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lettischer Rubel</displayName>
-				<displayName count="other">Lettische Rubel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libyscher Dinar</displayName>
-				<displayName count="other">Libysche Dinar</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkanischer Dirham</displayName>
-				<displayName count="other">Marokkanische Dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkanischer Franc</displayName>
-				<displayName count="other">Marokkanische Franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldau Leu</displayName>
-				<displayName count="other">Moldau Leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskar Ariary</displayName>
-				<displayName count="other">Madagaskar Ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskar-Franc</displayName>
-				<displayName count="other">Madagaskar-Franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Denar</displayName>
-				<displayName count="other">Denar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malischer Franc</displayName>
-				<displayName count="other">Malische Franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat</displayName>
-				<displayName count="other">Kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik</displayName>
-				<displayName count="other">Tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca</displayName>
-				<displayName count="other">Pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya</displayName>
-				<displayName count="other">Ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltesische Lira</displayName>
-				<displayName count="other">Maltesische Lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltesisches Pfund</displayName>
-				<displayName count="other">Maltesische Pfund</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritius-Rupie</displayName>
-				<displayName count="other">Mauritius Rupie</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rufiyaa</displayName>
-				<displayName count="other">Rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawi Kwacha</displayName>
-				<displayName count="other">Malawi-Kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexikanischer Peso</displayName>
-				<displayName count="other">Mexikanische Pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexikanischer Silber-Peso (1861-1992)</displayName>
-				<displayName count="other">Mexikanische Silber-Pesos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexican Unidad de Inversion (UDI)</displayName>
-				<displayName count="other">Mexikanische Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysischer Ringgit</displayName>
-				<displayName count="other">Malaysische Ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mosambikanischer Escudo</displayName>
-				<displayName count="other">Mozambikanische Escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Alter Metical</displayName>
-				<displayName count="other">Alte Metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Metical</displayName>
-				<displayName count="other">Metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibia-Dollar</displayName>
-				<displayName count="other">Namibia-Dollar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira</displayName>
-				<displayName count="other">Naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Cordoba</displayName>
-				<displayName count="other">Cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Gold-Cordoba</displayName>
-				<displayName count="other">Gold-Cordoba</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Holländischer Gulden</displayName>
-				<displayName count="other">Holländische Gulden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norwegische Krone</displayName>
-				<displayName count="other">Norwegische Kronen</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalesische Rupie</displayName>
-				<displayName count="other">Nepalesische Rupien</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Neuseeland-Dollar</displayName>
-				<displayName count="other">Neuseeland-Dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial Omani</displayName>
-				<displayName count="other">Rial Omani</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa</displayName>
-				<displayName count="other">Balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruanischer Inti</displayName>
-				<displayName count="other">Peruanische Inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Neuer Sol</displayName>
-				<displayName count="other">Neue Sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol</displayName>
-				<displayName count="other">Sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina</displayName>
-				<displayName count="other">Kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Philippinischer Peso</displayName>
-				<displayName count="other">Philippinische Peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistanische Rupie</displayName>
-				<displayName count="other">Pakistanische Rupien</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty</displayName>
-				<displayName count="other">Zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloty (1950-1995)</displayName>
-				<displayName count="other">Zloty (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugiesischer Escudo</displayName>
-				<displayName count="other">Portugiesische Escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani</displayName>
-				<displayName count="other">Guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Katar Riyal</displayName>
-				<displayName count="other">Katar Riyal</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rhodesischer Dollar</displayName>
-				<displayName count="other">Rhodesische Dollar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Leu</displayName>
-				<displayName count="other">Leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumänischer Leu</displayName>
-				<displayName count="other">Rumänische Leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbischer Dinar</displayName>
-				<displayName count="other">Serbische Dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russischer Rubel (neu)</displayName>
-				<displayName count="other">Russische Rubel (neu)</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Russischer Rubel (alt)</displayName>
-				<displayName count="other">Russische Rubel (alt)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruanda-Franc</displayName>
-				<displayName count="other">Ruanda-Franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi Riyal</displayName>
-				<displayName count="other">Saudi Riyal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomonen-Dollar</displayName>
-				<displayName count="other">Salomonen-Dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychellen-Rupie</displayName>
-				<displayName count="other">Seychellen-Rupien</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Sudanesischer Dinar</displayName>
-				<displayName count="other">Sudanesische Dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudanesisches Pfund</displayName>
-				<displayName count="other">Sudanesische Pfund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudanesisches Pfund (alt)</displayName>
-				<displayName count="other">Sudanesische Pfund (alt)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Schwedische Krone</displayName>
-				<displayName count="other">Schwedische Kronen</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapur-Dollar</displayName>
-				<displayName count="other">Singapur-Dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>St. Helena Pfund</displayName>
-				<displayName count="other">St. Helena-Pfund</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar</displayName>
-				<displayName count="other">Tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slowakische Krone</displayName>
-				<displayName count="other">Slowakische Kronen</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone</displayName>
-				<displayName count="other">Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalia-Schilling</displayName>
-				<displayName count="other">Somalia-Schilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamischer Dollar</displayName>
-				<displayName count="other">Surinamische Dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Suriname Gulden</displayName>
-				<displayName count="other">Suriname-Gulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra</displayName>
-				<displayName count="other">Dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sowjetischer Rubel</displayName>
-				<displayName count="other">Sowjetische Rubel</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El Salvador Colon</displayName>
-				<displayName count="other">El Salvador-Colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syrisches Pfund</displayName>
-				<displayName count="other">Syrische Pfund</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni</displayName>
-				<displayName count="other">Lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht</displayName>
-				<displayName count="other">Baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadschikistan Rubel</displayName>
-				<displayName count="other">Tadschikistan-Rubel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadschikistan Somoni</displayName>
-				<displayName count="other">Tadschikistan-Somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmenistan-Manat</displayName>
-				<displayName count="other">Turkmenistan-Manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunesischer Dinar</displayName>
-				<displayName count="other">Tunesische Dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga</displayName>
-				<displayName count="other">Paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timor-Escudo</displayName>
-				<displayName count="other">Timor-Escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Alte Türkische Lira</displayName>
-				<displayName count="one">Alte Türkische Lira</displayName>
-				<displayName count="other">Alte Türkische Lire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Türkische Lira</displayName>
-				<displayName count="one">Türkische Lira</displayName>
-				<displayName count="other">Türkische Lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad- und Tobago-Dollar</displayName>
-				<displayName count="other">Trinidad und Tobago-Dollar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Neuer Taiwan-Dollar</displayName>
-				<displayName count="other">Neuer Taiwan Dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tansania-Schilling</displayName>
-				<displayName count="other">Tansania-Schilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia</displayName>
-				<displayName count="other">Hryvnia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainischer Karbovanetz</displayName>
-				<displayName count="other">Ukrainische Karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Uganda-Schilling (1966-1987)</displayName>
-				<displayName count="other">Uganda-Schilling (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Uganda-Schilling</displayName>
-				<displayName count="other">Uganda-Schilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US-Dollar</displayName>
-				<displayName count="other">US-Dollar</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>US Dollar (Nächster Tag)</displayName>
-				<displayName count="other">US-Dollar (Nächster Tag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>US Dollar (Gleicher Tag)</displayName>
-				<displayName count="other">US-Dollar (Gleicher Tag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>UYU</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguayischer Neuer Peso (1975-1993)</displayName>
-				<displayName count="other">Uruguayische Pesos (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguayischer Peso</displayName>
-				<displayName count="other">Uruguayische Pesos</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Usbekistan Sum</displayName>
-				<displayName count="other">Usbekistan-Sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar</displayName>
-				<displayName count="other">Bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar Fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong</displayName>
-				<displayName count="other">Dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu</displayName>
-				<displayName count="other">Vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala</displayName>
-				<displayName count="other">Tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA Franc (Äquatorial)</displayName>
-				<displayName count="other">CFA-Franc (BEAC)</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Unze Silber</displayName>
-				<displayName count="one">Unze Silber</displayName>
-				<displayName count="other">Silber</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Unze Gold</displayName>
-				<displayName count="one">Unze Gold</displayName>
-				<displayName count="other">Gold</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Europäische Rechnungseinheit</displayName>
-				<displayName count="other">Europäische Rechnungseinheiten</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Europäische Währungseinheit (XBB)</displayName>
-				<displayName count="other">Europäische Währungseinheiten (XBB)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Europäische Rechnungseinheit (XBC)</displayName>
-				<displayName count="other">Europäische Rechnungseinheiten (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Europäische Rechnungseinheit (XBD)</displayName>
-				<displayName count="other">Europäische Rechnungseinheiten (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Ostkaribischer Dollar</displayName>
-				<displayName count="other">Ostkaribische Dollar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Sonderziehungsrechte</displayName>
-				<displayName count="other">Sonderziehungsrechte</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Europäische Währungseinheit (XEU)</displayName>
-				<displayName count="other">Europäische Währungseinheiten (XEU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Französischer Gold-Franc</displayName>
-				<displayName count="other">Französische Gold-Franc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Französischer UIC-Franc</displayName>
-				<displayName count="other">Französische UIC-Franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA Franc (West)</displayName>
-				<displayName count="other">CFA-Franc (BCEAO)</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Unze Palladium</displayName>
-				<displayName count="one">Unze Palladium</displayName>
-				<displayName count="other">Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP Franc</displayName>
-				<displayName count="other">CFP-Franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Unze Platin</displayName>
-				<displayName count="one">Unze Platin</displayName>
-				<displayName count="other">Platin</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET Funds</displayName>
-				<displayName count="other">RINET Funds</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Testwährung</displayName>
-				<displayName count="other">Testwährung</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Unbekannte Währung</displayName>
-				<displayName count="one">Unbekannte Währung</displayName>
-				<displayName count="other">Unbekannte Währung</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemen-Dinar</displayName>
-				<displayName count="other">Jemen-Dinar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemen-Rial</displayName>
-				<displayName count="other">Jemen-Rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoslawischer Dinar (1966-1990)</displayName>
-				<displayName count="other">Jugoslawische Dinar</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Neuer Dinar</displayName>
-				<displayName count="other">Jugoslawische Neue Dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslawischer Dinar (konvertibel)</displayName>
-				<displayName count="other">Jugoslawische Dinar (konvertibel)</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Südafrikanischer Rand (Finanz)</displayName>
-				<displayName count="one">Südafrikanischer Rand (Finanz)</displayName>
-				<displayName count="other">Südafrikanischer Rand (Finanz)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Südafrikanischer Rand</displayName>
-				<displayName count="one">Südafrikanischer Rand</displayName>
-				<displayName count="other">Rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha</displayName>
-				<displayName count="other">Kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Neuer Zaire</displayName>
-				<displayName count="other">Neue Zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire</displayName>
-				<displayName count="other">Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Simbabwe-Dollar</displayName>
-				<displayName count="other">Simbabwe-Dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} Tag</unitPattern>
-			<unitPattern count="other">{0} Tage</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} Stunde</unitPattern>
-			<unitPattern count="other">{0} Stunden</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} Minute</unitPattern>
-			<unitPattern count="other">{0} Minuten</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} Monat</unitPattern>
-			<unitPattern count="other">{0} Monate</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} Sekunde</unitPattern>
-			<unitPattern count="other">{0} Sekunden</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} Woche</unitPattern>
-			<unitPattern count="other">{0} Wochen</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} Jahr</unitPattern>
-			<unitPattern count="other">{0} Jahre</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nein:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_AT.xml b/airtime_mvc/library/Zend/Locale/Data/de_AT.xml
deleted file mode 100644
index 7657ffe01..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_AT.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="de"/>
-		<territory type="AT"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jän</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Jänner</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd.-dd. MMM</greatestDifference>
-							<greatestDifference id="M">dd. MMM - dd. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd. - E, dd. MMM</greatestDifference>
-							<greatestDifference id="M">E, dd. MMM - E, dd. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd.-dd. MMM y</greatestDifference>
-							<greatestDifference id="M">dd. MMM - dd. MMM y</greatestDifference>
-							<greatestDifference id="y">dd. MMM y - dd. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd. - E, dd. MMM y</greatestDifference>
-							<greatestDifference id="M">E, dd. MMM - E, dd. MMM y</greatestDifference>
-							<greatestDifference id="y">E, dd. MMM y - E, dd. MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_BE.xml b/airtime_mvc/library/Zend/Locale/Data/de_BE.xml
deleted file mode 100644
index 533edf95f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_BE.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.63 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="de"/>
-		<territory type="BE"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mon</day>
-							<day type="tue">Die</day>
-							<day type="wed">Mit</day>
-							<day type="thu">Don</day>
-							<day type="fri">Fre</day>
-							<day type="sat">Sam</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH 'h' mm 'min' ss 's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="FRF">
-				<displayName>Franken</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_CH.xml b/airtime_mvc/library/Zend/Locale/Data/de_CH.xml
deleted file mode 100644
index 16c333bec..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_CH.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/06/09 06:08:19 $"/>
-		<language type="de"/>
-		<territory type="CH"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="be">Weissrussisch</language>
-		</languages>
-		<territories>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Weissrussland</territory>
-			<territory type="CV">Kapverden</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="GB">Grossbritannien</territory>
-			<territory type="MH">Marshall-Inseln</territory>
-			<territory type="QO">Äusseres Ozeanien</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SB">Salomon-Inseln</territory>
-			<territory type="ST">Sao Tomé und Principe</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a ä b-o ö p-u ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å � æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ø � œ ß ú ù ŭ û ū ÿ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>'</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_DE.xml b/airtime_mvc/library/Zend/Locale/Data/de_DE.xml
deleted file mode 100644
index 51ba44fa1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_DE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="de"/>
-		<territory type="DE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_LI.xml b/airtime_mvc/library/Zend/Locale/Data/de_LI.xml
deleted file mode 100644
index aca32677d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_LI.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="de"/>
-		<territory type="LI"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>'</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/de_LU.xml b/airtime_mvc/library/Zend/Locale/Data/de_LU.xml
deleted file mode 100644
index 8a52061ad..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/de_LU.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="de"/>
-		<territory type="LU"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="LUF">
-				<symbol>F</symbol>
-				<decimal>.</decimal>
-				<group>,</group>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/dv.xml b/airtime_mvc/library/Zend/Locale/Data/dv.xml
deleted file mode 100644
index 8976f4dc4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/dv.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="dv"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="dv">Þ‹Þ¨ÞˆÞ¬Þ€Þ¨Þ„Þ¦Þ�Þ°</language>
-		</languages>
-		<territories>
-			<territory type="MV">Þ‹Þ¨ÞˆÞ¬Þ€Þ¨ ÞƒÞ§Þ‡Þ°Þ–Þ¬</territory>
-		</territories>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[Þ€-Þ— \u07A6-\u07B0]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D ޙ ޚ ޜ ޢ ޣ ޥ ޛ ޘ ޠ ޡ ޤ �-ޟ ޱ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>hh:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>hh:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>hh:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>hh:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<list>,</list>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="MVR">
-				<symbol>Þƒ.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/dv_MV.xml b/airtime_mvc/library/Zend/Locale/Data/dv_MV.xml
deleted file mode 100644
index 6a54b345a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/dv_MV.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:34 $"/>
-		<language type="dv"/>
-		<territory type="MV"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/dz.xml b/airtime_mvc/library/Zend/Locale/Data/dz.xml
deleted file mode 100644
index fb3c787db..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/dz.xml
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.68 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="dz"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">ཨེ་ར་སྦིག</language>
-			<language type="art">བཟོ་བཟོ� (གཞན)</language>
-			<language type="as">ཨ་ས་མི་སི</language>
-			<language type="bh">བི་ཧ་ལི</language>
-			<language type="bn">བེངྒ་ལི</language>
-			<language type="bo">བོད་�</language>
-			<language type="cs">ཅེཀ</language>
-			<language type="da">ཌེ་ནིཤ</language>
-			<language type="de">ཇཱར་མཱན</language>
-			<language type="dv">དི་བེ་ཧི</language>
-			<language type="dz">རྫོང་�</language>
-			<language type="egy">ཨི་ཇིཔ་ཤཱན (སྔ་དུས་ཀྱི)</language>
-			<language type="el">གིརིཀ</language>
-			<language type="en">ཨིང་ལིཤ</language>
-			<language type="es">སིཔེ་ནིཤ</language>
-			<language type="fa">པར་ཤི་ཡན</language>
-			<language type="fr">ཕེ་རེནཆེ</language>
-			<language type="ga">ཨའི་རིཤ</language>
-			<language type="grc">གིརིཀ, སྔ་དུས་ཀྱི (༡༤༥༣)</language>
-			<language type="he">ཧི་བུརུ</language>
-			<language type="hi">ཧིན་དི</language>
-			<language type="him">ཧི་མ་ཅ་ལི</language>
-			<language type="inc">ཨིན་ཌིཀ (གཞན)</language>
-			<language type="it">ཨི་ཊ་ལི་རན</language>
-			<language type="km">�ེ་མར</language>
-			<language type="kn">ཀ་ན་ཌ</language>
-			<language type="ko">ཀོ་རིཡན</language>
-			<language type="ks">ཀེཤ་མི་རི</language>
-			<language type="lo">ལའོ</language>
-			<language type="ml">མ་ལ་ཡ་ལམ</language>
-			<language type="mn">སོག་པོའི་�</language>
-			<language type="mnc">མཱན་ཅུ</language>
-			<language type="mni">མ་ནི་པུ་རི</language>
-			<language type="mr">མ་ར་�ི</language>
-			<language type="my">བར་མིསི</language>
-			<language type="ne">ནེ་པ་ལི</language>
-			<language type="new">ནི་�་རི</language>
-			<language type="nl">ཌཆ</language>
-			<language type="no">ནོར་�ི་ཇི་ཡན</language>
-			<language type="or">ཨོ་རི་ཡ</language>
-			<language type="pa">པཱན་ཇ་བི</language>
-			<language type="pi">པ་ལི</language>
-			<language type="ru">ར་ཤི་ཡན</language>
-			<language type="sa">སཾས�ྲྀ�</language>
-			<language type="si">སིན་ཧ་ལིསི</language>
-			<language type="ta">�་མིལ</language>
-			<language type="te">�ེ་ལུ་གུ</language>
-			<language type="th">�ཱའེ</language>
-			<language type="ur">ཨུར་དུ</language>
-			<language type="zh">རགྱ་མི་�</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ཨེ་རེ་སྦིག</script>
-			<script type="Beng">བེངྒ་ལི</script>
-			<script type="Brai">བེརེལ</script>
-			<script type="Cyrl">སིརི་ལིཀ</script>
-			<script type="Deva">དི་�་ན་གརི</script>
-			<script type="Grek">གིརིཀ</script>
-			<script type="Gujr">གུ་ཇ་ར་�ི</script>
-			<script type="Guru">གུར་མུ་�ི</script>
-			<script type="Hang">ཧང་གུལ</script>
-			<script type="Hani">ཧཱན</script>
-			<script type="Hans">ལུགས་གསར ཧཱན</script>
-			<script type="Hant">ལུགས་རྙིང ཧཱན</script>
-			<script type="Hebr">ཧི་བུརུ</script>
-			<script type="Hira">ཧི་ར་ག་ན</script>
-			<script type="Kana">ཀ་�་ཀ་ན</script>
-			<script type="Khmr">�ེ་མར</script>
-			<script type="Knda">ཀ་ན་ཌ</script>
-			<script type="Laoo">ལའོ</script>
-			<script type="Latn">ལེ་ཊིན</script>
-			<script type="Limb">ལིམ་བུ</script>
-			<script type="Mlym">མ་ལ་ཡ་ལམ</script>
-			<script type="Mong">སོག་པོ</script>
-			<script type="Mymr">མི་མར</script>
-			<script type="Orya">ཨོ་རི་ཡ</script>
-			<script type="Qaai">སྔར་རྒྱུན</script>
-			<script type="Sinh">སིན་ཧ་ལ</script>
-			<script type="Taml">�་མིལ</script>
-			<script type="Telu">�ེ་ལུ་གུ</script>
-			<script type="Thaa">�ཱ་ན</script>
-			<script type="Tibt">བོད</script>
-			<script type="Zyyy">སྤྱིར</script>
-		</scripts>
-		<territories>
-			<territory type="AE">ཡུ་ནའི་ཊེཊ་ཨ་ར བ་ཨེ་མི་རེཊསི</territory>
-			<territory type="AF">ཨཕ་ག་ནིསི་�ཱན</territory>
-			<territory type="AQ">ཨེན་ཊཱག་ཊི་ཀ</territory>
-			<territory type="AR">ཨར་ཇེན་ཊི་ན</territory>
-			<territory type="AT">ཨས་ཊི་ཡ</territory>
-			<territory type="AU">ཨས་ཊེཡེ་ལི་ཡ</territory>
-			<territory type="BD">བངྒ་ལ་དེཤ</territory>
-			<territory type="BE">བེལ་ཇིཡམ</territory>
-			<territory type="BH">བཧ་རེན</territory>
-			<territory type="BR">བཱརཱ་ཛིལ</territory>
-			<territory type="BT">འབྲུག</territory>
-			<territory type="CA">ཀེ་ན་ཌ</territory>
-			<territory type="CH">སུའིཊ་ཛར་ལེན</territory>
-			<territory type="CN">རྒྱ་མི</territory>
-			<territory type="CU">ཀིའུ་སྦ</territory>
-			<territory type="CZ">ཅེཀ་རི་པབ་ལིཀ</territory>
-			<territory type="DE">ཇཱར་མ་ནི</territory>
-			<territory type="DK">ཌེན་མཱཀ</territory>
-			<territory type="EG">ཨི་ཇིཔཊ</territory>
-			<territory type="ES">སིཔཱེན</territory>
-			<territory type="FI">ཕིན་ལེནཌ</territory>
-			<territory type="FR">ཕརཱནསི</territory>
-			<territory type="GB">ཡུ་ནའི་ཊེཊ་ཀིང་ཌམ</territory>
-			<territory type="GR">གིརིསི</territory>
-			<territory type="HK">ཧོང་ཀོང</territory>
-			<territory type="IE">ཨའིརི་ལེནཌ</territory>
-			<territory type="IL">ཨིཛ་རཱེལ</territory>
-			<territory type="IN">རྒྱ་གར</territory>
-			<territory type="IQ">ཨི་རཀ</territory>
-			<territory type="IR">ཨི་རཱན</territory>
-			<territory type="IS">ཨའིསི་ལེནཌ</territory>
-			<territory type="IT">ཨྀཊ་ལི</territory>
-			<territory type="JM">ཇ་མའི་ཀ</territory>
-			<territory type="JP">ཇ་པཱན</territory>
-			<territory type="KE">ཀེ་ནི་ཡ</territory>
-			<territory type="KH">ཀམ་བོ་ཌི་ཡ</territory>
-			<territory type="KP">བྱང་ཀོ་རི་ཡ</territory>
-			<territory type="KR">ལྷོ་ཀོ་རི་ཡ</territory>
-			<territory type="KW">ཀུ་�ེཊ</territory>
-			<territory type="LA">ལ་འོསུ</territory>
-			<territory type="LB">ལེ་བཱ་ནཱོན</territory>
-			<territory type="LK">ཤྲཱྀ་ལངཀ</territory>
-			<territory type="MM">མེ་མར</territory>
-			<territory type="MN">སོག་པོ</territory>
-			<territory type="MS">མོན་ས་རཊི</territory>
-			<territory type="MU">མོ་རི་ཤིཡསི</territory>
-			<territory type="MV">མཱལ་ཌིབས</territory>
-			<territory type="MX">མེཀསི་ཀོ</territory>
-			<territory type="MY">མ་ལེ་ཤི་ཡ</territory>
-			<territory type="NL">ནེ་དར་ལེནཌསི</territory>
-			<territory type="NO">ནོ་�ེ</territory>
-			<territory type="NP">བལ་ཡུལ</territory>
-			<territory type="NZ">ནིའུ་ཛི་ལེནཌ</territory>
-			<territory type="PA">པ་ན་མཱ</territory>
-			<territory type="PK">པ་ཀིསི་�ཱན</territory>
-			<territory type="PS">པེ་ལིསི་ཊི་ནིཡ ན་ཊེ་རི་ངོ་རི</territory>
-			<territory type="PT">པོར་ཅུ་གལ</territory>
-			<territory type="QA">ཀ་�ར</territory>
-			<territory type="SA">སའུ་དི་ཨེ་ར་སྦི་ཡ</territory>
-			<territory type="SE">སུའི་ཌན</territory>
-			<territory type="SI">སིལོ་བེ་ནི་ཡ</territory>
-			<territory type="TH">�ཱའི་ལེནཌ</territory>
-			<territory type="TJ">�་ཇག་ཀིསི་�ཱན</territory>
-			<territory type="TW">�འི་�ཱན</territory>
-			<territory type="US">ཡུ་ནའིཊེཊ་སི་ཊེསི</territory>
-			<territory type="UZ">ཨུཛ་བེ་ཀིསི་�ཱན</territory>
-			<territory type="VN">བེཊ་ནཱམ</territory>
-			<territory type="ZA">སའུ�་ཨཕ་རི་ཀ</territory>
-			<territory type="ZM">ཛམ་བི་ཡ</territory>
-			<territory type="ZW">ཛིམ་བབ་�ེ</territory>
-		</territories>
-		<keys>
-			<key type="collation">གནས་སདུད་རིམ་ སགྲིག</key>
-		</keys>
-		<types>
-			<type type="traditional" key="collation">ལུགས་སྲོལ</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[ཀ \u0F90 � \u0F91 ག \u0F92 ང \u0F94 ཅ-ཇ \u0F97 ཉ \u0F99 � \u0F9F � ད \u0FA1 ན \u0FA3 པ \u0FA4 ཕ བ \u0FA6 མ \u0FA8 ཙ \u0FA9 ཚ ཛ \u0FAB � \u0FAD ཞ-ཡ \u0FB1 ར \u0FB2 ལ \u0FB3 ཤ \u0FB5 ས ཧ \u0FB7 ཨ \u0F72 \u0F74 \u0F7A \u0F7C]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ཊ-ཌ ཎ ཥ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>&quot;</quotationStart>
-		<quotationEnd>&quot;</quotationEnd>
-		<alternateQuotationStart>'</alternateQuotationStart>
-		<alternateQuotationEnd>'</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ཟླ་ ༡</month>
-							<month type="2">ཟླ་ ༢</month>
-							<month type="3">ཟླ་ ༣</month>
-							<month type="4">ཟླ་ ༤</month>
-							<month type="5">ཟླ་ ༥</month>
-							<month type="6">ཟླ་ ༦</month>
-							<month type="7">ཟླ་ ༧</month>
-							<month type="8">ཟླ་ ༨</month>
-							<month type="9">ཟླ་ ༩</month>
-							<month type="10">ཟླ་ ༡༠</month>
-							<month type="11">ཟླ་ ༡༡</month>
-							<month type="12">ཟླ་ ༡༢</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">སྤྱི་ཟླ�་དངཔ་</month>
-							<month type="2">སྤྱི་ཟླ�་གཉིས་པ་</month>
-							<month type="3">སྤྱི་ཟླ�་གསུམ་པ་</month>
-							<month type="4">སྤྱི་ཟླ�་བཞི་པ་</month>
-							<month type="5">སྤྱི་ཟླ�་ལྔ་པ་</month>
-							<month type="6">སྤྱི་ཟླ�་དྲུག་པ་</month>
-							<month type="7">སྤྱི་ཟླ�་བདུན་པ་</month>
-							<month type="8">སྤྱི་ཟླ�་བརྒྱད་པ་</month>
-							<month type="9">སྤྱི་ཟླ�་དགུ་པ་</month>
-							<month type="10">སྤྱི་ཟླ�་བཅུ་པ་</month>
-							<month type="11">སྤྱི་ཟླ�་བཅུ་གཅིག་པ་</month>
-							<month type="12">སྤྱི་ཟླ�་བཅུ་གཉིས་པ་</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ཟླ་</day>
-							<day type="mon">མིར་</day>
-							<day type="tue">ལྷག་</day>
-							<day type="wed">ཕུར་</day>
-							<day type="thu">སངས་</day>
-							<day type="fri">སྤེན་</day>
-							<day type="sat">ཉི་</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">གཟའ་ཟླ་བ་</day>
-							<day type="mon">གཟའ་མིག་དམར་</day>
-							<day type="tue">གཟའ་ལྷག་པ་</day>
-							<day type="wed">གཟའ་ཕུར་བུ་</day>
-							<day type="thu">གཟའ་པ་སངས་</day>
-							<day type="fri">གཟའ་སྤེན་པ་</day>
-							<day type="sat">གཟའ་ཉི་མ་</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">བཞི་དཔྱ་༡</quarter>
-							<quarter type="2">བཞི་དཔྱ་༢</quarter>
-							<quarter type="3">བཞི་དཔྱ་༣</quarter>
-							<quarter type="4">བཞི་དཔྱ་༤</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">བཞི་དཔྱ་དང་པ་</quarter>
-							<quarter type="2">བཞི་དཔྱ་གཉིས་པ་</quarter>
-							<quarter type="3">བཞི་དཔྱ་གསུམ་པ་</quarter>
-							<quarter type="4">བཞི་དཔྱ་བཞི་པ་</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>སྔ་ཆ་</am>
-				<pm>ཕྱི་ཆ་</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>སྤྱི་ལོ་y ཟླ་ MMMM ཚེས་ dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>སྤྱི་ལོ་y ཟླ་ MMMM ཚེས་ dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>སྤྱི་ལོ་y ཟླ་ MMM ཚེས་ dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<default choice="long"/>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>ཆུ་ཚོད་ h ས�ར་མ་ mm ས�ར་ཆཱ་ ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>ཆུ་ཚོད་ h ས�ར་མ་ mm ས�ར་ཆཱ་ ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>ཆུ་ཚོད་h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>ཆུ་ཚོད་ h ས�ར་མ་ mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<default choice="long"/>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>�ིམ་ཕུག</exemplarCity>
-			</zone>
-			<metazone type="Bhutan">
-				<long>
-					<generic>Bhutan Time</generic>
-					<standard>Bhutan Standard Time</standard>
-				</long>
-				<short>
-					<generic>BT</generic>
-					<standard>BST</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E+00</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BTN">
-				<displayName>དངུལ་ཀྲམ་</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/dz_BT.xml b/airtime_mvc/library/Zend/Locale/Data/dz_BT.xml
deleted file mode 100644
index fa4d76069..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/dz_BT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.43 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="dz"/>
-		<territory type="BT"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ee.xml b/airtime_mvc/library/Zend/Locale/Data/ee.xml
deleted file mode 100644
index d58d282b6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ee.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="ee"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a b d {dz} ɖ e ɛ f ƒ g {gb} ɣ h i k {kp} l-n {ny} ŋ o ɔ p r-t {ts} u v ʋ w-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c j q]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Dzv</month>
-							<month type="2">Dzd</month>
-							<month type="3">Ted</month>
-							<month type="4">AfÉ”</month>
-							<month type="5">Dam</month>
-							<month type="6">Mas</month>
-							<month type="7">Sia</month>
-							<month type="8">Dea</month>
-							<month type="9">Any</month>
-							<month type="10">Kel</month>
-							<month type="11">Ade</month>
-							<month type="12">Dzm</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Dzove</month>
-							<month type="2">Dzodze</month>
-							<month type="3">Tedoxe</month>
-							<month type="4">Afɔfiɛ</month>
-							<month type="5">Dama</month>
-							<month type="6">Masa</month>
-							<month type="7">Siamlɔm</month>
-							<month type="8">Deasiamime</month>
-							<month type="9">Anyɔnyɔ</month>
-							<month type="10">Kele</month>
-							<month type="11">Adeɛmekpɔxe</month>
-							<month type="12">Dzome</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">D</month>
-							<month type="2">D</month>
-							<month type="3">T</month>
-							<month type="4">A</month>
-							<month type="5">D</month>
-							<month type="6">M</month>
-							<month type="7">S</month>
-							<month type="8">D</month>
-							<month type="9">A</month>
-							<month type="10">K</month>
-							<month type="11">A</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Kɔs Kwe</day>
-							<day type="mon">Dzo</day>
-							<day type="tue">Bra</day>
-							<day type="wed">KuÉ–</day>
-							<day type="thu">Yaw</day>
-							<day type="fri">FiÉ–</day>
-							<day type="sat">Mem</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Kɔsiɖa</day>
-							<day type="mon">DzoÉ–a</day>
-							<day type="tue">BraÉ–a</day>
-							<day type="wed">KuÉ–a</day>
-							<day type="thu">YawoÉ–a</day>
-							<day type="fri">FiÉ–a</day>
-							<day type="sat">MemleÉ–a</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">K</day>
-							<day type="mon">D</day>
-							<day type="tue">B</day>
-							<day type="wed">K</day>
-							<day type="thu">Y</day>
-							<day type="fri">F</day>
-							<day type="sat">M</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AN</am>
-				<pm>EW</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Hafi Yesu Va Do Å‹gÉ” na Yesu</era>
-						<era type="1">Yesu Ŋɔli</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">HY</era>
-						<era type="1">YÅŠ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="GHC">
-				<displayName>SiÉ–i</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Sefa</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ee_GH.xml b/airtime_mvc/library/Zend/Locale/Data/ee_GH.xml
deleted file mode 100644
index 46267b796..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ee_GH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="ee"/>
-		<territory type="GH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ee_TG.xml b/airtime_mvc/library/Zend/Locale/Data/ee_TG.xml
deleted file mode 100644
index 62a4625a5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ee_TG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.20 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="ee"/>
-		<territory type="TG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/el.xml b/airtime_mvc/library/Zend/Locale/Data/el.xml
deleted file mode 100644
index 8f4f4198f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/el.xml
+++ /dev/null
@@ -1,4123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.116 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="el"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">Αφά�</language>
-			<language type="ab">Αμπχαζικά</language>
-			<language type="ace">Αχινίζ</language>
-			<language type="ach">Ακολί</language>
-			<language type="ada">Αντάνγκμε</language>
-			<language type="ady">Αντιγκέα</language>
-			<language type="ae">Αβεστάν</language>
-			<language type="af">Αφ�ικάανς</language>
-			<language type="afa">Αφ�οασιατική γλώσσα</language>
-			<language type="afh">Αφ�ιχίλι</language>
-			<language type="ain">Αϊνο�</language>
-			<language type="ak">Ακάν</language>
-			<language type="akk">Ακάντιαν</language>
-			<language type="ale">Αλο�τ</language>
-			<language type="alg">Γλώσσα Αλγκονκιάν</language>
-			<language type="alt">�ότια Αλαταϊκά</language>
-			<language type="am">Αμα�ικά</language>
-			<language type="an">Α�αγκονικά</language>
-			<language type="ang">Παλαιά Αγγλικά</language>
-			<language type="anp">Ανγκικά</language>
-			<language type="apa">Γλώσσα Απάτσι</language>
-			<language type="ar">Α�αβικά</language>
-			<language type="arc">Α�αμαϊκά</language>
-			<language type="arn">Α�ουκάνιαν</language>
-			<language type="arp">Α�άπαχο</language>
-			<language type="art">Τεχνητή γλώσσα</language>
-			<language type="arw">Α�αγουάκ</language>
-			<language type="as">Ασαμεζικά</language>
-			<language type="ast">Αστου�ιανά</language>
-			<language type="ath">Γλώσσα Αθαπάσκαν</language>
-			<language type="aus">Αυστ�αλιανή γλώσσα</language>
-			<language type="av">Άβα�ικ</language>
-			<language type="awa">Αγουαντί</language>
-			<language type="ay">Αϊμά�α</language>
-			<language type="az">Αζε�μπαϊτζανικά</language>
-			<language type="ba">Μπασκί�</language>
-			<language type="bad">Μπάντα</language>
-			<language type="bai">Γλώσσα Μπαμιλέκ</language>
-			<language type="bal">Μπαλο�τσι</language>
-			<language type="ban">Μπαλινίζ</language>
-			<language type="bas">Μπάσα</language>
-			<language type="bat">Βαλτική γλώσσα</language>
-			<language type="be">Λευκο�ωσικά</language>
-			<language type="bej">Μπέζα</language>
-			<language type="bem">Μπέμπα</language>
-			<language type="ber">Μπέ�μπε�</language>
-			<language type="bg">Βουλγα�ικά</language>
-			<language type="bh">Μπιχά�ι</language>
-			<language type="bho">Μποζπο��ι</language>
-			<language type="bi">Μπισλάμα</language>
-			<language type="bik">Μπικόλ</language>
-			<language type="bin">Μπίνι</language>
-			<language type="bla">Σικσίκα</language>
-			<language type="bm">Μπαμπά�α</language>
-			<language type="bn">Μπενγκάλι</language>
-			<language type="bnt">Μπαντο�</language>
-			<language type="bo">Θιβετιανά</language>
-			<language type="br">Β�ετονικά</language>
-			<language type="bra">Μπ�ατζ</language>
-			<language type="bs">Βοσνιακά</language>
-			<language type="btk">Μπατάκ</language>
-			<language type="bua">Μπου�ιάτ</language>
-			<language type="bug">Μπουγκίζ</language>
-			<language type="byn">Μπλιν</language>
-			<language type="ca">Καταλανικά</language>
-			<language type="cad">Κάντο</language>
-			<language type="cai">Ινδιανική γλώσσα Κεντ�ικής Αμε�ικής</language>
-			<language type="car">Κα�ίμπ</language>
-			<language type="cau">Καυκάσια γλώσσα</language>
-			<language type="cch">Ατσάμ</language>
-			<language type="ce">Τσέτσνιαν</language>
-			<language type="ceb">Κεμπουάνο</language>
-			<language type="cel">Κελτική γλώσσα</language>
-			<language type="ch">Καμό��ο</language>
-			<language type="chb">Τσίμπτσα</language>
-			<language type="chg">Τσαγκατάι</language>
-			<language type="chk">Τσουκίζι</language>
-			<language type="chm">Μά�ι</language>
-			<language type="chn">Ιδιωματικά Σινο�κ</language>
-			<language type="cho">Τσοκτάου</language>
-			<language type="chp">Τσίπιουαν</language>
-			<language type="chr">Τσε�όκι</language>
-			<language type="chy">Σεγιέν</language>
-			<language type="cmc">Χαμική γλώσσα</language>
-			<language type="co">Κο�σικανικά</language>
-			<language type="cop">Κοπτικά</language>
-			<language type="cpe">Κ�εόλ ή Πίντγκιν βάσει Αγγλικών</language>
-			<language type="cpf">Κ�εόλ ή Πίντγκιν βάσει Γαλλικών</language>
-			<language type="cpp">Κ�εόλ και Πίντγκιν βάσει Πο�τογαλικών</language>
-			<language type="cr">Κ�ι</language>
-			<language type="crh">Του�κικά Κ�ιμαίας</language>
-			<language type="crp">Κ�εόλ ή Πίντγκιν</language>
-			<language type="cs">Τσεχικά</language>
-			<language type="csb">Κασο�μπιαν</language>
-			<language type="cu">Εκκλησιαστικά Σλαβικά</language>
-			<language type="cus">Γλώσσα Κουσιτίκ</language>
-			<language type="cv">Χουβάς</language>
-			<language type="cy">Ουαλικά</language>
-			<language type="da">Δανικά</language>
-			<language type="dak">�τακότα</language>
-			<language type="dar">�τά�γκουα</language>
-			<language type="day">�ταγιάκ</language>
-			<language type="de">Γε�μανικά</language>
-			<language type="de_AT">Γε�μανικά Αυστ�ίας</language>
-			<language type="de_CH">Γε�μανικά Ελβετίας</language>
-			<language type="del">�τέλαγουε�</language>
-			<language type="den">Σλαβικά</language>
-			<language type="dgr">�τόγκ�ιμπ</language>
-			<language type="din">�τίνκα</language>
-			<language type="doi">�τόγκ�ι</language>
-			<language type="dra">Γλώσσα �τ�αβίδιαν</language>
-			<language type="dsb">Γλώσσα Κάτω Λουσατίας</language>
-			<language type="dua">�τουάλα</language>
-			<language type="dum">Μέσα Ολλανδικά</language>
-			<language type="dv">�τιβέχι</language>
-			<language type="dyu">�τογιο�λα</language>
-			<language type="dz">�τζόνγκχα</language>
-			<language type="ee">Γι</language>
-			<language type="efi">Εφίκ</language>
-			<language type="egy">Α�χαία Αιγυπτιακά</language>
-			<language type="eka">Εκατζο�κ</language>
-			<language type="el">Ελληνικά</language>
-			<language type="elx">Ελαμάιτ</language>
-			<language type="en">Αγγλικά</language>
-			<language type="en_AU">Αγγλικά Αυστ�αλίας</language>
-			<language type="en_CA">Αγγλικά Καναδά</language>
-			<language type="en_GB">Αγγλικά Ηνωμένου Βασιλείου</language>
-			<language type="en_US">Αγγλικά Η.Π.Α.</language>
-			<language type="enm">Μέσα Αγγλικά</language>
-			<language type="eo">Εσπε�άντο</language>
-			<language type="es">Ισπανικά</language>
-			<language type="es_419">Ισπανικά Λατινικής Αμε�ικής</language>
-			<language type="es_ES">Ισπανικά Ιβη�ικής</language>
-			<language type="et">Εσθονικά</language>
-			<language type="eu">Βασκικά</language>
-			<language type="ewo">Εγουόντο</language>
-			<language type="fa">Πε�σικά</language>
-			<language type="fan">Φανγκ</language>
-			<language type="fat">Φάντι</language>
-			<language type="ff">Φουλάχ</language>
-			<language type="fi">Φινλανδικά</language>
-			<language type="fil">Φιλιππινεζικά</language>
-			<language type="fiu">Φιννο-Ο�γκ�ιαν</language>
-			<language type="fj">Φίτζι</language>
-			<language type="fo">Φα�όε</language>
-			<language type="fon">Φον</language>
-			<language type="fr">Γαλλικά</language>
-			<language type="fr_CA">Γαλλικά Καναδά</language>
-			<language type="fr_CH">Γαλλικά Ελβετίας</language>
-			<language type="frm">Μέσα Γαλλικά</language>
-			<language type="fro">Παλαιά Γαλλικά</language>
-			<language type="frr">Βό�εια Φ�ιζιανά</language>
-			<language type="frs">Ανατολικά Φ�ιζιανά</language>
-			<language type="fur">Φ�ιο�λιαν</language>
-			<language type="fy">Δυτικά Φ�ιζιανά</language>
-			<language type="ga">Ι�λανδικά</language>
-			<language type="gaa">Γκα</language>
-			<language type="gay">Γκάγιο</language>
-			<language type="gba">Γκμπάγια</language>
-			<language type="gd">Σκωτικά Κελτικά</language>
-			<language type="gem">Γε�μανική γλώσσα</language>
-			<language type="gez">Γκιζ</language>
-			<language type="gil">Γκιλμπε�τίζ</language>
-			<language type="gl">Γαλικιανά</language>
-			<language type="gmh">Μέσα Άνω Γε�μανικά</language>
-			<language type="gn">Γκουα�ανί</language>
-			<language type="goh">Παλαιά Άνω Γε�μανικά</language>
-			<language type="gon">Γκόντι</language>
-			<language type="gor">Γκο�οντάλο</language>
-			<language type="got">Γοτθικά</language>
-			<language type="grb">Γκ�ίμπο</language>
-			<language type="grc">Α�χαία Ελληνικά</language>
-			<language type="gsw">Ελβετικά Γε�μανικά</language>
-			<language type="gu">Γκουγια�άτι</language>
-			<language type="gv">Μανξ</language>
-			<language type="gwi">Γκουίτσιν</language>
-			<language type="ha">Χάουσα</language>
-			<language type="hai">Χάιντα</language>
-			<language type="haw">Χαβανεζικά</language>
-			<language type="he">Εβ�αϊκά</language>
-			<language type="hi">Χίντι</language>
-			<language type="hil">Χιλιγκαγιόν</language>
-			<language type="him">Χιματσάλι</language>
-			<language type="hit">Χιτίτε</language>
-			<language type="hmn">Χμονγκ</language>
-			<language type="ho">Χί�ι Μότου</language>
-			<language type="hr">Κ�οατικά</language>
-			<language type="hsb">Γλώσσα Άνω Λουσατίας</language>
-			<language type="ht">Αϊτιανά</language>
-			<language type="hu">Ουγγ�ικά</language>
-			<language type="hup">Χο�πα</language>
-			<language type="hy">Α�μενικά</language>
-			<language type="hz">Χε�έ�ο</language>
-			<language type="ia">Ιντε�λίνγκουα</language>
-			<language type="iba">Ιμπάν</language>
-			<language type="id">Ινδονησιακά</language>
-			<language type="ie">Ιντε�λίνγκουε</language>
-			<language type="ig">Ίγκμπο</language>
-			<language type="ii">Σικουάν Γι</language>
-			<language type="ijo">Ιζό</language>
-			<language type="ik">Ινουπιάκ</language>
-			<language type="ilo">Ιλόκο</language>
-			<language type="inc">Ινδική γλώσσα</language>
-			<language type="ine">Ινδοευ�ωπαϊκή γλώσσα</language>
-			<language type="inh">Ινγκο�ς</language>
-			<language type="io">Ίντο</language>
-			<language type="ira">Ι�ανική γλώσσα</language>
-			<language type="iro">Γλώσσα Ι�οκόιαν</language>
-			<language type="is">Ισλανδικά</language>
-			<language type="it">Ιταλικά</language>
-			<language type="iu">Ινουκτιτο�τ</language>
-			<language type="ja">Ιαπωνικά</language>
-			<language type="jbo">Λόζμπαν</language>
-			<language type="jpr">Ιουδαϊκά-Πε�σικά</language>
-			<language type="jrb">Ιουδαϊκά-Α�αβικά</language>
-			<language type="jv">Ιαβανεζικά</language>
-			<language type="ka">Γεω�γιανά</language>
-			<language type="kaa">Κά�α-Καλπάκ</language>
-			<language type="kab">Καμπίλε</language>
-			<language type="kac">Κατσίν</language>
-			<language type="kaj">Τζου</language>
-			<language type="kam">Κάμπα</language>
-			<language type="kar">Κα�έν</language>
-			<language type="kaw">Κάουι</language>
-			<language type="kbd">Καμπα�ντιανά</language>
-			<language type="kcg">Τουάπ</language>
-			<language type="kfo">Κό�ο</language>
-			<language type="kg">Κονγκό</language>
-			<language type="kha">Κάσι</language>
-			<language type="khi">Γλώσσα Κοϊσάν</language>
-			<language type="kho">Κοτανικά</language>
-			<language type="ki">Κικο�γιου</language>
-			<language type="kj">Κουανιγιάμα</language>
-			<language type="kk">Καζακικά</language>
-			<language type="kl">Καλααλισο�τ</language>
-			<language type="km">Καμποτζιανά</language>
-			<language type="kmb">Κιμπο�ντου</language>
-			<language type="kn">Κανάντα</language>
-			<language type="ko">Κο�εατικά</language>
-			<language type="kok">Κονκάνι</language>
-			<language type="kos">Κοσ�αενικά</language>
-			<language type="kpe">Κπέλε</language>
-			<language type="kr">Κανο��ι</language>
-			<language type="krc">Κα�ατσάι-Μπαλκά�</language>
-			<language type="krl">Κα�ελιακά</language>
-			<language type="kro">Κ�ου</language>
-			<language type="kru">Κου�ο�χ</language>
-			<language type="ks">Κασμί�ι</language>
-			<language type="ku">Κου�δικά</language>
-			<language type="kum">Κουμγιο�κ</language>
-			<language type="kut">Κουτενάι</language>
-			<language type="kv">Κόμι</language>
-			<language type="kw">Κό�νις</language>
-			<language type="ky">Κυ�γιζικά</language>
-			<language type="la">Λατινικά</language>
-			<language type="lad">Λαδίνο</language>
-			<language type="lah">Λάχδα</language>
-			<language type="lam">Λάμπα</language>
-			<language type="lb">Λουξεμβου�γικά</language>
-			<language type="lez">Λαζγκιάν</language>
-			<language type="lg">Γκάντα</language>
-			<language type="li">Λιμβου�γιανά</language>
-			<language type="ln">Λινγκάλα</language>
-			<language type="lo">Λαοθιανά</language>
-			<language type="lol">Μόνγκο</language>
-			<language type="loz">Λόζι</language>
-			<language type="lt">Λιθουανικά</language>
-			<language type="lu">Λο�μπα-Κατάνγκα</language>
-			<language type="lua">Λο�μπα-Λουλο�α</language>
-			<language type="lui">Λουισένο</language>
-			<language type="lun">Λο�ντα</language>
-			<language type="luo">Λο�ο</language>
-			<language type="lus">Λουσάι</language>
-			<language type="lv">Λετονικά</language>
-			<language type="mad">Μαντου�ίζ</language>
-			<language type="mag">Μαγκάχι</language>
-			<language type="mai">Μαϊτχίλι</language>
-			<language type="mak">Μακαζά�</language>
-			<language type="man">Μαντίνγκο</language>
-			<language type="map">Οστ�ονέζιαν</language>
-			<language type="mas">Μασάι</language>
-			<language type="mdf">Μόκσα</language>
-			<language type="mdr">Μανδά�</language>
-			<language type="men">Μέντε</language>
-			<language type="mg">Μαλαγάσι</language>
-			<language type="mga">Μέσα Ι�λανδικά</language>
-			<language type="mh">Μά�σαλ</language>
-			<language type="mi">Μάο�ι</language>
-			<language type="mic">Μικμάκ</language>
-			<language type="min">Μινανγκαμπάου</language>
-			<language type="mis">Διάφο�ες γλώσσες</language>
-			<language type="mk">Σλαβομακεδονικά</language>
-			<language type="mkh">Γλώσσα Μον-Χμε�</language>
-			<language type="ml">Μαλαγιαλάμ</language>
-			<language type="mn">Μογγολικά</language>
-			<language type="mnc">Μαντσο�</language>
-			<language type="mni">Μανιπο��ι</language>
-			<language type="mno">Γλώσσα Μανόμπο</language>
-			<language type="mo">Μολδαβικά</language>
-			<language type="moh">Μοχόκ</language>
-			<language type="mos">Μόσι</language>
-			<language type="mr">Μα�άθι</language>
-			<language type="ms">Μαλάι</language>
-			<language type="mt">Μαλτεζικά</language>
-			<language type="mul">Πολλαπλές γλώσσες</language>
-			<language type="mun">Γλώσσα Μο�ντα</language>
-			<language type="mus">Κ�ικ</language>
-			<language type="mwl">Μι�αντεζικά</language>
-			<language type="mwr">Μα�γουά�ι</language>
-			<language type="my">Βι�μανικά</language>
-			<language type="myn">Γλώσσα Μάγιαν</language>
-			<language type="myv">Έ�ζυα</language>
-			<language type="na">�αο��ου</language>
-			<language type="nah">�αχουάτλ</language>
-			<language type="nai">Ινδιανική γλώσσα Βό�ειας Αμε�ικής</language>
-			<language type="nap">�απολιτανικά</language>
-			<language type="nb">�ο�βηγικά Μποκμάλ</language>
-			<language type="nd">�τεμπέλε Βο��ά</language>
-			<language type="nds">Κάτω Γε�μανικά</language>
-			<language type="ne">�επάλι</language>
-			<language type="new">�εγουά�ι</language>
-			<language type="ng">�τόνγκα</language>
-			<language type="nia">�ίας</language>
-			<language type="nic">Γλώσσα �ίγη�α-Κο�δοφάνιαν</language>
-			<language type="niu">�ιο�εαν</language>
-			<language type="nl">Ολλανδικά</language>
-			<language type="nl_BE">Φλαμανδικά</language>
-			<language type="nn">�ο�βηγικά �ινό�σκ</language>
-			<language type="no">�ο�βηγικά</language>
-			<language type="nog">�ογκάι</language>
-			<language type="non">Παλαιά �ο�βηγικά</language>
-			<language type="nqo">�'Κο</language>
-			<language type="nr">�τεμπέλε �ότου</language>
-			<language type="nso">Βό�εια Σόθο</language>
-			<language type="nub">Γλώσσα �ο�μπιαν</language>
-			<language type="nv">�άβαχο</language>
-			<language type="nwc">Κλασικά �εουά�ι</language>
-			<language type="ny">�ιάντζα</language>
-			<language type="nym">�ιαμγουέζι</language>
-			<language type="nyn">�ιανκόλε</language>
-			<language type="nyo">�ιό�ο</language>
-			<language type="nzi">�ζίμα</language>
-			<language type="oc">Οκσιτανικά</language>
-			<language type="oj">Οζιβίγουα</language>
-			<language type="om">Ο�όμο</language>
-			<language type="or">Ο�ίγια</language>
-			<language type="os">Οσετικά</language>
-			<language type="osa">Οσάζ</language>
-			<language type="ota">Οθωμανικά Του�κικά</language>
-			<language type="oto">Οθωμανική γλώσσα</language>
-			<language type="pa">Παντζαπικά</language>
-			<language type="paa">Παπο�α</language>
-			<language type="pag">Πανγκασινάν</language>
-			<language type="pal">Παχλάβι</language>
-			<language type="pam">Παμπάνγκα</language>
-			<language type="pap">Παπιαμέντο</language>
-			<language type="pau">Παλάουαν</language>
-			<language type="peo">Α�χαία Πε�σικά</language>
-			<language type="phi">Φιλιππινεζική γλώσσα</language>
-			<language type="phn">Φοινικικά</language>
-			<language type="pi">Πάλι</language>
-			<language type="pl">Πολωνικά</language>
-			<language type="pon">Ποχπέιαν</language>
-			<language type="pra">Γλώσσα Π�άκ�ιτ</language>
-			<language type="pro">Παλαιά Π�οβενσιάλ</language>
-			<language type="ps">Πάστο</language>
-			<language type="pt">Πο�τογαλικά</language>
-			<language type="pt_BR">Πο�τογαλικά Β�αζιλίας</language>
-			<language type="pt_PT">Πο�τογαλικά Ιβη�ικής</language>
-			<language type="qu">Κετσο�α</language>
-			<language type="raj">Ραζασθάνι</language>
-			<language type="rap">Ραπανο�ι</language>
-			<language type="rar">Ρα�οτονγκάν</language>
-			<language type="rm">Ρετο-Ρομανικά</language>
-			<language type="rn">Ρο�ντι</language>
-			<language type="ro">Ρουμανικά</language>
-			<language type="roa">Ρομανική γλώσσα</language>
-			<language type="rom">Ρομανί</language>
-			<language type="root">Ρουτ</language>
-			<language type="ru">Ρωσικά</language>
-			<language type="rup">Α�ομανικά</language>
-			<language type="rw">Κινια�βάντα</language>
-			<language type="sa">Σανσκ�ιτικά</language>
-			<language type="sad">Σαντάγουε</language>
-			<language type="sah">Γιακο�τ</language>
-			<language type="sai">Ινδιανική γλώσσα �ότιας Αμε�ικής</language>
-			<language type="sal">Γλώσσα Σαλισάν</language>
-			<language type="sam">Σαμα�ίτικα Α�αμαϊκά</language>
-			<language type="sas">Σασάκ</language>
-			<language type="sat">Σαντάλι</language>
-			<language type="sc">Σα�δινικά</language>
-			<language type="scn">Σικελιανά</language>
-			<language type="sco">Σκωτικά</language>
-			<language type="sd">Σίντι</language>
-			<language type="se">Βό�εια Σάμι</language>
-			<language type="sel">Σελκο�π</language>
-			<language type="sem">Σημητική γλώσσα</language>
-			<language type="sg">Σάνγκο</language>
-			<language type="sga">Παλαιά Ι�λανδικά</language>
-			<language type="sgn">�οηματική γλώσσα</language>
-			<language type="sh">Σε�βοκ�οατικά</language>
-			<language type="shn">Σαν</language>
-			<language type="si">Σινχαλεζικά</language>
-			<language type="sid">Σιντάμο</language>
-			<language type="sio">Γλώσσα Σιουάν</language>
-			<language type="sit">Σινοθιβετιανή γλώσσα</language>
-			<language type="sk">Σλοβακικά</language>
-			<language type="sl">Σλοβενικά</language>
-			<language type="sla">Σλαβική γλώσσα</language>
-			<language type="sm">Σαμόαν</language>
-			<language type="sma">�ότια Σάμι</language>
-			<language type="smi">Γλώσσα Σάμι</language>
-			<language type="smj">Λο�λε Σάμι</language>
-			<language type="smn">Ινά�ι Σάμι</language>
-			<language type="sms">Σκολτ Σάμι</language>
-			<language type="sn">Σχόνα</language>
-			<language type="snk">Σονίνκε</language>
-			<language type="so">Σομάλι</language>
-			<language type="sog">Σογκντιέν</language>
-			<language type="son">Σονγκχάι</language>
-			<language type="sq">Αλβανικά</language>
-			<language type="sr">Σε�βικά</language>
-			<language type="srn">Σ�ανά� Τόνγκο</language>
-			<language type="srr">Σε�έ�</language>
-			<language type="ss">Σουάτι</language>
-			<language type="ssa">�ιλο-Σαχα�ιανή γλώσσα</language>
-			<language type="st">�ότια Σόθο</language>
-			<language type="su">Σουδανικά</language>
-			<language type="suk">Σουκο�μα</language>
-			<language type="sus">Σο�σου</language>
-			<language type="sux">Σουμε�ικά</language>
-			<language type="sv">Σουηδικά</language>
-			<language type="sw">Σουαχίλι</language>
-			<language type="syc">Κλασικά Συ�ιακά</language>
-			<language type="syr">Συ�ιακά</language>
-			<language type="ta">Ταμίλ</language>
-			<language type="tai">Ταϊλανδική γλώσσα</language>
-			<language type="te">Τελο�γκου</language>
-			<language type="tem">Τίμνε</language>
-			<language type="ter">Τε�ένο</language>
-			<language type="tet">Τέτουμ</language>
-			<language type="tg">Τατζίκ</language>
-			<language type="th">Ταϊλανδικά</language>
-			<language type="ti">Τιγκ�ίνυα</language>
-			<language type="tig">Τίγκ�ε</language>
-			<language type="tiv">Τιβ</language>
-			<language type="tk">Του�κμενικά</language>
-			<language type="tkl">Τοκελάου</language>
-			<language type="tl">Ταγκαλόγκ</language>
-			<language type="tlh">Κλίνγκον</language>
-			<language type="tli">Τλίνγκιτ</language>
-			<language type="tmh">Ταμασέκ</language>
-			<language type="tn">Τσιγουάνα</language>
-			<language type="to">Τόνγκα</language>
-			<language type="tog">�ιάσα Τόνγκα</language>
-			<language type="tpi">Τοκ Πισίν</language>
-			<language type="tr">Του�κικά</language>
-			<language type="ts">Τσόνγκα</language>
-			<language type="tsi">Τσίμσιαν</language>
-			<language type="tt">Τατά�</language>
-			<language type="tum">Τουμπο�κα</language>
-			<language type="tup">Γλώσσα Το�πι</language>
-			<language type="tut">Αλταϊκή γλώσσα</language>
-			<language type="tvl">Τουβαλο�</language>
-			<language type="tw">Το�ι</language>
-			<language type="ty">Ταϊτιανά</language>
-			<language type="tyv">Τουβίνιαν</language>
-			<language type="udm">Ουντμο��τ</language>
-			<language type="ug">Ουιγου�ικά</language>
-			<language type="uga">Ουγκα�ίτικ</language>
-			<language type="uk">Ουκ�ανικά</language>
-			<language type="umb">Ουμπο�ντου</language>
-			<language type="und">Άγνωστη ή ακατάλληλη γλώσσα</language>
-			<language type="ur">Ου�ντο�</language>
-			<language type="uz">Ουζμπεκικά</language>
-			<language type="vai">Βάι</language>
-			<language type="ve">Βένδα</language>
-			<language type="vi">Βιετναμεζικά</language>
-			<language type="vo">Βόλαπικ</language>
-			<language type="vot">Βότικ</language>
-			<language type="wa">Γουαλο�ν</language>
-			<language type="wak">Γλώσσα Γουακασάν</language>
-			<language type="wal">Γουάλαμο</language>
-			<language type="war">Γουά�ει</language>
-			<language type="was">Γουασό</language>
-			<language type="wen">Διάλεκτος Άνω Λουσατίας</language>
-			<language type="wo">Γουόλοφ</language>
-			<language type="xal">Καλμίκ</language>
-			<language type="xh">Ζόσα</language>
-			<language type="yao">Γιάο</language>
-			<language type="yap">Γιαπίζ</language>
-			<language type="yi">Γίντις</language>
-			<language type="yo">Γιο�ο�μπα</language>
-			<language type="ypk">Γλώσσα Γιο�πικ</language>
-			<language type="za">Ζουάνγκ</language>
-			<language type="zap">Ζάποτεκ</language>
-			<language type="zbl">Σ�μβολα Bliss</language>
-			<language type="zen">Ζενάγκα</language>
-			<language type="zh">Κινεζικά</language>
-			<language type="zh_Hans">Απλοποιημένα Κινεζικά</language>
-			<language type="zh_Hant">Πα�αδοσιακά Κινεζικά</language>
-			<language type="znd">Ζάντε</language>
-			<language type="zu">Ζουλο�</language>
-			<language type="zun">Ζο�νι</language>
-			<language type="zxx">Χω�ίς γλωσσολογικό πε�ιεχόμενο</language>
-			<language type="zza">Ζάζα</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Α�αβικό</script>
-			<script type="Armi">Αυτοκ�ατο�ικό Α�αμαϊκό</script>
-			<script type="Armn">Α�μενικό</script>
-			<script type="Avst">Αβεστάν</script>
-			<script type="Bali">Μπαλινίζ</script>
-			<script type="Batk">Μπατάκ</script>
-			<script type="Beng">Μπενγκάλι</script>
-			<script type="Blis">Σ�μβολα Bliss</script>
-			<script type="Bopo">Μποπομόφο</script>
-			<script type="Brah">Μπ�αχμί</script>
-			<script type="Brai">Μπ�άιγ</script>
-			<script type="Bugi">Μπο�γκις</script>
-			<script type="Buhd">Μπουχίντ</script>
-			<script type="Cakm">Τσάκμα</script>
-			<script type="Cans">Ενοποιημένοι Καναδεζικοί Συλλαβισμοί Ιθαγενών</script>
-			<script type="Cari">Κα�ιάν</script>
-			<script type="Cham">Τσαμ</script>
-			<script type="Cher">Τσε�όκι</script>
-			<script type="Cirt">Σε�θ</script>
-			<script type="Copt">Κοπτικό</script>
-			<script type="Cprt">Κυπ�ιακό</script>
-			<script type="Cyrl">Κυ�ιλλικό</script>
-			<script type="Cyrs">Παλαιό Εκκλησιαστικό Σλαβικό Κυ�ιλλικό</script>
-			<script type="Deva">�τεβαναγκά�ι</script>
-			<script type="Dsrt">�τεσε�έ</script>
-			<script type="Egyd">Λαϊκό Αιγυπτιακό</script>
-			<script type="Egyh">Ιε�ατικό Αιγυπτιακό</script>
-			<script type="Egyp">Αιγυπτιακά Ιε�ογλυφικά</script>
-			<script type="Ethi">Αιθιοπικό</script>
-			<script type="Geok">Γεω�γιανό Κχουτσο��ι</script>
-			<script type="Geor">Γεω�γιανό</script>
-			<script type="Glag">Γκλαγκολιτικό</script>
-			<script type="Goth">Γοτθικό</script>
-			<script type="Grek">Ελληνικό</script>
-			<script type="Gujr">Γκουγια�άτι</script>
-			<script type="Guru">Γκου�μουκχί</script>
-			<script type="Hang">Χανγκο�λ</script>
-			<script type="Hani">Χαν</script>
-			<script type="Hano">Χανο�νου</script>
-			<script type="Hans">Απλοποιημένο Κινεζικό</script>
-			<script type="Hant">Πα�αδοσιακό Κινεζικό</script>
-			<script type="Hebr">Εβ�αϊκό</script>
-			<script type="Hira">Χι�αγκάνα</script>
-			<script type="Hmng">Παχάχ Χμονγκ</script>
-			<script type="Hrkt">Κατακάνα ή Χι�αγκάνα</script>
-			<script type="Hung">Παλαιό Ουγγ�ικό</script>
-			<script type="Inds">Ίνδους</script>
-			<script type="Ital">Παλαιό Ιταλικό</script>
-			<script type="Java">Ιαβανεζικό</script>
-			<script type="Jpan">Ιαπωνικό</script>
-			<script type="Kali">Καγιάχ Λι</script>
-			<script type="Kana">Κατακάνα</script>
-			<script type="Khar">Κα�όσθι</script>
-			<script type="Khmr">Κχμε�</script>
-			<script type="Knda">Κανάντα</script>
-			<script type="Kore">Κο�εατικό</script>
-			<script type="Kthi">Καϊθί</script>
-			<script type="Lana">Λάννα</script>
-			<script type="Laoo">Λάος</script>
-			<script type="Latf">Φ�άκτου� Λατινικό</script>
-			<script type="Latg">Γαελικό Λατινικό</script>
-			<script type="Latn">Λατινικό</script>
-			<script type="Lepc">Λέπτσα</script>
-			<script type="Limb">Λιμπο�</script>
-			<script type="Lina">Γ�αμμικό Α</script>
-			<script type="Linb">Γ�αμμικό Β</script>
-			<script type="Lyci">Λυκιανικό</script>
-			<script type="Lydi">Λυδιανικό</script>
-			<script type="Mand">Μανδαϊκό</script>
-			<script type="Mani">Μανιχαϊκό</script>
-			<script type="Maya">Ιε�ογλυφικά Μάγια</script>
-			<script type="Mero">Με�οϊτικό</script>
-			<script type="Mlym">Μαλαϊκό</script>
-			<script type="Mong">Μογγολικό</script>
-			<script type="Moon">Μουν</script>
-			<script type="Mtei">Μεϊτέι Μάγεκ</script>
-			<script type="Mymr">Μιανμά�</script>
-			<script type="Nkoo">�'Κο</script>
-			<script type="Ogam">Όγκχαμ</script>
-			<script type="Olck">Ολ Τσίκι</script>
-			<script type="Orkh">Ό�κχον</script>
-			<script type="Orya">Ο�ίγια</script>
-			<script type="Osma">Οσμάνγια</script>
-			<script type="Perm">Παλαιό Πε�μικό</script>
-			<script type="Phag">Παγκς-πα</script>
-			<script type="Phli">Επιγ�αφικό Παχλάβι</script>
-			<script type="Phlp">Ψάλτε� Παχλάβι</script>
-			<script type="Phlv">Μπουκ Παχλαβί</script>
-			<script type="Phnx">Φοινικικό</script>
-			<script type="Plrd">Φωνητικό Πόλα�ντ</script>
-			<script type="Prti">Επιγ�αφικό Πα�θιάν</script>
-			<script type="Qaai">Κλη�ονομημένο</script>
-			<script type="Rjng">Ρετζάνγκ</script>
-			<script type="Roro">Ρονγκο�όνγκο</script>
-			<script type="Runr">Ρουνίκ</script>
-			<script type="Samr">Σαμα�ιτικό</script>
-			<script type="Sara">Σα�άθι</script>
-			<script type="Saur">Σαου�άστ�α</script>
-			<script type="Sgnw">�οηματική γ�αφή</script>
-			<script type="Shaw">Σαβιανό</script>
-			<script type="Sinh">Σινχάλα</script>
-			<script type="Sund">Σουδανεζικό</script>
-			<script type="Sylo">Συλότι �άγκ�ι</script>
-			<script type="Syrc">Συ�ιακό</script>
-			<script type="Syre">Εστ�αντζέλο Συ�ιακό</script>
-			<script type="Syrj">Δυτικό Συ�ιακό</script>
-			<script type="Syrn">Ανατολικό Συ�ιακό</script>
-			<script type="Tagb">Ταγκμάνγουα</script>
-			<script type="Tale">Τάι Λε</script>
-			<script type="Talu">�έο Τάι Λο�ε</script>
-			<script type="Taml">Ταμίλ</script>
-			<script type="Tavt">Τάι Βιέτ</script>
-			<script type="Telu">Τελο�γκου</script>
-			<script type="Teng">Τεγνγουά�</script>
-			<script type="Tfng">Τιφινάγκ</script>
-			<script type="Tglg">Ταγκαλόγκ</script>
-			<script type="Thaa">Θαανά</script>
-			<script type="Thai">Ταϊλανδικό</script>
-			<script type="Tibt">Θιβετιανό</script>
-			<script type="Ugar">Ουγκα�ιτικό</script>
-			<script type="Vaii">Βάι</script>
-			<script type="Visp">Ο�ατή ομιλία</script>
-			<script type="Xpeo">Παλαιό Πε�σικό</script>
-			<script type="Xsux">Σο�με�ο-Ακάντιαν Κουνεϊφό�μ</script>
-			<script type="Yiii">Γι</script>
-			<script type="Zmth">Μαθηματική πα�άσταση</script>
-			<script type="Zsym">Σ�μβολα</script>
-			<script type="Zxxx">Άγ�αφο</script>
-			<script type="Zyyy">Κοινό</script>
-			<script type="Zzzz">Άγνωστη ή ακατάλληλη γ�αφή</script>
-		</scripts>
-		<territories>
-			<territory type="001">Κόσμος</territory>
-			<territory type="002">Αφ�ική</territory>
-			<territory type="003">Βό�εια Αμε�ική</territory>
-			<territory type="005">�ότια Αμε�ική</territory>
-			<territory type="009">Ωκεανία</territory>
-			<territory type="011">Δυτική Αφ�ική</territory>
-			<territory type="013">Κεντ�ική Αμε�ική</territory>
-			<territory type="014">Ανατολική Αφ�ική</territory>
-			<territory type="015">Βό�εια Αφ�ική</territory>
-			<territory type="017">Μέση Αφ�ική</territory>
-			<territory type="018">�ότιος Αφ�ική</territory>
-			<territory type="019">Αμε�ική</territory>
-			<territory type="021">Βό�ειος Αμε�ική</territory>
-			<territory type="029">Κα�αϊβική</territory>
-			<territory type="030">Ανατολική Ασία</territory>
-			<territory type="034">�ότια Ασία</territory>
-			<territory type="035">�οτιοανατολική Ασία</territory>
-			<territory type="039">�ότια Ευ�ώπη</territory>
-			<territory type="053">Αυστ�αλία και �έα Ζηλανδία</territory>
-			<territory type="054">Μελανησία</territory>
-			<territory type="057">Πε�ιοχή Μικ�ονησίας</territory>
-			<territory type="061">Πολυνησία</territory>
-			<territory type="062">�ότια Κεντ�ική Ασία</territory>
-			<territory type="142">Ασία</territory>
-			<territory type="143">Κεντ�ική Ασία</territory>
-			<territory type="145">Δυτική Ασία</territory>
-			<territory type="150">Ευ�ώπη</territory>
-			<territory type="151">Ανατολική Ευ�ώπη</territory>
-			<territory type="154">Βό�εια Ευ�ώπη</territory>
-			<territory type="155">Δυτική Ευ�ώπη</territory>
-			<territory type="172">Κοινοπολιτεία Ανεξα�τήτων Πολιτειών</territory>
-			<territory type="419">Λατινική Αμε�ική και Κα�αϊβική</territory>
-			<territory type="830">�ησιά Τσάνελ</territory>
-			<territory type="AD">Ανδό�α</territory>
-			<territory type="AE">Ηνωμένα Α�αβικά Εμι�άτα</territory>
-			<territory type="AF">Αφγανιστάν</territory>
-			<territory type="AG">Αντίγκουα και Μπα�μπο�ντα</territory>
-			<territory type="AI">Ανγκουίλα</territory>
-			<territory type="AL">Αλβανία</territory>
-			<territory type="AM">Α�μενία</territory>
-			<territory type="AN">Ολλανδικές Αντίλλες</territory>
-			<territory type="AO">Ανγκόλα</territory>
-			<territory type="AQ">Αντα�κτική</territory>
-			<territory type="AR">Α�γεντινή</territory>
-			<territory type="AS">Αμε�ικανική Σαμόα</territory>
-			<territory type="AT">Αυστ�ία</territory>
-			<territory type="AU">Αυστ�αλία</territory>
-			<territory type="AW">Α�ο�μπα</territory>
-			<territory type="AX">�ήσοι Άλαντ</territory>
-			<territory type="AZ">Αζε�μπαϊτζάν</territory>
-			<territory type="BA">Βοσνία - Ε�ζεγοβίνη</territory>
-			<territory type="BB">Μπα�μπάντος</territory>
-			<territory type="BD">Μπανγκλαντές</territory>
-			<territory type="BE">Βέλγιο</territory>
-			<territory type="BF">Μπου�κίνα Φάσο</territory>
-			<territory type="BG">Βουλγα�ία</territory>
-			<territory type="BH">Μπαχ�έιν</territory>
-			<territory type="BI">Μπου�ο�ντι</territory>
-			<territory type="BJ">Μπενίν</territory>
-			<territory type="BL">Άγιος Βα�θολομαίος</territory>
-			<territory type="BM">Βε�μο�δες</territory>
-			<territory type="BN">Μπ�ουνέι</territory>
-			<territory type="BO">Βολιβία</territory>
-			<territory type="BR">Β�αζιλία</territory>
-			<territory type="BS">Μπαχάμες</territory>
-			<territory type="BT">Μπουτάν</territory>
-			<territory type="BV">�ήσος Μπουβέ</territory>
-			<territory type="BW">Μποτσουάνα</territory>
-			<territory type="BY">Λευκο�ωσία</territory>
-			<territory type="BZ">Μπελίσε</territory>
-			<territory type="CA">Καναδάς</territory>
-			<territory type="CC">�ήσοι Κόκος</territory>
-			<territory type="CD">Κονγκό - Κινσάσα</territory>
-			<territory type="CF">Κεντ�οαφ�ικανική Δημοκ�ατία</territory>
-			<territory type="CG">Κονγκό - Μπ�αζαβίλ</territory>
-			<territory type="CH">Ελβετία</territory>
-			<territory type="CI">Ακτή Ελεφαντοστο�</territory>
-			<territory type="CK">�ήσοι Κουκ</territory>
-			<territory type="CL">Χιλή</territory>
-			<territory type="CM">Καμε�ο�ν</territory>
-			<territory type="CN">Κίνα</territory>
-			<territory type="CO">Κολομβία</territory>
-			<territory type="CR">Κόστα Ρίκα</territory>
-			<territory type="CS">Σε�βία και Μαυ�οβο�νιο</territory>
-			<territory type="CU">Κο�βα</territory>
-			<territory type="CV">Π�άσινο Ακ�ωτή�ιο</territory>
-			<territory type="CX">�ήσος Χ�ιστουγέννων</territory>
-			<territory type="CY">Κ�π�ος</territory>
-			<territory type="CZ">Τσεχία</territory>
-			<territory type="DE">Γε�μανία</territory>
-			<territory type="DJ">Τζιμπουτί</territory>
-			<territory type="DK">Δανία</territory>
-			<territory type="DM">�τομίνικα</territory>
-			<territory type="DO">Δομινικανή Δημοκ�ατία</territory>
-			<territory type="DZ">Αλγε�ία</territory>
-			<territory type="EC">Ισημε�ινός</territory>
-			<territory type="EE">Εσθονία</territory>
-			<territory type="EG">Αίγυπτος</territory>
-			<territory type="EH">Δυτική Σαχά�α</territory>
-			<territory type="ER">Ε�υθ�αία</territory>
-			<territory type="ES">Ισπανία</territory>
-			<territory type="ET">Αιθιοπία</territory>
-			<territory type="FI">Φινλανδία</territory>
-			<territory type="FJ">Φίτζι</territory>
-			<territory type="FK">�ήσοι Φώκλαντ</territory>
-			<territory type="FM">Μικ�ονησία</territory>
-			<territory type="FO">�ήσοι Φε�όε</territory>
-			<territory type="FR">Γαλλία</territory>
-			<territory type="GA">Γκαμπόν</territory>
-			<territory type="GB">Ηνωμένο Βασίλειο</territory>
-			<territory type="GD">Γ�ενάδα</territory>
-			<territory type="GE">Γεω�γία</territory>
-			<territory type="GF">Γαλλική Γουιάνα</territory>
-			<territory type="GG">Γκε�νσέι</territory>
-			<territory type="GH">Γκάνα</territory>
-			<territory type="GI">Γιβ�αλτά�</territory>
-			<territory type="GL">Γ�οιλανδία</territory>
-			<territory type="GM">Γκάμπια</territory>
-			<territory type="GN">Γουινέα</territory>
-			<territory type="GP">Γουαδελο�πη</territory>
-			<territory type="GQ">Ισημε�ινή Γουινέα</territory>
-			<territory type="GR">Ελλάδα</territory>
-			<territory type="GS">�ότια Γεω�γία και �ότιες �ήσοι Σάντουιτς</territory>
-			<territory type="GT">Γουατεμάλα</territory>
-			<territory type="GU">Γκουάμ</territory>
-			<territory type="GW">Γουινέα-Μπισάου</territory>
-			<territory type="GY">Γουιάνα</territory>
-			<territory type="HK">Χονγκ Κονγκ ΕΔΠ Κίνας</territory>
-			<territory type="HM">�ήσοι Χε�ντ και Μακντόναλντ</territory>
-			<territory type="HN">Ονδο��α</territory>
-			<territory type="HR">Κ�οατία</territory>
-			<territory type="HT">Αϊτή</territory>
-			<territory type="HU">Ουγγα�ία</territory>
-			<territory type="ID">Ινδονησία</territory>
-			<territory type="IE">Ι�λανδία</territory>
-			<territory type="IL">Ισ�αήλ</territory>
-			<territory type="IM">�ήσος Μαν</territory>
-			<territory type="IN">Ινδία</territory>
-			<territory type="IO">Β�ετανικά Εδάφη Ινδικο� Ωκεανο�</territory>
-			<territory type="IQ">Ι�άκ</territory>
-			<territory type="IR">Ι�άν</territory>
-			<territory type="IS">Ισλανδία</territory>
-			<territory type="IT">Ιταλία</territory>
-			<territory type="JE">Υε�σέη</territory>
-			<territory type="JM">Τζαμάικα</territory>
-			<territory type="JO">Ιο�δανία</territory>
-			<territory type="JP">Ιαπωνία</territory>
-			<territory type="KE">Κένυα</territory>
-			<territory type="KG">Κι�γιζία</territory>
-			<territory type="KH">Καμπότζη</territory>
-			<territory type="KI">Κι�ιμπάτι</territory>
-			<territory type="KM">Κομό�ος</territory>
-			<territory type="KN">Σαιντ Κιτς και �έβις</territory>
-			<territory type="KP">Βό�εια Κο�έα</territory>
-			<territory type="KR">�ότια Κο�έα</territory>
-			<territory type="KW">Κουβέιτ</territory>
-			<territory type="KY">�ήσοι Κέιμαν</territory>
-			<territory type="KZ">Καζακστάν</territory>
-			<territory type="LA">Λάος</territory>
-			<territory type="LB">Λίβανος</territory>
-			<territory type="LC">Αγία Λουκία</territory>
-			<territory type="LI">Λιχτενστάιν</territory>
-			<territory type="LK">Σ�ι Λάνκα</territory>
-			<territory type="LR">Λιβε�ία</territory>
-			<territory type="LS">Λεσότο</territory>
-			<territory type="LT">Λιθουανία</territory>
-			<territory type="LU">Λουξεμβο��γο</territory>
-			<territory type="LV">Λετονία</territory>
-			<territory type="LY">Λιβ�η</territory>
-			<territory type="MA">Μα�όκο</territory>
-			<territory type="MC">Μονακό</territory>
-			<territory type="MD">Μολδαβία</territory>
-			<territory type="ME">Μαυ�οβο�νιο</territory>
-			<territory type="MF">Άγιος Μα�τίνος</territory>
-			<territory type="MG">Μαδαγασκά�η</territory>
-			<territory type="MH">�ήσοι Μά�σαλ</territory>
-			<territory type="MK">ΠΓΔ Μακεδονίας</territory>
-			<territory type="ML">Μάλι</territory>
-			<territory type="MM">Μιανμά�</territory>
-			<territory type="MN">Μογγολία</territory>
-			<territory type="MO">Μακάο ΕΔΠ Κίνας</territory>
-			<territory type="MP">Βό�ειες Μα�ιάνες �ήσοι</territory>
-			<territory type="MQ">Μα�τινίκα</territory>
-			<territory type="MR">Μαυ�ιτανία</territory>
-			<territory type="MS">Μονσε�άτ</territory>
-			<territory type="MT">Μάλτα</territory>
-			<territory type="MU">Μαυ�ίκιος</territory>
-			<territory type="MV">Μαλδίβες</territory>
-			<territory type="MW">Μαλάουι</territory>
-			<territory type="MX">Μεξικό</territory>
-			<territory type="MY">Μαλαισία</territory>
-			<territory type="MZ">Μοζαμβίκη</territory>
-			<territory type="NA">�αμίμπια</territory>
-			<territory type="NC">�έα Καληδονία</territory>
-			<territory type="NE">�ίγη�ας</territory>
-			<territory type="NF">�ήσος �ό�φολκ</territory>
-			<territory type="NG">�ιγη�ία</territory>
-			<territory type="NI">�ικα�άγουα</territory>
-			<territory type="NL">Ολλανδία</territory>
-			<territory type="NO">�ο�βηγία</territory>
-			<territory type="NP">�επάλ</territory>
-			<territory type="NR">�αο��ου</territory>
-			<territory type="NU">�ιο�ε</territory>
-			<territory type="NZ">�έα Ζηλανδία</territory>
-			<territory type="OM">Ομάν</territory>
-			<territory type="PA">Παναμάς</territory>
-			<territory type="PE">Πε�ο�</territory>
-			<territory type="PF">Γαλλική Πολυνησία</territory>
-			<territory type="PG">Παπο�α �έα Γουινέα</territory>
-			<territory type="PH">Φιλιππίνες</territory>
-			<territory type="PK">Πακιστάν</territory>
-			<territory type="PL">Πολωνία</territory>
-			<territory type="PM">Σαιντ Πιέ� και Μικελόν</territory>
-			<territory type="PN">Πίτκε�ν</territory>
-			<territory type="PR">Πουέ�το Ρίκο</territory>
-			<territory type="PS">Παλαιστινιακά Εδάφη</territory>
-			<territory type="PT">Πο�τογαλία</territory>
-			<territory type="PW">Παλάου</territory>
-			<territory type="PY">Πα�αγουάη</territory>
-			<territory type="QA">Κατά�</territory>
-			<territory type="QO">Πε�ιφε�ειακή Ωκεανία</territory>
-			<territory type="QU">Ευ�ωπαϊκή Ένωση</territory>
-			<territory type="RE">Ρεϋνιόν</territory>
-			<territory type="RO">Ρουμανία</territory>
-			<territory type="RS">Σε�βία</territory>
-			<territory type="RU">Ρωσία</territory>
-			<territory type="RW">Ρουάντα</territory>
-			<territory type="SA">Σαουδική Α�αβία</territory>
-			<territory type="SB">�ήσοι Σολομώντος</territory>
-			<territory type="SC">Σεϋχέλλες</territory>
-			<territory type="SD">Σουδάν</territory>
-			<territory type="SE">Σουηδία</territory>
-			<territory type="SG">Σιγκαπο��η</territory>
-			<territory type="SH">Αγία Ελένη</territory>
-			<territory type="SI">Σλοβενία</territory>
-			<territory type="SJ">Σβαλμπά�ντ και Γιαν Μαγιέν</territory>
-			<territory type="SK">Σλοβακία</territory>
-			<territory type="SL">Σιέ�α Λεόνε</territory>
-			<territory type="SM">Άγιος Μα�ίνος</territory>
-			<territory type="SN">Σενεγάλη</territory>
-			<territory type="SO">Σομαλία</territory>
-			<territory type="SR">Σου�ινάμ</territory>
-			<territory type="ST">Σάο Τομέ και Π�ίνσιπε</territory>
-			<territory type="SV">Ελ Σαλβαδό�</territory>
-			<territory type="SY">Συ�ία</territory>
-			<territory type="SZ">Ζουαζηλάνδη</territory>
-			<territory type="TC">�ήσοι Τε�κς και Κάικος</territory>
-			<territory type="TD">Τσαντ</territory>
-			<territory type="TF">Γαλλικά �ότια Εδάφη</territory>
-			<territory type="TG">Τόγκο</territory>
-			<territory type="TH">Ταϊλάνδη</territory>
-			<territory type="TJ">Τατζικιστάν</territory>
-			<territory type="TK">Τοκελάου</territory>
-			<territory type="TL">Ανατολικό Τιμό�</territory>
-			<territory type="TM">Του�κμενιστάν</territory>
-			<territory type="TN">Τυνησία</territory>
-			<territory type="TO">Τόνγκα</territory>
-			<territory type="TR">Του�κία</territory>
-			<territory type="TT">Τ�ινιντάντ και Τομπάγκο</territory>
-			<territory type="TV">Τουβαλο�</territory>
-			<territory type="TW">Ταϊβάν</territory>
-			<territory type="TZ">Τανζανία</territory>
-			<territory type="UA">Ουκ�ανία</territory>
-			<territory type="UG">Ουγκάντα</territory>
-			<territory type="UM">Απομακ�υσμένες �ησίδες Η.Π.Α.</territory>
-			<territory type="US">Ηνωμένες Πολιτείες της Αμε�ικής</territory>
-			<territory type="UY">Ου�ουγουάη</territory>
-			<territory type="UZ">Ουζμπεκιστάν</territory>
-			<territory type="VA">Βατικανό</territory>
-			<territory type="VC">Άγιος Βικέντιος και Γ�εναδίνες</territory>
-			<territory type="VE">Βενεζουέλα</territory>
-			<territory type="VG">Β�ετανικές Πα�θένοι �ήσοι</territory>
-			<territory type="VI">Αμε�ικανικές Πα�θένοι �ήσοι</territory>
-			<territory type="VN">Βιετνάμ</territory>
-			<territory type="VU">Βανουάτου</territory>
-			<territory type="WF">�ήσοι Ουαλλίς και Φουτουνά</territory>
-			<territory type="WS">Σαμόα</territory>
-			<territory type="YE">Υεμένη</territory>
-			<territory type="YT">Μαγιότ</territory>
-			<territory type="ZA">�ότια Αφ�ική</territory>
-			<territory type="ZM">Ζάμπια</territory>
-			<territory type="ZW">Ζιμπάμπουε</territory>
-			<territory type="ZZ">Άγνωστη ή μη έγκυ�η πε�ιοχή</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Πα�αδοσιακή γε�μανική ο�θογ�αφία</variant>
-			<variant type="1994">Τυποποιημένη ο�θογ�αφία Ρεσιάν</variant>
-			<variant type="1996">Γε�μανική ο�θογ�αφία του 1996</variant>
-			<variant type="1606NICT">�εότε�α Μέσα Γαλλικά του 1606</variant>
-			<variant type="1694ACAD">Π�ώιμα Σ�γχ�ονα Γαλλικά</variant>
-			<variant type="AREVELA">Ανατολικά Α�μενικά</variant>
-			<variant type="AREVMDA">Δυτικά Α�μενικά</variant>
-			<variant type="BAKU1926">Ενοποιημένη του�κική λατινική αλφάβητος</variant>
-			<variant type="BISKE">Διάλεκτος Σαν Τζιό�τζιο/Βίλα</variant>
-			<variant type="BOONT">Μπο�ντλινγκ</variant>
-			<variant type="FONIPA">Διεθνής φωνητική αλφάβητος</variant>
-			<variant type="FONUPA">Ου�αλική φωνητική αλφάβητος</variant>
-			<variant type="LIPAW">Διάλεκτος Λιποβάζ της Ρεσιάν</variant>
-			<variant type="MONOTON">Μονοτονικό</variant>
-			<variant type="NEDIS">Διάλεκτος �ατισόνε</variant>
-			<variant type="NJIVA">Διάλεκτος Γκνιβά/�τζιβά</variant>
-			<variant type="OSOJS">Διάλεκτος Οσεακό/Οσοτζάν</variant>
-			<variant type="POLYTON">Πολυτονικό</variant>
-			<variant type="POSIX">Υπολογιστής</variant>
-			<variant type="REVISED">Αναθεω�ημένη ο�θογ�αφία</variant>
-			<variant type="ROZAJ">Ρεσιάν</variant>
-			<variant type="SAAHO">Σάχο</variant>
-			<variant type="SCOTLAND">Σκοτσεζικά τυποποιημένα Αγγλικά</variant>
-			<variant type="SCOUSE">Σκουζ</variant>
-			<variant type="SOLBA">Διάλεκτος Στολβιτζά/Σολμπικά</variant>
-			<variant type="TARASK">Τα�ασκιεβική ο�θογ�αφία</variant>
-			<variant type="VALENCIA">Βαλενθιανά</variant>
-		</variants>
-		<keys>
-			<key type="calendar">ημε�ολόγιο</key>
-			<key type="collation">τακτοποίηση</key>
-			<key type="currency">νόμισμα</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Σει�ά ταξινόμησης Πα�αδοσιακών Κινεζικών - Big5</type>
-			<type type="buddhist" key="calendar">Βουδιστικό ημε�ολόγιο</type>
-			<type type="chinese" key="calendar">Κινεζικό ημε�ολόγιο</type>
-			<type type="direct" key="collation">Άμεση σει�ά ταξινόμησης</type>
-			<type type="gb2312han" key="collation">Σει�ά ταξινόμησης Απλουστευμένων Κινεζικών - GB2312</type>
-			<type type="gregorian" key="calendar">Γ�ηγο�ιανό ημε�ολόγιο</type>
-			<type type="hebrew" key="calendar">Εβ�αϊκό ημε�ολόγιο</type>
-			<type type="indian" key="calendar">Ινδικό εθνικό ημε�ολόγιο</type>
-			<type type="islamic" key="calendar">Ισλαμικό ημε�ολόγιο</type>
-			<type type="islamic-civil" key="calendar">Ισλαμικό αστικό ημε�ολόγιο</type>
-			<type type="japanese" key="calendar">Ιαπωνικό ημε�ολόγιο</type>
-			<type type="phonebook" key="collation">Σει�ά ταξινόμησης τηλεφωνικο� καταλόγου</type>
-			<type type="pinyin" key="collation">Σει�ά ταξινόμησης Πινγίν</type>
-			<type type="roc" key="calendar">Ημε�ολόγιο της Δημοκ�ατίας της Κίνας</type>
-			<type type="stroke" key="collation">Σει�ά ταξινόμησης κινήσεων</type>
-			<type type="traditional" key="collation">Πα�αδοσιακή σει�ά ταξινόμησης</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Μετ�ικό</measurementSystemName>
-			<measurementSystemName type="US">Αγγλοσαξωνικό</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Γλώσσα: {0}</codePattern>
-			<codePattern type="script">Σ�στημα γ�αφής: {0}</codePattern>
-			<codePattern type="territory">Πε�ιοχή: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[α ά β-ε έ ζ η ή θ ι ί ϊ � κ-ο ό π � σ ς τ υ � ϋ ΰ φ-ω ώ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL, y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="coptic">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="ethiopic">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ιαν</month>
-							<month type="2">Φεβ</month>
-							<month type="3">Μα�</month>
-							<month type="4">Απ�</month>
-							<month type="5">Μαϊ</month>
-							<month type="6">Ιουν</month>
-							<month type="7">Ιουλ</month>
-							<month type="8">Αυγ</month>
-							<month type="9">Σεπ</month>
-							<month type="10">Οκτ</month>
-							<month type="11">�οε</month>
-							<month type="12">Δεκ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ιανουα�ίου</month>
-							<month type="2">Φεβ�ουα�ίου</month>
-							<month type="3">Μα�τίου</month>
-							<month type="4">Απ�ιλίου</month>
-							<month type="5">Μα�ου</month>
-							<month type="6">Ιουνίου</month>
-							<month type="7">Ιουλίου</month>
-							<month type="8">Αυγο�στου</month>
-							<month type="9">Σεπτεμβ�ίου</month>
-							<month type="10">Οκτωβ�ίου</month>
-							<month type="11">�οεμβ�ίου</month>
-							<month type="12">Δεκεμβ�ίου</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ι</month>
-							<month type="2">Φ</month>
-							<month type="3">Μ</month>
-							<month type="4">Α</month>
-							<month type="5">Μ</month>
-							<month type="6">Ι</month>
-							<month type="7">Ι</month>
-							<month type="8">Α</month>
-							<month type="9">Σ</month>
-							<month type="10">Ο</month>
-							<month type="11">�</month>
-							<month type="12">Δ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ιανουά�ιος</month>
-							<month type="2">Φεβ�ουά�ιος</month>
-							<month type="3">Μά�τιος</month>
-							<month type="4">Απ�ίλιος</month>
-							<month type="5">Μάιος</month>
-							<month type="6">Ιο�νιος</month>
-							<month type="7">Ιο�λιος</month>
-							<month type="8">Α�γουστος</month>
-							<month type="9">Σεπτέμβ�ιος</month>
-							<month type="10">Οκτώβ�ιος</month>
-							<month type="11">�οέμβ�ιος</month>
-							<month type="12">Δεκέμβ�ιος</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Κυ�</day>
-							<day type="mon">Δευ</day>
-							<day type="tue">Τ�ι</day>
-							<day type="wed">Τετ</day>
-							<day type="thu">Πεμ</day>
-							<day type="fri">Πα�</day>
-							<day type="sat">Σαβ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Κυ�ιακή</day>
-							<day type="mon">Δευτέ�α</day>
-							<day type="tue">Τ�ίτη</day>
-							<day type="wed">Τετά�τη</day>
-							<day type="thu">Πέμπτη</day>
-							<day type="fri">Πα�ασκευή</day>
-							<day type="sat">Σάββατο</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Κ</day>
-							<day type="mon">Δ</day>
-							<day type="tue">Τ</day>
-							<day type="wed">Τ</day>
-							<day type="thu">Π</day>
-							<day type="fri">Π</day>
-							<day type="sat">Σ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Τ1</quarter>
-							<quarter type="2">Τ2</quarter>
-							<quarter type="3">Τ3</quarter>
-							<quarter type="4">Τ4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1ο τ�ίμηνο</quarter>
-							<quarter type="2">2ο τ�ίμηνο</quarter>
-							<quarter type="3">3ο τ�ίμηνο</quarter>
-							<quarter type="4">4ο τ�ίμηνο</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Τ1</quarter>
-							<quarter type="2">Τ2</quarter>
-							<quarter type="3">Τ3</quarter>
-							<quarter type="4">Τ4</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">π.Χ.</era>
-						<era type="1">μ.Χ.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">π.Χ.</era>
-						<era type="1">μ.Χ.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL-LLL y</greatestDifference>
-							<greatestDifference id="y">LLL y - LLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM y</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM y</greatestDifference>
-							<greatestDifference id="y">E, dd MMM y - E, dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM-MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy-MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Πε�ίοδος</displayName>
-					</field>
-					<field type="year">
-						<displayName>Έτος</displayName>
-					</field>
-					<field type="month">
-						<displayName>Μήνας</displayName>
-					</field>
-					<field type="week">
-						<displayName>Εβδομάδα</displayName>
-					</field>
-					<field type="day">
-						<displayName>Ημέ�α</displayName>
-						<relative type="-3">Π�ιν από τ�εις ημέ�ες</relative>
-						<relative type="-2">Π�οχτές</relative>
-						<relative type="-1">Χτες</relative>
-						<relative type="0">Σήμε�α</relative>
-						<relative type="1">Α��ιο</relative>
-						<relative type="2">Μεθα��ιο</relative>
-						<relative type="3">Σε τ�εις ημέ�ες από τώ�α</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Ημέ�α εβδομάδας</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>π.μ./μ.μ.</displayName>
-					</field>
-					<field type="hour">
-						<displayName>��α</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Λεπτό</displayName>
-					</field>
-					<field type="second">
-						<displayName>Δευτε�όλεπτο</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Ζώνη</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">π.μ.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="indian">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="islamic">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="japanese">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM/yy GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM yy GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyQ">yy GGGGG Q</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="persian">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-			</calendar>
-			<calendar type="roc">
-				<am>π.μ.</am>
-				<pm>μ.μ.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Π�ιν R.O.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="yyyy">y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">EEE, d/M/y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM, y G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">EEE, d MMM, y G</dateFormatItem>
-						<dateFormatItem id="yyyyQ">y G Q</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ y G</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Άγνωστη</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Ανδό�α</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>�τουμπάι</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Καμπο�λ</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Αντίγκουα</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Ανγκουίλλα</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Τί�ανα</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Γε�εβάν</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Κου�ακάο</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Αγκόλα</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ροθέ�α</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Πάλμε�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>�ότιος Πόλος</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Σ�οβα</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Μόουσον</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>�τέιβις</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Βόστοκ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Κάσεϊ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>�τυμόντ �τε�βίλ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Μακμέ�ντο</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Ρίο Γκαγιέγκος</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Μεντόζα</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Σαν Χουάν</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ουσουάια</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Λα Ριόχα</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Σαν Λο�ις</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Καταμά�κα</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Σάλτα</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Χουχο�ι</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Τουκουμάν</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Κό�δοβα</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Μπουένος Άι�ες</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Πάγκο Πάγκο</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Βιέννη</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Πε�θ</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Εο�κλα</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>�τά�γουιν</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Αδελα�δα</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Μπ�όκεν Χιλ</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Κιου�ί</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Μελβο��νη</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Χόμπα�τ</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Λίντεμαν</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Σίδνεϊ</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Μπ�ίσμπεϊν</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Λο�ντ Χάουι</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>Α�ο�μπα</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Μπακο�</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Μπα�μπέιντος</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>�τάκα</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Β�υξέλλες</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Μπου�κίνα Φάσο</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Σόφια</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Μπαχ�έιν</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Μπου�ο�ντι</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Μπενίν</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Βε�μο�δα</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Μπ�ο�νεϊ</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Λα Παζ</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Εϊ�ουνέπε</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Ρίο Μπ�άνκο</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Πό�το Βέλο</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Μπόα Βίστα</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Μανάος</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Κουϊάμπα</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Σαντα�έμ</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Κάμπο Γκ�άντε</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Μπέλεμ</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Α�αγκουάινα</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Σάο Πάολο</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Μπάχια</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Φο�ταλέζα</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Μασέιο</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ρεσίφε</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�ο�όνχα</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�ασάου</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Τ�ίμφου</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Γκαμπο�όνε</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Μινσκ</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Μπελίζ</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>�τόσον</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Γουάιτχο�ς</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Ινο�βικ</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Βανκο�βε�</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>�τόσον Κ�ικ</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Γέλοουναϊφ</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Έντμοντον</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Σουίφτ Κά��εντ</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Κέμπ�ιτζ Μπέι</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Ρετζίνα</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Γο�νιπεγκ</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Ρέσολουτ</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Ρέινι Ρίβε�</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ρέινκιν Ίνλετ</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Κό�αλ Χά�μπου�</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Θάντε� Μπέι</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�ιπιγκόν</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Το�όντο</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Μόντ�εαλ</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ικαλο�τ</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Πανγκνί�τουνγκ</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Μονκτόν</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Χάλιφαξ</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Γκους Μπέι</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Γκλέις Μπέι</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Μπλαν Σαμπλόν</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Σεντ Τζονς</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Κόκος</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Κινσάσα</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Λουμπουμπάσι</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Κεντ�οαφ�ικανική Δημοκ�ατία</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Μπ�άζαβιλ</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Ζυ�ίχη</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Ακτή Ελεφαντοστο�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Ρα�οτόνγκα</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>�ήσος Πάσχα</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Σαντιάγκο</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Καμε�ο�ν</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Κάσγκα�</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ου�ουμκί</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Τσονγκίνγκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Σανγκάη</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Χα�μπίν</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Μπογκοτά</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Κόστα Ρίκα</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Αβάνα</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>�ήσοι Χ�ιστουγέννων</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Λευκωσία</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Βε�ολίνο</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Τζιμπουτί</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Κοπεγχάγη</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Δομινίκα</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Σάντο �τομίνγκο</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Αλγέ�ι</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Γκαλαπάγκος</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Γκουαγιακ�λ</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Ταλίν</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Αίγυπτος</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Δυτική Σαχά�α</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Ασμέ�α</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Κανά�ια</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Κέουτα</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Μαδ�ίτη</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Αιθιοπία</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Ελσίνκι</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Φίτζι</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Στάνλεϋ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Τ�ουκ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Πονάπε</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Κοσ�άη</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Φε�όες</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Πα�ίσι</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Γκαμπόν</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Λονδίνο</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Γ�ενάδα</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Τμπιλίσι</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Καγιένε</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Άκκ�α</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Γιβ�αλτά�</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Το�λε</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Γκόνθαμπ</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Σκο�εσμπίσουντ</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>�τανμα�κσάβν</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Γκάμπια</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Γουινέα</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Γουαδελο�πη</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Ισημε�ινή Γουινέα</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Αθήνα</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>�ότια Γεω�γία</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Γουατεμάλα</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Γκουάμ</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Γουινέα Μπισσάου</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Γουιάνα</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Χονγκ Κονγκ</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Πο�τ-Ο-Π�ενς</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Βουδαπέστη</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Τζακά�τα</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Πόντιανακ</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Μακασά�</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Χαγιαπο��α</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Δουβλίνο</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Ιε�ουσαλήμ</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Τσάγκος</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Βαγδάτη</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Τεχε�άνη</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Ρέυκιαβικ</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Ρώμη</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Τζαμάικα</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Αμάν</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Τόκυο</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>Κένυα</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Μπισχέκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Πιόμ Πενχ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Εντε�μπέ�υ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Κι�ιτιμάτι</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Τα�άουα</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Κομό�ο</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Σαιν Κιττς</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Πυόνγκ Γιάνγκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Σεο�λ</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Κέυμαν</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Ακτάου</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Ό�αλ</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Ακτόμπε</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Κτζιλ-Ο�ντά</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Αλμάτυ</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Βιεντιάνε</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Βη�υτός</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Αγ. Λουκία</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Βαντο�ζ</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Κολόμπο</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Λιβε�ία</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Λεσόθο</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Βίλνιους</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Λουξεμβο��γο</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Ρίγα</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Λιβ�η</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Καζαμπλάνκα</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Μονακό</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Τσισινάου</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Αντανανα�ίβο</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Κουαχαλέιν</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Μαχο��ο</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Μπαμάκο</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Ρανγκο�ν</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Χοβντ</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ουλάν Μπατό�</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Χόιμπαλσαν</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Μακάο</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Σάιπαν</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Μα�τινίκα</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>Μαυ�ιτανία</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Μονσε�άτ</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Μάλτα</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Μαυ�ίκιος</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Μαλδίβες</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Μαλάουι</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Τιχουάνα</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Ε�μοσίγιο</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Μαζατλάν</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Τσιουάουα</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Μοντε�έι</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Πόλη του Μεξικο�</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Μέ�ιντα</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Κανκο�ν</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Κουάλα Λουμπο��</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Κουτσίνγκ</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Μαπο�το</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Γουιντχόεκ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>�ουμέα</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>�ιαμέυ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�ό�φολκ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Λάγος</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Μανάγκουα</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Άμστε�νταμ</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Όσλο</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Κατμαντο�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>�αο��ου</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�ιο�ε</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Τσάταμ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Όκλαντ</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Μουσκάτ</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Παναμάς</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Λίμα</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Αϊτή</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Μα�κέσας</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Γκάμπιε�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Πο�τ Μό�εσμπυ</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Μανίλα</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Κα�άτσι</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Βα�σοβία</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Μικελόν</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Πιτκέι�ν</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Πουέ�το Ρίκο</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Γάζα</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Αζό�ες</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Μαδέ�α</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Λισσαβώνα</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Παλάου</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Ασουνσιόν</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Κατά�</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Ρεϋνιόν</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Βουκου�έστι</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Καλλίπολη</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Μόσχα</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Βόλγκοκ�αντ</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Σαμά�α</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Αικατε�ινο�πολη</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ομσκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�οβοσιμπί�σκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Κ�ασνογιά�σκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Ι�κο�τσκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Γιάκουτσκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Βλαδιβοστόκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Σακαλίνσκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Μαγκαντάν</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Καμτσάτκα</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Αναντί�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Κιγκάλι</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Ριάντ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Γκουανταλκανάλ</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Μάχε</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Σουδάν</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Στοκχόλμη</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Σιγκαπο��η</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Αγ. Ελένη</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Σιέ�α Λεόνε</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>�τακά�</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Μογκαντίσου</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Πα�αμα�ίνμπο</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Σάο Τόμε</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Σαλβαδό�</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Δαμασκός</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Ζουαζιλάνδη</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Γ�αντ Του�κ</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�τζαμένα</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Κέ�γκουελεν</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Λόμε</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Μπανγκόκ</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>�τουσχάνμπη</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Φακαόφο</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>�τίλι</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Ασγκάμπατ</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Τυνησία</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Τονγκατάπου</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Κωνσταντινο�πολη</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Πο�τ-Οφ-Σπέιν</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Φουναφο�τι</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Ταϊπέι</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>�τα� Ες Σαλάμ</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ουζκό�οντ</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Κίεβο</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Συμφε�ο�πολη</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Ζαπο�όζιε</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Καμπάλα</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Μίντγουεϊ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Τζόνστον</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Γουέικ</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>Άντακ</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�όμε</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Χονολουλο�</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Άνκο�ατζ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Γιακο�τατ</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Τζο�νο</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Λος Άντζελες</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Μπόιζ</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Φοίνιξ</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Σίπ�οκ</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>�τένβε�</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�ιου Σάλεμ, Βό�εια �τακότα</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Κέντ�ο, Βό�εια �τακότα</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Σικάγο</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Μενομίνε</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Βίνκενες, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Πίτε�σμπε�γκ, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Τελ Σίτυ, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�οξ, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Γουίναμακ, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Μα�ένγκο, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Ινδιανάπολη</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Λο�ισβιλ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Βεβάι, Ιντιάνα</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Μοντιτσέλο, Κεντάκι</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>�τητ�όιτ</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�έα Υό�κη</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Μοντεβίδεο</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Σαμα�κάνδη</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Τασκένδη</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Αγ. Βικέντιος</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Κα�άκας</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Το�τόλα</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Σαιντ Τόμας</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Σαϊγκόν</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Εφάτε</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Γουόλις</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>Άπια</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Έιντεν</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Μαγιότε</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Γιοχάνεσμπου�γκ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Ζάμπια</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Ζιμπάμπουε</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<short>
-					<standard>ACT (Ακ�)</standard>
-					<daylight>ACST (Ακ�)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>ώ�α Κεντ�ικής Αφ�ικής</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>ώ�α Ανατολικής Αφ�ικής</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>ώ�α �ότιας Αφ�ικής</generic>
-					<standard>τυπική ώ�α �ότιας Αφ�ικής</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>ώ�α Δυτικής Αφ�ικής</standard>
-					<daylight>καλοκαι�ινή ώ�α Δυτικής Αφ�ικής</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (Ακτάου)</standard>
-					<daylight>AQTST (Ακτάου)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (Ακτοβε)</standard>
-					<daylight>AQTST (Ακτοβε)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bering">
-				<short>
-					<standard>BST (Μπε�ίνγκ)</standard>
-					<daylight>BDT (Μπε�ίνγκ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cuba">
-				<short>
-					<standard>CST (Κο�βα)</standard>
-					<daylight>CDT (Κο�βα)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (Σάμα�καντ)</standard>
-					<daylight>SAMST (Σάμα�καντ)</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>,</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>e</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Πεσέτα Ανδό�ας</displayName>
-				<displayName count="one">πεσέτα Ανδό�ας</displayName>
-				<displayName count="other">πεσέτες Ανδό�ας</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>�τι�άμ Ηνωμένων Α�αβικών Εμι�άτων</displayName>
-				<displayName count="one">ντι�άμ Ηνωμένων Α�αβικών Εμι�άτων</displayName>
-				<displayName count="other">ντι�άμ Ηνωμένων Α�αβικών Εμι�άτων</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Αφγανί Αφγανιστάν (1927-2002)</displayName>
-				<displayName count="one">αφγάνι Αφγανιστάν (AFA)</displayName>
-				<displayName count="other">αφγάνι Αφγανιστάν (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Αφγανί Αφγανιστάν</displayName>
-				<displayName count="one">αφγάνι Αφγανιστάν</displayName>
-				<displayName count="other">Αφγάνι Αφγανιστάν</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Λεκ Αλβανίας</displayName>
-				<displayName count="one">λεκ Αλβανίας</displayName>
-				<displayName count="other">λεκ Αλβανίας</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>�τ�αμ Α�μενίας</displayName>
-				<displayName count="one">ντ�αμ Α�μενίας</displayName>
-				<displayName count="other">ντ�αμ Α�μενίας</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Γκίλντα Ολλανδικών Αντιλλών</displayName>
-				<displayName count="one">γκίλντα Ολλανδικών Αντιλλών</displayName>
-				<displayName count="other">γκίλντα Ολλανδικών Αντιλλών</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Κουάνζα Ανγκόλας</displayName>
-				<displayName count="one">κουάνζα Ανγκόλας</displayName>
-				<displayName count="other">κουάνζα Ανγκόλας</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Κουάνζα Ανγκόλας (1977-1990)</displayName>
-				<displayName count="one">κουάνζα Ανγκόλας (AOK)</displayName>
-				<displayName count="other">κουάνζα Ανγκόλας (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�έα Κουάνζα Ανγκόλας (1990-2000)</displayName>
-				<displayName count="one">νέο κουάνζα Ανγκόλας (AON)</displayName>
-				<displayName count="other">νέα κουάνζα Ανγκόλας (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Κουάνζα Reajustado Ανγκόλας (1995-1999)</displayName>
-				<displayName count="one">κουάνζα Reajustado Ανγκόλας (AOR)</displayName>
-				<displayName count="other">κουάνζα Reajustado Ανγκόλας (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Ωστ�άλ Α�γετινής</displayName>
-				<displayName count="one">αουστ�άλ Α�γεντινής</displayName>
-				<displayName count="other">αουστ�άλ Α�γεντινής</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Πέσο Α�γεντινής (1983-1985)</displayName>
-				<displayName count="one">πέσο Α�γεντινής (ARP)</displayName>
-				<displayName count="other">πέσο Α�γεντινής (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Πέσο Α�γεντινής</displayName>
-				<displayName count="one">πέσο Α�γεντινής</displayName>
-				<displayName count="other">πέσο Α�γεντινής</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Σελίνι Αυστ�ίας</displayName>
-				<displayName count="one">σελίνι Αυστ�ίας</displayName>
-				<displayName count="other">σελίνια Αυστ�ίας</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Δολά�ιο Αυστ�αλίας</displayName>
-				<displayName count="one">δολά�ιο Αυστ�αλίας</displayName>
-				<displayName count="other">δολά�ια Αυστ�αλίας</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Γκίλντα Α�ο�μπα</displayName>
-				<displayName count="one">γκίλντα Α�ο�μπα</displayName>
-				<displayName count="other">γκίλντα Α�ο�μπα</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Μανάτ Αζε�μπαϊτζάν (1993-2006)</displayName>
-				<displayName count="one">μανάτ Αζε�μπαϊτζάν (1993-2006)</displayName>
-				<displayName count="other">μανάτ Αζε�μπαϊτζάν (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Μανάτ Αζε�μπαϊτζάν</displayName>
-				<displayName count="one">μανάτ Αζε�μπαϊτζαν</displayName>
-				<displayName count="other">μανάτ Αζε�μπαϊτζαν</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Δηνά�ιο Βοσνίας-Ε�ζεγοβίνης</displayName>
-				<displayName count="one">δηνά�ιο Βοσνίας-Ε�ζεγοβίνης</displayName>
-				<displayName count="other">δηνά�ια Βοσνίας-Ε�ζεγοβίνης</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Μετατ�έψιμο Μά�κο Βοσνίας-Ε�ζεγοβίνης</displayName>
-				<displayName count="one">μά�κο Βοσνίας-Ε�ζεγοβίνης</displayName>
-				<displayName count="other">μά�κα Βοσνίας-Ε�ζεγοβίνης</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Δολά�ιο Μπα�μπάντος</displayName>
-				<displayName count="one">δολά�ιο Μπα�μπάντος</displayName>
-				<displayName count="other">δολά�ια Μπα�μπάντος</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Τάκα Μπαγκλαντές</displayName>
-				<displayName count="one">τάκα Μπαγκλαντές</displayName>
-				<displayName count="other">τάκα Μπαγκλαντές</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Φ�άγκο Βελγίου (μετατ�έψιμο)</displayName>
-				<displayName count="one">φ�άγκο Βελγίου (μετατ�έψιμο)</displayName>
-				<displayName count="other">φ�άγκα Βελγίου (μετατ�έψιμα)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Φ�άγκο Βελγίου</displayName>
-				<displayName count="one">φ�άγκο Βελγίου</displayName>
-				<displayName count="other">φ�άγκα Βελγίου</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Φ�άγκο Βελγίου (οικονομικό)</displayName>
-				<displayName count="one">φ�άγκο Βελγίου (οικονομικό)</displayName>
-				<displayName count="other">φ�άγκα Βελγίου (οικονομικό)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Μεταλλικό Λεβ Βουλγα�ίας</displayName>
-				<displayName count="one">μεταλλικό λεβ Βουλγα�ίας</displayName>
-				<displayName count="other">μεταλλικά λεβ Βουλγα�ίας</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>�έο Λεβ Βουλγα�ίας</displayName>
-				<displayName count="one">νέο λεβ Βουλγα�ίας</displayName>
-				<displayName count="other">νέα λεβ Βουλγα�ίας</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Δηνά�ιο Μπαχ�έιν</displayName>
-				<displayName count="one">δηνά�ιο Μπαχ�έιν</displayName>
-				<displayName count="other">δηνά�ια Μπαχ�έιν</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Φ�άγκο Μπου�ο�ντι</displayName>
-				<displayName count="one">φ�άγκο Μπου�ο�ντι</displayName>
-				<displayName count="other">φ�άγκα Μπου�ο�ντι</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Δολά�ιο Βε�μο�δων</displayName>
-				<displayName count="one">δολά�ιο Βε�μο�δων</displayName>
-				<displayName count="other">δολά�ια Βε�μο�δων</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Δολά�ιο Μπ�ουνέι</displayName>
-				<displayName count="one">δολά�ιο Μπ�ουνέι</displayName>
-				<displayName count="other">δολά�ια Μπ�ουνέι</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Μπολιβιάνο Βολιβίας</displayName>
-				<displayName count="one">μπολιβιάνο Βολιβίας</displayName>
-				<displayName count="other">μπολιβιάνο Βολιβίας</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Πέσο Βολιβίας</displayName>
-				<displayName count="one">πέσο Βολιβίας</displayName>
-				<displayName count="other">πέσο Βολιβίας</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Μβδολ Βολιβίας</displayName>
-				<displayName count="one">μβντολ Βολιβίας</displayName>
-				<displayName count="other">μβντολ Βολιβίας</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>�έο Κ�ουζιέ�ο Β�αζιλίας (1967-1986)</displayName>
-				<displayName count="one">νέο κ�ουζέι�ο Β�αζιλίας (BRB)</displayName>
-				<displayName count="other">νέα κ�ουζέι�ο Β�αζιλίας (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Κ�ουζάντο Β�αζιλίας</displayName>
-				<displayName count="one">κ�ουζάντο Β�αζιλίας</displayName>
-				<displayName count="other">κ�ουζάντο Β�αζιλίας</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Κ�ουζιέ�ο Β�αζιλίας (1990-1993)</displayName>
-				<displayName count="one">κ�ουζέι�ο Β�αζιλίας (BRE)</displayName>
-				<displayName count="other">κ�ουζέι�ο Β�αζιλίας (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Ρεάλ Β�αζιλίας</displayName>
-				<displayName count="one">�εάλ Β�αζιλίας</displayName>
-				<displayName count="other">�εάλ Β�αζιλίας</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>�έο Κ�ουζάντο Β�αζιλίας</displayName>
-				<displayName count="one">νέο κ�ουζάντο Β�α±ζιλίας</displayName>
-				<displayName count="other">νέα κ�ουζάντο Β�αζιλίας</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Κ�ουζιέ�ο Β�αζιλίας</displayName>
-				<displayName count="one">κ�ουζέι�ο Β�αζιλίας</displayName>
-				<displayName count="other">κ�ουζέι�ο Β�αζιλίας</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Δολά�ιο Μπαχάμες</displayName>
-				<displayName count="one">δολά�ιο Μπαχάμες</displayName>
-				<displayName count="other">δολά�ια Μπαχάμες</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>�γκο�λτ�ουμ Μπουτάν</displayName>
-				<displayName count="one">νγκο�λτ�ουμ Μπουτάν</displayName>
-				<displayName count="other">νγκο�λτ�ουμ Μπουτάν</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Κιατ Βι�μανίας</displayName>
-				<displayName count="one">κιάτ Βι�μανίας</displayName>
-				<displayName count="other">κιάτ Βι�μανίας</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Πο�λα Μποτσουάνας</displayName>
-				<displayName count="one">πο�λα Μποτσουάνας</displayName>
-				<displayName count="other">πο�λα Μποτσουάνας</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>�έο Ρο�βλι Λευκο�ωσίας (1994-1999)</displayName>
-				<displayName count="one">νέο �ο�βλι Λευκο�ωσίας (1994-1999)</displayName>
-				<displayName count="other">νέα �ο�βλια Λευκο�ωσίας (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Ρο�βλι Λευκο�ωσίας</displayName>
-				<displayName count="one">�ο�βλι Λευκο�ωσίας</displayName>
-				<displayName count="other">�ο�βλια Λευκο�ωσίας</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Δολά�ιο Μπελίζ</displayName>
-				<displayName count="one">δολά�ιο Μπελίζ</displayName>
-				<displayName count="other">δολά�ια Μπελίζ</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Δολά�ιο Καναδά</displayName>
-				<displayName count="one">δολά�ιο Καναδά</displayName>
-				<displayName count="other">δολά�ια Καναδά</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Φ�άγκο Κονγκό</displayName>
-				<displayName count="one">φ�άγκο Κονγκό</displayName>
-				<displayName count="other">φ�άγκα Κονγκό</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>Ευ�ώ WIR</displayName>
-				<displayName count="one">ευ�ώ WIR</displayName>
-				<displayName count="other">ευ�ώ WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Φ�άγκο Ελβετίας</displayName>
-				<displayName count="one">φ�άγκο Ελβετίας</displayName>
-				<displayName count="other">φ�άγκα Ελβετίας</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>Φ�άγκο WIR</displayName>
-				<displayName count="one">φ�άγκο WIR</displayName>
-				<displayName count="other">φ�άγκα WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento Χιλής</displayName>
-				<displayName count="one">ουνιδάδες ντε φομέντο Χιλής</displayName>
-				<displayName count="other">ουνιδάδες ντε φομέντο Χιλής</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Πέσο Χιλής</displayName>
-				<displayName count="one">πέσο Χιλής</displayName>
-				<displayName count="other">πέσο Χιλής</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Γιουάν Ρενμίμπι Κίνας</displayName>
-				<displayName count="one">γιουάν Κίνας</displayName>
-				<displayName count="other">γιουάν Κίνας</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Πέσο Κολομβίας</displayName>
-				<displayName count="one">πέσο Κολομβίας</displayName>
-				<displayName count="other">πέσο Κολομβίας</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>unidad de valor real</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor reals</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Κολόν Κόστα Ρίκα</displayName>
-				<displayName count="one">κολόν Κόστα Ρίκα</displayName>
-				<displayName count="other">κολόν Κόστα Ρίκα</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Παλαιό Δηνά�ιο Σε�βίας</displayName>
-				<displayName count="one">παλιό δινά�η Σε�βίας</displayName>
-				<displayName count="other">παλιά δινά�ια Σε�βίας</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Σκλη�ή Κο�όνα Τσεχοσλοβακίας</displayName>
-				<displayName count="one">σκλη�ή κο�όνα Τσεχοσλοβακίας</displayName>
-				<displayName count="other">σκλη�ές κο�όνες Τσεχοσλοβακίας</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Πέσο Κο�βας</displayName>
-				<displayName count="one">πέσο Κο�βας</displayName>
-				<displayName count="other">πέσο Κο�βας</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Εσκο�δο Π�άσινου Ακ�ωτη�ίου</displayName>
-				<displayName count="one">εσκο�δο Π�άσινου Ακ�ωτη�ίου</displayName>
-				<displayName count="other">εσκο�δο Π�άσινου Ακ�ωτη�ίου</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Λί�α Κ�π�ου</displayName>
-				<displayName count="one">λί�α Κ�π�ου</displayName>
-				<displayName count="other">λί�ες Κ�π�ου</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Κο�όνα Τσέχικης Δημοκ�ατίας</displayName>
-				<displayName count="one">κο�όνα Τσέχικης Δημοκ�ατίας</displayName>
-				<displayName count="other">κο�όνες Τσέχικης Δημοκ�ατίας</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Οστμά�κ Ανατολικής Γε�μανίας</displayName>
-				<displayName count="one">όστμα�κ Ανατολικής Γε�μανίας</displayName>
-				<displayName count="other">όστμα�κ Ανατολικής Γε�μανίας</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Μά�κο Γε�μανίας</displayName>
-				<displayName count="one">μά�κο Γε�μανίας</displayName>
-				<displayName count="other">μά�κα Γε�μανίας</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Φ�άγκο Τζιμπουτί</displayName>
-				<displayName count="one">φ�άγκο Τζιμπουτί</displayName>
-				<displayName count="other">φ�άγκα Τζιμπουτί</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Κο�όνα Δανίας</displayName>
-				<displayName count="one">κο�όνα Δανίας</displayName>
-				<displayName count="other">κο�όνες Δανίας</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Πέσο Δομίνικου</displayName>
-				<displayName count="one">πέσο Δομίνικου</displayName>
-				<displayName count="other">πέσο Δομινικανής Δημοκ�ατίας</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Δηνά�ιο Αλγε�ίας</displayName>
-				<displayName count="one">δηνά�ιο Αλγε�ίας</displayName>
-				<displayName count="other">δηνά�ια Αλγε�ίας</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Σο�κ�ε Εκουαδό�</displayName>
-				<displayName count="one">σο�κ�ε Εκουαδό�</displayName>
-				<displayName count="other">σο�κ�ε Εκουαδό�</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidad de Valor Constante (UVC) Ισημε�ινο�</displayName>
-				<displayName count="one">Unidad de Valor Constante (UVC) Ισημε�ινο�</displayName>
-				<displayName count="other">Unidads de Valor Constante (UVC) Ισημε�ινο�</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Κο�όνα Εσθονίας</displayName>
-				<displayName count="one">κο�όνα Εσθονίας</displayName>
-				<displayName count="other">κο�όνες Εσθονίας</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Λί�α Αιγ�πτου</displayName>
-				<displayName count="one">λί�α Αιγ�πτου</displayName>
-				<displayName count="other">λί�ες Αιγ�πτου</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�άκφα Ε�υθ�αίας</displayName>
-				<displayName count="one">νάκφα Ε�υθ�αίας</displayName>
-				<displayName count="other">νάκφα Ε�υθ�αίας</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>πεσέτα Ισπανίας (λογα�ιασμός Α)</displayName>
-				<displayName count="one">πεσέτα Ισπανίας (λογα�ιασμός Α)</displayName>
-				<displayName count="other">πεσέτες Ισπανίας (λογα�ιασμός Α)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>πεσέτα Ισπανίας (μετατ�έψιμος λογα�ιασμός)</displayName>
-				<displayName count="one">πεσέτα Ισπανίας (μετατ�έψιμος λογα�ιασμός)</displayName>
-				<displayName count="other">πεσέτες Ισπανίας (μετατ�έψιμες)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Πεσέτα Ισπανίας</displayName>
-				<displayName count="one">πεσέτα Ισπανίας</displayName>
-				<displayName count="other">πεσέτες Ισπανίας</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Μπι� Αιθιοπίας</displayName>
-				<displayName count="one">μπι� Αιθιοπίας</displayName>
-				<displayName count="other">μπι� Αιθιοπίας</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Ευ�ώ</displayName>
-				<displayName count="one">ευ�ώ</displayName>
-				<displayName count="other">ευ�ώ</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Μά�κο Φινλανδίας</displayName>
-				<displayName count="one">μά�κο Φινλανδίας</displayName>
-				<displayName count="other">μά�κα Φινλανδίας</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Δολά�ιο Φίτζι</displayName>
-				<displayName count="one">δολά�ιο Φίτζι</displayName>
-				<displayName count="other">δολά�ια Φίτζι</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Λί�α �ησιών Φώλκλαντ</displayName>
-				<displayName count="one">λί�α �ησιών Φώλκλαντ</displayName>
-				<displayName count="other">λί�ες �ησιών Φώλκλαντ</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Φ�άγκο Γαλλίας</displayName>
-				<displayName count="one">φ�άγκο Γαλλίας</displayName>
-				<displayName count="other">φ�άγκα Γαλλίας</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Λί�α Στε�λίνα Β�ετανίας</displayName>
-				<displayName count="one">λί�α στε�λίνα Β�ετανίας</displayName>
-				<displayName count="other">λί�ες στε�λίνες Β�ετανίας</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Κο�πον Λά�ι Γεω�γίας</displayName>
-				<displayName count="one">κο�πον λά�ι Γεω�γίας</displayName>
-				<displayName count="other">κο�πον λά�ι Γεω�γίας</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Λά�ι Γεω�γίας</displayName>
-				<displayName count="one">λά�ι Γεω�γίας</displayName>
-				<displayName count="other">λά�ι Γεω�γίας</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Σέντι Γκάνας (1979-2007)</displayName>
-				<displayName count="one">σέντι Γκάνας (GHC)</displayName>
-				<displayName count="other">σέντι Γκάνας (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Σέντι Γκάνας</displayName>
-				<displayName count="one">σέντι Γκάνας</displayName>
-				<displayName count="other">σέντι Γκανά</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Λί�α Γιβ�αλτά�</displayName>
-				<displayName count="one">λί�α Γιβ�αλτά�</displayName>
-				<displayName count="other">λί�ες Γιβ�αλτά�</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>�ταλάσι Γκάμπιας</displayName>
-				<displayName count="one">νταλάσι Γκάμπιας</displayName>
-				<displayName count="other">νταλάσι Γκάμπιας</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Φ�άγκο Γουινέας</displayName>
-				<displayName count="one">φ�άγκο Γουινέας</displayName>
-				<displayName count="other">φ�άγκα Γουινέας</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Συλί Γουινέας</displayName>
-				<displayName count="one">συλί Γουινέας</displayName>
-				<displayName count="other">συλί Γουινέας</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Εκγουέλε Ισημε�ινής Γουινέας</displayName>
-				<displayName count="one">εκουέλε Ισημε�ινής Γουινέας</displayName>
-				<displayName count="other">εκουέλε Ισημε�ινής Γουινέας</displayName>
-			</currency>
-			<currency type="GRD">
-				<pattern>#,##0.00 ¤;-#,##0.00 ¤</pattern>
-				<displayName>Δ�αχμή Ελλάδας</displayName>
-				<displayName count="one">δ�αχμή Ελλάδας</displayName>
-				<displayName count="other">δ�αχμές Ελλάδας</displayName>
-				<symbol>Δ�χ</symbol>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Κουετσάλ Γουατεμάλας</displayName>
-				<displayName count="one">κουετσάλ Γουατεμάλας</displayName>
-				<displayName count="other">κουετσάλ Γουατεμάλας</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Γκινέα Εσκο�δο Πο�τογαλίας</displayName>
-				<displayName count="one">γκινέα εσκο�δο Πο�τογαλίας</displayName>
-				<displayName count="other">γκινέα εσκο�δο Πο�τογαλίας</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Πέσο Γουινέας-Μπισάου</displayName>
-				<displayName count="one">πέσο Γουινέα-Μπισάου</displayName>
-				<displayName count="other">πέσο Γουινέα-Μπισάου</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Δολά�ιο Γουιάνας</displayName>
-				<displayName count="one">δολά�ιο Γουιάνας</displayName>
-				<displayName count="other">δολά�ια Γουιάνας</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Δολά�ιο Χονγκ Κονγκ</displayName>
-				<displayName count="one">δολά�ιο Χονγκ Κονγκ</displayName>
-				<displayName count="other">δολά�ια Χονγκ Κονγκ</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Λεμπί�α Ονδο��ας</displayName>
-				<displayName count="one">λεμπί�α Ονδο��ας</displayName>
-				<displayName count="other">λεμπί�α Ονδο��ας</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Δηνά�ιο Κ�οατίας</displayName>
-				<displayName count="one">δηνά�ιο Κ�οατίας</displayName>
-				<displayName count="other">δηνά�ια Κ�οατίας</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Κο�να Κ�οατίας</displayName>
-				<displayName count="one">κο�να Κ�οατίας</displayName>
-				<displayName count="other">κο�να Κ�οατίας</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Γκου�ντ Αϊτής</displayName>
-				<displayName count="one">γκου�ντ Αϊτής</displayName>
-				<displayName count="other">γκου�ντ Αϊτής</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Φιο�ίνι Ουγγα�ίας</displayName>
-				<displayName count="one">φιο�ίνι Ουγγα�ίας</displayName>
-				<displayName count="other">φιο�ίνια Ουγγα�ίας</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Ρο�πια Ινδονησίας</displayName>
-				<displayName count="one">�ο�πι Ινδονησίας</displayName>
-				<displayName count="other">�ο�πια Ινδονησίας</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Λί�α Ι�λανδίας</displayName>
-				<displayName count="one">λί�α Ι�λανδίας</displayName>
-				<displayName count="other">λί�ες Ι�λανδίας</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Λί�α Ισ�αήλ</displayName>
-				<displayName count="one">λί�α Ισ�αήλ</displayName>
-				<displayName count="other">λί�ες Ισ�αήλ</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>παλιό σεκέλ Ισ�αήλ</displayName>
-				<displayName count="one">παλιό σεκέλ Ισ�αήλ</displayName>
-				<displayName count="other">παλιά σεκέλ Ισ�αήλ</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>�έο Σέκελ Ισ�αήλ</displayName>
-				<displayName count="one">νέο σέκελ Ισ�αήλ</displayName>
-				<displayName count="other">νέα σέκελ Ισ�αήλ</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Ρο�πια Ινδίας</displayName>
-				<displayName count="one">�ο�πι Ινδίας</displayName>
-				<displayName count="other">�ο�πια Ινδίας</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Δηνά�ιο Ι�άκ</displayName>
-				<displayName count="one">δηνά�ιο Ι�άκ</displayName>
-				<displayName count="other">δηνά�ια Ι�άκ</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Ριάλ Ι�άν</displayName>
-				<displayName count="one">�ιάλ Ι�άν</displayName>
-				<displayName count="other">�ιάλ Ι�άν</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>Παλιά κο�όνα Ισλανδίας</displayName>
-				<displayName count="one">Παλιά κο�όνα Ισλανδίας</displayName>
-				<displayName count="other">παλιές κο�όνες Ισλανδίας</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Κο�όνα Ισλανδίας</displayName>
-				<displayName count="one">κο�όνα Ισλανδίας</displayName>
-				<displayName count="other">κο�όνες Ισλανδίας</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Λι�έτα Ιταλίας</displayName>
-				<displayName count="one">λι�έτα Ιταλίας</displayName>
-				<displayName count="other">λι�έτες Ιταλίας</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Δολά�ιο Τζαμάικας</displayName>
-				<displayName count="one">δολά�ιο Τζαμάικας</displayName>
-				<displayName count="other">δολά�ια Τζαμάικας</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Δηνά�ιο Ιο�δανίας</displayName>
-				<displayName count="one">δηνά�ιο Ιο�δανίας</displayName>
-				<displayName count="other">δηνά�ια Ιο�δανίας</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Γιεν Ιαπωνίας</displayName>
-				<displayName count="one">γιεν Ιαπωνίας</displayName>
-				<displayName count="other">γιεν Ιαπωνίας</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Σελίνι Κένυας</displayName>
-				<displayName count="one">σελίνι Κένυας</displayName>
-				<displayName count="other">σελίνια Κένυας</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Σομ Κι�γιζίας</displayName>
-				<displayName count="one">σομ Κι�γιστάν</displayName>
-				<displayName count="other">σομ Κι�γιστάν</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Ρίελ Καμπότζης</displayName>
-				<displayName count="one">�ίελ Καμπότζης</displayName>
-				<displayName count="other">�ίελ Καμπότζης</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Φ�άγκο Κομό�ος</displayName>
-				<displayName count="one">φ�άγκο Κομό�ος</displayName>
-				<displayName count="other">φ�άγκα Κομό�ο</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Γον Βό�ειας Κο�έας</displayName>
-				<displayName count="one">γουόν Βό�ειας Κο�έας</displayName>
-				<displayName count="other">γουόν Βό�ειας Κο�έας</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Γον �ότιας Κο�έας</displayName>
-				<displayName count="one">γουόν �ότιας Κο�έας</displayName>
-				<displayName count="other">γουόν �ότιας Κο�έας</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Δηνά�ιο Κουβέιτ</displayName>
-				<displayName count="one">δηνά�ιο Κουβέιτ</displayName>
-				<displayName count="other">δηνά�ια Κουβέιτ</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Δολά�ιο �ήσων Κάιμαν</displayName>
-				<displayName count="one">δολά�ιο �ήσων Κάιμαν</displayName>
-				<displayName count="other">δολά�ια �ήσων Κάιμαν</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Τένγκε Καζακστάν</displayName>
-				<displayName count="one">τένγκε Καζακστάν</displayName>
-				<displayName count="other">τένγκε Καζακστάν</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Κιπ Λάος</displayName>
-				<displayName count="one">κιπ Λάος</displayName>
-				<displayName count="other">κιπ Λάος</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Λί�α Λιβάνου</displayName>
-				<displayName count="one">λί�α Λιβάνου</displayName>
-				<displayName count="other">λί�ες Λιβάνου</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Ρο�πια Σ�ι Λάνκα</displayName>
-				<displayName count="one">�ο�πι Σ�ι Λάνκα</displayName>
-				<displayName count="other">�ο�πια Σ�ι Λάνκα</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Δολά�ιο Λιβε�ίας</displayName>
-				<displayName count="one">δολά�ιο Λιβε�ίας</displayName>
-				<displayName count="other">δολά�ια Λιβε�ίας</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Λότι Λεσότο</displayName>
-				<displayName count="one">λότι Λεσόθο</displayName>
-				<displayName count="other">λότι Λεσόθο</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Λίτα Λιθουανίας</displayName>
-				<displayName count="one">λίτα Λιθουανίας</displayName>
-				<displayName count="other">λίτα Λιθουανίας</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Ταλόνας Λιθουανίας</displayName>
-				<displayName count="one">ταλόνας Λιθουανίας</displayName>
-				<displayName count="other">ταλόνας Λιθουανίας</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Μετατ�έψιμο Φ�άγκο Λουξεμβο��γου</displayName>
-				<displayName count="one">LUC</displayName>
-				<displayName count="other">LUC</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Φ�άγκο Λουξεμβο��γου</displayName>
-				<displayName count="one">φ�άγκο Λουξεμβο��γου</displayName>
-				<displayName count="other">φ�άγκα Λουξεμβο��γου</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Οικονομικό Φ�άγκο Λουξεμβο��γου</displayName>
-				<displayName count="one">LUL</displayName>
-				<displayName count="other">LUL</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Λατς Λετονίας</displayName>
-				<displayName count="one">λατς Λετονίας</displayName>
-				<displayName count="other">λατς Λετονίας</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Ρο�βλι Λετονίας</displayName>
-				<displayName count="one">�ο�βλι Λετονίας</displayName>
-				<displayName count="other">�ο�βλια Λετονίας</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Δηνά�ιο Λιβ�ης</displayName>
-				<displayName count="one">δηνά�ιο Λιβ�ης</displayName>
-				<displayName count="other">δηνά�ια Λιβ�ης</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>�τι�άμ Μα�όκου</displayName>
-				<displayName count="one">ντι�άμ Μα�όκου</displayName>
-				<displayName count="other">ντι�άμ Μα�όκου</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Φ�άγκο Μα�όκου</displayName>
-				<displayName count="one">φ�άγκο Μα�όκου</displayName>
-				<displayName count="other">φ�άγκα Μα�όκου</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Λέι Μολδαβίας</displayName>
-				<displayName count="one">λέι Μολδαβίας</displayName>
-				<displayName count="other">λέι Μολδαβίας</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Α�ιανί Μαδαγασκά�ης</displayName>
-				<displayName count="one">α�ιά�ι Μαδαγασκά�ης</displayName>
-				<displayName count="other">α�ιά�ι Μαδαγασκά�ης</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Φ�άγκο Μαδαγασκά�ης</displayName>
-				<displayName count="one">φ�άγκο Μαδαγασκά�ης</displayName>
-				<displayName count="other">φ�άγκα Μαδαγασκά�ης</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Δηνά�ιο Π.Γ.Δ.Μ.</displayName>
-				<displayName count="one">δηνά�ιο Π.Γ.Δ.Μ.</displayName>
-				<displayName count="other">δηνά�ια Π.Γ.Δ.Μ.</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Φ�άγκο Μαλί</displayName>
-				<displayName count="one">φ�άγκο Μαλί</displayName>
-				<displayName count="other">φ�άγκα Μαλί</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Κυάτ Μιανμά�</displayName>
-				<displayName count="one">κυάτ Μιανμά�</displayName>
-				<displayName count="other">κυάτ Μιανμά�</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Τουγκ�ίκ Μογγολίας</displayName>
-				<displayName count="one">τουγκ�ίκ Μογγολίας</displayName>
-				<displayName count="other">τουγκ�ίκ Μογγολίας</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Πατάκα Μακάο</displayName>
-				<displayName count="one">πατάκα Μακάο</displayName>
-				<displayName count="other">πατάκα Μακάο</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ουγκουίγκα Μαυ�ιτανίας</displayName>
-				<displayName count="one">ουγκουίγκα Μαυ�ιτανίας</displayName>
-				<displayName count="other">ουγκουίγκα Μαυ�ιτανίας</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Λι�έτα Μάλτας</displayName>
-				<displayName count="one">λι�έτα Μάλτας</displayName>
-				<displayName count="other">λι�έτες Μάλτας</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Λί�α Μάλτας</displayName>
-				<displayName count="one">λί�α Μάλτας</displayName>
-				<displayName count="other">λί�ες Μάλτας</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Ρο�πια Μαυ�ικίου</displayName>
-				<displayName count="one">�ο�πι Μαυ�ικίου</displayName>
-				<displayName count="other">�ο�πια Μαυ�ικίου</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Ρουφίγια �ήσων Μαλδίβων</displayName>
-				<displayName count="one">�ουφίγια �ήσων Μαλδίβων</displayName>
-				<displayName count="other">�ουφίγια �ήσων Μαλδίβων</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Κουάτσα Μαλάουι</displayName>
-				<displayName count="one">κουάτσα Μαλάουι</displayName>
-				<displayName count="other">κουάτσα Μαλάουι</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Πέσο Μεξικο�</displayName>
-				<displayName count="one">πέσο Μεξικο�</displayName>
-				<displayName count="other">πέσο Μεξικο�</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Ασημένιο Πέσο Μεξικο� (1861-1992)</displayName>
-				<displayName count="one">ασημένιο πέσο Μεξικο� (MXP)</displayName>
-				<displayName count="other">ασημένια πέσο Μεξικο� (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidad de Inversion (UDI) Μεξικο�</displayName>
-				<displayName count="one">Unidad de Inversion (UDI) Μεξικο�</displayName>
-				<displayName count="other">Unidads de Inversion (UDI) Μεξικο�</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ρινγκίτ Μαλαισίας</displayName>
-				<displayName count="one">�ινγκίτ Μαλαισίας</displayName>
-				<displayName count="other">�ινγκίτ Μαλαισίας</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Εσκο�δο Μοζαμβίκης</displayName>
-				<displayName count="one">εσκο�δο Μοζαμβίκης</displayName>
-				<displayName count="other">εσκο�δο Μοζαμβίκης</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Παλαιό Μετικάλ Μοζαμβίκης</displayName>
-				<displayName count="one">παλιό μετικάλ Μοζαμβίκης</displayName>
-				<displayName count="other">παλιά μετικάλ Μοζαμβίκης</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Μετικάλ Μοζαμβίκης</displayName>
-				<displayName count="one">μετικάλ Μοζαμβίκης</displayName>
-				<displayName count="other">μετικάλ Μοζαμβίκης</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Δολά�ιο �αμίμπια</displayName>
-				<displayName count="one">δολά�ιο �αμίμπια</displayName>
-				<displayName count="other">δολά�ια �αμίμπια</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�άι�α �ιγη�ίας</displayName>
-				<displayName count="one">νάι�α �ιγη�ίας</displayName>
-				<displayName count="other">νάι�α �ιγη�ίας</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Κό�δοβα �ικα�άγουας</displayName>
-				<displayName count="one">κό�δοβα �ικα�άγουας</displayName>
-				<displayName count="other">κό�δοβα �ικα�άγουας</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Χ�υσή Κό�δοβα �ικα�άγουας</displayName>
-				<displayName count="one">χ�υσή κό�δοβα �ικα�άγουας</displayName>
-				<displayName count="other">χ�υσές κό�δοβα �ικα�άγουας</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Γκίλντα Ολλανδίας</displayName>
-				<displayName count="one">γκίλντα Ολλανδίας</displayName>
-				<displayName count="other">γκίλντα Ολλανδίας</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Κο�όνα �ο�βηγίας</displayName>
-				<displayName count="one">κο�όνα �ο�βηγίας</displayName>
-				<displayName count="other">κο�όνες �ο�βηγίας</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Ρο�πια �επάλ</displayName>
-				<displayName count="one">�ο�πι �επάλ</displayName>
-				<displayName count="other">�ο�πια �επάλ</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Δολά�ιο �έας Ζηλανδίας</displayName>
-				<displayName count="one">δολά�ιο �έας Ζηλανδίας</displayName>
-				<displayName count="other">δολά�ια �έας Ζηλανδίας</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Ριάλ Ομάν</displayName>
-				<displayName count="one">�ιάλ Ομάν</displayName>
-				<displayName count="other">�ιάλ Ομάν</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Μπαλμπόα Παναμά</displayName>
-				<displayName count="one">μπαλμπόα Παναμά</displayName>
-				<displayName count="other">μπαλμπόα Παναμά</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Ίντι Πε�ο�</displayName>
-				<displayName count="one">ίντι Πε�ο�</displayName>
-				<displayName count="other">ίντι Πε�ο�</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>�έο Σολ Πε�ο�</displayName>
-				<displayName count="one">νέο σολ Πε�ο�</displayName>
-				<displayName count="other">νέα Σολ Πε�ο�</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Σολ Πε�ο�</displayName>
-				<displayName count="one">σολ Πε�ο�</displayName>
-				<displayName count="other">σολ Πε�ο�</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Κίνα Παπο�α �έα Γουινέα</displayName>
-				<displayName count="one">κίνα Παπο�α �έα Γουινέα</displayName>
-				<displayName count="other">κίνα Παπο�α �έα Γουινέα</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Πέσο Φιλιππίνων</displayName>
-				<displayName count="one">πέσο Φιλιππίνων</displayName>
-				<displayName count="other">πέσο Φιλιππίνων</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Ρο�πια Πακιστάν</displayName>
-				<displayName count="one">�ο�πι Πακιστάν</displayName>
-				<displayName count="other">�ο�πια Πακιστάν</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Ζλότυ Πολωνίας</displayName>
-				<displayName count="one">ζλότυ Πολωνίας</displayName>
-				<displayName count="other">ζλότυ Πολωνίας</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Ζλότυ Πολωνίας (1950-1995)</displayName>
-				<displayName count="one">ζλότυ Πολωνίας (PLZ)</displayName>
-				<displayName count="other">ζλότυ Πολωνίας (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Εσκο�δο Πο�τογαλίας</displayName>
-				<displayName count="one">εσκο�δο Πο�τογαλίας</displayName>
-				<displayName count="other">εσκο�δο Πο�τογαλίας</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Γκουα�ανί Πα�αγουάης</displayName>
-				<displayName count="one">γκουα�ανί Πα�αγουάης</displayName>
-				<displayName count="other">γκουα�ανί Πα�αγουάης</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Ριάλ Κατά�</displayName>
-				<displayName count="one">�ιάλ Κατά�</displayName>
-				<displayName count="other">�ιάλ Κατά�</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Δολά�ιο Ροδεσίας</displayName>
-				<displayName count="one">δολά�ιο Ροδεσίας</displayName>
-				<displayName count="other">δολά�ια Ροδεσίας</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Λέι Ρουμανίας</displayName>
-				<displayName count="one">παλιό λέι Ρουμανίας</displayName>
-				<displayName count="other">παλιά λέι Ρουμανίας</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Λεβ Ρουμανίας</displayName>
-				<displayName count="one">λεβ Ρουμανίας</displayName>
-				<displayName count="other">λεβ Ρουμανίας</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Δηνά�ιο Σε�βίας</displayName>
-				<displayName count="one">δηνά�ιο Σε�βίας</displayName>
-				<displayName count="other">δηνά�ια Σε�βίας</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ρο�βλι Ρωσίας</displayName>
-				<displayName count="one">�ο�βλι Ρωσίας</displayName>
-				<displayName count="other">�ο�βλια Ρωσίας</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ρο�βλι Ρωσίας (1991-1998)</displayName>
-				<displayName count="one">�ο�βλι Ρωσίας (RUR)</displayName>
-				<displayName count="other">�ο�βλια Ρωσίας (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Φ�άγκο Ρουάντας</displayName>
-				<displayName count="one">φ�άγκο Ρουάντας</displayName>
-				<displayName count="other">φ�άγκα Ρουάντας</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Ριάλ Σαουδικής Α�αβίας</displayName>
-				<displayName count="one">�ιάλ Σαουδικής Α�αβίας</displayName>
-				<displayName count="other">�ιάλ Σαουδικής Α�αβίας</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Δολά�ιο �ήσων Σολομώντος</displayName>
-				<displayName count="one">δολά�ιο �ήσων Σολομώντος</displayName>
-				<displayName count="other">δολά�ια �ήσων Σολομώντος</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Ρο�πια Σεϋχέλες</displayName>
-				<displayName count="one">�ο�πι Σεϋχέλες</displayName>
-				<displayName count="other">�ο�πια Σεϋχέλες</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Δηνά�ιο Σουδάν</displayName>
-				<displayName count="one">δηνά�ιο Σουδάν</displayName>
-				<displayName count="other">δηνά�ια Σουδάν</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Λί�α Σουδάν</displayName>
-				<displayName count="one">λί�α Σουδάν</displayName>
-				<displayName count="other">λί�ες Σουδάν</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Παλαιά Λί�α Σουδάν</displayName>
-				<displayName count="one">παλιά λί�α Σουδάν</displayName>
-				<displayName count="other">παλαιές λί�ες Σουδάν</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Κο�όνα Σουηδίας</displayName>
-				<displayName count="one">κο�όνα Σουηδίας</displayName>
-				<displayName count="other">κο�όνες Σουηδίας</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Δολά�ιο Σιγκαπο��ης</displayName>
-				<displayName count="one">δολά�ιο Σιγκαπο��ης</displayName>
-				<displayName count="other">δολά�ια Σιγκαπο��ης</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Λί�α Αγίας Ελένης</displayName>
-				<displayName count="one">λί�α Αγίας Ελένης</displayName>
-				<displayName count="other">λί�ες Αγίας Ελένης</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Τόλα� Σλοβενίας</displayName>
-				<displayName count="one">τόλα� Σλοβενίας</displayName>
-				<displayName count="other">τόλα� Σλοβ</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Κο�όνα Σλοβενίας</displayName>
-				<displayName count="one">κο�όνα Σλοβενίας</displayName>
-				<displayName count="other">κο�όνες Σλοβενίας</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Λεόνε Σιέ�α Λεόνε</displayName>
-				<displayName count="one">λεόνε Σιέ�α Λεόνε</displayName>
-				<displayName count="other">λεόνε Σιέ�α Λεόνε</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Σελίνι Σομαλίας</displayName>
-				<displayName count="one">σελίνι Σομαλίας</displayName>
-				<displayName count="other">σελίνια Σομαλίας</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Δολά�ιο Σου�ινάμ</displayName>
-				<displayName count="one">δολά�ιο Σου�ινάμ</displayName>
-				<displayName count="other">δολά�ια Σου�ινάμ</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Γκίλντα Σου�ινάμ</displayName>
-				<displayName count="one">γκίλντα Σου�ινάμ</displayName>
-				<displayName count="other">γκίλντα Σου�ινάμ</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>�τόμπ�α Σάο Τομέ και Π�ίνσιπε</displayName>
-				<displayName count="one">ντόμπ�α Σάο Τόμε και Π�ίνσιπε</displayName>
-				<displayName count="other">ντόμπ�α Σάο Τόμε και Π�ίνσιπε</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Σοβιετικό Ρο�βλι</displayName>
-				<displayName count="one">σοβιετικό �ο�βλι</displayName>
-				<displayName count="other">σοβιετικά �ο�βλια</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Κολόν Ελ Σαλβαδό�</displayName>
-				<displayName count="one">κολόν Ελ Σαλβαδό�</displayName>
-				<displayName count="other">κολόν Ελ Σαλβαδό�</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Λί�α Συ�ίας</displayName>
-				<displayName count="one">λί�α Συ�ίας</displayName>
-				<displayName count="other">λί�ες Συ�ίας</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Λιλανγκένι Σουαζιλάνδη</displayName>
-				<displayName count="one">λιλανγκένι Σουαζιλάνδη</displayName>
-				<displayName count="other">λιλανγκένι Σουαζιλάνδη</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Μπατ Ταϊλάνδης</displayName>
-				<displayName count="one">μπατ Ταϊλάνδης</displayName>
-				<displayName count="other">μπατ Ταϊλάνδης</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Ρο�βλι Τατζικιστάν</displayName>
-				<displayName count="one">�ο�βλι Τατζικιστάν</displayName>
-				<displayName count="other">�ο�βλια Τατζικιστάν</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Σομόν Τατζικιστάν</displayName>
-				<displayName count="one">σομόν Τατζικιστάν</displayName>
-				<displayName count="other">σομόν Τατζικιστάν</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Μανάτ Του�κμενιστάν</displayName>
-				<displayName count="one">μανάτ Του�κμενιστάν</displayName>
-				<displayName count="other">μανάτ Του�κμενιστάν</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Δηνά�ιο Τυνησίας</displayName>
-				<displayName count="one">δηνά�ιο Τυνησίας</displayName>
-				<displayName count="other">δηνά�ια Τυνησίας</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Παάνγκα Τόνγκας</displayName>
-				<displayName count="one">πάνγκα Τόγκα</displayName>
-				<displayName count="other">πάνγκα Τόγκα</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Εσκο�δο Τιμό�</displayName>
-				<displayName count="one">εσκο�δο Τιμό�</displayName>
-				<displayName count="other">εσκο�δο Τιμό�</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Παλιά Λί�α Του�κίας</displayName>
-				<displayName count="one">παλιά λί�α Του�κίας</displayName>
-				<displayName count="other">παλιές λί�ες Του�κίας</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Του�κική Λί�α</displayName>
-				<displayName count="one">λί�α Του�κίας</displayName>
-				<displayName count="other">λί�ες Του�κίας</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Δολά�ιο Τ�ινιντάντ και Τομπάγκο</displayName>
-				<displayName count="one">δολά�ιο Τ�ινιδάδ και Τομπάγκο</displayName>
-				<displayName count="other">δολά�ια Τ�ινιδάδ και Τομπάγκο</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>�έο Δολά�ιο Ταϊβάν</displayName>
-				<displayName count="one">νέο δολά�ιο Ταϊβάν</displayName>
-				<displayName count="other">νέα δολά�ια Ταϊβάν</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Σελίνι Τανζανίας</displayName>
-				<displayName count="one">σελίνι Τανζανίας</displayName>
-				<displayName count="other">σελίνι Τανζανίας</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Χ�ίφνα Ουκ�ανίας</displayName>
-				<displayName count="one">χ�ίφνα Ουκ�ανίας</displayName>
-				<displayName count="other">χ�ίφνα Ουκ�ανίας</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Κα�μποβανέτς Ουκ�ανίας</displayName>
-				<displayName count="one">κα�μποβανέτς Ουκ�ανίας</displayName>
-				<displayName count="other">κα�μποβανέτς Ουκ�ανίας</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Σελίνι Ουγκάντας (1966-1987)</displayName>
-				<displayName count="one">σελίνι Ουγκάντας (UGS)</displayName>
-				<displayName count="other">σελίνια Ουγκάντας (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Σελίνι Ουγκάντας</displayName>
-				<displayName count="one">σελίνι Ουγκάντας</displayName>
-				<displayName count="other">σελίνια Ουγκάντας</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Δολά�ιο ΗΠΑ</displayName>
-				<displayName count="one">δολά�ιο Η.Π.Α.</displayName>
-				<displayName count="other">δολά�ια Η.Π.Α.</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Δολά�ιο ΗΠΑ (επόμενη ημέ�α)</displayName>
-				<displayName count="one">δολά�ιο Η.Π.Α. (επόμενη ημέ�α)</displayName>
-				<displayName count="other">δολά�ια Η.Π.Α. (επόμενη ημέ�α)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Δολά�ιο ΗΠΑ (ίδια ημέ�α)</displayName>
-				<displayName count="one">δολά�ιο Η.Π.Α. (ίδια ημέ�α)</displayName>
-				<displayName count="other">δολά�ια Η.Π.Α. (ίδια ημέ�α)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Peso en Unidades Indexadas Ου�ουγουάης</displayName>
-				<displayName count="one">peso en unidades indexadas Ου�ουγκουάης</displayName>
-				<displayName count="other">pesos en unidades indexadas Ου�ουγκουάης</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Πέσο Ου�ουγουάης (1975-1993)</displayName>
-				<displayName count="one">πέσο Ου�ουγουάης (UYP)</displayName>
-				<displayName count="other">πέσο Ου�ουγουάης (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Πέσο Ου�ουγουάης</displayName>
-				<displayName count="one">πέσο Ου�ουγουάης</displayName>
-				<displayName count="other">πέσο Ου�ουγουάης</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Σομ Ουζμπεκιστάν</displayName>
-				<displayName count="one">σομ Ουζμπεκιστάν</displayName>
-				<displayName count="other">σομ Ουζμπεκιστάν</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Μπολιβά� Βενεζουέλας</displayName>
-				<displayName count="one">μπολιβά� Βενεζουέλας</displayName>
-				<displayName count="other">μπολιβά� Βενεζουέλας</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Βολιβά� Φουέ�τε Βενεζουέλας</displayName>
-				<displayName count="one">βολιβά� φουέ�τε Βενεζουέλας</displayName>
-				<displayName count="other">βολιβά� φουέ�τε Βενεζουέλας</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>�τονγκ Βιετνάμ</displayName>
-				<displayName count="one">ντονγκ Βιετνάμ</displayName>
-				<displayName count="other">ντονγκ Βιετνάμ</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Βατο� Βανουάτου</displayName>
-				<displayName count="one">βατο� Βανουάτου</displayName>
-				<displayName count="other">βατο� Βανουάτου</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Ταλά Δυτικής Σαμόας</displayName>
-				<displayName count="one">Τάλα Σαμόας</displayName>
-				<displayName count="other">τάλα Σαμόας</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Φ�άγκο BEAC CFA</displayName>
-				<displayName count="one">φ�άγκο BEAC CFA</displayName>
-				<displayName count="other">φ�άγκα BEAC CFA</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Χ�υσός</displayName>
-				<displayName count="one">XAU</displayName>
-				<displayName count="other">XAU</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Ευ�ωπαϊκή Σ�νθετη Μονάδα</displayName>
-				<displayName count="one">ευ�ωπαϊκή σ�νθετη μονάδα</displayName>
-				<displayName count="other">ευ�ωπαϊκές σ�νθετες μονάδες</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Ευ�ωπαϊκή �ομισματική Μονάδα</displayName>
-				<displayName count="one">ευ�ωπαϊκή νομισματική μονάδα</displayName>
-				<displayName count="other">ευ�ωπαϊκές νομισματικές μονάδες</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Ευ�ωπαϊκή μονάδα λογα�ιασμο� (XBC)</displayName>
-				<displayName count="one">ευ�ωπαϊκή μονάδα λογα�ιασμο� (XBC)</displayName>
-				<displayName count="other">ευ�ωπαϊκές μονάδες λογα�ιασμο� (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Ευ�ωπαϊκή μονάδα λογα�ιασμο� (XBD)</displayName>
-				<displayName count="one">ευ�ωπαϊκή μονάδα λογα�ιασμο� (XBD)</displayName>
-				<displayName count="other">ευ�ωπαϊκές μονάδες λογα�ιασμο� (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Δολά�ιο Ανατολικής Κα�αϊβικής</displayName>
-				<displayName count="one">δολά�ιο Ανατολικής Κα�αϊβικής</displayName>
-				<displayName count="other">δολά�ια Ανατολικής Κα�αϊβικής</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Ειδικά Δικαιώματα Ανάληψης</displayName>
-				<displayName count="one">ειδικό δικαίωμα ανάληψης</displayName>
-				<displayName count="other">ειδικά δικαιώματα ανάληψης</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Ευ�ωπαϊκή Συναλλαγματική Μονάδα</displayName>
-				<displayName count="one">ευ�ωπαϊκή συναλλαγματική μονάδα</displayName>
-				<displayName count="other">ευ�ωπαϊκές συναλλαγματικές μονάδες</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Χ�υσό Φ�άγκο Γαλλίας</displayName>
-				<displayName count="one">χ�υσό φ�άγκο Γαλλίας</displayName>
-				<displayName count="other">χ�υσά φ�άγκα Γαλλίας</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>UIC-Φ�άγκο Γαλλίας</displayName>
-				<displayName count="one">UIC-φ�άγκο Γαλλίας</displayName>
-				<displayName count="other">UIC-φ�άγκα Γαλλίας</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Φ�άγκο BCEAO CFA</displayName>
-				<displayName count="one">φ�άγκο BCEAO CFA</displayName>
-				<displayName count="other">φ�άγκα BCEAO CFA</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Φ�άγκο CFP</displayName>
-				<displayName count="one">φ�άγκο CFP</displayName>
-				<displayName count="other">φ�άγκα CFP</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Άγνωστο ή μη έγκυ�ο νόμισμα</displayName>
-				<displayName count="one">άγνωστο/μη έγκυ�ο νόμισμα</displayName>
-				<displayName count="other">Άγνωστο ή μη έγκυ�ο νόμισμα</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Δηνά�ιο Υεμένης</displayName>
-				<displayName count="one">δηνά�ιο Υεμένης</displayName>
-				<displayName count="other">δηνά�ια Υεμένης</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Ριάλ Υεμένης</displayName>
-				<displayName count="one">�ιάλ Υεμένης</displayName>
-				<displayName count="other">�ιάλ Υεμένης</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Μεταλλικό Δηνά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="one">μεταλλικό δηνά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="other">μεταλλικά δηνά�ια Γιουγκοσλαβίας</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>�έο Δηνά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="one">νέο δηνά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="other">νέο δηνά�ιο Γιουγκοσλαβίας</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Μετατ�έψιμο Δηνά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="one">μετατ�έψιμο δινά�ιο Γιουγκοσλαβίας</displayName>
-				<displayName count="other">μετατ�έψιμο δηνά�ιο Γιουγκοσλαβίας</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Ραντ �ότιας Αφ�ικής (οικονομικό)</displayName>
-				<displayName count="one">�αντ �ότιας Αφ�ικής (οικονομικό)</displayName>
-				<displayName count="other">�αντ �ότιας Αφ�ικής (οικονομικό)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Ραντ �ότιας Αφ�ικής</displayName>
-				<displayName count="one">�αντ �ότιας Αφ�ικής</displayName>
-				<displayName count="other">�αντ �ότιας Αφ�ικής</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Κουάνζα Ζα��</displayName>
-				<displayName count="one">κουάτσα Ζάμπιας</displayName>
-				<displayName count="other">κουάτσα Ζάμπιας</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>�έο Ζα�� Ζα��</displayName>
-				<displayName count="one">νέο ζα�� Ζα��</displayName>
-				<displayName count="other">νέα ζα�� Ζα��</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Ζα�� Ζα��</displayName>
-				<displayName count="one">ζα�� Ζα��</displayName>
-				<displayName count="other">ζα�� Ζα��</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Δολά�ιο Ζιμπάμπουε</displayName>
-				<displayName count="one">δολά�ιο Ζιμπάμπουε</displayName>
-				<displayName count="other">δολά�ια Ζιμπάμπουε</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ημέ�α</unitPattern>
-			<unitPattern count="other">{0} ημέ�ες</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ώ�α</unitPattern>
-			<unitPattern count="other">{0} ώ�ες</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} λεπτό</unitPattern>
-			<unitPattern count="other">{0} λεπτά</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} μήνας</unitPattern>
-			<unitPattern count="other">{0} μήνες</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} δευτε�όλεπτο</unitPattern>
-			<unitPattern count="other">{0} δευτε�όλεπτα</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} εβδομάδα</unitPattern>
-			<unitPattern count="other">{0} εβδομάδες</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} έτος</unitPattern>
-			<unitPattern count="other">{0} έτη</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ναι:ν</yesstr>
-			<nostr>όχι:ό</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/el_CY.xml b/airtime_mvc/library/Zend/Locale/Data/el_CY.xml
deleted file mode 100644
index bcb1bcbc4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/el_CY.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="el"/>
-		<territory type="CY"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/el_GR.xml b/airtime_mvc/library/Zend/Locale/Data/el_GR.xml
deleted file mode 100644
index 9674621d0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/el_GR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="el"/>
-		<territory type="GR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/el_POLYTON.xml b/airtime_mvc/library/Zend/Locale/Data/el_POLYTON.xml
deleted file mode 100644
index d58e853a4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/el_POLYTON.xml
+++ /dev/null
@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.10 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="el"/>
-		<variant type="POLYTON"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">Ἀ�αβικά</language>
-			<language type="arc">Ἀ�αμαϊκά</language>
-			<language type="cy">Ο�αλικά</language>
-			<language type="egy">Αἰγυπτιακὰ (ἀ�χαῖα)</language>
-			<language type="el">Ἑλληνικά</language>
-			<language type="en">Ἀγγλικά</language>
-			<language type="es">Ἱσπανικά</language>
-			<language type="et">Ἐσθονικά</language>
-			<language type="ga">Ἰ�λανδικά</language>
-			<language type="gd">Σκωτικὰ κελτικά</language>
-			<language type="grc">Ἀ�χαῖα Ἑλληνικά</language>
-			<language type="he">Ἑβ�αϊκά</language>
-			<language type="hu">Οὑγγ�ικά</language>
-			<language type="hy">Ἀ�μενικά</language>
-			<language type="id">Ἰνδονησιακά</language>
-			<language type="ine">Ἰνδοευ�ωπαϊκὰ (ἄλλα)</language>
-			<language type="ira">Ἰ�ανικά</language>
-			<language type="is">Ἰσλανδικά</language>
-			<language type="it">Ἰταλικά</language>
-			<language type="ja">Ἰαπωνικά</language>
-			<language type="mul">Πολλαπλές γλῶσσες</language>
-			<language type="nai">Ἰνδιανικὰ βό�ειας Ἀμε�ικῆς (ἄλλα)</language>
-			<language type="nl">Ὁλλανδικά</language>
-			<language type="ota">Του�κικά, ὀθωμανικὰ (1500-1928)</language>
-			<language type="peo">Ἀ�χαῖα πε�σικὰ (600-400 π.Χ.)</language>
-			<language type="phi">Φιλιππινέζικα (ἄλλα)</language>
-			<language type="sem">Σημιτικὰ (ἄλλα)</language>
-			<language type="sla">Σλαβικὰ (ἄλλα)</language>
-			<language type="sq">Ἀλβανικά</language>
-			<language type="uk">Ο�κ�ανικά</language>
-			<language type="yi">Ἰουδαϊκά</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Ἀ�αβικό</script>
-			<script type="Armn">Ἀ�μενικό</script>
-			<script type="Ethi">Αἰθιοπικό</script>
-			<script type="Grek">Ἑλληνικό</script>
-			<script type="Hebr">Ἑβ�αϊκό</script>
-		</scripts>
-		<territories>
-			<territory type="AD">Ἀνδό�α</territory>
-			<territory type="AE">Ἠνωμένα Ἀ�αβικὰ Ἐμι�άτα</territory>
-			<territory type="AF">Ἀφγανιστάν</territory>
-			<territory type="AG">Ἀντίγκουα καὶ Μπα�μπο�ντα</territory>
-			<territory type="AI">Ἀνγκουίλα</territory>
-			<territory type="AL">Ἀλβανία</territory>
-			<territory type="AM">Ἀ�μενία</territory>
-			<territory type="AN">Ὁλλανδικὲς Ἀντίλλες</territory>
-			<territory type="AO">Ἀνγκόλα</territory>
-			<territory type="AQ">Ἀντα�κτική</territory>
-			<territory type="AR">Ἀ�γεντινή</territory>
-			<territory type="AS">Ἀμε�ικανικὴ Σαμόα</territory>
-			<territory type="AT">Α�στ�ία</territory>
-			<territory type="AU">Α�στ�αλία</territory>
-			<territory type="AW">Ἀ�ο�μπα</territory>
-			<territory type="AZ">Ἀζε�μπαϊτζάν</territory>
-			<territory type="BA">Βοσνία - Ἐ�ζεγοβίνη</territory>
-			<territory type="BM">Βε�μοῦδες</territory>
-			<territory type="BV">�ῆσος Μπουβέ</territory>
-			<territory type="CC">�ῆσοι Κόκος (Κήλινγκ)</territory>
-			<territory type="CD">Κονγκό, Λαϊκὴ Δημοκ�ατία τοῦ</territory>
-			<territory type="CF">Κεντ�οαφ�ικανικὴ Δημοκ�ατία</territory>
-			<territory type="CH">Ἑλβετία</territory>
-			<territory type="CI">Ἀκτὴ Ἐλεφαντοστο�</territory>
-			<territory type="CK">�ῆσοι Κο�κ</territory>
-			<territory type="CV">Π�άσινο Ἀκ�ωτή�ιο</territory>
-			<territory type="CX">�ῆσος Χ�ιστουγέννων</territory>
-			<territory type="DO">Δομινικανὴ Δημοκ�ατία</territory>
-			<territory type="DZ">Ἀλγε�ία</territory>
-			<territory type="EC">Ἰσημε�ινός</territory>
-			<territory type="EE">Ἐσθονία</territory>
-			<territory type="EG">Αἴγυπτος</territory>
-			<territory type="EH">Δυτικὴ Σαχά�α</territory>
-			<territory type="ER">Ἐ�υθ�αία</territory>
-			<territory type="ES">Ἱσπανία</territory>
-			<territory type="ET">Αἰθιοπία</territory>
-			<territory type="FM">Μικ�ονησία, Ὁμόσπονδες Πολιτεῖες τῆς</territory>
-			<territory type="FO">�ῆσοι Φε�όες</territory>
-			<territory type="GB">Ἡνωμένο Βασίλειο</territory>
-			<territory type="GF">Γαλλικὴ Γουιάνα</territory>
-			<territory type="GQ">Ἰσημε�ινὴ Γουινέα</territory>
-			<territory type="GR">Ἑλλάδα</territory>
-			<territory type="GS">�ότια Γεω�γία καὶ �ότιες �ήσοι Σάντουιτς</territory>
-			<territory type="HK">Χὸνγκ Κόνγκ, Εἰδικὴ Διοικητικὴ Πε�ιφέ�εια τῆς Κίνας</territory>
-			<territory type="HM">�ῆσοι Χὲ�ντ καὶ Μακντόναλντ</territory>
-			<territory type="HN">Ὁνδο��α</territory>
-			<territory type="HT">Ἁϊτή</territory>
-			<territory type="HU">Οὑγγα�ία</territory>
-			<territory type="ID">Ἰνδονησία</territory>
-			<territory type="IE">Ἰ�λανδία</territory>
-			<territory type="IL">Ἰσ�αήλ</territory>
-			<territory type="IN">Ἰνδία</territory>
-			<territory type="IO">Β�ετανικὰ Ἐδάφη Ἰνδικοῦ Ὠκεανοῦ</territory>
-			<territory type="IQ">Ἰ�άκ</territory>
-			<territory type="IR">Ἰ�άν, Ἰσλαμικὴ Δημοκ�ατία τοῦ</territory>
-			<territory type="IS">Ἰσλανδία</territory>
-			<territory type="IT">Ἰταλία</territory>
-			<territory type="JO">Ἰο�δανία</territory>
-			<territory type="JP">Ἰαπωνία</territory>
-			<territory type="KN">Σαὶντ Κὶτς καὶ �έβις</territory>
-			<territory type="KY">�ῆσοι Κέιμαν</territory>
-			<territory type="LA">Λατινικὴ Ἀμε�ική</territory>
-			<territory type="LC">Ἁγία Λουκία</territory>
-			<territory type="LK">Σ�ὶ Λάνκα</territory>
-			<territory type="LU">Λουξεμβοῦ�γο</territory>
-			<territory type="MD">Μολδαβία, Δημοκ�ατία τῆς</territory>
-			<territory type="MH">�ῆσοι Μά�σαλ</territory>
-			<territory type="ML">Μαλί</territory>
-			<territory type="MO">Μακάο, Εἰδικὴ Διοικητικὴ Πε�ιφέ�εια τῆς Κίνας</territory>
-			<territory type="MP">�ῆσοι Βό�ειες Μα�ιάνες</territory>
-			<territory type="NF">�ῆσος �ό�φολκ</territory>
-			<territory type="NL">Ὁλλανδία</territory>
-			<territory type="OM">Ὀμάν</territory>
-			<territory type="PF">Γαλλικὴ Πολυνησία</territory>
-			<territory type="PM">Σαὶντ Πιὲ� καὶ Μικελόν</territory>
-			<territory type="PS">Παλαιστινιακὰ Ἐδάφη</territory>
-			<territory type="SA">Σαουδικὴ Ἀ�αβία</territory>
-			<territory type="SB">�ῆσοι Σολομῶντος</territory>
-			<territory type="SH">Ἁγία Ἑλένη</territory>
-			<territory type="SJ">�ῆσοι Σβάλμπα� καὶ Γιὰν Μαγιέν</territory>
-			<territory type="SM">�γιος Μα�ίνος</territory>
-			<territory type="ST">Σάο Τομὲ καὶ Π�ίνσιπε</territory>
-			<territory type="SV">Ἒλ Σαλβαδό�</territory>
-			<territory type="SY">Συ�ία, Ἀ�αβικὴ Δημοκ�ατία τῆς</territory>
-			<territory type="TC">�ῆσοι Τὲ�κς καὶ Κάικος</territory>
-			<territory type="TD">Τσάντ</territory>
-			<territory type="TF">Γαλλικὰ �ότια Ἐδάφη</territory>
-			<territory type="TL">Ἀνατολικὸ Τιμό�</territory>
-			<territory type="TT">Τ�ινιδὰδ καὶ Τομπάγκο</territory>
-			<territory type="UA">Ο�κ�ανία</territory>
-			<territory type="UG">Ο�γκάντα</territory>
-			<territory type="UM">Ἀπομακ�υσμένες �ησίδες τῶν Ἡνωμένων Πολιτειῶν</territory>
-			<territory type="US">Ἡνωμένες Πολιτεῖες</territory>
-			<territory type="UY">Ο��ουγουάη</territory>
-			<territory type="UZ">Ο�ζμπεκιστάν</territory>
-			<territory type="VA">Ἁγία �δ�α (Βατικανό)</territory>
-			<territory type="VC">�γιος Βικέντιος καὶ Γ�εναδίνες</territory>
-			<territory type="VG">Β�ετανικὲς Πα�θένοι �ῆσοι</territory>
-			<territory type="VI">Ἀμε�ικανικὲς Πα�θένοι �ῆσοι</territory>
-			<territory type="WF">�ῆσοι Ο�άλλις καὶ Φουτουνά</territory>
-			<territory type="YE">Ὑεμένη</territory>
-			<territory type="ZA">�ότια Ἀφ�ική</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Ἡμε�ολόγιο</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">Βουδιστικὸ ἡμε�ολόγιο</type>
-			<type type="chinese" key="calendar">Κινεζικὸ ἡμε�ολόγιο</type>
-			<type type="direct" key="collation">Σει�ὰ Direct</type>
-			<type type="gregorian" key="calendar">Γ�ηγο�ιανὸ ἡμε�ολόγιο</type>
-			<type type="hebrew" key="calendar">Ἑβ�αϊκὸ ἡμε�ολόγιο</type>
-			<type type="islamic" key="calendar">Ἰσλαμικὸ ἡμε�ολόγιο</type>
-			<type type="islamic-civil" key="calendar">Ἰσλαμικὸ ἀστικὸ ἡμε�ολόγιο</type>
-			<type type="japanese" key="calendar">Ἰαπωνικὸ ἡμε�ολόγιο</type>
-			<type type="phonebook" key="collation">Σει�ὰ τηλεφωνικοῦ καταλόγου</type>
-			<type type="pinyin" key="collation">Σει�ὰ Πίνγιν</type>
-			<type type="stroke" key="collation">Σει�ὰ Stroke</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[α ἀ ἄ ἂ ἆ � ἅ ἃ ἇ ά ὰ ᾶ β-ε � ἔ ἒ ἑ ἕ ἓ έ ὲ ζ η ἠ ἤ ἢ ἦ ἡ ἥ ἣ ἧ ή ὴ ῆ θ ι ἰ ἴ ἲ ἶ ἱ ἵ ἳ ἷ ί ὶ ῖ ϊ � ῒ ῗ κ-ο ὄ ὂ ὃ ό ὸ π � σ ς τ υ � ὔ ὒ ὖ ὑ ὕ ὓ ὗ � ὺ ῦ ϋ ΰ ῢ ῧ φ-ω ὤ ὢ ὦ ὥ ὣ ὧ ώ ὼ ῶ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<alternateQuotationStart>‛</alternateQuotationStart>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ἰαν</month>
-							<month type="4">Ἀπ�</month>
-							<month type="6">Ἰουν</month>
-							<month type="7">Ἰουλ</month>
-							<month type="8">Α�γ</month>
-							<month type="10">Ὀκτ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ἰανουα�ίου</month>
-							<month type="4">Ἀπ�ιλίου</month>
-							<month type="6">Ἰουνίου</month>
-							<month type="7">Ἰουλίου</month>
-							<month type="8">Α�γο�στου</month>
-							<month type="10">Ὀκτωβ�ίου</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Ἰαν</month>
-							<month type="4">Ἀπ�</month>
-							<month type="6">Ἰουν</month>
-							<month type="7">Ἰουλ</month>
-							<month type="8">Α�γ</month>
-							<month type="10">Ὀκτ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ἰανουά�ιος</month>
-							<month type="4">Ἀπ�ίλιος</month>
-							<month type="6">Ἰο�νιος</month>
-							<month type="7">Ἰο�λιος</month>
-							<month type="8">Αὔγουστος</month>
-							<month type="10">Ὀκτώβ�ιος</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Πεσέτα Ἀνδό�ας</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>�τι�ὰμ Ἡνωμένων Ἀ�αβικῶν Ἐμι�άτων</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Λὲκ Ἀλβανίας</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram Ἀ�μενίας</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Γκίλντα Ὁλλανδικῶν Ἀντιλλῶν</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza Ἀνγκόλας</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Kwanza Ἀνγκόλας (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�έα Kwanza Ἀνγκόλας (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza Reajustado Ἀνγκόλας (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Austral Ἀ�γεντινῆς</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Πέσο Ἀ�γεντινῆς (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Πέσο Ἀ�γεντινῆς</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Σελίνι Α�στ�ίας</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Δολά�ιο Α�στ�αλίας</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Γκίλντα Ἀ�ο�μπα</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Μανὰτ Ἀζε�μπαϊτζάν</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Δηνά�ιο Βοσνίας-Ἑ�ζεγοβίνης</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Μά�κο Βοσνίας-Ἑ�ζεγοβίνης</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Φ�άγκο Βελγίου (οἰκονομικό)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Μεταλλικὸ Λὲβ Βουλγα�ίας</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>�έο Λὲβ Βουλγα�ίας</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Δολά�ιο Καναδᾶ</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Φ�άγκο Ἑλβετίας</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento Χιλῆς</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Πέσο Χιλῆς</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Σκλη�ὴ Κο�όνα Τσεχοσλοβακίας</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Ἐσκο�δο Π�άσινου Ἀκ�ωτη�ίου</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Ostmark Ἀνατολικῆς Γε�μανίας</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Δηνά�ιο Ἀλγε�ίας</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre Ἰσημε�ινοῦ</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidad de Valor Constante (UVC) Ἰσημε�ινοῦ</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Κο�όνα Ἐστονίας</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Λί�α Αἰγ�πτου</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa Ἐ�υθ�αίας</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Πεσέτα Ἱσπανίας</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr Αἰθιοπίας</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Ε��ώ</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Λί�α �ήσων Φώλκλαντ</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi Γκάμπιας</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele Guineana Ἰσημε�ινῆς Γουινέας</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal Γουατεμάλας</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Γκινέα Ἐσκο�δο Πο�τογαλίας</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Δολά�ιο Χὸνγκ Κόνγκ</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde Ἁϊτῆς</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Φιο�ίνι Οὑγγα�ίας</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Ρο�πια Ἰνδονησίας</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Λί�α Ἰ�λανδίας</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Λί�α Ἰσ�αήλ</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>�έο Sheqel Ἰσ�αήλ</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Ρο�πια Ἰνδίας</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Δηνά�ιο Ἰ�άκ</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial Ἰ�άκ</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Κο�όνα Ἰσλανδίας</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Λι�έτα Ἰταλίας</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Δηνά�ιο Ἰο�δανίας</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Γιὲν Ἰαπωνίας</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Ρο�πια Σ�ὶ Λάνκας</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca Μακάου</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Πέσο Μεξικοῦ</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Ἀσημένιο Πέσο Μεξικοῦ (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidad de Inversion (UDI) Μεξικοῦ</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Ἐσκο�δο Μοζαμβίκης</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Δολά�ιο �αμίμπιας</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Χ�υσὴ Κό�δοβα �ικα�άγουας</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Γκίλντα Ὁλλανδίας</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Μπαλμπόα Παναμᾶ</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina Παπο�α �έα Γουινέας</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Ἐσκο�δο Πο�τογαλίας</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Γκουα�ανὶ Πα�αγουάης</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Δολά�ιο �ήσων Σολομῶντος</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Ρο�πια Σεϋχελῶν</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Λί�α Ἀγίας Ἑλένης</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Σοβιετικὸ Ρο�βλι</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colon Ἒλ Σαλβαδό�</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni Ζουαζιλάνδης</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Μπὰτ Ταϊλάνδης</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Μανὰτ Του�κμενιστάν</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Ἐσκο�δο Τιμό�</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Δολά�ιο Τ�ινιδὰδ καὶ Τομπάγκο</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia Ο�κ�ανίας</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Karbovanetz Ο�κ�ανίας</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Σελίνι Ο�γκάντας (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Σελίνι Ο�γκάντας</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Δολά�ιο ΗΠΑ (Ἑπόμενη ἡμέ�α)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Δολά�ιο ΗΠΑ (Ἴδια ἡμέ�α)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Πέσο Ο��ουγουάης (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Πέσο Uruguayo Ο��ουγουάης</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Sum Ο�ζμπεκιστάν</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Μπολιβὰλ Βενεζουέλας</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala Δυτικῆς Σαμόας</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Ε��ωπαϊκὴ Σ�νθετη Μονάδα</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Ε��ωπαϊκὴ �ομισματικὴ Μονάδα</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Ε��ωπαϊκὴ Μονάδα Λογα�ιασμοῦ (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Ε��ωπαϊκὴ Μονάδα Λογα�ιασμοῦ (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Δολά�ιο Ἀνατολικῆς Κα�αϊβικῆς</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Εἰδικὰ Δικαιώματα Ἀνάληψης</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Ε��ωπαϊκὴ Συναλλαγματικὴ Μονάδα</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Χ�υσὸ Φ�άγκο Γαλλίας</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Δηνά�ιο Ὑεμένης</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rial Ὑεμένης</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Μεταλλικὸ Δηνά�ιο Γιουγκοσλαβίας</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Ραντ �ότιας Ἀφ�ικῆς (οἰκονομικό)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Ρὰντ �ότιας Ἀφ�ικῆς</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>�αί</yesstr>
-			<nostr>Ὄχι</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en.xml b/airtime_mvc/library/Zend/Locale/Data/en.xml
deleted file mode 100644
index bfd0b5185..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en.xml
+++ /dev/null
@@ -1,4107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.234 $"/>
-		<generation date="$Date: 2009/06/17 16:15:14 $"/>
-		<language type="en"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abkhazian</language>
-			<language type="ace">Achinese</language>
-			<language type="ach">Acoli</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adyghe</language>
-			<language type="ae">Avestan</language>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Afro-Asiatic Language</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadian</language>
-			<language type="ale">Aleut</language>
-			<language type="alg">Algonquian Language</language>
-			<language type="alt">Southern Altai</language>
-			<language type="am">Amharic</language>
-			<language type="an">Aragonese</language>
-			<language type="ang">Old English</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apache Language</language>
-			<language type="ar">Arabic</language>
-			<language type="arc">Aramaic</language>
-			<language type="arn">Araucanian</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Artificial Language</language>
-			<language type="arw">Arawak</language>
-			<language type="as">Assamese</language>
-			<language type="ast">Asturian</language>
-			<language type="ath">Athapascan Language</language>
-			<language type="aus">Australian Language</language>
-			<language type="av">Avaric</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Azerbaijani</language>
-			<language type="ba">Bashkir</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke Language</language>
-			<language type="bal">Baluchi</language>
-			<language type="ban">Balinese</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Baltic Language</language>
-			<language type="be">Belarusian</language>
-			<language type="bej">Beja</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berber</language>
-			<language type="bg">Bulgarian</language>
-			<language type="bh">Bihari</language>
-			<language type="bho">Bhojpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengali</language>
-			<language type="bnt">Bantu</language>
-			<language type="bo">Tibetan</language>
-			<language type="br">Breton</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Bosnian</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Buriat</language>
-			<language type="bug">Buginese</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Catalan</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Central American Indian Language</language>
-			<language type="car">Carib</language>
-			<language type="cau">Caucasian Language</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Chechen</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Celtic Language</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Chibcha</language>
-			<language type="chg">Chagatai</language>
-			<language type="chk">Chuukese</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Chinook Jargon</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Chamic Language</language>
-			<language type="co">Corsican</language>
-			<language type="cop">Coptic</language>
-			<language type="cpe">English-based Creole or Pidgin</language>
-			<language type="cpf">French-based Creole or Pidgin</language>
-			<language type="cpp">Portuguese-based Creole or Pidgin</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Crimean Turkish</language>
-			<language type="crp">Creole or Pidgin</language>
-			<language type="cs">Czech</language>
-			<language type="csb">Kashubian</language>
-			<language type="cu">Church Slavic</language>
-			<language type="cus">Cushitic Language</language>
-			<language type="cv">Chuvash</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Danish</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargwa</language>
-			<language type="day">Dayak</language>
-			<language type="de">German</language>
-			<language type="de_AT">Austrian German</language>
-			<language type="de_CH">Swiss High German</language>
-			<language type="del">Delaware</language>
-			<language type="den">Slave</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravidian Language</language>
-			<language type="dsb">Lower Sorbian</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Middle Dutch</language>
-			<language type="dv">Divehi</language>
-			<language type="dyu">Dyula</language>
-			<language type="dz">Dzongkha</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Ancient Egyptian</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Greek</language>
-			<language type="elx">Elamite</language>
-			<language type="en">English</language>
-			<language type="en_AU">Australian English</language>
-			<language type="en_CA">Canadian English</language>
-			<language type="en_GB">British English</language>
-			<language type="en_US">U.S. English</language>
-			<language type="enm">Middle English</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanish</language>
-			<language type="es_419">Latin American Spanish</language>
-			<language type="es_ES">Iberian Spanish</language>
-			<language type="et">Estonian</language>
-			<language type="eu">Basque</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Persian</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulah</language>
-			<language type="fi">Finnish</language>
-			<language type="fil">Filipino</language>
-			<language type="fiu">Finno-Ugrian Language</language>
-			<language type="fj">Fijian</language>
-			<language type="fo">Faroese</language>
-			<language type="fon">Fon</language>
-			<language type="fr">French</language>
-			<language type="fr_CA">Canadian French</language>
-			<language type="fr_CH">Swiss French</language>
-			<language type="frm">Middle French</language>
-			<language type="fro">Old French</language>
-			<language type="frr">Northern Frisian</language>
-			<language type="frs">Eastern Frisian</language>
-			<language type="fur">Friulian</language>
-			<language type="fy">Western Frisian</language>
-			<language type="ga">Irish</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">Scottish Gaelic</language>
-			<language type="gem">Germanic Language</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbertese</language>
-			<language type="gl">Galician</language>
-			<language type="gmh">Middle High German</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Old High German</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gothic</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Ancient Greek</language>
-			<language type="gsw">Swiss German</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="gwi">Gwichʼin</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaiian</language>
-			<language type="he">Hebrew</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hittite</language>
-			<language type="hmn">Hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">Croatian</language>
-			<language type="hsb">Upper Sorbian</language>
-			<language type="ht">Haitian</language>
-			<language type="hu">Hungarian</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armenian</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indonesian</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiaq</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Indic Language</language>
-			<language type="ine">Indo-European Language</language>
-			<language type="inh">Ingush</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iranian Language</language>
-			<language type="iro">Iroquoian Language</language>
-			<language type="is">Icelandic</language>
-			<language type="it">Italian</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japanese</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Judeo-Persian</language>
-			<language type="jrb">Judeo-Arabic</language>
-			<language type="jv">Javanese</language>
-			<language type="ka">Georgian</language>
-			<language type="kaa">Kara-Kalpak</language>
-			<language type="kab">Kabyle</language>
-			<language type="kac">Kachin</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardian</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi</language>
-			<language type="khi">Khoisan Language</language>
-			<language type="kho">Khotanese</language>
-			<language type="ki">Kikuyu</language>
-			<language type="kj">Kuanyama</language>
-			<language type="kk">Kazakh</language>
-			<language type="kl">Kalaallisut</language>
-			<language type="km">Khmer</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korean</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraean</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Karachay-Balkar</language>
-			<language type="krl">Karelian</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurukh</language>
-			<language type="ks">Kashmiri</language>
-			<language type="ku">Kurdish</language>
-			<language type="kum">Kumyk</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Cornish</language>
-			<language type="ky">Kirghiz</language>
-			<language type="la">Latin</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Luxembourgish</language>
-			<language type="lez">Lezghian</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburgish</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Lao</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Lithuanian</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
-			<language type="lv">Latvian</language>
-			<language type="mad">Madurese</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makasar</language>
-			<language type="man">Mandingo</language>
-			<language type="map">Austronesian Language</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">Moksha</language>
-			<language type="mdr">Mandar</language>
-            <language type="men">Mende</language>
-            <language type="mfe">Morisyen</language>
-			<language type="mg">Malagasy</language>
-			<language type="mga">Middle Irish</language>
-			<language type="mh">Marshallese</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Miscellaneous Language</language>
-			<language type="mk">Macedonian</language>
-			<language type="mkh">Mon-Khmer Language</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolian</language>
-			<language type="mnc">Manchu</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Manobo Language</language>
-			<language type="mo">Moldavian</language>
-			<language type="moh">Mohawk</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malay</language>
-			<language type="mt">Maltese</language>
-			<language type="mul">Multiple Languages</language>
-			<language type="mun">Munda Language</language>
-			<language type="mus">Creek</language>
-			<language type="mwl">Mirandese</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Burmese</language>
-			<language type="myn">Mayan Language</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauru</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">North American Indian Language</language>
-			<language type="nap">Neapolitan</language>
-			<language type="nb">Norwegian Bokmål</language>
-			<language type="nd">North Ndebele</language>
-			<language type="nds">Low German</language>
-			<language type="ne">Nepali</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Niger-Kordofanian Language</language>
-			<language type="niu">Niuean</language>
-			<language type="nl">Dutch</language>
-			<language type="nl_BE">Flemish</language>
-			<language type="nn">Norwegian Nynorsk</language>
-			<language type="no">Norwegian</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Old Norse</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">South Ndebele</language>
-			<language type="nso">Northern Sotho</language>
-			<language type="nub">Nubian Language</language>
-			<language type="nv">Navajo</language>
-			<language type="nwc">Classical Newari</language>
-			<language type="ny">Nyanja</language>
-			<language type="nym">Nyamwezi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Occitan</language>
-			<language type="oj">Ojibwa</language>
-			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
-			<language type="os">Ossetic</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Ottoman Turkish</language>
-			<language type="oto">Otomian Language</language>
-			<language type="pa">Punjabi</language>
-			<language type="paa">Papuan Language</language>
-			<language type="pag">Pangasinan</language>
-			<language type="pal">Pahlavi</language>
-			<language type="pam">Pampanga</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palauan</language>
-			<language type="peo">Old Persian</language>
-			<language type="phi">Philippine Language</language>
-			<language type="phn">Phoenician</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Polish</language>
-			<language type="pon">Pohnpeian</language>
-			<language type="pra">Prakrit Language</language>
-			<language type="pro">Old Provençal</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portuguese</language>
-			<language type="pt_BR">Brazilian Portuguese</language>
-			<language type="pt_PT">Iberian Portuguese</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Rapanui</language>
-			<language type="rar">Rarotongan</language>
-			<language type="rm">Rhaeto-Romance</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Romanian</language>
-			<language type="roa">Romance Language</language>
-			<language type="rom">Romany</language>
-			<language type="root">Root</language>
-			<language type="ru">Russian</language>
-			<language type="rup">Aromanian</language>
-			<language type="rw">Kinyarwanda</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Yakut</language>
-			<language type="sai">South American Indian Language</language>
-			<language type="sal">Salishan Language</language>
-			<language type="sam">Samaritan Aramaic</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardinian</language>
-			<language type="scn">Sicilian</language>
-			<language type="sco">Scots</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Northern Sami</language>
-			<language type="sel">Selkup</language>
-			<language type="sem">Semitic Language</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Old Irish</language>
-			<language type="sgn">Sign Language</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="shn">Shan</language>
-			<language type="si">Sinhala</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Siouan Language</language>
-			<language type="sit">Sino-Tibetan Language</language>
-			<language type="sk">Slovak</language>
-			<language type="sl">Slovenian</language>
-			<language type="sla">Slavic Language</language>
-			<language type="sm">Samoan</language>
-			<language type="sma">Southern Sami</language>
-			<language type="smi">Sami Language</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Shona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somali</language>
-			<language type="sog">Sogdien</language>
-			<language type="son">Songhai</language>
-			<language type="sq">Albanian</language>
-			<language type="sr">Serbian</language>
-			<language type="srn">Sranan Tongo</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Swati</language>
-			<language type="ssa">Nilo-Saharan Language</language>
-			<language type="st">Southern Sotho</language>
-			<language type="su">Sundanese</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumerian</language>
-			<language type="sv">Swedish</language>
-			<language type="sw">Swahili</language>
-			<language type="syc">Classical Syriac</language>
-			<language type="syr">Syriac</language>
-			<language type="ta">Tamil</language>
-			<language type="tai">Tai Language</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tajik</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmen</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">Tamashek</language>
-			<language type="tn">Tswana</language>
-			<language type="to">Tonga</language>
-			<language type="tog">Nyasa Tonga</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Turkish</language>
-			<language type="trv">Taroko</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian</language>
-			<language type="tt">Tatar</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi Language</language>
-			<language type="tut">Altaic Language</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitian</language>
-			<language type="tyv">Tuvinian</language>
-			<language type="udm">Udmurt</language>
-			<language type="ug">Uighur</language>
-			<language type="uga">Ugaritic</language>
-			<language type="uk">Ukrainian</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Unknown or Invalid Language</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbek</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vietnamese</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Votic</language>
-			<language type="wa">Walloon</language>
-			<language type="wak">Wakashan Language</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo</language>
-			<language type="wen">Sorbian Language</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmyk</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao</language>
-			<language type="yap">Yapese</language>
-			<language type="yi">Yiddish</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik Language</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotec</language>
-			<language type="zbl">Blissymbols</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Chinese</language>
-			<language type="zh_Hans">Simplified Chinese</language>
-			<language type="zh_Hant">Traditional Chinese</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">No linguistic content</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabic</script>
-			<script type="Armi">Imperial Aramaic</script>
-			<script type="Armn">Armenian</script>
-			<script type="Avst">Avestan</script>
-			<script type="Bali">Balinese</script>
-			<script type="Batk">Batak</script>
-			<script type="Beng">Bengali</script>
-			<script type="Blis">Blissymbols</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Braille</script>
-			<script type="Bugi">Buginese</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Chakma</script>
-			<script type="Cans">Unified Canadian Aboriginal Syllabics</script>
-			<script type="Cari">Carian</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Coptic</script>
-			<script type="Cprt">Cypriot</script>
-			<script type="Cyrl">Cyrillic</script>
-			<script type="Cyrs">Old Church Slavonic Cyrillic</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Egyptian demotic</script>
-			<script type="Egyh">Egyptian hieratic</script>
-			<script type="Egyp">Egyptian hieroglyphs</script>
-			<script type="Ethi">Ethiopic</script>
-			<script type="Geok">Georgian Khutsuri</script>
-			<script type="Geor">Georgian</script>
-			<script type="Glag">Glagolitic</script>
-			<script type="Goth">Gothic</script>
-			<script type="Grek">Greek</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Simplified Han</script>
-			<script type="Hant">Traditional Han</script>
-			<script type="Hebr">Hebrew</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana or Hiragana</script>
-			<script type="Hung">Old Hungarian</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Old Italic</script>
-			<script type="Java">Javanese</script>
-			<script type="Jpan">Japanese</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Korean</script>
-			<script type="Kthi">Kaithi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Lao</script>
-			<script type="Latf">Fraktur Latin</script>
-			<script type="Latg">Gaelic Latin</script>
-			<script type="Latn">Latin</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Linear A</script>
-			<script type="Linb">Linear B</script>
-			<script type="Lyci">Lycian</script>
-			<script type="Lydi">Lydian</script>
-			<script type="Mand">Mandaean</script>
-			<script type="Mani">Manichaean</script>
-			<script type="Maya">Mayan hieroglyphs</script>
-			<script type="Mero">Meroitic</script>
-			<script type="Mlym">Malayalam</script>
-			<script type="Mong">Mongolian</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Myanmar</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orkhon</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanya</script>
-			<script type="Perm">Old Permic</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Inscriptional Pahlavi</script>
-			<script type="Phlp">Psalter Pahlavi</script>
-			<script type="Phlv">Book Pahlavi</script>
-			<script type="Phnx">Phoenician</script>
-			<script type="Plrd">Pollard Phonetic</script>
-			<script type="Prti">Inscriptional Parthian</script>
-			<script type="Qaai">Inherited</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runic</script>
-			<script type="Samr">Samaritan</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">Shavian</script>
-			<script type="Sinh">Sinhala</script>
-			<script type="Sund">Sundanese</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syriac</script>
-			<script type="Syre">Estrangelo Syriac</script>
-			<script type="Syrj">Western Syriac</script>
-			<script type="Syrn">Eastern Syriac</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">New Tai Lue</script>
-			<script type="Taml">Tamil</script>
-			<script type="Tavt">Tai Viet</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibetan</script>
-			<script type="Ugar">Ugaritic</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Visible Speech</script>
-			<script type="Xpeo">Old Persian</script>
-			<script type="Xsux">Sumero-Akkadian Cuneiform</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Mathematical Notation</script>
-			<script type="Zsym">Symbols</script>
-			<script type="Zxxx">Unwritten</script>
-			<script type="Zyyy">Common</script>
-			<script type="Zzzz">Unknown or Invalid Script</script>
-		</scripts>
-		<territories>
-			<territory type="001">World</territory>
-			<territory type="002">Africa</territory>
-			<territory type="003">North America</territory>
-			<territory type="005">South America</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Western Africa</territory>
-			<territory type="013">Central America</territory>
-			<territory type="014">Eastern Africa</territory>
-			<territory type="015">Northern Africa</territory>
-			<territory type="017">Middle Africa</territory>
-			<territory type="018">Southern Africa</territory>
-			<territory type="019">Americas</territory>
-			<territory type="021">Northern America</territory>
-			<territory type="029">Caribbean</territory>
-			<territory type="030">Eastern Asia</territory>
-			<territory type="034">Southern Asia</territory>
-			<territory type="035">South-Eastern Asia</territory>
-			<territory type="039">Southern Europe</territory>
-			<territory type="053">Australia and New Zealand</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Micronesian Region</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">South-Central Asia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Central Asia</territory>
-			<territory type="145">Western Asia</territory>
-			<territory type="150">Europe</territory>
-			<territory type="151">Eastern Europe</territory>
-			<territory type="154">Northern Europe</territory>
-			<territory type="155">Western Europe</territory>
-			<territory type="172">Commonwealth of Independent States</territory>
-			<territory type="200">Czechoslovakia</territory>
-			<territory type="419">Latin America and the Caribbean</territory>
-			<territory type="830">Channel Islands</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">United Arab Emirates</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua and Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">American Samoa</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…land Islands</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia and Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgium</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BQ">British Antarctic Territory</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet Island</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Cocos [Keeling] Islands</territory>
-			<territory type="CD">Congo - Kinshasa</territory>
-			<territory type="CF">Central African Republic</territory>
-			<territory type="CG">Congo - Brazzaville</territory>
-			<territory type="CH">Switzerland</territory>
-			<territory type="CI">Côte d’Ivoire</territory>
-			<territory type="CK">Cook Islands</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Cameroon</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia and Montenegro</territory>
-			<territory type="CT">Canton and Enderbury Islands</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cape Verde</territory>
-			<territory type="CX">Christmas Island</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Czech Republic</territory>
-			<territory type="DD">East Germany</territory>
-			<territory type="DE">Germany</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Denmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominican Republic</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egypt</territory>
-			<territory type="EH">Western Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spain</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falkland Islands</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Faroe Islands</territory>
-			<territory type="FQ">French Southern and Antarctic Territories</territory>
-			<territory type="FR">France</territory>
-			<territory type="FX">Metropolitan France</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">French Guiana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Greenland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Equatorial Guinea</territory>
-			<territory type="GR">Greece</territory>
-			<territory type="GS">South Georgia and the South Sandwich Islands</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong SAR China</territory>
-			<territory type="HM">Heard Island and McDonald Islands</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungary</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Ireland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">British Indian Ocean Territory</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Iceland</territory>
-			<territory type="IT">Italy</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="JT">Johnston Island</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kyrgyzstan</territory>
-			<territory type="KH">Cambodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts and Nevis</territory>
-			<territory type="KP">North Korea</territory>
-			<territory type="KR">South Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Cayman Islands</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lebanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithuania</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Morocco</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Marshall Islands</territory>
-			<territory type="MI">Midway Islands</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar [Burma]</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macau SAR China</territory>
-			<territory type="MP">Northern Mariana Islands</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">New Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Island</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Netherlands</territory>
-			<territory type="NO">Norway</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NQ">Dronning Maud Land</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NT">Neutral Zone</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PC">Pacific Islands Trust Territory</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">French Polynesia</territory>
-			<territory type="PG">Papua New Guinea</territory>
-			<territory type="PH">Philippines</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poland</territory>
-			<territory type="PM">Saint Pierre and Miquelon</territory>
-			<territory type="PN">Pitcairn Islands</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinian Territories</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PU">U.S. Miscellaneous Pacific Islands</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="PZ">Panama Canal Zone</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Outlying Oceania</territory>
-			<territory type="QU">European Union</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi Arabia</territory>
-			<territory type="SB">Solomon Islands</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard and Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">São Tomé and Príncipe</territory>
-			<territory type="SU">Union of Soviet Socialist Republics</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks and Caicos Islands</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">French Southern Territories</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tajikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor-Leste</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkey</territory>
-			<territory type="TT">Trinidad and Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">U.S. Minor Outlying Islands</territory>
-			<territory type="US">United States</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatican City</territory>
-			<territory type="VC">Saint Vincent and the Grenadines</territory>
-			<territory type="VD">North Vietnam</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">British Virgin Islands</territory>
-			<territory type="VI">U.S. Virgin Islands</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis and Futuna</territory>
-			<territory type="WK">Wake Island</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YD">People's Democratic Republic of Yemen</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">South Africa</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Unknown or Invalid Region</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Traditional German orthography</variant>
-			<variant type="1994">Standardized Resian orthography</variant>
-			<variant type="1996">German orthography of 1996</variant>
-			<variant type="1606NICT">Late Middle French to 1606</variant>
-			<variant type="1694ACAD">Early Modern French</variant>
-			<variant type="1959ACAD">Academic</variant>
-			<variant type="AREVELA">Eastern Armenian</variant>
-			<variant type="AREVMDA">Western Armenian</variant>
-			<variant type="BAKU1926">Unified Turkic Latin Alphabet</variant>
-			<variant type="BISKE">San Giorgio/Bila dialect</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">IPA Phonetics</variant>
-			<variant type="FONUPA">UPA Phonetics</variant>
-			<variant type="KKCOR">Common Orthography</variant>
-			<variant type="LIPAW">The Lipovaz dialect of Resian</variant>
-			<variant type="MONOTON">Monotonic</variant>
-			<variant type="NEDIS">Natisone dialect</variant>
-			<variant type="NJIVA">Gniva/Njiva dialect</variant>
-			<variant type="OSOJS">Oseacco/Osojane dialect</variant>
-			<variant type="PINYIN">Pinyin Romanization</variant>
-			<variant type="POLYTON">Polytonic</variant>
-			<variant type="POSIX">Computer</variant>
-			<variant type="REVISED">Revised Orthography</variant>
-			<variant type="ROZAJ">Resian</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Scottish Standard English</variant>
-			<variant type="SCOUSE">Scouse</variant>
-			<variant type="SOLBA">Stolvizza/Solbica dialect</variant>
-			<variant type="TARASK">Taraskievica orthography</variant>
-			<variant type="UCCOR">Unified Orthography</variant>
-			<variant type="UCRCOR">Unified Revised Orthography</variant>
-			<variant type="VALENCIA">Valencian</variant>
-			<variant type="WADEGILE">Wade-Giles Romanization</variant>
-		</variants>
-		<types>
-			<type type="arab" key="numbers">Arabic-Indic Digits</type>
-			<type type="arabext" key="numbers">Extended Arabic-Indic Digits</type>
-			<type type="armn" key="numbers">Armenian Numerals</type>
-			<type type="armnlow" key="numbers">Armenian Lowercase Numerals</type>
-			<type type="beng" key="numbers">Bengali Digits</type>
-			<type type="big5han" key="collation">Traditional Chinese Sort Order - Big5</type>
-			<type type="buddhist" key="calendar">Buddhist Calendar</type>
-			<type type="chinese" key="calendar">Chinese Calendar</type>
-			<type type="coptic" key="calendar">Coptic Calendar</type>
-			<type type="deva" key="numbers">Devanagari Digits</type>
-			<type type="direct" key="collation">Direct Sort Order</type>
-			<type type="ethi" key="numbers">Ethiopic Numerals</type>
-			<type type="ethiopic" key="calendar">Ethiopic Calendar</type>
-			<type type="ethiopic-amete-alem" key="calendar">Ethiopic Amete Alem Calendar</type>
-			<type type="fullwide" key="numbers">Full Width Digits</type>
-			<type type="gb2312han" key="collation">Simplified Chinese Sort Order - GB2312</type>
-			<type type="geor" key="numbers">Georgian Numerals</type>
-			<type type="gregorian" key="calendar">Gregorian Calendar</type>
-			<type type="grek" key="numbers">Greek Numerals</type>
-			<type type="greklow" key="numbers">Greek Lowercase Numerals</type>
-			<type type="gujr" key="numbers">Gujarati Digits</type>
-			<type type="guru" key="numbers">Gurmukhi Digits</type>
-			<type type="hans" key="numbers">Simplified Chinese Numerals</type>
-			<type type="hansfin" key="numbers">Simplified Chinese Financial Numerals</type>
-			<type type="hant" key="numbers">Traditional Chinese Numerals</type>
-			<type type="hantfin" key="numbers">Traditional Chinese Financial Numerals</type>
-			<type type="hebr" key="numbers">Hebrew Numerals</type>
-			<type type="hebrew" key="calendar">Hebrew Calendar</type>
-			<type type="indian" key="calendar">Indian National Calendar</type>
-			<type type="islamic" key="calendar">Islamic Calendar</type>
-			<type type="islamic-civil" key="calendar">Islamic-Civil Calendar</type>
-			<type type="japanese" key="calendar">Japanese Calendar</type>
-			<type type="jpan" key="numbers">Japanese Numerals</type>
-			<type type="jpanfin" key="numbers">Japanese Financial Numerals</type>
-			<type type="khmr" key="numbers">Khmer Digits</type>
-			<type type="knda" key="numbers">Kannada Digits</type>
-			<type type="laoo" key="numbers">Lao Digits</type>
-			<type type="latn" key="numbers">Western Digits</type>
-			<type type="mlym" key="numbers">Malayalam Digits</type>
-			<type type="mong" key="numbers">Mongolian Digits</type>
-			<type type="mymr" key="numbers">Myanmar Digits</type>
-			<type type="orya" key="numbers">Oriya Digits</type>
-			<type type="persian" key="calendar">Persian Calendar</type>
-			<type type="phonebook" key="collation">Phonebook Sort Order</type>
-			<type type="pinyin" key="collation">Simplified Chinese Pinyin Sort Order</type>
-			<type type="roc" key="calendar">Republic of China Calendar</type>
-			<type type="roman" key="numbers">Roman Numerals</type>
-			<type type="romanlow" key="numbers">Roman Lowercase Numerals</type>
-			<type type="stroke" key="collation">Traditional Chinese Stroke Sort Order</type>
-			<type type="taml" key="numbers">Tamil Numerals</type>
-			<type type="telu" key="numbers">Telugu Digits</type>
-			<type type="thai" key="numbers">Thai Digits</type>
-			<type type="tibt" key="numbers">Tibetan Digits</type>
-			<type type="traditional" key="collation">Traditional Sort Order</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Language: {0}</codePattern>
-			<codePattern type="script">Script: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å ä ã � æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ö ø � œ ß ú ù ŭ û ü ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">May</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Oct</month>
-							<month type="11">Nov</month>
-							<month type="12">Dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">January</month>
-							<month type="2">February</month>
-							<month type="3">March</month>
-							<month type="4">April</month>
-							<month type="5">May</month>
-							<month type="6">June</month>
-							<month type="7">July</month>
-							<month type="8">August</month>
-							<month type="9">September</month>
-							<month type="10">October</month>
-							<month type="11">November</month>
-							<month type="12">December</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sun</day>
-							<day type="mon">Mon</day>
-							<day type="tue">Tue</day>
-							<day type="wed">Wed</day>
-							<day type="thu">Thu</day>
-							<day type="fri">Fri</day>
-							<day type="sat">Sat</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sunday</day>
-							<day type="mon">Monday</day>
-							<day type="tue">Tuesday</day>
-							<day type="wed">Wednesday</day>
-							<day type="thu">Thursday</day>
-							<day type="fri">Friday</day>
-							<day type="sat">Saturday</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">W</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1st quarter</quarter>
-							<quarter type="2">2nd quarter</quarter>
-							<quarter type="3">3rd quarter</quarter>
-							<quarter type="4">4th quarter</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Before Christ</era>
-						<era type="1">Anno Domini</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">B</era>
-						<era type="1">A</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, M/d/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d – M/d</greatestDifference>
-							<greatestDifference id="M">M/d – M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d – E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d – E, M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d–d</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy – M/d/yy</greatestDifference>
-							<greatestDifference id="M">M/d/yy – M/d/yy</greatestDifference>
-							<greatestDifference id="y">M/d/yy – M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/yy – E, M/d/yy</greatestDifference>
-							<greatestDifference id="M">E, M/d/yy – E, M/d/yy</greatestDifference>
-							<greatestDifference id="y">E, M/d/yy – E, M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d–d, y</greatestDifference>
-							<greatestDifference id="M">MMM d – MMM d, y</greatestDifference>
-							<greatestDifference id="y">MMM d, y – MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y – E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Year</displayName>
-					</field>
-					<field type="month">
-						<displayName>Month</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Day</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Day of the Week</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hour</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Second</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} Time</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<long>
-					<daylight>British Summer Time</daylight>
-				</long>
-				<short>
-					<daylight>BST</daylight>
-				</short>
-			</zone>
-			<zone type="Europe/Dublin">
-				<long>
-					<daylight>Irish Summer Time</daylight>
-				</long>
-				<short>
-					<daylight>IST (Irish)</daylight>
-				</short>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre Time</standard>
-					<daylight>Acre Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afghanistan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Central Africa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>East Africa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>South Africa Time</generic>
-					<standard>South Africa Standard Time</standard>
-				</long>
-				<short>
-					<generic>SAT</generic>
-				</short>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>West Africa Time</standard>
-					<daylight>West Africa Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk Time</standard>
-					<daylight>Aktyubinsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska Time</generic>
-					<standard>Alaska Standard Time</standard>
-					<daylight>Alaska Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AKT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii Time</generic>
-					<standard>Alaska-Hawaii Standard Time</standard>
-					<daylight>Alaska-Hawaii Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almaty Time</standard>
-					<daylight>Almaty Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazon Time</standard>
-					<daylight>Amazon Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central Time</generic>
-					<standard>Central Standard Time</standard>
-					<daylight>Central Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Eastern Time</generic>
-					<standard>Eastern Standard Time</standard>
-					<daylight>Eastern Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Mountain Time</generic>
-					<standard>Mountain Standard Time</standard>
-					<daylight>Mountain Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pacific Time</generic>
-					<standard>Pacific Standard Time</standard>
-					<daylight>Pacific Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadyr Time</standard>
-					<daylight>Anadyr Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aqtau Time</standard>
-					<daylight>Aqtau Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aqtobe Time</standard>
-					<daylight>Aqtobe Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabian Time</generic>
-					<standard>Arabian Standard Time</standard>
-					<daylight>Arabian Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AT (Arabian)</generic>
-					<standard>AST (Arabian)</standard>
-					<daylight>ADT (Arabian)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentina Time</standard>
-					<daylight>Argentina Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Western Argentina Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armenia Time</standard>
-					<daylight>Armenia Summer Time</daylight>
-				</long>
-				<short>
-					<standard>AMT (Armenia)</standard>
-					<daylight>AMST (Armenia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashkhabad Time</standard>
-					<daylight>Ashkhabad Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantic Time</generic>
-					<standard>Atlantic Standard Time</standard>
-					<daylight>Atlantic Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Central Australia Time</generic>
-					<standard>Australian Central Standard Time</standard>
-					<daylight>Australian Central Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Australian Central Western Time</generic>
-					<standard>Australian Central Western Standard Time</standard>
-					<daylight>Australian Central Western Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Eastern Australia Time</generic>
-					<standard>Australian Eastern Standard Time</standard>
-					<daylight>Australian Eastern Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AET</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Western Australia Time</generic>
-					<standard>Australian Western Standard Time</standard>
-					<daylight>Australian Western Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Azerbaijan Time</standard>
-					<daylight>Azerbaijan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azores Time</standard>
-					<daylight>Azores Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Baku Time</standard>
-					<daylight>Baku Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladesh Time</standard>
-					<daylight>Bangladesh Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering Time</generic>
-					<standard>Bering Standard Time</standard>
-					<daylight>Bering Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>BT (Bering)</generic>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Bolivia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo Time</standard>
-					<daylight>Borneo Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brasilia Time</standard>
-					<daylight>Brasilia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunei Darussalam Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Cape Verde Time</standard>
-					<daylight>Cape Verde Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Chamorro Time</generic>
-					<standard>Chamorro Standard Time</standard>
-				</long>
-				<short>
-					<generic>ChT</generic>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Chatham Standard Time</standard>
-					<daylight>Chatham Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Chile Time</standard>
-					<daylight>Chile Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>China Time</generic>
-					<standard>China Standard Time</standard>
-					<daylight>China Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>CT (China)</generic>
-					<standard>CST (China)</standard>
-					<daylight>CDT (China)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Choibalsan Time</standard>
-					<daylight>Choibalsan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Christmas Island Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Cocos Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Colombia Time</standard>
-					<daylight>Colombia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Cook Islands Time</standard>
-					<daylight>Cook Islands Half Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Cuba Time</generic>
-					<standard>Cuba Standard Time</standard>
-					<daylight>Cuba Daylight Time</daylight>
-				</long>
-				<short>
-					<standard>CST (Cuba)</standard>
-					<daylight>CDT (Cuba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dacca Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Davis Time</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dumont-d'Urville Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dushanbe Time</standard>
-					<daylight>Dushanbe Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Dutch Guiana Time</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>East Timor Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Easter Island Time</standard>
-					<daylight>Easter Island Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ecuador Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Central European Time</standard>
-					<daylight>Central European Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Eastern European Time</standard>
-					<daylight>Eastern European Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Western European Time</standard>
-					<daylight>Western European Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Falkland Islands Time</standard>
-					<daylight>Falkland Islands Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Fiji Time</standard>
-					<daylight>Fiji Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>French Guiana Time</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>French Southern and Antarctic Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze Time</standard>
-					<daylight>Frunze Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagos Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Gambier Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Georgia Time</standard>
-					<daylight>Georgia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Gilbert Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich Mean Time</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Central Greenland Time</standard>
-					<daylight>Central Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>East Greenland Time</standard>
-					<daylight>East Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>West Greenland Time</standard>
-					<daylight>West Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guam Standard Time</standard>
-				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Gulf Time</generic>
-					<standard>Gulf Standard Time</standard>
-				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Guyana Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Hawaii-Aleutian Standard Time</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hong Kong Time</standard>
-					<daylight>Hong Kong Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hovd Time</standard>
-					<daylight>Hovd Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>India Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Indian Ocean Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Indochina Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Central Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Eastern Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Western Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Iran Standard Time</standard>
-					<daylight>Iran Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Irkutsk Time</standard>
-					<daylight>Irkutsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Israel Time</generic>
-					<standard>Israel Standard Time</standard>
-					<daylight>Israel Daylight Time</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japan Time</generic>
-					<standard>Japan Standard Time</standard>
-					<daylight>Japan Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>JT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Petropavlovsk-Kamchatski Time</standard>
-					<daylight>Petropavlovsk-Kamchatski Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karachi Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kashgar Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>East Kazakhstan Time</generic>
-					<standard>East Kazakhstan Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>West Kazakhstan Time</generic>
-					<standard>West Kazakhstan Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilorda Time</standard>
-					<daylight>Kizilorda Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Korean Time</generic>
-					<standard>Korean Standard Time</standard>
-					<daylight>Korean Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Kosrae Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasnoyarsk Time</standard>
-					<daylight>Krasnoyarsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuybyshev Time</standard>
-					<daylight>Kuybyshev Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajalein Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kyrgystan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lanka Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Line Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howe Time</generic>
-					<standard>Lord Howe Standard Time</standard>
-					<daylight>Lord Howe Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Macau Time</standard>
-					<daylight>Macau Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Magadan Time</standard>
-					<daylight>Magadan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaya Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Malaysia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Maldives Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Marquesas Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Marshall Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauritius Time</standard>
-					<daylight>Mauritius Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Mawson Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulan Bator Time</standard>
-					<daylight>Ulan Bator Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moscow Time</generic>
-					<standard>Moscow Standard Time</standard>
-					<daylight>Moscow Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Myanmar Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Nauru Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepal Time</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>New Caledonia Time</standard>
-					<daylight>New Caledonia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>New Zealand Time</generic>
-					<standard>New Zealand Standard Time</standard>
-					<daylight>New Zealand Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Newfoundland Time</generic>
-					<standard>Newfoundland Standard Time</standard>
-					<daylight>Newfoundland Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>NT</generic>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Niue Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Norfolk Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronha Time</standard>
-					<daylight>Fernando de Noronha Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>North Mariana Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novosibirsk Time</standard>
-					<daylight>Novosibirsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omsk Time</standard>
-					<daylight>Omsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistan Time</standard>
-					<daylight>Pakistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Palau Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Papua New Guinea Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paraguay Time</standard>
-					<daylight>Paraguay Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peru Time</standard>
-					<daylight>Peru Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Philippine Time</standard>
-					<daylight>Philippine Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Phoenix Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre and Miquelon Time</generic>
-					<standard>Pierre and Miquelon Standard Time</standard>
-					<daylight>Pierre and Miquelon Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>PMT</generic>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Pitcairn Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Ponape Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Qyzylorda Time</standard>
-					<daylight>Qyzylorda Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Reunion Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Rothera Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sakhalin Time</standard>
-					<daylight>Sakhalin Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara Time</standard>
-					<daylight>Samara Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Samarkand Time</standard>
-					<daylight>Samarkand Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Samoa Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Seychelles Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Shevchenko Time</standard>
-					<daylight>Shevchenko Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Singapore Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Solomon Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>South Georgia Time</standard>
-				</long>
-				<short>
-					<standard>GST (S. Georgia)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Suriname Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk Time</standard>
-					<daylight>Sverdlovsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Syowa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Tahiti Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Taipei">
-				<long>
-					<generic>Taipei Time</generic>
-					<standard>Taipei Standard Time</standard>
-					<daylight>Taipei Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>CT (Taipei)</generic>
-					<standard>CST (Taipei)</standard>
-					<daylight>CDT (Taipei)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tajikistan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Tashkent Time</standard>
-					<daylight>Tashkent Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisi Time</standard>
-					<daylight>Tbilisi Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Tokelau Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Tonga Time</standard>
-					<daylight>Tonga Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Truk Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turkey Time</standard>
-					<daylight>Turkey Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Turkmenistan Time</standard>
-					<daylight>Turkmenistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Tuvalu Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Ural'sk Time</standard>
-					<daylight>Ural'sk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Uruguay Time</standard>
-					<daylight>Uruguay Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumqi Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Uzbekistan Time</standard>
-					<daylight>Uzbekistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Vanuatu Time</standard>
-					<daylight>Vanuatu Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venezuela Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vladivostok Time</standard>
-					<daylight>Vladivostok Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgograd Time</standard>
-					<daylight>Volgograd Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vostok Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Wake Island Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Wallis and Futuna Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Yakutsk Time</standard>
-					<daylight>Yakutsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Yekaterinburg Time</standard>
-					<daylight>Yekaterinburg Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Yerevan Time</standard>
-					<daylight>Yerevan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon Time</generic>
-					<standard>Yukon Standard Time</standard>
-					<daylight>Yukon Daylight Time</daylight>
-				</long>
-				<short>
-					<generic>YT</generic>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorran Peseta</displayName>
-				<displayName count="one">Andorran peseta</displayName>
-				<displayName count="other">Andorran pesetas</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>United Arab Emirates Dirham</displayName>
-				<displayName count="one">UAE dirham</displayName>
-				<displayName count="other">UAE dirhams</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghan Afghani (1927-2002)</displayName>
-				<displayName count="one">Afghan Afghani (AFA)</displayName>
-				<displayName count="other">Afghan Afghanis (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghan Afghani</displayName>
-				<displayName count="one">Afghan Afghani</displayName>
-				<displayName count="other">Afghan Afghanis</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albanian Lek</displayName>
-				<displayName count="one">Albanian lek</displayName>
-				<displayName count="other">Albanian lekë</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armenian Dram</displayName>
-				<displayName count="one">Armenian dram</displayName>
-				<displayName count="other">Armenian drams</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Netherlands Antillean Guilder</displayName>
-				<displayName count="one">Netherlands Antillean guilder</displayName>
-				<displayName count="other">Netherlands Antillean guilders</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolan Kwanza</displayName>
-				<displayName count="one">Angolan kwanza</displayName>
-				<displayName count="other">Angolan kwanzas</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolan Kwanza (1977-1990)</displayName>
-				<displayName count="one">Angolan kwanza (AOK)</displayName>
-				<displayName count="other">Angolan kwanzas (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolan New Kwanza (1990-2000)</displayName>
-				<displayName count="one">Angolan new kwanza (AON)</displayName>
-				<displayName count="other">Angolan new kwanzas (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolan Kwanza Reajustado (1995-1999)</displayName>
-				<displayName count="one">Angolan kwanza reajustado (AOR)</displayName>
-				<displayName count="other">Angolan kwanzas reajustado (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentine Austral</displayName>
-				<displayName count="one">Argentine austral</displayName>
-				<displayName count="other">Argentine australs</displayName>
-			</currency>
-			<currency type="ARL">
-				<displayName>Argentine Peso Ley</displayName>
-				<displayName count="one">Argentine peso ley</displayName>
-				<displayName count="other">Argentine pesos ley</displayName>
-			</currency>
-			<currency type="ARM">
-				<displayName>Argentine Peso Moneda Nacional</displayName>
-				<displayName count="one">Argentine peso moneda nacional</displayName>
-				<displayName count="other">Argentine pesos moneda nacional</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentine Peso (1983-1985)</displayName>
-				<displayName count="one">Argentine peso (ARP)</displayName>
-				<displayName count="other">Argentine pesos (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentine Peso</displayName>
-				<displayName count="one">Argentine peso</displayName>
-				<displayName count="other">Argentine pesos</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austrian Schilling</displayName>
-				<displayName count="one">Austrian schilling</displayName>
-				<displayName count="other">Austrian schillings</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australian Dollar</displayName>
-				<displayName count="one">Australian dollar</displayName>
-				<displayName count="other">Australian dollars</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruban Florin</displayName>
-				<displayName count="one">Aruban florin</displayName>
-				<displayName count="other">Aruban florin</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbaijani Manat (1993-2006)</displayName>
-				<displayName count="one">Azerbaijani manat (AZM)</displayName>
-				<displayName count="other">Azerbaijani manats (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbaijani Manat</displayName>
-				<displayName count="one">Azerbaijani manat</displayName>
-				<displayName count="other">Azerbaijani manats</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnia-Herzegovina Dinar</displayName>
-				<displayName count="one">Bosnia-Herzegovina dinar</displayName>
-				<displayName count="other">Bosnia-Herzegovina dinars</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnia-Herzegovina Convertible Mark</displayName>
-				<displayName count="one">Bosnia-Herzegovina convertible mark</displayName>
-				<displayName count="other">Bosnia-Herzegovina convertible marks</displayName>
-			</currency>
-			<currency type="BAN">
-				<displayName>Bosnia-Herzegovina New Dinar</displayName>
-				<displayName count="one">Bosnia-Herzegovina new dinar</displayName>
-				<displayName count="other">Bosnia-Herzegovina new dinars</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadian Dollar</displayName>
-				<displayName count="one">Barbadian dollar</displayName>
-				<displayName count="other">Barbadian dollars</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeshi Taka</displayName>
-				<displayName count="one">Bangladeshi taka</displayName>
-				<displayName count="other">Bangladeshi takas</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgian Franc (convertible)</displayName>
-				<displayName count="one">Belgian franc (convertible)</displayName>
-				<displayName count="other">Belgian francs (convertible)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgian Franc</displayName>
-				<displayName count="one">Belgian franc</displayName>
-				<displayName count="other">Belgian francs</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgian Franc (financial)</displayName>
-				<displayName count="one">Belgian franc (financial)</displayName>
-				<displayName count="other">Belgian francs (financial)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgarian Hard Lev</displayName>
-				<displayName count="one">Bulgarian hard lev</displayName>
-				<displayName count="other">Bulgarian hard leva</displayName>
-			</currency>
-			<currency type="BGM">
-				<displayName>Bulgarian Socialist Lev</displayName>
-				<displayName count="one">Bulgarian socialist lev</displayName>
-				<displayName count="other">Bulgarian socialist leva</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgarian Lev</displayName>
-				<displayName count="one">Bulgarian lev</displayName>
-				<displayName count="other">Bulgarian leva</displayName>
-			</currency>
-			<currency type="BGO">
-				<displayName>Old Bulgarian Lev</displayName>
-				<displayName count="one">Old Bulgarian lev</displayName>
-				<displayName count="other">Old Bulgarian leva</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahraini Dinar</displayName>
-				<displayName count="one">Bahraini dinar</displayName>
-				<displayName count="other">Bahraini dinars</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundian Franc</displayName>
-				<displayName count="one">Burundian franc</displayName>
-				<displayName count="other">Burundian francs</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudan Dollar</displayName>
-				<displayName count="one">Bermudan dollar</displayName>
-				<displayName count="other">Bermudan dollars</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei Dollar</displayName>
-				<displayName count="one">Brunei dollar</displayName>
-				<displayName count="other">Brunei dollars</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivian Boliviano</displayName>
-				<displayName count="one">Bolivian boliviano</displayName>
-				<displayName count="other">Bolivian bolivianos</displayName>
-			</currency>
-			<currency type="BOL">
-				<displayName>Old Bolivian Boliviano</displayName>
-				<displayName count="one">Old Bolivian boliviano</displayName>
-				<displayName count="other">Old Bolivian bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivian Peso</displayName>
-				<displayName count="one">Bolivian peso</displayName>
-				<displayName count="other">Bolivian pesos</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivian Mvdol</displayName>
-				<displayName count="one">Bolivian mvdol</displayName>
-				<displayName count="other">Bolivian mvdols</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brazilian Cruzeiro Novo (1967-1986)</displayName>
-				<displayName count="one">Brazilian cruzeiro novo (BRB)</displayName>
-				<displayName count="other">Brazilian cruzeiros novo (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brazilian Cruzado</displayName>
-				<displayName count="one">Brazilian cruzado</displayName>
-				<displayName count="other">Brazilian cruzados</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brazilian Cruzeiro (1990-1993)</displayName>
-				<displayName count="one">Brazilian cruzeiro (BRE)</displayName>
-				<displayName count="other">Brazilian cruzeiros (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-				<displayName count="one">Brazilian real</displayName>
-				<displayName count="other">Brazilian reals</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brazilian Cruzado Novo</displayName>
-				<displayName count="one">Brazilian cruzado novo</displayName>
-				<displayName count="other">Brazilian cruzado novos</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brazilian Cruzeiro</displayName>
-				<displayName count="one">Brazilian cruzeiro</displayName>
-				<displayName count="other">Brazilian cruzeiros</displayName>
-			</currency>
-			<currency type="BRZ">
-				<displayName>Old Brazilian Cruzeiro</displayName>
-				<displayName count="one">Old Brazilian cruzeiro</displayName>
-				<displayName count="other">Old Brazilian cruzeiros</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamian Dollar</displayName>
-				<displayName count="one">Bahamian dollar</displayName>
-				<displayName count="other">Bahamian dollars</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutanese Ngultrum</displayName>
-				<displayName count="one">Bhutanese ngultrum</displayName>
-				<displayName count="other">Bhutanese ngultrums</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmese Kyat</displayName>
-				<displayName count="one">Burmese kyat</displayName>
-				<displayName count="other">Burmese kyats</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswanan Pula</displayName>
-				<displayName count="one">Botswanan pula</displayName>
-				<displayName count="other">Botswanan pulas</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Belarusian New Ruble (1994-1999)</displayName>
-				<displayName count="one">Belarusian new ruble (BYB)</displayName>
-				<displayName count="other">Belarusian new rubles (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Belarusian Ruble</displayName>
-				<displayName count="one">Belarusian ruble</displayName>
-				<displayName count="other">Belarusian rubles</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize Dollar</displayName>
-				<displayName count="one">Belize dollar</displayName>
-				<displayName count="other">Belize dollars</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Canadian Dollar</displayName>
-				<displayName count="one">Canadian dollar</displayName>
-				<displayName count="other">Canadian dollars</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Congolese Franc</displayName>
-				<displayName count="one">Congolese franc</displayName>
-				<displayName count="other">Congolese francs</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR Euro</displayName>
-				<displayName count="one">WIR euro</displayName>
-				<displayName count="other">WIR euros</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Swiss Franc</displayName>
-				<displayName count="one">Swiss franc</displayName>
-				<displayName count="other">Swiss francs</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR Franc</displayName>
-				<displayName count="one">WIR franc</displayName>
-				<displayName count="other">WIR francs</displayName>
-			</currency>
-			<currency type="CLE">
-				<displayName>Chilean Escudo</displayName>
-				<displayName count="one">Chilean escudo</displayName>
-				<displayName count="other">Chilean escudos</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilean Unidades de Fomento</displayName>
-				<displayName count="one">Chilean unidades de fomento</displayName>
-				<displayName count="other">Chilean unidades de fomentos</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilean Peso</displayName>
-				<displayName count="one">Chilean peso</displayName>
-				<displayName count="other">Chilean pesos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Chinese Yuan Renminbi</displayName>
-				<displayName count="one">Chinese yuan</displayName>
-				<displayName count="other">Chinese yuan</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Colombian Peso</displayName>
-				<displayName count="one">Colombian peso</displayName>
-				<displayName count="other">Colombian pesos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor reals</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costa Rican Colón</displayName>
-				<displayName count="one">Costa Rican colón</displayName>
-				<displayName count="other">Costa Rican colóns</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Old Serbian Dinar</displayName>
-				<displayName count="one">Old Serbian dinar</displayName>
-				<displayName count="other">Old Serbian dinars</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Czechoslovak Hard Koruna</displayName>
-				<displayName count="one">Czechoslovak hard koruna</displayName>
-				<displayName count="other">Czechoslovak hard korunas</displayName>
-			</currency>
-			<currency type="CUC">
-				<displayName>Cuban Convertible Peso</displayName>
-				<displayName count="one">Cuban convertible peso</displayName>
-				<displayName count="other">Cuban convertible pesos</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Cuban Peso</displayName>
-				<displayName count="one">Cuban peso</displayName>
-				<displayName count="other">Cuban pesos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Cape Verdean Escudo</displayName>
-				<displayName count="one">Cape Verdean escudo</displayName>
-				<displayName count="other">Cape Verdean escudos</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Cypriot Pound</displayName>
-				<displayName count="one">Cypriot pound</displayName>
-				<displayName count="other">Cypriot pounds</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Czech Republic Koruna</displayName>
-				<displayName count="one">Czech Republic koruna</displayName>
-				<displayName count="other">Czech Republic korunas</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>East German Mark</displayName>
-				<displayName count="one">East German mark</displayName>
-				<displayName count="other">East German marks</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>German Mark</displayName>
-				<displayName count="one">German mark</displayName>
-				<displayName count="other">German marks</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Djiboutian Franc</displayName>
-				<displayName count="one">Djiboutian franc</displayName>
-				<displayName count="other">Djiboutian francs</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Danish Krone</displayName>
-				<displayName count="one">Danish krone</displayName>
-				<displayName count="other">Danish kroner</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominican Peso</displayName>
-				<displayName count="one">Dominican peso</displayName>
-				<displayName count="other">Dominican pesos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algerian Dinar</displayName>
-				<displayName count="one">Algerian dinar</displayName>
-				<displayName count="other">Algerian dinars</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadorian Sucre</displayName>
-				<displayName count="one">Ecuadorian sucre</displayName>
-				<displayName count="other">Ecuadorian sucres</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuadorian Unidad de Valor Constante (UVC)</displayName>
-				<displayName count="one">Ecuadorian unidad de valor Constante (UVC)</displayName>
-				<displayName count="other">Ecuadorian unidads de valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estonian Kroon</displayName>
-				<displayName count="one">Estonian kroon</displayName>
-				<displayName count="other">Estonian kroons</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptian Pound</displayName>
-				<displayName count="one">Egyptian pound</displayName>
-				<displayName count="other">Egyptian pounds</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritrean Nakfa</displayName>
-				<displayName count="one">Eritrean nakfa</displayName>
-				<displayName count="other">Eritrean nakfas</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Spanish Peseta (A account)</displayName>
-				<displayName count="one">Spanish peseta (A account)</displayName>
-				<displayName count="other">Spanish pesetas (A account)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Spanish Peseta (convertible account)</displayName>
-				<displayName count="one">Spanish peseta (convertible account)</displayName>
-				<displayName count="other">Spanish pesetas (convertible account)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spanish Peseta</displayName>
-				<displayName count="one">Spanish peseta</displayName>
-				<displayName count="other">Spanish pesetas</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Ethiopian Birr</displayName>
-				<displayName count="one">Ethiopian birr</displayName>
-				<displayName count="other">Ethiopian birrs</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finnish Markka</displayName>
-				<displayName count="one">Finnish markka</displayName>
-				<displayName count="other">Finnish markkas</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fijian Dollar</displayName>
-				<displayName count="one">Fijian dollar</displayName>
-				<displayName count="other">Fijian dollars</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland Islands Pound</displayName>
-				<displayName count="one">Falkland Islands pound</displayName>
-				<displayName count="other">Falkland Islands pounds</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>French Franc</displayName>
-				<displayName count="one">French franc</displayName>
-				<displayName count="other">French francs</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>British Pound Sterling</displayName>
-				<displayName count="one">British pound sterling</displayName>
-				<displayName count="other">British pound sterlings</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgian Kupon Larit</displayName>
-				<displayName count="one">Georgian kupon larit</displayName>
-				<displayName count="other">Georgian kupon larits</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgian Lari</displayName>
-				<displayName count="one">Georgian lari</displayName>
-				<displayName count="other">Georgian laris</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanaian Cedi (1979-2007)</displayName>
-				<displayName count="one">Ghanaian cedi (GHC)</displayName>
-				<displayName count="other">Ghanaian cedis (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanaian Cedi</displayName>
-				<displayName count="one">Ghanaian cedi</displayName>
-				<displayName count="other">Ghanaian cedis</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltar Pound</displayName>
-				<displayName count="one">Gibraltar pound</displayName>
-				<displayName count="other">Gibraltar pounds</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambian Dalasi</displayName>
-				<displayName count="one">Gambian dalasi</displayName>
-				<displayName count="other">Gambian dalasis</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinean Franc</displayName>
-				<displayName count="one">Guinean franc</displayName>
-				<displayName count="other">Guinean francs</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinean Syli</displayName>
-				<displayName count="one">Guinean syli</displayName>
-				<displayName count="other">Guinean sylis</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Equatorial Guinean Ekwele</displayName>
-				<displayName count="one">Equatorial Guinean ekwele</displayName>
-				<displayName count="other">Equatorial Guinean ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Greek Drachma</displayName>
-				<displayName count="one">Greek drachma</displayName>
-				<displayName count="other">Greek drachmas</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalan Quetzal</displayName>
-				<displayName count="one">Guatemalan quetzal</displayName>
-				<displayName count="other">Guatemalan quetzals</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portuguese Guinea Escudo</displayName>
-				<displayName count="one">Portuguese Guinea escudo</displayName>
-				<displayName count="other">Portuguese Guinea escudos</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau Peso</displayName>
-				<displayName count="one">Guinea-Bissau peso</displayName>
-				<displayName count="other">Guinea-Bissau pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyanaese Dollar</displayName>
-				<displayName count="one">Guyanaese dollar</displayName>
-				<displayName count="other">Guyanaese dollars</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hong Kong Dollar</displayName>
-				<displayName count="one">Hong Kong dollar</displayName>
-				<displayName count="other">Hong Kong dollars</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduran Lempira</displayName>
-				<displayName count="one">Honduran lempira</displayName>
-				<displayName count="other">Honduran lempiras</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Croatian Dinar</displayName>
-				<displayName count="one">Croatian dinar</displayName>
-				<displayName count="other">Croatian dinars</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Croatian Kuna</displayName>
-				<displayName count="one">Croatian kuna</displayName>
-				<displayName count="other">Croatian kunas</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haitian Gourde</displayName>
-				<displayName count="one">Haitian gourde</displayName>
-				<displayName count="other">Haitian gourdes</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Hungarian Forint</displayName>
-				<displayName count="one">Hungarian forint</displayName>
-				<displayName count="other">Hungarian forints</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonesian Rupiah</displayName>
-				<displayName count="one">Indonesian rupiah</displayName>
-				<displayName count="other">Indonesian rupiahs</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Irish Pound</displayName>
-				<displayName count="one">Irish pound</displayName>
-				<displayName count="other">Irish pounds</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israeli Pound</displayName>
-				<displayName count="one">Israeli pound</displayName>
-				<displayName count="other">Israeli pounds</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>Old Israeli Sheqel</displayName>
-				<displayName count="one">Old Israeli sheqel</displayName>
-				<displayName count="other">Old Israeli sheqels</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Israeli New Sheqel</displayName>
-				<displayName count="one">Israeli new sheqel</displayName>
-				<displayName count="other">Israeli new sheqels</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indian Rupee</displayName>
-				<displayName count="one">Indian rupee</displayName>
-				<displayName count="other">Indian rupees</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Iraqi Dinar</displayName>
-				<displayName count="one">Iraqi dinar</displayName>
-				<displayName count="other">Iraqi dinars</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iranian Rial</displayName>
-				<displayName count="one">Iranian rial</displayName>
-				<displayName count="other">Iranian rials</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>Old Icelandic Króna</displayName>
-				<displayName count="one">Old Icelandic króna</displayName>
-				<displayName count="other">Old Icelandic krónur</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Icelandic Króna</displayName>
-				<displayName count="one">Icelandic króna</displayName>
-				<displayName count="other">Icelandic krónur</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italian Lira</displayName>
-				<displayName count="one">Italian lira</displayName>
-				<displayName count="other">Italian liras</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaican Dollar</displayName>
-				<displayName count="one">Jamaican dollar</displayName>
-				<displayName count="other">Jamaican dollars</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordanian Dinar</displayName>
-				<displayName count="one">Jordanian dinar</displayName>
-				<displayName count="other">Jordanian dinars</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanese Yen</displayName>
-				<displayName count="one">Japanese yen</displayName>
-				<displayName count="other">Japanese yen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenyan Shilling</displayName>
-				<displayName count="one">Kenyan shilling</displayName>
-				<displayName count="other">Kenyan shillings</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kyrgystani Som</displayName>
-				<displayName count="one">Kyrgystani som</displayName>
-				<displayName count="other">Kyrgystani soms</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Cambodian Riel</displayName>
-				<displayName count="one">Cambodian riel</displayName>
-				<displayName count="other">Cambodian riels</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Comorian Franc</displayName>
-				<displayName count="one">Comorian franc</displayName>
-				<displayName count="other">Comorian francs</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>North Korean Won</displayName>
-				<displayName count="one">North Korean won</displayName>
-				<displayName count="other">North Korean won</displayName>
-			</currency>
-			<currency type="KRH">
-				<displayName>South Korean Hwan</displayName>
-				<displayName count="one">South Korean hwan</displayName>
-				<displayName count="other">South Korean hwan</displayName>
-			</currency>
-			<currency type="KRO">
-				<displayName>Old South Korean Won</displayName>
-				<displayName count="one">Old South Korean won</displayName>
-				<displayName count="other">Old South Korean won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>South Korean Won</displayName>
-				<displayName count="one">South Korean won</displayName>
-				<displayName count="other">South Korean won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuwaiti Dinar</displayName>
-				<displayName count="one">Kuwaiti dinar</displayName>
-				<displayName count="other">Kuwaiti dinars</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Cayman Islands Dollar</displayName>
-				<displayName count="one">Cayman Islands dollar</displayName>
-				<displayName count="other">Cayman Islands dollars</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazakhstan Tenge</displayName>
-				<displayName count="one">Kazakhstan tenge</displayName>
-				<displayName count="other">Kazakhstan tenges</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laotian Kip</displayName>
-				<displayName count="one">Laotian kip</displayName>
-				<displayName count="other">Laotian kips</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Lebanese Pound</displayName>
-				<displayName count="one">Lebanese pound</displayName>
-				<displayName count="other">Lebanese pounds</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri Lanka Rupee</displayName>
-				<displayName count="one">Sri Lanka rupee</displayName>
-				<displayName count="other">Sri Lanka rupees</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberian Dollar</displayName>
-				<displayName count="one">Liberian dollar</displayName>
-				<displayName count="other">Liberian dollars</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesotho Loti</displayName>
-				<displayName count="one">Lesotho loti</displayName>
-				<displayName count="other">Lesotho lotis</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lithuanian Litas</displayName>
-				<displayName count="one">Lithuanian litas</displayName>
-				<displayName count="other">Lithuanian litai</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Lithuanian Talonas</displayName>
-				<displayName count="one">Lithuanian talonas</displayName>
-				<displayName count="other">Lithuanian talonases</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxembourgian Convertible Franc</displayName>
-				<displayName count="one">Luxembourgian convertible franc</displayName>
-				<displayName count="other">Luxembourgian convertible francs</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxembourgian Franc</displayName>
-				<displayName count="one">Luxembourgian franc</displayName>
-				<displayName count="other">Luxembourgian francs</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxembourg Financial Franc</displayName>
-				<displayName count="one">Luxembourg financial franc</displayName>
-				<displayName count="other">Luxembourg financial francs</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latvian Lats</displayName>
-				<displayName count="one">Latvian lats</displayName>
-				<displayName count="other">Latvian lati</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvian Ruble</displayName>
-				<displayName count="one">Latvian ruble</displayName>
-				<displayName count="other">Latvian rubles</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libyan Dinar</displayName>
-				<displayName count="one">Libyan dinar</displayName>
-				<displayName count="other">Libyan dinars</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Moroccan Dirham</displayName>
-				<displayName count="one">Moroccan dirham</displayName>
-				<displayName count="other">Moroccan dirhams</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Moroccan Franc</displayName>
-				<displayName count="one">Moroccan franc</displayName>
-				<displayName count="other">Moroccan francs</displayName>
-			</currency>
-			<currency type="MCF">
-				<displayName>Monegasque Franc</displayName>
-				<displayName count="one">Monegasque franc</displayName>
-				<displayName count="other">Monegasque francs</displayName>
-			</currency>
-			<currency type="MDC">
-				<displayName>Moldovan Cupon</displayName>
-				<displayName count="one">Moldovan cupon</displayName>
-				<displayName count="other">Moldovan cupon</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovan Leu</displayName>
-				<displayName count="one">Moldovan leu</displayName>
-				<displayName count="other">Moldovan lei</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Malagasy Ariary</displayName>
-				<displayName count="one">Malagasy Ariary</displayName>
-				<displayName count="other">Malagasy Ariaries</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Malagasy Franc</displayName>
-				<displayName count="one">Malagasy franc</displayName>
-				<displayName count="other">Malagasy francs</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Macedonian Denar</displayName>
-				<displayName count="one">Macedonian denar</displayName>
-				<displayName count="other">Macedonian denari</displayName>
-			</currency>
-			<currency type="MKN">
-				<displayName>Old Macedonian Denar</displayName>
-				<displayName count="one">Old Macedonian denar</displayName>
-				<displayName count="other">Old Macedonian denari</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malian Franc</displayName>
-				<displayName count="one">Malian franc</displayName>
-				<displayName count="other">Malian francs</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanma Kyat</displayName>
-				<displayName count="one">Myanma kyat</displayName>
-				<displayName count="other">Myanma kyats</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolian Tugrik</displayName>
-				<displayName count="one">Mongolian tugrik</displayName>
-				<displayName count="other">Mongolian tugriks</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macanese Pataca</displayName>
-				<displayName count="one">Macanese pataca</displayName>
-				<displayName count="other">Macanese patacas</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritanian Ouguiya</displayName>
-				<displayName count="one">Mauritanian ouguiya</displayName>
-				<displayName count="other">Mauritanian ouguiyas</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltese Lira</displayName>
-				<displayName count="one">Maltese lira</displayName>
-				<displayName count="other">Maltese lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltese Pound</displayName>
-				<displayName count="one">Maltese pound</displayName>
-				<displayName count="other">Maltese pounds</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritian Rupee</displayName>
-				<displayName count="one">Mauritian rupee</displayName>
-				<displayName count="other">Mauritian rupees</displayName>
-			</currency>
-			<currency type="MVP">
-				<displayName>Maldivian Rupee</displayName>
-				<displayName count="one">Maldivian rupee</displayName>
-				<displayName count="other">Maldivian rupees</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldivian Rufiyaa</displayName>
-				<displayName count="one">Maldivian rufiyaa</displayName>
-				<displayName count="other">Maldivian rufiyaas</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawian Kwacha</displayName>
-				<displayName count="one">Malawian Kwacha</displayName>
-				<displayName count="other">Malawian Kwachas</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexican Peso</displayName>
-				<displayName count="one">Mexican peso</displayName>
-				<displayName count="other">Mexican pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexican Silver Peso (1861-1992)</displayName>
-				<displayName count="one">Mexican silver peso (MXP)</displayName>
-				<displayName count="other">Mexican silver pesos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexican Unidad de Inversion (UDI)</displayName>
-				<displayName count="one">Mexican unidad de inversion (UDI)</displayName>
-				<displayName count="other">Mexican unidads de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysian Ringgit</displayName>
-				<displayName count="one">Malaysian ringgit</displayName>
-				<displayName count="other">Malaysian ringgits</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambican Escudo</displayName>
-				<displayName count="one">Mozambican escudo</displayName>
-				<displayName count="other">Mozambican escudos</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Old Mozambican Metical</displayName>
-				<displayName count="one">Old Mozambican metical</displayName>
-				<displayName count="other">Old Mozambican meticals</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambican Metical</displayName>
-				<displayName count="one">Mozambican metical</displayName>
-				<displayName count="other">Mozambican meticals</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibian Dollar</displayName>
-				<displayName count="one">Namibian dollar</displayName>
-				<displayName count="other">Namibian dollars</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerian Naira</displayName>
-				<displayName count="one">Nigerian naira</displayName>
-				<displayName count="other">Nigerian nairas</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nicaraguan Cordoba</displayName>
-				<displayName count="one">Nicaraguan cordoba</displayName>
-				<displayName count="other">Nicaraguan cordobas</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nicaraguan Cordoba Oro</displayName>
-				<displayName count="one">Nicaraguan cordoba oro</displayName>
-				<displayName count="other">Nicaraguan cordobas oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Dutch Guilder</displayName>
-				<displayName count="one">Dutch guilder</displayName>
-				<displayName count="other">Dutch guilders</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norwegian Krone</displayName>
-				<displayName count="one">Norwegian krone</displayName>
-				<displayName count="other">Norwegian kroner</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalese Rupee</displayName>
-				<displayName count="one">Nepalese rupee</displayName>
-				<displayName count="other">Nepalese rupees</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>New Zealand Dollar</displayName>
-				<displayName count="one">New Zealand dollar</displayName>
-				<displayName count="other">New Zealand dollars</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omani Rial</displayName>
-				<displayName count="one">Omani rial</displayName>
-				<displayName count="other">Omani rials</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamanian Balboa</displayName>
-				<displayName count="one">Panamanian balboa</displayName>
-				<displayName count="other">Panamanian balboas</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruvian Inti</displayName>
-				<displayName count="one">Peruvian inti</displayName>
-				<displayName count="other">Peruvian intis</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruvian Nuevo Sol</displayName>
-				<displayName count="one">Peruvian nuevo sol</displayName>
-				<displayName count="other">Peruvian nuevos soles</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruvian Sol</displayName>
-				<displayName count="one">Peruvian sol</displayName>
-				<displayName count="other">Peruvian soles</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua New Guinean Kina</displayName>
-				<displayName count="one">Papua New Guinean kina</displayName>
-				<displayName count="other">Papua New Guinean kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Philippine Peso</displayName>
-				<displayName count="one">Philippine peso</displayName>
-				<displayName count="other">Philippine pesos</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistani Rupee</displayName>
-				<displayName count="one">Pakistani rupee</displayName>
-				<displayName count="other">Pakistani rupees</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polish Zloty</displayName>
-				<displayName count="one">Polish zloty</displayName>
-				<displayName count="other">Polish zlotys</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Polish Zloty (1950-1995)</displayName>
-				<displayName count="one">Polish zloty (PLZ)</displayName>
-				<displayName count="other">Polish zlotys (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portuguese Escudo</displayName>
-				<displayName count="one">Portuguese escudo</displayName>
-				<displayName count="other">Portuguese escudos</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguayan Guarani</displayName>
-				<displayName count="one">Paraguayan guarani</displayName>
-				<displayName count="other">Paraguayan guaranis</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatari Rial</displayName>
-				<displayName count="one">Qatari rial</displayName>
-				<displayName count="other">Qatari rials</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rhodesian Dollar</displayName>
-				<displayName count="one">Rhodesian dollar</displayName>
-				<displayName count="other">Rhodesian dollars</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Old Romanian Leu</displayName>
-				<displayName count="one">Old Romanian leu</displayName>
-				<displayName count="other">Old Romanian Lei</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Romanian Leu</displayName>
-				<displayName count="one">Romanian leu</displayName>
-				<displayName count="other">Romanian lei</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbian Dinar</displayName>
-				<displayName count="one">Serbian dinar</displayName>
-				<displayName count="other">Serbian dinars</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russian Ruble</displayName>
-				<displayName count="one">Russian ruble</displayName>
-				<displayName count="other">Russian rubles</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Russian Ruble (1991-1998)</displayName>
-				<displayName count="one">Russian ruble (RUR)</displayName>
-				<displayName count="other">Russian rubles (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rwandan Franc</displayName>
-				<displayName count="one">Rwandan franc</displayName>
-				<displayName count="other">Rwandan francs</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi Riyal</displayName>
-				<displayName count="one">Saudi riyal</displayName>
-				<displayName count="other">Saudi riyals</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Solomon Islands Dollar</displayName>
-				<displayName count="one">Solomon Islands dollar</displayName>
-				<displayName count="other">Solomon Islands dollars</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychellois Rupee</displayName>
-				<displayName count="one">Seychellois rupee</displayName>
-				<displayName count="other">Seychellois rupees</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Old Sudanese Dinar</displayName>
-				<displayName count="one">Old Sudanese dinar</displayName>
-				<displayName count="other">Old Sudanese dinars</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudanese Pound</displayName>
-				<displayName count="one">Sudanese pound</displayName>
-				<displayName count="other">Sudanese pounds</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Old Sudanese Pound</displayName>
-				<displayName count="one">Old Sudanese pound</displayName>
-				<displayName count="other">Old Sudanese pounds</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Swedish Krona</displayName>
-				<displayName count="one">Swedish krona</displayName>
-				<displayName count="other">Swedish kronor</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapore Dollar</displayName>
-				<displayName count="one">Singapore dollar</displayName>
-				<displayName count="other">Singapore dollars</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Saint Helena Pound</displayName>
-				<displayName count="one">Saint Helena pound</displayName>
-				<displayName count="other">Saint Helena pounds</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovenian Tolar</displayName>
-				<displayName count="one">Slovenian tolar</displayName>
-				<displayName count="other">Slovenian tolars</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovak Koruna</displayName>
-				<displayName count="one">Slovak koruna</displayName>
-				<displayName count="other">Slovak korunas</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leonean Leone</displayName>
-				<displayName count="one">Sierra Leonean leone</displayName>
-				<displayName count="other">Sierra Leonean leones</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somali Shilling</displayName>
-				<displayName count="one">Somali shilling</displayName>
-				<displayName count="other">Somali shillings</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamese Dollar</displayName>
-				<displayName count="one">Surinamese dollar</displayName>
-				<displayName count="other">Surinamese dollars</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Suriname Guilder</displayName>
-				<displayName count="one">Suriname guilder</displayName>
-				<displayName count="other">Suriname guilders</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>São Tomé and Príncipe Dobra</displayName>
-				<displayName count="one">São Tomé and Príncipe dobra</displayName>
-				<displayName count="other">São Tomé and Príncipe dobras</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Soviet Rouble</displayName>
-				<displayName count="one">Soviet rouble</displayName>
-				<displayName count="other">Soviet roubles</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadoran Colón</displayName>
-				<displayName count="one">Salvadoran colón</displayName>
-				<displayName count="other">Salvadoran colones</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syrian Pound</displayName>
-				<displayName count="one">Syrian pound</displayName>
-				<displayName count="other">Syrian pounds</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Swazi Lilangeni</displayName>
-				<displayName count="one">Swazi lilangeni</displayName>
-				<displayName count="other">Swazi emalangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thai Baht</displayName>
-				<displayName count="one">Thai baht</displayName>
-				<displayName count="other">Thai baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tajikistani Ruble</displayName>
-				<displayName count="one">Tajikistani ruble</displayName>
-				<displayName count="other">Tajikistani rubles</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tajikistani Somoni</displayName>
-				<displayName count="one">Tajikistani somoni</displayName>
-				<displayName count="other">Tajikistani somonis</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmenistani Manat</displayName>
-				<displayName count="one">Turkmenistani manat</displayName>
-				<displayName count="other">Turkmenistani manat</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName>Turkmenistani New Manat</displayName>
-				<displayName count="one">Turkmenistani new manat</displayName>
-				<displayName count="other">Turkmenistani new manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunisian Dinar</displayName>
-				<displayName count="one">Tunisian dinar</displayName>
-				<displayName count="other">Tunisian dinars</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongan Paʻanga</displayName>
-				<displayName count="one">Tongan paʻanga</displayName>
-				<displayName count="other">Tongan paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timorese Escudo</displayName>
-				<displayName count="one">Timorese escudo</displayName>
-				<displayName count="other">Timorese escudos</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Old Turkish Lira</displayName>
-				<displayName count="one">old Turkish lira</displayName>
-				<displayName count="other">Old Turkish Lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Turkish Lira</displayName>
-				<displayName count="one">Turkish lira</displayName>
-				<displayName count="other">Turkish Lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad and Tobago Dollar</displayName>
-				<displayName count="one">Trinidad and Tobago dollar</displayName>
-				<displayName count="other">Trinidad and Tobago dollars</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>New Taiwan Dollar</displayName>
-				<displayName count="one">New Taiwan dollar</displayName>
-				<displayName count="other">New Taiwan dollars</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanian Shilling</displayName>
-				<displayName count="one">Tanzanian shilling</displayName>
-				<displayName count="other">Tanzanian shillings</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainian Hryvnia</displayName>
-				<displayName count="one">Ukrainian hryvnia</displayName>
-				<displayName count="other">Ukrainian hryvnias</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainian Karbovanets</displayName>
-				<displayName count="one">Ukrainian karbovanets</displayName>
-				<displayName count="other">Ukrainian karbovantsiv</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandan Shilling (1966-1987)</displayName>
-				<displayName count="one">Ugandan shilling (UGS)</displayName>
-				<displayName count="other">Ugandan shillings (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandan Shilling</displayName>
-				<displayName count="one">Ugandan shilling</displayName>
-				<displayName count="other">Ugandan shillings</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US Dollar</displayName>
-				<displayName count="one">US dollar</displayName>
-				<displayName count="other">US dollars</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>US Dollar (Next day)</displayName>
-				<displayName count="one">US dollar (next day)</displayName>
-				<displayName count="other">US dollars (next day)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>US Dollar (Same day)</displayName>
-				<displayName count="one">US dollar (same day)</displayName>
-				<displayName count="other">US dollars (same day)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayan Peso en Unidades Indexadas</displayName>
-				<displayName count="one">Uruguayan peso en unidades indexadas</displayName>
-				<displayName count="other">Uruguayan pesos en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguayan Peso (1975-1993)</displayName>
-				<displayName count="one">Uruguayan peso (UYP)</displayName>
-				<displayName count="other">Uruguayan pesos (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguayan Peso</displayName>
-				<displayName count="one">Uruguayan peso</displayName>
-				<displayName count="other">Uruguayan pesos</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekistan Som</displayName>
-				<displayName count="one">Uzbekistan som</displayName>
-				<displayName count="other">Uzbekistan som</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelan Bolívar</displayName>
-				<displayName count="one">Venezuelan bolívar</displayName>
-				<displayName count="other">Venezuelan bolívars</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelan Bolívar Fuerte</displayName>
-				<displayName count="one">Venezuelan bolívar fuerte</displayName>
-				<displayName count="other">Venezuelan bolívars fuertes</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamese Dong</displayName>
-				<displayName count="one">Vietnamese dong</displayName>
-				<displayName count="other">Vietnamese dong</displayName>
-			</currency>
-			<currency type="VNN">
-				<displayName>Old Vietnamese Dong</displayName>
-				<displayName count="one">Old Vietnamese dong</displayName>
-				<displayName count="other">Old Vietnamese dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu Vatu</displayName>
-				<displayName count="one">Vanuatu vatu</displayName>
-				<displayName count="other">Vanuatu vatus</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Samoan Tala</displayName>
-				<displayName count="one">Samoan tala</displayName>
-				<displayName count="other">Samoan tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA Franc BEAC</displayName>
-				<displayName count="one">CFA franc BEAC</displayName>
-				<displayName count="other">CFA francs BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Silver</displayName>
-				<displayName count="one">Silver</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Gold</displayName>
-				<displayName count="one">Gold</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>European Composite Unit</displayName>
-				<displayName count="one">European composite unit</displayName>
-				<displayName count="other">European composite units</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>European Monetary Unit</displayName>
-				<displayName count="one">European monetary unit</displayName>
-				<displayName count="other">European monetary units</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>European Unit of Account (XBC)</displayName>
-				<displayName count="one">European unit of account (XBC)</displayName>
-				<displayName count="other">European units of account (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>European Unit of Account (XBD)</displayName>
-				<displayName count="one">European unit of account (XBD)</displayName>
-				<displayName count="other">European units of account (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>East Caribbean Dollar</displayName>
-				<displayName count="one">East Caribbean dollar</displayName>
-				<displayName count="other">East Caribbean dollars</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Special Drawing Rights</displayName>
-				<displayName count="one">special drawing rights</displayName>
-				<displayName count="other">special drawing rights</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>European Currency Unit</displayName>
-				<displayName count="one">European currency unit</displayName>
-				<displayName count="other">European currency units</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>French Gold Franc</displayName>
-				<displayName count="one">French gold franc</displayName>
-				<displayName count="other">French gold francs</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>French UIC-Franc</displayName>
-				<displayName count="one">French UIC-franc</displayName>
-				<displayName count="other">French UIC-francs</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA Franc BCEAO</displayName>
-				<displayName count="one">CFA franc BCEAO</displayName>
-				<displayName count="other">CFA francs BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladium</displayName>
-				<displayName count="one">Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP Franc</displayName>
-				<displayName count="one">CFP franc</displayName>
-				<displayName count="other">CFP francs</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platinum</displayName>
-				<displayName count="one">Platinum</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET Funds</displayName>
-				<displayName count="one">RINET Funds</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Testing Currency Code</displayName>
-				<displayName count="one">Testing Currency Code</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Unknown or Invalid Currency</displayName>
-				<displayName count="one">unknown/invalid currency</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Yemeni Dinar</displayName>
-				<displayName count="one">Yemeni dinar</displayName>
-				<displayName count="other">Yemeni dinars</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Yemeni Rial</displayName>
-				<displayName count="one">Yemeni rial</displayName>
-				<displayName count="other">Yemeni rials</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Yugoslavian Hard Dinar</displayName>
-				<displayName count="one">Yugoslavian hard dinar</displayName>
-				<displayName count="other">Yugoslavian hard dinars</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Yugoslavian Noviy Dinar</displayName>
-				<displayName count="one">Yugoslavian noviy dinar</displayName>
-				<displayName count="other">Yugoslavian Noviy dinars</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Yugoslavian Convertible Dinar</displayName>
-				<displayName count="one">Yugoslavian convertible dinar</displayName>
-				<displayName count="other">Yugoslavian convertible dinars</displayName>
-			</currency>
-			<currency type="YUR">
-				<displayName>Yugoslavian Reformed Dinar</displayName>
-				<displayName count="one">Yugoslavian reformed dinar</displayName>
-				<displayName count="other">Yugoslavian reformed dinars</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>South African Rand (financial)</displayName>
-				<displayName count="one">South African rand (financial)</displayName>
-				<displayName count="other">South African rands (financial)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>South African Rand</displayName>
-				<displayName count="one">South African rand</displayName>
-				<displayName count="other">South African rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambian Kwacha</displayName>
-				<displayName count="one">Zambian kwacha</displayName>
-				<displayName count="other">Zambian kwachas</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairean New Zaire</displayName>
-				<displayName count="one">Zairean new zaire</displayName>
-				<displayName count="other">Zairean new zaires</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairean Zaire</displayName>
-				<displayName count="one">Zairean zaire</displayName>
-				<displayName count="other">Zairean zaires</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwean Dollar</displayName>
-				<displayName count="one">Zimbabwean dollar</displayName>
-				<displayName count="other">Zimbabwean dollars</displayName>
-			</currency>
-			<currency type="ZWL">
-				<displayName>Zimbabwean Dollar (2009)</displayName>
-				<displayName count="one">Zimbabwean dollar (2009)</displayName>
-				<displayName count="other">Zimbabwean dollars (2009)</displayName>
-			</currency>
-			<currency type="ZWR">
-				<displayName>Zimbabwean Dollar (2008)</displayName>
-				<displayName count="one">Zimbabwean dollar (2008)</displayName>
-				<displayName count="other">Zimbabwean dollars (2008)</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} day</unitPattern>
-			<unitPattern count="other">{0} days</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hour</unitPattern>
-			<unitPattern count="other">{0} hours</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minute</unitPattern>
-			<unitPattern count="other">{0} minutes</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} month</unitPattern>
-			<unitPattern count="other">{0} months</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} second</unitPattern>
-			<unitPattern count="other">{0} seconds</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} week</unitPattern>
-			<unitPattern count="other">{0} weeks</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} year</unitPattern>
-			<unitPattern count="other">{0} years</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_AS.xml b/airtime_mvc/library/Zend/Locale/Data/en_AS.xml
deleted file mode 100644
index 796a61a5b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_AS.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="AS"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_AU.xml b/airtime_mvc/library/Zend/Locale/Data/en_AU.xml
deleted file mode 100644
index 23acece54..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_AU.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="en"/>
-		<territory type="AU"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/MM - E, d/MM</greatestDifference>
-							<greatestDifference id="M">E, d/MM - E, d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Atlantic">
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Zealand">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AUD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_BE.xml b/airtime_mvc/library/Zend/Locale/Data/en_BE.xml
deleted file mode 100644
index bd4c8a39b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_BE.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.63 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="BE"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH 'h' mm 'min' ss 's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BEF">
-				<pattern>#,##0.00 ¤;-#,##0.00 ¤</pattern>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_BW.xml b/airtime_mvc/library/Zend/Locale/Data/en_BW.xml
deleted file mode 100644
index 28b8a822b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_BW.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="BW"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E dd - E dd MMM</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd - E dd MMM y</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM y</greatestDifference>
-							<greatestDifference id="y">E dd MMM y - E dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BWP">
-				<symbol>P</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_BZ.xml b/airtime_mvc/library/Zend/Locale/Data/en_BZ.xml
deleted file mode 100644
index b5d422fbb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_BZ.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="BZ"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d - M/d</greatestDifference>
-							<greatestDifference id="M">M/d - M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d - E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d - E, M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy - M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy - M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="M">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="y">M/d/yy - M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/yy - E, M/d/yy</greatestDifference>
-							<greatestDifference id="M">E, M/d/yy - E, M/d/yy</greatestDifference>
-							<greatestDifference id="y">E, M/d/yy - E, M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d-d, y</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d, y</greatestDifference>
-							<greatestDifference id="y">MMM d, y - MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y - E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BZD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_CA.xml b/airtime_mvc/library/Zend/Locale/Data/en_CA.xml
deleted file mode 100644
index 8a5ef09c8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_CA.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.66 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="CA"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM-yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-MM - yy-MM</greatestDifference>
-							<greatestDifference id="y">yy-MM - yy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yy-MM-dd - yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d-d, y</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d, y</greatestDifference>
-							<greatestDifference id="y">MMM d, y - MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y - E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Newfoundland">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="CAD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_Dsrt.xml b/airtime_mvc/library/Zend/Locale/Data/en_Dsrt.xml
deleted file mode 100644
index 71d46195d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_Dsrt.xml
+++ /dev/null
@@ -1,1024 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.13 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="en"/>
-		<script type="Dsrt"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="an">��������</language>
-			<language type="apa">����� ������</language>
-			<language type="ar">������</language>
-			<language type="art">��������� ������</language>
-			<language type="bat">������ ������</language>
-			<language type="ber">������</language>
-			<language type="bnt">�����</language>
-			<language type="br">������</language>
-			<language type="byn">����</language>
-			<language type="ca">�������</language>
-			<language type="cel">������ ������</language>
-			<language type="chr">������</language>
-			<language type="chy">����</language>
-			<language type="co">��������</language>
-			<language type="cop">������</language>
-			<language type="cpe">�����-���� ����� �� �����</language>
-			<language type="cpf">�����-���� ����� �� �����</language>
-			<language type="cr">���</language>
-			<language type="crp">����� �� �����</language>
-			<language type="cs">���</language>
-			<language type="cy">����</language>
-			<language type="da">�����</language>
-			<language type="dak">������</language>
-			<language type="de">������</language>
-			<language type="dsb">���� �������</language>
-			<language type="dum">����� ���</language>
-			<language type="egy">������ �������</language>
-			<language type="el">����</language>
-			<language type="en">�����</language>
-			<language type="enm">����� �����</language>
-			<language type="eo">���������</language>
-			<language type="es">������</language>
-			<language type="et">��������</language>
-			<language type="eu">����</language>
-			<language type="fr">�����</language>
-			<language type="frm">����� �����</language>
-			<language type="ga">����</language>
-			<language type="gem">�������� ������</language>
-			<language type="gil">���������</language>
-			<language type="gmh">����� �� ������</language>
-			<language type="got">�����</language>
-			<language type="grc">������ ����</language>
-			<language type="gv">�����</language>
-			<language type="haw">������</language>
-			<language type="hi">�����</language>
-			<language type="hit">�����</language>
-			<language type="hr">�������</language>
-			<language type="ht">�����</language>
-			<language type="hy">��������</language>
-			<language type="ia">����������</language>
-			<language type="id">���������</language>
-			<language type="inc">����� ������</language>
-			<language type="ine">����-�������� ������</language>
-			<language type="is">��������</language>
-			<language type="it">�������</language>
-			<language type="ja">�������</language>
-			<language type="jpr">�����-������</language>
-			<language type="jrb">�����-������</language>
-			<language type="jv">�������</language>
-			<language type="ka">������</language>
-			<language type="km">�����</language>
-			<language type="ko">������</language>
-			<language type="ku">������</language>
-			<language type="kut">������</language>
-			<language type="kw">������</language>
-			<language type="la">�����</language>
-			<language type="lb">������������</language>
-			<language type="lo">��</language>
-			<language type="lv">�������</language>
-			<language type="mga">����� ����</language>
-			<language type="mi">����</language>
-			<language type="mis">���������� ������</language>
-			<language type="mk">����������</language>
-			<language type="mn">��������</language>
-			<language type="mnc">�����</language>
-			<language type="mo">���������</language>
-			<language type="moh">�����</language>
-			<language type="mul">�������� ��������</language>
-			<language type="mus">����</language>
-			<language type="my">������</language>
-			<language type="myn">���� ������</language>
-			<language type="nai">���� �������� ������ ������</language>
-			<language type="nap">����������</language>
-			<language type="nds">�� ������</language>
-			<language type="nl">���</language>
-			<language type="nv">������</language>
-			<language type="tlh">������</language>
-			<language type="zbl">����-�������</language>
-			<language type="zh">�����</language>
-			<language type="zxx">�� ��������� �������</language>
-		</languages>
-		<scripts>
-			<script type="Arab">������</script>
-			<script type="Armi">�������� �������</script>
-			<script type="Armn">��������</script>
-			<script type="Avst">�������</script>
-			<script type="Bali">�������</script>
-			<script type="Batk">�����</script>
-			<script type="Beng">�������</script>
-			<script type="Blis">����������</script>
-			<script type="Bopo">��������</script>
-			<script type="Brah">�����</script>
-			<script type="Brai">����</script>
-			<script type="Bugi">�������</script>
-			<script type="Buhd">�����</script>
-			<script type="Cakm">�����</script>
-			<script type="Cans">������� �������� ���������� ��������</script>
-			<script type="Cari">������</script>
-			<script type="Cham">���</script>
-			<script type="Cher">������</script>
-			<script type="Cirt">����</script>
-			<script type="Copt">������</script>
-			<script type="Cprt">�������</script>
-			<script type="Cyrl">�������</script>
-			<script type="Cyrs">��� ���� �������� �������</script>
-			<script type="Deva">����������</script>
-			<script type="Dsrt">�������</script>
-			<script type="Egyd">������� �������</script>
-			<script type="Egyh">������� �������</script>
-			<script type="Egyp">������� �����������</script>
-			<script type="Ethi">�������</script>
-			<script type="Geok">������ �������</script>
-			<script type="Geor">������</script>
-			<script type="Glag">����������</script>
-			<script type="Goth">�����</script>
-			<script type="Grek">����</script>
-			<script type="Gujr">��������</script>
-			<script type="Guru">�������</script>
-			<script type="Hang">������</script>
-			<script type="Hani">���</script>
-			<script type="Hano">�������</script>
-			<script type="Hans">��������� ���</script>
-			<script type="Hant">���������� ���</script>
-			<script type="Hebr">�����</script>
-			<script type="Hira">��������</script>
-			<script type="Hrkt">�������� �� ��������</script>
-			<script type="Hung">��� ��������</script>
-			<script type="Inds">�����</script>
-			<script type="Ital">��� ������</script>
-			<script type="Java">�������</script>
-			<script type="Jpan">�������</script>
-			<script type="Kali">���� ��</script>
-			<script type="Kana">��������</script>
-			<script type="Khar">�������</script>
-			<script type="Khmr">�����</script>
-			<script type="Knda">������</script>
-			<script type="Kore">������</script>
-			<script type="Kthi">�����</script>
-			<script type="Lana">����</script>
-			<script type="Laoo">��</script>
-			<script type="Latf">������� �����</script>
-			<script type="Latg">����� �����</script>
-			<script type="Latn">�����</script>
-			<script type="Lepc">�����</script>
-			<script type="Limb">�����</script>
-			<script type="Lina">������ �</script>
-			<script type="Linb">������ �</script>
-			<script type="Lyci">�����</script>
-			<script type="Lydi">������</script>
-			<script type="Mand">�������</script>
-			<script type="Mani">��������</script>
-			<script type="Maya">���� ����������</script>
-			<script type="Mero">��������</script>
-			<script type="Mlym">��������</script>
-			<script type="Mong">��������</script>
-			<script type="Moon">���</script>
-			<script type="Mtei">���� ����</script>
-			<script type="Mymr">�������</script>
-			<script type="Nkoo">�’��</script>
-			<script type="Ogam">���</script>
-			<script type="Olck">�� ����</script>
-			<script type="Orkh">�����</script>
-			<script type="Orya">����</script>
-			<script type="Osma">�������</script>
-			<script type="Perm">��� ������</script>
-			<script type="Phli">������������ ������</script>
-			<script type="Phlp">������ ������</script>
-			<script type="Phlv">��� ������</script>
-			<script type="Phnx">�������</script>
-			<script type="Plrd">������ �������</script>
-			<script type="Prti">������������ �������</script>
-			<script type="Qaai">���������</script>
-			<script type="Rjng">�����</script>
-			<script type="Roro">����������</script>
-			<script type="Runr">�����</script>
-			<script type="Samr">���������</script>
-			<script type="Sara">�������</script>
-			<script type="Saur">���������</script>
-			<script type="Sgnw">��� �����</script>
-			<script type="Shaw">������</script>
-			<script type="Sinh">�������</script>
-			<script type="Sund">��������</script>
-			<script type="Sylo">������ �����</script>
-			<script type="Syrc">������</script>
-			<script type="Syre">���������� ������</script>
-			<script type="Syrj">������� ������</script>
-			<script type="Syrn">������ ������</script>
-			<script type="Tagb">��������</script>
-			<script type="Tale">�� ��</script>
-			<script type="Talu">�� �� ���</script>
-			<script type="Taml">�����</script>
-			<script type="Tavt">�� ����</script>
-			<script type="Telu">������</script>
-			<script type="Teng">������</script>
-			<script type="Tfng">������</script>
-			<script type="Tglg">�������</script>
-			<script type="Thaa">�����</script>
-			<script type="Thai">��</script>
-			<script type="Tibt">�������</script>
-			<script type="Ugar">���������</script>
-			<script type="Vaii">��</script>
-			<script type="Visp">������� ����</script>
-			<script type="Xpeo">��� ������</script>
-			<script type="Xsux">������-������� ����������</script>
-			<script type="Yiii">��</script>
-			<script type="Zmth">����������� �������</script>
-			<script type="Zsym">����������� �������</script>
-			<script type="Zxxx">�������</script>
-			<script type="Zyyy">�����</script>
-			<script type="Zzzz">���� �� ������� ������</script>
-		</scripts>
-		<territories>
-			<territory type="001">�����</territory>
-			<territory type="002">������</territory>
-			<territory type="003">���� �������</territory>
-			<territory type="005">��� �������</territory>
-			<territory type="009">�������</territory>
-			<territory type="011">������� ������</territory>
-			<territory type="013">������� �������</territory>
-			<territory type="014">������ ������</territory>
-			<territory type="015">������� ������</territory>
-			<territory type="017">���� ������</territory>
-			<territory type="018">������ ������</territory>
-			<territory type="019">��������</territory>
-			<territory type="021">������� �������</territory>
-			<territory type="029">��������</territory>
-			<territory type="030">������ ���</territory>
-			<territory type="034">������ ���</territory>
-			<territory type="035">���-������ ���</territory>
-			<territory type="039">������ �����</territory>
-			<territory type="053">�������� ��� �� ������</territory>
-			<territory type="054">��������</territory>
-			<territory type="057">���������� �����</territory>
-			<territory type="061">��������</territory>
-			<territory type="062">���-������� ���</territory>
-			<territory type="142">���</territory>
-			<territory type="143">������� ���</territory>
-			<territory type="145">������� ���</territory>
-			<territory type="150">�����</territory>
-			<territory type="151">������ �����</territory>
-			<territory type="154">������� �����</territory>
-			<territory type="155">������� �����</territory>
-			<territory type="172">��������� �� ����������� �����</territory>
-			<territory type="200">������������</territory>
-			<territory type="419">���� ������� ��� � ��������</territory>
-			<territory type="830">����� ������</territory>
-			<territory type="AD">������</territory>
-			<territory type="AE">������� ���� �������</territory>
-			<territory type="AF">����������</territory>
-			<territory type="AG">������� ��� ��������</territory>
-			<territory type="AI">�������</territory>
-			<territory type="AL">�������</territory>
-			<territory type="AM">�������</territory>
-			<territory type="AN">���������� �������</territory>
-			<territory type="AO">������</territory>
-			<territory type="AQ">����������</territory>
-			<territory type="AR">���������</territory>
-			<territory type="AS">�������� �����</territory>
-			<territory type="AT">������</territory>
-			<territory type="AU">��������</territory>
-			<territory type="AW">�����</territory>
-			<territory type="AX">����� ������</territory>
-			<territory type="AZ">���������</territory>
-			<territory type="BA">������ ��� ������������</territory>
-			<territory type="BB">��������</territory>
-			<territory type="BD">���������</territory>
-			<territory type="BE">������</territory>
-			<territory type="BF">������� ����</territory>
-			<territory type="BG">��������</territory>
-			<territory type="BH">�����</territory>
-			<territory type="BI">�������</territory>
-			<territory type="BJ">�����</territory>
-			<territory type="BL">���� ���������</territory>
-			<territory type="BM">��������</territory>
-			<territory type="BN">�����</territory>
-			<territory type="BO">�������</territory>
-			<territory type="BQ">������ ��������� ��������</territory>
-			<territory type="BR">������</territory>
-			<territory type="BS">�������</territory>
-			<territory type="BT">�����</territory>
-			<territory type="BV">���� �����</territory>
-			<territory type="BW">��������</territory>
-			<territory type="BY">�������</territory>
-			<territory type="BZ">�����</territory>
-			<territory type="CA">������</territory>
-			<territory type="CC">����� ������</territory>
-			<territory type="CD">����� - �������</territory>
-			<territory type="CF">������� ������� ��������</territory>
-			<territory type="CG">����� - ��������</territory>
-			<territory type="CH">�����������</territory>
-			<territory type="CI">���� ����</territory>
-			<territory type="CK">��� ������</territory>
-			<territory type="CL">����</territory>
-			<territory type="CM">�������</territory>
-			<territory type="CN">����</territory>
-			<territory type="CO">��������</territory>
-			<territory type="CR">����� ����</territory>
-			<territory type="CS">������ ��� ���������</territory>
-			<territory type="CT">������ ��� ��������� ������</territory>
-			<territory type="CU">�����</territory>
-			<territory type="CV">��� �����</territory>
-			<territory type="CX">������� �����</territory>
-			<territory type="CY">������</territory>
-			<territory type="CZ">��� ��������</territory>
-			<territory type="DD">��� �������</territory>
-			<territory type="DE">�������</territory>
-			<territory type="DJ">������</territory>
-			<territory type="DK">�������</territory>
-			<territory type="DM">��������</territory>
-			<territory type="DO">��������� ��������</territory>
-			<territory type="DZ">�������</territory>
-			<territory type="EC">�������</territory>
-			<territory type="EE">�������</territory>
-			<territory type="EG">�����</territory>
-			<territory type="EH">������� ������</territory>
-			<territory type="ER">�������</territory>
-			<territory type="ES">����</territory>
-			<territory type="ET">�������</territory>
-			<territory type="FI">�������</territory>
-			<territory type="FJ">����</territory>
-			<territory type="FK">�������� ������</territory>
-			<territory type="FM">���������</territory>
-			<territory type="FO">���� ������</territory>
-			<territory type="FQ">����� ������ ��� ��������� ���������</territory>
-			<territory type="FR">�����</territory>
-			<territory type="FX">������������ �����</territory>
-			<territory type="GA">�����</territory>
-			<territory type="GB">������� ������</territory>
-			<territory type="GD">�������</territory>
-			<territory type="GE">�����</territory>
-			<territory type="GF">����� �����</territory>
-			<territory type="GG">������</territory>
-			<territory type="GH">����</territory>
-			<territory type="GI">���������</territory>
-			<territory type="GL">��������</territory>
-			<territory type="GM">������</territory>
-			<territory type="GN">����</territory>
-			<territory type="GP">��������</territory>
-			<territory type="GQ">���������� ����</territory>
-			<territory type="GR">����</territory>
-			<territory type="GS">��� ����� ��� � ��� ������� ������</territory>
-			<territory type="GT">���������</territory>
-			<territory type="GU">����</territory>
-			<territory type="GW">����-����</territory>
-			<territory type="GY">�����</territory>
-			<territory type="HK">��� ��� ��� ����</territory>
-			<territory type="HM">���� ����� ��� �������� ������</territory>
-			<territory type="HN">��������</territory>
-			<territory type="HR">������</territory>
-			<territory type="HT">����</territory>
-			<territory type="HU">�������</territory>
-			<territory type="ID">��������</territory>
-			<territory type="IE">������</territory>
-			<territory type="IL">������</territory>
-			<territory type="IM">��� �� ���</territory>
-			<territory type="IN">�����</territory>
-			<territory type="IO">������ ������ ���� ��������</territory>
-			<territory type="IQ">����</territory>
-			<territory type="IR">����</territory>
-			<territory type="IS">������</territory>
-			<territory type="IT">�����</territory>
-			<territory type="JE">�����</territory>
-			<territory type="JM">������</territory>
-			<territory type="JO">������</territory>
-			<territory type="JP">�����</territory>
-			<territory type="JT">������� �����</territory>
-			<territory type="KE">�����</territory>
-			<territory type="KG">���������</territory>
-			<territory type="KH">��������</territory>
-			<territory type="KI">��������</territory>
-			<territory type="KM">�������</territory>
-			<territory type="KN">���� ���� ��� �����</territory>
-			<territory type="KP">���� �����</territory>
-			<territory type="KR">��� �����</territory>
-			<territory type="KW">�����</territory>
-			<territory type="KY">����� ������</territory>
-			<territory type="KZ">���������</territory>
-			<territory type="LA">����</territory>
-			<territory type="LB">�������</territory>
-			<territory type="LI">����������</territory>
-			<territory type="LK">��� �����</territory>
-			<territory type="LR">�������</territory>
-			<territory type="LS">������</territory>
-			<territory type="LT">���������</territory>
-			<territory type="LU">����������</territory>
-			<territory type="LV">������</territory>
-			<territory type="LY">�����</territory>
-			<territory type="MA">������</territory>
-			<territory type="MC">������</territory>
-			<territory type="MD">�������</territory>
-			<territory type="ME">���������</territory>
-			<territory type="MF">���� �����</territory>
-			<territory type="MG">����������</territory>
-			<territory type="MH">������ ������</territory>
-			<territory type="MI">����� ������</territory>
-			<territory type="MK">���������</territory>
-			<territory type="ML">����</territory>
-			<territory type="MM">�������</territory>
-			<territory type="MN">��������</territory>
-			<territory type="MO">���� ��� ����</territory>
-			<territory type="MP">������� ������� ������</territory>
-			<territory type="MQ">�������</territory>
-			<territory type="MR">���������</territory>
-			<territory type="MS">���������</territory>
-			<territory type="MT">�����</territory>
-			<territory type="MU">�������</territory>
-			<territory type="MV">�������</territory>
-			<territory type="MW">������</territory>
-			<territory type="MX">�������</territory>
-			<territory type="MY">������</territory>
-			<territory type="MZ">��������</territory>
-			<territory type="NA">�������</territory>
-			<territory type="NC">�� ���������</territory>
-			<territory type="NE">�����</territory>
-			<territory type="NF">������ �����</territory>
-			<territory type="NG">�������</territory>
-			<territory type="NI">���������</territory>
-			<territory type="NL">����������</territory>
-			<territory type="NO">�����</territory>
-			<territory type="NP">�����</territory>
-			<territory type="NQ">������ ��� ����</territory>
-			<territory type="NR">�����</territory>
-			<territory type="NT">������ ���</territory>
-			<territory type="NU">����</territory>
-			<territory type="NZ">�� ������</territory>
-			<territory type="OM">����</territory>
-			<territory type="PA">������</territory>
-			<territory type="PC">������� ������ ����� ��������</territory>
-			<territory type="PE">����</territory>
-			<territory type="PF">����� ��������</territory>
-			<territory type="PG">������ �� ����</territory>
-			<territory type="PH">��������</territory>
-			<territory type="PK">��������</territory>
-			<territory type="PL">������</territory>
-			<territory type="PM">���� ���� ��� �������</territory>
-			<territory type="PN">�������</territory>
-			<territory type="PR">������ ����</territory>
-			<territory type="PS">����������� ��������</territory>
-			<territory type="PT">��������</territory>
-			<territory type="PU">�.�. ���������� ������� ������</territory>
-			<territory type="PW">����</territory>
-			<territory type="PY">�������</territory>
-			<territory type="PZ">������ ����� ���</territory>
-			<territory type="QA">�����</territory>
-			<territory type="QO">������ �������</territory>
-			<territory type="QU">�������� ������</territory>
-			<territory type="RE">��������</territory>
-			<territory type="RO">�������</territory>
-			<territory type="RS">������</territory>
-			<territory type="RU">����</territory>
-			<territory type="RW">�������</territory>
-			<territory type="SA">���� ������</territory>
-			<territory type="SB">������� ������</territory>
-			<territory type="SC">������</territory>
-			<territory type="SD">�����</territory>
-			<territory type="SE">�����</territory>
-			<territory type="SG">�������</territory>
-			<territory type="SH">���� ������</territory>
-			<territory type="SI">��������</territory>
-			<territory type="SJ">�������� ��� ��� ����</territory>
-			<territory type="SK">��������</territory>
-			<territory type="SL">����� ����</territory>
-			<territory type="SM">��� ������</territory>
-			<territory type="SN">�������</territory>
-			<territory type="SO">�������</territory>
-			<territory type="SR">�������</territory>
-			<territory type="ST">�� ��� ��� ��������</territory>
-			<territory type="SU">������ �� ������ �������� ���������</territory>
-			<territory type="SV">�� ��������</territory>
-			<territory type="SY">�����</territory>
-			<territory type="SZ">���������</territory>
-			<territory type="TC">����� ��� ����� ������</territory>
-			<territory type="TD">���</territory>
-			<territory type="TF">����� ������ ���������</territory>
-			<territory type="TG">����</territory>
-			<territory type="TH">������</territory>
-			<territory type="TJ">����������</territory>
-			<territory type="TK">������</territory>
-			<territory type="TL">��� �����</territory>
-			<territory type="TM">������������</territory>
-			<territory type="TO">�����</territory>
-			<territory type="TR">�����</territory>
-			<territory type="TT">�������� ��� ������</territory>
-			<territory type="TV">������</territory>
-			<territory type="TW">�����</territory>
-			<territory type="TZ">��������</territory>
-			<territory type="UG">�������</territory>
-			<territory type="UM">�������� ����� ����� ������ ������</territory>
-			<territory type="US">������� �����</territory>
-			<territory type="UY">�������</territory>
-			<territory type="UZ">����������</territory>
-			<territory type="VA">�������</territory>
-			<territory type="VC">���� ������� ��� � ���������</territory>
-			<territory type="VD">���� �������</territory>
-			<territory type="VG">������ ������ ������</territory>
-			<territory type="VI">�.�. ������ ������</territory>
-			<territory type="VN">�������</territory>
-			<territory type="VU">�������</territory>
-			<territory type="WF">����� ��� ������</territory>
-			<territory type="WK">��� �����</territory>
-			<territory type="WS">�����</territory>
-			<territory type="YD">������ ���������� �������� �� �����</territory>
-			<territory type="YE">�����</territory>
-			<territory type="YT">�����</territory>
-			<territory type="ZA">��� ������</territory>
-			<territory type="ZM">������</territory>
-			<territory type="ZW">��������</territory>
-			<territory type="ZZ">���� �� ������� �����</territory>
-		</territories>
-		<variants>
-			<variant type="1901">��������� ������ ���������</variant>
-			<variant type="1996">������ ��������� �� 1996</variant>
-			<variant type="1606NICT">��� ���� ����� �� 1606</variant>
-			<variant type="1694ACAD">���� ������ �����</variant>
-			<variant type="AREVELA">������ ��������</variant>
-			<variant type="AREVMDA">������� ��������</variant>
-			<variant type="BAKU1926">������� ������ ���� �������</variant>
-			<variant type="FONIPA">��� ��������</variant>
-			<variant type="MONOTON">���������</variant>
-			<variant type="POLYTON">���������</variant>
-			<variant type="POSIX">���������</variant>
-			<variant type="REVISED">������ ���������</variant>
-			<variant type="SCOTLAND">������ �������� �����</variant>
-		</variants>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">������</measurementSystemName>
-			<measurementSystemName type="US">��</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[�-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a-z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">���</month>
-							<month type="2">���</month>
-							<month type="3">���</month>
-							<month type="4">���</month>
-							<month type="5">��</month>
-							<month type="6">���</month>
-							<month type="7">���</month>
-							<month type="8">��</month>
-							<month type="9">���</month>
-							<month type="10">���</month>
-							<month type="11">���</month>
-							<month type="12">���</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">�</month>
-							<month type="3">�</month>
-							<month type="4">�</month>
-							<month type="5">�</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">�</month>
-							<month type="9">�</month>
-							<month type="10">�</month>
-							<month type="11">�</month>
-							<month type="12">�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">��������</month>
-							<month type="2">��������</month>
-							<month type="3">����</month>
-							<month type="4">�����</month>
-							<month type="5">��</month>
-							<month type="6">���</month>
-							<month type="7">����</month>
-							<month type="8">�����</month>
-							<month type="9">���������</month>
-							<month type="10">�������</month>
-							<month type="11">��������</month>
-							<month type="12">��������</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">���</month>
-							<month type="3">���</month>
-							<month type="4">���</month>
-							<month type="5">��</month>
-							<month type="6">���</month>
-							<month type="7">���</month>
-							<month type="8">��</month>
-							<month type="9">���</month>
-							<month type="10">���</month>
-							<month type="11">���</month>
-							<month type="12">���</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">�</month>
-							<month type="3">�</month>
-							<month type="4">�</month>
-							<month type="5">�</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">�</month>
-							<month type="9">�</month>
-							<month type="10">�</month>
-							<month type="11">�</month>
-							<month type="12">�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">��������</month>
-							<month type="3">����</month>
-							<month type="4">�����</month>
-							<month type="5">��</month>
-							<month type="6">���</month>
-							<month type="7">����</month>
-							<month type="8">�����</month>
-							<month type="9">���������</month>
-							<month type="10">�������</month>
-							<month type="11">��������</month>
-							<month type="12">��������</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">���</day>
-							<day type="mon">���</day>
-							<day type="tue">���</day>
-							<day type="wed">���</day>
-							<day type="thu">���</day>
-							<day type="fri">���</day>
-							<day type="sat">���</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�����</day>
-							<day type="mon">�����</day>
-							<day type="tue">�����</day>
-							<day type="wed">������</day>
-							<day type="thu">������</day>
-							<day type="fri">�����</day>
-							<day type="sat">�������</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">�</day>
-							<day type="tue">�</day>
-							<day type="wed">�</day>
-							<day type="thu">�</day>
-							<day type="fri">�</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">�1</quarter>
-							<quarter type="2">�2</quarter>
-							<quarter type="3">�3</quarter>
-							<quarter type="4">�4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1�� �������</quarter>
-							<quarter type="2">2�� �������</quarter>
-							<quarter type="3">3�� �������</quarter>
-							<quarter type="4">4�� �������</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>��</am>
-				<pm>��</pm>
-				<eras>
-					<eraNames>
-						<era type="0">����� �����</era>
-						<era type="1">��� ������</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">��</era>
-						<era type="1">��</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">�</era>
-						<era type="1">�</era>
-					</eraNarrow>
-				</eras>
-				<fields>
-					<field type="era">
-						<displayName>���</displayName>
-					</field>
-					<field type="year">
-						<displayName>���</displayName>
-					</field>
-					<field type="month">
-						<displayName>����</displayName>
-					</field>
-					<field type="week">
-						<displayName>���</displayName>
-					</field>
-					<field type="day">
-						<displayName>��</displayName>
-						<relative type="-3">��� ��� ���</relative>
-						<relative type="-2">� �� ����� ��������</relative>
-						<relative type="-1">��������</relative>
-						<relative type="0">����</relative>
-						<relative type="1">������</relative>
-						<relative type="2">� �� ����� ������</relative>
-						<relative type="3">��� ��� ���� ��</relative>
-					</field>
-					<field type="weekday">
-						<displayName>�� �� � ���</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>��/��</displayName>
-					</field>
-					<field type="hour">
-						<displayName>��</displayName>
-					</field>
-					<field type="minute">
-						<displayName>�����</displayName>
-					</field>
-					<field type="second">
-						<displayName>������</displayName>
-					</field>
-					<field type="zone">
-						<displayName>���</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<gmtFormat>��� {0}</gmtFormat>
-			<gmtZeroFormat>���</gmtZeroFormat>
-			<regionFormat>{0} ���</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�����</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>��� ���</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>�����</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>�������</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>���</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>����</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>���</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>��������</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�������</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>�������</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>����</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>��� ������</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>�����</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>������</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>������</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>������</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�� �����, ���� ������</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>������, ���� ������</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>������</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>��������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>�������, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>����������, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>��� ����, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>����, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>�������, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>�������, �������</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>������������</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>�������</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>����, �������</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>���������, �������</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>�������</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�� ����</exemplarCity>
-			</zone>
-			<metazone type="Alaska">
-				<long>
-					<generic>���������</generic>
-					<standard>������ �������� ���</standard>
-					<daylight>����������� ���</daylight>
-				</long>
-				<short>
-					<generic>���</generic>
-					<standard>����</standard>
-					<daylight>����</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>������-����� ���</generic>
-					<standard>������-����� �������� ���</standard>
-					<daylight>������-����� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>���</generic>
-					<standard>����</standard>
-					<daylight>����</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>������� ���</generic>
-					<standard>������� �������� ���</standard>
-					<daylight>������� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>������ ���</generic>
-					<standard>������ �������� ���</standard>
-					<daylight>������ ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>������ ���</generic>
-					<standard>������ �������� ���</standard>
-					<daylight>������ ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>������� ���</generic>
-					<standard>������� �������� ���</standard>
-					<daylight>������� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>�������� ���</generic>
-					<standard>�������� �������� ���</standard>
-					<daylight>�������� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>����� ���</generic>
-					<standard>����� �������� ���</standard>
-					<daylight>����� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>�� (����� )</generic>
-					<standard>��� (����� )</standard>
-					<daylight>��� (����� )</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>��� ��� ���</standard>
-					<daylight>��� ��� ����� ���</daylight>
-				</long>
-				<short>
-					<standard>���</standard>
-					<daylight>����</daylight>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>���������� ���</generic>
-					<standard>���������� �������� ���</standard>
-					<daylight>���������� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>����� ����� ���</generic>
-					<standard>����� �������� ���</standard>
-					<daylight>����� ����� ���</daylight>
-				</long>
-				<short>
-					<generic>��</generic>
-					<standard>���</standard>
-					<daylight>���</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ��</unitPattern>
-			<unitPattern count="other">{0} ���</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ��</unitPattern>
-			<unitPattern count="other">{0} ���</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} �����</unitPattern>
-			<unitPattern count="other">{0} ������</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} �����</unitPattern>
-			<unitPattern count="other">{0} ����</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} ������</unitPattern>
-			<unitPattern count="other">{0} �������</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} ���</unitPattern>
-			<unitPattern count="other">{0} ����</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} ���</unitPattern>
-			<unitPattern count="other">{0} ����</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>���:�</yesstr>
-			<nostr>��:�</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_Dsrt_US.xml b/airtime_mvc/library/Zend/Locale/Data/en_Dsrt_US.xml
deleted file mode 100644
index 475e5f722..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_Dsrt_US.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<script type="Dsrt"/>
-		<territory type="US"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_GB.xml b/airtime_mvc/library/Zend/Locale/Data/en_GB.xml
deleted file mode 100644
index 604c23eb0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_GB.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.65 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="GB"/>
-	</identity>
-	<characters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Europe_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_GU.xml b/airtime_mvc/library/Zend/Locale/Data/en_GU.xml
deleted file mode 100644
index f6c3c7ae0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_GU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="GU"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_HK.xml b/airtime_mvc/library/Zend/Locale/Data/en_HK.xml
deleted file mode 100644
index f94a2e81c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_HK.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="HK"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="japanese">
-				<eras>
-					<eraAbbr>
-						<era type="161">Bunchū</era>
-						<era type="165">Genchū</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="HKD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_IE.xml b/airtime_mvc/library/Zend/Locale/Data/en_IE.xml
deleted file mode 100644
index bf7f947dc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_IE.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.65 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="en"/>
-		<territory type="IE"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_IN.xml b/airtime_mvc/library/Zend/Locale/Data/en_IN.xml
deleted file mode 100644
index 81b454c0c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_IN.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="IN"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_JM.xml b/airtime_mvc/library/Zend/Locale/Data/en_JM.xml
deleted file mode 100644
index 57843781e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_JM.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="JM"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="JMD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_MH.xml b/airtime_mvc/library/Zend/Locale/Data/en_MH.xml
deleted file mode 100644
index bb1982d4c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_MH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="MH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_MP.xml b/airtime_mvc/library/Zend/Locale/Data/en_MP.xml
deleted file mode 100644
index ea8df71d3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_MP.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="MP"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_MT.xml b/airtime_mvc/library/Zend/Locale/Data/en_MT.xml
deleted file mode 100644
index 79c98e5de..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_MT.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="MT"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="GBP">
-				<symbol>GB£</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_NA.xml b/airtime_mvc/library/Zend/Locale/Data/en_NA.xml
deleted file mode 100644
index c09b3e1f3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_NA.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="NA"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="NAD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_NZ.xml b/airtime_mvc/library/Zend/Locale/Data/en_NZ.xml
deleted file mode 100644
index 635291341..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_NZ.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="NZ"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/MM - E, d/MM</greatestDifference>
-							<greatestDifference id="M">E, d/MM - E, d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E, d/MM/yy - E, d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Australia_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Zealand">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="NZD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_PH.xml b/airtime_mvc/library/Zend/Locale/Data/en_PH.xml
deleted file mode 100644
index ccc050a9f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_PH.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="PH"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="PHP">
-				<displayName>Peso</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_PK.xml b/airtime_mvc/library/Zend/Locale/Data/en_PK.xml
deleted file mode 100644
index 7cb2a9a2c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_PK.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="en"/>
-		<territory type="PK"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d - M/d</greatestDifference>
-							<greatestDifference id="M">M/d - M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, M/d - E, M/d</greatestDifference>
-							<greatestDifference id="M">E, M/d - E, M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy - M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy - M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="M">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="y">M/d/yy - M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, M/d/yy - E, M/d/yy</greatestDifference>
-							<greatestDifference id="M">E, M/d/yy - E, M/d/yy</greatestDifference>
-							<greatestDifference id="y">E, M/d/yy - E, M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d-d, y</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d, y</greatestDifference>
-							<greatestDifference id="y">MMM d, y - MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y - E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>INRs</symbol>
-			</currency>
-			<currency type="PKR">
-				<symbol>₨</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_SG.xml b/airtime_mvc/library/Zend/Locale/Data/en_SG.xml
deleted file mode 100644
index bdfba8445..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_SG.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.64 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="SG"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="japanese">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="SGD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_Shaw.xml b/airtime_mvc/library/Zend/Locale/Data/en_Shaw.xml
deleted file mode 100644
index eac6749d2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_Shaw.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.9 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<script type="Shaw"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[�-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a-z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">·��</month>
-							<month type="2">·��</month>
-							<month type="3">·��</month>
-							<month type="4">·��</month>
-							<month type="5">·��</month>
-							<month type="6">·��</month>
-							<month type="7">·��</month>
-							<month type="8">·��</month>
-							<month type="9">·��</month>
-							<month type="10">·��</month>
-							<month type="11">·��</month>
-							<month type="12">·��</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">·��������</month>
-							<month type="2">·��������</month>
-							<month type="3">·���</month>
-							<month type="4">·�����</month>
-							<month type="5">·��</month>
-							<month type="6">·���</month>
-							<month type="7">·����</month>
-							<month type="8">·�����</month>
-							<month type="9">·��������</month>
-							<month type="10">·������</month>
-							<month type="11">·�������</month>
-							<month type="12">·�������</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">�</month>
-							<month type="2">�</month>
-							<month type="3">�</month>
-							<month type="4">�</month>
-							<month type="5">�</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">�</month>
-							<month type="9">�</month>
-							<month type="10">�</month>
-							<month type="11">�</month>
-							<month type="12">�</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">·��</day>
-							<day type="mon">·��</day>
-							<day type="tue">·��</day>
-							<day type="wed">·��</day>
-							<day type="thu">·��</day>
-							<day type="fri">·��</day>
-							<day type="sat">·��</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">·�����</day>
-							<day type="mon">·�����</day>
-							<day type="tue">·�����</day>
-							<day type="wed">·������</day>
-							<day type="thu">·�����</day>
-							<day type="fri">·�����</day>
-							<day type="sat">·������</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">�</day>
-							<day type="tue">�</day>
-							<day type="wed">�</day>
-							<day type="thu">�</day>
-							<day type="fri">�</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">�1</quarter>
-							<quarter type="2">�2</quarter>
-							<quarter type="3">�3</quarter>
-							<quarter type="4">�4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1�� �����</quarter>
-							<quarter type="2">2�� �����</quarter>
-							<quarter type="3">3�� �����</quarter>
-							<quarter type="4">4�� �����</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>��</am>
-				<pm>��</pm>
-				<eras>
-					<eraNames>
-						<era type="0">����� ·�����</era>
-						<era type="1">��� ������</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">�·�</era>
-						<era type="1">��</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">�</era>
-						<era type="1">�</era>
-					</eraNarrow>
-				</eras>
-				<fields>
-					<field type="era">
-						<displayName>��</displayName>
-					</field>
-					<field type="year">
-						<displayName>��</displayName>
-					</field>
-					<field type="month">
-						<displayName>����</displayName>
-					</field>
-					<field type="week">
-						<displayName>���</displayName>
-					</field>
-					<field type="day">
-						<displayName>��</displayName>
-						<relative type="-3">��� ��� ���</relative>
-						<relative type="-2">� �� ���� �������</relative>
-						<relative type="-1">�������</relative>
-						<relative type="0">����</relative>
-						<relative type="2">� �� ���� �����</relative>
-						<relative type="3">��� ��� ���� ��</relative>
-					</field>
-					<field type="weekday">
-						<displayName>�� � � ���</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>��/��</displayName>
-					</field>
-					<field type="hour">
-						<displayName>��</displayName>
-					</field>
-					<field type="minute">
-						<displayName>�����</displayName>
-					</field>
-					<field type="second">
-						<displayName>������</displayName>
-					</field>
-					<field type="zone">
-						<displayName>���</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<gmtFormat>·���{0}</gmtFormat>
-			<gmtZeroFormat>·���</gmtZeroFormat>
-			<regionFormat>{0} ���</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<posix>
-		<messages>
-			<yesstr>���:�</yesstr>
-			<nostr>��:�</nostr>
-		</messages>
-	</posix>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_TT.xml b/airtime_mvc/library/Zend/Locale/Data/en_TT.xml
deleted file mode 100644
index e290e404c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_TT.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.42 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="TT"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="TTD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_UM.xml b/airtime_mvc/library/Zend/Locale/Data/en_UM.xml
deleted file mode 100644
index 08bbf4983..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_UM.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="UM"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_US.xml b/airtime_mvc/library/Zend/Locale/Data/en_US.xml
deleted file mode 100644
index a891028a5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_US.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="US"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_US_POSIX.xml b/airtime_mvc/library/Zend/Locale/Data/en_US_POSIX.xml
deleted file mode 100644
index 329b4cdf7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_US_POSIX.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="US"/>
-		<variant type="POSIX"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<perMille>0/00</perMille>
-			<infinity>INF</infinity>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.######</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>0.000000E+000</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_VI.xml b/airtime_mvc/library/Zend/Locale/Data/en_VI.xml
deleted file mode 100644
index 6047abd4b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_VI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="en"/>
-		<territory type="VI"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/en_ZA.xml
deleted file mode 100644
index f7d9e3ad3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_ZA.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="en"/>
-		<territory type="ZA"/>
-	</identity>
-	<characters>
-		<exemplarCharacters type="auxiliary">[á à ă â å ä � æ ç ḓ é è ĕ ê ë ē í ì ĭ î ï ī ḽ ñ ṅ ṋ ó ò � ô ö ø � œ š ß ṱ ú ù ŭ û ü ū ÿ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM/dd - MM/dd</greatestDifference>
-							<greatestDifference id="M">MM/dd - MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E MM/dd - E MM/dd</greatestDifference>
-							<greatestDifference id="M">E MM/dd - E MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E dd - E dd MMM</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy/MM - yyyy/MM</greatestDifference>
-							<greatestDifference id="y">yyyy/MM - yyyy/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy/MM/dd - yyyy/MM/dd</greatestDifference>
-							<greatestDifference id="M">yyyy/MM/dd - yyyy/MM/dd</greatestDifference>
-							<greatestDifference id="y">yyyy/MM/dd - yyyy/MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E yyyy/MM/dd - E yyyy/MM/dd</greatestDifference>
-							<greatestDifference id="M">E yyyy/MM/dd - E yyyy/MM/dd</greatestDifference>
-							<greatestDifference id="y">E yyyy/MM/dd - E yyyy/MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd - E dd MMM y</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM y</greatestDifference>
-							<greatestDifference id="y">E dd MMM y - E dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Africa_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/en_ZW.xml b/airtime_mvc/library/Zend/Locale/Data/en_ZW.xml
deleted file mode 100644
index 1175f78e2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/en_ZW.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="en"/>
-		<territory type="ZW"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM,y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M - d/M</greatestDifference>
-							<greatestDifference id="M">d/M - d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/M - E d/M</greatestDifference>
-							<greatestDifference id="M">E d/M - E d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E dd - E dd MMM</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yyyy - M/yyyy</greatestDifference>
-							<greatestDifference id="y">M/yyyy - M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yyyy - d/M/yyyy</greatestDifference>
-							<greatestDifference id="M">d/M/yyyy - d/M/yyyy</greatestDifference>
-							<greatestDifference id="y">d/M/yyyy - d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/M/yyyy - E d/M/yyyy</greatestDifference>
-							<greatestDifference id="M">E d/M/yyyy - E d/M/yyyy</greatestDifference>
-							<greatestDifference id="y">E d/M/yyyy - E d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd - E dd MMM y</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM y</greatestDifference>
-							<greatestDifference id="y">E dd MMM y - E dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Africa_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/eo.xml b/airtime_mvc/library/Zend/Locale/Data/eo.xml
deleted file mode 100644
index ba43614ce..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/eo.xml
+++ /dev/null
@@ -1,632 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.76 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="eo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afara</language>
-			<language type="ab">abĥaza</language>
-			<language type="af">afrikansa</language>
-			<language type="am">amhara</language>
-			<language type="ar">araba</language>
-			<language type="as">asama</language>
-			<language type="ay">ajmara</language>
-			<language type="az">azerbaj�ana</language>
-			<language type="ba">ba�kira</language>
-			<language type="be">belorusa</language>
-			<language type="bg">bulgara</language>
-			<language type="bh">bihara</language>
-			<language type="bi">bislamo</language>
-			<language type="bn">bengala</language>
-			<language type="bo">tibeta</language>
-			<language type="br">bretona</language>
-			<language type="bs">bosnia</language>
-			<language type="ca">kataluna</language>
-			<language type="co">korsika</language>
-			<language type="cs">ĉeĥa</language>
-			<language type="cy">kimra</language>
-			<language type="da">dana</language>
-			<language type="de">germana</language>
-			<language type="dz">dzonko</language>
-			<language type="el">greka</language>
-			<language type="en">angla</language>
-			<language type="eo">esperanto</language>
-			<language type="es">hispana</language>
-			<language type="et">estona</language>
-			<language type="eu">eÅ­ska</language>
-			<language type="fa">persa</language>
-			<language type="fi">finna</language>
-			<language type="fil">filipina</language>
-			<language type="fj">fi�ia</language>
-			<language type="fo">feroa</language>
-			<language type="fr">franca</language>
-			<language type="fy">frisa</language>
-			<language type="ga">irlanda</language>
-			<language type="gd">gaela</language>
-			<language type="gl">galega</language>
-			<language type="gn">gvarania</language>
-			<language type="gu">gu�arata</language>
-			<language type="ha">haÅ­sa</language>
-			<language type="he">hebrea</language>
-			<language type="hi">hinda</language>
-			<language type="hr">kroata</language>
-			<language type="hu">hungara</language>
-			<language type="hy">armena</language>
-			<language type="ia">interlingvao</language>
-			<language type="id">indonezia</language>
-			<language type="ie">okcidentalo</language>
-			<language type="ik">eskima</language>
-			<language type="is">islanda</language>
-			<language type="it">itala</language>
-			<language type="iu">inuita</language>
-			<language type="ja">japana</language>
-			<language type="jv">java</language>
-			<language type="ka">kartvela</language>
-			<language type="kk">kazaĥa</language>
-			<language type="kl">gronlanda</language>
-			<language type="km">kmera</language>
-			<language type="kn">kanara</language>
-			<language type="ko">korea</language>
-			<language type="ks">ka�mira</language>
-			<language type="ku">kurda</language>
-			<language type="ky">kirgiza</language>
-			<language type="la">latino</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laÅ­a</language>
-			<language type="lt">litova</language>
-			<language type="lv">latva</language>
-			<language type="mg">malagasa</language>
-			<language type="mi">maoria</language>
-			<language type="mk">makedona</language>
-			<language type="ml">malajalama</language>
-			<language type="mn">mongola</language>
-			<language type="mr">marata</language>
-			<language type="ms">malaja</language>
-			<language type="mt">malta</language>
-			<language type="my">birma</language>
-			<language type="na">naura</language>
-			<language type="ne">nepala</language>
-			<language type="nl">nederlanda</language>
-			<language type="nn">novnorvega</language>
-			<language type="no">norvega</language>
-			<language type="oc">okcitana</language>
-			<language type="om">oroma</language>
-			<language type="or">orijo</language>
-			<language type="pa">pan�aba</language>
-			<language type="pl">pola</language>
-			<language type="ps">pa�tua</language>
-			<language type="pt">portugala</language>
-			<language type="pt_BR">brazilportugala</language>
-			<language type="pt_PT">portugalportugala</language>
-			<language type="qu">keĉua</language>
-			<language type="rm">romanĉa</language>
-			<language type="rn">burunda</language>
-			<language type="ro">rumana</language>
-			<language type="ru">rusa</language>
-			<language type="rw">ruanda</language>
-			<language type="sa">sanskrito</language>
-			<language type="sd">sinda</language>
-			<language type="sg">sangoa</language>
-			<language type="sh">serbo-Kroata</language>
-			<language type="si">sinhala</language>
-			<language type="sk">slovaka</language>
-			<language type="sl">slovena</language>
-			<language type="sm">samoa</language>
-			<language type="sn">�ona</language>
-			<language type="so">somala</language>
-			<language type="sq">albana</language>
-			<language type="sr">serba</language>
-			<language type="ss">svazia</language>
-			<language type="st">sota</language>
-			<language type="su">sunda</language>
-			<language type="sv">sveda</language>
-			<language type="sw">svahila</language>
-			<language type="ta">tamila</language>
-			<language type="te">telugua</language>
-			<language type="tg">ta�ika</language>
-			<language type="th">taja</language>
-			<language type="ti">tigraja</language>
-			<language type="tk">turkmena</language>
-			<language type="tl">tagaloga</language>
-			<language type="tlh">klingona</language>
-			<language type="tn">cvana</language>
-			<language type="to">tongaa</language>
-			<language type="tr">turka</language>
-			<language type="ts">conga</language>
-			<language type="tt">tatara</language>
-			<language type="tw">akana</language>
-			<language type="ug">ujgura</language>
-			<language type="uk">ukraina</language>
-			<language type="ur">urduo</language>
-			<language type="uz">uzbeka</language>
-			<language type="vi">vjetnama</language>
-			<language type="vo">volapuko</language>
-			<language type="wo">volofa</language>
-			<language type="xh">ksosa</language>
-			<language type="yi">jida</language>
-			<language type="yo">joruba</language>
-			<language type="za">�uanga</language>
-			<language type="zh">ĉina</language>
-			<language type="zu">zulua</language>
-		</languages>
-		<territories>
-			<territory type="AD">Andoro</territory>
-			<territory type="AE">Unui�intaj Arabaj Emirlandos</territory>
-			<territory type="AF">Afganujo</territory>
-			<territory type="AG">Antigvo-Barbudo</territory>
-			<territory type="AI">Angvilo</territory>
-			<territory type="AL">Albanujo</territory>
-			<territory type="AM">Armenujo</territory>
-			<territory type="AN">Nederlandaj Antiloj</territory>
-			<territory type="AO">Angolo</territory>
-			<territory type="AQ">Antarkto</territory>
-			<territory type="AR">Argentino</territory>
-			<territory type="AT">AÅ­strujo</territory>
-			<territory type="AU">AÅ­stralio</territory>
-			<territory type="AW">Arubo</territory>
-			<territory type="AZ">Azerbaj�ano</territory>
-			<territory type="BA">Bosnio-Hercegovino</territory>
-			<territory type="BB">Barbado</territory>
-			<territory type="BD">Banglade�o</territory>
-			<territory type="BE">Belgujo</territory>
-			<territory type="BF">Burkino</territory>
-			<territory type="BG">Bulgarujo</territory>
-			<territory type="BH">Barejno</territory>
-			<territory type="BI">Burundo</territory>
-			<territory type="BJ">Benino</territory>
-			<territory type="BM">Bermudoj</territory>
-			<territory type="BN">Brunejo</territory>
-			<territory type="BO">Bolivio</territory>
-			<territory type="BR">Brazilo</territory>
-			<territory type="BS">Bahamoj</territory>
-			<territory type="BT">Butano</territory>
-			<territory type="BW">Bocvano</territory>
-			<territory type="BY">Belorusujo</territory>
-			<territory type="BZ">Belizo</territory>
-			<territory type="CA">Kanado</territory>
-			<territory type="CF">Centr-Afrika Respubliko</territory>
-			<territory type="CG">Kongolo</territory>
-			<territory type="CH">Svisujo</territory>
-			<territory type="CI">Ebur-Bordo</territory>
-			<territory type="CK">Kukinsuloj</territory>
-			<territory type="CL">Ĉilio</territory>
-			<territory type="CM">Kameruno</territory>
-			<territory type="CN">Ĉinujo</territory>
-			<territory type="CO">Kolombio</territory>
-			<territory type="CR">Kostariko</territory>
-			<territory type="CS">Serbujo</territory>
-			<territory type="CU">Kubo</territory>
-			<territory type="CV">Kabo-Verdo</territory>
-			<territory type="CY">Kipro</territory>
-			<territory type="CZ">Ĉeĥujo</territory>
-			<territory type="DE">Germanujo</territory>
-			<territory type="DJ">Äœibutio</territory>
-			<territory type="DK">Danujo</territory>
-			<territory type="DM">Dominiko</territory>
-			<territory type="DO">Domingo</territory>
-			<territory type="DZ">Al�erio</territory>
-			<territory type="EC">Ekvadoro</territory>
-			<territory type="EE">Estonujo</territory>
-			<territory type="EG">Egipto</territory>
-			<territory type="EH">Okcidenta Saharo</territory>
-			<territory type="ER">Eritreo</territory>
-			<territory type="ES">Hispanujo</territory>
-			<territory type="ET">Etiopujo</territory>
-			<territory type="FI">Finnlando</territory>
-			<territory type="FJ">Fi�oj</territory>
-			<territory type="FM">Mikronezio</territory>
-			<territory type="FO">Ferooj</territory>
-			<territory type="FR">Francujo</territory>
-			<territory type="GA">Gabono</territory>
-			<territory type="GB">Unui�inta Re�lando</territory>
-			<territory type="GD">Grenado</territory>
-			<territory type="GE">Kartvelujo</territory>
-			<territory type="GF">Franca Gviano</territory>
-			<territory type="GH">Ganao</territory>
-			<territory type="GI">Äœibraltaro</territory>
-			<territory type="GL">Gronlando</territory>
-			<territory type="GM">Gambio</territory>
-			<territory type="GN">Gvineo</territory>
-			<territory type="GP">Gvadelupo</territory>
-			<territory type="GQ">Ekvatora Gvineo</territory>
-			<territory type="GR">Grekujo</territory>
-			<territory type="GS">Sud-Georgio kaj Sud-Sandviĉinsuloj</territory>
-			<territory type="GT">Gvatemalo</territory>
-			<territory type="GU">Gvamo</territory>
-			<territory type="GW">Gvineo-BisaÅ­o</territory>
-			<territory type="GY">Gujano</territory>
-			<territory type="HM">Herda kaj Makdonaldaj Insuloj</territory>
-			<territory type="HN">Honduro</territory>
-			<territory type="HR">Kroatujo</territory>
-			<territory type="HT">Haitio</territory>
-			<territory type="HU">Hungarujo</territory>
-			<territory type="ID">Indonezio</territory>
-			<territory type="IE">Irlando</territory>
-			<territory type="IL">Israelo</territory>
-			<territory type="IN">Hindujo</territory>
-			<territory type="IO">Brita Hindoceana Teritorio</territory>
-			<territory type="IQ">Irako</territory>
-			<territory type="IR">Irano</territory>
-			<territory type="IS">Islando</territory>
-			<territory type="IT">Italujo</territory>
-			<territory type="JM">Jamajko</territory>
-			<territory type="JO">Jordanio</territory>
-			<territory type="JP">Japanujo</territory>
-			<territory type="KE">Kenjo</territory>
-			<territory type="KG">Kirgizistano</territory>
-			<territory type="KH">Kambo�o</territory>
-			<territory type="KI">Kiribato</territory>
-			<territory type="KM">Komoroj</territory>
-			<territory type="KN">Sent-Kristofo kaj Neviso</territory>
-			<territory type="KP">Nord-Koreo</territory>
-			<territory type="KR">Sud-Koreo</territory>
-			<territory type="KW">Kuvajto</territory>
-			<territory type="KY">Kejmanoj</territory>
-			<territory type="KZ">Kazaĥstano</territory>
-			<territory type="LA">Laoso</territory>
-			<territory type="LB">Libano</territory>
-			<territory type="LC">Sent-Lucio</territory>
-			<territory type="LI">Liĥten�tejno</territory>
-			<territory type="LK">Sri-Lanko</territory>
-			<territory type="LR">Liberio</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litovujo</territory>
-			<territory type="LU">Luksemburgo</territory>
-			<territory type="LV">Latvujo</territory>
-			<territory type="LY">Libio</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavujo</territory>
-			<territory type="MG">Madagaskaro</territory>
-			<territory type="MH">Mar�aloj</territory>
-			<territory type="MK">Makedonujo</territory>
-			<territory type="ML">Malio</territory>
-			<territory type="MM">Mjanmao</territory>
-			<territory type="MN">Mongolujo</territory>
-			<territory type="MP">Nord-Marianoj</territory>
-			<territory type="MQ">Martiniko</territory>
-			<territory type="MR">MaÅ­ritanujo</territory>
-			<territory type="MT">Malto</territory>
-			<territory type="MU">MaÅ­ricio</territory>
-			<territory type="MV">Maldivoj</territory>
-			<territory type="MW">Malavio</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malajzio</territory>
-			<territory type="MZ">Mozambiko</territory>
-			<territory type="NA">Namibio</territory>
-			<territory type="NC">Nov-Kaledonio</territory>
-			<territory type="NE">Ni�ero</territory>
-			<territory type="NF">Norfolkinsulo</territory>
-			<territory type="NG">Ni�erio</territory>
-			<territory type="NI">Nikaragvo</territory>
-			<territory type="NL">Nederlando</territory>
-			<territory type="NO">Norvegujo</territory>
-			<territory type="NP">Nepalo</territory>
-			<territory type="NR">Nauro</territory>
-			<territory type="NU">Niuo</territory>
-			<territory type="NZ">Nov-Zelando</territory>
-			<territory type="OM">Omano</territory>
-			<territory type="PA">Panamo</territory>
-			<territory type="PE">Peruo</territory>
-			<territory type="PF">Franca Polinezio</territory>
-			<territory type="PG">Papuo-Nov-Gvineo</territory>
-			<territory type="PH">Filipinoj</territory>
-			<territory type="PK">Pakistano</territory>
-			<territory type="PL">Pollando</territory>
-			<territory type="PM">Sent-Piero kaj Mikelono</territory>
-			<territory type="PN">Pitkarna Insulo</territory>
-			<territory type="PR">Puerto-Riko</territory>
-			<territory type="PT">Portugalujo</territory>
-			<territory type="PW">BelaÅ­o</territory>
-			<territory type="PY">Paragvajo</territory>
-			<territory type="QA">Kataro</territory>
-			<territory type="RE">Reunio</territory>
-			<territory type="RO">Rumanujo</territory>
-			<territory type="RU">Rusujo</territory>
-			<territory type="RW">Ruando</territory>
-			<territory type="SA">SaÅ­da Arabujo</territory>
-			<territory type="SB">Salomonoj</territory>
-			<territory type="SC">Sej�eloj</territory>
-			<territory type="SD">Sudano</territory>
-			<territory type="SE">Svedujo</territory>
-			<territory type="SG">Singapuro</territory>
-			<territory type="SH">Sent-Heleno</territory>
-			<territory type="SI">Slovenujo</territory>
-			<territory type="SJ">Svalbardo kaj Jan-Majen-insulo</territory>
-			<territory type="SK">Slovakujo</territory>
-			<territory type="SL">Siera-Leono</territory>
-			<territory type="SM">San-Marino</territory>
-			<territory type="SN">Senegalo</territory>
-			<territory type="SO">Somalujo</territory>
-			<territory type="SR">Surinamo</territory>
-			<territory type="ST">Sao-Tomeo kaj Principeo</territory>
-			<territory type="SV">Salvadoro</territory>
-			<territory type="SY">Sirio</territory>
-			<territory type="SZ">Svazilando</territory>
-			<territory type="TD">Ĉado</territory>
-			<territory type="TG">Togolo</territory>
-			<territory type="TH">Tajlando</territory>
-			<territory type="TJ">Ta�ikujo</territory>
-			<territory type="TM">Turkmenujo</territory>
-			<territory type="TN">Tunizio</territory>
-			<territory type="TO">Tongo</territory>
-			<territory type="TR">Turkujo</territory>
-			<territory type="TT">Trinidado kaj Tobago</territory>
-			<territory type="TV">Tuvalo</territory>
-			<territory type="TW">Tajvano</territory>
-			<territory type="TZ">Tanzanio</territory>
-			<territory type="UA">Ukrajno</territory>
-			<territory type="UG">Ugando</territory>
-			<territory type="UM">Usonaj malgrandaj insuloj</territory>
-			<territory type="US">Usono</territory>
-			<territory type="UY">Urugvajo</territory>
-			<territory type="UZ">Uzbekujo</territory>
-			<territory type="VA">Vatikano</territory>
-			<territory type="VC">Sent-Vincento kaj la Grenadinoj</territory>
-			<territory type="VE">Venezuelo</territory>
-			<territory type="VG">Britaj Virgulininsuloj</territory>
-			<territory type="VI">Usonaj Virgulininsuloj</territory>
-			<territory type="VN">Vjetnamo</territory>
-			<territory type="VU">Vanuatuo</territory>
-			<territory type="WF">Valiso kaj Futuno</territory>
-			<territory type="WS">Samoo</territory>
-			<territory type="YE">Jemeno</territory>
-			<territory type="YT">Majoto</territory>
-			<territory type="ZA">Sud-Afriko</territory>
-			<territory type="ZM">Zambio</territory>
-			<territory type="ZW">Zimbabvo</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ĉ d-g � h ĥ i j ĵ k-p r s � t u ŭ v z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q w-y]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aÅ­g</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januaro</month>
-							<month type="2">februaro</month>
-							<month type="3">marto</month>
-							<month type="4">aprilo</month>
-							<month type="5">majo</month>
-							<month type="6">junio</month>
-							<month type="7">julio</month>
-							<month type="8">aÅ­gusto</month>
-							<month type="9">septembro</month>
-							<month type="10">oktobro</month>
-							<month type="11">novembro</month>
-							<month type="12">decembro</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">di</day>
-							<day type="mon">lu</day>
-							<day type="tue">ma</day>
-							<day type="wed">me</day>
-							<day type="thu">ĵa</day>
-							<day type="fri">ve</day>
-							<day type="sat">sa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">dimanĉo</day>
-							<day type="mon">lundo</day>
-							<day type="tue">mardo</day>
-							<day type="wed">merkredo</day>
-							<day type="thu">ĵaŭdo</day>
-							<day type="fri">vendredo</day>
-							<day type="sat">sabato</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1a kvaronjaro</quarter>
-							<quarter type="2">2a kvaronjaro</quarter>
-							<quarter type="3">3a kvaronjaro</quarter>
-							<quarter type="4">4a kvaronjaro</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>atm</am>
-				<pm>ptm</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">aK</era>
-						<era type="1">pK</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d-'a' 'de' MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y-MMMM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y-MMM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H-'a' 'horo' 'kaj' m:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM-dd - MMM-dd</greatestDifference>
-							<greatestDifference id="M">MMM-dd - MMM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM-dd - E, MMM-dd</greatestDifference>
-							<greatestDifference id="M">E, MMM-dd - E, MMM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-MM - yy-MM</greatestDifference>
-							<greatestDifference id="y">yy-MM - yy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yy-MM-dd - yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y-MMM - y-MMM</greatestDifference>
-							<greatestDifference id="y">y-MMM - y-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y-MMM-dd - y-MMM-dd</greatestDifference>
-							<greatestDifference id="M">y-MMM-dd - y-MMM-dd</greatestDifference>
-							<greatestDifference id="y">y-MMM-dd - y-MMM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d-'a' - E, d-'a' 'de' MMM y</greatestDifference>
-							<greatestDifference id="M">E, d-'a' 'de' MMM - E, d-'a' 'de' MMM y</greatestDifference>
-							<greatestDifference id="y">E, d-'a' 'de' MMM y - E, d-'a' 'de' MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es.xml b/airtime_mvc/library/Zend/Locale/Data/es.xml
deleted file mode 100644
index 85caefa6b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es.xml
+++ /dev/null
@@ -1,3714 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.128 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>,</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abjasio</language>
-			<language type="ace">acehnés</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adigeo</language>
-			<language type="ae">avéstico</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">lengua afroasiática</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">acadio</language>
-			<language type="ale">aleutiano</language>
-			<language type="alg">lenguas algonquinas</language>
-			<language type="alt">altái meridional</language>
-			<language type="am">amárico</language>
-			<language type="an">aragonés</language>
-			<language type="ang">inglés antiguo</language>
-			<language type="anp">angika</language>
-			<language type="apa">lenguas apache</language>
-			<language type="ar">árabe</language>
-			<language type="arc">arameo</language>
-			<language type="arn">araucano</language>
-			<language type="arp">arapaho</language>
-			<language type="art">lengua artificial</language>
-			<language type="arw">arahuaco</language>
-			<language type="as">asamés</language>
-			<language type="ast">asturiano</language>
-			<language type="ath">lenguas atabascas</language>
-			<language type="aus">lenguas australianas</language>
-			<language type="av">avar</language>
-			<language type="awa">avadhi</language>
-			<language type="ay">aimara</language>
-			<language type="az">azerí</language>
-			<language type="ba">bashkir</language>
-			<language type="bad">banda</language>
-			<language type="bai">lenguas bamileke</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinés</language>
-			<language type="bas">basa</language>
-			<language type="bat">lengua báltica</language>
-			<language type="be">bielorruso</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">bereber</language>
-			<language type="bg">búlgaro</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bicol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalí</language>
-			<language type="bnt">bantú</language>
-			<language type="bo">tibetano</language>
-			<language type="br">bretón</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnio</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriat</language>
-			<language type="bug">buginés</language>
-			<language type="byn">blin</language>
-			<language type="ca">catalán</language>
-			<language type="cad">caddo</language>
-			<language type="cai">lengua india centroamericana</language>
-			<language type="car">caribe</language>
-			<language type="cau">lengua caucásica</language>
-			<language type="cch">atsam</language>
-			<language type="ce">checheno</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">lengua celta</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatái</language>
-			<language type="chk">trukés</language>
-			<language type="chm">marí</language>
-			<language type="chn">jerga chinuk</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyene</language>
-			<language type="cmc">lenguas chámicas</language>
-			<language type="co">corso</language>
-			<language type="cop">copto</language>
-			<language type="cpe">lengua criolla o pidgin basada en el inglés</language>
-			<language type="cpf">lengua criolla o pidgin basada en el francés</language>
-			<language type="cpp">lengua criolla o pidgin basada en el portugués</language>
-			<language type="cr">cree</language>
-			<language type="crh">tártaro de Crimea</language>
-			<language type="crp">lengua criolla o pidgin</language>
-			<language type="cs">checo</language>
-			<language type="csb">casubio</language>
-			<language type="cu">eslavo eclesiástico</language>
-			<language type="cus">lengua cusita</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">galés</language>
-			<language type="da">danés</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargva</language>
-			<language type="day">dayak</language>
-			<language type="de">alemán</language>
-			<language type="de_AT">alemán austríaco</language>
-			<language type="de_CH">alto alemán de Suiza</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">lengua dravídica</language>
-			<language type="dsb">sorbio inferior</language>
-			<language type="dua">duala</language>
-			<language type="dum">neerlandés medieval</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">diula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">egipcio antiguo</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">griego</language>
-			<language type="elx">elamita</language>
-			<language type="en">inglés</language>
-			<language type="en_AU">inglés australiano</language>
-			<language type="en_CA">inglés canadiense</language>
-			<language type="en_GB">inglés británico</language>
-			<language type="en_US">inglés estadounidense</language>
-			<language type="enm">inglés medieval</language>
-			<language type="eo">esperanto</language>
-			<language type="es">español</language>
-			<language type="es_419">español latinoamericano</language>
-			<language type="es_ES">español de España</language>
-			<language type="et">estonio</language>
-			<language type="eu">vasco</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persa</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fula</language>
-			<language type="fi">finés</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">lengua finoúgria</language>
-			<language type="fj">fidjiano</language>
-			<language type="fo">feroés</language>
-			<language type="fon">fon</language>
-			<language type="fr">francés</language>
-			<language type="fr_CA">francés canadiense</language>
-			<language type="fr_CH">francés de Suiza</language>
-			<language type="frm">francés medieval</language>
-			<language type="fro">francés antiguo</language>
-			<language type="frr">frisón septentrional</language>
-			<language type="frs">frisón oriental</language>
-			<language type="fur">friulano</language>
-			<language type="fy">frisón</language>
-			<language type="ga">irlandés</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">gaélico escocés</language>
-			<language type="gem">lengua germánica</language>
-			<language type="gez">geez</language>
-			<language type="gil">gilbertés</language>
-			<language type="gl">gallego</language>
-			<language type="gmh">alemán de la alta edad media</language>
-			<language type="gn">guaraní</language>
-			<language type="goh">alemán de la alta edad antigua</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gótico</language>
-			<language type="grb">grebo</language>
-			<language type="grc">griego antiguo</language>
-			<language type="gsw">alemán suizo</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">gaélico manés</language>
-			<language type="gwi">kutchin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiano</language>
-			<language type="he">hebreo</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hitita</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croata</language>
-			<language type="hsb">sorbio superior</language>
-			<language type="ht">haitiano</language>
-			<language type="hu">húngaro</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armenio</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesio</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">sichuan yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaq</language>
-			<language type="ilo">ilocano</language>
-			<language type="inc">lengua índica</language>
-			<language type="ine">lengua indoeuropea</language>
-			<language type="inh">ingush</language>
-			<language type="io">ido</language>
-			<language type="ira">lengua irania</language>
-			<language type="iro">lenguas iroquesas</language>
-			<language type="is">islandés</language>
-			<language type="it">italiano</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japonés</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judeo-persa</language>
-			<language type="jrb">judeo-árabe</language>
-			<language type="jv">javanés</language>
-			<language type="ka">georgiano</language>
-			<language type="kaa">karakalpako</language>
-			<language type="kab">cabila</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardiano</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">lengua joisana</language>
-			<language type="kho">kotanés</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazajo</language>
-			<language type="kl">groenlandés</language>
-			<language type="km">jemer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">canarés</language>
-			<language type="ko">coreano</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraeano</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">carelio</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">cachemiro</language>
-			<language type="ku">kurdo</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">córnico</language>
-			<language type="ky">kirghiz</language>
-			<language type="la">latín</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgués</language>
-			<language type="lez">lezgiano</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgués</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosiano</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituano</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseño</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">letón</language>
-			<language type="mad">madurés</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">macasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">lengua austronesia</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgache</language>
-			<language type="mga">irlandés medieval</language>
-			<language type="mh">marshalés</language>
-			<language type="mi">maorí</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">lenguas varias</language>
-			<language type="mk">macedonio</language>
-			<language type="mkh">lengua mon-jemer</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">manchú</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">lenguas manobo</language>
-			<language type="mo">moldavo</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malayo</language>
-			<language type="mt">maltés</language>
-			<language type="mul">lenguas múltiples</language>
-			<language type="mun">lenguas munda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandés</language>
-			<language type="mwr">marwari</language>
-			<language type="my">birmano</language>
-			<language type="myn">maya</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauruano</language>
-			<language type="nah">náhuatl</language>
-			<language type="nai">lengua india norteamericana</language>
-			<language type="nap">napolitano</language>
-			<language type="nb">bokmal noruego</language>
-			<language type="nd">ndebele septentrional</language>
-			<language type="nds">bajo alemán</language>
-			<language type="ne">nepalí</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">lengua níger-cordofana</language>
-			<language type="niu">niueano</language>
-			<language type="nl">neerlandés</language>
-			<language type="nl_BE">flamenco</language>
-			<language type="nn">nynorsk noruego</language>
-			<language type="no">noruego</language>
-			<language type="nog">nogai</language>
-			<language type="non">nórdico antiguo</language>
-			<language type="nqo">n’ko</language>
-			<language type="nr">ndebele meridional</language>
-			<language type="nso">sotho septentrional</language>
-			<language type="nub">lenguas nubias</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">newari clásico</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitano</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">osético</language>
-			<language type="osa">osage</language>
-			<language type="ota">turco otomano</language>
-			<language type="oto">lenguas otomanas</language>
-			<language type="pa">punjabí</language>
-			<language type="paa">lengua papú</language>
-			<language type="pag">pangasinán</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauano</language>
-			<language type="peo">persa antiguo</language>
-			<language type="phi">lengua filipina</language>
-			<language type="phn">fenicio</language>
-			<language type="pi">pali</language>
-			<language type="pl">polaco</language>
-			<language type="pon">pohnpeiano</language>
-			<language type="pra">lenguas prácritas</language>
-			<language type="pro">provenzal antiguo</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugués</language>
-			<language type="pt_BR">portugués de Brasil</language>
-			<language type="pt_PT">portugués de Portugal</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongano</language>
-			<language type="rm">retorrománico</language>
-			<language type="rn">kiroundi</language>
-			<language type="ro">rumano</language>
-			<language type="roa">lengua romance</language>
-			<language type="rom">romaní</language>
-			<language type="root">raíz</language>
-			<language type="ru">ruso</language>
-			<language type="rup">arrumano</language>
-			<language type="rw">kinyarwanda</language>
-			<language type="sa">sánscrito</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">yakut</language>
-			<language type="sai">lengua india sudamericana</language>
-			<language type="sal">lenguas salish</language>
-			<language type="sam">arameo samaritano</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardo</language>
-			<language type="scn">siciliano</language>
-			<language type="sco">escocés</language>
-			<language type="sd">sindhi</language>
-			<language type="se">sami septentrional</language>
-			<language type="sel">selkup</language>
-			<language type="sem">lengua semítica</language>
-			<language type="sg">sango</language>
-			<language type="sga">irlandés antiguo</language>
-			<language type="sgn">lenguajes de signos</language>
-			<language type="sh">serbocroata</language>
-			<language type="shn">shan</language>
-			<language type="si">cingalés</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">lenguas sioux</language>
-			<language type="sit">lengua sino-tibetana</language>
-			<language type="sk">eslovaco</language>
-			<language type="sl">esloveno</language>
-			<language type="sla">lengua eslava</language>
-			<language type="sm">samoano</language>
-			<language type="sma">sami meridional</language>
-			<language type="smi">lengua sami</language>
-			<language type="smj">sami lule</language>
-			<language type="smn">sami inari</language>
-			<language type="sms">sami skolt</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninké</language>
-			<language type="so">somalí</language>
-			<language type="sog">sogdiano</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanés</language>
-			<language type="sr">serbio</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">siswati</language>
-			<language type="ssa">lengua nilo-sahariana</language>
-			<language type="st">sesotho</language>
-			<language type="su">sundanés</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerio</language>
-			<language type="sv">sueco</language>
-			<language type="sw">swahili</language>
-			<language type="syc">siríaco clásico</language>
-			<language type="syr">siriaco</language>
-			<language type="ta">tamil</language>
-			<language type="tai">lengua tai</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetún</language>
-			<language type="tg">tayiko</language>
-			<language type="th">tailandés</language>
-			<language type="ti">tigriña</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turcomano</language>
-			<language type="tkl">tokelauano</language>
-			<language type="tl">tagalo</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">setchwana</language>
-			<language type="to">tongano</language>
-			<language type="tog">tonga del Nyasa</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turco</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshiano</language>
-			<language type="tt">tártaro</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">lenguas tupí</language>
-			<language type="tut">lengua altaica</language>
-			<language type="tvl">tuvaluano</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitiano</language>
-			<language type="tyv">tuviniano</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigur</language>
-			<language type="uga">ugarítico</language>
-			<language type="uk">ucraniano</language>
-			<language type="umb">umbundu</language>
-			<language type="und">indeterminada</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbeko</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamita</language>
-			<language type="vo">volapük</language>
-			<language type="vot">vótico</language>
-			<language type="wa">valón</language>
-			<language type="wak">lenguas wakasha</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">lenguas sorbias</language>
-			<language type="wo">uolof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapés</language>
-			<language type="yi">yídish</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">lenguas yupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapoteco</language>
-			<language type="zbl">símbolos Bliss</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">chino</language>
-			<language type="zh_Hans">chino simplificado</language>
-			<language type="zh_Hant">chino tradicional</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulú</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">sin contenido lingüístico</language>
-			<language type="zza">zazaki</language>
-		</languages>
-		<scripts>
-			<script type="Arab">árabe</script>
-			<script type="Armn">armenio</script>
-			<script type="Avst">avéstico</script>
-			<script type="Bali">balinés</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalí</script>
-			<script type="Blis">símbolos blis</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginés</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cans">símbolos aborígenes canadienses unificados</script>
-			<script type="Cari">cario</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">copto</script>
-			<script type="Cprt">chipriota</script>
-			<script type="Cyrl">cirílico</script>
-			<script type="Cyrs">cirílico del antiguo eslavo eclesiástico</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egipcio demótico</script>
-			<script type="Egyh">egipcio hierático</script>
-			<script type="Egyp">jeroglíficos egipcios</script>
-			<script type="Ethi">etiópico</script>
-			<script type="Geok">georgiano eclesiástico</script>
-			<script type="Geor">georgiano</script>
-			<script type="Glag">glagolítico</script>
-			<script type="Goth">gótico</script>
-			<script type="Grek">griego</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmuji</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">han simplificado</script>
-			<script type="Hant">han tradicional</script>
-			<script type="Hebr">hebreo</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana o hiragana</script>
-			<script type="Hung">húngaro antiguo</script>
-			<script type="Inds">Indio (harappan)</script>
-			<script type="Ital">antigua bastardilla</script>
-			<script type="Java">javanés</script>
-			<script type="Jpan">japonés</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharosthi</script>
-			<script type="Khmr">jemer</script>
-			<script type="Knda">canarés</script>
-			<script type="Kore">coreano</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">latino fraktur</script>
-			<script type="Latg">latino gaélico</script>
-			<script type="Latn">latín</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineal A</script>
-			<script type="Linb">lineal B</script>
-			<script type="Lyci">licio</script>
-			<script type="Lydi">lidio</script>
-			<script type="Mand">mandeo</script>
-			<script type="Maya">jeroglíficos mayas</script>
-			<script type="Mero">meroítico</script>
-			<script type="Mlym">malayálam</script>
-			<script type="Mong">mongol</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">manipuri</script>
-			<script type="Mymr">birmano</script>
-			<script type="Nkoo">n’ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol ciki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmaniya</script>
-			<script type="Perm">permiano antiguo</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phnx">fenicio</script>
-			<script type="Plrd">Pollard Miao</script>
-			<script type="Qaai">heredado</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongo-rongo</script>
-			<script type="Runr">rúnico</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">shaviano</script>
-			<script type="Sinh">binhala</script>
-			<script type="Sund">sundanés</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">siriaco</script>
-			<script type="Syre">siriaco estrangelo</script>
-			<script type="Syrj">siriaco occidental</script>
-			<script type="Syrn">siriaco oriental</script>
-			<script type="Tagb">tagbanúa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">nuevo tai lue</script>
-			<script type="Taml">tamil</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalo</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tailandés</script>
-			<script type="Tibt">tibetano</script>
-			<script type="Ugar">ugarítico</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">lenguaje visible</script>
-			<script type="Xpeo">persa antiguo</script>
-			<script type="Xsux">cuneiforme sumerio-acadio</script>
-			<script type="Yiii">yi</script>
-			<script type="Zsym">símbolos</script>
-			<script type="Zxxx">no escrito</script>
-			<script type="Zyyy">común</script>
-			<script type="Zzzz">escritura desconocida o no válida</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mundo</territory>
-			<territory type="002">�frica</territory>
-			<territory type="003">América del Norte</territory>
-			<territory type="005">Suramérica</territory>
-			<territory type="009">Oceanía</territory>
-			<territory type="011">�frica occidental</territory>
-			<territory type="013">Centroamérica</territory>
-			<territory type="014">�frica oriental</territory>
-			<territory type="015">�frica septentrional</territory>
-			<territory type="017">�frica central</territory>
-			<territory type="018">�frica meridional</territory>
-			<territory type="019">Américas</territory>
-			<territory type="021">Norteamérica</territory>
-			<territory type="029">Caribe</territory>
-			<territory type="030">Asia oriental</territory>
-			<territory type="034">Asia meridional</territory>
-			<territory type="035">Sudeste asiático</territory>
-			<territory type="039">Europa meridional</territory>
-			<territory type="053">Australia y Nueva Zelanda</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Micronesia [057]</territory>
-			<territory type="061">Polinesia</territory>
-			<territory type="062">Asia centromeridional</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia central</territory>
-			<territory type="145">Asia occidental</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa oriental</territory>
-			<territory type="154">Europa septentrional</territory>
-			<territory type="155">Europa occidental</territory>
-			<territory type="172">Comunidad de Estados Independientes</territory>
-			<territory type="419">Latinoamérica y el Caribe</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiratos �rabes Unidos</territory>
-			<territory type="AF">Afganistán</territory>
-			<territory type="AG">Antigua y Barbuda</territory>
-			<territory type="AI">Anguila</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antillas Neerlandesas</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antártida</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americana</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Islas Ã…land</territory>
-			<territory type="AZ">Azerbaiyán</territory>
-			<territory type="BA">Bosnia-Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Bélgica</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahréin</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benín</territory>
-			<territory type="BL">San Bartolomé</territory>
-			<territory type="BM">Bermudas</territory>
-			<territory type="BN">Brunéi</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bután</territory>
-			<territory type="BV">Isla Bouvet</territory>
-			<territory type="BW">Botsuana</territory>
-			<territory type="BY">Bielorrusia</territory>
-			<territory type="BZ">Belice</territory>
-			<territory type="CA">Canadá</territory>
-			<territory type="CC">Islas Cocos</territory>
-			<territory type="CD">República Democrática del Congo</territory>
-			<territory type="CF">República Centroafricana</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suiza</territory>
-			<territory type="CI">Costa de Marfil</territory>
-			<territory type="CK">Islas Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerún</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia y Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cabo Verde</territory>
-			<territory type="CX">Isla Christmas</territory>
-			<territory type="CY">Chipre</territory>
-			<territory type="CZ">República Checa</territory>
-			<territory type="DE">Alemania</territory>
-			<territory type="DJ">Yibuti</territory>
-			<territory type="DK">Dinamarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">República Dominicana</territory>
-			<territory type="DZ">Argelia</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egipto</territory>
-			<territory type="EH">Sáhara Occidental</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">España</territory>
-			<territory type="ET">Etiopía</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Fiyi</territory>
-			<territory type="FK">Islas Malvinas</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Islas Feroe</territory>
-			<territory type="FR">Francia</territory>
-			<territory type="GA">Gabón</territory>
-			<territory type="GB">Reino Unido</territory>
-			<territory type="GD">Granada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guayana Francesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Groenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadalupe</territory>
-			<territory type="GQ">Guinea Ecuatorial</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GS">Islas Georgia del Sur y Sandwich del Sur</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Región Administrativa Especial de Hong Kong de la República Popular China</territory>
-			<territory type="HM">Islas Heard y McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croacia</territory>
-			<territory type="HT">Haití</territory>
-			<territory type="HU">Hungría</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isla de Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Territorio Británico del Océano �ndico</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Irán</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordania</territory>
-			<territory type="JP">Japón</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirguistán</territory>
-			<territory type="KH">Camboya</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoras</territory>
-			<territory type="KN">San Cristóbal y Nieves</territory>
-			<territory type="KP">Corea del Norte</territory>
-			<territory type="KR">Corea del Sur</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Islas Caimán</territory>
-			<territory type="KZ">Kazajistán</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Líbano</territory>
-			<territory type="LC">Santa Lucía</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Luxemburgo</territory>
-			<territory type="LV">Letonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Marruecos</territory>
-			<territory type="MC">Mónaco</territory>
-			<territory type="MD">Moldavia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">San Martín</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Islas Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Región Administrativa Especial de Macao de la República Popular China</territory>
-			<territory type="MP">Islas Marianas del Norte</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricio</territory>
-			<territory type="MV">Maldivas</territory>
-			<territory type="MW">Malaui</territory>
-			<territory type="MX">México</territory>
-			<territory type="MY">Malasia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nueva Caledonia</territory>
-			<territory type="NE">Níger</territory>
-			<territory type="NF">Isla Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Países Bajos</territory>
-			<territory type="NO">Noruega</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Isla Niue</territory>
-			<territory type="NZ">Nueva Zelanda</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panamá</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Polinesia Francesa</territory>
-			<territory type="PG">Papúa Nueva Guinea</territory>
-			<territory type="PH">Filipinas</territory>
-			<territory type="PK">Pakistán</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">San Pedro y Miquelón</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Territorios alejados de Oceanía</territory>
-			<territory type="QU">Unión Europea</territory>
-			<territory type="RE">Reunión</territory>
-			<territory type="RO">Rumanía</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rusia</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudí</territory>
-			<territory type="SB">Islas Salomón</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudán</territory>
-			<territory type="SE">Suecia</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Santa Elena</territory>
-			<territory type="SI">Eslovenia</territory>
-			<territory type="SJ">Svalbard y Jan Mayen</territory>
-			<territory type="SK">Eslovaquia</territory>
-			<territory type="SL">Sierra Leona</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Santo Tomé y Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Suazilandia</territory>
-			<territory type="TC">Islas Turcas y Caicos</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">Territorios Australes Franceses</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandia</territory>
-			<territory type="TJ">Tayikistán</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Oriental</territory>
-			<territory type="TM">Turkmenistán</territory>
-			<territory type="TN">Túnez</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquía</territory>
-			<territory type="TT">Trinidad y Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwán</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ucrania</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Islas menores alejadas de los Estados Unidos</territory>
-			<territory type="US">Estados Unidos</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistán</territory>
-			<territory type="VA">Ciudad del Vaticano</territory>
-			<territory type="VC">San Vicente y las Granadinas</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Islas Vírgenes Británicas</territory>
-			<territory type="VI">Islas Vírgenes de los Estados Unidos</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis y Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sudáfrica</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabue</territory>
-			<territory type="ZZ">Región desconocida o no válida</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Ortografía alemana tradicional</variant>
-			<variant type="1996">Ortografía alemana de 1996</variant>
-			<variant type="AREVELA">Armenio oriental</variant>
-			<variant type="FONIPA">alfabeto fonético internacional IPA</variant>
-			<variant type="MONOTON">Monotónico</variant>
-			<variant type="POLYTON">Politónico</variant>
-			<variant type="POSIX">Ordenador</variant>
-			<variant type="REVISED">Ortografía revisada</variant>
-			<variant type="VALENCIA">Valenciano</variant>
-		</variants>
-		<keys>
-			<key type="calendar">calendario</key>
-			<key type="collation">intercalación</key>
-			<key type="currency">moneda</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">orden del chino tradicional - Big5</type>
-			<type type="buddhist" key="calendar">calendario budista</type>
-			<type type="chinese" key="calendar">calendario chino</type>
-			<type type="direct" key="collation">orden directo</type>
-			<type type="gb2312han" key="collation">orden del chino simplificado - GB2312</type>
-			<type type="gregorian" key="calendar">calendario gregoriano</type>
-			<type type="hebrew" key="calendar">calendario hebreo</type>
-			<type type="indian" key="calendar">calendario nacional hindú</type>
-			<type type="islamic" key="calendar">calendario islámico</type>
-			<type type="islamic-civil" key="calendar">calendario civil islámico</type>
-			<type type="japanese" key="calendar">calendario japonés</type>
-			<type type="phonebook" key="collation">orden de listín telefónico</type>
-			<type type="pinyin" key="collation">orden pinyin</type>
-			<type type="roc" key="calendar">calendario de la República Popular de China</type>
-			<type type="stroke" key="collation">orden de los trazos</type>
-			<type type="traditional" key="collation">orden tradicional</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">métrico</measurementSystemName>
-			<measurementSystemName type="US">estadounidense</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Idioma: {0}</codePattern>
-			<codePattern type="script">Dialecto: {0}</codePattern>
-			<codePattern type="territory">Región: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="fields">lowercase-words</inText>
-		<inText type="keys">lowercase-words</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="long">lowercase-words</inText>
-		<inText type="measurementSystemNames">lowercase-words</inText>
-		<inText type="quarterWidth">lowercase-words</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="types">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á b-e é f-i í j-n ñ o ó p-u ú ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[à ă â å ä ã � æ-è ĕ ê ë ē ì ĭ î ï ī º ò � ô ö ø � œ ß ù ŭ û ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} – {1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ene</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">abr</month>
-							<month type="5">may</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">ago</month>
-							<month type="9">sep</month>
-							<month type="10">oct</month>
-							<month type="11">nov</month>
-							<month type="12">dic</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">enero</month>
-							<month type="2">febrero</month>
-							<month type="3">marzo</month>
-							<month type="4">abril</month>
-							<month type="5">mayo</month>
-							<month type="6">junio</month>
-							<month type="7">julio</month>
-							<month type="8">agosto</month>
-							<month type="9">septiembre</month>
-							<month type="10">octubre</month>
-							<month type="11">noviembre</month>
-							<month type="12">diciembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">E</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">lun</day>
-							<day type="tue">mar</day>
-							<day type="wed">mié</day>
-							<day type="thu">jue</day>
-							<day type="fri">vie</day>
-							<day type="sat">sáb</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domingo</day>
-							<day type="mon">lunes</day>
-							<day type="tue">martes</day>
-							<day type="wed">miércoles</day>
-							<day type="thu">jueves</day>
-							<day type="fri">viernes</day>
-							<day type="sat">sábado</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">J</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1er trimestre</quarter>
-							<quarter type="2">2º trimestre</quarter>
-							<quarter type="3">3er trimestre</quarter>
-							<quarter type="4">4º trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">antes de Cristo</era>
-						<era type="1">anno Dómini</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.C.</era>
-						<era type="1">d.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
-						<dateFormatItem id="MMd">d/MM</dateFormatItem>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd-MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ yyyy</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM-yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ 'de' yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H–H</greatestDifference>
-							<greatestDifference id="h">H–H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H:mm – H:mm</greatestDifference>
-							<greatestDifference id="h">H:mm – H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm – H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H:mm – H:mm v</greatestDifference>
-							<greatestDifference id="h">H:mm – H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm – H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H–H v</greatestDifference>
-							<greatestDifference id="h">H–H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
-							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d MMM – E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy – M/d/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy – d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/M/yy – E d/M/yy</greatestDifference>
-							<greatestDifference id="M">E d/M/yy – E d/M/yy</greatestDifference>
-							<greatestDifference id="y">E d/M/yy – E d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y – E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM–MM yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>año</displayName>
-					</field>
-					<field type="month">
-						<displayName>mes</displayName>
-					</field>
-					<field type="week">
-						<displayName>semana</displayName>
-					</field>
-					<field type="day">
-						<displayName>día</displayName>
-						<relative type="-3">Hace tres días</relative>
-						<relative type="-2">antes de ayer</relative>
-						<relative type="-1">ayer</relative>
-						<relative type="0">hoy</relative>
-						<relative type="1">mañana</relative>
-						<relative type="2">pasado mañana</relative>
-						<relative type="3">Dentro de tres días</relative>
-					</field>
-					<field type="weekday">
-						<displayName>día de la semana</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>periodo del día</displayName>
-					</field>
-					<field type="hour">
-						<displayName>hora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuto</displayName>
-					</field>
-					<field type="second">
-						<displayName>segundo</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Hora de {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Desconocida</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Anguila</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Ereván</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Polo Sur</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Hora de Argentina (Buenos Aires)</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelaida</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Sídney</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Bakú</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruselas</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofía</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahráin</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Portonovo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudas</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Brunéi</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Río Branco</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Bahía</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belice</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Hora de Canadá (Edmonton)</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Hora de Canadá (Regina)</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Hora de Canadá (Winnipeg)</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Hora de Canadá (Halifax)</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. John’s</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zúrich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Isla de Pascua</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>La Habana</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cabo Verde</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Praga</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlín</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Yibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhague</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Argelia</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>El Cairo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Islas Canarias</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fiyi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Chuuk</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Islas Feroe</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>París</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londres</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tiflis</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Cayena</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atenas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Georgia del Sur</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Puerto Príncipe</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Yakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublín</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jerusalén</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teherán</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reikiavik</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comoras</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seúl</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caimán</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktobe</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vientián</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Santa Lucía</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilna</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburgo</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Trípoli</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Mónaco</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangún</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulán Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricio</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivas</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Katmandú</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Tahití</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsovia</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Miquelón</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Islas Pitcairn</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Palaos</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunión</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrado</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscú</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgogrado</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Yekaterinburgo</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sajalín</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riad</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Jartún</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Estocolmo</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Santa Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Santo Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damasco</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Duchanbé</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Asjabad</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Túnez</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Estambul</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Puerto España</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulú</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Los �ngeles</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Centro</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianápolis</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Nueva York</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcanda</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>San Vicente</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johannesburgo</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Hora de Acre</standard>
-					<daylight>Hora de verano de Acre</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Hora de Afganistán</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Hora de �frica central</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Hora de �frica oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Hora de Sudáfrica</generic>
-					<standard>Hora estándar de �frica meridional</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Hora de �frica occidental</standard>
-					<daylight>Hora de verano de �frica occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Hora de Aktyubinsk</standard>
-					<daylight>Hora de verano de Aktyubinsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Hora de Alaska</generic>
-					<standard>Hora estándar de Alaska</standard>
-					<daylight>Hora de verano de Alaska</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Hora de Alaska-Hawái</generic>
-					<standard>Hora estándar de Alaska-Hawái</standard>
-					<daylight>Hora de verano de Alaska-Hawái</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Hora del Amazonas</standard>
-					<daylight>Hora de verano del Amazonas</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Hora central</generic>
-					<standard>Hora estándar central</standard>
-					<daylight>Hora de verano central</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Hora oriental</generic>
-					<standard>Hora estándar oriental</standard>
-					<daylight>Hora de verano oriental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Hora de las Montañas</generic>
-					<standard>Hora estándar de Montaña</standard>
-					<daylight>Hora de verano de Montaña</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Hora del Pacífico</generic>
-					<standard>Hora estándar del Pacífico</standard>
-					<daylight>Hora de verano del Pacífico</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Hora de Aktau</standard>
-					<daylight>Hora de verano de Aktau</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aktau)</standard>
-					<daylight>AQTST (Aktau)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Hora de Aktobe</standard>
-					<daylight>Hora de verano de Aktobe</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aktobe)</standard>
-					<daylight>AQTST (Aktobe)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Hora de Arabia</generic>
-					<standard>Hora estándar de Arabia</standard>
-					<daylight>Hora de verano de Arabia</daylight>
-				</long>
-				<short>
-					<generic>AT (Arabia)</generic>
-					<standard>AST (Arabia)</standard>
-					<daylight>ADT (Arabia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Hora de Argentina</standard>
-					<daylight>Hora de verano de Argentina</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Hora de Argentina occidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Hora de Armenia</standard>
-					<daylight>Hora de verano de Armenia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Hora de Asjabad</standard>
-					<daylight>Hora de verano de Asjabad</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Hora del Atlántico</generic>
-					<standard>Hora estándar del Atlántico</standard>
-					<daylight>Hora de verano del Atlántico</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Hora de Australia central</generic>
-					<standard>Hora estándar de Australia central</standard>
-					<daylight>Hora de verano de Australia central</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Hora de Australia centroccidental</generic>
-					<standard>Hora estándar de Australia centroccidental</standard>
-					<daylight>Hora de verano de Australia centroccidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Hora de Australia oriental</generic>
-					<standard>Hora estándar de Australia oriental</standard>
-					<daylight>Hora de verano de Australia oriental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Hora de Australia occidental</generic>
-					<standard>Hora estándar de Australia occidental</standard>
-					<daylight>Hora de verano de Australia occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Hora de Azerbaiyán</standard>
-					<daylight>Hora de verano de Azerbaiyán</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Hora de las Azores</standard>
-					<daylight>Hora de verano de las Azores</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Hora de Bakú</standard>
-					<daylight>Hora de verano de Bakú</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Hora de Bangladesh</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Hora de Bering</generic>
-					<standard>Hora estándar de Bering</standard>
-					<daylight>Hora de verano de Bering</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Hora de Bután</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Hora de Bolivia</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Hora de Borneo</standard>
-					<daylight>Hora de verano de Borneo</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Hora de Brasilia</standard>
-					<daylight>Hora de verano de Brasilia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Hora de Cabo Verde</standard>
-					<daylight>Hora de verano de Cabo Verde</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>Hora estándar de Chamorro</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Hora de Changbai</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Hora de Chile</standard>
-					<daylight>Hora de verano de Chile</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Hora de China</generic>
-					<standard>Hora estándar de China</standard>
-					<daylight>Hora de verano de China</daylight>
-				</long>
-				<short>
-					<standard>CST (China)</standard>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Hora de Choibalsan</standard>
-					<daylight>Hora de verano de Choibalsan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Hora de Colombia</standard>
-					<daylight>Hora de verano de Colombia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Hora de Cuba</generic>
-					<standard>Hora estándar de Cuba</standard>
-					<daylight>Hora de verano de Cuba</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Hora de Dacca</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Hora de Dusambé</standard>
-					<daylight>Hora de verano de Dusambé</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Hora de la Guayana Holandesa</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Hora de Timor Oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Hora de Ecuador</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Hora estándar de Europa Central</standard>
-					<daylight>Hora de verano de Europa Central</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Hora estándar de Europa del Este</standard>
-					<daylight>Hora de verano de Europa del Este</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Hora de Europa Occidental</standard>
-					<daylight>Hora de verano de Europa Occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Hora de la Guayana Francesa</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Hora de Frunze</standard>
-					<daylight>Hora de verano de Frunze</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Hora de Galápagos</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Hora de Georgia</standard>
-					<daylight>Hora de verano de Georgia</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Hora media de Greenwich</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Hora de Groenlandia central</standard>
-					<daylight>Hora de verano de Groenlandia central</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Hora de Groenlandia oriental</standard>
-					<daylight>Hora de verano de Groenlandia oriental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Hora de Groenlandia occidental</standard>
-					<daylight>Hora de verano de Groenlandia occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Hora estándar de Guam</standard>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Hora estándar del Golfo</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Hora de la Guyana</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<generic>Hora de Hawái-Aleutianas</generic>
-					<standard>Hora estándar de Hawái-Aleutianas</standard>
-					<daylight>Hora de verano de Hawái-Aleutianas</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hora de Hong Kong</standard>
-					<daylight>Hora de verano de Hong Kong</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Hora estándar de la India</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Hora de Indochina</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Hora de Indonesia central</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Hora de Indonesia oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Hora de Indonesia occidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Hora de Israel</generic>
-					<standard>Hora estándar de Israel</standard>
-					<daylight>Hora de verano de Israel</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Hora de Japón</generic>
-					<standard>Hora estándar de Japón</standard>
-					<daylight>Hora de verano de Japón</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Hora de Karachi</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Hora de Kashgar</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<standard>Hora estándar de Kazajistán oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<standard>Hora estándar de Kazajistán occidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Hora de Kizil Orda</standard>
-					<daylight>Hora de verano de Kizil Orda</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Hora de Corea</generic>
-					<standard>Hora estándar de Corea</standard>
-					<daylight>Hora de verano de Corea</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Hora de Kuíbyshev</standard>
-					<daylight>Hora de verano de Kuíbyshev</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Hora de Kwajalein</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Hora de Kirguistán</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Hora de Sri Lanka</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Hora de Long-Shu</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Hora de Lord Howe</generic>
-					<standard>Hora estándar de Lord Howe</standard>
-					<daylight>Hora de verano de Lord Howe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Hora de Macao</standard>
-					<daylight>Hora de verano de Macao</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Hora de Malaya</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Hora de Malasia</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Hora de las Islas Marshall</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Hora de Ulán Bator</standard>
-					<daylight>Hora de verano de Ulán Bator</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Hora de Moscú</generic>
-					<standard>Hora estándar de Moscú</standard>
-					<daylight>Hora de verano de Moscú</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Hora de Myanmar</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Hora de Nepal</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Hora de Nueva Zelanda</generic>
-					<standard>Hora estándar de Nueva Zelanda</standard>
-					<daylight>Hora de verano de Nueva Zelanda</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Hora de Terranova</generic>
-					<standard>Hora estándar de Newfoundland</standard>
-					<daylight>Hora de verano de Newfoundland</daylight>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Hora de Fernando de Noronha</standard>
-					<daylight>Hora de verano de Fernando de Noronha</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Hora de las Islas Marianas del Norte</standard>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Hora de Pakistán</standard>
-					<daylight>Hora de verano de Pakistán</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Hora de Paraguay</standard>
-					<daylight>Hora de verano de Paraguay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Hora de Perú</standard>
-					<daylight>Hora de verano de Perú</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Hora de Filipinas</standard>
-					<daylight>Hora de verano de Filipinas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Hora de San Pedro y Miquelón</generic>
-					<standard>Hora estándar de San Pedro y Miquelón</standard>
-					<daylight>Hora de verano de San Pedro y Miquelón</daylight>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Hora de Qyzylorda</standard>
-					<daylight>Hora de verano de Qyzylorda</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Hora de Samara</standard>
-					<daylight>Hora de verano de Samara</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Hora de Samarcanda</standard>
-					<daylight>Hora de verano de Samarcanda</daylight>
-				</long>
-				<short>
-					<standard>SAMT (Samarcanda)</standard>
-					<daylight>SAMST (Samarcanda)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Hora estándar de Samoa</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Hora de Shevchenko</standard>
-					<daylight>Hora de verano de Shevchenko</daylight>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Hora de Georgia meridional</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Hora de Surinam</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Hora de Sverdlovsk</standard>
-					<daylight>Hora de verano de Sverdlovsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Hora de Tayikistán</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Hora de Tashkent</standard>
-					<daylight>Hora de verano de Tashkent</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Hora de Tbilisi</standard>
-					<daylight>Hora de verano de Tbilisi</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Hora de Turquía</standard>
-					<daylight>Hora de verano de Turquía</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Hora de Turkmenistán</standard>
-					<daylight>Hora de verano de Turkmenistán</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Hora de Oral</standard>
-					<daylight>Hora de verano de Oral</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Hora de Uruguay</standard>
-					<daylight>Hora de verano de Uruguay</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Hora de Ürümqi</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Hora de Uzbekistán</standard>
-					<daylight>Hora de verano de Uzbekistán</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Hora de Venezuela</standard>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Hora de Volgogrado</standard>
-					<daylight>Hora de verano de Volgogrado</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Hora de Yekaterinburgo</standard>
-					<daylight>Hora de verano de Yekaterinburgo</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Hora de Ereván</standard>
-					<daylight>Hora de verano de Ereván</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Hora del Yukón</generic>
-					<standard>Hora estándar del Yukón</standard>
-					<daylight>Hora de verano del Yukón</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>peseta andorrana</displayName>
-				<displayName count="one">peseta andorrana</displayName>
-				<displayName count="other">pesetas andorranas</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>dírham de los Emiratos �rabes Unidos</displayName>
-				<displayName count="one">dirham de los Emiratos �rabes Unidos</displayName>
-				<displayName count="other">dirhams de los Emiratos �rabes Unidos</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afgani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afgani</displayName>
-				<displayName count="one">afgani afgano</displayName>
-				<displayName count="other">afganis afganos</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>lek albanés</displayName>
-				<displayName count="one">lek albanés</displayName>
-				<displayName count="other">lekë albaneses</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram armenio</displayName>
-				<displayName count="one">dram armenio</displayName>
-				<displayName count="other">dram armenios</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>florín de las Antillas Neerlandesas</displayName>
-				<displayName count="one">florín de las Antillas Neerlandesas</displayName>
-				<displayName count="other">florines de las Antillas Neerlandesas</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>kwanza angoleño</displayName>
-				<displayName count="one">kwanza angoleño</displayName>
-				<displayName count="other">kwanzas angoleños</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>kwanza angoleño (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>nuevo kwanza angoleño (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>kwanza reajustado angoleño (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>austral argentino</displayName>
-				<displayName count="one">austral argentino</displayName>
-				<displayName count="other">australes argentinos</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>peso argentino (1983-1985)</displayName>
-				<displayName count="one">peso argentino (ARP)</displayName>
-				<displayName count="other">pesos argentinos (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>peso argentino</displayName>
-				<displayName count="one">peso argentino</displayName>
-				<displayName count="other">pesos argentinos</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>chelín austriaco</displayName>
-				<displayName count="one">chelín austriaco</displayName>
-				<displayName count="other">chelines austriacos</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>dólar australiano</displayName>
-				<displayName count="one">dólar australiano</displayName>
-				<displayName count="other">dólares australianos</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>florín de Aruba</displayName>
-				<displayName count="one">florín de Aruba</displayName>
-				<displayName count="other">florines de Aruba</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>manat azerí (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat azerí</displayName>
-				<displayName count="one">manat azerí</displayName>
-				<displayName count="other">manat azeríes</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>dinar bosnio</displayName>
-				<displayName count="one">dinar bosnio</displayName>
-				<displayName count="other">dinares bosnios</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>marco convertible de Bosnia-Herzegovina</displayName>
-				<displayName count="one">marco convertible de Bosnia-Herzegovina</displayName>
-				<displayName count="other">marcos convertibles de Bosnia-Herzegovina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>dólar de Barbados</displayName>
-				<displayName count="one">dólar de Barbados</displayName>
-				<displayName count="other">dólares de Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka de Bangladesh</displayName>
-				<displayName count="one">taka de Bangladesh</displayName>
-				<displayName count="other">taka de Bangladesh</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>franco belga (convertible)</displayName>
-				<displayName count="one">franco belga (convertible)</displayName>
-				<displayName count="other">francos belgas (convertibles)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>franco belga</displayName>
-				<displayName count="one">franco belga</displayName>
-				<displayName count="other">francos belgas</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>franco belga (financiero)</displayName>
-				<displayName count="one">franco belga (financiero)</displayName>
-				<displayName count="other">francos belgas (financieros)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>lev fuerte búlgaro</displayName>
-				<displayName count="one">lev fuerte búlgaro</displayName>
-				<displayName count="other">leva fuertes búlgaros</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>nuevo lev búlgaro</displayName>
-				<displayName count="one">nuevo lev búlgaro</displayName>
-				<displayName count="other">nuevos leva búlgaros</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>dinar bahreiní</displayName>
-				<displayName count="one">dinar bahreiní</displayName>
-				<displayName count="other">dinares bahreiníes</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>franco de Burundi</displayName>
-				<displayName count="one">franco de Burundi</displayName>
-				<displayName count="other">francos de Burundi</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>dólar de Bermudas</displayName>
-				<displayName count="one">dólar de Bermudas</displayName>
-				<displayName count="other">dólares de Bermudas</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>dólar de Brunéi</displayName>
-				<displayName count="one">dólar de Brunéi</displayName>
-				<displayName count="other">dólares de Brunéi</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<displayName count="one">boliviano</displayName>
-				<displayName count="other">bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>peso boliviano</displayName>
-				<displayName count="one">peso boliviano</displayName>
-				<displayName count="other">pesos bolivianos</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>MVDOL boliviano</displayName>
-				<displayName count="one">MVDOL boliviano</displayName>
-				<displayName count="other">MVDOL bolivianos</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>nuevo cruceiro brasileño (1967-1986)</displayName>
-				<displayName count="one">nuevo cruzado brasileño (BRB)</displayName>
-				<displayName count="other">nuevos cruzados brasileños (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>cruzado brasileño</displayName>
-				<displayName count="one">cruzado brasileño</displayName>
-				<displayName count="other">cruzados brasileños</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>cruceiro brasileño (1990-1993)</displayName>
-				<displayName count="one">cruceiro brasileño (BRE)</displayName>
-				<displayName count="other">cruceiros brasileños (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>real brasileño</displayName>
-				<displayName count="one">real brasileño</displayName>
-				<displayName count="other">reales brasileños</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>nuevo cruzado brasileño</displayName>
-				<displayName count="one">nuevo cruzado brasileño</displayName>
-				<displayName count="other">nuevos cruzados brasileños</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>cruceiro brasileño</displayName>
-				<displayName count="one">cruceiro brasileño</displayName>
-				<displayName count="other">cruceiros brasileños</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>dólar de las Bahamas</displayName>
-				<displayName count="one">dólar de las Bahamas</displayName>
-				<displayName count="other">dólares de las Bahamas</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum butanés</displayName>
-				<displayName count="one">ngultrum butanés</displayName>
-				<displayName count="other">ngultrum butaneses</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat birmano</displayName>
-				<displayName count="one">kyat birmano</displayName>
-				<displayName count="other">kyat birmanos</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula botsuano</displayName>
-				<displayName count="one">pula botsuana</displayName>
-				<displayName count="other">pula botsuanas</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>nuevo rublo bielorruso (1994-1999)</displayName>
-				<displayName count="one">nuevo rublo bielorruso</displayName>
-				<displayName count="other">nuevos rublos bielorrusos</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>rublo bielorruso</displayName>
-				<displayName count="one">rublo bielorruso</displayName>
-				<displayName count="other">rublos bielorrusos</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>dólar de Belice</displayName>
-				<displayName count="one">dólar de Belice</displayName>
-				<displayName count="other">dólares de Belice</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>dólar canadiense</displayName>
-				<displayName count="one">dólar canadiense</displayName>
-				<displayName count="other">dólares canadienses</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>franco congoleño</displayName>
-				<displayName count="one">franco congoleño</displayName>
-				<displayName count="other">francos congoleños</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>euro WIR</displayName>
-				<displayName count="one">euro WIR</displayName>
-				<displayName count="other">euros WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>franco suizo</displayName>
-				<displayName count="one">franco suizo</displayName>
-				<displayName count="other">francos suizos</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>franco WIR</displayName>
-				<displayName count="one">franco WIR</displayName>
-				<displayName count="other">francos WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>unidad de fomento chilena</displayName>
-				<displayName count="one">unidad de fomento chilena</displayName>
-				<displayName count="other">unidades de fomento chilenas</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>peso chileno</displayName>
-				<displayName count="one">peso chileno</displayName>
-				<displayName count="other">pesos chilenos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>yuan renminbi chino</displayName>
-				<displayName count="one">yuan renminbi chino</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>peso colombiano</displayName>
-				<displayName count="one">peso colombiano</displayName>
-				<displayName count="other">pesos colombianos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>unidad de valor real colombiana</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidades de valor reales</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>colón costarricense</displayName>
-				<displayName count="one">colón costarricense</displayName>
-				<displayName count="other">colones costarricenses</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>antiguo dinar serbio</displayName>
-				<displayName count="one">antiguo dinar serbio</displayName>
-				<displayName count="other">antiguos dinares serbios</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>corona fuerte checoslovaca</displayName>
-				<displayName count="one">corona fuerte checoslovaca</displayName>
-				<displayName count="other">coronas fuertes checoslovacas</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>peso cubano</displayName>
-				<displayName count="one">peso cubano</displayName>
-				<displayName count="other">pesos cubanos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>escudo de Cabo Verde</displayName>
-				<displayName count="one">escudo de Cabo Verde</displayName>
-				<displayName count="other">escudos de Cabo Verde</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>libra chipriota</displayName>
-				<displayName count="one">libra chipriota</displayName>
-				<displayName count="other">libras chipriotas</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>corona checa</displayName>
-				<displayName count="one">corona checa</displayName>
-				<displayName count="other">coronas checas</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>ostmark de Alemania del Este</displayName>
-				<displayName count="one">marco de la República Democrática Alemana</displayName>
-				<displayName count="other">marcos de la República Democrática Alemana</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>marco alemán</displayName>
-				<displayName count="one">marco alemán</displayName>
-				<displayName count="other">marcos alemanes</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>franco de Yibuti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>corona danesa</displayName>
-				<displayName count="one">corona danesa</displayName>
-				<displayName count="other">coronas danesas</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>peso dominicano</displayName>
-				<displayName count="one">peso dominicano</displayName>
-				<displayName count="other">pesos dominicanos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar argelino</displayName>
-				<displayName count="one">dinar argelino</displayName>
-				<displayName count="other">dinares argelinos</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>sucre ecuatoriano</displayName>
-				<displayName count="one">sucre ecuatoriano</displayName>
-				<displayName count="other">sucres ecuatorianos</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>unidad de valor constante (UVC) ecuatoriana</displayName>
-				<displayName count="one">unidad de valor constante (UVC) ecuatoriana</displayName>
-				<displayName count="other">unidades de valor constante (UVC) ecuatorianas</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>corona estonia</displayName>
-				<displayName count="one">corona estonia</displayName>
-				<displayName count="other">coronas estonias</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>libra egipcia</displayName>
-				<displayName count="one">libra egipcia</displayName>
-				<displayName count="other">libras egipcias</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>nakfa eritreo</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>peseta española (cuenta A)</displayName>
-				<displayName count="one">peseta española (cuenta A)</displayName>
-				<displayName count="other">pesetas españolas (cuenta A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>peseta española (cuenta convertible)</displayName>
-				<displayName count="one">peseta española (cuenta convertible)</displayName>
-				<displayName count="other">pesetas españolas (cuenta convertible)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>peseta española</displayName>
-				<displayName count="one">peseta española</displayName>
-				<displayName count="other">pesetas españolas</displayName>
-				<symbol>₧</symbol>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr etíope</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>marco finlandés</displayName>
-				<displayName count="one">marco finlandés</displayName>
-				<displayName count="other">marcos finlandeses</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>dólar de las Islas Fiyi</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>libra de las Islas Malvinas</displayName>
-				<displayName count="one">libra de las Islas Malvinas</displayName>
-				<displayName count="other">libras de las Islas Malvinas</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>franco francés</displayName>
-				<displayName count="one">franco francés</displayName>
-				<displayName count="other">francos franceses</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>libra esterlina británica</displayName>
-				<displayName count="one">libra esterlina británica</displayName>
-				<displayName count="other">libras esterlinas británicas</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>kupon larit georgiano</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari georgiano</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>cedi ghanés</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>libra de Gibraltar</displayName>
-				<displayName count="one">libra gibraltareña</displayName>
-				<displayName count="other">libras gibraltareñas</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi gambiano</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>franco guineano</displayName>
-				<displayName count="one">franco guineano</displayName>
-				<displayName count="other">francos guineanos</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>syli guineano</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekuele de Guinea Ecuatorial</displayName>
-				<displayName count="one">ekuele de Guinea Ecuatorial</displayName>
-				<displayName count="other">ekueles de Guinea Ecuatorial</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>dracma griego</displayName>
-				<displayName count="one">dracma griego</displayName>
-				<displayName count="other">dracmas griegos</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal guatemalteco</displayName>
-				<displayName count="one">quetzal guatemalteco</displayName>
-				<displayName count="other">quetzales guatemaltecos</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>escudo de Guinea Portuguesa</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso de Guinea-Bissáu</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>dólar guyanés</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>dólar de Hong Kong</displayName>
-				<displayName count="one">dólar de Hong Kong</displayName>
-				<displayName count="other">dólares de Hong Kong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira hondureño</displayName>
-				<displayName count="one">lempira hondureño</displayName>
-				<displayName count="other">lempiras hondureños</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>dinar croata</displayName>
-				<displayName count="one">dinar croata</displayName>
-				<displayName count="other">dinares croatas</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna croata</displayName>
-				<displayName count="one">kuna croata</displayName>
-				<displayName count="other">kunas croatas</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde haitiano</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>florín húngaro</displayName>
-				<displayName count="one">florín húngaro</displayName>
-				<displayName count="other">florines húngaros</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>rupia indonesia</displayName>
-				<displayName count="one">rupia indonesia</displayName>
-				<displayName count="other">rupias indonesias</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>libra irlandesa</displayName>
-				<displayName count="one">libra irlandesa</displayName>
-				<displayName count="other">libras irlandesas</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>libra israelí</displayName>
-				<displayName count="one">libra israelí</displayName>
-				<displayName count="other">libras israelíes</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>nuevo sheqel israelí</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>rupia india</displayName>
-				<displayName count="one">rupia india</displayName>
-				<displayName count="other">rupias indias</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar iraquí</displayName>
-				<displayName count="one">dinar iraquí</displayName>
-				<displayName count="other">dinares iraquíes</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial iraní</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>corona islandesa</displayName>
-				<displayName count="one">corona islandesa</displayName>
-				<displayName count="other">coronas islandesas</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>lira italiana</displayName>
-				<displayName count="one">lira italiana</displayName>
-				<displayName count="other">liras italianas</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>dólar de Jamaica</displayName>
-				<displayName count="one">dólar de Jamaica</displayName>
-				<displayName count="other">dólares de Jamaica</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar jordano</displayName>
-				<displayName count="one">dinar jordano</displayName>
-				<displayName count="other">dinares jordanos</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>yen japonés</displayName>
-				<displayName count="one">yen japonés</displayName>
-				<displayName count="other">yenes japoneses</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>chelín keniata</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>som kirguís</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel camboyano</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>franco comorense</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>won norcoreano</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>won surcoreano</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar kuwaití</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>dólar de las Islas Caimán</displayName>
-				<displayName count="one">dólar de las Islas Caimán</displayName>
-				<displayName count="other">dólares de las Islas Caimán</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>tenge kazako</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip laosiano</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>libra libanesa</displayName>
-				<displayName count="one">libra libanesa</displayName>
-				<displayName count="other">libras libanesas</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>rupia de Sri Lanka</displayName>
-				<displayName count="one">rupia de Sri Lanka</displayName>
-				<displayName count="other">rupias de Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>dólar liberiano</displayName>
-				<displayName count="one">dólar liberiano</displayName>
-				<displayName count="other">dólares liberianos</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>loti lesothense</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litas lituano</displayName>
-				<displayName count="one">litas lituana</displayName>
-				<displayName count="other">litas lituanas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>talonas lituano</displayName>
-				<displayName count="one">talonas lituana</displayName>
-				<displayName count="other">talonas lituanas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>franco convertible luxemburgués</displayName>
-				<displayName count="one">franco convertible luxemburgués</displayName>
-				<displayName count="other">francos convertibles luxemburgueses</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>franco luxemburgués</displayName>
-				<displayName count="one">franco luxemburgués</displayName>
-				<displayName count="other">francos luxemburgueses</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>franco financiero luxemburgués</displayName>
-				<displayName count="one">franco financiero luxemburgués</displayName>
-				<displayName count="other">francos financieros luxemburgueses</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>lats letón</displayName>
-				<displayName count="one">lats letón</displayName>
-				<displayName count="other">lats letones</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>rublo letón</displayName>
-				<displayName count="one">rublo letón</displayName>
-				<displayName count="other">rublos letones</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar libio</displayName>
-				<displayName count="one">dinar libio</displayName>
-				<displayName count="other">dinares libios</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>dirham marroquí</displayName>
-				<displayName count="one">dirham marroquí</displayName>
-				<displayName count="other">dirhams marroquíes</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>franco marroquí</displayName>
-				<displayName count="one">franco marroquí</displayName>
-				<displayName count="other">francos marroquíes</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>leu moldavo</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>ariary malgache</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>franco malgache</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>dinar macedonio</displayName>
-				<displayName count="one">dinar macedonio</displayName>
-				<displayName count="other">dinares macedonios</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>franco malí</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat de Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>tugrik mongol</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>pataca de Macao</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>ouguiya mauritano</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>lira maltesa</displayName>
-				<displayName count="one">lira maltesa</displayName>
-				<displayName count="other">liras maltesas</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>libra maltesa</displayName>
-				<displayName count="one">libra maltesa</displayName>
-				<displayName count="other">libras maltesas</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>rupia mauriciana</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>rufiyaa de Maldivas</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>kwacha de Malawi</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>peso mexicano</displayName>
-				<displayName count="one">peso mexicano</displayName>
-				<displayName count="other">pesos mexicanos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>peso de plata mexicano (1861-1992)</displayName>
-				<displayName count="one">peso de plata mexicano (MXP)</displayName>
-				<displayName count="other">pesos de plata mexicanos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>unidad de inversión (UDI) mexicana</displayName>
-				<displayName count="one">unidad de inversión (UDI) mexicana</displayName>
-				<displayName count="other">unidades de inversión (UDI) mexicanas</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit malasio</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>escudo mozambiqueño</displayName>
-				<displayName count="one">escudo mozambiqueño</displayName>
-				<displayName count="other">escudos mozambiqueños</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>antiguo metical mozambiqueño</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical mozambiqueño</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>dólar de Namibia</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>naira nigeriano</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>córdoba nicaragüense</displayName>
-				<displayName count="one">córdoba nicaragüense</displayName>
-				<displayName count="other">córdobas nicaragüenses</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>córdoba oro nicaragüense</displayName>
-				<displayName count="one">córdoba oro nicaragüense</displayName>
-				<displayName count="other">córdobas oro nicaragüenses</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>florín neerlandés</displayName>
-				<displayName count="one">florín neerlandés</displayName>
-				<displayName count="other">florines neerlandeses</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>corona noruega</displayName>
-				<displayName count="one">corona noruega</displayName>
-				<displayName count="other">coronas noruegas</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>rupia nepalesa</displayName>
-				<displayName count="one">rupia nepalesa</displayName>
-				<displayName count="other">rupias nepalesas</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>dólar neozelandés</displayName>
-				<displayName count="one">dólar neozelandés</displayName>
-				<displayName count="other">dólares neozelandeses</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>rial omaní</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panameño</displayName>
-				<displayName count="one">balboa panameño</displayName>
-				<displayName count="other">balboas panameños</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>inti peruano</displayName>
-				<displayName count="one">inti peruano</displayName>
-				<displayName count="other">intis peruanos</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>nuevo sol peruano</displayName>
-				<displayName count="one">nuevo sol peruano</displayName>
-				<displayName count="other">nuevos soles peruanos</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol peruano</displayName>
-				<displayName count="one">sol peruano</displayName>
-				<displayName count="other">soles peruanos</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina de Papúa Nueva Guinea</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>peso filipino</displayName>
-				<displayName count="one">peso filipino</displayName>
-				<displayName count="other">pesos filipinos</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>rupia pakistaní</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>zloty polaco</displayName>
-				<displayName count="one">zloty polaco</displayName>
-				<displayName count="other">zlotys polacos</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>zloty polaco (1950-1995)</displayName>
-				<displayName count="one">zloty polaco (PLZ)</displayName>
-				<displayName count="other">zlotys polacos (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>escudo portugués</displayName>
-				<displayName count="one">escudo portugués</displayName>
-				<displayName count="other">escudos portugueses</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guaraní paraguayo</displayName>
-				<displayName count="one">guaraní paraguayo</displayName>
-				<displayName count="other">guaraníes paraguayos</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>riyal de Qatar</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>dólar rodesiano</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>antiguo leu rumano</displayName>
-				<displayName count="one">antiguo leu rumano</displayName>
-				<displayName count="other">antiguos lei rumanos</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>leu rumano</displayName>
-				<displayName count="one">leu rumano</displayName>
-				<displayName count="other">lei rumanos</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar serbio</displayName>
-				<displayName count="one">dinar serbio</displayName>
-				<displayName count="other">dinares serbios</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>rublo ruso</displayName>
-				<displayName count="one">rublo ruso</displayName>
-				<displayName count="other">rublos rusos</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>rublo ruso (1991-1998)</displayName>
-				<displayName count="one">rublo ruso (RUR)</displayName>
-				<displayName count="other">rublos rusos (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>franco ruandés</displayName>
-				<displayName count="one">franco ruandés</displayName>
-				<displayName count="other">francos ruandeses</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>riyal saudí</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>dólar de las Islas Salomón</displayName>
-				<displayName count="one">dólar de las Islas Salomón</displayName>
-				<displayName count="other">dólares de las Islas Salomón</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>rupia de Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar sudanés</displayName>
-				<displayName count="one">dinar sudanés</displayName>
-				<displayName count="other">dinares sudaneses</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>libra sudanesa</displayName>
-				<displayName count="one">libra sudanesa</displayName>
-				<displayName count="other">libras sudanesas</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>libra sudanesa antigua</displayName>
-				<displayName count="one">libra sudanesa antigua</displayName>
-				<displayName count="other">libras sudanesas antiguas</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>corona sueca</displayName>
-				<displayName count="one">corona sueca</displayName>
-				<displayName count="other">coronas suecas</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>dólar singapurense</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>libra de Santa Elena</displayName>
-				<displayName count="one">libra de Santa Elena</displayName>
-				<displayName count="other">libras de Santa Elena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>tólar esloveno</displayName>
-				<displayName count="one">tólar esloveno</displayName>
-				<displayName count="other">tólares eslovenos</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>corona eslovaca</displayName>
-				<displayName count="one">corona eslovaca</displayName>
-				<displayName count="other">coronas eslovacas</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leone de Sierra Leona</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>chelín somalí</displayName>
-				<displayName count="one">chelín somalí</displayName>
-				<displayName count="other">chelines somalíes</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>dólar surinamés</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>florín surinamés</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra de Santo Tomé y Príncipe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>rublo soviético</displayName>
-				<displayName count="one">rublo soviético</displayName>
-				<displayName count="other">rublos soviéticos</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>colón salvadoreño</displayName>
-				<displayName count="one">colón salvadoreño</displayName>
-				<displayName count="other">colones salvadoreños</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>libra siria</displayName>
-				<displayName count="one">libra siria</displayName>
-				<displayName count="other">libras sirias</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>lilangeni suazi</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>baht tailandés</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>rublo tayiko</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>somoni tayiko</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>manat turcomano</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunecino</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>paʻanga tongano</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>escudo timorense</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>lira turca antigua</displayName>
-				<displayName count="one">lira turca antigua</displayName>
-				<displayName count="other">liras turcas antiguas</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>nueva lira turca</displayName>
-				<displayName count="one">lira turca</displayName>
-				<displayName count="other">liras turcas</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dólar de Trinidad y Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>nuevo dólar taiwanés</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>chelín tanzano</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>grivna ucraniana</displayName>
-				<displayName count="one">grivnia ucraniana</displayName>
-				<displayName count="other">grivnias ucranianas</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>karbovanet ucraniano</displayName>
-				<displayName count="one">karbovanet ucraniano</displayName>
-				<displayName count="other">karbovanets ucranianos</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>chelín ugandés (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>chelín ugandés</displayName>
-				<displayName count="one">chelín ugandés</displayName>
-				<displayName count="other">chelines ugandeses</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>dólar estadounidense</displayName>
-				<displayName count="one">dólar estadounidense</displayName>
-				<displayName count="other">dólares estadounidenses</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>dólar estadounidense (día siguiente)</displayName>
-				<displayName count="one">dólar estadounidense (día siguiente)</displayName>
-				<displayName count="other">dólares estadounidenses (día siguiente)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>dólar estadounidense (mismo día)</displayName>
-				<displayName count="one">dólar estadounidense (mismo día)</displayName>
-				<displayName count="other">dólares estadounidenses (mismo día)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>peso uruguayo en unidades indexadas</displayName>
-				<displayName count="one">peso uruguayo en unidades indexadas</displayName>
-				<displayName count="other">pesos uruguayos en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>peso uruguayo (1975-1993)</displayName>
-				<displayName count="one">peso uruguayo (UYP)</displayName>
-				<displayName count="other">pesos uruguayos (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>peso uruguayo</displayName>
-				<displayName count="one">peso uruguayo</displayName>
-				<displayName count="other">pesos uruguayos</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>sum uzbeko</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>bolívar venezolano</displayName>
-				<displayName count="one">bolívar venezolano</displayName>
-				<displayName count="other">bolívares venezolanos</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>bolívar fuerte venezolano</displayName>
-				<displayName count="one">bolívar fuerte venezolano</displayName>
-				<displayName count="other">bolívares fuertes venezolanos</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>dong vietnamita</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vatu vanuatuense</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>tala samoano</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>franco CFA BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>plata</displayName>
-				<displayName count="one">plata</displayName>
-				<displayName count="other">plata</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>oro</displayName>
-				<displayName count="one">oro</displayName>
-				<displayName count="other">oro</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>unidad compuesta europea</displayName>
-				<displayName count="one">unidad compuesta europea</displayName>
-				<displayName count="other">unidades compuestas europeas</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>unidad monetaria europea</displayName>
-				<displayName count="one">unidad monetaria europea</displayName>
-				<displayName count="other">unidades monetarias europeas</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>unidad de cuenta europea (XBC)</displayName>
-				<displayName count="one">unidad de cuenta europea (XBC)</displayName>
-				<displayName count="other">unidades de cuenta europeas (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>unidad de cuenta europea (XBD)</displayName>
-				<displayName count="one">unidad de cuenta europea (XBD)</displayName>
-				<displayName count="other">unidades de cuenta europeas (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>dólar del Caribe Oriental</displayName>
-				<displayName count="one">dólar del Caribe Oriental</displayName>
-				<displayName count="other">dólares del Caribe Oriental</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>derechos especiales de giro</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>unidad de moneda europea</displayName>
-				<displayName count="one">unidad de moneda europea</displayName>
-				<displayName count="other">unidades de moneda europeas</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>franco oro francés</displayName>
-				<displayName count="one">franco oro francés</displayName>
-				<displayName count="other">francos oro franceses</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>franco UIC francés</displayName>
-				<displayName count="one">franco UIC francés</displayName>
-				<displayName count="other">francos UIC franceses</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>franco CFA BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>paladio</displayName>
-				<displayName count="one">paladio</displayName>
-				<displayName count="other">paladio</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>franco CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platino</displayName>
-				<displayName count="one">platino</displayName>
-				<displayName count="other">platino</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>fondos RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>código reservado para pruebas</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Sin divisa</displayName>
-				<displayName count="one">moneda desconocida/no válida</displayName>
-				<displayName count="other">monedas desconocidas/no válidas</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>dinar yemení</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>rial yemení</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>dinar fuerte yugoslavo</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>super dinar yugoslavo</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>dinar convertible yugoslavo</displayName>
-				<displayName count="one">dinar convertible yugoslavo</displayName>
-				<displayName count="other">dinares convertibles yugoslavos</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>rand sudafricano (financiero)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand sudafricano</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>kwacha zambiano</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>nuevo zaire zaireño</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zaire zaireño</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>dólar de Zimbabue</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} día</unitPattern>
-			<unitPattern count="other">{0} días</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hora</unitPattern>
-			<unitPattern count="other">{0} horas</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuto</unitPattern>
-			<unitPattern count="other">{0} minutos</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mes</unitPattern>
-			<unitPattern count="other">{0} meses</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segundo</unitPattern>
-			<unitPattern count="other">{0} segundos</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} semana</unitPattern>
-			<unitPattern count="other">{0} semanas</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} año</unitPattern>
-			<unitPattern count="other">{0} años</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>sí:si:s</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_AR.xml b/airtime_mvc/library/Zend/Locale/Data/es_AR.xml
deleted file mode 100644
index bd605cae1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_AR.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.63 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="es"/>
-		<territory type="AR"/>
-	</identity>
-	<localeDisplayNames>
-		<territories>
-			<territory type="HK">Hong Kong</territory>
-			<territory type="MO">Macao</territory>
-		</territories>
-		<variants>
-			<variant type="REVISED">Ortografía revisada</variant>
-		</variants>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">métrico</measurementSystemName>
-			<measurementSystemName type="US">estadounidense</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH'h'''mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MEd">E d-M</dateFormatItem>
-						<dateFormatItem id="yM">M-yyyy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ARS">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_BO.xml b/airtime_mvc/library/Zend/Locale/Data/es_BO.xml
deleted file mode 100644
index ff64310ee..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_BO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="BO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_CL.xml b/airtime_mvc/library/Zend/Locale/Data/es_CL.xml
deleted file mode 100644
index 68a857656..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_CL.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.64 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="es"/>
-		<territory type="CL"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="arn">mapudungun</language>
-			<language type="ira">iraníes</language>
-		</languages>
-		<scripts>
-			<script type="Bali">balinés</script>
-		</scripts>
-		<territories>
-			<territory type="005">Sudamérica</territory>
-			<territory type="AN">Antillas Holandesas</territory>
-			<territory type="AZ">Azerbayán</territory>
-			<territory type="EH">Sahara Occidental</territory>
-			<territory type="PS">Territorio Palestino</territory>
-			<territory type="RO">Rumania</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="TZ">Tanzanía</territory>
-		</territories>
-		<keys>
-			<key type="currency">divisa</key>
-		</keys>
-		<types>
-			<type type="phonebook" key="collation">orden de directorio telefónico</type>
-		</types>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd-MM - dd-MM</greatestDifference>
-							<greatestDifference id="M">dd-MM - dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd-MM - E dd-MM</greatestDifference>
-							<greatestDifference id="M">E dd-MM - E dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM-yy - MM-yy</greatestDifference>
-							<greatestDifference id="y">MM-yy - MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">dd-MM-yy - dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="CLP">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_CO.xml b/airtime_mvc/library/Zend/Locale/Data/es_CO.xml
deleted file mode 100644
index 2a4bec5e7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_CO.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="es"/>
-		<territory type="CO"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="COP">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_CR.xml b/airtime_mvc/library/Zend/Locale/Data/es_CR.xml
deleted file mode 100644
index a70a51b1f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_CR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.55 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="CR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_DO.xml b/airtime_mvc/library/Zend/Locale/Data/es_DO.xml
deleted file mode 100644
index fa686b5ec..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_DO.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="DO"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_EC.xml b/airtime_mvc/library/Zend/Locale/Data/es_EC.xml
deleted file mode 100644
index 16cf76004..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_EC.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-		<territory type="EC"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<timeFormats>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="USD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_ES.xml b/airtime_mvc/library/Zend/Locale/Data/es_ES.xml
deleted file mode 100644
index 66208089c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_ES.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="ES"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_GT.xml b/airtime_mvc/library/Zend/Locale/Data/es_GT.xml
deleted file mode 100644
index fa018cb79..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_GT.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.59 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-		<territory type="GT"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="GTQ">
-				<symbol>Q</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_HN.xml b/airtime_mvc/library/Zend/Locale/Data/es_HN.xml
deleted file mode 100644
index a55ffe386..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_HN.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.60 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="es"/>
-		<territory type="HN"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd 'de' MMM</greatestDifference>
-							<greatestDifference id="M">dd 'de' MMM 'al' dd 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E dd 'al' E dd 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E dd 'de' MMM 'al' E dd 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">dd 'de' MMM 'al' dd 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">dd 'de' MMM 'de' y 'al' dd 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd 'al' E dd 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E dd 'de' MMM 'al' E dd 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E dd 'de' MMM 'de' y 'al' E dd 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="HNL">
-				<symbol>L</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_MX.xml b/airtime_mvc/library/Zend/Locale/Data/es_MX.xml
deleted file mode 100644
index a2c97a63c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_MX.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="MX"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="MXN">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_NI.xml b/airtime_mvc/library/Zend/Locale/Data/es_NI.xml
deleted file mode 100644
index 4e8dc8d84..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_NI.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="NI"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_PA.xml b/airtime_mvc/library/Zend/Locale/Data/es_PA.xml
deleted file mode 100644
index fba18aab1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_PA.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.60 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-		<territory type="PA"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MM/dd/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>MM/dd/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM/dd - MM/dd</greatestDifference>
-							<greatestDifference id="M">MM/dd - MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E MM/dd - E MM/dd</greatestDifference>
-							<greatestDifference id="M">E MM/dd - E MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">MM/dd/yy - MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_PE.xml b/airtime_mvc/library/Zend/Locale/Data/es_PE.xml
deleted file mode 100644
index 7ee4789c1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_PE.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-		<territory type="PE"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH'H'mm''ss&quot; zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_PR.xml b/airtime_mvc/library/Zend/Locale/Data/es_PR.xml
deleted file mode 100644
index 7b94e928f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_PR.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="es"/>
-		<territory type="PR"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MM/dd/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>MM/dd/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM/dd - MM/dd</greatestDifference>
-							<greatestDifference id="M">MM/dd - MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E MM/dd - E MM/dd</greatestDifference>
-							<greatestDifference id="M">E MM/dd - E MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">MM/dd/yy - MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">E MM/dd/yy - E MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="USD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_PY.xml b/airtime_mvc/library/Zend/Locale/Data/es_PY.xml
deleted file mode 100644
index 01591a64b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_PY.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.55 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="PY"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_SV.xml b/airtime_mvc/library/Zend/Locale/Data/es_SV.xml
deleted file mode 100644
index b3c80e7ac..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_SV.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="SV"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_US.xml b/airtime_mvc/library/Zend/Locale/Data/es_US.xml
deleted file mode 100644
index d6d4cf39a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_US.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.71 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="es"/>
-		<territory type="US"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MMd">MM/d</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} a el {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d - M/d</greatestDifference>
-							<greatestDifference id="M">M/d - M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E M/d - E M/d</greatestDifference>
-							<greatestDifference id="M">E M/d - E M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy - M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy - M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="M">M/d/yy - M/d/yy</greatestDifference>
-							<greatestDifference id="y">M/d/yy - M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E M/d/yy - E M/d/yy</greatestDifference>
-							<greatestDifference id="M">E M/d/yy - E M/d/yy</greatestDifference>
-							<greatestDifference id="y">E M/d/yy - E M/d/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y 'a' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM 'al' d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y 'al' d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E d 'de' MMM 'al' E d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E d 'de' MMM 'de' y 'al' E d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="JPY">
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_UY.xml b/airtime_mvc/library/Zend/Locale/Data/es_UY.xml
deleted file mode 100644
index 6352d04f2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_UY.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="UY"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="UYU">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/es_VE.xml b/airtime_mvc/library/Zend/Locale/Data/es_VE.xml
deleted file mode 100644
index 913e03b77..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/es_VE.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.55 $"/>
-		<generation date="$Date: 2009/05/05 23:06:35 $"/>
-		<language type="es"/>
-		<territory type="VE"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/et.xml b/airtime_mvc/library/Zend/Locale/Data/et.xml
deleted file mode 100644
index df02844c6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/et.xml
+++ /dev/null
@@ -1,1983 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.95 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="et"/>
-	</identity>
-	<fallback>en fi</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afari</language>
-			<language type="ab">abhaasi</language>
-			<language type="ace">atšehi</language>
-			<language type="ach">akoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adõgee</language>
-			<language type="ae">avesta</language>
-			<language type="af">afrikaani</language>
-			<language type="afa">muu afroaasia</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akani</language>
-			<language type="akk">akadi</language>
-			<language type="ale">aleuudi</language>
-			<language type="alg">algonkini keeled</language>
-			<language type="alt">altai</language>
-			<language type="am">amhari</language>
-			<language type="an">aragoni</language>
-			<language type="ang">vanainglise</language>
-			<language type="anp">angika</language>
-			<language type="apa">apatši keeled</language>
-			<language type="ar">araabia</language>
-			<language type="arc">aramea</language>
-			<language type="arn">araukaani</language>
-			<language type="arp">arapaho</language>
-			<language type="art">muu tehiskeel</language>
-			<language type="arw">aravaki</language>
-			<language type="as">assami</language>
-			<language type="ast">astuuria</language>
-			<language type="ath">atapaski keeled</language>
-			<language type="aus">Austraalia keeled</language>
-			<language type="av">avaari</language>
-			<language type="awa">avadhi</language>
-			<language type="ay">aimara</language>
-			<language type="az">aserbaidžaani</language>
-			<language type="ba">baškiiri</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke keeled</language>
-			<language type="bal">belutši</language>
-			<language type="ban">bali</language>
-			<language type="bas">basa</language>
-			<language type="bat">muu balti</language>
-			<language type="be">valgevene</language>
-			<language type="bej">bedža</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberi</language>
-			<language type="bg">bulgaaria</language>
-			<language type="bh">bihaari</language>
-			<language type="bho">bhodžpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikoli</language>
-			<language type="bin">edo</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tiibeti</language>
-			<language type="br">bretooni</language>
-			<language type="bra">bradži</language>
-			<language type="bs">bosnia</language>
-			<language type="btk">bataki</language>
-			<language type="bua">burjaadi</language>
-			<language type="bug">bugi</language>
-			<language type="byn">bilini</language>
-			<language type="ca">katalaani</language>
-			<language type="cad">kado</language>
-			<language type="cai">muu Kesk-Ameerika indiaani</language>
-			<language type="car">kariibi</language>
-			<language type="cau">muu Kaukaasia</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tšetšeeni</language>
-			<language type="ceb">sebu</language>
-			<language type="cel">muu keldi</language>
-			<language type="ch">tšamorro</language>
-			<language type="chb">tšibtša</language>
-			<language type="chg">tšagatai</language>
-			<language type="chk">tšuugi</language>
-			<language type="chm">mari</language>
-			<language type="chn">tšinuki žargoon</language>
-			<language type="cho">tšokto</language>
-			<language type="chp">tšipevai</language>
-			<language type="chr">tšerokii</language>
-			<language type="chy">Å¡aieeni</language>
-			<language type="cmc">tšami keeled</language>
-			<language type="co">korsika</language>
-			<language type="cop">kopti</language>
-			<language type="cpe">muud inglispõhjalised kreool- ja pidžinkeeled</language>
-			<language type="cpf">muud prantsuspõhjalised kreool- ja pidžinkeeled</language>
-			<language type="cpp">muud portugalipõhjalised kreool- ja pidžinkeeled</language>
-			<language type="cr">krii</language>
-			<language type="crh">krimmitatari</language>
-			<language type="crp">muud kreool- ja pidžinkeeled</language>
-			<language type="cs">tšehhi</language>
-			<language type="csb">kašuubi</language>
-			<language type="cu">kirikuslaavi</language>
-			<language type="cus">muu kuši keel</language>
-			<language type="cv">tšuvaši</language>
-			<language type="cy">kõmri</language>
-			<language type="da">taani</language>
-			<language type="dak">siuu</language>
-			<language type="dar">dargi</language>
-			<language type="day">dajaki</language>
-			<language type="de">saksa</language>
-			<language type="del">delavari</language>
-			<language type="den">sleivi</language>
-			<language type="dgr">dogribi</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">muu draviidi keel</language>
-			<language type="dsb">alamsorbi</language>
-			<language type="dua">duala</language>
-			<language type="dum">keskhollandi</language>
-			<language type="dv">maldiivi</language>
-			<language type="dyu">djula</language>
-			<language type="dz">bhutani</language>
-			<language type="ee">eve</language>
-			<language type="efi">ibibio</language>
-			<language type="egy">muinasegiptuse</language>
-			<language type="eka">ekadžuki</language>
-			<language type="el">kreeka</language>
-			<language type="elx">eelami</language>
-			<language type="en">inglise</language>
-			<language type="en_US">inglise (USA)</language>
-			<language type="enm">keskinglise</language>
-			<language type="eo">esperanto</language>
-			<language type="es">hispaania</language>
-			<language type="et">eesti</language>
-			<language type="eu">baski</language>
-			<language type="ewo">evondo</language>
-			<language type="fa">pärsia</language>
-			<language type="fan">fangi</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulbe</language>
-			<language type="fi">soome</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">muu soomeugri</language>
-			<language type="fj">fidži</language>
-			<language type="fo">fääri</language>
-			<language type="fon">foni</language>
-			<language type="fr">prantsuse</language>
-			<language type="frm">keskprantsuse</language>
-			<language type="fro">vanaprantsuse</language>
-			<language type="frr">põhjafriisi</language>
-			<language type="frs">idafriisi</language>
-			<language type="fur">friuuli</language>
-			<language type="fy">läänefriisi</language>
-			<language type="ga">iiri</language>
-			<language type="gaa">gaa</language>
-			<language type="gay">gajo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">gaeli</language>
-			<language type="gem">muu germaani</language>
-			<language type="gez">etioopia</language>
-			<language type="gil">kiribati</language>
-			<language type="gl">galeegi</language>
-			<language type="gmh">keskülemsaksa</language>
-			<language type="gn">guaranii</language>
-			<language type="goh">vanaülemsaksa</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gooti</language>
-			<language type="grb">grebo</language>
-			<language type="grc">vanakreeka</language>
-			<language type="gsw">alemanni</language>
-			<language type="gu">gudžarati</language>
-			<language type="gv">mänksi</language>
-			<language type="gwi">gvitšini</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">havai</language>
-			<language type="he">heebrea</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligainoni</language>
-			<language type="him">himtšali</language>
-			<language type="hit">heti</language>
-			<language type="hmn">hmongi</language>
-			<language type="ho">motu</language>
-			<language type="hr">horvaadi</language>
-			<language type="hsb">ülemsorbi</language>
-			<language type="ht">haiti</language>
-			<language type="hu">ungari</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armeenia</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">ibani</language>
-			<language type="id">indoneesia</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">ibo</language>
-			<language type="ii">Sichuani jii</language>
-			<language type="ijo">idžo</language>
-			<language type="ik">injupiaki</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">muu India</language>
-			<language type="ine">muu indoeuroopa</language>
-			<language type="inh">inguši</language>
-			<language type="io">ido</language>
-			<language type="ira">muu Iraani</language>
-			<language type="iro">irokeesi keeled</language>
-			<language type="is">islandi</language>
-			<language type="it">itaalia</language>
-			<language type="iu">inuktituti</language>
-			<language type="ja">jaapani</language>
-			<language type="jbo">lojbani</language>
-			<language type="jpr">juudipärsia</language>
-			<language type="jrb">juudiaraabia</language>
-			<language type="jv">jaava</language>
-			<language type="ka">gruusia</language>
-			<language type="kaa">karakalpaki</language>
-			<language type="kab">kabiili</language>
-			<language type="kac">katšini</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">kareni</language>
-			<language type="kaw">kaavi</language>
-			<language type="kbd">kabardi-tšerkessi</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">muu khoisani</language>
-			<language type="kho">saki</language>
-			<language type="ki">kikuju</language>
-			<language type="kj">ambo</language>
-			<language type="kk">kasahhi</language>
-			<language type="kl">grööni</language>
-			<language type="km">khmeeri</language>
-			<language type="kmb">mbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">korea</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosrae</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karatšai-balkaari</language>
-			<language type="krl">karjala</language>
-			<language type="kro">kruu</language>
-			<language type="kru">oraoni</language>
-			<language type="ks">kašmiiri</language>
-			<language type="ku">kurdi</language>
-			<language type="kum">kumõki</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">korni</language>
-			<language type="ky">kirgiisi</language>
-			<language type="la">ladina</language>
-			<language type="lad">ladiino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">letseburgi</language>
-			<language type="lez">lesgi</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgi</language>
-			<language type="ln">lingala</language>
-			<language type="lo">lao</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">leedu</language>
-			<language type="lu">luba</language>
-			<language type="lua">lulua</language>
-			<language type="lui">luisenjo</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lušei</language>
-			<language type="lv">läti</language>
-			<language type="mad">madura</language>
-			<language type="mag">magali</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makassari</language>
-			<language type="man">malinke</language>
-			<language type="map">austroneesia keeled</language>
-			<language type="mas">masai</language>
-			<language type="mdf">mokša</language>
-			<language type="mdr">mandari</language>
-			<language type="men">mende</language>
-			<language type="mg">malagassi</language>
-			<language type="mga">keskiiri</language>
-			<language type="mh">maršalli</language>
-			<language type="mi">maoori</language>
-			<language type="mic">mikmaki</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">üksikkeeled</language>
-			<language type="mk">makedoonia</language>
-			<language type="mkh">muu moni-khmeeri</language>
-			<language type="ml">malajalami</language>
-			<language type="mn">mongoli</language>
-			<language type="mnc">mandžu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobo keeled</language>
-			<language type="mo">moldova</language>
-			<language type="moh">mohoogi</language>
-			<language type="mos">more</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malai</language>
-			<language type="mt">malta</language>
-			<language type="mul">mitu keelt</language>
-			<language type="mun">munda keel</language>
-			<language type="mus">maskogi</language>
-			<language type="mwl">miranda</language>
-			<language type="mwr">marvari</language>
-			<language type="my">birma</language>
-			<language type="myn">maia keeled</language>
-			<language type="myv">ersa</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahua</language>
-			<language type="nai">muu Põhja-Ameerika indiaani</language>
-			<language type="nap">napoli</language>
-			<language type="nb">norra bokmål</language>
-			<language type="nd">põhjandebele</language>
-			<language type="nds">alamsaksa</language>
-			<language type="ne">nepali</language>
-			<language type="new">nevari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">niasi</language>
-			<language type="nic">muu Nigeri-Kordofani</language>
-			<language type="niu">niue</language>
-			<language type="nl">hollandi</language>
-			<language type="nn">norra nynorsk</language>
-			<language type="no">norra</language>
-			<language type="nog">nogai</language>
-			<language type="non">vanapõhjala</language>
-			<language type="nqo">nkoo</language>
-			<language type="nr">lõunandebele</language>
-			<language type="nso">pedi</language>
-			<language type="nub">Nuubia keeled</language>
-			<language type="nv">navaho</language>
-			<language type="nwc">vananevari</language>
-			<language type="ny">njandža</language>
-			<language type="nym">njamvesi</language>
-			<language type="nyn">nkole</language>
-			<language type="nyo">njoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">oksitaani</language>
-			<language type="oj">odžibvei</language>
-			<language type="om">oromo</language>
-			<language type="or">oria</language>
-			<language type="os">osseedi</language>
-			<language type="osa">oseidži</language>
-			<language type="ota">osmanitürgi</language>
-			<language type="oto">otomi keeled</language>
-			<language type="pa">pandžabi</language>
-			<language type="paa">muu Paapua</language>
-			<language type="pag">pangasinani</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">belau</language>
-			<language type="peo">vanapärsia</language>
-			<language type="phi">muu Filipiini</language>
-			<language type="phn">foiniikia</language>
-			<language type="pi">paali</language>
-			<language type="pl">poola</language>
-			<language type="pon">poonpei</language>
-			<language type="pra">praakriti keeled</language>
-			<language type="pro">vanaprovansi</language>
-			<language type="ps">puštu</language>
-			<language type="pt">portugali</language>
-			<language type="qu">ketšua</language>
-			<language type="raj">radžastani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotonga</language>
-			<language type="rm">retoromaani</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumeenia</language>
-			<language type="roa">muu romaani</language>
-			<language type="rom">mustlaskeel</language>
-			<language type="ru">vene</language>
-			<language type="rup">aromuuni</language>
-			<language type="rw">ruanda</language>
-			<language type="sa">sanskriti</language>
-			<language type="sad">sandave</language>
-			<language type="sah">jakuudi</language>
-			<language type="sai">muu Lõuna-Ameerika indiaani</language>
-			<language type="sal">sališi keeled</language>
-			<language type="sam">Samaaria aramea</language>
-			<language type="sas">sasaki</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardiinia</language>
-			<language type="scn">sitsiilia</language>
-			<language type="sco">Å¡oti</language>
-			<language type="sd">sindhi</language>
-			<language type="se">põhjasaami</language>
-			<language type="sel">sölkupi</language>
-			<language type="sem">muu semi</language>
-			<language type="sg">sango</language>
-			<language type="sga">vanaiiri</language>
-			<language type="sgn">viipekeeled</language>
-			<language type="sh">serbia-horvaadi</language>
-			<language type="shn">Å¡ani</language>
-			<language type="si">singali</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siuu keeled</language>
-			<language type="sit">muu Hiina-Tiibeti</language>
-			<language type="sk">slovaki</language>
-			<language type="sl">sloveeni</language>
-			<language type="sla">muu slaavi</language>
-			<language type="sm">samoa</language>
-			<language type="sma">lõunasaami</language>
-			<language type="smi">muu saami</language>
-			<language type="smj">Lule saami</language>
-			<language type="smn">Inari saami</language>
-			<language type="sms">koltasaami</language>
-			<language type="sn">Å¡ona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somaali</language>
-			<language type="sog">sogdi</language>
-			<language type="son">songai</language>
-			<language type="sq">albaania</language>
-			<language type="sr">serbia</language>
-			<language type="srn">sranani</language>
-			<language type="srr">sereri</language>
-			<language type="ss">svaasi</language>
-			<language type="ssa">muu Niiluse-Sahara</language>
-			<language type="st">lõunasotho</language>
-			<language type="su">sunda</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumeri</language>
-			<language type="sv">rootsi</language>
-			<language type="sw">suahiili</language>
-			<language type="syr">süüria</language>
-			<language type="ta">tamili</language>
-			<language type="tai">muu tai keel</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetumi</language>
-			<language type="tg">tadžiki</language>
-			<language type="th">tai</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigree</language>
-			<language type="tiv">tivi</language>
-			<language type="tk">türkmeeni</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalogi</language>
-			<language type="tlh">klingoni</language>
-			<language type="tli">tlingiti</language>
-			<language type="tmh">tamašeki</language>
-			<language type="tn">tsvana</language>
-			<language type="to">tonga</language>
-			<language type="tog">tšitonga</language>
-			<language type="tpi">uusmelaneesia</language>
-			<language type="tr">türgi</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tšimši keeled</language>
-			<language type="tt">tatari</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupii keeled</language>
-			<language type="tut">muu Altai</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">tvii</language>
-			<language type="ty">tahiti</language>
-			<language type="tyv">tõva</language>
-			<language type="udm">udmurdi</language>
-			<language type="ug">uiguuri</language>
-			<language type="uga">ugariti</language>
-			<language type="uk">ukraina</language>
-			<language type="umb">umbundu</language>
-			<language type="und">määramata</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbeki</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnami</language>
-			<language type="vo">volapüki</language>
-			<language type="vot">vadja</language>
-			<language type="wa">vallooni</language>
-			<language type="wak">vakaši keeled</language>
-			<language type="wal">volamo</language>
-			<language type="war">varai</language>
-			<language type="was">vašo</language>
-			<language type="wen">sorbi keeled</language>
-			<language type="wo">volofi</language>
-			<language type="xal">kalmõki</language>
-			<language type="xh">koosa</language>
-			<language type="yao">jao</language>
-			<language type="yap">japi</language>
-			<language type="yi">jidiši</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupiki keeled</language>
-			<language type="za">tšuangi</language>
-			<language type="zap">sapoteegi</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">hiina</language>
-			<language type="zh_Hans">hiina keel - lihtsustatud</language>
-			<language type="zh_Hant">hiina keel - traditsiooniline</language>
-			<language type="znd">zande</language>
-			<language type="zu">suulu</language>
-			<language type="zun">sunji</language>
-			<language type="zxx">mittekeeleline</language>
-		</languages>
-		<scripts>
-			<script type="Arab">araabia</script>
-			<script type="Armn">armeenia</script>
-			<script type="Bali">bali</script>
-			<script type="Batk">bataki</script>
-			<script type="Beng">bengali</script>
-			<script type="Blis">Blissi sümbolid</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">punktkiri</script>
-			<script type="Bugi">bugi</script>
-			<script type="Buhd">buhidi</script>
-			<script type="Cans">Kanada põlisrahvaste ühtlustatud silpkiri</script>
-			<script type="Cham">tšami</script>
-			<script type="Cher">tšerokii</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">kopti</script>
-			<script type="Cprt">muinasküprose</script>
-			<script type="Cyrl">kirillitsa</script>
-			<script type="Cyrs">kirikuslaavi kirillitsa</script>
-			<script type="Deva">devanaagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egiptuse demootiline</script>
-			<script type="Egyh">egiptuse hieraatiline</script>
-			<script type="Egyp">egiptuse hieroglüüfkiri</script>
-			<script type="Ethi">etioopia</script>
-			<script type="Geok">gruusia hutsuri</script>
-			<script type="Geor">gruusia</script>
-			<script type="Glag">glagoolitsa</script>
-			<script type="Goth">gooti</script>
-			<script type="Grek">kreeka</script>
-			<script type="Gujr">gudžarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hanguli</script>
-			<script type="Hani">hiina han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">hiina lihtsustatud</script>
-			<script type="Hant">hiina traditsiooniline</script>
-			<script type="Hebr">heebrea</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hrkt">katakana või hiragana</script>
-			<script type="Hung">vanaungari</script>
-			<script type="Inds">induse</script>
-			<script type="Ital">vanaitali</script>
-			<script type="Java">jaava</script>
-			<script type="Jpan">jaapani</script>
-			<script type="Kali">kaja li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshthi</script>
-			<script type="Khmr">khmeeri</script>
-			<script type="Knda">kannada</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">ladina fraktuurkiri</script>
-			<script type="Latg">ladina keldi kiri</script>
-			<script type="Latn">ladina</script>
-			<script type="Lepc">leptša</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineaar-A</script>
-			<script type="Linb">lineaar-B</script>
-			<script type="Mand">mandea</script>
-			<script type="Maya">maaja hieroglüüfkiri</script>
-			<script type="Mero">meroe</script>
-			<script type="Mlym">malajalami</script>
-			<script type="Mong">mongoli</script>
-			<script type="Mymr">birma</script>
-			<script type="Nkoo">nkoo</script>
-			<script type="Ogam">ogam</script>
-			<script type="Orkh">orhoni</script>
-			<script type="Orya">oria</script>
-			<script type="Osma">osmanja</script>
-			<script type="Perm">vanapermi</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phnx">foiniikia</script>
-			<script type="Plrd">Pollardi miao</script>
-			<script type="Qaai">päritud</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">ruunikiri</script>
-			<script type="Sara">sarati</script>
-			<script type="Shaw">Shaw tähestik</script>
-			<script type="Sinh">singali</script>
-			<script type="Sylo">silotinagri</script>
-			<script type="Syrc">assüüria</script>
-			<script type="Syre">assüüria estrangelo</script>
-			<script type="Syrj">lääneassüüria</script>
-			<script type="Syrn">idaassüüria</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">lihtsustatud tai lue</script>
-			<script type="Taml">tamili</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagi</script>
-			<script type="Tglg">tagalogi</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tai</script>
-			<script type="Tibt">tiibeti</script>
-			<script type="Ugar">ugariti</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">häälduskiri</script>
-			<script type="Xpeo">vanapärsia</script>
-			<script type="Xsux">sumeri kiilkiri</script>
-			<script type="Yiii">jii</script>
-			<script type="Zxxx">kirjakeeleta</script>
-			<script type="Zyyy">üldine</script>
-			<script type="Zzzz">määramata</script>
-		</scripts>
-		<territories>
-			<territory type="001">maailm</territory>
-			<territory type="002">Aafrika</territory>
-			<territory type="003">Põhja-Ameerika</territory>
-			<territory type="005">Lõuna-Ameerika</territory>
-			<territory type="009">Okeaania</territory>
-			<territory type="011">Lääne-Aafrika</territory>
-			<territory type="013">Kesk-Ameerika</territory>
-			<territory type="014">Ida-Aafrika</territory>
-			<territory type="015">Põhja-Aafrika</territory>
-			<territory type="017">Kesk-Aafrika</territory>
-			<territory type="018">Lõuna-Aafrika</territory>
-			<territory type="019">Ameerika maailmajagu</territory>
-			<territory type="021">Ameerika põhjaosa</territory>
-			<territory type="029">Kariibi meri</territory>
-			<territory type="030">Ida-Aasia</territory>
-			<territory type="034">Lõuna-Aasia</territory>
-			<territory type="035">Kagu-Aasia</territory>
-			<territory type="039">Lõuna-Euroopa</territory>
-			<territory type="053">Austraalia ja Uus-Meremaa</territory>
-			<territory type="054">Melaneesia</territory>
-			<territory type="057">Mikroneesia</territory>
-			<territory type="061">Polüneesia</territory>
-			<territory type="062">Kesk-Aasia lõunaosa</territory>
-			<territory type="142">Aasia</territory>
-			<territory type="143">Kesk-Aasia</territory>
-			<territory type="145">Lääne-Aasia</territory>
-			<territory type="150">Euroopa</territory>
-			<territory type="151">Ida-Euroopa</territory>
-			<territory type="154">Põhja-Euroopa</territory>
-			<territory type="155">Lääne-Euroopa</territory>
-			<territory type="172">Sõltumatute Riikide Ühendus</territory>
-			<territory type="419">Ladina-Ameerika ja Kariibi meri</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Araabia Ãœhendemiraadid</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua ja Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albaania</territory>
-			<territory type="AM">Armeenia</territory>
-			<territory type="AN">Hollandi Antillid</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Ameerika Samoa</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Austraalia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ahvenamaa</territory>
-			<territory type="AZ">Aserbaidžaan</territory>
-			<territory type="BA">Bosnia ja Hertsegoviina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaaria</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Boliivia</territory>
-			<territory type="BR">Brasiilia</territory>
-			<territory type="BS">Bahama</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet’ saar</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Valgevene</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kookossaared</territory>
-			<territory type="CD">Kongo DV</territory>
-			<territory type="CF">Kesk-Aafrika Vabariik</territory>
-			<territory type="CG">Kongo Vabariik</territory>
-			<territory type="CH">Å veits</territory>
-			<territory type="CI">Côte d'Ivoire</territory>
-			<territory type="CK">Cooki saared</territory>
-			<territory type="CL">TÅ¡iili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Hiina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia ja Montenegro</territory>
-			<territory type="CU">Kuuba</territory>
-			<territory type="CV">Roheneemesaared</territory>
-			<territory type="CX">Jõulusaar</territory>
-			<territory type="CY">Küpros</territory>
-			<territory type="CZ">TÅ¡ehhi</territory>
-			<territory type="DE">Saksamaa</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Taani</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominikaani Vabariik</territory>
-			<territory type="DZ">Alžeeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Eesti</territory>
-			<territory type="EG">Egiptus</territory>
-			<territory type="EH">Lääne-Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Hispaania</territory>
-			<territory type="ET">Etioopia</territory>
-			<territory type="FI">Soome</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandi saared</territory>
-			<territory type="FM">Mikroneesia Liiduriigid</territory>
-			<territory type="FO">Fääri saared</territory>
-			<territory type="FR">Prantsusmaa</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Suurbritannia</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruusia</territory>
-			<territory type="GF">Prantsuse Guajaana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Gröönimaa</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatoriaal-Guinea</territory>
-			<territory type="GR">Kreeka</territory>
-			<territory type="GS">Lõuna-Georgia ja Lõuna-Sandwichi saared</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong - Hiina erihalduspiirkond</territory>
-			<territory type="HM">Heard ja McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Horvaatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungari</territory>
-			<territory type="ID">Indoneesia</territory>
-			<territory type="IE">Iirimaa</territory>
-			<territory type="IL">Iisrael</territory>
-			<territory type="IM">Mani saar</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Briti India ookeani ala</territory>
-			<territory type="IQ">Iraak</territory>
-			<territory type="IR">Iraan</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Itaalia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordaania</territory>
-			<territory type="JP">Jaapan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kõrgõzstan</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoorid</territory>
-			<territory type="KN">Saint Kitts ja Nevis</territory>
-			<territory type="KP">Põhja-Korea</territory>
-			<territory type="KR">Lõuna-Korea</territory>
-			<territory type="KW">Kuveit</territory>
-			<territory type="KY">Kaimanisaared</territory>
-			<territory type="KZ">Kasahstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liibanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Libeeria</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Leedu</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">Läti</territory>
-			<territory type="LY">Liibüa</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalli Saared</territory>
-			<territory type="MK">Makedoonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongoolia</territory>
-			<territory type="MO">Aomen - Hiina erihalduspiirkond</territory>
-			<territory type="MP">Põhja-Mariaanid</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritaania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldiivid</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mehhiko</territory>
-			<territory type="MY">Malaisia</territory>
-			<territory type="MZ">Mosambiik</territory>
-			<territory type="NA">Namiibia</territory>
-			<territory type="NC">Uus-Kaledoonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk</territory>
-			<territory type="NG">Nigeeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Holland</territory>
-			<territory type="NO">Norra</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Uus-Meremaa</territory>
-			<territory type="OM">Omaan</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peruu</territory>
-			<territory type="PF">Prantsuse Polüneesia</territory>
-			<territory type="PG">Paapua Uus-Guinea</territory>
-			<territory type="PH">Filipiinid</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poola</territory>
-			<territory type="PM">Saint-Pierre ja Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestiina ala</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Belau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Okeaania hajasaared</territory>
-			<territory type="QU">Euroopa Liit</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumeenia</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Venemaa</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi Araabia</territory>
-			<territory type="SB">Saalomoni Saared</territory>
-			<territory type="SC">Seišellid</territory>
-			<territory type="SD">Sudaan</territory>
-			<territory type="SE">Rootsi</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Sloveenia</territory>
-			<territory type="SJ">Svalbard ja Jan Mayen</territory>
-			<territory type="SK">Slovakkia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somaalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">São Tomé ja Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Süüria</territory>
-			<territory type="SZ">Svaasimaa</territory>
-			<territory type="TC">Turks ja Caicos</territory>
-			<territory type="TD">TÅ¡aad</territory>
-			<territory type="TF">Prantsuse Lõunaalad</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tai</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Ida-Timor</territory>
-			<territory type="TM">Türkmenistan</territory>
-			<territory type="TN">Tuneesia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Türgi</territory>
-			<territory type="TT">Trinidad ja Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansaania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Ãœhendriikide hajasaared</territory>
-			<territory type="US">Ameerika Ãœhendriigid</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent ja Grenadiinid</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Briti Neitsisaared</territory>
-			<territory type="VI">USA Neitsisaared</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis ja Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jeemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Lõuna-Aafrika Vabariik</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">määramata</territory>
-		</territories>
-		<variants>
-			<variant type="1901">saksa traditsiooniline kirjaviis</variant>
-			<variant type="1996">saksa reformitud kirjaviis</variant>
-			<variant type="NEDIS">Natisone murre</variant>
-			<variant type="POLYTON">polütooniline</variant>
-			<variant type="REVISED">uus kirjaviis</variant>
-			<variant type="ROZAJ">Resia murre</variant>
-			<variant type="SAAHO">saho murre</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalender</key>
-			<key type="collation">sortimine</key>
-			<key type="currency">vääring</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">hiina traditsiooniline - big5</type>
-			<type type="buddhist" key="calendar">budistlik kalender</type>
-			<type type="chinese" key="calendar">Hiina kalender</type>
-			<type type="direct" key="collation">lisareegliteta</type>
-			<type type="gb2312han" key="collation">hiina lihtsustatud - GB2312</type>
-			<type type="gregorian" key="calendar">Gregoriuse kalender</type>
-			<type type="hebrew" key="calendar">juudi kalender</type>
-			<type type="islamic" key="calendar">islamikalender</type>
-			<type type="islamic-civil" key="calendar">islami ilmalik kalender</type>
-			<type type="japanese" key="calendar">Jaapani kalender</type>
-			<type type="phonebook" key="collation">telefoniraamat</type>
-			<type type="stroke" key="collation">elementide kirjutamise järjekorras</type>
-			<type type="traditional" key="collation">traditsiooniline</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">meetermõõdustik</measurementSystemName>
-			<measurementSystemName type="US">inglise mõõdustik</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-s š z ž t-w õ ä ö ü x y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à â å � æ ç é è ê ë ē í ì î ï ī ñ ó ò � ô ø � œ ß ú ù û ū]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>‚</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}−{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jaan</month>
-							<month type="2">veebr</month>
-							<month type="3">märts</month>
-							<month type="4">apr</month>
-							<month type="5">mai</month>
-							<month type="6">juuni</month>
-							<month type="7">juuli</month>
-							<month type="8">aug</month>
-							<month type="9">sept</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dets</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">jaanuar</month>
-							<month type="2">veebruar</month>
-							<month type="3">märts</month>
-							<month type="4">aprill</month>
-							<month type="5">mai</month>
-							<month type="6">juuni</month>
-							<month type="7">juuli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktoober</month>
-							<month type="11">november</month>
-							<month type="12">detsember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">P</day>
-							<day type="mon">E</day>
-							<day type="tue">T</day>
-							<day type="wed">K</day>
-							<day type="thu">N</day>
-							<day type="fri">R</day>
-							<day type="sat">L</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">pühapäev</day>
-							<day type="mon">esmaspäev</day>
-							<day type="tue">teisipäev</day>
-							<day type="wed">kolmapäev</day>
-							<day type="thu">neljapäev</day>
-							<day type="fri">reede</day>
-							<day type="sat">laupäev</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">enne meie aega</era>
-						<era type="1">meie aja järgi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">e.m.a.</era>
-						<era type="1">m.a.j.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d, MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d, MMM y</greatestDifference>
-							<greatestDifference id="M">E, d, MMM - E, d, MMM y</greatestDifference>
-							<greatestDifference id="y">E, d, MMM y - E, d, MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>määramata</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Lõunapoolus</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viin</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brüssel</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermuuda</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Kookossaared</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Lihavõttesaar</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Roheneeme</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Jõulud</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berliin</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhaagen</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžiir</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanaari saared</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madriid</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsingi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Fääri</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Pariis</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Ateena</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Lõuna Gruusia</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rooma</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Riia</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldiivid</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varssavi</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Kokkutulek</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Hispaania Sadam</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiiev</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska aeg</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>¤¤¤</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorra peseeta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Araabia Ãœhendemiraatide dirhem</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afganistani afgaani, 1927-2002</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afganistani afgaani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albaania lekk</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armeenia dramm</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Hollandi Antillide kulden</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angola kvanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angola kvanza, 1977-1990</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angola kvanza, 1990-2000</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angola reformitud kvanza, 1995-1999</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentina austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentina peeso, 1983-1985</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentina peeso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austria Å¡illing</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Austraalia dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba guilder</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Aserbaidžaani manat, 1993-2006</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Aserbaidžaani manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnia-Hertsegoviina dinaar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnia-Hertsegoviina mark</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadose dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeshi taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgia konverteeritav frank</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgia frank</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgia arveldusfrank</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgaaria püsiv leev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgaaria leev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreini dinaar</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi frank</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda dollar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei dollar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviaano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Boliivia peeso</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brasiilia krusado</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brasiilia reaal</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Birma kjatt</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswana pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Valgevene uus rubla, 1994-1999</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Valgevene rubla</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanada dollar</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å veitsi frank</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>TÅ¡iili peeso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Hiina jüaan</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbia peeso</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Serbia vana dinaar</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Küprose nael</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>TÅ¡ehhi kroon</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Saksa mark</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Taani kroon</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alžeeria dinaar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadori sukre</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>kroon</displayName>
-				<symbol>kr</symbol>
-				<decimal>.</decimal>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egiptuse nael</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Hispaania peseeta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etioopia birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Soome mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidži dollar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklandi saarte nael</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Prantsuse frank</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Suurbritannia naelsterling</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gruusia lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghana sedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltari nael</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambia dalasi</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinea syli</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Kreeka drahm</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemala ketsal</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau peeso</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyana dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkongi dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hondurase lempiira</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Horvaatia kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haiti gurd</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Ungari forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indoneesia ruupia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Iiri nael</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Iisraeli nael</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Iisraeli uus seekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>India ruupia</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Iraagi dinaar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iraani riaal</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islandi kroon</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Itaalia liir</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaica dollar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jaapani jeen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Keenia Å¡illing</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kõrgõzstani somm</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodža riaal</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Põhja-Korea vonn</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Lõuna-Korea vonn</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuveidi dinaar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kasahstani tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laose kiip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Liibanoni nael</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Leedu litt</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luksemburgi frank</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Läti latt</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Maroko dirhem</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldova leu</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmari kjatt</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongoolia tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macao pataka</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauretaania ugia</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Malta liir</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritiuse ruupia</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldiivide ruupia</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawi kvatša</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mehhiko peeso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mehhiko peeso, 1861-1990</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaisia ringgit</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mosambiigi metikal</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigeeria naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nicaragua kordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nicaragua kuldkordoba</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Hollandi kulden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norra kroon</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepali ruupia</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Uus-Meremaa dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omaani riaal</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panama balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruu inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruu uus soll</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruu soll</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Paapua Uus-Guinea kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipiinide peeso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistani ruupia</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Poola zlott</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Poola zlott, 1950-1995</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugali eskuudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguai guaranii</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Quatari riaal</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Rumeenia lei, -2005</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumeenia lei</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbia dinaar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Venemaa rubla</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Venemaa rubla, 1991-1998</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruanda frank</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi-Araabia riaal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Saalomoni saarte dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seišelli saarte ruupia</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudaani nael</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Rootsi kroon</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapuri dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Saint Helena nael</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Sloveenia tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovakkia kroon</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leone leoone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somaalia Å¡illing</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinami kulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>São Tomé ja Príncipe dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>NSVL rubla</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadori koloon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Süüria nael</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Tai baat</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikistani somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Türkmenistani manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tuneesia dinaar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tonga pa'anga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timori eskuudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Türgi liir</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Türgi uus liir</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Taiwani dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tansaania Å¡illing</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukraina grivna</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukraina karbovanets</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Uganda Å¡illing</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>USA dollar</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>USA järgmise päeva dollar</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>USA sama päeva dollar</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguai peeso</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Usbekistani somm</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuela boliivar</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnami dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Lääne-Samoa tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA frank BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>hõbe</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>kuld</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>EURCO</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Ida-Kariibi dollar</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>eküü</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Prantsuse kuldfrank</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>pallaadium</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>plaatina</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>vääringute testkood</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>määramata</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jeemeni dinaar</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoslaavia uus dinaar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslaavia konverteeritav dinaar</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>LAVi rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Sambia kvatša</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Sairi zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwe dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ööpäev</unitPattern>
-			<unitPattern count="other">{0} ööpäeva</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} tund</unitPattern>
-			<unitPattern count="other">{0} tunniga</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minut</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} kuu</unitPattern>
-			<unitPattern count="other">{0} kuud</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekundit</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} nädal</unitPattern>
-			<unitPattern count="other">{0} nädalat</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} aasta</unitPattern>
-			<unitPattern count="other">{0} aastat</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>jah:j</yesstr>
-			<nostr>ei:e</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/et_EE.xml b/airtime_mvc/library/Zend/Locale/Data/et_EE.xml
deleted file mode 100644
index 8a089e1fc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/et_EE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="et"/>
-		<territory type="EE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/eu.xml b/airtime_mvc/library/Zend/Locale/Data/eu.xml
deleted file mode 100644
index 3e97bd5b7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/eu.xml
+++ /dev/null
@@ -1,1003 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.78 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="eu"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="af">afrikaans</language>
-			<language type="am">amharikera</language>
-			<language type="ar">arabiera</language>
-			<language type="as">assamera</language>
-			<language type="az">azerbaijanera</language>
-			<language type="be">bielorrusiera</language>
-			<language type="bg">bulgariera</language>
-			<language type="bh">bihariera</language>
-			<language type="bn">bengalera</language>
-			<language type="br">bretoiera</language>
-			<language type="bs">bosniera</language>
-			<language type="ca">katalana</language>
-			<language type="cs">txekiera</language>
-			<language type="cy">galesera</language>
-			<language type="da">daniera</language>
-			<language type="de">alemanera</language>
-			<language type="el">greziera</language>
-			<language type="en">ingelera</language>
-			<language type="en_AU">ingelesa (Australia)</language>
-			<language type="en_GB">ingelesa (Erresuma Batua)</language>
-			<language type="en_US">ingelesa (AEB)</language>
-			<language type="eo">esperantoa</language>
-			<language type="es">espainiera</language>
-			<language type="et">estoniera</language>
-			<language type="eu">euskara</language>
-			<language type="fa">pertsiera</language>
-			<language type="fi">finlandiera</language>
-			<language type="fil">tagalo</language>
-			<language type="fo">faroera</language>
-			<language type="fr">frantsesera</language>
-			<language type="fy">frisiarra</language>
-			<language type="ga">gaelikoa</language>
-			<language type="gd">eskoziar gaelikoa</language>
-			<language type="gl">galegoa</language>
-			<language type="gn">guaraniera</language>
-			<language type="gu">gujaratera</language>
-			<language type="he">hebreera</language>
-			<language type="hi">hindia</language>
-			<language type="hr">kroaziera</language>
-			<language type="hu">hungariera</language>
-			<language type="hy">armeniera</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indonesiera</language>
-			<language type="ie">interlingue</language>
-			<language type="is">islandiera</language>
-			<language type="it">italiera</language>
-			<language type="ja">japoniera</language>
-			<language type="jv">javera</language>
-			<language type="ka">georgiera</language>
-			<language type="km">khemerera</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreera</language>
-			<language type="ku">kurduera</language>
-			<language type="ky">kirgizera</language>
-			<language type="la">latina</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosera</language>
-			<language type="lt">lituaniera</language>
-			<language type="lv">letoniera</language>
-			<language type="mk">mazedoniera</language>
-			<language type="ml">malayalamera</language>
-			<language type="mn">mongoliera</language>
-			<language type="mr">marathera</language>
-			<language type="ms">malaysiera</language>
-			<language type="mt">maltera</language>
-			<language type="ne">nepalera</language>
-			<language type="nl">nederlandera</language>
-			<language type="nn">norvegiera berria</language>
-			<language type="no">norvegiera</language>
-			<language type="oc">okzitaniera</language>
-			<language type="or">oriya</language>
-			<language type="pa">punjabera</language>
-			<language type="pl">poloniera</language>
-			<language type="ps">paxtuera</language>
-			<language type="pt">portugalera</language>
-			<language type="pt_BR">portugesa (Brasil)</language>
-			<language type="pt_PT">portugesa (Potugal)</language>
-			<language type="ro">errumaniera</language>
-			<language type="ru">errusiera</language>
-			<language type="sa">sanskritoa</language>
-			<language type="sd">sindhia</language>
-			<language type="sh">serbokroaziera</language>
-			<language type="si">sinhala</language>
-			<language type="sk">eslovakiera</language>
-			<language type="sl">esloveniera</language>
-			<language type="so">somaliera</language>
-			<language type="sq">albaniera</language>
-			<language type="sr">serbiera</language>
-			<language type="st">sesothoera</language>
-			<language type="su">sundanera</language>
-			<language type="sv">suediera</language>
-			<language type="sw">swahili</language>
-			<language type="ta">tamilera</language>
-			<language type="te">telugua</language>
-			<language type="th">thailandiera</language>
-			<language type="ti">tigrinya</language>
-			<language type="tk">turkmeniera</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingonera</language>
-			<language type="tr">turkiera</language>
-			<language type="tw">twia</language>
-			<language type="ug">uigurrera</language>
-			<language type="uk">ukrainera</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbekera</language>
-			<language type="vi">vietnamera</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">yiddishera</language>
-			<language type="zh">txinera</language>
-			<language type="zh_Hans">txinera (soildua)</language>
-			<language type="zh_Hant">txinera (tradizionala)</language>
-			<language type="zu">zuluera</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arab</script>
-			<script type="Armi">Armi</script>
-			<script type="Armn">Armn</script>
-			<script type="Avst">Avst</script>
-			<script type="Bali">Bali</script>
-			<script type="Batk">Batk</script>
-			<script type="Beng">Beng</script>
-			<script type="Blis">Blis</script>
-			<script type="Bopo">Bopo</script>
-			<script type="Brah">Brah</script>
-			<script type="Brai">Brai</script>
-			<script type="Bugi">Bugi</script>
-			<script type="Buhd">Buhd</script>
-			<script type="Cakm">Cakm</script>
-			<script type="Cari">Cari</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Txer</script>
-			<script type="Cirt">Cirt</script>
-			<script type="Copt">Copt</script>
-			<script type="Cprt">Cprt</script>
-			<script type="Cyrl">Cyrl</script>
-			<script type="Deva">Deva</script>
-			<script type="Dsrt">Dsrt</script>
-			<script type="Egyd">Egyd</script>
-			<script type="Egyh">Egyh</script>
-			<script type="Egyp">Egyp</script>
-			<script type="Ethi">Etiop</script>
-			<script type="Geok">Geok</script>
-			<script type="Geor">Geor</script>
-			<script type="Glag">Glag</script>
-			<script type="Goth">Goth</script>
-			<script type="Grek">Grez</script>
-			<script type="Gujr">Gujr</script>
-			<script type="Guru">Guru</script>
-			<script type="Hang">Hang</script>
-			<script type="Hani">Hani</script>
-			<script type="Hano">Hano</script>
-			<script type="Hebr">Hebr</script>
-			<script type="Hira">Hira</script>
-			<script type="Hrkt">Hrkt</script>
-			<script type="Inds">Inds</script>
-			<script type="Java">Java</script>
-			<script type="Jpan">Jpon</script>
-			<script type="Kali">Kali</script>
-			<script type="Kana">Kana</script>
-			<script type="Khar">Khar</script>
-			<script type="Khmr">Khmr</script>
-			<script type="Knda">Knda</script>
-			<script type="Kore">Kore</script>
-			<script type="Kthi">Kthi</script>
-			<script type="Lana">Lana</script>
-			<script type="Laoo">Laoo</script>
-			<script type="Latf">Latf</script>
-			<script type="Latg">Latg</script>
-			<script type="Latn">Latn</script>
-			<script type="Lepc">Lepc</script>
-			<script type="Limb">Limb</script>
-			<script type="Lina">Lina</script>
-			<script type="Linb">Linb</script>
-			<script type="Lyci">Lyci</script>
-			<script type="Lydi">Lydi</script>
-			<script type="Mand">Mand</script>
-			<script type="Mani">Mani</script>
-			<script type="Maya">Maia</script>
-			<script type="Mero">Mero</script>
-			<script type="Mlym">Mlym</script>
-			<script type="Mong">Mong</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Mtei</script>
-			<script type="Mymr">Mymr</script>
-			<script type="Nkoo">Nkoo</script>
-			<script type="Phli">Phli</script>
-			<script type="Phlv">Phlv</script>
-			<script type="Prti">Prti</script>
-			<script type="Qaai">Qaai</script>
-			<script type="Syre">Syre</script>
-			<script type="Syrn">Syrn</script>
-			<script type="Talu">Talu</script>
-			<script type="Zmth">Zmth</script>
-			<script type="Zyyy">Zyyy</script>
-		</scripts>
-		<territories>
-			<territory type="AE">Arabiar Emirrerri Batuak</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua eta Barbuda</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Holandarren Antillak</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antartika</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikar Samoa</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AX">Aland Uharteak</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia-Herzegovina</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgika</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BO">Bolibia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamak</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet Uhartea</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorrusia</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Cocos uharteak</territory>
-			<territory type="CD">Kongoko Errepublika Demokratikoa</territory>
-			<territory type="CF">Afrika Erdiko Errepublika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Suitza</territory>
-			<territory type="CI">Boli Kosta</territory>
-			<territory type="CK">Cook uharteak</territory>
-			<territory type="CL">Txile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Txina</territory>
-			<territory type="CO">Kolonbia</territory>
-			<territory type="CS">Serbia eta Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Cabo Verde</territory>
-			<territory type="CX">Christmas uhartea</territory>
-			<territory type="CY">Zipre</territory>
-			<territory type="CZ">Txekiar errepublika</territory>
-			<territory type="DE">Alemania</territory>
-			<territory type="DJ">Djibuti</territory>
-			<territory type="DK">Danimarka</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikar Errepublika</territory>
-			<territory type="DZ">Aljeria</territory>
-			<territory type="EC">Ekuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egipto</territory>
-			<territory type="EH">Mendebaldeko Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Espainia</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FK">Malvinak</territory>
-			<territory type="FM">Mikronesia</territory>
-			<territory type="FO">Faroe Uharteak</territory>
-			<territory type="FR">Frantzia</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Erresuma Batua</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guyana Frantsesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GL">Groenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Ginea</territory>
-			<territory type="GQ">Ekuatore Ginea</territory>
-			<territory type="GR">Grezia</territory>
-			<territory type="GS">Hegoaldeko Georgia eta Hegoaldeko Sandwich uharteak</territory>
-			<territory type="GW">Ginea-Bissau</territory>
-			<territory type="HM">Heard eta McDonald Uharteak</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroazia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungaria</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Man uhartea</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Indiako Ozeanoko Britainiar Lurraldea</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordania</territory>
-			<territory type="JP">Japonia</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgizistan</territory>
-			<territory type="KH">Kanbodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoreak</territory>
-			<territory type="KN">Saint Kitts eta Nevis</territory>
-			<territory type="KP">Ipar Korea</territory>
-			<territory type="KR">Hego Korea</territory>
-			<territory type="KY">Kaiman Uharteak</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libano</territory>
-			<territory type="LC">Santa Luzia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Luxenburgo</territory>
-			<territory type="LV">Letonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshall uharteak</territory>
-			<territory type="MK">Mazedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Birmania</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makau</territory>
-			<territory type="MP">Iparraldeko Mariana uharteak</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MU">Maurizio</territory>
-			<territory type="MV">Maldivak</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malasia</territory>
-			<territory type="MZ">Mozambike</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Kaledonia Berria</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk uhartea</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Herbehereak</territory>
-			<territory type="NO">Norvegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NZ">Zeelanda Berria</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polinesia Frantsesa</territory>
-			<territory type="PG">Papua Ginea Berria</territory>
-			<territory type="PH">Filipinak</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">Saint-Pierre eta Mikelune</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PY">Paraguai</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="RO">Errumania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Errusia</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi Arabia</territory>
-			<territory type="SB">Salomon uharteak</territory>
-			<territory type="SC">Seychelleak</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Suedia</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Eslovenia</territory>
-			<territory type="SJ">Svalbard eta Jan Mayen uharteak</territory>
-			<territory type="SK">Eslovakia</territory>
-			<territory type="SL">Sierra Leona</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tomé eta Principe</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Swazilandia</territory>
-			<territory type="TC">Turk eta Caico uharteak</territory>
-			<territory type="TD">Txad</territory>
-			<territory type="TF">Frantziaren Lurralde Australak</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandia</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Ekialdeko Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkia</territory>
-			<territory type="TT">Trinidad eta Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Estatu Batuetatik urruti dauden uharte txikiak</territory>
-			<territory type="US">Ameriketako Estatu Batuak</territory>
-			<territory type="UY">Uruguai</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikano</territory>
-			<territory type="VC">Saint Vincent eta Grenadinak</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Birjina uharte britainiarrak</territory>
-			<territory type="VI">Birjina uharte amerikarrak</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis eta Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="ZA">Hegoafrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-		<variants>
-			<variant type="POLYTON">POLITON</variant>
-			<variant type="REVISED">BERRIKUSIA</variant>
-			<variant type="SAAHO">SAHO</variant>
-			<variant type="SCOTLAND">ESKOZIAR INGELESA</variant>
-			<variant type="VALENCIA">VALENTZIERA</variant>
-		</variants>
-		<keys>
-			<key type="calendar">egutegia</key>
-			<key type="collation">alfabetoa</key>
-			<key type="currency">moneta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Txinera tradizionalaren alfabetoa-Big5</type>
-			<type type="buddhist" key="calendar">egutegi budista</type>
-			<type type="chinese" key="calendar">txinatar egutegia</type>
-			<type type="direct" key="collation">Zuzena</type>
-			<type type="gb2312han" key="collation">Txinera sinplifikatuaren alfabetoa -GB2312</type>
-			<type type="gregorian" key="calendar">egutegi gregoriarra</type>
-			<type type="hebrew" key="calendar">hebrear egutegia</type>
-			<type type="indian" key="calendar">indiar egutegia</type>
-			<type type="islamic" key="calendar">islamiar egutegia</type>
-			<type type="islamic-civil" key="calendar">islamiar egutegi zibila</type>
-			<type type="japanese" key="calendar">japoniar egutegia</type>
-			<type type="phonebook" key="collation">Telefonoen zerrenda</type>
-			<type type="roc" key="calendar">Txinako Errepublikako egutegia</type>
-			<type type="traditional" key="collation">Tradizionala</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metriko</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ç d-n ñ o-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraAbbr>
-						<era type="0">BG</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">urt</month>
-							<month type="2">ots</month>
-							<month type="3">mar</month>
-							<month type="4">api</month>
-							<month type="5">mai</month>
-							<month type="6">eka</month>
-							<month type="7">uzt</month>
-							<month type="8">abu</month>
-							<month type="9">ira</month>
-							<month type="10">urr</month>
-							<month type="11">aza</month>
-							<month type="12">abe</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">urtarrila</month>
-							<month type="2">otsaila</month>
-							<month type="3">martxoa</month>
-							<month type="4">apirila</month>
-							<month type="5">maiatza</month>
-							<month type="6">ekaina</month>
-							<month type="7">uztaila</month>
-							<month type="8">abuztua</month>
-							<month type="9">iraila</month>
-							<month type="10">urria</month>
-							<month type="11">azaroa</month>
-							<month type="12">abendua</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">U</month>
-							<month type="2">O</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">E</month>
-							<month type="7">U</month>
-							<month type="8">A</month>
-							<month type="9">I</month>
-							<month type="10">U</month>
-							<month type="11">A</month>
-							<month type="12">A</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ig</day>
-							<day type="mon">al</day>
-							<day type="tue">as</day>
-							<day type="wed">az</day>
-							<day type="thu">og</day>
-							<day type="fri">or</day>
-							<day type="sat">lr</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">igandea</day>
-							<day type="mon">astelehena</day>
-							<day type="tue">asteartea</day>
-							<day type="wed">asteazkena</day>
-							<day type="thu">osteguna</day>
-							<day type="fri">ostirala</day>
-							<day type="sat">larunbata</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1Hh</quarter>
-							<quarter type="2">2Hh</quarter>
-							<quarter type="3">3Hh</quarter>
-							<quarter type="4">4Hh</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. hiruhilekoa</quarter>
-							<quarter type="2">2. hiruhilekoa</quarter>
-							<quarter type="3">3. hiruhilekoa</quarter>
-							<quarter type="4">4. hiruhilekoa</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y'eko' MMMM'ren' dd'a'</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y'eko' MMM'ren' dd'a'</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraAbbr>
-						<era type="0">R.O.C. aurretik</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Ezezaguna</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudak</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cabo Verde</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibuti</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Espainia (Kanariak)</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madril</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxenburgo</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinika</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Maurizio</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivak</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Ameriketako Estatu Batuak (Erdialdea, Ipar Dakota)</exemplarCity>
-			</zone>
-			<metazone type="Australia_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Western">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Azores">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="British">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chamorro">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chatham">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Christmas">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cocos">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cook">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Davis">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Easter">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Central">
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Falkland">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Fiji">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Southern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Galapagos">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Gambier">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>GMT</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Irish">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Maldives">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mauritius">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mawson">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Moscow">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Reunion">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Rothera">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Seychelles">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="South_Georgia">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Syowa">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkey">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vostok">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0}{1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>BRL</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>CNY</displayName>
-			</currency>
-			<currency type="ESP">
-				<pattern>¤ #,##0;-¤ #,##0</pattern>
-				<symbol>₧</symbol>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-			<currency type="EUR">
-				<displayName>EUR</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>GBP</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>INR</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>JPY</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>RUB</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>USD</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>USN</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>USS</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>XAG</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>XAU</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>XBA</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>XBB</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>XBC</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>XBD</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>XDR</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>XEU</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>XFO</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>XFU</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>XPD</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>XPT</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>XRE</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>XTS</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>XXX</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} eguna</unitPattern>
-			<unitPattern count="other">{0} egun</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ordua</unitPattern>
-			<unitPattern count="other">{0} h</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minutu</unitPattern>
-			<unitPattern count="other">{0} minutu</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} hilea</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segundo</unitPattern>
-			<unitPattern count="other">{0} s</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} aste</unitPattern>
-			<unitPattern count="other">{0} aste</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} urtea</unitPattern>
-			<unitPattern count="other">{0} y</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>bai:b</yesstr>
-			<nostr>ez:e</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/eu_ES.xml b/airtime_mvc/library/Zend/Locale/Data/eu_ES.xml
deleted file mode 100644
index 43bfd7916..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/eu_ES.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="eu"/>
-		<territory type="ES"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fa.xml b/airtime_mvc/library/Zend/Locale/Data/fa.xml
deleted file mode 100644
index d01d3cc79..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fa.xml
+++ /dev/null
@@ -1,3309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.115 $"/>
-		<generation date="$Date: 2009/06/15 05:50:27 $"/>
-		<language type="fa"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>، </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">آ�اری</language>
-			<language type="ab">آبخازی</language>
-			<language type="ace">آچئی</language>
-			<language type="ach">آچولیایی</language>
-			<language type="ada">آدانگمه‌ای</language>
-			<language type="ady">آدیجیایی</language>
-			<language type="ae">اوستایی</language>
-			<language type="af">آ�ریکانس</language>
-			<language type="afa">زبان ا�ریقا و آسیایی</language>
-			<language type="afh">آ�ریهیلی</language>
-			<language type="ain">آینویی</language>
-			<language type="ak">آکان</language>
-			<language type="akk">آکدی</language>
-			<language type="ale">آلئوتی</language>
-			<language type="alg">زبان آلگونکینی</language>
-			<language type="alt">آلتایی جنوبی</language>
-			<language type="am">امهری</language>
-			<language type="an">آراگونی</language>
-			<language type="ang">انگلیسی باستان</language>
-			<language type="anp">آنگیکا</language>
-			<language type="apa">زبان آپاچیایی</language>
-			<language type="ar">عربی</language>
-			<language type="arc">آرامی</language>
-			<language type="arn">آروکانیایی</language>
-			<language type="arp">آراپاهویی</language>
-			<language type="art">زبان ساختگی</language>
-			<language type="arw">آراواکی</language>
-			<language type="as">آسامی</language>
-			<language type="ath">زبان آتاپاسکایی</language>
-			<language type="aus">زبان استرالیایی</language>
-			<language type="av">آواری</language>
-			<language type="ay">آیمارایی</language>
-			<language type="az">ترکی آذربایجانی</language>
-			<language type="ba">باشغیری</language>
-			<language type="bad">باندایی</language>
-			<language type="bal">بلوچی</language>
-			<language type="ban">بالیایی</language>
-			<language type="bas">باسایی</language>
-			<language type="bat">زبان بالتیکی</language>
-			<language type="be">بلوروسی</language>
-			<language type="bej">بجایی</language>
-			<language type="bem">بمبایی</language>
-			<language type="ber">بربری</language>
-			<language type="bg">بلغاری</language>
-			<language type="bh">بیهاری</language>
-			<language type="bho">بوجپوری</language>
-			<language type="bi">بیسلاما</language>
-			<language type="bik">بیکولی</language>
-			<language type="bin">بینی</language>
-			<language type="bm">بامبارایی</language>
-			<language type="bn">بنگالی</language>
-			<language type="bnt">بانتویی</language>
-			<language type="bo">تبتی</language>
-			<language type="br">برتانیایی</language>
-			<language type="bra">براج</language>
-			<language type="bs">بوسنیایی</language>
-			<language type="btk">باتاکی</language>
-			<language type="bua">بوریاتی</language>
-			<language type="bug">بوگیایی</language>
-			<language type="byn">بلین</language>
-			<language type="ca">کاتالونیایی</language>
-			<language type="cad">کادویی</language>
-			<language type="cai">زبان سرخپوستی امریکای مرکزی</language>
-			<language type="car">کاریبی</language>
-			<language type="cau">زبان ق�قازی</language>
-			<language type="ce">چچنی</language>
-			<language type="ceb">سبویی</language>
-			<language type="cel">زبان سلتی</language>
-			<language type="ch">چامورویی</language>
-			<language type="chb">چیبچا</language>
-			<language type="chg">جغتایی</language>
-			<language type="chk">تروکی</language>
-			<language type="chm">ماریایی</language>
-			<language type="cho">چوکتویی</language>
-			<language type="chp">چیپه‌ویه‌ای</language>
-			<language type="chr">چروکیایی</language>
-			<language type="chy">شایانی</language>
-			<language type="co">کورسی</language>
-			<language type="cop">قبطی</language>
-			<language type="cpe">کریول یا پیجین مبتنی بر انگلیسی</language>
-			<language type="cpf">کریول یا پیجین مبتنی بر �رانسوی</language>
-			<language type="cpp">کریول یا پیجین مبتنی بر پرتغالی</language>
-			<language type="cr">کریایی</language>
-			<language type="crh">ترکی کریمه</language>
-			<language type="crp">کریول یا پیجین</language>
-			<language type="cs">چکی</language>
-			<language type="csb">کاشوبی</language>
-			<language type="cu">اسلاوی کلیسایی</language>
-			<language type="cus">زبان کوشی</language>
-			<language type="cv">چوواشی</language>
-			<language type="cy">ویلزی</language>
-			<language type="da">دانمارکی</language>
-			<language type="dak">داکوتایی</language>
-			<language type="dar">دارقینی</language>
-			<language type="day">دایاک</language>
-			<language type="de">آلمانی</language>
-			<language type="de_AT">آلمانی اتریش</language>
-			<language type="de_CH">آلمانی علیای سوئیس</language>
-			<language type="del">دلاواری</language>
-			<language type="dgr">دوگریب</language>
-			<language type="din">دینکایی</language>
-			<language type="doi">دوگری</language>
-			<language type="dra">زبان دراویدی</language>
-			<language type="dsb">ص�ربی س�لی</language>
-			<language type="dua">دوآلایی</language>
-			<language type="dum">هلندی میانه</language>
-			<language type="dv">مالدیوی</language>
-			<language type="dyu">دایولایی</language>
-			<language type="dz">جونخایی</language>
-			<language type="ee">اوه‌ای</language>
-			<language type="efi">ا�یکی</language>
-			<language type="egy">مصری کهن</language>
-			<language type="eka">اکاجوک</language>
-			<language type="el">یونانی</language>
-			<language type="elx">عیلامی</language>
-			<language type="en">انگلیسی</language>
-			<language type="en_AU">انگلیسی استرالیا</language>
-			<language type="en_CA">انگلیسی کانادا</language>
-			<language type="en_GB">نگلیسی بریتانیا</language>
-			<language type="en_US">انگلیسی امریکا</language>
-			<language type="enm">انگلیسی میانه</language>
-			<language type="eo">اسپرانتو</language>
-			<language type="es">اسپانیایی</language>
-			<language type="es_419">اسپانیایی امریکای لاتین</language>
-			<language type="es_ES">اسپانیایی اسپانیا</language>
-			<language type="et">استونیایی</language>
-			<language type="eu">باسکی</language>
-			<language type="ewo">اواندو</language>
-			<language type="fa">�ارسی</language>
-			<language type="fan">�انکی</language>
-			<language type="fat">�انتیایی</language>
-			<language type="ff">�ولایی</language>
-			<language type="fi">�نلاندی</language>
-			<language type="fil">�یلیپینی</language>
-			<language type="fiu">زبان �ین و اوگرایی</language>
-			<language type="fj">�یجیایی</language>
-			<language type="fo">�ارویی</language>
-			<language type="fon">�ونی</language>
-			<language type="fr">�رانسوی</language>
-			<language type="fr_CA">�رانسوی کانادا</language>
-			<language type="fr_CH">�رانسوی سوئیس</language>
-			<language type="frm">�رانسوی میانه</language>
-			<language type="fro">�رانسوی باستان</language>
-			<language type="frr">�ریزی شمالی</language>
-			<language type="frs">�ریزی شرقی</language>
-			<language type="fur">�ریولیایی</language>
-			<language type="fy">�ریزی غربی</language>
-			<language type="ga">ایرلندی</language>
-			<language type="gaa">گایی</language>
-			<language type="gay">گایویی</language>
-			<language type="gba">گبایایی</language>
-			<language type="gd">گیلی اسکاتلندی</language>
-			<language type="gem">زبان ژرمنی</language>
-			<language type="gez">گی‌ئزی</language>
-			<language type="gil">گیلبرتی</language>
-			<language type="gl">گالیسیایی</language>
-			<language type="gmh">آلمانی علیای میانه</language>
-			<language type="gn">گوارانی</language>
-			<language type="goh">آلمانی علیای باستان</language>
-			<language type="gon">گوندی</language>
-			<language type="gor">گورونتالو</language>
-			<language type="got">گوتی</language>
-			<language type="grb">گریبویی</language>
-			<language type="grc">یونانی کهن</language>
-			<language type="gsw">آلمانی سوئیسی</language>
-			<language type="gu">گجراتی</language>
-			<language type="gv">مانی</language>
-			<language type="gwi">گویچ این</language>
-			<language type="ha">هوسیایی</language>
-			<language type="hai">هایدایی</language>
-			<language type="haw">هاوائیایی</language>
-			<language type="he">عبری</language>
-			<language type="hi">هندی</language>
-			<language type="hil">هیلی‌گاینونی</language>
-			<language type="him">هیماچالی</language>
-			<language type="hit">هیتی</language>
-			<language type="hmn">همونگ</language>
-			<language type="ho">موتویی هیری</language>
-			<language type="hr">کرواتی</language>
-			<language type="hsb">ص�ربی علیا</language>
-			<language type="ht">هائیتیایی</language>
-			<language type="hu">مجاری</language>
-			<language type="hup">هوپا</language>
-			<language type="hy">ارمنی</language>
-			<language type="hz">هریرویی</language>
-			<language type="ia">میان‌زبان</language>
-			<language type="iba">آیبن</language>
-			<language type="id">اندونزیایی</language>
-			<language type="ie">اکسیدنتال</language>
-			<language type="ig">ایگبویی</language>
-			<language type="ii">یی سیچوان</language>
-			<language type="ijo">ایجویی</language>
-			<language type="ik">اینوپیک</language>
-			<language type="ilo">ایلوکویی</language>
-			<language type="inc">زبان هندیک</language>
-			<language type="ine">زبان هند و اروپایی</language>
-			<language type="inh">اینگوشی</language>
-			<language type="io">ایدو</language>
-			<language type="ira">زبان ایرانی</language>
-			<language type="iro">زبان ایروکوایی</language>
-			<language type="is">ایسلندی</language>
-			<language type="it">ایتالیایی</language>
-			<language type="iu">اینوکتیتوت</language>
-			<language type="ja">ژاپنی</language>
-			<language type="jbo">لوجبان</language>
-			<language type="jpr">�ارسی یهودی</language>
-			<language type="jrb">عربی یهودی</language>
-			<language type="jv">جاوه‌ای</language>
-			<language type="ka">گرجی</language>
-			<language type="kaa">قره‌قالپاقی</language>
-			<language type="kab">قبایلی</language>
-			<language type="kac">کاچینی</language>
-			<language type="kaj">جو</language>
-			<language type="kam">کامبایی</language>
-			<language type="kar">کارنی</language>
-			<language type="kaw">کاویایی</language>
-			<language type="kbd">کاباردینی</language>
-			<language type="kcg">تایپه ای</language>
-			<language type="kfo">کورو</language>
-			<language type="kg">کنگویی</language>
-			<language type="kha">خاسیایی</language>
-			<language type="khi">زبان خواسی</language>
-			<language type="kho">ختنی</language>
-			<language type="ki">کیکویویی</language>
-			<language type="kj">کوانیاما</language>
-			<language type="kk">قزاقی</language>
-			<language type="kl">گرینلندی</language>
-			<language type="km">خمری</language>
-			<language type="kmb">کیمبوندویی</language>
-			<language type="kn">کاناده‌ای</language>
-			<language type="ko">کره‌ای</language>
-			<language type="kok">کنکانی</language>
-			<language type="kpe">کپله‌ای</language>
-			<language type="kr">کانوریایی</language>
-			<language type="krc">قره‌چایی�بالکاری</language>
-			<language type="kro">کرویی</language>
-			<language type="kru">کوروخی</language>
-			<language type="ks">کشمیری</language>
-			<language type="ku">کردی</language>
-			<language type="kum">کومیکی</language>
-			<language type="kut">کوتنی</language>
-			<language type="kv">کومیایی</language>
-			<language type="kw">کرنوالی</language>
-			<language type="ky">قرقیزی</language>
-			<language type="la">لاتینی</language>
-			<language type="lad">لادینو</language>
-			<language type="lah">لاهندا</language>
-			<language type="lam">لامبا</language>
-			<language type="lb">لوگزامبورگی</language>
-			<language type="lez">لزگی</language>
-			<language type="lg">گاندایی</language>
-			<language type="li">لیمبورگی</language>
-			<language type="ln">لینگالا</language>
-			<language type="lo">لائوسی</language>
-			<language type="lol">مونگویی</language>
-			<language type="loz">لوزیایی</language>
-			<language type="lt">لیتوانیایی</language>
-			<language type="lu">لوبایی�کاتانگا</language>
-			<language type="lua">لوبایی�لولوا</language>
-			<language type="lui">لویسنو</language>
-			<language type="lun">لوندایی</language>
-			<language type="luo">لوئویی</language>
-			<language type="lus">لوشه‌ای</language>
-			<language type="lv">لتونیایی</language>
-			<language type="mad">مادورایی</language>
-			<language type="mag">ماگاهیایی</language>
-			<language type="mai">مایدیلی</language>
-			<language type="mak">ماکاسار</language>
-			<language type="man">ماندینگویی</language>
-			<language type="map">زبان آسترونیزیایی</language>
-			<language type="mas">ماسایی</language>
-			<language type="mdf">مکشایی</language>
-			<language type="mdr">ماندار</language>
-			<language type="men">منده‌ای</language>
-			<language type="mg">مالاگاسیایی</language>
-			<language type="mga">ایرلندی میانه</language>
-			<language type="mh">مارشالی</language>
-			<language type="mi">مائوریایی</language>
-			<language type="mic">میکماکی</language>
-			<language type="min">مینانگ‌کابویی</language>
-			<language type="mis">زبان مت�رقه</language>
-			<language type="mk">مقدونی</language>
-			<language type="mkh">زبان مون‌خمری</language>
-			<language type="ml">مالایالامی</language>
-			<language type="mn">مغولی</language>
-			<language type="mnc">مانچویی</language>
-			<language type="mni">میته‌ای</language>
-			<language type="mno">زبان مانوبو</language>
-			<language type="mo">مولداویایی</language>
-			<language type="moh">موهاکی</language>
-			<language type="mos">ماسیایی</language>
-			<language type="mr">مراتی</language>
-			<language type="ms">مالزیایی</language>
-			<language type="mt">مالتی</language>
-			<language type="mul">چندین زبان</language>
-			<language type="mun">زبان موندایی</language>
-			<language type="mus">کریکی</language>
-			<language type="mwr">مارواری</language>
-			<language type="my">برمه‌ای</language>
-			<language type="myn">زبان مایایی</language>
-			<language type="myv">ارزیایی</language>
-			<language type="na">نائورویی</language>
-			<language type="nah">ناواتلی</language>
-			<language type="nai">زبان سرخپوستی امریکای شمالی</language>
-			<language type="nap">ناپلی</language>
-			<language type="nb">بوکسمال نروژی</language>
-			<language type="nd">انده‌بله‌ای شمالی</language>
-			<language type="nds">آلمانی س�لی</language>
-			<language type="ne">نپالی</language>
-			<language type="new">نواریایی</language>
-			<language type="ng">اندونگایی</language>
-			<language type="nia">نیاسی</language>
-			<language type="niu">نیویی</language>
-			<language type="nl">هلندی</language>
-			<language type="nl_BE">�لمنگی</language>
-			<language type="nn">نرس جدید نروژی</language>
-			<language type="no">نروژی</language>
-			<language type="nog">نغایی</language>
-			<language type="non">نرس باستان</language>
-			<language type="nr">انده‌بله‌ای جنوبی</language>
-			<language type="nso">سوتویی شمالی</language>
-			<language type="nub">زبان نوبیایی</language>
-			<language type="nv">ناواهویی</language>
-			<language type="nwc">نواریایی کلاسیک</language>
-			<language type="ny">نیانجایی</language>
-			<language type="nym">نیام‌وزیایی</language>
-			<language type="nyn">نیانکوله‌ای</language>
-			<language type="nyo">نیورویی</language>
-			<language type="nzi">نزیمایی</language>
-			<language type="oc">اوکیتایی</language>
-			<language type="oj">اوجیبوایی</language>
-			<language type="om">اورومویی</language>
-			<language type="or">اوریه‌ای</language>
-			<language type="os">آسی</language>
-			<language type="osa">اوسیجی</language>
-			<language type="ota">ترکی عثمانی</language>
-			<language type="oto">زبان اتومیایی</language>
-			<language type="pa">پنجابی</language>
-			<language type="paa">زبان پاپوایی</language>
-			<language type="pag">پانگاسینانی</language>
-			<language type="pal">پهلوی</language>
-			<language type="pam">پامپانگایی</language>
-			<language type="pap">پاپیامنتو</language>
-			<language type="pau">پالائویی</language>
-			<language type="peo">�ارسی باستان</language>
-			<language type="phi">زبان �یلیپینی</language>
-			<language type="phn">�نیقی</language>
-			<language type="pi">پالی</language>
-			<language type="pl">لهستانی</language>
-			<language type="pon">پناپی</language>
-			<language type="pra">زبان پراکریتی</language>
-			<language type="pro">پرووانسی باستان</language>
-			<language type="ps">پشتو</language>
-			<language type="pt">پرتغالی</language>
-			<language type="pt_BR">پرتغالی برزیل</language>
-			<language type="pt_PT">پرتغالی پرتغال</language>
-			<language type="qu">کچوایی</language>
-			<language type="raj">راجستانی</language>
-			<language type="rap">راپانویی</language>
-			<language type="rar">راروتونگایی</language>
-			<language type="rm">رتو�رومیایی</language>
-			<language type="rn">روندیایی</language>
-			<language type="ro">رومانیایی</language>
-			<language type="roa">زبان رومیایی</language>
-			<language type="rom">رومانویی</language>
-			<language type="root">ریشه</language>
-			<language type="ru">روسی</language>
-			<language type="rw">کینیارواندایی</language>
-			<language type="sa">سنسکریت</language>
-			<language type="sad">سانداوه‌ای</language>
-			<language type="sah">یاقوتی</language>
-			<language type="sai">زبان سرخپوستی امریکای جنوبی</language>
-			<language type="sal">زبان سالیشی</language>
-			<language type="sam">آرامی سامری</language>
-			<language type="sas">ساساکی</language>
-			<language type="sat">سانتالی</language>
-			<language type="sc">ساردینیایی</language>
-			<language type="scn">سیسیلی</language>
-			<language type="sco">اسکاتلندی</language>
-			<language type="sd">سندی</language>
-			<language type="sel">سلکوپی</language>
-			<language type="sem">زبان سامی</language>
-			<language type="sg">سانگویی</language>
-			<language type="sga">ایرلندی باستان</language>
-			<language type="sgn">زبان نشانه‌ای</language>
-			<language type="sh">صرب و کرواتی</language>
-			<language type="shn">شانی</language>
-			<language type="si">سینهالی</language>
-			<language type="sid">سیدامویی</language>
-			<language type="sio">زبان سویی</language>
-			<language type="sit">زبان چین و تبتی</language>
-			<language type="sk">اسلواکی</language>
-			<language type="sl">اسلووینیایی</language>
-			<language type="sla">زبان اسلاوی</language>
-			<language type="sm">ساموآیی</language>
-			<language type="sn">شونایی</language>
-			<language type="snk">سونینکه‌ای</language>
-			<language type="so">سومالیایی</language>
-			<language type="sog">سغدی</language>
-			<language type="son">سونغایی</language>
-			<language type="sq">آلبانیایی</language>
-			<language type="sr">صربی</language>
-			<language type="srn">تاکی‌تاکی</language>
-			<language type="srr">سریری</language>
-			<language type="ss">سوازیایی</language>
-			<language type="ssa">زبان نیلی و صحرایی</language>
-			<language type="st">سوتویی جنوبی</language>
-			<language type="su">سوندایی</language>
-			<language type="suk">سوکومایی</language>
-			<language type="sus">سوسویی</language>
-			<language type="sux">سومری</language>
-			<language type="sv">سوئدی</language>
-			<language type="sw">سواحلی</language>
-			<language type="syc">سریانی کلاسیک</language>
-			<language type="syr">سریانی</language>
-			<language type="ta">تامیلی</language>
-			<language type="tai">زبان تایی</language>
-			<language type="te">تلوگویی</language>
-			<language type="tem">تمنه‌ای</language>
-			<language type="ter">ترنو</language>
-			<language type="tet">تتومی</language>
-			<language type="tg">تاجیکی</language>
-			<language type="th">تایلندی</language>
-			<language type="ti">تیگرینیایی</language>
-			<language type="tig">تیگره‌ای</language>
-			<language type="tiv">تیوی</language>
-			<language type="tk">ترکمنی</language>
-			<language type="tl">تاگالوگی</language>
-			<language type="tlh">کلینگون</language>
-			<language type="tli">تلین‌گیتی</language>
-			<language type="tmh">تاماشقی</language>
-			<language type="tn">تسوانایی</language>
-			<language type="to">تونگایی</language>
-			<language type="tog">تونگایی نیاسا</language>
-			<language type="tpi">زبان توک پیسینی</language>
-			<language type="tr">ترکی استانبولی</language>
-			<language type="ts">تسونگایی</language>
-			<language type="tsi">تسیم‌شیانی</language>
-			<language type="tt">تاتاری</language>
-			<language type="tum">تومبوکایی</language>
-			<language type="tup">زبان توپیایی</language>
-			<language type="tut">زبان آلتاییک</language>
-			<language type="tvl">تووالویی</language>
-			<language type="tw">توی‌یایی</language>
-			<language type="ty">تاهیتیایی</language>
-			<language type="tyv">تووایی</language>
-			<language type="udm">اودمورتی</language>
-			<language type="ug">اویغوری</language>
-			<language type="uga">اوگاریتی</language>
-			<language type="uk">اوکراینی</language>
-			<language type="umb">امبوندویی</language>
-			<language type="und">زبان نامشخص یا نامعتبر</language>
-			<language type="ur">اردو</language>
-			<language type="uz">ازبکی</language>
-			<language type="vai">ویایی</language>
-			<language type="ve">وندایی</language>
-			<language type="vi">ویتنامی</language>
-			<language type="vo">ولاپوک</language>
-			<language type="vot">وتی</language>
-			<language type="wa">والونی</language>
-			<language type="wak">زبان واکاشی</language>
-			<language type="wal">والامو</language>
-			<language type="war">وارایی</language>
-			<language type="was">واشویی</language>
-			<language type="wen">زبان ص�ربی</language>
-			<language type="wo">ولو�ی</language>
-			<language type="xal">قلموقی</language>
-			<language type="xh">خوسایی</language>
-			<language type="yao">یائویی</language>
-			<language type="yap">یاپی</language>
-			<language type="yi">یدی</language>
-			<language type="yo">یوروبایی</language>
-			<language type="ypk">زبان یوپیکی</language>
-			<language type="za">چوانگی</language>
-			<language type="zap">زاپوتکی</language>
-			<language type="zen">زناگا</language>
-			<language type="zh">چینی</language>
-			<language type="zh_Hans">چینی ساده‌شده</language>
-			<language type="zh_Hant">چینی سنتی</language>
-			<language type="znd">زانده‌ای</language>
-			<language type="zu">زولویی</language>
-			<language type="zun">زونیایی</language>
-			<language type="zxx">بدون محتوای زبانی</language>
-			<language type="zza">زازایی</language>
-		</languages>
-		<scripts>
-			<script type="Arab">عربی</script>
-			<script type="Armi">آرامی هخامنشی</script>
-			<script type="Armn">ارمنی</script>
-			<script type="Avst">اوستایی</script>
-			<script type="Bali">بالیایی</script>
-			<script type="Batk">باتاکی</script>
-			<script type="Beng">بنگالی</script>
-			<script type="Blis">نمادهای بلیس</script>
-			<script type="Bopo">بوپومو�و</script>
-			<script type="Brah">براهمی</script>
-			<script type="Brai">بریل</script>
-			<script type="Bugi">بوگیایی</script>
-			<script type="Buhd">بوهید</script>
-			<script type="Cakm">کاکم</script>
-			<script type="Cari">کاری</script>
-			<script type="Cham">چمی</script>
-			<script type="Cher">چروکیایی</script>
-			<script type="Cirt">کرت</script>
-			<script type="Copt">قبطی</script>
-			<script type="Cprt">قبرسی</script>
-			<script type="Cyrl">سیریلی</script>
-			<script type="Deva">دوناگری</script>
-			<script type="Dsrt">دیسرتی</script>
-			<script type="Egyh">کاهنی مصری</script>
-			<script type="Egyp">هیروگلی� مصری</script>
-			<script type="Ethi">اتیوپیایی</script>
-			<script type="Geok">گرجی خوتسوری</script>
-			<script type="Geor">گرجی</script>
-			<script type="Glag">گلاگولیتیک</script>
-			<script type="Goth">گوتیک</script>
-			<script type="Grek">یونانی</script>
-			<script type="Gujr">گجراتی</script>
-			<script type="Guru">گورموخی</script>
-			<script type="Hang">هانگول</script>
-			<script type="Hani">هان</script>
-			<script type="Hano">هانونویی</script>
-			<script type="Hans">هان ساده‌شده</script>
-			<script type="Hant">هان سنتی</script>
-			<script type="Hebr">عبری</script>
-			<script type="Hira">هیراگانا</script>
-			<script type="Hrkt">کاتاکانا یا هیراگانا</script>
-			<script type="Hung">مجاری باستان</script>
-			<script type="Inds">ایندوس</script>
-			<script type="Java">جاوه‌ای</script>
-			<script type="Jpan">ژاپنی</script>
-			<script type="Kali">کایالی</script>
-			<script type="Kana">کاتاکانا</script>
-			<script type="Khmr">خمری</script>
-			<script type="Knda">کاناده‌ای</script>
-			<script type="Kore">کره‌ای</script>
-			<script type="Kthi">کثی</script>
-			<script type="Lana">لانایی</script>
-			<script type="Laoo">لائوسی</script>
-			<script type="Latf">لاتینی �راکتور</script>
-			<script type="Latg">لاتینی گیلی</script>
-			<script type="Latn">لاتینی</script>
-			<script type="Limb">لیمبایی</script>
-			<script type="Lina">خطی ال�</script>
-			<script type="Linb">خطی ب</script>
-			<script type="Lyci">لسیایی</script>
-			<script type="Lydi">لدیایی</script>
-			<script type="Mand">منده‌ای</script>
-			<script type="Mani">مانوی</script>
-			<script type="Maya">هیروگلی� مایایی</script>
-			<script type="Mero">مروییتی</script>
-			<script type="Mlym">مالایالامی</script>
-			<script type="Mong">مغولی</script>
-			<script type="Moon">مونی</script>
-			<script type="Mtei">مایک میتی</script>
-			<script type="Mymr">میانمار</script>
-			<script type="Ogam">اوگامی</script>
-			<script type="Orkh">اورخونی</script>
-			<script type="Orya">اوریه‌ای</script>
-			<script type="Perm">پرمی باستان</script>
-			<script type="Phli">پهلوی کتیبه‌ای</script>
-			<script type="Phlp">پهلوی زبوری</script>
-			<script type="Phlv">پهلوی کتابی</script>
-			<script type="Phnx">�نیقی</script>
-			<script type="Prti">پارتی کتیبه‌ای</script>
-			<script type="Qaai">موروثی</script>
-			<script type="Rjng">رجنگی</script>
-			<script type="Runr">رونی</script>
-			<script type="Samr">سامری</script>
-			<script type="Sara">ساراتی</script>
-			<script type="Saur">سوراشترایی</script>
-			<script type="Shaw">شاوی</script>
-			<script type="Sinh">سینهالی</script>
-			<script type="Sylo">سیلوتی نگاری</script>
-			<script type="Syrc">سریانی</script>
-			<script type="Syre">سریانی استرانگلو</script>
-			<script type="Syrj">سریانی غربی</script>
-			<script type="Syrn">سریانی شرقی</script>
-			<script type="Tagb">تگبنوایی</script>
-			<script type="Taml">تامیلی</script>
-			<script type="Telu">تلوگویی</script>
-			<script type="Teng">تنگوار</script>
-			<script type="Tglg">تاگالوگی</script>
-			<script type="Thai">تایلندی</script>
-			<script type="Tibt">تبتی</script>
-			<script type="Vaii">ویایی</script>
-			<script type="Visp">گ�تار قابل مشاهده</script>
-			<script type="Xpeo">�ارسی باستان</script>
-			<script type="Xsux">میخی سومری�آکدی</script>
-			<script type="Yiii">یی</script>
-			<script type="Zxxx">نوشته‌نشده</script>
-			<script type="Zyyy">مشترک</script>
-			<script type="Zzzz">خط نامشخص یا نامعتبر</script>
-		</scripts>
-		<territories>
-			<territory type="001">جهان</territory>
-			<territory type="002">ا�ریقا</territory>
-			<territory type="003">امریکای شمالی</territory>
-			<territory type="005">امریکای جنوبی</territory>
-			<territory type="009">اقیانوسیه</territory>
-			<territory type="011">غرب ا�ریقا</territory>
-			<territory type="013">امریکای مرکزی</territory>
-			<territory type="014">شرق ا�ریقا</territory>
-			<territory type="015">شمال ا�ریقا</territory>
-			<territory type="017">مرکز ا�ریقا</territory>
-			<territory type="018">جنوب ا�ریقا</territory>
-			<territory type="019">امریکا</territory>
-			<territory type="021">شمال امریکا</territory>
-			<territory type="029">کارائیب</territory>
-			<territory type="030">شرق آسیا</territory>
-			<territory type="034">جنوب آسیا</territory>
-			<territory type="035">جنوب شرقی آسیا</territory>
-			<territory type="039">جنوب اروپا</territory>
-			<territory type="053">استرالیا و زلاند نو</territory>
-			<territory type="054">ملانزی</territory>
-			<territory type="057">ناحیهٔ میکرونزی</territory>
-			<territory type="061">پلی‌نزی</territory>
-			<territory type="062">جنوب آسیا و آسیای میانه</territory>
-			<territory type="142">آسیا</territory>
-			<territory type="143">آسیای مرکزی</territory>
-			<territory type="145">غرب آسیا</territory>
-			<territory type="150">اروپا</territory>
-			<territory type="151">شرق اروپا</territory>
-			<territory type="154">شمال اروپا</territory>
-			<territory type="155">غرب اروپا</territory>
-			<territory type="172">کشورهای مستقل مشترک‌المنا�ع</territory>
-			<territory type="419">امریکای لاتین و کارائیب</territory>
-			<territory type="AD">آندورا</territory>
-			<territory type="AE">امارات متحدهٔ عربی</territory>
-			<territory type="AF">ا�غانستان</territory>
-			<territory type="AG">آنتیگوا و باربودا</territory>
-			<territory type="AI">آنگیل</territory>
-			<territory type="AL">آلبانی</territory>
-			<territory type="AM">ارمنستان</territory>
-			<territory type="AN">آنتیل هلند</territory>
-			<territory type="AO">آنگولا</territory>
-			<territory type="AQ">جنوبگان</territory>
-			<territory type="AR">آرژانتین</territory>
-			<territory type="AS">ساموای امریکا</territory>
-			<territory type="AT">اتریش</territory>
-			<territory type="AU">استرالیا</territory>
-			<territory type="AW">آروبا</territory>
-			<territory type="AX">جزایر آلاند</territory>
-			<territory type="AZ">جمهوری آذربایجان</territory>
-			<territory type="BA">بوسنی و هرزگوین</territory>
-			<territory type="BB">باربادوس</territory>
-			<territory type="BD">بنگلادش</territory>
-			<territory type="BE">بلژیک</territory>
-			<territory type="BF">بورکینا�اسو</territory>
-			<territory type="BG">بلغارستان</territory>
-			<territory type="BH">بحرین</territory>
-			<territory type="BI">بوروندی</territory>
-			<territory type="BJ">بنین</territory>
-			<territory type="BL">سنت بارتلیمی</territory>
-			<territory type="BM">برمودا</territory>
-			<territory type="BN">برونئی</territory>
-			<territory type="BO">بولیوی</territory>
-			<territory type="BR">برزیل</territory>
-			<territory type="BS">باهاما</territory>
-			<territory type="BT">بوتان</territory>
-			<territory type="BV">جزیرهٔ بووت</territory>
-			<territory type="BW">بوتسوانا</territory>
-			<territory type="BY">بیلوروسی</territory>
-			<territory type="BZ">بلیز</territory>
-			<territory type="CA">کانادا</territory>
-			<territory type="CC">جزایر کوکوس</territory>
-			<territory type="CD">کنگو کینشاسا</territory>
-			<territory type="CF">جمهوری ا�ریقای مرکزی</territory>
-			<territory type="CG">کنگو برازویل</territory>
-			<territory type="CH">سوئیس</territory>
-			<territory type="CI">ساحل عاج</territory>
-			<territory type="CK">جزایر کوک</territory>
-			<territory type="CL">شیلی</territory>
-			<territory type="CM">کامرون</territory>
-			<territory type="CN">چین</territory>
-			<territory type="CO">کلمبیا</territory>
-			<territory type="CR">کاستاریکا</territory>
-			<territory type="CS">صربستان و مونته‌نگرو</territory>
-			<territory type="CU">کوبا</territory>
-			<territory type="CV">کیپ ورد</territory>
-			<territory type="CX">جزیرهٔ کریسمس</territory>
-			<territory type="CY">قبرس</territory>
-			<territory type="CZ">جمهوری چک</territory>
-			<territory type="DE">آلمان</territory>
-			<territory type="DJ">جیبوتی</territory>
-			<territory type="DK">دانمارک</territory>
-			<territory type="DM">دومینیک</territory>
-			<territory type="DO">جمهوری دومینیکن</territory>
-			<territory type="DZ">الجزایر</territory>
-			<territory type="EC">اکوادر</territory>
-			<territory type="EE">استونی</territory>
-			<territory type="EG">مصر</territory>
-			<territory type="EH">صحرای غربی</territory>
-			<territory type="ER">اریتره</territory>
-			<territory type="ES">اسپانیا</territory>
-			<territory type="ET">اتیوپی</territory>
-			<territory type="FI">�نلاند</territory>
-			<territory type="FJ">�یجی</territory>
-			<territory type="FK">جزایر �الکلند</territory>
-			<territory type="FM">میکرونزی</territory>
-			<territory type="FO">جزایر �ارو</territory>
-			<territory type="FR">�رانسه</territory>
-			<territory type="GA">گابون</territory>
-			<territory type="GB">بریتانیا</territory>
-			<territory type="GD">گرانادا</territory>
-			<territory type="GE">گرجستان</territory>
-			<territory type="GF">گویان �رانسه</territory>
-			<territory type="GG">گرنزی</territory>
-			<territory type="GH">غنا</territory>
-			<territory type="GI">جبل‌الطارق</territory>
-			<territory type="GL">گروئنلند</territory>
-			<territory type="GM">گامبیا</territory>
-			<territory type="GN">گینه</territory>
-			<territory type="GP">گوادلوپ</territory>
-			<territory type="GQ">گینهٔ استوایی</territory>
-			<territory type="GR">یونان</territory>
-			<territory type="GS">جورجیای جنوبی و جزایر ساندویچ جنوبی</territory>
-			<territory type="GT">گواتمالا</territory>
-			<territory type="GU">گوام</territory>
-			<territory type="GW">گینهٔ بیسائو</territory>
-			<territory type="GY">گویان</territory>
-			<territory type="HK">هنگ‌کنگ، ناحیهٔ ویژهٔ حکومتی چین</territory>
-			<territory type="HM">جزیرهٔ هرد و جزایر مک‌دونالد</territory>
-			<territory type="HN">هندوراس</territory>
-			<territory type="HR">کرواسی</territory>
-			<territory type="HT">هاییتی</territory>
-			<territory type="HU">مجارستان</territory>
-			<territory type="ID">اندونزی</territory>
-			<territory type="IE">ایرلند</territory>
-			<territory type="IL">اسرائیل</territory>
-			<territory type="IM">جزیرهٔ مان</territory>
-			<territory type="IN">هند</territory>
-			<territory type="IO">مستعمره‌های بریتانیا در اقیانوس هند</territory>
-			<territory type="IQ">عراق</territory>
-			<territory type="IR">ایران</territory>
-			<territory type="IS">ایسلند</territory>
-			<territory type="IT">ایتالیا</territory>
-			<territory type="JE">جرسی</territory>
-			<territory type="JM">جامائیکا</territory>
-			<territory type="JO">اردن</territory>
-			<territory type="JP">ژاپن</territory>
-			<territory type="KE">کنیا</territory>
-			<territory type="KG">قرقیزستان</territory>
-			<territory type="KH">کامبوج</territory>
-			<territory type="KI">کیریباتی</territory>
-			<territory type="KM">کومورو</territory>
-			<territory type="KN">سنت کیتس و نویس</territory>
-			<territory type="KP">کرهٔ شمالی</territory>
-			<territory type="KR">کرهٔ جنوبی</territory>
-			<territory type="KW">کویت</territory>
-			<territory type="KY">جزایر ک�یمن</territory>
-			<territory type="KZ">قزاقستان</territory>
-			<territory type="LA">لائوس</territory>
-			<territory type="LB">لبنان</territory>
-			<territory type="LC">سنت لوسیا</territory>
-			<territory type="LI">لیختن‌اشتاین</territory>
-			<territory type="LK">سری‌لانکا</territory>
-			<territory type="LR">لیبریا</territory>
-			<territory type="LS">لسوتو</territory>
-			<territory type="LT">لیتوانی</territory>
-			<territory type="LU">لوکزامبورگ</territory>
-			<territory type="LV">لتونی</territory>
-			<territory type="LY">لیبی</territory>
-			<territory type="MA">مراکش</territory>
-			<territory type="MC">موناکو</territory>
-			<territory type="MD">مولداوی</territory>
-			<territory type="ME">مونته‌نگرو</territory>
-			<territory type="MF">سنت مارتین</territory>
-			<territory type="MG">ماداگاسکار</territory>
-			<territory type="MH">جزایر مارشال</territory>
-			<territory type="MK">مقدونیه</territory>
-			<territory type="ML">مالی</territory>
-			<territory type="MM">میانمار</territory>
-			<territory type="MN">مغولستان</territory>
-			<territory type="MO">ماکائو، ناحیهٔ ویژهٔ حکومتی چین</territory>
-			<territory type="MP">جزایر ماریانای شمالی</territory>
-			<territory type="MQ">مارتینیک</territory>
-			<territory type="MR">موریتانی</territory>
-			<territory type="MS">مونت‌سرات</territory>
-			<territory type="MT">مالت</territory>
-			<territory type="MU">موریس</territory>
-			<territory type="MV">مالدیو</territory>
-			<territory type="MW">مالاوی</territory>
-			<territory type="MX">مکزیک</territory>
-			<territory type="MY">مالزی</territory>
-			<territory type="MZ">موزامبیک</territory>
-			<territory type="NA">نامیبیا</territory>
-			<territory type="NC">کالدونیای جدید</territory>
-			<territory type="NE">نیجر</territory>
-			<territory type="NF">جزیرهٔ نور�ولک</territory>
-			<territory type="NG">نیجریه</territory>
-			<territory type="NI">نیکاراگوئه</territory>
-			<territory type="NL">هلند</territory>
-			<territory type="NO">نروژ</territory>
-			<territory type="NP">نپال</territory>
-			<territory type="NR">نائورو</territory>
-			<territory type="NU">نیوئه</territory>
-			<territory type="NZ">زلاند نو</territory>
-			<territory type="OM">عمان</territory>
-			<territory type="PA">پاناما</territory>
-			<territory type="PE">پرو</territory>
-			<territory type="PF">پلی‌نزی �رانسه</territory>
-			<territory type="PG">پاپوا گینهٔ نو</territory>
-			<territory type="PH">�یلیپین</territory>
-			<territory type="PK">پاکستان</territory>
-			<territory type="PL">لهستان</territory>
-			<territory type="PM">سنت پیر و میکلون</territory>
-			<territory type="PN">پیتکایرن</territory>
-			<territory type="PR">پورتو ریکو</territory>
-			<territory type="PS">�لسطین</territory>
-			<territory type="PT">پرتغال</territory>
-			<territory type="PW">پالائو</territory>
-			<territory type="PY">پاراگوئه</territory>
-			<territory type="QA">قطر</territory>
-			<territory type="QO">بخش‌های دورا�تادهٔ اقیانوسیه</territory>
-			<territory type="QU">اتحادیهٔ اروپا</territory>
-			<territory type="RE">ریونیون</territory>
-			<territory type="RO">رومانی</territory>
-			<territory type="RS">صربستان</territory>
-			<territory type="RU">روسیه</territory>
-			<territory type="RW">رواندا</territory>
-			<territory type="SA">عربستان سعودی</territory>
-			<territory type="SB">جزایر سلیمان</territory>
-			<territory type="SC">سیشل</territory>
-			<territory type="SD">سودان</territory>
-			<territory type="SE">سوئد</territory>
-			<territory type="SG">سنگاپور</territory>
-			<territory type="SH">سنت هلن</territory>
-			<territory type="SI">اسلوونی</territory>
-			<territory type="SJ">اسوالبارد و جان ماین</territory>
-			<territory type="SK">اسلواکی</territory>
-			<territory type="SL">سیرالئون</territory>
-			<territory type="SM">سان مارینو</territory>
-			<territory type="SN">سنگال</territory>
-			<territory type="SO">سومالی</territory>
-			<territory type="SR">سورینام</territory>
-			<territory type="ST">سائو تومه و پرینسیپه</territory>
-			<territory type="SV">السالوادور</territory>
-			<territory type="SY">سوریه</territory>
-			<territory type="SZ">سوازیلند</territory>
-			<territory type="TC">جزایر ترک و کایکوس</territory>
-			<territory type="TD">چاد</territory>
-			<territory type="TF">مستعمره‌های جنوبی �رانسه</territory>
-			<territory type="TG">توگو</territory>
-			<territory type="TH">تایلند</territory>
-			<territory type="TJ">تاجیکستان</territory>
-			<territory type="TK">توکلائو</territory>
-			<territory type="TL">تیمور شرقی</territory>
-			<territory type="TM">ترکمنستان</territory>
-			<territory type="TN">تونس</territory>
-			<territory type="TO">تونگا</territory>
-			<territory type="TR">ترکیه</territory>
-			<territory type="TT">ترینیداد و توباگو</territory>
-			<territory type="TV">تووالو</territory>
-			<territory type="TW">تایوان</territory>
-			<territory type="TZ">تانزانیا</territory>
-			<territory type="UA">اوکراین</territory>
-			<territory type="UG">اوگاندا</territory>
-			<territory type="UM">جزایر کوچک دورا�تادهٔ ایالات متحده</territory>
-			<territory type="US">ایالات متحدهٔ امریکا</territory>
-			<territory type="UY">اوروگوئه</territory>
-			<territory type="UZ">ازبکستان</territory>
-			<territory type="VA">واتیکان</territory>
-			<territory type="VC">سنت وینسنت و گرنادین</territory>
-			<territory type="VE">ونزوئلا</territory>
-			<territory type="VG">جزایر ویرجین بریتانیا</territory>
-			<territory type="VI">جزایر ویرجین ایالات متحده</territory>
-			<territory type="VN">ویتنام</territory>
-			<territory type="VU">وانواتو</territory>
-			<territory type="WF">والیس و �یوتونا</territory>
-			<territory type="WS">ساموا</territory>
-			<territory type="YE">یمن</territory>
-			<territory type="YT">مایوت</territory>
-			<territory type="ZA">ا�ریقای جنوبی</territory>
-			<territory type="ZM">زامبیا</territory>
-			<territory type="ZW">زیمبابوه</territory>
-			<territory type="ZZ">ناحیهٔ نامشخص یا نامعتبر</territory>
-		</territories>
-		<variants>
-			<variant type="1901">رسم‌الخط سنتی آلمانی</variant>
-			<variant type="1996">رسم‌الخط آلمانی ۱۹۹۶ میلادی</variant>
-			<variant type="AREVELA">ارمنی شرقی</variant>
-			<variant type="AREVMDA">ارمنی غربی</variant>
-			<variant type="POSIX">کامپیوتری</variant>
-			<variant type="REVISED">رسم‌الخط تجدیدنظرشده</variant>
-			<variant type="SAAHO">ساهویی</variant>
-			<variant type="SCOTLAND">انگلیسی معیار اسکاتلند</variant>
-		</variants>
-		<keys>
-			<key type="calendar">تقویم</key>
-			<key type="collation">ترتیب‌بندی</key>
-			<key type="currency">واحد پول</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">ترتیب چینی سنتی  Big5</type>
-			<type type="buddhist" key="calendar">تقویم بودایی</type>
-			<type type="chinese" key="calendar">تقویم چینی</type>
-			<type type="direct" key="collation">ترتیب مستقیم</type>
-			<type type="gb2312han" key="collation">ترتیب چینی ساده‌شده GB2312</type>
-			<type type="gregorian" key="calendar">تقویم میلادی</type>
-			<type type="hebrew" key="calendar">تقویم عبری</type>
-			<type type="indian" key="calendar">تقویم ملی هند</type>
-			<type type="islamic" key="calendar">تقویم هجری قمری</type>
-			<type type="islamic-civil" key="calendar">تقویم هجری قمری مدنی</type>
-			<type type="japanese" key="calendar">تقویم ژاپنی</type>
-			<type type="persian" key="calendar">تقویم هجری شمسی</type>
-			<type type="phonebook" key="collation">ترتیب د�تر تل�ن</type>
-			<type type="pinyin" key="collation">ترتیب پین‌یین چینی ساده‌شده</type>
-			<type type="roc" key="calendar">تقویم جمهوری چین</type>
-			<type type="stroke" key="collation">ترتیب حرکتی چینی سنتی</type>
-			<type type="traditional" key="collation">ترتیب سنتی</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">متریک</measurementSystemName>
-			<measurementSystemName type="US">امریکایی</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">زبان: {0}</codePattern>
-			<codePattern type="script">خط: {0}</codePattern>
-			<codePattern type="territory">ناحیه: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064B \u064D \u064C \u0651 \u0654 آ ا ء أ ؤ ئ ب پ ت-ج چ ح-ز ژ س-غ � ق ک گ ل-ن و ه ة ی]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u064E-\u0650 \u0652 \u0656 \u0670 Û°-Û¹ \u200C-\u200F]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z ï·¼]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} تا {1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ژانویهٔ</month>
-							<month type="2">�وریهٔ</month>
-							<month type="3">مارس</month>
-							<month type="4">آوریل</month>
-							<month type="5">مهٔ</month>
-							<month type="6">ژوئن</month>
-							<month type="7">ژوئیهٔ</month>
-							<month type="8">اوت</month>
-							<month type="9">سپتامبر</month>
-							<month type="10">اکتبر</month>
-							<month type="11">نوامبر</month>
-							<month type="12">دسامبر</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ژانویهٔ</month>
-							<month type="2">�وریهٔ</month>
-							<month type="3">مارس</month>
-							<month type="4">آوریل</month>
-							<month type="5">مهٔ</month>
-							<month type="6">ژوئن</month>
-							<month type="7">ژوئیهٔ</month>
-							<month type="8">اوت</month>
-							<month type="9">سپتامبر</month>
-							<month type="10">اکتبر</month>
-							<month type="11">نوامبر</month>
-							<month type="12">دسامبر</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ú˜</month>
-							<month type="2">Ù�</month>
-							<month type="3">Ù…</month>
-							<month type="4">Ø¢</month>
-							<month type="5">Ù…</month>
-							<month type="6">Ú˜</month>
-							<month type="7">Ú˜</month>
-							<month type="8">ا</month>
-							<month type="9">س</month>
-							<month type="10">ا</month>
-							<month type="11">Ù†</month>
-							<month type="12">د</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ژانویه</month>
-							<month type="2">�وریه</month>
-							<month type="3">مارس</month>
-							<month type="4">آوریل</month>
-							<month type="5">مه</month>
-							<month type="6">ژوئن</month>
-							<month type="7">ژوئیه</month>
-							<month type="8">اوت</month>
-							<month type="9">سپتامبر</month>
-							<month type="10">اکتبر</month>
-							<month type="11">نوامبر</month>
-							<month type="12">دسامبر</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun">یکشنبه</day>
-							<day type="mon">دوشنبه</day>
-							<day type="tue">سه‌شنبه</day>
-							<day type="wed">چهارشنبه</day>
-							<day type="thu">پنجشنبه</day>
-							<day type="fri">جمعه</day>
-							<day type="sat">شنبه</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ی</day>
-							<day type="mon">د</day>
-							<day type="tue">س</day>
-							<day type="wed">Ú†</day>
-							<day type="thu">Ù¾</day>
-							<day type="fri">ج</day>
-							<day type="sat">Ø´</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">س‌م۱</quarter>
-							<quarter type="2">س‌م۲</quarter>
-							<quarter type="3">س‌م۳</quarter>
-							<quarter type="4">س‌م۴</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">سه‌ماههٔ اول</quarter>
-							<quarter type="2">سه‌ماههٔ دوم</quarter>
-							<quarter type="3">سه‌ماههٔ سوم</quarter>
-							<quarter type="4">سه‌ماههٔ چهارم</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">Û±</quarter>
-							<quarter type="2">Û²</quarter>
-							<quarter type="3">Û³</quarter>
-							<quarter type="4">Û´</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>قبل از ظهر</am>
-				<pm>بعد از ظهر</pm>
-				<eras>
-					<eraNames>
-						<era type="0">قبل از میلاد</era>
-						<era type="1">میلادی</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Ù‚.Ù….</era>
-						<era type="1">Ù….</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">Ù‚</era>
-						<era type="1">Ù…</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<default choice="long"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss (zzzz)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss (z)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}، ساعت {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}، ساعت {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}،� {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}،� {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="GGGGyyyyMMMMd">d MMMM y GGGG</dateFormatItem>
-						<dateFormatItem id="HHmmZ">HH:mm (Z)</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d LLL</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d LLL</dateFormatItem>
-						<dateFormatItem id="MMMMd">d LLLL</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d LLLL</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy/M</dateFormatItem>
-						<dateFormatItem id="yMEd">E yyyy/M/d</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMMEEEEd">EEEE d MMMM y</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day-Of-Week">{1} {0}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<intervalFormatFallback>{0} تا {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d تا d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H تا H</greatestDifference>
-							<greatestDifference id="h">H تا H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H:mm تا H:mm</greatestDifference>
-							<greatestDifference id="h">H:mm تا H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm تا H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H:mm تا H:mm (v)</greatestDifference>
-							<greatestDifference id="h">H:mm تا H:mm (v)</greatestDifference>
-							<greatestDifference id="m">H:mm تا H:mm (v)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H تا H (v)</greatestDifference>
-							<greatestDifference id="h">H تا H (v)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M تا M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M تا d/M</greatestDifference>
-							<greatestDifference id="M">M/d تا M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E M/d تا E M/d</greatestDifference>
-							<greatestDifference id="M">E M/d تا E M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL تا LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d تا d LLL</greatestDifference>
-							<greatestDifference id="M">d LLL تا d LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d LLL تا E d LLL</greatestDifference>
-							<greatestDifference id="M">E d LLL تا E d LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL تا LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y تا y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy/M تا yyyy/M</greatestDifference>
-							<greatestDifference id="y">yyyy/M تا yyyy/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy/M/d تا yyyy/M/d</greatestDifference>
-							<greatestDifference id="M">yyyy/M/d تا yyyy/M/d</greatestDifference>
-							<greatestDifference id="y">yyyy/M/d تا yyyy/M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E yyyy/M/d تا E yyyy/M/d</greatestDifference>
-							<greatestDifference id="M">E yyyy/M/d تا E yyyy/M/d</greatestDifference>
-							<greatestDifference id="y">E yyyy/M/d تا E yyyy/M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL تا MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y تا MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d تا d MMM y</greatestDifference>
-							<greatestDifference id="M">d LLL تا d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y تا d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d LLL تا E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d LLL تا E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y تا E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL تا MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y تا MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>دوره</displayName>
-					</field>
-					<field type="year">
-						<displayName>سال</displayName>
-					</field>
-					<field type="month">
-						<displayName>ماه</displayName>
-					</field>
-					<field type="week">
-						<displayName>ه�ته</displayName>
-					</field>
-					<field type="day">
-						<displayName>روز</displayName>
-						<relative type="-3">سه روز پیش</relative>
-						<relative type="-2">پریروز</relative>
-						<relative type="-1">دیروز</relative>
-						<relative type="0">امروز</relative>
-						<relative type="1">�ردا</relative>
-						<relative type="2">پس‌�ردا</relative>
-						<relative type="3">سه روز بعد</relative>
-					</field>
-					<field type="weekday">
-						<displayName>روز ه�ته</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>قبل/بعد از ظهر</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ساعت</displayName>
-					</field>
-					<field type="minute">
-						<displayName>دقیقه</displayName>
-					</field>
-					<field type="second">
-						<displayName>ثانیه</displayName>
-					</field>
-					<field type="zone">
-						<displayName>منطقهٔ زمانی</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">تشری</month>
-							<month type="2">حشوان</month>
-							<month type="3">کسلو</month>
-							<month type="4">طوت</month>
-							<month type="5">شباط</month>
-							<month type="6">آذار</month>
-							<month type="7">واذار</month>
-							<month type="8">نیسان</month>
-							<month type="9">ایار</month>
-							<month type="10">سیوان</month>
-							<month type="11">تموز</month>
-							<month type="12">آب</month>
-							<month type="13">ایلول</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ت</month>
-							<month type="2">Ø­</month>
-							<month type="3">Ú©</month>
-							<month type="4">Ø·</month>
-							<month type="5">Ø´</month>
-							<month type="6">Ø¢</month>
-							<month type="7">Ùˆ</month>
-							<month type="8">Ù†</month>
-							<month type="9">ا</month>
-							<month type="10">س</month>
-							<month type="11">ت</month>
-							<month type="12">Ø¢</month>
-							<month type="13">ا</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">محرم</month>
-							<month type="2">ص�ر</month>
-							<month type="3">ربیع الاول</month>
-							<month type="4">ربیع الثانی</month>
-							<month type="5">جمادی الاول</month>
-							<month type="6">جمادی الثانی</month>
-							<month type="7">رجب</month>
-							<month type="8">شعبان</month>
-							<month type="9">رمضان</month>
-							<month type="10">شوال</month>
-							<month type="11">ذیقعدهٔ</month>
-							<month type="12">ذیحجهٔ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ù…</month>
-							<month type="2">ص</month>
-							<month type="3">ر</month>
-							<month type="4">ر</month>
-							<month type="5">ج</month>
-							<month type="6">ج</month>
-							<month type="7">ر</month>
-							<month type="8">Ø´</month>
-							<month type="9">ر</month>
-							<month type="10">Ø´</month>
-							<month type="11">Ø°</month>
-							<month type="12">Ø°</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>قبل از ظهر</am>
-				<pm>بعد از ظهر</pm>
-				<eras>
-					<eraNames>
-						<era type="0">هجری قمری</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ه�. ق.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<default choice="long"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y GGGG</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy/M/d G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/M/d G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">�روردین</month>
-							<month type="2">اردیبهشت</month>
-							<month type="3">خرداد</month>
-							<month type="4">تیر</month>
-							<month type="5">مرداد</month>
-							<month type="6">شهریور</month>
-							<month type="7">مهر</month>
-							<month type="8">آبان</month>
-							<month type="9">آذر</month>
-							<month type="10">دی</month>
-							<month type="11">بهمن</month>
-							<month type="12">اس�ند</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ù�</month>
-							<month type="2">ا</month>
-							<month type="3">Ø®</month>
-							<month type="4">ت</month>
-							<month type="5">Ù…</month>
-							<month type="6">Ø´</month>
-							<month type="7">Ù…</month>
-							<month type="8">Ø¢</month>
-							<month type="9">Ø¢</month>
-							<month type="10">د</month>
-							<month type="11">ب</month>
-							<month type="12">ا</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>قبل از ظهر</am>
-				<pm>بعد از ظهر</pm>
-				<eras>
-					<eraNames>
-						<era type="0">هجری شمسی</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ه�. ش.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>وقت {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>نامشخص</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>آندورا</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>کابل</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>آنگویلا</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>روترا</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>پالمر</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>قطب جنوب</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>سی ووا</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>ماوسون</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>دیویس</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ووستوک</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>کیسی</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>دومونت د اورویل</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>مک موردو</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>ریو گالگوس</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>مندوسا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>سن خوان</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>اوشوایا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>لاریوجا</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>سن لوئیس</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>کاتامارکا</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>خوخوئی</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>توکومن</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>کوردووا</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>بوئنوس‌آیرس</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>پرت</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>اوکلا</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>داروین</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>آدلاید</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>بروکن هیل</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>کوری</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>ملبورن</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>هوبارت</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>لیندمن</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>سیدنی</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>بریسبین</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>لردهاو</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>آروبا</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>باربادس</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>بحرین</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>برمودا</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>ایرونپه</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>ریو برانکو</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>پورتوولیو</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>بوئاویشتا</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>ماناوس</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>کویاوا</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>کمپو گرانده</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>بلم</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>آراگواینا</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>سائوپائولو</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>باهیا</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>�ورتالزا</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>ماسیو</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>ریسای�</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>نورونیا</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>بلیز</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>داوسن</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>وایت‌هورس</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>اینوویک</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>ونکوور</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>داوسن کریک</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>یلونای�</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>ادمونتون</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>سوئی�ت کورنت</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>خلیج کمبریج</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>رجاینا</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>وینیپگ</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>رسولوت</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>رینی‌ریور</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>خلیجک رنکین</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>کورال هاربر</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ثاندر بی</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>نیپیگان</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>تورنتو</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>مونرئال</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>ایکلوئت</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>پانگنیرتونگ</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>مانکتون</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>هلی�کس</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>خلیج گوس</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>گلیس بی</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>بلنک-سابلن</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>سنت جان</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>کینشاسا</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>لوبومباشی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ایستر</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>سانتیاگو</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>کاشغر</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>ارومچی</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>چونگ کینگ</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>شانگهای</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>هاربین</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>کستا ریکا</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>کیپ ورد</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>دجیبوتی</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>دمونیکا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>گالاپاگوس</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>گوایاکیل</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>قناری</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>سئوتا</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>مادرید</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>�یجی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>تراک</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>پناپه</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>کوساره</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>گرینادا</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>جبل الطارق</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>تول</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>گودهوب</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>اسکورسبیساند</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>دانمارک شاون</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>گوادلوپ</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>گواتمالا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>گوام</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>گویانا</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>هونگ کنگ</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>جاکارتا</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>پونتیاناک</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>ماکاسار</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>جیاپورا</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>تهران</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>جامایکا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>اندربری</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>کریتیماتی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>تاراوا</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>کویت</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>آکتا</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>اورال</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>آکتوبه</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>کویزیلوردا</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>آلماتی</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>لاکسمبورگ</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>موناکو</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>کواجالین</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>ماجورو</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>هود</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>اولان باتار</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>چیو بال سان</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>مکاو</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>مارتینیکو</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>منتسرات</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>مالتا</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>ماوریتیوس</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>مالدیو</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>تی جوانا</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>ارموسیو</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>ماساتلان</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>چیئوائوا</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>مونترئی</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>مکزیکوسیتی</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>مریدا</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>کانکون</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>کوچینگ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>ناورو</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>نیوه</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>چاتام</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>پاناما</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>تاهیتی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>مارکوس</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>گامبیر</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>پیتکیرن</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>پورتو ریکو</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>آزورس</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>مادریا</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>لیسبون</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>پالاو</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>قطر</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>ریونیون</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>کالینینگراد</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>مسکو</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>ولگاگراد</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>سامارا</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>یکاترینبرگ</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>اومسک</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>نووسیبیریسک</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>کراسنویارسک</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ایرکوتسک</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>یاکوتسک</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ولادی‌وستوک</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>ساخالین</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>مگادن</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>کامچاتکا</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>آنادیر</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>سنگاپور</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>ال سالوادر</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>اوژگورود</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>کی�</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>سیم�روپل</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>زاپوروژی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>میدوی</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>جانستون</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>ویک</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>ایدک</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>نوم</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>هونولولو</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>انکریج</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>یاکوتات</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>جونو</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>لوس‌آنجلس</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>بویسی</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>�ینکس</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>شیپراک</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>دنور</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>سالم جدید، داکوتای شمالی</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>سنتر، داکوتای شمالی</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>شیکاگو</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>منامینی</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>وینسنس ایندیانا</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>پترزبرگ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>تل‌سیتی، ایندیانا</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>ناکس</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>ویناماک ایندیانا</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>مارنگو</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>ایندیاناپولیس</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>لوئیزویل</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>ویوی</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>مانتیسلو</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>دترویت</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>نیویورک</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>سمرقند</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>تاشکند</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>مایوته</exemplarCity>
-			</zone>
-			<metazone type="Afghanistan">
-				<long>
-					<generic>وقت ا�غانستان</generic>
-					<standard>وقت ا�غانستان</standard>
-					<daylight>وقت تابستانی ا�غانستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>وقت مرکز ا�ریقا</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>وقت شرق ا�ریقا</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>وقت جنوب ا�ریقا</generic>
-					<standard>وقت عادی جنوب ا�ریقا</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>وقت غرب ا�ریقا</standard>
-					<daylight>وقت تابستانی غرب ا�ریقا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>وقت آلاسکا</generic>
-					<standard>وقت عادی آلاسکا</standard>
-					<daylight>وقت تابستانی آلاسکا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>وقت آلاسکا�هاوائی</generic>
-					<standard>وقت عادی آلاسکا�هاوائی</standard>
-					<daylight>وقت تابستانی آلاسکا�هاوائی</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>وقت آمازون</standard>
-					<daylight>وقت تابستانی آمازون</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>وقت مرکز امریکا</generic>
-					<standard>وقت عادی مرکز امریکا</standard>
-					<daylight>وقت تابستانی مرکز امریکا</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>وقت شرق امریکا</generic>
-					<standard>وقت عادی شرق امریکا</standard>
-					<daylight>وقت تابستانی شرق امریکا</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>وقت کوهستانی امریکا</generic>
-					<standard>وقت عادی کوهستانی امریکا</standard>
-					<daylight>وقت تابستانی کوهستانی امریکا</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>وقت غرب امریکا</generic>
-					<standard>وقت عادی غرب امریکا</standard>
-					<daylight>وقت تابستانی غرب امریکا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>وقت عربستان</generic>
-					<standard>وقت عادی عربستان</standard>
-					<daylight>وقت تابستانی عربستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>وقت آرژانتین</standard>
-					<daylight>وقت تابستانی آرژانتین</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>وقت غرب آرژانتین</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>وقت ارمنستان</standard>
-					<daylight>وقت تابستانی ارمنستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>وقت عشق‌آباد</standard>
-					<daylight>وقت تابستانی عشق‌آباد</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>وقت آتلانتیک</generic>
-					<standard>وقت عادی آتلانتیک</standard>
-					<daylight>وقت تابستانی آتلانتیک</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>وقت مرکز استرالیا</generic>
-					<standard>وقت عادی مرکز استرالیا</standard>
-					<daylight>وقت تابستانی مرکز استرالیا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>وقت شرق استرالیا</generic>
-					<standard>وقت عادی شرق استرالیا</standard>
-					<daylight>وقت تابستانی شرق استرالیا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>وقت غرب استرالیا</generic>
-					<standard>وقت عادی غرب استرالیا</standard>
-					<daylight>وقت تابستانی غرب استرالیا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>وقت جمهوری آذربایجان</standard>
-					<daylight>وقت تابستانی جمهوری آذربایجان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>وقت باکو</standard>
-					<daylight>وقت تابستانی باکو</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>وقت بنگلادش</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>وقت برینگ</generic>
-					<standard>وقت عادی برینگ</standard>
-					<daylight>وقت تابستانی برینگ</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>وقت بوتان</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>وقت بولیوی</standard>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>وقت برازیلیا</standard>
-					<daylight>وقت تابستانی برازیلیا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>وقت کیپ ورد</standard>
-					<daylight>وقت تابستانی کیپ ورد</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>وقت شیلی</standard>
-					<daylight>وقت تابستانی شیلی</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>وقت چین</generic>
-					<standard>وقت عادی چین</standard>
-					<daylight>وقت تابستانی چین</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>وقت جزیرهٔ کریسمس</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>وقت جزایر کوکوس</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>وقت کلمبیا</standard>
-					<daylight>وقت تابستانی کلمبیا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>وقت جزایر کوک</standard>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>وقت کوبا</generic>
-					<standard>وقت عادی کوبا</standard>
-					<daylight>وقت تابستانی کوبا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>وقت دیویس</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>وقت دوشنبه</standard>
-					<daylight>وقت تابستانی دوشنبه</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>وقت گویان هلند</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>وقت تیمور شرقی</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>وقت جزیرهٔ ایستر</standard>
-					<daylight>وقت تابستانی جزیرهٔ ایستر</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>وقت اکوادور</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>وقت مرکز اروپا</standard>
-					<daylight>وقت تابستانی مرکز اروپا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>وقت شرق اروپا</standard>
-					<daylight>وقت تابستانی شرق اروپا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>وقت غرب اروپا</standard>
-					<daylight>وقت تابستانی غرب اروپا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>وقت جزایر �الکلند</standard>
-					<daylight>وقت تابستانی جزایر �الکلند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>وقت �یجی</standard>
-					<daylight>وقت تابستانی �یجی</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>وقت گویان �رانسه</standard>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>وقت گالاپاگوس</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>وقت گرجستان</standard>
-					<daylight>وقت تابستانی گرجستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>وقت گرینویچ</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>وقت مرکز گروئنلند</standard>
-					<daylight>وقت تابستانی مرکز گروئنلند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>وقت شرق گروئنلند</standard>
-					<daylight>وقت تابستانی شرق گروئنلند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>وقت غرب گروئنلند</standard>
-					<daylight>وقت تابستانی غرب گروئنلند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>وقت عادی گوام</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>وقت گویان</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>وقت هنگ‌کنگ</standard>
-					<daylight>وقت تابستانی هنگ‌کنگ</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>وقت عادی هند</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>وقت اقیانوس هند</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>وقت هندوچین</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>وقت مرکز اندونزی</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>وقت شرق اندونزی</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>وقت غرب اندونزی</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>وقت ایران</generic>
-					<standard>وقت عادی ایران</standard>
-					<daylight>وقت تابستانی ایران</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>وقت ایرکوتسک</standard>
-					<daylight>وقت تابستانی ایرکوتسک</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>وقت اسرائیل</generic>
-					<standard>وقت عادی اسرائیل</standard>
-					<daylight>وقت تابستانی اسرائیل</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>وقت ژاپن</generic>
-					<standard>وقت عادی ژاپن</standard>
-					<daylight>وقت تابستانی ژاپن</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>وقت کراچی</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>وقت کاشغر</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>وقت شرق قزاقستان</generic>
-					<standard>وقت عادی شرق قزاقستان</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>وقت غرب قزاقستان</generic>
-					<standard>وقت عادی غرب قزاقستان</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>وقت کره</generic>
-					<standard>وقت عادی کره</standard>
-					<daylight>وقت تابستانی کره</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>وقت قرقیزستان</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>وقت لانکا</standard>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>وقت ماکائو</standard>
-					<daylight>وقت تابستانی ماکائو</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>وقت مالزی</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>وقت مالدیو</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>وقت جزایر مارشال</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>وقت مسکو</generic>
-					<standard>وقت عادی مسکو</standard>
-					<daylight>وقت تابستانی مسکو</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>وقت میانمار</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>وقت نائورو</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>وقت نپال</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>وقت زلاند نو</generic>
-					<standard>وقت عادی زلاند نو</standard>
-					<daylight>وقت تابستانی زلاند نو</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>وقت جزایر ماریانای شمالی</standard>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>وقت پاکستان</standard>
-					<daylight>وقت تابستانی پاکستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>وقت پالائو</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>وقت پاپوا گینهٔ نو</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>وقت پاراگوئه</standard>
-					<daylight>وقت تابستانی پاراگوئه</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>وقت پرو</standard>
-					<daylight>وقت تابستانی پرو</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>وقت �یلیپین</standard>
-					<daylight>وقت تابستانی �یلیپین</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>وقت سمرقند</standard>
-					<daylight>وقت تابستانی سمرقند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>وقت عادی ساموا</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>وقت سیشل</standard>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>وقت عادی سنگاپور</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>وقت جزایر سلیمان</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>وقت جورجیای جنوبی</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>وقت سورینام</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>وقت تاهیتی</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>وقت تاجیکستان</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>وقت تاشکند</standard>
-					<daylight>وقت تابستانی تاشکند</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>وقت ت�لیس</standard>
-					<daylight>وقت تابستانی ت�لیس</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>وقت تونگا</standard>
-					<daylight>وقت تابستانی تونگا</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>وقت ترکیه</standard>
-					<daylight>وقت تابستانی ترکیه</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>وقت ترکمنستان</standard>
-					<daylight>وقت تابستانی ترکمنستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>وقت تووالو</standard>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>وقت اروگوئه</standard>
-					<daylight>وقت تابستانی اروگوئه</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>وقت ارومچی</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>وقت ازبکستان</standard>
-					<daylight>وقت تابستانی ازبکستان</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>وقت واناتو</standard>
-					<daylight>وقت تابستانی واناتو</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>وقت ونزوئلا</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>وقت جزیرهٔ ویک</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>وقت یاکوتسک</standard>
-					<daylight>وقت تابستانی یاکوتسک</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>وقت ایروان</standard>
-					<daylight>وقت تابستانی ایروان</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>arabext</defaultNumberingSystem>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###;'‪'-#,##0.###'‬'</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>'‪'%#,##0'‬'</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤;'‪'-#,##0.00'‬' ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>پزتای آندورا</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>درهم امارات متحدهٔ عربی</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>ا�غانی ا�غانستان (۱۹۲۷ تا ۲۰۰۲)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>ا�غانی ا�غانستان</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>لک آلبانی</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>درم ارمنستان</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>گیلدر آنتیل هلند</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>پزوی آرژانتین (۱۹۸۳ تا ۱۹۸۵)�</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>پزوی آرژانتین</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>شیلینگ اتریش</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>دلار استرالیا</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�لورین آروبا</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>منات جمهوری آذربایجان (۱۹۹۳ تا ۲۰۰۶)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>منات جمهوری آذربایجان</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>دینار بوسنی و هرزگوین</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>دلار باربادوس</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>�رانک بلژیک</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>�رانک بلژیک (مالی)</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>دینار بحرین</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>�رانک بوروندی</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>دلار برمودا</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>دلار برونئی</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>پزوی بولیوی</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>رئال برزیل</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>دلار باهاما</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>روبل جدید بیلوروسی (۱۹۹۴ تا ۱۹۹۹)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>روبل بیلوروسی</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>دلار بلیز</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>دلار کانادا</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>�رانک کنگو</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>�رانک سوئیس</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>پزوی شیلی</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>یوآن چین</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>پزوی کلمبیا</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>دینار قدیم صربستان</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>پزوی کوبا</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>اسکودوی کیپ ورد</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>پوند قبرس</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>مارک آلمان شرقی</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>مارک آلمان</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>�رانک جیبوتی</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>کرون دانمارک</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>پزوی دومینیکا</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>دینار الجزایر</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>یورو</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>دلار �یجی</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>پوند جزایر �الکلند</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>�رانک �رانسه</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>پوند بریتانیا</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>پوند جبل‌الطارق</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>�رانک گینه</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>دراخمای یونان</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>پزوی گینهٔ بیسائو</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>دلار گویان</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>دلار هنگ‌کنگ</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>دینار کرواسی</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>�ورینت مجارستان</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>روپیهٔ اندونزی</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>پوند ایرلند</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>روپیهٔ هند</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>دینار عراق</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>ریال ایران</displayName>
-				<symbol>ï·¼</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>لیرهٔ ایتالیا</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>دلا§§ر جامائیکا</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>دینار اردن</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ین ژاپن</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>شیلینگ کنیا</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>�رانک کومورو</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>دینار کویت</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>دلار جزایر ک�یمن</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>لیرهٔ لبنان</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>روپیهٔ سری‌لانکا</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>دلار لیبریا</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>�رانک لوکزامبورگ</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>�رانک مالی لوگزامبورگ</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>روبل لتونی</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>دینار لیبی</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>درهم مراکش</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>�رانک مراکش</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>�رانک ماداگاسکار</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>دینار مقدونیه</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>�رانک مالی</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>لیرهٔ مالت</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>پوند مالت</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>روپیهٔ موریس</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>پزوی مکزیک</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>پزوی نقرهٔ مکزیک (۱۸۶۱ تا ۱۹۹۲)</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>اسکودوی موزامبیک</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>دلار نامیبیا</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>گیلدر هلند</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>کرون نروژ</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>روپیهٔ نپال</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>دلار زلاند نو</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>ریال عمان</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>پزوی �یلیپین</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>روپیهٔ پاکستان</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>زواتی لهستان</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>اسکودوی پرتغال</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>ریال قطر</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>دلار رودزیا</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>دینار صربستان</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>روبل روسیه</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>روبل روسیه (۱۹۹۱ تا ۱۹۹۸)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>�رانک رواندا</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>ریال سعودی</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>دلار جزایر سلیمان</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>روپیهٔ سیشل</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>دینار قدیم سودان</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>کرون سوئد</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>دلار سنگاپور</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>پوند سنت هلن</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>دلار سورینام</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>گیلدر سورینام</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>روبل شوروی</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>لیرهٔ سوریه</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>بات تایلند</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>روبل تاجیکستان</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>سامانی تاجیکستان</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>منات ترکمنستان</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName>منات جدید ترکمنستان</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>دینار تونس</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>اسکودوی تیمور</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>لیرهٔ قدیم ترکیه</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>لیرهٔ ترکیه</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>دلار ترینیداد و توباگو</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>دلار جدید تایوان</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>شیلینگ تانزانیا</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>شیلینگ اوگاندا (۱۹۶۶ تا ۱۹۸۷)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>شیلینگ اوگاندا</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>دلار امریکا</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>دلار امریکا (روز بعد)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>دلار امریکا (همان روز)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>پزوی اوروگوئه (۱۹۷۵ تا ۱۹۹۳)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>پزوی اوروگوئه</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>سوم ازبکستان</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>نقره</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>طلا</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>دلار شرق کارائیب</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>�رانک طلای �رانسه</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>پالادیم</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>پلاتین</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>ارز نامشخص یا نامعتبر</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>دینار یمن</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>ریال یمن</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>راند ا�ریقای جنوبی</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>دلار زیمبابوه</displayName>
-			</currency>
-			<currency type="ZWL">
-				<displayName>دلار زیمبابوه (۲۰۰۹)</displayName>
-			</currency>
-			<currency type="ZWR">
-				<displayName>دلار زیمبابوه (۲۰۰۸)</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} روز</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} ساعت</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} دقیقه</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} ماه</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} ثانیه</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} ه�ته</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} سال</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>بله:ب:آری:آ</yesstr>
-			<nostr>نه:ن:خیر:خ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fa_AF.xml b/airtime_mvc/library/Zend/Locale/Data/fa_AF.xml
deleted file mode 100644
index 15289246e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fa_AF.xml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.66 $"/>
-		<generation date="$Date: 2009/06/15 05:50:27 $"/>
-		<language type="fa"/>
-		<territory type="AF"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="es">هسپانوی</language>
-			<language type="fa">دری</language>
-			<language type="fi">�نلندی</language>
-			<language type="ga">آیرلندی</language>
-			<language type="hr">کروشیایی</language>
-			<language type="id">اندونیزیایی</language>
-			<language type="is">آیسلندی</language>
-			<language type="it">ایتالوی</language>
-			<language type="ja">جاپانی</language>
-			<language type="ko">کوریایی</language>
-			<language type="ky">قرغزی</language>
-			<language type="mn">مغلی</language>
-			<language type="ne">نیپالی</language>
-			<language type="nl">هالندی</language>
-			<language type="no">نارویژی</language>
-			<language type="pl">پولندی</language>
-			<language type="pt">پرتگالی</language>
-			<language type="sv">سویدنی</language>
-			<language type="tg">تاجکی</language>
-		</languages>
-		<scripts>
-			<script type="Mong">مغلی</script>
-		</scripts>
-		<territories>
-			<territory type="AD">اندورا</territory>
-			<territory type="AE">امارات متحدهٔ عربی</territory>
-			<territory type="AG">انتیگوا و باربودا</territory>
-			<territory type="AL">البانیا</territory>
-			<territory type="AO">انگولا</territory>
-			<territory type="AR">ارجنتاین</territory>
-			<territory type="AU">آسترالیا</territory>
-			<territory type="BA">بوسنیا و هرزه‌گوینا</territory>
-			<territory type="BD">بنگله‌دیش</territory>
-			<territory type="BE">بلجیم</territory>
-			<territory type="BG">بلغاریا</territory>
-			<territory type="BN">برونی</territory>
-			<territory type="BO">بولیویا</territory>
-			<territory type="BR">برازیل</territory>
-			<territory type="BS">بهاماس</territory>
-			<territory type="BY">روسیهٔ س�ید</territory>
-			<territory type="CD">جمهوری دموکراتیک کانگو</territory>
-			<territory type="CF">ا�ریقای مرکزی</territory>
-			<territory type="CG">کانگو</territory>
-			<territory type="CH">سویس</territory>
-			<territory type="CL">چلی</territory>
-			<territory type="CO">کولمبیا</territory>
-			<territory type="CR">کاستریکا</territory>
-			<territory type="CU">کیوبا</territory>
-			<territory type="DK">دنمارک</territory>
-			<territory type="EC">اکوادور</territory>
-			<territory type="EE">استونیا</territory>
-			<territory type="ER">اریتریا</territory>
-			<territory type="ES">هسپانیه</territory>
-			<territory type="ET">ایتوپیا</territory>
-			<territory type="FI">�نلند</territory>
-			<territory type="FM">میکرونزیا</territory>
-			<territory type="GD">گرینادا</territory>
-			<territory type="GN">گینیا</territory>
-			<territory type="GQ">گینیا استوایی</territory>
-			<territory type="GT">گواتیمالا</territory>
-			<territory type="GW">گینیا بیسائو</territory>
-			<territory type="GY">گیانا</territory>
-			<territory type="HN">هاندوراس</territory>
-			<territory type="HR">کروشیا</territory>
-			<territory type="HT">هایتی</territory>
-			<territory type="ID">اندونیزیا</territory>
-			<territory type="IE">آیرلند</territory>
-			<territory type="IS">آیسلند</territory>
-			<territory type="JP">جاپان</territory>
-			<territory type="KE">کینیا</territory>
-			<territory type="KG">قرغزستان</territory>
-			<territory type="KH">کمپوچیا</territory>
-			<territory type="KM">کومور</territory>
-			<territory type="KN">سنت کیتس و نیویس</territory>
-			<territory type="KP">کوریای شمالی</territory>
-			<territory type="KR">کوریای جنوبی</territory>
-			<territory type="LK">سریلانکا</territory>
-			<territory type="LS">لیسوتو</territory>
-			<territory type="LT">لتوانیا</territory>
-			<territory type="LV">لاتویا</territory>
-			<territory type="LY">لیبیا</territory>
-			<territory type="MG">مادغاسکر</territory>
-			<territory type="MN">منگولیا</territory>
-			<territory type="MR">موریتانیا</territory>
-			<territory type="MT">مالتا</territory>
-			<territory type="MX">مکسیکو</territory>
-			<territory type="MY">مالیزیا</territory>
-			<territory type="MZ">موزمبیق</territory>
-			<territory type="NG">نیجریا</territory>
-			<territory type="NI">نیکاراگوا</territory>
-			<territory type="NL">هالند</territory>
-			<territory type="NO">ناروی</territory>
-			<territory type="NP">نیپال</territory>
-			<territory type="NZ">زیلاند جدید</territory>
-			<territory type="PA">پانامه</territory>
-			<territory type="PE">پیرو</territory>
-			<territory type="PG">پاپوا نیو گینیا</territory>
-			<territory type="PL">پولند</territory>
-			<territory type="PT">پرتگال</territory>
-			<territory type="PY">پاراگوای</territory>
-			<territory type="RO">رومانیا</territory>
-			<territory type="RW">روآندا</territory>
-			<territory type="SB">جزایر سلومون</territory>
-			<territory type="SE">سویدن</territory>
-			<territory type="SG">سینگاپور</territory>
-			<territory type="SI">سلونیا</territory>
-			<territory type="SK">سلواکیا</territory>
-			<territory type="SL">سیرالیون</territory>
-			<territory type="SN">سینیگال</territory>
-			<territory type="SO">سومالیه</territory>
-			<territory type="ST">سائو تومه و پرینسیپ</territory>
-			<territory type="SV">السلوادور</territory>
-			<territory type="TJ">تاجکستان</territory>
-			<territory type="UA">اکراین</territory>
-			<territory type="US">ایالات متحدهٔ امریکا</territory>
-			<territory type="UY">یوروگوای</territory>
-			<territory type="VC">سنت وینسنت و گرینادین</territory>
-			<territory type="VE">ونزویلا</territory>
-			<territory type="WS">ساموآ</territory>
-			<territory type="ZW">زیمبابوی</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters type="auxiliary">[\u0656 \u0670 \u200C \u200D Ù¼ Ú� Ú… Ú‰ Ú“ Ú– Úš Ú« Ú¼ ÙŠ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">جنو</month>
-							<month type="5">مـی</month>
-							<month type="6">جون</month>
-							<month type="7">جول</month>
-							<month type="12">دسم</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جنوری</month>
-							<month type="2">�بروری</month>
-							<month type="3">مارچ</month>
-							<month type="4">اپریل</month>
-							<month type="5">می</month>
-							<month type="6">جون</month>
-							<month type="7">جولای</month>
-							<month type="8">اگست</month>
-							<month type="9">سپتمبر</month>
-							<month type="10">اکتوبر</month>
-							<month type="11">نومبر</month>
-							<month type="12">دسمبر</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ج</month>
-							<month type="2">Ù�</month>
-							<month type="3">Ù…</month>
-							<month type="4">ا</month>
-							<month type="5">Ù…</month>
-							<month type="6">ج</month>
-							<month type="7">ج</month>
-							<month type="8">ا</month>
-							<month type="9">س</month>
-							<month type="10">ا</month>
-							<month type="11">Ù†</month>
-							<month type="12">د</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">حمل</month>
-							<month type="2">ثور</month>
-							<month type="3">جوزا</month>
-							<month type="4">سرطان</month>
-							<month type="5">اسد</month>
-							<month type="6">سنبلهٔ</month>
-							<month type="7">میزان</month>
-							<month type="8">عقرب</month>
-							<month type="9">قوس</month>
-							<month type="10">جدی</month>
-							<month type="11">دلو</month>
-							<month type="12">حوت</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Ø­</month>
-							<month type="2">Ø«</month>
-							<month type="3">ج</month>
-							<month type="4">س</month>
-							<month type="5">ا</month>
-							<month type="6">س</month>
-							<month type="8">ع</month>
-							<month type="9">Ù‚</month>
-							<month type="10">ج</month>
-							<month type="11">د</month>
-							<month type="12">Ø­</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">حمل</month>
-							<month type="2">ثور</month>
-							<month type="3">جوزا</month>
-							<month type="4">سرطان</month>
-							<month type="5">اسد</month>
-							<month type="6">سنبله</month>
-							<month type="7">میزان</month>
-							<month type="8">عقرب</month>
-							<month type="9">قوس</month>
-							<month type="10">جدی</month>
-							<month type="11">دلو</month>
-							<month type="12">حوت</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraNames>
-						<era type="0">هجری شمسی</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ه�. ش.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<minusSign>−</minusSign>
-		</symbols>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>'‪'#,##0%'‬'</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencies>
-			<currency type="AFN">
-				<symbol>Ø‹</symbol>
-			</currency>
-			<currency type="AUD">
-				<displayName>دالر آسترالیا</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>دالر برونی</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>روبل روسیهٔ س�ید</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>دالر کانادا</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>�رانک سویس</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>کرون دنمارک</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ین جاپان</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>پزوی مکسیکو</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>گیلدر هالند</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>کرون ناروی</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>کرون سویدن</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>دالر سینگاپور</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>سامانی تاجکستان</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>دالر امریکا</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fa_IR.xml b/airtime_mvc/library/Zend/Locale/Data/fa_IR.xml
deleted file mode 100644
index 884114b5b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fa_IR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.55 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fa"/>
-		<territory type="IR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fi.xml b/airtime_mvc/library/Zend/Locale/Data/fi.xml
deleted file mode 100644
index b4e75d905..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fi.xml
+++ /dev/null
@@ -1,3828 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.137 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="fi"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abhaasi</language>
-			<language type="ace">aceh</language>
-			<language type="ach">atšoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyge</language>
-			<language type="ae">avesta</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afro-aasialainen kieli</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadi</language>
-			<language type="ale">aleutti</language>
-			<language type="alg">algonkin-kieli</language>
-			<language type="alt">altai</language>
-			<language type="am">amhara</language>
-			<language type="an">aragonia</language>
-			<language type="ang">muinaisenglanti</language>
-			<language type="anp">angika</language>
-			<language type="apa">apaššikieli</language>
-			<language type="ar">arabia</language>
-			<language type="arc">aramea</language>
-			<language type="arn">araukaani</language>
-			<language type="arp">arapaho</language>
-			<language type="art">keinotekoinen kieli</language>
-			<language type="arw">arawak</language>
-			<language type="as">assami</language>
-			<language type="ast">asturia</language>
-			<language type="ath">athabasca-kieli</language>
-			<language type="aus">australialainen kieli</language>
-			<language type="av">avaari</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aimara</language>
-			<language type="az">azeri</language>
-			<language type="ba">baškiiri</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke-kieli</language>
-			<language type="bal">belutši</language>
-			<language type="ban">bali</language>
-			<language type="bas">basa</language>
-			<language type="bat">balttilainen kieli</language>
-			<language type="be">valkovenäjä</language>
-			<language type="bej">bedža</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberikieli</language>
-			<language type="bg">bulgaria</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhodžpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">mustajalka</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantukieli</language>
-			<language type="bo">tiibet</language>
-			<language type="br">bretoni</language>
-			<language type="bra">bradž</language>
-			<language type="bs">bosnia</language>
-			<language type="btk">batak</language>
-			<language type="bua">burjaatti</language>
-			<language type="bug">bugi</language>
-			<language type="byn">bilin</language>
-			<language type="ca">katalaani</language>
-			<language type="cad">caddo</language>
-			<language type="cai">keskiamerikkalainen intiaanikieli</language>
-			<language type="car">karibi</language>
-			<language type="cau">kaukasialainen kieli</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tšetšeeni</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">kelttiläinen kieli</language>
-			<language type="ch">tšamorro</language>
-			<language type="chb">tšibtša</language>
-			<language type="chg">tšagatai</language>
-			<language type="chk">chuuk</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook-jargon</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">tšam-kieli</language>
-			<language type="co">korsika</language>
-			<language type="cop">kopti</language>
-			<language type="cpe">englantiin perustuva kreoli- tai pidgin-kieli</language>
-			<language type="cpf">ranskaan perustuva kreoli- tai pidgin-kieli</language>
-			<language type="cpp">portugaliin perustuva kreoli- tai pidgin-kieli</language>
-			<language type="cr">cree</language>
-			<language type="crh">krimintataari</language>
-			<language type="crp">kreoli- tai pidgin-kieli</language>
-			<language type="cs">tšekki</language>
-			<language type="csb">kašubi</language>
-			<language type="cu">kirkkoslaavi</language>
-			<language type="cus">kuušilainen kieli</language>
-			<language type="cv">tšuvassi</language>
-			<language type="cy">kymri</language>
-			<language type="da">tanska</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargi</language>
-			<language type="day">dajakki</language>
-			<language type="de">saksa</language>
-			<language type="de_AT">itävallansaksa</language>
-			<language type="de_CH">sveitsinyläsaksa</language>
-			<language type="del">delaware</language>
-			<language type="den">slevi</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidakieli</language>
-			<language type="dsb">alasorbi</language>
-			<language type="dua">duala</language>
-			<language type="dum">keskihollanti</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">djula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">muinaisegypti</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">kreikka</language>
-			<language type="elx">elami</language>
-			<language type="en">englanti</language>
-			<language type="en_AU">australianenglanti</language>
-			<language type="en_CA">kanadanenglanti</language>
-			<language type="en_GB">britannianenglanti</language>
-			<language type="en_US">amerikanenglanti</language>
-			<language type="enm">keskienglanti</language>
-			<language type="eo">esperanto</language>
-			<language type="es">espanja</language>
-			<language type="es_419">amerikanespanja</language>
-			<language type="es_ES">espanjanespanja</language>
-			<language type="et">viro</language>
-			<language type="eu">baski</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">farsi</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">suomi</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">suomalais-ugrilainen kieli</language>
-			<language type="fj">fidži</language>
-			<language type="fo">fääri</language>
-			<language type="fon">fon</language>
-			<language type="fr">ranska</language>
-			<language type="fr_CA">kanadanranska</language>
-			<language type="fr_CH">sveitsinranska</language>
-			<language type="frm">keskiranska</language>
-			<language type="fro">muinaisranska</language>
-			<language type="frr">pohjoisfriisi</language>
-			<language type="frs">itäfriisi</language>
-			<language type="fur">friuli</language>
-			<language type="fy">länsifriisi</language>
-			<language type="ga">iiri</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">gaeli</language>
-			<language type="gem">germaaninen kieli</language>
-			<language type="gez">ge’ez</language>
-			<language type="gil">kiribati</language>
-			<language type="gl">galicia</language>
-			<language type="gmh">keskiyläsaksa</language>
-			<language type="gn">guarani</language>
-			<language type="goh">muinaisyläsaksa</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gootti</language>
-			<language type="grb">grebo</language>
-			<language type="grc">muinaiskreikka</language>
-			<language type="gsw">sveitsinsaksa</language>
-			<language type="gu">gudžarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwitšin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">havaiji</language>
-			<language type="he">heprea</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaino</language>
-			<language type="him">himatšali</language>
-			<language type="hit">heetti</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri-motu</language>
-			<language type="hr">kroatia</language>
-			<language type="hsb">yläsorbi</language>
-			<language type="ht">haiti</language>
-			<language type="hu">unkari</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armenia</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesia</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">sichuanin-yi</language>
-			<language type="ijo">idžo</language>
-			<language type="ik">inupiatun</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indoarjalainen kieli</language>
-			<language type="ine">indoeurooppalainen kieli</language>
-			<language type="inh">inguuši</language>
-			<language type="io">ido</language>
-			<language type="ira">iranilainen kieli</language>
-			<language type="iro">irokeesikieli</language>
-			<language type="is">islanti</language>
-			<language type="it">italia</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japani</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">juutalaispersia</language>
-			<language type="jrb">juutalaisarabia</language>
-			<language type="jv">jaava</language>
-			<language type="ka">georgia</language>
-			<language type="kaa">karakalpakki</language>
-			<language type="kab">kabyyli</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kavi</language>
-			<language type="kbd">kabardi</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">norsunluurannikonkoro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisan-kieli</language>
-			<language type="kho">khotani</language>
-			<language type="ki">kikuju</language>
-			<language type="kj">kuanjama</language>
-			<language type="kk">kazakki</language>
-			<language type="kl">kalaallisut</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">korea</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosrae</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karatšai-balkaari</language>
-			<language type="krl">karjala</language>
-			<language type="kro">kru-kieli</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kašmiri</language>
-			<language type="ku">kurdi</language>
-			<language type="kum">kumykki</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">korni</language>
-			<language type="ky">kirgiisi</language>
-			<language type="la">latina</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburg</language>
-			<language type="lez">lezgi</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburg</language>
-			<language type="ln">lingala</language>
-			<language type="lo">lao</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">liettua</language>
-			<language type="lu">katanganluba</language>
-			<language type="lua">luluanluba</language>
-			<language type="lui">luiseño</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lusai</language>
-			<language type="lv">latvia</language>
-			<language type="mad">madura</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makassar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronesialainen kieli</language>
-			<language type="mas">maasai</language>
-			<language type="mdf">mokša</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malagassi</language>
-			<language type="mga">keski-iiri</language>
-			<language type="mh">marshall</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">luokittelematon kieli</language>
-			<language type="mk">makedonia</language>
-			<language type="mkh">mon-khmer-kieli</language>
-			<language type="ml">malajalam</language>
-			<language type="mn">mongoli</language>
-			<language type="mnc">mantšu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobo-kieli</language>
-			<language type="mo">moldavia</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malaiji</language>
-			<language type="mt">malta</language>
-			<language type="mul">monia kieliä</language>
-			<language type="mun">mundakieli</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandeesi</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burma</language>
-			<language type="myn">maya-kieli</language>
-			<language type="myv">ersä</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">pohjoisamerikkalainen intiaanikieli</language>
-			<language type="nap">napoli</language>
-			<language type="nb">norjan bokmål</language>
-			<language type="nd">pohjois-ndebele</language>
-			<language type="nds">alasaksa</language>
-			<language type="ne">nepali</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">nigeriläis-kongolainen kieli</language>
-			<language type="niu">niue</language>
-			<language type="nl">hollanti</language>
-			<language type="nl_BE">flaami</language>
-			<language type="nn">norjan nynorsk</language>
-			<language type="no">norja</language>
-			<language type="nog">nogai</language>
-			<language type="non">muinaisnorja</language>
-			<language type="nqo">n’ko</language>
-			<language type="nr">etelä-ndebele</language>
-			<language type="nso">pohjoissotho</language>
-			<language type="nub">nubialainen kieli</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">klassinen newari</language>
-			<language type="ny">njandža</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">oksitaani</language>
-			<language type="oj">odžibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">orija</language>
-			<language type="os">osseetti</language>
-			<language type="osa">osage</language>
-			<language type="ota">osmani</language>
-			<language type="oto">otomi-kieli</language>
-			<language type="pa">pandžabi</language>
-			<language type="paa">papualaiskieli</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamentu</language>
-			<language type="pau">palau</language>
-			<language type="peo">muinaispersia</language>
-			<language type="phi">filippiiniläinen kieli</language>
-			<language type="phn">foinikia</language>
-			<language type="pi">paali</language>
-			<language type="pl">puola</language>
-			<language type="pon">pohnpei</language>
-			<language type="pra">prakrit-kieli</language>
-			<language type="pro">muinaisprovensaali</language>
-			<language type="ps">paštu</language>
-			<language type="pt">portugali</language>
-			<language type="pt_BR">brasilianportugali</language>
-			<language type="pt_PT">portugalinportugali</language>
-			<language type="qu">ketšua</language>
-			<language type="raj">radžastani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotonga</language>
-			<language type="rm">retoromaani</language>
-			<language type="rn">rundi</language>
-			<language type="ro">romania</language>
-			<language type="roa">romaaninen kieli</language>
-			<language type="rom">romani</language>
-			<language type="root">juuri</language>
-			<language type="ru">venäjä</language>
-			<language type="rup">aromania</language>
-			<language type="rw">ruanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakuutti</language>
-			<language type="sai">eteläamerikkalainen intiaanikieli</language>
-			<language type="sal">sališilainen kieli</language>
-			<language type="sam">samarianaramea</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardi</language>
-			<language type="scn">sisilia</language>
-			<language type="sco">skotti</language>
-			<language type="sd">sindhi</language>
-			<language type="se">pohjoissaame</language>
-			<language type="sel">selkuppi</language>
-			<language type="sem">seemiläinen kieli</language>
-			<language type="sg">sango</language>
-			<language type="sga">muinaisiiri</language>
-			<language type="sgn">viittomakieli</language>
-			<language type="sh">serbokroaatti</language>
-			<language type="shn">shan</language>
-			<language type="si">sinhali</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">sioux-kieli</language>
-			<language type="sit">sinotiibetiläinen kieli</language>
-			<language type="sk">slovakki</language>
-			<language type="sl">sloveeni</language>
-			<language type="sla">slaavilainen kieli</language>
-			<language type="sm">samoa</language>
-			<language type="sma">eteläsaame</language>
-			<language type="smi">saamelaiskieli</language>
-			<language type="smj">luulajansaame</language>
-			<language type="smn">inarinsaame</language>
-			<language type="sms">koltansaame</language>
-			<language type="sn">Å¡ona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdi</language>
-			<language type="son">songhai</language>
-			<language type="sq">albania</language>
-			<language type="sr">serbia</language>
-			<language type="srn">sranan</language>
-			<language type="srr">serer</language>
-			<language type="ss">swazi</language>
-			<language type="ssa">niililäis-saharalainen kieli</language>
-			<language type="st">eteläsotho</language>
-			<language type="su">sunda</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumeri</language>
-			<language type="sv">ruotsi</language>
-			<language type="sw">swahili</language>
-			<language type="syc">muinaissyyria</language>
-			<language type="syr">syyria</language>
-			<language type="ta">tamil</language>
-			<language type="tai">thaikieli</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadžikki</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turkmeeni</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamašek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tongantonga</language>
-			<language type="tog">malawintonga</language>
-			<language type="tpi">tok-pisin</language>
-			<language type="tr">turkki</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimši</language>
-			<language type="tt">tataari</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi-kieli</language>
-			<language type="tut">altailainen kieli</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahiti</language>
-			<language type="tyv">tuva</language>
-			<language type="udm">udmurtti</language>
-			<language type="ug">uiguuri</language>
-			<language type="uga">ugarit</language>
-			<language type="uk">ukraina</language>
-			<language type="umb">umbundu</language>
-			<language type="und">määrittämätön</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbekki</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnam</language>
-			<language type="vo">volapük</language>
-			<language type="vot">vatja</language>
-			<language type="wa">valloni</language>
-			<language type="wak">wakash-kieli</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sorbin kieli</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmukki</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">jao</language>
-			<language type="yap">japi</language>
-			<language type="yi">jiddiš</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupikkikieli</language>
-			<language type="za">zhuang</language>
-			<language type="zap">sapoteekki</language>
-			<language type="zbl">blisskieli</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kiina</language>
-			<language type="zh_Hans">yksinkertaistettu kiina</language>
-			<language type="zh_Hant">perinteinen kiina</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">ei kielellistä sisältöä</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabialainen</script>
-			<script type="Armi">valtakunnanaramealainen</script>
-			<script type="Armn">armenialainen</script>
-			<script type="Avst">avestalainen</script>
-			<script type="Bali">balilainen</script>
-			<script type="Batk">batakilainen</script>
-			<script type="Beng">bengalilainen</script>
-			<script type="Blis">bliss-symbolit</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille-pistekirjoitus</script>
-			<script type="Bugi">bugilainen</script>
-			<script type="Buhd">buhidilainen</script>
-			<script type="Cakm">chakmalainen</script>
-			<script type="Cans">Kanadan alkuperäiskansojen yhtenäistetty tavukirjoitus</script>
-			<script type="Cari">kaarialainen</script>
-			<script type="Cham">tšamilainen</script>
-			<script type="Cher">cherokeelainen</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">koptilainen</script>
-			<script type="Cprt">muinaiskyproslainen</script>
-			<script type="Cyrl">kyrillinen</script>
-			<script type="Cyrs">kyrillinen muinaiskirkkoslaavimuunnelma</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egyptiläinen demoottinen</script>
-			<script type="Egyh">egyptiläinen hieraattinen</script>
-			<script type="Egyp">egyptiläiset hieroglyfit</script>
-			<script type="Ethi">etiopialainen</script>
-			<script type="Geok">muinaisgeorgialainen</script>
-			<script type="Geor">georgialainen</script>
-			<script type="Glag">glagoliittinen</script>
-			<script type="Goth">goottilainen</script>
-			<script type="Grek">kreikkalainen</script>
-			<script type="Gujr">gudžaratilainen</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">kiinalainen han</script>
-			<script type="Hano">hanunoolainen</script>
-			<script type="Hans">kiinalainen yksinkertaistettu han</script>
-			<script type="Hant">kiinalainen perinteinen han</script>
-			<script type="Hebr">heprealainen</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">hiragana tai katakana</script>
-			<script type="Hung">muinaisunkarilainen</script>
-			<script type="Inds">induslainen</script>
-			<script type="Ital">muinaisitalialainen</script>
-			<script type="Java">jaavalainen</script>
-			<script type="Jpan">japanilainen</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharosthi</script>
-			<script type="Khmr">khmeriläinen</script>
-			<script type="Knda">kannadalainen</script>
-			<script type="Kore">korealainen</script>
-			<script type="Kthi">kaithi</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laolainen</script>
-			<script type="Latf">latinalainen fraktuuramuunnelma</script>
-			<script type="Latg">latinalainen gaelimuunnelma</script>
-			<script type="Latn">latinalainen</script>
-			<script type="Lepc">lepchalainen</script>
-			<script type="Limb">limbulainen</script>
-			<script type="Lina">lineaari-A</script>
-			<script type="Linb">lineaari-B</script>
-			<script type="Lyci">lyykialainen</script>
-			<script type="Lydi">lyydialainen</script>
-			<script type="Mand">mandealainen</script>
-			<script type="Mani">manikealainen</script>
-			<script type="Maya">maya-hieroglyfit</script>
-			<script type="Mero">meroiittinen</script>
-			<script type="Mlym">malajalamilainen</script>
-			<script type="Mong">mongolilainen</script>
-			<script type="Moon">moon-kohokirjoitus</script>
-			<script type="Mtei">meitei</script>
-			<script type="Mymr">burmalainen</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogam</script>
-			<script type="Olck">ol chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">orijalainen</script>
-			<script type="Osma">osmanjalainen</script>
-			<script type="Perm">muinaispermiläinen</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">piirtokirjoituspahlavilainen</script>
-			<script type="Phlp">psalttaripahlavilainen</script>
-			<script type="Phlv">kirjapahlavilainen</script>
-			<script type="Phnx">foinikialainen</script>
-			<script type="Plrd">Pollardin foneettinen</script>
-			<script type="Prti">piirtokirjoitusparthialainen</script>
-			<script type="Qaai">peritty</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">riimukirjoitus</script>
-			<script type="Samr">samarianaramealainen</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">shaw’lainen</script>
-			<script type="Sinh">sinhalilainen</script>
-			<script type="Sund">sundalainen</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syyrialainen</script>
-			<script type="Syre">syyrialainen estrangelo-muunnelma</script>
-			<script type="Syrj">syyrialainen läntinen muunnelma</script>
-			<script type="Syrn">syyrialainen itäinen muunnelma</script>
-			<script type="Tagb">tagbanwalainen</script>
-			<script type="Tale">tailelainen</script>
-			<script type="Talu">uusi tailuelainen</script>
-			<script type="Taml">tamililainen</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugulainen</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalogilainen</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">thailainen</script>
-			<script type="Tibt">tiibetiläinen</script>
-			<script type="Ugar">ugaritilainen</script>
-			<script type="Vaii">vailainen</script>
-			<script type="Visp">näkyvä puhe</script>
-			<script type="Xpeo">muinaispersialainen</script>
-			<script type="Xsux">sumerilais-akkadilainen nuolenpääkirjoitus</script>
-			<script type="Yiii">yiläinen</script>
-			<script type="Zmth">matemaattinen</script>
-			<script type="Zsym">symbolit</script>
-			<script type="Zxxx">kirjoittamaton</script>
-			<script type="Zyyy">määrittämätön</script>
-			<script type="Zzzz">tuntematon tai virheellinen kirjoitusjärjestelmä</script>
-		</scripts>
-		<territories>
-			<territory type="001">maailma</territory>
-			<territory type="002">Afrikka</territory>
-			<territory type="003">Pohjois-Amerikka</territory>
-			<territory type="005">Etelä-Amerikka</territory>
-			<territory type="009">Oseania</territory>
-			<territory type="011">Länsi-Afrikka</territory>
-			<territory type="013">Väli-Amerikka</territory>
-			<territory type="014">Itä-Afrikka</territory>
-			<territory type="015">Pohjois-Afrikka</territory>
-			<territory type="017">Keski-Afrikka</territory>
-			<territory type="018">eteläinen Afrikka</territory>
-			<territory type="019">Amerikka</territory>
-			<territory type="021">pohjoinen Amerikka</territory>
-			<territory type="029">Karibia</territory>
-			<territory type="030">Itä-Aasia</territory>
-			<territory type="034">Etelä-Aasia</territory>
-			<territory type="035">Kaakkois-Aasia</territory>
-			<territory type="039">Etelä-Eurooppa</territory>
-			<territory type="053">Australia ja Uusi-Seelanti</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Mikronesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Etelä- ja Keski-Aasia</territory>
-			<territory type="142">Aasia</territory>
-			<territory type="143">Keski-Aasia</territory>
-			<territory type="145">Länsi-Aasia</territory>
-			<territory type="150">Eurooppa</territory>
-			<territory type="151">Itä-Eurooppa</territory>
-			<territory type="154">Pohjois-Eurooppa</territory>
-			<territory type="155">Länsi-Eurooppa</territory>
-			<territory type="172">Itsenäisten valtioiden yhteisö</territory>
-			<territory type="419">Latinalainen Amerikka ja Karibia</territory>
-			<territory type="830">Kanaalisaaret</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Arabiemiirikunnat</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua ja Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Alankomaiden Antillit</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentiina</territory>
-			<territory type="AS">Amerikan Samoa</territory>
-			<territory type="AT">Itävalta</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ahvenanmaa</territory>
-			<territory type="AZ">Azerbaidžan</territory>
-			<territory type="BA">Bosnia ja Hertsegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint-Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasilia</territory>
-			<territory type="BS">Bahama</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet’nsaari</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Valko-Venäjä</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kookossaaret</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CF">Keski-Afrikan tasavalta</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CH">Sveitsi</territory>
-			<territory type="CI">Norsunluurannikko</territory>
-			<territory type="CK">Cookinsaaret</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kiina</territory>
-			<territory type="CO">Kolumbia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia ja Montenegro</territory>
-			<territory type="CU">Kuuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Joulusaari</territory>
-			<territory type="CY">Kypros</territory>
-			<territory type="CZ">TÅ¡ekki</territory>
-			<territory type="DE">Saksa</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Tanska</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominikaaninen tasavalta</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Viro</territory>
-			<territory type="EG">Egypti</territory>
-			<territory type="EH">Länsi-Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Espanja</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Suomi</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandinsaaret</territory>
-			<territory type="FM">Mikronesian liittovaltio</territory>
-			<territory type="FO">Färsaaret</territory>
-			<territory type="FR">Ranska</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Britannia</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Ranskan Guayana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grönlanti</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Päiväntasaajan Guinea</territory>
-			<territory type="GR">Kreikka</territory>
-			<territory type="GS">Etelä-Georgia ja Eteläiset Sandwichsaaret</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong – Kiinan erityishallintoalue</territory>
-			<territory type="HM">Heard- ja McDonaldinsaaret</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Unkari</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanti</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Mansaari</territory>
-			<territory type="IN">Intia</territory>
-			<territory type="IO">Brittiläinen Intian valtameren alue</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islanti</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordania</territory>
-			<territory type="JP">Japani</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgisia</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorit</territory>
-			<territory type="KN">Saint Kitts ja Nevis</territory>
-			<territory type="KP">Pohjois-Korea</territory>
-			<territory type="KR">Etelä-Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Caymansaaret</territory>
-			<territory type="KZ">Kazakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Liettua</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint-Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallinsaaret</territory>
-			<territory type="MK">Makedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao – Kiinan erityishallintoalue</territory>
-			<territory type="MP">Pohjois-Mariaanit</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Malediivit</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malesia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Uusi-Kaledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkinsaari</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Alankomaat</territory>
-			<territory type="NO">Norja</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Uusi-Seelanti</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Ranskan Polynesia</territory>
-			<territory type="PG">Papua-Uusi-Guinea</territory>
-			<territory type="PH">Filippiinit</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Puola</territory>
-			<territory type="PM">Saint-Pierre ja Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestiina</territory>
-			<territory type="PT">Portugali</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">ulkomeri</territory>
-			<territory type="QU">Euroopan unioni</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Venäjä</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Arabia</territory>
-			<territory type="SB">Salomonsaaret</territory>
-			<territory type="SC">Seychellit</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Ruotsi</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Huippuvuoret ja Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé ja Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syyria</territory>
-			<territory type="SZ">Swazimaa</territory>
-			<territory type="TC">Turks- ja Caicossaaret</territory>
-			<territory type="TD">TÅ¡ad</territory>
-			<territory type="TF">Ranskan ulkopuoliset eteläiset alueet</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thaimaa</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Itä-Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkki</territory>
-			<territory type="TT">Trinidad ja Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Yhdysvaltain pienet erillissaaret</territory>
-			<territory type="US">Yhdysvallat</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikaani</territory>
-			<territory type="VC">Saint Vincent ja Grenadiinit</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Brittiläiset Neitsytsaaret</territory>
-			<territory type="VI">Yhdysvaltain Neitsytsaaret</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis ja Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Etelä-Afrikka</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">tuntematon tai virheellinen alue</territory>
-		</territories>
-		<variants>
-			<variant type="1901">saksan perinteinen oikeinkirjoitus</variant>
-			<variant type="1994">sloveenin resian murteen yhdenmukaistettu oikeinkirjoitus</variant>
-			<variant type="1996">saksan uusi oikeinkirjoitus</variant>
-			<variant type="1606NICT">myöhäiskeskiranska</variant>
-			<variant type="1694ACAD">varhaisnykyranska</variant>
-			<variant type="1959ACAD">valkovenäjän virallinen oikeinkirjoitus</variant>
-			<variant type="AREVELA">itäarmenialainen</variant>
-			<variant type="AREVMDA">länsiarmenialainen</variant>
-			<variant type="BAKU1926">yhtenäistetty turkkilainen latinalainen aakkosto</variant>
-			<variant type="BISKE">sloveenin resian San Giorgion/Bilan alamurre</variant>
-			<variant type="BOONT">englannin boontling-murre</variant>
-			<variant type="FONIPA">kansainvälinen foneettinen aakkosto IPA</variant>
-			<variant type="FONUPA">uralilainen foneettinen aakkosto UPA</variant>
-			<variant type="KKCOR">kornin yleiskirjoitus</variant>
-			<variant type="LIPAW">sloveenin resian Lipovazin/Lipovecin alamurre</variant>
-			<variant type="MONOTON">monotoninen kreikka</variant>
-			<variant type="NEDIS">sloveenin natisonen murre</variant>
-			<variant type="NJIVA">sloveenin resian Gnivan/Njivan alamurre</variant>
-			<variant type="OSOJS">sloveenin resian Oseaccon/Osojanen alamurre</variant>
-			<variant type="PINYIN">kiinan pinyin-latinaistus</variant>
-			<variant type="POLYTON">polytoninen kreikka</variant>
-			<variant type="POSIX">tietokonemäärittely POSIX</variant>
-			<variant type="REVISED">uudistettu oikeinkirjoitus</variant>
-			<variant type="ROZAJ">sloveenin resian murre</variant>
-			<variant type="SAAHO">afarin saho-murre</variant>
-			<variant type="SCOTLAND">skotlanninenglanti</variant>
-			<variant type="SCOUSE">englannin scouse-murre</variant>
-			<variant type="SOLBA">sloveenin resian Stolvizzan/Solbican alamurre</variant>
-			<variant type="TARASK">valkovenäjän taraškevitsa-oikeinkirjoitus</variant>
-			<variant type="UCCOR">kornin yhtenäiskirjoitus</variant>
-			<variant type="UCRCOR">kornin uusittu yhtenäiskirjoitus</variant>
-			<variant type="VALENCIA">katalaanin valencian murre</variant>
-			<variant type="WADEGILE">kiinan Wade-Giles-latinaistus</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalenteri</key>
-			<key type="collation">lajittelu</key>
-			<key type="currency">valuutta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">perinteinen kiinalainen järjestys Big5</type>
-			<type type="buddhist" key="calendar">buddhalainen kalenteri</type>
-			<type type="chinese" key="calendar">kiinalainen kalenteri</type>
-			<type type="direct" key="collation">suora järjestys</type>
-			<type type="gb2312han" key="collation">yksinkertaistettu kiinalainen järjestys GB2312</type>
-			<type type="gregorian" key="calendar">gregoriaaninen kalenteri</type>
-			<type type="hebrew" key="calendar">juutalainen kalenteri</type>
-			<type type="indian" key="calendar">intialainen kalenteri</type>
-			<type type="islamic" key="calendar">islamilainen kalenteri</type>
-			<type type="islamic-civil" key="calendar">islamilainen siviilikalenteri</type>
-			<type type="japanese" key="calendar">japanilainen kalenteri</type>
-			<type type="phonebook" key="collation">puhelinluettelojärjestys</type>
-			<type type="pinyin" key="collation">pinyin-järjestys</type>
-			<type type="roc" key="calendar">kiinan tasavallan kalenteri 1912–1949</type>
-			<type type="stroke" key="collation">piirtojärjestys</type>
-			<type type="traditional" key="collation">perinteinen järjestys</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrinen</measurementSystemName>
-			<measurementSystemName type="US">amerikkalainen</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">kieli: {0}</codePattern>
-			<codePattern type="script">kirjoitusjärjestelmä: {0}</codePattern>
-			<codePattern type="territory">alue: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a-s š t-z ž å ä ö]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à â ã � ç đ é è ë ǧ ǥ ȟ í ï ǩ ń ñ ŋ ô õ œ ř ŧ ú ü ʒ ǯ æ ø]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>�</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>’</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">tammikuuta</month>
-							<month type="2">helmikuuta</month>
-							<month type="3">maaliskuuta</month>
-							<month type="4">huhtikuuta</month>
-							<month type="5">toukokuuta</month>
-							<month type="6">kesäkuuta</month>
-							<month type="7">heinäkuuta</month>
-							<month type="8">elokuuta</month>
-							<month type="9">syyskuuta</month>
-							<month type="10">lokakuuta</month>
-							<month type="11">marraskuuta</month>
-							<month type="12">joulukuuta</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">tammikuuta</month>
-							<month type="2">helmikuuta</month>
-							<month type="3">maaliskuuta</month>
-							<month type="4">huhtikuuta</month>
-							<month type="5">toukokuuta</month>
-							<month type="6">kesäkuuta</month>
-							<month type="7">heinäkuuta</month>
-							<month type="8">elokuuta</month>
-							<month type="9">syyskuuta</month>
-							<month type="10">lokakuuta</month>
-							<month type="11">marraskuuta</month>
-							<month type="12">joulukuuta</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">tammi</month>
-							<month type="2">helmi</month>
-							<month type="3">maalis</month>
-							<month type="4">huhti</month>
-							<month type="5">touko</month>
-							<month type="6">kesä</month>
-							<month type="7">heinä</month>
-							<month type="8">elo</month>
-							<month type="9">syys</month>
-							<month type="10">loka</month>
-							<month type="11">marras</month>
-							<month type="12">joulu</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">T</month>
-							<month type="2">H</month>
-							<month type="3">M</month>
-							<month type="4">H</month>
-							<month type="5">T</month>
-							<month type="6">K</month>
-							<month type="7">H</month>
-							<month type="8">E</month>
-							<month type="9">S</month>
-							<month type="10">L</month>
-							<month type="11">M</month>
-							<month type="12">J</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">tammikuu</month>
-							<month type="2">helmikuu</month>
-							<month type="3">maaliskuu</month>
-							<month type="4">huhtikuu</month>
-							<month type="5">toukokuu</month>
-							<month type="6">kesäkuu</month>
-							<month type="7">heinäkuu</month>
-							<month type="8">elokuu</month>
-							<month type="9">syyskuu</month>
-							<month type="10">lokakuu</month>
-							<month type="11">marraskuu</month>
-							<month type="12">joulukuu</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">su</day>
-							<day type="mon">ma</day>
-							<day type="tue">ti</day>
-							<day type="wed">ke</day>
-							<day type="thu">to</day>
-							<day type="fri">pe</day>
-							<day type="sat">la</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sunnuntaina</day>
-							<day type="mon">maanantaina</day>
-							<day type="tue">tiistaina</day>
-							<day type="wed">keskiviikkona</day>
-							<day type="thu">torstaina</day>
-							<day type="fri">perjantaina</day>
-							<day type="sat">lauantaina</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">K</day>
-							<day type="thu">T</day>
-							<day type="fri">P</day>
-							<day type="sat">L</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sunnuntai</day>
-							<day type="mon">maanantai</day>
-							<day type="tue">tiistai</day>
-							<day type="wed">keskiviikko</day>
-							<day type="thu">torstai</day>
-							<day type="fri">perjantai</day>
-							<day type="sat">lauantai</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1. nelj.</quarter>
-							<quarter type="2">2. nelj.</quarter>
-							<quarter type="3">3. nelj.</quarter>
-							<quarter type="4">4. nelj.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. neljännes</quarter>
-							<quarter type="2">2. neljännes</quarter>
-							<quarter type="3">3. neljännes</quarter>
-							<quarter type="4">4. neljännes</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ap.</am>
-				<pm>ip.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ennen Kristuksen syntymää</era>
-						<era type="1">jälkeen Kristuksen syntymän</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">eKr.</era>
-						<era type="1">jKr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d.</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">L.yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yMMMMccccd">cccc, d. MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q/yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">M/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q/yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMEEEd">EEE d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.–d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H–H</greatestDifference>
-							<greatestDifference id="h">H–H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H.mm–H.mm</greatestDifference>
-							<greatestDifference id="h">H.mm–H.mm</greatestDifference>
-							<greatestDifference id="m">H.mm–H.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H.mm–H.mm v</greatestDifference>
-							<greatestDifference id="h">H.mm–H.mm v</greatestDifference>
-							<greatestDifference id="m">H.mm–H.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H–H v</greatestDifference>
-							<greatestDifference id="h">H–H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">L.–L.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.–d.M.</greatestDifference>
-							<greatestDifference id="M">d.M.–d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d. – E d.M</greatestDifference>
-							<greatestDifference id="M">E d.M. – E d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.–d. MMMM</greatestDifference>
-							<greatestDifference id="M">d. MMMM – d. MMMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d. – E d. MMMM</greatestDifference>
-							<greatestDifference id="M">E d. MMMM – E d. MMMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">LLL–LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.–d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">d.M.–d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">d.M.yyyy–d.M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d.M.yyyy – E d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">E d.M.yyyy – E d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">E d.M.yyyy – E d.M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.–d. MMMM y</greatestDifference>
-							<greatestDifference id="M">d. MMMM – d. MMMM y</greatestDifference>
-							<greatestDifference id="y">d. MMMM y – d. MMMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d. – E d. MMMM y</greatestDifference>
-							<greatestDifference id="M">E d. MMMM – E d. MMMM y</greatestDifference>
-							<greatestDifference id="y">E d. MMMM y – E d. MMMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLL–LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y – LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>aikakausi</displayName>
-					</field>
-					<field type="year">
-						<displayName>vuosi</displayName>
-					</field>
-					<field type="month">
-						<displayName>kuukausi</displayName>
-					</field>
-					<field type="week">
-						<displayName>viikko</displayName>
-					</field>
-					<field type="day">
-						<displayName>päivä</displayName>
-						<relative type="-2">toissapäivänä</relative>
-						<relative type="-1">eilen</relative>
-						<relative type="0">tänään</relative>
-						<relative type="1">huomenna</relative>
-						<relative type="2">ylihuomenna</relative>
-					</field>
-					<field type="weekday">
-						<displayName>viikonpäivä</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ap/ip</displayName>
-					</field>
-					<field type="hour">
-						<displayName>tunti</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuutti</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekunti</displayName>
-					</field>
-					<field type="zone">
-						<displayName>aikavyöhyke</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">tišrí</month>
-							<month type="2">hešván</month>
-							<month type="3">kislév</month>
-							<month type="4">tevét</month>
-							<month type="5">ševát</month>
-							<month type="6">adár</month>
-							<month type="7">adár II</month>
-							<month type="8">nisán</month>
-							<month type="9">ijjár</month>
-							<month type="10">siván</month>
-							<month type="11">tammúz</month>
-							<month type="12">ab</month>
-							<month type="13">elúl</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">tišríkuu</month>
-							<month type="2">hešvánkuu</month>
-							<month type="3">kislévkuu</month>
-							<month type="4">tevétkuu</month>
-							<month type="5">ševátkuu</month>
-							<month type="6">adárkuu</month>
-							<month type="7">adárkuu II</month>
-							<month type="8">nisánkuu</month>
-							<month type="9">ijjárkuu</month>
-							<month type="10">sivánkuu</month>
-							<month type="11">tammúzkuu</month>
-							<month type="12">abkuu</month>
-							<month type="13">elúlkuu</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">muharram</month>
-							<month type="2">safar</month>
-							<month type="3">rabi’ al-awwal</month>
-							<month type="4">rabi’ al-akhir</month>
-							<month type="5">džumada-l-ula</month>
-							<month type="6">džumada-l-akhira</month>
-							<month type="7">radžab</month>
-							<month type="8">ša’ban</month>
-							<month type="9">ramadan</month>
-							<month type="10">Å¡awwal</month>
-							<month type="11">dhu-l-qa’da</month>
-							<month type="12">dhu-l-hiddža</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+H.mm;-H.mm</hourFormat>
-			<gmtFormat>UTC{0}</gmtFormat>
-			<gmtZeroFormat>UTC</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>tuntematon</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Etelänapa</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>Maarianhamina</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bryssel</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Pääsiäissaari</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kap Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Joulu</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikosia</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berliini</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kööpenhamina</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallinna</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanariansaaret</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidzi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Färsaaret</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Pariisi</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Lontoo</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Ateena</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Etelä-Georgia</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Mansaari</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rooma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komorit</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Saint Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtöbe</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Saint Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilna</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Riika</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Malediivit</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Ciudad de México</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Niuesaari</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsova</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorit</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Belgrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskova</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtšatka</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Tukholma</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>San Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskos</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dušanbe</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiova</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporižžja</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>keskinen Pohjois-Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>Vatikaani</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Saint Thomas</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Keski-Afrikan aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Itä-Afrikan aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Etelä-Afrikan aika</generic>
-					<standard>Etelä-Afrikan normaaliaika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Länsi-Afrikan aika</standard>
-					<daylight>Länsi-Afrikan kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<standard>Alaskan normaaliaika</standard>
-					<daylight>Alaskan kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazonin aika</standard>
-					<daylight>Amazonin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Yhdysvaltain keskinen aika</generic>
-					<standard>Yhdysvaltain keskinen normaaliaika</standard>
-					<daylight>Yhdysvaltain keskinen kesäaika</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Yhdysvaltain itäinen aika</generic>
-					<standard>Yhdysvaltain itäinen normaaliaika</standard>
-					<daylight>Yhdysvaltain itäinen kesäaika</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Kalliovuorten aika</generic>
-					<standard>Kalliovuorten normaaliaika</standard>
-					<daylight>Kalliovuorten kesäaika</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Yhdysvaltain Tyynenmeren aika</generic>
-					<standard>Yhdysvaltain Tyynenmeren normaaliaika</standard>
-					<daylight>Yhdysvaltain Tyynenmeren kesäaika</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Saudi-Arabian aika</generic>
-					<standard>Saudi-Arabian normaaliaika</standard>
-					<daylight>Saudi-Arabian kesäaika</daylight>
-				</long>
-				<short>
-					<generic>AT (SA)</generic>
-				</short>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armenian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>AÅ¡gabatin aika</standard>
-					<daylight>Ašgabatin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Kanadan Atlantin aika</generic>
-					<standard>Kanadan Atlantin normaaliaika</standard>
-					<daylight>Kanadan Atlantin kesäaika</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Keski-Australian aika</generic>
-					<daylight>Keski-Australian kesäaika</daylight>
-				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Läntisen Keski-Australian aika</generic>
-					<standard>Läntisen Keski-Australian normaaliaika</standard>
-					<daylight>Läntisen Keski-Australian kesäaika</daylight>
-				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Itä-Australian aika</generic>
-					<standard>Itä-Australian normaaliaika</standard>
-					<daylight>Itä-Australian kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<standard>Länsi-Australian normaaliaika</standard>
-					<daylight>Länsi-Australian kesäaika</daylight>
-				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Azerbaidžanin aika</standard>
-					<daylight>Azerbaidžanin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azorien aika</standard>
-					<daylight>Azorien kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<daylight>Bakun kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladeshin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutanin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneon aika</standard>
-					<daylight>Borneon kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunein aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Kap Verden aika</standard>
-					<daylight>Kap Verden kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Kiinan aika</generic>
-					<standard>Kiinan normaaliaika</standard>
-					<daylight>Kiinan kesäaika</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST (Kiina)</standard>
-					<daylight>CDT (Kiina)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<daylight>Tšoibalsan kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Joulusaaren aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Kookossaarten aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Keski-Euroopan normaaliaika</standard>
-					<daylight>Keski-Euroopan kesäaika</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Itä-Euroopan normaaliaika</standard>
-					<daylight>Itä-Euroopan kesäaika</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Länsi-Euroopan aika</standard>
-					<daylight>Länsi-Euroopan kesäaika</daylight>
-				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<daylight>Falklandinsaarten kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Ranskan eteläisten ja antarktisten alueiden aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Biškekin aika</standard>
-					<daylight>Biškekin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Georgian aika</standard>
-					<daylight>Georgian kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwichin normaaliaika</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Arabiemiirikuntien normaaliaika</standard>
-				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hongkongin aika</standard>
-					<daylight>Hongkongin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<daylight>Hovdin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Intian normaaliaika</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>In</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Keski-Indonesian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Itä-Indonesian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Länsi-Indonesian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Israelin normaaliaika</standard>
-					<daylight>Israelin kesäaika</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Japanin normaaliaika</standard>
-					<daylight>Japanin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karachin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Korean aika</generic>
-					<standard>Korean normaaliaika</standard>
-				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasnojarskin aika</standard>
-					<daylight>Krasnojarskin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuybyshevin aika</standard>
-					<daylight>Kuybyshevin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Sri Lankan aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howen aika</generic>
-					<standard>Lord Howen normaaliaika</standard>
-					<daylight>Lord Howen kesäaika</daylight>
-				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<daylight>Macaon kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaijan aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Malediivien aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauritiuksen aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<daylight>Ulan Batorin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskovan aika</generic>
-					<standard>Moskovan normaaliaika</standard>
-					<daylight>Moskovan kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Myanmarin aikaMa</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepalin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<standard>Uuden-Seelannin normaaliaika</standard>
-				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>Newfoundlandin normaaliaika</standard>
-					<daylight>Newfoundlandin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novosibirskin aika</standard>
-					<daylight>Novosibirskin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omskin aika</standard>
-					<daylight>Omskin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistanin aika</standard>
-					<daylight>Pakistanin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Filippiinien aika</standard>
-					<daylight>Filippiinien kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sahalinin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samaran aika</standard>
-					<daylight>Samaran kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Etelä-Georgian aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tadžikistanin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Taškentin aika</standard>
-					<daylight>Taškentin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<daylight>Turkin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Turkmenistanin aika</standard>
-					<daylight>Turkmenistanin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Oralin aika</standard>
-					<daylight>Oralin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Ürümqin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Uzbekistanin aika</standard>
-					<daylight>Uzbekistanin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vladivostokin aika</standard>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgogradin aika</standard>
-					<daylight>Volgogradin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Jakutskin aika</standard>
-					<daylight>Jakutskin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Jekaterinburgin aika</standard>
-					<daylight>Jekaterinburgin kesäaika</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Jerevanin aika</standard>
-					<daylight>Jerevanin kesäaika</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>epäluku</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorran peseta</displayName>
-				<displayName count="one">Andorran peseta</displayName>
-				<displayName count="other">Andorran pesetaa</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Arabiemiirikuntien dirhami</displayName>
-				<displayName count="one">Arabiemiirikuntien dirhami</displayName>
-				<displayName count="other">Arabiemiirikuntien dirhamia</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afganistanin afgaani (1927–2002)</displayName>
-				<displayName count="one">Afganistanin afgaani (1927-2002)</displayName>
-				<displayName count="other">Afganistanin afgaania (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afganistanin afgaani</displayName>
-				<displayName count="one">Afganistanin afgaani</displayName>
-				<displayName count="other">Afganistanin afgaania</displayName>
-				<symbol>AFN</symbol>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albanian lek</displayName>
-				<displayName count="one">Albanian lek</displayName>
-				<displayName count="other">Albanian lekiä</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armenian dram</displayName>
-				<displayName count="one">Armenian dram</displayName>
-				<displayName count="other">Armenian dramia</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Alankomaiden Antillien guldeni</displayName>
-				<displayName count="one">Alankomaiden Antillien guldeni</displayName>
-				<displayName count="other">Alankomaiden Antillien guldenia</displayName>
-				<symbol>ANG</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolan kwanza</displayName>
-				<displayName count="one">Angolan kwanza</displayName>
-				<displayName count="other">Angolan kwanzaa</displayName>
-				<symbol>AOA</symbol>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolan kwanza (1977–1990)</displayName>
-				<displayName count="one">Angolan kwanza (1977–1990)</displayName>
-				<displayName count="other">Angolan kwanzaa (1977–1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolan uusi kwanza (1990–2000)</displayName>
-				<displayName count="one">Angolan uusi kwanza (1990–2000)</displayName>
-				<displayName count="other">Angolan uutta kwanzaa (1990–2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolan kwanza reajustado (1995–1999)</displayName>
-				<displayName count="one">Angolan kwanza reajustado (1995–1999)</displayName>
-				<displayName count="other">Angolan kwanza reajustadoa (1995–1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentiinan austral</displayName>
-				<displayName count="one">Argentiinan austral</displayName>
-				<displayName count="other">Argentiinan australia</displayName>
-				<symbol>ARA</symbol>
-			</currency>
-			<currency type="ARL">
-				<symbol>ARL</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>ARM</symbol>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentiinan peso (1983–1985)</displayName>
-				<displayName count="one">Argentiinan peso (1983–1985)</displayName>
-				<displayName count="other">Argentiinan pesoa (1983–1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentiinan peso</displayName>
-				<displayName count="one">Argentiinan peso</displayName>
-				<displayName count="other">Argentiinan pesoa</displayName>
-				<symbol>ARS</symbol>
-			</currency>
-			<currency type="ATS">
-				<displayName>Itävallan šillinki</displayName>
-				<displayName count="one">Itävallan šillinki</displayName>
-				<displayName count="other">Itävallan šillinkiä</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australian dollari</displayName>
-				<displayName count="one">Australian dollari</displayName>
-				<displayName count="other">Australian dollaria</displayName>
-				<symbol>AUD</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruban guldeni</displayName>
-				<displayName count="one">Aruban guldeni</displayName>
-				<displayName count="other">Aruban guldenia</displayName>
-				<symbol>AWG</symbol>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbaidžanin manat (1993–2006)</displayName>
-				<displayName count="one">Azerbaidžanin manat (1993–2006)</displayName>
-				<displayName count="other">Azerbaidžanin manatia (1993–2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbaidžanin manat</displayName>
-				<displayName count="one">Azerbaidžanin manat</displayName>
-				<displayName count="other">Azerbaidžanin manatia</displayName>
-				<symbol>AZN</symbol>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnia-Hertsegovinan dinaari</displayName>
-				<displayName count="one">Bosnia-Hertsegovinan dinaari</displayName>
-				<displayName count="other">Bosnia-Hertsegovinan dinaaria</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnia-Hertsegovinan vaihdettava markka</displayName>
-				<displayName count="one">Bosnia-Hertsegovinan vaihdettava markka</displayName>
-				<displayName count="other">Bosnia-Hertsegovinan vaihdettavaa markkaa</displayName>
-				<symbol>BAM</symbol>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadosin dollari</displayName>
-				<displayName count="one">Barbadosin dollari</displayName>
-				<displayName count="other">Barbadosin dollaria</displayName>
-				<symbol>BBD</symbol>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeshin taka</displayName>
-				<displayName count="one">Bangladeshin taka</displayName>
-				<displayName count="other">Bangladeshin takaa</displayName>
-				<symbol>BDT</symbol>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgian vaihdettava frangi</displayName>
-				<displayName count="one">Belgian vaihdettava frangi</displayName>
-				<displayName count="other">Belgian vaihdettavaa frangia</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgian frangi</displayName>
-				<displayName count="one">Belgian frangi</displayName>
-				<displayName count="other">Belgian frangia</displayName>
-				<symbol>BEF</symbol>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgian rahoitusfrangi</displayName>
-				<displayName count="one">Belgian rahoitusfrangi</displayName>
-				<displayName count="other">Belgian rahoitusfrangia</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgarian kova lev</displayName>
-				<displayName count="one">Bulgarian kova lev</displayName>
-				<displayName count="other">Bulgarian kovaa levaa</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgarian uusi lev</displayName>
-				<displayName count="one">Bulgarian uusi lev</displayName>
-				<displayName count="other">Bulgarian uutta levaa</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahrainin dinaari</displayName>
-				<displayName count="one">Bahrainin dinaari</displayName>
-				<displayName count="other">Bahrainin dinaaria</displayName>
-				<symbol>BHD</symbol>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundin frangi</displayName>
-				<displayName count="one">Burundin frangi</displayName>
-				<displayName count="other">Burundin frangia</displayName>
-				<symbol>BIF</symbol>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudan dollari</displayName>
-				<displayName count="one">Bermudan dollari</displayName>
-				<displayName count="other">Bermudan dollaria</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunein dollari</displayName>
-				<displayName count="one">Brunein dollari</displayName>
-				<displayName count="other">Brunein dollaria</displayName>
-				<symbol>BND</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivian boliviano</displayName>
-				<displayName count="one">Bolivian boliviano</displayName>
-				<displayName count="other">Bolivian bolivianoa</displayName>
-				<symbol>BOB</symbol>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivian peso</displayName>
-				<displayName count="one">Bolivian peso</displayName>
-				<displayName count="other">Bolivian pesoa</displayName>
-				<symbol>BOP</symbol>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivian mvdol</displayName>
-				<displayName count="one">Bolivian mvdol</displayName>
-				<displayName count="other">Bolivian mvdol'ia</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brasilian uusi cruzeiro (1967–1986)</displayName>
-				<displayName count="one">Brasilian uusi cruzeiro (1967–1986)</displayName>
-				<displayName count="other">Brasilian uutta cruzeiroa (1967–1986)</displayName>
-				<symbol>BRB</symbol>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brasilian cruzado</displayName>
-				<displayName count="one">Brasilian cruzado</displayName>
-				<displayName count="other">Brasilian cruzadoa</displayName>
-				<symbol>BRC</symbol>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brasilian cruzeiro (1990–1993)</displayName>
-				<displayName count="one">Brasilian cruzeiro (1990–1993)</displayName>
-				<displayName count="other">Brasilian cruzeiroa (1990–1993)</displayName>
-				<symbol>BRE</symbol>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brasilian real</displayName>
-				<displayName count="one">Brasilian real</displayName>
-				<displayName count="other">Brasilian realia</displayName>
-				<symbol>BRL</symbol>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brasilian uusi cruzado</displayName>
-				<displayName count="one">Brasilian uusi cruzado</displayName>
-				<displayName count="other">Brasilian uutta cruzadoa</displayName>
-				<symbol>BRN</symbol>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brasilian cruzeiro</displayName>
-				<displayName count="one">Brasilian cruzeiro</displayName>
-				<displayName count="other">Brasilian cruzeiroa</displayName>
-				<symbol>BRR</symbol>
-			</currency>
-			<currency type="BRZ">
-				<symbol>BRZ</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahaman dollari</displayName>
-				<displayName count="one">Bahaman dollari</displayName>
-				<displayName count="other">Bahaman dollaria</displayName>
-				<symbol>BSD</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutanin ngultrum</displayName>
-				<displayName count="one">Bhutanin ngultrum</displayName>
-				<displayName count="other">Bhutanin ngultrumia</displayName>
-				<symbol>BTN</symbol>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burman kyat</displayName>
-				<displayName count="one">Burman kyat</displayName>
-				<displayName count="other">Burman kyatia</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswanan pula</displayName>
-				<displayName count="one">Botswanan pula</displayName>
-				<displayName count="other">Botswanan pulaa</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Valko-Venäjän uusi rupla (1994–1999)</displayName>
-				<displayName count="one">Valko-Venäjän uusi rupla (1994–1999)</displayName>
-				<displayName count="other">Valko-Venäjän uutta ruplaa (1994–1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Valko-Venäjän rupla</displayName>
-				<displayName count="one">Valko-Venäjän rupla</displayName>
-				<displayName count="other">Valko-Venäjän ruplaa</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizen dollari</displayName>
-				<displayName count="one">Belizen dollari</displayName>
-				<displayName count="other">Belizen dollaria</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadan dollari</displayName>
-				<displayName count="one">Kanadan dollari</displayName>
-				<displayName count="other">Kanadan dollaria</displayName>
-				<symbol>CAD</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>Kongon frangi</displayName>
-				<displayName count="one">Kongon frangi</displayName>
-				<displayName count="other">Kongon frangia</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>Sveitsin WIR-euro</displayName>
-				<displayName count="one">Sveitsin WIR-euro</displayName>
-				<displayName count="other">Sveitsin WIR-euroa</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Sveitsin frangi</displayName>
-				<displayName count="one">Sveitsin frangi</displayName>
-				<displayName count="other">Sveitsin frangia</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CHW">
-				<displayName>Sveitsin WIR-frangi</displayName>
-				<displayName count="one">Sveitsin WIR-frangi</displayName>
-				<displayName count="other">Sveitsin WIR-frangia</displayName>
-			</currency>
-			<currency type="CLE">
-				<symbol>CLE</symbol>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilen unidades de fomento</displayName>
-				<displayName count="one">Chilen unidades de fomento</displayName>
-				<displayName count="other">Chilen unidades de fomentoa</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilen peso</displayName>
-				<displayName count="one">Chilen peso</displayName>
-				<displayName count="other">Chilen pesoa</displayName>
-				<symbol>CLP</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>Kiinan yuan</displayName>
-				<displayName count="one">Kiinan yuan</displayName>
-				<displayName count="other">Kiinan yuania</displayName>
-				<symbol>CNY</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbian peso</displayName>
-				<displayName count="one">Kolumbian peso</displayName>
-				<displayName count="other">Kolumbian pesoa</displayName>
-				<symbol>COP</symbol>
-			</currency>
-			<currency type="COU">
-				<displayName>Kolumbian unidad de valor real</displayName>
-				<displayName count="one">Kolumbian unidad de valor real</displayName>
-				<displayName count="other">Kolumbian unidad de valor realia</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costa Rican colon</displayName>
-				<displayName count="one">Costa Rican colon</displayName>
-				<displayName count="other">Costa Rican colonia</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CSD">
-				<displayName>Serbian vanha dinaari</displayName>
-				<displayName count="one">Serbian vanha dinaari</displayName>
-				<displayName count="other">Serbian vanhaa dinaaria</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>TÅ¡ekkoslovakian kova koruna</displayName>
-				<displayName count="one">TÅ¡ekkoslovakian kova koruna</displayName>
-				<displayName count="other">TÅ¡ekkoslovakian kovaa korunaa</displayName>
-			</currency>
-			<currency type="CUC">
-				<symbol>CUC</symbol>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kuuban peso</displayName>
-				<displayName count="one">Kuuban peso</displayName>
-				<displayName count="other">Kuuban pesoa</displayName>
-				<symbol>CUP</symbol>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kap Verden escudo</displayName>
-				<displayName count="one">Kap Verden escudo</displayName>
-				<displayName count="other">Kap Verden escudoa</displayName>
-				<symbol>CVE</symbol>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kyproksen punta</displayName>
-				<displayName count="one">Kyproksen punta</displayName>
-				<displayName count="other">Kyproksen puntaa</displayName>
-				<symbol>CYP</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>TÅ¡ekin koruna</displayName>
-				<displayName count="one">TÅ¡ekin koruna</displayName>
-				<displayName count="other">TÅ¡ekin korunaa</displayName>
-				<symbol>CZK</symbol>
-			</currency>
-			<currency type="DDM">
-				<displayName>Itä-Saksan markka</displayName>
-				<displayName count="one">Itä-Saksan markka</displayName>
-				<displayName count="other">Itä-Saksan markkaa</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Saksan markka</displayName>
-				<displayName count="one">Saksan markka</displayName>
-				<displayName count="other">Saksan markkaa</displayName>
-				<symbol>DEM</symbol>
-			</currency>
-			<currency type="DJF">
-				<displayName>Djiboutin frangi</displayName>
-				<displayName count="one">Djiboutin frangi</displayName>
-				<displayName count="other">Djiboutin frangia</displayName>
-				<symbol>DJF</symbol>
-			</currency>
-			<currency type="DKK">
-				<displayName>Tanskan kruunu</displayName>
-				<displayName count="one">Tanskan kruunu</displayName>
-				<displayName count="other">Tanskan kruunua</displayName>
-				<symbol>Tkr</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikaanisen tasavallan peso</displayName>
-				<displayName count="one">Dominikaanisen tasavallan peso</displayName>
-				<displayName count="other">Dominikaanisen tasavallan pesoa</displayName>
-				<symbol>DOP</symbol>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algerian dinaari</displayName>
-				<displayName count="one">Algerian dinaari</displayName>
-				<displayName count="other">Algerian dinaaria</displayName>
-				<symbol>DZD</symbol>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadorin sucre</displayName>
-				<displayName count="one">Ecuadorin sucre</displayName>
-				<displayName count="other">Ecuadorin sucrea</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuadorin UVC</displayName>
-				<displayName count="one">Ecuadorin UVC</displayName>
-				<displayName count="other">Ecuadorin UVC'ta</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Viron kruunu</displayName>
-				<displayName count="one">Viron kruunu</displayName>
-				<displayName count="other">Viron kruunua</displayName>
-				<symbol>EEK</symbol>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptin punta</displayName>
-				<displayName count="one">Egyptin punta</displayName>
-				<displayName count="other">Egyptin puntaa</displayName>
-				<symbol>EGP</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritrean nakfa</displayName>
-				<displayName count="one">Eritrean nakfa</displayName>
-				<displayName count="other">Eritrean nakfaa</displayName>
-				<symbol>ERN</symbol>
-			</currency>
-			<currency type="ESA">
-				<displayName>Espanjan peseta (A-tili)</displayName>
-				<displayName count="one">Espanjan peseta (A-tili)</displayName>
-				<displayName count="other">Espanjan pesetaa (A-tili)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Espanjan peseta (vaihdettava tili)</displayName>
-				<displayName count="one">Espanjan peseta (vaihdettava tili)</displayName>
-				<displayName count="other">Espanjan pesetaa (vaihdettava tili)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Espanjan peseta</displayName>
-				<displayName count="one">Espanjan peseta</displayName>
-				<displayName count="other">Espanjan pesetaa</displayName>
-				<symbol>ESP</symbol>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiopian birr</displayName>
-				<displayName count="one">Etiopian birr</displayName>
-				<displayName count="other">Etiopian birriä</displayName>
-				<symbol>ETB</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euroa</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Suomen markka</displayName>
-				<displayName count="one">Suomen markka</displayName>
-				<displayName count="other">Suomen markkaa</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidžin dollari</displayName>
-				<displayName count="one">Fidžin dollari</displayName>
-				<displayName count="other">Fidžin dollaria</displayName>
-				<symbol>FJD</symbol>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklandinsaarten punta</displayName>
-				<displayName count="one">Falklandinsaarten punta</displayName>
-				<displayName count="other">Falklandinsaarten puntaa</displayName>
-				<symbol>FKP</symbol>
-			</currency>
-			<currency type="FRF">
-				<displayName>Ranskan frangi</displayName>
-				<displayName count="one">Ranskan frangi</displayName>
-				<displayName count="other">Ranskan frangia</displayName>
-				<symbol>FRF</symbol>
-			</currency>
-			<currency type="GBP">
-				<displayName>Englannin punta</displayName>
-				<displayName count="one">Englannin punta</displayName>
-				<displayName count="other">Englannin puntaa</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgian kuponkilari</displayName>
-				<displayName count="one">Georgian kuponkilari</displayName>
-				<displayName count="other">Georgian kuponkilaria</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgian lari</displayName>
-				<displayName count="one">Georgian lari</displayName>
-				<displayName count="other">Georgian laria</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanan cedi (1979–2007)</displayName>
-				<displayName count="one">Ghanan cedi (1979–2007)</displayName>
-				<displayName count="other">Ghanan cediä (1979–2007)</displayName>
-				<symbol>GHC</symbol>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanan cedi</displayName>
-				<displayName count="one">Ghanan cedi</displayName>
-				<displayName count="other">Ghanan cediä</displayName>
-				<symbol>GHS</symbol>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltarin punta</displayName>
-				<displayName count="one">Gibraltarin punta</displayName>
-				<displayName count="other">Gibraltarin puntaa</displayName>
-				<symbol>GIP</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambian dalasi</displayName>
-				<displayName count="one">Gambian dalasi</displayName>
-				<displayName count="other">Gambian dalasia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinean frangi</displayName>
-				<displayName count="one">Guinean frangi</displayName>
-				<displayName count="other">Guinean frangia</displayName>
-				<symbol>GNF</symbol>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinean syli</displayName>
-				<displayName count="one">Guinean syli</displayName>
-				<displayName count="other">Guinean syliä</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Päiväntasaajan Guinean ekwele (–1986)</displayName>
-				<displayName count="one">Päiväntasaajan Guinean ekwele (–1986)</displayName>
-				<displayName count="other">Päiväntasaajan Guinean ekweleä (–1986)</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Kreikan drakma</displayName>
-				<displayName count="one">Kreikan drakma</displayName>
-				<displayName count="other">Kreikan drakmaa</displayName>
-				<symbol>GRD</symbol>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalan quetzal</displayName>
-				<displayName count="one">Guatemalan quetzal</displayName>
-				<displayName count="other">Guatemalan quetzalia</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugalin Guinean escudo</displayName>
-				<displayName count="one">Portugalin Guinean escudo</displayName>
-				<displayName count="other">Portugalin Guinean escudoa</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissaun peso</displayName>
-				<displayName count="one">Guinea-Bissaun peso</displayName>
-				<displayName count="other">Guinea-Bissaun pesoa</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyanan dollari</displayName>
-				<displayName count="one">Guyanan dollari</displayName>
-				<displayName count="other">Guyanan dollaria</displayName>
-				<symbol>GYD</symbol>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkongin dollari</displayName>
-				<displayName count="one">Hongkongin dollari</displayName>
-				<displayName count="other">Hongkongin dollaria</displayName>
-				<symbol>HKD</symbol>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hondurasin lempira</displayName>
-				<displayName count="one">Hondurasin lempira</displayName>
-				<displayName count="other">Hondurasin lempiraa</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroatian dinaari</displayName>
-				<displayName count="one">Kroatian dinaari</displayName>
-				<displayName count="other">Kroatian dinaaria</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kroatian kuna</displayName>
-				<displayName count="one">Kroatian kuna</displayName>
-				<displayName count="other">Kroatian kunaa</displayName>
-				<symbol>HRK</symbol>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haitin gourde</displayName>
-				<displayName count="one">Haitin gourde</displayName>
-				<displayName count="other">Haitin gourdea</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Unkarin forintti</displayName>
-				<displayName count="one">Unkarin forintti</displayName>
-				<displayName count="other">Unkarin forinttia</displayName>
-				<symbol>HUF</symbol>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonesian rupia</displayName>
-				<displayName count="one">Indonesian rupia</displayName>
-				<displayName count="other">Indonesian rupiaa</displayName>
-				<symbol>IDR</symbol>
-			</currency>
-			<currency type="IEP">
-				<displayName>Irlannin punta</displayName>
-				<displayName count="one">Irlannin punta</displayName>
-				<displayName count="other">Irlannin puntaa</displayName>
-				<symbol>IEP</symbol>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israelin punta</displayName>
-				<displayName count="one">Israelin punta</displayName>
-				<displayName count="other">Israelin puntaa</displayName>
-				<symbol>ILP</symbol>
-			</currency>
-			<currency type="ILR">
-				<displayName>Israelin vanha sekeli</displayName>
-				<displayName count="one">Israelin vanha sekeli</displayName>
-				<displayName count="other">Israelin vanhaa sekeliä</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Israelin uusi sekeli</displayName>
-				<displayName count="one">Israelin uusi sekeli</displayName>
-				<displayName count="other">Israelin uutta sekeliä</displayName>
-				<symbol>ILS</symbol>
-			</currency>
-			<currency type="INR">
-				<displayName>Intian rupia</displayName>
-				<displayName count="one">Intian rupia</displayName>
-				<displayName count="other">Intian rupiaa</displayName>
-				<symbol>INR</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irakin dinaari</displayName>
-				<displayName count="one">Irakin dinaari</displayName>
-				<displayName count="other">Irakin dinaaria</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iranin rial</displayName>
-				<displayName count="one">Iranin rial</displayName>
-				<displayName count="other">Iranin rialia</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>Islannin vanha kruunu</displayName>
-				<displayName count="one">Islannin vanha kruunu</displayName>
-				<displayName count="other">Islannin vanhaa kruunua</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islannin kruunu</displayName>
-				<displayName count="one">Islannin kruunu</displayName>
-				<displayName count="other">Islannin kruunua</displayName>
-				<symbol>ISK</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italian liira</displayName>
-				<displayName count="one">Italian liira</displayName>
-				<displayName count="other">Italian liiraa</displayName>
-				<symbol>ITL</symbol>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaikan dollari</displayName>
-				<displayName count="one">Jamaikan dollari</displayName>
-				<displayName count="other">Jamaikan dollaria</displayName>
-				<symbol>JMD</symbol>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordanian dinaari</displayName>
-				<displayName count="one">Jordanian dinaari</displayName>
-				<displayName count="other">Jordanian dinaaria</displayName>
-				<symbol>JOD</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanin jeni</displayName>
-				<displayName count="one">Japanin jeni</displayName>
-				<displayName count="other">Japanin jeniä</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenian Å¡illinki</displayName>
-				<displayName count="one">Kenian Å¡illinki</displayName>
-				<displayName count="other">Kenian šillinkiä</displayName>
-				<symbol>KES</symbol>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgisian som</displayName>
-				<displayName count="one">Kirgisian som</displayName>
-				<displayName count="other">Kirgisian somia</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodžan riel</displayName>
-				<displayName count="one">Kambodžan riel</displayName>
-				<displayName count="other">Kambodžan rieliä</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komorien frangi</displayName>
-				<displayName count="one">Komorien frangi</displayName>
-				<displayName count="other">Komorien frangia</displayName>
-				<symbol>KMF</symbol>
-			</currency>
-			<currency type="KPW">
-				<displayName>Pohjois-Korean won</displayName>
-				<displayName count="one">Pohjois-Korean won</displayName>
-				<displayName count="other">Pohjois-Korean wonia</displayName>
-				<symbol>KPW</symbol>
-			</currency>
-			<currency type="KRW">
-				<displayName>Etelä-Korean won</displayName>
-				<displayName count="one">Etelä-Korean won</displayName>
-				<displayName count="other">Etelä-Korean wonia</displayName>
-				<symbol>KRW</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuwaitin dinaari</displayName>
-				<displayName count="one">Kuwaitin dinaari</displayName>
-				<displayName count="other">Kuwaitin dinaaria</displayName>
-				<symbol>KWD</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName>Caymansaarten dollari</displayName>
-				<displayName count="one">Caymansaarten dollari</displayName>
-				<displayName count="other">Caymansaarten dollaria</displayName>
-				<symbol>KYD</symbol>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazakstanin tenge</displayName>
-				<displayName count="one">Kazakstanin tenge</displayName>
-				<displayName count="other">Kazakstanin tengeä</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laosin kip</displayName>
-				<displayName count="one">Laosin kip</displayName>
-				<displayName count="other">Laosin kipiä</displayName>
-				<symbol>LAK</symbol>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanonin punta</displayName>
-				<displayName count="one">Libanonin punta</displayName>
-				<displayName count="other">Libanonin puntaa</displayName>
-				<symbol>LBP</symbol>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri Lankan rupia</displayName>
-				<displayName count="one">Sri Lankan rupia</displayName>
-				<displayName count="other">Sri Lankan rupiaa</displayName>
-				<symbol>LKR</symbol>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberian dollari</displayName>
-				<displayName count="one">Liberian dollari</displayName>
-				<displayName count="other">Liberian dollaria</displayName>
-				<symbol>LRD</symbol>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesothon loti</displayName>
-				<displayName count="one">Lesothon loti</displayName>
-				<displayName count="other">Lesothon lotia</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Liettuan liti</displayName>
-				<displayName count="one">Liettuan liti</displayName>
-				<displayName count="other">Liettuan litiä</displayName>
-				<symbol>LTL</symbol>
-			</currency>
-			<currency type="LTT">
-				<displayName>Liettuan talonas</displayName>
-				<displayName count="one">Liettuan talonas</displayName>
-				<displayName count="other">Liettuan talonasia</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxemburgin vaihdettava frangi</displayName>
-				<displayName count="one">Luxemburgin vaihdettava frangi</displayName>
-				<displayName count="other">Luxemburgin vaihdettavaa frangia</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburgin frangi</displayName>
-				<displayName count="one">Luxemburgin frangi</displayName>
-				<displayName count="other">Luxemburgin frangia</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxemburgin rahoitusfrangi</displayName>
-				<displayName count="one">Luxemburgin rahoitusfrangi</displayName>
-				<displayName count="other">Luxemburgin rahoitusfrangia</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latvian lati</displayName>
-				<displayName count="one">Latvian lati</displayName>
-				<displayName count="other">Latvian latia</displayName>
-				<symbol>LVL</symbol>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvian rupla</displayName>
-				<displayName count="one">Latvian rupla</displayName>
-				<displayName count="other">Latvian ruplaa</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libyan dinaari</displayName>
-				<displayName count="one">Libyan dinaari</displayName>
-				<displayName count="other">Libyan dinaaria</displayName>
-				<symbol>LYD</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokon dirhami</displayName>
-				<displayName count="one">Marokon dirhami</displayName>
-				<displayName count="other">Marokon dirhamia</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokon frangi</displayName>
-				<displayName count="one">Marokon frangi</displayName>
-				<displayName count="other">Marokon frangia</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovan leu</displayName>
-				<displayName count="one">Moldovan leu</displayName>
-				<displayName count="other">Moldovan leuta</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskarin ariary</displayName>
-				<displayName count="one">Madagaskarin ariary</displayName>
-				<displayName count="other">Madagaskarin ariarya</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskarin frangi</displayName>
-				<displayName count="one">Madagaskarin frangi</displayName>
-				<displayName count="other">Madagaskarin frangia</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedonian dinaari</displayName>
-				<displayName count="one">Makedonian dinaari</displayName>
-				<displayName count="other">Makedonian dinaaria</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malin frangi</displayName>
-				<displayName count="one">Malin frangi</displayName>
-				<displayName count="other">Malin frangia</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmarin kyat</displayName>
-				<displayName count="one">Myanmarin kyat</displayName>
-				<displayName count="other">Myanmarin kyatia</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolian tugrik</displayName>
-				<displayName count="one">Mongolian tugrik</displayName>
-				<displayName count="other">Mongolian tugrikia</displayName>
-				<symbol>MNT</symbol>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macaon pataca</displayName>
-				<displayName count="one">Macaon pataca</displayName>
-				<displayName count="other">Macaon patacaa</displayName>
-				<symbol>MOP</symbol>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritanian ouguiya</displayName>
-				<displayName count="one">Mauritanian ouguiya</displayName>
-				<displayName count="other">Mauritanian ouguiyaa</displayName>
-				<symbol>MRO</symbol>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltan liira</displayName>
-				<displayName count="one">Maltan liira</displayName>
-				<displayName count="other">Maltan liiraa</displayName>
-				<symbol>MTL</symbol>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltan punta</displayName>
-				<displayName count="one">Maltan punta</displayName>
-				<displayName count="other">Maltan puntaa</displayName>
-				<symbol>MTP</symbol>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritiuksen rupia</displayName>
-				<displayName count="one">Mauritiuksen rupia</displayName>
-				<displayName count="other">Mauritiuksen rupiaa</displayName>
-				<symbol>MUR</symbol>
-			</currency>
-			<currency type="MVR">
-				<displayName>Malediivien rufiyaa</displayName>
-				<displayName count="one">Malediivien rufiyaa</displayName>
-				<displayName count="other">Malediivien rufiyaata</displayName>
-				<symbol>MVR</symbol>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawin kwacha</displayName>
-				<displayName count="one">Malawin kwacha</displayName>
-				<displayName count="other">Malawin kwachaa</displayName>
-				<symbol>MWK</symbol>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksikon peso</displayName>
-				<displayName count="one">Meksikon peso</displayName>
-				<displayName count="other">Meksikon pesoa</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Meksikon hopeapeso (1861–1992)</displayName>
-				<displayName count="one">Meksikon hopeapeso (1861–1992)</displayName>
-				<displayName count="other">Meksikon hopeapesoa (1861–1992)</displayName>
-				<symbol>MXP</symbol>
-			</currency>
-			<currency type="MXV">
-				<displayName>Meksikon UDI</displayName>
-				<displayName count="one">Meksikon UDI</displayName>
-				<displayName count="other">Meksikon UDI'ta</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malesian ringgit</displayName>
-				<displayName count="one">Malesian ringgit</displayName>
-				<displayName count="other">Malesian ringgitiä</displayName>
-				<symbol>MYR</symbol>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mosambikin escudo</displayName>
-				<displayName count="one">Mosambikin escudo</displayName>
-				<displayName count="other">Mosambikin escudoa</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Mosambikin metical (1980–2006)</displayName>
-				<displayName count="one">Mosambikin metical (1980–2006)</displayName>
-				<displayName count="other">Mosambikin meticalia (1980–2006)</displayName>
-				<symbol>MZM</symbol>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mosambikin metical</displayName>
-				<displayName count="one">Mosambikin metical</displayName>
-				<displayName count="other">Mosambikin meticalia</displayName>
-				<symbol>MZN</symbol>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibian dollari</displayName>
-				<displayName count="one">Namibian dollari</displayName>
-				<displayName count="other">Namibian dollaria</displayName>
-				<symbol>NAD</symbol>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerian naira</displayName>
-				<displayName count="one">Nigerian naira</displayName>
-				<displayName count="other">Nigerian nairaa</displayName>
-				<symbol>NGN</symbol>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nicaraguan cordoba</displayName>
-				<displayName count="one">Nicaraguan cordoba</displayName>
-				<displayName count="other">Nicaraguan cordobaa</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nicaraguan kultacordoba</displayName>
-				<displayName count="one">Nicaraguan kultacordoba</displayName>
-				<displayName count="other">Nicaraguan kultacordobaa</displayName>
-				<symbol>NIO</symbol>
-			</currency>
-			<currency type="NLG">
-				<displayName>Alankomaiden guldeni</displayName>
-				<displayName count="one">Alankomaiden guldeni</displayName>
-				<displayName count="other">Alankomaiden guldenia</displayName>
-				<symbol>NLG</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norjan kruunu</displayName>
-				<displayName count="one">Norjan kruunu</displayName>
-				<displayName count="other">Norjan kruunua</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalin rupia</displayName>
-				<displayName count="one">Nepalin rupia</displayName>
-				<displayName count="other">Nepalin rupiaa</displayName>
-				<symbol>NPR</symbol>
-			</currency>
-			<currency type="NZD">
-				<displayName>Uuden-Seelannin dollari</displayName>
-				<displayName count="one">Uuden-Seelannin dollari</displayName>
-				<displayName count="other">Uuden-Seelannin dollaria</displayName>
-				<symbol>NZD</symbol>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omanin rial</displayName>
-				<displayName count="one">Omanin rial</displayName>
-				<displayName count="other">Omanin rialia</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panaman balboa</displayName>
-				<displayName count="one">Panaman balboa</displayName>
-				<displayName count="other">Panaman balboaa</displayName>
-				<symbol>PAB</symbol>
-			</currency>
-			<currency type="PEI">
-				<displayName>Perun inti</displayName>
-				<displayName count="one">Perun inti</displayName>
-				<displayName count="other">Perun intiä</displayName>
-				<symbol>PEI</symbol>
-			</currency>
-			<currency type="PEN">
-				<displayName>Perun uusi sol</displayName>
-				<displayName count="one">Perun uusi sol</displayName>
-				<displayName count="other">Perun uutta solia</displayName>
-				<symbol>PEN</symbol>
-			</currency>
-			<currency type="PES">
-				<displayName>Perun sol</displayName>
-				<displayName count="one">Perun sol</displayName>
-				<displayName count="other">Perun solia</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua-Uuden-Guinean kina</displayName>
-				<displayName count="one">Papua-Uuden-Guinean kina</displayName>
-				<displayName count="other">Papua-Uuden-Guinean kinaa</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filippiinien peso</displayName>
-				<displayName count="one">Filippiinien peso</displayName>
-				<displayName count="other">Filippiinien pesoa</displayName>
-				<symbol>PHP</symbol>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistanin rupia</displayName>
-				<displayName count="one">Pakistanin rupia</displayName>
-				<displayName count="other">Pakistanin rupiaa</displayName>
-				<symbol>PKR</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName>Puolan zloty</displayName>
-				<displayName count="one">Puolan zloty</displayName>
-				<displayName count="other">Puolan zlotya</displayName>
-				<symbol>PLN</symbol>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Puolan zloty (1950–1995)</displayName>
-				<displayName count="one">Puolan zloty (1950–1995)</displayName>
-				<displayName count="other">Puolan zlotya (1950–1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugalin escudo</displayName>
-				<displayName count="one">Portugalin escudo</displayName>
-				<displayName count="other">Portugalin escudoa</displayName>
-				<symbol>PTE</symbol>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguayn guarani</displayName>
-				<displayName count="one">Paraguayn guarani</displayName>
-				<displayName count="other">Paraguayn guarania</displayName>
-				<symbol>PYG</symbol>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatarin rial</displayName>
-				<displayName count="one">Qatarin rial</displayName>
-				<displayName count="other">Qatarin rialia</displayName>
-				<symbol>QAR</symbol>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rhodesian dollari</displayName>
-				<displayName count="one">Rhodesian dollari</displayName>
-				<displayName count="other">Rhodesian dollaria</displayName>
-				<symbol>RHD</symbol>
-			</currency>
-			<currency type="ROL">
-				<displayName>Romanian vanha leu</displayName>
-				<displayName count="one">Romanian vanha leu</displayName>
-				<displayName count="other">Romanian vanhaa leuta</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Romanian uusi leu</displayName>
-				<displayName count="one">Romanian uusi leu</displayName>
-				<displayName count="other">Romanian uutta leuta</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbian dinaari</displayName>
-				<displayName count="one">Serbian dinaari</displayName>
-				<displayName count="other">Serbian dinaaria</displayName>
-				<symbol>RSD</symbol>
-			</currency>
-			<currency type="RUB">
-				<displayName>Venäjän rupla</displayName>
-				<displayName count="one">Venäjän rupla</displayName>
-				<displayName count="other">Venäjän ruplaa</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Venäjän rupla (1991–1998)</displayName>
-				<displayName count="one">Venäjän rupla (1991–1998)</displayName>
-				<displayName count="other">Venäjän ruplaa (1991–1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruandan frangi</displayName>
-				<displayName count="one">Ruandan frangi</displayName>
-				<displayName count="other">Ruandan frangia</displayName>
-				<symbol>RWF</symbol>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi-Arabian rial</displayName>
-				<displayName count="one">Saudi-Arabian rial</displayName>
-				<displayName count="other">Saudi-Arabian rialia</displayName>
-				<symbol>SAR</symbol>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomonsaarten dollari</displayName>
-				<displayName count="one">Salomonsaarten dollari</displayName>
-				<displayName count="other">Salomonsaarten dollaria</displayName>
-				<symbol>SBD</symbol>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychellien rupia</displayName>
-				<displayName count="one">Seychellien rupia</displayName>
-				<displayName count="other">Seychellien rupiaa</displayName>
-				<symbol>SCR</symbol>
-			</currency>
-			<currency type="SDD">
-				<displayName>Sudanin dinaari</displayName>
-				<displayName count="one">Sudanin dinaari</displayName>
-				<displayName count="other">Sudanin dinaaria</displayName>
-				<symbol>SDD</symbol>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudanin punta</displayName>
-				<displayName count="one">Sudanin punta</displayName>
-				<displayName count="other">Sudanin puntaa</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudanin punta (1957–1999)</displayName>
-				<displayName count="one">Sudanin punta (1957–1999)</displayName>
-				<displayName count="other">Sudanin puntaa (1957–1999)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Ruotsin kruunu</displayName>
-				<displayName count="one">Ruotsin kruunu</displayName>
-				<displayName count="other">Ruotsin kruunua</displayName>
-				<symbol>Rkr</symbol>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singaporen dollari</displayName>
-				<displayName count="one">Singaporen dollari</displayName>
-				<displayName count="other">Singaporen dollaria</displayName>
-				<symbol>SGD</symbol>
-			</currency>
-			<currency type="SHP">
-				<displayName>Saint Helenan punta</displayName>
-				<displayName count="one">Saint Helenan punta</displayName>
-				<displayName count="other">Saint Helenan puntaa</displayName>
-				<symbol>SHP</symbol>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovenian tolar</displayName>
-				<displayName count="one">Slovenian tolar</displayName>
-				<displayName count="other">Slovenian tolaria</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovakian koruna</displayName>
-				<displayName count="one">Slovakian koruna</displayName>
-				<displayName count="other">Slovakian korunaa</displayName>
-				<symbol>SKK</symbol>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leonen leone</displayName>
-				<displayName count="one">Sierra Leonen leone</displayName>
-				<displayName count="other">Sierra Leonen leonea</displayName>
-				<symbol>SLL</symbol>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalian Å¡illinki</displayName>
-				<displayName count="one">Somalian Å¡illinki</displayName>
-				<displayName count="other">Somalian šillinkiä</displayName>
-				<symbol>SOS</symbol>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamin dollari</displayName>
-				<displayName count="one">Surinamin dollari</displayName>
-				<displayName count="other">Surinamin dollaria</displayName>
-				<symbol>SRD</symbol>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamin guldeni</displayName>
-				<displayName count="one">Surinamin guldeni</displayName>
-				<displayName count="other">Surinamin guldenia</displayName>
-				<symbol>SRG</symbol>
-			</currency>
-			<currency type="STD">
-				<displayName>São Tomén ja Príncipen dobra</displayName>
-				<displayName count="one">São Tomén ja Príncipen dobra</displayName>
-				<displayName count="other">São Tomén ja Príncipen dobraa</displayName>
-				<symbol>STD</symbol>
-			</currency>
-			<currency type="SUR">
-				<displayName>Neuvostoliiton rupla</displayName>
-				<displayName count="one">Neuvostoliiton rupla</displayName>
-				<displayName count="other">Neuvostoliiton ruplaa</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El Salvadorin colon</displayName>
-				<displayName count="one">El Salvadorin colon</displayName>
-				<displayName count="other">El Salvadorin colonia</displayName>
-				<symbol>SVC</symbol>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syyrian punta</displayName>
-				<displayName count="one">Syyrian punta</displayName>
-				<displayName count="other">Syyrian puntaa</displayName>
-				<symbol>SYP</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>Swazimaan lilangeni</displayName>
-				<displayName count="one">Swazimaan lilangeni</displayName>
-				<displayName count="other">Swazimaan lilangenia</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thaimaan baht</displayName>
-				<displayName count="one">Thaimaan baht</displayName>
-				<displayName count="other">Thaimaan bahtia</displayName>
-				<symbol>THB</symbol>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadžikistanin rupla</displayName>
-				<displayName count="one">Tadžikistanin rupla</displayName>
-				<displayName count="other">Tadžikistanin ruplaa</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikistanin somoni</displayName>
-				<displayName count="one">Tadžikistanin somoni</displayName>
-				<displayName count="other">Tadžikistanin somonia</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmenistanin manat</displayName>
-				<displayName count="one">Turkmenistanin manat</displayName>
-				<displayName count="other">Turkmenistanin manatia</displayName>
-			</currency>
-			<currency type="TMT">
-				<displayName>Turkmenistanin uusi manat</displayName>
-				<displayName count="one">Turkmenistanin uusi manat</displayName>
-				<displayName count="other">Turkmenistanin uutta manatia</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunisian dinaari</displayName>
-				<displayName count="one">Tunisian dinaari</displayName>
-				<displayName count="other">Tunisian dinaaria</displayName>
-				<symbol>TND</symbol>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongan pa’anga</displayName>
-				<displayName count="one">Tongan pa’anga</displayName>
-				<displayName count="other">Tongan pa’angaa</displayName>
-				<symbol>TOP</symbol>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timorin escudo</displayName>
-				<displayName count="one">Timorin escudo</displayName>
-				<displayName count="other">Timorin escudoa</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Turkin vanha liira</displayName>
-				<displayName count="one">Turkin vanha liira</displayName>
-				<displayName count="other">Turkin vanhaa liiraa</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Turkin liira</displayName>
-				<displayName count="one">Turkin liira</displayName>
-				<displayName count="other">Turkin liiraa</displayName>
-				<symbol>TRY</symbol>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidadin ja Tobagon dollari</displayName>
-				<displayName count="one">Trinidadin ja Tobagon dollari</displayName>
-				<displayName count="other">Trinidadin ja Tobagon dollaria</displayName>
-				<symbol>TTD</symbol>
-			</currency>
-			<currency type="TWD">
-				<displayName>Taiwanin uusi dollari</displayName>
-				<displayName count="one">Taiwanin uusi dollari</displayName>
-				<displayName count="other">Taiwanin uutta dollaria</displayName>
-				<symbol>TWD</symbol>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tansanian Å¡illinki</displayName>
-				<displayName count="one">Tansanian Å¡illinki</displayName>
-				<displayName count="other">Tansanian šillinkiä</displayName>
-				<symbol>TZS</symbol>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainan hryvnia</displayName>
-				<displayName count="one">Ukrainan hryvnia</displayName>
-				<displayName count="other">Ukrainan hryvniaa</displayName>
-				<symbol>UAH</symbol>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainan karbovanetz</displayName>
-				<displayName count="one">Ukrainan karbovanetz</displayName>
-				<displayName count="other">Ukrainan karbovanetziä</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandan šillinki (1966–1987)</displayName>
-				<displayName count="one">Ugandan šillinki (1966–1987)</displayName>
-				<displayName count="other">Ugandan šillinkiä (1966–1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandan Å¡illinki</displayName>
-				<displayName count="one">Ugandan Å¡illinki</displayName>
-				<displayName count="other">Ugandan šillinkiä</displayName>
-				<symbol>UGX</symbol>
-			</currency>
-			<currency type="USD">
-				<displayName>Yhdysvaltain dollari</displayName>
-				<displayName count="one">Yhdysvaltain dollari</displayName>
-				<displayName count="other">Yhdysvaltain dollaria</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>Yhdysvaltain dollari (seuraava päivä)</displayName>
-				<displayName count="one">Yhdysvaltain dollari (seuraava päivä)</displayName>
-				<displayName count="other">Yhdysvaltain dollaria (seuraava päivä)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Yhdysvaltain dollari (sama päivä)</displayName>
-				<displayName count="one">Yhdysvaltain dollari (sama päivä)</displayName>
-				<displayName count="other">Yhdysvaltain dollaria (sama päivä)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayn peso en unidades indexadas</displayName>
-				<displayName count="one">Uruguayn peso en unidades indexadas</displayName>
-				<displayName count="other">Uruguayn pesoa en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguayn peso (1975–1993)</displayName>
-				<displayName count="one">Uruguayn peso (1975–1993)</displayName>
-				<displayName count="other">Uruguayn pesoa (1975–1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguayn peso</displayName>
-				<displayName count="one">Uruguayn peso</displayName>
-				<displayName count="other">Uruguayn pesoa</displayName>
-				<symbol>UYU</symbol>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekistanin som</displayName>
-				<displayName count="one">Uzbekistanin som</displayName>
-				<displayName count="other">Uzbekistanin somia</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelan bolivar</displayName>
-				<displayName count="one">Venezuelan bolivar</displayName>
-				<displayName count="other">Venezuelan bolivaria</displayName>
-				<symbol>VEB</symbol>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelan bolivar fuerte</displayName>
-				<displayName count="one">Venezuelan bolivar fuerte</displayName>
-				<displayName count="other">Venezuelan bolivar fuertea</displayName>
-				<symbol>VEF</symbol>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamin dong</displayName>
-				<displayName count="one">Vietnamin dong</displayName>
-				<displayName count="other">Vietnamin dongia</displayName>
-				<symbol>VND</symbol>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatun vatu</displayName>
-				<displayName count="one">Vanuatun vatu</displayName>
-				<displayName count="other">Vanuatun vatua</displayName>
-				<symbol>VUV</symbol>
-			</currency>
-			<currency type="WST">
-				<displayName>Samoan tala</displayName>
-				<displayName count="one">Samoan tala</displayName>
-				<displayName count="other">Samoan talaa</displayName>
-				<symbol>WST</symbol>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA-frangi BEAC</displayName>
-				<displayName count="one">CFA-frangi BEAC</displayName>
-				<displayName count="other">CFA-frangia BEAC</displayName>
-				<symbol>XAF</symbol>
-			</currency>
-			<currency type="XAG">
-				<displayName>hopea</displayName>
-				<displayName count="one">hopeayksikkö</displayName>
-				<displayName count="other">hopeayksikköä</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>kulta</displayName>
-				<displayName count="one">kultayksikkö</displayName>
-				<displayName count="other">kultayksikköä</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>EURCO</displayName>
-				<displayName count="one">EURCO</displayName>
-				<displayName count="other">EURCO'a</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Euroopan rahayksikkö (EMU)</displayName>
-				<displayName count="one">Euroopan rahayksikkö (EMU)</displayName>
-				<displayName count="other">Euroopan rahayksikköä (EMU)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>EUA (XBC)</displayName>
-				<displayName count="one">EUA (XBC)</displayName>
-				<displayName count="other">EUA'ta (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>EUA (XBD)</displayName>
-				<displayName count="one">EUA (XBD)</displayName>
-				<displayName count="other">EUA'ta (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Itä-Karibian dollari</displayName>
-				<displayName count="one">Itä-Karibian dollari</displayName>
-				<displayName count="other">Itä-Karibian dollaria</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>erityisnosto-oikeus (SDR)</displayName>
-				<displayName count="one">erityisnosto-oikeus (SDR)</displayName>
-				<displayName count="other">erityisnosto-oikeutta (SDR)</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Euroopan valuuttayksikkö (ECU)</displayName>
-				<displayName count="one">Euroopan valuuttayksikkö (ECU)</displayName>
-				<displayName count="other">Euroopan valuuttayksikköä (ECU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Ranskan kultafrangi</displayName>
-				<displayName count="one">Ranskan kultafrangi</displayName>
-				<displayName count="other">Ranskan kultafrangia</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Ranskan UIC-frangi</displayName>
-				<displayName count="one">Ranskan UIC-frangi</displayName>
-				<displayName count="other">Ranskan UIC-frangia</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA-frangi BCEAO</displayName>
-				<displayName count="one">CFA-frangi BCEAO</displayName>
-				<displayName count="other">CFA-frangia BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palladium</displayName>
-				<displayName count="one">palladiumyksikkö</displayName>
-				<displayName count="other">palladiumyksikköä</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP-frangi</displayName>
-				<displayName count="one">CFP-frangi</displayName>
-				<displayName count="other">CFP-frangia</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-				<displayName count="one">platinayksikkö</displayName>
-				<displayName count="other">platinayksikköä</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-rahastot</displayName>
-				<displayName count="one">RINET-rahastoyksikkö</displayName>
-				<displayName count="other">RINET-rahastoyksikköä</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>testaustarkoitukseen varattu valuuttakoodi</displayName>
-				<displayName count="one">testaustarkoitukseen varattu valuuttakoodi</displayName>
-				<displayName count="other">testaustarkoitukseen varattua valuuttakoodia</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>tuntematon tai virheellinen rahayksikkö</displayName>
-				<displayName count="one">tuntematon tai virheellinen rahayksikkö</displayName>
-				<displayName count="other">tuntematonta tai virheellistä rahayksikköä</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemenin dinaari</displayName>
-				<displayName count="one">Jemenin dinaari</displayName>
-				<displayName count="other">Jemenin dinaaria</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenin rial</displayName>
-				<displayName count="one">Jemenin rial</displayName>
-				<displayName count="other">Jemenin rialia</displayName>
-				<symbol>YER</symbol>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoslavian kova dinaari</displayName>
-				<displayName count="one">Jugoslavian kova dinaari</displayName>
-				<displayName count="other">Jugoslavian kovaa dinaaria</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoslavian uusi dinaari</displayName>
-				<displayName count="one">Jugoslavian uusi dinaari</displayName>
-				<displayName count="other">Jugoslavian uutta dinaaria</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslavian vaihdettava dinaari</displayName>
-				<displayName count="one">Jugoslavian vaihdettava dinaari</displayName>
-				<displayName count="other">Jugoslavian vaihdettavaa dinaaria</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Etelä-Afrikan rahoitusrandi</displayName>
-				<displayName count="one">Etelä-Afrikan rahoitusrandi</displayName>
-				<displayName count="other">Etelä-Afrikan rahoitusrandia</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Etelä-Afrikan randi</displayName>
-				<displayName count="one">Etelä-Afrikan randi</displayName>
-				<displayName count="other">Etelä-Afrikan randia</displayName>
-				<symbol>ZAR</symbol>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Sambian kwacha</displayName>
-				<displayName count="one">Sambian kwacha</displayName>
-				<displayName count="other">Sambian kwachaa</displayName>
-				<symbol>ZMK</symbol>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairen uusi zaire</displayName>
-				<displayName count="one">Zairen uusi zaire</displayName>
-				<displayName count="other">Zairen uutta zairea</displayName>
-				<symbol>ZRN</symbol>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairen zaire</displayName>
-				<displayName count="one">Zairen zaire</displayName>
-				<displayName count="other">Zairen zairea</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwen dollari</displayName>
-				<displayName count="one">Zimbabwen dollari</displayName>
-				<displayName count="other">Zimbabwen dollaria</displayName>
-				<symbol>ZWD</symbol>
-			</currency>
-			<currency type="ZWL">
-				<displayName>Zimbabwen dollari (2009)</displayName>
-				<displayName count="one">Zimbabwen dollari (2009)</displayName>
-				<displayName count="other">Zimbabwen dollaria (2009)</displayName>
-			</currency>
-			<currency type="ZWR">
-				<displayName>Zimbabwen dollari (2008)</displayName>
-				<displayName count="one">Zimbabwen dollari (2008)</displayName>
-				<displayName count="other">Zimbabwen dollaria (2008)</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} päivä</unitPattern>
-			<unitPattern count="other">{0} päivää</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} tunti</unitPattern>
-			<unitPattern count="other">{0} tuntia</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuutti</unitPattern>
-			<unitPattern count="other">{0} minuuttia</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} kuukausi</unitPattern>
-			<unitPattern count="other">{0} kuukautta</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekunti</unitPattern>
-			<unitPattern count="other">{0} sekuntia</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} viikko</unitPattern>
-			<unitPattern count="other">{0} viikkoa</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} vuosi</unitPattern>
-			<unitPattern count="other">{0} vuotta</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>kyllä:kylla:k</yesstr>
-			<nostr>ei:e</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fi_FI.xml b/airtime_mvc/library/Zend/Locale/Data/fi_FI.xml
deleted file mode 100644
index e980bde8e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fi_FI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fi"/>
-		<territory type="FI"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fil.xml b/airtime_mvc/library/Zend/Locale/Data/fil.xml
deleted file mode 100644
index e997b57fc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fil.xml
+++ /dev/null
@@ -1,1009 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="fil"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikaans</language>
-			<language type="am">Amharic</language>
-			<language type="ar">Arabic</language>
-			<language type="as">Assamese</language>
-			<language type="az">Azerbaijani</language>
-			<language type="be">Belarusian</language>
-			<language type="bg">Bulgarian</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Bengali; Bangla</language>
-			<language type="br">Breton</language>
-			<language type="bs">Bosnian</language>
-			<language type="ca">Catalan</language>
-			<language type="cs">Czech</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Danish</language>
-			<language type="de">Aleman</language>
-			<language type="el">Griyego</language>
-			<language type="en">Ingles</language>
-			<language type="en_GB">Ingles (UK)</language>
-			<language type="en_US">Ingles (US)</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Espanyol</language>
-			<language type="et">Estonian</language>
-			<language type="eu">Basque</language>
-			<language type="fa">Persian</language>
-			<language type="fi">Finnish</language>
-			<language type="fil">Filipino</language>
-			<language type="fo">Faroeso</language>
-			<language type="fr">Pranses</language>
-			<language type="fy">Prisian</language>
-			<language type="ga">Irish</language>
-			<language type="gd">Scots Gaelic</language>
-			<language type="gl">Galician</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Gujarati</language>
-			<language type="he">Hebreo</language>
-			<language type="hi">Hindu</language>
-			<language type="hr">Croatian</language>
-			<language type="hu">Hungarian</language>
-			<language type="hy">Armenian</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesian</language>
-			<language type="ie">Interlingue</language>
-			<language type="is">Icelandic</language>
-			<language type="it">Italyano</language>
-			<language type="ja">Japanese</language>
-			<language type="jv">Javanese</language>
-			<language type="ka">Georgian</language>
-			<language type="km">Khmer</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korean</language>
-			<language type="ku">Kurdish</language>
-			<language type="ky">Kirghiz</language>
-			<language type="la">Latin</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Lao</language>
-			<language type="lt">Lithuanian</language>
-			<language type="lv">Latvian</language>
-			<language type="mk">Macedonian</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolian</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malay</language>
-			<language type="mt">Maltese</language>
-			<language type="ne">Nepali</language>
-			<language type="nl">Olandes</language>
-			<language type="nn">Norwegian Nynorsk</language>
-			<language type="no">Norwegian</language>
-			<language type="oc">Occitan</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Punjabi</language>
-			<language type="pl">Polish</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portuges</language>
-			<language type="pt_BR">Portuges (Brasil)</language>
-			<language type="rm">Rhaeto-Romance</language>
-			<language type="ro">Romanian</language>
-			<language type="ru">Ruso</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sd">Sindhi</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="si">Sinhalese</language>
-			<language type="sk">Eslobak</language>
-			<language type="sl">Eslobenyan</language>
-			<language type="so">Somali</language>
-			<language type="sq">Albanian</language>
-			<language type="sr">Serbiran</language>
-			<language type="st">Sesoto</language>
-			<language type="su">Taga Sundan</language>
-			<language type="sv">Suwiso</language>
-			<language type="sw">Swahili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Turkmen</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Turko</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Ukranian</language>
-			<language type="und">und</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbeko</language>
-			<language type="vi">Vietnamese</language>
-			<language type="wo">Wolof</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Yiddish</language>
-			<language type="zh">zh</language>
-			<language type="zh_Hans">Intsik (Pinadali)</language>
-			<language type="zh_Hant">Intsik (Tradisyunal)</language>
-			<language type="zu">Zulu</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arab</script>
-			<script type="Armi">Armi</script>
-			<script type="Armn">Armn</script>
-			<script type="Avst">Avst</script>
-			<script type="Bali">Bali</script>
-			<script type="Batk">Batk</script>
-			<script type="Beng">Beng</script>
-			<script type="Blis">Blis</script>
-			<script type="Bopo">Bopo</script>
-			<script type="Brah">Brah</script>
-			<script type="Brai">Brai</script>
-			<script type="Bugi">Bugi</script>
-			<script type="Buhd">Buhd</script>
-			<script type="Cakm">Cakm</script>
-			<script type="Cari">Cari</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cher</script>
-			<script type="Cirt">Cirt</script>
-			<script type="Copt">Copt</script>
-			<script type="Cprt">Cprt</script>
-			<script type="Cyrl">Cyrl</script>
-			<script type="Deva">Deva</script>
-			<script type="Dsrt">Dsrt</script>
-			<script type="Egyd">Egyd</script>
-			<script type="Egyh">Egyh</script>
-			<script type="Egyp">Egyp</script>
-			<script type="Ethi">Ethi</script>
-			<script type="Geok">Geok</script>
-			<script type="Geor">Geor</script>
-			<script type="Glag">Glag</script>
-			<script type="Goth">Goth</script>
-			<script type="Grek">Grek</script>
-			<script type="Gujr">Gujr</script>
-			<script type="Guru">Guru</script>
-			<script type="Hang">Hang</script>
-			<script type="Hani">Hani</script>
-			<script type="Hano">Hano</script>
-			<script type="Hans">Hans</script>
-			<script type="Hant">Hant</script>
-			<script type="Hebr">Hebr</script>
-			<script type="Hira">Hira</script>
-			<script type="Hrkt">Hrkt</script>
-			<script type="Inds">Inds</script>
-			<script type="Java">Java</script>
-			<script type="Jpan">Jpan</script>
-			<script type="Kali">Kali</script>
-			<script type="Kana">Kana</script>
-			<script type="Khar">Khar</script>
-			<script type="Khmr">Khmr</script>
-			<script type="Knda">Knda</script>
-			<script type="Kore">Kore</script>
-			<script type="Kthi">Kthi</script>
-			<script type="Lana">Lana</script>
-			<script type="Laoo">Laoo</script>
-			<script type="Latf">Latf</script>
-			<script type="Latg">Latg</script>
-			<script type="Latn">Latn</script>
-			<script type="Lepc">Lepc</script>
-			<script type="Limb">Limb</script>
-			<script type="Lina">Lina</script>
-			<script type="Linb">Linb</script>
-			<script type="Lyci">Lyci</script>
-			<script type="Lydi">Lydi</script>
-			<script type="Mand">Mand</script>
-			<script type="Mani">Mani</script>
-			<script type="Maya">Maya</script>
-			<script type="Mero">Mero</script>
-			<script type="Mlym">Mlym</script>
-			<script type="Mong">Mong</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Mtei</script>
-			<script type="Mymr">Mymr</script>
-			<script type="Nkoo">Nkoo</script>
-			<script type="Phlv">Phlv</script>
-			<script type="Qaai">Qaai</script>
-			<script type="Syre">Syre</script>
-			<script type="Syrn">Syrn</script>
-			<script type="Zxxx">Zxxx</script>
-			<script type="Zyyy">Zyyy</script>
-			<script type="Zzzz">Zzzz</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mundo</territory>
-			<territory type="002">Africa</territory>
-			<territory type="003">North America</territory>
-			<territory type="005">South America</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Kanlurang Africa</territory>
-			<territory type="013">Gitnang Amerika</territory>
-			<territory type="014">Silangang Africa</territory>
-			<territory type="015">Hilagang Africa</territory>
-			<territory type="017">Gitnang Africa</territory>
-			<territory type="018">Katimugang Africa</territory>
-			<territory type="019">Americas</territory>
-			<territory type="021">Hilagang Amerika</territory>
-			<territory type="029">Carribbean</territory>
-			<territory type="030">Silangang Asya</territory>
-			<territory type="034">Katimugang Asya</territory>
-			<territory type="035">Timog-Silangang Asya</territory>
-			<territory type="039">Katimugang Europa</territory>
-			<territory type="053">Australia at New Zealand</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Rehiyong Micronesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Timog-Gitnang Asya</territory>
-			<territory type="142">Asya</territory>
-			<territory type="143">Gitnang Asya</territory>
-			<territory type="145">Kanlurang Asya</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Silangang Europa</territory>
-			<territory type="154">Hilagang Europa</territory>
-			<territory type="155">Kanlurang Europa</territory>
-			<territory type="419">Latin America at ang Caribbean</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">United Arab Emirates</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua at Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antartica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">American Samoa</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Aland Islands</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia and Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgium</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet Island</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Cocos Islands</territory>
-			<territory type="CD">Congo - Kinshasa</territory>
-			<territory type="CF">Central African Republic</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Switzerland</territory>
-			<territory type="CI">Côte d'Ivoire</territory>
-			<territory type="CK">Cook Islands</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Cameroon</territory>
-			<territory type="CN">Tsina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia at Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cape Verde</territory>
-			<territory type="CX">Christmas Island</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Czech Republic</territory>
-			<territory type="DE">Alemaya</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Denmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominican Republic</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Ehipto</territory>
-			<territory type="EH">Western Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Espanya</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falkland Islands</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Faroe Islands</territory>
-			<territory type="FR">Pranses</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">French Guiana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GL">Greenland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GQ">Equatorial Guinea</territory>
-			<territory type="GR">Griyego</territory>
-			<territory type="GS">South Georgia and the South Sandwich Islands</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="HK">Hong Kong SAR China</territory>
-			<territory type="HM">Heard Island and McDonald Islands</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungary</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Ireland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">British Indian Ocean Territory</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Iceland</territory>
-			<territory type="IT">Italya</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kyrgyzstan</territory>
-			<territory type="KH">Cambodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts and Nevis</territory>
-			<territory type="KP">Hilagang Korea</territory>
-			<territory type="KR">Timog Korea</territory>
-			<territory type="KY">Cayman Islands</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lebanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithuania</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Morocco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Marshall Islands</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao</territory>
-			<territory type="MP">Northern Mariana Islands</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mehiko</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">New Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Island</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Netherlands</territory>
-			<territory type="NO">Norway</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">French Polynesia</territory>
-			<territory type="PG">Papua New Guinea</territory>
-			<territory type="PH">Pilipinas</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poland</territory>
-			<territory type="PM">Saint Pierre at Miquelon</territory>
-			<territory type="PS">Palestine</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QO">Malayong bahagi ng Oceania</territory>
-			<territory type="QU">European Union</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi Arabya</territory>
-			<territory type="SB">Solomon Islands</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard and Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tome and Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks and Caicos Islands</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">French Southern Territories</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tajikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">East Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkey</territory>
-			<territory type="TT">Trinidad and Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">United States minor outlying islands</territory>
-			<territory type="US">United States</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatican City</territory>
-			<territory type="VC">Saint Vincent and the Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">British Virgin Islands</territory>
-			<territory type="VI">U.S. Virgin Islands</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis and Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="ZA">Timog Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Hindi kilala o Hindi wastong Rehiyon</territory>
-		</territories>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-n ñ {ng} o-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à â é è ê í ì î ó ò ô ú ù û]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ene</month>
-							<month type="2">Peb</month>
-							<month type="3">Mar</month>
-							<month type="4">Abr</month>
-							<month type="5">May</month>
-							<month type="6">Hun</month>
-							<month type="7">Hul</month>
-							<month type="8">Ago</month>
-							<month type="9">Set</month>
-							<month type="10">Okt</month>
-							<month type="11">Nob</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Enero</month>
-							<month type="2">Pebrero</month>
-							<month type="3">Marso</month>
-							<month type="4">Abril</month>
-							<month type="5">Mayo</month>
-							<month type="6">Hunyo</month>
-							<month type="7">Hulyo</month>
-							<month type="8">Agosto</month>
-							<month type="9">Setyembre</month>
-							<month type="10">Oktubre</month>
-							<month type="11">Nobyembre</month>
-							<month type="12">Disyembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">E</month>
-							<month type="2">P</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">H</month>
-							<month type="7">H</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Enero</month>
-							<month type="2">Pebrero</month>
-							<month type="3">Marso</month>
-							<month type="4">Abril</month>
-							<month type="5">Mayo</month>
-							<month type="6">Hunyo</month>
-							<month type="7">Hulyo</month>
-							<month type="8">Agosto</month>
-							<month type="9">Setyembre</month>
-							<month type="10">Oktubre</month>
-							<month type="11">Nobyembre</month>
-							<month type="12">Disyembre</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Lin</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Mye</day>
-							<day type="thu">Huw</day>
-							<day type="fri">Bye</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Linggo</day>
-							<day type="mon">Lunes</day>
-							<day type="tue">Martes</day>
-							<day type="wed">Miyerkules</day>
-							<day type="thu">Huwebes</day>
-							<day type="fri">Biyernes</day>
-							<day type="sat">Sabado</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="wed">Miy</day>
-							<day type="fri">Biy</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">L</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">H</day>
-							<day type="fri">B</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM dd y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">yy-MM</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Taon</displayName>
-					</field>
-					<field type="month">
-						<displayName>Buwan</displayName>
-					</field>
-					<field type="week">
-						<displayName>Linggo</displayName>
-					</field>
-					<field type="day">
-						<displayName>Araw</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Araw ng Linggo</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Oras</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuto</displayName>
-					</field>
-					<field type="second">
-						<displayName>Segundo</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto - Novo</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Pasko.</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilisi.</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Conarky</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Maseru.</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dushanbe.</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port nang Espanya</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Harare.</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>United Arab Emirates Dirham</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentine Peso</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australian Dollar</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgarian Lev</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivian Boliviano</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Canadian Dollar</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Swiss Francs</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilean Peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Colombian Peso</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Czech Koruna</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Deutsche Marks</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Denmark Kroner</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estonian Kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptian Pound</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euros</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>French Franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>British Pounds Sterling</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hong Kong Dollars</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Croatian Kuna</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Hungarian Forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonesian Rupiah</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Israeli Shekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indian Rupee</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanese Yen</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>South Korean Won</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lithuanian Litas</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Moroccan Dirham</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexico Peso</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysian Ringgit</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norwegian Kroner</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>New Zealand Dollars</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruvian Nuevo Sol</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Philippine Peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistan Rupee</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polish NewZloty</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Romanian Leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbian Dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russian Ruble</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi Riyal</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Sweden Kronor</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapore Dollars</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovenian Tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovak Koruna</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thai Baht</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Turkish Lira</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>New Taiwan Dollar</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US Dollar</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuela Bolivar</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>XXX</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>South African Rand</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} araw</unitPattern>
-			<unitPattern count="other">{0} araw</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} oras</unitPattern>
-			<unitPattern count="other">{0} oras</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuto</unitPattern>
-			<unitPattern count="other">{0} minuto</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} buwan</unitPattern>
-			<unitPattern count="other">{0} buwan</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segundo</unitPattern>
-			<unitPattern count="other">{0} segundo</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} linggo</unitPattern>
-			<unitPattern count="other">{0} linggo</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} taon</unitPattern>
-			<unitPattern count="other">{0} taon</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fil_PH.xml b/airtime_mvc/library/Zend/Locale/Data/fil_PH.xml
deleted file mode 100644
index 8395d92d7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fil_PH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fil"/>
-		<territory type="PH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fo.xml b/airtime_mvc/library/Zend/Locale/Data/fo.xml
deleted file mode 100644
index b16a30eb6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fo.xml
+++ /dev/null
@@ -1,794 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.72 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="fo"/>
-	</identity>
-	<fallback>is da sv en</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">afríska</language>
-			<language type="am">amhariskt</language>
-			<language type="ar">arabiskt</language>
-			<language type="as">assamesiskt</language>
-			<language type="az">azerbaijaniskt</language>
-			<language type="be">belarussiskt</language>
-			<language type="bg">bulgarskum</language>
-			<language type="bh">bihariskt</language>
-			<language type="bn">bengaliskt</language>
-			<language type="br">bretonskt</language>
-			<language type="bs">bosniskt</language>
-			<language type="ca">katalanskt</language>
-			<language type="cs">kekkiskt</language>
-			<language type="cy">valisiskt</language>
-			<language type="da">danskt</language>
-			<language type="de">týskt</language>
-			<language type="el">grikskt</language>
-			<language type="en">enskt</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spanskt</language>
-			<language type="et">estlendskt</language>
-			<language type="eu">baskiskt</language>
-			<language type="fa">persiskt</language>
-			<language type="fi">finskt</language>
-			<language type="fil">tagalog</language>
-			<language type="fo">føroyskt</language>
-			<language type="fr">franskt</language>
-			<language type="fy">frisiskt</language>
-			<language type="ga">írskt</language>
-			<language type="gd">skotskt gæliskt</language>
-			<language type="gl">galliskt</language>
-			<language type="gn">guarani</language>
-			<language type="gu">gujariti</language>
-			<language type="he">hebraiskt</language>
-			<language type="hi">hindi</language>
-			<language type="hr">kroatiskum</language>
-			<language type="hu">ungarskt</language>
-			<language type="hy">armenskum</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indonesiskum</language>
-			<language type="ie">interlingue</language>
-			<language type="is">íslendskt</language>
-			<language type="it">italskt</language>
-			<language type="ja">japanskt</language>
-			<language type="jv">javanesiskt</language>
-			<language type="ka">georgiskt</language>
-			<language type="km">kambodjanskt</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreanskt</language>
-			<language type="ku">kurdiskt</language>
-			<language type="ky">kyrgyz</language>
-			<language type="la">latín</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laothian</language>
-			<language type="lt">litavskt</language>
-			<language type="lv">latviskt</language>
-			<language type="mk">makedonskt</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongoliskt</language>
-			<language type="mr">marathiskt</language>
-			<language type="ms">malay</language>
-			<language type="mt">maltesiskt</language>
-			<language type="nb">norskt bokmál</language>
-			<language type="ne">nepalskt</language>
-			<language type="nl">hollendskt</language>
-			<language type="nn">nýnorskt</language>
-			<language type="no">norskt</language>
-			<language type="oc">occitan</language>
-			<language type="or">oriya</language>
-			<language type="pa">punjabi</language>
-			<language type="pl">polskt</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugisiskt</language>
-			<language type="ro">romanskt</language>
-			<language type="ru">russiskt</language>
-			<language type="sa">sanskrit</language>
-			<language type="sd">sindhi</language>
-			<language type="sh">serbokroatiskt</language>
-			<language type="si">sinhalesiskt</language>
-			<language type="sk">slovakiskum</language>
-			<language type="sl">slovenskum</language>
-			<language type="so">somaliskt</language>
-			<language type="sq">albanskt</language>
-			<language type="sr">serbiskum</language>
-			<language type="st">sesotho</language>
-			<language type="su">sundanesiskt</language>
-			<language type="sv">svenskt</language>
-			<language type="sw">swahili</language>
-			<language type="ta">tamilskt</language>
-			<language type="te">telugu</language>
-			<language type="th">thailendskt</language>
-			<language type="ti">tigrinya</language>
-			<language type="tk">turkmenskt</language>
-			<language type="tlh">klingonskt</language>
-			<language type="tr">turkiskt</language>
-			<language type="tw">twi</language>
-			<language type="ug">uighur</language>
-			<language type="uk">ukrainskt</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbekiskt</language>
-			<language type="vi">vietnamesiskt</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">jiddiskt</language>
-			<language type="zh">kinesískt</language>
-			<language type="zu">sulu</language>
-		</languages>
-		<territories>
-			<territory type="001">heimur</territory>
-			<territory type="002">Africa</territory>
-			<territory type="003">Norðuramerika</territory>
-			<territory type="005">Suðuramerika</territory>
-			<territory type="009">Kyrrahavsoyggjarnar</territory>
-			<territory type="011">Vesturafrika</territory>
-			<territory type="013">Sentralamerika</territory>
-			<territory type="014">Eysturafrika</territory>
-			<territory type="015">Norðurafrika</territory>
-			<territory type="017">Miðafrika</territory>
-			<territory type="018">Suður Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Amerika nor∂ur Meksiko</territory>
-			<territory type="029">Karibia</territory>
-			<territory type="030">Eysturasia</territory>
-			<territory type="034">Suðurasia</territory>
-			<territory type="035">Suðureysturasia</territory>
-			<territory type="039">Suðurevropa</territory>
-			<territory type="053">Avstralia og Nýsæland</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Mikronesiske regionen</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Suðursentralasia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Sentralasia</territory>
-			<territory type="145">Vesturasia</territory>
-			<territory type="150">Evropa</territory>
-			<territory type="151">Eysturevropa</territory>
-			<territory type="154">Norðurevropa</territory>
-			<territory type="155">Vesturevropa</territory>
-			<territory type="419">Latínamerika og Karibia</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Sameindu Emirríkini</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua og Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Niðurlendsku Antilloyggjar</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikanska Sámoa</territory>
-			<territory type="AT">Eysturríki</territory>
-			<territory type="AU">Avstralia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">�land</territory>
-			<territory type="AZ">Aserbajdsjan</territory>
-			<territory type="BA">Bosnia-Hersegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesj</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasilia</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Bouvetoy</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Hvítarussland</territory>
-			<territory type="BZ">Belis</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosoyggjar</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CF">Miðafrikalýðveldið</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Sveis</territory>
-			<territory type="CI">Fílabeinsstrondin</territory>
-			<territory type="CK">Cooksoyggjar</territory>
-			<territory type="CL">Kili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Kolombia</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Grønhøvdaoyggjarnar</territory>
-			<territory type="CX">Jólaoyggjin</territory>
-			<territory type="CY">Kýpros</territory>
-			<territory type="CZ">Kekkia</territory>
-			<territory type="DE">Týskland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danmørk</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Domingo lýðveldið</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egyptaland</territory>
-			<territory type="EH">Vestursahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falklandsoyggjar</territory>
-			<territory type="FM">Mikronesia</territory>
-			<territory type="FO">Føroyar</territory>
-			<territory type="FR">Frakland</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Stóra Bretland</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Fransk Gujana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grønland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvator Guinea</territory>
-			<territory type="GR">Grikkaland</territory>
-			<territory type="GS">Suðurgeorgia</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea Bissau</territory>
-			<territory type="GY">Gujana</territory>
-			<territory type="HK">Hongkong</territory>
-			<territory type="HM">Heard- og McDonald-oyggjar</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">�rland</territory>
-			<territory type="IL">�srael</territory>
-			<territory type="IM">Mann</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Bretsku Indiahavsoyggjar</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">�sland</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jameika</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenja</territory>
-			<territory type="KG">Kirgisia</territory>
-			<territory type="KH">Kambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorooyggjarnar</territory>
-			<territory type="KN">Saint Kitts og Nevis</territory>
-			<territory type="KP">Norður-Korea</territory>
-			<territory type="KR">Suður-Korea</territory>
-			<territory type="KW">Kuvait</territory>
-			<territory type="KY">Caymanoyggjar</territory>
-			<territory type="KZ">Kasakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lusia</territory>
-			<territory type="LI">Liktenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litava</territory>
-			<territory type="LU">Luksemborg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalloyggjarnar</territory>
-			<territory type="MK">Makedónia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Burma</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makao</territory>
-			<territory type="MP">Norðurmarianoyggjar</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Móritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Móritius</territory>
-			<territory type="MV">Maldivuoyggjarnar</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Maleisia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Ný-Kaledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkoy</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Niðurlond</territory>
-			<territory type="NO">Noreg</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Ný Sæland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Franska Polynesia</territory>
-			<territory type="PG">Papua Nýguinea</territory>
-			<territory type="PH">Filipsoyggjar</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Pólland</territory>
-			<territory type="PM">Saint-Pierre og Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinskt territorium</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguei</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QU">EU</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumenia</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Russland</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Arábia</territory>
-			<territory type="SB">Sálomonoyggjarnar</territory>
-			<territory type="SC">Seyskelloyggjarnar</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Svøríki</territory>
-			<territory type="SG">Singapor</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard og Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome og Prinsipi</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Svasiland</territory>
-			<territory type="TC">Turks- og Caicosoyggjar</territory>
-			<territory type="TD">Kjad</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Teiland</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Eystur Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunesia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkaland</territory>
-			<territory type="TT">Trinidad og Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Teivan</territory>
-			<territory type="TZ">Tansania</territory>
-			<territory type="UA">Ukreina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="US">Sambandsríki Amerika</territory>
-			<territory type="UY">Uruguei</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vinsent og Grenadinoyggjar</territory>
-			<territory type="VE">Venesuela</territory>
-			<territory type="VG">Stóra Bretlands Jómfrúoyggjar</territory>
-			<territory type="VI">Sambandsríki Amerikas Jómfrúoyggjar</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis og Futuna</territory>
-			<territory type="WS">Sámoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Suðurafrika</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabvi</territory>
-		</territories>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">SI-einingar</measurementSystemName>
-			<measurementSystemName type="US">US-einingar</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b d ð e-i í j-o ó p r-u ú v x y ý æ ø]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q w z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>�</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>’</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">mai</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">mars</month>
-							<month type="4">apríl</month>
-							<month type="5">mai</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sun</day>
-							<day type="mon">mán</day>
-							<day type="tue">týs</day>
-							<day type="wed">mik</day>
-							<day type="thu">hós</day>
-							<day type="fri">frí</day>
-							<day type="sat">ley</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sunnudagur</day>
-							<day type="mon">mánadagur</day>
-							<day type="tue">týsdagur</day>
-							<day type="wed">mikudagur</day>
-							<day type="thu">hósdagur</day>
-							<day type="fri">fríggjadagur</day>
-							<day type="sat">leygardagur</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">fyrir Krist</era>
-						<era type="1">eftir Krist</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd-MM - dd-MM</greatestDifference>
-							<greatestDifference id="M">dd-MM - dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd-MM - E dd-MM</greatestDifference>
-							<greatestDifference id="M">E dd-MM - E dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d. - E d. MMM</greatestDifference>
-							<greatestDifference id="M">E d. MMM - E d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM-yy - MM-yy</greatestDifference>
-							<greatestDifference id="y">MM-yy - MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">dd-MM-yy - dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd - E dd MMM y</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM y</greatestDifference>
-							<greatestDifference id="y">E dd MMM y - E dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>tímabil</displayName>
-					</field>
-					<field type="year">
-						<displayName>ár</displayName>
-					</field>
-					<field type="month">
-						<displayName>mánuður</displayName>
-					</field>
-					<field type="week">
-						<displayName>vika</displayName>
-					</field>
-					<field type="day">
-						<displayName>dagur</displayName>
-						<relative type="-3">í fyrrafyrradag</relative>
-						<relative type="-2">í fyrradag</relative>
-						<relative type="-1">í gær</relative>
-						<relative type="0">í dag</relative>
-						<relative type="1">á morgum</relative>
-						<relative type="2">í overmorgen</relative>
-						<relative type="3">í overovermorgen</relative>
-					</field>
-					<field type="weekday">
-						<displayName>vikudagur</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>f.h./e.h.</displayName>
-					</field>
-					<field type="hour">
-						<displayName>klukkustund</displayName>
-					</field>
-					<field type="minute">
-						<displayName>mínúta</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>tímabelti</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{0} ({1})</fallbackFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>¤¤¤</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="DKK">
-				<symbol>kr</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dage</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} tíma</unitPattern>
-			<unitPattern count="other">{0} tímar</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minuttir</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mánaði</unitPattern>
-			<unitPattern count="other">{0} mánaðir</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekund</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} vika</unitPattern>
-			<unitPattern count="other">{0} vikur</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} ár</unitPattern>
-			<unitPattern count="other">{0} ár</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>já:j</yesstr>
-			<nostr>nei:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fo_FO.xml b/airtime_mvc/library/Zend/Locale/Data/fo_FO.xml
deleted file mode 100644
index 736383708..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fo_FO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fo"/>
-		<territory type="FO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr.xml b/airtime_mvc/library/Zend/Locale/Data/fr.xml
deleted file mode 100644
index e427afbfb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr.xml
+++ /dev/null
@@ -1,5457 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.148 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="fr"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhaze</language>
-			<language type="ace">aceh</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghéen</language>
-			<language type="ae">avestique</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">langue afro-asiatique</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">aïnou</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadien</language>
-			<language type="ale">aléoute</language>
-			<language type="alg">langue algonquienne</language>
-			<language type="alt">altaï du Sud</language>
-			<language type="am">amharique</language>
-			<language type="an">aragonais</language>
-			<language type="ang">ancien anglais</language>
-			<language type="anp">angika</language>
-			<language type="apa">langue apache</language>
-			<language type="ar">arabe</language>
-			<language type="arc">araméen</language>
-			<language type="arn">araukan</language>
-			<language type="arp">arapaho</language>
-			<language type="art">langue artificielle</language>
-			<language type="arw">arawak</language>
-			<language type="as">assamais</language>
-			<language type="ast">asturien</language>
-			<language type="ath">langue athapascane</language>
-			<language type="aus">langue australienne</language>
-			<language type="av">avar</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">azéri</language>
-			<language type="ba">bachkir</language>
-			<language type="bad">banda</language>
-			<language type="bai">langue bamilékée</language>
-			<language type="bal">baloutchi</language>
-			<language type="ban">balinais</language>
-			<language type="bas">bassa</language>
-			<language type="bat">langue balte</language>
-			<language type="be">biélorusse</language>
-			<language type="bej">bedja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berbère</language>
-			<language type="bg">bulgare</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bichelamar</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantou</language>
-			<language type="bo">tibétain</language>
-			<language type="br">breton</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosniaque</language>
-			<language type="btk">batak</language>
-			<language type="bua">bouriate</language>
-			<language type="bug">bugi</language>
-			<language type="byn">blin</language>
-			<language type="ca">catalan</language>
-			<language type="cad">caddo</language>
-			<language type="cai">langue amérindienne centrale</language>
-			<language type="car">caribe</language>
-			<language type="cau">langue caucasienne</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tchétchène</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">langue celtique</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">tchaghataï</language>
-			<language type="chk">chuuk</language>
-			<language type="chm">mari</language>
-			<language type="chn">jargon chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">langue chame</language>
-			<language type="co">corse</language>
-			<language type="cop">copte</language>
-			<language type="cpe">créole ou pidgin anglais</language>
-			<language type="cpf">créole ou pidgin français</language>
-			<language type="cpp">créole ou pidgin portugais</language>
-			<language type="cr">cree</language>
-			<language type="crh">turc de Crimée</language>
-			<language type="crp">créole ou pidgin</language>
-			<language type="cs">tchèque</language>
-			<language type="csb">kachoube</language>
-			<language type="cu">slavon d’église</language>
-			<language type="cus">langue couchitique</language>
-			<language type="cv">tchouvache</language>
-			<language type="cy">gallois</language>
-			<language type="da">danois</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">allemand</language>
-			<language type="de_AT">allemand autrichien</language>
-			<language type="de_CH">allemand suisse</language>
-			<language type="del">delaware</language>
-			<language type="den">slavey</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">langue dravidienne</language>
-			<language type="dsb">bas-sorabe</language>
-			<language type="dua">douala</language>
-			<language type="dum">moyen néerlandais</language>
-			<language type="dv">maldivien</language>
-			<language type="dyu">dioula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">éwé</language>
-			<language type="efi">efik</language>
-			<language type="egy">égyptien ancien</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grec</language>
-			<language type="elx">élamite</language>
-			<language type="en">anglais</language>
-			<language type="en_AU">anglais australien</language>
-			<language type="en_CA">anglais canadien</language>
-			<language type="en_GB">anglais britannique</language>
-			<language type="en_US">anglais américain</language>
-			<language type="enm">moyen anglais</language>
-			<language type="eo">espéranto</language>
-			<language type="es">espagnol</language>
-			<language type="es_419">espagnol latino-américain</language>
-			<language type="es_ES">espagnol ibérique</language>
-			<language type="et">estonien</language>
-			<language type="eu">basque</language>
-			<language type="ewo">éwondo</language>
-			<language type="fa">persan</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">peul</language>
-			<language type="fi">finnois</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">langue finno-ougrienne</language>
-			<language type="fj">fidjien</language>
-			<language type="fo">féroïen</language>
-			<language type="fon">fon</language>
-			<language type="fr">français</language>
-			<language type="fr_CA">français canadien</language>
-			<language type="fr_CH">français suisse</language>
-			<language type="frm">moyen français</language>
-			<language type="fro">ancien français</language>
-			<language type="frr">frison du Nord</language>
-			<language type="frs">frison oriental</language>
-			<language type="fur">frioulan</language>
-			<language type="fy">frison</language>
-			<language type="ga">irlandais</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">gaélique écossais</language>
-			<language type="gem">langue germanique</language>
-			<language type="gez">guèze</language>
-			<language type="gil">gilbertais</language>
-			<language type="gl">galicien</language>
-			<language type="gmh">moyen haut-allemand</language>
-			<language type="gn">guarani</language>
-			<language type="goh">ancien haut allemand</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotique</language>
-			<language type="grb">grebo</language>
-			<language type="grc">grec ancien</language>
-			<language type="gsw">alémanique</language>
-			<language type="gu">goudjarâtî</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichʼin</language>
-			<language type="ha">haoussa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaïen</language>
-			<language type="he">hébreu</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hittite</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croate</language>
-			<language type="hsb">haut-sorabe</language>
-			<language type="ht">haïtien</language>
-			<language type="hu">hongrois</language>
-			<language type="hup">hupa</language>
-			<language type="hy">arménien</language>
-			<language type="hz">héréro</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonésien</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">yi de Sichuan</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaq</language>
-			<language type="ilo">ilokano</language>
-			<language type="inc">langue indo-aryenne</language>
-			<language type="ine">langue indo-européenne</language>
-			<language type="inh">ingouche</language>
-			<language type="io">ido</language>
-			<language type="ira">langue iranienne</language>
-			<language type="iro">langue iroquoienne</language>
-			<language type="is">islandais</language>
-			<language type="it">italien</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japonais</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judéo-persan</language>
-			<language type="jrb">judéo-arabe</language>
-			<language type="jv">javanais</language>
-			<language type="ka">géorgien</language>
-			<language type="kaa">karakalpak</language>
-			<language type="kab">kabyle</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardin</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">langue khoïsan</language>
-			<language type="kho">khotanais</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazakh</language>
-			<language type="kl">groenlandais</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kiMboundou</language>
-			<language type="kn">kannada</language>
-			<language type="ko">coréen</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kusaien</language>
-			<language type="kpe">kpellé</language>
-			<language type="kr">kanouri</language>
-			<language type="krc">karatchaï balkar</language>
-			<language type="krl">carélien</language>
-			<language type="kro">krou</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kâshmîrî</language>
-			<language type="ku">kurde</language>
-			<language type="kum">koumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">cornique</language>
-			<language type="ky">kirghize</language>
-			<language type="la">latin</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxembourgeois</language>
-			<language type="lez">lezghien</language>
-			<language type="lg">ganda</language>
-			<language type="li">limbourgeois</language>
-			<language type="ln">lingala</language>
-			<language type="lo">lao</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituanien</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">letton</language>
-			<language type="mad">madurais</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makassar</language>
-			<language type="man">mandingue</language>
-			<language type="map">malayo-polynésien</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksa</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mendé</language>
-			<language type="mg">malgache</language>
-			<language type="mga">moyen irlandais</language>
-			<language type="mh">marshall</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">langue diverse</language>
-			<language type="mk">macédonien</language>
-			<language type="mkh">langue mon-khmère</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">mandchou</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">langue manobo</language>
-			<language type="mo">moldave</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">moré</language>
-			<language type="mr">marathe</language>
-			<language type="ms">malais</language>
-			<language type="mt">maltais</language>
-			<language type="mul">multilingue</language>
-			<language type="mun">langue mounda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandais</language>
-			<language type="mwr">marwarî</language>
-			<language type="my">birman</language>
-			<language type="myn">langue maya</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauruan</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">langue amérindienne du Nord</language>
-			<language type="nap">napolitain</language>
-			<language type="nb">norvégien bokmål</language>
-			<language type="nd">ndébélé du Nord</language>
-			<language type="nds">bas-allemand</language>
-			<language type="ne">népalais</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">langue nigéro-congolaise</language>
-			<language type="niu">niué</language>
-			<language type="nl">néerlandais</language>
-			<language type="nl_BE">néerlandais belge</language>
-			<language type="nn">norvégien nynorsk</language>
-			<language type="no">norvégien</language>
-			<language type="nog">nogaï</language>
-			<language type="non">vieux norrois</language>
-			<language type="nqo">n’ko</language>
-			<language type="nr">ndébélé du Sud</language>
-			<language type="nso">sotho du Nord</language>
-			<language type="nub">langue nubienne</language>
-			<language type="nv">navaho</language>
-			<language type="nwc">newarî classique</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankolé</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzema</language>
-			<language type="oc">occitan</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossète</language>
-			<language type="osa">osage</language>
-			<language type="ota">turc ottoman</language>
-			<language type="oto">langue otomangue</language>
-			<language type="pa">pendjabi</language>
-			<language type="paa">langue papoue</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampangan</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palau</language>
-			<language type="peo">persan ancien</language>
-			<language type="phi">langue philippine</language>
-			<language type="phn">phénicien</language>
-			<language type="pi">pali</language>
-			<language type="pl">polonais</language>
-			<language type="pon">pohnpei</language>
-			<language type="pra">langues prâkrit</language>
-			<language type="pro">provençal ancien</language>
-			<language type="ps">pachto</language>
-			<language type="pt">portugais</language>
-			<language type="pt_BR">portugais brésilien</language>
-			<language type="pt_PT">portugais ibérique</language>
-			<language type="qu">langue quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongien</language>
-			<language type="rm">rhéto-roman</language>
-			<language type="rn">roundi</language>
-			<language type="ro">roumain</language>
-			<language type="roa">langue romane</language>
-			<language type="rom">tzigane</language>
-			<language type="root">racine</language>
-			<language type="ru">russe</language>
-			<language type="rup">valaque</language>
-			<language type="rw">rwanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">iakoute</language>
-			<language type="sai">langue amérindienne du Sud</language>
-			<language type="sal">langue salishenne</language>
-			<language type="sam">araméen samaritain</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santal</language>
-			<language type="sc">sarde</language>
-			<language type="scn">sicilien</language>
-			<language type="sco">écossais</language>
-			<language type="sd">sindhî</language>
-			<language type="se">sami du Nord</language>
-			<language type="sel">selkoupe</language>
-			<language type="sem">langue sémitique</language>
-			<language type="sg">sangho</language>
-			<language type="sga">ancien irlandais</language>
-			<language type="sgn">langue des signes</language>
-			<language type="sh">serbo-croate</language>
-			<language type="shn">shan</language>
-			<language type="si">singhalais</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">langue sioux</language>
-			<language type="sit">langue sino-tibétaine</language>
-			<language type="sk">slovaque</language>
-			<language type="sl">slovène</language>
-			<language type="sla">langue slave</language>
-			<language type="sm">samoan</language>
-			<language type="sma">sami du Sud</language>
-			<language type="smi">langue samie</language>
-			<language type="smj">sami de Lule</language>
-			<language type="smn">sami d’Inari</language>
-			<language type="sms">sami skolt</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninké</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdien</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanais</language>
-			<language type="sr">serbe</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">sérère</language>
-			<language type="ss">swati</language>
-			<language type="ssa">langue nilo-saharienne</language>
-			<language type="st">sesotho</language>
-			<language type="su">soundanais</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">soussou</language>
-			<language type="sux">sumérien</language>
-			<language type="sv">suédois</language>
-			<language type="sw">swahili</language>
-			<language type="syc">syriaque classique</language>
-			<language type="syr">syriaque</language>
-			<language type="ta">tamoul</language>
-			<language type="tai">langue taï</language>
-			<language type="te">télougou</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadjik</language>
-			<language type="th">thaï</language>
-			<language type="ti">tigrigna</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turkmène</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamacheq</language>
-			<language type="tn">tswana</language>
-			<language type="to">tongan</language>
-			<language type="tog">tonga nyasa</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turc</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatar</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">langue tupi</language>
-			<language type="tut">langue altaïque</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitien</language>
-			<language type="tyv">touva</language>
-			<language type="udm">oudmourte</language>
-			<language type="ug">ouïgour</language>
-			<language type="uga">ougaritique</language>
-			<language type="uk">ukrainien</language>
-			<language type="umb">umbundu</language>
-			<language type="und">indéterminé</language>
-			<language type="ur">ourdou</language>
-			<language type="uz">ouzbek</language>
-			<language type="vai">vaï</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamien</language>
-			<language type="vo">volapuk</language>
-			<language type="vot">vote</language>
-			<language type="wa">wallon</language>
-			<language type="wak">langues wakashennes</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">langue sorabe</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmouk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapois</language>
-			<language type="yi">yiddish</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">langues yupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotèque</language>
-			<language type="zbl">symboles Bliss</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">chinois</language>
-			<language type="zh_Hans">chinois simplifié</language>
-			<language type="zh_Hant">chinois traditionnel</language>
-			<language type="znd">zandé</language>
-			<language type="zu">zoulou</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">sans contenu linguistique</language>
-			<language type="zza">zazaki</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabe</script>
-			<script type="Armi">araméen impérial</script>
-			<script type="Armn">arménien</script>
-			<script type="Avst">avestique</script>
-			<script type="Bali">balinais</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengâglî</script>
-			<script type="Blis">symboles Bliss</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brâhmî</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">bouguis</script>
-			<script type="Buhd">bouhide</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">syllabaire autochtone canadien unifié</script>
-			<script type="Cari">carien</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">tchérokî</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">copte</script>
-			<script type="Cprt">syllabaire chypriote</script>
-			<script type="Cyrl">cyrillique</script>
-			<script type="Cyrs">cyrillique (variante slavonne)</script>
-			<script type="Deva">dévanâgarî</script>
-			<script type="Dsrt">déséret</script>
-			<script type="Egyd">démotique égyptien</script>
-			<script type="Egyh">hiératique égyptien</script>
-			<script type="Egyp">hiéroglyphes égyptiens</script>
-			<script type="Ethi">éthiopique</script>
-			<script type="Geok">géorgien khoutsouri</script>
-			<script type="Geor">géorgien</script>
-			<script type="Glag">glagolitique</script>
-			<script type="Goth">gotique</script>
-			<script type="Grek">grec</script>
-			<script type="Gujr">goudjarâtî</script>
-			<script type="Guru">gourmoukhî</script>
-			<script type="Hang">hangûl</script>
-			<script type="Hani">idéogrammes han</script>
-			<script type="Hano">hanounóo</script>
-			<script type="Hans">idéogrammes han simplifiés</script>
-			<script type="Hant">idéogrammes han traditionnels</script>
-			<script type="Hebr">hébreu</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana ou hiragana</script>
-			<script type="Hung">ancien hongrois</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">ancien italique</script>
-			<script type="Java">javanais</script>
-			<script type="Jpan">japonais</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharochthî</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannara</script>
-			<script type="Kore">coréen</script>
-			<script type="Kthi">kaithî</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">latin (variante brisée)</script>
-			<script type="Latg">latin (variante gaélique)</script>
-			<script type="Latn">latin</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbou</script>
-			<script type="Lina">linéaire A</script>
-			<script type="Linb">linéaire B</script>
-			<script type="Lyci">lycien</script>
-			<script type="Lydi">lydien</script>
-			<script type="Mand">mandéen</script>
-			<script type="Mani">manichéen</script>
-			<script type="Maya">hiéroglyphes mayas</script>
-			<script type="Mero">méroïtique</script>
-			<script type="Mlym">malayâlam</script>
-			<script type="Mong">mongol</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei mayek</script>
-			<script type="Mymr">birman</script>
-			<script type="Nkoo">n’ko</script>
-			<script type="Ogam">ogam</script>
-			<script type="Olck">ol tchiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriyâ</script>
-			<script type="Osma">osmanais</script>
-			<script type="Perm">ancien permien</script>
-			<script type="Phag">phags pa</script>
-			<script type="Phli">pehlevi des inscriptions</script>
-			<script type="Phlp">pehlevi des psautiers</script>
-			<script type="Phlv">pehlevi des livres</script>
-			<script type="Phnx">phénicien</script>
-			<script type="Plrd">phonétique de Pollard</script>
-			<script type="Prti">parthe des inscriptions</script>
-			<script type="Qaai">hérité</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runique</script>
-			<script type="Samr">samaritain</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">écriture des signes</script>
-			<script type="Shaw">shavien</script>
-			<script type="Sinh">singhalais</script>
-			<script type="Sund">sundanais</script>
-			<script type="Sylo">sylotî nâgrî</script>
-			<script type="Syrc">syriaque</script>
-			<script type="Syre">syriaque estranghélo</script>
-			<script type="Syrj">syriaque occidental</script>
-			<script type="Syrn">syriaque oriental</script>
-			<script type="Tagb">tagbanoua</script>
-			<script type="Tale">taï-le</script>
-			<script type="Talu">nouveau taï-lue</script>
-			<script type="Taml">tamoul</script>
-			<script type="Tavt">taï viêt</script>
-			<script type="Telu">télougou</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagal</script>
-			<script type="Thaa">thâna</script>
-			<script type="Thai">thaï</script>
-			<script type="Tibt">tibétain</script>
-			<script type="Ugar">ougaritique</script>
-			<script type="Vaii">vaï</script>
-			<script type="Visp">parole visible</script>
-			<script type="Xpeo">cunéiforme persépolitain</script>
-			<script type="Xsux">cunéiforme suméro-akkadien</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">notation mathématique</script>
-			<script type="Zsym">symboles</script>
-			<script type="Zxxx">non écrit</script>
-			<script type="Zyyy">commun</script>
-			<script type="Zzzz">écriture inconnue ou non valide</script>
-		</scripts>
-		<territories>
-			<territory type="001">Monde</territory>
-			<territory type="002">Afrique</territory>
-			<territory type="003">Amérique du Nord</territory>
-			<territory type="005">Amérique du Sud</territory>
-			<territory type="009">Océanie</territory>
-			<territory type="011">Afrique occidentale</territory>
-			<territory type="013">Amérique centrale</territory>
-			<territory type="014">Afrique orientale</territory>
-			<territory type="015">Afrique septentrionale</territory>
-			<territory type="017">Afrique centrale</territory>
-			<territory type="018">Afrique australe</territory>
-			<territory type="019">Amériques</territory>
-			<territory type="021">Amérique septentrionale</territory>
-			<territory type="029">Caraïbes</territory>
-			<territory type="030">Asie orientale</territory>
-			<territory type="034">Asie du Sud</territory>
-			<territory type="035">Asie du Sud-Est</territory>
-			<territory type="039">Europe méridionale</territory>
-			<territory type="053">Australie et Nouvelle-Zélande</territory>
-			<territory type="054">Mélanésie</territory>
-			<territory type="057">région micronésienne</territory>
-			<territory type="061">Polynésie</territory>
-			<territory type="062">Asie centrale et du Sud</territory>
-			<territory type="142">Asie</territory>
-			<territory type="143">Asie centrale</territory>
-			<territory type="145">Asie occidentale</territory>
-			<territory type="150">Europe</territory>
-			<territory type="151">Europe orientale</territory>
-			<territory type="154">Europe septentrionale</territory>
-			<territory type="155">Europe occidentale</territory>
-			<territory type="172">Communauté des États indépendants</territory>
-			<territory type="419">Amérique latine et Caraïbes</territory>
-			<territory type="830">ÃŽles Anglo-normandes</territory>
-			<territory type="AD">Andorre</territory>
-			<territory type="AE">Émirats arabes unis</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua-et-Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanie</territory>
-			<territory type="AM">Arménie</territory>
-			<territory type="AN">Antilles néerlandaises</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctique</territory>
-			<territory type="AR">Argentine</territory>
-			<territory type="AS">Samoa américaines</territory>
-			<territory type="AT">Autriche</territory>
-			<territory type="AU">Australie</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">ÃŽles Ã…land</territory>
-			<territory type="AZ">Azerbaïdjan</territory>
-			<territory type="BA">Bosnie-Herzégovine</territory>
-			<territory type="BB">Barbade</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgique</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarie</territory>
-			<territory type="BH">Bahreïn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Bénin</territory>
-			<territory type="BL">Saint-Barthélémy</territory>
-			<territory type="BM">Bermudes</territory>
-			<territory type="BN">Brunéi Darussalam</territory>
-			<territory type="BO">Bolivie</territory>
-			<territory type="BR">Brésil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhoutan</territory>
-			<territory type="BV">ÃŽle Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bélarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">ÃŽles Cocos - Keeling</territory>
-			<territory type="CD">République démocratique du Congo</territory>
-			<territory type="CF">République centrafricaine</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suisse</territory>
-			<territory type="CI">Côte d’Ivoire</territory>
-			<territory type="CK">ÃŽles Cook</territory>
-			<territory type="CL">Chili</territory>
-			<territory type="CM">Cameroun</territory>
-			<territory type="CN">Chine</territory>
-			<territory type="CO">Colombie</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbie-et-Monténégro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cap-Vert</territory>
-			<territory type="CX">ÃŽle Christmas</territory>
-			<territory type="CY">Chypre</territory>
-			<territory type="CZ">République tchèque</territory>
-			<territory type="DE">Allemagne</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danemark</territory>
-			<territory type="DM">Dominique</territory>
-			<territory type="DO">République dominicaine</territory>
-			<territory type="DZ">Algérie</territory>
-			<territory type="EC">Équateur</territory>
-			<territory type="EE">Estonie</territory>
-			<territory type="EG">Égypte</territory>
-			<territory type="EH">Sahara occidental</territory>
-			<territory type="ER">Érythrée</territory>
-			<territory type="ES">Espagne</territory>
-			<territory type="ET">Éthiopie</territory>
-			<territory type="FI">Finlande</territory>
-			<territory type="FJ">Fidji</territory>
-			<territory type="FK">ÃŽles Malouines</territory>
-			<territory type="FM">États fédérés de Micronésie</territory>
-			<territory type="FO">Îles Féroé</territory>
-			<territory type="FR">France</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Royaume-Uni</territory>
-			<territory type="GD">Grenade</territory>
-			<territory type="GE">Géorgie</territory>
-			<territory type="GF">Guyane française</territory>
-			<territory type="GG">Guernesey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Groenland</territory>
-			<territory type="GM">Gambie</territory>
-			<territory type="GN">Guinée</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Guinée équatoriale</territory>
-			<territory type="GR">Grèce</territory>
-			<territory type="GS">Géorgie du Sud et les îles Sandwich du Sud</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinée-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">R.A.S. chinoise de Hong Kong</territory>
-			<territory type="HM">ÃŽles Heard et MacDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatie</territory>
-			<territory type="HT">Haïti</territory>
-			<territory type="HU">Hongrie</territory>
-			<territory type="ID">Indonésie</territory>
-			<territory type="IE">Irlande</territory>
-			<territory type="IL">Israël</territory>
-			<territory type="IM">ÃŽle de Man</territory>
-			<territory type="IN">Inde</territory>
-			<territory type="IO">Territoire britannique de l'océan Indien</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islande</territory>
-			<territory type="IT">Italie</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaïque</territory>
-			<territory type="JO">Jordanie</territory>
-			<territory type="JP">Japon</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirghizistan</territory>
-			<territory type="KH">Cambodge</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comores</territory>
-			<territory type="KN">Saint-Kitts-et-Nevis</territory>
-			<territory type="KP">Corée du Nord</territory>
-			<territory type="KR">Corée du Sud</territory>
-			<territory type="KW">Koweït</territory>
-			<territory type="KY">Îles Caïmans</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LC">Sainte-Lucie</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Libéria</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituanie</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Lettonie</territory>
-			<territory type="LY">Libye</territory>
-			<territory type="MA">Maroc</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldavie</territory>
-			<territory type="ME">Monténégro</territory>
-			<territory type="MF">Saint-Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">ÃŽles Marshall</territory>
-			<territory type="MK">Macédoine</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolie</territory>
-			<territory type="MO">R.A.S. chinoise de Macao</territory>
-			<territory type="MP">ÃŽles Mariannes du Nord</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritanie</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malte</territory>
-			<territory type="MU">Maurice</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexique</territory>
-			<territory type="MY">Malaisie</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibie</territory>
-			<territory type="NC">Nouvelle-Calédonie</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">ÃŽle Norfolk</territory>
-			<territory type="NG">Nigéria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Pays-Bas</territory>
-			<territory type="NO">Norvège</territory>
-			<territory type="NP">Népal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nouvelle-Zélande</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Pérou</territory>
-			<territory type="PF">Polynésie française</territory>
-			<territory type="PG">Papouasie-Nouvelle-Guinée</territory>
-			<territory type="PH">Philippines</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Pologne</territory>
-			<territory type="PM">Saint-Pierre-et-Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Rico</territory>
-			<territory type="PS">Territoire palestinien</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palaos</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">régions éloignées de l’Océanie</territory>
-			<territory type="QU">Union européenne</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Roumanie</territory>
-			<territory type="RS">Serbie</territory>
-			<territory type="RU">Russie</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Arabie saoudite</territory>
-			<territory type="SB">ÃŽles Salomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Soudan</territory>
-			<territory type="SE">Suède</territory>
-			<territory type="SG">Singapour</territory>
-			<territory type="SH">Sainte-Hélène</territory>
-			<territory type="SI">Slovénie</territory>
-			<territory type="SJ">Svalbard et ÃŽle Jan Mayen</territory>
-			<territory type="SK">Slovaquie</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">Saint-Marin</territory>
-			<territory type="SN">Sénégal</territory>
-			<territory type="SO">Somalie</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tomé-et-Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrie</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Îles Turks et Caïques</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Terres australes françaises</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thaïlande</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor oriental</territory>
-			<territory type="TM">Turkménistan</territory>
-			<territory type="TN">Tunisie</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquie</territory>
-			<territory type="TT">Trinité-et-Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taïwan</territory>
-			<territory type="TZ">Tanzanie</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Ouganda</territory>
-			<territory type="UM">Îles Mineures Éloignées des États-Unis</territory>
-			<territory type="US">États-Unis</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Ouzbékistan</territory>
-			<territory type="VA">État de la Cité du Vatican</territory>
-			<territory type="VC">Saint-Vincent-et-les Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">ÃŽles Vierges britanniques</territory>
-			<territory type="VI">Îles Vierges des États-Unis</territory>
-			<territory type="VN">Viêt Nam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis-et-Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yémen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Afrique du Sud</territory>
-			<territory type="ZM">Zambie</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">région indéterminée</territory>
-		</territories>
-		<variants>
-			<variant type="1901">orthographe allemande traditionnelle</variant>
-			<variant type="1994">orthographe normalisée de Resia</variant>
-			<variant type="1996">orthographe allemande de 1996</variant>
-			<variant type="1606NICT">françoys de 1606</variant>
-			<variant type="1694ACAD">françois académique de 1694</variant>
-			<variant type="AREVELA">arménien oriental</variant>
-			<variant type="AREVMDA">arménien occidental</variant>
-			<variant type="BAKU1926">alphabet latin altaïque unifié</variant>
-			<variant type="BISKE">dialecte de San Giorgio / Bila</variant>
-			<variant type="BOONT">dialecte boontling</variant>
-			<variant type="FONIPA">alphabet phonétique international</variant>
-			<variant type="FONUPA">alphabet phonétique ouralique</variant>
-			<variant type="LIPAW">dialecte lipovaz de Resia</variant>
-			<variant type="MONOTON">monotonique</variant>
-			<variant type="NEDIS">dialecte de Natisone</variant>
-			<variant type="NJIVA">dialecte de Gniva / Njiva</variant>
-			<variant type="OSOJS">dialecte d’Oseacco / Osojane</variant>
-			<variant type="POLYTON">polytonique</variant>
-			<variant type="POSIX">informatique</variant>
-			<variant type="REVISED">orthographe révisée</variant>
-			<variant type="ROZAJ">dialecte de Resia</variant>
-			<variant type="SAAHO">dialecte saho</variant>
-			<variant type="SCOTLAND">anglais standard écossais</variant>
-			<variant type="SCOUSE">dialecte scouse</variant>
-			<variant type="SOLBA">dialecte de Stolvizza / Solbica</variant>
-			<variant type="TARASK">orthographe taraskievica</variant>
-			<variant type="VALENCIA">valencien</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Calendrier</key>
-			<key type="collation">Ordonnancement</key>
-			<key type="currency">Devise</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Ordre chinois traditionnel - Big5</type>
-			<type type="buddhist" key="calendar">Calendrier bouddhiste</type>
-			<type type="chinese" key="calendar">Calendrier chinois</type>
-			<type type="direct" key="collation">Ordre direct</type>
-			<type type="gb2312han" key="collation">Ordre chinois simplifié - GB2312</type>
-			<type type="gregorian" key="calendar">Calendrier grégorien</type>
-			<type type="hebrew" key="calendar">Calendrier hébraïque</type>
-			<type type="indian" key="calendar">Calendrier indien</type>
-			<type type="islamic" key="calendar">Calendrier musulman</type>
-			<type type="islamic-civil" key="calendar">Calendrier civil musulman</type>
-			<type type="japanese" key="calendar">Calendrier japonais</type>
-			<type type="phonebook" key="collation">Ordre de l’annuaire</type>
-			<type type="pinyin" key="collation">Ordre pinyin</type>
-			<type type="roc" key="calendar">Calendrier républicain chinois</type>
-			<type type="stroke" key="collation">Ordre des traits</type>
-			<type type="traditional" key="collation">Ordre traditionnel</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">métrique</measurementSystemName>
-			<measurementSystemName type="US">américain</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">langue : {0}</codePattern>
-			<codePattern type="script">écriture : {0}</codePattern>
-			<codePattern type="territory">région : {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à â æ b c ç d e é è ê ë f-i î ï j-o ô œ p-u ù û ü v-y ÿ z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á å ä ã � ē í ì ī ñ ó ò ö ø ú ǔ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z Ò± Ò°]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} – {1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<am>matin</am>
-				<pm>soir</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ère bouddhiste</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ère b.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ÈB</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="ms">m:ss</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1yuè</month>
-							<month type="2">2yuè</month>
-							<month type="3">3yuè</month>
-							<month type="4">4yuè</month>
-							<month type="5">5yuè</month>
-							<month type="6">6yuè</month>
-							<month type="7">7yuè</month>
-							<month type="8">8yuè</month>
-							<month type="9">9yuè</month>
-							<month type="10">10yuè</month>
-							<month type="11">11yuè</month>
-							<month type="12">12yuè</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">zhēngyuè</month>
-							<month type="2">èryuè</month>
-							<month type="3">s�nyuè</month>
-							<month type="4">sìyuè</month>
-							<month type="5">wǔyuè</month>
-							<month type="6">liùyuè</month>
-							<month type="7">qīyuè</month>
-							<month type="8">b�yuè</month>
-							<month type="9">jiǔyuè</month>
-							<month type="10">shíyuè</month>
-							<month type="11">shíyīyuè</month>
-							<month type="12">shí’èryuè</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>matin</am>
-				<pm>soir</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMMl y'x'G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMMl y'x'G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMMl y'x'G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/Ml/y'x'G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="M">Ml</dateFormatItem>
-						<dateFormatItem id="Md">d/Ml</dateFormatItem>
-						<dateFormatItem id="MEd">EEE d/Ml</dateFormatItem>
-						<dateFormatItem id="MMd">d/MMl</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MMl</dateFormatItem>
-						<dateFormatItem id="MMM">MMMl</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMMl</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd MMMl</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMMl</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMMl</dateFormatItem>
-						<dateFormatItem id="MMMMEd">EEE d MMMMl</dateFormatItem>
-						<dateFormatItem id="ms">m:ss</dateFormatItem>
-						<dateFormatItem id="y">y'x'G</dateFormatItem>
-						<dateFormatItem id="yM">Ml/y'x'G</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d/Ml/y'x'G</dateFormatItem>
-						<dateFormatItem id="yMMM">MMMl y'x'G</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMMl y'x'G</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y'x'G</dateFormatItem>
-						<dateFormatItem id="yQ">'T'Q y'x'G</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y'x'G</dateFormatItem>
-						<dateFormatItem id="yyMM">MMl/y'x'G</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMMl yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d MMMl yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE d MMMl yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMMl y'x'G</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">tout</month>
-							<month type="2">bâb.</month>
-							<month type="3">hât.</month>
-							<month type="4">kya.</month>
-							<month type="5">toub.</month>
-							<month type="6">amsh.</month>
-							<month type="7">barma.</month>
-							<month type="8">barmo.</month>
-							<month type="9">bash.</month>
-							<month type="10">ba’o.</month>
-							<month type="11">abî.</month>
-							<month type="12">mis.</month>
-							<month type="13">al-n.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">tout</month>
-							<month type="2">bâbâ</month>
-							<month type="3">hâtour</month>
-							<month type="4">kyakh</month>
-							<month type="5">toubah</month>
-							<month type="6">amshîr</month>
-							<month type="7">barmahât</month>
-							<month type="8">barmoudah</month>
-							<month type="9">bashans</month>
-							<month type="10">ba’ounah</month>
-							<month type="11">abîb</month>
-							<month type="12">misra</month>
-							<month type="13">al-nasi</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">T</month>
-							<month type="2">B</month>
-							<month type="3">H</month>
-							<month type="4">K</month>
-							<month type="5">T</month>
-							<month type="6">A</month>
-							<month type="7">B</month>
-							<month type="8">B</month>
-							<month type="9">B</month>
-							<month type="10">B</month>
-							<month type="11">A</month>
-							<month type="12">M</month>
-							<month type="13">N</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>matin</am>
-				<pm>soir</pm>
-				<eras>
-					<eraNames>
-						<era type="0">avant Dioclétien</era>
-						<era type="1">après Dioclétien</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">av. D.</era>
-						<era type="1">ap. D.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">mäs.</month>
-							<month type="2">teq.</month>
-							<month type="3">hed.</month>
-							<month type="4">tah.</month>
-							<month type="5">ter</month>
-							<month type="6">yäk.</month>
-							<month type="7">mäg.</month>
-							<month type="8">miy.</month>
-							<month type="9">gue.</month>
-							<month type="10">sän.</month>
-							<month type="11">ham.</month>
-							<month type="12">näh.</month>
-							<month type="13">pag.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">mäskäräm</month>
-							<month type="2">teqemt</month>
-							<month type="3">hedar</month>
-							<month type="4">tahesas</month>
-							<month type="5">ter</month>
-							<month type="6">yäkatit</month>
-							<month type="7">mägabit</month>
-							<month type="8">miyazya</month>
-							<month type="9">guenbot</month>
-							<month type="10">säné</month>
-							<month type="11">hamlé</month>
-							<month type="12">nähasé</month>
-							<month type="13">pagumén</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">M</month>
-							<month type="2">T</month>
-							<month type="3">H</month>
-							<month type="4">T</month>
-							<month type="5">T</month>
-							<month type="6">Y</month>
-							<month type="7">M</month>
-							<month type="8">M</month>
-							<month type="9">G</month>
-							<month type="10">S</month>
-							<month type="11">H</month>
-							<month type="12">N</month>
-							<month type="13">P</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>matin</am>
-				<pm>soir</pm>
-				<eras>
-					<eraNames>
-						<era type="0">avant l’Incarnation</era>
-						<era type="1">après l’Incarnation</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">av. Inc.</era>
-						<era type="1">ap. Inc.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">janv.</month>
-							<month type="2">févr.</month>
-							<month type="3">mars</month>
-							<month type="4">avr.</month>
-							<month type="5">mai</month>
-							<month type="6">juin</month>
-							<month type="7">juil.</month>
-							<month type="8">août</month>
-							<month type="9">sept.</month>
-							<month type="10">oct.</month>
-							<month type="11">nov.</month>
-							<month type="12">déc.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">janvier</month>
-							<month type="2">février</month>
-							<month type="3">mars</month>
-							<month type="4">avril</month>
-							<month type="5">mai</month>
-							<month type="6">juin</month>
-							<month type="7">juillet</month>
-							<month type="8">août</month>
-							<month type="9">septembre</month>
-							<month type="10">octobre</month>
-							<month type="11">novembre</month>
-							<month type="12">décembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dim.</day>
-							<day type="mon">lun.</day>
-							<day type="tue">mar.</day>
-							<day type="wed">mer.</day>
-							<day type="thu">jeu.</day>
-							<day type="fri">ven.</day>
-							<day type="sat">sam.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">dimanche</day>
-							<day type="mon">lundi</day>
-							<day type="tue">mardi</day>
-							<day type="wed">mercredi</day>
-							<day type="thu">jeudi</day>
-							<day type="fri">vendredi</day>
-							<day type="sat">samedi</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">J</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1er trimestre</quarter>
-							<quarter type="2">2e trimestre</quarter>
-							<quarter type="3">3e trimestre</quarter>
-							<quarter type="4">4e trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">avant Jésus-Christ</era>
-						<era type="1">après Jésus-Christ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">av. J.-C.</era>
-						<era type="1">ap. J.-C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">EEE d/M</dateFormatItem>
-						<dateFormatItem id="MMd">d/MM</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">EEE d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">'T'Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d MMM yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE d MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">'T'Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH – HH</greatestDifference>
-							<greatestDifference id="h">HH – HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm – HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm – HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm – HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm – HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH – HH v</greatestDifference>
-							<greatestDifference id="h">HH – HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">'du' d MMM 'au' d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">'du' E d 'au' E d MMM</greatestDifference>
-							<greatestDifference id="M">'du' E d MMM 'au' E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy – MM/yy</greatestDifference>
-							<greatestDifference id="y">M/yyyy – M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yyyy – d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy – E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy – E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/M/yyyy – E d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d – E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y – E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM–MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ère</displayName>
-					</field>
-					<field type="year">
-						<displayName>année</displayName>
-					</field>
-					<field type="month">
-						<displayName>mois</displayName>
-					</field>
-					<field type="week">
-						<displayName>semaine</displayName>
-					</field>
-					<field type="day">
-						<displayName>jour</displayName>
-						<relative type="-3">avant-avant-hier</relative>
-						<relative type="-2">avant-hier</relative>
-						<relative type="-1">hier</relative>
-						<relative type="0">aujourd’hui</relative>
-						<relative type="1">demain</relative>
-						<relative type="2">après-demain</relative>
-						<relative type="3">après-après-demain</relative>
-					</field>
-					<field type="weekday">
-						<displayName>jour de la semaine</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>cadran</displayName>
-					</field>
-					<field type="hour">
-						<displayName>heure</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>seconde</displayName>
-					</field>
-					<field type="zone">
-						<displayName>fuseau horaire</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">tis.</month>
-							<month type="2">hes.</month>
-							<month type="3">kis.</month>
-							<month type="4">téb.</month>
-							<month type="5">sché.</month>
-							<month type="6">ad.I</month>
-							<month type="7">adar</month>
-							<month type="8">nis.</month>
-							<month type="9">iyar</month>
-							<month type="10">siv.</month>
-							<month type="11">tam.</month>
-							<month type="12">ab</month>
-							<month type="13">ell.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Tisseri</month>
-							<month type="2">Hesvan</month>
-							<month type="3">kislev</month>
-							<month type="4">Tébeth</month>
-							<month type="5">Schébat</month>
-							<month type="6">Adar</month>
-							<month type="7">Adar II</month>
-							<month type="8">Nissan</month>
-							<month type="9">iyar</month>
-							<month type="10">sivan</month>
-							<month type="11">Tamouz</month>
-							<month type="12">Ab</month>
-							<month type="13">Elloul</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">T</month>
-							<month type="2">H</month>
-							<month type="3">K</month>
-							<month type="4">T</month>
-							<month type="5">S</month>
-							<month type="6">A</month>
-							<month type="7">A</month>
-							<month type="8">N</month>
-							<month type="9">I</month>
-							<month type="10">S</month>
-							<month type="11">T</month>
-							<month type="12">A</month>
-							<month type="13">E</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>matin</am>
-				<pm>soir</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Anno Mundi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">A.M.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">chai.</month>
-							<month type="2">vai.</month>
-							<month type="3">jyai.</month>
-							<month type="4">�sha.</month>
-							<month type="5">shr�.</month>
-							<month type="6">bh�.</month>
-							<month type="7">�shw.</month>
-							<month type="8">k�r.</month>
-							<month type="9">m�r.</month>
-							<month type="10">pau.</month>
-							<month type="11">m�gh</month>
-							<month type="12">ph�l.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">chaitra</month>
-							<month type="2">vaish�kh</month>
-							<month type="3">jyaishtha</month>
-							<month type="4">�sh�dha</month>
-							<month type="5">shr�vana</month>
-							<month type="6">bh�drapad</month>
-							<month type="7">�shwin</month>
-							<month type="8">k�rtik</month>
-							<month type="9">m�rgashīrsha</month>
-							<month type="10">paush</month>
-							<month type="11">m�gh</month>
-							<month type="12">ph�lgun</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">C</month>
-							<month type="2">V</month>
-							<month type="3">J</month>
-							<month type="4">Ä€</month>
-							<month type="5">S</month>
-							<month type="6">B</month>
-							<month type="7">Ä€</month>
-							<month type="8">K</month>
-							<month type="9">M</month>
-							<month type="10">P</month>
-							<month type="11">M</month>
-							<month type="12">P</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>matin</am>
-				<pm>soir</pm>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Mouharram</month>
-							<month type="3">RabiÊ»-oul-Aououal</month>
-							<month type="4">RabiÊ»-out-Tani</month>
-							<month type="5">Djoumada-l-Oula</month>
-							<month type="6">Djoumada-t-Tania</month>
-							<month type="7">Radjab</month>
-							<month type="8">Chaʻban</month>
-							<month type="10">Chaououal</month>
-							<month type="11">Dou-l-Qaʻda</month>
-							<month type="12">Dou-l-Hidjja</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>UTC{0}</gmtFormat>
-			<gmtZeroFormat>UTC</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>zone inconnue</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andorre</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubaï</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kaboul</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Saint John’s</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>The Valley</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Pôle Sud</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Showa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Mac Murdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ushuaïa</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Vienne</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adélaïde</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>Oranjestad</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Bakou</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbade (La)</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dhâkâ</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelles</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahreïn</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudes</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Bandar Seri Begawan</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Manaos</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimphou</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belmopan</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Régina</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Montréal</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Saint-Jean de Terre-Neuve</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>West Island</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Île de Pâques</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kachgar</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>San José</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>La Havane</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cap Vert</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Flying Fish Cove</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicosie</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhague</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominique</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Saint Domingue</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Le Caire</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Laâyoune</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>ÃŽles Canaries</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis-Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidji</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Port Stanley</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Féroé</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londres</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Grenade</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilissi</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>Saint-Pierre-Port</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Thulé</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthåb</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Basse-Terre</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athènes</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Géorgie du Sud</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Hagåtña</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guyane</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong-Kong</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Macassar</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jérusalem</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Douglas</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Kolkata</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Diego Garcia</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Téhéran</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavík</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>Saint-Hélier</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaïque</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bichkek</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comores (Archipel)</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Saint-Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Séoul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Koweït</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caïmans</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktaou</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Ouralsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktioubinsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kzyl Orda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Alma Ata</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beyrouth</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Sainte-Lucie</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Oulan-Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Tchoïbalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Fort-de-France</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Brades</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Malte</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Maurice (ÃŽle)</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Malé</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Kingston</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Katmandou</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Yaren</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Alofi</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá (Panamá)</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquises</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Manille</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Karâchi</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsovie</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Saint-Pierre</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn (ÃŽle)</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Rico</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Açores</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Madère</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisbonne</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Melekeok</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Doha</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion (Île de la)</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscou</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Ekaterinbourg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novossibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnoïarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkoutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Iakoutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sakhaline</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtchatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyad</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Honiara</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapour</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sainte-Hélène</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>Saint-Marin</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadiscio</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damas</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Cockburn Town</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Port-aux-Français</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Douchanbé</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Achgabat</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Nukuʻalofa</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port-d’Espagne</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Oujgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojie</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Dakota du Nord</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Central North Dakota</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Détroit</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcande</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tachkent</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>Cité du Vatican</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint-Vincent</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Road Town</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Saint-Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Hô-Chi-Minh-Ville</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Efaté</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Mat�ʻutu</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Mamoudzou</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<generic>heure de l’Acre</generic>
-					<standard>heure de l’Acre</standard>
-					<daylight>heure avancée de l’Acre</daylight>
-				</long>
-				<short>
-					<generic>HACR</generic>
-					<standard>HNACR</standard>
-					<daylight>HAACR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<generic>heure d’Afghanistan</generic>
-					<standard>heure d’Afghanistan</standard>
-					<daylight>heure avancée d’Afghanistan</daylight>
-				</long>
-				<short>
-					<generic>HAF</generic>
-					<standard>HNAF</standard>
-					<daylight>HAAF</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<generic>heure d’Afrique centrale</generic>
-					<standard>heure normale d’Afrique centrale</standard>
-					<daylight>heure avancée d’Afrique centrale</daylight>
-				</long>
-				<short>
-					<generic>HAFC</generic>
-					<standard>HNAFC</standard>
-					<daylight>HAAFC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<generic>heure d’Afrique de l’Est</generic>
-					<standard>heure normale d’Afrique de l’Est</standard>
-					<daylight>heure avancée d’Afrique de l’Est</daylight>
-				</long>
-				<short>
-					<generic>HAFE</generic>
-					<standard>HNAFE</standard>
-					<daylight>HAAFE</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_FarWestern">
-				<long>
-					<generic>heure d’Afrique de l’Ouest sahélien</generic>
-					<standard>heure normale d’Afrique de l’Ouest sahélien</standard>
-					<daylight>heure avancée d’Afrique de l’Ouest sahélien</daylight>
-				</long>
-				<short>
-					<generic>HAFOS</generic>
-					<standard>HNAFOS</standard>
-					<daylight>HAAFOS</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>heure d’Afrique méridionale</generic>
-					<standard>heure normale d’Afrique méridionale</standard>
-					<daylight>heure avancée d’Afrique méridionale</daylight>
-				</long>
-				<short>
-					<generic>HAFM</generic>
-					<standard>HNAFM</standard>
-					<daylight>HAAFM</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>heure d’Afrique de l’Ouest</generic>
-					<standard>heure normale d’Afrique de l’Ouest</standard>
-					<daylight>heure avancée d’Afrique de l’Ouest</daylight>
-				</long>
-				<short>
-					<generic>HAFO</generic>
-					<standard>HNAFO</standard>
-					<daylight>HAAFO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<generic>heure d’Aqtöbe</generic>
-					<standard>heure normale d’Aqtöbe</standard>
-					<daylight>heure avancée d’Aqtöbe</daylight>
-				</long>
-				<short>
-					<generic>HAQB</generic>
-					<standard>HNAQB</standard>
-					<daylight>HAAQB</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>heure de l’Alaska</generic>
-					<standard>heure normale de l’Alaska</standard>
-					<daylight>heure avancée de l’Alaska</daylight>
-				</long>
-				<short>
-					<generic>HAK</generic>
-					<standard>HNAK</standard>
-					<daylight>HAAK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>heure d’Alaska - Hawaii</generic>
-					<standard>heure normale d’Alaska - Hawaii</standard>
-					<daylight>heure avancée d’Alaska - Hawaii</daylight>
-				</long>
-				<short>
-					<generic>HAH</generic>
-					<standard>HNAH</standard>
-					<daylight>HAAH</daylight>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<generic>heure d’Alma Ata</generic>
-					<standard>heure normale d’Alma Ata</standard>
-					<daylight>heure avancée d’Alma Ata</daylight>
-				</long>
-				<short>
-					<generic>HALM</generic>
-					<standard>HNALM</standard>
-					<daylight>HAALM</daylight>
-				</short>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<generic>heure de l’Amazonie</generic>
-					<standard>heure de l’Amazonie</standard>
-					<daylight>heure avancée de l’Amazonie</daylight>
-				</long>
-				<short>
-					<generic>HAMA</generic>
-					<standard>HNAMA</standard>
-					<daylight>HAAMA</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>heure du Centre</generic>
-					<standard>heure normale du Centre</standard>
-					<daylight>heure avancée du Centre</daylight>
-				</long>
-				<short>
-					<generic>HC</generic>
-					<standard>HNC</standard>
-					<daylight>HAC</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>heure de l’Est</generic>
-					<standard>heure normale de l’Est</standard>
-					<daylight>heure avancée de l’Est</daylight>
-				</long>
-				<short>
-					<generic>HE</generic>
-					<standard>HNE</standard>
-					<daylight>HAE</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Heure des Rocheuses</generic>
-					<standard>heure normale des Rocheuses</standard>
-					<daylight>heure avancée des Rocheuses</daylight>
-				</long>
-				<short>
-					<generic>HR</generic>
-					<standard>HNR</standard>
-					<daylight>HAR</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>heure du Pacifique</generic>
-					<standard>heure normale du Pacifique</standard>
-					<daylight>heure avancée du Pacifique</daylight>
-				</long>
-				<short>
-					<generic>HP</generic>
-					<standard>HNP</standard>
-					<daylight>HAP</daylight>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<generic>heure d’Anadyr</generic>
-					<standard>heure d’Anadyr</standard>
-					<daylight>heure avancée d’Anadyr</daylight>
-				</long>
-				<short>
-					<generic>HANA</generic>
-					<standard>HNANA</standard>
-					<daylight>HAANA</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<generic>heure d’Aktaou</generic>
-					<standard>heure d’Aktaou</standard>
-					<daylight>heure avancée d’Aktaou</daylight>
-				</long>
-				<short>
-					<generic>HAQT</generic>
-					<standard>HNAQT</standard>
-					<daylight>HAAQT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<generic>heure d’Aqtöbe</generic>
-					<standard>heure d’Aqtöbe</standard>
-					<daylight>heure avancé d’Aqtöbe</daylight>
-				</long>
-				<short>
-					<generic>HAQB</generic>
-					<standard>HNAQB</standard>
-					<daylight>HAAQB</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>heure de l’Arabie</generic>
-					<standard>heure normale de l’Arabie</standard>
-					<daylight>heure avancée de l’Arabie</daylight>
-				</long>
-				<short>
-					<generic>HA</generic>
-					<standard>HNA</standard>
-					<daylight>HAA</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<generic>heure de l’Est argentin</generic>
-					<standard>heure d’Argentine</standard>
-					<daylight>heure avancée de l’Est argentin</daylight>
-				</long>
-				<short>
-					<generic>HE (AR)</generic>
-					<standard>HNE (AR)</standard>
-					<daylight>HAE (AR)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<generic>heure de l’Ouest argentin</generic>
-					<standard>heure de l’Ouest argentin</standard>
-					<daylight>heure avancée de l’Ouest argentin</daylight>
-				</long>
-				<short>
-					<generic>HO (AR)</generic>
-					<standard>HNO (AR)</standard>
-					<daylight>HAO (AR)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<generic>heure d’Arménie</generic>
-					<standard>heure d’Arménie</standard>
-					<daylight>heure avancée d’Arménie</daylight>
-				</long>
-				<short>
-					<generic>HAM</generic>
-					<standard>HNAM</standard>
-					<daylight>HAAM</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<generic>heure d’Achgabat</generic>
-					<standard>heure d’Achgabat</standard>
-					<daylight>heure avancée d’Achgabat</daylight>
-				</long>
-				<short>
-					<generic>HACH</generic>
-					<standard>HNACH</standard>
-					<daylight>HAACH</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>heure de l’Atlantique</generic>
-					<standard>heure normale de l’Atlantique</standard>
-					<daylight>heure avancée de l’Atlantique</daylight>
-				</long>
-				<short>
-					<generic>HA</generic>
-					<standard>HNA</standard>
-					<daylight>HAA</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>heure du Centre australien</generic>
-					<standard>heure normale du Centre australien</standard>
-					<daylight>heure avancée du Centre australien</daylight>
-				</long>
-				<short>
-					<generic>HC (AU)</generic>
-					<standard>HNC (AU)</standard>
-					<daylight>HAC (AU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>heure Centre Ouest australien</generic>
-					<standard>heure normale Centre Ouest australien</standard>
-					<daylight>heure avancée du Centre Ouest australien</daylight>
-				</long>
-				<short>
-					<generic>HCO (AU)</generic>
-					<standard>HNCO (AU)</standard>
-					<daylight>HACO (AU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>heure de l’Est australien</generic>
-					<standard>heure normale de l’Est australien</standard>
-					<daylight>heure avancée de l’Est australien</daylight>
-				</long>
-				<short>
-					<generic>HE (AU)</generic>
-					<standard>HNE (AU)</standard>
-					<daylight>HAE (AU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>heure de l’Ouest australien</generic>
-					<standard>heure normale de l’Ouest australien</standard>
-					<daylight>heure avancée de l’Ouest australien</daylight>
-				</long>
-				<short>
-					<generic>HO (AU)</generic>
-					<standard>HNO (AU)</standard>
-					<daylight>HAO (AU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<generic>heure d’Azerbaïdjan</generic>
-					<standard>heure d’Azerbaïdjan</standard>
-					<daylight>heure avancée d’Azerbaïdjan</daylight>
-				</long>
-				<short>
-					<generic>HAZ</generic>
-					<standard>HNAZ</standard>
-					<daylight>HAAZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<generic>heure des Açores</generic>
-					<standard>heure des Açores</standard>
-					<daylight>heure avancée des Açores</daylight>
-				</long>
-				<short>
-					<generic>HAC (PT)</generic>
-					<standard>HNAC (PT)</standard>
-					<daylight>HAAC (PT)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<generic>heure de Bakou</generic>
-					<standard>heure de Bakou</standard>
-					<daylight>heure avancée de Bakou</daylight>
-				</long>
-				<short>
-					<generic>HBAK</generic>
-					<standard>HNBAK</standard>
-					<daylight>HABAK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<generic>heure du Bangladesh</generic>
-					<standard>heure du Bangladesh</standard>
-					<daylight>heure avancée du Bangladesh</daylight>
-				</long>
-				<short>
-					<generic>HBD</generic>
-					<standard>HNBD</standard>
-					<daylight>HABD</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>heure de Bering</generic>
-					<standard>heure normale de Bering</standard>
-					<daylight>heure avancée de Bering</daylight>
-				</long>
-				<short>
-					<generic>HBER</generic>
-					<standard>HNBER</standard>
-					<daylight>HABER</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<generic>heure du Bhoutan</generic>
-					<standard>heure du Bhoutan</standard>
-					<daylight>heure avancée du Bhoutan</daylight>
-				</long>
-				<short>
-					<generic>HBT</generic>
-					<standard>HNBT</standard>
-					<daylight>HABT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<generic>heure de Bolivie</generic>
-					<standard>heure de Bolivie</standard>
-					<daylight>heure avancée de Bolivie</daylight>
-				</long>
-				<short>
-					<generic>HBO</generic>
-					<standard>HNBO</standard>
-					<daylight>HABO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<generic>heure de Bornéo</generic>
-					<standard>heure de Bornéo</standard>
-					<daylight>heure avancée de Bornéo</daylight>
-				</long>
-				<short>
-					<generic>HBOR</generic>
-					<standard>HNBOR</standard>
-					<daylight>HABOR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<generic>heure de Brasilia</generic>
-					<standard>heure de Brasilia</standard>
-					<daylight>heure avancée de Brasilia</daylight>
-				</long>
-				<short>
-					<generic>HBR</generic>
-					<standard>HNBR</standard>
-					<daylight>HABR</daylight>
-				</short>
-			</metazone>
-			<metazone type="British">
-				<long>
-					<generic>heure du Royaume-Uni</generic>
-					<standard>heure normale du Royaume-Uni</standard>
-					<daylight>heure avancée du Royaume-Uni</daylight>
-				</long>
-				<short>
-					<generic>HGB</generic>
-					<standard>HNGB</standard>
-					<daylight>HAGB</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<generic>heure du Brunéi</generic>
-					<standard>heure du Brunéi</standard>
-					<daylight>heure avancée du Brunéi</daylight>
-				</long>
-				<short>
-					<generic>HBN</generic>
-					<standard>HNBN</standard>
-					<daylight>HABN</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<generic>heure du Cap-Vert</generic>
-					<standard>heure du Cap-Vert</standard>
-					<daylight>heure avancée du Cap-Vert</daylight>
-				</long>
-				<short>
-					<generic>HCV</generic>
-					<standard>HNCV</standard>
-					<daylight>HACV</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>heure des Chamorro</generic>
-					<standard>heure normale des Chamorro</standard>
-					<daylight>heure avancée des Chamorro</daylight>
-				</long>
-				<short>
-					<generic>HCh</generic>
-					<standard>HNCh</standard>
-					<daylight>HACh</daylight>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<generic>heure du Changbai</generic>
-					<standard>heure du Changbai</standard>
-					<daylight>heure avancée du Changbai</daylight>
-				</long>
-				<short>
-					<generic>HCHA (CN)</generic>
-					<standard>HNCHA (CN)</standard>
-					<daylight>HACHA (CN)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<generic>heure des îles Chatham</generic>
-					<standard>heure des îles Chatham</standard>
-					<daylight>heure avancée des îles Chatham</daylight>
-				</long>
-				<short>
-					<generic>HCHA (NZ)</generic>
-					<standard>HNCHA (NZ)</standard>
-					<daylight>HACHA (NZ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<generic>heure du Chili</generic>
-					<standard>heure du Chili</standard>
-					<daylight>heure avancée du Chili</daylight>
-				</long>
-				<short>
-					<generic>HCL</generic>
-					<standard>HNCL</standard>
-					<daylight>HACL</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>heure de Chine</generic>
-					<standard>heure normale de Chine</standard>
-					<daylight>heure avancée de Chine</daylight>
-				</long>
-				<short>
-					<generic>HC (CN)</generic>
-					<standard>HNC (Chine)</standard>
-					<daylight>HAC (Chine)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<generic>heure de l’île Christmas</generic>
-					<standard>heure de l’île Christmas</standard>
-					<daylight>heure avancée de l’île Christmas</daylight>
-				</long>
-				<short>
-					<generic>HCX</generic>
-					<standard>HNCX</standard>
-					<daylight>HACX</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<generic>heure des îles Cocos - Keeling</generic>
-					<standard>heure des îles Cocos</standard>
-					<daylight>heure avancée des îles Cocos - Keeling</daylight>
-				</long>
-				<short>
-					<generic>HCC</generic>
-					<standard>HNCC</standard>
-					<daylight>HACC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<generic>heure de Colombie</generic>
-					<standard>heure de Colombie</standard>
-					<daylight>heure avancée de Colombie</daylight>
-				</long>
-				<short>
-					<generic>HCO</generic>
-					<standard>HNCO</standard>
-					<daylight>HACO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<generic>heure des îles Cook</generic>
-					<standard>heure des îles Cook</standard>
-					<daylight>heure avancée des îles Cook</daylight>
-				</long>
-				<short>
-					<generic>HCK</generic>
-					<standard>HNCK</standard>
-					<daylight>HACK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>heure de Cuba</generic>
-					<standard>heure normale de Cuba</standard>
-					<daylight>heure avancée de Cuba</daylight>
-				</long>
-				<short>
-					<generic>HCU</generic>
-					<standard>HNCU</standard>
-					<daylight>HACU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<generic>heure de Dhâkâ</generic>
-					<standard>heure de Dhâkâ</standard>
-					<daylight>heure avancée de Dhâkâ</daylight>
-				</long>
-				<short>
-					<generic>HDAC</generic>
-					<standard>HNDAC</standard>
-					<daylight>HADAC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<generic>heure de Davis</generic>
-					<standard>heure de Davis</standard>
-					<daylight>heure avancée de Davis</daylight>
-				</long>
-				<short>
-					<generic>HDAV</generic>
-					<standard>HNDAV</standard>
-					<daylight>HADAV</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dominican">
-				<long>
-					<generic>heure de République dominicaine</generic>
-					<standard>heure normale de République dominicaine</standard>
-					<daylight>heure avancée de République dominicaine</daylight>
-				</long>
-				<short>
-					<generic>HDO</generic>
-					<standard>HNDO</standard>
-					<daylight>HADO</daylight>
-				</short>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<generic>heure de Dumont-d’Urville</generic>
-					<standard>heure de Dumont-d’Urville</standard>
-					<daylight>heure avancée de Dumont-d’Urville</daylight>
-				</long>
-				<short>
-					<generic>HDDU</generic>
-					<standard>HNDDU</standard>
-					<daylight>HADDU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<generic>heure de Duchanbé</generic>
-					<standard>heure de Duchanbé</standard>
-					<daylight>heure avancée de Duchanbé</daylight>
-				</long>
-				<short>
-					<generic>HDUC</generic>
-					<standard>HNDUC</standard>
-					<daylight>HADUC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<generic>heure de Guyane néerlandaise</generic>
-					<standard>heure de Guyane néerlandaise</standard>
-					<daylight>heure avancée de Guyane néerlandaise</daylight>
-				</long>
-				<short>
-					<generic>HGNE</generic>
-					<standard>HAGNE</standard>
-					<daylight>HAGNE</daylight>
-				</short>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<generic>heure du Timor oriental</generic>
-					<standard>heure du Timor oriental</standard>
-					<daylight>heure avancée du Timor oriental</daylight>
-				</long>
-				<short>
-					<generic>HTL</generic>
-					<standard>HNTL</standard>
-					<daylight>HATL</daylight>
-				</short>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<generic>heure de l’île de Pâques</generic>
-					<standard>heure de l’île de Pâques</standard>
-					<daylight>heure avancée de l’île de Pâques</daylight>
-				</long>
-				<short>
-					<generic>HPAQ</generic>
-					<standard>HNPAQ</standard>
-					<daylight>HAPAQ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<generic>heure d’Équateur</generic>
-					<standard>heure d’Équateur</standard>
-					<daylight>heure avancée d’Équateur</daylight>
-				</long>
-				<short>
-					<generic>HEQ</generic>
-					<standard>HNEQ</standard>
-					<daylight>HAEQ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>Heure de l’Europe centrale</generic>
-					<standard>Heure normale de l’Europe centrale</standard>
-					<daylight>heure avancée d’Europe centrale</daylight>
-				</long>
-				<short>
-					<generic>HEC</generic>
-					<standard>HNEC</standard>
-					<daylight>HAEC</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>heure d’Europe de l’Est</generic>
-					<standard>Heure normale de l’Europe de l’Est</standard>
-					<daylight>heure avancée d’Europe de l’Est</daylight>
-				</long>
-				<short>
-					<generic>HEE</generic>
-					<standard>HEE</standard>
-					<daylight>HAEE</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic>heure d’Europe de l’Ouest</generic>
-					<standard>heure d’Europe de l’Ouest</standard>
-					<daylight>heure avancée d’Europe de l’Ouest</daylight>
-				</long>
-				<short>
-					<generic>HEO</generic>
-					<standard>HNEO</standard>
-					<daylight>HAEO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<generic>heure des îles Malouines</generic>
-					<standard>heure des îles Malouines</standard>
-					<daylight>heure avancée des îles Malouines</daylight>
-				</long>
-				<short>
-					<generic>HFK</generic>
-					<standard>HNFK</standard>
-					<daylight>HAFK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<generic>heure des îles Fidji</generic>
-					<standard>heure des îles Fidji</standard>
-					<daylight>heure avancée des îles Fidji</daylight>
-				</long>
-				<short>
-					<generic>HFJ</generic>
-					<standard>HNFJ</standard>
-					<daylight>HAFJ</daylight>
-				</short>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<generic>heure de Guyane française</generic>
-					<standard>heure de Guyane française</standard>
-					<daylight>heure avancée de Guyane française</daylight>
-				</long>
-				<short>
-					<generic>HGF</generic>
-					<standard>HNGF</standard>
-					<daylight>HAGF</daylight>
-				</short>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<generic>heure des Terres australes françaises</generic>
-					<standard>heure des Terres australes françaises</standard>
-					<daylight>heure avancée des Terres australes françaises</daylight>
-				</long>
-				<short>
-					<generic>HTF</generic>
-					<standard>HNTF</standard>
-					<daylight>HATF</daylight>
-				</short>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<generic>heure de Frounzé</generic>
-					<standard>heure de Frounzé</standard>
-					<daylight>heure avancée de Frounzé</daylight>
-				</long>
-				<short>
-					<generic>HFRU</generic>
-					<standard>FNFRU</standard>
-					<daylight>HAFRU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<generic>heure des îles Galápagos</generic>
-					<standard>heure des îles Galápagos</standard>
-					<daylight>heure avancée des îles Galápagos</daylight>
-				</long>
-				<short>
-					<generic>HGAL</generic>
-					<standard>HNGAL</standard>
-					<daylight>HAGAL</daylight>
-				</short>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<generic>heure des îles Gambier</generic>
-					<standard>heure des îles Gambier</standard>
-					<daylight>heure avancée des îles Gambier</daylight>
-				</long>
-				<short>
-					<generic>HGAM</generic>
-					<standard>HNGAM</standard>
-					<daylight>HAGAM</daylight>
-				</short>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<generic>heure de Géorgie</generic>
-					<standard>heure de Géorgie</standard>
-					<daylight>heure avancée de Géorgie</daylight>
-				</long>
-				<short>
-					<generic>HGE</generic>
-					<standard>HNGE</standard>
-					<daylight>HAGE</daylight>
-				</short>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<generic>heure des îles Gilbert</generic>
-					<standard>heure des îles Gilbert</standard>
-					<daylight>heure avancée des îles Gilbert</daylight>
-				</long>
-				<short>
-					<generic>HGIL</generic>
-					<standard>HNGIL</standard>
-					<daylight>HAGIL</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>heure moyenne de Greenwich</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Goose_Bay">
-				<long>
-					<generic>heure de Goose Bay</generic>
-					<standard>heure normale de Goose Bay</standard>
-					<daylight>heure avancée de Goose Bay</daylight>
-				</long>
-				<short>
-					<generic>HGOB</generic>
-					<standard>HNGOB</standard>
-					<daylight>HAGOB</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<generic>heure du Centre du Groenland</generic>
-					<standard>heure du Centre du Groenland</standard>
-					<daylight>heure avancée du Centre du Groenland</daylight>
-				</long>
-				<short>
-					<generic>HC (GL)</generic>
-					<standard>HNC (GL)</standard>
-					<daylight>HAC (GL)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<generic>heure de l’Est du Groenland</generic>
-					<standard>heure de l’Est du Groenland</standard>
-					<daylight>heure avancée de l’Est du Groenland</daylight>
-				</long>
-				<short>
-					<generic>HE (GL)</generic>
-					<standard>HNE (GL)</standard>
-					<daylight>HAE (GL)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<generic>heure de l’Ouest du Groenland</generic>
-					<standard>heure de l’Ouest du Groenland</standard>
-					<daylight>heure avancée de l’Ouest du Groenland</daylight>
-				</long>
-				<short>
-					<generic>HO (GL)</generic>
-					<standard>HNO (GL)</standard>
-					<daylight>HAO (GL)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<generic>heure de Guam</generic>
-					<standard>heure de Guam</standard>
-					<daylight>heure avancée de Guam</daylight>
-				</long>
-				<short>
-					<generic>HGU</generic>
-					<standard>HNGU</standard>
-					<daylight>HAGU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>heure du Golfe</generic>
-					<standard>heure normale du Golfe</standard>
-					<daylight>heure avancée du Golfe</daylight>
-				</long>
-				<short>
-					<generic>HG</generic>
-					<standard>HNG</standard>
-					<daylight>HAG</daylight>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<generic>heure du Guyana</generic>
-					<standard>heure du Guyana</standard>
-					<daylight>heure avancée du Guyana</daylight>
-				</long>
-				<short>
-					<generic>HGY</generic>
-					<standard>HNGY</standard>
-					<daylight>HAGY</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<generic>heure d’Hawaii - Aléoutiennes</generic>
-					<standard>heure normale d’Hawaii - Aléoutiennes</standard>
-					<daylight>heure avancée d’Hawaii - Aléoutiennes</daylight>
-				</long>
-				<short>
-					<generic>HH</generic>
-					<standard>HNH</standard>
-					<daylight>HAH</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<generic>heure de Hong Kong</generic>
-					<standard>heure de Hong Kong</standard>
-					<daylight>heure avancée de Hong Kong</daylight>
-				</long>
-				<short>
-					<generic>HHK</generic>
-					<standard>HNHK</standard>
-					<daylight>HAHK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<generic>heure de Hovd</generic>
-					<standard>heure de Hovd</standard>
-					<daylight>heure avancée de Hovd</daylight>
-				</long>
-				<short>
-					<generic>HHOV</generic>
-					<standard>HNHOV</standard>
-					<daylight>HAHOV</daylight>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<generic>heure de l’Inde</generic>
-					<standard>heure normale de l’Inde</standard>
-					<daylight>heure avancée de l’Inde</daylight>
-				</long>
-				<short>
-					<generic>HI (IN)</generic>
-					<standard>HNI (IN)</standard>
-					<daylight>HAI (IN)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<generic>heure du Territoire britannique de l’océan Indien</generic>
-					<standard>heure du Territoire britannique de l’océan Indien</standard>
-					<daylight>heure avancée du Territoire britannique de l’océan Indien</daylight>
-				</long>
-				<short>
-					<generic>HIO</generic>
-					<standard>HNIO</standard>
-					<daylight>HAIO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<generic>heure d’Indochine</generic>
-					<standard>heure d’Indochine</standard>
-					<daylight>heure avancée d’Indochine</daylight>
-				</long>
-				<short>
-					<generic>HIDC</generic>
-					<standard>HNIDC</standard>
-					<daylight>HAIDC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<generic>heure du Centre indonésien</generic>
-					<standard>heure normale du Centre indonésien</standard>
-					<daylight>heure avancée du Centre indonésien</daylight>
-				</long>
-				<short>
-					<generic>HC (ID)</generic>
-					<standard>HNC (ID)</standard>
-					<daylight>HAC (ID)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<generic>heure de l’Est indonésien</generic>
-					<standard>heure normale de l’Est indonésien</standard>
-					<daylight>heure avancée de l’Est indonésien</daylight>
-				</long>
-				<short>
-					<generic>HE (ID)</generic>
-					<standard>HNE (ID)</standard>
-					<daylight>HAE (ID)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<generic>heure de l’Ouest indonésien</generic>
-					<standard>heure normale de l’Ouest indonésien</standard>
-					<daylight>heure avancée de l’Ouest indonésien</daylight>
-				</long>
-				<short>
-					<generic>HO (ID)</generic>
-					<standard>HNO (ID)</standard>
-					<daylight>HAO (ID)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>heure d’Iran</generic>
-					<standard>heure normale d’Iran</standard>
-					<daylight>heure avancée d’Iran</daylight>
-				</long>
-				<short>
-					<generic>HIR</generic>
-					<standard>HNIR</standard>
-					<daylight>HAIR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Irish">
-				<long>
-					<generic>heure d’Irlande</generic>
-					<standard>heure normale d’Irlande</standard>
-					<daylight>heure avancée d’Irlande</daylight>
-				</long>
-				<short>
-					<generic>HIE</generic>
-					<standard>HNIE</standard>
-					<daylight>HAIE</daylight>
-				</short>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<generic>heure d’Irkoutsk</generic>
-					<standard>heure d’Irkoutsk</standard>
-					<daylight>heure avancée d’Irkoutsk</daylight>
-				</long>
-				<short>
-					<generic>HIRK</generic>
-					<standard>HNIRK</standard>
-					<daylight>HAIRK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>heure d’Israël</generic>
-					<standard>heure normale d’Israël</standard>
-					<daylight>heure avancée d’Israël</daylight>
-				</long>
-				<short>
-					<generic>HI (IL)</generic>
-					<standard>HNI</standard>
-					<daylight>HAI</daylight>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>heure du Japon</generic>
-					<standard>heure normale du Japon</standard>
-					<daylight>heure avancée du Japon</daylight>
-				</long>
-				<short>
-					<generic>HJ</generic>
-					<standard>HNJ</standard>
-					<daylight>HAJ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<generic>heure de Petropavlovsk-Kamchatski</generic>
-					<standard>heure de Petropavlovsk-Kamchatski</standard>
-					<daylight>heure avancée de Petropavlovsk-Kamchatski</daylight>
-				</long>
-				<short>
-					<generic>HPET</generic>
-					<standard>HNPET</standard>
-					<daylight>HAPET</daylight>
-				</short>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<generic>heure de Karâchi</generic>
-					<standard>heure de Karâchi</standard>
-					<daylight>heure avancée de Karâchi</daylight>
-				</long>
-				<short>
-					<generic>HKAR</generic>
-					<standard>HNKAR</standard>
-					<daylight>HAKAR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<generic>heure de Kachgar</generic>
-					<standard>heure de Kachgar</standard>
-					<daylight>heure avancée de Kachgar</daylight>
-				</long>
-				<short>
-					<generic>HKAC</generic>
-					<standard>HNKAC</standard>
-					<daylight>HAKAC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>heure de l’Est kazakh</generic>
-					<standard>heure normale de l’Est kazakh</standard>
-					<daylight>heure avancée de l’Est kazakh</daylight>
-				</long>
-				<short>
-					<generic>HE (KZ)</generic>
-					<standard>HNE (KZ)</standard>
-					<daylight>HAE (KZ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>heure de l’Ouest kazakh</generic>
-					<standard>heure normale de l’Ouest kazakh</standard>
-					<daylight>heure avancée de l’Ouest kazakh</daylight>
-				</long>
-				<short>
-					<generic>HO (KZ)</generic>
-					<standard>HNO (KZ)</standard>
-					<daylight>HAO (KZ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<generic>heure de Kyzylorda</generic>
-					<standard>heure de Kyzylorda</standard>
-					<daylight>heure avancée de Kyzylorda</daylight>
-				</long>
-				<short>
-					<generic>HKYZ</generic>
-					<standard>HNKYZ</standard>
-					<daylight>HAKYZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>heure de Corée</generic>
-					<standard>heure normale de Corée</standard>
-					<daylight>heure avancée de Corée</daylight>
-				</long>
-				<short>
-					<generic>HKR</generic>
-					<standard>HNKR</standard>
-					<daylight>HAKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<generic>heure de Kosrae</generic>
-					<standard>heure de Kosrae</standard>
-					<daylight>heure avancée de Kosrae</daylight>
-				</long>
-				<short>
-					<generic>HKOS</generic>
-					<standard>HNKOS</standard>
-					<daylight>HAKOS</daylight>
-				</short>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<generic>heure de Krasnoïarsk</generic>
-					<standard>heure de Krasnoïarsk</standard>
-					<daylight>heure avancée de Krasnoïarsk</daylight>
-				</long>
-				<short>
-					<generic>HKRA</generic>
-					<standard>HNKRA</standard>
-					<daylight>HAKRA</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<generic>heure de Kouïbychev</generic>
-					<standard>heure de Kouïbychev</standard>
-					<daylight>heure avancée de Kouïbychev</daylight>
-				</long>
-				<short>
-					<generic>HKUY</generic>
-					<standard>HNKUY</standard>
-					<daylight>HAKUY</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<generic>heure de Kwajalein</generic>
-					<standard>heure de Kwajalein</standard>
-					<daylight>heure avancée de Kwajalein</daylight>
-				</long>
-				<short>
-					<generic>HKWA</generic>
-					<standard>HNKWA</standard>
-					<daylight>HAKWA</daylight>
-				</short>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<generic>heure des îles de la Ligne</generic>
-					<standard>heure normale des îles de la Ligne</standard>
-					<daylight>heure avancée des îles de la Ligne</daylight>
-				</long>
-				<short>
-					<generic>HLIGN</generic>
-					<standard>HNLIGN</standard>
-					<daylight>HALIGN</daylight>
-				</short>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<generic>heure des Maldives</generic>
-					<standard>heure normale des Maldives</standard>
-					<daylight>heure avancée des Maldives</daylight>
-				</long>
-				<short>
-					<generic>HMV</generic>
-					<standard>HNMV</standard>
-					<daylight>HAMV</daylight>
-				</short>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<generic>heure des îles Marquises</generic>
-					<standard>heure normale des îles Marquises</standard>
-					<daylight>heure avancée des îles Marquises</daylight>
-				</long>
-				<short>
-					<generic>HMA (PF)</generic>
-					<standard>HNMA (PF)</standard>
-					<daylight>HAMA (PF)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<generic>heure des îles Marshall</generic>
-					<standard>heure normale des îles Marshall</standard>
-					<daylight>heure avancée des îles Marshall</daylight>
-				</long>
-				<short>
-					<generic>HMH</generic>
-					<standard>HNMH</standard>
-					<daylight>HAMH</daylight>
-				</short>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<generic>heure de Maurice</generic>
-					<standard>heure normale de Maurice</standard>
-					<daylight>heure avancée de Maurice</daylight>
-				</long>
-				<short>
-					<generic>HMU</generic>
-					<standard>HNMU</standard>
-					<daylight>HAMU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>heure de Moscou</generic>
-					<standard>heure normale de Moscou</standard>
-					<daylight>heure avancée de Moscou</daylight>
-				</long>
-				<short>
-					<generic>HMOS</generic>
-					<standard>HNMO</standard>
-					<daylight>HAMO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<generic>heure de Nauru</generic>
-					<standard>heure normale de Nauru</standard>
-					<daylight>heure avancée de Nauru</daylight>
-				</long>
-				<short>
-					<generic>HNR</generic>
-					<standard>HNNR</standard>
-					<daylight>HANR</daylight>
-				</short>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<generic>heure de Nouvelle-Calédonie</generic>
-					<standard>heure normale de Nouvelle-Calédonie</standard>
-					<daylight>heure avancée de Nouvelle-Calédonie</daylight>
-				</long>
-				<short>
-					<generic>HNC</generic>
-					<standard>HNNC</standard>
-					<daylight>HANC</daylight>
-				</short>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>heure de Nouvelle-Zélande</generic>
-					<standard>heure normale de Nouvelle-Zélande</standard>
-					<daylight>heure avancée de Nouvelle-Zélande</daylight>
-				</long>
-				<short>
-					<generic>HNZ</generic>
-					<standard>HNNZ</standard>
-					<daylight>HANZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>heure de Terre-Neuve</generic>
-					<standard>heure normale de Terre-Neuve</standard>
-					<daylight>heure avancée de Terre-Neuve</daylight>
-				</long>
-				<short>
-					<generic>HT</generic>
-					<standard>HNT</standard>
-					<daylight>HAT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<generic>heure de Nioué</generic>
-					<standard>heure normale de Nioué</standard>
-					<daylight>heure avancée de Nioué</daylight>
-				</long>
-				<short>
-					<generic>HNU</generic>
-					<standard>HNNU</standard>
-					<daylight>HANU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<generic>heure de Norfolk</generic>
-					<standard>heure normale de Norfolk</standard>
-					<daylight>heure avancée de Norfolk</daylight>
-				</long>
-				<short>
-					<generic>HNF</generic>
-					<standard>HNNF</standard>
-					<daylight>HANF</daylight>
-				</short>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<generic>heure des îles Mariannes du Nord</generic>
-					<standard>heure normale des îles Mariannes du Nord</standard>
-					<daylight>heure avancée des îles Mariannes du Nord</daylight>
-				</long>
-				<short>
-					<generic>HMP</generic>
-					<standard>HNMP</standard>
-					<daylight>HAMP</daylight>
-				</short>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<generic>heure de Palaos</generic>
-					<standard>heure normale de Palaos</standard>
-					<daylight>heure avancée de Palaos</daylight>
-				</long>
-				<short>
-					<generic>HPW</generic>
-					<standard>HNPW</standard>
-					<daylight>HAPW</daylight>
-				</short>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<generic>heure de Papouasie-Nouvelle-Guinée</generic>
-					<standard>heure normale de Papouasie-Nouvelle-Guinée</standard>
-					<daylight>heure avancée de Papouasie-Nouvelle-Guinée</daylight>
-				</long>
-				<short>
-					<generic>HPG</generic>
-					<standard>HNPG</standard>
-					<daylight>HAPG</daylight>
-				</short>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<generic>heure des îles Phoenix</generic>
-					<standard>heure normale des îles Phoenix</standard>
-					<daylight>heure avancée des îles Phoenix</daylight>
-				</long>
-				<short>
-					<generic>HPHO</generic>
-					<standard>HNPHO</standard>
-					<daylight>HAPHO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<generic>heure de Pitcairn</generic>
-					<standard>heure normale de Pitcairn</standard>
-					<daylight>heure avancée de Pitcairn</daylight>
-				</long>
-				<short>
-					<generic>HPN</generic>
-					<standard>HNPN</standard>
-					<daylight>HAPN</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<generic>heure de Ponape</generic>
-					<standard>heure normale de Ponape</standard>
-					<daylight>heure avancée de Ponape</daylight>
-				</long>
-				<short>
-					<generic>HPON</generic>
-					<standard>HNPON</standard>
-					<daylight>HAPON</daylight>
-				</short>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<generic>heure de la Réunion</generic>
-					<standard>heure normale de la Réunion</standard>
-					<daylight>heure avancée de la Réunion</daylight>
-				</long>
-				<short>
-					<generic>HRE</generic>
-					<standard>HNRE</standard>
-					<daylight>HARE</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<generic>heure de Samara</generic>
-					<standard>heure de Samara</standard>
-					<daylight>heure avancée de Samara</daylight>
-				</long>
-				<short>
-					<generic>HSAM</generic>
-					<standard>HNSA</standard>
-					<daylight>HASAM</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<generic>heure de Samoa</generic>
-					<standard>heure normale de Samoa</standard>
-					<daylight>heure avancée de Samoa</daylight>
-				</long>
-				<short>
-					<generic>HS</generic>
-					<standard>HNS</standard>
-					<daylight>HAS</daylight>
-				</short>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<generic>heure des Seychelles</generic>
-					<standard>heure normale des Seychelles</standard>
-					<daylight>heure avancée des Seychelles</daylight>
-				</long>
-				<short>
-					<generic>HSC</generic>
-					<standard>HNSC</standard>
-					<daylight>HASC</daylight>
-				</short>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<generic>heure des îles Salomon</generic>
-					<standard>heure normale des îles Salomon</standard>
-					<daylight>heure avancée des îles Salomon</daylight>
-				</long>
-				<short>
-					<generic>HSB</generic>
-					<standard>HNSB</standard>
-					<daylight>HASB</daylight>
-				</short>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>heure de Géorgie du Sud</standard>
-				</long>
-				<short>
-					<standard>HNG</standard>
-				</short>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<generic>heure de Tahiti</generic>
-					<standard>heure normale de Tahiti</standard>
-					<daylight>heure avancée de Tahiti</daylight>
-				</long>
-				<short>
-					<generic>HTAH</generic>
-					<standard>HNTAH</standard>
-					<daylight>HATAH</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<generic>heure de Tokelau</generic>
-					<standard>heure normale de Tokelau</standard>
-					<daylight>heure avancée de Tokelau</daylight>
-				</long>
-				<short>
-					<generic>HTK</generic>
-					<standard>HNTK</standard>
-					<daylight>HATK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<generic>heure de Tonga</generic>
-					<standard>heure normale de Tonga</standard>
-					<daylight>heure avancée de Tonga</daylight>
-				</long>
-				<short>
-					<generic>HTO</generic>
-					<standard>HNTO</standard>
-					<daylight>HATO</daylight>
-				</short>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<generic>heure de Truk</generic>
-					<standard>heure normale de Truk</standard>
-					<daylight>heure avancée de Truk</daylight>
-				</long>
-				<short>
-					<generic>HTRU</generic>
-					<standard>HNTRU</standard>
-					<daylight>HATRU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<generic>heure de Turquie</generic>
-					<standard>heure de Turquie</standard>
-					<daylight>heure avancée de Turquie</daylight>
-				</long>
-				<short>
-					<generic>HTR</generic>
-					<standard>HNTR</standard>
-					<daylight>HATR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<generic>heure des Tuvalu</generic>
-					<standard>heure normale des Tuvalu</standard>
-					<daylight>heure avancée des Tuvalu</daylight>
-				</long>
-				<short>
-					<generic>HTV</generic>
-					<standard>HNTV</standard>
-					<daylight>HATV</daylight>
-				</short>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<generic>heure de Vanuatu</generic>
-					<standard>heure normale de Vanuatu</standard>
-					<daylight>heure avancée de Vanuatu</daylight>
-				</long>
-				<short>
-					<generic>HVU</generic>
-					<standard>HNVU</standard>
-					<daylight>HAVU</daylight>
-				</short>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<generic>heure de Volgograd</generic>
-					<standard>heure de Volgograd</standard>
-					<daylight>heure avancée de Volgograd</daylight>
-				</long>
-				<short>
-					<generic>HVOL</generic>
-					<standard>HNVO</standard>
-					<daylight>HAVOL</daylight>
-				</short>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<generic>heure de l’île Wake</generic>
-					<standard>heure normale de l’île Wake</standard>
-					<daylight>heure avancée de l’île Wake</daylight>
-				</long>
-				<short>
-					<generic>HWAK</generic>
-					<standard>HNWAK</standard>
-					<daylight>HAWAK</daylight>
-				</short>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<generic>heure de Wallis-et-Futuna</generic>
-					<standard>heure normale de Wallis-et-Futuna</standard>
-					<daylight>heure avancée de Wallis-et-Futuna</daylight>
-				</long>
-				<short>
-					<generic>HWF</generic>
-					<standard>HNWF</standard>
-					<daylight>HAWF</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>heure du Yukon</generic>
-					<standard>heure normale du Yukon</standard>
-					<daylight>heure avancée du Yukon</daylight>
-				</long>
-				<short>
-					<generic>HY</generic>
-					<standard>HNY</standard>
-					<daylight>HAY</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>peseta andorrane</displayName>
-				<displayName count="one">peseta andorrane</displayName>
-				<displayName count="other">pesetas andorranes</displayName>
-				<symbol>₧A</symbol>
-			</currency>
-			<currency type="AED">
-				<displayName>dirham des Émirats arabes unis</displayName>
-				<displayName count="one">dirham des Émirats arabes unis</displayName>
-				<displayName count="other">dirhams des Émirats arabes unis</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afghani (1927–2002)</displayName>
-				<displayName count="one">afghani (1927–2002)</displayName>
-				<displayName count="other">afghanis (1927–2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afghani</displayName>
-				<displayName count="one">afghani</displayName>
-				<displayName count="other">afghanis</displayName>
-			</currency>
-			<currency type="ALK">
-				<displayName>lek albanais (1947–1961)</displayName>
-				<displayName count="one">lek albanais (1947–1961)</displayName>
-				<displayName count="other">leks albanais (1947–1961)</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>lek albanais</displayName>
-				<displayName count="one">lek albanais</displayName>
-				<displayName count="other">leks albanais</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram arménien</displayName>
-				<displayName count="one">dram arménien</displayName>
-				<displayName count="other">drams arméniens</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>florin antillais</displayName>
-				<displayName count="one">florin antillais</displayName>
-				<displayName count="other">florins antillais</displayName>
-				<symbol>f.NA</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>kwanza angolais</displayName>
-				<displayName count="one">kwanza angolais</displayName>
-				<displayName count="other">kwanzas angolais</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>kwanza angolais (1977-1990)</displayName>
-				<displayName count="one">kwanza angolais (1977–1990)</displayName>
-				<displayName count="other">kwanzas angolais (1977–1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>nouveau kwanza angolais (1990-2000)</displayName>
-				<displayName count="one">nouveau kwanza angolais (1990–2000)</displayName>
-				<displayName count="other">nouveaux kwanzas angolais (1990–2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>kwanza angolais réajusté (1995-1999)</displayName>
-				<displayName count="one">kwanza angolais réajusté (1995–1999)</displayName>
-				<displayName count="other">kwanzas angolais réajustés (1995–1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>austral argentin</displayName>
-				<displayName count="one">austral argentin</displayName>
-				<displayName count="other">australs argentins</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>peso argentin (1983-1985)</displayName>
-				<displayName count="one">peso argentin (1983–1985)</displayName>
-				<displayName count="other">pesos argentins (1983–1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>peso argentin</displayName>
-				<displayName count="one">peso argentin</displayName>
-				<displayName count="other">pesos argentins</displayName>
-				<symbol>$AR</symbol>
-			</currency>
-			<currency type="ATS">
-				<displayName>schilling autrichien</displayName>
-				<displayName count="one">schilling autrichien</displayName>
-				<displayName count="other">schillings autrichiens</displayName>
-				<symbol>öS</symbol>
-			</currency>
-			<currency type="AUD">
-				<displayName>dollar australien</displayName>
-				<displayName count="one">dollar australien</displayName>
-				<displayName count="other">dollars australiens</displayName>
-				<symbol>$AU</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>florin arubais</displayName>
-				<displayName count="one">florin arubais</displayName>
-				<displayName count="other">florins arubais</displayName>
-				<symbol>f.AW</symbol>
-			</currency>
-			<currency type="AZM">
-				<displayName>manat azéri (1993-2006)</displayName>
-				<displayName count="one">manat azéri (1993–2006)</displayName>
-				<displayName count="other">manats azéris (1993–2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat azéri</displayName>
-				<displayName count="one">manat azéri</displayName>
-				<displayName count="other">manats azéris</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>dinar bosniaque</displayName>
-				<displayName count="one">dinar bosniaque</displayName>
-				<displayName count="other">dinars bosniaques</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>mark convertible bosniaque</displayName>
-				<displayName count="one">mark convertible bosniaque</displayName>
-				<displayName count="other">marks convertibles bosniaques</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>dollar barbadien</displayName>
-				<displayName count="one">dollar barbadien</displayName>
-				<displayName count="other">dollars barbadiens</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka bangladeshi</displayName>
-				<displayName count="one">taka bangladeshi</displayName>
-				<displayName count="other">takas bangladeshis</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>franc belge (convertible)</displayName>
-				<displayName count="one">franc belge (convertible)</displayName>
-				<displayName count="other">francs belges (convertibles)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>franc belge</displayName>
-				<displayName count="one">franc belge</displayName>
-				<displayName count="other">francs belges</displayName>
-				<symbol>FB</symbol>
-			</currency>
-			<currency type="BEL">
-				<displayName>franc belge (financier)</displayName>
-				<displayName count="one">franc belge (financier)</displayName>
-				<displayName count="other">francs belges (financiers)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>lev bulgare (1962–1999)</displayName>
-				<displayName count="one">lev bulgare (1962–1999)</displayName>
-				<displayName count="other">levs bulgares (1962–1999)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>nouveau lev bulgare</displayName>
-				<displayName count="one">nouveau lev bulgare</displayName>
-				<displayName count="other">nouveaux levs bulgares</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>dinar bahreïni</displayName>
-				<displayName count="one">dinar bahreïni</displayName>
-				<displayName count="other">dinars bahreïnis</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>franc burundais</displayName>
-				<displayName count="one">franc burundais</displayName>
-				<displayName count="other">francs burundais</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>dollar bermudien</displayName>
-				<displayName count="one">dollar bermudien</displayName>
-				<displayName count="other">dollars bermudiens</displayName>
-				<symbol>$BM</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>dollar brunéien</displayName>
-				<displayName count="one">dollar brunéien</displayName>
-				<displayName count="other">dollars brunéiens</displayName>
-				<symbol>$BN</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<displayName count="one">boliviano</displayName>
-				<displayName count="other">bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>peso bolivien</displayName>
-				<displayName count="one">peso bolivien</displayName>
-				<displayName count="other">pesos boliviens</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>mvdol bolivien</displayName>
-				<displayName count="one">mvdol bolivien</displayName>
-				<displayName count="other">mvdols boliviens</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>nouveau cruzeiro brésilien (1967–1986)</displayName>
-				<displayName count="one">nouveau cruzeiro brésilien (1967–1986)</displayName>
-				<displayName count="other">nouveaux cruzeiros brésiliens (1967–1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>cruzado brésilien (1986–1989)</displayName>
-				<displayName count="one">cruzado brésilien (1986–1989)</displayName>
-				<displayName count="other">cruzados brésiliens (1986–1989)</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>cruzeiro brésilien (1990–1993)</displayName>
-				<displayName count="one">cruzeiro brésilien (1990–1993)</displayName>
-				<displayName count="other">cruzeiros brésiliens (1990–1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>réal brésilien</displayName>
-				<displayName count="one">réal brésilien</displayName>
-				<displayName count="other">réals brésiliens</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>nouveau cruzado</displayName>
-				<displayName count="one">nouveau cruzado brésilien (1989–1990)</displayName>
-				<displayName count="other">nouveaux cruzados brésiliens (1989–1990)</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>cruzeiro</displayName>
-				<displayName count="one">cruzeiro réal brésilien (1993–1994)</displayName>
-				<displayName count="other">cruzeiros réals brésiliens (1993–1994)</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>dollar bahaméen</displayName>
-				<displayName count="one">dollar bahaméen</displayName>
-				<displayName count="other">dollars bahaméens</displayName>
-				<symbol>$BS</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum bouthanais</displayName>
-				<displayName count="one">ngultrum bouthanais</displayName>
-				<displayName count="other">ngultrums bouthanais</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat birman</displayName>
-				<displayName count="one">kyat birman</displayName>
-				<displayName count="other">kyats birmans</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula botswanais</displayName>
-				<displayName count="one">pula botswanais</displayName>
-				<displayName count="other">pulas botswanais</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>nouveau rouble biélorusse (1994-1999)</displayName>
-				<displayName count="one">nouveau rouble biélorusse (1994–1999)</displayName>
-				<displayName count="other">nouveaux roubles biélorusses (1994–1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>rouble biélorusse</displayName>
-				<displayName count="one">rouble biélorusse</displayName>
-				<displayName count="other">roubles biélorusses</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>dollar bélizéen</displayName>
-				<displayName count="one">dollar bélizéen</displayName>
-				<displayName count="other">dollars bélizéens</displayName>
-				<symbol>$BZ</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>dollar canadien</displayName>
-				<displayName count="one">dollar canadien</displayName>
-				<displayName count="other">dollars canadiens</displayName>
-				<symbol>$CA</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>franc congolais</displayName>
-				<displayName count="one">franc congolais</displayName>
-				<displayName count="other">francs congolais</displayName>
-				<symbol>FrCD</symbol>
-			</currency>
-			<currency type="CHE">
-				<displayName>euro WIR</displayName>
-				<displayName count="one">euro WIR</displayName>
-				<displayName count="other">euros WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>franc suisse</displayName>
-				<displayName count="one">franc suisse</displayName>
-				<displayName count="other">francs suisses</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CHW">
-				<displayName>franc WIR</displayName>
-				<displayName count="one">franc WIR</displayName>
-				<displayName count="other">francs WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>unité d’investissement chilienne</displayName>
-				<displayName count="one">unité d’investissement chilienne</displayName>
-				<displayName count="other">unités d’investissement chiliennes</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>peso chilien</displayName>
-				<displayName count="one">peso chilien</displayName>
-				<displayName count="other">pesos chiliens</displayName>
-				<symbol>$CL</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>yuan renminbi chinois</displayName>
-				<displayName count="one">yuan renminbi chinois</displayName>
-				<displayName count="other">yuans renminbi chinois</displayName>
-				<symbol>Ò°</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>peso colombien</displayName>
-				<displayName count="one">peso colombien</displayName>
-				<displayName count="other">peso colombien</displayName>
-				<symbol>$CO</symbol>
-			</currency>
-			<currency type="COU">
-				<displayName>Unité de valeur réelle colombienne</displayName>
-				<displayName count="one">unité de valeur réelle colombienne</displayName>
-				<displayName count="other">unités de valeur réelle colombiennes</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>colón costaricain</displayName>
-				<displayName count="one">colón costaricain</displayName>
-				<displayName count="other">colóns costaricains</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>dinar serbo-monténégrin</displayName>
-				<displayName count="one">dinar serbo-monténégrin</displayName>
-				<displayName count="other">dinars serbo-monténégrins</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>couronne forte tchécoslovaque</displayName>
-				<displayName count="one">couronne forte tchécoslovaque</displayName>
-				<displayName count="other">couronnes fortes tchécoslovaques</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>peso cubain</displayName>
-				<displayName count="one">peso cubain</displayName>
-				<displayName count="other">pesos cubains</displayName>
-				<symbol>$CU</symbol>
-			</currency>
-			<currency type="CVE">
-				<displayName>escudo capverdien</displayName>
-				<displayName count="one">escudo capverdien</displayName>
-				<displayName count="other">escudos capverdiens</displayName>
-				<symbol>$CV</symbol>
-			</currency>
-			<currency type="CYP">
-				<displayName>livre chypriote</displayName>
-				<displayName count="one">livre chypriote</displayName>
-				<displayName count="other">livres chypriotes</displayName>
-				<symbol>£CY</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>couronne tchèque</displayName>
-				<displayName count="one">couronne tchèque</displayName>
-				<displayName count="other">couronnes tchèques</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>mark est-allemand</displayName>
-				<displayName count="one">mark est-allemand</displayName>
-				<displayName count="other">marks est-allemands</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>mark allemand</displayName>
-				<displayName count="one">mark allemand</displayName>
-				<displayName count="other">marks allemands</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>franc djiboutien</displayName>
-				<displayName count="one">franc djiboutien</displayName>
-				<displayName count="other">francs djiboutiens</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>couronne danoise</displayName>
-				<displayName count="one">couronne danoise</displayName>
-				<displayName count="other">couronnes danoises</displayName>
-				<symbol>krD</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>peso dominicain</displayName>
-				<displayName count="one">peso dominicain</displayName>
-				<displayName count="other">pesos dominicains</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar algérien</displayName>
-				<displayName count="one">dinar algérien</displayName>
-				<displayName count="other">dinars algériens</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>sucre équatorien</displayName>
-				<displayName count="one">sucre équatorien</displayName>
-				<displayName count="other">sucres équatoriens</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>unité de valeur constante équatoriale (UVC)</displayName>
-				<displayName count="one">unité de valeur constante équatorienne (UVC)</displayName>
-				<displayName count="other">unités de valeur constante équatoriennes (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>couronne estonienne</displayName>
-				<displayName count="one">couronne estonienne</displayName>
-				<displayName count="other">couronnes estoniennes</displayName>
-				<symbol>krE</symbol>
-			</currency>
-			<currency type="EGP">
-				<displayName>livre égyptienne</displayName>
-				<displayName count="one">livre égyptienne</displayName>
-				<displayName count="other">livres égyptiennes</displayName>
-				<symbol>£EG</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>nafka érythréen</displayName>
-				<displayName count="one">nafka érythréen</displayName>
-				<displayName count="other">nafkas érythréens</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>peseta espagnole (compte A)</displayName>
-				<displayName count="one">peseta espagnole (compte A)</displayName>
-				<displayName count="other">pesetas espagnoles (compte A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>peseta espagnole (compte convertible)</displayName>
-				<displayName count="one">peseta espagnole (compte convertible)</displayName>
-				<displayName count="other">pesetas espagnoles (compte convertible)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>peseta espagnole</displayName>
-				<displayName count="one">peseta espagnole</displayName>
-				<displayName count="other">pesetas espagnoles</displayName>
-				<symbol>₧</symbol>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr éthiopien</displayName>
-				<displayName count="one">birr éthiopien</displayName>
-				<displayName count="other">birrs éthiopiens</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>mark finlandais</displayName>
-				<displayName count="one">mark finlandais</displayName>
-				<displayName count="other">marks finlandais</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>dollar fidjien</displayName>
-				<displayName count="one">dollar fidjien</displayName>
-				<displayName count="other">dollars fidjien</displayName>
-				<symbol>$FJ</symbol>
-			</currency>
-			<currency type="FKP">
-				<displayName>livre des Falkland</displayName>
-				<displayName count="one">livre des Falkland</displayName>
-				<displayName count="other">livres des Falkland</displayName>
-				<symbol>£FK</symbol>
-			</currency>
-			<currency type="FRF">
-				<displayName>franc français</displayName>
-				<displayName count="one">franc français</displayName>
-				<displayName count="other">francs français</displayName>
-				<symbol>F</symbol>
-			</currency>
-			<currency type="GBP">
-				<displayName>livre sterling</displayName>
-				<displayName count="one">livre sterling</displayName>
-				<displayName count="other">livres sterling</displayName>
-				<symbol>£UK</symbol>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgian Kupon Larit</displayName>
-				<displayName count="one">coupon de lari géorgien</displayName>
-				<displayName count="other">coupons de lari géorgiens</displayName>
-				<symbol>KlGe</symbol>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari géorgien</displayName>
-				<displayName count="one">lari géorgien</displayName>
-				<displayName count="other">laris géorgiens</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>cédi</displayName>
-				<displayName count="one">cédi ghanéen (1967–2007)</displayName>
-				<displayName count="other">cédis ghanéens (1967–2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>cédi ghanéen</displayName>
-				<displayName count="one">cédi ghanéen</displayName>
-				<displayName count="other">cédis ghanéens</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>livre de Gibraltar</displayName>
-				<displayName count="one">livre de Gibraltar</displayName>
-				<displayName count="other">livres de Gibraltar</displayName>
-				<symbol>£GI</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi gambien</displayName>
-				<displayName count="one">dalasi gambien</displayName>
-				<displayName count="other">dalasis gambiens</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>franc guinéen</displayName>
-				<displayName count="one">franc guinéen</displayName>
-				<displayName count="other">francs guinéens</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>syli guinéen</displayName>
-				<displayName count="one">syli guinéen</displayName>
-				<displayName count="other">sylis guinéens</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekwélé équatoguinéen</displayName>
-				<displayName count="one">ekwélé équatoguinéen</displayName>
-				<displayName count="other">ekwélés équatoguinéens</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>drachme grecque</displayName>
-				<displayName count="one">drachme grecque</displayName>
-				<displayName count="other">drachmes grecques</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal guatémaltèque</displayName>
-				<displayName count="one">quetzal guatémaltèque</displayName>
-				<displayName count="other">quetzals guatémaltèques</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>escudo de Guinée portugaise</displayName>
-				<displayName count="one">escudo de Guinée portugaise</displayName>
-				<displayName count="other">escudos de Guinée portugaise</displayName>
-				<symbol>EscGW</symbol>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso bissau-guinéen</displayName>
-				<displayName count="one">peso bissau-guinéen</displayName>
-				<displayName count="other">pesos bissau-guinéens</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>dollar du Guyana</displayName>
-				<displayName count="one">dollar guyanien</displayName>
-				<displayName count="other">dollars guyaniens</displayName>
-				<symbol>$GY</symbol>
-			</currency>
-			<currency type="HKD">
-				<displayName>dollar de Hong Kong</displayName>
-				<displayName count="one">dollar de Hong Kong</displayName>
-				<displayName count="other">dollars de Hong Kong</displayName>
-				<symbol>$HK</symbol>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira hondurien</displayName>
-				<displayName count="one">lempira hondurien</displayName>
-				<displayName count="other">lempiras honduriens</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>dinar croate</displayName>
-				<displayName count="one">dinar croate</displayName>
-				<displayName count="other">dinars croates</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna croate</displayName>
-				<displayName count="one">kuna croate</displayName>
-				<displayName count="other">kunas croates</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde haïtienne</displayName>
-				<displayName count="one">gourde haïtienne</displayName>
-				<displayName count="other">gourdes haïtiennes</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>forint hongrois</displayName>
-				<displayName count="one">forint hongrois</displayName>
-				<displayName count="other">forints hongrois</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>roupie indonésienne</displayName>
-				<displayName count="one">roupie indonésienne</displayName>
-				<displayName count="other">roupies indonésiennes</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>livre irlandaise</displayName>
-				<displayName count="one">livre irlandaise</displayName>
-				<displayName count="other">livres irlandaises</displayName>
-				<symbol>£IE</symbol>
-			</currency>
-			<currency type="ILP">
-				<displayName>livre israélienne</displayName>
-				<displayName count="one">livre israélienne</displayName>
-				<displayName count="other">livres israéliennes</displayName>
-				<symbol>£IL</symbol>
-			</currency>
-			<currency type="ILS">
-				<displayName>nouveau shekel israélien</displayName>
-				<displayName count="one">nouveau shekel israélien</displayName>
-				<displayName count="other">nouveaux shekels israélien</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>roupie indienne</displayName>
-				<displayName count="one">roupie indienne</displayName>
-				<displayName count="other">roupies indiennes</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar irakien</displayName>
-				<displayName count="one">dinar irakien</displayName>
-				<displayName count="other">dinars irakiens</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial iranien</displayName>
-				<displayName count="one">rial iranien</displayName>
-				<displayName count="other">rials iraniens</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>couronne islandaise</displayName>
-				<displayName count="one">couronne islandaise</displayName>
-				<displayName count="other">couronnes islandaises</displayName>
-				<symbol>krI</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>lire italienne</displayName>
-				<displayName count="one">lire italienne</displayName>
-				<displayName count="other">lires italiennes</displayName>
-				<symbol>₤IT</symbol>
-			</currency>
-			<currency type="JMD">
-				<displayName>dollar jamaïcain</displayName>
-				<displayName count="one">dollar jamaïcain</displayName>
-				<displayName count="other">dollars jamaïcains</displayName>
-				<symbol>$JM</symbol>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar jordanien</displayName>
-				<displayName count="one">dinar jordanien</displayName>
-				<displayName count="other">dinars jordaniens</displayName>
-				<symbol>DJ</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>yen japonais</displayName>
-				<displayName count="one">yen japonais</displayName>
-				<displayName count="other">yens japonais</displayName>
-				<symbol>Â¥JP</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>shilling kényan</displayName>
-				<displayName count="one">shilling kényan</displayName>
-				<displayName count="other">shillings kényans</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>som kirghize</displayName>
-				<displayName count="one">som kirghize</displayName>
-				<displayName count="other">soms kirghizes</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel cambodgien</displayName>
-				<displayName count="one">riel cambodgien</displayName>
-				<displayName count="other">riels cambodgiens</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>franc comorien</displayName>
-				<displayName count="one">franc comorien</displayName>
-				<displayName count="other">francs comoriens</displayName>
-				<symbol>FC</symbol>
-			</currency>
-			<currency type="KPW">
-				<displayName>won nord-coréen</displayName>
-				<displayName count="one">won nord-coréen</displayName>
-				<displayName count="other">wons nord-coréens</displayName>
-				<symbol>â‚©KP</symbol>
-			</currency>
-			<currency type="KRW">
-				<displayName>won sud-coréen</displayName>
-				<displayName count="one">won sud-coréen</displayName>
-				<displayName count="other">wons sud-coréens</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar koweïtien</displayName>
-				<displayName count="one">dinar koweïtien</displayName>
-				<displayName count="other">dinar koweïtiens</displayName>
-				<symbol>DK</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName>dollar des îles Caïmanes</displayName>
-				<displayName count="one">dollar des îles Caïmanes</displayName>
-				<displayName count="other">dollars des îles Caïmanes</displayName>
-				<symbol>$KY</symbol>
-			</currency>
-			<currency type="KZT">
-				<displayName>tenge kazakh</displayName>
-				<displayName count="one">tenge kazakh</displayName>
-				<displayName count="other">tenges kazakhs</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip loatien</displayName>
-				<displayName count="one">kip loatien</displayName>
-				<displayName count="other">kips loatiens</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>livre libanaise</displayName>
-				<displayName count="one">livre libanaise</displayName>
-				<displayName count="other">livres libanaises</displayName>
-				<symbol>£LB</symbol>
-			</currency>
-			<currency type="LKR">
-				<displayName>roupie srilankaise</displayName>
-				<displayName count="one">roupie srilankaise</displayName>
-				<displayName count="other">roupies srilankaises</displayName>
-				<symbol>RsSL</symbol>
-			</currency>
-			<currency type="LRD">
-				<displayName>dollar libérien</displayName>
-				<displayName count="one">dollar libérien</displayName>
-				<displayName count="other">dollars libériens</displayName>
-				<symbol>$LR</symbol>
-			</currency>
-			<currency type="LSL">
-				<displayName>loti lesothan</displayName>
-				<displayName count="one">loti lesothan</displayName>
-				<displayName count="other">maloti lesothans</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litas lituanien</displayName>
-				<displayName count="one">litas lituanien</displayName>
-				<displayName count="other">litas lituaniens</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>talonas lituanien</displayName>
-				<displayName count="one">talonas lituanien</displayName>
-				<displayName count="other">talonas lituaniens</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>franc convertible luxembourgeois</displayName>
-				<displayName count="one">franc convertible luxembourgeois</displayName>
-				<displayName count="other">francs convertibles luxembourgeois</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>franc luxembourgeois</displayName>
-				<displayName count="one">franc luxembourgeois</displayName>
-				<displayName count="other">francs luxembourgeois</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>franc financier luxembourgeois</displayName>
-				<displayName count="one">franc financier luxembourgeois</displayName>
-				<displayName count="other">francs financiers luxembourgeois</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>lats letton</displayName>
-				<displayName count="one">lats letton</displayName>
-				<displayName count="other">lats lettons</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>rouble letton</displayName>
-				<displayName count="one">rouble letton</displayName>
-				<displayName count="other">roubles lettons</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar lybien</displayName>
-				<displayName count="one">dinar lybien</displayName>
-				<displayName count="other">dinars lybien</displayName>
-				<symbol>DL</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>dirham marocain</displayName>
-				<displayName count="one">dirham marocain</displayName>
-				<displayName count="other">dirhams marocains</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>franc marocain</displayName>
-				<displayName count="one">franc marocain</displayName>
-				<displayName count="other">francs marocains</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>leu moldave</displayName>
-				<displayName count="one">leu moldave</displayName>
-				<displayName count="other">leus moldaves</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>ariary malgache</displayName>
-				<displayName count="one">ariary malgache</displayName>
-				<displayName count="other">ariarys malgaches</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>franc malgache</displayName>
-				<displayName count="one">franc malgache</displayName>
-				<displayName count="other">francs malgaches</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>denar macédonien</displayName>
-				<displayName count="one">denar macédonien</displayName>
-				<displayName count="other">denars macédoniens</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>franc malien</displayName>
-				<displayName count="one">franc malien</displayName>
-				<displayName count="other">francs maliens</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat myanmarais</displayName>
-				<displayName count="one">kyat myanmarais</displayName>
-				<displayName count="other">kyats myanmarais</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>tugrik mongol</displayName>
-				<displayName count="one">tugrik mongol</displayName>
-				<displayName count="other">tugriks mongols</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>pataca macanaise</displayName>
-				<displayName count="one">pataca macanaise</displayName>
-				<displayName count="other">patacas macanaises</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>ouguiya mauritanien</displayName>
-				<displayName count="one">ouguiya mauritanien</displayName>
-				<displayName count="other">ouguiyas mauritaniens</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>lire maltaise</displayName>
-				<displayName count="one">lire maltaise</displayName>
-				<displayName count="other">lires maltaises</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>livre maltaise</displayName>
-				<displayName count="one">livre maltaise</displayName>
-				<displayName count="other">livres maltaises</displayName>
-				<symbol>£MT</symbol>
-			</currency>
-			<currency type="MUR">
-				<displayName>roupie mauricienne</displayName>
-				<displayName count="one">roupie mauricienne</displayName>
-				<displayName count="other">roupies mauriciennes</displayName>
-				<symbol>RsMU</symbol>
-			</currency>
-			<currency type="MVR">
-				<displayName>rufiyaa maldivienne</displayName>
-				<displayName count="one">rufiyaa maldivienne</displayName>
-				<displayName count="other">rufiyaas maldiviennes</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>kwacha malawite</displayName>
-				<displayName count="one">kwacha malawite</displayName>
-				<displayName count="other">kwachas malawites</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>peso mexicain</displayName>
-				<displayName count="one">peso mexicain</displayName>
-				<displayName count="other">pesos mexicains</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>peso d’argent mexicain (1861–1992)</displayName>
-				<displayName count="one">peso d’argent mexicain (1861–1992)</displayName>
-				<displayName count="other">pesos d’argent mexicains (1861–1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>unité de conversion mexicaine (UDI)</displayName>
-				<displayName count="one">unité de conversion mexicaine (UDI)</displayName>
-				<displayName count="other">unités de conversion mexicaines (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit malais</displayName>
-				<displayName count="one">ringgit malais</displayName>
-				<displayName count="other">ringgits malais</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>escudo mozambicain</displayName>
-				<displayName count="one">escudo mozambicain</displayName>
-				<displayName count="other">escudos mozambicains</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>métical</displayName>
-				<displayName count="one">metical mozambicain (1980–2006)</displayName>
-				<displayName count="other">meticais mozambicains (1980–2006)</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical mozambicain</displayName>
-				<displayName count="one">metical mozambicain</displayName>
-				<displayName count="other">meticais mozambicains</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>dollar namibien</displayName>
-				<displayName count="one">dollar namibien</displayName>
-				<displayName count="other">dollars namibiens</displayName>
-				<symbol>$NA</symbol>
-			</currency>
-			<currency type="NGN">
-				<displayName>naira nigérian</displayName>
-				<displayName count="one">naira nigérian</displayName>
-				<displayName count="other">nairas nigérians</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>cordoba</displayName>
-				<displayName count="one">córdoba nicaraguayen (1912–1988)</displayName>
-				<displayName count="other">córdobas nicaraguayens (1912–1988)</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>córdoba oro nicaraguayen</displayName>
-				<displayName count="one">córdoba oro nicaraguayen</displayName>
-				<displayName count="other">córdobas oro nicaraguayens</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>florin néerlandais</displayName>
-				<displayName count="one">florin néerlandais</displayName>
-				<displayName count="other">florins néerlandais</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>couronne norvégienne</displayName>
-				<displayName count="one">couronne norvégienne</displayName>
-				<displayName count="other">couronnes norvégiennes</displayName>
-				<symbol>krN</symbol>
-			</currency>
-			<currency type="NPR">
-				<displayName>roupie népalaise</displayName>
-				<displayName count="one">roupie népalaise</displayName>
-				<displayName count="other">roupies népalaises</displayName>
-				<symbol>RsNP</symbol>
-			</currency>
-			<currency type="NZD">
-				<displayName>dollar néo-zélandais</displayName>
-				<displayName count="one">dollar néo-zélandais</displayName>
-				<displayName count="other">dollars néo-zélandais</displayName>
-				<symbol>$NZ</symbol>
-			</currency>
-			<currency type="OMR">
-				<displayName>rial omani</displayName>
-				<displayName count="one">rial omani</displayName>
-				<displayName count="other">rials omanis</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panaméen</displayName>
-				<displayName count="one">balboa panaméen</displayName>
-				<displayName count="other">balboas panaméens</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>inti péruvien</displayName>
-				<displayName count="one">inti péruvien</displayName>
-				<displayName count="other">intis péruviens</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>nouveau sol péruvien</displayName>
-				<displayName count="one">nouveau sol péruvien</displayName>
-				<displayName count="other">nouveaux sols péruviens</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol péruvien</displayName>
-				<displayName count="one">sol péruvien (1863–1985)</displayName>
-				<displayName count="other">sols péruviens (1863–1985)</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina papouan-néo-guinéen</displayName>
-				<displayName count="one">kina papouan-néo-guinéen</displayName>
-				<displayName count="other">kinas papouan-néo-guinéens</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>peso philippin</displayName>
-				<displayName count="one">peso philippin</displayName>
-				<displayName count="other">pesos philippins</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>roupie pakistanaise</displayName>
-				<displayName count="one">roupie pakistanaise</displayName>
-				<displayName count="other">roupies pakistanaises</displayName>
-				<symbol>RsPK</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName>zloty polonais</displayName>
-				<displayName count="one">zloty polonais</displayName>
-				<displayName count="other">zlotys polonais</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>zloty (1950-1995)</displayName>
-				<displayName count="one">zloty polonais (1950–1995)</displayName>
-				<displayName count="other">zlotys polonais (1950–1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>escudo portugais</displayName>
-				<displayName count="one">escudo portugais</displayName>
-				<displayName count="other">escudos portugais</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guaraní paraguayen</displayName>
-				<displayName count="one">guaraní paraguayen</displayName>
-				<displayName count="other">guaranís paraguayens</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>rial qatari</displayName>
-				<displayName count="one">rial qatari</displayName>
-				<displayName count="other">rials qataris</displayName>
-				<symbol>RQ</symbol>
-			</currency>
-			<currency type="RHD">
-				<displayName>dollar rhodésien</displayName>
-				<displayName count="one">dollar rhodésien</displayName>
-				<displayName count="other">dollars rhodésiens</displayName>
-				<symbol>$RH</symbol>
-			</currency>
-			<currency type="ROL">
-				<displayName>ancien leu roumain</displayName>
-				<displayName count="one">leu roumain (1952–2005)</displayName>
-				<displayName count="other">lei roumains (1952–2005)</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>leu roumain</displayName>
-				<displayName count="one">leu roumain</displayName>
-				<displayName count="other">lei roumains</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar serbe</displayName>
-				<displayName count="one">dinar serbe</displayName>
-				<displayName count="other">dinars serbes</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>rouble russe</displayName>
-				<displayName count="one">rouble russe</displayName>
-				<displayName count="other">roubles russes</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>rouble russe (1991–1998)</displayName>
-				<displayName count="one">rouble russe (1991–1998)</displayName>
-				<displayName count="other">roubles russes (1991–1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>franc rwandais</displayName>
-				<displayName count="one">franc rwandais</displayName>
-				<displayName count="other">francs rwandais</displayName>
-				<symbol>FR</symbol>
-			</currency>
-			<currency type="SAR">
-				<displayName>rial saoudien</displayName>
-				<displayName count="one">rial saoudien</displayName>
-				<displayName count="other">rials saoudiens</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>dollar des îles Salomon</displayName>
-				<displayName count="one">dollar des îles Salomon</displayName>
-				<displayName count="other">dollars des îles Salomon</displayName>
-				<symbol>$SB</symbol>
-			</currency>
-			<currency type="SCR">
-				<displayName>roupie des Seychelles</displayName>
-				<displayName count="one">roupie des Seychelles</displayName>
-				<displayName count="other">roupies des Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar soudanais</displayName>
-				<displayName count="one">dinar soudanais (1992–2007)</displayName>
-				<displayName count="other">dinars soudanais (1992–2007)</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>livre soudanaise</displayName>
-				<displayName count="one">livre soudanaise</displayName>
-				<displayName count="other">livres soudanaises</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>livre soudanaise (1956–2007)</displayName>
-				<displayName count="one">livre soudanaise (1956–2007)</displayName>
-				<displayName count="other">livres soudanaises (1956–2007)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>couronne suédoise</displayName>
-				<displayName count="one">couronne suédoise</displayName>
-				<displayName count="other">couronnes suédoises</displayName>
-				<symbol>krS</symbol>
-			</currency>
-			<currency type="SGD">
-				<displayName>dollar de Singapour</displayName>
-				<displayName count="one">dollar de Singapour</displayName>
-				<displayName count="other">dollars de Singapour</displayName>
-				<symbol>$SG</symbol>
-			</currency>
-			<currency type="SHP">
-				<displayName>livre de Sainte-Hélène</displayName>
-				<displayName count="one">livre de Sainte-Hélène</displayName>
-				<displayName count="other">livres de Sainte-Hélène</displayName>
-				<symbol>£SH</symbol>
-			</currency>
-			<currency type="SIT">
-				<displayName>tolar slovène</displayName>
-				<displayName count="one">tolar slovène</displayName>
-				<displayName count="other">tolars slovènes</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>couronne slovaque</displayName>
-				<displayName count="one">couronne slovaque</displayName>
-				<displayName count="other">couronnes slovaques</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leone sierra-léonais</displayName>
-				<displayName count="one">leone sierra-léonais</displayName>
-				<displayName count="other">leones sierra-léonais</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>shilling somalien</displayName>
-				<displayName count="one">shilling somalien</displayName>
-				<displayName count="other">shillings somaliens</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>dollar surinamais</displayName>
-				<displayName count="one">dollar surinamais</displayName>
-				<displayName count="other">dollars surinamais</displayName>
-				<symbol>$SR</symbol>
-			</currency>
-			<currency type="SRG">
-				<displayName>florin surinamais</displayName>
-				<displayName count="one">florin surinamais</displayName>
-				<displayName count="other">florins surinamais</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra santoméen</displayName>
-				<displayName count="one">dobra santoméen</displayName>
-				<displayName count="other">dobras santoméens</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>rouble soviétique</displayName>
-				<displayName count="one">rouble soviétique</displayName>
-				<displayName count="other">roubles soviétiques</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>colón salvadorien</displayName>
-				<displayName count="one">colón salvadorien</displayName>
-				<displayName count="other">colóns salvadoriens</displayName>
-				<symbol>â‚¡SV</symbol>
-			</currency>
-			<currency type="SYP">
-				<displayName>livre syrienne</displayName>
-				<displayName count="one">livre syrienne</displayName>
-				<displayName count="other">livres syriennes</displayName>
-				<symbol>£SY</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>lilangeni swazi</displayName>
-				<displayName count="one">lilangeni swazi</displayName>
-				<displayName count="other">emalangeni swazis</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>baht thaïlandais</displayName>
-				<displayName count="one">baht thaïlandais</displayName>
-				<displayName count="other">baths thaïlandais</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>rouble tadjik</displayName>
-				<displayName count="one">rouble tadjik</displayName>
-				<displayName count="other">roubles tadjiks</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>somoni tadjik</displayName>
-				<displayName count="one">somoni tadjik</displayName>
-				<displayName count="other">somonis tadjiks</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>manat turkmène</displayName>
-				<displayName count="one">manat turkmène</displayName>
-				<displayName count="other">manats turkmènes</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunisien</displayName>
-				<displayName count="one">dinar tunisien</displayName>
-				<displayName count="other">dinars tunisiens</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>pa’anga tongan</displayName>
-				<displayName count="one">pa’anga tongan</displayName>
-				<displayName count="other">pa’angas tongans</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>escudo timorais</displayName>
-				<displayName count="one">escudo timorais</displayName>
-				<displayName count="other">escudos timorais</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>livre turque</displayName>
-				<displayName count="one">livre turque (1844–2005)</displayName>
-				<displayName count="other">livres turques</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>nouvelle livre turque</displayName>
-				<displayName count="one">nouvelle livre turque</displayName>
-				<displayName count="other">nouvelles livres turques</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dollar trinidadien</displayName>
-				<displayName count="one">dollar trinidadien</displayName>
-				<displayName count="other">dollars trinidadiens</displayName>
-				<symbol>$TT</symbol>
-			</currency>
-			<currency type="TWD">
-				<displayName>nouveau dollar taïwanais</displayName>
-				<displayName count="one">nouveau dollar taïwanais</displayName>
-				<displayName count="other">nouveaux dollars taïwanais</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>shilling tanzanien</displayName>
-				<displayName count="one">shilling tanzanien</displayName>
-				<displayName count="other">shillings tanzaniens</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>hryvnia ukrainienne</displayName>
-				<displayName count="one">hryvnia ukrainienne</displayName>
-				<displayName count="other">hryvnias ukrainiennes</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>karbovanetz</displayName>
-				<displayName count="one">karbovanets ukrainien (1992–1996)</displayName>
-				<displayName count="other">karbovanets ukrainiens (1992–1996)</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>shilling ougandais (1966-1987)</displayName>
-				<displayName count="one">shilling ougandais (1966–1987)</displayName>
-				<displayName count="other">shillings ougandais (1966–1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>shilling ougandais</displayName>
-				<displayName count="one">shilling ougandais</displayName>
-				<displayName count="other">shillings ougandais</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>dollar des États-Unis</displayName>
-				<displayName count="one">dollar des États-Unis</displayName>
-				<displayName count="other">dollars des États-Unis</displayName>
-				<symbol>$US</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>dollar des Etats-Unis (jour suivant)</displayName>
-				<displayName count="one">dollar des États-Unis (jour suivant)</displayName>
-				<displayName count="other">dollars des États-Unis (jour suivant)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>dollar des Etats-Unis (jour même)</displayName>
-				<displayName count="one">dollar des États-Unis (jour même)</displayName>
-				<displayName count="other">dollars des États-Unis (jour même)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>peso uruguayen (unités indexées)</displayName>
-				<displayName count="one">peso uruguayen (unités indexées)</displayName>
-				<displayName count="other">pesos uruguayen (unités indexées)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>peso uruguayen (1975–1993)</displayName>
-				<displayName count="one">peso uruguayen (1975–1993)</displayName>
-				<displayName count="other">pesos uruguayens (1975–1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>peso uruguayen</displayName>
-				<displayName count="one">peso uruguayen</displayName>
-				<displayName count="other">pesos uruguayens</displayName>
-				<symbol>$UY</symbol>
-			</currency>
-			<currency type="UZS">
-				<displayName>sum ouzbek</displayName>
-				<displayName count="one">sum ouzbek</displayName>
-				<displayName count="other">sums ouzbeks</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>bolivar</displayName>
-				<displayName count="one">bolívar vénézuélien (1879–2008)</displayName>
-				<displayName count="other">bolívars vénézuéliens (1879–2008)</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>bolivar fuerte vénézuélien</displayName>
-				<displayName count="one">bolivar fuerte vénézuélien</displayName>
-				<displayName count="other">bolivar fuertes vénézuélien</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>dông vietnamien</displayName>
-				<displayName count="one">dông vietnamien</displayName>
-				<displayName count="other">dôngs vietnamiens</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vatu vanuatuan</displayName>
-				<displayName count="one">vatu vanuatuan</displayName>
-				<displayName count="other">vatus vanuatuans</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>tala samoan</displayName>
-				<displayName count="one">tala samoan</displayName>
-				<displayName count="other">talas samoans</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>franc CFA (BEAC)</displayName>
-				<displayName count="one">franc CFA (BEAC)</displayName>
-				<displayName count="other">francs CFA (BEAC)</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>argent</displayName>
-				<displayName count="one">once troy d’argent</displayName>
-				<displayName count="other">onces troy d’argent</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>or</displayName>
-				<displayName count="one">once troy d’or</displayName>
-				<displayName count="other">onces troy d’or</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>unité européenne composée</displayName>
-				<displayName count="one">unité composée européenne (EURCO)</displayName>
-				<displayName count="other">unités composées européennes (EURCO)</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>unité monétaire européenne</displayName>
-				<displayName count="one">unité monétaire européenne (UME-6)</displayName>
-				<displayName count="other">unités monétaires européennes (UME-6)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>unité de compte européenne (XBC)</displayName>
-				<displayName count="one">unité de compte 9 européenne (UEC-9)</displayName>
-				<displayName count="other">unités de compte 9 européennes (UEC-9)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>unité de compte européenne (XBD)</displayName>
-				<displayName count="one">unité de compte 17 européenne (UEC-17)</displayName>
-				<displayName count="other">unités de compte 17 européennes (UEC-17)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>dollar des Caraïbes orientales</displayName>
-				<displayName count="one">dollar des Caraïbes orientales</displayName>
-				<displayName count="other">dollars des Caraïbes orientales</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>droit de tirage spécial</displayName>
-				<displayName count="one">droit de tirage spécial</displayName>
-				<displayName count="other">droits de tirage spéciaux</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>unité de compte européenne (ECU)</displayName>
-				<displayName count="one">unité de compte européenne (ECU)</displayName>
-				<displayName count="other">unités de compte européennes (ECU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>franc or</displayName>
-				<displayName count="one">franc or</displayName>
-				<displayName count="other">francs or</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>franc UIC</displayName>
-				<displayName count="one">franc UIC</displayName>
-				<displayName count="other">francs UIC</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>franc CFA (BCEAO)</displayName>
-				<displayName count="one">franc CFA (BCEAO)</displayName>
-				<displayName count="other">francs CFA (BCEAO)</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palladium</displayName>
-				<displayName count="one">once troy de palladium</displayName>
-				<displayName count="other">onces troy de palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>franc CFP</displayName>
-				<displayName count="one">franc CFP</displayName>
-				<displayName count="other">francs CFP</displayName>
-				<symbol>FCFP</symbol>
-			</currency>
-			<currency type="XPT">
-				<displayName>platine</displayName>
-				<displayName count="one">once troy de platine</displayName>
-				<displayName count="other">onces troy de platine</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>type de fonds RINET</displayName>
-				<displayName count="one">unité de fonds RINET</displayName>
-				<displayName count="other">unités de fonds RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>(devise de test)</displayName>
-				<displayName count="one">(devise de test)</displayName>
-				<displayName count="other">(devises de test)</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>devise inconnue ou non valide</displayName>
-				<displayName count="one">devise inconnue ou non valide</displayName>
-				<displayName count="other">devise inconnue ou non valide</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>dinar du Yémen</displayName>
-				<displayName count="one">dinar nord-yéménite</displayName>
-				<displayName count="other">dinars nord-yéménites</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>rial yéménite</displayName>
-				<displayName count="one">rial yéménite</displayName>
-				<displayName count="other">rials yéménites</displayName>
-				<symbol>RY</symbol>
-			</currency>
-			<currency type="YUD">
-				<displayName>nouveau dinar yougoslave</displayName>
-				<displayName count="one">dinar fort yougoslave (1966–1989)</displayName>
-				<displayName count="other">dinars forts yougoslaves (1966–1989)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>dinar yougoslave Noviy</displayName>
-				<displayName count="one">nouveau dinar yougoslave (1994–2003)</displayName>
-				<displayName count="other">nouveaux dinars yougoslaves (1994–2003)</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>dinar yougoslave convertible</displayName>
-				<displayName count="one">dinar convertible yougoslave (1990–1992)</displayName>
-				<displayName count="other">dinars convertibles yougoslaves (1990–1992)</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>rand sud-africain (financier)</displayName>
-				<displayName count="one">rand sud-africain (financier)</displayName>
-				<displayName count="other">rands sud-africains (financiers)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand sud-africain</displayName>
-				<displayName count="one">rand sud-africain</displayName>
-				<displayName count="other">rands sud-africains</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>kwacha zambien</displayName>
-				<displayName count="one">kwacha zambien</displayName>
-				<displayName count="other">kwachas zambiens</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>nouveau zaïre zaïrien</displayName>
-				<displayName count="one">nouveau zaïre zaïrien</displayName>
-				<displayName count="other">nouveaux zaïres zaïriens</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zaïre zaïrois</displayName>
-				<displayName count="one">zaïre zaïrois</displayName>
-				<displayName count="other">zaïres zaïrois</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>dollar zimbabwéen</displayName>
-				<displayName count="one">dollar zimbabwéen</displayName>
-				<displayName count="other">dollars zimbabwéens</displayName>
-				<symbol>$Z</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} jour</unitPattern>
-			<unitPattern count="other">{0} jours</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} heure</unitPattern>
-			<unitPattern count="other">{0} heures</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minute</unitPattern>
-			<unitPattern count="other">{0} minutes</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mois</unitPattern>
-			<unitPattern count="other">{0} mois</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} seconde</unitPattern>
-			<unitPattern count="other">{0} secondes</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} semaine</unitPattern>
-			<unitPattern count="other">{0} semaines</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} année</unitPattern>
-			<unitPattern count="other">{0} années</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>oui:o</yesstr>
-			<nostr>non:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_BE.xml b/airtime_mvc/library/Zend/Locale/Data/fr_BE.xml
deleted file mode 100644
index 912692ccb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_BE.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.59 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="fr"/>
-		<territory type="BE"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H 'h' mm 'min' ss 's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>du {0} au {1}</intervalFormatFallback>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM 'au' d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d 'au' E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM 'au' E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y 'a`' MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM 'au' d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y 'au' d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d 'au' E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM 'au' E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y 'au' E d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<group>.</group>
-		</symbols>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_CA.xml b/airtime_mvc/library/Zend/Locale/Data/fr_CA.xml
deleted file mode 100644
index 31e235c47..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_CA.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.66 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="fr"/>
-		<territory type="CA"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH 'h' mm 'min' ss 's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">EEE M-d</dateFormatItem>
-						<dateFormatItem id="MMd">MM-d</dateFormatItem>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE yyyy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyMM">yy-MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E MM-dd – E MM-dd</greatestDifference>
-							<greatestDifference id="M">E MM-dd – E MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-MM – yy-MM</greatestDifference>
-							<greatestDifference id="y">yy-MM – yy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-MM-dd – yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yy-MM-dd – yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yy-MM-dd – yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">'du' E yy-MM-dd 'au' E yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">'du' E yy-MM-dd 'au' E yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">'du' E yy-MM-dd 'au' E yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="y">'de' MMM y 'à' MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">'du' d MMM 'au' d MMM y</greatestDifference>
-							<greatestDifference id="y">'du' d MMM y 'au' d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">'du' E d 'au' E d MMM y</greatestDifference>
-							<greatestDifference id="M">'du' E d MMM 'au' E d MMM y</greatestDifference>
-							<greatestDifference id="y">'du' E d MMM y 'au' E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Alaska">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Central">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Atlantic">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Central">
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="Newfoundland">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="CAD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_CH.xml b/airtime_mvc/library/Zend/Locale/Data/fr_CH.xml
deleted file mode 100644
index d4322152e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_CH.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="fr"/>
-		<territory type="CH"/>
-	</identity>
-	<delimiters>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm:ss 'h' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>du {0} au {1}</intervalFormatFallback>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM 'au' d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d 'au' E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM 'au' E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y 'a`' MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM 'au' d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y 'au' d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d 'au' E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM 'au' E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y 'au' E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>'</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_FR.xml b/airtime_mvc/library/Zend/Locale/Data/fr_FR.xml
deleted file mode 100644
index ae12b9b56..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_FR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.45 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fr"/>
-		<territory type="FR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_LU.xml b/airtime_mvc/library/Zend/Locale/Data/fr_LU.xml
deleted file mode 100644
index 01a478701..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_LU.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fr"/>
-		<territory type="LU"/>
-	</identity>
-	<numbers>
-		<symbols>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="FRF">
-				<symbol>FRF</symbol>
-			</currency>
-			<currency type="LUF">
-				<symbol>F</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_MC.xml b/airtime_mvc/library/Zend/Locale/Data/fr_MC.xml
deleted file mode 100644
index 0020ec1ab..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_MC.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fr"/>
-		<territory type="MC"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fr_SN.xml b/airtime_mvc/library/Zend/Locale/Data/fr_SN.xml
deleted file mode 100644
index 743313363..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fr_SN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fr"/>
-		<territory type="SN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/fur.xml b/airtime_mvc/library/Zend/Locale/Data/fur.xml
deleted file mode 100644
index 69d78b2fc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fur.xml
+++ /dev/null
@@ -1,1221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="fur"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ae">avestan</language>
-			<language type="af">afrikaans</language>
-			<language type="am">amaric</language>
-			<language type="an">aragonês</language>
-			<language type="ang">vieri inglês</language>
-			<language type="apa">lenghe Apache</language>
-			<language type="ar">arap</language>
-			<language type="arc">aramaic</language>
-			<language type="as">assamês</language>
-			<language type="ast">asturian</language>
-			<language type="aus">lenghis australianis</language>
-			<language type="av">avar</language>
-			<language type="ay">aymarà</language>
-			<language type="az">azerbaijani</language>
-			<language type="be">bielorùs</language>
-			<language type="bg">bulgar</language>
-			<language type="bn">bengalês</language>
-			<language type="bo">tibetan</language>
-			<language type="br">breton</language>
-			<language type="bs">bosniac</language>
-			<language type="ca">catalan</language>
-			<language type="ce">cecen</language>
-			<language type="cel">lenghe celtiche</language>
-			<language type="ch">chamorro</language>
-			<language type="co">cors</language>
-			<language type="cop">coptic</language>
-			<language type="cr">cree</language>
-			<language type="cs">cec</language>
-			<language type="cu">sclâf de glesie</language>
-			<language type="cy">galês</language>
-			<language type="da">danês</language>
-			<language type="de">todesc</language>
-			<language type="den">sclâf</language>
-			<language type="egy">vieri egjizian</language>
-			<language type="el">grêc</language>
-			<language type="en">inglês</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spagnûl</language>
-			<language type="et">eston</language>
-			<language type="eu">basc</language>
-			<language type="fa">persian</language>
-			<language type="ff">fulah</language>
-			<language type="fi">finlandês</language>
-			<language type="fj">fizian</language>
-			<language type="fo">faroês</language>
-			<language type="fr">francês</language>
-			<language type="fro">vieri francês</language>
-			<language type="fur">furlan</language>
-			<language type="fy">frisian</language>
-			<language type="ga">gaelic irlandês</language>
-			<language type="gd">gaelic scozês</language>
-			<language type="gem">lenghe gjermaniche</language>
-			<language type="gl">galizian</language>
-			<language type="got">gotic</language>
-			<language type="grc">vieri grêc</language>
-			<language type="gv">manx</language>
-			<language type="he">ebraic</language>
-			<language type="hi">hindi</language>
-			<language type="hr">cravuat</language>
-			<language type="ht">haitian</language>
-			<language type="hu">ongjarês</language>
-			<language type="hy">armen</language>
-			<language type="id">indonesian</language>
-			<language type="ik">inupiaq</language>
-			<language type="ine">lenghe indo-europeane</language>
-			<language type="io">ido</language>
-			<language type="is">islandês</language>
-			<language type="it">talian</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">gjaponês</language>
-			<language type="ka">gjeorgjian</language>
-			<language type="kk">kazac</language>
-			<language type="kl">kalaallisut</language>
-			<language type="km">khmer</language>
-			<language type="kn">kannada</language>
-			<language type="ko">corean</language>
-			<language type="ku">curd</language>
-			<language type="kw">cornualiês</language>
-			<language type="la">latin</language>
-			<language type="lad">ladin</language>
-			<language type="lb">lussemburghês</language>
-			<language type="li">limburghês</language>
-			<language type="ln">lingala</language>
-			<language type="lt">lituan</language>
-			<language type="lv">leton</language>
-			<language type="map">austronesian</language>
-			<language type="mi">maori</language>
-			<language type="mis">lenghis variis</language>
-			<language type="mk">macedon</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongul</language>
-			<language type="mo">moldâf</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malês</language>
-			<language type="mt">maltês</language>
-			<language type="mul">lenghis multiplis</language>
-			<language type="mwl">mirandês</language>
-			<language type="myn">lenghis Maya</language>
-			<language type="nap">napoletan</language>
-			<language type="nb">norvegjês bokmål</language>
-			<language type="nds">bas todesc</language>
-			<language type="ne">nepalês</language>
-			<language type="nl">olandês</language>
-			<language type="nn">norvegjês nynorsk</language>
-			<language type="no">norvegjês</language>
-			<language type="non">vieri norvegjês</language>
-			<language type="nv">navajo</language>
-			<language type="oc">ocitan</language>
-			<language type="os">osetic</language>
-			<language type="ota">turc otoman</language>
-			<language type="pa">punjabi</language>
-			<language type="pap">papiamento</language>
-			<language type="peo">vieri persian</language>
-			<language type="pl">polac</language>
-			<language type="pro">vieri provenzâl</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portughês</language>
-			<language type="pt_BR">portughês brasilian</language>
-			<language type="qu">quechua</language>
-			<language type="rm">rumanç</language>
-			<language type="ro">romen</language>
-			<language type="roa">lenghe romanze</language>
-			<language type="ru">rus</language>
-			<language type="sa">sanscrit</language>
-			<language type="sc">sardegnûl</language>
-			<language type="scn">sicilian</language>
-			<language type="sco">scozês</language>
-			<language type="sd">sindhi</language>
-			<language type="se">sami setentrionâl</language>
-			<language type="sga">vieri irlandês</language>
-			<language type="si">sinalês</language>
-			<language type="sk">slovac</language>
-			<language type="sl">sloven</language>
-			<language type="sla">lenghe sclave</language>
-			<language type="sm">samoan</language>
-			<language type="so">somal</language>
-			<language type="sq">albanês</language>
-			<language type="sr">serp</language>
-			<language type="sux">sumeric</language>
-			<language type="sv">svedês</language>
-			<language type="sw">swahili</language>
-			<language type="ta">tamil</language>
-			<language type="te">telegu</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tagic</language>
-			<language type="th">thai</language>
-			<language type="tl">tagalog</language>
-			<language type="tr">turc</language>
-			<language type="tt">tartar</language>
-			<language type="ty">tahitian</language>
-			<language type="uk">ucrain</language>
-			<language type="und">indeterminade</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbec</language>
-			<language type="vi">vietnamite</language>
-			<language type="wa">valon</language>
-			<language type="yi">yiddish</language>
-			<language type="zh">cinês</language>
-			<language type="zh_Hans">cinês semplificât</language>
-			<language type="zh_Hant">cinês tradizionâl</language>
-			<language type="zu">zulu</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arap</script>
-			<script type="Armn">armen</script>
-			<script type="Bali">balinês</script>
-			<script type="Beng">bengalês</script>
-			<script type="Brai">Braille</script>
-			<script type="Bugi">buginês</script>
-			<script type="Cans">Silabari unificât aborigjens canadês</script>
-			<script type="Copt">copt</script>
-			<script type="Cprt">cipriot</script>
-			<script type="Cyrl">cirilic</script>
-			<script type="Cyrs">cirilic dal vieri slavonic de glesie</script>
-			<script type="Deva">devanagari</script>
-			<script type="Egyd">demotic egjizian</script>
-			<script type="Egyh">jeratic egjizian</script>
-			<script type="Egyp">jeroglifics egjizians</script>
-			<script type="Ethi">etiopic</script>
-			<script type="Geor">georgjian</script>
-			<script type="Glag">glagolitic</script>
-			<script type="Goth">gotic</script>
-			<script type="Grek">grêc</script>
-			<script type="Hani">han</script>
-			<script type="Hans">Han semplificât</script>
-			<script type="Hant">Han tradizionâl</script>
-			<script type="Hebr">ebreu</script>
-			<script type="Hrkt">katakana o hiragana</script>
-			<script type="Hung">vieri ongjarês</script>
-			<script type="Ital">vieri italic</script>
-			<script type="Java">gjavanês</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">latin Fraktur</script>
-			<script type="Latg">latin gaelic</script>
-			<script type="Latn">latin</script>
-			<script type="Lina">lineâr A</script>
-			<script type="Linb">lineâr B</script>
-			<script type="Maya">jeroglifics Maya</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongul</script>
-			<script type="Runr">runic</script>
-			<script type="Syrc">siriac</script>
-			<script type="Syre">siriac Estrangelo</script>
-			<script type="Syrj">siriac ocidentâl</script>
-			<script type="Syrn">siriac orientâl</script>
-			<script type="Taml">tamil</script>
-			<script type="Telu">telegu</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thai">thai</script>
-			<script type="Tibt">tibetan</script>
-			<script type="Ugar">ugaritic</script>
-			<script type="Xpeo">vieri persian</script>
-			<script type="Xsux">cuneiform sumeric-acadic</script>
-			<script type="Zxxx">codiç pes lenghis no scritis</script>
-			<script type="Zyyy">comun</script>
-			<script type="Zzzz">codiç par scrituris no codificadis</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mont</territory>
-			<territory type="002">Afriche</territory>
-			<territory type="003">Americhe dal Nord</territory>
-			<territory type="005">Americhe meridionâl</territory>
-			<territory type="009">Oceanie</territory>
-			<territory type="011">Afriche ocidentâl</territory>
-			<territory type="013">Americhe centrâl</territory>
-			<territory type="014">Afriche orientâl</territory>
-			<territory type="015">Afriche setentrionâl</territory>
-			<territory type="017">Afriche di mieç</territory>
-			<territory type="018">Afriche meridionâl</territory>
-			<territory type="019">Americhis</territory>
-			<territory type="021">Americhe setentrionâl</territory>
-			<territory type="029">caraibic</territory>
-			<territory type="030">Asie orientâl</territory>
-			<territory type="034">Asie meridionâl</territory>
-			<territory type="035">Asie sud orientâl</territory>
-			<territory type="039">Europe meridionâl</territory>
-			<territory type="053">Australie e Gnove Zelande</territory>
-			<territory type="054">Melanesie</territory>
-			<territory type="057">Regjon de Micronesie</territory>
-			<territory type="061">Polinesie</territory>
-			<territory type="142">Asie</territory>
-			<territory type="143">Asie centrâl</territory>
-			<territory type="145">Asie ocidentâl</territory>
-			<territory type="150">Europe</territory>
-			<territory type="151">Europe orientâl</territory>
-			<territory type="154">Europe setentrionâl</territory>
-			<territory type="155">Europe ocidentâl</territory>
-			<territory type="172">Commonwealth dai stâts indipendents</territory>
-			<territory type="419">Americhe latine e caraibiche</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emirâts araps unîts</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua e Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanie</territory>
-			<territory type="AM">Armenie</territory>
-			<territory type="AN">Antilis olandesis</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antartic</territory>
-			<territory type="AR">Argjentine</territory>
-			<territory type="AS">Samoa merecanis</territory>
-			<territory type="AT">Austrie</territory>
-			<territory type="AU">Australie</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Isulis Aland</territory>
-			<territory type="AZ">Azerbaigian</territory>
-			<territory type="BA">Bosnie e Ercegovine</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgjiche</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarie</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Sant Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivie</territory>
-			<territory type="BR">Brasîl</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Isule Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorussie</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canade</territory>
-			<territory type="CC">Isulis Cocos</territory>
-			<territory type="CD">Republiche Democratiche dal Congo</territory>
-			<territory type="CF">Republiche centri africane</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Svuizare</territory>
-			<territory type="CI">Cueste di Avoli</territory>
-			<territory type="CK">Isulis Cook</territory>
-			<territory type="CL">Cile</territory>
-			<territory type="CM">Camerun</territory>
-			<territory type="CN">Cine</territory>
-			<territory type="CO">Colombie</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia e Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cjâf vert</territory>
-			<territory type="CX">Isule Christmas</territory>
-			<territory type="CY">Cipri</territory>
-			<territory type="CZ">Republiche ceche</territory>
-			<territory type="DE">Gjermanie</territory>
-			<territory type="DJ">Gibuti</territory>
-			<territory type="DK">Danimarcje</territory>
-			<territory type="DM">Dominiche</territory>
-			<territory type="DO">Republiche dominicane</territory>
-			<territory type="DZ">Alzerie</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonie</territory>
-			<territory type="EG">Egjit</territory>
-			<territory type="EH">Sahara ocidentâl</territory>
-			<territory type="ER">Eritree</territory>
-			<territory type="ES">Spagne</territory>
-			<territory type="ET">Etiopie</territory>
-			<territory type="FI">Finlandie</territory>
-			<territory type="FJ">Fizi</territory>
-			<territory type="FK">Isulis Falkland</territory>
-			<territory type="FM">Micronesie</territory>
-			<territory type="FO">Isulis Faroe</territory>
-			<territory type="FR">France</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Ream unît</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gjeorgjie</territory>
-			<territory type="GF">Guiana francês</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gjibraltar</territory>
-			<territory type="GL">Groenlande</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinee</territory>
-			<territory type="GP">Guadalupe</territory>
-			<territory type="GQ">Guinee ecuatoriâl</territory>
-			<territory type="GR">Grecie</territory>
-			<territory type="GS">Georgia dal Sud e Isulis Sandwich dal Sud</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Regjon aministrative speciâl de Cine di Hong Kong</territory>
-			<territory type="HM">Isule Heard e Isulis McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Cravuazie</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ongjarie</territory>
-			<territory type="ID">Indonesie</territory>
-			<territory type="IE">Irlande</territory>
-			<territory type="IL">Israêl</territory>
-			<territory type="IM">Isule di Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Teritori britanic dal Ocean Indian</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islande</territory>
-			<territory type="IT">Italie</territory>
-			<territory type="JM">Gjamaiche</territory>
-			<territory type="JO">Jordanie</territory>
-			<territory type="JP">Gjapon</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirghizstan</territory>
-			<territory type="KH">Camboze</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoris</territory>
-			<territory type="KN">San Kitts e Nevis</territory>
-			<territory type="KP">Coree dal nord</territory>
-			<territory type="KR">Coree dal sud</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Isulis Cayman</territory>
-			<territory type="KZ">Kazachistan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LC">Sante Lusie</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberie</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituanie</territory>
-			<territory type="LU">Lussemburc</territory>
-			<territory type="LV">Letonie</territory>
-			<territory type="LY">Libie</territory>
-			<territory type="MA">Maroc</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldavie</territory>
-			<territory type="MF">Sant Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Isulis Marshall</territory>
-			<territory type="MK">Macedonie</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Birmanie</territory>
-			<territory type="MN">Mongolie</territory>
-			<territory type="MO">Regjon aministrative speciâl de Cine di Macao</territory>
-			<territory type="MP">Isulis Mariana dal Nord</territory>
-			<territory type="MQ">Martiniche</territory>
-			<territory type="MR">Mauritanie</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Maurizi</territory>
-			<territory type="MV">Maldivis</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Messic</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambic</territory>
-			<territory type="NA">Namibie</territory>
-			<territory type="NC">Gnove Caledonie</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Isole Norfolk</territory>
-			<territory type="NG">Nigerie</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Paîs bas</territory>
-			<territory type="NO">Norvegje</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Gnove Zelande</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panamà</territory>
-			<territory type="PE">Perù</territory>
-			<territory type="PF">Polinesie francês</territory>
-			<territory type="PG">Papue Gnove Guinee</territory>
-			<territory type="PH">Filipinis</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonie</territory>
-			<territory type="PM">San Pierre e Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Rico</territory>
-			<territory type="PS">Teritori palestinês</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceanie periferiche</territory>
-			<territory type="QU">Union europeane</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Romanie</territory>
-			<territory type="RS">Serbie</territory>
-			<territory type="RU">Russie</territory>
-			<territory type="RW">Ruande</territory>
-			<territory type="SA">Arabie Saudide</territory>
-			<territory type="SB">Isulis Salomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SE">Svezie</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Sante Eline</territory>
-			<territory type="SI">Slovenie</territory>
-			<territory type="SJ">Svalbard e Jan Mayen</territory>
-			<territory type="SK">Slovachie</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marin</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalie</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tomè e Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Sirie</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Isulis Turks e Caicos</territory>
-			<territory type="TD">Çad</territory>
-			<territory type="TF">Teritoris meridionâi francês</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandie</territory>
-			<territory type="TJ">Tazikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor orientâl</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisie</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turchie</territory>
-			<territory type="TT">Trinidad e Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzanie</territory>
-			<territory type="UA">Ucraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Isulis periferichis minôrs dai Stâts Unîts</territory>
-			<territory type="US">Stâts Unîts</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbechistan</territory>
-			<territory type="VA">Vatican</territory>
-			<territory type="VC">San Vincent e lis Grenadinis</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Isulis vergjinis britanichis</territory>
-			<territory type="VI">Isulis vergjinis americanis</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis e Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sud Afriche</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Regjon no cognossude o no valide</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Ortografie todescje tradizionâl</variant>
-			<variant type="1994">Ortografie resiane standard</variant>
-			<variant type="1996">Ortografie todescje dal 1996</variant>
-			<variant type="AREVELA">armen orientâl</variant>
-			<variant type="AREVMDA">armen ocidentâl</variant>
-			<variant type="BISKE">dialet di San Zorç di Resie</variant>
-			<variant type="LIPAW">dialet di Lipovaz dal resian</variant>
-			<variant type="NEDIS">Dialet des valadis dal Nadison</variant>
-			<variant type="NJIVA">dialet di Gnive</variant>
-			<variant type="OSOJS">dialet di Oseac</variant>
-			<variant type="POLYTON">Politoniche</variant>
-			<variant type="REVISED">Ortografie revisade</variant>
-			<variant type="ROZAJ">Resian</variant>
-			<variant type="SOLBA">dialet di Stolvize</variant>
-			<variant type="VALENCIA">valenzian</variant>
-		</variants>
-		<keys>
-			<key type="calendar">calendari</key>
-			<key type="collation">ordenament</key>
-			<key type="currency">monede</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">ordin cinês tradizionâl - Big5</type>
-			<type type="buddhist" key="calendar">calendari budist</type>
-			<type type="chinese" key="calendar">calendari cinês</type>
-			<type type="direct" key="collation">ordin diret</type>
-			<type type="gb2312han" key="collation">ordin cinês semplificât - GB2312</type>
-			<type type="gregorian" key="calendar">calendari gregorian</type>
-			<type type="hebrew" key="calendar">calendari ebreu</type>
-			<type type="indian" key="calendar">calendari nazionâl indian</type>
-			<type type="islamic" key="calendar">calendari islamic</type>
-			<type type="islamic-civil" key="calendar">calendari islamic civîl</type>
-			<type type="japanese" key="calendar">calendari gjaponês</type>
-			<type type="phonebook" key="collation">ordin elenc telefonic</type>
-			<type type="pinyin" key="collation">ordin pinyin</type>
-			<type type="roc" key="calendar">calendari de Republiche di Cine</type>
-			<type type="stroke" key="collation">ordin segns</type>
-			<type type="traditional" key="collation">ordin tradizionâl</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metric</measurementSystemName>
-			<measurementSystemName type="US">anglosasson</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Lenghe: {0}</codePattern>
-			<codePattern type="script">Scriture: {0}</codePattern>
-			<codePattern type="territory">Regjon: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à â b c ç d e è ê f-i ì î j-o ò ô p-u ù û v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[å � é ë ğ ï ñ ó š ü]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Zen</month>
-							<month type="2">Fev</month>
-							<month type="3">Mar</month>
-							<month type="4">Avr</month>
-							<month type="5">Mai</month>
-							<month type="6">Jug</month>
-							<month type="7">Lui</month>
-							<month type="8">Avo</month>
-							<month type="9">Set</month>
-							<month type="10">Otu</month>
-							<month type="11">Nov</month>
-							<month type="12">Dic</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Zenâr</month>
-							<month type="2">Fevrâr</month>
-							<month type="3">Març</month>
-							<month type="4">Avrîl</month>
-							<month type="5">Mai</month>
-							<month type="6">Jugn</month>
-							<month type="7">Lui</month>
-							<month type="8">Avost</month>
-							<month type="9">Setembar</month>
-							<month type="10">Otubar</month>
-							<month type="11">Novembar</month>
-							<month type="12">Dicembar</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Z</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">L</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">lun</day>
-							<day type="tue">mar</day>
-							<day type="wed">mie</day>
-							<day type="thu">joi</day>
-							<day type="fri">vin</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domenie</day>
-							<day type="mon">lunis</day>
-							<day type="tue">martars</day>
-							<day type="wed">miercus</day>
-							<day type="thu">joibe</day>
-							<day type="fri">vinars</day>
-							<day type="sat">sabide</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">J</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Prin trimestri</quarter>
-							<quarter type="2">Secont trimestri</quarter>
-							<quarter type="3">Tierç trimestri</quarter>
-							<quarter type="4">Cuart trimestri</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.</am>
-				<pm>p.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">pdC</era>
-						<era type="1">ddC</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">pdC</era>
-						<era type="1">ddC</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d 'di' MMMM 'dal' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'di' MMMM 'dal' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E d/M</dateFormatItem>
-						<dateFormatItem id="MMd">d/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'di' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL 'dal' y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'di' MMM</greatestDifference>
-							<greatestDifference id="M">d 'di' MMM - d 'di' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d 'di' MMM</greatestDifference>
-							<greatestDifference id="M">E d 'di' MMM - E d 'di' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MM - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d - d/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - d/MM</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yyyy - E dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ere</displayName>
-					</field>
-					<field type="year">
-						<displayName>an</displayName>
-					</field>
-					<field type="month">
-						<displayName>mês</displayName>
-					</field>
-					<field type="week">
-						<displayName>setemane</displayName>
-					</field>
-					<field type="day">
-						<displayName>dì</displayName>
-						<relative type="-3">trê dîs fa</relative>
-						<relative type="-2">îr l'altri</relative>
-						<relative type="-1">îr</relative>
-						<relative type="0">vuê</relative>
-						<relative type="1">doman</relative>
-						<relative type="2">passantdoman</relative>
-						<relative type="3">tra trê dîs</relative>
-					</field>
-					<field type="weekday">
-						<displayName>dì de setemane</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>toc dal dì</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ore</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minût</displayName>
-					</field>
-					<field type="second">
-						<displayName>secont</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>No cognossude</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>San Pauli dal Brasîl</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canariis</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoris</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisbone</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Mosche</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Gnove York</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ore de Europe centrâl</standard>
-					<daylight>Ore estive de Europe centrâl</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Ore de Europe orientâl</standard>
-					<daylight>Ore estive de Europe orientâl</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Ore de Europe ocidentâl</standard>
-					<daylight>Ore estive de Europe ocidentâl</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Ore di Mosche</generic>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AMD">
-				<displayName count="one">Dram armen</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso argjentin</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Selin austriac</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dolar australian</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Franc de Belgjiche</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Franc burundês</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dolar dal Brunei</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real brasilian</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rubli bielorùs</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dolar canadês</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franc svuizar</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi cinês</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Vieri dinar serp</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso cuban</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Corone de Republiche Ceche</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marc todesc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Corone danês</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dinar algerin</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franc francês</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Sterline britaniche</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Dinar cravuat</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna cravuate</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupie indiane</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial iranian</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lire taliane</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen gjaponês</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won de Coree dal Sud</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lats leton</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso messican</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Dolar namibian</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba oro nicaraguan</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Corone norvegjêse</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dollar neozelandês</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupie pachistane</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty polac</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinar serp</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rubli rus</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Corone svedese</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Talar sloven</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Corone slovache</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Viere Lire turche</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lire turche</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dolar american</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Dolar american (prossime zornade)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Dolar american (stesse zornade)</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Arint</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Aur</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Unitât composite europeane</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Unitât monetarie europeane</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Unitât di acont europeane (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Unitât di acont europeane (XBD)</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Dirits speciâi di incas</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franc aur francês</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Franc UIC francês</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladi</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platin</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>fonts RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>codiç di verifiche de monede</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Monede no valide o no cognossude</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand sudafrican</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} zornade</unitPattern>
-			<unitPattern count="other">{0} zornadis</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ore</unitPattern>
-			<unitPattern count="other">{0} oris</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minût</unitPattern>
-			<unitPattern count="other">{0} minûts</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mês</unitPattern>
-			<unitPattern count="other">{0} mês</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} secont</unitPattern>
-			<unitPattern count="other">{0} seconts</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} setemane</unitPattern>
-			<unitPattern count="other">{0} setemanis</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} an</unitPattern>
-			<unitPattern count="other">{0} agns</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>sì:si:s</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/fur_IT.xml b/airtime_mvc/library/Zend/Locale/Data/fur_IT.xml
deleted file mode 100644
index b0ab550f5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/fur_IT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="fur"/>
-		<territory type="IT"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ga.xml b/airtime_mvc/library/Zend/Locale/Data/ga.xml
deleted file mode 100644
index 8338199c5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ga.xml
+++ /dev/null
@@ -1,1501 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.78 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="ga"/>
-	</identity>
-	<fallback>en_IE</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">aa</language>
-			<language type="ab">Abcáisis</language>
-			<language type="ae">Aivéistis</language>
-			<language type="af">Afracáinis</language>
-			<language type="am">Amarais</language>
-			<language type="ar">Araibis</language>
-			<language type="as">Asaimis</language>
-			<language type="az">Asarbaiseáinis</language>
-			<language type="ba">Baiscíris</language>
-			<language type="be">Bealarúisis</language>
-			<language type="bg">Bulgáiris</language>
-			<language type="bh">Bihairis</language>
-			<language type="bn">Beangáilis</language>
-			<language type="bo">Tibéadais</language>
-			<language type="br">Briotáinis</language>
-			<language type="bs">Boisnis</language>
-			<language type="ca">Catalóinis</language>
-			<language type="ce">Sisinis</language>
-			<language type="co">Corsaicis</language>
-			<language type="cr">Craíais</language>
-			<language type="cs">Seicis</language>
-			<language type="cu">Slavais na hEaglaise</language>
-			<language type="cv">Suvaisis</language>
-			<language type="cy">Breatnais</language>
-			<language type="da">Danmhairgis</language>
-			<language type="de">Gearmáinis</language>
-			<language type="el">Gréigis</language>
-			<language type="en">Béarla</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spáinnis</language>
-			<language type="et">Eastóinis</language>
-			<language type="eu">Bascais</language>
-			<language type="fa">Peirsis</language>
-			<language type="fi">Fionlainnis</language>
-			<language type="fil">fil</language>
-			<language type="fj">Fidsis</language>
-			<language type="fo">Faróis</language>
-			<language type="fr">Fraincis</language>
-			<language type="fy">Freaslainnis Iartharach</language>
-			<language type="ga">Gaeilge</language>
-			<language type="gd">Gaeilge na hAlban</language>
-			<language type="gl">Gailísis</language>
-			<language type="gn">Guaráinis</language>
-			<language type="gu">Gúisearáitis</language>
-			<language type="gv">Mannainis</language>
-			<language type="haw">Haváíais</language>
-			<language type="he">Eabhrais</language>
-			<language type="hi">Hiondúis</language>
-			<language type="hr">Cróitis</language>
-			<language type="hu">Ungáiris</language>
-			<language type="hy">Airméinis</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indinéisis</language>
-			<language type="ie">Interlingue</language>
-			<language type="ik">Inupiaq</language>
-			<language type="io">Ido</language>
-			<language type="is">�oslainnis</language>
-			<language type="it">Iodáilis</language>
-			<language type="iu">Ionúitis</language>
-			<language type="ja">Seapáinis</language>
-			<language type="jv">Iávais</language>
-			<language type="ka">Seoirsis</language>
-			<language type="kk">Casachais</language>
-			<language type="km">Cambóidis</language>
-			<language type="kn">Cannadais</language>
-			<language type="ko">Cóiréis</language>
-			<language type="ks">Caismíris</language>
-			<language type="ku">Coirdis</language>
-			<language type="kw">Cornais</language>
-			<language type="ky">Cirgeasais</language>
-			<language type="la">Laidin</language>
-			<language type="lb">Leitseabuirgis</language>
-			<language type="ln">ln</language>
-			<language type="lo">Laosais</language>
-			<language type="lt">Liotuáinis</language>
-			<language type="lv">Laitvis</language>
-			<language type="mg">Malagásais</language>
-			<language type="mi">Maorais</language>
-			<language type="mk">Macadóinis</language>
-			<language type="ml">Mailéalaimis</language>
-			<language type="mn">Mongóilis</language>
-			<language type="mo">Moldáivis</language>
-			<language type="mr">Maraitis</language>
-			<language type="ms">Malaeis</language>
-			<language type="mt">Maltais</language>
-			<language type="my">Burmais</language>
-			<language type="na">Nárúis</language>
-			<language type="nb">Ioruais Bokmål</language>
-			<language type="ne">Neipealais</language>
-			<language type="nl">Ollainnis</language>
-			<language type="nn">Ioruais Nynorsk</language>
-			<language type="no">Ioruais</language>
-			<language type="nv">Navachóis</language>
-			<language type="oc">Ocatáinis</language>
-			<language type="or">Oraisis</language>
-			<language type="os">Óiséitis</language>
-			<language type="pa">Puinseáibis</language>
-			<language type="pl">Polainnis</language>
-			<language type="ps">Paistis</language>
-			<language type="pt">Portaingéilis</language>
-			<language type="pt_BR">Portaingéilis Bhrasaíleach</language>
-			<language type="pt_PT">Portaingéilis Ibéireach</language>
-			<language type="qu">Ceatsuais</language>
-			<language type="ro">Rómáinis</language>
-			<language type="ru">Rúisis</language>
-			<language type="sa">Sanscrait</language>
-			<language type="sc">Sairdínis</language>
-			<language type="sd">Sindis</language>
-			<language type="se">Sáimis Thuaidh</language>
-			<language type="sh">Seirbea-Chróitis</language>
-			<language type="si">Siolóinis</language>
-			<language type="sk">Slóvaicis</language>
-			<language type="sl">Slóivéinis</language>
-			<language type="sm">Samóis</language>
-			<language type="so">Somáilis</language>
-			<language type="sq">Albáinis</language>
-			<language type="sr">Seirbis</language>
-			<language type="st">Sótais Dheisceartach</language>
-			<language type="su">Sundais</language>
-			<language type="sv">Sualainnis</language>
-			<language type="sw">Svahaílis</language>
-			<language type="ta">Tamailis</language>
-			<language type="te">Teileagúis</language>
-			<language type="th">Téalainnis</language>
-			<language type="ti">Tigrinis</language>
-			<language type="tk">Tuircméinis</language>
-			<language type="tl">Tagálaigis</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Tuircis</language>
-			<language type="tt">Tatarais</language>
-			<language type="tw">Tvís</language>
-			<language type="ty">Taihítis</language>
-			<language type="ug">ug</language>
-			<language type="uk">Úcráinis</language>
-			<language type="und">Teanga Anaithnid nó Neamhbhailí</language>
-			<language type="ur">Urdais</language>
-			<language type="uz">Úisbéicis</language>
-			<language type="vi">Vítneamais</language>
-			<language type="wa">Vallúnais</language>
-			<language type="xh">Cósais</language>
-			<language type="yi">Giúdais</language>
-			<language type="zh">Sínis</language>
-			<language type="zh_Hans">Sínis Shimplithe</language>
-			<language type="zh_Hant">Sínis Thraidisiúnta</language>
-			<language type="zu">Súlúis</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabach</script>
-			<script type="Armn">Airméanach</script>
-			<script type="Beng">Beangálach</script>
-			<script type="Brai">Braille</script>
-			<script type="Cyrl">Coireallach</script>
-			<script type="Deva">Déiveanágrach</script>
-			<script type="Ethi">Aetópach</script>
-			<script type="Goth">Gotach</script>
-			<script type="Grek">Gréagach</script>
-			<script type="Gujr">Gúisearátach</script>
-			<script type="Guru">Gurmúcach</script>
-			<script type="Hang">Hangalach</script>
-			<script type="Hani">Han</script>
-			<script type="Hans">Han Símplithe</script>
-			<script type="Hant">Han Traidisiúnta</script>
-			<script type="Hebr">Eabhrach</script>
-			<script type="Hira">Híreagánach</script>
-			<script type="Hrkt">Catacánach nó Híreagánach</script>
-			<script type="Jpan">Seapánach</script>
-			<script type="Kana">Catacánach</script>
-			<script type="Knda">Cannadach</script>
-			<script type="Kore">Cóiréach</script>
-			<script type="Latg">Cló Gaelach</script>
-			<script type="Latn">Laidineach</script>
-			<script type="Mlym">Mailéalamach</script>
-			<script type="Mong">Mongólach</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Orya">Oiríseach</script>
-			<script type="Runr">Rúnach</script>
-			<script type="Taml">Tamalach</script>
-			<script type="Telu">Teileagúch</script>
-			<script type="Thai">Téallanach</script>
-			<script type="Tibt">Tibéadach</script>
-			<script type="Zxxx">Gan Scríobh</script>
-			<script type="Zzzz">Script Anaithnid nó Neamhbhailí</script>
-		</scripts>
-		<territories>
-			<territory type="001">An Domhan</territory>
-			<territory type="002">An Afraic</territory>
-			<territory type="009">An Aigéine</territory>
-			<territory type="013">Meiriceá Láir</territory>
-			<territory type="017">An Afraic Láir</territory>
-			<territory type="019">Na Meiriceánna</territory>
-			<territory type="053">An Astráil agus an Nua-Shéalainn</territory>
-			<territory type="054">An Mheilinéis</territory>
-			<territory type="057">An Réigiún Micrinéiseach</territory>
-			<territory type="061">An Pholainéis</territory>
-			<territory type="142">An �ise</territory>
-			<territory type="143">An �ise Láir</territory>
-			<territory type="150">An Eoraip</territory>
-			<territory type="172">Comhlathas na Stát Neamhspleácha</territory>
-			<territory type="419">Meiriceá Laidineach agus an Mhuir Chairib</territory>
-			<territory type="AD">Andóra</territory>
-			<territory type="AE">Aontas na nÉimíríochtaí Arabacha</territory>
-			<territory type="AF">An Afganastáin</territory>
-			<territory type="AG">Aintíge agus Barbúda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">An Albáin</territory>
-			<territory type="AM">An Airméin</territory>
-			<territory type="AN">Antillí na h�siltíre</territory>
-			<territory type="AO">Angóla</territory>
-			<territory type="AQ">An Antartaice</territory>
-			<territory type="AR">An Airgintín</territory>
-			<territory type="AS">Samó Meiriceánach</territory>
-			<territory type="AT">An Ostair</territory>
-			<territory type="AU">An Astráil</territory>
-			<territory type="AW">Arúba</territory>
-			<territory type="AX">Oileáin Alaind</territory>
-			<territory type="AZ">An Asarbaiseáin</territory>
-			<territory type="BA">An Bhoisnia agus Heirseagóvéin</territory>
-			<territory type="BB">Barbadós</territory>
-			<territory type="BD">An Bhanglaidéis</territory>
-			<territory type="BE">An Bheilg</territory>
-			<territory type="BF">Buircíne Fasó</territory>
-			<territory type="BG">An Bhulgáir</territory>
-			<territory type="BH">Bairéin</territory>
-			<territory type="BI">An Bhurúin</territory>
-			<territory type="BJ">Beinin</territory>
-			<territory type="BM">Beirmiúda</territory>
-			<territory type="BN">Brúiné</territory>
-			<territory type="BO">An Bholaiv</territory>
-			<territory type="BR">An Bhrasaíl</territory>
-			<territory type="BS">Na Bahámaí</territory>
-			<territory type="BT">An Bhútáin</territory>
-			<territory type="BV">Oileán Bouvet</territory>
-			<territory type="BW">An Bhotsuáin</territory>
-			<territory type="BY">An Bhealarúis</territory>
-			<territory type="BZ">An Bheilís</territory>
-			<territory type="CA">Ceanada</territory>
-			<territory type="CC">Oileáin na gCócónna</territory>
-			<territory type="CD">Poblacht Dhaonlathach an Chongó</territory>
-			<territory type="CF">Poblacht na hAfraice Láir</territory>
-			<territory type="CG">An Congó</territory>
-			<territory type="CH">An Eilvéis</territory>
-			<territory type="CI">An Cósta Eabhair</territory>
-			<territory type="CK">Oileáin Cook</territory>
-			<territory type="CL">An tSile</territory>
-			<territory type="CM">Camarún</territory>
-			<territory type="CN">An tSín</territory>
-			<territory type="CO">An Cholóim</territory>
-			<territory type="CR">Cósta Ríce</territory>
-			<territory type="CS">An tSeirbia agus Montainéagró</territory>
-			<territory type="CU">Cúba</territory>
-			<territory type="CV">An Rinn Ghlas</territory>
-			<territory type="CX">Oileán na Nollag</territory>
-			<territory type="CY">An Chipir</territory>
-			<territory type="CZ">Poblacht na Seice</territory>
-			<territory type="DE">An Ghearmáin</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">An Danmhairg</territory>
-			<territory type="DM">Doiminice</territory>
-			<territory type="DO">An Phoblacht Dhoiminiceach</territory>
-			<territory type="DZ">An Ailgéir</territory>
-			<territory type="EC">Eacuadór</territory>
-			<territory type="EE">An Eastóin</territory>
-			<territory type="EG">An Éigipt</territory>
-			<territory type="EH">An Sahára Thiar</territory>
-			<territory type="ER">An Eiritré</territory>
-			<territory type="ES">An Spáinn</territory>
-			<territory type="ET">An Aetóip</territory>
-			<territory type="FI">An Fhionlainn</territory>
-			<territory type="FJ">Fidsí</territory>
-			<territory type="FK">Oileáin Fháclainne</territory>
-			<territory type="FM">An Mhicrinéis</territory>
-			<territory type="FO">Oileáin Fharó</territory>
-			<territory type="FR">An Fhrainc</territory>
-			<territory type="GA">An Ghabúin</territory>
-			<territory type="GB">An Ríocht Aontaithe</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">An tSeoirsia</territory>
-			<territory type="GF">An Ghuáin Fhrancach</territory>
-			<territory type="GG">Geansaí</territory>
-			<territory type="GH">Gána</territory>
-			<territory type="GI">Giobráltar</territory>
-			<territory type="GL">An Ghraonlainn</territory>
-			<territory type="GM">An Ghaimbia</territory>
-			<territory type="GN">An Ghuine</territory>
-			<territory type="GP">Guadalúip</territory>
-			<territory type="GQ">An Ghuine Mheánchriosach</territory>
-			<territory type="GR">An Ghréig</territory>
-			<territory type="GS">An tSeoirsia Theas agus Oileáin Sandwich Theas</territory>
-			<territory type="GT">Guatamala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">An Ghuine-Bhissau</territory>
-			<territory type="GY">An Ghuáin</territory>
-			<territory type="HK">R.R.S. na Síne Hong Cong</territory>
-			<territory type="HM">Oileán Heard agus Oileáin McDonald</territory>
-			<territory type="HN">Hondúras</territory>
-			<territory type="HR">An Chróit</territory>
-			<territory type="HT">Háití</territory>
-			<territory type="HU">An Ungáir</territory>
-			<territory type="ID">An Indinéis</territory>
-			<territory type="IE">Éire</territory>
-			<territory type="IL">Iosrael</territory>
-			<territory type="IM">Oileán Mhanann</territory>
-			<territory type="IN">An India</territory>
-			<territory type="IO">Críocha Briotanacha an Aigéin Indiagh</territory>
-			<territory type="IQ">An Iaráic</territory>
-			<territory type="IR">An Iaráin</territory>
-			<territory type="IS">An �oslainn</territory>
-			<territory type="IT">An Iodáil</territory>
-			<territory type="JE">Geirsí</territory>
-			<territory type="JM">Iamáice</territory>
-			<territory type="JO">An Iordáin</territory>
-			<territory type="JP">An tSeapáin</territory>
-			<territory type="KE">An Chéinia</territory>
-			<territory type="KG">An Chirgeastáin</territory>
-			<territory type="KH">An Chambóid</territory>
-			<territory type="KI">Ciribeas</territory>
-			<territory type="KM">Oileáin Chomóra</territory>
-			<territory type="KN">Saint Kitts agus Nevis</territory>
-			<territory type="KP">An Chóiré Thuaidh</territory>
-			<territory type="KR">An Chóiré Theas</territory>
-			<territory type="KW">Cuáit</territory>
-			<territory type="KY">Oileáin na gCadhman</territory>
-			<territory type="KZ">An Chasacstáin</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">An Liobáin</territory>
-			<territory type="LC">San Lúisia</territory>
-			<territory type="LI">Lichtinstéin</territory>
-			<territory type="LK">Srí Lanca</territory>
-			<territory type="LR">An Libéir</territory>
-			<territory type="LS">Leosóta</territory>
-			<territory type="LT">An Liotuáin</territory>
-			<territory type="LU">Lucsamburg</territory>
-			<territory type="LV">An Laitvia</territory>
-			<territory type="LY">An Libia</territory>
-			<territory type="MA">Maracó</territory>
-			<territory type="MC">Monacó</territory>
-			<territory type="MD">An Mholdóiv</territory>
-			<territory type="ME">Montainéagró</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Oileáin Marshall</territory>
-			<territory type="MK">An Mhacadóin</territory>
-			<territory type="ML">Mailí</territory>
-			<territory type="MM">Maenmar</territory>
-			<territory type="MN">An Mhongóil</territory>
-			<territory type="MO">R.R.S. na Síne Macáó</territory>
-			<territory type="MP">Oileáin Mariana Thuaidh</territory>
-			<territory type="MQ">Martainíc</territory>
-			<territory type="MR">An Mharatáin</territory>
-			<territory type="MS">Montsarat</territory>
-			<territory type="MT">Málta</territory>
-			<territory type="MU">Oileán Mhuirís</territory>
-			<territory type="MV">Na Maildiví</territory>
-			<territory type="MW">An Mhaláiv</territory>
-			<territory type="MX">Meicsiceo</territory>
-			<territory type="MY">An Mhalaeisia</territory>
-			<territory type="MZ">Mósaimbíc</territory>
-			<territory type="NA">An Namaib</territory>
-			<territory type="NC">An Nua-Chaladóin</territory>
-			<territory type="NE">An Nígir</territory>
-			<territory type="NF">Oileán Norfolk</territory>
-			<territory type="NG">An Nigéir</territory>
-			<territory type="NI">Nicearagua</territory>
-			<territory type="NL">An �siltír</territory>
-			<territory type="NO">An Iorua</territory>
-			<territory type="NP">Neipeal</territory>
-			<territory type="NR">Nárú</territory>
-			<territory type="NU">Nívé</territory>
-			<territory type="NZ">An Nua-Shéalainn</territory>
-			<territory type="OM">Óman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peiriú</territory>
-			<territory type="PF">An Pholainéis Fhrancach</territory>
-			<territory type="PG">Nua-Ghuine Phapua</territory>
-			<territory type="PH">Na hOileáin Fhilipíneacha</territory>
-			<territory type="PK">An Phacastáin</territory>
-			<territory type="PL">An Pholainn</territory>
-			<territory type="PM">Saint Pierre agus Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portó Ríce</territory>
-			<territory type="PS">Na Críocha Pailistíneacha</territory>
-			<territory type="PT">An Phortaingéil</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragua</territory>
-			<territory type="QA">Catar</territory>
-			<territory type="QO">An Aigéine Imeallach</territory>
-			<territory type="QU">An tAontas Eorpach</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">An Rómáin</territory>
-			<territory type="RS">An tSeirbia</territory>
-			<territory type="RU">Cónaidhm na Rúise</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">An Araib Shádach</territory>
-			<territory type="SB">Oileáin Sholaimh</territory>
-			<territory type="SC">Na Séiséil</territory>
-			<territory type="SD">An tSúdáin</territory>
-			<territory type="SE">An tSualainn</territory>
-			<territory type="SG">Singeapór</territory>
-			<territory type="SH">San Héilin</territory>
-			<territory type="SI">An tSlóvéin</territory>
-			<territory type="SJ">Svalbard agus Jan Mayen</territory>
-			<territory type="SK">An tSlóvaic</territory>
-			<territory type="SL">Siarra Leon</territory>
-			<territory type="SM">San Mairíne</territory>
-			<territory type="SN">An tSeineagáil</territory>
-			<territory type="SO">An tSomáil</territory>
-			<territory type="SR">Suranam</territory>
-			<territory type="ST">Sao Tome agus Principe</territory>
-			<territory type="SV">An tSalvadóir</territory>
-			<territory type="SY">An tSiria</territory>
-			<territory type="SZ">An tSuasalainn</territory>
-			<territory type="TC">Oileáin Turks agus Caicos</territory>
-			<territory type="TD">Sead</territory>
-			<territory type="TF">Críocha Deisceartacha na Fraince</territory>
-			<territory type="TG">Tóga</territory>
-			<territory type="TH">An Téalainn</territory>
-			<territory type="TJ">An Táidsíceastáin</territory>
-			<territory type="TK">Tócalá</territory>
-			<territory type="TL">Tíomór Thoir</territory>
-			<territory type="TM">An Tuircméanastáin</territory>
-			<territory type="TN">An Túinéis</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">An Tuirc</territory>
-			<territory type="TT">Oileáin na Tríonóide agus Tobága</territory>
-			<territory type="TV">Túválú</territory>
-			<territory type="TW">An Téaváin</territory>
-			<territory type="TZ">An Tansáin</territory>
-			<territory type="UA">An Úcráin</territory>
-			<territory type="UG">Úganda</territory>
-			<territory type="UM">Mion-Oileáin Imeallacha S.A.M.</territory>
-			<territory type="US">Stáit Aontaithe Mheiriceá</territory>
-			<territory type="UY">Urugua</territory>
-			<territory type="UZ">Úisbéiceastáin</territory>
-			<territory type="VA">An Vatacáin</territory>
-			<territory type="VC">Saint Vincent agus na Grenadines</territory>
-			<territory type="VE">Veiniséala</territory>
-			<territory type="VG">Oileáin Bhriotanacha na Maighdean</territory>
-			<territory type="VI">Oileáin na Maighdean S.A.M.</territory>
-			<territory type="VN">Vít Neam</territory>
-			<territory type="VU">Vanuatú</territory>
-			<territory type="WF">Oileáin Vailís agus Futúna</territory>
-			<territory type="WS">Samó</territory>
-			<territory type="YE">Éimin</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">An Afraic Theas</territory>
-			<territory type="ZM">An tSaimbia</territory>
-			<territory type="ZW">An tSiombáib</territory>
-			<territory type="ZZ">Réigiún Anaithnid nó Neamhbhailí</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Féilire</key>
-			<key type="collation">Comhordú</key>
-			<key type="currency">Airgeadra</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Ord sórtála Síneach traidisiúnta - Big5</type>
-			<type type="buddhist" key="calendar">Féilire Búdaíoch</type>
-			<type type="chinese" key="calendar">Féilire Síneach</type>
-			<type type="direct" key="collation">Ord sórtála díreach</type>
-			<type type="gb2312han" key="collation">Ord sórtála Síneach simplithe - GB 2312</type>
-			<type type="gregorian" key="calendar">Féilire Greagórach</type>
-			<type type="hebrew" key="calendar">Féilire Eabhrach</type>
-			<type type="islamic" key="calendar">Féilire Ioslamach</type>
-			<type type="islamic-civil" key="calendar">Féilire Ioslamach Sibhialta</type>
-			<type type="japanese" key="calendar">Féilire Seapánach</type>
-			<type type="phonebook" key="collation">Ord sórtála an eolaire teileafóin</type>
-			<type type="pinyin" key="collation">Ord sórtála pinyin</type>
-			<type type="stroke" key="collation">Ord sórtála stríce</type>
-			<type type="traditional" key="collation">Ord sórtála traidisiúnta</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Méadrach</measurementSystemName>
-			<measurementSystemName type="US">Meiriceánach</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b-e é f-i í j-o ó p-u ú v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ḃ ċ ḋ ḟ ġ � ṗ ṡ ṫ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ean</month>
-							<month type="2">Feabh</month>
-							<month type="3">Márta</month>
-							<month type="4">Aib</month>
-							<month type="5">Beal</month>
-							<month type="6">Meith</month>
-							<month type="7">Iúil</month>
-							<month type="8">Lún</month>
-							<month type="9">MFómh</month>
-							<month type="10">DFómh</month>
-							<month type="11">Samh</month>
-							<month type="12">Noll</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Eanáir</month>
-							<month type="2">Feabhra</month>
-							<month type="3">Márta</month>
-							<month type="4">Aibreán</month>
-							<month type="5">Bealtaine</month>
-							<month type="6">Meitheamh</month>
-							<month type="7">Iúil</month>
-							<month type="8">Lúnasa</month>
-							<month type="9">Meán Fómhair</month>
-							<month type="10">Deireadh Fómhair</month>
-							<month type="11">Samhain</month>
-							<month type="12">Nollaig</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">E</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">B</month>
-							<month type="6">M</month>
-							<month type="7">I</month>
-							<month type="8">L</month>
-							<month type="9">M</month>
-							<month type="10">D</month>
-							<month type="11">S</month>
-							<month type="12">N</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Domh</day>
-							<day type="mon">Luan</day>
-							<day type="tue">Máirt</day>
-							<day type="wed">Céad</day>
-							<day type="thu">Déar</day>
-							<day type="fri">Aoine</day>
-							<day type="sat">Sath</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dé Domhnaigh</day>
-							<day type="mon">Dé Luain</day>
-							<day type="tue">Dé Máirt</day>
-							<day type="wed">Dé Céadaoin</day>
-							<day type="thu">Déardaoin</day>
-							<day type="fri">Dé hAoine</day>
-							<day type="sat">Dé Sathairn</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">C</day>
-							<day type="thu">D</day>
-							<day type="fri">A</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">R1</quarter>
-							<quarter type="2">R2</quarter>
-							<quarter type="3">R3</quarter>
-							<quarter type="4">R4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1ú ráithe</quarter>
-							<quarter type="2">2ú ráithe</quarter>
-							<quarter type="3">3ú ráithe</quarter>
-							<quarter type="4">4ú ráithe</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Roimh Chríost</era>
-						<era type="1">Anno Domini</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">RC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Ré</displayName>
-					</field>
-					<field type="year">
-						<displayName>Bliain</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mí</displayName>
-					</field>
-					<field type="week">
-						<displayName>Seachtain</displayName>
-					</field>
-					<field type="day">
-						<displayName>Lá</displayName>
-						<relative type="-2">Arú inné</relative>
-						<relative type="-1">Inné</relative>
-						<relative type="0">Inniu</relative>
-						<relative type="1">Amárach</relative>
-						<relative type="2">Arú amárach</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Lá na seachtaine</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>a.m./p.m.</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Uair</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Nóiméad</displayName>
-					</field>
-					<field type="second">
-						<displayName>Soicind</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Crios</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>MAG{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Anaithnid</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<long>
-					<daylight>Am Samhraidh na Breataine</daylight>
-				</long>
-				<short>
-					<daylight>ASB</daylight>
-				</short>
-				<exemplarCity>Londain</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<long>
-					<daylight>Am Samhraidh na hÉireann</daylight>
-				</long>
-				<short>
-					<daylight>ASÉ</daylight>
-				</short>
-				<exemplarCity>Baile �tha Cliath</exemplarCity>
-			</zone>
-			<metazone type="GMT">
-				<long>
-					<standard>Meán-Am Greenwich</standard>
-				</long>
-				<short>
-					<standard>MAG</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Peseta Andóra</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Dirham Aontas na nÉimíríochtaí Arabacha</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afgainí (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afgainí</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek Albánach</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram Airméanach</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Guilder na nAntillí �siltíreach</displayName>
-				<symbol>A� f.</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza Angólach</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Kwanza Angólach (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Kwanza Nua Angólach (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza Reajustado Angólach (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Austral Airgintíneach</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Peso na Airgintíne (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso na Airgintíne</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Scilling Ostarach</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dollar Astrálach</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Guilder Aruba</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Manat Asarbaiseánach</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Dínear Bhoisnia-Heirseagaivéin</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marc Inathraithe Bhoisnia-Heirseagaivéin</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Dollar Bharbadóis</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka Bhanglaidéiseach</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Franc Beilgeach (inathraithe)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Franc Beilgeach</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Franc Beilgeach (airgeadúil)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lev Bulgárach Crua</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lev Nua Bulgárach</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Dínear na Bairéine</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Franc na Burúine</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Dollar Bheirmiúda</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dollar Bhrúiné</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Peso na Bolaive</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Mvdol Bolavach</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Cruzeiro Novo Brasaíleach (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Cruzado Brasaíleach</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Cruzeiro Brasaíleach (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real Brasaíleach</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Cruzado Novo Brasaíleach</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Cruzeiro Brasaíleach</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Dollar na mBahámaí</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum Bútánach</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Kyat Burmach</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula Botsuánach</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Rúbal Nua Béalarúiseach (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rúbal Béalarúiseach</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Dollar na Beilíse</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dollar Ceanada</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Franc Congolais an Chongó</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franc na hEilvéise</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento na Sile</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso na Sile</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi Síneach</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso na Colóime</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colon Chósta Ríce</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Koruna Crua na Seicslóvaice</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso Cúba</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Escudo na Rinne Verde</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Punt na Cipire</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Koruna Phoblacht na Seice</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Ostmark na hOirGhearmáine</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Deutsche Mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Franc Djibouti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Krone Danmhargach</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso Doimineacach</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dínear na hAilgéire</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre Eacuadóir</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidad de Valor Constante (UVC) Eacuadóir</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Kroon na hEastóine</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Punt na hÉigipte</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Peseta Spáinneach</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr na hAetóipe</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Markka Fionnlannach</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dollar Fhidsí</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Punt Oileáin Fháclainne</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franc Francach</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Punt Steirling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Kupon Larit na Grúise</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari na Grúise</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi Ghána</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Punt Ghiobráltair</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi Gaimbia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franc Guine</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Syli Guine</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele Guineana na Guine Meánchriosaí</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Drachma Gréagach</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal Guatamala</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Escudo na Guine Portaingéalaí</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Peso Guine-Bhissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Dollar na Guáine</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Dollar Hong Cong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira Hondúrais</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Dínear na Cróite</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna Crótach</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde Háití</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forint Ungárach</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupiah Indinéiseach</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Punt Éireannach</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Punt Iosraelach</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Sheqel Nua Iosraelach</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rúipí India</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dínear Irácach</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial Iaránach</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Krona �oslannach</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lira Iodálach</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Dollar Iamácach</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dínear Iordánach</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen Seapánach</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Scilling Céiniach</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som na Cirgeastáine</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel na Cambóide</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Franc Chomóra</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Won na Cóiré Thuaidh</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won na Cóiré Theas</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dínear Cuátach</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dollar Oileáin Cayman</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge Casacstánach</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip Laosach</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Punt na Liobáine</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Rúipí Srí Lanca</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Dollar na Libéire</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti Leosóta</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lita Liotuánach</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Talonas Liotuánach</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Franc Lucsamburg</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lats Laitviach</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Rúbal Laitviach</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Dínear Libia</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham Mharacó</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Franc Mharacó</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Leu Moldóvach</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Ariary Madagascar</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Franc Madagascar</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Denar na Macadóine</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Franc Mhailí</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat Mhaenmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik Mongólach</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca Macao</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya na Maratáine</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira Maltach</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Punt Maltach</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Rúipí Oileán Mhuirís</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldive Islands Rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Kwacha na Maláive</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso Meicsiceo</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso Airgid Meicsiceo (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidad de Inversion (UDI) Meicsiceo</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit Malaeisia</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Escudo Mósaimbíce</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Metical Mósaimbíce</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Dollar na Namaibe</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira Nígéarach</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Cordoba Nicearagua</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Cordoba Oro Nicearagua</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Guilder �siltíreach</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Krone Ioruach</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Rúipí Neipeáil</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dollar na Nua-Shéalainne</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial Omain</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa Panamach</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Inti Pheiriú</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Sol Nuevo Pheiriú</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol Pheiriú</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina Nua-Ghuine Phapua</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso Filipíneach</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rúipí na Pacastáine</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty Polannach</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloty Polannach (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Escudo Portaingélach</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani Pharagua</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rial Catarach</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Leu Rómánach</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rúbal Rúiseach</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rúbal Rúiseach (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Franc Ruanda</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Riyal Sádach</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Dollar Oileáin Solomon</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Rúipí na Séiséil</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Dínear na Súdáine</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Punt na Súdáine</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Krona Sualannach</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dollar Singeapóir</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Punt San Héilin</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar Slóvénach</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Koruna na Slóvaice</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone Shiarra Leon</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Scilling na Sómáile</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Guilder Shuranaim</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra Sao Tome agus Principe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Rúbal Sóvéadach</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colon na Salvadóire</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Punt Siria</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni na Suasalainne</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht na Téalainne</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Rúbal na Táidsíceastáine</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Somoni na Táidsíceastáine</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Manat na An Tuircméanastáine</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Dínear na Túinéise</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga Tonga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Escudo Tíomóir</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lira Turcach</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Dollar Oileáin na Tríonóide agus Tobága</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Dollar Nua na Téaváine</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Scilling na Tansáine</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia Úcránach</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Karbovanetz Úcránach</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Scilling Uganda (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Scilling Uganda</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dollar S.A.M.</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Dollar S.A.M. (an chéad lá eile)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Dollar S.A.M. (an la céanna)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Peso Uragua (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso Uruguayo Uragua</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Sum na hÚisbéiceastáine</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar Veiniséala</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong Vítneamach</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu Vanuatú</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala Samó Thiar</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA Franc BEAC</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Ór</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Aonad Ilchodach Eorpach</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Aonad Airgeadaíochta Eorpach</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Aonad Cuntais Eorpach (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Aonad Cuntais Eorpach (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Dollar Oirthear na Cairibe</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Cearta Speisialta Tarraingthe</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Aonad Airgeadra Eorpach</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franc Ór Francach</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>UIC-Franc Francach</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA Franc BCEAO</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP Franc</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Airgeadra Anaithnid nó Neamhbhailí</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Dínear Éimin</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rial Éimin</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Dínear Crua Iúgslavach</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Noviy Dinar Iúgslavach</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Dínear Inathraithe Iúgslavach</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Rand na hAfraice Theas (airgeadúil)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand na hAfraice Theas</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha Saimbiach</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zaire Nua Sáíreach</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire Sáíreach</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Dollar Siombábach</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>tá:t</yesstr>
-			<nostr>níl:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ga_IE.xml b/airtime_mvc/library/Zend/Locale/Data/ga_IE.xml
deleted file mode 100644
index 25bcc01ad..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ga_IE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ga"/>
-		<territory type="IE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gaa.xml b/airtime_mvc/library/Zend/Locale/Data/gaa.xml
deleted file mode 100644
index d1f52f339..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gaa.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gaa"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Aha</month>
-							<month type="2">Ofl</month>
-							<month type="3">Och</month>
-							<month type="4">Abe</month>
-							<month type="5">Agb</month>
-							<month type="6">Otu</month>
-							<month type="7">Maa</month>
-							<month type="8">Man</month>
-							<month type="9">Gbo</month>
-							<month type="10">Ant</month>
-							<month type="11">Ale</month>
-							<month type="12">Afu</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Aharabata</month>
-							<month type="2">Oflo</month>
-							<month type="3">Ochokrikri</month>
-							<month type="4">Abeibee</month>
-							<month type="5">Agbeinaa</month>
-							<month type="6">Otukwadan</month>
-							<month type="7">Maawe</month>
-							<month type="8">Manyawale</month>
-							<month type="9">Gbo</month>
-							<month type="10">Anton</month>
-							<month type="11">Alemle</month>
-							<month type="12">Afuabee</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ho</day>
-							<day type="mon">Dzu</day>
-							<day type="tue">Dzf</day>
-							<day type="wed">Sho</day>
-							<day type="thu">Soo</day>
-							<day type="fri">Soh</day>
-							<day type="sat">Ho</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Hogbaa</day>
-							<day type="mon">Dzu</day>
-							<day type="tue">Dzufo</day>
-							<day type="wed">Sho</day>
-							<day type="thu">Soo</day>
-							<day type="fri">Sohaa</day>
-							<day type="sat">Ho</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>LB</am>
-				<pm>SN</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Dani Jesu</era>
-						<era type="1">KJ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">DJ</era>
-						<era type="1">KJ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="GHC">
-				<displayName>Sidi</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gaa_GH.xml b/airtime_mvc/library/Zend/Locale/Data/gaa_GH.xml
deleted file mode 100644
index 224528f3a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gaa_GH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gaa"/>
-		<territory type="GH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gez.xml b/airtime_mvc/library/Zend/Locale/Data/gez.xml
deleted file mode 100644
index c0fab7caf..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gez.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.65 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="gez"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">አ�ርኛ</language>
-			<language type="ab">አብ�ዚኛ</language>
-			<language type="af">አ�ሪቃንስኛ</language>
-			<language type="am">አ��ረኛ</language>
-			<language type="ar">�ርቢኛ</language>
-			<language type="as">አሳሜዛዊ</language>
-			<language type="ay">አያማርኛ</language>
-			<language type="az">አዜርባይጃንኛ</language>
-			<language type="ba">ባስኪርኛ</language>
-			<language type="be">ቤላራሻኛ</language>
-			<language type="bg">ቡ�ጋሪኛ</language>
-			<language type="bh">ቢሃሪ</language>
-			<language type="bi">ቢስላ�ኛ</language>
-			<language type="bn">በንጋሊኛ</language>
-			<language type="bo">ትበትንኛ</language>
-			<language type="br">ብሬቶንኛ</language>
-			<language type="byn">ብሊን</language>
-			<language type="ca">ካታላንኛ</language>
-			<language type="co">ኮርሲካኛ</language>
-			<language type="cs">ቼክኛ</language>
-			<language type="cy">ወ�ሽ</language>
-			<language type="da">ዴኒሽ</language>
-			<language type="de">ጀርመን</language>
-			<language type="dz">ድዞን�ኻኛ</language>
-			<language type="el">�ሪክኛ</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="eo">ኤስ�ራንቶ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="et">ኤስቶኒአን</language>
-			<language type="eu">ባስክኛ</language>
-			<language type="fa">�ርሲያኛ</language>
-			<language type="fi">�ኒሽ</language>
-			<language type="fj">�ጂኛ</language>
-			<language type="fo">�ሮኛ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="fy">�ሪስኛ</language>
-			<language type="ga">አይሪሽ</language>
-			<language type="gd">እስኮትስ�ጌ�ክኛ</language>
-			<language type="gez">�ዕ�ኛ</language>
-			<language type="gl">ጋለጋኛ</language>
-			<language type="gn">ጓራኒኛ</language>
-			<language type="gu">ጉጃርቲኛ</language>
-			<language type="ha">ሃ�ሳኛ</language>
-			<language type="he">ዕብራስጥ</language>
-			<language type="hi">�ንድኛ</language>
-			<language type="hr">ክሮሽያንኛ</language>
-			<language type="hu">ሀንጋሪኛ</language>
-			<language type="hy">አርመናዊ</language>
-			<language type="ia">ኢንቴርሊንጓ</language>
-			<language type="id">እንዶኒሲኛ</language>
-			<language type="ie">እንተርሊን�ወ</language>
-			<language type="ik">እኑ�ያቅኛ</language>
-			<language type="is">አይስላንድኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="iu">እኑክቲቱትኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="jv">ጃቫንኛ</language>
-			<language type="ka">ጊዮርጊያን</language>
-			<language type="kk">ካዛክኛ</language>
-			<language type="kl">ካላሊሱትኛ</language>
-			<language type="km">ክመርኛ</language>
-			<language type="kn">ካናዳኛ</language>
-			<language type="ko">ኮሪያኛ</language>
-			<language type="ks">ካሽሚርኛ</language>
-			<language type="ku">ኩርድሽኛ</language>
-			<language type="ky">ኪርጊ�ኛ</language>
-			<language type="la">ላቲንኛ</language>
-			<language type="ln">ሊንጋላኛ</language>
-			<language type="lo">ላ�ስኛ</language>
-			<language type="lt">ሊቱአኒያን</language>
-			<language type="lv">ላትቪያን</language>
-			<language type="mg">ማላጋስኛ</language>
-			<language type="mi">ማዮሪኛ</language>
-			<language type="mk">ማከዶኒኛ</language>
-			<language type="ml">ማላያላ�ኛ</language>
-			<language type="mn">ሞንጎላዊኛ</language>
-			<language type="mo">ሞ�ዳቫዊና</language>
-			<language type="mr">ማራዚኛ</language>
-			<language type="ms">ማላይኛ</language>
-			<language type="mt">ማ�ቲስኛ</language>
-			<language type="my">ቡርማኛ</language>
-			<language type="na">ናኡሩ</language>
-			<language type="ne">ኔ�ሊኛ</language>
-			<language type="nl">ደች</language>
-			<language type="no">ኖርዌጂያን</language>
-			<language type="oc">ኦኪታንኛ</language>
-			<language type="om">ኦሮ�ኛ</language>
-			<language type="or">ኦሪያኛ</language>
-			<language type="pa">�ንጃቢኛ</language>
-			<language type="pl">�ሊሽ</language>
-			<language type="ps">�ሽቶኛ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="qu">ኵቿኛ</language>
-			<language type="rm">ሮማንስ</language>
-			<language type="rn">ሩንዲኛ</language>
-			<language type="ro">ሮማኒያን</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="rw">ኪንያርዋንድኛ</language>
-			<language type="sa">ሳንስክሪትኛ</language>
-			<language type="sd">ሲንድሂኛ</language>
-			<language type="sg">ሳንጎኛ</language>
-			<language type="si">ስንሃ�ኛ</language>
-			<language type="sid">ሲዳ�ኛ</language>
-			<language type="sk">ስሎቫክኛ</language>
-			<language type="sl">ስሎቪኛ</language>
-			<language type="sm">ሳሞአኛ</language>
-			<language type="sn">ሾናኛ</language>
-			<language type="so">ሱማ�ኛ</language>
-			<language type="sq">�ቤኒኛ</language>
-			<language type="sr">ሰርቢኛ</language>
-			<language type="ss">ስዋቲኛ</language>
-			<language type="st">ሶዞኛ</language>
-			<language type="su">ሱዳንኛ</language>
-			<language type="sv">ስዊድንኛ</language>
-			<language type="sw">ስዋሂሊኛ</language>
-			<language type="ta">ታሚ�ኛ</language>
-			<language type="te">ተሉጉኛ</language>
-			<language type="tg">ታጂኪኛ</language>
-			<language type="th">ታይኛ</language>
-			<language type="ti">ት�ርኛ</language>
-			<language type="tig">ት�ረ</language>
-			<language type="tk">ቱርክመንኛ</language>
-			<language type="tl">ታጋሎገኛ</language>
-			<language type="tn">ጽዋናዊኛ</language>
-			<language type="to">ቶንጋ</language>
-			<language type="tr">ቱርክኛ</language>
-			<language type="ts">ጾንጋኛ</language>
-			<language type="tt">ታታርኛ</language>
-			<language type="tw">ትዊኛ</language>
-			<language type="ug">ኡዊ��ርኛ</language>
-			<language type="uk">ዩክረኒኛ</language>
-			<language type="ur">ኡርዱኛ</language>
-			<language type="uz">ኡ�በክኛ</language>
-			<language type="vi">ቪትና�ኛ</language>
-			<language type="vo">ቮላ�ክኛ</language>
-			<language type="wo">ዎሎ�ኛ</language>
-			<language type="xh">ዞሳኛ</language>
-			<language type="yi">ይዲሻዊኛ</language>
-			<language type="yo">ዮሩባዊኛ</language>
-			<language type="za">ዡዋን�ኛ</language>
-			<language type="zh">ቻይንኛ</language>
-			<language type="zu">ዙሉኛ</language>
-		</languages>
-		<scripts>
-			<script type="Latn">ላቲን</script>
-		</scripts>
-		<territories>
-			<territory type="AD">አንዶራ</territory>
-			<territory type="AE">የተባበሩት�አረብ�ኤ�ሬትስ</territory>
-			<territory type="AL">አ�ባኒያ</territory>
-			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ�አንቲ�ስ</territory>
-			<territory type="AR">አርጀንቲና</territory>
-			<territory type="AT">ኦስትሪያ</territory>
-			<territory type="AU">አ�ስትሬሊያ</territory>
-			<territory type="AZ">አዘርባጃን</territory>
-			<territory type="BA">ቦስኒያ�እና�ሄርዞጎቪኒያ</territory>
-			<territory type="BB">ባርቤዶስ</territory>
-			<territory type="BE">ቤ�ጄ�</territory>
-			<territory type="BG">ቡ�ጌሪያ</territory>
-			<territory type="BH">ባህሬን</territory>
-			<territory type="BM">ቤርሙዳ</territory>
-			<territory type="BO">ቦሊቪያ</territory>
-			<territory type="BR">ብራዚ�</territory>
-			<territory type="BT">ቡህታን</territory>
-			<territory type="BY">ቤላሩስ</territory>
-			<territory type="BZ">ቤሊዘ</territory>
-			<territory type="CF">የመካከለኛ��አ�ሪካ�ሪ�ብሊክ</territory>
-			<territory type="CH">ስዊዘርላንድ</territory>
-			<territory type="CL">ቺሊ</territory>
-			<territory type="CM">ካሜሩን</territory>
-			<territory type="CN">ቻይና</territory>
-			<territory type="CO">ኮሎ�ቢያ</territory>
-			<territory type="CS">ሰርቢያ</territory>
-			<territory type="CV">ኬ��ቬርዴ</territory>
-			<territory type="CY">ሳይ�ረስ</territory>
-			<territory type="CZ">ቼክ�ሪ�ብሊክ</territory>
-			<territory type="DE">ጀርመን</territory>
-			<territory type="DK">ዴንማርክ</territory>
-			<territory type="DM">ዶሚኒካ</territory>
-			<territory type="DO">ዶሚኒክ�ሪ�ብሊክ</territory>
-			<territory type="DZ">አ�ጄሪያ</territory>
-			<territory type="EC">ኢኳዶር</territory>
-			<territory type="EE">ኤስቶኒያ</territory>
-			<territory type="EG">�ብጽ</territory>
-			<territory type="EH">�ዕራባዊ�ሳህራ</territory>
-			<territory type="ER">ኤርትራ</territory>
-			<territory type="ES">ስ�ን</territory>
-			<territory type="ET">ኢትዮጵያ</territory>
-			<territory type="FI">�ንላንድ</territory>
-			<territory type="FJ">�ጂ</territory>
-			<territory type="FM">ሚክሮኔዢያ</territory>
-			<territory type="FR">�ረንሳይ</territory>
-			<territory type="GB">እን�ሊ�</territory>
-			<territory type="GE">ጆርጂያ</territory>
-			<territory type="GF">የ�ረንሳይ�ጉዊአና</territory>
-			<territory type="GM">ጋ�ቢያ</territory>
-			<territory type="GN">ጊኒ</territory>
-			<territory type="GQ">ኢኳቶሪያ��ጊኒ</territory>
-			<territory type="GR">�ሪክ</territory>
-			<territory type="GW">ቢሳዎ</territory>
-			<territory type="GY">ጉያና</territory>
-			<territory type="HK">ሆን��ኮን�</territory>
-			<territory type="HR">ክሮኤሽያ</territory>
-			<territory type="HT">ሀይቲ</territory>
-			<territory type="HU">ሀንጋሪ</territory>
-			<territory type="ID">ኢንዶኔዢያ</territory>
-			<territory type="IE">አየርላንድ</territory>
-			<territory type="IL">እስራኤ�</territory>
-			<territory type="IN">ህንድ</territory>
-			<territory type="IQ">ኢራቅ</territory>
-			<territory type="IS">አይስላንድ</territory>
-			<territory type="IT">ጣሊያን</territory>
-			<territory type="JM">ጃማይካ</territory>
-			<territory type="JO">ጆርዳን</territory>
-			<territory type="JP">ጃ�ን</territory>
-			<territory type="KH">ካ�ቦዲያ</territory>
-			<territory type="KM">ኮሞሮስ</territory>
-			<territory type="KP">ደቡብ�ኮሪያ</territory>
-			<territory type="KR">ሰሜን�ኮሪያ</territory>
-			<territory type="KW">ክዌት</territory>
-			<territory type="LB">ሊባኖስ</territory>
-			<territory type="LT">ሊቱዌኒያ</territory>
-			<territory type="LV">ላትቪያ</territory>
-			<territory type="LY">ሊቢያ</territory>
-			<territory type="MA">ሞሮኮ</territory>
-			<territory type="MD">ሞ�ዶቫ</territory>
-			<territory type="MK">ማከዶኒያ</territory>
-			<territory type="MN">ሞንጎሊያ</territory>
-			<territory type="MO">ማካዎ</territory>
-			<territory type="MR">ሞሪቴኒያ</territory>
-			<territory type="MT">ማ�ታ</territory>
-			<territory type="MU">ማሩሸስ</territory>
-			<territory type="MX">ሜክሲኮ</territory>
-			<territory type="MY">ማሌዢያ</territory>
-			<territory type="NA">ናሚቢያ</territory>
-			<territory type="NC">ኒ��ካሌዶኒያ</territory>
-			<territory type="NG">ናይጄሪያ</territory>
-			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
-			<territory type="NP">ኔ��</territory>
-			<territory type="NZ">ኒ��ዚላንድ</territory>
-			<territory type="PE">�ሩ</territory>
-			<territory type="PF">የ�ረንሳይ��ሊኔዢያ</territory>
-			<territory type="PG">��ዋ�ኒ��ጊኒ</territory>
-			<territory type="PL">�ላንድ</territory>
-			<territory type="PR">�ርታ�ሪኮ</territory>
-			<territory type="RO">ሮሜኒያ</territory>
-			<territory type="RU">ራሺያ</territory>
-			<territory type="SA">ሳ�ድአረቢያ</territory>
-			<territory type="SD">ሱዳን</territory>
-			<territory type="SE">ስዊድን</territory>
-			<territory type="SG">ሲንጋ�ር</territory>
-			<territory type="SI">ስሎቬኒያ</territory>
-			<territory type="SK">ስሎቫኪያ</territory>
-			<territory type="SN">ሴኔጋ�</territory>
-			<territory type="SO">ሱማሌ</territory>
-			<territory type="SY">ሲሪያ</territory>
-			<territory type="TD">ቻድ</territory>
-			<territory type="TF">የ�ረንሳይ�ደቡባዊ��ዛቶች</territory>
-			<territory type="TH">ታይላንድ</territory>
-			<territory type="TJ">ታጃኪስታን</territory>
-			<territory type="TL">�ስራቅ�ቲሞር</territory>
-			<territory type="TN">ቱኒዚያ</territory>
-			<territory type="TR">ቱርክ</territory>
-			<territory type="TT">ትሪኒዳድ�እና�ቶባጎ</territory>
-			<territory type="TZ">ታንዛኒያ</territory>
-			<territory type="UG">ዩጋንዳ</territory>
-			<territory type="US">አሜሪካ</territory>
-			<territory type="UZ">ዩ�በኪስታን</territory>
-			<territory type="VE">ቬንዙዌላ</territory>
-			<territory type="VG">የእን�ሊ��ድን���ደሴቶች</territory>
-			<territory type="VI">የአሜሪካ�ቨርጂን�ደሴቶች</territory>
-			<territory type="YE">የመን</territory>
-			<territory type="ZA">ደቡብ�አ�ሪካ</territory>
-			<territory type="ZM">ዛ�ቢያ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F �-᎙ ሀ-ሆ ለ-ሎ �-ሖ መ-ሞ ሠ-ሦ ረ-ሮ ሰ-ሶ ቀ-ቆ ቈ ቊ-� በ-ቦ ተ-ቶ ኀ-ኆ ኈ ኊ-� �-ኖ አ-ኦ ከ-ኮ ኰ ኲ-ኵ ወ-ዎ �-ዖ ዘ-ዞ የ-ዮ ደ-ዶ ገ-ጎ � ጒ-ጕ ጠ-ጦ ጰ-ጶ ጸ-ጾ �-� �-� �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ሇ � ⶀ ሗ ሟ ᎀ-ᎃ � ሧ ሯ ⶂ ሷ ⶃ ሸ-ሿ ⶄ ቇ �-ቖ ቘ ቚ-� ቧ ᎄ-ᎇ ⶅ ቮ ቯ ቷ ⶆ ቿ ⶇ ኇ ኗ ⶈ ኟ ⶉ ኧ ⶊ ኯ ኸ-ኾ ዀ ዂ-ዅ � ዟ ⶋ ዠ-ዧ ዷ ⶌ ዸ-ዿ � ጀ-ጇ ⶎ � ጘ-ጟ ⶓ-ⶖ ጧ � ጨ-ጯ � ጷ ⶑ ጿ � � ᎈ-ᎋ � ᎌ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጠ�ረ</month>
-							<month type="2">ከተተ</month>
-							<month type="3">መገበ</month>
-							<month type="4">አኀዘ</month>
-							<month type="5">�ንባ</month>
-							<month type="6">ሠንየ</month>
-							<month type="7">�መለ</month>
-							<month type="8">��ሰ</month>
-							<month type="9">ከረመ</month>
-							<month type="10">ጠቀመ</month>
-							<month type="11">ኀደረ</month>
-							<month type="12">ኀሠሠ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጠ�ረ</month>
-							<month type="2">ከተተ</month>
-							<month type="3">መገበ</month>
-							<month type="4">አኀዘ</month>
-							<month type="5">�ንባት</month>
-							<month type="6">ሠንየ</month>
-							<month type="7">�መለ</month>
-							<month type="8">��ሰ</month>
-							<month type="9">ከረመ</month>
-							<month type="10">ጠቀመ</month>
-							<month type="11">ኀደረ</month>
-							<month type="12">ኀሠሠ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ጠ</month>
-							<month type="2">ከ</month>
-							<month type="3">መ</month>
-							<month type="4">አ</month>
-							<month type="5">�</month>
-							<month type="6">ሠ</month>
-							<month type="7">�</month>
-							<month type="8">�</month>
-							<month type="9">ከ</month>
-							<month type="10">ጠ</month>
-							<month type="11">ኀ</month>
-							<month type="12">ኀ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">እ�ድ</day>
-							<day type="mon">ሰኑይ</day>
-							<day type="tue">ሠሉስ</day>
-							<day type="wed">ራብዕ</day>
-							<day type="thu">�ሙስ</day>
-							<day type="fri">ዓርበ</day>
-							<day type="sat">ቀዳሚ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">እ�ድ</day>
-							<day type="mon">ሰኑይ</day>
-							<day type="tue">ሠሉስ</day>
-							<day type="wed">ራብዕ</day>
-							<day type="thu">�ሙስ</day>
-							<day type="fri">ዓርበ</day>
-							<day type="sat">ቀዳሚት</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">እ</day>
-							<day type="mon">ሰ</day>
-							<day type="tue">ሠ</day>
-							<day type="wed">ራ</day>
-							<day type="thu">�</day>
-							<day type="fri">á‹“</day>
-							<day type="sat">ቀ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ጽባሕ</am>
-				<pm>�ሴት</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">á‹“/á‹“</era>
-						<era type="1">ዓ/�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM መዓ�ት y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<group>ወ</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>አ�ሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/gez_ER.xml b/airtime_mvc/library/Zend/Locale/Data/gez_ER.xml
deleted file mode 100644
index b4b498bba..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gez_ER.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gez"/>
-		<territory type="ER"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gez_ET.xml b/airtime_mvc/library/Zend/Locale/Data/gez_ET.xml
deleted file mode 100644
index 5d0cf2ec5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gez_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.42 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gez"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gl.xml b/airtime_mvc/library/Zend/Locale/Data/gl.xml
deleted file mode 100644
index 93b9d41ad..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gl.xml
+++ /dev/null
@@ -1,1361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.68 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="gl"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Lingua afro-asiática</language>
-			<language type="alg">Lingua algonquina</language>
-			<language type="am">Amárico</language>
-			<language type="an">Aragonés</language>
-			<language type="apa">Lingua apache</language>
-			<language type="ar">�rabe</language>
-			<language type="arc">Arameo</language>
-			<language type="art">Lingua artificial</language>
-			<language type="as">Assamés</language>
-			<language type="ast">Asturiano</language>
-			<language type="aus">Lingua australiana</language>
-			<language type="az">Azerbaiano</language>
-			<language type="bat">Lingua báltica</language>
-			<language type="be">Bielorruso</language>
-			<language type="bg">Búlgaro</language>
-			<language type="bh">Bihariano</language>
-			<language type="bn">Bengalí</language>
-			<language type="br">Bretón</language>
-			<language type="bs">Bosnio</language>
-			<language type="ca">Catalán</language>
-			<language type="cai">Lingua india centroamericana</language>
-			<language type="cau">Lingua caucásica</language>
-			<language type="cel">Lingua céltica</language>
-			<language type="cs">Checo</language>
-			<language type="cu">Eslavo eclesiástico</language>
-			<language type="cy">Galés</language>
-			<language type="da">Dinamarqués</language>
-			<language type="de">Alemán</language>
-			<language type="de_AT">Alemán de Austria</language>
-			<language type="de_CH">Alemán suízo</language>
-			<language type="egy">Exipcio antigo</language>
-			<language type="el">Grego</language>
-			<language type="en">Inglés</language>
-			<language type="en_AU">Inglés australiano</language>
-			<language type="en_CA">Inglés canadiano</language>
-			<language type="en_GB">Inglés británico</language>
-			<language type="en_US">Inglés americano</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Español</language>
-			<language type="es_419">Español latinoamericano</language>
-			<language type="es_ES">Castelán</language>
-			<language type="et">Estoniano</language>
-			<language type="eu">Éuscaro</language>
-			<language type="fa">Persa</language>
-			<language type="fi">Finés</language>
-			<language type="fil">Filipino</language>
-			<language type="fiu">Lingua finno-úgrica</language>
-			<language type="fo">Faroés</language>
-			<language type="fr">Francés</language>
-			<language type="fr_CA">Francés canadiano</language>
-			<language type="fr_CH">Francés suízo</language>
-			<language type="fy">Frisón</language>
-			<language type="ga">Irlandés</language>
-			<language type="gd">Gaélico escocés</language>
-			<language type="gem">Lingua xermánica</language>
-			<language type="gl">galego</language>
-			<language type="gn">Guaraní</language>
-			<language type="grc">Grego antigo</language>
-			<language type="gu">Guxaratiano</language>
-			<language type="he">Hebreo</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Croata</language>
-			<language type="hu">Húngaro</language>
-			<language type="hy">Armenio</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesio</language>
-			<language type="inc">Lingua índica</language>
-			<language type="ine">Lingua indoeuropea</language>
-			<language type="is">Islandés</language>
-			<language type="it">Italiano</language>
-			<language type="ja">Xaponés</language>
-			<language type="jv">Xavanés</language>
-			<language type="ka">Xeorxiano</language>
-			<language type="km">Cambodiano</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Coreano</language>
-			<language type="ku">Kurdo</language>
-			<language type="ky">Kyrgiz</language>
-			<language type="la">Latín</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laotiano</language>
-			<language type="lt">Lituano</language>
-			<language type="lv">Letón</language>
-			<language type="mis">Lingua miscelánea</language>
-			<language type="mk">Macedonio</language>
-			<language type="ml">Malaialam</language>
-			<language type="mn">Mongol</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malaio</language>
-			<language type="mt">Maltés</language>
-			<language type="mul">Varias linguas</language>
-			<language type="nai">Lingua india norteamericana</language>
-			<language type="nb">Noruegués Bokmal</language>
-			<language type="ne">Nepalí</language>
-			<language type="nl">Holandés</language>
-			<language type="nl_BE">Flamenco</language>
-			<language type="nn">Noruegués nynorsk</language>
-			<language type="no">Noruegués</language>
-			<language type="nub">Lingua nubia</language>
-			<language type="oc">Occitano</language>
-			<language type="or">Orissa</language>
-			<language type="pa">Punjabi</language>
-			<language type="phi">Lingua filipina</language>
-			<language type="pl">Polaco</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portugués</language>
-			<language type="pt_BR">Portugués brasileiro</language>
-			<language type="pt_PT">Portugués ibérico</language>
-			<language type="ro">Romanés</language>
-			<language type="roa">Lingua románica</language>
-			<language type="ru">Ruso</language>
-			<language type="sa">Sánscrito</language>
-			<language type="sai">Lingua india sudamericana</language>
-			<language type="sd">Sindhi</language>
-			<language type="sem">Lingua semita</language>
-			<language type="sgn">Lingua de signos</language>
-			<language type="sh">Serbocroata</language>
-			<language type="si">Sinhalés</language>
-			<language type="sk">Eslovaco</language>
-			<language type="sl">Esloveno</language>
-			<language type="sla">Lingua eslávica</language>
-			<language type="so">Somalí</language>
-			<language type="sq">Albanés</language>
-			<language type="sr">Serbio</language>
-			<language type="ssa">Lingua do Nilo-Sáhara</language>
-			<language type="st">Sesotho</language>
-			<language type="su">Sondanés</language>
-			<language type="sv">Sueco</language>
-			<language type="sw">Suaxili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="th">Tailandés</language>
-			<language type="ti">Tigriña</language>
-			<language type="tl">Tagalo</language>
-			<language type="tlh">Clingon</language>
-			<language type="tr">Turco</language>
-			<language type="tut">Lingua altaica</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Ucraíno</language>
-			<language type="und">Lingua descoñecida ou non válida</language>
-			<language type="ur">Urdú</language>
-			<language type="uz">Uzbeco</language>
-			<language type="vi">Vietnamita</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Yiddish</language>
-			<language type="zh">Chinés</language>
-			<language type="zh_Hans">Chinés simplificado</language>
-			<language type="zh_Hant">Chinés tradicional</language>
-			<language type="zu">Zulú</language>
-			<language type="zxx">Sen contido lingüístico</language>
-		</languages>
-		<scripts>
-			<script type="Arab">árabe</script>
-			<script type="Brai">braille</script>
-			<script type="Cans">silabario aborixe canadiano unificado</script>
-			<script type="Cyrl">cirílico</script>
-			<script type="Grek">grego</script>
-			<script type="Hebr">hebreo</script>
-			<script type="Latn">latino</script>
-			<script type="Zxxx">non escrita</script>
-			<script type="Zzzz">escritura descoñecida ou non válida</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mundo</territory>
-			<territory type="002">�frica</territory>
-			<territory type="003">Norteamérica</territory>
-			<territory type="005">Sudamérica</territory>
-			<territory type="009">Oceanía</territory>
-			<territory type="011">�frica Occidental</territory>
-			<territory type="013">América Central</territory>
-			<territory type="014">�frica Oriental</territory>
-			<territory type="015">�frica Septentrional</territory>
-			<territory type="017">�frica Central</territory>
-			<territory type="018">�frica Meridional</territory>
-			<territory type="019">América</territory>
-			<territory type="021">América do Norte</territory>
-			<territory type="029">Caribe</territory>
-			<territory type="030">Asia Oriental</territory>
-			<territory type="034">Sul de Asia</territory>
-			<territory type="035">Sureste Asiático</territory>
-			<territory type="039">Europa Meridional</territory>
-			<territory type="053">Australia e Nova Celandia</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Rexión da Micronesia</territory>
-			<territory type="061">Polinesia</territory>
-			<territory type="062">Asia do Sul-Centro</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia Central</territory>
-			<territory type="145">Asia Occidental</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa do Leste</territory>
-			<territory type="154">Europa Septentrional</territory>
-			<territory type="155">Europa Occidental</territory>
-			<territory type="172">Comunidade de Estados Independentes</territory>
-			<territory type="419">América Latina e o Caribe</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiratos �rabes Unidos</territory>
-			<territory type="AF">Afganistán</territory>
-			<territory type="AG">Antiga e Barbuda</territory>
-			<territory type="AI">Anguila</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antillas Holandesas</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antártida</territory>
-			<territory type="AR">Arxentina</territory>
-			<territory type="AS">Samoa Americana</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Illas Aland</territory>
-			<territory type="AZ">Acerbaixán</territory>
-			<territory type="BA">Bosnia e Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Bélxica</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">San Bartolomé</territory>
-			<territory type="BM">Bermudas</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bután</territory>
-			<territory type="BV">Illa Bouvet</territory>
-			<territory type="BW">Botsuana</territory>
-			<territory type="BY">Bielorrusia</territory>
-			<territory type="BZ">Belice</territory>
-			<territory type="CA">Canadá</territory>
-			<territory type="CC">Illas Cocos</territory>
-			<territory type="CD">República Democrática do Congo</territory>
-			<territory type="CF">República Africana Central</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suíza</territory>
-			<territory type="CI">Costa de Marfil</territory>
-			<territory type="CK">Illas Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerún</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia e Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cabo Verde</territory>
-			<territory type="CX">Illa Christmas</territory>
-			<territory type="CY">Chipre</territory>
-			<territory type="CZ">República Checa</territory>
-			<territory type="DE">Alemaña</territory>
-			<territory type="DJ">Xibuti</territory>
-			<territory type="DK">Dinamarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">República Dominicana</territory>
-			<territory type="DZ">Arxelia</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Exipto</territory>
-			<territory type="EH">Sahara Occidental</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">España</territory>
-			<territory type="ET">Etiopía</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Fixi</territory>
-			<territory type="FK">Illas Malvinas</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Illas Feroe</territory>
-			<territory type="FR">Francia</territory>
-			<territory type="GA">Gabón</territory>
-			<territory type="GB">Reino Unido</territory>
-			<territory type="GD">Granada</territory>
-			<territory type="GE">Xeorxia</territory>
-			<territory type="GF">Güiana Francesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Xibraltar</territory>
-			<territory type="GL">Grenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadalupe</territory>
-			<territory type="GQ">Guinea Ecuatorial</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GS">Xeorxia do Sur e Illas Sandwich</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Güiana</territory>
-			<territory type="HK">Hong Kong RAE de China</territory>
-			<territory type="HM">Illa Heard e Illas McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croacia</territory>
-			<territory type="HT">Haití</territory>
-			<territory type="HU">Hungría</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Illa de Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Territorio Británico do Océano �ndico</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Irán</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Xamaica</territory>
-			<territory type="JO">Xordania</territory>
-			<territory type="JP">Xapón</territory>
-			<territory type="KE">Quenia</territory>
-			<territory type="KG">Quirguicistán</territory>
-			<territory type="KH">Cambodia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comores</territory>
-			<territory type="KN">San Cristovo e Nevis</territory>
-			<territory type="KP">Corea do Norte</territory>
-			<territory type="KR">Corea do Sur</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Illas Caimán</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Líbano</territory>
-			<territory type="LC">Santa Lucía</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Luxemburgo</territory>
-			<territory type="LV">Letonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Marrocos</territory>
-			<territory type="MC">Mónaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">San Martiño</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Illas Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macau RAE de China</territory>
-			<territory type="MP">Illas Marianas do norte</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricio</territory>
-			<territory type="MV">Maldivas</territory>
-			<territory type="MW">Malaui</territory>
-			<territory type="MX">México</territory>
-			<territory type="MY">Malaisia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nova Caledonia</territory>
-			<territory type="NE">Níxer</territory>
-			<territory type="NF">Illa Norfolk</territory>
-			<territory type="NG">Nixeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Países Baixos</territory>
-			<territory type="NO">Noruega</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nova Celandia</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panamá</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Polinesia Francesa</territory>
-			<territory type="PG">Papúa Nova Guinea</territory>
-			<territory type="PH">Filipinas</territory>
-			<territory type="PK">Paquistán</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">San Pedro e Miguelón</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Rico</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguai</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceanía Distante</territory>
-			<territory type="QU">Unión Europea</territory>
-			<territory type="RE">Reunión</territory>
-			<territory type="RO">Romanía</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rusia</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SB">Illas Salomón</territory>
-			<territory type="SC">Seixeles</territory>
-			<territory type="SD">Sudán</territory>
-			<territory type="SE">Suecia</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Santa Helena</territory>
-			<territory type="SI">Eslovenia</territory>
-			<territory type="SJ">Svalbard e Jan Mayen</territory>
-			<territory type="SK">Eslovaquia</territory>
-			<territory type="SL">Serra Leoa</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Santo Tomé e Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Suacilandia</territory>
-			<territory type="TC">Illas Turks e Caicos</territory>
-			<territory type="TD">Xad</territory>
-			<territory type="TF">Territorios Franceses do Sul</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandia</territory>
-			<territory type="TJ">Taxiquistán</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Leste</territory>
-			<territory type="TM">Turkmenistán</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquía</territory>
-			<territory type="TT">Trindade e Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwán</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ucraína</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Illas Menores Distantes dos EUA.</territory>
-			<territory type="US">Estados Unidos de América</territory>
-			<territory type="UY">Uruguai</territory>
-			<territory type="UZ">Uzbekistán</territory>
-			<territory type="VA">Cidade do Vaticano</territory>
-			<territory type="VC">San Vicente e Granadinas</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Illas Virxes Británicas</territory>
-			<territory type="VI">Illas Virxes Estadounidenses</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis e Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Iemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sudáfrica</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Cimbabue</territory>
-			<territory type="ZZ">rexión descoñecida ou non válida</territory>
-		</territories>
-		<keys>
-			<key type="calendar">calendario</key>
-			<key type="collation">orde alfabética</key>
-			<key type="currency">moeda</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">orde chinesa tradicional - Big5</type>
-			<type type="buddhist" key="calendar">calendario budista</type>
-			<type type="chinese" key="calendar">calendario chinés</type>
-			<type type="direct" key="collation">orde alfabética directa</type>
-			<type type="gb2312han" key="collation">orde chinesa simplificada - GB2312</type>
-			<type type="gregorian" key="calendar">calendario gregoriano</type>
-			<type type="hebrew" key="calendar">calendario hebreo</type>
-			<type type="islamic" key="calendar">calendario islámico</type>
-			<type type="islamic-civil" key="calendar">calendario islámico civil</type>
-			<type type="japanese" key="calendar">calendario xaponés</type>
-			<type type="phonebook" key="collation">orde da guía telefónica</type>
-			<type type="pinyin" key="collation">orde pinyin</type>
-			<type type="stroke" key="collation">orde polo número de trazos</type>
-			<type type="traditional" key="collation">orde tradicional</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">métrico decimal</measurementSystemName>
-			<measurementSystemName type="US">americano</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Idioma: {0}</codePattern>
-			<codePattern type="script">Alfabeto: {0}</codePattern>
-			<codePattern type="territory">Rexión: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b-e é f-i í j-n ñ o ó p-u ú ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ª à â ä ã ç è ê-ì î ï º ò ô ö õ ù û]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Xan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Abr</month>
-							<month type="5">Mai</month>
-							<month type="6">Xuñ</month>
-							<month type="7">Xul</month>
-							<month type="8">Ago</month>
-							<month type="9">Set</month>
-							<month type="10">Out</month>
-							<month type="11">Nov</month>
-							<month type="12">Dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Xaneiro</month>
-							<month type="2">Febreiro</month>
-							<month type="3">Marzo</month>
-							<month type="4">Abril</month>
-							<month type="5">Maio</month>
-							<month type="6">Xuño</month>
-							<month type="7">Xullo</month>
-							<month type="8">Agosto</month>
-							<month type="9">Setembro</month>
-							<month type="10">Outubro</month>
-							<month type="11">Novembro</month>
-							<month type="12">Decembro</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">X</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">X</month>
-							<month type="7">X</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Dom</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Mér</day>
-							<day type="thu">Xov</day>
-							<day type="fri">Ven</day>
-							<day type="sat">Sáb</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Domingo</day>
-							<day type="mon">Luns</day>
-							<day type="tue">Martes</day>
-							<day type="wed">Mércores</day>
-							<day type="thu">Xoves</day>
-							<day type="fri">Venres</day>
-							<day type="sat">Sábado</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">X</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1o trimestre</quarter>
-							<quarter type="2">2o trimestre</quarter>
-							<quarter type="3">3o trimestre</quarter>
-							<quarter type="4">4o trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">antes de Cristo</era>
-						<era type="1">despois de Cristo</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.C.</era>
-						<era type="1">d.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ano</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mes</displayName>
-					</field>
-					<field type="week">
-						<displayName>Semana</displayName>
-					</field>
-					<field type="day">
-						<displayName>Día</displayName>
-						<relative type="-3">trasantonte</relative>
-						<relative type="-2">antonte</relative>
-						<relative type="-1">onte</relative>
-						<relative type="0">hoxe</relative>
-						<relative type="1">mañá</relative>
-						<relative type="2">pasadomañá</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Día da semana</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuto</displayName>
-					</field>
-					<field type="second">
-						<displayName>Segundo</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Fuso horario</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Hora de {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Descoñecido</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Anguila</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Polo Sul</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont-d'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Bos Aires</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudas</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belice</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St Johns</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Illa de Pascua</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cabo Verde</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Xubuti</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Illas Galápagos</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Illas Canarias</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidxi</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>París</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Xibraltar</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Güiana</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Iacarta</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Xamaica</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburgo</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Mónaco</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricio</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivas</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Monterrei</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Cidade de México</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Rico</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunión</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrado</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscova</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgogrado</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Ecaterinburgo</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>O Salvador</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulú</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Central</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburg</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tell City</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticello</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcanda</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>horario europeo central</standard>
-					<daylight>horario de verán europeo central</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>horario europeo oriental</standard>
-					<daylight>horario de verán europeo oriental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>horario europeo occidental</standard>
-					<daylight>horario de verán europeo occidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>horario medio de Greenwich</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>peseta andorrana</displayName>
-				<displayName count="one">peseta andorrana</displayName>
-				<displayName count="other">pesetas andorranas</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Peso arxentino (1983-1985)</displayName>
-				<displayName count="one">peso arxentino (ARP)</displayName>
-				<displayName count="other">pesos arxentinos (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso arxentino</displayName>
-				<displayName count="one">peso arxentino</displayName>
-				<displayName count="other">pesos arxentinos</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Franco belga (convertible)</displayName>
-				<displayName count="one">franco belga (convertible)</displayName>
-				<displayName count="other">francos belgas (convertibles)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Franco belga</displayName>
-				<displayName count="one">franco belga</displayName>
-				<displayName count="other">francos belgas</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Franco belga (financeiro)</displayName>
-				<displayName count="one">franco belga (financeiro)</displayName>
-				<displayName count="other">francos belgas (financeiros)</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="one">boliviano</displayName>
-				<displayName count="other">bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Peso boliviano</displayName>
-				<displayName count="one">peso boliviano</displayName>
-				<displayName count="other">pesos bolivianos</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>MVDOL boliviano</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Cruzeiro novo brasileiro (1967-1986)</displayName>
-				<displayName count="one">cruzeiro novo brasileiro</displayName>
-				<displayName count="other">cruzeiros novos brasileiros</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Cruzado brasileiro</displayName>
-				<displayName count="one">cruzado brasileiro</displayName>
-				<displayName count="other">cruzados brasileiros</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Cruzeiro brasileiro (1990-1993)</displayName>
-				<displayName count="one">cruzeiro brasileiro (BRE)</displayName>
-				<displayName count="other">cruzeiros brasileiros (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real brasileiro</displayName>
-				<displayName count="one">real brasileiro</displayName>
-				<displayName count="other">reais brasileiros</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Cruzado novo brasileiro</displayName>
-				<displayName count="one">cruzado novo brasileiro</displayName>
-				<displayName count="other">cruzados novos brasileiros</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Cruzeiro brasileiro</displayName>
-				<displayName count="one">cruzeiro brasileiro</displayName>
-				<displayName count="other">cruzeiros brasileiros</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dólar canadiano</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franco suizo</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de fomento chilenas</displayName>
-				<displayName count="one">unidade de fomento chilena</displayName>
-				<displayName count="other">unidades de fomento chilenas</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso chileno</displayName>
-				<displayName count="one">peso chileno</displayName>
-				<displayName count="other">pesos chilenos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Iuan renminbi chinés</displayName>
-				<displayName count="one">iuán chinés</displayName>
-				<displayName count="other">iuáns chineses</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso colombiano</displayName>
-				<displayName count="one">peso colombiano</displayName>
-				<displayName count="other">pesos colombianos</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colón costarricense</displayName>
-				<displayName count="one">colón costarricense</displayName>
-				<displayName count="other">colóns costarricenses</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso cubano</displayName>
-				<displayName count="one">peso cubano</displayName>
-				<displayName count="other">pesos cubanos</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marco alemán</displayName>
-				<displayName count="one">marco alemán</displayName>
-				<displayName count="other">marcos alemáns</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Coroa dinamarquesa</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso dominicano</displayName>
-				<displayName count="one">peso dominicano</displayName>
-				<displayName count="other">pesos dominicanos</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre ecuatoriano</displayName>
-				<displayName count="one">sucre ecuatoriano</displayName>
-				<displayName count="other">sucres ecuatorianos</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidade de valor constante ecuatoriana</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Peseta española (conta A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Peseta española (conta convertible)</displayName>
-			</currency>
-			<currency type="ESP">
-				<pattern>#,##0 ¤;-#,##0 ¤</pattern>
-				<displayName>Peseta española</displayName>
-				<displayName count="one">peseta</displayName>
-				<displayName count="other">pesetas</displayName>
-				<symbol>₧</symbol>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franco francés</displayName>
-				<displayName count="one">franco francés</displayName>
-				<displayName count="other">francos franceses</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Libra esterlina</displayName>
-				<displayName count="one">libra esterlina</displayName>
-				<displayName count="other">libras esterlinas</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Libra de Xibraltar</displayName>
-				<displayName count="one">libra xibraltareña</displayName>
-				<displayName count="other">libras xibraltareñas</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franco guineano</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Syli guineano</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Dracma grego</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal guatemalteco</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira hondureño</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Florín húngaro</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Libra irlandesa</displayName>
-				<displayName count="one">libra irlandesa</displayName>
-				<displayName count="other">libras irlandesas</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupia india</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Coroa islandesa</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lira italiana</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Ien xaponés</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Franco convertible luxemburgués</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Franco luxemburgués</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Franco financeiro luxemburgués</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham marroquí</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Franco marroquí</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso mexicano</displayName>
-				<displayName count="one">peso mexicano</displayName>
-				<displayName count="other">pesos mexicanos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso de prata mexicano (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidade de inversión mexicana</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Córdoba nicaragüense</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba de ouro nicaragüense</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Florín holandés</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Coroa norueguesa</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa panameño</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Inti peruano</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Sol novo peruano</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol peruano</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso filipino</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Escudo portugués</displayName>
-				<displayName count="one">escudo portugués</displayName>
-				<displayName count="other">escudos portugueses</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guaraní paraguaio</displayName>
-				<displayName count="one">guaraní do paraguai</displayName>
-				<displayName count="other">guaranís do paraguai</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rublo ruso</displayName>
-				<displayName count="one">rublo ruso</displayName>
-				<displayName count="other">rublos rusos</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rublo ruso (1991-1998)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Coroa sueca</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Rublo soviético</displayName>
-				<displayName count="one">rublo soviético</displayName>
-				<displayName count="other">rublos soviéticos</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colón salvadoreño</displayName>
-				<displayName count="one">colón salvadoreño</displayName>
-				<displayName count="other">colóns salvadoreños</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dólar estadounidense</displayName>
-				<displayName count="one">dólar estadounidense</displayName>
-				<displayName count="other">dólares estadounidenses</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Peso en unidades indexadas uruguaio</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Peso uruguaio (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso uruguaio</displayName>
-				<displayName count="one">peso uruguaio</displayName>
-				<displayName count="other">pesos uruguaios</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolívar venezolano</displayName>
-				<displayName count="one">bolívar venezolano</displayName>
-				<displayName count="other">bolívares venezolanos</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar forte venezolano</displayName>
-				<displayName count="one">bolívar forte venezolano</displayName>
-				<displayName count="other">bolívares fortes venezolanos</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Prata</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Ouro</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladio</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platino</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Unidade monetaria descoñecida ou non válida</displayName>
-				<displayName count="one">unidade monetaria descoñecida ou non válida</displayName>
-				<displayName count="other">unidades monetarias descoñecidas ou non válidas</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand sudafricano</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} día</unitPattern>
-			<unitPattern count="other">{0} días</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hora</unitPattern>
-			<unitPattern count="other">{0} horas</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuto</unitPattern>
-			<unitPattern count="other">{0} minutos</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mes</unitPattern>
-			<unitPattern count="other">{0} meses</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segundo</unitPattern>
-			<unitPattern count="other">{0} segundos</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} semana</unitPattern>
-			<unitPattern count="other">{0} semanas</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} ano</unitPattern>
-			<unitPattern count="other">{0} anos</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>si:s</yesstr>
-			<nostr>non:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/gl_ES.xml b/airtime_mvc/library/Zend/Locale/Data/gl_ES.xml
deleted file mode 100644
index 132f6bc53..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gl_ES.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gl"/>
-		<territory type="ES"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gsw.xml b/airtime_mvc/library/Zend/Locale/Data/gsw.xml
deleted file mode 100644
index 7396ea5f1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gsw.xml
+++ /dev/null
@@ -1,2918 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="gsw"/>
-	</identity>
-	<fallback>de_CH</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abchasisch</language>
-			<language type="ace">Aceh</language>
-			<language type="ach">Acholi</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adygai</language>
-			<language type="ae">Avestisch</language>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Afro-Asiatischi Schpraach</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadisch</language>
-			<language type="ale">Aleutisch</language>
-			<language type="alg">Algonkin-Schpraach</language>
-			<language type="alt">Süüd-Altaisch</language>
-			<language type="am">Amharisch</language>
-			<language type="an">Aragonesisch</language>
-			<language type="ang">Altänglisch</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apache-Schpraach</language>
-			<language type="ar">Arabisch</language>
-			<language type="arc">Aramääisch</language>
-			<language type="arn">Araukanisch</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Künschtlichi Schpraach</language>
-			<language type="arw">Arawak</language>
-			<language type="as">Assamesisch</language>
-			<language type="ast">Aschturianisch</language>
-			<language type="ath">Athapaskischi Schpraach</language>
-			<language type="aus">Auschtralischi Schpraach</language>
-			<language type="av">Awarisch</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Aserbaidschanisch</language>
-			<language type="ba">Baschkirisch</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke</language>
-			<language type="bal">Belutschisch</language>
-			<language type="ban">Balinesisch</language>
-			<language type="bas">Basaa</language>
-			<language type="bat">Baltischi Schpraach</language>
-			<language type="be">Wiissrussisch</language>
-			<language type="bej">Bedauye</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Bärberisch</language>
-			<language type="bg">Bulgaarisch</language>
-			<language type="bh">Bihaarisch</language>
-			<language type="bho">Bhodschpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikolisch</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Blackfoot-Schpraach</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengalisch</language>
-			<language type="bnt">Bantu</language>
-			<language type="bo">Tibeetisch</language>
-			<language type="br">Brötoonisch</language>
-			<language type="bra">Braj-Bhakha</language>
-			<language type="bs">Bosnisch</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Burjatisch</language>
-			<language type="bug">Bugineesisch</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalaanisch</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Zentralamerikanischi Indianerschpraach</language>
-			<language type="car">Kariibisch</language>
-			<language type="cau">Kaukaasisch</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Tschetscheenisch</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Keltischi Schpraach</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Tschibtscha</language>
-			<language type="chg">Tschagataisch</language>
-			<language type="chk">Trukesisch</language>
-			<language type="chm">Tscheremissisch</language>
-			<language type="chn">Chinook</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Chamischi Schpraach</language>
-			<language type="co">Korsisch</language>
-			<language type="cop">Koptisch</language>
-			<language type="cpe">Änglisch-basierts Kreol oder Pidgin</language>
-			<language type="cpf">Französisch-basierts Kreol oder Pidgin</language>
-			<language type="cpp">Portugiesisch-basierts Kreol oder Pidgin</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Krimtatarisch</language>
-			<language type="crp">Kreol oder Pidgin</language>
-			<language type="cs">Tschechisch</language>
-			<language type="csb">Kaschubisch</language>
-			<language type="cu">Chileslawisch</language>
-			<language type="cus">Kuschitischi Schpraach</language>
-			<language type="cv">Tschuwaschisch</language>
-			<language type="cy">Walisisch</language>
-			<language type="da">Tänisch</language>
-			<language type="dak">Takota</language>
-			<language type="dar">Targiinisch</language>
-			<language type="day">Tajakisch</language>
-			<language type="de">Tüütsch</language>
-			<language type="de_AT">Öschtriichischs Tüütsch</language>
-			<language type="de_CH">Schwiizer Hochtüütsch</language>
-			<language type="del">Delaware-Schpraach</language>
-			<language type="den">Slavey</language>
-			<language type="dgr">Togrib</language>
-			<language type="din">Tinka</language>
-			<language type="doi">Togri</language>
-			<language type="dra">Trawidischi Schpraach</language>
-			<language type="dsb">Nidersorbisch</language>
-			<language type="dua">Tuala</language>
-			<language type="dum">Mittelniderländisch</language>
-			<language type="dv">Malediivisch</language>
-			<language type="dyu">Tiula</language>
-			<language type="dz">Dschongkha</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efikisch</language>
-			<language type="egy">Altägyptisch</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Griechisch</language>
-			<language type="elx">Elamisch</language>
-			<language type="en">Änglisch</language>
-			<language type="en_AU">Auschtralischs Änglisch</language>
-			<language type="en_CA">Kanadischs Änglisch</language>
-			<language type="en_GB">Britischs Änglisch</language>
-			<language type="en_US">Amerikanischs Änglisch</language>
-			<language type="enm">Mittelänglisch</language>
-			<language type="eo">Eschperanto</language>
-			<language type="es">Schpanisch</language>
-			<language type="es_419">Latiinamerikanischs Schpanisch</language>
-			<language type="es_ES">Ibeerischs Schpanisch</language>
-			<language type="et">Eestnisch</language>
-			<language type="eu">Baskisch</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Persisch</language>
-			<language type="fan">Pangwe-Schpraach</language>
-			<language type="fat">Fanti-Schpraach</language>
-			<language type="ff">Ful</language>
-			<language type="fi">Finnisch</language>
-			<language type="fil">Filipino</language>
-			<language type="fiu">Finno-ugrischi Schpraach</language>
-			<language type="fj">Fidschianisch</language>
-			<language type="fo">Färöisch</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Französisch</language>
-			<language type="fr_CA">Kanadischs Französisch</language>
-			<language type="fr_CH">Schwiizer Französisch</language>
-			<language type="frm">Mittelfranzösisch</language>
-			<language type="fro">Altfranzösisch</language>
-			<language type="frr">Nordfriesisch</language>
-			<language type="frs">Oschtfriesisch</language>
-			<language type="fur">Friulisch</language>
-			<language type="fy">Friesisch</language>
-			<language type="ga">Iirisch</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">Schottisch-Gäälisch</language>
-			<language type="gem">Germanischi Schpraach</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbertesisch</language>
-			<language type="gl">Galizisch</language>
-			<language type="gmh">Mittelhochtüütsch</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Althochtüütsch</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Mongondou</language>
-			<language type="got">Gotisch</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Altgriechisch</language>
-			<language type="gsw">Schwiizertüütsch</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx-Gäälisch</language>
-			<language type="gwi">Kutchinisch</language>
-			<language type="ha">Haussa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaiianisch</language>
-			<language type="he">Hebräisch</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynonisch</language>
-			<language type="him">Himatschalisch</language>
-			<language type="hit">Hethitisch</language>
-			<language type="hmn">Miao</language>
-			<language type="ho">Hiri-Motu</language>
-			<language type="hr">Kroazisch</language>
-			<language type="hsb">Obersorbisch</language>
-			<language type="ht">Haitisch</language>
-			<language type="hu">Ungarisch</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armenisch</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Ibanisch</language>
-			<language type="id">Indonesisch</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sezuanischs Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiak</language>
-			<language type="ilo">Ilokano</language>
-			<language type="inc">Indoarischi Schpraach</language>
-			<language type="ine">Indogermanischi Schpraach</language>
-			<language type="inh">Inguschisch</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iranischi Schpraach</language>
-			<language type="iro">Irokesischi Schpraach</language>
-			<language type="is">Iisländisch</language>
-			<language type="it">Italiänisch</language>
-			<language type="iu">Inukitut</language>
-			<language type="ja">Japanisch</language>
-			<language type="jbo">Lojbanisch</language>
-			<language type="jpr">Jüüdisch-Persisch</language>
-			<language type="jrb">Jüüdisch-Arabisch</language>
-			<language type="jv">Javanisch</language>
-			<language type="ka">Georgisch</language>
-			<language type="kaa">Karakalpakisch</language>
-			<language type="kab">Kabylisch</language>
-			<language type="kac">Kachin-Schpraach</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karenisch</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardinisch</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongolesisch</language>
-			<language type="kha">Khasisch</language>
-			<language type="khi">Khoisanisch</language>
-			<language type="kho">Sakisch</language>
-			<language type="ki">Kikuyu-Schpraach</language>
-			<language type="kj">Kwanyama</language>
-			<language type="kk">Kasachisch</language>
-			<language type="kl">Gröönländisch</language>
-			<language type="km">Kambodschanisch</language>
-			<language type="kmb">Kimbundu-Schpraach</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Koreaanisch</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraeanisch</language>
-			<language type="kpe">Kpelle-Schpraach</language>
-			<language type="kr">Kanuri-Schpraach</language>
-			<language type="krc">Karatschaiisch-Balkarisch</language>
-			<language type="krl">Karelisch</language>
-			<language type="kro">Kru-Schpraach</language>
-			<language type="kru">Oraon-Schpraach</language>
-			<language type="ks">Kaschmirisch</language>
-			<language type="ku">Kurdisch</language>
-			<language type="kum">Kumükisch</language>
-			<language type="kut">Kutenai-Schpraach</language>
-			<language type="kv">Komi-Schpraach</language>
-			<language type="kw">Kornisch</language>
-			<language type="ky">Kirgiisisch</language>
-			<language type="la">Latiin</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahndanisch</language>
-			<language type="lam">Lambanisch</language>
-			<language type="lb">Luxemburgisch</language>
-			<language type="lez">Lesgisch</language>
-			<language type="lg">Ganda-Schpraach</language>
-			<language type="li">Limburgisch</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laozisch</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Rotse-Schpraach</language>
-			<language type="lt">Litauisch</language>
-			<language type="lu">Luba</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno-Schpraach</language>
-			<language type="lun">Lunda-Schpraach</language>
-			<language type="luo">Luo-Schpraach</language>
-			<language type="lus">Lushai-Schpraach</language>
-			<language type="lv">Lettisch</language>
-			<language type="mad">Maduresisch</language>
-			<language type="mag">Khotta</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makassarisch</language>
-			<language type="man">Manding-Schpraach</language>
-			<language type="map">Auschtroneesischi Schpraach</language>
-			<language type="mas">Massai-Schpraach</language>
-			<language type="mdf">Mokschamordwinisch</language>
-			<language type="mdr">Mandaresisch</language>
-			<language type="men">Mende-Schpraach</language>
-			<language type="mg">Madagassisch</language>
-			<language type="mga">Mittelirisch</language>
-			<language type="mh">Marschallesisch</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac-Schpraach</language>
-			<language type="min">Minangkabau-Schpraach</language>
-			<language type="mis">Anderi Schpraach</language>
-			<language type="mk">Mazedonisch</language>
-			<language type="mkh">Mon-Khmer-Schpraach</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolisch</language>
-			<language type="mnc">Mandschurisch</language>
-			<language type="mni">Meithei-Schpraach</language>
-			<language type="mno">Manobo-Schpraach</language>
-			<language type="mo">Moldawisch</language>
-			<language type="moh">Mohawk-Schpraach</language>
-			<language type="mos">Mossi-Schpraach</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malaiisch</language>
-			<language type="mt">Maltesisch</language>
-			<language type="mul">Mehrschpraachig</language>
-			<language type="mun">Munda-Schpraach</language>
-			<language type="mus">Muskogee-Schpraach</language>
-			<language type="mwl">Mirandesisch</language>
-			<language type="mwr">Marwarisch</language>
-			<language type="my">Birmanisch</language>
-			<language type="myn">Maya-Schpraach</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauruisch</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Nordamerikanischi Indianersprach</language>
-			<language type="nap">Neapolitanisch</language>
-			<language type="nb">Norwegisch Bokmål</language>
-			<language type="nd">Nord-Ndebele-Schpraach</language>
-			<language type="nds">Nidertüütsch</language>
-			<language type="ne">Nepalesisch</language>
-			<language type="new">Newarisch</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias-Schpraach</language>
-			<language type="nic">Nigerkordofanischi Schpraach</language>
-			<language type="niu">Niue-Schpraach</language>
-			<language type="nl">Niderländisch</language>
-			<language type="nl_BE">Fläämisch</language>
-			<language type="nn">Norwegisch Nynorsk</language>
-			<language type="no">Norwegisch</language>
-			<language type="nog">Nogaisch</language>
-			<language type="non">Altnordisch</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">Süüd-Ndebele-Schpraach</language>
-			<language type="nso">Nord-Sotho-Schpraach</language>
-			<language type="nub">Nubischi Schpraach</language>
-			<language type="nv">Navajo-Schpraach</language>
-			<language type="nwc">Alt-Newari</language>
-			<language type="ny">Chewa-Schpraach</language>
-			<language type="nym">Nyamwezi-Schpraach</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Okzitanisch</language>
-			<language type="oj">Ojibwa-Schpraach</language>
-			<language type="om">Oromo</language>
-			<language type="or">Orija</language>
-			<language type="os">Ossezisch</language>
-			<language type="osa">Osage-Schpraach</language>
-			<language type="ota">Osmanisch</language>
-			<language type="oto">Otomangue-Schpraach</language>
-			<language type="pa">Pandschabisch</language>
-			<language type="paa">Papua-Schpraach</language>
-			<language type="pag">Pangasinanisch</language>
-			<language type="pal">Mittelpersisch</language>
-			<language type="pam">Pampanggan-Schpraach</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palau</language>
-			<language type="peo">Altpersisch</language>
-			<language type="phi">Philippine-Austronesischi Schpraach</language>
-			<language type="phn">Phönikisch</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Polnisch</language>
-			<language type="pon">Ponapeanisch</language>
-			<language type="pra">Prakrit</language>
-			<language type="pro">Altprovenzalisch</language>
-			<language type="ps">Paschtu</language>
-			<language type="pt">Portugiisisch</language>
-			<language type="pt_BR">Brasilianischs Portugiisisch</language>
-			<language type="pt_PT">Iberischs Portugiisisch</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Oschterinsel-Schpraach</language>
-			<language type="rar">Rarotonganisch</language>
-			<language type="rm">Rätoromanisch</language>
-			<language type="rn">Rundi-Schpraach</language>
-			<language type="ro">Rumänisch</language>
-			<language type="roa">Romanischi Schpraach</language>
-			<language type="rom">Zigüünerschpraach</language>
-			<language type="root">Root</language>
-			<language type="ru">Russisch</language>
-			<language type="rup">Aromunisch</language>
-			<language type="rw">Ruandisch</language>
-			<language type="sa">Sanschkrit</language>
-			<language type="sad">Sandawe-Schpraach</language>
-			<language type="sah">Jakutisch</language>
-			<language type="sai">Süüdamerikanischi Indianerschpraach</language>
-			<language type="sal">Salish-Schpraach</language>
-			<language type="sam">Samaritanisch</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardisch</language>
-			<language type="scn">Sizilianisch</language>
-			<language type="sco">Schottisch</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Nord-Samisch</language>
-			<language type="sel">Selkupisch</language>
-			<language type="sem">Semitischi Schpraach</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Altirisch</language>
-			<language type="sgn">Gebäärdeschpraach</language>
-			<language type="sh">Serbo-Kroatisch</language>
-			<language type="shn">Schan-Schpraach</language>
-			<language type="si">Singhalesisch</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Sioux-Schpraach</language>
-			<language type="sit">Sinotibetischi Schpraach</language>
-			<language type="sk">Slowakisch</language>
-			<language type="sl">Slowenisch</language>
-			<language type="sla">Slawischi Schpraach</language>
-			<language type="sm">Samoanisch</language>
-			<language type="sma">Süüd-Samisch</language>
-			<language type="smi">Samisch</language>
-			<language type="smj">Lule-Samisch</language>
-			<language type="smn">Inari-Samisch</language>
-			<language type="sms">Skolt-Samisch</language>
-			<language type="sn">Schhona</language>
-			<language type="snk">Soninke-Schpraach</language>
-			<language type="so">Somali</language>
-			<language type="sog">Sogdisch</language>
-			<language type="son">Songhai-Schpraach</language>
-			<language type="sq">Albanisch</language>
-			<language type="sr">Serbisch</language>
-			<language type="srn">Srananisch</language>
-			<language type="srr">Serer-Schpraach</language>
-			<language type="ss">Swazi</language>
-			<language type="ssa">Nilosaharanischi Schpraach</language>
-			<language type="st">Süüd-Sotho-Schpraach</language>
-			<language type="su">Sundanesisch</language>
-			<language type="suk">Sukuma-Schpraach</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumerisch</language>
-			<language type="sv">Schwedisch</language>
-			<language type="sw">Suaheli</language>
-			<language type="syc">Altsyrisch</language>
-			<language type="syr">Syrisch</language>
-			<language type="ta">Tamilisch</language>
-			<language type="tai">Thaischpraache</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Temne</language>
-			<language type="ter">Tereno-Schpraach</language>
-			<language type="tet">Tetum-Schpraach</language>
-			<language type="tg">Tadschikisch</language>
-			<language type="th">Thailändisch</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv-Schpraach</language>
-			<language type="tk">Turkmenisch</language>
-			<language type="tkl">Tokelauanisch</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingonisch</language>
-			<language type="tli">Tlingit-Schpraach</language>
-			<language type="tmh">Tamaseq</language>
-			<language type="tn">Tswana-Schpraach</language>
-			<language type="to">Tongaisch</language>
-			<language type="tog">Tsonga-Schpraach</language>
-			<language type="tpi">Neumelanesisch</language>
-			<language type="tr">Türkisch</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian-Schpraach</language>
-			<language type="tt">Tatarisch</language>
-			<language type="tum">Tumbuka-Schpraach</language>
-			<language type="tup">Tupi-Schpraache</language>
-			<language type="tut">Altaischi Schpraachä</language>
-			<language type="tvl">Elliceanisch</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitisch</language>
-			<language type="tyv">Tuwinisch</language>
-			<language type="udm">Udmurtisch</language>
-			<language type="ug">Uigurisch</language>
-			<language type="uga">Ugaritisch</language>
-			<language type="uk">Ukrainisch</language>
-			<language type="umb">Mbundu-Schpraach</language>
-			<language type="und">Unbeschtimmti Schpraach</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Usbekisch</language>
-			<language type="vai">Vai-Schpraach</language>
-			<language type="ve">Venda-Schpraach</language>
-			<language type="vi">Vietnamesisch</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Wotisch</language>
-			<language type="wa">Wallonisch</language>
-			<language type="wak">Wakashanisch</language>
-			<language type="wal">Walamo-Schpraach</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo-Schpraach</language>
-			<language type="wen">Sorbisch</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmückisch</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao-Schpraach</language>
-			<language type="yap">Yapesisch</language>
-			<language type="yi">Jiddisch</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik-Schpraach</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotekisch</language>
-			<language type="zbl">Bliss-Symbool</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Chineesisch</language>
-			<language type="zh_Hans">Veräifachts Chineesisch</language>
-			<language type="zh_Hant">Tradizionells Chineesisch</language>
-			<language type="znd">Zande-Schpraach</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni-Schpraach</language>
-			<language type="zxx">Kän schpraachliche Inhalt</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabisch</script>
-			<script type="Armi">Armi</script>
-			<script type="Armn">Armenisch</script>
-			<script type="Avst">Aveschtisch</script>
-			<script type="Bali">Balinesisch</script>
-			<script type="Batk">Battakisch</script>
-			<script type="Beng">Bengalisch</script>
-			<script type="Blis">Bliss-Symbool</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Blindäschrift</script>
-			<script type="Bugi">Buginesisch</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Cakm</script>
-			<script type="Cans">UCAS</script>
-			<script type="Cari">Karisch</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptisch</script>
-			<script type="Cprt">Zypriotisch</script>
-			<script type="Cyrl">Kyrillisch</script>
-			<script type="Cyrs">Altchileslawisch</script>
-			<script type="Deva">Tövanagaari</script>
-			<script type="Dsrt">Teseret</script>
-			<script type="Egyd">Temozisch-Ägüptisch</script>
-			<script type="Egyh">Hiraazisch-Ägüptisch</script>
-			<script type="Egyp">Ägüptischi Hiroglüüfe</script>
-			<script type="Ethi">Äzioopisch</script>
-			<script type="Geok">Ghutsuri</script>
-			<script type="Geor">Georgisch</script>
-			<script type="Glag">Glagolitisch</script>
-			<script type="Goth">Gotisch</script>
-			<script type="Grek">Griechisch</script>
-			<script type="Gujr">Guscharati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Chineesisch</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Veräifachti Chineesischi Schrift</script>
-			<script type="Hant">Tradizionelli Chineesischi Schrift</script>
-			<script type="Hebr">Hebräisch</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana oder Hiragana</script>
-			<script type="Hung">Altungarisch</script>
-			<script type="Inds">Indus-Schrift</script>
-			<script type="Ital">Altitalisch</script>
-			<script type="Java">Javanesisch</script>
-			<script type="Jpan">Japanisch</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreanisch</script>
-			<script type="Kthi">Kthi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Laotisch</script>
-			<script type="Latf">Latiinisch - Fraktur-Variante</script>
-			<script type="Latg">Latiinisch - Gäälischi Variante</script>
-			<script type="Latn">Latiinisch</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Linear A</script>
-			<script type="Linb">Linear B</script>
-			<script type="Lyci">Lykisch</script>
-			<script type="Lydi">Lydisch</script>
-			<script type="Mand">Mandäisch</script>
-			<script type="Mani">Manichäisch</script>
-			<script type="Maya">Maya-Hieroglyphä</script>
-			<script type="Mero">Meroitisch</script>
-			<script type="Mlym">Malaysisch</script>
-			<script type="Mong">Mongolisch</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Burmesisch</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orchon-Runä</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanisch</script>
-			<script type="Perm">Altpermisch</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Phli</script>
-			<script type="Phlp">Phlp</script>
-			<script type="Phlv">Pahlavi</script>
-			<script type="Phnx">Phönizisch</script>
-			<script type="Plrd">Pollard Phonetisch</script>
-			<script type="Prti">Prti</script>
-			<script type="Qaai">G’eerbtä Schriftwärt</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runäschrift</script>
-			<script type="Samr">Samaritanisch</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">Gebäärdeschpraach</script>
-			<script type="Shaw">Shaw-Alphabet</script>
-			<script type="Sinh">Singhalesisch</script>
-			<script type="Sund">Sundanesisch</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syrisch</script>
-			<script type="Syre">Syrisch - Eschtrangelo-Variante</script>
-			<script type="Syrj">Weschtsyrisch</script>
-			<script type="Syrn">Oschtsyrisch</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Tai Lue</script>
-			<script type="Taml">Tamilisch</script>
-			<script type="Tavt">Tavt</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibeetisch</script>
-			<script type="Ugar">Ugaritisch</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Sichtbari Schpraach</script>
-			<script type="Xpeo">Altpersisch</script>
-			<script type="Xsux">Sumerisch-akkadischi Keilschrift</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Zmth</script>
-			<script type="Zsym">Zsym</script>
-			<script type="Zxxx">Schriftlosi Schpraach</script>
-			<script type="Zyyy">Unbeschtimmt</script>
-			<script type="Zzzz">Uncodiirti Schrift</script>
-		</scripts>
-		<territories>
-			<territory type="001">Wält</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nordameerika</territory>
-			<territory type="005">Süüdameerika</territory>
-			<territory type="009">Ozeaanie</territory>
-			<territory type="011">Weschtafrika</territory>
-			<territory type="013">Mittelameerika</territory>
-			<territory type="014">Oschtafrika</territory>
-			<territory type="015">Nordafrika</territory>
-			<territory type="017">Zentraalafrika</territory>
-			<territory type="018">Süüdlichs Afrika</territory>
-			<territory type="019">Nord-, Mittel- und Süüdameerika</territory>
-			<territory type="021">Nördlichs Ameerika</territory>
-			<territory type="029">Karibik</territory>
-			<territory type="030">Oschtaasie</territory>
-			<territory type="034">Süüdaasie</territory>
-			<territory type="035">Süüdoschtaasie</territory>
-			<territory type="039">Süüdeuropa</territory>
-			<territory type="053">Auschtraalie und Nöiseeland</territory>
-			<territory type="054">Melaneesie</territory>
-			<territory type="057">Mikroneesischs Inselgebiet</territory>
-			<territory type="061">Polineesie</territory>
-			<territory type="062">Süüd-Zentraalaasie</territory>
-			<territory type="142">Aasie</territory>
-			<territory type="143">Zentraalaasie</territory>
-			<territory type="145">Weschtaasie</territory>
-			<territory type="150">Euroopa</territory>
-			<territory type="151">Oschteuroopa</territory>
-			<territory type="154">Nordeuroopa</territory>
-			<territory type="155">Weschteuroopa</territory>
-			<territory type="172">Gmäinschaft vo Unabhängige Schtaate</territory>
-			<territory type="419">Latiinameerika und Karibik</territory>
-			<territory type="830">Kanaalinsle</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Veräinigti Arabischi Emiräät</territory>
-			<territory type="AF">Afganischtan</territory>
-			<territory type="AG">Antigua und Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albaanie</territory>
-			<territory type="AM">Armeenie</territory>
-			<territory type="AN">Niderländischi Antille</territory>
-			<territory type="AO">Angoola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentiinie</territory>
-			<territory type="AS">Amerikaanisch-Samoa</territory>
-			<territory type="AT">Ööschtriich</territory>
-			<territory type="AU">Auschtraalie</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Aaland-Insle</territory>
-			<territory type="AZ">Aserbäidschan</territory>
-			<territory type="BA">Bosnie und Herzegowina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesch</territory>
-			<territory type="BE">Belgie</territory>
-			<territory type="BF">Burkina Faaso</territory>
-			<territory type="BG">Bulgaarie</territory>
-			<territory type="BH">Bachräin</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">St. Barthelemi</territory>
-			<territory type="BM">Bermuuda</territory>
-			<territory type="BN">Brunäi Tarussalam</territory>
-			<territory type="BO">Boliivie</territory>
-			<territory type="BR">Brasilie</territory>
-			<territory type="BS">Bahaamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet-Insle</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Wiissrussland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos-Insle</territory>
-			<territory type="CD">Temokraatischi Republik Kongo</territory>
-			<territory type="CF">Zentraalafrikaanischi Republik</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Schwiiz</territory>
-			<territory type="CI">Elfebäiküschte</territory>
-			<territory type="CK">Cook-Insle</territory>
-			<territory type="CL">Tschile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Chiina</territory>
-			<territory type="CO">Kolumbie</territory>
-			<territory type="CR">Coschta Rica</territory>
-			<territory type="CS">Särbie und Monteneegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Wienachts-Insle</territory>
-			<territory type="CY">Tsüpere</territory>
-			<territory type="CZ">Tschechischi Republik</territory>
-			<territory type="DE">Tüütschland</territory>
-			<territory type="DJ">Tschibuuti</territory>
-			<territory type="DK">Tänemark</territory>
-			<territory type="DM">Tominica</territory>
-			<territory type="DO">Tominikaanischi Republik</territory>
-			<territory type="DZ">Algeerie</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Eestland</territory>
-			<territory type="EG">Ägüpte</territory>
-			<territory type="EH">Weschtsahara</territory>
-			<territory type="ER">Äritreea</territory>
-			<territory type="ES">Schpanie</territory>
-			<territory type="ET">Äzioopie</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fitschi</territory>
-			<territory type="FK">Falkland-Insle</territory>
-			<territory type="FM">Mikroneesie</territory>
-			<territory type="FO">Färöer</territory>
-			<territory type="FR">Frankriich</territory>
-			<territory type="GA">Gabun</territory>
-			<territory type="GB">Veräinigts Chönigriich</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Geoorgie</territory>
-			<territory type="GF">Französisch-Guäjaana</territory>
-			<territory type="GG">Gäärnsi</territory>
-			<territory type="GH">Gaana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Gröönland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Gineea</territory>
-			<territory type="GP">Guadälup</territory>
-			<territory type="GQ">Äquatoriaalgineea</territory>
-			<territory type="GR">Griecheland</territory>
-			<territory type="GS">Süüdgeorgie und d’süüdlichi Sändwitsch-Insle</territory>
-			<territory type="GT">Guatemaala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gineea-Bissau</territory>
-			<territory type="GY">Guäjaana</territory>
-			<territory type="HK">Sonderverwaltigszone Hongkong</territory>
-			<territory type="HM">Höörd- und MäcDonald-Insle</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroaazie</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indoneesie</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Insle vo Män</territory>
-			<territory type="IN">Indie</territory>
-			<territory type="IO">Britischs Territoorium im Indische Oozean</territory>
-			<territory type="IQ">Iraak</territory>
-			<territory type="IR">Iraan</territory>
-			<territory type="IS">Iisland</territory>
-			<territory type="IT">Itaalie</territory>
-			<territory type="JE">Dschörsi</territory>
-			<territory type="JM">Dschamäika</territory>
-			<territory type="JO">Jordaanie</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Keenia</territory>
-			<territory type="KG">Kirgiisischtan</territory>
-			<territory type="KH">Kambodscha</territory>
-			<territory type="KI">Kiribaati</territory>
-			<territory type="KM">Komoore</territory>
-			<territory type="KN">St. Kitts und Niuwis</territory>
-			<territory type="KP">Demokraatischi Volksrepublik Koreea</territory>
-			<territory type="KR">Republik Koreea</territory>
-			<territory type="KW">Kuwäit</territory>
-			<territory type="KY">Käimän-Insle</territory>
-			<territory type="KZ">Kasachschtan</territory>
-			<territory type="LA">Laaos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Sankta Lutschiia</territory>
-			<territory type="LI">Liächteschtäi</territory>
-			<territory type="LK">Schri Lanka</territory>
-			<territory type="LR">Libeeria</territory>
-			<territory type="LS">Lesooto</territory>
-			<territory type="LT">Littaue</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Lüübie</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Republik Moldau</territory>
-			<territory type="ME">Monteneegro</territory>
-			<territory type="MF">St. Martin</territory>
-			<territory type="MG">Madagaschkar</territory>
-			<territory type="MH">Marshallinsle</territory>
-			<territory type="MK">Mazedoonie</territory>
-			<territory type="ML">Maali</territory>
-			<territory type="MM">Müanmar</territory>
-			<territory type="MN">Mongolei</territory>
-			<territory type="MO">Sonderverwaltigszone Macao</territory>
-			<territory type="MP">Nördlichi Mariaane</territory>
-			<territory type="MQ">Martinigg</territory>
-			<territory type="MR">Mauretaanie</territory>
-			<territory type="MS">Moosörrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauriizius</territory>
-			<territory type="MV">Malediiwe</territory>
-			<territory type="MW">Malaawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malaisia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namiibia</territory>
-			<territory type="NC">Nöikaledoonie</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk-Insle</territory>
-			<territory type="NG">Nigeeria</territory>
-			<territory type="NI">Nicaraagua</territory>
-			<territory type="NL">Niderland</territory>
-			<territory type="NO">Norweege</territory>
-			<territory type="NP">Neepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nöiseeland</territory>
-			<territory type="OM">Omaan</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Französisch-Polineesie</territory>
-			<territory type="PG">Papua-Neuguinea</territory>
-			<territory type="PH">Philippiine</territory>
-			<territory type="PK">Pakischtan</territory>
-			<territory type="PL">Poole</territory>
-			<territory type="PM">St. Pierr und Miggelo</territory>
-			<territory type="PN">Pitggäärn</territory>
-			<territory type="PR">Puerto Riggo</territory>
-			<territory type="PS">Paläschtinänsischi Gebiet</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguai</territory>
-			<territory type="QA">Ggatar</territory>
-			<territory type="QO">Ãœssers Ozeaanie</territory>
-			<territory type="QU">Europääischi Unioon</territory>
-			<territory type="RE">Reünioon</territory>
-			<territory type="RO">Rumäänie</territory>
-			<territory type="RS">Särbie</territory>
-			<territory type="RU">Russischi Föderazioon</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Araabie</territory>
-			<territory type="SB">Salomoone</territory>
-			<territory type="SC">Seischälle</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Schweede</territory>
-			<territory type="SG">Singapuur</territory>
-			<territory type="SH">St. Helena</territory>
-			<territory type="SI">Sloweenie</territory>
-			<territory type="SJ">Svalbard und Jaan Määie</territory>
-			<territory type="SK">Slowakäi</territory>
-			<territory type="SL">Sierra Leoone</territory>
-			<territory type="SM">San Mariino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somaalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome und Prinssipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Süürie</territory>
-			<territory type="SZ">Swasiland</territory>
-			<territory type="TC">Törks- und Gaiggos-Insle</territory>
-			<territory type="TD">Tschad</territory>
-			<territory type="TF">Französischi Süüd- und Antarktisgebiet</territory>
-			<territory type="TG">Toogo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadschikischtan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Oschttimor</territory>
-			<territory type="TM">Turkmeenischtan</territory>
-			<territory type="TN">Tuneesie</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Türggei</territory>
-			<territory type="TT">Trinidad und Tobaago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansaniia</territory>
-			<territory type="UA">Ukraiine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerikanisch-Ozeaanie</territory>
-			<territory type="US">Veräinigti Schtaate</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uschbeekischtan</territory>
-			<territory type="VA">Vatikanstadt</territory>
-			<territory type="VC">Sankt Wässä und d’Grönadiine</territory>
-			<territory type="VE">Venezueela</territory>
-			<territory type="VG">Britischi Jungfere-Insle</territory>
-			<territory type="VI">Amerikaanischi Jungfere-Insle</territory>
-			<territory type="VN">Wietnam</territory>
-			<territory type="VU">Wanuatu</territory>
-			<territory type="WF">Wallis und Futuuna</territory>
-			<territory type="WS">Samooa</territory>
-			<territory type="YE">Jeeme</territory>
-			<territory type="YT">Majott</territory>
-			<territory type="ZA">Süüdafrika</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabwe</territory>
-			<territory type="ZZ">Unbekannti oder ungültigi Regioon</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Alti tüütschi Rächtschriibig</variant>
-			<variant type="1994">Schtandardisierti Resianischi Rächtschriibig</variant>
-			<variant type="1996">Nööi tüütschi Rächtschriibig</variant>
-			<variant type="1606NICT">Schpaats Mittelfranzösisch</variant>
-			<variant type="AREVELA">Oschtarmeenisch</variant>
-			<variant type="AREVMDA">Weschtarmeenisch</variant>
-			<variant type="BAKU1926">Äinheitlichs Türggischs Alfabeet</variant>
-			<variant type="BISKE">Bela-Tialäkt</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">Foneetisch (IPA)</variant>
-			<variant type="FONUPA">Foneetisch (UPA)</variant>
-			<variant type="LIPAW">Lipowaz-Mundart</variant>
-			<variant type="MONOTON">Monotonisch</variant>
-			<variant type="NEDIS">Natisone-Mundart</variant>
-			<variant type="NJIVA">Njiva-Mundart</variant>
-			<variant type="OSOJS">Osojane-Mundart</variant>
-			<variant type="POLYTON">Politonisch</variant>
-			<variant type="POSIX">Posix</variant>
-			<variant type="REVISED">Nööi Rächtschriibig</variant>
-			<variant type="ROZAJ">Resianisch</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Schottischs Schtandardänglisch</variant>
-			<variant type="SCOUSE">Scouse-Mundart</variant>
-			<variant type="SOLBA">Solbica-Mundart</variant>
-			<variant type="TARASK">Taraskievica-Rächtschriibig</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kaländer</key>
-			<key type="collation">Sortiirig</key>
-			<key type="currency">Wäährig</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Tradizionells Chineesisch - Big5</type>
-			<type type="buddhist" key="calendar">Buddhischtisch Kaländer</type>
-			<type type="chinese" key="calendar">Chineesisch Kaländer</type>
-			<type type="direct" key="collation">Diräkti Sortiir-Regle</type>
-			<type type="gb2312han" key="collation">Veräifachts Chineesisch - GB2312</type>
-			<type type="gregorian" key="calendar">Gregoriaanisch Kaländer</type>
-			<type type="hebrew" key="calendar">Hebrääisch Kaländer</type>
-			<type type="indian" key="calendar">Indisch Nationaalkaländer</type>
-			<type type="islamic" key="calendar">Islaamisch Kaländer</type>
-			<type type="islamic-civil" key="calendar">Bürgerlich islaamisch Kaländer</type>
-			<type type="japanese" key="calendar">Japaanisch Kaländer</type>
-			<type type="phonebook" key="collation">Telifonbuech-Sortiirregle</type>
-			<type type="pinyin" key="collation">Pinyin-Sortiirregle</type>
-			<type type="roc" key="calendar">Kaländer vor Republik Chiina</type>
-			<type type="stroke" key="collation">Strichfolg</type>
-			<type type="traditional" key="collation">Tradizionelli Sortiir-Regle</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrisch</measurementSystemName>
-			<measurementSystemName type="US">angloamerikaanisch</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Schpraach: {0}</codePattern>
-			<codePattern type="script">Schrift: {0}</codePattern>
-			<codePattern type="territory">Regioon: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="currency">titlecase-words</inText>
-		<inText type="keys">titlecase-words</inText>
-		<inText type="languages">titlecase-words</inText>
-		<inText type="scripts">titlecase-words</inText>
-		<inText type="territories">titlecase-words</inText>
-		<inText type="types">titlecase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a ä b-o ö p-u ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å � æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ø � œ ß ú ù ŭ û ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>vorm.</am>
-				<pm>nam.</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="chinese">
-				<am>vorm.</am>
-				<pm>nam.</pm>
-			</calendar>
-			<calendar type="coptic">
-				<am>vorm.</am>
-				<pm>nam.</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mär</month>
-							<month type="4">Apr</month>
-							<month type="5">Mai</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dez</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januar</month>
-							<month type="2">Februar</month>
-							<month type="3">März</month>
-							<month type="4">April</month>
-							<month type="5">Mai</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Auguscht</month>
-							<month type="9">Septämber</month>
-							<month type="10">Oktoober</month>
-							<month type="11">Novämber</month>
-							<month type="12">Dezämber</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="3">Mär</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dez</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Su.</day>
-							<day type="mon">Mä.</day>
-							<day type="tue">Zi.</day>
-							<day type="wed">Mi.</day>
-							<day type="thu">Du.</day>
-							<day type="fri">Fr.</day>
-							<day type="sat">Sa.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sunntig</day>
-							<day type="mon">Määntig</day>
-							<day type="tue">Ziischtig</day>
-							<day type="wed">Mittwuch</day>
-							<day type="thu">Dunschtig</day>
-							<day type="fri">Friitig</day>
-							<day type="sat">Samschtig</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">D</day>
-							<day type="wed">M</day>
-							<day type="thu">D</day>
-							<day type="fri">F</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. Quartal</quarter>
-							<quarter type="2">2. Quartal</quarter>
-							<quarter type="3">3. Quartal</quarter>
-							<quarter type="4">4. Quartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>vorm.</am>
-				<pm>nam.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">v. Chr.</era>
-						<era type="1">n. Chr.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">v. Chr.</era>
-						<era type="1">n. Chr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d.</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMd">d.MM.</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMdd">dd.MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.-d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.-M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM. - dd.MM.</greatestDifference>
-							<greatestDifference id="M">dd.MM. - dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM. - E, dd.MM.</greatestDifference>
-							<greatestDifference id="M">E, dd.MM. - E, dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y - E, d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy – MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Epoche</displayName>
-					</field>
-					<field type="year">
-						<displayName>Jaar</displayName>
-					</field>
-					<field type="month">
-						<displayName>Monet</displayName>
-					</field>
-					<field type="week">
-						<displayName>Wuche</displayName>
-					</field>
-					<field type="day">
-						<displayName>Tag</displayName>
-						<relative type="-3">vor drü Tääg</relative>
-						<relative type="-2">vorgeschter</relative>
-						<relative type="-1">geschter</relative>
-						<relative type="0">hüt</relative>
-						<relative type="1">moorn</relative>
-						<relative type="2">übermoorn</relative>
-						<relative type="3">i drü Tääg</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Wuchetag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Tageshälfti</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Schtund</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunde</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<am>vorm.</am>
-				<pm>nam.</pm>
-			</calendar>
-			<calendar type="islamic">
-				<am>vorm.</am>
-				<pm>nam.</pm>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unbekannt</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erivan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Süüdpol</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Woschtok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brüssel</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Wagadugu</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudas</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Züri</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Oschterinsle</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kap Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Wienachts-Insle</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikosia</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Dschibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopehage</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Algier</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanare</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidschi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Färöer</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tiflis</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akkra</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athen</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Süüd-Georgie</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rom</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bischkek</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komore</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pjöngjang</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kaimaninsle</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktobe</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Wilna</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Kischinau</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan-Baator</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maledive</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexiko-Schtadt</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Niger</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muschkat</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warschau</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azore</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarescht</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskau</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Nowosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Wladiwostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtschatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riad</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Khartum</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadischu</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskus</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Duschanbe</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port-of-Spain</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taipeh</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Daressalam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kiew</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporischja</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taschkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre-Ziit</standard>
-					<daylight>Acre-Summerziit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afghanischtan-Ziit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Zentralafrikanischi Ziit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Oschtafrikanischi Ziit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Süüdafrikanischi Ziit</generic>
-					<standard>Süüdafrikanischi Schtandardziit</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Weschtafrikanischi Ziit</standard>
-					<daylight>Weschtafrikanischi Summerziit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk-Ziit</standard>
-					<daylight>Aktyubinsk-Summerziit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska-Ziit</generic>
-					<standard>Alaska-Schtandardziit</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii-Ziit</generic>
-					<standard>Alaska-Hawaii-Schtandardziit</standard>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almaty-Ziit</standard>
-					<daylight>Almaty-Summerziit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<daylight>Amazonas-Summerziit</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Mitteleuropäischi Ziit</standard>
-					<daylight>Mitteleuropäischi Summerziit</daylight>
-				</long>
-				<short>
-					<standard>MEZ</standard>
-					<daylight>MESZ</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Oschteuropäischi Ziit</standard>
-					<daylight>Oschteuropäischi Summerziit</daylight>
-				</long>
-				<short>
-					<standard>OEZ</standard>
-					<daylight>OESZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Weschteuropäischi Ziit</standard>
-					<daylight>Weschteuropäischi Summerziit</daylight>
-				</long>
-				<short>
-					<standard>WEZ</standard>
-					<daylight>WESZ</daylight>
-				</short>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Moskauer Ziit</standard>
-					<daylight>Moskauer Summerziit</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>’</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorranischi Peseete</displayName>
-				<displayName count="other">Andorranischi Peseete</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE Dirham</displayName>
-				<displayName count="other">UAE Dirhäm</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghani (1927-2002)</displayName>
-				<displayName count="other">Afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani</displayName>
-				<displayName count="other">Afghani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek</displayName>
-				<displayName count="other">Lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram</displayName>
-				<displayName count="other">Dräm</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Niderländischi-Antille-Gulde</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolanische Kwanza (1977-1990)</displayName>
-				<displayName count="other">Angolanischi Kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Nöie Kwanza</displayName>
-				<displayName count="other">Nöii Kwanza</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza Reajustado</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentinische Auschtral</displayName>
-				<displayName count="other">Argentinischi Auschtral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinische Peso (1983-1985)</displayName>
-				<displayName count="other">Argentinischi Peso (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinische Peso</displayName>
-				<displayName count="other">Argentinischi Peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Öschtriichische Schilling</displayName>
-				<displayName count="other">Öschtriichischi Schilling</displayName>
-				<symbol>öS</symbol>
-			</currency>
-			<currency type="AUD">
-				<displayName>Auschtralische Dollar</displayName>
-				<displayName count="other">Auschtralischi Dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba Florin</displayName>
-				<displayName count="other">Aruba Florin</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Aserbeidschanische Manat (1993-2006)</displayName>
-				<displayName count="other">Aserbaidschanischi Manat (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Aserbeidschanische Manat</displayName>
-				<displayName count="other">Aserbeidschanischi Manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnie-und-Herzegowina-Dinar</displayName>
-				<displayName count="other">Bosnie-und-Herzegowina-Dinär</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Konvertierbari Mark vo Bosnie und Herzegowina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbados-Dollar</displayName>
-				<displayName count="other">Barbados-Dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka</displayName>
-				<displayName count="other">Taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgische Franc (konvertibel)</displayName>
-				<displayName count="other">Belgischi Franc (konvertibel)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgische Franc</displayName>
-				<displayName count="other">Belgischi Franc</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgische Finanz-Franc</displayName>
-				<displayName count="other">Belgischi Finanz-Franc</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lew (1962-1999)</displayName>
-				<displayName count="other">Lewa (1962-1999)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgarische Lew</displayName>
-				<displayName count="other">Bulgarischi Lew</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahrain-Dinar</displayName>
-				<displayName count="other">Bahrain-Dinar</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi-Franc</displayName>
-				<displayName count="other">Burundi-Franc</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda-Dollar</displayName>
-				<displayName count="other">Bermuda-Dollar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei-Dollar</displayName>
-				<displayName count="other">Brunei-Dollar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="other">Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivianische Peso</displayName>
-				<displayName count="other">Bolivianischi Peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivianische Mvdol</displayName>
-				<displayName count="other">Bolivianischi Mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brasilianische Cruzeiro Novo (1967-1986)</displayName>
-				<displayName count="other">Brasilianischi Cruzeiro Novo (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brasilianische Cruzado</displayName>
-				<displayName count="other">Brasilianischi Cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brasilianische Cruzeiro (1990-1993)</displayName>
-				<displayName count="other">Brasilianischi Cruzeiro (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brasilianische Real</displayName>
-				<displayName count="other">Brasilianischi Real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brasilianische Cruzado Novo</displayName>
-				<displayName count="other">Brasilianischi Cruzado Novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brasilianische Cruzeiro</displayName>
-				<displayName count="other">Brasilianischi Cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahama-Dollar</displayName>
-				<displayName count="other">Bahama-Dollar</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutanische Ngultrum</displayName>
-				<displayName count="other">Bhutanischi Ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Birmanische Kyat</displayName>
-				<displayName count="other">Birmanischi Kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswanische Pula</displayName>
-				<displayName count="other">Botswanischi Pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Belarus-Rubel (alt)</displayName>
-				<displayName count="other">Belarus-Rubel (alt)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Belarus Rubel (nöi)</displayName>
-				<displayName count="other">Belarus-Rubel (nöi)</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize-Dollar</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadische Dollar</displayName>
-				<displayName count="other">Kanadischi Dollar</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Franc congolais</displayName>
-				<displayName count="other">Francs congolais</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR-Euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Schwiizer Franke</displayName>
-				<displayName count="other">Schwiizer Franke</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR-Franke</displayName>
-				<displayName count="other">WIR-Franke</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Tschileenische Unidad de Fomento</displayName>
-				<displayName count="other">Tschileenischi Unidades de Fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Tschileenische Peso</displayName>
-				<displayName count="other">Tschileenischi Pesos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Renminbi Yuan</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbianische Peso</displayName>
-				<displayName count="other">Kolumbianischi Pesos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-				<displayName count="other">Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costa Rica Colon</displayName>
-				<displayName count="other">Costa Rica Colon</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Alte Serbische Dinar</displayName>
-				<displayName count="other">Alti Serbischi Dinar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Tschechoslowakischi Chroone</displayName>
-				<displayName count="other">Tschechoslowakischi Chroone</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubanische Peso</displayName>
-				<displayName count="other">Kubanischi Pesos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kap Verde Escudo</displayName>
-				<displayName count="other">Kap Verde Escudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Zypere-Pfund</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Tschechischi Chroone</displayName>
-				<displayName count="other">Tschechischi Chroone</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>DDR-Mark</displayName>
-				<displayName count="other">DDR-Mark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Tüütschi Mark</displayName>
-				<displayName count="other">Tüütschi Mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Dschibuti-Franc</displayName>
-				<displayName count="other">Dschibuti-Franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Tänischi Chroone</displayName>
-				<displayName count="other">Tänischi Chroone</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Tominikanische Peso</displayName>
-				<displayName count="other">Tominikanischi Pesos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algeerischi Dinar</displayName>
-				<displayName count="other">Algeerischi Dinar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadorianische Sucre</displayName>
-				<displayName count="other">Ecuadorianischi Sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Verrächnigsäiheit für EC</displayName>
-				<displayName count="other">Verrächnigsäiheit für EC</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Eestnischi Chroone</displayName>
-				<displayName count="other">Eestnischi Chroone</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Ägüptischs Pfund</displayName>
-				<displayName count="other">Ägüptischi Pfund</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritreische Nakfa</displayName>
-				<displayName count="other">Eritreischi Nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Schpanischi Peseeta (A-Kontene)</displayName>
-				<displayName count="other">Schpanischi Peseete (A-Kontene)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Schpanischi Peseeta (konvertibel)</displayName>
-				<displayName count="other">Schpanischi Peseete (konvertibel)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Schpanischi Peseeta</displayName>
-				<displayName count="other">Schpanischi Peseete</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Äthiopische Birr</displayName>
-				<displayName count="other">Äthiopischi Birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-				<displayName count="other">Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finnischi Mark</displayName>
-				<displayName count="other">Finnischi Mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidschi Dollar</displayName>
-				<displayName count="other">Fidschi Dollar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland-Pfund</displayName>
-				<displayName count="other">Falkland-Pfund</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Französische Franc</displayName>
-				<displayName count="other">Französischi Franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Pfund Schtörling</displayName>
-				<displayName count="other">Pfund Schtörling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgische Kupon Larit</displayName>
-				<displayName count="other">Georgischi Kupon Larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgische Lari</displayName>
-				<displayName count="other">Georgischi Lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanaische Cedi (GHC)</displayName>
-				<displayName count="other">Ghanaischi Cedi (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanaische Cedi (GHS)</displayName>
-				<displayName count="other">Ghanaischi Cedi (GHS)</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltar-Pfund</displayName>
-				<displayName count="other">Gibraltar-Pfund</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambische Dalasi</displayName>
-				<displayName count="other">Gambischi Dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinea-Franc</displayName>
-				<displayName count="other">Guinea-Franc</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guineische Syli</displayName>
-				<displayName count="other">Guineischi Syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Äquatorialguinea-Ekwele</displayName>
-				<displayName count="other">Äquatorialguinea-Ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Griechische Trachme</displayName>
-				<displayName count="other">Griechischi Trachme</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal</displayName>
-				<displayName count="other">Quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugiisische Guinea Escudo</displayName>
-				<displayName count="other">Portugiisischi Guinea Escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau-Peso</displayName>
-				<displayName count="other">Guinea-Bissau-Pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyana-Dollar</displayName>
-				<displayName count="other">Guyana0Dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong-Dollar</displayName>
-				<displayName count="other">Hongkong-Dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira</displayName>
-				<displayName count="other">Lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroazische Dinar</displayName>
-				<displayName count="other">Kroazischi Dinar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna</displayName>
-				<displayName count="other">Kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde</displayName>
-				<displayName count="other">Gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forint</displayName>
-				<displayName count="other">Forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupie</displayName>
-				<displayName count="other">Rupie</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Iirischs Pfund</displayName>
-				<displayName count="other">Iirischi Pfund</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israelischs Pfund</displayName>
-				<displayName count="other">Israelischi Pfund</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Schekel</displayName>
-				<displayName count="other">Schekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indischi Rupie</displayName>
-				<displayName count="other">Indischi Rupie</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irak-Dinar</displayName>
-				<displayName count="other">Irak-Dinar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial</displayName>
-				<displayName count="other">Rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Iisländischi Chroone</displayName>
-				<displayName count="other">Iisländischi Chroone</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italiänischi Lira</displayName>
-				<displayName count="other">Italienischi Lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaika-Dollar</displayName>
-				<displayName count="other">Jamaika-Dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordaanische Dinar</displayName>
-				<displayName count="other">Jordaanischi Dinar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen</displayName>
-				<displayName count="other">Yen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenia-Schilling</displayName>
-				<displayName count="other">Kenia-Schilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som</displayName>
-				<displayName count="other">Som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel</displayName>
-				<displayName count="other">Riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komore-Franc</displayName>
-				<displayName count="other">Komore-Franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Nordkoreanische Won</displayName>
-				<displayName count="other">Nordkoreanischi Won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Süüdkoreanische Won</displayName>
-				<displayName count="other">Süüdkoreanischi Won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuwait-Dinar</displayName>
-				<displayName count="other">Kuwait-Dinar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kaiman-Dollar</displayName>
-				<displayName count="other">Kaiman-Dollar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge</displayName>
-				<displayName count="other">Tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip</displayName>
-				<displayName count="other">Kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libaneesischs Pfund</displayName>
-				<displayName count="other">Libaneesischi Pfund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri-Lanka-Rupie</displayName>
-				<displayName count="other">Sri-Lanka-Rupie</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberiaanische Dollar</displayName>
-				<displayName count="other">Liberiaanischi Dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti</displayName>
-				<displayName count="other">Loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litauische Litas</displayName>
-				<displayName count="other">Litauischi Litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litauische Talonas</displayName>
-				<displayName count="other">Litauischi Talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxemburgische Franc (konvertibel)</displayName>
-				<displayName count="other">Luxemburgischi Franc (konvertibel)</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburgische Franc</displayName>
-				<displayName count="other">Luxemburgischi Franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxemburgischer Finanz-Franc</displayName>
-				<displayName count="other">Luxemburgischi Finanz-Franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lettische Lats</displayName>
-				<displayName count="other">Lettischi Lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lettische Rubel</displayName>
-				<displayName count="other">Lettischi Rubel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Lüübische Dinar</displayName>
-				<displayName count="other">Lüübischi Dinar</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkanische Dirham</displayName>
-				<displayName count="other">Marokkanischi Dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkanischer Franc</displayName>
-				<displayName count="other">Marokkanische Franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldau-Löi</displayName>
-				<displayName count="other">Moldau-Löi</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaschkar-Ariary</displayName>
-				<displayName count="other">Madagaschkar-Ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaschkar-Franc</displayName>
-				<displayName count="other">Madagaschkar-Franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Denar</displayName>
-				<displayName count="other">Denar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malische Franc</displayName>
-				<displayName count="other">Malischi Franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat</displayName>
-				<displayName count="other">Kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik</displayName>
-				<displayName count="other">Tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca</displayName>
-				<displayName count="other">Pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya</displayName>
-				<displayName count="other">Ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Malteesischi Lira</displayName>
-				<displayName count="other">Malteesischi Lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Malteesischs Pfund</displayName>
-				<displayName count="other">Malteesischi Pfund</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Maurizius-Rupie</displayName>
-				<displayName count="other">Maurizius-Rupie</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rufiyaa</displayName>
-				<displayName count="other">Rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawi-Kwacha</displayName>
-				<displayName count="other">Malawi-Kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexikanische Peso</displayName>
-				<displayName count="other">Mexikanischi Pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexikanische Silber-Peso (1861-1992)</displayName>
-				<displayName count="other">Mexikanischi Silber-Pesos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexikanische Unidad de Inversion (UDI)</displayName>
-				<displayName count="other">Mexikanischi Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysische Ringgit</displayName>
-				<displayName count="other">Malaysischi Ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mosambikanische Escudo</displayName>
-				<displayName count="other">Mozambikanischi Escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Alte Metical</displayName>
-				<displayName count="other">Alti Metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Metical</displayName>
-				<displayName count="other">Metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibia-Dollar</displayName>
-				<displayName count="other">Namibia-Dollar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira</displayName>
-				<displayName count="other">Naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Cordoba</displayName>
-				<displayName count="other">Cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Gold-Cordoba</displayName>
-				<displayName count="other">Gold-Cordoba</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Holländische Gulde</displayName>
-				<displayName count="other">Holländischi Gulde</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norweegischi Chroone</displayName>
-				<displayName count="other">Norweegischi Chroone</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepaleesischi Rupie</displayName>
-				<displayName count="other">Nepalesischi Rupie</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Neuseeland-Dollar</displayName>
-				<displayName count="other">Neuseeland-Dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial Omani</displayName>
-				<displayName count="other">Rial Omani</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa</displayName>
-				<displayName count="other">Balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruanische Inti</displayName>
-				<displayName count="other">Peruanischi Inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Nöie Sol</displayName>
-				<displayName count="other">Nöii Sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol</displayName>
-				<displayName count="other">Sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina</displayName>
-				<displayName count="other">Kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Philippiinische Peso</displayName>
-				<displayName count="other">Philippiinischi Peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakischtanischi Rupie</displayName>
-				<displayName count="other">Pakischtanischi Rupie</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty</displayName>
-				<displayName count="other">Zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloty (1950-1995)</displayName>
-				<displayName count="other">Zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugiisische Escudo</displayName>
-				<displayName count="other">Portugiisischi Escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani</displayName>
-				<displayName count="other">Guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Katar-Riyal</displayName>
-				<displayName count="other">Katar-Riyal</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rhodesische Dollar</displayName>
-				<displayName count="other">Rhodesischi Dollar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Löi</displayName>
-				<displayName count="other">Löi</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumäänische Löi</displayName>
-				<displayName count="other">Rumäänischi Löi</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbische Dinar</displayName>
-				<displayName count="other">Serbischi Dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russische Rubel (nöi)</displayName>
-				<displayName count="other">Russischi Rubel (nöi)</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Russische Rubel (alt)</displayName>
-				<displayName count="other">Russischi Rubel (alt)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruanda-Franc</displayName>
-				<displayName count="other">Ruanda-Franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudi-Riyal</displayName>
-				<displayName count="other">Saudi-Riyal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomone-Dollar</displayName>
-				<displayName count="other">Salomone-Dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seyschelle-Rupie</displayName>
-				<displayName count="other">Seyschelle-Rupien</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Sudaneesische Dinar</displayName>
-				<displayName count="other">Sudaneesischi Dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudaneesischs Pfund</displayName>
-				<displayName count="other">Sudaneesischi Pfund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudaneesischs Pfund (alt)</displayName>
-				<displayName count="other">Sudaneesischi Pfund (alt)</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Schweedischi Chroone</displayName>
-				<displayName count="other">Schwedischi Chroone</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapur-Dollar</displayName>
-				<displayName count="other">Singapur-Dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>St.-Helena-Pfund</displayName>
-				<displayName count="other">St.-Helena-Pfund</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar</displayName>
-				<displayName count="other">Tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slowakischi Chroone</displayName>
-				<displayName count="other">Slowakischi Chroone</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone</displayName>
-				<displayName count="other">Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalia-Schilling</displayName>
-				<displayName count="other">Somalia-Schilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamische Dollar</displayName>
-				<displayName count="other">Surinamischi Dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamische Gulde</displayName>
-				<displayName count="other">Surinamischi Gulde</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra</displayName>
-				<displayName count="other">Dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sowjetische Rubel</displayName>
-				<displayName count="other">Sowjetischi Rubel</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El-Salvador-Colon</displayName>
-				<displayName count="other">El-Salvador-Colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Süürischs Pfund</displayName>
-				<displayName count="other">Süürischi Pfund</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni</displayName>
-				<displayName count="other">Lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht</displayName>
-				<displayName count="other">Baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadschikischtan-Rubel</displayName>
-				<displayName count="other">Tadschikischtan-Rubel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadschikischtan-Somoni</displayName>
-				<displayName count="other">Tadschikischtan-Somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmeenischtan-Manat</displayName>
-				<displayName count="other">Turkmeenischtan-Manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tuneesische Dinar</displayName>
-				<displayName count="other">Tuneesischi Dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga</displayName>
-				<displayName count="other">Paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timor-Escudo</displayName>
-				<displayName count="other">Timor-Escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Türkischi Liire</displayName>
-				<displayName count="one">Türkischi Liira</displayName>
-				<displayName count="other">Türkischi Liire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Nöii Türkischi Liire</displayName>
-				<displayName count="one">Nöii Türkischi Liira</displayName>
-				<displayName count="other">Nöii Türkischi Liire</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad-und-Tobago-Dollar</displayName>
-				<displayName count="other">Trinidad-und-Tobago-Dollar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Nöii Taiwan-Dollar</displayName>
-				<displayName count="one">Nöie Taiwan-Dollar</displayName>
-				<displayName count="other">Nöii Taiwan-Dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tansania-Schilling</displayName>
-				<displayName count="other">Tansania-Schilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia</displayName>
-				<displayName count="other">Hryvnia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukraiinische Karbovanetz</displayName>
-				<displayName count="other">Ukraiinischi Karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Uganda-Schilling (1966-1987)</displayName>
-				<displayName count="other">Uganda-Schilling (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Uganda-Schilling</displayName>
-				<displayName count="other">Uganda-Schilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US-Dollar</displayName>
-				<displayName count="other">US-Dollar</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>US Dollar (Nöchschte Taag)</displayName>
-				<displayName count="other">US-Dollar (Nöchschte Taag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>US Dollar (Gliiche Taag)</displayName>
-				<displayName count="other">US-Dollar (Gliiche Taag)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguayische Nöie Peso (1975-1993)</displayName>
-				<displayName count="other">Uruguayischi Nöii Pesos (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguayische Peso</displayName>
-				<displayName count="other">Uruguayischi Pesos</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Usbeekischtan-Sum</displayName>
-				<displayName count="other">Usbeekischtan-Sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar</displayName>
-				<displayName count="other">Bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar Fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu</displayName>
-				<displayName count="other">Vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala</displayName>
-				<displayName count="other">Tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA-Franc (Äquatoriaal)</displayName>
-				<displayName count="other">CFA-Franc (Äquatoriaal)</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Silber</displayName>
-				<displayName count="other">Silber</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Gold</displayName>
-				<displayName count="other">Gold</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Europääischi Rächnigseinheit</displayName>
-				<displayName count="other">Europääischi Rächnigseinheite</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Europääischi Währigseinheit (XBB)</displayName>
-				<displayName count="other">Europääischi Währigseinheite (XBB)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Europääischi Rächnigseinheit (XBC)</displayName>
-				<displayName count="other">Europääischi Rächnigseinheite (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Europääischi Rächnigseinheit (XBD)</displayName>
-				<displayName count="other">Europääischi Rächnigseinheite (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Oschtkaribische Dollar</displayName>
-				<displayName count="other">Oschtkaribischi Dollar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Sunderziäigsrächt</displayName>
-				<displayName count="other">Sunderziäigsrächt</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Europääischi Währigseinheit (XEU)</displayName>
-				<displayName count="other">Europääischi Währigseinheite (XEU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Französische Gold-Franc</displayName>
-				<displayName count="other">Französischi Gold-Franc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Französische UIC-Franc</displayName>
-				<displayName count="other">Französischi UIC-Franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA-Franc (Wescht)</displayName>
-				<displayName count="other">CFA-Franc (Wescht)</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladium</displayName>
-				<displayName count="other">Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP-Franc</displayName>
-				<displayName count="other">CFP-Franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platin</displayName>
-				<displayName count="other">Platin</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-Funds</displayName>
-				<displayName count="other">RINET-Funds</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Teschtwährig</displayName>
-				<displayName count="other">Teschtwährig</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Unbekannti Währig</displayName>
-				<displayName count="one">Unbekannti Währig</displayName>
-				<displayName count="other">Unbekannti Währig</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jeme-Dinar</displayName>
-				<displayName count="other">Jeme-Dinar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jeme-Rial</displayName>
-				<displayName count="other">Jeme-Rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoslawische Dinar (1966-1990)</displayName>
-				<displayName count="other">Jugoslawischi Dinar (1966-1990)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Nöii Dinar</displayName>
-				<displayName count="one">Nöie Dinar</displayName>
-				<displayName count="other">Nöii Dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslawische Dinar (konvertibel)</displayName>
-				<displayName count="other">Jugoslawischi Dinar (konvertibel)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand</displayName>
-				<displayName count="other">Rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha</displayName>
-				<displayName count="other">Kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Nöie Zaire</displayName>
-				<displayName count="other">Nöii Zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire</displayName>
-				<displayName count="other">Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Simbabwe-Dollar</displayName>
-				<displayName count="other">Simbabwe-Dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} Taag</unitPattern>
-			<unitPattern count="other">{0} Tääg</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} Schtund</unitPattern>
-			<unitPattern count="other">{0} Schtunde</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} Minuute</unitPattern>
-			<unitPattern count="other">{0} Minuute</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} Monet</unitPattern>
-			<unitPattern count="other">{0} Mönet</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} Sekunde</unitPattern>
-			<unitPattern count="other">{0} Sekunde</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} Wuche</unitPattern>
-			<unitPattern count="other">{0} Wuche</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} Jahr</unitPattern>
-			<unitPattern count="other">{0} Jahr</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>näi:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/gsw_CH.xml b/airtime_mvc/library/Zend/Locale/Data/gsw_CH.xml
deleted file mode 100644
index eee89614e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gsw_CH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gsw"/>
-		<territory type="CH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gu.xml b/airtime_mvc/library/Zend/Locale/Data/gu.xml
deleted file mode 100644
index 48d69a211..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gu.xml
+++ /dev/null
@@ -1,1160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.73 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="gu"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">અફાર</language>
-			<language type="ab">અબખાજિયન</language>
-			<language type="ace">અચીની</language>
-			<language type="ach">અકોલી</language>
-			<language type="ada">અદાંગ�મી</language>
-			<language type="ady">અદિઘે</language>
-			<language type="ae">અવેસ�તન</language>
-			<language type="af">આફ�રિકન�સ</language>
-			<language type="afa">અફ�રો-�શિયાટીક ભાષાઓ</language>
-			<language type="afh">અફ�રિહિલી</language>
-			<language type="ain">�નૂ</language>
-			<language type="ak">અકન</language>
-			<language type="akk">અક�કાદીયાન</language>
-			<language type="ale">અલેઉત</language>
-			<language type="alg">�લ�ગોક�વિયન ભાષા</language>
-			<language type="alt">દક�ષિણ અલ�તાઇ</language>
-			<language type="am">�મ�હારિક</language>
-			<language type="an">અર�ગોની�</language>
-			<language type="ang">જ�ની અંગ�રેજી</language>
-			<language type="anp">અંગીકા</language>
-			<language type="apa">અપાચે ભાષા</language>
-			<language type="ar">અરબી</language>
-			<language type="arc">અર�માઇક</language>
-			<language type="arn">�રોકૈનિયન</language>
-			<language type="arp">અરાપાહો</language>
-			<language type="art">કૃત�રિમ ભાષા</language>
-			<language type="arw">અરાવક</language>
-			<language type="as">આસામી</language>
-			<language type="ast">અસ�ત�રિયન</language>
-			<language type="ath">અથાપાસ�કાન ભાષા</language>
-			<language type="aus">ઓસ�ટ�રેલિયન ભાષા</language>
-			<language type="av">અવેરિક</language>
-			<language type="awa">અવધી</language>
-			<language type="ay">આયમારા</language>
-			<language type="az">અ�રબૈજાની</language>
-			<language type="ba">બષ�ખિર</language>
-			<language type="bad">બાંદા</language>
-			<language type="bai">બમિલેકે ભાષા</language>
-			<language type="bal">બલૂચી</language>
-			<language type="ban">બાલિનીસ</language>
-			<language type="bas">બસા</language>
-			<language type="bat">બાલ�ટિક ભાષા</language>
-			<language type="be">બેલાર�શિયન</language>
-			<language type="bej">બેજા</language>
-			<language type="bem">બેમ�બા</language>
-			<language type="ber">બર�બર</language>
-			<language type="bg">બલ�ગેરિયન</language>
-			<language type="bh">બિહારી</language>
-			<language type="bho">ભોજપ�રી</language>
-			<language type="bi">બિસ�લામા</language>
-			<language type="bik">બિકોલ</language>
-			<language type="bin">બિની</language>
-			<language type="bla">સિક�સિકા</language>
-			<language type="bm">બામ�બારા</language>
-			<language type="bn">બંગાળી</language>
-			<language type="bnt">બન�ટ�</language>
-			<language type="bo">તિબેટી</language>
-			<language type="br">બ�રેટોન</language>
-			<language type="bra">બ�રજ</language>
-			<language type="bs">બોસ�નિયન</language>
-			<language type="btk">બતાક</language>
-			<language type="bua">બ�રિયાત</language>
-			<language type="bug">બગિનીસ</language>
-			<language type="byn">બ�લિન</language>
-			<language type="ca">કતલાન</language>
-			<language type="cad">કડ�ડો</language>
-			<language type="cai">મધ�ય અમેરિકન ઇંડિયન ભાષા</language>
-			<language type="car">કરિબ</language>
-			<language type="cau">કાકેશિયન ભાષા</language>
-			<language type="cch">અત�સમ</language>
-			<language type="ce">ચેચન</language>
-			<language type="ceb">સિબ�આનો</language>
-			<language type="cel">સેલ�ટિક ભાષા</language>
-			<language type="ch">કેમોરો</language>
-			<language type="chb">ચિબ�ચા</language>
-			<language type="chg">છગાતાઇ</language>
-			<language type="chk">ચૂકીસે</language>
-			<language type="chm">મારી</language>
-			<language type="chn">ચિનૂક જાર�ગન</language>
-			<language type="cho">ચોક�તૌ</language>
-			<language type="chp">શિપેવ�યાન</language>
-			<language type="chr">શેરોકી</language>
-			<language type="chy">શેયેન�ન</language>
-			<language type="cmc">ચાર�મિક ભાષા</language>
-			<language type="co">કોર�સિકન</language>
-			<language type="cop">કોપ�ટિક</language>
-			<language type="cpe">અંગ�રેજી આધારિત ક�રેઓલ અથવા પિજિન</language>
-			<language type="cpf">ફ�રેંચ આધારિત ક�રેઓલ અથવા પિજિન</language>
-			<language type="cpp">પાર�ટ�ગી� આધારિત ક�રેઓલ અથવા પિજિન</language>
-			<language type="cr">ક�રી</language>
-			<language type="crh">ક�રિમીન ત�ર�કી</language>
-			<language type="crp">ક�રેઓલ અથવા પિજિન</language>
-			<language type="cs">ચેક</language>
-			<language type="csb">કાશ�બિયન</language>
-			<language type="cu">ચર�ચ સ�લાવિક</language>
-			<language type="cus">ક�શિતિક ભાષા</language>
-			<language type="cv">ચૂવાશ</language>
-			<language type="cy">વેલ�શ</language>
-			<language type="da">ડેનિશ</language>
-			<language type="dak">દાકોતા</language>
-			<language type="dar">દાર�ગવા</language>
-			<language type="day">દાયક</language>
-			<language type="de">જર�મન</language>
-			<language type="de_AT">ઓસ�ટ�રિઅન જર�મન</language>
-			<language type="de_CH">સ�વિસ હાય જર�મન</language>
-			<language type="del">દેલેવેર</language>
-			<language type="den">સ�લેવ</language>
-			<language type="dgr">ડોગ�રિબ</language>
-			<language type="din">દિન�કા</language>
-			<language type="doi">ડોગ�રી</language>
-			<language type="dra">દ�રવિડિઅન ભાષા</language>
-			<language type="dsb">નિમ�ન સોર�બિયન</language>
-			<language type="dua">દ�આલા</language>
-			<language type="dum">મધ�ય ડચ</language>
-			<language type="dv">દિવેહી</language>
-			<language type="dyu">ડ�ય�લા</language>
-			<language type="dz">�ોંગખા</language>
-			<language type="ee">ઇવે</language>
-			<language type="efi">�ફિક</language>
-			<language type="egy">પ�રાચીન ઇજીપ�શિયન</language>
-			<language type="eka">�કાજ�ક</language>
-			<language type="el">ગ�રીક</language>
-			<language type="elx">�લામાઇટ</language>
-			<language type="en">અંગ�રેજી</language>
-			<language type="en_AU">ઓસ�ટ�રેલિયન અંગ�રેજી</language>
-			<language type="en_CA">કેનેડિયન ફ�રેંચ</language>
-			<language type="en_GB">બ�રિટિશ અંગ�રેજી</language>
-			<language type="en_US">ય� �સ અંગ�રેજી</language>
-			<language type="enm">મિડિલ અંગ�રેજી</language>
-			<language type="eo">�સ�પેરાન�ટો</language>
-			<language type="es">સ�પેનિશ</language>
-			<language type="es_419">લેટિન અમેરિકન સ�પેનિશ</language>
-			<language type="es_ES">ઇબેરિયન સ�પેનિશ</language>
-			<language type="et">�સ�ટોનિયન</language>
-			<language type="eu">બાસ�ક</language>
-			<language type="ewo">ઇવોન�ડો</language>
-			<language type="fa">પર�શિયન</language>
-			<language type="fan">ફેંગ</language>
-			<language type="fat">ફન�ટી</language>
-			<language type="ff">ફ�લાહ</language>
-			<language type="fi">ફિનિશ</language>
-			<language type="fil">ફિલિપિનો</language>
-			<language type="fiu">ફિન�નો-ઉગ�રીયન ભાષા</language>
-			<language type="fj">ફિજીયન</language>
-			<language type="fo">ફોરિસ�ત</language>
-			<language type="fon">ફોન</language>
-			<language type="fr">ફ�રેન�ચ</language>
-			<language type="fr_CH">સ�વિસ ફ�રેંચ</language>
-			<language type="frm">મિડિલ ફ�રેંચ</language>
-			<language type="fro">જૂની ફ�રેંચ</language>
-			<language type="frr">નોર�ધર�ન ફ�રિશિયન</language>
-			<language type="frs">પૂર�વ ફ�રિશિયન</language>
-			<language type="fur">ફ�રિય�લિયાન</language>
-			<language type="fy">પશ�ચિમી ફ�રિશિયન</language>
-			<language type="ga">આઇરિશ</language>
-			<language type="gaa">ગા</language>
-			<language type="gay">ગાયો</language>
-			<language type="gba">બાયા</language>
-			<language type="gd">સ�કોટ�સ ગેલિક</language>
-			<language type="gem">જર�મેનિક ભાષા</language>
-			<language type="gez">ગી�</language>
-			<language type="gil">જિલ�બરટી�</language>
-			<language type="gl">ગેલિશિયન</language>
-			<language type="gmh">મધ�ય હાઇ જર�મન</language>
-			<language type="gn">ગ�આરાની</language>
-			<language type="goh">જૂની હાઇ જર�મન</language>
-			<language type="gon">ગોંડી</language>
-			<language type="gor">ગોરોન�તાલો</language>
-			<language type="got">ગોથિક</language>
-			<language type="grb">ગ�રેબો</language>
-			<language type="grc">પ�રાચીન ગ�રીક</language>
-			<language type="gsw">સ�વિસ જર�મન</language>
-			<language type="gu">ગ�જરાતી</language>
-			<language type="gv">માંક�સ</language>
-			<language type="gwi">ગ�વિચ'ઇન</language>
-			<language type="ha">હૌસા</language>
-			<language type="hai">હૈડા</language>
-			<language type="haw">હાવાઇયન</language>
-			<language type="he">હીબ�ર�</language>
-			<language type="hi">હિન�દી</language>
-			<language type="hil">હિલિગેનોન</language>
-			<language type="him">હિમાચલી</language>
-			<language type="hit">હિટ�ટિતે</language>
-			<language type="hmn">મોંગ</language>
-			<language type="ho">હિરી મોટૂ</language>
-			<language type="hr">ક�રો�શિયન</language>
-			<language type="hsb">અપ�પર સોર�બિયન</language>
-			<language type="ht">હૈતીયન</language>
-			<language type="hu">હંગેરિયન</language>
-			<language type="hup">હૂપા</language>
-			<language type="hy">આર�મેનિયન</language>
-			<language type="hz">હેરેરો</language>
-			<language type="ia">ઇંટરલિંગ�આ</language>
-			<language type="iba">ઇબાન</language>
-			<language type="id">ઇન�ડોનેશિયન</language>
-			<language type="ie">ઇંટરલિંગ</language>
-			<language type="ii">સિચ�આન યી</language>
-			<language type="ijo">ઇજો</language>
-			<language type="ik">ઇન�પિયાક</language>
-			<language type="ilo">ઇલોકો</language>
-			<language type="inc">ભારતીય ભાષા</language>
-			<language type="ine">ઇંડો-ય�રોપીયન ભાષા</language>
-			<language type="inh">ઇંગ�શ</language>
-			<language type="io">ઇડૌ</language>
-			<language type="ira">ઇરાની ભાષા</language>
-			<language type="iro">ઇરોક�વોઇયન ભાષા</language>
-			<language type="is">આઇસલેન�ડિક</language>
-			<language type="it">ઇટાલિયન</language>
-			<language type="iu">ઇન�કિટૂટ</language>
-			<language type="ja">જાપાની�</language>
-			<language type="jbo">લોજ�બાન</language>
-			<language type="jpr">જ�દેઓ-પર�શિયન</language>
-			<language type="jrb">જ�દેઓ-અરબી</language>
-			<language type="jv">જાવાનીસ</language>
-			<language type="ka">જ�યોર�જિઅન</language>
-			<language type="kaa">કારા-કલ�પક</language>
-			<language type="kab">કબાઇલ</language>
-			<language type="kac">કાચિન</language>
-			<language type="kaj">જ�જ�</language>
-			<language type="kam">કમ�બા</language>
-			<language type="kar">કારેન</language>
-			<language type="kaw">કાવી</language>
-			<language type="kbd">કબાર�ડિયન</language>
-			<language type="kcg">ત�યાપ</language>
-			<language type="kfo">કોરો</language>
-			<language type="kg">કોંગો</language>
-			<language type="kha">ખાસી</language>
-			<language type="khi">ખોસિયન ભાષા</language>
-			<language type="kho">ખોતાનીસ</language>
-			<language type="ki">કિક�યૂ</language>
-			<language type="kj">ક�વાન�યામા</language>
-			<language type="kk">ક�ાક</language>
-			<language type="kl">કલાલ�લિસ�ત</language>
-			<language type="km">ખ�મેર</language>
-			<language type="kmb">કિમ�બન�દ�</language>
-			<language type="kn">કન�નડા</language>
-			<language type="ko">કોરિયન</language>
-			<language type="kok">કોંકણી</language>
-			<language type="kos">કોસરિયન</language>
-			<language type="kpe">ક�પેલ�લે</language>
-			<language type="kr">કન�રી</language>
-			<language type="krc">કરાચય-બલ�કાર</language>
-			<language type="krl">કરેલિયન</language>
-			<language type="kro">ક�રૂ</language>
-			<language type="kru">ક�રૂખ</language>
-			<language type="ks">કશ�મીરી</language>
-			<language type="ku">ક�ર�દિશ</language>
-			<language type="kum">ક�મીક</language>
-			<language type="kut">ક�તેનાઇ</language>
-			<language type="kv">કોમી</language>
-			<language type="kw">કોર�નિશ</language>
-			<language type="ky">કિરગી�</language>
-			<language type="la">લેટિન</language>
-			<language type="lad">લાદીનો</language>
-			<language type="lah">લાહન�ડા</language>
-			<language type="lam">લામ�બા</language>
-			<language type="lb">લક��ેમબર�ગિશ</language>
-			<language type="lez">લે�ધીયન</language>
-			<language type="lg">ગાંડા</language>
-			<language type="li">લિંબૂર�ગિશ</language>
-			<language type="ln">લિંગાલા</language>
-			<language type="lo">લાઓથિયન</language>
-			<language type="lol">મોગો</language>
-			<language type="loz">લો�ી</language>
-			<language type="lt">લિથ�નિયન</language>
-			<language type="lu">લ�યૂબા કટાંગા</language>
-			<language type="lua">લૂબા-લ�લ�આ</language>
-			<language type="lui">લ�ઇસેનો</language>
-			<language type="lun">લ�ન�ડા</language>
-			<language type="luo">લ�ય�ઓ</language>
-			<language type="lus">લ�શાઇ</language>
-			<language type="lv">લાતવિયન</language>
-			<language type="mad">માદ�રીસ</language>
-			<language type="mag">મગહી</language>
-			<language type="mai">મૈથિલી</language>
-			<language type="mak">મકાસર</language>
-			<language type="man">મન�ડિન�ગો</language>
-			<language type="map">ઓસ�ટ�રોનેશિયન</language>
-			<language type="mas">મસાઇ</language>
-			<language type="mdf">મોક�ષ</language>
-			<language type="mdr">મંડાર</language>
-			<language type="men">મેન�ડે</language>
-			<language type="mg">મલાગસી</language>
-			<language type="mga">મિડિલ આઇરિશ</language>
-			<language type="mh">માર�શલી�</language>
-			<language type="mi">માઓરી</language>
-			<language type="mic">મિકમેક</language>
-			<language type="min">મિનાંગ�કાબાઉ</language>
-			<language type="mis">વિવિધ ભાષા</language>
-			<language type="mk">મેસેડોનિયન</language>
-			<language type="mkh">મોન-ખ�મેર ભાષા</language>
-			<language type="ml">મલયાલમ</language>
-			<language type="mn">મોંગોલિયન</language>
-			<language type="mnc">માન�ચ�</language>
-			<language type="mni">મનિપૂરી</language>
-			<language type="mno">મનોબો ભાષા</language>
-			<language type="mo">મોલડાવિયન</language>
-			<language type="moh">મોહૌક</language>
-			<language type="mos">મોસ�સી</language>
-			<language type="mr">મરાઠી</language>
-			<language type="ms">મલય</language>
-			<language type="mt">માલ�ટિ�</language>
-			<language type="mul">બહ�વિધ ભાષા</language>
-			<language type="mun">મ�ન�ડા ભાષા</language>
-			<language type="mus">ક�રિક</language>
-			<language type="mwl">મિરાંડી</language>
-			<language type="mwr">મારવાડી</language>
-			<language type="my">બર�મી�</language>
-			<language type="myn">માયા ભાષા</language>
-			<language type="myv">�ર��યા</language>
-			<language type="na">નાઉરૂ</language>
-			<language type="nah">નહઆત�લ</language>
-			<language type="nai">ઉતરી અમેરીકન ઇંડિયન ભાષા</language>
-			<language type="nap">નેપોલિટાન</language>
-			<language type="nb">નોર�વેજીયન બોકમાલ</language>
-			<language type="nd">ઉતર દેબેલ</language>
-			<language type="nds">લો જર�મન</language>
-			<language type="ne">નેપાળી</language>
-			<language type="new">નેવારી</language>
-			<language type="ng">ડોન�ગા</language>
-			<language type="nia">નિયાસ</language>
-			<language type="nic">નાઇગર-કોર�ડોફેનિયન ભાષા</language>
-			<language type="niu">નિય�આન</language>
-			<language type="nl">ડચ</language>
-			<language type="nl_BE">ફ�લેમિશ</language>
-			<language type="nn">નૉર�વેજીયન નાયનૉર�સ�ક</language>
-			<language type="no">નૉર�વેજીયન</language>
-			<language type="nog">નોગાઇ</language>
-			<language type="non">જૂની નોર�સ</language>
-			<language type="nqo">�ન'કો</language>
-			<language type="nr">દક�ષિણ દેબેલ</language>
-			<language type="nso">ઉતરી સોથો</language>
-			<language type="nub">ન�ય�બિયાન ભાષા</language>
-			<language type="nv">નાવાજો</language>
-			<language type="nwc">પરંપરાગત નેવારી</language>
-			<language type="ny">ન�યાન�જા</language>
-			<language type="nym">ન�યામવે�ી</language>
-			<language type="nyn">ન�યાનકોલ</language>
-			<language type="nyo">ન�યોરો</language>
-			<language type="nzi">ન��િમા</language>
-			<language type="oc">ઑકીટન</language>
-			<language type="oj">ઓ�િંબ�વા</language>
-			<language type="om">ઓરોમો</language>
-			<language type="or">ઉડિયા</language>
-			<language type="os">ઓસ�સેટિક</language>
-			<language type="osa">ઓસેજ</language>
-			<language type="ota">ઓટોમાન ત�ર�કિશ</language>
-			<language type="oto">ઓટોમિયન ભાષા</language>
-			<language type="pa">પંજાબી</language>
-			<language type="paa">પાપ�ન ભાષા</language>
-			<language type="pag">પંગાસીનાન</language>
-			<language type="pal">પહલવી</language>
-			<language type="pam">પમ�પાન�ગા</language>
-			<language type="pap">પાપિયામેન�ટો</language>
-			<language type="pau">પલાઉઆન</language>
-			<language type="peo">જૂની પર�શિયન</language>
-			<language type="phi">ફિલિપીની ભાષા</language>
-			<language type="phn">ફોનિશિયન</language>
-			<language type="pi">પાલી</language>
-			<language type="pl">પોલીશ</language>
-			<language type="pon">પોહપિ�ન</language>
-			<language type="pra">પ�રક�રૃત ભાષા</language>
-			<language type="pro">જ�ની પ�રોવેન�સલ</language>
-			<language type="ps">પશ�તો</language>
-			<language type="pt">પોર�ટ�ગી�</language>
-			<language type="pt_BR">બ�રા�િલીયન પોર�ટ�ગી�</language>
-			<language type="pt_PT">ઇબેરિયન પોર�ટ�ગી�</language>
-			<language type="qu">ક�વેચ�આ</language>
-			<language type="raj">રાજસ�થાની</language>
-			<language type="rap">રાપાન�ઇ</language>
-			<language type="rar">રારોટોંગન</language>
-			<language type="rm">રહેટો રોમાન�સ</language>
-			<language type="rn">રૂન�દી</language>
-			<language type="ro">રોમાનિયન</language>
-			<language type="roa">રોમાંસ ભાષા</language>
-			<language type="rom">રોમાની</language>
-			<language type="root">મૂલ</language>
-			<language type="ru">રશિયન</language>
-			<language type="rup">અરોમેનિયન</language>
-			<language type="rw">કિન�યારવાન�ડા</language>
-			<language type="sa">સંસ�કૃત</language>
-			<language type="sad">સોંડવે</language>
-			<language type="sah">યાકૂત</language>
-			<language type="sai">દક�ષિણ અમેરીકન ઇંડિયન ભાષા</language>
-			<language type="sal">સલીશન ભાષા</language>
-			<language type="sam">સામરિટાન અરેમિક</language>
-			<language type="sas">સાસાક</language>
-			<language type="sat">સંતાલી</language>
-			<language type="sc">સાર�દિનિયન</language>
-			<language type="scn">સિસિલિયાન</language>
-			<language type="sco">સ�કોટ�સ</language>
-			<language type="sd">સિંધી</language>
-			<language type="se">નૉર�થન સામી</language>
-			<language type="sel">સેલ�કપ</language>
-			<language type="sem">સેમિટિક ભાષા</language>
-			<language type="sg">સાંગો</language>
-			<language type="sga">જૂની આયરિશ</language>
-			<language type="sgn">સાંકેતિક ભાષા</language>
-			<language type="sh">સર�બો-ક�રો�શિયન</language>
-			<language type="shn">શેન</language>
-			<language type="si">સિંહલી</language>
-			<language type="sid">સિદામો</language>
-			<language type="sio">સિઉઆન ભાષા</language>
-			<language type="sit">ચીની-ટિબેટી ભાષા</language>
-			<language type="sk">સ�લોવૅક</language>
-			<language type="sl">સ�લોવેનિયન</language>
-			<language type="sla">સ�લોવિક ભાષા</language>
-			<language type="sm">સામોન</language>
-			<language type="sma">દક�ષિણ સામી</language>
-			<language type="smi">સામી ભાષા</language>
-			<language type="smj">લ�ય�લ સામી</language>
-			<language type="smn">ઇનારી સામી</language>
-			<language type="sms">સ�કોલ�ટ સામી</language>
-			<language type="sn">શોના</language>
-			<language type="snk">સોનિન�કે</language>
-			<language type="so">સોમાલી</language>
-			<language type="sog">સોગ�ડિ�ન</language>
-			<language type="son">સોન�ઘાઇ</language>
-			<language type="sq">અલ�બેનિયન</language>
-			<language type="sr">સર�બિયન</language>
-			<language type="srn">સ�રાનન ટોન�ગો</language>
-			<language type="srr">સેરેર</language>
-			<language type="ss">સ�વાતી</language>
-			<language type="ssa">નીલો-સહારન ભાષા</language>
-			<language type="st">સદર�ન સોથો</language>
-			<language type="su">સંડેની�</language>
-			<language type="suk">સ�ક�મા</language>
-			<language type="sus">સ�સ�</language>
-			<language type="sux">સ�મેરિયન</language>
-			<language type="sv">સ�વીડિશ</language>
-			<language type="sw">સ�વાહિલી</language>
-			<language type="syc">પરંપરાગત સિરિ�ક</language>
-			<language type="syr">સિરિ�ક</language>
-			<language type="ta">તમિલ</language>
-			<language type="tai">તાઇ ભાષા</language>
-			<language type="te">તેલ�ગ�</language>
-			<language type="tem">ટિમ�ને</language>
-			<language type="ter">તેરેનો</language>
-			<language type="tet">તેત�મ</language>
-			<language type="tg">તાજીક</language>
-			<language type="th">થાઈ</language>
-			<language type="ti">ટાઇગ�રિનિયા</language>
-			<language type="tig">ટાઇગ�રે</language>
-			<language type="tiv">તિવ</language>
-			<language type="tk">ત�ર�કમેન</language>
-			<language type="tkl">તોકેલાઉ</language>
-			<language type="tl">ટાગાલોગ</language>
-			<language type="tlh">ક�લિંગન</language>
-			<language type="tli">લિંગિત</language>
-			<language type="tmh">તામાશેખ</language>
-			<language type="tn">ત�સ�વાના</language>
-			<language type="to">ટોંગા</language>
-			<language type="tog">ન�યાસા ટોન�ગા</language>
-			<language type="tpi">ટોક પિસિન</language>
-			<language type="tr">ટર�કીશ</language>
-			<language type="ts">સોંગા</language>
-			<language type="tsi">સિમ�શિયન</language>
-			<language type="tt">તતાર</language>
-			<language type="tum">તમ�બૂકા</language>
-			<language type="tup">ટ�યૂપી ભાષા</language>
-			<language type="tut">અલ�ટેઇક ભાષા</language>
-			<language type="tvl">ત�વાલ�</language>
-			<language type="tw">ટ�વાઇ</language>
-			<language type="ty">તાહિતિયન</language>
-			<language type="tyv">ટ�વીનિયન</language>
-			<language type="udm">ઉદમ�ર�ત</language>
-			<language type="ug">ઇગ�ર</language>
-			<language type="uga">ય�ગેરિટિક</language>
-			<language type="uk">ય�ક�રેનિયન</language>
-			<language type="umb">ઉમ�બ�ન�ડૂ</language>
-			<language type="und">અજ�ઞાત અથવા અમાન�ય ભાષા</language>
-			<language type="ur">ઉર�દ�</language>
-			<language type="uz">ઉ��બેક</language>
-			<language type="vai">વાઇ</language>
-			<language type="ve">વેન�દા</language>
-			<language type="vi">વિયેતનામીસ</language>
-			<language type="vo">વોલાપ�ક</language>
-			<language type="vot">વોટિક</language>
-			<language type="wa">વાલૂન</language>
-			<language type="wak">વાકાશન ભાષા</language>
-			<language type="wal">વલામો</language>
-			<language type="war">વારે</language>
-			<language type="was">વાશો</language>
-			<language type="wen">સોર�બિયન ભાષા</language>
-			<language type="wo">વોલોફ</language>
-			<language type="xal">કાલ�મિક</language>
-			<language type="xh">ખોસા</language>
-			<language type="yao">યાઓ</language>
-			<language type="yap">યાપીસ</language>
-			<language type="yi">યીદ�દીશ</language>
-			<language type="yo">યોરૂબા</language>
-			<language type="ypk">યૂપિક ભાષા</language>
-			<language type="za">��આગ</language>
-			<language type="zap">�ેપોટેક</language>
-			<language type="zbl">બ�લિસિમ�બોલ�સ</language>
-			<language type="zen">�ેનાગા</language>
-			<language type="zh">ચાઇની�</language>
-			<language type="zh_Hans">સરળીકૃત ચિની</language>
-			<language type="zh_Hant">પારંપરિક ચિની</language>
-			<language type="znd">�ન�ડે</language>
-			<language type="zu">��લ�</language>
-			<language type="zun">�ૂની</language>
-			<language type="zxx">કોઇ ભાષાશાસ�ત�રીય સામગ�રી નથી</language>
-			<language type="zza">�ા�ા</language>
-		</languages>
-		<scripts>
-			<script type="Arab">અરેબી</script>
-			<script type="Armi">ઇમ�પિરિયલ આર�મનિક</script>
-			<script type="Armn">અર�મેનિયન</script>
-			<script type="Avst">અવેસ�તન</script>
-			<script type="Bali">બાલીની�</script>
-			<script type="Batk">બટાક</script>
-			<script type="Beng">બંગાળી</script>
-			<script type="Blis">બ�લિસિમ�બોલ�સ</script>
-			<script type="Bopo">બોપોમોફો</script>
-			<script type="Brah">બ�રહ�મી</script>
-			<script type="Brai">બ�રેલ</script>
-			<script type="Bugi">બગિનીસ</script>
-			<script type="Buhd">બ�હિદ</script>
-			<script type="Cakm">ચકમા</script>
-			<script type="Cans">ય�નાઇટેડ કેનેડિયન �બોરિજનલ સિલેબિક�સ</script>
-			<script type="Cari">કરૈન</script>
-			<script type="Cher">ચેરોકી</script>
-			<script type="Cirt">સિર�થ</script>
-			<script type="Copt">કોપ�ટિક</script>
-			<script type="Cprt">સિપ�રાયટ</script>
-			<script type="Cyrl">સિરિલિક</script>
-			<script type="Cyrs">ઓલ�ડ ચર�ચ સ�લાવોનિક સિરિલિક</script>
-			<script type="Deva">દેવનાગરી</script>
-			<script type="Dsrt">ડેસરેટ</script>
-			<script type="Egyd">ઇજિપ�શિયન ડેમોટિક</script>
-			<script type="Egyh">ઇજિપ�શિયન હાઇરેટિક</script>
-			<script type="Egyp">ઇજિપ�શિયન હાઇરોગ�લિફ�સ</script>
-			<script type="Ethi">ઇથિયોપિક</script>
-			<script type="Geok">જ�યોર�જિઅન ખ�તસ�રી</script>
-			<script type="Geor">જ�યોર�જિઅન</script>
-			<script type="Glag">ગ�લેગોલિટિક</script>
-			<script type="Goth">ગોથિક</script>
-			<script type="Grek">ગ�રીક</script>
-			<script type="Gujr">ગ�જરાતી</script>
-			<script type="Guru">ગ�રૂમ�ખી</script>
-			<script type="Hang">હંગ�લ</script>
-			<script type="Hani">હાન</script>
-			<script type="Hano">હન�નૂ</script>
-			<script type="Hans">સરળીકૃત</script>
-			<script type="Hant">પારમ�પરિક હન</script>
-			<script type="Hebr">હીબ�ર�</script>
-			<script type="Hira">હિરાગાના</script>
-			<script type="Hmng">પહાઉ મોન�ગ</script>
-			<script type="Hrkt">કતાકના અને હિરાગના</script>
-			<script type="Hung">ઓલ�ડ હંગેરિયન</script>
-			<script type="Inds">સિન�ધ�</script>
-			<script type="Ital">જૂન� ઇટાલિક</script>
-			<script type="Java">જાવાનીસ</script>
-			<script type="Jpan">જાપાની</script>
-			<script type="Kali">કાયાહ લી</script>
-			<script type="Kana">કટાકાના</script>
-			<script type="Khar">ખારોશ�થી</script>
-			<script type="Khmr">ખ�મેર</script>
-			<script type="Knda">કન�નડા</script>
-			<script type="Kore">કોરિયન</script>
-			<script type="Kthi">કૈથી</script>
-			<script type="Lana">લાના</script>
-			<script type="Laoo">લાઓ</script>
-			<script type="Latf">ફ�રેકત�ર લેટિન</script>
-			<script type="Latg">ગૈલિક લેટિન</script>
-			<script type="Latn">લેટિન</script>
-			<script type="Lepc">લેપચા</script>
-			<script type="Limb">લિમ�બૂ</script>
-			<script type="Lina">લીનિયર અ</script>
-			<script type="Linb">લીનિયર બી</script>
-			<script type="Lyci">લિશિયન</script>
-			<script type="Lydi">લિડિયન</script>
-			<script type="Mand">માન�ડાયીન</script>
-			<script type="Mani">માનીચાયીન</script>
-			<script type="Maya">મયાન હાઇરોગ�લિફ�સ</script>
-			<script type="Mero">મેરોઇટિક</script>
-			<script type="Mlym">મલયાલમ</script>
-			<script type="Mong">મોંગોલિયન</script>
-			<script type="Moon">મૂન</script>
-			<script type="Mtei">મેઇતેઇ માયેક</script>
-			<script type="Mymr">મ�યાંમાર</script>
-			<script type="Nkoo">�ન' કો</script>
-			<script type="Ogam">ઓઘામ</script>
-			<script type="Olck">ઓલ ચિકી</script>
-			<script type="Orkh">ઓરખોન</script>
-			<script type="Orya">ઉડિયા</script>
-			<script type="Osma">ઓસ�માન�યા</script>
-			<script type="Perm">ઓલ�ડ પરમિક</script>
-			<script type="Phag">ફાગ�સ-પા</script>
-			<script type="Phli">ઇન�સ�ક�રિપ�શનલ પહલવી</script>
-			<script type="Phlp">સાલટર પહલવી</script>
-			<script type="Phlv">બ�ક પહલવી</script>
-			<script type="Phnx">ફોનિશિયન</script>
-			<script type="Plrd">પોલાર�ડ ફોનેટિક</script>
-			<script type="Prti">ઇન�સ�ક�રિપ�શનલ પાર�થિયન</script>
-			<script type="Qaai">વંશાગત</script>
-			<script type="Rjng">રીજાંગ</script>
-			<script type="Roro">રોંગોરોંગો</script>
-			<script type="Runr">રૂનિક</script>
-			<script type="Samr">સમરિટાન</script>
-			<script type="Sara">સરાતી</script>
-			<script type="Saur">સૌરાષ�ટ�ર</script>
-			<script type="Sgnw">સંકેત લિપી</script>
-			<script type="Shaw">શાવિયાન</script>
-			<script type="Sinh">સિંહલી</script>
-			<script type="Sund">સ�દાની�</script>
-			<script type="Sylo">સિલોતી નાગરી</script>
-			<script type="Syrc">સિરિયેક</script>
-			<script type="Syre">�સ�ત�રેન�જેલો સિરિયાક</script>
-			<script type="Syrj">પશ�ચિમ સિરિયાક</script>
-			<script type="Syrn">પૂર�વ સિરિયાક</script>
-			<script type="Tagb">તગબન�વા</script>
-			<script type="Tale">તાઇ લી</script>
-			<script type="Talu">નવીન તાઇ લૂ</script>
-			<script type="Taml">તમિલ</script>
-			<script type="Tavt">તાઇ વેઇત</script>
-			<script type="Telu">તેલ�ગ�</script>
-			<script type="Teng">તેન�ગવાર</script>
-			<script type="Tfng">તિફિનાઘ</script>
-			<script type="Tglg">ટેગાલોગ</script>
-			<script type="Thaa">થાના</script>
-			<script type="Thai">થાઇ</script>
-			<script type="Tibt">ટિબેટી</script>
-			<script type="Ugar">ય�ગાતિટિક</script>
-			<script type="Vaii">વાઇ</script>
-			<script type="Visp">વિસિબલ સ�પીચ</script>
-			<script type="Xpeo">જ�ની ફારસી</script>
-			<script type="Xsux">સ�મેરો અક�કાદિયન સ�નિફોર�મ</script>
-			<script type="Yiii">યી</script>
-			<script type="Zmth">ગણિતીય સંકેતલિપિ</script>
-			<script type="Zsym">પ�રતીક લિપી</script>
-			<script type="Zxxx">અલિખિત</script>
-			<script type="Zyyy">સામાન�ય</script>
-			<script type="Zzzz">અજ�ઞાત અથવા અમાન�ય લિપિ</script>
-		</scripts>
-		<territories>
-			<territory type="001">વિશ�વ</territory>
-			<territory type="002">આફ�રિકા</territory>
-			<territory type="003">ઉતર અમેરિકા</territory>
-			<territory type="005">દક�ષિણ અમેરિકા</territory>
-			<territory type="009">ઓશિઆનિયા</territory>
-			<territory type="011">પશ�ચિમ આફ�રિકા</territory>
-			<territory type="013">મધ�ય અમેરિકા</territory>
-			<territory type="014">પૂર�વ અમેરિકા</territory>
-			<territory type="015">ઉતરીય આફ�રિકા</territory>
-			<territory type="017">મધ�ય આફ�રિકા</territory>
-			<territory type="018">દક�ષિણી આફ�રિકા</territory>
-			<territory type="019">અમેરિકાસ</territory>
-			<territory type="021">ઉતરીય અમેરિકા</territory>
-			<territory type="029">કેરિબિયન</territory>
-			<territory type="030">પૂર�વીય �શિયા</territory>
-			<territory type="034">દક�ષિણી �શિયા</territory>
-			<territory type="035">દક�ષિણ- પૂર�વ �શિયા</territory>
-			<territory type="039">દક�ષિણી યૂરોપ</territory>
-			<territory type="053">ઑસ�ટ�રેલિયા અને ન�ય��ીલેન�ડ</territory>
-			<territory type="054">મેલાનેશિયા</territory>
-			<territory type="057">માઇક�રોનેશિયન રીજન</territory>
-			<territory type="061">પોલિનેશિયા</territory>
-			<territory type="062">દક�ષિણ-મધ�ય �શિયા</territory>
-			<territory type="142">�શિયા</territory>
-			<territory type="143">મધ�ય �શિયા</territory>
-			<territory type="145">પશ�ચિમ �શિયા</territory>
-			<territory type="150">યૂરોપ</territory>
-			<territory type="151">પૂર�વીય યૂરોપ</territory>
-			<territory type="154">ઉતરીય યૂરોપ</territory>
-			<territory type="155">પશ�ચિમ યૂરોપ</territory>
-			<territory type="172">સ�વતંત�ર રાષ�ટ�રન� કોમનવેલ�થ</territory>
-			<territory type="200">ચેકોસ�લવાકિયા</territory>
-			<territory type="419">લેટિન અમેરિકા અને કેરીબિયન</territory>
-			<territory type="830">ચેનલ આઇલન�ડ�સ</territory>
-			<territory type="AD">�ંડોરા</territory>
-			<territory type="AE">ય�નાઇટેડ અરબ �મિરેટ�સ</territory>
-			<territory type="AF">અફઘાનિસ�તાન</territory>
-			<territory type="AG">�ન�ટીગ�આ અને બરબ�ડા</territory>
-			<territory type="AI">�ંગ�વિલા</territory>
-			<territory type="AL">અલ�બેનિયા</territory>
-			<territory type="AM">આર�મેનિયા</territory>
-			<territory type="AN">નેધરલેંડ�સ �ંટિલેસ</territory>
-			<territory type="AO">અંગોલા</territory>
-			<territory type="AQ">�ન�ટાર�કટિકા</territory>
-			<territory type="AR">આર�જેન�ટીના</territory>
-			<territory type="AS">અમેરીકન સમોઆ</territory>
-			<territory type="AT">ઑસ�ટ�રિયા</territory>
-			<territory type="AU">ઑસ�ટ�રેલિયા</territory>
-			<territory type="AW">અર�બા</territory>
-			<territory type="AX">�લેંડ આઇલેન�ડ�સ</territory>
-			<territory type="AZ">અ�રબૈજાન</territory>
-			<territory type="BA">બોસ�નિયા અને હર��ેગોવિના</territory>
-			<territory type="BB">બારબાડોસ</territory>
-			<territory type="BD">બાંગ�લાદેશ</territory>
-			<territory type="BE">બેલ�જીયમ</territory>
-			<territory type="BF">બ�ર�કિના ફાસો</territory>
-			<territory type="BG">બલ�ગેરિયા</territory>
-			<territory type="BH">બેહરીન</territory>
-			<territory type="BI">બ�ર�ંડી</territory>
-			<territory type="BJ">બેનિન</territory>
-			<territory type="BL">સેંટ બાર�થલેમી</territory>
-			<territory type="BM">બર�મ�ડા</territory>
-			<territory type="BN">બ�ર�નેઇ</territory>
-			<territory type="BO">બોલિવિયા</territory>
-			<territory type="BR">બ�રા�િલ</territory>
-			<territory type="BS">બહામાસ</territory>
-			<territory type="BT">ભૂટાન</territory>
-			<territory type="BV">બૌવેત આઇલેન�ડ</territory>
-			<territory type="BW">બોત�સ�વાના</territory>
-			<territory type="BY">બેલાર�સ</territory>
-			<territory type="BZ">બેલી�</territory>
-			<territory type="CA">કેનેડા</territory>
-			<territory type="CC">કોકો� આઇલેન�ડ</territory>
-			<territory type="CD">કોંગો - કિંશાસા</territory>
-			<territory type="CF">સેંટ�રલ આફ�રિકન રીપબ�લિક</territory>
-			<territory type="CG">કોંગો - બ�રા�ાવિલે</territory>
-			<territory type="CH">સ�વિટ��ર�લૅન�ડ</territory>
-			<territory type="CI">આઇવરી કોસ�ટ</territory>
-			<territory type="CK">ક�ક આઇલેન�ડ�સ</territory>
-			<territory type="CL">ચિલી</territory>
-			<territory type="CM">કૅમરૂન</territory>
-			<territory type="CN">ચીન</territory>
-			<territory type="CO">કોલમ�બિયા</territory>
-			<territory type="CR">કોસ�ટા રિકા</territory>
-			<territory type="CS">સર�બિયા અને મોન�ટેનેગ�રો</territory>
-			<territory type="CU">ક�ય�બા</territory>
-			<territory type="CV">કૅપ વર�ડે</territory>
-			<territory type="CX">ક�રિસમસ આઇલેંડ</territory>
-			<territory type="CY">સાયપ�રસ</territory>
-			<territory type="CZ">ચેક રીપબ�લિક</territory>
-			<territory type="DE">જર�મની</territory>
-			<territory type="DJ">જીબૌટી</territory>
-			<territory type="DK">ડેનમાર�ક</territory>
-			<territory type="DM">ડોમિનિકા</territory>
-			<territory type="DO">ડોમિનિકન રીપબ�લિક</territory>
-			<territory type="DZ">અલ�જીરિયા</territory>
-			<territory type="EC">�ક�વાડોર</territory>
-			<territory type="EE">�સ�ટોનિયા</territory>
-			<territory type="EG">ઇજિપ�ત</territory>
-			<territory type="EH">પશ�ચિમી સહારા</territory>
-			<territory type="ER">�રિટ�રિયા</territory>
-			<territory type="ES">સ�પેન</territory>
-			<territory type="ET">ઇથિઓપિયા</territory>
-			<territory type="FI">ફીનલેંડ</territory>
-			<territory type="FJ">ફીજી</territory>
-			<territory type="FK">ફૉકલૅંડ આઇલૅંડ�સ</territory>
-			<territory type="FM">માઇક�રોનેશિયા</territory>
-			<territory type="FO">ફૅરો આઇલેન�ડ�સ</territory>
-			<territory type="FR">ફ�રાંસ</territory>
-			<territory type="GA">ગેબન</territory>
-			<territory type="GB">ય�નાઇટેડ કિંગડમ</territory>
-			<territory type="GD">ગ�રેનેડા</territory>
-			<territory type="GE">જ�યોર�જીયા</territory>
-			<territory type="GF">ફ�રેંચ ગયાના</territory>
-			<territory type="GG">ગ�વેર�નસે</territory>
-			<territory type="GH">ઘાના</territory>
-			<territory type="GI">જીબ�રાલ�ટર</territory>
-			<territory type="GL">ગ�રીનલેન�ડ</territory>
-			<territory type="GM">ગેમ�બિયા</territory>
-			<territory type="GN">ગિની</territory>
-			<territory type="GP">ગ�વાડેલોપ</territory>
-			<territory type="GQ">ઇક�વેટોરિયલ ગિની</territory>
-			<territory type="GR">ગ�રીસ</territory>
-			<territory type="GS">દક�ષિણ જ�યોર�જીયા અને દક�ષિણ સેન�ડવિચ આઇલેન�ડ</territory>
-			<territory type="GT">ગ�વાટેમાલા</territory>
-			<territory type="GU">ગ�વામ</territory>
-			<territory type="GW">ગિની-બિસાઉ</territory>
-			<territory type="GY">ગયાના</territory>
-			<territory type="HK">હોંગકોંગ SAR ચીન</territory>
-			<territory type="HM">હર�ડ આઇલૅંડ �ંડ મેકડોનાલ�ડ આઇલૅંડ�સ</territory>
-			<territory type="HN">હોન�ડ�રસ</territory>
-			<territory type="HR">ક�રો�શિયા</territory>
-			<territory type="HT">હૈતિ</territory>
-			<territory type="HU">હંગેરી</territory>
-			<territory type="ID">ઇન�ડોનેશિયા</territory>
-			<territory type="IE">આયર�લેંડ</territory>
-			<territory type="IL">ઇ�રાઇલ</territory>
-			<territory type="IM">ઇસ�લે ઓફ મૅન</territory>
-			<territory type="IN">ભારત</territory>
-			<territory type="IO">બ�રિટિશ ઇન�ડિયન ઓશન ટેરિટરી</territory>
-			<territory type="IQ">ઇરાક</territory>
-			<territory type="IR">ઈરાન</territory>
-			<territory type="IS">આઇસલેન�ડ</territory>
-			<territory type="IT">ઇટાલી</territory>
-			<territory type="JE">જર�સી</territory>
-			<territory type="JM">જમૈકા</territory>
-			<territory type="JO">જોર�ડન</territory>
-			<territory type="JP">જાપાન</territory>
-			<territory type="KE">કેન�યા</territory>
-			<territory type="KG">કિર�ગિ��સ�તાન</territory>
-			<territory type="KH">કંબોડિયા</territory>
-			<territory type="KI">કિરિબાટી</territory>
-			<territory type="KM">કોમોરસ</territory>
-			<territory type="KN">સેંટ કિટ�સ �ંડ નેવિસ</territory>
-			<territory type="KP">ઉત�તર કોરિયા</territory>
-			<territory type="KR">દક�ષિણ કોરિયા</territory>
-			<territory type="KW">ક�વૈત</territory>
-			<territory type="KY">કેયમેન આઇલૅંડ�સ</territory>
-			<territory type="KZ">ક�ાકિસ�તાન</territory>
-			<territory type="LA">લાઓસ</territory>
-			<territory type="LB">લેબનોન</territory>
-			<territory type="LC">સેંટ લ�સિયા</territory>
-			<territory type="LI">લૈચટેંસ�ટેઇન</territory>
-			<territory type="LK">શ�રીલંકા</territory>
-			<territory type="LR">લાઇબેરિયા</territory>
-			<territory type="LS">લેસોથો</territory>
-			<territory type="LT">લિથ�નિયા</territory>
-			<territory type="LU">લક��મબર�ગ</territory>
-			<territory type="LV">લેતવિયા</territory>
-			<territory type="LY">લિબિયા</territory>
-			<territory type="MA">મોરોક�કો</territory>
-			<territory type="MC">મોનાકો</territory>
-			<territory type="MD">મોલડોવા</territory>
-			<territory type="ME">મૉન�ટેંનેગ�રો</territory>
-			<territory type="MF">સેંટ માર�ટિન</territory>
-			<territory type="MG">મેડાગાસ�કર</territory>
-			<territory type="MH">માર�શલ આઇલેન�ડ�સ</territory>
-			<territory type="MK">મેસેડોનિયા</territory>
-			<territory type="ML">માલી</territory>
-			<territory type="MM">મ�યાંમાર</territory>
-			<territory type="MN">મંગોલિયા</territory>
-			<territory type="MO">મકાઓ SAR ચીન</territory>
-			<territory type="MP">ઉતરીય મારિયાના આઇલેન�ડ�સ</territory>
-			<territory type="MQ">માર�ટીનીક</territory>
-			<territory type="MR">મૌરિટાનિયા</territory>
-			<territory type="MS">મોંટસેરાત</territory>
-			<territory type="MT">માલ�ટા</territory>
-			<territory type="MU">મોરિશિયસ</territory>
-			<territory type="MV">માલદિવ�સ</territory>
-			<territory type="MW">માલાવી</territory>
-			<territory type="MX">મેક�સિકો</territory>
-			<territory type="MY">મલેશિયા</territory>
-			<territory type="MZ">મો�ામ�બિક</territory>
-			<territory type="NA">નામિબિયા</territory>
-			<territory type="NC">ન�ય� સેલેડોનિયા</territory>
-			<territory type="NE">નાઇજર</territory>
-			<territory type="NF">નોરફૉક આઇલેન�ડ</territory>
-			<territory type="NG">નાઇજીરીયા</territory>
-			<territory type="NI">નિકારાગ�આ</territory>
-			<territory type="NL">નેધરલેન�ડ</territory>
-			<territory type="NO">નૉર�વે</territory>
-			<territory type="NP">નેપાળ</territory>
-			<territory type="NR">નૌર�</territory>
-			<territory type="NU">નીય�</territory>
-			<territory type="NZ">ન�ય��ીલેન�ડ</territory>
-			<territory type="OM">ઑમાન</territory>
-			<territory type="PA">પનામા</territory>
-			<territory type="PE">પેર�</territory>
-			<territory type="PF">ફ�રેંચ પોલિનેશિયા</territory>
-			<territory type="PG">પપ�આ ન�ય� ગિની</territory>
-			<territory type="PH">ફિલિપિન�સ</territory>
-			<territory type="PK">પાકિસ�તાન</territory>
-			<territory type="PL">પોલેંડ</territory>
-			<territory type="PM">સેંટ પી�રે �ન�ડ મિકીલોન</territory>
-			<territory type="PN">પીટકૈર�ન</territory>
-			<territory type="PR">પ�ય�અર�ટો રિકો</territory>
-			<territory type="PS">પેલેસ�ટિનિયન ટેરિટરી</territory>
-			<territory type="PT">પોર�ટ�ગલ</territory>
-			<territory type="PW">પલાઉ</territory>
-			<territory type="PY">પેરાગ�વે</territory>
-			<territory type="QA">કતાર</territory>
-			<territory type="QO">આઉટલાયિંગ ઓશનિયા</territory>
-			<territory type="QU">ય�રોપિયન સંઘ</territory>
-			<territory type="RE">રીય�નિયન</territory>
-			<territory type="RO">રોમાનિયા</territory>
-			<territory type="RS">સર�બિયા</territory>
-			<territory type="RU">રશિયા</territory>
-			<territory type="RW">રવાંડા</territory>
-			<territory type="SA">સાઉદી અરેબિયા</territory>
-			<territory type="SB">સોલોમન આઇલેન�ડ</territory>
-			<territory type="SC">શેશેલ�સ</territory>
-			<territory type="SD">સ�દાન</territory>
-			<territory type="SE">સ�વીડન</territory>
-			<territory type="SG">સિંગાપ�ર</territory>
-			<territory type="SH">સેંટ હેલેના</territory>
-			<territory type="SI">સ�લોવેનિયા</territory>
-			<territory type="SJ">સ�વાલબર�ડ �ંડ જેન મેયન</territory>
-			<territory type="SK">સ�લોવેકિયા</territory>
-			<territory type="SL">સી�રા લેઓન</territory>
-			<territory type="SM">સૅન મેરિનો</territory>
-			<territory type="SN">સેનેગલ</territory>
-			<territory type="SO">સોમાલિયા</territory>
-			<territory type="SR">સ�રીનામ</territory>
-			<territory type="ST">સાઓ ટૉમ અને પ�રિંસિપે</territory>
-			<territory type="SV">�લ સેલ�વાડોર</territory>
-			<territory type="SY">સીરિયા</territory>
-			<territory type="SZ">સ�વા�િલેન�ડ</territory>
-			<territory type="TC">ટર�ક�સ �ન�ડ કૈકોસ આઇલેન�ડ�સ</territory>
-			<territory type="TD">ચાડ</territory>
-			<territory type="TF">ફ�રેંચ સદર�ન ટેરિટરી�</territory>
-			<territory type="TG">ટોગો</territory>
-			<territory type="TH">થાઇલેંડ</territory>
-			<territory type="TJ">તાજીકિસ�તાન</territory>
-			<territory type="TK">ટોકેલાઉ</territory>
-			<territory type="TL">પૂર�વ તિમોર</territory>
-			<territory type="TM">ત�ર�ક�મનિસ�તાન</territory>
-			<territory type="TN">ટ�ય�નિશિયા</territory>
-			<territory type="TO">ટોંગા</territory>
-			<territory type="TR">ત�ર�કસ�તાન</territory>
-			<territory type="TT">ત�રિનિડાડ અને ટોબેગો</territory>
-			<territory type="TV">ત�વાલ�</territory>
-			<territory type="TW">તાઇવાન</territory>
-			<territory type="TZ">તાં�ાનિયા</territory>
-			<territory type="UA">ટર�કી</territory>
-			<territory type="UG">ય�ગાંડા</territory>
-			<territory type="UM">સંય�ક�ત રાજ�ય માઇનર આઉટલાઇંગ આયલેન�ડ</territory>
-			<territory type="US">સંય�કત રાજ�ય/ અમેરિકા</territory>
-			<territory type="UY">ઉર�ગ�વે</territory>
-			<territory type="UZ">ઉ��બેકિસ�તાન</territory>
-			<territory type="VA">વેટિકન</territory>
-			<territory type="VC">સેંટ વિંસેંટ �ંડ ધ ગ�રેનેડિન�સ</territory>
-			<territory type="VE">વેને���લા</territory>
-			<territory type="VG">બ�રિટિશ વર�જિન આઇલેન�ડ</territory>
-			<territory type="VI">ય�.�સ વર�જિન આઇલેન�ડ</territory>
-			<territory type="VN">વિયેતનામ</territory>
-			<territory type="VU">વાન�આત�</territory>
-			<territory type="WF">વૉલિસ �ંડ ફ�ય�ચ�ના</territory>
-			<territory type="WS">સમોઆ</territory>
-			<territory type="YE">યેમેન</territory>
-			<territory type="YT">મેયોટ</territory>
-			<territory type="ZA">દક�ષિણ આફ�રિકા</territory>
-			<territory type="ZM">�ામ�બિયા</territory>
-			<territory type="ZW">�િમ�બાબ�વે</territory>
-			<territory type="ZZ">અજ�ઞાત અથવા અમાન�ય પ�રદેશ</territory>
-		</territories>
-		<keys>
-			<key type="calendar">કેલેન�ડર</key>
-			<key type="collation">ક�રમ</key>
-			<key type="currency">ચલણ</key>
-		</keys>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[૦-૯ � અ-ઋ ૠ � �-ઑ ઓ-ન પ-ર લ ળ વ-હ ઼ �-ઃ ઽ � ા-ૅ ે-ૉ ો ૌ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">જાન�ય�</month>
-							<month type="2">ફેબ�ર�</month>
-							<month type="3">માર�ચ</month>
-							<month type="4">�પ�રિલ</month>
-							<month type="5">મે</month>
-							<month type="6">જૂન</month>
-							<month type="7">જ�લાઈ</month>
-							<month type="8">ઑગસ�ટ</month>
-							<month type="9">સપ�ટે</month>
-							<month type="10">ઑક�ટો</month>
-							<month type="11">નવે</month>
-							<month type="12">ડિસે</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">જાન�ય�આરી</month>
-							<month type="2">ફેબ�ર�આરી</month>
-							<month type="3">માર�ચ</month>
-							<month type="4">�પ�રિલ</month>
-							<month type="5">મે</month>
-							<month type="6">જૂન</month>
-							<month type="7">જ�લાઈ</month>
-							<month type="8">ઑગસ�ટ</month>
-							<month type="9">સપ�ટેમ�બર</month>
-							<month type="10">ઑક�ટ�બર</month>
-							<month type="11">નવેમ�બર</month>
-							<month type="12">ડિસેમ�બર</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">જા</month>
-							<month type="2">ફે</month>
-							<month type="3">મા</month>
-							<month type="4">�</month>
-							<month type="5">મે</month>
-							<month type="6">જૂ</month>
-							<month type="7">જ�</month>
-							<month type="8">ઑ</month>
-							<month type="9">સ</month>
-							<month type="10">ઑ</month>
-							<month type="11">ન</month>
-							<month type="12">ડિ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">રવિ</day>
-							<day type="mon">સોમ</day>
-							<day type="tue">મંગળ</day>
-							<day type="wed">બ�ધ</day>
-							<day type="thu">ગ�ર�</day>
-							<day type="fri">શ�ક�ર</day>
-							<day type="sat">શનિ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">રવિવાર</day>
-							<day type="mon">સોમવાર</day>
-							<day type="tue">મંગળવાર</day>
-							<day type="wed">બ�ધવાર</day>
-							<day type="thu">ગ�ર�વાર</day>
-							<day type="fri">શ�ક�રવાર</day>
-							<day type="sat">શનિવાર</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ર</day>
-							<day type="mon">સો</day>
-							<day type="tue">મં</day>
-							<day type="wed">બ�</day>
-							<day type="thu">ગ�</day>
-							<day type="fri">શ�</day>
-							<day type="sat">શ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">ત�રિમાસિક ૧</quarter>
-							<quarter type="2">ત�રિમાસિક ૨</quarter>
-							<quarter type="3">ત�રિમાસિક ૩</quarter>
-							<quarter type="4">ત�રિમાસિક ૪</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">પહલી ત�રિમાસિક</quarter>
-							<quarter type="2">બીજી ત�રિમાસિક</quarter>
-							<quarter type="3">ત�રીજી ત�રિમાસિક</quarter>
-							<quarter type="4">ચૌથી ત�રિમાસિક</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ઈસવીસન પૂર�વે</era>
-						<era type="1">ઇસવીસન</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ઇ સ પ�</era>
-						<era type="1">ઇસ</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>hh:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>hh:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>hh:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>hh:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>ર�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>હા</yesstr>
-			<nostr>ના</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/gu_IN.xml b/airtime_mvc/library/Zend/Locale/Data/gu_IN.xml
deleted file mode 100644
index b31ed5fb3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gu_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gu"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/gv.xml b/airtime_mvc/library/Zend/Locale/Data/gv.xml
deleted file mode 100644
index 64ff48d22..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gv.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.60 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="gv"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="gv">Gaelg</language>
-		</languages>
-		<territories>
-			<territory type="GB">Rywvaneth Unys</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ç d-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">J-guer</month>
-							<month type="2">T-arree</month>
-							<month type="3">Mayrnt</month>
-							<month type="4">Avrril</month>
-							<month type="5">Boaldyn</month>
-							<month type="6">M-souree</month>
-							<month type="7">J-souree</month>
-							<month type="8">Luanistyn</month>
-							<month type="9">M-fouyir</month>
-							<month type="10">J-fouyir</month>
-							<month type="11">M.Houney</month>
-							<month type="12">M.Nollick</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Jerrey-geuree</month>
-							<month type="2">Toshiaght-arree</month>
-							<month type="3">Mayrnt</month>
-							<month type="4">Averil</month>
-							<month type="5">Boaldyn</month>
-							<month type="6">Mean-souree</month>
-							<month type="7">Jerrey-souree</month>
-							<month type="8">Luanistyn</month>
-							<month type="9">Mean-fouyir</month>
-							<month type="10">Jerrey-fouyir</month>
-							<month type="11">Mee Houney</month>
-							<month type="12">Mee ny Nollick</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Jed</day>
-							<day type="mon">Jel</day>
-							<day type="tue">Jem</day>
-							<day type="wed">Jerc</day>
-							<day type="thu">Jerd</day>
-							<day type="fri">Jeh</day>
-							<day type="sat">Jes</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Jedoonee</day>
-							<day type="mon">Jelhein</day>
-							<day type="tue">Jemayrt</day>
-							<day type="wed">Jercean</day>
-							<day type="thu">Jerdein</day>
-							<day type="fri">Jeheiney</day>
-							<day type="sat">Jesarn</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">RC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/gv_GB.xml b/airtime_mvc/library/Zend/Locale/Data/gv_GB.xml
deleted file mode 100644
index 1cb6b89f2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/gv_GB.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="gv"/>
-		<territory type="GB"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha.xml b/airtime_mvc/library/Zend/Locale/Data/ha.xml
deleted file mode 100644
index f0d74e2b7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ha"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afirkanci</language>
-			<language type="am">Amharic</language>
-			<language type="ar">Harshen Larabci</language>
-			<language type="as">Asamisanci</language>
-			<language type="az">Azerbaijanci</language>
-			<language type="be">Belarushiyanci</language>
-			<language type="bg">Bulgeriyan</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Dan Bengal</language>
-			<language type="br">Buretananci</language>
-			<language type="bs">Bosniyanci</language>
-			<language type="ca">Kataloniyanci</language>
-			<language type="cs">Yaren Jamhuriyar Cek</language>
-			<language type="cy">Kabilar Welsh</language>
-			<language type="da">Danish</language>
-			<language type="de">Jamusanchi</language>
-			<language type="el">Girkanci</language>
-			<language type="en">Turanci</language>
-			<language type="eo">D'an/'Yar Kabilar Andalus</language>
-			<language type="es">Mutanen Espanya</language>
-			<language type="et">Istoniyanci</language>
-			<language type="eu">Dan/'Yar Kabilar Bas</language>
-			<language type="fa">Persian</language>
-			<language type="fi">Yaren mutanen Finland</language>
-			<language type="fil">Dan Filifin</language>
-			<language type="fo">Faroese</language>
-			<language type="fr">Faranshi</language>
-			<language type="fy">K'abilan Firsi</language>
-			<language type="ga">Dan Ailan</language>
-			<language type="gd">K'abilan Scots Gaelic</language>
-			<language type="gl">Bagalike</language>
-			<language type="gn">Guwaraniyanci</language>
-			<language type="gu">Gujarati</language>
-			<language type="ha">Haoussa</language>
-			<language type="he">Yahudanci</language>
-			<language type="hi">Bahinde</language>
-			<language type="hr">Kuroshiyan</language>
-			<language type="hu">Hongeriyanci</language>
-			<language type="hy">Armeniyanci</language>
-			<language type="ia">Yare Tsakanin Kasashe</language>
-			<language type="id">Indonesiyan</language>
-			<language type="ie">Intagulanci</language>
-			<language type="is">Yaren mutanen Iceland</language>
-			<language type="it">Italiyanci</language>
-			<language type="ja">Jafananci</language>
-			<language type="jv">Javanisanci</language>
-			<language type="ka">Jojiyanci</language>
-			<language type="km">Kambodiyanci</language>
-			<language type="kn">Dan/'Yar Kabilar Kannada</language>
-			<language type="ko">Yaren mutanen Koriya</language>
-			<language type="ku">Kurdanci</language>
-			<language type="ky">Kirgizanci</language>
-			<language type="la">Dan Kabilar Latin</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laothian</language>
-			<language type="lt">Lituweniyanci</language>
-			<language type="lv">Latbiyanci</language>
-			<language type="mk">Dan Masedoniya</language>
-			<language type="ml">Kabilar Maleyalam</language>
-			<language type="mn">Mongolian</language>
-			<language type="mr">K'abilan Marathi</language>
-			<language type="ms">Dan Kabilar Male</language>
-			<language type="mt">Harshen Maltis</language>
-			<language type="ne">D'an/'Yar Kabilar Nepal</language>
-			<language type="nl">Yaren mutanen Holland</language>
-			<language type="nn">Yaren Kasar Norway</language>
-			<language type="no">Yaren mutanen Norway</language>
-			<language type="oc">Ositanci</language>
-			<language type="or">Oriyanci</language>
-			<language type="pa">Dan/'Yar Garin Punjab</language>
-			<language type="pl">Yaren mutanen Poland</language>
-			<language type="ps">Pashtanci</language>
-			<language type="pt">Yaren mutanen Portugal</language>
-			<language type="pt_BR">Fotigis (Burazil)</language>
-			<language type="pt_PT">Yaren Kasar Portugal</language>
-			<language type="ro">Romaniyanci</language>
-			<language type="ru">Rashanci</language>
-			<language type="sa">sanskrit</language>
-			<language type="sd">Sindiyanci</language>
-			<language type="sh">Kuroweshiyancin-Sabiya</language>
-			<language type="si">Sinhalanci</language>
-			<language type="sk">Basulake</language>
-			<language type="sl">Basulabe</language>
-			<language type="so">Somaali</language>
-			<language type="sq">D'an/'Yar Kabilar Albaniya</language>
-			<language type="sr">Sabiyan</language>
-			<language type="st">Sesotanci</language>
-			<language type="su">Sundanese</language>
-			<language type="sv">Yaren mutanen Sweden</language>
-			<language type="sw">Harshen Suwahili</language>
-			<language type="ta">D'an/'Yar Kabilar Tamil</language>
-			<language type="te">D'an/'Yar Kabilar Telug</language>
-			<language type="th">Tayanci</language>
-			<language type="ti">Tigriyanci</language>
-			<language type="tk">Tukmenistanci</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Baturke</language>
-			<language type="tw">Tiwiniyanci</language>
-			<language type="ug">Ugiranci</language>
-			<language type="uk">Dan Ukirain</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbek</language>
-			<language type="vi">K'abilan Biyetnam</language>
-			<language type="xh">Bazosa</language>
-			<language type="zu">Bazule</language>
-		</languages>
-		<territories>
-			<territory type="GH">Gaana</territory>
-			<territory type="NE">Nijer</territory>
-			<territory type="NG">Nijeriya</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b ɓ c d ɗ e-k ƙ l-o r s {sh} t {ts} u w y z ʼ {ʼy}]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à â é è ê í ì î ó ò ô p q {r\u0303} ú ù û v x ƴ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Fab</month>
-							<month type="3">Mar</month>
-							<month type="4">Afr</month>
-							<month type="5">May</month>
-							<month type="6">Yun</month>
-							<month type="7">Yul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sat</month>
-							<month type="10">Okt</month>
-							<month type="11">Nuw</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Janairu</month>
-							<month type="2">Fabrairu</month>
-							<month type="3">Maris</month>
-							<month type="4">Afrilu</month>
-							<month type="5">Mayu</month>
-							<month type="6">Yuni</month>
-							<month type="7">Yuli</month>
-							<month type="8">Augusta</month>
-							<month type="9">Satumba</month>
-							<month type="10">Oktoba</month>
-							<month type="11">Nuwamba</month>
-							<month type="12">Disamba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">Y</month>
-							<month type="7">Y</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Lah</day>
-							<day type="mon">Lit</day>
-							<day type="tue">Tal</day>
-							<day type="wed">Lar</day>
-							<day type="thu">Alh</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Asa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Lahadi</day>
-							<day type="mon">Litini</day>
-							<day type="tue">Talata</day>
-							<day type="wed">Laraba</day>
-							<day type="thu">Alhamis</day>
-							<day type="fri">Jumma'a</day>
-							<day type="sat">Asabar</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">L</day>
-							<day type="mon">L</day>
-							<day type="tue">T</day>
-							<day type="wed">L</day>
-							<day type="thu">A</day>
-							<day type="fri">J</day>
-							<day type="sat">A</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Gabanin Miladi</era>
-						<era type="1">Miladi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">GM</era>
-						<era type="1">M</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="GHC">
-				<displayName>Sidi</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Neira</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Sefa</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>i</yesstr>
-			<nostr>a'a:a</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Arab.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Arab.xml
deleted file mode 100644
index c4532ad9d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Arab.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Arab"/>
-	</identity>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[ا ب ت-غ � ڢ ك-ن]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">جَن</month>
-							<month type="2">ڢَب</month>
-							<month type="3">مَر</month>
-							<month type="4">أَڢْر</month>
-							<month type="5">Ù…ÙŽÙŠ</month>
-							<month type="6">ي�ون</month>
-							<month type="7">ي�ول</month>
-							<month type="8">أَغ�</month>
-							<month type="9">سَت</month>
-							<month type="10">أ�كْت</month>
-							<month type="11">ن�و</month>
-							<month type="12">د�س</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جَنَيْر�</month>
-							<month type="2">ڢَبْرَيْر�</month>
-							<month type="3">مَر�سْ</month>
-							<month type="4">أَڢْر�ل�</month>
-							<month type="5">مَي�</month>
-							<month type="6">ي�ون�</month>
-							<month type="7">ي�ول�</month>
-							<month type="8">أَغ�سْتَ</month>
-							<month type="9">سَت�مْبَ</month>
-							<month type="10">أ�كْتو�بَ</month>
-							<month type="11">ن�وَمْبَ</month>
-							<month type="12">د�سَمْبَ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ù„ÙŽØ­</day>
-							<day type="mon">ل�ت</day>
-							<day type="tue">تَل</day>
-							<day type="wed">لَر</day>
-							<day type="thu">أَلْح</day>
-							<day type="fri">ج�م</day>
-							<day type="sat">أَسَ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">لَحَد�</day>
-							<day type="mon">ل�ت�ن�نْ</day>
-							<day type="tue">تَلَتَ</day>
-							<day type="wed">لَرَبَ</day>
-							<day type="thu">أَلْحَم�سْ</day>
-							<day type="fri">ج�مَعَ</day>
-							<day type="sat">أَسَبَرْ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<am>A.M.</am>
-				<pm>P.M.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">غَبَن�نْ م�لَد�</era>
-						<era type="1">م�لَد�</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">غَبَن�نْ م�لَد�</era>
-						<era type="1">م�لَد�</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>نَيْرَ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Arab_NG.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Arab_NG.xml
deleted file mode 100644
index 96fdf196e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Arab_NG.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Arab"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Arab_SD.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Arab_SD.xml
deleted file mode 100644
index ec2a114f5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Arab_SD.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Arab"/>
-		<territory type="SD"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_GH.xml b/airtime_mvc/library/Zend/Locale/Data/ha_GH.xml
deleted file mode 100644
index 3ea20fcc3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_GH.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<territory type="GH"/>
-	</identity>
-	<alias source="ha_Latn_GH" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Latn.xml
deleted file mode 100644
index bc224be49..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Latn.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.13 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_GH.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Latn_GH.xml
deleted file mode 100644
index ad0b2c3ce..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_GH.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.13 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
-		<territory type="GH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NE.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NE.xml
deleted file mode 100644
index 0f3bf2d8d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NE.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.13 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
-		<territory type="NE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NG.xml b/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NG.xml
deleted file mode 100644
index bf140031d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_Latn_NG.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.13 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<script type="Latn"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_NE.xml b/airtime_mvc/library/Zend/Locale/Data/ha_NE.xml
deleted file mode 100644
index 45049214b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_NE.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<territory type="NE"/>
-	</identity>
-	<alias source="ha_Latn_NE" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_NG.xml b/airtime_mvc/library/Zend/Locale/Data/ha_NG.xml
deleted file mode 100644
index c1c584d8c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_NG.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<territory type="NG"/>
-	</identity>
-	<alias source="ha_Latn_NG" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ha_SD.xml b/airtime_mvc/library/Zend/Locale/Data/ha_SD.xml
deleted file mode 100644
index ef6c39d93..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ha_SD.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="ha"/>
-		<territory type="SD"/>
-	</identity>
-	<alias source="ha_Arab_SD" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/haw.xml b/airtime_mvc/library/Zend/Locale/Data/haw.xml
deleted file mode 100644
index f0e118994..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/haw.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.45 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="haw"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="haw">ʻ�lelo Hawaiʻi</language>
-		</languages>
-		<territories>
-			<territory type="AU">Nūh�lani</territory>
-			<territory type="CA">Kanak�</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="DE">Kelem�nia</territory>
-			<territory type="DK">Kenemaka</territory>
-			<territory type="ES">Kepania</territory>
-			<territory type="FR">Palani</territory>
-			<territory type="GB">Aupuni M�ʻī Hui Pū ʻIa</territory>
-			<territory type="GR">Helene</territory>
-			<territory type="IE">ʻIlelani</territory>
-			<territory type="IL">ʻIseraʻela</territory>
-			<territory type="IN">ʻĪnia</territory>
-			<territory type="IT">ʻĪk�lia</territory>
-			<territory type="JP">I�pana</territory>
-			<territory type="MX">Mekiko</territory>
-			<territory type="NL">H�lani</territory>
-			<territory type="NZ">Aotearoa</territory>
-			<territory type="PH">ʻĀina Pilipino</territory>
-			<territory type="RU">LÅ«kia</territory>
-			<territory type="US">ʻAmelika Hui Pū ʻIa</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a � e ē i ī o � u ū h k-n p w ʻ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[b-d f g j q-t v x-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ian.</month>
-							<month type="2">Pep.</month>
-							<month type="3">Mal.</month>
-							<month type="4">ʻAp.</month>
-							<month type="5">Mei</month>
-							<month type="6">Iun.</month>
-							<month type="7">Iul.</month>
-							<month type="8">ʻAu.</month>
-							<month type="9">Kep.</month>
-							<month type="10">ʻOk.</month>
-							<month type="11">Now.</month>
-							<month type="12">Kek.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ianuali</month>
-							<month type="2">Pepeluali</month>
-							<month type="3">Malaki</month>
-							<month type="4">ʻApelila</month>
-							<month type="5">Mei</month>
-							<month type="6">Iune</month>
-							<month type="7">Iulai</month>
-							<month type="8">ʻAukake</month>
-							<month type="9">Kepakemapa</month>
-							<month type="10">ʻOkakopa</month>
-							<month type="11">Nowemapa</month>
-							<month type="12">Kekemapa</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">LP</day>
-							<day type="mon">P1</day>
-							<day type="tue">P2</day>
-							<day type="wed">P3</day>
-							<day type="thu">P4</day>
-							<day type="fri">P5</day>
-							<day type="sat">P6</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">L�pule</day>
-							<day type="mon">Poʻakahi</day>
-							<day type="tue">Poʻalua</day>
-							<day type="wed">Poʻakolu</day>
-							<day type="thu">Poʻah�</day>
-							<day type="fri">Poʻalima</day>
-							<day type="sat">Poʻaono</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyM">M/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/haw_US.xml b/airtime_mvc/library/Zend/Locale/Data/haw_US.xml
deleted file mode 100644
index 1e033f0f6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/haw_US.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="haw"/>
-		<territory type="US"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/he.xml b/airtime_mvc/library/Zend/Locale/Data/he.xml
deleted file mode 100644
index 123d0093f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/he.xml
+++ /dev/null
@@ -1,2757 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.126 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="he"/>
-	</identity>
-	<fallback>en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">�פ�רית</language>
-			<language type="ab">�בחזית</language>
-			<language type="ady">�דיגית</language>
-			<language type="ae">�בסטן</language>
-			<language type="af">�פריק�נס</language>
-			<language type="afa">שפה �פרו-�סייתית</language>
-			<language type="afh">�פריהילי</language>
-			<language type="ain">�ינו</language>
-			<language type="ak">�ק�ן</language>
-			<language type="akk">�כדית</language>
-			<language type="am">�מהרית</language>
-			<language type="ang">�נגלית עתיקה</language>
-			<language type="apa">שפה �פ�צ׳ית</language>
-			<language type="ar">ערבית</language>
-			<language type="arc">�רמית</language>
-			<language type="art">שפה מל�כותית �חרת</language>
-			<language type="as">�ס�מית</language>
-			<language type="ast">�סטורית</language>
-			<language type="aus">שפה �וסטרלית</language>
-			<language type="awa">�וו�דית</language>
-			<language type="ay">�יימ�רית</language>
-			<language type="az">�זרית</language>
-			<language type="ba">בשקירית</language>
-			<language type="bal">ב�לוצ'י</language>
-			<language type="ban">בלינזית</language>
-			<language type="bat">שפות בלטיות</language>
-			<language type="be">בל�רוסית</language>
-			<language type="bej">בז'ה</language>
-			<language type="ber">ברברית</language>
-			<language type="bg">בולגרית</language>
-			<language type="bh">ביה�רי</language>
-			<language type="bi">ביסלמה</language>
-			<language type="bn">בנגלית</language>
-			<language type="bnt">בנטו</language>
-			<language type="bo">טיבטית</language>
-			<language type="br">ברטונית</language>
-			<language type="bs">בוסנית</language>
-			<language type="ca">קטל�נית</language>
-			<language type="cad">ק�דו</language>
-			<language type="cai">�ינדי�נית מרכז �מריק�ית �חרת</language>
-			<language type="cau">שפה קווקזית</language>
-			<language type="ce">צ'צ'נית</language>
-			<language type="ceb">קבו�נו</language>
-			<language type="cel">שפה קלטית</language>
-			<language type="chg">צ'�ג�ט�י</language>
-			<language type="chr">צ'רוקי</language>
-			<language type="co">קורסיקנית</language>
-			<language type="cop">קופטית</language>
-			<language type="crh">טטרית של קרי�</language>
-			<language type="crp">שפה קר�ולית �ו פידג'�נית</language>
-			<language type="cs">צ׳כית</language>
-			<language type="cu">סל�בית כנסייתית עתיקה</language>
-			<language type="cy">וולשית</language>
-			<language type="da">דנית</language>
-			<language type="dak">דקוטה</language>
-			<language type="de">גרמנית</language>
-			<language type="de_AT">גרמנית �וסטרית</language>
-			<language type="del">דל�וור</language>
-			<language type="den">סל�בית</language>
-			<language type="doi">דוגרי</language>
-			<language type="dum">הולנדית תיכונה</language>
-			<language type="dv">דיבהי</language>
-			<language type="dz">דזונקה</language>
-			<language type="egy">מצרית עתיקה</language>
-			<language type="el">יוונית</language>
-			<language type="elx">עילמית</language>
-			<language type="en">�נגלית</language>
-			<language type="en_AU">�נגלית �וסטרלית</language>
-			<language type="en_CA">�נגלית קנדית</language>
-			<language type="en_GB">�נגלית בריטית</language>
-			<language type="en_US">�נגלית �מריקנית</language>
-			<language type="enm">�נגלית תיכונה</language>
-			<language type="eo">�ספרנטו</language>
-			<language type="es">ספרדית</language>
-			<language type="es_419">ספרדית לטינו־�מריק�ית</language>
-			<language type="es_ES">ספרדית �יברית</language>
-			<language type="et">�סטונית</language>
-			<language type="eu">בסקית</language>
-			<language type="fa">פרסית</language>
-			<language type="fi">פינית</language>
-			<language type="fil">פיליפינית</language>
-			<language type="fj">פיג'ית</language>
-			<language type="fo">פ�רו�זית</language>
-			<language type="fr">צרפתית</language>
-			<language type="fr_CA">צרפתית קנדית</language>
-			<language type="fr_CH">צרפתית שוויצרית</language>
-			<language type="frm">צרפתית תיכונה</language>
-			<language type="fro">צרפתית עתיקה</language>
-			<language type="frr">פריזית צפונית</language>
-			<language type="fy">פריזית</language>
-			<language type="ga">�ירית</language>
-			<language type="gd">ג�לית סקוטית</language>
-			<language type="gem">גרמ�נית �חרת</language>
-			<language type="gez">×’×¢×–</language>
-			<language type="gl">גליצי�נית</language>
-			<language type="gn">גו�רני</language>
-			<language type="gon">גונדי</language>
-			<language type="got">גותית</language>
-			<language type="grc">יוונית עתיקה</language>
-			<language type="gsw">גרמנית שוויצרית</language>
-			<language type="gu">גוג'ר�טית</language>
-			<language type="gv">מ�נית</language>
-			<language type="ha">ה�וסה</language>
-			<language type="haw">הוו�ית</language>
-			<language type="he">עברית</language>
-			<language type="hi">הינדי</language>
-			<language type="hit">חיתית</language>
-			<language type="ho">ה�רי מוטו</language>
-			<language type="hr">קרו�טית</language>
-			<language type="ht">ה�יטית</language>
-			<language type="hu">הונגרית</language>
-			<language type="hy">�רמנית</language>
-			<language type="ia">��ינטרלינגו�ה</language>
-			<language type="id">�ינדונזית</language>
-			<language type="ie">�ינטרלינגה</language>
-			<language type="ig">�יגבו</language>
-			<language type="ik">ik</language>
-			<language type="ine">�ינדו-�ירופית �חרת</language>
-			<language type="inh">�ינגושית</language>
-			<language type="io">�ידו</language>
-			<language type="ira">שפה �יר�נית</language>
-			<language type="is">�יסלנדית</language>
-			<language type="it">�יטלקית</language>
-			<language type="iu">�ינוקטיטוט</language>
-			<language type="ja">יפנית</language>
-			<language type="jpr">פרסית יהודית</language>
-			<language type="jrb">ערבית יהודית</language>
-			<language type="jv">י�וונית</language>
-			<language type="ka">גי�ורגית</language>
-			<language type="kab">קבילה</language>
-			<language type="kk">קזחית</language>
-			<language type="kl">ק�ל�ליסוטית</language>
-			<language type="km">קמרית</language>
-			<language type="kn">קנ�דה</language>
-			<language type="ko">קורי�נית</language>
-			<language type="ks">קשמירית</language>
-			<language type="ku">כורדית</language>
-			<language type="kw">קורנית</language>
-			<language type="ky">קירגיזית</language>
-			<language type="la">לטינית</language>
-			<language type="lad">לדינו</language>
-			<language type="lb">לוקסמבורגית</language>
-			<language type="ln">לינגלה</language>
-			<language type="lo">ל�ית</language>
-			<language type="lt">ליט�ית</language>
-			<language type="lv">לטבית</language>
-			<language type="mag">מ�ג�הית</language>
-			<language type="mai">מ�יטילית</language>
-			<language type="map">�וסטרונזית</language>
-			<language type="mas">מ�ס�ית</language>
-			<language type="mg">מלגשית</language>
-			<language type="mga">�ירית תיכונה</language>
-			<language type="mi">מ�ורית</language>
-			<language type="mis">שפה שונה</language>
-			<language type="mk">מקדונית</language>
-			<language type="ml">מל�י�ל�</language>
-			<language type="mn">מונגולית</language>
-			<language type="mni">מניפורית</language>
-			<language type="mo">מולדבית</language>
-			<language type="mr">מרטהי</language>
-			<language type="ms">מל�ית</language>
-			<language type="mt">מלטית</language>
-			<language type="mul">מספר שפות</language>
-			<language type="my">בורמזית</language>
-			<language type="myn">מ�יה</language>
-			<language type="na">נ�ורית</language>
-			<language type="nah">נ�הו�טל</language>
-			<language type="nai">�ינדי�נית צפון �מריק�ית �חרת</language>
-			<language type="nap">נפוליטנית</language>
-			<language type="nb">�נורבגית ספרותית</language>
-			<language type="nds">גרמנית תחתית</language>
-			<language type="ne">נפ�לית</language>
-			<language type="nl">הולנדית</language>
-			<language type="nl_BE">פלמית</language>
-			<language type="nn">נורבגית חדשה - נינורשק</language>
-			<language type="no">נורווגית</language>
-			<language type="non">�נורדית עתיקה</language>
-			<language type="nub">שפות נבטיות</language>
-			<language type="nv">נבחו</language>
-			<language type="nwc">נוו�רית קל�סית</language>
-			<language type="oc">�וקסיטנית</language>
-			<language type="or">�וריה</language>
-			<language type="ota">טורקית עותומנית</language>
-			<language type="pa">פנג'�בית</language>
-			<language type="peo">פרסית עתיקה</language>
-			<language type="phi">פיליפינית �חרת</language>
-			<language type="phn">פניקית</language>
-			<language type="pl">פולנית</language>
-			<language type="ps">פ�שטו</language>
-			<language type="pt">פורטוגלית</language>
-			<language type="pt_BR">פורטוגזית ברזיל�ית</language>
-			<language type="raj">ר�ג'סטן</language>
-			<language type="rn">קירונדי</language>
-			<language type="ro">רומנית</language>
-			<language type="rom">רומ�נית</language>
-			<language type="ru">רוסית</language>
-			<language type="rup">�רומנית</language>
-			<language type="rw">קינירו�נדה</language>
-			<language type="sa">סנסקריט</language>
-			<language type="sai">שפה �ינדי�נית דרו� �מריק�ית</language>
-			<language type="sam">�רמית שומרונית</language>
-			<language type="sat">ס�נטלי</language>
-			<language type="sc">סרדינית</language>
-			<language type="scn">סיצילי�נית</language>
-			<language type="sco">סקוטית</language>
-			<language type="sd">סינדהית</language>
-			<language type="sem">שפה שמית</language>
-			<language type="sga">�ירית עתיקה</language>
-			<language type="sgn">שפת סימני�</language>
-			<language type="sh">סרבו-קרו�טית</language>
-			<language type="si">סינהלה</language>
-			<language type="sid">סידמו</language>
-			<language type="sit">שפה סינו־טיבטית</language>
-			<language type="sk">סלובקית</language>
-			<language type="sl">סלובנית</language>
-			<language type="sla">שפה סל�בית</language>
-			<language type="sm">סמו�ית</language>
-			<language type="smi">שפות ס�מיות �חרות</language>
-			<language type="so">סומלית</language>
-			<language type="sq">�לבנית</language>
-			<language type="sr">סרבית</language>
-			<language type="ss">סיסוו�טי</language>
-			<language type="st">ססות'ו</language>
-			<language type="su">סודנית</language>
-			<language type="sux">שומרית</language>
-			<language type="sv">שוודית</language>
-			<language type="sw">סווהילית</language>
-			<language type="syr">סורית</language>
-			<language type="ta">טמילית</language>
-			<language type="te">טלוגו</language>
-			<language type="tg">טג'יקית</language>
-			<language type="th">ת�י</language>
-			<language type="ti">טיגרינ�ית</language>
-			<language type="tk">טורקמנית</language>
-			<language type="tl">טגלוג</language>
-			<language type="tlh">קלינגון</language>
-			<language type="tn">צוו�נה</language>
-			<language type="to">טונג�ית</language>
-			<language type="tr">טורקית</language>
-			<language type="ts">טסונגה</language>
-			<language type="tt">טטרית</language>
-			<language type="tw">טווי</language>
-			<language type="ty">טהיטית</language>
-			<language type="ug">�ויגהור</language>
-			<language type="uga">�וגריתית</language>
-			<language type="uk">�וקר�ינית</language>
-			<language type="und">שפה ל� ידועה �ו ל� תקפה</language>
-			<language type="ur">�ורדו</language>
-			<language type="uz">�וזבקית</language>
-			<language type="ve">וונדה</language>
-			<language type="vi">וי�טנמית</language>
-			<language type="vo">�וול�פיק</language>
-			<language type="wo">ג'ולוף</language>
-			<language type="xh">קסוסה</language>
-			<language type="yap">י�פזית</language>
-			<language type="yi">יידיש</language>
-			<language type="yo">יורובה</language>
-			<language type="zap">ז�פוטק</language>
-			<language type="zen">זנ�גה</language>
-			<language type="zh">סינית</language>
-			<language type="zh_Hans">סינית (מפושטת)</language>
-			<language type="zh_Hant">סינית מסורתית</language>
-			<language type="zu">זולו</language>
-			<language type="zxx">לל� תוכן לשוני</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ערבי</script>
-			<script type="Armn">�רמני</script>
-			<script type="Bali">ב�לינזי</script>
-			<script type="Beng">בנגלי</script>
-			<script type="Brai">ברייל</script>
-			<script type="Cher">צ׳ירוקי</script>
-			<script type="Copt">קופטי</script>
-			<script type="Cprt">קפריס�י</script>
-			<script type="Cyrl">קירילי</script>
-			<script type="Cyrs">קירילי סל�בוני כנסייתי עתיק</script>
-			<script type="Deva">דוו�נגרי</script>
-			<script type="Egyp">כתב חרטומי�</script>
-			<script type="Ethi">�תיופי</script>
-			<script type="Geor">ג�ורגי</script>
-			<script type="Goth">גותי</script>
-			<script type="Grek">יווני</script>
-			<script type="Hang">ה�נגול</script>
-			<script type="Hani">ה�ן</script>
-			<script type="Hans">ה�ן מפושט</script>
-			<script type="Hant">ה�ן מסורתי</script>
-			<script type="Hebr">עברי</script>
-			<script type="Hung">הונגרי עתיק</script>
-			<script type="Inds">�ינדוס</script>
-			<script type="Ital">�יטלקי עתיק</script>
-			<script type="Jpan">יפני</script>
-			<script type="Khmr">קמרית</script>
-			<script type="Knda">ק�נדה</script>
-			<script type="Kore">קורי�ני</script>
-			<script type="Laoo">ל�ית</script>
-			<script type="Latg">לטיני ג�לי</script>
-			<script type="Latn">לטיני</script>
-			<script type="Mong">מונגולי</script>
-			<script type="Orya">�ורייה</script>
-			<script type="Phnx">פיניקי</script>
-			<script type="Runr">רוני</script>
-			<script type="Sinh">סינהלה</script>
-			<script type="Syrc">סורי</script>
-			<script type="Syrj">סורי מערבי</script>
-			<script type="Syrn">סורי מזרחי</script>
-			<script type="Taml">טמיל</script>
-			<script type="Telu">טלוגו</script>
-			<script type="Tglg">טגלוג</script>
-			<script type="Thai">ת�י</script>
-			<script type="Tibt">טיבטי</script>
-			<script type="Ugar">�וגריתי</script>
-			<script type="Xpeo">פרסי עתיק</script>
-			<script type="Zxxx">ל� כתוב</script>
-			<script type="Zzzz">כתב ל� ידוע �ו ל� תקף</script>
-		</scripts>
-		<territories>
-			<territory type="001">העול�</territory>
-			<territory type="002">�פריקה</territory>
-			<territory type="003">צפון �מריקה</territory>
-			<territory type="005">דרו� �מריקה</territory>
-			<territory type="009">�וקי�ניה</territory>
-			<territory type="011">מערב �פריקה</territory>
-			<territory type="013">מרכז �מריקה</territory>
-			<territory type="014">מזרח �פריקה</territory>
-			<territory type="015">צפון �פריקה</territory>
-			<territory type="017">מרכז �פריקה</territory>
-			<territory type="018">דרו� יבשת �פריקה</territory>
-			<territory type="019">�מריקה</territory>
-			<territory type="021">�מריקה הצפונית</territory>
-			<territory type="029">קריביי�</territory>
-			<territory type="030">מזרח �סיה</territory>
-			<territory type="034">דרו� �סיה</territory>
-			<territory type="035">דרו�־מזרח �סיה</territory>
-			<territory type="039">דרו� �ירופה</territory>
-			<territory type="053">�וסטרליה וניו־זילנד</territory>
-			<territory type="054">מלנסיה</territory>
-			<territory type="057">�זור מיקרונזיה</territory>
-			<territory type="061">פולינזיה</territory>
-			<territory type="062">דרו�־מרכז �סיה</territory>
-			<territory type="142">�סיה</territory>
-			<territory type="143">מרכז �סיה</territory>
-			<territory type="145">מערב �סיה</territory>
-			<territory type="150">�ירופה</territory>
-			<territory type="151">מזרח �ירופה</territory>
-			<territory type="154">צפון �ירופה</territory>
-			<territory type="155">מערב �ירופה</territory>
-			<territory type="172">חבר המדינות העצמ�יות</territory>
-			<territory type="419">�מריקה הלטינית והקריביי�</territory>
-			<territory type="830">�יי התעלה</territory>
-			<territory type="AD">�נדורה</territory>
-			<territory type="AE">�יחוד ה�מירויות הערביות</territory>
-			<territory type="AF">�פגניסטן</territory>
-			<territory type="AG">�נטיגו�ה וברבודה</territory>
-			<territory type="AI">�נגילה</territory>
-			<territory type="AL">�לבניה</territory>
-			<territory type="AM">�רמניה</territory>
-			<territory type="AN">�נטילי� הולנדיי�</territory>
-			<territory type="AO">�נגולה</territory>
-			<territory type="AQ">�נט�רקטיקה</territory>
-			<territory type="AR">�רגנטינה</territory>
-			<territory type="AS">סמו�ה ה�מריקנית</territory>
-			<territory type="AT">�וסטריה</territory>
-			<territory type="AU">�וסטרליה</territory>
-			<territory type="AW">�רובה</territory>
-			<territory type="AX">�יי �לנד</territory>
-			<territory type="AZ">�זרביג'ן</territory>
-			<territory type="BA">בוסניה והרצגובינה</territory>
-			<territory type="BB">ברבדוס</territory>
-			<territory type="BD">בנגלדש</territory>
-			<territory type="BE">בלגיה</territory>
-			<territory type="BF">בורקינה פ�סו</territory>
-			<territory type="BG">בולגריה</territory>
-			<territory type="BH">בחריין</territory>
-			<territory type="BI">בורונדי</territory>
-			<territory type="BJ">בנין</territory>
-			<territory type="BL">סנט ברתולומי�ו</territory>
-			<territory type="BM">ברמודה</territory>
-			<territory type="BN">ברוניי</territory>
-			<territory type="BO">בוליביה</territory>
-			<territory type="BR">ברזיל</territory>
-			<territory type="BS">�יי בה�מה</territory>
-			<territory type="BT">בהוטן</territory>
-			<territory type="BV">�יי בובה</territory>
-			<territory type="BW">בוטסוו�נה</territory>
-			<territory type="BY">בל�רוס</territory>
-			<territory type="BZ">בליז</territory>
-			<territory type="CA">קנדה</territory>
-			<territory type="CC">�יי קוקוס</territory>
-			<territory type="CD">קונגו - קינש�סה</territory>
-			<territory type="CF">הרפובליקה של מרכז �פריקה</territory>
-			<territory type="CG">קונגו - ברז�ויל</territory>
-			<territory type="CH">שווייץ</territory>
-			<territory type="CI">חוף השנהב</territory>
-			<territory type="CK">�יי קוק</territory>
-			<territory type="CL">צ׳ילה</territory>
-			<territory type="CM">קמרון</territory>
-			<territory type="CN">סין</territory>
-			<territory type="CO">קולומביה</territory>
-			<territory type="CR">קוסטה ריקה</territory>
-			<territory type="CS">סרביה ומונטנגרו</territory>
-			<territory type="CU">קובה</territory>
-			<territory type="CV">כף ורדה</territory>
-			<territory type="CX">�יי כריסטמס</territory>
-			<territory type="CY">קפריסין</territory>
-			<territory type="CZ">צ׳כיה</territory>
-			<territory type="DE">גרמניה</territory>
-			<territory type="DJ">ג׳יבוטי</territory>
-			<territory type="DK">דנמרק</territory>
-			<territory type="DM">דומיניקה</territory>
-			<territory type="DO">הרפובליקה הדומיניקנית</territory>
-			<territory type="DZ">�לג׳יריה</territory>
-			<territory type="EC">�קוודור</territory>
-			<territory type="EE">�סטוניה</territory>
-			<territory type="EG">מצרי�</territory>
-			<territory type="EH">סהרה המערבית</territory>
-			<territory type="ER">�ריתר�ה</territory>
-			<territory type="ES">ספרד</territory>
-			<territory type="ET">�תיופיה</territory>
-			<territory type="FI">פינלנד</territory>
-			<territory type="FJ">פיג׳י</territory>
-			<territory type="FK">�יי פוקלנד</territory>
-			<territory type="FM">מיקרונזיה</territory>
-			<territory type="FO">�יי פ�רו</territory>
-			<territory type="FR">צרפת</territory>
-			<territory type="GA">ג�בון</territory>
-			<territory type="GB">בריטניה</territory>
-			<territory type="GD">גרנדה</territory>
-			<territory type="GE">ג�ורגיה</territory>
-			<territory type="GF">גי�נה הצרפתית</territory>
-			<territory type="GG">גרנסי</territory>
-			<territory type="GH">ג�נה</territory>
-			<territory type="GI">גיברלטר</territory>
-			<territory type="GL">גרינלנד</territory>
-			<territory type="GM">גמביה</territory>
-			<territory type="GN">גיני�ה</territory>
-			<territory type="GP">גוו�דלופ</territory>
-			<territory type="GQ">גיני�ה המשוונית</territory>
-			<territory type="GR">יוון</territory>
-			<territory type="GS">ג׳ורג׳יה הדרומית ו�יי סנדוויץ׳ הדרומיי�</territory>
-			<territory type="GT">גו�טמלה</territory>
-			<territory type="GU">גו��</territory>
-			<territory type="GW">גיני�ה-ביס�ו</territory>
-			<territory type="GY">גי�נה</territory>
-			<territory type="HK">הונג קונג (מחוז מנהלי מיוחד של סין)</territory>
-			<territory type="HM">�יי הרד ו�יי מקדונלנד</territory>
-			<territory type="HN">הונדורס</territory>
-			<territory type="HR">קרו�טיה</territory>
-			<territory type="HT">ה�יטי</territory>
-			<territory type="HU">הונגריה</territory>
-			<territory type="ID">�ינדונזיה</territory>
-			<territory type="IE">�ירלנד</territory>
-			<territory type="IL">ישר�ל</territory>
-			<territory type="IM">ה�י מ�ן</territory>
-			<territory type="IN">הודו</territory>
-			<territory type="IO">טריטוריה בריטית ב�וקי�נוס ההודי</territory>
-			<territory type="IQ">עיר�ק</territory>
-			<territory type="IR">�יר�ן</territory>
-			<territory type="IS">�יסלנד</territory>
-			<territory type="IT">�יטליה</territory>
-			<territory type="JE">ג'רסי</territory>
-			<territory type="JM">ג׳מייקה</territory>
-			<territory type="JO">ירדן</territory>
-			<territory type="JP">יפן</territory>
-			<territory type="KE">קניה</territory>
-			<territory type="KG">קירגיזסטן</territory>
-			<territory type="KH">קמבודיה</territory>
-			<territory type="KI">קיריב�טי</territory>
-			<territory type="KM">קומורוס</territory>
-			<territory type="KN">סנט קיטס ונוויס</territory>
-			<territory type="KP">צפון קורי�ה</territory>
-			<territory type="KR">דרו� קורי�ה</territory>
-			<territory type="KW">כווית</territory>
-			<territory type="KY">�יי קיימן</territory>
-			<territory type="KZ">קזחסטן</territory>
-			<territory type="LA">ל�וס</territory>
-			<territory type="LB">לבנון</territory>
-			<territory type="LC">סנט לוסיה</territory>
-			<territory type="LI">ליכטנשטיין</territory>
-			<territory type="LK">סרי לנקה</territory>
-			<territory type="LR">ליבריה</territory>
-			<territory type="LS">לסוטו</territory>
-			<territory type="LT">ליט�</territory>
-			<territory type="LU">לוקסמבורג</territory>
-			<territory type="LV">לטביה</territory>
-			<territory type="LY">לוב</territory>
-			<territory type="MA">מרוקו</territory>
-			<territory type="MC">מונקו</territory>
-			<territory type="MD">מולדובה</territory>
-			<territory type="ME">מונטנגרו</territory>
-			<territory type="MF">סנט מרטין</territory>
-			<territory type="MG">מדגסקר</territory>
-			<territory type="MH">�יי מרשל</territory>
-			<territory type="MK">מקדוניה</territory>
-			<territory type="ML">מ�לי</territory>
-			<territory type="MM">מיי�נמ�ר</territory>
-			<territory type="MN">מונגוליה</territory>
-			<territory type="MO">מק�ו (מחוז מנהלי מיוחד של סין)</territory>
-			<territory type="MP">�יי מרי�נה הצפוניי�</territory>
-			<territory type="MQ">מרטיניק</territory>
-			<territory type="MR">מ�וריטניה</territory>
-			<territory type="MS">מונסר�ט</territory>
-			<territory type="MT">מלטה</territory>
-			<territory type="MU">מ�וריציוס</territory>
-			<territory type="MV">מלדיבי�</territory>
-			<territory type="MW">מל�ווי</territory>
-			<territory type="MX">מקסיקו</territory>
-			<territory type="MY">מלזיה</territory>
-			<territory type="MZ">מוזמביק</territory>
-			<territory type="NA">נמיביה</territory>
-			<territory type="NC">קלדוניה החדשה</territory>
-			<territory type="NE">ניז׳ר</territory>
-			<territory type="NF">�יי נורפוק</territory>
-			<territory type="NG">ניגריה</territory>
-			<territory type="NI">ניקרגו�ה</territory>
-			<territory type="NL">הולנד</territory>
-			<territory type="NO">נורווגיה</territory>
-			<territory type="NP">נפ�ל</territory>
-			<territory type="NR">נ�ורו</territory>
-			<territory type="NU">ניווה</territory>
-			<territory type="NZ">ניו זילנד</territory>
-			<territory type="OM">עומ�ן</territory>
-			<territory type="PA">פנמה</territory>
-			<territory type="PE">פרו</territory>
-			<territory type="PF">פולינזיה הצרפתית</territory>
-			<territory type="PG">פפו�ה גיני�ה החדשה</territory>
-			<territory type="PH">פיליפיני�</territory>
-			<territory type="PK">פקיסטן</territory>
-			<territory type="PL">פולין</territory>
-			<territory type="PM">סנט פייר ומיקלון</territory>
-			<territory type="PN">פיטקרן</territory>
-			<territory type="PR">פורטו ריקו</territory>
-			<territory type="PS">הרשות הפלסטינית</territory>
-			<territory type="PT">פורטוגל</territory>
-			<territory type="PW">פ�ל�ו</territory>
-			<territory type="PY">פרגוו�י</territory>
-			<territory type="QA">קט�ר</territory>
-			<territory type="QU">ה�יחוד ה�ירופי</territory>
-			<territory type="RE">ר�וניון</territory>
-			<territory type="RO">רומניה</territory>
-			<territory type="RS">סרביה</territory>
-			<territory type="RU">רוסיה</territory>
-			<territory type="RW">רו�נדה</territory>
-			<territory type="SA">ערב הסעודית</territory>
-			<territory type="SB">�יי שלמה</territory>
-			<territory type="SC">�יי סיישל</territory>
-			<territory type="SD">סודן</territory>
-			<territory type="SE">שוודיה</territory>
-			<territory type="SG">סינגפור</territory>
-			<territory type="SH">סנט הלנה</territory>
-			<territory type="SI">סלובניה</territory>
-			<territory type="SJ">סוולב�רד וז׳�ן מ�יין</territory>
-			<territory type="SK">סלובקיה</territory>
-			<territory type="SL">סיירה ל�ונה</territory>
-			<territory type="SM">סן מרינו</territory>
-			<territory type="SN">סנגל</territory>
-			<territory type="SO">סומליה</territory>
-			<territory type="SR">סורינ�</territory>
-			<territory type="ST">ס�ו טומה ופרינסיפה</territory>
-			<territory type="SV">�ל סלבדור</territory>
-			<territory type="SY">סוריה</territory>
-			<territory type="SZ">סווזילנד</territory>
-			<territory type="TC">�יי טורקס וק�יקוס</territory>
-			<territory type="TD">צ׳�ד</territory>
-			<territory type="TF">טריטוריות דרומיות של צרפת</territory>
-			<territory type="TG">טוגו</territory>
-			<territory type="TH">ת�ילנד</territory>
-			<territory type="TJ">טג׳יקיסטן</territory>
-			<territory type="TK">טוקל�ו</territory>
-			<territory type="TL">מזרח טימור</territory>
-			<territory type="TM">טורקמניסטן</territory>
-			<territory type="TN">תוניסיה</territory>
-			<territory type="TO">טונגה</territory>
-			<territory type="TR">טורקיה</territory>
-			<territory type="TT">טרינידד וטובגו</territory>
-			<territory type="TV">טובלו</territory>
-			<territory type="TW">טייוו�ן</territory>
-			<territory type="TZ">טנזניה</territory>
-			<territory type="UA">�וקר�ינה</territory>
-			<territory type="UG">�וגנדה</territory>
-			<territory type="UM">�יי� קטני� שלחוף �רצות הברית</territory>
-			<territory type="US">�רצות הברית</territory>
-			<territory type="UY">�ורוגוו�י</territory>
-			<territory type="UZ">�וזבקיסטן</territory>
-			<territory type="VA">הוותיקן</territory>
-			<territory type="VC">סנט וינסנט והגרנדיני�</territory>
-			<territory type="VE">ונצו�לה</territory>
-			<territory type="VG">�יי הבתולה הבריטיי�</territory>
-			<territory type="VI">�יי הבתולה ה�מריקניי�</territory>
-			<territory type="VN">וייטנ��</territory>
-			<territory type="VU">ונו�טו</territory>
-			<territory type="WF">�יי ווליס ופוטונה</territory>
-			<territory type="WS">סמו�ה</territory>
-			<territory type="YE">תימן</territory>
-			<territory type="YT">מ�יוט</territory>
-			<territory type="ZA">דרו� �פריקה</territory>
-			<territory type="ZM">זמביה</territory>
-			<territory type="ZW">זימב�בווה</territory>
-			<territory type="ZZ">�זור ל� ידוע �ו ל� תקין</territory>
-		</territories>
-		<variants>
-			<variant type="1901">כתיב גרמני מסורתי</variant>
-			<variant type="AREVELA">מזרח �רמנית</variant>
-			<variant type="AREVMDA">מערב �רמנית</variant>
-			<variant type="MONOTON">מונוטונית</variant>
-			<variant type="POSIX">מחשב</variant>
-		</variants>
-		<keys>
-			<key type="calendar">לוח שנה</key>
-			<key type="collation">מיון</key>
-			<key type="currency">מטבע</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">מיון סינית מסורתית</type>
-			<type type="buddhist" key="calendar">לוח שנה בודהיסטי</type>
-			<type type="chinese" key="calendar">לוח שנה סיני</type>
-			<type type="direct" key="collation">מיון ישיר</type>
-			<type type="gb2312han" key="collation">מיון סינית מודרנית</type>
-			<type type="gregorian" key="calendar">לוח שנה גרגורי�ני</type>
-			<type type="hebrew" key="calendar">לוח שנה עברי</type>
-			<type type="islamic" key="calendar">לוח שנה מוסלמי</type>
-			<type type="islamic-civil" key="calendar">לוח שנה מוסלמי-�זרחי</type>
-			<type type="japanese" key="calendar">לוח שנה יפני</type>
-			<type type="phonebook" key="collation">מיון ספר טלפוני�</type>
-			<type type="pinyin" key="collation">מיון פיניין</type>
-			<type type="traditional" key="collation">מיון מסורתי</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">מטרי</measurementSystemName>
-			<measurementSystemName type="US">�רה&quot;ב</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[�-י כ ך ל מ � נ ן ס ע פ ף צ ץ ק-ת]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u05BD \u05C4\u200E \u200F \u05B0-\u05B9 \u05BB \u05C2 \u05C1 \u05BC \u05BF ־ ׳ ״ a-z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ינו</month>
-							<month type="2">פבר</month>
-							<month type="3">מרס</month>
-							<month type="4">�פר</month>
-							<month type="5">מ�י</month>
-							<month type="6">יונ</month>
-							<month type="7">יול</month>
-							<month type="8">�וג</month>
-							<month type="9">ספט</month>
-							<month type="10">�וק</month>
-							<month type="11">נוב</month>
-							<month type="12">דצמ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ינו�ר</month>
-							<month type="2">פברו�ר</month>
-							<month type="3">מרס</month>
-							<month type="4">�פריל</month>
-							<month type="5">מ�י</month>
-							<month type="6">יוני</month>
-							<month type="7">יולי</month>
-							<month type="8">�וגוסט</month>
-							<month type="9">ספטמבר</month>
-							<month type="10">�וקטובר</month>
-							<month type="11">נובמבר</month>
-							<month type="12">דצמבר</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">יו� �'</day>
-							<day type="mon">יו� ב'</day>
-							<day type="tue">יו� ג'</day>
-							<day type="wed">יו� ד'</day>
-							<day type="thu">יו� ה'</day>
-							<day type="fri">יו� ו'</day>
-							<day type="sat">שבת</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">יו� ר�שון</day>
-							<day type="mon">יו� שני</day>
-							<day type="tue">יו� שלישי</day>
-							<day type="wed">יו� רביעי</day>
-							<day type="thu">יו� חמישי</day>
-							<day type="fri">יו� שישי</day>
-							<day type="sat">יו� שבת</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">ב</day>
-							<day type="tue">×’</day>
-							<day type="wed">ד</day>
-							<day type="thu">×”</day>
-							<day type="fri">ו</day>
-							<day type="sat">ש</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">רבעון 1</quarter>
-							<quarter type="2">רבעון 2</quarter>
-							<quarter type="3">רבעון 3</quarter>
-							<quarter type="4">רבעון 4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">רבעון 1</quarter>
-							<quarter type="2">רבעון 2</quarter>
-							<quarter type="3">רבעון 3</quarter>
-							<quarter type="4">רבעון 4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>לפנה&quot;צ</am>
-				<pm>�חה&quot;צ</pm>
-				<eras>
-					<eraNames>
-						<era type="0">לפני הספירה</era>
-						<era type="1">לספירה</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">לפנה״ס</era>
-						<era type="1">לסה״נ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d בMMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d בMMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d בMMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">EEEE dd/MM - EEEE dd/MM</greatestDifference>
-							<greatestDifference id="M">EEEE dd/MM - EEEE dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">EEEE d MMM - EEEE d MMM</greatestDifference>
-							<greatestDifference id="M">EEEE d MMM - EEEE d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">EEEE dd/MM/yy - EEEE dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">EEEE dd/MM/yy - EEEE dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">EEEE dd/MM/yy - EEEE dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">EEEE d MMM - EEEE d MMM y</greatestDifference>
-							<greatestDifference id="M">EEEE d MMM - EEEE d MMM y</greatestDifference>
-							<greatestDifference id="y">EEEE d MMM y - EEEE d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>תקופה</displayName>
-					</field>
-					<field type="year">
-						<displayName>שנה</displayName>
-					</field>
-					<field type="month">
-						<displayName>חודש</displayName>
-					</field>
-					<field type="week">
-						<displayName>שבוע</displayName>
-					</field>
-					<field type="day">
-						<displayName>יו�</displayName>
-						<relative type="-3">לפני שלושה ימי�</relative>
-						<relative type="-2">שלשו�</relative>
-						<relative type="-1">�תמול</relative>
-						<relative type="0">היו�</relative>
-						<relative type="1">מחר</relative>
-						<relative type="2">מחרתיי�</relative>
-						<relative type="3">בעוד שלושה ימי�</relative>
-					</field>
-					<field type="weekday">
-						<displayName>יו� בשבוע</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>שעה</displayName>
-					</field>
-					<field type="minute">
-						<displayName>דקה</displayName>
-					</field>
-					<field type="second">
-						<displayName>שנייה</displayName>
-					</field>
-					<field type="zone">
-						<displayName>�זור</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">תשרי</month>
-							<month type="2">חשון</month>
-							<month type="3">כסלו</month>
-							<month type="4">טבת</month>
-							<month type="5">שבט</month>
-							<month type="6">�דר �'</month>
-							<month type="7">�דר</month>
-							<month type="8">ניסן</month>
-							<month type="9">�ייר</month>
-							<month type="10">סיון</month>
-							<month type="11">תמוז</month>
-							<month type="12">�ב</month>
-							<month type="13">�לול</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">תשרי</month>
-							<month type="2">חשון</month>
-							<month type="3">כסלו</month>
-							<month type="4">טבת</month>
-							<month type="5">שבט</month>
-							<month type="6">�דר �'</month>
-							<month type="7">�דר</month>
-							<month type="8">ניסן</month>
-							<month type="9">�ייר</month>
-							<month type="10">סיון</month>
-							<month type="11">תמוז</month>
-							<month type="12">�ב</month>
-							<month type="13">�לול</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>לפנה&quot;צ</am>
-				<pm>�חה&quot;צ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">לבה&quot;ע</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern numbers="hebr">EEEE, d בMMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern numbers="hebr">d בMMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern numbers="hebr">dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern numbers="hebr">dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMMEd">E, d בMMMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">מוחר�</month>
-							<month type="2">ספר</month>
-							<month type="3">רביע �ל-�וו�ל</month>
-							<month type="4">רביע �ל-תני</month>
-							<month type="5">ג׳ומדה �ל-�וו�ל</month>
-							<month type="6">ג׳ומדה �ל-תני</month>
-							<month type="7">רג׳�ב</month>
-							<month type="8">שעב�ן</month>
-							<month type="9">ר�מדן</month>
-							<month type="10">שוו�ל</month>
-							<month type="11">זו �ל-QI'DAH</month>
-							<month type="12">זו �ל-חיג׳ה</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">שנת היג׳רה</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="japanese">
-				<eras>
-					<eraAbbr>
-						<era type="0">ט�יקה</era>
-						<era type="24">נינג'ו</era>
-						<era type="73">שוטוקו</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>שעון {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ל� ידוע</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>�נדורה</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>דוב�י</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>ק�בול</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�נטיגו�ה</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�נגווילה</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>טירנה</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>ירב�ן</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>קורס�ו</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>לו�נדה</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>רות'רה</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>�מריקה/פ�למר</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>הקוטב הדרומי</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>שויה</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>מ�וסון</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>דייויס</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ווסטוק</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>ק�סיי</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>דומון ד'�ורווי</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>מקמרדו</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>�מריקה/מנדוזה</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>�מריקה/�רגנטינה/ס�ן-חו�ן</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>�מריקה/קורדובה</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>בו�נוס �יירס</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>פ�גו פ�גו</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>וינה</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>�וסטרליה/פרת'</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>�וסטרליה/דרווין</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�דלייד</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>�וסטרליה/ברוקן-היל</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>�וסטרליה/מלבורן</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>�וסטרליה/הוברט</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>�וסטרליה/סידני</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>�וסטרליה/בריסבן</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�רובה</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>ב�קו</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>ברבדוס</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>ד�קה</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>בריסל</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>ו�ג�דוגו</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>סופיה</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>בהרין</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>בוג'ומבורה</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>פורטו-נובו</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>ברמודה</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>ברוניי</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>לה פ�ז</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>רי�ו ברנצ'ו</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>פורטו וולהו</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>בו�ה ויסטה</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>מנ�וס</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>קוי�בה</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>קמפו גרנדה</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>בל�</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�ר�גו�ינה</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>�מריקה/ס�ן-פ�ולו</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>�מריקה/בהי�ה</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>פורט�לזה</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>מ�סיו</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>רסיפה</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>נורונהה</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>נס�ו</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>טימפו</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>ג�בורונה</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>מינסק</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>בליז</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>�מריקה/ונקובר</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>�מריקה/דוסון-קריק</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>�מריקה/�דמנטון</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>�מריקה/וויניפוג</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>�מריקה/טורנטו</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>�מריקה/מונטרי�ול</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>�מריקה/הליפקס</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>קוקוס</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>קינשסה</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>לובומב�שי</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>בנגו�י</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>בר�ז�ווייל</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>ציריך</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>�בידג'ן</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>ר�רוטונגה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>�יי הפסח�</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>�מריקה/סנטי�גו</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>דו�לה</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>�סיה/שנח�י</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>בוגוטה</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>קוסטה ריקה</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>הוו�נה</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>קייפ ורדה</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>�יי חג המולד</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>ניקוסיה</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>ברלין</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>ג'יב�וטי</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>קופנהגן</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>דומיניקה</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>סנטו דומינגו</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�לג'יר</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>פסיפי/גל�פגוס</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>גוויקיל</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>ט�לין</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>קהיר</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>�ל עיון</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>�סמרה</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>�טלנטי/קנרי</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>ס�וטה</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>�ירופה/מדריד</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�דיס �בבה</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>הלסינקי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>פיג'י</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>סטנלי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>טרוק</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>פונפה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>קוסרה</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>פ�רו</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>פריס</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>ליברווייל</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>�ירופה/לונדון</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>גרנדה</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>טביליסי</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>ק�יין</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�קרה</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>גיברלטר</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>טולה</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>גודת'�ב</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>סקורסביסונד</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>דנמרקסהוון</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>ב�נג'ול</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>קונ�קרי</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>גוו�דלופ</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>מ�ל�בו</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�תונה</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>�יי ג'ורג'יה הדרומית</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>גוו�טמלה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>גו��</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>ביס�ו</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>גוינה</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>הונג קונג</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>פורט �ו פרינס</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>בודפשט</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>�סיה/ג'קרטה</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>מ�ק�ס�ר</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ג'�י�פורה</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>דבלין</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>ירושלי�</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>�יי צ'גוס</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>בגדד</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>טהרן</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>רייקי�וויק</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>רומ�</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>ג'מייקה</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>רבת עמון</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>טוקיו</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>ניירובי</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>בישקק</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>פנו� פן</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�נדרבורי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>קיריטימ�טי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>ט�ר�ווה</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>קומורו</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>סנט קיטס</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>צפון קורי�ה</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>דרו� קורי�ה</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>כווית</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>קיימן</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�קט�ו</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>�סיה/�ורל</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�קטובה</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�למ�טי</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>וינטי�ן</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>ביירות</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>סנט לוצ'יה</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>ו�דוז</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>קולומבו</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>מונרוביה</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>מ�סרו</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>וילני�וס</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>לוקסמבורג</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>ריגה</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>טריפולי</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>קזבלנקה</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>מונקו</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>קישינב</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�נטננרבינו</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>מ�ג'ורו</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>ב�מ�קו</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>ר�נגון</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>חובד</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>�ול��נבט�ר</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>צ'ו�יבלס�ן</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>מק�ו</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>ס�יפ�ן</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>מרטיניק</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>נוקשוט</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>מונטסר�ט</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>מ�לטה</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>מ�וריטיוס</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>מולדוביה</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>בלנטיר</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>�מריקה/מזטלן</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>�מריקה/מונטריי</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>�מריקה/מקסיקו סיטי</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>�מריקה/קנקון</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>קו�לה לומפור</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>מ�פוטו</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>ווינדהוק</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>נומ�ה</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>ני�מיי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�יי נורפוק</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>ל�גוס</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>מנ�גו�ה</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�מסטרד�</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>�וסלו</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>קטמנדו</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>נ�ורו</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>ניווה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>פסיפי/�וקלנד</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>מוסקט</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>פנמה</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>לימה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>פסיפי/טהיטי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>�יי מרקיז</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>�יי גמביר</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>פורט מורנסבי</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>מנילה</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>ק�ר�צ'י</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>ורשה</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>מיקלון</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>פיטקרן</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>פו�רטו ריקו</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>×¢×–×”</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>ה�יי� ה�זורי�</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>�ירופה/ליסבון</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>פל�ו</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>�סונסיון</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>קתר</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>ריונין</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>בוקרשט</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>�ירופה/מוסקבה</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>�ירופה/סמרה</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>�יה/�ומסק</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�סיה/נובוסיבירסק</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>קיג�לי</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>רי�ד</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>גו�דלקנל</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>מ�הה</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>חרטו�</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>שטוקהול�</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>סינגפור</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>סנט הלנה</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>פריט�ון</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>ד�ק�ר</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>מוגדישו</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>פרמ�ריבו</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>ס�ו טומה</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>סלבדור</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>דמשק</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>מב�ב�נה</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>גרנד טורק</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>נג'מנה</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>קרגו�לן</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>לומה</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>בנקוק</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>דושנבה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>פ�ק�ופו</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>דילי</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>�שחב�ד</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>תוניסיה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>טונגט�פו</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>�יסטנבול</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>נמל ספרד</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>פונ�פוטי</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>טייפה</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>ד�ר �-ס�ל�</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>�ירופה/קייב</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>קמפלה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>מידוויי</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ג'ונסטון</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>וו�ק</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>פסיפי/הונולולו</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>זמן �לסקה</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>�מריקה/לוס-�נג'לס</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>�מריקה/פיניקס</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>�מריקה/שיפרוק</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>�מריקה/דנוור</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>�מריקה/צפון דקוטה/מרכז</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>�מריקה/שיקגו</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>�ינדי�נפוליס</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>�מריקה/לו�יסוויל</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>�מריקה/דטרויט</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�מריקה/ניו-יורק</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>מונטוויד�ו</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>�סיה/סמרקנד</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>�סיה/טשקנט</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>סנט וינסנט</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>ק�ר�ק�ס</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>טורטולה</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>סנט תומ�ס</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>סייגון</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>�פטה</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>ו�ליס</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�פיה</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>עדן</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>מ�יוט</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>יוהנסבורג</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>לוס�קה</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>הררה</exemplarCity>
-			</zone>
-			<metazone type="India">
-				<short>
-					<standard>IST (הודו)</standard>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>שעון ישר�ל</generic>
-				</long>
-				<short>
-					<standard>IST</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>פזטה �נדורית</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>דירה� של �יחוד הנסיכויות הערביות</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�פגני �פגני</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>לק �לבני</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>דר�� �רמני</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>גילדן של ה�נטילי� ההולנדיי�</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>קו�נזה �נגולי</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>קו�נזה חדש �נגולי (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>קו�נזה רג׳וסטדו �נגולי (1995-1999)</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>פזו �רגנטינ�י (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>פזו �רגנטינ�י</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>שילינג �וסטרי</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>דולר �וסטרלי</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>פלורין של �רובה</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>מנ�ט �זרביג׳�ני (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>מ�נ�ט �זרביג׳ני</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>דינר של בוסניה־הרצגובינה</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>מ�רק בר המרה של בוסניה־הרצגובינה</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>דולר ברבדי�ני</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>ט�קה בנגלדשי</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>פרנק בלגי (בר המרה)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>פרנק בלגי</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>לב בולגרי ישן</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>לב בולגרי</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>דינר בחרייני</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>פרנק בורונדי</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>דולר ברמודה</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>דולר ברוניי</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>בוליבי�נו</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>פזו בוליבי</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>קרוזי�רו חדש ברזיל�י (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>קרוזדו ברזיל�י</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>רי�ל ברזיל�י</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>דולר בה�מי</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>נגולטרו� בהוטני</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>פולה בוצוו�ני</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>דולר בליזי</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>דולר קנדי</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>פרנק קונגולזי</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>פרנק שוויצרי</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>פזו צ'יל�ני</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>יו�ן רנמינבי סיני</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>פזו קולומבי�ני</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>קולון קוסטה־ריקני</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>דינר סרבי ישן</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>קורונה צ׳כית</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>פזו קובני</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>לירה קפריס�ית</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>קורונה צ'כית</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>מרק מזרח גרמני</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>מרק גרמני</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>פרנק ג׳יבוטי</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>כתר דני</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>פזו דומיניקני</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>דינר �לג׳ירי</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>סוקר �קו�דורי</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>קרון �סטוני</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>לירה מיצרית</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>נ�קפה �ריתר�י</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>פזטה [ESA]</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>פזטה [ESB]</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>פסטה ספרדי</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>ביר �תיופי</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>�ירו</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>מרק פיני</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>דולר פיג'י</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>לירה של �יי פוקלנד</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>פרנק צרפתי</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>לירה שטרלינג</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>לרי ג�ורגי</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>פ�ונד גיברלטר</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>דל�סי גמבי</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>פרנק גינ�י</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>דרכמה</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>קצל גו�טמלי</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>פזו גינ�י</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>דולר גי�ני</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>דולר הונג קונגי</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>למפירה הונדורי</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>קונה קרו�טי</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>ג�רד ה�יטי</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>פורינט הונגרי</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>רופיה �ינדונזית</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>לירה �ירית</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>לירה ישר�לית</displayName>
-				<symbol>ל״י</symbol>
-			</currency>
-			<currency type="ILS">
-				<displayName>ש&quot;ח</displayName>
-				<displayName count="other">שקלי� חדשי�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>רופי הודית</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>דינר עירקי</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>רי�ל �יר�ני</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>קרונה �יסלנדית</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>לירה �יטלקית</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>דולר ג'מ�יקני</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>דינר ירדני</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ין יפני</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>שילינג קניי�תי</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>סו� קירגיזי</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>ריל קמבודי</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>פרנק קומורו�י</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>וון צפון קור�ני</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>וון דרו� קור�ני</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>דינר כוויתי</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>דולר קיימ�ני</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>טנגה קזחסטני</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>קיפ ל�י</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>לירה לבנונית</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>רופי סרי לנקי</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>דולר ליברי</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>לוטי לסותי</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>ליט� ליט�י</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>פרנק לוקסמבורגי</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>לט לטבי</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>דינר לובי</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>דירה� מרוק�י</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>פרנק מרוק�י</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>לי�ו מולדובני</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>פרנק מדגסק�רי</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>קי�ט מי�נמרי</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>טוגרוג</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>פטקה</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>לירה מלטית</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>רופי מ�וריציני</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>רופיה מלדיבית</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>קו�צ׳ה מל�וי</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>פזו מקסיקני</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>פזו מקסיקני (1861 - 1992)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>רינגיט מלזי</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>מטיקל</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>דולר נמיבי</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>נ�ירה ניגרי</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>קורדובה ניקר�גי</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>גילדן הולנדי</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>כתר נורבגי</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>רופי נפ�לי</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>דולר ניו זילנדי</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>בלבו�ה פנמי</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>סול פרו�ני חדש</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>קינה של פפו�ה גינ�ה החדשה</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>פזו פיליפיני</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>רופי פקיסטני</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>זלוטי פולני</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>זלוטי (1950 - 1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>�סקודו פורטוגלי</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>גוורני פר�גוו�י</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>רי�ל קט�רי</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>ל�ו רומני ישן</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>ל�ו רומני חדש</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>דינר סרבי</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>רובל</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>רובל רוסי (1991 - 1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>פרנק רו�נדי</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>רי�ל סעודי</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>דולר �יי שלמה</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>רופי סיישלי</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>דינר סודני</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>לירה סודנית</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>כתר שוודי</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>דולר סינגפורי</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>פ�ונד סנט הלני</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>טול�ר סלובני</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>קורונה סלובקי</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>לי�ון סיירה ל�וני</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>שילינג סומ�לי</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>דולר סורינ�מי</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>גילדר סורינ�מי</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>דוברה של סן טומה ופרינסיפה</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>רובל סובייטי</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>לירה סורית</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>לילנגני סווזי</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>בהט ת�ילנדי</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>סומוני טג'קיסטני</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>מנ�ט טורקמ�ני</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>דינר טוניס�י</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>פ��מגה טונגי</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>�סקודו טימור�י</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>לירה טורקית</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>לירה טורקית חדשה</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>דולר טרינידדי</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>דולר ט�ייוני חדש</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>שילינג טנזני</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>גריבנה �וקר�יני</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>שילינג �וגנדי (1966 - 1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>שילינג �וגנדי</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>דולר �מריק�י</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>דולר �מריק�י (היו� הב�)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>דולר �מריק�י (היו� הזה)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>פזו �ורוגוו�י</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>סו� �וזבקי</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>בוליבר ונצו�לי</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>דונג וייטנ�מי</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>ו�טו של ונו�טו</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>ט�לה סמו�י</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>פרנק CFA</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>כסף</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>זהב</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>דולר מזרח קריבי</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>זכויות משיכה מיוחדות</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>פרנק זהב</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>פלדיו�</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>פלטינה</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>סימון למטרות בדיקה</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>סימון &quot;לל� מטבע&quot;</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>דינר תימני</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>רי�ל תימני</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>דינר יגוסלבי חדש</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>דינר יגוסלבי</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>ר�נד דרו� �פריק�י (כספי)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>ר�נד דרו� �פריק�י</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>קוו�צ'ה זמבית</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>ז�יר חדש</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>דולר זימבבו�י</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} יו�</unitPattern>
-			<unitPattern count="other">{0} ימי�</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} שעה</unitPattern>
-			<unitPattern count="other">{0} שעות</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} דקה</unitPattern>
-			<unitPattern count="other">{0} דקות</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} חודש</unitPattern>
-			<unitPattern count="other">{0} חודשי�</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} שניה</unitPattern>
-			<unitPattern count="other">{0} שניות</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} שבוע</unitPattern>
-			<unitPattern count="other">{0} שבועות</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} שנה</unitPattern>
-			<unitPattern count="other">{0} שני�</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>כן:כ</yesstr>
-			<nostr>ל�:ל</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/he_IL.xml b/airtime_mvc/library/Zend/Locale/Data/he_IL.xml
deleted file mode 100644
index 505430c4e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/he_IL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="he"/>
-		<territory type="IL"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/hi.xml b/airtime_mvc/library/Zend/Locale/Data/hi.xml
deleted file mode 100644
index 9b4a46f59..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hi.xml
+++ /dev/null
@@ -1,3343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.107 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="hi"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">अफ़ार</language>
-			<language type="ab">अब�खाज़ियन�</language>
-			<language type="ace">अचाइनीस</language>
-			<language type="ach">अकोली</language>
-			<language type="ada">अदान�गमे</language>
-			<language type="ady">अदिघे</language>
-			<language type="ae">अवेस�तन</language>
-			<language type="af">अफ�रीकी</language>
-			<language type="afa">अफ�रो-�शियाई भाषा��</language>
-			<language type="afh">अफ�रिहिली</language>
-			<language type="ain">�नू</language>
-			<language type="ak">अकन</language>
-			<language type="akk">अक�केदिअन</language>
-			<language type="ale">अलेउत</language>
-			<language type="alg">�ल�गोनक�य�इअन भाषा</language>
-			<language type="alt">दक�षिणी अल�ताई</language>
-			<language type="am">अम�हारिक�</language>
-			<language type="an">अर�गोनी</language>
-			<language type="ang">प�रानी अंग�रेज़ी</language>
-			<language type="anp">अंगिका</language>
-			<language type="apa">अपाचे भाषा</language>
-			<language type="ar">अरबी</language>
-			<language type="arc">�रेमेक</language>
-			<language type="arn">�रोकैनियन</language>
-			<language type="arp">अराफाओ</language>
-			<language type="art">कृत�रिम भाषा</language>
-			<language type="arw">अरावक</language>
-			<language type="as">असामी</language>
-			<language type="ast">अस�त�रियन</language>
-			<language type="ath">अथापास�कान भाषा</language>
-			<language type="aus">आस�ट�रेलियाई भाषा</language>
-			<language type="av">अवेरिक</language>
-			<language type="awa">अवधी</language>
-			<language type="ay">आयमारा</language>
-			<language type="az">अज़रबैंजानी</language>
-			<language type="ba">बशख़िर</language>
-			<language type="bad">बांदा</language>
-			<language type="bai">बमिलेके भाषा</language>
-			<language type="bal">बलूची</language>
-			<language type="ban">बालिनीस</language>
-			<language type="bas">बसा</language>
-			<language type="bat">बाल�टिक भाषा</language>
-			<language type="be">बैलोरूशियन�</language>
-			<language type="bej">बेजा</language>
-			<language type="bem">बेम�बा</language>
-			<language type="ber">बरबर</language>
-			<language type="bg">बल�गेरियाई</language>
-			<language type="bh">बिहारी</language>
-			<language type="bho">भोजप�री</language>
-			<language type="bi">बिस�लामा</language>
-			<language type="bik">बिकोल</language>
-			<language type="bin">बिनी</language>
-			<language type="bla">सिक�सिका</language>
-			<language type="bm">बाम�बारा</language>
-			<language type="bn">ब�गाली</language>
-			<language type="bnt">बन�त�</language>
-			<language type="bo">तिब�बती</language>
-			<language type="br">ब�रेटन</language>
-			<language type="bra">ब�रज</language>
-			<language type="bs">बोस�नियाई</language>
-			<language type="btk">बताक</language>
-			<language type="bua">ब�रियात</language>
-			<language type="bug">बगिनीस</language>
-			<language type="byn">ब�लिन</language>
-			<language type="ca">कातालान</language>
-			<language type="cad">कैड�डो</language>
-			<language type="cai">मध�य अमेरिकी इंडियन भाषा</language>
-			<language type="car">कैरिब</language>
-			<language type="cau">कॉकेशियन भाषा</language>
-			<language type="cch">अत�सम</language>
-			<language type="ce">चेचन</language>
-			<language type="ceb">सिब�आनो</language>
-			<language type="cel">केल�टिक भाषा</language>
-			<language type="ch">कमोरो</language>
-			<language type="chb">चिब�चा</language>
-			<language type="chg">छगाताई</language>
-			<language type="chk">चूकीस</language>
-			<language type="chm">मारी</language>
-			<language type="chn">चिनूक जारगॉन</language>
-			<language type="cho">चोक�तौ</language>
-			<language type="chp">शिपेव�यान</language>
-			<language type="chr">शेरूकी</language>
-			<language type="chy">शेयेन�न</language>
-			<language type="cmc">शैमिक भाषा</language>
-			<language type="co">कोर�सीकन</language>
-			<language type="cop">कॉप�टिक</language>
-			<language type="cpe">अंग�रेजी आधारित क�रेओल या पिजिन</language>
-			<language type="cpf">फ�रेंच आधारित क�रेओल या पिजिन</language>
-			<language type="cpp">प�र�तगाली आधारित क�रेओल या पिजिन</language>
-			<language type="cr">क�री</language>
-			<language type="crh">क�रीमीन त�र�की</language>
-			<language type="crp">क�रेओल या पिजिन</language>
-			<language type="cs">चेक</language>
-			<language type="csb">काश�बियन</language>
-			<language type="cu">चर�च साल�विक</language>
-			<language type="cus">क�शितिक भाषा</language>
-			<language type="cv">चूवाश</language>
-			<language type="cy">वेल�श</language>
-			<language type="da">डैनीश</language>
-			<language type="dak">दाकोता</language>
-			<language type="dar">दार�गवा</language>
-			<language type="day">दायक</language>
-			<language type="de">ज़र�मन</language>
-			<language type="de_AT">जर�मन (ऑस�ट�रिया)</language>
-			<language type="del">डिलैवेयर</language>
-			<language type="den">स�लेव</language>
-			<language type="dgr">डोग�रिब</language>
-			<language type="din">दिन�का</language>
-			<language type="doi">डोग�री</language>
-			<language type="dra">द�रविण भाषा</language>
-			<language type="dsb">निचला सॉर�बियन</language>
-			<language type="dua">द�आला</language>
-			<language type="dum">मध�य प�र�तगाली</language>
-			<language type="dv">दिवेही</language>
-			<language type="dyu">ड�य�ला</language>
-			<language type="dz">ज़ोन�गखा</language>
-			<language type="ee">ईवे</language>
-			<language type="efi">�फिक</language>
-			<language type="egy">प�राचीन मिस�री</language>
-			<language type="eka">�काज�क</language>
-			<language type="el">ग�रीक</language>
-			<language type="elx">�लामाइट</language>
-			<language type="en">अंग�रेजी</language>
-			<language type="en_AU">अंग�रेज़ी (ऑस�ट�रेलिया)</language>
-			<language type="en_CA">अंग�रेज़ी(कनाडाई)</language>
-			<language type="en_GB">अंग�रेजी(ब�रिटिश)</language>
-			<language type="en_US">अंग�रेज़ी अमेरीकी</language>
-			<language type="enm">मिडिल अंग�रजी</language>
-			<language type="eo">�स�पेरान�तो</language>
-			<language type="es">स�पेनिश</language>
-			<language type="es_419">लेटिन अमेरिकी स�पेनिश</language>
-			<language type="es_ES">ईवेरियाई स�पेनिश</language>
-			<language type="et">�स�तोनियन�</language>
-			<language type="eu">बास�क�</language>
-			<language type="ewo">इवोन�डो</language>
-			<language type="fa">पर�शियन�</language>
-			<language type="fan">फैन�ग</language>
-			<language type="fat">फन�टी</language>
-			<language type="ff">फ�लाह</language>
-			<language type="fi">फिनिश</language>
-			<language type="fil">फिलिपिनो</language>
-			<language type="fiu">फिन�नो-उग�रीयन भाषा</language>
-			<language type="fj">फ़ीजी</language>
-			<language type="fo">फिरोज़ी</language>
-			<language type="fon">फॉन</language>
-			<language type="fr">फ�रेंच</language>
-			<language type="fr_CA">फ़�रेंच(कनाडाई)</language>
-			<language type="frm">मिडिल फ�रेंच</language>
-			<language type="fro">प�रानी फ�रांसीसी</language>
-			<language type="frr">उत�तरी फ�रीसीयन</language>
-			<language type="frs">पूर�वी फ�रीसीयन</language>
-			<language type="fur">फ�रीय�लीयान</language>
-			<language type="fy">पश�चिमी फ़�रिसियाई</language>
-			<language type="ga">आयरिश</language>
-			<language type="gaa">गा</language>
-			<language type="gay">गायो</language>
-			<language type="gba">ग�बाया</language>
-			<language type="gd">स�काट�स� गायेलिक�</language>
-			<language type="gem">जर�मनिक भाषा</language>
-			<language type="gez">गीज़</language>
-			<language type="gil">गिल�बरतीस</language>
-			<language type="gl">गैलिशियन�</language>
-			<language type="gmh">मध�यकालीन हाइ जर�मन</language>
-			<language type="gn">ग�आरानी</language>
-			<language type="goh">प�रातन हाइ जर�मन</language>
-			<language type="gon">गा�डी</language>
-			<language type="gor">गोरोन�तालो</language>
-			<language type="got">गॉथिक</language>
-			<language type="grb">ग�रेबो</language>
-			<language type="grc">प�राचीन यूनानी</language>
-			<language type="gsw">स�विस जर�मन</language>
-			<language type="gu">ग�ज़राती</language>
-			<language type="gv">मैंक�स</language>
-			<language type="gwi">ग�विच'इन</language>
-			<language type="ha">होउसा</language>
-			<language type="hai">हैडा</language>
-			<language type="haw">हावाइयन</language>
-			<language type="he">हीब�रू</language>
-			<language type="hi">हिन�दी</language>
-			<language type="hil">हिलिगेनन</language>
-			<language type="him">हिमाचली</language>
-			<language type="hit">हिताइत</language>
-			<language type="hmn">ह�मॉंग</language>
-			<language type="ho">हिरी मोटू</language>
-			<language type="hr">क�रो�शन�</language>
-			<language type="hsb">ऊपरी सॉर�बियन</language>
-			<language type="ht">हैतीयन</language>
-			<language type="hu">हंगेरी</language>
-			<language type="hup">हूपा</language>
-			<language type="hy">अरमेनियन�</language>
-			<language type="hz">हरैरो</language>
-			<language type="ia">ईन�टरलिंग�आ</language>
-			<language type="iba">इबान</language>
-			<language type="id">इन�डोनेशियाई</language>
-			<language type="ie">ईन�टरलिंग�इ</language>
-			<language type="ig">ईग�बो</language>
-			<language type="ii">सिच�आन यी</language>
-			<language type="ijo">इजो</language>
-			<language type="ik">इन�पियाक�</language>
-			<language type="ilo">इलोको</language>
-			<language type="inc">भारतीय भाषा</language>
-			<language type="ine">इंडो-य�रोपीय भाषा</language>
-			<language type="inh">इंग�श</language>
-			<language type="io">इडौ</language>
-			<language type="ira">ईरानी भाषा</language>
-			<language type="iro">इरोक�य�ओइयन भाषा</language>
-			<language type="is">आईस�लैंडिक�</language>
-			<language type="it">इतालवी</language>
-			<language type="iu">इनूकीटूत�</language>
-			<language type="ja">जापानी</language>
-			<language type="jbo">लोज�बान</language>
-			<language type="jpr">ज�देओ-पर�शियन</language>
-			<language type="jrb">ज�देओ-अरेबिक</language>
-			<language type="jv">जावानीस</language>
-			<language type="ka">जॉर�जीयन�</language>
-			<language type="kaa">कारा-कल�पक</language>
-			<language type="kab">कबाइल</language>
-			<language type="kac">काचिन</language>
-			<language type="kaj">ज�ज�</language>
-			<language type="kam">कम�बा</language>
-			<language type="kar">कारेन</language>
-			<language type="kaw">कावी</language>
-			<language type="kbd">कबार�डियन</language>
-			<language type="kcg">त�याप</language>
-			<language type="kfo">कोरो</language>
-			<language type="kg">कोंगो</language>
-			<language type="kha">खासी</language>
-			<language type="khi">खोइसन भाषा</language>
-			<language type="kho">खोतानीस</language>
-			<language type="ki">किक�यू</language>
-			<language type="kj">क�वान�यामा</language>
-			<language type="kk">कज़ाख</language>
-			<language type="kl">ग�रीनलैंडिक</language>
-			<language type="km">कैम�बोडियन�</language>
-			<language type="kmb">किम�बन�द�</language>
-			<language type="kn">कन�नड़</language>
-			<language type="ko">कोरीयन�</language>
-			<language type="kok">कोंकणी</language>
-			<language type="kos">कोसरैन</language>
-			<language type="kpe">क�पेल�लै</language>
-			<language type="kr">कन�री</language>
-			<language type="krc">कराचय-बल�कार</language>
-			<language type="krl">करेलियन</language>
-			<language type="kro">क�र�</language>
-			<language type="kru">क�रूख</language>
-			<language type="ks">कश�मीरी</language>
-			<language type="ku">क�रदीश</language>
-			<language type="kum">क�मीक</language>
-			<language type="kut">क�तेनाई</language>
-			<language type="kv">कोमी</language>
-			<language type="kw">कोर�निश</language>
-			<language type="ky">किरघिज़</language>
-			<language type="la">लैटीन</language>
-			<language type="lad">लादीनो</language>
-			<language type="lah">लाह�न�डा</language>
-			<language type="lam">लाम�बा</language>
-			<language type="lb">लक�ष�ज़ेमबर�गिश</language>
-			<language type="lez">लेज़�घीयन</language>
-			<language type="lg">गांडा</language>
-			<language type="li">लिंबर�गिश</language>
-			<language type="ln">लिंगाला</language>
-			<language type="lo">लाओथीयन�</language>
-			<language type="lol">मोंगो</language>
-			<language type="loz">लोज़ी</language>
-			<language type="lt">लिथ�नियन�</language>
-			<language type="lu">ल�यूबा-कटांगा</language>
-			<language type="lua">ल�यूबा-ल�ल�आ</language>
-			<language type="lui">ल�इसेनो</language>
-			<language type="lun">ल�न�डा</language>
-			<language type="luo">ल�य�ओ</language>
-			<language type="lus">ल�शाई</language>
-			<language type="lv">लातवी</language>
-			<language type="mad">माद�रीस</language>
-			<language type="mag">मगाही</language>
-			<language type="mai">मैथिली</language>
-			<language type="mak">मकासर</language>
-			<language type="man">मन�डिन�गो</language>
-			<language type="map">ऑस�ट�रोनेशियन</language>
-			<language type="mas">मसाई</language>
-			<language type="mdf">मोक�ष</language>
-			<language type="mdr">मंधार</language>
-			<language type="men">मेन�डे</language>
-			<language type="mg">मालागासी</language>
-			<language type="mga">मिडिल आइरिश</language>
-			<language type="mh">मार�शलीज़</language>
-			<language type="mi">मेओरी</language>
-			<language type="mic">मिकमैक</language>
-			<language type="min">मिनांग�काबाउ</language>
-			<language type="mis">विविध भाषा</language>
-			<language type="mk">मैसेडोनियन�</language>
-			<language type="mkh">मॉन-ख�मेर भाषा</language>
-			<language type="ml">मलयालम</language>
-			<language type="mn">मंगोलीयाई</language>
-			<language type="mnc">मन�च�</language>
-			<language type="mni">मणिपूरी</language>
-			<language type="mno">मनोबो भाषा</language>
-			<language type="mo">मोलडावियन�</language>
-			<language type="moh">मोहौक</language>
-			<language type="mos">मोस�सी</language>
-			<language type="mr">मराठी</language>
-			<language type="ms">मलय</language>
-			<language type="mt">मालटिस�</language>
-			<language type="mul">विविध भाषा��</language>
-			<language type="mun">म�न�डा भाषा</language>
-			<language type="mus">क�रीक</language>
-			<language type="mwl">मिरांडी</language>
-			<language type="mwr">मारवाड़ी</language>
-			<language type="my">बर�लिस</language>
-			<language type="myn">माया भाषा</language>
-			<language type="myv">�र�ज़या</language>
-			<language type="na">नाउरू</language>
-			<language type="nah">नह�आत�ल</language>
-			<language type="nai">उत�तरी अमेरीकी इंडियन भाषा</language>
-			<language type="nap">नीपोलिटन</language>
-			<language type="nb">नॉर�वेजियन बोकमाल</language>
-			<language type="nd">उत�तरी देबेल</language>
-			<language type="nds">निचला जर�मन</language>
-			<language type="ne">नेपाली</language>
-			<language type="new">नेवाड़ी</language>
-			<language type="ng">डोन�गा</language>
-			<language type="nia">नियास</language>
-			<language type="nic">नाइगर-कोर�डोफैनियन भाषा</language>
-			<language type="niu">निय�आन</language>
-			<language type="nl">डच�</language>
-			<language type="nn">नॉर�वेजियन नाइनोर�स�क</language>
-			<language type="no">नार�वेजियन</language>
-			<language type="nog">नोगाई</language>
-			<language type="non">प�राना नॉर�स</language>
-			<language type="nqo">�न�को</language>
-			<language type="nr">दक�षिण देबेल</language>
-			<language type="nso">उत�तरी सोथो</language>
-			<language type="nub">न�य�बियान भाषा</language>
-			<language type="nv">नावाजो</language>
-			<language type="nwc">पारम�परिक नेवारी</language>
-			<language type="ny">न�यानजा</language>
-			<language type="nym">न�यामवेज़ी</language>
-			<language type="nyn">न�यानकोल</language>
-			<language type="nyo">न�योरो</language>
-			<language type="nzi">न�ज़ीमा</language>
-			<language type="oc">ओसीटान</language>
-			<language type="oj">ओजिब�वा</language>
-			<language type="om">ओरोमो</language>
-			<language type="or">उड़िया</language>
-			<language type="os">ओस�सेटिक</language>
-			<language type="osa">ओसेज</language>
-			<language type="ota">ओटोमान त�र�किश</language>
-			<language type="oto">ओटोमियन भाषा</language>
-			<language type="pa">पंजाबी</language>
-			<language type="paa">पाप�आन भाषा</language>
-			<language type="pag">पंगासीनान</language>
-			<language type="pal">पाह�लावी</language>
-			<language type="pam">पाम�पान�गा</language>
-			<language type="pap">पापियामेन�टो</language>
-			<language type="pau">पलोउआन</language>
-			<language type="peo">प�रानी फारसी</language>
-			<language type="phi">फिलिपीन भाषा</language>
-			<language type="phn">फो�निशियन</language>
-			<language type="pi">पाली</language>
-			<language type="pl">पॉलिश</language>
-			<language type="pon">पोह�नपि�न</language>
-			<language type="pra">प�राकृत</language>
-			<language type="pro">प�रानी प�रोवेन�सल</language>
-			<language type="ps">पॉशतो</language>
-			<language type="pt">प�र�तगाली</language>
-			<language type="pt_BR">प�र�तगाली (ब�राज़ील)</language>
-			<language type="pt_PT">ईवेरियाई प�र�तगाली</language>
-			<language type="qu">क�वेश�आ</language>
-			<language type="raj">राजस�थानी</language>
-			<language type="rap">रापान�ई</language>
-			<language type="rar">रारोतोंगन</language>
-			<language type="rm">रहेय�टो-रोमान�स</language>
-			<language type="rn">र�न�दी</language>
-			<language type="ro">रोमानियाई</language>
-			<language type="roa">रोमांस भाषा</language>
-			<language type="rom">रोमानी</language>
-			<language type="root">रूट</language>
-			<language type="ru">रूसी</language>
-			<language type="rup">अरोमानियन</language>
-			<language type="rw">किन�यारवाण�डा</language>
-			<language type="sa">संस�कृत</language>
-			<language type="sad">सन�डावे</language>
-			<language type="sah">याकूत</language>
-			<language type="sai">दक�षिण अमेरीकी इंडियन भाषा</language>
-			<language type="sal">सलीशन भाषा</language>
-			<language type="sam">सामैरिटन अरैमिक</language>
-			<language type="sas">सासाक</language>
-			<language type="sat">संताली</language>
-			<language type="sc">सार�दिनियन</language>
-			<language type="scn">सिसिलियन</language>
-			<language type="sco">स�कॉट�स</language>
-			<language type="sd">सिन�धी</language>
-			<language type="se">नॉर�दन सामी</language>
-			<language type="sel">सेल�कप</language>
-			<language type="sem">सेमिटिक भाषा</language>
-			<language type="sg">सांगो</language>
-			<language type="sga">प�रानी आइरिश</language>
-			<language type="sgn">सांकेतिक भाषा</language>
-			<language type="sh">सेर�बो-क�रो�शन�</language>
-			<language type="shn">शैन</language>
-			<language type="si">शिंघालीस�</language>
-			<language type="sid">सिदामो</language>
-			<language type="sio">सिउआन भाषा</language>
-			<language type="sit">चीनी-तिब�ब�ती भाषा</language>
-			<language type="sk">स�लोवाक�</language>
-			<language type="sl">स�लोवेनियन�</language>
-			<language type="sla">स�लोवियाई भाषा</language>
-			<language type="sm">सामोन</language>
-			<language type="sma">दक�षिण सामी</language>
-			<language type="smi">सामी भाषा</language>
-			<language type="smj">ल�य�ल सामी</language>
-			<language type="smn">इनारी सामी</language>
-			<language type="sms">स�कोल�ट सामी</language>
-			<language type="sn">सोणा</language>
-			<language type="snk">सोनिन�के</language>
-			<language type="so">सोमाली</language>
-			<language type="sog">सोग�डि�न</language>
-			<language type="son">सोन�घाई</language>
-			<language type="sq">अल�बेनियन�</language>
-			<language type="sr">सर�बियन�</language>
-			<language type="srn">स�रानान टॉन�गो</language>
-			<language type="srr">सेरेर</language>
-			<language type="ss">स�वाती</language>
-			<language type="ssa">नील सहारी भाषा</language>
-			<language type="st">सेसोथो</language>
-			<language type="su">स�ंडानी</language>
-			<language type="suk">स�क�मा</language>
-			<language type="sus">स�स�</language>
-			<language type="sux">स�मेरियन</language>
-			<language type="sv">स�विडिश</language>
-			<language type="sw">स�वाहिली</language>
-			<language type="syc">क�लासिकल सिरि�क</language>
-			<language type="syr">सिरि�क</language>
-			<language type="ta">तमिल</language>
-			<language type="tai">ताई भाषा</language>
-			<language type="te">तेलेग�</language>
-			<language type="tem">टिम�ने</language>
-			<language type="ter">तेरेनो</language>
-			<language type="tet">तेत�म</language>
-			<language type="tg">ताजिक�</language>
-			<language type="th">थाई</language>
-			<language type="ti">तिग�रीन�या</language>
-			<language type="tig">टाइग�रे</language>
-			<language type="tiv">तिव</language>
-			<language type="tk">त�क�रमेन</language>
-			<language type="tkl">तोकेलाऊ</language>
-			<language type="tl">तागालोग</language>
-			<language type="tlh">क�लिंगन</language>
-			<language type="tli">त�लिंगित</language>
-			<language type="tmh">तामाशेक</language>
-			<language type="tn">सेत�स�वाना</language>
-			<language type="to">टोंगा</language>
-			<language type="tog">न�यासा टोन�गा</language>
-			<language type="tpi">टोक पिसिन</language>
-			<language type="tr">त�र�की</language>
-			<language type="ts">सोंगा</language>
-			<language type="tsi">त�सिमीशियन</language>
-			<language type="tt">टाटर</language>
-			<language type="tum">तम�बूका</language>
-			<language type="tup">ट�यूपी भाषा</language>
-			<language type="tut">अल�तैक भाषा</language>
-			<language type="tvl">त�वाल�</language>
-			<language type="tw">ट�वी</language>
-			<language type="ty">ताहितियन</language>
-			<language type="tyv">त�वीनियन</language>
-			<language type="udm">उदम�र�त</language>
-			<language type="ug">उईघ�र</language>
-			<language type="uga">य�गैरिटिक</language>
-			<language type="uk">यूक�रेनी</language>
-			<language type="umb">उम�ब�न�ड�</language>
-			<language type="und">अज�ञात या अवैध भाषा</language>
-			<language type="ur">उर�दू</language>
-			<language type="uz">उज़�बेक</language>
-			<language type="vai">वाई</language>
-			<language type="ve">वेन�दा</language>
-			<language type="vi">वियेतनामी</language>
-			<language type="vo">वोलाप�क</language>
-			<language type="vot">वॉटिक</language>
-			<language type="wa">वाल�लून</language>
-			<language type="wak">वाकाशन भाषा</language>
-			<language type="wal">वलामो</language>
-			<language type="war">वारै</language>
-			<language type="was">वाशो</language>
-			<language type="wen">सॉर�बियन भाषा</language>
-			<language type="wo">वोलोफ</language>
-			<language type="xal">काल�मिक</language>
-			<language type="xh">षोसा</language>
-			<language type="yao">याओ</language>
-			<language type="yap">यापीस</language>
-			<language type="yi">येह�दी</language>
-			<language type="yo">योरूबा</language>
-			<language type="ypk">यूपिक भाषा</language>
-			<language type="za">ज़�आंग</language>
-			<language type="zap">ज़ेपोटेक</language>
-			<language type="zbl">ब�लिसिम�बॉल�स</language>
-			<language type="zen">ज़ेनान�गा</language>
-			<language type="zh">चीनी</language>
-			<language type="zh_Hans">चीनी (सरलीकृत)</language>
-			<language type="zh_Hant">चीनी (पारम�परिक)</language>
-			<language type="znd">ज़न�डे</language>
-			<language type="zu">ज़�लू</language>
-			<language type="zun">ज़ूनी</language>
-			<language type="zxx">कोई लिंग�विस�ट सामग�री नहीं</language>
-			<language type="zza">ज़ाज़ा</language>
-		</languages>
-		<scripts>
-			<script type="Arab">अरबी</script>
-			<script type="Armi">इम�पिरियल आर�मेनिक</script>
-			<script type="Armn">अर�मेनियाई</script>
-			<script type="Avst">अवेस�तन</script>
-			<script type="Bali">बाली</script>
-			<script type="Batk">बटकी</script>
-			<script type="Beng">बंगाली</script>
-			<script type="Blis">ब�लिसिम�बॉल�स</script>
-			<script type="Bopo">बोपोमोफो</script>
-			<script type="Brah">ब�रह�मी</script>
-			<script type="Brai">ब�रेल</script>
-			<script type="Bugi">बगिनीस</script>
-			<script type="Buhd">ब�हिद</script>
-			<script type="Cakm">चकमा</script>
-			<script type="Cans">य�निफाइड कैनेडियन �बोरिजनल सिलेबिक�स</script>
-			<script type="Cari">करैन</script>
-			<script type="Cham">चाम</script>
-			<script type="Cher">चिरूकी</script>
-			<script type="Cirt">किर�थ</script>
-			<script type="Copt">कॉप�टिक</script>
-			<script type="Cprt">काइप�रायट</script>
-			<script type="Cyrl">सिरिलिक</script>
-			<script type="Cyrs">ओल�ड चर�च स�लावोनिक सिरिलिक</script>
-			<script type="Deva">देवनागरी</script>
-			<script type="Dsrt">डेसरेट</script>
-			<script type="Egyd">इजिप�शियन डेमोटिक</script>
-			<script type="Egyh">इजिप�शियन हाइरेटिक</script>
-			<script type="Egyp">इजिप�शियन हाइरोग�लिफ�स</script>
-			<script type="Ethi">ईथोपियाई</script>
-			<script type="Geok">जॉर�जियन ख�तस�री</script>
-			<script type="Geor">जॉर�जियन</script>
-			<script type="Glag">ग�लेगोलिटिक</script>
-			<script type="Goth">गोथिक</script>
-			<script type="Grek">ग�रीक</script>
-			<script type="Gujr">ग�जराती</script>
-			<script type="Guru">ग�रम�खी</script>
-			<script type="Hang">हंग�ल</script>
-			<script type="Hani">हन</script>
-			<script type="Hano">हन�नू</script>
-			<script type="Hans">सरलीकृत हन</script>
-			<script type="Hant">पारम�परिक हन</script>
-			<script type="Hebr">हिब�रू</script>
-			<script type="Hira">हीरागाना</script>
-			<script type="Hmng">पाहो ह�मोन�ग</script>
-			<script type="Hrkt">कचाकना और हिरागना</script>
-			<script type="Hung">ऑल�ड हंगेरियन</script>
-			<script type="Inds">सिन�ध�</script>
-			<script type="Ital">प�रानी इटली</script>
-			<script type="Java">जावानीस</script>
-			<script type="Jpan">जापानी</script>
-			<script type="Kali">कायाह ली</script>
-			<script type="Kana">कटाकना</script>
-			<script type="Khar">खारोशथी</script>
-			<script type="Khmr">खमेर</script>
-			<script type="Knda">कन�नड़</script>
-			<script type="Kore">कोरियाई</script>
-			<script type="Kthi">कैथी</script>
-			<script type="Lana">लाना</script>
-			<script type="Laoo">लाओ</script>
-			<script type="Latf">फ�रैकत�र लैटिन</script>
-			<script type="Latg">गैलिक लेटिन</script>
-			<script type="Latn">लाटिन</script>
-			<script type="Lepc">लेपचा</script>
-			<script type="Limb">लिम�बू</script>
-			<script type="Lina">लीनियर A</script>
-			<script type="Linb">लीनियर बी</script>
-			<script type="Lyci">लिशियन</script>
-			<script type="Lydi">लिडियन</script>
-			<script type="Mand">मनडेन</script>
-			<script type="Mani">मनीशीन</script>
-			<script type="Maya">मयान हाइरोग�लिफ�स</script>
-			<script type="Mero">मेरोइटिक</script>
-			<script type="Mlym">मलयालम</script>
-			<script type="Mong">मंगोलियाई</script>
-			<script type="Moon">मून</script>
-			<script type="Mtei">मेइतेइ मायेक</script>
-			<script type="Mymr">म�यांमार</script>
-			<script type="Nkoo">�न�'को</script>
-			<script type="Ogam">ओगम</script>
-			<script type="Olck">ऑल चिकी</script>
-			<script type="Orkh">ओरखोन</script>
-			<script type="Orya">उडिया</script>
-			<script type="Osma">ओस�मान�या</script>
-			<script type="Perm">ओल�ड परमिक</script>
-			<script type="Phag">फाग�स-पा</script>
-			<script type="Phli">इंस�क�रिपश�नल पाहलवी</script>
-			<script type="Phlp">सॉल�टर पाहलवी</script>
-			<script type="Phlv">ब�क पाहलवी</script>
-			<script type="Phnx">फोनिशियन</script>
-			<script type="Plrd">पॉलार�ड फोनेटिक</script>
-			<script type="Prti">इंस�क�रिपश�नल पार�थियन</script>
-			<script type="Qaai">विरासत</script>
-			<script type="Rjng">रीजांग</script>
-			<script type="Roro">रोन�गोरोन�गो</script>
-			<script type="Runr">रूनिक</script>
-			<script type="Samr">समरिटन</script>
-			<script type="Sara">सराती</script>
-			<script type="Saur">सौराष�ट�र</script>
-			<script type="Sgnw">सांकेतिक लेख</script>
-			<script type="Shaw">शावियान</script>
-			<script type="Sinh">सिहंली</script>
-			<script type="Sund">सूडानी</script>
-			<script type="Sylo">सिलोती नागरी</script>
-			<script type="Syrc">सिरियेक</script>
-			<script type="Syre">�स�त�रेन�जेलो सिरि�क</script>
-			<script type="Syrj">पश�चिम सिरि�क</script>
-			<script type="Syrn">पूर�व सिरि�क</script>
-			<script type="Tagb">तगबन�वा</script>
-			<script type="Tale">ताई ली</script>
-			<script type="Talu">नया ताई ल�</script>
-			<script type="Taml">तमिल</script>
-			<script type="Tavt">ताई वि�त</script>
-			<script type="Telu">तेल�गू</script>
-			<script type="Teng">तेन�गवार</script>
-			<script type="Tfng">तिफिनाघ</script>
-			<script type="Tglg">टैगालोग</script>
-			<script type="Thaa">थाना</script>
-			<script type="Thai">थाई</script>
-			<script type="Tibt">तिब�बती</script>
-			<script type="Ugar">य�गारिटिक</script>
-			<script type="Vaii">वाई</script>
-			<script type="Visp">विसिबल स�पीच</script>
-			<script type="Xpeo">प�रानी फारसी</script>
-			<script type="Xsux">स�मेरो अक�कादियन स�निफॉर�म</script>
-			<script type="Yiii">यी</script>
-			<script type="Zmth">गणितीय संकेतन</script>
-			<script type="Zsym">चिन�ह</script>
-			<script type="Zxxx">अलिखित</script>
-			<script type="Zyyy">आम</script>
-			<script type="Zzzz">अज�ञात या अवैध लिपि</script>
-		</scripts>
-		<territories>
-			<territory type="001">द�निया</territory>
-			<territory type="002">अफ�रीका</territory>
-			<territory type="003">उत�तर अमेरिका</territory>
-			<territory type="005">दक�षिण अमेरिका</territory>
-			<territory type="009">ओशिआनिया</territory>
-			<territory type="011">पश�चिमी अफ�रीका</territory>
-			<territory type="013">मध�य अमरीका</territory>
-			<territory type="014">पूर�वी अफ�रीका</territory>
-			<territory type="015">उत�तरी अफ�रीका</territory>
-			<territory type="017">मध�य अफ�रीका</territory>
-			<territory type="018">दक�षिणी अफ�रीका</territory>
-			<territory type="019">अमेरीकास</territory>
-			<territory type="021">उत�तरी अमेरिका</territory>
-			<territory type="029">कैरिबियन</territory>
-			<territory type="030">पूर�वी �शिया</territory>
-			<territory type="034">दक�षिणी �शिया</territory>
-			<territory type="035">दक�षिण-पूर�व �शिया</territory>
-			<territory type="039">दक�षिणी यूरोप</territory>
-			<territory type="053">ऑस�ट�रेलिया �वं न�यूजीलैंड</territory>
-			<territory type="054">मेलानेशिया</territory>
-			<territory type="057">माइक�रोनेशियन रीजन</territory>
-			<territory type="061">पोलीनेशिया</territory>
-			<territory type="062">दक�षिण-मध�य �शिया</territory>
-			<territory type="142">�शिया</territory>
-			<territory type="143">मध�य �शिया</territory>
-			<territory type="145">पश�चिमी �शिया</territory>
-			<territory type="150">यूरोप</territory>
-			<territory type="151">पूर�वी यूरोप</territory>
-			<territory type="154">उत�तरी यूरोप</territory>
-			<territory type="155">पश�चिमी यूरोप�</territory>
-			<territory type="172">कॉमनवेल�थ ऑफ इंडिपेंडेंट स�टेट�स</territory>
-			<territory type="200">चेकोस�लवाकिया</territory>
-			<territory type="419">लेटिन अमेरिका और कैरिबियन</territory>
-			<territory type="830">चैनल द�वीपसमूह</territory>
-			<territory type="AD">अन�डोरा</territory>
-			<territory type="AE">संय�क�त अरब अमीरात</territory>
-			<territory type="AF">अफ़गानिस�तान</territory>
-			<territory type="AG">�ंटिग�आ और बरब�डा</territory>
-			<territory type="AI">�ंग�इला</territory>
-			<territory type="AL">अल�बानिया</territory>
-			<territory type="AM">आर�मेनिया</territory>
-			<territory type="AN">नीदरलैंड�स �ंटिलीज़</territory>
-			<territory type="AO">अंगोला</territory>
-			<territory type="AQ">अंटार�कटिका</territory>
-			<territory type="AR">अर�जेन�टीना</territory>
-			<territory type="AS">अमेरिकी समोआ</territory>
-			<territory type="AT">ऑस�ट�रिया</territory>
-			<territory type="AU">ऑस�ट�रेलिया</territory>
-			<territory type="AW">अरूबा</territory>
-			<territory type="AX">�लैंड द�वीपसमूह</territory>
-			<territory type="AZ">अज़रबैजान</territory>
-			<territory type="BA">बोस�निया और हर�ज़िगोविना</territory>
-			<territory type="BB">बारबाडोस</territory>
-			<territory type="BD">बांग�लादेश</territory>
-			<territory type="BE">बेल�जियम</territory>
-			<territory type="BF">ब�र�किना फ़ासो</territory>
-			<territory type="BG">ब�ल�गारिया</territory>
-			<territory type="BH">बाहरेन</territory>
-			<territory type="BI">ब�र�ंडी</territory>
-			<territory type="BJ">बेनिन</territory>
-			<territory type="BL">सेंट बार�थेलेमी</territory>
-			<territory type="BM">बरमूडा</territory>
-			<territory type="BN">ब�र�नेई</territory>
-			<territory type="BO">बोलीविया</territory>
-			<territory type="BR">ब�राजील</territory>
-			<territory type="BS">बहामा</territory>
-			<territory type="BT">भूटान</territory>
-			<territory type="BV">बौवेत द�वीप</territory>
-			<territory type="BW">बोत�स�वाना</territory>
-			<territory type="BY">बेलारूस</territory>
-			<territory type="BZ">बेलिज</territory>
-			<territory type="CA">कनाडा</territory>
-			<territory type="CC">कोकोस द�वीप</territory>
-			<territory type="CD">कोंगो जनतांत�रिक गणतंत�र</territory>
-			<territory type="CF">सेंट�रल अफ�रीकन रिपब�लिक</territory>
-			<territory type="CG">कांगो</territory>
-			<territory type="CH">स�विस</territory>
-			<territory type="CI">आईवरी कोस�ट</territory>
-			<territory type="CK">क�क द�वीपसमूह</territory>
-			<territory type="CL">चिली</territory>
-			<territory type="CM">कैमरून</territory>
-			<territory type="CN">चीन</territory>
-			<territory type="CO">कोलम�बिया</territory>
-			<territory type="CR">कोस�टारीका</territory>
-			<territory type="CS">सर�बिया व मॉण�टेनेग�रो</territory>
-			<territory type="CU">क�यूबा</territory>
-			<territory type="CV">कैप वर�डे</territory>
-			<territory type="CX">क�रिसमस द�वीप</territory>
-			<territory type="CY">साइप�रस</territory>
-			<territory type="CZ">चेक गणराज�य</territory>
-			<territory type="DE">जर�मनी</territory>
-			<territory type="DJ">जिबूती</territory>
-			<territory type="DK">डेनमार�क</territory>
-			<territory type="DM">डोमिनिक</territory>
-			<territory type="DO">डोमिनिकन गणराज�य</territory>
-			<territory type="DZ">अल�जीरिया</territory>
-			<territory type="EC">इक�वाडोर</territory>
-			<territory type="EE">�स�टोनिया</territory>
-			<territory type="EG">मिस�र</territory>
-			<territory type="EH">पश�चिमी सहारा</territory>
-			<territory type="ER">इरिट�रिया</territory>
-			<territory type="ES">स�पेन</territory>
-			<territory type="ET">इथियोपिया</territory>
-			<territory type="FI">फिनलैंड</territory>
-			<territory type="FJ">फिजी</territory>
-			<territory type="FK">फ़ॉकलैंड द�वीप</territory>
-			<territory type="FM">माइक�रोनेशिया</territory>
-			<territory type="FO">फरो� द�वीप</territory>
-			<territory type="FR">फ�रांस</territory>
-			<territory type="GA">गैबॉन</territory>
-			<territory type="GB">ब�रितन</territory>
-			<territory type="GD">ग�रेनेडा</territory>
-			<territory type="GE">जॉर�जिया</territory>
-			<territory type="GF">फ़�रांसीसी गिआना</territory>
-			<territory type="GG">ग�वेर�नसे</territory>
-			<territory type="GH">घाना</territory>
-			<territory type="GI">जिब�राल�टर</territory>
-			<territory type="GL">ग�रीनलैण�ड</territory>
-			<territory type="GM">गाम�बिया</territory>
-			<territory type="GN">गिनी</territory>
-			<territory type="GP">ग�वाडेलोप</territory>
-			<territory type="GQ">इक�वेटोरियल गिनी</territory>
-			<territory type="GR">ग�रीस</territory>
-			<territory type="GS">दक�षिण जोर�जिया और दक�षिण सैंडविच द�वीपसमूह</territory>
-			<territory type="GT">गोतेदाला</territory>
-			<territory type="GU">ग�आम</territory>
-			<territory type="GW">गीनी-बिसाउ</territory>
-			<territory type="GY">ग�याना</territory>
-			<territory type="HK">हांगकांग विशेष प�रशासनिक क�षेत�र चीन</territory>
-			<territory type="HM">हर�ड द�वीप और मैकडोनॉल�ड द�वीप</territory>
-			<territory type="HN">हाण�डूरस</territory>
-			<territory type="HR">क�रोशिया</territory>
-			<territory type="HT">हाइती</territory>
-			<territory type="HU">हंगरी</territory>
-			<territory type="ID">इंडोनेशिया</territory>
-			<territory type="IE">आयरलैंड</territory>
-			<territory type="IL">इसराइल</territory>
-			<territory type="IM">आइल ऑफ मैन</territory>
-			<territory type="IN">भारत</territory>
-			<territory type="IO">ब�रिटिश हिंद महासागरीय क�षेत�र</territory>
-			<territory type="IQ">इराक</territory>
-			<territory type="IR">ईरान</territory>
-			<territory type="IS">आइसलैंड</territory>
-			<territory type="IT">इटली</territory>
-			<territory type="JE">जर�सी</territory>
-			<territory type="JM">जमाइका</territory>
-			<territory type="JO">जोर�डन</territory>
-			<territory type="JP">जापान</territory>
-			<territory type="KE">केन�या</territory>
-			<territory type="KG">किर�गिज़तान</territory>
-			<territory type="KH">कम�बोडिया</territory>
-			<territory type="KI">किरिबाती</territory>
-			<territory type="KM">कोमोरोस</territory>
-			<territory type="KN">सेंट किट�स और नेविस</territory>
-			<territory type="KP">उत�तर कोरिया</territory>
-			<territory type="KR">दक�षिण कोरिया</territory>
-			<territory type="KW">क�वैत</territory>
-			<territory type="KY">केमैन द�वीपसमूह</territory>
-			<territory type="KZ">कजाखस�तान</territory>
-			<territory type="LA">लाओस</territory>
-			<territory type="LB">लेबनान</territory>
-			<territory type="LC">सेंट लूसिया</territory>
-			<territory type="LI">लिकटेंस�टीन</territory>
-			<territory type="LK">श�रीलंका</territory>
-			<territory type="LR">लाइबेरिया</territory>
-			<territory type="LS">लेसोथो</territory>
-			<territory type="LT">लिथ�आनिया</territory>
-			<territory type="LU">लक�समबर�ग</territory>
-			<territory type="LV">लात�विया</territory>
-			<territory type="LY">लीबिया</territory>
-			<territory type="MA">मोरक�को</territory>
-			<territory type="MC">मोनाको</territory>
-			<territory type="MD">मोल�डाविया</territory>
-			<territory type="ME">मोंटेनेग�रो</territory>
-			<territory type="MF">सेंट मार�टिन</territory>
-			<territory type="MG">मैडागास�कर</territory>
-			<territory type="MH">मार�शल द�वीप</territory>
-			<territory type="MK">मैसेडोनिया</territory>
-			<territory type="ML">माली</territory>
-			<territory type="MM">म�यानमार</territory>
-			<territory type="MN">मंगोलिया</territory>
-			<territory type="MO">मकाओ चीन</territory>
-			<territory type="MP">नॉर�दन मारियाना द�वीपसमूह</territory>
-			<territory type="MQ">मार�टीनिक</territory>
-			<territory type="MR">मॉरिटानिया</territory>
-			<territory type="MS">मॉन�ट�सेराट</territory>
-			<territory type="MT">माल�टा</territory>
-			<territory type="MU">मॉरिशस</territory>
-			<territory type="MV">मालदीव</territory>
-			<territory type="MW">मलावी</territory>
-			<territory type="MX">मेक�सिको</territory>
-			<territory type="MY">मलेशिया</territory>
-			<territory type="MZ">मोजाम�बिक</territory>
-			<territory type="NA">नामीबिया</territory>
-			<territory type="NC">न�यू कैलेडोनिया</territory>
-			<territory type="NE">नाइजर</territory>
-			<territory type="NF">नॉरफ़ॉक द�वीप</territory>
-			<territory type="NG">नाइजीरिया</territory>
-			<territory type="NI">निकाराग�आ</territory>
-			<territory type="NL">नीदरलैण�ड</territory>
-			<territory type="NO">नॉर�वे</territory>
-			<territory type="NP">नेपाल</territory>
-			<territory type="NR">नाउर�</territory>
-			<territory type="NU">नीयू</territory>
-			<territory type="NZ">न�यूज़ीलैंड</territory>
-			<territory type="OM">ओमान</territory>
-			<territory type="PA">पनामा</territory>
-			<territory type="PE">पेरू</territory>
-			<territory type="PF">फ़�रांसीसी पॉलिनेशिया</territory>
-			<territory type="PG">पाप�आ न�यू गिनी</territory>
-			<territory type="PH">फिलीपिंस</territory>
-			<territory type="PK">पाकिस�तान</territory>
-			<territory type="PL">पोलैंड</territory>
-			<territory type="PM">सेंट पि�रे और मिक�वेलन</territory>
-			<territory type="PN">पिटकैर�न</territory>
-			<territory type="PR">पर�टो रीको</territory>
-			<territory type="PS">फ़िलिस�तीन</territory>
-			<territory type="PT">प�र�तगाल</territory>
-			<territory type="PW">पलाऊ</territory>
-			<territory type="PY">पाराग��</territory>
-			<territory type="QA">कतर</territory>
-			<territory type="QO">आउटलाइंग ओशिनिया</territory>
-			<territory type="QU">यूरोपीय संघ</territory>
-			<territory type="RE">रियूनियन</territory>
-			<territory type="RO">रोमानिया</territory>
-			<territory type="RS">सर�बिया</territory>
-			<territory type="RU">रूस</territory>
-			<territory type="RW">रूआण�डा</territory>
-			<territory type="SA">सऊदी अरब</territory>
-			<territory type="SB">सोलोमन द�वीप</territory>
-			<territory type="SC">सेशेल�स</territory>
-			<territory type="SD">सूडान</territory>
-			<territory type="SE">स�वीडन</territory>
-			<territory type="SG">सिंगाप�र</territory>
-			<territory type="SH">सेंट हेलेना</territory>
-			<territory type="SI">स�लोवेनिया</territory>
-			<territory type="SJ">स�वालबर�ड और जान मायेन</territory>
-			<territory type="SK">स�लोवाकिया</territory>
-			<territory type="SL">सियरालेओन</territory>
-			<territory type="SM">सैन मेरीनो</territory>
-			<territory type="SN">सेनेगल</territory>
-			<territory type="SO">सोमालिया</territory>
-			<territory type="SR">स�रिनाम</territory>
-			<territory type="ST">साउ-तोम-प�रिंसिप</territory>
-			<territory type="SV">अल साल�वाडोर</territory>
-			<territory type="SY">सीरिया</territory>
-			<territory type="SZ">स�आजीलैंड</territory>
-			<territory type="TC">त�र�क� और� कैकोज़ द�वीप</territory>
-			<territory type="TD">चाड</territory>
-			<territory type="TF">फ़�रांसीसी दक�षिणी क�षेत�र</territory>
-			<territory type="TG">टोगो</territory>
-			<territory type="TH">थाइलैंड</territory>
-			<territory type="TJ">ताजिकिस�तान</territory>
-			<territory type="TK">तोकेलाउ</territory>
-			<territory type="TL">पूर�वी तिमोर</territory>
-			<territory type="TM">त�र�कमेनिस�तान</territory>
-			<territory type="TN">त�निशिया</territory>
-			<territory type="TO">टोंगा</territory>
-			<territory type="TR">त�र�की</territory>
-			<territory type="TT">त�रिनिडाड और टोबैगो</territory>
-			<territory type="TV">त�वाल�</territory>
-			<territory type="TW">ताइवान</territory>
-			<territory type="TZ">तंजा़निया</territory>
-			<territory type="UA">यूक�रेन</territory>
-			<territory type="UG">य�गांडा</territory>
-			<territory type="UM">य�नाइटेड स�टेट�स माइनर आउटलाइंग द�वीपसमूह</territory>
-			<territory type="US">संय�क�त राज�य अमेरिका</territory>
-			<territory type="UY">य�रूग��</territory>
-			<territory type="UZ">उजबेकिस�तान</territory>
-			<territory type="VA">वैटिकन</territory>
-			<territory type="VC">सेंट विनसेंट �ंड ग�रेनाडाइन�स</territory>
-			<territory type="VE">वेनेज��ला</territory>
-			<territory type="VG">ब�रिटिश वर�जिन द�वीपसमूह</territory>
-			<territory type="VI">अमेरिकी वर�जिन टापू</territory>
-			<territory type="VN">वियतनाम</territory>
-			<territory type="VU">वान�अत�</territory>
-			<territory type="WF">वालिस और फ़�यूचूना</territory>
-			<territory type="WS">समोआ</territory>
-			<territory type="YE">यमन</territory>
-			<territory type="YT">मैयट</territory>
-			<territory type="ZA">दक�षिण अफ�रीका</territory>
-			<territory type="ZM">जाम�बिया</territory>
-			<territory type="ZW">जिम�बाब�वे</territory>
-			<territory type="ZZ">अज�ञात या अवैध क�षेत�र</territory>
-		</territories>
-		<variants>
-			<variant type="1901">पारम�पारिक जर�मन वर�तनी</variant>
-			<variant type="1996">जर�मेनी की 1996 वर�तनी</variant>
-			<variant type="AREVELA">पूर�वी अर�मेनियाई</variant>
-			<variant type="MONOTON">�कस�वरीय</variant>
-			<variant type="NJIVA">जीवा बोली</variant>
-			<variant type="POLYTON">बह�स�वरीय</variant>
-			<variant type="POSIX">कम�प�यूटर</variant>
-			<variant type="REVISED">संशोधित वर�तनी</variant>
-		</variants>
-		<keys>
-			<key type="calendar">पंचाग</key>
-			<key type="collation">मिलान</key>
-			<key type="currency">म�द�रा</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">पारम�पारिक चीनी वर�गीकरण</type>
-			<type type="buddhist" key="calendar">बौद�ध पंचांग</type>
-			<type type="chinese" key="calendar">चीनी पंचांग</type>
-			<type type="direct" key="collation">प�रत�यक�ष वर�गीकरण</type>
-			<type type="gb2312han" key="collation">सरलीकृत चीनी वर�गीकरण</type>
-			<type type="gregorian" key="calendar">ग�रेगरी पंचांग</type>
-			<type type="hebrew" key="calendar">हिब�रू पंचांग</type>
-			<type type="indian" key="calendar">भारतीय पंचांग</type>
-			<type type="islamic" key="calendar">इस�लामी पंचांग</type>
-			<type type="islamic-civil" key="calendar">इस�लामी नागरिक पंचांग</type>
-			<type type="japanese" key="calendar">जापानी पंचांग</type>
-			<type type="phonebook" key="collation">दूरभाष निर�देशिका वर�गीकरण</type>
-			<type type="pinyin" key="collation">पिनयीन वर�गीकरण</type>
-			<type type="roc" key="calendar">चीनी गणतंत�र पंचांग</type>
-			<type type="stroke" key="collation">स�ट�रोक वर�गीकरण</type>
-			<type type="traditional" key="collation">पारम�पारिक वर�गीकरण</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">मेट�रिक</measurementSystemName>
-			<measurementSystemName type="US">यू�स</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[� ०-९ अ-� �-ऑ ओ-न प-र ल ळ व-ह ़ �-ः ऽ � ा-ॅ े-ॉ ो ौ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">मस�केरेम</month>
-							<month type="2">टेकेम�ट</month>
-							<month type="3">हेदर</month>
-							<month type="4">तहसास</month>
-							<month type="5">टर</month>
-							<month type="6">येकाटिट</month>
-							<month type="7">मेगाबिट</month>
-							<month type="8">मियाज़िया</month>
-							<month type="9">गनबोट</month>
-							<month type="10">सेन</month>
-							<month type="11">हम�ले</month>
-							<month type="12">नेहासे</month>
-							<month type="13">पागूमन</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">जनवरी</month>
-							<month type="2">फरवरी</month>
-							<month type="3">मार�च</month>
-							<month type="4">अप�रैल</month>
-							<month type="5">मई</month>
-							<month type="6">जून</month>
-							<month type="7">ज�लाई</month>
-							<month type="8">अगस�त</month>
-							<month type="9">सितम�बर</month>
-							<month type="10">अक�तूबर</month>
-							<month type="11">नवम�बर</month>
-							<month type="12">दिसम�बर</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ज</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">जनवरी</month>
-							<month type="2">फरवरी</month>
-							<month type="3">मार�च</month>
-							<month type="4">अप�रैल</month>
-							<month type="5">मई</month>
-							<month type="6">जून</month>
-							<month type="7">ज�लाई</month>
-							<month type="8">अगस�त</month>
-							<month type="9">सितम�बर</month>
-							<month type="10">अक�तूबर</month>
-							<month type="11">नवम�बर</month>
-							<month type="12">दिसम�बर</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ज</month>
-							<month type="2">फ़</month>
-							<month type="3">मा</month>
-							<month type="4">अ</month>
-							<month type="5">म</month>
-							<month type="6">जू</month>
-							<month type="7">ज�</month>
-							<month type="8">अ</month>
-							<month type="9">सि</month>
-							<month type="10">अ</month>
-							<month type="11">न</month>
-							<month type="12">दि</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">रवि</day>
-							<day type="mon">सोम</day>
-							<day type="tue">मंगल</day>
-							<day type="wed">ब�ध</day>
-							<day type="thu">ग�र�</day>
-							<day type="fri">श�क�र</day>
-							<day type="sat">शनि</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">रविवार</day>
-							<day type="mon">सोमवार</day>
-							<day type="tue">मंगलवार</day>
-							<day type="wed">ब�धवार</day>
-							<day type="thu">ग�र�वार</day>
-							<day type="fri">श�क�रवार</day>
-							<day type="sat">शनिवार</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">र</day>
-							<day type="mon">सो</day>
-							<day type="tue">मं</day>
-							<day type="wed">ब�</day>
-							<day type="thu">ग�</day>
-							<day type="fri">श�</day>
-							<day type="sat">श</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="2">द�वितीय चौथाई</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">प�रथम चौथाई</quarter>
-							<quarter type="2">द�वितीय चौथाई</quarter>
-							<quarter type="3">तृतीय चौथाई</quarter>
-							<quarter type="4">चत�र�थ चौथाई</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">प�रथम चौथाई</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">ईसापूर�व</era>
-						<era type="1">सन</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="GGGGyMMMMEEEEdd">EEEE,dd MMMM GGGGy</dateFormatItem>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yyMMdd">dd-MM-yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d MMM, yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE, d MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>काल</displayName>
-					</field>
-					<field type="year">
-						<displayName>साल</displayName>
-					</field>
-					<field type="month">
-						<displayName>महीना</displayName>
-					</field>
-					<field type="week">
-						<displayName>सप�ताह</displayName>
-					</field>
-					<field type="day">
-						<displayName>दिन</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>सप�ताह का दिन</displayName>
-					</field>
-					<field type="hour">
-						<displayName>घंटा</displayName>
-					</field>
-					<field type="minute">
-						<displayName>मिनट</displayName>
-					</field>
-					<field type="second">
-						<displayName>सेकेंड</displayName>
-					</field>
-					<field type="zone">
-						<displayName>क�षेत�र</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">चैत�र</month>
-							<month type="2">वैशाख</month>
-							<month type="3">ज�येष�ठ</month>
-							<month type="4">असध</month>
-							<month type="5">श�रावण</month>
-							<month type="6">भाद�र</month>
-							<month type="7">अश�विन</month>
-							<month type="8">कार�तिक</month>
-							<month type="9">अग�रायण</month>
-							<month type="10">पौष</month>
-							<month type="11">माघ</month>
-							<month type="12">फाल�ग�न</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">चैत�र</month>
-							<month type="2">वैशाख</month>
-							<month type="3">ज�येष�ठ</month>
-							<month type="4">असध</month>
-							<month type="5">श�रावण</month>
-							<month type="6">भाद�रपद</month>
-							<month type="7">अश�विन</month>
-							<month type="8">कार�तिक</month>
-							<month type="9">अग�रायण</month>
-							<month type="10">पौष</month>
-							<month type="11">माघ</month>
-							<month type="12">फाल�ग�न</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">म�हर�रम</month>
-							<month type="2">सफर</month>
-							<month type="3">राबी प�रथम</month>
-							<month type="4">राबी द�वितीय</month>
-							<month type="5">ज�म�डा प�रथम</month>
-							<month type="6">ज�म�डा द�वितीय</month>
-							<month type="7">रजब</month>
-							<month type="8">शावन</month>
-							<month type="9">रमजान</month>
-							<month type="10">शव�व�ल</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">म�हर�रम</month>
-							<month type="2">सफर</month>
-							<month type="3">राबी प�रथम</month>
-							<month type="4">राबी द�वितीय</month>
-							<month type="5">ज�म�डा प�रथम</month>
-							<month type="6">ज�म�डा द�वितीय</month>
-							<month type="7">रजब</month>
-							<month type="8">शावन</month>
-							<month type="9">रमजान</month>
-							<month type="10">शव�व�ल</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="wide">
-							<month type="1">म�हर�रम</month>
-							<month type="2">सफर</month>
-							<month type="3">राबी प�रथम</month>
-							<month type="4">राबी द�वितीय</month>
-							<month type="5">ज�म�डा प�रथम</month>
-							<month type="6">ज�म�डा द�वितीय</month>
-							<month type="7">रजब</month>
-							<month type="8">शावन</month>
-							<month type="9">रमजान</month>
-							<month type="10">शव�व�ल</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="japanese">
-				<eras>
-					<eraNames>
-						<era type="0">ता�का</era>
-						<era type="1">हाकूची</era>
-						<era type="2">हाकूहो</era>
-						<era type="3">शूचो</era>
-						<era type="4">ताहिओ</era>
-						<era type="5">केउन</era>
-						<era type="6">वाडू</era>
-						<era type="7">रैकी</era>
-						<era type="8">योरो</era>
-						<era type="10">टेम�प�यो</era>
-						<era type="11">टेम�प�यो-काम�पो</era>
-						<era type="12">टेम�प�यो-शोहो</era>
-						<era type="13">टेम�प�यो-होजी</era>
-						<era type="14">टेम�प�यो-जिंगो</era>
-						<era type="15">टेम�प�यो-किउन</era>
-						<era type="16">होकी</era>
-						<era type="17">टेनो</era>
-						<era type="18">इंर�याकू</era>
-						<era type="19">डाईडू</era>
-						<era type="20">क़ोनिन</era>
-						<era type="21">टेंचो</era>
-						<era type="22">शोवा</era>
-						<era type="23">काज�यो</era>
-						<era type="24">निंजू</era>
-						<era type="25">शाईकू</era>
-						<era type="26">टेनन</era>
-						<era type="27">जोगन�</era>
-						<era type="28">गेंकेई</era>
-						<era type="29">निन�ना</era>
-						<era type="30">केम�प�यो</era>
-						<era type="31">शूताई</era>
-						<era type="32">ईंगी</era>
-						<era type="33">ईंचो</era>
-						<era type="34">शोहेई</era>
-						<era type="35">टेंग�यो</era>
-						<era type="36">टेंर�याकू</era>
-						<era type="37">टेंटूकू</era>
-						<era type="38">ओवा</era>
-						<era type="39">कोहो</era>
-						<era type="40">अन�ना</era>
-						<era type="41">टेंरोकू</era>
-						<era type="42">टेन-�न</era>
-						<era type="43">जोगन�</era>
-						<era type="44">टेंगेन</era>
-						<era type="45">ईकान</era>
-						<era type="46">कन�ना</era>
-						<era type="47">ई-�न</era>
-						<era type="48">�इसो</era>
-						<era type="50">चोटूक�</era>
-						<era type="51">चोहो</era>
-						<era type="52">कंको</era>
-						<era type="53">च�योवा</era>
-						<era type="54">कन�निन</era>
-						<era type="55">ज़ियान</era>
-						<era type="56">मंजू</era>
-						<era type="57">चोगन</era>
-						<era type="58">चोर�याकू</era>
-						<era type="59">चोक�य�</era>
-						<era type="60">कांटूको</era>
-						<era type="61">ईशो</era>
-						<era type="62">टेंगी</era>
-						<era type="63">कोहैइ</era>
-						<era type="64">जिर�याकू</era>
-						<era type="65">ईंक�यू</era>
-						<era type="66">सोहो</era>
-						<era type="67">शोर�याकू</era>
-						<era type="68">ईहो</era>
-						<era type="69">ओटूको</era>
-						<era type="70">कांजि</era>
-						<era type="71">कोहो</era>
-						<era type="72">ईचो</era>
-						<era type="73">शोटूको</era>
-						<era type="74">कोवा</era>
-						<era type="75">चोजी</era>
-						<era type="76">काशो</era>
-						<era type="77">टेन�निन</era>
-						<era type="78">टेन-ई</era>
-						<era type="79">ईक�यू</era>
-						<era type="80">जेन-ई</era>
-						<era type="81">होआन</era>
-						<era type="82">तेंजी</era>
-						<era type="83">दाईजी</era>
-						<era type="84">टेंशो</era>
-						<era type="85">चोशो</era>
-						<era type="86">हो�न</era>
-						<era type="87">ईजी</era>
-						<era type="89">टेन�यो</era>
-						<era type="90">क�यूआन</era>
-						<era type="91">निंपैई</era>
-						<era type="92">क�योजो</era>
-						<era type="93">होगेन</era>
-						<era type="94">हैजी</era>
-						<era type="95">ईर�याकू</era>
-						<era type="96">ओहो</era>
-						<era type="97">चोकान</era>
-						<era type="98">ईमान</era>
-						<era type="99">निन-आन</era>
-						<era type="100">काओ</era>
-						<era type="101">शोअन</era>
-						<era type="102">अंजन</era>
-						<era type="103">जिशो</era>
-						<era type="104">योवा</era>
-						<era type="105">जू�ई</era>
-						<era type="106">जेंर�याकू</era>
-						<era type="107">बूंजी</era>
-						<era type="108">केंक�यू</era>
-						<era type="109">शोजी</era>
-						<era type="110">केन�निन</era>
-						<era type="111">जेंक�यू</era>
-						<era type="112">केन-ई</era>
-						<era type="113">शोगेन</era>
-						<era type="114">केंर�याकू</era>
-						<era type="115">केंपो</era>
-						<era type="116">शोक�यू</era>
-						<era type="117">जू</era>
-						<era type="118">जेन�निन</era>
-						<era type="119">कोरोकू</era>
-						<era type="120">अंटैइ</era>
-						<era type="121">कांकी</era>
-						<era type="122">जो�ई</era>
-						<era type="123">टेम�पूकू</era>
-						<era type="124">ब�ंर�याकू</era>
-						<era type="125">काटेई</era>
-						<era type="126">र�याकूनिन</era>
-						<era type="127">ईन-ओ</era>
-						<era type="128">निंजी</era>
-						<era type="130">होजी</era>
-						<era type="131">केंचो</era>
-						<era type="132">कोगेन</era>
-						<era type="133">शोका</era>
-						<era type="134">शोगेन</era>
-						<era type="135">ब�न-ओ</era>
-						<era type="136">कोचो</era>
-						<era type="137">ब�न-ई</era>
-						<era type="138">केंजी</era>
-						<era type="139">कोअन</era>
-						<era type="140">शो</era>
-						<era type="141">ईनिन</era>
-						<era type="142">शोअन</era>
-						<era type="143">केंजेन</era>
-						<era type="144">काजेन</era>
-						<era type="145">टोकूजी</era>
-						<era type="146">ईंकेई</era>
-						<era type="147">ओचो</era>
-						<era type="148">शोवा</era>
-						<era type="149">ब�ंपो</era>
-						<era type="150">जेनो</era>
-						<era type="151">जेंक�यो</era>
-						<era type="152">शोचू</era>
-						<era type="153">कारेकी</era>
-						<era type="154">जेंटोकू</era>
-						<era type="155">गेंको</era>
-						<era type="156">केम�मू</era>
-						<era type="157">ईंजेन</era>
-						<era type="158">कोकोकू</era>
-						<era type="159">शोहेई</era>
-						<era type="160">केंटोकू</era>
-						<era type="161">बूंचो</era>
-						<era type="162">टेंजो</era>
-						<era type="163">कोर�याकू</era>
-						<era type="164">कोवा</era>
-						<era type="165">जेंचू</era>
-						<era type="166">मेटोकू</era>
-						<era type="167">काकेई</era>
-						<era type="168">कू</era>
-						<era type="170">ओई</era>
-						<era type="171">शोचो</era>
-						<era type="172">ईक�यो</era>
-						<era type="173">काकीत�सू</era>
-						<era type="174">ब�न-अन</era>
-						<era type="175">होटोकू</era>
-						<era type="176">क�योटोकू</era>
-						<era type="177">कोशो</era>
-						<era type="178">चोरोकू</era>
-						<era type="179">कांशो</era>
-						<era type="180">ब�ंशो</era>
-						<era type="181">ओनिन</era>
-						<era type="182">ब�न�मेई</era>
-						<era type="183">चोक�यो</era>
-						<era type="184">ईंटोकू</era>
-						<era type="185">मेईओ</era>
-						<era type="186">ब�ंकी</era>
-						<era type="187">ईशो</era>
-						<era type="188">ताई�ई</era>
-						<era type="189">क�योरोकू</era>
-						<era type="190">टेन�मन</era>
-						<era type="191">कोजी</era>
-						<era type="192">ईरोकू</era>
-						<era type="193">जेंकी</era>
-						<era type="194">टेंशो</era>
-						<era type="195">ब�ंरोकू</era>
-						<era type="196">केईचो</era>
-						<era type="197">जेनवा</era>
-						<era type="198">कान-�ई</era>
-						<era type="199">शोहो</era>
-						<era type="200">केईआन</era>
-						<era type="201">शो</era>
-						<era type="202">मेईर�याकू</era>
-						<era type="203">मानजी</era>
-						<era type="204">कनब�न</era>
-						<era type="205">ईंपो</era>
-						<era type="206">टेंवा</era>
-						<era type="207">जोक�यो</era>
-						<era type="208">जेंरोकू</era>
-						<era type="210">शोटूको</era>
-						<era type="211">क�योहो</era>
-						<era type="212">जेंब�न</era>
-						<era type="213">कांपो</era>
-						<era type="214">इंक�यो</era>
-						<era type="215">कान-�न</era>
-						<era type="216">होर�याकू</era>
-						<era type="217">मेईवा</era>
-						<era type="218">अन-�ई</era>
-						<era type="219">टेनमेई</era>
-						<era type="220">कांसेई</era>
-						<era type="221">क�योवा</era>
-						<era type="222">ब�ंका</era>
-						<era type="223">ब�ंसेई</era>
-						<era type="224">टेंपो</era>
-						<era type="225">कोका</era>
-						<era type="226">काई�</era>
-						<era type="227">अंसेई</era>
-						<era type="228">मान-ईन</era>
-						<era type="229">ब�ंक�यौ</era>
-						<era type="230">जेंजी</era>
-						<era type="231">केईओ</era>
-						<era type="232">मेजी</era>
-						<era type="233">ताईशो</era>
-						<era type="234">शोवा</era>
-						<era type="235">हेईसेई</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ता�का</era>
-						<era type="1">हाकूची</era>
-						<era type="2">हाकूहो</era>
-						<era type="3">शूचो</era>
-						<era type="4">ताहिओ</era>
-						<era type="5">केउन</era>
-						<era type="6">वाडू</era>
-						<era type="7">रैकी</era>
-						<era type="8">योरो</era>
-						<era type="9">जिंकी</era>
-						<era type="10">टेम�प�यो</era>
-						<era type="11">टेम�प�यो-काम�पो</era>
-						<era type="12">टेम�प�यो-शोहो</era>
-						<era type="13">टेम�प�यो-होजी</era>
-						<era type="14">टेम�प�यो-जिंगो</era>
-						<era type="15">टेम�प�यो-किउन</era>
-						<era type="16">होकी</era>
-						<era type="17">टेनो</era>
-						<era type="18">इंर�याकू</era>
-						<era type="19">डाईडू</era>
-						<era type="20">क़ोनिन</era>
-						<era type="21">टेंचो</era>
-						<era type="22">शोवा</era>
-						<era type="23">काज�यो</era>
-						<era type="24">निंजू</era>
-						<era type="25">शाईकू</era>
-						<era type="26">टेनन</era>
-						<era type="27">जोगन�</era>
-						<era type="28">गेंकेई</era>
-						<era type="29">निन�ना</era>
-						<era type="30">केम�प�यो</era>
-						<era type="31">शूताई</era>
-						<era type="32">ईंगी</era>
-						<era type="33">ईंचो</era>
-						<era type="34">शोहेई</era>
-						<era type="35">टेंग�यो</era>
-						<era type="36">टेंर�याकू</era>
-						<era type="37">टेंटूकू</era>
-						<era type="38">ओवा</era>
-						<era type="39">कोहो</era>
-						<era type="40">अन�ना</era>
-						<era type="41">टेंरोकू</era>
-						<era type="42">टेन-�न</era>
-						<era type="43">जोगन�</era>
-						<era type="44">टेंगेन</era>
-						<era type="45">ईकान</era>
-						<era type="46">कन�ना</era>
-						<era type="47">ई-�न</era>
-						<era type="48">�इसो</era>
-						<era type="49">शोर�याकू</era>
-						<era type="50">चोटूक�</era>
-						<era type="51">चोहो</era>
-						<era type="52">कंको</era>
-						<era type="53">च�योवा</era>
-						<era type="54">कन�निन</era>
-						<era type="55">ज़ियान</era>
-						<era type="56">मंजू</era>
-						<era type="57">चोगन</era>
-						<era type="58">चोर�याकू</era>
-						<era type="59">चोक�य�</era>
-						<era type="60">कांटूको</era>
-						<era type="61">ईशो</era>
-						<era type="62">टेंगी</era>
-						<era type="63">कोहैइ</era>
-						<era type="64">जिर�याकू</era>
-						<era type="65">ईंक�यू</era>
-						<era type="66">सोहो</era>
-						<era type="67">शोर�याकू</era>
-						<era type="68">ईहो</era>
-						<era type="69">ओटूको</era>
-						<era type="70">कांजि</era>
-						<era type="71">कोहो</era>
-						<era type="72">ईचो</era>
-						<era type="73">शोटूको</era>
-						<era type="74">कोवा</era>
-						<era type="75">चोजी</era>
-						<era type="76">काशो</era>
-						<era type="77">टेन�निन</era>
-						<era type="78">टेन-ई</era>
-						<era type="79">ईक�यू</era>
-						<era type="80">जेन-ई</era>
-						<era type="81">होआन</era>
-						<era type="82">तेंजी</era>
-						<era type="83">दाईजी</era>
-						<era type="84">टेंशो</era>
-						<era type="85">चोशो</era>
-						<era type="86">हो�न</era>
-						<era type="87">ईजी</era>
-						<era type="88">कोजी</era>
-						<era type="89">टेन�यो</era>
-						<era type="90">क�यूआन</era>
-						<era type="91">निंपैई</era>
-						<era type="92">क�योजो</era>
-						<era type="93">होगेन</era>
-						<era type="94">हैजी</era>
-						<era type="95">ईर�याकू</era>
-						<era type="96">ओहो</era>
-						<era type="97">चोकान</era>
-						<era type="98">ईमान</era>
-						<era type="99">निन-आन</era>
-						<era type="100">काओ</era>
-						<era type="101">शोअन</era>
-						<era type="102">अंजन</era>
-						<era type="103">जिशो</era>
-						<era type="104">योवा</era>
-						<era type="105">जू�ई</era>
-						<era type="106">जेंर�याकू</era>
-						<era type="107">बूंजी</era>
-						<era type="108">केंक�यू</era>
-						<era type="109">शोजी</era>
-						<era type="110">केन�निन</era>
-						<era type="111">जेंक�यू</era>
-						<era type="112">केन-ई</era>
-						<era type="113">शोगेन</era>
-						<era type="114">केंर�याकू</era>
-						<era type="115">केंपो</era>
-						<era type="116">शोक�यू</era>
-						<era type="117">जू</era>
-						<era type="118">जेन�निन</era>
-						<era type="119">कोरोकू</era>
-						<era type="120">अंटैइ</era>
-						<era type="121">कांकी</era>
-						<era type="122">जो�ई</era>
-						<era type="123">टेम�पूकू</era>
-						<era type="124">ब�ंर�याकू</era>
-						<era type="125">काटेई</era>
-						<era type="126">र�याकूनिन</era>
-						<era type="127">ईन-ओ</era>
-						<era type="128">निंजी</era>
-						<era type="129">कांजेन</era>
-						<era type="130">होजी</era>
-						<era type="131">केंचो</era>
-						<era type="132">कोगेन</era>
-						<era type="133">शोका</era>
-						<era type="134">शोगेन</era>
-						<era type="135">ब�न-ओ</era>
-						<era type="136">कोचो</era>
-						<era type="137">ब�न-ई</era>
-						<era type="138">केंजी</era>
-						<era type="139">कोअन</era>
-						<era type="140">शो</era>
-						<era type="141">ईनिन</era>
-						<era type="142">शोअन</era>
-						<era type="143">केंजेन</era>
-						<era type="144">काजेन</era>
-						<era type="145">टोकूजी</era>
-						<era type="146">ईंकेई</era>
-						<era type="147">ओचो</era>
-						<era type="148">शोवा</era>
-						<era type="149">ब�ंपो</era>
-						<era type="150">जेनो</era>
-						<era type="151">जेंक�यो</era>
-						<era type="152">शोचू</era>
-						<era type="153">कारेकी</era>
-						<era type="154">जेंटोकू</era>
-						<era type="155">गेंको</era>
-						<era type="156">केम�मू</era>
-						<era type="157">ईंजेन</era>
-						<era type="158">कोकोकू</era>
-						<era type="159">शोहेई</era>
-						<era type="160">केंटोकू</era>
-						<era type="161">बूंचो</era>
-						<era type="162">टेंजो</era>
-						<era type="163">कोर�याकू</era>
-						<era type="164">कोवा</era>
-						<era type="165">जेंचू</era>
-						<era type="166">मेटोकू</era>
-						<era type="167">काकेई</era>
-						<era type="168">कू</era>
-						<era type="169">मेटोकू</era>
-						<era type="170">ओई</era>
-						<era type="171">शोचो</era>
-						<era type="172">ईक�यो</era>
-						<era type="173">काकीत�सू</era>
-						<era type="174">ब�न-अन</era>
-						<era type="175">होटोकू</era>
-						<era type="176">क�योटोकू</era>
-						<era type="177">कोशो</era>
-						<era type="178">चोरोकू</era>
-						<era type="179">कांशो</era>
-						<era type="180">ब�ंशो</era>
-						<era type="181">ओनिन</era>
-						<era type="182">ब�न�मेई</era>
-						<era type="183">चोक�यो</era>
-						<era type="184">ईंटोकू</era>
-						<era type="185">मेईओ</era>
-						<era type="186">ब�ंकी</era>
-						<era type="187">ईशो</era>
-						<era type="188">ताई�ई</era>
-						<era type="189">क�योरोकू</era>
-						<era type="190">टेन�मन</era>
-						<era type="191">कोजी</era>
-						<era type="192">ईरोकू</era>
-						<era type="193">जेंकी</era>
-						<era type="194">टेंशो</era>
-						<era type="195">ब�ंरोकू</era>
-						<era type="196">केईचो</era>
-						<era type="197">जेनवा</era>
-						<era type="198">कान-�ई</era>
-						<era type="199">शोहो</era>
-						<era type="200">केईआन</era>
-						<era type="201">शो</era>
-						<era type="202">मेईर�याकू</era>
-						<era type="203">मानजी</era>
-						<era type="204">कनब�न</era>
-						<era type="205">ईंपो</era>
-						<era type="206">टेंवा</era>
-						<era type="207">जोक�यो</era>
-						<era type="208">जेंरोकू</era>
-						<era type="209">हो�ई</era>
-						<era type="210">शोटूको</era>
-						<era type="211">क�योहो</era>
-						<era type="212">जेंब�न</era>
-						<era type="213">कांपो</era>
-						<era type="214">इंक�यो</era>
-						<era type="215">कान-�न</era>
-						<era type="216">होर�याकू</era>
-						<era type="217">मेईवा</era>
-						<era type="218">अन-�ई</era>
-						<era type="219">टेनमेई</era>
-						<era type="220">कांसेई</era>
-						<era type="221">क�योवा</era>
-						<era type="222">ब�ंका</era>
-						<era type="223">ब�ंसेई</era>
-						<era type="224">टेंपो</era>
-						<era type="225">कोका</era>
-						<era type="226">काई�</era>
-						<era type="227">अंसेई</era>
-						<era type="228">मान-ईन</era>
-						<era type="229">ब�ंक�यौ</era>
-						<era type="230">जेंजी</era>
-						<era type="231">केईओ</era>
-						<era type="232">मेजी</era>
-						<era type="233">ताईशो</era>
-						<era type="234">शोवा</era>
-						<era type="235">हेईसेई</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="232">म</era>
-						<era type="233">ट</era>
-						<era type="234">स</era>
-						<era type="235">ह</era>
-					</eraNarrow>
-				</eras>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">फर�वादिन</month>
-							<month type="2">ओर�दिवेहेस�ट</month>
-							<month type="3">खोरर�दाद</month>
-							<month type="4">टिर</month>
-							<month type="5">मोरदाद</month>
-							<month type="6">शाहरीवर�</month>
-							<month type="7">मेहर</month>
-							<month type="8">अवन</month>
-							<month type="9">अज़र</month>
-							<month type="10">डे</month>
-							<month type="11">बहमन</month>
-							<month type="12">ईस�फन�द�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">फर�वादिन</month>
-							<month type="2">ओर�दिवेहेस�ट</month>
-							<month type="3">खोरर�दाद</month>
-							<month type="4">टिर</month>
-							<month type="5">मोरदाद</month>
-							<month type="6">शाहरीवर�</month>
-							<month type="7">मेहर</month>
-							<month type="8">अवन</month>
-							<month type="9">अज़र</month>
-							<month type="10">डे</month>
-							<month type="11">बहमन</month>
-							<month type="12">ईस�फन�द�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="wide">
-							<month type="1">फर�वादिन</month>
-							<month type="2">ओर�दिवेहेस�ट</month>
-							<month type="3">खोरर�दाद</month>
-							<month type="4">टिर</month>
-							<month type="5">मोरदाद</month>
-							<month type="6">शाहरीवर�</month>
-							<month type="7">मेहर</month>
-							<month type="8">अवन</month>
-							<month type="9">अज़र</month>
-							<month type="10">डे</month>
-							<month type="11">बहमन</month>
-							<month type="12">ईस�फन�द�</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>अज�ञात</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>अंडोरा</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>द�बई</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>काबूल</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�ंटिग�आ</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�ंग�विला</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>टिरेन</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>येरेवन</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>क�यूराकाओ</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>लू�ंडा</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>रोथेरा</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>पॉमर</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>दक�षिणी ध�र�व</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>स�योवा</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>मॉसन</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>डेविस</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>वोस�तोक</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>क़ेसी</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>ड�मोंट ड'अर�विल</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>मैकम�र�डो</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>रियो गालेगोस</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>मेंडोजा</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>सान ज�आन</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>उशूयिया</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ला रिओजा</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>सान ल�ईस</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>कटामार�का</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>ज�जो�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>टोकूमन</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>कोर�डोवा</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ब�यूनस आयरस</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>पागो पागो</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>वियना</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>पर�थ</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>यूक�ला</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>डार�विन�</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�डिलेड</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ब�रोकन हिल</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>क�यूरी</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>मेलबोर�न</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>होबर�ट�</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>लिंडेमान</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>सिडनी</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ब�रिसबेन</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>लोर�ड होवे</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>अरूबा</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>बाकू</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>बारबाडोस</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>ढाका</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>ब�रसल�स</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>ओआगदूगू</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>सोफ़िया</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>बहरीन</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>ब�ज�म�ब�रा</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>पोर�टो-नोवो</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>बरमूडा</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>ब�रूनेइ</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>ला पाज़</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>ईर�नेपे</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>रियो ब�रान�को</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>पोर�टो वेल�हो</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>बोआ विस�ता</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>मनौस</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>कूईआबा</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>केम�पो ग�रान�दे</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>बेलेम</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�रेग�वेना</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>साओ पॉलो</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>बहिया</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>फ़ोर�टालेज़ा</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>मेसीओ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>रेचीफ़े</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>नोरोन�हा</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>नस�साउ</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>थिम�फू</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>गैबोरोन</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>मिंस�क</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>बेलिज़े</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>डौसन</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>व�हाईटहोर�स</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>इनूविक</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>वांकूवर</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>डौसन क�रिक</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येलोनाईफ</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>�डमंटन</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>स�विफ�ट करंट</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>केम�ब�रिज खाड़ी</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>रेजिना</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>विनीपेग</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>रिसोल�यूट</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनी नदी</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>रेंकिन इंलेट</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>कोरल बन�दरगाह</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थंडर खाडी</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगन</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>टोरंटो</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>मोंट�रियल</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>इक�याल�यूईत</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पंग�निर�टंग�</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>मोंक�ट�न</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>हेलिफेक�स</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>गूस खा़ड़ी</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>ग�लेस खा़ड़ी</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ब�लांक-सेबलोन</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>सेंट जोंस</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>कोकोस</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>किन�शासा</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ल�ब�मबाशी</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>बैंग�इ</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>ब�राज़ाविल</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>ज़�यूरिक</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>अबिद�जान</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>रारोटोंगा</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ईस�टर</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>सेंटि�गो</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>दोआला</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>काश�गर</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>उरम�ची</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>चोंग�पिंग</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>हर�बिन</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>बोगोटा</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>कोस�टा रिका</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>हवाना</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>केप वर�डे</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>क�रिसमस</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>निकोसिया</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>बर�लिन</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>डिजिबौटी</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>कोपनहेगन</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>डॉमिनिका</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>संटो डोमिंगो</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>अल�जीरिया</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>गेलापगोस</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>ग�वायाक�विल</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>टैलिन</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>कायरो</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>�ल आइउन</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>असमेरा</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>कैनेरी</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>क�यूटा</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>मैड�रिड</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�डिस अबाबा</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>हेल�सिंकी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>फ़िजी</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>स�टैन�ली</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ट�र�क</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>पोनापे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>कोसरा�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>फ़ैरो</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>पेरिस</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>लिबरविल</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>लंदन</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>ग�रेनाडा</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>बिलिसी</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>कयेन</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�क�रा</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>जिब�राल�टर</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>थ�यूले</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>गॉडथैब</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>स�कोर�सबाइसंड</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>डेनमार�क�षवन</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>बनज�ल</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>कोनाक�री</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>गौडलोप</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>मालाबो</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�थेंस</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>साउथ जॉर�जिया</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>ग�वाटेमाला</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>ग�वाम</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>बिस�साउ</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>ग�याना</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>हा�गका�ग</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>पोर�ट-आउ-प�रिंस</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>ब�डापेस�ट</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>जकार�ता</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>पोंतिआंक</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>मकस�सर</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>जयाप�रा</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>डबलिन</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>येर�सलम</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>चागोस</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>बगदाद</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>तेहरान</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>रेक�याविक</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>रोम</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>जमैका</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>अम�मान</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>टोक�यो</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>नैरोबी</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>बिश�केक</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>नोम पेन�ह</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�ंडरबेरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>किरीतिमाति</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>टरावा</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>कोमोरो</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>सेंट किट�ट�स</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>प�योंगयांग</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>सोल</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>क�वैत</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>केमन</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>अक�ताउ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ओरल</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>अक�टोब</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>केज़ेलोर�डा</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>अल�माटी</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>वियंतियेन</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>बेर�त</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>सेंट ल�सीया</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>वाद�ज़</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>कोलंबो</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>मोन�रोविया</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>मसेरू</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>विल�निअस</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>लक�ज़मबर�ग</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>रिगा</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>त�रिपोली</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>कैसाब�लैंका</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>मोनाको</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>चिसीनौ</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�ंटनानरीवो</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>क�वजलेन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>मजूरो</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>बमाको</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>रंगून</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>होव�ड</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>उलानबाटर</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>चोइबालसन</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>मकाऊ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>सइपान</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>मारटीनीक</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>नौवाक�चॉट</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>मोन�त�सेरत</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>माल�टा</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>मॉरिशस</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>मालदीव</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>ब�लैंटायर</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>टिज�यूआना</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>हर�मोसिल�लो</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>म�जाटलान</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>चिह�आह�आ</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>मोंटेरे</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>मेक�सिको सिटी</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>मेरिडा</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>कैन�कन</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>क�वाला लम�प�र</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>कूचिंग</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>माइप�टो</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>विन�डो�क</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>नूमिया</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>न�यामे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>नोर�फ़ोक</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>लागोस</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>मनाग�आ</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�म�स�टरडम</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>ओस�लो</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>काठमांडू</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>नौरू</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>निय�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>चाथम</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>औकलैंड</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>मस�कट</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>पनामा</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>लीमा</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>टहीटि</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>मार�केसस</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>गैम�बियर</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>पोर�ट मोरेस�बाइ</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>मनीला</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>कराची</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>वॉरसा</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>मिक�वेलोन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>पिट�कैर�न</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>प�योर�तो रिको</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>गाज़ा</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>अज़ोरस</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>मडे�रा</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>लिस�बन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>पलाऊ</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>�सन�क�षन</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>क़तर</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>रियूनियन</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>ब�क�कारेस�ट</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>कालिनिंग�राड</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>मॉस�को</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>वोल�गोग�रेड</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>समारा</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>येकांतिरिंबर�ग</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>ओम�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>नॉवोसिविर�स�क�</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>क�रास�नोयार�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ईर�क�त�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>याकूत�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ब�लाडिवोस�टोक</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>सखालिन</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>मगादन</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>कमचटका</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>अनाडाइर</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>किगालि</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>रियाध</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>ग�वाडलकनाल</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>माहे</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>खार�तूम</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>स�टॉकहोम</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>सिंगाप�र</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>सेंट हेलेना</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>फ़�रीटाउ‰न</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>डकार</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>मोगाडिशू</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>परामरीबो</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>साओ टोम</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>सैल�वेडोर</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>दमास�कस</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>म�बाबेन</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>ग�रै�ड त�र�क</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>जमेना</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>कर�ग�वेलेन</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>लोम</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>बैंगकॉक</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>द�शांबे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>फ़काओफ़ो</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>डिली</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>अश�गाबात</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>ट�यूनिस</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>टोंगाटापू</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>इस�तानब�ल</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>पोर�ट ऑफ़ स�पेन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>फ़�नाफ़ूटी</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>ताइपेइ</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>दार �स सलाम</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उ��गोरोड�</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>कीव</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>सिम�फेरोपोल</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>�ापोरो�े</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>कम�पाला</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>मिडवे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जॉनस�टन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>वेक</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>अडक</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>नोम</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>हॉनॉल�ल�</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>अलास�का</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>यकूतत</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>ज�नेऔ</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>लोस �ंजिलेस</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>बोईस</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>फोनिक�स</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>शिपरेक</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>डेनवर</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>न�यू सालेम</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>मध�य, उत�तरी दाकोता</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>शिकागो</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>मेनोमिनी</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>विंसिनेस</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>पिटर�स�वर�ग</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>टेल सिटी</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>नौक�स, इंडियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>विनामेक</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>मारेंगो</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>इन�डियानापोलिस</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>लोईसविले</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>विवे</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>मोंटीसेलो</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>डेट�रोईट</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>न�यूयार�क</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>मोन�टेवीडियो</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>समरकंड</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>ताशकंद</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>सेंट विंसेंट</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>काराकस</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>टॉरटोला</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>सेंट टॉमस</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>साइगॉन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>�फ़ेट</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>वालिस</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�पिया</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>�डेन</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>मायोत�ते</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>जोहानसबर�ग</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>ल�साका</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>हरारे</exemplarCity>
-			</zone>
-			<metazone type="India">
-				<long>
-					<standard>भारतीय समय</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>deva</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>संय�क�त अरब अमीरात दिर�हाम</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>अफगानी (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>अफगानी</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>अरमेनियाई दरम</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>अर�जेण�टीनी पीसो</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>ऑस�ट�रेलियाई डॉलर</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>ब�ल�गारियाई लेव�</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>बोलिवियाई बोलिवियानो</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>रीयाल</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>कनेडियन डॉलर</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>स�विस फ़�रैंक</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>चिली पीसो</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>य�वान</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>कोलम�बियाई पीसो</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>सर�बिय का ढीनार</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>साईप�रस पाऊंड</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>चेक कोर�ना</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>डच मार�क</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>डेनमार�क क�रोन</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>अल�जीरीयाई दिनार</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>�स�टोनियाई क�रून�</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>मिस�री पाउण�ड</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>य�रो</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>फ़िजी का डालर</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>फ़�रांसीसी फ़�रैंक</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ब�रितन का पौन�ड स�टर�लिग</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>हा�गका�ग डॉलर</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>क�रो�शियन दिनार</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>क�रो�शियाई क�ना</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>हंगरी फोरेंट�</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>इण�डोनेशियाई र�पिया</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>इस�राइली शेकेल</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>भारतीय रूपया</displayName>
-				<symbol>र�.</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>इराकी दिनार</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>इतली का लीरा</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>जापानी येन</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>उत�तर कोरियाई वोन</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>दक�षिण कोरियाई वोन</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>क�वैती दिनार</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>लेबनानी पाउंड</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>श�रीलंकाई र�पया</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>लाईबेरीयाई डालर</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>लिथ�आनियाई लितास</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>मोराक�को दिरहम</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>मोरक�को फ�रैंक</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>मेक�सिको पेसो</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>मलेशियाई रिंगित</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>नामीबियाई डालर</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>नॉर�वे क�रोन</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>नेपाली र�पया</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>न�यूज़ीलैंड डॉलर</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>ओमानी रियाल</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>पेर�वाई न�यूवो सोल</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>फ़िलिपीनी पीसो</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>पाकिस�तानी र�पया</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>पोलिश ज़�लॉटी</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>रोडेशियाई डालर</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>रोमानियाई ल�यू</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>सर�बियन दिनार</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>रूसी रूबल</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>रवांडाई फ�रैंक</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>सउदी रियाल</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>प�रानी सूडानी दिनार</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>सूडानी पाउंड</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>प�राना सूडानी पाउंड</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>स�वीडन क�रोना</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>सिंगाप�र डॉलर</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>स�लोवेनियाई तोलार</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>स�लोवाक कोर�ना</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>सोमाली शिलिंग</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>सूरीनामी डालर</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>सूरीनामी गिल�डर</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>सोवियत रूबल</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>सीरियाई पाउंड</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>थाई बाहत</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>तजाखी रूबल</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>तजाखी सोमोनी</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>प�रानी त�र�की लीरा</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>नई त�र�की लीरा</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>नया ताईवानी डॉलर</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>अमरीकी डालर</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>अमेरीकी डालर (कल)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>अमेरीकी डालर (आज)</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>वेनेज़��लाई बोलिवार</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>वियतनामी डोंग</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>अज�ञात या अवैध म�द�रा</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>दक�षिण अफ़�रीकी रॅण�ड</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} दिन</unitPattern>
-			<unitPattern count="other">{0} दिन</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} घंटा</unitPattern>
-			<unitPattern count="other">{0} घंटे</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} मिनट</unitPattern>
-			<unitPattern count="other">{0} मिनट</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} महीना</unitPattern>
-			<unitPattern count="other">{0} महीने</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} सेकंड</unitPattern>
-			<unitPattern count="other">{0} सेकंड</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} सप�ताह</unitPattern>
-			<unitPattern count="other">{0} सप�ताह</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} साल</unitPattern>
-			<unitPattern count="other">{0} साल</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>हा�</yesstr>
-			<nostr>नहीं</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/hi_IN.xml b/airtime_mvc/library/Zend/Locale/Data/hi_IN.xml
deleted file mode 100644
index e98aa19f0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hi_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.56 $"/>
-		<generation date="$Date: 2009/05/05 23:06:36 $"/>
-		<language type="hi"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/hr.xml b/airtime_mvc/library/Zend/Locale/Data/hr.xml
deleted file mode 100644
index 7f9b64226..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hr.xml
+++ /dev/null
@@ -1,3703 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.111 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="hr"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afarski</language>
-			<language type="ab">abhaski</language>
-			<language type="ace">achinese</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adigejski</language>
-			<language type="ae">avestan</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">ostali afri�ko-azijski</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akanski</language>
-			<language type="akk">akkadian</language>
-			<language type="ale">aleutski</language>
-			<language type="alg">algonquian</language>
-			<language type="alt">južni altai</language>
-			<language type="am">amharik</language>
-			<language type="an">aragonski</language>
-			<language type="ang">staroengleski</language>
-			<language type="anp">angika</language>
-			<language type="apa">apaški</language>
-			<language type="ar">arapski</language>
-			<language type="arc">aramejski</language>
-			<language type="arn">araukanski</language>
-			<language type="arp">arapaho</language>
-			<language type="art">umjetni jezik</language>
-			<language type="arw">arawak</language>
-			<language type="as">asamski</language>
-			<language type="ast">asturijski</language>
-			<language type="ath">athapascan</language>
-			<language type="aus">australski</language>
-			<language type="av">avarski</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">azerbajdžanski</language>
-			<language type="ba">baškirski</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinezijski</language>
-			<language type="bas">basa</language>
-			<language type="bat">balti�ki</language>
-			<language type="be">bjeloruski</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberski</language>
-			<language type="bg">bugarski</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalski</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetanski</language>
-			<language type="br">bretonski</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosanski</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriat</language>
-			<language type="bug">buginski</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalonski</language>
-			<language type="cad">caddo</language>
-			<language type="cai">jezik srednjoameri�kih Indijanaca</language>
-			<language type="car">karipski</language>
-			<language type="cau">kavkaski</language>
-			<language type="cch">atsam</language>
-			<language type="ce">�e�enski</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">keltski</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukese</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook žargon</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">�eroki</language>
-			<language type="chy">�ejenski</language>
-			<language type="cmc">chamic</language>
-			<language type="co">korzi�ki</language>
-			<language type="cop">koptski</language>
-			<language type="cpe">engleski - na osnovi kreolskog ili pidgin</language>
-			<language type="cpf">francuski - na osnovi kreolskog ili pidgin</language>
-			<language type="cpp">kreolski ili pidgin na osnovi portugalskog</language>
-			<language type="cr">cree</language>
-			<language type="crh">krimski turski</language>
-			<language type="crp">kreolski ili pidgin</language>
-			<language type="cs">�eški</language>
-			<language type="csb">kašupski</language>
-			<language type="cu">crkvenoslavenski</language>
-			<language type="cus">kušitski</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">velški</language>
-			<language type="da">danski</language>
-			<language type="dak">dakota jezik</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">njema�ki</language>
-			<language type="de_AT">austrijski njema�ki</language>
-			<language type="de_CH">gornjonjema�ki (švicarski)</language>
-			<language type="del">delavarski</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidski</language>
-			<language type="dsb">luži�kosrpski</language>
-			<language type="dua">duala</language>
-			<language type="dum">nizozemski, srednji</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">staroegipatski</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">gr�ki</language>
-			<language type="elx">elamitski</language>
-			<language type="en">engleski</language>
-			<language type="en_AU">engleski (australski)</language>
-			<language type="en_CA">kanadski engleski</language>
-			<language type="en_GB">engleski (britanski)</language>
-			<language type="en_US">engleski (ameri�ki)</language>
-			<language type="enm">engleski, srednji</language>
-			<language type="eo">esperanto</language>
-			<language type="es">Å¡panjolski</language>
-			<language type="es_419">španjolski (latinoameri�ki)</language>
-			<language type="es_ES">iberski Å¡panjolski</language>
-			<language type="et">estonijski</language>
-			<language type="eu">baskijski</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">perzijski</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulah</language>
-			<language type="fi">finski</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">ugro-finski jezik</language>
-			<language type="fj">fidžijski</language>
-			<language type="fo">faroanski</language>
-			<language type="fon">fon</language>
-			<language type="fr">francuski</language>
-			<language type="fr_CA">kanadski francuski</language>
-			<language type="fr_CH">Å¡vicarski francuski</language>
-			<language type="frm">francuski, srednji</language>
-			<language type="fro">starofrancuski</language>
-			<language type="frr">sjevernofrizijski</language>
-			<language type="frs">isto�nofrizijski</language>
-			<language type="fur">friulski</language>
-			<language type="fy">frizijski</language>
-			<language type="ga">irski</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">Å¡kotski-galski</language>
-			<language type="gem">germanski</language>
-			<language type="gez">staroetiopski</language>
-			<language type="gil">gilbertski</language>
-			<language type="gl">galicijski</language>
-			<language type="gmh">njema�ki, srednji visoki</language>
-			<language type="gn">guarani</language>
-			<language type="goh">staronjema�ki, visoki</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gothic</language>
-			<language type="grb">grebo</language>
-			<language type="grc">starogr�ki</language>
-			<language type="gsw">švicarski njema�ki</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwich'in</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haidi</language>
-			<language type="haw">havajski</language>
-			<language type="he">hebrejski</language>
-			<language type="hi">hindu</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hetitski</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">hrvatski</language>
-			<language type="hsb">gornjoluži�ki</language>
-			<language type="ht">kreolski</language>
-			<language type="hu">mađarski</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armenski</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonezijski</language>
-			<language type="ie">interligua</language>
-			<language type="ig">igbo</language>
-			<language type="ii">sichuan yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaq</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indijski</language>
-			<language type="ine">indoeuropski</language>
-			<language type="inh">ingušetski</language>
-			<language type="io">ido</language>
-			<language type="ira">iranski</language>
-			<language type="iro">irokeški</language>
-			<language type="is">islandski</language>
-			<language type="it">talijanski</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japanski</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judejsko-perzijski</language>
-			<language type="jrb">judejsko-arapski</language>
-			<language type="jv">javanski</language>
-			<language type="ka">gruzijski</language>
-			<language type="kaa">kara-kalpak</language>
-			<language type="kab">kabyle</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">kaje</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardian</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">kojsanski</language>
-			<language type="kho">khotanese</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazaški</language>
-			<language type="kl">kalaallisut</language>
-			<language type="km">kmerski</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">korejski</language>
-			<language type="kok">konkani</language>
-			<language type="kos">naurski</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">karelijski</language>
-			<language type="kro">kru</language>
-			<language type="kru">kuruški</language>
-			<language type="ks">kašmirski</language>
-			<language type="ku">kurdski</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">kornski</language>
-			<language type="ky">kirgiški</language>
-			<language type="la">latinski</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luksemburški</language>
-			<language type="lez">lezgiški</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgish</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laoski</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litvanski</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">latvijski</language>
-			<language type="mad">madurski</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronezijski</language>
-			<language type="mas">masajski</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgaški</language>
-			<language type="mga">irski, srednji</language>
-			<language type="mh">maršalski</language>
-			<language type="mi">maorski</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">ostali jezici</language>
-			<language type="mk">makedonski</language>
-			<language type="mkh">mkh</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolski</language>
-			<language type="mnc">mandžurski</language>
-			<language type="mni">manipurski</language>
-			<language type="mno">manobo</language>
-			<language type="mo">moldavski</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malajski</language>
-			<language type="mt">malteški</language>
-			<language type="mul">više jezika</language>
-			<language type="mun">munda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandski</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burmanski</language>
-			<language type="myn">majanski</language>
-			<language type="myv">mordvinski</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">jezik sjevernoameri�kih Indijanaca</language>
-			<language type="nap">napolitanski</language>
-			<language type="nb">književni norveški</language>
-			<language type="nd">sjeverni ndebele</language>
-			<language type="nds">donjonjema�ki</language>
-			<language type="ne">nepalski</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">nigersko-kordofanski</language>
-			<language type="niu">niujski</language>
-			<language type="nl">nizozemski</language>
-			<language type="nl_BE">flamanski</language>
-			<language type="nn">novonorveški</language>
-			<language type="no">norveški</language>
-			<language type="nog">nogajski</language>
-			<language type="non">staronorveški</language>
-			<language type="nqo">n'ko</language>
-			<language type="nr">južni ndebele</language>
-			<language type="nso">sjeverni sotho</language>
-			<language type="nub">nubijski</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">klasi�ni newari</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">okcitanski</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">orijski</language>
-			<language type="os">osetski</language>
-			<language type="osa">osage</language>
-			<language type="ota">turski - otomanski</language>
-			<language type="oto">otomijski</language>
-			<language type="pa">punjabi</language>
-			<language type="paa">papuanski</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauanski</language>
-			<language type="peo">staroperzijski</language>
-			<language type="phi">filipinski</language>
-			<language type="phn">feni�ki</language>
-			<language type="pi">pali</language>
-			<language type="pl">poljski</language>
-			<language type="pon">pohnpeian</language>
-			<language type="pra">prakrit</language>
-			<language type="pro">staroprovansalski</language>
-			<language type="ps">paštu</language>
-			<language type="pt">portugalski</language>
-			<language type="pt_BR">brazilski portugalski</language>
-			<language type="pt_PT">portugalski (iberijski)</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapa nui</language>
-			<language type="rar">rarotonški</language>
-			<language type="rm">retoromanski</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumunjski</language>
-			<language type="roa">romanski</language>
-			<language type="rom">romski</language>
-			<language type="root">korijenski</language>
-			<language type="ru">ruski</language>
-			<language type="rup">aromunski</language>
-			<language type="rw">kinyarwanda</language>
-			<language type="sa">sanskrtski</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakutski</language>
-			<language type="sai">jezik južnoameri�kih Indijanaca</language>
-			<language type="sal">salishan</language>
-			<language type="sam">samarijanski aramejski</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardski</language>
-			<language type="scn">sicilijski</language>
-			<language type="sco">Å¡kotski</language>
-			<language type="sd">sindhi</language>
-			<language type="se">južni sami</language>
-			<language type="sel">selkupski</language>
-			<language type="sem">semitic</language>
-			<language type="sg">sango</language>
-			<language type="sga">staroirski</language>
-			<language type="sgn">znakovni jezik</language>
-			<language type="sh">srpsko-hrvatski</language>
-			<language type="shn">shan</language>
-			<language type="si">singaleški</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouan</language>
-			<language type="sit">sino-tibetski</language>
-			<language type="sk">slova�ki</language>
-			<language type="sl">slovenski</language>
-			<language type="sla">slavenski</language>
-			<language type="sm">samoanski</language>
-			<language type="sma">sjeverni sami</language>
-			<language type="smi">sami</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalski</language>
-			<language type="sog">sogdien</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanski</language>
-			<language type="sr">srpski</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">svati</language>
-			<language type="ssa">nilo-saharski</language>
-			<language type="st">sesotski</language>
-			<language type="su">sundanski</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerski</language>
-			<language type="sv">Å¡vedski</language>
-			<language type="sw">svahili</language>
-			<language type="syc">klasi�ni sirski</language>
-			<language type="syr">sirijski</language>
-			<language type="ta">tamilski</language>
-			<language type="tai">tajski</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tajik</language>
-			<language type="th">tajlandski</language>
-			<language type="ti">tigrinya</language>
-			<language type="tig">tigriški</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turkmenski</language>
-			<language type="tkl">tokelaunski</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingonski</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">cvana</language>
-			<language type="to">tonga</language>
-			<language type="tog">nyasa tonga</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turski</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatarski</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi</language>
-			<language type="tut">altajski</language>
-			<language type="tvl">tuvaluanski</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahićanski</language>
-			<language type="tyv">tuvinian</language>
-			<language type="udm">udmurtski</language>
-			<language type="ug">uighur</language>
-			<language type="uga">ugaritski</language>
-			<language type="uk">ukrajinski</language>
-			<language type="umb">umbundu</language>
-			<language type="und">nepoznati ili nevažeći jezik</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbe�ki</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vijetnamski</language>
-			<language type="vo">volapük</language>
-			<language type="vot">votic</language>
-			<language type="wa">valonski</language>
-			<language type="wak">wakashan</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">luži�ki</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">japski</language>
-			<language type="yi">jidiš</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">yupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotec</language>
-			<language type="zbl">blissymbols</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kineski</language>
-			<language type="zh_Hans">kineski (pojednostavljeni)</language>
-			<language type="zh_Hant">kineski (tradicionalni)</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">bez jezi�nog sadržaja</language>
-			<language type="zza">zazaki</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arapsko pismo</script>
-			<script type="Armi">aramejsko pismo</script>
-			<script type="Armn">armensko pismo</script>
-			<script type="Avst">avestansko pismo</script>
-			<script type="Bali">balijsko pismo</script>
-			<script type="Batk">batak pismo</script>
-			<script type="Beng">bengalsko pismo</script>
-			<script type="Blis">blissymbols</script>
-			<script type="Bopo">bopomofo pismo</script>
-			<script type="Brah">brahmi pismo</script>
-			<script type="Brai">Braillovo pismo</script>
-			<script type="Bugi">buginsko pismo</script>
-			<script type="Buhd">buhid pismo</script>
-			<script type="Cakm">chakma pismo</script>
-			<script type="Cans">unificirani kanadski aboriđinski slogovi</script>
-			<script type="Cari">karijsko pismo</script>
-			<script type="Cham">�amsko pismo</script>
-			<script type="Cher">�eroki pismo</script>
-			<script type="Cirt">cirth pismo</script>
-			<script type="Copt">koptsko pismo</script>
-			<script type="Cprt">cypriot pismo</script>
-			<script type="Cyrl">ćirilica</script>
-			<script type="Cyrs">staroslavenska crkvena �irilica</script>
-			<script type="Deva">devangari pismo</script>
-			<script type="Dsrt">deseret pismo</script>
-			<script type="Egyd">egipatsko narodno pismo</script>
-			<script type="Egyh">egipatsko hijeratsko pismo</script>
-			<script type="Egyp">egipatski hijeroglifi</script>
-			<script type="Ethi">etiopsko pimo</script>
-			<script type="Geok">gruzijsko khutsuri pismo</script>
-			<script type="Geor">gruzijsko pismo</script>
-			<script type="Glag">glagoljica</script>
-			<script type="Goth">goti�ko pismo</script>
-			<script type="Grek">gr�ko pismo</script>
-			<script type="Gujr">gujarati pismo</script>
-			<script type="Guru">gurmukhi pismo</script>
-			<script type="Hang">hangul pismo</script>
-			<script type="Hani">han pismo</script>
-			<script type="Hano">hanunoo pismo</script>
-			<script type="Hans">pojednostavljeno han pismo</script>
-			<script type="Hant">tradicionalno han pismo</script>
-			<script type="Hebr">hebrejsko pismo</script>
-			<script type="Hira">hiragana pismo</script>
-			<script type="Hmng">pahawh hmong pismo</script>
-			<script type="Hrkt">katakana ili hiragana pismo</script>
-			<script type="Hung">staro mađarsko pismo</script>
-			<script type="Inds">indijsko pismo</script>
-			<script type="Ital">staro talijansko pismo</script>
-			<script type="Java">javansko pismo</script>
-			<script type="Jpan">japansko pismo</script>
-			<script type="Kali">kayah li pismo</script>
-			<script type="Kana">katakana pismo</script>
-			<script type="Khar">kharoshthi pismo</script>
-			<script type="Khmr">kmersko pismo</script>
-			<script type="Knda">kannada pismo</script>
-			<script type="Kore">korejsko pismo</script>
-			<script type="Kthi">kaithi pismo</script>
-			<script type="Lana">lanna pismo</script>
-			<script type="Laoo">laosko pismo</script>
-			<script type="Latf">fraktur latinica</script>
-			<script type="Latg">keltska latinica</script>
-			<script type="Latn">latinica</script>
-			<script type="Lepc">lepcha pismo</script>
-			<script type="Limb">limbu pismo</script>
-			<script type="Lina">linear A pismo</script>
-			<script type="Linb">linear B pismo</script>
-			<script type="Lyci">likijsko pismo</script>
-			<script type="Lydi">lidijsko pismo</script>
-			<script type="Mand">mandai pismo</script>
-			<script type="Mani">manihejsko pismo</script>
-			<script type="Maya">majanski hijeroglifi</script>
-			<script type="Mero">meroitic pismo</script>
-			<script type="Mlym">majalajam pismo</script>
-			<script type="Mong">mongolijsko pismo</script>
-			<script type="Moon">moon pismo</script>
-			<script type="Mtei">meitei mayek pismo</script>
-			<script type="Mymr">mianmarko pismo</script>
-			<script type="Nkoo">n'ko pismo</script>
-			<script type="Ogam">ogham pismo</script>
-			<script type="Olck">ol chiki pismo</script>
-			<script type="Orkh">orkhon pismo</script>
-			<script type="Orya">oriya pismo</script>
-			<script type="Osma">osmanya pismo</script>
-			<script type="Perm">staro permic pismo</script>
-			<script type="Phag">phags-pa pismo</script>
-			<script type="Phli">pisani pahlavi</script>
-			<script type="Phlp">psalter pahlavi</script>
-			<script type="Phlv">pahlavi pismo</script>
-			<script type="Phnx">feni�ko pismo</script>
-			<script type="Plrd">pollard fonetsko pismo</script>
-			<script type="Prti">pisani parthian</script>
-			<script type="Qaai">nasljedno pismo</script>
-			<script type="Rjng">rejang pismo</script>
-			<script type="Roro">rongorongo pismo</script>
-			<script type="Runr">runsko pismo</script>
-			<script type="Samr">samaritansko pismo</script>
-			<script type="Sara">sarati pismo</script>
-			<script type="Saur">saurashtra pismo</script>
-			<script type="Sgnw">znakovno pismo</script>
-			<script type="Shaw">shavian pismo</script>
-			<script type="Sinh">singaleško pismo</script>
-			<script type="Sund">sudansko pismo</script>
-			<script type="Sylo">syloti nagri pismo</script>
-			<script type="Syrc">sirijsko pismo</script>
-			<script type="Syre">sirijsko estrangelo pismo</script>
-			<script type="Syrj">pismo zapadne Sirije</script>
-			<script type="Syrn">pismo isto�ne Sirije</script>
-			<script type="Tagb">tagbanwa pismo</script>
-			<script type="Tale">tai le pismo</script>
-			<script type="Talu">novo tai lue pismo</script>
-			<script type="Taml">tamilsko pismo</script>
-			<script type="Tavt">tai viet pismo</script>
-			<script type="Telu">telugu pismo</script>
-			<script type="Teng">tengwar pismo</script>
-			<script type="Tfng">tifinar</script>
-			<script type="Tglg">tagalog pismo</script>
-			<script type="Thaa">thaana pismo</script>
-			<script type="Thai">tajlandsko pismo</script>
-			<script type="Tibt">tibetansko pismo</script>
-			<script type="Ugar">ugaritsko pismo</script>
-			<script type="Vaii">vai pismo</script>
-			<script type="Visp">Visible Speech</script>
-			<script type="Xpeo">staro perzijsko pismo</script>
-			<script type="Xsux">sumersko-akadsko cuneiform pismo</script>
-			<script type="Yiii">Yi pismo</script>
-			<script type="Zmth">matemati�ko znakovlje</script>
-			<script type="Zsym">simboli</script>
-			<script type="Zxxx">nepisani jezik</script>
-			<script type="Zyyy">zajedni�ko pismo</script>
-			<script type="Zzzz">nepoznato ili nevažeće pismo</script>
-		</scripts>
-		<territories>
-			<territory type="001">Svijet</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Sjevernoameri�ki kontinent</territory>
-			<territory type="005">Južna Amerika</territory>
-			<territory type="009">Oceanija</territory>
-			<territory type="011">Zapadna Afrika</territory>
-			<territory type="013">Centralna Amerika</territory>
-			<territory type="014">Isto�na Afrika</territory>
-			<territory type="015">Sjeverna Afrika</territory>
-			<territory type="017">Središnja Afrika</territory>
-			<territory type="018">Južna Afrika</territory>
-			<territory type="019">Amerike</territory>
-			<territory type="021">Sjeverna Amerika</territory>
-			<territory type="029">Karibi</territory>
-			<territory type="030">Isto�na Azija</territory>
-			<territory type="034">Južna Azija</territory>
-			<territory type="035">Jugoisto�na Azija</territory>
-			<territory type="039">Južna Europa</territory>
-			<territory type="053">Australija i Novi Zeland</territory>
-			<territory type="054">Melanezija</territory>
-			<territory type="057">Mikronezki oblast</territory>
-			<territory type="061">Polinezija</territory>
-			<territory type="062">Južno-centralna Azija</territory>
-			<territory type="142">Azija</territory>
-			<territory type="143">Srednja Azija</territory>
-			<territory type="145">Zapadna Azija</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Isto�na Europa</territory>
-			<territory type="154">Sjeverna Europa</territory>
-			<territory type="155">Zapadna Europa</territory>
-			<territory type="172">Zajednica nezavisnih država</territory>
-			<territory type="419">Latinska Amerika i Karibi</territory>
-			<territory type="830">Kanalski otoci</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Ujedinjeni Arapski Emirati</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua i Barbuda</territory>
-			<territory type="AI">Anguila</territory>
-			<territory type="AL">Albanija</territory>
-			<territory type="AM">Armenija</territory>
-			<territory type="AN">Nizozemski Antili</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktik</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Ameri�ka Samoa</territory>
-			<territory type="AT">Austrija</territory>
-			<territory type="AU">Australija</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandski otoci</territory>
-			<territory type="AZ">Azerbajdžan</territory>
-			<territory type="BA">Bosna i Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladeš</territory>
-			<territory type="BE">Belgija</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bugarska</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Sveti Bartolomej</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolivija</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahami</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Otok Bouvet</territory>
-			<territory type="BW">Bocvana</territory>
-			<territory type="BY">Bjelorusija</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosovi Otoci</territory>
-			<territory type="CD">Demokratska Republika Kongo</territory>
-			<territory type="CF">Srednjoafri�ka Republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Å vicarska</territory>
-			<territory type="CI">Obala Bjelokosti</territory>
-			<territory type="CK">Kukovi Otoci</territory>
-			<territory type="CL">ÄŒile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Kolumbija</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Srbija i Crna Gora</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Zeleni Rt</territory>
-			<territory type="CX">Božićni Otok</territory>
-			<territory type="CY">Cipar</territory>
-			<territory type="CZ">Češka Republika</territory>
-			<territory type="DE">Njema�ka</territory>
-			<territory type="DJ">Džibuti</territory>
-			<territory type="DK">Danska</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikanska Republika</territory>
-			<territory type="DZ">Alžir</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estonija</territory>
-			<territory type="EG">Egipat</territory>
-			<territory type="EH">Zapadna Sahara</territory>
-			<territory type="ER">Eritreja</territory>
-			<territory type="ES">Å panjolska</territory>
-			<territory type="ET">Etiopija</territory>
-			<territory type="FI">Finska</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandski Otoci</territory>
-			<territory type="FM">Mikronezija</territory>
-			<territory type="FO">Farski Otoci</territory>
-			<territory type="FR">Francuska</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Velika Britanija</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzija</territory>
-			<territory type="GF">Francuska Gvajana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grenland</territory>
-			<territory type="GM">Gambija</territory>
-			<territory type="GN">Gvineja</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatorska Gvineja</territory>
-			<territory type="GR">Gr�ka</territory>
-			<territory type="GS">Južna Gruzija i Južni Sendvi� Otoci</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gvineja Bisau</territory>
-			<territory type="GY">Gvajana</territory>
-			<territory type="HK">Hong Kong S.A.R. Kine</territory>
-			<territory type="HM">Otok Heard i Otoci McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Hrvatska</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Mađarska</territory>
-			<territory type="ID">Indonezija</territory>
-			<territory type="IE">Irska</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Otok Man</territory>
-			<territory type="IN">Indija</territory>
-			<territory type="IO">Britanski Teritorij Indijskog Oceana</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italija</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenija</territory>
-			<territory type="KG">Kirgistan</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komori</territory>
-			<territory type="KN">Sveti Kristofor i Nevis</territory>
-			<territory type="KP">Koreja, Sjeverna</territory>
-			<territory type="KR">Južna Koreja</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanski Otoci</territory>
-			<territory type="KZ">Kazakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Sveta Lucija</territory>
-			<territory type="LI">Lihtenštajn</territory>
-			<territory type="LK">Å ri Lanka</territory>
-			<territory type="LR">Liberija</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litva</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">Latvija</territory>
-			<territory type="LY">Libijska Arapska Džamahirija</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavija</territory>
-			<territory type="ME">Crna Gora</territory>
-			<territory type="MF">Sveti Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Maršalovi Otoci</territory>
-			<territory type="MK">Bivša Jugoslavenska Republika Makedonija</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mijanma</territory>
-			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Makao S.A.R. Kine</territory>
-			<territory type="MP">Sjeverni Marijanski Otoci</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mauritanija</territory>
-			<territory type="MS">Montserat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricijus</territory>
-			<territory type="MV">Maldivi</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malezija</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibija</territory>
-			<territory type="NC">Nova Kaledonija</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Otok Norfolk</territory>
-			<territory type="NG">Nigerija</territory>
-			<territory type="NI">Nikaragva</territory>
-			<territory type="NL">Nizozemska</territory>
-			<territory type="NO">Norveška</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Novi Zeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francuska Polinezija</territory>
-			<territory type="PG">Papua Nova Gvineja</territory>
-			<territory type="PH">Filipini</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poljska</territory>
-			<territory type="PM">Sveti Petar i Miguel</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portoriko</territory>
-			<territory type="PS">Palestinsko Podru�je</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragvaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Ostala oceanija</territory>
-			<territory type="QU">Europska Unija</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Rumunjska</territory>
-			<territory type="RS">Srbija</territory>
-			<territory type="RU">Rusija</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudijska Arabija</territory>
-			<territory type="SB">Solomonski Otoci</territory>
-			<territory type="SC">Sejšeli</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Å vedska</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Sveta Helena</territory>
-			<territory type="SI">Slovenija</territory>
-			<territory type="SJ">Svalbard i Jan Mayen</territory>
-			<territory type="SK">Slova�ka</territory>
-			<territory type="SL">Sijera Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalija</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sveti Toma i Prinsipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Sirija</territory>
-			<territory type="SZ">Svazi</territory>
-			<territory type="TC">Turkski i Kaikos Otoci</territory>
-			<territory type="TD">ÄŒad</territory>
-			<territory type="TF">Francuski Južni Teritoriji</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajland</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Isto�ni Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunis</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turska</territory>
-			<territory type="TT">Trinidad i Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajvan</territory>
-			<territory type="TZ">Tanzanija</territory>
-			<territory type="UA">Ukrajina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Ujedinjene Države Manjih Pacifi�kih Otoka</territory>
-			<territory type="US">Sjedinjene Države</territory>
-			<territory type="UY">Urugvaj</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Grad Vatikan</territory>
-			<territory type="VC">Sveti Vincent i Grenadini</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britanski Djevi�anski Otoci</territory>
-			<territory type="VI">Ameri�ki Djevi�anski Otoci</territory>
-			<territory type="VN">Vijetnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis i Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Majote</territory>
-			<territory type="ZA">Južnoafri�ka Republika</territory>
-			<territory type="ZM">Zambija</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">nepoznata ili nevažeća oblast</territory>
-		</territories>
-		<variants>
-			<variant type="1901">tradicionalan njema�ki pravopis</variant>
-			<variant type="1994">standardizirani resian pravopis</variant>
-			<variant type="1996">njema�ka ortografija iz 1996.</variant>
-			<variant type="1606NICT">kasni srednjofrancuski do 1606.</variant>
-			<variant type="1694ACAD">rani moderni francuski</variant>
-			<variant type="AREVELA">isto�no-armenijski</variant>
-			<variant type="AREVMDA">zapadno-armenijski</variant>
-			<variant type="BAKU1926">unificirana turska abeceda</variant>
-			<variant type="BISKE">san giorgio/bila dijalekt</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">IPA fonetika</variant>
-			<variant type="FONUPA">UPA fonetika</variant>
-			<variant type="LIPAW">lipova�ki dijalekt resian jezika</variant>
-			<variant type="MONOTON">monotono</variant>
-			<variant type="NEDIS">natisone dijalekt</variant>
-			<variant type="NJIVA">Gniva/Njiva dijalekt</variant>
-			<variant type="OSOJS">oseacco/osojane dijalekt</variant>
-			<variant type="POLYTON">politono</variant>
-			<variant type="POSIX">ra�unalo</variant>
-			<variant type="REVISED">izmijenjen pravopis</variant>
-			<variant type="ROZAJ">resian</variant>
-			<variant type="SAAHO">saho</variant>
-			<variant type="SCOTLAND">Å¡kotski standardni engleski</variant>
-			<variant type="SCOUSE">scouse</variant>
-			<variant type="SOLBA">stolvizza/solbica dijalekt</variant>
-			<variant type="TARASK">taraskievica pravopis</variant>
-			<variant type="VALENCIA">valencijski</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalendar</key>
-			<key type="collation">poredavanje</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">tradicionalno kinesko poredavanje - Big5</type>
-			<type type="buddhist" key="calendar">budisti�ki kalendar</type>
-			<type type="chinese" key="calendar">kineski kalendar</type>
-			<type type="direct" key="collation">izravno poredavanje</type>
-			<type type="gb2312han" key="collation">pojednostavljeno kinesko poredavanje - GB2312</type>
-			<type type="gregorian" key="calendar">gregorijanski kalendar</type>
-			<type type="hebrew" key="calendar">hebrejski kalendar</type>
-			<type type="indian" key="calendar">indijski nacionalni kalendar</type>
-			<type type="islamic" key="calendar">islamski kalendar</type>
-			<type type="islamic-civil" key="calendar">islamski civilni kalendar</type>
-			<type type="japanese" key="calendar">japanski kalendar</type>
-			<type type="phonebook" key="collation">poredavanje po abecedi</type>
-			<type type="pinyin" key="collation">Pinyin poredavanje</type>
-			<type type="roc" key="calendar">kalendar Republike Kine</type>
-			<type type="stroke" key="collation">Stroke order poredavanje</type>
-			<type type="traditional" key="collation">tradicionalno predavanje</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metri�ki</measurementSystemName>
-			<measurementSystemName type="US">ameri�ki sustav</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">titlecase-firstword</inText>
-		<inText type="fields">titlecase-firstword</inText>
-		<inText type="keys">titlecase-firstword</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="long">titlecase-firstword</inText>
-		<inText type="measurementSystemNames">titlecase-firstword</inText>
-		<inText type="quarterWidth">titlecase-firstword</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="territories">titlecase-words</inText>
-		<inText type="types">titlecase-firstword</inText>
-		<inText type="variants">titlecase-firstword</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a-c � ć d đ {dž} e-l {lj} m n {nj} o p r s š t-v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q w-y]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.MMM.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="chinese">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEE, d.Ml.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d.Ml.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.Ml.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.Ml.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">01.</month>
-							<month type="2">02.</month>
-							<month type="3">03.</month>
-							<month type="4">04.</month>
-							<month type="5">05.</month>
-							<month type="6">06.</month>
-							<month type="7">07.</month>
-							<month type="8">08.</month>
-							<month type="9">09.</month>
-							<month type="10">10.</month>
-							<month type="11">11.</month>
-							<month type="12">12.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">sije�nja</month>
-							<month type="2">velja�e</month>
-							<month type="3">ožujka</month>
-							<month type="4">travnja</month>
-							<month type="5">svibnja</month>
-							<month type="6">lipnja</month>
-							<month type="7">srpnja</month>
-							<month type="8">kolovoza</month>
-							<month type="9">rujna</month>
-							<month type="10">listopada</month>
-							<month type="11">studenoga</month>
-							<month type="12">prosinca</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1.</month>
-							<month type="2">2.</month>
-							<month type="3">3.</month>
-							<month type="4">4.</month>
-							<month type="5">5.</month>
-							<month type="6">6.</month>
-							<month type="7">7.</month>
-							<month type="8">8.</month>
-							<month type="9">9.</month>
-							<month type="10">10.</month>
-							<month type="11">11.</month>
-							<month type="12">12.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">sije�anj</month>
-							<month type="2">velja�a</month>
-							<month type="3">ožujak</month>
-							<month type="4">travanj</month>
-							<month type="5">svibanj</month>
-							<month type="6">lipanj</month>
-							<month type="7">srpanj</month>
-							<month type="8">kolovoz</month>
-							<month type="9">rujan</month>
-							<month type="10">listopad</month>
-							<month type="11">studeni</month>
-							<month type="12">prosinac</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ned</day>
-							<day type="mon">pon</day>
-							<day type="tue">uto</day>
-							<day type="wed">sri</day>
-							<day type="thu">�et</day>
-							<day type="fri">pet</day>
-							<day type="sat">sub</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">nedjelja</day>
-							<day type="mon">ponedjeljak</day>
-							<day type="tue">utorak</day>
-							<day type="wed">srijeda</day>
-							<day type="thu">�etvrtak</day>
-							<day type="fri">petak</day>
-							<day type="sat">subota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">n</day>
-							<day type="mon">p</day>
-							<day type="tue">u</day>
-							<day type="wed">s</day>
-							<day type="thu">�</day>
-							<day type="fri">p</day>
-							<day type="sat">s</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1kv</quarter>
-							<quarter type="2">2kv</quarter>
-							<quarter type="3">3kv</quarter>
-							<quarter type="4">4kv</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraNames>
-						<era type="0">Prije Krista</era>
-						<era type="1">Poslije Krista</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">pr.n.e.</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yyyy.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d.</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE, d.</dateFormatItem>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L.</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL.</dateFormatItem>
-						<dateFormatItem id="MMMd">d.MMM.</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d.MMM.</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y.</dateFormatItem>
-						<dateFormatItem id="yM">M.yyyy.</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d.M.y.</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM.y.</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d.MMM.y.</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y.</dateFormatItem>
-						<dateFormatItem id="yQ">Q. yyyy.</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y.</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE, d.MMM.yy.</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy.</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy.</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy.</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">dd. - dd.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH - HH'h'</greatestDifference>
-							<greatestDifference id="h">HH - HH'h'</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH - HH 'h' v</greatestDifference>
-							<greatestDifference id="h">HH - HH 'h' v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">MM. - MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM. - dd.MM.</greatestDifference>
-							<greatestDifference id="M">dd.MM. - dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM. - E, dd.MM.</greatestDifference>
-							<greatestDifference id="M">E, dd.MM. - E, dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL.-LLL.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd. - dd.MMM.</greatestDifference>
-							<greatestDifference id="M">dd.MMM. - dd.MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd. - E, dd. MMM.</greatestDifference>
-							<greatestDifference id="M">E, dd.MMM. - E, dd.MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y. - y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yyyy. - MM.yyyy.</greatestDifference>
-							<greatestDifference id="y">MM.yyyy. - MM.yyyy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yyyy. - dd.MM.yyyy.</greatestDifference>
-							<greatestDifference id="M">dd.MM.yyyy. - dd.MM.yyyy.</greatestDifference>
-							<greatestDifference id="y">dd.MM.yyyy. - dd.MM.yyyy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yyyy. - E, dd.MM.yyyy.</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yyyy. - E, dd.MM.yyyy.</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yyyy. - E, dd.MM.yyyy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL.-LLL.y.</greatestDifference>
-							<greatestDifference id="y">LLL.y. - LLL.y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd. - dd.MMM.y.</greatestDifference>
-							<greatestDifference id="M">dd.MMM. - dd.MMM.y.</greatestDifference>
-							<greatestDifference id="y">dd.MMM.y. - dd.MMM.y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd. - E, dd.MMM.y.</greatestDifference>
-							<greatestDifference id="M">E, dd.MMM. - E, dd.MMM.y.</greatestDifference>
-							<greatestDifference id="y">E, dd.MMM.y. - E, dd.MMM.y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM. - MM.yyyy.</greatestDifference>
-							<greatestDifference id="y">MM.yyyy. - MM.yyyy.</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>godina</displayName>
-					</field>
-					<field type="month">
-						<displayName>mjesec</displayName>
-					</field>
-					<field type="week">
-						<displayName>tjedan</displayName>
-					</field>
-					<field type="day">
-						<displayName>dan</displayName>
-						<relative type="-3">prije tri dana</relative>
-						<relative type="-2">prekju�er</relative>
-						<relative type="-1">ju�er</relative>
-						<relative type="0">danas</relative>
-						<relative type="1">sutra</relative>
-						<relative type="2">prekosutra</relative>
-						<relative type="3">za tri dana</relative>
-					</field>
-					<field type="weekday">
-						<displayName>dan u tjednu</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>dio dana</displayName>
-					</field>
-					<field type="hour">
-						<displayName>sat</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="japanese">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.MMM.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">E, d.</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d.MMM.</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="yyyy">yy. GGG</dateFormatItem>
-						<dateFormatItem id="yyyyM">MM.yy. GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM.yy. GGGGG</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Q. yy. GGGGG</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraAbbr>
-						<era type="0">prije R.O.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.MMM.y. G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.y.G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyyy">y. G</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">EEE, d.M.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">EEE, d.MMM.y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Q. y. G</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ y. G</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nepoznat ili nevažeći grad</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Južni pol</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Beć</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinšasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lubumbaši</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Uskrsni Otok</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Å angaj</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Zelenortska Republika</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Božić</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikozija</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibuti</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžir</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarska Oto�ja</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Pariz</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atena</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Južna Georgia</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gvajana</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budimpešta</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rim</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvajt</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Sveta Lucija</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricijus</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivi</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšava</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portoriko</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorski otoci</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukurešt</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kalinjingrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadir</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sveta Helena</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska vremenska zona</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Sjeverna Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Središnja, Sjeverna Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Sveti Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Sveti Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<daylight>Acre ljetno vrijeme</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Središnja Afrika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Isto�na Afrika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>Južna Afrika</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Zapadna Afrika</standard>
-					<daylight>Zapadna Afrika, ljetno vrijeme</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>središnje vrijeme</generic>
-					<standard>središnje standardno vrijeme</standard>
-					<daylight>središnje dnevno vrijeme</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>isto�no vrijeme</generic>
-					<standard>isto�no standardno vrijeme</standard>
-					<daylight>isto�no dnevno vrijeme</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>planinsko vrijeme</generic>
-					<standard>planinsko standardno vrijeme</standard>
-					<daylight>planinsko dnevno vrijeme</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>pacifi�ko vrijeme</generic>
-					<standard>pacifi�ko standardno vrijeme</standard>
-					<daylight>pacifi�ko dnevno vrijeme</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>atlantsko vrijeme</generic>
-					<standard>atlantsko standardno vrijeme</standard>
-					<daylight>atlantsko dnevno vrijeme</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>andorska pezeta</displayName>
-				<displayName count="many">andorskih pezeta</displayName>
-				<displayName count="other">andorskih pezeta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE dirham</displayName>
-				<displayName count="few">UAE dirhama</displayName>
-				<displayName count="many">UAE dirhama</displayName>
-				<displayName count="other">UAE dirhama</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afganistanski afgani (1927.-2002.)</displayName>
-				<displayName count="few">afganistanska afgana (AFA)</displayName>
-				<displayName count="many">afganistanskih afgana (AFA)</displayName>
-				<displayName count="one">afganistanski afgan (AFA)</displayName>
-				<displayName count="other">afganistanskih afgana (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afganistanski afgani</displayName>
-				<displayName count="few">afganistanska afgana</displayName>
-				<displayName count="many">afganistanskih afgana</displayName>
-				<displayName count="one">afganistanski afgan</displayName>
-				<displayName count="other">afganistanskih afgana</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>albanski lek</displayName>
-				<displayName count="few">albanska leka</displayName>
-				<displayName count="many">albanskih leka</displayName>
-				<displayName count="one">albanski lek</displayName>
-				<displayName count="other">albanskih leka</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>armenski dram</displayName>
-				<displayName count="few">armenska drama</displayName>
-				<displayName count="many">armenskih drama</displayName>
-				<displayName count="one">armenski dram</displayName>
-				<displayName count="other">armenskih drama</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>nizozemskoantilski gulden</displayName>
-				<displayName count="few">nizozemskoantilska guldena</displayName>
-				<displayName count="many">nizozemskoantilskih guldena</displayName>
-				<displayName count="one">nizozemskoantilski gulden</displayName>
-				<displayName count="other">nizozemskoantilskih guldena</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>angolska kvanza</displayName>
-				<displayName count="few">angolske kvanze</displayName>
-				<displayName count="many">angolskih kvanzi</displayName>
-				<displayName count="one">angolska kvanza</displayName>
-				<displayName count="other">angolskih kvanzi</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>angolska kvanza (1977-1990)</displayName>
-				<displayName count="few">angolske kvanze (AOK)</displayName>
-				<displayName count="many">angolskih kvanzi (AOK)</displayName>
-				<displayName count="one">angolska kvanza (AOK)</displayName>
-				<displayName count="other">angolskih kvanzi (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>angolska nova kvanza (1990-2000)</displayName>
-				<displayName count="few">angolske nove kvanze (AON)</displayName>
-				<displayName count="many">angolskih novih kvanzi (AON)</displayName>
-				<displayName count="one">angolska nova kvanza (AON)</displayName>
-				<displayName count="other">angolskih novih kvanzi (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>angolska kvanza (1995.-1999.)</displayName>
-				<displayName count="few">angolske kvanze reajustado</displayName>
-				<displayName count="many">angolskih kvanzi reajustado</displayName>
-				<displayName count="one">angolska kvanza reajustado</displayName>
-				<displayName count="other">angolskih kvanzi reajustado (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>argentinski austral</displayName>
-				<displayName count="few">argentinska australa</displayName>
-				<displayName count="many">argentinskih australa</displayName>
-				<displayName count="one">argentinski austral</displayName>
-				<displayName count="other">argentinskih australa</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>argentinski pezo (1983-1985)</displayName>
-				<displayName count="few">argentinska peza (ARP)</displayName>
-				<displayName count="many">argentinskih peza (ARP)</displayName>
-				<displayName count="one">argentinski pezo (ARP)</displayName>
-				<displayName count="other">argentinskih peza (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>argentinski pezo</displayName>
-				<displayName count="few">argentinska pezosa</displayName>
-				<displayName count="many">argentinskih pezosa</displayName>
-				<displayName count="one">argentinski pezos</displayName>
-				<displayName count="other">argentinskih pezosa</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>austrijski Å¡iling</displayName>
-				<displayName count="few">austrijska Å¡ilinga</displayName>
-				<displayName count="many">austrijskih Å¡ilinga</displayName>
-				<displayName count="one">austrijski Å¡iling</displayName>
-				<displayName count="other">austrijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>australski dolar</displayName>
-				<displayName count="few">australska dolara</displayName>
-				<displayName count="many">australskih dolara</displayName>
-				<displayName count="one">australski dolar</displayName>
-				<displayName count="other">australskih dolara</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>arupski gulden</displayName>
-				<displayName count="few">arupska guldena</displayName>
-				<displayName count="many">arupskih guldena</displayName>
-				<displayName count="one">arupski gulden</displayName>
-				<displayName count="other">arupskih guldena</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>azerbajdžanski manat (1993-2006)</displayName>
-				<displayName count="few">azerbajdžanska manata (AZM)</displayName>
-				<displayName count="many">azerbajdžanskih manata (AZM)</displayName>
-				<displayName count="one">azerbajdžanski manat (AZM)</displayName>
-				<displayName count="other">azerbajdžanskih manata (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>azerbajdžanski manat</displayName>
-				<displayName count="few">azerbajdžanska manata</displayName>
-				<displayName count="many">azerbajdžanskih manata</displayName>
-				<displayName count="one">azerbajdžanski manat</displayName>
-				<displayName count="other">azerbajdžanskih manata</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>bosansko-hercegova�ki dinar</displayName>
-				<displayName count="few">bosansko-hercegova�ka dinara</displayName>
-				<displayName count="many">bosansko-hercegova�kih dinara</displayName>
-				<displayName count="other">bosansko-hercegova�kih dinara</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>konvertibilna marka</displayName>
-				<displayName count="few">konvertibilne marke</displayName>
-				<displayName count="many">konvertibilnih maraka</displayName>
-				<displayName count="one">konvertibilna marka</displayName>
-				<displayName count="other">konvertibilnih maraka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>barbadoski dolar</displayName>
-				<displayName count="few">barbadoska dolara</displayName>
-				<displayName count="many">barbadoskih dolara</displayName>
-				<displayName count="one">barbadoski dolar</displayName>
-				<displayName count="other">barbadoskih dolara</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka</displayName>
-				<displayName count="few">bangladeške take</displayName>
-				<displayName count="many">bangladeških taka</displayName>
-				<displayName count="one">bangladeška taka</displayName>
-				<displayName count="other">bangladeških taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>belgijski franak (konvertibilan)</displayName>
-				<displayName count="few">belgijska franka (konvertibilna)</displayName>
-				<displayName count="many">belgijskih franaka (konvertibilnih)</displayName>
-				<displayName count="one">belgijski franak (konvertibilan)</displayName>
-				<displayName count="other">belgijskih franaka (konvertibilnih)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>belgijski franak</displayName>
-				<displayName count="few">belgijska franka</displayName>
-				<displayName count="many">belgijskih franaka</displayName>
-				<displayName count="one">belgijski franak</displayName>
-				<displayName count="other">belgijskih franaka</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>belgijski franak (financijski)</displayName>
-				<displayName count="few">belgijska franka (financijska)</displayName>
-				<displayName count="many">belgijskih franaka (financijskih)</displayName>
-				<displayName count="one">belgijski franak (financijski)</displayName>
-				<displayName count="other">belgijskih franaka (financijskih)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>bugarski �vrsti lev</displayName>
-				<displayName count="few">bugarska �vrsta leva</displayName>
-				<displayName count="many">bugarskih �vrstih leva</displayName>
-				<displayName count="one">bugarski �vrsti lev</displayName>
-				<displayName count="other">bugarskih �vrstih leva</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>bugarski novi lev</displayName>
-				<displayName count="few">bugarska leva</displayName>
-				<displayName count="many">bugarskih leva</displayName>
-				<displayName count="one">bugarski lev</displayName>
-				<displayName count="other">bugarskih leva</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>bahreinski dinar</displayName>
-				<displayName count="few">bahreinska dinara</displayName>
-				<displayName count="many">bahreinskih dinara</displayName>
-				<displayName count="one">bahreinski dinar</displayName>
-				<displayName count="other">bahreinskih dinara</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>burundski franak</displayName>
-				<displayName count="few">burundska franka</displayName>
-				<displayName count="many">burundskih franaka</displayName>
-				<displayName count="one">burundski franak</displayName>
-				<displayName count="other">burundskih franaka</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>bermudski dolar</displayName>
-				<displayName count="few">bermudska dolara</displayName>
-				<displayName count="many">bermudskih dolara</displayName>
-				<displayName count="one">bermudski dolar</displayName>
-				<displayName count="other">bermudskih dolara</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>brunejski dolar</displayName>
-				<displayName count="few">brunejska dolara</displayName>
-				<displayName count="many">brunejskih dolara</displayName>
-				<displayName count="one">brunejski dolar</displayName>
-				<displayName count="other">brunejskih dolara</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>bolivijano</displayName>
-				<displayName count="few">bolivijska bolivijana</displayName>
-				<displayName count="many">bolivijskih bolivijana</displayName>
-				<displayName count="one">bolivijski bolivijano</displayName>
-				<displayName count="other">bolivijskih bolivijana</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>bolivijski pezo</displayName>
-				<displayName count="few">bolivijska peza</displayName>
-				<displayName count="many">bolivijskih peza</displayName>
-				<displayName count="one">bolivijski pezo</displayName>
-				<displayName count="other">bolivijskih peza</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>bolivijski mvdol</displayName>
-				<displayName count="few">bolivijska mvdola</displayName>
-				<displayName count="many">bolivijskih mvdola</displayName>
-				<displayName count="one">bolivijski mvdol</displayName>
-				<displayName count="other">bolivijskih mvdola</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>brazilski novi cruzeiro (1967.-1986.)</displayName>
-				<displayName count="few">brazilska nova cruzeira (BRB)</displayName>
-				<displayName count="many">brazilskih novih cruzeira (BRB)</displayName>
-				<displayName count="one">brazilski novi cruzeir (BRB)</displayName>
-				<displayName count="other">brazilskih novih cruzeira (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>brazilski cruzado</displayName>
-				<displayName count="few">brazilska cruzada</displayName>
-				<displayName count="many">brazilskih cruzada</displayName>
-				<displayName count="one">brazilski cruzad</displayName>
-				<displayName count="other">brazilskih cruzada</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>brazilski cruzeiro (1990.-1993.)</displayName>
-				<displayName count="few">brazilska cruzeira (BRE)</displayName>
-				<displayName count="many">brazilskih cruzeira (BRE)</displayName>
-				<displayName count="one">brazilski cruzeir (BRE)</displayName>
-				<displayName count="other">brazilskih cruzeira (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>brazilski real</displayName>
-				<displayName count="few">brazilska reala</displayName>
-				<displayName count="many">brazilskih reala</displayName>
-				<displayName count="one">brazilski real</displayName>
-				<displayName count="other">brazilskih reala</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>brazilski novi cruzado</displayName>
-				<displayName count="few">brazilska nova cruzada</displayName>
-				<displayName count="many">brazilskih novih cruzada</displayName>
-				<displayName count="one">brazilski novi cruzad</displayName>
-				<displayName count="other">brazilskih novih cruzada</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>brazilski cruzeiro</displayName>
-				<displayName count="few">brazilska cruzeira</displayName>
-				<displayName count="many">brazilskih cruzeira</displayName>
-				<displayName count="one">brazilski cruzeiro</displayName>
-				<displayName count="other">brazilskih cruzeira</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>bahamski dolar</displayName>
-				<displayName count="few">bahamska dolara</displayName>
-				<displayName count="many">bahamskih dolara</displayName>
-				<displayName count="other">bahamskih dolara</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>butanski ngultrum</displayName>
-				<displayName count="few">butanska ngultruma</displayName>
-				<displayName count="many">butanskih ngultruma</displayName>
-				<displayName count="one">butanski ngultrum</displayName>
-				<displayName count="other">butanskih ngultruma</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat</displayName>
-				<displayName count="few">kyata</displayName>
-				<displayName count="many">kyata</displayName>
-				<displayName count="one">kyat</displayName>
-				<displayName count="other">kyata</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula</displayName>
-				<displayName count="few">bocvanske pule</displayName>
-				<displayName count="many">bocvanskih pula</displayName>
-				<displayName count="one">bocvanska pula</displayName>
-				<displayName count="other">bocvanskih pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>bjeloruska nova rublja (1994-1999)</displayName>
-				<displayName count="few">bjeloruske nove rublje (BYB)</displayName>
-				<displayName count="many">bjeloruskih novih rublji (BYB)</displayName>
-				<displayName count="one">bjeloruska nova rublja (BYB)</displayName>
-				<displayName count="other">bjeloruskih novih rublji (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>bjeloruska rublja</displayName>
-				<displayName count="few">bjeloruske rublje</displayName>
-				<displayName count="many">bjeloruskih rublji</displayName>
-				<displayName count="one">bjeloruska rublja</displayName>
-				<displayName count="other">bjeloruskih rublji</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>belizeanski dolar</displayName>
-				<displayName count="few">belizeanska dolara</displayName>
-				<displayName count="many">belizeanskih dolara</displayName>
-				<displayName count="one">belizeanski dolar</displayName>
-				<displayName count="other">belizeanskih dolara</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>kanadski dolar</displayName>
-				<displayName count="few">kanadska dolara</displayName>
-				<displayName count="many">kanadskih dolara</displayName>
-				<displayName count="one">kanadski dolar</displayName>
-				<displayName count="other">kanadskih dolara</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>kongoanski franak</displayName>
-				<displayName count="few">kongoanska franka</displayName>
-				<displayName count="many">kongoanskih franaka</displayName>
-				<displayName count="one">kongoanski franak</displayName>
-				<displayName count="other">kongoanskih franaka</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-				<displayName count="few">WIR eura</displayName>
-				<displayName count="many">WIR eura</displayName>
-				<displayName count="one">WIR euro</displayName>
-				<displayName count="other">WIR eura</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å¡vicarski franak</displayName>
-				<displayName count="few">Å¡vicarska franka</displayName>
-				<displayName count="many">Å¡vicarskih franaka</displayName>
-				<displayName count="one">Å¡vicarski franak</displayName>
-				<displayName count="other">Å¡vicarskih franaka</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franak</displayName>
-				<displayName count="few">WIR franka</displayName>
-				<displayName count="many">WIR franaka</displayName>
-				<displayName count="one">WIR franak</displayName>
-				<displayName count="other">WIR franaka</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilean Unidades de Fomento</displayName>
-				<displayName count="few">�ileanska unidades de fomentos</displayName>
-				<displayName count="many">�ileanskih unidades de fomentos</displayName>
-				<displayName count="one">�ileanski unidades de fomentos</displayName>
-				<displayName count="other">�ileanskih unidades de fomentos</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>�ileanski pezo</displayName>
-				<displayName count="few">�ileanska peza</displayName>
-				<displayName count="many">�ileanskih peza</displayName>
-				<displayName count="one">�ileanski pezo</displayName>
-				<displayName count="other">�ileanskih peza</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>renminbi-juan</displayName>
-				<displayName count="few">kineska yuana</displayName>
-				<displayName count="many">kineskih yuana</displayName>
-				<displayName count="one">kineski yuan</displayName>
-				<displayName count="other">kineskih yuana</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>kolumbijski pezo</displayName>
-				<displayName count="few">kolumbijska peza</displayName>
-				<displayName count="many">kolumbijskih peza</displayName>
-				<displayName count="one">kolumbijski pezo</displayName>
-				<displayName count="other">kolumbijskih peza</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-				<displayName count="few">unidad de valor reala</displayName>
-				<displayName count="many">unidad de valor reala</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor reala</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>kostarikanski kolon</displayName>
-				<displayName count="few">kostarikanska kolona</displayName>
-				<displayName count="many">kostarikanskih kolona</displayName>
-				<displayName count="one">kostarikanski kolon</displayName>
-				<displayName count="other">kostarikanskih kolona</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>stari srpski dinar</displayName>
-				<displayName count="few">stara srpska dinara</displayName>
-				<displayName count="many">starih srpskih dinara</displayName>
-				<displayName count="other">starih srpskih dinara</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Czechoslovak Hard Koruna</displayName>
-				<displayName count="few">�ehoslova�ke krune</displayName>
-				<displayName count="many">�ehoslova�kih kruna</displayName>
-				<displayName count="one">�ehoslova�ka kruna</displayName>
-				<displayName count="other">�ehoslova�kih kruna</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>kubanski pezo</displayName>
-				<displayName count="few">kubanska peza</displayName>
-				<displayName count="many">kubanskih peza</displayName>
-				<displayName count="one">kubanski pezo</displayName>
-				<displayName count="other">kubanskih peza</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>zelenortski eskudo</displayName>
-				<displayName count="few">zelenortska eskuda</displayName>
-				<displayName count="many">zelenortskih eskuda</displayName>
-				<displayName count="one">zelenortski eskudo</displayName>
-				<displayName count="other">zelenortskih eskuda</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>ciparska funta</displayName>
-				<displayName count="few">ciparske funte</displayName>
-				<displayName count="many">ciparskih funti</displayName>
-				<displayName count="one">ciparska funta</displayName>
-				<displayName count="other">ciparskih funti</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>�eška kruna</displayName>
-				<displayName count="few">�eške krune</displayName>
-				<displayName count="many">�eških kruna</displayName>
-				<displayName count="one">�eška kruna</displayName>
-				<displayName count="other">�eških kruna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>East German Ostmark</displayName>
-				<displayName count="few">isto�nonjema�ke marke</displayName>
-				<displayName count="many">isto�nonjema�kih marki</displayName>
-				<displayName count="one">isto�nonjema�ka marka</displayName>
-				<displayName count="other">isto�nonjema�kih marki</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>njema�ka marka</displayName>
-				<displayName count="few">njema�ke marke</displayName>
-				<displayName count="many">njema�kih marki</displayName>
-				<displayName count="one">njema�ka marka</displayName>
-				<displayName count="other">njema�kih marki</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>džibutski franak</displayName>
-				<displayName count="few">džibutska franka</displayName>
-				<displayName count="many">džibutskih franaka</displayName>
-				<displayName count="one">džibutski franak</displayName>
-				<displayName count="other">džibutskih franaka</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>danska kruna</displayName>
-				<displayName count="few">danske krune</displayName>
-				<displayName count="many">danskih kruna</displayName>
-				<displayName count="one">danska kruna</displayName>
-				<displayName count="other">danskih kruna</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominikanski pezo</displayName>
-				<displayName count="few">dominikanska peza</displayName>
-				<displayName count="many">dominikanskih peza</displayName>
-				<displayName count="one">dominikanski pezo</displayName>
-				<displayName count="other">dominikanskih peza</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>alžirski dinar</displayName>
-				<displayName count="few">alžirska dinara</displayName>
-				<displayName count="many">alžirskih dinara</displayName>
-				<displayName count="one">alžirski dinar</displayName>
-				<displayName count="other">alžirskih dinara</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuador Sucre</displayName>
-				<displayName count="few">ekvatorske sucre</displayName>
-				<displayName count="many">ekvatorskih sucri</displayName>
-				<displayName count="one">evatorska sucra</displayName>
-				<displayName count="other">ekvatorskih sucri</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuador Unidad de Valor Constante (UVC)</displayName>
-				<displayName count="few">ekvatorska unidad de valor constante (UVC)</displayName>
-				<displayName count="many">ekvatorskih unidad de valor constante (UVC)</displayName>
-				<displayName count="one">ekvatorski unidad de valor constante (UVC)</displayName>
-				<displayName count="other">ekvatorskih unidad de valor constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>estonska kruna</displayName>
-				<displayName count="few">estonske krune</displayName>
-				<displayName count="many">estonskih kruna</displayName>
-				<displayName count="one">estonska kruna</displayName>
-				<displayName count="other">estonskih kruna</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>egipatska funta</displayName>
-				<displayName count="few">egipatske funte</displayName>
-				<displayName count="many">egipatskih funti</displayName>
-				<displayName count="one">egipatska funta</displayName>
-				<displayName count="other">egipatskih funti</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>nakfa</displayName>
-				<displayName count="few">eritrejske nakfe</displayName>
-				<displayName count="many">eritrejskih nakfi</displayName>
-				<displayName count="one">eritrejska nakfa</displayName>
-				<displayName count="other">eritrejskih nakfi</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>španjolska pezeta (A ra�un)</displayName>
-				<displayName count="few">španjolske pezete (A ra�un)</displayName>
-				<displayName count="many">španjolskih pezeta (A ra�un)</displayName>
-				<displayName count="one">španjolska pezeta (A ra�un)</displayName>
-				<displayName count="other">španjolskih pezeta (A ra�un)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>španjolska pezeta (konvertibilni ra�un)</displayName>
-				<displayName count="few">španjolske pezete (konvertibilan ra�un)</displayName>
-				<displayName count="many">španjolskih pezeta (konvertibilan ra�un)</displayName>
-				<displayName count="one">španjolska pezeta (konvertibilan ra�un)</displayName>
-				<displayName count="other">španjolskih pezeta (konvertibilan ra�un)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Å¡panjolska pezeta</displayName>
-				<displayName count="few">Å¡panjolske pezete</displayName>
-				<displayName count="many">Å¡panjolskih pezeta</displayName>
-				<displayName count="one">Å¡panjolska pezeta</displayName>
-				<displayName count="other">Å¡panjolskih pezeta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>etiopski bir</displayName>
-				<displayName count="few">etiopska bira</displayName>
-				<displayName count="many">etiopskih bira</displayName>
-				<displayName count="one">etiopski bir</displayName>
-				<displayName count="other">etiopskih bira</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="few">eura</displayName>
-				<displayName count="many">eura</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">eura</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>finska marka</displayName>
-				<displayName count="few">finske marke</displayName>
-				<displayName count="many">finskih marki</displayName>
-				<displayName count="one">finska marka</displayName>
-				<displayName count="other">finskih marki</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>fidžijski dolar</displayName>
-				<displayName count="few">fidžijska dolara</displayName>
-				<displayName count="many">fidžijskih dolara</displayName>
-				<displayName count="one">fidžijski dolar</displayName>
-				<displayName count="other">fidžijskih dolara</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>falklandska funta</displayName>
-				<displayName count="few">falklandske funte</displayName>
-				<displayName count="many">falklandskih funti</displayName>
-				<displayName count="one">falklandska funta</displayName>
-				<displayName count="other">falklandskih funti</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>francuski franak</displayName>
-				<displayName count="few">francuska franka</displayName>
-				<displayName count="many">francuskih franaka</displayName>
-				<displayName count="one">francuski franak</displayName>
-				<displayName count="other">francuskih franaka</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>britanska funta</displayName>
-				<displayName count="few">britanske funte</displayName>
-				<displayName count="many">britanskih funti</displayName>
-				<displayName count="one">britanska funta</displayName>
-				<displayName count="other">britanskih funti</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgian Kupon Larit</displayName>
-				<displayName count="few">gruzijska kupon larita</displayName>
-				<displayName count="many">gruzijskih kupon larita</displayName>
-				<displayName count="one">gruzijski kupon larit</displayName>
-				<displayName count="other">gruzijskih kupon larita</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari</displayName>
-				<displayName count="few">gruzijska lara</displayName>
-				<displayName count="many">gruzijskih lara</displayName>
-				<displayName count="one">gruzijski lar</displayName>
-				<displayName count="other">gruzijskih lara</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ganski cedi (1979.-2007.)</displayName>
-				<displayName count="few">ganska ceda (GHC)</displayName>
-				<displayName count="many">ganskih ceda (GHC)</displayName>
-				<displayName count="one">ganski cedi (GHC)</displayName>
-				<displayName count="other">ganskih ceda (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>ganski cedi</displayName>
-				<displayName count="few">ganska ceda</displayName>
-				<displayName count="many">ganskih ceda</displayName>
-				<displayName count="one">ganski cedi</displayName>
-				<displayName count="other">ganskih ceda</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>gibraltarska funta</displayName>
-				<displayName count="few">gibraltarske funte</displayName>
-				<displayName count="many">gibraltarskih funti</displayName>
-				<displayName count="one">gibraltarska funta</displayName>
-				<displayName count="other">gibraltarskih funti</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi</displayName>
-				<displayName count="few">gambijska dalasa</displayName>
-				<displayName count="many">gambijskih dalasa</displayName>
-				<displayName count="one">gambijski dalas</displayName>
-				<displayName count="other">gambijskih dalasa</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>gvinejski franak</displayName>
-				<displayName count="few">gvinejska franka</displayName>
-				<displayName count="many">gvinejskih franaka</displayName>
-				<displayName count="one">gvinejski franak</displayName>
-				<displayName count="other">gvinejskih franaka</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>gvinejski syli</displayName>
-				<displayName count="few">gvinejska sylija</displayName>
-				<displayName count="many">gvinejskih sylija</displayName>
-				<displayName count="one">gvinejski syli</displayName>
-				<displayName count="other">gvinejskih sylija</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Equatorial Guinea Ekwele Guineana</displayName>
-				<displayName count="few">gvinejska ekwele</displayName>
-				<displayName count="many">gvinejskih ekwele</displayName>
-				<displayName count="one">gvinejska ekwele</displayName>
-				<displayName count="other">gvinejskih ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>gr�ka drahma</displayName>
-				<displayName count="few">gr�ke drahme</displayName>
-				<displayName count="many">gr�kih drahmi</displayName>
-				<displayName count="one">gr�ka drahma</displayName>
-				<displayName count="other">gr�kih drahmi</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>kvecal</displayName>
-				<displayName count="few">gvatemalska kvecala</displayName>
-				<displayName count="many">gvatemalskih kvecala</displayName>
-				<displayName count="one">gvatemalski kvecal</displayName>
-				<displayName count="other">gvatemalskih kvecala</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>portugalski gvineja eskudo</displayName>
-				<displayName count="few">gvinejska eskuda</displayName>
-				<displayName count="many">gvinejskih eskuda</displayName>
-				<displayName count="one">gvinejski eskudo</displayName>
-				<displayName count="other">gvinejskih eskuda</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>gvinejskobisauski pezo</displayName>
-				<displayName count="few">gvinejskobisauska peza</displayName>
-				<displayName count="many">gvinejskobisauskih peza</displayName>
-				<displayName count="one">gvinejskobisauski pezo</displayName>
-				<displayName count="other">gvinejskobisauskih peza</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>gvajanski dolar</displayName>
-				<displayName count="few">gvajanska dolara</displayName>
-				<displayName count="many">gvajanskih dolara</displayName>
-				<displayName count="one">gvajanski dolar</displayName>
-				<displayName count="other">gvajanskih dolara</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>hongkonški dolar</displayName>
-				<displayName count="few">honkonška dolara</displayName>
-				<displayName count="many">honkonških dolara</displayName>
-				<displayName count="one">honkonški dolar</displayName>
-				<displayName count="other">honkonških dolara</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>honduraška lempira</displayName>
-				<displayName count="few">honduraške lempire</displayName>
-				<displayName count="many">honduraških lempira</displayName>
-				<displayName count="one">honduraška lempira</displayName>
-				<displayName count="other">honduraških lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>hrvatski dinar</displayName>
-				<displayName count="few">hrvatska dinara</displayName>
-				<displayName count="many">hrvatskih dinara</displayName>
-				<displayName count="one">hrvatski dinar</displayName>
-				<displayName count="other">hrvatskih dinara</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna</displayName>
-				<displayName count="few">kune</displayName>
-				<displayName count="many">kuna</displayName>
-				<displayName count="one">kuna</displayName>
-				<displayName count="other">kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>haićanski gourd</displayName>
-				<displayName count="few">haićanska gourda</displayName>
-				<displayName count="many">haićanskih gourda</displayName>
-				<displayName count="one">haićanski gourd</displayName>
-				<displayName count="other">haićanskih gourda</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>mađarska forinta</displayName>
-				<displayName count="few">mađarske forinte</displayName>
-				<displayName count="many">mađarskih forinti</displayName>
-				<displayName count="one">mađarska forinta</displayName>
-				<displayName count="other">mađarskih forinti</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>indonezijska rupija</displayName>
-				<displayName count="few">indonezijske rupije</displayName>
-				<displayName count="many">indonezijskih rupija</displayName>
-				<displayName count="one">indonezijska rupija</displayName>
-				<displayName count="other">indonezijskih rupija</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>irska funta</displayName>
-				<displayName count="few">irske funte</displayName>
-				<displayName count="many">irskih funti</displayName>
-				<displayName count="one">irska funta</displayName>
-				<displayName count="other">irskih funti</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>izraelska funta</displayName>
-				<displayName count="few">izraelske funte</displayName>
-				<displayName count="many">izraelskih funti</displayName>
-				<displayName count="one">izraelska funta</displayName>
-				<displayName count="other">izraelskih funti</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>stari izraelski Å¡ekel</displayName>
-				<displayName count="few">stara izraelska Å¡ekela</displayName>
-				<displayName count="many">starih izraelskih Å¡ekela</displayName>
-				<displayName count="one">stari izraelski Å¡ekel</displayName>
-				<displayName count="other">starih izraelskih Å¡ekela</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>novi izraelski Å¡ekel</displayName>
-				<displayName count="few">nova izraelska Å¡ekela</displayName>
-				<displayName count="many">novih izraelskih Å¡ekela</displayName>
-				<displayName count="one">novi izraelski Å¡ekel</displayName>
-				<displayName count="other">novih izraelskih Å¡ekela</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>indijska rupija</displayName>
-				<displayName count="few">indijske rupije</displayName>
-				<displayName count="many">indijskih rupija</displayName>
-				<displayName count="one">indijska rupija</displayName>
-				<displayName count="other">indijskih rupija</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>ira�ki dinar</displayName>
-				<displayName count="few">ira�ka dinara</displayName>
-				<displayName count="many">ira�kih dinara</displayName>
-				<displayName count="one">ira�ki dinar</displayName>
-				<displayName count="other">ira�kih dinara</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>iranski rijal</displayName>
-				<displayName count="few">iranska rijala</displayName>
-				<displayName count="many">iranskih rijala</displayName>
-				<displayName count="one">iranski rijal</displayName>
-				<displayName count="other">iranskih rijala</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>stara islandska kruna</displayName>
-				<displayName count="few">stare islandske krune</displayName>
-				<displayName count="many">starih islandskih kruna</displayName>
-				<displayName count="one">stara islandska kruna</displayName>
-				<displayName count="other">starih islandskih kruna</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>islandska kruna</displayName>
-				<displayName count="few">islandske krune</displayName>
-				<displayName count="many">islandskih kruna</displayName>
-				<displayName count="one">islandska kruna</displayName>
-				<displayName count="other">islandskih kruna</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Talijanska lira</displayName>
-				<displayName count="few">talijanske lire</displayName>
-				<displayName count="many">talijanskih lira</displayName>
-				<displayName count="one">talijanska lira</displayName>
-				<displayName count="other">talijanskih lira</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>jamaj�anski dolar</displayName>
-				<displayName count="few">jamaj�anska dolara</displayName>
-				<displayName count="many">jamaj�anskih dolara</displayName>
-				<displayName count="one">jamaj�anski dolar</displayName>
-				<displayName count="other">jamaj�anskih dolara</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>jordanski dinar</displayName>
-				<displayName count="few">jordanska dinara</displayName>
-				<displayName count="many">jordanskih dinara</displayName>
-				<displayName count="one">jordanski dinar</displayName>
-				<displayName count="other">jordanskih dinara</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>japanski jen</displayName>
-				<displayName count="few">japanska jena</displayName>
-				<displayName count="many">japanskih jena</displayName>
-				<displayName count="one">japanski jen</displayName>
-				<displayName count="other">japanskih jena</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>kenijski Å¡iling</displayName>
-				<displayName count="few">kenijska Å¡ilinga</displayName>
-				<displayName count="many">kenijskih Å¡ilinga</displayName>
-				<displayName count="one">kenijski Å¡iling</displayName>
-				<displayName count="other">kenijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>kirgiski som</displayName>
-				<displayName count="few">kirgijska soma</displayName>
-				<displayName count="many">kirgijskih soma</displayName>
-				<displayName count="one">kirgijski som</displayName>
-				<displayName count="other">kirgijskih soma</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>rijal</displayName>
-				<displayName count="few">kambođanska rijala</displayName>
-				<displayName count="many">kambođanskih rijala</displayName>
-				<displayName count="one">kambođanski rijal</displayName>
-				<displayName count="other">kambođanskih rijala</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>komorski franak</displayName>
-				<displayName count="few">komorska franka</displayName>
-				<displayName count="many">komorskih franaka</displayName>
-				<displayName count="one">komorski franak</displayName>
-				<displayName count="other">komorskih franaka</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>sjevernokorejski won</displayName>
-				<displayName count="few">sjevernokorejska wona</displayName>
-				<displayName count="many">sjevernokorejskih wona</displayName>
-				<displayName count="one">sjevernokorejski won</displayName>
-				<displayName count="other">sjevernokorejskih wona</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>južnokorejski won</displayName>
-				<displayName count="few">južnokorejska wona</displayName>
-				<displayName count="many">južnokorejskih wona</displayName>
-				<displayName count="other">južnokorejskih wona</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>kuvajtski dinar</displayName>
-				<displayName count="few">kuvajtska dinara</displayName>
-				<displayName count="many">kuvajtskih dinara</displayName>
-				<displayName count="one">kuvajtski dinar</displayName>
-				<displayName count="other">kuvajtskih dinara</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>kajmanski dolar</displayName>
-				<displayName count="few">kajmanska dolara</displayName>
-				<displayName count="many">kajmanskih dolara</displayName>
-				<displayName count="one">kajmanski dolar</displayName>
-				<displayName count="other">kajmanskih dolara</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>kazahstanski tenge</displayName>
-				<displayName count="few">kazahstanska tengea</displayName>
-				<displayName count="many">kazahstanskih tengea</displayName>
-				<displayName count="one">kazahstanski tenge</displayName>
-				<displayName count="other">kazahstanskih tengea</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip</displayName>
-				<displayName count="few">laoska kipa</displayName>
-				<displayName count="many">laoskih kipa</displayName>
-				<displayName count="one">laoski kip</displayName>
-				<displayName count="other">laoskih kipa</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>libanonska funta</displayName>
-				<displayName count="few">libanonske funte</displayName>
-				<displayName count="many">libanonskih funti</displayName>
-				<displayName count="one">libanonska funta</displayName>
-				<displayName count="other">libanonskih funti</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Å¡rilanska rupija</displayName>
-				<displayName count="few">Å¡rilankanske rupije</displayName>
-				<displayName count="many">Å¡rilankanskih rupija</displayName>
-				<displayName count="one">Å¡rilankanska rupija</displayName>
-				<displayName count="other">Å¡rilankanskih rupija</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>liberijski dolar</displayName>
-				<displayName count="few">liberijska dolara</displayName>
-				<displayName count="many">liberijskih dolara</displayName>
-				<displayName count="one">liberijski dolar</displayName>
-				<displayName count="other">liberijskih dolara</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>loti</displayName>
-				<displayName count="few">lesoto lotija</displayName>
-				<displayName count="many">lesoto lotija</displayName>
-				<displayName count="one">lesoto loti</displayName>
-				<displayName count="other">lesoto lotija</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litavski litas</displayName>
-				<displayName count="few">litavska litasa</displayName>
-				<displayName count="many">litavskih litasa</displayName>
-				<displayName count="one">litavski litas</displayName>
-				<displayName count="other">litavskih litasa</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>litavski talonas</displayName>
-				<displayName count="few">litavska talonasa</displayName>
-				<displayName count="many">litavskih talonasa</displayName>
-				<displayName count="one">litavski talonas</displayName>
-				<displayName count="other">litavskih talonasa</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luksemburški konvertibilni franak</displayName>
-				<displayName count="few">luksemburška konvertibilna franka</displayName>
-				<displayName count="many">luksemburških konvertibilnih franaka</displayName>
-				<displayName count="one">luksemburški konvertibilni franak</displayName>
-				<displayName count="other">luksemburških konvertibilnih franaka</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>luksemburški franak</displayName>
-				<displayName count="few">luksemburška franka</displayName>
-				<displayName count="many">luksemburških franaka</displayName>
-				<displayName count="one">luksemburški franak</displayName>
-				<displayName count="other">luksemburških franaka</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luksemburški financijski franak</displayName>
-				<displayName count="few">luksemburška financijska franka</displayName>
-				<displayName count="many">luksemburških financijskih franaka</displayName>
-				<displayName count="one">luksemburški financijski franak</displayName>
-				<displayName count="other">luksemburških financijskih franaka</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>letonski lats</displayName>
-				<displayName count="few">letonska latsa</displayName>
-				<displayName count="many">letonskih latsa</displayName>
-				<displayName count="one">letonski lats</displayName>
-				<displayName count="other">letonskih latsa</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvian Ruble</displayName>
-				<displayName count="few">letonske rublje</displayName>
-				<displayName count="many">letonskih rublji</displayName>
-				<displayName count="one">letonska rublja</displayName>
-				<displayName count="other">letonskih rublji</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>libijski dinar</displayName>
-				<displayName count="few">libijska dinara</displayName>
-				<displayName count="many">libijskih dinara</displayName>
-				<displayName count="one">libijski dinar</displayName>
-				<displayName count="other">libijskih dinara</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>marokanski dirham</displayName>
-				<displayName count="few">marokanska dirhama</displayName>
-				<displayName count="many">marokanskih dirhama</displayName>
-				<displayName count="one">marokanski dirham</displayName>
-				<displayName count="other">marokanskih dirhama</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>marokanski franak</displayName>
-				<displayName count="few">marokanska franka</displayName>
-				<displayName count="many">marokanskih franaka</displayName>
-				<displayName count="one">marokanski franak</displayName>
-				<displayName count="other">marokanskih franaka</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>moldavski lej</displayName>
-				<displayName count="few">moldavska leja</displayName>
-				<displayName count="many">moldavskih leja</displayName>
-				<displayName count="one">moldavski lej</displayName>
-				<displayName count="other">moldavskih leja</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>madagaskarski ariary</displayName>
-				<displayName count="few">madagaskarska ariarija</displayName>
-				<displayName count="many">madagaskarskih ariarija</displayName>
-				<displayName count="one">madagaskarski ariary</displayName>
-				<displayName count="other">madagaskarskih ariarija</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>madagaskarski franak</displayName>
-				<displayName count="few">madagaskarska franka</displayName>
-				<displayName count="many">madagaskarskih franaka</displayName>
-				<displayName count="one">madagaskarski franak</displayName>
-				<displayName count="other">madagaskarskih franaka</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>makedonski denar</displayName>
-				<displayName count="few">makedonska dinara</displayName>
-				<displayName count="many">makedonskih dinara</displayName>
-				<displayName count="one">makedonski dinar</displayName>
-				<displayName count="other">makedonskih dinara</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>CFA franak</displayName>
-				<displayName count="few">malijska franka</displayName>
-				<displayName count="many">malijskih franaka</displayName>
-				<displayName count="one">malijski franak</displayName>
-				<displayName count="other">malijskih franaka</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmar Kyat</displayName>
-				<displayName count="few">mjanmarska kjata</displayName>
-				<displayName count="many">mjanmarskih kjata</displayName>
-				<displayName count="one">mjanmarski kjat</displayName>
-				<displayName count="other">mjanmarskih kjata</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>mongolski tugrik</displayName>
-				<displayName count="few">mongolska tugrika</displayName>
-				<displayName count="many">mongolskih tugrika</displayName>
-				<displayName count="one">mongolski tugrik</displayName>
-				<displayName count="other">mongolskih tugrika</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macao Pataca</displayName>
-				<displayName count="few">pataka</displayName>
-				<displayName count="many">pataka</displayName>
-				<displayName count="one">patak</displayName>
-				<displayName count="other">pataka</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>mauritanijska ouguja</displayName>
-				<displayName count="few">mauritanijske ouguje</displayName>
-				<displayName count="many">mauritanijskih ouguja</displayName>
-				<displayName count="one">mauritanijska ouguja</displayName>
-				<displayName count="other">mauritanijskih ouguja</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>malteška lira</displayName>
-				<displayName count="few">malteške lire</displayName>
-				<displayName count="many">malteških lira</displayName>
-				<displayName count="one">malteška lira</displayName>
-				<displayName count="other">malteških lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>malteška funta</displayName>
-				<displayName count="few">malteške funte</displayName>
-				<displayName count="many">malteških funti</displayName>
-				<displayName count="one">malteška funta</displayName>
-				<displayName count="other">malteških funti</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>mauricijska rupija</displayName>
-				<displayName count="few">mauricijske rupije</displayName>
-				<displayName count="many">mauricijskih rupija</displayName>
-				<displayName count="one">mauricijska rupija</displayName>
-				<displayName count="other">mauricijskih rupija</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>maldivijska rufija</displayName>
-				<displayName count="few">maldivijske rufije</displayName>
-				<displayName count="many">maldivijskih rufija</displayName>
-				<displayName count="one">maldivijska rufija</displayName>
-				<displayName count="other">maldivijskih rufija</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawi Kwacha</displayName>
-				<displayName count="few">malavijske kva�e</displayName>
-				<displayName count="many">malavijskih kva�a</displayName>
-				<displayName count="one">malavijska kva�a</displayName>
-				<displayName count="other">malavijskih kva�a</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>meksi�ki pezo</displayName>
-				<displayName count="few">meksi�ka peza</displayName>
-				<displayName count="many">meksi�kih peza</displayName>
-				<displayName count="one">meksi�ki pezo</displayName>
-				<displayName count="other">meksi�kih peza</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>meksi�ki srebrni pezo (1861-1992)</displayName>
-				<displayName count="few">meksi�ka srebrna peza (MXP)</displayName>
-				<displayName count="many">meksi�kih srebrnih peza (MXP)</displayName>
-				<displayName count="one">meksi�ki srebrni pezo (MXP)</displayName>
-				<displayName count="other">meksi�kih srebrnih peza (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexican Unidad de Inversion (UDI)</displayName>
-				<displayName count="few">Mexican unidads de inversion (UDI)</displayName>
-				<displayName count="many">Mexican unidads de inversion (UDI)</displayName>
-				<displayName count="one">Mexican unidads de inversion (UDI)</displayName>
-				<displayName count="other">Mexican unidads de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>malezijski ringit</displayName>
-				<displayName count="few">malezijska ringita</displayName>
-				<displayName count="many">malezijskih ringita</displayName>
-				<displayName count="one">malezijski ringit</displayName>
-				<displayName count="other">malezijskih ringita</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>mozambijski eskudo</displayName>
-				<displayName count="few">mozambijska eskuda</displayName>
-				<displayName count="many">mozambijskih eskuda</displayName>
-				<displayName count="one">mozambijski eskudo</displayName>
-				<displayName count="other">mozambijskih eskuda</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>stari mozambijski metikal</displayName>
-				<displayName count="few">stara mozambijska metikala</displayName>
-				<displayName count="many">starih mozambijskih metikala</displayName>
-				<displayName count="one">stari mozambijski metikal</displayName>
-				<displayName count="other">starih mozambijskih metikala</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>mozambijski metikal</displayName>
-				<displayName count="few">mozambijska metikala</displayName>
-				<displayName count="many">mozambijskih metikala</displayName>
-				<displayName count="one">mozambijski metikal</displayName>
-				<displayName count="other">mozambijskih metikala</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>namibijski dolar</displayName>
-				<displayName count="few">namibijska dolara</displayName>
-				<displayName count="many">namibijskih dolara</displayName>
-				<displayName count="one">namibijski dolar</displayName>
-				<displayName count="other">namibijskih dolara</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>nigerijska naira</displayName>
-				<displayName count="few">nigerijska naira</displayName>
-				<displayName count="many">nigerijskih naira</displayName>
-				<displayName count="one">nigerijski nair</displayName>
-				<displayName count="other">nigerijskih naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>nikaragvanska kordoba</displayName>
-				<displayName count="few">nikaragvanske kordobe</displayName>
-				<displayName count="many">nikaragvanskih kordoba</displayName>
-				<displayName count="one">nikaragvanska kordoba</displayName>
-				<displayName count="other">nikaragvanskih kordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>nikaragvanska zlatna kordoba</displayName>
-				<displayName count="few">nikaragvanske zlatne kordobe</displayName>
-				<displayName count="many">nikaragvanskih zlatnih kordoba</displayName>
-				<displayName count="one">nikaragvanska zlatna kordoba</displayName>
-				<displayName count="other">nikaragvanskih zlatnih kordoba</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>nizozemski gulden</displayName>
-				<displayName count="few">nizozemska guldena</displayName>
-				<displayName count="many">nizozemskih guldena</displayName>
-				<displayName count="one">nizozemski gulden</displayName>
-				<displayName count="other">nizozemskih guldena</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>norveška kruna</displayName>
-				<displayName count="few">norveške krune</displayName>
-				<displayName count="many">norveških kruna</displayName>
-				<displayName count="one">norveška kruna</displayName>
-				<displayName count="other">norveških kruna</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>nepalska rupija</displayName>
-				<displayName count="few">nepalske rupije</displayName>
-				<displayName count="many">nepalskih rupija</displayName>
-				<displayName count="one">nepalska rupija</displayName>
-				<displayName count="other">nepalskih rupija</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>novozelandski dolar</displayName>
-				<displayName count="few">novozelandska dolara</displayName>
-				<displayName count="many">novozelandskih dolara</displayName>
-				<displayName count="one">novozelandski dolar</displayName>
-				<displayName count="other">novozelandskih dolara</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>omanski rijal</displayName>
-				<displayName count="few">omanska rijala</displayName>
-				<displayName count="many">omanskih rijala</displayName>
-				<displayName count="one">omanski rijal</displayName>
-				<displayName count="other">omanskih rijala</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa</displayName>
-				<displayName count="few">panamske balboe</displayName>
-				<displayName count="many">panamskih balboa</displayName>
-				<displayName count="one">panamska balboa</displayName>
-				<displayName count="other">panamskih balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>peruanski inti</displayName>
-				<displayName count="few">peruanske inti</displayName>
-				<displayName count="many">peruanskih inti</displayName>
-				<displayName count="one">peruanski inti</displayName>
-				<displayName count="other">peruanskih inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>novi sol</displayName>
-				<displayName count="few">peruanska nova sola</displayName>
-				<displayName count="many">peruanskih novih sola</displayName>
-				<displayName count="one">peruanski novi sol</displayName>
-				<displayName count="other">peruanskih novih sola</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol</displayName>
-				<displayName count="few">peruanska sola</displayName>
-				<displayName count="many">peruanskih sola</displayName>
-				<displayName count="one">peruanski sol</displayName>
-				<displayName count="other">peruanskih sola</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina Papue Nove Gvineje</displayName>
-				<displayName count="few">kine Papue Nove Gvineje</displayName>
-				<displayName count="many">kina Papue Nove Gvineje</displayName>
-				<displayName count="one">kina Papue Nove Gvineje</displayName>
-				<displayName count="other">kina Papue Nove Gvineje</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filipinski pezo</displayName>
-				<displayName count="few">filipinska peza</displayName>
-				<displayName count="many">filipinskih peza</displayName>
-				<displayName count="one">filipinski pezo</displayName>
-				<displayName count="other">filipinskih peza</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>pakistanska rupija</displayName>
-				<displayName count="few">pakistanske rupije</displayName>
-				<displayName count="many">pakistanskih rupija</displayName>
-				<displayName count="one">pakistanska rupija</displayName>
-				<displayName count="other">pakistanskih rupija</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>poljska zlota</displayName>
-				<displayName count="few">poljske zlote</displayName>
-				<displayName count="many">poljskih zlota</displayName>
-				<displayName count="one">poljska zlota</displayName>
-				<displayName count="other">poljskih zlota</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Poljska zlota (1950-1995)</displayName>
-				<displayName count="few">poljske zlote (PLZ)</displayName>
-				<displayName count="many">poljskih zlota (PLZ)</displayName>
-				<displayName count="one">poljska zlota (PLZ)</displayName>
-				<displayName count="other">poljskih zlota (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>portugalski eskudo</displayName>
-				<displayName count="few">portugalska eskuda</displayName>
-				<displayName count="many">portugalskih eskuda</displayName>
-				<displayName count="one">portugalski eskudo</displayName>
-				<displayName count="other">portugalskih eskuda</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>gvarani</displayName>
-				<displayName count="few">paragvajska gvaranija</displayName>
-				<displayName count="many">paragvajskih gvaranija</displayName>
-				<displayName count="one">paragvajski gvarani</displayName>
-				<displayName count="other">paragvajskih gvaranija</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>katarski rial</displayName>
-				<displayName count="few">katarska rijala</displayName>
-				<displayName count="many">katarskih rijala</displayName>
-				<displayName count="one">katarski rijal</displayName>
-				<displayName count="other">katarskih rijala</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>rodezijski dolar</displayName>
-				<displayName count="few">rodezijska dolara</displayName>
-				<displayName count="many">rodezijskih dolara</displayName>
-				<displayName count="one">rodezijski dolar</displayName>
-				<displayName count="other">rodezijskih dolara</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>starorumunjski lek</displayName>
-				<displayName count="few">stara rumunjska leja</displayName>
-				<displayName count="many">starih rumunjskih leja</displayName>
-				<displayName count="one">stari rumunjski lej</displayName>
-				<displayName count="other">starih rumunjskih leja</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>rumunjski lev</displayName>
-				<displayName count="few">nova rumunjska leja</displayName>
-				<displayName count="many">novih rumunjskih leja</displayName>
-				<displayName count="one">novi rumunjski lej</displayName>
-				<displayName count="other">novih rumunjskih leja</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>srpski dinar</displayName>
-				<displayName count="few">srpska dinara</displayName>
-				<displayName count="many">srpskih dinara</displayName>
-				<displayName count="one">srpski dinar</displayName>
-				<displayName count="other">srpskih dinara</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ruska rublja</displayName>
-				<displayName count="few">ruske rublje</displayName>
-				<displayName count="many">ruskih rublji</displayName>
-				<displayName count="one">ruska rublja</displayName>
-				<displayName count="other">ruskih rublji</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>ruska rublja (1991.-1998.)</displayName>
-				<displayName count="few">ruske rublje (RUR)</displayName>
-				<displayName count="many">ruskih rublji (RUR)</displayName>
-				<displayName count="one">ruska rublja (RUR)</displayName>
-				<displayName count="other">ruskih rublji (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>ruandski franak</displayName>
-				<displayName count="few">ruandska franka</displayName>
-				<displayName count="many">ruandskih franaka</displayName>
-				<displayName count="one">ruandski franak</displayName>
-				<displayName count="other">ruandskih franaka</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>saudijski rial</displayName>
-				<displayName count="few">saudijska rijala</displayName>
-				<displayName count="many">saudijskih rijala</displayName>
-				<displayName count="one">saudijski rijal</displayName>
-				<displayName count="other">saudijskih rijala</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>solmonskooto�ni dolar</displayName>
-				<displayName count="few">solomonskooto�na dolara</displayName>
-				<displayName count="many">solomonskooto�nih dolara</displayName>
-				<displayName count="one">solomonskooto�ni dolar</displayName>
-				<displayName count="other">solomonskooto�nih dolara</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>sejšelska rupija</displayName>
-				<displayName count="few">sejšelske rupije</displayName>
-				<displayName count="many">sejšelskih rupija</displayName>
-				<displayName count="one">sejšelska rupija</displayName>
-				<displayName count="other">sejšelskih rupija</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>sudanski dinar</displayName>
-				<displayName count="few">sudanska dinara</displayName>
-				<displayName count="many">sudanskih dinara</displayName>
-				<displayName count="one">sudanski dinar</displayName>
-				<displayName count="other">sudanskih dinara</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>sudanska funta</displayName>
-				<displayName count="few">sudanske funte</displayName>
-				<displayName count="many">sudanskih funti</displayName>
-				<displayName count="one">sudanska funta</displayName>
-				<displayName count="other">sudanskih funti</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>stara sudanska funta</displayName>
-				<displayName count="few">stare sudanske funte</displayName>
-				<displayName count="many">starih sudanskih funti</displayName>
-				<displayName count="one">stara sudanska funta</displayName>
-				<displayName count="other">starih sudanskih funti</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Å¡vedska kruna</displayName>
-				<displayName count="few">Å¡vedske krune</displayName>
-				<displayName count="many">Å¡vedskih kruna</displayName>
-				<displayName count="one">Å¡vedska kruna</displayName>
-				<displayName count="other">Å¡vedskih kruna</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>singapurski dolar</displayName>
-				<displayName count="few">singapurska dolara</displayName>
-				<displayName count="many">singapurskih dolara</displayName>
-				<displayName count="one">singapurski dolar</displayName>
-				<displayName count="other">singapurskih dolara</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>svetohelenska funta</displayName>
-				<displayName count="few">svetohelenske funte</displayName>
-				<displayName count="many">svetohelenskih funti</displayName>
-				<displayName count="one">svetohelenska funta</displayName>
-				<displayName count="other">svetohelenskih funti</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>slovenski tolar</displayName>
-				<displayName count="few">slovenska tolara</displayName>
-				<displayName count="many">slovenskih tolara</displayName>
-				<displayName count="one">slovenski tolar</displayName>
-				<displayName count="other">slovenskih tolara</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>slova�ka kruna</displayName>
-				<displayName count="few">slova�ke krune</displayName>
-				<displayName count="many">slova�kih kruna</displayName>
-				<displayName count="one">slova�ka kruna</displayName>
-				<displayName count="other">slova�kih kruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>sijeraleonski leone</displayName>
-				<displayName count="few">sijeraleonske leone</displayName>
-				<displayName count="many">sijeraleonskih leona</displayName>
-				<displayName count="one">sijeraleonski leon</displayName>
-				<displayName count="other">sijeraleonskih leona</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>somalijski Å¡iling</displayName>
-				<displayName count="few">somalijska Å¡ilinga</displayName>
-				<displayName count="many">somalijskih Å¡ilinga</displayName>
-				<displayName count="one">somalijski Å¡iling</displayName>
-				<displayName count="other">somalijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>surinamski dolar</displayName>
-				<displayName count="few">surinamska dolara</displayName>
-				<displayName count="many">surinamskih dolara</displayName>
-				<displayName count="one">surinamski dolar</displayName>
-				<displayName count="other">surinamskih dolara</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>surinamski gulden</displayName>
-				<displayName count="few">surinamska guldena</displayName>
-				<displayName count="many">surinamskih guldena</displayName>
-				<displayName count="one">surinamski gulden</displayName>
-				<displayName count="other">surinamskih guldena</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra Svetog Tome i Principa</displayName>
-				<displayName count="few">dobra Svetog Tome i Principa</displayName>
-				<displayName count="many">dobra Svetog Tome i Principa</displayName>
-				<displayName count="one">dobra Svetog Tome i Principa</displayName>
-				<displayName count="other">dobra Svetog Tome i Principa</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>sovjetska rublja</displayName>
-				<displayName count="few">sovjetske rublje</displayName>
-				<displayName count="many">sovjetskih rublji</displayName>
-				<displayName count="one">sovjetska rublja</displayName>
-				<displayName count="other">sovjetskih rublji</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>salvadorski kolon</displayName>
-				<displayName count="few">salvadorska kolona</displayName>
-				<displayName count="many">salvadorskih kolona</displayName>
-				<displayName count="one">salvadorski kolon</displayName>
-				<displayName count="other">salvadorskih kolona</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>sirijska funta</displayName>
-				<displayName count="few">sirijske funte</displayName>
-				<displayName count="many">sirijskih funti</displayName>
-				<displayName count="one">sirijska funta</displayName>
-				<displayName count="other">sirijskih funti</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>svazi lilangeni</displayName>
-				<displayName count="few">svazi lilangena</displayName>
-				<displayName count="many">svazi lilangena</displayName>
-				<displayName count="one">svazi lilangeni</displayName>
-				<displayName count="other">svazi lilangena</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>tajlandski bat</displayName>
-				<displayName count="few">tajlandska bahta</displayName>
-				<displayName count="many">tajlandskih bahta</displayName>
-				<displayName count="one">tajlandski baht</displayName>
-				<displayName count="other">tajlandskih bahta</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>tajikistanska rublja</displayName>
-				<displayName count="few">tadžikistanske rublje</displayName>
-				<displayName count="many">tadžikistanskih rublji</displayName>
-				<displayName count="one">tadžikistanska rublja</displayName>
-				<displayName count="other">tadžikistanskih rublji</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>tadžikistanski somoni</displayName>
-				<displayName count="few">tadžikistanska somona</displayName>
-				<displayName count="many">tadžikistanskih somona</displayName>
-				<displayName count="one">tadžikistanski somoni</displayName>
-				<displayName count="other">tadžikistanskih somona</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>turkmenistanski manat</displayName>
-				<displayName count="few">turkmenistanska manata</displayName>
-				<displayName count="many">turkmenistanskih manata</displayName>
-				<displayName count="one">turkmenistanski manat</displayName>
-				<displayName count="other">turkmenistanskih manata</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>tuniski dinar</displayName>
-				<displayName count="few">tuniska dinara</displayName>
-				<displayName count="many">tuniskih dinara</displayName>
-				<displayName count="one">tuniski dinar</displayName>
-				<displayName count="other">tuniskih dinara</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>tongaška pa'anga</displayName>
-				<displayName count="few">tongaške pa'ange</displayName>
-				<displayName count="many">tongaških pa'angi</displayName>
-				<displayName count="one">tongaška pa'anga</displayName>
-				<displayName count="other">tongaških pa'angi</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>timorski eskudo</displayName>
-				<displayName count="few">timorska eskuda</displayName>
-				<displayName count="many">timorskih eskuda</displayName>
-				<displayName count="one">timorski eskudo</displayName>
-				<displayName count="other">timorskih eskuda</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>stara turska lira</displayName>
-				<displayName count="few">stare turske lire</displayName>
-				<displayName count="many">starih turskih lira</displayName>
-				<displayName count="one">stara turska lira</displayName>
-				<displayName count="other">starih turskih lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>turska lira</displayName>
-				<displayName count="few">turske lire</displayName>
-				<displayName count="many">turskih lira</displayName>
-				<displayName count="one">turska lira</displayName>
-				<displayName count="other">turskih lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>trininadtobaški dolar</displayName>
-				<displayName count="few">trinidadtobaška dolara</displayName>
-				<displayName count="many">trinidadtobaških dolara</displayName>
-				<displayName count="one">trinidadtobaški dolar</displayName>
-				<displayName count="other">trinidadtobaških dolara</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Novotajvanski dolar</displayName>
-				<displayName count="few">novotajvanska dolara</displayName>
-				<displayName count="many">novotajvanskih dolara</displayName>
-				<displayName count="one">novotajvanski dolar</displayName>
-				<displayName count="other">novotajvanskih dolara</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>tanzanijski Å¡iling</displayName>
-				<displayName count="few">tanzanijska Å¡ilinga</displayName>
-				<displayName count="many">tanzanijskih Å¡ilinga</displayName>
-				<displayName count="one">tanzanijski Å¡iling</displayName>
-				<displayName count="other">tanzanijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ukrajinska hrivnja</displayName>
-				<displayName count="few">ukrajinske hrivnje</displayName>
-				<displayName count="many">ukrajinskih hrivnji</displayName>
-				<displayName count="one">ukrajinska hrivnja</displayName>
-				<displayName count="other">ukrajinskih hrivnji</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ukrajinski karbovanet</displayName>
-				<displayName count="few">ukrajinska karbovantsiva</displayName>
-				<displayName count="many">ukrajinskih karbovantsiva</displayName>
-				<displayName count="one">ukrajinski karbovantsiv</displayName>
-				<displayName count="other">ukrajinskih karbovantsiva</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ugandski Å¡iling (1966.-1987.)</displayName>
-				<displayName count="few">ugandska Å¡ilinga (UGS)</displayName>
-				<displayName count="many">ugandskih Å¡ilinga (UGS)</displayName>
-				<displayName count="one">ugandski Å¡iling (UGS)</displayName>
-				<displayName count="other">ugandskih Å¡ilinga (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ugandski Å¡iling</displayName>
-				<displayName count="few">ugandska Å¡ilinga</displayName>
-				<displayName count="many">ugandskih Å¡ilinga</displayName>
-				<displayName count="one">ugandski Å¡iling</displayName>
-				<displayName count="other">ugandskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ameri�ki dolar</displayName>
-				<displayName count="few">ameri�ka dolara</displayName>
-				<displayName count="many">ameri�kih dolara</displayName>
-				<displayName count="one">ameri�ki dolar</displayName>
-				<displayName count="other">ameri�kih dolara</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>ameri�ki dolar (sljedeći dan)</displayName>
-				<displayName count="few">ameri�ka dolara (sljedeći dan)</displayName>
-				<displayName count="many">ameri�kih dolara (sljedeći dan)</displayName>
-				<displayName count="one">ameri�ki dolar (sljedeći dan)</displayName>
-				<displayName count="other">ameri�kih dolara (sljedeći dan)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>ameri�ki dolar (isti dan)</displayName>
-				<displayName count="few">ameri�ka dolara (isti dan)</displayName>
-				<displayName count="many">ameri�kih dolara (isti dan)</displayName>
-				<displayName count="one">ameri�ki dolar (isti dan)</displayName>
-				<displayName count="other">ameri�kih dolara (isti dan)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>urugvajski pezo en unidades indexadas</displayName>
-				<displayName count="few">urugvajska pesosa en unidades indexadas</displayName>
-				<displayName count="many">urugvajskih pesosa en unidades indexadas</displayName>
-				<displayName count="one">urugvajski pesos en unidades indexadas</displayName>
-				<displayName count="other">urugvajskih pesosa en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>urugvajski pezo (1975.-1993.)</displayName>
-				<displayName count="few">urugvajska peza (UYP)</displayName>
-				<displayName count="many">urugvajskih peza (UYP)</displayName>
-				<displayName count="one">urugvajski pezo (UYP)</displayName>
-				<displayName count="other">urugvajskih peza (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>urugvajski pezo</displayName>
-				<displayName count="few">urugvajska pezosa</displayName>
-				<displayName count="many">urugvajskih pezosa</displayName>
-				<displayName count="one">urugvajski pezo</displayName>
-				<displayName count="other">urugvajskih pezosa</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>uzbekistanski som</displayName>
-				<displayName count="few">uzbekistanska soma</displayName>
-				<displayName count="many">uzbekistanskih soma</displayName>
-				<displayName count="one">uzbekistanski som</displayName>
-				<displayName count="other">uzbekistanskih soma</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venezuelanski bolivar</displayName>
-				<displayName count="few">venezuelanska bolivara</displayName>
-				<displayName count="many">vezuelanskih bolivara</displayName>
-				<displayName count="one">venezuelanski bolivar</displayName>
-				<displayName count="other">venezuelanskih bolivara</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>venezuelanski bolivar fuerte</displayName>
-				<displayName count="few">venezuelanska bolivara fuertes</displayName>
-				<displayName count="many">venezuelanskih bolivara fuertes</displayName>
-				<displayName count="one">venezuelanski bolivar fuertes</displayName>
-				<displayName count="other">venezuelanskih bolivara fuertes</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>vijetnamski dong</displayName>
-				<displayName count="few">vijetnamska donga</displayName>
-				<displayName count="many">vijetnamskih donga</displayName>
-				<displayName count="one">vijetnamski dong</displayName>
-				<displayName count="other">vijetnamskih donga</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vanuatuški vatu</displayName>
-				<displayName count="few">vanuatska vatua</displayName>
-				<displayName count="many">vanuatskih vatua</displayName>
-				<displayName count="one">vanuatski vatu</displayName>
-				<displayName count="other">vanuatskih vatua</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>samoanska tala</displayName>
-				<displayName count="few">samoanske tale</displayName>
-				<displayName count="many">samoanskih tala</displayName>
-				<displayName count="one">samoanska tala</displayName>
-				<displayName count="other">samoanskih tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA franak BEAC</displayName>
-				<displayName count="few">CFA franka BEAC</displayName>
-				<displayName count="many">CFA franaka BEAC</displayName>
-				<displayName count="one">CFA franak BEAC</displayName>
-				<displayName count="other">CFA franaka BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>srebro</displayName>
-				<displayName count="few">srebra</displayName>
-				<displayName count="many">srebra</displayName>
-				<displayName count="one">srebro</displayName>
-				<displayName count="other">srebra</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>zlato</displayName>
-				<displayName count="few">zlata</displayName>
-				<displayName count="many">zlata</displayName>
-				<displayName count="one">zlato</displayName>
-				<displayName count="other">zlata</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Europska složena jedinica</displayName>
-				<displayName count="few">europske složene jedinice</displayName>
-				<displayName count="many">europskih složenih jedinica</displayName>
-				<displayName count="one">europska složena jedinica</displayName>
-				<displayName count="other">europskih složenih jedinica</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Europska monetarna jedinica</displayName>
-				<displayName count="few">europske monetarne jedinice</displayName>
-				<displayName count="many">europskih monetarnih jedinica</displayName>
-				<displayName count="one">europska monetarna jedinica</displayName>
-				<displayName count="other">europskih monetarnih jedinica</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>europska obra�unska jedinica (XBC)</displayName>
-				<displayName count="few">europske obra�unske jedinice (XBC)</displayName>
-				<displayName count="many">europskih obra�unskih jedinica (XBC)</displayName>
-				<displayName count="one">europska obra�unska jedinica (XBC)</displayName>
-				<displayName count="other">europskih obra�unskih jedinica (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>europska obra�unska jedinica (XBD)</displayName>
-				<displayName count="few">europske obra�unske jedinice (XBD)</displayName>
-				<displayName count="many">europskih obra�unskih jedinica (XBD)</displayName>
-				<displayName count="one">europska obra�unska jedinica (XBD)</displayName>
-				<displayName count="other">europskih obra�unskih jedinica (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>isto�nokaripski dolar</displayName>
-				<displayName count="few">isto�nokaripska dolara</displayName>
-				<displayName count="many">isto�nokaripskih dolara</displayName>
-				<displayName count="one">isto�nokaripski dolar</displayName>
-				<displayName count="other">isto�nokaripskih dolara</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>posebna crtaća prava</displayName>
-				<displayName count="few">poseebna crtaća prava</displayName>
-				<displayName count="many">posebnih crtaćih prava</displayName>
-				<displayName count="one">posebno crtaće pravo</displayName>
-				<displayName count="other">posebnih crtaćih prava</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>europska monetarna jedinica (ECU)</displayName>
-				<displayName count="few">europske monetarne jedinice (ECU)</displayName>
-				<displayName count="many">europskih monetarnih jedinica (ECU)</displayName>
-				<displayName count="one">europska monetarna jedinica (ECU)</displayName>
-				<displayName count="other">europskih monetarnih jedinica (ECU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>francuski zlatni franak</displayName>
-				<displayName count="few">francuska zlatna franka</displayName>
-				<displayName count="many">francuskih zlatnih franaka</displayName>
-				<displayName count="one">francuski zlatni franak</displayName>
-				<displayName count="other">francuskih zlatnih franaka</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>francuski UIC-franak</displayName>
-				<displayName count="few">francuska UIC-franka</displayName>
-				<displayName count="many">francuskih UIC-franaka</displayName>
-				<displayName count="one">francuski UIC-franak</displayName>
-				<displayName count="other">francuskih UIC-franaka</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA franak BCEAO</displayName>
-				<displayName count="few">CFA franka BCEAO</displayName>
-				<displayName count="many">CFA franaka BCEAO</displayName>
-				<displayName count="one">CFA franak BCEAO</displayName>
-				<displayName count="other">CFA franaka BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>paladij</displayName>
-				<displayName count="few">paladija</displayName>
-				<displayName count="many">paladija</displayName>
-				<displayName count="one">paladij</displayName>
-				<displayName count="other">paladija</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP franak</displayName>
-				<displayName count="many">CFP franaka</displayName>
-				<displayName count="other">CFP franaka</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-				<displayName count="few">platine</displayName>
-				<displayName count="many">platina</displayName>
-				<displayName count="one">platina</displayName>
-				<displayName count="other">platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET fondovi</displayName>
-				<displayName count="few">RINET fonda</displayName>
-				<displayName count="many">RINET fondova</displayName>
-				<displayName count="one">RINET fond</displayName>
-				<displayName count="other">RINET fondova</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>ispitni kod valute</displayName>
-				<displayName count="few">ispitna koda valute</displayName>
-				<displayName count="many">ispitnih kodova valute</displayName>
-				<displayName count="one">ispitni kod vlaute</displayName>
-				<displayName count="other">ispitnih kodova valute</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>nepoznata ili nevažeća valuta</displayName>
-				<displayName count="few">nepoznate ili nevažeće valute</displayName>
-				<displayName count="many">nepoznatih ili nevažećih valuta</displayName>
-				<displayName count="one">nepoznata ili nevažeća valuta</displayName>
-				<displayName count="other">nevažećih ili nepoznatih valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>jemenski dinar</displayName>
-				<displayName count="few">jemenska dinara</displayName>
-				<displayName count="many">jemenskih dinara</displayName>
-				<displayName count="one">jemenski dinar</displayName>
-				<displayName count="other">jemenskih dinara</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>jemenski rial</displayName>
-				<displayName count="few">jemenska rijala</displayName>
-				<displayName count="many">jemenskih rijala</displayName>
-				<displayName count="one">jemenski rijal</displayName>
-				<displayName count="other">jemenskih rijala</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>jugoslavenski �vrsti dinar</displayName>
-				<displayName count="few">jugoslavenska �vrsta dinara</displayName>
-				<displayName count="many">jugoslavenskih �vstih dinara</displayName>
-				<displayName count="one">jugoslavenski �vrsti dinar</displayName>
-				<displayName count="other">jugoslavenskih �vrstih dinara</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>jugoslavenski novi dinar</displayName>
-				<displayName count="few">jugoslavenska nova dinara</displayName>
-				<displayName count="many">jugoslavenskih novih dinara</displayName>
-				<displayName count="one">jugoslavenski novi dinar</displayName>
-				<displayName count="other">jugoslavenskih novih dinara</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>jugoslavenski konvertibilni dinar</displayName>
-				<displayName count="few">jugoslavenska konvertibilna dinara</displayName>
-				<displayName count="many">jugoslavenskih konvertibilnih dinara</displayName>
-				<displayName count="one">jugoslavenski konvertibilni dinar</displayName>
-				<displayName count="other">jugoslavenskih konvertibilnih dinara</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>južnoafri�ki rand (financijski)</displayName>
-				<displayName count="few">južnoafri�ka randa (financijska)</displayName>
-				<displayName count="many">južnoafi�kih randa (financijskih)</displayName>
-				<displayName count="one">južnoafri�ki rand (financijski)</displayName>
-				<displayName count="other">južnoafri�kih randa (financijskih)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>južnoafri�ki rand</displayName>
-				<displayName count="few">južnoafri�ka randa</displayName>
-				<displayName count="many">južnoafri�kih randa</displayName>
-				<displayName count="one">južnoafri�ki rand</displayName>
-				<displayName count="other">južnoafri�kih randa</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>zambijska kva�a</displayName>
-				<displayName count="few">zambijske kva�e</displayName>
-				<displayName count="many">zambijskih kva�a</displayName>
-				<displayName count="one">zambijska kva�a</displayName>
-				<displayName count="other">zambijskih kva�a</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zairski novi zair</displayName>
-				<displayName count="few">zairska nova zaira</displayName>
-				<displayName count="many">zairskih novih zaira</displayName>
-				<displayName count="one">zairski novi zair</displayName>
-				<displayName count="other">zairskih novih zaira</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zairski zair</displayName>
-				<displayName count="few">zairska zaira</displayName>
-				<displayName count="many">zairskih zaira</displayName>
-				<displayName count="one">zairski zair</displayName>
-				<displayName count="other">zairskih zaira</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>zimbabveanski dolar</displayName>
-				<displayName count="few">zimbabveanska dolara</displayName>
-				<displayName count="many">zimbabveanskih dolara</displayName>
-				<displayName count="one">zimbabveanski dolar</displayName>
-				<displayName count="other">zimbabveanskih dolara</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dana</unitPattern>
-			<unitPattern count="many">{0} dana</unitPattern>
-			<unitPattern count="one">{0} dan</unitPattern>
-			<unitPattern count="other">{0} dan</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} sata</unitPattern>
-			<unitPattern count="many">{0} sati</unitPattern>
-			<unitPattern count="one">{0} sat</unitPattern>
-			<unitPattern count="other">{0} sat</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minute</unitPattern>
-			<unitPattern count="many">{0} minuta</unitPattern>
-			<unitPattern count="one">{0} minuta</unitPattern>
-			<unitPattern count="other">{0} minuta</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} mjeseca</unitPattern>
-			<unitPattern count="many">{0} mjeseci</unitPattern>
-			<unitPattern count="one">{0} mjesec</unitPattern>
-			<unitPattern count="other">{0} mjesec</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekunde</unitPattern>
-			<unitPattern count="many">{0} sekundi</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekunda</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} tjedna</unitPattern>
-			<unitPattern count="many">{0} tjedana</unitPattern>
-			<unitPattern count="one">{0} tjedan</unitPattern>
-			<unitPattern count="other">{0} tjedan</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} godine</unitPattern>
-			<unitPattern count="many">{0} godina</unitPattern>
-			<unitPattern count="one">{0} godina</unitPattern>
-			<unitPattern count="other">{0} godina</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>da:d</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/hr_HR.xml b/airtime_mvc/library/Zend/Locale/Data/hr_HR.xml
deleted file mode 100644
index 05091a371..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hr_HR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="hr"/>
-		<territory type="HR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/hu.xml b/airtime_mvc/library/Zend/Locale/Data/hu.xml
deleted file mode 100644
index 38c296a36..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hu.xml
+++ /dev/null
@@ -1,3745 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.122 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="hu"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abház</language>
-			<language type="ace">achinéz</language>
-			<language type="ach">akoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avesztán</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afroázsiai nyelv</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkád</language>
-			<language type="ale">aleut</language>
-			<language type="alg">algonkin nyelv</language>
-			<language type="alt">dél-altaji</language>
-			<language type="am">amhara</language>
-			<language type="an">aragonéz</language>
-			<language type="ang">óangol</language>
-			<language type="anp">angika</language>
-			<language type="apa">apacs nyelvek</language>
-			<language type="ar">arab</language>
-			<language type="arc">arámi</language>
-			<language type="arn">araucani</language>
-			<language type="arp">arapaho</language>
-			<language type="art">mesterséges nyelv</language>
-			<language type="arw">aravak</language>
-			<language type="as">asszámi</language>
-			<language type="ast">asztúr</language>
-			<language type="ath">atapaszkan nyelvek</language>
-			<language type="aus">ausztrál nyelvek</language>
-			<language type="av">avar</language>
-			<language type="awa">awádi</language>
-			<language type="ay">ajmara</language>
-			<language type="az">azerbajdzsáni</language>
-			<language type="ba">baskír</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamileke nyelvek</language>
-			<language type="bal">balucsi</language>
-			<language type="ban">balinéz</language>
-			<language type="bas">basza</language>
-			<language type="bat">balti nyelv</language>
-			<language type="be">belorusz</language>
-			<language type="bej">bedzsa</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berber</language>
-			<language type="bg">bolgár</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bodzspuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengáli</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibeti</language>
-			<language type="br">breton</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnyák</language>
-			<language type="btk">batak</language>
-			<language type="bua">burját</language>
-			<language type="bug">buginéz</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalán</language>
-			<language type="cad">caddo</language>
-			<language type="cai">egyéb közép-amerikai indián</language>
-			<language type="car">karib</language>
-			<language type="cau">egyéb kaukázusi</language>
-			<language type="cch">atszam</language>
-			<language type="ce">csecsen</language>
-			<language type="ceb">cebui</language>
-			<language type="cel">egyéb kelta</language>
-			<language type="ch">csamoró</language>
-			<language type="chb">csibcsa</language>
-			<language type="chg">csagatáj</language>
-			<language type="chk">csukéz</language>
-			<language type="chm">mari</language>
-			<language type="chn">csinuk zsargon</language>
-			<language type="cho">csoktó</language>
-			<language type="chp">csipevé</language>
-			<language type="chr">cseroki</language>
-			<language type="chy">csejen</language>
-			<language type="cmc">csam nyelv</language>
-			<language type="co">korzikai</language>
-			<language type="cop">kopt</language>
-			<language type="cpe">egyéb angol alapú kreol és pidgin</language>
-			<language type="cpf">egyéb francia alapú kreol és pidgin</language>
-			<language type="cpp">portugál alapú kreol vagy pidgin</language>
-			<language type="cr">krí</language>
-			<language type="crh">krími tatár</language>
-			<language type="crp">kreol és pidzsin</language>
-			<language type="cs">cseh</language>
-			<language type="csb">kasub</language>
-			<language type="cu">egyházi szláv</language>
-			<language type="cus">kusita nyelv</language>
-			<language type="cv">csuvas</language>
-			<language type="cy">walesi</language>
-			<language type="da">dán</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargva</language>
-			<language type="day">dajak</language>
-			<language type="de">német</language>
-			<language type="de_AT">osztrák német</language>
-			<language type="de_CH">svájci felnémet</language>
-			<language type="del">delavár</language>
-			<language type="den">szlevi</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">egyéb dravida</language>
-			<language type="dsb">alsó szorb</language>
-			<language type="dua">duala</language>
-			<language type="dum">közép holland</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">diula</language>
-			<language type="dz">butáni</language>
-			<language type="ee">eve</language>
-			<language type="efi">efik</language>
-			<language type="egy">óegyiptomi</language>
-			<language type="eka">ekadzsuk</language>
-			<language type="el">görög</language>
-			<language type="elx">elamit</language>
-			<language type="en">angol</language>
-			<language type="en_AU">ausztrál angol</language>
-			<language type="en_CA">kanadai angol</language>
-			<language type="en_GB">brit angol</language>
-			<language type="en_US">amerikai angol</language>
-			<language type="enm">közép angol</language>
-			<language type="eo">eszperantó</language>
-			<language type="es">spanyol</language>
-			<language type="es_419">latin-amerikai spanyol</language>
-			<language type="es_ES">ibériai spanyol</language>
-			<language type="et">észt</language>
-			<language type="eu">baszk</language>
-			<language type="ewo">evondo</language>
-			<language type="fa">perzsa</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">finn</language>
-			<language type="fil">filippínó</language>
-			<language type="fiu">finnugor nyelv</language>
-			<language type="fj">fidzsi</language>
-			<language type="fo">feröeri</language>
-			<language type="fon">fon</language>
-			<language type="fr">francia</language>
-			<language type="fr_CA">kanadai francia</language>
-			<language type="fr_CH">svájci francia</language>
-			<language type="frm">közép francia</language>
-			<language type="fro">ófrancia</language>
-			<language type="frr">északi fríz</language>
-			<language type="frs">keleti fríz</language>
-			<language type="fur">friuli</language>
-			<language type="fy">fríz</language>
-			<language type="ga">ír</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">skót gael</language>
-			<language type="gem">germán nyelv</language>
-			<language type="gez">geez</language>
-			<language type="gil">ikiribati</language>
-			<language type="gl">galíciai</language>
-			<language type="gmh">közép felső német</language>
-			<language type="gn">guarani</language>
-			<language type="goh">ófelső német</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gót</language>
-			<language type="grb">grebó</language>
-			<language type="grc">ógörög</language>
-			<language type="gsw">svájci német</language>
-			<language type="gu">gudzsarati</language>
-			<language type="gv">Man-szigeti</language>
-			<language type="gwi">gvicsin</language>
-			<language type="ha">hausza</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaii</language>
-			<language type="he">héber</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligajnon</language>
-			<language type="him">himaháli</language>
-			<language type="hit">hittite</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">horvát</language>
-			<language type="hsb">felső szorb</language>
-			<language type="ht">haiti</language>
-			<language type="hu">magyar</language>
-			<language type="hup">hupa</language>
-			<language type="hy">örmény</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingva</language>
-			<language type="iba">iban</language>
-			<language type="id">indonéz</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbó</language>
-			<language type="ii">szecsuán ji</language>
-			<language type="ijo">idzsó</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">ilokó</language>
-			<language type="inc">egyéb indiai</language>
-			<language type="ine">indoeurópai nyelv</language>
-			<language type="inh">ingus</language>
-			<language type="io">idó</language>
-			<language type="ira">iráni</language>
-			<language type="iro">irokéz nyelvek</language>
-			<language type="is">izlandi</language>
-			<language type="it">olasz</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japán</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">zsidó-perzsa</language>
-			<language type="jrb">zsidó-arab</language>
-			<language type="jv">jávai</language>
-			<language type="ka">grúz</language>
-			<language type="kaa">kara-kalpak</language>
-			<language type="kab">kabije</language>
-			<language type="kac">kacsin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardi</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">kaszi</language>
-			<language type="khi">egyéb koiszan</language>
-			<language type="kho">kotanéz</language>
-			<language type="ki">kikuju</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazah</language>
-			<language type="kl">grönlandi</language>
-			<language type="km">kambodzsai</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreai</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosrei</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karacsáj-balkár</language>
-			<language type="krl">karelai</language>
-			<language type="kro">kru</language>
-			<language type="kru">kuruh</language>
-			<language type="ks">kásmíri</language>
-			<language type="ku">kurd</language>
-			<language type="kum">kumük</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">korni</language>
-			<language type="ky">kirgiz</language>
-			<language type="la">latin</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgi</language>
-			<language type="lez">lezg</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgi</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laoszi</language>
-			<language type="lol">mongó</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litván</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">lett</language>
-			<language type="mad">madurai</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makaszar</language>
-			<language type="man">mandingó</language>
-			<language type="map">ausztronéz</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksán</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">málgas</language>
-			<language type="mga">közép ír</language>
-			<language type="mh">marshalli</language>
-			<language type="mi">maori</language>
-			<language type="mic">mikmak</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">egyéb nyelvek</language>
-			<language type="mk">macedón</language>
-			<language type="mkh">egyéb mon-khmer</language>
-			<language type="ml">malajálam</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">mandzsu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobó nyelvek</language>
-			<language type="mo">moldvai</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">moszi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">maláj</language>
-			<language type="mt">máltai</language>
-			<language type="mul">többszörös nyelvek</language>
-			<language type="mun">munda nyelvek</language>
-			<language type="mus">krík</language>
-			<language type="mwl">mirandéz</language>
-			<language type="mwr">marvari</language>
-			<language type="my">burmai</language>
-			<language type="myn">maja nyelvek</language>
-			<language type="myv">erzjány</language>
-			<language type="na">naurui</language>
-			<language type="nah">nahuati</language>
-			<language type="nai">észak-amerikai indián nyelv</language>
-			<language type="nap">nápolyi</language>
-			<language type="nb">norvég bokmal</language>
-			<language type="nd">északi ndebele</language>
-			<language type="nds">alsónémet</language>
-			<language type="ne">nepáli</language>
-			<language type="new">nevari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">niger-kordofan nyelv</language>
-			<language type="niu">niui</language>
-			<language type="nl">holland</language>
-			<language type="nl_BE">flamand</language>
-			<language type="nn">norvég nynorsk</language>
-			<language type="no">norvég</language>
-			<language type="nog">nogaj</language>
-			<language type="non">óskandináv</language>
-			<language type="nqo">n'kó</language>
-			<language type="nr">déli ndebele</language>
-			<language type="nso">északi szotó</language>
-			<language type="nub">núbiai nyelv</language>
-			<language type="nv">navahó</language>
-			<language type="nwc">klasszikus newari</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamvézi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoró</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">okszitán</language>
-			<language type="oj">ojibva</language>
-			<language type="om">oromói</language>
-			<language type="or">orija</language>
-			<language type="os">oszét</language>
-			<language type="osa">osage</language>
-			<language type="ota">ottomán török</language>
-			<language type="oto">otomi nyelv</language>
-			<language type="pa">pandzsábi</language>
-			<language type="paa">pápuai nyelv</language>
-			<language type="pag">pangaszinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampangan</language>
-			<language type="pap">papiamentó</language>
-			<language type="pau">palaui</language>
-			<language type="peo">óperzsa</language>
-			<language type="phi">Fülöp-szigeteki nyelv</language>
-			<language type="phn">főniciai</language>
-			<language type="pi">pali</language>
-			<language type="pl">lengyel</language>
-			<language type="pon">pohnpei</language>
-			<language type="pra">prakrit nyelvek</language>
-			<language type="pro">óprovánszi</language>
-			<language type="ps">pastu</language>
-			<language type="pt">portugál</language>
-			<language type="pt_BR">brazíliai portugál</language>
-			<language type="pt_PT">ibériai portugál</language>
-			<language type="qu">kecsua</language>
-			<language type="raj">radzsasztáni</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongai</language>
-			<language type="rm">réto-román</language>
-			<language type="rn">kirundi</language>
-			<language type="ro">román</language>
-			<language type="roa">román nyelv</language>
-			<language type="rom">roma</language>
-			<language type="root">Å‘si</language>
-			<language type="ru">orosz</language>
-			<language type="rup">aromán</language>
-			<language type="rw">kiruanda</language>
-			<language type="sa">szanszkrit</language>
-			<language type="sad">szandave</language>
-			<language type="sah">jakut</language>
-			<language type="sai">dél-amerikai indián nyelv</language>
-			<language type="sal">szelis nyelv</language>
-			<language type="sam">szamaritánus arámi</language>
-			<language type="sas">sasak</language>
-			<language type="sat">szantáli</language>
-			<language type="sc">szardíniai</language>
-			<language type="scn">szicíliai</language>
-			<language type="sco">skót</language>
-			<language type="sd">szindhi</language>
-			<language type="se">északi számi</language>
-			<language type="sel">szölkup</language>
-			<language type="sem">egyéb szemita</language>
-			<language type="sg">szangó</language>
-			<language type="sga">óír</language>
-			<language type="sgn">jelnyelv</language>
-			<language type="sh">szerbhorvát</language>
-			<language type="shn">san</language>
-			<language type="si">szingaléz</language>
-			<language type="sid">szidamó</language>
-			<language type="sio">sziú nyelvek</language>
-			<language type="sit">sinotibeti nyelv</language>
-			<language type="sk">szlovák</language>
-			<language type="sl">szlovén</language>
-			<language type="sla">szláv nyelv</language>
-			<language type="sm">szamoai</language>
-			<language type="sma">déli számi</language>
-			<language type="smi">lapp nyelv</language>
-			<language type="smj">lule számi</language>
-			<language type="smn">inar sami</language>
-			<language type="sms">koltta lapp</language>
-			<language type="sn">sona</language>
-			<language type="snk">szoninke</language>
-			<language type="so">szomáliai</language>
-			<language type="sog">sogdien</language>
-			<language type="son">szongai</language>
-			<language type="sq">albán</language>
-			<language type="sr">szerb</language>
-			<language type="srn">szranai tongó</language>
-			<language type="srr">szerer</language>
-			<language type="ss">sziszuati</language>
-			<language type="ssa">nílusi-szaharai nyelv</language>
-			<language type="st">szeszotó</language>
-			<language type="su">szundanéz</language>
-			<language type="suk">szukuma</language>
-			<language type="sus">szuszu</language>
-			<language type="sux">sumér</language>
-			<language type="sv">svéd</language>
-			<language type="sw">szuahéli</language>
-			<language type="syc">klasszikus szír</language>
-			<language type="syr">szíriai</language>
-			<language type="ta">tamil</language>
-			<language type="tai">thai nyelv</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">terenó</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadzsik</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">türkmén</language>
-			<language type="tkl">tokelaui</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamasek</language>
-			<language type="tn">szecsuáni</language>
-			<language type="to">tonga</language>
-			<language type="tog">nyasa tonga</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">török</language>
-			<language type="ts">conga</language>
-			<language type="tsi">csimsiáni</language>
-			<language type="tt">tatár</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi nyelv</language>
-			<language type="tut">altáji nyelv</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahiti</language>
-			<language type="tyv">tuvai</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">ujgur</language>
-			<language type="uga">ugariti</language>
-			<language type="uk">ukrán</language>
-			<language type="umb">umbundu</language>
-			<language type="und">ismeretlen vagy érvénytelen nyelv</language>
-			<language type="ur">urdu</language>
-			<language type="uz">üzbég</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnámi</language>
-			<language type="vo">volapük</language>
-			<language type="vot">votják</language>
-			<language type="wa">vallon</language>
-			<language type="wak">vakas nyelv</language>
-			<language type="wal">valamo</language>
-			<language type="war">varaó</language>
-			<language type="was">vasó</language>
-			<language type="wen">szorb nyelvek</language>
-			<language type="wo">volof</language>
-			<language type="xal">kalmük</language>
-			<language type="xh">hosza</language>
-			<language type="yao">jaó</language>
-			<language type="yap">japi</language>
-			<language type="yi">jiddis</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupik nyelv</language>
-			<language type="za">zsuang</language>
-			<language type="zap">zapoték</language>
-			<language type="zbl">Bliss jelképrendszer</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kínai</language>
-			<language type="zh_Hans">egyszerűsített kínai</language>
-			<language type="zh_Hant">hagyományos kínai</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">nincs nyelvészeti tartalom</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arab</script>
-			<script type="Armi">Birodalmi arámi</script>
-			<script type="Armn">Örmény</script>
-			<script type="Avst">Avesztán</script>
-			<script type="Bali">Balinéz</script>
-			<script type="Batk">Batak</script>
-			<script type="Beng">Bengáli</script>
-			<script type="Blis">Bliss jelképrendszer</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brámi</script>
-			<script type="Brai">Vakírás</script>
-			<script type="Bugi">Buginéz</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Csakma</script>
-			<script type="Cans">Egyesített kanadai őslakos jelek</script>
-			<script type="Cari">Kari</script>
-			<script type="Cham">Csám</script>
-			<script type="Cher">Cseroki</script>
-			<script type="Cirt">Cirt</script>
-			<script type="Copt">Kopt</script>
-			<script type="Cprt">Ciprusi</script>
-			<script type="Cyrl">Cirill</script>
-			<script type="Cyrs">Óegyházi szláv cirill</script>
-			<script type="Deva">Devanagári</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Egyiptomi demotikus</script>
-			<script type="Egyh">Egyiptomi hieratikus</script>
-			<script type="Egyp">Egyiptomi hieroglifák</script>
-			<script type="Ethi">Etióp</script>
-			<script type="Geok">Grúz kucsuri</script>
-			<script type="Geor">Grúz</script>
-			<script type="Glag">Glagolitikus</script>
-			<script type="Goth">Gót</script>
-			<script type="Grek">Görög</script>
-			<script type="Gujr">Gudzsaráti</script>
-			<script type="Guru">Gurmuki</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Egyszerűsített Han</script>
-			<script type="Hant">Hagyományos Han</script>
-			<script type="Hebr">Héber</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh hmong</script>
-			<script type="Hrkt">Katakana vagy hiragana</script>
-			<script type="Hung">Ómagyar</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Régi olasz</script>
-			<script type="Java">Jávai</script>
-			<script type="Jpan">Japán</script>
-			<script type="Kali">Kajah li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreai</script>
-			<script type="Kthi">Kaithi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Lao</script>
-			<script type="Latf">Fraktur latin</script>
-			<script type="Latg">Gael latin</script>
-			<script type="Latn">Latin</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Lineáris A</script>
-			<script type="Linb">Lineáris B</script>
-			<script type="Lyci">Líciai</script>
-			<script type="Lydi">Lídiai</script>
-			<script type="Mand">Mandai</script>
-			<script type="Mani">Manicheus</script>
-			<script type="Maya">Maja hieroglifák</script>
-			<script type="Mero">Meroitikus</script>
-			<script type="Mlym">Malajálam</script>
-			<script type="Mong">Mongol</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei mayek</script>
-			<script type="Mymr">Burmai</script>
-			<script type="Nkoo">N'ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol chiki</script>
-			<script type="Orkh">Orhon</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Oszmán</script>
-			<script type="Perm">Ópermikus</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Felriatos pahlavi</script>
-			<script type="Phlp">Psalter pahlavi</script>
-			<script type="Phlv">Könyv pahlavi</script>
-			<script type="Phnx">FÅ‘niciai</script>
-			<script type="Plrd">Pollard fonetikus</script>
-			<script type="Prti">Feliratos parthian</script>
-			<script type="Qaai">Származtatott</script>
-			<script type="Rjng">Redzsang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runikus</script>
-			<script type="Samr">Szamaritán</script>
-			<script type="Sara">Szarati</script>
-			<script type="Saur">Szaurastra</script>
-			<script type="Sgnw">Jelírás</script>
-			<script type="Shaw">Shaw ábécé</script>
-			<script type="Sinh">Szingaléz</script>
-			<script type="Sund">Szundanéz</script>
-			<script type="Sylo">Sylheti nagári</script>
-			<script type="Syrc">Szíriai</script>
-			<script type="Syre">Estrangelo szíriai</script>
-			<script type="Syrj">Nyugat-szíriai</script>
-			<script type="Syrn">Kelet-szíriai</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Új tai lue</script>
-			<script type="Taml">Tamil</script>
-			<script type="Tavt">Tai viet</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Berber</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibeti</script>
-			<script type="Ugar">Ugari</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Látható beszéd</script>
-			<script type="Xpeo">Óperzsa</script>
-			<script type="Xsux">Ékírásos suméro-akkád</script>
-			<script type="Yiii">Ji</script>
-			<script type="Zmth">Matematikai jelrendszer</script>
-			<script type="Zsym">Szimbólum</script>
-			<script type="Zxxx">�ratlan nyelvek kódja</script>
-			<script type="Zyyy">Meghatározatlan</script>
-			<script type="Zzzz">Ismeretlen vagy érvénytelen írásrendszer</script>
-		</scripts>
-		<territories>
-			<territory type="001">Világ</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Észak-Amerika</territory>
-			<territory type="005">Dél-Amerika</territory>
-			<territory type="009">Óceánia</territory>
-			<territory type="011">Nyugat-Afrika</territory>
-			<territory type="013">Közép-Amerika</territory>
-			<territory type="014">Kelet-Afrika</territory>
-			<territory type="015">Észak-Afrika</territory>
-			<territory type="017">Közép-Afrika</territory>
-			<territory type="018">Afrika déli része</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Amerika északi része</territory>
-			<territory type="029">Karib-térség</territory>
-			<territory type="030">Kelet-�zsia</territory>
-			<territory type="034">Dél-�zsia</territory>
-			<territory type="035">Délkelet-�zsia</territory>
-			<territory type="039">Dél-Európa</territory>
-			<territory type="053">Ausztrália és Új-Zéland</territory>
-			<territory type="054">Melanézia</territory>
-			<territory type="057">Mikronéziai régió</territory>
-			<territory type="061">Polinézia</territory>
-			<territory type="062">Délközép-�zsia</territory>
-			<territory type="142">�zsia</territory>
-			<territory type="143">Közép-�zsia</territory>
-			<territory type="145">Nyugat-�zsia</territory>
-			<territory type="150">Európa</territory>
-			<territory type="151">Kelet-Európa</territory>
-			<territory type="154">Észak-Európa</territory>
-			<territory type="155">Nyugat-Európa</territory>
-			<territory type="172">Független �llamok Közössége</territory>
-			<territory type="419">Latin-Amerika és a Karib-térség</territory>
-			<territory type="830">Csatorna-szigetek</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Egyesült Arab Emirátus</territory>
-			<territory type="AF">Afganisztán</territory>
-			<territory type="AG">Antigua és Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albánia</territory>
-			<territory type="AM">Örményország</territory>
-			<territory type="AN">Holland Antillák</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktisz</territory>
-			<territory type="AR">Argentína</territory>
-			<territory type="AS">Amerikai Szamoa</territory>
-			<territory type="AT">Ausztria</territory>
-			<territory type="AU">Ausztrália</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Aland-szigetek</territory>
-			<territory type="AZ">Azerbajdzsán</territory>
-			<territory type="BA">Bosznia-Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Banglades</territory>
-			<territory type="BE">Belgium</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgária</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolívia</territory>
-			<territory type="BR">Brazília</territory>
-			<territory type="BS">Bahamák</territory>
-			<territory type="BT">Bhután</territory>
-			<territory type="BV">Bouvet-sziget</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Fehéroroszország</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kókusz-szigetek</territory>
-			<territory type="CD">Kongó - Kinshasa</territory>
-			<territory type="CF">Közép-afrikai Köztársaság</territory>
-			<territory type="CG">Kongó</territory>
-			<territory type="CH">Svájc</territory>
-			<territory type="CI">Elefántcsontpart</territory>
-			<territory type="CK">Cook-szigetek</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kína</territory>
-			<territory type="CO">Kolumbia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Szerbia és Montenegró</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Zöld-foki Köztársaság</territory>
-			<territory type="CX">Karácsony-szigetek</territory>
-			<territory type="CY">Ciprus</territory>
-			<territory type="CZ">Csehország</territory>
-			<territory type="DE">Németország</territory>
-			<territory type="DJ">Dzsibuti</territory>
-			<territory type="DK">Dánia</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikai Köztársaság</territory>
-			<territory type="DZ">Algéria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Észtország</territory>
-			<territory type="EG">Egyiptom</territory>
-			<territory type="EH">Nyugat-Szahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanyolország</territory>
-			<territory type="ET">Etiópia</territory>
-			<territory type="FI">Finnország</territory>
-			<territory type="FJ">Fidzsi</territory>
-			<territory type="FK">Falkland-szigetek</territory>
-			<territory type="FM">Mikronézia</territory>
-			<territory type="FO">Feröer-szigetek</territory>
-			<territory type="FR">Franciaország</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Egyesült Királyság</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Grúzia</territory>
-			<territory type="GF">Francia Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghána</territory>
-			<territory type="GI">Gibraltár</territory>
-			<territory type="GL">Grönland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Egyenlítői-Guinea</territory>
-			<territory type="GR">Görögország</territory>
-			<territory type="GS">Dél Grúzia és a Déli Szendvics-szigetek</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong S.A.R, Kína</territory>
-			<territory type="HM">Heard és McDonald Szigetek</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Horvátország</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Magyarország</territory>
-			<territory type="ID">Indonézia</territory>
-			<territory type="IE">�rország</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Man-sziget</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Brit Indiai Oceán</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Irán</territory>
-			<territory type="IS">Izland</territory>
-			<territory type="IT">Olaszország</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordánia</territory>
-			<territory type="JP">Japán</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirgizisztán</territory>
-			<territory type="KH">Kambodzsa</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comore-szigetek</territory>
-			<territory type="KN">Saint Kitts és Nevis</territory>
-			<territory type="KP">Észak-Korea</territory>
-			<territory type="KR">Dél-Korea</territory>
-			<territory type="KW">Kuvait</territory>
-			<territory type="KY">Kajmán-szigetek</territory>
-			<territory type="KZ">Kazahsztán</territory>
-			<territory type="LA">Laosz</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Santa Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Srí Lanka</territory>
-			<territory type="LR">Libéria</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litvánia</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Lettország</territory>
-			<territory type="LY">Líbia</territory>
-			<territory type="MA">Marokkó</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegró</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaszkár</territory>
-			<territory type="MH">Marshall-szigetek</territory>
-			<territory type="MK">Macedónia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mianmar</territory>
-			<territory type="MN">Mongólia</territory>
-			<territory type="MO">Makaó SAR Kína</territory>
-			<territory type="MP">Északi Mariana-szigetek</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritánia</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Málta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldív-szigetek</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexikó</territory>
-			<territory type="MY">Malajzia</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namíbia</territory>
-			<territory type="NC">Új-Kaledónia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk-sziget</territory>
-			<territory type="NG">Nigéria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Hollandia</territory>
-			<territory type="NO">Norvégia</territory>
-			<territory type="NP">Nepál</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Új-Zéland</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francia Polinézia</territory>
-			<territory type="PG">Pápua Új-Guinea</territory>
-			<territory type="PH">Fülöp-szigetek</territory>
-			<territory type="PK">Pakisztán</territory>
-			<territory type="PL">Lengyelország</territory>
-			<territory type="PM">Saint Pierre és Miquelon</territory>
-			<territory type="PN">Pitcairn-sziget</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palesztin Terület</territory>
-			<territory type="PT">Portugália</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Külső-Óceánia</territory>
-			<territory type="QU">Európai Unió</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Románia</territory>
-			<territory type="RS">Szerbia</territory>
-			<territory type="RU">Oroszország</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Szaúd-Arábia</territory>
-			<territory type="SB">Salamon-szigetek</territory>
-			<territory type="SC">Seychelle-szigetek</territory>
-			<territory type="SD">Szudán</territory>
-			<territory type="SE">Svédország</territory>
-			<territory type="SG">Szingapúr</territory>
-			<territory type="SH">Szent Helena</territory>
-			<territory type="SI">Szlovénia</territory>
-			<territory type="SJ">Svalbard és Jan Mayen</territory>
-			<territory type="SK">Szlovákia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Szenegál</territory>
-			<territory type="SO">Szomália</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tomé és Príncipe</territory>
-			<territory type="SV">Salvador</territory>
-			<territory type="SY">Szíria</territory>
-			<territory type="SZ">Szváziföld</territory>
-			<territory type="TC">Turks- és Caicos-szigetek</territory>
-			<territory type="TD">Csád</territory>
-			<territory type="TF">Francia Déli Területek</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thaiföld</territory>
-			<territory type="TJ">Tadzsikisztán</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Kelet-Timor</territory>
-			<territory type="TM">Türkmenisztán</territory>
-			<territory type="TN">Tunézia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Törökország</territory>
-			<territory type="TT">Trinidad és Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajvan</territory>
-			<territory type="TZ">Tanzánia</territory>
-			<territory type="UA">Ukrajna</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerikai Csendes-óceáni Szigetek</territory>
-			<territory type="US">Egyesült �llamok</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Üzbegisztán</territory>
-			<territory type="VA">Vatikán</territory>
-			<territory type="VC">Saint Vincent és Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Brit Virgin-szigetek</territory>
-			<territory type="VI">Amerikai Virgin-szigetek</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis és Futuna</territory>
-			<territory type="WS">Szamoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Dél-Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Ismeretlen vagy érvénytelen körzet</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Hagyományos német helyesírás</variant>
-			<variant type="1994">Szabványosított reziján helyesírás</variant>
-			<variant type="1996">1996-os német helyesírás</variant>
-			<variant type="1606NICT">Késői közép francia 1606-ig</variant>
-			<variant type="AREVELA">Keleti örmény</variant>
-			<variant type="AREVMDA">Nyugati örmény</variant>
-			<variant type="BAKU1926">Egyesített türkic latin ábécé</variant>
-			<variant type="BISKE">San Giorgo/Bila tájszólás</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">IPA fonetika</variant>
-			<variant type="FONUPA">UPA fonetika</variant>
-			<variant type="LIPAW">Reziján lipovaz tájszólás</variant>
-			<variant type="MONOTON">Monoton</variant>
-			<variant type="NEDIS">Natisone dialektus</variant>
-			<variant type="NJIVA">Gniva/Njiva tájszólás</variant>
-			<variant type="OSOJS">Oseacco/Osojane tájszólás</variant>
-			<variant type="POLYTON">Politonikus</variant>
-			<variant type="POSIX">Számítógép</variant>
-			<variant type="REVISED">�tdolgozott helyesírás</variant>
-			<variant type="ROZAJ">Reziján</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Skót szabványos angol</variant>
-			<variant type="SCOUSE">Scouse</variant>
-			<variant type="SOLBA">Stolvizza/Solbica tájszólás</variant>
-			<variant type="TARASK">Taraskijevica helyesírás</variant>
-			<variant type="VALENCIA">Valencia</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Naptár</key>
-			<key type="collation">Rendezés</key>
-			<key type="currency">Pénznem</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Hagyományos kínai sorrend - Big5</type>
-			<type type="buddhist" key="calendar">buddhista naptár</type>
-			<type type="chinese" key="calendar">kínai naptár</type>
-			<type type="direct" key="collation">Közvetlen sorrend</type>
-			<type type="gb2312han" key="collation">Egyszerűsített kínai sorrend - GB2312</type>
-			<type type="gregorian" key="calendar">Gergely-naptár</type>
-			<type type="hebrew" key="calendar">héber naptár</type>
-			<type type="indian" key="calendar">Indiai nemzeti naptár</type>
-			<type type="islamic" key="calendar">iszlám naptár</type>
-			<type type="islamic-civil" key="calendar">iszlám civil naptár</type>
-			<type type="japanese" key="calendar">japán naptár</type>
-			<type type="phonebook" key="collation">Telefonkönyv sorrend</type>
-			<type type="pinyin" key="collation">Pinyin sorrend</type>
-			<type type="roc" key="calendar">Kínai köztársasági naptár</type>
-			<type type="stroke" key="collation">Vonássorrend</type>
-			<type type="traditional" key="collation">Hagyományos</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrikus</measurementSystemName>
-			<measurementSystemName type="US">amerikai</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Nyelv: {0}</codePattern>
-			<codePattern type="script">�rásrendszer: {0}</codePattern>
-			<codePattern type="territory">Régió: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="keys">titlecase-firstword</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="measurementSystemNames">lowercase-words</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="types">lowercase-words</inText>
-		<inText type="variants">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á b c {cs} {ccs} d {dz} {ddz} {dzs} {ddzs} e é f g {gy} {ggy} h i í j-l {ly} {lly} m n {ny} {nny} o ó ö ő p r s {sz} {ssz} t {ty} {tty} u ú ü ű v z {zs} {zzs}]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q w-y]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraAbbr>
-						<era type="0">BK</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan.</month>
-							<month type="2">febr.</month>
-							<month type="3">márc.</month>
-							<month type="4">ápr.</month>
-							<month type="5">máj.</month>
-							<month type="6">jún.</month>
-							<month type="7">júl.</month>
-							<month type="8">aug.</month>
-							<month type="9">szept.</month>
-							<month type="10">okt.</month>
-							<month type="11">nov.</month>
-							<month type="12">dec.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">január</month>
-							<month type="2">február</month>
-							<month type="3">március</month>
-							<month type="4">április</month>
-							<month type="5">május</month>
-							<month type="6">június</month>
-							<month type="7">július</month>
-							<month type="8">augusztus</month>
-							<month type="9">szeptember</month>
-							<month type="10">október</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">�</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">V</day>
-							<day type="mon">H</day>
-							<day type="tue">K</day>
-							<day type="wed">Sze</day>
-							<day type="thu">Cs</day>
-							<day type="fri">P</day>
-							<day type="sat">Szo</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">vasárnap</day>
-							<day type="mon">hétfő</day>
-							<day type="tue">kedd</day>
-							<day type="wed">szerda</day>
-							<day type="thu">csütörtök</day>
-							<day type="fri">péntek</day>
-							<day type="sat">szombat</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">V</day>
-							<day type="mon">H</day>
-							<day type="tue">K</day>
-							<day type="wed">S</day>
-							<day type="thu">C</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">N1</quarter>
-							<quarter type="2">N2</quarter>
-							<quarter type="3">N3</quarter>
-							<quarter type="4">N4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">I. negyedév</quarter>
-							<quarter type="2">II. negyedév</quarter>
-							<quarter type="3">III. negyedév</quarter>
-							<quarter type="4">IV. negyedév</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>de.</am>
-				<pm>du.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">időszámításunk előtt</era>
-						<era type="1">időszámításunk szerint</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">i. e.</era>
-						<era type="1">i. sz.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y. MMMM d., EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y. MMMM d.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy.MM.dd.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy.MM.dd.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M. d.</dateFormatItem>
-						<dateFormatItem id="MEd">M. d., E</dateFormatItem>
-						<dateFormatItem id="MMdd">MM.dd.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d.</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d.</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">yy/Q</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy.MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">y. MMMM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM.dd-dd.</greatestDifference>
-							<greatestDifference id="M">MM.dd. - MM.dd.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM.dd., E - MM.dd., E</greatestDifference>
-							<greatestDifference id="M">MM.dd., E - MM.dd., E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d.</greatestDifference>
-							<greatestDifference id="M">MMM d. - MMM d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d., E - d., E</greatestDifference>
-							<greatestDifference id="M">MMM d., E - MMM d., E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy.MM-MM.</greatestDifference>
-							<greatestDifference id="y">yyyy.MM. - yyyy.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy.MM.dd-dd.</greatestDifference>
-							<greatestDifference id="M">yyyy.MM.dd. - MM.dd.</greatestDifference>
-							<greatestDifference id="y">yyyy.MM.dd. - yyyy.MM.dd.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yyyy.MM.dd., E - dd., E</greatestDifference>
-							<greatestDifference id="M">yyyy.MM.dd., E - MM.dd., E</greatestDifference>
-							<greatestDifference id="y">yyyy.MM.dd., E - yyyy.MM.dd., E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y. MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y. MMM - y. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y. MMM d-d.</greatestDifference>
-							<greatestDifference id="M">y. MMM d. - MMM d.</greatestDifference>
-							<greatestDifference id="y">y. MMM d. - y. MMM d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y. MMM d., E - d., E</greatestDifference>
-							<greatestDifference id="M">y. MMM d., E - MMM d., E</greatestDifference>
-							<greatestDifference id="y">y. MMM d., E - y. MMM d., E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>éra</displayName>
-					</field>
-					<field type="year">
-						<displayName>év</displayName>
-					</field>
-					<field type="month">
-						<displayName>hónap</displayName>
-					</field>
-					<field type="week">
-						<displayName>hét</displayName>
-					</field>
-					<field type="day">
-						<displayName>nap</displayName>
-						<relative type="-3">három nappal ezelőtt</relative>
-						<relative type="-2">tegnapelőtt</relative>
-						<relative type="-1">tegnap</relative>
-						<relative type="0">ma</relative>
-						<relative type="1">holnap</relative>
-						<relative type="2">holnapután</relative>
-						<relative type="3">három nap múlva</relative>
-					</field>
-					<field type="weekday">
-						<displayName>hét napja</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>napszak</displayName>
-					</field>
-					<field type="hour">
-						<displayName>óra</displayName>
-					</field>
-					<field type="minute">
-						<displayName>perc</displayName>
-					</field>
-					<field type="second">
-						<displayName>másodperc</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zóna</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Tisri</month>
-							<month type="2">Hesván</month>
-							<month type="3">Kiszlév</month>
-							<month type="4">Tévész</month>
-							<month type="5">Svát</month>
-							<month type="6">�dár risón</month>
-							<month type="7">�dár séni</month>
-							<month type="8">Niszán</month>
-							<month type="9">Ijár</month>
-							<month type="10">Sziván</month>
-							<month type="12">�v</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">TÉ</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Moharrem</month>
-							<month type="3">Rébi el avvel</month>
-							<month type="4">Rébi el accher</month>
-							<month type="5">Dsemádi el avvel</month>
-							<month type="6">Dsemádi el accher</month>
-							<month type="7">Redseb</month>
-							<month type="8">Sabán</month>
-							<month type="9">Ramadán</month>
-							<month type="10">Sevvál</month>
-							<month type="11">Dsül kade</month>
-							<month type="12">Dsül hedse</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">MF</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ismeretlen</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jereván</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Déli-sark</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Vosztok</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Bécs</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbadosz</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brüsszel</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Szófia</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Río Branco</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minszk</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Beliz</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Montréal</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Húsvét-szigetek</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kasgár</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Ürümqi</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Csungking</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Sanghaj</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Zöld-Foki Szigetek</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Dzsibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Koppenhága</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagos-szigetek</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairó</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanári-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidzsi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Truk-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Ponape-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Kosrae-szigetek</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Párizs</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibraltár</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthåb</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Scoresby Sound</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarks Havn</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athén</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Dél-Georgia</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Dzsakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teherán</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Róma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Kiritimati-sziget</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Észak-Korea</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Dél-Korea</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvait</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktöbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kizilorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Alma-Ata</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Laosz</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Bejrút</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilniusz</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Montenegró</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kwajalein-zátony</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Majuro-zátony</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulánbátor</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Csojbalszan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makaó</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Málta</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldív-szigetek</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexikóváros</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Chatham-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquesas-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambier-szigetek</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsó</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn-szigetek</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azori-szigetek</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>madeirai idő</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisszabon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Szerbia</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kalinyingrád</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moszkva</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgográd</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Szamara</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekatyerinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omszk</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novoszibirszk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasznojarszk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutszk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutszk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vlagyivosztok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Szahalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magadán</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamcsatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadir</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Szingapúr</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaszkusz</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunisz</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Isztanbul</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Tajvan</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ungvár</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijev</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Szimferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporozsje</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Midway-szigetek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Wake-sziget</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Középső, Észak-Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Szamarkand</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taskent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre idő</standard>
-					<daylight>Acre nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afganisztáni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<generic>Mozambiki idő</generic>
-					<standard>Közép-afrikai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<generic>Kenyai idő</generic>
-					<standard>Kelet-afrikai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_FarWestern">
-				<long>
-					<generic>Nyugat-szaharai idő</generic>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Dél-afrikai idő</generic>
-					<standard>Dél-afrikai szabvány idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>Nigériai idő</generic>
-					<standard>Nyugat-afrikai idő</standard>
-					<daylight>Nyugat-afrikai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinszki idő</standard>
-					<daylight>Aktyubinszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaszkai idő</generic>
-					<standard>Alaszkai zónaidő</standard>
-					<daylight>Alaszkai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaszkai-hawaii idő</generic>
-					<standard>Alaszkai-hawaii zónaidő</standard>
-					<daylight>Alaszkai-hawaii nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazóniai idő</standard>
-					<daylight>Amazóniai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Középső államokbeli idő</generic>
-					<standard>Középső államokbeli zónaidő</standard>
-					<daylight>Középső államokbeli nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Keleti államokbeli idő</generic>
-					<standard>Keleti államokbeli zónaidő</standard>
-					<daylight>Keleti államokbeli nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Hegyvidéki idő</generic>
-					<standard>Hegyvidéki zónaidő</standard>
-					<daylight>Hegyvidéki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Csendes-óceáni idő</generic>
-					<standard>Csendes-óceáni zónaidő</standard>
-					<daylight>Csendes-óceáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadíri idő</standard>
-					<daylight>Anadíri nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aqtaui idő</standard>
-					<daylight>Aqtaui nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aqtobei idő</standard>
-					<daylight>Aqtobei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arab idő</generic>
-					<standard>Arab zónaidő</standard>
-					<daylight>Arab nyári idő</daylight>
-				</long>
-				<short>
-					<generic>AT (Arab)</generic>
-					<standard>AST (arab)</standard>
-					<daylight>ADT (Arab)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentína idő</standard>
-					<daylight>argentínai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Nyugat-Argentína idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Örmény idő</standard>
-					<daylight>Örmény nyári idő</daylight>
-				</long>
-				<short>
-					<standard>AMT (Örményország)</standard>
-					<daylight>AMST (Örményország)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashabadi idő</standard>
-					<daylight>Ashabadi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlanti-óceáni idő</generic>
-					<standard>Atlanti-óceáni zónaidő</standard>
-					<daylight>Atlanti-óceáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Közép-ausztráliai idő</generic>
-					<standard>Ausztrál középső zónaidő</standard>
-					<daylight>Ausztrál középső nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Ausztrál középső nyugati idő</generic>
-					<standard>Ausztrál középső nyugati zónaidő</standard>
-					<daylight>Ausztrál középső nyugati nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Kelet-ausztrál idő</generic>
-					<standard>Ausztrál keleti zónaidő</standard>
-					<daylight>Ausztrál keleti nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Nyugat-ausztrál idő</generic>
-					<standard>Ausztrál nyugati zónaidő</standard>
-					<daylight>Ausztrál nyugati nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azori idő</standard>
-					<daylight>Azori nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Bakui idő</standard>
-					<daylight>Bakui nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladesi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering idő</generic>
-					<standard>Beringi zónaidő</standard>
-					<daylight>Beringi nyári idő</daylight>
-				</long>
-				<short>
-					<standard>BST (Beringi)</standard>
-					<daylight>BDT (Beringi)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Butáni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Bolíviai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneói idő</standard>
-					<daylight>Borneói nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brazíliai idő</standard>
-					<daylight>Brazíliai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunei Darussalam-i idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Cape verdei idő</standard>
-					<daylight>Cape verdei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>Chamorroi zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Chathami zónaidő</standard>
-					<daylight>Chathami nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>chilei idő</standard>
-					<daylight>chilei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Kínai zónaidő</standard>
-					<daylight>Kínai nyári idő</daylight>
-				</long>
-				<short>
-					<standard>CST (Kína)</standard>
-					<daylight>CDT (Kína)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Csojbalszani idő</standard>
-					<daylight>Csojbalszani nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Karácsony-szigeti idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Kókusz-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Kolumbiai idő</standard>
-					<daylight>Kolumbiai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Cook-szigeteki idő</standard>
-					<daylight>Cook-szigeteki fél nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Kubai idő</generic>
-					<standard>Kubai zónaidő</standard>
-					<daylight>Kubai nyári idő</daylight>
-				</long>
-				<short>
-					<standard>CST (Kuba)</standard>
-					<daylight>CDT (Kuba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Daccai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Davisi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dumont-d'Urville-i idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dusanbei idő</standard>
-					<daylight>Dusanbei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Holland-guianai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Kelet-timori idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Húsvét-szigeteki idő</standard>
-					<daylight>Húsvét-szigeteki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ecuadori idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>közép-európai idő</standard>
-					<daylight>közép-európai nyári idő</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>kelet-európai idő</standard>
-					<daylight>kelet-európai nyári idő</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Nyugat-európai idő</standard>
-					<daylight>Nyugat-európai nyári idő</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Falkland-szigeteki idő</standard>
-					<daylight>Falkland-szigeteki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Fidzsi idő</standard>
-					<daylight>Fidzsi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Francia-guianai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Francia déli és antarktikus idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunzei idő</standard>
-					<daylight>Frunzei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagosi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Gambieri idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Grúz idő</standard>
-					<daylight>Grúz nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Gilbert-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwichi középidő</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Közép-grönlandi idő</standard>
-					<daylight>Közép-grönlandi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Kelet-grönlandi idő</standard>
-					<daylight>Kelet-grönlandi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Nyugat-grönlandi idő</standard>
-					<daylight>Nyugat-grönlandi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guami zónaidő</standard>
-				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Öbölbeli zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Guyanai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Hawaii-aleuti zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hongkongi idő</standard>
-					<daylight>Hongkongi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hovdi idő</standard>
-					<daylight>Hovdi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Indiai zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Indiai-óceáni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Közép-indonéziai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Kelet-indonéziai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Nyugat-indonéziai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Iráni zónaidő</standard>
-					<daylight>Iráni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Irkutszki idő</standard>
-					<daylight>Irkutszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Izraeli zónaidő</standard>
-					<daylight>Izraeli nyári idő</daylight>
-				</long>
-				<short>
-					<standard>IST (Izrael)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Japán zónaidő</standard>
-					<daylight>Japán nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Petropavlovszk-kamcsatkai idő</standard>
-					<daylight>Petropavlovszk-kamcsatkai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karacsi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kasgár idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<standard>Kelet-kazahsztáni zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<standard>Nyugat-kazahsztáni zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilordai idő</standard>
-					<daylight>Kizilordai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Koreai idő</generic>
-					<standard>Koreai zónaidő</standard>
-					<daylight>Koreai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Kosraei idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasznojarszki idő</standard>
-					<daylight>Krasznojarszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kujbisevi idő</standard>
-					<daylight>Kujbisevi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajaleini idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kirgiz idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lankai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Liberia">
-				<long>
-					<generic>Libériai idő</generic>
-				</long>
-				<short>
-					<generic>Libériai idő</generic>
-				</short>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Line-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord howei idő</generic>
-					<standard>Lord howei zónaidő</standard>
-					<daylight>Lord howei nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Macaui idő</standard>
-					<daylight>Macaui nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Magadáni idő</standard>
-					<daylight>Magadáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malayai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Malajziai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Maldív-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Marquesasi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Marshall-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauritiusi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Mawsoni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulánbátori idő</standard>
-					<daylight>Ulánbátori nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moszkvai idő</generic>
-					<standard>Moszkvai zónaidő</standard>
-					<daylight>Moszkvai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Myanmari idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Naurui idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepáli idő</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>Új-kaledóniai idő</standard>
-					<daylight>Új-kaledóniai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Új-zélandi idő</generic>
-					<standard>Új-zélandi zónaidő</standard>
-					<daylight>Új-zélandi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Új-fundlandi idő</generic>
-					<standard>Új-fundlandi zónaidő</standard>
-					<daylight>Új-fundlandi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Niuei idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Norfolk-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronha-i idő</standard>
-					<daylight>Fernando de Noronha-i nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Észak-mariana-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novoszibirzski idő</standard>
-					<daylight>Novoszibirszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omszki idő</standard>
-					<daylight>Omszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakisztáni idő</standard>
-					<daylight>Pakisztáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Palaui idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Pápua új-guineai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paraguayi idő</standard>
-					<daylight>Paraguayi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Perui idő</standard>
-					<daylight>Perui nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Fülöp-szigeteki idő</standard>
-					<daylight>Fülöp-szigeteki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Phoenix-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre és Miquelon-i idő</generic>
-					<standard>Pierre és Miquelon-i zónaidő</standard>
-					<daylight>Pierre és Miquelon-i nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Pitcairni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Ponapei idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Qyzylordai idő</standard>
-					<daylight>Qyzylordai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Réunioni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Rotherai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sakhalin idő</standard>
-					<daylight>Sakhalin nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Szamarai idő</standard>
-					<daylight>Szamarai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Szamarkandi idő</standard>
-					<daylight>Szamarkandi nyári idő</daylight>
-				</long>
-				<short>
-					<standard>SAMT (Szamarkand)</standard>
-					<daylight>SAMST (Szamarkand)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Szamoai zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Seychelle-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Sevcsenkói idő</standard>
-					<daylight>Sevcsenkói nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Szingapúri zónaidő</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Salamon-szigeteki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Dél-grúziai idő</standard>
-				</long>
-				<short>
-					<standard>GST (Dél-grúziai)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Szurinámi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Szverdlovszki idő</standard>
-					<daylight>Szverdlovszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Syowai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Tahiti idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tadzsikisztáni idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Taskenti idő</standard>
-					<daylight>Taskenti nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbiliszi idő</standard>
-					<daylight>Tbiliszi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Tokelaui idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Tongai idő</standard>
-					<daylight>Tongai nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Truki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<generic>Török idő</generic>
-					<standard>Törökországi idő</standard>
-					<daylight>Törökországi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Türkmenisztáni idő</standard>
-					<daylight>Türkmenisztáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Tuvalui idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Uráli idő</standard>
-					<daylight>Uráli nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Uruguayi idő</standard>
-					<daylight>Uruguayi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumqi idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Üzbegisztáni idő</standard>
-					<daylight>Üzbegisztáni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Vanuatui idő</standard>
-					<daylight>Vanuatui nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venezuelai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vlagyivosztoki idő</standard>
-					<daylight>Vlagyivosztoki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgográdi idő</standard>
-					<daylight>Volgográdi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vosztoki idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Wake-szigeti idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Wallis és futunai idő</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Jakutszki idő</standard>
-					<daylight>Jakutszki nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Jekatyerinburgi idő</standard>
-					<daylight>Jekatyerinburgi nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Jereváni idő</standard>
-					<daylight>Jereváni nyári idő</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>yukoni idő</generic>
-					<standard>yukoni zónaidő</standard>
-					<daylight>Yukoni nyári idő</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorrai peseta</displayName>
-				<displayName count="other">Andorrai peseta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>EAE dirham</displayName>
-				<displayName count="other">UAE dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghani (1927-2002)</displayName>
-				<displayName count="other">Afghani (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani</displayName>
-				<displayName count="other">Afghani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albán lek</displayName>
-				<displayName count="other">Albán lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram</displayName>
-				<displayName count="other">Örmény dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Holland-antilla forint</displayName>
-				<displayName count="other">Holland Antillai guilder</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolai kwanza</displayName>
-				<displayName count="other">Angolai kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolai kwanza (1977-1990)</displayName>
-				<displayName count="other">Angolai kwanza (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolai új kwanza (1990-2000)</displayName>
-				<displayName count="other">Angolai új kwanza (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolai kwanza reajustado (1995-1999)</displayName>
-				<displayName count="other">Angolai kwanza reajustado (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentín austral</displayName>
-				<displayName count="other">Argentin austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentín peso (1983-1985)</displayName>
-				<displayName count="other">Argentin peso (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso</displayName>
-				<displayName count="other">Argentin peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Osztrák schilling</displayName>
-				<displayName count="other">Osztrák schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Ausztrál dollár</displayName>
-				<displayName count="other">Ausztrál dollár</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubai forint</displayName>
-				<displayName count="other">Arubai forint</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbajdzsáni manat (1993-2006)</displayName>
-				<displayName count="other">Azerbajdzsáni manat (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbajdzsáni manat</displayName>
-				<displayName count="other">Azerbajdzsáni manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosznia-hercegovinai dínár</displayName>
-				<displayName count="other">Bosznia-hercegovinai dínár</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bozsnia-hercegovinai konvertibilis márka</displayName>
-				<displayName count="other">Bosznia-hercegovinai konvertibilis márka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadosi dollár</displayName>
-				<displayName count="other">Barbadosi dollár</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladesi taka</displayName>
-				<displayName count="other">Bangladesi taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belga frank (konvertibilis)</displayName>
-				<displayName count="other">Belga frank (konvertibilis)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belga frank</displayName>
-				<displayName count="other">Belga frank</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belga frank (pénzügyi)</displayName>
-				<displayName count="other">Belga frank (pénzügyi)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bolgár kemény leva</displayName>
-				<displayName count="other">Bolgár kemény leva</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bolgár új leva</displayName>
-				<displayName count="other">Bolgár új leva</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreini dinár</displayName>
-				<displayName count="other">Bahreini dinár</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi frank</displayName>
-				<displayName count="other">Burundi frank</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudai dollár</displayName>
-				<displayName count="other">Bermudai dollár</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei dollár</displayName>
-				<displayName count="other">Brunei dollár</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="other">Bolíviai boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolíviai peso</displayName>
-				<displayName count="other">Bolíviai peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolíviai mvdol</displayName>
-				<displayName count="other">Bolíviai mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brazi cruzeiro novo (1967-1986)</displayName>
-				<displayName count="other">Brazil cruzeiro novo (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brazi cruzado</displayName>
-				<displayName count="other">Brazil cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brazil cruzeiro (1990-1993)</displayName>
-				<displayName count="other">Brazil cruzeiro (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazil real</displayName>
-				<displayName count="other">Brazil real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brazil cruzado novo</displayName>
-				<displayName count="other">Brazil cruzado novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brazil cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamai dollár</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutáni ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmai kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswanai pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Fehérorosz új rubel (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Fehérorosz rubel</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizei dollár</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadai dollár</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Kongói frank</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Svájci frank</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR frank</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilei unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chilei peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Kínai jüan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbiai peso</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costa Ricai colon</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>szerb dinár</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Csehszlovák kemény korona</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubai peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Cape Verdei escudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Ciprusi font</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Cseh korona</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Kelet-Német márka</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Német márka</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Dzsibuti frank</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Dán korona</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikai peso</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algériai dínár</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadori sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuadori Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Észt korona</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyiptomi font</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritreai nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>spanyol peseta (A-kontó)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>spanyol peseta (konvertibilis kontó)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spanyol peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiópiai birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finn markka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidzsi dollár</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland-szigeteki font</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Francia frank</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Brit font sterling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Grúz kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Grúz lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghánai cedi (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghánai cedi</displayName>
-				<displayName count="other">Ghánai cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltári font</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambiai dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guineai frank</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guineai syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Egyenlítői-guineai ekwele guineana</displayName>
-				<displayName count="other">Egyenlítői-guineai ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Görög drachma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalai quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugál guinea escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissaui peso</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyanai dollár</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkongi dollár</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hodurasi lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Horvát dínár</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Horvát kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haiti gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Magyar forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonéz rúpia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>�r font</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Izraeli font</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Izraeli új sékel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>indiai rúpia</displayName>
-				<displayName count="other">Indiai rúpia</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Iraki dínár</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iráni rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Izlandi korona</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Olasz líra</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaikai dollár</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordániai dínár</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japán jen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenyai shilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgizisztáni szom</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodzsai riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Comorei frank</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Észak-koreai won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Dél-koreai won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuvaiti dínár</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kajmán-szigeteki dollár</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazahsztáni tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laoszi kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanoni font</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri Lankai rúpia</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Libériai dollár</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesothoi loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litvániai litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litvániai talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luxemburgi konvertibilis frank</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburgi frank</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>luxemburgi pénzügyi frank</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lett lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lett rubel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Líbiai dínár</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkói dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkói frank</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldován lei</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaszkári ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaszkári frank</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Macedon dínár</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Mali frank</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Mianmari kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongóliai tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>makaói pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritániai ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Máltai líra</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Máltai font</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritiusi rúpia</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldív-szigeteki rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawi kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexikói peso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexikói ezüst peso (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexikói Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malajziai ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambik escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Mozambik metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambiki metikális</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namíbiai dollár</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigériai naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaraguai cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nikaraguai cordoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Holland forint</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norvég korona</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepáli rúpia</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Új-zélandi dollár</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Ománi rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamai balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Perui inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Perui sol nuevo</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Perui sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Pápua új-guineai kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Fülöp-szigeteki peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakisztáni rúpia</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Lengyel zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Lengyel zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugál escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguayi guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Katari rial</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>rhodéziai dollár</displayName>
-				<displayName count="other">Rhodéziai dollár</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Régi román lej</displayName>
-				<displayName count="other">Régi román lej</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>új román lej</displayName>
-				<displayName count="other">Román lej</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Szerb Dínár</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Orosz rubel</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Orosz rubel (1991-1998)</displayName>
-				<displayName count="other">Orosz rubel (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruandai frank</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Szaúdi riyal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salamon-szigeteki dollár</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychelle-szigeteki rúpia</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Szudáni dínár</displayName>
-				<displayName count="other">Régi szudáni dínár</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Szudáni font</displayName>
-				<displayName count="other">Szudáni font</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Régi szudáni font</displayName>
-				<displayName count="other">Régi szudáni font</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Svéd korona</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Szingapúri dollár</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Saint Helena font</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Szlovén tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Szlovák korona</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leonei leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Szomáli shilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamei dollár</displayName>
-				<displayName count="other">Surinamei dollár</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Suriname-i gulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao tome-i és principe-i dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Szovjet rubel</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadori colón</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Szíriai font</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Szváziföldi lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thai baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tádzsikisztáni rubel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tádzsikisztáni somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Türkmenisztáni manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunéziai dínár</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>tongai paanga</displayName>
-				<displayName count="other">Tongai paanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timori escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Régi török líra</displayName>
-				<displayName count="other">Régi török líra</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>új török líra</displayName>
-				<displayName count="other">Török líra</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad és tobagoi dollár</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Tajvani új dollár</displayName>
-				<displayName count="other">Tajvani dollár</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzániai shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrán hrivnya</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrán karbovanec</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandai shilling (1966-1987)</displayName>
-				<displayName count="other">Ugandai shilling (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandai shilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>USA dollár</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>USA dollár (következő napi)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>USA dollár (aznapi)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayi peso en unidades indexadas</displayName>
-				<displayName count="other">Uruguayi peso en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguay-i peso (1975-1993)</displayName>
-				<displayName count="other">Uruguayi peso (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguay-i peso uruguayo</displayName>
-				<displayName count="other">Uruguayi peso</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Üzbegisztáni szum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelai bolívar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezuelai bolivar fuerte</displayName>
-				<displayName count="other">Venezuelai bolivar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnámi dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatui vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Nyugat-szamoai tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA frank BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Ezüst</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Arany</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>European Composite Unit</displayName>
-				<displayName count="other">Európai kompozit egység</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>European Monetary Unit</displayName>
-				<displayName count="other">Európai monetáris egység</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>European Unit of Account (XBC)</displayName>
-				<displayName count="other">Európai kontó egység (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>European Unit of Account (XBD)</displayName>
-				<displayName count="other">Európai kontó egység (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Kelet-karibi dollár</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Special Drawing Rights</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>európai pénznemegység</displayName>
-				<displayName count="other">Európai pénznemegység</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Francia arany frank</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Francia UIC-frank</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA frank BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palládium</displayName>
-				<displayName count="other">Palládium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP frank</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-				<displayName count="other">Platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET tőke</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Tesztelési pénznemkód</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Ismeretlen vagy érvénytelen pénznem</displayName>
-				<displayName count="other">Ismeretlen/érvénytelen pénznem</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemeni dínár</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemeni rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoszláv kemény dínár</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoszláv új dínár</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoszláv konvertibilis dínár</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Dél-afrikai rand (pénzügyi)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Dél-afrikai rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambiai kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairei új zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairei zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwei dollár</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} nap</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} óra</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} perc</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} hónap</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} másodperc</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} hét</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} év</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>igen:i</yesstr>
-			<nostr>nem:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/hu_HU.xml b/airtime_mvc/library/Zend/Locale/Data/hu_HU.xml
deleted file mode 100644
index 9192e0ae2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hu_HU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="hu"/>
-		<territory type="HU"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/hy.xml b/airtime_mvc/library/Zend/Locale/Data/hy.xml
deleted file mode 100644
index 30e9f0395..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hy.xml
+++ /dev/null
@@ -1,593 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.73 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="hy"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Ô±Ö†Ö€Õ«Õ¯Õ¡Õ¶Õ½</language>
-			<language type="am">Õ€Õ¡Õ¢Õ¥Õ·Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ar">Ô±Ö€Õ¡Õ¢Õ¥Ö€Õ¥Õ¶</language>
-			<language type="as">Ô±Õ½Õ¡Õ´Õ¥Ö€Õ¥Õ¶</language>
-			<language type="az">Ô±Õ¤Ö€Õ¢Õ¥Õ»Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="be">Ô²Õ¥Õ¬Õ¡Ö€Õ¸Ö‚Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="bg">Ô²Õ¸Ö‚Õ¬Õ²Õ¡Ö€Õ¥Ö€Õ¥Õ¶</language>
-			<language type="bh">Ô²Õ«Õ°Õ¡Ö€Õ¥Ö€Õ¥Õ¶</language>
-			<language type="bn">Ô²Õ¥Õ¶Õ£Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="br">Ô²Ö€Õ¥Õ¿Õ¸Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="bs">Ô²Õ¸Õ½Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ca">Ô¿Õ¡Õ¿Õ¡Õ¬Õ¸Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="cs">Õ‰Õ¥Õ­Õ¥Ö€Õ¥Õ¶</language>
-			<language type="cy">ÕŽÕ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="da">Ô´Õ¡Õ¶Õ«Õ¥Ö€Õ¥Õ¶</language>
-			<language type="de">Ô³Õ¥Ö€Õ´Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="el">Õ€Õ¸Ö‚Õ¶Õ¡Ö€Õ¥Õ¶</language>
-			<language type="en">Ô±Õ¶Õ£Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="eo">Ô·Õ½ÕºÕ¥Ö€Õ¡Õ¶Õ¿Õ¸</language>
-			<language type="es">Ô»Õ½ÕºÕ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="et">Ô·Õ½Õ¿Õ¸Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="eu">Ô²Õ¡Õ½Õ¯Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fa">ÕŠÕ¡Ö€Õ½Õ¯Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fi">Õ–Õ«Õ¶Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fil">Õ�Õ¡Õ£Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fo">Õ–Õ¡Ö€Õ¾Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fr">Õ–Ö€Õ¡Õ¶Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="fy">Õ–Ö€Õ«Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ga">Ô»Õ¼Õ¬Õ¡Õ¶Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="gd">Ô³Õ¡Õ¥Õ¬ÕµÕ¡Õ¶ Õ‡Õ¸Õ¿Õ¬Õ¡Õ¶Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="gl">Ô³Õ¡Õ¬Õ«Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="gn">Ô³Õ¸Ö‚Õ¡Ö€Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="gu">Ô³Õ¸Ö‚Õ»Õ¡Ö€Õ¡Õ¿Õ¥Ö€Õ¥Õ¶</language>
-			<language type="he">ÔµÕ¢Ö€Õ¡ÕµÕ¥Ö€Õ¥Õ¶</language>
-			<language type="hi">Õ€Õ¶Õ¤Õ¯Õ¥Ö€Õ¥Õ¶</language>
-			<language type="hr">Ô½Õ¸Ö€Õ¾Õ¡Õ©Õ¥Ö€Õ¥Õ¶</language>
-			<language type="hu">Õ€Õ¸Ö‚Õ¶Õ£Õ¡Ö€Õ¥Ö€Õ¥Õ¶</language>
-			<language type="hy">Õ€Õ¡ÕµÕ¥Ö€Õ§Õ¶</language>
-			<language type="ia">Ô»Õ¶Õ¿Õ¥Ö€Õ¬Õ«Õ¶Õ£Õ¸Ö‚Õ¡</language>
-			<language type="id">Ô»Õ¶Õ¤Õ¸Õ¶Õ¥Õ¦Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ie">Ô»Õ¶Õ¿Õ¥Ö€Õ¬Õ«Õ¶Õ£</language>
-			<language type="is">Ô»Õ½Õ¬Õ¡Õ¶Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="it">Ô»Õ¿Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ja">ÕƒÕ¡ÕºÕ¸Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="jv">ÕƒÕ¡Õ¾Õ¡ÕµÕ¥Ö€Õ¥Õ¶</language>
-			<language type="ka">ÕŽÖ€Õ¡Ö�Õ¥Ö€Õ¥Õ¶</language>
-			<language type="km">Ô¿Õ¡Õ´Õ¢Õ¸Õ»Õ¥Ö€Õ¥Õ¶</language>
-			<language type="kn">Ô¿Õ¡Õ¶Õ¶Õ¡Õ¤Õ¡</language>
-			<language type="ko">Ô¿Õ¸Ö€Õ¥Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ku">Õ”Ö€Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ky">Õ‚Ö€Õ²Õ¦Õ¥Ö€Õ¥Õ¶</language>
-			<language type="la">Ô¼Õ¡Õ¿Õ«Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ln">Ô¼Õ«Õ¶Õ£Õ¡Õ¬Õ¡</language>
-			<language type="lo">Ô¼Õ¡Õ¸Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="lt">Ô¼Õ«Õ¿Õ¾Õ¥Ö€Õ¥Õ¶</language>
-			<language type="lv">Ô¼Õ¡Õ¿Õ¾Õ¥Ö€Õ¥Õ¶</language>
-			<language type="mk">Õ„Õ¡Õ¯Õ¥Õ¤Õ¸Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ml">Ô¿Õ¥Ö€Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="mn">Õ„Õ¸Õ¶Õ²Õ¸Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="mr">Õ„Õ¡Ö€Õ¡Õ©Õ«</language>
-			<language type="ms">Õ„Õ¡Õ¬Õ¡ÕµÕ¥Ö€Õ¥Õ¶</language>
-			<language type="mt">Õ„Õ¡Õ¬Õ©Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ne">Õ†Õ¥ÕºÕ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="nl">Õ€Õ¸Õ¬Õ¡Õ¶Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="nn">Õ†Õ¸Ö€Õ¾Õ¥Õ£Õ¥Ö€Õ¥Õ¶ (Õ†ÕµÕ¸Ö‚Õ¶Õ¸Ö€Õ½Õ¯)</language>
-			<language type="no">Õ†Õ¸Ö€Õ¾Õ¥Õ£Õ¥Ö€Õ¥Õ¶</language>
-			<language type="oc">Ô±Õ¯Õ¾Õ«Õ¿Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="or">Õ•Ö€Õ«Õ½Õ¥Ö€Õ¥Õ¶</language>
-			<language type="pa">Õ“Õ¥Õ¶Õ»Õ¡Õ¢Õ¥Ö€Õ¥Õ¶</language>
-			<language type="pl">Ô¼Õ¥Õ°Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ps">Õ“Õ¡Õ·Õ¿Õ¸Ö‚Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="pt">ÕŠÕ¸Ö€Õ¿Õ¸Ö‚Õ£Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ro">Ռումիներեն</language>
-			<language type="ru">Ռուսերեն</language>
-			<language type="sa">Õ�Õ¡Õ¶Õ½Õ¯Ö€Õ«Õ¿Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sd">Õ�Õ«Õ¶Õ¤Õ°Õ«</language>
-			<language type="sh">Õ�Õ¥Ö€Õ¢Õ¡-Ô½Õ¸Ö€Õ¾Õ¡Õ©Õ¥Ö€Õ¥Õ¶</language>
-			<language type="si">Õ�Õ«Õ¶Õ°Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sk">Õ�Õ¬Õ¸Õ¾Õ¡Õ¯Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sl">Õ�Õ¬Õ¸Õ¾Õ¥Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="so">Õ�Õ¸Õ´Õ¡Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sq">Ô±Õ¬Õ¢Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sr">Õ�Õ¥Ö€Õ¢Õ¥Ö€Õ¥Õ¶</language>
-			<language type="st">Õ�Õ¥Õ½Õ¸Õ¿Õ¸</language>
-			<language type="su">Õ�Õ¸Ö‚Õ¶Õ¤Õ¡Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sv">Õ‡Õ¾Õ¥Õ¤Õ¥Ö€Õ¥Õ¶</language>
-			<language type="sw">Õ�Õ¸Ö‚Õ¡Õ°Õ«Õ¬Õ«</language>
-			<language type="ta">Ô¹Õ¡Õ´Õ«Õ¬Õ¥Ö€Õ¥Õ¶</language>
-			<language type="te">Õ�Õ¥Õ¬Õ¸Ö‚Õ£Õ¸Ö‚</language>
-			<language type="th">Ô¹Õ¡ÕµÕ¥Ö€Õ¥Õ¶</language>
-			<language type="ti">Ô·Ö€Õ«Õ¿Ö€Õ¥Ö€Õ¥Õ¶</language>
-			<language type="tk">Ô¹Õ¸Ö‚Ö€Ö„Õ´Õ¥Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="tlh">Ô¿Õ¬Õ«Õ¶Õ£Õ¸Õ¶</language>
-			<language type="tr">Ô¹Õ¸Ö‚Ö€Ö„Õ¥Ö€Õ¥Õ¶</language>
-			<language type="tw">Õ�Õ¸Ö‚Õ«</language>
-			<language type="ug">ÕˆÖ‚ÕµÕ²Õ¸Ö‚Ö€Õ¥Ö€Õ¥Õ¶</language>
-			<language type="uk">ÕˆÖ‚Õ¯Ö€Õ¡Õ«Õ¶Õ¥Ö€Õ¥Õ¶</language>
-			<language type="ur">ÕˆÖ‚Ö€Õ¤Õ¸Ö‚</language>
-			<language type="uz">ÕˆÖ‚Õ¦Õ¢Õ¥Õ¯Õ¥Ö€Õ¥Õ¶</language>
-			<language type="vi">ÕŽÕ«Õ¥Õ¿Õ¶Õ¡Õ´Õ¥Ö€Õ¥Õ¶</language>
-			<language type="xh">Ô½Õ¸Õ·Õ¥Ö€Õ¥Õ¶</language>
-			<language type="yi">Ô»Õ¤Õ«Õ·</language>
-			<language type="zh">Õ‰Õ«Õ¶Õ¡Ö€Õ¥Õ¶</language>
-			<language type="zu">Ô¶Õ¸Ö‚Õ¬Õ¸Ö‚Õ½Õ¥Ö€Õ¥Õ¶</language>
-		</languages>
-		<territories>
-			<territory type="001">Ô±Õ·Õ­Õ¡Ö€Õ°</territory>
-			<territory type="002">Ô±Ö†Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="005">Õ€Õ¡Ö€Õ¡Õ¾Õ¡ÕµÕ«Õ¶ Ô±Õ´Õ¥Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="011">Ô±Ö€Ö‡Õ´Õ¿ÕµÕ¡Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="014">Ô±Ö€Ö‡Õ¥Õ¬ÕµÕ¡Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="015">Õ€ÕµÕ¸Ö‚Õ½Õ«Õ½Õ¡ÕµÕ«Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="018">Õ€Õ¡Ö€Õ¡Õ¾Õ¡ÕµÕ«Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡ [018]</territory>
-			<territory type="AD">Ô±Õ¶Õ¤Õ¸Ö€Õ¡</territory>
-			<territory type="AE">Õ„Õ«Õ¡Ö�ÕµÕ¡Õ¬ Ô±Ö€Õ¡Õ¢Õ¡Õ¯Õ¡Õ¶ Ô·Õ´Õ«Ö€Õ¡Õ©Õ¶Õ¥Ö€</territory>
-			<territory type="AF">Ô±Ö†Õ²Õ¡Õ¶Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="AG">Ô±Õ¶Õ¿Õ«Õ£Õ¸Ö‚Õ¡-Ô²Õ¡Ö€Õ¢Õ¸Ö‚Õ¤Õ¡</territory>
-			<territory type="AL">Ô±Õ¬Õ¢Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="AM">Õ€Õ¡ÕµÕ¡Õ½Õ¿Õ¡Õ¶Õ« Õ€Õ¡Õ¶Ö€Õ¡ÕºÕ¥Õ¿Õ¸Ö‚Õ©Õ«Ö‚Õ¶</territory>
-			<territory type="AO">Ô±Õ¶Õ£Õ¸Õ¬Õ¡</territory>
-			<territory type="AR">Ô±Ö€Õ£Õ¥Õ¶Õ¿Õ«Õ¶Õ¡</territory>
-			<territory type="AT">Ô±Õ¾Õ½Õ¿Ö€Õ«Õ¡</territory>
-			<territory type="AU">Ô±Õ¾Õ½Õ¿Ö€Õ¡Õ¬Õ«Õ¡</territory>
-			<territory type="AZ">Ô±Õ¤Ö€Õ¢Õ¥Õ»Õ¡Õ¶</territory>
-			<territory type="BA">Ô²Õ¸Õ½Õ¶Õ«Õ¡-Õ€Õ¥Ö€Ö�Õ¥Õ£Õ¸Õ¾Õ«Õ¶Õ¡</territory>
-			<territory type="BB">Ô²Õ¡Ö€Õ¢Õ¡Õ¤Õ¸Õ½</territory>
-			<territory type="BD">Ô²Õ¡Õ¶Õ£Õ¬Õ¡Õ¤Õ¥Õ·</territory>
-			<territory type="BE">Ô²Õ¥Õ¬Õ£Õ«Õ¡</territory>
-			<territory type="BF">Ô²Õ¸Ö‚Ö€Õ¯Õ«Õ¶Õ¡ Õ–Õ¡Õ½Õ¸</territory>
-			<territory type="BG">Ô²Õ¸Ö‚Õ¬Õ²Õ¡Ö€Õ«Õ¡</territory>
-			<territory type="BH">Ô²Õ¡Õ°Ö€Õ¥ÕµÕ¶</territory>
-			<territory type="BI">Ô²Õ¸Ö‚Ö€Õ¸Ö‚Õ¶Õ¤Õ«</territory>
-			<territory type="BJ">Ô²Õ¥Õ¶Õ«Õ¶</territory>
-			<territory type="BN">Ô²Ö€Õ¸Ö‚Õ¶Õ¥Õµ</territory>
-			<territory type="BO">Ô²Õ¸Õ¬Õ«Õ¾Õ«Õ¡</territory>
-			<territory type="BR">Ô²Ö€Õ¡Õ¦Õ«Õ¬Õ«Õ¡</territory>
-			<territory type="BS">Ô²Õ¡Õ°Õ¡Õ´Õ¶Õ¥Ö€</territory>
-			<territory type="BT">Ô²Õ¸Ö‚Õ¿Õ¡Õ¶</territory>
-			<territory type="BW">Ô²Õ¸Õ¿Õ½Õ¾Õ¡Õ¶Õ¡</territory>
-			<territory type="BY">Ô²Õ¥Õ¬Õ¸Õ¼Õ¸Ö‚Õ½</territory>
-			<territory type="BZ">Ô²Õ¥Õ¬Õ«Õ¦</territory>
-			<territory type="CA">Ô¿Õ¡Õ¶Õ¡Õ¤Õ¡</territory>
-			<territory type="CF">Ô¿Õ¥Õ¶Õ¿Ö€Õ¸Õ¶Õ¡Õ¯Õ¡Õ¶ Ô±Ö†Ö€Õ«Õ¯ÕµÕ¡Õ¶ Õ€Õ¡Õ¶Ö€Õ¡ÕºÕ¥Õ¿Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶</territory>
-			<territory type="CG">Ô¿Õ¸Õ¶Õ£Õ¸</territory>
-			<territory type="CH">Õ‡Õ¾Õ¥ÕµÖ�Õ¡Ö€Õ«Õ¡</territory>
-			<territory type="CI">Õ“Õ²Õ¸Õ½Õ¯Ö€Õ« Ô±Öƒ</territory>
-			<territory type="CL">Õ‰Õ«Õ¬Õ«</territory>
-			<territory type="CM">Ô¿Õ¡Õ´Õ¥Ö€Õ¸Ö‚Õ¶</territory>
-			<territory type="CN">Õ‰Õ«Õ¶Õ¡Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="CO">Ô¿Õ¸Õ¬Õ¸Ö‚Õ´Õ¢Õ«Õ¡</territory>
-			<territory type="CR">Կոստա-Ռիկա</territory>
-			<territory type="CS">Õ�Õ¥Ö€Õ¢Õ«Õ¡ Ö‡ Õ„Õ¸Õ¶Õ¿Õ¥Õ¶Õ¥Õ£Ö€Õ¸</territory>
-			<territory type="CU">Ô¿Õ¸Ö‚Õ¢Õ¡</territory>
-			<territory type="CV">Ô¿Õ¡Õ¢Õ¸-ÕŽÕ¥Ö€Õ¤Õ¥</territory>
-			<territory type="CY">Ô¿Õ«ÕºÖ€Õ¸Õ½</territory>
-			<territory type="CZ">Õ‰Õ¥Õ­Õ«Õ¡ÕµÕ« Õ€Õ¡Õ¶Ö€Õ¡ÕºÕ¥Õ¿Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶</territory>
-			<territory type="DE">Ô³Õ¥Ö€Õ´Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="DJ">Õ‹Õ«Õ¢Õ¸Ö‚Õ¿Õ«</territory>
-			<territory type="DK">Ô´Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="DM">Ô´Õ¸Õ´Õ«Õ¶Õ«Õ¯Õ¡</territory>
-			<territory type="DO">Ô´Õ¸Õ´Õ«Õ¶Õ«Õ¯ÕµÕ¡Õ¶ Õ€Õ¡Õ¶Ö€Õ¡ÕºÕ¥Õ¿Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶</territory>
-			<territory type="DZ">Ô±Õ¬ÕªÕ«Ö€</territory>
-			<territory type="EC">Ô·Õ¯Õ¾Õ¡Õ¤Õ¸Ö€</territory>
-			<territory type="EE">Ô·Õ½Õ¿Õ¸Õ¶Õ«Õ¡</territory>
-			<territory type="EG">ÔµÕ£Õ«ÕºÕ¿Õ¸Õ½</territory>
-			<territory type="EH">Ô±Ö€Õ¥Õ¾Õ´Õ¿ÕµÕ¡Õ¶ Õ�Õ¡Õ°Õ¡Ö€Õ¡</territory>
-			<territory type="ER">Ô·Ö€Õ«Õ¿Ö€Õ¥Õ¡</territory>
-			<territory type="ES">Ô»Õ½ÕºÕ¡Õ¶Õ«Õ¡</territory>
-			<territory type="ET">ÔµÕ©Õ¸Õ¾ÕºÕ«Õ¡</territory>
-			<territory type="FI">Õ–Õ«Õ¶Õ¬Õ¡Õ¶Õ¤Õ«Õ¡</territory>
-			<territory type="FJ">Õ–Õ«Õ»Õ«</territory>
-			<territory type="FM">Õ„Õ«Õ¯Ö€Õ¸Õ¶Õ¥Õ¦Õ«Õ¡</territory>
-			<territory type="FR">Õ–Ö€Õ¡Õ¶Õ½Õ«Õ¡</territory>
-			<territory type="GA">Ô³Õ¡Õ¢Õ¸Õ¶</territory>
-			<territory type="GB">Õ„Õ¥Õ® Ô²Ö€Õ«Õ¿Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="GD">Ô³Ö€Õ¥Õ¶Õ¡Õ¤Õ¡</territory>
-			<territory type="GE">ÕŽÖ€Õ¡Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="GH">Ô³Õ¡Õ¶Õ¡</territory>
-			<territory type="GM">Ô³Õ¡Õ´Õ¢Õ«Õ¡</territory>
-			<territory type="GN">Ô³Õ¾Õ«Õ¶Õ¥Õ¡</territory>
-			<territory type="GQ">Õ€Õ¡Õ½Õ¡Ö€Õ¡Õ¯Õ¡Õ®Õ¡ÕµÕ«Õ¶ Ô³Õ¾Õ«Õ¶Õ¥Õ¡</territory>
-			<territory type="GR">Õ€Õ¸Ö‚Õ¶Õ¡Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="GT">Ô³Õ¾Õ¡Õ¿Õ¥Õ´Õ¡Õ¬Õ¡</territory>
-			<territory type="GW">Ô³Õ¾Õ«Õ¶Õ¥Õ¡-Ô²Õ«Õ½Õ¡Õ¸Ö‚</territory>
-			<territory type="GY">Ô³Õ¡ÕµÕ¡Õ¶Õ¡</territory>
-			<territory type="HN">Õ€Õ¸Õ¶Õ¤Õ¸Ö‚Ö€Õ¡Õ½</territory>
-			<territory type="HR">Õ€Õ¸Ö€Õ¾Õ¡Õ©Õ«Õ¡</territory>
-			<territory type="HT">Õ€Õ¡Õ«Õ©Õ«</territory>
-			<territory type="HU">Õ€Õ¸Ö‚Õ¶Õ£Õ¡Ö€Õ«Õ¡</territory>
-			<territory type="ID">Ô»Õ¶Õ¤Õ¸Õ¶Õ¥Õ¦Õ«Õ¡</territory>
-			<territory type="IE">Ô»Õ¼Õ¬Õ¡Õ¶Õ¤Õ«Õ¡</territory>
-			<territory type="IL">Ô»Õ½Ö€Õ¡ÕµÕ¥Õ¬</territory>
-			<territory type="IN">Õ€Õ¶Õ¤Õ¯Õ¡Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="IQ">Ô»Ö€Õ¡Ö„</territory>
-			<territory type="IR">Ô»Ö€Õ¡Õ¶</territory>
-			<territory type="IS">Ô»Õ½Õ¬Õ¡Õ¶Õ¤Õ«Õ¡</territory>
-			<territory type="IT">Ô»Õ¿Õ¡Õ¬Õ«Õ¡</territory>
-			<territory type="JM">Õ‹Õ¡Õ´Õ¡ÕµÕ¯Õ¡</territory>
-			<territory type="JO">Õ€Õ¸Ö€Õ¤Õ¡Õ¶Õ¡Õ¶</territory>
-			<territory type="JP">ÕƒÕ¡ÕºÕ¸Õ¶Õ«Õ¡</territory>
-			<territory type="KE">Õ”Õ¥Õ¶Õ«Õ¡</territory>
-			<territory type="KG">Ô¿Õ«Ö€Õ£Õ«Õ¦Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="KH">Ô¿Õ¡Õ´Õ¢Õ¸Õ»Õ¡</territory>
-			<territory type="KI">Ô¿Õ«Ö€Õ«Õ¢Õ¡Õ¿Õ«</territory>
-			<territory type="KM">Ô¿Õ¸Õ´Õ¸Ö€Õ¸Õ½</territory>
-			<territory type="KN">Õ�Õ¥Õ¶Õ¿ Ô¿Õ«Õ¿Õ½-Õ†Õ¥Õ¾Õ«Õ½</territory>
-			<territory type="KP">Õ€ÕµÕ¸Ö‚Õ½Õ«Õ½Õ¡ÕµÕ«Õ¶ Ô¿Õ¸Ö€Õ¥Õ¡</territory>
-			<territory type="KR">Õ€Õ¡Ö€Õ¡Õ¾Õ¡ÕµÕ«Õ¶ Ô¿Õ¸Ö€Õ¥Õ¡</territory>
-			<territory type="KW">Õ”Õ¸Ö‚Õ¾Õ¥ÕµÕ©</territory>
-			<territory type="KZ">Õ‚Õ¡Õ¦Õ¡Õ­Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="LA">Ô¼Õ¡Õ¸Õ½</territory>
-			<territory type="LB">Ô¼Õ«Õ¢Õ¡Õ¶Õ¡Õ¶</territory>
-			<territory type="LC">Õ�Õ¡Õ¶Õ¿Õ¡ Ô¼Õ¸Ö‚Õ¹Õ«Õ¡</territory>
-			<territory type="LI">Ô¼Õ«Õ­Õ¿Õ¥Õ¶Õ·Õ¿Õ¥ÕµÕ¶</territory>
-			<territory type="LK">Õ‡Ö€Õ« Ô¼Õ¡Õ¶Õ¯Õ¡</territory>
-			<territory type="LR">Ô¼Õ«Õ¢Õ¥Ö€Õ«Õ¡</territory>
-			<territory type="LS">Ô¼Õ¥Õ½Õ¸Õ¿Õ¸</territory>
-			<territory type="LT">Ô¼Õ«Õ¿Õ¾Õ¡</territory>
-			<territory type="LU">Ô¼ÕµÕ¸Ö‚Ö„Õ½Õ¥Õ´Õ¢Õ¸Ö‚Ö€Õ£</territory>
-			<territory type="LV">Ô¼Õ¡Õ¿Õ¾Õ«Õ¡</territory>
-			<territory type="LY">Ô¼Õ«Õ¢Õ«Õ¡</territory>
-			<territory type="MA">Õ„Õ¡Ö€Õ¸Õ¯Õ¸</territory>
-			<territory type="MC">Õ„Õ¸Õ¶Õ¡Õ¯Õ¸</territory>
-			<territory type="MD">Õ„Õ¸Õ¬Õ¤Õ¸Õ¾Õ¡</territory>
-			<territory type="MG">Õ„Õ¡Õ¤Õ¡Õ£Õ¡Õ½Õ¯Õ¡Ö€</territory>
-			<territory type="MH">Õ„Õ¡Ö€Õ·Õ¡Õ¬ÕµÕ¡Õ¶ Õ¯Õ²Õ¦Õ«Õ¶Õ¥Ö€</territory>
-			<territory type="MK">Õ„Õ¡Õ¯Õ¥Õ¤Õ¸Õ¶Õ«Õ¡</territory>
-			<territory type="ML">Õ„Õ¡Õ¬Õ«</territory>
-			<territory type="MM">Õ„ÕµÕ¡Õ¶Õ´Õ¡</territory>
-			<territory type="MN">Õ„Õ¸Õ¶Õ²Õ¸Õ¬Õ«Õ¡</territory>
-			<territory type="MR">Õ„Õ¡Õ¾Ö€Õ«Õ¿Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="MT">Õ„Õ¡Õ¬Õ©Õ¡</territory>
-			<territory type="MU">Õ„Õ¡Õ¾Ö€Õ«Õ¿Õ¸Õ½</territory>
-			<territory type="MV">Õ„Õ¡Õ¬Õ¤Õ«Õ¾Õ¶Õ¥Ö€</territory>
-			<territory type="MW">Õ„Õ¡Õ¬Õ¡Õ¾Õ«</territory>
-			<territory type="MX">Õ„Õ¥Ö„Õ½Õ«Õ¯Õ¡</territory>
-			<territory type="MY">Õ„Õ¡Õ¬Õ¡ÕµÕ¦Õ«Õ¡</territory>
-			<territory type="MZ">Õ„Õ¸Õ¦Õ¡Õ´Õ¢Õ«Õ¯</territory>
-			<territory type="NA">Õ†Õ¡Õ´Õ«Õ¢Õ«Õ¡</territory>
-			<territory type="NE">Õ†Õ«Õ£Õ¥Ö€</territory>
-			<territory type="NG">Õ†Õ«Õ£Õ¥Ö€Õ«Õ¡</territory>
-			<territory type="NI">Õ†Õ«Õ¯Õ¡Ö€Õ¡Õ£Õ¸Ö‚Õ¡</territory>
-			<territory type="NL">Õ†Õ«Õ¤Õ¥Ö€Õ¬Õ¡Õ¶Õ¤Õ¥Ö€</territory>
-			<territory type="NO">Õ†Õ¸Ö€Õ¾Õ¥Õ£Õ«Õ¡</territory>
-			<territory type="NP">Õ†Õ¥ÕºÕ¡Õ¬</territory>
-			<territory type="NR">Õ†Õ¡Õ¸Ö‚Ö€Õ¸Ö‚</territory>
-			<territory type="NZ">Õ†Õ¸Ö€ Ô¶Õ¥Õ¬Õ¡Õ¶Õ¤Õ«Õ¡</territory>
-			<territory type="OM">Õ•Õ´Õ¡Õ¶</territory>
-			<territory type="PA">ÕŠÕ¡Õ¶Õ¡Õ´Õ¡</territory>
-			<territory type="PE">ÕŠÕ¥Ö€Õ¸Ö‚</territory>
-			<territory type="PG">ÕŠÕ¡ÕºÕ¸Ö‚Õ¡ Õ†Õ¸Ö€ Ô³Õ¾Õ«Õ¶Õ¥Õ¡</territory>
-			<territory type="PH">Õ–Õ«Õ¬Õ«ÕºÕ«Õ¶Õ¶Õ¥Ö€</territory>
-			<territory type="PK">ÕŠÕ¡Õ¯Õ«Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="PL">Ô¼Õ¥Õ°Õ¡Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="PT">ÕŠÕ¸Ö€Õ¿Õ¸Ö‚Õ£Õ¡Õ¬Õ«Õ¡</territory>
-			<territory type="PW">ÕŠÕ¡Õ¬Õ¡Õ¸Ö‚</territory>
-			<territory type="PY">ÕŠÕ¡Ö€Õ¡Õ£Õ¾Õ¡Õµ</territory>
-			<territory type="QA">Ô¿Õ¡Õ¿Õ¡Ö€</territory>
-			<territory type="RO">Ռումինիա</territory>
-			<territory type="RU">Ռուսաստան</territory>
-			<territory type="RW">Ռուանդա</territory>
-			<territory type="SA">Õ�Õ¡Õ¸Ö‚Õ¤Õ«Õ¡Õ¶ Ô±Ö€Õ¡Õ¢Õ«Õ¡</territory>
-			<territory type="SB">Õ�Õ¸Õ¬Õ¸Õ´Õ¸Õ¶ÕµÕ¡Õ¶ Õ¯Õ²Õ¦Õ«Õ¶Õ¥Ö€</territory>
-			<territory type="SC">Õ�Õ¥ÕµÕ·Õ¥Õ¬Õ¶Õ¥Ö€</territory>
-			<territory type="SD">Õ�Õ¸Ö‚Õ¤Õ¡Õ¶</territory>
-			<territory type="SE">Õ‡Õ¾Õ¥Õ¤Õ«Õ¡</territory>
-			<territory type="SG">Õ�Õ«Õ¶Õ£Õ¡ÕºÕ¸Ö‚Ö€</territory>
-			<territory type="SI">Õ�Õ¬Õ¸Õ¾Õ¥Õ¶Õ«Õ¡</territory>
-			<territory type="SK">Õ�Õ¬Õ¸Õ¾Õ¡Õ¯Õ«Õ¡</territory>
-			<territory type="SL">Õ�ÕµÕ¥Ö€Õ¡-Ô¼Õ¥Õ¸Õ¶Õ¥</territory>
-			<territory type="SM">Õ�Õ¡Õ¶ Õ„Õ¡Ö€Õ«Õ¶Õ¸</territory>
-			<territory type="SN">Õ�Õ¥Õ¶Õ¥Õ£Õ¡Õ¬</territory>
-			<territory type="SO">Õ�Õ¸Õ´Õ¡Õ¬Õ«</territory>
-			<territory type="SR">Õ�Õ¸Ö‚Ö€Õ«Õ¶Õ¡Õ´</territory>
-			<territory type="ST">Õ�Õ¡Õ¶-Ô¹Õ¸Õ´Õ¥-Õ“Ö€Õ«Õ¶Õ½Õ«ÕºÕ«</territory>
-			<territory type="SV">Õ�Õ¡Õ¬Õ¾Õ¡Õ¤Õ¸Ö€</territory>
-			<territory type="SY">Õ�Õ«Ö€Õ«Õ¡</territory>
-			<territory type="SZ">Õ�Õ¾Õ¡Õ¦Õ«Õ¬Õ¥Õ¶Õ¤</territory>
-			<territory type="TD">Õ‰Õ¡Õ¤</territory>
-			<territory type="TG">Õ�Õ¸Õ£Õ¸</territory>
-			<territory type="TH">Ô¹Õ¡Õ«Õ¬Õ¡Õ¶Õ¤</territory>
-			<territory type="TJ">Õ�Õ¡Õ³Õ«Õ¯Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="TM">Ô¹Õ¸Ö‚Ö€Ö„Õ´Õ¥Õ¶Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="TN">Ô¹Õ¸Ö‚Õ¶Õ«Õ½</territory>
-			<territory type="TO">Õ�Õ¸Õ¶Õ£Õ¡</territory>
-			<territory type="TR">Ô¹Õ¸Ö‚Ö€Ö„Õ«Õ¡</territory>
-			<territory type="TT">Õ�Ö€Õ«Õ¶Õ«Õ¤Õ¡Õ¤-Õ�Õ¸Õ¢Õ¡Õ£Õ¸</territory>
-			<territory type="TV">Õ�Õ¸Ö‚Õ¾Õ¡Õ¬Õ¸Ö‚</territory>
-			<territory type="TW">Ô¹Õ¡ÕµÕ¾Õ¡Õ¶</territory>
-			<territory type="TZ">Õ�Õ¡Õ¶Õ¦Õ¡Õ¶Õ«Õ¡</territory>
-			<territory type="UA">ÕˆÖ‚Õ¯Ö€Õ¡Õ«Õ¶Õ¡</territory>
-			<territory type="UG">ÕˆÖ‚Õ£Õ¡Õ¶Õ¤Õ¡</territory>
-			<territory type="US">Ô±Õ´Õ§Ö€Õ«Õ¯Õ¡ÕµÕ« Õ„Õ«Õ¡Ö�ÕµÕ¡Õ¬ Õ†Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ§Ö€</territory>
-			<territory type="UY">ÕˆÖ‚Ö€Õ¸Ö‚Õ£Õ¾Õ¡Õµ</territory>
-			<territory type="UZ">ÕˆÖ‚Õ¦Õ¢Õ¥Õ¯Õ½Õ¿Õ¡Õ¶</territory>
-			<territory type="VA">ÕŽÕ¡Õ¿Õ«Õ¯Õ¡Õ¶</territory>
-			<territory type="VC">Õ�Õ¥Õ¶Õ¿ ÕŽÕ«Õ½Õ¥Õ¶Õ¿-Ô³Ö€Õ¥Õ¶Õ¡Õ¤Õ«Õ¶Õ¶Õ¥Ö€</territory>
-			<territory type="VE">ÕŽÕ¥Õ¶Õ¥Õ½Õ¸Ö‚Õ¥Õ¬Õ¡</territory>
-			<territory type="VN">ÕŽÕ«Õ¥Õ¿Õ¶Õ¡Õ´</territory>
-			<territory type="VU">ÕŽÕ¡Õ¶Õ¸Ö‚Õ¡Õ¿Õ¸Ö‚</territory>
-			<territory type="WS">Õ�Õ¡Õ´Õ¸Õ¡</territory>
-			<territory type="YE">ÔµÕ´Õ¥Õ¶</territory>
-			<territory type="ZA">Õ€Õ¡Ö€Õ¡Õ¾Õ¡ÕµÕ«Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡</territory>
-			<territory type="ZM">Ô¶Õ¡Õ´Õ¢Õ«Õ¡</territory>
-			<territory type="ZW">Ô¶Õ«Õ´Õ¢Õ¡Õ¢Õ¾Õ¥</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[֊ � ՜ ՞ ՚ ՛ ՟ ա-ե և զ-ֆ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Õ…Õ¶Ö€</month>
-							<month type="2">Õ“Õ¿Ö€</month>
-							<month type="3">Õ„Ö€Õ¿</month>
-							<month type="4">Ô±ÕºÖ€</month>
-							<month type="5">Õ„ÕµÕ½</month>
-							<month type="6">Õ…Õ¶Õ½</month>
-							<month type="7">Õ…Õ¬Õ½</month>
-							<month type="8">Õ•Õ£Õ½</month>
-							<month type="9">Õ�Õ¥Õº</month>
-							<month type="10">Õ€Õ¸Õ¯</month>
-							<month type="11">Õ†Õ¸Õµ</month>
-							<month type="12">Ô´Õ¥Õ¯</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Õ…Õ¸Ö‚Õ¶Õ¸Ö‚Õ¡Ö€</month>
-							<month type="2">Õ“Õ¥Õ¿Ö€Õ¸Ö‚Õ¡Ö€</month>
-							<month type="3">Õ„Õ¡Ö€Õ¿</month>
-							<month type="4">Ô±ÕºÖ€Õ«Õ¬</month>
-							<month type="5">Õ„Õ¡ÕµÕ«Õ½</month>
-							<month type="6">Õ…Õ¸Ö‚Õ¶Õ«Õ½</month>
-							<month type="7">Õ…Õ¸Ö‚Õ¬Õ«Õ½</month>
-							<month type="8">Õ•Õ£Õ¸Õ½Õ¿Õ¸Õ½</month>
-							<month type="9">Õ�Õ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€</month>
-							<month type="10">Õ€Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€</month>
-							<month type="11">Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€</month>
-							<month type="12">Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ô¿Õ«Ö€</day>
-							<day type="mon">ÔµÖ€Õ¯</day>
-							<day type="tue">ÔµÖ€Ö„</day>
-							<day type="wed">Õ‰Õ¸Ö€</day>
-							<day type="thu">Õ€Õ¶Õ£</day>
-							<day type="fri">ÕˆÖ‚Ö€</day>
-							<day type="sat">Õ‡Õ¡Õ¢</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ô¿Õ«Ö€Õ¡Õ¯Õ«</day>
-							<day type="mon">ÔµÖ€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«</day>
-							<day type="tue">ÔµÖ€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«</day>
-							<day type="wed">Õ‰Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«</day>
-							<day type="thu">Õ€Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«</day>
-							<day type="fri">ÕˆÖ‚Ö€Õ¢Õ¡Õ©</day>
-							<day type="sat">Õ‡Õ¡Õ¢Õ¡Õ©</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>Առ․</am>
-				<pm>Եր․</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Ք․Ա․</era>
-						<era type="1">Ք․Ե․</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>MM/dd/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="MMMMdd">MMMM dd</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM/dd - MM/dd</greatestDifference>
-							<greatestDifference id="M">MM/dd - MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM/dd - E, MM/dd</greatestDifference>
-							<greatestDifference id="M">E, MM/dd - E, MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM dd-dd</greatestDifference>
-							<greatestDifference id="M">MMM dd - MMM dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM dd - E, MMM dd</greatestDifference>
-							<greatestDifference id="M">E, MMM dd - E, MMM dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">MM/dd/yy - MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">MM/dd/yy - MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, MM/dd/yy - E, MM/dd/yy</greatestDifference>
-							<greatestDifference id="M">E, MM/dd/yy - E, MM/dd/yy</greatestDifference>
-							<greatestDifference id="y">E, MM/dd/yy - E, MM/dd/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM dd-dd, y</greatestDifference>
-							<greatestDifference id="M">MMM dd - MMM dd, y</greatestDifference>
-							<greatestDifference id="y">MMM dd, y - MMM dd, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y - E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AMD">
-				<symbol>Õ¤Ö€.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/hy_AM.xml b/airtime_mvc/library/Zend/Locale/Data/hy_AM.xml
deleted file mode 100644
index 38cf3c93e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hy_AM.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="hy"/>
-		<territory type="AM"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/hy_AM_REVISED.xml b/airtime_mvc/library/Zend/Locale/Data/hy_AM_REVISED.xml
deleted file mode 100644
index 838590363..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/hy_AM_REVISED.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="hy"/>
-		<territory type="AM"/>
-		<variant type="REVISED"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Õ€Õ¶Õ¾</month>
-							<month type="2">Õ“Õ¿Õ¾</month>
-							<month type="6">Õ€Õ¶Õ½</month>
-							<month type="7">Õ€Õ¬Õ½</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Õ€Õ¸Ö‚Õ¶Õ¾Õ¡Ö€</month>
-							<month type="2">Õ“Õ¥Õ¿Ö€Õ¾Õ¡Ö€</month>
-							<month type="6">Õ€Õ¸Ö‚Õ¶Õ«Õ½</month>
-							<month type="7">Õ€Õ¸Ö‚Õ¬Õ«Õ½</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<pm>Կե․</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Մ․Թ․Ա․</era>
-						<era type="1">Մ․Թ․</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ia.xml b/airtime_mvc/library/Zend/Locale/Data/ia.xml
deleted file mode 100644
index b7bd7ff2b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ia.xml
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.28 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="ia"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">afrikaans</language>
-			<language type="am">amharico</language>
-			<language type="ar">arabe</language>
-			<language type="as">Assamese</language>
-			<language type="az">azerbaidzhani</language>
-			<language type="be">bielorusso</language>
-			<language type="bg">bulgaro</language>
-			<language type="bh">bihari</language>
-			<language type="bn">bengali</language>
-			<language type="br">breton</language>
-			<language type="bs">bosniaco</language>
-			<language type="ca">catalano</language>
-			<language type="cs">checo</language>
-			<language type="cy">gallese</language>
-			<language type="da">danese</language>
-			<language type="de">germano</language>
-			<language type="el">greco</language>
-			<language type="en">anglese</language>
-			<language type="en_GB">anglese (RU)</language>
-			<language type="en_US">anglese (SUA)</language>
-			<language type="eo">esperanto</language>
-			<language type="es">espaniol</language>
-			<language type="et">estoniano</language>
-			<language type="eu">basco</language>
-			<language type="fa">persiano</language>
-			<language type="fi">finnese</language>
-			<language type="fil">tagalog</language>
-			<language type="fo">faroese</language>
-			<language type="fr">francese</language>
-			<language type="fy">frisiano</language>
-			<language type="ga">irlandese</language>
-			<language type="gd">scoto gaelic</language>
-			<language type="gl">gallego</language>
-			<language type="gn">guarani</language>
-			<language type="gu">gujarati</language>
-			<language type="he">hebreo</language>
-			<language type="hi">hindi</language>
-			<language type="hr">croato</language>
-			<language type="hu">hungaro</language>
-			<language type="hy">armeniano</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indonesiano</language>
-			<language type="ie">Interlingue</language>
-			<language type="is">islandese</language>
-			<language type="it">italiano</language>
-			<language type="ja">japonese</language>
-			<language type="jv">javanese</language>
-			<language type="ka">georgiano</language>
-			<language type="km">Cambodiano</language>
-			<language type="kn">kannada</language>
-			<language type="ko">coreano</language>
-			<language type="ku">kurdo</language>
-			<language type="ky">kirghizo</language>
-			<language type="la">latino</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotiano</language>
-			<language type="lt">lithuano</language>
-			<language type="lv">letton</language>
-			<language type="mk">macedone</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolico</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malay</language>
-			<language type="mt">maltese</language>
-			<language type="ne">nepalese</language>
-			<language type="nl">nederlandese</language>
-			<language type="nn">norvegiano (nynorsk)</language>
-			<language type="no">norvegiano</language>
-			<language type="oc">occitano</language>
-			<language type="or">oriya</language>
-			<language type="pa">punjabi</language>
-			<language type="pl">polonese</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugese</language>
-			<language type="ro">romaniano</language>
-			<language type="ru">russo</language>
-			<language type="sa">sanscrito</language>
-			<language type="sd">sindhi</language>
-			<language type="sh">serbocroate</language>
-			<language type="si">sinhalese</language>
-			<language type="sk">slovaco</language>
-			<language type="sl">sloveno</language>
-			<language type="so">somali</language>
-			<language type="sq">albanese</language>
-			<language type="sr">serbo</language>
-			<language type="st">sesotho</language>
-			<language type="su">sundanese</language>
-			<language type="sv">svedese</language>
-			<language type="sw">swahili</language>
-			<language type="ta">tamil</language>
-			<language type="te">telugu</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinya</language>
-			<language type="tk">turkmeno</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">turco</language>
-			<language type="tw">twi</language>
-			<language type="ug">Uyghur</language>
-			<language type="uk">ukrainiano</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbeco</language>
-			<language type="vi">vietnamese</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">yiddish</language>
-			<language type="zu">zulu</language>
-		</languages>
-		<territories>
-			<territory type="AE">Emiratos Arabe Unite</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua e Barbuda</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antillas nederlandese</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa american</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AZ">Azerbaidzhan</territory>
-			<territory type="BA">Bosnia e Herzegovina</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgica</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Insula de Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorussia</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CF">Republica African Central</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suissa</territory>
-			<territory type="CK">Insulas Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerun</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CX">Insula de Natal</territory>
-			<territory type="CY">Cypro</territory>
-			<territory type="CZ">Republica Tchec</territory>
-			<territory type="DE">Germania</territory>
-			<territory type="DK">Danmark</territory>
-			<territory type="DO">Republica Dominican</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egypto</territory>
-			<territory type="EH">Sahara occidental</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Espania</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Insulas Feroe</territory>
-			<territory type="FR">Francia</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Regno Unite</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guyana francese</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GL">Groenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GQ">Guinea equatorial</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungaria</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Territorio oceanic britanno-indian</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islanda</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JO">Jordania</territory>
-			<territory type="JP">Japon</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirghizistan</territory>
-			<territory type="KH">Cambodgia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Sancte Christophoro e Nevis</territory>
-			<territory type="KP">Corea del Nord</territory>
-			<territory type="KR">Corea del Sud</territory>
-			<territory type="KY">Insulas de Caiman</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LB">Libano</territory>
-			<territory type="LC">Sancte Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LV">Lettonia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marocco</territory>
-			<territory type="MD">Moldavia</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Insulas Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Birmania/Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MP">Insulas Marianna del Nord</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nove Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Insula Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederlandia</territory>
-			<territory type="NO">Norvegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NZ">Nove Zelanda</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polynesia francese</territory>
-			<territory type="PG">Papua Nove Guinea</territory>
-			<territory type="PH">Philippinas</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SB">Insulas Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Svedia</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SK">Slovachia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swazilandia</territory>
-			<territory type="TC">Insulas Turcos e Caicos</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Territorios meridional francese</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailandia</territory>
-			<territory type="TJ">Tadzhikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor del Est</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">tonga</territory>
-			<territory type="TR">Turchia</territory>
-			<territory type="TT">Trinidad e Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="US">Statos Unite</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VC">Sancte Vincente e le Grenadinas</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="ZA">Africa del Sud</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c {ch} d-p {ph} q-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">mai</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">oct</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januario</month>
-							<month type="2">februario</month>
-							<month type="3">martio</month>
-							<month type="4">april</month>
-							<month type="5">maio</month>
-							<month type="6">junio</month>
-							<month type="7">julio</month>
-							<month type="8">augusto</month>
-							<month type="9">septembre</month>
-							<month type="10">octobre</month>
-							<month type="11">novembre</month>
-							<month type="12">decembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">lun</day>
-							<day type="tue">mar</day>
-							<day type="wed">mer</day>
-							<day type="thu">jov</day>
-							<day type="fri">ven</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">dominica</day>
-							<day type="mon">lunedi</day>
-							<day type="tue">martedi</day>
-							<day type="wed">mercuridi</day>
-							<day type="thu">jovedi</day>
-							<day type="fri">venerdi</day>
-							<day type="sat">sabbato</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-me trimestre</quarter>
-							<quarter type="2">2-nde trimestre</quarter>
-							<quarter type="3">3-tie trimestre</quarter>
-							<quarter type="4">4-te trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ante Christo</era>
-						<era type="1">post Christo</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.Chr.</era>
-						<era type="1">p.Chr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Capo Verde</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibuti</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauritio</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Insula Pitcairn</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Rico</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Mayotta</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="AUD">
-				<displayName>Dollares australian</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dollares canadian</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Francos suisse</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marcos german</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Coronas danese</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euros</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>francos francese</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Libras sterling britannic</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen japonese</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Coronas norvegian</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Coronas svedese</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dollares statounitese</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/id.xml b/airtime_mvc/library/Zend/Locale/Data/id.xml
deleted file mode 100644
index 97f49bd91..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/id.xml
+++ /dev/null
@@ -1,1334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.77 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="id"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abkhaz</language>
-			<language type="ace">Aceh</language>
-			<language type="ach">Acoli</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adyghe</language>
-			<language type="ae">Avestan</language>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Afro-Asiatik (Lainnya)</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadien</language>
-			<language type="ale">Aleut</language>
-			<language type="alg">Bahasa Algonquia</language>
-			<language type="alt">Altai Selatan</language>
-			<language type="am">Amharik</language>
-			<language type="an">Aragon</language>
-			<language type="ang">Inggris Kuno (kl.450-1100)</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Bahasa-bahasa Apache</language>
-			<language type="ar">Arab</language>
-			<language type="arc">Aram</language>
-			<language type="arn">Araucan</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Buatan (Lainnya)</language>
-			<language type="arw">Arawak</language>
-			<language type="as">Assam</language>
-			<language type="ast">Astur</language>
-			<language type="ath">Bahasa-bahasa Athapaska</language>
-			<language type="aus">Bahasa-bahasa Australia</language>
-			<language type="av">Avarik</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Azerbaijan</language>
-			<language type="ba">Bashkir</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bahasa-bahasa Bamileke</language>
-			<language type="bal">Baluchi</language>
-			<language type="ban">Balin</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Baltik (Lainnya)</language>
-			<language type="be">Belarusia</language>
-			<language type="bej">Beja</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berber</language>
-			<language type="bg">Bulgaria</language>
-			<language type="bh">Bihari</language>
-			<language type="bho">Bhojpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengal</language>
-			<language type="bnt">Bantu</language>
-			<language type="bo">Tibet</language>
-			<language type="br">Breton</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Bosnia</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Buriat</language>
-			<language type="bug">Bugis</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Catalan</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">India Amerika Tengah (Lainnnya)</language>
-			<language type="car">Karib</language>
-			<language type="cau">Kaukasia (Lainnya)</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Chechen</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Celtic (Lainnya)</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Chibcha</language>
-			<language type="chg">Chagatai</language>
-			<language type="chk">Chuuke</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Jargon Chinook</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Bahasa Chamic</language>
-			<language type="co">Korsika</language>
-			<language type="cop">Koptik</language>
-			<language type="cpe">Kreol dan Pidgins Lain Berbasis Inggris</language>
-			<language type="cpf">Kreol dan Pidgins Lain berbasis Prancis</language>
-			<language type="cpp">Kreol dan Pidgins Lain berbasis Portugis</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Turki Krimea</language>
-			<language type="crp">Kreol dan Pidgins Lain</language>
-			<language type="cs">Ceko</language>
-			<language type="csb">Kashubian</language>
-			<language type="cu">Church Slavic</language>
-			<language type="cus">Cushitic Lain</language>
-			<language type="cv">Chuvash</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Denmark</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargwa</language>
-			<language type="day">Dayak</language>
-			<language type="de">Jerman</language>
-			<language type="de_AT">Jerman Austria</language>
-			<language type="de_CH">Jerman Tinggi Swiss</language>
-			<language type="del">Delaware</language>
-			<language type="den">Slave</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravidia Lain</language>
-			<language type="dsb">Sorbia Rendahan</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Belanda Menengah</language>
-			<language type="dv">Divehi</language>
-			<language type="dyu">Dyula</language>
-			<language type="dz">Dzongkha</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Mesir Kuno</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Yunani</language>
-			<language type="elx">Elamite</language>
-			<language type="en">Inggris</language>
-			<language type="en_AU">Inggris Australia</language>
-			<language type="en_CA">Inggris Kanada</language>
-			<language type="en_GB">Inggris (British)</language>
-			<language type="en_US">Inggris A.S.</language>
-			<language type="enm">Inggris, Abad Pertengahan (1100-1500)</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanyol</language>
-			<language type="es_419">Spanyol Amerika Latin</language>
-			<language type="es_ES">Spanyol (Iberia)</language>
-			<language type="et">Estonian</language>
-			<language type="eu">Basque</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Persia</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulah</language>
-			<language type="fi">Finlandia</language>
-			<language type="fil">Filipina</language>
-			<language type="fiu">Finno - Ugria Lain</language>
-			<language type="fj">Fiji</language>
-			<language type="fo">Faro</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Perancis</language>
-			<language type="fr_CA">Prancis Kanada</language>
-			<language type="fr_CH">Prancis Swiss</language>
-			<language type="frm">Perancis, Abad Pertengahan (kl.1400-1600)</language>
-			<language type="fro">Perancis Kuno (842-kl.1400)</language>
-			<language type="frr">Frisia Utara</language>
-			<language type="frs">Frisia Timur</language>
-			<language type="fur">Friuli</language>
-			<language type="fy">Frisi</language>
-			<language type="ga">Irlandia</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">Gaelik Skotlandia</language>
-			<language type="gem">Jermanik (Lainnya)</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbert</language>
-			<language type="gl">Gallegan</language>
-			<language type="gmh">Jerman, Abad Pertengahan (kl.1050-1500)</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Jerman Kuno (kl.750-1050)</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gothik</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Yunani Kuno (sd 1453)</language>
-			<language type="gsw">Jerman Swiss</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="gwi">Gwich'in</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaii</language>
-			<language type="he">Ibrani</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hittite</language>
-			<language type="hmn">Hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">Kroasia</language>
-			<language type="hsb">Sorbia Atas</language>
-			<language type="ht">Haiti</language>
-			<language type="hu">Hungaria</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armenia</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Bahasa Indonesia</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiaq</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Indic Lain</language>
-			<language type="ine">Indo-Eropa Lain</language>
-			<language type="inh">Ingush</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iran Lain</language>
-			<language type="iro">Bahasa Iroquoia</language>
-			<language type="is">Icelandic</language>
-			<language type="it">Italian</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japanese</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Judeo-Persia</language>
-			<language type="jrb">Judeo-Arab</language>
-			<language type="jv">Jawa</language>
-			<language type="ka">Georgian</language>
-			<language type="kaa">Kara-Kalpak</language>
-			<language type="kab">Kabyle</language>
-			<language type="kac">Kachin</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardian</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi</language>
-			<language type="khi">Khoisa Lain</language>
-			<language type="kho">Khotan</language>
-			<language type="ki">Kikuyu</language>
-			<language type="kj">Kuanyama</language>
-			<language type="kk">Kazakh</language>
-			<language type="kl">Kalaallisut</language>
-			<language type="km">Khmer</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korea</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosrae</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Karachay-Balkar</language>
-			<language type="krl">Karelian</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurukh</language>
-			<language type="ks">Kashmir</language>
-			<language type="ku">Kurdi</language>
-			<language type="kum">Kumyk</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Cornish</language>
-			<language type="ky">Kirghiz</language>
-			<language type="la">Latin</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Luxembourg</language>
-			<language type="lez">Lezghia</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburg</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Lao</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Lithuania</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
-			<language type="lv">Latvian</language>
-			<language type="mad">Madura</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makassar</language>
-			<language type="man">Mandingo</language>
-			<language type="map">Austronesia</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">Moksha</language>
-			<language type="mdr">Mandar</language>
-			<language type="men">Mende</language>
-			<language type="mg">Malagasi</language>
-			<language type="mga">Irlandia Abad Pertengahan (900-1200)</language>
-			<language type="mh">Marshall</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Bahasa Lain-lain</language>
-			<language type="mk">Macedonian</language>
-			<language type="mkh">Mon-Khmer (Lainnya)</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolian</language>
-			<language type="mnc">Manchu</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Bahasa Manobo</language>
-			<language type="mo">Moldavian</language>
-			<language type="moh">Mohawk</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malay</language>
-			<language type="mt">Maltese</language>
-			<language type="mul">Beberapa Bahasa</language>
-			<language type="mun">Bahasa Munda</language>
-			<language type="mus">Creek</language>
-			<language type="mwl">Mirand</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Burma</language>
-			<language type="myn">Bahasa Mayan</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauru</language>
-			<language type="nah">Nahuati</language>
-			<language type="nai">Indian Amerika Utara Lain</language>
-			<language type="nap">Neapolitan</language>
-			<language type="nb">Norwegian Bokmål</language>
-			<language type="nd">Ndebele Utara</language>
-			<language type="nds">Jerman Rendah</language>
-			<language type="ne">Nepal</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Niger - Kordofania Lain</language>
-			<language type="niu">Niuea</language>
-			<language type="nl">Belanda</language>
-			<language type="nl_BE">Flemish</language>
-			<language type="nn">Norwegian Nynorsk</language>
-			<language type="no">Norwegian</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Norse Lama</language>
-			<language type="nqo">N'Ko</language>
-			<language type="nr">Ndebele Selatan</language>
-			<language type="nso">Sotho Utara</language>
-			<language type="nub">Bahasa Nubia</language>
-			<language type="nv">Navajo</language>
-			<language type="nwc">Newari Klasik</language>
-			<language type="ny">Nyanja; Chichewa; Chewa</language>
-			<language type="nym">Nyamwezi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Bahasa Occit</language>
-			<language type="oj">Ojibwa</language>
-			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
-			<language type="os">Ossetic</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Turki Ottoman</language>
-			<language type="oto">Bahasa Otomia</language>
-			<language type="pa">Punjabi</language>
-			<language type="paa">Papuan (Lainnya)</language>
-			<language type="pag">Pangasina</language>
-			<language type="pal">Pahlavi</language>
-			<language type="pam">Pampanga</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palaua</language>
-			<language type="peo">Persia Kuno (kl.600-400 SM.)</language>
-			<language type="phi">Filipina (Lainnya)</language>
-			<language type="phn">Phoenicia</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Polish</language>
-			<language type="pon">Pohnpeia</language>
-			<language type="pra">Bahasa Prakrit</language>
-			<language type="pro">Provençal Lama</language>
-			<language type="ps">Pashto (Pushto)</language>
-			<language type="pt">Portugis</language>
-			<language type="pt_BR">Portugis Brasil</language>
-			<language type="pt_PT">Portugis (Iberia)</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Rapanui</language>
-			<language type="rar">Rarotongan</language>
-			<language type="rm">Rhaeto-Romance</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Romanian</language>
-			<language type="roa">Romance Lain</language>
-			<language type="rom">Romany</language>
-			<language type="root">Root</language>
-			<language type="ru">Russian</language>
-			<language type="rup">Aromanian</language>
-			<language type="rw">Kinyarwanda</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Yakut</language>
-			<language type="sai">Indian Amerika Selatan Lain</language>
-			<language type="sal">Bahasa Salisha</language>
-			<language type="sam">Aramaic Samaritan</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardinian</language>
-			<language type="scn">Sisilia</language>
-			<language type="sco">Skotlandia</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Northern Sami</language>
-			<language type="sel">Selkup</language>
-			<language type="sem">Semitic Lain</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Irlandia Lama</language>
-			<language type="sgn">Bahasa Isyarat</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="shn">Shan</language>
-			<language type="si">Sinhalese</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Bahasa Siouan</language>
-			<language type="sit">Sino-Tibet Lain</language>
-			<language type="sk">Slovak</language>
-			<language type="sl">Slovenian</language>
-			<language type="sla">Slavic Lain</language>
-			<language type="sm">Samoan</language>
-			<language type="sma">Sami Selatan</language>
-			<language type="smi">Bahasa Sami Lain</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Shona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somali</language>
-			<language type="sog">Sogdien</language>
-			<language type="son">Songhai</language>
-			<language type="sq">Albanian</language>
-			<language type="sr">Serbian</language>
-			<language type="srn">Sranan Tongo</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Swati</language>
-			<language type="ssa">Nilo-Sahara Lain</language>
-			<language type="st">Sotho Selatan</language>
-			<language type="su">Sundan</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumeria</language>
-			<language type="sv">Swedia</language>
-			<language type="sw">Swahili</language>
-			<language type="syr">Syria</language>
-			<language type="ta">Tamil</language>
-			<language type="tai">Tai Lain</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tajik</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmen</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tli">Tingit</language>
-			<language type="tmh">Tamashek</language>
-			<language type="tn">Tswana</language>
-			<language type="to">Tonga</language>
-			<language type="tog">Nyasa Tonga</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Turkish</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian</language>
-			<language type="tt">Tatar</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Bahasa Tupi</language>
-			<language type="tut">Altaic Lain</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitian</language>
-			<language type="tyv">Tuvinia</language>
-			<language type="udm">Udmurt</language>
-			<language type="ug">Uighur</language>
-			<language type="uga">Ugaritik</language>
-			<language type="uk">Ukrainian</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Bahasa Tidak Dikenal atau Tidak Valid</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbek</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vietnamese</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Votik</language>
-			<language type="wa">Walloon</language>
-			<language type="wak">Bahasa Wakasha</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo</language>
-			<language type="wen">Bahasa Serbia</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmyk</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao</language>
-			<language type="yap">Yap</language>
-			<language type="yi">Yiddish</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Bahasa Yupik</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotek</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Cina</language>
-			<language type="zh_Hans">Cina Sederhana</language>
-			<language type="zh_Hant">Cina Tradisional</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Tidak ada konten linguistik</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Armn">Armenia</script>
-			<script type="Batk">Batak</script>
-			<script type="Beng">Bengali</script>
-			<script type="Blis">Blissymbols</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Braile</script>
-			<script type="Bugi">Bugis</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cans">Simbol Aborigin Kanada Kesatuan</script>
-			<script type="Cari">Carian</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Coptic</script>
-			<script type="Cprt">Cypriot</script>
-			<script type="Cyrl">Cyrillic</script>
-			<script type="Cyrs">Church Slavonic Cyrillic Lama</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Demotik Mesir</script>
-			<script type="Egyh">Hieratik Mesir</script>
-			<script type="Egyp">Hieroglip Mesir</script>
-			<script type="Ethi">Ethiopic</script>
-			<script type="Geok">Georgian Khutsuri</script>
-			<script type="Geor">Georgian</script>
-			<script type="Glag">Glagolitic</script>
-			<script type="Goth">Gothic</script>
-			<script type="Grek">Yunani</script>
-			<script type="Gujr">Gujarat</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Han Sederhana</script>
-			<script type="Hant">Han Tradisional</script>
-			<script type="Hebr">Ibrani</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana atau Hiragana</script>
-			<script type="Hung">Hongaria Lama</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Italia Lama</script>
-			<script type="Java">Jawa</script>
-			<script type="Jpan">Jepang</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Lao</script>
-			<script type="Latf">Latin Fraktur</script>
-			<script type="Latg">Latin Gaelic</script>
-			<script type="Latn">Latin</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Linear A</script>
-			<script type="Linb">Linear B</script>
-			<script type="Lyci">Lycian</script>
-			<script type="Lydi">Lydian</script>
-			<script type="Mand">Mandaean</script>
-			<script type="Maya">Hieroglip Maya</script>
-			<script type="Mero">Meroitic</script>
-			<script type="Mlym">Malayalam</script>
-			<script type="Mong">Mongol</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Myanmar</script>
-			<script type="Nkoo">N'Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Chiki Lama</script>
-			<script type="Orkh">Orkhon</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanya</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phnx">Phoenix</script>
-			<script type="Plrd">Fonetik Pollard</script>
-			<script type="Qaai">Warisan</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runic</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">Tulisan Isyarat</script>
-			<script type="Shaw">Shavian</script>
-			<script type="Sinh">Sinhala</script>
-			<script type="Sund">Sunda</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syriac</script>
-			<script type="Syre">Siria Estrangelo</script>
-			<script type="Syrj">Syriac Barat</script>
-			<script type="Syrn">Siria Timur</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Tai Lue Baru</script>
-			<script type="Taml">Tamil</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tenghwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibet</script>
-			<script type="Ugar">Ugaritic</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Ucapan Terlihat</script>
-			<script type="Xsux">Sumero-Akkadian Cuneiform</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zxxx">Tidak tertulis</script>
-			<script type="Zyyy">Common</script>
-			<script type="Zzzz">Skrip tidak diketahui atau tidak valid</script>
-		</scripts>
-		<territories>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Uni Emirat Arab</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua dan Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilles Belanda</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Amerika</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">�Land Islands</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia dan Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Kepulauan Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarusia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kepulauan Cocos</territory>
-			<territory type="CD">Republik Demokratik Kongo</territory>
-			<territory type="CF">Republik Afrika Tengah</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Swiss</territory>
-			<territory type="CI">Pantai Gading</territory>
-			<territory type="CK">Kepulauan Cook</territory>
-			<territory type="CL">Chili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Cina</territory>
-			<territory type="CO">Kolombia</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Serbia dan Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Tanjung Verde</territory>
-			<territory type="CX">Pulau Christmas</territory>
-			<territory type="CY">Siprus</territory>
-			<territory type="CZ">Republik Ceko</territory>
-			<territory type="DE">Jerman</territory>
-			<territory type="DJ">Jibouti</territory>
-			<territory type="DK">Denmark</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Republik Dominika</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ekuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Mesir</territory>
-			<territory type="EH">Sahara Barat</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanyol</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Kepulauan Falkland</territory>
-			<territory type="FM">Mikronesia</territory>
-			<territory type="FO">Kepulauan Faroe</territory>
-			<territory type="FR">Perancis</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Inggris Raya</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guyana Perancis</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Greenland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Guinea Khatulistiwa</territory>
-			<territory type="GR">Yunani</territory>
-			<territory type="GS">Georgia Selatan dan Kepulauan Sandwich Selatan</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong S.A.R., Cina</territory>
-			<territory type="HM">Pulau Heard dan Kepulauan McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroasia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungaria</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlandia</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">British Indian Ocean Territory</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">Itali</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Yordania</territory>
-			<territory type="JP">Jepang</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kyrgyzstan</territory>
-			<territory type="KH">Kamboja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoros</territory>
-			<territory type="KN">Saint Kitts dan Nevis</territory>
-			<territory type="KP">Korea Utara</territory>
-			<territory type="KR">Korea Selatan</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Kepulauan Kayman</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lebanon</territory>
-			<territory type="LC">Santa Lusia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithuania</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Kepulauan Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makao S.A.R. Cina</territory>
-			<territory type="MP">Kepualuan Mariana Utara</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Kaledonia Baru</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Kepulauan Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Netherlands</territory>
-			<territory type="NO">Norwegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Selandia Baru</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polynesia Perancis</territory>
-			<territory type="PG">Papua Nugini</territory>
-			<territory type="PH">Filipina</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polandia</territory>
-			<territory type="PM">Saint Pierre dan Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Riko</territory>
-			<territory type="PS">Otoritas Palestina</territory>
-			<territory type="PT">Portugis</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rusia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Arab Saudi</territory>
-			<territory type="SB">Kepulauan Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapura</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard dan Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tome dan Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Kepulauan Turks dan Caicos</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TF">Wilayah Prancis Selatan</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tajikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Timur</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkey</territory>
-			<territory type="TT">Trinidad dan Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Kepulauan minor sekitar Amerika Serikat</territory>
-			<territory type="US">Amerika Serikat</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent dan Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Kepulauan British Virgin</territory>
-			<territory type="VI">Kepulauan U.S. Virgin</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis dan Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yaman</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Afrika Selatan</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-n {ng} {ny} o p r-w y]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Agu</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januari</month>
-							<month type="2">Februari</month>
-							<month type="3">Maret</month>
-							<month type="4">April</month>
-							<month type="5">Mei</month>
-							<month type="6">Juni</month>
-							<month type="7">Juli</month>
-							<month type="8">Agustus</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">Desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Min</day>
-							<day type="mon">Sen</day>
-							<day type="tue">Sel</day>
-							<day type="wed">Rab</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Minggu</day>
-							<day type="mon">Senin</day>
-							<day type="tue">Selasa</day>
-							<day type="wed">Rabu</day>
-							<day type="thu">Kamis</day>
-							<day type="fri">Jumat</day>
-							<day type="sat">Sabtu</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">kuartal pertama</quarter>
-							<quarter type="2">kuartal kedua</quarter>
-							<quarter type="3">kuartal ketiga</quarter>
-							<quarter type="4">kuartal keempat</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Anguila</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Kutub Selatan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Easter Island</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kosta Rika</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canary Islands</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makau</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapura</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska Time</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>Dirham Uni Emirat Arab</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso Argentina</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dolar Australia</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lev Bulgaria</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dollar Brunei</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano Bolivia</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real Brazil</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dolar Kanada</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franc Swiss</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso Chili</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso Kolombia</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Koruna Czech</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Mark Jerman</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Kroner Denmark</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Kroon Estonia</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Pound Mesir</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dollar Fiji</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Frank Prancis</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Pondsterling Inggris</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Dolar Hong Kong</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna Kroasia</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forint Hungaria</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupiah Indonesia</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Shekel Israel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupee India</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen Jepang</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Shilling Kenya</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won Korea Selatan</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litas Lithuania</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham Maroko</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira Malta</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso Meksiko</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit Malaysia</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Kroner Norwegia</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dolar New Zealand</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Nuevo Sol Peruvian</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso Filipina</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupee Pakistan</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>NewZloty Polandia</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Leu Rumania Baru</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinar Serbia</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rubel Rusia</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Real Saudi</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Kronor Swedia</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dolar Singapura</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar Slovenia</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Koruna Slovakia</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht Thailand</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lira Turki</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lira Turki Baru</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Dolar Taiwan Baru</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia Ukrania</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dolar Amerika</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar Venezuela</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong Vietnam</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand Afrika Selatan</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} hari</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} jam</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} menit</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} bulan</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} detik</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} minggu</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} tahun</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ya:y</yesstr>
-			<nostr>tidak:t</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/id_ID.xml b/airtime_mvc/library/Zend/Locale/Data/id_ID.xml
deleted file mode 100644
index 423b45d7a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/id_ID.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="id"/>
-		<territory type="ID"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ig.xml b/airtime_mvc/library/Zend/Locale/Data/ig.xml
deleted file mode 100644
index f1f699e1c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ig.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ig"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a b {ch} d-g {gb} {gh} {gw} h i ị j k {kp} {kw} l-n ṅ {nw} {ny} o � p r s {sh} t u ụ v w y z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jen</month>
-							<month type="2">Feb</month>
-							<month type="3">Maa</month>
-							<month type="4">Epr</month>
-							<month type="5">Mee</month>
-							<month type="6">Juu</month>
-							<month type="7">Jul</month>
-							<month type="8">Ọg�</month>
-							<month type="9">Sep</month>
-							<month type="10">Ọkt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Jenụwarị</month>
-							<month type="2">Febrụwarị</month>
-							<month type="3">Maachị</month>
-							<month type="4">Eprel</month>
-							<month type="5">Mee</month>
-							<month type="6">Juun</month>
-							<month type="7">Julaị</month>
-							<month type="8">Ọg��st</month>
-							<month type="9">Septemba</month>
-							<month type="10">Ọktoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ụka</day>
-							<day type="mon">M�n</day>
-							<day type="tue">Tiu</day>
-							<day type="wed">Wen</day>
-							<day type="thu">T��</day>
-							<day type="fri">Fraị</day>
-							<day type="sat">Sat</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Mb�sị Ụka</day>
-							<day type="mon">M�nde</day>
-							<day type="tue">Tiuzdee</day>
-							<day type="wed">Wenezdee</day>
-							<day type="thu">T��zdee</day>
-							<day type="fri">Fraịdee</day>
-							<day type="sat">Sat�dee</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>A.M.</am>
-				<pm>P.M.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Tupu Kristi</era>
-						<era type="1">Af� Kristi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">T.K.</era>
-						<era type="1">A.K.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>Naịra</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ig_NG.xml b/airtime_mvc/library/Zend/Locale/Data/ig_NG.xml
deleted file mode 100644
index 77e19c153..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ig_NG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="ig"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ii.xml b/airtime_mvc/library/Zend/Locale/Data/ii.xml
deleted file mode 100644
index 6c90b7356..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ii.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.12 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ii"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="de">ꄓꇩꉙ</language>
-			<language type="en">ꑱꇩꉙ</language>
-			<language type="es">ꑭꀠꑸꉙ</language>
-			<language type="fr">ꃔꇩꉙ</language>
-			<language type="ii">ꆈꌠꉙ</language>
-			<language type="it">ꑴꄊꆺꉙ</language>
-			<language type="ja">�ꀪꉙ</language>
-			<language type="pt">�ꄨꑸꉙ</language>
-			<language type="pt_BR">ꀠꑟ�ꄨꑸꉙ</language>
-			<language type="ru">ꊉꇩꉙ</language>
-			<language type="und">ꅉꀋꌠꅇꂷ</language>
-			<language type="zh">�ꇩꉙ</language>
-			<language type="zh_Hans">���ꇩꉙ</language>
-			<language type="zh_Hant">ꀎ��ꇩꉙ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ꀊ�ꀨ�ꂷ</script>
-			<script type="Cyrl">ꀊꆨꌦ�ꃚ�ꂷ</script>
-			<script type="Hans">��ꉌꈲ�ꂷ</script>
-			<script type="Hant">ꀎ�ꉌꈲ�ꂷ</script>
-			<script type="Latn">�ꄀ�ꂷ</script>
-			<script type="Yiii">ꆈꌠ�ꂷ</script>
-			<script type="Zxxx">�ꀋꉆꌠ</script>
-			<script type="Zzzz">ꅉꀋ�ꌠ�ꂷ</script>
-		</scripts>
-		<territories>
-			<territory type="BR">ꀠꑭ</territory>
-			<territory type="CN">�ꇩ</territory>
-			<territory type="DE">ꄓꇩ</territory>
-			<territory type="FR">ꃔꇩ</territory>
-			<territory type="GB">ꑱꇩ</territory>
-			<territory type="IN">ê‘´ê„—</territory>
-			<territory type="IT">ꑴꄊꆺ</territory>
-			<territory type="JP">�ꀪ</territory>
-			<territory type="RU">ꊉꇆꌦ</territory>
-			<territory type="US">ꂰꇩ</territory>
-			<territory type="ZZ">ꃅꄷꅉꀋ�ꌠ</territory>
-		</territories>
-		<types>
-			<type type="gregorian" key="calendar">ꄉꉻꃅ�</type>
-			<type type="islamic" key="calendar">ꑳꌦꇂ�ꉖ</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">ꂰꌬꌠ</measurementSystemName>
-			<measurementSystemName type="US">ꂰꇩ</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">ꅇꉙ: {0}</codePattern>
-			<codePattern type="script">ꇇ�: {0}</codePattern>
-			<codePattern type="territory">ꃅꄷ: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[ꀀ-ꒌ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�ꆪ</month>
-							<month type="2">�ꆪ</month>
-							<month type="3">ꌕꆪ</month>
-							<month type="4">ꇖꆪ</month>
-							<month type="5">ꉬꆪ</month>
-							<month type="6">ꃘꆪ</month>
-							<month type="7">�ꆪ</month>
-							<month type="8">ꉆꆪ</month>
-							<month type="9">ꈬꆪ</month>
-							<month type="10">ꊰꆪ</month>
-							<month type="11">ꊰꊪꆪ</month>
-							<month type="12">ꊰꑋꆪ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">��</day>
-							<day type="mon">��</day>
-							<day type="tue">��</day>
-							<day type="wed">�ꌕ</day>
-							<day type="thu">�ꇖ</day>
-							<day type="fri">�ꉬ</day>
-							<day type="sat">�ꃘ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ꑭ��</day>
-							<day type="mon">�ꊂ�</day>
-							<day type="tue">�ꊂ�</day>
-							<day type="wed">�ꊂꌕ</day>
-							<day type="thu">�ꊂꇖ</day>
-							<day type="fri">�ꊂꉬ</day>
-							<day type="sat">�ꊂꃘ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">�</day>
-							<day type="tue">�</day>
-							<day type="wed">ꌕ</day>
-							<day type="thu">ꇖ</day>
-							<day type="fri">ꉬ</day>
-							<day type="sat">ꃘ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">ꃅꑌ</quarter>
-							<quarter type="2">ꃅꎸ</quarter>
-							<quarter type="3">ꃅ�</quarter>
-							<quarter type="4">ꃅꋆ</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ꃅꑌ</quarter>
-							<quarter type="2">ꃅꎸ</quarter>
-							<quarter type="3">ꃅ�</quarter>
-							<quarter type="4">ꃅꋆ</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ꎸꄑ</am>
-				<pm>�ꋒ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">ꃅꋊꂿ</era>
-						<era type="1">ꃅꋊꊂ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<fields>
-					<field type="era">
-						<displayName>ꃅꋊ</displayName>
-					</field>
-					<field type="year">
-						<displayName>ꈎ</displayName>
-					</field>
-					<field type="month">
-						<displayName>ꆪ</displayName>
-					</field>
-					<field type="week">
-						<displayName>ꑭ�</displayName>
-					</field>
-					<field type="day">
-						<displayName>�</displayName>
-						<relative type="-2">ꎴꂿ��</relative>
-						<relative type="-1">ꀋꅔꉈ</relative>
-						<relative type="0">ꀃ�</relative>
-						<relative type="1">ꃆ��</relative>
-						<relative type="2">ꌕꀿ�</relative>
-					</field>
-					<field type="weekday">
-						<displayName>��</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ꎸꄑ/�ꋒ</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ꄮꈉ</displayName>
-					</field>
-					<field type="minute">
-						<displayName>�</displayName>
-					</field>
-					<field type="second">
-						<displayName>ꇙ</displayName>
-					</field>
-					<field type="zone">
-						<displayName>ꃅꄷꄮꈉ</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ꅉꀋ�ꌠ</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencies>
-			<currency type="XXX">
-				<displayName>ꅉꀋ�ꌠꌋꆀꎆꃀꀋ��ꌠ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ꉬ</yesstr>
-			<nostr>ꀋꉬ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ii_CN.xml b/airtime_mvc/library/Zend/Locale/Data/ii_CN.xml
deleted file mode 100644
index d4de9bca6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ii_CN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.7 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="ii"/>
-		<territory type="CN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/in.xml b/airtime_mvc/library/Zend/Locale/Data/in.xml
deleted file mode 100644
index 4847551c3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/in.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="in"/>
-	</identity>
-	<alias source="id" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/is.xml b/airtime_mvc/library/Zend/Locale/Data/is.xml
deleted file mode 100644
index 292b3b5b4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/is.xml
+++ /dev/null
@@ -1,2179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.100 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="is"/>
-	</identity>
-	<fallback>nn sv nb da en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afár</language>
-			<language type="ab">abkasíska</language>
-			<language type="ace">akkíska</language>
-			<language type="ach">akólí</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adýge</language>
-			<language type="ae">avestíska</language>
-			<language type="af">afríkanska</language>
-			<language type="afa">afróasísk mál (önnur)</language>
-			<language type="afh">afríhílí</language>
-			<language type="ain">aínu (Japan)</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadíska</language>
-			<language type="ale">aleúska</language>
-			<language type="alg">algonkvínsk mál</language>
-			<language type="alt">suðuraltaíska</language>
-			<language type="am">amharíska</language>
-			<language type="an">aragonska</language>
-			<language type="ang">fornenska (um 450-1100)</language>
-			<language type="anp">angíka</language>
-			<language type="apa">apatsjamál</language>
-			<language type="ar">arabíska</language>
-			<language type="arc">arameíska</language>
-			<language type="arn">arákaníska</language>
-			<language type="arp">arapahó</language>
-			<language type="art">alþjóðamál (önnur)</language>
-			<language type="arw">aravakska</language>
-			<language type="as">assamska</language>
-			<language type="ast">astúríska</language>
-			<language type="ath">atapaskísk mál</language>
-			<language type="aus">áströlsk mál</language>
-			<language type="av">avaríska</language>
-			<language type="awa">avadí</language>
-			<language type="ay">aímara</language>
-			<language type="az">aserska</language>
-			<language type="ba">baskír</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamílekemál</language>
-			<language type="bal">balúkí</language>
-			<language type="ban">balíska</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltnesk mál (önnur)</language>
-			<language type="be">hvítrússneska</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berbamál</language>
-			<language type="bg">búlgarska</language>
-			<language type="bh">bíharí</language>
-			<language type="bho">bojpúrí</language>
-			<language type="bi">bíslama</language>
-			<language type="bik">bíkol</language>
-			<language type="bin">bíní</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalska</language>
-			<language type="bnt">bantúmál</language>
-			<language type="bo">tíbeska</language>
-			<language type="br">bretónska</language>
-			<language type="bra">braí</language>
-			<language type="bs">bosníska</language>
-			<language type="btk">batak</language>
-			<language type="bua">búríat</language>
-			<language type="bug">búgíska</language>
-			<language type="byn">blín</language>
-			<language type="ca">katalónska</language>
-			<language type="cad">kaddó</language>
-			<language type="cai">Indíánamál Mið-Ameríku (önnur)</language>
-			<language type="car">karíbamál</language>
-			<language type="cau">kákasusmál (önnur)</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tsjetsjenska</language>
-			<language type="ceb">kebúanó</language>
-			<language type="cel">keltnesk (önnur)</language>
-			<language type="ch">kamorró</language>
-			<language type="chb">síbsja</language>
-			<language type="chg">sjagataí</language>
-			<language type="chk">sjúkíska</language>
-			<language type="chm">marí</language>
-			<language type="chn">sínúk</language>
-			<language type="cho">sjoktá</language>
-			<language type="chp">sípevíska</language>
-			<language type="chr">sjerókí</language>
-			<language type="chy">sjeyen</language>
-			<language type="cmc">kamísk mál</language>
-			<language type="co">korsíska</language>
-			<language type="cop">koptíska</language>
-			<language type="cpe">kreól- og pidginmál á enskum grunni</language>
-			<language type="cpf">kreól- og pidginmál á frönskum grunni</language>
-			<language type="cpp">kreól- og pidginmál á portúgölskum grunni</language>
-			<language type="cr">krí</language>
-			<language type="crh">krímtyrkneska</language>
-			<language type="crp">kreól- og pidginmál (önnur)</language>
-			<language type="cs">tékkneska</language>
-			<language type="csb">kasúbíska</language>
-			<language type="cu">kirkjuslavneska</language>
-			<language type="cus">kúsitísk mál (önnur)</language>
-			<language type="cv">sjúvas</language>
-			<language type="cy">velska</language>
-			<language type="da">danska</language>
-			<language type="dak">dakóta</language>
-			<language type="dar">dargva</language>
-			<language type="day">dajak</language>
-			<language type="de">þýska</language>
-			<language type="de_AT">austurrísk þýska</language>
-			<language type="de_CH">svissnesk háþýska</language>
-			<language type="del">delaver</language>
-			<language type="den">slavneska</language>
-			<language type="dgr">dogríb</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogrí</language>
-			<language type="dra">dravidísk mál (önnur)</language>
-			<language type="dsb">lágsorbneska</language>
-			<language type="dua">dúala</language>
-			<language type="dum">miðhollenska (um 1050-1350)</language>
-			<language type="dv">dívehí</language>
-			<language type="dyu">djúla</language>
-			<language type="dz">dsongka</language>
-			<language type="ee">eve</language>
-			<language type="efi">efík</language>
-			<language type="egy">fornegypska</language>
-			<language type="eka">ekajúk</language>
-			<language type="el">nýgríska (1453-)</language>
-			<language type="elx">elamít</language>
-			<language type="en">enska</language>
-			<language type="en_AU">áströlsk enska</language>
-			<language type="en_CA">kanadísk enska</language>
-			<language type="en_GB">bresk enska</language>
-			<language type="en_US">bandarísk enska</language>
-			<language type="enm">miðenska (1100-1500)</language>
-			<language type="eo">esperantó</language>
-			<language type="es">spænska</language>
-			<language type="es_419">latnesk-amerísk spænska</language>
-			<language type="es_ES">íberísk spænska</language>
-			<language type="et">eistneska</language>
-			<language type="eu">baskneska</language>
-			<language type="ewo">evondó</language>
-			<language type="fa">persneska</language>
-			<language type="fan">fang</language>
-			<language type="fat">fantí</language>
-			<language type="ff">fúla</language>
-			<language type="fi">finnska</language>
-			<language type="fil">filipínska</language>
-			<language type="fiu">finnskúgrísk mál (önnur)</language>
-			<language type="fj">fídjeyska</language>
-			<language type="fo">færeyska</language>
-			<language type="fon">fón</language>
-			<language type="fr">franska</language>
-			<language type="fr_CA">kanadísk franska</language>
-			<language type="fr_CH">svissnesk franska</language>
-			<language type="frm">miðfranska (um 1400-1600)</language>
-			<language type="fro">fornfranska (842 - um 1400)</language>
-			<language type="frr">norðurfrísneska</language>
-			<language type="frs">austurfrísneska</language>
-			<language type="fur">fríúlska</language>
-			<language type="fy">frísneska</language>
-			<language type="ga">írska</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajó</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">skosk gelíska</language>
-			<language type="gem">germönsk mál (önnur)</language>
-			<language type="gez">gís</language>
-			<language type="gil">gilberska</language>
-			<language type="gl">gallegska</language>
-			<language type="gmh">miðháþýska (um 1050-1500</language>
-			<language type="gn">gvaraní</language>
-			<language type="goh">fornháþýska (um 750-1050)</language>
-			<language type="gon">gondí</language>
-			<language type="gor">gorontaló</language>
-			<language type="got">gotneska</language>
-			<language type="grb">gerbó</language>
-			<language type="grc">forngríska (til 1453)</language>
-			<language type="gsw">svissnesk þýska</language>
-			<language type="gu">gújaratí</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gvísín</language>
-			<language type="ha">hása</language>
-			<language type="hai">haída</language>
-			<language type="haw">havaíska</language>
-			<language type="he">hebreska</language>
-			<language type="hi">hindí</language>
-			<language type="hil">híligaínon</language>
-			<language type="him">hímasjalí</language>
-			<language type="hit">hettitíska</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hírímótú</language>
-			<language type="hr">króatíska</language>
-			<language type="hsb">hásorbneska</language>
-			<language type="ht">haítíska</language>
-			<language type="hu">ungverska</language>
-			<language type="hup">húpa</language>
-			<language type="hy">armenska</language>
-			<language type="hz">hereró</language>
-			<language type="ia">interlingva</language>
-			<language type="iba">íban</language>
-			<language type="id">indónesíska</language>
-			<language type="ie">interlingve</language>
-			<language type="ig">ígbó</language>
-			<language type="ii">sísúanjí</language>
-			<language type="ijo">íjó</language>
-			<language type="ik">ínúpíak</language>
-			<language type="ilo">ílokó</language>
-			<language type="inc">indversk mál (önnur)</language>
-			<language type="ine">indóevrópsk mál (önnur)</language>
-			<language type="inh">ingús</language>
-			<language type="io">ídó</language>
-			<language type="ira">íranska</language>
-			<language type="iro">írókesk mál</language>
-			<language type="is">íslenska</language>
-			<language type="it">ítalska</language>
-			<language type="iu">inúktitút</language>
-			<language type="ja">japanska</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">gyðingapersneska</language>
-			<language type="jrb">gyðingaarabíska</language>
-			<language type="jv">javanska</language>
-			<language type="ka">georgíska</language>
-			<language type="kaa">karakalpak</language>
-			<language type="kab">kabíle</language>
-			<language type="kac">kasín</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kaví</language>
-			<language type="kbd">kabardíska</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongó</language>
-			<language type="kha">kasí</language>
-			<language type="khi">koímál (önnur)</language>
-			<language type="kho">kotaska</language>
-			<language type="ki">kíkújú</language>
-			<language type="kj">kúanjama</language>
-			<language type="kk">kasakska</language>
-			<language type="kl">grænlenska</language>
-			<language type="km">kmer</language>
-			<language type="kmb">kimbúndú</language>
-			<language type="kn">kannada</language>
-			<language type="ko">kóreska</language>
-			<language type="kok">konkaní</language>
-			<language type="kos">kosraska</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanúrí</language>
-			<language type="krc">karasaíbalkar</language>
-			<language type="krl">karélska</language>
-			<language type="kro">krú</language>
-			<language type="kru">kúrúk</language>
-			<language type="ks">kasmírska</language>
-			<language type="ku">kúrdneska</language>
-			<language type="kum">kúmík</language>
-			<language type="kut">kútenaí</language>
-			<language type="kv">komíska</language>
-			<language type="kw">korníska</language>
-			<language type="ky">kirgiska</language>
-			<language type="la">latína</language>
-			<language type="lad">ladínska</language>
-			<language type="lah">landa</language>
-			<language type="lam">lamba</language>
-			<language type="lb">lúxemborgíska</language>
-			<language type="lez">lesgíska</language>
-			<language type="lg">ganda</language>
-			<language type="li">limbúrgíska</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laó</language>
-			<language type="lol">mongó</language>
-			<language type="loz">losí</language>
-			<language type="lt">litháíska</language>
-			<language type="lu">lúbakatanga</language>
-			<language type="lua">lúbalúlúa</language>
-			<language type="lui">lúisenó</language>
-			<language type="lun">lúnda</language>
-			<language type="luo">lúó</language>
-			<language type="lus">lúsaí</language>
-			<language type="lv">lettneska</language>
-			<language type="mad">madúrska</language>
-			<language type="mag">magahí</language>
-			<language type="mai">maítílí</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingó</language>
-			<language type="map">ástrónesíska</language>
-			<language type="mas">masaí</language>
-			<language type="mdf">moksa</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malagasíska</language>
-			<language type="mga">miðírska (900-1200)</language>
-			<language type="mh">marshallska</language>
-			<language type="mi">maórí</language>
-			<language type="mic">mikmak</language>
-			<language type="min">mínangkabá</language>
-			<language type="mis">ýmis mál</language>
-			<language type="mk">makedónska</language>
-			<language type="mkh">monkmermál (önnur)</language>
-			<language type="ml">malajalam</language>
-			<language type="mn">mongólska</language>
-			<language type="mnc">mansjú</language>
-			<language type="mni">manípúrí</language>
-			<language type="mno">manóbómál</language>
-			<language type="mo">moldóvska</language>
-			<language type="moh">móhíska</language>
-			<language type="mos">mossí</language>
-			<language type="mr">maratí</language>
-			<language type="ms">malaíska</language>
-			<language type="mt">maltneska</language>
-			<language type="mul">margvísleg mál</language>
-			<language type="mun">múndamál</language>
-			<language type="mus">krík</language>
-			<language type="mwl">mirandesíska</language>
-			<language type="mwr">marvarí</language>
-			<language type="my">burmneska</language>
-			<language type="myn">majamál</language>
-			<language type="myv">ersja</language>
-			<language type="na">nárúska</language>
-			<language type="nah">nahúatl</language>
-			<language type="nai">Indíánamál Norður-Ameríku (önnur)</language>
-			<language type="nap">napólíska</language>
-			<language type="nb">norskt bókmál</language>
-			<language type="nd">norðurndebele</language>
-			<language type="nds">Lágþýska; Lágsaxneska</language>
-			<language type="ne">nepalska</language>
-			<language type="new">nevarí</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nías</language>
-			<language type="nic">nígerkordófanmál (önnur)</language>
-			<language type="niu">níveska</language>
-			<language type="nl">hollenska</language>
-			<language type="nl_BE">flæmska</language>
-			<language type="nn">nýnorska</language>
-			<language type="no">norska</language>
-			<language type="nog">nógaí</language>
-			<language type="non">norræna</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">suðurndebele</language>
-			<language type="nso">norðursótó</language>
-			<language type="nub">núbísk mál</language>
-			<language type="nv">navahó</language>
-			<language type="nwc">klassísk nevaríska</language>
-			<language type="ny">Njanja; Sísjeva; Sjeva</language>
-			<language type="nym">njamvesí</language>
-			<language type="nyn">njankóle</language>
-			<language type="nyo">njóró</language>
-			<language type="nzi">nsíma</language>
-			<language type="oc">Okkitíska (eftir 1500); Próvensalska</language>
-			<language type="oj">ojibva</language>
-			<language type="om">órómó</language>
-			<language type="or">óría</language>
-			<language type="os">ossetíska</language>
-			<language type="osa">ósage</language>
-			<language type="ota">tyrkneska, ottóman (1500-1928)</language>
-			<language type="oto">ótommál</language>
-			<language type="pa">púnjabí</language>
-			<language type="paa">papúsk mál (önnur)</language>
-			<language type="pag">pangasínmál</language>
-			<language type="pal">palaví</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papíamentó</language>
-			<language type="pau">paláska</language>
-			<language type="peo">fornpersneska</language>
-			<language type="phi">filippseysk mál (önnur)</language>
-			<language type="phn">fönikíska</language>
-			<language type="pi">palí</language>
-			<language type="pl">pólska</language>
-			<language type="pon">ponpeiska</language>
-			<language type="pra">prakrítmál</language>
-			<language type="pro">fornpróvensalska (til 1500)</language>
-			<language type="ps">pastú</language>
-			<language type="pt">portúgalska</language>
-			<language type="pt_BR">brasílísk portúgalska</language>
-			<language type="pt_PT">íberísk portúgalska</language>
-			<language type="qu">kvesjúa</language>
-			<language type="raj">rajastaní</language>
-			<language type="rap">rapanúí</language>
-			<language type="rar">rarótongska</language>
-			<language type="rm">retórómanska</language>
-			<language type="rn">rúndí</language>
-			<language type="ro">rúmenska</language>
-			<language type="roa">rómönsk mál (önnur)</language>
-			<language type="rom">romaní</language>
-			<language type="root">rót</language>
-			<language type="ru">rússneska</language>
-			<language type="rup">arúmenska</language>
-			<language type="rw">kínjarvanda</language>
-			<language type="sa">sanskrít</language>
-			<language type="sad">sandave</language>
-			<language type="sah">jakút</language>
-			<language type="sai">Indíánamál Suður-Ameríku (önnur)</language>
-			<language type="sal">salísmál</language>
-			<language type="sam">samversk arameíska</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santalí</language>
-			<language type="sc">sardínska</language>
-			<language type="scn">sikileyska</language>
-			<language type="sco">skoska</language>
-			<language type="sd">sindí</language>
-			<language type="se">norðursamíska</language>
-			<language type="sel">selkúp</language>
-			<language type="sem">semísk mál (önnur)</language>
-			<language type="sg">sangó</language>
-			<language type="sga">fornírska (til 900)</language>
-			<language type="sgn">táknmál</language>
-			<language type="sh">serbókróatíska</language>
-			<language type="shn">sjan</language>
-			<language type="si">singalesíska</language>
-			<language type="sid">sídamó</language>
-			<language type="sio">síúmál</language>
-			<language type="sit">sínótíbesk mál</language>
-			<language type="sk">slóvakíska</language>
-			<language type="sl">slóvenska</language>
-			<language type="sla">slavnesk mál (önnur)</language>
-			<language type="sm">samóska</language>
-			<language type="sma">suðursamíska</language>
-			<language type="smi">samísk mál (önnur)</language>
-			<language type="smj">lúlesamíska</language>
-			<language type="smn">enaresamíska</language>
-			<language type="sms">skoltesamíska</language>
-			<language type="sn">shóna</language>
-			<language type="snk">sóninke</language>
-			<language type="so">sómalska</language>
-			<language type="sog">sogdíen</language>
-			<language type="son">songhaí</language>
-			<language type="sq">albanska</language>
-			<language type="sr">serbneska</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">svatí</language>
-			<language type="ssa">nílósaharamál (önnur)</language>
-			<language type="st">suðursótó</language>
-			<language type="su">súndanska</language>
-			<language type="suk">súkúma</language>
-			<language type="sus">súsú</language>
-			<language type="sux">súmerska</language>
-			<language type="sv">sænska</language>
-			<language type="sw">svahílí</language>
-			<language type="syc">klassísk sýrlenska</language>
-			<language type="syr">sýrlenska</language>
-			<language type="ta">tamílska</language>
-			<language type="tai">taímál (önnur)</language>
-			<language type="te">telúgú</language>
-			<language type="tem">tímne</language>
-			<language type="ter">terenó</language>
-			<language type="tet">tetúm</language>
-			<language type="tg">tadsjikska</language>
-			<language type="th">taílenska</language>
-			<language type="ti">tígrinja</language>
-			<language type="tig">tígre</language>
-			<language type="tiv">tív</language>
-			<language type="tk">túrkmenska</language>
-			<language type="tkl">tókeláska</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingónska</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamasjek</language>
-			<language type="tn">tsúana</language>
-			<language type="to">Tongverska (Tongaeyjar)</language>
-			<language type="tog">Tongverska (Nyasa)</language>
-			<language type="tpi">tokpisin</language>
-			<language type="tr">tyrkneska</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimsíska</language>
-			<language type="tt">tatarska</language>
-			<language type="tum">túmbúka</language>
-			<language type="tup">túpímál</language>
-			<language type="tut">altaísk mál (önnur)</language>
-			<language type="tvl">túvalúska</language>
-			<language type="tw">tví</language>
-			<language type="ty">tahítíska</language>
-			<language type="tyv">túvínska</language>
-			<language type="udm">údmúrt</language>
-			<language type="ug">úígúr</language>
-			<language type="uga">úgarítíska</language>
-			<language type="uk">úkraínska</language>
-			<language type="umb">úmbúndú</language>
-			<language type="und">óþekkt eða ógilt tungumál</language>
-			<language type="ur">úrdú</language>
-			<language type="uz">úsbekska</language>
-			<language type="vai">vaí</language>
-			<language type="ve">venda</language>
-			<language type="vi">víetnamska</language>
-			<language type="vo">volapyk</language>
-			<language type="vot">votíska</language>
-			<language type="wa">vallónska</language>
-			<language type="wak">vakasmál</language>
-			<language type="wal">valamó</language>
-			<language type="war">varaí</language>
-			<language type="was">vasjó</language>
-			<language type="wen">sorbnesk mál</language>
-			<language type="wo">volof</language>
-			<language type="xal">kalmúkska</language>
-			<language type="xh">sósa</language>
-			<language type="yao">jaó</language>
-			<language type="yap">japíska</language>
-			<language type="yi">jiddíska</language>
-			<language type="yo">jórúba</language>
-			<language type="ypk">júpísk mál</language>
-			<language type="za">súang</language>
-			<language type="zap">sapótek</language>
-			<language type="zbl">blisstákn</language>
-			<language type="zen">senaga</language>
-			<language type="zh">kínverska</language>
-			<language type="zh_Hans">kínverska (einfölduð)</language>
-			<language type="zh_Hant">kínverska (hefðbundin)</language>
-			<language type="znd">sande</language>
-			<language type="zu">súlú</language>
-			<language type="zun">súní</language>
-			<language type="zxx">ekkert tungutengt efni</language>
-			<language type="zza">zázáíska</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabísk</script>
-			<script type="Armi">impéríska araméíska</script>
-			<script type="Armn">arméníska</script>
-			<script type="Avst">avestíska</script>
-			<script type="Bali">balinesíska</script>
-			<script type="Batk">batakíska</script>
-			<script type="Beng">bengalíska</script>
-			<script type="Blis">blisstégn</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmíska</script>
-			<script type="Brai">blindtégn</script>
-			<script type="Bugi">buginesíska</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">Cans</script>
-			<script type="Cari">karíska</script>
-			<script type="Cham">chamíska</script>
-			<script type="Cher">cherokí</script>
-			<script type="Cirt">círth</script>
-			<script type="Copt">koptíska</script>
-			<script type="Cprt">kypriotíska</script>
-			<script type="Cyrl">kyrillísk</script>
-			<script type="Deva">dévanágríska</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Ethi">eþíópísk</script>
-			<script type="Geok">georgíska (khutsuri)</script>
-			<script type="Geor">georgrísk</script>
-			<script type="Grek">grísk</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">kínversk</script>
-			<script type="Hans">einfaldað han</script>
-			<script type="Hant">hefðbundið han</script>
-			<script type="Hebr">hebresk</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hrkt">katakana eða hiragana</script>
-			<script type="Java">javanesíska</script>
-			<script type="Jpan">japönsk</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khmr">khmeríska</script>
-			<script type="Kore">kórönska</script>
-			<script type="Kthi">kaithíska</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotíska</script>
-			<script type="Latf">frakturlatnéska</script>
-			<script type="Latg">gaeliklatnéska</script>
-			<script type="Latn">latnesk</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lyci">lykíska</script>
-			<script type="Lydi">lydíska</script>
-			<script type="Mand">mandaíska</script>
-			<script type="Mani">manikeíska</script>
-			<script type="Mero">meroitíska</script>
-			<script type="Mong">mongólíska</script>
-			<script type="Moon">moon</script>
-			<script type="Mymr">burmesíska</script>
-			<script type="Nkoo">n-kó</script>
-			<script type="Ogam">ogham</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oríja</script>
-			<script type="Qaai">(erfðir)</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">rúntégn</script>
-			<script type="Samr">samaríska</script>
-			<script type="Sara">saratí</script>
-			<script type="Shaw">shavíska</script>
-			<script type="Sinh">sinhala</script>
-			<script type="Sund">sundanesíska</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syriakíska</script>
-			<script type="Tale">tai le</script>
-			<script type="Taml">tamílska</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengvar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thai">thai</script>
-			<script type="Tibt">tibetánska</script>
-			<script type="Ugar">ugaritíska</script>
-			<script type="Vaii">vai</script>
-			<script type="Yiii">yí</script>
-			<script type="Zxxx">Óskrifað</script>
-			<script type="Zzzz">Óþekkt eða ógilt letur</script>
-		</scripts>
-		<territories>
-			<territory type="001">heimur</territory>
-			<territory type="002">Afríka</territory>
-			<territory type="003">Norður-Ameríka</territory>
-			<territory type="005">Suður-Ameríka</territory>
-			<territory type="009">Eyjaálfa</territory>
-			<territory type="011">Vestur-Afríka</territory>
-			<territory type="013">Mið-Ameríka</territory>
-			<territory type="014">Austur-Afríka</territory>
-			<territory type="015">Norður-Afríka</territory>
-			<territory type="017">Mið-Afríka</territory>
-			<territory type="018">Suðurhluti Afríku</territory>
-			<territory type="019">Ameríka</territory>
-			<territory type="021">Ameríka norðan Mexikó</territory>
-			<territory type="029">Karíbahaf</territory>
-			<territory type="030">Austur-Asía</territory>
-			<territory type="034">suðurhluti Asíu</territory>
-			<territory type="035">Suðaustur-Asía</territory>
-			<territory type="039">Suður-Evrópa</territory>
-			<territory type="053">�stralía og Nýja-Sjáland</territory>
-			<territory type="054">Melanesía</territory>
-			<territory type="057">Míkrónesía</territory>
-			<territory type="061">Pólýnesía</territory>
-			<territory type="062">Syðri-Mið-Asía</territory>
-			<territory type="142">Asía</territory>
-			<territory type="143">Mið-Asía</territory>
-			<territory type="145">vestur-Asía</territory>
-			<territory type="150">Evrópa</territory>
-			<territory type="151">Austur-Evrópa</territory>
-			<territory type="154">Norður-Evrópa</territory>
-			<territory type="155">vestur-Evrópa</territory>
-			<territory type="172">Samveldi sjálfstæðra ríkja</territory>
-			<territory type="419">Latín-Ameríka og Karíbahaf</territory>
-			<territory type="830">Ermasundseyjar</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Sameinuðu arabísku furstadæmin</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antígva og Barbúda</territory>
-			<territory type="AI">Angvilla</territory>
-			<territory type="AL">Albanía</territory>
-			<territory type="AM">Armenía</territory>
-			<territory type="AN">Hollensku Antillur</territory>
-			<territory type="AO">Angóla</territory>
-			<territory type="AQ">Suðurskautslandið</territory>
-			<territory type="AR">Argentína</territory>
-			<territory type="AS">Bandaríska Samóa</territory>
-			<territory type="AT">Austurríki</territory>
-			<territory type="AU">�stralía</territory>
-			<territory type="AW">Arúba</territory>
-			<territory type="AX">�landseyjar</territory>
-			<territory type="AZ">Aserbaídsjan</territory>
-			<territory type="BA">Bosnía og Hersegóvína</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladess</territory>
-			<territory type="BE">Belgía</territory>
-			<territory type="BF">Búrkína Fasó</territory>
-			<territory type="BG">Búlgaría</territory>
-			<territory type="BH">Barein</territory>
-			<territory type="BI">Búrúndí</territory>
-			<territory type="BJ">Benín</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermúdaeyjar</territory>
-			<territory type="BN">Brúnei</territory>
-			<territory type="BO">Bólivía</territory>
-			<territory type="BR">Brasilía</territory>
-			<territory type="BS">Bahamaeyjar</territory>
-			<territory type="BT">Bútan</territory>
-			<territory type="BV">Bouveteyja</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Hvíta-Rússland</territory>
-			<territory type="BZ">Belís</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kókoseyjar</territory>
-			<territory type="CD">Austur-Kongó</territory>
-			<territory type="CF">Mið-Afríkulýðveldið</territory>
-			<territory type="CG">Vestur-Kongó</territory>
-			<territory type="CH">Sviss</territory>
-			<territory type="CI">Fílabeinsströndin</territory>
-			<territory type="CK">Cookseyjar</territory>
-			<territory type="CL">Chíle</territory>
-			<territory type="CM">Kamerún</territory>
-			<territory type="CN">Kína</territory>
-			<territory type="CO">Kólumbía</territory>
-			<territory type="CR">Kostaríka</territory>
-			<territory type="CS">Serbía og Svartfjallaland</territory>
-			<territory type="CU">Kúba</territory>
-			<territory type="CV">Grænhöfðaeyjar</territory>
-			<territory type="CX">Jólaey</territory>
-			<territory type="CY">Kýpur</territory>
-			<territory type="CZ">Tékkland</territory>
-			<territory type="DE">Þýskaland</territory>
-			<territory type="DJ">Djíbútí</territory>
-			<territory type="DK">Danmörk</territory>
-			<territory type="DM">Dóminíka</territory>
-			<territory type="DO">Dóminíska lýðveldið</territory>
-			<territory type="DZ">Alsír</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Eistland</territory>
-			<territory type="EG">Egyptaland</territory>
-			<territory type="EH">Vestur-Sahara</territory>
-			<territory type="ER">Erítrea</territory>
-			<territory type="ES">Spánn</territory>
-			<territory type="ET">Eþíópía</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fídjieyjar</territory>
-			<territory type="FK">Falklandseyjar</territory>
-			<territory type="FM">Mikrónesía</territory>
-			<territory type="FO">Færeyjar</territory>
-			<territory type="FR">Frakkland</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Bretland</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgía</territory>
-			<territory type="GF">Franska Gvæjana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gíbraltar</territory>
-			<territory type="GL">Grænland</territory>
-			<territory type="GM">Gambía</territory>
-			<territory type="GN">Gínea</territory>
-			<territory type="GP">Gvadelúpeyjar</territory>
-			<territory type="GQ">Miðbaugs-Gínea</territory>
-			<territory type="GR">Grikkland</territory>
-			<territory type="GS">Suður-Georgía og Suður-Sandvíkureyjar</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Gvam</territory>
-			<territory type="GW">Gínea-Bissá</territory>
-			<territory type="GY">Gvæjana</territory>
-			<territory type="HK">Hong Kong</territory>
-			<territory type="HM">Heard og McDonaldseyjar</territory>
-			<territory type="HN">Hondúras</territory>
-			<territory type="HR">Króatía</territory>
-			<territory type="HT">Haítí</territory>
-			<territory type="HU">Ungverjaland</territory>
-			<territory type="ID">Indónesía</territory>
-			<territory type="IE">�rland</territory>
-			<territory type="IL">�srael</territory>
-			<territory type="IM">Mön</territory>
-			<territory type="IN">Indland</territory>
-			<territory type="IO">Bresku Indlandshafseyjar</territory>
-			<territory type="IQ">�rak</territory>
-			<territory type="IR">�ran</territory>
-			<territory type="IS">�sland</territory>
-			<territory type="IT">�talía</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaíka</territory>
-			<territory type="JO">Jórdanía</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenía</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambódía</territory>
-			<territory type="KI">Kíribatí</territory>
-			<territory type="KM">Kómoreyjar</territory>
-			<territory type="KN">Sankti Kristófer og Nevis</territory>
-			<territory type="KP">Norður-Kórea</territory>
-			<territory type="KR">Suður-Kórea</territory>
-			<territory type="KW">Kúveit</territory>
-			<territory type="KY">Caymaneyjar</territory>
-			<territory type="KZ">Kasakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Líbanon</territory>
-			<territory type="LC">Sankti Lúsía</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Srí Lanka</territory>
-			<territory type="LR">Líbería</territory>
-			<territory type="LS">Lesótó</territory>
-			<territory type="LT">Litháen</territory>
-			<territory type="LU">Lúxemborg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Líbía</territory>
-			<territory type="MA">Marokkó</territory>
-			<territory type="MC">Mónakó</territory>
-			<territory type="MD">Moldóva</territory>
-			<territory type="ME">Svartfjallaland</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalleyjar</territory>
-			<territory type="MK">Makedónía</territory>
-			<territory type="ML">Malí</territory>
-			<territory type="MM">Mjanmar</territory>
-			<territory type="MN">Mongólía</territory>
-			<territory type="MO">Makaó</territory>
-			<territory type="MP">Norður-Maríanaeyjar</territory>
-			<territory type="MQ">Martiník</territory>
-			<territory type="MR">Máritanía</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Máritíus</territory>
-			<territory type="MV">Maldíveyjar</territory>
-			<territory type="MW">Malaví</territory>
-			<territory type="MX">Mexíkó</territory>
-			<territory type="MY">Malasía</territory>
-			<territory type="MZ">Mósambík</territory>
-			<territory type="NA">Namibía</territory>
-			<territory type="NC">Nýja-Kaledónía</territory>
-			<territory type="NE">Níger</territory>
-			<territory type="NF">Norfolkeyja</territory>
-			<territory type="NG">Nígería</territory>
-			<territory type="NI">Níkaragva</territory>
-			<territory type="NL">Niðurlönd</territory>
-			<territory type="NO">Noregur</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nárú</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nýja-Sjáland</territory>
-			<territory type="OM">Óman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Perú</territory>
-			<territory type="PF">Franska Pólýnesía</territory>
-			<territory type="PG">Papúa Nýja-Gínea</territory>
-			<territory type="PH">Filippseyjar</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Pólland</territory>
-			<territory type="PM">Sankti Pierre og Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Púertó Ríkó</territory>
-			<territory type="PS">Palestína</territory>
-			<territory type="PT">Portúgal</territory>
-			<territory type="PW">Palá</territory>
-			<territory type="PY">Paragvæ</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Ytri Eyjaálfa</territory>
-			<territory type="QU">Evrópusambandið</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rúmenía</territory>
-			<territory type="RS">Serbía</territory>
-			<territory type="RU">Rússland</territory>
-			<territory type="RW">Rúanda</territory>
-			<territory type="SA">Sádi-Arabía</territory>
-			<territory type="SB">Salómonseyjar</territory>
-			<territory type="SC">Seychelleseyjar</territory>
-			<territory type="SD">Súdan</territory>
-			<territory type="SE">Svíþjóð</territory>
-			<territory type="SG">Singapúr</territory>
-			<territory type="SH">Sankti Helena</territory>
-			<territory type="SI">Slóvenía</territory>
-			<territory type="SJ">Svalbarði og Jan Mayen</territory>
-			<territory type="SK">Slóvakía</territory>
-			<territory type="SL">Síerra Leóne</territory>
-			<territory type="SM">San Marínó</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Sómalía</territory>
-			<territory type="SR">Súrínam</territory>
-			<territory type="ST">Saó Tóme og Prinsípe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Sýrland</territory>
-			<territory type="SZ">Svasíland</territory>
-			<territory type="TC">Turks- og Caicoseyjar</territory>
-			<territory type="TD">Tsjad</territory>
-			<territory type="TF">Frönsku suðlægu landsvæðin</territory>
-			<territory type="TG">Tógó</territory>
-			<territory type="TH">Taíland</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK">Tókelá</territory>
-			<territory type="TL">Austur-Tímor</territory>
-			<territory type="TM">Túrkmenistan</territory>
-			<territory type="TN">Túnis</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tyrkland</territory>
-			<territory type="TT">Trínidad og Tóbagó</territory>
-			<territory type="TV">Túvalú</territory>
-			<territory type="TW">Taívan</territory>
-			<territory type="TZ">Tansanía</territory>
-			<territory type="UA">Úkraína</territory>
-			<territory type="UG">Úganda</territory>
-			<territory type="UM">Smáeyjar Bandaríkjanna</territory>
-			<territory type="US">Bandaríkin</territory>
-			<territory type="UY">Úrúgvæ</territory>
-			<territory type="UZ">Úsbekistan</territory>
-			<territory type="VA">Páfagarður</territory>
-			<territory type="VC">Sankti Vinsent og Grenadíneyjar</territory>
-			<territory type="VE">Venesúela</territory>
-			<territory type="VG">Jómfrúaeyjar (bresku)</territory>
-			<territory type="VI">Jómfrúaeyjar (bandarísku)</territory>
-			<territory type="VN">Víetnam</territory>
-			<territory type="VU">Vanúatú</territory>
-			<territory type="WF">Wallis- og Fútúnaeyjar</territory>
-			<territory type="WS">Samóa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Suður-Afríka</territory>
-			<territory type="ZM">Sambía</territory>
-			<territory type="ZW">Simbabve</territory>
-			<territory type="ZZ">Óþekkt eða ógilt svæði</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Dagatal</key>
-			<key type="collation">Röðun</key>
-			<key type="currency">Gjaldmiðill</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">hefðbundin kínversk röðun - Big5</type>
-			<type type="buddhist" key="calendar">Búddískt dagatal</type>
-			<type type="chinese" key="calendar">Kínverskt dagatal</type>
-			<type type="direct" key="collation">Bein röðun</type>
-			<type type="gb2312han" key="collation">einfölduð kínversk röðun - GB2312</type>
-			<type type="gregorian" key="calendar">Gregorískt dagatal</type>
-			<type type="hebrew" key="calendar">Hebreskt dagatal</type>
-			<type type="indian" key="calendar">indverskt dagatal</type>
-			<type type="islamic" key="calendar">�slamskt dagatal</type>
-			<type type="islamic-civil" key="calendar">�slamskt borgaradagatal</type>
-			<type type="japanese" key="calendar">Japanskt dagatal</type>
-			<type type="phonebook" key="collation">Símaskráarröðun</type>
-			<type type="pinyin" key="collation">Pinyin-röðun</type>
-			<type type="roc" key="calendar">kínverskt dagatal</type>
-			<type type="stroke" key="collation">Strikaröðun</type>
-			<type type="traditional" key="collation">Hefðbundin</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrakerfi</measurementSystemName>
-			<measurementSystemName type="US">bandarískt</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">tungumál: {0}</codePattern>
-			<codePattern type="script">leturgerð: {0}</codePattern>
-			<codePattern type="territory">svæði: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="languages">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á b d ð e é f-i í j-o ó p r-u ú v y ý þ æ ö]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q w z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‚</alternateQuotationStart>
-		<alternateQuotationEnd>‘</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maí</month>
-							<month type="6">jún</month>
-							<month type="7">júl</month>
-							<month type="8">ágú</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nóv</month>
-							<month type="12">des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">janúar</month>
-							<month type="2">febrúar</month>
-							<month type="3">mars</month>
-							<month type="4">apríl</month>
-							<month type="5">maí</month>
-							<month type="6">júní</month>
-							<month type="7">júlí</month>
-							<month type="8">ágúst</month>
-							<month type="9">september</month>
-							<month type="10">október</month>
-							<month type="11">nóvember</month>
-							<month type="12">desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">j</month>
-							<month type="2">f</month>
-							<month type="3">m</month>
-							<month type="4">a</month>
-							<month type="5">m</month>
-							<month type="6">j</month>
-							<month type="7">j</month>
-							<month type="8">á</month>
-							<month type="9">s</month>
-							<month type="10">o</month>
-							<month type="11">n</month>
-							<month type="12">d</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sun</day>
-							<day type="mon">mán</day>
-							<day type="tue">þri</day>
-							<day type="wed">mið</day>
-							<day type="thu">fim</day>
-							<day type="fri">fös</day>
-							<day type="sat">lau</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sunnudagur</day>
-							<day type="mon">mánudagur</day>
-							<day type="tue">þriðjudagur</day>
-							<day type="wed">miðvikudagur</day>
-							<day type="thu">fimmtudagur</day>
-							<day type="fri">föstudagur</day>
-							<day type="sat">laugardagur</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">s</day>
-							<day type="mon">m</day>
-							<day type="tue">þ</day>
-							<day type="wed">m</day>
-							<day type="thu">f</day>
-							<day type="fri">f</day>
-							<day type="sat">l</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">F1</quarter>
-							<quarter type="2">F2</quarter>
-							<quarter type="3">F3</quarter>
-							<quarter type="4">F4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1st fjórðungur</quarter>
-							<quarter type="2">2nd fjórðungur</quarter>
-							<quarter type="3">3rd fjórðungur</quarter>
-							<quarter type="4">4th fjórðungur</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1F</quarter>
-							<quarter type="2">2F</quarter>
-							<quarter type="3">3F</quarter>
-							<quarter type="4">4F</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. fjórðungur</quarter>
-							<quarter type="2">2. fjórðungur</quarter>
-							<quarter type="3">3. fjórðungur</quarter>
-							<quarter type="4">4. fjórðungur</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>f.h.</am>
-				<pm>e.h.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">fyrir Krist</era>
-						<era type="1">eftir Krist</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">f.k.</era>
-						<era type="1">e.k.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L.</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E d.M.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M. yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q. yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M - d.M</greatestDifference>
-							<greatestDifference id="M">d.M - d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M - E, d.M</greatestDifference>
-							<greatestDifference id="M">E, d.M - E, d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yyyy - M.yyyy</greatestDifference>
-							<greatestDifference id="y">M.yyyy - M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.yyyy - d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">d.M.yyyy - d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">d.M.yyyy - d.M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.yyyy - E, d.M.yyyy</greatestDifference>
-							<greatestDifference id="M">E, d.M.yyyy - E, d.M.yyyy</greatestDifference>
-							<greatestDifference id="y">E, d.M.yyyy - E, d.M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.-d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y - E, d. MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>tímabil</displayName>
-					</field>
-					<field type="year">
-						<displayName>ár</displayName>
-					</field>
-					<field type="month">
-						<displayName>mánuður</displayName>
-					</field>
-					<field type="week">
-						<displayName>vika</displayName>
-					</field>
-					<field type="day">
-						<displayName>dagur</displayName>
-						<relative type="-3">fyrir þremur dögum</relative>
-						<relative type="-2">fyrir tveimur dögum</relative>
-						<relative type="-1">í gær</relative>
-						<relative type="0">í dag</relative>
-						<relative type="1">á morgun</relative>
-						<relative type="2">eftir tvo daga</relative>
-						<relative type="3">eftir þrjá daga</relative>
-					</field>
-					<field type="weekday">
-						<displayName>vikudagur</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>f.h./e.h.</displayName>
-					</field>
-					<field type="hour">
-						<displayName>klukkustund</displayName>
-					</field>
-					<field type="minute">
-						<displayName>mínúta</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekúnda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>svæði</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{0} ({1})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>óþekkt</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabúl</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Angúilla</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Suðurpóllinn</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Vínarborg</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>Arúba</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbadoseyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brussel</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofía</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Barein</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermúdaeyjar</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Brúnei</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branco</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belís</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Regína</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Páskaeyja</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostaríka</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Grænhöfðaeyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlín</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djíbútí</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kaupmannahöfn</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dóminíka</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alsír</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kaíró</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanaríeyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madríd</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidjieyjar</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Færeyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>París</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gíbraltar</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuuk</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Gvadelúp</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Aþena</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Suður-Georgía</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Gúam</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Bissá</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gvæjana</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Búdapest</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Djakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reykjavík</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Róm</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaíka</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tókýó</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pjongjang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seúl</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kúveit</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirút</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monróvía</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilníus</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Lúxemborg</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Mónakó</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Úlan Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makaó</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martínik</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Máritíus</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldíveyjar</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexíkóborg</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Kankún</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Osló</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Nárú</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Níúe</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquesas-eyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsjá</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Púertó Ríkó</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoreyjar</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Palaú</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Kvatar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Búkarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stokkhólmur</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapúr</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskus</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Túnis</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanbúl</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulu</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Anchorage</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Denver</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianapolis</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Jóhannesarborg</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Mið-Evróputími</standard>
-					<daylight>sumartími Mið-Evrópu</daylight>
-				</long>
-				<short>
-					<standard>MET</standard>
-					<daylight>STME</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Austur-Evróputími</standard>
-					<daylight>sumartími Austur-Evrópu</daylight>
-				</long>
-				<short>
-					<standard>AET</standard>
-					<daylight>STAE</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>EiTa</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorrskur peseti</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Arabískt dírham</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dramm</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Hollenskt Antillugyllini</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentine Austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentískur pesi (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentískur pesi</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austurrískur skildingur</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�stralskur dalur</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadoskur dalur</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgískur franki</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lef</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lef, nýtt</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermúdeyskur dalur</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brúneiskur dalur</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>bólivískt bólívíanó</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bólivískur pesi</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivian Mvdol</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brasilískt ríal</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahameyskur dalur</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Búrmverskt kjat</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belískur dalur</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadískur dalur</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Svissneskur franki</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chilean Unidades de Fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chileskur pesi</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Júan</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kólumbískur pesi</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Tékknesk króna, eldri</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kúbverskur pesi</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Grænhöfðeyskur skúti</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kýpverskt pund</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Tékknesk króna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Austurþýskt mark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Þýskt mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Djibouti Franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Dönsk króna</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dóminískur pesi</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuador Sucre</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Eistnesk króna</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egypskt pund</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spænskur peseti</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finnskt mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fídjeyskur dalur</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklenskt pund</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franskur franki</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Sterlingspund</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gíbraltarspund</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Gíneufranki</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Drakma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemala Quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portúgalskur, gíneskur skúti</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Gvæjanskur dalur</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hong Kong-dalur</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hoduras Lempira</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kúna</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Fórinta</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indónesísk rúpía</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>�rskt pund</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>�sraelskt pund</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Sikill</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indversk rúpía</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>�rakskur denari</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>�ranskt ríal</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>�slensk króna</displayName>
-				<displayName count="one">íslensk króna</displayName>
-				<displayName count="other">íslensku krónur</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>�tölsk líra</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaískur dalur</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>kenískur skildingur</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Kómoreyskur franki</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Norðurkóreskt vonn</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Suðurkóreskt vonn</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kúveiskur denari</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Caymaneyskur dalur</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazakhstan Tenge</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Líbanskt pund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Srílönsk rúpía</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Líberískur dalur</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesotho Loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lít</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Lithuanian Talonas</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Lúxemborgarfranki</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lat</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lettnesk rúbla</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Líbískur denari</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkóskt dírham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkóskur franki</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagascar Ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskur franki</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedónskur denari</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malískur franki</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Mjanmarskt kjat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Túríkur</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macao Pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritania Ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Meltnesk líra</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltneskt pund</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexíkóskur pesi</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexíkóskur silfurpesi (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexíkóskur pesi, UDI</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaysian Ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mósambískur skúti</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibískur dalur</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerian Naira</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Hollenskt gyllini</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norsk króna</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Nýsjálenskur dalur</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Ómanskt ríal</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balbói</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>perúskar sol nuevo</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filippeyskir pesóar</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistönsk rúpía</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>pólskt zlotý</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Slot</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portúgalskur skúti</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Rúmenskt lei</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>rúmensk leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>serbneskur dínar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>rússnesk rúbla</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rússnesk rúbla (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rwandan Franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Sádiarabískt ríal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salómonseyskur dalur</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychelles rúpía</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Súdanskur denari</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Súdanskt pund</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Sænsk króna</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapúrskur dalur</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Helenskt pund</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slóvenskur dalur</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slóvakísk króna</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Suriname Guilder</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome and Principe Dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Soviet Rouble</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El Salvador Colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Sýrlenskt pund</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Bat</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadsjiksk rúbla</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tajikistan Somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Túrkmenskt manat</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Tímorskur skúti</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Tyrknesk líra</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Ný tyrknesk líra</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trínidad og Tóbagó-dalur</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Taívanskur dalur</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanian Shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hrinja</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainian Karbovanetz</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Bandaríkjadalur</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Bandaríkjadalur (næsta dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Bandaríkjadalur (sama dag)</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelan Bolivar</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>víetnamskt dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu Vatu</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Miðafrískur franki, BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>unse silfur</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>unse gull</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Austur-Karíbahafsdalur</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Sérstök dráttarréttindi</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franskur gullfranki</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Franskur franki, UIC</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Miðafrískur franki, BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>unse palladín</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Pólinesískur franki</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>unse platína</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Óþekktur eða ógildur gjaldeyrir</displayName>
-				<displayName count="one">óþekktur eða ógildur gjaldeyrir</displayName>
-				<displayName count="other">óþekktur eða ógildur gjaldeyrir</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemenskur denari</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenskt ríal</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Júgóslavneskur denari</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Rand (viðskipta)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>suðurafríkskt rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambian Kwacha</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Simbabveskur dalur</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dagur</unitPattern>
-			<unitPattern count="other">{0} dagar</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} klukkustund</unitPattern>
-			<unitPattern count="other">{0} klukkustundir</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} mínúta</unitPattern>
-			<unitPattern count="other">{0} mínútur</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mánuður</unitPattern>
-			<unitPattern count="other">{0} mánuðir</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekúnda</unitPattern>
-			<unitPattern count="other">{0} sekúndur</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} vika</unitPattern>
-			<unitPattern count="other">{0} vikur</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} ár</unitPattern>
-			<unitPattern count="other">{0} ár</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>já:j</yesstr>
-			<nostr>nei:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/is_IS.xml b/airtime_mvc/library/Zend/Locale/Data/is_IS.xml
deleted file mode 100644
index 6433c91b4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/is_IS.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="is"/>
-		<territory type="IS"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/it.xml b/airtime_mvc/library/Zend/Locale/Data/it.xml
deleted file mode 100644
index 2d61c7802..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/it.xml
+++ /dev/null
@@ -1,3002 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.124 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="it"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhazian</language>
-			<language type="ace">accinese</language>
-			<language type="ach">acioli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avestan</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">lingua afroasiatica</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">accado</language>
-			<language type="ale">aleuto</language>
-			<language type="alg">lingue algonchine</language>
-			<language type="alt">altai meridionale</language>
-			<language type="am">amarico</language>
-			<language type="an">aragonese</language>
-			<language type="ang">inglese antico</language>
-			<language type="anp">angika</language>
-			<language type="apa">lingue apache</language>
-			<language type="ar">arabo</language>
-			<language type="arc">aramaico</language>
-			<language type="arn">araucano</language>
-			<language type="arp">arapaho</language>
-			<language type="art">lingua artificiale</language>
-			<language type="arw">aruaco</language>
-			<language type="as">assamese</language>
-			<language type="ast">asturiano</language>
-			<language type="ath">lingue athabaska</language>
-			<language type="aus">lingue australiane</language>
-			<language type="av">avaro</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">azerbaigiano</language>
-			<language type="ba">baschiro</language>
-			<language type="bad">banda</language>
-			<language type="bai">lingue bamileke</language>
-			<language type="bal">beluci</language>
-			<language type="ban">balinese</language>
-			<language type="bas">basa</language>
-			<language type="bat">lingua baltica</language>
-			<language type="be">bielorusso</language>
-			<language type="bej">begia</language>
-			<language type="bem">wemba</language>
-			<language type="ber">berbero</language>
-			<language type="bg">bulgaro</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bicol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalese</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetano</language>
-			<language type="br">bretone</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosniaco</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriat</language>
-			<language type="bug">bugi</language>
-			<language type="byn">blin</language>
-			<language type="ca">catalano</language>
-			<language type="cad">caddo</language>
-			<language type="cai">lingua indiana dell'America Centrale</language>
-			<language type="car">caribico</language>
-			<language type="cau">lingua caucasica</language>
-			<language type="cch">atsam</language>
-			<language type="ce">ceceno</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">celtica altra lingua</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">ciagataico</language>
-			<language type="chk">chuukese</language>
-			<language type="chm">mari</language>
-			<language type="chn">gergo chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">lingue chamic</language>
-			<language type="co">corso</language>
-			<language type="cop">copto</language>
-			<language type="cpe">creolo o pidgin basati sull'inglese</language>
-			<language type="cpf">creolo o pidgin basati sul francese</language>
-			<language type="cpp">creolo o pidgin basati sul portoghese</language>
-			<language type="cr">cree</language>
-			<language type="crh">turco crimeo</language>
-			<language type="crp">creolo o pidgin</language>
-			<language type="cs">ceco</language>
-			<language type="csb">kashubian</language>
-			<language type="cu">slavo della Chiesa</language>
-			<language type="cus">lingua cuscitica</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">gallese</language>
-			<language type="da">danese</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">tedesco</language>
-			<language type="de_AT">tedesco austriaco</language>
-			<language type="de_CH">alto tedesco svizzero</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinca</language>
-			<language type="doi">dogri</language>
-			<language type="dra">lingua dravidica</language>
-			<language type="dsb">basso sorabo</language>
-			<language type="dua">duala</language>
-			<language type="dum">olandese medio</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">diula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">egiziano antico</language>
-			<language type="eka">ekajuka</language>
-			<language type="el">greco</language>
-			<language type="elx">elamitico</language>
-			<language type="en">inglese</language>
-			<language type="en_AU">inglese australiano</language>
-			<language type="en_CA">inglese canadese</language>
-			<language type="en_GB">inglese britannico</language>
-			<language type="en_US">inglese americano</language>
-			<language type="enm">inglese medio</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spagnolo</language>
-			<language type="es_419">spagnolo latinoamericano</language>
-			<language type="es_ES">spagnolo della Spagna</language>
-			<language type="et">estone</language>
-			<language type="eu">basco</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persiano</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulah</language>
-			<language type="fi">finlandese</language>
-			<language type="fil">filippino</language>
-			<language type="fiu">lingua ungrofinnica</language>
-			<language type="fj">figiano</language>
-			<language type="fo">faroese</language>
-			<language type="fr">francese</language>
-			<language type="fr_CA">francese canadese</language>
-			<language type="fr_CH">francese svizzero</language>
-			<language type="frm">francese medio</language>
-			<language type="fro">francese antico</language>
-			<language type="frr">frisone settentrionale</language>
-			<language type="fur">friulano</language>
-			<language type="fy">frisone</language>
-			<language type="ga">irlandese</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">gaelico scozzese</language>
-			<language type="gem">lingua germanica</language>
-			<language type="gez">geez</language>
-			<language type="gil">gilbertese</language>
-			<language type="gl">galiziano</language>
-			<language type="gmh">tedesco medio alto</language>
-			<language type="gn">guarana</language>
-			<language type="goh">tedesco antico alto</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotico</language>
-			<language type="grb">gerbo</language>
-			<language type="grc">greco antico</language>
-			<language type="gsw">tedesco svizzero</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichʼin</language>
-			<language type="ha">haussa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiano</language>
-			<language type="he">ebraico</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligayna</language>
-			<language type="him">himachali</language>
-			<language type="hit">hittite</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croato</language>
-			<language type="hsb">alto sorabo</language>
-			<language type="ht">haitiano</language>
-			<language type="hu">ungherese</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armeno</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesiano</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">sichuan yi</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">ilocano</language>
-			<language type="inc">lingua indiana</language>
-			<language type="ine">lingua indoeuropea</language>
-			<language type="inh">ingush</language>
-			<language type="io">ido</language>
-			<language type="ira">iraniana</language>
-			<language type="iro">lingue irochesi</language>
-			<language type="is">islandese</language>
-			<language type="it">italiano</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">giapponese</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">giudeo persiano</language>
-			<language type="jrb">giudeo arabo</language>
-			<language type="jv">giavanese</language>
-			<language type="ka">georgiano</language>
-			<language type="kaa">kara-kalpak</language>
-			<language type="kab">kabyle</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">kai</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardia</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">kfo</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">lingua khoisan</language>
-			<language type="kho">khotanese</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazako</language>
-			<language type="kl">kalaallisut</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">coreano</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraean</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-Balkar</language>
-			<language type="krl">careliano</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kashmiri</language>
-			<language type="ku">curdo</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">cornico</language>
-			<language type="ky">kirghiso</language>
-			<language type="la">latino</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">lussemburghese</language>
-			<language type="lez">lezghian</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgese</language>
-			<language type="ln">lingala</language>
-			<language type="lo">lao</language>
-			<language type="lol">lolo bantu</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituano</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">lettone</language>
-			<language type="mad">madurese</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronesiano</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgascio</language>
-			<language type="mga">irlandese medio</language>
-			<language type="mh">marshallese</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">menangkabau</language>
-			<language type="mis">lingue diverse</language>
-			<language type="mk">macedone</language>
-			<language type="mkh">lingua mon-khmer</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolo</language>
-			<language type="mnc">manchu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobo</language>
-			<language type="mo">moldavo</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malese</language>
-			<language type="mt">maltese</language>
-			<language type="mul">multilingua</language>
-			<language type="mun">lingua munda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandese</language>
-			<language type="mwr">marwari</language>
-			<language type="my">birmano</language>
-			<language type="myn">lingue maya</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">lingua indiana del Nord America</language>
-			<language type="nap">napoletano</language>
-			<language type="nb">norvegese bokmal</language>
-			<language type="nd">ndebele del nord</language>
-			<language type="nds">basso tedesco</language>
-			<language type="ne">nepalese</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">lingua niger-cordofan</language>
-			<language type="niu">niue</language>
-			<language type="nl">olandese</language>
-			<language type="nl_BE">fiammingo belga</language>
-			<language type="nn">norvegese nynorsk</language>
-			<language type="no">norvegese</language>
-			<language type="nog">nogai</language>
-			<language type="non">norse antico</language>
-			<language type="nqo">n'ko</language>
-			<language type="nr">ndebele del sud</language>
-			<language type="nso">sotho del nord</language>
-			<language type="nub">nubiano</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">newari classico</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitano</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetico</language>
-			<language type="osa">osage</language>
-			<language type="ota">turco ottomano</language>
-			<language type="oto">lingue otomi</language>
-			<language type="pa">punjabi</language>
-			<language type="paa">lingua papuana</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palau</language>
-			<language type="peo">persiano antico</language>
-			<language type="phi">lingua filippina</language>
-			<language type="phn">fenicio</language>
-			<language type="pi">pali</language>
-			<language type="pl">polacco</language>
-			<language type="pon">ponape</language>
-			<language type="pra">pracrito</language>
-			<language type="pro">provenzale antico</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portoghese</language>
-			<language type="pt_BR">portoghese brasiliano</language>
-			<language type="pt_PT">portoghese del Portogallo</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotonga</language>
-			<language type="rm">lingua rhaeto-romance</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumeno</language>
-			<language type="roa">lingua romanza</language>
-			<language type="rom">romani</language>
-			<language type="root">root</language>
-			<language type="ru">russo</language>
-			<language type="rup">arumeno</language>
-			<language type="rw">kinyarwanda</language>
-			<language type="sa">sanscrito</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">yakut</language>
-			<language type="sai">lingua indiana del Sud America</language>
-			<language type="sal">lingue salish</language>
-			<language type="sam">aramaico samaritano</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardo</language>
-			<language type="scn">siciliano</language>
-			<language type="sco">scozzese</language>
-			<language type="sd">sindhi</language>
-			<language type="se">sami del nord</language>
-			<language type="sel">selkup</language>
-			<language type="sem">lingua semitica</language>
-			<language type="sg">sango</language>
-			<language type="sga">irlandese antico</language>
-			<language type="sgn">lingue sign</language>
-			<language type="sh">serbo-croato</language>
-			<language type="shn">shan</language>
-			<language type="si">singalese</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">lingue sioux</language>
-			<language type="sit">lingua sino-tibetana</language>
-			<language type="sk">slovacco</language>
-			<language type="sl">sloveno</language>
-			<language type="sla">lingua slava</language>
-			<language type="sm">samoano</language>
-			<language type="sma">sami del sud</language>
-			<language type="smi">lingua sami</language>
-			<language type="smj">sami lule</language>
-			<language type="smn">sami inari</language>
-			<language type="sms">sami skolt</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalo</language>
-			<language type="sog">sogdiano</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanese</language>
-			<language type="sr">serbo</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssa">lingua nilo-sahariana</language>
-			<language type="st">sotho del sud</language>
-			<language type="su">sundanese</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumero</language>
-			<language type="sv">svedese</language>
-			<language type="sw">swahili</language>
-			<language type="syr">siriaco</language>
-			<language type="ta">tamil</language>
-			<language type="tai">lingua tailandese</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tagicco</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinya</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turcomanno</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonga</language>
-			<language type="tog">nyasa del Tonga</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turco</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatarico</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">lingue tupi</language>
-			<language type="tut">lingua altaica</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">ci</language>
-			<language type="ty">taitiano</language>
-			<language type="tyv">tuvinian</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigurico</language>
-			<language type="uga">ugaritico</language>
-			<language type="uk">ucraino</language>
-			<language type="umb">mbundu</language>
-			<language type="und">lingua imprecisata</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbeco</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamita</language>
-			<language type="vo">volapük</language>
-			<language type="vot">voto</language>
-			<language type="wa">vallone</language>
-			<language type="wak">lingue wakash</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sorabo</language>
-			<language type="wo">volof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xosa</language>
-			<language type="yao">yao (bantu)</language>
-			<language type="yap">yapese</language>
-			<language type="yi">yiddish</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">lingue yupik</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotec</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">cinese</language>
-			<language type="zh_Hans">cinese semplificato</language>
-			<language type="zh_Hant">cinese tradizionale</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">Nessun contenuto linguistico</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabo</script>
-			<script type="Armn">armeno</script>
-			<script type="Bali">balinese</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengali</script>
-			<script type="Blis">simboli bliss</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginese</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cans">simboli aborigeni canadesi unificati</script>
-			<script type="Cari">carian</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">copto</script>
-			<script type="Cprt">cipriota</script>
-			<script type="Cyrl">cirillico</script>
-			<script type="Cyrs">cirillico antica chiesa slavonica</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egiziano demotico</script>
-			<script type="Egyh">ieratico egiziano</script>
-			<script type="Egyp">geroglifici egiziani</script>
-			<script type="Ethi">etiope</script>
-			<script type="Geok">kutsuri</script>
-			<script type="Geor">georgiano</script>
-			<script type="Glag">glagolitico</script>
-			<script type="Goth">gotico</script>
-			<script type="Grek">greco</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">han semplificato</script>
-			<script type="Hant">han tradizionale</script>
-			<script type="Hebr">ebraico</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawn hmong</script>
-			<script type="Hrkt">katanaka o hiragana</script>
-			<script type="Hung">antico ungherese</script>
-			<script type="Inds">indu</script>
-			<script type="Ital">italico antico</script>
-			<script type="Java">javanese</script>
-			<script type="Jpan">giapponese</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshthi</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">variante fraktur del latino</script>
-			<script type="Latg">variante gaelica del latino</script>
-			<script type="Latn">latino</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineare A</script>
-			<script type="Linb">lineare B</script>
-			<script type="Lyci">lyci</script>
-			<script type="Lydi">lydi</script>
-			<script type="Mand">mandaico</script>
-			<script type="Maya">geroglifici maya</script>
-			<script type="Mero">meroitico</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongolo</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">meetei mayek</script>
-			<script type="Mymr">myanmar</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">permico antico</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phnx">fenicio</script>
-			<script type="Plrd">fonetica di pollard</script>
-			<script type="Qaai">ereditato</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runico</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">linguaggio dei segni</script>
-			<script type="Shaw">shaviano</script>
-			<script type="Sinh">singalese</script>
-			<script type="Sund">sundanese</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">siriano</script>
-			<script type="Syre">siriaco estrangelo</script>
-			<script type="Syrj">siriaco occidentale</script>
-			<script type="Syrn">siriaco orientale</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">tai lue</script>
-			<script type="Taml">tamil</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tailandese</script>
-			<script type="Tibt">tibetano</script>
-			<script type="Ugar">ugarita</script>
-			<script type="Vaii">vaii</script>
-			<script type="Visp">alfabeto visivo</script>
-			<script type="Xpeo">persiano antico</script>
-			<script type="Xsux">sumero-accadiano cuneiforme</script>
-			<script type="Yiii">yi</script>
-			<script type="Zxxx">non scritto</script>
-			<script type="Zyyy">comune</script>
-			<script type="Zzzz">ignoto o non valido</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mondo</territory>
-			<territory type="002">Africa</territory>
-			<territory type="003">Nord America</territory>
-			<territory type="005">America del Sud</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Africa occidentale</territory>
-			<territory type="013">America centrale</territory>
-			<territory type="014">Africa orientale</territory>
-			<territory type="015">Africa del Nord</territory>
-			<territory type="017">Africa centrale</territory>
-			<territory type="018">Africa del Sud</territory>
-			<territory type="019">Americhe</territory>
-			<territory type="021">America del Nord</territory>
-			<territory type="029">Caraibi</territory>
-			<territory type="030">Asia orientale</territory>
-			<territory type="034">Asia del Sud</territory>
-			<territory type="035">Asia sudorientale</territory>
-			<territory type="039">Europa del Sud</territory>
-			<territory type="053">Australia e Nuova Zelanda</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Regione Micronesiana</territory>
-			<territory type="061">Polinesia</territory>
-			<territory type="062">Asia centro-meridionale</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia centrale</territory>
-			<territory type="145">Asia occidentale</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa orientale</territory>
-			<territory type="154">Europa del Nord</territory>
-			<territory type="155">Europa occidentale</territory>
-			<territory type="172">Comunità di Stati Indipendenti</territory>
-			<territory type="419">America Latina e Caraibi</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emirati Arabi Uniti</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua e Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antille Olandesi</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antartide</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americane</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Isole Aland</territory>
-			<territory type="AZ">Azerbaigian</territory>
-			<territory type="BA">Bosnia Erzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgio</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">San Bartolomeo</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasile</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Isola Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorussia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Isole Cocos</territory>
-			<territory type="CD">Repubblica Democratica del Congo</territory>
-			<territory type="CF">Repubblica Centrafricana</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Svizzera</territory>
-			<territory type="CI">Costa d’Avorio</territory>
-			<territory type="CK">Isole Cook</territory>
-			<territory type="CL">Cile</territory>
-			<territory type="CM">Camerun</territory>
-			<territory type="CN">Cina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia e Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Capo Verde</territory>
-			<territory type="CX">Isola di Christmas</territory>
-			<territory type="CY">Cipro</territory>
-			<territory type="CZ">Repubblica Ceca</territory>
-			<territory type="DE">Germania</territory>
-			<territory type="DJ">Gibuti</territory>
-			<territory type="DK">Danimarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Repubblica Dominicana</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egitto</territory>
-			<territory type="EH">Sahara Occidentale</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spagna</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Figi</territory>
-			<territory type="FK">Isole Falkland</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Isole Faroe</territory>
-			<territory type="FR">Francia</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Regno Unito</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guiana Francese</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibilterra</territory>
-			<territory type="GL">Groenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadalupa</territory>
-			<territory type="GQ">Guinea Equatoriale</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GS">Georgia del Sud e Isole Sandwich del Sud</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Regione Amministrativa Speciale di Hong Kong della Repubblica Popolare Cinese</territory>
-			<territory type="HM">Isole Heard ed Isole McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croazia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungheria</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israele</territory>
-			<territory type="IM">Isola di Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Territorio Britannico dell’Oceano Indiano</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islanda</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Giamaica</territory>
-			<territory type="JO">Giordania</territory>
-			<territory type="JP">Giappone</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirghizistan</territory>
-			<territory type="KH">Cambogia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comore</territory>
-			<territory type="KN">Saint Kitts e Nevis</territory>
-			<territory type="KP">Corea del Nord</territory>
-			<territory type="KR">Corea del Sud</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Isole Cayman</territory>
-			<territory type="KZ">Kazakistan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libano</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Lussemburgo</territory>
-			<territory type="LV">Lettonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Marocco</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldavia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Isole Marshall</territory>
-			<territory type="MK">Repubblica di Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Regione Amministrativa Speciale di Macao della Repubblica Popolare Cinese</territory>
-			<territory type="MP">Isole Marianne Settentrionali</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldive</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Messico</territory>
-			<territory type="MY">Malesia</territory>
-			<territory type="MZ">Mozambico</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nuova Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Isola Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Paesi Bassi</territory>
-			<territory type="NO">Norvegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nuova Zelanda</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Perù</territory>
-			<territory type="PF">Polinesia Francese</territory>
-			<territory type="PG">Papua Nuova Guinea</territory>
-			<territory type="PH">Filippine</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">Saint Pierre e Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portorico</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portogallo</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceania lontana</territory>
-			<territory type="QU">Unione Europea</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Federazione Russa</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SB">Isole Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Svezia</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Sant’Elena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard e Jan Mayen</territory>
-			<territory type="SK">Slovacchia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tomé e Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Isole Turks e Caicos</territory>
-			<territory type="TD">Ciad</territory>
-			<territory type="TF">Territori australi francesi</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailandia</territory>
-			<territory type="TJ">Tagikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Est</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turchia</territory>
-			<territory type="TT">Trinidad e Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ucraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Isole Minori lontane dagli Stati Uniti</territory>
-			<territory type="US">Stati Uniti</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vaticano</territory>
-			<territory type="VC">Saint Vincent e Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Isole Vergini Britanniche</territory>
-			<territory type="VI">Isole Vergini Americane</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis e Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sudafrica</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">regione non valida o sconosciuta</territory>
-		</territories>
-		<variants>
-			<variant type="1901">ortografia tradizionale tedesca</variant>
-			<variant type="1996">ortografia tedesca del 1996</variant>
-			<variant type="AREVELA">armeno orientale</variant>
-			<variant type="AREVMDA">armeno occidentale</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">alfabeto fonetico internazionale IPA</variant>
-			<variant type="FONUPA">alfabeto fonetico uralico UPA</variant>
-			<variant type="MONOTON">monotonico</variant>
-			<variant type="NEDIS">dialetto del Natisone</variant>
-			<variant type="POLYTON">politonico</variant>
-			<variant type="POSIX">computer</variant>
-			<variant type="REVISED">ortografia revisionata</variant>
-			<variant type="ROZAJ">resiano</variant>
-			<variant type="SAAHO">saho</variant>
-		</variants>
-		<keys>
-			<key type="calendar">calendario</key>
-			<key type="collation">collazione</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">cinese tradizionale</type>
-			<type type="buddhist" key="calendar">calendario buddista</type>
-			<type type="chinese" key="calendar">calendario cinese</type>
-			<type type="direct" key="collation">ordine diretto</type>
-			<type type="gb2312han" key="collation">cinese semplificato</type>
-			<type type="gregorian" key="calendar">calendario gregoriano</type>
-			<type type="hebrew" key="calendar">calendario ebraico</type>
-			<type type="indian" key="calendar">calendario nazionale indiano</type>
-			<type type="islamic" key="calendar">calendario islamico</type>
-			<type type="islamic-civil" key="calendar">calendario civile islamico</type>
-			<type type="japanese" key="calendar">calendario giapponese</type>
-			<type type="phonebook" key="collation">ordine elenco telefonico</type>
-			<type type="pinyin" key="collation">ordine pinyin</type>
-			<type type="stroke" key="collation">ordine segni</type>
-			<type type="traditional" key="collation">ordine tradizionale</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrico</measurementSystemName>
-			<measurementSystemName type="US">USA</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<layout>
-		<inText type="keys">lowercase-words</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="types">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a à b-e é è f-i ì j-o ó ò p-u ù v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[í ï ú]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">gen</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">mag</month>
-							<month type="6">giu</month>
-							<month type="7">lug</month>
-							<month type="8">ago</month>
-							<month type="9">set</month>
-							<month type="10">ott</month>
-							<month type="11">nov</month>
-							<month type="12">dic</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">gennaio</month>
-							<month type="2">febbraio</month>
-							<month type="3">marzo</month>
-							<month type="4">aprile</month>
-							<month type="5">maggio</month>
-							<month type="6">giugno</month>
-							<month type="7">luglio</month>
-							<month type="8">agosto</month>
-							<month type="9">settembre</month>
-							<month type="10">ottobre</month>
-							<month type="11">novembre</month>
-							<month type="12">dicembre</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">G</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">G</month>
-							<month type="7">L</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Gennaio</month>
-							<month type="2">Febbraio</month>
-							<month type="3">Marzo</month>
-							<month type="4">Aprile</month>
-							<month type="5">Maggio</month>
-							<month type="6">Giugno</month>
-							<month type="7">Luglio</month>
-							<month type="8">Agosto</month>
-							<month type="9">Settembre</month>
-							<month type="10">Ottobre</month>
-							<month type="11">Novembre</month>
-							<month type="12">Dicembre</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">lun</day>
-							<day type="tue">mar</day>
-							<day type="wed">mer</day>
-							<day type="thu">gio</day>
-							<day type="fri">ven</day>
-							<day type="sat">sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domenica</day>
-							<day type="mon">lunedì</day>
-							<day type="tue">martedì</day>
-							<day type="wed">mercoledì</day>
-							<day type="thu">giovedì</day>
-							<day type="fri">venerdì</day>
-							<day type="sat">sabato</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">G</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Domenica</day>
-							<day type="mon">Lunedì</day>
-							<day type="tue">Martedì</day>
-							<day type="wed">Mercoledì</day>
-							<day type="thu">Giovedì</day>
-							<day type="fri">Venerdì</day>
-							<day type="sat">Sabato</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1o trimestre</quarter>
-							<quarter type="2">2o trimestre</quarter>
-							<quarter type="3">3o trimestre</quarter>
-							<quarter type="4">4o trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>m.</am>
-				<pm>p.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">a.C.</era>
-						<era type="1">d.C</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">aC</era>
-						<era type="1">dC</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MMM/y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hhmm">hh.mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh.mm.ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">EEE d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">EEE d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">EEE d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q-yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd/MM - E dd/MM</greatestDifference>
-							<greatestDifference id="M">E dd/MM - E dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E dd - E dd MMM</greatestDifference>
-							<greatestDifference id="M">E dd MMM - E dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E dd/MM/yy - E dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>anno</displayName>
-					</field>
-					<field type="month">
-						<displayName>mese</displayName>
-					</field>
-					<field type="week">
-						<displayName>settimana</displayName>
-					</field>
-					<field type="day">
-						<displayName>giorno</displayName>
-						<relative type="-3">tre giorni fa</relative>
-						<relative type="-2">l'altro ieri</relative>
-						<relative type="-1">ieri</relative>
-						<relative type="0">oggi</relative>
-						<relative type="1">domani</relative>
-						<relative type="2">dopodomani</relative>
-						<relative type="3">tra tre giorni</relative>
-					</field>
-					<field type="weekday">
-						<displayName>giorno della settimana</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>periodo del giorno</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuto</displayName>
-					</field>
-					<field type="second">
-						<displayName>secondo</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH.mm;-HH.mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Sconosciuto</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Polo Sud</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Cordova</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelles</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>San Paolo</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zurigo</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Pasqua</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Capo Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Natale</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlino</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Gibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenaghen</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Algeri</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canarie</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Figi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Isole Faeroe</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Parigi</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londra</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibilterra</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupa</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atene</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Georgia meridionale</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guiana</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Giacarta</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublino</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Gerusalemme</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Giamaica</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Comore</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Santa Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Lussemburgo</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldive</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Città del Messico</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsavia</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn, isole</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portorico</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azzorre</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisbona</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Riunione, isola di</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Mosca</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stoccolma</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sant'Elena</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadiscio</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tomè</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damasco</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunisi</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Fuso orario Alaska</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Dakota del nord</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarcanda</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre Time</standard>
-					<daylight>Acre Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Central Africa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>East Africa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>South Africa Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>West Africa Time</standard>
-					<daylight>West Africa Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk Time</standard>
-					<daylight>Aktyubinsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska Time</generic>
-					<standard>Ora Standard Alaska</standard>
-					<daylight>Ora Legale Alaska</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<standard>Alaska-Hawaii Standard Time</standard>
-					<daylight>Alaska-Hawaii Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazon Time</standard>
-					<daylight>Amazon Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central Time</generic>
-					<standard>Central Standard Time</standard>
-					<daylight>Central Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Eastern Time</generic>
-					<standard>Eastern Standard Time</standard>
-					<daylight>Eastern Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Mountain Time</generic>
-					<standard>Mountain Standard Time</standard>
-					<daylight>Mountain Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pacific Time</generic>
-					<standard>Pacific Standard Time</standard>
-					<daylight>Pacific Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aqtau Time</standard>
-					<daylight>Aqtau Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aqtobe Time</standard>
-					<daylight>Aqtobe Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabian Time</generic>
-					<standard>Arabian Standard Time</standard>
-					<daylight>Arabian Daylight Time</daylight>
-				</long>
-				<short>
-					<standard>ST arabo</standard>
-					<daylight>ADT arabo</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentina Time</standard>
-					<daylight>Argentina Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Western Argentina Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armenia Time</standard>
-					<daylight>Armenia Summer Time</daylight>
-				</long>
-				<short>
-					<standard>AMT Armenia</standard>
-					<daylight>AMST Armenia</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashkhabad Time</standard>
-					<daylight>Ashkhabad Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantic Time</generic>
-					<standard>Atlantic Standard Time</standard>
-					<daylight>Atlantic Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Central Australia Time</generic>
-					<standard>Australian Central Standard Time</standard>
-					<daylight>Australian Central Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Eastern Australia Time</generic>
-					<standard>Australian Eastern Standard Time</standard>
-					<daylight>Australian Eastern Daylight Tim</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Western Australia Time</generic>
-					<standard>Australian Western Standard Time</standard>
-					<daylight>Australian Western Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azores Time</standard>
-					<daylight>Azores Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Baku Time</standard>
-					<daylight>Baku Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladesh Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering Time</generic>
-					<standard>Bering Standard Time</standard>
-					<daylight>Bering Daylight Time</daylight>
-				</long>
-				<short>
-					<standard>BST Bering</standard>
-					<daylight>BDT Bering</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo Time</standard>
-					<daylight>Borneo Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brasilia Time</standard>
-					<daylight>Brasilia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>Chamorro Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Chile Time</standard>
-					<daylight>Chile Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Ora Standard Cina</standard>
-					<daylight>Ora Legale Cina</daylight>
-				</long>
-				<short>
-					<standard>CST (Cina)</standard>
-					<daylight>CDT (Cina)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Choibalsan Time</standard>
-					<daylight>Choibalsan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dacca Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dushanbe Time</standard>
-					<daylight>Dushanbe Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Dutch Guiana Time</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>East Timor Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ecuador Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ora Standard Europa Centrale</standard>
-					<daylight>Ora Legale Europa Centrale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Ora Standard Europa Orientale</standard>
-					<daylight>Ora Legale Europa Orientale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Western European Time</standard>
-					<daylight>Western European Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze Time</standard>
-					<daylight>Frunze Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagos Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Georgia Time</standard>
-					<daylight>Georgia Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich Mean Time</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Central Greenland Time</standard>
-					<daylight>Central Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>East Greenland Time</standard>
-					<daylight>East Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>West Greenland Time</standard>
-					<daylight>West Greenland Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guam Standard Time</standard>
-				</long>
-				<short>
-					<standard>GST Guam</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Gulf Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii">
-				<long>
-					<generic>Hawaii Time</generic>
-					<standard>Ora Standard Hawaii</standard>
-					<daylight>Ora Legale Hawaii</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<generic>Hawaii-Aleutian Time</generic>
-					<standard>Hawaii-Aleutian Standard Time</standard>
-					<daylight>Hawaii-Aleutian Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>India Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Central Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Eastern Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Western Indonesia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Ora Standard Israele</standard>
-					<daylight>Ora Legale Israele</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Ora Standard Giappone</standard>
-					<daylight>Ora Legale Giappone</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karachi Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kashgar Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<standard>East Kazakhstan Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<standard>West Kazakhstan Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilorda Time</standard>
-					<daylight>Kizilorda Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Korean Time</generic>
-					<standard>Korean Standard Time</standard>
-					<daylight>Korean Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuybyshev Time</standard>
-					<daylight>Kuybyshev Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajalein Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kyrgystan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lanka Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howe Time</generic>
-					<standard>Lord Howe Standard Time</standard>
-					<daylight>Lord Howe Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Macau Time</standard>
-					<daylight>Macau Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaya Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Malaysia Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Marshall Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulan Bator Time</standard>
-					<daylight>Ulan Bator Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>New Zealand Time</generic>
-					<standard>New Zealand Standard Time</standard>
-					<daylight>New Zealand Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Newfoundland Time</generic>
-					<standard>Newfoundland Standard Time</standard>
-					<daylight>Newfoundland Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>North Mariana Islands Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistan Time</standard>
-					<daylight>Pakistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre and Miquelon Time</generic>
-					<standard>Pierre and Miquelon Standard Time</standard>
-					<daylight>Pierre and Miquelon Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Qyzylorda Time</standard>
-					<daylight>Qyzylorda Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara Time</standard>
-					<daylight>Samara Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Samarkand Time</standard>
-					<daylight>Samarkand Summer Time</daylight>
-				</long>
-				<short>
-					<standard>SAMT Samarkand</standard>
-					<daylight>SAMST Samarkand</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Samoa Standard Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Shevchenko Time</standard>
-					<daylight>Shevchenko Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Suriname Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk Time</standard>
-					<daylight>Sverdlovsk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tajikistan Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Tashkent Time</standard>
-					<daylight>Tashkent Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisi Time</standard>
-					<daylight>Tbilisi Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turkey Time</standard>
-					<daylight>Turkey Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Turkmenistan Time</standard>
-					<daylight>Turkmenistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Ural'sk Time</standard>
-					<daylight>Ural'sk Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumqi Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Uzbekistan Time</standard>
-					<daylight>Uzbekistan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Yekaterinburg Time</standard>
-					<daylight>Yekaterinburg Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Yerevan Time</standard>
-					<daylight>Yerevan Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon Time</generic>
-					<standard>Yukon Standard Time</standard>
-					<daylight>Yukon Daylight Time</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Peseta Andorrana</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Dirham degli Emirati Arabi Uniti</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afgani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afgani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek Albanese</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram Armeno</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Fiorino delle Antille Olandesi</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Kwanza Angolano</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Kwanza Angolano (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Nuovo Kwanza Angolano (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Kwanza Reajustado Angolano (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Austral Argentino</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Peso Argentino (vecchio Cod.)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso Argentino</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Scellino Austriaco</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dollaro Australiano</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Fiorino di Aruba</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Manat Azero (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat azero</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Dinar Bosnia-Herzegovina</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marco Conv. Bosnia-Erzegovina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Dollaro di Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka Bangladese</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Franco Belga (convertibile)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Franco Belga</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Franco Belga (finanziario)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lev Bulgaro</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Nuovo Lev Bulgaro</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Dinaro del Bahraini</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Franco del Burundi</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Dollaro delle Bermuda</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dollaro del Brunei</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Peso Boliviano</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Mvdol Boliviano</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Cruzeiro Novo Brasiliano (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Cruzado Brasiliano</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Cruzeiro Brasiliano (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real Brasiliano</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Cruzado Novo Brasiliano</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Cruzeiro Brasiliano</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Dollaro delle Bahamas</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum Butanese</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Kyat Birmano</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula del Botswana</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Nuovo Rublo Bielorussia (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rublo Bielorussia</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Dollaro Belize</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dollaro Canadese</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Franco Congolese</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franco Svizzero</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento Chilene</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso Cileno</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Renmimbi Cinese</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso Colombiano</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colón Costaricano</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>antico dinaro serbo</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Corona forte cecoslovacca</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso Cubano</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Escudo del Capo Verde</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Sterlina Cipriota</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Corona Ceca</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Ostmark della Germania Orientale</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marco Tedesco</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Franco Gibutiano</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Corona Danese</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso Dominicano</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dinaro Algerino</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre dell’Ecuador</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidad de Valor Constante (UVC) dell’Ecuador</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Corona dell’Estonia</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Sterlina Egiziana</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa Eritreo</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>peseta spagnola account</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>peseta spagnola account convertibile</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Peseta Spagnola</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr Etiopico</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Markka Finlandese</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dollaro delle Figi</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Sterlina delle Falkland</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franco Francese</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Sterlina Inglese</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Kupon Larit Georgiano</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari Georgiano</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi del Ghana</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Cedi ghanese</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Sterlina di Gibilterra</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi del Gambia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franco della Guinea</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Syli della Guinea</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele della Guinea Equatoriale</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Dracma Greca</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal Guatemalteco</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Escudo della Guinea portoghese</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Peso della Guinea-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Dollaro della Guyana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Dollaro di Hong Kong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira Hoduregno</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Dinaro Croato</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna Croata</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde Haitiano</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Fiorino Ungherese</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupia Indonesiana</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Sterlina irlandese</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Sterlina Israeliana</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Nuovo sheqel israeliano</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupia Indiana</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dinaro Iracheno</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial Iraniano</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Corona Islandese</displayName>
-			</currency>
-			<currency type="ITL">
-				<pattern>¤ #,##0;-¤ #,##0</pattern>
-				<displayName>Lira Italiana</displayName>
-				<decimal>,</decimal>
-				<group>.</group>
-			</currency>
-			<currency type="JMD">
-				<displayName>Dollaro Giamaicano</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dinaro Giordano</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yen Giapponese</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Scellino Keniota</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som Kirghiso</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel Cambogiano</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Franco Comoriano</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Won Nordcoreano</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won Sudcoreano</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dinaro Kuwaitiano</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dollaro delle Isole Cayman</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge Kazaco</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip Laotiano</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Sterlina Libanese</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Rupia di Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Dollaro Liberiano</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti del Lesotho</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lita Lituana</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Talonas Lituani</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>franco convertibile del Lussemburgo</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Franco del Lussemburgo</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>franco finanziario del Lussemburgo</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lat Lettone</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Rublo Lettone</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Dinaro Libico</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirham Marocchino</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Franco Marocchino</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Leu Moldavo</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Ariary Malgascio</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Franco Malgascio</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Dinaro Macedone</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Franco di Mali</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat di Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik Mongolo</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca di Macao</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya della Mauritania</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira Maltese</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Sterlina Maltese</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Rupia Mauriziana</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rufiyaa delle Maldive</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Kwacha Malawiano</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso Messicano</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso messicano d’argento (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidad de Inversion (UDI) Messicana</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit della Malesia</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Escudo del Mozambico</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Metical del Mozambico</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Dollaro Namibiano</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira Nigeriana</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Cordoba Nicaraguense</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba oro nicaraguense</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Fiorino Olandese</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Corona Norvegese</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Rupia Nepalese</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dollaro Neozelandese</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial Omanita</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa di Panama</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Inti Peruviano</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Sol Nuevo Peruviano</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol Peruviano</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina della Papua Nuova Guinea</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso delle Filippine</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupia del Pakistan</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty Polacco</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloty Polacco (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Escudo Portoghese</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani del Paraguay</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rial del Qatar</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>dollaro della Rhodesia</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Leu della Romania</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>leu rumeno</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinaro serbo</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rublo Russo</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rublo della CSI</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Franco Ruandese</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Ryal Saudita</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Dollaro delle Isole Solomon</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Rupia delle Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Dinaro Sudanese</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sterlina sudanese</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Corona Svedese</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dollaro di Singapore</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Sterlina di Sant’Elena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tallero Sloveno</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Corona Slovacca</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone della Sierra Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Scellino Somalo</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Dollaro surinamese</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Fiorino del Suriname</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra di Sao Tomé e Principe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Rublo Sovietico</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colón Salvadoregno</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Sterlina Siriana</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni dello Swaziland</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht Tailandese</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Rublo del Tajikistan</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Somoni del Tajikistan</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Manat Turkmeno</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Dinaro Tunisino</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga di Tonga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Escudo di Timor</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lira Turca</displayName>
-				<displayName count="one">lira turca</displayName>
-				<displayName count="other">lire turche</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>nuova Lira turca</displayName>
-				<displayName count="one">nuova Lira turca</displayName>
-				<displayName count="other">nuove Lire turche</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Dollaro di Trinidad e Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Nuovo dollaro taiwanese</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Scellino della Tanzania</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hrivna Ucraina</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Karbovanetz Ucraino</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Scellino Ugandese (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Scellino Ugandese</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dollaro Statunitense</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Dollaro Statunitense (Next day)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Dollaro Statunitense (Same day)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Peso uruguaiano in unità indicizzate</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Peso Uruguaiano (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso Uruguayo uruguaiano</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Sum dell’Uzbekistan</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolivar Venezuelano</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar venezuelano forte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong Vietnamita</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu di Vanuatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala della Samoa Occidentale</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Franco CFA BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Argento</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Oro</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Unità composita europea</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Unità monetaria europea</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Unità di acconto europea (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Unità di acconto europea (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Dollaro dei Caraibi Orientali</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Diritti Speciali di Incasso</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franco Oro Francese</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Franco UIC Francese</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Franco CFA BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladio</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Franco CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platino</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>fondi RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>codice di verifica della valuta</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Nessuna valuta</displayName>
-				<displayName count="one">valuta sconosciuta/non valida</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Dinaro dello Yemen</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rial dello Yemen</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Dinaro Forte Yugoslavo</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Dinaro Noviy Yugoslavo</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Dinaro Convertibile Yugoslavo</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Rand Sudafricano (finanziario)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand Sudafricano</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Kwacha dello Zambia</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Nuovo Zaire dello Zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire dello Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Dollaro dello Zimbabwe</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} giorno</unitPattern>
-			<unitPattern count="other">{0} giorni</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ora</unitPattern>
-			<unitPattern count="other">{0} ore</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuto</unitPattern>
-			<unitPattern count="other">{0} minuti</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mese</unitPattern>
-			<unitPattern count="other">{0} mesi</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} secondo</unitPattern>
-			<unitPattern count="other">{0} secondi</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} settimana</unitPattern>
-			<unitPattern count="other">{0} settimane</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} anno</unitPattern>
-			<unitPattern count="other">{0} anni</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>sì:si:s</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/it_CH.xml b/airtime_mvc/library/Zend/Locale/Data/it_CH.xml
deleted file mode 100644
index 9945ed89c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/it_CH.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="it"/>
-		<territory type="CH"/>
-	</identity>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>‹</alternateQuotationStart>
-		<alternateQuotationEnd>›</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm:ss 'h' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>'</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/it_IT.xml b/airtime_mvc/library/Zend/Locale/Data/it_IT.xml
deleted file mode 100644
index a069df137..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/it_IT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="it"/>
-		<territory type="IT"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/iu.xml b/airtime_mvc/library/Zend/Locale/Data/iu.xml
deleted file mode 100644
index 651daf5db..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/iu.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="iu"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="iu">�ᓄᒃᑎ�ᑦ ᑎᑎᕋ�ᓯᖅ</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[�-� � � �-� � � ᑉ ᑎ-ᑑ ᑕ ᑖ ᑦ ᑭ-ᑰ ᑲ ᑳ ᒃ ᒋ-ᒎ � ᒑ ᒡ ᒥ-ᒨ ᒪ ᒫ ᒻ ᓂ-ᓅ ᓇ ᓈ � ᓕ-ᓘ ᓚ ᓛ ᓪ ᓯ-ᓲ ᓴ ᓵ ᔅ ᔨ-ᔫ ᔭ ᔮ ᔾ ᕆ-ᕉ ᕋ ᕌ � ᕕ-ᕚ � ᕿ-ᖃ ᖅ � ᖑ-ᖕ ᙱ-ᙶ ᖖ ᖠ-ᖦ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ᔭ�ᓄ�ᓕ</month>
-							<month type="2">ᕕ�ᕗ�ᓕ</month>
-							<month type="3">ᒫᑦᓯ</month>
-							<month type="4">��ᑉ�ᓗ</month>
-							<month type="5">ᒪ�</month>
-							<month type="6">ᔫᓂ</month>
-							<month type="7">ᔪᓚ�</month>
-							<month type="8">��ᒡ�ᓯ</month>
-							<month type="9">ᓰᑦ��ᕙ</month>
-							<month type="10">�ᑦᑑ�ᕙ</month>
-							<month type="11">ᓅᕙ��ᕙ</month>
-							<month type="12">�ᓰ�ᕙ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ᔭ�ᓄ�ᓕ</month>
-							<month type="2">ᕕ�ᕗ�ᓕ</month>
-							<month type="3">ᒫᑦᓯ</month>
-							<month type="4">��ᑉ�ᓗ</month>
-							<month type="5">ᒪ�</month>
-							<month type="6">ᔫᓂ</month>
-							<month type="7">ᔪᓚ�</month>
-							<month type="8">��ᒡ�ᓯ</month>
-							<month type="9">ᓰᑦ��ᕙ</month>
-							<month type="10">�ᑦᑑ�ᕙ</month>
-							<month type="11">ᓅᕙ��ᕙ</month>
-							<month type="12">�ᓰ�ᕙ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ᓈᑦᓰᖑᔭ</day>
-							<day type="mon">ᓇᒡ�ᔾᔭ�</day>
-							<day type="tue">ᓇᒡ�ᔾᔭ�ᓕᖅᑭ</day>
-							<day type="wed">�ᖓᑦᓯᖅ</day>
-							<day type="thu">ᓯᑕᒻᒥᖅ</day>
-							<day type="fri">ᑕᓪᓕ�ᒥᖅ</day>
-							<day type="sat">ᓈᑦᓰᖑᔭᓕᖅᕿ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ᓈᑦᓰᖑᔭ</day>
-							<day type="mon">ᓇᒡ�ᔾᔭ�</day>
-							<day type="tue">ᓇᒡ�ᔾᔭ�ᓕᖅᑭ</day>
-							<day type="wed">�ᖓᑦᓯᖅ</day>
-							<day type="thu">ᓯᑕᒻᒥᖅ</day>
-							<day type="fri">ᑕᓪᓕ�ᒥᖅ</day>
-							<day type="sat">ᓈᑦᓰᖑᔭᓕᖅᕿ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/iw.xml b/airtime_mvc/library/Zend/Locale/Data/iw.xml
deleted file mode 100644
index e166b199d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/iw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="iw"/>
-	</identity>
-	<alias source="he" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ja.xml b/airtime_mvc/library/Zend/Locale/Data/ja.xml
deleted file mode 100644
index afc24af4f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ja.xml
+++ /dev/null
@@ -1,3798 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.173 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ja"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0}({1})</localePattern>
-			<localeSeparator>，</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">アファル語</language>
-			<language type="ab">アブ�ズ語</language>
-			<language type="ace">ア�ェー語</language>
-			<language type="ach">ア�ョリ語</language>
-			<language type="ada">アダングメ語</language>
-			<language type="ady">アディゲ語</language>
-			<language type="ae">アヴェスタ語</language>
-			<language type="af">アフリカーンス語</language>
-			<language type="afa">セム・�ム諸語</language>
-			<language type="afh">アフリヒリ語</language>
-			<language type="ain">アイヌ語</language>
-			<language type="ak">アカン語</language>
-			<language type="akk">アッカド語</language>
-			<language type="ale">アレウト語</language>
-			<language type="alg">アルゴンキアン語�</language>
-			<language type="alt">�アルタイ語</language>
-			<language type="am">アム�ラ語</language>
-			<language type="an">アラゴン語</language>
-			<language type="ang">�代英語</language>
-			<language type="anp">アンギカ語</language>
-			<language type="apa">アパッ�語�</language>
-			<language type="ar">アラビア語</language>
-			<language type="arc">アラム語</language>
-			<language type="arn">アラウカン語</language>
-			<language type="arp">アラパホー語</language>
-			<language type="art">人工諸語</language>
-			<language type="arw">アラワク語</language>
-			<language type="as">アッサム語</language>
-			<language type="ast">アストゥリアス語</language>
-			<language type="ath">アサパスカン語�</language>
-			<language type="aus">オーストラリア語�</language>
-			<language type="av">アヴァル語</language>
-			<language type="awa">アワディー語</language>
-			<language type="ay">アイマラ語</language>
-			<language type="az">アゼル�イジャン語</language>
-			<language type="ba">�シキール語</language>
-			<language type="bad">�ンダ語</language>
-			<language type="bai">�ミレケ語�</language>
-			<language type="bal">�ルー�ー語</language>
-			<language type="ban">�リ語</language>
-			<language type="bas">�サ語</language>
-			<language type="bat">�ルト諸語</language>
-			<language type="be">ベラルーシ語</language>
-			<language type="bej">ベジャ語</language>
-			<language type="bem">ベン�語</language>
-			<language type="ber">ベルベル諸語</language>
-			<language type="bg">ブルガリア語</language>
-			<language type="bh">ビ�ール語</language>
-			<language type="bho">ボージプリー語</language>
-			<language type="bi">ビスラマ語</language>
-			<language type="bik">ビコル語</language>
-			<language type="bin">ビニ語</language>
-			<language type="bla">シクシカ語</language>
-			<language type="bm">�ン�ラ語</language>
-			<language type="bn">ベンガル語</language>
-			<language type="bnt">�ントゥ諸語</language>
-			<language type="bo">�ベット語</language>
-			<language type="br">ブルトン語</language>
-			<language type="bra">ブラジ語</language>
-			<language type="bs">ボスニア語</language>
-			<language type="btk">�タク語</language>
-			<language type="bua">ブリヤート語</language>
-			<language type="bug">ブギ語</language>
-			<language type="byn">ビリン語</language>
-			<language type="ca">カタロニア語</language>
-			<language type="cad">カドー語</language>
-			<language type="cai">中米インディアン諸語</language>
-			<language type="car">カリブ語</language>
-			<language type="cau">コーカサス諸語</language>
-			<language type="cch">�ャワイ語</language>
-			<language type="ce">�ェ�ェン語</language>
-			<language type="ceb">セブアノ語</language>
-			<language type="cel">ケルト諸語</language>
-			<language type="ch">�ャモロ語</language>
-			<language type="chb">�ブ�ャ語</language>
-			<language type="chg">�ャガタイ語</language>
-			<language type="chk">�ューク語</language>
-			<language type="chm">マリ語</language>
-			<language type="chn">ビー�・ラ・マー 等</language>
-			<language type="cho">�ョクトー語</language>
-			<language type="chp">�ペワイアン語</language>
-			<language type="chr">�ェロキー語</language>
-			<language type="chy">シャイアン語</language>
-			<language type="cmc">�ャム語�</language>
-			<language type="co">コルシカ語</language>
-			<language type="cop">コプト語</language>
-			<language type="cpe">英語�基盤�混�語・混�語</language>
-			<language type="cpf">フランス語�基盤�混�語・混�語</language>
-			<language type="cpp">�ルトガル語�基盤�混�語・混�語</language>
-			<language type="cr">クリー語</language>
-			<language type="crh">クリミア・タタール語</language>
-			<language type="crp">��他�混�語・混�語</language>
-			<language type="cs">�ェコ語</language>
-			<language type="csb">カシューブ語</language>
-			<language type="cu">教会スラブ語</language>
-			<language type="cus">クシュ諸語</language>
-			<language type="cv">�ュヴァシュ語</language>
-			<language type="cy">ウェールズ語</language>
-			<language type="da">デンマーク語</language>
-			<language type="dak">ダコタ語</language>
-			<language type="dar">ダルガン語</language>
-			<language type="day">ダヤク語</language>
-			<language type="de">ドイツ語</language>
-			<language type="de_AT">ドイツ語（オーストリア）</language>
-			<language type="de_CH">正統ドイツ語（スイス）</language>
-			<language type="del">デラウェア語</language>
-			<language type="den">スレイビー語</language>
-			<language type="dgr">ドグリブ語</language>
-			<language type="din">ディンカ語</language>
-			<language type="doi">ドグリ語</language>
-			<language type="dra">ドラヴィダ諸語</language>
-			<language type="dsb">低ソルビア語</language>
-			<language type="dua">ドゥアラ語</language>
-			<language type="dum">中世オランダ語</language>
-			<language type="dv">ディベヒ語</language>
-			<language type="dyu">デゥウラ語</language>
-			<language type="dz">ゾンカ語</language>
-			<language type="ee">エウェ語</language>
-			<language type="efi">エフィック語</language>
-			<language type="egy">�代エジプト語</language>
-			<language type="eka">エカジュク語</language>
-			<language type="el">ギリシャ語</language>
-			<language type="elx">エラム語</language>
-			<language type="en">英語</language>
-			<language type="en_CA">カナダ英語</language>
-			<language type="en_GB">イギリス英語</language>
-			<language type="en_US">アメリカ英語</language>
-			<language type="enm">中世英語</language>
-			<language type="eo">エスペラント語</language>
-			<language type="es">スペイン語</language>
-			<language type="es_419">スペイン語（ラテンアメリカ）</language>
-			<language type="es_ES">スペイン語（イベリア�島）</language>
-			<language type="et">エストニア語</language>
-			<language type="eu">�スク語</language>
-			<language type="ewo">エウォンド語</language>
-			<language type="fa">ペルシア語</language>
-			<language type="fan">ファング語</language>
-			<language type="fat">ファンティー語</language>
-			<language type="ff">フラニ語</language>
-			<language type="fi">フィンランド語</language>
-			<language type="fil">フィリピノ語</language>
-			<language type="fiu">フィン・ウゴル諸語</language>
-			<language type="fj">フィジー語</language>
-			<language type="fo">フェロー語</language>
-			<language type="fon">フォン語</language>
-			<language type="fr">フランス語</language>
-			<language type="fr_CA">フランス語（カナダ）</language>
-			<language type="fr_CH">フランス語（スイス）</language>
-			<language type="frm">中期フランス語</language>
-			<language type="fro">�フランス語</language>
-			<language type="frs">�フリジア語</language>
-			<language type="fur">フリウリ語</language>
-			<language type="fy">フリジア語</language>
-			<language type="ga">アイルランド語</language>
-			<language type="gaa">ガ語</language>
-			<language type="gay">ガヨ語</language>
-			<language type="gba">�ヤ語</language>
-			<language type="gd">スコットランド・ゲール語</language>
-			<language type="gem">ゲルマン諸語</language>
-			<language type="gez">ゲエズ語</language>
-			<language type="gil">キリ�ス語</language>
-			<language type="gl">ガリシア語</language>
-			<language type="gmh">中高ドイツ語</language>
-			<language type="gn">グアラニー語</language>
-			<language type="goh">�高ドイツ語</language>
-			<language type="gon">ゴーンディー語</language>
-			<language type="gor">ゴロンタロ語</language>
-			<language type="got">ゴート語</language>
-			<language type="grb">グレボ語</language>
-			<language type="grc">�代ギリシャ語</language>
-			<language type="gsw">スイスドイツ語（スイス）</language>
-			<language type="gu">グジャラート語</language>
-			<language type="gv">マン島語</language>
-			<language type="gwi">グウィッ�ン語</language>
-			<language type="ha">�ウサ語</language>
-			<language type="hai">�イダ語</language>
-			<language type="haw">�ワイ語</language>
-			<language type="he">ヘブライ語</language>
-			<language type="hi">ヒンディー語</language>
-			<language type="hil">ヒリガイノン語</language>
-			<language type="him">ヒマ�ャル語</language>
-			<language type="hit">ヒッタイト語</language>
-			<language type="hmn">フモン語</language>
-			<language type="ho">ヒリモトゥ語</language>
-			<language type="hr">クロア�ア語</language>
-			<language type="hsb">上ソルビア語</language>
-			<language type="ht">�イ�語</language>
-			<language type="hu">�ンガリー語</language>
-			<language type="hup">アタパスカ語</language>
-			<language type="hy">アルメニア語</language>
-			<language type="hz">ヘレロ語</language>
-			<language type="ia">インターリングア語</language>
-			<language type="iba">イ�ン語</language>
-			<language type="id">インド�シア語</language>
-			<language type="ie">インターリング語</language>
-			<language type="ig">イボ語</language>
-			<language type="ii">四�イ語</language>
-			<language type="ijo">イジョー語</language>
-			<language type="ik">イヌピアック語</language>
-			<language type="ilo">イロカノ語</language>
-			<language type="inc">インド諸語</language>
-			<language type="ine">�欧諸語</language>
-			<language type="inh">イングシ語</language>
-			<language type="io">イド語</language>
-			<language type="ira">イラン語</language>
-			<language type="iro">イロコイ語�</language>
-			<language type="is">アイスランド語</language>
-			<language type="it">イタリア語</language>
-			<language type="iu">イヌクウティトット語</language>
-			<language type="ja">日本語</language>
-			<language type="jbo">ロジ�ン語</language>
-			<language type="jpr">ユダヤ・ペルシア語</language>
-			<language type="jrb">ユダヤ・アラビア語</language>
-			<language type="jv">ジャワ語</language>
-			<language type="ka">グルジア語</language>
-			<language type="kaa">カラ・カルパク語</language>
-			<language type="kab">カビル語</language>
-			<language type="kac">カ�ン語</language>
-			<language type="kaj">カジェ語</language>
-			<language type="kam">カン�語</language>
-			<language type="kar">カレン語</language>
-			<language type="kaw">カウィ語</language>
-			<language type="kbd">カ�ルド語</language>
-			<language type="kcg">カタブ語</language>
-			<language type="kfo">コロ語</language>
-			<language type="kg">コンゴ語</language>
-			<language type="kha">カシ語</language>
-			<language type="khi">コイサン諸語</language>
-			<language type="kho">コータン語</language>
-			<language type="ki">キクユ語</language>
-			<language type="kj">クアニャマ語</language>
-			<language type="kk">カザフ語</language>
-			<language type="kl">グリーンランド語</language>
-			<language type="km">クメール語</language>
-			<language type="kmb">キンブンドゥ語</language>
-			<language type="kn">カンナダ語</language>
-			<language type="ko">韓国語</language>
-			<language type="kok">コンカニ語</language>
-			<language type="kos">コシャエ語</language>
-			<language type="kpe">クペレ語</language>
-			<language type="kr">カヌリ語</language>
-			<language type="krc">カラ�ャイ語</language>
-			<language type="krl">カレリア語</language>
-			<language type="kro">クルー語</language>
-			<language type="kru">クルク語</language>
-			<language type="ks">カシミール語</language>
-			<language type="ku">クルド語</language>
-			<language type="kum">クムク語</language>
-			<language type="kut">クテナイ語</language>
-			<language type="kv">コミ語</language>
-			<language type="kw">コーンウォール語</language>
-			<language type="ky">キルギス語</language>
-			<language type="la">ラテン語</language>
-			<language type="lad">ラジノ語</language>
-			<language type="lah">ラフンダー語</language>
-			<language type="lam">ラン�語</language>
-			<language type="lb">ルクセンブルク語</language>
-			<language type="lez">レズギ語</language>
-			<language type="lg">ガンダ語</language>
-			<language type="li">リンブルフ語</language>
-			<language type="ln">リンガラ語</language>
-			<language type="lo">ラオ語</language>
-			<language type="lol">モンゴ語</language>
-			<language type="loz">ロズィ語</language>
-			<language type="lt">リトアニア語</language>
-			<language type="lu">ル�・カタンガ語</language>
-			<language type="lua">ル�・ルルア語</language>
-			<language type="lui">ルイセーニョ語</language>
-			<language type="lun">ルンダ語</language>
-			<language type="luo">ルオ語</language>
-			<language type="lus">ルシャイ語</language>
-			<language type="lv">ラトビア語</language>
-			<language type="mad">マドゥラ語</language>
-			<language type="mag">マガヒー語</language>
-			<language type="mai">マイティリー語</language>
-			<language type="mak">マカッサル語</language>
-			<language type="man">マンディンゴ語</language>
-			<language type="map">オーストロ�シア諸語</language>
-			<language type="mas">マサイ語</language>
-			<language type="mdf">モクシャ語</language>
-			<language type="mdr">マンダル語</language>
-			<language type="men">メンデ語</language>
-			<language type="mg">マダガスカル語</language>
-			<language type="mga">中期アイルランド語</language>
-			<language type="mh">マーシャル語</language>
-			<language type="mi">マオリ語</language>
-			<language type="mic">ミクマク語</language>
-			<language type="min">ミナンカ�ウ語</language>
-			<language type="mis">��他�言語</language>
-			<language type="mk">マケドニア語</language>
-			<language type="mkh">モン・クメール諸語</language>
-			<language type="ml">マラヤーラム語</language>
-			<language type="mn">モンゴル語</language>
-			<language type="mnc">満州語</language>
-			<language type="mni">マニプル語</language>
-			<language type="mno">マノボ語�</language>
-			<language type="mo">モルダビア語</language>
-			<language type="moh">モーホーク語</language>
-			<language type="mos">モシ語</language>
-			<language type="mr">マラーティー語</language>
-			<language type="ms">マレー語</language>
-			<language type="mt">マルタ語</language>
-			<language type="mul">複数言語</language>
-			<language type="mun">ムンダ語�</language>
-			<language type="mus">クリーク語</language>
-			<language type="mwl">ミランダ語</language>
-			<language type="mwr">マールワーリー語</language>
-			<language type="my">ビルマ語</language>
-			<language type="myn">マヤ語�</language>
-			<language type="myv">エルジャ語</language>
-			<language type="na">ナウル語</language>
-			<language type="nah">ナワトル語</language>
-			<language type="nai">北米インディアン諸語</language>
-			<language type="nap">ナ�リ語</language>
-			<language type="nb">ノルウェー語 (ブークモール)</language>
-			<language type="nd">北ンデベレ語</language>
-			<language type="nds">低地ドイツ語�低地サクソン語</language>
-			<language type="ne">�パール語</language>
-			<language type="new">�ワール語</language>
-			<language type="ng">ンドンガ語</language>
-			<language type="nia">ニアス語</language>
-			<language type="nic">ニジェール・コルドファン諸語</language>
-			<language type="niu">ニウーエイ語</language>
-			<language type="nl">オランダ語</language>
-			<language type="nl_BE">フレミッシュ語</language>
-			<language type="nn">ノルウェー語 (ニーノシュク)</language>
-			<language type="no">ノルウェー語</language>
-			<language type="nog">ノガイ語</language>
-			<language type="non">�ノルド語</language>
-			<language type="nqo">ンコ語</language>
-			<language type="nr">�ンデベレ語</language>
-			<language type="nso">北部ソト語</language>
-			<language type="nub">ヌビア語�</language>
-			<language type="nv">ナ�ホ語</language>
-			<language type="nwc">�典�ワール語</language>
-			<language type="ny">ニャンジャ語���ェワ語��ェワ語</language>
-			<language type="nym">ニャムウェジ語</language>
-			<language type="nyn">ニャンコレ語</language>
-			<language type="nyo">ニョロ語</language>
-			<language type="nzi">ンゼマ語</language>
-			<language type="oc">オック語</language>
-			<language type="oj">オブジワ語</language>
-			<language type="om">オロモ語</language>
-			<language type="or">オリヤー語</language>
-			<language type="os">オセト語</language>
-			<language type="osa">オセージ語</language>
-			<language type="ota">オスマントルコ語</language>
-			<language type="oto">オトミ語�</language>
-			<language type="pa">パンジャブ語</language>
-			<language type="paa">パプア諸語</language>
-			<language type="pag">パンガシナン語</language>
-			<language type="pal">パフラヴィ語</language>
-			<language type="pam">パンパンガ語</language>
-			<language type="pap">パピアメント語</language>
-			<language type="pau">パラオ語</language>
-			<language type="peo">�代ペルシア語</language>
-			<language type="phi">フィリピン諸語</language>
-			<language type="phn">フェニキア語</language>
-			<language type="pi">パーリ語</language>
-			<language type="pl">�ーランド語</language>
-			<language type="pon">�ンペイ語</language>
-			<language type="pra">プラークリット語�</language>
-			<language type="pro">�期プロ�ンス語</language>
-			<language type="ps">パシュトゥー語</language>
-			<language type="pt">�ルトガル語</language>
-			<language type="pt_BR">�ルトガル語 (ブラジル)</language>
-			<language type="pt_PT">�ルトガル語（イベリア�島）</language>
-			<language type="qu">ケ�ュア語</language>
-			<language type="raj">ラージャスターン語</language>
-			<language type="rap">ラパヌイ語</language>
-			<language type="rar">ラロトガ語</language>
-			<language type="rm">レト・ロマン語</language>
-			<language type="rn">ルンディ語</language>
-			<language type="ro">ルーマニア語</language>
-			<language type="roa">ロマンス諸語</language>
-			<language type="rom">ロマーニー語</language>
-			<language type="root">ルート</language>
-			<language type="ru">ロシア語</language>
-			<language type="rup">アルーマニア語</language>
-			<language type="rw">ルワンダ語</language>
-			<language type="sa">サンスクリット語</language>
-			<language type="sad">サンダウェ語</language>
-			<language type="sah">ヤクート語</language>
-			<language type="sai">�米インディアン諸語</language>
-			<language type="sal">セイリッシュ語�</language>
-			<language type="sam">サマリア・アラム語</language>
-			<language type="sas">ササク語</language>
-			<language type="sat">サンターリー語</language>
-			<language type="sc">サルデーニャ語</language>
-			<language type="scn">シ�リア語</language>
-			<language type="sco">スコットランド語</language>
-			<language type="sd">シンド語</language>
-			<language type="se">北サーミ語</language>
-			<language type="sel">セリクプ語</language>
-			<language type="sem">セム諸語</language>
-			<language type="sg">サンゴ語</language>
-			<language type="sga">�期アイルランド語</language>
-			<language type="sgn">手��言語</language>
-			<language type="sh">セルボ�クロア�ア語</language>
-			<language type="shn">シャン語</language>
-			<language type="si">シン�ラ語</language>
-			<language type="sid">シダモ語</language>
-			<language type="sio">スー語�</language>
-			<language type="sit">シナ・�ベット諸語</language>
-			<language type="sk">スロ�キア語</language>
-			<language type="sl">スロベニア語</language>
-			<language type="sla">スラブ諸語</language>
-			<language type="sm">サモア語</language>
-			<language type="sma">�サーミ語</language>
-			<language type="smi">サーミ諸語</language>
-			<language type="smj">ルレ・サーミ語</language>
-			<language type="smn">イナリ・サーミ語</language>
-			<language type="sms">スコルト・サーミ語</language>
-			<language type="sn">ショナ語</language>
-			<language type="snk">ソニンケ語</language>
-			<language type="so">ソマリ語</language>
-			<language type="sog">ソグド語</language>
-			<language type="son">ソンガイ語</language>
-			<language type="sq">アル�ニア語</language>
-			<language type="sr">セルビア語</language>
-			<language type="srn">スリナム語</language>
-			<language type="srr">セレル語</language>
-			<language type="ss">シスワティ語</language>
-			<language type="ssa">ナイル・サ�ラ諸語</language>
-			<language type="st">�部ソト語</language>
-			<language type="su">スンダ語</language>
-			<language type="suk">スクマ語</language>
-			<language type="sus">スス語</language>
-			<language type="sux">シュメール語</language>
-			<language type="sv">スウェーデン語</language>
-			<language type="sw">スワヒリ語</language>
-			<language type="syr">シリア語</language>
-			<language type="ta">タミール語</language>
-			<language type="tai">タイ諸語</language>
-			<language type="te">テルグ語</language>
-			<language type="tem">テム�語</language>
-			<language type="ter">テレーノ語</language>
-			<language type="tet">テトゥン語</language>
-			<language type="tg">タジク語</language>
-			<language type="th">タイ語</language>
-			<language type="ti">ティグリニア語</language>
-			<language type="tig">ティグレ語</language>
-			<language type="tiv">ティブ語</language>
-			<language type="tk">トルクメン語</language>
-			<language type="tkl">トケラウ語</language>
-			<language type="tl">タガログ語</language>
-			<language type="tlh">クリンゴン語</language>
-			<language type="tli">トリンギット語</language>
-			<language type="tmh">タマシェク語</language>
-			<language type="tn">ツワナ語</language>
-			<language type="to">トンガ語</language>
-			<language type="tog">トンガ語 (ニアサ)</language>
-			<language type="tpi">トク・ピシン語</language>
-			<language type="tr">トルコ語</language>
-			<language type="ts">ツォンガ語</language>
-			<language type="tsi">�ムシュ語</language>
-			<language type="tt">タタール語</language>
-			<language type="tum">トゥンブカ語</language>
-			<language type="tup">トゥピ語�</language>
-			<language type="tut">アルタイ諸語</language>
-			<language type="tvl">ツ�ル語</language>
-			<language type="tw">トウィ語</language>
-			<language type="ty">タヒ�語</language>
-			<language type="tyv">トゥヴァ語</language>
-			<language type="udm">ウドムルト語</language>
-			<language type="ug">ウイグル語</language>
-			<language type="uga">ウガリト語</language>
-			<language type="uk">ウクライナ語</language>
-			<language type="umb">ウンブンドゥ語</language>
-			<language type="und">�確定</language>
-			<language type="ur">ウルドゥー語</language>
-			<language type="uz">ウズベク語</language>
-			<language type="vai">ヴァイ語</language>
-			<language type="ve">ベンダ語</language>
-			<language type="vi">ベトナム語</language>
-			<language type="vo">ボラピュク語</language>
-			<language type="vot">ボート語</language>
-			<language type="wa">ワロン語</language>
-			<language type="wak">ワカシ語�</language>
-			<language type="wal">ワッラモ語</language>
-			<language type="war">ワライ語</language>
-			<language type="was">ワショ語</language>
-			<language type="wen">ソルビア語�</language>
-			<language type="wo">ウォロフ語</language>
-			<language type="xal">カルムイク語</language>
-			<language type="xh">コサ語</language>
-			<language type="yao">ヤオ語</language>
-			<language type="yap">ヤップ語</language>
-			<language type="yi">イディッシュ語</language>
-			<language type="yo">ヨル�語</language>
-			<language type="ypk">ユピック語�</language>
-			<language type="za">�ワン語</language>
-			<language type="zap">ザ�テック語</language>
-			<language type="zen">ゼナガ語</language>
-			<language type="zh">中国語</language>
-			<language type="zh_Hans">簡体中国語</language>
-			<language type="zh_Hant">�体中国語</language>
-			<language type="znd">ザンデ語</language>
-			<language type="zu">ズールー語</language>
-			<language type="zun">ズニ語</language>
-		</languages>
-		<scripts>
-			<script type="Arab">アラビア文字</script>
-			<script type="Armn">アルメニア文字</script>
-			<script type="Bali">�リ文字</script>
-			<script type="Batk">�タク文字</script>
-			<script type="Beng">ベンガル文字</script>
-			<script type="Blis">ブリスシンボル</script>
-			<script type="Bopo">注音字�</script>
-			<script type="Brah">ブラーフミー文字</script>
-			<script type="Brai">ブライユ点字</script>
-			<script type="Bugi">ブギス文字</script>
-			<script type="Buhd">ブヒッド文字</script>
-			<script type="Cans">統�カナダ先�民記�</script>
-			<script type="Cari">カリ文字</script>
-			<script type="Cham">�ャム文字</script>
-			<script type="Cher">�ェロキー文字</script>
-			<script type="Cirt">キアス文字</script>
-			<script type="Copt">コプト文字</script>
-			<script type="Cprt">キプロス文字</script>
-			<script type="Cyrl">キリル文字</script>
-			<script type="Cyrs">キリル文字 (�代教会スラブ語�文字)</script>
-			<script type="Deva">デー�ナーガリー文字</script>
-			<script type="Dsrt">デセレット文字</script>
-			<script type="Egyd">エジプト民衆文字</script>
-			<script type="Egyh">エジプト神官文字</script>
-			<script type="Egyp">エジプト�刻文字</script>
-			<script type="Ethi">エ�オピア文字</script>
-			<script type="Geok">グルジア文字（フツリ）</script>
-			<script type="Geor">グルジア文字</script>
-			<script type="Glag">グラゴール文字</script>
-			<script type="Goth">ゴート文字</script>
-			<script type="Grek">ギリシャ文字</script>
-			<script type="Gujr">グジャラート文字</script>
-			<script type="Guru">グルムキー文字</script>
-			<script type="Hang">�ングル</script>
-			<script type="Hani">漢字</script>
-			<script type="Hano">�ヌノオ文字</script>
-			<script type="Hans">簡体字</script>
-			<script type="Hant">�体字</script>
-			<script type="Hebr">ヘブライ文字</script>
-			<script type="Hira">�ら��</script>
-			<script type="Hmng">パ�ウ・フモン文字</script>
-			<script type="Hrkt">カタカナ��ら��</script>
-			<script type="Hung">�代�ンガリー文字</script>
-			<script type="Inds">インダス文字 (�ラッパ文字)</script>
-			<script type="Ital">�代イタリア�文字</script>
-			<script type="Java">ジャワ文字</script>
-			<script type="Jpan">日本語�文字</script>
-			<script type="Kali">カヤー文字</script>
-			<script type="Kana">カタカナ</script>
-			<script type="Khar">カローシュティー文字</script>
-			<script type="Khmr">クメール文字</script>
-			<script type="Knda">カンナダ文字</script>
-			<script type="Kore">韓国語�文字</script>
-			<script type="Laoo">ラオ文字</script>
-			<script type="Latf">ラテン文字 (ドイツ文字)</script>
-			<script type="Latg">ラテン文字 (ゲール語�文字)</script>
-			<script type="Latn">ラテン文字</script>
-			<script type="Lepc">レプ�ャ文字 (ロン文字)</script>
-			<script type="Limb">リンブ文字</script>
-			<script type="Lina">線文字A</script>
-			<script type="Linb">線文字B</script>
-			<script type="Mand">マンダ文字</script>
-			<script type="Maya">マヤ象形文字</script>
-			<script type="Mero">メロエ文字</script>
-			<script type="Mlym">マラヤーラム文字</script>
-			<script type="Mong">モンゴル文字</script>
-			<script type="Moon">ムーン文字</script>
-			<script type="Mtei">メイテイ文字</script>
-			<script type="Mymr">ミャンマー文字</script>
-			<script type="Nkoo">ンコ文字</script>
-			<script type="Ogam">オガム文字</script>
-			<script type="Olck">オル�キ文字</script>
-			<script type="Orkh">オルホン文字</script>
-			<script type="Orya">オリヤー文字</script>
-			<script type="Osma">オスマニア文字</script>
-			<script type="Perm">�ペルミック文字</script>
-			<script type="Phag">パスパ文字</script>
-			<script type="Phnx">フェニキア文字</script>
-			<script type="Plrd">�ラード音声記�</script>
-			<script type="Qaai">系統</script>
-			<script type="Roro">ロンゴロンゴ文字</script>
-			<script type="Runr">ルーン文字</script>
-			<script type="Sara">サラティ文字</script>
-			<script type="Shaw">ショー文字</script>
-			<script type="Sinh">シン�ラ文字</script>
-			<script type="Sylo">シロティ・ナグリ文字</script>
-			<script type="Syrc">シリア文字</script>
-			<script type="Syre">シリア文字 (エストランゲロ文字)</script>
-			<script type="Syrj">シリア文字 (西方シリア文字)</script>
-			<script type="Syrn">シリア文字 (�方シリア文字)</script>
-			<script type="Tagb">タグ�ンワ文字</script>
-			<script type="Tale">タイレ文字</script>
-			<script type="Talu">新タイ・ルー文字</script>
-			<script type="Taml">タミール文字</script>
-			<script type="Telu">テルグ文字</script>
-			<script type="Teng">テングワール文字</script>
-			<script type="Tfng">ティフナグ文字 (ベルベル文字)</script>
-			<script type="Tglg">タガログ文字</script>
-			<script type="Thaa">ターナ文字</script>
-			<script type="Thai">タイ文字</script>
-			<script type="Tibt">�ベット文字</script>
-			<script type="Ugar">ウガリト文字</script>
-			<script type="Vaii">ヴァイ文字</script>
-			<script type="Visp">視話法</script>
-			<script type="Xpeo">�代ペルシア文字</script>
-			<script type="Xsux">シュメール�アッカド語楔形文字</script>
-			<script type="Yiii">イ文字</script>
-			<script type="Zxxx">�承言語�コード</script>
-			<script type="Zyyy">共通コード</script>
-			<script type="Zzzz">コード化�れ����文字�コード</script>
-		</scripts>
-		<territories>
-			<territory type="001">世界</territory>
-			<territory type="002">アフリカ</territory>
-			<territory type="003">北米</territory>
-			<territory type="005">�アメリカ</territory>
-			<territory type="009">オセアニア</territory>
-			<territory type="011">西アフリカ</territory>
-			<territory type="013">中央アメリカ</territory>
-			<territory type="014">�アフリカ</territory>
-			<territory type="015">北アフリカ</territory>
-			<territory type="017">中部アフリカ</territory>
-			<territory type="018">�部アフリカ</territory>
-			<territory type="019">アメリカ大陸</territory>
-			<territory type="021">北アメリカ</territory>
-			<territory type="029">カリブ海</territory>
-			<territory type="030">�アジア</territory>
-			<territory type="034">�アジア</territory>
-			<territory type="035">��アジア</territory>
-			<territory type="039">�ヨーロッパ</territory>
-			<territory type="053">オーストラリア・ニュージーランド</territory>
-			<territory type="054">メラ�シア</territory>
-			<territory type="057">ミクロ�シア地域</territory>
-			<territory type="061">�リ�シア</territory>
-			<territory type="062">�中央アジア</territory>
-			<territory type="142">アジア</territory>
-			<territory type="143">中央アジア</territory>
-			<territory type="145">西アジア</territory>
-			<territory type="150">ヨーロッパ</territory>
-			<territory type="151">�ヨーロッパ</territory>
-			<territory type="154">北ヨーロッパ</territory>
-			<territory type="155">西ヨーロッパ</territory>
-			<territory type="172">独立国家共�体</territory>
-			<territory type="419">ラテンアメリカ・カリブ地域</territory>
-			<territory type="830">�ャ�ル諸島</territory>
-			<territory type="AD">アンドラ</territory>
-			<territory type="AE">アラブ首長国連邦</territory>
-			<territory type="AF">アフガニスタン</territory>
-			<territory type="AG">アンティグア・�ーブーダ</territory>
-			<territory type="AI">アンギラ</territory>
-			<territory type="AL">アル�ニア</territory>
-			<territory type="AM">アルメニア</territory>
-			<territory type="AN">オランダ領アンティル諸島</territory>
-			<territory type="AO">アンゴラ</territory>
-			<territory type="AQ">�極大陸</territory>
-			<territory type="AR">アルゼン�ン</territory>
-			<territory type="AS">米領サモア</territory>
-			<territory type="AT">オーストリア</territory>
-			<territory type="AU">オーストラリア</territory>
-			<territory type="AW">アル�島</territory>
-			<territory type="AX">オーランド諸島</territory>
-			<territory type="AZ">アゼル�イジャン</territory>
-			<territory type="BA">ボスニア・ヘルツェゴビナ</territory>
-			<territory type="BB">�ル�ドス</territory>
-			<territory type="BD">�ングラデシュ</territory>
-			<territory type="BE">ベルギー</territory>
-			<territory type="BF">ブルキナファソ</territory>
-			<territory type="BG">ブルガリア</territory>
-			<territory type="BH">�ーレーン</territory>
-			<territory type="BI">ブルンジ</territory>
-			<territory type="BJ">ベニン</territory>
-			<territory type="BL">サン・�ルテルミー</territory>
-			<territory type="BM">�ミューダ</territory>
-			<territory type="BN">ブル�イ</territory>
-			<territory type="BO">ボリビア</territory>
-			<territory type="BR">ブラジル</territory>
-			<territory type="BS">��マ</territory>
-			<territory type="BT">ブータン</territory>
-			<territory type="BV">ブーベ島</territory>
-			<territory type="BW">ボツワナ</territory>
-			<territory type="BY">ベラルーシ</territory>
-			<territory type="BZ">ベリーズ</territory>
-			<territory type="CA">カナダ</territory>
-			<territory type="CC">ココス (キーリング) 諸島</territory>
-			<territory type="CD">コンゴ民主共和国 (キンシャサ)</territory>
-			<territory type="CF">中央アフリカ共和国</territory>
-			<territory type="CG">コンゴ共和国 (ブラザビル)</territory>
-			<territory type="CH">スイス</territory>
-			<territory type="CI">コートジボワール</territory>
-			<territory type="CK">クック諸島</territory>
-			<territory type="CL">�リ</territory>
-			<territory type="CM">カメルーン</territory>
-			<territory type="CN">中国</territory>
-			<territory type="CO">コロンビア</territory>
-			<territory type="CR">コスタリカ</territory>
-			<territory type="CS">セルビア・モンテ�グロ</territory>
-			<territory type="CU">キュー�</territory>
-			<territory type="CV">カーボベルデ</territory>
-			<territory type="CX">クリスマス島</territory>
-			<territory type="CY">キプロス</territory>
-			<territory type="CZ">�ェコ共和国</territory>
-			<territory type="DE">ドイツ</territory>
-			<territory type="DJ">ジブ�</territory>
-			<territory type="DK">デンマーク</territory>
-			<territory type="DM">ドミニカ国</territory>
-			<territory type="DO">ドミニカ共和国</territory>
-			<territory type="DZ">アルジェリア</territory>
-			<territory type="EC">エクアドル</territory>
-			<territory type="EE">エストニア</territory>
-			<territory type="EG">エジプト</territory>
-			<territory type="EH">西サ�ラ</territory>
-			<territory type="ER">エリトリア</territory>
-			<territory type="ES">スペイン</territory>
-			<territory type="ET">エ�オピア</territory>
-			<territory type="FI">フィンランド</territory>
-			<territory type="FJ">フィジー</territory>
-			<territory type="FK">フォークランド諸島</territory>
-			<territory type="FM">ミクロ�シア</territory>
-			<territory type="FO">フェロー諸島</territory>
-			<territory type="FR">フランス</territory>
-			<territory type="GA">ガボン</territory>
-			<territory type="GB">イギリス</territory>
-			<territory type="GD">グレナダ</territory>
-			<territory type="GE">グルジア</territory>
-			<territory type="GF">�領ギアナ</territory>
-			<territory type="GG">ガーンジー</territory>
-			<territory type="GH">ガーナ</territory>
-			<territory type="GI">ジブラルタル</territory>
-			<territory type="GL">グリーンランド</territory>
-			<territory type="GM">ガンビア</territory>
-			<territory type="GN">ギニア</territory>
-			<territory type="GP">グアドループ</territory>
-			<territory type="GQ">赤�ギニア</territory>
-			<territory type="GR">ギリシャ</territory>
-			<territory type="GS">�ジョージア島・�サンドイッ�諸島</territory>
-			<territory type="GT">グアテマラ</territory>
-			<territory type="GU">グアム</territory>
-			<territory type="GW">ギニアビサウ</territory>
-			<territory type="GY">ガイアナ</territory>
-			<territory type="HK">中�人民共和国香港特別行政区</territory>
-			<territory type="HM">�ード島・マクドナルド諸島</territory>
-			<territory type="HN">ホンジュラス</territory>
-			<territory type="HR">クロア�ア</territory>
-			<territory type="HT">�イ�</territory>
-			<territory type="HU">�ンガリー</territory>
-			<territory type="ID">インド�シア</territory>
-			<territory type="IE">アイルランド</territory>
-			<territory type="IL">イスラエル</territory>
-			<territory type="IM">マン島</territory>
-			<territory type="IN">インド</territory>
-			<territory type="IO">英領インド洋�民地</territory>
-			<territory type="IQ">イラク</territory>
-			<territory type="IR">イラン</territory>
-			<territory type="IS">アイスランド</territory>
-			<territory type="IT">イタリア</territory>
-			<territory type="JE">ジャージー</territory>
-			<territory type="JM">ジャマイカ</territory>
-			<territory type="JO">ヨルダン</territory>
-			<territory type="JP">日本</territory>
-			<territory type="KE">ケニア</territory>
-			<territory type="KG">キルギスタン</territory>
-			<territory type="KH">カンボジア</territory>
-			<territory type="KI">キリ�ス</territory>
-			<territory type="KM">コモロ</territory>
-			<territory type="KN">セントクリストファー・�イビス</territory>
-			<territory type="KP">�鮮民主主義人民共和国</territory>
-			<territory type="KR">大韓民国</territory>
-			<territory type="KW">クウェート</territory>
-			<territory type="KY">ケイマン諸島</territory>
-			<territory type="KZ">カザフスタン</territory>
-			<territory type="LA">ラオス</territory>
-			<territory type="LB">レ�ノン</territory>
-			<territory type="LC">セントルシア</territory>
-			<territory type="LI">リヒテンシュタイン</territory>
-			<territory type="LK">スリランカ</territory>
-			<territory type="LR">リベリア</territory>
-			<territory type="LS">レソト</territory>
-			<territory type="LT">リトアニア</territory>
-			<territory type="LU">ルクセンブルグ</territory>
-			<territory type="LV">ラトビア</territory>
-			<territory type="LY">リビア</territory>
-			<territory type="MA">モロッコ</territory>
-			<territory type="MC">モナコ</territory>
-			<territory type="MD">モルド�</territory>
-			<territory type="ME">モンテ�グロ</territory>
-			<territory type="MF">セント・マー�ン</territory>
-			<territory type="MG">マダガスカル</territory>
-			<territory type="MH">マーシャル諸島共和国</territory>
-			<territory type="MK">マケドニア</territory>
-			<territory type="ML">マリ</territory>
-			<territory type="MM">ミャンマー</territory>
-			<territory type="MN">モンゴル</territory>
-			<territory type="MO">中�人民共和国マカオ特別行政区</territory>
-			<territory type="MP">北マリアナ諸島</territory>
-			<territory type="MQ">マルティニーク島</territory>
-			<territory type="MR">モーリタニア</territory>
-			<territory type="MS">モントセラト島</territory>
-			<territory type="MT">マルタ</territory>
-			<territory type="MU">モーリシャス</territory>
-			<territory type="MV">モルジブ</territory>
-			<territory type="MW">マラウィ</territory>
-			<territory type="MX">メキシコ</territory>
-			<territory type="MY">マレーシア</territory>
-			<territory type="MZ">モザンビーク</territory>
-			<territory type="NA">ナミビア</territory>
-			<territory type="NC">ニューカレドニア</territory>
-			<territory type="NE">ニジェール</territory>
-			<territory type="NF">ノーフォーク島</territory>
-			<territory type="NG">ナイジェリア</territory>
-			<territory type="NI">ニカラグア</territory>
-			<territory type="NL">オランダ</territory>
-			<territory type="NO">ノルウェー</territory>
-			<territory type="NP">�パール</territory>
-			<territory type="NR">ナウル</territory>
-			<territory type="NU">ニウエ島</territory>
-			<territory type="NZ">ニュージーランド</territory>
-			<territory type="OM">オマーン</territory>
-			<territory type="PA">パナマ</territory>
-			<territory type="PE">ペルー</territory>
-			<territory type="PF">�領�リ�シア</territory>
-			<territory type="PG">パプアニューギニア</territory>
-			<territory type="PH">フィリピン</territory>
-			<territory type="PK">パキスタン</territory>
-			<territory type="PL">�ーランド</territory>
-			<territory type="PM">サンピエール島・ミクロン島</territory>
-			<territory type="PN">ピトケアン島</territory>
-			<territory type="PR">プエルトリコ</territory>
-			<territory type="PS">パレス�ナ領土</territory>
-			<territory type="PT">�ルトガル</territory>
-			<territory type="PW">パラオ</territory>
-			<territory type="PY">パラグアイ</territory>
-			<territory type="QA">カタール</territory>
-			<territory type="QO">��他�オセアニア</territory>
-			<territory type="QU">欧州連�</territory>
-			<territory type="RE">レユニオン島</territory>
-			<territory type="RO">ルーマニア</territory>
-			<territory type="RS">セルビア</territory>
-			<territory type="RU">ロシア</territory>
-			<territory type="RW">ルワンダ</territory>
-			<territory type="SA">サウジアラビア</territory>
-			<territory type="SB">ソロモン諸島</territory>
-			<territory type="SC">セーシェル</territory>
-			<territory type="SD">スーダン</territory>
-			<territory type="SE">スウェーデン</territory>
-			<territory type="SG">シンガ�ール</territory>
-			<territory type="SH">セントヘレナ</territory>
-			<territory type="SI">スロベニア</territory>
-			<territory type="SJ">ス�ール�ル諸島・ヤンマイエン島</territory>
-			<territory type="SK">スロ�キア</territory>
-			<territory type="SL">シエラレオ�</territory>
-			<territory type="SM">サンマリノ</territory>
-			<territory type="SN">セ�ガル</territory>
-			<territory type="SO">ソマリア</territory>
-			<territory type="SR">スリナム</territory>
-			<territory type="ST">サントメ・プリンシペ</territory>
-			<territory type="SV">エルサル�ドル</territory>
-			<territory type="SY">シリア</territory>
-			<territory type="SZ">スワジランド</territory>
-			<territory type="TC">タークス諸島・カイコス諸島</territory>
-			<territory type="TD">�ャド</territory>
-			<territory type="TF">フランス領極�諸島</territory>
-			<territory type="TG">トーゴ</territory>
-			<territory type="TH">タイ</territory>
-			<territory type="TJ">タジキスタン</territory>
-			<territory type="TK">トケラウ諸島</territory>
-			<territory type="TL">�ティモール</territory>
-			<territory type="TM">トルクメニスタン</territory>
-			<territory type="TN">�ュニジア</territory>
-			<territory type="TO">トンガ</territory>
-			<territory type="TR">トルコ</territory>
-			<territory type="TT">トリニダード・ト�ゴ</territory>
-			<territory type="TV">ツ�ル</territory>
-			<territory type="TW">�湾</territory>
-			<territory type="TZ">タンザニア</territory>
-			<territory type="UA">ウクライナ</territory>
-			<territory type="UG">ウガンダ</territory>
-			<territory type="UM">米領太平洋諸島</territory>
-			<territory type="US">アメリカ�衆国</territory>
-			<territory type="UY">ウルグアイ</territory>
-			<territory type="UZ">ウズベキスタン</territory>
-			<territory type="VA">��カン市国</territory>
-			<territory type="VC">セントビンセント・グレナディーン諸島</territory>
-			<territory type="VE">ベ�ズエラ</territory>
-			<territory type="VG">イギリス領ヴァージン諸島</territory>
-			<territory type="VI">アメリカ領ヴァージン諸島</territory>
-			<territory type="VN">ベトナム</territory>
-			<territory type="VU">�ヌアツ</territory>
-			<territory type="WF">ウォリス・フツナ</territory>
-			<territory type="WS">サモア</territory>
-			<territory type="YE">イエメン</territory>
-			<territory type="YT">マヨット島</territory>
-			<territory type="ZA">�アフリカ</territory>
-			<territory type="ZM">ザンビア</territory>
-			<territory type="ZW">ジン�ブエ</territory>
-			<territory type="ZZ">�明�地域</territory>
-		</territories>
-		<variants>
-			<variant type="1901">�統的ドイツ語正書法（1901）</variant>
-			<variant type="1996">ドイツ語正書法（1996）</variant>
-			<variant type="1606NICT">後期中世フランス語（〜1606）</variant>
-			<variant type="1694ACAD">�期�代フランス語</variant>
-			<variant type="AREVELA">�アルメニア文語</variant>
-			<variant type="AREVMDA">西アルメニア文語</variant>
-			<variant type="BOONT">ブーントリング</variant>
-			<variant type="FONIPA">国際音声記�</variant>
-			<variant type="FONUPA">ウラル音声記�</variant>
-			<variant type="MONOTON">モノトニック</variant>
-			<variant type="NEDIS">ナティゾー�方言</variant>
-			<variant type="POLYTON">�リトニック</variant>
-			<variant type="POSIX">コンピュータ</variant>
-			<variant type="REVISED">改訂版</variant>
-			<variant type="ROZAJ">レシア方言</variant>
-			<variant type="SAAHO">サホ語</variant>
-			<variant type="SCOUSE">リ�プール方言</variant>
-			<variant type="VALENCIA">�レンシア方言</variant>
-		</variants>
-		<keys>
-			<key type="calendar">暦法</key>
-			<key type="collation">照�</key>
-			<key type="currency">通貨</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">�体字中国語 (Big5)</type>
-			<type type="buddhist" key="calendar">タイ�教暦</type>
-			<type type="chinese" key="calendar">中国暦</type>
-			<type type="direct" key="collation">直接著錄</type>
-			<type type="gb2312han" key="collation">簡体字中国語 (GB2312)</type>
-			<type type="gregorian" key="calendar">西暦 (グレゴリオ暦)</type>
-			<type type="hebrew" key="calendar">ユダヤ暦</type>
-			<type type="islamic" key="calendar">イスラム暦</type>
-			<type type="islamic-civil" key="calendar">太陽イスラム暦</type>
-			<type type="japanese" key="calendar">和暦</type>
-			<type type="phonebook" key="collation">電話帳方�</type>
-			<type type="pinyin" key="collation">ピンイン順</type>
-			<type type="stroke" key="collation">画数順</type>
-			<type type="traditional" key="collation">旧�</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">メートル法</measurementSystemName>
-			<measurementSystemName type="US">ヤード・�ンド法</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">言語: {0}</codePattern>
-			<codePattern type="script">文字: {0}</codePattern>
-			<codePattern type="territory">地域: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[ゞ �ヽ ヾ �ァ �ア �ィ �イ �ゥ �ウ ヴ �ェ �エ �ォ �オ ヵ �カ �ガ �キ �ギ �ク �グ ヶ �ケ �ゲ �コ �ゴ �サ �ザ �シ �ジ �ス �ズ �セ �ゼ �ソ �ゾ �タ �ダ �� �ヂ �ッ �ツ �ヅ �テ �デ �ト �ド �ナ �ニ �ヌ �� �ノ �� �� �パ �ヒ �ビ �ピ �フ �ブ �プ �ヘ �ベ �ペ �ホ �ボ �� �マ �ミ むム �メ もモ ゃャ やヤ ゅュ ゆユ ょョ よヨ らラ りリ るル れレ �ロ ゎヮ �ワ �ヰ ゑヱ をヲ んン 一 � 七 万-下 � 与 且 世 丘 丙 両 並 中 丸 丹 主 久 � 乗 乙 � 乱 乳 乾 亀 了 予 争 事 二 互 五 井 亜 亡 交 亨 享-亭 人 � 今 介 � 仕 他 付 仙 代-以 仮 仰 仲 件 任 � �-休 会 � 伯 伴 伸 伺 似 但 �-� 体 何 余 作 佳 併 使 例 � 供 � 価 侮 侯 侵 便 係 促 俊 俗 � 信 修 俳 俵 俸 倉 個 � 倒 候 借 倣 値 倫 倹 � � � � �-� � � 傑 傘 備 催 債 傷 傾 � � 僕 僚 僧 儀 億 儒 償 優 元-兆 先 光 克 � � 党 入 全 八-六 共 兵 具 典 兼 内 円 冊 � 冒 冗 写 冠 冬 冷 准 � � 凡 処 凶 凸-出 刀 刃 分-刈 刊 刑 列 � 判 別 利 到 制-券 刺 刻 則 削 � 剖 剛 剣 剤 副 剰 割 創 劇 力 功 加 劣 助 努 励 労 効 劾 勅 勇 勉 動 勘 務 � 募 勢 勤 勧 勲 勺 � 包 化 北 匠 匹-医 匿 � � � � � �-� � � � � � � �-� � 厄 厘 厚 原 厳 去 � � �-� � � � � �-� � � � � � � � � � � � �-� � � � � � � 呈-告 周 味 呼 命 和 咲 哀 � 員 哲 唆 唇 � 唯 唱 商 � 啓 善 喚 喜 � 喪 喫 営 嗣 嘆 嘉 嘱 器 噴 嚇 囚 四 回 因 団 困 囲 図 固 国 � 園 土 圧 在 地 � � � � � 垂 型 垣 埋 城 域 執 培 基 堀 堂 堅 堕 堤 堪 報 場 塀 � 塊 塑 塔 塗 塚 塩 塾 境 墓 増 墜 墨 墳 墾 � 壇 壊 壌 士 壮 声-売 変 � 夕 外 多 夜 夢 大 天-夫 央 失 奇 奉 � 契 奔 奥 奨 奪 奮 女 奴 好 如-妄 妊 妙 妥 妨 妹 妻 姉 始 姓 委 姫 姻 姿 � 娘 娠 娯 婆 婚 婦 婿 媒 � 嫌 嫡 嬢 � 孔 字 存 � 季 孤 学 孫 宅 宇-安 完 宗-定 宜 � 実 客-室 宮 宰 害-家 容 宿 寂 寄 密 富 寒 寛 � 察 寡 寧 審 寮 寸 寺 対 寿 � 専 射 将 尉-尋 導 � 少 尚 就 尺 尼-局 居 屈 届 屋 展 属 層 履 屯 山 � 岩 岬 岳 岸 峠 峡 峰 島 崇 崎 崩 � 州 巡 巣 工-巨 差 己 巻 市 布 帆 希 � 帥 師 席 帯 帰 帳 常 帽 幅 幕 幣 干-年 幸 幹 幻-幾 � 広 床 � 底 店 府 度 座 庫 庭 庶-庸 廃 廉 廊 延 廷 建 � 弊 � � 弓-引 弘 弟 弦 弧 弱 張 強 弾 当 形 彩 彫 彰 影 役 彼 往 � 径 待 律 後 � 徒 従 得 御 復 循 微 徳 徴 徹 心 必 忌 � 志-忙 応 忠 快 念 怒 怖 � 怠 急 性 怪 � � � � � � � � � 悔 悟 悠 患 悦 悩 悪 悲 悼 情 惑 惜 惨 惰 想 � 愉 � 愚 愛 感 慈 態 慌 慎 慕 慢 慣 慨 慮 慰 慶 憂 憎 憤 憩 憲 憶 憾 懇 � 懲 懸 �-戒 戦 戯 戸 戻 房 所 扇 扉 手 � 打 払 扱 扶 批 承 技 抄 把 抑 投 抗 折 抜 択 披 抱 抵 抹 押 抽 担 � � 拒 拓 拘 拙 招 � 拠 拡 括 拷 拾 � 指 挑 挙 挟 振 挿 � � � � 掃 授 掌 排 掘 掛 採 探 接 控 推 措 掲 � � � � � � � � � � � � � 摂 摘 摩 撃 撤 撮 撲 � � 擦 擬 支 改 攻 放 政 故 � 救 敗 教 敢 散 敬 数 整 敵 敷 文 斉 斎 斗 料 斜 斤 斥 断 新 方 施 旅 旋 � 旗 既 日 旧-早 旬 昆 昇 昌 明 易 昔 星 映 春 昨 昭 是 昼 時 晩 普 景 晴 晶 � 暇 暑 暖 暗 暦 暫 暮 暴 曇 曜 曲 更 書 曹 替 最 月 有 � 朕 朗 望 � 期 木 未-札 朱 朴 机 朽 � � � � � � � � � � � 林 枚 果 � 枠 枢 枯 架 柄 � 染 柔 柱 柳 査 栄 栓 校 株 核 根 格 栽 桃 案 桑 桜 桟 梅 械 棄 棋 棒 棚 棟 森 棺 � 検 業 極 楼 楽 概 構 様 槽 標 模 権 横 樹 橋 機 欄 欠 次 欧 欲 欺 款 歌 歓 止 正 武 歩 歯 歳 歴 死 殉-残 殖 殴 段 殺 殻 殿 � 毎 毒 比 毛 � 民 気 水 氷 永 � 求 汗 汚 江 池 決 汽 沈 沖 没 沢 河 沸 油 治 沼 沿 � 泉 泊 泌 法 泡-泣 泥 注 泰 泳 洋 洗 洞 津 洪 活 派 � 浄 浅 浜 浦 浪 浮 浴 海 浸 消 涙 涯 液 涼 淑 淡 深 混 添 清 渇-渉 渋 渓 減 渡 渦 温 測 港 湖 湯 湾-満 � 準 � 溶 滅 滋 滑 � 滞 滴 � 漂 漆 � 演 漠 漢 漫 漬 漸 潔 潜 潟 潤 潮 澄 激 � 濃 濫 濯 瀬 � � � � 炉 炊 炎 炭 点 為 烈 無 焦 然 焼 煙 照 煩 煮 熟 熱 燃 燥 爆 爵 父 片 版 牛 牧 物 牲 特 犠 犬 犯 状 狂 狩 独 狭 猛 猟 猫 献 猶 猿 � � � 玄 率 玉 王 � � � � � � � 環 璽 瓶 甘 甚 生 産 用 田-申 男 町 画 界 畑 畔 留 畜 � 略 番 異 畳 疎 疑 疫 疲 疾 病 症 痘 痛 痢 痴 療 癒 癖 発 登 白 百 的 皆 皇 皮 皿 盆 益 盗 盛 盟 監 盤 目 盲 直 相 盾 � 看 県 真 眠 眺 眼 � � � 瞬 矛 矢 知 短 矯 石 砂 研 砕 砲 破 � 硫 硬 � 碑 確 � 磨 � 礎 示 礼 社 祈 祉 祖 祚 � 神 祥 票 祭 � 禄 禅 �-� 秀 � 秋 科 秒 秘 租 秩 称 移 程 税 稚 種 稲 稼 稿 穀 穂 � � 穫 穴 究 空 � 窃 窒 窓 窮 窯 立 竜 章 童 端 競 竹 笑 笛 符 第 筆 等 筋 筒 答 策 箇 算 管 箱 節 範 築 篤 簡 簿 � 米 粉 粋 粒 粗 粘 粛 粧 精 糖 糧 糸 系 糾 紀 約 紅 紋 � 純 紙-紛 素-索 紫 累 細 紳 紹 紺 終 組 経 � 絞 絡 給 統 絵 絶 絹 継 続 維 綱 網 綿 緊 � 緑 緒 線 締 編 緩 緯 練 � 縄 縛 縦 縫 縮 績 � 繊 織 繕 繭 繰 缶 罪 置 罰 署 罷 羅 羊 美 群 義 羽 � 翌 習 翻 翼 � 考 者 � 耕 耗 耳 � � � � 肉 肌 肖 � 肢 肥 肩 肪 肯 育 肺 胃 胆 背 胎 胞 胴 胸 能 脂 脅 脈 脚 脱 脳 脹 � 腕 腰 腸 腹 膚 膜 膨 臓 臣 臨 自 臭 至 致 興 舌 舎 舗 舞 舟 航 般 舶 船 艇 艦 良 色 芋 � 花 芳 芸 芽 苗 若 苦 英 茂 茎 茶 � � � � � � � � � � 葉 著 葬 蒸 蓄 蔵 薄 薦 薪-薬 藩 藻 � 虚 虜 虞 虫 蚊 蚕 蛇 � 蛮 � 血 衆 行 術 街 衛 � 衡 衣 表 衰 衷 袋 被 � 裂 装 � 裕 補 裸 製 複 � 褒 襟 襲 西 � 覆 覇 見 � 視 覚 覧 親 観 角 解 触 言 訂 計 討 訓 託 記 訟 訪 設 許 訳 訴 診 証 � 詔 評 詞 詠 試 詩 詰-詳 誇 誉 誌 � 誓 誕 誘 語 誠 誤 説 読 課 調 談 請 論 諭 諮 諸 諾 謀 � 謄 謙 講 � 謡 謹 識 譜 警 議 譲 護 谷 豆 豊 豚 象 豪 � 貞 負-貢 貧-販 貫 責 貯 貴 買 貸 費 貿 賀 賃 賄 資 賊 賓 賛 賜 賞 賠 賢 賦 質 購 贈 赤 赦 走 赴 起 超 越 趣 足 � 跡 路 跳 践 踊 � � 身 車 軌 � 軒 軟 転 軸 軽 較 載 � 輩 輪 輸 轄 辛 辞 辱 農 辺 込 迅 迎 近 返 迫 迭 述 迷 追 退 � 逃 逆 � � 逓 途 通 � 速 造 連 逮 週 進 逸 � � � � � � � �-� � � � � � � � � � � 還 邦 邪 邸 郊 郎 郡 部 郭 郵 郷 都 酌 � 酒 酔 酢 酪 酬 酵 酷 酸 醜 醸 釈 里-� 金 � 釣 � 鈴 鉄 鉛 鉢 鉱 銀 銃 銅 銑 銘 銭 鋭 鋳 鋼 錘 錠 錬 錯 録 � 鎖 鎮 � � 鑑 長 門 閉 開 閑 間 関 閣 閥 閲 闘 防 阻 附 � � 陛 院-陥 陪 陰 陳 陵 陶 陸 険 陽 隅 隆 隊 階 � 隔 際 障 隠 隣 隷 隻 雄-雇 雉 雌 雑 離 難 雨 雪 雰 雲 零 雷 電 需 震 霊 霜 霧 露 � � � � � � 韓 音 韻 響 頂 項 順 �-頒 領 頭 頻 頼 題 � 顔 顕 願 類 顧 風 飛 食 飢 飯 飲 飼-飾 養 餓 館 首 香 馬 駄-駆 � 騎 騒 験 騰 驚 骨 髄 高 髪 鬼 魂 魅 魔 魚 鮮 鯨 鳥 鳴 � 麗 麦 麻 黄 黒 黙 鼓 鼻 齢]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[兌 拼 楔 錄 鳯]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>「</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>『</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">æ—¥</day>
-							<day type="mon">月</day>
-							<day type="tue">�</day>
-							<day type="wed">æ°´</day>
-							<day type="thu">木</day>
-							<day type="fri">金</day>
-							<day type="sat">土</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">日曜日</day>
-							<day type="mon">月曜日</day>
-							<day type="tue">�曜日</day>
-							<day type="wed">水曜日</day>
-							<day type="thu">木曜日</day>
-							<day type="fri">金曜日</day>
-							<day type="sat">土曜日</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">æ—¥</day>
-							<day type="mon">月</day>
-							<day type="tue">�</day>
-							<day type="wed">æ°´</day>
-							<day type="thu">木</day>
-							<day type="fri">金</day>
-							<day type="sat">土</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">第1四�期</quarter>
-							<quarter type="2">第2四�期</quarter>
-							<quarter type="3">第3四�期</quarter>
-							<quarter type="4">第4四�期</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>��</am>
-				<pm>�後</pm>
-				<eras>
-					<eraNames>
-						<era type="0">紀元�</era>
-						<era type="1">西暦</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">紀元�</era>
-						<era type="1">西暦</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H時mm分ss秒 zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">dæ—¥</dateFormatItem>
-						<dateFormatItem id="Ed">dæ—¥(EEE)</dateFormatItem>
-						<dateFormatItem id="GGGGyMd">GGGGy年M月d日</dateFormatItem>
-						<dateFormatItem id="H">H時</dateFormatItem>
-						<dateFormatItem id="hm">ah:mm</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">M/d(E)</dateFormatItem>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日(E)</dateFormatItem>
-						<dateFormatItem id="MMMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMMEd">M月d日(E)</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">y/M</dateFormatItem>
-						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
-						<dateFormatItem id="yMEd">y/M/d(EEE)</dateFormatItem>
-						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
-						<dateFormatItem id="yMMMd">y年M月d日</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日(EEE)</dateFormatItem>
-						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
-						<dateFormatItem id="yQ">y/Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">yQQQ</dateFormatItem>
-						<dateFormatItem id="yyMMM">y年M月</dateFormatItem>
-						<dateFormatItem id="yyQ">yy/Q</dateFormatItem>
-						<dateFormatItem id="yyyy">yå¹´</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy/MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}～{1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d日～d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H時～H時</greatestDifference>
-							<greatestDifference id="h">H時～H時</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H時mm分～H時mm分</greatestDifference>
-							<greatestDifference id="h">H時mm分～H時mm分</greatestDifference>
-							<greatestDifference id="m">H時mm分～H時mm分</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H時mm分～H時mm分（v）</greatestDifference>
-							<greatestDifference id="h">H時mm分～H時mm分v</greatestDifference>
-							<greatestDifference id="m">H時mm分～H時mm分v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H時～H時（v）</greatestDifference>
-							<greatestDifference id="h">H時～H時v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M月～M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM/dd～MM/dd</greatestDifference>
-							<greatestDifference id="M">MM/dd～MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM/dd(E)～MM/dd(E)</greatestDifference>
-							<greatestDifference id="M">MM/dd(E)～MM/dd(E)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">M月～M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">M月d日～d日</greatestDifference>
-							<greatestDifference id="M">M月d日～M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">M月d日(E)～d日(E)</greatestDifference>
-							<greatestDifference id="M">M月d日(E)～M月d日(E)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL～LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y年～y年</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy/MM～yy/MM</greatestDifference>
-							<greatestDifference id="y">yy/MM～yy/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy/MM/dd～yy/MM/dd</greatestDifference>
-							<greatestDifference id="M">yy/MM/dd～yy/MM/dd</greatestDifference>
-							<greatestDifference id="y">yy/MM/dd～yy/MM/dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yy/MM/dd(E)～yy/MM/dd(E)</greatestDifference>
-							<greatestDifference id="M">yy/MM/dd(E)～yy/MM/dd(E)</greatestDifference>
-							<greatestDifference id="y">yy/MM/dd(E)～yy/MM/dd(E)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y年M月～M月</greatestDifference>
-							<greatestDifference id="y">y年M月～y年M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y年M月d日～d日</greatestDifference>
-							<greatestDifference id="M">y年M月d日～M月d日</greatestDifference>
-							<greatestDifference id="y">y年M月d日～y年M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y年M月d日(E)～d日(E)</greatestDifference>
-							<greatestDifference id="M">y年M月d日(E)～M月d日(E)</greatestDifference>
-							<greatestDifference id="y">y年M月d日(E)～y年M月d日(E)</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y年M月～M月</greatestDifference>
-							<greatestDifference id="y">y年M月～y年M月</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>時代</displayName>
-					</field>
-					<field type="year">
-						<displayName>å¹´</displayName>
-					</field>
-					<field type="month">
-						<displayName>月</displayName>
-					</field>
-					<field type="week">
-						<displayName>週</displayName>
-					</field>
-					<field type="day">
-						<displayName>æ—¥</displayName>
-						<relative type="-2">一昨日</relative>
-						<relative type="-1">昨日</relative>
-						<relative type="0">今日</relative>
-						<relative type="1">明日</relative>
-						<relative type="2">明後日</relative>
-					</field>
-					<field type="weekday">
-						<displayName>曜日</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>��/�後</displayName>
-					</field>
-					<field type="hour">
-						<displayName>時</displayName>
-					</field>
-					<field type="minute">
-						<displayName>分</displayName>
-					</field>
-					<field type="second">
-						<displayName>秒</displayName>
-					</field>
-					<field type="zone">
-						<displayName>タイムゾーン</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="japanese">
-				<am>��</am>
-				<pm>�後</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">大化</era>
-						<era type="1">白雉</era>
-						<era type="2">白鳯</era>
-						<era type="3">朱鳥</era>
-						<era type="4">大�</era>
-						<era type="5">慶雲</era>
-						<era type="6">和銅</era>
-						<era type="7">霊亀</era>
-						<era type="8">養�</era>
-						<era type="9">神亀</era>
-						<era type="10">天平</era>
-						<era type="11">天平感�</era>
-						<era type="12">天平��</era>
-						<era type="13">天平�字</era>
-						<era type="14">天平神護</era>
-						<era type="15">神護景雲</era>
-						<era type="16">�亀</era>
-						<era type="17">天応</era>
-						<era type="18">延暦</era>
-						<era type="19">大�</era>
-						<era type="20">弘�</era>
-						<era type="21">天長</era>
-						<era type="22">承和</era>
-						<era type="23">嘉祥</era>
-						<era type="24">�寿</era>
-						<era type="25">斉衡</era>
-						<era type="26">天安</era>
-						<era type="27">貞観</era>
-						<era type="28">元慶</era>
-						<era type="29">�和</era>
-						<era type="30">寛平</era>
-						<era type="31">昌泰</era>
-						<era type="32">延喜</era>
-						<era type="33">延長</era>
-						<era type="34">承平</era>
-						<era type="35">天慶</era>
-						<era type="36">天暦</era>
-						<era type="37">天徳</era>
-						<era type="38">応和</era>
-						<era type="39">康�</era>
-						<era type="40">安和</era>
-						<era type="41">天禄</era>
-						<era type="42">天延</era>
-						<era type="43">貞元</era>
-						<era type="44">天元</era>
-						<era type="45">永観</era>
-						<era type="46">寛和</era>
-						<era type="47">永延</era>
-						<era type="48">永祚</era>
-						<era type="49">正暦</era>
-						<era type="50">é•·å¾³</era>
-						<era type="51">長�</era>
-						<era type="52">寛弘</era>
-						<era type="53">長和</era>
-						<era type="54">寛�</era>
-						<era type="55">治安</era>
-						<era type="56">万寿</era>
-						<era type="57">é•·å…ƒ</era>
-						<era type="58">長暦</era>
-						<era type="59">é•·ä¹…</era>
-						<era type="60">寛徳</era>
-						<era type="61">永承</era>
-						<era type="62">天喜</era>
-						<era type="63">康平</era>
-						<era type="64">治暦</era>
-						<era type="65">延久</era>
-						<era type="66">承�</era>
-						<era type="67">承暦</era>
-						<era type="68">永�</era>
-						<era type="69">応徳</era>
-						<era type="70">寛治</era>
-						<era type="71">嘉�</era>
-						<era type="72">永長</era>
-						<era type="73">承徳</era>
-						<era type="74">康和</era>
-						<era type="75">é•·æ²»</era>
-						<era type="76">嘉承</era>
-						<era type="77">天�</era>
-						<era type="78">天永</era>
-						<era type="79">永久</era>
-						<era type="80">元永</era>
-						<era type="81">�安</era>
-						<era type="82">天治</era>
-						<era type="83">大治</era>
-						<era type="84">天承</era>
-						<era type="85">長承</era>
-						<era type="86">�延</era>
-						<era type="87">永治</era>
-						<era type="88">康治</era>
-						<era type="89">天養</era>
-						<era type="90">久安</era>
-						<era type="91">�平</era>
-						<era type="92">久寿</era>
-						<era type="93">�元</era>
-						<era type="94">平治</era>
-						<era type="95">永暦</era>
-						<era type="96">応�</era>
-						<era type="97">長寛</era>
-						<era type="98">永万</era>
-						<era type="99">�安</era>
-						<era type="100">嘉応</era>
-						<era type="101">承安</era>
-						<era type="102">安元</era>
-						<era type="103">治承</era>
-						<era type="104">養和</era>
-						<era type="105">寿永</era>
-						<era type="106">元暦</era>
-						<era type="107">文治</era>
-						<era type="108">建久</era>
-						<era type="109">正治</era>
-						<era type="110">建�</era>
-						<era type="111">元久</era>
-						<era type="112">建永</era>
-						<era type="113">承元</era>
-						<era type="114">建暦</era>
-						<era type="115">建�</era>
-						<era type="116">承久</era>
-						<era type="117">貞応</era>
-						<era type="118">元�</era>
-						<era type="119">嘉禄</era>
-						<era type="120">安貞</era>
-						<era type="121">寛喜</era>
-						<era type="122">貞永</era>
-						<era type="123">天�</era>
-						<era type="124">文暦</era>
-						<era type="125">嘉禎</era>
-						<era type="126">暦�</era>
-						<era type="127">延応</era>
-						<era type="128">�治</era>
-						<era type="129">寛元</era>
-						<era type="130">�治</era>
-						<era type="131">建長</era>
-						<era type="132">康元</era>
-						<era type="133">正嘉</era>
-						<era type="134">正元</era>
-						<era type="135">文応</era>
-						<era type="136">弘長</era>
-						<era type="137">文永</era>
-						<era type="138">建治</era>
-						<era type="139">弘安</era>
-						<era type="140">正応</era>
-						<era type="141">永�</era>
-						<era type="142">正安</era>
-						<era type="143">乾元</era>
-						<era type="144">嘉元</era>
-						<era type="145">徳治</era>
-						<era type="146">延慶</era>
-						<era type="147">応長</era>
-						<era type="148">正和</era>
-						<era type="149">文�</era>
-						<era type="150">元応</era>
-						<era type="151">元亨</era>
-						<era type="152">正中</era>
-						<era type="153">嘉暦</era>
-						<era type="154">元徳</era>
-						<era type="155">元弘</era>
-						<era type="156">建武</era>
-						<era type="157">延元</era>
-						<era type="158">興国</era>
-						<era type="159">正平</era>
-						<era type="160">建徳</era>
-						<era type="161">文中</era>
-						<era type="162">天授</era>
-						<era type="163">康暦</era>
-						<era type="164">弘和</era>
-						<era type="165">元中</era>
-						<era type="166">至徳</era>
-						<era type="167">嘉慶</era>
-						<era type="168">康応</era>
-						<era type="169">明徳</era>
-						<era type="170">応永</era>
-						<era type="171">正長</era>
-						<era type="172">永享</era>
-						<era type="173">嘉�</era>
-						<era type="174">文安</era>
-						<era type="175">�徳</era>
-						<era type="176">享徳</era>
-						<era type="177">康正</era>
-						<era type="178">長禄</era>
-						<era type="179">寛正</era>
-						<era type="180">文正</era>
-						<era type="181">応�</era>
-						<era type="182">文明</era>
-						<era type="183">長享</era>
-						<era type="184">延徳</era>
-						<era type="185">明応</era>
-						<era type="186">文亀</era>
-						<era type="187">永正</era>
-						<era type="188">大永</era>
-						<era type="189">享禄</era>
-						<era type="190">天文</era>
-						<era type="191">弘治</era>
-						<era type="192">永禄</era>
-						<era type="193">元亀</era>
-						<era type="194">天正</era>
-						<era type="195">文禄</era>
-						<era type="196">慶長</era>
-						<era type="197">元和</era>
-						<era type="198">寛永</era>
-						<era type="199">正�</era>
-						<era type="200">慶安</era>
-						<era type="201">承応</era>
-						<era type="202">明暦</era>
-						<era type="203">万治</era>
-						<era type="204">寛文</era>
-						<era type="205">延�</era>
-						<era type="206">天和</era>
-						<era type="207">貞享</era>
-						<era type="208">元禄</era>
-						<era type="209">�永</era>
-						<era type="210">正徳</era>
-						<era type="211">享�</era>
-						<era type="212">元文</era>
-						<era type="213">寛�</era>
-						<era type="214">延享</era>
-						<era type="215">寛延</era>
-						<era type="216">�暦</era>
-						<era type="217">明和</era>
-						<era type="218">安永</era>
-						<era type="219">天明</era>
-						<era type="220">寛政</era>
-						<era type="221">享和</era>
-						<era type="222">文化</era>
-						<era type="223">文政</era>
-						<era type="224">天�</era>
-						<era type="225">弘化</era>
-						<era type="226">嘉永</era>
-						<era type="227">安政</era>
-						<era type="228">万延</era>
-						<era type="229">文久</era>
-						<era type="230">元治</era>
-						<era type="231">慶応</era>
-						<era type="232">明治</era>
-						<era type="233">大正</era>
-						<era type="234">昭和</era>
-						<era type="235">平�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>Gy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>Gyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>Gyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">dæ—¥(EEE)</dateFormatItem>
-						<dateFormatItem id="hm">ah:mm</dateFormatItem>
-						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日(EEE)</dateFormatItem>
-						<dateFormatItem id="yyyy">Gyå¹´</dateFormatItem>
-						<dateFormatItem id="yyyyMd">Gyy/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMM">Gyy/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Gyy/Q</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraAbbr>
-						<era type="0">民国�</era>
-						<era type="1">民国</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>Gyy/MM/dd(EE)</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>Gyy/MM/dd(E)</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}時間</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�明</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>アンドラ公国</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>ド�イ</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>カブール</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>アン�グア</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>アンギラ</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>�ラナ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>エレ�ン</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>キュラソー</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>ルアンダ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>ロデラ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>パーマー</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>�極点</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>昭和基地</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>モーソン</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>デービス</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ボストーク</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>ケーシー</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>デュモン デュルビル</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>マクムード</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>リオガイェゴス</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>メンドーサ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>サンファン</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>ウスアイア</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ラリオ�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>サンルイス</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>カタマルカ</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>フフイ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>トゥクマン</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>コルド�</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ブエノスアイレス</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>パゴパゴ</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>ウィーン</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>パース</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>ユークラ</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>ダーウィン</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>アデレード</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ブロークンヒル</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>カリー</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>メルボルン</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>ホ�ート</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>リンデマン</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>シドニー</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ブリスベン</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>ロード�ウ</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>アル�</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>�クー</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>�ル�ドス</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>ダッカ</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>ブリュッセル</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>ワガドゥグー</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>ソフィア</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>�ーレーン国</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>ブジュンブラ</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>�ルトノボ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>�ミューダ</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>ブル�イ</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>ラパス</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>エイル�ペ</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>リオブランコ</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>�ルトベーリョ</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>ボアビスタ</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>マナウス</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>クイア�</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>カン�グランデ</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>ベレン</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>アラグァイナ</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>サンパウロ</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>�イーア</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>フォルタレザ</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>マセイオ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>レシフェ</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>ノロニャ</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>ナッサウ</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>ティンプー</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>ガボロー�</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>ミンスク</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>ベリーズ</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>ドーソン</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>ホワイトホース</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>イヌヴィク</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>�ンクー�ー</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>ドーソンクリーク</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>イエローナイフ</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>エドモントン</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>スウィフトカレント</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>ケンブリッジベイ</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>レジャイナ</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>ウィニペグ</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>レソリュート</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>レイニーリ�ー</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>ランキン湾</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>コーラル�ー�ー</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>サンダーベイ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ニピゴン</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>トロント</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>モントリオール</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>イカルイット</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>パンナータング</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>モンクトン</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>�リファクス</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>グースベイ</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>グレースベイ</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ブラン・サブロン</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>セントジョンズ</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>ココス</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>キンシャサ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ルブン�シ</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>�ンギ</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>ブラザビル</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>�ューリッヒ</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>アビジャン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>ラロトンガ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>イースター島</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>アメリカ/サン�アゴ</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>ドゥアラ</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>カシガル</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>ウルム�</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>�慶</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>上海</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>�ルビン</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>ボゴタ</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>コスタリカ共和国</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>��ナ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>カボベルデ共和国</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>クリスマス</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>ニコシア</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>ベルリン</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>ジブ�共和国</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>コペン�ーゲン</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>ドミニカ国</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>サントドミンゴ</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>アルジェ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>ガラパゴス</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>アメリカ/グアヤキル</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>タリン</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>カイロ</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>アイウン</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>アスマラ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>カナリア諸島</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>セウタ</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>ヨーロッパ/マドリード</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>アジスアベ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>ヘルシンキ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>フィジー共和国</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>スタンリー</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>トラック</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>�ナペ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>コシャエ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>フェロー</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>パリ</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>リーブルビル</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>ヨーロッパ/ロンドン</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>グレナダ</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>トビリシ</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>カイエンヌ</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>アクラ</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>ジブラルタル</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>�ューレ</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>アメリカ/ゴッドホープ</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>スコレスビスン</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>デンマークシャウン</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>�ンジュル</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>コナクリ</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>グアダループ</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>マラボ</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>アテ�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>�ジョージア島</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>グァテマラ共和国</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>グアム</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>ビサウ</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>ガイアナ</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>香港</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>�ルトープランス</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>ブダペスト</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>ジャカルタ</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>�ンティアナク</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>マカッサル</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ジャヤプラ</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>ダブリン</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>エルサレム</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>�ャゴス</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>�グダッド</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>テヘラン</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>レイキャビーク</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>ローマ</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>ジャマイカ</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>アンマン</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>�京</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>ナイロビ</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>ビシュケク</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>プノンペン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>エンダベリー</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>キリティマティ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>タラワ</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>コモロ</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>セントキッツ�イビス</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>平壌</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>ソウル</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>クウェート国</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>ケイマン</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>アクタウ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>オラル</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>アクトベ</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>キジルオルダ</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>アルマトイ</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>ビエン�ャン</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>ベイルート</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>セントルシア</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>ファドゥーツ</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>コロンボ</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>モンロビア</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>マセル</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>ヴィルニアス</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>ルクセンブルグ大公国</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>リガ</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>トリ�リ</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>カサブランカ</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>モナコ公国</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>キシナウ</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>アンタナナリボ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>クワジェリン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>マジュロ</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>アフリカ/�マコ</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>ラングーン</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>ホブド</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>ウラン�ートル</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>�ョイ�ルサン</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>マカオ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>サイパン</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>マル�ニーク</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>ヌアクショット</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>モントセラト島</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>マルタ共和国</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>モーリシャス共和国</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>モルディブ共和国</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>ブランタイア</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>ティフアナ</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>エルモシヨ</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>マサトラン</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>�ワワ</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>モンテレイ</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>メキシコシティー</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>メリダ</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>カンクン</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>アジア/クアラルンプール</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>ク�ン</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>マプト</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>ビントフック</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>ヌメア</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>ニアメー</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>ノーフォーク</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>ラゴス</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>マナグア</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>アムステルダム</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>オスロ</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>カトマンズ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>ナウル共和国</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>ニウエ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>�ャタム</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>太平洋/オークランド</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>マスカット</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>パナマ共和国</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>リマ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>太平洋/タヒ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>マルケサス</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>ガンビア</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>�ートモレスビー</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>マニラ</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>カラ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>ワルシャワ</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>ミクロン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>ピトケアン島</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>プエルトリコ</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>ガザ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>アゾレス諸島</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>マデイラ</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>ヨーロッパ/リスボン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>パラオ共和国</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>アスンシオン</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>カタール</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>レユニオン</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>ブカレスト</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>カリーニングラード</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>モスクワ</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>ボルゴグラード</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>サマラ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>エカテリンブルグ</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>オムスク</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>ノボシビルスク</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>クラスノヤルスク</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>イルクーツク</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ヤクーツク</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ウラジオストク</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>サ�リン</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>マガダン</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>カム�ャッカ</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>アナジル</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>キガリ</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>リヤド</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>ガダルカナル</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>マエ</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>�ルツーム</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>ストックホルム</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>シンガ�ール</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>セントヘレナ</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>北極/ロングイヤービーエン</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>フリータウン</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>ダカール</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>モガディシュ</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>パラマリボ</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>サントメ</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>サル�ドル</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>ダマスカス</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>ム���</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>グランドターク</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>ンジャメナ</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>ケルゲレーヌ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>ロメ</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>�ンコク</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>ドゥシャンベ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>ファカオフォ</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>ディリ</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>アシガ�ード</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>�ュニジア</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>トンガタプ</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>イスタンブール</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>�ートオブスペイン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>フナフティ</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>�北</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>ダルエスサラーム</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ウジゴロド</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>キエフ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>シンフェロー�リ</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ザ�ロージェ</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>カンパラ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>ミッドウェー</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ジョンストン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>ウェーク</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>アダック</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>ノーメ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>ホノルル</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>アンカレッジ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ヤクタット</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>ジュノー</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>ロサンゼルス</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>ボイシ</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>フェニックス</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>シップロック</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>デン�ー</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>ノースダコタ州ニューセーラム</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>ノースダコタ州センター</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ã‚·ã‚«ã‚´</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>メノミニー</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>インディアナ州ビンセンス</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>インディアナ州ピーターズ�ーグ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>インディアナ州テルシティ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>インディアナ州ノックス</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>インディアナ州ウィナマック</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>インディアナ州マレンゴ</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>インディアナ�リス</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ルイスビル</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>インディアナ州ビベー</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>ケンタッキー州モンティ�ェロ</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>デトロイト</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>ニューヨーク</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>モンテビデオ</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>サマルカンド</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>アジア/タシケント</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>セントヴィンセント</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>カラカス</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>トルトーラ</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>セントトマス</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>サイゴン</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>エファテ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>ワリー</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>アピーア</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>アデン</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>マイヨット島</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>ヨ��スブルグ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>ルサカ</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>�ラーレ</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<generic>中央アフリカ時間</generic>
-					<standard>中央アフリカ時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<generic>�アフリカ時間</generic>
-					<standard>�アフリカ時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>�アフリカ時間</generic>
-					<standard>�アフリカ標準時</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>西アフリカ時間</generic>
-					<standard>西アフリカ時間</standard>
-					<daylight>西アフリカ�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>アラスカ時間</generic>
-					<standard>アラスカ標準時</standard>
-					<daylight>アラスカ�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>アマゾン時間</standard>
-					<daylight>アマゾン�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>アメリカ中部時間</generic>
-					<standard>アメリカ中部標準時</standard>
-					<daylight>アメリカ中部�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>アメリカ�部時間</generic>
-					<standard>アメリカ�部標準時</standard>
-					<daylight>アメリカ�部�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>アメリカ山地時間</generic>
-					<standard>アメリカ山地標準時</standard>
-					<daylight>アメリカ山地�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>アメリカ太平洋時間</generic>
-					<standard>アメリカ太平洋標準時</standard>
-					<daylight>アメリカ太平洋�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<generic>アルゼン�ン時間</generic>
-					<daylight>アルゼン�ン�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>大西洋時間</generic>
-					<standard>大西洋標準時</standard>
-					<daylight>大西洋�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>ブラジリア時間</standard>
-					<daylight>ブラジリア�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>中国標準時</standard>
-					<daylight>中国�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>中欧標準時</standard>
-					<daylight>中欧�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>�欧標準時</standard>
-					<daylight>�欧�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>グリニッジ標準時</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>イスラエル標準時</standard>
-					<daylight>イスラエル�時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>日本標準時</standard>
-					<daylight>日本�時間</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>ニューファンドランド島標準時</standard>
-					<daylight>ニューファンドランド島�時間</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>アンドラ ペセタ</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE ディル�ム</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>アフガニー (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>アフガニー</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>アル�ニア レク</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>アルメニア ドラム</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>オランダ領アンティル ギルダー</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>クワンザ</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>クワンザ (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>アンゴラ 新クワンザ (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>アンゴラ 旧クワンザ (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>アルゼン�ン アゥストラール</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>アルゼン�ン ペソ (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>アルゼン�ン ペソ</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>オーストリア シリング</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>オーストラリア ドル</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>アル� ギルダー</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>アゼル�イジャン マナト (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>アゼル�イジャン マナト</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>ボスニア ディナール</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>ボスニア マルク (BAM)</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>�ル�ドス ドル</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>�ングラデシュ タカ</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>ベルギー フラン (BEC)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>ベルギー フラン</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>ベルギー フラン (BEL)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>ブルガリア レフ</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>ブルガリア 新レフ</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>�ーレーン ディナール</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ブルンジ フラン</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>�ミューダ ドル</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ブル�イ ドル</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>ボリビアーノ</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>ボリビア ペソ</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>ボリビア Mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>ブラジル 新クルゼイロ (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>ブラジル クルゼイロ</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>ブラジル クルゼイロ (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ブラジル レアル</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>ブラジル 新クルゼイロ</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>ブラジル クルゼイロ レアル</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>��マ ドル</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ブータン ニュルタム</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>ビルマ �ャット</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>ボツワナ プラ</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>ベラルーシ ルーブル (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>ベラルーシ ルーブル</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>ベリーズ ドル</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>カナダ ドル</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>コンゴ フラン</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR ユーロ</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>スイス フラン</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR フラン</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>�リ ウニダ デ フォメント</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>�リ ペソ</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>中国人民元</displayName>
-				<symbol>å…ƒ</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>コロンビア ペソ</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>レアル (UVR)</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>コスタリカ コロン</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>セルビアン ディナール</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>�ェコスロ�キア コルナ</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>キュー� ペソ</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>カーボベルデ エスクード</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>キプロス �ンド</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>�ェコ コルナ</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>�ドイツ マルク</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>ドイツ マルク</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>ジブ� フラン</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>デンマーク クロー�</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>ドミニカ ペソ</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>アルジェリア ディナール</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>エクアドル スクレ</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>エクアドル UVC</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>エストニア クルーン</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>エジプト �ンド</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>エリトリア ナクファ</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>スペインペセタ</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>スペイン 兌�ペセタ</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>スペイン ペセタ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>エ�オピア ブル</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ユーロ</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>フィンランド マルカ</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>フィジー諸島 ドル</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>フォークランド（マルビナス）諸島 �ンド</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>フランス フラン</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>英国�ンド</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>グルジア クー�ン ラリ</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>グルジア ラリ</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ガーナ セディ (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>ガーナ セディ</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>ジブラルタル �ンド</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>ガンビア ダラシ</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>ギニア フラン</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>ギニア シリー</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>赤�ギニア ギニー</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>ギリシャ ドラクマ</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>グアテマラ ケツァル</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>�ルトガル領ギニア エスクード</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>ギニアビサウ ペソ</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>ガイアナ ドル</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>香港ドル</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>ホンジュラス レンピラ</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>クロア�ア ディナール</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>クロア�ア クーナ</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>�イ� グールド</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>�ンガリー フォリント</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>インド�シア ルピア</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>アイリッシュ �ンド</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>イスラエル �ンド</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>イスラエル新シェケル</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>インド ルピー</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>イラク ディナール</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>イラン リアル</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>アイスランド クローナ</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>イタリア リラ</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>ジャマイカ ドル</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>ヨルダン ディナール</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>日本円</displayName>
-				<symbol>ï¿¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>ケニア シリング</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>キルギスタン ソム</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>カンボジア リエル</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>コモロ フラン</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>北�鮮 ウォン</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>韓国 ウォン</displayName>
-				<symbol>￦</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>クウェート ディナール</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>ケイマン諸島 ドル</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>カザフスタン テンゲ</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>ラオス キープ</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>レ�ノン �ンド</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>スリランカ ルピー</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>リベリア ドル</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>レソト ロティ</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>リトアニア リタス</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>リトアニア タロナ</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>ルクセンブルク 兌�フラン</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>ルクセンブルグ フラン</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>ルクセンブルク 金�フラン</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>ラトビア ラッツ</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>ラトビア ルーブル</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>リビア ディナール</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>モロッコ ディル�ム</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>モロッコ フラン</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>モルド� レイ</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>マダガスカル アリアリ</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>マダガスカル フラン</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>マケドニア デナル</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>マリ フラン</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>ミャンマー �ャット</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>モンゴル トグログ</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>マカオ パタカ</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>モーリタニア ウギア</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>マルタ リラ</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>マルタ �ンド</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>モーリシャス ルピー</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>モルディブ諸島 ルフィア</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>マラウィ クワ�ャ</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>メキシコ ペソ</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>メキシコ ペソ (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>メキシコ UDI</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>マレーシア リンギット</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>モザンピーク エスクード</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>モザンピーク メティカル</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>モザンビーク メティカル</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>ナミビア ドル</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>ナイジェリア ナイラ</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>ニカラグア コルド�</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>ニカラグア コルド� オロ</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>オランダ ギルダー</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>ノルウェー クロー�</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�パール ルピー</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>ニュージーランド ドル</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>オマーン リアル</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>パナマ �ルボア</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>ペルー インティ</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>ペルー 新ソル</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>ペルー ソル</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>パプアニューギニア キナ</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>フィリピン ペソ</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>パキスタン ルピー</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>�ーランド ズウォティ</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>�ーランド ズウォティ (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>�ルトガル エスクード</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>パラグアイ グアラニ</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>カタール リアル</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>ローデシア ドル</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>ルーマニア 旧レイ</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>ルーマニア レイ</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>ディナール (セルビア)</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ロシア ルーブル</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>ロシア ルーブル (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>ルワンダ フラン</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>サウジ リヤル</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>ソロモン諸島 ドル</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>セイシェル ルピー</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>スーダン ディナール</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>スーダン �ンド</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>旧スーダン �ンド</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>スウェーデン クローナ</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>シンガ�ール ドル</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>セントヘレナ島 �ンド</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>スロベニア トラール</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>スロ�キア コルナ</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>シエラレオ� レオン</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>ソマリア シリング</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>スリナム ドル</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>スリナム ギルダー</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>サントメ・プリンシペ ドブラ</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>ソ連 ルーブル</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>エルサル�ドル コロン</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>シリア �ンド</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>スワジランド リランゲニ</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>タイ �ーツ</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>タジキスタン ルーブル</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>タジキスタン ソモニ</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>トルクメニスタン マナト</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>�ュニジア ディナール</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>トンガ パ・アンガ</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>ティモール エスクード</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>トルコ リラ</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>新トルコリラ</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>トリニダードト�ゴ ドル</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>新�湾ドル</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>タンザニア シリング</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ウクライナ グリブナ</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ウクライナ カルボ��ツ</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ウガンダ シリング (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ウガンダ シリング</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>米ドル</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>米ドル (翌日)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>米ドル (当日)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>ウルグアイ ペソ (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>ウルグアイ ペソ</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>ウズベキスタン スム</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>ベ�ズエラ ボリ�ル</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>ベ�ズエラ ボリ�ルフエルテ</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>ベトナム ドン</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>�ヌアツ �ツ</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>西サモア タラ</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA フラン BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>銀</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>金</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>ヨーロッパ混��� (EURCO)</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>ヨーロッパ通貨�� (EMU-6)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>ヨーロッパ勘定�� (EUA-9)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>ヨーロッパ勘定�� (EUA-17)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>�カリブ ドル</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>特別引�出�権</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ヨーロッパ通貨��</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>フランス金フラン</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>フランス UIC フラン</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA フラン BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>パラジウム</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP フラン</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>プラ�ナ</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET基金</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>テスト用通貨コード</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>�明���無効�通貨</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>イエメン ディナール</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>イエメン リアル</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>ユーゴスラビア ディナール</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>ユーゴスラビア スーパー ディナール</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>ユーゴスラビア 新ディナール (YUN)</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>�アフリカ ランド (ZAL)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>�アフリカ ランド</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>ザンビア クワ�ャ</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>ザイール 新ザイール</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>ザイール ザイール</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>ジン�ブエ ドル</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} æ—¥</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} 時間</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} 分</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} �月</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} 秒</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} 週</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} å¹´</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>��:�イ</yesstr>
-			<nostr>���:イイエ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ja_JP.xml b/airtime_mvc/library/Zend/Locale/Data/ja_JP.xml
deleted file mode 100644
index a8beb5be6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ja_JP.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="ja"/>
-		<territory type="JP"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ka.xml b/airtime_mvc/library/Zend/Locale/Data/ka.xml
deleted file mode 100644
index 807bc91bf..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ka.xml
+++ /dev/null
@@ -1,2157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.67 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ka"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ab">�ფხ�ზური</language>
-			<language type="ady">�დიღეური</language>
-			<language type="ae">�ვესტ�</language>
-			<language type="af">�ფრიკული</language>
-			<language type="ain">�ინუ</language>
-			<language type="ale">�ლეუტური</language>
-			<language type="ang">ძველი ინგლისური</language>
-			<language type="ar">�რ�ბული</language>
-			<language type="arc">�რ�მეული</language>
-			<language type="art">ხელ�ვნური სხვ�</language>
-			<language type="as">�ს�მური</language>
-			<language type="ast">�ვსტრიული</language>
-			<language type="az">�ზერბ�იჯ�ნული</language>
-			<language type="be">ბელ�რუსული</language>
-			<language type="bg">ბულგ�რული</language>
-			<language type="bh">ბიჰ�რი</language>
-			<language type="bo">ტიბეტური</language>
-			<language type="br">ბრეტ�ნული</language>
-			<language type="bs">ბ�სნიური</language>
-			<language type="bua">ბური�ტული</language>
-			<language type="ca">კ�ტ�ლ�ნური</language>
-			<language type="cau">კ�ვკ�სიური სხვ�</language>
-			<language type="ce">ჩეჩნური</language>
-			<language type="cel">კელტური სხვ�</language>
-			<language type="cs">ჩეხური</language>
-			<language type="cu">ს�ეკლესი� სლ�ვური</language>
-			<language type="cy">უელსური</language>
-			<language type="da">დ�ნიური</language>
-			<language type="de">გერმ�ნული</language>
-			<language type="de_AT">�ვსტრიული გერმ�ნული</language>
-			<language type="de_CH">შვეიც�რიული მ�ღ�ლი გერმ�ნული</language>
-			<language type="egy">ეგვიპტური</language>
-			<language type="el">ბერძნული</language>
-			<language type="en">ინგლისური</language>
-			<language type="en_AU">�ვსტრ�ლიური ინგლისური</language>
-			<language type="en_CA">კ�ნ�დური ინგლისური</language>
-			<language type="en_GB">ბრიტ�ნული ინგლისური</language>
-			<language type="en_US">�მერიკული ინგლისური</language>
-			<language type="eo">ესპერ�ნტ�</language>
-			<language type="es">ესპ�ნური</language>
-			<language type="es_419">ლ�თინურ �მერიკული ესპ�ნური</language>
-			<language type="es_ES">იბერიული ესპ�ნური</language>
-			<language type="et">ესტ�ნური</language>
-			<language type="eu">ბ�სკური</language>
-			<language type="fa">სპ�რსული</language>
-			<language type="fi">ფინური</language>
-			<language type="fil">ფილიპინური</language>
-			<language type="fr">ფრ�ნგული</language>
-			<language type="fr_CA">კ�ნ�დური ფრ�ნგული</language>
-			<language type="fr_CH">შვეიც�რიული ფრ�ნგული</language>
-			<language type="fro">ძველი ფრ�ნგული</language>
-			<language type="ga">ირლ�ნდიური</language>
-			<language type="gd">შ�ტლ�ნდიურ-გ�ლური</language>
-			<language type="gl">გ�ლური</language>
-			<language type="gn">გუ�რ�ნი</language>
-			<language type="goh">ძველი გერმ�ნული</language>
-			<language type="grc">ძველი ბერძნული</language>
-			<language type="gsw">შვეიც�რიული გერმ�ნული</language>
-			<language type="gu">გუჯ�რ�თი</language>
-			<language type="he">ებრ�ული</language>
-			<language type="hi">ჰინდი</language>
-			<language type="hr">ხ�რვ�ტიული</language>
-			<language type="hu">უნგრული</language>
-			<language type="hy">ს�მხური</language>
-			<language type="ia">ინტერლინგუ�ლური</language>
-			<language type="id">ინდ�ნეზიური</language>
-			<language type="ie">ინტერლინგი</language>
-			<language type="ine">ინდ�-ევრ�პული სხვ�</language>
-			<language type="is">ისლ�ნდიური</language>
-			<language type="it">იტ�ლიური</language>
-			<language type="ja">ი�პ�ნური</language>
-			<language type="jv">ი�ვ�ნური</language>
-			<language type="ka">ქ�რთული</language>
-			<language type="kg">კ�ნგ�</language>
-			<language type="kk">ყ�ზ�ხური</language>
-			<language type="km">კ�მბ�ჯიური</language>
-			<language type="ko">კ�რეული</language>
-			<language type="ku">ქურთული</language>
-			<language type="ky">ყირგიზული</language>
-			<language type="la">ლ�თინური</language>
-			<language type="lb">ლუქსემბურგული</language>
-			<language type="ln">ლინგ�ლ�</language>
-			<language type="lo">ლ��სური</language>
-			<language type="lt">ლიტვური</language>
-			<language type="lv">ლ�ტვიური</language>
-			<language type="mk">მ�კედ�ნიური</language>
-			<language type="mn">მ�ნღ�ლური</language>
-			<language type="mo">მ�ლდ�ვური</language>
-			<language type="ms">მ�ლ�იზიური</language>
-			<language type="myn">მ�ი�ს ენები</language>
-			<language type="nap">ნე�პ�ლიტ�ნური</language>
-			<language type="ne">ნეპ�ლური</language>
-			<language type="nl">ჰ�ლ�ნდიური</language>
-			<language type="nl_BE">ფლ�მ�ნდიური</language>
-			<language type="nn">ნ�რვეგიული ნინ�რსკი</language>
-			<language type="no">ნ�რვეგიული</language>
-			<language type="nv">ნ�ვ�ხ�</language>
-			<language type="oc">�ციტ�ნური</language>
-			<language type="or">�რიული</language>
-			<language type="os">�სური</language>
-			<language type="peo">ძველი სპ�რსული</language>
-			<language type="pl">პ�ლ�ნური</language>
-			<language type="pra">პრ�კრიტის ენები</language>
-			<language type="ps">პუშტუ</language>
-			<language type="pt">პ�რტუგ�ლიური</language>
-			<language type="pt_BR">ბრ�ზილიური პ�რტუგ�ლიური</language>
-			<language type="pt_PT">იბერიულ-პ�რტუგ�ლიური</language>
-			<language type="ro">რუმინული</language>
-			<language type="ru">რუსული</language>
-			<language type="sa">ს�ნსკრიტი</language>
-			<language type="sc">ს�რდინიული</language>
-			<language type="scn">სიცილიური</language>
-			<language type="sd">სინდური</language>
-			<language type="sga">ძველი ირლ�ნდიური</language>
-			<language type="sh">სერბულ-ხ�რვ�ტული</language>
-			<language type="si">სინჰ�ლური</language>
-			<language type="sk">სლ�ვ�კური</language>
-			<language type="sl">სლ�ვენური</language>
-			<language type="sla">სლ�ვური სხვ�</language>
-			<language type="so">ს�მ�ლიური</language>
-			<language type="sq">�ლბ�ნური</language>
-			<language type="sr">სერბული</language>
-			<language type="st">ს�მხრეთ ს�თ�ს ენ�</language>
-			<language type="sux">შუმერული</language>
-			<language type="sv">შვედური</language>
-			<language type="sw">სუ�ჰილი</language>
-			<language type="tg">ტ�ჯიკური</language>
-			<language type="th">ტ�ილ�ნდური</language>
-			<language type="tk">თურქმენული</language>
-			<language type="tlh">კლინგ�ნი</language>
-			<language type="tn">ტსვ�ნ�</language>
-			<language type="tr">თურქული</language>
-			<language type="tw">თუი</language>
-			<language type="udm">უდმურტიული</language>
-			<language type="ug">უიგურული</language>
-			<language type="uk">უკრ�ინული</language>
-			<language type="und">უცნ�ბი �ნ �რ�სწ�რი ენ�</language>
-			<language type="ur">ურდუ</language>
-			<language type="uz">უზბეკური</language>
-			<language type="vi">ვიეტნ�მური</language>
-			<language type="xh">ქს�ზ�</language>
-			<language type="yi">იდიში</language>
-			<language type="zh">ჩინური</language>
-			<language type="zh_Hans">გ�მ�რტივებული ჩინური</language>
-			<language type="zh_Hant">ტრ�დიციული ჩინური</language>
-			<language type="zu">ზულუ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�რ�ბული</script>
-			<script type="Armn">ს�მხური</script>
-			<script type="Bali">ბ�ლი</script>
-			<script type="Batk">ბ�ტ�კი</script>
-			<script type="Beng">ბენგ�ლური</script>
-			<script type="Brai">ბრ�ილი</script>
-			<script type="Copt">კ�პტური</script>
-			<script type="Cprt">კვიპრ�სული</script>
-			<script type="Cyrl">კირილიც�</script>
-			<script type="Cyrs">ძველი ს�ეკლესი� კირილიც�</script>
-			<script type="Deva">დევ�ნ�გ�რი</script>
-			<script type="Egyd">ეგვიპტური დემ�ტიკური</script>
-			<script type="Egyh">ეგვიპტური ჰიერ�ტიკული</script>
-			<script type="Egyp">ეგვიპტური იერ�გლიფური</script>
-			<script type="Ethi">ეთი�პური</script>
-			<script type="Geok">ხუცური</script>
-			<script type="Geor">ქ�რთული</script>
-			<script type="Glag">გლ�გ�ლიც�</script>
-			<script type="Goth">გ�თური</script>
-			<script type="Grek">ბერძნული</script>
-			<script type="Gujr">გუჯ�რ�თული</script>
-			<script type="Guru">გურმუხული</script>
-			<script type="Hani">ჰ�ნი</script>
-			<script type="Hans">გ�მ�რტივებული ჰ�ნი</script>
-			<script type="Hant">ტრ�დიციული ჰ�ნი</script>
-			<script type="Hebr">ებრ�ული</script>
-			<script type="Hira">ჰირ�გ�ნ�</script>
-			<script type="Hrkt">კ�ტ�კ�ნ� �ნ ჰირ�გ�ნ�</script>
-			<script type="Hung">ძველი უნგრული</script>
-			<script type="Jpan">ი�პ�ნური</script>
-			<script type="Kana">კ�ტ�კ�ნ�</script>
-			<script type="Khmr">ქჰმერული</script>
-			<script type="Laoo">ლ��სური</script>
-			<script type="Latn">ლ�თინური</script>
-			<script type="Lina">წრფივი A</script>
-			<script type="Linb">წრფივი B</script>
-			<script type="Maya">მ�ი�ს იერ�გლიფები</script>
-			<script type="Mong">მ�ნღ�ლური</script>
-			<script type="Phnx">ფინიკიური</script>
-			<script type="Runr">რუნული</script>
-			<script type="Syrc">სირიული</script>
-			<script type="Syre">ესტრ�ნჯელ�სეული სირიული</script>
-			<script type="Syrj">დ�ს�ვლეთი სირიული</script>
-			<script type="Syrn">�ღმ�ს�ვლეთი სირიული</script>
-			<script type="Taml">ტ�მილური</script>
-			<script type="Thai">ტ�ილ�ნდური</script>
-			<script type="Tibt">ტიბეტური</script>
-			<script type="Xpeo">ძველი სპ�რსული</script>
-			<script type="Xsux">შუმერულ-�ქ�დური ლურსმნული</script>
-			<script type="Zxxx">დ�უწერელი</script>
-			<script type="Zzzz">უცნ�ბი �ნ �რ�სწ�რი დ�მწერლ�ბ�</script>
-		</scripts>
-		<territories>
-			<territory type="001">მს�ფლი�</territory>
-			<territory type="002">�ფრიკ�</territory>
-			<territory type="003">ჩრდილ�ეთ �მერიკ�</territory>
-			<territory type="005">ს�მხრეთი �მერიკ�</territory>
-			<territory type="009">�კე�ნეთი</territory>
-			<territory type="011">დ�ს�ვლეთი �ფრიკ�</territory>
-			<territory type="013">ცენტრ�ლური �მერიკ�</territory>
-			<territory type="014">�ღმ�ს�ვლეთი �ფრიკ�</territory>
-			<territory type="015">ჩრდილ�ეთი �ფრიკ�</territory>
-			<territory type="017">შუ� �ფრიკ�</territory>
-			<territory type="018">ს�მხრეთი �ფრიკ�</territory>
-			<territory type="019">�მერიკები</territory>
-			<territory type="021">ჩრდილ�ეთი �მერიკ�</territory>
-			<territory type="029">კ�რიბი</territory>
-			<territory type="030">�ღმ�ს�ვლეთი �ზი�</territory>
-			<territory type="034">ს�მხრეთი �ზი�</territory>
-			<territory type="035">ს�მხრეთ-�ღმ�ს�ვლეთი �ზი�</territory>
-			<territory type="039">ს�მხრეთი ევრ�პ�</territory>
-			<territory type="053">�ვსტრ�ლი� დ� �ხ�ლი ზელ�ნდი�</territory>
-			<territory type="054">მელ�ნეზი�</territory>
-			<territory type="057">მირ�ნეზი�</territory>
-			<territory type="061">პ�ლინეზი�</territory>
-			<territory type="062">ს�მხრეთ-ცენტრ�ლური �ზი�</territory>
-			<territory type="142">�ზი�</territory>
-			<territory type="143">ცენტრ�ლური �ზი�</territory>
-			<territory type="145">დ�ს�ვლეთი �ზი�</territory>
-			<territory type="150">ევრ�პ�</territory>
-			<territory type="151">�ღმ�ს�ვლეთი ევრ�პ�</territory>
-			<territory type="154">ჩრდილ�ეთი ევრ�პ�</territory>
-			<territory type="155">დ�ს�ვლეთი ევრ�პ�</territory>
-			<territory type="172">დ�მ�უკიდებელ ს�ხელმწიფ�თ� თ�ნ�მეგ�ბრ�ბ�</territory>
-			<territory type="419">ლ�თინური �მერიკ� დ� კ�რიბი</territory>
-			<territory type="AD">�ნდ�რ�</territory>
-			<territory type="AE">�რ�ბეთის გ�ერთი�ნებული ემირ�ტები</territory>
-			<territory type="AF">�ვღ�ნეთი</territory>
-			<territory type="AG">�ნტიგუ� დ� ბ�რბუდ�</territory>
-			<territory type="AI">�ნგვილ�</territory>
-			<territory type="AL">�ლბ�ნეთი</territory>
-			<territory type="AM">ს�მხეთი</territory>
-			<territory type="AN">ნიდერლ�ნდების �ნტილები</territory>
-			<territory type="AO">�ნგ�ლ�</territory>
-			<territory type="AQ">�ნტ�რქტიკ�</territory>
-			<territory type="AR">�რგენტინ�</territory>
-			<territory type="AS">�მერიკული ს�მ��</territory>
-			<territory type="AT">�ვსტრი�</territory>
-			<territory type="AU">�ვსტრ�ლი�</territory>
-			<territory type="AW">�რუბ�</territory>
-			<territory type="AX">�ლ�ნდის კუნძულები</territory>
-			<territory type="AZ">�ზერბ�იჯ�ნი</territory>
-			<territory type="BA">ბ�სნი� დ� ჰერცეგ�ვინ�</territory>
-			<territory type="BB">ბ�რბ�დ�სი</territory>
-			<territory type="BD">ბ�ნგლ�დეში</territory>
-			<territory type="BE">ბელგი�</territory>
-			<territory type="BF">ბურკინ�-ფ�ს�</territory>
-			<territory type="BG">ბულგ�რეთი</territory>
-			<territory type="BH">ბ�ჰრეინი</territory>
-			<territory type="BI">ბურუნდი</territory>
-			<territory type="BJ">ბენინი</territory>
-			<territory type="BM">ბერმუდ�</territory>
-			<territory type="BN">ბრუნეი</territory>
-			<territory type="BO">ბ�ლივი�</territory>
-			<territory type="BR">ბრ�ზილი�</territory>
-			<territory type="BS">ბ�ჰ�მის კუნძულები</territory>
-			<territory type="BT">ბუტ�ნი</territory>
-			<territory type="BV">ბუვეს კუნძული</territory>
-			<territory type="BW">ბ�ტსვ�ნ�</territory>
-			<territory type="BY">ბელ�რუსი�</territory>
-			<territory type="BZ">ბელიზი</territory>
-			<territory type="CA">კ�ნ�დ�</territory>
-			<territory type="CD">კ�ნგ� - კინშ�ს�</territory>
-			<territory type="CF">ცენტრ�ლური �ფრიკის რესპუბლიკ�</territory>
-			<territory type="CG">კ�ნგ�</territory>
-			<territory type="CH">შვეიც�რი�</territory>
-			<territory type="CI">სპილ�ს ძვლის ს�ნ�პირ�</territory>
-			<territory type="CK">კუკის კუნძულები</territory>
-			<territory type="CL">ჩილე</territory>
-			<territory type="CM">კ�მერუნი</territory>
-			<territory type="CN">ჩინეთი</territory>
-			<territory type="CO">კ�ლუმბი�</territory>
-			<territory type="CR">კ�სტ�-რიკ�</territory>
-			<territory type="CS">სერბი� დ� მ�ნტენეგრ�</territory>
-			<territory type="CU">კუბ�</territory>
-			<territory type="CV">კ�ბ�-ვერდე</territory>
-			<territory type="CX">შ�ბის კუნძული</territory>
-			<territory type="CY">კვიპრ�სი</territory>
-			<territory type="CZ">ჩეხეთის რესპუბლიკ�</territory>
-			<territory type="DE">გერმ�ნი�</territory>
-			<territory type="DJ">ჯიბუტი</territory>
-			<territory type="DK">დ�ნი�</territory>
-			<territory type="DM">დ�მინიკ�</territory>
-			<territory type="DO">დ�მინიკ�ნის რესპუბლიკ�</territory>
-			<territory type="DZ">�ლჟირი</territory>
-			<territory type="EC">ეკვ�დ�რი</territory>
-			<territory type="EE">ესტ�ნეთი</territory>
-			<territory type="EG">ეგვიპტე</territory>
-			<territory type="EH">დ�ს�ვლეთი ს�ჰ�რ�</territory>
-			<territory type="ER">ერიტრე�</territory>
-			<territory type="ES">ესპ�ნეთი</territory>
-			<territory type="ET">ეთი�პი�</territory>
-			<territory type="FI">ფინეთი</territory>
-			<territory type="FJ">ფიჯი</territory>
-			<territory type="FK">ფ�ლკლენდის კუნძულები</territory>
-			<territory type="FM">მიკრ�ნეზი�</territory>
-			<territory type="FO">ფ�რ�ს კუნძულები</territory>
-			<territory type="FR">ს�ფრ�ნგეთი</territory>
-			<territory type="GA">გ�ბ�ნი</territory>
-			<territory type="GB">დიდი ბრიტ�ნეთი</territory>
-			<territory type="GD">გრენ�დ�</territory>
-			<territory type="GE">ს�ქ�რთველ�</territory>
-			<territory type="GH">გ�ნ�</territory>
-			<territory type="GI">გიბრ�ლტ�რი</territory>
-			<territory type="GL">გრენლ�ნდი�</territory>
-			<territory type="GM">გ�მბი�</territory>
-			<territory type="GN">გვინე�</territory>
-			<territory type="GP">გვ�დელუპე</territory>
-			<territory type="GQ">ეკვ�ტ�რული გვინე�</territory>
-			<territory type="GR">ს�ბერძნეთი</territory>
-			<territory type="GS">ს�მხრეთი ჯ�რჯი� დ� ს�მხრეთ სენდვიჩის კუნძულები</territory>
-			<territory type="GT">გვ�ტემ�ლ�</territory>
-			<territory type="GU">გუ�მი</territory>
-			<territory type="GW">გვინე�-ბის�უ</territory>
-			<territory type="GY">გ�ი�ნ�</territory>
-			<territory type="HK">ჰ�ნგ კ�ნგი</territory>
-			<territory type="HM">ჰერდის კუნძული დ� მ�კდ�ნ�ლდის კუნძულები</territory>
-			<territory type="HN">ჰ�ნდურ�სი</territory>
-			<territory type="HR">ჰ�რვ�ტი�</territory>
-			<territory type="HT">ჰ�იტი</territory>
-			<territory type="HU">უნგრეთი</territory>
-			<territory type="ID">ინდ�ნეზი�</territory>
-			<territory type="IE">ირლ�ნდი�</territory>
-			<territory type="IL">ისრ�ელი</territory>
-			<territory type="IM">მ�ნის კუნძული</territory>
-			<territory type="IN">ინდ�ეთი</territory>
-			<territory type="IO">ბრიტ�ნული ტერიტ�რი� ინდ�ეთის �კე�ნეში</territory>
-			<territory type="IQ">ერ�ყი</territory>
-			<territory type="IR">ირ�ნი</territory>
-			<territory type="IS">ისლ�ნდი�</territory>
-			<territory type="IT">იტ�ლი�</territory>
-			<territory type="JE">ჯერსი</territory>
-			<territory type="JM">ი�მ�იკ�</territory>
-			<territory type="JO">ი�რდ�ნი�</territory>
-			<territory type="JP">ი�პ�ნი�</territory>
-			<territory type="KE">კენი�</territory>
-			<territory type="KG">ყირგიზეთი</territory>
-			<territory type="KH">კ�მბ�ჯ�</territory>
-			<territory type="KI">კირიბ�ტი</territory>
-			<territory type="KM">კ�მ�რის კუნძულები</territory>
-			<territory type="KN">სენტ-კიტსი დ� ნევისი</territory>
-			<territory type="KP">ჩრდილ�ეთი კ�რე�</territory>
-			<territory type="KR">ს�მხრეთი კ�რე�</territory>
-			<territory type="KW">კუვეიტი</territory>
-			<territory type="KY">კ�იმ�ნის კუნძულები</territory>
-			<territory type="KZ">ყ�ზ�ხეთი</territory>
-			<territory type="LA">ლ��სი</territory>
-			<territory type="LB">ლიბ�ნი</territory>
-			<territory type="LC">სენტ-ლუსი�</territory>
-			<territory type="LI">ლიხტენშტ�ინი</territory>
-			<territory type="LK">შრი-ლ�ნკ�</territory>
-			<territory type="LR">ლიბერი�</territory>
-			<territory type="LS">ლეს�თ�</territory>
-			<territory type="LT">ლიტვ�</territory>
-			<territory type="LU">ლუქსემბურგი</territory>
-			<territory type="LV">ლ�ტვი�</territory>
-			<territory type="LY">ლიბი�</territory>
-			<territory type="MA">მ�რ�კ�</territory>
-			<territory type="MC">მ�ნ�კ�</territory>
-			<territory type="MD">მ�ლდ�ვ�</territory>
-			<territory type="ME">მ�ნტენეგრ�</territory>
-			<territory type="MG">მ�დ�გ�სკ�რი</territory>
-			<territory type="MH">მ�რშ�ლის კუნძულები</territory>
-			<territory type="MK">მ�კედ�ნი�</territory>
-			<territory type="ML">მ�ლი</territory>
-			<territory type="MM">მი�ნმ�რი</territory>
-			<territory type="MN">მ�ნღ�ლეთი</territory>
-			<territory type="MO">მ�კ��</territory>
-			<territory type="MQ">მ�რტინიკი</territory>
-			<territory type="MR">მ�ვრიტ�ნი�</territory>
-			<territory type="MS">მ�ნსერ�ტი</territory>
-			<territory type="MT">მ�ლტ�</territory>
-			<territory type="MU">მ�ვრიკი�</territory>
-			<territory type="MV">მ�ლდივის კუნძულები</territory>
-			<territory type="MW">მ�ლ�ვი</territory>
-			<territory type="MX">მექსიკ�</territory>
-			<territory type="MY">მ�ლ�იზი�</territory>
-			<territory type="MZ">მ�ზ�მბიკი</territory>
-			<territory type="NA">ნ�მიბი�</territory>
-			<territory type="NC">�ხ�ლი კ�ლედ�ნი�</territory>
-			<territory type="NE">ნიგერი</territory>
-			<territory type="NF">ნ�რფ�ლკის კუნძული</territory>
-			<territory type="NG">ნიგერი�</territory>
-			<territory type="NI">ნიკ�რ�გუ�</territory>
-			<territory type="NL">ნიდერლ�ნდები</territory>
-			<territory type="NO">ნ�რვეგი�</territory>
-			<territory type="NP">ნეპ�ლი</territory>
-			<territory type="NR">ნ�ურუ</territory>
-			<territory type="NZ">�ხ�ლი ზელ�ნდი�</territory>
-			<territory type="OM">�მ�ნი</territory>
-			<territory type="PA">პ�ნ�მ�</territory>
-			<territory type="PE">პერუ</territory>
-			<territory type="PF">ფრ�ნგული პ�ლინეზი�</territory>
-			<territory type="PG">პ�პუ�-�ხ�ლი გვინე�</territory>
-			<territory type="PH">ფილიპინები</territory>
-			<territory type="PK">პ�კისტ�ნი</territory>
-			<territory type="PL">პ�ლ�ნეთი</territory>
-			<territory type="PM">სენტ-პიერი დ� მიქელ�ნი</territory>
-			<territory type="PR">პუერტ� რიკ�</territory>
-			<territory type="PS">პ�ლესტინის ტერიტ�რი�</territory>
-			<territory type="PT">პ�რტუგ�ლი�</territory>
-			<territory type="PW">პ�ლ�უ</territory>
-			<territory type="PY">პ�რ�გვ�ი</territory>
-			<territory type="QA">კ�ტ�რი</territory>
-			<territory type="QO">დ�შ�რებული �კე�ნი�</territory>
-			<territory type="QU">ევრ�კ�ვშირი</territory>
-			<territory type="RE">რეიუნი�ნი</territory>
-			<territory type="RO">რუმინეთი</territory>
-			<territory type="RS">სერბი�</territory>
-			<territory type="RU">რუსეთი</territory>
-			<territory type="RW">რუ�ნდ�</territory>
-			<territory type="SA">ს�უდის �რ�ბეთი</territory>
-			<territory type="SB">ს�ლ�მ�ნის კუნძულები</territory>
-			<territory type="SC">სეიშელის კუნძულები</territory>
-			<territory type="SD">სუდ�ნი</territory>
-			<territory type="SE">შვეცი�</territory>
-			<territory type="SG">სინგ�პური</territory>
-			<territory type="SH">წმინდ� ელენეს კუნძული</territory>
-			<territory type="SI">სლ�ვენი�</territory>
-			<territory type="SK">სლ�ვ�კეთი</territory>
-			<territory type="SL">სიერ�-ლე�ნე</territory>
-			<territory type="SM">ს�ნ-მ�რინ�</territory>
-			<territory type="SN">სენეგ�ლი</territory>
-			<territory type="SO">ს�მ�ლი</territory>
-			<territory type="SR">სურინ�მი</territory>
-			<territory type="ST">ს��-ტ�მე დ� პრინსიპი</territory>
-			<territory type="SV">ს�ლვ�დ�რი</territory>
-			<territory type="SY">სირი�</territory>
-			<territory type="SZ">სვ�ზილენდი</territory>
-			<territory type="TD">ჩ�დი</territory>
-			<territory type="TF">ფრ�ნგული ს�მხრეთის ტერიტ�რიები</territory>
-			<territory type="TG">ტ�გ�</territory>
-			<territory type="TH">ტ�ილ�ნდი</territory>
-			<territory type="TJ">ტ�ჯიკეთი</territory>
-			<territory type="TL">�ღმ�ს�ვლეთი ტიმ�რი</territory>
-			<territory type="TM">თურქმენეთი</territory>
-			<territory type="TN">ტუნისი</territory>
-			<territory type="TO">ტ�ნგ�</territory>
-			<territory type="TR">თურქეთი</territory>
-			<territory type="TT">ტრინიდ�დი დ� ტ�ბ�გ�</territory>
-			<territory type="TV">ტუვ�ლუ</territory>
-			<territory type="TW">ტ�ივ�ნი</territory>
-			<territory type="TZ">ტ�ნზ�ნი�</territory>
-			<territory type="UA">უკრ�ინ�</territory>
-			<territory type="UG">უგ�ნდ�</territory>
-			<territory type="UM">შეერთებული შტ�ტების მცირე დ�შ�რებული კუნძულები</territory>
-			<territory type="US">�მერიკის შეერთებული შტ�ტები</territory>
-			<territory type="UY">ურუგვ�ი</territory>
-			<territory type="UZ">უზბეკეთი</territory>
-			<territory type="VA">ვ�ტიკ�ნი</territory>
-			<territory type="VC">სენტ-ვინსენტი დ� გრენ�დინები</territory>
-			<territory type="VE">ვენესუელ�</territory>
-			<territory type="VN">ვიეტნ�მი</territory>
-			<territory type="VU">ვ�ნუ�ტუ</territory>
-			<territory type="WF">ვ�ლისი დ� ფუტუნ�</territory>
-			<territory type="WS">ს�მ��</territory>
-			<territory type="YE">იემენი</territory>
-			<territory type="ZA">ს�მხრეთ �ფრიკ�</territory>
-			<territory type="ZM">ზ�მბი�</territory>
-			<territory type="ZW">ზიმბ�ბვე</territory>
-			<territory type="ZZ">უცნ�ბი �ნ �რ�სწ�რი რეგი�ნი</territory>
-		</territories>
-		<keys>
-			<key type="calendar">კ�ლენდ�რი</key>
-			<key type="collation">მიმდევრ�ბ�</key>
-			<key type="currency">ვ�ლუტ�</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">ტრ�დიციული ჩინური</type>
-			<type type="buddhist" key="calendar">ბუდისტური კ�ლენდ�რი</type>
-			<type type="chinese" key="calendar">ჩინური კ�ლენდ�რი</type>
-			<type type="direct" key="collation">პირდ�პირი მიმდევრ�ბ�</type>
-			<type type="gb2312han" key="collation">გ�მ�რტივებული ჩინური</type>
-			<type type="gregorian" key="calendar">გრიგ�რი�ნული კ�ლენდ�რი</type>
-			<type type="hebrew" key="calendar">ებრ�ული კ�ლენდ�რი</type>
-			<type type="indian" key="calendar">ინდური ერ�ვნული კ�ლენდ�რი</type>
-			<type type="islamic" key="calendar">ისლ�მური კ�ლენდ�რი</type>
-			<type type="islamic-civil" key="calendar">ისლ�მური ს�მ�ქ�ლ�ქ� კ�ლენდ�რი</type>
-			<type type="japanese" key="calendar">ი�პ�ნური კ�ლენდ�რი</type>
-			<type type="roc" key="calendar">ჩინეთის რესპუბლიკის კ�ლენდ�რი</type>
-			<type type="traditional" key="collation">ტრ�დიციული</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[� ⴀ ბ � გ ⴂ დ ⴃ ე ⴄ ვ ⴅ ზ ⴆ ჱ ⴡ თ ⴇ ი ⴈ კ ⴉ ლ ⴊ მ ⴋ ნ ⴌ ჲ ⴢ � � პ ⴎ ჟ � რ � ს ⴑ ტ ⴒ ჳ ⴣ უ ⴓ ფ ⴔ ქ ⴕ ღ ⴖ ყ ⴗ შ ⴘ ჩ ⴙ ც ⴚ ძ ⴛ წ ⴜ ჭ � ხ ⴞ ჴ ⴤ ჯ ⴟ ჰ ⴠ ჵ ⴥ ჶ-ჺ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ი�ნ</month>
-							<month type="2">თებ</month>
-							<month type="3">მ�რ</month>
-							<month type="4">�პრ</month>
-							<month type="5">მ�ი</month>
-							<month type="6">ივნ</month>
-							<month type="7">ივლ</month>
-							<month type="8">�გვ</month>
-							<month type="9">სექ</month>
-							<month type="10">�ქტ</month>
-							<month type="11">ნ�ე</month>
-							<month type="12">დეკ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ი�ნვ�რი</month>
-							<month type="2">თებერვ�ლი</month>
-							<month type="3">მ�რტი</month>
-							<month type="4">�პრილი</month>
-							<month type="5">მ�ისი</month>
-							<month type="6">ივნისი</month>
-							<month type="7">ივლისი</month>
-							<month type="8">�გვისტ�</month>
-							<month type="9">სექტემბერი</month>
-							<month type="10">�ქტ�მბერი</month>
-							<month type="11">ნ�ემბერი</month>
-							<month type="12">დეკემბერი</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ი</month>
-							<month type="2">თ</month>
-							<month type="3">მ</month>
-							<month type="4">�</month>
-							<month type="5">მ</month>
-							<month type="6">ი</month>
-							<month type="7">ი</month>
-							<month type="8">�</month>
-							<month type="9">ს</month>
-							<month type="10">�</month>
-							<month type="11">ნ</month>
-							<month type="12">დ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">კვი</day>
-							<day type="mon">�რშ</day>
-							<day type="tue">ს�მ</day>
-							<day type="wed">�თხ</day>
-							<day type="thu">ხუთ</day>
-							<day type="fri">პ�რ</day>
-							<day type="sat">შ�ბ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">კვირ�</day>
-							<day type="mon">�რშ�ბ�თი</day>
-							<day type="tue">ს�მშ�ბ�თი</day>
-							<day type="wed">�თხშ�ბ�თი</day>
-							<day type="thu">ხუთშ�ბ�თი</day>
-							<day type="fri">პ�რ�სკევი</day>
-							<day type="sat">შ�ბ�თი</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">კ</day>
-							<day type="mon">�</day>
-							<day type="tue">ს</day>
-							<day type="wed">�</day>
-							<day type="thu">ხ</day>
-							<day type="fri">პ</day>
-							<day type="sat">შ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">I კვ.</quarter>
-							<quarter type="2">II კვ.</quarter>
-							<quarter type="3">III კვ.</quarter>
-							<quarter type="4">IV კვ.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-ლი კვ�რტ�ლი</quarter>
-							<quarter type="2">მე-2 კვ�რტ�ლი</quarter>
-							<quarter type="3">მე-3 კვ�რტ�ლი</quarter>
-							<quarter type="4">მე-4 კვ�რტ�ლი</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="wide">
-							<quarter type="1">I კვ�რტ�ლი</quarter>
-							<quarter type="2">II კვ�რტ�ლი</quarter>
-							<quarter type="3">III კვ�რტ�ლი</quarter>
-							<quarter type="4">IV კვ�რტ�ლი</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>დილის</am>
-				<pm>ს�ღ�მ�ს</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ჩვენს წელთ�ღრიცხვ�მდე</era>
-						<era type="1">ჩვენი წელთ�ღრიცხვით</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ჩვენს წელთ�ღრიცხვ�მდე</era>
-						<era type="1">ჩვენი წელთ�ღრიცხვით</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ჩვენს წელთ�ღრიცხვ�მდე</era>
-						<era type="1">ჩვენი წელთ�ღრიცხვით</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd MMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMdd">dd/MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d MMM, yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE, d MMM, yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ხ�ნ�</displayName>
-					</field>
-					<field type="year">
-						<displayName>წელი</displayName>
-					</field>
-					<field type="month">
-						<displayName>თვე</displayName>
-					</field>
-					<field type="week">
-						<displayName>კვირ�</displayName>
-					</field>
-					<field type="day">
-						<displayName>დღე</displayName>
-						<relative type="-3">ს�მი დღის წინ</relative>
-						<relative type="-2">გუშინწინ</relative>
-						<relative type="-1">გუშინ</relative>
-						<relative type="0">დღეს</relative>
-						<relative type="1">ხვ�ლ</relative>
-						<relative type="2">ზეგ</relative>
-						<relative type="3">ს�მი დღის შემდეგ</relative>
-					</field>
-					<field type="weekday">
-						<displayName>კვირის დღე</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>დღის პერი�დი</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ს��თი</displayName>
-					</field>
-					<field type="minute">
-						<displayName>წუთი</displayName>
-					</field>
-					<field type="second">
-						<displayName>წ�მი</displayName>
-					</field>
-					<field type="zone">
-						<displayName>ზ�ნ�</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>უცნ�ბი</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>ბ�რბუდ�</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�ნგილ�</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>ნიდერლ�ნდის</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>�ნგ�ლ�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>რ�თერ�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>პ�ლმერი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>ს�მხრეთი პ�ლუსი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>სი�უ�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>მ�უს�ნი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>დევისი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>ვ�სტ�კი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>კეისი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>დიუმ�ნ დ'ურვილი</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>მ�კმურდ�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>რი� გ�ლეგ�სი</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>მენდ�ზ�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>ს�ნ ხუ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>უშუ�ი�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ლ� რი�ხ�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>ს�ნ ლუისი</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>კ�ტ�მ�რკ�</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>ჯუჯუი</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>ტუკუმ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>კ�რდ�ბ�</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ბუენ�ს �ირესი</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>პერთი</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>ეუკლ�</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>დ�რვინი</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�დელ�იდ�</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ბრ�უკენ ჰილი</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ქური</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>მელბურნი</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>ჰ�ბ�რტი</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>ლინდმ�ნი</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>სიდნეი</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ბრისბეინი</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>ლ�რდ ჰ�უი</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�რუბ�</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>ბ�რბ�დ�სი</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>ბურკინ� ფ�ს�</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>ბურუნდი</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>ბენინი</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>ბ�ლივი�</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>ეირუნეპე</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>რი� ბრ�ნკ�</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>პ�რტ� ველჰ�</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>ბ�� ვისტ�</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>მ�ნ�უსი</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>კუი�ბ�</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>კ�მპ� გრ�ნდე</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>ბელემი</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�რ�გუ�ინ�</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>ს�� პ�ულ�</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>ბ�ი�</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>ფ�რტ�ლეზ�</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>მ�სეი�</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>რეციფე</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>ნ�რ�ნი�</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>ბ�ჰ�მის კუნძულები</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>ბ�ტსვ�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>ბელიზი</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>დ�უს�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>უ�ითჰ�რსი</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>ინუვიკი</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>ვ�ნკუვერი</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>დ�უს�ნ ქრიკი</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>იელ�უნ�იფი</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>ედმ�ნტ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>სვიფტ კ�რენტი</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>კემბრიჯ ბეი</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>რეჯინ�</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>უინიპეგი</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>რეზ�ლუტე</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>რეინი რივერი</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>რენკინ ინლეტი</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>ქ�რ�ლ ჰ�რბ�რი</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>თ�ნდერ ბეი</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>ნიპიგ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>ტ�რ�ნტ�</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>მ�ნრე�ლი</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>იქ�ლუიტი</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>პ�ნგნირტუნგი</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>მ�ნქტ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>ჰ�ლიფ�ქსი</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>გუზ ბეი</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>გლეის ბეი</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ბლ�ნ-ს�ბლ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>სენტ ჯ�ნსი</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>კინშ�ს�</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ლუბუმბ�ში</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>ცენტრ�ლური �ფრიკის რესპუბლიკ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>კ�ნგ� - ბრ�ზ�ვილი</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>სპილ�ს ძვლის ს�ნ�პირ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ისთერი</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>კ�მერუნი</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>კ�შგ�რი</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>ურუმქი</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ჩ�ნგქინგი</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>ჰ�რბინი</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>კ�ლუმბი�</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>კ�სტ� რიკ�</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>კუბ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>ჯიბუტი</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>დ�მინიკ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�ლჟირი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>გ�ლ�პ�გ�სი</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>ეგვიპტე</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>დ�ს�ვლეთი ს�ჰ�რ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>ერითრე�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>კ�ნ�რი</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>სეუტ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>ეთი�პი�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ტრუკი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>პ�ნ�პე</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>კ�სრ�ე</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>გ�ბ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>გრენ�დ�</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>გუი�ნ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>გ�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>თულე</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>სკ�რსბისუნდი</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>დენმ�რკშ�ვნი</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>გ�მბი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>გინე�</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>გუ�დელუპე</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>ეკვ�ტ�რული გვინე�</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>გუ�ტემ�ლ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>გინე�-ბის�უ</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>გუი�ნ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>ჯ�კ�რტ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>პ�ნტი�ნ�კი</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>მ�კ�ს�რი</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ჯ�ი�პურ�</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>ი�მ�იკ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>კენი�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>ენდერბური</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>კირიტიმ�ტი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>ტ�რ�უ�</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>კ�იმ�ნის</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ქტ�უ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>�რ�ლი</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�ქტ�ბე</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>ყიზილ�რდ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�ლმ�ტი</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>ლიბერი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>ლეს�თ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>ლიბი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>მ�რ�კ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>კვ�ჯ�ლეინი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>მ�ხურ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>მ�ლი</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>ჰ�ვდი</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>ულ�ნბ�ტ�რი</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ჩ�იბ�ლს�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>მ�რტინიკი</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>მ�ვრიტ�ნი�</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>მ�ნსერ�ტი</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>მ�ლ�ვი</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>ტიხუ�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>ჰერმ�სი�</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>მ�ზ�ტლ�ნი</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ჩიჰუ�ჰუ�</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>მ�ნტერეი</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>მექსიკ� სითი</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>მერიდ�</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>კ�ნკუნი</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>კუჩინგი</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>მ�ზ�მბიკი</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>ნ�მიბი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>ნიგერი</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>ნიგერი�</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>ნიკ�რ�გუ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>ჩ�თ�მი</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>პერუ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>მ�რკეზ�სი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>გƒ�მბიერი</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>სენტ პიერი დ� მიკელ�ნი</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�ზ�რეს</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>მ�დეირ�</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>პ�რ�გვ�ი</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>კ�ლინინგრ�დი</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>მ�სკ�ვი</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>ვ�ლგ�გრ�დი</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>ს�მ�რ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>ეკ�ტერინბურგი</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>�მსკი</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>ნ�ვ�სიბირსკი</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>კრ�სნ�ი�რსკი</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ირკუტსკი</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ი�კუტსკი</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>ვლ�დივ�სტ�კი</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>ს�ხ�ლინი</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>მ�გ�დ�ნი</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>კ�მჩ�ტკ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�ნ�დირი</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>რუ�ნდ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>სუდ�ნი</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>სიერ� ლე�ნე</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>სენეგ�ლი</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>ს�მ�ლი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>ს�� ტ�მე დ� პრინსიპე</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>ელ ს�ლვ�დ�რი</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>სვ�ზილენდი</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>ტერკის დ� კ�იკ�ს</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>ჩ�დი</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>ტ�გ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>ტუნისი</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>ტ�ნზ�ნი�</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>უჟგ�რ�დი</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>კიევი</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>სიმფერ�პ�ლი</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ზ�პ�რ�ჟიე</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>უგ�ნდ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>მიდუეი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ჯ�ნსტ�ნი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>უეიკი</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�დ�კი</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>ნ�მი</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>ჰ�ნ�ლულუ</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>ენქ�რ�ჯი</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ი�კუტ�ტი</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>ჯუნ�</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>ლ�ს �ნჯელესი</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>ბუ�სი</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ფენიქსი</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>შიპრ�კი</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>დენვერი</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>ნიუ ს�ლემი, ჩრდილ�ეთი დ�კ�ტ�</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>ცენტრი, ჩრდილ�ეთი დ�კ�ტ�</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ჩიკ�გ�</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>მენ�მინი</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>ვინსენი, ინდი�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>პიტერსბურგი</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>თელ სითი, ინდი�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>ნ�ქსი, ინდი�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>უინემ�კი, ინდი�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>მ�რენგ�</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>ინდი�ნ�პ�ლისი</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ლუისვილი</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>ვივეი, ინდი�ნ�</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>მ�ნტიჩელ�</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>დეტრ�იტი</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>ნიუ ი�რკი</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>ურუგვ�ი</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>ს�მ�რყ�ნდი</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>ვენესუელ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>ს�მხრეთი �ფრიკ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>ზ�მბი�</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>ზიმბ�ბვე</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ნდ�რული პესეტ�</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>გ�ერთი�ნებული �რ�ბული ს�ემირ�ების დირჰემი</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�ვღ�ნი (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�ვღ�ნი</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�ლბ�ნური ლეკი</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>ს�მხური დრ�მი</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>ნიდრელ�ნდების �ნტილიის გულდენი</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�ნგ�ლური კვ�ნზ�</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�ნგ�ლური კვ�ნზ� (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�ნგ�ლური �ხ�ლი კვ�ნზ� (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�ნგ�ლური მიტ�ლებული კვ�ნზ� (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>�რგენტინული �უსტრ�ლი</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>�რგენტინული პეს� (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>�რგენტინული პეს�</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�ვსტრიული შილინგი</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�ვსტრ�ლიური დ�ლ�რი</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�რუბ�ნული გულდენი</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>�ზერბ�იჯ�ნული მ�ნ�თი (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>�ზერბ�იჯ�ნული მ�ნ�თი</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>ბ�სნი�-ჰერც�გ�ვინ�ს დინ�რი</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>ბ�სნი�-ჰერც�გ�ვინ�ს კ�ნვერტირებ�დი მ�რკ�</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>ბ�რბ�დ�სული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>ბ�ნგლ�დეშური ტ�კ�</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>ბელგიური ფრ�ნკი (კ�ვერტირებ�დი)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>ბელგიური ფრ�ნკი</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>ბელგიური ფრ�ნკი (ფინ�ნსური)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>ბულგ�რული მყ�რი ლევი</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>ბულგ�რული �ხ�ლი ლევი</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>ბ�ჰრეინული დინ�რი</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ბურუნდიული ფრ�ნკი</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>ბერმუდული დინ�რი</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ბრუნეული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>ბ�ლივი�ნ�</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>ბ�ლივიური პეს�</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>ბრ�ზილიური კრუზეირ� ნ�ვ� (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>ბრ�ზილიური კრუზ�დ�</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>ბრ�ზილიური კრუზეირ� (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ბრ�ზილიური რე�ლი</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>ბრ�ზილიური კრუზ�დ� ნ�ვ�</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>ბრ�ზილიური კრუზეირ�</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>ბ�ჰ�მური დ�ლ�რი</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>ბ�ტსვ�ნიური პულ�</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>�ხ�ლი ბელ�რუსიული რუბლი (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>ბელ�რუსიული რუბლი</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>კ�ნ�დური დ�ლ�რი</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>შვეიც�რიული ფრ�ნკი</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>ჩინური უ�ნი</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>კ�სტ� რიკული კ�ლ�ნი</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>ძველი სერბიული დინ�რი</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>ჩეხ�სლ�ვ�კიის მყ�რი კრ�ნ�</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>კუბური პეს�</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>კ�ბ� ვერდეს ესკუდ�</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>კვიპრ�სის გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>ჩეხური კრ�ნ�</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>�ღმ�ს�ვლეთ გერმ�ნული მ�რკ�</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>გერმ�ნული მ�რკ�</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>ჯიბუტის ფრ�ნკი</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>დ�ნიური კრ�ნ�</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>დ�მინიკური პეს�</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�ლჟირიული დინ�რი</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>ესტ�ნური კრუნ�</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>ეგვიპტური გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>ესპ�ნური პესეტ�</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ევრ�</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>ფინური მ�რკ�</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>ფიჯი დ�ლ�რი</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>ფრ�ნგული ფრ�ნკი</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ინგლისური გირვ�ნქ� სტერლინგი</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>ქ�რთული კუპ�ნი ლ�რით</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>ქ�რთული ლ�რი</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>ბერძნული დრ�ჰმ�</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>პ�რტუგ�ლიური გინე� ესკუდ�</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>ჰ�ნგ კ�ნგის დ�ლ�რი</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>ჰ�ნდურ�სის ლემპირ�</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>ხ�რვ�ტიული დინ�რი</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>ხ�რვ�ტიული კუნ�</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>უნგრული ფ�რინტი</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>ინდ�ნეზიური რუპი�</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>ირლ�ნდიური გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>ინდური რუპი�</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>ისლ�ნდიური კრ�ნ�</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>იტ�ლიური ლირ�</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>ი�მ�იკური დ�ლ�რი</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>ი�რდ�ნიული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ი�პ�ნური იენი</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>კენიური შილინგი</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>ყირღიზული ს�მი</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>ჩრდილ�ეთ კ�რეული ვ�ნი</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>ს�მხრეთ კ�რეული ვ�ნი</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>კუვეიტური დინ�რი</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>კ�იმ�ნის კუნძულების დ�ლ�რი</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>ყ�ზ�ხური ტენგე</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>შრი ლ�ნკის რუპი�</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>ლიბერიული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>ლიტვური ლიტ�</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>ლიტვური ტ�ლ�ნი</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>ლუქსემბურგის კ�ნვერტირებ�დი ფრ�ნკი</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>ლუქსემბურგის ფრ�ნკი</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>ლუქსემბურგის ფინ�ნსური ფრ�ნკი</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>ლ�ტვიური ლ�ტი</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>ლ�ტვიური რუბლი</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>ლიბიური დინ�რი</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>მ�რ�კ�ს დირჰ�მი</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>მ�რ�კ�ს ფრ�ნკი</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>მ�ლდ�ვური ლეუ</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>მ�დ�გ�სკ�რის �რი�რი</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>მ�დ�გ�სკ�რის ფრ�ნკი</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>მ�კედ�ნიური დენ�რი</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>მ�ლის ფრ�ნკი</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>მი�ნმ�რის კი�ტი</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>მ�ნღ�ლური ტუგრიკი</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>მ�ლტის ლირ�</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>მ�ლტის გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>მ�ვრიტ�ნული რუპი�</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>მ�ლდივური რუფი�</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>მ�ლ�ვის კვ�ნჩ�</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>მექსიკური პეს�</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>მექსიკური ვერცხლის პეს� (1861-1992)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>მ�ლ�იზიური რინგიტი</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>მ�ზ�მბიკური ესკუდ�</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>ძველი მ�ზ�მბიკური მეტიკ�ლი</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>მ�ზ�მბიკური მეტიკ�ლი</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>ნ�მიბიური დ�ლ�რი</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>ნიგერიული ნ�ირ�</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>ნიკ�რ�გუ�ს კ�რდ�ბ�</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>ნიკ�რ�გუ�ს �ქრ�ს კ�რდ�ბ�</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>ჰ�ლ�ნდიური გულდენი</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>ნ�რვეგიული კრ�ნ�</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>ნეპ�ლური რუპი�</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�ხ�ლი ზელ�ნდიის დ�ლ�რი</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>�მ�ნის რე�ლი</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>პერუს ინტი</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>პერუს �ხ�ლი ს�ლი</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>პერუს ს�ლი</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>ფილიპინური პეს�</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>პ�კისტ�ნური რუპი�</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>პ�ლ�ნური ზლ�ტი</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>პ�ლ�ნური ზლ�ტი (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>პ�რტუგ�ლიური ესკუდ�</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>კ�ტ�რის რი�ლი</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>რ�დეზიული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>ძველი რუმინული ლეუ</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>რუმინული ლეუ</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>რუსული რუბლი</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>რუსული რუბლი (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>რუ�ნდული ფრ�ნკი</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>სეიშელის რუპი�</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>სუდ�ნის დინ�რი</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>სუდ�ნის გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>შვედური კრ�ნ�</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>სინგ�პურის დ�ლ�რი</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>სიერ� ლე�ნეს ლე�ნე</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>სურინ�მის დ�ლ�რი</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>სურინ�მის გულდენი</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>ს�ბჭ�თ� რუბლი</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>სირიული გირვ�ნქ�</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>ტ�ჯიკური რუბლი</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>ტ�ჯიკური ს�მ�ნი</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>თურქმენული მ�ნ�თი</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>ტუნისიური დინ�რი</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>თურქული ლირ�</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>�ხ�ლი თურქული ლირ�</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>ტრინიდ�დ დ� ტ�ბ�გ�ს დ�ლ�რი</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>ტ�ივ�ნური �ხ�ლი დ�ლ�რი</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>ტ�ნზ�ნიური შილინგი</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>უკრ�ინული გრივნ�</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>უკრ�ინული კ�რბ�ვ�ნეცი</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>უგ�ნდური შილინგი (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>უგ�ნდური შილინგი</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�შშ დ�ლ�რი</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>�შშ დ�ლ�რი (შემდეგი დღე)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>�შშ დ�ლ�რი (იგივე დღე)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>ურუგვ�ის პეს� (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>ურუგვ�ის პეს� ურუგვ�ი�</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>უზბეკური სუმი</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>ვენესუელის ბ�ლივ�რი</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>ვიეტნ�მური დ�ნგი</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>ვ�ნ�ტუს ვ�ტუ</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>დ�ს�ვლეთ ს�მ��ს ტ�ლ�</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>ვერცხლი</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>ევრ�პული კ�მპპ�ზიტური ერთეული</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>ევრ�პული ფულ�დი ერთეული</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>�ღმ�ს�ვლეთ კ�რიბიული დ�ლ�რი</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ევრ�პული ს�ვ�ლუტ� ერთეული</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>ფრ�ნგული �ქრ�ს ფრ�ნკი</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>უცნ�ბი �ნ �რ�სწ�რი ვ�ლუტ�</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>იემენის დინ�რი</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>იემენის რე�ლი</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>იუგ�სლ�ვიური მყ�რი დინ�რი</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>იუგ�სლ�ვიური �ხ�ლი დინ�რი</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>იუგ�სლ�ვიური კ�ნვერტირებ�დი დინ�რი</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>ზ�მბიური კვ�ნჩ�</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>ზ�ირის �ხ�ლი ზ�ირი</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>ზ�ირის ზ�ირი</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>ზიმბ�ბვეს დ�ლ�რი</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} დღე</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} ს��თი</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} წუთი</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} თვე</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} წ�მი</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} კვირ�</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} წელი</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>დი�ხ</yesstr>
-			<nostr>�რ�</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ka_GE.xml b/airtime_mvc/library/Zend/Locale/Data/ka_GE.xml
deleted file mode 100644
index e6016642f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ka_GE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="ka"/>
-		<territory type="GE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kaj.xml b/airtime_mvc/library/Zend/Locale/Data/kaj.xml
deleted file mode 100644
index 37e9ef553..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kaj.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.27 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kaj"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">A̱yr</month>
-							<month type="2">A̱hw</month>
-							<month type="3">A̱ta</month>
-							<month type="4">A̱na</month>
-							<month type="5">A̱pf</month>
-							<month type="6">A̱ki</month>
-							<month type="7">A̱ty</month>
-							<month type="8">A̱ni</month>
-							<month type="9">A̱ku</month>
-							<month type="10">Swa</month>
-							<month type="11">Sby</month>
-							<month type="12">Sbh</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Hywan A̱yrnig</month>
-							<month type="2">Hywan A̱hwa</month>
-							<month type="3">Hywan A̱tat</month>
-							<month type="4">Hywan A̱naai</month>
-							<month type="5">Hywan A̱pfwon</month>
-							<month type="6">Hywan A̱kitat</month>
-							<month type="7">Hywan A̱tyirin</month>
-							<month type="8">Hywan A̱ninai</month>
-							<month type="9">Hywan A̱kumviriyin</month>
-							<month type="10">Hywan Swak</month>
-							<month type="11">Hywan Swak B'a̱yrnig</month>
-							<month type="12">Hywan Swak B'a̱hwa</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Lad</day>
-							<day type="mon">Lin</day>
-							<day type="tue">Tal</day>
-							<day type="wed">Lar</day>
-							<day type="thu">Lam</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Asa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ladi</day>
-							<day type="mon">Lintani</day>
-							<day type="tue">Talata</day>
-							<day type="wed">Larba</day>
-							<day type="thu">Lamit</day>
-							<day type="fri">Juma</day>
-							<day type="sat">Asabar</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>A.M.</am>
-				<pm>P.M.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Gabanin Miladi</era>
-						<era type="1">Miladi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">G.M.</era>
-						<era type="1">M.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>A̱naira</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kaj_NG.xml b/airtime_mvc/library/Zend/Locale/Data/kaj_NG.xml
deleted file mode 100644
index 52ccaa483..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kaj_NG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kaj"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kam.xml b/airtime_mvc/library/Zend/Locale/Data/kam.xml
deleted file mode 100644
index 85058b4b8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kam.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kam"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a-e g-o r-w y z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Mwei wa mbee</month>
-							<month type="2">Mwei wa keli</month>
-							<month type="3">Mwei wa katatu</month>
-							<month type="4">Mwei wa kanne</month>
-							<month type="5">Mwei wa katano</month>
-							<month type="6">Mwei wa thanthatu</month>
-							<month type="7">Mwei wa muonza</month>
-							<month type="8">Mwei wa nyanya</month>
-							<month type="9">Mwei wa kenda</month>
-							<month type="10">Mwei wa ikumi</month>
-							<month type="11">Mwei wa ikumi na imwe</month>
-							<month type="12">Mwei wa ikumi na ili</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Mwei wa mbee</month>
-							<month type="2">Mwei wa keli</month>
-							<month type="3">Mwei wa katatu</month>
-							<month type="4">Mwei wa kanne</month>
-							<month type="5">Mwei wa katano</month>
-							<month type="6">Mwei wa thanthatu</month>
-							<month type="7">Mwei wa muonza</month>
-							<month type="8">Mwei wa nyanya</month>
-							<month type="9">Mwei wa kenda</month>
-							<month type="10">Mwei wa ikumi</month>
-							<month type="11">Mwei wa ikumi na imwe</month>
-							<month type="12">Mwei wa ikumi na ili</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Jpl</day>
-							<day type="mon">Jtt</day>
-							<day type="tue">Jnn</day>
-							<day type="wed">Jtn</day>
-							<day type="thu">Alh</day>
-							<day type="fri">Ijm</day>
-							<day type="sat">Jms</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Jumapili</day>
-							<day type="mon">Jumatatu</day>
-							<day type="tue">Jumanne</day>
-							<day type="wed">Jumatano</day>
-							<day type="thu">Alamisi</day>
-							<day type="fri">Ijumaa</day>
-							<day type="sat">Jumamosi</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">mbee wa yesu</era>
-						<era type="1">IY</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">MY</era>
-						<era type="1">IY</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="KES">
-				<displayName>Silingi ya Kenya</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kam_KE.xml b/airtime_mvc/library/Zend/Locale/Data/kam_KE.xml
deleted file mode 100644
index 8ff9ce0c7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kam_KE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kam"/>
-		<territory type="KE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kcg.xml b/airtime_mvc/library/Zend/Locale/Data/kcg.xml
deleted file mode 100644
index b92408c0a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kcg.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.29 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kcg"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a {a\u0331} b {ch} {chy} d-g {gb} {gh} {ghw} {ghy} i {i\u0331} j {jhy} k {kh} {kp} l-n {ng} {ny} o p r s {sh} {shy} t {ts} u-w y z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Juw</month>
-							<month type="2">Swi</month>
-							<month type="3">Tsa</month>
-							<month type="4">Nya</month>
-							<month type="5">Tsw</month>
-							<month type="6">Ata</month>
-							<month type="7">Ana</month>
-							<month type="8">Ari</month>
-							<month type="9">Aku</month>
-							<month type="10">Swa</month>
-							<month type="11">Man</month>
-							<month type="12">Mas</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Zwat Juwung</month>
-							<month type="2">Zwat Swiyang</month>
-							<month type="3">Zwat Tsat</month>
-							<month type="4">Zwat Nyai</month>
-							<month type="5">Zwat Tswon</month>
-							<month type="6">Zwat Ataah</month>
-							<month type="7">Zwat Anatat</month>
-							<month type="8">Zwat Arinai</month>
-							<month type="9">Zwat Akubunyung</month>
-							<month type="10">Zwat Swag</month>
-							<month type="11">Zwat Mangjuwang</month>
-							<month type="12">Zwat Swag-Ma-Suyang</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Lad</day>
-							<day type="mon">Tan</day>
-							<day type="tue">Tal</day>
-							<day type="wed">Lar</day>
-							<day type="thu">Lam</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Asa</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ladi</day>
-							<day type="mon">Tanii</day>
-							<day type="tue">Talata</day>
-							<day type="wed">Larba</day>
-							<day type="thu">Lamit</day>
-							<day type="fri">Juma</day>
-							<day type="sat">Asabat</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Gabanin Miladi</era>
-						<era type="1">Miladi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">GM</era>
-						<era type="1">M</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>Nera</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kcg_NG.xml b/airtime_mvc/library/Zend/Locale/Data/kcg_NG.xml
deleted file mode 100644
index 8d4c9beaf..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kcg_NG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kcg"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kfo.xml b/airtime_mvc/library/Zend/Locale/Data/kfo.xml
deleted file mode 100644
index 343d5a985..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kfo.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.29 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kfo"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a � b-e ē f g {gb} h-k {kh} l-p {pk} r-u w y z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Wey</month>
-							<month type="2">Fan</month>
-							<month type="3">Tat</month>
-							<month type="4">Nan</month>
-							<month type="5">Tuy</month>
-							<month type="6">Tso</month>
-							<month type="7">Taf</month>
-							<month type="8">War</month>
-							<month type="9">Kun</month>
-							<month type="10">Ban</month>
-							<month type="11">Kom</month>
-							<month type="12">Sau</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Fai Weyene</month>
-							<month type="2">Fai Fani</month>
-							<month type="3">Fai Tataka</month>
-							<month type="4">Fai Nangra</month>
-							<month type="5">Fai Tuyo</month>
-							<month type="6">Fai Tsoyi</month>
-							<month type="7">Fai Tafaka</month>
-							<month type="8">Fai Warachi</month>
-							<month type="9">Fai Kunobok</month>
-							<month type="10">Fai Bansok</month>
-							<month type="11">Fai Kom</month>
-							<month type="12">Fai Sauk</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Lah</day>
-							<day type="mon">Kub</day>
-							<day type="tue">Gba</day>
-							<day type="wed">Tan</day>
-							<day type="thu">Yei</day>
-							<day type="fri">Koy</day>
-							<day type="sat">Sat</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Lahadi</day>
-							<day type="mon">Je-Kubacha</day>
-							<day type="tue">Je-Gbai</day>
-							<day type="wed">Tansati</day>
-							<day type="thu">Je-Yei</day>
-							<day type="fri">Je-Koye</day>
-							<day type="sat">Sati</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Kafi Mar Wenom</era>
-						<era type="1">Bayan Chi Wenom</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">KMW</era>
-						<era type="1">BCW</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>Neira</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kfo_CI.xml b/airtime_mvc/library/Zend/Locale/Data/kfo_CI.xml
deleted file mode 100644
index 4fff419c4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kfo_CI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kfo"/>
-		<territory type="CI"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kk.xml b/airtime_mvc/library/Zend/Locale/Data/kk.xml
deleted file mode 100644
index 360ef5894..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kk.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.67 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="kk"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">бур</language>
-			<language type="am">амхар</language>
-			<language type="ar">арабша</language>
-			<language type="as">а��ам</language>
-			<language type="be">белару�</language>
-			<language type="bg">болгар</language>
-			<language type="bh">бихари</language>
-			<language type="bn">бенгал</language>
-			<language type="br">брит</language>
-			<language type="bs">бо�ни�</language>
-			<language type="ca">каталан</language>
-			<language type="cs">чех</language>
-			<language type="cy">валлий</language>
-			<language type="da">дат</language>
-			<language type="de">немі�</language>
-			<language type="el">грек</language>
-			<language type="en">ағылшын</language>
-			<language type="eo">��перанто</language>
-			<language type="es">и�пан</language>
-			<language type="et">��тон</language>
-			<language type="eu">ба�к</language>
-			<language type="fa">пар�ы</language>
-			<language type="fi">фин</language>
-			<language type="fil">пилипино</language>
-			<language type="fo">фарер</language>
-			<language type="fr">француз</language>
-			<language type="fy">фри�</language>
-			<language type="ga">ирландша</language>
-			<language type="gd">Солтү�тік Шотланди�</language>
-			<language type="gl">галици�ша</language>
-			<language type="gn">гуарани</language>
-			<language type="gu">гуджарати</language>
-			<language type="he">иврит</language>
-			<language type="hi">хинди</language>
-			<language type="hr">хорват</language>
-			<language type="hu">мадь�р</language>
-			<language type="hy">арм�н</language>
-			<language type="ia">интерлингва</language>
-			<language type="id">индонези�</language>
-			<language type="ie">интерлингве</language>
-			<language type="is">и�ланд</language>
-			<language type="it">итали�н</language>
-			<language type="ja">жапон</language>
-			<language type="jv">�ва</language>
-			<language type="ka">грузин</language>
-			<language type="kk">Қазақ</language>
-			<language type="km">камбоджи�</language>
-			<language type="kn">каннада</language>
-			<language type="ko">кәрі�</language>
-			<language type="ku">күрд</language>
-			<language type="ky">қырғыз</language>
-			<language type="la">латын</language>
-			<language type="ln">лингала</language>
-			<language type="lo">лао�</language>
-			<language type="lt">литва</language>
-			<language type="lv">латыш</language>
-			<language type="mk">македон</language>
-			<language type="ml">малай�лам</language>
-			<language type="mn">монғол</language>
-			<language type="mr">маратхи</language>
-			<language type="ms">малай</language>
-			<language type="mt">мальта</language>
-			<language type="ne">непал</language>
-			<language type="nl">голланд</language>
-			<language type="no">норвег</language>
-			<language type="oc">ок�итан</language>
-			<language type="or">ори�</language>
-			<language type="pa">панджаб</language>
-			<language type="pl">пол�к</language>
-			<language type="ps">пашто</language>
-			<language type="pt">португал</language>
-			<language type="ro">румын</language>
-			<language type="ru">оры�</language>
-			<language type="sa">�ан�крит</language>
-			<language type="sd">�индхи</language>
-			<language type="sh">�ербхорват</language>
-			<language type="si">�ингал</language>
-			<language type="sk">�ловак</language>
-			<language type="sl">�ловен</language>
-			<language type="so">�омали</language>
-			<language type="sq">албан</language>
-			<language type="sr">�ерб</language>
-			<language type="st">�е�ото</language>
-			<language type="su">�удан</language>
-			<language type="sv">швед</language>
-			<language type="sw">�уахили</language>
-			<language type="ta">тамил</language>
-			<language type="te">телугу</language>
-			<language type="th">тай</language>
-			<language type="ti">тигринь�</language>
-			<language type="tk">түркмен</language>
-			<language type="tlh">клингон</language>
-			<language type="tr">түрікше</language>
-			<language type="tw">тви</language>
-			<language type="ug">ұйғыр</language>
-			<language type="uk">украин</language>
-			<language type="ur">урду</language>
-			<language type="uz">өзбек</language>
-			<language type="vi">вьетнам</language>
-			<language type="xh">хо�а</language>
-			<language type="yi">идиш</language>
-			<language type="zu">зулу�</language>
-		</languages>
-		<territories>
-			<territory type="KZ">Қазақ�тан</territory>
-			<territory type="TO">Тонга</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а ә б-е ё ж-й і к қ л-н ң о-у ұ ү ф-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[Ò»]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">қаң.</month>
-							<month type="2">ақп.</month>
-							<month type="3">нау.</month>
-							<month type="4">�әу.</month>
-							<month type="5">мам.</month>
-							<month type="6">мау.</month>
-							<month type="7">шіл.</month>
-							<month type="8">там.</month>
-							<month type="9">қыр.</month>
-							<month type="10">қаз.</month>
-							<month type="11">қар.</month>
-							<month type="12">желт.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">қаңтар</month>
-							<month type="2">ақпан</month>
-							<month type="3">наурыз</month>
-							<month type="4">�әуір</month>
-							<month type="5">мамыр</month>
-							<month type="6">мау�ым</month>
-							<month type="7">шілде</month>
-							<month type="8">тамыз</month>
-							<month type="9">қыркүйек</month>
-							<month type="10">қазан</month>
-							<month type="11">қараша</month>
-							<month type="12">желтоқ�ан</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ж�.</day>
-							<day type="mon">д�.</day>
-							<day type="tue">��.</day>
-							<day type="wed">�р.</day>
-							<day type="thu">б�.</day>
-							<day type="fri">жм.</day>
-							<day type="sat">�һ.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">жек�ені</day>
-							<day type="mon">дуй�енбі</day>
-							<day type="tue">�ей�енбі</day>
-							<day type="wed">�әренбі</day>
-							<day type="thu">бей�енбі</day>
-							<day type="fri">жұма</day>
-							<day type="sat">�енбі</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y 'ж'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y 'ж'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y 'ж'.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">MMM y 'ж'. - MMM y 'ж'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">d MMM y 'ж'. - d MMM y 'ж'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y 'ж'.</greatestDifference>
-							<greatestDifference id="y">E, d MMM y 'ж'. - E, d MMM y 'ж'.</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="KZT">
-				<symbol>тңг.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>иә:и</yesstr>
-			<nostr>жоқ:ж</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl.xml
deleted file mode 100644
index 3fea53d98..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kk"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl_KZ.xml b/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl_KZ.xml
deleted file mode 100644
index 28d6f52e4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kk_Cyrl_KZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kk"/>
-		<script type="Cyrl"/>
-		<territory type="KZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kk_KZ.xml b/airtime_mvc/library/Zend/Locale/Data/kk_KZ.xml
deleted file mode 100644
index 1b3883284..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kk_KZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.42 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kk"/>
-		<territory type="KZ"/>
-	</identity>
-	<alias source="kk_Cyrl_KZ" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kl.xml b/airtime_mvc/library/Zend/Locale/Data/kl.xml
deleted file mode 100644
index 6ca1248cb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kl.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="kl"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="kl">kalaallisut</language>
-		</languages>
-		<territories>
-			<territory type="GL">Kalaallit Nunaat</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á-ã b-e é ê f-i í î ĩ j-o ô p q ĸ r-u ú û ũ v-z æ ø å]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januari</month>
-							<month type="2">februari</month>
-							<month type="3">martsi</month>
-							<month type="4">aprili</month>
-							<month type="5">maji</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">augustusi</month>
-							<month type="9">septemberi</month>
-							<month type="10">oktoberi</month>
-							<month type="11">novemberi</month>
-							<month type="12">decemberi</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sab</day>
-							<day type="mon">ata</day>
-							<day type="tue">mar</day>
-							<day type="wed">pin</day>
-							<day type="thu">sis</day>
-							<day type="fri">tal</day>
-							<day type="sat">arf</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sabaat</day>
-							<day type="mon">ataasinngorneq</day>
-							<day type="tue">marlunngorneq</day>
-							<day type="wed">pingasunngorneq</day>
-							<day type="thu">sisamanngorneq</day>
-							<day type="fri">tallimanngorneq</day>
-							<day type="sat">arfininngorneq</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="DKK">
-				<symbol>kr</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kl_GL.xml b/airtime_mvc/library/Zend/Locale/Data/kl_GL.xml
deleted file mode 100644
index ece50e2a9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kl_GL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="kl"/>
-		<territory type="GL"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/km.xml b/airtime_mvc/library/Zend/Locale/Data/km.xml
deleted file mode 100644
index b9eefca5d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/km.xml
+++ /dev/null
@@ -1,667 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.77 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="km"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">ភាសាអាហ្វារ</language>
-			<language type="ae">ភាសាអាវែស្�ង់</language>
-			<language type="af">ភាសាអាហ្វ្រីកាអាន</language>
-			<language type="am">អំហារិក</language>
-			<language type="an">ភាសាអារ៉ាហ្គោន</language>
-			<language type="ar">ភាសាអារ៉ាប់</language>
-			<language type="ay">ភាសាអីម៉ារ៉ា</language>
-			<language type="az">ភាសាអាហ៊្សែរបែហ្សង់</language>
-			<language type="be">ភាសាប�ឡារុស្ស</language>
-			<language type="bg">ភាសាប៊ុលហ្ការី</language>
-			<language type="bh">ភាសាបិហារ</language>
-			<language type="bm">ភាសាបាម្បារា</language>
-			<language type="bn">ភាសាប�ន្កាលី</language>
-			<language type="bo">ភាសាទីប�</language>
-			<language type="br">ប្រីស្�ុន</language>
-			<language type="bs">ប៊ូស្នៀរ</language>
-			<language type="ca">ភាសាកា�ាឡាន</language>
-			<language type="cs">ភាសាឆ�ក</language>
-			<language type="cy">វ�ល</language>
-			<language type="da">ភាសាដាណឺម៉ាក</language>
-			<language type="de">ភាសាអាល្លឺម៉ង់</language>
-			<language type="dz">ភាសាប៊ូ�ាន</language>
-			<language type="el">ភាសាក្រិច</language>
-			<language type="en">ភាសាអង់គ្ល�ស</language>
-			<language type="eo">ភាសាអ�ស្ព�រ៉ាន្ទោ</language>
-			<language type="es">ភាសាអ�ស្ប៉ាញ</language>
-			<language type="et">ភាសាអ�ស្�ូនី</language>
-			<language type="eu">ភាសាបាស្ក�</language>
-			<language type="fa">ភឺសៀន</language>
-			<language type="fi">ភាសាហ្វាំងឡង់</language>
-			<language type="fil">ពីលីពីន</language>
-			<language type="fj">ហ្វ៉ីហ្ស៉ី</language>
-			<language type="fo">ហ្វារូស</language>
-			<language type="fr">ភាសាបារាំង</language>
-			<language type="fy">ហ្រីសង់</language>
-			<language type="ga">ភាសាហ្កែលិគ</language>
-			<language type="gd">ភាសាហ្កែលិគ [gd]</language>
-			<language type="gl">ភាសាហ្កាលីស៉ី</language>
-			<language type="gn">ភាសាហ្កួរ៉ានី</language>
-			<language type="gu">ភាសាហ្កុយ៉ារាទី</language>
-			<language type="he">ភាសាហ�ប្រិ</language>
-			<language type="hi">ភាសាហ៉ិនឌី</language>
-			<language type="hr">ក្រូអាទៀន</language>
-			<language type="hu">ភាសាហុងគ្រី</language>
-			<language type="hy">ភាសាអារម�នី</language>
-			<language type="ia">អីនធើលីង</language>
-			<language type="id">ភាសាឥណ្ឌូន�ស៊ី</language>
-			<language type="is">ភាសាអ៉ីស្លង់</language>
-			<language type="it">ភាសាអ៊ី�ាលី</language>
-			<language type="ja">ភាសាជប៉ុន</language>
-			<language type="jv">ភាសាយ៉ាវា</language>
-			<language type="ka">ភាសាហ្សកហ្ស៉ី</language>
-			<language type="kk">ភាសាកាហ្សាក់ស្�ង់់</language>
-			<language type="km">ភាសា�្មែរ</language>
-			<language type="kn">ភាសាកិណាដា</language>
-			<language type="ko">ភាសាកូរ៉�</language>
-			<language type="ku">ភាសាឃឺដ</language>
-			<language type="ky">ភាសាគៀរហ្គីស្�ង់</language>
-			<language type="la">ភាសាឡា�ំាង</language>
-			<language type="ln">លីនកាឡា</language>
-			<language type="lo">ភាសាឡាវ</language>
-			<language type="lt">ភាសាលីទុយអានី</language>
-			<language type="lv">ភាសាឡា�វីយ៉ា</language>
-			<language type="mg">ភាសាម៉ាដាហ្កាសការ</language>
-			<language type="mi">ភាសាម៉ោរី</language>
-			<language type="mk">ភាសាម៉ាស�ដូនី</language>
-			<language type="ml">ភាសាម៉ាឡាឡាយ៉ាន</language>
-			<language type="mn">ភាសាម៉ុងហ្គោលី</language>
-			<language type="mo">ភាសាម៉ុលដាវី</language>
-			<language type="mr">ភាសាម៉ារាធី</language>
-			<language type="ms">ភាសាម៉ាល�ស៉ី</language>
-			<language type="mt">ភាសាម៉ាល់�ា</language>
-			<language type="ne">ភាសាន�ប៉ាល់</language>
-			<language type="nl">ភាសាហុល្លង់</language>
-			<language type="nn">ន�រវ�</language>
-			<language type="no">ភាសាន�រវែស</language>
-			<language type="oc">អូសី�ាន់</language>
-			<language type="or">ភាសាអូរីយ៉ា</language>
-			<language type="pa">ភាសាពូនយ៉ាប៊ី</language>
-			<language type="pl">ភាសាប៉ូឡូញ</language>
-			<language type="ps">បាស្�ូ</language>
-			<language type="pt">ភាសាព�រទុយហ្កាល់</language>
-			<language type="qu">ភាសាក�ទ្ជូអា</language>
-			<language type="rn">ភាសារូន្ឌី</language>
-			<language type="ro">ភាសារូម៉ានី</language>
-			<language type="ru">ភាសាรัរូស្ស៉ី</language>
-			<language type="sa">ភាសាសំស្ក្រឹ�</language>
-			<language type="sd">ភាសាស៉ីន្ដី</language>
-			<language type="sh">សើបូក្រូទៀន</language>
-			<language type="si">សីនហាលិស</language>
-			<language type="sk">ភាសាស្លូវ៉ាគី</language>
-			<language type="sl">ភាសាស្លូវ៉ានី</language>
-			<language type="sm">ភាសាសាមូអា</language>
-			<language type="so">ភាសាសូម៉ាលី</language>
-			<language type="sq">ភាសាអាល់បានី</language>
-			<language type="sr">សើបៀន</language>
-			<language type="st">ស�សូដូ</language>
-			<language type="su">ភាំសាស៊ូដង់</language>
-			<language type="sv">ភាសាស៊ុយអែដ</language>
-			<language type="sw">ភាសាស្វាហ៉ីលី</language>
-			<language type="ta">ភាសា�ាមីល</language>
-			<language type="te">ភាសា��លូហ្គូ</language>
-			<language type="tg">ភាសា�ាដហ្ស៉ីគីស្�ង់</language>
-			<language type="th">ភាសា�ៃ</language>
-			<language type="ti">ទីរិនយា</language>
-			<language type="tk">ភាសាទួគម�នីស្�ង់</language>
-			<language type="tlh">�្លិងសុន</language>
-			<language type="to">ភាសា�ុងហ្គោ</language>
-			<language type="tr">ភាសាទួរគី</language>
-			<language type="tt">ភាសា�ា�ារ</language>
-			<language type="tw">ទ្វី</language>
-			<language type="uk">ភាសាអ៊ុយក្រែន</language>
-			<language type="ur">ភាសាអ៊ូរ្ឌូ</language>
-			<language type="uz">ភាសាអ៊ូហ្សប�គីស្�ង់</language>
-			<language type="vi">ភាសាវៀ�ណាម</language>
-			<language type="xh">ភាសាឃសា</language>
-			<language type="yi">ភាសាយីឌីហ្ស</language>
-			<language type="yo">ភាសាយរូបា</language>
-			<language type="za">ភាសាចួង</language>
-			<language type="zh">ភាសាចិន</language>
-			<language type="zu">ភាសាហ្ស៉ូលូ</language>
-		</languages>
-		<territories>
-			<territory type="AD">អានដូរ៉ា</territory>
-			<territory type="AE">អ�មីរ៉ែទអារ៉ាប់រួម</territory>
-			<territory type="AF">អាហ្វហ្គានីស្�ាន</territory>
-			<territory type="AL">អាល់បានី</territory>
-			<territory type="AM">អារម�នី</territory>
-			<territory type="AO">អង់ហ្គោឡា</territory>
-			<territory type="AR">អាហ្សង់ទីន</territory>
-			<territory type="AT">អូទ្រីស</territory>
-			<territory type="AU">អូស្�្រាលី</territory>
-			<territory type="AZ">អាហ៊្សែរបែហ្សង់</territory>
-			<territory type="BA">បូស្ន៉ី</territory>
-			<territory type="BB">បារបាដូស</territory>
-			<territory type="BD">បង់ក្លាដ�ស្ហ</territory>
-			<territory type="BE">បែលហ្ស៉ិក</territory>
-			<territory type="BF">ប៊ូរគីណាហ្វាសូ</territory>
-			<territory type="BG">ប៊ុលហ្គារី</territory>
-			<territory type="BH">បារ៉ែន</territory>
-			<territory type="BI">ប៊ូរុនឌី</territory>
-			<territory type="BJ">ប�ណាំង</territory>
-			<territory type="BN">ប៊្រុយណ�</territory>
-			<territory type="BO">បូលីវី</territory>
-			<territory type="BR">ប្រ�ស៊ីល</territory>
-			<territory type="BS">បាហាម៉ា</territory>
-			<territory type="BT">ប៊ូ�ាន</territory>
-			<territory type="BW">បុ�ស្វាណា</territory>
-			<territory type="BY">ប�ឡារុស្ស</territory>
-			<territory type="BZ">ប�លីហ្ស</territory>
-			<territory type="CA">កាណាដា</territory>
-			<territory type="CF">សាធារណរដ្ឋអាហ្វ្រិកកណ្ដាល</territory>
-			<territory type="CG">កុងហ្គោ</territory>
-			<territory type="CH">ស្វីស</territory>
-			<territory type="CI">កូដឌីវ�រ</territory>
-			<territory type="CL">ឈីលី</territory>
-			<territory type="CM">កាម�រូន</territory>
-			<territory type="CN">áž…áž·áž“</territory>
-			<territory type="CO">កូឡុំប៊ី</territory>
-			<territory type="CR">កូស្�ារីកា</territory>
-			<territory type="CU">គុយបា</territory>
-			<territory type="CV">កាបវែរ</territory>
-			<territory type="CY">ស៉ីពរ�</territory>
-			<territory type="CZ">សាធារណរដ្ឋឆ�ក</territory>
-			<territory type="DE">អាល្លឺម៉ង់</territory>
-			<territory type="DJ">ហ្ស៉ីបូទី</territory>
-			<territory type="DK">ដាណឺម៉ាក</territory>
-			<territory type="DM">ដូមីនីកា</territory>
-			<territory type="DO">សាធារណរដ្ឋដូមីនីកែន</territory>
-			<territory type="DZ">អាល់ហ្ស�រី</territory>
-			<territory type="EC">អ�ក្វាឌ�រ</territory>
-			<territory type="EE">អ�ស្�ូនី</territory>
-			<territory type="EG">អ�ហ្ស៉ីប</territory>
-			<territory type="EH">សាហារ៉ា�ាងលិច</territory>
-			<territory type="ER">អ�រីទ្រា</territory>
-			<territory type="ES">អ�ស្ប៉ាញ</territory>
-			<territory type="ET">អ��្យូពី</territory>
-			<territory type="FI">ហ្វាំងឡង់</territory>
-			<territory type="FJ">ហ្វ៉ីហ្ស៉ី</territory>
-			<territory type="FM">មិក្រូន�ស៊ី</territory>
-			<territory type="FR">បារាំង</territory>
-			<territory type="GA">ហ្គាបុង</territory>
-			<territory type="GE">ហ្សកហ្ស៉ី</territory>
-			<territory type="GH">ហ្កាណា</territory>
-			<territory type="GM">ហ្គាំប៊ី</territory>
-			<territory type="GN">ហ្គីណ�</territory>
-			<territory type="GQ">ហ្គីណ�អ�ក្វាទ�រ</territory>
-			<territory type="GR">ក្រិច</territory>
-			<territory type="GT">ហ្គា��ម៉ាឡា</territory>
-			<territory type="GW">ហ្គីណ�ប៊ីសូ</territory>
-			<territory type="GY">ហ្គីយ៉ាណា</territory>
-			<territory type="HK">ហុងកុង</territory>
-			<territory type="HN">ហុងឌួរ៉ាស់</territory>
-			<territory type="HR">ក្រូអាស៊ី</territory>
-			<territory type="HT">ហៃទី</territory>
-			<territory type="HU">ហុងគ្រី</territory>
-			<territory type="ID">ឥណ្ឌូន�ស៊ី</territory>
-			<territory type="IE">អៀរឡង់</territory>
-			<territory type="IL">អ៊ីស្រាអែល</territory>
-			<territory type="IN">ឥណ្ឌា</territory>
-			<territory type="IQ">អ៊ីរ៉ាក់</territory>
-			<territory type="IR">អ៊ីរ៉ង់</territory>
-			<territory type="IS">អ៉ីស្លង់</territory>
-			<territory type="IT">អ៊ី�ាលី</territory>
-			<territory type="JM">ហ្សាម៉ាអ៉ិគ</territory>
-			<territory type="JO">ហ៊្សកដានី</territory>
-			<territory type="JP">ជប៉ុន</territory>
-			<territory type="KE">ក�នយ៉ា</territory>
-			<territory type="KG">គៀរហ្គីស្�ង់</territory>
-			<territory type="KH">កម្ពុជា</territory>
-			<territory type="KI">គិរិបាទី</territory>
-			<territory type="KM">កុំម៉ូរ៉ូស</territory>
-			<territory type="KP">សាធារណរដ្ឋប្រជាធិប��យ្យប្រជាមានិ�កូរ៉�</territory>
-			<territory type="KR">សាធារណរដ្ឋកូរ៉�</territory>
-			<territory type="KW">គុយវ៉ែ�</territory>
-			<territory type="KZ">កាហ្សាក់ស្�ាង់់</territory>
-			<territory type="LA">ឡាវ</territory>
-			<territory type="LB">លីបង់</territory>
-			<territory type="LI">លិចទ�នស្�ែន</territory>
-			<territory type="LK">ស្រីលង្កា</territory>
-			<territory type="LR">លីប�រីយ៉ា</territory>
-			<territory type="LS">លើសូ�ូ</territory>
-			<territory type="LT">លីទុយអានី</territory>
-			<territory type="LU">លុចហ្សំបួរ</territory>
-			<territory type="LV">ឡា�វីយ៉ា</territory>
-			<territory type="LY">លីប៊ី</territory>
-			<territory type="MA">ម៉ារ៉ុក</territory>
-			<territory type="MC">ម៉ូណាកូ</territory>
-			<territory type="MD">សាធារណរដ្ឋម៉ុលដាវី</territory>
-			<territory type="MG">ម៉ាដាហ្កាស្ការ</territory>
-			<territory type="MK">ម៉ាស�ដន</territory>
-			<territory type="ML">ម៉ាលី</territory>
-			<territory type="MM">មីយ៉ាន់ម៉ា</territory>
-			<territory type="MN">ម៉ុងហ្គោលី</territory>
-			<territory type="MR">ម៉ូរី�ានី</territory>
-			<territory type="MT">ម៉ាល់�ា</territory>
-			<territory type="MU">ម៉ូរីទុស</territory>
-			<territory type="MX">ម៉ិចសិក</territory>
-			<territory type="MY">ម៉ាល�ស៉ី</territory>
-			<territory type="MZ">ម៉ូហ្សាំប៊ិក</territory>
-			<territory type="NA">ណាមីប៊ី</territory>
-			<territory type="NE">នីហ្ស�រ</territory>
-			<territory type="NG">នីហ្ស�រីយ៉ា</territory>
-			<territory type="NI">នីការ៉ាហ្គ�រ</territory>
-			<territory type="NL">ហូល្លង់</territory>
-			<territory type="NO">ន�រវែស</territory>
-			<territory type="NP">ន�ប៉ាល់</territory>
-			<territory type="NZ">នូវែលហ្ស�ឡង់</territory>
-			<territory type="OM">អូម៉ង់</territory>
-			<territory type="PA">ប៉ាណាម៉ា</territory>
-			<territory type="PE">ប៉�រូ</territory>
-			<territory type="PG">ប៉ាពូអានូវែលហ្គីណ�</territory>
-			<territory type="PH">ហ្វ៉ីលីពីន</territory>
-			<territory type="PK">ប៉ាគីស្�ាន</territory>
-			<territory type="PL">ប៉ូលូញ</territory>
-			<territory type="PR">ព�រ�ូរីកូ</territory>
-			<territory type="PS">ប៉ាល�ស្ទីន</territory>
-			<territory type="PT">ព�រទុយហ្កាល់</territory>
-			<territory type="PY">ប៉ារ៉ាហ្គាយ</territory>
-			<territory type="QA">កា�ារ</territory>
-			<territory type="RO">រូម៉ានី</territory>
-			<territory type="RU">រូស្ស៊ី</territory>
-			<territory type="RW">រវ៉ាន់ដា</territory>
-			<territory type="SA">អារ៉ាប៊ីសាអ៊ូឌី�</territory>
-			<territory type="SC">សីសែល</territory>
-			<territory type="SD">ស៊ូដង់</territory>
-			<territory type="SE">ស៊ុយអែដ</territory>
-			<territory type="SG">សិង្ហបុរី</territory>
-			<territory type="SI">ស្លូវ�នី</territory>
-			<territory type="SK">ស្លូវ៉ាគី</territory>
-			<territory type="SL">ស�រ៉ាឡ�អូន</territory>
-			<territory type="SN">ស�ន�ហ្កាល់</territory>
-			<territory type="SO">សូម៉ាលី</territory>
-			<territory type="SR">សូរីណាម</territory>
-			<territory type="SV">អែលសាល់វ៉ាឌ�រ</territory>
-			<territory type="SY">ស៊ីរី</territory>
-			<territory type="SZ">សូហ្ស៉ីឡង់</territory>
-			<territory type="TD">ឆាដ</territory>
-			<territory type="TG">�ូហ្គូ</territory>
-			<territory type="TH">�ៃ</territory>
-			<territory type="TJ">�ាដហ្ស៉ីគីស្�ង់</territory>
-			<territory type="TL">ទីម�រ�ាងកើ�</territory>
-			<territory type="TM">ទួគម�នីស្�ង់</territory>
-			<territory type="TN">ទុយន�ស៊ី</territory>
-			<territory type="TO">�ុងហ្គា</territory>
-			<territory type="TR">ទួរគី</territory>
-			<territory type="TT">ទ្រីនីដាដនឹង�ូបាហ្គោ</territory>
-			<territory type="TW">�ៃវ៉ាន់</territory>
-			<territory type="TZ">�ង់ហ្សានី</territory>
-			<territory type="UA">អ៊ុយក្រែន</territory>
-			<territory type="UG">អ៊ូហ្កង់ដា</territory>
-			<territory type="US">សហរដ្ឋអាម�រិក</territory>
-			<territory type="UY">អ៊ុយរុយហ្គាយ</territory>
-			<territory type="UZ">អ៊ូហ្សប�គីស្�ង់</territory>
-			<territory type="VA">វ៉ាទីកង់</territory>
-			<territory type="VE">វ�ន�ហ្ស៊ុយឡា</territory>
-			<territory type="VN">វៀ�ណាម</territory>
-			<territory type="WS">សាមូអា</territory>
-			<territory type="YE">យ�មែន</territory>
-			<territory type="ZA">អាហ្វ្រិក�ាង�្បូង</territory>
-			<territory type="ZM">ហ្សាំប៊ី</territory>
-			<territory type="ZW">ហ្ស៊ីមបាបវ៉�</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u17CE \u17CF \u17D1 \u17D0 ៈ \u17CB \u17C9 \u17CA \u17CD \u17CC ក-រ ឫ ឬ ល ឭ ឮ វ ស-អ {អា} ឥ-ឧ {ឧក} ឪ ឩ ឯ-ឳ ា-ះ \u17D2]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u17B4 \u17B5\u200B � ឞ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraAbbr>
-						<era type="0">ព.ស.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<default choice="long"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE �្ងៃ d �ែ MMMM ឆ្នាំ y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>EEEE �្ងៃ d �ែ MMMM ឆ្នាំ y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">១</month>
-							<month type="2">២</month>
-							<month type="3">៣</month>
-							<month type="4">៤</month>
-							<month type="5">៥</month>
-							<month type="6">៦</month>
-							<month type="7">៧</month>
-							<month type="8">៨</month>
-							<month type="9">៩</month>
-							<month type="10">១០</month>
-							<month type="11">១១</month>
-							<month type="12">១២</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">មករា</month>
-							<month type="2">កុម្ភៈ</month>
-							<month type="3">មិនា</month>
-							<month type="4">ម�សា</month>
-							<month type="5">ឧសភា</month>
-							<month type="6">មិ�ុនា</month>
-							<month type="7">កក្កដា</month>
-							<month type="8">សីហា</month>
-							<month type="9">កញ្ញា</month>
-							<month type="10">�ុលា</month>
-							<month type="11">វិច្ឆិកា</month>
-							<month type="12">ធ្នូ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">អា</day>
-							<day type="mon">áž…</day>
-							<day type="tue">អ</day>
-							<day type="wed">áž–áž»</day>
-							<day type="thu">ព្រ</day>
-							<day type="fri">សុ</day>
-							<day type="sat">ស</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�្ងៃអាទិ�្យ</day>
-							<day type="mon">​�្ងៃច�ន្ទ</day>
-							<day type="tue">�្ងៃអង្គារ</day>
-							<day type="wed">�្ងៃពុធ</day>
-							<day type="thu">�្ងៃព្រហស្ប�ិ�</day>
-							<day type="fri">�្ងៃសុក្រ</day>
-							<day type="sat">�្ងៃសៅរ�</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">�្រី១</quarter>
-							<quarter type="2">�្រី២</quarter>
-							<quarter type="3">�្រី៣</quarter>
-							<quarter type="4">�្រី៤</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">�្រីមាសទី១</quarter>
-							<quarter type="2">�្រីមាសទី២</quarter>
-							<quarter type="3">�្រីមាសទី៣</quarter>
-							<quarter type="4">�្រីមាសទី៤</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ព្រឹក</am>
-				<pm>ល្ងាច</pm>
-				<eras>
-					<eraNames>
-						<era type="0">មុន​គ្រិស្�សករាជ</era>
-						<era type="1">គ្រិស្�សករាជ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">មុន​គ.ស.</era>
-						<era type="1">គ.ស.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE �្ងៃ d �ែ MMMM ឆ្នាំ y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d �ែ MMMM ឆ្នាំ y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H ម៉ោង m នាទី ss វិនាទី​ zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H ម៉ោង m នាទី ss វិនាទី​z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M - d/M</greatestDifference>
-							<greatestDifference id="M">d/M - d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d/M - E, d/M</greatestDifference>
-							<greatestDifference id="M">E, d/M - E, d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d - E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d - E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yyyy - M/yyyy</greatestDifference>
-							<greatestDifference id="y">M/yyyy - M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yyyy - d/M/yyyy</greatestDifference>
-							<greatestDifference id="M">d/M/yyyy - d/M/yyyy</greatestDifference>
-							<greatestDifference id="y">d/M/yyyy - d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d/M/yyyy - E, d/M/yyyy</greatestDifference>
-							<greatestDifference id="M">E, d/M/yyyy - E, d/M/yyyy</greatestDifference>
-							<greatestDifference id="y">E, d/M/yyyy - E, d/M/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="M">E, y MMM dd - E, y MMM dd</greatestDifference>
-							<greatestDifference id="y">E, y MMM dd - E, y MMM dd</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="KHR">
-				<displayName>Riel</displayName>
-				<symbol>៛</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/km_KH.xml b/airtime_mvc/library/Zend/Locale/Data/km_KH.xml
deleted file mode 100644
index e78c134b3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/km_KH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:37 $"/>
-		<language type="km"/>
-		<territory type="KH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kn.xml b/airtime_mvc/library/Zend/Locale/Data/kn.xml
deleted file mode 100644
index f4c7b2519..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kn.xml
+++ /dev/null
@@ -1,1157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.74 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="kn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">ಅಫಾರ�</language>
-			<language type="ab">ಅಬ�ಖಾಜಿಯನ�</language>
-			<language type="ace">ಅಛಿನೀಸ�</language>
-			<language type="ach">ಅಕೋಲಿ</language>
-			<language type="ada">ಅಡಂಗ�‌ಮೆ</language>
-			<language type="ady">ಅಡೈಘೆ</language>
-			<language type="ae">ಅವೆಸ�ಟನ�</language>
-			<language type="af">ಆಫ�ರಿಕಾನ�ಸ�</language>
-			<language type="afa">ಆಫ�ರೋ-�ಶಿಯಾಟಿಕ� ಭಾಷೆ</language>
-			<language type="afh">ಆಫ�ರಿಹಿಲಿ</language>
-			<language type="ain">�ನ�</language>
-			<language type="ak">ಅಕನ�</language>
-			<language type="akk">ಅಕ�ಕಾಡಿಯನ�</language>
-			<language type="ale">ಅಲೆಯ�ಟ�</language>
-			<language type="alg">ಅಲ�ಗೊಂಕ�ವಿಯನ� ಭಾಷೆ</language>
-			<language type="alt">ದಕ�ಷಿಣ ಅಲ�ಟಾಯ�</language>
-			<language type="am">ಅಂಹರಿಕ�</language>
-			<language type="an">ಅರಗೊನೀಸ�</language>
-			<language type="ang">ಪ�ರಾಚೀನ ಇಂಗ�ಲೀಷ�</language>
-			<language type="anp">ಆಂಗಿಕಾ</language>
-			<language type="apa">ಅಪಾಚಿ ಭಾಷೆ</language>
-			<language type="ar">ಅರೇಬಿಕ�</language>
-			<language type="arc">ಅರಾಮಿಕ�</language>
-			<language type="arn">ಅರೌಕೇನಿಯನ�</language>
-			<language type="arp">ಅರಪಾಹೋ</language>
-			<language type="art">ಕೃತಕ ಭಾಷೆ</language>
-			<language type="arw">ಅರಾವಾಕ�</language>
-			<language type="as">ಅಸ�ಸಾಮೀಸ�</language>
-			<language type="ast">ಆಸ�ಟ�ರಿಯನ�</language>
-			<language type="ath">ಅಥಪಾಸ�ಕನ� ಭಾಷೆ</language>
-			<language type="aus">ಆಸ�ಟ�ರೇಲಿಯನ� ಭಾಷೆ</language>
-			<language type="av">ಅವರಿಕ�</language>
-			<language type="awa">ಅವಧಿ</language>
-			<language type="ay">ಅಯ�ಮಾರಾ</language>
-			<language type="az">ಅಜರ�‌ಬೈಜಾನಿ</language>
-			<language type="ba">ಬಶ�ಕಿರ�</language>
-			<language type="bad">ಬಾಂಡಾ</language>
-			<language type="bai">ಬಮಿಲೇಕೆ ಭಾಷೆ</language>
-			<language type="bal">ಬಲೂಚಿ</language>
-			<language type="ban">ಬಲಿನೀಸ�</language>
-			<language type="bas">ಬಸಾ</language>
-			<language type="bat">ಬಾಲ�ಟಿಕ� ಭಾಷೆ</language>
-			<language type="be">ಬೆಲರೂಸಿಯನ�</language>
-			<language type="bej">ಬೇಜಾ</language>
-			<language type="bem">ಬೆಂಬಾ</language>
-			<language type="ber">ಬೆರ�ಬರ�</language>
-			<language type="bg">ಬಲ�ಗೇರಿಯನ�</language>
-			<language type="bh">ಬಿಹಾರಿ</language>
-			<language type="bho">ಭೋಜಪ�ರಿ</language>
-			<language type="bi">ಬಿಸ�ಲಾಮಾ</language>
-			<language type="bik">ಬಿಕೊಲ�</language>
-			<language type="bin">ಬಿನಿ</language>
-			<language type="bla">ಸಿಕ�ಸಿಕಾ</language>
-			<language type="bm">ಬಂಬಾರಾ</language>
-			<language type="bn">ಬೆಂಗಾಲಿ</language>
-			<language type="bnt">ಬಂಟ�</language>
-			<language type="bo">ಟಿಬೇಟಿಯನ�</language>
-			<language type="br">ಬ�ರೆಟನ�</language>
-			<language type="bra">ಬ�ರಾಜ�</language>
-			<language type="bs">ಬೋಸ�ನಿಯನ�</language>
-			<language type="btk">ಬಟಾಕ�</language>
-			<language type="bua">ಬ�ರಿಯಟ�</language>
-			<language type="bug">ಬ�ಗಿನೀಸ�</language>
-			<language type="byn">ಬ�ಲಿನ�</language>
-			<language type="ca">ಕೆಟಲಾನ�</language>
-			<language type="cad">ಕ�ಯಾಡ�ಡೋ</language>
-			<language type="cai">ಮಧ�ಯ ಅಮೇರಿಕನ� ಇಂಡಿಯನ� ಭಾಷೆ</language>
-			<language type="car">ಕಾರಿಬ�</language>
-			<language type="cau">ಕಕೇಶಿಯನ� ಭಾಷೆ</language>
-			<language type="cch">ಅಟ�ಸಮ�</language>
-			<language type="ce">ಚೆಚನ�</language>
-			<language type="ceb">ಸೆಬ�ಆನೋ</language>
-			<language type="cel">ಸೆಲ�ಟಿಕ� ಭಾಷೆ</language>
-			<language type="ch">ಕಮೊರೊ</language>
-			<language type="chb">ಚಿಬ�ಚಾ</language>
-			<language type="chg">ಚಗಟಾಯ�</language>
-			<language type="chk">ಚೂಕಿಸೆ</language>
-			<language type="chm">ಮಾರಿ</language>
-			<language type="chn">ಚಿನೂಕ� ಜಾರ�ಗೋನ�</language>
-			<language type="cho">ಚೋಕ�ಟಾವ�</language>
-			<language type="chp">ಚಿಪೆವ�ಯಾನ�</language>
-			<language type="chr">ಚೀರೋಕೀ</language>
-			<language type="chy">ಚೀಯೆನ�ನೇ</language>
-			<language type="cmc">ಚಾಮಿಕ� ಭಾಷೆ</language>
-			<language type="co">ಕೊರ�ಸಿಕನ�</language>
-			<language type="cop">ಕೊಪ�ಟಿಕ�</language>
-			<language type="cpe">ಇಂಗ�ಲೀಷ�-ಮೂಲದ ಕ�ರಿಯೋಲ� ಅಥವಾ ಪಿಡ�ಗಿನ�</language>
-			<language type="cpf">ಫ�ರೆಂಚ�-ಮೂಲದ ಕ�ರಿಯೋಲ� ಅಥವಾ ಪಿಡ�ಗಿನ�</language>
-			<language type="cpp">ಪೋರ�ಚ�ಗೀಸ�- ಮೂಲದ ಕ�ರಿಯೋಲ� ಅಥವಾ ಪಿಡ�ಗಿನ�</language>
-			<language type="cr">ಕ�ರೀ</language>
-			<language type="crh">ಕ�ರಿಮೀಯನ� ಟರ�ಕಿಷ�</language>
-			<language type="crp">ಕ�ರಿಯೋಲ� ಅಥವಾ ಪಿಡ�ಗಿನ�</language>
-			<language type="cs">ಜೆಕ�</language>
-			<language type="csb">ಕಶ�ಬಿಯನ�</language>
-			<language type="cu">ಚರ�ಚ� ಸ�ಲಾವಿಕ�</language>
-			<language type="cus">ಕ�ಷಿಟಿಕ� ಭಾಷೆ</language>
-			<language type="cv">ಚ�ವಾಶ�</language>
-			<language type="cy">ವೆಲ�ಶ�</language>
-			<language type="da">ಡ�ಯಾನಿಶ�</language>
-			<language type="dak">ಡಕೋಟ</language>
-			<language type="dar">ದರ�ಗ�ವಾ</language>
-			<language type="day">ದಾಯಕ�</language>
-			<language type="de">ಜರ�ಮನ�</language>
-			<language type="de_AT">ಆಸ�ಟ�ರಿಯನ� ಜರ�ಮನ�</language>
-			<language type="de_CH">ಸ�ವಿಸ� ಹೈ ಜರ�ಮನ�</language>
-			<language type="del">ಡೆಲಾವೇರ�</language>
-			<language type="den">ಸ�ಲೇವ�</language>
-			<language type="dgr">ಡೋಗ�ರಿಬ�</language>
-			<language type="din">ಡಿಂಕಾ</language>
-			<language type="doi">ಡೋಗ�ರಿ</language>
-			<language type="dra">ಡ�ರಾವಿಡಿಯನ� ಭಾಷೆ</language>
-			<language type="dsb">ಲೋವರ� ಸೋರ�ಬಿಯನ�</language>
-			<language type="dua">ಡ�ವಾಲಾ</language>
-			<language type="dum">ಮಧ�ಯ ಡಚ�</language>
-			<language type="dv">ದಿವೆಹಿ</language>
-			<language type="dyu">ಡ�ಯೂಲಾ</language>
-			<language type="dz">ಜೋಂಗ�‌ಖಾ</language>
-			<language type="ee">�ವ�</language>
-			<language type="efi">ಎಫಿಕ�</language>
-			<language type="egy">ಪ�ರಾಚೀನ ಈಜಿಪ�ಟಿಯನ�</language>
-			<language type="eka">ಎಕಾಜ�ಕ�</language>
-			<language type="el">ಗ�ರೀಕ�</language>
-			<language type="elx">ಎಲಾಮೈಟ�</language>
-			<language type="en">ಇಂಗ�ಲೀಷ�</language>
-			<language type="en_AU">ಆಸ�ಟ�ರೇಲಿಯನ� ಇಂಗ�ಲೀಷ�</language>
-			<language type="en_CA">ಕೆನೆಡಿಯನ� ಇಂಗ�ಲೀಷ�</language>
-			<language type="en_GB">ಬ�ರಿಟಿಷ� ಇಂಗ�ಲೀಷ�</language>
-			<language type="en_US">ಯ�.ಎಸ�. ಇಂಗ�ಲೀಷ�</language>
-			<language type="enm">ಮಧ�ಯ ಇಂಗ�ಲೀಷ�</language>
-			<language type="eo">ಎಸ�ಪೆರಾಂಟೊ</language>
-			<language type="es">ಸ�ಪ�ಯಾನಿಷ�</language>
-			<language type="es_419">ಲ�ಯಾಟಿನ� ಅಮೇರಿಕನ� ಸ�ಪ�ಯಾನಿಶ�</language>
-			<language type="es_ES">�ಬೇರಿಯನ� ಸ�ಪ�ಯಾನಿಶ�</language>
-			<language type="et">ಎಸ�ಟೊನಿಯನ�</language>
-			<language type="eu">ಬಾಸ�ಕ�</language>
-			<language type="ewo">ಇವಾಂಡೋ</language>
-			<language type="fa">ಪರ�ಶಿಯನ�</language>
-			<language type="fan">ಫೆಂಗ�</language>
-			<language type="fat">ಫಾಂಟಿ</language>
-			<language type="ff">ಫ�ಲಾಹ�</language>
-			<language type="fi">ಫಿನ�ನಿಶ�</language>
-			<language type="fil">ಫಿಲಿಪಿನೊ</language>
-			<language type="fiu">ಫಿನ�ನೋ-ಉಗ�ರಿಯನ� ಭಾಷೆ</language>
-			<language type="fj">ಫಿಜಿಯನ�</language>
-			<language type="fo">ಫರೋಸಿ</language>
-			<language type="fon">ಫೋನ�</language>
-			<language type="fr">ಫ�ರೆಂಚ�</language>
-			<language type="fr_CA">ಕೆನೆಡಿಯನ� ಫ�ರೆಂಚ�</language>
-			<language type="fr_CH">ಸ�ವಿಸ� ಫ�ರೆಂಚ�</language>
-			<language type="frm">ಮಧ�ಯ ಫ�ರೆಂಚ�</language>
-			<language type="fro">ಪ�ರಾಚೀನ ಫ�ರೆಂಚ�</language>
-			<language type="frr">ಉತ�ತರ ಫ�ರಿಸಿಯನ�</language>
-			<language type="frs">ಪೂರ�ವ ಫ�ರಿಸಿಯನ�</language>
-			<language type="fur">ಫ�ರಿಯ�ಲಿಯನ�</language>
-			<language type="fy">ಪಶ�ಚಿಮ ಫ�ರಿಸಿಯನ�</language>
-			<language type="ga">�ರಿಷ�</language>
-			<language type="gaa">ಗಾ</language>
-			<language type="gay">ಗಾಯೋ</language>
-			<language type="gba">ಗ�ಬಾಯಾ</language>
-			<language type="gd">ಸ�ಕಾಟಿಶ� ಗ�ಯಾಲಿಕ�</language>
-			<language type="gem">ಜರ�ಮನಿಕ� ಭಾಷೆ</language>
-			<language type="gez">ಗೀ��</language>
-			<language type="gil">ಗಿಲ�ಬರ�ಟೀಸ�</language>
-			<language type="gl">ಗ�ಯಾಲಿಶಿಯನ�</language>
-			<language type="gmh">ಮಧ�ಯ ಹೈ ಜರ�ಮನ�</language>
-			<language type="gn">ಗೌರಾನಿ</language>
-			<language type="goh">ಪ�ರಾಚೀನ ಹೈ ಜರ�ಮನ�</language>
-			<language type="gon">ಗೊಂಡಿ</language>
-			<language type="gor">ಗೊರೊಂಟಾಲೋ</language>
-			<language type="got">ಗೋಥಿಕ�</language>
-			<language type="grb">ಗ�ರೇಬೋ</language>
-			<language type="grc">ಪ�ರಾಚೀನ ಗ�ರೀಕ�</language>
-			<language type="gsw">ಸ�ವಿಸ� ಜರ�ಮನ�</language>
-			<language type="gu">ಗ�ಜರಾತಿ</language>
-			<language type="gv">ಮ�ಯಾಂಕ�ಸ�</language>
-			<language type="gwi">ಗ�ವಿಚ�‌ಇನ�</language>
-			<language type="ha">ಹೌಸಾ</language>
-			<language type="hai">ಹೈಡಾ</language>
-			<language type="haw">ಹವಾಯಿಯನ�</language>
-			<language type="he">ಹೀಬ�ರ�ಯೂ</language>
-			<language type="hi">ಹಿಂದಿ</language>
-			<language type="hil">ಹಿಲಿಗೇನನ�</language>
-			<language type="him">ಹಿಮಾಚಲಿ</language>
-			<language type="hit">ಹಿಟ�ಟಿಟೆ</language>
-			<language type="hmn">ಮೋಂಗ�</language>
-			<language type="ho">ಹಿರಿ ಮೊಟ�</language>
-			<language type="hr">ಕ�ರೊಯೇಶಿಯನ�</language>
-			<language type="hsb">ಅಪ�ಪರ� ಸರ�ಬಿಯನ�</language>
-			<language type="ht">ಹೈತಿಯನ�</language>
-			<language type="hu">ಹಂಗೇರಿಯನ�</language>
-			<language type="hup">ಹೂಪಾ</language>
-			<language type="hy">ಅರ�ಮೇನಿಯನ�</language>
-			<language type="hz">ಹೆರೆರೊ</language>
-			<language type="ia">ಇಂಟರ�ಲಿಂಗ�ವಾ</language>
-			<language type="iba">ಇಬಾನ�</language>
-			<language type="id">ಇಂಡೋನೇಶಿಯನ�</language>
-			<language type="ie">ಇಂಟರ�ಲಿಂಗ�</language>
-			<language type="ig">ಇಗ�ಬೊ</language>
-			<language type="ii">ಸಿಚ�ಅನ� ಯಿ</language>
-			<language type="ijo">ಇಜೋ</language>
-			<language type="ik">ಇನ�ಪಿಯಾಕ�</language>
-			<language type="ilo">ಇಲ�ಲಿಕೋ</language>
-			<language type="inc">ಭಾರತೀಯ ಭಾಷೆ</language>
-			<language type="ine">ಇಂಡೋ-ಯೂರೋಪಿಯನ� ಭಾಷೆ</language>
-			<language type="inh">ಇಂಗ�ಷ�</language>
-			<language type="io">ಇಡೊ</language>
-			<language type="ira">ಇರಾನಿಯನ� ಭಾಷೆ</language>
-			<language type="iro">ಇರೋಕ�ವಿಯನ� ಭಾಷೆ</language>
-			<language type="is">�ಸ�‌ಲ�ಯಾಂಡಿಕ�</language>
-			<language type="it">ಇಟಾಲಿಯನ�</language>
-			<language type="iu">ಇನ�ಕ�ಟಿಟ�ಟ�</language>
-			<language type="ja">ಜಪಾನೀಸ�</language>
-			<language type="jbo">ಲೊಜ�ಬಾನ�</language>
-			<language type="jpr">ಜೂಡಿಯೋ-ಪರ�ಶಿಯನ�</language>
-			<language type="jrb">ಜೂಡಿಯೋ-ಅರೇಬಿಕ�</language>
-			<language type="jv">ಜವಾನೀಸ�</language>
-			<language type="ka">ಜಾರ�ಜಿಯನ�</language>
-			<language type="kaa">ಕಾರಾ-ಕಲ�ಪಾಕ�</language>
-			<language type="kab">ಕಬೈಲ�</language>
-			<language type="kac">ಕಚಿನ�</language>
-			<language type="kaj">ಜ�ಜ�</language>
-			<language type="kam">ಕಂಬಾ</language>
-			<language type="kar">ಕರೆನ�</language>
-			<language type="kaw">ಕಾವಿ</language>
-			<language type="kbd">ಕಬರ�ಡಿಯನ�</language>
-			<language type="kcg">ಟ�ಯಾಪ�</language>
-			<language type="kfo">ಕೋರೋ</language>
-			<language type="kg">ಕಾಂಗೋ</language>
-			<language type="kha">ಖಾಸಿ</language>
-			<language type="khi">ಖೋಇಸನ� ಭಾಷೆ</language>
-			<language type="kho">ಖೋಟಾನೀಸ�</language>
-			<language type="ki">ಕಿಕ�ಯ�</language>
-			<language type="kj">ಕ�ವಾನ�‌ಯಾಮಾ</language>
-			<language type="kk">ಕ�ಕ�</language>
-			<language type="kl">ಕಲಾಲ�ಲಿಸ�ಟ�</language>
-			<language type="km">ಖಮೇರ�</language>
-			<language type="kmb">ಕಿಂಬ�ಂಡ�</language>
-			<language type="kn">ಕನ�ನಡ</language>
-			<language type="ko">ಕೋರಿಯನ�</language>
-			<language type="kok">ಕೊಂಕಣಿ</language>
-			<language type="kos">ಕೊಸರಿಯನ�</language>
-			<language type="kpe">ಕಪೆಲ�ಲೆ</language>
-			<language type="kr">ಕನ�ರಿ</language>
-			<language type="krc">ಕರಚಯ�-ಬಲ�ಕಾರ�</language>
-			<language type="krl">ಕರೇಲಿಯನ�</language>
-			<language type="kro">ಕ�ರ�</language>
-			<language type="kru">ಕ�ರ�ಖ�</language>
-			<language type="ks">ಕಾಶ�ಮೀರಿ</language>
-			<language type="ku">ಕ�ರ�ದಿಷ�</language>
-			<language type="kum">ಕ�ಮೈಕ�</language>
-			<language type="kut">ಕ�ಟೇನಾಯ�</language>
-			<language type="kv">ಕೋಮಿ</language>
-			<language type="kw">ಕೋರ�ನಿಷ�</language>
-			<language type="ky">ಕಿರ�ಜಿ��</language>
-			<language type="la">ಲ�ಯಾಟಿನ�</language>
-			<language type="lad">ಕಾಡಿನೋ</language>
-			<language type="lah">ಲಹಂಡಾ</language>
-			<language type="lam">ಲಂಬಾ</language>
-			<language type="lb">ಲಕ�ಸಂಬರ�ಗ�</language>
-			<language type="lez">ಲೆಜ�ಘಿಯನ�</language>
-			<language type="lg">ಗಂಡಾ</language>
-			<language type="li">ಲಿಂಬರ�ಗಿಶ�</language>
-			<language type="ln">ಲಿಂಗಾಲ</language>
-			<language type="lo">ಲಾವೋ</language>
-			<language type="lol">ಮೊಂಗೋ</language>
-			<language type="loz">ಲೋಜಿ</language>
-			<language type="lt">ಲಿಥ�ವೇನಿಯನ�</language>
-			<language type="lu">ಲೂಬಾ-ಕಟಾಂಗಾ</language>
-			<language type="lua">ಲೂಬಾ-ಲ�ಲ�ಆ</language>
-			<language type="lui">ಲೂಯಿಸೆನೋ</language>
-			<language type="lun">ಲ�ಂಡಾ</language>
-			<language type="luo">ಲ�ವೋ</language>
-			<language type="lus">ಲ�ಶಾಯ�</language>
-			<language type="lv">ಲಟ�ವಿಯನ�</language>
-			<language type="mad">ಮದ�ರೀಸ�</language>
-			<language type="mag">ಮಗಾಹಿ</language>
-			<language type="mai">ಮೈಥಿಲಿ</language>
-			<language type="mak">ಮಕಾಸರ�</language>
-			<language type="man">ಮಂಡಿಂಗೊ</language>
-			<language type="map">ಆಸ�ಟ�ರೋನೇಷ�ಯನ�</language>
-			<language type="mas">ಮಸಾಯ�</language>
-			<language type="mdf">ಮೋಕ�ಷ</language>
-			<language type="mdr">ಮಂದಾರ�</language>
-			<language type="men">ಮೆಂಡೆ</language>
-			<language type="mg">ಮಲಗಾಸಿ</language>
-			<language type="mga">ಮಧ�ಯ �ರಿಷ�</language>
-			<language type="mh">ಮಾರ�ಶಲ�ಲೀಸ�</language>
-			<language type="mi">ಮಾವೋರಿ</language>
-			<language type="mic">ಮಿಕ�‌ಮ�ಯಾಕ�</language>
-			<language type="min">ಮಿನಂಗ�‌ಕಬಾವ�</language>
-			<language type="mis">ಸಮ�ಮಿಶ�ರ ಭಾಷೆ</language>
-			<language type="mk">ಮೆಸಿಡೋನಿಯನ�</language>
-			<language type="mkh">ಮೋನ�-ಖಮೇರ� ಭಾಷೆ</language>
-			<language type="ml">ಮಲೆಯಾಳಂ</language>
-			<language type="mn">ಮಂಗೋಲಿಯನ�</language>
-			<language type="mnc">ಮಂಚ�</language>
-			<language type="mni">ಮಣಿಪ�ರಿ</language>
-			<language type="mno">ಮನೋಬೋ ಭಾಷೆ</language>
-			<language type="mo">ಮಾಲ�ಡೀವಿಯನ�</language>
-			<language type="moh">ಮೊಹಾವ�ಕ�</language>
-			<language type="mos">ಮೊಸ�ಸಿ</language>
-			<language type="mr">ಮರಾಠಿ</language>
-			<language type="ms">ಮಲಯ</language>
-			<language type="mt">ಮಾಲ�ಟೀಸ�</language>
-			<language type="mul">ಬಹ�ಸಂಖ�ಯೆಯ ಭಾಷೆಗಳ�</language>
-			<language type="mun">ಮ�ಂಡಾ ಭಾಷೆ</language>
-			<language type="mus">ಕ�ರೀಕ�</language>
-			<language type="mwl">ಕಿರಾಂಡೀಸ�</language>
-			<language type="mwr">ಮಾರ�ವಾಡಿ</language>
-			<language type="my">ಬರ�ಮೀಸ�</language>
-			<language type="myn">ಮಯನ� ಭಾಷೆ</language>
-			<language type="myv">ಎರ�‌��ಯಾ</language>
-			<language type="na">ನೌರ�</language>
-			<language type="nah">ನಹೌಟಿ</language>
-			<language type="nai">ಉತ�ತರ ಅಮೇರಿಕದ ಇಂಡಿಯನ� ಭಾಷೆ</language>
-			<language type="nap">ನಿಯಾಪೊಲಿಟನ�</language>
-			<language type="nb">ನೋರ�ವೇಜಿಯನ� ಬೊಕ�ಮಲ�</language>
-			<language type="nd">ಉತ�ತರ ದೆಬೆಲೆ</language>
-			<language type="nds">ಲೋ ಜರ�ಮನ�</language>
-			<language type="ne">ನೇಪಾಳಿ</language>
-			<language type="new">ನೇವಾರೀ</language>
-			<language type="ng">ಡೋಂಗಾ</language>
-			<language type="nia">ನಿಯಾಸ�</language>
-			<language type="nic">ನೈಗರ�-ಕೊರ�ಡೊಫನಿಯನ� ಭಾಷೆ</language>
-			<language type="niu">ನಿಯ�ವನ�</language>
-			<language type="nl">ಡಚ�</language>
-			<language type="nl_BE">ಫ�ಲೆಮಿಷ�</language>
-			<language type="nn">ನಾರ�ವೇಜಿಯನ� ನೂನಾರ�ಸ�ಕ�</language>
-			<language type="no">ನಾರ�ವೇಜಿಯನ�</language>
-			<language type="nog">ನೊಗಾಯ�</language>
-			<language type="non">ಪ�ರಾಚೀನ ನೋರ�ಸ�</language>
-			<language type="nqo">ಎನ�‌ಕೋ</language>
-			<language type="nr">ದಕ�ಷಿಣ ದೆಬೆಲೆ</language>
-			<language type="nso">ಉತ�ತರ ಸೋಥೋ</language>
-			<language type="nub">ನ�ಬಿಯನ� ಭಾಷೆ</language>
-			<language type="nv">ನವಾಜೊ</language>
-			<language type="nwc">ಶಾಸ�ತ�ರೀಯ ನೇವಾರಿ</language>
-			<language type="ny">ನ�ಯಾಂಜಾ</language>
-			<language type="nym">ನ�ಯಾಮ�‌ವೆಂಜಿ</language>
-			<language type="nyn">ನ�ಯಾನ�‌ಕೋಲೆ</language>
-			<language type="nyo">ನ�ಯೋರೋ</language>
-			<language type="nzi">ಜೀಮಾ</language>
-			<language type="oc">ಆಕ�ಸಿಟಾನ�</language>
-			<language type="oj">ಒಜಿಬ�ವಾ</language>
-			<language type="om">ಒರೊಮೊ</language>
-			<language type="or">ಓರಿಯಾ</language>
-			<language type="os">ಒಸ�ಸೆಟಿಕ�</language>
-			<language type="osa">ಓಸಾಜ�</language>
-			<language type="ota">ಒಟ�ಟೋಮನ� ತ�ರ�ಕಿಷ�</language>
-			<language type="oto">ಒಟ�ಟೋಮನ� ಭಾಷೆ</language>
-			<language type="pa">ಪಂಜಾಬಿ</language>
-			<language type="paa">ಪಪ�ವನ� ಭಾಷೆ</language>
-			<language type="pag">ಪಂಗಾಸಿನನ�</language>
-			<language type="pal">ಪಹ�ಲವಿ</language>
-			<language type="pam">ಪಂಪಾಂಗಾ</language>
-			<language type="pap">ಪಾಪಿಯಮೆಂಟೋ</language>
-			<language type="pau">ಪಲ�ಆನ�</language>
-			<language type="peo">ಪ�ರಾಚೀನ ಪರ�ಶಿಯನ�</language>
-			<language type="phi">ಫಿಲಿಫೈನ� ಭಾಷೆ</language>
-			<language type="phn">ಫೀನಿಷಿಯನ�</language>
-			<language type="pi">ಪಾಲಿ</language>
-			<language type="pl">ಪೋಲಿಶ�</language>
-			<language type="pon">ಪೋನ�‌‌ಪಿಯನ�</language>
-			<language type="pra">ಪ�ರಾಕೃತ� ಭಾಷೆ</language>
-			<language type="pro">ಪ�ರಾಚೀನ ಪ�ರೊವೆನ�ಶಿಯಲ�</language>
-			<language type="ps">ಪಾಷ�ಟೋ</language>
-			<language type="pt">ಪೋರ�ಚ�ಗೀಸ�</language>
-			<language type="pt_BR">ಬ�ರೆಜಿಲಿಯನ� ಪೋರ�ಚ�ಗೀಸ�</language>
-			<language type="pt_PT">�ಬೀರಿಯನ� ಪೋರ�ಚ�ಗೀಸ�</language>
-			<language type="qu">ಕ�ವೆಚ�ವಾ</language>
-			<language type="raj">ರಾಜಾಸ�ಥಾನಿ</language>
-			<language type="rap">ರಾಪಾನ�ಯಿ</language>
-			<language type="rar">ರಾರೋಟೊಂಗನ�</language>
-			<language type="rm">ರಹೇಟೋ-ರೋಮ�ಯಾನ�ಸ�</language>
-			<language type="rn">ರ�ಂಡಿ</language>
-			<language type="ro">ರೊಮ�ಯಾನಿಯನ�</language>
-			<language type="roa">ರೋಮನ� ಭಾಷೆ</language>
-			<language type="rom">ರೋಮಾನಿ</language>
-			<language type="root">ರೂಟ�</language>
-			<language type="ru">ರಶಿಯನ�</language>
-			<language type="rup">ಅರೋಮಾನಿಯನ�</language>
-			<language type="rw">ಕೀನ�ಯಾರ�ವಾಂಡಾ</language>
-			<language type="sa">ಸಂಸ�ಕೃತ</language>
-			<language type="sad">ಸಂಡಾವೇ</language>
-			<language type="sah">ಯಾಕ�ಟ�</language>
-			<language type="sai">ದಕ�ಷಿಣ ಅಮೇರಿಕದ ಇಂಡಿಯನ� ಭಾಷೆ</language>
-			<language type="sal">ಸಲಿಷನ� ಭಾಷೆ</language>
-			<language type="sam">ಸಮರಿಟನ� ಅರಾಮಿಕ�</language>
-			<language type="sas">ಸಸಾಕ�</language>
-			<language type="sat">ಸಂತಾಲಿ</language>
-			<language type="sc">ಸರ�ಡೀನಿಯನ�</language>
-			<language type="scn">ಸಿಸಿಲಿಯನ�</language>
-			<language type="sco">ಸ�ಕೋಟ�ಸ�</language>
-			<language type="sd">ಸಿಂಧಿ</language>
-			<language type="se">ಉತ�ತರ ಸಾಮಿ</language>
-			<language type="sel">ಸೆಲ�ಕಪ�</language>
-			<language type="sem">ಸೆಮಿಟಿಕ� ಭಾಷೆ</language>
-			<language type="sg">ಸಾಂಗೋ</language>
-			<language type="sga">ಪ�ರಾಚೀನ �ರಿಷ�</language>
-			<language type="sgn">ಸಂಜ�ಞಾ ಭಾಷೆ</language>
-			<language type="sh">ಸರ�ಬೋ-ಕ�ರೊಯೇಶಿಯನ�</language>
-			<language type="shn">ಶಾನ�</language>
-			<language type="si">ಸಿಂಹಳ</language>
-			<language type="sid">ಸಿಡಾಮೋ</language>
-			<language type="sio">ಸಿವ�ಅನ� ಭಾಷೆ</language>
-			<language type="sit">ಸೈನೋ-ಟಿಬೇಟಿಯನ� ಭಾಷೆ</language>
-			<language type="sk">ಸ�ಲೋವಾಕ�</language>
-			<language type="sl">ಸ�ಲೋವೇನಿಯನ�</language>
-			<language type="sla">ಸ�ಲಾವಿಕ� ಭಾಷೆ</language>
-			<language type="sm">ಸಮೋವನ�</language>
-			<language type="sma">ದಕ�ಷಿಣ ಸಾಮಿ</language>
-			<language type="smi">ಸಾಮಿ ಭಾಷೆ</language>
-			<language type="smj">ಲೂಲ� ಸಾಮಿ</language>
-			<language type="smn">ಇನರಿ ಸಾಮಿ</language>
-			<language type="sms">ಸ�ಕೋಟ� ಸಾಮಿ</language>
-			<language type="sn">ಶೋನಾ</language>
-			<language type="snk">ಸೋನಿಂಕೆ</language>
-			<language type="so">ಸೋಮಾಲಿ</language>
-			<language type="sog">ಸೋಗ�ಡಿ�ನ�</language>
-			<language type="son">ಸೋಂಘಾಯ�</language>
-			<language type="sq">ಅಲ�ಬೇನಿಯನ�</language>
-			<language type="sr">ಸರ�ಬಿಯನ�</language>
-			<language type="srn">ಸ�ರಾನನ� ಟೋಂಗೋ</language>
-			<language type="srr">ಸೇರೇರ�</language>
-			<language type="ss">ಸ�ವಾತಿ</language>
-			<language type="ssa">ನಿಲೋ-ಸಹಾರನ� ಭಾಷೆ</language>
-			<language type="st">ದಕ�ಷಿಣ ಸೋಥೋ</language>
-			<language type="su">ಸ�ಂಡಾನೀಸ�</language>
-			<language type="suk">ಸ�ಕ�ಮಾ</language>
-			<language type="sus">ಸ�ಸ�</language>
-			<language type="sux">ಸ�ಮೇರಿಯನ�</language>
-			<language type="sv">ಸ�ವೀಡಿಷ�</language>
-			<language type="sw">ಸ�ವಹಿಲಿ</language>
-			<language type="syc">ಶಾಸ�ತ�ರೀಯ ಸಿರಿಯಕ�</language>
-			<language type="syr">ಸಿರಿಯಕ�</language>
-			<language type="ta">ತಮಿಳ�</language>
-			<language type="tai">ಥಾಯ� ಭಾಷೆ</language>
-			<language type="te">ತೆಲ�ಗ�</language>
-			<language type="tem">ಟಿಮ�ನೆ</language>
-			<language type="ter">ಟೆರೆನೋ</language>
-			<language type="tet">ಟೇಟಮ�</language>
-			<language type="tg">ತಾಜಿಕ�</language>
-			<language type="th">ಥಾಯಿ</language>
-			<language type="ti">ಟೈಗ�ರಿನ�ಯಾ</language>
-			<language type="tig">ಟೈಗ�ರೆ</language>
-			<language type="tiv">ಟಿವ�</language>
-			<language type="tk">ಟರ�ಕ�‌ಮೆನ�</language>
-			<language type="tkl">ಟೊಕೆಲಾವ�</language>
-			<language type="tl">ಟ�ಯಾಗಲೋಗ�</language>
-			<language type="tlh">ಕ�ಲಿಂಗೋನ�</language>
-			<language type="tli">ಟ�ಲಿಂಗಿಟ�</language>
-			<language type="tmh">ಟಮಾಷೆಕ�</language>
-			<language type="tn">ಸ�ವಾನಾ</language>
-			<language type="to">ಟೊಂಗಾ</language>
-			<language type="tog">ನ�ಯಾಸಾ ಟೋಂಗಾ</language>
-			<language type="tpi">ಟೋಕ� ಪಿಸಿನ�</language>
-			<language type="tr">ಟರ�ಕಿಶ�</language>
-			<language type="ts">ಸೋಂಗಾ</language>
-			<language type="tsi">ಸಿಂಶಿಯನ�</language>
-			<language type="tt">ಟಾಟರ�</language>
-			<language type="tum">ಟ�ಂಬ�ಕ</language>
-			<language type="tup">ಟೂಪಿ ಭಾಷೆ</language>
-			<language type="tut">ಆಲ�ಟಾಯಿಕ� ಭಾಷೆ</language>
-			<language type="tvl">ಟ�ವಾಲ�</language>
-			<language type="tw">ಟ�ವಿ</language>
-			<language type="ty">ತಹಿತಿಯನ�</language>
-			<language type="tyv">ಟ�ವಿನಿಯನ�</language>
-			<language type="udm">ಉಡ�‌ಮ�ರ�ಟ�</language>
-			<language type="ug">ಉಯಿಘರ�</language>
-			<language type="uga">ಉಗಾರಿಟಿಕ�</language>
-			<language type="uk">ಉಕ�ರೈನಿಯನ�</language>
-			<language type="umb">ಉಂಬ�ಂಡ�</language>
-			<language type="und">ಅಪರಿಚಿತ ಅಥವಾ ಅಮಾನ�ಯ ಭಾಷೆ</language>
-			<language type="ur">ಉರ�ದ�</language>
-			<language type="uz">ಉಜ�ಬೇಕ�</language>
-			<language type="vai">ವಾಯಿ</language>
-			<language type="ve">ವೆಂಡಾ</language>
-			<language type="vi">ವಿಯೇಟ�ನಾಮೀಸ�</language>
-			<language type="vo">ವೋಲಾಪ�ಕ�</language>
-			<language type="vot">ವೋಟಿಕ�</language>
-			<language type="wa">ವಾಲೂನ�</language>
-			<language type="wak">ವಾಕಾಷನ� ಭಾಷೆ</language>
-			<language type="wal">ವಲಾಮೋ</language>
-			<language type="war">ವರಾಯ�</language>
-			<language type="was">ವಾಷೋ</language>
-			<language type="wen">ಸೋರ�ಬಿಯನ� ಭಾಷೆ</language>
-			<language type="wo">ವೋಲೋಫ�</language>
-			<language type="xal">ಕಲ�‌ಮೈಕ�</language>
-			<language type="xh">ಷೋಸಾ</language>
-			<language type="yao">ಯಾಓ</language>
-			<language type="yap">ಯಪೀಸೆ</language>
-			<language type="yi">ಯಿಡ�ಡಿಷ�</language>
-			<language type="yo">ಯೊರ�ಬಾ</language>
-			<language type="ypk">ಯೂಪಿಕ� ಭಾಷೆ</language>
-			<language type="za">�ೂವಾಂಗ�</language>
-			<language type="zap">�ೋಪೊಟೆಕ�</language>
-			<language type="zbl">ಬ�ಲಿಸ�‌ಸಿಂಬಲ�ಸ�</language>
-			<language type="zen">�ೆನಾಗಾ</language>
-			<language type="zh">ಚೈನೀಸ�</language>
-			<language type="zh_Hans">ಸಿಂಪ�ಲಿಫೈಡ� ಚೈನೀಸ�</language>
-			<language type="zh_Hant">ಟ�ರೆಡೀಶನಲ� ಚೈನೀಸ�</language>
-			<language type="znd">�ಂಡೇ</language>
-			<language type="zu">ಜ�ಲ�</language>
-			<language type="zun">�ೂನಿ</language>
-			<language type="zxx">ಯಾವ�ದೇ ಭಾಷಾಸಂಬಂಧಿ ವಿಷಯವಿಲ�ಲ</language>
-			<language type="zza">ಜಾ�ಾ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ಅರೇಬಿಕ�</script>
-			<script type="Armi">ಇಂಪೀರಿಯಲ� ಅರೆಮಾಯಿಕ�</script>
-			<script type="Armn">ಅರ�ಮೇನಿಯನ�</script>
-			<script type="Avst">ಅವೆಸ�ತಾನ�</script>
-			<script type="Bali">ಬಾಲಿನೀಸ�</script>
-			<script type="Batk">ಬಾಟಕ�</script>
-			<script type="Beng">ಬೆಂಗಾಲಿ</script>
-			<script type="Blis">ಬ�ಲಿಸ�‌ಸಿಂಬಲ�ಸ�</script>
-			<script type="Bopo">ಬೋಪೊಮೋಫೋ</script>
-			<script type="Brah">ಬ�ರಾಹ�ಮಿ</script>
-			<script type="Brai">ಬ�ರೈಲ�</script>
-			<script type="Bugi">ಬಗಿನೀಸ�</script>
-			<script type="Buhd">ಬ�ಹಿದ�</script>
-			<script type="Cakm">ಕಾಕಂ</script>
-			<script type="Cans">ಯ�ನಿಟೆಡ� ಕೆನೆಡಿಯನ� ಅಬೊರಿಜಿನಲ� ಸಿಲ�ಯಾಬಿಕ�ಸ�</script>
-			<script type="Cari">ಕರೇನ�</script>
-			<script type="Cham">ಚಾಮ�</script>
-			<script type="Cher">ಚೆರೋಕೀ</script>
-			<script type="Cirt">ಸಿರ�ಥ�</script>
-			<script type="Copt">ಕಾಪ�ಟಿಕ�</script>
-			<script type="Cprt">ಸಿಪ�ರಿಯಾಟ�</script>
-			<script type="Cyrl">ಸಿರಿಲಿಕ�</script>
-			<script type="Cyrs">ಪ�ರಾಚೀನ ಚರ�ಚ� ಸ�ಲೋವಾನಿಕ� ಸಿರಿಲಿಕ�</script>
-			<script type="Deva">ದೇವನಾಗರಿ</script>
-			<script type="Dsrt">ಡಸರ�ಟ�</script>
-			<script type="Egyd">ಈಜಿಪ�ಟಿಯನ� ಡೆಮೋಟಿಕ�</script>
-			<script type="Egyh">ಈಜಿಪ�ಟಿಯನ� ಹಯಾರಿಟಿಕ�</script>
-			<script type="Egyp">ಈಜಿಪ�ಟಿಯನ� ಹೀರೋಗ�ಲಿಫ�ಸ�</script>
-			<script type="Ethi">ಇಥಿಯೋಪಿಯಾ</script>
-			<script type="Geok">ಜಾರ�ಜಿಯನ� ಖ�ಸ�ತ�ರಿ</script>
-			<script type="Geor">ಜಾರ�ಜಿಯನ�</script>
-			<script type="Glag">ಗ�ಲಾಗೋಲಿಟಿಕ�</script>
-			<script type="Goth">ಗೋತಿಕ�</script>
-			<script type="Grek">ಗ�ರೀಕ�</script>
-			<script type="Gujr">ಗ�ಜರಾತಿ</script>
-			<script type="Guru">ಗ�ರ�ಮ�ಖಿ</script>
-			<script type="Hang">ಹ�ಯಾಂಗಲ�</script>
-			<script type="Hani">ಹಾನ�</script>
-			<script type="Hano">ಹನೂನೂ</script>
-			<script type="Hans">ಸರಳೀಕೃತ ಹಾನ�</script>
-			<script type="Hant">ಸಾಂಪ�ರದಾಯಿಕ ಹಾನ�</script>
-			<script type="Hebr">ಹೀಬ�ರೂ</script>
-			<script type="Hira">ಹಿರಗಾನಾ</script>
-			<script type="Hmng">ಪಹವ� ಹ�ಮೋಂಗ�</script>
-			<script type="Hrkt">ಕಟಕಾನಾ ಅಥವಾ ಹಿರಗಾನಾ</script>
-			<script type="Hung">ಪ�ರಾಚೀನ ಹಂಗೇರಿಯನ�</script>
-			<script type="Inds">ಸಿಂಧೂ</script>
-			<script type="Ital">ಪ�ರಾಚೀನ� ಇಟಾಲಿಕ�</script>
-			<script type="Java">ಜಾವನೀಸ�</script>
-			<script type="Jpan">ಜಾಪನೀಸ�</script>
-			<script type="Kali">ಕೆಯಾ ಲಿ</script>
-			<script type="Kana">ಕಟಕಾನಾ</script>
-			<script type="Khar">ಖರೋಶ�ತಿ</script>
-			<script type="Khmr">ಖಮೇರ�</script>
-			<script type="Knda">ಕನ�ನಡ</script>
-			<script type="Kore">ಕೊರಿಯನ�</script>
-			<script type="Kthi">ಕೈಥಿ</script>
-			<script type="Lana">ಲಾನಾ</script>
-			<script type="Laoo">ಲಾವೋ</script>
-			<script type="Latf">ಫ�ರಾಕ�ತರ� ಲ�ಯಾಟಿನ�</script>
-			<script type="Latg">ಗೇಲಿಕ� ಲ�ಯಾಟಿನ�</script>
-			<script type="Latn">ಲ�ಯಾಟಿನ�</script>
-			<script type="Lepc">ಲೆಪ�ಚಾ</script>
-			<script type="Limb">ಲಿಂಬ�</script>
-			<script type="Lina">ಲೀನಯರ� ಎ</script>
-			<script type="Linb">ಲೀನಯರ� ಬಿ</script>
-			<script type="Lyci">ಲೈಸಿಯನ�</script>
-			<script type="Lydi">ಲಿಡಿಯನ�</script>
-			<script type="Mand">ಮಂಡೇಯನ�</script>
-			<script type="Mani">ಮನಿಚೈಯನ�</script>
-			<script type="Maya">ಮಯಾನ� ಹೀರೋಗ�ಲಿಫ�ಸ�</script>
-			<script type="Mero">ಮೆರೊಯಿಟಿಕ�</script>
-			<script type="Mlym">ಮಲೆಯಾಳಂ</script>
-			<script type="Mong">ಮಂಗೋಲಿಯನ�</script>
-			<script type="Moon">ಮೂನ�</script>
-			<script type="Mtei">ಮೈತಿ ಮಯೆಕ�</script>
-			<script type="Mymr">ಮ�ಯಾನ�ಮಾರ�</script>
-			<script type="Nkoo">ಎನ��ಕೋ</script>
-			<script type="Ogam">ಓಘಮ�</script>
-			<script type="Olck">ಓಲ� ಚಿಕಿ</script>
-			<script type="Orkh">ಓರ�ಖೋನ�</script>
-			<script type="Orya">ಓರಿಯಾ</script>
-			<script type="Osma">ಓಸ�ಮಾನ�ಯಾ</script>
-			<script type="Perm">ಪ�ರಾಚೀನ ಪೆರ�ಮಿಕ�</script>
-			<script type="Phag">ಫಾಗ�ಸ�-ಪಾ</script>
-			<script type="Phli">ಇನ�ಸ�‌ಕ�ರಿಪ�ಶನಲ� ಪಾಹ�ಲವಿ</script>
-			<script type="Phlp">ಸಾಲ�ಟರ� ಪಾಹ�ಲವಿ</script>
-			<script type="Phlv">ಬ�ಕ� ಪಾಹ�ಲವಿ</script>
-			<script type="Phnx">ಫೀನಿಶಿಯನ�</script>
-			<script type="Plrd">ಪೊಲ�ಲಾರ�ಡ� ಫೊನೆಟಿಕ�</script>
-			<script type="Prti">ಇನ�ಸ�‌ಕ�ರಿಪ�ಶನಲ� ಪಾರ�ಥಿಯನ�</script>
-			<script type="Qaai">ಇನ��ಹೆರಿಟೆಡ�</script>
-			<script type="Rjng">ರೆಜಾಂಗ�</script>
-			<script type="Roro">ರೋಂಗೋರೋಂಗೋ</script>
-			<script type="Runr">ರೂನಿಕ�</script>
-			<script type="Samr">ಸಮಾರಿಟನ�</script>
-			<script type="Sara">ಸರಾಟಿ</script>
-			<script type="Saur">ಸೌರಾಷ�ಟ�ರ</script>
-			<script type="Sgnw">ಸೈನ�‌ರೈಟಿಂಗ�</script>
-			<script type="Shaw">ಶಾವಿಯಾನ�</script>
-			<script type="Sinh">ಸಿಂಹಳ</script>
-			<script type="Sund">ಸ�ಂಡಾನೀಸ�</script>
-			<script type="Sylo">ಸೈಲೋಟಿ ನಗ�ರಿ</script>
-			<script type="Syrc">ಸಿರಿಯಾಕ�</script>
-			<script type="Syre">ಎಸ�ಟ�ರಾಂಜಿಲೋ ಸಿರಿಯಾಕ�</script>
-			<script type="Syrj">ಪಶ�ಚಿಮ ಸಿರಿಯಾಕ�</script>
-			<script type="Syrn">ಪೂರ�ವ ಸಿರಿಯಾಕ�</script>
-			<script type="Tagb">ಟಾಗ�ಬಾನವಾ</script>
-			<script type="Tale">ಥಾಯ� ಲಿ</script>
-			<script type="Talu">ನ�ಯೂ ಥಾಯ� ಲ�ಇ</script>
-			<script type="Taml">ತಮಿಳ�</script>
-			<script type="Tavt">ಥಾಯ� ವಿಯೆಟ�</script>
-			<script type="Telu">ತೆಲ�ಗ�</script>
-			<script type="Teng">ತೆಂಗ�‌ವಾರ�</script>
-			<script type="Tfng">ಟಿಫಿನಾಘ�</script>
-			<script type="Tglg">ಟ�ಯಾಗಲೋಗ�</script>
-			<script type="Thaa">ಥಾನಾ</script>
-			<script type="Thai">ಥಾಯ�</script>
-			<script type="Tibt">ಟಿಬೇಟನ�</script>
-			<script type="Ugar">ಉಗಾರಿಟಿಕ�</script>
-			<script type="Vaii">ವಾಯ�</script>
-			<script type="Visp">ವಿಸಿಬಲ� ಸ�ಪೀಚ�</script>
-			<script type="Xpeo">ಪ�ರಾಚೀನ ಪರ�ಶಿಯನ�</script>
-			<script type="Xsux">ಸ�ಮೇರೋ-ಅಕ�ಕಾಡಿಯನ� ಕ�ಯೂನಿಫಾರ�ಮ�</script>
-			<script type="Yiii">ಯಿ</script>
-			<script type="Zmth">ಗಣೀತ ಸಂಕೇತಲಿಪಿ</script>
-			<script type="Zsym">ಸಂಕೇತಗಳ�</script>
-			<script type="Zxxx">ಅಲಿಖಿತ</script>
-			<script type="Zyyy">ಸಾಮಾನ�ಯ</script>
-			<script type="Zzzz">ಅಜ�ಞಾತ ಅಥವ ಅಮಾನ�ಯವಾದ ಲಿಪಿ</script>
-		</scripts>
-		<territories>
-			<territory type="001">ವಿಶ�ವ</territory>
-			<territory type="002">ಆಫ�ರಿಕಾ</territory>
-			<territory type="003">ಉತ�ತರ ಅಮೇರಿಕಾ</territory>
-			<territory type="005">ದಕ�ಷಿಣ ಅಮೇರಿಕಾ</territory>
-			<territory type="009">ಓಶಿಯಾನಾ</territory>
-			<territory type="011">ಪಶ�ಚಿಮ ಆಫ�ರಿಕಾ</territory>
-			<territory type="013">ಮಧ�ಯ ಅಮೇರಿಕಾ</territory>
-			<territory type="014">ಪೂರ�ವ ಆಫ�ರಿಕಾ</territory>
-			<territory type="015">ಉತ�ತರ ಆಫ�ರಿಕಾ</territory>
-			<territory type="017">ಮಧ�ಯ ಆಫ�ರಿಕಾ</territory>
-			<territory type="018">ಆಫ�ರಿಕಾದ ದಕ�ಷಿಣ ಭಾಗ</territory>
-			<territory type="019">ಅಮೆರಿಕಾಸ�</territory>
-			<territory type="021">ಅಮೇರಿಕಾದ ಉತ�ತರ ಭಾಗ</territory>
-			<territory type="029">ಕೆರೇಬಿಯನ�</territory>
-			<territory type="030">�ಷ�ಯಾದ ಪೂರ�ವ ಭಾಗ</territory>
-			<territory type="034">�ಷ�ಯಾದ ದಕ�ಷಿಣ ಭಾಗ</territory>
-			<territory type="035">ಆಗ�ನೇಯ �ಷ�ಯಾ</territory>
-			<territory type="039">ದಕ�ಷಿಣ ಯೂರೋಪ�</territory>
-			<territory type="053">ಆಸ�ಟ�ರೇಲಿಯಾ ಹಾಗೂ ನ�ಯೂ�ಿಲ�ಯಾಂಡ�</territory>
-			<territory type="054">ಮೇಲಿನೇಶಿಯಾ</territory>
-			<territory type="057">ಮೈಕ�ರೋನೇಶಿಯನ� ಪ�ರದೇಶ</territory>
-			<territory type="061">ಪೋಲಿನೇಶಿಯಾ</territory>
-			<territory type="062">ದಕ�ಷಿಣ-ಮಧ�ಯ �ಷ�ಯಾ</territory>
-			<territory type="142">�ಷ�ಯಾ</territory>
-			<territory type="143">ಮಧ�ಯ �ಷ�ಯಾ</territory>
-			<territory type="145">ಪಶ�ಚಿಮ �ಷ�ಯಾ</territory>
-			<territory type="150">ಯೂರೋಪ�</territory>
-			<territory type="151">ಪೂರ�ವ ಯೂರೋಪ�</territory>
-			<territory type="154">ಉತ�ತರ ಯೂರೋಪ�</territory>
-			<territory type="155">ಪಶ�ಚಿಮ ಯೂರೋಪ�</territory>
-			<territory type="172">ಸ�ವಂತಂತ�ರ�ಯ ರಾಷ�ಟ�ರಗಳ ಕಾಮನ�‌ವೆಲ�ತ�</territory>
-			<territory type="200">ಜೆಕೊಸ�ಲೋವಾಕಿಯಾ</territory>
-			<territory type="419">ಲ�ಯಾಟಿನ� ಅಮೇರಿಕಾ ಮತ�ತ� ಕೆರಿಬಿಯನ�</territory>
-			<territory type="830">ಛಾನೆಲ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="AD">ಅಂಡೋರಾ</territory>
-			<territory type="AE">ಸಂಯ�ಕ�ತ ಅರಬ� ಎಮಿರೇಟಸ�</territory>
-			<territory type="AF">ಅಫಘಾನಿಸ�ಥಾನ�</territory>
-			<territory type="AG">ಆಂಟಿಗ�ವಾ ಮತ�ತ� ಬರ�ಬ�ಡಾ</territory>
-			<territory type="AI">ಆಂಗ�ಯಿಲ�ಲಾ</territory>
-			<territory type="AL">ಅಲ�ಬೇನಿಯಾ</territory>
-			<territory type="AM">ಅರ�ಮೇನಿಯಾ</territory>
-			<territory type="AN">ನೆದರ�‌ಲ�ಯಾಂಡ�</territory>
-			<territory type="AO">ಅಂಗೋಲಾ</territory>
-			<territory type="AQ">ಅಂಟಾರ�ಟಿಕಾ</territory>
-			<territory type="AR">ಅರ�ಜೆಂಟೈನಾ</territory>
-			<territory type="AS">ಅಮೇರಿಕನ� ಸಮೋವಾ</territory>
-			<territory type="AT">ಆಸ�ಟ�ರಿಯಾ</territory>
-			<territory type="AU">ಆಸ�ಟ�ರೇಲಿಯ</territory>
-			<territory type="AW">ಅರ�ಬಾ</territory>
-			<territory type="AX">ಆಲ�ಯಾಂಡ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="AZ">ಅಜರ�ಬೈಜಾನ�</territory>
-			<territory type="BA">ಬೋಸ�ನಿಯಾ ಮತ�ತ� ಹರ�ಜೆಗೋವಿನಾ</territory>
-			<territory type="BB">ಬಾರ�ಬಡೋಸ�</territory>
-			<territory type="BD">ಬಾಂಗ�ಲಾದೇಶ�</territory>
-			<territory type="BE">ಬೆಲ�ಜಿಯಮ�</territory>
-			<territory type="BF">ಬ�ರ�ಕಿನಾ ಫಾಸೋ</territory>
-			<territory type="BG">ಬಲ�ಗೇರಿಯನ�</territory>
-			<territory type="BH">ಬಹರೈನ�</territory>
-			<territory type="BI">ಬ�ರ�ಂಡಿ</territory>
-			<territory type="BJ">ಬೆನಿನ�</territory>
-			<territory type="BL">ಸೇಂಟ� ಬಾರ�ಥೆಲೆಮಿ</territory>
-			<territory type="BM">ಬರ�ಮ�ಡಾ</territory>
-			<territory type="BN">ಬ�ರೂನಿ</territory>
-			<territory type="BO">ಬಲ�ಗೇರಿಯಾ</territory>
-			<territory type="BR">ಬ�ರೆಜಿಲ�</territory>
-			<territory type="BS">ಬಹಾಮಾಸ�</territory>
-			<territory type="BT">ಭೂತಾನ�</territory>
-			<territory type="BV">ಬೋವೆಟ� ದ�ವೀಪ</territory>
-			<territory type="BW">ಬೋಟ�ಸ�‌ವಾನಾ</territory>
-			<territory type="BY">ಬೊಲಿವಿಯಾ</territory>
-			<territory type="BZ">ಬೆಲಿಜ�</territory>
-			<territory type="CA">ಕೆನಡಾ</territory>
-			<territory type="CC">ಕೊಕೊಸ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="CD">ಕಾಂಗೋ - ಕಿನ�ಶಾಸಾ</territory>
-			<territory type="CF">ಮಧ�ಯ ಆಫ�ರಿಕಾ ಗಣರಾಜ�ಯ</territory>
-			<territory type="CG">ಕಾಂಗೋ - ಬ�ರಾಜಾವಿಲ�ಲೇ</territory>
-			<territory type="CH">ಸ�ವಿಡ�ಜರ�‌ಲ�ಯಾಂಡ�</territory>
-			<territory type="CI">�ವರಿ ಕೋಸ�ಟ�</territory>
-			<territory type="CK">ಕ�ಕ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="CL">ಚಿಲಿ</territory>
-			<territory type="CM">ಕ�ಯಾಮರೋನ�</territory>
-			<territory type="CN">ಚೀನ</territory>
-			<territory type="CO">ಕೊಲಂಬಿಯಾ</territory>
-			<territory type="CR">ಕೊಸ�ಟಾ ರಿಕಾ</territory>
-			<territory type="CS">ಸೆರ�ಬಿಯಾ ಮತ�ತ� ಮೊಂಟೊನೆಗ�ರೋ</territory>
-			<territory type="CU">ಕ�ಯೂಬಾ</territory>
-			<territory type="CV">ಕೇಪ� ವರ�ಡೆ</territory>
-			<territory type="CX">ಕ�ರಿಸ�‌ಮಸ� ದ�ವೀಪ</territory>
-			<territory type="CY">ಸೈಪ�ರಸ�</territory>
-			<territory type="CZ">ಚೆಕ� ರಿಪಬ�ಲಿಕ�</territory>
-			<territory type="DE">ಜರ�ಮನಿ</territory>
-			<territory type="DJ">ಜಿಬೋಟಿ</territory>
-			<territory type="DK">ಡೆನ�ಮಾರ�ಕ�</territory>
-			<territory type="DM">ಡೊಮಿನಿಕಾ</territory>
-			<territory type="DO">ಡೊಮೆನಿಕ� ರಿಪಬ�ಲಿಕ�</territory>
-			<territory type="DZ">ಅಲ�ಗೇರಿಯಾ</territory>
-			<territory type="EC">ಈಕ�ವೆಡಾರ�</territory>
-			<territory type="EE">ಎಸ�ತೊನಿಯ</territory>
-			<territory type="EG">ಈಜಿಪ�ಟ�</territory>
-			<territory type="EH">ಪಶ�ಚಿಮ ಸಹಾರಾ</territory>
-			<territory type="ER">�ರಿಟ�ರಿಯಾ</territory>
-			<territory type="ES">ಸ�ಪೈನ�</territory>
-			<territory type="ET">ಇಥಿಯೋಪಿಯಾ</territory>
-			<territory type="FI">ಫಿನ���ಲ�ಯಾಂಡ�</territory>
-			<territory type="FJ">ಫಿಜಿ</territory>
-			<territory type="FK">ಫ�ಹಾಕ�‌ಲ�ಯಾಂಡ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="FM">ಮೈಕ�ರೋನೇಶಿಯಾ</territory>
-			<territory type="FO">ಫರೋ ದ�ವೀಪಗಳ�</territory>
-			<territory type="FR">ಫ�ರಾನ�ಸ�</territory>
-			<territory type="GA">ಗೆಬೊನ�</territory>
-			<territory type="GB">ಬ�ರಿಟನ�/ಇಂಗ�ಲೆಂಡ�</territory>
-			<territory type="GD">ಗ�ರೆನೆಡಾ</territory>
-			<territory type="GE">ಜಾರ�ಜಿಯಾ</territory>
-			<territory type="GF">ಫ�ರೆಂಚ� ಗಯಾನಾ</territory>
-			<territory type="GG">ಗ�ರ�ನಜೀ</territory>
-			<territory type="GH">ಘಾನಾ</territory>
-			<territory type="GI">ಗಿಬ�ರಾಲ�ಟರ�</territory>
-			<territory type="GL">ಗ�ರೀನ�‌ಲ�ಯಾಂಡ�</territory>
-			<territory type="GM">ಗ�ಯಾಂಬಿಯಾ</territory>
-			<territory type="GN">ಗಿನಿ</territory>
-			<territory type="GP">ಗ�ಡೆಲೋಪ�</territory>
-			<territory type="GQ">ಈಕ�ವೆಟೋರಿಯಲ� ಗಿನಿ</territory>
-			<territory type="GR">ಗ�ರೀಸ�</territory>
-			<territory type="GS">ದಕ�ಷಿಣ ಜಾರ�ಜಿಯಾ ಮತ�ತ� ದಕ�ಷಿಣ ಸ�ಯಾಂಡ�‌ವಿಚ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="GT">ಗ�ವಾಟೆಮಾಲಾ</territory>
-			<territory type="GU">ಗ�ಯಾಮ�</territory>
-			<territory type="GW">ಗಿನಿ-ಬಿಸ�ಸಾವ�</territory>
-			<territory type="GY">ಗಯಾನಾ</territory>
-			<territory type="HK">ಹಾಂಗ� ಕಾಂಗ� SAR ಚೀನಾ</territory>
-			<territory type="HM">ಹರ�ಡ� ದ�ವೀಪ ಮತ�ತ� ಮಾಕ�‌ಡೊನಾಲ�ಡ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="HN">ಹೊಂಡ�ರಾಸ�</territory>
-			<territory type="HR">ಕ�ರೋಯೇಶಿಯಾ</territory>
-			<territory type="HT">ಹೈಟಿ</territory>
-			<territory type="HU">ಹಂಗೇರಿ</territory>
-			<territory type="ID">ಇಂಡೋನೇಶಿಯಾ</territory>
-			<territory type="IE">�ರ�ಲೆಂಡ�</territory>
-			<territory type="IL">ಇಸ�ರೇಲ�</territory>
-			<territory type="IM">�ಲ� ಆಫ� ಮ�ಯಾನ�</territory>
-			<territory type="IN">ಭಾರತ</territory>
-			<territory type="IO">ಬ�ರಿಟೀಶ� ಇಂಡಿಯನ� ಮಹಾಸಾಗರ ಪ�ರದೇಶ</territory>
-			<territory type="IQ">ಇರಾಕ�</territory>
-			<territory type="IR">ಇರಾನ�</territory>
-			<territory type="IS">�ಸ�‌ಲ�ಯಾಂಡ�</territory>
-			<territory type="IT">ಇಟಲಿ</territory>
-			<territory type="JE">ಜೆರ�ಸಿ</territory>
-			<territory type="JM">ಜಮೈಕಾ</territory>
-			<territory type="JO">ಜೋರ�ಡಾನ�</territory>
-			<territory type="JP">ಜಪಾನ�</territory>
-			<territory type="KE">ಕೀನ�ಯಾ</territory>
-			<territory type="KG">ಕಿರ�ಗಿಸ�ಥಾನ�</territory>
-			<territory type="KH">ಕಾಂಬೋಡಿಯಾ</territory>
-			<territory type="KI">ಕಿರಿಬಾತಿ</territory>
-			<territory type="KM">ಕೊಮೊರೊಸ�</territory>
-			<territory type="KN">ಸೇಂಟ� ಕಿಟ�ಸ� ಮತ�ತ� ನೆವಿಸ�</territory>
-			<territory type="KP">ಉತ�ತರ ಕೋರಿಯಾ</territory>
-			<territory type="KR">ದಕ�ಷಿಣ ಕೋರಿಯಾ</territory>
-			<territory type="KW">ಕ�ವೈತ�</territory>
-			<territory type="KY">ಕೇಮನ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="KZ">ಕ�ಾಕಿಸ�ಥಾನ�</territory>
-			<territory type="LA">ಲಾವೋಸ�</territory>
-			<territory type="LB">ಲೆಬನಾನ�</territory>
-			<territory type="LC">ಸೇಂಟ� ಲೂಸಿಯಾ</territory>
-			<territory type="LI">ಲಿಚೆನ�‌ಸ�ಟೈನ�</territory>
-			<territory type="LK">ಶ�ರೀಲಂಕಾ</territory>
-			<territory type="LR">ಲಿಬೇರಿಯಾ</territory>
-			<territory type="LS">ಲೆಥೋಸೊ</territory>
-			<territory type="LT">ಲಿಥ�ವೇನಿಯಾ</territory>
-			<territory type="LU">ಲಕ�ಸಂಬರ�ಗ�</territory>
-			<territory type="LV">ಲಾಟ�ವಿಯಾ</territory>
-			<territory type="LY">ಲಿಬಿಯಾ</territory>
-			<territory type="MA">ಮೊರಾಕ�ಕೊ</territory>
-			<territory type="MC">ಮೊನಾಕೊ</territory>
-			<territory type="MD">ಮೊಲ�ಡೋವಾ</territory>
-			<territory type="ME">ಮೊಂಟೆನೆಗ�ರೋ</territory>
-			<territory type="MF">ಸೇಂಟ� ಮಾರ�ಟಿನ�</territory>
-			<territory type="MG">ಮಡಗಾಸ�ಕರ�</territory>
-			<territory type="MH">ಮಾರ�ಶಲ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="MK">ಮ�ಯಾಸಿಡೋನಿಯಾ</territory>
-			<territory type="ML">ಮಾಲಿ</territory>
-			<territory type="MM">ಮಯನ�ಮಾರ�</territory>
-			<territory type="MN">ಮೊಂಗೋಲಿಯಾ</territory>
-			<territory type="MO">ಮಕಾವ� SAR ಚೀನಾ</territory>
-			<territory type="MP">ಉತ�ತರ ಮರಿಯಾನಾ ದ�ವೀಪಗಳ�</territory>
-			<territory type="MQ">ಮಾರ�ಟಿನಿಕ�</territory>
-			<territory type="MR">ಮಾರಿಟಾನಿಯಾ</territory>
-			<territory type="MS">ಮೋಂಟ�‌ಸೆರೆಟ�</territory>
-			<territory type="MT">ಮಾಲ�ಟಾ</territory>
-			<territory type="MU">ಮಾರಿಶಿಯಸ�</territory>
-			<territory type="MV">ಮಾಲ�ಡಿವ�ಸ�</territory>
-			<territory type="MW">ಮಲಾವಿ</territory>
-			<territory type="MX">ಮೆಕ�ಸಿಕೊ</territory>
-			<territory type="MY">ಮಲೇಶಿಯಾ</territory>
-			<territory type="MZ">ಮೊಜಾಂಬಿಕ�</territory>
-			<territory type="NA">ನಮೀಬಿಯಾ</territory>
-			<territory type="NC">ನ�ಯೂ ಕ�ಯಾಲಿಡೋನಿಯಾ</territory>
-			<territory type="NE">ನೈಜರ�</territory>
-			<territory type="NF">ನಾರ�‌ಫೋಕ� ದ�ವೀಪ</territory>
-			<territory type="NG">ನೈಜೀರಿಯಾ</territory>
-			<territory type="NI">ನಿಕಾರಾಗ�ವಾ</territory>
-			<territory type="NL">ನೆದರ�‌ಲ�ಯಾಂಡ�ಸ�</territory>
-			<territory type="NO">ನಾರ�ವೇ</territory>
-			<territory type="NP">ನೇಪಾಳ</territory>
-			<territory type="NR">ನೌರ�</territory>
-			<territory type="NU">ನಿಯ�</territory>
-			<territory type="NZ">ನ�ಯೂಜಿಲೆಂಡ�</territory>
-			<territory type="OM">ಓಮನ�</territory>
-			<territory type="PA">ಪನಾಮಾ</territory>
-			<territory type="PE">ಪೆರ�</territory>
-			<territory type="PF">ಫ�ರೆಂಚ� ಪೋಲಿನೇಶಿಯಾ</territory>
-			<territory type="PG">ಪಪ�ವಾ ನ�ಯೂಗೀನಿಯಾ</territory>
-			<territory type="PH">ಫಿಲಿಫೈನ�ಸ�</territory>
-			<territory type="PK">ಪಾಕಿಸ�ತಾನ</territory>
-			<territory type="PL">ಪೋಲ�ಯಾಂಡ�</territory>
-			<territory type="PM">ಸೇಂಟ� ಪಿಯರೆ ಮತ�ತ� ಮಿಕೆಲನ�</territory>
-			<territory type="PN">ಪಿಟ�‌ಕೈರ�ನ�</territory>
-			<territory type="PR">ಪ�ಯೂರ�ಟೋ ರಿಕೊ</territory>
-			<territory type="PS">ಪ�ಯಾಲಿಸ�ಟೇನಿಯನ� ಪ�ರದೇಶ</territory>
-			<territory type="PT">ಪೋರ�ಚ�ಗಲ�</territory>
-			<territory type="PW">ಪಲಾವ�</territory>
-			<territory type="PY">ಪರಾಗ�ವೇ</territory>
-			<territory type="QA">ಕತಾರ�</territory>
-			<territory type="QO">ಔಟ�‌ಲೈಯಿಂಗ� ಓಶಿಯಾನಿಯಾ</territory>
-			<territory type="QU">ಯ�ರೋಪಿಯನ� ಯೂನಿಯನ�</territory>
-			<territory type="RE">ರೀಯೂನಿಯನ�</territory>
-			<territory type="RO">ರೊಮ�ಯಾನಿಯಾ</territory>
-			<territory type="RS">ಸೆರ�ಬಿಯಾ</territory>
-			<territory type="RU">ರಶಿಯಾ</territory>
-			<territory type="RW">ರ�ವಾಂಡಾ</territory>
-			<territory type="SA">ಸೌದಿ ಅರೇಬಿಯಾ</territory>
-			<territory type="SB">ಸೊಲೊಮನ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="SC">ಸೀಶೆಲ�ಲೆಸ�</territory>
-			<territory type="SD">ಸೂಡಾನ�</territory>
-			<territory type="SE">ಸ�ವೀಡನ�</territory>
-			<territory type="SG">ಸಿಂಗಪ�ರ</territory>
-			<territory type="SH">ಸೇಂಟ� ಹೆಲೆನಾ</territory>
-			<territory type="SI">ಸ�ಲೋವೇನಿಯಾ</territory>
-			<territory type="SJ">ಸ�ವಾಲ�ಬಾರ�ಡ� ಮತ�ತ� ಜಾನ� ಮಾಯೆನ�</territory>
-			<territory type="SK">ಸ�ಲೋವಾಕಿಯಾ</territory>
-			<territory type="SL">ಸಿಯೆರ�ರಾ ಲಿಯೋನ�</territory>
-			<territory type="SM">ಸ�ಯಾನ� ಮೆರಿನೋ</territory>
-			<territory type="SN">ಸೆನೆಗಲ�</territory>
-			<territory type="SO">ಸೊಮಾಲಿಯಾ</territory>
-			<territory type="SR">ಸ�ರಿನಾಮ</territory>
-			<territory type="ST">ಸಾವೋ ಟೋಮ� ಮತ�ತ� ಪ�ರಿನ�ಸಿಪೆ</territory>
-			<territory type="SV">ಎಲ� ಸಾಲ�ವೇಡಾರ�</territory>
-			<territory type="SY">ಸಿರಿಯಾ</territory>
-			<territory type="SZ">ಸ�ವಾಜಿಲ�ಯಾಂಡ�</territory>
-			<territory type="TC">ಟರ�ಕ�ಸ� ಮತ�ತ� ಕೈಕೋಸ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="TD">ಚಾಡ�</territory>
-			<territory type="TF">ಫ�ರೆಂಚ� ದಕ�ಷಿಣ ಪ�ರದೇಶಗಳ�</territory>
-			<territory type="TG">ಟೋಗೋ</territory>
-			<territory type="TH">ಥೈಲ�ಯಾಂಡ�</territory>
-			<territory type="TJ">ತಜಾಕಿಸ�ಥಾನ�</territory>
-			<territory type="TK">ಟೊಕೆಲಾವ�</territory>
-			<territory type="TL">ಪೂರ�ವ ತಿಮೋರ�</territory>
-			<territory type="TM">ತ�ರ�ಕಮೆನಿಸ�ಥಾನ�</territory>
-			<territory type="TN">ಟ�ನಿಶಿಯಾ</territory>
-			<territory type="TO">ಟೊಂಗ</territory>
-			<territory type="TR">ಟರ�ಕಿ</territory>
-			<territory type="TT">ಟ�ರಿನಿಡಾಡ� ಮತ�ತ� ಟೊಬ�ಯಾಗೊ</territory>
-			<territory type="TV">ಟ�ವಾಲ�</territory>
-			<territory type="TW">ಥೈವಾನ�</territory>
-			<territory type="TZ">ಟಾಂಜಾನಿಯಾ</territory>
-			<territory type="UA">ಉಕ�ರೈನ�</territory>
-			<territory type="UG">ಉಗಾಂಡಾ</territory>
-			<territory type="UM">ಸಂಯ�ಕ�ತ ಸಂಸ�ಥಾನ ಮೈನರ� ಔಟ�‌ಲೈಯಿಂಗ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="US">ಅಮೇರಿಕಾ ಸಂಯ�ಕ�ತ ಸಂಸ�ಥಾನ</territory>
-			<territory type="UY">ಉರ�ಗ�ವೇ</territory>
-			<territory type="UZ">ಉಜ�ಬೇಕಿಸ�ಥಾನ�</territory>
-			<territory type="VA">ವ�ಯಾಟಿಕನ�</territory>
-			<territory type="VC">ಸೇಂಟ� ವಿನ�ಸೆಂಟ� ಮತ�ತ� ಗ�ರೆನೆಡೈನ�ಸ�</territory>
-			<territory type="VE">ವೆನೆಜ�ವೆಲಾ</territory>
-			<territory type="VG">ಬ�ರಿಟಿಷ� ವರ�ಜಿನ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="VI">ಯ�.ಎಸ�. ವರ�ಜಿನ� ದ�ವೀಪಗಳ�</territory>
-			<territory type="VN">ವಿಯೇಟ�ನಾಮ�</territory>
-			<territory type="VU">ವನೌಟ�</territory>
-			<territory type="WF">ವಾಲಿಸ� ಮತ�ತ� ಫ�ಟ�ನಾ</territory>
-			<territory type="WS">ಸಮೋವಾ</territory>
-			<territory type="YE">ಯೆಮನ�</territory>
-			<territory type="YT">ಮಯೊಟ�ಟೆ</territory>
-			<territory type="ZA">ದಕ�ಷಿಣ ಆಫ�ರಿಕಾ</territory>
-			<territory type="ZM">�ಾಂಬಿಯಾ</territory>
-			<territory type="ZW">ಜಿಂಬಾಬ�ವೆ</territory>
-			<territory type="ZZ">ಅಪರಿಚಿತ ಅಥವಾ ಅಮಾನ�ಯ ಪ�ರದೇಶ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[಼ ಂ ಃ ೦-೯ ಅ-ಋ ೠ ಌ ೡ ಎ-� ಒ-ನ ಪ-ಲ ವ-ಹ ಳ ೞ ಽ-ೄ ೆ-ೈ ೊ-� ೕ ೖ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ಜನವರೀ</month>
-							<month type="2">ಫೆಬ�ರವರೀ</month>
-							<month type="3">ಮಾರ�ಚ�</month>
-							<month type="4">ಎಪ�ರಿಲ�</month>
-							<month type="5">ಮೆ</month>
-							<month type="6">ಜೂನ�</month>
-							<month type="7">ಜ�ಲೈ</month>
-							<month type="8">ಆಗಸ�ಟ�</month>
-							<month type="9">ಸಪ�ಟೆಂಬರ�</month>
-							<month type="10">ಅಕ�ಟೋಬರ�</month>
-							<month type="11">ನವೆಂಬರ�</month>
-							<month type="12">ಡಿಸೆಂಬರ�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ಜನವರೀ</month>
-							<month type="2">ಫೆಬ�ರವರೀ</month>
-							<month type="3">ಮಾರ�ಚ�</month>
-							<month type="4">ಎಪ�ರಿಲ�</month>
-							<month type="5">ಮೆ</month>
-							<month type="6">ಜೂನ�</month>
-							<month type="7">ಜ�ಲೈ</month>
-							<month type="8">ಆಗಸ�ಟ�</month>
-							<month type="9">ಸಪ�ಟೆಂಬರ�</month>
-							<month type="10">ಅಕ�ಟೋಬರ�</month>
-							<month type="11">ನವೆಂಬರ�</month>
-							<month type="12">ಡಿಸೆಂಬರ�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ಜ</month>
-							<month type="2">ಫೆ</month>
-							<month type="3">ಮಾ</month>
-							<month type="4">ಎ</month>
-							<month type="5">ಮೇ</month>
-							<month type="6">ಜೂ</month>
-							<month type="7">ಜ�</month>
-							<month type="8">ಆ</month>
-							<month type="9">ಸೆ</month>
-							<month type="10">ಅ</month>
-							<month type="11">ನ</month>
-							<month type="12">ಡಿ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ರ.</day>
-							<day type="mon">ಸೋ.</day>
-							<day type="tue">ಮಂ.</day>
-							<day type="wed">ಬ�.</day>
-							<day type="thu">ಗ�.</day>
-							<day type="fri">ಶ�.</day>
-							<day type="sat">ಶನಿ.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ರವಿವಾರ</day>
-							<day type="mon">ಸೋಮವಾರ</day>
-							<day type="tue">ಮಂಗಳವಾರ</day>
-							<day type="wed">ಬ�ಧವಾರ</day>
-							<day type="thu">ಗ�ರ�ವಾರ</day>
-							<day type="fri">ಶ�ಕ�ರವಾರ</day>
-							<day type="sat">ಶನಿವಾರ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ರ</day>
-							<day type="mon">ಸೋ</day>
-							<day type="tue">ಮಂ</day>
-							<day type="wed">ಬ�</day>
-							<day type="thu">ಗ�</day>
-							<day type="fri">ಶ�</day>
-							<day type="sat">ಶ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ಒಂದ� 1</quarter>
-							<quarter type="2">ಎರಡ� 2</quarter>
-							<quarter type="3">ಮ³‚ರ� 3</quarter>
-							<quarter type="4">ನಾಲೃಕ 4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ಈಸಪೂವ೯.</era>
-						<era type="1">ಕ�ರಿಸ�ತ ಶಕ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>hh:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>hh:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>hh:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>hh:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>knda</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>र�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ಹೌದ�</yesstr>
-			<nostr>ಇಲ�ಲ:ಅಲ�ಲ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kn_IN.xml b/airtime_mvc/library/Zend/Locale/Data/kn_IN.xml
deleted file mode 100644
index a70c543a1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kn_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kn"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ko.xml b/airtime_mvc/library/Zend/Locale/Data/ko.xml
deleted file mode 100644
index 516528239..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ko.xml
+++ /dev/null
@@ -1,3848 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.140 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="ko"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0}({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">아파르어</language>
-			<language type="ab">압카즈어</language>
-			<language type="ace">ì•„ì²´ì–´</language>
-			<language type="ach">아콜리어</language>
-			<language type="ada">아당메어</language>
-			<language type="ady">아닥헤어</language>
-			<language type="ae">아베스타어</language>
-			<language type="af">남아공 공용어</language>
-			<language type="afa">아시아-아프리카어 (기타)</language>
-			<language type="afh">아프리히리어</language>
-			<language type="ain">아�누어</language>
-			<language type="ak">아칸어</language>
-			<language type="akk">아카드어</language>
-			<language type="ale">알류트어</language>
-			<language type="alg">알공킨어족</language>
-			<language type="alt">남부 알타�어</language>
-			<language type="am">암하�어</language>
-			<language type="an">아�곤어</language>
-			<language type="ang">고대 �어</language>
-			<language type="anp">앙가어</language>
-			<language type="apa">아파치어</language>
-			<language type="ar">아�어</language>
-			<language type="arc">아람어</language>
-			<language type="arn">아�우칸어</language>
-			<language type="arp">아�파호어</language>
-			<language type="art">기계어 (기타)</language>
-			<language type="arw">아�와�어</language>
-			<language type="as">아샘어</language>
-			<language type="ast">아스투리아어</language>
-			<language type="ath">아타파스카어군</language>
-			<language type="aus">오스트레�리아어족</language>
-			<language type="av">아바릭어</language>
-			<language type="awa">아와히어</language>
-			<language type="ay">아�마�어</language>
-			<language type="az">아제르바�잔어</language>
-			<language type="ba">바슈키르어</language>
-			<language type="bad">반다어</language>
-			<language type="bai">바밀레케어족</language>
-			<language type="bal">발루치어</language>
-			<language type="ban">발리어</language>
-			<language type="bas">바사어</language>
-			<language type="bat">발트어 (기타)</language>
-			<language type="be">벨로루시어</language>
-			<language type="bej">베�어</language>
-			<language type="bem">벰바어</language>
-			<language type="ber">베르베르어</language>
-			<language type="bg">불가리아어</language>
-			<language type="bh">비하르어</language>
-			<language type="bho">호즈푸리어</language>
-			<language type="bi">비슬�마어</language>
-			<language type="bik">비콜어</language>
-			<language type="bin">비니어</language>
-			<language type="bla">�시카어</language>
-			<language type="bm">밤바�어</language>
-			<language type="bn">벵골어</language>
-			<language type="bnt">반투어</language>
-			<language type="bo">티베트어</language>
-			<language type="br">브르타뉴어</language>
-			<language type="bra">브�지어</language>
-			<language type="bs">보스니아어</language>
-			<language type="btk">바타�어</language>
-			<language type="bua">부리아타</language>
-			<language type="bug">부기어</language>
-			<language type="byn">브린어</language>
-			<language type="ca">카탈로니아어</language>
-			<language type="cad">카�어</language>
-			<language type="cai">중앙 아메리카 �디안어 (기타)</language>
-			<language type="car">카리브어</language>
-			<language type="cau">카프카스어 (기타)</language>
-			<language type="cch">아삼어</language>
-			<language type="ce">체첸어</language>
-			<language type="ceb">세부아노어</language>
-			<language type="cel">켈트어 (기타)</language>
-			<language type="ch">차모로어</language>
-			<language type="chb">치브차어</language>
-			<language type="chg">차가타�어</language>
-			<language type="chk">추�어</language>
-			<language type="chm">마리어</language>
-			<language type="chn">치누�어와 �어 프랑스어� 혼성어</language>
-			<language type="cho">촉토어</language>
-			<language type="chp">치페우얀</language>
-			<language type="chr">체로키어</language>
-			<language type="chy">샤�엔어</language>
-			<language type="cmc">참어군</language>
-			<language type="co">코르시카어</language>
-			<language type="cop">콥트어</language>
-			<language type="cpe">�리올어 � 피진어 (�어를 기반으로 한 기타)</language>
-			<language type="cpf">�리올어 � 피진어 (프랑스어를 기반으로 한 기타)</language>
-			<language type="cpp">�리올어 � 피진어 (�르투갈어를 기반으로 한 기타)</language>
-			<language type="cr">�리어</language>
-			<language type="crh">�리민 터키어; �리민 타타르어</language>
-			<language type="crp">�리올어 � 피진어 (기타)</language>
-			<language type="cs">체코어</language>
-			<language type="csb">카슈비아어</language>
-			<language type="cu">�회 슬�브어</language>
-			<language type="cus">쿠시어족</language>
-			<language type="cv">추바시어</language>
-			<language type="cy">웨�스어</language>
-			<language type="da">�마�어</language>
-			<language type="dak">다코타어</language>
-			<language type="dar">다르그와어</language>
-			<language type="day">다야�어</language>
-			<language type="de">��어</language>
-			<language type="de_AT">��어 (오스트리아)</language>
-			<language type="de_CH">고지 ��어 (스위스)</language>
-			<language type="del">��웨어어</language>
-			<language type="den">슬�브어</language>
-			<language type="dgr">�그리브어</language>
-			<language type="din">딩카어</language>
-			<language type="doi">�그리어</language>
-			<language type="dra">드�비다어 (기타)</language>
-			<language type="dsb">저지 소르비아어</language>
-			<language type="dua">드와�어</language>
-			<language type="dum">중세 네�란드어</language>
-			<language type="dv">디베히어</language>
-			<language type="dyu">드율�어</language>
-			<language type="dz">종카어</language>
-			<language type="ee">�웨어</language>
-			<language type="efi">�픽어</language>
-			<language type="egy">�집트어 (고대)</language>
-			<language type="eka">�카죽어</language>
-			<language type="el">그리스어</language>
-			<language type="elx">엘람어</language>
-			<language type="en">�어</language>
-			<language type="en_AU">�어 (호주)</language>
-			<language type="en_CA">�어 (�나다)</language>
-			<language type="en_GB">�어 (�국�)</language>
-			<language type="en_US">�어 (미국�)</language>
-			<language type="enm">�어, 중세 (1100-1500)</language>
-			<language type="eo">�스페란토어</language>
-			<language type="es">스페�어</language>
-			<language type="es_419">중남미 스페�어</language>
-			<language type="es_ES">스페�어 (�베리아)</language>
-			<language type="et">�스토니아어</language>
-			<language type="eu">바스�어</language>
-			<language type="ewo">���어</language>
-			<language type="fa">페르시아어</language>
-			<language type="fan">팡그어</language>
-			<language type="fat">�티어</language>
-			<language type="ff">풀�어</language>
-			<language type="fi">핀란드어</language>
-			<language type="fil">필리핀어</language>
-			<language type="fiu">피노우그리아어 (기타)</language>
-			<language type="fj">피지어</language>
-			<language type="fo">페로어</language>
-			<language type="fon">�어</language>
-			<language type="fr">프랑스어</language>
-			<language type="fr_CA">프랑스어 (�나다)</language>
-			<language type="fr_CH">프랑스어 (스위스)</language>
-			<language type="frm">중세 프랑스어</language>
-			<language type="fro">고대 프랑스어</language>
-			<language type="frr">�부 프리슬란드어</language>
-			<language type="frs">�부 프리슬란드어</language>
-			<language type="fur">프리우리안어</language>
-			<language type="fy">프리지아어</language>
-			<language type="ga">아�랜드어</language>
-			<language type="gaa">가어</language>
-			<language type="gay">가요어</language>
-			<language type="gba">그바야어</language>
-			<language type="gd">스코틀랜드 게�어</language>
-			<language type="gem">��어 (기타)</language>
-			<language type="gez">게�즈어</language>
-			<language type="gil">키리바시어</language>
-			<language type="gl">갈리시아어</language>
-			<language type="gmh">중세 고지 ��어</language>
-			<language type="gn">과�니어</language>
-			<language type="goh">고대 고지 ��어</language>
-			<language type="gon">곤디어</language>
-			<language type="gor">고론탈로어</language>
-			<language type="got">고트어</language>
-			<language type="grb">게르보어</language>
-			<language type="grc">그리스어, 고대 (1453년 까지)</language>
-			<language type="gsw">��어 (스위스)</language>
-			<language type="gu">구��트어</language>
-			<language type="gv">맹�스어</language>
-			<language type="gwi">그위친어</language>
-			<language type="ha">하우사어</language>
-			<language type="hai">하�다어</language>
-			<language type="haw">하와�어</language>
-			<language type="he">히브리어</language>
-			<language type="hi">힌디어</language>
-			<language type="hil">헤리가뇬어</language>
-			<language type="him">히마차리어</language>
-			<language type="hit">하타�트어</language>
-			<language type="hmn">히몸어</language>
-			<language type="ho">히리 모투어</language>
-			<language type="hr">�로아티아어</language>
-			<language type="hsb">고지 소르비아어</language>
-			<language type="ht">아�티어</language>
-			<language type="hu">�가리어</language>
-			<language type="hup">후파어</language>
-			<language type="hy">아르메니아어</language>
-			<language type="hz">헤레로어</language>
-			<language type="ia">�테르�구아 (국제보조어협회)</language>
-			<language type="iba">�반어</language>
-			<language type="id">��네시아어</language>
-			<language type="ie">�테르�구�</language>
-			<language type="ig">�그보어</language>
-			<language type="ii">쓰촨 �어</language>
-			<language type="ijo">�조어</language>
-			<language type="ik">�누피아�어</language>
-			<language type="ilo">�로코어</language>
-			<language type="inc">��어 (기타)</language>
-			<language type="ine">��유럽어 (기타)</language>
-			<language type="inh">�귀시어</language>
-			<language type="io">��어</language>
-			<language type="ira">�란어 [ira]</language>
-			<language type="iro">�러쿼�어</language>
-			<language type="is">아�슬란드어</language>
-			<language type="it">�탈리아어</language>
-			<language type="iu">�눅티투트어</language>
-			<language type="ja">�본어</language>
-			<language type="jbo">로반어</language>
-			<language type="jpr">유대-페르시아어</language>
-			<language type="jrb">유대-아�비아어</language>
-			<language type="jv">�바어</language>
-			<language type="ka">그루지야어</language>
-			<language type="kaa">카�칼파�어</language>
-			<language type="kab">커바�어</language>
-			<language type="kac">카친어</language>
-			<language type="kam">캄바어</language>
-			<language type="kar">카렌어</language>
-			<language type="kaw">카위어</language>
-			<language type="kbd">카바르디어</language>
-			<language type="kfo">코로어</language>
-			<language type="kg">콩고어</language>
-			<language type="kha">카시어</language>
-			<language type="khi">코�산어 (기타)</language>
-			<language type="kho">호탄어</language>
-			<language type="ki">키쿠유어</language>
-			<language type="kj">쿠안야마어</language>
-			<language type="kk">카��어</language>
-			<language type="kl">그린란드어</language>
-			<language type="km">캄보디아어</language>
-			<language type="kmb">킴분�어</language>
-			<language type="kn">카나다어</language>
-			<language type="ko">한국어</language>
-			<language type="kok">코카니어</language>
-			<language type="kos">코스��엔어</language>
-			<language type="kpe">�펠레어</language>
-			<language type="kr">칸누리어</language>
-			<language type="krc">카�챠�-발카르어</language>
-			<language type="krl">카�리야어</language>
-			<language type="kro">�루어</language>
-			<language type="kru">쿠르�어</language>
-			<language type="ks">카슈미르어</language>
-			<language type="ku">쿠르드어</language>
-			<language type="kum">쿠믹어</language>
-			<language type="kut">쿠테네어</language>
-			<language type="kv">코미어</language>
-			<language type="kw">콘월어</language>
-			<language type="ky">키르기스어</language>
-			<language type="la">�틴어</language>
-			<language type="lad">�디노어</language>
-			<language type="lah">�한다어</language>
-			<language type="lam">람바어</language>
-			<language type="lb">룩셈부르�어</language>
-			<language type="lez">레즈기안어</language>
-			<language type="lg">간다어</language>
-			<language type="li">림버거어</language>
-			<language type="ln">�갈�어</language>
-			<language type="lo">�오어</language>
-			<language type="lol">몽구어</language>
-			<language type="loz">로지어</language>
-			<language type="lt">리투아니아어</language>
-			<language type="lu">루바-카탄가어</language>
-			<language type="lua">루바-룰루아어</language>
-			<language type="lui">루�세노어</language>
-			<language type="lun">룬다어</language>
-			<language type="luo">루오어</language>
-			<language type="lus">루샤�어</language>
-			<language type="lv">�트비아어</language>
-			<language type="mad">마��어</language>
-			<language type="mag">마가히</language>
-			<language type="mai">마�틸리</language>
-			<language type="mak">마카사어</language>
-			<language type="man">만딩고어</language>
-			<language type="map">남�어</language>
-			<language type="mas">마사�어</language>
-			<language type="mdf">모�샤어</language>
-			<language type="mdr">만다르어</language>
-			<language type="men">멘�어</language>
-			<language type="mg">마다가스카르어</language>
-			<language type="mga">아�랜드어, 중세 (900-1200)</language>
-			<language type="mh">마셜제�어</language>
-			<language type="mi">마오리어</language>
-			<language type="mic">미�맥어</language>
-			<language type="min">미낭카바우</language>
-			<language type="mis">기타 언어</language>
-			<language type="mk">마케�니아어</language>
-			<language type="mkh">몬�메르어 (기타)</language>
-			<language type="ml">��얄람어</language>
-			<language type="mn">몽고어</language>
-			<language type="mnc">만주어</language>
-			<language type="mni">마니푸리어</language>
-			<language type="mno">마노보어</language>
-			<language type="mo">몰�바어</language>
-			<language type="moh">모호�어</language>
-			<language type="mos">모시어</language>
-			<language type="mr">마�티어</language>
-			<language type="ms">�레�어</language>
-			<language type="mt">몰타어</language>
-			<language type="mul">다중 언어</language>
-			<language type="mun">문다어</language>
-			<language type="mus">�리�어</language>
-			<language type="mwl">미란�어</language>
-			<language type="mwr">마르와리어</language>
-			<language type="my">버마어</language>
-			<language type="myn">마야어</language>
-			<language type="myv">엘즈야어</language>
-			<language type="na">나우루어</language>
-			<language type="nah">나우아틀어</language>
-			<language type="nai">�아메리카 �디언어 (기타)</language>
-			<language type="nap">나�리어</language>
-			<language type="nb">보�� 노르웨�어</language>
-			<language type="nd">��벨레어(�부)</language>
-			<language type="nds">저지 ��어</language>
-			<language type="ne">네팔어</language>
-			<language type="new">네와르어</language>
-			<language type="ng">��가어</language>
-			<language type="nia">니아스어</language>
-			<language type="nic">니제르 - 코르�파니아어 (기타)</language>
-			<language type="niu">니웨언어</language>
-			<language type="nl">네�란드어</language>
-			<language type="nl_BE">플��어</language>
-			<language type="nn">노르웨�어(니노르스�)</language>
-			<language type="no">노르웨�어</language>
-			<language type="nog">노가�어</language>
-			<language type="non">노르웨�, 고대</language>
-			<language type="nqo">�코어</language>
-			<language type="nr">��벨레어(남부)</language>
-			<language type="nso">소토어 (�부)</language>
-			<language type="nub">누비안어</language>
-			<language type="nv">나바호어</language>
-			<language type="nwc">네와르어 (고전)</language>
-			<language type="ny">니안�어; 치츄어; 츄어</language>
-			<language type="nym">니암웨지어</language>
-			<language type="nyn">니안콜어</language>
-			<language type="nyo">뉴로어</language>
-			<language type="nzi">�지마어</language>
-			<language type="oc">오�어</language>
-			<language type="oj">오지브웨�어</language>
-			<language type="om">오로모어 (아�)</language>
-			<language type="or">오리야어</language>
-			<language type="os">오세트어</language>
-			<language type="osa">오세�지어</language>
-			<language type="ota">터키어, 오스만 (1500-1928)</language>
-			<language type="oto">오토미안어</language>
-			<language type="pa">펀잡어</language>
-			<language type="paa">파푸아어 (기타)</language>
-			<language type="pag">�가시난어</language>
-			<language type="pal">팔레비어</language>
-			<language type="pam">팜팡가어</language>
-			<language type="pap">파피아먼토어</language>
-			<language type="pau">파�우안어</language>
-			<language type="peo">고대 페르시아어</language>
-			<language type="phi">필리핀어 (기타)</language>
-			<language type="phn">페니키아어</language>
-			<language type="pi">팔리어</language>
-			<language type="pl">�란드어</language>
-			<language type="pon">�페�어</language>
-			<language type="pra">프��리트어</language>
-			<language type="pro">고대 프로방스어</language>
-			<language type="ps">파시토어 (푸시토)</language>
-			<language type="pt">�르투갈어</language>
-			<language type="pt_BR">�르투갈어 (브�질)</language>
-			<language type="pt_PT">�르투갈어 (�베리아)</language>
-			<language type="qu">케추아어</language>
-			<language type="raj">��스탄어</language>
-			<language type="rap">�파뉴�</language>
-			<language type="rar">�로통가어</language>
-			<language type="rm">레토로만어</language>
-			<language type="rn">룬디어</language>
-			<language type="ro">루마니아어</language>
-			<language type="roa">로�스어 (기타)</language>
-			<language type="rom">집시어</language>
-			<language type="root">ì–´ê·¼</language>
-			<language type="ru">러시아어</language>
-			<language type="rup">아로마니아어</language>
-			<language type="rw">르완다어</language>
-			<language type="sa">산스�리트어</language>
-			<language type="sad">산다웨어</language>
-			<language type="sah">야�트어</language>
-			<language type="sai">남아메리카 �디언어 (기타)</language>
-			<language type="sal">�리시어어</language>
-			<language type="sam">사마리아 아�어</language>
-			<language type="sas">사사�어</language>
-			<language type="sat">산탈리어</language>
-			<language type="sc">사르디니아어</language>
-			<language type="scn">시칠리아어</language>
-			<language type="sco">스코틀랜드어</language>
-			<language type="sd">신디어</language>
-			<language type="se">�부 사미어</language>
-			<language type="sel">셀쿠프어</language>
-			<language type="sem">셈어 (기타)</language>
-			<language type="sg">ì‚°ê³ ì–´</language>
-			<language type="sga">아�랜드, 고대 (900년 까지)</language>
-			<language type="sgn">수화</language>
-			<language type="sh">세르비아-�로아티아어</language>
-			<language type="shn">샨어</language>
-			<language type="si">스리랑카어</language>
-			<language type="sid">시다모어</language>
-			<language type="sio">수족어</language>
-			<language type="sit">중국 티베트 어족</language>
-			<language type="sk">슬로바키아어</language>
-			<language type="sl">슬로베니아어</language>
-			<language type="sla">슬�브어 (기타)</language>
-			<language type="sm">사모아어</language>
-			<language type="sma">남부 사미어</language>
-			<language type="smi">사미어 (기타)</language>
-			<language type="smj">룰레 사미어</language>
-			<language type="smn">�나리 사미어</language>
-			<language type="sms">스콜트 사미어</language>
-			<language type="sn">쇼나어</language>
-			<language type="snk">소닌케어</language>
-			<language type="so">소�리아어</language>
-			<language type="sog">소그디엔어</language>
-			<language type="son">송가�족어</language>
-			<language type="sq">알바니아어</language>
-			<language type="sr">세르비아어</language>
-			<language type="srn">스�난 통가어</language>
-			<language type="srr">세레르어</language>
-			<language type="ss">시스와티어</language>
-			<language type="ssa">니로-사하람어 (기타)</language>
-			<language type="st">소토어 (남부)</language>
-			<language type="su">순다어</language>
-			<language type="suk">수쿠마족어</language>
-			<language type="sus">수수어</language>
-			<language type="sux">수메르어</language>
-			<language type="sv">스웨�어</language>
-			<language type="sw">스와�리어</language>
-			<language type="syc">시리아어 (고전)</language>
-			<language type="syr">시리아어</language>
-			<language type="ta">타밀어</language>
-			<language type="tai">태국어 (기타)</language>
-			<language type="te">텔루구어</language>
-			<language type="tem">팀니어</language>
-			<language type="ter">테레노어</language>
-			<language type="tet">테툼어</language>
-			<language type="tg">타지키스탄어</language>
-			<language type="th">태국어</language>
-			<language type="ti">티그리�어</language>
-			<language type="tig">티그레어</language>
-			<language type="tiv">티비어</language>
-			<language type="tk">투르�멘어</language>
-			<language type="tkl">토켈�우제�어</language>
-			<language type="tl">타갈로그어</language>
-			<language type="tlh">��온어</language>
-			<language type="tli">틀�깃족어</language>
-			<language type="tmh">타마섹어</language>
-			<language type="tn">세츠와나어</language>
-			<language type="to">통가어</language>
-			<language type="tog">통가어 (니아살랜드)</language>
-			<language type="tpi">토� 피신어</language>
-			<language type="tr">터키어</language>
-			<language type="ts">�가어</language>
-			<language type="tsi">트심시안어</language>
-			<language type="tt">타타르어</language>
-			<language type="tum">툼부카어</language>
-			<language type="tup">투피어</language>
-			<language type="tut">알타�제어 (기타)</language>
-			<language type="tvl">투발루어</language>
-			<language type="tw">트위어</language>
-			<language type="ty">타히티어</language>
-			<language type="tyv">투비니안어</language>
-			<language type="udm">우드�트어</language>
-			<language type="ug">위구르어</language>
-			<language type="uga">유가리틱어</language>
-			<language type="uk">우���나어</language>
-			<language type="umb">윤번�어</language>
-			<language type="und">결정�지않�</language>
-			<language type="ur">우르�어</language>
-			<language type="uz">우즈베�어</language>
-			<language type="vai">바�어</language>
-			<language type="ve">벤다어</language>
-			<language type="vi">베트남어</language>
-			<language type="vo">볼�퓌�어</language>
-			<language type="vot">보틱어</language>
-			<language type="wa">왈론어</language>
-			<language type="wak">와카샨어</language>
-			<language type="wal">와�모어</language>
-			<language type="war">와��어</language>
-			<language type="was">와쇼어</language>
-			<language type="wen">소르브어</language>
-			<language type="wo">올로프어</language>
-			<language type="xal">칼미�어</language>
-			<language type="xh">코사어</language>
-			<language type="yao">야오족어</language>
-			<language type="yap">�페세어</language>
-			<language type="yi">�디시어</language>
-			<language type="yo">요루바어</language>
-			<language type="ypk">야픽어</language>
-			<language type="za">주앙어</language>
-			<language type="zap">사�테�어</language>
-			<language type="zbl">블리스 심볼</language>
-			<language type="zen">제나가어</language>
-			<language type="zh">중국어</language>
-			<language type="zh_Hans">중국어(간체)</language>
-			<language type="zh_Hant">중국어 (번체)</language>
-			<language type="znd">아잔�족어</language>
-			<language type="zu">줄루어</language>
-			<language type="zun">주니어</language>
-			<language type="zza">��어</language>
-		</languages>
-		<scripts>
-			<script type="Arab">아� 문�</script>
-			<script type="Armn">아르메니아 문�</script>
-			<script type="Bali">발리 문�</script>
-			<script type="Batk">바타� 문�</script>
-			<script type="Beng">벵골 문�</script>
-			<script type="Blis">블리스기호 문�</script>
-			<script type="Bopo">주�부호</script>
-			<script type="Brah">브�미</script>
-			<script type="Brai">브�유 ��</script>
-			<script type="Bugi">부기 문�</script>
-			<script type="Buhd">부히드 문�</script>
-			<script type="Cans">통합 �나다 토착어</script>
-			<script type="Cari">카리 문�</script>
-			<script type="Cham">칸 고어</script>
-			<script type="Cher">체로키 문�</script>
-			<script type="Cirt">키르쓰</script>
-			<script type="Copt">콥트 문�</script>
-			<script type="Cprt">키프로스 문�</script>
-			<script type="Cyrl">키릴 문�</script>
-			<script type="Cyrs">고대�회슬�브어 키릴문�</script>
-			<script type="Deva">�바나가리</script>
-			<script type="Dsrt">디저렛 문�</script>
-			<script type="Egyd">고대 �집트 민중문�</script>
-			<script type="Egyh">고대 �집트 신관문�</script>
-			<script type="Egyp">고대 �집트 신성문�</script>
-			<script type="Ethi">�티오피아 문�</script>
-			<script type="Geor">그루지야 문�</script>
-			<script type="Glag">글�골 문�</script>
-			<script type="Goth">고트 문�</script>
-			<script type="Grek">그리스 문�</script>
-			<script type="Gujr">구쟈�티 문�</script>
-			<script type="Guru">구르무키 문�</script>
-			<script type="Hang">한글</script>
-			<script type="Hani">한�</script>
-			<script type="Hano">하누누어</script>
-			<script type="Hans">중국어 간체</script>
-			<script type="Hant">중국어 번체</script>
-			<script type="Hebr">히브리어</script>
-			<script type="Hira">히�카나</script>
-			<script type="Hmng">파하우 몽 문�</script>
-			<script type="Hrkt">가나</script>
-			<script type="Hung">고대 �가리 문�</script>
-			<script type="Inds">��스 문�</script>
-			<script type="Ital">고�탈리아어</script>
-			<script type="Java">�바 문�</script>
-			<script type="Jpan">�본 문�</script>
-			<script type="Kali">카야 리 문�</script>
-			<script type="Kana">가타카나</script>
-			<script type="Khar">카로슈티</script>
-			<script type="Khmr">�메르어</script>
-			<script type="Knda">칸나다</script>
-			<script type="Kore">한국어</script>
-			<script type="Lana">란나 문�</script>
-			<script type="Laoo">�오어</script>
-			<script type="Latf">��� 로마�</script>
-			<script type="Latg">아�랜드� 로마�</script>
-			<script type="Latn">�틴어</script>
-			<script type="Lepc">렙차문�</script>
-			<script type="Limb">림부어</script>
-			<script type="Lina">선형 문� A</script>
-			<script type="Linb">선형 문� B</script>
-			<script type="Lyci">리키아어</script>
-			<script type="Lydi">리디아어</script>
-			<script type="Mand">만�아어</script>
-			<script type="Maya">마야 �형 문�</script>
-			<script type="Mero">메로� 문�</script>
-			<script type="Mlym">��얄람어</script>
-			<script type="Mong">몽골어</script>
-			<script type="Mymr">미얀마어</script>
-			<script type="Nkoo">�코 문�</script>
-			<script type="Ogam">오검 문�</script>
-			<script type="Olck">올 치키 문�</script>
-			<script type="Orkh">오르혼어</script>
-			<script type="Orya">오리야어</script>
-			<script type="Osma">오스만야어</script>
-			<script type="Perm">고대 페름어</script>
-			<script type="Phag">파스파 문�</script>
-			<script type="Phnx">페니키아 문�</script>
-			<script type="Plrd">��드 표� 문�</script>
-			<script type="Rjng">레장 문�</script>
-			<script type="Roro">롱고롱고</script>
-			<script type="Runr">룬 문�</script>
-			<script type="Sara">사�티</script>
-			<script type="Saur">사우�슈트� 문�</script>
-			<script type="Sgnw">수화 문�</script>
-			<script type="Shaw">샤비안어</script>
-			<script type="Sinh">신할�어</script>
-			<script type="Sund">순다 문�</script>
-			<script type="Sylo">실헤티 나가리</script>
-			<script type="Syrc">시리아어</script>
-			<script type="Syre">�스트랑겔로� 시리아 문�</script>
-			<script type="Syrj">서부 시리아 문�</script>
-			<script type="Syrn">�부 시리아 문�</script>
-			<script type="Tagb">타반와어</script>
-			<script type="Tale">타� 레어</script>
-			<script type="Talu">신 타� 루�</script>
-			<script type="Taml">타밀어</script>
-			<script type="Telu">탤루그어</script>
-			<script type="Teng">텡과르</script>
-			<script type="Tfng">티피나그</script>
-			<script type="Tglg">타갈로그어</script>
-			<script type="Thaa">타나어</script>
-			<script type="Thai">태국어</script>
-			<script type="Tibt">티벳어</script>
-			<script type="Ugar">우가릿어</script>
-			<script type="Vaii">바�어</script>
-			<script type="Visp">시화법</script>
-			<script type="Xpeo">고대 페르시아 문�</script>
-			<script type="Xsux">수메르-아카드어 설형문�</script>
-			<script type="Yiii">�어</script>
-			<script type="Zxxx">구전</script>
-			<script type="Zyyy">�반 문�</script>
-			<script type="Zzzz">기��지 않� 문�(구전)</script>
-		</scripts>
-		<territories>
-			<territory type="001">세계</territory>
-			<territory type="002">아프리카</territory>
-			<territory type="003">�아메리카</territory>
-			<territory type="005">남아메리카[남미]</territory>
-			<territory type="009">오세아니아, 대양주</territory>
-			<territory type="011">서아프리카</territory>
-			<territory type="013">중앙 아메리카</territory>
-			<territory type="014">�부 아프리카</territory>
-			<territory type="015">�부 아프리카</territory>
-			<territory type="017">중부 아프리카</territory>
-			<territory type="018">남부 아프리카</territory>
-			<territory type="019">아메리카 대륙</territory>
-			<territory type="021">�부 아메리카</territory>
-			<territory type="029">카리브 해 제�</territory>
-			<territory type="030">�아시아</territory>
-			<territory type="034">남아시아</territory>
-			<territory type="035">�남 아시아</territory>
-			<territory type="039">남유럽</territory>
-			<territory type="053">오스트레�리아와 뉴질랜드</territory>
-			<territory type="054">멜�네시아</territory>
-			<territory type="057">미�로네시아 지역</territory>
-			<territory type="061">�리네시아</territory>
-			<territory type="062">중남 아시아</territory>
-			<territory type="142">아시아</territory>
-			<territory type="143">중앙 아시아</territory>
-			<territory type="145">서아시아</territory>
-			<territory type="150">유럽</territory>
-			<territory type="151">�유럽</territory>
-			<territory type="154">�유럽</territory>
-			<territory type="155">서유럽</territory>
-			<territory type="172">�립 국가 연합</territory>
-			<territory type="419">�틴 아메리카 � 카리브 해 제�</territory>
-			<territory type="AD">안��</territory>
-			<territory type="AE">아��미리트 연합</territory>
-			<territory type="AF">아프가니스탄</territory>
-			<territory type="AG">앤티가 바부다</territory>
-			<territory type="AI">안길�</territory>
-			<territory type="AL">알바니아</territory>
-			<territory type="AM">아르메니아</territory>
-			<territory type="AN">네�란드령 안틸레스</territory>
-			<territory type="AO">앙골�</territory>
-			<territory type="AQ">남극 대륙</territory>
-			<territory type="AR">아르헨티나</territory>
-			<territory type="AS">아메리칸 사모아</territory>
-			<territory type="AT">오스트리아</territory>
-			<territory type="AU">오스트레�리아</territory>
-			<territory type="AW">아루바</territory>
-			<territory type="AX">올란드 제�</territory>
-			<territory type="AZ">아제르바�잔</territory>
-			<territory type="BA">보스니아 헤르체고비나</territory>
-			<territory type="BB">바베��스</territory>
-			<territory type="BD">방글��시</territory>
-			<territory type="BE">벨기�</territory>
-			<territory type="BF">부르키나파소</territory>
-			<territory type="BG">불가리아</territory>
-			<territory type="BH">바레�</territory>
-			<territory type="BI">부룬디</territory>
-			<territory type="BJ">베냉</territory>
-			<territory type="BL">� 바르텔르미</territory>
-			<territory type="BM">버뮤다</territory>
-			<territory type="BN">브루나�</territory>
-			<territory type="BO">볼리비아</territory>
-			<territory type="BR">브�질</territory>
-			<territory type="BS">바하마</territory>
-			<territory type="BT">부탄</territory>
-			<territory type="BV">부베</territory>
-			<territory type="BW">보츠와나</territory>
-			<territory type="BY">벨�루스</territory>
-			<territory type="BZ">벨리즈</territory>
-			<territory type="CA">�나다</territory>
-			<territory type="CC">코코스제�</territory>
-			<territory type="CD">콩고 민주공화국</territory>
-			<territory type="CF">중앙 아프리카 공화국</territory>
-			<territory type="CG">콩고</territory>
-			<territory type="CH">스위스</territory>
-			<territory type="CI">코트디부아르</territory>
-			<territory type="CK">쿡제�</territory>
-			<territory type="CL">ì¹ ë ˆ</territory>
-			<territory type="CM">카메룬</territory>
-			<territory type="CN">중국</territory>
-			<territory type="CO">콜롬비아</territory>
-			<territory type="CR">코스타리카</territory>
-			<territory type="CS">세르비아 � 몬테네그로</territory>
-			<territory type="CU">ì¿ ë°”</territory>
-			<territory type="CV">까뽀베르�</territory>
-			<territory type="CX">�리스마스섬</territory>
-			<territory type="CY">사�프러스</territory>
-			<territory type="CZ">ì²´ì½”</territory>
-			<territory type="DE">��</territory>
-			<territory type="DJ">지부티</territory>
-			<territory type="DK">�마�</territory>
-			<territory type="DM">�미니카</territory>
-			<territory type="DO">�미니카 공화국</territory>
-			<territory type="DZ">알제리</territory>
-			<territory type="EC">�콰�르</territory>
-			<territory type="EE">�스토니아</territory>
-			<territory type="EG">�집트</territory>
-			<territory type="EH">서사하�</territory>
-			<territory type="ER">�리트리아</territory>
-			<territory type="ES">스페�</territory>
-			<territory type="ET">�디오피아</territory>
-			<territory type="FI">핀란드</territory>
-			<territory type="FJ">피지</territory>
-			<territory type="FK">��랜드 군�</territory>
-			<territory type="FM">미�로네시아</territory>
-			<territory type="FO">페로제�</territory>
-			<territory type="FR">프랑스</territory>
-			<territory type="GA">가봉</territory>
-			<territory type="GB">�국</territory>
-			<territory type="GD">그레나다</territory>
-			<territory type="GE">그루지야</territory>
-			<territory type="GF">프랑스령 기아나</territory>
-			<territory type="GG">건지</territory>
-			<territory type="GH">가나</territory>
-			<territory type="GI">지브롤터</territory>
-			<territory type="GL">그린란드</territory>
-			<territory type="GM">�비아</territory>
-			<territory type="GN">기니</territory>
-			<territory type="GP">과달로프</territory>
-			<territory type="GQ">�� 기니</territory>
-			<territory type="GR">그리스</territory>
-			<territory type="GS">사우스조지아-사우스샌드위치제�</territory>
-			<territory type="GT">과테��</territory>
-			<territory type="GU">괌</territory>
-			<territory type="GW">기네비�</territory>
-			<territory type="GY">가�아나</territory>
-			<territory type="HK">�콩, 중국 특별행정구</territory>
-			<territory type="HM">허드섬-맥��드제�</territory>
-			<territory type="HN">온��스</territory>
-			<territory type="HR">�로아티아</territory>
-			<territory type="HT">아�티</territory>
-			<territory type="HU">�가리</territory>
-			<territory type="ID">��네시아</territory>
-			<territory type="IE">아�랜드</territory>
-			<territory type="IL">�스�엘</territory>
-			<territory type="IM">맨 섬</territory>
-			<territory type="IN">��</territory>
-			<territory type="IO">�국령��양�민지</territory>
-			<territory type="IQ">���</territory>
-			<territory type="IR">�란</territory>
-			<territory type="IS">아�슬란드</territory>
-			<territory type="IT">�탈리아</territory>
-			<territory type="JE">저지</territory>
-			<territory type="JM">�메�카</territory>
-			<territory type="JO">요르단</territory>
-			<territory type="JP">�본</territory>
-			<territory type="KE">케�</territory>
-			<territory type="KG">키르기스스탄</territory>
-			<territory type="KH">캄보디아</territory>
-			<territory type="KI">키리바시</territory>
-			<territory type="KM">코모로스</territory>
-			<territory type="KN">세�트�리스토� 네비스</territory>
-			<territory type="KP">조선 민주주� �민 공화국</territory>
-			<territory type="KR">대한민국</territory>
-			<territory type="KW">쿠웨�트</territory>
-			<territory type="KY">케�맨제�</territory>
-			<territory type="KZ">카��스탄</territory>
-			<territory type="LA">�오스</territory>
-			<territory type="LB">레바논</territory>
-			<territory type="LC">세�트루시아</territory>
-			<territory type="LI">리히�슈타�</territory>
-			<territory type="LK">스리랑카</territory>
-			<territory type="LR">��베리아</territory>
-			<territory type="LS">레소토</territory>
-			<territory type="LT">리투아니아</territory>
-			<territory type="LU">룩셈부르�</territory>
-			<territory type="LV">�트비아</territory>
-			<territory type="LY">리비아</territory>
-			<territory type="MA">모로코</territory>
-			<territory type="MC">모나코</territory>
-			<territory type="MD">몰�바</territory>
-			<territory type="ME">몬테네그로</territory>
-			<territory type="MF">� 마르탱</territory>
-			<territory type="MG">마다가스카르</territory>
-			<territory type="MH">마샬 군�</territory>
-			<territory type="MK">마케�니아</territory>
-			<territory type="ML">�리</territory>
-			<territory type="MM">미얀마</territory>
-			<territory type="MN">몽골</territory>
-			<territory type="MO">마카오, 중국 특별행정구</territory>
-			<territory type="MP">�마리아나제�</territory>
-			<territory type="MQ">�티니�</territory>
-			<territory type="MR">모리타니</territory>
-			<territory type="MS">몬트세�트</territory>
-			<territory type="MT">몰타</territory>
-			<territory type="MU">모리셔스</territory>
-			<territory type="MV">몰디브</territory>
-			<territory type="MW">��위</territory>
-			<territory type="MX">멕시코</territory>
-			<territory type="MY">�레�시아</territory>
-			<territory type="MZ">모잠비�</territory>
-			<territory type="NA">나미비아</territory>
-			<territory type="NC">뉴 칼레�니아</territory>
-			<territory type="NE">니제르</territory>
-			<territory type="NF">노�섬</territory>
-			<territory type="NG">나�지리아</territory>
-			<territory type="NI">니카�과</territory>
-			<territory type="NL">네�란드</territory>
-			<territory type="NO">노르웨�</territory>
-			<territory type="NP">네팔</territory>
-			<territory type="NR">나우루</territory>
-			<territory type="NU">니우�</territory>
-			<territory type="NZ">뉴질랜드</territory>
-			<territory type="OM">오만</territory>
-			<territory type="PA">파나마</territory>
-			<territory type="PE">페루</territory>
-			<territory type="PF">프랑스령 �리네시아</territory>
-			<territory type="PG">파푸아뉴기니</territory>
-			<territory type="PH">필리핀</territory>
-			<territory type="PK">파키스탄</territory>
-			<territory type="PL">�란드</territory>
-			<territory type="PM">세�트피�르-미케롱</territory>
-			<territory type="PN">�케언섬</territory>
-			<territory type="PR">푸�르토리코</territory>
-			<territory type="PS">팔레스타� 지구</territory>
-			<territory type="PT">�르투갈</territory>
-			<territory type="PW">팔�우</territory>
-			<territory type="PY">파�과�</territory>
-			<territory type="QA">카타르</territory>
-			<territory type="QO">오세아니아 외곽</territory>
-			<territory type="QU">유럽 연합</territory>
-			<territory type="RE">리유니온</territory>
-			<territory type="RO">루마니아</territory>
-			<territory type="RS">세르비아</territory>
-			<territory type="RU">러시아</territory>
-			<territory type="RW">르완다</territory>
-			<territory type="SA">사우디아�비아</territory>
-			<territory type="SB">솔로몬 제�</territory>
-			<territory type="SC">��쉘</territory>
-			<territory type="SD">수단</territory>
-			<territory type="SE">스웨�</territory>
-			<territory type="SG">싱가�르</territory>
-			<territory type="SH">세�트헬레나</territory>
-			<territory type="SI">슬로베니아</territory>
-			<territory type="SJ">스발바르제�-얀마웬섬</territory>
-			<territory type="SK">슬로바키아</territory>
-			<territory type="SL">시��리온</territory>
-			<territory type="SM">산마리노</territory>
-			<territory type="SN">세네갈</territory>
-			<territory type="SO">소�리아</territory>
-			<territory type="SR">수리남</territory>
-			<territory type="ST">�투메 프린시페</territory>
-			<territory type="SV">엘살바�르</territory>
-			<territory type="SY">시리아</territory>
-			<territory type="SZ">스와질랜드</territory>
-			<territory type="TC">터�스케�커스제�</territory>
-			<territory type="TD">차드</territory>
-			<territory type="TF">프랑스 남부 지방</territory>
-			<territory type="TG">토고</territory>
-			<territory type="TH">태국</territory>
-			<territory type="TJ">타지키스탄</territory>
-			<territory type="TK">토켈�우</territory>
-			<territory type="TL">�티모르</territory>
-			<territory type="TM">투르�메니스탄</territory>
-			<territory type="TN">튀니지</territory>
-			<territory type="TO">통가</territory>
-			<territory type="TR">터키</territory>
-			<territory type="TT">트리니다드 토바고</territory>
-			<territory type="TV">투발루</territory>
-			<territory type="TW">대만</territory>
-			<territory type="TZ">탄�니아</territory>
-			<territory type="UA">우���나</territory>
-			<territory type="UG">우간다</territory>
-			<territory type="UM">미국령 해외 제�</territory>
-			<territory type="US">미국</territory>
-			<territory type="UY">우루과�</territory>
-			<territory type="UZ">우즈베키스탄</territory>
-			<territory type="VA">바티칸</territory>
-			<territory type="VC">세�트빈센트그레나딘</territory>
-			<territory type="VE">베네수엘�</territory>
-			<territory type="VG">�국령 버진 아�랜드</territory>
-			<territory type="VI">미국령 버진 아�랜드</territory>
-			<territory type="VN">베트남</territory>
-			<territory type="VU">바누아투</territory>
-			<territory type="WF">왈리스-푸투나 제�</territory>
-			<territory type="WS">사모아</territory>
-			<territory type="YE">예멘</territory>
-			<territory type="YT">마요티</territory>
-			<territory type="ZA">남아프리카</territory>
-			<territory type="ZM">잠비아</territory>
-			<territory type="ZW">�바브웨</territory>
-			<territory type="ZZ">알수없거나 유효하지 않� 지역</territory>
-		</territories>
-		<variants>
-			<variant type="1994">표준 레지아어 철�법</variant>
-			<variant type="1996">��어 철�법 (1996년)</variant>
-			<variant type="1606NICT">후기 중세 프랑스어</variant>
-			<variant type="AREVELA">�아르메니아어</variant>
-			<variant type="BAKU1926">통합 투르�어 �틴 알파벳</variant>
-			<variant type="BISKE">산조르지오/빌� 방언</variant>
-			<variant type="BOONT">분틀�어</variant>
-			<variant type="NEDIS">나티소네 방언</variant>
-			<variant type="NJIVA">니바 방언</variant>
-			<variant type="REVISED">개정</variant>
-			<variant type="ROZAJ">레지아어</variant>
-			<variant type="SCOTLAND">스코틀랜드 표준 �어</variant>
-			<variant type="VALENCIA">발렌시아어</variant>
-		</variants>
-		<keys>
-			<key type="calendar">달력</key>
-			<key type="collation">ì •ë ¬</key>
-			<key type="currency">통화</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">중국어 번체 정렬 순서 - Big5</type>
-			<type type="buddhist" key="calendar">불�력</type>
-			<type type="chinese" key="calendar">중국력</type>
-			<type type="direct" key="collation">순서</type>
-			<type type="gb2312han" key="collation">중국어 간체 정렬 순서 - GB2312</type>
-			<type type="gregorian" key="calendar">태양력</type>
-			<type type="hebrew" key="calendar">히브리력</type>
-			<type type="indian" key="calendar">��력</type>
-			<type type="islamic" key="calendar">�슬람력</type>
-			<type type="islamic-civil" key="calendar">�슬람 �용력</type>
-			<type type="japanese" key="calendar">�본력</type>
-			<type type="phonebook" key="collation">전화번호부순</type>
-			<type type="pinyin" key="collation">병�순</type>
-			<type type="roc" key="calendar">대만력</type>
-			<type type="stroke" key="collation">��순</type>
-			<type type="traditional" key="collation">전통 역법</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">미터법</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">언어: {0}</codePattern>
-			<codePattern type="script">스�립트: {0}</codePattern>
-			<codePattern type="territory">지역: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[가 � 간 갇-갊 �-갗 같-� 갠 갤 갬 갭 갯-갱 갸 갹 갼 걀 걋 � 걔 걘 걜 거 걱 건 걷 걸 걺 검 � 것-겆 겉-게 � 겔 겜 � 겟-겡 겨-겪 견 겯 결 겸 겹 겻-경 � 계 곈 곌 곕 곗 고 곡 곤 곧 골 곪 곬 곯-곱 곳 공 곶 과 곽 관 괄 괆 괌 � � 광 괘 괜 괠 괩 괬 괭 괴 괵 괸 괼 굄 굅 굇 굉 � 굔 굘 굡 굣 구 국 군 굳-굶 굻-굽 굿 � 궂 궈 궉 권 � 궜 � 궤 궷 귀 � 귄 귈 � 귑 귓 규 균 귤 그 극 근 귿-� 금 급 긋 � 긔 기 긱 긴 긷 길 긺 김 � 깃 깅 깆 깊 까-깎 � 깔 깖 깜 � 깟-깡 깥 깨 깩 깬 깰 깸 깹 깻-깽 꺄 꺅 꺌 꺼-꺾 껀 껄 껌 � �-껑 께 껙 껜 껨 껫 껭 껴 껸 껼 꼇 꼈 � � 꼬 꼭 꼰 꼲 꼴 꼼 꼽 꼿 �-꽃 꽈 꽉 � 꽜 � 꽤 꽥 꽹 꾀 꾄 꾈 � 꾑 꾕 꾜 꾸 꾹 꾼 꿀 꿇-꿉 꿋 � 꿎 꿔 꿜 꿨 꿩 꿰 꿱 꿴 꿸 뀀 � 뀄 뀌 � 뀔 뀜 � 뀨 � � � � � � �-� � � � � � 낀 낄 낌 � � 낑 나-낚 난 낟-낢 남 납 낫-낯 낱 낳-낵 낸 낼 냄 냅 냇-냉 � 냑 냔 냘 냠 냥 너 넉 넋 넌 � 넒 넓 넘 넙 넛-� 넣-넥 넨 넬 넴 넵 넷-넹 녀 � 년 녈 � 녑 녔 녕 녘 녜 녠 노 녹 논 놀 놂 놈 놉 놋 � 높-놔 놘 놜 놨 뇌 � 뇔 뇜 � 뇟 뇨 뇩 뇬 뇰 뇹 뇻 뇽 누 눅 눈 눋 눌 눔 눕 눗 눙 눠 눴 눼 뉘 뉜 뉠 뉨 뉩 뉴 뉵 뉼 늄 늅 늉 � 늑 는 늘-늚 늠 늡 늣 능 늦 늪 늬 늰 늴 니 닉 닌 � 닒 님 닙 닛 � 닢 다-닦 단 닫-닯 닳-답 닷-닻 닿-� 댄 댈 � 댑 댓-댕 댜 �-� � � � � � � � � � � � � � � � 뎀 � 뎃-뎅 뎌 � 뎔 뎠 뎡 뎨 뎬 � � � � � � � � � � � � � � � � � � � � � � � � � � 둑 둔 둘 둠 둡 둣 둥 둬 뒀 뒈 � 뒤 뒨 뒬 뒵 뒷 뒹 듀 듄 듈 � 듕 드 � 든 듣 들 듦 듬 듭 듯 등 듸 디 딕 딘 딛 딜 딤 딥 딧-딪 따 딱 딴 딸 땀 � 땃-땅 땋-� � 땔 땜 � 땟-땡 떠 떡 떤 떨 떪 떫 떰 떱 떳-떵 떻-떽 뗀 뗄 뗌 � �-뗑 뗘 뗬 � 똑 똔 똘 똥 똬 똴 뙈 뙤 뙨 뚜 � 뚠 뚤 뚫 뚬 뚱 뛔 뛰 뛴 뛸 뜀 � 뜅 뜨 뜩 뜬 뜯 뜰 뜸 뜹 뜻 � � � � � � � � � � � � � � 란 랄 람 � �-랒 랖-랙 랜 랠 램 랩 랫-랭 랴 략 랸 럇 량 러 럭 런 럴 럼 럽 럿-� 렇-렉 렌 � 렘 렙 렛 � 려 력 련 렬 렴 렵 렷-령 례 롄 롑 롓 로 � 론 롤 롬 롭 롯 롱 롸 롼 � 뢨 뢰 뢴 뢸 룀 � 룃 룅 료 � 룔 � 룟 룡 루 룩 룬 룰 룸 룹 룻 룽 뤄 뤘 뤠 뤼 뤽 륀 륄 륌 � 륑 류 륙 륜 률 륨 륩 륫 륭 르 륵 른 를 름 릅 릇 릉 릊 � 릎 리 릭 린 릴 림 립 릿 � 마 막 만 많-맒 맘 맙 맛 � 맞 맡 맣-맥 맨 맬 맴 맵 맷-맺 먀 � 먈 먕 머 먹 먼 멀 멂 멈 멉 멋 � 멎 멓-멕 멘 멜 멤 멥 멧-멩 며 멱 면 멸 몃-명 몇 몌 모 목 몫 몬 몰 몲 몸 몹 못 몽 뫄 뫈 뫘 뫙 뫼 묀 묄 � � 묑 묘 묜 묠 묩 묫 무-묶 문 묻-묾 뭄 뭅 뭇 뭉 � � � 뭔 뭘 뭡 뭣 뭬 뮈 뮌 � 뮤 뮨 뮬 뮴 뮷 므 믄 믈 � 믓 미 믹 민 믿 밀 밂 밈 밉 밋-� � 밑 바-반 받-밟 밤 밥 밧 방 밭 배 백 밴 밸 뱀 � 뱃-뱅 뱉 뱌 � � � 버 벅 번 벋 벌 벎 범 법 벗 벙 벚 베 벡 벤 벧 벨 벰 벱 벳-벵 벼 벽 변 별 � �-병 볕 볘 볜 보-볶 본 볼 봄 봅 봇 봉 � 봔 봤 봬 뵀 뵈 뵉 뵌 � 뵘 뵙 뵤 뵨 부 � 분 붇-붊 � 붑 붓 붕 붙 붚 붜 붤 붰 붸 뷔 뷕 뷘 뷜 뷩 뷰 뷴 뷸 븀 븃 븅 브 � � 블 븜 � 븟 비 빅 빈 빌 빎 빔 빕 빗 빙-빛 빠 빡 빤 빨 빪 빰 빱 빳-빵 빻-빽 뺀 뺄 뺌 � �-뺑 뺘 뺙 뺨 � 뻑 뻔 뻗 뻘 뻠 뻣-뻥 뻬 � 뼈 뼉 뼘 뼙 뼛-� 뽀 � 뽄 뽈 � 뽑 뽕 뾔 뾰 뿅 뿌 � � 뿔 뿜 뿟 뿡 쀼 � � � � � � � 삑 삔 삘 삠 삡 삣 삥 사 삭 삯 산 삳-삶 삼 삽 삿-� 샅 새 색 샌 � 샘 샙 샛-� 샤 샥 샨 샬 샴 샵 샷 샹 섀 섄 섈 � 섕 서-선 섣 설 섦 섧 섬 섭 섯-성 섶 세 섹 센 셀 셈 셉 셋-� 셔 셕 션 셜 셤 셥 셧-셩 셰 셴 셸 솅 소-솎 � 솔 솖 솜 � 솟 송 솥 솨 솩 솬 솰 솽 쇄 쇈 쇌 쇔 쇗 쇘 쇠 쇤 쇨 쇰 쇱 쇳 쇼 쇽 숀 숄 숌 � � 숑 수 숙 순 숟 술 숨 숩 숫 숭 숯 숱 숲 숴 쉈 � 쉑 쉔 쉘 쉠 쉥 쉬 쉭 쉰 쉴 쉼 쉽 쉿 � 슈 슉 � 슘 슛 � 스 슥 슨 슬 슭 슴 습 슷 승 시 � 신 싣 실 싫-십 싯 싱 싶 싸 싹 싻 싼 쌀 쌈 쌉 쌌 � 쌓-쌕 쌘 쌜 쌤 쌥 쌨 쌩 � � � � � � � � � � 쎄 쎈 쎌 � � � � � � � � � � � � � � � � � � � � � 쑈 쑤 쑥 쑨 쑬 쑴 쑵 쑹 쒀 쒔 쒜 쒸 쒼 쓩 쓰 쓱 쓴 쓸 쓺 쓿-� 씌 � 씔 씜 씨 씩 씬 씰 씸 씹 씻 씽 아 악 안-않 알-앎 앓-압 앗-앙 � 앞 애 액 앤 앨 앰 앱 앳-앵 야 약 얀 얄 얇 얌 � � 양 얕 얗 얘 얜 얠 얩 어 억 언 얹 얻-얾 엄-엊 엌 엎 � 엑 엔 엘 엠 엡 엣 엥 여-엮 연 열 엶 엷 염-� 옅-예 옌 � 옘 옙 옛 옜 오 옥 온 올-옮 옰 옳-옵 옷 옹 옻 와 � 완 왈 � 왑 왓-왕 왜 � 왠 왬 왯 왱 외 왹 왼 욀 욈 욉 욋 � 요 욕 욘 욜 욤 욥 욧 용 우 욱 운 울-욺 움 � 웃 웅 워 � � 월 웜 � 웠 웡 웨 웩 웬 웰 웸 웹 웽 위 윅 윈 윌 윔 윕 윗 윙 유 육 윤 율 윰 윱 윳 융 윷 으 윽 � � � � � � �-� � � � � � � � �-� 잃-입 잇-잊 잎 � 작 잔 잖-잘 잚 잠 잡 잣-잦 재 잭 잰 잴 잼 잽 잿-� 쟈 쟉 쟌 쟎 � 쟘 � 쟤 쟨 쟬 저 � 전 절 젊 � 접 젓 정 젖 제 � 젠 젤 젬 젭 젯 젱 져 젼 졀 졈 졉 졌 � 졔 조 족 존 졸 졺 좀 � 좃 종-좇 좋-� 좔 � 좟 좡 좨 좼 좽 죄 죈 죌 죔 죕 죗 죙 죠 죡 죤 죵 주 죽 준 줄-줆 줌 � � 중 줘 줬 줴 � 쥑 쥔 쥘 쥠 쥡 쥣 쥬 쥰 쥴 쥼 즈 즉 즌 � 즘 즙 즛 � 지 � 진 짇 질 짊 � 집 짓 징 짖 짙 짚 짜 � 짠 짢 짤 짧 짬 짭 짯-짱 째 짹 짼 쨀 쨈 쨉 쨋-� 쨔 쨘 쨩 쩌 � � 쩔 쩜 � 쩟-쩡 쩨 쩽 쪄 쪘 쪼 쪽 쫀 쫄 쫌 � � 쫑 쫓 쫘 쫙 쫠 쫬 쫴 쬈 � 쬔 쬘 쬠 쬡 � 쭈 쭉 쭌 � 쭘 쭙 � 쭤 쭸 쭹 쮜 쮸 쯔 쯤 쯧 쯩 찌 � � 찔 찜 � 찡 찢 찧-착 찬 찮 찰 참 찹 찻-찾 채 책 챈 챌 챔 챕 챗-챙 챠 챤 챦 챨 챰 챵 처 척 천 철 첨 첩 첫-청 체 첵 첸 첼 쳄 쳅 쳇 쳉 � 쳔 쳤 쳬 쳰 � 초 촉 촌 � 촘 촙 촛 � 촤 촨 촬 촹 최 쵠 쵤 쵬 쵭 쵯 쵱 쵸 춈 추 축 춘 출 춤 춥 춧 충 춰 췄 췌 � 취 췬 췰 췸 췹 췻 췽 츄 츈 츌 츔 츙 츠 측 츤 츨 츰 츱 츳 층 치 칙 친 칟-칡 침 칩 칫 칭 카 칵 칸 칼 캄 캅 캇 캉 � 캑 캔 캘 캠 캡 캣-캥 캬 캭 � 커 컥 컨 컫 컬 컴 컵 컷-컹 케 � 켄 켈 � 켑 켓 켕 켜 켠 켤 켬 켭 켯-켱 켸 코 콕 콘 콜 콤 콥 콧 콩 콰 콱 콴 콸 쾀 쾅 쾌 쾡 쾨 쾰 쿄 쿠 쿡 쿤 쿨 쿰 쿱 쿳 쿵 쿼 퀀 퀄 퀑 퀘 퀭 퀴 퀵 퀸 퀼 � � � � � � � � � � � � � � � 키 킥 킨 킬 킴 킵 킷 킹 타 � 탄 탈 탉 � 탑 탓-탕 태 � 탠 탤 탬 탭 탯-탱 탸 � 터 턱 턴 털 턺 텀 � 텃-텅 테 � � 텔 템 � 텟 텡 텨 텬 텼 톄 톈 토 톡 톤 톨 톰 톱 톳 통 톺 톼 퇀 퇘 퇴 퇸 툇 툉 � 투 툭 툰 툴 툼 툽 툿 � 퉈 퉜 퉤 튀 � 튄 튈 � 튑 튕 튜 튠 튤 튬 튱 트 특 튼 튿 틀 틂 틈 틉 틋 틔 틘 틜 틤 틥 티 틱 틴 틸 팀 � 팃 팅 파-팎 � 팔 팖 팜 � 팟-팡 팥 패 팩 팬 팰 팸 팹 팻-팽 � � � � 펀 펄 펌 � �-펑 페 펙 펜 펠 펨 펩 펫 펭 펴 편 펼 � � � � � � � � � � � � � � � � � � 푀 푄 표 푠 푤 푭 푯 푸 푹 푼 푿 풀 풂 품 풉 풋 � 풔 풩 퓌 � 퓔 퓜 퓟 퓨 퓬 퓰 퓸 퓻 퓽 프 픈 플 픔 픕 픗 피 픽 핀 필 핌 � � 핑 하 학 한 할 핥 함 합 핫 항 해 핵 핸 핼 햄 햅 햇-행 � 향 허 헉 헌 � 헒 험 헙 헛 � 헤 헥 헨 헬 헴 헵 헷 헹 혀 � 현 혈 � 협 혓-형 혜 혠 혤 혭 호 혹 혼 홀 홅 홈 홉 홋 � 홑 화 확 환 활 홧 황 홰 홱 홴 횃 횅 회 � � 횔 � 횟 횡 효 횬 횰 횹 횻 후 훅 훈 훌 훑 훔 훗 훙 훠 훤 훨 훰 훵 훼 훽 휀 휄 휑 휘 휙 휜 휠 휨 휩 휫 휭 휴 휵 휸 휼 � � � � � � �-� � � � � � � � � � � � 히 힉 힌 � 힘 힙 힛 �]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[丘 串 乃 久 乖 � 乞 乫 乾 亂 亘 交 京 仇 今 介 件 价 � 伋 伎 伽 佳 佶 侃 來 侊 供 係 俓 俱 個 倞 倦 倨 � � � 傀 傑 傾 僅 僑 價 儆 儉 儺 光 克 兢 內 公 共 其 具 兼 冀 冠 凱 刊 刮 券 刻 剋 剛 劇 � 劒 功 加 劤 劫 � � 勘 勤 勸 勻 勾 匡 匣 � � � � � � � 厥 去 � � � � � � � � � 告 呱 呵 咎 咬 哥 哭 啓 喀 喇 � 喫 喬 嗜 嘉 嘔 器 囊 困 固 圈 國 圭 圻 � � � � � � 垢 基 埼 堀 堅 堈 堪 堺 塊 � 境 墾 壙 壞 夔 奇 奈 奎 契 奸 妓 妗 姑 姜 姦 娘 娜 � 嬌 孔 季 孤 � 官 客 宮 家 寄 寇 寡 寬 尻 局 居 屆 屈 � 岡 岬 崎 崑 崗 嵌 � 嶇 嶠 工 巧 巨 己 巾 干 幹 幾 庚 庫 康 廊 � 廓 廣 建 弓 强 彊 徑 忌 急 怪 怯 � � � � 悸 愆 感 愧 愷 愾 慊 慣 慤 慨 慶 慷 憩 憬 憾 懃 懇 懦 懶 懼 戈 戒 戟 戡 扱 技 抉 拉 � � 拒 拘 括 拮 拱 拳 拷 拿 � � � � 掘 掛 控 � � � 擊 擎 擒 據 擧 攪 攷 改 攻 故 敎 救 敢 敬 敲 斛 斤 旗 旣 昆 昑 景 晷 暇 暖 暠 暻 曠 曲 更 曷 朗 朞 期 机 � � � � 果 枯 架 枸 柑 柩 柬 柯 校 根 格 桀 桂 桔 桿 � 梗 械 梱 棄 棋 � 棘 棨 棺 楗 楠 極 � 構 � 槨 槪 槻 槿 樂 橄 橋 橘 機 檄 檎 檢 櫃 欄 權 欺 款 歌 � 歸 殼 毆 毬 氣 求 江 汨 汲 決 汽 沂 沽 洛 洸 浪 涇 淃 淇 減 渠 渴 湳 � 溪 滑 滾 漑 潔 潰 澗 激 濫 � � 炅 炚 炬 烙 烱 煖 爛 牽 犬 狂 狗 狡 狼 � 玖 玘 � � � � � � � � � � � � 瑾 璂 璟 璣 璥 瓊 瓘 瓜 甄 甘 甲 男 畇 界 畸 畺 畿 疆 疥 疳 痂 痙 痼 癎 癩 癸 皆 皎 � 盖 監 看 眷 � 瞰 瞼 瞿 矜 矩 矯 硅 硬 � 碣 磎 磬 磯 磵 � 祇 祈 祛 祺 � 禽 科 稈 稼 稽 稿 穀 究 穹 空 窘 窟 窮 窺 竅 竟 竭 競 竿 筋 � 筠 箇 箕 � 管 簡 粳 糠 系 糾 紀 � 紘 級 紺 絅 � 絞 給 絳 絹 絿 經 綱 綺 緊 繫 繭 繼 缺 � 罫 羅 羈 羌 羔 群 羹 翹 考 耆 耉 耕 耭 耿 肌 � 股 肩 肯 肱 胛 胱 脚 脛 腔 腱 膈 � 膠 臘 臼 舅 舊 舡 艮 艱 芎 芥 芩 芹 苛 苟 苦 苽 茄 莖 � � � � � � � 葛 葵 蓋 蕎 蕨 薑 � � 藿 蘭 蘿 虔 蚣 蛟 � 螺 蠟 蠱 街 衢 衲 衾 衿 袈 袞 袴 裙 裸 � � 襟 襤 見 � 覡 覲 覺 觀 角 計 記 訣 訶 詭 誇 誡 誥 課 諫 諾 謙 講 謳 謹 � 警 譴 谷 谿 豈 貢 貫 貴 賈 購 赳 起 � � 跨 踞 蹇 蹶 躬 軀 車 軌 � 軻 較 輕 轎 轟 辜 近 迦 迲 适 逑 逕 逵 � � � � 那 邯 邱 郊 郎 郡 郭 酪 醵 金 � 鈞 鉀 鉅 鉗 鉤 銶 鋸 鋼 錡 錤 錦 錮 � � 鎌 鎧 � 鑑 鑒 鑛 開 間 閘 閣 閨 闕 關 � 階 隔 隙 雇 難 � 鞠 鞨 鞫 頃 頸 顆 顧 飢 餃 館 饉 饋 饑 駒 駕 駱 騎 � 騫 驅 驕 驚 驥 骨 高 鬼 � 鮫 鯤 鯨 鱇 鳩 鵑 鵠 鷄 鷗 鸞 麒 麴 黔 鼓 龕 龜]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>오전</am>
-				<pm>오후</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">불기</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>G y년 MMMM d� EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>G y년 MMMM d�</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="coptic">
-				<am>오전</am>
-				<pm>오후</pm>
-			</calendar>
-			<calendar type="ethiopic">
-				<am>오전</am>
-				<pm>오후</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">1ì›”</month>
-							<month type="2">2ì›”</month>
-							<month type="3">3ì›”</month>
-							<month type="4">4ì›”</month>
-							<month type="5">5ì›”</month>
-							<month type="6">6ì›”</month>
-							<month type="7">7ì›”</month>
-							<month type="8">8ì›”</month>
-							<month type="9">9ì›”</month>
-							<month type="10">10ì›”</month>
-							<month type="11">11ì›”</month>
-							<month type="12">12ì›”</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1ì›”</month>
-							<month type="2">2ì›”</month>
-							<month type="3">3ì›”</month>
-							<month type="4">4ì›”</month>
-							<month type="5">5ì›”</month>
-							<month type="6">6ì›”</month>
-							<month type="7">7ì›”</month>
-							<month type="8">8ì›”</month>
-							<month type="9">9ì›”</month>
-							<month type="10">10ì›”</month>
-							<month type="11">11ì›”</month>
-							<month type="12">12ì›”</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">�</day>
-							<day type="mon">ì›”</day>
-							<day type="tue">í™”</day>
-							<day type="wed">수</day>
-							<day type="thu">목</day>
-							<day type="fri">금</day>
-							<day type="sat">토</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�요�</day>
-							<day type="mon">월요�</day>
-							<day type="tue">화요�</day>
-							<day type="wed">수요�</day>
-							<day type="thu">목요�</day>
-							<day type="fri">금요�</day>
-							<day type="sat">토요�</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">ì›”</day>
-							<day type="tue">í™”</day>
-							<day type="wed">수</day>
-							<day type="thu">목</day>
-							<day type="fri">금</day>
-							<day type="sat">토</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1분기</quarter>
-							<quarter type="2">2분기</quarter>
-							<quarter type="3">3분기</quarter>
-							<quarter type="4">4분기</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">제 1/4분기</quarter>
-							<quarter type="2">제 2/4분기</quarter>
-							<quarter type="3">제 3/4분기</quarter>
-							<quarter type="4">제 4/4분기</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>오전</am>
-				<pm>오후</pm>
-				<eras>
-					<eraNames>
-						<era type="0">서력기�전</era>
-						<era type="1">서력기�</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">기�전</era>
-						<era type="1">서기</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y년 M월 d� EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y년 M월 d�</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy. M. d.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy. M. d.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>a hh시 mm분 ss초 zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>a hh시 mm분 ss초 z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>a h:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>a h:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">d� (E)</dateFormatItem>
-						<dateFormatItem id="EEEd">d� EEE</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="Hms">H시 m분 s초</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M. d.</dateFormatItem>
-						<dateFormatItem id="MEd">M. d. (E)</dateFormatItem>
-						<dateFormatItem id="MMdd">MM. dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d�</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d� (E)</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d�</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMM d� (E)</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy. M.</dateFormatItem>
-						<dateFormatItem id="yMEd">yyyy. M. d. EEE</dateFormatItem>
-						<dateFormatItem id="yMMM">yë…„ MMM</dateFormatItem>
-						<dateFormatItem id="yMMMd">y년 MMM d�</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y년 MMM d� EEE</dateFormatItem>
-						<dateFormatItem id="yMMMM">yë…„ MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">y년 Q분기</dateFormatItem>
-						<dateFormatItem id="yQQQ">yë…„ QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">YY. M.</dateFormatItem>
-						<dateFormatItem id="yyMMM">yyë…„ MMM</dateFormatItem>
-						<dateFormatItem id="yyQ">yy년 Q분기</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy. MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d� ~ d�</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">a h ~ a h</greatestDifference>
-							<greatestDifference id="h">a h~h</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">a h:mm ~ a h:mm</greatestDifference>
-							<greatestDifference id="h">a h:mm~h:mm</greatestDifference>
-							<greatestDifference id="m">a h:mm~h:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">a h:mm ~ a h:mm v</greatestDifference>
-							<greatestDifference id="h">a h:mm~h:mm v</greatestDifference>
-							<greatestDifference id="m">a h:mm~h:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">a h ~ a h v</greatestDifference>
-							<greatestDifference id="h">a h~h v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">Mì›” ~ Mì›”</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M. d ~ M. d</greatestDifference>
-							<greatestDifference id="M">M. d ~ M. d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M. d E ~ M. d E</greatestDifference>
-							<greatestDifference id="M">M. d E ~ M. d E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM ~ MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">M월 d� ~ d�</greatestDifference>
-							<greatestDifference id="M">M월 d� ~ M월 d�</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">M월 d� E ~ d� E</greatestDifference>
-							<greatestDifference id="M">M월 d� E ~ M월 d� E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">yë…„ ~ yë…„</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy. M ~ yyyy. M</greatestDifference>
-							<greatestDifference id="y">yyyy. M ~ yyyy. M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy. M. d. ~ yy. M. d.</greatestDifference>
-							<greatestDifference id="M">yy. M. d. ~ yy. M. d.</greatestDifference>
-							<greatestDifference id="y">yy. M. d. ~ yy. M. d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yy. M. d. E ~ yy. M. d. E</greatestDifference>
-							<greatestDifference id="M">yy. M. d. E ~ yy. M. d. E</greatestDifference>
-							<greatestDifference id="y">yy. M. d. E ~ yy. M. d. E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">yë…„ Mì›”~Mì›”</greatestDifference>
-							<greatestDifference id="y">yë…„ Mì›” ~ yë…„ Mì›”</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y년 M월 d�~d�</greatestDifference>
-							<greatestDifference id="M">y년 M월 d� ~ M월 d�</greatestDifference>
-							<greatestDifference id="y">y년 M월 d� ~ y년 M월 d�</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y년 M월 d� E ~ d� E</greatestDifference>
-							<greatestDifference id="M">y년 M월 d� E ~ M월 d� E</greatestDifference>
-							<greatestDifference id="y">y년 M월 d� E ~ y년 M월 d� E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yë…„ MMì›” ~ MMì›”</greatestDifference>
-							<greatestDifference id="y">yë…„ MMì›” ~ yë…„ MMì›”</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>연호</displayName>
-					</field>
-					<field type="year">
-						<displayName>ë…„</displayName>
-					</field>
-					<field type="month">
-						<displayName>ì›”</displayName>
-					</field>
-					<field type="week">
-						<displayName>주</displayName>
-					</field>
-					<field type="day">
-						<displayName>�</displayName>
-						<relative type="-3">그�제</relative>
-						<relative type="-2">그저께</relative>
-						<relative type="-1">어제</relative>
-						<relative type="0">오늘</relative>
-						<relative type="1">내�</relative>
-						<relative type="2">모레</relative>
-						<relative type="3">3�후</relative>
-					</field>
-					<field type="weekday">
-						<displayName>요�</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>오전/오후</displayName>
-					</field>
-					<field type="hour">
-						<displayName>시</displayName>
-					</field>
-					<field type="minute">
-						<displayName>분</displayName>
-					</field>
-					<field type="second">
-						<displayName>ì´ˆ</displayName>
-					</field>
-					<field type="zone">
-						<displayName>시간대</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="islamic">
-				<am>오전</am>
-				<pm>오후</pm>
-			</calendar>
-			<calendar type="japanese">
-				<am>오전</am>
-				<pm>오후</pm>
-			</calendar>
-			<calendar type="persian">
-				<am>오전</am>
-				<pm>오후</pm>
-			</calendar>
-			<calendar type="roc">
-				<am>오전</am>
-				<pm>오후</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">중화민국전</era>
-						<era type="1">중화민국</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>G y년 M월 d�</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>G y년 M월 d�</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>G y. M. d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G y. M. d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} 시간</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>알 수 없는 장소</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>안��</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>�바�</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>카불</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>안티과</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>앙귈�</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>티�나</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>예레반</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>쿠�사오</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>루안다</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>로��</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>파머</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>남극</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>쇼와</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>모슨</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>��비스</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>보스토�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>케�시</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>뒤몽 뒤르빌</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>맥머�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>리오 가예고스</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>멘�사</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>산후안</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>우수아�아</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>� 리오하</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>산루�스</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>카타마르카</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>살타</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>후후�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>뚜꾸만</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>코르�바</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>부�노스 아�레스</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>파고파고</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>비엔나</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>�스</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>유��</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>다윈</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>애들레�드</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>브로컨�</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>퀴리</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>멜버른</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>호바트</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>린�만</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>시드니</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>브리스베�</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>로드 하우</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>아루바</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>바쿠</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>바베��스</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>다카</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>브뤼셀</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>와가�구</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>소피아</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>바레�</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>부줌부�</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>�르토노보</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>버뮤다</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>브루나�</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>�파스</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>아�루네페</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>리오 브랑코</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>�르토 벨로</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>보아 비스타</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>마나우스</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>쿠�아바</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>산타렘</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>캄� 그란�</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>벨렘</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>아�과�나</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>�파울로</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>바히아</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>�르탈레�</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>마세�오</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>레시페</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>노롱야</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>나소</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>팀부</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>가보로네</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>민스�</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>벨리즈</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>�슨</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>화�트호스</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>�누빅</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>벤쿠버</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>�슨�릭</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>�로나�프</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>�드먼턴</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>스위프트커런트</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>케임브리지 베�</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>리��나</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>위니펙</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>리졸루트</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>레�니강</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>랭킹 �렛</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>코랄하버</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>선�베�</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>니피곤</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>토론토</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>몬트리올</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>�칼루�트</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>팡니르�</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>몽턴</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>핼리팩스</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>구즈베�</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>글�스베�</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>블랑 사블롱</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>세�트존</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>코코스</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>킨샤사</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>루�바시</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>방기</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>브��빌</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>취리히</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>아비장</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>�로통가</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>�스터 섬</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>ì‚°í‹°ì•„ê³ </exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>�알�</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>카슈가르</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>우루무치</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>충칭</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>�하�</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>하얼빈</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>보고타</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>코스타리카</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>하바나</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>카보 베르�</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>�리스마스</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>니코시아</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>베를린</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>지부티</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>코펜하�</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>�미니카</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>산토��고</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>알제</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>갈�파고스</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>과야킬</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>탈린</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>카�로</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>엘아�운</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>아스메�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>카나리아 제�</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>세우타</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>마드리드</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>아디스아바바</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>헬싱키</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>피지</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>스탠리</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>트루�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>�나페</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>코스레</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>페로</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>파리</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>리브르빌</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>런�</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>그�나다</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>트빌리시</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>샤�엔</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>아��</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>지브랄타</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>툴레</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>고드호프</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>스코레스바�선드</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>�마�샤�</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>반줄</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>코나�리</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>과�로프</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>��보</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>아테네</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>남부 조지아</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>과테��</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>괌</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>비사우</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>가�아나</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>�콩</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>�르토프랭스</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>부다페스트</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>�카르타</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>�티아나�</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>마카사르</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>�야푸�</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>�블린</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>예루살렘</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>차고스</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>바그다드</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>테헤란</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>레�캬비�</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>로마</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>�메�카</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>암만</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>�쿄</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>나�로비</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>비슈케�</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>프놈펜</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>엔�베리</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>키리티마티</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>타�와</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>코모로</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>세�트 키츠</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>�양</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>서울</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>쿠웨�트</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>카�만</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>아�타우</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>오랄</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>악토브</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>키질로르다</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>알마티</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>비엔티안</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>베�루트</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>세�트 루시아</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>파�츠</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>콜롬보</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>몬로비아</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>마세루</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>빌니우스</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>룩셈부르�</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>리가</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>트리�리</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>카사블랑카</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>모나코</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>키시나우</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>안타나나리보</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>콰잘렌</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>마주로</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>바마코</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>ëž‘êµ°</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>호브드</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>울란바토르</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>초�발산</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>마카오</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>사��</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>마티니�</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>누악쇼트</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>몬세�</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>몰타</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>모리셔스</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>몰디브</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>블랜타�어</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>티후아나</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>�르모시요</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>마사틀란</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>치와와</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>몬테레�</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>멕시코 시티</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>메리다</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>칸쿤</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>쿠알�룸푸르</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>ì¿ ì¹­</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>마푸토</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>빈트후�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>누메아</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>니아메</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>노�</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>�고스</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>마나과</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>암스텔담</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>오슬로</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>카트만�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>나우루</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>니우�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>채텀</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>오�랜드</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>무스카트</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>파나마</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>리마</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>타히티</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>마퀘사스</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>�비어</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>�트모르즈비</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>마��</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>카�치</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>바르샤바</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>미퀠론</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>피트카�른</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>푸�르토리코</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>가�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>아조레스</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>마���</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>리스본</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>팔�우</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>아순시온</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>카타르</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>불령 리유니온</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>부쿠레슈티</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>칼리닌그�드</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>모스�바</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>볼고그�트</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>사마�</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>예카테린부르�</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>옴스�</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>노보시비르스�</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>��스노야르스�</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>�르쿠츠�</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>야쿠츠�</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>블�디보스토�</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>사할린</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>마가단</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>캄차카</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>아나디리</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>키갈리</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>리야드</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>과달카날</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>마헤</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>카르툼</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>스톡홀름</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>싱가�르</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>세�트 헬레나</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>프리타운</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>다카르</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>모가디슈</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>파�마리보</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>사오 투메</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>엘살바�르</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>다마스쿠스</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>�바바네</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>그랜드 터�</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>엔�메나</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>케르켈렌</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>로메</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>방콕</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>�샨베</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>파카오푸</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>딜리</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>아쉬가바트</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>튀니스</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>통가타푸</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>�스탄불</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>�트오브스페�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>푸나푸티</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>타�베�</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>다르�스살람</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>우주고로트</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>키예프</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>심페로�</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>��로지예</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>캄팔�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>미드웨�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>존스톤</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>웨��</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>��닥</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>놈</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>호놀룰루</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>앵커리지</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>야쿠타트</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>주노</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>로스앤젤레스</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>보�시</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>피닉스</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>십�</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>�버</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>노스 다코타주, 뉴살렘</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>중부, 노스다코타</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>시카고</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>메노미니</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>�디아나주, 뱅센</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>�디애나주, 피츠버그</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>�디아나주, 텔시티</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�디애나주 녹스</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>�디아나주, 워너맥</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>�디애나주, 마�고</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>�디애나�리스</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>루�빌</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>��로제</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>켄터키주, 몬티첼로</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>디트로�트</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>뉴욕</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>몬테비�오</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>사마르칸트</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>타슈켄트</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>세�트 빈센트</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>카�카스</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>토르톨�</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>세�트 토마스</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>사�공</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>�파테</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>월리스</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>아피아</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>아�</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>메요트</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>요하네스버그</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>루사카</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>하�레</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>아�레 표준시</standard>
-					<daylight>아�레 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>ACT (아�레)</standard>
-					<daylight>ACST (아�레)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>중앙아프리카 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>�아프리카 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>남아프리카 시간</generic>
-					<standard>남아프리카 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>서아프리카 시간</standard>
-					<daylight>서아프리카 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<standard>알래스카 표준시</standard>
-					<daylight>알래스카 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>아마존 표준시</standard>
-					<daylight>아마존 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>중부 표준시</generic>
-					<standard>중부 표준시</standard>
-					<daylight>미 중부 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>�부 표준시</generic>
-					<standard>�부 표준시</standard>
-					<daylight>미 �부 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>산지 표준시</generic>
-					<standard>산악 표준시</standard>
-					<daylight>미 산지 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>태�양 표준시</generic>
-					<standard>태�양 표준시</standard>
-					<daylight>미 태�양 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (아�타우)</standard>
-					<daylight>AQTST (아�타우)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (악퇴베)</standard>
-					<daylight>AQTST (악퇴베)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>아�비아 시간</generic>
-					<standard>아�비아 표준시</standard>
-					<daylight>아�비아 하계 표준시</daylight>
-				</long>
-				<short>
-					<generic>AT(아�비아)</generic>
-					<standard>AST(아�비아)</standard>
-					<daylight>ADT(아�비아)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>대서양 표준시</generic>
-					<standard>대서양 표준시</standard>
-					<daylight>미 대서양 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>중앙 오스트레�리아 시간</generic>
-					<standard>오스트레�리아 중부 표준시</standard>
-					<daylight>오스트레�리아 중부 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>오스트레�리아 중서부 시간</generic>
-					<standard>오스트레�리아 중서부 표준시</standard>
-					<daylight>오스트레�리아 중서부 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>�부 오스트레�리아 시간</generic>
-					<standard>오스트레�리아 �부 표준시</standard>
-					<daylight>오스트레�리아 �부 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>서부 오스트레�리아 시간</generic>
-					<standard>오스트레�리아 서부 표준시</standard>
-					<daylight>오스트레�리아 서부 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>아조레스 표준시</standard>
-					<daylight>아조레스 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<short>
-					<standard>BST (베�)</standard>
-					<daylight>BDT (베�)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>브�질리아 표준시</standard>
-					<daylight>브�질리아 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>카보 베르� 표준시</standard>
-					<daylight>카보 베르� 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>차모로 시간</generic>
-					<standard>차모로 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>채텀 표준시</standard>
-					<daylight>채텀 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>중국 표준시</standard>
-					<daylight>중국 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>CST (중국)</standard>
-					<daylight>CDT (중국)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>�리스마스섬 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>코코스섬 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>쿡제� 표준시</standard>
-					<daylight>쿡제� 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<short>
-					<standard>CST (ì¿ ë°”)</standard>
-					<daylight>CDT (ì¿ ë°”)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>��비스 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>뒤몽 뒤르빌 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>�스터섬 표준시</standard>
-					<daylight>�스터섬 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>중부유럽 표준시</standard>
-					<daylight>중부유럽 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>�부유럽 표준시</standard>
-					<daylight>�부유럽 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>서부 유럽 시간</standard>
-					<daylight>서부 유럽 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>��랜드 표준시</standard>
-					<daylight>��랜드 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>피지 표준시</standard>
-					<daylight>피지 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>프랑스령 남쪽�민지 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>갈�파고스 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>그리니치 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<short>
-					<standard>GST (괌)</standard>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>�콩 시간</standard>
-					<daylight>�콩 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>�� 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>�국령 ��양 �민지 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>��차�나 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>중앙��네시아 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>���네시아 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>서��네시아 시간</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>�스�엘 표준시</standard>
-					<daylight>�스�엘 하계 표준시</daylight>
-				</long>
-				<short>
-					<standard>IST (�스�엘)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>�본 표준시</standard>
-					<daylight>�본 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<standard>한국 표준시</standard>
-					<daylight>한국 하계 표준시</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>로드 하우 시간</generic>
-					<standard>로드 하우 표준시</standard>
-					<daylight>로드 하우 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>몰디브 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>모리셔스 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>모슨 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>모스�바 표준시</standard>
-					<daylight>모스�바 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>뉴질랜드 시간</generic>
-					<standard>뉴질랜드 표준시</standard>
-					<daylight>뉴질랜드 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>뉴펀들랜드 표준시</standard>
-					<daylight>뉴펀들랜드 하계 표준시</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>리유니온 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>로�� 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (사마르칸트)</standard>
-					<daylight>SAMST (사마르칸트)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>세�셸 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>사우스 조지아 표준시</standard>
-				</long>
-				<short>
-					<standard>GST (사우스 조지아)</standard>
-				</short>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>쇼와 표준시</standard>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>보스토� 표준시</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>안�� 페세타</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>아��미리트 디르함</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>아프가니 (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>아프가니</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>알바니아 레�</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>아르메니아 드람</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>네�란드령 안틸레스 길�</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>앙골� 콴�</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>앙골� 콴� (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>앙골� 신콴� (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>앙골� 콴� Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>아르헨티나 오스트랄</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>아르헨티나 페소 (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>아르헨티나 페소</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>호주 실�</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>호주 달러</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>아루바 길�</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>아제르바�젠 마나트(1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>아제르바�잔 마나트</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>보스니아-헤르체고비나 디나르</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>보스니아-헤르체고비나 태환 마르�</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>바베��스 달러</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>방글��시 타카</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>벨기� 프랑 (태환)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>벨기� 프랑</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>벨기� 프랑 (금융)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>불가리아 �전 렛</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>불가리아 신권 렛</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>바레� 디나르</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>부룬디 프랑</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>버뮤다 달러</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>부루나� 달러</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>볼리비아노</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>볼리비아노 페소</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>볼리비아노 Mvdol(기금)</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>볼리비아노 �루제�루 노보 (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>브�질 �루��</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>브�질 �루제�루 (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>브�질 레알</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>브�질 �루�� 노보</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>브�질 �루제�루</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>바하마 달러</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>부탄 눌투눔</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>버마 차트</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>보츠와나 ��</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>벨�루스 신권 루블 (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>벨�루스 루블</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>벨리즈 달러</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>�나다 달러</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>콩고 프랑 콩골�스</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR 유로</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>스위스 프랑</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR 프랑</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>ì¹ ë ˆ UF (Unidades de Fomento)</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>칠레 페소</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>중국 위안 �민�</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>콜롬비아 페소</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>UVR (Unidad de Valor Real)</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>코스타리카 콜론</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>고 세르비아 디나르</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>체코슬로바키아 �전 코루나</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>쿠바 페소</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>카보베르� �스쿠�</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>싸�프러스 파운드</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>체코 공화국 코루나</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>�� 오스트마르�</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>�� 마르�</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>지부티 프랑</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>�마� �로네</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>�미니카 페소</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>알제리 디나르</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>�쿠아�르 수�레</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>�콰�르 UVC(Unidad de Valor Constante)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>�스토니아 �룬</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>�집트 파운드</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�리트리아 나�파</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>스페� 페세타(예금)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>스페� 페세타(변환 예금)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>스페� 페세타</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>�디오피아 비르</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>유로화</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>핀란드 마르카</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>피지 달러</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>��랜드제� 파운드</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>프랑스 프랑</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>�국령 파운드 스털�</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>그루지야 지� �리트</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>그루지야 �리</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>가나 시디 (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>가나 시디</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>지브롤터 파운드</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>�비아 달�시</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>기니 프랑</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>기니 시리</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>�� 기니 �쿨 (Ekwele)</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>그리스 드��마</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>과테�� 케트살</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>�르투갈령 기니 �스쿠�</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>기네비� 페소</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>가�아나 달러</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>�콩 달러</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>온��스 렘피�</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>�로아티아 디나르</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>�로아티아 쿠나</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>하�티 구르드</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>�가리 �린트</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>��네시아 루피아</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>아�랜드 파운드</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>�스�엘 파운드</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>�스�엘 신권 세켈</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>�� 루피</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>��� 디나르</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>�란 리얄</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>아�슬란드 �로나</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>�탈리아 리�</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>�메�카 달러</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>요르단 디나르</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>�본 엔화</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>케� 실�</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>키르기스스탄 솜</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>캄보디아 리얄</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>코모르 프랑</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>조선 민주주� �민 공화국 �</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>대한민국 �</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>쿠웨�트 디나르</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>케�맨 제� 달러</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>카��스탄 �게</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>�오스 키프</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>레바논 파운드</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>스리랑카 루피</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>��베리아 달러</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>레소토 로티</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>리투아니아 리타</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>룩셈부르� 타로나</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>룩셈부르� 변환 프랑</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>룩셈부르� 프랑</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>룩셈부르� 재정 프랑</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>�트비아 �트</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>�트비아 루블</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>리비아 디나르</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>모로코 디렘</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>모로코 프랑</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>몰�바 레�</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>마다가스카르 아리아리</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>마다가스카르 프랑</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>마케�니아 디나르</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>�리 프랑</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>미얀마 키�</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>몽골 투그릭</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>마카오 파타카</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>모리타니 우기야</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>몰타 리�</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>몰타 파운드</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>모리셔스 루피</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>몰디브 제� 루피아</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>��위 콰�</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>멕시코 페소</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>멕시코 실버 페소 (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>멕시코 UDI(Unidad de Inversion)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>�레�시아 �깃</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>모잠비� �스쿠�</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>고 모잠비� 메티칼</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>모잠비� 메티칼</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>나미비아 달러</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>니제르 나��</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>니카�과 코르�바</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>니카�과 코르�바 오로</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>네�란드 길�</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>노르웨� �로네</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>네팔 루피</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>뉴질랜드 달러</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>오만 리얄</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>파나마 발보아</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>페루 �티</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>페루 솔 누�보</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>페루 솔</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>파푸아뉴기니 키나</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>필리핀 페소</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>파키스탄 루피</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>�란드 �로티</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>�란드 �로티 (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>�르투갈 �스쿠�</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>파�과� 과�니</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>카타르 리얄</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>로디지아 달러</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>루마니아 레�</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>루마니아 레우</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>세르비아 디나르</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>러시아 루블</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>러시아 루블 (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>르완다 프랑</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>사우디아�비아 리얄</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>솔로몬 제� 달러</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>세�쉴 루피</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>수단 디나르</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>수단 파운드</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>고 수단 파운드</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>스웨� �로나</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>싱가� 달러</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>세�트헬레나 파운드</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>슬로베니아 톨�르</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>슬로바키아 코루나</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>시��리온 리온</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>소�리아 실�</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>수리남 달러</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>수리남 길�</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>�투메 프린시페 �브�</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>소련 루블</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>엘살바�르 콜론</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>시리아 파운드</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>스와질란드 릴랑게니</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>태국 바트</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>타지키스탄 루블</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>타지키스탄 소모니</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>투르�메니스탄 마나트</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>튀니지 디나르</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>통가 파앙가</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>티모르 �스쿠�</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>터키 리�</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>신 터키 리�</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>트리니다드 토바고 달러</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>대만 신권 달러</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>탄�니아 실�</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>우���나 그리브나</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>우���나 카보바네츠</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>우간다 실� (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>우간다 실�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>미국 달러</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>미국 달러(다�날)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>미국 달러(당�)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>우루과� 페소 UI (Unidades Indexadas)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>우루과� 페소 (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>우루과� 페소 우루과요</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>우즈베키스탄 숨</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>베네주엘� 볼리바르</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>베네주엘� 볼리바르 푸�르떼</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>베트남 �</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>바누아투 바투</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>서 사모아 탈�</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA 프랑 BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>�화</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>금</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>유르코 (유럽 회계 단위)</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>유럽 통화 �맹</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>유럽 계산 단위 (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>유럽 계산 단위 (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>�카리브 달러</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>특별�출권</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>유럽 환율 단위</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>프랑스 Gold 프랑</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>프랑스 UIC-프랑</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA 프랑 BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>팔��</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP 프랑</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>백금</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET 기금</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>테스트 통화 코드</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>알수없거나 유효하지않� 통화단위</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>예멘 디나르</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>예멘 리알</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>유고슬�비아 �전 디나르</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>유고슬�비아 노비 디나르</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>유고슬�비아 전환 디나르</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>남아프리카 랜드 (금융)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>남아프리카 랜드</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>쟘비아 콰�</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>��르 신권 ��르</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>��르 ��르</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>�바브웨 달러</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0}�</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0}시간</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0}분</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0}개월</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0}ì´ˆ</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0}주</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0}ë…„</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>예</yesstr>
-			<nostr>아니오</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ko_KR.xml b/airtime_mvc/library/Zend/Locale/Data/ko_KR.xml
deleted file mode 100644
index 7a5bbbb31..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ko_KR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ko"/>
-		<territory type="KR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kok.xml b/airtime_mvc/library/Zend/Locale/Data/kok.xml
deleted file mode 100644
index 1a2e5bdd2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kok.xml
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.65 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="kok"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">अफार</language>
-			<language type="ab">अबखेज़ियन</language>
-			<language type="af">अफ�रिकान�स</language>
-			<language type="am">अमहारिक�</language>
-			<language type="ar">अरेबिक�</language>
-			<language type="as">असामी</language>
-			<language type="ay">�मरा</language>
-			<language type="az">अज़रबैजानी</language>
-			<language type="ba">बष�किर</language>
-			<language type="be">बैलोर�सियन�</language>
-			<language type="bg">बल�गेरियन</language>
-			<language type="bh">बीहारी</language>
-			<language type="bi">बिसलमा</language>
-			<language type="bn">बंगाली</language>
-			<language type="bo">तिबेतियन</language>
-			<language type="br">ब�रेटन</language>
-			<language type="ca">कटलान</language>
-			<language type="co">कोर�शियन</language>
-			<language type="cs">ज़ेक�</language>
-			<language type="cy">वेळ�ष�</language>
-			<language type="da">डानिष</language>
-			<language type="de">जर�मन</language>
-			<language type="dz">भूटानी</language>
-			<language type="el">ग�रीक�</language>
-			<language type="en">आंग�ल</language>
-			<language type="eo">इस�परान�टो</language>
-			<language type="es">स�पानिष</language>
-			<language type="et">इस�टोनियन�</language>
-			<language type="eu">बास�क</language>
-			<language type="fa">पर�षियन�</language>
-			<language type="fi">फिन�निष�</language>
-			<language type="fj">फिजी</language>
-			<language type="fo">फेरोस�</language>
-			<language type="fr">फ�रेन�च</language>
-			<language type="fy">फ�रिशियन�</language>
-			<language type="ga">�रिष</language>
-			<language type="gd">स�काटस� गेलिक�</language>
-			<language type="gl">गेलीशियन</language>
-			<language type="gn">गौरानी</language>
-			<language type="gu">ग�जराती</language>
-			<language type="ha">हौसा</language>
-			<language type="he">हेब�र�</language>
-			<language type="hi">हिन�दी</language>
-			<language type="hr">क�रोयेषियन�</language>
-			<language type="hu">हंगेरियन�</language>
-			<language type="hy">आर�मीनियन�</language>
-			<language type="ia">इन�टरलिंग�वा</language>
-			<language type="id">इन�डोनेषियन</language>
-			<language type="ie">इन�टरलिंग�</language>
-			<language type="ik">इनूपेयाक�</language>
-			<language type="is">आईस�लान�डिक</language>
-			<language type="it">इटालियन</language>
-			<language type="iu">इन�य�कट�ट</language>
-			<language type="ja">जापनीस�</language>
-			<language type="jv">जावनीस�</language>
-			<language type="ka">जार�जियन�</language>
-			<language type="kk">कज़ख�</language>
-			<language type="kl">ग�रीनलान�डिक</language>
-			<language type="km">कंबोडियन</language>
-			<language type="kn">कन�नडा</language>
-			<language type="ko">कोरियन�</language>
-			<language type="kok">कोंकणी</language>
-			<language type="ks">कश�मीरी</language>
-			<language type="ku">क�र�दिष</language>
-			<language type="ky">किर�गिज़</language>
-			<language type="la">लाटिन</language>
-			<language type="ln">लिंगाला</language>
-			<language type="lo">लाओतियन�</language>
-			<language type="lt">लिथ�आनियन�</language>
-			<language type="lv">लाट�वियन� (लेट�टिष�)</language>
-			<language type="mg">मलागसी</language>
-			<language type="mi">माओरी</language>
-			<language type="mk">मसीडोनियन�</language>
-			<language type="ml">मळियाळम</language>
-			<language type="mn">मंगोलियन�</language>
-			<language type="mo">मोल�डावियन�</language>
-			<language type="mr">मराठी</language>
-			<language type="ms">मलय</language>
-			<language type="mt">मालतीस�</language>
-			<language type="my">बर�मीज़�</language>
-			<language type="na">नौरो</language>
-			<language type="ne">नेपाळी</language>
-			<language type="nl">डच�</language>
-			<language type="no">नोर�वेजियन</language>
-			<language type="oc">ओसिटान�</language>
-			<language type="om">ओरोमो (अफान)</language>
-			<language type="or">ओरिया</language>
-			<language type="pa">पंजाबी</language>
-			<language type="pl">पोलिष</language>
-			<language type="ps">पाष�टो (प�ष�टो)</language>
-			<language type="pt">पोर�च�गीज़�</language>
-			<language type="qu">क�वेच�वा</language>
-			<language type="rm">रहटो-रोमान�स�</language>
-			<language type="rn">किर�न�दी</language>
-			<language type="ro">रोमानियन�</language>
-			<language type="ru">रष�यन�</language>
-			<language type="rw">किन�यार�वान�डा</language>
-			<language type="sa">संस�कृत</language>
-			<language type="sd">सिंधी</language>
-			<language type="sg">सांग�रो</language>
-			<language type="sh">सेर�बो-क�रोयेषियन�</language>
-			<language type="si">सिन�हलीस�</language>
-			<language type="sk">स�लोवाक</language>
-			<language type="sl">स�लोवेनियन�</language>
-			<language type="sm">समोन</language>
-			<language type="sn">शोना</language>
-			<language type="so">सोमाळी</language>
-			<language type="sq">आल�बेनियन�</language>
-			<language type="sr">सेर�बियन�</language>
-			<language type="ss">सिस�वाती</language>
-			<language type="st">सेसोथो</language>
-			<language type="su">स�ंदनीस</language>
-			<language type="sv">स�वीदीष</language>
-			<language type="sw">स�वाहिली</language>
-			<language type="ta">तमिळ</language>
-			<language type="te">तेल�गू</language>
-			<language type="tg">तजिक</language>
-			<language type="th">थाई</language>
-			<language type="ti">तिग�रिन�या</language>
-			<language type="tk">त�र�कमन</language>
-			<language type="tl">तगालोग</language>
-			<language type="tn">सेत�स�वाना</language>
-			<language type="to">तोंगा</language>
-			<language type="tr">त�र�किष</language>
-			<language type="ts">त�सोगा</language>
-			<language type="tt">तटार</language>
-			<language type="tw">त�वि</language>
-			<language type="ug">उधूर</language>
-			<language type="uk">य�क�रेनियन�</language>
-			<language type="ur">उर�दू</language>
-			<language type="uz">उज़बेक</language>
-			<language type="vi">वियत�नामीज़</language>
-			<language type="vo">ओलाप�क</language>
-			<language type="wo">उलोफ़</language>
-			<language type="xh">�़ौसा</language>
-			<language type="yi">इद�दिष�</language>
-			<language type="yo">यूर�बा</language>
-			<language type="za">��ह�न�ग</language>
-			<language type="zh">चीनीस�</language>
-			<language type="zu">ज�लू</language>
-		</languages>
-		<territories>
-			<territory type="IN">भारत</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[़ �-ः ०-९ � अ-� �-ऑ ओ-क {क़} ख {ख़} ग {ग़} घ-ज {ज़} �-ड {ड़} ढ {ढ़} ण-न प फ {फ़} ब-य {य़} र ल ळ व-ह ऽ-ॅ े-ॉ ो-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">जानेवारी</month>
-							<month type="2">फेबृवारी</month>
-							<month type="3">मार�च</month>
-							<month type="4">�प�रिल</month>
-							<month type="5">मे</month>
-							<month type="6">जून</month>
-							<month type="7">ज�लै</month>
-							<month type="8">ओगस�ट</month>
-							<month type="9">सेप�टेंबर</month>
-							<month type="10">ओक�टोबर</month>
-							<month type="11">नोव�हेंबर</month>
-							<month type="12">डिसेंबर</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">जानेवारी</month>
-							<month type="2">फेब�र�वारी</month>
-							<month type="3">मार�च</month>
-							<month type="4">�प�रिल</month>
-							<month type="5">मे</month>
-							<month type="6">जून</month>
-							<month type="7">ज�लै</month>
-							<month type="8">ओगस�ट</month>
-							<month type="9">सेप�टेंबर</month>
-							<month type="10">ओक�टोबर</month>
-							<month type="11">नोव�हेंबर</month>
-							<month type="12">डिसेंबर</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">रवि</day>
-							<day type="mon">सोम</day>
-							<day type="tue">मंगळ</day>
-							<day type="wed">ब�ध</day>
-							<day type="thu">ग�र�</day>
-							<day type="fri">श�क�र</day>
-							<day type="sat">शनि</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">आदित�यवार</day>
-							<day type="mon">सोमवार</day>
-							<day type="tue">मंगळार</day>
-							<day type="wed">ब�धवार</day>
-							<day type="thu">ग�र�वार</day>
-							<day type="fri">श�क�रवार</day>
-							<day type="sat">शनिवार</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>म.पू.</am>
-				<pm>म.नं.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">क�रिस�तपूर�व</era>
-						<era type="1">क�रिस�तशखा</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<metazone type="India">
-				<long>
-					<standard>भारतीय समय</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>र�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kok_IN.xml b/airtime_mvc/library/Zend/Locale/Data/kok_IN.xml
deleted file mode 100644
index 3d40f02fb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kok_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kok"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kpe.xml b/airtime_mvc/library/Zend/Locale/Data/kpe.xml
deleted file mode 100644
index d3921b233..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kpe.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.28 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kpe"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a b ɓ d e ə ɛ f g � {gb} {gw} ɣ h-k {kp} {kw} l-n {ny} ɲ ŋ {ŋw} o ɔ p t-w y z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="LRD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kpe_GN.xml b/airtime_mvc/library/Zend/Locale/Data/kpe_GN.xml
deleted file mode 100644
index 50bad7646..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kpe_GN.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kpe"/>
-		<territory type="GN"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="LRD">
-				<symbol>L$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kpe_LR.xml b/airtime_mvc/library/Zend/Locale/Data/kpe_LR.xml
deleted file mode 100644
index 219479eb4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kpe_LR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kpe"/>
-		<territory type="LR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku.xml b/airtime_mvc/library/Zend/Locale/Data/ku.xml
deleted file mode 100644
index 341670f11..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.25 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">ئه‌�ریكای</language>
-			<language type="am">ئه‌مهه‌رینجی</language>
-			<language type="ar">عه‌ره‌بی</language>
-			<language type="as">ئا سسامی (زوبان)</language>
-			<language type="az">ئازه‌ربایجانی</language>
-			<language type="be">بێلاڕووسی</language>
-			<language type="bg">بۆلگاری</language>
-			<language type="bh">بیهاری</language>
-			<language type="bn">به‌نگلادێشی</language>
-			<language type="br">برێتونی</language>
-			<language type="bs">بۆسنی</language>
-			<language type="ca">كاتالۆنی</language>
-			<language type="cs">چه‌كی</language>
-			<language type="cy">وێلزی</language>
-			<language type="da">دانماركی</language>
-			<language type="de">ئاڵمانی</language>
-			<language type="el">یۆنانی</language>
-			<language type="en">ئینگلیزی</language>
-			<language type="eo">ئێسپیرانتۆ</language>
-			<language type="es">ئیسپانی</language>
-			<language type="et">ئیستۆنی</language>
-			<language type="eu">باسكی</language>
-			<language type="fa">�ارسی</language>
-			<language type="fi">�ینله‌ندی</language>
-			<language type="fil">تاگالۆگی</language>
-			<language type="fo">�ه‌رئۆیی</language>
-			<language type="fr">�ه‌رانسی</language>
-			<language type="fy">�ریسی</language>
-			<language type="ga">ئیرله‌ندی</language>
-			<language type="gd">گه‌لیكی سكۆتله‌ندی</language>
-			<language type="gl">گالیسی</language>
-			<language type="gn">گووارانی</language>
-			<language type="gu">گوجاراتی</language>
-			<language type="he">هیبرێ</language>
-			<language type="hi">هیندی</language>
-			<language type="hr">كرواتی</language>
-			<language type="hu">هه‌نگاری (مه‌جاری)</language>
-			<language type="hy">ئه رمه نی</language>
-			<language type="ia">ئینترلینگوی</language>
-			<language type="id">ئێه‌ندونیزی</language>
-			<language type="ie">ئه نته ر لينگ (زوبان)</language>
-			<language type="is">ئیسله‌ندی</language>
-			<language type="it">ئیتالی</language>
-			<language type="ja">ژاپۆنی</language>
-			<language type="jv">جاڤانی</language>
-			<language type="ka">گۆرجستانی</language>
-			<language type="km">کامبۆجی (زوبان)</language>
-			<language type="kn">كه‌نه‌دایی</language>
-			<language type="ko">كۆری</language>
-			<language type="ku">كوردی</language>
-			<language type="ky">كرگیزی</language>
-			<language type="la">لاتینی</language>
-			<language type="ln">لينگالا</language>
-			<language type="lo">لاو�ى</language>
-			<language type="lt">لیتوانی</language>
-			<language type="lv">لێتۆنی</language>
-			<language type="mk">ماكێدۆنی</language>
-			<language type="ml">مالایلام</language>
-			<language type="mn">مه‌نگۆلی</language>
-			<language type="mr">ماراتی</language>
-			<language type="ms">مالیزی</language>
-			<language type="mt">ماڵتایی</language>
-			<language type="ne">نێپالی</language>
-			<language type="nl">هۆڵه‌ندی</language>
-			<language type="no">نۆروێژی</language>
-			<language type="oc">ئۆسیتانی</language>
-			<language type="or">ئۆرییا</language>
-			<language type="pa">په‌نجابی</language>
-			<language type="pl">پۆڵۆنیایی (له‌هستانی)</language>
-			<language type="ps">په‌شتوو</language>
-			<language type="pt">پۆرتۆگالی</language>
-			<language type="pt_BR">پورتوگاڵی (برازیل)</language>
-			<language type="pt_PT">پورتوگاڵی (پورتوگاڵ)</language>
-			<language type="ro">ڕۆمانی</language>
-			<language type="ru">ڕووسی</language>
-			<language type="sa">سانسکريت</language>
-			<language type="sd">سيندی(زوبان)</language>
-			<language type="sh">سێربۆكرواتی</language>
-			<language type="si">سینهه‌لی</language>
-			<language type="sk">سلۆڤاكی</language>
-			<language type="sl">سلۆڤێنی</language>
-			<language type="so">سۆمالی</language>
-			<language type="sq">ئاڵبانی</language>
-			<language type="sr">سه‌ربی</language>
-			<language type="st">سێسۆتۆ</language>
-			<language type="su">سودانی</language>
-			<language type="sv">سویدی</language>
-			<language type="sw">سواهیلی</language>
-			<language type="ta">تامیلی</language>
-			<language type="te">ته‌لۆگوی</language>
-			<language type="th">تایله‌ندی</language>
-			<language type="ti">تیگرینیای</language>
-			<language type="tk">تروكمانی</language>
-			<language type="tlh">كلینگۆن</language>
-			<language type="tr">توركی</language>
-			<language type="tw">توی</language>
-			<language type="ug">ئويخووری</language>
-			<language type="uk">ئۆكراینی</language>
-			<language type="ur">ئۆردو‌و</language>
-			<language type="uz">ئۆزبه‌كی</language>
-			<language type="vi">ڤیه‌تنامی</language>
-			<language type="xh">سسوسا</language>
-			<language type="yi">یوددی</language>
-			<language type="zu">زولو</language>
-		</languages>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[ئ-ب پ ت ج چ ح-د ر ز ڕ ژ س ش ع غ � ڤ ق ک گ ل ڵ م-ه ھ و ۆ ی ێ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u064B-\u0652 ء-ة ث ذ ص-ظ ك ى ي]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">یەکشەممە</day>
-							<day type="mon">دووشەممە</day>
-							<day type="tue">سێشەممە</day>
-							<day type="wed">چوارشەممە</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">یەکشەممە</day>
-							<day type="mon">دووشەممە</day>
-							<day type="tue">سێشەممە</day>
-							<day type="wed">چوارشەممە</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ی</day>
-							<day type="mon">د</day>
-							<day type="tue">س</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Arab.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Arab.xml
deleted file mode 100644
index a96062cc1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Arab.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<script type="Arab"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IQ.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IQ.xml
deleted file mode 100644
index ac474a984..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IQ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<script type="Arab"/>
-		<territory type="IQ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IR.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IR.xml
deleted file mode 100644
index 725990578..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_IR.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<script type="Arab"/>
-		<territory type="IR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_SY.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Arab_SY.xml
deleted file mode 100644
index 0d76f7283..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Arab_SY.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<script type="Arab"/>
-		<territory type="SY"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_IQ.xml b/airtime_mvc/library/Zend/Locale/Data/ku_IQ.xml
deleted file mode 100644
index deaa6f5ac..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_IQ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<territory type="IQ"/>
-	</identity>
-	<alias source="ku_Arab_IQ" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_IR.xml b/airtime_mvc/library/Zend/Locale/Data/ku_IR.xml
deleted file mode 100644
index 8c8752ebe..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_IR.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<territory type="IR"/>
-	</identity>
-	<alias source="ku_Arab_IR" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Latn.xml
deleted file mode 100644
index e945b42c1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Latn.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.20 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ku"/>
-		<script type="Latn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">erebî</language>
-			<language type="en">îngilîzî</language>
-			<language type="ja">japonî</language>
-			<language type="ku">kurdî</language>
-		</languages>
-		<scripts>
-			<script type="Arab">erebî</script>
-		</scripts>
-		<territories>
-			<territory type="001">Cîhan</territory>
-			<territory type="TR">Tirkiye</territory>
-		</territories>
-		<keys>
-			<key type="calendar">salname</key>
-			<key type="collation">rêzkirin</key>
-		</keys>
-		<types>
-			<type type="gregorian" key="calendar">mîladî</type>
-			<type type="islamic" key="calendar">hîcrî</type>
-		</types>
-	</localeDisplayNames>
-	<layout>
-		<orientation/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a-c ç d e ê f-i î j-s ş t u û v-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">çil</month>
-							<month type="2">sib</month>
-							<month type="3">adr</month>
-							<month type="4">nîs</month>
-							<month type="5">gul</month>
-							<month type="6">hez</month>
-							<month type="7">tîr</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">çile</month>
-							<month type="2">sibat</month>
-							<month type="3">adar</month>
-							<month type="4">nîsan</month>
-							<month type="5">gulan</month>
-							<month type="6">hezîran</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ç</month>
-							<month type="2">s</month>
-							<month type="3">a</month>
-							<month type="4">n</month>
-							<month type="5">g</month>
-							<month type="6">h</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">yÅŸ</day>
-							<day type="mon">dÅŸ</day>
-							<day type="tue">sÅŸ</day>
-							<day type="wed">çş</day>
-							<day type="thu">pÅŸ</day>
-							<day type="fri">în</day>
-							<day type="sat">ÅŸ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">yekÅŸem</day>
-							<day type="mon">duÅŸem</day>
-							<day type="tue">şê</day>
-							<day type="wed">çarşem</day>
-							<day type="thu">pêncşem</day>
-							<day type="fri">în</day>
-							<day type="sat">şemî</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">y</day>
-							<day type="mon">d</day>
-							<day type="tue">s</day>
-							<day type="wed">ç</day>
-							<day type="thu">p</day>
-							<day type="fri">î</day>
-							<day type="sat">ÅŸ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Ç1</quarter>
-							<quarter type="2">Ç2</quarter>
-							<quarter type="3">Ç3</quarter>
-							<quarter type="4">Ç4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Ç1</quarter>
-							<quarter type="2">Ç2</quarter>
-							<quarter type="3">Ç3</quarter>
-							<quarter type="4">Ç4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>BN</am>
-				<pm>PN</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BZ</era>
-						<era type="1">PZ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<fields>
-					<field type="year">
-						<displayName>sal</displayName>
-					</field>
-					<field type="month">
-						<displayName>meh</displayName>
-					</field>
-					<field type="week">
-						<displayName>hefte</displayName>
-					</field>
-					<field type="day">
-						<displayName>roj</displayName>
-					</field>
-					<field type="hour">
-						<displayName>demjimêr</displayName>
-					</field>
-					<field type="minute">
-						<displayName>xulek</displayName>
-					</field>
-					<field type="second">
-						<displayName>çirke</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">muẖerem</month>
-							<month type="2">sefer</month>
-							<month type="3">rebîʿulewel</month>
-							<month type="4">rebîʿulaxer</month>
-							<month type="5">cemazîyelewel</month>
-							<month type="6">cemazîyelaxer</month>
-							<month type="7">receb</month>
-							<month type="8">şeʿban</month>
-							<month type="9">remezan</month>
-							<month type="10">ÅŸewal</month>
-							<month type="11">zîlqeʿde</month>
-							<month type="12">zîlẖece</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<posix>
-		<messages>
-			<yesstr>erê:e</yesstr>
-			<nostr>na:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_Latn_TR.xml b/airtime_mvc/library/Zend/Locale/Data/ku_Latn_TR.xml
deleted file mode 100644
index 5d2a227af..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_Latn_TR.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.12 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<script type="Latn"/>
-		<territory type="TR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_SY.xml b/airtime_mvc/library/Zend/Locale/Data/ku_SY.xml
deleted file mode 100644
index 2c5a0091e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_SY.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<territory type="SY"/>
-	</identity>
-	<alias source="ku_Arab_SY" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ku_TR.xml b/airtime_mvc/library/Zend/Locale/Data/ku_TR.xml
deleted file mode 100644
index cea01888f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ku_TR.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ku"/>
-		<territory type="TR"/>
-	</identity>
-	<alias source="ku_Latn_TR" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/kw.xml b/airtime_mvc/library/Zend/Locale/Data/kw.xml
deleted file mode 100644
index 9d03b4d76..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kw.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.59 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="kw"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="kw">kernewek</language>
-		</languages>
-		<territories>
-			<territory type="GB">Rywvaneth Unys</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Gen</month>
-							<month type="2">Whe</month>
-							<month type="3">Mer</month>
-							<month type="4">Ebr</month>
-							<month type="5">Me</month>
-							<month type="6">Efn</month>
-							<month type="7">Gor</month>
-							<month type="8">Est</month>
-							<month type="9">Gwn</month>
-							<month type="10">Hed</month>
-							<month type="11">Du</month>
-							<month type="12">Kev</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Mys Genver</month>
-							<month type="2">Mys Whevrel</month>
-							<month type="3">Mys Merth</month>
-							<month type="4">Mys Ebrel</month>
-							<month type="5">Mys Me</month>
-							<month type="6">Mys Efan</month>
-							<month type="7">Mys Gortheren</month>
-							<month type="8">Mye Est</month>
-							<month type="9">Mys Gwyngala</month>
-							<month type="10">Mys Hedra</month>
-							<month type="11">Mys Du</month>
-							<month type="12">Mys Kevardhu</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sul</day>
-							<day type="mon">Lun</day>
-							<day type="tue">Mth</day>
-							<day type="wed">Mhr</day>
-							<day type="thu">Yow</day>
-							<day type="fri">Gwe</day>
-							<day type="sat">Sad</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">De Sul</day>
-							<day type="mon">De Lun</day>
-							<day type="tue">De Merth</day>
-							<day type="wed">De Merher</day>
-							<day type="thu">De Yow</day>
-							<day type="fri">De Gwener</day>
-							<day type="sat">De Sadorn</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>a.m.</am>
-				<pm>p.m.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">RC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/kw_GB.xml b/airtime_mvc/library/Zend/Locale/Data/kw_GB.xml
deleted file mode 100644
index e992c0a49..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/kw_GB.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="kw"/>
-		<territory type="GB"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ky.xml b/airtime_mvc/library/Zend/Locale/Data/ky.xml
deleted file mode 100644
index 228c22374..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ky.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.45 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ky"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">африкаанча</language>
-			<language type="ar">арабча</language>
-			<language type="az">азербайжанча</language>
-			<language type="be">белару�ча</language>
-			<language type="bg">болгари�ча</language>
-			<language type="bh">бихариче</language>
-			<language type="bn">бангладешче</language>
-			<language type="br">бретон</language>
-			<language type="bs">бо�ни�ча</language>
-			<language type="ca">каталанча</language>
-			<language type="cs">чех тили</language>
-			<language type="da">датча</language>
-			<language type="de">неми�че</language>
-			<language type="el">грекче</language>
-			<language type="en">англи�че</language>
-			<language type="es">и�панча</language>
-			<language type="et">��тончо</language>
-			<language type="fa">фарзча</language>
-			<language type="fi">финче</language>
-			<language type="fil">тагалча</language>
-			<language type="fr">французча</language>
-			<language type="ga">ирландча</language>
-			<language type="gn">гуараш</language>
-			<language type="gu">гужаратча</language>
-			<language type="he">еврейче</language>
-			<language type="hi">инду�ча</language>
-			<language type="hr">хорватча</language>
-			<language type="hu">венгри�ча</language>
-			<language type="id">индонези�ча</language>
-			<language type="is">и�ландча</language>
-			<language type="it">итали�нча</language>
-			<language type="ja">�пончо</language>
-			<language type="jv">жаванизче</language>
-			<language type="ka">грузинче</language>
-			<language type="kn">каннадача</language>
-			<language type="ko">корейче</language>
-			<language type="ku">курт</language>
-			<language type="ky">Кыргыз</language>
-			<language type="la">латынча</language>
-			<language type="lt">литвача</language>
-			<language type="lv">латви�ча</language>
-			<language type="mk">македони�ча</language>
-			<language type="ml">малайаламча</language>
-			<language type="mr">маратиче</language>
-			<language type="ms">малайча</language>
-			<language type="mt">малтизче</language>
-			<language type="ne">непалча</language>
-			<language type="nl">голландча</language>
-			<language type="nn">норвеги�ча</language>
-			<language type="no">норвежче</language>
-			<language type="or">ори�</language>
-			<language type="pa">пунжабиче</language>
-			<language type="pl">пол�кча</language>
-			<language type="ps">пашто</language>
-			<language type="pt">португалча</language>
-			<language type="ro">румыни�ча</language>
-			<language type="ru">ору�ча</language>
-			<language type="sh">�ерб-хорват</language>
-			<language type="si">�ингалача</language>
-			<language type="sk">�ловакча</language>
-			<language type="sl">�ловенче</language>
-			<language type="sq">албанча</language>
-			<language type="sr">�ербче</language>
-			<language type="st">�е�ото</language>
-			<language type="su">�унданча</language>
-			<language type="sv">шведче</language>
-			<language type="sw">�уахиличе</language>
-			<language type="ta">тамилче</language>
-			<language type="te">телугуча</language>
-			<language type="th">тайча</language>
-			<language type="tk">түркмөн</language>
-			<language type="tlh">клингончо</language>
-			<language type="tr">туркчо</language>
-			<language type="tw">тви</language>
-			<language type="uk">украинче</language>
-			<language type="ur">урдуча</language>
-			<language type="uz">озбекче</language>
-			<language type="vi">вьетнамча</language>
-			<language type="yi">еврей</language>
-			<language type="zh">кытайча</language>
-		</languages>
-		<territories>
-			<territory type="KG">Кыргыз�тан</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а б г-е ё ж-н ӊ о ө п-у ү х ч ш ъ ы �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[в ф ц щ ь]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencies>
-			<currency type="KGS">
-				<symbol>�ом</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ky_KG.xml b/airtime_mvc/library/Zend/Locale/Data/ky_KG.xml
deleted file mode 100644
index 9cf74f72a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ky_KG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ky"/>
-		<territory type="KG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/likelySubtags.xml b/airtime_mvc/library/Zend/Locale/Data/likelySubtags.xml
deleted file mode 100644
index fdfd07482..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/likelySubtags.xml
+++ /dev/null
@@ -1,462 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-    <version number="$Revision: 1.24 $"/>
-    <generation date="$Date: 2009/05/05 23:15:57 $"/>
-    <likelySubtags>
-      <likelySubtag from="aa" to="aa_Latn_ET"/>
-      <likelySubtag from="ab" to="ab_Cyrl_GE"/>
-      <likelySubtag from="ady" to="ady_Cyrl_RU"/>
-      <likelySubtag from="af" to="af_Latn_ZA"/>
-      <likelySubtag from="ak" to="ak_Latn_GH"/>
-      <likelySubtag from="am" to="am_Ethi_ET"/>
-      <likelySubtag from="ar" to="ar_Arab_EG"/>
-      <likelySubtag from="as" to="as_Beng_IN"/>
-      <likelySubtag from="ast" to="ast_Latn_ES"/>
-      <likelySubtag from="av" to="av_Cyrl_RU"/>
-      <likelySubtag from="ay" to="ay_Latn_BO"/>
-      <likelySubtag from="az" to="az_Latn_AZ"/>
-      <likelySubtag from="az_Arab" to="az_Arab_IR"/>
-      <likelySubtag from="az_IR" to="az_Arab_IR"/>
-      <likelySubtag from="ba" to="ba_Cyrl_RU"/>
-      <likelySubtag from="be" to="be_Cyrl_BY"/>
-      <likelySubtag from="bg" to="bg_Cyrl_BG"/>
-      <likelySubtag from="bi" to="bi_Latn_VU"/>
-      <likelySubtag from="bn" to="bn_Beng_BD"/>
-      <likelySubtag from="bo" to="bo_Tibt_CN"/>
-      <likelySubtag from="bs" to="bs_Latn_BA"/>
-      <likelySubtag from="ca" to="ca_Latn_ES"/>
-      <likelySubtag from="ce" to="ce_Cyrl_RU"/>
-      <likelySubtag from="ceb" to="ceb_Latn_PH"/>
-      <likelySubtag from="ch" to="ch_Latn_GU"/>
-      <likelySubtag from="chk" to="chk_Latn_FM"/>
-      <likelySubtag from="crk" to="crk_Cans_CA"/>
-      <likelySubtag from="cs" to="cs_Latn_CZ"/>
-      <likelySubtag from="cwd" to="cwd_Cans_CA"/>
-      <likelySubtag from="cy" to="cy_Latn_GB"/>
-      <likelySubtag from="da" to="da_Latn_DK"/>
-      <likelySubtag from="de" to="de_Latn_DE"/>
-      <likelySubtag from="dv" to="dv_Thaa_MV"/>
-      <likelySubtag from="dz" to="dz_Tibt_BT"/>
-      <likelySubtag from="ee" to="ee_Latn_GH"/>
-      <likelySubtag from="efi" to="efi_Latn_NG"/>
-      <likelySubtag from="el" to="el_Grek_GR"/>
-      <likelySubtag from="en" to="en_Latn_US"/>
-      <likelySubtag from="es" to="es_Latn_ES"/>
-      <likelySubtag from="et" to="et_Latn_EE"/>
-      <likelySubtag from="eu" to="eu_Latn_ES"/>
-      <likelySubtag from="fa" to="fa_Arab_IR"/>
-      <likelySubtag from="fi" to="fi_Latn_FI"/>
-      <likelySubtag from="fil" to="fil_Latn_PH"/>
-      <likelySubtag from="fj" to="fj_Latn_FJ"/>
-      <likelySubtag from="fo" to="fo_Latn_FO"/>
-      <likelySubtag from="fr" to="fr_Latn_FR"/>
-      <likelySubtag from="fur" to="fur_Latn_IT"/>
-      <likelySubtag from="fy" to="fy_Latn_NL"/>
-      <likelySubtag from="ga" to="ga_Latn_IE"/>
-      <likelySubtag from="gaa" to="gaa_Latn_GH"/>
-      <likelySubtag from="gag" to="gag_Latn_MD"/>
-      <likelySubtag from="gd" to="gd_Latn_GB"/>
-      <likelySubtag from="gil" to="gil_Latn_KI"/>
-      <likelySubtag from="gl" to="gl_Latn_ES"/>
-      <likelySubtag from="gn" to="gn_Latn_PY"/>
-      <likelySubtag from="gsw" to="gsw_Latn_CH"/>
-      <likelySubtag from="gu" to="gu_Gujr_IN"/>
-      <likelySubtag from="ha" to="ha_Latn_NG"/>
-      <likelySubtag from="ha_Arab" to="ha_Arab_SD"/>
-      <likelySubtag from="ha_SD" to="ha_Arab_SD"/>
-      <likelySubtag from="haw" to="haw_Latn_US"/>
-      <likelySubtag from="he" to="he_Hebr_IL"/>
-      <likelySubtag from="hi" to="hi_Deva_IN"/>
-      <likelySubtag from="hil" to="hil_Latn_PH"/>
-      <likelySubtag from="ho" to="ho_Latn_PG"/>
-      <likelySubtag from="hr" to="hr_Latn_HR"/>
-      <likelySubtag from="ht" to="ht_Latn_HT"/>
-      <likelySubtag from="hu" to="hu_Latn_HU"/>
-      <likelySubtag from="hy" to="hy_Armn_AM"/>
-      <likelySubtag from="id" to="id_Latn_ID"/>
-      <likelySubtag from="ig" to="ig_Latn_NG"/>
-      <likelySubtag from="ii" to="ii_Yiii_CN"/>
-      <likelySubtag from="ilo" to="ilo_Latn_PH"/>
-      <likelySubtag from="inh" to="inh_Cyrl_RU"/>
-      <likelySubtag from="is" to="is_Latn_IS"/>
-      <likelySubtag from="it" to="it_Latn_IT"/>
-      <likelySubtag from="iu" to="iu_Cans_CA"/>
-      <likelySubtag from="ja" to="ja_Jpan_JP"/>
-      <likelySubtag from="jv" to="jv_Latn_ID"/>
-      <likelySubtag from="ka" to="ka_Geor_GE"/>
-      <likelySubtag from="kaj" to="kaj_Latn_NG"/>
-      <likelySubtag from="kam" to="kam_Latn_KE"/>
-      <likelySubtag from="kbd" to="kbd_Cyrl_RU"/>
-      <likelySubtag from="kha" to="kha_Latn_IN"/>
-      <likelySubtag from="kk" to="kk_Cyrl_KZ"/>
-      <likelySubtag from="kl" to="kl_Latn_GL"/>
-      <likelySubtag from="km" to="km_Khmr_KH"/>
-      <likelySubtag from="kn" to="kn_Knda_IN"/>
-      <likelySubtag from="ko" to="ko_Kore_KR"/>
-      <likelySubtag from="koi" to="koi_Cyrl_RU"/>
-      <likelySubtag from="kok" to="kok_Deva_IN"/>
-      <likelySubtag from="kos" to="kos_Latn_FM"/>
-      <likelySubtag from="kpe" to="kpe_Latn_LR"/>
-      <likelySubtag from="kpv" to="kpv_Cyrl_RU"/>
-      <likelySubtag from="krc" to="krc_Cyrl_RU"/>
-      <likelySubtag from="ks" to="ks_Arab_IN"/>
-      <likelySubtag from="ku" to="ku_Arab_IQ"/>
-      <likelySubtag from="ku_Latn" to="ku_Latn_TR"/>
-      <likelySubtag from="ku_TR" to="ku_Latn_TR"/>
-      <likelySubtag from="kum" to="kum_Cyrl_RU"/>
-      <likelySubtag from="ky" to="ky_Cyrl_KG"/>
-      <likelySubtag from="la" to="la_Latn_VA"/>
-      <likelySubtag from="lah" to="lah_Arab_PK"/>
-      <likelySubtag from="lb" to="lb_Latn_LU"/>
-      <likelySubtag from="lbe" to="lbe_Cyrl_RU"/>
-      <likelySubtag from="lez" to="lez_Cyrl_RU"/>
-      <likelySubtag from="ln" to="ln_Latn_CD"/>
-      <likelySubtag from="lo" to="lo_Laoo_LA"/>
-      <likelySubtag from="lt" to="lt_Latn_LT"/>
-      <likelySubtag from="lv" to="lv_Latn_LV"/>
-      <likelySubtag from="mai" to="mai_Deva_IN"/>
-      <likelySubtag from="mdf" to="mdf_Cyrl_RU"/>
-      <likelySubtag from="mdh" to="mdh_Latn_PH"/>
-      <likelySubtag from="mg" to="mg_Latn_MG"/>
-      <likelySubtag from="mh" to="mh_Latn_MH"/>
-      <likelySubtag from="mi" to="mi_Latn_NZ"/>
-      <likelySubtag from="mk" to="mk_Cyrl_MK"/>
-      <likelySubtag from="ml" to="ml_Mlym_IN"/>
-      <likelySubtag from="mn" to="mn_Cyrl_MN"/>
-      <likelySubtag from="mn_CN" to="mn_Mong_CN"/>
-      <likelySubtag from="mn_Mong" to="mn_Mong_CN"/>
-      <likelySubtag from="mr" to="mr_Deva_IN"/>
-      <likelySubtag from="ms" to="ms_Latn_MY"/>
-      <likelySubtag from="mt" to="mt_Latn_MT"/>
-      <likelySubtag from="my" to="my_Mymr_MM"/>
-      <likelySubtag from="myv" to="myv_Cyrl_RU"/>
-      <likelySubtag from="na" to="na_Latn_NR"/>
-      <likelySubtag from="nb" to="nb_Latn_NO"/>
-      <likelySubtag from="ne" to="ne_Deva_NP"/>
-      <likelySubtag from="niu" to="niu_Latn_NU"/>
-      <likelySubtag from="nl" to="nl_Latn_NL"/>
-      <likelySubtag from="nn" to="nn_Latn_NO"/>
-      <likelySubtag from="nr" to="nr_Latn_ZA"/>
-      <likelySubtag from="nso" to="nso_Latn_ZA"/>
-      <likelySubtag from="ny" to="ny_Latn_MW"/>
-      <likelySubtag from="oc" to="oc_Latn_FR"/>
-      <likelySubtag from="om" to="om_Latn_ET"/>
-      <likelySubtag from="or" to="or_Orya_IN"/>
-      <likelySubtag from="os" to="os_Cyrl_GE"/>
-      <likelySubtag from="pa" to="pa_Guru_IN"/>
-      <likelySubtag from="pa_Arab" to="pa_Arab_PK"/>
-      <likelySubtag from="pa_PK" to="pa_Arab_PK"/>
-      <likelySubtag from="pag" to="pag_Latn_PH"/>
-      <likelySubtag from="pap" to="pap_Latn_AN"/>
-      <likelySubtag from="pau" to="pau_Latn_PW"/>
-      <likelySubtag from="pl" to="pl_Latn_PL"/>
-      <likelySubtag from="pon" to="pon_Latn_FM"/>
-      <likelySubtag from="ps" to="ps_Arab_AF"/>
-      <likelySubtag from="pt" to="pt_Latn_BR"/>
-      <likelySubtag from="qu" to="qu_Latn_PE"/>
-      <likelySubtag from="rm" to="rm_Latn_CH"/>
-      <likelySubtag from="rn" to="rn_Latn_BI"/>
-      <likelySubtag from="ro" to="ro_Latn_RO"/>
-      <likelySubtag from="ru" to="ru_Cyrl_RU"/>
-      <likelySubtag from="rw" to="rw_Latn_RW"/>
-      <likelySubtag from="sa" to="sa_Deva_IN"/>
-      <likelySubtag from="sah" to="sah_Cyrl_RU"/>
-      <likelySubtag from="sat" to="sat_Latn_IN"/>
-      <likelySubtag from="sd" to="sd_Arab_IN"/>
-      <likelySubtag from="se" to="se_Latn_NO"/>
-      <likelySubtag from="sg" to="sg_Latn_CF"/>
-      <likelySubtag from="si" to="si_Sinh_LK"/>
-      <likelySubtag from="sid" to="sid_Latn_ET"/>
-      <likelySubtag from="sk" to="sk_Latn_SK"/>
-      <likelySubtag from="sl" to="sl_Latn_SI"/>
-      <likelySubtag from="sm" to="sm_Latn_WS"/>
-      <likelySubtag from="so" to="so_Latn_SO"/>
-      <likelySubtag from="sq" to="sq_Latn_AL"/>
-      <likelySubtag from="sr" to="sr_Cyrl_RS"/>
-      <likelySubtag from="sr_ME" to="sr_Latn_ME"/>
-      <likelySubtag from="ss" to="ss_Latn_ZA"/>
-      <likelySubtag from="st" to="st_Latn_ZA"/>
-      <likelySubtag from="su" to="su_Latn_ID"/>
-      <likelySubtag from="sv" to="sv_Latn_SE"/>
-      <likelySubtag from="sw" to="sw_Latn_TZ"/>
-      <likelySubtag from="swb" to="swb_Arab_KM"/>
-      <likelySubtag from="ta" to="ta_Taml_IN"/>
-      <likelySubtag from="te" to="te_Telu_IN"/>
-      <likelySubtag from="tet" to="tet_Latn_TL"/>
-      <likelySubtag from="tg" to="tg_Cyrl_TJ"/>
-      <likelySubtag from="th" to="th_Thai_TH"/>
-      <likelySubtag from="ti" to="ti_Ethi_ET"/>
-      <likelySubtag from="tig" to="tig_Ethi_ER"/>
-      <likelySubtag from="tk" to="tk_Latn_TM"/>
-      <likelySubtag from="tkl" to="tkl_Latn_TK"/>
-      <likelySubtag from="tl" to="tl_Latn_PH"/>
-      <likelySubtag from="tn" to="tn_Latn_ZA"/>
-      <likelySubtag from="to" to="to_Latn_TO"/>
-      <likelySubtag from="tpi" to="tpi_Latn_PG"/>
-      <likelySubtag from="tr" to="tr_Latn_TR"/>
-      <likelySubtag from="trv" to="trv_Latn_TW"/>
-      <likelySubtag from="ts" to="ts_Latn_ZA"/>
-      <likelySubtag from="tsg" to="tsg_Latn_PH"/>
-      <likelySubtag from="tt" to="tt_Cyrl_RU"/>
-      <likelySubtag from="tts" to="tts_Thai_TH"/>
-      <likelySubtag from="tvl" to="tvl_Latn_TV"/>
-      <likelySubtag from="tw" to="tw_Latn_GH"/>
-      <likelySubtag from="ty" to="ty_Latn_PF"/>
-      <likelySubtag from="tyv" to="tyv_Cyrl_RU"/>
-      <likelySubtag from="udm" to="udm_Cyrl_RU"/>
-      <likelySubtag from="ug" to="ug_Arab_CN"/>
-      <likelySubtag from="uk" to="uk_Cyrl_UA"/>
-      <likelySubtag from="uli" to="uli_Latn_FM"/>
-      <likelySubtag from="und" to="en_Latn_US"/>
-      <likelySubtag from="und_AD" to="ca_Latn_AD"/>
-      <likelySubtag from="und_AE" to="ar_Arab_AE"/>
-      <likelySubtag from="und_AF" to="fa_Arab_AF"/>
-      <likelySubtag from="und_AL" to="sq_Latn_AL"/>
-      <likelySubtag from="und_AM" to="hy_Armn_AM"/>
-      <likelySubtag from="und_AN" to="pap_Latn_AN"/>
-      <likelySubtag from="und_AO" to="pt_Latn_AO"/>
-      <likelySubtag from="und_AR" to="es_Latn_AR"/>
-      <likelySubtag from="und_AS" to="sm_Latn_AS"/>
-      <likelySubtag from="und_AT" to="de_Latn_AT"/>
-      <likelySubtag from="und_AW" to="nl_Latn_AW"/>
-      <likelySubtag from="und_AX" to="sv_Latn_AX"/>
-      <likelySubtag from="und_AZ" to="az_Latn_AZ"/>
-      <likelySubtag from="und_Arab" to="ar_Arab_EG"/>
-      <likelySubtag from="und_Arab_CN" to="ug_Arab_CN"/>
-      <likelySubtag from="und_Arab_DJ" to="ar_Arab_DJ"/>
-      <likelySubtag from="und_Arab_ER" to="ar_Arab_ER"/>
-      <likelySubtag from="und_Arab_IL" to="ar_Arab_IL"/>
-      <likelySubtag from="und_Arab_IN" to="ur_Arab_IN"/>
-      <likelySubtag from="und_Arab_PK" to="ur_Arab_PK"/>
-      <likelySubtag from="und_Armn" to="hy_Armn_AM"/>
-      <likelySubtag from="und_BA" to="bs_Latn_BA"/>
-      <likelySubtag from="und_BD" to="bn_Beng_BD"/>
-      <likelySubtag from="und_BE" to="nl_Latn_BE"/>
-      <likelySubtag from="und_BF" to="fr_Latn_BF"/>
-      <likelySubtag from="und_BG" to="bg_Cyrl_BG"/>
-      <likelySubtag from="und_BH" to="ar_Arab_BH"/>
-      <likelySubtag from="und_BI" to="rn_Latn_BI"/>
-      <likelySubtag from="und_BJ" to="fr_Latn_BJ"/>
-      <likelySubtag from="und_BL" to="fr_Latn_BL"/>
-      <likelySubtag from="und_BN" to="ms_Latn_BN"/>
-      <likelySubtag from="und_BO" to="es_Latn_BO"/>
-      <likelySubtag from="und_BR" to="pt_Latn_BR"/>
-      <likelySubtag from="und_BT" to="dz_Tibt_BT"/>
-      <likelySubtag from="und_BY" to="be_Cyrl_BY"/>
-      <likelySubtag from="und_Beng" to="bn_Beng_BD"/>
-      <likelySubtag from="und_CD" to="sw_Latn_CD"/>
-      <likelySubtag from="und_CF" to="fr_Latn_CF"/>
-      <likelySubtag from="und_CG" to="fr_Latn_CG"/>
-      <likelySubtag from="und_CH" to="de_Latn_CH"/>
-      <likelySubtag from="und_CI" to="fr_Latn_CI"/>
-      <likelySubtag from="und_CL" to="es_Latn_CL"/>
-      <likelySubtag from="und_CM" to="fr_Latn_CM"/>
-      <likelySubtag from="und_CN" to="zh_Hans_CN"/>
-      <likelySubtag from="und_CO" to="es_Latn_CO"/>
-      <likelySubtag from="und_CR" to="es_Latn_CR"/>
-      <likelySubtag from="und_CU" to="es_Latn_CU"/>
-      <likelySubtag from="und_CV" to="pt_Latn_CV"/>
-      <likelySubtag from="und_CY" to="el_Grek_CY"/>
-      <likelySubtag from="und_CZ" to="cs_Latn_CZ"/>
-      <likelySubtag from="und_Cans" to="crk_Cans_CA"/>
-      <likelySubtag from="und_Cyrl" to="ru_Cyrl_RU"/>
-      <likelySubtag from="und_Cyrl_BA" to="sr_Cyrl_BA"/>
-      <likelySubtag from="und_Cyrl_GE" to="ab_Cyrl_GE"/>
-      <likelySubtag from="und_DE" to="de_Latn_DE"/>
-      <likelySubtag from="und_DJ" to="aa_Latn_DJ"/>
-      <likelySubtag from="und_DK" to="da_Latn_DK"/>
-      <likelySubtag from="und_DO" to="es_Latn_DO"/>
-      <likelySubtag from="und_DZ" to="ar_Arab_DZ"/>
-      <likelySubtag from="und_Deva" to="hi_Deva_IN"/>
-      <likelySubtag from="und_EC" to="es_Latn_EC"/>
-      <likelySubtag from="und_EE" to="et_Latn_EE"/>
-      <likelySubtag from="und_EG" to="ar_Arab_EG"/>
-      <likelySubtag from="und_EH" to="ar_Arab_EH"/>
-      <likelySubtag from="und_ER" to="ti_Ethi_ER"/>
-      <likelySubtag from="und_ES" to="es_Latn_ES"/>
-      <likelySubtag from="und_Ethi" to="am_Ethi_ET"/>
-      <likelySubtag from="und_FI" to="fi_Latn_FI"/>
-      <likelySubtag from="und_FJ" to="fj_Latn_FJ"/>
-      <likelySubtag from="und_FM" to="chk_Latn_FM"/>
-      <likelySubtag from="und_FO" to="fo_Latn_FO"/>
-      <likelySubtag from="und_FR" to="fr_Latn_FR"/>
-      <likelySubtag from="und_GA" to="fr_Latn_GA"/>
-      <likelySubtag from="und_GE" to="ka_Geor_GE"/>
-      <likelySubtag from="und_GF" to="fr_Latn_GF"/>
-      <likelySubtag from="und_GH" to="ak_Latn_GH"/>
-      <likelySubtag from="und_GL" to="kl_Latn_GL"/>
-      <likelySubtag from="und_GN" to="fr_Latn_GN"/>
-      <likelySubtag from="und_GP" to="fr_Latn_GP"/>
-      <likelySubtag from="und_GQ" to="fr_Latn_GQ"/>
-      <likelySubtag from="und_GR" to="el_Grek_GR"/>
-      <likelySubtag from="und_GT" to="es_Latn_GT"/>
-      <likelySubtag from="und_GW" to="pt_Latn_GW"/>
-      <likelySubtag from="und_Geor" to="ka_Geor_GE"/>
-      <likelySubtag from="und_Grek" to="el_Grek_GR"/>
-      <likelySubtag from="und_Gujr" to="gu_Gujr_IN"/>
-      <likelySubtag from="und_Guru" to="pa_Guru_IN"/>
-      <likelySubtag from="und_HK" to="zh_Hant_HK"/>
-      <likelySubtag from="und_HN" to="es_Latn_HN"/>
-      <likelySubtag from="und_HR" to="hr_Latn_HR"/>
-      <likelySubtag from="und_HT" to="ht_Latn_HT"/>
-      <likelySubtag from="und_HU" to="hu_Latn_HU"/>
-      <likelySubtag from="und_Hani" to="zh_Hans_CN"/>
-      <likelySubtag from="und_Hans" to="zh_Hans_CN"/>
-      <likelySubtag from="und_Hant" to="zh_Hant_TW"/>
-      <likelySubtag from="und_Hebr" to="he_Hebr_IL"/>
-      <likelySubtag from="und_ID" to="id_Latn_ID"/>
-      <likelySubtag from="und_IL" to="he_Hebr_IL"/>
-      <likelySubtag from="und_IN" to="hi_Deva_IN"/>
-      <likelySubtag from="und_IQ" to="ar_Arab_IQ"/>
-      <likelySubtag from="und_IR" to="fa_Arab_IR"/>
-      <likelySubtag from="und_IS" to="is_Latn_IS"/>
-      <likelySubtag from="und_IT" to="it_Latn_IT"/>
-      <likelySubtag from="und_JO" to="ar_Arab_JO"/>
-      <likelySubtag from="und_JP" to="ja_Jpan_JP"/>
-      <likelySubtag from="und_Jpan" to="ja_Jpan_JP"/>
-      <likelySubtag from="und_KG" to="ky_Cyrl_KG"/>
-      <likelySubtag from="und_KH" to="km_Khmr_KH"/>
-      <likelySubtag from="und_KM" to="ar_Arab_KM"/>
-      <likelySubtag from="und_KP" to="ko_Kore_KP"/>
-      <likelySubtag from="und_KR" to="ko_Kore_KR"/>
-      <likelySubtag from="und_KW" to="ar_Arab_KW"/>
-      <likelySubtag from="und_KZ" to="ru_Cyrl_KZ"/>
-      <likelySubtag from="und_Khmr" to="km_Khmr_KH"/>
-      <likelySubtag from="und_Knda" to="kn_Knda_IN"/>
-      <likelySubtag from="und_Kore" to="ko_Kore_KR"/>
-      <likelySubtag from="und_LA" to="lo_Laoo_LA"/>
-      <likelySubtag from="und_LB" to="ar_Arab_LB"/>
-      <likelySubtag from="und_LI" to="de_Latn_LI"/>
-      <likelySubtag from="und_LK" to="si_Sinh_LK"/>
-      <likelySubtag from="und_LS" to="st_Latn_LS"/>
-      <likelySubtag from="und_LT" to="lt_Latn_LT"/>
-      <likelySubtag from="und_LU" to="fr_Latn_LU"/>
-      <likelySubtag from="und_LV" to="lv_Latn_LV"/>
-      <likelySubtag from="und_LY" to="ar_Arab_LY"/>
-      <likelySubtag from="und_Laoo" to="lo_Laoo_LA"/>
-      <likelySubtag from="und_Latn_CN" to="za_Latn_CN"/>
-      <likelySubtag from="und_Latn_CY" to="tr_Latn_CY"/>
-      <likelySubtag from="und_Latn_DZ" to="fr_Latn_DZ"/>
-      <likelySubtag from="und_Latn_ER" to="aa_Latn_ER"/>
-      <likelySubtag from="und_Latn_KM" to="fr_Latn_KM"/>
-      <likelySubtag from="und_Latn_MA" to="fr_Latn_MA"/>
-      <likelySubtag from="und_Latn_MK" to="sq_Latn_MK"/>
-      <likelySubtag from="und_Latn_SY" to="fr_Latn_SY"/>
-      <likelySubtag from="und_Latn_TN" to="fr_Latn_TN"/>
-      <likelySubtag from="und_MA" to="ar_Arab_MA"/>
-      <likelySubtag from="und_MC" to="fr_Latn_MC"/>
-      <likelySubtag from="und_MD" to="ro_Latn_MD"/>
-      <likelySubtag from="und_ME" to="sr_Latn_ME"/>
-      <likelySubtag from="und_MF" to="fr_Latn_MF"/>
-      <likelySubtag from="und_MG" to="mg_Latn_MG"/>
-      <likelySubtag from="und_MH" to="mh_Latn_MH"/>
-      <likelySubtag from="und_MK" to="mk_Cyrl_MK"/>
-      <likelySubtag from="und_ML" to="fr_Latn_ML"/>
-      <likelySubtag from="und_MM" to="my_Mymr_MM"/>
-      <likelySubtag from="und_MN" to="mn_Cyrl_MN"/>
-      <likelySubtag from="und_MO" to="zh_Hant_MO"/>
-      <likelySubtag from="und_MQ" to="fr_Latn_MQ"/>
-      <likelySubtag from="und_MR" to="ar_Arab_MR"/>
-      <likelySubtag from="und_MT" to="mt_Latn_MT"/>
-      <likelySubtag from="und_MV" to="dv_Thaa_MV"/>
-      <likelySubtag from="und_MW" to="ny_Latn_MW"/>
-      <likelySubtag from="und_MX" to="es_Latn_MX"/>
-      <likelySubtag from="und_MY" to="ms_Latn_MY"/>
-      <likelySubtag from="und_MZ" to="pt_Latn_MZ"/>
-      <likelySubtag from="und_Mlym" to="ml_Mlym_IN"/>
-      <likelySubtag from="und_Mong" to="mn_Mong_CN"/>
-      <likelySubtag from="und_Mymr" to="my_Mymr_MM"/>
-      <likelySubtag from="und_NC" to="fr_Latn_NC"/>
-      <likelySubtag from="und_NE" to="ha_Latn_NE"/>
-      <likelySubtag from="und_NI" to="es_Latn_NI"/>
-      <likelySubtag from="und_NL" to="nl_Latn_NL"/>
-      <likelySubtag from="und_NO" to="nb_Latn_NO"/>
-      <likelySubtag from="und_NP" to="ne_Deva_NP"/>
-      <likelySubtag from="und_NU" to="niu_Latn_NU"/>
-      <likelySubtag from="und_OM" to="ar_Arab_OM"/>
-      <likelySubtag from="und_Orya" to="or_Orya_IN"/>
-      <likelySubtag from="und_PA" to="es_Latn_PA"/>
-      <likelySubtag from="und_PE" to="es_Latn_PE"/>
-      <likelySubtag from="und_PF" to="fr_Latn_PF"/>
-      <likelySubtag from="und_PG" to="tpi_Latn_PG"/>
-      <likelySubtag from="und_PH" to="fil_Latn_PH"/>
-      <likelySubtag from="und_PK" to="ur_Arab_PK"/>
-      <likelySubtag from="und_PL" to="pl_Latn_PL"/>
-      <likelySubtag from="und_PM" to="fr_Latn_PM"/>
-      <likelySubtag from="und_PR" to="es_Latn_PR"/>
-      <likelySubtag from="und_PS" to="ar_Arab_PS"/>
-      <likelySubtag from="und_PT" to="pt_Latn_PT"/>
-      <likelySubtag from="und_PW" to="pau_Latn_PW"/>
-      <likelySubtag from="und_PY" to="gn_Latn_PY"/>
-      <likelySubtag from="und_QA" to="ar_Arab_QA"/>
-      <likelySubtag from="und_RE" to="fr_Latn_RE"/>
-      <likelySubtag from="und_RO" to="ro_Latn_RO"/>
-      <likelySubtag from="und_RS" to="sr_Cyrl_RS"/>
-      <likelySubtag from="und_RU" to="ru_Cyrl_RU"/>
-      <likelySubtag from="und_RW" to="rw_Latn_RW"/>
-      <likelySubtag from="und_SA" to="ar_Arab_SA"/>
-      <likelySubtag from="und_SD" to="ar_Arab_SD"/>
-      <likelySubtag from="und_SE" to="sv_Latn_SE"/>
-      <likelySubtag from="und_SI" to="sl_Latn_SI"/>
-      <likelySubtag from="und_SJ" to="nb_Latn_SJ"/>
-      <likelySubtag from="und_SK" to="sk_Latn_SK"/>
-      <likelySubtag from="und_SM" to="it_Latn_SM"/>
-      <likelySubtag from="und_SN" to="fr_Latn_SN"/>
-      <likelySubtag from="und_SO" to="so_Latn_SO"/>
-      <likelySubtag from="und_SR" to="nl_Latn_SR"/>
-      <likelySubtag from="und_ST" to="pt_Latn_ST"/>
-      <likelySubtag from="und_SV" to="es_Latn_SV"/>
-      <likelySubtag from="und_SY" to="ar_Arab_SY"/>
-      <likelySubtag from="und_Sinh" to="si_Sinh_LK"/>
-      <likelySubtag from="und_TD" to="fr_Latn_TD"/>
-      <likelySubtag from="und_TG" to="fr_Latn_TG"/>
-      <likelySubtag from="und_TH" to="th_Thai_TH"/>
-      <likelySubtag from="und_TJ" to="tg_Cyrl_TJ"/>
-      <likelySubtag from="und_TL" to="pt_Latn_TL"/>
-      <likelySubtag from="und_TM" to="tk_Latn_TM"/>
-      <likelySubtag from="und_TN" to="ar_Arab_TN"/>
-      <likelySubtag from="und_TO" to="to_Latn_TO"/>
-      <likelySubtag from="und_TR" to="tr_Latn_TR"/>
-      <likelySubtag from="und_TV" to="tvl_Latn_TV"/>
-      <likelySubtag from="und_TW" to="zh_Hant_TW"/>
-      <likelySubtag from="und_TZ" to="sw_Latn_TZ"/>
-      <likelySubtag from="und_Taml" to="ta_Taml_IN"/>
-      <likelySubtag from="und_Telu" to="te_Telu_IN"/>
-      <likelySubtag from="und_Thaa" to="dv_Thaa_MV"/>
-      <likelySubtag from="und_Thai" to="th_Thai_TH"/>
-      <likelySubtag from="und_Tibt" to="bo_Tibt_CN"/>
-      <likelySubtag from="und_UA" to="uk_Cyrl_UA"/>
-      <likelySubtag from="und_UG" to="sw_Latn_UG"/>
-      <likelySubtag from="und_UY" to="es_Latn_UY"/>
-      <likelySubtag from="und_UZ" to="uz_Cyrl_UZ"/>
-      <likelySubtag from="und_VA" to="la_Latn_VA"/>
-      <likelySubtag from="und_VE" to="es_Latn_VE"/>
-      <likelySubtag from="und_VN" to="vi_Latn_VN"/>
-      <likelySubtag from="und_VU" to="bi_Latn_VU"/>
-      <likelySubtag from="und_WF" to="fr_Latn_WF"/>
-      <likelySubtag from="und_WS" to="sm_Latn_WS"/>
-      <likelySubtag from="und_YE" to="ar_Arab_YE"/>
-      <likelySubtag from="und_YT" to="fr_Latn_YT"/>
-      <likelySubtag from="und_Yiii" to="ii_Yiii_CN"/>
-      <likelySubtag from="ur" to="ur_Arab_PK"/>
-      <likelySubtag from="uz" to="uz_Cyrl_UZ"/>
-      <likelySubtag from="uz_AF" to="uz_Arab_AF"/>
-      <likelySubtag from="uz_Arab" to="uz_Arab_AF"/>
-      <likelySubtag from="ve" to="ve_Latn_ZA"/>
-      <likelySubtag from="vi" to="vi_Latn_VN"/>
-      <likelySubtag from="wal" to="wal_Ethi_ET"/>
-      <likelySubtag from="war" to="war_Latn_PH"/>
-      <likelySubtag from="wo" to="wo_Latn_SN"/>
-      <likelySubtag from="xh" to="xh_Latn_ZA"/>
-      <likelySubtag from="yap" to="yap_Latn_FM"/>
-      <likelySubtag from="yo" to="yo_Latn_NG"/>
-      <likelySubtag from="za" to="za_Latn_CN"/>
-      <likelySubtag from="zh" to="zh_Hans_CN"/>
-      <likelySubtag from="zh_HK" to="zh_Hant_HK"/>
-      <likelySubtag from="zh_Hani" to="zh_Hans_CN"/>
-      <likelySubtag from="zh_Hant" to="zh_Hant_TW"/>
-      <likelySubtag from="zh_MO" to="zh_Hant_MO"/>
-      <likelySubtag from="zh_TW" to="zh_Hant_TW"/>
-      <likelySubtag from="zu" to="zu_Latn_ZA"/>
-    </likelySubtags>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ln.xml b/airtime_mvc/library/Zend/Locale/Data/ln.xml
deleted file mode 100644
index 09ef80c93..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ln.xml
+++ /dev/null
@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ln"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">afrikánsi</language>
-			<language type="afh">afríhili</language>
-			<language type="ak">akan</language>
-			<language type="am">liamariki</language>
-			<language type="ar">liarabu</language>
-			<language type="as">liasame</language>
-			<language type="az">liazerbayani</language>
-			<language type="bai">nkótá ya Bamileke</language>
-			<language type="be">belarusi</language>
-			<language type="bg">kibulgaria</language>
-			<language type="bh">libiyari</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="br">breton</language>
-			<language type="bs">libosinia</language>
-			<language type="ca">katalani</language>
-			<language type="cs">litshɛki</language>
-			<language type="cy">liwelesi</language>
-			<language type="da">lidanemark</language>
-			<language type="de">lialemani</language>
-			<language type="el">ligreki</language>
-			<language type="en">lingɛlɛ�sa</language>
-			<language type="en_CA">lingɛlɛ�sa (CA)</language>
-			<language type="eo">lisipelanto</language>
-			<language type="es">lispanyola</language>
-			<language type="et">liestonia</language>
-			<language type="eu">libaske</language>
-			<language type="fa">lipɛrsi</language>
-			<language type="fi">lifilandi</language>
-			<language type="fil">litagalog</language>
-			<language type="fo">lifarose</language>
-			<language type="fr">lifalansé</language>
-			<language type="fr_CA">lifalansé (CA)</language>
-			<language type="fy">lifrisi</language>
-			<language type="ga">lirlande</language>
-			<language type="gd">ligaeliki</language>
-			<language type="gl">ligalicia</language>
-			<language type="gn">ligwarani</language>
-			<language type="gu">liguzarati</language>
-			<language type="he">liyuda</language>
-			<language type="hi">lihindi</language>
-			<language type="hr">likroasia</language>
-			<language type="hu">liungaria</language>
-			<language type="hy">liarmenya</language>
-			<language type="ia">interlingua</language>
-			<language type="id">lindonesi</language>
-			<language type="ie">interlingue</language>
-			<language type="is">lislanda</language>
-			<language type="it">litaliano</language>
-			<language type="ja">liyapani</language>
-			<language type="jv">lizava</language>
-			<language type="ka">lizorzi</language>
-			<language type="kg">kikɔ�ngɔ</language>
-			<language type="km">likambodia</language>
-			<language type="kn">kanada</language>
-			<language type="ko">likorea</language>
-			<language type="ku">likurdi</language>
-			<language type="ky">kirgizi</language>
-			<language type="la">kilatini</language>
-			<language type="ln">lingála</language>
-			<language type="lo">lilao</language>
-			<language type="lt">lituani</language>
-			<language type="lua">ciluba</language>
-			<language type="lun">lunda</language>
-			<language type="lv">lilativa</language>
-			<language type="mk">limasedonia</language>
-			<language type="ml">limalayalami</language>
-			<language type="mn">limongoli</language>
-			<language type="mr">limarati</language>
-			<language type="ms">limalasi</language>
-			<language type="mt">limalta</language>
-			<language type="mul">nkótá míngi</language>
-			<language type="ne">linepali</language>
-			<language type="nl">lifalamá</language>
-			<language type="nn">linovezi-nynorsk</language>
-			<language type="no">linovezi</language>
-			<language type="oc">liosita</language>
-			<language type="or">oriya</language>
-			<language type="pa">lipunzabi</language>
-			<language type="pl">lipoloni</language>
-			<language type="ps">pashto</language>
-			<language type="pt">lipulutugɛ�si</language>
-			<language type="pt_BR">lipulutugɛ�si (Brazil)</language>
-			<language type="ro">lirumani</language>
-			<language type="ru">lirusi</language>
-			<language type="sa">indu-ya-kala</language>
-			<language type="sd">lisindi</language>
-			<language type="sg">sango</language>
-			<language type="sh">liserbokroata</language>
-			<language type="si">lisinalɛ�si</language>
-			<language type="sk">lisolovaki</language>
-			<language type="sl">lisoloveni</language>
-			<language type="so">lisomali</language>
-			<language type="sq">lialbania</language>
-			<language type="sr">liserbia</language>
-			<language type="st">Sotho ya Sidi</language>
-			<language type="su">lisundanɛ�si</language>
-			<language type="sv">liswédwa</language>
-			<language type="sw">kiswahili</language>
-			<language type="ta">tamili</language>
-			<language type="te">litelegu</language>
-			<language type="th">thai</language>
-			<language type="ti">tigirinya</language>
-			<language type="tk">turkmen</language>
-			<language type="tlh">kilingoni</language>
-			<language type="tr">turk</language>
-			<language type="tw">twi</language>
-			<language type="ug">uighur</language>
-			<language type="uk">liukrenia</language>
-			<language type="und">lokótá eyébámí tɛ�</language>
-			<language type="ur">liurdu</language>
-			<language type="uz">liusibeki</language>
-			<language type="vi">livietnami</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">yiddish</language>
-			<language type="zu">zulu</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabu</script>
-			<script type="Latn">latɛ�</script>
-			<script type="Zxxx">ekomí tɛ�</script>
-			<script type="Zzzz">bokomi boyébámí tɛ�</script>
-		</scripts>
-		<territories>
-			<territory type="001">mokili mobimba</territory>
-			<territory type="002">Afríka</territory>
-			<territory type="005">Ameríka ya Sídi</territory>
-			<territory type="011">Afríka ya límbe</territory>
-			<territory type="015">Afríka ya Nola</territory>
-			<territory type="018">Afríka ya Sídi</territory>
-			<territory type="142">Azía</territory>
-			<territory type="150">Erópa</territory>
-			<territory type="154">Erópa ya Nola</territory>
-			<territory type="155">Erópa ya límbe</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AF">Afganistáni</territory>
-			<territory type="AG">Antigua mpé Barbuda</territory>
-			<territory type="AO">Angóla</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AX">Albania</territory>
-			<territory type="BA">Bosnia na Erzegovina</territory>
-			<territory type="BD">Bángaladɛ�si</territory>
-			<territory type="BE">Bɛ�ljika</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BR">Bresíli</territory>
-			<territory type="BT">Butáni</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorusia</territory>
-			<territory type="CA">Kanadá</territory>
-			<territory type="CD">Kongó-Kinsásá</territory>
-			<territory type="CF">Santrafríka</territory>
-			<territory type="CG">Kongó-Brazzaville</territory>
-			<territory type="CH">Swisi</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Sína</territory>
-			<territory type="CZ">Republiki Sheki</territory>
-			<territory type="DE">Alémani</territory>
-			<territory type="DJ">Djibuti</territory>
-			<territory type="DZ">Aljeria</territory>
-			<territory type="EG">Ejipti</territory>
-			<territory type="EH">Sahara ya límbe</territory>
-			<territory type="ES">Espania</territory>
-			<territory type="ET">Etiopya</territory>
-			<territory type="FI">Finilanda</territory>
-			<territory type="FR">Falansia</territory>
-			<territory type="GB">Ingɛlɛ�tɛlɛ</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Gine</territory>
-			<territory type="GR">Gresi</territory>
-			<territory type="GW">Gine-Bisau</territory>
-			<territory type="HR">Kroasia</territory>
-			<territory type="HU">Ungri</territory>
-			<territory type="ID">Indoneziá</territory>
-			<territory type="IE">Irlandí</territory>
-			<territory type="IN">�ndɛ</territory>
-			<territory type="IS">Islandi</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JO">Zordaní</territory>
-			<territory type="JP">Yapan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirghizistáni</territory>
-			<territory type="KI">KI</territory>
-			<territory type="KP">Kore ya Nola</territory>
-			<territory type="KR">Kore ya Sidi</territory>
-			<territory type="KZ">Kazakstáni</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LT">Litwani</territory>
-			<territory type="LU">Luksamburg</territory>
-			<territory type="LV">Letoni</territory>
-			<territory type="LY">Libíya</territory>
-			<territory type="MK">Masedoni</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MN">Mongolí</territory>
-			<territory type="MO">Makau</territory>
-			<territory type="MV">Madívi</territory>
-			<territory type="MZ">Mozambíki</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NE">Nijé</territory>
-			<territory type="NG">Nijeria</territory>
-			<territory type="NL">Holanda</territory>
-			<territory type="NO">Norvej</territory>
-			<territory type="NP">Nepáli</territory>
-			<territory type="PK">Pakistáni</territory>
-			<territory type="PL">Poloni</territory>
-			<territory type="PT">Pulutugal</territory>
-			<territory type="RO">Rumania</territory>
-			<territory type="RU">Rusí</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SD">Sudani</territory>
-			<territory type="SE">Swési</territory>
-			<territory type="SH">Santu Helena</territory>
-			<territory type="SM">Santu Marino</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="ST">Sǎo Tomé na Principe</territory>
-			<territory type="SY">Sirí</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TJ">Tazikistáni</territory>
-			<territory type="TM">Turkmenistáni</territory>
-			<territory type="TN">Tunizia</territory>
-			<territory type="TR">Turkí</territory>
-			<territory type="TT">Trinidad mpé Tobago</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="US">Etazíni</territory>
-			<territory type="UZ">Uzbekistáni</territory>
-			<territory type="VA">Vatikáni</territory>
-			<territory type="VN">Vietnami</territory>
-			<territory type="YE">Yeméni</territory>
-			<territory type="ZA">Sidafríka</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Esíká eyébámí tɛ�</territory>
-		</territories>
-		<keys>
-			<key type="calendar">manáka</key>
-			<key type="collation">elandiseli</key>
-			<key type="currency">mbɔ�ngɔ</key>
-		</keys>
-		<types>
-			<type type="gregorian" key="calendar">manáka ya Gregor</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">na mɛ�tɛlɛ</measurementSystemName>
-			<measurementSystemName type="US">na míli</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á â ǎ b-e é ê ě ɛ {ɛ\u0301} {ɛ\u0302} {ɛ\u030C} f g {gb} h i í î � k-m {mb} {mp} n {nd} {ng} {nk} {ns} {nt} {nz} o ó ô ǒ ɔ {ɔ\u0301} {ɔ\u0302} {ɔ\u030C} p r-u ú û ǔ v w y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[j q x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[c f F]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">s1</month>
-							<month type="2">s2</month>
-							<month type="3">s3</month>
-							<month type="4">s4</month>
-							<month type="5">s5</month>
-							<month type="6">s6</month>
-							<month type="7">s7</month>
-							<month type="8">s8</month>
-							<month type="9">s9</month>
-							<month type="10">s10</month>
-							<month type="11">s11</month>
-							<month type="12">s12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">sánzá ya yambo</month>
-							<month type="2">sánzá ya míbalé</month>
-							<month type="3">sánzá ya mísáto</month>
-							<month type="4">sánzá ya mínei</month>
-							<month type="5">sánzá ya mítáno</month>
-							<month type="6">sánzá ya motóbá</month>
-							<month type="7">sánzá ya nsambo</month>
-							<month type="8">sánzá ya mwambe</month>
-							<month type="9">sánzá ya libwa</month>
-							<month type="10">sánzá ya zómi</month>
-							<month type="11">sánzá ya zómi na mɔ̌kɔ�</month>
-							<month type="12">sánzá ya zómi na míbalé</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">eye</day>
-							<day type="mon">m1</day>
-							<day type="tue">m2</day>
-							<day type="wed">m3</day>
-							<day type="thu">m4</day>
-							<day type="fri">m5</day>
-							<day type="sat">mps</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">eyenga</day>
-							<day type="mon">mokɔlɔ ya libosó</day>
-							<day type="tue">mokɔlɔ ya míbalé</day>
-							<day type="wed">mokɔlɔ ya mísáto</day>
-							<day type="thu">mokɔlɔ ya mínéi</day>
-							<day type="fri">mokɔlɔ ya mítáno</day>
-							<day type="sat">mpɔ�sɔ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">SM1</quarter>
-							<quarter type="2">SM2</quarter>
-							<quarter type="3">SM3</quarter>
-							<quarter type="4">SM4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">sánzá mísáto ya yambo</quarter>
-							<quarter type="2">sánzá mísáto ya míbalé</quarter>
-							<quarter type="3">sánzá mísáto ya mísáto</quarter>
-							<quarter type="4">sánzá mísáto ya mínei</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">libosó ya Y.-K.</era>
-						<era type="1">nsima ya Y.-K.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">libosó ya Y.-K.</era>
-						<era type="1">nsima ya Y.-K.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="day">
-						<displayName>mokɔlɔ</displayName>
-						<relative type="0">lɛlɔ�</relative>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinsásá</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Santrafríka</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-		</symbols>
-		<currencies>
-			<currency type="BEF">
-				<displayName>falánga ya Bɛ�ljika</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>falánga ya Burundi</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>falánga kongolé</displayName>
-				<symbol>F</symbol>
-			</currency>
-			<currency type="CHF">
-				<displayName>Falánga ya Swisi</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Falánga ya Falansia</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Falánga CFA BCEAO</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Falánga CFP</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>mbɔ�ngɔ eyébámí tɛ�</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ln_CD.xml b/airtime_mvc/library/Zend/Locale/Data/ln_CD.xml
deleted file mode 100644
index d5a9938c6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ln_CD.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.18 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ln"/>
-		<territory type="CD"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ln_CG.xml b/airtime_mvc/library/Zend/Locale/Data/ln_CG.xml
deleted file mode 100644
index dd2f4d001..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ln_CG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ln"/>
-		<territory type="CG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/lo.xml b/airtime_mvc/library/Zend/Locale/Data/lo.xml
deleted file mode 100644
index f918470c4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lo.xml
+++ /dev/null
@@ -1,623 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.73 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="lo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">ອາຟາ</language>
-			<language type="ab">�ອບຄາເຊ�</language>
-			<language type="af">ອັຟຣິ�າ</language>
-			<language type="am">ອຳຫາຣິ�</language>
-			<language type="ar">ອາຣັບ</language>
-			<language type="as">ອັສສຳ</language>
-			<language type="ay">ໄອມາລາ</language>
-			<language type="az">ອາ�ຊ�ບາ�ຊານ</language>
-			<language type="ba">ບາສສີ</language>
-			<language type="be">ເບລາລຸດຊີ</language>
-			<language type="bg">ບຸນ�າຣີ</language>
-			<language type="bh">ບີຮາຣີ</language>
-			<language type="bi">ບິສລາມາ</language>
-			<language type="bn">ເບັງ�ານ</language>
-			<language type="bo">ທິເບດ</language>
-			<language type="br">ບເຣີຕົງ</language>
-			<language type="bs">ບອສນີ</language>
-			<language type="ca">�າຕາລັງ</language>
-			<language type="co">ຄ�ຊິ�້າ</language>
-			<language type="cs">ເຊັ�</language>
-			<language type="cy">�ວວ</language>
-			<language type="da">ເດັນມາ�</language>
-			<language type="de">ເ��ລະມັນ</language>
-			<language type="dz">ພູຖານີ</language>
-			<language type="el">�ເຣັ�</language>
-			<language type="en">ອັງ�ິດ</language>
-			<language type="eo">ເອສເປຣັງໂຕ</language>
-			<language type="es">�ອສປາໂ�ນ</language>
-			<language type="et">ເອສໂຕນີ</language>
-			<language type="eu">ບັສເ�ີ</language>
-			<language type="fa">ເປີເຊ�</language>
-			<language type="fi">�ຟງລັງ</language>
-			<language type="fil">ຕາ�າລ໊ອ�</language>
-			<language type="fj">ຟິຈິ</language>
-			<language type="fo">ຟາໂຣ</language>
-			<language type="fr">�ຣັ່ງ</language>
-			<language type="fy">ຟຣີຊຽນ</language>
-			<language type="ga">ໄອ�ລນ</language>
-			<language type="gd">ສະ�ັອດ ��ລິ�</language>
-			<language type="gl">�າລິດ</language>
-			<language type="gn">�ົວຣານີ</language>
-			<language type="gu">�ູຊາຣາຕີ</language>
-			<language type="ha">ໂອຊາ</language>
-			<language type="he">�ິວ</language>
-			<language type="hi">ຮິນດູ</language>
-			<language type="hr">ໂ�ຣອາຊີ</language>
-			<language type="hu">ຮັງ�າຣີ</language>
-			<language type="hy">ອາ�ເມນີ</language>
-			<language type="ia">ອິນເຕີລິງ�າ</language>
-			<language type="id">ອິນໂດເນເຊ�</language>
-			<language type="ie">ອິນເຕີລິງ</language>
-			<language type="ik">ໄອນູປຽ�</language>
-			<language type="is">ອິສລັງ</language>
-			<language type="it">ອີຕາລີ</language>
-			<language type="iu">ໄອນຸ�ຕິຕັ�</language>
-			<language type="ja">�ີ່ປຸ່ນ</language>
-			<language type="jv">ຊວາ</language>
-			<language type="ka">ຊອ�ຊີ</language>
-			<language type="kk">ຄາຊັ�</language>
-			<language type="kl">�ຼີນ�ລນດິດ</language>
-			<language type="km">�ຳປູເຈ�</language>
-			<language type="kn">�ັນນາດາ</language>
-			<language type="ko">ເ�ົາຫຼີ</language>
-			<language type="ks">ຄັດຊະມີລີ</language>
-			<language type="ku">ເຄີດິສ</language>
-			<language type="ky">ເ���ິສ</language>
-			<language type="la">ລາ�ຕັງ</language>
-			<language type="ln">ລິງ�າລາ</language>
-			<language type="lo">ລາວ</language>
-			<language type="lt">ລີທົວນີ</language>
-			<language type="lv">ລັດເວ�</language>
-			<language type="mg">ມາລາ�າຊິ</language>
-			<language type="mi">ເມົາລີ</language>
-			<language type="mk">ມາເຊໂດນີ</language>
-			<language type="ml">ມາລາຢາລຳ</language>
-			<language type="mn">ມົງໂ�ນ</language>
-			<language type="mo">ໂມຄາເວ�</language>
-			<language type="mr">ມາຣາທີ</language>
-			<language type="ms">ມາເລ</language>
-			<language type="mt">ມານຕາ</language>
-			<language type="my">ພະມ່າ</language>
-			<language type="na">ນ�ລູ</language>
-			<language type="ne">ເນປານ</language>
-			<language type="nl">ໂຮນລັງ</language>
-			<language type="nn">ນອ��ວ (ນີນອ�)</language>
-			<language type="no">ນອ��ວ</language>
-			<language type="oc">ອົ�ຊີຕານ</language>
-			<language type="om">ໂອໂລໂມ(ອາຟານ)</language>
-			<language type="or">ໂອຣີຢາ</language>
-			<language type="pa">ປັນຈາບ</language>
-			<language type="pl">ໂປໂລ�</language>
-			<language type="ps">ປາສໂຕ</language>
-			<language type="pt">ປອ�ຕຸ��ານ</language>
-			<language type="pt_BR">ປອ�ຕຸ��ານ (ບຣາຊີນ)</language>
-			<language type="pt_PT">ປອ�ຕຸ��ານ (ປອ�ຕຸ��ານ)</language>
-			<language type="qu">ຄິວຊົວ</language>
-			<language type="rm">ເລໂຕ-ໂລ�ມນ</language>
-			<language type="rn">ຄິລັນສີ</language>
-			<language type="ro">ໂຣມານີ</language>
-			<language type="ru">ລັດເຊ�</language>
-			<language type="rw">ຄິນ�າວັນດາ</language>
-			<language type="sa">ສັນສະ�ິດ</language>
-			<language type="sd">ສິນທິ</language>
-			<language type="sg">ສັນໂຄ</language>
-			<language type="sh">�ຊັ�ໂບ-ໂ�ຣ�ອັດ</language>
-			<language type="si">ສິງຫານ</language>
-			<language type="sk">ສະໂລວັ��ີ</language>
-			<language type="sl">ສະໂລວານີ</language>
-			<language type="sm">ຊາມົວ</language>
-			<language type="sn">ໂຊນາ</language>
-			<language type="so">ໂຊມາລີ</language>
-			<language type="sq">ອານບານີ</language>
-			<language type="sr">�ຊ�ບີ</language>
-			<language type="ss">ຊິສວາຕິ</language>
-			<language type="st">ເຊໂຊໂທ</language>
-			<language type="su">ຊັນດານ</language>
-			<language type="sv">ຊູ�ອັດ</language>
-			<language type="sw">ຊວາຮີລີ</language>
-			<language type="ta">ທະມິນ</language>
-			<language type="te">ເຕລູ�ູ</language>
-			<language type="tg">ທາຈິດ</language>
-			<language type="th">ໄທ</language>
-			<language type="ti">ຕີ�ຣິນຢາ</language>
-			<language type="tk">ຕວຽ�ເມນ</language>
-			<language type="tl">ຕາ�າລັອ�</language>
-			<language type="tlh">�ລິງ�ອງ</language>
-			<language type="tn">ເຊຕະສະວານາ</language>
-			<language type="to">ທອງ�້າ</language>
-			<language type="tr">ຕວ��ີ</language>
-			<language type="ts">ຊອງ�າ</language>
-			<language type="tt">ຕາດ</language>
-			<language type="tw">ຕວີ</language>
-			<language type="ug">ອຸ�ເຄີ</language>
-			<language type="uk">ອູ��ຣນ</language>
-			<language type="ur">ອູຣະດູ</language>
-			<language type="uz">ອຸດຊະເບັ��ິດສະຖານ</language>
-			<language type="vi">ຫວຽດນາມ</language>
-			<language type="vo">ໂວລາພຸ�</language>
-			<language type="wo">ວູບ</language>
-			<language type="xh">ໂຊຊາ</language>
-			<language type="yi">ຢິດດິສ</language>
-			<language type="yo">ໂຢລູບາ</language>
-			<language type="za">ຈວງ</language>
-			<language type="zh">ຈີນ</language>
-			<language type="zu">ຊູລູ</language>
-		</languages>
-		<territories>
-			<territory type="AD">ອັນດ�ລາ</territory>
-			<territory type="AE">ສະຫະລັດອາຫລັບເອມິເລດ</territory>
-			<territory type="AF">ອັຟ�ານິດສະຖານ</territory>
-			<territory type="AI">ອັນ�ິລາ</territory>
-			<territory type="AL">�ອລເບເນ�</territory>
-			<territory type="AM">ອາມິເນ�</territory>
-			<territory type="AN">ເນເທີ�ລນ�ອນເທິນ</territory>
-			<territory type="AO">ອັນໂ�ລາ</territory>
-			<territory type="AR">ອາເຈນຕິນາ່</territory>
-			<territory type="AT">ອົອດສະເຕຼ�</territory>
-			<territory type="AU">ອົອດສະຕາລີ</territory>
-			<territory type="AW">ອາລູບາ</territory>
-			<territory type="AZ">ອາເຊີໄບຈັນ</territory>
-			<territory type="BA">ບັອດສເນ� �ລະ ເຮີດໂ�ວິເນ�</territory>
-			<territory type="BB">ບາບາຄັອດ</territory>
-			<territory type="BD">ບັງ�ະລາເທດ</territory>
-			<territory type="BE">ເບວຢຽມ</territory>
-			<territory type="BF">ເບີ�ິນາຟາໂຊ</territory>
-			<territory type="BG">ບັງ�າເລ�</territory>
-			<territory type="BH">ບາເລນ</territory>
-			<territory type="BI">ບູລັນຕິ</territory>
-			<territory type="BJ">ເບນິນ</territory>
-			<territory type="BM">ເບີມິວດາ</territory>
-			<territory type="BN">ບູຮໄນ</territory>
-			<territory type="BO">ໂບລິເວ�</territory>
-			<territory type="BR">ບຼາຊິວ</territory>
-			<territory type="BS">ບາຮາມາສ</territory>
-			<territory type="BT">ພູຖານ</territory>
-			<territory type="BW">ບອັດສະວານາ</territory>
-			<territory type="BY">ເບນລາຮັສ</territory>
-			<territory type="BZ">ເບລິຊ</territory>
-			<territory type="CA">�ານາດາ</territory>
-			<territory type="CF">ສາທາລະນະລັດອັບຟຼິ��າ�າງ</territory>
-			<territory type="CG">ຄອງໂ�</territory>
-			<territory type="CH">ສະວິດເຊີ�ລນ</territory>
-			<territory type="CI">�ັ່ງທະເລໄອວ�ລິ</territory>
-			<territory type="CL">ຊິສິ</territory>
-			<territory type="CM">ຄາເມລູນ</territory>
-			<territory type="CN">ຈີນ</territory>
-			<territory type="CO">ໂຄລຳເບ�</territory>
-			<territory type="CR">ຄອສຕາລິ�າ</territory>
-			<territory type="CS">ເຊີເບ�</territory>
-			<territory type="CU">ຄິວບາ</territory>
-			<territory type="CV">ເຄບວອດ</territory>
-			<territory type="CY">ໄຊປັຼດ</territory>
-			<territory type="CZ">ສາທາລະນະລັດເຊັ�</territory>
-			<territory type="DE">ເຢ�ລະມັນ</territory>
-			<territory type="DJ">ຄິໂບຕິ</territory>
-			<territory type="DK">ເດນມາ�</territory>
-			<territory type="DM">ໂດເມນິ�າ</territory>
-			<territory type="DO">ສາທາລະນະລັດໂດມິນິ�ັນ</territory>
-			<territory type="DZ">�ອລຈິເລ�</territory>
-			<territory type="EC">ເອ�ວາດ�</territory>
-			<territory type="EE">ເອສໂຕເນ�</territory>
-			<territory type="EG">ອີຢິບ</territory>
-			<territory type="EH">ຊາຮາລາຕະເວັນຕົ�</territory>
-			<territory type="ER">ອິນຊີ</territory>
-			<territory type="ES">ສະເປນ</territory>
-			<territory type="ET">ເອທິໂອເປ�</territory>
-			<territory type="FI">ຟິນ�ລນ</territory>
-			<territory type="FJ">ຟິຈິ</territory>
-			<territory type="FM">ໄມໂຄນິເຊ�</territory>
-			<territory type="FR">�ລັ່ງ</territory>
-			<territory type="GA">�າບອນ</territory>
-			<territory type="GB">ສະຫະລາດຊະອານາຈັ�</territory>
-			<territory type="GE">ຈ�ເຈ�</territory>
-			<territory type="GF">ເຟັນສ�ິວນາ</territory>
-			<territory type="GH">�ານ່າ</territory>
-			<territory type="GM">��ມເບ�</territory>
-			<territory type="GN">�ິວນີ</territory>
-			<territory type="GP">�ົວເດີລູບ</territory>
-			<territory type="GQ">ເອຄົວໂທເລ�ລະ�ິນີ</territory>
-			<territory type="GR">�ິຼ�</territory>
-			<territory type="GT">�ົວເຕມາລາ</territory>
-			<territory type="GW">�ິວນີ-ບິສໂຊ</territory>
-			<territory type="GY">�ູຢານາ</territory>
-			<territory type="HK">ຮ່ອງ�ົງ</territory>
-			<territory type="HN">ອວນຄູຣັສ</territory>
-			<territory type="HR">ໂຄເອເຊ�</territory>
-			<territory type="HT">ໄອທີ</territory>
-			<territory type="HU">ຮົງ�າຣີ</territory>
-			<territory type="ID">ອິນໂດເນເຊ�</territory>
-			<territory type="IE">ໄອ�ລນ</territory>
-			<territory type="IL">ອິສລະເອວ</territory>
-			<territory type="IN">ອິນເດ�</territory>
-			<territory type="IQ">ອີລັ�</territory>
-			<territory type="IR">ອີລ່ານ</territory>
-			<territory type="IS">ໄອສ�ລນ</territory>
-			<territory type="IT">ອິຕາລີ</territory>
-			<territory type="JM">ຈາໄມ�າ</territory>
-			<territory type="JO">ຈ��ດນ</territory>
-			<territory type="JP">�ີ່ປຸ່ນ</territory>
-			<territory type="KE">ເຄນຢ່າ</territory>
-			<territory type="KG">ເດີ�ິດສະຖານ</territory>
-			<territory type="KH">�ຳປູເຈ�</territory>
-			<territory type="KI">ຄີລິບາດ</territory>
-			<territory type="KM">ໂຄໂມຣອດ</territory>
-			<territory type="KP">ເ�ົາຫລີເໜືອ</territory>
-			<territory type="KR">ເ�ົາຫລີໃຕ້</territory>
-			<territory type="KW">ຄູເວດ</territory>
-			<territory type="KZ">ຄາຊັດສະຖານ</territory>
-			<territory type="LA">ລາວ</territory>
-			<territory type="LB">ເລບານອນ</territory>
-			<territory type="LI">ໄລເທນສະໄຕ</territory>
-			<territory type="LK">ສີລັງ�າ</territory>
-			<territory type="LR">ລິເບີເລ�</territory>
-			<territory type="LS">ເລໂຊໂທ</territory>
-			<territory type="LT">ລິເທີເນ�</territory>
-			<territory type="LU">ລຸ��ຊມເບີ�</territory>
-			<territory type="LV">ລຼາດເວ�</territory>
-			<territory type="LY">ລິເບ�</territory>
-			<territory type="MA">ໂມລັອ�ໂຄ</territory>
-			<territory type="MC">ໂມນາໂ�</territory>
-			<territory type="MD">ໂມນໂຄວາ</territory>
-			<territory type="MG">ມາຄາ�ັສ�າ</territory>
-			<territory type="MK">�ມຊິໂຄເນ�</territory>
-			<territory type="ML">ມາລິ</territory>
-			<territory type="MM">ສະຫະພາບພະມ້າ</territory>
-			<territory type="MN">ມົງໂ�ລີ</territory>
-			<territory type="MO">ມາເ�ົ້າ</territory>
-			<territory type="MQ">ມາຕິນິ�</territory>
-			<territory type="MR">ມ�ລິ�ທາເນ�</territory>
-			<territory type="MS">ມອນເຊີລາດ</territory>
-			<territory type="MT">ມັນຕາ</territory>
-			<territory type="MU">ມ�ຣິຕຽດ</territory>
-			<territory type="MX">�ມັ�ຊິໂ�</territory>
-			<territory type="MY">ມາເລເຊ�</territory>
-			<territory type="MZ">ໂມ�ຊມບິ�</territory>
-			<territory type="NA">ນາມິເບ�</territory>
-			<territory type="NC">ນິວຄາລິໂຄເນ�</territory>
-			<territory type="NE">ໄນເຈີ</territory>
-			<territory type="NG">ໄນຈີເລ�</territory>
-			<territory type="NI">ນິຄາລາ�ົວ</territory>
-			<territory type="NL">ເນເທີ�ລນ</territory>
-			<territory type="NO">ນ�ເວ</territory>
-			<territory type="NP">ເນປານ</territory>
-			<territory type="NU">ນີຢູ</territory>
-			<territory type="NZ">ນິວຊີ�ລນ</territory>
-			<territory type="OM">ໂອມານ</territory>
-			<territory type="PA">ປານາມາ</territory>
-			<territory type="PE">ເປລູ</territory>
-			<territory type="PF">ເຟັນຣໂພລິນີເຊ�</territory>
-			<territory type="PG">ປາປົວນິວ�ີນີ</territory>
-			<territory type="PH">ຟິລິປິນ</territory>
-			<territory type="PK">ປາ�ິສຖານ</territory>
-			<territory type="PL">ໂປ�ລນ</territory>
-			<territory type="PR">ເປີໂຕລິໂ�</territory>
-			<territory type="PT">ໂປຕຸ��ັນ</territory>
-			<territory type="PY">ປາລາ�ວ�</territory>
-			<territory type="QA">�າຕາ</territory>
-			<territory type="RO">ລູເມເນ�</territory>
-			<territory type="RU">ລັດເຊ�</territory>
-			<territory type="RW">ລາວັນດາ</territory>
-			<territory type="SA">ຊາອຸດິອາລະເບ�</territory>
-			<territory type="SC">ເຊ�ຊວ</territory>
-			<territory type="SD">ຊູດານ</territory>
-			<territory type="SE">ສະວິເດັນ</territory>
-			<territory type="SG">ສິງ�ະໂປ</territory>
-			<territory type="SI">ສະໂລເວເນ�</territory>
-			<territory type="SK">ສະໂລວາເ��</territory>
-			<territory type="SL">ເຊ�ລາສິອອນ</territory>
-			<territory type="SN">ຊິນີ�ັນ</territory>
-			<territory type="SO">ໂຊມາເລ�</territory>
-			<territory type="SR">ຊູລິນາມິ</territory>
-			<territory type="SV">ເອຊາວາດ�</territory>
-			<territory type="SY">ຊິເລ�</territory>
-			<territory type="SZ">ສະວາຊິ�ລນ</territory>
-			<territory type="TD">ຊາດ</territory>
-			<territory type="TF">ອານາເຂດທາງໃຕ້ຂອງ�ລັ່ງເສດ</territory>
-			<territory type="TG">ໂຕໂ�</territory>
-			<territory type="TH">ປະເທດໄທ</territory>
-			<territory type="TJ">ທາຈິ�ິສະຖານ</territory>
-			<territory type="TK">ໂທ�ິໂລ</territory>
-			<territory type="TL">ຕິມ�ຕາເວັນອອ�</territory>
-			<territory type="TM">ເຕຣີ�ເມນິສະຖານ</territory>
-			<territory type="TN">ຕູນິເຊ�</territory>
-			<territory type="TO">ຕອງ�າ</territory>
-			<territory type="TR">ຕຸນ�ີ</territory>
-			<territory type="TT">ທິນິ�ດດ</territory>
-			<territory type="TW">ໄຕ້ຫວັນ</territory>
-			<territory type="TZ">ທານຊາເນ�</territory>
-			<territory type="UA">ຢູເຄຼນ</territory>
-			<territory type="UG">ອູ�ານດາ</territory>
-			<territory type="US">ສະຫະລັດອາເມລິ�າ</territory>
-			<territory type="UY">ລູ�ວ�ອຸຣ</territory>
-			<territory type="UZ">ອຸດເບ�ິສະຖານ</territory>
-			<territory type="VA">ວາຕິ�ັນ</territory>
-			<territory type="VE">ເວເນຊູເອລາ</territory>
-			<territory type="VG">ບຣິທິດເວີຈິນໄອ�ລນ</territory>
-			<territory type="VI">ຢູເອສເວີຈິນໄອ�ລນ</territory>
-			<territory type="VN">ຫວຽດນາມ</territory>
-			<territory type="VU">ວານົວຕູ</territory>
-			<territory type="YE">ເຢເມນ</territory>
-			<territory type="YT">ມາຢອດ</territory>
-			<territory type="ZA">ອາຟະລິ�າໃຕ້</territory>
-			<territory type="ZM">�ຊມເບ�</territory>
-			<territory type="ZW">ຊິມບັບເວ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[່-� ໆ � ຂ ຄ ງ ຈ ຊ � ດ-ທ ນ-ຟ ມ-ຣ ລ ວ ສ ຫ ໜ � ອ-ູ ົ-ຽ ເ-ໄ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200B �-໙]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraAbbr>
-						<era type="0">ພ.ສ.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEທີ່ d MMMM G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ມ.�.</month>
-							<month type="2">�.ພ.</month>
-							<month type="3">ມີ.ນ.</month>
-							<month type="4">ມ.ສ..</month>
-							<month type="5">ພ.ພ.</month>
-							<month type="6">ມິ.ຖ.</month>
-							<month type="7">�.ລ.</month>
-							<month type="8">ສ.ຫ.</month>
-							<month type="9">�.�.</month>
-							<month type="10">ຕ.ລ.</month>
-							<month type="11">ພ.ຈ.</month>
-							<month type="12">ທ.ວ.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ມັງ�ອນ</month>
-							<month type="2">�ຸມພາ</month>
-							<month type="3">ມີນາ</month>
-							<month type="4">ເມສາ</month>
-							<month type="5">ພຶດສະພາ</month>
-							<month type="6">ມິຖຸນາ</month>
-							<month type="7">��ລະ�ົດ</month>
-							<month type="8">ສິງຫາ</month>
-							<month type="9">�ັນ�າ</month>
-							<month type="10">ຕຸລາ</month>
-							<month type="11">ພະຈິ�</month>
-							<month type="12">ທັນວາ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ອາ.</day>
-							<day type="mon">ຈ.</day>
-							<day type="tue">ອ.</day>
-							<day type="wed">ພ.</day>
-							<day type="thu">ພຫ.</day>
-							<day type="fri">ສ�.</day>
-							<day type="sat">ສ.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ວັນອາທິດ</day>
-							<day type="mon">ວັນຈັນ</day>
-							<day type="tue">ວັນອັງຄານ</day>
-							<day type="wed">ວັນພຸດ</day>
-							<day type="thu">ວັນພະຫັດ</day>
-							<day type="fri">ວັນສຸ�</day>
-							<day type="sat">ວັນເສົາ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>�່ອນທ່ຽງ</am>
-				<pm>ຫລັງທ່ຽງ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">ປີ�່ອນຄິດສະ�ານທີ່</era>
-						<era type="1">ຄ.ສ.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEທີ d MMMM G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>Hໂມງ mນາທີ ss ວິນາທີzzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H ໂມງ mນາທີss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="LAK">
-				<displayName>�ີບ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/lo_LA.xml b/airtime_mvc/library/Zend/Locale/Data/lo_LA.xml
deleted file mode 100644
index c80003a19..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lo_LA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="lo"/>
-		<territory type="LA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/lt.xml b/airtime_mvc/library/Zend/Locale/Data/lt.xml
deleted file mode 100644
index 631a7d69e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lt.xml
+++ /dev/null
@@ -1,3327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.111 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="lt"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afarų</language>
-			<language type="ab">abchazų</language>
-			<language type="ace">a�inezų</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangmų</language>
-			<language type="ady">adygėjų</language>
-			<language type="ae">avestų</language>
-			<language type="af">afrikanų</language>
-			<language type="afa">afroazijos kalba</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainų</language>
-			<language type="ak">akanų</language>
-			<language type="akk">akadianų</language>
-			<language type="ale">aleutų</language>
-			<language type="alg">algonkuanų kalba</language>
-			<language type="alt">pietų altajaus</language>
-			<language type="am">amharų</language>
-			<language type="an">aragonesų</language>
-			<language type="ang">senoji anglų</language>
-			<language type="anp">angikų</language>
-			<language type="apa">apa�ių kalba</language>
-			<language type="ar">arabų</language>
-			<language type="arc">aramaikų</language>
-			<language type="arn">araukanų</language>
-			<language type="arp">arapahų</language>
-			<language type="art">dirbtinÄ— kalba</language>
-			<language type="arw">aravakų</language>
-			<language type="as">asamų</language>
-			<language type="ast">asturianų</language>
-			<language type="ath">athapaskanų kalba</language>
-			<language type="aus">australų kalba</language>
-			<language type="av">avarikų</language>
-			<language type="awa">avadhi</language>
-			<language type="ay">aimarų</language>
-			<language type="az">azerbaidžanie�ių</language>
-			<language type="ba">baškirų</language>
-			<language type="bad">bandų</language>
-			<language type="bai">bamilekų kalba</language>
-			<language type="bal">balu�i</language>
-			<language type="ban">balinezų</language>
-			<language type="bas">basų</language>
-			<language type="bat">baltų kalba</language>
-			<language type="be">baltarusių</language>
-			<language type="bej">bėjų</language>
-			<language type="bem">bembų</language>
-			<language type="ber">berberų</language>
-			<language type="bg">bulgarų</language>
-			<language type="bh">biharų</language>
-			<language type="bho">bau�puri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikolų</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambarų</language>
-			<language type="bn">bengalų</language>
-			<language type="bnt">bantų</language>
-			<language type="bo">tibetie�ių</language>
-			<language type="br">bretonų</language>
-			<language type="bra">brajų</language>
-			<language type="bs">bosnių</language>
-			<language type="btk">batakų</language>
-			<language type="bua">buriatų</language>
-			<language type="bug">buginezų</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalonų</language>
-			<language type="cad">kado</language>
-			<language type="cai">Centrinės Amerikos indėnų kalba</language>
-			<language type="car">karibų</language>
-			<language type="cau">kaukazie�ių kalba</language>
-			<language type="cch">atsamų</language>
-			<language type="ce">�e�ėnų</language>
-			<language type="ceb">cebuanų</language>
-			<language type="cel">keltų kalba</language>
-			<language type="ch">�amorų</language>
-			<language type="chb">�ib�a</language>
-			<language type="chg">�agatų</language>
-			<language type="chk">�ukesų</language>
-			<language type="chm">mari</language>
-			<language type="chn">�inuk žargonas</language>
-			<language type="cho">�oktau</language>
-			<language type="chp">�ipvėjų</language>
-			<language type="chr">�erokių</language>
-			<language type="chy">�ajenų</language>
-			<language type="cmc">�amikų kalba</language>
-			<language type="co">korsikie�ių</language>
-			<language type="cop">koptų</language>
-			<language type="cpe">kreolų ir pidžinų kalba pagal anglų</language>
-			<language type="cpf">kreolų ir pidžinų kalba pagal prancūzų</language>
-			<language type="cpp">kreolų ir pidžinų kalba pagal portugalų</language>
-			<language type="cr">kry</language>
-			<language type="crh">krymo turkų</language>
-			<language type="crp">kreolų ir pidžinų</language>
-			<language type="cs">�ekų</language>
-			<language type="csb">kašubų</language>
-			<language type="cu">bažnytinė slavų</language>
-			<language type="cus">kušitik kalba</language>
-			<language type="cv">�iuvašų</language>
-			<language type="cy">valų</language>
-			<language type="da">danų</language>
-			<language type="dak">dakotų</language>
-			<language type="dar">dargva</language>
-			<language type="day">bidayuh kalba</language>
-			<language type="de">vokie�ių</language>
-			<language type="de_AT">Austrijos vokie�ių</language>
-			<language type="de_CH">aukštoji Šveicarijos vokie�ių</language>
-			<language type="del">delavero</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogribų</language>
-			<language type="din">dinkų</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidų kalba</language>
-			<language type="dsb">Žemutinės Serbijos</language>
-			<language type="dua">dualų</language>
-			<language type="dum">Vidurio Vokietijos</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyulų</language>
-			<language type="dz">svazilando</language>
-			<language type="ee">eve</language>
-			<language type="efi">efik</language>
-			<language type="egy">senovės egiptie�ių</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">graikų</language>
-			<language type="elx">elamitų</language>
-			<language type="en">anglų</language>
-			<language type="en_AU">anglų kalba (australija)</language>
-			<language type="en_CA">Kanados anglų</language>
-			<language type="en_GB">anglų (britų)</language>
-			<language type="en_US">anglų (amerikie�ių)</language>
-			<language type="enm">Vidurio Anglijos</language>
-			<language type="eo">esperanto</language>
-			<language type="es">ispanų</language>
-			<language type="es_419">Lotynų Amerikos ispanų</language>
-			<language type="es_ES">Iberijos ispanų</language>
-			<language type="et">estų</language>
-			<language type="eu">baskų</language>
-			<language type="ewo">evondo</language>
-			<language type="fa">persų</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulahų</language>
-			<language type="fi">suomių</language>
-			<language type="fil">tagalų</language>
-			<language type="fiu">finougrų kalba</language>
-			<language type="fj">fidžio</language>
-			<language type="fo">farerų kalba</language>
-			<language type="fon">fon</language>
-			<language type="fr">prancūzų</language>
-			<language type="fr_CA">Kanados prancūzų</language>
-			<language type="fr_CH">Šveicarijos prancūzų</language>
-			<language type="frm">Vidurio Prancūzijos</language>
-			<language type="fro">senoji prancūzų</language>
-			<language type="frr">šiaurinių fryzų</language>
-			<language type="frs">rytų fryzų</language>
-			<language type="fur">frulan</language>
-			<language type="fy">vakarų fryzų</language>
-			<language type="ga">airių</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">škotų (gėlų)</language>
-			<language type="gem">germanų kalba</language>
-			<language type="gez">gyz</language>
-			<language type="gil">kiribati</language>
-			<language type="gl">galisų</language>
-			<language type="gmh">Vidurio aukštosios Vokietijos</language>
-			<language type="gn">gvaranių</language>
-			<language type="goh">Senoji Aukštosios Vokietijos</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotų</language>
-			<language type="grb">grebo</language>
-			<language type="grc">senovės graikų</language>
-			<language type="gsw">Šveicarijos vokie�ių</language>
-			<language type="gu">gudžaratų</language>
-			<language type="gv">manks</language>
-			<language type="gwi">gvi�ino</language>
-			<language type="ha">hausų</language>
-			<language type="hai">haido</language>
-			<language type="haw">havajų</language>
-			<language type="he">hebrajų</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligainon</language>
-			<language type="him">hima�ali</language>
-			<language type="hit">hititų</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">kroatų</language>
-			<language type="hsb">viršutinė sorbian</language>
-			<language type="ht">hai�io</language>
-			<language type="hu">vengrų</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armėnų</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingva</language>
-			<language type="iba">iban</language>
-			<language type="id">indonezie�ių</language>
-			<language type="ie">interkalba</language>
-			<language type="ig">igbo</language>
-			<language type="ii">si�uan ji</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indų kalba</language>
-			<language type="ine">indoeuropie�ių kalba</language>
-			<language type="inh">ingušų</language>
-			<language type="io">ido</language>
-			<language type="ira">Iranie�ių</language>
-			<language type="iro">irako kalba</language>
-			<language type="is">islandų</language>
-			<language type="it">italų</language>
-			<language type="iu">inukitut</language>
-			<language type="ja">japonų</language>
-			<language type="jbo">loiban</language>
-			<language type="jpr">judėjų persų</language>
-			<language type="jrb">judėjų arabų</language>
-			<language type="jv">javie�ių</language>
-			<language type="ka">gruzinų</language>
-			<language type="kaa">karakalpakų</language>
-			<language type="kab">kabilo</language>
-			<language type="kac">ka�in</language>
-			<language type="kaj">ju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karenų</language>
-			<language type="kaw">kavi</language>
-			<language type="kbd">kabardinų</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">kasi</language>
-			<language type="khi">koisan kalba</language>
-			<language type="kho">kotanezų</language>
-			<language type="ki">kikui</language>
-			<language type="kj">kuaniama</language>
-			<language type="kk">kazachų</language>
-			<language type="kl">kalalisut</language>
-			<language type="km">khmerų</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kanadų</language>
-			<language type="ko">korėjie�ių</language>
-			<language type="kok">kankani</language>
-			<language type="kos">kosreanų</language>
-			<language type="kpe">kpele</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">kara�iajų balkarijos</language>
-			<language type="krl">karelų</language>
-			<language type="kro">kru kalba</language>
-			<language type="kru">kuruk</language>
-			<language type="ks">kašmyro</language>
-			<language type="ku">kurdų</language>
-			<language type="kum">kumik</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">kornų</language>
-			<language type="ky">kirgizų</language>
-			<language type="la">lotynų</language>
-			<language type="lad">ladino</language>
-			<language type="lah">landa</language>
-			<language type="lam">lamba</language>
-			<language type="lb">liuksemburgie�ių</language>
-			<language type="lez">lezginų</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgiš</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosie�ių</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lietuvių</language>
-			<language type="lu">luba katanga</language>
-			<language type="lua">luba lula</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lušai</language>
-			<language type="lv">latvių</language>
-			<language type="mad">madurezų</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasaro</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronezų</language>
-			<language type="mas">masajų</language>
-			<language type="mdf">mokša</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malagasijos</language>
-			<language type="mga">Vidurio Airijos</language>
-			<language type="mh">Maršalo salų</language>
-			<language type="mi">maorių</language>
-			<language type="mic">mikmak</language>
-			<language type="min">minankabu</language>
-			<language type="mis">įvairios kalbos</language>
-			<language type="mk">makedonų</language>
-			<language type="mkh">mon khmer kalba</language>
-			<language type="ml">malajalių</language>
-			<language type="mn">mongolų</language>
-			<language type="mnc">man�u</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobo kalba</language>
-			<language type="mo">moldavų</language>
-			<language type="moh">mohok</language>
-			<language type="mos">mosi</language>
-			<language type="mr">maratų</language>
-			<language type="ms">malajie�ių</language>
-			<language type="mt">maltie�ių</language>
-			<language type="mul">kelios kalbos</language>
-			<language type="mun">munda kalba</language>
-			<language type="mus">krykų</language>
-			<language type="mwl">mirandezų</language>
-			<language type="mwr">marvari</language>
-			<language type="my">birmie�ių</language>
-			<language type="myn">majanų</language>
-			<language type="myv">erzyjų</language>
-			<language type="na">naurų</language>
-			<language type="nah">nahuatlų</language>
-			<language type="nai">Šiaurės Amerikos indėnų kalba</language>
-			<language type="nap">neapolie�ių</language>
-			<language type="nb">Norvegijos bokmal</language>
-			<language type="nd">šiaurės ndebelų</language>
-			<language type="nds">Žemutinės Vokietijos</language>
-			<language type="ne">nepalų</language>
-			<language type="new">nevari</language>
-			<language type="ng">ndongų</language>
-			<language type="nia">nias</language>
-			<language type="nic">Nigerio kordofanų kalba</language>
-			<language type="niu">niuenų</language>
-			<language type="nl">olandų</language>
-			<language type="nl_BE">flamandų</language>
-			<language type="nn">naujoji norvegų</language>
-			<language type="no">norvegų</language>
-			<language type="nog">nogų</language>
-			<language type="non">norsu</language>
-			<language type="nqo">enko</language>
-			<language type="nr">pietų ndebele</language>
-			<language type="nso">šiaurės sothų</language>
-			<language type="nub">nubijos kalba</language>
-			<language type="nv">navajų</language>
-			<language type="nwc">klasikinÄ— nevari</language>
-			<language type="ny">nianja</language>
-			<language type="nym">niamvezi</language>
-			<language type="nyn">niankole</language>
-			<language type="nyo">nioro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">provansalų</language>
-			<language type="oj">ojibva</language>
-			<language type="om">oromo</language>
-			<language type="or">orijų</language>
-			<language type="os">osetinų</language>
-			<language type="osa">osage</language>
-			<language type="ota">osmanų turkų</language>
-			<language type="oto">otomanų kalba</language>
-			<language type="pa">pandžabų</language>
-			<language type="paa">papuasų kalba</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiemento</language>
-			<language type="pau">palau</language>
-			<language type="peo">senoji persų</language>
-			<language type="phi">filipinų kalba</language>
-			<language type="phn">finikie�ių</language>
-			<language type="pi">pali</language>
-			<language type="pl">lenkų</language>
-			<language type="pon">ponapean</language>
-			<language type="pra">prakrit kalba</language>
-			<language type="pro">senovės provansalų</language>
-			<language type="ps">puštūnų</language>
-			<language type="pt">portugalų</language>
-			<language type="pt_BR">portugalų (Brazilijos)</language>
-			<language type="pt_PT">Iberijos portugalų</language>
-			<language type="qu">ke�ujų</language>
-			<language type="raj">radžastano</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongan</language>
-			<language type="rm">raeto romanų</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumunų</language>
-			<language type="roa">romanų kalba</language>
-			<language type="rom">romų kalba</language>
-			<language type="root">rūt</language>
-			<language type="ru">rusų</language>
-			<language type="rup">aromanių</language>
-			<language type="rw">kinjarvanda</language>
-			<language type="sa">sanskritas</language>
-			<language type="sad">sandavi</language>
-			<language type="sah">jakutų</language>
-			<language type="sai">Pietų Amerikos indėnų kalba</language>
-			<language type="sal">sališan kalba</language>
-			<language type="sam">samarėjų aramių</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardinie�ių</language>
-			<language type="scn">sicilie�ių</language>
-			<language type="sco">škotų</language>
-			<language type="sd">sindų</language>
-			<language type="se">šiaurinių samių</language>
-			<language type="sel">selkup</language>
-			<language type="sem">samitų kalba</language>
-			<language type="sg">sango</language>
-			<language type="sga">senoji airių</language>
-			<language type="sgn">ženklų kalba</language>
-			<language type="sh">serbų-kroatų</language>
-			<language type="shn">Å¡an</language>
-			<language type="si">sinhalų</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouan kalba</language>
-			<language type="sit">sino tibeto kalba</language>
-			<language type="sk">slovakų</language>
-			<language type="sl">slovėnų</language>
-			<language type="sla">slavų kalba</language>
-			<language type="sm">samoa</language>
-			<language type="sma">pietų sami</language>
-			<language type="smi">samių kalba</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
-			<language type="sn">Å¡ona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalių</language>
-			<language type="sog">sogdien</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanų</language>
-			<language type="sr">serbų</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">sererų</language>
-			<language type="ss">svati</language>
-			<language type="ssa">Nilo Sacharos kalba</language>
-			<language type="st">pietų sesuto</language>
-			<language type="su">sundų</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">šumerų</language>
-			<language type="sv">švedų</language>
-			<language type="sw">svahili</language>
-			<language type="syc">klasikinė sirie�ių</language>
-			<language type="syr">sirų</language>
-			<language type="ta">tamilų</language>
-			<language type="tai">tajų kalba</language>
-			<language type="te">telugų</language>
-			<language type="tem">timne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadžikų</language>
-			<language type="th">tajų</language>
-			<language type="ti">tigrajų</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turkmėnų</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalogų</language>
-			<language type="tlh">„žvaigždžių kelionių“</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamašek</language>
-			<language type="tn">tsvana</language>
-			<language type="to">tonga</language>
-			<language type="tog">niasa tongos</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turkų</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimšian</language>
-			<language type="tt">totorių</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi kalba</language>
-			<language type="tut">altaikų kalba</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">tvi</language>
-			<language type="ty">taitie�ių</language>
-			<language type="tyv">tuvių</language>
-			<language type="udm">udmurtų</language>
-			<language type="ug">uigūrų</language>
-			<language type="uga">ugaritic</language>
-			<language type="uk">ukrainie�ių</language>
-			<language type="umb">umbundu</language>
-			<language type="und">nenustatyta kalba</language>
-			<language type="ur">urdų</language>
-			<language type="uz">uzbekų</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamie�ių</language>
-			<language type="vo">volapiuk</language>
-			<language type="vot">votik</language>
-			<language type="wa">valonų</language>
-			<language type="wak">vakašan kalba</language>
-			<language type="wal">valamo</language>
-			<language type="war">varai</language>
-			<language type="was">vašo</language>
-			<language type="wen">sorbų kalba</language>
-			<language type="wo">volof</language>
-			<language type="xal">kalmukų</language>
-			<language type="xh">kosų</language>
-			<language type="yao">jao</language>
-			<language type="yap">japezų</language>
-			<language type="yi">jidiš</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupik kalba</language>
-			<language type="za">chuang</language>
-			<language type="zap">zapotekų</language>
-			<language type="zbl">„Bliss“ simbolių kalba</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kinų</language>
-			<language type="zh_Hans">kinų supaprastinta</language>
-			<language type="zh_Hant">kinų tradicinė</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulų</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">NÄ—ra kalbinio turinio</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabų</script>
-			<script type="Armi">imperinė aramaikų</script>
-			<script type="Armn">armėnų</script>
-			<script type="Avst">avestano</script>
-			<script type="Bali">Bali</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalų</script>
-			<script type="Blis">„Bliss“ simboliai</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">brailio</script>
-			<script type="Bugi">buginezų</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">�akma</script>
-			<script type="Cans">suvienodinti Kanados aborigenų silabiniai</script>
-			<script type="Cari">karių</script>
-			<script type="Cham">�am</script>
-			<script type="Cher">�erokių</script>
-			<script type="Cirt">kirt</script>
-			<script type="Copt">koptų</script>
-			<script type="Cprt">kipro</script>
-			<script type="Cyrl">kirilica</script>
-			<script type="Cyrs">senoji bažnytinė slavų kirilica</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseretas</script>
-			<script type="Egyd">Egipto liaudies</script>
-			<script type="Egyh">Egipto žynių</script>
-			<script type="Egyp">egipto hieroglifai</script>
-			<script type="Ethi">etiopų</script>
-			<script type="Geok">gruzinų kutsuri</script>
-			<script type="Geor">gruzinų</script>
-			<script type="Glag">glagolitik</script>
-			<script type="Goth">gotų</script>
-			<script type="Grek">graikų</script>
-			<script type="Gujr">gudžiarati</script>
-			<script type="Guru">gurmuki</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanuno</script>
-			<script type="Hans">supaprastinta han</script>
-			<script type="Hant">tradicinÄ— han</script>
-			<script type="Hebr">hebrajų</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahav hmong</script>
-			<script type="Hrkt">katakana/hiragana</script>
-			<script type="Hung">senasis vengrų</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">senasis italų</script>
-			<script type="Java">javie�ių</script>
-			<script type="Jpan">japonų</script>
-			<script type="Kali">kajah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">karošti</script>
-			<script type="Khmr">khmerų</script>
-			<script type="Knda">kanadie�ių</script>
-			<script type="Kore">korejie�ių</script>
-			<script type="Kthi">kaithi</script>
-			<script type="Lana">lana</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">fraktur lotynų</script>
-			<script type="Latg">gėlų lotynų</script>
-			<script type="Latn">lotynų</script>
-			<script type="Lepc">lep�a</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">linijiniai A</script>
-			<script type="Linb">linijiniai B</script>
-			<script type="Lyci">lician</script>
-			<script type="Lydi">lidian</script>
-			<script type="Mand">mandėjų</script>
-			<script type="Mani">mani�ų</script>
-			<script type="Maya">malų hieroglifai</script>
-			<script type="Mero">meroitik</script>
-			<script type="Mlym">malajalų</script>
-			<script type="Mong">mongolų</script>
-			<script type="Moon">mūn</script>
-			<script type="Mtei">meitei majek</script>
-			<script type="Mymr">mianmaro</script>
-			<script type="Nkoo">enko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol �iki</script>
-			<script type="Orkh">orkon</script>
-			<script type="Orya">orija</script>
-			<script type="Osma">osmanų</script>
-			<script type="Perm">senieji permÄ—s</script>
-			<script type="Phag">pagsa pa</script>
-			<script type="Phli">rašytiniai pahlavi</script>
-			<script type="Phlp">pselter pahlavi</script>
-			<script type="Phlv">buk pahvali</script>
-			<script type="Phnx">foenikų</script>
-			<script type="Plrd">polard fonetinÄ—</script>
-			<script type="Prti">rašytiniai partų</script>
-			<script type="Qaai">paveldÄ—tas</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runų</script>
-			<script type="Samr">samarie�ių</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">sauraštra</script>
-			<script type="Sgnw">ženklų raštas</script>
-			<script type="Shaw">šavių</script>
-			<script type="Sinh">sinhala</script>
-			<script type="Sund">sundų</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">sirų</script>
-			<script type="Syre">estrangelo sirie�ių</script>
-			<script type="Syrj">vakarų sirų</script>
-			<script type="Syrn">rytų sirų</script>
-			<script type="Tagb">tagbanva</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">naujasis Tailando lue</script>
-			<script type="Taml">tamilų</script>
-			<script type="Tavt">tai vet</script>
-			<script type="Telu">telugų</script>
-			<script type="Teng">tengvar</script>
-			<script type="Tfng">tifinag</script>
-			<script type="Tglg">tagalogų</script>
-			<script type="Thaa">hana</script>
-			<script type="Thai">tajų</script>
-			<script type="Tibt">tibetie�ių</script>
-			<script type="Ugar">ugaritik</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">matoma kalba</script>
-			<script type="Xpeo">senieji persų</script>
-			<script type="Xsux">Šumero Akado dantiraštis</script>
-			<script type="Yiii">ji</script>
-			<script type="Zmth">matematiniai simboliai</script>
-			<script type="Zsym">simbolių</script>
-			<script type="Zxxx">neparašyta</script>
-			<script type="Zyyy">bendras</script>
-			<script type="Zzzz">nežinomi arba neteisingi rašmenys</script>
-		</scripts>
-		<territories>
-			<territory type="001">Pasaulis</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Å iaurÄ—s Amerika</territory>
-			<territory type="005">Pietų Amerika</territory>
-			<territory type="009">Okeanija</territory>
-			<territory type="011">Vakarų Afrika</territory>
-			<territory type="013">CentrinÄ— Amerika</territory>
-			<territory type="014">Rytų Afrika</territory>
-			<territory type="015">Å iaurÄ—s Afrika</territory>
-			<territory type="017">Vidurio Afrika</territory>
-			<territory type="018">Pietų Afrika [018]</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Å iaurinÄ— Amerika</territory>
-			<territory type="029">Karibai</territory>
-			<territory type="030">Rytų Azija</territory>
-			<territory type="034">Pietų Azija</territory>
-			<territory type="035">Pietry�ių Azija</territory>
-			<territory type="039">Pietų Europa</territory>
-			<territory type="053">Australija ir Naujoji Zelandija</territory>
-			<territory type="054">Melanezija</territory>
-			<territory type="057">Mikronezijos regionas</territory>
-			<territory type="061">Polinezija</territory>
-			<territory type="062">Pietų vidurio Azija</territory>
-			<territory type="142">Azija</territory>
-			<territory type="143">CentrinÄ— Azija</territory>
-			<territory type="145">Vakarų Azija</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Rytų Europa</territory>
-			<territory type="154">Å iaurÄ—s Europa</territory>
-			<territory type="155">Vakarų Europa</territory>
-			<territory type="172">Nepriklausomų Valstybių Sandrauga</territory>
-			<territory type="200">ÄŒekoslovakija</territory>
-			<territory type="419">Lotynų Amerika ir Karibai</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Jungtiniai Arabų Emyratai</territory>
-			<territory type="AF">Afganistanas</territory>
-			<territory type="AG">Antigva ir Barbuda</territory>
-			<territory type="AI">Angilija</territory>
-			<territory type="AL">Albanija</territory>
-			<territory type="AM">ArmÄ—nija</territory>
-			<territory type="AN">Olandijos Antilai</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikos Samoa</territory>
-			<territory type="AT">Austrija</territory>
-			<territory type="AU">Australija</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandų salos</territory>
-			<territory type="AZ">Azerbaidžanas</territory>
-			<territory type="BA">Bosnija ir Hercegovina</territory>
-			<territory type="BB">Barbadosas</territory>
-			<territory type="BD">Bangladešas</territory>
-			<territory type="BE">Belgija</territory>
-			<territory type="BF">Burkina Fasas</territory>
-			<territory type="BG">Bulgarija</territory>
-			<territory type="BH">Bahreinas</territory>
-			<territory type="BI">Burundis</territory>
-			<territory type="BJ">Beninas</territory>
-			<territory type="BL">Å vento Baltramiejaus sala</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">BrunÄ—jus</territory>
-			<territory type="BO">Bolivija</territory>
-			<territory type="BR">Brazilija</territory>
-			<territory type="BS">Bahamos</territory>
-			<territory type="BT">Butanas</territory>
-			<territory type="BV">Bouvet sala</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Baltarusija</territory>
-			<territory type="BZ">Belizas</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosų salos</territory>
-			<territory type="CD">Kongo DemokratinÄ— Respublika</territory>
-			<territory type="CF">CentrinÄ—s Afrikos Respublika</territory>
-			<territory type="CG">Kongas</territory>
-			<territory type="CH">Å veicarija</territory>
-			<territory type="CI">Dramblio Kaulo Krantas</territory>
-			<territory type="CK">Kuko salos</territory>
-			<territory type="CL">ÄŒilÄ—</territory>
-			<territory type="CM">Kamerūnas</territory>
-			<territory type="CN">Kinija</territory>
-			<territory type="CO">Kolumbija</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Serbija ir Juodkalnija</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Žaliasis Kyšulys</territory>
-			<territory type="CX">Kalėdų sala</territory>
-			<territory type="CY">Kipras</territory>
-			<territory type="CZ">ÄŒekija</territory>
-			<territory type="DE">Vokietija</territory>
-			<territory type="DJ">Džibutis</territory>
-			<territory type="DK">Danija</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikos Respublika</territory>
-			<territory type="DZ">Alžyras</territory>
-			<territory type="EC">Ekvadoras</territory>
-			<territory type="EE">Estija</territory>
-			<territory type="EG">Egiptas</territory>
-			<territory type="EH">Vakarų Sachara</territory>
-			<territory type="ER">EritrÄ—ja</territory>
-			<territory type="ES">Ispanija</territory>
-			<territory type="ET">Etiopija</territory>
-			<territory type="FI">Suomija</territory>
-			<territory type="FJ">Fidžis</territory>
-			<territory type="FK">Falklando salos</territory>
-			<territory type="FM">Mikronezija</territory>
-			<territory type="FO">Farerų salos</territory>
-			<territory type="FR">Prancūzija</territory>
-			<territory type="GA">Gabonas</territory>
-			<territory type="GB">Didžioji Britanija</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzija</territory>
-			<territory type="GF">Prancūzijos Gviana</territory>
-			<territory type="GG">Guernsis</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltaras</territory>
-			<territory type="GL">Grenlandija</territory>
-			<territory type="GM">Gambija</territory>
-			<territory type="GN">GvinÄ—ja</territory>
-			<territory type="GP">GvadelupÄ—</territory>
-			<territory type="GQ">Pusiaujo GvinÄ—ja</territory>
-			<territory type="GR">Graikija</territory>
-			<territory type="GS">Pietų Džordžija ir Pietų Sandvi�o salos</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guamas</territory>
-			<territory type="GW">Bisau GvinÄ—ja</territory>
-			<territory type="GY">Gajana</territory>
-			<territory type="HK">Kinijos S.A.R.Honkongas</territory>
-			<territory type="HM">Heardo ir McDonaldo Salų Sritis</territory>
-			<territory type="HN">Hondūras</territory>
-			<territory type="HR">Kroatija</territory>
-			<territory type="HT">Haitis</territory>
-			<territory type="HU">Vengrija</territory>
-			<territory type="ID">Indonezija</territory>
-			<territory type="IE">Airija</territory>
-			<territory type="IL">Izraelis</territory>
-			<territory type="IM">Meino sala</territory>
-			<territory type="IN">Indija</territory>
-			<territory type="IO">Indijos vandenyno britų sritis</territory>
-			<territory type="IQ">Irakas</territory>
-			<territory type="IR">Iranas</territory>
-			<territory type="IS">Islandija</territory>
-			<territory type="IT">Italija</territory>
-			<territory type="JE">Džersis</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordanija</territory>
-			<territory type="JP">Japonija</territory>
-			<territory type="KE">Kenija</territory>
-			<territory type="KG">Kirgiztanas</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribatis</territory>
-			<territory type="KM">Komorai</territory>
-			<territory type="KN">Sent Kitsas ir Nevis</territory>
-			<territory type="KP">Å iaurÄ—s KorÄ—ja</territory>
-			<territory type="KR">Pietų Korėja</territory>
-			<territory type="KW">Kuveitas</territory>
-			<territory type="KY">Kaimanų salos</territory>
-			<territory type="KZ">Kazachstanas</territory>
-			<territory type="LA">Laosas</territory>
-			<territory type="LB">Libanas</territory>
-			<territory type="LC">Å ventoji Liucija</territory>
-			<territory type="LI">Lichtenšteinas</territory>
-			<territory type="LK">Å ri Lanka</territory>
-			<territory type="LR">Liberija</territory>
-			<territory type="LS">Lesotas</territory>
-			<territory type="LT">Lietuva</territory>
-			<territory type="LU">Liuksemburgas</territory>
-			<territory type="LV">Latvija</territory>
-			<territory type="LY">Libija</territory>
-			<territory type="MA">Marokas</territory>
-			<territory type="MC">Monakas</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Juodkalnija</territory>
-			<territory type="MF">Saint-Martin</territory>
-			<territory type="MG">Madagaskaras</territory>
-			<territory type="MH">Maršalo Salos</territory>
-			<territory type="MK">Makedonija</territory>
-			<territory type="ML">Malis</territory>
-			<territory type="MM">Mianmaras</territory>
-			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Macao</territory>
-			<territory type="MP">Marianos Å¡iaurinÄ—s salos</territory>
-			<territory type="MQ">Martinika</territory>
-			<territory type="MR">Mauritanija</territory>
-			<territory type="MS">Montserratas</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricijus</territory>
-			<territory type="MV">Maldivai</territory>
-			<territory type="MW">Malavis</territory>
-			<territory type="MX">Meksika</territory>
-			<territory type="MY">Malaizija</territory>
-			<territory type="MZ">Mozambikas</territory>
-			<territory type="NA">Namibija</territory>
-			<territory type="NC">Naujoji Kaledonija</territory>
-			<territory type="NE">Nigeris</territory>
-			<territory type="NF">Norfolko sala</territory>
-			<territory type="NG">Nigerija</territory>
-			<territory type="NI">Nikaragva</territory>
-			<territory type="NL">Nyderlandai</territory>
-			<territory type="NO">Norvegija</territory>
-			<territory type="NP">Nepalas</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Naujoji Zelandija</territory>
-			<territory type="OM">Omanas</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Prancūzų Polinezija</territory>
-			<territory type="PG">Papua Naujoji GvinÄ—ja</territory>
-			<territory type="PH">Filipinai</territory>
-			<territory type="PK">Pakistanas</territory>
-			<territory type="PL">Lenkija</territory>
-			<territory type="PM">Sen Pjeras ir Mikelonas</territory>
-			<territory type="PN">Pitkernas</territory>
-			<territory type="PR">Puerto Rikas</territory>
-			<territory type="PS">Palestinos teritorija</territory>
-			<territory type="PT">Portugalija</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragvajus</territory>
-			<territory type="QA">Kataras</territory>
-			<territory type="QU">Europos SÄ…junga</territory>
-			<territory type="RE">Reunionas</territory>
-			<territory type="RO">Rumunija</territory>
-			<territory type="RS">Serbija</territory>
-			<territory type="RU">Rusijos Federacija</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudo Arabija</territory>
-			<territory type="SB">Saliamono salos</territory>
-			<territory type="SC">Seišeliai</territory>
-			<territory type="SD">Sudanas</territory>
-			<territory type="SE">Å vedija</territory>
-			<territory type="SG">Singapūras</territory>
-			<territory type="SH">Å ventoji Elena</territory>
-			<territory type="SI">SlovÄ—nija</territory>
-			<territory type="SJ">Svalbardo ir Jan Majen salos</territory>
-			<territory type="SK">Slovakija</territory>
-			<territory type="SL">Siera LeonÄ—</territory>
-			<territory type="SM">San Marinas</territory>
-			<territory type="SN">Senegalas</territory>
-			<territory type="SO">Somalis</territory>
-			<territory type="SR">Surinamas</territory>
-			<territory type="ST">San TomÄ— ir PrincipÄ—</territory>
-			<territory type="SV">Salvadoras</territory>
-			<territory type="SY">Sirija</territory>
-			<territory type="SZ">Svazilendas</territory>
-			<territory type="TC">Turkso ir Caicoso salos</territory>
-			<territory type="TD">ÄŒadas</territory>
-			<territory type="TF">Prancūzijos Pietų sritys</territory>
-			<territory type="TG">Togas</territory>
-			<territory type="TH">Tailandas</territory>
-			<territory type="TJ">Tadžikistanas</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Rytų Timoras</territory>
-			<territory type="TM">TurkmÄ—nistanas</territory>
-			<territory type="TN">Tunisas</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkija</territory>
-			<territory type="TT">Trinidadas ir Tobagas</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taivanas</territory>
-			<territory type="TZ">Tanzanija</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Jungtinių Valstijų mažosios aplinkinės salos</territory>
-			<territory type="US">JungtinÄ—s Valstijos</territory>
-			<territory type="UY">Urugvajus</territory>
-			<territory type="UZ">Uzbekistanas</territory>
-			<territory type="VA">Vatikanas</territory>
-			<territory type="VC">Å ventasis Vincentas ir Grenadinai</territory>
-			<territory type="VE">Venesuela</territory>
-			<territory type="VG">Didžiosios Britanijos Mergelių salos</territory>
-			<territory type="VI">Mergelių salos (JAV)</territory>
-			<territory type="VN">Vietnamas</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallisas ir Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemenas</territory>
-			<territory type="YT">Mayotte’as</territory>
-			<territory type="ZA">Pietų Afrika</territory>
-			<territory type="ZM">Zambija</territory>
-			<territory type="ZW">ZimbabvÄ—</territory>
-			<territory type="ZZ">Nežinoma ar neteisinga sritis</territory>
-		</territories>
-		<variants>
-			<variant type="POSIX">Kompiuteris</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalendorius</key>
-			<key type="collation">lyginimas</key>
-			<key type="currency">valiuta</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">Budistų kalendorius</type>
-			<type type="chinese" key="calendar">Kinie�ių kalendorius</type>
-			<type type="gregorian" key="calendar">Grigaliaus kalendorius</type>
-			<type type="hebrew" key="calendar">Hebrajų kalendorius</type>
-			<type type="islamic" key="calendar">Islamo kalendorius</type>
-			<type type="japanese" key="calendar">Japonų kalendorius</type>
-			<type type="roc" key="calendar">Kinijos respublikos kalendorius</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">MetrinÄ—</measurementSystemName>
-			<measurementSystemName type="US">JAV</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Kalba: {0}</codePattern>
-			<codePattern type="script">Rašmenys: {0}</codePattern>
-			<codePattern type="territory">Sritis: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a ą b c � d e ę ė f-i į y j-p r s š t u ų ū v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[{į\u0307} {i\u0307} {i\u0307\u0301} {i\u0307\u0300} {i\u0307\u0303} {j\u0307} q w x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a ą b c � d e ę ė f-i į y j-p r s š t u ų ū v z ž]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}−{1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<am>ryte</am>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y G, MMMM d, EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Sau</month>
-							<month type="2">Vas</month>
-							<month type="3">Kov</month>
-							<month type="4">Bal</month>
-							<month type="5">Geg</month>
-							<month type="6">Bir</month>
-							<month type="7">Lie</month>
-							<month type="8">Rgp</month>
-							<month type="9">Rgs</month>
-							<month type="10">Spl</month>
-							<month type="11">Lap</month>
-							<month type="12">Grd</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">sausio</month>
-							<month type="2">vasario</month>
-							<month type="3">kovo</month>
-							<month type="4">balandžio</month>
-							<month type="5">gegužės</month>
-							<month type="6">birželio</month>
-							<month type="7">liepos</month>
-							<month type="8">rugpjū�io</month>
-							<month type="9">rugsÄ—jo</month>
-							<month type="10">spalio</month>
-							<month type="11">lapkri�io</month>
-							<month type="12">gruodžio</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">S</month>
-							<month type="2">V</month>
-							<month type="3">K</month>
-							<month type="4">B</month>
-							<month type="5">G</month>
-							<month type="6">B</month>
-							<month type="7">L</month>
-							<month type="8">R</month>
-							<month type="9">R</month>
-							<month type="10">S</month>
-							<month type="11">L</month>
-							<month type="12">G</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Sausis</month>
-							<month type="2">Vasaris</month>
-							<month type="3">Kovas</month>
-							<month type="4">Balandis</month>
-							<month type="5">Gegužė</month>
-							<month type="6">Birželis</month>
-							<month type="7">Liepa</month>
-							<month type="8">Rugpjūtis</month>
-							<month type="9">RugsÄ—jis</month>
-							<month type="10">Spalis</month>
-							<month type="11">Lapkritis</month>
-							<month type="12">Gruodis</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sk</day>
-							<day type="mon">Pr</day>
-							<day type="tue">An</day>
-							<day type="wed">Tr</day>
-							<day type="thu">Kt</day>
-							<day type="fri">Pn</day>
-							<day type="sat">Å t</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sekmadienis</day>
-							<day type="mon">pirmadienis</day>
-							<day type="tue">antradienis</day>
-							<day type="wed">tre�iadienis</day>
-							<day type="thu">ketvirtadienis</day>
-							<day type="fri">penktadienis</day>
-							<day type="sat">šeštadienis</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">P</day>
-							<day type="tue">A</day>
-							<day type="wed">T</day>
-							<day type="thu">K</day>
-							<day type="fri">P</day>
-							<day type="sat">Å </day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">pirmas ketvirtis</quarter>
-							<quarter type="2">antras ketvirtis</quarter>
-							<quarter type="3">tre�ias ketvirtis</quarter>
-							<quarter type="4">ketvirtas ketvirtis</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1K</quarter>
-							<quarter type="2">2K</quarter>
-							<quarter type="3">3K</quarter>
-							<quarter type="4">4K</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>priešpiet</am>
-				<pm>popiet</pm>
-				<eras>
-					<eraNames>
-						<era type="0">prieš Kristų</era>
-						<era type="1">po Kristaus</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">pr. Kr.</era>
-						<era type="1">po Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y 'm'. MMMM d 'd'.,EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y 'm'. MMMM d 'd'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy.MM.dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="MMdd">MM.dd</dateFormatItem>
-						<dateFormatItem id="MMMdd">MMM-dd</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy.MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-ddE - MM-ddE</greatestDifference>
-							<greatestDifference id="M">MM-ddE - MM-ddE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d 'd'.-d 'd'.</greatestDifference>
-							<greatestDifference id="M">MMM d 'd'. - MMM d 'd'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d 'd'.E - d 'd'.E</greatestDifference>
-							<greatestDifference id="M">MMM d 'd'.E - MMM d 'd'.E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM - yyyy-MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM - yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yyyy-MM-ddE - yyyy-MM-ddE</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-ddE - yyyy-MM-ddE</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-ddE - yyyy-MM-ddE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y 'm'. MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y 'm'. MMM - y 'm'. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y 'm'. MMM d 'd'.-d 'd'.</greatestDifference>
-							<greatestDifference id="M">y 'm'. MMM d 'd'. - MMM d 'd'.</greatestDifference>
-							<greatestDifference id="y">y 'm'. MMM d 'd'. - y 'm'. MMM d 'd'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y 'm'. MMM d 'd'.,E - d 'd'.,E</greatestDifference>
-							<greatestDifference id="M">y 'm'. MMM d 'd'.,E - MMM d 'd'.,E</greatestDifference>
-							<greatestDifference id="y">y 'm'. MMM d 'd'.,E - y 'm'. MMM d 'd'.,E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>metai</displayName>
-					</field>
-					<field type="month">
-						<displayName>mÄ—nuo</displayName>
-					</field>
-					<field type="week">
-						<displayName>savaitÄ—</displayName>
-					</field>
-					<field type="day">
-						<displayName>diena</displayName>
-						<relative type="-3">už užvakar</relative>
-						<relative type="-2">užvakar</relative>
-						<relative type="-1">vakar</relative>
-						<relative type="0">Å¡iandien</relative>
-						<relative type="1">rytoj</relative>
-						<relative type="2">poryt</relative>
-						<relative type="3">užporyt</relative>
-					</field>
-					<field type="weekday">
-						<displayName>savaitÄ—s diena</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>dienos metas</displayName>
-					</field>
-					<field type="hour">
-						<displayName>valanda</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minutÄ—</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekundÄ—</displayName>
-					</field>
-					<field type="zone">
-						<displayName>juosta</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{0} ({1})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nežinoma</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubajus</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabulas</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevanas</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Palmeris</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Pietų ašigalis</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Syova</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Vostokas</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio Galjegosas</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Mendosa</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San Chuanas</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>UÅ¡uaja</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La Riocha</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Sent Luisas</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Katamarka</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Chuchujus</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tukumanas</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos AirÄ—s</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Pertas</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Darvinas</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>AdelaidÄ—</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Melburnas</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Hobartas</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>SidnÄ—jus</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Brisbanas</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lordo Hau sala</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbadosas</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Daka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Briuselis</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahreinas</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudų salos</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>BrunÄ—jus</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>La Pasas</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Brankas</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Manausas</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Kujaba</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarenas</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belemas</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>San Paulas</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>ResifÄ—</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Gaboronas</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minskas</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belizas</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Dosonas</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Vaithorsas</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Vankuveris</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Dosono įlanka</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelounaifas</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Edmontonas</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Kembridžo įlanka</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Redžina</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Vinipegas</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander BÄ—jus</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigonas</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Torontas</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Monrealis</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ikaluitas</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtungas</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Monktonas</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Halifaksas</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinšasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lubumbašis</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Brazavilis</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Ciurichas</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidžanas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Velykų sala</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Santjagas</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kashi</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urum�i</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Čong�ingas</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Harbinas</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kosta Rika</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Kalėdų sala</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikosija</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlynas</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibutis</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhaga</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santo Domingas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagai</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Talinas</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairas</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarų salos</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Seuta</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madridas</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinkis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidžis</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Stenlis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Trukas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>PonapÄ—</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Farerai</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Paryžius</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Librevilis</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londonas</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilisis</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Kajenas</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibraltaras</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>TÅ«la</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthabas</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkshavn’as</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Konakris</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>GvadelupÄ—</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>AtÄ—nai</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Guamas</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gajana</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Honkongas</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapeštas</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Džakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Pontianakas</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasaras</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Džajapura</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublinas</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdadas</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheranas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reikjavikas</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Amanas</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>Nairobis</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biškekas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderburis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Tarava</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komoras</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitsas</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seulas</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuveitas</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kaimanas</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Uralskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktiubinskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kzyl-Orda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Alma Ata</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vientianas</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirutas</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Vaducas</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Kolombo</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monrovija</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Liuksemburgas</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Ryga</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripolis</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Kasablanka</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monakas</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarivas</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangūnas</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan-Batoras</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ÄŒoibalsanas</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makao</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Saipanas</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinika</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Montseratas</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricijus</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldyvai</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Tichuana</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Hermosiljas</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlanas</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ÄŒihuahua</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>MonterÄ—jus</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Meksikas</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Kankunas</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Ku�ingas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Norfolkas</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Managva</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdamas</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Oslas</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Maskatas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Taitis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markizo salos</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšuva</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairno salos</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Puerto Rikas</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Gazos ruožas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorai</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabona</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunsjonas</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Kataras</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunionas</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukareštas</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningradas</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Maskva</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgogradas</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburgas</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novosibirskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutskas</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vladivostokas</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalinas</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magadanas</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�iatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>AnadyrÄ—</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rijadas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Gvadalkanalas</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Chartumas</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stokholmas</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapūras</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Å v. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Frytaunas</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Dakaras</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadišas</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>San TomÄ—</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvadoras</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskas</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Grand Terkas</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>Ndžamena</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Bankokas</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dušanbė</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Dilis</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅ¡chabadas</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunisas</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Stambulas</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port of Speinas</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorodas</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijevas</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Simferopolis</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožė</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Jungtinių Valstijų mažosios aplinkinės salos (Midway</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonstonas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Jungtinių Valstijų mažosios aplinkinės salos (Klivateris)</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Ankoridžas</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Jakutat</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Džūnas</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Los Andželas</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>BoisÄ—</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Fyniksas</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Denveris</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Naujasis Salemas, Å iaurÄ—s Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>JungtinÄ—s Valstijos (Centras, Å iaurÄ—s Dakota)</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ÄŒikaga</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincenas, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Peterburgas</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Noksas, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Vinamakas, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Luizvilis</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticelas, Kentukis</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Detroitas</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Niujorkas</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Montevidëjas</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkandas</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškentas</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Sant VincentÄ—</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Karakasas</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Efatas</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>Apija</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Adenas</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Majotas</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johanesburgas</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>CentrinÄ—s Afrikos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Rytų Afrikos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Pietų Afrikos laikas</generic>
-					<standard>Pietų Afrikos standartinis laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Vakarų Afrikos laikas</standard>
-					<daylight>Vakarų Afrikos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Aliaskos laikas</generic>
-					<standard>Aliaskos standartinis laikas</standard>
-					<daylight>Aliaskos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Aliaskos-Havajų laikas</generic>
-					<standard>Aliaskos-Havajų standartinis laikas</standard>
-					<daylight>Aliaskos-Havajų vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>AmazonÄ—s laikas</standard>
-					<daylight>AmazonÄ—s vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Centro laikas</generic>
-					<standard>Centro standartinis laikas</standard>
-					<daylight>Centro vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Rytų laikas</generic>
-					<standard>Rytų standartinis laikas</standard>
-					<daylight>Rytų vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Ramiojo vandenyno laikas</generic>
-					<standard>Ramiojo vandenyno standartinis laikas</standard>
-					<daylight>Ramiojo vandenyno vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (Aktau)</standard>
-					<daylight>AQTST (Aktau)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (AktobÄ—)</standard>
-					<daylight>AQTST (AktobÄ—)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentinos laikas</standard>
-					<daylight>Argentinos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Vakarų Argentinos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlanto laikas</generic>
-					<standard>Atlanto standartinis laikas</standard>
-					<daylight>Atlanto vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Beringo laikas</generic>
-					<standard>Beringo standartinis laikas</standard>
-					<daylight>Beringo vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Bolivijos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brazilijos laikas</standard>
-					<daylight>Brazilijos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>ÄŒilÄ—s laikas</standard>
-					<daylight>ÄŒilÄ—s vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Kolumbijos laikas</standard>
-					<daylight>Kolumbijos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Kubos laikas</generic>
-					<standard>Kubos standartinis laikas</standard>
-					<daylight>Kubos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Olandų Gajanos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ekvadoro laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Vidurio Europos laikas</standard>
-					<daylight>Vidurio Europos vasaros laikas</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Rytų Europos laikas</standard>
-					<daylight>Rytų Europos vasaros laikas</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Prancūzų Gajanos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Grenlandijos centro laikas</standard>
-					<daylight>Grenlandijos centro vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Grenlandijos rytų laikas</standard>
-					<daylight>Grenlandijos rytų vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Grenlandijos vakarų laikas</standard>
-					<daylight>Grenlandijos vakarų vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Gajanos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuibyševo laikas</standard>
-					<daylight>Kuibyševo vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Maskvos laikas</generic>
-					<standard>Maskvos standartinis laikas</standard>
-					<daylight>Maskvos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Niufaundlendo laikas</generic>
-					<standard>Niufaundlendo standartinis laikas</standard>
-					<daylight>Niufaundlendo vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paragvajaus laikas</standard>
-					<daylight>Paragvajaus vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peru laikas</standard>
-					<daylight>Peru vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samaros laikas</standard>
-					<daylight>Samaros vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (Samarkandas)</standard>
-					<daylight>SAMST (Samarkandas)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turkijos laikas</standard>
-					<daylight>Turkijos vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Urugvajaus laikas</standard>
-					<daylight>Urugvajaus vasaros laikas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venesuelos laikas</standard>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgogrado laikas</standard>
-					<daylight>Volgogrado vasaros laikas</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>¤¤¤</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andoros peseta</displayName>
-				<displayName count="few">Andoros pesetos</displayName>
-				<displayName count="one">Andoros peseta</displayName>
-				<displayName count="other">Andoros pesetos</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>JAE dirhamas</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afganis (1927-2002)</displayName>
-				<displayName count="few">Afganiai (1927-2002)</displayName>
-				<displayName count="one">Afganis (1927-2002)</displayName>
-				<displayName count="other">Afganiai (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afganis</displayName>
-				<displayName count="few">Afganiai</displayName>
-				<displayName count="one">Afganis</displayName>
-				<displayName count="other">Afganiai</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albanijos lekas</displayName>
-				<displayName count="few">Albanijos lekai</displayName>
-				<displayName count="one">Albanijos lekas</displayName>
-				<displayName count="other">Albanijos lekai</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>ArmÄ—nijos dramas</displayName>
-				<displayName count="few">ArmÄ—nijos dramai</displayName>
-				<displayName count="one">ArmÄ—nijos dramas</displayName>
-				<displayName count="other">ArmÄ—nijos dramai</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Nyderlandų Antilų guldenas</displayName>
-				<displayName count="few">Nyderlandų Antilų guldenas</displayName>
-				<displayName count="other">Nyderlandų Antilų guldenai</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolos kvanza</displayName>
-				<displayName count="few">Angolos kvanzos</displayName>
-				<displayName count="one">Angolos kvanza</displayName>
-				<displayName count="other">Angolos kvanzai</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolos kvanza (1977-1990)</displayName>
-				<displayName count="few">Angolos kvanzos (1977-1990)</displayName>
-				<displayName count="one">Angolos kvanza (1977-1990)</displayName>
-				<displayName count="other">Angolos kvanzai (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolos naujoji kvanza</displayName>
-				<displayName count="few">Angolos naujosios kvanzos</displayName>
-				<displayName count="one">Angolos naujoji kvanza</displayName>
-				<displayName count="other">Angolos naujosios kvanzos</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinos pesas (1983-1985)</displayName>
-				<displayName count="few">Argentinos pesai (1983-1985)</displayName>
-				<displayName count="one">Argentinos pesas (1983-1985)</displayName>
-				<displayName count="other">Argentinos pesai (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinos pesas</displayName>
-				<displayName count="one">Argentinos pesas</displayName>
-				<displayName count="other">Argentinos pesai</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austrijos Å¡ilingas</displayName>
-				<displayName count="few">Austrijos Å¡ilingai</displayName>
-				<displayName count="one">Austrijos Å¡ilingas</displayName>
-				<displayName count="other">Austrijos Å¡ilingai</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australijos doleris</displayName>
-				<displayName count="one">Australijos doleris</displayName>
-				<displayName count="other">Australijos doleriai</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubos guldenas</displayName>
-				<displayName count="few">Arubos guldenai</displayName>
-				<displayName count="one">Arubos guldenas</displayName>
-				<displayName count="other">Arubos guldenai</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbaidžano manatas (1993-2006)</displayName>
-				<displayName count="few">Azerbaidžano manatai (1993-2006)</displayName>
-				<displayName count="one">Azerbaidžano manatas (1993-2006)</displayName>
-				<displayName count="other">Azerbaidžano manatai (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbaidžano manatas</displayName>
-				<displayName count="few">Azerbaidžano manatai</displayName>
-				<displayName count="one">Azerbaidžano manatas</displayName>
-				<displayName count="other">Azerbaidžano manatai</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnijos ir Hercegovinos dinaras</displayName>
-				<displayName count="few">Bosnijos ir Hercegovinos dinarai</displayName>
-				<displayName count="one">Bosnijos ir Hercegovinos dinaras</displayName>
-				<displayName count="other">Bosnijos ir Hercegovinos dinarai</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnijos ir Hercegovinos konvertuojamoji markÄ—</displayName>
-				<displayName count="few">Bosnijos ir Hercegovinos konvertuojamosios markÄ—s</displayName>
-				<displayName count="one">Bosnijos ir Hercegovinos konvertuojamoji markÄ—</displayName>
-				<displayName count="other">Bosnijos ir Hercegovinos konvertuojamosios markÄ—s</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadoso doleris</displayName>
-				<displayName count="few">Barbadoso doleriai</displayName>
-				<displayName count="one">Barbadoso doleris</displayName>
-				<displayName count="other">Barbadoso doleriai</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladešo taka</displayName>
-				<displayName count="few">Bangladešo takos</displayName>
-				<displayName count="one">Bangladešo taka</displayName>
-				<displayName count="other">Bangladešo takos</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgijos frankas (konvertuojamas)</displayName>
-				<displayName count="few">Belgijos frankai (konvertuojami)</displayName>
-				<displayName count="one">Belgijos frankas (konvertuojamas)</displayName>
-				<displayName count="other">Belgijos frankai (konvertuojami)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgijos frankas</displayName>
-				<displayName count="few">Belgijos frankai</displayName>
-				<displayName count="one">Belgijos frankas</displayName>
-				<displayName count="other">Belgijos frankai</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgijos frankas (finansinis)</displayName>
-				<displayName count="few">Belgijos frankai (finansiniai)</displayName>
-				<displayName count="one">Belgijos frankas (finansinis)</displayName>
-				<displayName count="other">Belgijos frankai (finansiniai)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgarijos levas (1962-1999)</displayName>
-				<displayName count="few">Bulgarijos levai</displayName>
-				<displayName count="one">Bulgarijos levas (1962-1999)</displayName>
-				<displayName count="other">Bulgarijos levai</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgarijos levas</displayName>
-				<displayName count="one">Bulgarijos naujasis levas</displayName>
-				<displayName count="other">Bulgarijos naujasis levai</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreino dinaras</displayName>
-				<displayName count="few">Bahreino dinarai</displayName>
-				<displayName count="one">Bahreino dinaras</displayName>
-				<displayName count="other">Bahreino dinarai</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundžio frankas</displayName>
-				<displayName count="few">Burundžio frankai</displayName>
-				<displayName count="one">Burundžio frankas</displayName>
-				<displayName count="other">Burundžio frankai</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudos doleris</displayName>
-				<displayName count="few">Bermudos doleriai</displayName>
-				<displayName count="one">Bermudos doleris</displayName>
-				<displayName count="other">Bermudos doleriai</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>BrunÄ—jaus doleris</displayName>
-				<displayName count="one">BrunÄ—jaus doleris</displayName>
-				<displayName count="other">BrunÄ—jaus doleriai</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivijos bolivijanas</displayName>
-				<displayName count="one">Bolivijos bolivijanas</displayName>
-				<displayName count="other">Bolivijos bolivijanai</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivijos pesas</displayName>
-				<displayName count="few">Bolivijos pesai</displayName>
-				<displayName count="one">Bolivijos pesas</displayName>
-				<displayName count="other">Bolivijos pesai</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivijos mvdol</displayName>
-				<displayName count="one">Bolivijos mvdol</displayName>
-				<displayName count="other">Bolivijos mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brazilijos naujasis kruzeiras</displayName>
-				<displayName count="few">Brazilijos naujieji kruzeirai</displayName>
-				<displayName count="one">Brazilijos naujasis kruzeiras</displayName>
-				<displayName count="other">Brazilijos naujieji kruzeirai</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brazilijos kruzadas</displayName>
-				<displayName count="few">Brazilijos kruzadai</displayName>
-				<displayName count="one">Brazilijos kruzadas</displayName>
-				<displayName count="other">Brazilijos kruzadai</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brazilijos kruzeiras (1990-1993)</displayName>
-				<displayName count="few">Brazilijos kruzeirai (1990-1993)</displayName>
-				<displayName count="one">Brazilijos kruzeiras (1990-1993)</displayName>
-				<displayName count="other">Brazilijos kruzeirai (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazilijos realas</displayName>
-				<displayName count="one">Brazilijos realas</displayName>
-				<displayName count="other">Brazilijos realai</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brazilijos naujasis kruzadas</displayName>
-				<displayName count="few">Brazilijos naujieji kruzadai</displayName>
-				<displayName count="one">Brazilijos naujasis kruzadas</displayName>
-				<displayName count="other">Brazilijos naujieji kruzadai</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brazilijos kruzeiras</displayName>
-				<displayName count="few">Brazilijos kruzeirai</displayName>
-				<displayName count="one">Brazilijos kruzeiras</displayName>
-				<displayName count="other">Brazilijos kruzeirai</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamų doleris</displayName>
-				<displayName count="few">Bahamų doleriai</displayName>
-				<displayName count="one">Bahamų doleris</displayName>
-				<displayName count="other">Bahamų doleriai</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Butano ngultrumas</displayName>
-				<displayName count="few">Butano ngultrumai</displayName>
-				<displayName count="one">Butano ngultrumas</displayName>
-				<displayName count="other">Butano ngultrumai</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botsvanos pula</displayName>
-				<displayName count="few">Botsvanos pulos</displayName>
-				<displayName count="one">Botsvanos pula</displayName>
-				<displayName count="other">Botsvanos pulos</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Baltarusijos naujasis rublis</displayName>
-				<displayName count="one">Baltarusijos naujasis rublis</displayName>
-				<displayName count="other">Baltarusijos naujieji rubliai</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Baltarusijos rublis</displayName>
-				<displayName count="one">Baltarusijos rublis</displayName>
-				<displayName count="other">Baltarusijos rubliai</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizo doleris</displayName>
-				<displayName count="one">Belizo doleris</displayName>
-				<displayName count="other">Belizo doleriai</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanados doleris</displayName>
-				<displayName count="one">Kanados doleris</displayName>
-				<displayName count="other">Kanados doleriai</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Kongo frankas</displayName>
-				<displayName count="one">Kongo frankas</displayName>
-				<displayName count="other">Kongo frankai</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å veicarijos frankas</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>ÄŒilÄ—s pesas</displayName>
-				<displayName count="one">ÄŒilÄ—s pesas</displayName>
-				<displayName count="other">ÄŒilÄ—s pesai</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Ženminbi juanis</displayName>
-				<displayName count="one">Kinijos juanis</displayName>
-				<displayName count="other">Kinijos juaniai</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbijos pesas</displayName>
-				<displayName count="one">Kolumbijos pesas</displayName>
-				<displayName count="other">Kolumbijos pesai</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kosta Rikos kolonas</displayName>
-				<displayName count="one">Kosta Rikos kolonas</displayName>
-				<displayName count="other">Kosta Rikos kolonai</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Senasis Serbijos dinaras</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubos pesas</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kipro svaras</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>ÄŒekijos krona</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Rytų Vokietijos ostmarkė</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Vokietijos markÄ—</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Džibu�io frankas</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Danijos krona</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikos pesas</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alžyro dinaras</displayName>
-				<displayName count="one">Alžyro dinaras</displayName>
-				<displayName count="other">Alžyro dinarai</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ekvadoro sukrÄ—</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ekvadoro constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estijos krona</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egipto svaras</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>EritrÄ—jos nakfa</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Ispanijos peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiopijos biras</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euras</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Suomijos markÄ—</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidžio doleris</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Folklando salų svaras</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Prancūzijos frankas</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Svaras sterlingų</displayName>
-				<displayName count="one">Didžiosios Britanijos svaras sterlingų</displayName>
-				<displayName count="other">Didžiosios Britanijos svarai sterlingų</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gruzijos laris</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ganos sedis (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ganos sedis</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltaro svaras</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambijos dalasis</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>GvinÄ—jos frankas</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Graikijos drachma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Gvatemalos kecalis</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugalų Gvinėjos eskudas</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>GvinÄ—jos-Bisau pesas</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Gajanos doleris</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Honkongo doleris</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hondūro lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroatijos dinaras</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kroatijos kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Hai�io gurdas</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Vengrijos forintas</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonezijos rupija</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Airijos svaras</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Izraelio svaras</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Izraelio Å¡ekelis</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indijos rupija</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irako dinaras</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Irano rialas</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islandijos krona</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italijos lira</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaikos doleris</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordanijos dinaras</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jena</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenijos Å¡ilingas</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgizijos somas</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komoro frankas</displayName>
-				<displayName count="one">Komoro frankas</displayName>
-				<displayName count="other">Komoro frankai</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Å iaurÄ—s KorÄ—jos vonas</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Pietų Korėjos vonas</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuveito dinaras</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kaimanų salų doleris</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazachstano tengÄ—</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laoso kipas</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libano svaras</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Å ri Lankos rupija</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberijos doleris</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesoto lotis</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Lietuvos talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Liuksemburgo konvertuojamas frankas</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Liuksemburgo frankas</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Liuksemburgo finansinis frankas</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latvijos latas</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvijos rublis</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libijos dinaras</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Maroko dirhamas</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Maroko frankas</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovos lÄ—ja</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskaro ariaris</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskaro frankas</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedonijos denaras</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malio frankas</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Mianmaro kijatas</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolijos tugrikas</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Makao pataka</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritanijos ugija</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltos lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltos svaras</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauricijaus rupija</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldyvų salų rufija</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malavio kva�a</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksikos pesas</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Meksikos sidabrinis pesas (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Meksikos United de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaizijos ringitas</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambiko eskudas</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Senasis Mozambiko metikalis</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambiko metikalis</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibijos doleris</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerijos naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaragvos kardoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nikaragvos kardoba oras</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Nyderlandų guldenas</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norvegijos krona</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalo rupija</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Naujosios Zelandijos doleris</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omano rialas</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamos balboja</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peru naujasis solis</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peru solis</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua Naujosios GvinÄ—jos kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipinų pesas</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistano rupija</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Lenkijos zlotas</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Lenkijos zlotas (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugalijos eskudas</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paragvajaus guaranis</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Kataro rialas</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rodezijos doleris</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Senoji Rumunijos lÄ—ja</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Naujoji Rumunijos lÄ—ja</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbijos dinaras</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rusijos rublis</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rusijos rublis (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruandos frankas</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudo Arabijos rialas</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Saliamono salų doleris</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seišelių salų rupija</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Senasis Sudano dinaras</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudano svaras</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Senasis Sudano svaras</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Å vedijos krona</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapūro doleris</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Šv. Elenos salų svaras</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>SlovÄ—nijos tolaras</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovakijos krona</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Siera LeonÄ—s leonÄ—</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalio Å¡ilingas</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surimano doleris</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surimano guldenas</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao TomÄ—s ir PrincipÄ—s dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovietų Sąjungos rublis</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadoro kolonas</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Sirijos svaras</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Svazilendo lilangenis</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Tailando batas</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadžikistano rublis</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikistano somonis</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>TurkmÄ—nistano manatas</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tuniso dinaras</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongo paanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timoro eskudas</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Turkijos lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Naujoji Turkijos lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidado ir Tobago doleris</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Naujasis Taivano doleris</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanijos Å¡ilingas</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainos grivina</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainos karbovanecas</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandos Å¡ilingas (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandos Å¡ilingas</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>JAV doleris</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>JAV doleris (kitos dienos)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>JAV doleris (Å¡ios dienos)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Urugvajaus pesas (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Urugvajaus pesas</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekistano sumas</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venesuelos bolivaras</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Stiprusis Venesuelos bolivaras</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamo dongas</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Vakarų Samoa tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA BEAC frankas</displayName>
-				<displayName count="one">CFA BEAC frankas</displayName>
-				<displayName count="other">CFA BEAC frankai</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Sidabras</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Auksas</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Europos suvestinÄ—s vienetas</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Europos piniginis vienetas</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Europos valiutos/apskaitos vienetas (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Europos valiutos/apskaitos vienetas (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Rytų Karibų doleris</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>SDR Tarptautinis valiutos fondas</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Europos piniginis vienetas (1993-1999)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Aukso frankas</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Uic -frankas</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA BCEAO frankas</displayName>
-				<displayName count="one">CFA BCEAO frankas</displayName>
-				<displayName count="other">CFA BCEAO frankai</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladis</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP frankas</displayName>
-				<displayName count="one">CFP frankas</displayName>
-				<displayName count="other">CFP frankai</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET fondai</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Tikrinamas valiutos kodas</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Nežinoma arba neteisinga valiuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemeno dinaras</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemeno rialas</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoslavijos naujasis dinaras</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslavijos konvertuojamas dinaras</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Pietų Afrikos finansinis randas</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Pietų Afrikos randas</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambijos kva�a</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairo naujasis zairas</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairo zairas</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>ZimbabvÄ—s doleris</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dienos</unitPattern>
-			<unitPattern count="one">{0} diena</unitPattern>
-			<unitPattern count="other">{0} dienų</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} valandos</unitPattern>
-			<unitPattern count="one">{0} valanda</unitPattern>
-			<unitPattern count="other">{0} valandų</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minutÄ—s</unitPattern>
-			<unitPattern count="one">{0} minutÄ—</unitPattern>
-			<unitPattern count="other">{0} minu�ių</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} mÄ—nesiai</unitPattern>
-			<unitPattern count="one">{0} mÄ—nuo</unitPattern>
-			<unitPattern count="other">{0} mėnesių</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekundÄ—s</unitPattern>
-			<unitPattern count="one">{0} sekundÄ—</unitPattern>
-			<unitPattern count="other">{0} sekundžių</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} savaitÄ—s</unitPattern>
-			<unitPattern count="one">{0} savaitÄ—</unitPattern>
-			<unitPattern count="other">{0} savai�ių</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} metai</unitPattern>
-			<unitPattern count="one">{0} metai</unitPattern>
-			<unitPattern count="other">{0} metų</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>taip:t</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/lt_LT.xml b/airtime_mvc/library/Zend/Locale/Data/lt_LT.xml
deleted file mode 100644
index f5f3e130c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lt_LT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="lt"/>
-		<territory type="LT"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/lv.xml b/airtime_mvc/library/Zend/Locale/Data/lv.xml
deleted file mode 100644
index ab49542e4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lv.xml
+++ /dev/null
@@ -1,2986 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.97 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="lv"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">af�ru</language>
-			<language type="ab">abh�zu</language>
-			<language type="ace">a�inu</language>
-			<language type="ach">a�olu</language>
-			<language type="ada">adangmu</language>
-			<language type="ady">adigu</language>
-			<language type="ae">avesta</language>
-			<language type="af">afrikandu</language>
-			<language type="afa">afroazi�tu valodas</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akanu</language>
-			<language type="akk">akadiešu</language>
-			<language type="ale">aleutu</language>
-			<language type="alg">algonkinu valodas</language>
-			<language type="alt">dienvidaltajiešu</language>
-			<language type="am">amharu</language>
-			<language type="an">aragoniešu</language>
-			<language type="ang">senangļu</language>
-			<language type="anp">angika</language>
-			<language type="apa">apa�u valodas</language>
-			<language type="ar">ar�bu</language>
-			<language type="arc">aramiešu</language>
-			<language type="arn">arauk�ņu</language>
-			<language type="arp">arapahu</language>
-			<language type="art">m�kslīg�s valodas</language>
-			<language type="arw">aravaku</language>
-			<language type="as">asamiešu</language>
-			<language type="ast">astūriešu</language>
-			<language type="ath">atapasku valodas</language>
-			<language type="aus">austr�liešu valodas</language>
-			<language type="av">av�ru</language>
-			<language type="awa">avadhu</language>
-			<language type="ay">aimaru</language>
-			<language type="az">azerbaidž�ņu</language>
-			<language type="ba">baškīru</language>
-			<language type="bad">bandu</language>
-			<language type="bai">bamileku valoda</language>
-			<language type="bal">beludžu</language>
-			<language type="ban">baliešu</language>
-			<language type="bas">basu</language>
-			<language type="bat">baltu valodas</language>
-			<language type="be">baltkrievu</language>
-			<language type="bej">bedžu</language>
-			<language type="bem">bembu</language>
-			<language type="ber">berberu</language>
-			<language type="bg">bulg�ru</language>
-			<language type="bh">biharu</language>
-			<language type="bho">bhodžpūru</language>
-			<language type="bi">bišlam�</language>
-			<language type="bik">bikolu</language>
-			<language type="bin">binu</language>
-			<language type="bla">siksiku</language>
-			<language type="bm">bambaru</language>
-			<language type="bn">beng�ļu</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetiešu</language>
-			<language type="br">bretoņu</language>
-			<language type="bra">bradžiešu</language>
-			<language type="bs">bosniešu</language>
-			<language type="btk">bataku</language>
-			<language type="bua">burjatu</language>
-			<language type="bug">bugu</language>
-			<language type="byn">bilinu</language>
-			<language type="ca">katal�ņu</language>
-			<language type="cad">kadu</language>
-			<language type="cai">Centr�lamerikas indi�ņu valodas</language>
-			<language type="car">karību</language>
-			<language type="cau">kauk�ziešu valodas</language>
-			<language type="ce">�e�enu</language>
-			<language type="ceb">sebu�ņu</language>
-			<language type="cel">Ä·eltu valoda</language>
-			<language type="ch">�amorru</language>
-			<language type="chb">�ib�u</language>
-			<language type="chg">džagatajs</language>
-			<language type="chk">�ūku</language>
-			<language type="chm">mariešu</language>
-			<language type="chn">�inuku žargons</language>
-			<language type="cho">�oktavu</language>
-			<language type="chp">�ipevaianu</language>
-			<language type="chr">irokēzu</language>
-			<language type="chy">Å¡ejenu</language>
-			<language type="cmc">�amiešu valodas</language>
-			<language type="co">korsik�ņu</language>
-			<language type="cop">koptu</language>
-			<language type="cpe">anglisk�s kreolisk�s valodas un pidžinvalodas</language>
-			<language type="cpf">francisk�s kreolisk�s valodas un pidžinvalodas</language>
-			<language type="cpp">portug�lisk�s kreolisk�s valodas un pidžinvalodas</language>
-			<language type="cr">krī</language>
-			<language type="crh">Krimas tat�ru</language>
-			<language type="crp">kreolisk�s valodas un pidžinvalodas</language>
-			<language type="cs">�ehu</language>
-			<language type="csb">kašubu</language>
-			<language type="cu">baznīcsl�vu</language>
-			<language type="cus">kušītu valodas</language>
-			<language type="cv">�uvašu</language>
-			<language type="cy">velsiešu</language>
-			<language type="da">d�ņu</language>
-			<language type="dak">dakotu</language>
-			<language type="dar">dargu</language>
-			<language type="day">dajaku</language>
-			<language type="de">v�cu</language>
-			<language type="de_AT">Austrijas v�cu</language>
-			<language type="de_CH">Šveices augšv�cu</language>
-			<language type="del">delavēru</language>
-			<language type="den">sleivu</language>
-			<language type="dgr">dogribu</language>
-			<language type="din">dinku</language>
-			<language type="doi">dogru</language>
-			<language type="dra">dravīdu valodas</language>
-			<language type="dsb">lejassorbu</language>
-			<language type="dua">dualu</language>
-			<language type="dum">vidusholandiešu</language>
-			<language type="dv">maldīviešu</language>
-			<language type="dyu">diūlu</language>
-			<language type="dz">dzongke</language>
-			<language type="ee">evu</language>
-			<language type="efi">efiku</language>
-			<language type="egy">ēģiptiešu</language>
-			<language type="eka">ekadžuku</language>
-			<language type="el">grieÄ·u</language>
-			<language type="elx">elamiešu</language>
-			<language type="en">angļu</language>
-			<language type="en_AU">Austr�lijas angļu</language>
-			<language type="en_CA">Kan�das angļu</language>
-			<language type="en_US">angļu (ASV)</language>
-			<language type="enm">vidusangļu</language>
-			<language type="eo">esperanto</language>
-			<language type="es">sp�ņu</language>
-			<language type="es_419">sp�ņu (Latīņamerika)</language>
-			<language type="es_ES">ibēriešu sp�ņu</language>
-			<language type="et">igauņu</language>
-			<language type="eu">basku</language>
-			<language type="ewo">evondu</language>
-			<language type="fa">persiešu</language>
-			<language type="fan">fangu</language>
-			<language type="fat">fantu</language>
-			<language type="ff">fulu</language>
-			<language type="fi">somu</language>
-			<language type="fil">filipīniešu</language>
-			<language type="fiu">somugru valodas</language>
-			<language type="fj">fidžiešu</language>
-			<language type="fo">fēru</language>
-			<language type="fon">fonu</language>
-			<language type="fr">fran�u</language>
-			<language type="fr_CA">Kan�das fran�u</language>
-			<language type="fr_CH">Šveices fran�u</language>
-			<language type="frm">vidusfran�u</language>
-			<language type="fro">senfran�u</language>
-			<language type="frr">ziemeļfrīzu</language>
-			<language type="frs">austrumfrīzu</language>
-			<language type="fur">friūlu</language>
-			<language type="fy">rietumfrīzu</language>
-			<language type="ga">Ä«ru</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajo</language>
-			<language type="gba">gbaju</language>
-			<language type="gd">gēlu</language>
-			<language type="gem">ģerm�ņu valodas</language>
-			<language type="gez">gēzu</language>
-			<language type="gil">kiribatiešu</language>
-			<language type="gl">galisiešu</language>
-			<language type="gmh">vidusaugšv�cu</language>
-			<language type="gn">gvaranu</language>
-			<language type="goh">senaugšv�cu</language>
-			<language type="gon">gondu valodas</language>
-			<language type="gor">gorontalu</language>
-			<language type="got">gotu</language>
-			<language type="grb">grebo</language>
-			<language type="grc">sengrieÄ·u</language>
-			<language type="gsw">Šveices v�cu</language>
-			<language type="gu">gudžaratu</language>
-			<language type="gv">meniešu</language>
-			<language type="gwi">ku�inu</language>
-			<language type="ha">hausu</language>
-			<language type="hai">haidu</language>
-			<language type="haw">havajiešu</language>
-			<language type="he">ivrits</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligainonu</language>
-			<language type="him">hima�ali</language>
-			<language type="hit">hetu</language>
-			<language type="hmn">hmongu</language>
-			<language type="ho">hirimotu</language>
-			<language type="hr">horv�tu</language>
-			<language type="hsb">augšsorbu</language>
-			<language type="ht">haitiešu</language>
-			<language type="hu">ung�ru</language>
-			<language type="hup">hupu</language>
-			<language type="hy">armēņu</language>
-			<language type="hz">hereru</language>
-			<language type="ia">interlingva</language>
-			<language type="iba">ibanu</language>
-			<language type="id">indonēziešu</language>
-			<language type="ie">interlingve</language>
-			<language type="ig">igbo</language>
-			<language type="ii">Si�uaņas ji</language>
-			<language type="ijo">idžbu</language>
-			<language type="ik">inupiaku</language>
-			<language type="ilo">iloku</language>
-			<language type="inc">indo�riešu valodas</language>
-			<language type="ine">indoeiropiešu valodas</language>
-			<language type="inh">ingušu</language>
-			<language type="io">ido</language>
-			<language type="ira">ir�ņu valodas</language>
-			<language type="iro">irokēzu valodas</language>
-			<language type="is">īslandiešu</language>
-			<language type="it">it�liešu</language>
-			<language type="iu">inuītu</language>
-			<language type="ja">jap�ņu</language>
-			<language type="jbo">ložbans</language>
-			<language type="jpr">jūdpersiešu</language>
-			<language type="jrb">jūdar�bu</language>
-			<language type="jv">javiešu</language>
-			<language type="ka">gruzīnu</language>
-			<language type="kaa">karakalpaku</language>
-			<language type="kab">kabilu</language>
-			<language type="kac">ka�inu</language>
-			<language type="kam">kambu</language>
-			<language type="kar">karenu</language>
-			<language type="kaw">k�vi</language>
-			<language type="kbd">kabardiešu</language>
-			<language type="kfo">koru</language>
-			<language type="kg">kongu</language>
-			<language type="kha">khasu</language>
-			<language type="khi">hosjanu valodas</language>
-			<language type="kho">hotaniešu</language>
-			<language type="ki">kikuju</language>
-			<language type="kj">kvaņamu</language>
-			<language type="kk">kazahu</language>
-			<language type="kl">grenlandiešu</language>
-			<language type="km">khmeru</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannadu</language>
-			<language type="ko">korejiešu</language>
-			<language type="kok">konkanu</language>
-			<language type="kos">kosr�jiešu</language>
-			<language type="kpe">kpellu</language>
-			<language type="kr">kanuru</language>
-			<language type="krc">kara�aju un balk�ru</language>
-			<language type="krl">karēļu</language>
-			<language type="kro">krū</language>
-			<language type="kru">kuruhu</language>
-			<language type="ks">kašmiriešu</language>
-			<language type="ku">kurdu</language>
-			<language type="kum">kumiku</language>
-			<language type="kut">kutenaju</language>
-			<language type="kv">komiešu</language>
-			<language type="kw">korniešu</language>
-			<language type="ky">kirgīzu</language>
-			<language type="la">latīņu</language>
-			<language type="lad">ladino</language>
-			<language type="lah">landu</language>
-			<language type="lam">lambu</language>
-			<language type="lb">luksemburgiešu</language>
-			<language type="lez">lezgīnu</language>
-			<language type="lg">gandu</language>
-			<language type="li">limburgiešu</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosiešu</language>
-			<language type="lol">mongu</language>
-			<language type="loz">lozu</language>
-			<language type="lt">lietuviešu</language>
-			<language type="lu">lubakatanga</language>
-			<language type="lua">lubalulva</language>
-			<language type="lui">luisenu</language>
-			<language type="lun">lundu</language>
-			<language type="luo">luo</language>
-			<language type="lus">lušeju</language>
-			<language type="lv">latviešu</language>
-			<language type="mad">maduriešu</language>
-			<language type="mag">magahiešu</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasaru</language>
-			<language type="man">mandingu</language>
-			<language type="map">austronēziešu valoda</language>
-			<language type="mas">masaju</language>
-			<language type="mdf">mokšu</language>
-			<language type="mdr">mandaru</language>
-			<language type="men">mendu</language>
-			<language type="mg">malagasu</language>
-			<language type="mga">vidusīru</language>
-			<language type="mh">m�ršaliešu</language>
-			<language type="mi">maoru</language>
-			<language type="mic">mikmaku</language>
-			<language type="min">minangkabavu</language>
-			<language type="mis">daž�das valodas</language>
-			<language type="mk">maķedoniešu</language>
-			<language type="mkh">monkhmeru valodas</language>
-			<language type="ml">malajalu</language>
-			<language type="mn">mongoļu</language>
-			<language type="mnc">mandžūru</language>
-			<language type="mni">manipūru</language>
-			<language type="mno">manobu valodas</language>
-			<language type="mo">mold�vu</language>
-			<language type="moh">mohauku</language>
-			<language type="mos">mosu</language>
-			<language type="mr">maratu</language>
-			<language type="ms">malajiešu</language>
-			<language type="mt">maltiešu</language>
-			<language type="mul">vair�kas valodas</language>
-			<language type="mun">mundu valoda</language>
-			<language type="mus">krīku</language>
-			<language type="mwl">mirandiešu</language>
-			<language type="mwr">marvaru</language>
-			<language type="my">birmiešu</language>
-			<language type="myn">maiju valodas</language>
-			<language type="myv">erzju</language>
-			<language type="na">nauruiešu</language>
-			<language type="nah">navatlu</language>
-			<language type="nai">Ziemeļamerikas indi�ņu valodas</language>
-			<language type="nap">neapoliešu</language>
-			<language type="nb">norvēģu bukmols</language>
-			<language type="nd">ziemeļndebelu</language>
-			<language type="nds">lejasv�cu</language>
-			<language type="ne">nep�liešu</language>
-			<language type="new">nevaru</language>
-			<language type="ng">ndongu</language>
-			<language type="nia">njasu</language>
-			<language type="nic">nigēriešu-kordof�ņu valodas</language>
-			<language type="niu">niu�ņu</language>
-			<language type="nl">holandiešu</language>
-			<language type="nl_BE">fl�mu</language>
-			<language type="nn">jaunnorvēģu</language>
-			<language type="no">norvēģu</language>
-			<language type="nog">nogaju</language>
-			<language type="non">sennorvēģu</language>
-			<language type="nqo">n-ko</language>
-			<language type="nr">dienvidndebelu</language>
-			<language type="nso">ziemeļsotu</language>
-			<language type="nub">nūbiešu valodas</language>
-			<language type="nv">navahu</language>
-			<language type="nwc">klasisk� nevaru</language>
-			<language type="ny">�i�eva</language>
-			<language type="nym">ņamvezu</language>
-			<language type="nyn">ņankolu</language>
-			<language type="nyo">ņoru</language>
-			<language type="nzi">nzemu</language>
-			<language type="oc">oksit�ņu</language>
-			<language type="oj">odžibvu</language>
-			<language type="om">oromu</language>
-			<language type="or">orisiešu</language>
-			<language type="os">osetīnu</language>
-			<language type="osa">važ�žu</language>
-			<language type="ota">turku osmaņu</language>
-			<language type="oto">otomu valoda</language>
-			<language type="pa">pandžabu</language>
-			<language type="paa">papuasu valoda</language>
-			<language type="pag">pangasinanu</language>
-			<language type="pal">pehlevi</language>
-			<language type="pam">pampanganu</language>
-			<language type="pap">papjamento</language>
-			<language type="pau">palaviešu</language>
-			<language type="peo">senpersu</language>
-			<language type="phi">filipīniešu valoda</language>
-			<language type="phn">feniķiešu</language>
-			<language type="pi">p�li</language>
-			<language type="pl">poļu</language>
-			<language type="pon">ponapiešu</language>
-			<language type="pra">pr�krita valoda</language>
-			<language type="pro">senprovansiešu</language>
-			<language type="ps">puštu</language>
-			<language type="pt">portug�ļu</language>
-			<language type="pt_BR">Brazīlijas portug�ļu</language>
-			<language type="pt_PT">ibēriešu portug�ļu</language>
-			<language type="qu">ke�vu</language>
-			<language type="raj">radžast�ņu</language>
-			<language type="rap">rapanuju</language>
-			<language type="rar">rarotongiešu</language>
-			<language type="rm">retorom�ņu</language>
-			<language type="rn">rundu</language>
-			<language type="ro">rum�ņu</language>
-			<language type="roa">rom�ņu valoda</language>
-			<language type="rom">�ig�nu</language>
-			<language type="root">sakne</language>
-			<language type="ru">krievu</language>
-			<language type="rup">aromūnu</language>
-			<language type="rw">kiņaruanda</language>
-			<language type="sa">sanskrits</language>
-			<language type="sad">sandavu</language>
-			<language type="sah">jakutu</language>
-			<language type="sai">Dienvidamerikas indi�ņu</language>
-			<language type="sal">sališu valodas</language>
-			<language type="sam">Sam�rijas aramiešu</language>
-			<language type="sas">sasaku</language>
-			<language type="sat">santalu</language>
-			<language type="sc">sardīniešu</language>
-			<language type="scn">sicīliešu</language>
-			<language type="sco">skotu</language>
-			<language type="sd">sindhu</language>
-			<language type="se">ziemeļs�mu</language>
-			<language type="sel">selkupu</language>
-			<language type="sem">semītu valodas</language>
-			<language type="sg">sangu</language>
-			<language type="sga">senīru</language>
-			<language type="sgn">zīmju valodas</language>
-			<language type="sh">serbu-horv�tu</language>
-			<language type="shn">Å¡anu</language>
-			<language type="si">sing�ļu</language>
-			<language type="sid">sidamu</language>
-			<language type="sio">siū valodas</language>
-			<language type="sit">sinotibetiešu valodas</language>
-			<language type="sk">slov�ku</language>
-			<language type="sl">slovēņu</language>
-			<language type="sla">sl�vu</language>
-			<language type="sm">samo�ņu</language>
-			<language type="sma">dienvids�mu</language>
-			<language type="smi">s�mu valoda</language>
-			<language type="smj">Luleo s�mu</language>
-			<language type="smn">Inari s�mu</language>
-			<language type="sms">skolts�mu</language>
-			<language type="sn">Å¡onu</language>
-			<language type="snk">soninku</language>
-			<language type="so">som�ļu</language>
-			<language type="sog">sogdiešu</language>
-			<language type="son">songaju</language>
-			<language type="sq">alb�ņu</language>
-			<language type="sr">serbu</language>
-			<language type="srn">sranantogo</language>
-			<language type="srr">serēru</language>
-			<language type="ss">svatu</language>
-			<language type="ssa">Nīlas-Sah�ras valodas</language>
-			<language type="st">sesoto</language>
-			<language type="su">sundaniešu</language>
-			<language type="suk">sukumu</language>
-			<language type="sus">susu</language>
-			<language type="sux">Å¡umeru</language>
-			<language type="sv">zviedru</language>
-			<language type="sw">svahili</language>
-			<language type="syc">klasisk� sīriešu</language>
-			<language type="syr">sīriešu</language>
-			<language type="ta">tamilu</language>
-			<language type="tai">taju valodas</language>
-			<language type="te">telugu</language>
-			<language type="tem">temnu</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetumu</language>
-			<language type="tg">tadžiku</language>
-			<language type="th">taju</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigru</language>
-			<language type="tiv">tivu</language>
-			<language type="tk">turkmēņu</language>
-			<language type="tkl">tokelaviešu</language>
-			<language type="tl">tagalu</language>
-			<language type="tlh">klingoņu</language>
-			<language type="tli">tlinkitu</language>
-			<language type="tmh">tuaregu</language>
-			<language type="tn">cvanu</language>
-			<language type="to">tongu</language>
-			<language type="tog">Njasas tongu valoda</language>
-			<language type="tpi">tokpisins</language>
-			<language type="tr">turku</language>
-			<language type="ts">congu</language>
-			<language type="tsi">cimši�ņu</language>
-			<language type="tt">tat�ru</language>
-			<language type="tum">tumbuku</language>
-			<language type="tup">tupu valodas</language>
-			<language type="tut">altajiešu valodas</language>
-			<language type="tvl">tuvaliešu</language>
-			<language type="tw">tvī</language>
-			<language type="ty">taitiešu</language>
-			<language type="tyv">tuviešu</language>
-			<language type="udm">udmurtu</language>
-			<language type="ug">uiguru</language>
-			<language type="uga">ugaritiešu</language>
-			<language type="uk">ukraiņu</language>
-			<language type="umb">umbundu</language>
-			<language type="und">nezin�ma vai nederīga valoda</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbeku</language>
-			<language type="vai">vaju</language>
-			<language type="ve">vendu</language>
-			<language type="vi">vjetnamiešu</language>
-			<language type="vo">volapiks</language>
-			<language type="vot">votu</language>
-			<language type="wa">valoņu</language>
-			<language type="wak">vakašu valodas</language>
-			<language type="wal">valamu</language>
-			<language type="war">varaju</language>
-			<language type="was">vašo</language>
-			<language type="wen">sorbu</language>
-			<language type="wo">volofu</language>
-			<language type="xal">kalmiku</language>
-			<language type="xh">khosu</language>
-			<language type="yao">jao</language>
-			<language type="yap">japiešu</language>
-			<language type="yi">jidišs</language>
-			<language type="yo">jorubu</language>
-			<language type="ypk">jopiku valodas</language>
-			<language type="za">džuanu</language>
-			<language type="zap">sapoteku</language>
-			<language type="zen">zenagu</language>
-			<language type="zh">ķīniešu</language>
-			<language type="zh_Hans">ķīniešu vienk�ršot�</language>
-			<language type="zh_Hant">ķīniešu tradicion�l�</language>
-			<language type="znd">zandē</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zunju</language>
-			<language type="zxx">Bez lingvistiska satura</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ar�bu</script>
-			<script type="Armi">aramiešu</script>
-			<script type="Armn">armēņu</script>
-			<script type="Bali">baliešu</script>
-			<script type="Beng">beng�ļu</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">Braila raksts</script>
-			<script type="Cher">irokēzu</script>
-			<script type="Copt">koptu</script>
-			<script type="Cyrl">kirilica</script>
-			<script type="Cyrs">sensl�vu</script>
-			<script type="Deva">dev�nag�ri</script>
-			<script type="Egyd">demotiskais raksts</script>
-			<script type="Egyh">hier�tiskais raksts</script>
-			<script type="Egyp">ēģiptiešu hieroglifi</script>
-			<script type="Ethi">etiopiešu</script>
-			<script type="Geor">gruzīnu</script>
-			<script type="Goth">gotu</script>
-			<script type="Grek">grieÄ·u</script>
-			<script type="Gujr">gudžaratu</script>
-			<script type="Hani">ķīniešu</script>
-			<script type="Hans">ķīniešu vienk�ršot�</script>
-			<script type="Hant">ķīniešu tradicion�l�</script>
-			<script type="Hebr">ivrits</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hrkt">katakana vai hiragana</script>
-			<script type="Hung">senung�ru</script>
-			<script type="Ital">vecit�ļu</script>
-			<script type="Java">javiešu</script>
-			<script type="Jpan">jap�ņu</script>
-			<script type="Kana">katakana</script>
-			<script type="Khmr">khmeru</script>
-			<script type="Knda">kannaru</script>
-			<script type="Kore">korejiešu</script>
-			<script type="Laoo">lao</script>
-			<script type="Latn">latīņu</script>
-			<script type="Lina">line�r� A</script>
-			<script type="Linb">line�r� B</script>
-			<script type="Lydi">līdiešu</script>
-			<script type="Maya">maiju</script>
-			<script type="Mlym">malajalu</script>
-			<script type="Mong">mongoļu</script>
-			<script type="Moon">MÅ«na raksts</script>
-			<script type="Mymr">birmiešu</script>
-			<script type="Ogam">ogamiskais raksts</script>
-			<script type="Orya">oriju</script>
-			<script type="Osma">osmaņu turku</script>
-			<script type="Phnx">feniķiešu</script>
-			<script type="Qaai">mantot�</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">rūnu raksts</script>
-			<script type="Samr">samariešu</script>
-			<script type="Sinh">sinhalas</script>
-			<script type="Sund">zundu</script>
-			<script type="Syrc">sīriešu</script>
-			<script type="Syrj">rietumsīriešu</script>
-			<script type="Syrn">austrumsīriešu</script>
-			<script type="Taml">tamilu</script>
-			<script type="Telu">telugu</script>
-			<script type="Tglg">tagalu</script>
-			<script type="Thaa">taana</script>
-			<script type="Thai">taju</script>
-			<script type="Tibt">tibetiešu</script>
-			<script type="Xpeo">vecpersiešu</script>
-			<script type="Xsux">šumeru-akadiešu ķīļraksts</script>
-			<script type="Yiii">ji</script>
-			<script type="Zmth">matem�tiskais pieraksts</script>
-			<script type="Zxxx">bez rakstības</script>
-			<script type="Zzzz">nezin�ma vai nederīga rakstība</script>
-		</scripts>
-		<territories>
-			<territory type="001">pasaule</territory>
-			<territory type="002">Ä€frika</territory>
-			<territory type="003">Ziemeļamerika</territory>
-			<territory type="005">Dienvidamerika</territory>
-			<territory type="009">Oke�nija</territory>
-			<territory type="011">Rietum�frika</territory>
-			<territory type="013">Centr�lamerika</territory>
-			<territory type="014">Austrum�frika</territory>
-			<territory type="015">Ziemeļ�frika</territory>
-			<territory type="017">Vidus�frika</territory>
-			<territory type="018">Ä€frikas dienvidi</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Amerikas ziemeļi</territory>
-			<territory type="029">Karību jūras reģions</territory>
-			<territory type="030">Austrum�zija</territory>
-			<territory type="034">Dienvid�zija</territory>
-			<territory type="035">Centr�laustrum�zija</territory>
-			<territory type="039">Dienvideiropa</territory>
-			<territory type="053">Austr�lija un Jaunzēlande</territory>
-			<territory type="054">Melanēzija</territory>
-			<territory type="057">Mikronēzijas reģions</territory>
-			<territory type="061">Polinēzija</territory>
-			<territory type="062">Centr�ldienvid�zija</territory>
-			<territory type="142">Ä€zija</territory>
-			<territory type="143">Centr�l�zija</territory>
-			<territory type="145">Rietum�zija</territory>
-			<territory type="150">Eiropa</territory>
-			<territory type="151">Austrumeiropa</territory>
-			<territory type="154">Ziemeļeiropa</territory>
-			<territory type="155">Rietumeiropa</territory>
-			<territory type="172">Neatkarīgo Valstu Savienība</territory>
-			<territory type="419">Latīņamerika un Karību jūras reģions</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Apvienotie Ar�bu Emir�ti</territory>
-			<territory type="AF">Afganist�na</territory>
-			<territory type="AG">Antigva un Barbuda</territory>
-			<territory type="AI">Angilja</territory>
-			<territory type="AL">Alb�nija</territory>
-			<territory type="AM">Armēnija</territory>
-			<territory type="AN">Nīderlandes Antiļas</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Argentīna</territory>
-			<territory type="AS">Amerik�ņu Samoa</territory>
-			<territory type="AT">Austrija</territory>
-			<territory type="AU">Austr�lija</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Olandes salas</territory>
-			<territory type="AZ">Azerbaidž�na</territory>
-			<territory type="BA">Bosnija un Hercegovina</territory>
-			<territory type="BB">Barbadosa</territory>
-			<territory type="BD">Bangladeša</territory>
-			<territory type="BE">Beļģija</territory>
-			<territory type="BF">Burkinafaso</territory>
-			<territory type="BG">Bulg�rija</territory>
-			<territory type="BH">Bahreina</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benina</territory>
-			<territory type="BL">Senbartelmī</territory>
-			<territory type="BM">Bermudu salas</territory>
-			<territory type="BN">Bruneja</territory>
-			<territory type="BO">Bolīvija</territory>
-			<territory type="BR">Brazīlija</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">But�na</territory>
-			<territory type="BV">Buvē sala</territory>
-			<territory type="BW">Botsv�na</territory>
-			<territory type="BY">Baltkrievija</territory>
-			<territory type="BZ">Beliza</territory>
-			<territory type="CA">Kan�da</territory>
-			<territory type="CC">Kokosu jeb KÄ«linga salas</territory>
-			<territory type="CD">Kongo Demokr�tisk� Republika</territory>
-			<territory type="CF">Centr�l�frikas Republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Å veice</territory>
-			<territory type="CI">Kotdivu�ra</territory>
-			<territory type="CK">Kuka salas</territory>
-			<territory type="CL">Čīle</territory>
-			<territory type="CM">Kamerūna</territory>
-			<territory type="CN">Ķīna</territory>
-			<territory type="CO">Kolumbija</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Serbija un Melnkalne</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kaboverde</territory>
-			<territory type="CX">Ziemsvētku sala</territory>
-			<territory type="CY">Kipra</territory>
-			<territory type="CZ">ÄŒehija</territory>
-			<territory type="DE">V�cija</territory>
-			<territory type="DJ">Džibutija</territory>
-			<territory type="DK">D�nija</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominik�nas Republika</territory>
-			<territory type="DZ">Alžīrija</territory>
-			<territory type="EC">Ekvadora</territory>
-			<territory type="EE">Igaunija</territory>
-			<territory type="EG">Ä’Ä£ipte</territory>
-			<territory type="EH">Rietumsah�ra</territory>
-			<territory type="ER">Eritreja</territory>
-			<territory type="ES">Sp�nija</territory>
-			<territory type="ET">Etiopija</territory>
-			<territory type="FI">Somija</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Folklenda salas</territory>
-			<territory type="FM">Mikronēzijas Federatīv�s Valstis</territory>
-			<territory type="FO">Farēru salas</territory>
-			<territory type="FR">Francija</territory>
-			<territory type="GA">Gabona</territory>
-			<territory type="GB">Lielbrit�nija</territory>
-			<territory type="GD">Gren�da</territory>
-			<territory type="GE">Gruzija</territory>
-			<territory type="GF">Fran�u Gvi�na</territory>
-			<territory type="GG">GÄ“rnsija</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibralt�rs</territory>
-			<territory type="GL">Grenlande</territory>
-			<territory type="GM">Gambija</territory>
-			<territory type="GN">Gvineja</territory>
-			<territory type="GP">Gvadelupa</territory>
-			<territory type="GQ">Ekvatori�l� Gvineja</territory>
-			<territory type="GR">GrieÄ·ija</territory>
-			<territory type="GS">Dienviddžordžija un Dienvidsendvi�u salas</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guama</territory>
-			<territory type="GW">Gvineja-Bisava</territory>
-			<territory type="GY">Gaj�na</territory>
-			<territory type="HK">Ķīnas īpaš�s p�rvaldes apgabals Honkonga</territory>
-			<territory type="HM">HÄ“rda un Makdonalda salas</territory>
-			<territory type="HN">Hondurasa</territory>
-			<territory type="HR">Horv�tija</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ung�rija</territory>
-			<territory type="ID">Indonēzija</territory>
-			<territory type="IE">Īrija</territory>
-			<territory type="IL">Izraēla</territory>
-			<territory type="IM">Mena</territory>
-			<territory type="IN">Indija</territory>
-			<territory type="IO">Britu Indijas oke�na teritorija</territory>
-			<territory type="IQ">Ir�ka</territory>
-			<territory type="IR">Ir�na</territory>
-			<territory type="IS">Īslande</territory>
-			<territory type="IT">It�lija</territory>
-			<territory type="JE">Džērsija</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jord�nija</territory>
-			<territory type="JP">Jap�na</territory>
-			<territory type="KE">Kenija</territory>
-			<territory type="KG">Kirgīzija</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoru salas</territory>
-			<territory type="KN">Sentkitsa un Nevisa</territory>
-			<territory type="KP">Ziemeļkoreja</territory>
-			<territory type="KR">Dienvidkoreja</territory>
-			<territory type="KW">Kuveita</territory>
-			<territory type="KY">Kaimanu salas</territory>
-			<territory type="KZ">Kazahst�na</territory>
-			<territory type="LA">Laosa</territory>
-			<territory type="LB">Lib�na</territory>
-			<territory type="LC">Sentlūsija</territory>
-			<territory type="LI">Lihtenšteina</territory>
-			<territory type="LK">Å rilanka</territory>
-			<territory type="LR">Libērija</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Lietuva</territory>
-			<territory type="LU">Luksemburga</territory>
-			<territory type="LV">Latvija</territory>
-			<territory type="LY">LÄ«bija</territory>
-			<territory type="MA">Maroka</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Melnkalne</territory>
-			<territory type="MF">Senmartēna</territory>
-			<territory type="MG">Madagaskara</territory>
-			<territory type="MH">M�ršala salas</territory>
-			<territory type="MK">MaÄ·edonija</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mjanma</territory>
-			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Ķīnas īpaš�s p�rvaldes apgabals Makao</territory>
-			<territory type="MP">Ziemeļu Marianas salas</territory>
-			<territory type="MQ">Martinika</territory>
-			<territory type="MR">Maurit�nija</territory>
-			<territory type="MS">Montserrata</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Maurīcija</territory>
-			<territory type="MV">Maldīvija</territory>
-			<territory type="MW">Mal�vija</territory>
-			<territory type="MX">Meksika</territory>
-			<territory type="MY">Malaizija</territory>
-			<territory type="MZ">Mozambika</territory>
-			<territory type="NA">Namībija</territory>
-			<territory type="NC">Jaunkaledonija</territory>
-			<territory type="NE">Nigēra</territory>
-			<territory type="NF">Norfolkas sala</territory>
-			<territory type="NG">Nigērija</territory>
-			<territory type="NI">Nikaragva</territory>
-			<territory type="NL">NÄ«derlande</territory>
-			<territory type="NO">Norvēģija</territory>
-			<territory type="NP">Nep�la</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Jaunzēlande</territory>
-			<territory type="OM">Om�na</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fran�u Polinēzija</territory>
-			<territory type="PG">Papua-Jaungvineja</territory>
-			<territory type="PH">Filipīnas</territory>
-			<territory type="PK">Pakist�na</territory>
-			<territory type="PL">Polija</territory>
-			<territory type="PM">Senpjēra un Mikelona</territory>
-			<territory type="PN">Pitkērna</territory>
-			<territory type="PR">Puertoriko</territory>
-			<territory type="PS">Palestīniešu pašp�rvaldes teritorija</territory>
-			<territory type="PT">Portug�le</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragvaja</territory>
-			<territory type="QA">Katara</territory>
-			<territory type="QO">ASV Maz�s Aizjūras salas</territory>
-			<territory type="QU">Eiropas Savienība</territory>
-			<territory type="RE">Reinjona</territory>
-			<territory type="RO">Rum�nija</territory>
-			<territory type="RS">Serbija</territory>
-			<territory type="RU">Krievija</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saūda Ar�bija</territory>
-			<territory type="SB">Z�lamana salas</territory>
-			<territory type="SC">Seišeļu salas</territory>
-			<territory type="SD">Sud�na</territory>
-			<territory type="SE">Zviedrija</territory>
-			<territory type="SG">Singapūra</territory>
-			<territory type="SH">Sv. Helēnas sala</territory>
-			<territory type="SI">Slovēnija</territory>
-			<territory type="SJ">Svalb�ra un Jana Majena sala</territory>
-			<territory type="SK">Slov�kija</territory>
-			<territory type="SL">Sjerraleone</territory>
-			<territory type="SM">Sanmarīno</territory>
-			<territory type="SN">Seneg�la</territory>
-			<territory type="SO">Som�lija</territory>
-			<territory type="SR">Surinama</territory>
-			<territory type="ST">Santome un Prinsipi</territory>
-			<territory type="SV">Salvadora</territory>
-			<territory type="SY">SÄ«rija</territory>
-			<territory type="SZ">Svazilenda</territory>
-			<territory type="TC">TÄ“rksas un Kaikosas salas</territory>
-			<territory type="TD">ÄŒada</territory>
-			<territory type="TF">Fran�u dienvidu teritorijas</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Taizeme</territory>
-			<territory type="TJ">Tadžikist�na</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Austrumtimora</territory>
-			<territory type="TM">Turkmenist�na</territory>
-			<territory type="TN">Tunisija</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turcija</territory>
-			<territory type="TT">Trinid�da un Tob�go</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiv�na</territory>
-			<territory type="TZ">Tanz�nija</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">ASV maz�s aizjūras teritorijas</territory>
-			<territory type="US">Amerikas Savienot�s Valstis</territory>
-			<territory type="UY">Urugvaja</territory>
-			<territory type="UZ">Uzbekist�na</territory>
-			<territory type="VA">Vatik�ns</territory>
-			<territory type="VC">Sentvinsenta un Grenadīnas</territory>
-			<territory type="VE">Venecuēla</territory>
-			<territory type="VG">Britu Virdžīnu salas</territory>
-			<territory type="VI">Amerik�ņu Virdžīnu salas</territory>
-			<territory type="VN">Vjetnama</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Volisa un Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemena</territory>
-			<territory type="YT">Majota</territory>
-			<territory type="ZA">Dienvid�frika</territory>
-			<territory type="ZM">Zambija</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">nezin�ms vai nederīgs reģions</territory>
-		</territories>
-		<keys>
-			<key type="calendar">kalend�rs</key>
-			<key type="collation">salīdzin�šana</key>
-			<key type="currency">valūta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">tradicion�l�s ķīniešu valodas k�rtošanas secība - Big5</type>
-			<type type="buddhist" key="calendar">budistu kalend�rs</type>
-			<type type="chinese" key="calendar">ķīniešu kalend�rs</type>
-			<type type="direct" key="collation">tieš� k�rtošanas secība</type>
-			<type type="gb2312han" key="collation">vienk�ršot�s ķīniešu valodas k�rtošanas secība - GB2312</type>
-			<type type="gregorian" key="calendar">Gregora kalend�rs</type>
-			<type type="hebrew" key="calendar">ebreju kalend�rs</type>
-			<type type="indian" key="calendar">Indijas nacion�lais kalend�rs</type>
-			<type type="islamic" key="calendar">isl�ma kalend�rs</type>
-			<type type="islamic-civil" key="calendar">isl�ma pilsoņu kalend�rs</type>
-			<type type="japanese" key="calendar">jap�ņu kalend�rs</type>
-			<type type="phonebook" key="collation">t�lruņu gr�matas k�rtošanas secība</type>
-			<type type="pinyin" key="collation">Pinyin k�rtošanas secība</type>
-			<type type="roc" key="calendar">Ķīnas Republikas kalend�rs</type>
-			<type type="stroke" key="collation">Stroke k�rtošanas secība</type>
-			<type type="traditional" key="collation">tradicion�l� k�rtošanas secība</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrisk�</measurementSystemName>
-			<measurementSystemName type="US">britu</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Valoda: {0}</codePattern>
-			<codePattern type="script">Rakstība: {0}</codePattern>
-			<codePattern type="territory">Reģions: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a � b c � d e ē f g ģ h i ī j k ķ l ļ m n ņ o p r s š t u ū v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[y q w x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-i y j-x z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} − {1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">janv.</month>
-							<month type="2">febr.</month>
-							<month type="3">marts</month>
-							<month type="4">apr.</month>
-							<month type="5">maijs</month>
-							<month type="6">jūn.</month>
-							<month type="7">jūl.</month>
-							<month type="8">aug.</month>
-							<month type="9">sept.</month>
-							<month type="10">okt.</month>
-							<month type="11">nov.</month>
-							<month type="12">dec.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">janv�ris</month>
-							<month type="2">febru�ris</month>
-							<month type="3">marts</month>
-							<month type="4">aprīlis</month>
-							<month type="5">maijs</month>
-							<month type="6">jūnijs</month>
-							<month type="7">jūlijs</month>
-							<month type="8">augusts</month>
-							<month type="9">septembris</month>
-							<month type="10">oktobris</month>
-							<month type="11">novembris</month>
-							<month type="12">decembris</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sv</day>
-							<day type="mon">Pr</day>
-							<day type="tue">Ot</day>
-							<day type="wed">Tr</day>
-							<day type="thu">Ce</day>
-							<day type="fri">Pk</day>
-							<day type="sat">Se</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">svētdiena</day>
-							<day type="mon">pirmdiena</day>
-							<day type="tue">otrdiena</day>
-							<day type="wed">trešdiena</day>
-							<day type="thu">ceturtdiena</day>
-							<day type="fri">piektdiena</day>
-							<day type="sat">sestdiena</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">P</day>
-							<day type="tue">O</day>
-							<day type="wed">T</day>
-							<day type="thu">C</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">C1</quarter>
-							<quarter type="2">C2</quarter>
-							<quarter type="3">C3</quarter>
-							<quarter type="4">C4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. ceturksnis</quarter>
-							<quarter type="2">2. ceturksnis</quarter>
-							<quarter type="3">3. ceturksnis</quarter>
-							<quarter type="4">4. ceturksnis</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">pirms mūsu ēras</era>
-						<era type="1">mūsu ēr�</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">p.m.Ä“.</era>
-						<era type="1">m.Ä“.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">p.m.Ä“.</era>
-						<era type="1">m.Ä“.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y. 'gada' d. MMMM</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y. 'gada' d. MMMM</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y. 'gada' d. MMM</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">EEE, d.</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE, d.</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">dd.mm.</dateFormatItem>
-						<dateFormatItem id="MEd">E, dd.MM.</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y. 'g'.</dateFormatItem>
-						<dateFormatItem id="yM">mm.yyyy.</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, dd.mm.yyyy.</dateFormatItem>
-						<dateFormatItem id="yMMM">yyyy. 'g'. MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, yyyy. 'g'. dd. MMM</dateFormatItem>
-						<dateFormatItem id="yMMMM">y. 'g'. MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y. 'g'.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.–d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH–HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH–HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">mm.–mm.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.mm.–dd.mm.</greatestDifference>
-							<greatestDifference id="M">dd.mm–dd.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. MMM – E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y.–y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">mm.yyyy.–mm.yyyy.</greatestDifference>
-							<greatestDifference id="y">mm.yyyy.–mm.yyyy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.mm.yyyy.–dd.mm.yyyy.</greatestDifference>
-							<greatestDifference id="M">dd.mm.yy.–dd.mm.yy.</greatestDifference>
-							<greatestDifference id="y">dd.mm.yy.–dd.mm.yy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">EEE, dd.mm.yy. – EEE, dd.mm.yy.</greatestDifference>
-							<greatestDifference id="M">EEE, dd.mm.yy. – EEE, dd.mm.yy.</greatestDifference>
-							<greatestDifference id="y">EEE, dd.mm.yy. – EEE, dd.mm.yy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y. 'gada' MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y. 'gada' MMM - y. 'gada' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y. 'gada' d.-d. MMM</greatestDifference>
-							<greatestDifference id="M">y. 'gada' d. MMM - d. MMM</greatestDifference>
-							<greatestDifference id="y">y. 'gada' d. MMM - y. 'gada' d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, y. 'gada' d. MMM - E, y. 'gada' d. MMM</greatestDifference>
-							<greatestDifference id="M">E, y. 'gada' d. MMM - E, y. 'gada' d. MMM</greatestDifference>
-							<greatestDifference id="y">E, y. 'gada' d. MMM - E, y. 'gada' d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">mm.yyyy.–mm.yyyy.</greatestDifference>
-							<greatestDifference id="y">mm.yyyy.–mm.yyyy.</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Ä“ra</displayName>
-					</field>
-					<field type="year">
-						<displayName>Gads</displayName>
-					</field>
-					<field type="month">
-						<displayName>MÄ“nesis</displayName>
-					</field>
-					<field type="week">
-						<displayName>Nedēļa</displayName>
-					</field>
-					<field type="day">
-						<displayName>diena</displayName>
-						<relative type="-3">aizaizvakar</relative>
-						<relative type="-2">aizvakar</relative>
-						<relative type="-1">vakar</relative>
-						<relative type="0">Å¡odien</relative>
-						<relative type="1">rīt</relative>
-						<relative type="2">parīt</relative>
-						<relative type="3">aizparīt</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Nedēļas diena</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Stundas</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minūtes</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekundes</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Josla</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">tišri</month>
-							<month type="2">hešvans</month>
-							<month type="3">kisļevs</month>
-							<month type="4">tevets</month>
-							<month type="5">Å¡evats</month>
-							<month type="7">adars</month>
-							<month type="8">nisans</month>
-							<month type="9">ijars</month>
-							<month type="10">sivans</month>
-							<month type="11">tamuzs</month>
-							<month type="12">avs</month>
-							<month type="13">eluls</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">muharams</month>
-							<month type="2">safars</month>
-							<month type="3">1. rabī</month>
-							<month type="4">2. rabī</month>
-							<month type="5">1. džum�d�</month>
-							<month type="6">2. džum�d�</month>
-							<month type="7">radžabs</month>
-							<month type="8">Å¡abans</month>
-							<month type="9">ramad�ns</month>
-							<month type="10">Å¡auvals</month>
-							<month type="11">du al-kid�</month>
-							<month type="12">du al-hidž�</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nezin�ma</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubaija</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabula</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Antigva</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Angilja</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tir�na</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erev�na</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Nīderlandes Antiļas</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Rotera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Palmera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Dienvidpols</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Sjova</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Mavsona</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Deivisa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Vostoka</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Kesija</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Makmerdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Riogaljegosa</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Mendosa</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Sanhuana</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>UÅ¡uaja</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Larioha</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Sanluisa</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Katamarka</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Žužuja</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tukumana</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordoba</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenosairesa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pagopago</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>VÄ«ne</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>PÄ“rta</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>JÅ«kla</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>D�rvina</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelaida</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Brokenhila</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kerija</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Melburna</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Hobarta</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Lindemana</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Sidneja</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Brisbena</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lordhova</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbadosa</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Daka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brisele</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Vagadugu</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahreina</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Bužumbura</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Portonovo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudu salas</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Bruneja</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Lapasa</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirenupe</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Riobranko</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Portuvelju</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Boavista</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Manausa</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Kujaba</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarena</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Kampugrandi</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belena</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Aragvaina</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sanpaulu</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Brazīlija (Salvadora)</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Fortalesa</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maseio</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Resifi</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Noroņa</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>Naso</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Timpu</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minska</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Beliza</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Dausona</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Vaithorsa</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Inuvika</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Vankūvera</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Dousonkrīka</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelounaifa</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Edmontona</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Sviftkarenta</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Kembridžbeja</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Regīna</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Vinipega</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Rezolūta</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Reinirivera</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Rankininleta</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Koralharbora</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tanderbeja</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigona</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Monre�la</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ikaluita</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtanga</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Monktona</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Halifaksa</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>GÅ«sbeja</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Gleisbeja</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Blanksablona</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Sentdžonsa</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Kokosa</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinšasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lubumbaši</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Bangi</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Brazavila</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>CÄ«rihe</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidžana</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Lieldienu sala</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Santjago</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Duala</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kašgara</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urum�i</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ÄŒuncina</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Harbina</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kaboverde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Ziemsvētku</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikosija</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlīne</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibutija</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenh�gena</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santodomingo</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžīra</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagu salas</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Gvajakila</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallina</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kaira</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Ajūna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kan�riju salas</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Seūta</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madride</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Adisabeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Stenlija</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Trūka</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Ponpeja</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Kosraja</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Farēru salas</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Parīze</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Librevila</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londona</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Gren�da</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Kajenna</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akra</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibralt�rs</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>TÅ«le</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>NÅ«ka</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Skoresbisunda</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Denm�rkšavna</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Bandžula</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Konakri</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Gvadelupa</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atēnas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Dienviddžordžija</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Guama</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Bisava</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gaj�na</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Honkonga</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Portoprensa</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapešta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Džakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Pontianaka</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasara</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Džajapūra</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dublina</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>ÄŒagosa</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagd�de</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teher�na</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Reikjavīka</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaika</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Amm�na</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biškeka</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Pnompeņa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderburija</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Kirisimasi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Tarava</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komoru</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Sentkitsa</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Phenjana</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seula</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuveita</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kaimanu Salas</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Or�la</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktobe</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kizilorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almati</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vjang�ana</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirūta</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Sentlūsija</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Vaduca</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Kolombo</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monrovija</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Viļņa</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburga</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>RÄ«ga</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripole</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Kasablanka</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Kišiņeva</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarivu</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kvadžaleina</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Madžuro</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Jangona</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Hovda</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulanbatora</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ÄŒoibalsana</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makao</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Saipana</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinika</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>Nuakšota</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Montserrata</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Maurīcija</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldīvija</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Blantaira</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Tihu�na</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Ermosiljo</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Masatl�na</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ÄŒihuahua</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Montereja</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mehiko</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Kankūna</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Kualalumpura</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Ku�inga</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Vindhuka</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Numea</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Niameja</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Norfolka</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Lagosa</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Managva</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdama</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>ÄŒetema</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Oklenda</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muskata</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Taiti</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markvesa</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambjera</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Portmorsbi</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Kara�i</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšava</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Mikelona</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitkērna</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Puertoriko</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoru salas</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabona</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunsjona</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katara</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reinjona</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukareste</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaļiņingrada</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Maskava</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgograda</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburga</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omska</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novosibirska</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarska</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutska</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutska</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vladivostoka</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalīna</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magad�na</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadira</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rij�da</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Gvadelkan�la</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Hartūma</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stokholma</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapūra</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sv. Helēna</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Frītauna</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Dak�ra</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadīšo</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Santome</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvadora</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaska</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Grendturka</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>Ndžamena</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Kergvelena</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Bangkoka</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dušanbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅ¡gabata</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunisa</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanbula</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Portofspeina</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taipeja</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>D�resal�ma</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgoroda</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijeva</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Simferopole</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Midveja</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonstauna</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Veika</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>Adaka</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>Noma</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Ankur�ža</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Jakutata</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Džuno</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Losandželosa</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>FÄ«niksa</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Å iproka</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Denvera</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Å…Å«salema</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Centra Ziemeļdakot�</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Čik�ga</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Menominī</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vinsensa</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>PÄ“terburga</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tellsitija</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Noksa</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Vinimaka</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianapolisa</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Luisvilla</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Viveja</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Montiselo</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Detroita</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Å…ujorka</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkanda</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškenta</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Sentvinsenta</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Karakasa</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Senttomasa</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Hošimina</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Vallisa</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Adena</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Majota</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johannesburga</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Centr�leiropas laiks</standard>
-					<daylight>Centr�leiropas vasaras laiks</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Austrumeiropas laiks</standard>
-					<daylight>Austrumeiropas vasaras laiks</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kuibiševas laiks</standard>
-					<daylight>Kuibiševas vasaras laiks</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Maskavas laiks</generic>
-					<standard>Maskavas standarta laiks</standard>
-					<daylight>Maskavas vasaras laiks</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samaras laiks</standard>
-					<daylight>Samaras vasaras laiks</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turcijas laiks</standard>
-					<daylight>Turcijas vasaras laiks</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgogradas laiks</standard>
-					<daylight>Volgogradas vasaras laiks</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>nav skaitlis</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-			<unitPattern count="zero">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>Apvienoto Ar�bu Emir�tu dirhēms</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afganist�nas afg�ns</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Alb�nijas leks</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armēnijas drams</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Nīderlandes Antiļu guldenis</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolas jaun� kvanza</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentīnas peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austrijas šiliņš</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Austr�lijas dol�rs</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubas guldenis</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbaidž�nas manats</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnijas konvertējam� marka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadosas dol�rs</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladešas taka</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Beļģijas franks</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulg�rijas leva</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi franks</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudu salu dol�rs</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunejas dol�rs</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolīvijas boliviano</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazīlijas re�ls</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamu dol�rs</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>But�nas ngultrums</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botsv�nas pula</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Baltkrievijas rubelis</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizas dol�rs</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kan�das dol�rs</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>KDR franks</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å veices franks</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Čīles peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Ķīnas juana</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbijas peso</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Kolumbijas re�ls</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kostarikas kolons</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubas peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kaboverdes eskudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kipras m�rciņa</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>ÄŒehijas krona</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>V�cijas marka</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Džibutijas franks</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>D�nijas krona</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominik�nas peso</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alžīrijas din�rs</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Igaunijas krona</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Ēģiptes m�rciņa</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritrejas nakfa</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Sp�nijas peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiopijas birs</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>eiro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Somijas marka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidži dol�rs</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Folklenda salu m�rciņa</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Francijas franks</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Lielbrit�nijas sterliņu m�rciņa</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gruzijas lari</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ganas sedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibralt�ra m�rciņa</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambijas dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Gvinejas franks</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>GrieÄ·ijas drahma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>(Gvatemalas) ketsals</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Gaj�nas dol�rs</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Honkongas dol�rs</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hondurasas lempīra</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Horv�tijas kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haiti gurds</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Ung�rijas forints</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonēzijas rūpija</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Īrijas m�rciņa</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Izraēlas šekelis</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indijas rūpija</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ir�kas din�rs</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Ir�nas ri�ls</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Īslandes krona</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>It�lijas lira</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaikas dol�rs</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jord�nas din�rs</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jap�nas jena</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenijas šiliņš</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgizst�nas soms</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Ziemeļkorejas vona</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Dienvidkorejas vona</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuveitas din�rs</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazahst�nas tenge</displayName>
-				<displayName count="zero">Kazahst�nas tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laosas kips</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Lib�nas m�rciņa</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Šrilankas rūpija</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Libērijas dol�rs</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesoto loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lietuvas lits</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luksemburgas franks</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latvijas lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvijas rublis</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Lībijas din�rs</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokas dirhēms</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovas leja</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>ariari</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Maķedonijas den�rs</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>CFA (Ä€frikas) franks</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Mjanmas kjats</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolijas tugriks</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Makao pataka</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Maurit�nijas ugija</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltas lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltas m�rciņa</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Maurīcijas rūpija</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldīvijas rūfija</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Mal�vijas kva�a</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksikas peso</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malaizijas ringits</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambikas eskudo</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambikas metikals</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namībijas dol�rs</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigērijas naira</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Kordovas oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>NÄ«derlandes guldenis</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norvēģijas krona</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nep�las rūpija</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Jaunzēlandes dol�rs</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Om�nas ri�ls</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamas balboa</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peru jaunais sols</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua-Jaungvinejas kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipīnu peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakist�nas rūpija</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polijas zlots</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portug�les eskudo</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Kataras ri�ls</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rum�nijas leja</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbijas din�rs</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Krievijas rublis</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruandas franks</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saūda ri�ls</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Z�lamana salu dol�rs</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seišelu salu rūpija</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sud�nas m�rciņa</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Zviedrijas krona</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapūras dol�rs</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Sv.Helēnas salas m�rciņa</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovēnijas tolars</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovakijas krona</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sjerraleones leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Som�lijas šiliņš</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamas dol�rs</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamas guldenis</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Santome un Prinsipi dobra</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadoras kolons</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Svazilendas lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Taizemes b�ts</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikist�nas somons</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmēnijas manats</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunisijas din�rs</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongas paanga</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Turcijas lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>jaun� Turcijas lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinid�das un Tob�go dol�rs</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>jaunais Taiv�nas dol�rs</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanz�nijas šiliņš</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainas grivna</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandas šiliņš</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ASV dol�rs</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Urugvajas peso</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekist�nas sums</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venecuēlas boliv�rs</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venecuēlas stiprais boliv�rs</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vjetnamas dongi</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Samoa tala</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>sudrabs</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>zelts</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Eiropas naudas vienība</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Austrumkarību dol�rs</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Speci�l�s aizņēmuma tiesības</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Eiropas norēķinu vienība</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Francijas zelta franks</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Francijas UIC franks</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>pall�dijs</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platīns</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>nezin�ma vai nederīga valūta</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenas ri�ls</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Dienvid�frikas rands</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambijas kva�a</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabves dol�rs</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} diena</unitPattern>
-			<unitPattern count="other">{0} dienas</unitPattern>
-			<unitPattern count="zero">{0} dienas</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} stunda</unitPattern>
-			<unitPattern count="other">{0} stundas</unitPattern>
-			<unitPattern count="zero">{0} stundas</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minūte</unitPattern>
-			<unitPattern count="other">{0} minūtes</unitPattern>
-			<unitPattern count="zero">{0} minūtes</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mēnesis</unitPattern>
-			<unitPattern count="other">{0} mēneši</unitPattern>
-			<unitPattern count="zero">{0} mēneši</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekunde</unitPattern>
-			<unitPattern count="other">{0} sekundes</unitPattern>
-			<unitPattern count="zero">{0} sekundes</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} nedēļa</unitPattern>
-			<unitPattern count="other">{0} nedēļas</unitPattern>
-			<unitPattern count="zero">{0} nedēļas</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} gads</unitPattern>
-			<unitPattern count="other">{0} gadi</unitPattern>
-			<unitPattern count="zero">{0} gadi</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>j�:ja:j</yesstr>
-			<nostr>nē:ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/lv_LV.xml b/airtime_mvc/library/Zend/Locale/Data/lv_LV.xml
deleted file mode 100644
index 07c7e65f1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/lv_LV.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="lv"/>
-		<territory type="LV"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/metazoneInfo.xml b/airtime_mvc/library/Zend/Locale/Data/metazoneInfo.xml
deleted file mode 100644
index 1e869af69..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/metazoneInfo.xml
+++ /dev/null
@@ -1,1403 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-	<metazoneInfo>
-		<timezone type="Europe/Andorra">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Dubai">
-			<usesMetazone mzone="Gulf"/>
-		</timezone>
-		<timezone type="Asia/Kabul">
-			<usesMetazone mzone="Afghanistan"/>
-		</timezone>
-		<timezone type="America/Antigua">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Anguilla">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Europe/Tirane">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Yerevan">
-			<usesMetazone to="1991-09-22 20:00" mzone="Yerevan"/>
-			<usesMetazone from="1991-09-22 20:00" mzone="Armenia"/>
-		</timezone>
-		<timezone type="America/Curacao">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Africa/Luanda">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Antarctica/Rothera">
-			<usesMetazone mzone="Rothera"/>
-		</timezone>
-		<timezone type="Antarctica/Palmer">
-			<usesMetazone to="1982-05-01 03:00" mzone="Argentina"/>
-			<usesMetazone from="1982-05-01 03:00" mzone="Chile"/>
-		</timezone>
-		<timezone type="Antarctica/Syowa">
-			<usesMetazone mzone="Syowa"/>
-		</timezone>
-		<timezone type="Antarctica/Mawson">
-			<usesMetazone mzone="Mawson"/>
-		</timezone>
-		<timezone type="Antarctica/Davis">
-			<usesMetazone mzone="Davis"/>
-		</timezone>
-		<timezone type="Antarctica/Vostok">
-			<usesMetazone mzone="Vostok"/>
-		</timezone>
-		<timezone type="Antarctica/Casey">
-			<usesMetazone mzone="Australia_Western"/>
-		</timezone>
-		<timezone type="Antarctica/DumontDUrville">
-			<usesMetazone mzone="DumontDUrville"/>
-		</timezone>
-		<timezone type="Antarctica/McMurdo">
-			<usesMetazone mzone="New_Zealand"/>
-		</timezone>
-		<timezone type="America/Argentina/Rio_Gallegos">
-			<usesMetazone to="2004-06-01 03:00" mzone="Argentina"/>
-			<usesMetazone to="2004-06-20 04:00" from="2004-06-01 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-06-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Mendoza">
-			<usesMetazone to="1990-03-04 02:00" mzone="Argentina"/>
-			<usesMetazone to="1992-10-18 04:00" from="1990-03-04 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-05-23 03:00" from="1992-10-18 04:00" mzone="Argentina"/>
-			<usesMetazone to="2004-09-26 04:00" from="2004-05-23 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-09-26 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/San_Juan">
-			<usesMetazone to="1991-03-01 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-05-07 04:00" from="1991-03-01 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-05-31 03:00" from="1991-05-07 04:00" mzone="Argentina"/>
-			<usesMetazone to="2004-07-25 04:00" from="2004-05-31 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-07-25 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/Ushuaia">
-			<usesMetazone to="2004-05-30 03:00" mzone="Argentina"/>
-			<usesMetazone to="2004-06-20 04:00" from="2004-05-30 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-06-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/La_Rioja">
-			<usesMetazone to="1991-03-01 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-05-07 04:00" from="1991-03-01 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-06-01 03:00" from="1991-05-07 04:00" mzone="Argentina"/>
-			<usesMetazone to="2004-06-20 04:00" from="2004-06-01 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-06-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Catamarca">
-			<usesMetazone to="1991-03-03 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-10-20 04:00" from="1991-03-03 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-06-01 03:00" from="1991-10-20 04:00" mzone="Argentina"/>
-			<usesMetazone to="2004-06-20 04:00" from="2004-06-01 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-06-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Jujuy">
-			<usesMetazone to="1990-03-04 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-10-06 04:00" from="1990-03-04 02:00" mzone="Argentina_Western"/>
-			<usesMetazone from="1991-10-06 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/Tucuman">
-			<usesMetazone to="1991-03-03 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-10-20 04:00" from="1991-03-03 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-06-01 03:00" from="1991-10-20 04:00" mzone="Argentina"/>
-			<usesMetazone to="2004-06-13 04:00" from="2004-06-01 03:00" mzone="Argentina_Western"/>
-			<usesMetazone from="2004-06-13 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Cordoba">
-			<usesMetazone to="1991-03-03 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-10-20 04:00" from="1991-03-03 02:00" mzone="Argentina_Western"/>
-			<usesMetazone from="1991-10-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Buenos_Aires">
-			<usesMetazone mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/San_Luis">
-			<usesMetazone to="1990-03-14 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-06-01 04:00" from="1990-03-14 02:00" mzone="Argentina_Western"/>
-			<usesMetazone to="1999-10-03 03:00" from="1991-06-01 04:00" mzone="Argentina"/>
-			<usesMetazone to="2000-03-03 03:00" from="1999-10-03 03:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2004-05-31 03:00" from="2000-03-03 03:00" mzone="Argentina"/>
-			<usesMetazone to="2004-07-25 04:00" from="2004-05-31 03:00" mzone="Argentina_Western"/>
-			<usesMetazone to="2009-03-15 03:00" from="2004-07-25 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="America/Argentina/Salta">
-			<usesMetazone to="1991-03-03 02:00" mzone="Argentina"/>
-			<usesMetazone to="1991-10-20 04:00" from="1991-03-03 02:00" mzone="Argentina_Western"/>
-			<usesMetazone from="1991-10-20 04:00" mzone="Argentina"/>
-		</timezone>
-		<timezone type="Pacific/Pago_Pago">
-			<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
-			<usesMetazone from="1983-10-30 12:00" mzone="Samoa"/>
-		</timezone>
-		<timezone type="Europe/Vienna">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Australia/Perth">
-			<usesMetazone mzone="Australia_Western"/>
-		</timezone>
-		<timezone type="Australia/Eucla">
-			<usesMetazone mzone="Australia_CentralWestern"/>
-		</timezone>
-		<timezone type="Australia/Darwin">
-			<usesMetazone mzone="Australia_Central"/>
-		</timezone>
-		<timezone type="Australia/Adelaide">
-			<usesMetazone mzone="Australia_Central"/>
-		</timezone>
-		<timezone type="Australia/Broken_Hill">
-			<usesMetazone mzone="Australia_Central"/>
-		</timezone>
-		<timezone type="Australia/Currie">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Melbourne">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Hobart">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Lindeman">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Sydney">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Brisbane">
-			<usesMetazone mzone="Australia_Eastern"/>
-		</timezone>
-		<timezone type="Australia/Lord_Howe">
-			<usesMetazone to="1981-02-28 14:00" mzone="Australia_Eastern"/>
-			<usesMetazone from="1981-02-28 14:00" mzone="Lord_Howe"/>
-		</timezone>
-		<timezone type="America/Aruba">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Europe/Mariehamn">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Baku">
-			<usesMetazone to="1991-08-29 20:00" mzone="Baku"/>
-			<usesMetazone from="1991-08-29 20:00" mzone="Azerbaijan"/>
-		</timezone>
-		<timezone type="Europe/Sarajevo">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Barbados">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Dhaka">
-			<usesMetazone to="1971-03-25 18:00" mzone="Dacca"/>
-			<usesMetazone from="1971-03-25 18:00" mzone="Bangladesh"/>
-		</timezone>
-		<timezone type="Europe/Brussels">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Ouagadougou">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Europe/Sofia">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Bahrain">
-			<usesMetazone to="1972-05-31 20:00" mzone="Gulf"/>
-			<usesMetazone from="1972-05-31 20:00" mzone="Arabian"/>
-		</timezone>
-		<timezone type="Africa/Bujumbura">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Africa/Porto-Novo">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Atlantic/Bermuda">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/St_Barthelemy">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Brunei">
-			<usesMetazone mzone="Brunei"/>
-		</timezone>
-		<timezone type="America/La_Paz">
-			<usesMetazone mzone="Bolivia"/>
-		</timezone>
-		<timezone type="America/Eirunepe">
-			<usesMetazone to="2008-06-24 05:00" mzone="Acre"/>
-			<usesMetazone from="2008-06-24 05:00" mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Rio_Branco">
-			<usesMetazone to="2008-06-24 05:00" mzone="Acre"/>
-			<usesMetazone from="2008-06-24 05:00" mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Porto_Velho">
-			<usesMetazone mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Boa_Vista">
-			<usesMetazone mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Manaus">
-			<usesMetazone mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Cuiaba">
-			<usesMetazone mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Campo_Grande">
-			<usesMetazone mzone="Amazon"/>
-		</timezone>
-		<timezone type="America/Belem">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Araguaina">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Sao_Paulo">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Bahia">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Fortaleza">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Maceio">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Recife">
-			<usesMetazone mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Noronha">
-			<usesMetazone mzone="Noronha"/>
-		</timezone>
-		<timezone type="America/Santarem">
-			<usesMetazone to="2008-06-24 04:00" mzone="Amazon"/>
-			<usesMetazone from="2008-06-24 04:00" mzone="Brasilia"/>
-		</timezone>
-		<timezone type="America/Nassau">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Thimphu">
-			<usesMetazone to="1987-09-30 18:30" mzone="India"/>
-			<usesMetazone from="1987-09-30 18:30" mzone="Bhutan"/>
-		</timezone>
-		<timezone type="Africa/Gaborone">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Europe/Minsk">
-			<usesMetazone to="1991-03-30 23:00" mzone="Moscow"/>
-			<usesMetazone from="1991-03-30 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="America/Belize">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Dawson">
-			<usesMetazone to="1973-10-28 09:00" mzone="Yukon"/>
-			<usesMetazone from="1973-10-28 09:00" mzone="America_Pacific"/>
-		</timezone>
-		<timezone type="America/Whitehorse">
-			<usesMetazone mzone="America_Pacific"/>
-		</timezone>
-		<timezone type="America/Inuvik">
-			<usesMetazone to="1979-04-29 10:00" mzone="America_Pacific"/>
-			<usesMetazone from="1979-04-29 10:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Vancouver">
-			<usesMetazone mzone="America_Pacific"/>
-		</timezone>
-		<timezone type="America/Dawson_Creek">
-			<usesMetazone to="1972-08-30 09:00" mzone="America_Pacific"/>
-			<usesMetazone from="1972-08-30 09:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Yellowknife">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Edmonton">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Swift_Current">
-			<usesMetazone to="1972-04-30 09:00" mzone="America_Mountain"/>
-			<usesMetazone from="1972-04-30 09:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Cambridge_Bay">
-			<usesMetazone to="1999-10-31 08:00" mzone="America_Mountain"/>
-			<usesMetazone to="2000-10-29 07:00" from="1999-10-31 08:00" mzone="America_Central"/>
-			<usesMetazone to="2000-11-05 05:00" from="2000-10-29 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="2001-04-01 09:00" from="2000-11-05 05:00" mzone="America_Central"/>
-			<usesMetazone from="2001-04-01 09:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Resolute">
-			<usesMetazone to="2000-10-29 07:00" mzone="America_Central"/>
-			<usesMetazone to="2001-04-01 08:00" from="2000-10-29 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="2006-10-29 07:00" from="2001-04-01 08:00" mzone="America_Central"/>
-			<usesMetazone from="2006-10-29 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Regina">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Winnipeg">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Rainy_River">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Rankin_Inlet">
-			<usesMetazone to="2000-10-29 07:00" mzone="America_Central"/>
-			<usesMetazone to="2001-04-01 08:00" from="2000-10-29 07:00" mzone="America_Eastern"/>
-			<usesMetazone from="2001-04-01 08:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Coral_Harbour">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Thunder_Bay">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Nipigon">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Toronto">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Montreal">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Iqaluit">
-			<usesMetazone to="1999-10-31 06:00" mzone="America_Eastern"/>
-			<usesMetazone to="2000-10-29 07:00" from="1999-10-31 06:00" mzone="America_Central"/>
-			<usesMetazone from="2000-10-29 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Pangnirtung">
-			<usesMetazone to="1995-04-02 06:00" mzone="Atlantic"/>
-			<usesMetazone to="1999-10-31 06:00" from="1995-04-02 06:00" mzone="America_Eastern"/>
-			<usesMetazone to="2000-10-29 07:00" from="1999-10-31 06:00" mzone="America_Central"/>
-			<usesMetazone from="2000-10-29 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Moncton">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Halifax">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Goose_Bay">
-			<usesMetazone to="1988-04-03 04:01" mzone="Atlantic"/>
-			<usesMetazone to="1988-10-30 02:01" from="1988-04-03 04:01" mzone="Goose_Bay"/>
-			<usesMetazone from="1988-10-30 02:01" mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Glace_Bay">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Blanc-Sablon">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/St_Johns">
-			<usesMetazone mzone="Newfoundland"/>
-		</timezone>
-		<timezone type="Indian/Cocos">
-			<usesMetazone mzone="Cocos"/>
-		</timezone>
-		<timezone type="Africa/Kinshasa">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Africa/Lubumbashi">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Africa/Bangui">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Africa/Brazzaville">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Europe/Zurich">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Abidjan">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Pacific/Rarotonga">
-			<usesMetazone mzone="Cook"/>
-		</timezone>
-		<timezone type="Pacific/Easter">
-			<usesMetazone mzone="Easter"/>
-		</timezone>
-		<timezone type="America/Santiago">
-			<usesMetazone mzone="Chile"/>
-		</timezone>
-		<timezone type="Africa/Douala">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Asia/Kashgar">
-			<usesMetazone to="1980-04-30 19:00" mzone="Kashgar"/>
-			<usesMetazone from="1980-04-30 19:00" mzone="China"/>
-		</timezone>
-		<timezone type="Asia/Urumqi">
-			<usesMetazone to="1980-04-30 18:00" mzone="Urumqi"/>
-			<usesMetazone from="1980-04-30 18:00" mzone="China"/>
-		</timezone>
-		<timezone type="Asia/Chongqing">
-			<usesMetazone to="1980-04-30 17:00" mzone="Long_Shu"/>
-			<usesMetazone from="1980-04-30 17:00" mzone="China"/>
-		</timezone>
-		<timezone type="Asia/Shanghai">
-			<usesMetazone mzone="China"/>
-		</timezone>
-		<timezone type="Asia/Harbin">
-			<usesMetazone to="1980-04-30 15:30" mzone="Changbai"/>
-			<usesMetazone from="1980-04-30 15:30" mzone="China"/>
-		</timezone>
-		<timezone type="America/Bogota">
-			<usesMetazone mzone="Colombia"/>
-		</timezone>
-		<timezone type="America/Costa_Rica">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Havana">
-			<usesMetazone mzone="Cuba"/>
-		</timezone>
-		<timezone type="Atlantic/Cape_Verde">
-			<usesMetazone mzone="Cape_Verde"/>
-		</timezone>
-		<timezone type="Indian/Christmas">
-			<usesMetazone mzone="Christmas"/>
-		</timezone>
-		<timezone type="Asia/Nicosia">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Prague">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Berlin">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Djibouti">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Copenhagen">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Dominica">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Santo_Domingo">
-			<usesMetazone to="1974-10-27 05:00" mzone="Dominican"/>
-			<usesMetazone to="2000-10-29 06:00" from="1974-10-27 05:00" mzone="Atlantic"/>
-			<usesMetazone to="2000-12-03 06:00" from="2000-10-29 06:00" mzone="America_Eastern"/>
-			<usesMetazone from="2000-12-03 06:00" mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Africa/Algiers">
-			<usesMetazone to="1977-10-20 23:00" mzone="Europe_Western"/>
-			<usesMetazone to="1979-10-25 23:00" from="1977-10-20 23:00" mzone="Europe_Central"/>
-			<usesMetazone to="1981-05-01 00:00" from="1979-10-25 23:00" mzone="Europe_Western"/>
-			<usesMetazone from="1981-05-01 00:00" mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Pacific/Galapagos">
-			<usesMetazone to="1986-01-01 05:00" mzone="Ecuador"/>
-			<usesMetazone from="1986-01-01 05:00" mzone="Galapagos"/>
-		</timezone>
-		<timezone type="America/Guayaquil">
-			<usesMetazone mzone="Ecuador"/>
-		</timezone>
-		<timezone type="Europe/Tallinn">
-			<usesMetazone to="1989-03-25 23:00" mzone="Moscow"/>
-			<usesMetazone from="1989-03-25 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Cairo">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/El_Aaiun">
-			<usesMetazone to="1976-04-14 01:00" mzone="Africa_FarWestern"/>
-			<usesMetazone from="1976-04-14 01:00" mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Africa/Asmera">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Atlantic/Canary">
-			<usesMetazone mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Africa/Ceuta">
-			<usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/>
-			<usesMetazone from="1984-03-16 00:00" mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Madrid">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Addis_Ababa">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Helsinki">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Pacific/Fiji">
-			<usesMetazone mzone="Fiji"/>
-		</timezone>
-		<timezone type="Atlantic/Stanley">
-			<usesMetazone mzone="Falkland"/>
-		</timezone>
-		<timezone type="Pacific/Truk">
-			<usesMetazone mzone="Truk"/>
-		</timezone>
-		<timezone type="Pacific/Ponape">
-			<usesMetazone mzone="Ponape"/>
-		</timezone>
-		<timezone type="Pacific/Kosrae">
-			<usesMetazone mzone="Kosrae"/>
-		</timezone>
-		<timezone type="Atlantic/Faeroe">
-			<usesMetazone mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Europe/Paris">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Libreville">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Europe/London">
-			<usesMetazone mzone="British" to="1971-10-31 02:00"/>
-			<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
-		</timezone>
-		<timezone type="America/Grenada">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Tbilisi">
-			<usesMetazone to="1991-04-08 20:00" mzone="Tbilisi"/>
-			<usesMetazone from="1991-04-08 20:00" mzone="Georgia"/>
-		</timezone>
-		<timezone type="America/Cayenne">
-			<usesMetazone mzone="French_Guiana"/>
-		</timezone>
-		<timezone type="Europe/Guernsey">
-			<usesMetazone mzone="British" to="1971-10-31 02:00"/>
-			<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
-		</timezone>
-		<timezone type="Africa/Accra">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Europe/Gibraltar">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Thule">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Godthab">
-			<usesMetazone mzone="Greenland_Western"/>
-		</timezone>
-		<timezone type="America/Scoresbysund">
-			<usesMetazone to="1981-03-29 02:00" mzone="Greenland_Central"/>
-			<usesMetazone from="1981-03-29 02:00" mzone="Greenland_Eastern"/>
-		</timezone>
-		<timezone type="America/Danmarkshavn">
-			<usesMetazone to="1996-01-01 03:00" mzone="Greenland_Western"/>
-			<usesMetazone from="1996-01-01 03:00" mzone="GMT"/>
-		</timezone>
-		<timezone type="Africa/Banjul">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Africa/Conakry">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="America/Guadeloupe">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Africa/Malabo">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Europe/Athens">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Atlantic/South_Georgia">
-			<usesMetazone mzone="South_Georgia"/>
-		</timezone>
-		<timezone type="America/Guatemala">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="Pacific/Guam">
-			<usesMetazone to="2000-12-22 14:00" mzone="Guam"/>
-			<usesMetazone from="2000-12-22 14:00" mzone="Chamorro"/>
-		</timezone>
-		<timezone type="Africa/Bissau">
-			<usesMetazone to="1975-01-01 01:00" mzone="Africa_FarWestern"/>
-			<usesMetazone from="1975-01-01 01:00" mzone="GMT"/>
-		</timezone>
-		<timezone type="America/Guyana">
-			<usesMetazone mzone="Guyana"/>
-		</timezone>
-		<timezone type="Asia/Hong_Kong">
-			<usesMetazone mzone="Hong_Kong"/>
-		</timezone>
-		<timezone type="America/Tegucigalpa">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="Europe/Zagreb">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Port-au-Prince">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Budapest">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Jakarta">
-			<usesMetazone mzone="Indonesia_Western"/>
-		</timezone>
-		<timezone type="Asia/Pontianak">
-			<usesMetazone to="1987-12-31 16:00" mzone="Indonesia_Central"/>
-			<usesMetazone from="1987-12-31 16:00" mzone="Indonesia_Western"/>
-		</timezone>
-		<timezone type="Asia/Makassar">
-			<usesMetazone mzone="Indonesia_Central"/>
-		</timezone>
-		<timezone type="Asia/Jayapura">
-			<usesMetazone mzone="Indonesia_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Dublin">
-			<usesMetazone mzone="Irish" to="1971-10-31 02:00"/>
-			<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
-		</timezone>
-		<timezone type="Asia/Jerusalem">
-			<usesMetazone mzone="Israel"/>
-		</timezone>
-		<timezone type="Europe/Isle_of_Man">
-			<usesMetazone mzone="British" to="1971-10-31 02:00"/>
-			<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
-		</timezone>
-		<timezone type="Asia/Calcutta">
-			<usesMetazone mzone="India"/>
-		</timezone>
-		<timezone type="Indian/Chagos">
-			<usesMetazone mzone="Indian_Ocean"/>
-		</timezone>
-		<timezone type="Asia/Baghdad">
-			<usesMetazone mzone="Arabian"/>
-		</timezone>
-		<timezone type="Asia/Tehran">
-			<usesMetazone mzone="Iran"/>
-		</timezone>
-		<timezone type="Atlantic/Reykjavik">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Europe/Rome">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Jersey">
-			<usesMetazone mzone="British" to="1971-10-31 02:00"/>
-			<usesMetazone mzone="GMT" from="1971-10-31 02:00"/>
-		</timezone>
-		<timezone type="America/Jamaica">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Amman">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Tokyo">
-			<usesMetazone mzone="Japan"/>
-		</timezone>
-		<timezone type="Africa/Nairobi">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Bishkek">
-			<usesMetazone to="1991-08-30 20:00" mzone="Frunze"/>
-			<usesMetazone from="1991-08-30 20:00" mzone="Kyrgystan"/>
-		</timezone>
-		<timezone type="Asia/Phnom_Penh">
-			<usesMetazone mzone="Indochina"/>
-		</timezone>
-		<timezone type="Pacific/Enderbury">
-			<usesMetazone mzone="Phoenix_Islands"/>
-		</timezone>
-		<timezone type="Pacific/Kiritimati">
-			<usesMetazone mzone="Line_Islands"/>
-		</timezone>
-		<timezone type="Pacific/Tarawa">
-			<usesMetazone mzone="Gilbert_Islands"/>
-		</timezone>
-		<timezone type="Indian/Comoro">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="America/St_Kitts">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Pyongyang">
-			<usesMetazone mzone="Korea"/>
-		</timezone>
-		<timezone type="Asia/Seoul">
-			<usesMetazone mzone="Korea"/>
-		</timezone>
-		<timezone type="Asia/Kuwait">
-			<usesMetazone mzone="Arabian"/>
-		</timezone>
-		<timezone type="America/Cayman">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Aqtau">
-			<usesMetazone to="1991-12-15 19:00" mzone="Shevchenko"/>
-			<usesMetazone to="2005-03-14 20:00" from="1991-12-15 19:00" mzone="Aqtau"/>
-			<usesMetazone from="2005-03-14 20:00" mzone="Kazakhstan_Western"/>
-		</timezone>
-		<timezone type="Asia/Oral">
-			<usesMetazone to="1991-12-15 20:00" mzone="Uralsk"/>
-			<usesMetazone to="2005-03-14 20:00" from="1991-12-15 20:00" mzone="Oral"/>
-			<usesMetazone from="2005-03-14 20:00" mzone="Kazakhstan_Western"/>
-		</timezone>
-		<timezone type="Asia/Aqtobe">
-			<usesMetazone to="1991-12-15 19:00" mzone="Aktyubinsk"/>
-			<usesMetazone to="2005-03-14 19:00" from="1991-12-15 19:00" mzone="Aqtobe"/>
-			<usesMetazone from="2005-03-14 19:00" mzone="Kazakhstan_Western"/>
-		</timezone>
-		<timezone type="Asia/Qyzylorda">
-			<usesMetazone to="1991-12-15 19:00" mzone="Kizilorda"/>
-			<usesMetazone to="2005-03-14 18:00" from="1991-12-15 19:00" mzone="Qyzylorda"/>
-			<usesMetazone from="2005-03-14 18:00" mzone="Kazakhstan_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Almaty">
-			<usesMetazone to="2005-03-14 18:00" mzone="Almaty"/>
-			<usesMetazone from="2005-03-14 18:00" mzone="Kazakhstan_Eastern"/>
-		</timezone>
-		<timezone type="Asia/Vientiane">
-			<usesMetazone mzone="Indochina"/>
-		</timezone>
-		<timezone type="Asia/Beirut">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="America/St_Lucia">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Europe/Vaduz">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Colombo">
-			<usesMetazone to="1996-05-24 18:30" mzone="India"/>
-			<usesMetazone to="2006-04-14 18:30" from="1996-05-24 18:30" mzone="Lanka"/>
-			<usesMetazone from="2006-04-14 18:30" mzone="India"/>
-		</timezone>
-		<timezone type="Africa/Monrovia">
-			<usesMetazone mzone="Liberia" to="1972-05-01 00:45"/>
-			<usesMetazone mzone="GMT" from="1972-05-01 00:45"/>
-		</timezone>
-		<timezone type="Africa/Maseru">
-			<usesMetazone mzone="Africa_Southern"/>
-		</timezone>
-		<timezone type="Europe/Vilnius">
-			<usesMetazone to="1991-03-30 23:00" mzone="Moscow"/>
-			<usesMetazone to="1998-03-29 01:00" from="1991-03-30 23:00" mzone="Europe_Eastern"/>
-			<usesMetazone to="1999-10-31 01:00" from="1998-03-29 01:00" mzone="Europe_Central"/>
-			<usesMetazone from="1999-10-31 01:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Luxembourg">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Riga">
-			<usesMetazone to="1989-03-25 23:00" mzone="Moscow"/>
-			<usesMetazone from="1989-03-25 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Tripoli">
-			<usesMetazone to="1981-12-31 22:00" mzone="Europe_Eastern"/>
-			<usesMetazone to="1990-05-03 23:00" from="1981-12-31 22:00" mzone="Europe_Central"/>
-			<usesMetazone to="1996-09-29 22:00" from="1990-05-03 23:00" mzone="Europe_Eastern"/>
-			<usesMetazone to="1997-10-03 22:00" from="1996-09-29 22:00" mzone="Europe_Central"/>
-			<usesMetazone from="1997-10-03 22:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Casablanca">
-			<usesMetazone to="1984-03-16 00:00" mzone="Europe_Western"/>
-			<usesMetazone to="1985-12-31 23:00" from="1984-03-16 00:00" mzone="Europe_Central"/>
-			<usesMetazone from="1985-12-31 23:00" mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Europe/Monaco">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Chisinau">
-			<usesMetazone to="1990-05-05 21:00" mzone="Moscow"/>
-			<usesMetazone from="1990-05-05 21:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Podgorica">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Indian/Antananarivo">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Pacific/Kwajalein">
-			<usesMetazone to="1993-08-20 12:00" mzone="Kwajalein"/>
-			<usesMetazone from="1993-08-20 12:00" mzone="Marshall_Islands"/>
-		</timezone>
-		<timezone type="Pacific/Majuro">
-			<usesMetazone mzone="Marshall_Islands"/>
-		</timezone>
-		<timezone type="Europe/Skopje">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Marigot">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Africa/Bamako">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Asia/Rangoon">
-			<usesMetazone mzone="Myanmar"/>
-		</timezone>
-		<timezone type="Asia/Hovd">
-			<usesMetazone mzone="Hovd"/>
-		</timezone>
-		<timezone type="Asia/Ulaanbaatar">
-			<usesMetazone mzone="Mongolia"/>
-		</timezone>
-		<timezone type="Asia/Choibalsan">
-			<usesMetazone to="1983-03-31 16:00" mzone="Mongolia"/>
-			<usesMetazone from="1983-03-31 16:00" mzone="Choibalsan"/>
-		</timezone>
-		<timezone type="Asia/Macau">
-			<usesMetazone to="1999-12-19 16:00" mzone="Macau"/>
-			<usesMetazone from="1999-12-19 16:00" mzone="China"/>
-		</timezone>
-		<timezone type="Pacific/Saipan">
-			<usesMetazone to="2000-12-22 14:00" mzone="North_Mariana"/>
-			<usesMetazone from="2000-12-22 14:00" mzone="Chamorro"/>
-		</timezone>
-		<timezone type="America/Martinique">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Africa/Nouakchott">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="America/Montserrat">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Europe/Malta">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Indian/Mauritius">
-			<usesMetazone mzone="Mauritius"/>
-		</timezone>
-		<timezone type="Indian/Maldives">
-			<usesMetazone mzone="Maldives"/>
-		</timezone>
-		<timezone type="Africa/Blantyre">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="America/Tijuana">
-			<usesMetazone mzone="America_Pacific"/>
-		</timezone>
-		<timezone type="America/Hermosillo">
-			<usesMetazone to="1970-01-01 08:00" mzone="America_Pacific"/>
-			<usesMetazone from="1970-01-01 08:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Mazatlan">
-			<usesMetazone to="1970-01-01 08:00" mzone="America_Pacific"/>
-			<usesMetazone from="1970-01-01 08:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Chihuahua">
-			<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
-			<usesMetazone from="1998-04-05 09:00" mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Monterrey">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Mexico_City">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Merida">
-			<usesMetazone to="1981-12-23 06:00" mzone="America_Central"/>
-			<usesMetazone to="1982-12-02 05:00" from="1981-12-23 06:00" mzone="America_Eastern"/>
-			<usesMetazone from="1982-12-02 05:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Cancun">
-			<usesMetazone to="1981-12-23 06:00" mzone="America_Central"/>
-			<usesMetazone to="1998-08-02 06:00" from="1981-12-23 06:00" mzone="America_Eastern"/>
-			<usesMetazone from="1998-08-02 06:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="Asia/Kuala_Lumpur">
-			<usesMetazone to="1981-12-31 16:30" mzone="Malaya"/>
-			<usesMetazone from="1981-12-31 16:30" mzone="Malaysia"/>
-		</timezone>
-		<timezone type="Asia/Kuching">
-			<usesMetazone to="1981-12-31 16:00" mzone="Borneo"/>
-			<usesMetazone from="1981-12-31 16:00" mzone="Malaysia"/>
-		</timezone>
-		<timezone type="Africa/Maputo">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Africa/Windhoek">
-			<usesMetazone to="1990-03-20 22:00" mzone="Africa_Southern"/>
-			<usesMetazone to="1994-04-02 22:00" from="1990-03-20 22:00" mzone="Africa_Central"/>
-			<usesMetazone from="1994-04-02 22:00" mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Pacific/Noumea">
-			<usesMetazone mzone="New_Caledonia"/>
-		</timezone>
-		<timezone type="Africa/Niamey">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Pacific/Norfolk">
-			<usesMetazone mzone="Norfolk"/>
-		</timezone>
-		<timezone type="Africa/Lagos">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="America/Managua">
-			<usesMetazone to="1973-05-01 06:00" mzone="America_Central"/>
-			<usesMetazone to="1975-02-16 05:00" from="1973-05-01 06:00" mzone="America_Eastern"/>
-			<usesMetazone to="1992-01-01 10:00" from="1975-02-16 05:00" mzone="America_Central"/>
-			<usesMetazone to="1992-09-24 05:00" from="1992-01-01 10:00" mzone="America_Eastern"/>
-			<usesMetazone to="1993-01-01 06:00" from="1992-09-24 05:00" mzone="America_Central"/>
-			<usesMetazone to="1997-01-01 05:00" from="1993-01-01 06:00" mzone="America_Eastern"/>
-			<usesMetazone from="1997-01-01 05:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="Europe/Amsterdam">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Oslo">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Katmandu">
-			<usesMetazone mzone="Nepal"/>
-		</timezone>
-		<timezone type="Pacific/Nauru">
-			<usesMetazone mzone="Nauru"/>
-		</timezone>
-		<timezone type="Pacific/Niue">
-			<usesMetazone mzone="Niue"/>
-		</timezone>
-		<timezone type="Pacific/Chatham">
-			<usesMetazone mzone="Chatham"/>
-		</timezone>
-		<timezone type="Pacific/Auckland">
-			<usesMetazone mzone="New_Zealand"/>
-		</timezone>
-		<timezone type="Asia/Muscat">
-			<usesMetazone mzone="Gulf"/>
-		</timezone>
-		<timezone type="America/Panama">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Lima">
-			<usesMetazone mzone="Peru"/>
-		</timezone>
-		<timezone type="Pacific/Tahiti">
-			<usesMetazone mzone="Tahiti"/>
-		</timezone>
-		<timezone type="Pacific/Marquesas">
-			<usesMetazone mzone="Marquesas"/>
-		</timezone>
-		<timezone type="Pacific/Gambier">
-			<usesMetazone mzone="Gambier"/>
-		</timezone>
-		<timezone type="Pacific/Port_Moresby">
-			<usesMetazone mzone="Papua_New_Guinea"/>
-		</timezone>
-		<timezone type="Asia/Manila">
-			<usesMetazone mzone="Philippines"/>
-		</timezone>
-		<timezone type="Asia/Karachi">
-			<usesMetazone to="1971-03-25 19:00" mzone="Karachi"/>
-			<usesMetazone from="1971-03-25 19:00" mzone="Pakistan"/>
-		</timezone>
-		<timezone type="Europe/Warsaw">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/Miquelon">
-			<usesMetazone to="1980-05-01 04:00" mzone="Atlantic"/>
-			<usesMetazone from="1980-05-01 04:00" mzone="Pierre_Miquelon"/>
-		</timezone>
-		<timezone type="Pacific/Pitcairn">
-			<usesMetazone mzone="Pitcairn"/>
-		</timezone>
-		<timezone type="America/Puerto_Rico">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Gaza">
-			<usesMetazone to="1995-12-31 22:00" mzone="Israel"/>
-			<usesMetazone from="1995-12-31 22:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Atlantic/Azores">
-			<usesMetazone to="1992-09-27 02:00" mzone="Azores"/>
-			<usesMetazone to="1993-03-28 01:00" from="1992-09-27 02:00" mzone="Europe_Western"/>
-			<usesMetazone from="1993-03-28 01:00" mzone="Azores"/>
-		</timezone>
-		<timezone type="Atlantic/Madeira">
-			<usesMetazone mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Europe/Lisbon">
-			<usesMetazone to="1976-09-26 00:00" mzone="Europe_Central"/>
-			<usesMetazone to="1992-09-27 01:00" from="1976-09-26 00:00" mzone="Europe_Western"/>
-			<usesMetazone to="1996-03-31 01:00" from="1992-09-27 01:00" mzone="Europe_Central"/>
-			<usesMetazone from="1996-03-31 01:00" mzone="Europe_Western"/>
-		</timezone>
-		<timezone type="Pacific/Palau">
-			<usesMetazone mzone="Palau"/>
-		</timezone>
-		<timezone type="America/Asuncion">
-			<usesMetazone mzone="Paraguay"/>
-		</timezone>
-		<timezone type="Asia/Qatar">
-			<usesMetazone to="1972-05-31 20:00" mzone="Gulf"/>
-			<usesMetazone from="1972-05-31 20:00" mzone="Arabian"/>
-		</timezone>
-		<timezone type="Indian/Reunion">
-			<usesMetazone mzone="Reunion"/>
-		</timezone>
-		<timezone type="Europe/Bucharest">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Belgrade">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Kaliningrad">
-			<usesMetazone to="1991-03-30 23:00" mzone="Moscow"/>
-			<usesMetazone from="1991-03-30 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Moscow">
-			<usesMetazone to="1991-03-30 23:00" mzone="Moscow"/>
-			<usesMetazone to="1992-01-19 00:00" from="1991-03-30 23:00" mzone="Europe_Eastern"/>
-			<usesMetazone from="1992-01-19 00:00" mzone="Moscow"/>
-		</timezone>
-		<timezone type="Europe/Volgograd">
-			<usesMetazone mzone="Volgograd"/>
-		</timezone>
-		<timezone type="Europe/Samara">
-			<usesMetazone to="1991-10-20 00:00" mzone="Kuybyshev"/>
-			<usesMetazone from="1991-10-20 00:00" mzone="Samara"/>
-		</timezone>
-		<timezone type="Asia/Yekaterinburg">
-			<usesMetazone to="1992-01-18 22:00" mzone="Sverdlovsk"/>
-			<usesMetazone from="1992-01-18 22:00" mzone="Yekaterinburg"/>
-		</timezone>
-		<timezone type="Asia/Omsk">
-			<usesMetazone mzone="Omsk"/>
-		</timezone>
-		<timezone type="Asia/Novosibirsk">
-			<usesMetazone mzone="Novosibirsk"/>
-		</timezone>
-		<timezone type="Asia/Krasnoyarsk">
-			<usesMetazone mzone="Krasnoyarsk"/>
-		</timezone>
-		<timezone type="Asia/Irkutsk">
-			<usesMetazone mzone="Irkutsk"/>
-		</timezone>
-		<timezone type="Asia/Yakutsk">
-			<usesMetazone mzone="Yakutsk"/>
-		</timezone>
-		<timezone type="Asia/Vladivostok">
-			<usesMetazone mzone="Vladivostok"/>
-		</timezone>
-		<timezone type="Asia/Sakhalin">
-			<usesMetazone mzone="Sakhalin"/>
-		</timezone>
-		<timezone type="Asia/Magadan">
-			<usesMetazone mzone="Magadan"/>
-		</timezone>
-		<timezone type="Asia/Kamchatka">
-			<usesMetazone mzone="Kamchatka"/>
-		</timezone>
-		<timezone type="Asia/Anadyr">
-			<usesMetazone mzone="Anadyr"/>
-		</timezone>
-		<timezone type="Africa/Kigali">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Asia/Riyadh">
-			<usesMetazone mzone="Arabian"/>
-		</timezone>
-		<timezone type="Pacific/Guadalcanal">
-			<usesMetazone mzone="Solomon"/>
-		</timezone>
-		<timezone type="Indian/Mahe">
-			<usesMetazone mzone="Seychelles"/>
-		</timezone>
-		<timezone type="Africa/Khartoum">
-			<usesMetazone to="2000-01-15 10:00" mzone="Africa_Central"/>
-			<usesMetazone from="2000-01-15 10:00" mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Stockholm">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Asia/Singapore">
-			<usesMetazone mzone="Singapore"/>
-		</timezone>
-		<timezone type="Atlantic/St_Helena">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Europe/Ljubljana">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Arctic/Longyearbyen">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Europe/Bratislava">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Freetown">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Europe/San_Marino">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Africa/Dakar">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Africa/Mogadishu">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="America/Paramaribo">
-			<usesMetazone to="1975-11-20 03:30" mzone="Dutch_Guiana"/>
-			<usesMetazone from="1975-11-20 03:30" mzone="Suriname"/>
-		</timezone>
-		<timezone type="Africa/Sao_Tome">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="America/El_Salvador">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="Asia/Damascus">
-			<usesMetazone mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Mbabane">
-			<usesMetazone mzone="Africa_Southern"/>
-		</timezone>
-		<timezone type="America/Grand_Turk">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Ndjamena">
-			<usesMetazone mzone="Africa_Western"/>
-		</timezone>
-		<timezone type="Indian/Kerguelen">
-			<usesMetazone mzone="French_Southern"/>
-		</timezone>
-		<timezone type="Africa/Lome">
-			<usesMetazone mzone="GMT"/>
-		</timezone>
-		<timezone type="Asia/Bangkok">
-			<usesMetazone mzone="Indochina"/>
-		</timezone>
-		<timezone type="Asia/Dushanbe">
-			<usesMetazone to="1991-09-08 21:00" mzone="Dushanbe"/>
-			<usesMetazone from="1991-09-08 21:00" mzone="Tajikistan"/>
-		</timezone>
-		<timezone type="Pacific/Fakaofo">
-			<usesMetazone mzone="Tokelau"/>
-		</timezone>
-		<timezone type="Asia/Dili">
-			<usesMetazone to="1976-05-02 15:00" mzone="East_Timor"/>
-			<usesMetazone to="2000-09-16 16:00" from="1976-05-02 15:00" mzone="Indonesia_Central"/>
-			<usesMetazone from="2000-09-16 16:00" mzone="East_Timor"/>
-		</timezone>
-		<timezone type="Asia/Ashgabat">
-			<usesMetazone to="1991-10-26 20:00" mzone="Ashkhabad"/>
-			<usesMetazone from="1991-10-26 20:00" mzone="Turkmenistan"/>
-		</timezone>
-		<timezone type="Africa/Tunis">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="Pacific/Tongatapu">
-			<usesMetazone mzone="Tonga"/>
-		</timezone>
-		<timezone type="Europe/Istanbul">
-			<usesMetazone to="1978-10-14 21:00" mzone="Europe_Eastern"/>
-			<usesMetazone to="1985-04-19 21:00" from="1978-10-14 21:00" mzone="Turkey"/>
-			<usesMetazone from="1985-04-19 21:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="America/Port_of_Spain">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Pacific/Funafuti">
-			<usesMetazone mzone="Tuvalu"/>
-		</timezone>
-		<timezone type="Asia/Taipei">
-			<usesMetazone mzone="Taipei"/>
-		</timezone>
-		<timezone type="Africa/Dar_es_Salaam">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Uzhgorod">
-			<usesMetazone to="1990-06-30 23:00" mzone="Moscow"/>
-			<usesMetazone to="1991-03-31 02:00" from="1990-06-30 23:00" mzone="Europe_Central"/>
-			<usesMetazone from="1991-03-31 02:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Kiev">
-			<usesMetazone to="1990-06-30 23:00" mzone="Moscow"/>
-			<usesMetazone from="1990-06-30 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Simferopol">
-			<usesMetazone to="1990-06-30 23:00" mzone="Moscow"/>
-			<usesMetazone to="1994-04-30 21:00" from="1990-06-30 23:00" mzone="Europe_Eastern"/>
-			<usesMetazone to="1997-03-30 01:00" from="1994-04-30 21:00" mzone="Moscow"/>
-			<usesMetazone from="1997-03-30 01:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Europe/Zaporozhye">
-			<usesMetazone to="1991-03-30 23:00" mzone="Moscow"/>
-			<usesMetazone from="1991-03-30 23:00" mzone="Europe_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Kampala">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Pacific/Midway">
-			<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
-			<usesMetazone from="1983-10-30 12:00" mzone="Samoa"/>
-		</timezone>
-		<timezone type="Pacific/Johnston">
-			<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
-			<usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/>
-		</timezone>
-		<timezone type="Pacific/Wake">
-			<usesMetazone mzone="Wake"/>
-		</timezone>
-		<timezone type="America/Adak">
-			<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
-			<usesMetazone from="1983-10-30 12:00" mzone="Hawaii_Aleutian"/>
-		</timezone>
-		<timezone type="America/Nome">
-			<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
-			<usesMetazone from="1983-10-30 12:00" mzone="Alaska"/>
-		</timezone>
-		<timezone type="Pacific/Honolulu">
-			<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
-			<usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/>
-		</timezone>
-		<timezone type="America/Anchorage">
-			<usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/>
-			<usesMetazone from="1983-10-30 11:00" mzone="Alaska"/>
-		</timezone>
-		<timezone type="America/Yakutat">
-			<usesMetazone to="1983-10-30 10:00" mzone="Yukon"/>
-			<usesMetazone from="1983-10-30 10:00" mzone="Alaska"/>
-		</timezone>
-		<timezone type="America/Juneau">
-			<usesMetazone to="1983-10-30 09:00" mzone="America_Pacific"/>
-			<usesMetazone from="1983-10-30 09:00" mzone="Alaska"/>
-		</timezone>
-		<timezone type="America/Los_Angeles">
-			<usesMetazone mzone="America_Pacific"/>
-		</timezone>
-		<timezone type="America/Boise">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Phoenix">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Shiprock">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/Denver">
-			<usesMetazone mzone="America_Mountain"/>
-		</timezone>
-		<timezone type="America/North_Dakota/New_Salem">
-			<usesMetazone to="2003-10-26 08:00" mzone="America_Mountain"/>
-			<usesMetazone from="2003-10-26 08:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/North_Dakota/Center">
-			<usesMetazone to="1992-10-25 08:00" mzone="America_Mountain"/>
-			<usesMetazone from="1992-10-25 08:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Chicago">
-			<usesMetazone mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Menominee">
-			<usesMetazone to="1973-04-29 07:00" mzone="America_Eastern"/>
-			<usesMetazone from="1973-04-29 07:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Indiana/Vincennes">
-			<usesMetazone to="2006-04-02 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="2007-11-04 07:00" from="2006-04-02 07:00" mzone="America_Central"/>
-			<usesMetazone from="2007-11-04 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Indiana/Petersburg">
-			<usesMetazone to="1977-10-30 07:00" mzone="America_Central"/>
-			<usesMetazone to="2006-04-02 07:00" from="1977-10-30 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="2007-11-04 07:00" from="2006-04-02 07:00" mzone="America_Central"/>
-			<usesMetazone from="2007-11-04 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Indiana/Knox">
-			<usesMetazone to="1991-10-27 07:00" mzone="America_Central"/>
-			<usesMetazone to="2006-04-02 07:00" from="1991-10-27 07:00" mzone="America_Eastern"/>
-			<usesMetazone from="2006-04-02 07:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Indiana/Marengo">
-			<usesMetazone to="1974-01-06 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="1974-10-27 07:00" from="1974-01-06 07:00" mzone="America_Central"/>
-			<usesMetazone from="1974-10-27 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Indiana/Tell_City">
-			<usesMetazone to="2006-04-02 07:00" mzone="America_Eastern"/>
-			<usesMetazone from="2006-04-02 07:00" mzone="America_Central"/>
-		</timezone>
-		<timezone type="America/Indiana/Winamac">
-			<usesMetazone to="2006-04-02 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="2007-03-11 08:00" from="2006-04-02 07:00" mzone="America_Central"/>
-			<usesMetazone from="2007-03-11 08:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Indianapolis">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Louisville">
-			<usesMetazone to="1974-01-06 07:00" mzone="America_Eastern"/>
-			<usesMetazone to="1974-10-27 07:00" from="1974-01-06 07:00" mzone="America_Central"/>
-			<usesMetazone from="1974-10-27 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Indiana/Vevay">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Kentucky/Monticello">
-			<usesMetazone to="2000-10-29 07:00" mzone="America_Central"/>
-			<usesMetazone from="2000-10-29 07:00" mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Detroit">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/New_York">
-			<usesMetazone mzone="America_Eastern"/>
-		</timezone>
-		<timezone type="America/Montevideo">
-			<usesMetazone mzone="Uruguay"/>
-		</timezone>
-		<timezone type="Asia/Samarkand">
-			<usesMetazone to="1981-09-30 18:00" mzone="Samarkand"/>
-			<usesMetazone to="1982-03-31 18:00" from="1981-09-30 18:00" mzone="Tashkent"/>
-			<usesMetazone to="1991-08-31 18:00" from="1982-03-31 18:00" mzone="Samarkand"/>
-			<usesMetazone from="1991-08-31 18:00" mzone="Uzbekistan"/>
-		</timezone>
-		<timezone type="Asia/Tashkent">
-			<usesMetazone to="1991-08-31 18:00" mzone="Tashkent"/>
-			<usesMetazone from="1991-08-31 18:00" mzone="Uzbekistan"/>
-		</timezone>
-		<timezone type="Europe/Vatican">
-			<usesMetazone mzone="Europe_Central"/>
-		</timezone>
-		<timezone type="America/St_Vincent">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/Caracas">
-			<usesMetazone mzone="Venezuela"/>
-		</timezone>
-		<timezone type="America/Tortola">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="America/St_Thomas">
-			<usesMetazone mzone="Atlantic"/>
-		</timezone>
-		<timezone type="Asia/Saigon">
-			<usesMetazone mzone="Indochina"/>
-		</timezone>
-		<timezone type="Pacific/Efate">
-			<usesMetazone mzone="Vanuatu"/>
-		</timezone>
-		<timezone type="Pacific/Wallis">
-			<usesMetazone mzone="Wallis"/>
-		</timezone>
-		<timezone type="Pacific/Apia">
-			<usesMetazone to="1983-10-30 12:00" mzone="Bering"/>
-			<usesMetazone from="1983-10-30 12:00" mzone="Samoa"/>
-		</timezone>
-		<timezone type="Asia/Aden">
-			<usesMetazone mzone="Arabian"/>
-		</timezone>
-		<timezone type="Indian/Mayotte">
-			<usesMetazone mzone="Africa_Eastern"/>
-		</timezone>
-		<timezone type="Africa/Johannesburg">
-			<usesMetazone mzone="Africa_Southern"/>
-		</timezone>
-		<timezone type="Africa/Lusaka">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-		<timezone type="Africa/Harare">
-			<usesMetazone mzone="Africa_Central"/>
-		</timezone>
-	</metazoneInfo>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mk.xml b/airtime_mvc/library/Zend/Locale/Data/mk.xml
deleted file mode 100644
index 128d6bb47..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mk.xml
+++ /dev/null
@@ -1,2321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.90 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="mk"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">афар</language>
-			<language type="ab">абхази�ки</language>
-			<language type="ace">акине�ки</language>
-			<language type="ach">аколи</language>
-			<language type="ada">адангме</language>
-			<language type="ady">адиге</language>
-			<language type="ae">аве�тан</language>
-			<language type="af">африкан�ки</language>
-			<language type="afa">афроазијат�ки</language>
-			<language type="afh">африхили</language>
-			<language type="ain">аину</language>
-			<language type="ak">акан</language>
-			<language type="akk">акадиј�ки</language>
-			<language type="ale">алеут</language>
-			<language type="alg">алгонквијан�ки</language>
-			<language type="alt">јужен алтај</language>
-			<language type="am">амхари�ки</language>
-			<language type="an">арагоне�ки</language>
-			<language type="ang">�тар англи�ки</language>
-			<language type="anp">ангика</language>
-			<language type="apa">апачи</language>
-			<language type="ar">арап�ки</language>
-			<language type="arc">арамеј�ки</language>
-			<language type="arn">арокен�ки</language>
-			<language type="arp">арапахо</language>
-			<language type="art">вештачки</language>
-			<language type="arw">аравак</language>
-			<language type="as">а�ам�ки</language>
-			<language type="ast">а�тури�ки</language>
-			<language type="ath">атапа�ки</language>
-			<language type="aus">ав�трали�ки</language>
-			<language type="av">авар�ки</language>
-			<language type="awa">авади</language>
-			<language type="ay">ајмара</language>
-			<language type="az">азербејџан�ки</language>
-			<language type="ba">башкир�ки</language>
-			<language type="bad">банда</language>
-			<language type="bai">бамилеке</language>
-			<language type="bal">балучи</language>
-			<language type="ban">балинезе</language>
-			<language type="bas">ба�а</language>
-			<language type="bat">балтички</language>
-			<language type="be">белору�ки</language>
-			<language type="bej">беха</language>
-			<language type="bem">бемба</language>
-			<language type="ber">бербер</language>
-			<language type="bg">бугар�ки</language>
-			<language type="bh">бихари</language>
-			<language type="bho">бојпури</language>
-			<language type="bi">би�лама</language>
-			<language type="bik">бикол</language>
-			<language type="bin">бини</language>
-			<language type="bla">�ик�ика</language>
-			<language type="bm">бамбара</language>
-			<language type="bn">бенгал�ки</language>
-			<language type="bnt">банту</language>
-			<language type="bo">тибет�ки</language>
-			<language type="br">бретон�ки</language>
-			<language type="bra">брај</language>
-			<language type="bs">бо�ан�ки</language>
-			<language type="btk">батак</language>
-			<language type="bua">буријат</language>
-			<language type="bug">буџин�ки</language>
-			<language type="byn">блин</language>
-			<language type="ca">каталон�ки</language>
-			<language type="cad">кадо</language>
-			<language type="cai">централноамерикан�ки индијан�ки</language>
-			<language type="car">кариб</language>
-			<language type="cau">кавка�ки</language>
-			<language type="cch">ацам</language>
-			<language type="ce">чечен�ки</language>
-			<language type="ceb">�ебуано</language>
-			<language type="cel">�елтички</language>
-			<language type="ch">чаморо</language>
-			<language type="chb">чибча</language>
-			<language type="chg">чагатај</language>
-			<language type="chk">чуук</language>
-			<language type="chm">мари</language>
-			<language type="chn">жаргон чинук</language>
-			<language type="cho">чокто</language>
-			<language type="chp">чипујан</language>
-			<language type="chr">чироки</language>
-			<language type="chy">чејен�ки</language>
-			<language type="cmc">чам�ки</language>
-			<language type="co">корзикан�ки</language>
-			<language type="cop">копт�ки</language>
-			<language type="cpe">англи�ки креол�ки</language>
-			<language type="cpf">францу�ки креол�ки</language>
-			<language type="cpp">португал�ки креол�ки</language>
-			<language type="cr">кри</language>
-			<language type="crh">крим�ко тур�ки</language>
-			<language type="crp">креол�ки</language>
-			<language type="cs">чешки</language>
-			<language type="csb">кашуби�ки</language>
-			<language type="cu">црковно�ловен�ки</language>
-			<language type="cus">кушит�ки</language>
-			<language type="cv">чувашки</language>
-			<language type="cy">велшки</language>
-			<language type="da">дан�ки</language>
-			<language type="dak">дакота</language>
-			<language type="dar">даргва</language>
-			<language type="day">дајак</language>
-			<language type="de">герман�ки</language>
-			<language type="de_AT">герман�ки (во �в�трија)</language>
-			<language type="de_CH">герман�ки (во Швајцарија)</language>
-			<language type="del">делавер</language>
-			<language type="den">�лав�ки</language>
-			<language type="dgr">догриб</language>
-			<language type="din">динка</language>
-			<language type="doi">догри</language>
-			<language type="dra">дравидиј�ки</language>
-			<language type="dsb">долно�орби�ки</language>
-			<language type="dua">дуала</language>
-			<language type="dum">�реднохоланд�ки</language>
-			<language type="dv">дивехи</language>
-			<language type="dyu">џула</language>
-			<language type="dz">џонга</language>
-			<language type="ee">еве</language>
-			<language type="efi">ефик</language>
-			<language type="egy">�тароегипет�ки</language>
-			<language type="eka">екајук</language>
-			<language type="el">грчки</language>
-			<language type="elx">еламит</language>
-			<language type="en">англи�ки</language>
-			<language type="en_AU">англи�ки (во �в�тралија)</language>
-			<language type="en_CA">англи�ки (во Канада)</language>
-			<language type="en_GB">англи�ки (во Велика Британија)</language>
-			<language type="en_US">американ�ки англи�ки</language>
-			<language type="enm">�редноангли�ки</language>
-			<language type="eo">е�перанто</language>
-			<language type="es">шпан�ки</language>
-			<language type="es_419">шпан�ки (во Латин�ка �мерика)</language>
-			<language type="es_ES">шпан�ки (во Португалија)</language>
-			<language type="et">е�тон�ки</language>
-			<language type="eu">ба�ки�ки</language>
-			<language type="ewo">евондо</language>
-			<language type="fa">пер�и�ки</language>
-			<language type="fan">фанг</language>
-			<language type="fat">фанти</language>
-			<language type="ff">фула</language>
-			<language type="fi">фин�ки</language>
-			<language type="fil">филипин�ки</language>
-			<language type="fiu">финоугри�ки</language>
-			<language type="fj">фиџи�ки</language>
-			<language type="fo">фар�ки</language>
-			<language type="fon">фон</language>
-			<language type="fr">францу�ки</language>
-			<language type="fr_CA">францу�ки (во Канада)</language>
-			<language type="fr_CH">францу�ки (во Швајцарија)</language>
-			<language type="frm">�реднофранцу�ки</language>
-			<language type="fro">�тар францу�ки</language>
-			<language type="frr">�еверен фризи�ки</language>
-			<language type="frs">и�точен фризи�ки</language>
-			<language type="fur">фрулијан�ки</language>
-			<language type="fy">фризи�ки</language>
-			<language type="ga">ир�ки</language>
-			<language type="gaa">га</language>
-			<language type="gay">гајо</language>
-			<language type="gba">гбаја</language>
-			<language type="gd">шкот�ко гал�ки</language>
-			<language type="gem">герман�ки јазици</language>
-			<language type="gez">гиз</language>
-			<language type="gil">гилбертан�ки</language>
-			<language type="gl">галици�ки</language>
-			<language type="gmh">�реден горногерман�ки</language>
-			<language type="gn">гуарани</language>
-			<language type="goh">�тар ви�окогерман�ки</language>
-			<language type="gon">гонди</language>
-			<language type="gor">горонтало</language>
-			<language type="got">гот�ки</language>
-			<language type="grb">грево</language>
-			<language type="grc">�тарогрчки</language>
-			<language type="gsw">швајцар�ко герман�ки</language>
-			<language type="gu">гуџарати</language>
-			<language type="gv">манк�</language>
-			<language type="gwi">гвишин</language>
-			<language type="ha">хауза</language>
-			<language type="hai">хајда</language>
-			<language type="haw">хавај�ки</language>
-			<language type="he">хебреј�ки</language>
-			<language type="hi">хинди</language>
-			<language type="hil">хилигајнон</language>
-			<language type="him">химашали</language>
-			<language type="hit">хитите</language>
-			<language type="hmn">хмонг</language>
-			<language type="ho">хири моту</language>
-			<language type="hr">хрват�ки</language>
-			<language type="hsb">горно�орби�ки</language>
-			<language type="ht">хаит�ки</language>
-			<language type="hu">унгар�ки</language>
-			<language type="hup">хупа</language>
-			<language type="hy">ермен�ки</language>
-			<language type="hz">хереро</language>
-			<language type="ia">интерлингва</language>
-			<language type="iba">ибан</language>
-			<language type="id">индонези�ки</language>
-			<language type="ie">интерлинг</language>
-			<language type="ig">игбо</language>
-			<language type="ii">�ичуан ји</language>
-			<language type="ijo">ихо</language>
-			<language type="ik">инупијак</language>
-			<language type="ilo">илоко</language>
-			<language type="inc">инди�ки јазици</language>
-			<language type="ine">индоевроп�ки</language>
-			<language type="inh">ингуш</language>
-			<language type="io">идо</language>
-			<language type="ira">иран�ки</language>
-			<language type="iro">ироквијан�ки јазици</language>
-			<language type="is">и�ланд�ки</language>
-			<language type="it">италијан�ки</language>
-			<language type="iu">инуктитут</language>
-			<language type="ja">јапон�ки</language>
-			<language type="jbo">лојбан�ки</language>
-			<language type="jpr">евреј�ко пер�и�ки</language>
-			<language type="jrb">евреј�ко арап�ки</language>
-			<language type="jv">јаван�ки</language>
-			<language type="ka">грузи�ки</language>
-			<language type="kaa">кара калпак</language>
-			<language type="kab">кабиле</language>
-			<language type="kac">кашин</language>
-			<language type="kaj">жжи</language>
-			<language type="kam">камба</language>
-			<language type="kar">карен</language>
-			<language type="kaw">кави</language>
-			<language type="kbd">кабарди�ки</language>
-			<language type="kcg">тјап</language>
-			<language type="kfo">коро</language>
-			<language type="kg">конго</language>
-			<language type="kha">ка�и</language>
-			<language type="khi">кој�ан�ки јазици</language>
-			<language type="kho">котане�ки</language>
-			<language type="ki">кикују</language>
-			<language type="kj">куањама</language>
-			<language type="kk">казак�тан�ки</language>
-			<language type="kl">калали�ут</language>
-			<language type="km">камбоџан�ки</language>
-			<language type="kmb">кимбунду</language>
-			<language type="kn">каннада</language>
-			<language type="ko">кореј�ки</language>
-			<language type="kok">конкани</language>
-			<language type="kos">козреј�ки</language>
-			<language type="kpe">кпеле</language>
-			<language type="kr">канури</language>
-			<language type="krc">карашај-балкар</language>
-			<language type="krl">карелиј�ки</language>
-			<language type="kro">кру</language>
-			<language type="kru">курук</language>
-			<language type="ks">кашмир�ки</language>
-			<language type="ku">курд�ки</language>
-			<language type="kum">кумик</language>
-			<language type="kut">кутенај�ки</language>
-			<language type="kv">коми</language>
-			<language type="kw">корнуол�ки келт�ки</language>
-			<language type="ky">кирги�тан�ки</language>
-			<language type="la">латин�ки</language>
-			<language type="lad">ладино</language>
-			<language type="lah">ланда</language>
-			<language type="lam">ламба</language>
-			<language type="lb">лук�ембуршки</language>
-			<language type="lez">лежгиј�ки</language>
-			<language type="lg">ганда</language>
-			<language type="li">лимбуршки</language>
-			<language type="ln">лингала</language>
-			<language type="lo">лао</language>
-			<language type="lol">монго</language>
-			<language type="loz">лози</language>
-			<language type="lt">литван�ки</language>
-			<language type="lu">луба-катанга</language>
-			<language type="lua">луба-лулуа</language>
-			<language type="lui">луизено</language>
-			<language type="lun">лунда</language>
-			<language type="luo">луо</language>
-			<language type="lus">лушај�ки</language>
-			<language type="lv">латви�ки</language>
-			<language type="mad">мадуре�ки</language>
-			<language type="mag">магахи</language>
-			<language type="mai">маитхили</language>
-			<language type="mak">мака�ар�ки</language>
-			<language type="man">мандинго</language>
-			<language type="map">ав�тронези�ки</language>
-			<language type="mas">ма�аи</language>
-			<language type="mdf">мокша</language>
-			<language type="mdr">мандар</language>
-			<language type="men">менде�ки</language>
-			<language type="mg">малгашки</language>
-			<language type="mga">�редноир�ки</language>
-			<language type="mh">маршал�ки</language>
-			<language type="mi">маор�ки</language>
-			<language type="mic">микмек</language>
-			<language type="min">минанкабау</language>
-			<language type="mis">други јазици</language>
-			<language type="mk">македон�ки</language>
-			<language type="mkh">мон-кмер�ки јазици</language>
-			<language type="ml">малајалам</language>
-			<language type="mn">монгол�ки</language>
-			<language type="mnc">манчу</language>
-			<language type="mni">манипури</language>
-			<language type="mno">манобо</language>
-			<language type="mo">молдав�ки</language>
-			<language type="moh">мохак</language>
-			<language type="mos">мо�и</language>
-			<language type="mr">марати</language>
-			<language type="ms">малези�ки</language>
-			<language type="mt">малтешки</language>
-			<language type="mul">повеќе јазици</language>
-			<language type="mun">мунда јазици</language>
-			<language type="mus">крик</language>
-			<language type="mwl">миранде�ки</language>
-			<language type="mwr">марвари</language>
-			<language type="my">бурман�ки</language>
-			<language type="myn">мајан�ки јазици</language>
-			<language type="myv">ержа</language>
-			<language type="na">науру</language>
-			<language type="nah">нахуатл</language>
-			<language type="nai">�еверноамерикан�ки индијан�ки јазици</language>
-			<language type="nap">неапол�ки</language>
-			<language type="nb">норвешки бокмал</language>
-			<language type="nd">�еверен ндебеле</language>
-			<language type="nds">долногерман�ки</language>
-			<language type="ne">непал�ки</language>
-			<language type="new">невари</language>
-			<language type="ng">ндонга</language>
-			<language type="nia">нија�</language>
-			<language type="nic">нигер-кордофани�ки јазици</language>
-			<language type="niu">најуан</language>
-			<language type="nl">холанд�ки</language>
-			<language type="nl_BE">холанд�ки (во Белгија)</language>
-			<language type="nn">норвешки ниноршк</language>
-			<language type="no">норвешки</language>
-			<language type="nog">ногај</language>
-			<language type="non">�тар нор�ки</language>
-			<language type="nqo">нко</language>
-			<language type="nr">јужен ндебеле�ки</language>
-			<language type="nso">�еверен �ото</language>
-			<language type="nub">нубиј�ки јазици</language>
-			<language type="nv">навахо</language>
-			<language type="nwc">кла�ичен невари</language>
-			<language type="ny">њања</language>
-			<language type="nym">њамвези</language>
-			<language type="nyn">њанколе</language>
-			<language type="nyo">њоро</language>
-			<language type="nzi">нзима</language>
-			<language type="oc">ок�итан�ки</language>
-			<language type="oj">оџибва</language>
-			<language type="om">оромо</language>
-			<language type="or">орија</language>
-			<language type="os">о�ети�ки</language>
-			<language type="osa">о�аж</language>
-			<language type="ota">отоман�ки тур�ки</language>
-			<language type="oto">отоми�ки јазици</language>
-			<language type="pa">пунџаби</language>
-			<language type="paa">папуан�ки</language>
-			<language type="pag">панга�инан</language>
-			<language type="pal">палави�ки</language>
-			<language type="pam">пампанга</language>
-			<language type="pap">папиаменто</language>
-			<language type="pau">палауан�ки</language>
-			<language type="peo">�тар пер�и�ки</language>
-			<language type="phi">филипин�ки јазик</language>
-			<language type="phn">феники�ки</language>
-			<language type="pi">пали</language>
-			<language type="pl">пол�ки</language>
-			<language type="pon">понпејан�ки</language>
-			<language type="pra">пракрит�ки јазици</language>
-			<language type="pro">�тар провенчал</language>
-			<language type="ps">пашто</language>
-			<language type="pt">португал�ки</language>
-			<language type="pt_BR">португал�ки (во Бразил)</language>
-			<language type="pt_PT">португал�ки (во Португалија)</language>
-			<language type="qu">кечуа</language>
-			<language type="raj">раџа�тан�ки</language>
-			<language type="rap">рапануи</language>
-			<language type="rar">раротонган</language>
-			<language type="rm">ретороман�ки</language>
-			<language type="rn">рунди�ки</language>
-			<language type="ro">роман�ки</language>
-			<language type="roa">роман�ки јазици</language>
-			<language type="rom">ром�ки</language>
-			<language type="root">рут�ки</language>
-			<language type="ru">ру�ки</language>
-			<language type="rup">влашки</language>
-			<language type="rw">кињарванда</language>
-			<language type="sa">�ан�крит</language>
-			<language type="sad">�андаве</language>
-			<language type="sah">јакут�ки</language>
-			<language type="sai">јужноамерикан�ки индијан�ки</language>
-			<language type="sal">�алишан�ки јазици</language>
-			<language type="sam">�амариќан�ки арамеј�ки</language>
-			<language type="sas">�а�ак</language>
-			<language type="sat">�антали</language>
-			<language type="sc">�ардини�ки</language>
-			<language type="scn">�ицилијан�ки</language>
-			<language type="sco">�коц</language>
-			<language type="sd">�инди</language>
-			<language type="se">�еверен �ами�ки</language>
-			<language type="sel">�елкап</language>
-			<language type="sem">�емит�ки</language>
-			<language type="sg">�анго</language>
-			<language type="sga">�тар ир�ки</language>
-			<language type="sgn">знаковни јазици</language>
-			<language type="sh">�рп�ко-хрват�ки</language>
-			<language type="shn">шан</language>
-			<language type="si">�инхали�ки</language>
-			<language type="sid">�идамо</language>
-			<language type="sio">�ију�ки јазици</language>
-			<language type="sit">�инотибетан�ки</language>
-			<language type="sk">�ловачки</language>
-			<language type="sl">�ловенечки јазик</language>
-			<language type="sla">�ловен�ки јазици</language>
-			<language type="sm">�амоан�ки</language>
-			<language type="sma">јужен �ами</language>
-			<language type="smi">�ами�ки јазици</language>
-			<language type="smj">луле �ами</language>
-			<language type="smn">инари �ами</language>
-			<language type="sms">�колт �ами</language>
-			<language type="sn">шона</language>
-			<language type="snk">�онинке</language>
-			<language type="so">�омали�ки</language>
-			<language type="sog">�огдијен</language>
-			<language type="son">�онгај</language>
-			<language type="sq">албан�ки</language>
-			<language type="sr">�рп�ки</language>
-			<language type="srn">�ран�ки тонго</language>
-			<language type="srr">�ерер</language>
-			<language type="ss">�вати</language>
-			<language type="ssa">нил�ко-�ахар�ки јазици</language>
-			<language type="st">�е�ото</language>
-			<language type="su">�ундане�ки</language>
-			<language type="suk">�укума</language>
-			<language type="sus">�у�у</language>
-			<language type="sux">�умери�ки</language>
-			<language type="sv">швед�ки</language>
-			<language type="sw">�вахили</language>
-			<language type="syc">кла�ичен �иријак</language>
-			<language type="syr">�иријак</language>
-			<language type="ta">тамил�ки</language>
-			<language type="tai">таи</language>
-			<language type="te">телугу</language>
-			<language type="tem">тимне</language>
-			<language type="ter">терено</language>
-			<language type="tet">тетум</language>
-			<language type="tg">таџики�тан�ки</language>
-			<language type="th">тајланд�ки</language>
-			<language type="ti">тигреј�ки</language>
-			<language type="tig">тигре</language>
-			<language type="tiv">тив</language>
-			<language type="tk">туркмени�тан�ки</language>
-			<language type="tkl">токелау</language>
-			<language type="tl">тагалог</language>
-			<language type="tlh">клингон�ки</language>
-			<language type="tli">тлингит</language>
-			<language type="tmh">тамашек</language>
-			<language type="tn">цвана</language>
-			<language type="to">тонга</language>
-			<language type="tog">ња�а тонга</language>
-			<language type="tpi">ток пи�ин</language>
-			<language type="tr">тур�ки</language>
-			<language type="ts">цонга</language>
-			<language type="tsi">цимшијан�ки</language>
-			<language type="tt">татар�ки</language>
-			<language type="tum">тумбука</language>
-			<language type="tup">тупи�ки јазици</language>
-			<language type="tut">алтај�ки</language>
-			<language type="tvl">тувалу</language>
-			<language type="tw">тви</language>
-			<language type="ty">тахит�ки</language>
-			<language type="tyv">тувинијан�ки</language>
-			<language type="udm">удмурт</language>
-			<language type="ug">ујгур�ки</language>
-			<language type="uga">угарит�ки</language>
-			<language type="uk">украин�ки</language>
-			<language type="umb">умбунду</language>
-			<language type="und">непознат или неважечки јазик</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбеки�тан�ки</language>
-			<language type="vai">ваи</language>
-			<language type="ve">венда</language>
-			<language type="vi">виетнам�ки</language>
-			<language type="vo">волапјок</language>
-			<language type="vot">вот�ки</language>
-			<language type="wa">валун�ки</language>
-			<language type="wak">вакашан�ки</language>
-			<language type="wal">валамо</language>
-			<language type="war">вареј</language>
-			<language type="was">вашо</language>
-			<language type="wen">�орби�ки</language>
-			<language type="wo">волоф�ки</language>
-			<language type="xal">калмик</language>
-			<language type="xh">хау�а</language>
-			<language type="yao">јао</language>
-			<language type="yap">јапезе</language>
-			<language type="yi">јид�ки</language>
-			<language type="yo">јоруба</language>
-			<language type="ypk">јупи�ки јазици</language>
-			<language type="za">жуанг</language>
-			<language type="zap">запотек</language>
-			<language type="zbl">бли�имбол�</language>
-			<language type="zen">зенага</language>
-			<language type="zh">кине�ки</language>
-			<language type="zh_Hans">поедно�тавен кине�ки</language>
-			<language type="zh_Hant">традиционален кине�ки</language>
-			<language type="znd">занди�ки</language>
-			<language type="zu">зулу</language>
-			<language type="zun">зуни</language>
-			<language type="zxx">без лингви�тичка �одржина</language>
-			<language type="zza">заза</language>
-		</languages>
-		<scripts>
-			<script type="Arab">арап�ко пи�мо</script>
-			<script type="Cyrl">кирилично пи�мо</script>
-			<script type="Hans">поедно�тавено хан�ко пи�мо</script>
-			<script type="Hant">традиционално хан�ко пи�мо</script>
-			<script type="Latn">латинично пи�мо</script>
-			<script type="Zxxx">без пи�мо</script>
-			<script type="Zzzz">непознато или неважечко пи�мо</script>
-		</scripts>
-		<territories>
-			<territory type="001">Свет</territory>
-			<territory type="002">�фрика</territory>
-			<territory type="003">Северна �мерика</territory>
-			<territory type="005">Јужна �мерика</territory>
-			<territory type="009">Океанија</territory>
-			<territory type="011">Западна �фрика</territory>
-			<territory type="013">Централна �мерика</territory>
-			<territory type="014">И�точна �фрика</territory>
-			<territory type="015">Северна �фрика</territory>
-			<territory type="017">Средна �фрика</territory>
-			<territory type="018">Јужна континентална �фрика</territory>
-			<territory type="019">�мерики</territory>
-			<territory type="021">Северна континентална �мерика</territory>
-			<territory type="029">Кариби</territory>
-			<territory type="030">И�точна �зија</territory>
-			<territory type="034">Јужна �зија</territory>
-			<territory type="035">Југои�точна �зија</territory>
-			<territory type="039">Јужна Европа</territory>
-			<territory type="053">�в�тралија и �ов Зеланд</territory>
-			<territory type="054">Меланезија</territory>
-			<territory type="057">Микронези�ки регион</territory>
-			<territory type="061">Полинезија</territory>
-			<territory type="062">Јужно-централна �зија</territory>
-			<territory type="142">�зија</territory>
-			<territory type="143">Централна �зија</territory>
-			<territory type="145">Западна �зија</territory>
-			<territory type="150">Европа</territory>
-			<territory type="151">И�точна Европа</territory>
-			<territory type="154">Северна Европа</territory>
-			<territory type="155">Западна Европа</territory>
-			<territory type="172">Комонвелт на незави�ни држави</territory>
-			<territory type="419">Латин�ка �мерика и Карибите</territory>
-			<territory type="AD">�ндора</territory>
-			<territory type="AE">Обединети �рап�ки Емирати</territory>
-			<territory type="AF">�вгани�тан</territory>
-			<territory type="AG">�нтигва и Барбуда</territory>
-			<territory type="AI">�нгвила</territory>
-			<territory type="AL">�лбанија</territory>
-			<territory type="AM">Ерменија</territory>
-			<territory type="AN">Холанд�ки �нтили</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктик</territory>
-			<territory type="AR">�ргентина</territory>
-			<territory type="AS">�мерикан�ка Самоа</territory>
-			<territory type="AT">�в�трија</territory>
-			<territory type="AU">�в�тралија</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�ки о�трови</territory>
-			<territory type="AZ">�зербејџан</territory>
-			<territory type="BA">Бо�на и Херцеговина</territory>
-			<territory type="BB">Барбадо�</territory>
-			<territory type="BD">Бангладеш</territory>
-			<territory type="BE">Белгија</territory>
-			<territory type="BF">Буркина Фа�о</territory>
-			<territory type="BG">Бугарија</territory>
-			<territory type="BH">Бахреин</territory>
-			<territory type="BI">Бурунди</territory>
-			<territory type="BJ">Бенин</territory>
-			<territory type="BL">Сент Бартоломеј</territory>
-			<territory type="BM">Бермуди</territory>
-			<territory type="BN">Брунеи</territory>
-			<territory type="BO">Боливија</territory>
-			<territory type="BR">Бразил</territory>
-			<territory type="BS">Бахами</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">Боувитови о�трови</territory>
-			<territory type="BW">Боцвана</territory>
-			<territory type="BY">Белору�ија</territory>
-			<territory type="BZ">Белизе</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Коко�ови о�трови</territory>
-			<territory type="CD">Демократ�ка Република Конго</territory>
-			<territory type="CF">Централна �фрикан�ка Република</territory>
-			<territory type="CG">Конго</territory>
-			<territory type="CH">Швајцарија</territory>
-			<territory type="CI">Брегот на Слоновата Ко�ка</territory>
-			<territory type="CK">Кукови О�трови</territory>
-			<territory type="CL">Чиле</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Кина</territory>
-			<territory type="CO">Колумбија</territory>
-			<territory type="CR">Ко�тарика</territory>
-			<territory type="CS">Србија и Црна Гора</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Зеленорт�ки О�трови</territory>
-			<territory type="CX">Божиќни О�трови</territory>
-			<territory type="CY">Кипар</territory>
-			<territory type="CZ">Чешка Република</territory>
-			<territory type="DE">Германија</territory>
-			<territory type="DJ">�ибути</territory>
-			<territory type="DK">Дан�ка</territory>
-			<territory type="DM">Доминика</territory>
-			<territory type="DO">Доминикан�ка Република</territory>
-			<territory type="DZ">�лжир</territory>
-			<territory type="EC">Еквадор</territory>
-			<territory type="EE">Е�тонија</territory>
-			<territory type="EG">Египет</territory>
-			<territory type="EH">Западна Сахара</territory>
-			<territory type="ER">Еритреја</territory>
-			<territory type="ES">Шпанија</territory>
-			<territory type="ET">Етиопија</territory>
-			<territory type="FI">Фин�ка</territory>
-			<territory type="FJ">Фиџи</territory>
-			<territory type="FK">Фолкланд�ки О�трови</territory>
-			<territory type="FM">Микронезија</territory>
-			<territory type="FO">Фар�ки О�трови</territory>
-			<territory type="FR">Франција</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Велика Британија</territory>
-			<territory type="GD">Гренада</territory>
-			<territory type="GE">Грузија</territory>
-			<territory type="GF">Францу�ка Гвајана</territory>
-			<territory type="GG">Гвернзи</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гибралтар</territory>
-			<territory type="GL">Гренланд</territory>
-			<territory type="GM">Гамбија</territory>
-			<territory type="GN">Гвинеја</territory>
-			<territory type="GP">Гвадалупе</territory>
-			<territory type="GQ">Екватор�ка Гвинеја</territory>
-			<territory type="GR">Грција</territory>
-			<territory type="GS">Јужна Грузија и Јужни Сендвич О�трови</territory>
-			<territory type="GT">Гватемала</territory>
-			<territory type="GU">Гвам</territory>
-			<territory type="GW">Гвинеа-Би�а</territory>
-			<territory type="GY">Гвајана</territory>
-			<territory type="HK">Хонг Конг С.�.Р Кина</territory>
-			<territory type="HM">Хардови о�трови и Мекдоналд О�трови</territory>
-			<territory type="HN">Хондура�</territory>
-			<territory type="HR">Хрват�ка</territory>
-			<territory type="HT">Хаити</territory>
-			<territory type="HU">Унгарија</territory>
-			<territory type="ID">Индонезија</territory>
-			<territory type="IE">Ир�ка</territory>
-			<territory type="IL">Израел</territory>
-			<territory type="IM">О�тровот Ман</territory>
-			<territory type="IN">Индија</territory>
-			<territory type="IO">Британ�ко Инди�ко Океан�ка територија</territory>
-			<territory type="IQ">Ирак</territory>
-			<territory type="IR">Иран</territory>
-			<territory type="IS">И�ланд</territory>
-			<territory type="IT">Италија</territory>
-			<territory type="JE">�ер�и</territory>
-			<territory type="JM">Јамајка</territory>
-			<territory type="JO">Јордан</territory>
-			<territory type="JP">Јапонија</territory>
-			<territory type="KE">Кенија</territory>
-			<territory type="KG">Кирги�тан</territory>
-			<territory type="KH">Камбоџа</territory>
-			<territory type="KI">Кирибати</territory>
-			<territory type="KM">Коморо�</territory>
-			<territory type="KN">Сент Кри�тофер и �еви�</territory>
-			<territory type="KP">Северна Кореја</territory>
-			<territory type="KR">Јужна Кореја</territory>
-			<territory type="KW">Кувајт</territory>
-			<territory type="KY">Кајман�ки О�трови</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">Лао�</territory>
-			<territory type="LB">Либан</territory>
-			<territory type="LC">Света Лучија</territory>
-			<territory type="LI">Лихтенштајн</territory>
-			<territory type="LK">Шри Ланка</territory>
-			<territory type="LR">Либерија</territory>
-			<territory type="LS">Ле�ото</territory>
-			<territory type="LT">Литванија</territory>
-			<territory type="LU">Лук�ембург</territory>
-			<territory type="LV">Латвија</territory>
-			<territory type="LY">Либија</territory>
-			<territory type="MA">Мароко</territory>
-			<territory type="MC">Монако</territory>
-			<territory type="MD">Молдавија</territory>
-			<territory type="ME">Црна Гора</territory>
-			<territory type="MF">Сент Мартин</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршалови о�трови</territory>
-			<territory type="MK">Македонија</territory>
-			<territory type="ML">Мали</territory>
-			<territory type="MM">Мјанмар</territory>
-			<territory type="MN">Монголија</territory>
-			<territory type="MO">Макао С.�.Р Кина</territory>
-			<territory type="MP">Северни Маријанини О�трови</territory>
-			<territory type="MQ">Мартиник</territory>
-			<territory type="MR">Мавританија</territory>
-			<territory type="MS">Мон�ерат</territory>
-			<territory type="MT">Малта</territory>
-			<territory type="MU">Маурициу�</territory>
-			<territory type="MV">Малдиви</territory>
-			<territory type="MW">Малави</territory>
-			<territory type="MX">Мек�ико</territory>
-			<territory type="MY">Малезија</territory>
-			<territory type="MZ">Мозамбик</territory>
-			<territory type="NA">�амибија</territory>
-			<territory type="NC">�ова Каледонија</territory>
-			<territory type="NE">�игер</territory>
-			<territory type="NF">�офролк О�тров</territory>
-			<territory type="NG">�игерија</territory>
-			<territory type="NI">�икарагва</territory>
-			<territory type="NL">Холандија</territory>
-			<territory type="NO">�орвешка</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�ие</territory>
-			<territory type="NZ">�ов Зеланд</territory>
-			<territory type="OM">Оман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Францу�ка Полинезија</territory>
-			<territory type="PG">Папуа �ова Гвинеја</territory>
-			<territory type="PH">Филипини</territory>
-			<territory type="PK">Паки�тан</territory>
-			<territory type="PL">Пол�ка</territory>
-			<territory type="PM">Сент Пјер и Микелан</territory>
-			<territory type="PN">Питкарн</territory>
-			<territory type="PR">Порторико</territory>
-			<territory type="PS">Пале�тин�ка Територија</territory>
-			<territory type="PT">Португалија</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвај</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Зави�ни земји во Океанија</territory>
-			<territory type="QU">Европ�ка унија</territory>
-			<territory type="RE">Ријунион</territory>
-			<territory type="RO">Романија</territory>
-			<territory type="RS">Србија</territory>
-			<territory type="RU">Ру�ија</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Сауди�ка �рабија</territory>
-			<territory type="SB">Соломоновите О�трови</territory>
-			<territory type="SC">Сејшели</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швед�ка</territory>
-			<territory type="SG">Сингапур</territory>
-			<territory type="SH">Света Елена</territory>
-			<territory type="SI">Словенија</territory>
-			<territory type="SJ">Свалбард и Жан Мејен</territory>
-			<territory type="SK">Словачка</territory>
-			<territory type="SL">Сиера Леоне</territory>
-			<territory type="SM">Сан Марино</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Сомалија</territory>
-			<territory type="SR">Суринам</territory>
-			<territory type="ST">Сао Томе и Принчипе</territory>
-			<territory type="SV">Ел Салвадор</territory>
-			<territory type="SY">Сирија</territory>
-			<territory type="SZ">Свазиленд</territory>
-			<territory type="TC">Турк и Каико� О�трови</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Францу�ки Јужни територии</territory>
-			<territory type="TG">Того</territory>
-			<territory type="TH">Тајланд</territory>
-			<territory type="TJ">Таџики�тан</territory>
-			<territory type="TK">Токелау</territory>
-			<territory type="TL">И�точен Тимор</territory>
-			<territory type="TM">Туркмени�тан</territory>
-			<territory type="TN">Туни�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Турција</territory>
-			<territory type="TT">Тринидад и Тобаго</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тајван</territory>
-			<territory type="TZ">Танзанија</territory>
-			<territory type="UA">Украина</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="UM">�мерикан�ки територии во Пацификот</territory>
-			<territory type="US">Соединети �мерикан�ки Држави</territory>
-			<territory type="UY">Уругвај</territory>
-			<territory type="UZ">Узбеки�тан</territory>
-			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент Вин�ент и Гренадините</territory>
-			<territory type="VE">Венецуела</territory>
-			<territory type="VG">Британ�ки Дев�твени О�трови</territory>
-			<territory type="VI">Дев�твени О�трови на С�Д</territory>
-			<territory type="VN">Виетнам</territory>
-			<territory type="VU">Ванату</territory>
-			<territory type="WF">Воли� и Футуна о�трови</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Јемен</territory>
-			<territory type="YT">Мајоте</territory>
-			<territory type="ZA">Јужна �фрика</territory>
-			<territory type="ZM">Замбија</territory>
-			<territory type="ZW">Зимбабве</territory>
-			<territory type="ZZ">�епознат регион</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Календар</key>
-			<key type="collation">Сортирање</key>
-			<key type="currency">Валута</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Традиционално кине�ко �ортирање</type>
-			<type type="buddhist" key="calendar">Буди�тички календар</type>
-			<type type="chinese" key="calendar">Кине�ки календар</type>
-			<type type="direct" key="collation">Директно �ортирање</type>
-			<type type="gb2312han" key="collation">Поедно�тавено кине�ко �ортирање</type>
-			<type type="gregorian" key="calendar">Грегоријан�ки календар</type>
-			<type type="hebrew" key="calendar">Евреј�ки календар</type>
-			<type type="indian" key="calendar">Индиј�ки национален календар</type>
-			<type type="islamic" key="calendar">И�лам�ки календар</type>
-			<type type="islamic-civil" key="calendar">И�лам�ки граѓан�ки календар</type>
-			<type type="japanese" key="calendar">Јапон�ки календар</type>
-			<type type="phonebook" key="collation">�збучен редо�лед</type>
-			<type type="pinyin" key="collation">Сортирање Pinyin</type>
-			<type type="roc" key="calendar">Календар на Република Кина</type>
-			<type type="stroke" key="collation">Ритмички редо�лед</type>
-			<type type="traditional" key="collation">Традиционално �ортирање</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Метрички</measurementSystemName>
-			<measurementSystemName type="US">�мерикан�ки</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Јазик: {0}</codePattern>
-			<codePattern type="script">Пи�мо: {0}</codePattern>
-			<codePattern type="territory">Регион: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а-г ѓ д-з ѕ и ј к ќ л љ м н њ о-ч џ ш]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[� �]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">јан.</month>
-							<month type="2">фев.</month>
-							<month type="3">мар.</month>
-							<month type="4">апр.</month>
-							<month type="5">мај</month>
-							<month type="6">јун.</month>
-							<month type="7">јул.</month>
-							<month type="8">авг.</month>
-							<month type="9">�епт.</month>
-							<month type="10">окт.</month>
-							<month type="11">ноем.</month>
-							<month type="12">декем.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">јануари</month>
-							<month type="2">февруари</month>
-							<month type="3">март</month>
-							<month type="4">април</month>
-							<month type="5">мај</month>
-							<month type="6">јуни</month>
-							<month type="7">јули</month>
-							<month type="8">авгу�т</month>
-							<month type="9">�ептември</month>
-							<month type="10">октомври</month>
-							<month type="11">ноември</month>
-							<month type="12">декември</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ј</month>
-							<month type="2">Ñ„</month>
-							<month type="3">м</month>
-							<month type="4">а</month>
-							<month type="5">м</month>
-							<month type="6">ј</month>
-							<month type="7">ј</month>
-							<month type="8">а</month>
-							<month type="9">�</month>
-							<month type="10">о</month>
-							<month type="11">н</month>
-							<month type="12">д</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">нед.</day>
-							<day type="mon">пон.</day>
-							<day type="tue">вт.</day>
-							<day type="wed">�ре.</day>
-							<day type="thu">чет.</day>
-							<day type="fri">пет.</day>
-							<day type="sat">�аб.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">недела</day>
-							<day type="mon">понеделник</day>
-							<day type="tue">вторник</day>
-							<day type="wed">�реда</day>
-							<day type="thu">четврток</day>
-							<day type="fri">петок</day>
-							<day type="sat">�абота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">н</day>
-							<day type="mon">п</day>
-							<day type="tue">в</day>
-							<day type="wed">�</day>
-							<day type="thu">ч</day>
-							<day type="fri">п</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">јан-мар</quarter>
-							<quarter type="2">апр-јун</quarter>
-							<quarter type="3">јул-�еп</quarter>
-							<quarter type="4">окт-дек</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">прво троме�ечје</quarter>
-							<quarter type="2">второ троме�ечје</quarter>
-							<quarter type="3">трето троме�ечје</quarter>
-							<quarter type="4">четврто троме�ечје</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>претпладне</am>
-				<pm>попладне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">пр.н.е.</era>
-						<era type="1">ае.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.M.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Mdd">dd.M</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.M - dd.M</greatestDifference>
-							<greatestDifference id="M">dd.M - dd.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.M - E, dd.M</greatestDifference>
-							<greatestDifference id="M">E, dd.M - E, dd.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yy - M.yy</greatestDifference>
-							<greatestDifference id="y">M.yy - M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.M.yy - dd.M.yy</greatestDifference>
-							<greatestDifference id="M">dd.M.yy - dd.M.yy</greatestDifference>
-							<greatestDifference id="y">dd.M.yy - dd.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.M.yy - E, dd.M.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.M.yy - E, dd.M.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.M.yy - E, dd.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM y</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM y</greatestDifference>
-							<greatestDifference id="y">E, dd MMM y - E, dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Ера</displayName>
-					</field>
-					<field type="month">
-						<displayName>Ме�ец</displayName>
-					</field>
-					<field type="week">
-						<displayName>�едела</displayName>
-					</field>
-					<field type="day">
-						<relative type="-2">завчера</relative>
-						<relative type="-1">Вчера</relative>
-						<relative type="0">Дене�</relative>
-						<relative type="1">Утре</relative>
-						<relative type="2">задутре</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Ден во неделата</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Ча�</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Минута</displayName>
-					</field>
-					<field type="second">
-						<displayName>Секунда</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�епознато</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ротера</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Палмер</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Јужен пол</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Сајова</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Мо�он</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Дејви�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Во�ток</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Кеј�и</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Димон дурвиј</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Мекмурдо</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Рио Галего�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Мендоза</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Сан Хуан</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуаја</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла Риоха</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан Луи�</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Катамарка</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Салта</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>�уџуи</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Тукуман</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Кордоба</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Буено� �ире�</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Перт</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Јукла</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Дарвин</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�делаида</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Брокен Хил</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Курие</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Мелбурн</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Хобарт</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Линдеман</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Сиднеј</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Бризбејн</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд Хоув</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Еирунепе</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Рио Бранко</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Порто Вељо</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Боа Ви�та</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Манау�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Куиаба</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Сантарем</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампо Гранде</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Белем</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�рагвајана</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сао Паоло</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Бахиа</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Форталеза</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Ма�ијо</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ре�ифе</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�ороња</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>До�он</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Вајтхор�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Инувик</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Ванкувер</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>До�он Крик</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Јелоунајф</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Едмонтон</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Свифт Курент</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кембриџ Беј</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Реџина</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Винипег</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Резолут</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рејни Ривер</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ренкин Инлет</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал Харбор</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандр Беј</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�ипигон</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Торонто</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Монтреал</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Иквалит</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Монктон</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Халифак�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Гу� Беј</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Глеј� Беј</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Бланк-Сејблон</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Сент �он�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Кинша�а</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Лубумбаши</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Велигден�ки о�тров</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Кашгар</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Урумки</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Чонгкинг</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Харбин</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Галапаго�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Канар�ки о�трови</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Сеута</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Трук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Понапе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Кошре</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Туле</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Скорзби�инд</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Данмаркшан</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>�акарта</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Понтијанак</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Мака�ар</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>�ајапура</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Киритимати</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Тарава</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ктау</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Орал</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�кутобе</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Кизилорда</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�лма-�та</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Кваџалеин</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Ховд</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Улан Батор</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Чојбал�ан</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Тихуана</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Хермо�иљо</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Мецатлан</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Чихуахуа</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Монтереј</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Мек�ико Сити</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Мерида</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Канкун</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Кучинг</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Катхам</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Марке�а�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбије</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�зори</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Мадеира</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Калининград</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Мо�ква</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Волгоград</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Јекатеринбург</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ом�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�ово�ибир�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Кра�нојар�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Иркут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Јакут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Владиво�ток</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сакалин</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Магадан</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Камчатка</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�надир</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Симферопол</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожје</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Мидвеј</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>�он�тон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Вејк</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�дак</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�оум</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Хонолулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Енкориџ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Јакутат</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>�уно</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло� �нџеле�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Бојзи</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Феник�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Шипрок</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Денвер</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Њу Салем, Северна Дакота</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Центар, Северна Дакота</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чикаго</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Меномини</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Винчен, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Питер�бург, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Тел Сити, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�ок�, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Винамек, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Маренго, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Индијанаполи�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Луизвил</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Вивај, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монтичело, Кентаки</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Детроит</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Њујорк</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Самарканд</exemplarCity>
-			</zone>
-			<metazone type="British">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Средноевроп�ко време</standard>
-					<daylight>Средноевроп�ко летно време</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>И�точноевроп�ко време</standard>
-					<daylight>И�точноевроп�ко летно време</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Irish">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Кујбишев</standard>
-					<daylight>Летно време во Кујбишев</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Мо�ква</generic>
-					<standard>Стандардно време во Мо�ква</standard>
-					<daylight>Летно време во Мо�ква</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Самара</standard>
-					<daylight>Летно време во Самара</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Турција</standard>
-					<daylight>Летно време во Турција</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Волгоград</standard>
-					<daylight>Летно време во Волгоград</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###;(#,##0.###)</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ндор�ка Пезета</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Обединети �рап�ки Емирати Дирхам</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�вгани (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�вгани</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�лбан�ки Лек</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Ермени�ки Драм</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�нгол�ка Кванза</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�нгол�ка Кванза (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�нгол�ка нова Кванза (1990-2000)</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>�ргентин�ки Пезо� (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>�ргентин�ки Пезо�</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�в�трали�ки Шилинг</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�в�трали�ки Долар</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Бо�ан�ко-Херцегов�ки Динар</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Бо�ан�ко-Херцегов�ка конвертибилна марка</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Барбадо�ки Долар</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Белги�ки Франк (конвертибилен)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Белги�ки Франк</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Белги�ки Франк (финан�и�ки)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Бугар�ки цвр�т лев</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Бугар�ки нов лев</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Бахреин�ки Динар</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Бурунди�ки Франк</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Бермуд�ки Долар</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Брунеј�ки долар</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Бахам�ки Долар</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Боцван�ка Пула</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Белору�ка нова рубља (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Белору�ка Рубља</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Белизи�ки Долар</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Канад�ки Долар</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Швајцар�ки Франк</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Чилеан�ки пезо�</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Колумби�ки Пезо�</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Ко�тарикан�ки Колон</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Чехо�ловачка цвр�та корона</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Кубан�ки пезо�</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Кипар�ка фунта</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Чешка корона</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Герман�ка Марка</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Дан�ка круна</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Доминикан�ки Пезо�</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�лжир�ки Динар</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Египет�ка Фунта</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Шпан�ка Пезета</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Етиопи�ки Бир</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Евро</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Фин�ка марка</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Фиџи долар</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Фолкланд�ка фунта</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Францу�ки франк</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Британ�ка Фунта</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Грузи�ки лари</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ганај�ки Седи</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Гибралтар�ка фунта</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Гамби�ки Дала�и</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Гвинеј�ки франк</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Грчка драхма</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Гватемал�ки кветцал</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Гвинеј�ки Би�ау пезо�</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Гвијан�ки Долар</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Хонгконшки долар</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Хондур�ка лемпира</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Хрват�ки динар</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Хрват�ка Куна</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Хаит�ки гурд</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Унгар�ка форинта</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Индонези�ка рупија</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ир�ка фунта</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Изрел�ка фунта</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Израел�ки нов шекел</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Индиј�ка рупија</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ирачки динар</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Иран�ки риал</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>И�ланд�ка крона</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Италијан�ка лира</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Јамајкан�ки долар</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Јордан�ки динар</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Јапон�ки јен</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Кени�ки шилинг</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Кирги�тан�ки �ом</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Камбоџи�ки рел</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Комор�ки долар</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Северно кореј�ки вон</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Јужно кореј�ки вон</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Кувајт�ки динар</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Казах�тан�ка тенга</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Лао�ки кип</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Либан�ка фунта</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Шриланкан�ка рупија</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Либери�ки долар</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Ле�от�ко лоти</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Литвани�ка лита</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Литвани�ки литаз</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Лук�ембуршки франк</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Латвиј�ки лат</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Латвиј�ка рубља</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Либиј�ки динар</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Марокан�ки Дирхам</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Марокан�ки франк</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Молдав�ки леу</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Македон�ки денар</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Мал�ки франк</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Монголи�ки тугрик</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Макао патака</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Малтешка лира</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Малтешка фунта</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Мек�икан�ки пезо�</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Мек�икан�ки �ребрен пезо� (1861-1992)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Малази�ки рингит</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Мозамби�ко е�кудо</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Стар мозамби�ки метикал</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>�амиби�ки долар</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�игери�ка наира</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>�икарагван�ка кордоба</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Холанд�ки гилдер</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>�орвешка круна</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�епал�ка рупија</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�овозеланд�ки долар</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Оман�ки риал</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Панам�ка балбоа</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Перуан�ки нов �ол</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Перуан�ки �ол</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Папуа новогвинеј�ка кина</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Филипин�ки пезо�</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Паки�тан�ка рупија</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Пол�ка злота</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Пол�ка злота (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Португал�ко е�кудо</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Парагвај�ка гуарана</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Катар�ки риал</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Роман�ка леа</displayName>
-				<displayName count="other">Роман�ки леи</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Срп�ки динар</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ру�ка рубља</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ру�ка рубља (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Руанд�ки франк</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Сауди�ки ријал</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Соломон�ки долар</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Сејшел�ка рупија</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Стар �удан�ки динар</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Стара �удан�ка фунта</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Швед�ка круна</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Сингапур�ки долар</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Словенечки толар</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Словачка круна</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Сиералеон�ко леоне</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Сомалиј�ки шилинг</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Суринам�ки гилдер</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Совет�ка рубља</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Салвадор�ки колон</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Сириј�ка фунта</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Свазиленд�ки лиланген</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Таи бат</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Таџики�тан�ка рубља</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Таџики�тан�ки �омони</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Туркмени�тан�ки манат</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Тунези�ки динар</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Тимор�ки е�кудо</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Тур�ка лира</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Тајван�ки нов долар</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Танзани�ки шилинг</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Украин�ка хривнија</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Уганди�ки шилинг (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Уганди�ки шилинг</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�мерикан�ки долар</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>С�Д долар (Next day)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>С�Д долар (Same day)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Уругвај�ки пезо� (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Уругвај�ки пезо�</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Узбеки�тан�ки �ом</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Венецуел�ки боливар</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Виетнам�ки донг</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Ванат�ки вату</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Самоан�ка тала</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>И�точно кариби�ки долар</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Јемен�ки динар</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Јемен�ки риал</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Југо�ловен�ки динар</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Југо�ловен�ки конвертибилен динар</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Јужно афрички ранд(финан�и�ки)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Јужно афрички ранд</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Замбиј�ка квача</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Заир�ко новозаире</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Заир�ко заире</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Зимбабви�ки долар</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ден</unitPattern>
-			<unitPattern count="other">{0} денови</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} ча�</unitPattern>
-			<unitPattern count="other">{0} ча�ови</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} минута</unitPattern>
-			<unitPattern count="other">{0} минути</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} ме�ец</unitPattern>
-			<unitPattern count="other">{0} ме�еци</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} �екунда</unitPattern>
-			<unitPattern count="other">{0} �екунди</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} недела</unitPattern>
-			<unitPattern count="other">{0} недели</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} година</unitPattern>
-			<unitPattern count="other">{0} години</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>да:д</yesstr>
-			<nostr>не:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/mk_MK.xml b/airtime_mvc/library/Zend/Locale/Data/mk_MK.xml
deleted file mode 100644
index 69f6f2b72..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mk_MK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mk"/>
-		<territory type="MK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ml.xml b/airtime_mvc/library/Zend/Locale/Data/ml.xml
deleted file mode 100644
index 31de56bcf..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ml.xml
+++ /dev/null
@@ -1,4423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.81 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="ml"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">അഫാര��</language>
-			<language type="ab">അബ�ഖാസിയന��</language>
-			<language type="ace">അചിനീസ�</language>
-			<language type="ach">അകോലി</language>
-			<language type="ada">അഡാങ�ഗമി</language>
-			<language type="ady">അഡൈഗേ</language>
-			<language type="ae">അവസ�റ�റാന��</language>
-			<language type="af">ആഫ�രിക�കാന��സ�</language>
-			<language type="afa">ആഫ�രോ-�ഷ�യാറ�റിക� ഭാഷ</language>
-			<language type="afh">ആഫ�രിഹിലി</language>
-			<language type="ain">അയിന�</language>
-			<language type="ak">അകാന��</language>
-			<language type="akk">അക�കാഡിയന��</language>
-			<language type="ale">അലൈട�ട�</language>
-			<language type="alg">അല��ഗോണ��ക�യന�� ഭാഷ</language>
-			<language type="alt">സതേണ�� അള��ട�ടായി</language>
-			<language type="am">അമാറിക�</language>
-			<language type="an">അരഗോണീസ�</language>
-			<language type="ang">പഴയ ഇംഗ�ലീഷ�</language>
-			<language type="anp">ആന��ഗിക</language>
-			<language type="apa">അപ�പാചേ ഭാഷ</language>
-			<language type="ar">അറബി</language>
-			<language type="arc">അരമായഭാഷ</language>
-			<language type="arn">ആരൗകാനിയന��</language>
-			<language type="arp">അരപാഹോ</language>
-			<language type="art">കൃത�രിമഭാഷ</language>
-			<language type="arw">അറാവക�</language>
-			<language type="as">ആസ�സാമീസ�</language>
-			<language type="ast">ഓസ�‌ട�രിയന��</language>
-			<language type="ath">അതപാസ�കന�� ഭാഷ</language>
-			<language type="aus">ഓസ�ട�രേലിയന�� ഭാഷ</language>
-			<language type="av">അവാരിക�</language>
-			<language type="awa">അവധി</language>
-			<language type="ay">അയ�മാറ</language>
-			<language type="az">അസര��ബൈജാനി</language>
-			<language type="ba">ബഷ�ഖിര��</language>
-			<language type="bad">ബന��ഡ</language>
-			<language type="bai">ബാമിലകേ ഭാഷ</language>
-			<language type="bal">ബലൂചി</language>
-			<language type="ban">ബാലിനീസ�</language>
-			<language type="bas">ബസ</language>
-			<language type="bat">ബാള��ട�ടിക� ഭാഷ</language>
-			<language type="be">ബൈലോറഷ�യന��</language>
-			<language type="bej">ബേജ</language>
-			<language type="bem">ബെംബ</language>
-			<language type="ber">ബെര��ബര��</language>
-			<language type="bg">ബള��ഗേറിയന��</language>
-			<language type="bh">ബീഹാറി</language>
-			<language type="bho">ഭോജ�‌പൂരി</language>
-			<language type="bi">ബിസ�‌ലാമ</language>
-			<language type="bik">ബികോല��</language>
-			<language type="bin">ബിനി</language>
-			<language type="bla">സിക�സിക</language>
-			<language type="bm">ബംബാറ</language>
-			<language type="bn">ബംഗാളി</language>
-			<language type="bnt">ബാന�‌ട�</language>
-			<language type="bo">തിബറ�റന��</language>
-			<language type="br">ബ�രറ�റണ��</language>
-			<language type="bra">ബ�രജ�</language>
-			<language type="bs">ബോസ�നിയന��</language>
-			<language type="btk">ബാറ�റക�</language>
-			<language type="bua">ബ�റിയത�ത�</language>
-			<language type="bug">ബ�ഗിനീസ�</language>
-			<language type="byn">ബ�ലിന��</language>
-			<language type="ca">കറ�റാലന��</language>
-			<language type="cad">കാഡോ</language>
-			<language type="cai">മദ�ധ�യ അമേരിക�കന�� ഇന��ഡ�യന�� ഭാഷ</language>
-			<language type="car">കാരിബ�</language>
-			<language type="cau">കൊക�കേഷ�യന�� ഭാഷ</language>
-			<language type="cch">അറ�റ�സാം</language>
-			<language type="ce">ചെചന��</language>
-			<language type="ceb">സെബ�വാനോ</language>
-			<language type="cel">സെല��റ�റിക� ഭാഷ</language>
-			<language type="ch">കമോറോ</language>
-			<language type="chb">ചിബ�ച</language>
-			<language type="chg">ചഗതൈ</language>
-			<language type="chk">ചൂകീസ�</language>
-			<language type="chm">മാരി</language>
-			<language type="chn">ചിനൂഗ�-ജാര��ഗണ��</language>
-			<language type="cho">ചോക�റ�റാവ�</language>
-			<language type="chp">ചിപേവ�യന��</language>
-			<language type="chr">ചെരോകീ</language>
-			<language type="chy">ചിയേന�നേ</language>
-			<language type="cmc">ചാമിക� ഭാഷ</language>
-			<language type="co">കോഴ�സിക�കണ��</language>
-			<language type="cop">കോപ�റ�റിക�</language>
-			<language type="cpe">ഇംഗ�ലീഷ� അധിഷ�ഠിത മിശ�ര ഭാഷ</language>
-			<language type="cpf">ഫ�രഞ�ച� അധിഷ�ഠിത മിശ�രഭാഷ</language>
-			<language type="cpp">പോര��ച�ച�ഗീസ� അധിഷ�ടിത മിശ�ര ഭാഷ</language>
-			<language type="cr">ക�രീ</language>
-			<language type="crh">ക�രിമിയന�� ടര��ക�കിഷ�</language>
-			<language type="crp">മിശ�രഭാഷ</language>
-			<language type="cs">ചെക�ക�</language>
-			<language type="csb">കാഷ�ബിയാന��</language>
-			<language type="cu">ചര��ച�ച� സ�ലാവിക�</language>
-			<language type="cus">ക�ഷിറ�റിക� ഭാഷ</language>
-			<language type="cv">ച�വാഷ�</language>
-			<language type="cy">വെല��ഷ�</language>
-			<language type="da">ഡാനിഷ�</language>
-			<language type="dak">ഡകോട�ട</language>
-			<language type="dar">ഡര��ഗ�വാ</language>
-			<language type="day">ദയാക�</language>
-			<language type="de">ജര��മ�മന��</language>
-			<language type="de_AT">ഓസ�ട�രിയന�� ജര��മന��</language>
-			<language type="de_CH">സ�വിസ� ഉച�ച ജര��മന��</language>
-			<language type="del">ദലവാരെ</language>
-			<language type="den">സ�ലേവ�</language>
-			<language type="dgr">ഡോഗ�രിബ�</language>
-			<language type="din">ദിന��ക</language>
-			<language type="doi">ഡോഗ�രി</language>
-			<language type="dra">ദ�രാവിഡഭാഷ</language>
-			<language type="dsb">ലോവര�� സോര��ബിയന��</language>
-			<language type="dua">ദ�വാല</language>
-			<language type="dum">മദ�ധ�യ ഡച�ച�</language>
-			<language type="dv">ദിവെഹി</language>
-			<language type="dyu">ദ�വൈല</language>
-			<language type="dz">ഭൂട�ടാനി</language>
-			<language type="ee">എവ�</language>
-			<language type="efi">എഫിക�</language>
-			<language type="egy">പ�രാചീന ഈജിപ�ഷ�യന��</language>
-			<language type="eka">എകാജ�ക�</language>
-			<language type="el">ഗ�രീക�ക�</language>
-			<language type="elx">എലാമൈറ�റ�</language>
-			<language type="en">ഇംഗ�ലീഷ�</language>
-			<language type="en_AU">ഓസ�ട�രേലിയന�� ഇംഗ�ലീഷ�</language>
-			<language type="en_CA">കനേഡിയന�� ഇംഗ�ലീഷ�</language>
-			<language type="en_GB">ബ�രിട�ടീഷ� ഇംഗ�ലീഷ�</language>
-			<language type="en_US">അമേരിക�കന�� ഇംഗ�ലീഷ�</language>
-			<language type="enm">മദ�ധ�യ ഇംഗ�ലീഷ�</language>
-			<language type="eo">എസ�പരാന�തോ</language>
-			<language type="es">സ�പാനിഷ�</language>
-			<language type="es_419">ലാറ�റിന�� അമേരിക�കന�� സ�പാനിഷ�</language>
-			<language type="es_ES">ഇബേറിയന�� സ�പാനിഷ�</language>
-			<language type="et">എസ�റ�റോണിയന��</language>
-			<language type="eu">ബാസ�ക�</language>
-			<language type="ewo">എവോന��ഡോ</language>
-			<language type="fa">പേര��ഷ�യന��</language>
-			<language type="fan">ഫങ�</language>
-			<language type="fat">ഫിലിപ�പീനോ</language>
-			<language type="ff">ഫ�ല</language>
-			<language type="fi">ഫിന�നിഷ�</language>
-			<language type="fil">ഫിലിപ�പിനോ</language>
-			<language type="fiu">ഫിന�നോ-ഉഗ�രിയന�� ഭാഷ</language>
-			<language type="fj">ഫിജിയന��</language>
-			<language type="fo">ഫാറോസ�</language>
-			<language type="fon">ഫോന��</language>
-			<language type="fr">ഫ�രഞ�ച�</language>
-			<language type="fr_CA">കനേഡിയന�� ഫ�രഞ�ച�</language>
-			<language type="fr_CH">സ�വിസ� ഫ�രഞ�ച�</language>
-			<language type="frm">മദ�ധ�യ ഫ�രഞ�ച�</language>
-			<language type="fro">പഴയ ഫ�രഞ�ച�</language>
-			<language type="frr">നോര��ത�തേന�� ഫ�രിഷ�യന��</language>
-			<language type="frs">ഈസ�റ�റേണ�� ഫ�രിഷ�യന��</language>
-			<language type="fur">ഫ�രിയ�ലിയാന��</language>
-			<language type="fy">പശ�ചിമ ഫ�രിഷിയന��</language>
-			<language type="ga">�റിഷ�</language>
-			<language type="gaa">à´—à´¾</language>
-			<language type="gay">ഗയൊ</language>
-			<language type="gba">ഗബ�യ</language>
-			<language type="gd">സ�കോട�ടിഷ� ഗൈലിക�</language>
-			<language type="gem">ജര��മാനിക� ഭാഷ</language>
-			<language type="gez">ഗീസ�</language>
-			<language type="gil">ഗില��ബര��സേ</language>
-			<language type="gl">ഗലീഷ�യന��</language>
-			<language type="gmh">മദ�ധ�യ ഉച�ച ജര��മന��</language>
-			<language type="gn">ഗ�വാറാനി</language>
-			<language type="goh">പ�രാചീന ഉച�ച ജര��മന��</language>
-			<language type="gon">ഗോണ�ഡി</language>
-			<language type="gor">ഗൊറോന��റാലോ</language>
-			<language type="got">ഗോഥിക�ക�</language>
-			<language type="grb">ഗ�രബൊ</language>
-			<language type="grc">പ�രാതന യവന ഭാഷ</language>
-			<language type="gsw">സ�വിസ� ജര��മന��</language>
-			<language type="gu">ഗ�ജറാത�തി</language>
-			<language type="gv">മാന��സ�</language>
-			<language type="gwi">ഗ�വിച�ച� ഇന��</language>
-			<language type="ha">ഹൗസ</language>
-			<language type="hai">ഹൈഡ</language>
-			<language type="haw">ഹവായിയന��</language>
-			<language type="he">ഹീബ�ര�</language>
-			<language type="hi">ഹിന�ദി</language>
-			<language type="hil">ഹിലിഗയ�നോണ��</language>
-			<language type="him">ഹിമാചലി</language>
-			<language type="hit">ഹിറ�റൈറ�റേ</language>
-			<language type="hmn">മോങ�</language>
-			<language type="ho">ഹിരി മോത�</language>
-			<language type="hr">ക�രൊയേഷ�യന��</language>
-			<language type="hsb">അപ�പര�� സോര��ബിയന��</language>
-			<language type="ht">ഹെയ�തിയന��</language>
-			<language type="hu">ഹംഗേറിയന��</language>
-			<language type="hup">ഹൂപ</language>
-			<language type="hy">അര��മേനിയന��</language>
-			<language type="hz">ഹെരേരൊ</language>
-			<language type="ia">ഇന��റര��ലിംഗ�വാ</language>
-			<language type="iba">ഇബാന��</language>
-			<language type="id">ഇന��ഡോനേഷ�യന��</language>
-			<language type="ie">ഇന�റര��ലിംഗ�വ</language>
-			<language type="ig">ഇഗ�ബോ</language>
-			<language type="ii">ഷ�വാന��യി</language>
-			<language type="ijo">ഇജോ</language>
-			<language type="ik">ഇന�പിയാക�</language>
-			<language type="ilo">ഇലോകോ</language>
-			<language type="inc">ഭാരതീയഭാഷ</language>
-			<language type="ine">ഇന��ഡോ-യൂറോപ�യന�� ഭാഷ</language>
-			<language type="inh">ഇംഗ�വിഷ�</language>
-			<language type="io">ഇഡോ</language>
-			<language type="ira">ഇറാനിയന�� ഭാഷ</language>
-			<language type="iro">ഇറോക�വായിയന�� ഭാഷ</language>
-			<language type="is">�സ�‌ലാന��ഡിക�</language>
-			<language type="it">ഇറ�റാലിയന��</language>
-			<language type="iu">ഇന�ക�റ�റിറ�റട�ട�</language>
-			<language type="ja">ജപ�പാനീസ�</language>
-			<language type="jbo">ലോജ�ബാന��</language>
-			<language type="jpr">ജൂഡിയോ-പേര��ഷ�യന��</language>
-			<language type="jrb">ജൂഡിയോ-അറബിക�</language>
-			<language type="jv">ജാവാനീസ�</language>
-			<language type="ka">ജോര��ജിയന��</language>
-			<language type="kaa">കര-കാല��പ�പക�</language>
-			<language type="kab">കബൈല��</language>
-			<language type="kac">കാചിന��</language>
-			<language type="kaj">ജ�ജ�</language>
-			<language type="kam">à´•à´‚à´¬</language>
-			<language type="kar">കരേന��</language>
-			<language type="kaw">കാവി</language>
-			<language type="kbd">കബര��ഡിയാന��</language>
-			<language type="kcg">ട�യാപ�</language>
-			<language type="kfo">കോറോ</language>
-			<language type="kg">കോംഗോ</language>
-			<language type="kha">ഘാസി</language>
-			<language type="khi">ഘോയിസന�� ഭാഷ</language>
-			<language type="kho">ഘോറ�റാനേസേ</language>
-			<language type="ki">കികൂയ�</language>
-			<language type="kj">ക�വാന�യമ</language>
-			<language type="kk">കസാഖ�</language>
-			<language type="kl">കലാല�ലിസട�ട�</language>
-			<language type="km">കംബോഡിയന��</language>
-			<language type="kmb">ക�ലിംഗന��</language>
-			<language type="kn">കന�നഡ</language>
-			<language type="ko">കൊറിയന��</language>
-			<language type="kok">കൊങ�കണി</language>
-			<language type="kos">കൊസറേയന��</language>
-			<language type="kpe">കപെല�ലേ</language>
-			<language type="kr">കനൂറി</language>
-			<language type="krc">കരചൈ-ബാല��കര��</language>
-			<language type="krl">കരീലിയന��</language>
-			<language type="kro">ക�ര�</language>
-			<language type="kru">ക�ര�ഖ�</language>
-			<language type="ks">കാശ�മീരി</language>
-			<language type="ku">ക�ര��ദ�ദിഷ�</language>
-			<language type="kum">ക�മൈക�</language>
-			<language type="kut">ക�തേനൈ</language>
-			<language type="kv">കോമി</language>
-			<language type="kw">കോര��ണിഷ�</language>
-			<language type="ky">കിര��ഗിസ�</language>
-			<language type="la">ലാറ�റിന��</language>
-			<language type="lad">ലാഡിനോ</language>
-			<language type="lah">ലഹ�‌ന��ഡ</language>
-			<language type="lam">ലംബ</language>
-			<language type="lb">ലക�സംബര��ഗിഷ�</language>
-			<language type="lez">ലഹ�ഗിയാന��</language>
-			<language type="lg">ഗാന��ഡ</language>
-			<language type="li">ലിംബര��ഗിഷ�</language>
-			<language type="ln">ലിംഗാല</language>
-			<language type="lo">ലാവോ</language>
-			<language type="lol">മോങ�കോ</language>
-			<language type="loz">ലോസി</language>
-			<language type="lt">ലിത�വേനിയന��</language>
-			<language type="lu">ല�ബ-കറ�റംഗ</language>
-			<language type="lua">ലൂബ-ല�ല�വ</language>
-			<language type="lui">ലൂയിസെനോ</language>
-			<language type="lun">ല�ന��ഡ</language>
-			<language type="luo">ലവോ</language>
-			<language type="lus">ല�ഷായി</language>
-			<language type="lv">ലാത�വിയന��</language>
-			<language type="mad">മദ�രേസേ</language>
-			<language type="mag">മഗാഹി</language>
-			<language type="mai">മൈഥിലി</language>
-			<language type="mak">മകാസര��</language>
-			<language type="man">മണ�ഡിന��ഗോ</language>
-			<language type="map">ഓസ�ട�രോനേഷ�യന��</language>
-			<language type="mas">മസൈ</language>
-			<language type="mdf">മോക�ഷ</language>
-			<language type="mdr">മണ�ഡാര��</language>
-			<language type="men">മെന��ഡെ</language>
-			<language type="mg">മലഗാസി</language>
-			<language type="mga">മദ�ധ�യ �റിഷ�</language>
-			<language type="mh">മാര��ഷല�ലീസ�</language>
-			<language type="mi">മൗറി</language>
-			<language type="mic">മിക�മാക�</language>
-			<language type="min">മിനാങ�കബൗ</language>
-			<language type="mis">ഇതരഭാഷ</language>
-			<language type="mk">മാസിഡോണിയന��</language>
-			<language type="mkh">മോണ��-ഖമര�� ഭാഷ</language>
-			<language type="ml">മലയാളം</language>
-			<language type="mn">മംഗോളിയന��</language>
-			<language type="mnc">മന��ച�</language>
-			<language type="mni">മണിപ�പൂരി</language>
-			<language type="mno">മനോബോ ഭാഷ</language>
-			<language type="mo">മോള��ഡാവിയന��</language>
-			<language type="moh">മോഹാക�</language>
-			<language type="mos">മൊസ�സി</language>
-			<language type="mr">മറാഠി</language>
-			<language type="ms">മലയ</language>
-			<language type="mt">മാള��ട�ടീസ�</language>
-			<language type="mul">പലഭാഷകള��</language>
-			<language type="mun">മ�ണ�ഡ ഭാഷ</language>
-			<language type="mus">ക�രീക�ക�</language>
-			<language type="mwl">മിരാന��റസേ</language>
-			<language type="mwr">മര��വാരി</language>
-			<language type="my">ബര��മീസ�</language>
-			<language type="myn">മായന�� ഭാഷ</language>
-			<language type="myv">�ഴ�സ�യ</language>
-			<language type="na">നൗറ�</language>
-			<language type="nah">നാഹ�വാള���ട�ട�</language>
-			<language type="nai">വടക�കേ അമേരിക�കന�� ഇന��ഡ�യന�� ഭാഷ</language>
-			<language type="nap">നെപ�പോളിറ�റാന��</language>
-			<language type="nb">നോര��വീജിയന�� ബ�ക�‌മല��</language>
-			<language type="nd">നോര��ത�ത� ഡെബിള��</language>
-			<language type="nds">ലോ ജര��മന��</language>
-			<language type="ne">നേപ�പാളി</language>
-			<language type="new">നേവാരി</language>
-			<language type="ng">ഡോങ�ക</language>
-			<language type="nia">നിയാസ�</language>
-			<language type="nic">നൈ�ജര��-കോര���ഡോഫാനിയന��</language>
-			<language type="niu">ന�യ�വാന��</language>
-			<language type="nl">ഡച�ച�</language>
-			<language type="nl_BE">ഫ�ലമിഷ�</language>
-			<language type="nn">നോര��വീജിയന�� നൈനോര��ക�സ�</language>
-			<language type="no">നോര��വീജിയന��</language>
-			<language type="nog">നോഗൈ</language>
-			<language type="non">പഴയ പേര��ഷ�യന��</language>
-			<language type="nqo">ഇന��കോ</language>
-			<language type="nr">ദക�ഷിണ നെഡിബിള��</language>
-			<language type="nso">നോര��ത�തേന�� സോതോ</language>
-			<language type="nub">ന�ബിയന�� ഭാഷ</language>
-			<language type="nv">നവാഹൊ</language>
-			<language type="nwc">ക�ലാസിക�കല�� നേവാരി</language>
-			<language type="ny">ന�യന��ജ</language>
-			<language type="nym">ന�യാംവേസി</language>
-			<language type="nyn">ന�യാന��കലേ</language>
-			<language type="nyo">ന�യോറോ</language>
-			<language type="nzi">സിമ</language>
-			<language type="oc">ഒക�സിററന��</language>
-			<language type="oj">ഓജിബ�വാ</language>
-			<language type="om">ഒറോമൂ</language>
-			<language type="or">ഒറിയ</language>
-			<language type="os">ഒസ�സെറ�റിക�</language>
-			<language type="osa">ഒസേജ�</language>
-			<language type="ota">ഓട�ടോമന�� ത�ര��ക�കിഷ�</language>
-			<language type="oto">ഓട�ടോമിയന�� ഭാഷ</language>
-			<language type="pa">പഞ�ചാബി</language>
-			<language type="paa">പാപ�വാന�� ഭാഷ</language>
-			<language type="pag">പങ�കാസിനന��</language>
-			<language type="pal">പാഹ�ലവി</language>
-			<language type="pam">പാംപന��ഗ</language>
-			<language type="pap">പാപിയാമെന��റൊ</language>
-			<language type="pau">പലാവ�ന��</language>
-			<language type="peo">പ�രാചീന പേര��ഷ�യന��</language>
-			<language type="phi">ഫിലിപീനി ഭാഷ</language>
-			<language type="phn">ഫീനിഷ�യന��</language>
-			<language type="pi">പാലി</language>
-			<language type="pl">പോളിഷ�</language>
-			<language type="pon">പൊന��പിയന��</language>
-			<language type="pra">പ�രാകൃതം</language>
-			<language type="pro">പ�രൊവന��ഷ�ല��</language>
-			<language type="ps">പഷ�ത�</language>
-			<language type="pt">പോര��ച�ച�ഗീസ�</language>
-			<language type="pt_BR">ബ�രസീലിയന�� പോര��ച�ച�ഗീസ�</language>
-			<language type="pt_PT">ഇബേറിയന�� പോര��ച�ച�ഗീസ�</language>
-			<language type="qu">ക�വെച�ച�വ</language>
-			<language type="raj">രാജസ�ഥാനി</language>
-			<language type="rap">രാപനൂയി</language>
-			<language type="rar">രാരോടോങ�കന��</language>
-			<language type="rm">രഹയ�ട�ടോ-റോമന��സ�</language>
-			<language type="rn">റ�ണ�ടി</language>
-			<language type="ro">റ�മേനിയന��</language>
-			<language type="roa">റോമന��സ� ഭാഷ</language>
-			<language type="rom">റോമനി</language>
-			<language type="root">മൂലഭാഷ</language>
-			<language type="ru">റഷ�യന��</language>
-			<language type="rup">ആരോമാനിയന��</language>
-			<language type="rw">കിന�യര��വണ�ട</language>
-			<language type="sa">സംസ�കൃതം</language>
-			<language type="sad">സാന��ഡവേ</language>
-			<language type="sah">യാകൂട�</language>
-			<language type="sai">ദക�ഷിണ അമേരിക�കന�� ഇന��ഡ�യന�� ഭാഷ</language>
-			<language type="sal">സാലിഷാന�� ഭാഷ</language>
-			<language type="sam">സമരിയാക�കാര�ടെ അരമായ</language>
-			<language type="sas">സസാക�</language>
-			<language type="sat">സന�താലി</language>
-			<language type="sc">സര��ഡിനിയാന��</language>
-			<language type="scn">സിസിലിയന��</language>
-			<language type="sco">സ�കോട�സ�</language>
-			<language type="sd">സിന�ധി</language>
-			<language type="se">വടക�കന�� സമി</language>
-			<language type="sel">സെല��കപ�</language>
-			<language type="sem">സെമറ�റിക� ഭാഷ</language>
-			<language type="sg">സാങ�കോ</language>
-			<language type="sga">പ�രാചീന �റിഷ�</language>
-			<language type="sgn">ആംഗ�യഭാഷ</language>
-			<language type="sh">സെര��ബോ-ക�രൊയേഷ�യന��</language>
-			<language type="shn">ഷാന��</language>
-			<language type="si">സിംഹള</language>
-			<language type="sid">സിഡാമോ</language>
-			<language type="sio">സിവോന�� ഭാഷ</language>
-			<language type="sit">ചീന-ടിബത�തന�� ഭാഷ</language>
-			<language type="sk">സ�ലോവാക�ക�</language>
-			<language type="sl">സ�ലോവേനിയന��</language>
-			<language type="sla">സ�ലേവിക� ഭാഷ</language>
-			<language type="sm">സമോവന��</language>
-			<language type="sma">സതേണ�� സമി</language>
-			<language type="smi">സമി ഭാഷ</language>
-			<language type="smj">ലൂലീ സമി</language>
-			<language type="smn">ഇനാരി സാമി</language>
-			<language type="sms">സ�കോള��ട�ട� സമി</language>
-			<language type="sn">ഷോണാ</language>
-			<language type="snk">സോണിന��കെ</language>
-			<language type="so">സോമാലി</language>
-			<language type="sog">സോജിഡിയന��</language>
-			<language type="son">സോംഗൈ</language>
-			<language type="sq">അല��ബേനിയന��</language>
-			<language type="sr">സെര��ബിയന��</language>
-			<language type="srn">ശ�രാനന�� ഡോങ�കോ</language>
-			<language type="srr">സെറര��</language>
-			<language type="ss">സ�വാറ�റി</language>
-			<language type="ssa">നിളോ-സഹാറന�� ഭാഷ</language>
-			<language type="st">തെക�കന�� സോതോ</language>
-			<language type="su">സ�ഡാനീസ�</language>
-			<language type="suk">സ�ക�മ</language>
-			<language type="sus">സ�സ�</language>
-			<language type="sux">സ�മേരിയന��</language>
-			<language type="sv">സ�വീഡിഷ�</language>
-			<language type="sw">സ�വാഹിലി</language>
-			<language type="syc">പ�രാതന സ�റിയാനിഭാഷ</language>
-			<language type="syr">സ�റിയാനി</language>
-			<language type="ta">തമിഴ�</language>
-			<language type="tai">തായ� ഭാഷ</language>
-			<language type="te">തെല�ങ�ക�</language>
-			<language type="tem">ടിംനേ</language>
-			<language type="ter">ടെറേനോ</language>
-			<language type="tet">ടെറ�റ�ം</language>
-			<language type="tg">താജിക�</language>
-			<language type="th">തായ�</language>
-			<language type="ti">ടൈഗ�രിന�യ</language>
-			<language type="tig">ടൈഗ�രി</language>
-			<language type="tiv">ടിവ�</language>
-			<language type="tk">ത�ര��ക�മെന��</language>
-			<language type="tkl">ടൊക�കേലൗ</language>
-			<language type="tl">തഗാലോഗ�</language>
-			<language type="tlh">ക�ലിംഗോണ��</language>
-			<language type="tli">ലിംഗ�വിറ�റ�</language>
-			<language type="tmh">ടമഷേക�</language>
-			<language type="tn">ത�സ�വാന</language>
-			<language type="to">ടോംഗ</language>
-			<language type="tog">ന�യാസാ ഡോങ�ക</language>
-			<language type="tpi">ടോക� പിസിന��</language>
-			<language type="tr">ത�ര��ക�കി</language>
-			<language type="ts">ത�സോംഗ</language>
-			<language type="tsi">സിംഷ�യന��</language>
-			<language type="tt">ടാട�ടാര��</language>
-			<language type="tum">ത�ംബ�ക</language>
-			<language type="tup">ത�പി ഭാഷ</language>
-			<language type="tut">അറ�റ�ലാന��റിക�ക� ഭാഷ</language>
-			<language type="tvl">ത�വാല�</language>
-			<language type="tw">ട�വി</language>
-			<language type="ty">താഹിതിയന��</language>
-			<language type="tyv">ത�വിനിയന��</language>
-			<language type="udm">ഉഡ�മ�ര��ട�ട�</language>
-			<language type="ug">ഉയ�ഘ�ര��</language>
-			<language type="uga">ഉഗറിട�ടിക�</language>
-			<language type="uk">ഉക�രേനിയന��</language>
-			<language type="umb">ഉംബ�ന�ദ�</language>
-			<language type="und">അറിയാത�തതോ നിലവിലില�ലാത�തതോ ആയ ഭാഷ</language>
-			<language type="ur">ഉറ�ദ�</language>
-			<language type="uz">ഉസ�ബെക�</language>
-			<language type="vai">വൈ</language>
-			<language type="ve">വെന�ദ</language>
-			<language type="vi">വിയറ�റ�നാമീസ�</language>
-			<language type="vo">വോളാപ�ക�</language>
-			<language type="vot">വോട�ടിക�</language>
-			<language type="wa">വല�ലൂണ��</language>
-			<language type="wak">വകഷന�� ഭാഷകള��</language>
-			<language type="wal">വലമൊ</language>
-			<language type="war">വാരേയ�</language>
-			<language type="was">വാഷൊ</language>
-			<language type="wen">സോര��ബിയന�� ഭാഷ</language>
-			<language type="wo">വൊളോഫ�</language>
-			<language type="xal">കല��മൈക�</language>
-			<language type="xh">ഖോസാ</language>
-			<language type="yao">യാവോ</language>
-			<language type="yap">യെപ�പീസ�</language>
-			<language type="yi">യിദ�ദിഷ�</language>
-			<language type="yo">യൊറൂബാ</language>
-			<language type="ypk">യ�പിക�</language>
-			<language type="za">സ�വാംഗ�</language>
-			<language type="zap">സാപ�പോടെക�</language>
-			<language type="zbl">ബ�ലിസ�സിംബല��സ�</language>
-			<language type="zen">സെനഗ</language>
-			<language type="zh">ചൈനീസ�</language>
-			<language type="zh_Hans">ലളിതചീനഭാഷ</language>
-			<language type="zh_Hant">പരമ�പരാഗത ചൈനീസ�‌</language>
-			<language type="znd">സാന�ദെ</language>
-			<language type="zu">സ�ല�</language>
-			<language type="zun">സ�നി</language>
-			<language type="zxx">ഭാഷേതരം</language>
-			<language type="zza">സാസാ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">അറബി</script>
-			<script type="Armi">അര��മി</script>
-			<script type="Armn">അര��മേനിയന��</script>
-			<script type="Avst">അവെസ�ഥന��</script>
-			<script type="Bali">ബാലിനീസ�</script>
-			<script type="Batk">ബട�ടക�</script>
-			<script type="Beng">ബംഗാളി</script>
-			<script type="Blis">ബ�ലിസ� ചിത�ര ലിപി</script>
-			<script type="Bopo">ബോപ�പോമോഫോ</script>
-			<script type="Brah">ബ�രാഹ�മി</script>
-			<script type="Brai">ബ�രെയ�‌ലി</script>
-			<script type="Bugi">ബ�ഗിനീസ�</script>
-			<script type="Buhd">ബ�ഹിഡ�</script>
-			<script type="Cakm">à´šà´•à´‚</script>
-			<script type="Cans">�കീകൃത കനേഡിയന�� ഗോത�രലിപി</script>
-			<script type="Cari">ചരിയന��</script>
-			<script type="Cham">ഛം</script>
-			<script type="Cher">ചെറോക�കി</script>
-			<script type="Cirt">ചിര��ത�ത�</script>
-			<script type="Copt">കോപ�റ�റിക�</script>
-			<script type="Cprt">സൈപ�രിയോട�ട�</script>
-			<script type="Cyrl">സിറിലിക�</script>
-			<script type="Cyrs">പ�രാതന ചര��ച�ച� സ�ലവോണിക� സിറിലിക�</script>
-			<script type="Deva">ദേവനാഗരി</script>
-			<script type="Dsrt">ഡെസെര��ട�ട�</script>
-			<script type="Egyd">ഈജിപ�ഷ�യന�� ഡിമോട�ടിക�</script>
-			<script type="Egyh">ഈജിപ�ഷ�യന�� ഹിരാറ�റിക�</script>
-			<script type="Egyp">ഈജിപ�ഷ�യന�� ചിത�രലിപി</script>
-			<script type="Ethi">എത�യോപിക�</script>
-			<script type="Geok">ജോര��ജ�ജിയന�� ഖ�ട�സ�രി</script>
-			<script type="Geor">ജോര��ജ�ജിയന��</script>
-			<script type="Glag">ഗ�ലഗോലിറ�റിക�</script>
-			<script type="Goth">ഗോഥിക�</script>
-			<script type="Grek">ഗ�രീക�ക�</script>
-			<script type="Gujr">ഗ�ജറാത�തി</script>
-			<script type="Guru">ഗ�ര�മ�ഖി</script>
-			<script type="Hang">ഹാംഗ�ള��</script>
-			<script type="Hani">ഹാന��</script>
-			<script type="Hano">ഹന�നൂ</script>
-			<script type="Hans">പരിഷ�കൃത ഹാന��</script>
-			<script type="Hant">പരമ�പരാഗത ഹാന��</script>
-			<script type="Hebr">ഹീബ�ര�</script>
-			<script type="Hira">ഹിരാഗാന</script>
-			<script type="Hmng">പഹ�വാ ഹമോംഗ�</script>
-			<script type="Hrkt">കടകാനയോ ഹിരാഗാനയോ</script>
-			<script type="Hung">പ�രാതന ഹംഗേറിയന��</script>
-			<script type="Inds">സിന�ധ�</script>
-			<script type="Ital">പഴയ ഇറ�റാലിയന��</script>
-			<script type="Java">ജാവനീസ�</script>
-			<script type="Jpan">ജാപ�പനീസ�</script>
-			<script type="Kali">കയാ ലി</script>
-			<script type="Kana">കടകാന</script>
-			<script type="Khar">ഖരോഷ�ടി</script>
-			<script type="Khmr">ഖമര��</script>
-			<script type="Knda">കന�നഡ</script>
-			<script type="Kore">കൊറിയന��</script>
-			<script type="Kthi">ക�തി</script>
-			<script type="Lana">ലന�ന</script>
-			<script type="Laoo">ലാവോ</script>
-			<script type="Latf">ഫ�രാക�ട�ര�� ലാറ�റിന��</script>
-			<script type="Latg">ഗെയ�‌ലിക� ലാറ�റിന��</script>
-			<script type="Latn">ലാറ�റിന��</script>
-			<script type="Lepc">ലെപ�ച</script>
-			<script type="Limb">ലിംബ�</script>
-			<script type="Lina">സമരേഖയില�ള�ള എ</script>
-			<script type="Linb">ലീനിയര�� ബി</script>
-			<script type="Lyci">ലൈസിന��</script>
-			<script type="Lydi">ലൈഡിയന��</script>
-			<script type="Mand">മന��ഡേയന��</script>
-			<script type="Mani">മണിചേയന��</script>
-			<script type="Maya">മായന�� ചിത�രലിപി</script>
-			<script type="Mero">മെറോയിറ�റിക�</script>
-			<script type="Mlym">മലയാളം</script>
-			<script type="Mong">മംഗോളിയന��</script>
-			<script type="Moon">മൂണ��</script>
-			<script type="Mtei">മേറ�റി മായക�</script>
-			<script type="Mymr">മ�യാന��മാര��</script>
-			<script type="Nkoo">എന��കോ</script>
-			<script type="Ogam">ഒഖാം</script>
-			<script type="Olck">ഒല�� ചിക�കി</script>
-			<script type="Orkh">ഒര��ഖോണ��</script>
-			<script type="Orya">ഒറിയ</script>
-			<script type="Osma">ഒസ�‌മാനിയ</script>
-			<script type="Perm">പ�രാതന പെര��മിക�</script>
-			<script type="Phag">ഫഗസ� പ</script>
-			<script type="Phli">എഴ�ത�ത� പഹല��വി</script>
-			<script type="Phlp">സാള��ട�ടര�� പഹല��വി</script>
-			<script type="Phlv">പഹല��വി ലിപി</script>
-			<script type="Phnx">ഫിനീഷ�യന��</script>
-			<script type="Plrd">പൊള�ളാര��ഡ� ശബ�ദലിപി</script>
-			<script type="Prti">പൃതി</script>
-			<script type="Qaai">പാരമ�പര�യമായ</script>
-			<script type="Rjng">റെജാംഗ�</script>
-			<script type="Roro">റൊംഗോറൊംഗോ</script>
-			<script type="Runr">റ�ണിക�</script>
-			<script type="Samr">സമരിയ</script>
-			<script type="Sara">സരതി</script>
-			<script type="Saur">സൗരാഷ�ട�ര</script>
-			<script type="Sgnw">ചിഹ�നലിപി</script>
-			<script type="Shaw">ഷാവിയന��</script>
-			<script type="Sinh">സിംഹള</script>
-			<script type="Sund">സന�താനീസ�</script>
-			<script type="Sylo">സൈലോതി നാഗരി</script>
-			<script type="Syrc">സിറിയക�ക�</script>
-			<script type="Syre">എസ�റ�റ�രാംഗ�ലോ സിറിയക�</script>
-			<script type="Syrj">പശ�ചിമസ�റിയാനി</script>
-			<script type="Syrn">കിഴക�കന�� സിറിയക�</script>
-			<script type="Tagb">തഗ�ബന��വാ</script>
-			<script type="Tale">തായ� ലേ</script>
-			<script type="Talu">പ�തിയ തായ� ല�യൂ</script>
-			<script type="Taml">തമിഴ�</script>
-			<script type="Tavt">ത�വട�</script>
-			<script type="Telu">തെല�ങ�ക�</script>
-			<script type="Teng">തെംഗ�വര��</script>
-			<script type="Tfng">തിഫിനാഗ�</script>
-			<script type="Tglg">തഗലോഗ�</script>
-			<script type="Thaa">ഥാന</script>
-			<script type="Thai">തായ�</script>
-			<script type="Tibt">ടിബറ�റന��</script>
-			<script type="Ugar">ഉഗ�രൈറ�റിക�</script>
-			<script type="Vaii">വൈ</script>
-			<script type="Visp">ദൃശ�യഭാഷ</script>
-			<script type="Xpeo">പഴയ പേര��ഷ�യന��</script>
-			<script type="Xsux">സ�മേറോ അക�കാഡിയന�� ക�യ�ണിഫോം</script>
-			<script type="Yiii">യി</script>
-			<script type="Zmth">ഗണിത രൂപം</script>
-			<script type="Zsym">ചിഹ�നങ�ങള��</script>
-			<script type="Zxxx">എഴ�തപ�പെടാത�തത�</script>
-			<script type="Zyyy">സാധാരണ</script>
-			<script type="Zzzz">അറിയപ�പെടാത�തതോ നിലവിലില�ലാത�തതോ ആയ ലിപി</script>
-		</scripts>
-		<territories>
-			<territory type="001">ലോകം</territory>
-			<territory type="002">ആഫ�രിക�ക</territory>
-			<territory type="003">വടക�കേ അമേരിക�കന�� ഭൂഖണ�ഡം</territory>
-			<territory type="005">തെക�കേ അമേരിക�കന�� ഭൂഖണ�ഡം</territory>
-			<territory type="009">ഓഷ�യാനിയ</territory>
-			<territory type="011">പശ�ചിമ ആഫ�രിക�ക</territory>
-			<territory type="013">മദ�ധ�യഅമേരിക�ക</territory>
-			<territory type="014">കിഴക�കന�� ആഫ�രിക�ക</territory>
-			<territory type="015">വടക�കേ ആഫ�രിക�ക</territory>
-			<territory type="017">മദ�ധ�യആഫ�രിക�ക</territory>
-			<territory type="018">തെക�കേ ആഫ�രിക�ക</territory>
-			<territory type="019">അമേരിക�കന�� ഭൂഖണ�ഡം</territory>
-			<territory type="021">വടക�കേ അമേരിക�ക</territory>
-			<territory type="029">കരീബിയന��</territory>
-			<territory type="030">കിഴക�കന�� �ഷ�യ</territory>
-			<territory type="034">തെക�കേ �ഷ�യ</territory>
-			<territory type="035">തെക�ക�-കിഴക�കന�� �ഷ�യ</territory>
-			<territory type="039">തെക�കേ യൂറോപ�പ�</territory>
-			<territory type="053">ഓസ�ട�രേലിയയ�ം ന�യൂസിലാന��ഡ�ം</territory>
-			<territory type="054">മെലനേഷ�യ</territory>
-			<territory type="057">മൈക�രോനേഷ�യന�� പ�രദേശം</territory>
-			<territory type="061">പോളിനേഷ�യ</territory>
-			<territory type="062">ദക�ഷിണ-മദ�ധ�യ �ഷ�യ</territory>
-			<territory type="142">�ഷ�യ</territory>
-			<territory type="143">മദ�ധ�യേഷ�യ</territory>
-			<territory type="145">പശ�ചിമേഷ�യ</territory>
-			<territory type="150">യൂറോപ�പ�</territory>
-			<territory type="151">കിഴക�കന�� യൂറോപ�പ�</territory>
-			<territory type="154">വടക�കേ യൂറോപ�പ�</territory>
-			<territory type="155">പശ�ചിമ യൂറോപ�പ�</territory>
-			<territory type="172">സ�വതന�ത�രരാഷ�ട�രങ�ങള�ടെ കോമണ��‌വെല��ത�ത�</territory>
-			<territory type="200">ചെക�കോസ�ലോവാക�യ</territory>
-			<territory type="419">ലാറ�റിനമേരിക�കയ�ം കരീബിയന�ം</territory>
-			<territory type="830">ചാനല�� ദ�വീപ�കള��</territory>
-			<territory type="AD">അന��റോറ</territory>
-			<territory type="AE">സംയ�ക�ത അറബ� രാഷ�ട�രം</territory>
-			<territory type="AF">അഫ�ഗാനിസ�ഥാന��</territory>
-			<territory type="AG">ആന��റിഗ�വയ�ം ബര��ബ�ഡയ�ം</territory>
-			<territory type="AI">ആന��ഗ�വില�ല</territory>
-			<territory type="AL">അല��ബേനിയ</territory>
-			<territory type="AM">അര��മേനിയ</territory>
-			<territory type="AN">നെതര��ലന��ഡ�സ� ആന��റിലിസ�</territory>
-			<territory type="AO">അംഗോള</territory>
-			<territory type="AQ">അന��റാര��ട�ടിക�ക</territory>
-			<territory type="AR">അര��ജന��റീന</territory>
-			<territory type="AS">അമേരിക�കന�� സാമോവ</territory>
-			<territory type="AT">ഓസ�ട�രിയ</territory>
-			<territory type="AU">ഓസ�ട�രേലിയ</territory>
-			<territory type="AW">അറ�ബ</territory>
-			<territory type="AX">അലന��ഡ� ദ�വീപ�കള��</territory>
-			<territory type="AZ">അസര��ബൈജാന��</territory>
-			<territory type="BA">ബോസ�നിയയ�ം ഹെര��സഗോവിനയ�ം</territory>
-			<territory type="BB">ബാര��ബഡോസ�</territory>
-			<territory type="BD">ബംഗ�ലാദേശ�</territory>
-			<territory type="BE">ബെല��ജിയം</territory>
-			<territory type="BF">ബ�ര��ക�കിനാ ഫാസോ</territory>
-			<territory type="BG">ബള��ഗേറിയ</territory>
-			<territory type="BH">ബഹ�റൈന��</territory>
-			<territory type="BI">ബ�റ�ണ�ടി</territory>
-			<territory type="BJ">ബെനിന��</territory>
-			<territory type="BL">സെന��റ� ബാര��ത�തെല��മി</territory>
-			<territory type="BM">ബര��മ�ഡ</territory>
-			<territory type="BN">ബ�രൂണൈ</territory>
-			<territory type="BO">ബൊളീവിയ</territory>
-			<territory type="BR">ബ�രസീല��</territory>
-			<territory type="BS">ബഹാമാസ�</territory>
-			<territory type="BT">ഭൂട�ടാന��</territory>
-			<territory type="BV">ബൗവെറ�റ� ദ�വീപ�</territory>
-			<territory type="BW">ബോട�സ�വാന</territory>
-			<territory type="BY">ബെലറൂസ�</territory>
-			<territory type="BZ">ബെലീസ�</territory>
-			<territory type="CA">കാനഡ</territory>
-			<territory type="CC">കോക�കസ�</territory>
-			<territory type="CD">കോംഗോ - കിന��ഷാസ</territory>
-			<territory type="CF">സെന��ട�രല�� ആഫ�രിക�കന�� റിപ�പബ�ലിക�</territory>
-			<territory type="CG">കോംഗോ - ബ�രാസാവില��</territory>
-			<territory type="CH">സ�വിറ�റ�സര��ലാന��ഡ�</territory>
-			<territory type="CI">�വറി കോസ�റ�റ�</territory>
-			<territory type="CK">കൂക�ക� ദ�വീപ�കള��</territory>
-			<territory type="CL">ചിലി</territory>
-			<territory type="CM">കാമറൂണ��</territory>
-			<territory type="CN">ചൈന</territory>
-			<territory type="CO">കൊളംബിയ</territory>
-			<territory type="CR">കോസ�റ�ററിക�ക</territory>
-			<territory type="CS">സെര��ബിയയ�ം മോണ�ടനേഗ�രോയ�ം</territory>
-			<territory type="CU">ക�യൂബ</territory>
-			<territory type="CV">കേപ�പ� വെര��ഡെ</territory>
-			<territory type="CX">ക�രിസ�മസ� ദ�വീപ�</territory>
-			<territory type="CY">സൈപ�രസ�സ�</territory>
-			<territory type="CZ">ചെക�ക� റിപ�പബ�ലിക�</territory>
-			<territory type="DE">ജര��മനി</territory>
-			<territory type="DJ">ജിബൂട�ടി</territory>
-			<territory type="DK">ഡെന��മാര��ക�ക�</territory>
-			<territory type="DM">ഡൊമിനിക�ക</territory>
-			<territory type="DO">ഡൊമിനിക�കന�� റിപ�പബ�ലിക�</territory>
-			<territory type="DZ">അള��ജീരിയ</territory>
-			<territory type="EC">ഇക�വഡോര��</territory>
-			<territory type="EE">എസ�റ�റോണിയ�</territory>
-			<territory type="EG">ഈജിപ�ത�</territory>
-			<territory type="EH">പശ�ചിമ സഹാറ</territory>
-			<territory type="ER">എറിത�രിയ</territory>
-			<territory type="ES">സ�പെയിന��</territory>
-			<territory type="ET">എത�യോപ�യ</territory>
-			<territory type="FI">ഫിന��ലാന��ഡ�</territory>
-			<territory type="FJ">ഫിജി</territory>
-			<territory type="FK">ഫാക�ക�‌ലാന��റ� �ലന��റ�</territory>
-			<territory type="FM">മൈക�രോനേഷ�യ</territory>
-			<territory type="FO">ഫറോയി ദ�വീപ�കള��</territory>
-			<territory type="FR">ഫ�രാന��സ�</territory>
-			<territory type="GA">ഗാബോണ��</territory>
-			<territory type="GB">ബ�രിട�ടന��</territory>
-			<territory type="GD">ഗ�രനേഡ</territory>
-			<territory type="GE">ജോര��ജിയ</territory>
-			<territory type="GF">ഫ�രഞ�ച� ഗയാന</territory>
-			<territory type="GG">ഗേണ��സി</territory>
-			<territory type="GH">ഘാന</territory>
-			<territory type="GI">ജിബ�രാള��ട�ടര��</territory>
-			<territory type="GL">ഗ�രീന��ലാന��റ�</territory>
-			<territory type="GM">ഗാംബിയ</territory>
-			<territory type="GN">ഗ�വിനിയ</territory>
-			<territory type="GP">ഗ�വാഡെലോപ�</territory>
-			<territory type="GQ">ഇക�വിറ�റോറിയല�� ഗ�വിനിയ</territory>
-			<territory type="GR">ഗ�രീസ�</territory>
-			<territory type="GS">ദക�ഷിണ ജോര��ജ�ജിയയ�ം ദക�ഷിണ സാന��ഡ�‌വിച�ച� ദ�വീപ�കള�ം</territory>
-			<territory type="GT">ഗ�വാട�ടിമാലാ</territory>
-			<territory type="GU">ഗ�വാം</territory>
-			<territory type="GW">ഗിനി-ബിസോ</territory>
-			<territory type="GY">ഗയാന</territory>
-			<territory type="HK">ഹോങ� കോങ� എസ�.�.ആര��. ചൈന</territory>
-			<territory type="HM">ഹിയേര��ഡ� ദ�വീപ�ം മക�ഡൊണാള�ഡ� ദ�വീപ�കള�ം</territory>
-			<territory type="HN">ഹോണ�ട�റാസ�</territory>
-			<territory type="HR">ക�രൊയേഷ�യ</territory>
-			<territory type="HT">ഹെയ�തി</territory>
-			<territory type="HU">ഹംഗറി</territory>
-			<territory type="ID">ഇന��ഡോനേഷ�യ</territory>
-			<territory type="IE">അയര��ലാന��ഡ�</territory>
-			<territory type="IL">ഇസ�രായേല��</territory>
-			<territory type="IM">�ല�� ഓഫ� മാന��</territory>
-			<territory type="IN">ഇന�ത�യ</territory>
-			<territory type="IO">ബ�രിട�ടീഷ� ഇന�ത�യന�� മഹാസമ�ദ�ര പ�രദേശം</territory>
-			<territory type="IQ">ഇറാക�ക�</territory>
-			<territory type="IR">ഇറാന��</territory>
-			<territory type="IS">�സ�‌ലാന�റ�</territory>
-			<territory type="IT">ഇറ�റലി</territory>
-			<territory type="JE">ജേഴ�സി</territory>
-			<territory type="JM">ജമൈക�ക</territory>
-			<territory type="JO">ജോര��ദ�ദാന��</territory>
-			<territory type="JP">ജപ�പാന��</territory>
-			<territory type="KE">കെനിയ</territory>
-			<territory type="KG">കിര��ഗിസ�ഥാന��</territory>
-			<territory type="KH">കംബോഡിയ</territory>
-			<territory type="KI">കിരിബാത�തി</territory>
-			<territory type="KM">കോമറോസ�</territory>
-			<territory type="KN">സെയ�ന��റ� കിറ�റ�സ�ം നെവിസ�ം</territory>
-			<territory type="KP">ഉത�തരകൊറിയ</territory>
-			<territory type="KR">ദക�ഷിണകൊറിയ</territory>
-			<territory type="KW">ക�വൈറ�റ�</territory>
-			<territory type="KY">കേയ�മാന�� ദ�വീപ�കള��</territory>
-			<territory type="KZ">കസാഖിസ�ഥാന��</territory>
-			<territory type="LA">ലാവോസ�</territory>
-			<territory type="LB">ലബനോണ��</territory>
-			<territory type="LC">സെന��റ� ലൂസിയ</territory>
-			<territory type="LI">ലൈച�ടെസ�റ�റിന��</territory>
-			<territory type="LK">ശ�രീലങ�ക</territory>
-			<territory type="LR">ലൈബീരിയ</territory>
-			<territory type="LS">ലെസോത�തോ</territory>
-			<territory type="LT">ലിത�വാനിയ</territory>
-			<territory type="LU">ലക�സംബര��ഗ�</territory>
-			<territory type="LV">ലാത�വിയ</territory>
-			<territory type="LY">ലിബിയ</territory>
-			<territory type="MA">മൊറോക�കൊ</territory>
-			<territory type="MC">മൊണോക�കൊ</territory>
-			<territory type="MD">മള��ഡോവ</territory>
-			<territory type="ME">മോണ�ടേനേഗ�രോ</territory>
-			<territory type="MF">സെന��റ� മാര��ട�ടിന��</territory>
-			<territory type="MG">മഡഗാസ�കര��</territory>
-			<territory type="MH">മാര��ഷല���� ദ�വീപ�കള��</territory>
-			<territory type="MK">മാസിഡോണിയ</territory>
-			<territory type="ML">മാലി</territory>
-			<territory type="MM">മ�യാന��മാര��</territory>
-			<territory type="MN">മംഗോളിയ</territory>
-			<territory type="MO">മക�കാവോ SAR ചൈന</territory>
-			<territory type="MP">ഉത�തര മറിയാനാ ദ�വീപ�കള��</territory>
-			<territory type="MQ">മാര��ട�ടീനിക�</territory>
-			<territory type="MR">മൗറിറ�റാനിയ</territory>
-			<territory type="MS">മോണ�ട�സെറാറ�റ�</territory>
-			<territory type="MT">മാള��ട�ട</territory>
-			<territory type="MU">മൗറീഷ�യസ�</territory>
-			<territory type="MV">മാലിദ�വീപ�</territory>
-			<territory type="MW">മലാവി</territory>
-			<territory type="MX">മെക�സിക�കോ</territory>
-			<territory type="MY">മലേഷ�യ</territory>
-			<territory type="MZ">മൊസാംബിക�ക�</territory>
-			<territory type="NA">നമീബിയ</territory>
-			<territory type="NC">പ�തിയ കാലിഡോണിയ</territory>
-			<territory type="NE">നൈജര��</territory>
-			<territory type="NF">നോര��ഫോക� ദ�വീപ�</territory>
-			<territory type="NG">നൈജീരിയ</territory>
-			<territory type="NI">നിക�കാരഗ�വ</territory>
-			<territory type="NL">നെതര��ലന��ഡ�സ�</territory>
-			<territory type="NO">നോര��വെ</territory>
-			<territory type="NP">നേപ�പാള��</territory>
-			<territory type="NR">നൗറൂ</territory>
-			<territory type="NU">ന�യൂവേ</territory>
-			<territory type="NZ">ന�യൂസിലാന��റ�</territory>
-			<territory type="OM">ഒമാന��</territory>
-			<territory type="PA">പനാമ</territory>
-			<territory type="PE">പെറ�</territory>
-			<territory type="PF">ഫ�രഞ�ച� പോളിനേഷ�യ</territory>
-			<territory type="PG">പപ�പ�വ ന�യൂ ഗ�വിനി</territory>
-			<territory type="PH">ഫിലിപ�പൈന��സ�</territory>
-			<territory type="PK">പാക�കിസ�ഥാന��</territory>
-			<territory type="PL">പോളണ�ട�</territory>
-			<territory type="PM">സെന��റ� പിറേയ�ം മിക�വലണ�ം</territory>
-			<territory type="PN">പിറ�റ�കെയ�ന��</territory>
-			<territory type="PR">പോര��ട�ടോ റിക�കോ</territory>
-			<territory type="PS">പാലസ�തീന��</territory>
-			<territory type="PT">പോര��ച�ച�ഗല��</territory>
-			<territory type="PW">പലാവ�</territory>
-			<territory type="PY">പരാഗ�വേ</territory>
-			<territory type="QA">ഖത�തര��</territory>
-			<territory type="QO">പ�റംദ�വീപ�കള��</territory>
-			<territory type="QU">യൂറോപ�യന�� യൂണിയന��</territory>
-			<territory type="RE">റീയൂണിയന��</territory>
-			<territory type="RO">റ�മേനിയ</territory>
-			<territory type="RS">സെര��ബിയ</territory>
-			<territory type="RU">റഷ�യ</territory>
-			<territory type="RW">റ�വാണ�ട</territory>
-			<territory type="SA">സൗദി അറേബ�യ</territory>
-			<territory type="SB">സോളമന��� ദ�വീപ�കള��</territory>
-			<territory type="SC">സെയ�ഷെല��സ�</territory>
-			<territory type="SD">സ�ഡാന��</territory>
-			<territory type="SE">സ�വീഡന��</territory>
-			<territory type="SG">സിംഗപ�പ�ര��</territory>
-			<territory type="SH">സെന��റ� ഹെലീന</territory>
-			<territory type="SI">സ�ലോവേനിയ</territory>
-			<territory type="SJ">സ�വാല��ബാഡ�ം ജാന�� മായേന�ം</territory>
-			<territory type="SK">സ�ലോവാക�യ</territory>
-			<territory type="SL">സിയേറാ ലിയോണ��</territory>
-			<territory type="SM">സാന�� മറിനോ</territory>
-			<territory type="SN">സെനഗല��</territory>
-			<territory type="SO">സോമാലിയ</territory>
-			<territory type="SR">സ�റിനാം</territory>
-			<territory type="ST">സാവോ റ�റമെ ആന��ഡ� പ�രിന��സിപ�പി</territory>
-			<territory type="SV">എല�� സാല��വദോര��</territory>
-			<territory type="SY">സിറിയ</territory>
-			<territory type="SZ">സ�വാസിലാന��റ�</territory>
-			<territory type="TC">ടര��ക�ക�സ�ം കൈക�കോ ദ�വീപ�കള�ം</territory>
-			<territory type="TD">ചാഡ�</territory>
-			<territory type="TF">ഫ�രഞ�ച� ദക�ഷിണ ഭൂപ�രദേശം</territory>
-			<territory type="TG">ടോഗോ</territory>
-			<territory type="TH">തായ�‌ലാന��ഡ�</territory>
-			<territory type="TJ">താജിക�കിസ�ഥാന��</territory>
-			<territory type="TK">ടൊകെലാവ�</territory>
-			<territory type="TL">കിഴക�കന�� തിമൂര��</territory>
-			<territory type="TM">ത�ര��ക�ക�മെനിസ�ഥാന��</territory>
-			<territory type="TN">ട�ണീഷ�യ</territory>
-			<territory type="TO">ടോംഗ</territory>
-			<territory type="TR">ത�ര��ക�കി</territory>
-			<territory type="TT">ട�രിനിഡാഡ�ം റ�റൊബാഗോയ�ം</territory>
-			<territory type="TV">ത�വാല�</territory>
-			<territory type="TW">തായ�‌വാന��</territory>
-			<territory type="TZ">ടാന��സാനിയ</territory>
-			<territory type="UA">ഉക�രൈന��</territory>
-			<territory type="UG">ഉഗാണ�ട</territory>
-			<territory type="UM">യ�ണൈറ�റഡ� സ�റ�റേറ�റ�സ�ം ചെറിയ പ�റംദ�വീപ�കള�ം</territory>
-			<territory type="US">അമേരിക�കന�� �ക�യനാട�കള��</territory>
-			<territory type="UY">ഉറ�ഗ�വേ</territory>
-			<territory type="UZ">ഉസ�ബെക�കിസ�ഥാന��</territory>
-			<territory type="VA">വത�തിക�കാന��</territory>
-			<territory type="VC">സെന��റ� വിന��സന��റ�ം ഗ�രനഡൈന��സ�ം</territory>
-			<territory type="VE">വെനിസ�വേല</territory>
-			<territory type="VG">ബ�രിട�ടീഷ� വിര��ജിന�� ദ�വീപ�കള��</territory>
-			<territory type="VI">യ�.എസ�. വെര��ജിന�� ദ�വീപ�കള��</territory>
-			<territory type="VN">വിയറ�റ�നാം</territory>
-			<territory type="VU">വന�വാത�ത�</territory>
-			<territory type="WF">വാലിസ� ആന��ഡ� ഫ�യ�ചൂന</territory>
-			<territory type="WS">സാമോവ</territory>
-			<territory type="YE">യമന��</territory>
-			<territory type="YT">മയോട�ട�</territory>
-			<territory type="ZA">ദക�ഷിണാഫ�രിക�ക</territory>
-			<territory type="ZM">സാംബിയ</territory>
-			<territory type="ZW">സിംബാബ�വേ</territory>
-			<territory type="ZZ">അറിയപ�പെടാത�തതോ നിലവിലില�ലാത�തതോ ആയ പ�രദേശം</territory>
-		</territories>
-		<variants>
-			<variant type="1996">1996-ലെ ജര��മന�� ലിപി</variant>
-			<variant type="1606NICT">1606 വരെയ�ള�ള ആധ�നികമദ�ധ�യകാല ഫ�രഞ�ച�</variant>
-			<variant type="AREVELA">കിഴക�കന�� അര��മീനിയന��</variant>
-			<variant type="BOONT">ബൂണ�ട�‌ലിങ�ങ�</variant>
-			<variant type="FONIPA">�പി‌എ സ�വനവ�യവസ�ഥ</variant>
-			<variant type="MONOTON">മോണോറ��റോണിക�</variant>
-			<variant type="NEDIS">നേറ�റിസോണ�� പ�രാദേശികരൂപം</variant>
-			<variant type="NJIVA">ഗ�നിവ/നിജിവ പ�രാദേശികരൂപം</variant>
-			<variant type="POSIX">കമ�പ�യµ‚ട�ടര��</variant>
-			<variant type="REVISED">പരിഷ�ക�കരിച�ച ലിപി</variant>
-		</variants>
-		<keys>
-			<key type="calendar">കലണ�ടര��</key>
-			<key type="collation">അകാരാദിക�രമം</key>
-			<key type="currency">നാണയം</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">പരമ�പരാഗത ചൈനീസ� ക�രമീകരണം - ബിഗ�5</type>
-			<type type="buddhist" key="calendar">ബ�ദ�ധമതകലണ�ടര��</type>
-			<type type="chinese" key="calendar">ചൈനീസ� കലണ�ടര��</type>
-			<type type="direct" key="collation">പ�രത�യക�ഷക�രമീകരണം</type>
-			<type type="gb2312han" key="collation">ലളിതമായ ചൈനീസ� ക�രമീകരണം - ജീബി2312</type>
-			<type type="gregorian" key="calendar">ഇംഗ�ലീഷ� കലണ�ടര��</type>
-			<type type="hebrew" key="calendar">ഹീബ�രൂ കലണ�ടര��</type>
-			<type type="indian" key="calendar">ശകവര��ഷ കലണ�ടര��</type>
-			<type type="islamic" key="calendar">ഇസ�ലാം കലണ�ടര��</type>
-			<type type="islamic-civil" key="calendar">ഇസ�ലാം-സിവില�� കലണ�ടര��</type>
-			<type type="japanese" key="calendar">ജാപ�പനീസ� കലണ�ടര��</type>
-			<type type="phonebook" key="collation">ഫോണ��ബ�ക�കിലെ ക�രമീകരണം</type>
-			<type type="pinyin" key="collation">പിന��‌യിന�� ക�രമീകരണം</type>
-			<type type="roc" key="calendar">ചൈനീസ� കലണ�ടര��</type>
-			<type type="stroke" key="collation">സ�റ�റ�രോക�ക� ക�രമീകരണം</type>
-			<type type="traditional" key="collation">പരമ�പരാഗത ക�രമീകരണം</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">മെട�രിക�</measurementSystemName>
-			<measurementSystemName type="US">യ�.എസ�.</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">ഭാഷ: {0}</codePattern>
-			<codePattern type="script">ലിപി: {0}</codePattern>
-			<codePattern type="territory">ദേശം: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u200C \u200D ഃ അ-ഋ ൠ ഌ ൡ എ-� ഒ-ന പ-മ ം യ ര ല വ-ഹ ള ഴ റ ാ-ൃ െ-ൈ ൊ ോ ൗ ൌ \u0D4D]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a-z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ജന�</month>
-							<month type="2">ഫെബ�ര�</month>
-							<month type="3">മാര��</month>
-							<month type="4">�പ�രി</month>
-							<month type="5">മേയ�</month>
-							<month type="6">ജൂണ��</month>
-							<month type="7">ജൂലൈ</month>
-							<month type="8">à´“à´—</month>
-							<month type="9">സെപ�റ�റം</month>
-							<month type="10">ഒക�ടോ</month>
-							<month type="11">നവം</month>
-							<month type="12">ഡിസം</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ജന�വരി</month>
-							<month type="2">ഫെബ�ര�വരി</month>
-							<month type="3">മാര��ച�ച�</month>
-							<month type="4">�പ�രില��</month>
-							<month type="5">മേയ�</month>
-							<month type="6">ജൂണ��</month>
-							<month type="7">ജൂലൈ</month>
-							<month type="8">ഓഗസ�റ�റ�</month>
-							<month type="9">സെപ�റ�റംബര��</month>
-							<month type="10">ഒക�ടോബര��</month>
-							<month type="11">നവംബര��</month>
-							<month type="12">ഡിസംബര��</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ജ</month>
-							<month type="2">ഫെ</month>
-							<month type="3">മാ</month>
-							<month type="4">à´�</month>
-							<month type="5">മേ</month>
-							<month type="6">ജൂ</month>
-							<month type="7">ജൂ</month>
-							<month type="8">à´“</month>
-							<month type="9">സെ</month>
-							<month type="10">à´’</month>
-							<month type="11">à´¨</month>
-							<month type="12">à´¡à´¿</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ഞായര��</day>
-							<day type="mon">തിങ�കള��</day>
-							<day type="tue">ചൊവ�വ</day>
-							<day type="wed">ബ�ധന��</day>
-							<day type="thu">വ�യാഴം</day>
-							<day type="fri">വെള�ളി</day>
-							<day type="sat">ശനി</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ഞായറാഴ�ച</day>
-							<day type="mon">തിങ�കളാഴ�ച</day>
-							<day type="tue">ചൊവ�വാഴ�ച</day>
-							<day type="wed">ബ�ധനാഴ�ച</day>
-							<day type="thu">വ�യാഴാഴ�ച</day>
-							<day type="fri">വെള�ളിയാഴ�ച</day>
-							<day type="sat">ശനിയാഴ�ച</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">à´žà´¾</day>
-							<day type="mon">തി</day>
-							<day type="tue">ചൊ</day>
-							<day type="wed">ബ�</day>
-							<day type="thu">വ�യാ</day>
-							<day type="fri">വെ</day>
-							<day type="sat">à´¶</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ഒന�നാം പാദം</quarter>
-							<quarter type="2">രണ�ടാം പാദം</quarter>
-							<quarter type="3">മൂന�നാം പാദം</quarter>
-							<quarter type="4">നാലാം പാദം</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ക�രിസ�ത�വിന�� മ�മ�പ�‌</era>
-						<era type="1">ക�രിസ�ത�വിന� പിന��പ�</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ക�രി.മ�.</era>
-						<era type="1">ക�രി.പി.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">ക�രി.മ�.</era>
-						<era type="1">ക�രി.പി.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y, MMMM d, EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y, MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y, MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">M/d, E</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMM d, E</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-y</dateFormatItem>
-						<dateFormatItem id="yMEd">d-M-yyyy, EEE</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y MMM d, EEE</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a – h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h–h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M - d/M</greatestDifference>
-							<greatestDifference id="M">d/M - d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">d/M, E - d/M, E</greatestDifference>
-							<greatestDifference id="M">d/M, E - d/M, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d, E - MMM d, E</greatestDifference>
-							<greatestDifference id="M">MMM d, E - MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy – d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">d/M/yy, E - d/M/yy, E</greatestDifference>
-							<greatestDifference id="M">d/M/yy, E - d/M/yy, E</greatestDifference>
-							<greatestDifference id="y">d/M/yy, E - d/M/yy, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y, MMM d, E - d, E</greatestDifference>
-							<greatestDifference id="M">y MMM d, E - MMM d, E</greatestDifference>
-							<greatestDifference id="y">y MMM d, E - y MMM d, E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>അബ�ദം</displayName>
-					</field>
-					<field type="year">
-						<displayName>വര��ഷം</displayName>
-					</field>
-					<field type="month">
-						<displayName>മാസം</displayName>
-					</field>
-					<field type="week">
-						<displayName>ആഴ�ച</displayName>
-					</field>
-					<field type="day">
-						<displayName>ദിവസം</displayName>
-						<relative type="-3">മൂന�ന�ദിവസം മ�മ�പ�</relative>
-						<relative type="-2">മിനിഞ�ഞാന�ന�</relative>
-						<relative type="-1">ഇന�നലെ</relative>
-						<relative type="0">ഇന�ന��</relative>
-						<relative type="1">നാളെ</relative>
-						<relative type="2">മറ�റന�നാള��</relative>
-						<relative type="3">ഇന�നേക�ക� മൂന�നാം‌പക�കം</relative>
-					</field>
-					<field type="weekday">
-						<displayName>ആഴ�ചയിലെ ദിവസം</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>am/pm</displayName>
-					</field>
-					<field type="hour">
-						<displayName>മണിക�കൂര��</displayName>
-					</field>
-					<field type="minute">
-						<displayName>മിനിട�ട�</displayName>
-					</field>
-					<field type="second">
-						<displayName>സെക�കന�റ�</displayName>
-					</field>
-					<field type="zone">
-						<displayName>മേഖല</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">ചൈത�രം</month>
-							<month type="2">വൈശാഖം</month>
-							<month type="3">ജ�യേഷ�ഠം</month>
-							<month type="4">ആഷാഢം</month>
-							<month type="5">ശ�രാവണം</month>
-							<month type="6">ഭാദ�രപാദം</month>
-							<month type="7">ആശ�വിനം</month>
-							<month type="8">കാര��ത�തികം</month>
-							<month type="9">മാര��ഗശീര��ഷം</month>
-							<month type="10">പൗഷം</month>
-							<month type="11">മാഘം</month>
-							<month type="12">ഫല��ഗ�നം</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ചൈ</month>
-							<month type="2">വൈ</month>
-							<month type="3">ജ�യേ</month>
-							<month type="4">à´†</month>
-							<month type="5">ശ�രാ</month>
-							<month type="6">à´­à´¾</month>
-							<month type="7">à´†</month>
-							<month type="8">à´•à´¾</month>
-							<month type="9">മാ</month>
-							<month type="10">പൗ</month>
-							<month type="11">മാ</month>
-							<month type="12">à´«</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">ശക</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">മ�ഹറം</month>
-							<month type="2">സഫര��</month>
-							<month type="3">റബീഹ�ല�� അവ�വല��</month>
-							<month type="4">റബീഹ�ല�� ആഖിര��</month>
-							<month type="5">ജമാദ�ല�� അവ�വല��</month>
-							<month type="6">ജമാദ�ല�� ആഖിര��</month>
-							<month type="7">റജബ�</month>
-							<month type="8">ശഹബാന��</month>
-							<month type="9">റമളാന��</month>
-							<month type="10">ശവ�വാല��</month>
-							<month type="11">ദ�ല�� ഖഹദ�</month>
-							<month type="12">ദ�ല�� ഹിജ�ജ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">മ�</month>
-							<month type="2">à´¸</month>
-							<month type="3">à´±-à´…</month>
-							<month type="4">à´±-à´†</month>
-							<month type="5">ജ-അ</month>
-							<month type="6">ജ-ആ</month>
-							<month type="7">à´±</month>
-							<month type="8">à´¶</month>
-							<month type="9">à´±</month>
-							<month type="10">à´¶</month>
-							<month type="11">ദ�</month>
-							<month type="12">ദ�-ഹി</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">ഹിജറ</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} സമയം</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>അറിയപ�പെടാത�ത നഗരം</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>റൊതീറ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>പാമര��</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>ദക�ഷിണ ധ�രൂവം</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>സ�യോവ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>മാവ�സണ��</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>ഡെയ�‌വിസ�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>വോസ�റ�റോക�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>കാസെ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>ഡ�യൂമണ�ട� ഡി യ�ര��വില��</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>മാക�മര��ഡോ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>റിയോ ഗ�യാലഗോസ�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>മെന��ഡോസ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>സാന�� ജ�വാന��</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>ഉഷിയ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ലാ റിയോജ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>സാന�� ലൂയിസ�</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>�ക�യാറ�റമാര��ക�ക</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>ജ�ജ�യ�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>റ�റ�ക�മാന��</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>കൊര��ദോവ</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ബ�യൂനസ� �റിസ�</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>പെര��ത�ത�</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>യൂക�ല</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>ഡാര��വിന��</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>അഡലെയ�ഡ�</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ബ�രോക�കണ�� ഹില��</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>ക�യൂറി</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>മെല��ബണ��</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>ഹൊബാര��ട�ട�</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>ലിന��ഡെമാന��</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>സിഡ�നി</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ബ�രിസ�‌ബേയ�ന��</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>ലോഡ� ഹോവ�</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>യെറ�നീപ�പെ</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>റിയോ ബ�രാങ�കോ</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>പോര��ട�ടോ വെല�ലോ</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>ബോവ വിസ�റ�റ</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>മനൌസ�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>ക�യ�ബ</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>ക�യാന�പോ ഗ�രാന��ഡെ</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>ബെലം</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>അറഗ�വൈന</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>സാവോ പോലോ</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>ബഹിയ</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>ഫോര��ട�ടലീസ</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>മാസിയോ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>റെസീഫെ</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>നൊറോന</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>ഡോവ�സണ��</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>വൈറ�റ�ഹോഴ�സ�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>ഇന�വിക�</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>വാന��‌കൂവര��</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>ഡോവ�സണ�� ക�രീക�ക�</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>യെല�ലോനൈഫ�</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>എഡ�മോണ��ടണ��</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>സ�വിഫ�റ�റ� കറന��റ�</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>കെയ�ന�പ�രിഡ�ജ� ബേ</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>റിജീന</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>വിന�നിപെഗ�</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>റെസല�യൂട�ട�</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>റെയ�നി റിവര��</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>റാങ�കിന�� ഇന��ലെറ�റ�</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>കോറല�� ഹാര��ബര��</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>തണ�ടര�� ബേ</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>നിപ�പിഗോണ��</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>ടൊറണ�ടോ</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>മോണ�ട�രിയാല��</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>ഇഖാലിത�</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>പാന��ഗ�‌നിറ�റങ�</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>മോങ�റ�റണ��</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>ഹാലിഫാക�സ�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>ഗൂസ� ബേ</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>ഗ�ലെയ�സ� ബേ</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ബ�ലാങ�ക� സാബ�ലോണ��</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>സെയ�ന��റ� ജോണ��സ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>കിന��ഷാസ</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ലൂബ�ംബാഷി</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ഈസ�റ�റര��</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>കാഷ�ഗര��</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>ഉറ�ംഖി</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ചോങ�ഖിങ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>ഹാര��ബിന��</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>ഗാലപ�പാഗോസ�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>ക�യാനറി</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>ക�യൂട�ട</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ട�രക�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>പൊനാപ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>കൊസ�രേ</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>തൂളി</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>സ�കോര��സ�ബൈസണ�ട�</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>ഡാന��മാര��ക�ക�ഷാവ�ന��</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>ജക�കാര��ത�ത</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>പൊന��റിയാനക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>മകസ�സര��</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ജയപ�ര</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>എന��ഡബറി</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>കിരിതിമാത�തി</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>തരാവ</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>അഖ�തൌ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ഓറല��</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>അഖ�തോബ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>ഖിസിലോര��ഡ</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>അല��മതി</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>ക�വാജലെയ�ന��</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>മജൂറോ</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>ഹൌഡ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>ഉലാന��ബട�ടൂര��</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ചൊയ�ബല��സന��</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>തിയ�വാന</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>ഹെര��മോസില�ലോ</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>മാസറ�റ�ലാന��</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ചിവാവ�</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>മോണ�ടര��‌റേ</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>മെക�സിക�കോ സിറ�റി</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>മെരിഡ</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>കന��കൂന��</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>ക�ചിങ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>ചാത�തം</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>മാര��ക�യ�സാസ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>ഗാന�പിയര��</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>എയ�സോര��സ�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>മഡെയ�റ</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>ക�യാലിനിന��ഗ�രാഡ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>മോസ�കോ</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>വോള��ഗോഗ�രാഡ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>സമാറ</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>യാകാറ�റെറിന��ബര��ഗ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>ഒംസ�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>നൊവോസിബിര��സ�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>ക�രാസ�നോയാസ�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>ഇര��കസ�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>യാകസ�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>വ�ളാഡിവോസ�റ�റോക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>സഖാലിന��</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>മഗഡാന��</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>കാംചട�ക</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>അനാഡിര��</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>ഉസ�ഗൊറോഡ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>കീവ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>സിംഫെറോപോള��</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>സാപ�പറോസൈ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>മിഡ�‌വേ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>ജോണ��സ�റ�റണ��</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>വെയ�ക�</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>അഡാക�</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>നൌം</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>ഹോണലൂല�</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>ആങ�കറേജ�</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>യാക�റ�റാറ�റ�</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>ജ�നിയ�</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>ലോസ� എയ�ഞ�ചലസ�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>ബൊയ�സി</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ഫീനിക�സ�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>ഷിപ�പ�റോക�ക�</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>ഡെന��‌വര��</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>ന�യൂ സെയ�‌ലം, നോര��ത�ത� ഡക�കോട�ട</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>സെന��റര��, നോര��ത�ത� ഡക�കോട�ട</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ചിക�കാഗോ</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>മെനോമിനീ</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>വിന��സെന��സ�, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>പീറ�റേഴ�സ�ബര��ഗ�, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>റ�റെല�� സിറ�റി, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>നോക�സ�, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>വിനാമാക�, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>മരെങ�കോ, ഇന��ഡ�യാനാ</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>ഇന��ഡ�യാനാപോലീസ�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ലൂയിവില��</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>വിവെയ�, ഇന��ഡ�യാന</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>മോണ�ടിസെല�ലോ, കെന��റക�കി</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>ഡെട�രോയിറ�റ�</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>ന�യൂയോര��ക�ക�</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>സമര��ക�കന�ദ�</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>എയ�ക�കര�� സമയം</standard>
-					<daylight>എയ�ക�കര�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-				<short>
-					<standard>ACT (എയ�ക�കര��)</standard>
-					<daylight>ACST (എയ�ക�കര��)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>അഫ�ഗാനിസ�ഥാന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>മദ�ധ�യ ആഫ�രിക�കന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>കിഴക�കേ ആഫ�രിക�കന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>ദക�ഷിണാഫ�രിക�കന�� സമയം</generic>
-					<standard>ദക�ഷിണാഫ�രിക�കന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>പശ�ചിമാഫ�രിക�കന�� സമയം</standard>
-					<daylight>പശ�ചിമാഫ�രിക�കന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>അക�ത�യ�ബിന��സ�ക� സമയം</standard>
-					<daylight>അക�ത�യ�ബിന��സ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>അലാസ�ക�ക സമയം</generic>
-					<standard>അലാസ�ക സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>അലാസ�ക പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>അലാസ�ക-ഹവായി സമയം</generic>
-					<standard>അലാസ�ക-ഹവായി സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>അലാസ�ക-ഹവായി പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>അല��മതി സമയം</standard>
-					<daylight>അല��മതി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>ആമസോണ�� സമയം</standard>
-					<daylight>ആമസോണ�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>സെന��ട�രല�� സമയം</generic>
-					<standard>സെന��ട�രല�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>സെന��ട�രല�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>കിഴക�കന�� സമയം</generic>
-					<standard>കിഴക�കന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>കിഴക�കന�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>മൌണ�ടന�� സമയം</generic>
-					<standard>മൌണ�ടന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>മൌണ�ടന�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>പസഫിക� സമയം</generic>
-					<standard>പസഫിക� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>പസഫിക� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>അനാഡിര�� സമയം</standard>
-					<daylight>അനാഡിര�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>അഖ�തൌ സമയം</standard>
-					<daylight>അഖ�തൌ വേനല��ക�കാല സമയം</daylight>
-				</long>
-				<short>
-					<standard>AQTT (അഖ�തൌ)</standard>
-					<daylight>AQTST (അഖ�തൌ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>അഖ�തോബ� സമയം</standard>
-					<daylight>അഖ�തോബ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-				<short>
-					<standard>AQTT (അഖ�തോബ�)</standard>
-					<daylight>AQTST (അഖ�തോബ�)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>അറേബ�യന�� സമയം</generic>
-					<standard>അറേബ�യന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>അറേബ�യന�� പകല�� സമയം</daylight>
-				</long>
-				<short>
-					<generic>AT (അറേബ�യന��)</generic>
-					<standard>AST (അറേബ�യന��)</standard>
-					<daylight>ADT (അറേബ�യന��)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>അര��ജന��റീന സമയം</standard>
-					<daylight>അര��ജന��റീന വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>പശ�ചിമ അര��ജന��റീന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>അര��മേനിയ സമയം</standard>
-					<daylight>അര��മേനിയ വേനല��ക�കാല സമയം</daylight>
-				</long>
-				<short>
-					<standard>AMT (അര��മേനിയ)</standard>
-					<daylight>AMST (അര��മേനിയ)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>അഷ�ഖാബാദ� സമയം</standard>
-					<daylight>അഷ�ഖാബാദ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>അറ�റ�ലാന��റിക� സമയം</generic>
-					<standard>അറ�റ�ലാന��റിക� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>അറ�റ�ലാന��റിക� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>സെന��ട�രല�� ഓസ�ട�രേലിയ സമയം</generic>
-					<standard>ഓസ�ട�രേലിയന�� സെന��ട�രല�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ഓസ�ട�രേലിയന�� സെന��ട�രല�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>ഓസ�ട�രേലിയന�� സെന��ട�രല�� വെസ�റ�റേണ�� സമയം</generic>
-					<standard>ഓസ�ട�രേലിയന�� സെന��ട�രല�� വെസ�റ�റേണ�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ഓസ�ട�രേലിയന�� സെന��ട�രല�� വെസ�റ�റേണ�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>ഈസ�റ�റേണ�� ഓസ�ട�രേലിയ സമയം</generic>
-					<standard>ഓസ�ട�രേലിയന�� ഈസ�റ�റേണ�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ഓസ�ട�രേലിയന�� ഈസ�റ�റേണ�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>വെസ�റ�റേണ�� ഓസ�ട�രേലിയ സമയം</generic>
-					<standard>ഓസ�ട�രേലിയന�� �വെസ�റ�റേണ�� സ�റ�റാന��ഡേര��ഡ�</standard>
-					<daylight>ഓസ�ട�രേലിയന�� �വെസ�റ�റേണ�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>അസര��ബയ�ജാന�� സമയം</standard>
-					<daylight>അസര��ബയ�ജാന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>എയ�സോര��സ� സമയം</standard>
-					<daylight>എയ�സോര��സ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>ബാക� സമയം</standard>
-					<daylight>ബാക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>ബംഗ�ലാദേശ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>ബെറിങ� സമയം</generic>
-					<standard>ബെറിങ� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ബെറിങ� പകല�� സമയം</daylight>
-				</long>
-				<short>
-					<generic>BT (ബെറിങ� )</generic>
-					<standard>BST (ബെറിങ� )</standard>
-					<daylight>BDT (ബെറിങ� )</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>ഭൂട�ടാന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>ബൊളീവിയ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>ബോര��ണിയോ സമയം</standard>
-					<daylight>ബോര��ണിയോ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>ബ�രസീലിയ സമയം</standard>
-					<daylight>ബ�രസീലിയ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>ബ�രൂണെ ഡാറ�സ�സലാം സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>കെയ�പ� വെര��ഡെ സമയം</standard>
-					<daylight>കെയ�പ� വെര��ഡെ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>കമോറോ സമയം</generic>
-					<standard>കമോറോ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>ചാങ�ബയ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>ചാതം സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ചാതം വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>ചിലി സമയം</standard>
-					<daylight>ചിലി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>ചൈന സമയം</generic>
-					<standard>ചൈനാ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ചൈന പകല�� സമയം</daylight>
-				</long>
-				<short>
-					<generic>CT (ചൈന)</generic>
-					<standard>CST (ചൈന)</standard>
-					<daylight>CDT (ചൈന)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>ചോയ�ബല��സന�� സമയം</standard>
-					<daylight>ചോയ�ബല��സന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>ക�രിസ�മസ� ദ�വീപ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>കൊക�കോസ� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>കൊളംബിയ സമയം</standard>
-					<daylight>കൊളംബിയ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>ക�ക�ക� ദ�വീപ�കള�� സമയം</standard>
-					<daylight>ക�ക�ക� ദ�വീപ�കള�� അര��ദ�ധ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>ക�യൂബ സമയം</generic>
-					<standard>ക�യൂബ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ക�യൂബ പകല�� സമയം</daylight>
-				</long>
-				<short>
-					<generic>CST (ക�യൂബ )</generic>
-					<standard>CST (ക�യൂബ)</standard>
-					<daylight>CDT (ക�യൂബ )</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>ഡാക�ക സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>ഡെയ�‌വിസ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>ഡ�യൂമണ�ട� ഡി യൂര��വില�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>ദ�ഷാന��ബെ സമയം</standard>
-					<daylight>ദ�ഷാന��ബെ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>ഡച�ച� ഗയാന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>കിഴക�കന�� തിമൂര�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>ഈസ�റ�റര�� ദ�വീപ� സമയം</standard>
-					<daylight>ഈസ�റ�റര�� ദ�വീപ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>ഇക�വഡോര�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>സെന��ട�രല�� യൂറോപ�യന�� സമയം</standard>
-					<daylight>സെന��ട�രല�� യൂറോപ�യന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>കിഴക�കന�� യൂറോപ�യന�� സമയം</standard>
-					<daylight>കിഴക�കന�� യൂറോപ�യന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>ഫാക�‌ലാന��ഡ� ദ�വീപ�കള�� സമയം</standard>
-					<daylight>ഫാക�‌ലാന��ഡ� ദ�വീപ�കള�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>ഫിജി സമയം</standard>
-					<daylight>ഫിജി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>ഫ�രെഞ�ച� ഗയാന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>ഫ�രെഞ�ച� സതേണ�� ആന��ഡ� അന��റാര��ട�ടിക� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>ഫ�രൂന��സ� സമയം</standard>
-					<daylight>ഫ�രൂന��സ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>ഗാലപ�പാഗോസ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>ഗാന�പിയര�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>ജോര��ജ�ജിയ സമയം</standard>
-					<daylight>ജോര��ജ�ജിയ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>ഗില��ബര��ട�ട� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>സെന��ട�രല�� ഗ�രീന��ലാന��ഡ� സമയം</standard>
-					<daylight>സെന��ട�രല�� ഗ�രീന��ലാന��ഡ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>കിഴക�കന�� ഗ�രീന��ലാന��ഡ� സമയം</standard>
-					<daylight>കിഴക�കന�� ഗ�രീന��ലാന��ഡ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>പശ�ചിമ ഗ�രീന��ലാന��ഡ� സമയം</standard>
-					<daylight>പശ�ചിമ ഗ�രീന��ലാന��ഡ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>ഗ�വാം സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-				<short>
-					<standard>GST (ഗ�വാം)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>ഗള��ഫ� സമയം</generic>
-					<standard>ഗള��ഫ� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>ഗയാന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>ഹവായി-അലൂഷ�യന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>ഹോങ� കോങ� സമയം</standard>
-					<daylight>ഹോങ� കോങ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>ഹൌഡ� സമയം</standard>
-					<daylight>ഹൌഡ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>ഇന��‌ഡ�യ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>ഇന��ഡ�യന�� മഹാസമ�ദ�ര സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>ഇന��ഡോചൈന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>സെന��ട�രല�� ഇന��ഡോനേഷ�യ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>കിഴക�കന�� ഇന��ഡോനേഷ�യ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>പശ�ചിമ ഇന��ഡോനേഷ�യ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>ഇറാന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ഇറാന�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>ഇര��കസ�ക� സമയം</standard>
-					<daylight>ഇര��കസ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>ഇസ�രായേല�� സമയം</generic>
-					<standard>ഇസ�രായേല�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ഇസ�രായേല�� പകല�� സമയം</daylight>
-				</long>
-				<short>
-					<standard>IST (ഇസ�രായേല��)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>ജപ�പാന�� സമയം</generic>
-					<standard>ജപ�പാന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ജപ�പാന�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>പെട�രോപാവ�‌ലോസ�ക� കംചാസ�കി സമയം</standard>
-					<daylight>പെട�രോപാവ�‌ലോസ�ക� കംചാസ�കി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>കറാച�ചി സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>കാഷ�ഗര�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>കിഴക�കന�� കസാഖ�സ�ഥാന�� സമയം</generic>
-					<standard>കിഴക�കന�� കസാഖ�സ�ഥാന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>പടിഞ�ഞാറന�� കസാഖ�സ�ഥാന�� സമയം</generic>
-					<standard>പടിഞ�ഞാറന�� കസാഖ�സ�ഥാന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>കിസിലോര��ഡ സമയം</standard>
-					<daylight>കിസിലോര��ഡ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>കൊറിയന�� സമയം</generic>
-					<standard>കൊറിയന�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>കൊറിയന�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>കൊസ�റേ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>ക�രാസ�നോയാഴ�സ�ക� സമയം</standard>
-					<daylight>ക�രാസ�നോയാഴ�സ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>ക�യ�ബൈഷെവ� സമയം</standard>
-					<daylight>ക�യ�ബൈഷെവ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>ക�വാജലെയ�ന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>കിര��ഗിസ�ഥാന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>ലങ�ക സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>ലൈന�� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>ലോങ�-ഷ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>ലോര��ഡ� ഹോവ� സമയം</generic>
-					<standard>ലോര��ഡ� ഹോവ� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ലോര��ഡ� ഹോവ� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>മകൌ സമയം</standard>
-					<daylight>മകൌ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>മഗാഡന�� സമയം</standard>
-					<daylight>മഗാഡന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>മലയ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>മലേഷ�യ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>മാലിദ�വീപ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>മാര��ക�യ�സാസ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>മാര��ഷല�� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>മൌറിഷ�യസ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>മാവ�സണ�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>യ�ലാന�� ബാറ�റര�� സമയം</standard>
-					<daylight>യ�ലാന�� ബാറ�റര�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>മോസ�കോ സമയം</generic>
-					<standard>മോസ�കോ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>മോസ�കോ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>മ�യാന��മാര�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>നൌറ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>നേപ�പാള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>ന�യൂ കാലിഡോണിയ സമയം</standard>
-					<daylight>ന�യൂ കാലിഡോണിയ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>ന�യൂസീലന��ഡ� സമയം</generic>
-					<standard>ന�യൂസീലന��ഡ� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ന�യൂസീലന��ഡ� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>ന�യൂഫൌണ�ട�‌ലാന��ഡ� സമയം</generic>
-					<standard>ന�യൂഫൌണ�ട�‌ലാന��ഡ� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>ന�യൂഫൌണ�ട�‌ലാന��ഡ� പകല��‌ സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>നിയ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>നോര��ഫോക� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>ഫെര��ണാണ�ടോ ഡി നൊറോന സമയം</standard>
-					<daylight>ഫെര��ണാണ�ടോ ഡി നൊറോന വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>നോര��ത�ത� മറിയാനാ ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>നോവോസിബിര��സ�ക� സമയം</standard>
-					<daylight>നോവോസിബിര��സ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>ഓംസ�ക� സമയം</standard>
-					<daylight>ഓംസ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>പാകിസ�ഥാന�� സമയം</standard>
-					<daylight>പാകിസ�ഥാന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>പലൌ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>പാപ�യ� ന�യൂ ഗിനിയ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>പരാഗ�വേ സമയം</standard>
-					<daylight>പരാഗ�വേ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>പെറ� സമയം</standard>
-					<daylight>പെറ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>ഫിലിപ�പീന�� സമയം</standard>
-					<daylight>ഫിലിപ�പീന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>ഫീനിക�സ� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>പിയറി ആന��ഡ� മിക�വിലോണ�� സമയം</generic>
-					<standard>പിയറി ആന��ഡ� മിക�വിലോണ�� സ�റ�റാന��ഡേര��ഡ�സമയം</standard>
-					<daylight>പിയറി ആന��ഡ� മിക�വിലോണ�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>പിറ�റ�കെയ�ന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>പൊനാപ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>ഖിസിലോര��ഡ സമയം</standard>
-					<daylight>ഖിസിലോര��ഡ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>റീയൂണിയന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>റൊതീറ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>സഖാലിന�� സമയം</standard>
-					<daylight>സഖാലിന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>സമാറ സമയം</standard>
-					<daylight>സമാറ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>സമര��കന�ദ� സമയം</standard>
-					<daylight>സമര��കന�ദ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-				<short>
-					<standard>SAMT (സമര��കന�ദ� )</standard>
-					<daylight>SAMST (സമര��കന�ദ� )</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>സമോവാ സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>സെയ�ഷെല��സ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>ഷെവ�ചെങ�കോ സമയം</standard>
-					<daylight>ഷെവ�ചെങ�കോ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>സിങ�കപ�പൂര�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>സോളമന�� ദ�വീപ�കള�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>ദക�ഷിണ ജോര��ജ�ജിയ സമയം</standard>
-				</long>
-				<short>
-					<standard>GST (ദക�ഷിണ ജോര��ജ�ജിയ)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>സൂറിനാം സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>സ�‌വേഡ�‌ലോവ�സ�ക� സമയം</standard>
-					<daylight>സ�‌വേഡ�‌ലോവ�സ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>സ�യോവ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>തഹിതി സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>തജികിസ�ഥാന�� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>താഷ�കന�ദ� സമയം</standard>
-					<daylight>താഷ�കന�ദ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>തിബിലീസി സമയം</standard>
-					<daylight>തിബിലീസി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>റ�റോക�കിലൌ സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>റ�റോംഗാ സമയം</standard>
-					<daylight>റ�റോംഗാ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>ട�രക�ക� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>ത�ര��ക�കി സമയം</standard>
-					<daylight>ത�ര��ക�കി വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>ത�ര��ക�ക�മെനിസ�ഥാന�� സമയം</standard>
-					<daylight>ത�ര��ക�ക�മെനിസ�ഥാന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>ത�വാല� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>യ�റാല��സ�ക� സമയം</standard>
-					<daylight>യ�റാല��സ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>ഉറ�ഗ�വെ സമയം</standard>
-					<daylight>ഉറ�ഗ�വെ വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>ഉറ�ംഖി വേനല��‌ക�കാല സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>ഉസ�ബക�കിസ�ഥാന�� സമയം</standard>
-					<daylight>ഉസ�ബക�കിസ�ഥാന�� വേനല��‌ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>വന�വാത� സമയം</standard>
-					<daylight>വന�വാത� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>വെനസ�വേല സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>വ�‌ളാഡിവോസ�റ�റോക� സമയം</standard>
-					<daylight>വ�‌ളാഡിവോസ�റ�റോക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>വോള��ഗോഗ�രാഡ� സമയം</standard>
-					<daylight>വോള��ഗോഗ�രാഡ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>വോസ�റ�റോക� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>വെയ�ക� ദ�വീപ� സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>വാലിസ� ആന��ഡ� ഫ�യൂച�ന സമയം</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>യാകസ�ക� സമയം</standard>
-					<daylight>യാകസ�ക� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>യെക�കാറ�ററിന��ബര��ഗ� സമയം</standard>
-					<daylight>യെക�കാറ�ററിന��ബര��ഗ� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>യെരെവാന�� സമയം</standard>
-					<daylight>യെരെവാന�� വേനല��ക�കാല സമയം</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>യൂക�കോണ�� സമയം</generic>
-					<standard>യൂക�കോണ�� സ�റ�റാന��ഡേര��ഡ� സമയം</standard>
-					<daylight>യൂക�കണ�� പകല�� സമയം</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##,##0.00¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>അന��ഡോറന�� പെസെയ�റ�റ</displayName>
-				<displayName count="one">അന��ഡോറന�� പെസെയ�റ�റ</displayName>
-				<displayName count="other">അന��ഡോറന�� പെസെയ�റ�റാസ�</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>യ�.എ.ഇ. ദിര��ഹം</displayName>
-				<displayName count="one">യ�.എ.ഇ. ദിര��ഹം</displayName>
-				<displayName count="other">യ�.എ.ഇ. ദിര��ഹംസ�</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>അഫ�ഘാനി (1927-2002)</displayName>
-				<displayName count="one">അഫ�ഘാനി (AFA)</displayName>
-				<displayName count="other">അഫ�ഘാനിസ� (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>അഫ�ഘാനി</displayName>
-				<displayName count="one">അഫ�ഘാനി</displayName>
-				<displayName count="other">അഫ�ഘാനിസ�</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>അല��ബേനിയന�� ലെക�</displayName>
-				<displayName count="one">അല��ബേനിയന�� ലെക�</displayName>
-				<displayName count="other">അല��ബേനിയന�� ലെക�സ�</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>അര��മേനിയന�� ഡ�രാം</displayName>
-				<displayName count="one">അര��മേനിയന�� ഡ�രാം</displayName>
-				<displayName count="other">അര��മേനിയന�� ഡ�രാംസ�</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>നെതര��ലന��ഡ�സ� ആന��റിലന�� ഗില��ഡര��</displayName>
-				<displayName count="one">നെതര��ലന��ഡ�സ� ആന��ഡിലന�� ഗില��ഡര��</displayName>
-				<displayName count="other">നെതര��ലന��ഡ�സ� ആന��ഡിലന�� ഗില��ഡേഴ�സ�</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>അംഗോളന�� �ക�വാന��സ</displayName>
-				<displayName count="one">അംഗോളന�� ക�വാന��സ</displayName>
-				<displayName count="other">അംഗോളന�� ക�വാന��സാസ�</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>അംഗോളന�� �ക�വാന��സ (1977-1990)</displayName>
-				<displayName count="one">അംഗോളന�� ക�വാന��സാ (AOK)</displayName>
-				<displayName count="other">അംഗോളന�� ക�വാന��സാസ� (AOK</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>അംഗോളന�� �ന�യൂ ക�വാന��സ (1990-2000)</displayName>
-				<displayName count="one">അംഗോളന�� ന�യൂ ക�വാന��സാ (AON)</displayName>
-				<displayName count="other">അംഗോളന�� ന�യൂ ക�വാന��സാസ� (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>അംഗോളന�� �ക�വാന��സ റിയാജസ�റ�റാഡോ (1995-1999)</displayName>
-				<displayName count="one">അംഗോളന�� ക�വാന��സ റീഅഡ�ജസ�റ�റാഡോ (AOR)</displayName>
-				<displayName count="other">അംഗോളന�� ക�വാന��സാസ� റീഅഡ�ജസ�റ�റാഡോ (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>അര��ജന��റീന�� ഓസ�ട�രല��</displayName>
-				<displayName count="one">അര��ജന��റീന�� ഓസ�ട�രല��</displayName>
-				<displayName count="other">അര��ജന��റീന�� ഓസ�ട�രല��സ�</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>അര��ജന��റീന�� പെയ�സോ (1983-1985)</displayName>
-				<displayName count="one">അര��ജന��റീന�� പെയ�സോ (ARP)</displayName>
-				<displayName count="other">അര��ജന��റീന�� പെയ�സോസ� (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>അര��ജന��റീന�� പെയ�സോ</displayName>
-				<displayName count="one">അര��ജന��റീന�� പെയ�സോ</displayName>
-				<displayName count="other">അര��ജന��റീന�� പെയ�സോസ�</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>ഓസ�ട�രേലിയന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="one">ഓസ�ട�രിയന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="other">ഓസ�ട�രിയന�� ഷില�ലിംഗ�സ�</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>ആസ�ട�രേലിയന�� ഡോളര��</displayName>
-				<displayName count="one">ഓസ�ട�രേലിയന�� ഡോളര��</displayName>
-				<displayName count="other">ഓസ�ട�രേലിയന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>അറൂബന�� ഗില��ഡര��</displayName>
-				<displayName count="one">അറൂബന�� ഗില��ഡര��</displayName>
-				<displayName count="other">അറൂബന�� ഗില��ഡേഴ�സ�</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>അസര��ബയ�ജാനിയന�� മനത� (1993-2006)</displayName>
-				<displayName count="one">അസര��ബയ�ജാന�� മനത�‌ (AZM)</displayName>
-				<displayName count="other">അസര��ബയ�ജാന�� മനത�‌സ� (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>അസര��ബയ�ജാനിയന�� മനത�</displayName>
-				<displayName count="one">അസര��ബയ�ജാന�� മനത�</displayName>
-				<displayName count="other">അസര��ബയ�ജാന�� മനത�‌സ�</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>ബോസ�നിയ-ഹെര��സഗോവിന ദിനാര��</displayName>
-				<displayName count="one">ബോസ�നിയ ഹെര��സഗോവിന ദിനാര��</displayName>
-				<displayName count="other">ബോസ�നിയ ഹെര��സഗോവിന ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>ബോസ�നിയ-ഹെര��സഗോവിന കണ��വേര��ട�ടിബിള�� മാര��ക�ക�</displayName>
-				<displayName count="one">ബോസ�നിയ ഹെര��സഗോവിന കണ��വേര��ട�ടിബിള�� മാര��ക�ക�</displayName>
-				<displayName count="other">ബോസ�നിയ ഹെര��സഗോവിന കണ��വേര��ട�ടിബിള�� മാര��ക�സ�</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>ബാര��ബഡോസ� ഡോളര��</displayName>
-				<displayName count="one">ബാര��ബഡോസ� ഡോളര��</displayName>
-				<displayName count="other">ബാര��ബഡോസ� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>ബംഗ�ലാദേശി ടാക�ക</displayName>
-				<displayName count="one">ബംഗ�ലാദേശ� താക�കാ</displayName>
-				<displayName count="other">ബംഗ�ലാദേശ� താക�കാസ�</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>ബെല��ജിയന�� ഫ�രാങ�ക� (കൈമാറ�റം ചെയ�യാവ�ന�നത�)</displayName>
-				<displayName count="one">ബെല��ജിയന�� ഫ�രാങ�ക� (കൈമാറ�റം ചെയ�യാവ�ന�നത�)</displayName>
-				<displayName count="other">ബെല��ജിയന�� ഫ�രാങ�ക�സ� (കൈമാറ�റം ചെയ�യാവ�ന�നത�)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>ബെല��ജിയന�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ബെല��ജിയന�� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ബെല��ജിയന�� ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>ബല��ജിയന�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ബെല��ജിയന�� ഫ�രാങ�ക� (ഫിനാന��ഷ�യല��)</displayName>
-				<displayName count="other">ബെല��ജിയന�� ഫ�രാങ�ക�സ�(ഫിനാന��ഷ�യല��)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>ബള��ഗേറിയന�� ഹാര��ഡ� ലെവ�</displayName>
-				<displayName count="one">ബള��ഗേറിയന�� ഹാര��ഡ� ലെവ�</displayName>
-				<displayName count="other">ബള��ഗേറിയന�� ഹാര��ഡ� ലെവ�സ�</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>ബള��ഗേറിയന�� ന�യൂലവ�</displayName>
-				<displayName count="one">ബള��ഗേറിയന�� ന�യൂ ലെവ�</displayName>
-				<displayName count="other">ബള��ഗേറിയന�� ന�യൂ ലെവ�സ�</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>ബഹറിന�� ദിനാര��</displayName>
-				<displayName count="one">ബഹ�റൈന�� ദിനാര��</displayName>
-				<displayName count="other">ബഹ�റൈന�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ബ�റ�ണ�ടി ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ബ�റ�ണ�ടി ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ബ�റ�ണ�ടി ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>ബെര��മ�ഡന�� ഡോളര��</displayName>
-				<displayName count="one">ബെര��മ�ഡന�� ഡോളര��</displayName>
-				<displayName count="other">ബെര��മ�ഡന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ബ�രൂണെ ഡോളര��</displayName>
-				<displayName count="one">ബ�രൂണെ ഡോളര��</displayName>
-				<displayName count="other">ബ�രൂണെ ഡോളറ�കള��</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>ബൊളീവിയാനോ</displayName>
-				<displayName count="one">ബൊളീവിയാനോ</displayName>
-				<displayName count="other">ബൊളീവിയാനോസ�</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>ബൊളീവിയന�� പെയ�സോ</displayName>
-				<displayName count="one">ബൊളീവിയന�� പെയ�സോ</displayName>
-				<displayName count="other">ബൊളീവിയന�� പെയ�സോസ�</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>ബൊളീവിയന�� എംവിഡോള��</displayName>
-				<displayName count="one">ബൊളീവിയന�� എംവിഡോ</displayName>
-				<displayName count="other">ബൊളീവിയന�� എംവിഡോസ�</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>ബ�രസീലിയന�� ക�ര�സെയ�റോ നോവോ (1967-1986)</displayName>
-				<displayName count="one">ബ�രസീലിയന�� ക�ര�സെയ�റോ നോവോ (BRB)</displayName>
-				<displayName count="other">ബ�രസീലിയന�� ക�ര�സെയ�റോസ� നോവോ (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>ബ�രസീലിയന�� ക�ര�സാഡോ</displayName>
-				<displayName count="one">ബ�രസീലിയന�� ക�ര�സാഡോ</displayName>
-				<displayName count="other">ബ�രസീലിയന�� ക�ര�സാഡോസ�</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>ബ�രസീലിയന�� ക�ര�സെയ�റോ (1990-1993)</displayName>
-				<displayName count="one">ബ�രസീലിയന�� ക�ര�സെയ�റോ (BRE)</displayName>
-				<displayName count="other">ബ�രസീലിയന�� ക�ര�സെയ�റോസ� (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ബ�രസീലിയന�� റിയാല��</displayName>
-				<displayName count="one">ബ�രസീലിയന�� റിയാല��</displayName>
-				<displayName count="other">ബ�രസീലിയന�� റിയാല��സ�</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>ബ�രസീലിയന�� ക�ര�സാഡോ നോവോ</displayName>
-				<displayName count="one">ബ�രസീലിയന�� ക�ര�സാഡോ നോവോ</displayName>
-				<displayName count="other">ബ�രസീലിയന�� ക�ര�സാഡോ നോവോസ�</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>ബ�രസീലിയന�� ക�ര�സെയ�റോ</displayName>
-				<displayName count="one">ബ�രസീലിയന�� ക�ര�സെയ�റോ</displayName>
-				<displayName count="other">ബ�രസീലിയന�� ക�ര�സെയ�റോസ�</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>ബഹാമിയന�� ഡോളര��</displayName>
-				<displayName count="one">ബഹാമിയന�� ഡോളര��</displayName>
-				<displayName count="other">ബഹാമിയന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ഭൂട�ടാന�� എന��ഗള��ട�രം</displayName>
-				<displayName count="one">ഭൂട�ടാന�� എന��ഗള��ട�രം</displayName>
-				<displayName count="other">ഭൂട�ടാന�� എന��ഗള��ട�രംസ�</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>ബര��മീസ� ചാറ�റ�</displayName>
-				<displayName count="one">ബര��മീസ� ചാറ�റ�</displayName>
-				<displayName count="other">ബര��മീസ� ചാറ�റ�സ�</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>ബോട�സ�വാനന�� പ�യൂല</displayName>
-				<displayName count="one">ബോട�സ�വാനന�� പ�യൂല</displayName>
-				<displayName count="other">ബോട�സ�വാനന�� പ�യൂലാസ�</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>ബെലാറഷ�യന�� ന�യൂ റൂബിള�� (1994-1999)</displayName>
-				<displayName count="one">ബെലാറഷ�യന�� ന�യൂ റൂബിള�� (BYB)</displayName>
-				<displayName count="other">ബെലാറഷ�യന�� ന�യൂ റൂബിള��സ� (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>ബെലാറഷ�യന�� റൂബിള��</displayName>
-				<displayName count="one">ബെലാറഷ�യന�� റൂബിള��</displayName>
-				<displayName count="other">ബെലാറഷ�യന�� റൂബിള��സ�</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>ബെലീസ� ഡോളര��</displayName>
-				<displayName count="one">ബെലീസ� ഡോളര��</displayName>
-				<displayName count="other">ബെലീസ� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>കനേഡിയന�� ഡോളര��</displayName>
-				<displayName count="one">കനേഡിയന�� ഡോളര��</displayName>
-				<displayName count="other">കനേഡിയന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>കോങ�കളീസ� ഫ�രാങ�ക� കോങ�കൊളൈസ�</displayName>
-				<displayName count="one">കോങ�കളീസ� ഫ�രാങ�ക� കോങ�കൊളൈസ�</displayName>
-				<displayName count="other">കോങ�കളീസ� ഫ�രാങ�ക�സ� കോങ�കൊളൈസ�</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR യൂറോ</displayName>
-				<displayName count="one">WIR യൂറോ</displayName>
-				<displayName count="other">WIR യൂറോസ�</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>സ�വിസ� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">സ�വിസ� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">സ�വിസ� ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR ഫ�രാങ�ക�</displayName>
-				<displayName count="one">WIR ഫ�രാങ�ക�</displayName>
-				<displayName count="other">WIR ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>ചിലിയന�� യൂണിഡാഡ�സ� ഡി ഫോമെന��റോ</displayName>
-				<displayName count="one">ചിലിയന�� യൂണിഡാഡ�സ� ഡി ഫോമെന��റോ</displayName>
-				<displayName count="other">ചിലിയന�� യൂണിഡാഡ�സ� ഡി ഫോമെന��റോസ�</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>ചിലിയന�� പെസോ</displayName>
-				<displayName count="one">ചിലിയന�� പെസോ</displayName>
-				<displayName count="other">ചിലിയന�� പെസോസ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>ചൈനീസ� യ�വാന��</displayName>
-				<displayName count="one">ചൈനീസ� യ�വാന��</displayName>
-				<displayName count="other">ചൈനീസ� യ�വാന��</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>കൊളംബിയന�� പെസോ</displayName>
-				<displayName count="one">കൊളംബിയന�� പെസോ</displayName>
-				<displayName count="other">കൊളംബിയന�� പെസോസ�</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>യൂണിഡാഡ� ഡി വാലര�� റിയല��</displayName>
-				<displayName count="one">യൂണിഡാഡ� ഡി വാലര�� റിയല��</displayName>
-				<displayName count="other">യൂണിഡാഡ� ഡി വാലര�� റിയല��സ�</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>കോസ�റ�റാ റിക�കന�� കോളന��</displayName>
-				<displayName count="one">കോസ�റ�റാ റിക�കന�� കോളന��</displayName>
-				<displayName count="other">കോസ�റ�റാ റിക�കന�� കോളന��സ�</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>പ�രാചീന സെര��ബിയന�� ദിനാര��</displayName>
-				<displayName count="one">പ�രാചീന സെര��ബിയന�� ദിനാര��</displayName>
-				<displayName count="other">പ�രാചീന സെര��ബിയന�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>ചെക�കോസ�ലൊവാക�ക� ഹാര��ഡ� കൊരൂന</displayName>
-				<displayName count="one">ചെക�കോസ�ലൊവാക�ക� ഹാര��ഡ� കൊരൂന</displayName>
-				<displayName count="other">ചെക�കോസ�ലൊവാക�ക� ഹാര��ഡ� കൊരൂനാസ�</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>ക�യൂബന�� പെസോ</displayName>
-				<displayName count="one">ക�യൂബന�� പെസോ</displayName>
-				<displayName count="other">ക�യൂബന�� പെസോസ�</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>കെയ�പ� വെര��ഡെ എസ�ക�യ�ഡോ</displayName>
-				<displayName count="one">കെയ�പ� വെര��ഡെ എസ�ക�യ�ഡോ</displayName>
-				<displayName count="other">കെയ�പ� വെര��ഡെ എസ�ക�യ�ഡോസ�</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>സൈപ�രസ� പൌണ�ട�</displayName>
-				<displayName count="one">സൈപ�രസ� പൌണ�ട�</displayName>
-				<displayName count="other">സൈപ�രസ� പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>ചെക�ക� റിപ�പബ�ലിക� കൊരൂന</displayName>
-				<displayName count="one">ചെക�ക� റിപ�പബ�ലിക� കൊരൂന</displayName>
-				<displayName count="other">ചെക�ക� റിപ�പബ�ലിക� കൊരൂനാസ�</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>കിഴക�കന�� ജര��മന�� ഓസ�റ�റ�മാര��ക�ക�</displayName>
-				<displayName count="one">കിഴക�കന�� ജര��മന�� ഓസ�റ�റ�മാര��ക�ക�</displayName>
-				<displayName count="other">കിഴക�കന�� ജര��മന�� ഓസ�റ�റ�മാര��ക�ക�സ�</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>ജര��മന�� മാര��ക�ക�</displayName>
-				<displayName count="one">ജര��മന�� മാര��ക�ക�</displayName>
-				<displayName count="other">ജര��മന�� മാര��ക�ക�സ�</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>ജീബോട�ടി ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ജീബോട�ടി ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ജീബോട�ടി ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>ഡാനിഷ� ക�രോണെ</displayName>
-				<displayName count="one">ഡാനിഷ� ക�രോണ��</displayName>
-				<displayName count="other">ഡാനിഷ� ക�രോണ��സ�</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>ഡൊമിനിക�കന�� പെയ�സോ</displayName>
-				<displayName count="one">ഡൊമിനിക�കന�� പെയ�സോ</displayName>
-				<displayName count="other">ഡൊമിനിക�കന�� പെയ�സോസ�</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>അള��ജീരിയന�� ദിനാര��</displayName>
-				<displayName count="one">അള��ജീരിയന�� ദിനാര��</displayName>
-				<displayName count="other">അള��ജീരിയന�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ഇക�വഡോര�� സൂക�രേ</displayName>
-				<displayName count="one">ഇക�വഡോര�� സൂക�രേ</displayName>
-				<displayName count="other">ഇക�വഡോര�� സൂക�രേസ�</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ഇക�വഡോര�� യൂണിഡാഡ� വാലര�� കോണ��സ�റ�റന��റെ (UVC)</displayName>
-				<displayName count="one">ഇക�വഡോര�� യൂണിഡാഡ� ഡി വാലര�� കോണ��സ�റ�റന��റെ (UVC)</displayName>
-				<displayName count="other">ഇക�വഡോര�� യൂണിഡാഡ�സ� ഡി വാലര�� കോണ��സ�റ�റന��റെ (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>എസ�റ�റൌനിയന�� ക�രൂണ��</displayName>
-				<displayName count="one">എസ�റ�റൌനിയന�� ക�രൂണ��</displayName>
-				<displayName count="other">എസ�റ�റൌനിയന�� ക�രൂണ��സ�</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>ഈജിപ�ഷ�യന�� പൌണ�ട�</displayName>
-				<displayName count="one">ഈജിപ�ഷ�യന�� പൌണ�ട�</displayName>
-				<displayName count="other">ഈജിപ�ഷ�യന�� പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>എറിത�രിയന�� നക�ഫ</displayName>
-				<displayName count="one">എറിത�രിയന�� നക�ഫ</displayName>
-				<displayName count="other">എറിത�രിയന�� നക�ഫാസ�</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>സ�പാനിഷ� പസെയ�റ�റ (A അക�കൌണ�ട�)</displayName>
-				<displayName count="one">സ�പാനിഷ� പസെയ�റ�റ (A അക�കൌണ�ട�)</displayName>
-				<displayName count="other">സ�പാനിഷ� പസെയ�റ�റാസ� (A അക�കൌണ�ട�)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>സ�പാനിഷ� പസെയ�റ�റ (കൈമാറ�റം ചെയ�യാവ�ന�ന അക�കൌണ�ട�)</displayName>
-				<displayName count="one">സ�പാനിഷ� പസെയ�റ�റ (കൈമാറ�റം ചെയ�യാവ�ന�ന അക�കൌണ�ട�)</displayName>
-				<displayName count="other">സ�പാനിഷ� പസെയ�റ�റാസ� (കൈമാറ�റം ചെയ�യാവ�ന�ന അക�കൌണ�ട�)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>സ�പാനിഷ� പസെയ�റ�റ</displayName>
-				<displayName count="one">സ�പാനിഷ� പസെയ�റ�റ</displayName>
-				<displayName count="other">സ�പാനിഷ� പസെയ�റ�റാസ�</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>എത�യോപ�പിയന�� ബിര��</displayName>
-				<displayName count="one">എത�യോപ�പിയന�� ബിര��</displayName>
-				<displayName count="other">എത�യോപ�പിയന�� ബിര��സ�</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>യൂറോ</displayName>
-				<displayName count="one">യൂറോ</displayName>
-				<displayName count="other">യൂറോസ�</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>ഫിന�നിഷ� മാര��ക�ക</displayName>
-				<displayName count="one">ഫിന�നിഷ� മാര��ക�ക</displayName>
-				<displayName count="other">ഫിന�നിഷ� മാര��ക�കാസ�</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>ഫിജി ഡോളര��</displayName>
-				<displayName count="one">ഫിജി ഡോളര��</displayName>
-				<displayName count="other">ഫിജി ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>ഫോക�‌ലാന��ഡ� ദ�വീപ�കള�ടെ പൌണ�ട�</displayName>
-				<displayName count="one">ഫോക�‌ലാന��ഡ� ദ�വീപ�കള�ടെ പൌണ�ട�</displayName>
-				<displayName count="other">ഫോക�‌ലാന��ഡ� ദ�വീപ�കള�ടെ പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ഫ�രെഞ�ച� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ഫ�രെഞ�ച� ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ബ�രിട�ടീഷ� പൌണ�ട� സ�റ�റെര��ലിംങ�</displayName>
-				<displayName count="one">ബ�രിട�ടീഷ� പൌണ�ട� സ�റ�റെര��ലിംഗ�</displayName>
-				<displayName count="other">ബ�രിട�ടീഷ� പൌണ�ട� സ�റ�റെര��ലിംഗ�സ�</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>ജോര���ജ�ജിയന�� ക�യൂപോണ�� ലാരിറ�റ�</displayName>
-				<displayName count="one">ജോര���ജ�ജിയന�� ക�യൂപോണ�� ലാരിറ�റ�</displayName>
-				<displayName count="other">ജോര���ജ�ജിയന�� ക�യൂപോണ�� ലാരിറ�റ�സ�</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>ജോര���ജ�ജിയന�� ലാരി</displayName>
-				<displayName count="one">ജോര���ജ�ജിയന�� ലാരി</displayName>
-				<displayName count="other">ജോര���ജ�ജിയന�� ലാരിസ�</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ഘാന കെഡി (1979-2007)</displayName>
-				<displayName count="one">ഘാന കെഡി (GHC)</displayName>
-				<displayName count="other">ഘാന കെഡിസ� (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>ഘാന കെഡി</displayName>
-				<displayName count="one">ഘാന കെഡി</displayName>
-				<displayName count="other">ഘാന കെഡിസ�</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>ഗിബ�രാല��ട�ടര�� പൌണ�ട�</displayName>
-				<displayName count="one">ഗിബ�രാല��ട�ടര�� പൌണ�ട�</displayName>
-				<displayName count="other">ഗിബ�രാല��ട�ടര�� പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>ഗാന�പിയ ദലാസി</displayName>
-				<displayName count="one">ഗാന�പിയ ദലാസി</displayName>
-				<displayName count="other">ഗാന�പിയ ദലാസിസ�</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>ഗിനിയ ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ഗിനിയ ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ഗിനിയ ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>ഗിനിയ സൈലി</displayName>
-				<displayName count="one">ഗിനിയ സൈലി</displayName>
-				<displayName count="other">ഗിനിയ സൈലിസ�</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ഇക�വിറ�റോറിയല�� ഗിനിയ എക�വീലെ ഗിനിയാന</displayName>
-				<displayName count="one">ഇക�വിറ�റോറിയല�� ഗിനി എക�വീലെ</displayName>
-				<displayName count="other">ഇക�വിറ�റോറിയല�� ഗിനി എക�വീലെ</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>ഗ�രീക�ക� ഡ�രാക�ക�മ</displayName>
-				<displayName count="one">ഗ�രീക�ക� ഡ�രാക�ക�മ</displayName>
-				<displayName count="other">ഗ�രീക�ക� ഡ�രാക�ക�മാസ�</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>ഗ�വാട�ടിമാല ക�വെറ�റ�സല��</displayName>
-				<displayName count="one">ഗ�വാട�ടിമാല ക�വെറ�റ�സല��</displayName>
-				<displayName count="other">ഗ�വാട�ടിമാല ക�വെറ�റ�സല��സ�</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>പോര��ച�ച�ഗീസ� ഗിനി എസ�ക�യൂഡോ</displayName>
-				<displayName count="one">പോര��ച�ച�ഗീസ� ഗിനി എസ�ക�യൂഡോ</displayName>
-				<displayName count="other">പോര��ച�ച�ഗീസ� ഗിനി എസ�ക�യൂഡോസ�</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>ഗിനിയ-ബിസാവ� പെയ�സോ</displayName>
-				<displayName count="one">ഗിനി-ബിസാവ� പെയ�സോ</displayName>
-				<displayName count="other">ഗിനി-ബിസാവ� പെയ�സോസ�</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>ഗയാന ഡോളര��</displayName>
-				<displayName count="one">ഗയാന ഡോളര��</displayName>
-				<displayName count="other">ഗയാന ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>ഹോങ� കോങ� ഡോളര��</displayName>
-				<displayName count="one">ഹോങ� കോങ� ഡോളര��</displayName>
-				<displayName count="other">ഹോങ� കോങ� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>ഹോന��ഡ�യ�റാസ� ലെംപീര</displayName>
-				<displayName count="one">ഹോന��ഡ�യ�റാസ� ലെംപീര</displayName>
-				<displayName count="other">ഹോന��ഡ�യ�റാസ� ലെംപീരാസ�</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>ക�രൊയേഷ�യന�� ദിനാര��</displayName>
-				<displayName count="one">ക�രൊയേഷ�യന�� ദിനാര��</displayName>
-				<displayName count="other">ക�രൊയേഷ�യന�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>ക�രൊയേഷ�യന�� ക�യൂന</displayName>
-				<displayName count="one">ക�രൊയേഷ�യന�� ക�യൂന</displayName>
-				<displayName count="other">ക�രൊയേഷ�യന�� ക�യൂനാസ�</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>ഹെയ�ഷ�യന�� ഗൂര��ഡ�</displayName>
-				<displayName count="one">ഹെയ�ഷ�യന�� ഗൂര��ഡ�</displayName>
-				<displayName count="other">ഹെയ�ഷ�യന�� ഗൂര��ഡ�സ�</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>ഹംഗേറിയന�� ഫോറിന��റ�</displayName>
-				<displayName count="one">ഹംഗേറിയന�� ഫോറിന��റ�</displayName>
-				<displayName count="other">ഹംഗേറിയന�� ഫോറിന��റ�സ�</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>ഇന�തോനേഷ�യന�� രൂപ</displayName>
-				<displayName count="one">ഇന�തോനേഷ�യന�� രൂപ</displayName>
-				<displayName count="other">ഇന�തോനേഷ�യന�� രൂപ</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>�റിഷ� പൌണ�ട�</displayName>
-				<displayName count="one">�റിഷ� പൌണ�ട�</displayName>
-				<displayName count="other">�റിഷ� പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>ഇസ�രയേലി പൌണ�ട�</displayName>
-				<displayName count="one">ഇസ�രയേലി പൌണ�ട�</displayName>
-				<displayName count="other">ഇസ�രയേലി പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>ഇസ�രായേലി ഷക�കേല��</displayName>
-				<displayName count="one">ഇസ�രായേലി ന�യൂ ഷെക�കല��</displayName>
-				<displayName count="other">ഇസ�രായേലി ന�യൂ ഷെക�കല��സ�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>ഇന�ത�യന�� രൂപ</displayName>
-				<displayName count="one">ഇന�ത�യന�� രൂപ</displayName>
-				<displayName count="other">ഇന�ത�യന�� രൂപ</displayName>
-				<symbol>രൂ</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>ഇറാക�കി ദിനാര��</displayName>
-				<displayName count="one">ഇറാക�കി ദിനാര��</displayName>
-				<displayName count="other">ഇറാക�കി ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>ഇറാനിയന�� റിയാല��</displayName>
-				<displayName count="one">ഇറാനിയന�� റിയാല��</displayName>
-				<displayName count="other">ഇറാനിയന�� റിയാല��സ�</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>�സ�‌ലാന��ഡിക� ക�രോണ</displayName>
-				<displayName count="one">�സ�‌ലാന��ഡിക� ക�രോണ</displayName>
-				<displayName count="other">�സ�‌ലാന��ഡിക� ക�രോണാസ�</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>ഇറ�റാലിയന�� ലിറ</displayName>
-				<displayName count="one">ഇറ�റാലിയന�� ലിറ</displayName>
-				<displayName count="other">ഇറ�റാലിയന�� ലിറാസ�</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>ജമൈക�കന�� ഡോളര��</displayName>
-				<displayName count="one">ജമൈക�കന�� ഡോളര��</displayName>
-				<displayName count="other">ജമൈക�കന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>ജോര��ദ�ദാന�� ദിനാര��</displayName>
-				<displayName count="one">ജോര��ദ�ദാന�� ദിനാര��</displayName>
-				<displayName count="other">ജോര��ദ�ദാന�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ജപ�പാനീസ� യെന��</displayName>
-				<displayName count="one">ജാപ�പനീസ� യെന��</displayName>
-				<displayName count="other">ജാപ�പനീസ� യെന��</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>കെനിയന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="one">കെനിയന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="other">കെനിയന�� ഷില�ലിംഗ�സ�</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>കിര��ഗിസ�ഥാന�� സോം</displayName>
-				<displayName count="one">കിര��ഗിസ�ഥാന�� സോം</displayName>
-				<displayName count="other">കിര��ഗിസ�ഥാന�� സോംസ�</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>കംബോഡിയന�� റീല��</displayName>
-				<displayName count="one">കംബോഡിയന�� റീല��</displayName>
-				<displayName count="other">കംബോഡിയന�� റീല��സ�</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>കൊമോറോ ഫ�രാങ�ക�</displayName>
-				<displayName count="one">കൊമോറോ ഫ�രാങ�ക�</displayName>
-				<displayName count="other">കൊമോറോ ഫ�രാങ�ക��സ�</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>നോര��ത�ത� കൊറിയന�� വോണ��</displayName>
-				<displayName count="one">ഉത�തര കൊറിയന�� വോണ��</displayName>
-				<displayName count="other">ഉത�തര കൊറിയന�� വോണ��സ�</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>ദക�ഷിണ കൊറിയന�� വോണ��</displayName>
-				<displayName count="one">ദക�ഷിണ കൊറിയന�� വോണ��</displayName>
-				<displayName count="other">ദക�ഷിണ കൊറിയന�� വോണ��സ�</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>ക�വൈറ�റി ദിനാര��</displayName>
-				<displayName count="one">ക�വൈറ�റ� ദിനാര��</displayName>
-				<displayName count="other">ക�വൈറ�റി ദിനാര��സ�‌</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>കെയ�മന��ദ�വീപ�കള�ടെ ഡോളര��‌</displayName>
-				<displayName count="one">കെയ�മന��ദ�വീപ�കള�ടെ ഡോളര��‌</displayName>
-				<displayName count="other">കെയ�മന��ദ�വീപ�കള�ടെ ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>കസാഖ�സ�ഥാന�� റ�റെംഗെ</displayName>
-				<displayName count="one">കസാഖ�സ�ഥാന�� റ�റെംഗെ</displayName>
-				<displayName count="other">കസാഖ�സ�ഥാന�� റ�റെംഗെസ�‌</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>ലാവോഷിയന�� കിപ�</displayName>
-				<displayName count="one">ലാവോഷ�യന�� കിപ�‌</displayName>
-				<displayName count="other">ലാവോഷ�യന�� കിപ�‌സ�‌</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>ലെബനീസ� പൌണ�ട�</displayName>
-				<displayName count="one">ലെബനീസ� പൌണ�ട�</displayName>
-				<displayName count="other">ലെബനീസ� പൌണ�ട�സ�</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>ശ�രീലങ�കന�� രൂപ</displayName>
-				<displayName count="one">ശ�രീലങ�കന�� രൂപ</displayName>
-				<displayName count="other">ശ�രീലങ�കന�� രൂപ</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>ലൈബീരിയന�� ഡോളര��</displayName>
-				<displayName count="one">ലൈബീരിയന�� ഡോളര��</displayName>
-				<displayName count="other">ലൈബീരിയന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>ലെസോതോ ലോത�തി</displayName>
-				<displayName count="one">ലെസോതോ ലോത�തി</displayName>
-				<displayName count="other">ലെസോതോ ലോത�തിസ�‌</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>ലിത�വാനിയന�� ലിത</displayName>
-				<displayName count="one">ലിത�വാനിയന�� ലിത</displayName>
-				<displayName count="other">ലിത�വാനിയന�� ലിതാസ�‌</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>ലിത�വാനിയന�� തലോനാസ�</displayName>
-				<displayName count="one">ലിത�വാനിയന�� തലോനാസ�</displayName>
-				<displayName count="other">ലിത�വാനിയന�� തലോനാസെസ�‌</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>ലക�സംബര��ഗ� കണ��വേര��ട�ടിബിള�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ലക�സംബര��ഗ� കൈമാറ�റം ചെയ�യാവ�ന�ന ഫ�രാങ�ക�‌</displayName>
-				<displayName count="other">ലക�സംബര��ഗ� കൈമാറ�റം ചെയ�യാവ�ന�ന ഫ�രാങ�ക�‌സ�‌</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>ലക�സംബര��ഗ� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ലക�സംബരµµ��ഗ� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ലക�സംബര��ഗ� ഫ�രാങ�ക�‌സ�‌</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>ലക�സ´‚ബര��ഗ� ഫിനാന��ഷ�യല�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ലക�സംബര��ഗ� ഫിനാന��ഷ�യല�� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ലക�സംബര��ഗ� ഫിനാന��ഷ�യല�� ഫ�രാങ�ക�‌സ�‌</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>ലാറ�റ�വിയന�� ലാറ�റ�സ�</displayName>
-				<displayName count="one">ലാറ�റ�വിയന�� ലാറ�റ�സ�</displayName>
-				<displayName count="other">ലാറ±�റ�വിയന�� ലാറ�റ�സെസ�‌</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>ലാറ�റ�വിയന�� റൂബിള��</displayName>
-				<displayName count="one">ലാറ�റ�വിയന�� റൂബിള��</displayName>
-				<displayName count="other">LVR</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>ലിബിയന�� ദിനാര��</displayName>
-				<displayName count="one">LYD</displayName>
-				<displayName count="other">LYD</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>മൊറോക�കന�� ദിര��ഹം</displayName>
-				<displayName count="one">MAD</displayName>
-				<displayName count="other">MAD</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>മൊറോക�കന�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">MAF</displayName>
-				<displayName count="other">MAF</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>മൊല��ഡോവന�� ലിയൂ</displayName>
-				<displayName count="one">MDL</displayName>
-				<displayName count="other">MDL</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>മഡഗാസ�കര�� �രിയറി</displayName>
-				<displayName count="one">MGA</displayName>
-				<displayName count="other">MGA</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>മഡഗാസ�കര�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">MGF</displayName>
-				<displayName count="other">MGF</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>മാസിഡോണിയന�� ദിനാര��</displayName>
-				<displayName count="one">MKD</displayName>
-				<displayName count="other">MKD</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>മാലി ഫ�രാങ�ക�</displayName>
-				<displayName count="one">MLF</displayName>
-				<displayName count="other">MLF</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>മ�യാന��മാര�� ചാറ�റ�</displayName>
-				<displayName count="one">മ�യാന��മാര�� ചാറ�റ�</displayName>
-				<displayName count="other">MMK</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>മംഗോളിയന�� ത�ഗ�രിക�</displayName>
-				<displayName count="one">MNT</displayName>
-				<displayName count="other">MNT</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>മകൌ പതാക�ക</displayName>
-				<displayName count="one">മകൌ പതാക�ക</displayName>
-				<displayName count="other">മകൌ പതാക�കാസ�</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>മൌറിറ�റേനിയ ഔഗിയ</displayName>
-				<displayName count="one">MRO</displayName>
-				<displayName count="other">MRO</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>മല��ത�തീസ� ലിറ</displayName>
-				<displayName count="one">MTL</displayName>
-				<displayName count="other">MTL</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>മല��ത�തീസ� പൌണ�ട�</displayName>
-				<displayName count="one">MTP</displayName>
-				<displayName count="other">MTP</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>മൌറീഷ�യസ� രൂപ</displayName>
-				<displayName count="one">MUR</displayName>
-				<displayName count="other">MUR</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>മാലദ�വീപ� രൂപ</displayName>
-				<displayName count="one">മാലദ�വീപ� രൂപ</displayName>
-				<displayName count="other">മാലദ�വീപ� രൂപ</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>മലാവി ക�വാച</displayName>
-				<displayName count="one">MWK</displayName>
-				<displayName count="other">MWK</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>മെക�സിക�കന�� പെസോ</displayName>
-				<displayName count="one">MXN</displayName>
-				<displayName count="other">MXN</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>മെക�സിക�കന�� സില��വര�� പെയ�സോ (1861-1992)</displayName>
-				<displayName count="one">മെക�സിക�കന�� സില��വര�� പെയ�സോ (MXP)</displayName>
-				<displayName count="other">മെക�സിക�കന�� സില��വര�� പെയ�സോസ� (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>മെക�സിക�കന�� യൂണിഡാഡ� ഡി ഇന��വെര��ഷന�� (UDI)</displayName>
-				<displayName count="one">മെക�സിക�കന�� യൂണിഡാഡ� ഡി ഇന��വെര��ഷന�� (UDI)</displayName>
-				<displayName count="other">മെക�സിക�കന�� യൂണിഡാഡ�സ� ഡി ഇന��വെര��ഷന�� (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>മലേഷ�യന�� റിംഗിറ�റ�</displayName>
-				<displayName count="one">MYR</displayName>
-				<displayName count="other">MYR</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>മൊസാന�പിക�ക� എസ�ക�യ�ഡോ</displayName>
-				<displayName count="one">MZE</displayName>
-				<displayName count="other">MZE</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>ഓള��ഡ� മൊസാന�പിക�ക� മെറ�റിക�കല��</displayName>
-				<displayName count="one">MZM</displayName>
-				<displayName count="other">MZM</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>മൊസാന�പിക�ക� മെറ�റിക�കല��</displayName>
-				<displayName count="one">MZN</displayName>
-				<displayName count="other">MZN</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>നമീബിയന�� ഡോളര��</displayName>
-				<displayName count="one">NAD</displayName>
-				<displayName count="other">NAD</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>നൈജീരിയന�� നൈറ</displayName>
-				<displayName count="one">NGN</displayName>
-				<displayName count="other">NGN</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>നികരാഗ�വന�� കൊര��ഡോബ</displayName>
-				<displayName count="one">NIC</displayName>
-				<displayName count="other">NIC</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>നികരാഗ�വന�� കൊര��ഡോബ ഒരോ</displayName>
-				<displayName count="one">NIO</displayName>
-				<displayName count="other">NIO</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>നെതര��ലന��ഡ�സ� ഗില��ഡര��</displayName>
-				<displayName count="one">നെതര��ലന��ഡ�സ� ഗില��ഡര��</displayName>
-				<displayName count="other">നെതര��ലന��ഡ�സ� ഗില��ഡേഴ�സ�</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>നോര��വീജിയന�� ക�രോണെ</displayName>
-				<displayName count="one">നോര��വീജിയന�� ക�രോണ��</displayName>
-				<displayName count="other">നോര��വീജിയന�� ക�രോണ��സ�</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>നേപ�പാളി രൂപ</displayName>
-				<displayName count="one">NPR</displayName>
-				<displayName count="other">NPR</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>ന�യൂസിലാന��ഡ� ഡോളര��</displayName>
-				<displayName count="one">ന�യൂസിലന��ഡ� ഡോളര��</displayName>
-				<displayName count="other">ന�യൂസിലന��ഡ� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>ഒമാന�� റിയാല��</displayName>
-				<displayName count="one">OMR</displayName>
-				<displayName count="other">OMR</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>പനാമെയ�നിയന�� ബാല��ബോവ</displayName>
-				<displayName count="one">പനാമെയ�നിയന�� ബാല��ബോവ</displayName>
-				<displayName count="other">പനാമെയ�നിയന�� ബാല��ബോവാസ�</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>പെറൂവിയന�� ഇന��റി</displayName>
-				<displayName count="one">പെറൂവിയന�� ഇന��റി</displayName>
-				<displayName count="other">പെറൂവിയന�� ഇന��റിസ�</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>പെറൂവിയന�� സോള�� ന�യൂവോ</displayName>
-				<displayName count="one">പെറൂവിയന�� സോള�� ന�യൂവോ</displayName>
-				<displayName count="other">പെറൂവിയന�� സോള�� ന�യൂവോസ�</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>പെറൂവിയന�� സോള��</displayName>
-				<displayName count="one">പെറൂവിയന�� സോള��</displayName>
-				<displayName count="other">പെറൂവിയന�� സോള��സ�</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>പാപ�വ ന�യൂ ഗിനി കിന</displayName>
-				<displayName count="one">പാപ�വ ന�യൂ ഗിനി കിന</displayName>
-				<displayName count="other">പാപ�വ ന�യൂ ഗിനി കിനാസ�</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>ഫിലിപ�പൈന�� പെയ�സോ</displayName>
-				<displayName count="one">ഫിലിപ�പൈന�� പെയ�സോ</displayName>
-				<displayName count="other">ഫിലിപ�പൈന�� പെയ�സോസ�</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>പാക�കിസ�ഥാനി രൂപ</displayName>
-				<displayName count="one">പാക�കിസ�ഥാനി രൂപ</displayName>
-				<displayName count="other">പാക�കിസ�ഥാനി രൂപ</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>പോളിഷ� സ�ലോട�ടി</displayName>
-				<displayName count="one">പോളിഷ� സ�ലോട�ടി</displayName>
-				<displayName count="other">പോളിഷ� സ�ലോട�ടീസ�</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>പോളിഷ� സ�ലോട�ടി (1950-1995)</displayName>
-				<displayName count="one">PLZ</displayName>
-				<displayName count="other">PLZ</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>പോര��ച�ച�ഗീസ� എസ�ക�യ�ഡോ</displayName>
-				<displayName count="one">PTE</displayName>
-				<displayName count="other">PTE</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>പരാഗ�വേ ഗ�വരനീ</displayName>
-				<displayName count="one">PYG</displayName>
-				<displayName count="other">PYG</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>ഖത�തര�� റിയാല��</displayName>
-				<displayName count="one">QAR</displayName>
-				<displayName count="other">QAR</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>റൊഡേഷ�യന�� ഡോളര��</displayName>
-				<displayName count="one">RHD</displayName>
-				<displayName count="other">RHD</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>പ�രാചീന റൊമേനിയന�� ലിയ�</displayName>
-				<displayName count="one">ROL</displayName>
-				<displayName count="other">ROL</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>റൊമേനിയന�� ലിയ�</displayName>
-				<displayName count="one">RON</displayName>
-				<displayName count="other">RON</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>സെര��ബിയന�� ദിനാര��</displayName>
-				<displayName count="one">RSD</displayName>
-				<displayName count="other">RSD</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>റഷ�യന�� റൂബിള��</displayName>
-				<displayName count="one">റഷ�യന�� റൂബിള��</displayName>
-				<displayName count="other">റഷ�യന�� റൂബിള��സ�</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>റഷ�യന�� റൂബിള�� (1991-1998)</displayName>
-				<displayName count="one">RUR</displayName>
-				<displayName count="other">RUR</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>റ�വാണ�ടന�� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">RWF</displayName>
-				<displayName count="other">RWF</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>സൌദി റിയാല��</displayName>
-				<displayName count="one">SAR</displayName>
-				<displayName count="other">SAR</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>സോളമന�� ദ�വീപ�കള�ടെ ഡോളര��</displayName>
-				<displayName count="one">SBD</displayName>
-				<displayName count="other">SBD</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>സെയ�ഷെല��സ� രൂപ</displayName>
-				<displayName count="one">SCR</displayName>
-				<displayName count="other">SCR</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>പ�രാചീന സ�ഡാനീസ� ദിനാര��</displayName>
-				<displayName count="one">SDD</displayName>
-				<displayName count="other">SDD</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>സ�ഡാനീസ� പൌണ�ട�</displayName>
-				<displayName count="one">SDG</displayName>
-				<displayName count="other">SDG</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>പ�രാചീന സ�ഡാനീസ� പൌണ�ട�</displayName>
-				<displayName count="one">SDP</displayName>
-				<displayName count="other">SDP</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>സ�വീഡിഷ� ക�രോണ</displayName>
-				<displayName count="one">SEK</displayName>
-				<displayName count="other">SEK</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>സിംഗപ�പൂര�� ഡോളര��</displayName>
-				<displayName count="one">SGD</displayName>
-				<displayName count="other">SGD</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>സെയ�ന��റ� ഹെലെന പൌണ�ട�</displayName>
-				<displayName count="one">SHP</displayName>
-				<displayName count="other">SHP</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>സ�ലൊവേനിയ റ�റോളര��</displayName>
-				<displayName count="one">SIT</displayName>
-				<displayName count="other">SIT</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>സ�ലോവാക� കൊരൂന</displayName>
-				<displayName count="one">SKK</displayName>
-				<displayName count="other">SKK</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>സിയറാ ലിയോണ�� ലിയോണ��</displayName>
-				<displayName count="one">SLL</displayName>
-				<displayName count="other">SLL</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>സൊമാലി ഷില�ലിംഗ�</displayName>
-				<displayName count="one">SOS</displayName>
-				<displayName count="other">SOS</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>സൂരിനാം ഡോളര��</displayName>
-				<displayName count="one">SRD</displayName>
-				<displayName count="other">SRD</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>സൂരിനാം ഗില��ഡര��</displayName>
-				<displayName count="one">SRG</displayName>
-				<displayName count="other">SRG</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>സാവോ റ�റോമി ആന��ഡ� പ�രിന��സിപ�പി ഡോബ�ര</displayName>
-				<displayName count="one">STD</displayName>
-				<displayName count="other">STD</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>സോവിയറ�റ� റൂബിള��</displayName>
-				<displayName count="one">SUR</displayName>
-				<displayName count="other">SUR</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>എല�� സാല��വഡോര�� കോളന��</displayName>
-				<displayName count="one">SVC</displayName>
-				<displayName count="other">SVC</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>സിറിയന�� പൌണ�ട�</displayName>
-				<displayName count="one">SYP</displayName>
-				<displayName count="other">സിറിയന�� പൌണ�ട�</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>സ�വാസിലാന��ഡ� ലിലാംഗനി</displayName>
-				<displayName count="one">SZL</displayName>
-				<displayName count="other">SZL</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>തായ� ബട�ട�</displayName>
-				<displayName count="one">തായ� ബട�ട�</displayName>
-				<displayName count="other">തായ� ബട�ട�</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>താജിക�കിസ�ഥാന�� റൂബിള��</displayName>
-				<displayName count="one">തജിക�സ�ഥാന�� റൂബിള��</displayName>
-				<displayName count="other">തജിക�സ�ഥാന�� റൂബിള��സ�</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>താജിക�കിസ�ഥാന�� സൊമോനി</displayName>
-				<displayName count="one">തജികിസ�ഥാന�� സൊമോനി</displayName>
-				<displayName count="other">തജികിസ�ഥാന�� സൊമോനിസ�</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>ത�ര��ക�മെനിസ�ഥാന�� മനത�</displayName>
-				<displayName count="one">ത�ര��ക�മെനിസ�ഥാന�� മനത�</displayName>
-				<displayName count="other">ത�ര��ക�മെനിസ�ഥാന�� മനത�‌സ�</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>ത�നീസിയന�� ദിനാര��</displayName>
-				<displayName count="one">TND</displayName>
-				<displayName count="other">TND</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>റ�റോംഗ പാംഗ</displayName>
-				<displayName count="one">റ�റോംഗ പാംഗ</displayName>
-				<displayName count="other">റ�റോംഗ പാംഗാസ�</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>തിമോര�� എസ�ക�യൂഡോ</displayName>
-				<displayName count="one">തിമോര�� എസ�ക�യൂഡോ</displayName>
-				<displayName count="other">തിമോര�� എസ�ക�യൂഡോസ�</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>പ�രാചീന ത�ര��ക�കിഷ� ലിറ</displayName>
-				<displayName count="one">TRL</displayName>
-				<displayName count="other">പ�രാചീന ത�ര��ക�കിഷ� ലിറാസ�</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ത�ര��ക�കിഷ� ലിറ</displayName>
-				<displayName count="one">ത�ര��ക�കിഷ� ലിറ</displayName>
-				<displayName count="other">ത�ര��ക�കിഷ� ലിറാസ�</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>ട�രിനിഡാഡ� ആന��ഡ� റ�റൊബാഗോ ഡോളര��</displayName>
-				<displayName count="one">TTD</displayName>
-				<displayName count="other">TTD</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>തായ�‌വാന�� ഡോളര��</displayName>
-				<displayName count="one">തായ�‌വാന�� ഡോളര��</displayName>
-				<displayName count="other">തായ�‌വാന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>ടാന��സാനിയന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="one">TZS</displayName>
-				<displayName count="other">TZS</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>യ�ക�രേനിയന�� ഹ�രിവ�നിയ</displayName>
-				<displayName count="one">ഉക�രേനിയന�� ഹ�രിവ�നിയ</displayName>
-				<displayName count="other">ഉക�രേനിയന�� ഹ�രിവ�നിയാസ�</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>യ�ക�രേനിയന�� കാര��ബോവാനെസ�</displayName>
-				<displayName count="one">ഉക�രേനിയന�� കാര��ബോവാനെസ�</displayName>
-				<displayName count="other">ഉക�രേനിയന�� കാര��ബോവാനെസ�</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ഉഗാണ�ടന�� ഷില�ലിംഗ� (1966-1987)</displayName>
-				<displayName count="one">UGS</displayName>
-				<displayName count="other">UGS</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ഉഗാണ�ടന�� ഷില�ലിംഗ�</displayName>
-				<displayName count="one">UGX</displayName>
-				<displayName count="other">UGX</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>യ�.എസ�. ഡോളര��</displayName>
-				<displayName count="one">യ�.എസ� ഡോളര��</displayName>
-				<displayName count="other">യ�.എസ� ഡോളേഴ�സ�</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>യ�എസ� ഡോളര�� (അട�ത�ത ദിവസം)</displayName>
-				<displayName count="one">USN</displayName>
-				<displayName count="other">USN</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>യ�എസ� ഡോളര�� (അതേ ദിവസം)</displayName>
-				<displayName count="one">USS</displayName>
-				<displayName count="other">യ�എസ� ഡോളേഴ�സ� (അതേ ദിവസം)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>ഉറ�ഗ�വേ പെയ�സോ എന�� യൂണിഡാഡ�സ�</displayName>
-				<displayName count="one">ഉറ�ഗ�വേ പെയ�സോ എന�� യൂണിഡാഡ�സ� ഇന��ഡെക�സാഡാസ�</displayName>
-				<displayName count="other">ഉറ�ഗ�വേ പെയ�സോസ� എന�� യൂണിഡാഡ�സ� ഇന��ഡെക�സാഡാസ�</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>ഉറ�ഗ�വേ പെയ�സോ (1975-1993)</displayName>
-				<displayName count="one">ഉറ�ഗ�വേ പെയ�സോ (UYP)</displayName>
-				<displayName count="other">ഉറ�ഗ�വേ പെയ�സോസ� (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>ഉറ�ഗ�വേ പെയ�സോ ഉറ�ഗായോ</displayName>
-				<displayName count="one">ഉറ�ഗ�വേ പെയ�സോ</displayName>
-				<displayName count="other">ഉറ�ഗ�വേ പെയ�സോ</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>ഉസ�ബക�കിസ�ഥാന�� സം</displayName>
-				<displayName count="one">ഉസ�ബക�കിസ�ഥാന�� സം</displayName>
-				<displayName count="other">ഉസ�ബക�കിസ�ഥാന�� സംസ�</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>വെനസ�വേലന�� ബോലിവര��</displayName>
-				<displayName count="one">വെനസ�വേലന�� ബോലിവര��</displayName>
-				<displayName count="other">വെനസ�വേലന�� ബോലിവര��സ�</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>വെനസ�വേലന�� ബോലിവര�� ഫ�വെര��റ�റെ</displayName>
-				<displayName count="one">വെനസ�വേലന�� ബോലിവര�� ഫ�വെര��റ�റെ</displayName>
-				<displayName count="other">വെനസ�വേലന�� ബോലിവര�� ഫ�വെര��റ�റെസ�</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>വിയറ�റ�നാമീസ� ഡോങ�</displayName>
-				<displayName count="one">VND</displayName>
-				<displayName count="other">VND</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>വന�വാത� വാത�</displayName>
-				<displayName count="one">വന�വാത� വാത�</displayName>
-				<displayName count="other">വന�വാത� വാതൂസ�</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>പശ�ചിമ സമോവ താല</displayName>
-				<displayName count="one">പശ�ചിമ സമോവ താല</displayName>
-				<displayName count="other">പശ�ചിമ സമോവ താലാസ�</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA ഫ�രാങ�ക� BEAC</displayName>
-				<displayName count="one">CFA ഫ�രാങ�ക� BEAC</displayName>
-				<displayName count="other">CFA ഫ�രാങ�ക�സ� BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>വെള�ളി</displayName>
-				<displayName count="one">വെള�ളി</displayName>
-				<displayName count="other">വെള�ളി</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>സ�വര��ണ�ണം</displayName>
-				<displayName count="one">സ�വര��ണ�ണം</displayName>
-				<displayName count="other">സ�വര��ണ�ണം</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>യൂറോപ�യന�� കോന�പസിറ�റ� യൂണിറ�റ�</displayName>
-				<displayName count="one">യൂറോപ�യന�� കോന�പസിറ�റ� യൂണിറ�റ�</displayName>
-				<displayName count="other">യൂറോപ�യന�� കോന�പസിറ�റ� യൂണിറ�റ�സ�</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>യൂറോപ�യന�� മോണിറ�ററി യൂണിറ�റ�</displayName>
-				<displayName count="one">യൂറോപ�യന�� മോണിറ�ററി യൂണിറ�റ�</displayName>
-				<displayName count="other">യൂറോപ�യന�� മോണിറ�ററി യൂണിറ�റ�സ�</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>യൂറോപ�യന�� യൂണിറ�റ� ഓഫ� അക�കൌണ�ട� (XBC)</displayName>
-				<displayName count="one">യൂറോപ�യന�� യൂണിറ�റ� ഓഫ� അക�കൌണ�ട� (XBC)</displayName>
-				<displayName count="other">യൂറോപ�യന�� യൂണിറ�റ�സ� ഓഫ� അക�കൌണ�ട� (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>യൂറോപ�യന�� യൂണിറ�റ� ഓഫ� അക�കൌണ�ട� (XBD)</displayName>
-				<displayName count="one">യൂറോപ�യന�� യൂണിറ�റ� ഓഫ� അക�കൌണ�ട� (XBD)</displayName>
-				<displayName count="other">യൂറോപ�യന�� യൂണിറ�റ�സ� ഓഫ� അക�കൌണ�ട� (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>കിഴക�കന�� കരീബിയന�� ഡോളര��</displayName>
-				<displayName count="one">കിഴക�കന�� കരീബിയന�� ഡോളര��</displayName>
-				<displayName count="other">കിഴക�കന�� കരീബിയന�� ഡോളേഴ�സ�</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>സ�പെഷ�യല�� ഡ�രോയിംഗ� റൈറ�റ�സ�</displayName>
-				<displayName count="one">സ�പെഷ�യല�� ഡ�രോയിംഗ� റൈറ�റ�സ�</displayName>
-				<displayName count="other">സ�പെഷ�യല�� ഡ�രോയിംഗ� റൈറ�റ�സ�</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>യൂറോപ�യന�� നാണയ യൂണിറ�റ�</displayName>
-				<displayName count="one">യൂറോപ�യന�� നാണയ യൂണിറ�റ�</displayName>
-				<displayName count="other">യൂറോപ�യന�� നാണയ യൂണിറ�റ�സ�</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>ഫ�രെഞ�ച� ഗോള��ഡ� ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ഫ�രെഞ�ച� ഗോള��ഡ� ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ഫ�രെഞ�ച� ഗോള��ഡ� ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>ഫ�രെഞ�ച� UIC-ഫ�രാങ�ക�</displayName>
-				<displayName count="one">ഫ�രെഞ�ച� UIC-ഫ�രാങ�ക�</displayName>
-				<displayName count="other">ഫ�രെഞ�ച� UIC-ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA ഫ�രാങ�ക� BCEAO</displayName>
-				<displayName count="one">CFA ഫ�രാങ�ക� BCEAO</displayName>
-				<displayName count="other">CFA ഫ�രാങ�ക�സ� BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>പലാഡിയം</displayName>
-				<displayName count="one">പലാഡിയം</displayName>
-				<displayName count="other">പലാഡിയം</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP ഫ�രാങ�ക�</displayName>
-				<displayName count="one">CFP ഫ�രാങ�ക�</displayName>
-				<displayName count="other">CFP ഫ�രാങ�ക�സ�</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>പ�ലാറ�റിനം</displayName>
-				<displayName count="one">പ�ലാറ�റിനം</displayName>
-				<displayName count="other">പ�ലാറ�റിനം</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET ഫണ�ട�സ�</displayName>
-				<displayName count="one">RINET ഫണ�ട�സ�</displayName>
-				<displayName count="other">RINET ഫണ�ട�സ�</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>ടെസ�റ�റിംഗിന�ള�ള കറന��സി കോഡ�</displayName>
-				<displayName count="one">റ�റെസ�റ�റിംഗ� കറന��സി കോഡ�</displayName>
-				<displayName count="other">റ�റെസ�റ�റിംഗ� കറന��സി കോഡ�</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>അറിയപ�പെടാത�തതോ നിലവിലില�ലാത�തതോ ആയ നാണയം</displayName>
-				<displayName count="one">അറിയപ�പെടാത�തതോ നിലവിലില�ലാത�തതോ ആയ നാണയം</displayName>
-				<displayName count="other">അറിയപ�പെടാത�തതോ നിലവിലില�ലാത�തതോ ആയ നാണയം</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>യമനി ദിനാര��</displayName>
-				<displayName count="one">യമനി ദിനാര��</displayName>
-				<displayName count="other">യമനി ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>യമനി റിയാല��</displayName>
-				<displayName count="one">യമനി റിയാല��</displayName>
-				<displayName count="other">യമനി റിയാല��സ�</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>യൂഗോസ�ലേവിയന�� ഹാര��ഡ� ദിനാര��</displayName>
-				<displayName count="one">യൂഗോസ�ലേവിയന�� ഹാര��ഡ� ദിനാര��</displayName>
-				<displayName count="other">യൂഗോസ�ലേവിയന�� ഹാര��ഡ� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>യൂഗോസ�ലേവിയന�� നോവി ദിനാര��</displayName>
-				<displayName count="one">യൂഗോസ�ലേവിയന�� നോവി ദിനാര��</displayName>
-				<displayName count="other">യൂഗോസ�ലേവിയന�� നോവി ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>യൂഗോസ�ലേവിയന�� കണ��വേര��ട�ടിബിള�� ദിനാര��</displayName>
-				<displayName count="one">യൂഗോസ�ലേവിയന�� കണ��വേര��ട�ടിബിള�� ദിനാര��</displayName>
-				<displayName count="other">യൂഗോസ�ലേവിയന�� കണ��വേര��ട�ടിബിള�� ദിനാര��സ�</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>ദക�ഷിണാഫ�രിക�കന�� റാന��ഡ� (ഫിനാന��ഷ�യല��)</displayName>
-				<displayName count="one">ദക�ഷിണാഫ�രിക�കന�� റാന��ഡ� (ഫിനാന��ഷ�യല��)</displayName>
-				<displayName count="other">ദക�ഷിണാഫ�രിക�കന�� റാന��ഡ�സ� (ഫിനാന��ഷ�യല��)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>ദക�ഷിണ ആഫ�രിക�കന�� റാന��ഡ�</displayName>
-				<displayName count="one">ദക�ഷിണാഫ�രിക�കന�� റാന��ഡ�</displayName>
-				<displayName count="other">ദക�ഷിണാഫ�രിക�കന�� റാന��ഡ�സ�</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>സാംബിയന�� ക�വാച</displayName>
-				<displayName count="one">സാംബിയന�� ക�വാച</displayName>
-				<displayName count="other">സാംബിയന�� ക�വാചാസ�</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>സൈറിയന�� ന�യൂ സൈര��</displayName>
-				<displayName count="one">സൈറിയന�� ന�യൂ സൈര��</displayName>
-				<displayName count="other">സൈറിയന�� ന�യൂ സൈര��സ�</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>സൈറിയന�� സൈര��</displayName>
-				<displayName count="one">സൈറിയന�� സൈര��</displayName>
-				<displayName count="other">സൈറിയന�� സൈര��സ�</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>സിംബാബ�‌വെ ഡോളര��</displayName>
-				<displayName count="one">സിംബാബ�‌വെ ഡോളര��</displayName>
-				<displayName count="other">സിംബാബ�‌വെ ഡോളേഴ�സ�</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ദിവസം</unitPattern>
-			<unitPattern count="other">{0} ദിവസം</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} മണിക�കൂര��</unitPattern>
-			<unitPattern count="other">{0} മണിക�കൂര��</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} മിനിട�ട�</unitPattern>
-			<unitPattern count="other">{0} മിനിട�ട�</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} മാസം</unitPattern>
-			<unitPattern count="other">{0} മാസം</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} സെക�കന�റ�</unitPattern>
-			<unitPattern count="other">{0} സെക�കന�റ�</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} ആഴ�ച</unitPattern>
-			<unitPattern count="other">{0} ആഴ�ച</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} വര��ഷം</unitPattern>
-			<unitPattern count="other">{0} വര��ഷം</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>അതെ</yesstr>
-			<nostr>അല�ല</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ml_IN.xml b/airtime_mvc/library/Zend/Locale/Data/ml_IN.xml
deleted file mode 100644
index c0b381735..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ml_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ml"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn.xml b/airtime_mvc/library/Zend/Locale/Data/mn.xml
deleted file mode 100644
index 5c3b2ce57..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">африк</language>
-			<language type="am">амхарик</language>
-			<language type="ar">араб</language>
-			<language type="as">а��ам үнд��т�н</language>
-			<language type="az">азарбежан</language>
-			<language type="be">белару�ь</language>
-			<language type="bg">болгар</language>
-			<language type="bh">бихари х�л</language>
-			<language type="bn">бенгаль</language>
-			<language type="br">бретон</language>
-			<language type="bs">бо�ниа</language>
-			<language type="ca">каталан</language>
-			<language type="cs">чех</language>
-			<language type="cy">у�л�</language>
-			<language type="da">дани</language>
-			<language type="de">герман</language>
-			<language type="el">грек</language>
-			<language type="en">англи</language>
-			<language type="eo">��перанто</language>
-			<language type="es">и�пани</language>
-			<language type="et">��тони</language>
-			<language type="eu">ба�к</language>
-			<language type="fa">пер�</language>
-			<language type="fi">финл�нд</language>
-			<language type="fil">тагало</language>
-			<language type="fo">фөри�� х�л</language>
-			<language type="fr">франц</language>
-			<language type="fy">голландын фри�иан х�л</language>
-			<language type="ga">ирланд</language>
-			<language type="gd">шотланд келт</language>
-			<language type="gl">галик</language>
-			<language type="gn">гуарани</language>
-			<language type="gu">�н�тх�гийн гужарати</language>
-			<language type="he">кипр</language>
-			<language type="hi">хинди</language>
-			<language type="hr">хорвати</language>
-			<language type="hu">унгар</language>
-			<language type="hy">армен</language>
-			<language type="ia">интерлингво</language>
-			<language type="id">индонези</language>
-			<language type="ie">н�гдм�л х�л</language>
-			<language type="is">и�ланд</language>
-			<language type="it">итали</language>
-			<language type="ja">�пон</language>
-			<language type="jv">�ва</language>
-			<language type="ka">гүрж</language>
-			<language type="km">камбуч</language>
-			<language type="kn">каннада</language>
-			<language type="ko">�олонго�</language>
-			<language type="ku">курд</language>
-			<language type="ky">киргиз</language>
-			<language type="la">латин</language>
-			<language type="ln">лингала</language>
-			<language type="lo">лаотиан</language>
-			<language type="lt">литви</language>
-			<language type="lv">латви</language>
-			<language type="mk">македони</language>
-			<language type="ml">малайлам</language>
-			<language type="mn">монгол</language>
-			<language type="mr">�н�тх�гийн марати</language>
-			<language type="ms">малай</language>
-			<language type="mt">малти</language>
-			<language type="ne">балба</language>
-			<language type="nl">голланд</language>
-			<language type="nn">норвеги (нынор�к)</language>
-			<language type="no">норвеги</language>
-			<language type="oc">францын ок�итан</language>
-			<language type="or">ори�</language>
-			<language type="pa">пенжаби</language>
-			<language type="pl">польш</language>
-			<language type="ps">афган</language>
-			<language type="pt">португали</language>
-			<language type="pt_BR">португали (бразил)</language>
-			<language type="pt_PT">португали (португали)</language>
-			<language type="ro">румын</language>
-			<language type="ru">оро�</language>
-			<language type="sa">�ан�кирит</language>
-			<language type="sd">�индхи</language>
-			<language type="sh">хорватын �ерб</language>
-			<language type="si">шри ланк</language>
-			<language type="sk">�ловак</language>
-			<language type="sl">�ловени</language>
-			<language type="so">�омали</language>
-			<language type="sq">албани</language>
-			<language type="sr">�ерби</language>
-			<language type="st">�е�ото</language>
-			<language type="su">�ундане� х�л</language>
-			<language type="sv">швед</language>
-			<language type="sw">африкийн �вахили х�л</language>
-			<language type="ta">тамил</language>
-			<language type="te">т�лүгү</language>
-			<language type="th">тай</language>
-			<language type="ti">тикрина</language>
-			<language type="tk">туркмен</language>
-			<language type="tlh">клингон х�л</language>
-			<language type="tr">турк</language>
-			<language type="tw">тви</language>
-			<language type="ug">уйгур</language>
-			<language type="uk">украин</language>
-			<language type="ur">паки�таны урду</language>
-			<language type="uz">узбек</language>
-			<language type="vi">вьетнам</language>
-			<language type="xh">хо�а</language>
-			<language type="yi">иддиш</language>
-			<language type="zh">х�тад</language>
-			<language type="zu">зулу</language>
-		</languages>
-		<territories>
-			<territory type="BR">Бразили</territory>
-			<territory type="DE">Герман</territory>
-			<territory type="FR">Франц</territory>
-			<territory type="IN">Эн�тх�г</territory>
-			<territory type="IT">Итали</territory>
-			<territory type="JP">Япон</territory>
-			<territory type="MN">Монгол ул�</territory>
-			<territory type="RU">Оро�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="US">�мерикийн ��гд��н Ул�</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а-е ё ж-о ө п-у ү ф-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[Ó™ Ò— ÓŠ Ò»]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">хул</month>
-							<month type="2">үх�</month>
-							<month type="3">бар</month>
-							<month type="4">туу</month>
-							<month type="5">луу</month>
-							<month type="6">мог</month>
-							<month type="7">мор</month>
-							<month type="8">хон</month>
-							<month type="9">бич</month>
-							<month type="10">тах</month>
-							<month type="11">нох</month>
-							<month type="12">гах</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Хулгана</month>
-							<month type="2">Үх�р</month>
-							<month type="3">Бар</month>
-							<month type="4">Туулай</month>
-							<month type="5">Луу</month>
-							<month type="6">Могой</month>
-							<month type="7">Морь</month>
-							<month type="8">Хонь</month>
-							<month type="9">Бич</month>
-							<month type="10">Тахиа</month>
-							<month type="11">�охой</month>
-							<month type="12">Гахай</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">��</day>
-							<day type="mon">Да</day>
-							<day type="tue">М�</day>
-							<day type="wed">Лх</day>
-							<day type="thu">Пү</day>
-							<day type="fri">Ба</day>
-							<day type="sat">Б�</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">н�м</day>
-							<day type="mon">даваа</day>
-							<day type="tue">м�гмар</day>
-							<day type="wed">лхагва</day>
-							<day type="thu">пүр�в</day>
-							<day type="fri">баа�ан</day>
-							<day type="sat">б�мба</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1/4</quarter>
-							<quarter type="2">2/4</quarter>
-							<quarter type="3">3/4</quarter>
-							<quarter type="4">4/4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">дөрөвний н�г</quarter>
-							<quarter type="2">дөрөвний хоёр</quarter>
-							<quarter type="3">дөрөвний гурав</quarter>
-							<quarter type="4">дөрөвний дөрөв</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">манай �риний өмнөх</era>
-						<era type="1">манай �риний</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">м.�.ө</era>
-						<era type="1">м.�.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_CN.xml b/airtime_mvc/library/Zend/Locale/Data/mn_CN.xml
deleted file mode 100644
index 594d2994e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.6 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<territory type="CN"/>
-	</identity>
-	<alias source="mn_Mong_CN" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl.xml
deleted file mode 100644
index ab98d657f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl_MN.xml b/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl_MN.xml
deleted file mode 100644
index dd9020ae4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_Cyrl_MN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<script type="Cyrl"/>
-		<territory type="MN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_MN.xml b/airtime_mvc/library/Zend/Locale/Data/mn_MN.xml
deleted file mode 100644
index 7daa6776f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_MN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.43 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<territory type="MN"/>
-	</identity>
-	<alias source="mn_Cyrl_MN" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_Mong.xml b/airtime_mvc/library/Zend/Locale/Data/mn_Mong.xml
deleted file mode 100644
index 876528cd2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_Mong.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<script type="Mong"/>
-	</identity>
-	<layout>
-		<orientation lines="left-to-right" characters="top-to-bottom"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[á �-á ™ á  -á¡‚]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a á à ă â å ä � æ b c ç d e é è ĕ ê ë ē f-i í ì ĭ î ï ī j-n ñ o ó ò � ô ö ø � œ p-s ß t u ú ù ŭ û ü ū v-y ÿ z]</exemplarCharacters>
-	</characters>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mn_Mong_CN.xml b/airtime_mvc/library/Zend/Locale/Data/mn_Mong_CN.xml
deleted file mode 100644
index 3fc18b5e3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mn_Mong_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mn"/>
-		<script type="Mong"/>
-		<territory type="CN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mo.xml b/airtime_mvc/library/Zend/Locale/Data/mo.xml
deleted file mode 100644
index 77aec411a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mo.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mo"/>
-	</identity>
-	<alias source="ro_MD" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mr.xml b/airtime_mvc/library/Zend/Locale/Data/mr.xml
deleted file mode 100644
index 5de642a53..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mr.xml
+++ /dev/null
@@ -1,1191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.86 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="mr"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">अफार</language>
-			<language type="ab">अबखेजियन</language>
-			<language type="ace">अचीनी</language>
-			<language type="ach">अकोली</language>
-			<language type="ada">अडांग�मे</language>
-			<language type="ady">अडिघे</language>
-			<language type="ae">अवेस�तन</language>
-			<language type="af">अफ�रिकान�स</language>
-			<language type="afa">अफ�रो-अशियाई भाषा</language>
-			<language type="afh">अफ�रिहिली</language>
-			<language type="ain">�नू</language>
-			<language type="ak">अकन</language>
-			<language type="akk">अक�कादिआन</language>
-			<language type="ale">अलेउत</language>
-			<language type="alg">अ�ॅल�गोक�वियन भाषा</language>
-			<language type="alt">दक�षिणात�य अल�ताई</language>
-			<language type="am">अम�हारिक</language>
-			<language type="an">अर�गोनीज</language>
-			<language type="ang">प�रातन इंग�रजी</language>
-			<language type="anp">अंगिका</language>
-			<language type="apa">अपाचे भाषा</language>
-			<language type="ar">अरबी</language>
-			<language type="arc">अ�ॅरेमाइक</language>
-			<language type="arn">अ�ॅरॉकॅनियन</language>
-			<language type="arp">अराफाओ</language>
-			<language type="art">कृत�रिम भाषा</language>
-			<language type="arw">अरावक</language>
-			<language type="as">आसामी</language>
-			<language type="ast">अस�त�रियन</language>
-			<language type="ath">अ�ॅथापास�कान भाषा</language>
-			<language type="aus">ऑस�ट�रेलियन भाषा</language>
-			<language type="av">अ�ॅव�हेरिक</language>
-			<language type="awa">अवधी</language>
-			<language type="ay">�मरा</language>
-			<language type="az">अ�रबैजानी</language>
-			<language type="ba">बष�किर</language>
-			<language type="bad">बांदा</language>
-			<language type="bai">बमिलेके भाषा</language>
-			<language type="bal">बल�ची</language>
-			<language type="ban">बालिनीस</language>
-			<language type="bas">बसा</language>
-			<language type="bat">बाल�टिक भाषा</language>
-			<language type="be">बेलार�शियन</language>
-			<language type="bej">बेजा</language>
-			<language type="bem">बेम�बा</language>
-			<language type="ber">बर�बर</language>
-			<language type="bg">बल�गेरियन</language>
-			<language type="bh">बिहारी</language>
-			<language type="bho">भोजप�री</language>
-			<language type="bi">बिस�लामा</language>
-			<language type="bik">बिकोल</language>
-			<language type="bin">बिनी</language>
-			<language type="bla">सिक�सिका</language>
-			<language type="bm">बाम�बारा</language>
-			<language type="bn">बंगाली</language>
-			<language type="bnt">बन�ट�</language>
-			<language type="bo">तिबेटी</language>
-			<language type="br">ब�रेटन</language>
-			<language type="bra">ब�रज</language>
-			<language type="bs">बोस�नियन</language>
-			<language type="btk">बटाक</language>
-			<language type="bua">ब�रियात</language>
-			<language type="bug">बगिनीस</language>
-			<language type="byn">ब�लिन</language>
-			<language type="ca">कॅटलान</language>
-			<language type="cad">कॅड�डो</language>
-			<language type="cai">मध�य अमेरिकी इंडियन भाषा</language>
-			<language type="car">कॅरिब</language>
-			<language type="cau">कॉकेशियन भाषा</language>
-			<language type="cch">अत�सम</language>
-			<language type="ce">चेचन</language>
-			<language type="ceb">सिब�आनो</language>
-			<language type="cel">केल�टिक भाषा</language>
-			<language type="ch">कॅमोरो</language>
-			<language type="chb">चिब�चा</language>
-			<language type="chg">छगाताई</language>
-			<language type="chk">चूकीसे</language>
-			<language type="chm">मारी</language>
-			<language type="chn">चिनूक जारगॉन</language>
-			<language type="cho">चोक�तौ</language>
-			<language type="chp">शिपेव�यान</language>
-			<language type="chr">चेरूकी</language>
-			<language type="chy">शेयेन�न</language>
-			<language type="cmc">चामिक भाषा</language>
-			<language type="co">कोर�सिकन</language>
-			<language type="cop">कॉप�टिक</language>
-			<language type="cpe">इंग�रजी-आधारित क�रेओल वा पिजिन</language>
-			<language type="cpf">फ�रेंच-आधारित क�रेओल वा पिजिन</language>
-			<language type="cpp">पोर�त�गीज-आधारित क�रेओल या पिजिन</language>
-			<language type="cr">क�री</language>
-			<language type="crh">क�राइमीन त�र�की</language>
-			<language type="crp">क�रेओल वा पिजिन</language>
-			<language type="cs">�ेक</language>
-			<language type="csb">काश�बियन</language>
-			<language type="cu">चर�च स�लाव�हिक</language>
-			<language type="cus">क�शितिक भाषा</language>
-			<language type="cv">चूवाश</language>
-			<language type="cy">वेल�श</language>
-			<language type="da">डॅनिश</language>
-			<language type="dak">दाकोता</language>
-			<language type="dar">दार�गवा</language>
-			<language type="day">दायक</language>
-			<language type="de">जर�मन</language>
-			<language type="de_AT">ऑस�ट�रियन जर�मन</language>
-			<language type="de_CH">स�विस हाय जर�मन</language>
-			<language type="del">डेलॅवेयर</language>
-			<language type="den">स�लाव�ह</language>
-			<language type="dgr">डोग�रिब</language>
-			<language type="din">दिन�का</language>
-			<language type="doi">डोगरी</language>
-			<language type="dra">द�रविडी भाषा</language>
-			<language type="dsb">निम�न सोर�बियन</language>
-			<language type="dua">द�आला</language>
-			<language type="dum">मिडल डच</language>
-			<language type="dv">दिवेही</language>
-			<language type="dyu">ड�य�ला</language>
-			<language type="dz">�ोंगखा</language>
-			<language type="ee">इवे</language>
-			<language type="efi">�फिक</language>
-			<language type="egy">प�राचीन इजिप�शियन</language>
-			<language type="eka">�काज�क</language>
-			<language type="el">ग�रीक</language>
-			<language type="elx">�लामाइट</language>
-			<language type="en">इंग�रजी</language>
-			<language type="en_AU">ऑस�ट�रेलियन इंग�रजी</language>
-			<language type="en_CA">कॅनेडियन इंग�रजी</language>
-			<language type="en_GB">ब�रिटिश इंग�रजी</language>
-			<language type="en_US">यू. �स. इंग�रजी</language>
-			<language type="enm">मिडल इंग�रजी</language>
-			<language type="eo">�स�परान�टो</language>
-			<language type="es">स�पॅनिश</language>
-			<language type="es_419">लॅटिन अमेरिकन स�पॅनिश</language>
-			<language type="es_ES">इबेरियन स�पॅनिश</language>
-			<language type="et">इस�टोनियन</language>
-			<language type="eu">बास�क</language>
-			<language type="ewo">इवोन�डो</language>
-			<language type="fa">फारसी</language>
-			<language type="fan">फ�ग</language>
-			<language type="fat">फन�टी</language>
-			<language type="ff">फ�लाह</language>
-			<language type="fi">फिन�निश</language>
-			<language type="fil">फिलिपिनो</language>
-			<language type="fiu">फिन�नो-उग�रीयन भाषा</language>
-			<language type="fj">फिजीयन</language>
-			<language type="fo">फरोइ�</language>
-			<language type="fon">फॉन</language>
-			<language type="fr">फ�रेंच</language>
-			<language type="fr_CA">कॅनेडियन फ�रेंच</language>
-			<language type="fr_CH">स�विस फ�रेंच</language>
-			<language type="frm">मिडल फ�रेंच</language>
-			<language type="fro">प�रातन फ�रेंच</language>
-			<language type="frr">उत�तरी फ�रिशियन</language>
-			<language type="frs">पौर�वात�य फ�रिशियन</language>
-			<language type="fur">फ�रिय�लियान</language>
-			<language type="fy">पाश�चात�य फ�रिशियन</language>
-			<language type="ga">आयरिश</language>
-			<language type="gaa">गा</language>
-			<language type="gay">गायो</language>
-			<language type="gba">बाया</language>
-			<language type="gd">स�कॉट�स गेलिक</language>
-			<language type="gem">जर�मनिक भाषा</language>
-			<language type="gez">गी�</language>
-			<language type="gil">जिल�बरटीज</language>
-			<language type="gl">गॅलिशियन</language>
-			<language type="gmh">मिडल हाय जर�मन</language>
-			<language type="gn">ग�आरनी</language>
-			<language type="goh">प�रातन हाइ जर�मन</language>
-			<language type="gon">गा�डी</language>
-			<language type="gor">गोरोन�तालो</language>
-			<language type="got">गॉथिक</language>
-			<language type="grb">ग�रेबो</language>
-			<language type="grc">प�राचीन ग�रीक</language>
-			<language type="gsw">स�विस जर�मन</language>
-			<language type="gu">ग�जराती</language>
-			<language type="gv">मांक�स</language>
-			<language type="gwi">ग�विच'इन</language>
-			<language type="ha">हौसा</language>
-			<language type="hai">हैडा</language>
-			<language type="haw">हवाईयन</language>
-			<language type="he">हिब�रू</language>
-			<language type="hi">हिंदी</language>
-			<language type="hil">हिलीगेनॉन</language>
-			<language type="him">हिमाचली</language>
-			<language type="hit">हिट�टिते</language>
-			<language type="hmn">मा�ग</language>
-			<language type="ho">हिरी मॉटू</language>
-			<language type="hr">क�रो�शियन</language>
-			<language type="hsb">अप�पर सॉर�बियन</language>
-			<language type="ht">हैतीयन</language>
-			<language type="hu">हंगेरियन</language>
-			<language type="hup">हूपा</language>
-			<language type="hy">आर�मेनियन</language>
-			<language type="hz">हरेरो</language>
-			<language type="ia">इन�टरलिंग�वा</language>
-			<language type="iba">इबान</language>
-			<language type="id">इंडोनेशियन</language>
-			<language type="ie">इन�टरलिंग</language>
-			<language type="ig">ईग�बो</language>
-			<language type="ii">सिच�आन यी</language>
-			<language type="ijo">इजो</language>
-			<language type="ik">इनूपियाक</language>
-			<language type="ilo">इलोको</language>
-			<language type="inc">भारतीय भाषा</language>
-			<language type="ine">इंडो-य�रोपीयन भाषा</language>
-			<language type="inh">इंग�श</language>
-			<language type="io">इडौ</language>
-			<language type="ira">ईराणी भाषा</language>
-			<language type="iro">इरोक�वोइयन भाषा</language>
-			<language type="is">आईसल�डिक</language>
-			<language type="it">इटालियन</language>
-			<language type="iu">इन�किट�ट�</language>
-			<language type="ja">जपानी</language>
-			<language type="jbo">लोज�बान</language>
-			<language type="jpr">ज�देओ-फारसी</language>
-			<language type="jrb">ज�देओ-अरबी</language>
-			<language type="jv">जावनीस�</language>
-			<language type="ka">जॉर�जियन</language>
-			<language type="kaa">कारा-कल�पक</language>
-			<language type="kab">कबाइल</language>
-			<language type="kac">काचिन</language>
-			<language type="kaj">ज�ज�</language>
-			<language type="kam">कम�बा</language>
-			<language type="kar">कारेन</language>
-			<language type="kaw">कावी</language>
-			<language type="kbd">कबार�डियन</language>
-			<language type="kcg">त�याप</language>
-			<language type="kfo">कोरो</language>
-			<language type="kg">का�गो</language>
-			<language type="kha">खासी</language>
-			<language type="khi">खोसियन भाषा</language>
-			<language type="kho">खोतानीस</language>
-			<language type="ki">किक�यू</language>
-			<language type="kj">क�वान�यामा</language>
-			<language type="kk">क�ाक</language>
-			<language type="kl">कलाल�लिस�त</language>
-			<language type="km">ख�मेर</language>
-			<language type="kmb">किम�बन�द�</language>
-			<language type="kn">कन�नड</language>
-			<language type="ko">कोरियन</language>
-			<language type="kok">कोंकणी</language>
-			<language type="kos">कोसरियन</language>
-			<language type="kpe">क�पेल�ले</language>
-			<language type="kr">कन�री</language>
-			<language type="krc">कराचय-बाल�कर</language>
-			<language type="krl">करेलियन</language>
-			<language type="kro">क�रू</language>
-			<language type="kru">क�रूख</language>
-			<language type="ks">काश�मीरी</language>
-			<language type="ku">क�र�दिश</language>
-			<language type="kum">क�मीक</language>
-			<language type="kut">क�तेनाई</language>
-			<language type="kv">कोमी</language>
-			<language type="kw">कोर�निश</language>
-			<language type="ky">किरगी�</language>
-			<language type="la">लॅटिन</language>
-			<language type="lad">लादीनो</language>
-			<language type="lah">लाह�न�डा</language>
-			<language type="lam">लाम�बा</language>
-			<language type="lb">लक��ेंबर�गिश</language>
-			<language type="lez">ले��घीयन</language>
-			<language type="lg">गांडा</language>
-			<language type="li">लिंबूर�गिश</language>
-			<language type="ln">लिंगाला</language>
-			<language type="lo">लाओ</language>
-			<language type="lol">मोंगो</language>
-			<language type="loz">लो�ी</language>
-			<language type="lt">लिथ�आनियन</language>
-			<language type="lu">ल�यूबा-कटांगा</language>
-			<language type="lua">लूबा-ल�ल�आ</language>
-			<language type="lui">ल�इसेनो</language>
-			<language type="lun">ल�न�डा</language>
-			<language type="luo">ल�य�ओ</language>
-			<language type="lus">ल�शाई</language>
-			<language type="lv">लाट�‌वियन</language>
-			<language type="mad">माद�रीस</language>
-			<language type="mag">मगही</language>
-			<language type="mai">मैथिली</language>
-			<language type="mak">मकस�सर</language>
-			<language type="man">मन�डिन�गो</language>
-			<language type="map">ऑस�ट�रोनेशियन</language>
-			<language type="mas">मसाई</language>
-			<language type="mdf">मोक�ष</language>
-			<language type="mdr">मंडार</language>
-			<language type="men">मेन�डे</language>
-			<language type="mg">मलागसी</language>
-			<language type="mga">मिडल आयरिश</language>
-			<language type="mh">मार�शलीज</language>
-			<language type="mi">माओरी</language>
-			<language type="mic">मिकमॅक</language>
-			<language type="min">मिनांग�काबाउ</language>
-			<language type="mis">विविध भाषा</language>
-			<language type="mk">मॅसेडोनियन</language>
-			<language type="mkh">मॉन-ख�मेर भाषा</language>
-			<language type="ml">मल�याळम</language>
-			<language type="mn">मंगोलियन</language>
-			<language type="mnc">मान�च�</language>
-			<language type="mni">मणिप�री</language>
-			<language type="mno">मनोबो भाषा</language>
-			<language type="mo">मोल�डाव�हियन</language>
-			<language type="moh">मोहॉक</language>
-			<language type="mos">मोस�सी</language>
-			<language type="mr">मराठी</language>
-			<language type="ms">मलय</language>
-			<language type="mt">माल�टिज�</language>
-			<language type="mul">�कविध भाषा</language>
-			<language type="mun">म�न�डा भाषा</language>
-			<language type="mus">क�रीक</language>
-			<language type="mwl">मिरांडिज�</language>
-			<language type="mwr">मारवाडी</language>
-			<language type="my">बर�मी</language>
-			<language type="myn">माया भाषा</language>
-			<language type="myv">�र���या</language>
-			<language type="na">नउरू</language>
-			<language type="nah">नह�आत�ल</language>
-			<language type="nai">उत�तरी अमेरीकी इंडियन भाषा</language>
-			<language type="nap">नेपोलिटान</language>
-			<language type="nb">नॉर�वेजियन बोकमाल</language>
-			<language type="nd">उत�तरी देबेली</language>
-			<language type="nds">लो जर�मन</language>
-			<language type="ne">नेपाळी</language>
-			<language type="new">नेवारी</language>
-			<language type="ng">डोंगा</language>
-			<language type="nia">नियास</language>
-			<language type="nic">नाइजर-कॉर�डोफॅनियन भाषा</language>
-			<language type="niu">निय�आन</language>
-			<language type="nl">डच</language>
-			<language type="nl_BE">फ�लेमिश</language>
-			<language type="nn">नॉर�वेजियन न�योर�स�क</language>
-			<language type="no">नोर�वेजियन</language>
-			<language type="nog">नोगाई</language>
-			<language type="non">प�रातन नॉर�स</language>
-			<language type="nqo">�न�को</language>
-			<language type="nr">दक�षिणात�य देबेली</language>
-			<language type="nso">उत�तरी सोथो</language>
-			<language type="nub">न�य�बियान भाषा</language>
-			<language type="nv">नावाजो</language>
-			<language type="nwc">अभिजात नेवारी</language>
-			<language type="ny">न�यान�जा</language>
-			<language type="nym">न�यामवे�ी</language>
-			<language type="nyn">न�यानकोल</language>
-			<language type="nyo">न�योरो</language>
-			<language type="nzi">न��िमा</language>
-			<language type="oc">ऑक�सिटान</language>
-			<language type="oj">ओजिब�वा</language>
-			<language type="om">ओरोमो</language>
-			<language type="or">उडिया</language>
-			<language type="os">ओस�सेटिक</language>
-			<language type="osa">ओसेज</language>
-			<language type="ota">ओटोमान त�र�किश</language>
-			<language type="oto">ओटोमियन भाषा</language>
-			<language type="pa">पंजाबी</language>
-			<language type="paa">पाप�न भाषा</language>
-			<language type="pag">पंगासीनान</language>
-			<language type="pal">पहलवी</language>
-			<language type="pam">पाम�पान�गा</language>
-			<language type="pap">पापियामेन�टो</language>
-			<language type="pau">पालाउआन</language>
-			<language type="peo">प�रातन फारसी</language>
-			<language type="phi">फिलिपीनी भाषा</language>
-			<language type="phn">फोनिशियन</language>
-			<language type="pi">पाली</language>
-			<language type="pl">पोलिश</language>
-			<language type="pon">पोह�नपियन</language>
-			<language type="pra">प�राकृत भाषा</language>
-			<language type="pro">प�रातन प�रोव�हेन�सल</language>
-			<language type="ps">पश�तो</language>
-			<language type="pt">पोर�त�गीज</language>
-			<language type="pt_BR">ब�रा�िलियन पोर�त�गीज</language>
-			<language type="pt_PT">इबेरियन पोर�त�गीज</language>
-			<language type="qu">क�वेच�आ</language>
-			<language type="raj">राजस�थानी</language>
-			<language type="rap">रापान�ई</language>
-			<language type="rar">रारोटोंगन</language>
-			<language type="rm">र��हा�टो-रोमांस</language>
-			<language type="rn">र�न�दी</language>
-			<language type="ro">रोमानियन</language>
-			<language type="roa">रोमांस भाषा</language>
-			<language type="rom">रोमानी</language>
-			<language type="root">रूट</language>
-			<language type="ru">रशियन</language>
-			<language type="rup">अरोमानियन</language>
-			<language type="rw">किन�यार�वान�डा</language>
-			<language type="sa">संस�कृत</language>
-			<language type="sad">स�डवे</language>
-			<language type="sah">याकूत</language>
-			<language type="sai">दक�षिण अमेरीकी इंडियन भाषा</language>
-			<language type="sal">सलीशन भाषा</language>
-			<language type="sam">सामरिटान अरॅमिक</language>
-			<language type="sas">सासाक</language>
-			<language type="sat">संताली</language>
-			<language type="sc">सर�दिनियन</language>
-			<language type="scn">सिसिलियन</language>
-			<language type="sco">स�कॉट�स</language>
-			<language type="sd">सिंधी</language>
-			<language type="se">नॉर�दन सामी</language>
-			<language type="sel">सेल�कप</language>
-			<language type="sem">सेमिटिक भाषा</language>
-			<language type="sg">सांगो</language>
-			<language type="sga">प�रातन आयरिश</language>
-			<language type="sgn">सांकेतिक भाषा</language>
-			<language type="sh">सर�बो-क�रो�शियन</language>
-			<language type="shn">शॅन</language>
-			<language type="si">सिंहली</language>
-			<language type="sid">सिदामो</language>
-			<language type="sio">सिउआन भाषा</language>
-			<language type="sit">चीनी-तिबेटी भाषा</language>
-			<language type="sk">स�लोव�हाक</language>
-			<language type="sl">स�लोव�हेनियन</language>
-			<language type="sla">स�लाव�हिक भाषा</language>
-			<language type="sm">सामोअन</language>
-			<language type="sma">दक�षिणात�य सामी</language>
-			<language type="smi">सामी भाषा</language>
-			<language type="smj">ल�य�ल सामी</language>
-			<language type="smn">इनारी सामी</language>
-			<language type="sms">स�कोल�ट सामी</language>
-			<language type="sn">शोना</language>
-			<language type="snk">सोनिन�के</language>
-			<language type="so">सोमाली</language>
-			<language type="sog">सोग�डि�न</language>
-			<language type="son">सोन�घाई</language>
-			<language type="sq">अल�बानियन</language>
-			<language type="sr">सर�बियन</language>
-			<language type="srn">स�रानान टॉन�गो</language>
-			<language type="srr">सेरेर</language>
-			<language type="ss">स�वाती</language>
-			<language type="ssa">निलो-सहारन भाषा</language>
-			<language type="st">सेसोथो</language>
-			<language type="su">स�ंदानीज</language>
-			<language type="suk">स�क�मा</language>
-			<language type="sus">स�स�</language>
-			<language type="sux">स�मेरियन</language>
-			<language type="sv">स�वीडिश</language>
-			<language type="sw">स�वाहिली</language>
-			<language type="syc">अभिजात सिरियाक</language>
-			<language type="syr">सिरियाक</language>
-			<language type="ta">तमिळ</language>
-			<language type="tai">ताई भाषा</language>
-			<language type="te">तेलगू</language>
-			<language type="tem">टिम�ने</language>
-			<language type="ter">तेरेनो</language>
-			<language type="tet">तेत�म</language>
-			<language type="tg">ताजिक</language>
-			<language type="th">थाई</language>
-			<language type="ti">टिग�रिन�या</language>
-			<language type="tig">टाइग�रे</language>
-			<language type="tiv">तिव</language>
-			<language type="tk">त�र�कमेन</language>
-			<language type="tkl">टोकेलाऊ</language>
-			<language type="tl">टागालोग</language>
-			<language type="tlh">क�लिंगॉन</language>
-			<language type="tli">लिंगित</language>
-			<language type="tmh">तामाशेक</language>
-			<language type="tn">त�स�वाना</language>
-			<language type="to">टोंगा</language>
-			<language type="tog">न�यासा टोन�गा</language>
-			<language type="tpi">टोक पिसिन</language>
-			<language type="tr">त�र�की</language>
-			<language type="ts">सोंगा</language>
-			<language type="tsi">सिम�शियन</language>
-			<language type="tt">ततार</language>
-			<language type="tum">तम�बूका</language>
-			<language type="tup">ट�यूपी भाषा</language>
-			<language type="tut">अल�टॅइक भाषा</language>
-			<language type="tvl">ट�वाल�</language>
-			<language type="tw">ट�वी</language>
-			<language type="ty">ताहितीयन</language>
-			<language type="tyv">ट�वीनियन</language>
-			<language type="udm">उदम�र�त</language>
-			<language type="ug">उईघ�र</language>
-			<language type="uga">य�गॅरिटिक</language>
-			<language type="uk">य�क�रेनियन</language>
-			<language type="umb">उम�ब�न�ड�</language>
-			<language type="und">अज�ञात वा अवैध भाषा</language>
-			<language type="ur">उर�दू</language>
-			<language type="uz">उ��बेक</language>
-			<language type="vai">वाई</language>
-			<language type="ve">व�हेंदा</language>
-			<language type="vi">व�हि�तनामी</language>
-			<language type="vo">ओलाप�क</language>
-			<language type="vot">वॉटिक</language>
-			<language type="wa">वालून</language>
-			<language type="wak">वाकाशन भाषा</language>
-			<language type="wal">वलामो</language>
-			<language type="war">वारे</language>
-			<language type="was">वाशो</language>
-			<language type="wen">सॉर�बियन भाषा</language>
-			<language type="wo">वोलोफ</language>
-			<language type="xal">काल�मिक</language>
-			<language type="xh">खोसा</language>
-			<language type="yao">याओ</language>
-			<language type="yap">यापीस</language>
-			<language type="yi">यिद�दिश</language>
-			<language type="yo">योर�बा</language>
-			<language type="ypk">यूपिक भाषा</language>
-			<language type="za">��आंग</language>
-			<language type="zap">�ेपोटेक</language>
-			<language type="zbl">ब�लिसिम�बॉल�स</language>
-			<language type="zen">�ेनान�गा</language>
-			<language type="zh">चीनी</language>
-			<language type="zh_Hans">सरलीकृत चीनी</language>
-			<language type="zh_Hant">पारंपारिक चीनी</language>
-			<language type="znd">�न�डे</language>
-			<language type="zu">��लू</language>
-			<language type="zun">��नी</language>
-			<language type="zxx">भाषावैज�ञानिक सामग�री नाही</language>
-			<language type="zza">�ा�ा</language>
-		</languages>
-		<scripts>
-			<script type="Arab">अरबी</script>
-			<script type="Armi">इम�पिरियल आर�मेनिक</script>
-			<script type="Armn">अर�मेनियन</script>
-			<script type="Avst">अवेस�तान</script>
-			<script type="Bali">बाली</script>
-			<script type="Batk">बटाक</script>
-			<script type="Beng">बंगाली</script>
-			<script type="Blis">ब�लिसिम�बॉल�स</script>
-			<script type="Bopo">बोपोमोफो</script>
-			<script type="Brah">ब�रह�मी</script>
-			<script type="Brai">ब�रेल</script>
-			<script type="Bugi">बूगी</script>
-			<script type="Buhd">ब�हिद</script>
-			<script type="Cakm">चकमा</script>
-			<script type="Cans">यूनिफाइड कॅनेडियन अ�ॅबोरिदनल सिलॅबिक�स</script>
-			<script type="Cari">कॅरियन</script>
-			<script type="Cham">चाम</script>
-			<script type="Cher">चेरोकी</script>
-			<script type="Cirt">किर�थ</script>
-			<script type="Copt">कॉप�टिक</script>
-			<script type="Cprt">सायप�रिऑट</script>
-			<script type="Cyrl">सीरिलिक</script>
-			<script type="Cyrs">प�रातन चर�च स�लाव�होनिक सिरिलिक</script>
-			<script type="Deva">देवनागरी</script>
-			<script type="Dsrt">डेसर�ट</script>
-			<script type="Egyd">इजिप�शियन डेमोटिक</script>
-			<script type="Egyh">इजिप�शियन हायरेटिक</script>
-			<script type="Egyp">इजिप�शियन हायरोग�लिफ�स</script>
-			<script type="Ethi">ईथिओपिक</script>
-			<script type="Geok">जॉर�जियन ख�त�स�री</script>
-			<script type="Geor">जॉर�जियन</script>
-			<script type="Glag">ग�लॅगोलिटिक</script>
-			<script type="Goth">गोथिक</script>
-			<script type="Grek">ग�रीक</script>
-			<script type="Gujr">ग�जराती</script>
-			<script type="Guru">ग�र�म�खी</script>
-			<script type="Hang">हंग�ल</script>
-			<script type="Hani">हान</script>
-			<script type="Hano">हन�नू</script>
-			<script type="Hans">सरलीकृत हन</script>
-			<script type="Hant">पारंपारिक हन</script>
-			<script type="Hebr">हिब�रू</script>
-			<script type="Hira">हिरागाना</script>
-			<script type="Hmng">पहाउ मंग</script>
-			<script type="Hrkt">कॅटाकना आणि हिरागाना</script>
-			<script type="Hung">प�रातन हंगेरियन</script>
-			<script type="Inds">सिन�ध�</script>
-			<script type="Ital">ज�नी इटालिक</script>
-			<script type="Java">जावानीस</script>
-			<script type="Jpan">जपानी</script>
-			<script type="Kali">कायाह ली</script>
-			<script type="Kana">कॅटाकाना</script>
-			<script type="Khar">खारोश�थी</script>
-			<script type="Khmr">ख�मेर</script>
-			<script type="Knda">कन�नड</script>
-			<script type="Kore">कोरियन</script>
-			<script type="Kthi">काइथी</script>
-			<script type="Lana">लाना</script>
-			<script type="Laoo">लाओ</script>
-			<script type="Latf">फ�रॅक�त�र लॅटिन</script>
-			<script type="Latg">गा�लिक लेटिन</script>
-			<script type="Latn">लॅटिन</script>
-			<script type="Lepc">लेपचा</script>
-			<script type="Limb">लिम�बू</script>
-			<script type="Lina">लीनियार अ</script>
-			<script type="Linb">लीनियर बी</script>
-			<script type="Lyci">लायशियान</script>
-			<script type="Lydi">लायडियान</script>
-			<script type="Mand">मान�डायीन</script>
-			<script type="Mani">मानीचायीन</script>
-			<script type="Maya">मायान हाइरोग�लिफ�स</script>
-			<script type="Mero">मेरोइटिक</script>
-			<script type="Mlym">मल�याळी</script>
-			<script type="Mong">मंगोलियन</script>
-			<script type="Moon">मून</script>
-			<script type="Mtei">मेइतेइ मायेक</script>
-			<script type="Mymr">म�यानमार</script>
-			<script type="Nkoo">�न�'को</script>
-			<script type="Ogam">ओघाम</script>
-			<script type="Olck">ओल चिकि</script>
-			<script type="Orkh">ओर�खोन</script>
-			<script type="Orya">उडिया</script>
-			<script type="Osma">उस�मानिया</script>
-			<script type="Perm">प�रातन पर�मिक</script>
-			<script type="Phag">फाग�स-पा</script>
-			<script type="Phli">इन�स�क�रिप�शनल पाहलवी</script>
-			<script type="Phlp">सॉल�टर पाहलवी</script>
-			<script type="Phlv">ब�क पाहलवी</script>
-			<script type="Phnx">फोनिशियन</script>
-			<script type="Plrd">पोलार�ड फोनेटिक</script>
-			<script type="Prti">इन�स�क�रिप�शनल पर�थियन</script>
-			<script type="Qaai">वंशपरंपरागत</script>
-			<script type="Rjng">रीजांग</script>
-			<script type="Roro">रोन�गोरोन�गो</script>
-			<script type="Runr">रूनिक</script>
-			<script type="Samr">समरिटान</script>
-			<script type="Sara">सराती</script>
-			<script type="Saur">सौराष�ट�र</script>
-			<script type="Sgnw">संकेत लिपी</script>
-			<script type="Shaw">शॅव�हियन</script>
-			<script type="Sinh">सिंहली</script>
-			<script type="Sund">सूदानी</script>
-			<script type="Sylo">सिलोती नागरी</script>
-			<script type="Syrc">सिरीयाक</script>
-			<script type="Syre">�स�त�ट�रेन�जेलो सिरियाक</script>
-			<script type="Syrj">पश�चिमी सिरियाक</script>
-			<script type="Syrn">पूर�वी सिरियाक</script>
-			<script type="Tagb">तगोआन�वा</script>
-			<script type="Tale">ताई ली</script>
-			<script type="Talu">नवीन ताई लू</script>
-			<script type="Taml">तमिळ</script>
-			<script type="Tavt">ताई वि�त</script>
-			<script type="Telu">तेलग�</script>
-			<script type="Teng">तेन�गवार</script>
-			<script type="Tfng">तिफिनाघ</script>
-			<script type="Tglg">टागालोग</script>
-			<script type="Thaa">थाना</script>
-			<script type="Thai">थाई</script>
-			<script type="Tibt">तिबेटी</script>
-			<script type="Ugar">य�गारिटिक</script>
-			<script type="Vaii">वाई</script>
-			<script type="Visp">दृश�य संवाद</script>
-			<script type="Xpeo">प�रातन फारसी</script>
-			<script type="Xsux">दृश�यमान भाषा</script>
-			<script type="Yiii">यी</script>
-			<script type="Zmth">गणिती संकेतलिपी</script>
-			<script type="Zsym">प�रतीक लिपी</script>
-			<script type="Zxxx">अलिखित</script>
-			<script type="Zyyy">सामान�य</script>
-			<script type="Zzzz">अज�ञात वा अवैध लिपी</script>
-		</scripts>
-		<territories>
-			<territory type="001">विश�व</territory>
-			<territory type="002">अफ�रिका</territory>
-			<territory type="003">उत�तर अमेरिका</territory>
-			<territory type="005">दक�षिण अमेरिका</territory>
-			<territory type="009">ओशनिया</territory>
-			<territory type="011">पश�चिम अफ�रिका</territory>
-			<territory type="013">मध�य अमेरीका</territory>
-			<territory type="014">पूर�व अफ�रिका</territory>
-			<territory type="015">उत�तर अफ�रिका</territory>
-			<territory type="017">मध�य अफ�रिका</territory>
-			<territory type="018">दक�षिणी अफ�रिका</territory>
-			<territory type="019">अमेरिकास</territory>
-			<territory type="021">उत�तरी अमेरिका</territory>
-			<territory type="029">कॅरीबियन</territory>
-			<territory type="030">पूर�व अशिया</territory>
-			<territory type="034">दक�षिण अशिया</territory>
-			<territory type="035">दक�षिण पूर�व अशिया</territory>
-			<territory type="039">दक�षिण य�रोप</territory>
-			<territory type="053">ऑस�ट�रेलिया आणि न�यू�ीलंड</territory>
-			<territory type="054">मेलानेशिया</territory>
-			<territory type="057">मायक�रोनेशियन रीजन</territory>
-			<territory type="061">पॉलिनेशिया</territory>
-			<territory type="062">दक�षिण-मध�य अशिया</territory>
-			<territory type="142">अशिया</territory>
-			<territory type="143">मध�य अशिया</territory>
-			<territory type="145">पश�चिम अशिया</territory>
-			<territory type="150">य�रोप</territory>
-			<territory type="151">पूर�व य�रोप</territory>
-			<territory type="154">उत�तर य�रोप</territory>
-			<territory type="155">पश�चिम य�रोप</territory>
-			<territory type="172">स�वतंत�र राष�ट�रांचे कॉमनवेल�थ</territory>
-			<territory type="200">�ेकोस�लवाकिया</territory>
-			<territory type="419">लॅटिन अमेरिका आणि कॅरीबियन</territory>
-			<territory type="830">चॅनल बेटे</territory>
-			<territory type="AD">अ�डोरा</territory>
-			<territory type="AE">संय�क�त अरब अमीरात</territory>
-			<territory type="AF">अफगाणिस�तान</territory>
-			<territory type="AG">अ�टिग�वा आणि बर�ब�डा</territory>
-			<territory type="AI">अ�ग�विला</territory>
-			<territory type="AL">अल�बानिया</territory>
-			<territory type="AM">आर�मेनिया</territory>
-			<territory type="AN">नेदरल�ड�स अ�टिल�स</territory>
-			<territory type="AO">अंगोला</territory>
-			<territory type="AQ">अंटार�क�टिक</territory>
-			<territory type="AR">अर�जेंटिना</territory>
-			<territory type="AS">अमेरिकन सामोआ</territory>
-			<territory type="AT">ऑस�ट�रिया</territory>
-			<territory type="AU">ऑस�ट�रेलिया</territory>
-			<territory type="AW">अर�बा</territory>
-			<territory type="AX">अ�ॅल�ड बेटे</territory>
-			<territory type="AZ">अ�रबैजान</territory>
-			<territory type="BA">बोस�निया अणि हर�जेगोविना</territory>
-			<territory type="BB">बार�बाडोस</territory>
-			<territory type="BD">बांग�लादेश</territory>
-			<territory type="BE">बेल�जियम</territory>
-			<territory type="BF">ब�र�किना फासो</territory>
-			<territory type="BG">बल�गेरिया</territory>
-			<territory type="BH">बहारीन</territory>
-			<territory type="BI">ब�र�ंडी</territory>
-			<territory type="BJ">बेनिन</territory>
-			<territory type="BL">सेंट बार�थेलेमी</territory>
-			<territory type="BM">बर�म�डा</territory>
-			<territory type="BN">ब�र�नेई</territory>
-			<territory type="BO">बोलिव�हिया</territory>
-			<territory type="BR">ब�रा�िल</territory>
-			<territory type="BS">बहामाज</territory>
-			<territory type="BT">भूतान</territory>
-			<territory type="BV">बोउवेट बेट</territory>
-			<territory type="BW">बोट�सवाना</territory>
-			<territory type="BY">बेलारूस</territory>
-			<territory type="BZ">बेलि�े</territory>
-			<territory type="CA">कॅनडा</territory>
-			<territory type="CC">कोकोस बेटे</territory>
-			<territory type="CD">का�गो - किंशासा</territory>
-			<territory type="CF">केंद�रीय अफ�रिकी प�रजासत�ताक</territory>
-			<territory type="CG">का�गो - ब�राजाविले</territory>
-			<territory type="CH">स�वित��र�लंड</territory>
-			<territory type="CI">आयव�हरी कोस�ट</territory>
-			<territory type="CK">क�क बेटे</territory>
-			<territory type="CL">चिली</territory>
-			<territory type="CM">कॅमेरून</territory>
-			<territory type="CN">चीन</territory>
-			<territory type="CO">कोलम�बिया</territory>
-			<territory type="CR">कोस�टारिका</territory>
-			<territory type="CS">सर�बिया आणि मा�टेनेग�रो</territory>
-			<territory type="CU">क�यूबा</territory>
-			<territory type="CV">केप व�हर�डे</territory>
-			<territory type="CX">ख�रिसमस बेट</territory>
-			<territory type="CY">सायप�रस</territory>
-			<territory type="CZ">�ेक प�रजासत�ताक</territory>
-			<territory type="DE">जर�मनी</territory>
-			<territory type="DJ">जिबौटी</territory>
-			<territory type="DK">डेन�मार�क</territory>
-			<territory type="DM">डोमिनिका</territory>
-			<territory type="DO">डोमिनिकन प�रजासत�ताक</territory>
-			<territory type="DZ">अल�जीरिया</territory>
-			<territory type="EC">इक�वेडोर</territory>
-			<territory type="EE">�स�टोनिया</territory>
-			<territory type="EG">इजिप�त</territory>
-			<territory type="EH">पश�चिम सहारा</territory>
-			<territory type="ER">इरिट�रिया</territory>
-			<territory type="ES">स�पेन</territory>
-			<territory type="ET">इथिओपिया</territory>
-			<territory type="FI">फिनलंड</territory>
-			<territory type="FJ">फिजी</territory>
-			<territory type="FK">फॉकलंड बेटे</territory>
-			<territory type="FM">मायक�रोनेशिया</territory>
-			<territory type="FO">फरो� बेटे</territory>
-			<territory type="FR">फ�रान�स</territory>
-			<territory type="GA">गॅबॉन</territory>
-			<territory type="GB">ब�रिटन</territory>
-			<territory type="GD">ग�रेनेडा</territory>
-			<territory type="GE">जॉर�जिया</territory>
-			<territory type="GF">फ�रेंच गयाना</territory>
-			<territory type="GG">ग�वेर�नसे</territory>
-			<territory type="GH">घाना</territory>
-			<territory type="GI">जिब�राल�टर</territory>
-			<territory type="GL">ग�रीनल�ड</territory>
-			<territory type="GM">गाम�बिया</territory>
-			<territory type="GN">गिनी</territory>
-			<territory type="GP">ग�वाडेलोउपे</territory>
-			<territory type="GQ">इक�वेटोरियल गिनी</territory>
-			<territory type="GR">ग�रीस</territory>
-			<territory type="GS">दक�षिण जॉर�जिया आणि दक�षिण स�डविच बेटे</territory>
-			<territory type="GT">ग�वाटेमाला</territory>
-			<territory type="GU">ग�आम</territory>
-			<territory type="GW">गिनी-बिसाउ</territory>
-			<territory type="GY">गयाना</territory>
-			<territory type="HK">हा�गका�ग विशेष प�रशासनिक क�षेत�र चीन</territory>
-			<territory type="HM">हर�ड बेट आणि मैकडोनाल�ड बेट</territory>
-			<territory type="HN">होंड�राज�</territory>
-			<territory type="HR">क�रो�शिया</territory>
-			<territory type="HT">हैती</territory>
-			<territory type="HU">हंगेरी</territory>
-			<territory type="ID">इंडोनेशिया</territory>
-			<territory type="IE">आयर�लंड</territory>
-			<territory type="IL">इस�त�राइल</territory>
-			<territory type="IM">इस�ले ऑफ मॅन</territory>
-			<territory type="IN">भारत</territory>
-			<territory type="IO">ब�रिटिश हिंद महासागरीय क�षेत�र</territory>
-			<territory type="IQ">इराक</territory>
-			<territory type="IR">ईराण</territory>
-			<territory type="IS">आइसल�ड</territory>
-			<territory type="IT">इटली</territory>
-			<territory type="JE">जर�सी</territory>
-			<territory type="JM">जमैका</territory>
-			<territory type="JO">जॉर�डन</territory>
-			<territory type="JP">जपान</territory>
-			<territory type="KE">केनिया</territory>
-			<territory type="KG">किरगी�स�तान</territory>
-			<territory type="KH">कंबोडिया</territory>
-			<territory type="KI">किरीबाटी</territory>
-			<territory type="KM">कोमोरोज</territory>
-			<territory type="KN">सेंट किट�स आणि नेव�हिस</territory>
-			<territory type="KP">उत�तर कोरिया</territory>
-			<territory type="KR">दक�षिण कोरिया</territory>
-			<territory type="KW">क�वेत</territory>
-			<territory type="KY">केमन बेटे</territory>
-			<territory type="KZ">क�ाकस�तान</territory>
-			<territory type="LA">लाओस</territory>
-			<territory type="LB">लेबानन</territory>
-			<territory type="LC">सेंट ल�यूसिया</territory>
-			<territory type="LI">लिंचेनस�टाइन</territory>
-			<territory type="LK">श�रीलंका</territory>
-			<territory type="LR">लायबेरिया</territory>
-			<territory type="LS">लेसोथो</territory>
-			<territory type="LT">लिथ�आनिया</territory>
-			<territory type="LU">लक��ेंबर�ग</territory>
-			<territory type="LV">लाट�‌विया</territory>
-			<territory type="LY">लिबिया</territory>
-			<territory type="MA">मोरोक�को</territory>
-			<territory type="MC">मोनॅको</territory>
-			<territory type="MD">मोल�डोव�हा</territory>
-			<territory type="ME">मोंटेनेग�रो</territory>
-			<territory type="MF">सेंट मार�टिन</territory>
-			<territory type="MG">मादागास�कर</territory>
-			<territory type="MH">मार�शल बेटे</territory>
-			<territory type="MK">मॅसेडोनिया</territory>
-			<territory type="ML">माली</territory>
-			<territory type="MM">म�यानमार</territory>
-			<territory type="MN">मंगोलिया</territory>
-			<territory type="MO">मकाऊ SAR चीन</territory>
-			<territory type="MP">उत�तरी मारियाना बेटे</territory>
-			<territory type="MQ">मार�टिनिक</territory>
-			<territory type="MR">मॉरिटानिया</territory>
-			<territory type="MS">मॉन�ट�सेराट</territory>
-			<territory type="MT">माल�टा</territory>
-			<territory type="MU">मॉरिशस</territory>
-			<territory type="MV">मालदीव�ज</territory>
-			<territory type="MW">मलावी</territory>
-			<territory type="MX">मेक�सिको</territory>
-			<territory type="MY">मलेशिया</territory>
-			<territory type="MZ">मो�ाम�बिक</territory>
-			<territory type="NA">नमीबिया</territory>
-			<territory type="NC">न�यू कॅलेडोनिया</territory>
-			<territory type="NE">नाइजर</territory>
-			<territory type="NF">नॉरफॉक बेट</territory>
-			<territory type="NG">नायजेरिया</territory>
-			<territory type="NI">निकाराग�वे</territory>
-			<territory type="NL">नेदरल�ड</territory>
-			<territory type="NO">नॉर�वे</territory>
-			<territory type="NP">नेपाळ</territory>
-			<territory type="NR">नऊर�</territory>
-			<territory type="NU">नीयू</territory>
-			<territory type="NZ">न�यू�ीलंड</territory>
-			<territory type="OM">ओमान</territory>
-			<territory type="PA">पनामा</territory>
-			<territory type="PE">पेरू</territory>
-			<territory type="PF">फ�रेंच पॉलिनेशिया</territory>
-			<territory type="PG">पाप�आ न�यू गिनी</territory>
-			<territory type="PH">फिलीपिन�स</territory>
-			<territory type="PK">पाकिस�तान</territory>
-			<territory type="PL">पोलंड</territory>
-			<territory type="PM">सेंट पियरे आणि मिक�वेलोन</territory>
-			<territory type="PN">पिटकॅर�न</territory>
-			<territory type="PR">पोर�टो रिको</territory>
-			<territory type="PS">पॅलेस�टिनी प�रदेश</territory>
-			<territory type="PT">पोर�त�गाल</territory>
-			<territory type="PW">पलाऊ</territory>
-			<territory type="PY">पराग�वे</territory>
-			<territory type="QA">कतार</territory>
-			<territory type="QO">आउटलायिंग ओशनिया</territory>
-			<territory type="QU">यूरोपीय संघ</territory>
-			<territory type="RE">रियूनियन</territory>
-			<territory type="RO">रोमानिया</territory>
-			<territory type="RS">सर�बिया</territory>
-			<territory type="RU">रशिया</territory>
-			<territory type="RW">रवांडा</territory>
-			<territory type="SA">सौदी अरब</territory>
-			<territory type="SB">सोलोमन बेटे</territory>
-			<territory type="SC">सेशेल�स</territory>
-			<territory type="SD">सूदान</territory>
-			<territory type="SE">स�वीडन</territory>
-			<territory type="SG">सिंगापूर</territory>
-			<territory type="SH">सेंट हेलेना</territory>
-			<territory type="SI">स�लोव�हेनिया</territory>
-			<territory type="SJ">स�वालबर�ड आणि जान मायेन</territory>
-			<territory type="SK">स�लोव�हाकिया</territory>
-			<territory type="SL">सि�रा लेओन</territory>
-			<territory type="SM">सॅन मरीनो</territory>
-			<territory type="SN">सेनेगल</territory>
-			<territory type="SO">सोमालिया</territory>
-			<territory type="SR">स�रिनाम</territory>
-			<territory type="ST">साओ टोम आणि प�रिंसिपे</territory>
-			<territory type="SV">अल साल�वाडोर</territory>
-			<territory type="SY">सीरिया</territory>
-			<territory type="SZ">स�वा�िल�ड</territory>
-			<territory type="TC">टर�क�स आणि कैकोस बेटे</territory>
-			<territory type="TD">चाड</territory>
-			<territory type="TF">फ�रेंच दाक�षिणात�य प�रदेश</territory>
-			<territory type="TG">टोगो</territory>
-			<territory type="TH">थायलंड</territory>
-			<territory type="TJ">ताजिकिस�तान</territory>
-			<territory type="TK">तोकेलाउ</territory>
-			<territory type="TL">पूर�व तिमोर</territory>
-			<territory type="TM">त�र�कमेनिस�तान</territory>
-			<territory type="TN">ट�यूनिशिया</territory>
-			<territory type="TO">टोंगा</territory>
-			<territory type="TR">त�र�की</territory>
-			<territory type="TT">त�रिनिदाद आणि टोबॅगो</territory>
-			<territory type="TV">ट�वाल�</territory>
-			<territory type="TW">तैवान</territory>
-			<territory type="TZ">टां�ानिया</territory>
-			<territory type="UA">यूक�रेन</territory>
-			<territory type="UG">य�गांडा</territory>
-			<territory type="UM">य�नाइटेड स�टेट�स माइनर आउटलाइंग बेटे</territory>
-			<territory type="US">संय�क�त राज�ये /अमेरिका</territory>
-			<territory type="UY">उर�ग�वे</territory>
-			<territory type="UZ">उ�बेकिस�तान</territory>
-			<territory type="VA">व�हॅटिकन</territory>
-			<territory type="VC">सेंट व�हिन�सेंट आणि ग�रेनडाइन�स</territory>
-			<territory type="VE">व�हेने���ला</territory>
-			<territory type="VG">ब�रिटिश व�हर�जिन बेटे</territory>
-			<territory type="VI">यू.�स. व�हर�जिन बेटे</territory>
-			<territory type="VN">व�हि�तनाम</territory>
-			<territory type="VU">वानौट�</territory>
-			<territory type="WF">वालिस आणि फ�यूचूना</territory>
-			<territory type="WS">सामोआ</territory>
-			<territory type="YE">येमेन</territory>
-			<territory type="YT">मायोट�टे</territory>
-			<territory type="ZA">दक�षिण अफ�रिका</territory>
-			<territory type="ZM">�ाम�बिया</territory>
-			<territory type="ZW">�िम�बाब�वे</territory>
-			<territory type="ZZ">अज�ञात वा अवैध प�रदेश</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[़ �-ः ०-९ � अ-� �-ऑ ओ-न प-र ल ळ व-ह ऽ-ॅ े-ॉ ो-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">जानेवारी</month>
-							<month type="2">फेब�र�वारी</month>
-							<month type="3">मार�च</month>
-							<month type="4">�प�रिल</month>
-							<month type="5">मे</month>
-							<month type="6">जून</month>
-							<month type="7">ज�लै</month>
-							<month type="8">ऑगस�ट</month>
-							<month type="9">सप�टेंबर</month>
-							<month type="10">ऑक�टोबर</month>
-							<month type="11">नोव�हेंबर</month>
-							<month type="12">डिसेंबर</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">जा</month>
-							<month type="2">फे</month>
-							<month type="3">मा</month>
-							<month type="4">�</month>
-							<month type="5">मे</month>
-							<month type="6">जू</month>
-							<month type="7">ज�</month>
-							<month type="8">ऑ</month>
-							<month type="9">स</month>
-							<month type="10">ऑ</month>
-							<month type="11">नो</month>
-							<month type="12">डि</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">रवि</day>
-							<day type="mon">सोम</day>
-							<day type="tue">मंगळ</day>
-							<day type="wed">ब�ध</day>
-							<day type="thu">ग�र�</day>
-							<day type="fri">श�क�र</day>
-							<day type="sat">शनि</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">रविवार</day>
-							<day type="mon">सोमवार</day>
-							<day type="tue">मंगळवार</day>
-							<day type="wed">ब�धवार</day>
-							<day type="thu">ग�र�वार</day>
-							<day type="fri">श�क�रवार</day>
-							<day type="sat">शनिवार</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">र</day>
-							<day type="mon">सो</day>
-							<day type="tue">मं</day>
-							<day type="wed">ब�</day>
-							<day type="thu">ग�</day>
-							<day type="fri">श�</day>
-							<day type="sat">श</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">प�रथम तिमाही</quarter>
-							<quarter type="2">द�वितीय तिमाही</quarter>
-							<quarter type="3">तृतीय तिमाही</quarter>
-							<quarter type="4">चत�र�थ तिमाही</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ईसवीसनपूर�व</era>
-						<era type="1">ईसवीसन</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ई.स.पू.</era>
-						<era type="1">ई.स.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h-mm-ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h-mm-ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h-mm-ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h-mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Hm">H-mm</dateFormatItem>
-						<dateFormatItem id="Hms">H-mm-ss</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>य�ग</displayName>
-					</field>
-					<field type="year">
-						<displayName>वर�ष</displayName>
-					</field>
-					<field type="month">
-						<displayName>महिना</displayName>
-					</field>
-					<field type="week">
-						<displayName>आठवडा</displayName>
-					</field>
-					<field type="day">
-						<displayName>दिवस</displayName>
-						<relative type="-3">तीन दिवसांपूर�वी</relative>
-						<relative type="-2">परवा</relative>
-						<relative type="-1">काल</relative>
-						<relative type="0">आज</relative>
-						<relative type="1">उद�या</relative>
-						<relative type="2">परवा</relative>
-						<relative type="3">आजपासून तीन दिवस</relative>
-					</field>
-					<field type="weekday">
-						<displayName>आठवड�याचा दिवस</displayName>
-					</field>
-					<field type="hour">
-						<displayName>तास</displayName>
-					</field>
-					<field type="minute">
-						<displayName>मिनिट</displayName>
-					</field>
-					<field type="second">
-						<displayName>सेकंद</displayName>
-					</field>
-					<field type="zone">
-						<displayName>�ोन</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<metazone type="India">
-				<long>
-					<standard>भारतीय समय</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>deva</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>र�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>होयःहो</yesstr>
-			<nostr>नाहीःना</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/mr_IN.xml b/airtime_mvc/library/Zend/Locale/Data/mr_IN.xml
deleted file mode 100644
index a4c48c95d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mr_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mr"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ms.xml b/airtime_mvc/library/Zend/Locale/Data/ms.xml
deleted file mode 100644
index 5110b10f3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ms.xml
+++ /dev/null
@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.69 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ms"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikaans</language>
-			<language type="am">Amharic</language>
-			<language type="ar">Arab</language>
-			<language type="as">Assam</language>
-			<language type="az">Azerbaijan</language>
-			<language type="be">Belarus</language>
-			<language type="bg">Bulgaria</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Benggala</language>
-			<language type="br">Brittany</language>
-			<language type="bs">Bosnia</language>
-			<language type="ca">Catalonia</language>
-			<language type="cs">Czech</language>
-			<language type="cy">Wales</language>
-			<language type="da">Denmark</language>
-			<language type="de">Jerman</language>
-			<language type="el">Greek</language>
-			<language type="en">Inggeris</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Sepanyol</language>
-			<language type="et">Estonia</language>
-			<language type="eu">Basque</language>
-			<language type="fa">Parsi</language>
-			<language type="fi">Finland</language>
-			<language type="fil">Tagalog</language>
-			<language type="fo">Faroese</language>
-			<language type="fr">Perancis</language>
-			<language type="fy">Frisian</language>
-			<language type="ga">Ireland</language>
-			<language type="gd">Scots Gaelic</language>
-			<language type="gl">Galicia</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Gujerat</language>
-			<language type="he">Ibrani</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Croat</language>
-			<language type="hu">Hungary</language>
-			<language type="hy">Armenia</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesia</language>
-			<language type="ie">Interlingue</language>
-			<language type="is">Iceland</language>
-			<language type="it">Itali</language>
-			<language type="ja">Jepun</language>
-			<language type="jv">Jawa</language>
-			<language type="ka">Georgia</language>
-			<language type="km">Khmer</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korea</language>
-			<language type="ku">Kurdish</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Latin</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laos</language>
-			<language type="lt">Lithuania</language>
-			<language type="lv">Latvia</language>
-			<language type="mk">Macedonia</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongolia</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Bahasa Melayu</language>
-			<language type="mt">Malta</language>
-			<language type="ne">Nepal</language>
-			<language type="nl">Belanda</language>
-			<language type="nn">Nynorsk Norway</language>
-			<language type="no">Norway</language>
-			<language type="oc">Occitan</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Punjabi</language>
-			<language type="pl">Poland</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portugis</language>
-			<language type="pt_PT">Portugis Iberia</language>
-			<language type="ro">Romania</language>
-			<language type="ru">Rusia</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sd">Sindhi</language>
-			<language type="sh">SerboCroatia</language>
-			<language type="si">Sinhala</language>
-			<language type="sk">Slovak</language>
-			<language type="sl">Slovenia</language>
-			<language type="so">Somali</language>
-			<language type="sq">Albania</language>
-			<language type="sr">Serbia</language>
-			<language type="st">Sesoto</language>
-			<language type="su">Sunda</language>
-			<language type="sv">Sweden</language>
-			<language type="sw">Swahili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Turkmen</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Turki</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Ukraine</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbek</language>
-			<language type="vi">Vietnam</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Yahudi</language>
-			<language type="zu">Zulu</language>
-		</languages>
-		<territories>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiriah Arab Bersatu</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua dan Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Netherlands Antilles</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">American Samoa</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bosnia dan Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgium</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet Island</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Cocos (Keeling) Islands</territory>
-			<territory type="CD">Democratic Republic of the Congo</territory>
-			<territory type="CF">Republik Afrika Tengah</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Switzerland</territory>
-			<territory type="CI">Pantai Gading</territory>
-			<territory type="CK">Cook Islands</territory>
-			<territory type="CL">Cile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Cina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Serbia dan Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cape Verde</territory>
-			<territory type="CX">Christmas Island</territory>
-			<territory type="CY">Kibris</territory>
-			<territory type="CZ">Republik Czech</territory>
-			<territory type="DE">Jerman</territory>
-			<territory type="DJ">Jibouti</territory>
-			<territory type="DK">Denmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Republik Dominican</territory>
-			<territory type="DZ">Aljazair</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Mesir</territory>
-			<territory type="EH">Sahara Barat</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Sepanyol</territory>
-			<territory type="ET">Ethiopia</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falkland Islands</territory>
-			<territory type="FM">Micronesia</territory>
-			<territory type="FO">Faroe Islands</territory>
-			<territory type="FR">Perancis</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">French Guiana</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Greenland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Equatorial Guinea</territory>
-			<territory type="GR">Yunani</territory>
-			<territory type="GS">South Georgia and the South Sandwich Islands</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong S.A.R., China</territory>
-			<territory type="HM">Heard Island and McDonald Islands</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungari</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Ireland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IN">Hindia</territory>
-			<territory type="IO">British Indian Ocean Territory</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Iceland</territory>
-			<territory type="IT">Itali</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Jepun</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kyrgyzstan</territory>
-			<territory type="KH">Kemboja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoros</territory>
-			<territory type="KN">Saint Kitts dan Nevis</territory>
-			<territory type="KP">Utara Korea</territory>
-			<territory type="KR">Selatan Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Cayman Islands</territory>
-			<territory type="KZ">Kazakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lubnan</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lithuania</territory>
-			<territory type="LU">Luksembourg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Maghribi</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Kepulauan Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao S.A.R., China</territory>
-			<territory type="MP">Northern Mariana Islands</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldiv</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">New Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Island</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Belanda</territory>
-			<territory type="NO">Norway</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">French Polynesia</territory>
-			<territory type="PG">Papua New Guinea</territory>
-			<territory type="PH">Filipina</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poland</territory>
-			<territory type="PM">Saint Pierre and Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinian Territory</territory>
-			<territory type="PT">Feringgi</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Arab Saudi</territory>
-			<territory type="SB">Kepulauan Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapura</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard and Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Siera Leon</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome dan Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks and Caicos Islands</territory>
-			<territory type="TD">Cad</territory>
-			<territory type="TF">French Southern Territories</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor-Leste</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turki</territory>
-			<territory type="TT">Trinidad dan Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">United States Minor Outlying Islands</territory>
-			<territory type="US">Amerika Syarikat</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatican</territory>
-			<territory type="VC">Saint Vincent dan Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">British Virgin Islands</territory>
-			<territory type="VI">U.S. Virgin Islands</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis and Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yaman</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Afrika Selatan</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a {ai} {au} b-d {dz} e-k {kh} l-n {ng} {ngg} {ny} o-s {sy} t {ts} u {ua} v-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mac</month>
-							<month type="4">Apr</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Ogos</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januari</month>
-							<month type="2">Februari</month>
-							<month type="3">Mac</month>
-							<month type="4">April</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Julai</month>
-							<month type="8">Ogos</month>
-							<month type="9">September</month>
-							<month type="10">Oktober</month>
-							<month type="11">November</month>
-							<month type="12">Disember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ahd</day>
-							<day type="mon">Isn</day>
-							<day type="tue">Sel</day>
-							<day type="wed">Rab</day>
-							<day type="thu">Kha</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ahad</day>
-							<day type="mon">Isnin</day>
-							<day type="tue">Selasa</day>
-							<day type="wed">Rabu</day>
-							<day type="thu">Khamis</day>
-							<day type="fri">Jumaat</day>
-							<day type="sat">Sabtu</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">S1</quarter>
-							<quarter type="2">S2</quarter>
-							<quarter type="3">S3</quarter>
-							<quarter type="4">S4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">suku pertama</quarter>
-							<quarter type="2">suku kedua</quarter>
-							<quarter type="3">suku ketiga</quarter>
-							<quarter type="4">suku keempat</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">S.M.</era>
-						<era type="1">T.M.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Hmm">H:mm</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="MYR">
-				<displayName>Ringgit Malaysia</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ya:y</yesstr>
-			<nostr>tidak:t</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ms_BN.xml b/airtime_mvc/library/Zend/Locale/Data/ms_BN.xml
deleted file mode 100644
index e2cecf5af..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ms_BN.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ms"/>
-		<territory type="BN"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss aa zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM - yyyy-MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM - yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BND">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ms_MY.xml b/airtime_mvc/library/Zend/Locale/Data/ms_MY.xml
deleted file mode 100644
index 471979b28..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ms_MY.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ms"/>
-		<territory type="MY"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/mt.xml b/airtime_mvc/library/Zend/Locale/Data/mt.xml
deleted file mode 100644
index 0eb36a642..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mt.xml
+++ /dev/null
@@ -1,1140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.91 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="mt"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abkażjan</language>
-			<language type="ace">Aċiniż</language>
-			<language type="ach">Akoli</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adyghe</language>
-			<language type="ae">Avestan</language>
-			<language type="af">Afrikans</language>
-			<language type="afa">Afro-Asjatiku (Oħra)</language>
-			<language type="afh">Afriħili</language>
-			<language type="ain">Ajnu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadjen</language>
-			<language type="ale">Aleut</language>
-			<language type="alg">Lingwi Algonqwinjani</language>
-			<language type="am">Amħariku</language>
-			<language type="an">Aragonese</language>
-			<language type="ang">Ingliż, Antik</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Lingwi Apaċi</language>
-			<language type="ar">Għarbi</language>
-			<language type="arc">Aramajk</language>
-			<language type="arn">Arawkanjan</language>
-			<language type="arp">Arapaħo</language>
-			<language type="art">Artifiċjali (Oħra)</language>
-			<language type="arw">Arawak</language>
-			<language type="as">Assamese</language>
-			<language type="ast">Asturian</language>
-			<language type="ath">Lingwi Atabaskani</language>
-			<language type="aus">Lingwi Awstraljani</language>
-			<language type="av">Avarik</language>
-			<language type="awa">Awadħi</language>
-			<language type="ay">Ajmara</language>
-			<language type="az">Ażerbajġani</language>
-			<language type="ba">Baxkir</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Lingwi Bamileke</language>
-			<language type="bal">Baluċi</language>
-			<language type="ban">Baliniż</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Baltiku (Oħra)</language>
-			<language type="be">Belarussu</language>
-			<language type="bej">Beja</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Beber</language>
-			<language type="bg">Bulgaru</language>
-			<language type="bh">Biħari</language>
-			<language type="bho">Bojpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengali</language>
-			<language type="bnt">Bantu</language>
-			<language type="bo">Tibetjan</language>
-			<language type="br">Brenton</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Bosnijan</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Burjat</language>
-			<language type="bug">Buginiż</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalan</language>
-			<language type="cad">Kaddo</language>
-			<language type="cai">Amerika Ċentrali (Oħra)</language>
-			<language type="car">Karib</language>
-			<language type="cau">Kawkasu (Oħra)</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Ċeċen</language>
-			<language type="ceb">Sibwano</language>
-			<language type="cel">Keltiku (Oħra)</language>
-			<language type="ch">ÄŠamorro</language>
-			<language type="chb">Ċibċa</language>
-			<language type="chg">ÄŠagataj</language>
-			<language type="chk">ÄŠukese</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Ġargon taċ-Ċinuk</language>
-			<language type="cho">ÄŠostaw</language>
-			<language type="chp">ÄŠipewjan</language>
-			<language type="chr">ÄŠerokij</language>
-			<language type="chy">Xajenn</language>
-			<language type="cmc">Lingwi ÄŠamiki</language>
-			<language type="co">Korsiku</language>
-			<language type="cop">Koptiku</language>
-			<language type="cpe">Kreoli u Piġini, Bbażat fuq l-Ingliż (Oħra)</language>
-			<language type="cpf">Kreoli u Piġini, Bbażat fuq il-Franċiż (Oħra)</language>
-			<language type="cpp">Kreoli u Piġini, Bbażat fuq il-Portugiż (Oħra)</language>
-			<language type="cr">Krij</language>
-			<language type="crh">Crimean Turkish; Crimean Tatar</language>
-			<language type="crp">Kreoli u Piġini (Oħra)</language>
-			<language type="cs">ÄŠek</language>
-			<language type="csb">Kashubian</language>
-			<language type="cu">Slaviku tal-Knisja</language>
-			<language type="cus">Kuxtiku (Oħra)</language>
-			<language type="cv">ÄŠuvax</language>
-			<language type="cy">Welx</language>
-			<language type="da">Daniż</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargwa</language>
-			<language type="day">Dajak</language>
-			<language type="de">Ġermaniż</language>
-			<language type="del">Delawerjan</language>
-			<language type="den">Slav</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravidjan (Oħra)</language>
-			<language type="dsb">Lower Sorbian</language>
-			<language type="dua">Dwala</language>
-			<language type="dum">Olandiż, Medjevali</language>
-			<language type="dv">Diveħi</language>
-			<language type="dyu">Djula</language>
-			<language type="dz">Dżongka</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">EÄ¡izzjan (Antik)</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Grieg</language>
-			<language type="elx">Elamit</language>
-			<language type="en">Ingliż</language>
-			<language type="enm">Ingliż, Medjevali (1100-1500)</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanjol</language>
-			<language type="et">Estonjan</language>
-			<language type="eu">Bask</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Persjan</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulaħ</language>
-			<language type="fi">Finlandiż</language>
-			<language type="fil">Filippino</language>
-			<language type="fiu">Finno - Ugrijan</language>
-			<language type="fj">Fiġi</language>
-			<language type="fo">Fawriż</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Franċiż</language>
-			<language type="frm">Franċiż, Medjevali</language>
-			<language type="fro">Franċiż, Antik</language>
-			<language type="fur">Frijuljan</language>
-			<language type="fy">Friżjan</language>
-			<language type="ga">Irlandiż</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gajo</language>
-			<language type="gba">Gbaja</language>
-			<language type="gd">Galliku Skoċċiż</language>
-			<language type="gem">Ġermaniku (Oħra)</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbertjan</language>
-			<language type="gl">Gallegjan</language>
-			<language type="gmh">Ä ermaniku, Medjevali Pulit</language>
-			<language type="gn">Gwarani</language>
-			<language type="goh">Ä ermaniku, Antik Pulit</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gotiku</language>
-			<language type="grb">Ä erbo</language>
-			<language type="grc">Grieg, Antik (to 1453)</language>
-			<language type="gu">Guġarati</language>
-			<language type="gv">Manks</language>
-			<language type="gwi">Gwiċin</language>
-			<language type="ha">Ħawsa</language>
-			<language type="hai">Ħajda</language>
-			<language type="haw">Ħawajjan</language>
-			<language type="he">Ebrajk</language>
-			<language type="hi">Ħindi</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Ħimaċali</language>
-			<language type="hit">Ħittit</language>
-			<language type="hmn">Ħmong</language>
-			<language type="ho">Ħiri Motu</language>
-			<language type="hr">Kroat</language>
-			<language type="hsb">Upper Sorbian</language>
-			<language type="ht">Haitian</language>
-			<language type="hu">Ungeriż</language>
-			<language type="hup">Ħupa</language>
-			<language type="hy">Armenjan</language>
-			<language type="hz">Ħerero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indoneżjan</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">IÄ¡o</language>
-			<language type="ik">Inupjak</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Indjan (Oħra)</language>
-			<language type="ine">Indo-Ewropew</language>
-			<language type="inh">Ingush</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iranjan</language>
-			<language type="iro">Lingwi Irogwjani</language>
-			<language type="is">Iżlandiż</language>
-			<language type="it">Taljan</language>
-			<language type="iu">Inukitut</language>
-			<language type="ja">Ġappuniż</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Lhudi-Persjan</language>
-			<language type="jrb">Lhudi-Għarbi</language>
-			<language type="jv">Ġavaniż</language>
-			<language type="ka">Ġorġjan</language>
-			<language type="kaa">Kara-Kalpak</language>
-			<language type="kab">Kabuljan</language>
-			<language type="kac">Kaċin</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardian</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Kasi</language>
-			<language type="khi">Kojsan</language>
-			<language type="kho">Kotaniż</language>
-			<language type="ki">Kikuju</language>
-			<language type="kj">Kuanyama</language>
-			<language type="kk">Każak</language>
-			<language type="kl">Kalallisut</language>
-			<language type="km">Kmer</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korejan</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosrejan</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Karachay-Balkar</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurusk</language>
-			<language type="ks">Kaxmiri</language>
-			<language type="ku">Kurdiż</language>
-			<language type="kum">Kumiku</language>
-			<language type="kut">Kutenaj</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Korniku</language>
-			<language type="ky">Kirgiż</language>
-			<language type="la">Latin</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Landa</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Letżburgiż</language>
-			<language type="lez">Leżgjan</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburgish</language>
-			<language type="ln">Lingaljan</language>
-			<language type="lo">Lao</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lożi</language>
-			<language type="lt">Litwanjan</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Luluwa</language>
-			<language type="lui">Luwisinuż</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luwa</language>
-			<language type="lus">Luxaj</language>
-			<language type="lv">Latvjan (Lettix)</language>
-			<language type="mad">Maduriż</language>
-			<language type="mag">Magaħi</language>
-			<language type="mai">Majtili</language>
-			<language type="mak">Makasar</language>
-			<language type="man">Mandingwan</language>
-			<language type="map">Awstronesjan</language>
-			<language type="mas">Masaj</language>
-			<language type="mdf">Moksha</language>
-			<language type="mdr">Mandar</language>
-			<language type="men">Mende</language>
-			<language type="mg">Malagażi</language>
-			<language type="mga">Irlandiż, Medjevali (900-1200)</language>
-			<language type="mh">Marxall</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Mikmek</language>
-			<language type="min">Minangkabaw</language>
-			<language type="mis">Lingwi Oħra</language>
-			<language type="mk">Maċedonjan</language>
-			<language type="mkh">Mon-Kmer (Oħra)</language>
-			<language type="ml">Malajalam</language>
-			<language type="mn">Mongoljan</language>
-			<language type="mnc">Manċurjan</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Lingwi Manobo</language>
-			<language type="mo">Moldavjan</language>
-			<language type="moh">Moħak</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marati</language>
-			<language type="ms">Malajan</language>
-			<language type="mt">Malti</language>
-			<language type="mul">Lingwi Diversi</language>
-			<language type="mun">Lingwi tal-Munda</language>
-			<language type="mus">Kriek</language>
-			<language type="mwl">Mirandiż</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Burmiż</language>
-			<language type="myn">Majan</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nawuru</language>
-			<language type="nah">Naħwatil</language>
-			<language type="nai">Indjan tal-Amerika ta’ Fuq (Oħra)</language>
-			<language type="nap">Neapolitan</language>
-			<language type="nb">Bokmahal Norveġiż</language>
-			<language type="nd">Ndebele, ta’ Fuq</language>
-			<language type="nds">Ġermaniż Komuni; Sassonu Komuni</language>
-			<language type="ne">Nepaliż</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nijas</language>
-			<language type="nic">Niġerjan - Kordofanjan</language>
-			<language type="niu">Nijuwejan</language>
-			<language type="nl">Olandiż</language>
-			<language type="nn">Ninorsk Norveġiż</language>
-			<language type="no">Norveġiż</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Skandinav, Antik</language>
-			<language type="nr">Ndebele, t’Isfel</language>
-			<language type="nso">Soto, ta’ Fuq</language>
-			<language type="nub">Lingwi Nubjani</language>
-			<language type="nv">Navaħo</language>
-			<language type="nwc">Classical Newari</language>
-			<language type="ny">Ċiċewa; Njanġa</language>
-			<language type="nym">Njamweżi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Njoro</language>
-			<language type="nzi">Nżima</language>
-			<language type="oc">OÄ‹Ä‹itan</language>
-			<language type="oj">OÄ¡ibwa</language>
-			<language type="om">Oromo (Afan)</language>
-			<language type="or">Orija</language>
-			<language type="os">Ossettiku</language>
-			<language type="osa">Osaġjan</language>
-			<language type="ota">Tork (Imperu Ottoman)</language>
-			<language type="oto">Lingwi Otomjani</language>
-			<language type="pa">Punġabi</language>
-			<language type="paa">Papwan (Oħra)</language>
-			<language type="pag">Pangasinjan</language>
-			<language type="pal">Paħlavi</language>
-			<language type="pam">Pampamga</language>
-			<language type="pap">Papjamento</language>
-			<language type="pau">Palawjan</language>
-			<language type="peo">Persjan Antik</language>
-			<language type="phi">Filippin (Oħra)</language>
-			<language type="phn">Feniċju</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Pollakk</language>
-			<language type="pon">Ponpejan</language>
-			<language type="pra">Lingwi Prakriti</language>
-			<language type="pro">Provenzal, Antik (sa l-1500)</language>
-			<language type="ps">Paxtun</language>
-			<language type="pt">Portugiż</language>
-			<language type="qu">Keċwa</language>
-			<language type="raj">Raġastani</language>
-			<language type="rap">Rapanwi</language>
-			<language type="rar">Rarotongani</language>
-			<language type="rm">Reto-Romanz</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Rumen</language>
-			<language type="roa">Romanz (Oħra)</language>
-			<language type="rom">Żingaru</language>
-			<language type="root">Għerq</language>
-			<language type="ru">Russu</language>
-			<language type="rup">Aromanijan</language>
-			<language type="rw">Kinjarwanda</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Jakut</language>
-			<language type="sai">Indjan tal-Amerika t’Isfel (Oħra)</language>
-			<language type="sal">Salixan</language>
-			<language type="sam">Samritan</language>
-			<language type="sas">Saska</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardinjan</language>
-			<language type="sco">Skoċċiż</language>
-			<language type="sd">Sindi</language>
-			<language type="se">Sami ta’ Fuq</language>
-			<language type="sel">Selkup</language>
-			<language type="sem">Semitiku</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Irlandiż, Antik (sa l-900)</language>
-			<language type="sgn">Lingwa tas-Sinjali</language>
-			<language type="sh">Serbo-Kroat</language>
-			<language type="shn">Xan</language>
-			<language type="si">Sinħaliż</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Lingwi Suwjani</language>
-			<language type="sit">Sino-Tibetjani (Oħra)</language>
-			<language type="sk">Slovakk</language>
-			<language type="sl">Sloven</language>
-			<language type="sla">Slavic (Other)</language>
-			<language type="sm">Samojan</language>
-			<language type="sma">Southern Sami</language>
-			<language type="smi">Sami languages (Other)</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Xona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somali</language>
-			<language type="sog">Sogdien</language>
-			<language type="son">Songaj</language>
-			<language type="sq">Albaniż</language>
-			<language type="sr">Serb</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Swati</language>
-			<language type="ssa">Nilo-Saħaram</language>
-			<language type="st">Soto, t’Isfel</language>
-			<language type="su">Sundaniż</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumerjan</language>
-			<language type="sv">Svediż</language>
-			<language type="sw">Swaħili</language>
-			<language type="syr">Sirjan</language>
-			<language type="ta">Tamil</language>
-			<language type="tai">Tai (Oħra)</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Taġik</language>
-			<language type="th">Tajlandiż</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmeni</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">Tamaxek</language>
-			<language type="tn">Zwana</language>
-			<language type="to">Tongan (Gżejjer ta’ Tonga)</language>
-			<language type="tog">Tonga (Njasa)</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Tork</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Zimxjan</language>
-			<language type="tt">Tatar</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi languages</language>
-			<language type="tut">Altajk (Oħra)</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Taħitjan</language>
-			<language type="tyv">Tuvinjan</language>
-			<language type="udm">Udmurt</language>
-			<language type="ug">Wigur</language>
-			<language type="uga">Ugaritiku</language>
-			<language type="uk">Ukranjan</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Indeterminat</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Użbek</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vjetnamiż</language>
-			<language type="vo">Volapuk</language>
-			<language type="vot">Votik</language>
-			<language type="wa">Walloon</language>
-			<language type="wak">Lingwi Wakaxani</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waraj</language>
-			<language type="was">Waxo</language>
-			<language type="wen">Lingwi Sorbjani</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmyk</language>
-			<language type="xh">Ħoża</language>
-			<language type="yao">Jao</language>
-			<language type="yap">Japese</language>
-			<language type="yi">Jiddix</language>
-			<language type="yo">Joruba</language>
-			<language type="ypk">Lingwi Jupiċi</language>
-			<language type="za">Żwang</language>
-			<language type="zap">Żapotek</language>
-			<language type="zen">Żenaga</language>
-			<language type="zh">Ċiniż</language>
-			<language type="znd">Żande</language>
-			<language type="zu">Żulu</language>
-			<language type="zun">Żuni</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Għarbi</script>
-			<script type="Grek">Grieg</script>
-			<script type="Hans">Ħan Sempliċi</script>
-			<script type="Hant">Ħan Tradizzjonali</script>
-			<script type="Latn">Latin</script>
-			<script type="Xpeo">Persjan Antik</script>
-			<script type="Zxxx">Mhux Miktub</script>
-			<script type="Zyyy">Komuni</script>
-			<script type="Zzzz">Skritt Mhux Magħruf jew Mhux Validu</script>
-		</scripts>
-		<territories>
-			<territory type="001">Dinja</territory>
-			<territory type="002">Affrika</territory>
-			<territory type="003">Amerika ta’ Fuq</territory>
-			<territory type="005">Amerika t’Isfel</territory>
-			<territory type="009">OÄ‹ejanja</territory>
-			<territory type="011">Affrika tal-Punent</territory>
-			<territory type="013">Amerika ÄŠentrali</territory>
-			<territory type="014">Affrika tal-Lvant</territory>
-			<territory type="015">Affrika ta’ Fuq</territory>
-			<territory type="017">Affrika Nofsani</territory>
-			<territory type="018">Affrika t’Isfel</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Amerika Nòrdiku</territory>
-			<territory type="029">Karibew</territory>
-			<territory type="030">Asja tal-Lvant</territory>
-			<territory type="034">Asja t’Isfel Ċentrali</territory>
-			<territory type="035">Asja tax-Xlokk</territory>
-			<territory type="039">Ewropa t’Isfel</territory>
-			<territory type="053">Awstralja u New Zealand</territory>
-			<territory type="054">Melanesja</territory>
-			<territory type="057">Reġjun ta’ Mikroneżja</territory>
-			<territory type="061">Polinesja</territory>
-			<territory type="142">Asja</territory>
-			<territory type="143">Asja ÄŠentrali</territory>
-			<territory type="145">Asja tal-Punent</territory>
-			<territory type="150">Ewropa</territory>
-			<territory type="151">Ewropa tal-Lvant</territory>
-			<territory type="154">Ewropa ta’ Fuq</territory>
-			<territory type="155">Ewropa tal-Punent</territory>
-			<territory type="172">Commonwealth tal-Istati Independenti</territory>
-			<territory type="419">Amerika Latina u l-Karibew</territory>
-			<territory type="830">Gżejjer tal-Kanal Ingliż</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emirati Għarab Maqgħuda</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua and Barbuda</territory>
-			<territory type="AI">Angwilla</territory>
-			<territory type="AL">Albanija</territory>
-			<territory type="AM">Armenja</territory>
-			<territory type="AN">Antilles Olandiżi</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antartika</territory>
-			<territory type="AR">Arġentina</territory>
-			<territory type="AS">Samoa Amerikana</territory>
-			<territory type="AT">Awstrija</territory>
-			<territory type="AU">Awstralja</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Gżejjer Aland</territory>
-			<territory type="AZ">Ażerbajġan</territory>
-			<territory type="BA">Bożnija Ħerżegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladexx</territory>
-			<territory type="BE">Belġju</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarija</territory>
-			<territory type="BH">Baħrajn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolivja</territory>
-			<territory type="BR">Brażil</territory>
-			<territory type="BS">Baħamas</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Bouvet Island</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bjelorussja</territory>
-			<territory type="BZ">Beliże</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Cocos (Keeling) Islands</territory>
-			<territory type="CD">Democratic Republic of the Congo</territory>
-			<territory type="CF">Repubblika Afrikana ÄŠentrali</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Svizzera</territory>
-			<territory type="CI">Kosta ta’ l-Avorju</territory>
-			<territory type="CK">Cook Islands</territory>
-			<territory type="CL">ÄŠili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">ÄŠina</territory>
-			<territory type="CO">Kolumbja</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Serbja u Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kape Verde</territory>
-			<territory type="CX">Christmas Island</territory>
-			<territory type="CY">ÄŠipru</territory>
-			<territory type="CZ">Repubblika ÄŠeka</territory>
-			<territory type="DE">Ä ermanja</territory>
-			<territory type="DJ">Ä ibuti</territory>
-			<territory type="DK">Danimarka</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Republikka Domenikana</territory>
-			<territory type="DZ">Alġerija</territory>
-			<territory type="EC">Ekwador</territory>
-			<territory type="EE">Estonja</territory>
-			<territory type="EG">EÄ¡ittu</territory>
-			<territory type="EH">Sahara tal-Punent</territory>
-			<territory type="ER">Eritreja</territory>
-			<territory type="ES">Spanja</territory>
-			<territory type="ET">Etijopja</territory>
-			<territory type="FI">Finlandja</territory>
-			<territory type="FJ">Fiġi</territory>
-			<territory type="FK">Falkland Islands</territory>
-			<territory type="FM">Mikronesja</territory>
-			<territory type="FO">Gżejjer Faroe</territory>
-			<territory type="FR">Franza</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Ingilterra</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Ġorġja</territory>
-			<territory type="GF">Gujana Franċiża</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grinlandja</territory>
-			<territory type="GM">Gambja</territory>
-			<territory type="GN">Gineja</territory>
-			<territory type="GP">Gwadelupe</territory>
-			<territory type="GQ">Ginea Ekwatorjali</territory>
-			<territory type="GR">Greċja</territory>
-			<territory type="GS">South Georgia and the South Sandwich Islands</territory>
-			<territory type="GT">Gwatemala</territory>
-			<territory type="GU">Gwam</territory>
-			<territory type="GW">Ginea-Bissaw</territory>
-			<territory type="GY">Gujana</territory>
-			<territory type="HK">Ħong Kong S.A.R., Ċina</territory>
-			<territory type="HM">Heard Island and McDonald Islands</territory>
-			<territory type="HN">Ħonduras</territory>
-			<territory type="HR">Kroazja</territory>
-			<territory type="HT">Ħaiti</territory>
-			<territory type="HU">Ungerija</territory>
-			<territory type="ID">Indoneżja</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Iżrael</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">Indja</territory>
-			<territory type="IO">British Indian Ocean Territory</territory>
-			<territory type="IQ">Iraq</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islanda</territory>
-			<territory type="IT">Italja</territory>
-			<territory type="JM">Ä amajka</territory>
-			<territory type="JO">Ä ordan</territory>
-			<territory type="JP">Ä appun</territory>
-			<territory type="KE">Kenja</territory>
-			<territory type="KG">Kirgistan</territory>
-			<territory type="KH">Kambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoros</territory>
-			<territory type="KN">Saint Kitts and Nevis</territory>
-			<territory type="KP">Koreja ta’ Fuq</territory>
-			<territory type="KR">Koreja t’Isfel</territory>
-			<territory type="KW">Kuwajt</territory>
-			<territory type="KY">Gżejjer Kajmani</territory>
-			<territory type="KZ">Każakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanu</territory>
-			<territory type="LC">Santa Luċija</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberja</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litwanja</territory>
-			<territory type="LU">Lussemburgu</territory>
-			<territory type="LV">Latvja</territory>
-			<territory type="LY">Libja</territory>
-			<territory type="MA">Marokk</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Maldova</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Gżejjer ta’ Marshall</territory>
-			<territory type="MK">Maċedonja</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mjanmar</territory>
-			<territory type="MN">Mongolja</territory>
-			<territory type="MO">Macao S.A.R., China</territory>
-			<territory type="MP">Gżejjer Marjana ta’ Fuq</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mawritanja</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mawrizju</territory>
-			<territory type="MV">Maldives</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Messiku</territory>
-			<territory type="MY">Malasja</territory>
-			<territory type="MZ">Możambik</territory>
-			<territory type="NA">Namibja</territory>
-			<territory type="NC">New Caledonia</territory>
-			<territory type="NE">Niġer</territory>
-			<territory type="NF">Norfolk Island</territory>
-			<territory type="NG">Niġerja</territory>
-			<territory type="NI">Nikaragwa</territory>
-			<territory type="NL">Olanda</territory>
-			<territory type="NO">Norveġja</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polinesja Franċiża</territory>
-			<territory type="PG">Papwa-Ginea Ä dida</territory>
-			<territory type="PH">Filippini</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonja</territory>
-			<territory type="PM">Saint Pierre and Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinian Territory</territory>
-			<territory type="PT">Portugall</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragwaj</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QU">Unjoni Ewropea</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumanija</territory>
-			<territory type="RU">Russja</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Għarabja Sawdita</territory>
-			<territory type="SB">Solomon Islands</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Żvezja</territory>
-			<territory type="SG">Singapor</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenja</territory>
-			<territory type="SJ">Svalbard and Jan Mayen</territory>
-			<territory type="SK">Slovakkja</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalja</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome and Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Sirja</territory>
-			<territory type="SZ">Sważiland</territory>
-			<territory type="TC">Turks and Caicos Islands</territory>
-			<territory type="TD">ÄŠad</territory>
-			<territory type="TF">Territorji Franċiżi ta’ Nofsinhar</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajlandja</territory>
-			<territory type="TJ">Taġikistan</territory>
-			<territory type="TK">Tokelaw</territory>
-			<territory type="TL">Timor tal-Lvant</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tuneż</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkija</territory>
-			<territory type="TT">Trinidad u Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajwan</territory>
-			<territory type="TZ">Tanżanija</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">United States Minor Outlying Islands</territory>
-			<territory type="US">Stati Uniti</territory>
-			<territory type="UY">Urugwaj</territory>
-			<territory type="UZ">Użbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent and the Grenadines</territory>
-			<territory type="VE">Venezwela</territory>
-			<territory type="VG">British Virgin Islands</territory>
-			<territory type="VI">U.S. Virgin Islands</territory>
-			<territory type="VN">Vjetnam</territory>
-			<territory type="VU">Vanwatu</territory>
-			<territory type="WF">Wallis and Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Majotte</territory>
-			<territory type="ZA">Afrika t’Isfel</territory>
-			<territory type="ZM">Żambja</territory>
-			<territory type="ZW">Żimbabwe</territory>
-			<territory type="ZZ">Reġjun Mhux Magħruf jew Mhux Validu</territory>
-		</territories>
-		<variants>
-			<variant type="REVISED">Ortografija Irriveda</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalendarju</key>
-			<key type="collation">Kollazjoni</key>
-			<key type="currency">Munita</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Ordni Ċiniż Tradizzjonali (Big5)</type>
-			<type type="buddhist" key="calendar">Kalendarju Buddist</type>
-			<type type="chinese" key="calendar">Kalendarju Ċiniż</type>
-			<type type="direct" key="collation">Ordni Diretta</type>
-			<type type="gb2312han" key="collation">Ordni Ċiniż Sempliċi (GB2312)</type>
-			<type type="gregorian" key="calendar">Kalendarju Gregorjan</type>
-			<type type="hebrew" key="calendar">Kalendarju Ebrajk</type>
-			<type type="islamic" key="calendar">Kalendarju Islamiku</type>
-			<type type="islamic-civil" key="calendar">Kalendarju Islamiku-ÄŠivili</type>
-			<type type="japanese" key="calendar">Kalendarju Ġappuniż</type>
-			<type type="phonebook" key="collation">Ordni Telefonika</type>
-			<type type="pinyin" key="collation">Ordni tal-Pinjin</type>
-			<type type="stroke" key="collation">Ordni Maħżuża</type>
-			<type type="traditional" key="collation">Tradizzjonali</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metriku</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Lingwa: {0}</codePattern>
-			<codePattern type="script">Skritt: {0}</codePattern>
-			<codePattern type="territory">Reġjun: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à b ċ d e è f ġ g {għ} h ħ i ì j-o ò p-u ù v-x ż z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c y]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Fra</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">Mej</month>
-							<month type="6">Ä un</month>
-							<month type="7">Lul</month>
-							<month type="8">Aww</month>
-							<month type="9">Set</month>
-							<month type="10">Ott</month>
-							<month type="11">Nov</month>
-							<month type="12">Diċ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Jannar</month>
-							<month type="2">Frar</month>
-							<month type="3">Marzu</month>
-							<month type="4">April</month>
-							<month type="5">Mejju</month>
-							<month type="6">Ä unju</month>
-							<month type="7">Lulju</month>
-							<month type="8">Awwissu</month>
-							<month type="9">Settembru</month>
-							<month type="10">Ottubru</month>
-							<month type="11">Novembru</month>
-							<month type="12">Diċembru</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">Ä </month>
-							<month type="7">L</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Ħad</day>
-							<day type="mon">Tne</day>
-							<day type="tue">Tli</day>
-							<day type="wed">Erb</day>
-							<day type="thu">Ħam</day>
-							<day type="fri">Ä im</day>
-							<day type="sat">Sib</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Il-Ħadd</day>
-							<day type="mon">It-Tnejn</day>
-							<day type="tue">It-Tlieta</day>
-							<day type="wed">L-Erbgħa</day>
-							<day type="thu">Il-Ħamis</day>
-							<day type="fri">Il-Ġimgħa</day>
-							<day type="sat">Is-Sibt</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Ħ</day>
-							<day type="mon">T</day>
-							<day type="tue">T</day>
-							<day type="wed">E</day>
-							<day type="thu">Ħ</day>
-							<day type="fri">Ä </day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>QN</am>
-				<pm>WN</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Qabel Kristu</era>
-						<era type="1">Wara Kristu</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">QK</era>
-						<era type="1">WK</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d 'ta'’ MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'ta'’ MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'ta'’ MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d 'ta'’-d 'ta'’ MMM</greatestDifference>
-							<greatestDifference id="M">d 'ta'’ MMM - d 'ta'’ MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d 'ta'’ - E, d 'ta'’ MMM</greatestDifference>
-							<greatestDifference id="M">E, d 'ta'’ MMM - E, d 'ta'’ MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yyyy - E, dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d 'ta'’-d 'ta'’ MMM y</greatestDifference>
-							<greatestDifference id="M">d 'ta'’ MMM - d 'ta'’ MMM y</greatestDifference>
-							<greatestDifference id="y">d 'ta'’ MMM y - d 'ta'’ MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d 'ta'’ - E, d 'ta'’ MMM y</greatestDifference>
-							<greatestDifference id="M">E, d 'ta'’ MMM - E, d 'ta'’ MMM y</greatestDifference>
-							<greatestDifference id="y">E, d 'ta'’ MMM y - E, d 'ta'’ MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Epoka</displayName>
-					</field>
-					<field type="year">
-						<displayName>Sena</displayName>
-					</field>
-					<field type="month">
-						<displayName>Xahar</displayName>
-					</field>
-					<field type="week">
-						<displayName>Ġimgħa</displayName>
-					</field>
-					<field type="day">
-						<displayName>Jum</displayName>
-						<relative type="-1">Lbieraħ</relative>
-						<relative type="0">Illum</relative>
-						<relative type="1">Għada</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Jum tal-Ġimgħa</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Siegħa</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekonda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Żona</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Ħin ta’ {0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Mhux Magħruf</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londra</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Valletta</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ħin Ċentrali Ewropew</standard>
-					<daylight>Ħin Ċentrali Ewropew tas-Sajf</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="EUR">
-				<displayName>Ewro</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira Maltija</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Munita Mhux Magħruf jew Mhux Validu</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>iva:i</yesstr>
-			<nostr>le:l</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/mt_MT.xml b/airtime_mvc/library/Zend/Locale/Data/mt_MT.xml
deleted file mode 100644
index 67a113d66..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/mt_MT.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="mt"/>
-		<territory type="MT"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/my.xml b/airtime_mvc/library/Zend/Locale/Data/my.xml
deleted file mode 100644
index cae1feab9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/my.xml
+++ /dev/null
@@ -1,1580 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="my"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localeSeparator>�</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ang">အင်္ဂလိပ်စာဟောင်း</language>
-			<language type="ar">အာရေဗီ</language>
-			<language type="art">အယောင်ဆောင် ဘာသာစကား</language>
-			<language type="ban">ဘာလီ</language>
-			<language type="bas">ဘာဆာ</language>
-			<language type="bat">ဘော်လ�စ် ဘာသာစကား</language>
-			<language type="be">ဘီလာရု</language>
-			<language type="bg">ဘူဂေးရီးယား</language>
-			<language type="bn">ဘင်္ဂါလီ</language>
-			<language type="bo">�ိဘက်</language>
-			<language type="bs">ဘော့စ်နီးယား</language>
-			<language type="cai">အလယ်ပိုင်း အမေရိကန် အိန္ဒြိယ ဘာသာစကား</language>
-			<language type="cau">ကောက်ကေးရှပ် ဘာသာစကား</language>
-			<language type="ce">�ျေ�ျင်း</language>
-			<language type="chr">�ျာရိုကီ</language>
-			<language type="cpp">ပေါ်�ူဂီ အ�ြေ�ံ အနောက်အိန္ဒြိယ ကျွန်းစုသား သို့မဟု�် ဗန်းစကား</language>
-			<language type="cr">�ရီး</language>
-			<language type="crp">အနောက်အိန္ဒြိယ ကျွန်းစုသား သို့မဟု�် ဗန်းစကား</language>
-			<language type="cs">�ျက်</language>
-			<language type="cy">�ေလ</language>
-			<language type="da">ဒိန်းမ�်</language>
-			<language type="dak">ဒါကို�ာ</language>
-			<language type="de">ဂျာမန်</language>
-			<language type="de_AT">ဩစ�ြီးယ ဂျာမန်</language>
-			<language type="de_CH">ဆွစ် အမြင့် ဂျာမန်</language>
-			<language type="del">ဒီလာ�ဲ</language>
-			<language type="dum">အလယ်ပိုင်း ဒ�်�ျ်</language>
-			<language type="dz">ဒွန်ကာ</language>
-			<language type="egy">ရှေးဟောင်း အီဂျစ်</language>
-			<language type="el">ဂရိ</language>
-			<language type="en">အင်္ဂလိပ်</language>
-			<language type="en_AU">ဩစ�ြေးလျှ အင်္ဂလိပ်</language>
-			<language type="en_CA">ကနေဒါ အင်္ဂလိပ်</language>
-			<language type="en_GB">ဗြိ�ိသျှ အင်္ဂလိပ်</language>
-			<language type="en_US">အမေရိကန် အင်္ဂလိပ်</language>
-			<language type="enm">အလယ်ပိုင်း အင်္ဂလိပ်</language>
-			<language type="es">စပိန်</language>
-			<language type="es_419">လက်�င်အမေရိက စပိန်</language>
-			<language type="et">အက်စ်�ိုးနီးရန်း</language>
-			<language type="fa">ပါရှန်</language>
-			<language type="fi">ဖင်နစ်ရှ်</language>
-			<language type="fil">ဖိလစ်ပီနို</language>
-			<language type="fj">ဖီဂျီ</language>
-			<language type="fr">ပြင်သစ်</language>
-			<language type="fr_CA">ကနေဒါ ပြင်သစ်</language>
-			<language type="fr_CH">ဆွစ် ပြင်သစ်</language>
-			<language type="frm">အလယ်ပိုင်းပြင်သစ်</language>
-			<language type="fro">ပြင်သစ်ဟောင်း</language>
-			<language type="frr">မြောက်ပိုင်း ဖရီစီရန်</language>
-			<language type="frs">အရှေ့ပိုင်း ဖရီစီရန်</language>
-			<language type="fy">အနောက်ပိုင်း ဖရီစီရန်</language>
-			<language type="ga">အိုင်းရစ်</language>
-			<language type="gem">ဂျာမန် အ�ြေ�ံဘာသာစကား</language>
-			<language type="gmh">အလယ်ပိုင်းအမြင့်ဂျာမန်</language>
-			<language type="grc">ရှေးဟောင်း ဂရိ</language>
-			<language type="gsw">ဆွစ် ဂျာမန်</language>
-			<language type="gu">ဂူဂျာရသီ</language>
-			<language type="haw">ဟာ�ေယံ</language>
-			<language type="he">ဟီးဘရူး</language>
-			<language type="hi">ဟိန္ဒီ</language>
-			<language type="hr">�ရိုအေရှန်</language>
-			<language type="hu">ဟန်ဂေရီ</language>
-			<language type="id">အင်ဒိုနီးရှား</language>
-			<language type="ii">စီ�ျွမ် ရီ</language>
-			<language type="ine">အင်ဒို ဥရောပ ဘာသာစကား</language>
-			<language type="ira">အီရန် အ�ြေ�ံ ဘာသာစကား</language>
-			<language type="it">အီ�လီ</language>
-			<language type="ja">ဂျပန်</language>
-			<language type="jpr">ဂျူဒီယို-ပါရှန်</language>
-			<language type="jrb">ဂျူဒီယို-အာရေဗျ</language>
-			<language type="jv">ဂျာဗားနီးစ်</language>
-			<language type="ka">ဂျော်ဂျီယန်</language>
-			<language type="kac">က�ျင်</language>
-			<language type="kar">ကရင်</language>
-			<language type="kg">ကွန်ဂို</language>
-			<language type="kha">�ါစီ</language>
-			<language type="km">�မာ</language>
-			<language type="kn">ကန်နာဒါ</language>
-			<language type="ko">ကိုးရီးယား</language>
-			<language type="ku">ကဒ်</language>
-			<language type="la">လက်�င်</language>
-			<language type="lo">လာအို</language>
-			<language type="mga">အလယ်ပိုင်း အိုင်းရစ်</language>
-			<language type="mis">အမျိုးမျိုးသော ဘာသာစကား</language>
-			<language type="mkh">မွန်-�မာ ဘာသာစကား</language>
-			<language type="ml">မလေးရာလမ်</language>
-			<language type="mn">မွန်ဂိုလီးယန်း</language>
-			<language type="mnc">မန်�ျူး</language>
-			<language type="mni">မနိပူရီ</language>
-			<language type="mno">မနိုဘို ဘာသာစကား</language>
-			<language type="mr">မာရသီ</language>
-			<language type="ms">မလေး</language>
-			<language type="mul">အကြိမ်များစွာ ဘာသာစကားများ</language>
-			<language type="my">ဗမာ</language>
-			<language type="nds">အနိမ့် ဂျာမန်</language>
-			<language type="ne">နီပေါလ်</language>
-			<language type="nl">ဒ�်�ျ်</language>
-			<language type="no">နော်�ေး</language>
-			<language type="pa">ပန်ဂျာပီ</language>
-			<language type="paa">ပါပူရန် ဘာသာစကား</language>
-			<language type="peo">ပါရှန် အဟောင်း</language>
-			<language type="phi">ဖိလစ်ပိုင် ဘာသာစကား</language>
-			<language type="pi">ပါဠိ</language>
-			<language type="pl">ပိုလန်</language>
-			<language type="pt">ပေါ်�ူဂီ</language>
-			<language type="pt_BR">ဘရာဇီး ပေါ်�ူဂီ</language>
-			<language type="ro">ရိုမေနီယား</language>
-			<language type="root">မူလရင်းမြစ်</language>
-			<language type="ru">ရုရှ</language>
-			<language type="sa">သင်္သကရိုက်</language>
-			<language type="sai">�ောင် အမေရိကန် အိန္ဒြိယ ဘာသာစကား</language>
-			<language type="sco">စကော့</language>
-			<language type="sd">စင်ဒီ</language>
-			<language type="sga">အိုင်းရစ် ဟောင်း</language>
-			<language type="sgn">အ�ျက်ပြ ဘာသာစကား</language>
-			<language type="shn">ရှမ်း</language>
-			<language type="si">ဆင်ဟာလ</language>
-			<language type="sit">�ရု�်-�ိဘက် ဘာသာစကား</language>
-			<language type="sk">စလိုဗက်</language>
-			<language type="sl">စလိုဗေးနီးယမ်း</language>
-			<language type="sla">စလိုဗစ် ဘာသာစကား</language>
-			<language type="sma">�ောင်ပိုင်း ဆာမိ</language>
-			<language type="smi">ဆာမိ ဘာသာစကား</language>
-			<language type="so">ဆိုမာလီ</language>
-			<language type="sq">အယ်လ်ဘေးနီးယန်း</language>
-			<language type="sr">ဆားဗီးယန်း</language>
-			<language type="su">ဆူဒန်</language>
-			<language type="sv">ဆွီဒင်</language>
-			<language type="ta">�မီးလ်</language>
-			<language type="tai">�ိုင် ဘာသာစကား</language>
-			<language type="th">ထိုင်း</language>
-			<language type="tup">�ူပီ ဘာသာစကား</language>
-			<language type="uk">ယူကရိန်း</language>
-			<language type="und">မသိ သို့မဟု�် မရှိ သော ဘာသာစကား</language>
-			<language type="vi">ဗီယက်နမ်</language>
-			<language type="zh">�ရု�်</language>
-			<language type="zh_Hans">ရိုးရှင်းသော �ရု�်</language>
-			<language type="zh_Hant">ရှေးရိုးစဉ်လာ �ရု�်</language>
-			<language type="zu">ဇူလူ</language>
-			<language type="zxx">ဘာသာစကား နှင့် ပ�်သက် သောအရာမရှိ</language>
-		</languages>
-		<scripts>
-			<script type="Arab">အာရေဗျ</script>
-			<script type="Armn">အာမေးနီးယား</script>
-			<script type="Beng">ဘင်္ဂါလီ</script>
-			<script type="Brah">ဗြဟ္မမီ</script>
-			<script type="Cyrl">စစ်ရိလစ်</script>
-			<script type="Deva">ဒီဗနာဂရီ</script>
-			<script type="Ethi">အီသီယိုးပီးယား</script>
-			<script type="Geor">ဂျော်ဂျီယန်</script>
-			<script type="Grek">ဂရိ</script>
-			<script type="Gujr">ဂုဂျာရသီ</script>
-			<script type="Hang">ဟန်ဂူးလ်</script>
-			<script type="Hani">ဟန်</script>
-			<script type="Hans">ရိုးရှင်းသော �ရု�်</script>
-			<script type="Hant">ရှေးရိုးစဉ်လာ �ရု�်</script>
-			<script type="Hebr">ဟီဗရူး</script>
-			<script type="Hira">ဟိရဂ�</script>
-			<script type="Hrkt">���� သို့မဟု�် ဟိရဂ�</script>
-			<script type="Java">ဂျာဗားနီးစ်</script>
-			<script type="Jpan">ဂျပန်</script>
-			<script type="Kali">ကယားလီ</script>
-			<script type="Kana">����</script>
-			<script type="Khmr">�မာ</script>
-			<script type="Kore">ကိုးရီးယား</script>
-			<script type="Laoo">လာအို</script>
-			<script type="Latn">လက်�င်</script>
-			<script type="Mong">မွန်ဂိုလီးယား</script>
-			<script type="Mymr">မြန်မာ</script>
-			<script type="Sinh">ဆင်ဟာလ</script>
-			<script type="Sund">ဆူဒန်</script>
-			<script type="Tale">�ိုင်လီ</script>
-			<script type="Taml">�မီးလ်</script>
-			<script type="Tglg">�ဂလော့ဂ်</script>
-			<script type="Thai">ထိုင်း</script>
-			<script type="Tibt">�ိဘက်</script>
-			<script type="Visp">မြင်နိုင်သော စကား</script>
-			<script type="Xpeo">ပါရှန် အဟောင်း</script>
-			<script type="Yiii">ရီ</script>
-			<script type="Zxxx">မရေးထားသော</script>
-			<script type="Zzzz">မသိ သို့မဟု�် မရှိသော စကားလုံး</script>
-		</scripts>
-		<territories>
-			<territory type="001">ကမ္ဘာ</territory>
-			<territory type="002">အာဖရိက</territory>
-			<territory type="003">မြောက် အမေရိက</territory>
-			<territory type="005">�ောင် အမေရိက</territory>
-			<territory type="009">သမုဒ္ဒရာဒေသ</territory>
-			<territory type="011">အနောက် အာဖရိက</territory>
-			<territory type="013">အလယ်ပိုင်း အမေရိက</territory>
-			<territory type="014">အရှေ့ပိုင်း အာဖရိက</territory>
-			<territory type="015">မြောက်ပိုင်း အာဖရိက</territory>
-			<territory type="017">အလယ်ပိုင်း အာဖရိက</territory>
-			<territory type="018">�ောင်ပိုင်း အာဖရိက</territory>
-			<territory type="019">အမေရိကများ</territory>
-			<territory type="021">မြောက်ပိုင်း အမေရိက</territory>
-			<territory type="029">ကာရီဘီယံ</territory>
-			<territory type="030">အရှေ့ပိုင်း အာရှ</territory>
-			<territory type="034">�ောင်ပိုင်း အာရှ</territory>
-			<territory type="035">အ‌ရှေ့�ောင်ပိုင်း အာရှ</territory>
-			<territory type="039">�ောင်ပိုင်း ဥရောပ</territory>
-			<territory type="053">ဩစ�ြေးလျှ နှင့် နယူးဇီလန်</territory>
-			<territory type="062">�ောင်-အလယ် အာရှ</territory>
-			<territory type="142">အာရှ</territory>
-			<territory type="143">အလယ် အာရှ</territory>
-			<territory type="145">အနောက် အာရှ</territory>
-			<territory type="150">ဥရောပ</territory>
-			<territory type="151">အရှေ့ပိုင်း ဥရောပ</territory>
-			<territory type="154">မြောက်ပိုင်း ဥရောပ</territory>
-			<territory type="155">အနောက်ပိုင်း ဥရောပ</territory>
-			<territory type="172">လွ�်လပ်သော ပြည်ထောင်စုများ� ဓနသဟာယအဖွဲ့</territory>
-			<territory type="419">လက်�င် အမေရိက နှင့် ကာရီဘီယန်</territory>
-			<territory type="AE">ယူအေအီး</territory>
-			<territory type="AF">အာဖဂန်နစ္စ�န်</territory>
-			<territory type="AI">အန်ကွီလာ</territory>
-			<territory type="AM">အာမေနီးယား</territory>
-			<territory type="AO">အင်ဂိုလာ</territory>
-			<territory type="AQ">အန္�ာ�ိက</territory>
-			<territory type="AR">အာဂျင်�ီးနား</territory>
-			<territory type="AS">အမေရိကန် စမိုအ</territory>
-			<territory type="AT">ဩစ�ြီးယား</territory>
-			<territory type="AU">ဩစ�ြေးလျှား</territory>
-			<territory type="AZ">အဇာဘိုင်ဂျန်</territory>
-			<territory type="BA">ဘော့စနီးယား နှင့် ဟာဇီဂိုဘီးနား</territory>
-			<territory type="BD">ဘင်္ဂလားဒေ့ရှ်</territory>
-			<territory type="BE">ဘယ်လ်ဂျီယမ်</territory>
-			<territory type="BG">ဘူဂေးရီးယား</territory>
-			<territory type="BH">ဘာရိန်း</territory>
-			<territory type="BM">ဘာမူဒါ</territory>
-			<territory type="BN">ဘရူနိုင်း</territory>
-			<territory type="BO">ဘိုလီးဘီးယား</territory>
-			<territory type="BR">ဘရာဇီး</territory>
-			<territory type="BS">ဘဟားမား</territory>
-			<territory type="BT">ဘူ�န်</territory>
-			<territory type="BW">ဘော့စ်�ါနာ</territory>
-			<territory type="BY">ဘီလာရုစ်</territory>
-			<territory type="BZ">ဘေလီဇ်</territory>
-			<territory type="CA">ကနေဒါ</territory>
-			<territory type="CC">ကိုကိုး ကျွန်းစု</territory>
-			<territory type="CF">အလယ်ပိုင်း အာဖရိက ပြည်ထောင်စု</territory>
-			<territory type="CH">ဆွစ်ဇလန်</territory>
-			<territory type="CI">အိုင်ဗရီကိုစ့်</territory>
-			<territory type="CK">ကွ�် ကျွန်းစု</territory>
-			<territory type="CL">�ျီလီ</territory>
-			<territory type="CM">ကင်မရွန်း</territory>
-			<territory type="CN">�ရု�်</territory>
-			<territory type="CO">ကိုလံဘီယာ</territory>
-			<territory type="CR">ကော့စ်�ာရီကာ</territory>
-			<territory type="CU">ကျူးဘား</territory>
-			<territory type="CX">�ရစ်စမ�် ကျွန်း</territory>
-			<territory type="CY">ဆိုက်ပရက်စ်</territory>
-			<territory type="CZ">�ျက် ပြည်ထောင်စု</territory>
-			<territory type="DE">ဂျာမ�ီ</territory>
-			<territory type="DK">ဒိန်းမ�်</territory>
-			<territory type="DM">ဒိုမီနီကာ</territory>
-			<territory type="DO">ဒိုမီနီကန်</territory>
-			<territory type="DZ">အယ်လ်ဂျီးရီးယား</territory>
-			<territory type="EC">အီကွေဒေါ</territory>
-			<territory type="EE">အက်စ�ိုးနီးယား</territory>
-			<territory type="EG">အီဂျစ်</territory>
-			<territory type="EH">အနောက်ပိုင်း ဆာဟာရ</territory>
-			<territory type="ES">စပိန်</territory>
-			<territory type="ET">အီသီယိုးပီးယား</territory>
-			<territory type="FI">ဖင်လန်</territory>
-			<territory type="FJ">ဖီဂျီ</territory>
-			<territory type="FK">ဖောက်ကလန် ကျွန်းစု</territory>
-			<territory type="FO">ဖာရိုး ကျွန်းစုများ</territory>
-			<territory type="FR">ပြင်သစ်</territory>
-			<territory type="GB">ယူနိုက်�က်ကင်းဒမ်း</territory>
-			<territory type="GE">ဂျော်ဂျီယာ</territory>
-			<territory type="GF">ပြင်သစ် ဂီယာနာ</territory>
-			<territory type="GH">ဂါနာ</territory>
-			<territory type="GI">ဂျီဘရော်လ်�ာ</territory>
-			<territory type="GL">ဂရင်းလန်း</territory>
-			<territory type="GM">ဂန်ဘီရာ</territory>
-			<territory type="GN">ဂီရာနာ</territory>
-			<territory type="GQ">အီကွေ�ာ ဂီရာနာ</territory>
-			<territory type="GR">ဂရိ</territory>
-			<territory type="GS">�ောင် ဂျော်ဂျီယာ နှင့် �ောင် ဆင်းဒ�စ်ဂျ် ကျွန်းစုများ</territory>
-			<territory type="GT">ဂွာ�ီမာလာ</territory>
-			<territory type="GU">ဂူအမ်</territory>
-			<territory type="HK">�ရု�်� အထူးအုပ်�ျုပ်�ွင့်ရ ဟောင်ကောင်</territory>
-			<territory type="HN">ဟွန်ဒူးရပ်စ်</territory>
-			<territory type="HR">�ရိုအေးရှား</territory>
-			<territory type="HT">ဟေ�ီ</territory>
-			<territory type="HU">ဟန်ဂေရီ</territory>
-			<territory type="ID">အင်ဒိုနီးရှား</territory>
-			<territory type="IE">အိုင်ယာလန်</territory>
-			<territory type="IL">အစ္စရေး</territory>
-			<territory type="IN">အိန္ဒိယ</territory>
-			<territory type="IO">ဗြိ�ိသျှ အိန္ဒြိယ သမုဒ္ဒရာ ပိုင်နက်</territory>
-			<territory type="IQ">အီရ�်</territory>
-			<territory type="IR">အီရန်</territory>
-			<territory type="IS">အိုက်စလန်</territory>
-			<territory type="IT">အီ�လီ</territory>
-			<territory type="JE">ဂျာစီ</territory>
-			<territory type="JM">ဂျမေနီကာ</territory>
-			<territory type="JO">ဂျော်ဒန်</territory>
-			<territory type="JP">ဂျပန်</territory>
-			<territory type="KE">ကင်ညာ</territory>
-			<territory type="KG">�ယ်ကစ်စ�န်</territory>
-			<territory type="KH">ကမ္ဘောဒီးယား</territory>
-			<territory type="KP">မြောက်ကိုရီးယား</territory>
-			<territory type="KR">�ောင်ကိုရီးယား</territory>
-			<territory type="KW">ကူ�ိ�်</territory>
-			<territory type="KY">ကေမန် ကျွန်းစု</territory>
-			<territory type="KZ">ကာဇက်စ�န်</territory>
-			<territory type="LA">လာအို</territory>
-			<territory type="LB">လက်ဘနွန်</territory>
-			<territory type="LK">သီရိလင်္ကာ</territory>
-			<territory type="LR">လိုင်ဘေးရီးယား</territory>
-			<territory type="LT">လစ်သူယေးနီးယား</territory>
-			<territory type="LU">လူဇင်ဘ�်</territory>
-			<territory type="LV">လ�်ဗီးယား</territory>
-			<territory type="MA">မော်ရိုကို</territory>
-			<territory type="MC">မိုနကို</territory>
-			<territory type="ME">မွန်�ီနိဂရိုး</territory>
-			<territory type="MF">စိန့်မာ�င်</territory>
-			<territory type="MG">မဒဂ�်စကာ</territory>
-			<territory type="MH">မာရှယ် ကျွန်းစု</territory>
-			<territory type="MK">မာစီဒိုးနီးယား</territory>
-			<territory type="ML">မာလီ</territory>
-			<territory type="MM">မြန်မာ</territory>
-			<territory type="MN">မွန်ဂိုးလီးယား</territory>
-			<territory type="MO">�ရု�်� အထူးအုပ်�ျုပ်�ွင့်ရ မကာအို</territory>
-			<territory type="MV">မော်လဒိုက်</territory>
-			<territory type="MW">မာလာ�ီ</territory>
-			<territory type="MX">မက္ကဆီကို</territory>
-			<territory type="MY">မလေးရှား</territory>
-			<territory type="MZ">မိုဇန်ဘစ်</territory>
-			<territory type="NA">နမ်မီးဘီးယား</territory>
-			<territory type="NC">နယူး ကယ်လီဒိုနီးယား</territory>
-			<territory type="NE">နိုင်ဂျာ</territory>
-			<territory type="NG">နိုင်ဂျီးရီးယား</territory>
-			<territory type="NI">နီကာရာဂွာ</territory>
-			<territory type="NL">နယ်သာလန်</territory>
-			<territory type="NO">နော်�ေ</territory>
-			<territory type="NP">နီပေါ</territory>
-			<territory type="NZ">နယူးဇီလန်</territory>
-			<territory type="OM">အိုမန်</territory>
-			<territory type="PA">ပနားမား</territory>
-			<territory type="PE">ပီရူး</territory>
-			<territory type="PF">ပြင်သစ် ပေါ်လီနေးရှား</territory>
-			<territory type="PG">ပါပူရာနယူးဂီနီ</territory>
-			<territory type="PH">ဖိလစ်ပိုင်</territory>
-			<territory type="PK">ပါကစ္စ�န်</territory>
-			<territory type="PL">ပိုလန်</territory>
-			<territory type="PR">ပေါ်�ူရီကို</territory>
-			<territory type="PS">ပါလက်စ�ိုင်း ပိုင်နက်</territory>
-			<territory type="PT">ပေါ်�ူဂီ</territory>
-			<territory type="PY">ပါရာဂွေး</territory>
-			<territory type="QA">ကာ�ာ</territory>
-			<territory type="QU">ဥရောပသမဂ္ဂ</territory>
-			<territory type="RO">ရိုမေးနီးယား</territory>
-			<territory type="RS">ဆားဘီးယား</territory>
-			<territory type="RU">ရုရှ</territory>
-			<territory type="RW">ရ�န်ဒါ</territory>
-			<territory type="SA">ဆော်ဒီအာရေးဗီးယား</territory>
-			<territory type="SB">ဆော်လမွန်ကျွန်းစု</territory>
-			<territory type="SD">ဆူဒန်</territory>
-			<territory type="SE">ဆွီဒင်</territory>
-			<territory type="SG">စင်္ကာပူ</territory>
-			<territory type="SI">စလိုဗေးနီးယား</territory>
-			<territory type="SK">စလိုဗေးကီးယား</territory>
-			<territory type="SN">ဆီနီဂေါ</territory>
-			<territory type="SO">ဆိုမာလီယာ</territory>
-			<territory type="SV">အယ်လ်ဆာဗေးဒိုး</territory>
-			<territory type="SY">ဆီးရီးယား</territory>
-			<territory type="TD">�ျဒ်</territory>
-			<territory type="TF">ပြင်သစ် �ောင်ပိုင်း ပိုင်နက်များ</territory>
-			<territory type="TH">ထိုင်း</territory>
-			<territory type="TJ">�ာဂျီကစ္စ�န်</territory>
-			<territory type="TL">အရှေ့�ီမော</territory>
-			<territory type="TN">�ူနီးရှား</territory>
-			<territory type="TO">�ွန်ဂါ</territory>
-			<territory type="TR">�ူရကီ</territory>
-			<territory type="TW">ထိုင်�မ်</territory>
-			<territory type="TZ">�န်ဇန်နီးယား</territory>
-			<territory type="UA">ယူကရိန်း</territory>
-			<territory type="UG">ယူဂန္ဒာ</territory>
-			<territory type="UM">ယူနိုက်�က်စ�ိ�် အပြင်ထွက် နေသည့် သေးငယ်သောကျွန်းများ</territory>
-			<territory type="US">ယူနိုက်�က်စ�ိ�်</territory>
-			<territory type="UY">ဥရုဂွေး</territory>
-			<territory type="UZ">ဥဘက်ကစ္စ�န်</territory>
-			<territory type="VA">ဗာ�ီကန်</territory>
-			<territory type="VE">ဗင်နီဇွဲလား</territory>
-			<territory type="VG">ဗြိ�ိသျှ ဗာဂျင်း ကျွန်းစု</territory>
-			<territory type="VI">ယူအက်စ် ဗာဂျင်း ကျွန်းစု</territory>
-			<territory type="VN">ဗီယက်နမ်</territory>
-			<territory type="YE">ယီမင်</territory>
-			<territory type="ZA">�ောင်အာဖရိက</territory>
-			<territory type="ZM">ဇမ်ဘီယာ</territory>
-			<territory type="ZW">ဇင်ဘာဘွေ</territory>
-			<territory type="ZZ">မသိ သို့မဟု�် မရှိ သော နေရာ</territory>
-		</territories>
-		<variants>
-			<variant type="1901">ရှေးရိုးစဉ်လာ ဂျာမန် ရေးထုံး</variant>
-			<variant type="1996">���� ဂျာမန် ရေးထုံး</variant>
-			<variant type="1606NICT">အလယ်ပိုင်းနောက်ကျသောပြင်သစ်မှ ����</variant>
-			<variant type="1694ACAD">����ACAD</variant>
-			<variant type="AREVELA">အရှေ့ပိုင်းအာမေးနီးယန်း</variant>
-			<variant type="BAKU1926">ပေါင်းစပ်ထားသော �ူရကီ လက်�င်စကားလုံး</variant>
-			<variant type="FONIPA">IPA အသံထွက်</variant>
-			<variant type="FONUPA">UPA အသံထွက်</variant>
-			<variant type="POSIX">ကွန်ပျူ�ာ</variant>
-			<variant type="REVISED">ပြန်လည်စီစစ်ထားသော ရေးထုံး</variant>
-			<variant type="SCOTLAND">စကော့ စံ အင်္ဂလိပ်</variant>
-		</variants>
-		<keys>
-			<key type="calendar">ပြက္�ဒိန်</key>
-			<key type="collation">စနစ်�ကျစီသော</key>
-			<key type="currency">ငွေကြေး</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">ဗုဒ္ဓ ပြက္�ဒိန်</type>
-			<type type="chinese" key="calendar">�ရု�် ပြက္�ဒိန်</type>
-			<type type="direct" key="collation">�ိုက်ရိုက်အစဉ်</type>
-			<type type="gregorian" key="calendar">နိုင်ငံ�ကာသုံး ပြက္�ဒိန်</type>
-			<type type="hebrew" key="calendar">ဟီဗရူး ပြက္�ဒိန်</type>
-			<type type="indian" key="calendar">အိန္ဒြိယ အမျိုးသား ပြက္�ဒိန်</type>
-			<type type="islamic" key="calendar">အစ္စလာမ် ပြက္�ဒိန်</type>
-			<type type="japanese" key="calendar">ဂျပန် ပြက္�ဒိန်</type>
-			<type type="phonebook" key="collation">ဖုန်းစာအုပ် အစီအစဉ်</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">မက်ထရစ်စနစ်</measurementSystemName>
-			<measurementSystemName type="US">အမေရိကန်စနစ်</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">ဘာသာစကား - {0}</codePattern>
-			<codePattern type="script">စာ - {0}</codePattern>
-			<codePattern type="territory">နယ်ပယ်ဒေသ - {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[က-အ ဣ-ဧ ဩ ဪ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u1036-း ျ-\u103E ာ ါ \u102D-\u1032 \u1039 \u103A]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ဇန်</month>
-							<month type="2">ဖေ</month>
-							<month type="3">မ�်</month>
-							<month type="4">ဧ</month>
-							<month type="5">မေ</month>
-							<month type="6">ဇွန်</month>
-							<month type="7">ဇူ</month>
-							<month type="8">ဩ</month>
-							<month type="9">စက်</month>
-							<month type="10">အောက်</month>
-							<month type="11">နို</month>
-							<month type="12">ဒီ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ဇန်န�ါရီ</month>
-							<month type="2">ဖေဖော်�ါရီ</month>
-							<month type="3">မ�်</month>
-							<month type="4">ဧပြီ</month>
-							<month type="5">မေ</month>
-							<month type="6">ဇွန်</month>
-							<month type="7">ဇူလိုင်</month>
-							<month type="8">ဩဂု�်</month>
-							<month type="9">စက်�င်ဘာ</month>
-							<month type="10">အောက်�ိုဘာ</month>
-							<month type="11">နို�င်ဘာ</month>
-							<month type="12">ဒီဇင်ဘာ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ဇ</month>
-							<month type="2">ဖ</month>
-							<month type="3">မ</month>
-							<month type="4">ဧ</month>
-							<month type="5">မ</month>
-							<month type="6">ဇ</month>
-							<month type="7">ဇ</month>
-							<month type="8">ဩ</month>
-							<month type="9">စ</month>
-							<month type="10">အ</month>
-							<month type="11">န</month>
-							<month type="12">ဒ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">နွေ</day>
-							<day type="mon">လာ</day>
-							<day type="tue">ဂါ</day>
-							<day type="wed">ဟူး</day>
-							<day type="thu">�ေး</day>
-							<day type="fri">ကြာ</day>
-							<day type="sat">နေ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�နင်္ဂနွေ</day>
-							<day type="mon">�နင်္လာ</day>
-							<day type="tue">အင်္ဂါ</day>
-							<day type="wed">ဗုဒ္ဓဟူး</day>
-							<day type="thu">ကြာသပ�ေး</day>
-							<day type="fri">သောကြာ</day>
-							<day type="sat">စနေ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">�</day>
-							<day type="tue">အ</day>
-							<day type="wed">ဗ</day>
-							<day type="thu">က</day>
-							<day type="fri">သ</day>
-							<day type="sat">စ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">ပ-စိ�်</quarter>
-							<quarter type="2">ဒု-စိ�်</quarter>
-							<quarter type="3">�-စိ�်</quarter>
-							<quarter type="4">စ-စိ�်</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ပထမ သုံးလပ�်</quarter>
-							<quarter type="2">ဒု�ိယ သုံးလပ�်</quarter>
-							<quarter type="3">��ိယ သုံးလပ�်</quarter>
-							<quarter type="4">စ�ု�္ထ သုံးလပ�်</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">ပ-စိ�်</quarter>
-							<quarter type="2">ဒု-စိ�်</quarter>
-							<quarter type="3">�-စိ�်</quarter>
-							<quarter type="4">စ-စိ�်</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">ပ</quarter>
-							<quarter type="2">ဒု</quarter>
-							<quarter type="3">�</quarter>
-							<quarter type="4">စ</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ပထမ သုံးလပ�်</quarter>
-							<quarter type="2">ဒု�ိယ သုံးလပ�်</quarter>
-							<quarter type="3">��ိယ သုံးလပ�်</quarter>
-							<quarter type="4">စ�ု�္ထ သုံးလပ�်</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>နံနက်</am>
-				<pm>ညနေ</pm>
-				<eras>
-					<eraNames>
-						<era type="0">�ရစ်�ော် မပေါ်မီကာလ</era>
-						<era type="1">�ရစ်�ော် ပေါ်ထွန်းပြီးကာလ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ဘီစီ</era>
-						<era type="1">အေဒီ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M – d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">EEEE� d/M – EEEE� d/M</greatestDifference>
-							<greatestDifference id="M">EEEE� d/M – EEEE� d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MMM d� EEEE – MMM d� EEEE</greatestDifference>
-							<greatestDifference id="M">MMM d� EEEE – MMM d� EEEE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy – d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">EEEE� d/M/yy – EEEE� d/M/yy</greatestDifference>
-							<greatestDifference id="M">EEEE� d/M/yy – EEEE� d/M/yy</greatestDifference>
-							<greatestDifference id="y">EEEE� d-M-yyyy – EEEE� d-M-yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="M">y� MMM d – MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y� MMM d� EEEE – MMM d� EEEE</greatestDifference>
-							<greatestDifference id="M">y� MMM d� EEEE – MMM d� EEEE</greatestDifference>
-							<greatestDifference id="y">y� MMM d� EEEE – y� MMM d� EEEE</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>�ေ�်</displayName>
-					</field>
-					<field type="year">
-						<displayName>နှစ်</displayName>
-					</field>
-					<field type="month">
-						<displayName>လ</displayName>
-					</field>
-					<field type="week">
-						<displayName>ပ�်</displayName>
-					</field>
-					<field type="day">
-						<displayName>ရက်</displayName>
-						<relative type="-2">�နေ့က</relative>
-						<relative type="-1">မနေ့က</relative>
-						<relative type="0">ယနေ့</relative>
-						<relative type="1">မနက်ဖြန်</relative>
-						<relative type="2">သဘက်�ါ</relative>
-					</field>
-					<field type="weekday">
-						<displayName>နေ့</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>နံနက်/ညနေ</displayName>
-					</field>
-					<field type="hour">
-						<displayName>နာရီ</displayName>
-					</field>
-					<field type="minute">
-						<displayName>မိနစ်</displayName>
-					</field>
-					<field type="second">
-						<displayName>စက္ကန့်</displayName>
-					</field>
-					<field type="zone">
-						<displayName>ဇုန်</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} အ�ျိန်</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>မသိသော</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>ရီယို ဗြန်ကို</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>ကိမ်ပို ဂရန်ဒ</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>ဆာပိုလို</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>ဟိုနိုလူလူ</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>အန်ကာရေ့ဂျ်</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>လော့စ်အိန်ဂျယ်လိစ်</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ဖီးနစ်</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>ဒင်ဗာ</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>�ျီကာကို</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>အင်ဒီယားနားပိုလစ်</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>နယူးယောက်</exemplarCity>
-			</zone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>အာဖဂန်နစ္စ�န် အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>အလယ်ပိုင်း အာဖရိက အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>အရှေ့ပိုင်း အာဖရိက အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>�ောင်အာဖရိက အ�ျိန်</generic>
-					<standard>�ောင်အာဖရိက စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>အနောက်ပိုင်း အာဖရိက အ�ျိန်</standard>
-					<daylight>အနောက်ပိုင်း အာဖရိက နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>အလယ်ပိုင်း အမေရိက အ�ျိန်</generic>
-					<standard>အလယ်ပိုင်း အမေရိက စံ�ော်�ျိန်</standard>
-					<daylight>အလယ်ပိုင်း အမေရိက နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>အရှေ့ပိုင်း အမေရိက အ�ျိန်</generic>
-					<standard>အရှေ့ပိုင်း အမေရိက စံ�ော်�ျိန်</standard>
-					<daylight>အရှေ့ပိုင်း အမေရိက အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>အမေရိက �ောင် အ�ျိန်</generic>
-					<standard>အမေရိက �ောင် စံ�ော်�ျိန်</standard>
-					<daylight>အမေရိက �ောင် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>ပစိဖိ�် အ�ျိန်</generic>
-					<standard>ပစိဖိ�် စံ�ော်�ျိန်</standard>
-					<daylight>ပစိဖိ�် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>အာရေဗျ အ�ျိန်</generic>
-					<standard>အာရေဗျ စံ�ော်�ျိန်</standard>
-					<daylight>အာရေဗျ နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>အာဂျင်�ီးနား အ�ျိန်</standard>
-					<daylight>အာဂျင်�ီးနား နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>အနောက် အာဂျင်�ီးနား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>အာမေနီးယား အ�ျိန်</standard>
-					<daylight>အာမေနီးယား နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>အ�္ထလန်�စ် အ�ျိန်</generic>
-					<standard>အ�္ထလန်�စ် စံ�ော်�ျိန်</standard>
-					<daylight>အ�္ထလန်�စ် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>အလယ်ဩစ�ြေးလျှား အ�ျိန်</generic>
-					<standard>အလယ်ပိုင်း ဩစ�ြေးလျှား စံ�ော်�ျိန်</standard>
-					<daylight>အလယ်ပိုင်း ဩစ�ြေးလျှား နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>အလယ်အနောက်ပိုင်း ဩစ�ြေးလျှား အ�ျိန်</generic>
-					<standard>အလယ်အနောက်ပိုင်း ဩစ�ြေးလျှား စံ�ော်�ျိန်</standard>
-					<daylight>အလယ်အနောက်ပိုင်း ဩစ�ြေးလျှား နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>အရှေ့ဩစ�ြေးလျှား အ�ျိန်</generic>
-					<standard>အရှေ့ပိုင်း ဩစ�ြေးလျှား စံ�ော်�ျိန်</standard>
-					<daylight>အရှေ့ပိုင်း ဩစ�ြေးလျှား နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>အနောက် ဩစ�ြေးလျှား အ�ျိန်</generic>
-					<standard>အနောက်ပိုင်း ဩစ�ြေးလျှား စံ�ော်�ျိန်</standard>
-					<daylight>အနောက်ပိုင်း ဩစ�ြေးလျှား နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>အဇာဘိုင်ဂျန် အ�ျိန်</standard>
-					<daylight>အဇာဘိုင်ဂျန် နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>ဘင်္ဂလားဒေ့ရှ် အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>ဘူ�န် အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>ဘိုလီးဘီးယား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>ဘရာဇီး အ�ျိန်</standard>
-					<daylight>ဘရာဇီး နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="British">
-				<long>
-					<generic>ဗြိ�ိသျှ အ�ျိန်</generic>
-					<daylight>ဗြိ�ိသျှ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>ဘရူနိုင်း စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>�ျီလီ အ�ျိန်</standard>
-					<daylight>�ျီလီ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>�ရု�် အ�ျိန်</generic>
-					<standard>�ရု�် စံ�ော်�ျိန်</standard>
-					<daylight>�ရု�် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>ကိုလံဘီယာ အ�ျိန်</standard>
-					<daylight>ကိုလံဘီယာ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>ကျူးဘား အ�ျိန်</generic>
-					<standard>ကျူးဘား စံ�ော်�ျိန်</standard>
-					<daylight>ကျူးဘား နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>ဒ�်�ျ် ဂီယာနာ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>အရှေ့�ီမော အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>အီကွေဒေါ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>ပြင်သစ် အ�ျိန်</generic>
-					<standard>ဥရောပ အလယ်ပိုင်း အ�ျိန်</standard>
-					<daylight>ဥရောပ အလယ်ပိုင်း နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>ရိုမေးနီးယား အ�ျိန်</generic>
-					<standard>အရှေ့ဥရောပ အ�ျိန်</standard>
-					<daylight>အရှေ့ဥရောပ နွေ±ရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>အနောက်ပိုင်း ဥရောပ အ�ျိန်</standard>
-					<daylight>အနောက်ပိုင်း ဥရောပ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>ဖောင်ကလန်ကျွန်းစု အ�ျိန်</standard>
-					<daylight>ဖောင်ကလန်ကျွန်းစု နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>ပြင်သစ် ဂီယာနာ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>ဂျော်ဂျီယာ အ�ျိန်</standard>
-					<daylight>ဂျော်ဂျီယာ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>ဂရင်းနစ် စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>အလယ်ဂရင်းလန်း အ�ျိန်</standard>
-					<daylight>အလယ်ဂရင်းလန်း နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>အရှေ့ဂရင်းလန်း အ�ျိန်</standard>
-					<daylight>အရှေ့ဂရင်းလန်း နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>အနောက် ဂရင်းလန်း အ�ျိန်</standard>
-					<daylight>အနောက် ဂရင်းလန်း နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>ပင်လယ်ဂွေ့ အ�ျိန်</generic>
-					<standard>ပင်လယ်ဂွေ့ စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>ဟောင်ကောင် အ�ျိန်</standard>
-					<daylight>ဟောင်ကောင် နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>အိန္ဒြိယ စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>အိန္ဒြိယ သမုဒ္ဒရာ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>အင်ဒို�ျိုင်းနား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>အလယ်ပိုင်း အင်ဒိုနီးရှား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>အရှေ့ပိုင်း အင်ဒိုနီးရှား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>အနောက်ပိုင်း အင်ဒိုနီးရှား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>အီရန် စံ�ော်�ျိန်</standard>
-					<daylight>အီရန် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irish">
-				<long>
-					<generic>အိုင်ယာလန် အ�ျိန်</generic>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>အစ္စရေး အ�ျိန်</generic>
-					<standard>အစ္စရေး စံ�ော်�ျိန်</standard>
-					<daylight>အစ္စရေး နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-				<short>
-					<standard>IST (အစ္စရေး)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>ဂျပန် အ�ျိန်</generic>
-					<standard>ဂျပန် စံ�ော်�ျိန်</standard>
-					<daylight>ဂျပန် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>အရှေ့ကာဇက်စ�န် အ�ျိန်</generic>
-					<standard>အရှေ့ကာဇက်စ�န် စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>ကိုးရီးယား အ�ျိန်</generic>
-					<standard>ကိုးရီးယား စံ�ော်�ျိန်</standard>
-					<daylight>ကိုးရီးယား နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>သီရိလင်္ကာ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>မကာအို အ�ျိန်</standard>
-					<daylight>မကာအို နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>မလေးရှား အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>မော်စကို အ�ျိန်</generic>
-					<standard>မော်စကို စံ�ော်�ျိန်</standard>
-					<daylight>မော်စကို နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>မြန်မာ အ�ျိန်</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>နီပေါ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>နယူးဇီလန် အ�ျိန်</generic>
-					<standard>နယူးဇီလန် စံ�ော်�ျိန်</standard>
-					<daylight>နယူးဇီလန် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>နယူးဖောင်လန် အ�ျိန်</generic>
-					<standard>နယူးဖောင်လန် စံ�ော်�ျိန်</standard>
-					<daylight>နယူးဖောင်လန် နေ့ပိုင်း အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>ပါကစ္စ�န် အ�ျိန်</standard>
-					<daylight>ပါကစ္စ�န် နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>ပါပူရာနယူးဂီနီ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>ပါရာဂွေး အ�ျိန်</standard>
-					<daylight>ပါရာဂွေး နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>ပီရူး အ�ျိန်</standard>
-					<daylight>ပီရူး နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>ဖိလစ်ပိုင် အ�ျိန်</standard>
-					<daylight>ဖိလစ်ပိုင် နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>စင်္ကာပူ စံ�ော်�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>�ောင်ဂျော်ဂျီယာ အ�ျိန်</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>�ူရကီ စံ�ော်�ျိန် အ�ျိန်</standard>
-					<daylight>�ူရကီ နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>ဥရုဂွေး အ�ျိန်</standard>
-					<daylight>ဥရုဂွေး နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>ဥဘက်ကစ္စ�န် အ�ျိန်</standard>
-					<daylight>ဥဘက်ကစ္စ�န် နွေရာသီ အ�ျိန်</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>ဗင်နီဇွဲလား အ�ျိန်</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>mymr</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ANG">
-				<displayName>နယ်သာလန် အန်�ီလန် ဂင်းဒါး</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>အာဂျင်�ီးနား ပီဆို (����-����)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>အာဂျင်�ီးနား ပီဆို</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>ဩစ�ြေးလျှား ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>အရူဘန် ဂင်းဒါး</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>ဘင်္ဂလားဒေ့ရှ် �ာကာ</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>ဘယ်လ်ဂျီယမ် ဖရန့်</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ဘူရွန်ဒီ ဖရန့်</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>ဘာမူဒါ ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ဘရူနိုင်း ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>ဘိုလီးဘီးယား ပီဆို</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ဘရာဇီး ရီးယဲ</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>ဘဟားမား ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>ဗမာ ကျပ်</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>ဘော့စ်�ါနာ ပုလ</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>ဘီလာရုစ် ရူဘယ်အသစ် (����-����)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>ဘီလာရုစ် ရူဘယ်</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>ဘေလီဇ် ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>ကနေဒါ ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>ဆွစ် ဖရန့်</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>�ျီလီ ပီဆို</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>�ရု�် ယွမ်</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>ကိုလံဘီယာ ပီဆို</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>ကျူးဘား ပီဆို</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>ဆိုက်ပရက်စ် ပေါင်</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>ဂျာမ�ီ မ�်</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>ဒိန်းမ�် �ရို�ာ</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>ဒိုမီနီကန် ပီဆို</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>အီဂျစ် ပေါင်</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>စပိန် ပယ်စေး�ာ</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ယူရို</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>ဖီဂျီ ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>ဖောက်ကလန် ကျွန်းစု ပေါင်</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>ပြင်သစ် ဖရန့်</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ဗြိ�ိသျှ ပေါင်</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>ဂျီဘရော်လ်�ာ ပေါင်</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>ဂီရာနာ ဖရန့်</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>ဟောင်ကောင် ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>အင်ဒိုနီးရှား ရူပီးယား</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>အစ္စရေး ပေါင်</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>အိန္ဒြိယ ရူပီး</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>ဂျမေနီကာ ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>ဂျပန်ယန်း</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>ကမ္ဘောဒီးယား ရီးယဲ</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>မြောက်ကိုးရီးယား �မ်</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>�ောင်ကိုးရီးယား �မ်</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>ကေမန် ကျွန်းစု ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>လက်ဘနွန် ပေါင်</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>သီရိလင်္ကာ ရူပီး</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>လိုင်ဘေးရီးယား ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>မြန်မာ ကျပ်</displayName>
-				<symbol>K</symbol>
-			</currency>
-			<currency type="MXN">
-				<displayName>မက္ကဆီကို ပီဆို</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>မလေးရှား ရင်းဂစ်</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>နမ်မီးဘီးယား ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>နော်�ေ �ရို�ာ</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>နီပေါ ရူပီး</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>နယူးဇီလန် ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>ဖိလစ်ပိုင် ပီဆို</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>ပါကစ္စ�န် ရူပီး</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>ပိုလန် ဇ‌လော့�ီ</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ရုရှ ရူဘယ်</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>ရုရှ ရူဘယ် (����-����)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>ရ�န်ဒါ ဖရန့်</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>ဆော်လမွန်ကျွန်းစု ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>ဆူဒန် ပေါင်</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>ဆူဒန် ပေါင်အဟောင်း</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>ဆွီဒင် �ရို�ာ</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>စင်္ကာပူ ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>ဆူရိနမ် ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>ဆိုဗီယက် ရူဗယ်</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>ထိုင်းဘ�်</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>ရှေးဟောင်း�ူရကီ လိုင်ရာ</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>�ူရကီ လိုင်ရာ</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>ထိုင်�မ် ဒေါ်လာအသစ်</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>အမေရိကန် ဒေါ်လာ</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>အမေရိကန် ဒေါ်လာ (နောက်နေ့)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>အမေရိကန် ဒေါ်လာ (�နေ့�ည်း)</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>ဗီယက်နမ် ဒေါင်</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>ငွေ</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>ရွှေ</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>ဥရောပငွေကြေးစံနစ်</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>အထူးထု�်ယူ�ွင့်</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA ဖရန့် BCEAO</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>ပလက်�ီနမ်</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>စမ်းသပ် ငွေကြေး ကုဒ်</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>မသိ သို့မဟု�် မရှိသော ငွေကြေး</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>ဇင်ဘာဘွေ ဒေါ်လာ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} ရက်</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} နာရီ</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} မိနစ်</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} လ</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} စက္ကန့်</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} ပ�်</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} နှစ်</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ဟု�်�ယ်</yesstr>
-			<nostr>မဟု�်ဘူး</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/my_MM.xml b/airtime_mvc/library/Zend/Locale/Data/my_MM.xml
deleted file mode 100644
index 55f512e5c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/my_MM.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="my"/>
-		<territory type="MM"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nb.xml b/airtime_mvc/library/Zend/Locale/Data/nb.xml
deleted file mode 100644
index 3d259975b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nb.xml
+++ /dev/null
@@ -1,3081 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.120 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="nb"/>
-	</identity>
-	<fallback>nn da sv en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhasisk</language>
-			<language type="ace">achinesisk</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avestisk</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afroasiatisk språk</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadisk</language>
-			<language type="ale">aleutisk</language>
-			<language type="alg">algonkinsk språk</language>
-			<language type="alt">søraltaisk</language>
-			<language type="am">amharisk</language>
-			<language type="an">aragonsk</language>
-			<language type="ang">gammelengelsk</language>
-			<language type="anp">angika</language>
-			<language type="apa">apachespråk</language>
-			<language type="ar">arabisk</language>
-			<language type="arc">arameisk</language>
-			<language type="arn">araukansk</language>
-			<language type="arp">arapaho</language>
-			<language type="art">kunstig språk</language>
-			<language type="arw">arawak</language>
-			<language type="as">assamisk</language>
-			<language type="ast">asturisk</language>
-			<language type="ath">athapaskansk språk</language>
-			<language type="aus">australsk språk</language>
-			<language type="av">avarisk</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">aserbajdsjansk</language>
-			<language type="ba">basjkirsk</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamilekisk språk</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinesisk</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltisk språk</language>
-			<language type="be">hviterussisk</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berbisk</language>
-			<language type="bg">bulgarsk</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetansk</language>
-			<language type="br">bretonsk</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnisk</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriat</language>
-			<language type="bug">buginesisk</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalansk</language>
-			<language type="cad">caddo</language>
-			<language type="cai">sentralamerikansk indiansk språk</language>
-			<language type="car">karibisk</language>
-			<language type="cau">kaukasisk språk</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tsjetsjensk</language>
-			<language type="ceb">cebuansk</language>
-			<language type="cel">keltisk språk</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukesisk</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewiansk</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">kamisk språk</language>
-			<language type="co">korsikansk</language>
-			<language type="cop">koptisk</language>
-			<language type="cpe">engelskbasert kreol- eller pidginspråk</language>
-			<language type="cpf">franskbasert kreol- eller pidginspråk</language>
-			<language type="cpp">portugisiskbasert kreol- eller pidginspråk</language>
-			<language type="cr">cree</language>
-			<language type="crh">krimtatarisk</language>
-			<language type="crp">kreol- eller pidginspråk</language>
-			<language type="cs">tsjekkisk</language>
-			<language type="csb">kasjubisk</language>
-			<language type="cu">kirkeslavisk</language>
-			<language type="cus">kusjitisk språk</language>
-			<language type="cv">tsjuvansk</language>
-			<language type="cy">walisisk</language>
-			<language type="da">dansk</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">tysk</language>
-			<language type="de_AT">østerriksk tysk</language>
-			<language type="de_CH">sveitsisk høytysk</language>
-			<language type="del">delaware</language>
-			<language type="den">slavisk</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidisk språk</language>
-			<language type="dsb">lavsorbisk</language>
-			<language type="dua">duala</language>
-			<language type="dum">mellomnederlandsk</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">gammelegyptisk</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">gresk</language>
-			<language type="elx">elamittisk</language>
-			<language type="en">engelsk</language>
-			<language type="en_AU">australsk engelsk</language>
-			<language type="en_CA">canadisk engelsk</language>
-			<language type="en_GB">britisk engelsk</language>
-			<language type="en_US">amerikansk engelsk</language>
-			<language type="enm">mellomengelsk</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spansk</language>
-			<language type="es_419">latinamerikansk spansk</language>
-			<language type="es_ES">iberisk spansk</language>
-			<language type="et">estisk</language>
-			<language type="eu">baskisk</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persisk</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">finsk</language>
-			<language type="fil">filippinsk</language>
-			<language type="fiu">finsk-ugrisk språk</language>
-			<language type="fj">fijiansk</language>
-			<language type="fo">færøysk</language>
-			<language type="fon">fon</language>
-			<language type="fr">fransk</language>
-			<language type="fr_CA">canadisk fransk</language>
-			<language type="fr_CH">sveitsisk fransk</language>
-			<language type="frm">mellomfransk</language>
-			<language type="fro">gammelfransk</language>
-			<language type="frr">nordfrisisk</language>
-			<language type="frs">østfrisisk</language>
-			<language type="fur">friuliansk</language>
-			<language type="fy">vestfrisisk</language>
-			<language type="ga">irsk</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">skotsk gælisk</language>
-			<language type="gem">germansk språk</language>
-			<language type="gez">ges</language>
-			<language type="gil">kiribatisk</language>
-			<language type="gl">galisisk</language>
-			<language type="gmh">mellomhøytysk</language>
-			<language type="gn">guarani</language>
-			<language type="goh">gammelhøytysk</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotisk</language>
-			<language type="grb">grebo</language>
-			<language type="grc">gammelgresk</language>
-			<language type="gsw">sveitsertysk</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiisk</language>
-			<language type="he">hebraisk</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hettittisk</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">kroatisk</language>
-			<language type="hsb">høysorbisk</language>
-			<language type="ht">haitisk</language>
-			<language type="hu">ungarsk</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armensk</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesisk</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">ibo</language>
-			<language type="ii">sichuan-yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indisk språk</language>
-			<language type="ine">indoeuropeisk språk</language>
-			<language type="inh">ingusjisk</language>
-			<language type="io">ido</language>
-			<language type="ira">iransk</language>
-			<language type="iro">irokansk språk</language>
-			<language type="is">islandsk</language>
-			<language type="it">italiensk</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japansk</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">jødepersisk</language>
-			<language type="jrb">jødearabisk</language>
-			<language type="jv">javanesisk</language>
-			<language type="ka">georgisk</language>
-			<language type="kaa">karakalpakisk</language>
-			<language type="kab">kabylsk</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karensk</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardisk</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kikongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisanspråk</language>
-			<language type="kho">khotanesisk</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kasakhisk</language>
-			<language type="kl">grønlandsk</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreansk</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraeansk</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">karelsk</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kasjmiri</language>
-			<language type="ku">kurdisk</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">kornisk</language>
-			<language type="ky">kirgisisk</language>
-			<language type="la">latin</language>
-			<language type="lad">ladinsk</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgsk</language>
-			<language type="lez">lezghian</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgisk</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotisk</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litauisk</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">latvisk</language>
-			<language type="mad">maduresisk</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronesisk</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">madagassisk</language>
-			<language type="mga">mellomirsk</language>
-			<language type="mh">marshallesisk</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">annet språk</language>
-			<language type="mk">makedonsk</language>
-			<language type="mkh">mon-khmerspråk</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolsk</language>
-			<language type="mnc">mandsju</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobospråk</language>
-			<language type="mo">moldavisk</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malayisk</language>
-			<language type="mt">maltesisk</language>
-			<language type="mul">flere språk</language>
-			<language type="mun">mundaspråk</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandesisk</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burmesisk</language>
-			<language type="myn">mayaspråk</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">nordamerikansk indiansk språk</language>
-			<language type="nap">napolitansk</language>
-			<language type="nb">norsk bokmål</language>
-			<language type="nd">nord-ndebele</language>
-			<language type="nds">lavtysk</language>
-			<language type="ne">nepalsk</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">niger-kordofiansk språk</language>
-			<language type="niu">niueansk</language>
-			<language type="nl">nederlandsk</language>
-			<language type="nl_BE">flamsk</language>
-			<language type="nn">norsk nynorsk</language>
-			<language type="no">norsk</language>
-			<language type="nog">nogai</language>
-			<language type="non">gammelnorsk</language>
-			<language type="nqo">nkå</language>
-			<language type="nr">sør-ndebele</language>
-			<language type="nso">nord-sotho</language>
-			<language type="nub">nubisk språk</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">klassisk newari</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">oksitansk</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetisk</language>
-			<language type="osa">osage</language>
-			<language type="ota">ottomansk tyrkisk</language>
-			<language type="oto">otomisk språk</language>
-			<language type="pa">panjabi</language>
-			<language type="paa">papuisk språk</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauisk</language>
-			<language type="peo">gammelpersisk</language>
-			<language type="phi">filippinsk språk</language>
-			<language type="phn">fønikisk</language>
-			<language type="pi">pali</language>
-			<language type="pl">polsk</language>
-			<language type="pon">ponapisk</language>
-			<language type="pra">prakritspråk</language>
-			<language type="pro">gammelprovençalsk</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugisisk</language>
-			<language type="pt_BR">brasiliansk portugisisk</language>
-			<language type="pt_PT">iberisk portugisisk</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongansk</language>
-			<language type="rm">retoromansk</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumensk</language>
-			<language type="roa">romansk språk</language>
-			<language type="rom">romani</language>
-			<language type="root">rot</language>
-			<language type="ru">russisk</language>
-			<language type="rup">aromansk</language>
-			<language type="rw">kinjarwanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakutsk</language>
-			<language type="sai">søramerikansk indiansk språk</language>
-			<language type="sal">salishansk språk</language>
-			<language type="sam">samaritansk arameisk</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardinsk</language>
-			<language type="scn">siciliansk</language>
-			<language type="sco">skotsk</language>
-			<language type="sd">sindhi</language>
-			<language type="se">nordsamisk</language>
-			<language type="sel">selkupisk</language>
-			<language type="sem">semittisk språk</language>
-			<language type="sg">sango</language>
-			<language type="sga">gammelirsk</language>
-			<language type="sgn">tegnspråk</language>
-			<language type="sh">serbokroatisk</language>
-			<language type="shn">shan</language>
-			<language type="si">singalesisk</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouxspråk</language>
-			<language type="sit">sino-tibetansk språk</language>
-			<language type="sk">slovakisk</language>
-			<language type="sl">slovensk</language>
-			<language type="sla">slavisk språk</language>
-			<language type="sm">samoansk</language>
-			<language type="sma">sørsamisk</language>
-			<language type="smi">samisk språk</language>
-			<language type="smj">lulesamisk</language>
-			<language type="smn">enaresamisk</language>
-			<language type="sms">skoltesamisk</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdisk</language>
-			<language type="son">songhai</language>
-			<language type="sq">albansk</language>
-			<language type="sr">serbisk</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssa">nilo-saharaspråk</language>
-			<language type="st">sør-sotho</language>
-			<language type="su">sundanesisk</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerisk</language>
-			<language type="sv">svensk</language>
-			<language type="sw">swahili</language>
-			<language type="syc">klassisk syrisk</language>
-			<language type="syr">syrisk</language>
-			<language type="ta">tamil</language>
-			<language type="tai">taispråk</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadsjikisk</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turkmensk</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamasjek</language>
-			<language type="tn">setswana</language>
-			<language type="to">tongansk</language>
-			<language type="tog">nyasa-tongansk</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">tyrkisk</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatarisk</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupispråk</language>
-			<language type="tut">altaisk språk</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitisk</language>
-			<language type="tyv">tuvinisk</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigurisk</language>
-			<language type="uga">ugaritisk</language>
-			<language type="uk">ukrainsk</language>
-			<language type="umb">umbundu</language>
-			<language type="und">ukjent eller ugyldig språk</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbekisk</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamesisk</language>
-			<language type="vo">volapyk</language>
-			<language type="vot">votisk</language>
-			<language type="wa">vallonsk</language>
-			<language type="wak">wakasjansk språk</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sorbisk språk</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapesisk</language>
-			<language type="yi">jiddisk</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupisk språk</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotec</language>
-			<language type="zbl">blissymboler</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kinesisk</language>
-			<language type="zh_Hans">forenklet kinesisk</language>
-			<language type="zh_Hant">tradisjonell kinesisk</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">uten språklig innhold</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabisk</script>
-			<script type="Armi">arameisk</script>
-			<script type="Armn">armensk</script>
-			<script type="Avst">avestisk</script>
-			<script type="Bali">balinesisk</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalsk</script>
-			<script type="Blis">blissymbol</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginesisk</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">felles kanadiske urspråksstavelser</script>
-			<script type="Cari">karisk</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">koptisk</script>
-			<script type="Cprt">kypriotisk</script>
-			<script type="Cyrl">kyrillisk</script>
-			<script type="Cyrs">kirkeslavisk kyrillisk</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egyptisk demotisk</script>
-			<script type="Egyh">egyptisk hieratisk</script>
-			<script type="Egyp">egyptiske hieroglyfer</script>
-			<script type="Ethi">etiopisk</script>
-			<script type="Geok">georgisk khutsuri</script>
-			<script type="Geor">georgisk</script>
-			<script type="Glag">glagolittisk</script>
-			<script type="Goth">gotisk</script>
-			<script type="Grek">gresk</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">forenklet han</script>
-			<script type="Hant">tradisjonell han</script>
-			<script type="Hebr">hebraisk</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana eller hiragana</script>
-			<script type="Hung">gammelungarsk</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">gammelitalisk</script>
-			<script type="Java">javanesisk</script>
-			<script type="Jpan">japansk</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshthi</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">koreansk</script>
-			<script type="Kthi">kaithisk</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotisk</script>
-			<script type="Latf">frakturlatinsk</script>
-			<script type="Latg">gælisk latinsk</script>
-			<script type="Latn">latinsk</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">lineær A</script>
-			<script type="Linb">lineær B</script>
-			<script type="Lyci">lykisk</script>
-			<script type="Lydi">lydisk</script>
-			<script type="Mand">mandaisk</script>
-			<script type="Mani">manikeisk</script>
-			<script type="Maya">maya-hieroglyfer</script>
-			<script type="Mero">meroitisk</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongolsk</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei-mayek</script>
-			<script type="Mymr">myanmar</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol-chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">gammelpermisk</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">inskripsjonspahlavi</script>
-			<script type="Phlp">psalter pahlavi</script>
-			<script type="Phlv">pahlavi</script>
-			<script type="Phnx">fønikisk</script>
-			<script type="Plrd">pollard-fonetisk</script>
-			<script type="Prti">inskripsjonsparthisk</script>
-			<script type="Qaai">nedarvet</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runer</script>
-			<script type="Samr">samaritansk</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">tegnskrift</script>
-			<script type="Shaw">shavisk</script>
-			<script type="Sinh">sinhala</script>
-			<script type="Sund">sundanesisk</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syrisk</script>
-			<script type="Syre">estrangelosyriakisk</script>
-			<script type="Syrj">vestlig syriakisk</script>
-			<script type="Syrn">østlig syriakisk</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">ny tai lue</script>
-			<script type="Taml">tamil</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">thai</script>
-			<script type="Tibt">tibetansk</script>
-			<script type="Ugar">ugaritisk</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">synlig tale</script>
-			<script type="Xpeo">gammelpersisk</script>
-			<script type="Xsux">sumersk-akkadisk kileskrift</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">matematisk notasjon</script>
-			<script type="Zsym">symboler</script>
-			<script type="Zxxx">språk uten skrift</script>
-			<script type="Zyyy">felles</script>
-			<script type="Zzzz">ukjent eller ugyldig skrift</script>
-		</scripts>
-		<territories>
-			<territory type="001">verden</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nord-Amerika</territory>
-			<territory type="005">Sør-Amerika</territory>
-			<territory type="009">Oseania</territory>
-			<territory type="011">Vest-Afrika</territory>
-			<territory type="013">Sentral-Amerika</territory>
-			<territory type="014">Øst-Afrika</territory>
-			<territory type="015">Nord-Afrika</territory>
-			<territory type="017">Sentral-Afrika</territory>
-			<territory type="018">Sørlige Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Nordlige Amerika</territory>
-			<territory type="029">Karibia</territory>
-			<territory type="030">Øst-Asia</territory>
-			<territory type="034">Sør-Asia</territory>
-			<territory type="035">Sørøst-Asia</territory>
-			<territory type="039">Sør-Europa</territory>
-			<territory type="053">Australia og New Zealand</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Mikronesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Sørsentral-Asia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Sentral-Asia</territory>
-			<territory type="145">Vest-Asia</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Øst-Europa</territory>
-			<territory type="154">Nord-Europa</territory>
-			<territory type="155">Vest-Europa</territory>
-			<territory type="172">Samveldet av uavhengige stater</territory>
-			<territory type="419">Latin-Amerika og Karibia</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">De forente arabiske emirater</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua og Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">De nederlandske antiller</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikansk Samoa</territory>
-			<territory type="AT">Østerrike</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…land</territory>
-			<territory type="AZ">Aserbajdsjan</territory>
-			<territory type="BA">Bosnia-Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvetøya</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Hviterussland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Kokosøyene</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CF">Den sentralafrikanske republikk</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CH">Sveits</territory>
-			<territory type="CI">Elfenbenskysten</territory>
-			<territory type="CK">Cookøyene</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia og Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Kapp Verde</territory>
-			<territory type="CX">Christmasøya</territory>
-			<territory type="CY">Kypros</territory>
-			<territory type="CZ">Tsjekkia</territory>
-			<territory type="DE">Tyskland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Den dominikanske republikk</territory>
-			<territory type="DZ">Algerie</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egypt</territory>
-			<territory type="EH">Vest-Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falklandsøyene</territory>
-			<territory type="FM">Mikronesiaføderasjonen</territory>
-			<territory type="FO">Færøyene</territory>
-			<territory type="FR">Frankrike</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Storbritannia</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Fransk Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grønland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatorial-Guinea</territory>
-			<territory type="GR">Hellas</territory>
-			<territory type="GS">Sør-Georgia og de sørlige Sandwich-øyene</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong S.A.R. Kina</territory>
-			<territory type="HM">Heardøya og McDonaldøyene</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Britiske territorier i Indiahavet</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambodsja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorene</territory>
-			<territory type="KN">St. Kitts og Nevis</territory>
-			<territory type="KP">Nord-Korea</territory>
-			<territory type="KR">Sør-Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Caymanøyene</territory>
-			<territory type="KZ">Kasakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">St. Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalløyene</territory>
-			<territory type="MK">Makedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao S.A.R. Kina</territory>
-			<territory type="MP">Nord-Marianene</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldivene</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Ny-Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkøya</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederland</territory>
-			<territory type="NO">Norge</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fransk Polynesia</territory>
-			<territory type="PG">Papua Ny-Guinea</territory>
-			<territory type="PH">Filippinene</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">St. Pierre og Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinsk territorium</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">avsidesliggende Oceania</territory>
-			<territory type="QU">Den europeiske union</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Russland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi-Arabia</territory>
-			<territory type="SB">Salomonøyene</territory>
-			<territory type="SC">Seychellene</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sverige</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">St. Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard og Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé og Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks- og Caicosøyene</territory>
-			<territory type="TD">Tsjad</territory>
-			<territory type="TF">De franske sørterritorier</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Øst-Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tyrkia</territory>
-			<territory type="TT">Trinidad og Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">USAs ytre småøyer</territory>
-			<territory type="US">USA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikanstaten</territory>
-			<territory type="VC">St. Vincent og Grenadinene</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">De britiske jomfruøyene</territory>
-			<territory type="VI">De amerikanske jomfruøyene</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis og Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sør-Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">ukjent eller ugyldig område</territory>
-		</territories>
-		<variants>
-			<variant type="1901">tradisjonell tysk ortografi</variant>
-			<variant type="1994">standardisert resisk ortografi</variant>
-			<variant type="1996">tysk ortografi fra 1996</variant>
-			<variant type="1606NICT">nyere mellomfransk til 1606</variant>
-			<variant type="1694ACAD">eldre nyfransk</variant>
-			<variant type="AREVELA">øst-armensk</variant>
-			<variant type="AREVMDA">vest-armensk</variant>
-			<variant type="BISKE">san giorgio- og biladialekt</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">det internasjonale fonetiske alfabet (IPA)</variant>
-			<variant type="FONUPA">det uraliske fonetiske alfabet (UPA)</variant>
-			<variant type="MONOTON">monotonisk rettskriving</variant>
-			<variant type="NEDIS">natisonedialekt</variant>
-			<variant type="NJIVA">gniva- og njivadialekt</variant>
-			<variant type="OSOJS">oseacco- og osojanedialekt</variant>
-			<variant type="POLYTON">polytonisk rettskriving</variant>
-			<variant type="POSIX">dataspråk</variant>
-			<variant type="REVISED">revidert rettskriving</variant>
-			<variant type="ROZAJ">resisk dialekt</variant>
-			<variant type="SAAHO">saaho dialekt</variant>
-			<variant type="SCOTLAND">skotsk standard engelsk</variant>
-			<variant type="SCOUSE">scouse dialekt</variant>
-			<variant type="SOLBA">stolvizza- og solbicadialekt</variant>
-			<variant type="VALENCIA">valensisk dialekt</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalender</key>
-			<key type="collation">kollasjon</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">tradisjonell kinesisk sortering - Big 5</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="direct" key="collation">direkte sortering</type>
-			<type type="gb2312han" key="collation">forenklet kinesisk sortering - GB2312</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="hebrew" key="calendar">hebraisk kalender</type>
-			<type type="indian" key="calendar">indisk nasjonalkalender</type>
-			<type type="islamic" key="calendar">islamsk kalender</type>
-			<type type="islamic-civil" key="calendar">islamsk sivil kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogsortering</type>
-			<type type="pinyin" key="collation">pinyinsortering</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="stroke" key="collation">streksortering</type>
-			<type type="traditional" key="collation">tradisjonell sortering</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrisk</measurementSystemName>
-			<measurementSystemName type="US">amerikansk</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Språk: {0}</codePattern>
-			<codePattern type="script">Skrift: {0}</codePattern>
-			<codePattern type="territory">Område: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="fields">titlecase-firstword</inText>
-		<inText type="keys">titlecase-firstword</inText>
-		<inText type="languages">titlecase-firstword</inText>
-		<inText type="long">lowercase-words</inText>
-		<inText type="quarterWidth">titlecase-firstword</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="territories">titlecase-firstword</inText>
-		<inText type="types">lowercase-words</inText>
-		<inText type="variants">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a à b-e é f-o ó ò ô p-z æ ø å]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á ǎ ã � ç đ è ê í ń ñ ŋ š ŧ ü ž ä ö]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan.</month>
-							<month type="2">feb.</month>
-							<month type="3">mars</month>
-							<month type="4">apr.</month>
-							<month type="5">mai</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">aug.</month>
-							<month type="9">sep.</month>
-							<month type="10">okt.</month>
-							<month type="11">nov.</month>
-							<month type="12">des.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">mars</month>
-							<month type="4">april</month>
-							<month type="5">mai</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">søn.</day>
-							<day type="mon">man.</day>
-							<day type="tue">tir.</day>
-							<day type="wed">ons.</day>
-							<day type="thu">tor.</day>
-							<day type="fri">fre.</day>
-							<day type="sat">lør.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">søndag</day>
-							<day type="mon">mandag</day>
-							<day type="tue">tirsdag</day>
-							<day type="wed">onsdag</day>
-							<day type="thu">torsdag</day>
-							<day type="fri">fredag</day>
-							<day type="sat">lørdag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">O</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">L</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>'kl'. HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d.</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E d.M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.–d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH–HH</greatestDifference>
-							<greatestDifference id="h">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="h">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="h">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH–HH v</greatestDifference>
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.–M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM.–dd.MM.</greatestDifference>
-							<greatestDifference id="M">dd.MM.–dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd.MM.–E dd.MM.</greatestDifference>
-							<greatestDifference id="M">E dd.MM.–E dd.MM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.–d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d.–E d. MMM</greatestDifference>
-							<greatestDifference id="M">E d. MMM–E d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy–MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy–MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy–dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy–dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy–dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd.MM.yy–E dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E dd.MM.yy–E dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E dd.MM.yy–E dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y–MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.–d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM–d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y–d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d.–E d. MMM y</greatestDifference>
-							<greatestDifference id="M">E d. MMM–E d. MMM y</greatestDifference>
-							<greatestDifference id="y">E d. MMM y–E d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM–MM yyyy</greatestDifference>
-							<greatestDifference id="y">MM yyyy–MM yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>tidsalder</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ã¥r</displayName>
-					</field>
-					<field type="month">
-						<displayName>måned</displayName>
-					</field>
-					<field type="week">
-						<displayName>uke</displayName>
-					</field>
-					<field type="day">
-						<displayName>dag</displayName>
-						<relative type="-3">for tre dager siden</relative>
-						<relative type="-2">i forgårs</relative>
-						<relative type="-1">i går</relative>
-						<relative type="0">i dag</relative>
-						<relative type="1">i morgen</relative>
-						<relative type="2">i overmorgen</relative>
-						<relative type="3">om tre dager</relative>
-					</field>
-					<field type="weekday">
-						<displayName>ukedag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>time</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minutt</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>sone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH.mm;-HH.mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Ukjent</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Sydpolen</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brussel</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novo</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimpu</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Kokosøyene</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Påskeøya</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kapp Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Christmasøya</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>København</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Aaiún</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanariøyene</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Pohnpei</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Færøyene</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthåb</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athen</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Sør-Georgia</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Jajapura</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bisjkek</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komorene</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caymanøyene</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivene</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico by</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warszawa</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorene</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucuresti</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskus</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dusjanbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Asjkhabad</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar-es-Salaam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzjhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporozje</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Alaska</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Nord-Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tasjkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre-tid</standard>
-					<daylight>Acre sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>sentralafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>østafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>sørafrikansk normaltid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>vestafrikansk tid</standard>
-					<daylight>vestafrikansk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazonas-tid</standard>
-					<daylight>Amazonas sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>normaltid</generic>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<short>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<short>
-					<standard>MST</standard>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<short>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>arabisk tid</generic>
-					<standard>arabisk standardtid</standard>
-					<daylight>arabisk sommertid</daylight>
-				</long>
-				<short>
-					<generic>AT (arabisk)</generic>
-					<standard>AST (arabisk)</standard>
-					<daylight>ADT (arabisk)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>sentralaustralsk tid</generic>
-					<standard>sentralaustralsk standardtid</standard>
-					<daylight>sentralaustralsk sommertid</daylight>
-				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>vest-sentralaustralsk tid</generic>
-					<standard>vest-sentralaustralsk standardtid</standard>
-					<daylight>vest-sentralaustralsk sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>østaustralsk tid</generic>
-					<standard>østaustralsk standardtid</standard>
-					<daylight>østaustralsk sommertid</daylight>
-				</long>
-				<short>
-					<generic>AET</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>vestaustralsk tid</generic>
-					<standard>vestaustralsk standardtid</standard>
-					<daylight>vestaustralsk sommertid</daylight>
-				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brasilia-tid</standard>
-					<daylight>Brasilia sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>kinesisk standardtid</standard>
-				</long>
-				<short>
-					<standard>CST (Kina)</standard>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>sentraleuropeisk normaltid</standard>
-					<daylight>sentraleuropeisk sommertid</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>østeuropeisk normaltid</standard>
-					<daylight>østeuropeisk sommertid</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>vesteuropeisk tid</standard>
-					<daylight>vesteuropeisk sommertid</daylight>
-				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich middeltid</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hong Kong-tid</standard>
-					<daylight>Hong Kong-sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>indisk standardtid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>indokinesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>sentralindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>østindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>vestindonesisk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>israelsk standardtid</standard>
-					<daylight>israelsk sommertid</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>japansk standardtid</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<standard>koreansk standardtid</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Moskva normaltid</standard>
-					<daylight>Moskva sommertid</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>newzealandsk tid</generic>
-					<standard>newzealandsk standardtid</standard>
-					<daylight>newzealandsk sommertid</daylight>
-				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>andorranske pesetas</displayName>
-				<displayName count="one">andorransk pesetas</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afghani</displayName>
-				<symbol>AFN</symbol>
-			</currency>
-			<currency type="ALL">
-				<displayName>albanske lek</displayName>
-				<displayName count="one">albansk lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>armenske dram</displayName>
-				<displayName count="one">armensk dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>nederlandske antillegylden</displayName>
-				<displayName count="one">nederlandsk antillegylden</displayName>
-				<symbol>ANG</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>angolanske kwanza</displayName>
-				<displayName count="one">angolansk kwanza</displayName>
-				<symbol>AOA</symbol>
-			</currency>
-			<currency type="AOK">
-				<displayName>angolanske kwanza (1977-1990)</displayName>
-				<displayName count="one">angolansk kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>angolanske nye kwanza (1990-2000)</displayName>
-				<displayName count="one">angolansk ny kwanza</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>angolanske kwanza reajustado (1995-1999)</displayName>
-				<displayName count="one">angolansk kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>argentinske australer</displayName>
-				<displayName count="one">argentinsk austral</displayName>
-			</currency>
-			<currency type="ARL">
-				<symbol>ARL</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>ARM</symbol>
-			</currency>
-			<currency type="ARP">
-				<displayName>argentinske pesos (1983-1985)</displayName>
-				<displayName count="one">argentinsk pesos (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>argentinske pesos</displayName>
-				<displayName count="one">argentinsk pesos</displayName>
-				<symbol>ARS</symbol>
-			</currency>
-			<currency type="ATS">
-				<displayName>østerrikske shilling</displayName>
-				<displayName count="one">østerriksk schilling</displayName>
-				<displayName count="other">østerrikske schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>australske dollar</displayName>
-				<displayName count="one">australsk dollar</displayName>
-				<symbol>AUD</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>arubiske gylden</displayName>
-				<displayName count="one">arubisk gylden</displayName>
-				<symbol>AWG</symbol>
-			</currency>
-			<currency type="AZM">
-				<displayName>aserbajdsjanske manat (1993-2006)</displayName>
-				<displayName count="one">aserbajdsjansk manat (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>aserbajdsjanske manat</displayName>
-				<displayName count="one">aserbajdsjansk manat</displayName>
-				<symbol>AZN</symbol>
-			</currency>
-			<currency type="BAD">
-				<displayName>bosnisk-hercegovinske dinarer</displayName>
-				<displayName count="one">bosnisk-hercegovinsk dinar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>bosnisk-hercegovinske mark (konvertible)</displayName>
-				<displayName count="one">bosnisk-hercegovinsk mark (konvertibel)</displayName>
-				<symbol>BAM</symbol>
-			</currency>
-			<currency type="BBD">
-				<displayName>barbadiske dollar</displayName>
-				<displayName count="one">barbadisk dollar</displayName>
-				<symbol>BBD</symbol>
-			</currency>
-			<currency type="BDT">
-				<displayName>bangladeshiske taka</displayName>
-				<displayName count="one">bangladeshisk taka</displayName>
-				<symbol>BDT</symbol>
-			</currency>
-			<currency type="BEC">
-				<displayName>belgiske franc (konvertible)</displayName>
-				<displayName count="one">belgisk franc (konvertibel)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>belgiske franc</displayName>
-				<displayName count="one">belgisk franc</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>belgiske franc (finansielle)</displayName>
-				<displayName count="one">belgisk franc (finansiell)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>bulgarske lev (hard)</displayName>
-				<displayName count="one">bulgarsk lev (hard)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>bulgarske lev</displayName>
-				<displayName count="one">bulgarsk lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>bahrainske dinarer</displayName>
-				<displayName count="one">bahrainsk dinar</displayName>
-				<symbol>BHD</symbol>
-			</currency>
-			<currency type="BIF">
-				<displayName>burundiske franc</displayName>
-				<displayName count="one">burundisk franc</displayName>
-				<symbol>BIF</symbol>
-			</currency>
-			<currency type="BMD">
-				<displayName>bermudiske dollar</displayName>
-				<displayName count="one">bermudisk dollar</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>bruneiske dollar</displayName>
-				<displayName count="one">bruneisk dollar</displayName>
-				<symbol>BND</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<symbol>BOB</symbol>
-			</currency>
-			<currency type="BOP">
-				<displayName>bolivianske pesos</displayName>
-				<displayName count="one">boliviansk pesos</displayName>
-				<symbol>BOP</symbol>
-			</currency>
-			<currency type="BOV">
-				<displayName>bolivianske mvdol</displayName>
-				<displayName count="one">BOV</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>brasilianske cruzeiro novo (1967-1986)</displayName>
-				<displayName count="one">brasiliansk cruzeiro novo (1967-1986)</displayName>
-				<symbol>BRB</symbol>
-			</currency>
-			<currency type="BRC">
-				<displayName>brasilianske cruzado</displayName>
-				<displayName count="one">brasiliansk cruzado</displayName>
-				<symbol>BRC</symbol>
-			</currency>
-			<currency type="BRE">
-				<displayName>brasilianske cruzeiro (1990-1993)</displayName>
-				<displayName count="one">brasiliansk cruzeiro (1990-1993)</displayName>
-				<symbol>BRE</symbol>
-			</currency>
-			<currency type="BRL">
-				<displayName>brasilianske realer</displayName>
-				<displayName count="one">brasiliansk real</displayName>
-				<symbol>BRL</symbol>
-			</currency>
-			<currency type="BRN">
-				<displayName>brasilianske cruzado novo</displayName>
-				<displayName count="one">brasiliansk cruzado novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>brasilianske cruzeiro</displayName>
-				<displayName count="one">brasiliansk cruzeiro</displayName>
-			</currency>
-			<currency type="BRZ">
-				<symbol>BRZ</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>bahamske dollar</displayName>
-				<displayName count="one">bahamsk dollar</displayName>
-				<symbol>BSD</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>bhutanske ngultrum</displayName>
-				<displayName count="one">bhutansk ngultrum</displayName>
-				<symbol>BTN</symbol>
-			</currency>
-			<currency type="BUK">
-				<displayName>burmesiske kyat</displayName>
-				<displayName count="one">burmesisk kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>botswanske pula</displayName>
-				<displayName count="one">botswansk pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>hviterussiske nye rubler (1994-1999)</displayName>
-				<displayName count="one">hviterussisk ny rubel (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>hviterussiske rubler</displayName>
-				<displayName count="one">hviterussisk rubel</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>beliziske dollar</displayName>
-				<displayName count="one">belizisk dollar</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>kanadiske dollar</displayName>
-				<displayName count="one">kanadisk dollar</displayName>
-				<symbol>CAD</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>kongolesiske franc (congolais)</displayName>
-				<displayName count="one">kongolesisk franc (congolais)</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>sveitsiske franc</displayName>
-				<displayName count="one">sveitsisk franc</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franc</displayName>
-			</currency>
-			<currency type="CLE">
-				<symbol>CLE</symbol>
-			</currency>
-			<currency type="CLF">
-				<displayName>chilenske unidades de fomento</displayName>
-				<displayName count="one">chilensk unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>chilenske pesos</displayName>
-				<displayName count="one">chilensk pesos</displayName>
-				<symbol>CLP</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>kinesiske yuan renminbi</displayName>
-				<displayName count="one">kinesisk yuan renminbi</displayName>
-				<symbol>CNY</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>colombianske pesos</displayName>
-				<displayName count="one">colombiansk pesos</displayName>
-				<symbol>COP</symbol>
-			</currency>
-			<currency type="COU">
-				<displayName>unidad de valor real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>costaricanske colon</displayName>
-				<displayName count="one">costaricansk colon</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CSD">
-				<displayName>gamle serbiske dinarer</displayName>
-				<displayName count="one">gammel serbisk dinar</displayName>
-				<displayName count="other">gamle serbiske dinarer</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>tsjekkoslovakiske koruna (hard)</displayName>
-				<displayName count="one">tsjekkoslovakisk koruna (hard)</displayName>
-			</currency>
-			<currency type="CUC">
-				<symbol>CUC</symbol>
-			</currency>
-			<currency type="CUP">
-				<displayName>kubanske pesos</displayName>
-				<displayName count="one">kubansk pesos</displayName>
-				<symbol>CUP</symbol>
-			</currency>
-			<currency type="CVE">
-				<displayName>kappverdiske escudo</displayName>
-				<displayName count="one">kappverdisk escudo</displayName>
-				<displayName count="other">kappverdiske escudos</displayName>
-				<symbol>CVE</symbol>
-			</currency>
-			<currency type="CYP">
-				<displayName>kypriotiske pund</displayName>
-				<displayName count="one">kypriotisk pund</displayName>
-				<symbol>CYP</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>tsjekkiske koruna</displayName>
-				<displayName count="one">tsjekkisk koruna</displayName>
-				<symbol>CZK</symbol>
-			</currency>
-			<currency type="DDM">
-				<displayName>østtyske ostmark</displayName>
-				<displayName count="one">østtysk ostmark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>tyske mark</displayName>
-				<displayName count="one">tysk mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>djiboutiske franc</displayName>
-				<displayName count="one">djiboutisk franc</displayName>
-				<symbol>DJF</symbol>
-			</currency>
-			<currency type="DKK">
-				<displayName>danske kroner</displayName>
-				<displayName count="one">dansk krone</displayName>
-				<displayName count="other">danske kroner</displayName>
-				<symbol>DKK</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominikanske pesos</displayName>
-				<displayName count="one">dominikansk pesos</displayName>
-				<displayName count="other">dominikanske pesos</displayName>
-				<symbol>DOP</symbol>
-			</currency>
-			<currency type="DZD">
-				<displayName>algeriske dinarer</displayName>
-				<displayName count="one">algerisk dinar</displayName>
-				<displayName count="other">algeriske dinarer</displayName>
-				<symbol>DZD</symbol>
-			</currency>
-			<currency type="ECS">
-				<displayName>ecuadorianske sucre</displayName>
-				<displayName count="one">ecuadoriansk sucre</displayName>
-				<displayName count="other">ecuadorianske sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ecuadorianske unidad de valor constante (UVC)</displayName>
-				<displayName count="one">ecuadoriansk unidad de valor constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>estiske kroon</displayName>
-				<displayName count="one">estisk kroon</displayName>
-				<symbol>EEK</symbol>
-			</currency>
-			<currency type="EGP">
-				<displayName>egyptiske pund</displayName>
-				<displayName count="one">egyptisk pund</displayName>
-				<symbol>EGP</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>eritreiske nakfa</displayName>
-				<displayName count="one">eritreisk nakfa</displayName>
-				<symbol>ERN</symbol>
-			</currency>
-			<currency type="ESA">
-				<displayName>spanske peseta (A-konto)</displayName>
-				<displayName count="one">spansk peseta (A-konto)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>spanske peseta (konvertibel konto)</displayName>
-				<displayName count="one">spansk peseta (konvertibel konto)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>spanske peseta</displayName>
-				<displayName count="one">spansk peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>etiopiske birr</displayName>
-				<displayName count="one">etiopisk birr</displayName>
-				<symbol>ETB</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<symbol>EUR</symbol>
-			</currency>
-			<currency type="FIM">
-				<displayName>finske mark</displayName>
-				<displayName count="one">finsk mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>fijianske dollar</displayName>
-				<displayName count="one">fijiansk dollar</displayName>
-				<symbol>FJD</symbol>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland-pund</displayName>
-				<symbol>FKP</symbol>
-			</currency>
-			<currency type="FRF">
-				<displayName>franske franc</displayName>
-				<displayName count="one">fransk franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>britiske pund sterling</displayName>
-				<displayName count="one">britisk pund sterling</displayName>
-				<symbol>GBP</symbol>
-			</currency>
-			<currency type="GEK">
-				<displayName>georgiske kupon larit</displayName>
-				<displayName count="one">georgisk kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>georgiske lari</displayName>
-				<displayName count="one">georgisk lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ghanesisk cedi (1979-2007)</displayName>
-				<displayName count="one">ghanesisk cedi (GHC)</displayName>
-				<displayName count="other">ghanesiske cedi (GHC)</displayName>
-				<symbol>GHC</symbol>
-			</currency>
-			<currency type="GHS">
-				<displayName>ghanesisk cedi</displayName>
-				<displayName count="one">ghanesisk cedi</displayName>
-				<displayName count="other">ghanesiske cedi</displayName>
-				<symbol>GHS</symbol>
-			</currency>
-			<currency type="GIP">
-				<displayName>gibraltarske pund</displayName>
-				<displayName count="one">gibraltarsk pund</displayName>
-				<symbol>GIP</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>gambiske dalasi</displayName>
-				<displayName count="one">gambisk dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>guineanske franc</displayName>
-				<displayName count="one">guineansk franc</displayName>
-				<symbol>GNF</symbol>
-			</currency>
-			<currency type="GNS">
-				<displayName>guineanske syli</displayName>
-				<displayName count="one">guineansk syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekvatorialguineanske ekwele guineana</displayName>
-				<displayName count="one">ekvatorialguineansk ekwele guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>greske drakmer</displayName>
-				<displayName count="one">gresk drakme</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>guatemalanske quetzal</displayName>
-				<displayName count="one">guatemalansk quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>portugisiske guinea escudo</displayName>
-				<displayName count="one">portugisisk guinea escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau-pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>guyanske dollar</displayName>
-				<displayName count="one">guyansk dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong-dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hoduras Lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>kroatiske dinarer</displayName>
-				<displayName count="one">kroatisk dinar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kroatiske kuna</displayName>
-				<displayName count="one">kroatisk kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>haitiske gourde</displayName>
-				<displayName count="one">haitisk gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>ungarske forinter</displayName>
-				<displayName count="one">ungarsk forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>indonesiske rupier</displayName>
-				<displayName count="one">indonesisk rupi</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>irske pund</displayName>
-				<displayName count="one">irsk pund</displayName>
-				<symbol>IEP</symbol>
-			</currency>
-			<currency type="ILP">
-				<displayName>israelske pund</displayName>
-				<displayName count="one">israelsk pund</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>israelsk gammel shekel</displayName>
-				<displayName count="one">israelsk gammel shekel</displayName>
-				<displayName count="other">israelske gamle shekler</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>israelske nye shekler</displayName>
-				<displayName count="one">israelsk ny shekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>indiske rupier</displayName>
-				<displayName count="one">indisk rupi</displayName>
-				<symbol>INR</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>irakske dinarer</displayName>
-				<displayName count="one">iraksk dinar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>iranske rialer</displayName>
-				<displayName count="one">iransk rial</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>gammel islandsk krone</displayName>
-				<displayName count="one">gammel islandsk krone</displayName>
-				<displayName count="other">gamle islandske kroner</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>islandske kroner</displayName>
-				<displayName count="one">islandsk krone</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>italienske lire</displayName>
-				<displayName count="one">italiensk lire</displayName>
-				<symbol>ITL</symbol>
-			</currency>
-			<currency type="JMD">
-				<displayName>jamaikanske dollar</displayName>
-				<displayName count="one">jamaikansk dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>jordanske dinarer</displayName>
-				<displayName count="one">jordansk dinar</displayName>
-				<symbol>JOD</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>japanske yen</displayName>
-				<displayName count="one">japansk yen</displayName>
-				<symbol>JPY</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>kenyanske shilling</displayName>
-				<displayName count="one">kenyansk shilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>kirgisiske som</displayName>
-				<displayName count="one">kirgisisk som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>kambodsjanske riel</displayName>
-				<displayName count="one">kambodsjansk riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>komoriske franc</displayName>
-				<displayName count="one">komorisk franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>nordkoreanske won</displayName>
-				<displayName count="one">nordkoreansk won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>sørkoreanske won</displayName>
-				<displayName count="one">sørkoreansk won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>kuwaitiske dinarer</displayName>
-				<displayName count="one">kuwaitisk dinar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>caymanske dollar</displayName>
-				<displayName count="one">caymansk dollar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>kasakhstanske tenge</displayName>
-				<displayName count="one">kasakhstansk tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>laotiske kip</displayName>
-				<displayName count="one">laotisk kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>libanesiske pund</displayName>
-				<displayName count="one">libanesisk pund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>srilankiske rupier</displayName>
-				<displayName count="one">srilankisk rupi</displayName>
-				<symbol>LKR</symbol>
-			</currency>
-			<currency type="LRD">
-				<displayName>liberiske dollar</displayName>
-				<displayName count="one">liberisk dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>lesothiske loti</displayName>
-				<displayName count="one">lesothisk loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litauiske lita</displayName>
-				<displayName count="one">litauisk lita</displayName>
-				<symbol>LTL</symbol>
-			</currency>
-			<currency type="LTT">
-				<displayName>litauiske talonas</displayName>
-				<displayName count="one">litauisk talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luxemburgske konvertible franc</displayName>
-				<displayName count="one">luxemburgsk konvertibel franc</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>luxemburgske franc</displayName>
-				<displayName count="one">luxemburgsk franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>luxemburgske finansielle franc</displayName>
-				<displayName count="one">luxemburgsk finansiell franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>latviske lats</displayName>
-				<displayName count="one">latvisk lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>latviske rubler</displayName>
-				<displayName count="one">latvisk rubel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>libyske dinarer</displayName>
-				<displayName count="one">libysk dinar</displayName>
-				<symbol>LYD</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>marokkanske dirham</displayName>
-				<displayName count="one">marokkansk dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>marokkanske franc</displayName>
-				<displayName count="one">marokkansk franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>moldovske leu</displayName>
-				<displayName count="one">moldovsk leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>madagassiske ariary</displayName>
-				<displayName count="one">madagassisk ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>madagassiske franc</displayName>
-				<displayName count="one">madagassisk franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>makedonske denarer</displayName>
-				<displayName count="one">makedonsk denar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>maliske franc</displayName>
-				<displayName count="one">malisk franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>myanmarske kyat</displayName>
-				<displayName count="one">myanmarsk kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>mongolske tugrik</displayName>
-				<displayName count="one">mongolsk tugrik</displayName>
-				<symbol>MNT</symbol>
-			</currency>
-			<currency type="MOP">
-				<displayName>makaoske pataca</displayName>
-				<displayName count="one">makaosk pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>mauritanske ouguiya</displayName>
-				<displayName count="one">mauritansk ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>maltesiske lira</displayName>
-				<displayName count="one">maltesisk lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>maltesiske pund</displayName>
-				<displayName count="one">maltesisk pund</displayName>
-				<symbol>MTP</symbol>
-			</currency>
-			<currency type="MUR">
-				<displayName>mauritiske rupier</displayName>
-				<displayName count="one">mauritisk rupi</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>maldiviske rufiyaa</displayName>
-				<displayName count="one">maldivisk rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>malawiske kwacha</displayName>
-				<displayName count="one">malawisk kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>meksikanske pesos</displayName>
-				<displayName count="one">meksikansk pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>meksikanske sølvpesos (1861-1992)</displayName>
-				<displayName count="one">meksikansk sølvpesos (MXP)</displayName>
-				<displayName count="other">meksikanske sølvpesos (MXP)</displayName>
-				<symbol>MXP</symbol>
-			</currency>
-			<currency type="MXV">
-				<displayName>meksikanske unidad de inversion (UDI)</displayName>
-				<displayName count="one">meksikansk unidad de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>malaysiske ringgit</displayName>
-				<displayName count="one">malaysisk ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>mosambikiske escudo</displayName>
-				<displayName count="one">mosambikisk escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>gamle mosambikiske metical</displayName>
-				<displayName count="one">gammel mosambikisk metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>mosambikiske metical</displayName>
-				<displayName count="one">mosambikisk metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>namibiske dollar</displayName>
-				<displayName count="one">namibisk dollar</displayName>
-				<symbol>NAD</symbol>
-			</currency>
-			<currency type="NGN">
-				<displayName>nigerianske naira</displayName>
-				<displayName count="one">nigeriansk naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>nicaraguanske cordoba</displayName>
-				<displayName count="one">nicaraguansk cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>nicaraguanske cordoba oro</displayName>
-				<displayName count="one">nicaraguansk cordoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>nederlandske gylden</displayName>
-				<displayName count="one">nederlandsk gylden</displayName>
-				<symbol>NLG</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName>norske kroner</displayName>
-				<displayName count="one">norsk krone</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="NPR">
-				<displayName>nepalske rupier</displayName>
-				<displayName count="one">nepalsk rupi</displayName>
-				<symbol>NPR</symbol>
-			</currency>
-			<currency type="NZD">
-				<displayName>new zealandske dollar</displayName>
-				<displayName count="one">new zealandsk dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>omanske rialer</displayName>
-				<displayName count="one">omansk rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>panamanske balboa</displayName>
-				<displayName count="one">panamansk balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>peruvianske inti</displayName>
-				<displayName count="one">peruviansk inti</displayName>
-				<symbol>PEI</symbol>
-			</currency>
-			<currency type="PEN">
-				<displayName>peruvianske nye sol</displayName>
-				<displayName count="one">peruviansk ny sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>peruvianske sol</displayName>
-				<displayName count="one">peruviansk sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>papuanske kina</displayName>
-				<displayName count="one">papuansk kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filippinske pesos</displayName>
-				<displayName count="one">filippinsk pesos</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>pakistanske rupier</displayName>
-				<displayName count="one">pakistansk rupi</displayName>
-				<symbol>PKR</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName>polske zloty</displayName>
-				<displayName count="one">polsk zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>polske zloty (1950-1995)</displayName>
-				<displayName count="one">polsk zloty (PLZ)</displayName>
-				<displayName count="other">polske zloty (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>portugisiske escudo</displayName>
-				<displayName count="one">portugisisk escudo</displayName>
-				<symbol>PTE</symbol>
-			</currency>
-			<currency type="PYG">
-				<displayName>paraguayanske guarani</displayName>
-				<displayName count="one">paraguayansk guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>qatarske rialer</displayName>
-				<displayName count="one">qatarsk rial</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>rhodesiske dollar</displayName>
-				<displayName count="one">rhodesisk dollar</displayName>
-				<symbol>RHD</symbol>
-			</currency>
-			<currency type="ROL">
-				<displayName>gamle rumenske leu</displayName>
-				<displayName count="one">gammel rumensk leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>rumenske leu</displayName>
-				<displayName count="one">rumensk leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>serbiske dinarer</displayName>
-				<displayName count="one">serbisk dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>russiske rubler</displayName>
-				<displayName count="one">russisk rubel</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>russiske rubler (1991-1998)</displayName>
-				<displayName count="one">russisk rubel (RUR)</displayName>
-				<displayName count="other">russiske rubler (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>rwandiske franc</displayName>
-				<displayName count="one">rwandisk franc</displayName>
-				<symbol>RWF</symbol>
-			</currency>
-			<currency type="SAR">
-				<displayName>saudiarabiske riyaler</displayName>
-				<displayName count="one">saudiarabisk riyal</displayName>
-				<symbol>SAR</symbol>
-			</currency>
-			<currency type="SBD">
-				<displayName>salomonske dollar</displayName>
-				<displayName count="one">salomonsk dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>seychelliske rupier</displayName>
-				<displayName count="one">seychellisk rupi</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>sudanesiske dinarer</displayName>
-				<displayName count="one">sudansk dinar</displayName>
-				<displayName count="other">sudanske dinarer</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>sudanske pund</displayName>
-				<displayName count="one">sudansk pund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>sudanesiske pund</displayName>
-				<displayName count="one">gammelt sudansk pund</displayName>
-				<displayName count="other">gamle sudanske pund</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>svenske kroner</displayName>
-				<displayName count="one">svensk krone</displayName>
-				<symbol>SEK</symbol>
-			</currency>
-			<currency type="SGD">
-				<displayName>singaporske dollar</displayName>
-				<displayName count="one">singaporsk dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>sankthelenske pund</displayName>
-				<displayName count="one">sankthelensk pund</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>slovenske tolar</displayName>
-				<displayName count="one">slovensk tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>slovakiske koruna</displayName>
-				<displayName count="one">slovakisk koruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>sierraleonske leone</displayName>
-				<displayName count="one">sierraleonsk leone</displayName>
-				<displayName count="other">sierraleonske leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>somaliske shilling</displayName>
-				<displayName count="one">somalisk shilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>surinamske dollar</displayName>
-				<displayName count="one">surinamsk dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>surinamske gylden</displayName>
-				<displayName count="one">surinamsk gylden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome og Principe-dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>sovjetiske rubler</displayName>
-				<displayName count="one">sovjetisk rubel</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>salvadoranske colon</displayName>
-				<displayName count="one">salvadoransk colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>syriske pund</displayName>
-				<displayName count="one">syrisk pund</displayName>
-				<symbol>SYP</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>swazilandske lilangeni</displayName>
-				<displayName count="one">swazilandsk lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>thailandske baht</displayName>
-				<displayName count="one">thailandsk baht</displayName>
-				<symbol>THB</symbol>
-			</currency>
-			<currency type="TJR">
-				<displayName>tadsjikiske rubler</displayName>
-				<displayName count="one">tadsjikisk rubel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>tadsjikiske somoni</displayName>
-				<displayName count="one">tadsjikisk somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>turkmenske manat</displayName>
-				<displayName count="one">turkmensk manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>tunisiske dinarer</displayName>
-				<displayName count="one">tunisisk dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>tonganske paʻanga</displayName>
-				<displayName count="one">tongansk paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>timoresiske escudo</displayName>
-				<displayName count="one">timoresisk escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>tyrkiske lire</displayName>
-				<displayName count="one">tyrkisk lire</displayName>
-				<displayName count="other">tyrkiske lire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ny tyrkisk lire</displayName>
-				<displayName count="one">ny tyrkisk lire</displayName>
-				<displayName count="other">nye tyrkiske lire</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>trinidadiske dollar</displayName>
-				<displayName count="one">trinidadisk dollar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>taiwanske nye dollar</displayName>
-				<displayName count="one">taiwansk ny dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>tanzanianske shilling</displayName>
-				<displayName count="one">tanzaniansk shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ukrainske hryvnia</displayName>
-				<displayName count="one">ukrainsk hryvnia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ukrainske karbovanetz</displayName>
-				<displayName count="one">ukrainsk karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ugandiske shilling (1966-1987)</displayName>
-				<displayName count="one">ugandisk shilling (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ugandiske shilling</displayName>
-				<displayName count="one">ugandisk shilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>amerikanske dollar</displayName>
-				<displayName count="one">amerikansk dollar</displayName>
-				<symbol>USD</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>amerikanske dollar (neste dag)</displayName>
-				<displayName count="one">amerikansk dollar (neste dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>amerikanske dollar (samme dag)</displayName>
-				<displayName count="one">amerikansk dollar (samme dag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayan Peso en Unidades Indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>uruguayanske pesos (1975-1993)</displayName>
-				<displayName count="one">uruguayansk pesos (UYP)</displayName>
-				<displayName count="other">uruguayanske pesos (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>uruguayanske peso uruguayo</displayName>
-				<displayName count="one">uruguayansk peso uruguayo</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>usbekiske sum</displayName>
-				<displayName count="one">usbekisk sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venezuelanske bolivar</displayName>
-				<displayName count="one">venezuelansk bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>venezuelanske bolivar fuerte</displayName>
-				<displayName count="one">venezuelansk bolivar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>vietnamesiske dong</displayName>
-				<displayName count="one">vietnamesisk dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vanuatiske vatu</displayName>
-				<displayName count="one">vanuatisk vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>vestsamoiske tala</displayName>
-				<displayName count="one">vestsamoisk tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA franc BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>sølv</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>gull</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>europeisk sammensatt enhet</displayName>
-				<displayName count="other">europeiske sammensatte enheter</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>europeisk monetær enhet</displayName>
-				<displayName count="other">europeiske monetære enheter</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>europeisk kontoenhet (XBC)</displayName>
-				<displayName count="other">europeiske kontoenheter</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>europeisk kontoenhet (XBD)</displayName>
-				<displayName count="other">europeiske kontoenheter (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>østkaribiske dollar</displayName>
-				<displayName count="one">østkaribisk dollar</displayName>
-				<symbol>XCD</symbol>
-			</currency>
-			<currency type="XDR">
-				<displayName>spesielle trekkrettigheter</displayName>
-				<displayName count="one">spesiell trekkrettighet</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>europeisk valutaenhet</displayName>
-				<displayName count="other">europeiske valutaenheter</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>franske gullfranc</displayName>
-				<displayName count="one">fransk gullfranc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>franske UIC-franc</displayName>
-				<displayName count="one">fransk UIC-franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA franc BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-fond</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>testvalutakode</displayName>
-				<displayName count="one">testvaluta</displayName>
-				<displayName count="other">testvaluta</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>ukjent eller ugyldig valuta</displayName>
-				<displayName count="one">ukjent eller ugyldig valuta</displayName>
-				<displayName count="other">ukjent eller ugyldig valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>jemenittiske dinarer</displayName>
-				<displayName count="one">jemenittisk dinar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>jemenittiske rialer</displayName>
-				<displayName count="one">jemenittisk rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>jugoslaviske dinarer (hard)</displayName>
-				<displayName count="one">jugoslavisk dinar (hard)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>jugoslaviske noviy-dinarer</displayName>
-				<displayName count="one">jugoslavisk noviy-dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>jugoslaviske konvertible dinarer</displayName>
-				<displayName count="one">jugoslavisk konvertibel dinar</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>sørafrikanske rand (finansielle)</displayName>
-				<displayName count="one">sørafrikansk rand (finansiell)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>sørafrikanske rand</displayName>
-				<displayName count="one">sørafrikansk rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>zambiske kwacha</displayName>
-				<displayName count="one">zambisk kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zairiske nye zaire</displayName>
-				<displayName count="one">zairisk ny zaire</displayName>
-				<symbol>ZRN</symbol>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zairiske zaire</displayName>
-				<displayName count="one">zairisk zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>zimbabwiske dollar</displayName>
-				<displayName count="one">zimbabwisk dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dager</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} time</unitPattern>
-			<unitPattern count="other">{0} timer</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minutt</unitPattern>
-			<unitPattern count="other">{0} minutter</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} måned</unitPattern>
-			<unitPattern count="other">{0} måneder</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekunder</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} uke</unitPattern>
-			<unitPattern count="other">{0} uker</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} år</unitPattern>
-			<unitPattern count="other">{0} år</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja</yesstr>
-			<nostr>nei</nostr>
-		</messages>
-	</posix>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nb_NO.xml b/airtime_mvc/library/Zend/Locale/Data/nb_NO.xml
deleted file mode 100644
index b79592947..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nb_NO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nb"/>
-		<territory type="NO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nds.xml b/airtime_mvc/library/Zend/Locale/Data/nds.xml
deleted file mode 100644
index 33e19050a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nds.xml
+++ /dev/null
@@ -1,1148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="nds"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abchaasch</language>
-			<language type="ace">Aceh</language>
-			<language type="ach">Acholi</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adygeisch</language>
-			<language type="ae">Avestsch</language>
-			<language type="af">Afrikaansch</language>
-			<language type="afa">Afro-Asiaatsche Spraken</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadsch</language>
-			<language type="ale">Aleutsch</language>
-			<language type="alg">Algonkin-Spraken</language>
-			<language type="alt">Süüd-Altaisch</language>
-			<language type="am">Amhaarsch</language>
-			<language type="an">Aragoneesch</language>
-			<language type="ang">Ooldengelsch</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apache</language>
-			<language type="ar">Araabsch</language>
-			<language type="arc">Aramääsch</language>
-			<language type="arn">Araukaansch</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Kunstspraken</language>
-			<language type="arw">Arawak-Spraken</language>
-			<language type="as">Assameesch</language>
-			<language type="ast">Asturiaansch</language>
-			<language type="ath">Athabasksche Spraken</language>
-			<language type="aus">Austraalsche Spraken</language>
-			<language type="av">Awaarsch</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Aserbaidschaansch</language>
-			<language type="ba">Baschkiersch</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke</language>
-			<language type="bal">Belutschisch</language>
-			<language type="ban">Balineesch</language>
-			<language type="bas">Basaa</language>
-			<language type="bat">Baltsche Spraken</language>
-			<language type="be">Wittruss’sch</language>
-			<language type="bej">Bedscha</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berberspraken</language>
-			<language type="bg">Bulgaarsch</language>
-			<language type="bh">Bihaarsch</language>
-			<language type="bho">Bhodschpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengaalsch</language>
-			<language type="bnt">Bantuspraken</language>
-			<language type="bo">Tibeetsch</language>
-			<language type="br">Bretoonsch</language>
-			<language type="bra">Braj-Bhakha</language>
-			<language type="bs">Bosnisch</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Burjaatsch</language>
-			<language type="bug">Bugineesch</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalaansch</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Indianerspraken in Zentralamerika</language>
-			<language type="car">Kariebsche Spraken</language>
-			<language type="cau">Kaukaasche Spraken</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Tschetscheensch</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Keltsche Spraken</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Chibcha-Spraken</language>
-			<language type="chg">Tschagataisch</language>
-			<language type="chk">Trukeesch</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Chinook</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Cham-Spraken</language>
-			<language type="co">Koorsch</language>
-			<language type="cop">Koptsch</language>
-			<language type="cpe">Kreoolsch-Engelsche Spraken</language>
-			<language type="cpf">Kreoolsch-Franzöösche Spraken</language>
-			<language type="cpp">Kreoolsch-Portugeesche Spraken</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Krimtataarsch</language>
-			<language type="crp">Kreoolsche Spraken</language>
-			<language type="cs">Tschech’sch</language>
-			<language type="csb">Kaschuubsch</language>
-			<language type="cu">Karkenslaavsch</language>
-			<language type="cus">Kuschietsche Spraken</language>
-			<language type="cv">Tschuwasch’sch</language>
-			<language type="cy">Waliesch</language>
-			<language type="da">Däänsch</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargiensch</language>
-			<language type="day">Dajak</language>
-			<language type="de">Düütsch</language>
-			<language type="de_AT">Öösterrieksch Hoochdüütsch</language>
-			<language type="de_CH">Swiezer Hoochdüütsch</language>
-			<language type="del">Delaware</language>
-			<language type="den">Slave</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Drawiedsche Spraken</language>
-			<language type="dsb">Neddersorbsch</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Middelnedderlandsch</language>
-			<language type="dv">Maledievsch</language>
-			<language type="dyu">Dyula</language>
-			<language type="dz">Bhutaansch</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Ägyptsch</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Greeksch</language>
-			<language type="elx">Elaamsch</language>
-			<language type="en">Engelsch</language>
-			<language type="en_AU">Austraalsch Engelsch</language>
-			<language type="en_CA">Kanaadsch Engelsch</language>
-			<language type="en_GB">Brietsch Engelsch</language>
-			<language type="en_US">Amerikaansch Engelsch</language>
-			<language type="enm">Middelengelsch</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spaansch</language>
-			<language type="es_419">Latienamerikaansch Spaansch</language>
-			<language type="es_ES">Ibeersch Spaansch</language>
-			<language type="et">Eestnisch</language>
-			<language type="eu">Basksch</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Pers’sch</language>
-			<language type="fan">Pangwe</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Ful</language>
-			<language type="fi">Finnsch</language>
-			<language type="fil">Philippiensch</language>
-			<language type="fiu">Finnougrische Spraken</language>
-			<language type="fj">Fidschiaansch</language>
-			<language type="fo">Färöösch</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Franzöösch</language>
-			<language type="fr_CA">Kanaadsch Franzöösch</language>
-			<language type="fr_CH">Swiezer Franzöösch</language>
-			<language type="frm">Middelfranzöösch</language>
-			<language type="fro">Ooldfranzöösch</language>
-			<language type="frr">Noordfreesch</language>
-			<language type="frs">Saterfreesch</language>
-			<language type="fur">Friuulsch</language>
-			<language type="fy">Westfreesch</language>
-			<language type="ga">Iersch</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">Schottsch Gäälsch</language>
-			<language type="gem">Germaansche Spraken</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilberteesch</language>
-			<language type="gl">Galizisch</language>
-			<language type="gmh">Middelhoochdüütsch</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Ooldhoochdüütsch</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gootsch</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Ooldgreeksch</language>
-			<language type="gsw">Swiezerdüütsch</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="gwi">Kutchin</language>
-			<language type="ha">Haussa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaiiaansch</language>
-			<language type="he">Hebrääsch</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hethitsch</language>
-			<language type="hmn">Miao-Spraken</language>
-			<language type="ho">Hiri-Motu</language>
-			<language type="hr">Kroaatsch</language>
-			<language type="hsb">Böversorbsch</language>
-			<language type="ht">Haitiaansch-Kreoolsch</language>
-			<language type="hu">Ungaarsch</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armeensch</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indoneesch</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiak</language>
-			<language type="ilo">Ilokano</language>
-			<language type="inc">Indoarische Spraken</language>
-			<language type="ine">Indogermaansche Spraken</language>
-			<language type="inh">Ingusch’sch</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iraansche Spraken</language>
-			<language type="iro">Irokeesche Spraken</language>
-			<language type="is">Ieslandsch</language>
-			<language type="it">Italieensch</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japaansch</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Jöödsch-Pers’sch</language>
-			<language type="jrb">Jöödsch-Araabsch</language>
-			<language type="jv">Javaansch</language>
-			<language type="ka">Georgsch</language>
-			<language type="kaa">Karakalpaksch</language>
-			<language type="kab">Kabyylsch</language>
-			<language type="kac">Kachin</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Kareensch</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardiensch</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi</language>
-			<language type="khi">Khoisan-Spraken</language>
-			<language type="kho">Saaksch</language>
-			<language type="ki">Kikuyu</language>
-			<language type="kj">Kwanyama</language>
-			<language type="kk">Kasach’sch</language>
-			<language type="kl">Gröönlandsch</language>
-			<language type="km">Kambodschaansch</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Koreaansch</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraeaansch</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuursch</language>
-			<language type="krc">Karatschaisch-Balkaarsch</language>
-			<language type="krl">Kareelsch</language>
-			<language type="kro">Kru-Spraken</language>
-			<language type="kru">Oraon</language>
-			<language type="ks">Kaschmiersch</language>
-			<language type="ku">Kurdsch</language>
-			<language type="kum">Kumücksch</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Koornsch</language>
-			<language type="ky">Kirgiesch</language>
-			<language type="la">Latiensch</language>
-			<language type="lad">Ladiensch</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Luxemborgsch</language>
-			<language type="lez">Lesgisch</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limborgsch</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laootsch</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Rotse</language>
-			<language type="lt">Litausch</language>
-			<language type="lu">Luba</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
-			<language type="lv">Lettsch</language>
-			<language type="mad">Madureesch</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makassarsch</language>
-			<language type="man">Manding</language>
-			<language type="map">Austroneesche Spraken</language>
-			<language type="mas">Massai</language>
-			<language type="mdf">Mokscha</language>
-			<language type="mdr">Mandareesch</language>
-			<language type="men">Mende</language>
-			<language type="mg">Madagassisch</language>
-			<language type="mga">Middeliersch</language>
-			<language type="mh">Marschalleesch</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Verschedene Spraken</language>
-			<language type="mk">Mazedoonsch</language>
-			<language type="mkh">Mon-Khmer-Spraken</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongoolsch</language>
-			<language type="mnc">Mandschuursch</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Manobo</language>
-			<language type="mo">Moldaawsch</language>
-			<language type="moh">Mohawk</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malaisch</language>
-			<language type="mt">Malteesch</language>
-			<language type="mul">Mehrsprakig</language>
-			<language type="mun">Munda-Spraken</language>
-			<language type="mus">Muskogee-Spraken</language>
-			<language type="mwl">Mirandeesch</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Birmaansch</language>
-			<language type="myn">Maya-Spraken</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauruusch</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Indianerspraken in Noordamerika</language>
-			<language type="nap">Neapolitaansch</language>
-			<language type="nb">Norweegsch Bokmål</language>
-			<language type="nd">Noord-Ndebele</language>
-			<language type="nds">Plattdüütsch</language>
-			<language type="ne">Nepaleesch</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Nigerkordofaansche Spraken</language>
-			<language type="niu">Niue</language>
-			<language type="nl">Nedderlandsch</language>
-			<language type="nl_BE">Fläämsch</language>
-			<language type="nn">Norweegsch Nynorsk</language>
-			<language type="no">Norweegsch</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Ooldnoorsch</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">Süüd-Ndebele</language>
-			<language type="nso">Noord-Sotho</language>
-			<language type="nub">Nuubsche Spraken</language>
-			<language type="nv">Navajo</language>
-			<language type="nwc">Oold-Newari</language>
-			<language type="ny">Nyanja</language>
-			<language type="nym">Nyamwezi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Okzitaansch</language>
-			<language type="oj">Ojibwa</language>
-			<language type="om">Oromo</language>
-			<language type="or">Orija</language>
-			<language type="os">Ossetsch</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Osmaansch</language>
-			<language type="oto">Otomangue-Spraken</language>
-			<language type="pa">Pandschabsch</language>
-			<language type="paa">Papuaspraken</language>
-			<language type="pag">Pangasinan</language>
-			<language type="pal">Middelpers’sch</language>
-			<language type="pam">Pampanggan</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palausch</language>
-			<language type="peo">Ooldpers’sch</language>
-			<language type="phi">Philippinen-Austroneesche Spraken</language>
-			<language type="phn">Phönieksch</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Poolsch</language>
-			<language type="pon">Ponapeaansch</language>
-			<language type="pra">Prakrit</language>
-			<language type="pro">Ooldprovenzaalsch</language>
-			<language type="ps">Paschtu</language>
-			<language type="pt">Portugeesch</language>
-			<language type="pt_BR">Brasiliaansch Portugeesch</language>
-			<language type="pt_PT">Ibeersch Portugeesch</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Oosterinsel-Spraak</language>
-			<language type="rar">Rarotongaansch</language>
-			<language type="rm">Rätoromaansch</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Rumäänsch</language>
-			<language type="roa">Romaansche Spraken</language>
-			<language type="rom">Romani</language>
-			<language type="root">Wortel</language>
-			<language type="ru">Russ’sch</language>
-			<language type="rup">Aromuunsch</language>
-			<language type="rw">Ruandsch</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Jakuutsch</language>
-			<language type="sai">Indianerspraken in Süüdamerika</language>
-			<language type="sal">Salish</language>
-			<language type="sam">Samaritaansch</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardsch</language>
-			<language type="scn">Siziliaansch</language>
-			<language type="sco">Schottsch</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Noord-Saamsch</language>
-			<language type="sel">Selkupsch</language>
-			<language type="sem">Semietsche Spraken</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Oold-Iersch</language>
-			<language type="sgn">Tekenspraken</language>
-			<language type="shn">Schan</language>
-			<language type="si">Singhaleesch</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Sioux-Spraken</language>
-			<language type="sit">Sinotibeetsche Spraken</language>
-			<language type="sk">Slowaaksch</language>
-			<language type="sl">Sloweensch</language>
-			<language type="sla">Slaavsche Spraken</language>
-			<language type="sm">Samoaansch</language>
-			<language type="sma">Süüd-Lappsch</language>
-			<language type="smi">Lappsch</language>
-			<language type="smj">Lule-Lappsch</language>
-			<language type="smn">Inari-Lappsch</language>
-			<language type="sms">Skolt-Lappsch</language>
-			<language type="sn">Schona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somaalsch</language>
-			<language type="sog">Sogdisch</language>
-			<language type="son">Songhai</language>
-			<language type="sq">Albaansch</language>
-			<language type="sr">Serbsch</language>
-			<language type="srn">Surinaamsch</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Swazi</language>
-			<language type="ssa">Nilosaharaansche Spraken</language>
-			<language type="st">Süüd-Sotho</language>
-			<language type="su">Sundaneesch</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumersch</language>
-			<language type="sv">Sweedsch</language>
-			<language type="sw">Suaheli</language>
-			<language type="syc">Oold-Syyrsch</language>
-			<language type="syr">Syyrsch</language>
-			<language type="ta">Tamilsch</language>
-			<language type="tai">Thaispraken</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Temne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tadschiksch</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmeensch</language>
-			<language type="tkl">Tokelausch</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingoonsch</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">Tamaschek</language>
-			<language type="tn">Tswana</language>
-			<language type="to">Tongaasch</language>
-			<language type="tog">Tonga (Nyasa)</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Törksch</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian</language>
-			<language type="tt">Tataarsch</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi-Spraken</language>
-			<language type="tut">Altaische Spraken</language>
-			<language type="tvl">Elliceaansch</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitsch</language>
-			<language type="tyv">Tuwinsch</language>
-			<language type="udm">Udmurtsch</language>
-			<language type="ug">Uiguursch</language>
-			<language type="uga">Ugaritsch</language>
-			<language type="uk">Ukrainsch</language>
-			<language type="umb">Mbundu</language>
-			<language type="und">Unbestimmte Spraak</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Usbeeksch</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vietnameesch</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Wootsch</language>
-			<language type="wa">Walloonsch</language>
-			<language type="wak">Wakashaansch</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo</language>
-			<language type="wen">Sorbsch</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmücksch</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao</language>
-			<language type="yap">Yapeesch</language>
-			<language type="yi">Jiddisch</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapoteeksch</language>
-			<language type="zbl">Bliss-Symbolen</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Chineesch</language>
-			<language type="zh_Hans">Vereenfacht Chineesch</language>
-			<language type="zh_Hant">Traditschonell Chineesch</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Keen Spraakinhold</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Araabsch</script>
-			<script type="Armi">Rieksaramääsch</script>
-			<script type="Armn">Armeensch</script>
-			<script type="Avst">Avestsch</script>
-			<script type="Bali">Balineesch</script>
-			<script type="Batk">Bataksch</script>
-			<script type="Beng">Bengaalsch</script>
-			<script type="Blis">Bliss-Symbolen</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Blinnenschrift</script>
-			<script type="Bugi">Bugineesch</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Chakma</script>
-			<script type="Cans">Vereenheidlicht Kanaadsch Sülvenschrift</script>
-			<script type="Cari">Kaarsch</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptsch</script>
-			<script type="Cprt">Zypriootsch</script>
-			<script type="Cyrl">Kyrillsch</script>
-			<script type="Cyrs">Ooldkarkenslaavsch</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Demootsch</script>
-			<script type="Egyh">Hieraatsch</script>
-			<script type="Egyp">Ägyptsche Hieroglyphen</script>
-			<script type="Ethi">Äthioopsch</script>
-			<script type="Geok">Khutsuri</script>
-			<script type="Geor">Georgsch</script>
-			<script type="Glag">Glagolietsch</script>
-			<script type="Goth">Gootsch</script>
-			<script type="Grek">Greeksch</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Chineesch</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Vereenfachte Chineesche Schrift</script>
-			<script type="Hant">Traditschonelle Chineesche Schrift</script>
-			<script type="Hebr">Hebrääsch</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana oder Hiragana</script>
-			<script type="Hung">Ooldungaarsch</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Oolditaalsch</script>
-			<script type="Java">Javaneesch</script>
-			<script type="Jpan">Japaansch</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreaansch</script>
-			<script type="Kthi">Kaithi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Laootsch</script>
-			<script type="Latf">Latiensch (Fraktur)</script>
-			<script type="Latg">Latiensch (Gäälsch)</script>
-			<script type="Latn">Latiensch</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Linear A</script>
-			<script type="Linb">Linear B</script>
-			<script type="Lyci">Lyyksch</script>
-			<script type="Lydi">Lyydsch</script>
-			<script type="Mand">Mandääsch</script>
-			<script type="Mani">Manichääsch</script>
-			<script type="Maya">Maya-Hieroglyphen</script>
-			<script type="Mero">Meroitsch</script>
-			<script type="Mlym">Malaysch</script>
-			<script type="Mong">Mongoolsch</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Birmaansch</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orchon-Runen</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmaansch</script>
-			<script type="Perm">Ooldpermsch</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Inschriften-Pahlavi</script>
-			<script type="Phlp">Psalter-Pahlavi</script>
-			<script type="Phlv">Book-Pahlavi</script>
-			<script type="Phnx">Phönieksch</script>
-			<script type="Plrd">Pollard-Phönieksch</script>
-			<script type="Prti">Inschriften-Parthsch</script>
-			<script type="Qaai">Arvt Schriftweert</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runenschrift</script>
-			<script type="Samr">Samarietsch</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">Shaw-Alphabet</script>
-			<script type="Sinh">Singhaleesch</script>
-			<script type="Sund">Sundaneesch</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syyrsch</script>
-			<script type="Syre">Estrangelo-Syyrsch</script>
-			<script type="Syrj">West-Syyrsch</script>
-			<script type="Syrn">Oost-Syyrsch</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Tai Lue</script>
-			<script type="Taml">Tamilsch</script>
-			<script type="Tavt">Tai Viet</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">Tibeetsch</script>
-			<script type="Ugar">Ugarietsch</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Visible Speech</script>
-			<script type="Xpeo">Ooldpers’sch</script>
-			<script type="Xsux">Sumeroakkadsch Kielschrift</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Mathemaatsch Teken</script>
-			<script type="Zsym">Symbolen</script>
-			<script type="Zxxx">Schriftlose Spraken</script>
-			<script type="Zyyy">Unbestimmt</script>
-			<script type="Zzzz">Unbekannt oder Unkodeert</script>
-		</scripts>
-		<territories>
-			<territory type="001">Welt</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Noordamerika</territory>
-			<territory type="005">Süüdamerika</territory>
-			<territory type="009">Ozeanien</territory>
-			<territory type="011">Westafrika</territory>
-			<territory type="013">Middelamerika</territory>
-			<territory type="014">Oostafrika</territory>
-			<territory type="015">Noordafrika</territory>
-			<territory type="017">Zentralafrika</territory>
-			<territory type="018">Süüdlich Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="029">Karibik</territory>
-			<territory type="030">Oostasien</territory>
-			<territory type="034">Süüdasien</territory>
-			<territory type="035">Süüdoostasien</territory>
-			<territory type="039">Süüdeuropa</territory>
-			<territory type="053">Australien un Neeseeland</territory>
-			<territory type="054">Melanesien</territory>
-			<territory type="061">Polynesien</territory>
-			<territory type="062">Süüd-Zentralasien</territory>
-			<territory type="142">Asien</territory>
-			<territory type="143">Zentralasien</territory>
-			<territory type="145">Westasien</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Oosteuropa</territory>
-			<territory type="154">Noordeuropa</territory>
-			<territory type="155">Westeuropa</territory>
-			<territory type="172">Gemeenschop vun Unafhängige Staten</territory>
-			<territory type="419">Latienamerika un Karibik</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Vereenigte Araabsche Emiraten</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua un Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanien</territory>
-			<territory type="AM">Armenien</territory>
-			<territory type="AN">Nedderlandsche Antillen</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentinien</territory>
-			<territory type="AS">Amerikaansch-Samoa</territory>
-			<territory type="AT">Öösterriek</territory>
-			<territory type="AU">Australien</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…landeilannen</territory>
-			<territory type="AZ">Aserbaidschan</territory>
-			<territory type="BA">Bosnien un Herzegowina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesch</territory>
-			<territory type="BE">Belgien</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarien</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Bolivien</territory>
-			<territory type="BR">Brasilien</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet-Eiland</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Wittrussland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos-Eilannen</territory>
-			<territory type="CD">Demokraatsche Republik Kongo</territory>
-			<territory type="CF">Zentralafrikaansche Republik</territory>
-			<territory type="CG">Republik Kongo</territory>
-			<territory type="CH">Swiez</territory>
-			<territory type="CI">Elfenbeenküst</territory>
-			<territory type="CK">Cook-Eilannen</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Kolumbien</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Wiehnachtseiland</territory>
-			<territory type="CY">Zypern</territory>
-			<territory type="CZ">Tschechien</territory>
-			<territory type="DE">Düütschland</territory>
-			<territory type="DJ">Dschibuti</territory>
-			<territory type="DK">Däänmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominikaansche Republik</territory>
-			<territory type="DZ">Algerien</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Eestland</territory>
-			<territory type="EG">Ägypten</territory>
-			<territory type="EH">Westsahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanien</territory>
-			<territory type="ET">Äthiopien</territory>
-			<territory type="FI">Finnland</territory>
-			<territory type="FJ">Fidschi</territory>
-			<territory type="FK">Falkland-Eilannen</territory>
-			<territory type="FM">Mikronesien</territory>
-			<territory type="FO">Färöer</territory>
-			<territory type="FR">Frankriek</territory>
-			<territory type="GA">Gabun</territory>
-			<territory type="GB">Vereenigt Königriek</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgien</territory>
-			<territory type="GF">Franzöösch-Guayana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Gröönland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Äquatorialguinea</territory>
-			<territory type="GR">Grekenland</territory>
-			<territory type="GS">Süüdgeorgien un de Südlichen Sandwich-Eilannen</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Sünnerverwaltensrebeed Hongkong</territory>
-			<territory type="HM">Heard- un McDonald-Eilannen</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatien</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesien</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Insel Man</territory>
-			<territory type="IN">Indien</territory>
-			<territory type="IO">Britisch Rebeed in’n Indischen Ozean</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Iesland</territory>
-			<territory type="IT">Italien</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Jordanien</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambodscha</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komoren</territory>
-			<territory type="KN">St. Kitts un Nevis</territory>
-			<territory type="KP">Noordkorea</territory>
-			<territory type="KR">Süüdkorea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Kaiman-Eilannen</territory>
-			<territory type="KZ">Kasachstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">St. Lucia</territory>
-			<territory type="LI">Liechtensteen</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxemborg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Libyen</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldawien</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshall-Eilannen</territory>
-			<territory type="MK">Makedonien</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Birma</territory>
-			<territory type="MN">Mongolei</territory>
-			<territory type="MO">Sünnerverwaltensrebeed Macao</territory>
-			<territory type="MP">Nöördliche Marianen</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauretanien</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Malediven</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Neekaledonien</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Nedderlannen</territory>
-			<territory type="NO">Norwegen</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Neeseeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Franzöösch-Polynesien</territory>
-			<territory type="PG">Papua-Neeguinea</territory>
-			<territory type="PH">Philippinen</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">St. Pierre un Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palästinensische Rebeden</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Büter Ozeanien</territory>
-			<territory type="QU">Europääsche Union</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Rumänien</territory>
-			<territory type="RS">Serbien</territory>
-			<territory type="RU">Russland</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudi-Arabien</territory>
-			<territory type="SB">Salomonen</territory>
-			<territory type="SC">Seychellen</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sweden</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">St. Helena</territory>
-			<territory type="SI">Slowenien</territory>
-			<territory type="SJ">Svalbard un Jan Mayen</territory>
-			<territory type="SK">Slowakei</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé un Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrien</territory>
-			<territory type="SZ">Swasiland</territory>
-			<territory type="TC">Turks- un Caicosinseln</territory>
-			<territory type="TD">Tschad</territory>
-			<territory type="TF">Franzöösche Süüd- un Antarktisrebeden</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadschikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Oosttimor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunesien</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Törkie</territory>
-			<territory type="TT">Trinidad un Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tansania</territory>
-			<territory type="UA">Ukraine</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerikaansch-Ozeanien</territory>
-			<territory type="US">USA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">St. Vincent un de Grenadinen</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Brietsche Jumfern-Eilannen</territory>
-			<territory type="VI">Amerikaansche Jumfern-Eilannen</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis un Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Süüdafrika</territory>
-			<territory type="ZM">Sambia</territory>
-			<territory type="ZW">Simbabwe</territory>
-			<territory type="ZZ">Unbekannte oder ungüllige Region</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Ole düütsche Rechtschrievung</variant>
-			<variant type="1994">Standardiseert Resiaansch Rechtschrievung</variant>
-			<variant type="1996">Ne’e düütsche Rechtschrievung</variant>
-			<variant type="1606NICT">Laat Middelfranzöösch bet 1606</variant>
-			<variant type="1694ACAD">Fröh Neefranzöösch</variant>
-			<variant type="AREVELA">Oostarmeensch</variant>
-			<variant type="AREVMDA">Westarmeensch</variant>
-			<variant type="BAKU1926">Vereenheitlicht Törksch Latienalphabet</variant>
-			<variant type="BISKE">San Giorgio-/Bila-Dialekt</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">Phoneetsch (IPA)</variant>
-			<variant type="FONUPA">Phoneetsch (UPA)</variant>
-			<variant type="LIPAW">Lipovaz-Dialekt vun dat Resiaansche</variant>
-			<variant type="MONOTON">Monotoonsch</variant>
-			<variant type="NEDIS">Natisone-Dialekt</variant>
-			<variant type="NJIVA">Gniva-/Njiva-Dialekt</variant>
-			<variant type="OSOJS">Oseacco-/Osojane-Dialekt</variant>
-			<variant type="POLYTON">Polytoonsch</variant>
-			<variant type="POSIX">Computer</variant>
-			<variant type="REVISED">Överarbeidt Rechtschrievung</variant>
-			<variant type="ROZAJ">Resiaansch</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Schottsch Standard-Engelsch</variant>
-			<variant type="SCOUSE">Scouse</variant>
-			<variant type="SOLBA">Stolvizza-/Solbica-Dialekt</variant>
-			<variant type="TARASK">Taraskievica-Rechtschrievung</variant>
-			<variant type="VALENCIA">Valenziaansch</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Klenner</key>
-			<key type="collation">Bookstaven-Folgreeg</key>
-			<key type="currency">Geldteken</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Traditschonell Chineesch Sorteerregeln - Big5</type>
-			<type type="buddhist" key="calendar">Buddhistisch Klenner</type>
-			<type type="chinese" key="calendar">Chineesch Klenner</type>
-			<type type="direct" key="collation">Direkte Sorteerregeln</type>
-			<type type="gb2312han" key="collation">Vereenfacht Chineesch Sorteerregeln - GB2312</type>
-			<type type="gregorian" key="calendar">Gregoriaansch Klenner</type>
-			<type type="hebrew" key="calendar">Hebrääsch Klenner</type>
-			<type type="indian" key="calendar">Indsch Nationalklenner</type>
-			<type type="islamic" key="calendar">Islaamsch Klenner</type>
-			<type type="islamic-civil" key="calendar">Islaamsch Zivilklenner</type>
-			<type type="japanese" key="calendar">Japaansch Klenner</type>
-			<type type="phonebook" key="collation">Telefonbook-Sorteerregeln</type>
-			<type type="pinyin" key="collation">Pinyin-Sorteerregeln</type>
-			<type type="roc" key="calendar">Klenner vun de Republik China</type>
-			<type type="stroke" key="collation">Streekfolg</type>
-			<type type="traditional" key="collation">Traditschonelle Sorteerregeln</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrisch</measurementSystemName>
-			<measurementSystemName type="US">US-amerikaansch</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Spraak: {0}</codePattern>
-			<codePattern type="script">Schrift: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a å ä b-o ö p-s ß t u ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â � æ ç é è ĕ ê ë ę ē í ì ĭ î ï ī ñ ó ò � ô ø � œ ú ù ŭ û ū ÿ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>“</quotationEnd>
-		<alternateQuotationStart>‚</alternateQuotationStart>
-		<alternateQuotationEnd>‘</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<timeZoneNames>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unbekannt</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Süüdpool</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Wostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanaren</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulanbator</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexiko-Stadt</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoren</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskau</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Wolgograd</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinborg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Nowosibirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Wladiwostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamschatka</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uschgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Saporoschje</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Noord-Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Noord-Dakota</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} Daag</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} Stünnen</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} Minuten</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} Maanden</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} Sekunnen</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} Weken</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} Johren</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>jo:j</yesstr>
-			<nostr>nee:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nds_DE.xml b/airtime_mvc/library/Zend/Locale/Data/nds_DE.xml
deleted file mode 100644
index 2fd28f664..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nds_DE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nds"/>
-		<territory type="DE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ne.xml b/airtime_mvc/library/Zend/Locale/Data/ne.xml
deleted file mode 100644
index eceb7f1b7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ne.xml
+++ /dev/null
@@ -1,1383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.35 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="ne"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">अफ�रिकाली</language>
-			<language type="am">अम�हारिक</language>
-			<language type="ar">अरबी</language>
-			<language type="as">आसामी</language>
-			<language type="az">अजरबैजानी</language>
-			<language type="be">बेलार�सियाली</language>
-			<language type="bg">ब�ल�गेरियाली</language>
-			<language type="bh">बिहारी</language>
-			<language type="bn">बंगाली</language>
-			<language type="bs">बोस�नियाली</language>
-			<language type="ca">क�याटालन</language>
-			<language type="cs">चेकोस�लोभाकियाली</language>
-			<language type="cy">वेल�श</language>
-			<language type="da">ड�यानिश</language>
-			<language type="de">जर�मन</language>
-			<language type="el">ग�रीक</language>
-			<language type="en">अ�ग�रेजी</language>
-			<language type="eo">�स�पेरान�तो</language>
-			<language type="es">स�प�यानिश</language>
-			<language type="et">इस�टोनियाली</language>
-			<language type="eu">बास�क</language>
-			<language type="fa">फारसी</language>
-			<language type="fi">फिनिश</language>
-			<language type="fil">फिलिपिनी</language>
-			<language type="fo">फारोइज</language>
-			<language type="fr">फ�रांसेली</language>
-			<language type="fy">फ�रिजीयन</language>
-			<language type="ga">आइरिश</language>
-			<language type="gd">स�कट�स गा�लिक</language>
-			<language type="gl">गलिसियाली</language>
-			<language type="gu">ग�जराती</language>
-			<language type="he">हिब�र�</language>
-			<language type="hi">हिन�दी</language>
-			<language type="hr">क�रो�सियाली</language>
-			<language type="hu">हंग�रीयाली</language>
-			<language type="ia">इन�टर�लिङ�ग�आ</language>
-			<language type="id">इन�डोनेसियाली</language>
-			<language type="ie">अन�तरभाषी</language>
-			<language type="is">आइसल�यान�डिक</language>
-			<language type="it">इटालियन</language>
-			<language type="ja">जापानी</language>
-			<language type="jv">जाभानिज</language>
-			<language type="ka">जोरजियन</language>
-			<language type="km">कम�बोडीयाली</language>
-			<language type="kn">कन�नाडा</language>
-			<language type="ko">कोरियाली</language>
-			<language type="ku">क�र�दिश</language>
-			<language type="la">ल�याटिन</language>
-			<language type="ln">लिंगाला</language>
-			<language type="lo">लाओ</language>
-			<language type="lt">लिथ�आनियाली</language>
-			<language type="lv">लात�भियाली</language>
-			<language type="mk">म�याकेडोनियन</language>
-			<language type="ml">मलयालम</language>
-			<language type="mn">मंगोल</language>
-			<language type="mr">मराठी</language>
-			<language type="ms">मलाया</language>
-			<language type="mt">माल�टिज</language>
-			<language type="ne">नेपाली</language>
-			<language type="nl">डच</language>
-			<language type="no">नर�वेजियाली</language>
-			<language type="oc">अक�सिटन</language>
-			<language type="or">ओरिया</language>
-			<language type="pa">पंजाबी</language>
-			<language type="pl">पोलिश</language>
-			<language type="ps">पाश�तो</language>
-			<language type="pt">पोर�त�गाली</language>
-			<language type="pt_BR">पर�त�गाली (ब�राजिल�याली)</language>
-			<language type="pt_PT">आइबेरी, पर�त�गाली</language>
-			<language type="ro">रोमानियाली</language>
-			<language type="ru">रसियाली</language>
-			<language type="sa">संस�कृत</language>
-			<language type="si">सिन�हाली</language>
-			<language type="sk">स�लोभाकियाली</language>
-			<language type="sl">स�लोभेनियाली</language>
-			<language type="so">सोमाली</language>
-			<language type="sq">अल�बेनियन</language>
-			<language type="sr">सर�बियाली</language>
-			<language type="su">स�डानी</language>
-			<language type="sv">स�विडिश</language>
-			<language type="sw">स�वाहिली</language>
-			<language type="ta">तामिल</language>
-			<language type="te">तेल�ग�</language>
-			<language type="th">थाई</language>
-			<language type="ti">तिग�रीन�या</language>
-			<language type="tlh">क�लिङ�गन</language>
-			<language type="tr">टर�की</language>
-			<language type="uk">य�क�रेनी</language>
-			<language type="ur">उर�द�</language>
-			<language type="uz">उज़�बेक</language>
-			<language type="vi">भियतनामी</language>
-			<language type="xh">�ोसा</language>
-			<language type="yi">यिद�दिस</language>
-			<language type="zh">चिनिया�</language>
-			<language type="zh_Hans">सरलिकृत चिनिया�</language>
-			<language type="zh_Hant">परम�परागत चिनिया�</language>
-			<language type="zu">ज�लू</language>
-		</languages>
-		<scripts>
-			<script type="Arab">अरब</script>
-			<script type="Armi">आर�मी</script>
-			<script type="Armn">आर�मेनियन</script>
-			<script type="Avst">आभेस�टान</script>
-			<script type="Bali">बाली</script>
-			<script type="Batk">बाटक</script>
-			<script type="Beng">बङ�गाली</script>
-			<script type="Blis">ब�लिजसिम�बोल�स</script>
-			<script type="Bopo">बोपोमोफो</script>
-			<script type="Brah">ब�राह�मी</script>
-			<script type="Brai">ब�रेल</script>
-			<script type="Bugi">ब�गिनिज</script>
-			<script type="Buhd">ब�हिद</script>
-			<script type="Cakm">काक�म�</script>
-			<script type="Cari">कारियन</script>
-			<script type="Cham">चाम</script>
-			<script type="Cher">चेरोकी</script>
-			<script type="Cirt">किर�थ</script>
-			<script type="Copt">कप�टिक</script>
-			<script type="Cprt">कप�रियट</script>
-			<script type="Cyrl">सिरिलिक</script>
-			<script type="Deva">देवानगरी</script>
-			<script type="Dsrt">डेसेरेट</script>
-			<script type="Egyd">इजिप�टियन डेमोटिक</script>
-			<script type="Egyh">इजिप�टियन हाइरटिक</script>
-			<script type="Egyp">इजिप�टियन हाइरोग�लिफ�स</script>
-			<script type="Ethi">इथियोपिक</script>
-			<script type="Geok">ग�र�जियाली ख�ट�स�री</script>
-			<script type="Geor">ग�र�जियाली</script>
-			<script type="Glag">ग�लागोलिटिक</script>
-			<script type="Goth">गोथिक</script>
-			<script type="Grek">ग�रीक</script>
-			<script type="Gujr">ग�जराती</script>
-			<script type="Guru">ग�रूम�खी</script>
-			<script type="Hang">हान�ग�ल</script>
-			<script type="Hani">हान</script>
-			<script type="Hano">हान�न�</script>
-			<script type="Hans">सरलिकृत हान</script>
-			<script type="Hant">परम�परागत हान</script>
-			<script type="Hebr">हिब�र�</script>
-			<script type="Hira">हिरागाना</script>
-			<script type="Hmng">पहावह हमोङ�ग</script>
-			<script type="Hrkt">काताकाना वा हिरागाना</script>
-			<script type="Hung">प�रानो हङ�गेरियाली</script>
-			<script type="Inds">इन�द�स</script>
-			<script type="Ital">प�रानो इटालिक</script>
-			<script type="Java">जाभानी</script>
-			<script type="Jpan">जापानी</script>
-			<script type="Kali">कायाहली</script>
-			<script type="Kana">काताकाना</script>
-			<script type="Khar">खारोस�थिति</script>
-			<script type="Khmr">खमेर</script>
-			<script type="Knda">कान�नाडा</script>
-			<script type="Kore">कोरियन</script>
-			<script type="Kthi">क�थी</script>
-			<script type="Lana">लान�ना</script>
-			<script type="Laoo">लाओ</script>
-			<script type="Latf">फ�राक�ट�र ल�याटिन</script>
-			<script type="Latg">ग�यालिक ल�याटिन</script>
-			<script type="Latn">ल�याटिन</script>
-			<script type="Lepc">लेप�चा</script>
-			<script type="Limb">लिम�ब�</script>
-			<script type="Lyci">लाइसियन</script>
-			<script type="Lydi">लाइडियन</script>
-			<script type="Mand">मान�डा�न</script>
-			<script type="Mani">मानिका�न</script>
-			<script type="Maya">माया हाइरोग�लिफ�स</script>
-			<script type="Mero">मेरियोटिक</script>
-			<script type="Mlym">मलायालम</script>
-			<script type="Mong">मङ�गोल</script>
-			<script type="Moon">जून</script>
-			<script type="Mtei">माइटेइ मायेक</script>
-			<script type="Mymr">म�यान�मार</script>
-			<script type="Nkoo">�न�को</script>
-			<script type="Ogam">ओघाम</script>
-			<script type="Olck">ओलचिकी</script>
-			<script type="Orkh">ओर�खोन</script>
-			<script type="Orya">ओरिया</script>
-			<script type="Osma">ओस�मान�या</script>
-			<script type="Perm">प�रानो पर�मिक</script>
-			<script type="Phag">फाग�स-पा</script>
-			<script type="Phli">फ�लि</script>
-			<script type="Phlp">फ�ल�प</script>
-			<script type="Phlv">ब�क पहल�भी</script>
-			<script type="Phnx">फोनिसियन</script>
-			<script type="Plrd">पोल�लार�ड फोनेटिक</script>
-			<script type="Prti">पिआरटी</script>
-			<script type="Qaai">इन�हेरिटेड</script>
-			<script type="Rjng">रेजाङ</script>
-			<script type="Roro">रोङ�गोरोङ�गो</script>
-			<script type="Runr">रूनिक</script>
-			<script type="Samr">समारिटन</script>
-			<script type="Sara">सारती</script>
-			<script type="Saur">सौराष�ट�र</script>
-			<script type="Sgnw">साइनराइटिङ</script>
-			<script type="Shaw">शाभियन</script>
-			<script type="Sinh">सिन�हाला</script>
-			<script type="Sund">स�डानी</script>
-			<script type="Sylo">स�ल�योटी नाग�री</script>
-			<script type="Syrc">सिरियाक</script>
-			<script type="Syre">इस�ट�रेनजेलो सिरियाक</script>
-			<script type="Syrj">पश�चिमी सिरियाक</script>
-			<script type="Syrn">पूर�वी सिरियाक</script>
-			<script type="Tagb">टाग�वान�वा</script>
-			<script type="Tale">टाइले</script>
-			<script type="Talu">न�यू टाइ ल�इ</script>
-			<script type="Taml">तामिल</script>
-			<script type="Tavt">टाभ�ट</script>
-			<script type="Telu">टेलेग�</script>
-			<script type="Teng">टेङ�वार</script>
-			<script type="Tfng">टिफिनाघ</script>
-			<script type="Tglg">टागालोग</script>
-			<script type="Thaa">थाना</script>
-			<script type="Thai">थाई</script>
-			<script type="Tibt">टिबेटन</script>
-			<script type="Ugar">य�गारिटिक</script>
-			<script type="Vaii">भाइ</script>
-			<script type="Visp">दृश�यमय वाणी</script>
-			<script type="Xpeo">प�रानो पर�सियन</script>
-			<script type="Yiii">यी</script>
-			<script type="Zmth">जमथ</script>
-			<script type="Zsym">जसम</script>
-			<script type="Zxxx">अलिखित</script>
-			<script type="Zyyy">सा�ा</script>
-			<script type="Zzzz">अपरिचित वा अवैध लिपी</script>
-		</scripts>
-		<territories>
-			<territory type="001">विश�व</territory>
-			<territory type="002">अफ�रिका</territory>
-			<territory type="003">उत�तर अमेरिका</territory>
-			<territory type="005">दक�षिण अमेरिका</territory>
-			<territory type="009">ओसनिया</territory>
-			<territory type="011">पश�चिमी अफ�रिका</territory>
-			<territory type="013">केन�द�रीय अमेरिका</territory>
-			<territory type="014">पूर�वी अफ�रिका</territory>
-			<territory type="015">उत�तरी अफ�रिका</territory>
-			<territory type="017">मध�य अफ�रिका</territory>
-			<territory type="018">दक�षिणी अफ�रिका</territory>
-			<territory type="019">अमेरिकास</territory>
-			<territory type="021">उत�तरी अमेरिका</territory>
-			<territory type="029">क�यारिबि�न</territory>
-			<territory type="030">पूर�वी �शिया</territory>
-			<territory type="034">दक�षिणी �शिया</territory>
-			<territory type="035">दक�षिण पूर�वी �शिया</territory>
-			<territory type="039">दक�षिणी य�रोप</territory>
-			<territory type="053">अष�ट�रेलिया र न�य�जिल�याण�ड</territory>
-			<territory type="054">मेलानेसिया</territory>
-			<territory type="057">माइक�रोनेसियाली क�षेत�र</territory>
-			<territory type="061">पोलिनेशिया</territory>
-			<territory type="062">दक�षिण मध�य �शिया</territory>
-			<territory type="142">�शिया</territory>
-			<territory type="143">केन�द�रीय �शिया</territory>
-			<territory type="145">पश�चिमी �शिया</territory>
-			<territory type="150">य�रोप</territory>
-			<territory type="151">पूर�वी य�रोप</territory>
-			<territory type="154">उत�तरी य�रोप</territory>
-			<territory type="155">पश�चिमी य�रोप</territory>
-			<territory type="172">कमनवेल�थका स�वतन�त�र राज�यहरू</territory>
-			<territory type="419">ल�याटिन अमेरिका तथा क�यारिबियन</territory>
-			<territory type="AD">अन�डोर�रा</territory>
-			<territory type="AE">संय�क�त अरब इमिराट�स</territory>
-			<territory type="AF">अफ�गानिष�तान</territory>
-			<territory type="AG">�न�टिग�आ र बारब�डा</territory>
-			<territory type="AI">आङ�ग�इला</territory>
-			<territory type="AL">अल�बानिया</territory>
-			<territory type="AM">आर�मेनिया</territory>
-			<territory type="AN">नेदरल�याण�ड�स �ण�टिलिस</territory>
-			<territory type="AO">अङ�गोला</territory>
-			<territory type="AQ">अन�टारतिका</territory>
-			<territory type="AR">अर�जेण�टिना</territory>
-			<territory type="AS">अमेरिकी समोआ</territory>
-			<territory type="AT">अष�ट�रिया</territory>
-			<territory type="AU">अष�ट�रेलिया</territory>
-			<territory type="AW">आरूबा</territory>
-			<territory type="AX">अलान�ड टाप�</territory>
-			<territory type="AZ">अजरबैजान</territory>
-			<territory type="BA">बोस�निया र हर�जगोभिनिया</territory>
-			<territory type="BB">बार�बाडोस</territory>
-			<territory type="BD">बङ�गलादेश</territory>
-			<territory type="BE">बेल�जियम</territory>
-			<territory type="BF">बर�किना फासो</territory>
-			<territory type="BG">बल�गेरिया</territory>
-			<territory type="BH">बाह�रेन</territory>
-			<territory type="BI">ब�रूण�डी</territory>
-			<territory type="BJ">बेनिन</territory>
-			<territory type="BL">सेन�ट बार�थालेमी</territory>
-			<territory type="BM">बर�म�डा</territory>
-			<territory type="BN">ब�र�नाइ</territory>
-			<territory type="BO">बोलिभिया</territory>
-			<territory type="BR">ब�राजिल</territory>
-			<territory type="BS">बहामास</territory>
-			<territory type="BT">भ�टान</territory>
-			<territory type="BV">ब�भेट टाप�</territory>
-			<territory type="BW">बोट�स�वाना</territory>
-			<territory type="BY">बेलारूस</territory>
-			<territory type="BZ">बेलिज</territory>
-			<territory type="CA">क�यानाडा</territory>
-			<territory type="CC">कोकोस टाप�</territory>
-			<territory type="CD">कोङ�गो-किन�शासा</territory>
-			<territory type="CF">केन�द�रीय अफ�रिकी गणतन�त�र</territory>
-			<territory type="CG">कोङ�गो - ब�राज�जाभिल�ले</territory>
-			<territory type="CH">स�विजरल�याण�ड</territory>
-			<territory type="CI">आइभोरी कोष�ट</territory>
-			<territory type="CK">क�क टाप�</territory>
-			<territory type="CL">चिली</territory>
-			<territory type="CM">क�यामेरून</territory>
-			<territory type="CN">चीन</territory>
-			<territory type="CO">कोलोम�बिया</territory>
-			<territory type="CR">कोष�टारिका</territory>
-			<territory type="CU">क�य�बा</territory>
-			<territory type="CV">केप भर�डे</territory>
-			<territory type="CX">क�रिष�टमस टाप�</territory>
-			<territory type="CY">साइप�रस</territory>
-			<territory type="CZ">चेख गणतन�त�र</territory>
-			<territory type="DE">जर�मनी</territory>
-			<territory type="DJ">डिजिब�टी</territory>
-			<territory type="DK">डेन�मार�क</territory>
-			<territory type="DM">डोमिनिका</territory>
-			<territory type="DO">डोमिनिकन गणतन�त�र</territory>
-			<territory type="DZ">अल�जेरिया</territory>
-			<territory type="EC">इक�वडेर</territory>
-			<territory type="EE">इस�टोनिया</territory>
-			<territory type="EG">इजिप�ट</territory>
-			<territory type="EH">पश�चिमी साहारा</territory>
-			<territory type="ER">�रित�रिया</territory>
-			<territory type="ES">स�पेन</territory>
-			<territory type="ET">इथोपिया</territory>
-			<territory type="FI">फिन�ल�याण�ड</territory>
-			<territory type="FJ">फिजी</territory>
-			<territory type="FK">फकल�याण�ड टाप�</territory>
-			<territory type="FM">माइक�रोनेसिया</territory>
-			<territory type="FO">फारोर टाप�</territory>
-			<territory type="FR">फ�रान�स</territory>
-			<territory type="GA">गावोन</territory>
-			<territory type="GB">संय�क�त अधिराज�य</territory>
-			<territory type="GD">ग�रेनाडा</territory>
-			<territory type="GE">जोर�जिया</territory>
-			<territory type="GF">फ�रान�सेली गायना</territory>
-			<territory type="GG">ग��र�नसे</territory>
-			<territory type="GH">घाना</territory>
-			<territory type="GI">जिब�राल�टार</territory>
-			<territory type="GL">ग�रिनल�याण�ड</territory>
-			<territory type="GM">गाम�विया</territory>
-			<territory type="GN">गिनी</territory>
-			<territory type="GP">ग�वाडेल�प</territory>
-			<territory type="GQ">भू-मध�यीय गिनी</territory>
-			<territory type="GR">ग�रिश</territory>
-			<territory type="GT">ग�वाटेमाला</territory>
-			<territory type="GU">ग�वाम</territory>
-			<territory type="GW">गिनी-बिसाउ</territory>
-			<territory type="GY">ग�याना</territory>
-			<territory type="HK">हङकङ चिनि�या समाजवादी स�वायत�त क�षेत�र</territory>
-			<territory type="HM">हर�ड टाप� र म�याकडोनाल�ड टाप�</territory>
-			<territory type="HN">हन�ड�रास</territory>
-			<territory type="HR">क�रो�शिया</territory>
-			<territory type="HT">हैटी</territory>
-			<territory type="HU">हङ�गेरी</territory>
-			<territory type="ID">इन�डोनेशिया</territory>
-			<territory type="IE">आइरल�याण�ड</territory>
-			<territory type="IL">इज�रायल</territory>
-			<territory type="IM">आइज�ले अफ� म�यान</territory>
-			<territory type="IN">भारत</territory>
-			<territory type="IO">बेलायती हिन�द महासागर क�षेत�र</territory>
-			<territory type="IQ">इराक</territory>
-			<territory type="IR">इरान</territory>
-			<territory type="IS">आइस�ल�याण�ड</territory>
-			<territory type="IT">इटाली</territory>
-			<territory type="JE">जर�सी</territory>
-			<territory type="JM">जमाइका</territory>
-			<territory type="JO">जोर�डन</territory>
-			<territory type="JP">जापान</territory>
-			<territory type="KE">केन�या</territory>
-			<territory type="KG">किर�गिस�थान</territory>
-			<territory type="KH">कम�बोडिया</territory>
-			<territory type="KI">किरिबाटी</territory>
-			<territory type="KM">कोमोरोस</territory>
-			<territory type="KN">सेन�ट किट�स र नेभिस</territory>
-			<territory type="KP">उत�तर कोरिया</territory>
-			<territory type="KR">दक�षिण कोरिया</territory>
-			<territory type="KW">क�वेत</territory>
-			<territory type="KY">केयमान टाप�</territory>
-			<territory type="KZ">काजाकस�थान</territory>
-			<territory type="LA">लाओस</territory>
-			<territory type="LB">लेबनोन</territory>
-			<territory type="LC">सेन�ट ल�सिया</territory>
-			<territory type="LI">लि�खटेन�स�टाइन</territory>
-			<territory type="LK">श�रीलङ�का</territory>
-			<territory type="LR">लाइबेरिया</territory>
-			<territory type="LS">लेसोथो</territory>
-			<territory type="LT">लिथ�अनिया</territory>
-			<territory type="LU">लक�जेमबर�ग</territory>
-			<territory type="LV">लाट�भिया</territory>
-			<territory type="LY">लिबिया</territory>
-			<territory type="MA">मोरोक�को</territory>
-			<territory type="MC">मोनाको</territory>
-			<territory type="MD">माल�डोभा</territory>
-			<territory type="ME">मोन�टेनेग�रो</territory>
-			<territory type="MF">सेन�ट मार�टिन</territory>
-			<territory type="MG">मडागास�कर</territory>
-			<territory type="MH">मार�शल टाप�</territory>
-			<territory type="MK">म�याकेडोनिया</territory>
-			<territory type="ML">माली</territory>
-			<territory type="MM">म�यान�मार</territory>
-			<territory type="MN">मङ�गोलिया</territory>
-			<territory type="MO">मकावो चिनि�या स�वशासित क�षेत�र</territory>
-			<territory type="MP">उत�तरी मारिआना टाप�</territory>
-			<territory type="MQ">मार�टिनिक</territory>
-			<territory type="MR">माउरिटानिया</territory>
-			<territory type="MS">मोन�टसेर�राट</territory>
-			<territory type="MT">माल�टा</territory>
-			<territory type="MU">माउरिटस</territory>
-			<territory type="MV">माल�दिभ�स</territory>
-			<territory type="MW">मालावी</territory>
-			<territory type="MX">मेक�सिको</territory>
-			<territory type="MY">मलेसिया</territory>
-			<territory type="MZ">मोजाम�बिक</territory>
-			<territory type="NA">नामिबिया</territory>
-			<territory type="NC">नया� कालेडोनिया</territory>
-			<territory type="NE">नाइजर</territory>
-			<territory type="NF">नोरफोल�क टाप�</territory>
-			<territory type="NG">नाइजेरिया</territory>
-			<territory type="NI">निकाराग�वा</territory>
-			<territory type="NL">नेदरल�याण�ड�स</territory>
-			<territory type="NO">नर�वे</territory>
-			<territory type="NP">नेपाल</territory>
-			<territory type="NR">नाउरू</territory>
-			<territory type="NU">निय�इ</territory>
-			<territory type="NZ">न�य�जिल�याण�ड</territory>
-			<territory type="OM">ओमन</territory>
-			<territory type="PA">पनामा</territory>
-			<territory type="PE">पेरू</territory>
-			<territory type="PF">फ�रान�सेली पोलिनेसिया</territory>
-			<territory type="PG">पप�आ न�यू गाइनिया</territory>
-			<territory type="PH">फिलिपिन�स</territory>
-			<territory type="PK">पाकिस�तान</territory>
-			<territory type="PL">पोल�याण�ड</territory>
-			<territory type="PM">सेन�ट पिर�रे र मिक�केलोन</territory>
-			<territory type="PN">पिटकाइर�न</territory>
-			<territory type="PR">प�य�र�टोरिको</territory>
-			<territory type="PS">प�यालेस�टनी भू-भाग</territory>
-			<territory type="PT">पोर�त�गल</territory>
-			<territory type="PW">पलाउ</territory>
-			<territory type="PY">प�याराग�ये</territory>
-			<territory type="QA">कटार</territory>
-			<territory type="QO">बाह�य ओसनिया</territory>
-			<territory type="QU">य�रोपियन य�नियन</territory>
-			<territory type="RE">रिय�नियन</territory>
-			<territory type="RO">रोमानिया</territory>
-			<territory type="RS">सर�बिया</territory>
-			<territory type="RU">रूस</territory>
-			<territory type="RW">रवाण�डा</territory>
-			<territory type="SA">साउदी अरब</territory>
-			<territory type="SB">सोलोमोन टाप�</territory>
-			<territory type="SC">सेचेलेस</territory>
-			<territory type="SD">स�डान</territory>
-			<territory type="SE">स�विडेन</territory>
-			<territory type="SG">सिङ�गाप�र</territory>
-			<territory type="SH">सेन�ट हेलेना</territory>
-			<territory type="SI">स�लोभेनिया</territory>
-			<territory type="SJ">सभाल�बार�ड र जान मायेन</territory>
-			<territory type="SK">स�लोभाकिया</territory>
-			<territory type="SL">सि�र�रा लिओन</territory>
-			<territory type="SM">सान� मारिनो</territory>
-			<territory type="SN">सेनेगाल</territory>
-			<territory type="SO">सोमालिया</territory>
-			<territory type="SR">स�रिनेम</territory>
-			<territory type="ST">साओ टोमे र प�रिन�सिप</territory>
-			<territory type="SV">�ल� साल�भाडोर</territory>
-			<territory type="SY">सिरिया</territory>
-			<territory type="SZ">स�वाजिल�याण�ड</territory>
-			<territory type="TC">त�र�क र काइकोस टाप�</territory>
-			<territory type="TD">चाड</territory>
-			<territory type="TF">फ�रान�सेली दक�षिणी क�षेत�र</territory>
-			<territory type="TG">टोगो</territory>
-			<territory type="TH">थाइल�याण�ड</territory>
-			<territory type="TJ">ताजिकिस�तान</territory>
-			<territory type="TK">तोगो</territory>
-			<territory type="TL">पूर�वी टिमोर</territory>
-			<territory type="TM">त�र�कमेनिस�तान</territory>
-			<territory type="TN">ट�निसिया</territory>
-			<territory type="TO">टोंगा</territory>
-			<territory type="TR">टर�की</territory>
-			<territory type="TT">त�रिनिडाड र तोबागो</territory>
-			<territory type="TV">त�भाल�</territory>
-			<territory type="TW">ताइवान</territory>
-			<territory type="TZ">तान�जानिया</territory>
-			<territory type="UA">य�क�रेन</territory>
-			<territory type="UG">य�गाण�डा</territory>
-			<territory type="UM">संय�क�त राज�य अल�प बाह�य टाप�</territory>
-			<territory type="US">संय�क�त राज�य</territory>
-			<territory type="UY">य�रूग��</territory>
-			<territory type="UZ">उज�बेकिस�तान</territory>
-			<territory type="VA">भेटिकन</territory>
-			<territory type="VC">सेन�ट भिन�सेन�ट र ग�रेनाडिन�स</territory>
-			<territory type="VE">भेनेज��ला</territory>
-			<territory type="VG">बेलायती भर�जिन टाप�</territory>
-			<territory type="VI">संय�क�त राज�य भर�जिन टाप�</territory>
-			<territory type="VN">भि�तनाम</territory>
-			<territory type="VU">भान�आत�</territory>
-			<territory type="WF">वालिस र फ�ट�ना</territory>
-			<territory type="WS">सामोआ</territory>
-			<territory type="YE">येमेन</territory>
-			<territory type="YT">मायोट�ट</territory>
-			<territory type="ZA">दक�षिण अफ�रिका</territory>
-			<territory type="ZM">जाम�बिया</territory>
-			<territory type="ZW">जिम�बाबे</territory>
-			<territory type="ZZ">अपरिचित वा अवैध क�षेत�र</territory>
-		</territories>
-		<variants>
-			<variant type="AREVELA">पूर�वी आर�मेनियाली</variant>
-			<variant type="POSIX">कम�प�य�टर</variant>
-		</variants>
-		<keys>
-			<key type="calendar">पात�रो</key>
-			<key type="collation">कोलेशन</key>
-			<key type="currency">म�द�रा</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">परम�परागत चिनि�या क�रमबद�धता पद�दति - बिग फाइभ</type>
-			<type type="buddhist" key="calendar">ब�द�धिष�ट पात�रो</type>
-			<type type="chinese" key="calendar">चिनि�या पात�रो</type>
-			<type type="direct" key="collation">प�रत�यक�ष क�रमबद�धता पद�दति</type>
-			<type type="gb2312han" key="collation">सरलिकृत चिनिया� क�रमबद�धता पद�दति-गीबीट�थ�रीवानट�</type>
-			<type type="gregorian" key="calendar">ग�रेगोरियन पात�रो</type>
-			<type type="hebrew" key="calendar">हिब�र� पात�रो</type>
-			<type type="indian" key="calendar">भारतीय राष�ट�रिय पात�रो</type>
-			<type type="islamic" key="calendar">इस�लामी पात�रो</type>
-			<type type="islamic-civil" key="calendar">इस�लामी नागरिक पात�रो</type>
-			<type type="japanese" key="calendar">जापानी पात�रो</type>
-			<type type="phonebook" key="collation">टेलिफोन प�स�तिका क�रमबद�धतापद�दति</type>
-			<type type="pinyin" key="collation">पिनयिन क�रमबद�धता पद�दति</type>
-			<type type="roc" key="calendar">चिनि�या गणतन�त�र पात�रो</type>
-			<type type="stroke" key="collation">स�ट�रोक क�रमबद�धता पद�दति</type>
-			<type type="traditional" key="collation">परम�परागत क�रमबद�धता पद�दति</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[�-ः ०-९ अ-ऋ � � ओ-न प-र ल व-ह ा-ृ े ै ो �]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>पूर�व मध�यान�ह</am>
-				<pm>पूर�व अपरान�ह</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">जन</month>
-							<month type="2">फेब</month>
-							<month type="3">मार�च</month>
-							<month type="4">अप�रि</month>
-							<month type="5">मे</month>
-							<month type="6">ज�न</month>
-							<month type="7">ज�ला</month>
-							<month type="8">अग</month>
-							<month type="9">सेप�ट</month>
-							<month type="10">अक�टो</month>
-							<month type="11">नोभे</month>
-							<month type="12">डिसे</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">जनवरी</month>
-							<month type="2">फेब�र�अरी</month>
-							<month type="3">मार�च</month>
-							<month type="4">अप�रिल</month>
-							<month type="5">मे</month>
-							<month type="6">ज�न</month>
-							<month type="7">ज�लाई</month>
-							<month type="8">अगस�त</month>
-							<month type="9">सेप�टेम�बर</month>
-							<month type="10">अक�टोबर</month>
-							<month type="11">नोभेम�बर</month>
-							<month type="12">डिसेम�बर</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">१</month>
-							<month type="2">२</month>
-							<month type="3">३</month>
-							<month type="4">४</month>
-							<month type="5">५</month>
-							<month type="6">६</month>
-							<month type="7">७</month>
-							<month type="8">८</month>
-							<month type="9">९</month>
-							<month type="10">१०</month>
-							<month type="11">११</month>
-							<month type="12">१२</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">आइत</day>
-							<day type="mon">सोम</day>
-							<day type="tue">मङ�गल</day>
-							<day type="wed">ब�ध</day>
-							<day type="thu">बिही</day>
-							<day type="fri">श�क�र</day>
-							<day type="sat">शनि</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">आइतबार</day>
-							<day type="mon">सोमबार</day>
-							<day type="tue">मङ�गलबार</day>
-							<day type="wed">ब�धबार</day>
-							<day type="thu">बिहीबार</day>
-							<day type="fri">श�क�रबार</day>
-							<day type="sat">शनिबार</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">१</day>
-							<day type="mon">२</day>
-							<day type="tue">३</day>
-							<day type="wed">४</day>
-							<day type="thu">५</day>
-							<day type="fri">६</day>
-							<day type="sat">७</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">पहिलो सत�र</quarter>
-							<quarter type="2">दोस�रो सत�र</quarter>
-							<quarter type="3">तेस�रो सत�र</quarter>
-							<quarter type="4">चौथो सत�र</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">१</quarter>
-							<quarter type="2">२</quarter>
-							<quarter type="3">३</quarter>
-							<quarter type="4">४</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>पूर�व मध�यान�ह</am>
-				<pm>उत�तर मध�यान�ह</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ईसा पूर�व</era>
-						<era type="1">सन�</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ईसा पूर�व</era>
-						<era type="1">सन�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>काल</displayName>
-					</field>
-					<field type="year">
-						<displayName>बर�ष</displayName>
-					</field>
-					<field type="month">
-						<displayName>महिना</displayName>
-					</field>
-					<field type="week">
-						<displayName>हप�ता</displayName>
-					</field>
-					<field type="day">
-						<displayName>बार</displayName>
-						<relative type="-3">तीन दिन पछि</relative>
-						<relative type="-2">अस�ति</relative>
-						<relative type="-1">हिजो</relative>
-						<relative type="0">आज</relative>
-						<relative type="1">भोलि</relative>
-					</field>
-					<field type="weekday">
-						<displayName>हप�ताको बार</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>पूर�व मध�यान�ह/उत�तर मध�यान�ह</displayName>
-					</field>
-					<field type="hour">
-						<displayName>घण�टा</displayName>
-					</field>
-					<field type="minute">
-						<displayName>मिनेट</displayName>
-					</field>
-					<field type="second">
-						<displayName>दोस�रो</displayName>
-					</field>
-					<field type="zone">
-						<displayName>क�षेत�र</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>अज�ञात</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>रोथेरा</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>पाल�मेर</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>दक�षिण पोल</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>सिओआ</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>माजन</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>डेभिस</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>भास�टोक</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>केजे</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>द�मोन�ट डि उर�भेल�ले</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>माकम�र�डो</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>रियो ग�यालेगोस</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>मेन�डोजा</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>सान ज�वान</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>उश�आइआ</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ला रियोजा</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>सान ल�इस</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>कातामार�का</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>ज�ज�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>ट�क�मान</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>कोरडोवा</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>ब�यनेश आयर�स</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>पर�थ</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>इय�क�ला</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>डार�विन</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�डेलेड</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>ब�रोकन हिल</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>क�य�री</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>मेल�बर�न</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>होभार�ट</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>लिन�डेम�यान</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>सिड�नी</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>ब�रिस�बेन</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>लर�ड होवे</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>आइरनेपे</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>रियो ब�रान�को</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>पोर�टो भेल�हो</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>बोआ भिष�टा</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>मानाउस</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>क�य�इआबा</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>क�याम�पो ग�रान�डे</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>बेलेम</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>आराग�वाना</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>साओ पाउलो</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>बाहिया</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>फोर�टालेजा</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>मासेइओ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>रिसाइफ</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>नोरोन�हा</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>डेजन</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>ह�वाइटहर�स</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>इन�भिक</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>भ�यानकोभर</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>डेजन क�रिक</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>येल�लोनाइफ</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>�ड�मोन�टन</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>स�विफ�ट करेण�ट</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>क�याम�ब�रिज बे</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>रेजिना</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>विन�निपेग</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>रिजोल�ट</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>रेनिरिभर</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>रान�किन इन�लेट</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>कोराल बन�दरगाहा</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>थण�डर बे</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>निपिगन</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>टोरोण�टो</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>मोन�ट�रिल</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>इक�वाल�इट</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>पाङ�निरत�ङ</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>मोन�कटन</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>हालेफाक�स</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>ग�ज बे</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>ग�लेस बे</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>ब�लान�क-साब�लोन</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>सेन�ट जोन�स</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>किन�शासा</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ल�ब�म�बासी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>इस�टर</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>काश�गर</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>उरूम�की</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>चोङकिङ</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>हार�विन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>गलापागोस</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>क�यानारी</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>सेउटा</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ट�र�क</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>पोनापे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>कोस�रा�</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>थ�ले</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>स�कोर�सबाइसन�ड</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>डान�मार�कशाभन</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>जाकार�ता</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>पोन�टिआनाक</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>माकास�सार</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>जयाप�रा</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�न�डरबरी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>किरितिमाटी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>तरवा</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>आक�टाउ</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ओरल</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>आक�टोब</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>किजिलोर�डा</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>आल�माटी</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>क�वाजालेइन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>माज�रो</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>होभ�ड</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>उलानबटार</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>चोइबाल�सान</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>तिज�आना</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>हेर�मोसिल�लो</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>माजाट�लान</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>चिह�आह�आ</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>मोन�टेर�रे</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>मेक�सिको सिटी</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>मेरिडा</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>कानक�न</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>क�चिङ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>चाथाम</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>मार�केसास</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>ग�याम�बियर</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>आजोर�स</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>माडेइरा</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>कालिनिनग�राद</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>मस�को</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>भोल�गोग�राद</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>सामारा</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>�कटरिनब�र�ग</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>ओम�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>नोबोसिबिर�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>क�रास�नोयार�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>इर�क�त�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>याक�त�स�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>भ�लाडिभास�टोक</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>साखालिन</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>मागाडान</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>कामचट�का</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>आनाडियर</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>उ�गोरद</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>किभ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>सिम�फेरोपोल</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>जापोरो��ये</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>मिडवे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>जोन�सटन</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>वेक</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>आडाक</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>नोमे</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>होनोल�ल�</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>याक�तात</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>ज�निउ</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>लस� �न�जेलस</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>बोइज</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>फोनिक�स</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>शिपरक</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>डेन�भर</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>नया� सालेम, उत�तर डाकोटा</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>उत�तर डाकोटा, केन�द�र</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>चिकागो</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>मेनोमिनी</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>भिन�सेन�स</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>पिटर�सबर�ग, इन�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>टेल सिटी, इन�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>नोक�स, इण�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>विनामाक, इन�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>मारेन�गो, इन�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>इण�डियानापोलिस</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ल�इसभिल�ले</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>भेभे, इन�डियाना</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>मोन�टिसेल�लो,केन�टकी</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>डिट�रोइट</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>न�य�योर�क</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>समारकण�ड</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<generic>१३:२५ मोजाम�बिक समय</generic>
-					<standard>१३:२५ केन�द�रीय अफ�रिकी समय</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>deva</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<minusSign>-</minusSign>
-		</symbols>
-		<currencies>
-			<currency type="AFA">
-				<displayName>अफ�गानी(१९२७-२००२)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>अफ�गानी</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>अल�बानियन लेक</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>अष�ट�रेलियन डलर</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>ब�राजिलियन रियल</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>चिनि�या य�आन रेनिबी</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>य�रो</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>बेलायती पाउण�ड स�टर�लिङ</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>भारती रूपि�या</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>जापानी येन</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>नर�वेजियाली क�रोन</displayName>
-			</currency>
-			<currency type="NPR">
-				<symbol>नेरू</symbol>
-			</currency>
-			<currency type="PHP">
-				<displayName>फिलिपिनी पेसो</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>रूसी रूबल</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>संय�क�त राज�य डलर</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>अपरिचित वा अवैध म�द�रा</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} दिन</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} घण�टा</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} मिनेट</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} महिना</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} सेकेण�ड</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} हप�ता</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} बर�ष</unitPattern>
-			<unitPattern count="other">{0} बर�ष</unitPattern>
-		</unit>
-	</units>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ne_IN.xml b/airtime_mvc/library/Zend/Locale/Data/ne_IN.xml
deleted file mode 100644
index 1e5ff6d7a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ne_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ne"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ne_NP.xml b/airtime_mvc/library/Zend/Locale/Data/ne_NP.xml
deleted file mode 100644
index 0cb467a28..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ne_NP.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ne"/>
-		<territory type="NP"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nl.xml b/airtime_mvc/library/Zend/Locale/Data/nl.xml
deleted file mode 100644
index 5d76dbb8c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nl.xml
+++ /dev/null
@@ -1,3797 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.124 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="nl"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abchazisch</language>
-			<language type="ace">Atjees</language>
-			<language type="ach">Akoli</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Adyghe</language>
-			<language type="ae">Avestisch</language>
-			<language type="af">Afrikaans</language>
-			<language type="afa">Afro-Aziatische taal</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akkadisch</language>
-			<language type="ale">Aleut</language>
-			<language type="alg">Algonkium-taal</language>
-			<language type="alt">Zuid-Altaïsch</language>
-			<language type="am">Amhaars</language>
-			<language type="an">Aragonees</language>
-			<language type="ang">Oudengels</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apache-taal</language>
-			<language type="ar">Arabisch</language>
-			<language type="arc">Aramees</language>
-			<language type="arn">Araukaans</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Kunstmatige taal</language>
-			<language type="arw">Arawak</language>
-			<language type="as">Assamees</language>
-			<language type="ast">Asturisch</language>
-			<language type="ath">Athapascaanse taal</language>
-			<language type="aus">Australische taal</language>
-			<language type="av">Avarisch</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Azerbeidzjaans</language>
-			<language type="ba">Basjkiers</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke-taal</language>
-			<language type="bal">Baloetsji</language>
-			<language type="ban">Balinees</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Baltische taal</language>
-			<language type="be">Wit-Russisch</language>
-			<language type="bej">Beja</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berber</language>
-			<language type="bg">Bulgaars</language>
-			<language type="bh">Bihari</language>
-			<language type="bho">Bhojpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengalees</language>
-			<language type="bnt">Bantoe</language>
-			<language type="bo">Tibetaans</language>
-			<language type="br">Bretons</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Bosnisch</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Buriat</language>
-			<language type="bug">Buginees</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Catalaans</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Midden-Amerikaans Indiaanse taal</language>
-			<language type="car">Caribisch</language>
-			<language type="cau">Kaukasische taal</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Chechen</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Keltische taal</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Chibcha</language>
-			<language type="chg">Chagatai</language>
-			<language type="chk">Chuukees</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Chinook-jargon</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Cherokee</language>
-			<language type="chy">Cheyenne</language>
-			<language type="cmc">Chamische taal</language>
-			<language type="co">Corsicaans</language>
-			<language type="cop">Koptisch</language>
-			<language type="cpe">Op Engels gebaseerd Creools of Pidgin</language>
-			<language type="cpf">Op Frans gebaseerd Creools of Pidgin</language>
-			<language type="cpp">Op Portugees gebaseerd Creools of Pidgin</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Krim-Tataars</language>
-			<language type="crp">Creools of Pidgin</language>
-			<language type="cs">Tsjechisch</language>
-			<language type="csb">Kasjoebisch</language>
-			<language type="cu">Kerkslavisch</language>
-			<language type="cus">Koesjitische taal</language>
-			<language type="cv">Tsjoevasjisch</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Deens</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargwa</language>
-			<language type="day">Dajak</language>
-			<language type="de">Duits</language>
-			<language type="de_AT">Oostenrijks Duits</language>
-			<language type="de_CH">Zwitsers Hoogduits</language>
-			<language type="del">Delaware</language>
-			<language type="den">Slave</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravidische taal</language>
-			<language type="dsb">Nedersorbisch</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Middelnederlands</language>
-			<language type="dv">Divehi</language>
-			<language type="dyu">Dyula</language>
-			<language type="dz">Dzongkha</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Oudegyptisch</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Grieks</language>
-			<language type="elx">Elamitisch</language>
-			<language type="en">Engels</language>
-			<language type="en_AU">Australisch Engels</language>
-			<language type="en_CA">Canadees Engels</language>
-			<language type="en_GB">Brits Engels</language>
-			<language type="en_US">Amerikaans Engels</language>
-			<language type="enm">Middelengels</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spaans</language>
-			<language type="es_419">Latijns-Amerikaans Spaans</language>
-			<language type="es_ES">Iberisch Spaans</language>
-			<language type="et">Estlands</language>
-			<language type="eu">Baskisch</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Perzisch</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulah</language>
-			<language type="fi">Fins</language>
-			<language type="fil">Filippijns</language>
-			<language type="fiu">Fins-Oegrische taal</language>
-			<language type="fj">Fijisch</language>
-			<language type="fo">Faeröers</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Frans</language>
-			<language type="fr_CA">Canadees Frans</language>
-			<language type="fr_CH">Zwitsers Frans</language>
-			<language type="frm">Middelfrans</language>
-			<language type="fro">Oudfrans</language>
-			<language type="frr">Noord-Fries</language>
-			<language type="frs">Oost-Fries</language>
-			<language type="fur">Friulisch</language>
-			<language type="fy">Fries</language>
-			<language type="ga">Iers</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">Schots Gaelic</language>
-			<language type="gem">Germaanse taal</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Gilbertees</language>
-			<language type="gl">Galicisch</language>
-			<language type="gmh">Middelhoogduits</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Oudhoogduits</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gothisch</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Oudgrieks</language>
-			<language type="gsw">Zwitsers Duits</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manx</language>
-			<language type="gwi">Gwichʼin</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaïaans</language>
-			<language type="he">Hebreeuws</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hettitisch</language>
-			<language type="hmn">Hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">Kroatisch</language>
-			<language type="hsb">Oppersorbisch</language>
-			<language type="ht">Haïtiaans</language>
-			<language type="hu">Hongaars</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Armeens</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indonesisch</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiaq</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Indische taal</language>
-			<language type="ine">Indo-Europese taal</language>
-			<language type="inh">Ingoesj</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iraanse taal</language>
-			<language type="iro">Irokese taal</language>
-			<language type="is">IJslands</language>
-			<language type="it">Italiaans</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japans</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Judeo-Perzisch</language>
-			<language type="jrb">Judeo-Arabisch</language>
-			<language type="jv">Javaans</language>
-			<language type="ka">Georgisch</language>
-			<language type="kaa">Karakalpaks</language>
-			<language type="kab">Kabyle</language>
-			<language type="kac">Kachin</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardisch</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi</language>
-			<language type="khi">Khoisan-taal</language>
-			<language type="kho">Khotanees</language>
-			<language type="ki">Kikuyu</language>
-			<language type="kj">Kuanyama</language>
-			<language type="kk">Kazachs</language>
-			<language type="kl">Kalaallisut</language>
-			<language type="km">Khmer</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Koreaans</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraeaans</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Karachay-Balkar</language>
-			<language type="krl">Karelisch</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurukh</language>
-			<language type="ks">Kashmiri</language>
-			<language type="ku">Koerdisch</language>
-			<language type="kum">Kumyk</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Cornish</language>
-			<language type="ky">Kirgizisch</language>
-			<language type="la">Latijn</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Luxemburgs</language>
-			<language type="lez">Lezgisch</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburgs</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Lao</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Litouws</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
-			<language type="lv">Letlands</language>
-			<language type="mad">Madurees</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makassaars</language>
-			<language type="man">Mandingo</language>
-			<language type="map">Austronesisch</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">Moksha</language>
-			<language type="mdr">Mandar</language>
-			<language type="men">Mende</language>
-			<language type="mg">Malagasisch</language>
-			<language type="mga">Middeliers</language>
-			<language type="mh">Marshallees</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Mi'kmaq</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Diverse talen</language>
-			<language type="mk">Macedonisch</language>
-			<language type="mkh">Mon-Khmer-taal</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mongools</language>
-			<language type="mnc">Mantsjoe</language>
-			<language type="mni">Manipoeri</language>
-			<language type="mno">Manobo-taal</language>
-			<language type="mo">Moldavisch</language>
-			<language type="moh">Mohawk</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Maleis</language>
-			<language type="mt">Maltees</language>
-			<language type="mul">Meerdere talen</language>
-			<language type="mun">Munda-taal</language>
-			<language type="mus">Creek</language>
-			<language type="mwl">Mirandees</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Birmees</language>
-			<language type="myn">Mayan-taal</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauru</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Noord-Amerikaans Indiaanse taal</language>
-			<language type="nap">Napolitaans</language>
-			<language type="nb">Noors - Bokmål</language>
-			<language type="nd">Noord-Ndbele</language>
-			<language type="nds">Laagduits</language>
-			<language type="ne">Nepalees</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Niger-Kordofanische taal</language>
-			<language type="niu">Niueaans</language>
-			<language type="nl">Nederlands</language>
-			<language type="nl_BE">Vlaams</language>
-			<language type="nn">Noors - Nynorsk</language>
-			<language type="no">Noors</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Oudnoors</language>
-			<language type="nqo">N’ko</language>
-			<language type="nr">Zuid-Ndbele</language>
-			<language type="nso">Noord-Sotho</language>
-			<language type="nub">Nubische taal</language>
-			<language type="nv">Navajo</language>
-			<language type="nwc">Klassiek Newari</language>
-			<language type="ny">Nyanja</language>
-			<language type="nym">Nyamwezi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Occitaans</language>
-			<language type="oj">Ojibwa</language>
-			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
-			<language type="os">Ossetisch</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Ottomaans-Turks</language>
-			<language type="oto">Otomi-taal</language>
-			<language type="pa">Punjabi</language>
-			<language type="paa">Papoeataal</language>
-			<language type="pag">Pangasinan</language>
-			<language type="pal">Pahlavi</language>
-			<language type="pam">Pampanga</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palauaans</language>
-			<language type="peo">Oudperzisch</language>
-			<language type="phi">Filippijnse taal</language>
-			<language type="phn">Foenicisch</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Pools</language>
-			<language type="pon">Pohnpeiaans</language>
-			<language type="pra">Prakrit-taal</language>
-			<language type="pro">Oudprovençaals</language>
-			<language type="ps">Pasjtoe</language>
-			<language type="pt">Portugees</language>
-			<language type="pt_BR">Braziliaans Portugees</language>
-			<language type="pt_PT">Iberisch Portugees</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Rapanui</language>
-			<language type="rar">Rarotongan</language>
-			<language type="rm">Reto-Romaans</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Roemeens</language>
-			<language type="roa">Romaanse taal</language>
-			<language type="rom">Romani</language>
-			<language type="root">Root</language>
-			<language type="ru">Russisch</language>
-			<language type="rup">Aromaniaans</language>
-			<language type="rw">Kinyarwanda</language>
-			<language type="sa">Sanskriet</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Yakut</language>
-			<language type="sai">Zuid-Amerikaans Indiaanse taal</language>
-			<language type="sal">Salishan-taal</language>
-			<language type="sam">Samaritaans-Aramees</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardinisch</language>
-			<language type="scn">Siciliaans</language>
-			<language type="sco">Schots</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Noord-Samisch</language>
-			<language type="sel">Selkup</language>
-			<language type="sem">Semitische taal</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Oudiers</language>
-			<language type="sgn">Gebarentaal</language>
-			<language type="sh">Servokroatisch</language>
-			<language type="shn">Shan</language>
-			<language type="si">Singalees</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Siouaanse talen</language>
-			<language type="sit">Sino-Tibetaanse taal</language>
-			<language type="sk">Slowaaks</language>
-			<language type="sl">Sloveens</language>
-			<language type="sla">Slavische taal</language>
-			<language type="sm">Samoaans</language>
-			<language type="sma">Zuid-Samisch</language>
-			<language type="smi">Sami-taal</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Shona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somalisch</language>
-			<language type="sog">Sogdisch</language>
-			<language type="son">Songhai</language>
-			<language type="sq">Albanees</language>
-			<language type="sr">Servisch</language>
-			<language type="srn">Sranantongo</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Swati</language>
-			<language type="ssa">Nilo-Saharaanse taal</language>
-			<language type="st">Zuid-Sotho</language>
-			<language type="su">Soendanees</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Soesoe</language>
-			<language type="sux">Soemerisch</language>
-			<language type="sv">Zweeds</language>
-			<language type="sw">Swahili</language>
-			<language type="syc">Klassiek Syrisch</language>
-			<language type="syr">Syriac</language>
-			<language type="ta">Tamil</language>
-			<language type="tai">Tai-taal</language>
-			<language type="te">Teloegoe</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tadzjieks</language>
-			<language type="th">Thais</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmeens</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Tagalog</language>
-			<language type="tlh">Klingon</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">Tamashek</language>
-			<language type="tn">Tswana</language>
-			<language type="to">Tonga</language>
-			<language type="tog">Nyasa Tonga</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Turks</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian</language>
-			<language type="tt">Tataars</language>
-			<language type="tum">Toemboeka</language>
-			<language type="tup">Tupi-taal</language>
-			<language type="tut">Altaïsche taal</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahitisch</language>
-			<language type="tyv">Tuvinisch</language>
-			<language type="udm">Udmurt</language>
-			<language type="ug">Oeigoers</language>
-			<language type="uga">Oegaritisch</language>
-			<language type="uk">Oekraïens</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Onbepaald</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Oezbeeks</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vietnamees</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Votisch</language>
-			<language type="wa">Wallonisch</language>
-			<language type="wak">Wakashan-taal</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo</language>
-			<language type="wen">Sorbische taal</language>
-			<language type="wo">Wolof</language>
-			<language type="xal">Kalmyk</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao</language>
-			<language type="yap">Yapees</language>
-			<language type="yi">Jiddisch</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik-talen</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotec</language>
-			<language type="zbl">Blissymbolen</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Chinees</language>
-			<language type="zh_Hans">Vereenvoudigd Chinees</language>
-			<language type="zh_Hant">Traditioneel Chinees</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Geen linguïstische inhoud</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabisch</script>
-			<script type="Armi">Keizerlijk Aramees</script>
-			<script type="Armn">Armeens</script>
-			<script type="Avst">Avestaans</script>
-			<script type="Bali">Balinees</script>
-			<script type="Batk">Batak</script>
-			<script type="Beng">Bengalees</script>
-			<script type="Blis">Blissymbolen</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Braille</script>
-			<script type="Bugi">Buginees</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Chakma</script>
-			<script type="Cans">Verenigde Canadese Aboriginal-symbolen</script>
-			<script type="Cari">Carisch</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Cherokee</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptisch</script>
-			<script type="Cprt">Cyprisch</script>
-			<script type="Cyrl">Cyrillisch</script>
-			<script type="Cyrs">Oudkerkslavisch Cyrillisch</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Egyptisch demotisch</script>
-			<script type="Egyh">Egyptisch hiëratisch</script>
-			<script type="Egyp">Egyptische hiërogliefen</script>
-			<script type="Ethi">Ethiopisch</script>
-			<script type="Geok">Georgisch Khutsuri</script>
-			<script type="Geor">Georgisch</script>
-			<script type="Glag">Glagolitisch</script>
-			<script type="Goth">Gothisch</script>
-			<script type="Grek">Grieks</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangul</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">Vereenvoudigd Han</script>
-			<script type="Hant">Traditioneel Han</script>
-			<script type="Hebr">Hebreeuws</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana of Hiragana</script>
-			<script type="Hung">Oudhongaars</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Oud-italisch</script>
-			<script type="Java">Javaans</script>
-			<script type="Jpan">Japans</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Koreaans</script>
-			<script type="Kthi">Kaithi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Lao</script>
-			<script type="Latf">Gotisch Latijn</script>
-			<script type="Latg">Gaelisch Latijn</script>
-			<script type="Latn">Latijn</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Lineair A</script>
-			<script type="Linb">Lineair B</script>
-			<script type="Lyci">Lycisch</script>
-			<script type="Lydi">Lydisch</script>
-			<script type="Mand">Mandaeans</script>
-			<script type="Mani">Manicheaans</script>
-			<script type="Maya">Mayahiërogliefen</script>
-			<script type="Mero">Meroïtisch</script>
-			<script type="Mlym">Malayalam</script>
-			<script type="Mong">Mongools</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei</script>
-			<script type="Mymr">Myanmar</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orkhon</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanya</script>
-			<script type="Perm">Oudpermisch</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Inscriptioneel Pahlavi</script>
-			<script type="Phlp">Psalmen Pahlavi</script>
-			<script type="Phlv">Boek Pahlavi</script>
-			<script type="Phnx">Foenicisch</script>
-			<script type="Plrd">Pollard-fonetisch</script>
-			<script type="Prti">Inscriptioneel Parthisch</script>
-			<script type="Qaai">Overgeërfd</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runic</script>
-			<script type="Samr">Samaritaans</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">SignWriting</script>
-			<script type="Shaw">Shavian</script>
-			<script type="Sinh">Sinhala</script>
-			<script type="Sund">Soendanees</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Syriac</script>
-			<script type="Syre">Estrangelo Aramees</script>
-			<script type="Syrj">West-Aramees</script>
-			<script type="Syrn">Oost-Aramees</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">Nieuw Tai Lue</script>
-			<script type="Taml">Tamil</script>
-			<script type="Tavt">Tai Viet</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Tagalog</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Thais</script>
-			<script type="Tibt">Tibetaans</script>
-			<script type="Ugar">Ugaritisch</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Zichtbare spraak</script>
-			<script type="Xpeo">Oudperzisch</script>
-			<script type="Xsux">Sumero-Akkadian Cuneiform</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Wiskundige notatie</script>
-			<script type="Zsym">Symbolen</script>
-			<script type="Zxxx">Code voor ongeschreven talen</script>
-			<script type="Zyyy">Algemeen</script>
-			<script type="Zzzz">Code voor ongecodeerde schriftsystemen</script>
-		</scripts>
-		<territories>
-			<territory type="001">Wereld</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Noord-Amerika</territory>
-			<territory type="005">Zuid-Amerika</territory>
-			<territory type="009">Oceanië</territory>
-			<territory type="011">West-Afrika</territory>
-			<territory type="013">Midden-Amerika</territory>
-			<territory type="014">Oost-Afrika</territory>
-			<territory type="015">Noord-Afrika</territory>
-			<territory type="017">Centraal-Afrika</territory>
-			<territory type="018">Zuidelijk Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Noordelijk Amerika</territory>
-			<territory type="029">Caribisch gebied</territory>
-			<territory type="030">Oost-Azië</territory>
-			<territory type="034">Zuid-Azië</territory>
-			<territory type="035">Zuidoost-Azië</territory>
-			<territory type="039">Zuid-Europa</territory>
-			<territory type="053">Australië en Nieuw-Zeeland</territory>
-			<territory type="054">Melanesië</territory>
-			<territory type="057">Micronesische regio</territory>
-			<territory type="061">Polynesië</territory>
-			<territory type="062">Zuidelijk Centraal-Azië</territory>
-			<territory type="142">Azië</territory>
-			<territory type="143">Centraal-Azië</territory>
-			<territory type="145">West-Azië</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Oost-Europa</territory>
-			<territory type="154">Noord-Europa</territory>
-			<territory type="155">West-Europa</territory>
-			<territory type="172">Gemenebest van Onafhankelijke Staten</territory>
-			<territory type="419">Latijns-Amerika en het Caribisch gebied</territory>
-			<territory type="830">Kanaaleilanden</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Verenigde Arabische Emiraten</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua en Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanië</territory>
-			<territory type="AM">Armenië</territory>
-			<territory type="AN">Nederlandse Antillen</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentinië</territory>
-			<territory type="AS">Amerikaans Samoa</territory>
-			<territory type="AT">Oostenrijk</territory>
-			<territory type="AU">Australië</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandeilanden</territory>
-			<territory type="AZ">Azerbeidzjan</territory>
-			<territory type="BA">Bosnië en Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">België</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarije</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brazilië</territory>
-			<territory type="BS">Bahama’s</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouveteiland</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Wit-Rusland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Cocoseilanden</territory>
-			<territory type="CD">Congo-Kinshasa</territory>
-			<territory type="CF">Centraal-Afrikaanse Republiek</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Zwitserland</territory>
-			<territory type="CI">Ivoorkust</territory>
-			<territory type="CK">Cookeilanden</territory>
-			<territory type="CL">Chili</territory>
-			<territory type="CM">Kameroen</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Servië en Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Kaapverdië</territory>
-			<territory type="CX">Christmaseiland</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Tsjechië</territory>
-			<territory type="DE">Duitsland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Denemarken</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominicaanse Republiek</territory>
-			<territory type="DZ">Algerije</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egypte</territory>
-			<territory type="EH">Westelijke Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanje</territory>
-			<territory type="ET">Ethiopië</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falklandeilanden</territory>
-			<territory type="FM">Micronesië</territory>
-			<territory type="FO">Faeröer</territory>
-			<territory type="FR">Frankrijk</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Verenigd Koninkrijk</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgië</territory>
-			<territory type="GF">Frans-Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Groenland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinee</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Equatoriaal-Guinea</territory>
-			<territory type="GR">Griekenland</territory>
-			<territory type="GS">Zuid-Georgië en Zuidelijke Sandwicheilanden</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinee-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong SAR van China</territory>
-			<territory type="HM">Heard- en McDonaldeilanden</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatië</territory>
-			<territory type="HT">Haïti</territory>
-			<territory type="HU">Hongarije</territory>
-			<territory type="ID">Indonesië</territory>
-			<territory type="IE">Ierland</territory>
-			<territory type="IL">Israël</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Britse Gebieden in de Indische Oceaan</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">IJsland</territory>
-			<territory type="IT">Italië</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordanië</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgizië</territory>
-			<territory type="KH">Cambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comoren</territory>
-			<territory type="KN">Saint Kitts en Nevis</territory>
-			<territory type="KP">Noord-Korea</territory>
-			<territory type="KR">Zuid-Korea</territory>
-			<territory type="KW">Koeweit</territory>
-			<territory type="KY">Caymaneilanden</territory>
-			<territory type="KZ">Kazachstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litouwen</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Letland</territory>
-			<territory type="LY">Libië</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldavië</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Sint-Maarten</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalleilanden</territory>
-			<territory type="MK">Macedonië</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolië</territory>
-			<territory type="MO">Macao SAR van China</territory>
-			<territory type="MP">Noordelijke Marianeneilanden</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritanië</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldiven</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Maleisië</territory>
-			<territory type="MZ">Mozambique</territory>
-			<territory type="NA">Namibië</territory>
-			<territory type="NC">Nieuw-Caledonië</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkeiland</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederland</territory>
-			<territory type="NO">Noorwegen</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nieuw-Zeeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Frans-Polynesië</territory>
-			<territory type="PG">Papoea-Nieuw-Guinea</territory>
-			<territory type="PH">Filipijnen</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">Saint Pierre en Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestijns Gebied</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceanië (overige)</territory>
-			<territory type="QU">Europese Unie</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Roemenië</territory>
-			<territory type="RS">Servië</territory>
-			<territory type="RU">Rusland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saoedi-Arabië</territory>
-			<territory type="SB">Salomonseilanden</territory>
-			<territory type="SC">Seychellen</territory>
-			<territory type="SD">Soedan</territory>
-			<territory type="SE">Zweden</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Sint-Helena</territory>
-			<territory type="SI">Slovenië</territory>
-			<territory type="SJ">Svalbard en Jan Mayen</territory>
-			<territory type="SK">Slowakije</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalië</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">Sao Tomé en Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrië</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks- en Caicoseilanden</territory>
-			<territory type="TD">Tsjaad</territory>
-			<territory type="TF">Franse Gebieden in de zuidelijke Indische Oceaan</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadzjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Oost-Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunesië</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkije</territory>
-			<territory type="TT">Trinidad en Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Oekraïne</territory>
-			<territory type="UG">Oeganda</territory>
-			<territory type="UM">Amerikaanse kleinere afgelegen eilanden</territory>
-			<territory type="US">Verenigde Staten</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Oezbekistan</territory>
-			<territory type="VA">Vaticaanstad</territory>
-			<territory type="VC">Saint Vincent en de Grenadines</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britse Maagdeneilanden</territory>
-			<territory type="VI">Amerikaanse Maagdeneilanden</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis en Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Zuid-Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Onbekend of onjuist gebied</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Traditionele Duitse spelling</variant>
-			<variant type="1994">Gestandaardiseerde Resiaanse spelling</variant>
-			<variant type="1996">Duitse spelling van 1996</variant>
-			<variant type="1606NICT">Laat Middelfrans tot 1606</variant>
-			<variant type="1694ACAD">Vroeg modern Frans</variant>
-			<variant type="AREVELA">Oost-Armeens</variant>
-			<variant type="AREVMDA">West-Armeens</variant>
-			<variant type="BAKU1926">Eenvormig Turkse Latijnse alfabet</variant>
-			<variant type="BISKE">San Giorgio/Bila-dialect</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">Internationaal Fonetisch Alfabet</variant>
-			<variant type="FONUPA">Oeralisch Fonetisch Alfabet</variant>
-			<variant type="LIPAW">Het Lipovaz-dialect van het Resiaans</variant>
-			<variant type="MONOTON">Monotonaal</variant>
-			<variant type="NEDIS">Natisone-dialect</variant>
-			<variant type="NJIVA">Gniva/Njiva-dialect</variant>
-			<variant type="OSOJS">Oseacco/Osojane-dialect</variant>
-			<variant type="POLYTON">Polytonaal</variant>
-			<variant type="POSIX">Computer</variant>
-			<variant type="REVISED">Gewijzigde spelling</variant>
-			<variant type="ROZAJ">Resiaans</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Schots standaard-Engels</variant>
-			<variant type="SCOUSE">Liverpools (Scouse)</variant>
-			<variant type="SOLBA">Stolvizza/Solbica-dialect</variant>
-			<variant type="TARASK">Taraskievica-spelling</variant>
-			<variant type="VALENCIA">Valenciaans</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalender</key>
-			<key type="collation">Volgorde</key>
-			<key type="currency">Munteenheid</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Traditioneel Chinees</type>
-			<type type="buddhist" key="calendar">Boeddhistische kalender</type>
-			<type type="chinese" key="calendar">Chinese kalender</type>
-			<type type="direct" key="collation">Directe sorteervolgorde</type>
-			<type type="gb2312han" key="collation">Vereenvoudigd Chinees</type>
-			<type type="gregorian" key="calendar">Gregoriaanse kalender</type>
-			<type type="hebrew" key="calendar">Hebreeuwse kalender</type>
-			<type type="indian" key="calendar">Indiase nationale kalender</type>
-			<type type="islamic" key="calendar">Islamitische kalender</type>
-			<type type="islamic-civil" key="calendar">Islamitische kalender (cyclisch)</type>
-			<type type="japanese" key="calendar">Japanse kalender</type>
-			<type type="phonebook" key="collation">Telefoonboeksorteervolgorde</type>
-			<type type="pinyin" key="collation">Pinyinvolgorde</type>
-			<type type="roc" key="calendar">Kalender van de Chinese Republiek</type>
-			<type type="stroke" key="collation">Streeksorteervolgorde</type>
-			<type type="traditional" key="collation">Traditionele sorteervolgorde</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metriek</measurementSystemName>
-			<measurementSystemName type="US">Amerikaans</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Taal: {0}</codePattern>
-			<codePattern type="script">Schrift: {0}</codePattern>
-			<codePattern type="territory">Regio: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="languages">titlecase-firstword</inText>
-		<inText type="scripts">titlecase-firstword</inText>
-		<inText type="territories">titlecase-firstword</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á ä b-e é ë f-i í ï {ij} j-o ó ö p-u ú ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[å ã ç ñ ô]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}−{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan.</month>
-							<month type="2">feb.</month>
-							<month type="3">mrt.</month>
-							<month type="4">apr.</month>
-							<month type="5">mei</month>
-							<month type="6">jun.</month>
-							<month type="7">jul.</month>
-							<month type="8">aug.</month>
-							<month type="9">sep.</month>
-							<month type="10">okt.</month>
-							<month type="11">nov.</month>
-							<month type="12">dec.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januari</month>
-							<month type="2">februari</month>
-							<month type="3">maart</month>
-							<month type="4">april</month>
-							<month type="5">mei</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">augustus</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">zo</day>
-							<day type="mon">ma</day>
-							<day type="tue">di</day>
-							<day type="wed">wo</day>
-							<day type="thu">do</day>
-							<day type="fri">vr</day>
-							<day type="sat">za</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">zondag</day>
-							<day type="mon">maandag</day>
-							<day type="tue">dinsdag</day>
-							<day type="wed">woensdag</day>
-							<day type="thu">donderdag</day>
-							<day type="fri">vrijdag</day>
-							<day type="sat">zaterdag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Z</day>
-							<day type="mon">M</day>
-							<day type="tue">D</day>
-							<day type="wed">W</day>
-							<day type="thu">D</day>
-							<day type="fri">V</day>
-							<day type="sat">Z</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1e kwartaal</quarter>
-							<quarter type="2">2e kwartaal</quarter>
-							<quarter type="3">3e kwartaal</quarter>
-							<quarter type="4">4e kwartaal</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Voor Christus</era>
-						<era type="1">Anno Domini</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">v. Chr.</era>
-						<era type="1">n. Chr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
-						<dateFormatItem id="MEd">E d-M</dateFormatItem>
-						<dateFormatItem id="MMd">d-MM</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d-MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM-yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd-MM - dd-MM</greatestDifference>
-							<greatestDifference id="M">dd-MM - dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E dd-MM - E dd-MM</greatestDifference>
-							<greatestDifference id="M">E dd-MM - E dd-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d - E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM-yy - MM-yy</greatestDifference>
-							<greatestDifference id="y">MM-yy - MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">dd-MM-yy - dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">dd-MM-yy - dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="M">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-							<greatestDifference id="y">E dd-MM-yy - E dd-MM-yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d - E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM - E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y - E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM–MM – yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Tijdperk</displayName>
-					</field>
-					<field type="year">
-						<displayName>Jaar</displayName>
-					</field>
-					<field type="month">
-						<displayName>Maand</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dag</displayName>
-						<relative type="-3">Drie dagen geleden</relative>
-						<relative type="-2">Eergisteren</relative>
-						<relative type="-1">Gisteren</relative>
-						<relative type="0">Vandaag</relative>
-						<relative type="1">Morgen</relative>
-						<relative type="2">Overmorgen</relative>
-						<relative type="3">Over drie dagen</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Dag van de week</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Uur</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuut</displayName>
-					</field>
-					<field type="second">
-						<displayName>Seconde</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Tisjrie</month>
-							<month type="2">Chesjwan</month>
-							<month type="5">Sjevat</month>
-							<month type="6">Adar</month>
-							<month type="7">Adar B</month>
-							<month type="9">Ijar</month>
-							<month type="11">Tammoez</month>
-							<month type="13">Elloel</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Moeharram</month>
-							<month type="3">Rabiʻa al awal</month>
-							<month type="4">Rabiʻa al thani</month>
-							<month type="5">Joemadʻal awal</month>
-							<month type="6">Joemadʻal thani</month>
-							<month type="8">Sjaʻaban</month>
-							<month type="10">Sjawal</month>
-							<month type="11">Doe al kaʻaba</month>
-							<month type="12">Doe al hizja</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraAbbr>
-						<era type="0">Saʻna Hizjria</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}-tijd</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Onbekend</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Zuidpool</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Río Gallegos</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wenen</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Bakoe</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brussel</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Pôrto Velho</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Montréal</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Cocoseilanden</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Paaseiland</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Sjanghai</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kaapverdië</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Christmaseiland</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlijn</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhagen</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canarische Eilanden</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Pohnpei</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Faeröer</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Parijs</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londen</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Athene</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Zuid-Georgië</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Boedapest</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jeruzalem</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Bisjkek</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderbury-eiland</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Koeweit</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtöbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Alma-Ata</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beiroet</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulaanbaator</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldiven</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico-stad</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Nouméa</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marquesaseilanden</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambier-eilanden</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Manilla</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warschau</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azoren</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Boekarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskou</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinenburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkoetsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakoetsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtsjatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyad</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Khartoem</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sint-Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Turks Eilanden</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dusjanbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Asjchabad</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanboel</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Oezjhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizja</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Wake-eiland</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tasjkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre-tijd</standard>
-					<daylight>Acre-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afghaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Centraal-Afrikaanse tijd</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Oost-Afrikaanse tijd</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Zuid-Afrikaanse tijd</generic>
-					<standard>Zuid-Afrikaanse standaardtijd</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>West-Afrikaanse tijd</standard>
-					<daylight>West-Afrikaanse zomertijd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk-tijd</standard>
-					<daylight>Aktyubinsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska-tijd</generic>
-					<standard>Alaska - standaardtijd</standard>
-					<daylight>Alaska - zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii-tijd</generic>
-					<standard>Alaska-Hawaii-standaardtijd</standard>
-					<daylight>Alaska-Hawaii-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Alma-Ata-tijd</standard>
-					<daylight>Alma-Ata-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazone-tijd</standard>
-					<daylight>Amazone-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central-tijd</generic>
-					<standard>Central-standaardtijd</standard>
-					<daylight>Central-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Eastern-tijd</generic>
-					<standard>Eastern-standaardtijd</standard>
-					<daylight>Eastern-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Mountain-tijd</generic>
-					<standard>Mountain-standaardtijd</standard>
-					<daylight>Mountain-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pacific-tijd</generic>
-					<standard>Pacific-standaardtijd</standard>
-					<daylight>Pacific-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadyr-tijd</standard>
-					<daylight>Anadyr-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aqtau-tijd</standard>
-					<daylight>Aqtau-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aqtöbe-tijd</standard>
-					<daylight>Aqtöbe-zomertijd</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aqtöbe)</standard>
-					<daylight>AQTST (Aqtöbe)</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabische tijd</generic>
-					<standard>Arabische standaardtijd</standard>
-					<daylight>Arabische zomertijd</daylight>
-				</long>
-				<short>
-					<generic>AT (Arabisch)</generic>
-					<standard>AST (Arabisch)</standard>
-					<daylight>ADT (Arabisch)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentijnse tijd</standard>
-					<daylight>Argentijnse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>West-Argentijnse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armeense tijd</standard>
-					<daylight>Armeense zomertijd</daylight>
-				</long>
-				<short>
-					<standard>AMT (Armenië)</standard>
-					<daylight>AMST (Armenië)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Ashkhabad-tijd</standard>
-					<daylight>Ashkhabad-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantic-tijd</generic>
-					<standard>Atlantic - standaardtijd</standard>
-					<daylight>Atlantic - zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Midden-Australische tijd</generic>
-					<standard>Midden-Australische standaardtijd</standard>
-					<daylight>Midden-Australische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Midden-Australische westelijke tijd</generic>
-					<standard>Midden-Australische westelijke standaardtijd</standard>
-					<daylight>Midden-Australische westelijke zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Oost-Australische tijd</generic>
-					<standard>Oost-Australische standaardtijd</standard>
-					<daylight>Oost-Australische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>West-Australische tijd</generic>
-					<standard>West-Australische standaardtijd</standard>
-					<daylight>West-Australische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Azerbeidzjaanse tijd</standard>
-					<daylight>Azerbeidzjaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azoren-tijd</standard>
-					<daylight>Azoren-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Bakoe-tijd</standard>
-					<daylight>Bakoe-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bengalese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering-tijd</generic>
-					<standard>Bering-standaardtijd</standard>
-					<daylight>Bering-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Boliviaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneose tijd</standard>
-					<daylight>Borneose zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Braziliaanse tijd</standard>
-					<daylight>Braziliaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Bruneise tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Kaapverdische tijd</standard>
-					<daylight>Kaapverdische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Chamorro-tijd</generic>
-					<standard>Chamorro-standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Chatham-standaardtijd</standard>
-					<daylight>Chatham-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Chileense tijd</standard>
-					<daylight>Chileense zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Chinese tijd</generic>
-					<standard>Chinese standaardtijd</standard>
-					<daylight>Chinese zomertijd</daylight>
-				</long>
-				<short>
-					<generic>CT (China)</generic>
-					<standard>CST (China)</standard>
-					<daylight>CDT (China)</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Choibalsan-tijd</standard>
-					<daylight>Choibalsan-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Christmaseilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Cocoseilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Colombiaanse tijd</standard>
-					<daylight>Colombiaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Cookeilandse tijd</standard>
-					<daylight>Cookeilandse halve zomertijd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Cubaanse tijd</generic>
-					<standard>Cubaanse standaardtijd</standard>
-					<daylight>Cubaanse zomertijd</daylight>
-				</long>
-				<short>
-					<standard>CST (Cuba)</standard>
-					<daylight>CDT (Cuba)</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dhaka-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Davis-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dominican">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dumont-d'Urville-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dushanbe-tijd</standard>
-					<daylight>Dushanbe-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Nederlands-Guyaanse tijd</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Oost-Timorese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Paaseilandse tijd</standard>
-					<daylight>Paaseilandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ecuadoriaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Midden-Europese standaardtijd</standard>
-					<daylight>Midden-Europese zomertijd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Oost-Europese standaardtijd</standard>
-					<daylight>Oost-Europese zomertijd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>West-Europese tijd</standard>
-					<daylight>West-Europese zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Falklandeilandse tijd</standard>
-					<daylight>Falklandeilandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Fijische tijd</standard>
-					<daylight>Fijische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Frans-Guyaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Franse zuidelijke en Antarctische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze-tijd</standard>
-					<daylight>Frunze-zomertijd</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagoseilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Gambiereilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Georgia-tijd</standard>
-					<daylight>Georgia-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Gilberteilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich Mean Time</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Goose_Bay">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Centraal-Groenlandse tijd</standard>
-					<daylight>Centraal-Groenlandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Oost-Groenlandse tijd</standard>
-					<daylight>Oost-Groenlandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>West-Groenlandse tijd</standard>
-					<daylight>West-Groenlandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guamese standaardtijd</standard>
-				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Golf-tijd</generic>
-					<standard>Golf-standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Guyaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Hawaii-Aleoetische standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hongkong-tijd</standard>
-					<daylight>Hongkong-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hovd-tijd</standard>
-					<daylight>Hovd-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Indiaase standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Indische Oceaan-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Indochinese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Centraal-Indonesische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Oost-Indonesische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>West-Indonesische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Iraanse standaardtijd</standard>
-					<daylight>Iraanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Irkoetsk-tijd</standard>
-					<daylight>Irkoetsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Israëlische tijd</generic>
-					<standard>Israëlische standaardtijd</standard>
-					<daylight>Israëlische zomertijd</daylight>
-				</long>
-				<short>
-					<standard>IST (Israël)</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japanse tijd</generic>
-					<standard>Japanse standaardtijd</standard>
-					<daylight>Japanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Petropavlovsk-Kamtsjatski-tijd</standard>
-					<daylight>Petropavlovsk-Kamtsjatski-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karachi-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kashgar-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>Oost-Kazachse tijd</generic>
-					<standard>Oost-Kazachse standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>West-Kazachse tijd</generic>
-					<standard>West-Kazachse standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilorda-tijd</standard>
-					<daylight>Kizilorda-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Koreaanse tijd</generic>
-					<standard>Koreaanse standaardtijd</standard>
-					<daylight>Koreaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Kosraese tijd</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasnojarsk-tijd</standard>
-					<daylight>Krasnojarsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<generic>Kuybyshev standaardtijd</generic>
-					<standard>Kuybyshev-tijd</standard>
-					<daylight>Kuybyshev-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajaleinse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kirgizische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lanka-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Line-eilandse tijd</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howe-tijd</generic>
-					<standard>Lord Howe-standaardtijd</standard>
-					<daylight>Lord Howe-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Macause tijd</standard>
-					<daylight>Macause zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Magadan-tijd</standard>
-					<daylight>Magadan-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malakka-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Maleisische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Maldivische tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Marquesaseilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Marshalleilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauritiaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Mawson-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulaanbaatar-tijd</standard>
-					<daylight>Ulaanbaatar-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskou-tijd</generic>
-					<standard>Moskou-standaardtijd</standard>
-					<daylight>Moskou-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Myanmarese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Nauruaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepalese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>Nieuw-Caledonische tijd</standard>
-					<daylight>Nieuw-Caledonische zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Nieuw-Zeelandse tijd</generic>
-					<standard>Nieuw-Zeelandse standaardtijd</standard>
-					<daylight>Nieuw-Zeelandse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Newfoundland-tijd</generic>
-					<standard>Newfoundland-standaardtijd</standard>
-					<daylight>Newfoundland-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Niuese tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Norfolkeilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronha-tijd</standard>
-					<daylight>Fernando de Noronha-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Noordelijk Mariaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novosibirsk-tijd</standard>
-					<daylight>Novosibirsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omsk-tijd</standard>
-					<daylight>Omsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Oral">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistaanse tijd</standard>
-					<daylight>Pakistaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Belause tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Papoea-Nieuw-Guinea-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paraguayaanse tijd</standard>
-					<daylight>Paraguayaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peruaanse tijd</standard>
-					<daylight>Peruaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Filipijnse tijd</standard>
-					<daylight>Filipijnse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Phoenixeilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre en Miquelon-tijd</generic>
-					<standard>Pierre en Miquelon-standaardtijd</standard>
-					<daylight>Pierre en Miquelon-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Pitcairnse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Pohnpeise tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Qyzylorda-tijd</standard>
-					<daylight>Qyzylorda-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Réunionse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Rothera-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sachalin-tijd</standard>
-					<daylight>Sachalin-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara-tijd</standard>
-					<daylight>Samara-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Samarkand-tijd</standard>
-					<daylight>Samarkand-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Samoaanse standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Seychelse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Shevchenko-tijd</standard>
-					<daylight>Shevchenko-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Singaporese standaardtijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Solomoneilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Zuid-Georgische tijd</standard>
-				</long>
-				<short>
-					<standard>GST (Z. Georgië)</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Surinaamse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk-tijd</standard>
-					<daylight>Sverdlovsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Syowa-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Tahitiaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tadzjiekse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Tasjkent-tijd</standard>
-					<daylight>Tasjkent-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisi-tijd</standard>
-					<daylight>Tbilisi-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Tokelause tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Tongaanse tijd</standard>
-					<daylight>Tongaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Chuukse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turkse tijd</standard>
-					<daylight>Turkse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Turkmeense tijd</standard>
-					<daylight>Turkmeense zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Tuvaluaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Oral-tijd</standard>
-					<daylight>Oral-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Uruguayaanse tijd</standard>
-					<daylight>Uruguayaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Ürümqi-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Oezbeekse tijd</standard>
-					<daylight>Oezbeekse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Vanuatuaanse tijd</standard>
-					<daylight>Vanuatuaanse zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venezolaanse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vladivostok-tijd</standard>
-					<daylight>Vladivostok-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Wolgograd-tijd</standard>
-					<daylight>Wolgograd-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vostok-tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Wake-eilandse tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Wallis en Futunase tijd</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Jakoetsk-tijd</standard>
-					<daylight>Jakoetsk-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Jekaterinenburg-tijd</standard>
-					<daylight>Jekaterinenburg-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Jerevan-tijd</standard>
-					<daylight>Jerevan-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon-tijd</generic>
-					<standard>Yukon-standaardtijd</standard>
-					<daylight>Yukon-zomertijd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤ #,##0.00-</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorrese peseta</displayName>
-				<displayName count="one">Andorrese peseta</displayName>
-				<displayName count="other">Andorrese peseta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Verenigde Arabische Emiraten-dirham</displayName>
-				<displayName count="one">Verenigde Arabische Emiraten-dirham</displayName>
-				<displayName count="other">Verenigde Arabische Emiraten-dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afghani (1927-2002)</displayName>
-				<displayName count="one">Afghani (AFA)</displayName>
-				<displayName count="other">Afghani (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afghani</displayName>
-				<displayName count="one">Afghani</displayName>
-				<displayName count="other">Afghani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albanese lek</displayName>
-				<displayName count="one">Albanese lek</displayName>
-				<displayName count="other">Albanese lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armeense dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Nederlands-Antilliaanse gulden</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolese kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolese kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolese nieuwe kwanza (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolese kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentijnse austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentijnse peso (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentijnse peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Oostenrijkse schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australische dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubaanse gulden</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbeidzjaanse manat (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbeidzjaanse manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnische dinar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnische convertibele mark</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadaanse dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bengalese taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgische frank (convertibel)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgische frank</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgische frank (financieel)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgaarse harde lev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulgaarse nieuwe lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreinse dinar</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundese franc</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda-dollar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Bruneise dollar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Boliviaanse peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Boliviaanse mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Braziliaanse cruzeiro novo (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Braziliaanse cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Braziliaanse cruzeiro (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Braziliaanse real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Braziliaanse cruzado novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Braziliaanse cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamaanse dollar</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutaanse ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Birmese kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswaanse pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Wit-Russische nieuwe roebel (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Wit-Russische roebel</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belizaanse dollar</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Canadese dollar</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Congolese franc</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Zwitserse franc</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franc</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Chileense unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Chileense peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Chinese yuan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Colombiaanse peso</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Costaricaanse colón</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Oude Servische dinar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Tsjechoslowaakse harde koruna</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Cubaanse peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kaapverdische escudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Cyprisch pond</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Tsjechische koruna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Oost-Duitse ostmark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Duitse mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Djiboutiaanse franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Deense kroon</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominicaanse peso</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Algerijnse dinar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ecuadoraanse sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ecuadoraanse unidad de valor constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estlandse kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptisch pond</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritrese nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Spaanse peseta (account A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Spaanse peseta (convertibele account)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Spaanse peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Ethiopische birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finse markka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fiji dollar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklandeilands pond</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franse franc</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Brits pond sterling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Georgische kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Georgische lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanese cedi (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ghanese cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltarees pond</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambiaanse dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinese franc</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinese syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Equatoriaal-Guinese ekwele guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Griekse drachme</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalteekse quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugees-Guinese escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinee-Bissause peso</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyaanse dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkongse dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hondurese lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Kroatische dinar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kroatische kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haïtiaanse gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Hongaarse forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonesische rupiah</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Iers pond</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Israëlisch pond</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Israëlische nieuwe shekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indiase rupee</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Iraakse dinar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iraanse rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>IJslandse kroon</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italiaanse lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaicaanse dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordaanse dinar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanse yen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Keniaanse shilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgizische som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Cambodjaanse riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Comorese franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Noord-Koreaanse won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Zuid-Koreaanse won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Koeweitse dinar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Caymaneilandse dollar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazachstaanse tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laotiaanse kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanees pond</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Srilankaanse rupee</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberiaanse dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesothaanse loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litouwse litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litouwse talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luxemburgse convertibele franc</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburgse frank</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luxemburgse financiële franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Letse lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Letse roebel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libische dinar</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokkaanse dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokkaanse franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldavische leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Malagassische ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Malagassische franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Macedonische denar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malinese franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmarese kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongoolse tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macause pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritaanse ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltese lire</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltees pond</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritiaanse rupee</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldivische rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malawische kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexicaanse peso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexicaanse zilveren peso (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexicaanse unidad de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Maleisische ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambikaanse escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Oude Mozambikaanse metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambikaanse metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibische dollar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigeriaanse naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nicaraguaanse córdoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nicaraguaanse córdoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Nederlandse gulden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Noorse kroon</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalese rupee</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Nieuw-Zeelandse dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omaanse rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamese balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruaanse inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruaanse nieuwe sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruaanse sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papuaanse kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipijnse peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistaanse rupee</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Poolse zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Poolse zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugese escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguayaanse guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatarese rial</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rhodesische dollar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Oude Roemeense leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Roemeense leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Servische dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russische roebel</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Russische roebel (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rwandese franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saoedische rial</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomonseilandse dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Seychelse rupee</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Soedanese dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Soedanese pond</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Soedanees pond</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Zweedse kroon</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singaporese dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Sint-Heleense pond</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Sloveense tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slowaakse koruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierraleoonse leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalische shilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinaamse dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinaamse gulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Santomese dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovjet-roebel</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadoraanse colón</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syrisch pond</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Swazische lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thaise baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadzjikistaanse roebel</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadzjikistaanse somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmeense manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunesische dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongaanse paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timorese escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Turkse lire</displayName>
-				<displayName count="one">oude Turkse lira</displayName>
-				<displayName count="other">oude Turkse lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Nieuwe Turkse lire</displayName>
-				<displayName count="one">Turkse lira</displayName>
-				<displayName count="other">Turkse lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad en Tobago-dollar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Nieuwe Taiwanese dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzaniaanse shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Oekraïense hryvnia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Oekraïense karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Oegandese shilling (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Oegandese shilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Amerikaanse dollar</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Amerikaanse dollar (volgende dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Amerikaanse dollar (zelfde dag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguayaanse peso en geïndexeerde eenheden</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguayaanse peso (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguayaanse peso uruguayo</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Oezbekistaanse sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezolaanse bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venezolaanse sterke bolivar</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamese dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatuaanse vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>West-Samoaanse tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA-franc BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Zilver</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Goud</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Europese samengestelde eenheid</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Europese monetaire eenheid</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Europese rekeneenheid (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Europese rekeneenheid (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Oost-Caribische dollar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Special Drawing Rights</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>European Currency Unit</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franse gouden franc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Franse UIC-franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA-franc BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP-franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-fondsen</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Valutacode voor testdoeleinden</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Geen valuta</displayName>
-				<displayName count="one">onbekende/ongeldige munteenheid</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemenitische dinar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenitische rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Joegoslavische harde dinar</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Joegoslavische noviy-dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Joegoslavische convertibele dinar</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Zuid-Afrikaanse rand (financieel)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Zuid-Afrikaanse rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambiaanse kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zaïrese nieuwe zaïre</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaïrese zaïre</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwaanse dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dagen</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} uur</unitPattern>
-			<unitPattern count="other">{0} uur</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuut</unitPattern>
-			<unitPattern count="other">{0} minuten</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} maand</unitPattern>
-			<unitPattern count="other">{0} maanden</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} seconde</unitPattern>
-			<unitPattern count="other">{0} seconden</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} week</unitPattern>
-			<unitPattern count="other">{0} weken</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} jaar</unitPattern>
-			<unitPattern count="other">{0} jaar</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nee:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nl_BE.xml b/airtime_mvc/library/Zend/Locale/Data/nl_BE.xml
deleted file mode 100644
index fc0e86680..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nl_BE.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.69 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="nl"/>
-		<territory type="BE"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="lv">Lets</language>
-			<language type="oc">Occitaans (na 1500); Provençaals</language>
-			<language type="sh">Servo-Kroatisch</language>
-			<language type="ssa">Nilo-Saharaans</language>
-		</languages>
-		<territories>
-			<territory type="013">Centraal-Amerika</territory>
-			<territory type="IM">Het Eiland Man</territory>
-			<territory type="MV">Malediven</territory>
-			<territory type="SB">Salomoneilanden</territory>
-		</territories>
-		<types>
-			<type type="traditional" key="collation">Traditioneel</type>
-		</types>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/MM - d/MM</greatestDifference>
-							<greatestDifference id="M">d/MM - d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/MM - E d/MM</greatestDifference>
-							<greatestDifference id="M">E d/MM - E d/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="M">d/MM/yy - d/MM/yy</greatestDifference>
-							<greatestDifference id="y">d/MM/yy - d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="M">E d/MM/yy - E d/MM/yy</greatestDifference>
-							<greatestDifference id="y">E d/MM/yy - E d/MM/yy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nl_NL.xml b/airtime_mvc/library/Zend/Locale/Data/nl_NL.xml
deleted file mode 100644
index cb5dd5c78..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nl_NL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nl"/>
-		<territory type="NL"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nn.xml b/airtime_mvc/library/Zend/Locale/Data/nn.xml
deleted file mode 100644
index e37e0534f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nn.xml
+++ /dev/null
@@ -1,2824 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.100 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="nn"/>
-	</identity>
-	<fallback>nb da sv en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abkhasisk</language>
-			<language type="ace">achinesisk</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyghe</language>
-			<language type="ae">avestisk</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afroasiatisk språk</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadisk</language>
-			<language type="ale">aleutisk</language>
-			<language type="alg">algonkinsk språk</language>
-			<language type="alt">sør-altai</language>
-			<language type="am">amharisk</language>
-			<language type="an">aragonsk</language>
-			<language type="ang">gammalengelsk</language>
-			<language type="anp">angika</language>
-			<language type="apa">apache-språk</language>
-			<language type="ar">arabisk</language>
-			<language type="arc">arameisk</language>
-			<language type="arn">araukansk</language>
-			<language type="arp">arapaho</language>
-			<language type="art">kunstig språk</language>
-			<language type="arw">arawak</language>
-			<language type="as">assamisk</language>
-			<language type="ast">asturisk</language>
-			<language type="ath">athapaskansk språk</language>
-			<language type="aus">australsk språk</language>
-			<language type="av">avarisk</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">aserbajdsjansk</language>
-			<language type="ba">basjkirsk</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamilekisk språk</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinesisk</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltisk språk</language>
-			<language type="be">kviterussisk</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berbisk</language>
-			<language type="bg">bulgarsk</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetansk</language>
-			<language type="br">bretonsk</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosnisk</language>
-			<language type="btk">batak</language>
-			<language type="bua">burjatisk</language>
-			<language type="bug">buginesisk</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalansk</language>
-			<language type="cad">caddo</language>
-			<language type="cai">sentralamerikansk indiansk språk</language>
-			<language type="car">karibisk</language>
-			<language type="cau">kaukasisk språk</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tsjetsjensk</language>
-			<language type="ceb">cebuansk</language>
-			<language type="cel">keltisk språk</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukesisk</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewiansk</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">kamisk språk</language>
-			<language type="co">korsikansk</language>
-			<language type="cop">koptisk</language>
-			<language type="cpe">engelskbasert kreol- eller pidginspråk</language>
-			<language type="cpf">franskbasert kreol- eller pidginspråk</language>
-			<language type="cpp">portugisiskbasert kreol- eller pidginspråk</language>
-			<language type="cr">cree</language>
-			<language type="crh">krimtatarisk</language>
-			<language type="crp">kreol- eller pidginspråk</language>
-			<language type="cs">tsjekkisk</language>
-			<language type="csb">kasjubisk</language>
-			<language type="cu">kyrkjeslavisk</language>
-			<language type="cus">kusjitisk språk</language>
-			<language type="cv">tsjuvansk</language>
-			<language type="cy">walisisk</language>
-			<language type="da">dansk</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">tysk</language>
-			<language type="de_AT">austerriksk tysk</language>
-			<language type="de_CH">sveitsisk høgtysk</language>
-			<language type="del">delaware</language>
-			<language type="den">slavej</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidisk språk</language>
-			<language type="dsb">lågsorbisk</language>
-			<language type="dua">duala</language>
-			<language type="dum">mellumnederlandsk</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">gammalegyptisk</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">gresk</language>
-			<language type="elx">elamittisk</language>
-			<language type="en">engelsk</language>
-			<language type="en_CA">kanadisk engelsk</language>
-			<language type="en_US">engelsk (amerikansk)</language>
-			<language type="enm">mellomengelsk</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spansk</language>
-			<language type="es_419">latinamerikansk spansk</language>
-			<language type="es_ES">iberisk spansk</language>
-			<language type="et">estisk</language>
-			<language type="eu">baskisk</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persisk</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">finsk</language>
-			<language type="fil">filippinsk</language>
-			<language type="fiu">finsk-ugrisk språk</language>
-			<language type="fj">fijiansk</language>
-			<language type="fo">færøysk</language>
-			<language type="fon">fon</language>
-			<language type="fr">fransk</language>
-			<language type="fr_CA">kanadisk fransk</language>
-			<language type="fr_CH">sveitsisk fransk</language>
-			<language type="frm">mellomfransk</language>
-			<language type="fro">gammalfransk</language>
-			<language type="frr">nordfrisisk</language>
-			<language type="frs">austfrisisk</language>
-			<language type="fur">friuliansk</language>
-			<language type="fy">vestfrisisk</language>
-			<language type="ga">irsk</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">skotsk-gælisk</language>
-			<language type="gem">germansk språk</language>
-			<language type="gez">ges</language>
-			<language type="gil">kiribatisk</language>
-			<language type="gl">galicisk</language>
-			<language type="gmh">mellomhøgtysk</language>
-			<language type="gn">guarani</language>
-			<language type="goh">gammalhøgtysk</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotisk</language>
-			<language type="grb">grebo</language>
-			<language type="grc">gammalgresk</language>
-			<language type="gsw">sveitsertysk</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiisk</language>
-			<language type="he">hebraisk</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hettittisk</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">kroatisk</language>
-			<language type="hsb">høgsorbisk</language>
-			<language type="ht">haitisk</language>
-			<language type="hu">ungarsk</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armensk</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonesisk</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">ibo</language>
-			<language type="ii">sichuan-yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indisk språk</language>
-			<language type="ine">indo-europeisk språk</language>
-			<language type="inh">ingusjisk</language>
-			<language type="io">ido</language>
-			<language type="ira">iransk</language>
-			<language type="iro">irokansk språk</language>
-			<language type="is">islandsk</language>
-			<language type="it">italiensk</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japansk</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">jødepersisk</language>
-			<language type="jrb">jødearabisk</language>
-			<language type="jv">javanesisk</language>
-			<language type="ka">georgisk</language>
-			<language type="kaa">karakalpakisk</language>
-			<language type="kab">kabylsk</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karensk</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardisk</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kikongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisanspråk</language>
-			<language type="kho">khotanesisk</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kasakhisk</language>
-			<language type="kl">kalaallisut; grønlandsk</language>
-			<language type="km">khmer</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreansk</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosraeansk</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">karelsk</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kasjmiri</language>
-			<language type="ku">kurdisk</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">kornisk</language>
-			<language type="ky">kirgisisk</language>
-			<language type="la">latin</language>
-			<language type="lad">ladinsk</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgsk</language>
-			<language type="lez">lezghian</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgisk</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotisk</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litauisk</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">latvisk</language>
-			<language type="mad">maduresisk</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronesisk</language>
-			<language type="mas">masai</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">madagassisk</language>
-			<language type="mga">mellomirsk</language>
-			<language type="mh">marshallesisk</language>
-			<language type="mi">maori</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">anna språk</language>
-			<language type="mk">makedonsk</language>
-			<language type="mkh">mon-khmerspråk</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolsk</language>
-			<language type="mnc">mandsju</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobospråk</language>
-			<language type="mo">moldavisk</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malayisk</language>
-			<language type="mt">maltesisk</language>
-			<language type="mul">fleire språk</language>
-			<language type="mun">mundaspråk</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandesisk</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burmesisk</language>
-			<language type="myn">mayaspråk</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">nordamerikansk indiansk språk</language>
-			<language type="nap">napolitansk</language>
-			<language type="nb">bokmål</language>
-			<language type="nd">nord-ndebele</language>
-			<language type="nds">lågtysk</language>
-			<language type="ne">nepalsk</language>
-			<language type="new">newari</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">niger-kordofaniansk språk</language>
-			<language type="niu">niueansk</language>
-			<language type="nl">nederlandsk</language>
-			<language type="nl_BE">flamsk</language>
-			<language type="nn">nynorsk</language>
-			<language type="no">norsk</language>
-			<language type="nog">nogai</language>
-			<language type="non">gammalnorsk</language>
-			<language type="nqo">n'ko</language>
-			<language type="nr">sør-ndebele</language>
-			<language type="nso">nordsotho</language>
-			<language type="nub">nubisk språk</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">klassisk newarisk</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">oksitansk</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetisk</language>
-			<language type="osa">osage</language>
-			<language type="ota">ottomansk tyrkisk</language>
-			<language type="oto">otomisk språk</language>
-			<language type="pa">panjabi</language>
-			<language type="paa">papuisk språk</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauisk</language>
-			<language type="peo">gammalpersisk</language>
-			<language type="phi">filippinsk språk</language>
-			<language type="phn">fønikisk</language>
-			<language type="pi">pali</language>
-			<language type="pl">polsk</language>
-			<language type="pon">ponapisk</language>
-			<language type="pra">prakrit-språk</language>
-			<language type="pro">gammalprovençalsk</language>
-			<language type="ps">pashto</language>
-			<language type="pt">portugisisk</language>
-			<language type="pt_BR">brasiliansk portugisisk</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongansk</language>
-			<language type="rm">retoromansk</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumensk</language>
-			<language type="roa">romansk språk</language>
-			<language type="rom">romani</language>
-			<language type="root">rot</language>
-			<language type="ru">russisk</language>
-			<language type="rup">aromansk</language>
-			<language type="rw">kinjarwanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakutsk</language>
-			<language type="sai">søramerikansk indiansk språk</language>
-			<language type="sal">salishansk språk</language>
-			<language type="sam">samaritansk arameisk</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardinsk</language>
-			<language type="scn">siciliansk</language>
-			<language type="sco">skotsk</language>
-			<language type="sd">sindhi</language>
-			<language type="se">nordsamisk</language>
-			<language type="sel">selkupisk</language>
-			<language type="sem">semittisk språk</language>
-			<language type="sg">sango</language>
-			<language type="sga">gammalirsk</language>
-			<language type="sgn">teiknspråk</language>
-			<language type="sh">serbokroatisk</language>
-			<language type="shn">shan</language>
-			<language type="si">singalesisk</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">sioux-språk</language>
-			<language type="sit">sino-tibetansk språk</language>
-			<language type="sk">slovakisk</language>
-			<language type="sl">slovensk</language>
-			<language type="sla">slavisk språk</language>
-			<language type="sm">samoansk</language>
-			<language type="sma">sørsamisk</language>
-			<language type="smi">samisk språk</language>
-			<language type="smj">lulesamisk</language>
-			<language type="smn">enaresamisk</language>
-			<language type="sms">skoltesamisk</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdisk</language>
-			<language type="son">songhai</language>
-			<language type="sq">albansk</language>
-			<language type="sr">serbisk</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssa">nilo-saharaspråk</language>
-			<language type="st">sørsotho</language>
-			<language type="su">sundanesisk</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumerisk</language>
-			<language type="sv">svensk</language>
-			<language type="sw">swahili</language>
-			<language type="syc">klassisk syrisk</language>
-			<language type="syr">syrisk</language>
-			<language type="ta">tamil</language>
-			<language type="tai">taispråk</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tatsjikisk</language>
-			<language type="th">thai</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tivi</language>
-			<language type="tk">turkmensk</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamasjek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonga (Tonga-øyane)</language>
-			<language type="tog">tonga (Nyasa)</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">tyrkisk</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatarisk</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi-språk</language>
-			<language type="tut">altaisk språk</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitisk</language>
-			<language type="tyv">tuvinisk</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uigurisk</language>
-			<language type="uga">ugaritisk</language>
-			<language type="uk">ukrainsk</language>
-			<language type="umb">umbundu</language>
-			<language type="und">ikkje bestemt</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbekisk</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamesisk</language>
-			<language type="vo">volapyk</language>
-			<language type="vot">votisk</language>
-			<language type="wa">vallonsk</language>
-			<language type="wak">wakasjansk språk</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sorbisk språk</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapesisk</language>
-			<language type="yi">jiddisk</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupisk språk</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotec</language>
-			<language type="zbl">blissymbol</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kinesisk</language>
-			<language type="zh_Hans">forenkla kinesisk</language>
-			<language type="zh_Hant">tradisjonell kinesisk</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">utan språkleg innhald</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabisk</script>
-			<script type="Armi">armisk</script>
-			<script type="Armn">armensk</script>
-			<script type="Avst">avestisk</script>
-			<script type="Bali">balinesisk</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengali</script>
-			<script type="Blis">blissymbol</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginesisk</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">felles kanadiske urspråksstavingar</script>
-			<script type="Cari">karisk</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">koptisk</script>
-			<script type="Cprt">kypriotisk</script>
-			<script type="Cyrl">kyrillisk</script>
-			<script type="Cyrs">kyrillisk (kyrkjeslavisk variant)</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egyptisk demotisk</script>
-			<script type="Egyh">egyptisk hieratisk</script>
-			<script type="Egyp">egyptiske hieroglyfar</script>
-			<script type="Ethi">etiopisk</script>
-			<script type="Geok">khutsuri (asomtavruli og nuskhuri)</script>
-			<script type="Geor">georgisk</script>
-			<script type="Glag">glagolittisk</script>
-			<script type="Goth">gotisk</script>
-			<script type="Grek">gresk</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">forenkla kinesisk</script>
-			<script type="Hant">tradisjonell kinesisk</script>
-			<script type="Hebr">hebraisk</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawk hmong</script>
-			<script type="Hrkt">katakana eller hiragana</script>
-			<script type="Hung">gammalungarsk</script>
-			<script type="Inds">indus (Harappan)</script>
-			<script type="Ital">gammalitalisk</script>
-			<script type="Java">javanesisk</script>
-			<script type="Jpan">japansk</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshthi</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">koreansk</script>
-			<script type="Kthi">kaithisk</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotisk</script>
-			<script type="Latf">latinsk (frakturvariant)</script>
-			<script type="Latg">latinsk (gælisk variant)</script>
-			<script type="Latn">latinsk</script>
-			<script type="Lepc">lepcha (róng)</script>
-			<script type="Limb">lumbu</script>
-			<script type="Lina">lineær A</script>
-			<script type="Linb">lineær B</script>
-			<script type="Lyci">lykisk</script>
-			<script type="Lydi">lydisk</script>
-			<script type="Mand">mandaisk</script>
-			<script type="Mani">manikeisk</script>
-			<script type="Maya">maya-hieroglyfar</script>
-			<script type="Mero">meroitisk</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongolsk</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei-mayek</script>
-			<script type="Mymr">myanmar</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol-chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">gammalpermisk</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">inskripsjonspahlavi</script>
-			<script type="Phlp">salmepahlavi</script>
-			<script type="Phlv">pahlavi</script>
-			<script type="Phnx">fønikisk</script>
-			<script type="Plrd">pollard-fonetisk</script>
-			<script type="Prti">inskripsjonsparthisk</script>
-			<script type="Qaai">nedarva</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runer</script>
-			<script type="Samr">samaritansk</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">teiknskrift</script>
-			<script type="Shaw">shavisk</script>
-			<script type="Sinh">sinhala</script>
-			<script type="Sund">sundanesisk</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syriakisk</script>
-			<script type="Syre">syriakisk (estrangelo-variant)</script>
-			<script type="Syrj">syriakisk (vestleg variant)</script>
-			<script type="Syrn">syriakisk (austleg variant)</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">ny tai lue</script>
-			<script type="Taml">tamilsk</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh (berber)</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">thai</script>
-			<script type="Tibt">tibetansk</script>
-			<script type="Ugar">ugaritisk</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">synleg tale</script>
-			<script type="Xpeo">gammalpersisk</script>
-			<script type="Xsux">sumero-akkadisk kileskrift</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">matematisk notasjon</script>
-			<script type="Zsym">symbol</script>
-			<script type="Zxxx">kode for språk utan skrift</script>
-			<script type="Zyyy">felles</script>
-			<script type="Zzzz">ukjend eller ugyldig skrift</script>
-		</scripts>
-		<territories>
-			<territory type="001">verda</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nord-Amerika</territory>
-			<territory type="005">Sør-Amerika</territory>
-			<territory type="009">Oseania</territory>
-			<territory type="011">Vest-Afrika</territory>
-			<territory type="013">Sentral-Amerika</territory>
-			<territory type="014">Aust-Afrika</territory>
-			<territory type="015">Nord-Afrika</territory>
-			<territory type="017">Sentral-Afrika</territory>
-			<territory type="018">Sørlege Afrika</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">nordlege Amerika</territory>
-			<territory type="029">Karibia</territory>
-			<territory type="030">Aust-Asia</territory>
-			<territory type="034">Sør-Asia</territory>
-			<territory type="035">Søraust-Asia</territory>
-			<territory type="039">Sør-Europa</territory>
-			<territory type="053">Australia og New Zealand</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Mikronesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Sørlege Sentral-Asia</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Sentral-Asia</territory>
-			<territory type="145">Vest-Asia</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Aust-Europa</territory>
-			<territory type="154">Nord-Europa</territory>
-			<territory type="155">Vest-Europa</territory>
-			<territory type="172">Samveldet av uavhengige statar</territory>
-			<territory type="419">Latin-Amerika og Karibia</territory>
-			<territory type="830">Kanaløyane</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Dei sameinte arabiske emirata</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua og Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Dei nederlandske Antillane</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikansk Samoa</territory>
-			<territory type="AT">Austerrike</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…land</territory>
-			<territory type="AZ">Aserbajdsjan</territory>
-			<territory type="BA">Bosnia og Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvetøya</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Kviterussland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Kokosøyane</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CF">Den sentralafrikanske republikken</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CH">Sveits</territory>
-			<territory type="CI">Elfenbeinskysten</territory>
-			<territory type="CK">Cookøyane</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia og Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Kapp Verde</territory>
-			<territory type="CX">Christmasøya</territory>
-			<territory type="CY">Kypros</territory>
-			<territory type="CZ">Tsjekkia</territory>
-			<territory type="DE">Tyskland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Den dominikanske republikken</territory>
-			<territory type="DZ">Algerie</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egypt</territory>
-			<territory type="EH">Vest-Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falklandsøyane</territory>
-			<territory type="FM">Mikronesiaføderasjonen</territory>
-			<territory type="FO">Færøyane</territory>
-			<territory type="FR">Frankrike</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Storbritannia</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Fransk Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grønland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatorial-Guinea</territory>
-			<territory type="GR">Hellas</territory>
-			<territory type="GS">Sør-Georgia og Sør-Sandwich-øyane</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong S.A.R. (Kina)</territory>
-			<territory type="HM">Heard- og McDonaldsøyane</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungarn</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Britiske område i Det indiske hav</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambodsja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorene</territory>
-			<territory type="KN">St. Christopher og Nevis</territory>
-			<territory type="KP">Nord-Korea</territory>
-			<territory type="KR">Sør-Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Caymanøyane</territory>
-			<territory type="KZ">Kasakhstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">St. Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Latvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshalløyane</territory>
-			<territory type="MK">Makedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Macao S.A.R. (Kina)</territory>
-			<territory type="MP">Nord-Marianane</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldivane</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexico</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Ny-Caledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkøyane</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederland</territory>
-			<territory type="NO">Noreg</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">New Zealand</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fransk Polynesia</territory>
-			<territory type="PG">Papua Ny-Guinea</territory>
-			<territory type="PH">Filippinane</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">St. Pierre og Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinsk territorium</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Ytre Oseania</territory>
-			<territory type="QU">Den europeiske unionen</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Romania</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Russland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi Arabia</territory>
-			<territory type="SB">Salomonøyane</territory>
-			<territory type="SC">Seychellane</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sverige</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard og Jan Mayen</territory>
-			<territory type="SK">Slovakia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé og Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks- og Caicosøyane</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Franske sørområde</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadsjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Aust-Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tyrkia</territory>
-			<territory type="TT">Trinidad og Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">USAs ytre småøyar</territory>
-			<territory type="US">USA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikanstaten</territory>
-			<territory type="VC">St. Vincent og Grenadinane</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Jomfruøyane (britisk)</territory>
-			<territory type="VI">Jomfruøyane (USA)</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis og Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sør-Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">(ukjent eller ugyldig område)</territory>
-		</territories>
-		<variants>
-			<variant type="1901">tradisjonell tysk ortografi</variant>
-			<variant type="1994">standardisert resisk ortografi</variant>
-			<variant type="1996">tysk ortografi frå 1996</variant>
-			<variant type="1606NICT">nyare mellomfransk til 1606</variant>
-			<variant type="1694ACAD">eldre nyfransk</variant>
-			<variant type="AREVELA">austarmensk</variant>
-			<variant type="AREVMDA">vestarmensk</variant>
-			<variant type="BAKU1926">samla tyrkisk-latinsk alfabet</variant>
-			<variant type="BISKE">san giorgio- og biladialekt</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">det internasjonale fonetiske alfabetet (IPA)</variant>
-			<variant type="FONUPA">det uralske fonetiske alfabetet UPA</variant>
-			<variant type="LIPAW">resian, lipovazdialekt</variant>
-			<variant type="MONOTON">monotonisk rettskriving</variant>
-			<variant type="NEDIS">natisonedialekt</variant>
-			<variant type="NJIVA">gniva- og njivadialekt</variant>
-			<variant type="OSOJS">oseacco- og osojanedialekt</variant>
-			<variant type="POLYTON">polytonisk rettskriving</variant>
-			<variant type="POSIX">dataspråk</variant>
-			<variant type="REVISED">revidert rettskriving</variant>
-			<variant type="ROZAJ">resisk dialekt</variant>
-			<variant type="SAAHO">saaho-dialekt</variant>
-			<variant type="SCOTLAND">skotsk standard engelsk</variant>
-			<variant type="SCOUSE">scouse-dialekt</variant>
-			<variant type="SOLBA">stolvizza- og solbicadialekt</variant>
-			<variant type="TARASK">taraskievica-ortografi</variant>
-			<variant type="VALENCIA">valensisk dialekt</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalender</key>
-			<key type="collation">kollasjon</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">tradisjonell kinesisk sortering</type>
-			<type type="buddhist" key="calendar">buddhistisk kalender</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="direct" key="collation">direkte sortering</type>
-			<type type="gb2312han" key="collation">forenkla kinesisk sortering</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="hebrew" key="calendar">hebraisk kalender</type>
-			<type type="indian" key="calendar">indisk nasjonalkalender</type>
-			<type type="islamic" key="calendar">islamsk kalender</type>
-			<type type="islamic-civil" key="calendar">islamsk sivil kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogsortering</type>
-			<type type="pinyin" key="collation">pinyin-sortering</type>
-			<type type="roc" key="calendar">kalender for Republikken Kina</type>
-			<type type="stroke" key="collation">streksortering</type>
-			<type type="traditional" key="collation">tradisjonell sortering</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metrisk</measurementSystemName>
-			<measurementSystemName type="US">amerikansk</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Språk: {0}</codePattern>
-			<codePattern type="script">Skrift: {0}</codePattern>
-			<codePattern type="territory">Område: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à b-e é f-o ó ò ô p-z æ ø å]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á ǎ � ç đ è ê ń ñ ŋ š ŧ ü ž ä ö]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}−{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">mai</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">mars</month>
-							<month type="4">april</month>
-							<month type="5">mai</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">desember</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sø.</day>
-							<day type="mon">må.</day>
-							<day type="tue">ty.</day>
-							<day type="wed">on.</day>
-							<day type="thu">to.</day>
-							<day type="fri">fr.</day>
-							<day type="sat">la.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">søndag</day>
-							<day type="mon">måndag</day>
-							<day type="tue">tysdag</day>
-							<day type="wed">onsdag</day>
-							<day type="thu">torsdag</day>
-							<day type="fri">fredag</day>
-							<day type="sat">laurdag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="mon">må.</day>
-							<day type="sat">la.</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">O</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">L</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>formiddag</am>
-				<pm>ettermiddag</pm>
-				<eras>
-					<eraNames>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM. y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>'kl'. HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hm">h.mm a</dateFormatItem>
-						<dateFormatItem id="hms">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.–d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">5–06</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM–dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM–dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E. dd.MM–E. dd.MM</greatestDifference>
-							<greatestDifference id="M">E. dd.MM–E. dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM.–MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.–d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM.–d. MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E. d.–E. d. MMM.</greatestDifference>
-							<greatestDifference id="M">E. d. MMM.–E. d. MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy–MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy–MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy–dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy–dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy–dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E. dd.MM.yy–E. dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E. dd.MM.yy–E. dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E. dd.MM.yy–E. dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM.–MMM. y</greatestDifference>
-							<greatestDifference id="y">MMM. y–MMM. y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.–d. MMM. y</greatestDifference>
-							<greatestDifference id="M">d. MMM.–d. MMM. y</greatestDifference>
-							<greatestDifference id="y">d. MMM. y–d. MMM. y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E. d.–E. d. MMM. y</greatestDifference>
-							<greatestDifference id="M">E. d. MMM.–E. d. MMM. y</greatestDifference>
-							<greatestDifference id="y">E. d. MMM. y–E. d. MMM. y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>æra</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ã¥r</displayName>
-					</field>
-					<field type="month">
-						<displayName>månad</displayName>
-					</field>
-					<field type="week">
-						<displayName>veke</displayName>
-					</field>
-					<field type="day">
-						<displayName>dag</displayName>
-						<relative type="-3">for tre dagar sidan</relative>
-						<relative type="-2">i forgårs</relative>
-						<relative type="-1">i går</relative>
-						<relative type="0">i dag</relative>
-						<relative type="1">i morgon</relative>
-						<relative type="2">i overmorgon</relative>
-						<relative type="3">om tre dagar</relative>
-					</field>
-					<field type="weekday">
-						<displayName>vekedag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>f.m./e.m.-val</displayName>
-					</field>
-					<field type="hour">
-						<displayName>time</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minutt</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>sone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH.mm;-HH.mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ukjend</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Sørpolen</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Påskeøya</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kapp Verde</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanariøyane</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthåb</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauritania</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivane</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Mexico by</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorane</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Nord-Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tasjkent</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>sentralafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>austafrikansk tid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>sørafrikansk tid</generic>
-					<standard>sørafrikansk standardtid</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>vestafrikansk tid</standard>
-					<daylight>vestafrikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Central Time</generic>
-					<standard>Central Standard Time</standard>
-					<daylight>Central Daylight Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<short>
-					<standard>AMT (Armenia)</standard>
-					<daylight>AMST (Armenia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>sentralaustralsk tid</generic>
-					<standard>sentralaustralsk standardtid</standard>
-					<daylight>sentralaustralsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>vest-sentralaustralsk tid</generic>
-					<standard>vest-sentralaustralsk standardtid</standard>
-					<daylight>vest-sentralaustralsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>austaustralsk tid</generic>
-					<standard>austaustralsk standardtid</standard>
-					<daylight>austaustralsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>vestaustralsk tid</generic>
-					<standard>vestaustralsk standardtid</standard>
-					<daylight>vestaustralsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<short>
-					<standard>CST (Kina)</standard>
-					<daylight>CDT (Kina)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>sentraleuropeisk tid</standard>
-					<daylight>sentraleuropeisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>austeuropeisk tid</standard>
-					<daylight>austeuropeisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>vesteuropeisk tid</standard>
-					<daylight>vesteuropeisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich middeltid</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>andorransk peseta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afghani</displayName>
-				<symbol>AFN</symbol>
-			</currency>
-			<currency type="ALL">
-				<displayName>albansk lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>armensk dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>nederlansk antillegylden</displayName>
-				<symbol>ANG</symbol>
-			</currency>
-			<currency type="AOA">
-				<displayName>angolsk kwanza</displayName>
-				<symbol>AOA</symbol>
-			</currency>
-			<currency type="AOK">
-				<displayName>angolsk kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>angolsk ny kwanza (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>angolsk kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>argentisk austral</displayName>
-				<symbol>ARA</symbol>
-			</currency>
-			<currency type="ARL">
-				<symbol>ARL</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>ARM</symbol>
-			</currency>
-			<currency type="ARP">
-				<displayName>argentinsk peso (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>argentinsk peso</displayName>
-				<symbol>ARS</symbol>
-			</currency>
-			<currency type="ATS">
-				<displayName>austerriksk schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>australsk dollar</displayName>
-				<symbol>AUD</symbol>
-			</currency>
-			<currency type="AWG">
-				<displayName>arubisk gylden</displayName>
-				<symbol>AWG</symbol>
-			</currency>
-			<currency type="AZM">
-				<displayName>aserbaijansk manat</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>aserbajdsjansk manat</displayName>
-				<displayName count="one">aserbajdsjansk manat</displayName>
-				<displayName count="other">aserbajdsjanske manat</displayName>
-				<symbol>AZN</symbol>
-			</currency>
-			<currency type="BAD">
-				<displayName>bosnisk-hercegovinsk dinar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>bosnisk-hercegovinsk mark (konvertibel)</displayName>
-				<symbol>BAM</symbol>
-			</currency>
-			<currency type="BBD">
-				<displayName>barbadisk dollar</displayName>
-				<symbol>BBD</symbol>
-			</currency>
-			<currency type="BDT">
-				<displayName>bangladeshisk taka</displayName>
-				<symbol>BDT</symbol>
-			</currency>
-			<currency type="BEC">
-				<displayName>belgisk franc (konvertibel)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>belgisk franc</displayName>
-				<symbol>BEF</symbol>
-			</currency>
-			<currency type="BEL">
-				<displayName>belgisk franc (finansiell)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>bulgarsk hard lev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>bulgarsk ny lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>bahrainsk dinar</displayName>
-				<symbol>BHD</symbol>
-			</currency>
-			<currency type="BIF">
-				<displayName>burundisk franc</displayName>
-				<symbol>BIF</symbol>
-			</currency>
-			<currency type="BMD">
-				<displayName>bermudisk dollar</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>bruneisk dollar</displayName>
-				<symbol>BND</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<symbol>BOB</symbol>
-			</currency>
-			<currency type="BOP">
-				<displayName>bolivisk peso</displayName>
-				<symbol>BOP</symbol>
-			</currency>
-			<currency type="BOV">
-				<displayName>bolivisk mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>brasiliansk cruzeiro novo (1967-1986)</displayName>
-				<symbol>BRB</symbol>
-			</currency>
-			<currency type="BRC">
-				<displayName>brasiliansk cruzado</displayName>
-				<symbol>BRC</symbol>
-			</currency>
-			<currency type="BRE">
-				<displayName>brasiliansk cruzeiro (1990-1993)</displayName>
-				<symbol>BRE</symbol>
-			</currency>
-			<currency type="BRL">
-				<displayName>brasiliansk real</displayName>
-				<symbol>BRL</symbol>
-			</currency>
-			<currency type="BRN">
-				<displayName>brasiliansk cruzado novo</displayName>
-				<symbol>BRN</symbol>
-			</currency>
-			<currency type="BRR">
-				<displayName>brasiliansk cruzeiro</displayName>
-				<symbol>BRR</symbol>
-			</currency>
-			<currency type="BRZ">
-				<symbol>BRZ</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>bahamisk dollar</displayName>
-				<symbol>BSD</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>bhutansk ngultrum</displayName>
-				<symbol>BTN</symbol>
-			</currency>
-			<currency type="BUK">
-				<displayName>burmesisk kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>botswansk pula</displayName>
-				<displayName count="one">botswansk pula</displayName>
-				<displayName count="other">botswanske pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>kviterussisk ny rubel (1994-1999)</displayName>
-				<displayName count="one">kviterussisk ny rubel (BYB)</displayName>
-				<displayName count="other">kviterussiske nye rublar (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>kviterussisk rubel</displayName>
-				<displayName count="one">kviterussisk rubel</displayName>
-				<displayName count="other">kviterussiske rublar</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>belizisk dollar</displayName>
-				<displayName count="one">belizisk dollar</displayName>
-				<displayName count="other">beliziske dollar</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>kanadisk dollar</displayName>
-				<displayName count="one">kanadisk dollar</displayName>
-				<displayName count="other">kanadiske dollar</displayName>
-				<symbol>CAD</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>kongolesisk franc</displayName>
-				<displayName count="one">kongolesisk franc</displayName>
-				<displayName count="other">kongolesiske franc</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR euro</displayName>
-				<displayName count="one">WIR euro</displayName>
-				<displayName count="other">WIR euro</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>sveitsisk franc</displayName>
-				<displayName count="one">sveitsisk franc</displayName>
-				<displayName count="other">sveitsiske franc</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franc</displayName>
-				<displayName count="one">WIR franc</displayName>
-				<displayName count="other">WIR franc</displayName>
-			</currency>
-			<currency type="CLE">
-				<symbol>CLE</symbol>
-			</currency>
-			<currency type="CLF">
-				<displayName>chilensk unidades de fomento</displayName>
-				<displayName count="one">chilensk unidades de fomento</displayName>
-				<displayName count="other">chilenske unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>chilensk peso</displayName>
-				<displayName count="one">chilensk peso</displayName>
-				<displayName count="other">chilenske peso</displayName>
-				<symbol>CLP</symbol>
-			</currency>
-			<currency type="CNY">
-				<displayName>kinesisk yuan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>colombiansk peso</displayName>
-				<displayName count="one">colombiansk peso</displayName>
-				<displayName count="other">colombianske peso</displayName>
-				<symbol>COP</symbol>
-			</currency>
-			<currency type="COU">
-				<displayName>unidad de valor real</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>costaricansk colon</displayName>
-				<displayName count="one">costaricansk colon</displayName>
-				<displayName count="other">costaricanske colon</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CSD">
-				<displayName>gammal serbisk dinar</displayName>
-				<displayName count="one">gammal serbisk dinar</displayName>
-				<displayName count="other">gamle serbiske dinarar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>tsjekkoslovakisk koruna (hard)</displayName>
-				<displayName count="one">tsjekkoslovakisk koruna (hard)</displayName>
-				<displayName count="other">tsjekkoslovakiske koruna (hard)</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>kubansk peso</displayName>
-				<displayName count="one">kubansk peso</displayName>
-				<displayName count="other">kubanske peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>kappverdisk escudo</displayName>
-				<symbol>CVE</symbol>
-			</currency>
-			<currency type="CYP">
-				<displayName>kypriotisk pund</displayName>
-				<displayName count="one">kypriotisk pund</displayName>
-				<displayName count="other">kypriotiske pund</displayName>
-				<symbol>CYP</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>tsjekkisk koruna</displayName>
-				<displayName count="one">tsjekkisk koruna</displayName>
-				<displayName count="other">tsjekkiske koruna</displayName>
-				<symbol>CZK</symbol>
-			</currency>
-			<currency type="DDM">
-				<displayName>austtysk mark</displayName>
-				<displayName count="one">austtysk mark</displayName>
-				<displayName count="other">austtyske mark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>tysk mark</displayName>
-				<displayName count="one">tysk mark</displayName>
-				<displayName count="other">tyske mark</displayName>
-				<symbol>DEM</symbol>
-			</currency>
-			<currency type="DJF">
-				<displayName>djiboutisk franc</displayName>
-				<displayName count="one">djiboutisk franc</displayName>
-				<displayName count="other">djiboutiske franc</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>dansk krone</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominikansk peso</displayName>
-				<displayName count="one">dominikansk peso</displayName>
-				<displayName count="other">dominikanske peso</displayName>
-				<symbol>DOP</symbol>
-			</currency>
-			<currency type="DZD">
-				<displayName>algerisk dinar</displayName>
-				<displayName count="one">algerisk dinar</displayName>
-				<displayName count="other">algeriske dinarar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ecuadoriansk sucre</displayName>
-				<displayName count="one">ecuadoriansk sucre</displayName>
-				<displayName count="other">ecuadorianske sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ecuadoriansk unidad de valor constante (UVC)</displayName>
-				<displayName count="one">ecuadoriansk unidad de valor constante (UVC)</displayName>
-				<displayName count="other">ecuadorianske unidad de valor constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>estisk kroon</displayName>
-				<displayName count="one">estisk kroon</displayName>
-				<displayName count="other">estiske kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>egyptisk pund</displayName>
-				<displayName count="one">egyptisk pund</displayName>
-				<displayName count="other">egyptiske pund</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>eritreisk nakfa</displayName>
-				<displayName count="one">eritreisk nakfa</displayName>
-				<displayName count="other">eritreiske nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>spansk peseta (A-konto)</displayName>
-				<displayName count="one">spansk peseta (A-konto)</displayName>
-				<displayName count="other">spanske peseta (A-konto)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>spansk peseta (konvertibel konto)</displayName>
-				<displayName count="one">spansk peseta (konvertibel konto)</displayName>
-				<displayName count="other">spanske peseta (konvertibel konto)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>spansk peseta</displayName>
-				<displayName count="one">spansk peseta</displayName>
-				<displayName count="other">spanske peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>etiopisk birr</displayName>
-				<displayName count="one">etiopisk birr</displayName>
-				<displayName count="other">etiopiske birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<symbol>EUR</symbol>
-			</currency>
-			<currency type="FIM">
-				<displayName>finsk mark</displayName>
-				<displayName count="one">finsk mark</displayName>
-				<displayName count="other">finske mark</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>fijiansk dollar</displayName>
-				<displayName count="one">fijiansk dollar</displayName>
-				<displayName count="other">fijianske dollar</displayName>
-				<symbol>FJD</symbol>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland-pund</displayName>
-				<displayName count="one">Falkland-pund</displayName>
-				<displayName count="other">Falkland-pund</displayName>
-				<symbol>FKP</symbol>
-			</currency>
-			<currency type="FRF">
-				<displayName>fransk franc</displayName>
-				<displayName count="one">fransk franc</displayName>
-				<displayName count="other">franske franc</displayName>
-				<symbol>FRF</symbol>
-			</currency>
-			<currency type="GBP">
-				<displayName>britisk pund sterling</displayName>
-				<symbol>GBP</symbol>
-			</currency>
-			<currency type="GEK">
-				<displayName>georgisk kupon larit</displayName>
-				<displayName count="one">georgisk kupon larit</displayName>
-				<displayName count="other">georgiske kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>georgisk lari</displayName>
-				<displayName count="one">georgisk lari</displayName>
-				<displayName count="other">georgiske lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ghanesisk cedi (1979-2007)</displayName>
-				<displayName count="one">ghanesisk cedi (GHC)</displayName>
-				<displayName count="other">ghanesiske cedi (GHC)</displayName>
-				<symbol>GHC</symbol>
-			</currency>
-			<currency type="GHS">
-				<displayName>ghanesisk cedi</displayName>
-				<displayName count="one">ghanesisk cedi</displayName>
-				<displayName count="other">ghanesiske cedi</displayName>
-				<symbol>GHS</symbol>
-			</currency>
-			<currency type="GIP">
-				<displayName>gibraltarsk pund</displayName>
-				<displayName count="one">gibraltarsk pund</displayName>
-				<displayName count="other">gibraltarske pund</displayName>
-				<symbol>GIP</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>gambisk dalasi</displayName>
-				<displayName count="one">gambisk dalasi</displayName>
-				<displayName count="other">gambiske dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>guineansk franc</displayName>
-				<displayName count="one">guineansk franc</displayName>
-				<displayName count="other">guineanske franc</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>guineansk syli</displayName>
-				<displayName count="one">guineansk syli</displayName>
-				<displayName count="other">guineanske syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekvatorialguineansk ekwele guineana</displayName>
-				<displayName count="one">ekvatorialguineansk ekwele</displayName>
-				<displayName count="other">ekvatorialguineanske ekwele</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>gresk drakme</displayName>
-				<displayName count="one">gresk drakme</displayName>
-				<displayName count="other">greske drakmer</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>guatemalansk quetzal</displayName>
-				<displayName count="one">guatemalansk quetzal</displayName>
-				<displayName count="other">guatemalanske quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>portugisisk guinea escudo</displayName>
-				<displayName count="one">portugisisk guinea escudo</displayName>
-				<displayName count="other">portugisiske guinea escudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau-peso</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>guyansk dollar</displayName>
-				<displayName count="one">guyansk dollar</displayName>
-				<displayName count="other">guyanske dollar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong-dollar</displayName>
-				<displayName count="one">Hongkong-dollar</displayName>
-				<displayName count="other">Hongkong-dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>honduransk lempira</displayName>
-				<displayName count="one">honduransk lempira</displayName>
-				<displayName count="other">honduranske lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>kroatisk dinar</displayName>
-				<displayName count="one">kroatisk dinar</displayName>
-				<displayName count="other">kroatiske dinarar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kroatisk kuna</displayName>
-				<displayName count="one">kroatisk kuna</displayName>
-				<displayName count="other">kroatiske kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>haitisk gourde</displayName>
-				<displayName count="one">haitisk gourde</displayName>
-				<displayName count="other">haitiske gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>ungarsk forint</displayName>
-				<displayName count="one">ungarsk forint</displayName>
-				<displayName count="other">ungarske forintar</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>indonesisk rupi</displayName>
-				<displayName count="one">indonesisk rupi</displayName>
-				<displayName count="other">indonesiske rupiar</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>irsk pund</displayName>
-				<displayName count="one">irsk pund</displayName>
-				<displayName count="other">irske pund</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>israelsk pund</displayName>
-				<displayName count="one">israelsk pund</displayName>
-				<displayName count="other">israelske pund</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>israelsk ny shekel</displayName>
-				<displayName count="one">israelsk ny shekel</displayName>
-				<displayName count="other">israelske nye sheklar</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>indisk rupi</displayName>
-				<symbol>INR</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>iraksk dinar</displayName>
-				<displayName count="one">irakisk dinar</displayName>
-				<displayName count="other">irakiske dinarar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>iransk rial</displayName>
-				<displayName count="one">iransk rial</displayName>
-				<displayName count="other">iranske rialar</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>islandsk krone</displayName>
-				<displayName count="one">islandsk krone</displayName>
-				<displayName count="other">islandske kroner</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>italiensk lire</displayName>
-				<displayName count="one">italiensk lire</displayName>
-				<displayName count="other">italienske lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>jamaikansk dollar</displayName>
-				<displayName count="one">jamaikansk dollar</displayName>
-				<displayName count="other">jamaikanske dollar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>jordansk dinar</displayName>
-				<displayName count="one">jordansk dinar</displayName>
-				<displayName count="other">jordanske dinarar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>japansk yen</displayName>
-				<symbol>JPY</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>kenyansk shilling</displayName>
-				<displayName count="one">kenyansk shilling</displayName>
-				<displayName count="other">kenyanske shilling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>kirgisisk som</displayName>
-				<displayName count="one">kirgisisk som</displayName>
-				<displayName count="other">kirgisiske som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>kambodsjansk riel</displayName>
-				<displayName count="one">kambodsjansk riel</displayName>
-				<displayName count="other">kambodsjanske riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>komorisk franc</displayName>
-				<displayName count="one">komorisk franc</displayName>
-				<displayName count="other">komoriske franc</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>nordkoreansk won</displayName>
-				<displayName count="one">nordkoreansk won</displayName>
-				<displayName count="other">nordkoreanske won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>sørkoreansk won</displayName>
-				<displayName count="one">sørkoreansk won</displayName>
-				<displayName count="other">sørkoreanske won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>kuwaitisk dinar</displayName>
-				<displayName count="one">kuwaitisk dinar</displayName>
-				<displayName count="other">kuwaitiske dinarar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>caymansk dollar</displayName>
-				<displayName count="one">caymansk dollar</displayName>
-				<displayName count="other">caymanske dollar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>kasakhstansk tenge</displayName>
-				<displayName count="one">kasakhstansk tenge</displayName>
-				<displayName count="other">kasakhstanske tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>laotisk kip</displayName>
-				<displayName count="one">laotisk kip</displayName>
-				<displayName count="other">laotiske kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>libanesisk pund</displayName>
-				<displayName count="one">libanesisk pund</displayName>
-				<displayName count="other">libanesiske pund</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>srilankisk rupi</displayName>
-				<displayName count="one">srilankisk rupi</displayName>
-				<displayName count="other">srilankiske rupiar</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>liberisk dollar</displayName>
-				<displayName count="one">liberisk dollar</displayName>
-				<displayName count="other">liberiske dollar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>lesothisk loti</displayName>
-				<displayName count="one">lesothisk loti</displayName>
-				<displayName count="other">lesothiske loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litauisk lita</displayName>
-				<displayName count="one">litauisk lita</displayName>
-				<displayName count="other">litauiske lita</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>litauisk talona</displayName>
-				<displayName count="one">litauisk talona</displayName>
-				<displayName count="other">litauiske talona</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luxemburgsk konvertibel franc</displayName>
-				<displayName count="one">luxemburgsk konvertibel franc</displayName>
-				<displayName count="other">luxemburgske konvertible franc</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>luxemburgsk franc</displayName>
-				<displayName count="one">luxemburgsk franc</displayName>
-				<displayName count="other">luxemburgske franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>luxemburgsk finansiell franc</displayName>
-				<displayName count="one">luxemburgsk finansiell franc</displayName>
-				<displayName count="other">luxemburgske finansielle franc</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>latvisk lat</displayName>
-				<displayName count="one">latvisk lat</displayName>
-				<displayName count="other">latviske lat</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>latvisk rubel</displayName>
-				<displayName count="one">latvisk rubel</displayName>
-				<displayName count="other">latviske rublar</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>libysk dinar</displayName>
-				<displayName count="one">libysk dinar</displayName>
-				<displayName count="other">libyske dinarar</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>marokkansk dirham</displayName>
-				<displayName count="one">marokkansk dirham</displayName>
-				<displayName count="other">marokkanske dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>marokkansk franc</displayName>
-				<displayName count="one">marokkansk franc</displayName>
-				<displayName count="other">marokkanske franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>moldovsk leu</displayName>
-				<displayName count="one">moldovsk leu</displayName>
-				<displayName count="other">moldovske lei</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>madagassisk ariary</displayName>
-				<displayName count="one">madagassisk ariary</displayName>
-				<displayName count="other">madagassiske ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>madagassisk franc</displayName>
-				<displayName count="one">madagassisk franc</displayName>
-				<displayName count="other">madagassiske franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>makedonsk denar</displayName>
-				<displayName count="one">makedonsk denar</displayName>
-				<displayName count="other">makedonske denarar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>malisk franc</displayName>
-				<displayName count="one">malisk franc</displayName>
-				<displayName count="other">maliske franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>myanmarsk kyat</displayName>
-				<displayName count="one">myanmarsk kyat</displayName>
-				<displayName count="other">myanmarske kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>mongolsk tugrik</displayName>
-				<displayName count="one">mongolsk tugrik</displayName>
-				<displayName count="other">mongolske tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>makaosk pataca</displayName>
-				<displayName count="one">makaosk pataca</displayName>
-				<displayName count="other">makaoske pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>mauritansk ouguiya</displayName>
-				<displayName count="one">mauritansk ouguiya</displayName>
-				<displayName count="other">mauritanske ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>maltesisk lira</displayName>
-				<displayName count="one">maltesisk lira</displayName>
-				<displayName count="other">maltesiske lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>maltesisk pund</displayName>
-				<displayName count="one">maltesisk pund</displayName>
-				<displayName count="other">maltesiske pund</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>mauritansk rupi</displayName>
-				<displayName count="one">mauritansk rupi</displayName>
-				<displayName count="other">mauritanske rupiar</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>maldivisk rufiyaa</displayName>
-				<displayName count="one">maldivisk rufiyaa</displayName>
-				<displayName count="other">maldiviske rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>malawisk kwacha</displayName>
-				<displayName count="one">malawisk kwacha</displayName>
-				<displayName count="other">malawiske kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>meksikansk peso</displayName>
-				<displayName count="one">meksikansk peso</displayName>
-				<displayName count="other">meksikanske peso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>meksikansk sølvpeso (1861-1992)</displayName>
-				<displayName count="one">meksikansk sølvpeso (MXP)</displayName>
-				<displayName count="other">meksikanske sølvpeso (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>meksikansk unidad de inversion (UDI)</displayName>
-				<displayName count="one">meksikansk unidad de inversion (UDI)</displayName>
-				<displayName count="other">meksikanske unidad de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>malaysisk ringgit</displayName>
-				<displayName count="one">malaysisk ringgit</displayName>
-				<displayName count="other">malaysiske ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>mosambikisk escudo</displayName>
-				<displayName count="one">mosambikisk escudo</displayName>
-				<displayName count="other">mosambikiske escudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>gammal mosambikisk metical</displayName>
-				<displayName count="one">gammal mosambikisk metical</displayName>
-				<displayName count="other">gamle mosambikiske metical</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>mosambikisk metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>namibisk dollar</displayName>
-				<displayName count="one">namibisk dollar</displayName>
-				<displayName count="other">namibiske dollar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>nigeriansk naira</displayName>
-				<displayName count="one">nigeriansk naira</displayName>
-				<displayName count="other">nigerianske naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>nicaraguansk cordoba</displayName>
-				<displayName count="one">nicaraguansk cordoba</displayName>
-				<displayName count="other">nicaraguanske cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>nicaraguansk cordoba oro</displayName>
-				<displayName count="one">nicaraguansk cordoba oro</displayName>
-				<displayName count="other">nicaraguanske cordoba oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>nederlandsk gylden</displayName>
-				<displayName count="one">nederlandsk gylden</displayName>
-				<displayName count="other">nederlandske gylden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>norsk krone</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="NPR">
-				<displayName>nepalsk rupi</displayName>
-				<displayName count="one">nepalsk rupi</displayName>
-				<displayName count="other">nepalske rupiar</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>new zealandsk dollar</displayName>
-				<displayName count="one">new zealandsk dollar</displayName>
-				<displayName count="other">new zealandske dollar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>omansk rial</displayName>
-				<displayName count="one">omansk rial</displayName>
-				<displayName count="other">omanske rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>panamansk balboa</displayName>
-				<displayName count="one">panamansk balboa</displayName>
-				<displayName count="other">panamanske balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>peruansk inti</displayName>
-				<displayName count="one">peruansk inti</displayName>
-				<displayName count="other">peruanske inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>peruansk nuevo sol</displayName>
-				<displayName count="one">peruansk nuevo sol</displayName>
-				<displayName count="other">peruanske nuevo sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>peruansk sol</displayName>
-				<displayName count="one">peruansk sol</displayName>
-				<displayName count="other">peruanske sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>papuansk kina</displayName>
-				<displayName count="one">papuansk kina</displayName>
-				<displayName count="other">papuanske kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filippinsk peso</displayName>
-				<displayName count="one">filippinsk peso</displayName>
-				<displayName count="other">filippinske peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>pakistansk rupi</displayName>
-				<displayName count="one">pakistansk rupi</displayName>
-				<displayName count="other">pakistanske rupiar</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>polsk zloty</displayName>
-				<displayName count="one">polsk zloty</displayName>
-				<displayName count="other">polske zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>polsk zloty (1950-1995)</displayName>
-				<displayName count="one">polsk zloty (PLZ)</displayName>
-				<displayName count="other">polske zloty (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>portugisisk escudo</displayName>
-				<displayName count="one">portugisisk escudo</displayName>
-				<displayName count="other">portugisiske escudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>paraguayansk guarani</displayName>
-				<displayName count="one">paraguayansk guarani</displayName>
-				<displayName count="other">paraguayanske guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>qatarsk rial</displayName>
-				<displayName count="one">qatarsk rial</displayName>
-				<displayName count="other">qatarske rial</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>rhodesisk dollar</displayName>
-				<displayName count="one">rhodesisk dollar</displayName>
-				<displayName count="other">rhodesiske dollar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>gammal rumensk leu</displayName>
-				<displayName count="one">gammal rumensk leu</displayName>
-				<displayName count="other">gamle rumenske lei</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>rumensk leu</displayName>
-				<displayName count="one">rumensk leu</displayName>
-				<displayName count="other">rumenske lei</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>serbisk dinar</displayName>
-				<displayName count="one">serbisk dinar</displayName>
-				<displayName count="other">serbiske dinarar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>russisk rubel</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>russisk rubel (1991-1998)</displayName>
-				<displayName count="one">russisk rubel (RUR)</displayName>
-				<displayName count="other">russiske rublar (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>rwandisk franc</displayName>
-				<displayName count="one">rwandisk franc</displayName>
-				<displayName count="other">rwandiske franc</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>saudiarabisk rial</displayName>
-				<displayName count="one">saudiarabisk rial</displayName>
-				<displayName count="other">saudiarabiske rial</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>salomonsk dollar</displayName>
-				<displayName count="one">salomonsk dollar</displayName>
-				<displayName count="other">salomonske dollar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>seychellisk rupi</displayName>
-				<displayName count="one">seychellisk rupi</displayName>
-				<displayName count="other">seychelliske rupiar</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>gammal sudanesisk dinar</displayName>
-				<displayName count="one">gammal sudansk dinar</displayName>
-				<displayName count="other">gamle sudanske dinarar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>sudansk pund</displayName>
-				<displayName count="one">sudansk pund</displayName>
-				<displayName count="other">sudanske pund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>gammalt sudanesisk pund</displayName>
-				<displayName count="one">gammalt sudansk pund</displayName>
-				<displayName count="other">gamle sudanske pund</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>svensk krone</displayName>
-				<displayName count="one">svensk krone</displayName>
-				<displayName count="other">svenske kroner</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>singaporsk dollar</displayName>
-				<displayName count="one">singaporsk dollar</displayName>
-				<displayName count="other">singaporske dollar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>sankthelensk pund</displayName>
-				<displayName count="one">sankthelensk pund</displayName>
-				<displayName count="other">sankthelenske pund</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>slovensk tolar</displayName>
-				<displayName count="one">slovensk tolar</displayName>
-				<displayName count="other">slovenske tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>slovakisk koruna</displayName>
-				<displayName count="one">slovakisk koruna</displayName>
-				<displayName count="other">slovakiske koruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>sierraleonsk leone</displayName>
-				<displayName count="one">sierraleonsk leone</displayName>
-				<displayName count="other">sierraleonske leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>somalisk shilling</displayName>
-				<displayName count="one">somalisk shilling</displayName>
-				<displayName count="other">somaliske shilling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>surinamsk dollar</displayName>
-				<displayName count="one">surinamsk dollar</displayName>
-				<displayName count="other">surinamske dollar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>surinamsk gylden</displayName>
-				<displayName count="one">surinamsk gylden</displayName>
-				<displayName count="other">surinamske gylden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome og Principe-dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>sovjetisk rubel</displayName>
-				<displayName count="one">sovjetisk rubel</displayName>
-				<displayName count="other">sovjetiske rublar</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>salvadoransk colon</displayName>
-				<displayName count="one">salvadoransk colon</displayName>
-				<displayName count="other">salvadoranske colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>syrisk pund</displayName>
-				<displayName count="one">syrisk pund</displayName>
-				<displayName count="other">syriske pund</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>swazilandsk lilangeni</displayName>
-				<displayName count="one">swazilandsk lilangeni</displayName>
-				<displayName count="other">swazilandske lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>thailandsk baht</displayName>
-				<displayName count="one">thailandsk baht</displayName>
-				<displayName count="other">thailandske baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>tadsjikisk rubel</displayName>
-				<displayName count="one">tadsjikisk rubel</displayName>
-				<displayName count="other">tadsjikiske rublar</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>tadsjikisk somoni</displayName>
-				<displayName count="one">tadsjikisk somoni</displayName>
-				<displayName count="other">tadsjikiske somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>turkmensk manat</displayName>
-				<displayName count="one">turkmensk manat</displayName>
-				<displayName count="other">turkmenske manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>tunisisk dinar</displayName>
-				<displayName count="one">tunisisk dinar</displayName>
-				<displayName count="other">tunisiske dinarar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>tongansk paʻanga</displayName>
-				<displayName count="one">tongansk paʻanga</displayName>
-				<displayName count="other">tonganske paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>timoresisk escudo</displayName>
-				<displayName count="one">timoresisk escudo</displayName>
-				<displayName count="other">timoresiske escudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>gammal tyrkiske lire</displayName>
-				<displayName count="one">gammal tyrkisk lire</displayName>
-				<displayName count="other">gamle tyrkiske lire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>tyrkisk lire</displayName>
-				<displayName count="one">tyrkisk lire</displayName>
-				<displayName count="other">tyrkiske lire</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>trinidadisk dollar</displayName>
-				<displayName count="one">trinidadisk dollar</displayName>
-				<displayName count="other">trinidadiske dollar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>taiwansk ny dollar</displayName>
-				<displayName count="one">taiwansk ny dollar</displayName>
-				<displayName count="other">taiwanske nye dollar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>tanzaniansk shilling</displayName>
-				<displayName count="one">tanzaniansk shilling</displayName>
-				<displayName count="other">tanzanianske shilling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ukrainsk hryvnia</displayName>
-				<displayName count="one">ukrainsk hryvnia</displayName>
-				<displayName count="other">ukrainske hryvnia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ukrainsk karbovanetz</displayName>
-				<displayName count="one">ukrainsk karbovanetz</displayName>
-				<displayName count="other">ukrainske karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ugandisk shilling (1966-1987)</displayName>
-				<displayName count="one">ugandisk shilling (UGS)</displayName>
-				<displayName count="other">ugandiske shilling (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ugandisk shilling</displayName>
-				<displayName count="one">ugandisk shilling</displayName>
-				<displayName count="other">ugandiske shilling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>amerikansk dollar</displayName>
-				<symbol>USD</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>amerikansk dollar (neste dag)</displayName>
-				<displayName count="one">amerikansk dollar (neste dag)</displayName>
-				<displayName count="other">amerikanske dollar (neste dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>amerikansk dollar (same dag)</displayName>
-				<displayName count="one">amerikansk dollar (same dag)</displayName>
-				<displayName count="other">amerikanske dollar (same dag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>uruguayansk peso en unidades indexadas</displayName>
-				<displayName count="one">uruguayansk peso en unidades indexadas</displayName>
-				<displayName count="other">uruguayanske peso en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>uruguayansk peso (1975-1993)</displayName>
-				<displayName count="one">uruguayansk peso (UYP)</displayName>
-				<displayName count="other">uruguayanske peso (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>uruguayansk peso</displayName>
-				<displayName count="one">uruguayansk peso</displayName>
-				<displayName count="other">uruguayanske peso</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>usbekisk sum</displayName>
-				<displayName count="one">usbekisk sum</displayName>
-				<displayName count="other">usbekiske sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venezuelansk bolivar</displayName>
-				<displayName count="one">venezuelansk bolivar</displayName>
-				<displayName count="other">venezuelanske bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>venezuelansk bolivar fuerte</displayName>
-				<displayName count="one">venezuelansk bolivar fuerte</displayName>
-				<displayName count="other">venezuelanske bolivar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>vietnamesisk dong</displayName>
-				<displayName count="one">vietnamesisk dong</displayName>
-				<displayName count="other">vietnamesiske dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vanuatuisk vatu</displayName>
-				<displayName count="one">vanuatuisk vatu</displayName>
-				<displayName count="other">vanuatuiske vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>vestsamoisk tala</displayName>
-				<displayName count="one">vestsamoisk tala</displayName>
-				<displayName count="other">vestsamoiske tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA franc BEAC</displayName>
-				<displayName count="one">CFA franc BEAC</displayName>
-				<displayName count="other">CFA franc BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>sølv</displayName>
-				<displayName count="one">sølv</displayName>
-				<displayName count="other">sølv</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>gull</displayName>
-				<displayName count="one">gull</displayName>
-				<displayName count="other">gull</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>europeisk samansett eining</displayName>
-				<displayName count="one">europeisk samansett eining</displayName>
-				<displayName count="other">europeiske samansette einingar</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>europeisk monetær eining</displayName>
-				<displayName count="one">europeisk monetær eining</displayName>
-				<displayName count="other">europeiske monetære einingar</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>europeisk kontoeining (XBC)</displayName>
-				<displayName count="one">europeisk kontoeining (XBC)</displayName>
-				<displayName count="other">europeiske kontoeiningar (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>europeisk kontoeining (XBD)</displayName>
-				<displayName count="one">europeisk kontoeining (XBD)</displayName>
-				<displayName count="other">europeiske kontoeiningar (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>austkaribisk dollar</displayName>
-				<displayName count="one">austkaribisk dollar</displayName>
-				<displayName count="other">austkaribiske dollar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>spesielle trekkrettar</displayName>
-				<displayName count="one">spesiell trekkrett</displayName>
-				<displayName count="other">spesielle trekkrettar</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>europeisk valutaeining</displayName>
-				<displayName count="one">europeisk valutaeining</displayName>
-				<displayName count="other">europeiske valutaeiningar</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>fransk gullfranc</displayName>
-				<displayName count="one">fransk gullfranc</displayName>
-				<displayName count="other">franske gullfranc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>fransk UIC-franc</displayName>
-				<displayName count="one">fransk UIC-franc</displayName>
-				<displayName count="other">franske UIC-franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA franc BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palladium</displayName>
-				<displayName count="one">palladium</displayName>
-				<displayName count="other">palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP franc</displayName>
-				<displayName count="one">CFP-franc</displayName>
-				<displayName count="other">CFP-franc</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-				<displayName count="one">platina</displayName>
-				<displayName count="other">platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-fond</displayName>
-				<displayName count="one">RINET-fond</displayName>
-				<displayName count="other">RINET-fond</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>testvalutakode</displayName>
-				<displayName count="one">testvalutakode</displayName>
-				<displayName count="other">testvalutakode</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>ukjend eller ugyldig valuta</displayName>
-				<displayName count="one">ukjend/ugyldig valuta</displayName>
-				<displayName count="other">ukjend eller ugyldig valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>jemenittisk dinar</displayName>
-				<displayName count="one">jemenittisk dinar</displayName>
-				<displayName count="other">jemenittiske dinarar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>jemenittisk rial</displayName>
-				<displayName count="one">jemenittisk rial</displayName>
-				<displayName count="other">jemenittiske rialar</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>jugoslavisk dinar (hard)</displayName>
-				<displayName count="one">jugoslavisk dinar (hard)</displayName>
-				<displayName count="other">jugoslaviske dinarar (hard)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>jugoslavisk noviy-dinar</displayName>
-				<displayName count="one">jugoslaviske noviy-dinarar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>jugoslavisk konvertibel dinar</displayName>
-				<displayName count="one">jugoslavisk konvertibel dinar</displayName>
-				<displayName count="other">jugoslaviske konvertible dinarar</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>sørafrikansk rand (finansiell)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>sørafrikansk rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>zambisk kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zairisk ny zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zairisk zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>zimbabwisk dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dagar</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} time</unitPattern>
-			<unitPattern count="other">{0} timar</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minutt</unitPattern>
-			<unitPattern count="other">{0} minutt</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} månad</unitPattern>
-			<unitPattern count="other">{0} månader</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekund</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} veke</unitPattern>
-			<unitPattern count="other">{0} veker</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} år</unitPattern>
-			<unitPattern count="other">{0} år</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nei:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nn_NO.xml b/airtime_mvc/library/Zend/Locale/Data/nn_NO.xml
deleted file mode 100644
index 9729f4f20..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nn_NO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nn"/>
-		<territory type="NO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/no.xml b/airtime_mvc/library/Zend/Locale/Data/no.xml
deleted file mode 100644
index 45a04abf1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/no.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="no"/>
-	</identity>
-	<alias source="nb" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nr.xml b/airtime_mvc/library/Zend/Locale/Data/nr.xml
deleted file mode 100644
index d4384740c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nr.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.28 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nr"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="nr">isiNdebele</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mat</month>
-							<month type="4">Apr</month>
-							<month type="5">Mey</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Arh</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Usi</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Janabari</month>
-							<month type="2">uFeberbari</month>
-							<month type="3">uMatjhi</month>
-							<month type="4">u-Apreli</month>
-							<month type="5">Meyi</month>
-							<month type="6">Juni</month>
-							<month type="7">Julayi</month>
-							<month type="8">Arhostosi</month>
-							<month type="9">Septemba</month>
-							<month type="10">Oktoba</month>
-							<month type="11">Usinyikhaba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mvu</day>
-							<day type="tue">Bil</day>
-							<day type="wed">Tha</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Gqi</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">uSonto</day>
-							<day type="mon">uMvulo</day>
-							<day type="tue">uLesibili</day>
-							<day type="wed">Lesithathu</day>
-							<day type="thu">uLesine</day>
-							<day type="fri">ngoLesihlanu</day>
-							<day type="sat">umGqibelo</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nr_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/nr_ZA.xml
deleted file mode 100644
index 2484d125f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nr_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nr"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/nso.xml b/airtime_mvc/library/Zend/Locale/Data/nso.xml
deleted file mode 100644
index ba730c415..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nso.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.29 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nso"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="nso">Sesotho sa Leboa</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b d e ê f-o ô p r s š t u w-y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q v z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mat</month>
-							<month type="4">Apo</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Ago</month>
-							<month type="9">Set</month>
-							<month type="10">Okt</month>
-							<month type="11">Nof</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Janaware</month>
-							<month type="2">Feberware</month>
-							<month type="3">Matšhe</month>
-							<month type="4">Aporele</month>
-							<month type="5">Mei</month>
-							<month type="6">June</month>
-							<month type="7">Julae</month>
-							<month type="8">Agostose</month>
-							<month type="9">Setemere</month>
-							<month type="10">Oktobore</month>
-							<month type="11">Nofemere</month>
-							<month type="12">Disemere</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mos</day>
-							<day type="tue">Bed</day>
-							<day type="wed">Rar</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Mok</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sontaga</day>
-							<day type="mon">Mosupalogo</day>
-							<day type="tue">Labobedi</day>
-							<day type="wed">Laboraro</day>
-							<day type="thu">Labone</day>
-							<day type="fri">Labohlano</day>
-							<day type="sat">Mokibelo</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/nso_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/nso_ZA.xml
deleted file mode 100644
index f13b852b0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/nso_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="nso"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/numberingSystems.xml b/airtime_mvc/library/Zend/Locale/Data/numberingSystems.xml
deleted file mode 100644
index 3320c370c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/numberingSystems.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-    <version number="$Revision: 1.9 $"/>
-    <generation date="$Date: 2009/05/05 23:15:57 $"/>
-    <numberingSystems>
-        <numberingSystem id="arab" type="numeric" digits="٠١٢٣٤٥٦٧٨٩"/>
-        <numberingSystem id="arabext" type="numeric" digits="Û°Û±Û²Û³Û´ÛµÛ¶Û·Û¸Û¹"/>
-        <numberingSystem id="armn" type="algorithmic" rules="armenian-upper"/>
-        <numberingSystem id="armnlow" type="algorithmic" rules="armenian-lower"/>
-        <numberingSystem id="beng" type="numeric" digits="০১২৩৪৫৬৭৮৯"/>
-        <numberingSystem id="deva" type="numeric" digits="०१२३४५६७८९"/>
-        <numberingSystem id="ethi" type="algorithmic" rules="ethiopic"/>
-        <numberingSystem id="fullwide" type="numeric" digits="�１２３４５６７８９"/>
-        <numberingSystem id="geor" type="algorithmic" rules="georgian"/>
-        <numberingSystem id="grek" type="algorithmic" rules="greek-upper"/>
-        <numberingSystem id="greklow" type="algorithmic" rules="greek-lower"/>
-        <numberingSystem id="gujr" type="numeric" digits="૦૧૨૩૪૫૬૭૮૯"/>
-        <numberingSystem id="guru" type="numeric" digits="੦੧੨੩੪੫੬੭੮੯"/>
-        <numberingSystem id="hans" type="algorithmic" rules="zh/SpelloutRules/spellout-cardinal"/>
-        <numberingSystem id="hansfin" type="algorithmic" rules="zh/SpelloutRules/spellout-cardinal-financial"/>
-        <numberingSystem id="hant" type="algorithmic" rules="zh_Hant/SpelloutRules/spellout-cardinal"/>
-        <numberingSystem id="hantfin" type="algorithmic" rules="zh_Hant/SpelloutRules/spellout-cardinal-financial"/>
-        <numberingSystem id="hebr" type="algorithmic" rules="hebrew"/>
-        <numberingSystem id="jpan" type="algorithmic" rules="ja/SpelloutRules/spellout-cardinal"/>
-        <numberingSystem id="jpanfin" type="algorithmic" rules="ja/SpelloutRules/spellout-cardinal-financial"/>
-        <numberingSystem id="khmr" type="numeric" digits="០១២៣៤៥៦៧៨៩"/>
-        <numberingSystem id="knda" type="numeric" digits="೦೧೨೩೪೫೬೭೮೯"/>
-        <numberingSystem id="laoo" type="numeric" digits="�໑໒໓໔໕໖໗໘໙"/>
-        <numberingSystem id="latn" type="numeric" digits="0123456789"/>
-        <numberingSystem id="mlym" type="numeric" digits="൦൧൨൩൪൫൬൭൮൯"/>
-        <numberingSystem id="mong" type="numeric" digits="�᠑᠒᠓᠔᠕᠖᠗᠘᠙"/>
-        <numberingSystem id="mymr" type="numeric" digits="����������"/>
-        <numberingSystem id="orya" type="numeric" digits="୦୧୨୩୪୫୬୭୮୯"/>
-        <numberingSystem id="roman" type="algorithmic" rules="roman-upper"/>
-        <numberingSystem id="romanlow" type="algorithmic" rules="roman-lower"/>
-        <numberingSystem id="taml" type="algorithmic" rules="tamil"/>
-        <numberingSystem id="telu" type="numeric" digits="౦౧౨౩౪౫౬౭౮౯"/>
-        <numberingSystem id="thai" type="numeric" digits="�๑๒๓๔๕๖๗๘๙"/>
-        <numberingSystem id="tibt" type="numeric" digits="༠༡༢༣༤༥༦༧༨༩"/>
-    </numberingSystems>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ny.xml b/airtime_mvc/library/Zend/Locale/Data/ny.xml
deleted file mode 100644
index cc462acae..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ny.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ny"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a-p r-u w ŵ y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q v x]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mal</month>
-							<month type="4">Epu</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Oga</month>
-							<month type="9">Sep</month>
-							<month type="10">Oku</month>
-							<month type="11">Nov</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januwale</month>
-							<month type="2">Febuluwale</month>
-							<month type="3">Malichi</month>
-							<month type="4">Epulo</month>
-							<month type="5">Mei</month>
-							<month type="6">Juni</month>
-							<month type="7">Julai</month>
-							<month type="8">Ogasiti</month>
-							<month type="9">Seputemba</month>
-							<month type="10">Okutoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Mul</day>
-							<day type="mon">Lem</day>
-							<day type="tue">Wir</day>
-							<day type="wed">Tat</day>
-							<day type="thu">Nai</day>
-							<day type="fri">San</day>
-							<day type="sat">Wer</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Lamulungu</day>
-							<day type="mon">Lolemba</day>
-							<day type="tue">Lachiwiri</day>
-							<day type="wed">Lachitatu</day>
-							<day type="thu">Lachinayi</day>
-							<day type="fri">Lachisanu</day>
-							<day type="sat">Loweruka</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="MWK">
-				<displayName>Malawian Kwacha</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ny_MW.xml b/airtime_mvc/library/Zend/Locale/Data/ny_MW.xml
deleted file mode 100644
index aec6f22f0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ny_MW.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="ny"/>
-		<territory type="MW"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/oc.xml b/airtime_mvc/library/Zend/Locale/Data/oc.xml
deleted file mode 100644
index 986e75b54..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/oc.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="oc"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">arabi</language>
-			<language type="art">lenga artificiala</language>
-			<language type="az">azerbaijani</language>
-			<language type="ber">berbèr</language>
-			<language type="br">breton</language>
-			<language type="ca">catalan</language>
-			<language type="cel">lenga celtica</language>
-			<language type="da">danés</language>
-			<language type="de">aleman</language>
-			<language type="el">grec</language>
-			<language type="en">anglés</language>
-			<language type="es">espanhòl</language>
-			<language type="eu">bàscol</language>
-			<language type="fr">francés</language>
-			<language type="frm">francés mejan</language>
-			<language type="grc">grec ancian</language>
-			<language type="he">ebreu</language>
-			<language type="hy">armèni</language>
-			<language type="it">italian</language>
-			<language type="la">latin</language>
-			<language type="nl_BE">flamenc</language>
-			<language type="oc">occitan</language>
-			<language type="phn">fenician</language>
-			<language type="pro">occitan ancian</language>
-			<language type="pt">portugués</language>
-			<language type="roa">lenga romança</language>
-			<language type="zh">chinés</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabi</script>
-			<script type="Armn">armèni</script>
-			<script type="Cyrl">cirilic</script>
-			<script type="Grek">grec</script>
-			<script type="Hani">chinés</script>
-			<script type="Hebr">ebreu</script>
-			<script type="Jpan">japonés</script>
-			<script type="Latn">latin</script>
-			<script type="Phnx">fenician</script>
-			<script type="Syre">siriac estranguelo</script>
-			<script type="Syrj">siriac occidental</script>
-			<script type="Syrn">siriac oriental</script>
-		</scripts>
-		<territories>
-			<territory type="002">Africa</territory>
-			<territory type="013">America centrala</territory>
-			<territory type="019">Americas</territory>
-			<territory type="053">Austràlia e Nòva Zelanda</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia centrala</territory>
-			<territory type="150">Euròpa</territory>
-			<territory type="AD">Andòrra</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua e Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armènia</territory>
-			<territory type="AO">Angòla</territory>
-			<territory type="AQ">Antartica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samòa americana</territory>
-			<territory type="AT">Àustria</territory>
-			<territory type="AU">Austràlia</territory>
-			<territory type="AZ">Azerbaijan</territory>
-			<territory type="BA">Bòsnia e Ercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgica</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bolgària</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolívia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Botan</territory>
-			<territory type="BV">Isla Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorussia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canadà</territory>
-			<territory type="CD">Còngo - Kinshasa</territory>
-			<territory type="CF">Republica Centraficana</territory>
-			<territory type="CG">Còngo - Brazzaville</territory>
-			<territory type="CH">Soïssa</territory>
-			<territory type="CI">Còsta d'Evòri</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Cameron</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colómbia</territory>
-			<territory type="CR">Còsta Rica</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cap Verd</territory>
-			<territory type="CY">Chipre</territory>
-			<territory type="CZ">Republica chèca</territory>
-			<territory type="DE">Alemanha</territory>
-			<territory type="DJ">Jiboti</territory>
-			<territory type="DK">Danemarc</territory>
-			<territory type="DO">Republica dominicana</territory>
-			<territory type="DZ">Argeria</territory>
-			<territory type="EC">Eqüator</territory>
-			<territory type="EE">Estònia</territory>
-			<territory type="EG">Egipte</territory>
-			<territory type="ER">Eritrèa</territory>
-			<territory type="ES">Espanha</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finlàndia</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FR">França</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Reiaume Unit</territory>
-			<territory type="GF">Guiana francesa</territory>
-			<territory type="GQ">Guinèa Eqüatoriala</territory>
-			<territory type="HR">Croàcia</territory>
-			<territory type="IL">Israèl</territory>
-			<territory type="IN">�ndia</territory>
-			<territory type="IT">Itàlia</territory>
-			<territory type="JP">Japon</territory>
-			<territory type="KH">Cambòja</territory>
-			<territory type="KM">Comòros</territory>
-			<territory type="KP">Corèa del Nòrd</territory>
-			<territory type="KR">Corèa del Sud</territory>
-			<territory type="KY">Islas Caiman</territory>
-			<territory type="KZ">Cazacstan</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Marròc</territory>
-			<territory type="MC">Mónegue</territory>
-			<territory type="MM">Birmania</territory>
-			<territory type="MR">Mauritània</territory>
-			<territory type="MZ">Moçambic</territory>
-			<territory type="PE">Peró</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Belau</territory>
-			<territory type="QU">Union Europèa</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="SA">Arabia Saudita</territory>
-			<territory type="SV">Lo Salvador</territory>
-			<territory type="SY">Súria</territory>
-			<territory type="TD">Chad</territory>
-			<territory type="TL">Timòr Èst</territory>
-			<territory type="UA">Ucràina</territory>
-			<territory type="US">Estats Units</territory>
-			<territory type="VE">Veneçuèla</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="ZZ">Desconegut o Region invalida</territory>
-		</territories>
-		<keys>
-			<key type="calendar">calendier</key>
-			<key type="collation">òrde alfabetic</key>
-			<key type="currency">moneda</key>
-		</keys>
-		<codePatterns>
-			<codePattern type="language">Lenga: {0}</codePattern>
-			<codePattern type="script">Escritura: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á à b-e é è f-i í ï j-o ó ò p-u ú ü v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ç é è í ï ó ò ú ü]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">genièr</month>
-							<month type="2">febrièr</month>
-							<month type="3">març</month>
-							<month type="4">abril</month>
-							<month type="5">mai</month>
-							<month type="6">junh</month>
-							<month type="7">julhet</month>
-							<month type="8">agost</month>
-							<month type="9">setembre</month>
-							<month type="10">octòbre</month>
-							<month type="11">novembre</month>
-							<month type="12">dezembre</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun">Dimenge</day>
-							<day type="mon">diluns</day>
-							<day type="tue">dimarç</day>
-							<day type="wed">dimècres</day>
-							<day type="thu">dijòus</day>
-							<day type="fri">divèndres</day>
-							<day type="sat">dissabte</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>annada</displayName>
-					</field>
-					<field type="month">
-						<displayName>mes</displayName>
-					</field>
-					<field type="week">
-						<displayName>setmana</displayName>
-					</field>
-					<field type="day">
-						<displayName>jorn</displayName>
-						<relative type="-1">ièr</relative>
-						<relative type="0">uèi</relative>
-						<relative type="1">deman</relative>
-					</field>
-					<field type="weekday">
-						<displayName>jorn de la setmana</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>segonda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zòna</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<regionFormat>Ora de: {0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} jorns</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} oras</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} minutas</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} mes</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} segondas</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} setmanas</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} annadas</unitPattern>
-		</unit>
-	</units>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/oc_FR.xml b/airtime_mvc/library/Zend/Locale/Data/oc_FR.xml
deleted file mode 100644
index 4ff3548db..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/oc_FR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="oc"/>
-		<territory type="FR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/om.xml b/airtime_mvc/library/Zend/Locale/Data/om.xml
deleted file mode 100644
index ee68950fd..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/om.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.63 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="om"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikoota</language>
-			<language type="am">Afaan Sidaamaa</language>
-			<language type="ar">Arabiffaa</language>
-			<language type="az">Afaan Azerbaijani</language>
-			<language type="be">Afaan Belarusia</language>
-			<language type="bg">Afaan Bulgariya</language>
-			<language type="bh">Afaan Bihari</language>
-			<language type="bn">Afaan Baangladeshi</language>
-			<language type="bs">Afaan Bosniyaa</language>
-			<language type="ca">Afaan Katalaa</language>
-			<language type="cs">Afaan Czech</language>
-			<language type="cy">Welishiffaa</language>
-			<language type="da">Afaan Deenmaark</language>
-			<language type="de">Afaan Jarmanii</language>
-			<language type="el">Afaan Giriiki</language>
-			<language type="en">Ingliffa</language>
-			<language type="eo">Afaan Esperantoo</language>
-			<language type="es">Afaan Ispeen</language>
-			<language type="et">Afaan Istooniya</language>
-			<language type="eu">Afaan Baskuu</language>
-			<language type="fa">Afaan Persia</language>
-			<language type="fi">Afaan Fiilaandi</language>
-			<language type="fil">Afaan Filippinii</language>
-			<language type="fo">Afaan Faroese</language>
-			<language type="fr">Afaan Faransaayii</language>
-			<language type="fy">Afaan Firisiyaani</language>
-			<language type="ga">Afaan Ayirishii</language>
-			<language type="gd">Scots Gaelic</language>
-			<language type="gl">Afaan Galishii</language>
-			<language type="gn">Afaan Guarani</language>
-			<language type="gu">Afaan Gujarati</language>
-			<language type="he">Afaan Hebrew</language>
-			<language type="hi">Afaan Hindii</language>
-			<language type="hr">Afaan Croatian</language>
-			<language type="hu">Afaan Hangaari</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Afaan Indoneziya</language>
-			<language type="is">Ayiislandiffaa</language>
-			<language type="it">Afaan Xaaliyaani</language>
-			<language type="ja">Afaan Japanii</language>
-			<language type="jv">Afaan Java</language>
-			<language type="ka">Afaan Georgian</language>
-			<language type="kn">Afaan Kannada</language>
-			<language type="ko">Afaan Korea</language>
-			<language type="la">Afaan Laatini</language>
-			<language type="lt">Afaan Liituniyaa</language>
-			<language type="lv">Afaan Lativiyaa</language>
-			<language type="mk">Afaan Macedooniyaa</language>
-			<language type="ml">Malayaalamiffaa</language>
-			<language type="mr">Afaan Maratii</language>
-			<language type="ms">Malaayiffaa</language>
-			<language type="mt">Afaan Maltesii</language>
-			<language type="ne">Afaan Nepalii</language>
-			<language type="nl">Afaan Dachii</language>
-			<language type="nn">Afaan Norwegian</language>
-			<language type="no">Afaan Norweyii</language>
-			<language type="oc">Afaan Occit</language>
-			<language type="om">Oromoo</language>
-			<language type="pa">Afaan Punjabii</language>
-			<language type="pl">Afaan Polandii</language>
-			<language type="pt">Afaan Porchugaal</language>
-			<language type="pt_BR">Afaan Portugali (Braazil)</language>
-			<language type="pt_PT">Afaan Protuguese</language>
-			<language type="ro">Afaan Romaniyaa</language>
-			<language type="ru">Afaan Rushiyaa</language>
-			<language type="si">Afaan Sinhalese</language>
-			<language type="sk">Afaan Slovak</language>
-			<language type="sl">Afaan Islovaniyaa</language>
-			<language type="sq">Afaan Albaniyaa</language>
-			<language type="sr">Afaan Serbiya</language>
-			<language type="su">Afaan Sudaanii</language>
-			<language type="sv">Afaan Suwidiin</language>
-			<language type="sw">Suwahilii</language>
-			<language type="ta">Afaan Tamilii</language>
-			<language type="te">Afaan Telugu</language>
-			<language type="th">Afaan Tayii</language>
-			<language type="ti">Afaan Tigiree</language>
-			<language type="tk">Lammii Turkii</language>
-			<language type="tlh">Afaan Kilingon</language>
-			<language type="tr">Afaan Turkii</language>
-			<language type="uk">Afaan Ukreenii</language>
-			<language type="ur">Afaan Urdu</language>
-			<language type="uz">Afaan Uzbek</language>
-			<language type="vi">Afaan Veetinam</language>
-			<language type="xh">Afaan Xhosa</language>
-			<language type="zh">Chinese</language>
-			<language type="zu">Afaan Zuulu</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Latin</script>
-		</scripts>
-		<territories>
-			<territory type="BR">Brazil</territory>
-			<territory type="CN">China</territory>
-			<territory type="DE">Germany</territory>
-			<territory type="ET">Itoophiyaa</territory>
-			<territory type="FR">France</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="IN">India</territory>
-			<territory type="IT">Italy</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Keeniyaa</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="US">United States</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ama</month>
-							<month type="2">Gur</month>
-							<month type="3">Bit</month>
-							<month type="4">Elb</month>
-							<month type="5">Cam</month>
-							<month type="6">Wax</month>
-							<month type="7">Ado</month>
-							<month type="8">Hag</month>
-							<month type="9">Ful</month>
-							<month type="10">Onk</month>
-							<month type="11">Sad</month>
-							<month type="12">Mud</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Amajjii</month>
-							<month type="2">Guraandhala</month>
-							<month type="3">Bitooteessa</month>
-							<month type="4">Elba</month>
-							<month type="5">Caamsa</month>
-							<month type="6">Waxabajjii</month>
-							<month type="7">Adooleessa</month>
-							<month type="8">Hagayya</month>
-							<month type="9">Fuulbana</month>
-							<month type="10">Onkololeessa</month>
-							<month type="11">Sadaasa</month>
-							<month type="12">Muddee</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Dil</day>
-							<day type="mon">Wix</day>
-							<day type="tue">Qib</day>
-							<day type="wed">Rob</day>
-							<day type="thu">Kam</day>
-							<day type="fri">Jim</day>
-							<day type="sat">San</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Dilbata</day>
-							<day type="mon">Wiixata</day>
-							<day type="tue">Qibxata</day>
-							<day type="wed">Roobii</day>
-							<day type="thu">Kamiisa</day>
-							<day type="fri">Jimaata</day>
-							<day type="sat">Sanbata</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">W</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>WD</am>
-				<pm>WB</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">KD</era>
-						<era type="1">KB</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Chinese Yuan Renminbi</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Itoophiyaa Birrii</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>British Pound Sterling</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indian Rupee</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanese Yen</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russian Ruble</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US Dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/om_ET.xml b/airtime_mvc/library/Zend/Locale/Data/om_ET.xml
deleted file mode 100644
index 72557f8bb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/om_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="om"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/om_KE.xml b/airtime_mvc/library/Zend/Locale/Data/om_KE.xml
deleted file mode 100644
index c08795674..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/om_KE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="om"/>
-		<territory type="KE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/or.xml b/airtime_mvc/library/Zend/Locale/Data/or.xml
deleted file mode 100644
index b9dbe4604..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/or.xml
+++ /dev/null
@@ -1,1141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.59 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="or"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">ଅଫାର�</language>
-			<language type="ab">ଆବ�ଖାଜିଆନ�</language>
-			<language type="ace">ଆଚାଇନୀଜ�</language>
-			<language type="ach">ଆକୋଲି</language>
-			<language type="ada">ଆଦାଙ�ଗେମ�</language>
-			<language type="ady">ଅଦ�ୟଘେ</language>
-			<language type="ae">ଅବେସ�ତନ</language>
-			<language type="af">ଆଫ�ରିକାନସ�</language>
-			<language type="afa">ଆଫ�ରୋ �ସିଆଟିକ� ଭାଷା</language>
-			<language type="afh">ଆଫ�ରିହିଲି</language>
-			<language type="ain">ଆଇନ�</language>
-			<language type="ak">ଅକନ�</language>
-			<language type="akk">ଆକାଡିଆନ�</language>
-			<language type="ale">ଆଲେଇଟ�</language>
-			<language type="alg">�ଲ�ଗୋନକ�ବିନା ଭାଷା</language>
-			<language type="alt">ଦକ�ଷିଣ ଆଲ�ଟାଇ</language>
-			<language type="am">ଆମହାରକି</language>
-			<language type="an">ଆର�ଗୋନୀ</language>
-			<language type="ang">ପ�ର�ଣା ଇ�ରାଜୀ</language>
-			<language type="anp">ଅ�ଗୀକା</language>
-			<language type="apa">ଆପାଚୀ ଭାଷା</language>
-			<language type="ar">ଆରବିକ�</language>
-			<language type="arc">ଆରାମାଇକ�</language>
-			<language type="arn">ଆରାଉକାନିଆନ�</language>
-			<language type="arp">ଆରାପାହୋ</language>
-			<language type="art">କୃତ�ରିମ ଭାଷା</language>
-			<language type="arw">ଆରୱକ</language>
-			<language type="as">ଆସାମୀ</language>
-			<language type="ast">ଆଷ�ଟ�ରିଆନ�</language>
-			<language type="ath">ଆଥପାସ�କାନ� ଭାଷା</language>
-			<language type="aus">ଅଷ�ଟ�ରେଲିଆନ� ଭାଷା</language>
-			<language type="av">ଆଭାରିକ�</language>
-			<language type="awa">ଆୱାଧି</language>
-			<language type="ay">ଆୟମାରା</language>
-			<language type="az">ଆଜେରବାଇଜାନି</language>
-			<language type="ba">ବଶଖିର�</language>
-			<language type="bad">ବାନ�ଦା</language>
-			<language type="bai">ବମିଲେକେ ଭାଷା</language>
-			<language type="bal">ବାଲ�ଚି</language>
-			<language type="ban">ବାଲିନୀଜ�</language>
-			<language type="bas">ବାସା</language>
-			<language type="bat">ବାଲାଟିକ� ଭାଷା</language>
-			<language type="be">ବେଲାର�ଷିଆନ�</language>
-			<language type="bej">ବେଜା</language>
-			<language type="bem">ବେମ�ବା</language>
-			<language type="ber">ବେରବର�</language>
-			<language type="bg">ବ�ଲଗେରିଆନ�</language>
-			<language type="bh">ବିହାରୀ</language>
-			<language type="bho">ଭୋଜପ�ରୀ</language>
-			<language type="bi">ବିସଲାମା</language>
-			<language type="bik">ବିକୋଲ�</language>
-			<language type="bin">ବିନି</language>
-			<language type="bla">ବିକ�ସିକା</language>
-			<language type="bm">ବାମ�ବାରା</language>
-			<language type="bn">ବଙ�ଗାଳୀ</language>
-			<language type="bnt">ବାଣ�ଟ�</language>
-			<language type="bo">ତିବେତାନ�</language>
-			<language type="br">ବ�ରେଟନ�</language>
-			<language type="bra">ବ�ରାଜ�</language>
-			<language type="bs">କାଟଲାନ�</language>
-			<language type="btk">ବାଟାକ�</language>
-			<language type="bua">ବ�ରିଆଟ�</language>
-			<language type="bug">ବ�ଗୀନୀଜ�</language>
-			<language type="byn">ବ�ଲିନ�</language>
-			<language type="ca">କାଟାଲାନ�</language>
-			<language type="cad">କାଡୋ</language>
-			<language type="cai">ମଧ�ୟ ଆମେରିକା ଭାରତୀୟ ଭାଷା</language>
-			<language type="car">କାରିବ�</language>
-			<language type="cau">କାକୋଶୀ ଭାଷା</language>
-			<language type="cch">ଆତ�ସମ�</language>
-			<language type="ce">ଚେଚନ�</language>
-			<language type="ceb">ସୀବ�ଆନୋ</language>
-			<language type="cel">କେଲ�ଟ ଭାଷା</language>
-			<language type="ch">ଚାମୋରୋ</language>
-			<language type="chb">ଚିବ�ଚା</language>
-			<language type="chg">ଛଗତାଇ</language>
-			<language type="chk">ଚ�କୀସେ</language>
-			<language type="chm">ମାରୀ</language>
-			<language type="chn">ଚିନ�କ� ଜାରଗା�ନ�</language>
-			<language type="cho">ଚୋଟୱା</language>
-			<language type="chp">ଚିପେୱାନ�</language>
-			<language type="chr">ଚେରୋକୀ</language>
-			<language type="chy">ଚେଚେନା</language>
-			<language type="cmc">ଚାମିକ� ଭାଷା</language>
-			<language type="co">କୋର�ସିକାନ�</language>
-			<language type="cop">କପ�ଟିକ�</language>
-			<language type="cpe">ଇ�ରାଜୀ ଆଧାରିତ କ�ରେଓଲ� କିମ�ବା ପିଜିନ�</language>
-			<language type="cpf">ଫ�ରେଞ�ଚ ଆଧାରିତ କ�ରେଓଲ� କିମ�ବା ପିଜିନ�</language>
-			<language type="cpp">ପର�ତ�ତ�ଗ�ରୀଜ� ଆଧାରିତ କ�ରେଓଲ� କିମ�ବା ପିଜିନ�</language>
-			<language type="cr">କ�ରୀ</language>
-			<language type="crh">କ�ରୀମିନ� ତ�ର�କୀସ�</language>
-			<language type="crp">କ�ରେଓଲ� କିମ�ବା ପିଜିନ�</language>
-			<language type="cs">ଚେକ�</language>
-			<language type="csb">କାଶ�ବିଆନ�</language>
-			<language type="cu">ଚର�ଚ�ଚ ସ�ଲାଭିକ�</language>
-			<language type="cus">କ�ଶିତିକ� ଭାଷା</language>
-			<language type="cv">ଚ�ଭାଶ�</language>
-			<language type="cy">ୱେଲ�ସ</language>
-			<language type="da">ଡାନ�ନିସ�</language>
-			<language type="dak">ଡାକୋଟା</language>
-			<language type="dar">ଡାରାଗ�ୱା</language>
-			<language type="day">ଡାୟକ�</language>
-			<language type="de">ଜର�ମାନ�</language>
-			<language type="de_AT">ଅଷ�ଟ�ରିଆନ� ଜର�ମାନ</language>
-			<language type="de_CH">ସ�ବିସ� ହାଇ ଜର�ମାନ�</language>
-			<language type="del">ଡେଲାୱେର�</language>
-			<language type="den">ସ�ଲେଭ�</language>
-			<language type="dgr">ଡୋଗ�ରିବ�</language>
-			<language type="din">ଦିଙ�କା</language>
-			<language type="doi">ଡୋଗ�ରୀ</language>
-			<language type="dra">ଦ�ରାବିଡିଆନ� ଭାଷା</language>
-			<language type="dsb">ନିଚଳା ସର�ବିଆନ�</language>
-			<language type="dua">ଡ�ଆନା</language>
-			<language type="dum">ମଧ�ୟ ପର�ତ�ତ�ଗାଲୀ</language>
-			<language type="dv">ଡିଭେହୀ</language>
-			<language type="dyu">ଡ�ଆଲା</language>
-			<language type="dz">ଭୂଟାନୀ</language>
-			<language type="ee">ଇୱେ</language>
-			<language type="efi">�ଫିକ�</language>
-			<language type="egy">ପ�ରାଚୀନ� ମିଶିରି</language>
-			<language type="eka">�କାଜ�କ�</language>
-			<language type="el">ଗ�ରୀକ�</language>
-			<language type="elx">�ଲାମାଇଟ�</language>
-			<language type="en">ଇଂରାଜୀ</language>
-			<language type="en_AU">ଅଷ�ଟ�ରେଲିଆନ� ଇ�ରାଜୀ</language>
-			<language type="en_CA">କାନାଡିଆନ� ଇ�ରାଜୀ</language>
-			<language type="en_GB">ବ�ରିଟିଶ� ଇ�ରାଜୀ</language>
-			<language type="en_US">ୟ�.�ସ�. ଇ�ରାଜୀ</language>
-			<language type="enm">ମଧ�ୟ ଇ�ରାଜୀ</language>
-			<language type="eo">�ସ�ପାରେଣ�ଟୋ</language>
-			<language type="es">ସ�ପାନିସ�</language>
-			<language type="es_419">ଲାଟିନ� ଆମେରିକାନ� ସ�ପାନିଶ�</language>
-			<language type="es_ES">ଲେବେରିଆନ� ସ�ପାନିଶ�</language>
-			<language type="et">�ସ�ତୋନିଆନ�</language>
-			<language type="eu">ବାସ�କ�ୱି</language>
-			<language type="ewo">ଇୱୋଣ�ଡୋ</language>
-			<language type="fa">ପର�ସିଆନ�</language>
-			<language type="fan">ଫାଙ�ଗ</language>
-			<language type="fat">ଫାଣ�ଟି</language>
-			<language type="ff">ଫ�ଲାହ</language>
-			<language type="fi">ଫିନ�ନିସ�</language>
-			<language type="fil">ଫିଲିପିନୋ</language>
-			<language type="fiu">ଫାଣ�ଟିଫିନ�ନୋ-ଉଗ�ରୀଆନ� ଭାଷା</language>
-			<language type="fj">ଫିଜି</language>
-			<language type="fo">ଫାରୋ�ସେ</language>
-			<language type="fon">ଫନ�</language>
-			<language type="fr">ଫ�ରେଞ�ଚ</language>
-			<language type="fr_CA">କାନାଡିଆନ� ଫ�ରେଞ�ଚ</language>
-			<language type="fr_CH">ସ�ବିସ� ଫ�ରେଞ�ଚ�</language>
-			<language type="frm">ମଧ�ୟ ଫ�ରେଞ�ଚ</language>
-			<language type="fro">ପ�ର�ଣା ଫ�ରେଞ�ଚ</language>
-			<language type="frr">ଉତ�ତର ଫ�ରିସିୟାନ�</language>
-			<language type="frs">ପୂର�ବ ଫ�ରିସିୟାନ�</language>
-			<language type="fur">ଫ�ରିୟ�ଲୀୟାନ�</language>
-			<language type="fy">ପଶ�ଚିମ ଫ�ରିସିୟନ�</language>
-			<language type="ga">ଇରିସ�</language>
-			<language type="gaa">ଗା</language>
-			<language type="gay">ଗାୟୋ</language>
-			<language type="gba">ଗବାୟା</language>
-			<language type="gd">ସ�କଟିସ� ଗା�ଲିକ�</language>
-			<language type="gem">ଜର�ମାନିକ� ଭାଷା</language>
-			<language type="gez">ଗୀଜ�</language>
-			<language type="gil">ଜିବ�ରାଟୀଜ�</language>
-			<language type="gl">ଗାଲସିଆନ�</language>
-			<language type="gmh">ମିଡିଲ� ହାଇ ଜର�ମାନ�</language>
-			<language type="gn">ଗ�ଆରାନୀ</language>
-			<language type="goh">ପ�ର�ଣା ହାଇ ଜର�ମାନ�</language>
-			<language type="gon">ଗୋଣ�ଡି</language>
-			<language type="gor">ଗୋରୋଣ�ଟାଲୋ</language>
-			<language type="got">ଗୋଥିକ�</language>
-			<language type="grb">ଗ�ରେବୋ</language>
-			<language type="grc">ପ�ରାଚୀନ� ୟ�ନାନୀ</language>
-			<language type="gsw">ସ�ବିସ� ଜର�ମାନ�</language>
-			<language type="gu">ଗ�ଜ�ରାଟୀ</language>
-			<language type="gv">ମା�କ�ସ</language>
-			<language type="gwi">ସ�ବିଚ� ଇନ�</language>
-			<language type="ha">ହୌସା</language>
-			<language type="hai">ହାଇଡା</language>
-			<language type="haw">ହାୱାଇନ�</language>
-			<language type="he">ହେବ�ର�ୟ�</language>
-			<language type="hi">ହିନ�ଦୀ</language>
-			<language type="hil">ହିଲିଗୈନନ�</language>
-			<language type="him">ହିମାଚଳୀ</language>
-			<language type="hit">ହିତୀତେ</language>
-			<language type="hmn">ହ�ଙ�ଗ</language>
-			<language type="ho">ହିରି ମୋଟ�</language>
-			<language type="hr">କ�ରୋଆଟିଆନ�</language>
-			<language type="hsb">ଉପର ସର�ବିଆନ�</language>
-			<language type="ht">ହୈତାୟିନ�</language>
-			<language type="hu">ହଙ�ଗେରିଆନ�</language>
-			<language type="hup">ହ�ପା</language>
-			<language type="hy">ଆର�ମେନିଆନ�</language>
-			<language type="hz">ହେରେରୋ</language>
-			<language type="ia">ଇର�ଣ�ଟଲିଙ�ଗ�ଆ</language>
-			<language type="iba">ଇବାନ�</language>
-			<language type="id">ଇଣ�ଡୋନେସିଆନ�</language>
-			<language type="ie">ଇର�ଣ�ଟରଲିଙ�ଗ�ଇ</language>
-			<language type="ig">ଇଗ�ବୋ</language>
-			<language type="ii">ସିଚ�ଆନ� ୟୀ</language>
-			<language type="ijo">ଇଜୋ</language>
-			<language type="ik">ଇନ�ପିୟାକ�</language>
-			<language type="ilo">ଇଲୋକୋ</language>
-			<language type="inc">ଇଣ�ଡିକ� ଭାଷା</language>
-			<language type="ine">ଇଣ�ଡୋ-ୟ�ରୋପୀୟ ଭାଷା</language>
-			<language type="inh">ଇ�ଙ�ଗ�ଶ�</language>
-			<language type="io">ଇଡୋ</language>
-			<language type="ira">ଇରାନୀ ଭାଷା</language>
-			<language type="iro">ଇରୋକ�ୱୋୟାନ� ଭାଷା</language>
-			<language type="is">ଆଇସଲାଣ�ଡିକ�</language>
-			<language type="it">ଇଟାଲିଆନ�</language>
-			<language type="iu">ଇନକୀଟ�ତ�</language>
-			<language type="ja">ଜାପାନୀଜ�</language>
-			<language type="jbo">ଲୋଜବାନ�</language>
-			<language type="jpr">ଜ�ଡେଓ-ପର�ସିଆନ�</language>
-			<language type="jrb">ଜ�ଡେଓ-ଆରବୀକ�</language>
-			<language type="jv">ଜାଭାନୀଜ�</language>
-			<language type="ka">ଜର�ଜିଆନ�</language>
-			<language type="kaa">କାରା-କଲ�ପକ�</language>
-			<language type="kab">କବାଇଲ�</language>
-			<language type="kac">କଚିନ�</language>
-			<language type="kaj">ଜ�ଜ�</language>
-			<language type="kam">କମ�ବା</language>
-			<language type="kar">କାରେନ�</language>
-			<language type="kaw">କାୱି</language>
-			<language type="kbd">କାବାର�ଡିଆନ�</language>
-			<language type="kcg">ତ�ୟାପ�</language>
-			<language type="kfo">କୋରୋ</language>
-			<language type="kg">କଙ�ଗୋ</language>
-			<language type="kha">ଖାସୀ</language>
-			<language type="khi">ଖୋସୀୟାନ� ଭାଷା</language>
-			<language type="kho">ଖୋତାନୀଜ�</language>
-			<language type="ki">କୀକ�ୟ�</language>
-			<language type="kj">କ�ୱାନ�ୟାମ�</language>
-			<language type="kk">କାଜାକ�</language>
-			<language type="kl">ଗ�ରୀନଲାଣ�ଡିକ�</language>
-			<language type="km">ଖ�ମେର�</language>
-			<language type="kmb">କିମ�ବ�ଣ�ଡ�</language>
-			<language type="kn">କନ�ନଡ</language>
-			<language type="ko">କୋରିଆନ�</language>
-			<language type="kok">କୋନକାନୀ</language>
-			<language type="kos">କୋସରୈନ�</language>
-			<language type="kpe">କୈପେଲେ</language>
-			<language type="kr">କନ�ରୀ</language>
-			<language type="krc">କରାଚୟ-ବଲ�କାର</language>
-			<language type="krl">କାରେଲିୟାନ�</language>
-			<language type="kro">କ�ର�</language>
-			<language type="kru">କ�ର�ଖ</language>
-			<language type="ks">କାଶ�ମିରୀ</language>
-			<language type="ku">କ�ର�ଦ�ଦିଶ�</language>
-			<language type="kum">କ�ମୀକ�</language>
-			<language type="kut">କ�ତେନାଉ</language>
-			<language type="kv">କୋମି</language>
-			<language type="kw">କୋର�ନିସ�</language>
-			<language type="ky">କିରଗିଜ�</language>
-			<language type="la">ଲାଟିନ�</language>
-			<language type="lad">ଲାଦିନୋ</language>
-			<language type="lah">ଲାହାଣ�ଡା</language>
-			<language type="lam">ଲାମ�ବା</language>
-			<language type="lb">ଲକ�ସେମବର�ଗିସ�</language>
-			<language type="lez">ଲେଜଗିୟାନ�</language>
-			<language type="lg">ଗନ�ଦା</language>
-			<language type="li">ଲିମ�ବ�ର�ଗିସ�</language>
-			<language type="ln">ଲିଙ�ଗାଲା</language>
-			<language type="lo">ଲାଓ</language>
-			<language type="lol">ମଙ�ଗୋ</language>
-			<language type="loz">ଲୋଜି</language>
-			<language type="lt">ଲିଥ�ଆନିଆନ�</language>
-			<language type="lu">ଲ�ୟ�ବା-କାଟାଙ�ଗା</language>
-			<language type="lua">ଲ�ବା-ଲ�ଲ�ଆ</language>
-			<language type="lui">ଲ�ଇସେନୋ</language>
-			<language type="lun">ଲ�ଣ�ଡା</language>
-			<language type="luo">ଲ�ଓ</language>
-			<language type="lus">ଲ�ସାଉ</language>
-			<language type="lv">ଲାଟଭିଆନ�</language>
-			<language type="mad">ମାଦ�ରୀସ�</language>
-			<language type="mag">ମାଗାହୀ</language>
-			<language type="mai">ମୈଥିଳୀ</language>
-			<language type="mak">ମକାସର�</language>
-			<language type="man">ମାଣ�ଡିଙ�ଗୋ</language>
-			<language type="map">ଅଷ�ଟ�ରୋନେସିଆନ�</language>
-			<language type="mas">ମାସାଇ</language>
-			<language type="mdf">ମୋକ�ଷ</language>
-			<language type="mdr">ମନ�ଦାର</language>
-			<language type="men">ମେଣ�ଡେ</language>
-			<language type="mg">ମାଲାଗାସୀ</language>
-			<language type="mga">ମଧ�ୟ ଇରିଶ�</language>
-			<language type="mh">ମାର�ଶାଲୀଜ�</language>
-			<language type="mi">ମାଓରୀ</language>
-			<language type="mic">ମିକମୌକ�</language>
-			<language type="min">ମିନାଙ�ଗାବାଉ</language>
-			<language type="mis">ବିବିଧ ଭାଷା</language>
-			<language type="mk">ମାକଡୋନିଆନ�</language>
-			<language type="mkh">ମ�ନ�-ଖ�ମେର� ଭାଷା</language>
-			<language type="ml">ମାଲାୟଲମ�</language>
-			<language type="mn">ମଙ�ଗୋଲିଆନ�</language>
-			<language type="mnc">ମାଞ�ଚ�</language>
-			<language type="mni">ମଣିପ�ରୀ</language>
-			<language type="mno">ମନୋବୋ ଭାଷା</language>
-			<language type="mo">ମୋଲଡୋଭିଆନ�</language>
-			<language type="moh">ମୋହୌକ</language>
-			<language type="mos">ମୋସି</language>
-			<language type="mr">ମରାଠୀ</language>
-			<language type="ms">ମାଲୟ</language>
-			<language type="mt">ମାଲଟୀଜ�</language>
-			<language type="mul">ବିବିଧ ଭାଷାମାନ</language>
-			<language type="mun">ମ�ଣ�ଡା ଭାଷା</language>
-			<language type="mus">କ�ରୀକ�</language>
-			<language type="mwl">ମିରାଣ�ଡିଜ�</language>
-			<language type="mwr">ମାରୱାରୀ</language>
-			<language type="my">ବର�ମୀଜ�</language>
-			<language type="myn">ମାୟା ଭାଷା</language>
-			<language type="myv">�ର�ଜୟା</language>
-			<language type="na">ନାଉର�</language>
-			<language type="nah">ନାଉହାତି</language>
-			<language type="nai">ଉତ�ତର ଆମେରିକା ଇଣ�ଡିଆନ� ଭାଷା</language>
-			<language type="nap">ନୀପୋଲିଟାନ�</language>
-			<language type="nb">ନରୱେଜିଆନ� ବୋକମଲ�</language>
-			<language type="nd">ଉତ�ତର ନେଡବେଲେ</language>
-			<language type="nds">ଲୋ ଜର�ମାନ�</language>
-			<language type="ne">ନେପାଳୀ</language>
-			<language type="new">ନେୱାରୀ</language>
-			<language type="ng">ଡୋଙ�ଗା</language>
-			<language type="nia">ନୀୟାସ�</language>
-			<language type="nic">ନାଇଜର�-କୋର�ଡୋଫୌନିୟାନ� ଭାଷା</language>
-			<language type="niu">ନିୟ�ଆନ�</language>
-			<language type="nl">ଡଚ�</language>
-			<language type="nl_BE">ଫ�ଲେମିଶ�</language>
-			<language type="nn">ନରୱେଜିଆନ� ନିୟୋର�ସ�କ</language>
-			<language type="no">ନରୱେଜିଆନ�</language>
-			<language type="nog">ନୋଗାଇ</language>
-			<language type="non">ପ�ର�ଣା ନର�ସ</language>
-			<language type="nqo">�ନ�କୋ</language>
-			<language type="nr">ଦକ�ଷିଣ ନେଡବେଲେ</language>
-			<language type="nso">ଉତ�ତରୀ ସୋଥୋ</language>
-			<language type="nub">ନ�ୟ�ବିଆନ� ଭାଷା</language>
-			<language type="nv">ନାଭାଜୋ</language>
-			<language type="nwc">ପାରମ�ପରିକ ନେୱାରୀ</language>
-			<language type="ny">ନିୟାଞ�ଜ</language>
-			<language type="nym">ନ�ୟାମୱେଜୀ</language>
-			<language type="nyn">ନ�ୟାନକୋଲ�</language>
-			<language type="nyo">ନ�ୟାରୋ</language>
-			<language type="nzi">ଞ�ଜିମା</language>
-			<language type="oc">ଓସିଟାନ�</language>
-			<language type="oj">ଓଜିୱା</language>
-			<language type="om">ଓରୋମୋ</language>
-			<language type="or">ଓଡ଼ିଆ</language>
-			<language type="os">ଓସେଟିକ�</language>
-			<language type="osa">ୱୌସେଜ�</language>
-			<language type="ota">ଓଟ�ଟୋମନ� ତ�ର�କିସ�</language>
-			<language type="oto">ଓଟ�ଟୋମିଆନ� ଭାଷା</language>
-			<language type="pa">ପଞ�ଜାବୀ</language>
-			<language type="paa">ପାପ�ଆନ� ଭାଷା</language>
-			<language type="pag">ପାଙ�ଗାସିନିଆନ�</language>
-			<language type="pal">ପାହ�ଲାଭି</language>
-			<language type="pam">ପାମ�ପାଙ�ଗା</language>
-			<language type="pap">ପାପିୟାମିଣ�ଟୋ</language>
-			<language type="pau">ପାଲାଉଆନ�</language>
-			<language type="peo">ପ�ର�ଣା ପର�ସିଆନ�</language>
-			<language type="phi">ଫିଲିପାଇନ� ଭାଷା</language>
-			<language type="phn">ଫୋନେସିଆନ�</language>
-			<language type="pi">ପାଲି</language>
-			<language type="pl">ପୋଲିଶ�</language>
-			<language type="pon">ପୋହପି�ନ�</language>
-			<language type="pra">ପ�ରାକୃତ ଭାଷା</language>
-			<language type="pro">ପ�ର�ଣା ପ�ରେଭେନେସିଆଲ�</language>
-			<language type="ps">ପାସ�ତୋ</language>
-			<language type="pt">ପର�ତ�ତ�ଗ�ରୀଜ�</language>
-			<language type="pt_BR">ବ�ରାଜିଲିଆନ� ପର�ତ�ତ�ଗୀଜ�</language>
-			<language type="pt_PT">ଲେବେରିଆନ� ପର�ତ�ତ�ଗୀଜ�</language>
-			<language type="qu">କ�ୱେଚ�ଆ</language>
-			<language type="raj">ରାଜସ�ଥାନୀ</language>
-			<language type="rap">ରାପାନ�ଇ</language>
-			<language type="rar">ରାରୋତୋଙ�ଗନ�</language>
-			<language type="rm">ରେହେଟୋ-ରୋମାନ�ସ</language>
-			<language type="rn">ର�ଣ�ଡି</language>
-			<language type="ro">ରୋମାନିଆନ�</language>
-			<language type="roa">ରୋମାନ�ସ ଭାଷା</language>
-			<language type="rom">ରୋମାନି</language>
-			<language type="root">ମୂଳ</language>
-			<language type="ru">ରଷିଆନ�</language>
-			<language type="rup">ଆରୋମାନିଆନ�</language>
-			<language type="rw">କିନ�ୟାରୱାଣ�ଡା</language>
-			<language type="sa">ସଂସ�କୃତ</language>
-			<language type="sad">ସଣ�ଡାୱେ</language>
-			<language type="sah">ୟାକ�ଟ�</language>
-			<language type="sai">ଦକ�ଷିଣ ଆମେରିକା ଇଣ�ଡିଆନ� ଭାଷା</language>
-			<language type="sal">ଶଲୀସନ� ଭାଷା</language>
-			<language type="sam">ସାମୌରିଟନ� ଆରମାଇକ�</language>
-			<language type="sas">ସାସାକ�</language>
-			<language type="sat">ସାନ�ତାଳି</language>
-			<language type="sc">ସର�ଦିନିଆନ�</language>
-			<language type="scn">ସିଶିଲିଆନ�</language>
-			<language type="sco">ସ�କଟସ�</language>
-			<language type="sd">ସିନ�ଧୀ</language>
-			<language type="se">ଉତ�ତର ସାମି</language>
-			<language type="sel">ସେଲ�କପ�</language>
-			<language type="sem">ସେମିଟିକ� ଭାଷା</language>
-			<language type="sg">ସାଙ�ଗୋ</language>
-			<language type="sga">ପ�ର�ଣା ଇରିଶ�</language>
-			<language type="sgn">ସାଙ�କେତିକ ଭାଷା</language>
-			<language type="sh">ସର�ବୋ-କ�ରୋଆଟିଆନ�</language>
-			<language type="shn">ଶାନ�</language>
-			<language type="si">ସିଂହଳ</language>
-			<language type="sid">ସିଦାମୋ</language>
-			<language type="sio">ସିଓନ� ଭାଷା</language>
-			<language type="sit">ସିନୋ-ତିବ�ବେତାନ� ଭାଷା</language>
-			<language type="sk">ସ�ଲୋଭାକ�</language>
-			<language type="sl">ସ�ଲୋଭେନିଆନ�</language>
-			<language type="sla">ସାଲ�ଭିକ� ଭାଷା</language>
-			<language type="sm">ସାମୋଆନ�</language>
-			<language type="sma">ଦକ�ଷିଣ ସାମି</language>
-			<language type="smi">ସାମି ଭାଷା</language>
-			<language type="smj">ଲ�ଲେ ସାମି</language>
-			<language type="smn">ଇନାରୀ ସାମି</language>
-			<language type="sms">ସ�କୋଲ�ଟ ସାମୀ</language>
-			<language type="sn">ଶୋନା</language>
-			<language type="snk">ସୋନିଙ�କେ</language>
-			<language type="so">ସୋମାଲିଆ</language>
-			<language type="sog">ସୋଗଡି�ନ�</language>
-			<language type="son">ସୋଙ�ଘାଇ</language>
-			<language type="sq">ଆଲବାନିଆନ�</language>
-			<language type="sr">ସର�ବିଆନ�</language>
-			<language type="srn">ଶାରାନା ଟୋଙ�ଗୋ</language>
-			<language type="srr">ଶେରେର�</language>
-			<language type="ss">ସ�ବାତୀ</language>
-			<language type="ssa">ନୀଲ� ସାହାରି ଭାଷା</language>
-			<language type="st">ସେସୋଥୋ</language>
-			<language type="su">ସ�ଦାନୀଜ�</language>
-			<language type="suk">ସ�କ�ମା</language>
-			<language type="sus">ଶ�ଶ�</language>
-			<language type="sux">ସ�ମେରିଆନ�</language>
-			<language type="sv">ସ�ୱେଡିସ�</language>
-			<language type="sw">ସ�ୱାହିଲ�</language>
-			<language type="syc">କ�ଲାସିକାଲ� ସିରିକ�</language>
-			<language type="syr">ସିରିକ�</language>
-			<language type="ta">ତାମିଲ�</language>
-			<language type="tai">ତାଇ ଭାଷା</language>
-			<language type="te">ତେଲ�ଗ�</language>
-			<language type="tem">ତିମନେ</language>
-			<language type="ter">ତେରେନୋ</language>
-			<language type="tet">ତେତ�ମ�</language>
-			<language type="tg">ତାଜିକ�</language>
-			<language type="th">ଥାଇ</language>
-			<language type="ti">ଟ�ରିଗିନିଆ</language>
-			<language type="tig">ଟାଇଗ�ରେ</language>
-			<language type="tiv">ତୀଭ�</language>
-			<language type="tk">ତ�ର�କମେନ�</language>
-			<language type="tkl">ଟୋକେଲାଉ</language>
-			<language type="tl">ଟାଗାଲଗ�</language>
-			<language type="tlh">କ�ଲିଙ�ଗନ�</language>
-			<language type="tli">ତ�ଲିଙ�ଗିଟ�</language>
-			<language type="tmh">ତାମାଶେକ�</language>
-			<language type="tn">ସେସ�ବାନା</language>
-			<language type="to">ଟୋଙ�ଗା</language>
-			<language type="tog">ନ�ୟାସା ଟୋଙ�ଗୋ</language>
-			<language type="tpi">ଟୋକ� ପିସିନ�</language>
-			<language type="tr">ତ�ର�କିସ�</language>
-			<language type="ts">ସୋଂଗା</language>
-			<language type="tsi">ତିସିମିସିଆନ�</language>
-			<language type="tt">ତାତାର�</language>
-			<language type="tum">ଟ�ମ�ବ�କା</language>
-			<language type="tup">ଟ�ପି ଭାଷା</language>
-			<language type="tut">ଆଲ�ଟିକ� ଭାଷା</language>
-			<language type="tvl">ତ�ଭାଲ�</language>
-			<language type="tw">ତ�ୱି</language>
-			<language type="ty">ତାହିତିଆନ�</language>
-			<language type="tyv">ତ�ଭିନିଆନ�</language>
-			<language type="udm">ଉଦମୂର�ତ�ତ</language>
-			<language type="ug">ୟ�ଘ�ର�</language>
-			<language type="uga">ୟ�ଗୋରଟିକ�</language>
-			<language type="uk">ୟ�କ�ରାନିଆନ�</language>
-			<language type="umb">ଉମ�ବ�ଣ�ଡ�</language>
-			<language type="und">ଅଜଣା �ବଂ ଅବୈଧ ଭାଷା</language>
-			<language type="ur">ଉର�ଦ�ଦ�</language>
-			<language type="uz">ଉଜବେକ�</language>
-			<language type="vai">ଭାଇ</language>
-			<language type="ve">ଭେଣ�ଡା</language>
-			<language type="vi">ଭି�ତନାମିଜ�</language>
-			<language type="vo">ବୋଲାପ�କ</language>
-			<language type="vot">ଭୋଟିକ�</language>
-			<language type="wa">ୱାଲ�ନ�</language>
-			<language type="wak">ୱାକଶନ� ଭାଷା</language>
-			<language type="wal">ୱାଲମୋ</language>
-			<language type="war">ୱାରୈ</language>
-			<language type="was">ୱାସୋ</language>
-			<language type="wen">ସର�ବିଆନ� ଭାଷା</language>
-			<language type="wo">ୱୋଲଫ�</language>
-			<language type="xal">କାଲ�ମୀକ�</language>
-			<language type="xh">ଖୋସା</language>
-			<language type="yao">ୟାଓ</language>
-			<language type="yap">ୟାପୀସ�</language>
-			<language type="yi">ୟିଡିସ�</language>
-			<language type="yo">ୟୋର�ବା</language>
-			<language type="ypk">ୟ�ପିକ� ଭାଷା</language>
-			<language type="za">ଜ�ଆଙ�ଗ</language>
-			<language type="zap">ଜାପୋଟେକ�</language>
-			<language type="zbl">ବ�ଲିସିମ�ବଲସ�</language>
-			<language type="zen">ଜେନାଗା</language>
-			<language type="zh">ଚାଇନୀଜ�</language>
-			<language type="zh_Hans">ସରଳିକରଣ ଚାଇନୀଜ�</language>
-			<language type="zh_Hant">ପାରମ�ପରିକ ଚାଇନୀଜ�</language>
-			<language type="znd">ଜାଣ�ଡେ</language>
-			<language type="zu">ଜ�ଲ�</language>
-			<language type="zun">ଜ�ନୀ</language>
-			<language type="zxx">କୌଣସି ଲିଙ�ଗ�ଇଷ�ଟ ସାମଗ�ରୀ ନାହି�</language>
-			<language type="zza">ଜାଜା</language>
-		</languages>
-		<scripts>
-			<script type="Arab">ଆରବିକ�</script>
-			<script type="Armi">ଇମ�ପେରିଆଲ� ଆରମିକ�</script>
-			<script type="Armn">ଆର�ମେନିଆନ�</script>
-			<script type="Avst">ଆବେସ�ଥାନ�</script>
-			<script type="Bali">ବାଲିନୀଜ�</script>
-			<script type="Batk">ବାଟାକ�</script>
-			<script type="Beng">ବଙ�ଗାଳୀ</script>
-			<script type="Blis">ବ�ଲିସିମ�ବଲସ�</script>
-			<script type="Bopo">ବୋପୋମୋଫୋ</script>
-			<script type="Brah">ବ�ରାହ�ମୀ</script>
-			<script type="Brai">ବ�ରିଲ�</script>
-			<script type="Bugi">ବ�ଗାନୀଜ�</script>
-			<script type="Buhd">ବ�ହିଦ�</script>
-			<script type="Cakm">ଚକମା</script>
-			<script type="Cans">ୟ�ନିଫା�ଡ� କାନାଡିଆନ� ଆବ�ରୋଜିନାଲ� ସିଲାବିକସ�</script>
-			<script type="Cari">କୈରନ�</script>
-			<script type="Cham">ଛମ�</script>
-			<script type="Cher">ଚିର�କୀ</script>
-			<script type="Cirt">ସିର�ଥ</script>
-			<script type="Copt">କପଟିକ�</script>
-			<script type="Cprt">ସିପ�ରଅଟ�</script>
-			<script type="Cyrl">ସିରିଲିକ�</script>
-			<script type="Cyrs">ଓଲ�ଡ ଚର�ଚ�ଚ ସାଲଭୋନିକ� ସିରିଲିକ�</script>
-			<script type="Deva">ଦେବାନଗିରି</script>
-			<script type="Dsrt">ଡେସର�ଟ</script>
-			<script type="Egyd">ଇଜିପ�ଟିଆନ� ଡେମୋଟିକ�</script>
-			<script type="Egyh">ଇଜିପ�ଟିଆନ� ହାଇଅରଟିକ�</script>
-			<script type="Egyp">ଇଜିପ�ଟିଆନ� ହାଅରଗ�ଲିପସ�</script>
-			<script type="Ethi">ଇଥୋପିକ�</script>
-			<script type="Geok">ଜର�ଜିଆନ� ଖ�ଟସ�ରୀ</script>
-			<script type="Geor">ଜର�ଜିଆନ�</script>
-			<script type="Glag">ଗ�ଲାଗ�ଲୋଟିକ�</script>
-			<script type="Goth">ଗୋଥିକ�</script>
-			<script type="Grek">ଗ�ରୀକ�</script>
-			<script type="Gujr">ଗ�ଜ�ରାଟୀ</script>
-			<script type="Guru">ଗ�ର�ମ�ଖୀ</script>
-			<script type="Hang">ହାଙ�ଗ�ଲ�</script>
-			<script type="Hani">ହାନ�</script>
-			<script type="Hano">ହାନ�ନ�</script>
-			<script type="Hans">ସରଳୀକୃତ ହାନ�</script>
-			<script type="Hant">ପାରମ�ପରିକ� ହାନ�</script>
-			<script type="Hebr">ହେବ�ର�ୟ�</script>
-			<script type="Hira">ହିରାଗାନା</script>
-			<script type="Hmng">ପାହୋ ହୋଙ�ଗ</script>
-			<script type="Hrkt">କାଟାକାନ� କିମ�ବା ହିରାଗାନ�</script>
-			<script type="Hung">ପ�ର�ଣା ହଙ�ଗେରିଆନ�</script>
-			<script type="Inds">ସିନ�ଧ�</script>
-			<script type="Ital">ପ�ର�ଣା ଇଟାଲୀ</script>
-			<script type="Java">ଜାଭାନୀଜ�</script>
-			<script type="Jpan">ଜାପାନୀଜ�</script>
-			<script type="Kali">କାୟାହା ଲୀ</script>
-			<script type="Kana">କାଟକାନ�</script>
-			<script type="Khar">ଖାରୋସ�ଥି</script>
-			<script type="Khmr">ଖ�ମେର�</script>
-			<script type="Knda">କନ�ନଡ</script>
-			<script type="Kore">କୋରିଆନ�</script>
-			<script type="Kthi">କୈଥି</script>
-			<script type="Lana">ଲାନା</script>
-			<script type="Laoo">ଲାଓ</script>
-			<script type="Latf">ଫ�ରାକଥ�ର� ଲାଟିନ�</script>
-			<script type="Latg">ଗା�ଲିକ� ଲାଟିନ�</script>
-			<script type="Latn">ଲାଟିନ�</script>
-			<script type="Lepc">ଲେପଚା</script>
-			<script type="Limb">ଲିମ�ବ�</script>
-			<script type="Lina">ଲିନିୟର�</script>
-			<script type="Linb">ଲିନିୟର� ବି</script>
-			<script type="Lyci">ଲିଶିୟନ�</script>
-			<script type="Lydi">ଲିଡିୟନ�</script>
-			<script type="Mand">ମାନଡେନ�</script>
-			<script type="Mani">ମନଶୀନ�</script>
-			<script type="Maya">ମୟାନ� ହାୟରଲଜିକସ�</script>
-			<script type="Mero">ମେରୋଇଟିକ�</script>
-			<script type="Mlym">ମାଲୟଲମ�</script>
-			<script type="Mong">ମଙ�ଗୋଲିଆନ�</script>
-			<script type="Moon">ଚନ�ଦ�ର</script>
-			<script type="Mtei">ମା�ତି ମାୟେକ�</script>
-			<script type="Mymr">ମିଆମାର�</script>
-			<script type="Nkoo">�ନ� କୋ</script>
-			<script type="Ogam">ଓଘାମା</script>
-			<script type="Olck">ଓଲ� ଚିକି</script>
-			<script type="Orkh">ଓରୋଖନ�</script>
-			<script type="Orya">ଓଡିଆ</script>
-			<script type="Osma">ଓସୋମାନିୟା</script>
-			<script type="Perm">ଓଲ�ଡ ପରମିକ�</script>
-			<script type="Phag">ଫାଗସ�-ପା</script>
-			<script type="Phli">ଇନସ�କ�ରୀପସାନଲ� ପାହାଲାୱୀ</script>
-			<script type="Phlp">ସ�ଲାଟର� ପାହାଲାୱୀ</script>
-			<script type="Phlv">ବ�କ� ପାହାଲାୱୀ</script>
-			<script type="Phnx">ଫେନୋସିଆନ�</script>
-			<script type="Plrd">ପୋଲାର�ଡ ଫୋନେଟିକ�</script>
-			<script type="Prti">ଇନସ�କ�ରୀପସାନଲ� ପାର�ଥିଆନ�</script>
-			<script type="Qaai">ବଂଶଗତ</script>
-			<script type="Rjng">ରେଜାଙ�ଗ</script>
-			<script type="Roro">ରୋଙ�ଗୋରୋଙ�ଗୋ</script>
-			<script type="Runr">ରନିକ�</script>
-			<script type="Samr">ସମୌରିଟନ�</script>
-			<script type="Sara">ସାରାତି</script>
-			<script type="Saur">ସୌରାଷ�ଟ�ର</script>
-			<script type="Sgnw">ସାଙ�କେତିକ ଲିଖ</script>
-			<script type="Shaw">ସାବିୟାନ�</script>
-			<script type="Sinh">ସିଂହଳ</script>
-			<script type="Sund">ସ�ଦାନୀଜ�</script>
-			<script type="Sylo">ସୀଲିତୋ ନଗରୀ</script>
-			<script type="Syrc">ସିରିୟାକ�</script>
-			<script type="Syre">�ଷ�ଟ�ରାଙ�ଗେଲୋ ସିରିକ�</script>
-			<script type="Syrj">ୱେଷ�ଟର�ନ ସିରିକ�</script>
-			<script type="Syrn">ଇଷ�ଟର�ନ ସିରିକ�</script>
-			<script type="Tagb">ତଗବାନ�ୱା</script>
-			<script type="Tale">ତାଇ ଲେ</script>
-			<script type="Talu">ନୂତନ ତାଇ ଲ��</script>
-			<script type="Taml">ତାମିଲ�</script>
-			<script type="Tavt">ତାଇ ଭି�ତ�</script>
-			<script type="Telu">ତେଲ�ଗ�</script>
-			<script type="Teng">ତେଙ�ଗୱାର�</script>
-			<script type="Tfng">ତିଫିଙ�ଘା</script>
-			<script type="Tglg">ଟାଗାଲୋଗ�</script>
-			<script type="Thaa">ଥାନା</script>
-			<script type="Thai">ଥାଇ</script>
-			<script type="Tibt">ତିବେତାନ�</script>
-			<script type="Ugar">ୟ�ଗାରିଟିକ�</script>
-			<script type="Vaii">ୱାଇ</script>
-			<script type="Visp">ଭିଜିବଲ� ସ�ପିଚ�</script>
-			<script type="Xpeo">ପ�ର�ଣା ଫରାସୀ</script>
-			<script type="Xsux">ସ�ମେରୋ-ଆକ�କାଡିଆନ� ସ�ନିଫର�ମ</script>
-			<script type="Yiii">à­Ÿà­€</script>
-			<script type="Zmth">ଗାଣିତିକ ନୋଟେସନ�</script>
-			<script type="Zsym">ସିମ�ବଲ�</script>
-			<script type="Zxxx">ଅଲିଖିତ</script>
-			<script type="Zyyy">ସାଧାରଣ</script>
-			<script type="Zzzz">ଅଞ�ଜାତ କିମ�ବା ଅବୈଧ ସ�କ�ରୀପ�ଟ</script>
-		</scripts>
-		<territories>
-			<territory type="001">ବିଶ�ବ</territory>
-			<territory type="002">ଆଫ�ରିକା</territory>
-			<territory type="003">ଉତ�ତର ଆମେରିକା</territory>
-			<territory type="005">ଦକ�ଷିଣ ଆମେରିକା</territory>
-			<territory type="009">ଓସୋନିଆନ�</territory>
-			<territory type="011">ପଶ�ଚିମ ଆଫ�ରିକା</territory>
-			<territory type="013">ମଧ�ୟ ଆମେରିକା</territory>
-			<territory type="014">ପୂର�ବ ଆଫ�ରିକା</territory>
-			<territory type="015">ଉତ�ତର ଆଫ�ରିକା</territory>
-			<territory type="017">ମଧ�ୟ ଆଫ�ରିକା</territory>
-			<territory type="018">ଦକ�ଷିଣସ�ଥ ଆଫ�ରିକା</territory>
-			<territory type="019">ଆମେରିକାସ�</territory>
-			<territory type="021">ଉତ�ତରସ�ଥ ଆମେରିକା</territory>
-			<territory type="029">କାରିବିଆନ�</territory>
-			<territory type="030">ପୂର�ବ �ସିଆ</territory>
-			<territory type="034">ଦକ�ଷିଣ �ସିଆ</territory>
-			<territory type="035">ଦକ�ଷିଣ-ପୂର�ବ �ସିଆ</territory>
-			<territory type="039">ଦକ�ଷିଣ ୟ�ରୋପ�</territory>
-			<territory type="053">ଅଷ�ଟ�ରେଲିଆ �ବଂ ନ�ୟ�ଜିଲ�ୟାଣ�ଡ</territory>
-			<territory type="054">ମେଲାନେସିଆ</territory>
-			<territory type="057">ମାଇକ�ରୋନେସିଆନ� ଅଞ�ଚଳ</territory>
-			<territory type="061">ପଲିନେସିଆ</territory>
-			<territory type="062">ଦକ�ଷିଣ-ମଧ�ୟ �ସିଆ</territory>
-			<territory type="142">�ସିଆ</territory>
-			<territory type="143">ମଧ�ୟ �ସିଆ</territory>
-			<territory type="145">ପଶ�ଚିମ �ସିଆ</territory>
-			<territory type="150">ୟ�ରୋପ�</territory>
-			<territory type="151">ପୂର�ବ ୟ�ରୋପ�</territory>
-			<territory type="154">ଉତ�ତର ୟ�ରୋପ�</territory>
-			<territory type="155">ପଶ�ଚିମ ୟ�ରୋପ�</territory>
-			<territory type="172">କମନୱେଲ�ଥ ଅଫ� ଇଣ�ଡିପେଣ�ଡେଣ�ଟ ଷ�ଟେଟସ�</territory>
-			<territory type="200">ଚେକୋସ�ଲୋଭିଆ</territory>
-			<territory type="419">ଲାଟିନ� ଆମେରିକା �ବଂ କାରିବିଆନ�</territory>
-			<territory type="830">ଚାନେଲ� ଆଇଲ�ୟାଣ�ଡ</territory>
-			<territory type="AD">ଆଣ�ଡୋରା</territory>
-			<territory type="AE">ସଂଯ�କ�ତ ଆରବ �ମିରେଟସ�</territory>
-			<territory type="AF">ଆଫାଗାନିସ�ତାନ�</territory>
-			<territory type="AG">ଆଣ�ଟିଗ�ଆ �ବଂ ବାରବ�ଦା</territory>
-			<territory type="AI">ଆଙ�ଗ�ଇଲ�ଲା</territory>
-			<territory type="AL">ଆଲବାନିଆ</territory>
-			<territory type="AM">ଆର�ମେନିଆ</territory>
-			<territory type="AN">ନେଦରଲ�ୟାଣ�ଡସ� ଆଣ�ଟିଲିଜ�</territory>
-			<territory type="AO">ଆଙ�ଗୋଲା</territory>
-			<territory type="AQ">ଆର�ଣ�ଟକଟିକା</territory>
-			<territory type="AR">ଆର�ଜେଣ�ଟିନା</territory>
-			<territory type="AS">ଆମେରିକାନ� ସାମୋଆ</territory>
-			<territory type="AT">ଅଷ�ଟ�ରିଆ</territory>
-			<territory type="AU">ଅଷ�ଟ�ରେଲିଆ</territory>
-			<territory type="AW">ଆର�ବା</territory>
-			<territory type="AX">ଆଲାଣ�ଡ ଆଇସଲ�ୟାଣ�ଡ</territory>
-			<territory type="AZ">ଆଜେରବାଇଜାନ�</territory>
-			<territory type="BA">ବୋସନିଆ �ବଂ ହର�ଜଗୋଭିନା</territory>
-			<territory type="BB">ବାରବାଡୋସ�</territory>
-			<territory type="BD">ବାଙ�ଗଲାଦେଶ�</territory>
-			<territory type="BE">ବେଲଜିୟମ�</territory>
-			<territory type="BF">ବ�ର�କିନୋ ଫାସୋ</territory>
-			<territory type="BG">ବ�ଲଗେରିଆ</territory>
-			<territory type="BH">ବାହାରିନ�</territory>
-			<territory type="BI">ବ�ର�ନ�ଦି</territory>
-			<territory type="BJ">ବେନିନ�</territory>
-			<territory type="BL">ସେଣ�ଟ ବାର�ଥେଲେମି</territory>
-			<territory type="BM">ବରମ�ଡା</territory>
-			<territory type="BN">ବ�ର�ନେଇ</territory>
-			<territory type="BO">ବୋଲଭିଆ</territory>
-			<territory type="BR">ବ�ରାଜିଲ�</territory>
-			<territory type="BS">ବାହାମାସ�</territory>
-			<territory type="BT">ଭ�ଟାନ�</territory>
-			<territory type="BV">ବୌଭେଟ� ଆଇସଲ�ୟାଣ�ଡ</territory>
-			<territory type="BW">ବୋଟସ�ବାନ�</territory>
-			<territory type="BY">ବେଲାର�ଷ�</territory>
-			<territory type="BZ">ବେଲିଜ�</territory>
-			<territory type="CA">କାନାଡା</territory>
-			<territory type="CC">କୋକୋସ� ଆଇସଲ�ୟାଣ�ଡ</territory>
-			<territory type="CD">କଙ�ଗୋ-କିନସାସା</territory>
-			<territory type="CF">ମଧ�ୟ ଆଫ�ରିକୀୟ ଗଣତନ�ତ�ର</territory>
-			<territory type="CG">କଙ�ଗୋ-ବ�ରାଜିଭିଲ�ଲେ</territory>
-			<territory type="CH">ସ�ବିଜରଲ�ୟାଣ�ଡ</territory>
-			<territory type="CI">ଆଇବରୀ କୋଷ�ଟ</territory>
-			<territory type="CK">କ�କ� ଆଇସଲ�ୟାଣ�ଡ</territory>
-			<territory type="CL">ଚିଲ�ଲୀ</territory>
-			<territory type="CM">କାମେର�ନ�</territory>
-			<territory type="CN">ଚିନ�</territory>
-			<territory type="CO">କୋଲମ�ବିଆ</territory>
-			<territory type="CR">କୋଷ�ଟା ରିକା</territory>
-			<territory type="CS">ସର�ବିଆ �ବଂ ମଣ�ଟେନଗ�ରୋ</territory>
-			<territory type="CU">କ�ୱିବା</territory>
-			<territory type="CV">କେପ� ଭର�ଦେ</territory>
-			<territory type="CX">ଖ�ରୀଷ�ଟମାସ ଆଇଲ�ୟାଣ�ଡ</territory>
-			<territory type="CY">ସାଇପ�ରସ�</territory>
-			<territory type="CZ">ଚେକ� ସାଧାରଣତନ�ତ�ର</territory>
-			<territory type="DE">ଜର�ମାନୀ</territory>
-			<territory type="DJ">ଡିବୌଟି</territory>
-			<territory type="DK">ଡେନମାର�କ</territory>
-			<territory type="DM">ଡୋମିନାକା</territory>
-			<territory type="DO">ଡୋମିନକାନ� ପ�ରଜାତନ�ତ�ର</territory>
-			<territory type="DZ">ଆଲଜେରିଆ</territory>
-			<territory type="EC">ଇକ�ୱାଡୋର�</territory>
-			<territory type="EE">�ସ�ତୋନିଆ</territory>
-			<territory type="EG">ଇଜିପ�ଟ</territory>
-			<territory type="EH">ପଶ�ଚିମ ସାହାରା</territory>
-			<territory type="ER">ଇରିଟ�ରିୟା</territory>
-			<territory type="ES">ସ�ପେନ�</territory>
-			<territory type="ET">ଇଥିଓପିଆ</territory>
-			<territory type="FI">ଫିନଲ�ୟାଣ�ଡ</territory>
-			<territory type="FJ">ଫିଜି</territory>
-			<territory type="FK">ଫଲ�କଲ�ୟାଣ�ଡ ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="FM">ମାଇକ�ରୋନେସିଆ</territory>
-			<territory type="FO">ଫାରୋଇ ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="FR">ଫ�ରାନ�ସ</territory>
-			<territory type="GA">ଗାବୋନ�</territory>
-			<territory type="GB">ବ�ରିଟେନ�</territory>
-			<territory type="GD">ଗ�ରେନାଡା</territory>
-			<territory type="GE">ଜର�ଜିଆ</territory>
-			<territory type="GF">ଫ�ରେଞ�ଚ ଗ�ଇନା</territory>
-			<territory type="GG">ଗ��ରନେସି</territory>
-			<territory type="GH">ଘାନା</territory>
-			<territory type="GI">ଜିବ�ରାଲ�ଟର�</territory>
-			<territory type="GL">ଗ�ରୀନଲ�ୟାଣ�ଡ</territory>
-			<territory type="GM">ଗାମ�ବିଆ</territory>
-			<territory type="GN">ଗ��ନେଆ</territory>
-			<territory type="GP">ଗୌଡେଲୌପେ</territory>
-			<territory type="GQ">ଇକ�ବାଟେରିଆଲ� ଗ�ଇନିଆ</territory>
-			<territory type="GR">ଗ�ରୀସ�</territory>
-			<territory type="GS">ଦକ�ଷିଣ ଜର�ଜିଆ �ବଂ ଦକ�ଷିଣ ସାଣ�ଡୱିଚ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="GT">ଗ��ତମାଲା</territory>
-			<territory type="GU">ଗ�ଆମ�</territory>
-			<territory type="GW">ଗ�ଇନିଆ-ବିସାଉ</territory>
-			<territory type="GY">ଗ�ଇନା</territory>
-			<territory type="HK">ହଂକଂ ବିଶେଷ ପ�ରଶାସନିକ କ�ଷେତ�ର ଚୀନ�</territory>
-			<territory type="HM">ହାର�ଡ ଦ�ବୀପପ�ଞ�ଜ �ବଂ ମ�ୟାକଡୋନାଲ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="HN">ହୋଣ�ଡାର�ସ�</territory>
-			<territory type="HR">କ�ରୋଆଟିଆ</territory>
-			<territory type="HT">ହାଇତି</territory>
-			<territory type="HU">ହଙ�ଗେରୀ</territory>
-			<territory type="ID">ଇଣ�ଡୋନେସିଆ</territory>
-			<territory type="IE">ଆୟରଲ�ୟାଣ�ଡ</territory>
-			<territory type="IL">ଇସ�ରା�ଲ�</territory>
-			<territory type="IM">ଆଇଲ� ଅଫ� ମୈନ�</territory>
-			<territory type="IN">ଭାରତ</territory>
-			<territory type="IO">ବ�ରିଟିଶ� ଭାରତୀୟ ସାମ�ଦ�ରିକ କ�ଷେତ�ର</territory>
-			<territory type="IQ">ଇରାକ�</territory>
-			<territory type="IR">ଇରାନ�</territory>
-			<territory type="IS">ଆଇସଲ�ୟାଣ�ଡ</territory>
-			<territory type="IT">ଇଟାଲୀ</territory>
-			<territory type="JE">ଜର�ସି</territory>
-			<territory type="JM">ଜାମାଇକା</territory>
-			<territory type="JO">ଜୋର�ଡାନ�</territory>
-			<territory type="JP">ଜାପାନ�</territory>
-			<territory type="KE">କେନିୟା</territory>
-			<territory type="KG">କିର�ଗିଜିସ�ଥାନ</territory>
-			<territory type="KH">କାମ�ବୋଡିଆ</territory>
-			<territory type="KI">କିରିବାଟୀ</territory>
-			<territory type="KM">କାମୋରସ�</territory>
-			<territory type="KN">ସେଣ�ଟ କିଟସ� �ଣ�ଡ ନେଭିସ�</territory>
-			<territory type="KP">ଉତ�ତର କୋରିଆ</territory>
-			<territory type="KR">ଦକ�ଷିଣ କୋରିଆ</territory>
-			<territory type="KW">କ��ତ�</territory>
-			<territory type="KY">କେମ�ୟାନ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="KZ">କାଜାକାସ�ଥାନ�</territory>
-			<territory type="LA">ଲାଓସ�</territory>
-			<territory type="LB">ଲେବାନନ�</territory>
-			<territory type="LC">ସେଣ�ଟ ଲ�ସିଆ</territory>
-			<territory type="LI">ଲିଚେସ�ତିଆନାନ�</territory>
-			<territory type="LK">ଶ�ରୀଲଙ�କା</territory>
-			<territory type="LR">ଲିବେରିଆ</territory>
-			<territory type="LS">ଲେସୋଥୋ</territory>
-			<territory type="LT">ଲିଥାଆନିଆ</territory>
-			<territory type="LU">ଲକ�ସେମବର�ଗ</territory>
-			<territory type="LV">ଲାଟଭିଆ</territory>
-			<territory type="LY">ଲିବିଆ</territory>
-			<territory type="MA">ମୋରୋକ�କୋ</territory>
-			<territory type="MC">ମୋନାକୋ</territory>
-			<territory type="MD">ମାଲଡୋଭା</territory>
-			<territory type="ME">ମଣ�ଟେଗ�ରୋ</territory>
-			<territory type="MF">ସେଣ�ଟ ମାର�ଟିନ�</territory>
-			<territory type="MG">ମାଡାଗାସ�କର�</territory>
-			<territory type="MH">ମାର�ଶଲ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="MK">ମାସେଡୋନିଆ</territory>
-			<territory type="ML">ମାଳୀ</territory>
-			<territory type="MM">ମିୟାମାର�</territory>
-			<territory type="MN">ମଙ�ଗୋଲିଆ</territory>
-			<territory type="MO">ମାକାଉ SAR ଚିନ�</territory>
-			<territory type="MP">ଉତ�ତର ମାରିଆନା ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="MQ">ମାର�ଟିନିକ�ୟ�</territory>
-			<territory type="MR">ମାଉରିଟାନିଆ</territory>
-			<territory type="MS">ମଣ�ଟେସେରାଟ�</territory>
-			<territory type="MT">ମାଲ�ଟା</territory>
-			<territory type="MU">ମୌରିସସ�</territory>
-			<territory type="MV">ମାଳଦ�ବୀପ</territory>
-			<territory type="MW">ମାଲୱି</territory>
-			<territory type="MX">ମେକ�ସିକୋ</territory>
-			<territory type="MY">ମାଲେସିଆ</territory>
-			<territory type="MZ">ମୋଜାମ�ବିକ�ୟ�</territory>
-			<territory type="NA">ନାମ�ବିଆ</territory>
-			<territory type="NC">ନୂତନ କାଲେଡୋନିଆ</territory>
-			<territory type="NE">ନାଇଜର�</territory>
-			<territory type="NF">ନରଫ�ଲକ� ଦ�ବୀପ</territory>
-			<territory type="NG">ନାଇଜେରିଆ</territory>
-			<territory type="NI">ନିକାରାଗ�ଆ</territory>
-			<territory type="NL">ନେଦରଲ�ୟାଣ�ଡ</territory>
-			<territory type="NO">ନରୱେ</territory>
-			<territory type="NP">ନେପାଳ</territory>
-			<territory type="NR">ନାଉର�</territory>
-			<territory type="NU">ନିଉ</territory>
-			<territory type="NZ">ନ�ୟ�ଜିଲାଣ�ଡ</territory>
-			<territory type="OM">ଓମାନ�</territory>
-			<territory type="PA">ପାନାମା</territory>
-			<territory type="PE">ପେର�</territory>
-			<territory type="PF">ଫ�ରେଞ�ଚ ପଲିନେସିଆ</territory>
-			<territory type="PG">ପପ�ଆ ନ�ୟ� ଗ��ନିଆ</territory>
-			<territory type="PH">ଫିଲିପାଇନସ�</territory>
-			<territory type="PK">ପାକିସ�ତାନ</territory>
-			<territory type="PL">ପୋଲାଣ�ଡ</territory>
-			<territory type="PM">ସେଣ�ଟ ପି�ରେ �ବଂ ମିକ�ବାଲୋନ�</territory>
-			<territory type="PN">ପିଟକାଇରିନ�</territory>
-			<territory type="PR">ପ��ର�ତ�ତୋ ରିକୋ</territory>
-			<territory type="PS">ପାଲେସ�ତେନିଆ</territory>
-			<territory type="PT">ପର�ତ�ତ�ଗାଲ�</territory>
-			<territory type="PW">ପାଲାଉ</territory>
-			<territory type="PY">ପାରାଗ��</territory>
-			<territory type="QA">କତାର�</territory>
-			<territory type="QO">ଆଉଟଲେଇଂ ଓସେନିଆ</territory>
-			<territory type="QU">ୟ�ରୋପିଆନ� ୟ�ନିଅନ�</territory>
-			<territory type="RE">ରିୟ�ନିଅନ�</territory>
-			<territory type="RO">ରୋମାନିଆ</territory>
-			<territory type="RS">ସର�ବିଆ</territory>
-			<territory type="RU">ର�ଷିଆ</territory>
-			<territory type="RW">ରାୱାଣ�ଡା</territory>
-			<territory type="SA">ସାଉଦି ଆରବିଆ</territory>
-			<territory type="SB">ସୋଲୋମନ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="SC">ସେଚେଲସ�</territory>
-			<territory type="SD">ସ�ଦାନ�</territory>
-			<territory type="SE">ସ�ୱେଡେନ�</territory>
-			<territory type="SG">ସିଙ�ଗାପ�ର�</territory>
-			<territory type="SH">ସେଣ�ଟ ହେଲେନା</territory>
-			<territory type="SI">ସ�ଲୋଭେନିଆ</territory>
-			<territory type="SJ">ସାଲ�ଭାର�ଡ �ବଂ ଜାନ� ମାୟୋନ�</territory>
-			<territory type="SK">ସ�ଲୋଭାକିଆ</territory>
-			<territory type="SL">ସିଓରା ଲିଓନ�</territory>
-			<territory type="SM">ସାନ� ମାରିନୋ</territory>
-			<territory type="SN">ସେନେଗାଲ�</territory>
-			<territory type="SO">ସୋମାଲିଆ</territory>
-			<territory type="SR">ସ�ରିନାମ</territory>
-			<territory type="ST">ସାଓ ଟୋମେ �ବଂ ପ�ରିନସିପି</territory>
-			<territory type="SV">�ଲ� ସାଲଭାଡୋର�</territory>
-			<territory type="SY">ସିରିଆ</territory>
-			<territory type="SZ">ସ�ବାଜିଲାଣ�ଡ</territory>
-			<territory type="TC">ତ�ର�କସ� �ବଂ ସାଇକସ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="TD">ଚାଦ�</territory>
-			<territory type="TF">ଫରାସୀ ଦକ�ଷିଣ କ�ଷେତ�ର</territory>
-			<territory type="TG">ଟୋଗୋ</territory>
-			<territory type="TH">ଥାଇଲାଣ�ଡ</territory>
-			<territory type="TJ">ତାଜିକିସ�ଥାନ�</territory>
-			<territory type="TK">ଟୋକେଲାଉ</territory>
-			<territory type="TL">ପ�ର�ବ ତିମୋର�</territory>
-			<territory type="TM">ତ�ର�କମେନିସ�ତାନ�</territory>
-			<territory type="TN">ତ�ନିସିଆ</territory>
-			<territory type="TO">ଟୋଙ�ଗା</territory>
-			<territory type="TR">ତ�ର�କୀ</territory>
-			<territory type="TT">ତ�ରିନିଦାଦ� �ବଂ ଟୋବାଗୋ</territory>
-			<territory type="TV">ଟ�ଭାଲ�</territory>
-			<territory type="TW">ତାଇୱାନ�</territory>
-			<territory type="TZ">ତାଞ�ଜାନିଆ</territory>
-			<territory type="UA">ୟ�କ�ରାଇନ�</territory>
-			<territory type="UG">ଉଗାଣ�ଡା</territory>
-			<territory type="UM">ୟ�ନାଇଟେଡ� ଷ�ଟେଟସ� ମାଇନର� ଆଉଟଲେଇଂ ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="US">ଯ�କ�ତ ରାଷ�ଟ�ର ଆମେରିକା</territory>
-			<territory type="UY">ଉର�ଗ��</territory>
-			<territory type="UZ">ଉଜବେକିସ�ଥାନ�</territory>
-			<territory type="VA">ଭାଟିକାନ�</territory>
-			<territory type="VC">ସେଣ�ଟ ଭିନସେଣ�ଟ �ବଂ ଦି ଗ�ରେନାଡିସ�</territory>
-			<territory type="VE">ଭେନଜ��ଲା</territory>
-			<territory type="VG">ବ�ରିଟିଶ� ଭର�ଜିନ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="VI">ୟ��ସ� ଭର�ଜିନ� ଦ�ବୀପପ�ଞ�ଜ</territory>
-			<territory type="VN">ଭି�ତନାମ�</territory>
-			<territory type="VU">ଭାନ�ଆତ�</territory>
-			<territory type="WF">ୱାଲିସ� �ବଂ ଫ�ତ�ନା</territory>
-			<territory type="WS">ସାମୋଆ</territory>
-			<territory type="YE">ୟେମେନ�</territory>
-			<territory type="YT">ମାୟୋଟେ</territory>
-			<territory type="ZA">ଦକ�ଷିଣ ଆଫ�ରିକା</territory>
-			<territory type="ZM">ଜାମ�ବିଆ</territory>
-			<territory type="ZW">ଜିମ�ବାୱେ</territory>
-			<territory type="ZZ">ଅଜଣା କିମ�ବା ଅବୈଧ ପ�ରଦେଶ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[୦-୯ ଅ-ଋ � � ଓ-ନ ପ-ର ଲ ଳ ଶ-ହ {ଡ\u0B3C}ଡ଼ {ଢ\u0B3C}� ୟ ୱ ଵ ଂ ଃ � � ଼ ା-ୃ େ ୈ ୋ ୌ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">ଜାନ�ଆରୀ</month>
-							<month type="2">ଫେବ�ର�ୟାରୀ</month>
-							<month type="3">ମାର�ଚ�ଚ</month>
-							<month type="4">ଅପ�ରେଲ</month>
-							<month type="5">ମେ</month>
-							<month type="6">ଜ�ନ</month>
-							<month type="7">ଜ�ଲାଇ</month>
-							<month type="8">ଅଗଷ�ଟ</month>
-							<month type="9">ସେପ�ଟେମ�ବର</month>
-							<month type="10">ଅକ�ଟୋବର</month>
-							<month type="11">ନଭେମ�ବର</month>
-							<month type="12">ଡିସେମ�ବର</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ଜା</month>
-							<month type="2">ଫେ</month>
-							<month type="3">ମା</month>
-							<month type="4">ଅ</month>
-							<month type="5">ମେ</month>
-							<month type="6">ଜ�</month>
-							<month type="7">ଜ�</month>
-							<month type="8">ଅ</month>
-							<month type="9">ସେ</month>
-							<month type="10">ଅ</month>
-							<month type="11">ନ</month>
-							<month type="12">ଡି</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ରବି</day>
-							<day type="mon">ସୋମ</day>
-							<day type="tue">ମଙ�ଗଳ</day>
-							<day type="wed">ବ�ଧ</day>
-							<day type="thu">ଗ�ର�</day>
-							<day type="fri">ଶ�କ�ର</day>
-							<day type="sat">ଶନି</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ରବିବାର</day>
-							<day type="mon">ସୋମବାର</day>
-							<day type="tue">ମଙ�ଗଳବାର</day>
-							<day type="wed">ବ�ଧବାର</day>
-							<day type="thu">ଗ�ର�ବାର</day>
-							<day type="fri">ଶ�କ�ରବାର</day>
-							<day type="sat">ଶନିବାର</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ର</day>
-							<day type="mon">ସୋ</day>
-							<day type="tue">ମ</day>
-							<day type="wed">ବ�</day>
-							<day type="thu">ଗ�</day>
-							<day type="fri">ଶ�</day>
-							<day type="sat">ଶ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<metazone type="Christmas">
-				<long>
-					<standard>ଖ�ରୀଷ�ଟମାସ ଆଇଲ�ୟାଣ�ଡ ସମୟ</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>orya</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<displayName>ଟଙକା</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ହ�</yesstr>
-			<nostr>ନା</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/or_IN.xml b/airtime_mvc/library/Zend/Locale/Data/or_IN.xml
deleted file mode 100644
index 930763d6f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/or_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:38 $"/>
-		<language type="or"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa.xml b/airtime_mvc/library/Zend/Locale/Data/pa.xml
deleted file mode 100644
index 854152ac3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.76 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="pa"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ab">ਅਬਖਾਜ਼ੀਅਨ</language>
-			<language type="ace">ਅਚੀਨੀ</language>
-			<language type="ach">ਅਕੋਲੀ</language>
-			<language type="af">ਅਫ਼ਰੀਕੀ</language>
-			<language type="apa">ਅਪਾਚੇ ਭਾਸ਼ਾ</language>
-			<language type="ar">ਅਰਬੀ</language>
-			<language type="as">ਅਸਾਮੀ</language>
-			<language type="aus">ਆਸਟਰੇਲੀਅਨ ਭਾਸ਼ਾ</language>
-			<language type="az">ਅਜ਼ੇਰਬੈਜਨਿ</language>
-			<language type="bat">ਬੈਲਟਿਕ ਭਾਸ਼ਾ</language>
-			<language type="be">ਬੇਲਾਰੂਸੀਅਨ</language>
-			<language type="bn">ਬੰਗਾਲੀ</language>
-			<language type="da">ਡੈਨਿਸ਼</language>
-			<language type="de">ਜਰਮਨ</language>
-			<language type="en">ਅੰਗਰੇਜ਼ੀ</language>
-			<language type="eo">�ਸਪਰੇਂਟੋ</language>
-			<language type="es">ਸਪੇਨਿਸ਼</language>
-			<language type="fi">ਫਿਨਿਸ਼</language>
-			<language type="fr">ਫਰੈਂਚ</language>
-			<language type="gu">ਗ�ਜਰਾਤੀ</language>
-			<language type="hi">ਹਿੰਦੀ</language>
-			<language type="id">ਇੰਡੋਨੇਸ਼ੀਆਈ</language>
-			<language type="it">ਇਤਾਲਵੀ</language>
-			<language type="ja">ਜਾਪਾਨੀ</language>
-			<language type="mk">ਮੈਕੇਡੋਨੀਅਨ</language>
-			<language type="nl">ਡੱਚ</language>
-			<language type="no">ਨਾਰਵੇਜੀਅਨ</language>
-			<language type="pa">ਪੰਜਾਬੀ</language>
-			<language type="pt">ਪੋਰਤੂਗੂਈਸ</language>
-			<language type="sv">ਸਵੈਡਿਸ਼</language>
-			<language type="ta">ਤਾਮਿਲ</language>
-			<language type="te">ਤੇਲਗੂ</language>
-			<language type="th">ਥਾਈ</language>
-			<language type="tw">ਤ�ਵਿ</language>
-			<language type="ug">ਉਇਘ�ਰ</language>
-			<language type="und">und</language>
-		</languages>
-		<scripts>
-			<script type="Deva">ਦੇਵਨਾਗਰੀ</script>
-			<script type="Guru">ਗ�ਰਮ�ਖੀ</script>
-			<script type="Zxxx">Zxxx</script>
-			<script type="Zzzz">Zzzz</script>
-		</scripts>
-		<territories>
-			<territory type="IN">ਭਾਰਤ</territory>
-			<territory type="TO">TO</territory>
-			<territory type="ZZ">ਅਣਜਾਣ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[਼ ੰ ੱ ੦-੯ ੴ ੳ ਉ ਊ ਓ ਅ ਆ � ਔ ੲ ਇ ਈ � ਸ {ਸ\u0A3C} ਹ ਕ ਖ {ਖ\u0A3C} ਗ {ਗ\u0A3C} ਘ-ਜ {ਜ\u0A3C} �-ਨ ਪ ਫ {ਫ\u0A3C} ਬ-ਰ ਲ ਵ ੜ ਾ-ੂ ੇ ੈ ੋ-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D \u0A01-\u0A03 {ਲ\u0A3C}]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">ਜਨਵਰੀ</month>
-							<month type="2">ਫ਼ਰਵਰੀ</month>
-							<month type="3">ਮਾਰਚ</month>
-							<month type="4">ਅਪ�ਰੈਲ</month>
-							<month type="5">ਮਈ</month>
-							<month type="6">ਜੂਨ</month>
-							<month type="7">ਜ�ਲਾਈ</month>
-							<month type="8">ਅਗਸਤ</month>
-							<month type="9">ਸਤੰਬਰ</month>
-							<month type="10">ਅਕਤੂਬਰ</month>
-							<month type="11">ਨਵੰਬਰ</month>
-							<month type="12">ਦਸੰਬਰ</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ਜ</month>
-							<month type="2">ਫ</month>
-							<month type="3">ਮਾ</month>
-							<month type="4">ਅ</month>
-							<month type="5">ਮ</month>
-							<month type="6">ਜੂ</month>
-							<month type="7">ਜ�</month>
-							<month type="8">ਅ</month>
-							<month type="9">ਸ</month>
-							<month type="10">ਅ</month>
-							<month type="11">ਨ</month>
-							<month type="12">ਦ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">�ਤ.</day>
-							<day type="mon">ਸੋਮ.</day>
-							<day type="tue">ਮੰਗਲ.</day>
-							<day type="wed">ਬ�ਧ.</day>
-							<day type="thu">ਵੀਰ.</day>
-							<day type="fri">ਸ਼�ਕਰ.</day>
-							<day type="sat">ਸ਼ਨੀ.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�ਤਵਾਰ</day>
-							<day type="mon">ਸੋਮਵਾਰ</day>
-							<day type="tue">ਮੰਗਲਵਾਰ</day>
-							<day type="wed">ਬ�ਧਵਾਰ</day>
-							<day type="thu">ਵੀਰਵਾਰ</day>
-							<day type="fri">ਸ਼�ੱਕਰਵਾਰ</day>
-							<day type="sat">ਸ਼ਨੀਚਰਵਾਰ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">ਸੋ</day>
-							<day type="tue">ਮੰ</day>
-							<day type="wed">ਬ�ੱ</day>
-							<day type="thu">ਵੀ</day>
-							<day type="fri">ਸ਼�ੱ</day>
-							<day type="sat">ਸ਼</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ਪਹਿਲਾਂ ਚੌਥਾਈ</quarter>
-							<quarter type="2">ਦੂਜਾ ਚੌਥਾਈ</quarter>
-							<quarter type="3">ਤੀਜਾ ਚੌਥਾਈ</quarter>
-							<quarter type="4">ਚੌਥਾ ਚੌਥਾਈ</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ਸਵੇਰੇ</am>
-				<pm>ਸ਼ਾਮ</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ਈਸਾਪੂਰਵ</era>
-						<era type="1">ਸੰਨ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="year">
-						<displayName>ਸਾਲ</displayName>
-					</field>
-					<field type="month">
-						<displayName>ਮਹੀਨਾ</displayName>
-					</field>
-					<field type="week">
-						<displayName>ਹਫ਼ਤਾ</displayName>
-					</field>
-					<field type="day">
-						<displayName>ਦਿਨ</displayName>
-						<relative type="-3">ਤਿੰਨ ਦਿਨ ਪਹਿਲਾਂ</relative>
-						<relative type="-2">ਪਰਸੋਂ</relative>
-						<relative type="0">ਅੱਜ</relative>
-						<relative type="1">ਭਲਕ</relative>
-						<relative type="2">ਭਲਕ</relative>
-						<relative type="3">ਤਿੰਨ ਦਿਨ ਬਾਅਦ</relative>
-					</field>
-					<field type="weekday">
-						<displayName>ਹਫ਼ਤੇ ਦਾ ਦਿਨ</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ਘੰਟਾ</displayName>
-					</field>
-					<field type="minute">
-						<displayName>ਮਿੰਟ</displayName>
-					</field>
-					<field type="zone">
-						<displayName>ਖੇਤਰ</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>guru</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AFN">
-				<displayName>ਅਫ਼ਗਾਨੀ</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ਯੂਰੋ</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>ਰ�ਪਿਯ</displayName>
-				<symbol>ਰ�.</symbol>
-			</currency>
-			<currency type="XXX">
-				<displayName>ਅਣਜਾਣ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ਹਾਂ</yesstr>
-			<nostr>ਨਹੀਂ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_Arab.xml b/airtime_mvc/library/Zend/Locale/Data/pa_Arab.xml
deleted file mode 100644
index de4cf6149..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_Arab.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.25 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="pa"/>
-		<script type="Arab"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="pa">پنجاب</language>
-		</languages>
-		<scripts>
-			<script type="Arab">العربية</script>
-			<script type="Guru">گ�رم�کھی</script>
-		</scripts>
-		<territories>
-			<territory type="PK">پکستان</territory>
-		</territories>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064F ء آ ؤ ئ-ب پ ت ث ٹ ج چ ح-ذ ڈ ر ز ڑ ژ س-غ � ق ک گ ل-ن ں ه ھ � و ی ے]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[Ø£ Ù» Ø© Ùº Ù¼ Ù½]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">جنوری</month>
-							<month type="2">�روری</month>
-							<month type="3">مارچ</month>
-							<month type="4">اپریل</month>
-							<month type="5">مئ</month>
-							<month type="6">جون</month>
-							<month type="7">جولائی</month>
-							<month type="8">اگست</month>
-							<month type="9">ستمبر</month>
-							<month type="10">اکتوبر</month>
-							<month type="11">نومبر</month>
-							<month type="12">دسمبر</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun">اتوار</day>
-							<day type="mon">پیر</day>
-							<day type="tue">منگل</day>
-							<day type="wed">ب�دھ</day>
-							<day type="thu">جمعرات</day>
-							<day type="fri">جمع�</day>
-							<day type="sat">��ت�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="wide">
-							<quarter type="1">چوتھاي پ�لاں</quarter>
-							<quarter type="2">چوتھاي دوجا</quarter>
-							<quarter type="3">چوتھاي تيجا</quarter>
-							<quarter type="4">چوتھاي چوتھا</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraNames>
-						<era type="0">ايساپورو</era>
-						<era type="1">سں</era>
-					</eraNames>
-				</eras>
-				<fields>
-					<field type="year">
-						<displayName>ورھا</displayName>
-					</field>
-					<field type="month">
-						<displayName>م�ينا</displayName>
-					</field>
-					<field type="week">
-						<displayName>��ت�</displayName>
-					</field>
-					<field type="day">
-						<displayName>دئن</displayName>
-					</field>
-					<field type="weekday">
-						<displayName>��تے دا دن</displayName>
-					</field>
-					<field type="hour">
-						<displayName>گھنٹا</displayName>
-					</field>
-					<field type="minute">
-						<displayName>منٹ</displayName>
-					</field>
-					<field type="zone">
-						<displayName>ٹپ�</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<currencies>
-			<currency type="EUR">
-				<displayName>يورو</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>روپئی� [INR]</displayName>
-				<symbol>ر [INR]</symbol>
-			</currency>
-			<currency type="PKR">
-				<displayName>روپئی�</displayName>
-				<symbol>ر</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>�اں</yesstr>
-			<nostr>Ù†Û�ÙŠÚº</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_Arab_PK.xml b/airtime_mvc/library/Zend/Locale/Data/pa_Arab_PK.xml
deleted file mode 100644
index 6cf9216c5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_Arab_PK.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.14 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pa"/>
-		<script type="Arab"/>
-		<territory type="PK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_Guru.xml b/airtime_mvc/library/Zend/Locale/Data/pa_Guru.xml
deleted file mode 100644
index 4a31992af..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_Guru.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.14 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pa"/>
-		<script type="Guru"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_Guru_IN.xml b/airtime_mvc/library/Zend/Locale/Data/pa_Guru_IN.xml
deleted file mode 100644
index 97aec4804..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_Guru_IN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.14 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pa"/>
-		<script type="Guru"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_IN.xml b/airtime_mvc/library/Zend/Locale/Data/pa_IN.xml
deleted file mode 100644
index ea123c203..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_IN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pa"/>
-		<territory type="IN"/>
-	</identity>
-	<alias source="pa_Guru_IN" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pa_PK.xml b/airtime_mvc/library/Zend/Locale/Data/pa_PK.xml
deleted file mode 100644
index 942fa027b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pa_PK.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pa"/>
-		<territory type="PK"/>
-	</identity>
-	<alias source="pa_Arab_PK" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pl.xml b/airtime_mvc/library/Zend/Locale/Data/pl.xml
deleted file mode 100644
index 4080ec357..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pl.xml
+++ /dev/null
@@ -1,3095 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.122 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="pl"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abchaski</language>
-			<language type="ace">aceh</language>
-			<language type="ach">aczoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adygejski</language>
-			<language type="ae">awestyjski</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afro-azjatycki</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ajnu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akadyjski</language>
-			<language type="ale">aleucki</language>
-			<language type="alg">języki algonkin</language>
-			<language type="alt">południowoałtajski</language>
-			<language type="am">amharski</language>
-			<language type="an">aragoński</language>
-			<language type="ang">staroangielski</language>
-			<language type="anp">angika</language>
-			<language type="apa">język Apaczów</language>
-			<language type="ar">arabski</language>
-			<language type="arc">aramejski</language>
-			<language type="arn">araukański</language>
-			<language type="arp">arapaho</language>
-			<language type="art">sztuczny</language>
-			<language type="arw">arawak</language>
-			<language type="as">asamski</language>
-			<language type="ast">asturyjski</language>
-			<language type="ath">język Atapasków</language>
-			<language type="aus">język australijski</language>
-			<language type="av">awarski</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">ajmara</language>
-			<language type="az">azerski</language>
-			<language type="ba">baszkirski</language>
-			<language type="bad">język banda</language>
-			<language type="bai">język bamileke</language>
-			<language type="bal">beludżi</language>
-			<language type="ban">balijski</language>
-			<language type="bas">basa</language>
-			<language type="bat">bałtycki</language>
-			<language type="be">białoruski</language>
-			<language type="bej">bedża</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberski</language>
-			<language type="bg">bułgarski</language>
-			<language type="bh">biharski</language>
-			<language type="bho">bhodźpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengalski</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tybetański</language>
-			<language type="br">bretoński</language>
-			<language type="bra">bradź</language>
-			<language type="bs">bośniacki</language>
-			<language type="btk">batak</language>
-			<language type="bua">buriacki</language>
-			<language type="bug">bugiński</language>
-			<language type="byn">blin</language>
-			<language type="ca">kataloński</language>
-			<language type="cad">kaddo</language>
-			<language type="cai">język Indian środkowoamerykańskich</language>
-			<language type="car">karibi</language>
-			<language type="cau">kaukaski</language>
-			<language type="cch">atsam</language>
-			<language type="ce">czeczeński</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">celtycki</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">czibcza</language>
-			<language type="chg">czagatajski</language>
-			<language type="chk">truk</language>
-			<language type="chm">maryjski</language>
-			<language type="chn">żargon Chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">czirokezki</language>
-			<language type="chy">język Czejenów</language>
-			<language type="cmc">czam</language>
-			<language type="co">korsykański</language>
-			<language type="cop">koptyjski</language>
-			<language type="cpe">angielski kreolski lub pidżin</language>
-			<language type="cpf">francuski kreolski lub pidżin</language>
-			<language type="cpp">portugalski kreolski lub pidżin</language>
-			<language type="cr">kri</language>
-			<language type="crh">krymski turecki</language>
-			<language type="crp">kreolski lub pidżin</language>
-			<language type="cs">czeski</language>
-			<language type="csb">kaszubski</language>
-			<language type="cu">staro-cerkiewno-słowiański</language>
-			<language type="cus">kuszycki</language>
-			<language type="cv">czuwaski</language>
-			<language type="cy">walijski</language>
-			<language type="da">duński</language>
-			<language type="dak">dakota</language>
-			<language type="dar">dargwijski</language>
-			<language type="day">dajak</language>
-			<language type="de">niemiecki</language>
-			<language type="de_AT">austriacki niemiecki</language>
-			<language type="de_CH">wysokoniemiecki (Szwajcaria)</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">drawidyjski</language>
-			<language type="dsb">dolnołużycki</language>
-			<language type="dua">duala</language>
-			<language type="dum">średniowieczny niderlandzki</language>
-			<language type="dv">malediwski</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">dzongkha</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">starożytny egipski</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grecki</language>
-			<language type="elx">elamicki</language>
-			<language type="en">angielski</language>
-			<language type="en_CA">kanadyjski angielski</language>
-			<language type="en_GB">brytyjski angielski</language>
-			<language type="en_US">angielski (USA)</language>
-			<language type="enm">średnioangielski</language>
-			<language type="eo">esperanto</language>
-			<language type="es">hiszpański</language>
-			<language type="es_419">hiszpański (Ameryka �acińska)</language>
-			<language type="et">estoński</language>
-			<language type="eu">baskijski</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">perski</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">fiński</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">ugrofiński</language>
-			<language type="fj">fidżijski</language>
-			<language type="fo">farerski</language>
-			<language type="fon">fon</language>
-			<language type="fr">francuski</language>
-			<language type="fr_CA">kanadyjski francuski</language>
-			<language type="frm">średniofrancuski</language>
-			<language type="fro">starofrancuski</language>
-			<language type="frr">północnofryzyjski</language>
-			<language type="frs">fryzyjski wschodni</language>
-			<language type="fur">friulijski</language>
-			<language type="fy">fryzyjski</language>
-			<language type="ga">irlandzki</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">szkocki gaelicki</language>
-			<language type="gem">germański</language>
-			<language type="gez">gyyz</language>
-			<language type="gil">gilbertański</language>
-			<language type="gl">galisyjski</language>
-			<language type="gmh">średnio-wysoko-niemiecki</language>
-			<language type="gn">guarani</language>
-			<language type="goh">staro-wysoko-niemiecki</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gocki</language>
-			<language type="grb">grebo</language>
-			<language type="grc">starogrecki</language>
-			<language type="gsw">szwajcarski niemiecki</language>
-			<language type="gu">gudźaracki</language>
-			<language type="gv">manx</language>
-			<language type="gwi">Gwichʼin</language>
-			<language type="ha">hausa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawajski</language>
-			<language type="he">hebrajski</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligajnon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hetycki</language>
-			<language type="hmn">hmongijski</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">chorwacki</language>
-			<language type="hsb">górnołużycki</language>
-			<language type="ht">haitański</language>
-			<language type="hu">węgierski</language>
-			<language type="hup">hupa</language>
-			<language type="hy">ormiański</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">ibanag</language>
-			<language type="id">indonezyjski</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igbo</language>
-			<language type="ii">syczuański</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">ilokano</language>
-			<language type="inc">indoaryjski</language>
-			<language type="ine">indoeuropejski</language>
-			<language type="inh">inguski</language>
-			<language type="io">ido</language>
-			<language type="ira">irański</language>
-			<language type="iro">irokeski</language>
-			<language type="is">islandzki</language>
-			<language type="it">włoski</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japoński</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judeoperski</language>
-			<language type="jrb">judeoarabski</language>
-			<language type="jv">jawajski</language>
-			<language type="ka">gruziński</language>
-			<language type="kaa">karakałpacki</language>
-			<language type="kab">kabylski</language>
-			<language type="kac">kaczin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">kareński</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardyjski</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisan</language>
-			<language type="kho">chotański</language>
-			<language type="ki">kikuju</language>
-			<language type="kj">kwanyama</language>
-			<language type="kk">kazachski</language>
-			<language type="kl">grenlandzki</language>
-			<language type="km">khmerski</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreański</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosrae</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karaczajsko-bałkarski</language>
-			<language type="krl">karelski</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kaszmirski</language>
-			<language type="ku">kurdyjski</language>
-			<language type="kum">kumycki</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">kornijski</language>
-			<language type="ky">kirgiski</language>
-			<language type="la">łaciński</language>
-			<language type="lad">ladyński</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luksemburski</language>
-			<language type="lez">lezgijski</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburgijski</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotański</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litewski</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">Å‚otewski</language>
-			<language type="mad">madurajski</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandingo</language>
-			<language type="map">austronezyjski</language>
-			<language type="mas">masajski</language>
-			<language type="mdf">moksha</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgaski</language>
-			<language type="mga">średnioirlandzki</language>
-			<language type="mh">marshall</language>
-			<language type="mi">maoryjski</language>
-			<language type="mic">micmac</language>
-			<language type="min">minangkabu</language>
-			<language type="mis">inny język</language>
-			<language type="mk">macedoński</language>
-			<language type="mkh">mon-khmer</language>
-			<language type="ml">malajalam</language>
-			<language type="mn">mongolski</language>
-			<language type="mnc">manchu</language>
-			<language type="mni">manipuryjski</language>
-			<language type="mno">manobo</language>
-			<language type="mo">mołdawski</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malajski</language>
-			<language type="mt">maltański</language>
-			<language type="mul">wiele języków</language>
-			<language type="mun">mundajski</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandese</language>
-			<language type="mwr">marwari</language>
-			<language type="my">birmański</language>
-			<language type="myn">język Majów</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauru</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">język Indian północnoamerykańskich</language>
-			<language type="nap">neapolitański</language>
-			<language type="nb">norweski Bokmål</language>
-			<language type="nd">ndebele północny</language>
-			<language type="nds">dolnosaksoński</language>
-			<language type="ne">nepalski</language>
-			<language type="new">newarski</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">nigrokordofański</language>
-			<language type="niu">niue</language>
-			<language type="nl">niderlandzki</language>
-			<language type="nl_BE">flamandzki (Belgia)</language>
-			<language type="nn">norweski Nynorsk</language>
-			<language type="no">norweski</language>
-			<language type="nog">nogajski</language>
-			<language type="non">staronordyjski</language>
-			<language type="nqo">n’ko</language>
-			<language type="nr">ndebele południowy</language>
-			<language type="nso">sotho północny</language>
-			<language type="nub">nubijski</language>
-			<language type="nv">nawaho</language>
-			<language type="nwc">newarski klasyczny</language>
-			<language type="ny">njandża</language>
-			<language type="nym">niamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzema</language>
-			<language type="oc">prowansalski</language>
-			<language type="oj">odżibwa</language>
-			<language type="om">oromski</language>
-			<language type="or">orija</language>
-			<language type="os">osetyjski</language>
-			<language type="osa">osage</language>
-			<language type="ota">osmańsko-turecki</language>
-			<language type="oto">otomi</language>
-			<language type="pa">pendżabski</language>
-			<language type="paa">papuaski</language>
-			<language type="pag">pangasino</language>
-			<language type="pal">pahlavi</language>
-			<language type="pam">pampango</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palau</language>
-			<language type="peo">staroperski</language>
-			<language type="phi">filipiński</language>
-			<language type="phn">fenicki</language>
-			<language type="pi">palijski</language>
-			<language type="pl">polski</language>
-			<language type="pon">ponpejski</language>
-			<language type="pra">prakryty</language>
-			<language type="pro">staroprowansalski</language>
-			<language type="ps">paszto</language>
-			<language type="pt">portugalski</language>
-			<language type="pt_BR">brazylyjski portugalski</language>
-			<language type="qu">keczua</language>
-			<language type="raj">radźasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotonga</language>
-			<language type="rm">retoromański</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumuński</language>
-			<language type="roa">romański</language>
-			<language type="rom">cygański</language>
-			<language type="root">język rdzenny</language>
-			<language type="ru">rosyjski</language>
-			<language type="rup">arumuński</language>
-			<language type="rw">kinya-ruanda</language>
-			<language type="sa">sanskryt</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakucki</language>
-			<language type="sai">język Indian południowoamerykańskich</language>
-			<language type="sal">salisz</language>
-			<language type="sam">samarytański aramejski</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardyński</language>
-			<language type="scn">sycylijski</language>
-			<language type="sco">szkocki</language>
-			<language type="sd">sindhi</language>
-			<language type="se">lapoński północny</language>
-			<language type="sel">selkupski</language>
-			<language type="sem">semicki</language>
-			<language type="sg">sango</language>
-			<language type="sga">staroirlandzki</language>
-			<language type="sgn">migowy</language>
-			<language type="sh">serbsko-chorwacki</language>
-			<language type="shn">shan</language>
-			<language type="si">syngaleski</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouański</language>
-			<language type="sit">chińsko-tybetański</language>
-			<language type="sk">słowacki</language>
-			<language type="sl">słoweński</language>
-			<language type="sla">słowiański</language>
-			<language type="sm">samoański</language>
-			<language type="sma">lapoński południowy</language>
-			<language type="smi">lapoński</language>
-			<language type="smj">lapoński Lule</language>
-			<language type="smn">lapoński Inari</language>
-			<language type="sms">lapoński Skolt</language>
-			<language type="sn">szona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somalijski</language>
-			<language type="sog">sogdyjski</language>
-			<language type="son">songhaj</language>
-			<language type="sq">albański</language>
-			<language type="sr">serbski</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">siswati</language>
-			<language type="ssa">nilosaharyjski</language>
-			<language type="st">sotho południowy</language>
-			<language type="su">sundajski</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumeryjski</language>
-			<language type="sv">szwedzki</language>
-			<language type="sw">suahili</language>
-			<language type="syc">syriacki</language>
-			<language type="syr">syryjski</language>
-			<language type="ta">tamilski</language>
-			<language type="tai">tai</language>
-			<language type="te">telugu</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadżycki</language>
-			<language type="th">tajski</language>
-			<language type="ti">tigrinia</language>
-			<language type="tig">tigre</language>
-			<language type="tiv">tiw</language>
-			<language type="tk">turkmeński</language>
-			<language type="tkl">tokelau</language>
-			<language type="tl">tagalski</language>
-			<language type="tlh">klingoński</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamaszek</language>
-			<language type="tn">setswana</language>
-			<language type="to">tonga</language>
-			<language type="tog">tonga (Niasa)</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turecki</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatarski</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupi</language>
-			<language type="tut">ałtajski</language>
-			<language type="tvl">tuvalu</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitański</language>
-			<language type="tyv">tuwiński</language>
-			<language type="udm">udmurcki</language>
-			<language type="ug">ujgurski</language>
-			<language type="uga">ugarycki</language>
-			<language type="uk">ukraiński</language>
-			<language type="umb">umbundu</language>
-			<language type="und">nieznany lub niepoprawny język</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbecki</language>
-			<language type="vai">wai</language>
-			<language type="ve">venda</language>
-			<language type="vi">wietnamski</language>
-			<language type="vo">volapuk</language>
-			<language type="vot">wotiacki</language>
-			<language type="wa">waloński</language>
-			<language type="wak">wakasz</language>
-			<language type="wal">walamo</language>
-			<language type="war">waraj</language>
-			<language type="was">washo</language>
-			<language type="wen">łużycki</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kałmucki</language>
-			<language type="xh">khosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">japski</language>
-			<language type="yi">jidysz</language>
-			<language type="yo">joruba</language>
-			<language type="ypk">jupik</language>
-			<language type="za">czuang</language>
-			<language type="zap">zapotecki</language>
-			<language type="zbl">bliss</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">chiński</language>
-			<language type="zh_Hans">chiński (uproszczony)</language>
-			<language type="zh_Hant">chiński (tradycyjny)</language>
-			<language type="znd">azande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">brak treści o charakterze lingwistycznym</language>
-			<language type="zza">zazaki</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabskie</script>
-			<script type="Armi">armi</script>
-			<script type="Armn">ormiańskie</script>
-			<script type="Avst">awestyjskie</script>
-			<script type="Bali">balijskie</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengalskie</script>
-			<script type="Blis">symbole Blissa</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">Braille’a</script>
-			<script type="Bugi">bugińskie</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">Zunifikowane symbole kanadyjskich autochtonów</script>
-			<script type="Cari">karyjskie</script>
-			<script type="Cham">czamskie</script>
-			<script type="Cher">Irokeski</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">koptyjskie</script>
-			<script type="Cprt">cypryjskie</script>
-			<script type="Cyrl">cyrylica</script>
-			<script type="Cyrs">cyrylica staro-cerkiewno-słowiańska</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">egipskie demotyczne</script>
-			<script type="Egyh">egipskie hieratyczne</script>
-			<script type="Egyp">hieroglify egipskie</script>
-			<script type="Ethi">etiopskie</script>
-			<script type="Geok">gruzińskie chucuri</script>
-			<script type="Geor">gruzińskie</script>
-			<script type="Glag">głagolica</script>
-			<script type="Goth">gotyckie</script>
-			<script type="Grek">greckie</script>
-			<script type="Gujr">gudźarackie</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangyl</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">Uproszczony Han</script>
-			<script type="Hant">Tradycyjny Han</script>
-			<script type="Hebr">hebrajskie</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana lub hiragana</script>
-			<script type="Hung">starowęgierskie</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">starowłoskie</script>
-			<script type="Java">jawajskie</script>
-			<script type="Jpan">japońskie</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">charosti</script>
-			<script type="Khmr">khmerskie</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">koreańskie</script>
-			<script type="Kthi">kaithi</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotańskie</script>
-			<script type="Latf">łaciński - fraktura</script>
-			<script type="Latg">łaciński - odmiana gaelicka</script>
-			<script type="Latn">łacińskie</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">linearne A</script>
-			<script type="Linb">linearne B</script>
-			<script type="Lyci">likijskie</script>
-			<script type="Lydi">lidyjskie</script>
-			<script type="Mand">mandejskie</script>
-			<script type="Mani">manichejskie</script>
-			<script type="Maya">hieroglify Majów</script>
-			<script type="Mero">meroickie</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongolskie</script>
-			<script type="Moon">Moon'a</script>
-			<script type="Mtei">meitei mayek</script>
-			<script type="Mymr">birmańskie</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">ol chiki</script>
-			<script type="Orkh">orchońskie</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanya</script>
-			<script type="Perm">staropermskie</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">inskrypcyjne pahlawi</script>
-			<script type="Phlp">pahlawi psałterzowy</script>
-			<script type="Phlv">pahlawi książkowy</script>
-			<script type="Phnx">fenicki</script>
-			<script type="Plrd">fonetyczny Pollard'a</script>
-			<script type="Prti">partyjski inskrypcyjny</script>
-			<script type="Qaai">dziedziczone</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runiczne</script>
-			<script type="Samr">samarytański</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">pismo znakowe</script>
-			<script type="Shaw">shawa</script>
-			<script type="Sinh">syngaleskie</script>
-			<script type="Sund">sundajskie</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">Syryjski</script>
-			<script type="Syre">syriacki estrangelo</script>
-			<script type="Syrj">Syryjski (odmiana zachodnia)</script>
-			<script type="Syrn">Syryjski (odmiana wschodnia)</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">nowy tai lue</script>
-			<script type="Taml">tamilskie</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">Tifinagh (berberski)</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tajskie</script>
-			<script type="Tibt">tybetańskie</script>
-			<script type="Ugar">ugaryckie</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">Visible Speech</script>
-			<script type="Xpeo">staroperskie</script>
-			<script type="Xsux">klinowe sumero-akadyjskie</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">notacja matematyczna</script>
-			<script type="Zsym">Symbols</script>
-			<script type="Zxxx">język bez systemu pisma</script>
-			<script type="Zyyy">wspólne</script>
-			<script type="Zzzz">nieznane lub niepoprawne</script>
-		</scripts>
-		<territories>
-			<territory type="001">Åšwiat</territory>
-			<territory type="002">Afryka</territory>
-			<territory type="003">Ameryka Północna</territory>
-			<territory type="005">Ameryka Południowa</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Afryka Zachodnia</territory>
-			<territory type="013">Ameryka Åšrodkowa</territory>
-			<territory type="014">Afryka Wschodnia</territory>
-			<territory type="015">Afryka Północna</territory>
-			<territory type="017">Afryka Åšrodkowa</territory>
-			<territory type="018">Afryka Południowa</territory>
-			<territory type="019">Ameryka</territory>
-			<territory type="021">Ameryka Północna - Kanada, USA</territory>
-			<territory type="029">Karaiby</territory>
-			<territory type="030">Azja Wschodnia</territory>
-			<territory type="034">Azja Południowa</territory>
-			<territory type="035">Azja Południowo-Wschodnia</territory>
-			<territory type="039">Europa Południowa</territory>
-			<territory type="053">Australia i Nowa Zelandia</territory>
-			<territory type="054">Melanezja</territory>
-			<territory type="057">Mikronezja</territory>
-			<territory type="061">Polinezja</territory>
-			<territory type="062">Azja Południowo-Środkowa</territory>
-			<territory type="142">Azja</territory>
-			<territory type="143">Azja Åšrodkowa</territory>
-			<territory type="145">Azja Zachodnia</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa Wschodnia</territory>
-			<territory type="154">Europa Północna</territory>
-			<territory type="155">Europa Zachodnia</territory>
-			<territory type="172">Wspólnota Niezależnych Państw</territory>
-			<territory type="419">Ameryka �acińska i Karaiby</territory>
-			<territory type="830">Wyspy Normandzkie</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Zjednoczone Emiraty Arabskie</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua i Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antyle Holenderskie</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktyka</territory>
-			<territory type="AR">Argentyna</territory>
-			<territory type="AS">Samoa Amerykańskie</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Wyspy Alandzkie</territory>
-			<territory type="AZ">Azerbejdżan</territory>
-			<territory type="BA">Bośnia i Hercegowina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesz</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bułgaria</territory>
-			<territory type="BH">Bahrajn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermudy</territory>
-			<territory type="BN">Brunei Darussalam</territory>
-			<territory type="BO">Boliwia</territory>
-			<territory type="BR">Brazylia</territory>
-			<territory type="BS">Bahamy</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Wyspa Bouveta</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Białoruś</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Wyspy Kokosowe</territory>
-			<territory type="CD">Demokratyczna Republika Konga</territory>
-			<territory type="CF">Republika Środkowoafrykańska</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Szwajcaria</territory>
-			<territory type="CI">Wybrzeże Kości Słoniowej</territory>
-			<territory type="CK">Wyspy Cooka</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Chiny</territory>
-			<territory type="CO">Kolumbia</territory>
-			<territory type="CR">Kostaryka</territory>
-			<territory type="CS">Serbia i Czarnogóra</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Republika Zielonego PrzylÄ…dka</territory>
-			<territory type="CX">Wyspa Bożego Narodzenia</territory>
-			<territory type="CY">Cypr</territory>
-			<territory type="CZ">Czechy</territory>
-			<territory type="DE">Niemcy</territory>
-			<territory type="DJ">Dżibuti</territory>
-			<territory type="DK">Dania</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Republika Dominikańska</territory>
-			<territory type="DZ">Algieria</territory>
-			<territory type="EC">Ekwador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egipt</territory>
-			<territory type="EH">Sahara Zachodnia</territory>
-			<territory type="ER">Erytrea</territory>
-			<territory type="ES">Hiszpania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finlandia</territory>
-			<territory type="FJ">Fidżi</territory>
-			<territory type="FK">Falklandy</territory>
-			<territory type="FM">Federalne Stany Mikronezji</territory>
-			<territory type="FO">Wyspy Owcze</territory>
-			<territory type="FR">Francja</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Wielka Brytania</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzja</territory>
-			<territory type="GF">Gujana Francuska</territory>
-			<territory type="GG">Wyspa Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grenlandia</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Gwinea</territory>
-			<territory type="GP">Gwadelupa</territory>
-			<territory type="GQ">Gwinea Równikowa</territory>
-			<territory type="GR">Grecja</territory>
-			<territory type="GS">Georgia Południowa i Sandwich Południowy</territory>
-			<territory type="GT">Gwatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gwinea Bissau</territory>
-			<territory type="GY">Gujana</territory>
-			<territory type="HK">Hongkong, Specjalny Region Administracyjny Chin</territory>
-			<territory type="HM">Wyspy Heard i McDonalda</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Chorwacja</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Węgry</territory>
-			<territory type="ID">Indonezja</territory>
-			<territory type="IE">Irlandia</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Wyspa Man</territory>
-			<territory type="IN">Indie</territory>
-			<territory type="IO">Terytorium Brytyjskie Oceanu Indyjskiego</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islandia</territory>
-			<territory type="IT">WÅ‚ochy</territory>
-			<territory type="JE">Wyspa Jersey</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordania</territory>
-			<territory type="JP">Japonia</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgistan</territory>
-			<territory type="KH">Kambodża</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komory</territory>
-			<territory type="KN">Saint Kitts i Nevis</territory>
-			<territory type="KP">Korea Północna</territory>
-			<territory type="KR">Korea Południowa</territory>
-			<territory type="KW">Kuwejt</territory>
-			<territory type="KY">Kajmany</territory>
-			<territory type="KZ">Kazachstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litwa</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">�otwa</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Mołdawia</territory>
-			<territory type="ME">Czarnogóra</territory>
-			<territory type="MF">Sint Maarten</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Wyspy Marshalla</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Birma</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makau, Specjalny Region Administracyjny Chin</territory>
-			<territory type="MP">Mariany Północne</territory>
-			<territory type="MQ">Martynika</territory>
-			<territory type="MR">Mauretania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Malediwy</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Meksyk</territory>
-			<territory type="MY">Malezja</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nowa Kaledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Holandia</territory>
-			<territory type="NO">Norwegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nowa Zelandia</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polinezja Francuska</territory>
-			<territory type="PG">Papua Nowa Gwinea</territory>
-			<territory type="PH">Filipiny</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polska</territory>
-			<territory type="PM">Saint-Pierre i Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portoryko</territory>
-			<territory type="PS">Terytoria Palestyńskie</territory>
-			<territory type="PT">Portugalia</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragwaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Oceania inne</territory>
-			<territory type="QU">Unia Europejska</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Rumunia</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rosja</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Arabia Saudyjska</territory>
-			<territory type="SB">Wyspy Salomona</territory>
-			<territory type="SC">Seszele</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Szwecja</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Wyspa Świętej Heleny</territory>
-			<territory type="SI">SÅ‚owenia</territory>
-			<territory type="SJ">Svalbard i Jan Mayen</territory>
-			<territory type="SK">SÅ‚owacja</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Wyspy Świętego Tomasza i Książęca</territory>
-			<territory type="SV">Salwador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Suazi</territory>
-			<territory type="TC">Turks i Caicos</territory>
-			<territory type="TD">Czad</territory>
-			<territory type="TF">Francuskie Terytoria Południowe</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajlandia</territory>
-			<territory type="TJ">Tadżykistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Wschodni</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunezja</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turcja</territory>
-			<territory type="TT">Trynidad i Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Dalekie Wyspy Mniejsze Stanów Zjednoczonych</territory>
-			<territory type="US">Stany Zjednoczone</territory>
-			<territory type="UY">Urugwaj</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Watykan</territory>
-			<territory type="VC">Saint Vincent i Grenadyny</territory>
-			<territory type="VE">Wenezuela</territory>
-			<territory type="VG">Brytyjskie Wyspy Dziewicze</territory>
-			<territory type="VI">Wyspy Dziewicze Stanów Zjednoczonych</territory>
-			<territory type="VN">Wietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis i Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Majotta</territory>
-			<territory type="ZA">Republika Południowej Afryki</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Nieznany lub nieprawidłowy region</territory>
-		</territories>
-		<variants>
-			<variant type="1901">tradycyjna ortografia niemiecka</variant>
-			<variant type="1994">standardowa ortografia regionu Resia</variant>
-			<variant type="1996">ortografia niemiecka z 1996 r.</variant>
-			<variant type="1606NICT">szesnastowieczny francuski</variant>
-			<variant type="1694ACAD">siedemnastowieczny francuski</variant>
-			<variant type="AREVELA">ormiański wchodni</variant>
-			<variant type="AREVMDA">ormiański zachodni</variant>
-			<variant type="BAKU1926">turecki zunifikowany alfabet łaciński</variant>
-			<variant type="BISKE">dialekt San Giorgio/Bila</variant>
-			<variant type="BOONT">dialekt Boontling</variant>
-			<variant type="FONIPA">fonetyczny międzynarodowy</variant>
-			<variant type="FONUPA">fonetyczny</variant>
-			<variant type="LIPAW">dialekt Lipovaz w regionie Resia</variant>
-			<variant type="MONOTON">monotoniczny</variant>
-			<variant type="NEDIS">dialekt Natisone</variant>
-			<variant type="NJIVA">dialekt Gniva/Njiva</variant>
-			<variant type="OSOJS">dialekt Oseacco/Osojane</variant>
-			<variant type="POLYTON">politoniczny</variant>
-			<variant type="POSIX">komputerowy</variant>
-			<variant type="REVISED">ortografia zreformowana</variant>
-			<variant type="ROZAJ">dialekt regionu Resia</variant>
-			<variant type="SAAHO">dialekt Saho</variant>
-			<variant type="SCOTLAND">standardowy szkocki angielski</variant>
-			<variant type="SCOUSE">dialekt Scouse</variant>
-			<variant type="SOLBA">dialekt Stolvizza/Solbica</variant>
-			<variant type="TARASK">ortografia taraszkiewicka</variant>
-			<variant type="VALENCIA">walencki</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalendarz</key>
-			<key type="collation">sortowanie</key>
-			<key type="currency">waluta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">chiński tradycyjny porządek sortowania - Big5</type>
-			<type type="buddhist" key="calendar">kalendarz buddyjski</type>
-			<type type="chinese" key="calendar">kalendarz chiński</type>
-			<type type="direct" key="collation">bezpośredni porządek sortowania</type>
-			<type type="gb2312han" key="collation">chiński uproszczony porządek sortowania - GB2312</type>
-			<type type="gregorian" key="calendar">kalendarz gregoriański</type>
-			<type type="hebrew" key="calendar">kalendarz hebrajski</type>
-			<type type="indian" key="calendar">narodowy kalendarz hinduski</type>
-			<type type="islamic" key="calendar">kalendarz islamski (metoda wzrokowa)</type>
-			<type type="islamic-civil" key="calendar">kalendarz islamski (metoda obliczeniowa)</type>
-			<type type="japanese" key="calendar">kalendarz japoński</type>
-			<type type="phonebook" key="collation">porządek sortowania książki telefonicznej</type>
-			<type type="pinyin" key="collation">porzÄ…dek sortowania pinyin</type>
-			<type type="roc" key="calendar">kalendarz Republiki Chińskiej</type>
-			<type type="stroke" key="collation">porządek akcentów</type>
-			<type type="traditional" key="collation">tradycyjny porzÄ…dek sortowania</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metryczny</measurementSystemName>
-			<measurementSystemName type="US">anglosaski</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Język: {0}</codePattern>
-			<codePattern type="script">Pismo: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a ą b c ć d e ę f-l ł m n ń o ó p r s ś t u w y z ź ż]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q v x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">sty</month>
-							<month type="2">lut</month>
-							<month type="3">mar</month>
-							<month type="4">kwi</month>
-							<month type="5">maj</month>
-							<month type="6">cze</month>
-							<month type="7">lip</month>
-							<month type="8">sie</month>
-							<month type="9">wrz</month>
-							<month type="10">paź</month>
-							<month type="11">lis</month>
-							<month type="12">gru</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">stycznia</month>
-							<month type="2">lutego</month>
-							<month type="3">marca</month>
-							<month type="4">kwietnia</month>
-							<month type="5">maja</month>
-							<month type="6">czerwca</month>
-							<month type="7">lipca</month>
-							<month type="8">sierpnia</month>
-							<month type="9">września</month>
-							<month type="10">października</month>
-							<month type="11">listopada</month>
-							<month type="12">grudnia</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">s</month>
-							<month type="2">l</month>
-							<month type="3">m</month>
-							<month type="4">k</month>
-							<month type="5">m</month>
-							<month type="6">c</month>
-							<month type="7">l</month>
-							<month type="8">s</month>
-							<month type="9">w</month>
-							<month type="10">p</month>
-							<month type="11">l</month>
-							<month type="12">g</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">styczeń</month>
-							<month type="2">luty</month>
-							<month type="3">marzec</month>
-							<month type="4">kwiecień</month>
-							<month type="5">maj</month>
-							<month type="6">czerwiec</month>
-							<month type="7">lipiec</month>
-							<month type="8">sierpień</month>
-							<month type="9">wrzesień</month>
-							<month type="10">październik</month>
-							<month type="11">listopad</month>
-							<month type="12">grudzień</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">niedz.</day>
-							<day type="mon">pon.</day>
-							<day type="tue">wt.</day>
-							<day type="wed">śr.</day>
-							<day type="thu">czw.</day>
-							<day type="fri">pt.</day>
-							<day type="sat">sob.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">niedziela</day>
-							<day type="mon">poniedziałek</day>
-							<day type="tue">wtorek</day>
-							<day type="wed">środa</day>
-							<day type="thu">czwartek</day>
-							<day type="fri">piÄ…tek</day>
-							<day type="sat">sobota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">N</day>
-							<day type="mon">P</day>
-							<day type="tue">W</day>
-							<day type="wed">Åš</day>
-							<day type="thu">C</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">I kwartał</quarter>
-							<quarter type="2">II kwartał</quarter>
-							<quarter type="3">III kwartał</quarter>
-							<quarter type="4">IV kwartał</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1 kw.</quarter>
-							<quarter type="2">2 kw.</quarter>
-							<quarter type="3">3 kw.</quarter>
-							<quarter type="4">4 kw.</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">p.n.e.</era>
-						<era type="1">n.e.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">p.n.e.</era>
-						<era type="1">n.e.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">d MMM E</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">d MMMM E</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM-dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM-dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MM-d – E, MM-d</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy-MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy-MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd-dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM-dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yyyy-dd.MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yyyy - E, dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yyyy - E, dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd-MM-yyyy-E, dd-MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL-LLL y</greatestDifference>
-							<greatestDifference id="y">LLL y - LLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM.yyyy - MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy - MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Rok</displayName>
-					</field>
-					<field type="month">
-						<displayName>MiesiÄ…c</displayName>
-					</field>
-					<field type="week">
-						<displayName>Tydzień</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dzień</displayName>
-						<relative type="-3">Trzy dni temu</relative>
-						<relative type="-2">Przedwczoraj</relative>
-						<relative type="-1">Wczoraj</relative>
-						<relative type="0">Dzisiaj</relative>
-						<relative type="1">Jutro</relative>
-						<relative type="2">Pojutrze</relative>
-						<relative type="3">Za trzy dni</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Dzień tygodnia</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Godzina</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Strefa</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Czas: {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nieznane</exemplarCity>
-			</zone>
-			<zone type="Etc/GMT-1">
-				<exemplarCity>GMT-01:0</exemplarCity>
-			</zone>
-			<zone type="Etc/GMT-2">
-				<exemplarCity>GMT-02:00</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Afganistan</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Antigua i Barbuda</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erewan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Stacja Naukowa Rothera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Archipelag Palmera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Biegun południowy</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Stacja Syowa</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Wybrzeże Mawsona</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Stacja Davis</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Stacja Vostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Stacja Casey</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Mc Murdo</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Samoa Amerykańskie</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wiedeń</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelajda</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Wyspa Lord Howe</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>Maarianhamina</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Azerbejdżan</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>Sarajewo</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dakka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruksela</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Wagadugu</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Bułgaria</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrajn</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Bużumbura</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudy</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Boliwia</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Pôrto Velho</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Săo Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>Bahamy</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Bhutan</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Mińsk</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Wyspy Kokosowe</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinszasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Bangi</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Kongo Brazzaville</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zurych</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidżan</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Wyspy Cooka</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Wyspa Wielkanocna</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Duala</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kaszgar</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumczi</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Czunking</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Szanghaj</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Kolumbia</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostaryka</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Hawana</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Zielony PrzylÄ…dek</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Wyspa Bożego Narodzenia</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikozja</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Praga</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Niemcy</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Dżibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhaga</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Republika Dominikańska</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Algier</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Ekwador</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kair</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Ujun</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmara</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Wyspy Kanaryjskie</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madryt</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Finlandia</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidżi</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Falklandy (Malwiny)</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Wyspy Owcze</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Paryż</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londyn</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Gruzja</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Kajenna</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akra</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Grenlandia</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Bandżul</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Konakri</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Gwadelupa</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Ateny</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Georgia Południowa</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gwatemala</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gujana</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>Honduras</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>Zagrzeb</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Haiti</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapeszt</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Dżakarta</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Irlandia</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jerozolima</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>Wyspa Man</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Kalkuta</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Czagos</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Rejkiawik</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rzym</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Jordania</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biszkek</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Kambodża</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komory</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Saint Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Korea Północna</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuwejt</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kajmany</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Uralsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktiubińsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kyzył Orda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>AÅ‚ma Ata</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Wientian</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Bejrut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Saint Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Liechtenstein</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Kolombo</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Wilno</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Ryga</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Trypolis</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Kiszyniów</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Czarnogóra</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarywa</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>Macedonia</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangun</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Howd</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>UÅ‚an Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Czojbalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makau</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Mariany Północne</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martynika</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>Nawakszut</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Malediwy</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Meksyk</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Kuczing</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Windhuk</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Numea</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Niamej</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Wyspa Norfolk</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Nikaragua</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Holandia</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Norwegia</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Nepal</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Maskat</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Peru</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markizy</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Papua Nowa Gwinea</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Filipiny</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Karaczi</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warszawa</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Saint Pierre i Miquelon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Wyspy Pitcairn</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portoryko</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Terytoria Palestyńskie</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azory</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Madera</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lizbona</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukareszt</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Belgrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskwa</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Wołgograd</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterynburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Nowosybirsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkuck</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakuck</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>WÅ‚adywostok</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamczatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rijad</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Wyspy Salomona</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahé</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Chartum</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Sztokholm</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Święta Helena</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>Lublana</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>Bratysława</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadiszu</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Surinam</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Săo Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salwador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaszek</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Turks i Caicos</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>Ndżamena</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Wyspy Kerguelena</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Tajlandia</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Duszanbe</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Tokelau</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Timor Wschodni</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>Aszchabad</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Tonga</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Stambuł</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port-of-Spain</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Tuvalu</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Tajpej</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar es-Salaam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Użgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijów</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Symferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporoże</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburg</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticello</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Nowy Jork</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Urugwaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkanda</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taszkient</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>Watykan</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Wenezuela</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Brytyjskie Wyspy Dziewicze</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Saint Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Sajgon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Vanuatu</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Wallis i Futuna</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>Samoa</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Jemen</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Majotta</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Czas środkowoeuropejski</standard>
-					<daylight>Czas środkowoeuropejski letni</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Czas wschodnioeuropejski</standard>
-					<daylight>Czas wschodnioeuropejski letni</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Czas zachodnioeuropejski</standard>
-					<daylight>Czas zachodnioeuropejski letni</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>peseta andorska</displayName>
-				<displayName count="few">pesety andorskie</displayName>
-				<displayName count="other">peset andorskich</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>dirham arabski</displayName>
-				<displayName count="few">dirhamy arabskie</displayName>
-				<displayName count="other">dirhamów arabskich</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afgani (1927-2002)</displayName>
-				<displayName count="few">afgani (1927-2002)</displayName>
-				<displayName count="other">afgani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afgani</displayName>
-				<displayName count="few">afgani</displayName>
-				<displayName count="other">afgani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>lek albański</displayName>
-				<displayName count="few">leki albańskie</displayName>
-				<displayName count="other">leków albańskich</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram armeński</displayName>
-				<displayName count="few">dramy armeńskie</displayName>
-				<displayName count="other">dramów armeńskich</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>gulden Antyle Holenderskie</displayName>
-				<displayName count="few">guldeny Antyle Holenderskie</displayName>
-				<displayName count="other">guldenów (Antyle Holenderskie)</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>kwanza angolańska</displayName>
-				<displayName count="few">kwanzy angolańskie</displayName>
-				<displayName count="other">kwanz angolańskich</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>kwanza angolańska (1977-1990)</displayName>
-				<displayName count="few">kwanzy angolańskie (1977-1990)</displayName>
-				<displayName count="other">kwanz angolańskich (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>nowa kwanza angolańska (1990-2000)</displayName>
-				<displayName count="few">nowe kwanzy angolańskie (1990-2000)</displayName>
-				<displayName count="other">nowych kwanz angolańskich (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>kwanza angolańska Reajustado (1995-1999)</displayName>
-				<displayName count="few">kwanzy angolańskie Reajustado (1995-1999)</displayName>
-				<displayName count="other">kwanz angolańskich Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>austral argentyński</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>peso argentyńskie (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>peso argentyńskie</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>szyling austriacki </displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>dolar australijski</displayName>
-				<displayName count="few">dolary australijskie</displayName>
-				<displayName count="one">dolar australijski</displayName>
-				<displayName count="other">dolarów australijskich</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>gulden arubski</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>manat azerbejdżański</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat azerski</displayName>
-				<displayName count="few">manaty azerskie</displayName>
-				<displayName count="one">manat azerski</displayName>
-				<displayName count="other">manatów azerskich</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>dinar Bośni i Hercegowiny</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>marka konwertybilna Bośni i Hercegowiny</displayName>
-				<displayName count="few">marki wymienne Bośni i Hercegowiny</displayName>
-				<displayName count="one">marka wymienna Bośni i Hercegowiny</displayName>
-				<displayName count="other">marek wymiennych Bośni i Hercegowiny</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>dolar Barbadosu</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka bengalska</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>frank belgijski (zamienny)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>frank belgijski</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>frank belgijski (finansowy)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>lew bułgarski</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>nowy lew bułgarski</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>dinar bahrański</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>frank burundyjski</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>dolar bermudzki</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>dolar brunejski</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>peso boliwijskie</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>mvdol boliwijski</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>cruzeiro novo brazylijskie (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>cruzado brazylijskie</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>cruzeiro brazylijskie (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>real brazylijski</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>nowe cruzado brazylijskie</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>cruzeiro brazylijskie</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>dolar bahamski</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum Bhutanu</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat birmański</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>rubel białoruski (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>rubel białoruski</displayName>
-				<displayName count="few">ruble białoruskie</displayName>
-				<displayName count="one">rubel białoruski</displayName>
-				<displayName count="other">rubli białoruskich</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>dolar belizeński</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>dolar kanadyjski</displayName>
-				<displayName count="few">dolary kanadyjskie</displayName>
-				<displayName count="one">dolar kanadyjski</displayName>
-				<displayName count="other">dolarów kanadyjskich</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>frank kongijski</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>frank szwajcarski</displayName>
-				<displayName count="few">franki szwajcarskie</displayName>
-				<displayName count="one">frank szwajcarski</displayName>
-				<displayName count="other">franków szwajcarskich</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>peso chilijskie</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>juan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>peso kolumbijskie</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>colon kostarykański</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>stary dinar serbski</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>korona czechosłowacka</displayName>
-				<displayName count="few">korony czechosłowackie</displayName>
-				<displayName count="one">korona czechosłowacka</displayName>
-				<displayName count="other">koron czechosłowackich</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>peso kubańskie</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>escudo Zielonego PrzylÄ…dka</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>funt cypryjski</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>korona czeska</displayName>
-				<displayName count="few">korony czeskie</displayName>
-				<displayName count="one">korona czeska</displayName>
-				<displayName count="other">koron czeskich</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>wschodnia marka wschodnioniemiecka</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>marka niemiecka</displayName>
-				<displayName count="few">marki niemieckie</displayName>
-				<displayName count="one">marka niemiecka</displayName>
-				<displayName count="other">marek niemieckich</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>frank Dżibuti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>korona duńska</displayName>
-				<displayName count="few">korony duńskie</displayName>
-				<displayName count="one">korona duńska</displayName>
-				<displayName count="other">koron duńskich</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>peso dominikańskie</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar algierski</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>sucre ekwadorski</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>korona estońska</displayName>
-				<displayName count="few">korony estońskie</displayName>
-				<displayName count="one">korona estońska</displayName>
-				<displayName count="other">koron estońskich</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>funt egipski</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>nakfa erytrejska</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>peseta hiszpańska (Konto A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>peseta hiszpańska (konto wymienne)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>peseta hiszpańska</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr etiopski</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="few">euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>marka fińska</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>dolar fidżi</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>funt Wysp Falklandzkich</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>frank francuski </displayName>
-				<displayName count="few">franki francuskie</displayName>
-				<displayName count="one">frank francuski</displayName>
-				<displayName count="other">franków francuskich</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>funt szterling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>kupon gruziński larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari gruzińskie</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>cedi ghańskie</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>cedi Ghany</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>funt gibraltarski</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi gambijskie</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>frank gwinejski</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>syli gwinejskie</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekwele gwinejskie Gwinei Równikowej</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>drachma grecka</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal gwatemalski</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>escudo Gwinea Portugalska</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso Guinea-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>dolar gujański</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>dolar hongkoński</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira Hondurasu</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>dinar chorwacki</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna chorwacka</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde haitańskie</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>forint węgierski </displayName>
-				<displayName count="few">forinty węgierskie</displayName>
-				<displayName count="one">forint węgierski</displayName>
-				<displayName count="other">forintów węgierskich</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>rupia indonezyjska</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>funt irlandzki</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>funt izraelski</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>nowy szekel izraelski</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>rupia indyjska</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar iracki</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial irański</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>korona islandzka</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>lir włoski</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>dolar jamajski</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar jordański</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>jen japoński</displayName>
-				<displayName count="few">jeny japońskie</displayName>
-				<displayName count="one">jen japoński</displayName>
-				<displayName count="other">jenów japońskich</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>szyling kenijski</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>som kirgiski</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel kambodżański</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>frank komoryjski</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>won północnokoreański</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>won południowokoreański</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar kuwejcki</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>dolar kajmański</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>tenge kazachskie</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip laotański</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>funt libański</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>rupia lankijska</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>dolar liberyjski</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>loti Lesoto</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>lit litewski</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>talon litewski</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>frank luksemburski</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Å‚at Å‚otewski</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>rubel Å‚otewski</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar libijski</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>dirham marokański</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>frank marokański</displayName>
-				<displayName count="few">franki marokańskie</displayName>
-				<displayName count="one">frank marokański</displayName>
-				<displayName count="other">franków marokańskich</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>lej mołdawski</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>ariar malgaski</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>frank malgaski</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>denar macedoński</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>frank malijski</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>tugrik mongolski</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>pataka Macao</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>ouguiya mauterańska</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>lira maltańska</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>funt maltański</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>rupia Mauritius</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>rufiyaa malediwska</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>kwacha malawska</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>peso meksykańskie</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>peso srebrne meksykańskie (1861-1992)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit malezyjski</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>escudo mozambickie</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>metical Mozambik</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical Mozambiku</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>dolar namibijski</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>naira nigeryjska</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>cordoba nikaraguańska</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>cordoba oro nikaraguańska</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>gulden holenderski </displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>korona norweska</displayName>
-				<displayName count="few">korony norweskie</displayName>
-				<displayName count="one">korona norweska</displayName>
-				<displayName count="other">koron norweskich</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>rupia nepalska</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>dolar nowozelandzki</displayName>
-				<displayName count="few">dolary nowozelandzkie</displayName>
-				<displayName count="one">dolar nowozelandzki</displayName>
-				<displayName count="other">dolarów nowozelandzkich</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>rial Omanu</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panamski</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>inti peruwiański</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>nowy sol peruwiański</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol peruwiański</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina Papua Nowa Gwinea</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>peso filipińskie</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>rupia pakistańska</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>złoty polski</displayName>
-				<displayName count="few">złote polskie</displayName>
-				<displayName count="one">złoty polski</displayName>
-				<displayName count="other">złotych polskich</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>złoty polski (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>escudo portugalskie</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guarani paragwajskie</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>rial katarski</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>dolar rodezyjski</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>lej rumuński</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>nowa leja rumuńska</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar serbski</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>rubel rosyjski</displayName>
-				<displayName count="few">ruble rosyjskie</displayName>
-				<displayName count="one">rubel rosyjski</displayName>
-				<displayName count="other">rubli rosyjskich</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>rubel rosyjski (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>frank ruandyjski</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>rial saudyjski</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>dolar Wysp Salomona</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>rupia seszelska</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar sudański</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>funt sudański</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>stary funt sudański</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>korona szwedzka</displayName>
-				<displayName count="few">korony szwedzkie</displayName>
-				<displayName count="one">korona szwedzka</displayName>
-				<displayName count="other">koron szwedzkich</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>dolar singapurski</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>funt Wyspy Świętej Heleny</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>tolar słoweński</displayName>
-				<displayName count="few">tolary słoweńskie</displayName>
-				<displayName count="one">tolar słoweński</displayName>
-				<displayName count="other">tolarów słoweńskich</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>korona słowacka</displayName>
-				<displayName count="few">korony słowackie</displayName>
-				<displayName count="one">korona słowacka</displayName>
-				<displayName count="other">koron słowackich</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leone Sierra Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>szyling somalijski</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>dolar surinamski</displayName>
-				<displayName count="few">dolary surinamskie</displayName>
-				<displayName count="one">dolar surinamski</displayName>
-				<displayName count="other">dolarów surinamskich</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>gulden surinamski</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra Wysp Świętego Tomasza i Książęcej</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>rubel radziecki</displayName>
-				<displayName count="few">ruble radzieckie</displayName>
-				<displayName count="one">rubel radziecki</displayName>
-				<displayName count="other">rubli radzieckich</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>colon salwadorski</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>funt syryjski</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>lilangeni Suazi</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>baht tajski</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>rubel tadżycki</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>somoni tadżyckie</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>manat turkmeński</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunezyjski</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>paʻanga Tonga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>escudo timorskie</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>lir turecki</displayName>
-				<displayName count="few">liry tureckie</displayName>
-				<displayName count="one">lira turecka</displayName>
-				<displayName count="other">lir tureckich</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>nowa lira turecka</displayName>
-				<displayName count="few">nowe liry tureckie</displayName>
-				<displayName count="one">nowa lira turecka</displayName>
-				<displayName count="other">nowych lir tureckich</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dolar Trynidadu i Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>nowy dolar tajwański</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>szyling tanzański</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>hrywna ukraińska</displayName>
-				<displayName count="few">hrywny ukraińskie</displayName>
-				<displayName count="one">hrywna ukraińska</displayName>
-				<displayName count="other">hrywien ukraińskich</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>karbowaniec ukraiński</displayName>
-				<displayName count="few">karbowańce ukraińskie</displayName>
-				<displayName count="one">karbowaniec ukraiński</displayName>
-				<displayName count="other">karbowańców ukraińskich</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>szyling ugandyjski (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>szyling ugandyjski</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>dolar amerykański </displayName>
-				<displayName count="few">dolary amerykańskie</displayName>
-				<displayName count="one">dolar amerykański</displayName>
-				<displayName count="other">dolarów amerykańskich</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>peso urugwajskie (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>peso urugwajskie</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>som uzbecki</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>boliwar wenezuelski</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>boliwar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>dong wietnamski</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vatu Vanuatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>tala samoańska</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>frank CFA BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>srebro</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>złoto</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>dolar wschodniokaraibski</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>specjalne prawa ciÄ…gnienia</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ECU</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>frank złoty francuski</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>UIC-frank francuski</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>frank CFA</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>pallad</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>frank CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platyna</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>nieznana/nieprawidłowa waluta</displayName>
-				<displayName count="few">XXX</displayName>
-				<displayName count="one">nieznana/nieprawidłowa waluta</displayName>
-				<displayName count="other">XXX</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>dinar jemeński</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>rial jemeński</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>nowy dinar jugosławiański</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>dinar jugosławiański wymienny</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>rand południowoafrykański (finansowy)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand południowoafrykański</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>kwacha zambijska</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>nowy zair zairski</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zair zairski</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>dolar Zimbabwe</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dni</unitPattern>
-			<unitPattern count="one">{0} dzień</unitPattern>
-			<unitPattern count="other">{0} dni</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} godziny</unitPattern>
-			<unitPattern count="one">{0} godzina</unitPattern>
-			<unitPattern count="other">{0} godzin</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minuty</unitPattern>
-			<unitPattern count="one">{0} minuta</unitPattern>
-			<unitPattern count="other">{0} minut</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} miesiÄ…ce</unitPattern>
-			<unitPattern count="one">{0} miesiÄ…c</unitPattern>
-			<unitPattern count="other">{0} miesięcy</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekundy</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekund</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} tygodnie</unitPattern>
-			<unitPattern count="one">{0} tydzień</unitPattern>
-			<unitPattern count="other">{0} tygodni</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} lata</unitPattern>
-			<unitPattern count="one">{0} rok</unitPattern>
-			<unitPattern count="other">{0} lat</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>tak:t</yesstr>
-			<nostr>nie:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/pl_PL.xml b/airtime_mvc/library/Zend/Locale/Data/pl_PL.xml
deleted file mode 100644
index 784b16adb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pl_PL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pl"/>
-		<territory type="PL"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/postalCodeData.xml b/airtime_mvc/library/Zend/Locale/Data/postalCodeData.xml
deleted file mode 100644
index e534882a2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/postalCodeData.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-    <version number="$Revision: 1.3 $"/>
-    <generation date="$Date: 2009/05/05 23:15:57 $"/>
-	      <postalCodeData>
-            <postCodeRegex territoryId="GB" >GIR[ ]?0AA|((AB|AL|B|BA|BB|BD|BH|BL|BN|BR|BS|BT|CA|CB|CF|CH|CM|CO|CR|CT|CV|CW|DA|DD|DE|DG|DH|DL|DN|DT|DY|E|EC|EH|EN|EX|FK|FY|G|GL|GY|GU|HA|HD|HG|HP|HR|HS|HU|HX|IG|IM|IP|IV|JE|KA|KT|KW|KY|L|LA|LD|LE|LL|LN|LS|LU|M|ME|MK|ML|N|NE|NG|NN|NP|NR|NW|OL|OX|PA|PE|PH|PL|PO|PR|RG|RH|RM|S|SA|SE|SG|SK|SL|SM|SN|SO|SP|SR|SS|ST|SW|SY|TA|TD|TF|TN|TQ|TR|TS|TW|UB|W|WA|WC|WD|WF|WN|WR|WS|WV|YO|ZE)(\d[\dA-Z]?[]?\d[ABD-HJLN-UW-Z]{2}))|BFPO[ ]?\d{1,4}</postCodeRegex>
-            <postCodeRegex territoryId="JE" >JE\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="GG" >GY\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="IM" >IM\d[\dA-Z]?[ ]?\d[ABD-HJLN-UW-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="US" >\d{5}([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="CA" >[ABCEGHJKLMNPRSTVXY]\d[A-Z][ ]?\d[A-Z]\d</postCodeRegex>
-            <postCodeRegex territoryId="DE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="JP" >\d{3}-\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="FR" >\d{2}[ ]?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="AU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CH" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="AT" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ES" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NL" >\d{4}[ ]?[A-Z]{2}</postCodeRegex>
-            <postCodeRegex territoryId="BE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="DK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="SE" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NO" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BR" >\d{5}[\-]?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PT" >\d{4}([\-]\d{3})?</postCodeRegex>
-            <postCodeRegex territoryId="FI" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AX" >22\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="KR" >\d{3}[\-]\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="CN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="TW" >\d{3}(\d{2})?</postCodeRegex>
-            <postCodeRegex territoryId="SG" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="DZ" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AD" >AD\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="AR" >([A-HJ-NP-Z])?\d{4}([A-Z]{3})?</postCodeRegex>
-            <postCodeRegex territoryId="AM" >(37)?\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="AZ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BH" >((1[0-2]|[2-9])\d{2})?</postCodeRegex>
-            <postCodeRegex territoryId="BD" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BB" >(BB\d{5})?</postCodeRegex>
-            <postCodeRegex territoryId="BY" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="BM" >[A-Z]{2}[ ]?[A-Z0-9]{2}</postCodeRegex>
-            <postCodeRegex territoryId="BA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="IO" >BBND 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="BN" >[A-Z]{2}[ ]?\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="BG" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="KH" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CV" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CL" >\d{7}</postCodeRegex>
-            <postCodeRegex territoryId="CR" >\d{4,5}|\d{3}-\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HR" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CY" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CZ" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="DO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="EC" >([A-Z]\d{4}[A-Z]|(?:[A-Z]{2})?\d{6})?</postCodeRegex>
-            <postCodeRegex territoryId="EG" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="EE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="FO" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="GE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="GR" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GL" >39\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="HT" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HN" >(?:\d{5})?</postCodeRegex>
-            <postCodeRegex territoryId="HU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IS" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="IN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="ID" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="IE" >((D|DUBLIN)?([1-9]|6[wW]|1[0-8]|2[024]))?</postCodeRegex>
-            <postCodeRegex territoryId="IL" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="JO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KZ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="KE" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KW" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LV" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LB" >(\d{4}([ ]?\d{4})?)?</postCodeRegex>
-            <postCodeRegex territoryId="LI" >(948[5-9])|(949[0-7])</postCodeRegex>
-            <postCodeRegex territoryId="LT" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="LU" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MY" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MV" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MT" >[A-Z]{3}[ ]?\d{2,4}</postCodeRegex>
-            <postCodeRegex territoryId="MU" >(\d{3}[A-Z]{2}\d{3})?</postCodeRegex>
-            <postCodeRegex territoryId="MX" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="MD" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="MC" >980\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="MA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NP" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="NZ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="NI" >((\d{4}-)?\d{3}-\d{3}(-\d{1})?)?</postCodeRegex>
-            <postCodeRegex territoryId="NG" >(\d{6})?</postCodeRegex>
-            <postCodeRegex territoryId="OM" >(PC )?\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PK" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="PY" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="PH" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="PL" >\d{2}-\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PR" >00[679]\d{2}([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="RO" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="RU" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="SM" >4789\d</postCodeRegex>
-            <postCodeRegex territoryId="SA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SN" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SK" >\d{3}[ ]?\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="SI" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ZA" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LK" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TJ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="TH" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TN" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="TR" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="TM" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="UA" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="UY" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="UZ" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="VA" >00120</postCodeRegex>
-            <postCodeRegex territoryId="VE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="ZM" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="AS" >96799</postCodeRegex>
-            <postCodeRegex territoryId="CC" >6799</postCodeRegex>
-            <postCodeRegex territoryId="CK" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="RS" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="ME" >8\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="CS" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="YU" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="CX" >6798</postCodeRegex>
-            <postCodeRegex territoryId="ET" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="FK" >FIQQ 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="NF" >2899</postCodeRegex>
-            <postCodeRegex territoryId="FM" >(9694[1-4])([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="GF" >9[78]3\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GN" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="GP" >9[78][01]\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="GS" >SIQQ 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="GU" >969[123]\d([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="GW" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="HM" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="IQ" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="KG" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="LR" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="LS" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="MG" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="MH" >969[67]\d([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="MN" >\d{6}</postCodeRegex>
-            <postCodeRegex territoryId="MP" >9695[012]([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="MQ" >9[78]2\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NC" >988\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="NE" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="VI" >008(([0-4]\d)|(5[01]))([ \-]\d{4})?</postCodeRegex>
-            <postCodeRegex territoryId="PF" >987\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="PG" >\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="PM" >9[78]5\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="PN" >PCRN 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="PW" >96940</postCodeRegex>
-            <postCodeRegex territoryId="RE" >9[78]4\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="SH" >STHL 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="SJ" >\d{4}</postCodeRegex>
-            <postCodeRegex territoryId="SO" >\d{5}</postCodeRegex>
-            <postCodeRegex territoryId="SZ" >[HLMS]\d{3}</postCodeRegex>
-            <postCodeRegex territoryId="TC" >TKCA 1ZZ</postCodeRegex>
-            <postCodeRegex territoryId="WF" >986\d{2}</postCodeRegex>
-            <postCodeRegex territoryId="YT" >976\d{2}</postCodeRegex>
-        </postalCodeData>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ps.xml b/airtime_mvc/library/Zend/Locale/Data/ps.xml
deleted file mode 100644
index d22c44cac..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ps.xml
+++ /dev/null
@@ -1,416 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.68 $"/>
-		<generation date="$Date: 2009/06/15 05:50:27 $"/>
-		<language type="ps"/>
-	</identity>
-	<fallback>fa_AF</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">ا�ريکاني</language>
-			<language type="am">امهاري</language>
-			<language type="ar">عربي</language>
-			<language type="as">اسمائى ژبه</language>
-			<language type="az">أذربائجاني</language>
-			<language type="bal">بلوڅي</language>
-			<language type="be">ب�لاروسي</language>
-			<language type="bg">بلغاري</language>
-			<language type="bh">بيهاري</language>
-			<language type="bn">بنګالي</language>
-			<language type="br">بر�تون</language>
-			<language type="bs">بوسني</language>
-			<language type="ca">کټلاني</language>
-			<language type="cs">Ú†Û�Ú©</language>
-			<language type="cy">ويلشي</language>
-			<language type="da">ډ�نش</language>
-			<language type="de">الماني</language>
-			<language type="el">یوناني</language>
-			<language type="en">انګلیسي</language>
-			<language type="eo">اسپرانتو</language>
-			<language type="es">هسپانوي</language>
-			<language type="et">حبشي</language>
-			<language type="eu">باسکي</language>
-			<language type="fa">�ارسي</language>
-			<language type="fi">�ینلنډي</language>
-			<language type="fil">تګالوګ</language>
-			<language type="fo">�اروئ�</language>
-			<language type="fr">�رانسوي</language>
-			<language type="fy">�ريزي</language>
-			<language type="ga">ائيرل�نډي</language>
-			<language type="gd">سکاټل�نډي ګ�لک</language>
-			<language type="gl">ګل�شيايي</language>
-			<language type="gn">ګوراني</language>
-			<language type="gu">ګجراتي</language>
-			<language type="he">عبري</language>
-			<language type="hi">هندي</language>
-			<language type="hr">کروواتي</language>
-			<language type="hu">هنګري</language>
-			<language type="hy">ارمني</language>
-			<language type="ia">انټرلنګوا</language>
-			<language type="id">انډون�شيايي</language>
-			<language type="ie">آسا نا جبة</language>
-			<language type="ine">هند و اروپایي</language>
-			<language type="is">أيسل�نډي</language>
-			<language type="it">ایټالوي</language>
-			<language type="ja">جاپانی</language>
-			<language type="jv">جاواي�</language>
-			<language type="ka">جورجيائي</language>
-			<language type="km">کمبوډياي� يا د کمبوډيا</language>
-			<language type="kn">کنأډه</language>
-			<language type="ko">کوريائي</language>
-			<language type="ku">کردي</language>
-			<language type="ky">کرګيز</language>
-			<language type="la">لاتیني</language>
-			<language type="lo">لويتين</language>
-			<language type="lt">ليتواني</language>
-			<language type="lv">ل�ټواني</language>
-			<language type="mg">ملغاسي</language>
-			<language type="mk">مقدوني</language>
-			<language type="ml">مالايالم</language>
-			<language type="mn">مغولي</language>
-			<language type="mr">مراټهي</language>
-			<language type="ms">ملایا</language>
-			<language type="mt">مالټايي</language>
-			<language type="ne">ن�پالي</language>
-			<language type="nl">هال�نډي</language>
-			<language type="nn">نارو�ئي (نائنورسک)</language>
-			<language type="no">نارو�ئ�</language>
-			<language type="oc">اوکسيټاني</language>
-			<language type="or">اوريا</language>
-			<language type="pa">پنجابي</language>
-			<language type="pl">پولنډي</language>
-			<language type="ps">پښتو</language>
-			<language type="pt">پورتګالي</language>
-			<language type="pt_BR">پرتگال (برازيل)</language>
-			<language type="pt_PT">پرتګالي (پرتګال)</language>
-			<language type="ro">روماني</language>
-			<language type="ru">روسي</language>
-			<language type="sa">سنسکریټ</language>
-			<language type="sd">سندهي</language>
-			<language type="sh">سرب-کروشيايي</language>
-			<language type="si">سينهالي</language>
-			<language type="sk">سلوواکي</language>
-			<language type="sl">سلوواني</language>
-			<language type="so">سومالي</language>
-			<language type="sq">الباني</language>
-			<language type="sr">سربيائي</language>
-			<language type="st">سيسوتو</language>
-			<language type="su">سوډاني</language>
-			<language type="sv">سویډنی</language>
-			<language type="sw">سواه�لي</language>
-			<language type="ta">تامل</language>
-			<language type="te">ت�ليګو</language>
-			<language type="tg">تاجک</language>
-			<language type="th">تايل�نډي</language>
-			<language type="ti">تيګريني</language>
-			<language type="tk">ترکمني</language>
-			<language type="tlh">کلينګاني</language>
-			<language type="tr">ترکي</language>
-			<language type="tt">تاتار</language>
-			<language type="tw">توی</language>
-			<language type="ug">اويگور</language>
-			<language type="uk">اوکرانايي</language>
-			<language type="ur">اردو</language>
-			<language type="uz">ازبکي</language>
-			<language type="vi">و�تنامي</language>
-			<language type="xh">خوسا</language>
-			<language type="yi">يديش</language>
-			<language type="zh">چیني</language>
-			<language type="zu">زولو</language>
-		</languages>
-		<scripts>
-			<script type="Arab">عربي</script>
-		</scripts>
-		<territories>
-			<territory type="AF">ا�غانستان</territory>
-			<territory type="AL">البانیه</territory>
-			<territory type="AO">انګولا</territory>
-			<territory type="AQ">انتارکتیکا</territory>
-			<territory type="AT">اتریش</territory>
-			<territory type="BD">بنګله‌دیش</territory>
-			<territory type="BG">بلغاریه</territory>
-			<territory type="CA">کاناډا</territory>
-			<territory type="CH">سویس</territory>
-			<territory type="CN">چین</territory>
-			<territory type="CO">کولمبیا</territory>
-			<territory type="CU">کیوبا</territory>
-			<territory type="DE">المان</territory>
-			<territory type="DK">ډنمارک</territory>
-			<territory type="DZ">الجزایر</territory>
-			<territory type="EG">مصر</territory>
-			<territory type="ES">هسپانیه</territory>
-			<territory type="ET">حبشه</territory>
-			<territory type="FI">�نلینډ</territory>
-			<territory type="FR">�رانسه</territory>
-			<territory type="GB">برتانیه</territory>
-			<territory type="GH">ګانا</territory>
-			<territory type="GN">ګیانا</territory>
-			<territory type="GR">یونان</territory>
-			<territory type="GT">ګواتیمالا</territory>
-			<territory type="HN">هانډوراس</territory>
-			<territory type="HU">مجارستان</territory>
-			<territory type="ID">اندونیزیا</territory>
-			<territory type="IN">هند</territory>
-			<territory type="IQ">عراق</territory>
-			<territory type="IS">آیسلینډ</territory>
-			<territory type="IT">ایټالیه</territory>
-			<territory type="JM">جمیکا</territory>
-			<territory type="JP">جاپان</territory>
-			<territory type="KH">کمبودیا</territory>
-			<territory type="KW">کویټ</territory>
-			<territory type="LA">لاوس</territory>
-			<territory type="LB">لبنان</territory>
-			<territory type="LR">لایبریا</territory>
-			<territory type="LY">لیبیا</territory>
-			<territory type="MA">مراکش</territory>
-			<territory type="MN">مغولستان</territory>
-			<territory type="MY">مالیزیا</territory>
-			<territory type="NG">نایجیریا</territory>
-			<territory type="NI">نکاراګوا</territory>
-			<territory type="NL">هال�نډ</territory>
-			<territory type="NO">نارو�</territory>
-			<territory type="NP">نیپال</territory>
-			<territory type="NZ">نیوزیلنډ</territory>
-			<territory type="PK">پاکستان</territory>
-			<territory type="PL">پولنډ</territory>
-			<territory type="PS">�لسطین</territory>
-			<territory type="PT">پورتګال</territory>
-			<territory type="RU">روسیه</territory>
-			<territory type="RW">روندا</territory>
-			<territory type="SA">سعودی عربستان</territory>
-			<territory type="SE">سویډن</territory>
-			<territory type="SV">سالو�ډور</territory>
-			<territory type="SY">سوریه</territory>
-			<territory type="TJ">تاجکستان</territory>
-			<territory type="TZ">تنزانیا</territory>
-			<territory type="UY">یوروګوای</territory>
-			<territory type="YE">یمن</territory>
-		</territories>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064E \u0650 \u064F \u064B \u064D \u064C \u0651 \u0652 \u0654 \u0670 آ ا أ ء ب پ ت ټ ث ج � چ څ ح-د ډ ذ ر ړ ز ژ ږ س ش ښ ص-غ � ق ک ګ ل-ن ڼ ه ة و ؤ ی ي � � ئ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">مـی</month>
-							<month type="6">جون</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جنوري</month>
-							<month type="2">�بروري</month>
-							<month type="3">مارچ</month>
-							<month type="4">اپریل</month>
-							<month type="5">می</month>
-							<month type="6">جون</month>
-							<month type="7">جولای</month>
-							<month type="8">اګست</month>
-							<month type="9">سپتمبر</month>
-							<month type="10">اکتوبر</month>
-							<month type="11">نومبر</month>
-							<month type="12">دسمبر</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">یکشنبه</day>
-							<day type="mon">دوشنبه</day>
-							<day type="tue">سه‌شنبه</day>
-							<day type="wed">چهارشنبه</day>
-							<day type="thu">پنجشنبه</day>
-							<day type="fri">جمعه</day>
-							<day type="sat">شنبه</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>غ.م.</am>
-				<pm>غ.و.</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Ù‚.Ù….</era>
-						<era type="1">Ù….</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE د y د MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>د y د MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss (zzzz)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss (z)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">د y د MMMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">وری</month>
-							<month type="2">غویی</month>
-							<month type="3">غبرګولی</month>
-							<month type="4">چنګاښ</month>
-							<month type="5">زمری</month>
-							<month type="6">وږی</month>
-							<month type="7">تله</month>
-							<month type="8">Ù„Ú“Ù…</month>
-							<month type="9">لیند�</month>
-							<month type="10">مرغومی</month>
-							<month type="11">سلواغه</month>
-							<month type="12">کب</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>د {0} په وخت</regionFormat>
-			<zone type="Asia/Kabul">
-				<exemplarCity>کابل</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>arabext</defaultNumberingSystem>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AFN">
-				<displayName>ا�غان�</displayName>
-				<symbol>Ø‹</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ps_AF.xml b/airtime_mvc/library/Zend/Locale/Data/ps_AF.xml
deleted file mode 100644
index 6d5465001..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ps_AF.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="ps"/>
-		<territory type="AF"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pt.xml b/airtime_mvc/library/Zend/Locale/Data/pt.xml
deleted file mode 100644
index 4ce09ff59..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pt.xml
+++ /dev/null
@@ -1,4337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.126 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="pt"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abcázio</language>
-			<language type="ace">achém</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adigue</language>
-			<language type="ae">avéstico</language>
-			<language type="af">africâner</language>
-			<language type="afa">idioma afro-asiático</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">acadiano</language>
-			<language type="ale">aleúte</language>
-			<language type="alg">idioma algonquiano</language>
-			<language type="alt">altai do sul</language>
-			<language type="am">amárico</language>
-			<language type="an">aragonês</language>
-			<language type="ang">inglês arcaico</language>
-			<language type="anp">angika</language>
-			<language type="apa">idioma apache</language>
-			<language type="ar">árabe</language>
-			<language type="arc">aramaico</language>
-			<language type="arn">araucano</language>
-			<language type="arp">arapaho</language>
-			<language type="art">idioma artificial</language>
-			<language type="arw">arauaqui</language>
-			<language type="as">assamês</language>
-			<language type="ast">asturiano</language>
-			<language type="ath">idioma atabascano</language>
-			<language type="aus">idioma australiano</language>
-			<language type="av">avaric</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aimara</language>
-			<language type="az">azerbaijano</language>
-			<language type="ba">bashkir</language>
-			<language type="bad">banda</language>
-			<language type="bai">idioma bamileke</language>
-			<language type="bal">balúchi</language>
-			<language type="ban">balinês</language>
-			<language type="bas">basa</language>
-			<language type="bat">idioma báltico</language>
-			<language type="be">bielo-russo</language>
-			<language type="bej">beja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berbere</language>
-			<language type="bg">búlgaro</language>
-			<language type="bh">biari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislamá</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">banto</language>
-			<language type="bo">tibetano</language>
-			<language type="br">bretão</language>
-			<language type="bra">braj</language>
-			<language type="bs">bósnio</language>
-			<language type="btk">bataque</language>
-			<language type="bua">buriat</language>
-			<language type="bug">buguinês</language>
-			<language type="byn">blin</language>
-			<language type="ca">catalão</language>
-			<language type="cad">caddo</language>
-			<language type="cai">idioma indígena centro-americano</language>
-			<language type="car">caribe</language>
-			<language type="cau">idioma caucásico</language>
-			<language type="cch">atsam</language>
-			<language type="ce">checheno</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">idioma celta</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukese</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook jargon</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokee</language>
-			<language type="chy">cheiene</language>
-			<language type="cmc">idioma chamic</language>
-			<language type="co">córsico</language>
-			<language type="cop">copta</language>
-			<language type="cpe">crioulo ou pidgin baseado no inglês</language>
-			<language type="cpf">crioulo ou pidgin baseado no francês</language>
-			<language type="cpp">crioulo ou pidgin baseado no português</language>
-			<language type="cr">cree</language>
-			<language type="crh">turco da Crimeia</language>
-			<language type="crp">crioulo ou pidgin</language>
-			<language type="cs">tcheco</language>
-			<language type="csb">kashubian</language>
-			<language type="cu">eslavo eclesiástico</language>
-			<language type="cus">idioma cuchítico</language>
-			<language type="cv">chuvash</language>
-			<language type="cy">galês</language>
-			<language type="da">dinamarquês</language>
-			<language type="dak">dacota</language>
-			<language type="dar">dargwa</language>
-			<language type="day">dayak</language>
-			<language type="de">alemão</language>
-			<language type="de_AT">alemão austríaco</language>
-			<language type="de_CH">alto alemão suíço</language>
-			<language type="del">delaware</language>
-			<language type="den">slave</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">idioma dravidiano</language>
-			<language type="dsb">sérvio baixo</language>
-			<language type="dua">duala</language>
-			<language type="dum">holandês médio</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">diúla</language>
-			<language type="dz">dzonga</language>
-			<language type="ee">eve</language>
-			<language type="efi">efique</language>
-			<language type="egy">egípcio arcaico</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grego</language>
-			<language type="elx">elamite</language>
-			<language type="en">inglês</language>
-			<language type="en_AU">inglês australiano</language>
-			<language type="en_CA">inglês canadense</language>
-			<language type="en_GB">inglês britânico</language>
-			<language type="en_US">inglês americano</language>
-			<language type="enm">inglês médio</language>
-			<language type="eo">esperanto</language>
-			<language type="es">espanhol</language>
-			<language type="es_419">espanhol latino-americano</language>
-			<language type="es_ES">espanhol ibérico</language>
-			<language type="et">estoniano</language>
-			<language type="eu">basco</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persa</language>
-			<language type="fan">fangue</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fula</language>
-			<language type="fi">finlandês</language>
-			<language type="fil">filipino</language>
-			<language type="fiu">idioma fino-úgrico</language>
-			<language type="fj">fijiano</language>
-			<language type="fo">feroês</language>
-			<language type="fon">fom</language>
-			<language type="fr">francês</language>
-			<language type="fr_CA">francês canadense</language>
-			<language type="fr_CH">francês suíço</language>
-			<language type="frm">francês médio</language>
-			<language type="fro">francês arcaico</language>
-			<language type="frr">frísio setentrional</language>
-			<language type="frs">frisão oriental</language>
-			<language type="fur">friulano</language>
-			<language type="fy">frísio ocidental</language>
-			<language type="ga">irlandês</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaia</language>
-			<language type="gd">gaélico escocês</language>
-			<language type="gem">idioma germânico</language>
-			<language type="gez">geez</language>
-			<language type="gil">gilbertês</language>
-			<language type="gl">galego</language>
-			<language type="gmh">alemão médio-alto</language>
-			<language type="gn">guarani</language>
-			<language type="goh">alemão arcaico alto</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gótico</language>
-			<language type="grb">grebo</language>
-			<language type="grc">grego arcaico</language>
-			<language type="gsw">alemão suíço</language>
-			<language type="gu">guzerate</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichʼin</language>
-			<language type="ha">hauçá</language>
-			<language type="hai">haida</language>
-			<language type="haw">havaiano</language>
-			<language type="he">hebraico</language>
-			<language type="hi">híndi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hitita</language>
-			<language type="hmn">hmong</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">croata</language>
-			<language type="hsb">sorábio superior</language>
-			<language type="ht">haitiano</language>
-			<language type="hu">húngaro</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armênio</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlíngua</language>
-			<language type="iba">iban</language>
-			<language type="id">indonésio</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">ibo</language>
-			<language type="ii">sichuan yi</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaque</language>
-			<language type="ilo">ilocano</language>
-			<language type="inc">idioma índico</language>
-			<language type="ine">idioma indo-europeu</language>
-			<language type="inh">inguche</language>
-			<language type="io">ido</language>
-			<language type="ira">iraniano</language>
-			<language type="iro">idioma iroquês</language>
-			<language type="is">islandês</language>
-			<language type="it">italiano</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japonês</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judaico-persa</language>
-			<language type="jrb">judaico-arábico</language>
-			<language type="jv">javanês</language>
-			<language type="ka">georgiano</language>
-			<language type="kaa">kara-kalpak</language>
-			<language type="kab">kabyle</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karen</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardiano</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">congolês</language>
-			<language type="kha">khasi</language>
-			<language type="khi">idioma coisã</language>
-			<language type="kho">khotanês</language>
-			<language type="ki">quicuio</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">cazaque</language>
-			<language type="kl">groenlandês</language>
-			<language type="km">cmer</language>
-			<language type="kmb">quimbundo</language>
-			<language type="kn">canarês</language>
-			<language type="ko">coreano</language>
-			<language type="kok">concani</language>
-			<language type="kos">kosraean</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">canúri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">idioma carélio</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">caxemira</language>
-			<language type="ku">curdo</language>
-			<language type="kum">kumyk</language>
-			<language type="kut">kutenai</language>
-			<language type="kv">komi</language>
-			<language type="kw">córnico</language>
-			<language type="ky">quirguiz</language>
-			<language type="la">latim</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburguês</language>
-			<language type="lez">lezghian</language>
-			<language type="lg">luganda</language>
-			<language type="li">limburguês</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laosiano</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">lituano</language>
-			<language type="lu">luba-catanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseno</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">letão</language>
-			<language type="mad">madurês</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mandinga</language>
-			<language type="map">austronésio</language>
-			<language type="mas">massai</language>
-			<language type="mdf">mocsa</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malgaxe</language>
-			<language type="mga">irlandês médio</language>
-			<language type="mh">marshalês</language>
-			<language type="mi">maori</language>
-			<language type="mic">miquemaque</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">idiomas diversos</language>
-			<language type="mk">macedônio</language>
-			<language type="mkh">idioma mon-khmer</language>
-			<language type="ml">malaiala</language>
-			<language type="mn">mongol</language>
-			<language type="mnc">manchu</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">idioma manobo</language>
-			<language type="mo">moldávio</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marata</language>
-			<language type="ms">malaio</language>
-			<language type="mt">maltês</language>
-			<language type="mul">idiomas múltiplos</language>
-			<language type="mun">idiomas munda</language>
-			<language type="mus">creek</language>
-			<language type="mwl">mirandês</language>
-			<language type="mwr">marwari</language>
-			<language type="my">birmanês</language>
-			<language type="myn">maia</language>
-			<language type="myv">erzya</language>
-			<language type="na">nauruano</language>
-			<language type="nah">náuatle</language>
-			<language type="nai">idioma indígena norte-americano</language>
-			<language type="nap">napolitano</language>
-			<language type="nb">bokmål norueguês</language>
-			<language type="nd">ndebele do norte</language>
-			<language type="nds">baixo-alemão</language>
-			<language type="ne">nepali</language>
-			<language type="new">newari</language>
-			<language type="ng">dongo</language>
-			<language type="nia">nias</language>
-			<language type="nic">idioma cordofano-nigeriano</language>
-			<language type="niu">niueano</language>
-			<language type="nl">holandês</language>
-			<language type="nl_BE">flamengo</language>
-			<language type="nn">nynorsk norueguês</language>
-			<language type="no">norueguês</language>
-			<language type="nog">nogai</language>
-			<language type="non">nórdico arcaico</language>
-			<language type="nqo">n'ko</language>
-			<language type="nr">ndebele do sul</language>
-			<language type="nso">soto setentrional</language>
-			<language type="nub">idioma núbio</language>
-			<language type="nv">navajo</language>
-			<language type="nwc">newari clássico</language>
-			<language type="ny">nianja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitânico</language>
-			<language type="oj">ojibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetic</language>
-			<language type="osa">osage</language>
-			<language type="ota">turco otomano</language>
-			<language type="oto">idioma otomano</language>
-			<language type="pa">panjabi</language>
-			<language type="paa">idioma papuano</language>
-			<language type="pag">pangasinã</language>
-			<language type="pal">pálavi</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palauano</language>
-			<language type="peo">persa arcaico</language>
-			<language type="phi">idioma filipino</language>
-			<language type="phn">fenício</language>
-			<language type="pi">páli</language>
-			<language type="pl">polonês</language>
-			<language type="pon">pohnpeian</language>
-			<language type="pra">idioma prácrito</language>
-			<language type="pro">provençal arcaico</language>
-			<language type="ps">pashto</language>
-			<language type="pt">português</language>
-			<language type="pt_BR">português do Brasil</language>
-			<language type="pt_PT">português ibérico</language>
-			<language type="qu">quíchua</language>
-			<language type="raj">rajastani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotongano</language>
-			<language type="rm">reto-romano</language>
-			<language type="rn">rundi</language>
-			<language type="ro">romeno</language>
-			<language type="roa">idioma românico</language>
-			<language type="rom">romani</language>
-			<language type="root">root</language>
-			<language type="ru">russo</language>
-			<language type="rup">aromeno</language>
-			<language type="rw">kinyarwanda</language>
-			<language type="sa">sânscrito</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">iacuto</language>
-			<language type="sai">idioma indígena sul-americano</language>
-			<language type="sal">idioma salisano</language>
-			<language type="sam">aramaico samaritano</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardo</language>
-			<language type="scn">siciliano</language>
-			<language type="sco">escocês</language>
-			<language type="sd">sindi</language>
-			<language type="se">sami do norte</language>
-			<language type="sel">selkup</language>
-			<language type="sem">idioma semítico</language>
-			<language type="sg">sango</language>
-			<language type="sga">irlandês arcaico</language>
-			<language type="sgn">linguagem de sinais</language>
-			<language type="sh">servo-croata</language>
-			<language type="shn">shan</language>
-			<language type="si">cingalês</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">idioma sioux</language>
-			<language type="sit">idioma sino-tibetano</language>
-			<language type="sk">eslovaco</language>
-			<language type="sl">esloveno</language>
-			<language type="sla">idioma eslavo</language>
-			<language type="sm">samoano</language>
-			<language type="sma">sami do sul</language>
-			<language type="smi">idioma sami</language>
-			<language type="smj">lule sami</language>
-			<language type="smn">inari sami</language>
-			<language type="sms">skolt sami</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninquê</language>
-			<language type="so">somali</language>
-			<language type="sog">sogdiano</language>
-			<language type="son">songai</language>
-			<language type="sq">albanês</language>
-			<language type="sr">sérvio</language>
-			<language type="srn">idioma surinamês</language>
-			<language type="srr">serere</language>
-			<language type="ss">swati</language>
-			<language type="ssa">idioma nilo-saariano</language>
-			<language type="st">soto do sul</language>
-			<language type="su">sundanês</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">sosso</language>
-			<language type="sux">sumério</language>
-			<language type="sv">sueco</language>
-			<language type="sw">suaili</language>
-			<language type="syc">siríaco clássico</language>
-			<language type="syr">siríaco</language>
-			<language type="ta">tâmil</language>
-			<language type="tai">idioma tailandês</language>
-			<language type="te">telugu</language>
-			<language type="tem">timne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tétum</language>
-			<language type="tg">tadjique</language>
-			<language type="th">tailandês</language>
-			<language type="ti">tigrínia</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tiv</language>
-			<language type="tk">turcomano</language>
-			<language type="tkl">toquelauano</language>
-			<language type="tl">tagalo</language>
-			<language type="tlh">klingon</language>
-			<language type="tli">tlinguite</language>
-			<language type="tmh">tamaxeque</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonganês</language>
-			<language type="tog">tonganês de Nyasa</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turco</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatar</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">idioma tupi</language>
-			<language type="tut">idioma altaico</language>
-			<language type="tvl">tuvaluano</language>
-			<language type="tw">twi</language>
-			<language type="ty">taitiano</language>
-			<language type="tyv">tuvinian</language>
-			<language type="udm">udmurt</language>
-			<language type="ug">uighur</language>
-			<language type="uga">ugarítico</language>
-			<language type="uk">ucraniano</language>
-			<language type="umb">umbundu</language>
-			<language type="und">idioma inválido ou desconhecido</language>
-			<language type="ur">urdu</language>
-			<language type="uz">usbeque</language>
-			<language type="vai">vai</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamita</language>
-			<language type="vo">volapuque</language>
-			<language type="vot">votic</language>
-			<language type="wa">valão</language>
-			<language type="wak">idioma wakashan</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">idioma sorábio</language>
-			<language type="wo">uólofe</language>
-			<language type="xal">kalmyk</language>
-			<language type="xh">xosa</language>
-			<language type="yao">yao</language>
-			<language type="yap">yapese</language>
-			<language type="yi">iídiche</language>
-			<language type="yo">ioruba</language>
-			<language type="ypk">idioma iúpique</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapoteca</language>
-			<language type="zbl">símbolos blis</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">chinês</language>
-			<language type="zh_Hans">chinês simplificado</language>
-			<language type="zh_Hant">chinês tradicional</language>
-			<language type="znd">zande</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zunhi</language>
-			<language type="zxx">sem conteúdo linguístico</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">árabe</script>
-			<script type="Armi">armi</script>
-			<script type="Armn">armênio</script>
-			<script type="Avst">avéstico</script>
-			<script type="Bali">balinês</script>
-			<script type="Batk">bataque</script>
-			<script type="Beng">bengali</script>
-			<script type="Blis">símbolos bliss</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brahmi</script>
-			<script type="Brai">braille</script>
-			<script type="Bugi">buginês</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">cakm</script>
-			<script type="Cans">escrita silábica unificada dos aborígenes canadenses</script>
-			<script type="Cari">cariano</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirth</script>
-			<script type="Copt">cóptico</script>
-			<script type="Cprt">cipriota</script>
-			<script type="Cyrl">cirílico</script>
-			<script type="Cyrs">cirílico eslavo eclesiástico</script>
-			<script type="Deva">devanágari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">demótico egípcio</script>
-			<script type="Egyh">hierático egípcio</script>
-			<script type="Egyp">hieróglifos egípcios</script>
-			<script type="Ethi">etiópico</script>
-			<script type="Geok">khutsuri georgiano</script>
-			<script type="Geor">georgiano</script>
-			<script type="Glag">glagolítico</script>
-			<script type="Goth">gótico</script>
-			<script type="Grek">grego</script>
-			<script type="Gujr">gujerati</script>
-			<script type="Guru">gurmuqui</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunoo</script>
-			<script type="Hans">han simplificado</script>
-			<script type="Hant">han tradicional</script>
-			<script type="Hebr">hebraico</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahawh hmong</script>
-			<script type="Hrkt">katakana ou hiragana</script>
-			<script type="Hung">húngaro antigo</script>
-			<script type="Inds">indo</script>
-			<script type="Ital">itálico antigo</script>
-			<script type="Java">javanês</script>
-			<script type="Jpan">japonês</script>
-			<script type="Kali">kayah li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshthi</script>
-			<script type="Khmr">khmer</script>
-			<script type="Knda">kannada</script>
-			<script type="Kore">coreano</script>
-			<script type="Kthi">kthi</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">lao</script>
-			<script type="Latf">latim fraktur</script>
-			<script type="Latg">latim gaélico</script>
-			<script type="Latn">latim</script>
-			<script type="Lepc">lepcha</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">A linear</script>
-			<script type="Linb">B linear</script>
-			<script type="Lyci">lício</script>
-			<script type="Lydi">lídio</script>
-			<script type="Mand">mandaico</script>
-			<script type="Mani">maniqueano</script>
-			<script type="Maya">hieróglifos maias</script>
-			<script type="Mero">meroítico</script>
-			<script type="Mlym">malaiala</script>
-			<script type="Mong">mongol</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei mayek</script>
-			<script type="Mymr">birmanês</script>
-			<script type="Nkoo">n'ko</script>
-			<script type="Ogam">ogâmico</script>
-			<script type="Olck">ol chiki</script>
-			<script type="Orkh">orkhon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmania</script>
-			<script type="Perm">pérmico antigo</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">phli</script>
-			<script type="Phlp">phlp</script>
-			<script type="Phlv">pahlavi antigo</script>
-			<script type="Phnx">fenício</script>
-			<script type="Plrd">fonético pollard</script>
-			<script type="Prti">prti</script>
-			<script type="Qaai">herdado</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">rúnico</script>
-			<script type="Samr">samaritano</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">signwriting</script>
-			<script type="Shaw">shaviano</script>
-			<script type="Sinh">cingalês</script>
-			<script type="Sund">sundanês</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">siríaco</script>
-			<script type="Syre">siríaco estrangelo</script>
-			<script type="Syrj">siríaco ocidental</script>
-			<script type="Syrn">siríaco oriental</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai Le</script>
-			<script type="Talu">novo tai lue</script>
-			<script type="Taml">tâmil</script>
-			<script type="Tavt">tavt</script>
-			<script type="Telu">télugo</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalo</script>
-			<script type="Thaa">thaana</script>
-			<script type="Thai">tailandês</script>
-			<script type="Tibt">tibetano</script>
-			<script type="Ugar">ugarítico</script>
-			<script type="Vaii">vai</script>
-			<script type="Visp">visible speech</script>
-			<script type="Xpeo">persa antigo</script>
-			<script type="Xsux">sumério-acadiano cuneiforme</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">zmth</script>
-			<script type="Zsym">zsym</script>
-			<script type="Zxxx">ágrafo</script>
-			<script type="Zyyy">comum</script>
-			<script type="Zzzz">escrita desconhecida ou inválida</script>
-		</scripts>
-		<territories>
-			<territory type="001">Mundo</territory>
-			<territory type="002">�frica</territory>
-			<territory type="003">América do Norte</territory>
-			<territory type="005">América do Sul</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">�frica Ocidental</territory>
-			<territory type="013">América Central</territory>
-			<territory type="014">�frica Oriental</territory>
-			<territory type="015">�frica do Norte</territory>
-			<territory type="017">�frica Central</territory>
-			<territory type="018">�frica Austral</territory>
-			<territory type="019">Américas</territory>
-			<territory type="021">América Setentrional</territory>
-			<territory type="029">Caribe</territory>
-			<territory type="030">�sia Oriental</territory>
-			<territory type="034">�sia do Sul</territory>
-			<territory type="035">�sia Centro-Oriental</territory>
-			<territory type="039">Europa do Sul</territory>
-			<territory type="053">Austrália e Nova Zelândia</territory>
-			<territory type="054">Melanésia</territory>
-			<territory type="057">Região da Micronésia</territory>
-			<territory type="061">Polinésia</territory>
-			<territory type="062">�sia Centro-Meridional</territory>
-			<territory type="142">�sia</territory>
-			<territory type="143">�sia Central</territory>
-			<territory type="145">�sia Ocidental</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa Oriental</territory>
-			<territory type="154">Europa Setentrional</territory>
-			<territory type="155">Europa Ocidental</territory>
-			<territory type="172">Comunidade dos Estados Independentes</territory>
-			<territory type="419">América Latina e Caribe</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emirados �rabes Unidos</territory>
-			<territory type="AF">Afeganistão</territory>
-			<territory type="AG">Antígua e Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albânia</territory>
-			<territory type="AM">Armênia</territory>
-			<territory type="AN">Antilhas Holandesas</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antártida</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americana</territory>
-			<territory type="AT">�ustria</territory>
-			<territory type="AU">Austrália</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ilhas Aland</territory>
-			<territory type="AZ">Azerbaijão</territory>
-			<territory type="BA">Bósnia-Herzegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Bélgica</territory>
-			<territory type="BF">Burquina Faso</territory>
-			<territory type="BG">Bulgária</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">São Bartolomeu</territory>
-			<territory type="BM">Bermudas</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolívia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Butão</territory>
-			<territory type="BV">Ilha Bouvet</territory>
-			<territory type="BW">Botsuana</territory>
-			<territory type="BY">Belarus</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canadá</territory>
-			<territory type="CC">Ilhas Coco</territory>
-			<territory type="CD">Congo-Kinshasa</territory>
-			<territory type="CF">República Centro-Africana</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Suíça</territory>
-			<territory type="CI">Costa do Marfim</territory>
-			<territory type="CK">Ilhas Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">República dos Camarões</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Colômbia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Sérvia e Montenegro</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Cabo Verde</territory>
-			<territory type="CX">Ilhas Natal</territory>
-			<territory type="CY">Chipre</territory>
-			<territory type="CZ">República Tcheca</territory>
-			<territory type="DE">Alemanha</territory>
-			<territory type="DJ">Djibuti</territory>
-			<territory type="DK">Dinamarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">República Dominicana</territory>
-			<territory type="DZ">Argélia</territory>
-			<territory type="EC">Equador</territory>
-			<territory type="EE">Estônia</territory>
-			<territory type="EG">Egito</territory>
-			<territory type="EH">Saara Ocidental</territory>
-			<territory type="ER">Eritreia</territory>
-			<territory type="ES">Espanha</territory>
-			<territory type="ET">Etiópia</territory>
-			<territory type="FI">Finlândia</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Ilhas Malvinas</territory>
-			<territory type="FM">Micronésia</territory>
-			<territory type="FO">Ilhas Faroe</territory>
-			<territory type="FR">França</territory>
-			<territory type="GA">Gabão</territory>
-			<territory type="GB">Reino Unido</territory>
-			<territory type="GD">Granada</territory>
-			<territory type="GE">Geórgia</territory>
-			<territory type="GF">Guiana Francesa</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Groênlandia</territory>
-			<territory type="GM">Gâmbia</territory>
-			<territory type="GN">Guiné</territory>
-			<territory type="GP">Guadalupe</territory>
-			<territory type="GQ">Guiné Equatorial</territory>
-			<territory type="GR">Grécia</territory>
-			<territory type="GS">Geórgia do Sul e Ilhas Sandwich do Sul</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guiné Bissau</territory>
-			<territory type="GY">Guiana</territory>
-			<territory type="HK">Hong Kong, Região Admin. Especial da China</territory>
-			<territory type="HM">Ilha Heard e Ilhas McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croácia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Hungria</territory>
-			<territory type="ID">Indonésia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Ilha de Man</territory>
-			<territory type="IN">�ndia</territory>
-			<territory type="IO">Território Britânico do Oceano �ndico</territory>
-			<territory type="IQ">Iraque</territory>
-			<territory type="IR">Irã</territory>
-			<territory type="IS">Islândia</territory>
-			<territory type="IT">Itália</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordânia</territory>
-			<territory type="JP">Japão</territory>
-			<territory type="KE">Quênia</territory>
-			<territory type="KG">Quirguistão</territory>
-			<territory type="KH">Camboja</territory>
-			<territory type="KI">Quiribati</territory>
-			<territory type="KM">Comores</territory>
-			<territory type="KN">São Cristovão e Nevis</territory>
-			<territory type="KP">Coreia do Norte</territory>
-			<territory type="KR">Coreia do Sul</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Ilhas Caiman</territory>
-			<territory type="KZ">Casaquistão</territory>
-			<territory type="LA">República Popular Democrática do Laos</territory>
-			<territory type="LB">Líbano</territory>
-			<territory type="LC">Santa Lúcia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Libéria</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Lituânia</territory>
-			<territory type="LU">Luxemburgo</territory>
-			<territory type="LV">Letônia</territory>
-			<territory type="LY">Líbia</territory>
-			<territory type="MA">Marrocos</territory>
-			<territory type="MC">Mônaco</territory>
-			<territory type="MD">Moldávia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">São Martinho</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Ilhas Marshall</territory>
-			<territory type="MK">Macedônia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mianmar</territory>
-			<territory type="MN">Mongólia</territory>
-			<territory type="MO">Macau, Região Admin. Especial da China</territory>
-			<territory type="MP">Ilhas Marianas do Norte</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritânia</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Maurício</territory>
-			<territory type="MV">Maldivas</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">México</territory>
-			<territory type="MY">Malásia</territory>
-			<territory type="MZ">Moçambique</territory>
-			<territory type="NA">Namíbia</territory>
-			<territory type="NC">Nova Caledônia</territory>
-			<territory type="NE">Níger</territory>
-			<territory type="NF">Ilha Norfolk</territory>
-			<territory type="NG">Nigéria</territory>
-			<territory type="NI">Nicarágua</territory>
-			<territory type="NL">Holanda</territory>
-			<territory type="NO">Noruega</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nova Zelândia</territory>
-			<territory type="OM">Omã</territory>
-			<territory type="PA">Panamá</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polinésia Francesa</territory>
-			<territory type="PG">Papua-Nova Guiné</territory>
-			<territory type="PH">Filipinas</territory>
-			<territory type="PK">Paquistão</territory>
-			<territory type="PL">Polônia</territory>
-			<territory type="PM">Saint Pierre e Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Rico</territory>
-			<territory type="PS">Território da Palestina</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguai</territory>
-			<territory type="QA">Catar</territory>
-			<territory type="QO">Oceania Remota</territory>
-			<territory type="QU">União Europeia</territory>
-			<territory type="RE">Reunião</territory>
-			<territory type="RO">Romênia</territory>
-			<territory type="RS">Sérvia</territory>
-			<territory type="RU">Rússia</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arábia Saudita</territory>
-			<territory type="SB">Ilhas Salomão</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudão</territory>
-			<territory type="SE">Suécia</territory>
-			<territory type="SG">Cingapura</territory>
-			<territory type="SH">Santa Helena</territory>
-			<territory type="SI">Eslovênia</territory>
-			<territory type="SJ">Svalbard e Jan Mayen</territory>
-			<territory type="SK">Eslováquia</territory>
-			<territory type="SL">Serra Leoa</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somália</territory>
-			<territory type="SR">Suriname</territory>
-			<territory type="ST">São Tomé e Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Síria</territory>
-			<territory type="SZ">Suazilândia</territory>
-			<territory type="TC">Ilhas Turks e Caicos</territory>
-			<territory type="TD">Chade</territory>
-			<territory type="TF">Territórios Franceses do Sul</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tailândia</territory>
-			<territory type="TJ">Tadjiquistão</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timor Leste</territory>
-			<territory type="TM">Turcomenistão</territory>
-			<territory type="TN">Tunísia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turquia</territory>
-			<territory type="TT">Trinidad e Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzânia</territory>
-			<territory type="UA">Ucrânia</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Ilhas Menores Distantes dos Estados Unidos</territory>
-			<territory type="US">Estados Unidos</territory>
-			<territory type="UY">Uruguai</territory>
-			<territory type="UZ">Uzbequistão</territory>
-			<territory type="VA">Vaticano</territory>
-			<territory type="VC">São Vicente e Granadinas</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Ilhas Virgens Britânicas</territory>
-			<territory type="VI">Ilhas Virgens dos EUA</territory>
-			<territory type="VN">Vietnã</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis e Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Iêmen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">�frica do Sul</territory>
-			<territory type="ZM">Zâmbia</territory>
-			<territory type="ZW">Zimbábue</territory>
-			<territory type="ZZ">Região desconhecida ou inválida</territory>
-		</territories>
-		<variants>
-			<variant type="1901">ortografia alemã tradicional</variant>
-			<variant type="1994">ortografia resiana padronizada</variant>
-			<variant type="1996">ortografia alemã de 1996</variant>
-			<variant type="1606NICT">francês antigo de 1606</variant>
-			<variant type="1694ACAD">francês da idade moderna</variant>
-			<variant type="AREVELA">armênio oriental</variant>
-			<variant type="AREVMDA">armênio ocidental</variant>
-			<variant type="BAKU1926">alfabeto latino turco unificado</variant>
-			<variant type="BISKE">dialeto san giorgio/bila</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">fonética do Alfabeto Fonético Internacional</variant>
-			<variant type="FONUPA">fonética do Alfabeto Fonético Urálico</variant>
-			<variant type="LIPAW">dialeto lipovaz de Resian</variant>
-			<variant type="MONOTON">monotônico</variant>
-			<variant type="NEDIS">dialeto natisone</variant>
-			<variant type="NJIVA">dialeto gniva/njiva</variant>
-			<variant type="OSOJS">dialeto oseacco/osojane</variant>
-			<variant type="POLYTON">politônico</variant>
-			<variant type="POSIX">computador</variant>
-			<variant type="REVISED">Ortografia Revisada</variant>
-			<variant type="ROZAJ">resiano</variant>
-			<variant type="SAAHO">saho</variant>
-			<variant type="SCOTLAND">inglês padrão escocês</variant>
-			<variant type="SCOUSE">scouse</variant>
-			<variant type="SOLBA">dialeto stolvizza/solbica</variant>
-			<variant type="TARASK">ortografia taraskievica</variant>
-			<variant type="VALENCIA">valenciano</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Calendário</key>
-			<key type="collation">Ordenação</key>
-			<key type="currency">Moeda</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Ordem do Chinês Tradicional - Big5</type>
-			<type type="buddhist" key="calendar">Calendário Budista</type>
-			<type type="chinese" key="calendar">Calendário Chinês</type>
-			<type type="direct" key="collation">Ordem Direta</type>
-			<type type="gb2312han" key="collation">Ordem do Chinês Simplificado - GB2312</type>
-			<type type="gregorian" key="calendar">Calendário Gregoriano</type>
-			<type type="hebrew" key="calendar">Calendário Hebraico</type>
-			<type type="indian" key="calendar">Calendário Nacional Indiano</type>
-			<type type="islamic" key="calendar">Calendário Islâmico</type>
-			<type type="islamic-civil" key="calendar">Calendário Civil Islâmico</type>
-			<type type="japanese" key="calendar">Calendário Japonês</type>
-			<type type="phonebook" key="collation">Ordem de Lista Telefônica</type>
-			<type type="pinyin" key="collation">Ordem Pin-yin</type>
-			<type type="roc" key="calendar">Calendário da República da China</type>
-			<type type="stroke" key="collation">Ordem dos Traços</type>
-			<type type="traditional" key="collation">Ordem Tradicional</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">métrico</measurementSystemName>
-			<measurementSystemName type="US">americano</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Idioma: {0}</codePattern>
-			<codePattern type="script">Roteiro: {0}</codePattern>
-			<codePattern type="territory">Região: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á à â ã b c ç d e é ê f-i í j-o ó ò ô õ p-u ú v-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ă å ä � æ è ĕ ë ē ì ĭ î ï ī ñ � ö ø � œ ß ù ŭ û ü ū ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d 'de' MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyMM">MM-yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">fev</month>
-							<month type="3">mar</month>
-							<month type="4">abr</month>
-							<month type="5">mai</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">ago</month>
-							<month type="9">set</month>
-							<month type="10">out</month>
-							<month type="11">nov</month>
-							<month type="12">dez</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">janeiro</month>
-							<month type="2">fevereiro</month>
-							<month type="3">março</month>
-							<month type="4">abril</month>
-							<month type="5">maio</month>
-							<month type="6">junho</month>
-							<month type="7">julho</month>
-							<month type="8">agosto</month>
-							<month type="9">setembro</month>
-							<month type="10">outubro</month>
-							<month type="11">novembro</month>
-							<month type="12">dezembro</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">dom</day>
-							<day type="mon">seg</day>
-							<day type="tue">ter</day>
-							<day type="wed">qua</day>
-							<day type="thu">qui</day>
-							<day type="fri">sex</day>
-							<day type="sat">sáb</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">domingo</day>
-							<day type="mon">segunda-feira</day>
-							<day type="tue">terça-feira</day>
-							<day type="wed">quarta-feira</day>
-							<day type="thu">quinta-feira</day>
-							<day type="fri">sexta-feira</day>
-							<day type="sat">sábado</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">S</day>
-							<day type="tue">T</day>
-							<day type="wed">Q</day>
-							<day type="thu">Q</day>
-							<day type="fri">S</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1º trimestre</quarter>
-							<quarter type="2">2º trimestre</quarter>
-							<quarter type="3">3º trimestre</quarter>
-							<quarter type="4">4º trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Antes de Cristo</era>
-						<era type="1">Ano do Senhor</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">a.C.</era>
-						<era type="1">d.C.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH'h'mm'min'ss's' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH'h'mm'min'ss's' z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE, d</dateFormatItem>
-						<dateFormatItem id="HHmm">HH'h'mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">H'h'mm'min'ss's'</dateFormatItem>
-						<dateFormatItem id="Hm">H'h'mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">EEE, dd/MM</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d 'de' MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">EEE, d 'de' MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">EEE, d 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm'min'ss's'</dateFormatItem>
-						<dateFormatItem id="ms">mm'min'ss's'</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, dd/MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d 'de' MMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM 'de' y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM 'de' yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d 'de' MMM 'de' yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE, d 'de' MMM 'de' yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM 'de' y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H'h' - H'h'</greatestDifference>
-							<greatestDifference id="h">H'h' - H'h'</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H'h'mm - H'h'mm</greatestDifference>
-							<greatestDifference id="h">H'h'mm - H'h'mm</greatestDifference>
-							<greatestDifference id="m">H'h'mm - H'h'mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H'h'mm - H'h'mm v</greatestDifference>
-							<greatestDifference id="h">H'h'mm - H'h'mm v</greatestDifference>
-							<greatestDifference id="m">H'h'mm - H'h'mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H'h'mm - H'h'mm v</greatestDifference>
-							<greatestDifference id="h">H'h'mm - H'h'mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM - MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM - d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d 'de' MMM</greatestDifference>
-							<greatestDifference id="M">E, d 'de' MMM - E, d 'de' MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL - LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y - y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">MMM 'de' y - MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">d 'de' MMM - d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">d 'de' MMM 'de' y - d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="M">E, d 'de' MMM - E, d 'de' MMM 'de' y</greatestDifference>
-							<greatestDifference id="y">E, d 'de' MMM 'de' y - E, d 'de' MMM 'de' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM-yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ano</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mês</displayName>
-					</field>
-					<field type="week">
-						<displayName>Semana</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dia</displayName>
-						<relative type="-3">Há três dias</relative>
-						<relative type="-2">Anteontem</relative>
-						<relative type="-1">Ontem</relative>
-						<relative type="0">Hoje</relative>
-						<relative type="1">Amanhã</relative>
-						<relative type="2">Depois de amanhã</relative>
-						<relative type="3">Daqui a três dias</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Dia da semana</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Período do dia</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hora</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuto</displayName>
-					</field>
-					<field type="second">
-						<displayName>Segundo</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Fuso</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="japanese">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d 'de' MMMM 'de' y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraNames>
-						<era type="0">Antes de R.O.C.</era>
-					</eraNames>
-					<eraNarrow>
-						<era type="0">Antes de R.O.C.</era>
-					</eraNarrow>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Horário {0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Desconhecido</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Cabul</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Antígua</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Anguila</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Ierevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Pólo Sul</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumã</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dacca</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelas</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sófia</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Barein</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudas</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarém</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaína</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Fernando de Noronha</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zurique</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidjã</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Ilha de Páscoa</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Xangai</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cabo Verde</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nicósia</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlim</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhague</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Argel</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Guaiaquil</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Canárias</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madri</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinque</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Ilhas Faroe</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londres</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Granada</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Caiena</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atenas</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Geórgia do Sul</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guiana</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Porto Príncipe</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapeste</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Jacarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Jerusalém</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdá</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teerã</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Amã</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tóquio</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>Nairóbi</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>São Cristóvão</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Caimã</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vienciana</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beirute</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Santa Lúcia</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monróvia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburgo</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Trípoli</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Mônaco</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Ilhas Maurício</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivas</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Cidade do México</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Manágua</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdã</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Catmandu</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panamá</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Taiti</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varsóvia</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Rico</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Açores</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisboa</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Catar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Ilha Reunião</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bucareste</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscou</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgogrado</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Ecaterimburgo</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riad</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Estocolmo</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Cingapura</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Santa Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Dacar</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damasco</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lomé</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunísia</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istambul</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Porto Espanha</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salen, Dakota do Norte</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Central, Dakota do Norte</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianápolis</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Nova York</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Montevidéu</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>São Vicente</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Ilha Mayotte</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johannesburgo</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Horário do Acre</standard>
-					<daylight>Horário de Verão do Acre</daylight>
-				</long>
-				<short>
-					<standard>ACT</standard>
-					<daylight>ACST</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Horário do Afeganistão</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Horário da �frica Central</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Horário da �frica Oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Horário da �frica do Sul</generic>
-					<standard>Horário Padrão da �frica do Sul</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Horário da �frica Ocidental</standard>
-					<daylight>Horário de Verão da �frica Ocidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Horário do Aktyubinsk</standard>
-					<daylight>Horário de Verão do Aktyubinsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Horário do Alaska</generic>
-					<standard>Horário Padrão do Alasca</standard>
-					<daylight>Horário de Verão do Alasca</daylight>
-				</long>
-				<short>
-					<generic>AKT</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Horário do Alasca-Havaí</generic>
-					<standard>Horário Padrão do Alaska-Havaí</standard>
-					<daylight>Horário de Verão do Alaska-Havaí</daylight>
-				</long>
-				<short>
-					<generic>AHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Horário do Almaty</standard>
-					<daylight>Horário de Verão do Almaty</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Horário do Amazonas</standard>
-					<daylight>Horário de Verão do Amazonas</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Horário Central</generic>
-					<standard>Horário Padrão Central</standard>
-					<daylight>Horário de Verão Central</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Horário Oriental</generic>
-					<standard>Horário Padrão Oriental</standard>
-					<daylight>Horário de Verão Oriental</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Horário da Montanha</generic>
-					<standard>Horário Padrão da Montanha</standard>
-					<daylight>Horário de Verão da Montanha</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Horário do Pacífico</generic>
-					<standard>Horário Padrão do Pacífico</standard>
-					<daylight>Horário de Verão do Pacífico</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Horário do Anadyr</standard>
-					<daylight>Horário de Verão do Anadyr</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Horário do Aqtau</standard>
-					<daylight>Horário de Verão do Aqtau</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Horário do Aqtobe</standard>
-					<daylight>Horário de Verão do Aqtobe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Horário da Arábia</generic>
-					<standard>Horário Padrão da Arábia</standard>
-					<daylight>Horário de Verão da Arábia</daylight>
-				</long>
-				<short>
-					<generic>AT (Arábia)</generic>
-					<standard>AST (Arábia)</standard>
-					<daylight>ADT (Arábia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Horário da Argentina</standard>
-					<daylight>Horário de Verão da Argentina</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Horário da Argentina Ocidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Horário da Armênia</standard>
-					<daylight>Horário de Verão da Armênia</daylight>
-				</long>
-				<short>
-					<standard>AMT (Armênia)</standard>
-					<daylight>AMST (Armênia)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>Horário de Ashkhabad</standard>
-					<daylight>Horário de Verão de Ashkhabad</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Horário do Atlântico</generic>
-					<standard>Horário Padrão do Atlântico</standard>
-					<daylight>Horário de Verão do Atlântico</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Horário da Austrália Central</generic>
-					<standard>Horário Padrão da Austrália Central</standard>
-					<daylight>Horário de Verão da Austrália Central</daylight>
-				</long>
-				<short>
-					<generic>ACT (Austrália)</generic>
-					<standard>ACST (Austrália)</standard>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Horário da Austrália Centro-Ocidental</generic>
-					<standard>Horário Padrão da Austrália Centro-Ocidental</standard>
-					<daylight>Horário de Verão da Austrália Centro-Ocidental</daylight>
-				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Horário da Austrália Oriental</generic>
-					<standard>Horário Padrão da Austrália Oriental</standard>
-					<daylight>Horário de Verão da Austrália Oriental</daylight>
-				</long>
-				<short>
-					<generic>AET</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Horário da Austrália Ocidental</generic>
-					<standard>Horário Padrão da Austrália Ocidental</standard>
-					<daylight>Horário de Verão da Austrália Ocidental</daylight>
-				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Horário do Arzeibaijão</standard>
-					<daylight>Horário de Verão do Arzeibaijão</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Horário dos Açores</standard>
-					<daylight>Horário de Verão dos Açores</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Horário de Baku</standard>
-					<daylight>Horário de Verão de Baku</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Horário de Bangladesh</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Horário de Bering</generic>
-					<standard>Horário Padrão de Bering</standard>
-					<daylight>Horário de Verão de Bering</daylight>
-				</long>
-				<short>
-					<generic>BT (Bering)</generic>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Horário do Butão</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Horário da Bolívia</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Horário de Bornéu</standard>
-					<daylight>Horário de Verão de Bornéu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Horário de Brasília</standard>
-					<daylight>Horário de Verão de Brasília</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Horário de Brunei Darussalam</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Horário do Cabo Verde</standard>
-					<daylight>Horário de Verão do Cabo Verde</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Horário de Chamorro</generic>
-					<standard>Horário Padrão de Chamorro</standard>
-				</long>
-				<short>
-					<generic>ChT</generic>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Horário de Changbai</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Horário de Padrão de Chatham</standard>
-					<daylight>Horário de Verão de Chatham</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Horário do Chile</standard>
-					<daylight>Horário de Verão do Chile</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Horário da China</generic>
-					<standard>Horário Padrão da China</standard>
-					<daylight>Horário de Verão da China</daylight>
-				</long>
-				<short>
-					<generic>CT (China)</generic>
-					<standard>CST (China)</standard>
-					<daylight>CDT (China)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Horário de Choibalsan</standard>
-					<daylight>Horário de Verão de Choibalsan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Horário das Ilhas Christmas</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Horário das Ilhas Coco</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Horário da Colômbia</standard>
-					<daylight>Horário de Verão da Colômbia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Horário das Ilhas Cook</standard>
-					<daylight>Meio Horário de Verão das Ilhas Cook</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Horário de Cuba</generic>
-					<standard>Horário Padrão de Cuba</standard>
-					<daylight>Horário de Verão de Cuba</daylight>
-				</long>
-				<short>
-					<standard>CST (Cuba)</standard>
-					<daylight>CDT (Cuba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Horário de Dacca</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Horário de Davis</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Horário de Dumont-d'Urville</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Horário de Dushanbe</standard>
-					<daylight>Horário de Verão de Dushanbe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Horário da Guiana Holandesa</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Horário do Timor-Leste</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Horário da Ilha de Páscoa</standard>
-					<daylight>Horário de Verão da Ilha de Páscoa</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Horário do Equador</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Horário da Europa Central</standard>
-					<daylight>Horário de Verão da Europa Central</daylight>
-				</long>
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Horário Padrão da Europa Oriental</standard>
-					<daylight>Horário de Verão da Europa Oriental</daylight>
-				</long>
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Horário da Europa Ocidental</standard>
-					<daylight>Horário de Verão da Europa Ocidental</daylight>
-				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Horário das Ilhas Falkland</standard>
-					<daylight>Horário de Verão das Ilhas Falkland</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Horário de Fiji</standard>
-					<daylight>Horário de Verão de Fiji</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Horário da Guiana Francesa</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Horário da Antártida e do Sul da França</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Horário de Frunze</standard>
-					<daylight>Horário de Verão de Frunze</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Horário de Galápagos</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Horário de Gambier</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Horário da Geórgia</standard>
-					<daylight>Horário de Verão da Geórgia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Horário das Ilhas Gilberto</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Horário do Meridiano de Greenwich</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Horário da Groelândia Central</standard>
-					<daylight>Horário de Verão da Groenlândia Central</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Horário da Groelândia Oriental</standard>
-					<daylight>Horário de Verão da Groelândia Oriental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Horário da Groenlândia Ocidental</standard>
-					<daylight>Horário de Verão da Groenlândia Ocidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Horário Padrão de Guam</standard>
-				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Horário do Golfo</generic>
-					<standard>Horário Padrão do Golfo</standard>
-				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Horário da Guiana</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Horário Padrão do Havaí-Aleuta</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Horário de Hong Kong</standard>
-					<daylight>Horário de Verão de Hong Kong</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Horário de Hovd</standard>
-					<daylight>Horário de Verão de Hovd</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Horário Padrão da �ndia</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Horário do Oceano �ndico</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Horário da Indochina</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Horário da Indonésia Central</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Horário da Indonésia Oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Horário da Indonésia Ocidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Horário Padrão do Irã</standard>
-					<daylight>Horário de Verão do Irã</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Horário de Irkutsk</standard>
-					<daylight>Horário de Verão de Irkutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Horário de Israel</generic>
-					<standard>Horário Padrão de Israel</standard>
-					<daylight>Horário de Verão de Israel</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Horário do Japão</generic>
-					<standard>Horário Padrão do Japão</standard>
-					<daylight>Horário de Verão do Japão</daylight>
-				</long>
-				<short>
-					<generic>JT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Horário de Petropavlovsk-Kamchatski</standard>
-					<daylight>Horário de Verão de Petropavlovsk-Kamchatski</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Horário de Karachi</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Horário de Kashgar</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>Horário do Casaquistão Oriental</generic>
-					<standard>Horário Padrão do Cazaquistão Oriental</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Horário do Casaquistão Ocidental</generic>
-					<standard>Horário Padrão do Casaquistão Ocidental</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Horário de Kizilorda</standard>
-					<daylight>Horário de Verão de Kizilorda</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Horário da Coréia</generic>
-					<standard>Horário Padrão da Coréia</standard>
-					<daylight>Horário de Verão da Coréia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Horário de Kosrae</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Horário de Krasnoyarsk</standard>
-					<daylight>Horário de Verão de Krasnoyarsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Horário de Kuybyshev</standard>
-					<daylight>Horário de Verão de Kuybyshev</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Horário de Kwajalein</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Horário do Quirguistão</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Horário de Lanka</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Horário das Ilhas Line</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Horário de Long-Shu</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Horário de Lord Howe</generic>
-					<standard>Horário Padrão de Lord Howe</standard>
-					<daylight>Horário de Verão de Lord Howe</daylight>
-				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Horário de Macau</standard>
-					<daylight>Horário de Verão de Macau</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Horário de Magadan</standard>
-					<daylight>Horário de Verão de Magadan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Horário de Malaia</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Horário da Malásia</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Horário das Ilhas Maldivas</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Horário das Marquesas</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Horário das Ilhas Marshall</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Horário das Ilhas Maurício</standard>
-					<daylight>Horário de Verão das Ilhas Maurício</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Horário de Mawson</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Horário de Ulan Bator</standard>
-					<daylight>Horário de Verão de Ulan Bator</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Horário de Moscou</generic>
-					<standard>Horário Padrão de Moscou</standard>
-					<daylight>Horário de Verão de Moscou</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Horário de Mianmar</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Horário de Nauru</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Horário do Nepal</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>Horário da Nova Caledônia</standard>
-					<daylight>Horário de Verão da Nova Caledônia</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Horário da Nova Zelândia</generic>
-					<standard>Horário Padrão da Nova Zelândia</standard>
-					<daylight>Horário de Verão da Nova Zelândia</daylight>
-				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Horário de Terra Nova</generic>
-					<standard>Horário Padrão de Terra Nova</standard>
-					<daylight>Horário de Verão de Terra Nova</daylight>
-				</long>
-				<short>
-					<generic>NT</generic>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Horário de Niue</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Horário das Ilhas Norfolk</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Horário de Fernando de Noronha</standard>
-					<daylight>Horário de Verão de Fernando de Noronha</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Horário das Ilhas Mariana do Norte</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Horário de Novosibirsk</standard>
-					<daylight>Horário de Verão de Novosibirsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Horário de Omsk</standard>
-					<daylight>Horário de Verão de Omsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Horário do Paquistão</standard>
-					<daylight>Horário de Verão do Paquistão</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Horário de Palau</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Horário de Papua Nova Guiné</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Horário do Paraguai</standard>
-					<daylight>Horário de Verão do Paraguai</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Horário do Peru</standard>
-					<daylight>Horário de Verão do Peru</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Horário das Filipinas</standard>
-					<daylight>Horário de Verão das Filipinas</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Horário das Ilhas Fênix</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Horário de Pierre e Miquelon</generic>
-					<standard>Horário Padrão de Pierre e Miquelon</standard>
-					<daylight>Horário de Verão de Pierre e Miquelon</daylight>
-				</long>
-				<short>
-					<generic>PMT</generic>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Horário de Pitcairn</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Horário de Ponape</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Horário de Qyzylorda</standard>
-					<daylight>Horário de Verão de Qyzylorda</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Horário das Ilhas Reunião</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Horário de Rothera</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Horário de Sakhalin</standard>
-					<daylight>Horário de Verão de Sakhalin</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Horário de Samara</standard>
-					<daylight>Horário de Verão de Samara</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Horário de Samarkand</standard>
-					<daylight>Horário de Verão de Samarkand</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Horário Padrão de Samoa</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Horário das Ilhas Seychelles</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Horário de Shevchenko</standard>
-					<daylight>Horário de Verão de Shevchenko</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Horário Padrão de Cingapura</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Horário das Ilhas Salomão</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Horário da Geórgia do Sul</standard>
-				</long>
-				<short>
-					<standard>GST (Geórgia do Sul)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Horário do Suriname</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Horário de Sverdlovsk</standard>
-					<daylight>Horário de Verão de Sverdlovsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Horário de Syowa</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Horário do Taiti</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Horário do Tajiquistão</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Horário de Tashkent</standard>
-					<daylight>Horário de Verão de Tashkent</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Horário de Tbilisi</standard>
-					<daylight>Horário de Verão de Tbilisi</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Horário de Tokelau</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Horário de Tonga</standard>
-					<daylight>Horário de Verão de Tonga</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Horário de Truk</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Horário da Turquia</standard>
-					<daylight>Horário de Verão da Turquia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Horário do Turcomenistão</standard>
-					<daylight>Horário de Verão do Turcomenistão</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Horário de Tuvalu</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Horário de Ural'sk</standard>
-					<daylight>Horário de Verão de Ural'sk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Horário do Uruguai</standard>
-					<daylight>Horário de Verão do Uruguai</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Horário de Urumqi</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Horário do Uzbequistão</standard>
-					<daylight>Horário de Verão do Uzbequistão</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Horário de Vanuatu</standard>
-					<daylight>Horário de Verão de Vanuatu</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Horário da Venezuela</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Horário de Vladivostok</standard>
-					<daylight>Horário de Verão de Vladivostok</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Horário de Volvogrado</standard>
-					<daylight>Horário de Verão de Volvogrado</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Horário de Vostok</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Horário das Ilhas Wake</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Horário de Wallis e Futuna</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Horário de Yakutsk</standard>
-					<daylight>Horário de Verão de Yakutsk</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Horário de Yekaterinburg</standard>
-					<daylight>Horário de Verão de Yekaterinburg</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Horário de Yerevan</standard>
-					<daylight>Horário de Verão de Yerevan</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Horário de Yukon</generic>
-					<standard>Horário Padrão de Yukon</standard>
-					<daylight>Horário de Verão de Yukon</daylight>
-				</long>
-				<short>
-					<generic>YT</generic>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Peseta de Andorra</displayName>
-				<displayName count="one">Peseta de Andorra</displayName>
-				<displayName count="other">Pesetas de Andorra</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Dirém dos Emirados �rabes Unidos</displayName>
-				<displayName count="one">Dirrã dos Emirados �rabes Unidos</displayName>
-				<displayName count="other">Dirrãs dos Emirados �rabes Unidos</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afegane (1927-2002)</displayName>
-				<displayName count="one">Afegane do Afeganistão (AFA)</displayName>
-				<displayName count="other">Afeganes do Afeganistão (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afegane</displayName>
-				<displayName count="one">Afegane do Afeganistão</displayName>
-				<displayName count="other">Afeganes do Afeganistão</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Lek Albanês</displayName>
-				<displayName count="one">Lek albanês</displayName>
-				<displayName count="other">Leks albaneses</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Dram armênio</displayName>
-				<displayName count="one">Dram armênio</displayName>
-				<displayName count="other">Drams armênios</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Guilder das Antilhas Holandesas</displayName>
-				<displayName count="one">Florim das Antilhas Holandesas</displayName>
-				<displayName count="other">Florins das Antilhas Holandesas</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Cuanza angolano</displayName>
-				<displayName count="one">Kwanza angolano</displayName>
-				<displayName count="other">Kwanzas angolanos</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Cuanza angolano (1977-1990)</displayName>
-				<displayName count="one">Kwanza angolano (AOK)</displayName>
-				<displayName count="other">Kwanzas angolanos (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Novo cuanza angolano (1990-2000)</displayName>
-				<displayName count="one">Novo kwanza angolano (AON)</displayName>
-				<displayName count="other">Novos kwanzas angolanos (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Cuanza angolano reajustado (1995-1999)</displayName>
-				<displayName count="one">Kwanza angolano reajustado (AOR)</displayName>
-				<displayName count="other">Kwanzas angolanos reajustados (AOR)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Austral argentino</displayName>
-				<displayName count="one">Austral argentino</displayName>
-				<displayName count="other">Austrais argentinos</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Peso argentino (1983-1985)</displayName>
-				<displayName count="one">Peso argentino (ARP)</displayName>
-				<displayName count="other">Pesos argentinos (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Peso argentino</displayName>
-				<displayName count="one">Peso argentino</displayName>
-				<displayName count="other">Pesos argentinos</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Xelim austríaco</displayName>
-				<displayName count="one">Schilling australiano</displayName>
-				<displayName count="other">Schillings australianos</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Dólar australiano</displayName>
-				<displayName count="one">Dólar australiano</displayName>
-				<displayName count="other">Dólares australianos</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Guilder de Aruba</displayName>
-				<displayName count="one">Florim de Aruba</displayName>
-				<displayName count="other">Florins de Aruba</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Manat azerbaijano</displayName>
-				<displayName count="one">Manat do Azeibaijão (AZM)</displayName>
-				<displayName count="other">Manats do Azeibaijão (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Manat do Azerbaijão</displayName>
-				<displayName count="one">Manat do Azeibaijão</displayName>
-				<displayName count="other">Manats do Azeibaijão</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Dinar da Bósnia-Herzegovina</displayName>
-				<displayName count="one">Dinar da Bósnia Herzegovina</displayName>
-				<displayName count="other">Dinares da Bósnia Herzegovina</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marco bósnio-herzegovino conversível</displayName>
-				<displayName count="one">Marca conversível da Bósnia Herzegovina</displayName>
-				<displayName count="other">Marcas conversíveis da Bósnia Herzegovina</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Dólar de Barbados</displayName>
-				<displayName count="one">Dólar de Barbados</displayName>
-				<displayName count="other">Dólares de Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Taka de Bangladesh</displayName>
-				<displayName count="one">Taka de Bangladesh</displayName>
-				<displayName count="other">Takas de Bangladesh</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Franco belga (conversível)</displayName>
-				<displayName count="one">Franco belga (conversível)</displayName>
-				<displayName count="other">Francos belgas (conversíveis)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Franco belga</displayName>
-				<displayName count="one">Franco belga</displayName>
-				<displayName count="other">Francos belgas</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Franco belga (financeiro)</displayName>
-				<displayName count="one">Franco belga (financeiro)</displayName>
-				<displayName count="other">Francos belgas (financeiros)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Lev forte búlgaro</displayName>
-				<displayName count="one">Lev forte búlgaro</displayName>
-				<displayName count="other">Levs fortes búlgaros</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lev novo búlgaro</displayName>
-				<displayName count="one">Lev búlgaro</displayName>
-				<displayName count="other">Levs búlgaros</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Dinar bareinita</displayName>
-				<displayName count="one">Dinar bareinita</displayName>
-				<displayName count="other">Dinares bareinitas</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Franco do Burundi</displayName>
-				<displayName count="one">Franco burundiano</displayName>
-				<displayName count="other">Francos burundianos</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Dólar das Bermudas</displayName>
-				<displayName count="one">Dólar bermudense</displayName>
-				<displayName count="other">Dólares bermudenses</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Dólar do Brunei</displayName>
-				<displayName count="one">Dólar bruneano</displayName>
-				<displayName count="other">Dólares bruneanos</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Boliviano</displayName>
-				<displayName count="one">Boliviano</displayName>
-				<displayName count="other">Bolivianos</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Peso boliviano</displayName>
-				<displayName count="one">Peso boliviano</displayName>
-				<displayName count="other">Pesos bolivianos</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Mvdol boliviano</displayName>
-				<displayName count="one">Mvdol boliviano</displayName>
-				<displayName count="other">Mvdols bolivianos</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Cruzeiro novo brasileiro (1967-1986)</displayName>
-				<displayName count="one">Cruzeiro novo brasileiro (BRB)</displayName>
-				<displayName count="other">Cruzeiros novos brasileiros (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Cruzado brasileiro</displayName>
-				<displayName count="one">Cruzado brasileiro</displayName>
-				<displayName count="other">Cruzados brasileiros</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Cruzeiro brasileiro (1990-1993)</displayName>
-				<displayName count="one">Cruzeiro brasileiro (BRE)</displayName>
-				<displayName count="other">Cruzeiros brasileiros (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real brasileiro</displayName>
-				<displayName count="one">Real brasileiro</displayName>
-				<displayName count="other">Reais brasileiros</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Cruzado novo brasileiro</displayName>
-				<displayName count="one">Cruzado novo brasileiro</displayName>
-				<displayName count="other">Cruzados novos brasileiros</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Cruzeiro brasileiro</displayName>
-				<displayName count="one">Cruzeiro brasileiro</displayName>
-				<displayName count="other">Cruzeiros brasileiros</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Dólar das Bahamas</displayName>
-				<displayName count="one">Dólar de Bahamian</displayName>
-				<displayName count="other">Dólares de Bahamian</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Ngultrum do Butão</displayName>
-				<displayName count="one">Ngultrum butanês</displayName>
-				<displayName count="other">Ngultruns butaneses</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Kyat birmanês</displayName>
-				<displayName count="one">Kyat burmês</displayName>
-				<displayName count="other">Kyats burmeses</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Pula botsuanesa</displayName>
-				<displayName count="one">Pula de Botsuana</displayName>
-				<displayName count="other">Pulas de Botsuana</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Rublo novo bielo-russo (1994-1999)</displayName>
-				<displayName count="one">Novo rublo bielorusso (BYB)</displayName>
-				<displayName count="other">Novos rublos bielorussos (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Rublo bielo-russo</displayName>
-				<displayName count="one">Rublo bielorusso</displayName>
-				<displayName count="other">Rublos bielorussos</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Dólar do Belize</displayName>
-				<displayName count="one">Dólar belizenho</displayName>
-				<displayName count="other">Dólares belizenhos</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Dólar canadense</displayName>
-				<displayName count="one">Dólar canadense</displayName>
-				<displayName count="other">Dólares canadenses</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Franco congolês</displayName>
-				<displayName count="one">Franco congolês</displayName>
-				<displayName count="other">Francos congoleses</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>Euro WIR</displayName>
-				<displayName count="one">Euro WIR</displayName>
-				<displayName count="other">Euros WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franco suíço</displayName>
-				<displayName count="one">Franco suíço</displayName>
-				<displayName count="other">Francos suíços</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>Franco WIR</displayName>
-				<displayName count="one">Franco WIR</displayName>
-				<displayName count="other">Francos WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Unidades de Fomento chilenas</displayName>
-				<displayName count="one">Unidade de fomento chilena</displayName>
-				<displayName count="other">Unidades de fomento chilenas</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Peso chileno</displayName>
-				<displayName count="one">Peso chileno</displayName>
-				<displayName count="other">Pesos chilenos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Yuan Renminbi chinês</displayName>
-				<displayName count="one">Yuan chinês</displayName>
-				<displayName count="other">Yuans chineses</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Peso colombiano</displayName>
-				<displayName count="one">Peso colombiano</displayName>
-				<displayName count="other">Pesos colombianos</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidade de Valor Real</displayName>
-				<displayName count="one">Unidade de valor real</displayName>
-				<displayName count="other">Unidades de valor real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Colon da Costa Rica</displayName>
-				<displayName count="one">Colon costa-riquenho</displayName>
-				<displayName count="other">Colons costa-riquenhos</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Dinar sérvio antigo</displayName>
-				<displayName count="one">Dinar antigo da Sérvia</displayName>
-				<displayName count="other">Dinares antigos da Sérvia</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Coroa Forte checoslovaca</displayName>
-				<displayName count="one">Coroa forte tchecoslovaca</displayName>
-				<displayName count="other">Coroas fortes tchecoslovacas</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Peso cubano</displayName>
-				<displayName count="one">Peso cubano</displayName>
-				<displayName count="other">Pesos cubanos</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Escudo cabo-verdiano</displayName>
-				<displayName count="one">Escudo cabo-verdiano</displayName>
-				<displayName count="other">Escudos cabo-verdianos</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Libra cipriota</displayName>
-				<displayName count="one">Libra cipriota</displayName>
-				<displayName count="other">Libras cipriotas</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Coroa checa</displayName>
-				<displayName count="one">Coroa da República Tcheca</displayName>
-				<displayName count="other">Coroas da República Tcheca</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Ostmark da Alemanha Oriental</displayName>
-				<displayName count="one">Marco da Alemanha Oriental</displayName>
-				<displayName count="other">Marcos da Alemanha Oriental</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Marco alemão</displayName>
-				<displayName count="one">Marco alemão</displayName>
-				<displayName count="other">Marcos alemães</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Franco do Djibuti</displayName>
-				<displayName count="one">Franco djibutiense</displayName>
-				<displayName count="other">Francos djibutienses</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Coroa dinamarquesa</displayName>
-				<displayName count="one">Coroa dinamarquesa</displayName>
-				<displayName count="other">Coroas dinamarquesas</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Peso dominicano</displayName>
-				<displayName count="one">Peso dominicano</displayName>
-				<displayName count="other">Pesos dominicanos</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Dinar argelino</displayName>
-				<displayName count="one">Dinar argelino</displayName>
-				<displayName count="other">Dinares argelinos</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Sucre equatoriano</displayName>
-				<displayName count="one">Sucre equatoriano</displayName>
-				<displayName count="other">Sucres equatorianos</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidade de Valor Constante (UVC) do Equador</displayName>
-				<displayName count="one">Unidade de valor constante equatoriana (UVC)</displayName>
-				<displayName count="other">Unidades de valor constante equatorianas (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Coroa estoniana</displayName>
-				<displayName count="one">Coroa estoniana</displayName>
-				<displayName count="other">Coroas estonianas</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Libra egípcia</displayName>
-				<displayName count="one">Libra egípcia</displayName>
-				<displayName count="other">Libras egípcias</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Nakfa da Eritreia</displayName>
-				<displayName count="one">Nakfa da Eritreia</displayName>
-				<displayName count="other">Nakfas da Eritreia</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Peseta espanhola (conta A)</displayName>
-				<displayName count="one">Peseta espanhola (conta A)</displayName>
-				<displayName count="other">Pesetas espanholas (conta A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Peseta espanhola (conta conversível)</displayName>
-				<displayName count="one">Peseta espanhola (conta conversível)</displayName>
-				<displayName count="other">Pesetas espanholas (conta conversível)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Peseta espanhola</displayName>
-				<displayName count="one">Peseta espanhola</displayName>
-				<displayName count="other">Pesetas espanholas</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birr etíope</displayName>
-				<displayName count="one">Birr etíope</displayName>
-				<displayName count="other">Birrs etíopes</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euros</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Marca finlandesa</displayName>
-				<displayName count="one">Marco finlandês</displayName>
-				<displayName count="other">Marcos finlandeses</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dólar de Fiji</displayName>
-				<displayName count="one">Dólar de Fiji</displayName>
-				<displayName count="other">Dólares de Fiji</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Libra das Malvinas</displayName>
-				<displayName count="one">Libra das Ilhas Falkland</displayName>
-				<displayName count="other">Libras das Ilhas Falkland</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franco francês</displayName>
-				<displayName count="one">Franco francês</displayName>
-				<displayName count="other">Francos franceses</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Libra esterlina britânica</displayName>
-				<displayName count="one">Libra esterlina britânica</displayName>
-				<displayName count="other">Libras esterlinas britânicas</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Cupom Lari georgiano</displayName>
-				<displayName count="one">Kupon larit da Geórgia</displayName>
-				<displayName count="other">Kupon larits da Geórgia</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari georgiano</displayName>
-				<displayName count="one">Lari da Geórgia</displayName>
-				<displayName count="other">Laris da Geórgia</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi de Gana (1979-2007)</displayName>
-				<displayName count="one">Cedi de Gana (GHC)</displayName>
-				<displayName count="other">Cedis de Gana (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Cedi ganês</displayName>
-				<displayName count="one">Cedi de Gana</displayName>
-				<displayName count="other">Cedis de Gana</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Libra de Gibraltar</displayName>
-				<displayName count="one">Libra de Gibraltar</displayName>
-				<displayName count="other">Libras de Gibraltar</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi de Gâmbia</displayName>
-				<displayName count="one">Dalasi da Gâmbia</displayName>
-				<displayName count="other">Dalasis da Gâmbia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franco de Guiné</displayName>
-				<displayName count="one">Franco guineano</displayName>
-				<displayName count="other">Francos guineanos</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Syli da Guiné</displayName>
-				<displayName count="one">Syli guineano</displayName>
-				<displayName count="other">Sylis guineanos</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekwele da Guiné Equatorial</displayName>
-				<displayName count="one">Ekwele da Guiné Equatorial</displayName>
-				<displayName count="other">Ekweles da Guiné Equatorial</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Dracma grego</displayName>
-				<displayName count="one">Dracma grego</displayName>
-				<displayName count="other">Dracmas gregos</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetçal da Guatemala</displayName>
-				<displayName count="one">Quetzal da Guatemala</displayName>
-				<displayName count="other">Quetzales da Guatemala</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Escudo da Guiné Portuguesa</displayName>
-				<displayName count="one">Escudo da Guiné Portuguesa</displayName>
-				<displayName count="other">Escudos da Guinéa Portuguesa</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Peso da Guiné-Bissau</displayName>
-				<displayName count="one">Peso de Guiné-Bissau</displayName>
-				<displayName count="other">Pesos de Guiné-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Dólar da Guiana</displayName>
-				<displayName count="one">Dólar da Guiana</displayName>
-				<displayName count="other">Dólares da Guiana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Dólar de Hong Kong</displayName>
-				<displayName count="one">Dólar de Hong Kong</displayName>
-				<displayName count="other">Dólares de Hong Kong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira de Honduras</displayName>
-				<displayName count="one">Lempira de Honduras</displayName>
-				<displayName count="other">Lempiras de Honduras</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Dinar croata</displayName>
-				<displayName count="one">Dinar croata</displayName>
-				<displayName count="other">Dinares croatas</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Kuna croata</displayName>
-				<displayName count="one">Kuna croata</displayName>
-				<displayName count="other">Kunas croatas</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gurde do Haiti</displayName>
-				<displayName count="one">Gourde haitiano</displayName>
-				<displayName count="other">Gourdes haitianos</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Forinte húngaro</displayName>
-				<displayName count="one">Forint húngaro</displayName>
-				<displayName count="other">Forints húngaros</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupia indonésia</displayName>
-				<displayName count="one">Rúpia da Indonésia</displayName>
-				<displayName count="other">Rúpias da Indonésia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Libra irlandesa</displayName>
-				<displayName count="one">Libra irlandesa</displayName>
-				<displayName count="other">Libras irlandesas</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Libra israelita</displayName>
-				<displayName count="one">Libra israelita</displayName>
-				<displayName count="other">Libras israelitas</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>Sheqel antigo israelita</displayName>
-				<displayName count="one">Sheqel antigo israelita</displayName>
-				<displayName count="other">Sheqels antigos israelitas</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Sheqel Novo israelita</displayName>
-				<displayName count="one">Sheqel novo israelita</displayName>
-				<displayName count="other">Sheqels novo israelitas</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rúpia indiana</displayName>
-				<displayName count="one">Rúpia indiana</displayName>
-				<displayName count="other">Rúpias indianas</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dinar iraquiano</displayName>
-				<displayName count="one">Dinar iraquiano</displayName>
-				<displayName count="other">Dinares iraquianos</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial iraniano</displayName>
-				<displayName count="one">Rial iraniano</displayName>
-				<displayName count="other">Riales iranianos</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>Coroa antiga islandesa</displayName>
-				<displayName count="one">Coroa antiga islandesa</displayName>
-				<displayName count="other">Coroas antigas islandesas</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Coroa islandesa</displayName>
-				<displayName count="one">Coroa islandesa</displayName>
-				<displayName count="other">Coroas islandesas</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lira italiana</displayName>
-				<displayName count="one">Lira italiana</displayName>
-				<displayName count="other">Liras italianas</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Dólar jamaicano</displayName>
-				<displayName count="one">Dólar jamaicano</displayName>
-				<displayName count="other">Dólares jamaicanos</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dinar jordaniano</displayName>
-				<displayName count="one">Dinar jordaniano</displayName>
-				<displayName count="other">Dinares jordanianos</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Iene japonês</displayName>
-				<displayName count="one">Iene japonês</displayName>
-				<displayName count="other">Ienes japoneses</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Xelim queniano</displayName>
-				<displayName count="one">Shilling queniano</displayName>
-				<displayName count="other">Shillings quenianos</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Som quirguiz</displayName>
-				<displayName count="one">Som do Quirguistão</displayName>
-				<displayName count="other">Soms do Quirguistão</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Riel cambojano</displayName>
-				<displayName count="one">Riel cambojano</displayName>
-				<displayName count="other">Rieles cambojanos</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Franco de Comores</displayName>
-				<displayName count="one">Franco de Comoro</displayName>
-				<displayName count="other">Francos de Comoro</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Won norte-coreano</displayName>
-				<displayName count="one">Won norte-coreano</displayName>
-				<displayName count="other">Wons norte-coreanos</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won sul-coreano</displayName>
-				<displayName count="one">Won sul-coreano</displayName>
-				<displayName count="other">Wons sul-coreanos</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dinar coveitiano</displayName>
-				<displayName count="one">Dinar kuwaitiano</displayName>
-				<displayName count="other">Dinares kuwaitianos</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dólar das Ilhas Caiman</displayName>
-				<displayName count="one">Dólar das Ilhas Cayman</displayName>
-				<displayName count="other">Dólares das Ilhas Caiman</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Tenge do Cazaquistão</displayName>
-				<displayName count="one">Tenge do Cazaquistão</displayName>
-				<displayName count="other">Tenges do Cazaquistão</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Kip de Laos</displayName>
-				<displayName count="one">Kip do Laos</displayName>
-				<displayName count="other">Kips do Laos</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libra libanesa</displayName>
-				<displayName count="one">Libra libanesa</displayName>
-				<displayName count="other">Libras libanesas</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Rupia do Sri Lanka</displayName>
-				<displayName count="one">Rúpia do Sri Lanka</displayName>
-				<displayName count="other">Rúpias do Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Dólar liberiano</displayName>
-				<displayName count="one">Dólar da Libéria</displayName>
-				<displayName count="other">Dólares da Libéria</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Loti do Lesoto</displayName>
-				<displayName count="one">Loti do Lesoto</displayName>
-				<displayName count="other">Lotis do Lesoto</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Lita lituano</displayName>
-				<displayName count="one">Litas lituana</displayName>
-				<displayName count="other">Litai lituanas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Talonas lituano</displayName>
-				<displayName count="one">Talonas lituanas</displayName>
-				<displayName count="other">Talonases lituanas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Franco conversível de Luxemburgo</displayName>
-				<displayName count="one">Franco conversível de Luxemburgo</displayName>
-				<displayName count="other">Francos conversíveis de Luxemburgo</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Franco luxemburguês</displayName>
-				<displayName count="one">Franco de Luxemburgo</displayName>
-				<displayName count="other">Francos de Luxemburgo</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Franco financeiro de Luxemburgo</displayName>
-				<displayName count="one">Franco financeiro de Luxemburgo</displayName>
-				<displayName count="other">Francos financeiros de Luxemburgo</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lats letão</displayName>
-				<displayName count="one">Lats da Letônia</displayName>
-				<displayName count="other">Latses da Letônia</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Rublo letão</displayName>
-				<displayName count="one">Rublo da Letônia</displayName>
-				<displayName count="other">Rublos da Letônia</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Dinar líbio</displayName>
-				<displayName count="one">Dinar líbio</displayName>
-				<displayName count="other">Dinares líbios</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Dirém marroquino</displayName>
-				<displayName count="one">Dirrã marroquino</displayName>
-				<displayName count="other">Dirrãs marroquinos</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Franco marroquino</displayName>
-				<displayName count="one">Franco marroquino</displayName>
-				<displayName count="other">Francos marroquinos</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Leu moldávio</displayName>
-				<displayName count="one">Leu da Moldávia</displayName>
-				<displayName count="other">Leus da Moldávia</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Ariary de Madagascar</displayName>
-				<displayName count="one">Ariari de Madagascar</displayName>
-				<displayName count="other">Ariaries de Madagascar</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Franco de Madagascar</displayName>
-				<displayName count="one">Franco de Madagascar</displayName>
-				<displayName count="other">Francos de Madagascar</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Dinar macedônio</displayName>
-				<displayName count="one">Dinar da Macedônia</displayName>
-				<displayName count="other">Dinares da Macedônia</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Franco de Mali</displayName>
-				<displayName count="one">Franco de Mali</displayName>
-				<displayName count="other">Francos de Mali</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Kyat de Mianmar</displayName>
-				<displayName count="one">Kyat de Mianmar</displayName>
-				<displayName count="other">Kyats de Mianmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Tugrik mongol</displayName>
-				<displayName count="one">Tugrik da Mongólia</displayName>
-				<displayName count="other">Tugriks da Mongólia</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Pataca macaense</displayName>
-				<displayName count="one">Pataca de Macau</displayName>
-				<displayName count="other">Patacas de Macau</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Ouguiya da Mauritânia</displayName>
-				<displayName count="one">Ouguiya da Mauritânia</displayName>
-				<displayName count="other">Ouguiyas da Mauritânia</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lira maltesa</displayName>
-				<displayName count="one">Lira Maltesa</displayName>
-				<displayName count="other">Liras maltesas</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Libra maltesa</displayName>
-				<displayName count="one">Libra maltesa</displayName>
-				<displayName count="other">Libras maltesas</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Rupia de Maurício</displayName>
-				<displayName count="one">Rúpia mauriciana</displayName>
-				<displayName count="other">Rúpias mauricianas</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Rupias das Ilhas Maldivas</displayName>
-				<displayName count="one">Rufiyaa das Ilhas Maldivas</displayName>
-				<displayName count="other">Rufiyaas das Ilhas Maldivas</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Cuacha do Maláui</displayName>
-				<displayName count="one">Kwacha do Malawi</displayName>
-				<displayName count="other">Kwachas do Malawi</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso mexicano</displayName>
-				<displayName count="one">Peso mexicano</displayName>
-				<displayName count="other">Pesos mexicanos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso Prata mexicano (1861-1992)</displayName>
-				<displayName count="one">Peso de prata mexicano (MXP)</displayName>
-				<displayName count="other">Pesos de prata mexicanos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidade Mexicana de Investimento (UDI)</displayName>
-				<displayName count="one">Unidade de investimento mexicana (UDI)</displayName>
-				<displayName count="other">Unidades de investimento mexicanas (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Ringgit malaio</displayName>
-				<displayName count="one">Ringgit malaio</displayName>
-				<displayName count="other">Ringgits malaios</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Escudo de Moçambique</displayName>
-				<displayName count="one">Escudo de Moçambique</displayName>
-				<displayName count="other">Escudos de Moçambique</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Metical antigo de Moçambique</displayName>
-				<displayName count="one">Metical antigo de Moçambique</displayName>
-				<displayName count="other">Meticales antigos de Moçambique</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Metical do Moçambique</displayName>
-				<displayName count="one">Metical de Moçambique</displayName>
-				<displayName count="other">Meticales de Moçambique</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Dólar da Namíbia</displayName>
-				<displayName count="one">Dólar da Namíbia</displayName>
-				<displayName count="other">Dólares da Namíbia</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Naira nigeriana</displayName>
-				<displayName count="one">Naira da Nigéria</displayName>
-				<displayName count="other">Nairas da Nigéria</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Córdoba nicaraguense</displayName>
-				<displayName count="one">Córdoba nicaraguense</displayName>
-				<displayName count="other">Córdobas da Nicarágua</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba Ouro nicaraguense</displayName>
-				<displayName count="one">Córdoba de ouro da Nicarágua</displayName>
-				<displayName count="other">Córdobas de ouro da Nicarágua</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Florim holandês</displayName>
-				<displayName count="one">Florim holandês</displayName>
-				<displayName count="other">Florins holandeses</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Coroa norueguesa</displayName>
-				<displayName count="one">Coroa norueguesa</displayName>
-				<displayName count="other">Coroas norueguesas</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Rupia nepalesa</displayName>
-				<displayName count="one">Rúpia nepalesa</displayName>
-				<displayName count="other">Rúpias nepalesas</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Dólar da Nova Zelândia</displayName>
-				<displayName count="one">Dólar da Nova Zelândia</displayName>
-				<displayName count="other">Dólares da Nova Zelândia</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Rial de Omã</displayName>
-				<displayName count="one">Rial de Omã</displayName>
-				<displayName count="other">Riales de Omã</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Balboa panamenho</displayName>
-				<displayName count="one">Balboa do Panamá</displayName>
-				<displayName count="other">Balboas do Panamá</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Inti peruano</displayName>
-				<displayName count="one">Inti peruano</displayName>
-				<displayName count="other">Intis peruanos</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Sol Novo peruano</displayName>
-				<displayName count="one">Novo sol peruano</displayName>
-				<displayName count="other">Novos soles peruanos</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Sol peruano</displayName>
-				<displayName count="one">Sol peruano</displayName>
-				<displayName count="other">Soles peruanos</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Kina da Papua-Nova Guiné</displayName>
-				<displayName count="one">Kina de Papua Nova Guiné</displayName>
-				<displayName count="other">Kinas de Papua Nova Guiné</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso filipino</displayName>
-				<displayName count="one">Peso filipino</displayName>
-				<displayName count="other">Pesos filipinos</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupia paquistanesa</displayName>
-				<displayName count="one">Rúpia paquistanesa</displayName>
-				<displayName count="other">Rúpias paquistanesas</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloti polonês</displayName>
-				<displayName count="one">Zloti polonês</displayName>
-				<displayName count="other">Zlotis poloneses</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloti polonês (1950-1995)</displayName>
-				<displayName count="one">Zloti polonês (PLZ)</displayName>
-				<displayName count="other">Zlotis poloneses (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Escudo português</displayName>
-				<displayName count="one">Escudo português</displayName>
-				<displayName count="other">Escudos portugueses</displayName>
-				<symbol>Esc.</symbol>
-			</currency>
-			<currency type="PYG">
-				<displayName>Guarani paraguaio</displayName>
-				<displayName count="one">Guarani paraguaio</displayName>
-				<displayName count="other">Guaranis paraguaios</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rial catariano</displayName>
-				<displayName count="one">Rial do Qatar</displayName>
-				<displayName count="other">Riales do Qatar</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Dólar rodesiano</displayName>
-				<displayName count="one">Dólar da Rodésia</displayName>
-				<displayName count="other">Dólares da Rodésia</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Leu romeno antigo</displayName>
-				<displayName count="one">Leu antigo da Romênia</displayName>
-				<displayName count="other">Leus antigos da Romênia</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Leu romeno</displayName>
-				<displayName count="one">Leu da Romênia</displayName>
-				<displayName count="other">Leus da Romênia</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Dinar sérvio</displayName>
-				<displayName count="one">Dinar sérvio</displayName>
-				<displayName count="other">Dinares sérvios</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rublo russo</displayName>
-				<displayName count="one">Rublo russo</displayName>
-				<displayName count="other">Rublos russos</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rublo russo (1991-1998)</displayName>
-				<displayName count="one">Rublo russo (RUR)</displayName>
-				<displayName count="other">Rublos russos (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Franco ruandês</displayName>
-				<displayName count="one">Franco de Ruanda</displayName>
-				<displayName count="other">Francos de Ruanda</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Rial saudita</displayName>
-				<displayName count="one">Riyal saudita</displayName>
-				<displayName count="other">Riyales sauditas</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Dólar das Ilhas Salomão</displayName>
-				<displayName count="one">Dólar das Ilhas Salomão</displayName>
-				<displayName count="other">Dólares das Ilhas Salomão</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Rupia das Seychelles</displayName>
-				<displayName count="one">Rúpia das Ilhas Seychelles</displayName>
-				<displayName count="other">Rúpias das Ilhas Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Dinar sudanês</displayName>
-				<displayName count="one">Dinar antigo do Sudão</displayName>
-				<displayName count="other">Dinares antigos do Sudão</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Libra sudanesa</displayName>
-				<displayName count="one">Libra sudanesa</displayName>
-				<displayName count="other">Libras sudanesas</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Libra sudanesa antiga</displayName>
-				<displayName count="one">Libra antiga sudanesa</displayName>
-				<displayName count="other">Libras antigas sudanesas</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Coroa sueca</displayName>
-				<displayName count="one">Coroa sueca</displayName>
-				<displayName count="other">Coroas suecas</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dólar de Cingapura</displayName>
-				<displayName count="one">Dólar de Singapura</displayName>
-				<displayName count="other">Dólares de Singapura</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Libra de Santa Helena</displayName>
-				<displayName count="one">Libra de Santa Helena</displayName>
-				<displayName count="other">Libras de Santa Helena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tolar Bons esloveno</displayName>
-				<displayName count="one">Tolar da Eslovênia</displayName>
-				<displayName count="other">Tolares da Eslovênia</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Coroa eslovaca</displayName>
-				<displayName count="one">Coroa eslovaca</displayName>
-				<displayName count="other">Coroas eslovacas</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Leone de Serra Leoa</displayName>
-				<displayName count="one">Leone de Serra Leoa</displayName>
-				<displayName count="other">Leones de Serra Leoa</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Xelim somali</displayName>
-				<displayName count="one">Shilling da Somália</displayName>
-				<displayName count="other">Shillings da Somália</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Dólar do Suriname</displayName>
-				<displayName count="one">Dólar do Suriname</displayName>
-				<displayName count="other">Dólares do Suriname</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Florim do Suriname</displayName>
-				<displayName count="one">Florim do Suriname</displayName>
-				<displayName count="other">Florins do Suriname</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Dobra de São Tomé e Príncipe</displayName>
-				<displayName count="one">Dobra de São Tomé e Príncipe</displayName>
-				<displayName count="other">Dobras de São Tomé e Príncipe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Rublo soviético</displayName>
-				<displayName count="one">Rublo soviético</displayName>
-				<displayName count="other">Rublos soviéticos</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Colom salvadorenho</displayName>
-				<displayName count="one">Colon de El Salvador</displayName>
-				<displayName count="other">Colons de El Salvador</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Libra síria</displayName>
-				<displayName count="one">Libra síria</displayName>
-				<displayName count="other">Libras sírias</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Lilangeni da Suazilândia</displayName>
-				<displayName count="one">Lilangeni da Suazilândia</displayName>
-				<displayName count="other">Lilangenis da Suazilândia</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Baht tailandês</displayName>
-				<displayName count="one">Baht da Tailândia</displayName>
-				<displayName count="other">Bahts da Tailândia</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Rublo do Tadjiquistão</displayName>
-				<displayName count="one">Rublo do Tajaquistão</displayName>
-				<displayName count="other">Rublos do Tajaquistão</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Somoni tadjique</displayName>
-				<displayName count="one">Somoni do Tajaquistão</displayName>
-				<displayName count="other">Somonis do Tajaquistão</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Manat do Turcomenistão</displayName>
-				<displayName count="one">Manat do Turcomenistão</displayName>
-				<displayName count="other">Manats do Turcomenistão</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Dinar tunisiano</displayName>
-				<displayName count="one">Dinar da Tunísia</displayName>
-				<displayName count="other">Dinares da Tunísia</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Paʻanga de Tonga</displayName>
-				<displayName count="one">Paʻanga de Tonga</displayName>
-				<displayName count="other">Paʻangas de Tonga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Escudo timorense</displayName>
-				<displayName count="one">Escudo do Timor</displayName>
-				<displayName count="other">Escudos do Timor</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lira turca antiga</displayName>
-				<displayName count="one">Lira turca antiga</displayName>
-				<displayName count="other">Liras turcas antigas</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lira turca</displayName>
-				<displayName count="one">Lira turca</displayName>
-				<displayName count="other">Liras turcas</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Dólar de Trinidad e Tobago</displayName>
-				<displayName count="one">Dólar de Trinidad e Tobago</displayName>
-				<displayName count="other">Dólares de Trinidad e Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Dólar Novo de Taiwan</displayName>
-				<displayName count="one">Dólar de Taiwan</displayName>
-				<displayName count="other">Dólares de Taiwan</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Xelim da Tanzânia</displayName>
-				<displayName count="one">Shilling da Tanzânia</displayName>
-				<displayName count="other">Shillings da Tanzânia</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Hryvnia ucraniano</displayName>
-				<displayName count="one">Hryvnia da Ucrânia</displayName>
-				<displayName count="other">Hryvnias da Ucrânia</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Karbovanetz ucraniano</displayName>
-				<displayName count="one">Karbovanetz da Ucrânia</displayName>
-				<displayName count="other">Karbovanetzs da Ucrânia</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Xelim ugandense (1966-1987)</displayName>
-				<displayName count="one">Shilling de Uganda (UGS)</displayName>
-				<displayName count="other">Shillings de Uganda (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Xelim ugandense</displayName>
-				<displayName count="one">Shilling de Uganda</displayName>
-				<displayName count="other">Shillings de Uganda</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dólar norte-americano</displayName>
-				<displayName count="one">Dólar americano</displayName>
-				<displayName count="other">Dólares americanos</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>Dólar norte-americano (Dia seguinte)</displayName>
-				<displayName count="one">Dólar americano (dia seguinte)</displayName>
-				<displayName count="other">Dólares americanos (dia seguinte)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Dólar norte-americano (Mesmo dia)</displayName>
-				<displayName count="one">Dólar americano (mesmo dia)</displayName>
-				<displayName count="other">Dólares americanos (mesmo dia)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Peso uruguaio en unidades indexadas</displayName>
-				<displayName count="one">Peso uruguaio em unidades indexadas</displayName>
-				<displayName count="other">Pesos uruguaios em unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Peso uruguaio (1975-1993)</displayName>
-				<displayName count="one">Peso uruguaio (UYP)</displayName>
-				<displayName count="other">Pesos uruguaios (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Peso uruguaio</displayName>
-				<displayName count="one">Peso uruguaio</displayName>
-				<displayName count="other">Pesos uruguaios</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Sum do Usbequistão</displayName>
-				<displayName count="one">Som do Uzbequistão</displayName>
-				<displayName count="other">Somes do Uzbequistão</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bolívar venezuelano</displayName>
-				<displayName count="one">Bolívar venezuelano</displayName>
-				<displayName count="other">Bolívares venezuelanos</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Bolívar v enezuelano forte</displayName>
-				<displayName count="one">Bolívar forte da Venezuela</displayName>
-				<displayName count="other">Bolívares fortes da Venezuela</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Dong vietnamita</displayName>
-				<displayName count="one">Dong vietnamês</displayName>
-				<displayName count="other">Dongs vietnameses</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vatu de Vanuatu</displayName>
-				<displayName count="one">Vatu de Vanuatu</displayName>
-				<displayName count="other">Vatus de Vanuatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala samoano</displayName>
-				<displayName count="one">Tala samoano</displayName>
-				<displayName count="other">Talas samoanos</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Franco CFA BEAC</displayName>
-				<displayName count="one">Franco CFA de BEAC</displayName>
-				<displayName count="other">Francos CFA de BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Prata</displayName>
-				<displayName count="one">Prata</displayName>
-				<displayName count="other">Pratas</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Ouro</displayName>
-				<displayName count="one">Ouro</displayName>
-				<displayName count="other">Ouros</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Unidade Composta Europeia</displayName>
-				<displayName count="one">Unidade de composição europeia</displayName>
-				<displayName count="other">Unidades de composição europeias</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Unidade Monetária Europeia</displayName>
-				<displayName count="one">Unidade monetária europeia</displayName>
-				<displayName count="other">Unidades monetárias europeias</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Unidade de Conta Europeia (XBC)</displayName>
-				<displayName count="one">Unidade europeia de conta (XBC)</displayName>
-				<displayName count="other">Unidades europeias de conta (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Unidade de Conta Europeia (XBD)</displayName>
-				<displayName count="one">Unidade europeia de conta (XBD)</displayName>
-				<displayName count="other">Unidades europeias de conta (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Dólar do Caribe Oriental</displayName>
-				<displayName count="one">Dólar do Caribe Oriental</displayName>
-				<displayName count="other">Dólares do Caribe Oriental</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Direitos Especiais de Giro</displayName>
-				<displayName count="one">direitos de desenho especiais</displayName>
-				<displayName count="other">direitos de desenho especiais</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Unidade de Moeda Europeia</displayName>
-				<displayName count="one">Unidade de moeda europeia</displayName>
-				<displayName count="other">Unidades de moedas europeias</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Franco-ouro francês</displayName>
-				<displayName count="one">Franco de ouro francês</displayName>
-				<displayName count="other">Francos de ouro franceses</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Franco UIC francês</displayName>
-				<displayName count="one">Franco UIC francês</displayName>
-				<displayName count="other">Francos UIC franceses</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Franco CFA BCEAO</displayName>
-				<displayName count="one">Franco CFA de BCEAO</displayName>
-				<displayName count="other">Francos CFA de BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paládio</displayName>
-				<displayName count="one">Paládio</displayName>
-				<displayName count="other">Paládios</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Franco CFP</displayName>
-				<displayName count="one">Franco CFP</displayName>
-				<displayName count="other">Francos CFP</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platina</displayName>
-				<displayName count="one">Platina</displayName>
-				<displayName count="other">Platinas</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>Fundos RINET</displayName>
-				<displayName count="one">Fundos RINET</displayName>
-				<displayName count="other">Fundos RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Código de Moeda de Teste</displayName>
-				<displayName count="one">Código de moeda de teste</displayName>
-				<displayName count="other">Códigos de moeda de teste</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Moeda Desconhecida ou Inválida</displayName>
-				<displayName count="one">moeda desconhecida ou inválida</displayName>
-				<displayName count="other">Moedas inválidas ou desconhecidas</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Dinar iemenita</displayName>
-				<displayName count="one">Dinar do Iêmen</displayName>
-				<displayName count="other">Dinares do Iêmen</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Rial iemenita</displayName>
-				<displayName count="one">Rial do Iêmen</displayName>
-				<displayName count="other">Riales do Iêmen</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Dinar forte iugoslavo</displayName>
-				<displayName count="one">Dinar forte iugoslavo</displayName>
-				<displayName count="other">Dinares fortes iugoslavos</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Dinar noviy iugoslavo</displayName>
-				<displayName count="one">Dinar noviy da Iugoslávia</displayName>
-				<displayName count="other">Dinares noviy da Iugoslávia</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Dinar conversível iugoslavo</displayName>
-				<displayName count="one">Dinar conversível da Iugoslávia</displayName>
-				<displayName count="other">Dinares conversíveis da Iugoslávia</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Rand sul-africano (financeiro)</displayName>
-				<displayName count="one">Rand da �frica do Sul (financeiro)</displayName>
-				<displayName count="other">Rands da �frica do Sul (financeiro)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Rand sul-africano</displayName>
-				<displayName count="one">Rand da �frica do Sul</displayName>
-				<displayName count="other">Rands da �frica do Sul</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Cuacha zambiano</displayName>
-				<displayName count="one">Kwacha da Zâmbia</displayName>
-				<displayName count="other">Kwachas da Zâmbia</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zaire Novo zairense</displayName>
-				<displayName count="one">Novo zaire do Zaire</displayName>
-				<displayName count="other">Novos zaires do Zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire zairense</displayName>
-				<displayName count="one">Zaire do Zaire</displayName>
-				<displayName count="other">Zaires do Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Dólar do Zimbábue</displayName>
-				<displayName count="one">Dólar do Zimbábue</displayName>
-				<displayName count="other">Dólares do Zimbábue</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dia</unitPattern>
-			<unitPattern count="other">{0} dias</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} hora</unitPattern>
-			<unitPattern count="other">{0} horas</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuto</unitPattern>
-			<unitPattern count="other">{0} minutos</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mês</unitPattern>
-			<unitPattern count="other">{0} meses</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} segundo</unitPattern>
-			<unitPattern count="other">{0} segundos</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} semana</unitPattern>
-			<unitPattern count="other">{0} semanas</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} ano</unitPattern>
-			<unitPattern count="other">{0} anos</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>sim:s</yesstr>
-			<nostr>não:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/pt_BR.xml b/airtime_mvc/library/Zend/Locale/Data/pt_BR.xml
deleted file mode 100644
index b56997fa1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pt_BR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.54 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="pt"/>
-		<territory type="BR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/pt_PT.xml b/airtime_mvc/library/Zend/Locale/Data/pt_PT.xml
deleted file mode 100644
index d69fee586..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/pt_PT.xml
+++ /dev/null
@@ -1,1865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.85 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="pt"/>
-		<territory type="PT"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">afrikaans</language>
-			<language type="art">idioma artifical</language>
-			<language type="awa">Awadhi</language>
-			<language type="bai">bamileke Languages</language>
-			<language type="bug">Buginese</language>
-			<language type="ce">chechene</language>
-			<language type="cel">idioma céltico</language>
-			<language type="chn">jargão chinook</language>
-			<language type="cpe">crioulo ou pidgin do inglês</language>
-			<language type="cpf">crioulo ou pidgin do francês</language>
-			<language type="cpp">crioulo ou pidgin do português</language>
-			<language type="cs">checo</language>
-			<language type="cus">idioma cuchita</language>
-			<language type="de_CH">alemão alto (Suíça)</language>
-			<language type="dra">idioma dravítico</language>
-			<language type="dyu">diula</language>
-			<language type="egy">egípcio clássico</language>
-			<language type="en">Inglês</language>
-			<language type="enm">inglês medieval</language>
-			<language type="et">estónio</language>
-			<language type="fiu">idioma ugro-finês</language>
-			<language type="frm">francês medieval</language>
-			<language type="frs">frísio oriental</language>
-			<language type="gmh">alemão medieval alto</language>
-			<language type="grc">grego clássico</language>
-			<language type="gsw">alemão da Suíça</language>
-			<language type="hsb">sorbiano superior</language>
-			<language type="hy">arménio</language>
-			<language type="iba">Iban</language>
-			<language type="ig">igbo</language>
-			<language type="ik">Inupiaq</language>
-			<language type="jv">jv</language>
-			<language type="khi">khoisan</language>
-			<language type="lez">lezghiano</language>
-			<language type="mga">irlandês, medieval (900-1200)</language>
-			<language type="mk">macedónio</language>
-			<language type="nah">Nauatle</language>
-			<language type="nds">baixo alemão</language>
-			<language type="nic">nigeriano - cordofano</language>
-			<language type="nl_BE">flamengo (Bélgica)</language>
-			<language type="non">norse, old</language>
-			<language type="oc">provençal</language>
-			<language type="os">ossético</language>
-			<language type="peo">persa arcaico (aprox. 600-400 a.C.)</language>
-			<language type="pl">polaco</language>
-			<language type="pra">idioma prácito</language>
-			<language type="pro">provençal, arcaico (até 1500)</language>
-			<language type="pt_PT">português europeu</language>
-			<language type="rm">reto-romance</language>
-			<language type="rom">romanês</language>
-			<language type="sai">idioma indígeno sul-americano</language>
-			<language type="sal">salishan languages</language>
-			<language type="sgn">linguages de sinais</language>
-			<language type="ssa">idioma nilo-sariano</language>
-			<language type="ta">tamil</language>
-			<language type="tai">idioma tailândes</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tajique</language>
-			<language type="tl">tagalogue</language>
-			<language type="to">tonga</language>
-			<language type="tog">toganês</language>
-			<language type="tyv">tuviniano</language>
-			<language type="wen">idioma sórbio</language>
-			<language type="zza">zazaki</language>
-		</languages>
-		<scripts>
-			<script type="Armn">arménio</script>
-			<script type="Blis">símbolos Bliss</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Cans">símbolos aborígenes canadianos</script>
-			<script type="Cyrs">cirílico (eslavónico sacro antigo)</script>
-			<script type="Egyd">egípcio demótico</script>
-			<script type="Egyh">egípcio hierático</script>
-			<script type="Geok">georgiano khutsuri</script>
-			<script type="Inds">indus</script>
-			<script type="Latf">latim (fraktur)</script>
-			<script type="Lina">linear A</script>
-			<script type="Linb">linear B</script>
-			<script type="Mand">mandaeano</script>
-			<script type="Mlym">malaialam</script>
-			<script type="Nkoo">n’ko</script>
-			<script type="Plrd">Pollard fonético</script>
-			<script type="Sgnw">escrita gestual</script>
-			<script type="Sylo">siloti nagri</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">tai lue moderno</script>
-			<script type="Taml">tamil</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tenguar</script>
-			<script type="Xsux">cuneiforme sumero-acadiano</script>
-			<script type="Zxxx">não escrito</script>
-			<script type="Zzzz">inválido ou desconhecido</script>
-		</scripts>
-		<territories>
-			<territory type="009">Oceânia</territory>
-			<territory type="015">Norte de �frica</territory>
-			<territory type="017">�frica Interior</territory>
-			<territory type="018">�frica Meridional</territory>
-			<territory type="035">Sudeste Asiático</territory>
-			<territory type="057">Micronésia</territory>
-			<territory type="062">�sia Sul-Central</territory>
-			<territory type="151">Europa de Leste</territory>
-			<territory type="154">Europa do Norte</territory>
-			<territory type="172">172</territory>
-			<territory type="AE">Emiratos �rabes Unidos</territory>
-			<territory type="AI">Anguilha</territory>
-			<territory type="AM">Arménia</territory>
-			<territory type="AQ">Antárctica</territory>
-			<territory type="AX">Ilhas Alanda</territory>
-			<territory type="AZ">Azerbeijão</territory>
-			<territory type="BD">Bangladeche</territory>
-			<territory type="BF">Burkina-Faso</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BJ">Benim</territory>
-			<territory type="BS">Baamas</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorrússia</territory>
-			<territory type="CC">Ilhas Cocos</territory>
-			<territory type="CD">República Democrática do Congo</territory>
-			<territory type="CG">Congo-Brazzaville</territory>
-			<territory type="CX">Ilha do Natal</territory>
-			<territory type="CZ">República Checa</territory>
-			<territory type="EE">Estónia</territory>
-			<territory type="EG">Egipto</territory>
-			<territory type="EH">Sara Ocidental</territory>
-			<territory type="FK">Ilhas Falkland ou Malvinas</territory>
-			<territory type="FM">Estados Federados da Micronésia</territory>
-			<territory type="FO">Ilhas Faroé</territory>
-			<territory type="GL">Gronelândia</territory>
-			<territory type="GW">Guiné-Bissau</territory>
-			<territory type="HK">Hong Kong - Região Administrativa Especial da China</territory>
-			<territory type="IR">Irão</territory>
-			<territory type="KE">Quénia</territory>
-			<territory type="KG">Quirguizistão</territory>
-			<territory type="KN">Saint Kitts e Nevis</territory>
-			<territory type="KW">Cuaite</territory>
-			<territory type="KY">Ilhas Caimão</territory>
-			<territory type="KZ">Cazaquistão</territory>
-			<territory type="LA">Laos, República Popular Democrática do</territory>
-			<territory type="LV">Letónia</territory>
-			<territory type="MC">Mónaco</territory>
-			<territory type="MD">Moldávia, República da</territory>
-			<territory type="MG">Madagáscar</territory>
-			<territory type="MK">Macedónia, República da</territory>
-			<territory type="MO">Macau - Região Administrativa Especial da China</territory>
-			<territory type="MP">Ilhas Mariana do Norte</territory>
-			<territory type="MS">Monserrate</territory>
-			<territory type="MU">Maurícias</territory>
-			<territory type="MW">Malaui</territory>
-			<territory type="NC">Nova Caledónia</territory>
-			<territory type="NF">Ilha Norfolque</territory>
-			<territory type="NL">Países Baixos</territory>
-			<territory type="PG">Papua Nova Guiné</territory>
-			<territory type="PL">Polónia</territory>
-			<territory type="PS">Território Palestiniano</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceânia Insular</territory>
-			<territory type="RO">Roménia</territory>
-			<territory type="SC">Seicheles</territory>
-			<territory type="SG">Singapura</territory>
-			<territory type="SI">Eslovénia</territory>
-			<territory type="SJ">Esvalbarda e Jan Mayen</territory>
-			<territory type="SM">São Marino</territory>
-			<territory type="TC">Ilhas Turcas e Caicos</territory>
-			<territory type="TJ">Tajiquistão</territory>
-			<territory type="TK">Toquelau</territory>
-			<territory type="TM">Turquemenistão</territory>
-			<territory type="TT">Trindade e Tobago</territory>
-			<territory type="UM">Ilhas Minor Outlying (E.U.A)</territory>
-			<territory type="UZ">Usbequistão</territory>
-			<territory type="VI">Ilhas Virgin E.U.A.</territory>
-			<territory type="VN">Vietname</territory>
-			<territory type="YE">Iémen</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Alemão Tradicional</variant>
-			<variant type="1996">Alemão Moderno</variant>
-			<variant type="AREVELA">arménio oriental</variant>
-			<variant type="AREVMDA">arménio ocidental</variant>
-			<variant type="BISKE">dialecto san giorgio/bila</variant>
-			<variant type="BOONT">buntlingue</variant>
-			<variant type="FONIPA">Alfabeto Fonético Internacional</variant>
-			<variant type="FONUPA">Alfabeto Fonético Urálico</variant>
-			<variant type="LIPAW">dialecto lipovaz de Resian</variant>
-			<variant type="MONOTON">monotónico</variant>
-			<variant type="NEDIS">dialecto natisone</variant>
-			<variant type="NJIVA">dialecto gniva/njiva</variant>
-			<variant type="OSOJS">dialecto oseacco/osojane</variant>
-			<variant type="POLYTON">politónico</variant>
-			<variant type="POSIX">Computador</variant>
-			<variant type="REVISED">Revisão Ortográfica</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOUSE">Scouse</variant>
-			<variant type="SOLBA">dialecto stolvizza/solbica</variant>
-		</variants>
-		<keys>
-			<key type="collation">Ordem</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Ordem de Chinês Tradicional - Big5</type>
-			<type type="direct" key="collation">Ordem Directa</type>
-			<type type="gb2312han" key="collation">Ordem de Chinês Simplificado - GB2312</type>
-			<type type="phonebook" key="collation">Ordem da Lista Telefónica</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Métrico</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters type="auxiliary">[ª ă å ä � æ è ĕ ë ē ì ĭ î ï ī ñ º � ö ø � œ ß ù ŭ û ü ū ÿ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
-						<dateFormatItem id="MMMMd">d de MMMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Fev</month>
-							<month type="3">Mar</month>
-							<month type="4">Abr</month>
-							<month type="5">Mai</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Ago</month>
-							<month type="9">Set</month>
-							<month type="10">Out</month>
-							<month type="11">Nov</month>
-							<month type="12">Dez</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Janeiro</month>
-							<month type="2">Fevereiro</month>
-							<month type="3">Março</month>
-							<month type="4">Abril</month>
-							<month type="5">Maio</month>
-							<month type="6">Junho</month>
-							<month type="7">Julho</month>
-							<month type="8">Agosto</month>
-							<month type="9">Setembro</month>
-							<month type="10">Outubro</month>
-							<month type="11">Novembro</month>
-							<month type="12">Dezembro</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="wide">
-							<quarter type="1">1.º trimestre</quarter>
-							<quarter type="2">2.º trimestre</quarter>
-							<quarter type="3">3.º trimestre</quarter>
-							<quarter type="4">4.º trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>Antes do meio-dia</am>
-				<pm>Depois do meio-dia</pm>
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d 'de' MMM 'de' yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yQ">QQQ 'de' yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ 'de' y</dateFormatItem>
-						<dateFormatItem id="yyQ">QQQ 'de' yy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">H'h' - H'h'</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM-MM 'de' yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="japanese">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tucumán</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuibá</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Araguaina</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Baía</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St.John's</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Páscoa</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madrid</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Marrocos</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancun</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrado</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscovo</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sacalina</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburgo</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Hora do Acre</standard>
-					<daylight>Hora de Verão do Acre</daylight>
-				</long>
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Hora do Afeganistão</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Hora da �frica Central</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Hora da �frica Oriental</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_FarWestern">
-				<long>
-					<generic>Hora do Sara Ocidental</generic>
-				</long>
-				<short>
-					<generic>Hora do Sara Ocidental</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Hora da �frica do Sul</generic>
-					<standard>Hora Padrão da �frica do Sul</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>Hora da Nigéria</generic>
-					<standard>Hora da �frica Ocidental</standard>
-					<daylight>Hora de Verão da �frica Ocidental</daylight>
-				</long>
-				<short>
-					<generic>Hora da Nigéria</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Hora de Aktyubinsk</standard>
-					<daylight>Hora de Verão de Aktyubinsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Hora do Alaska</generic>
-					<standard>Hora Padrão do Alaska</standard>
-					<daylight>Hora de Verão do Alaska</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Hora do Alaska- Havai</generic>
-					<standard>Hora Padrão do Alaska-Havai</standard>
-					<daylight>Hora de Verão do Alaska-Havai</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Hora de Almaty</standard>
-					<daylight>Hora de Verão de Almaty</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Hora do Amazonas</standard>
-					<daylight>Hora de Verão do Amazonas</daylight>
-				</long>
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Hora Central</generic>
-					<standard>Hora Padrão Central</standard>
-					<daylight>Hora de Verão Central</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Hora Oriental</generic>
-					<standard>Hora Padrão Oriental</standard>
-					<daylight>Hora de Verão Oriental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Hora da Montanha</generic>
-					<standard>Hora Padrão da Montanha</standard>
-					<daylight>Hora de Verão da Montanha</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Hora do Pacífico</generic>
-					<standard>Hora Padrão do Pacífico</standard>
-					<daylight>Hora de Verão do Pacífico</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Hora de Anadyr</standard>
-					<daylight>Hora de Verão de Anadyr</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Hora de Aqtau</standard>
-					<daylight>Hora de Verão de Aqtau</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Hora de Aqtobe</standard>
-					<daylight>Hora de Verão de Aqtobe</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Hora da Arábia</generic>
-					<standard>Hora Padrão da Arábia</standard>
-					<daylight>Hora de Verão da Arábia</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Hora da Argentina</standard>
-					<daylight>Hora de Verão da Argentina</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Hora da Argentina Ocidental</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<generic>Hora da Arménia</generic>
-					<standard>Hora da Arménia</standard>
-					<daylight>Hora de Verão da Arménia</daylight>
-				</long>
-				<short>
-					<generic>Hora da Arménia</generic>
-					<standard>AMT (Arménia)</standard>
-					<daylight>AMST (Arménia)</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<generic>Hora do Turquemenistão</generic>
-					<standard>Hora de Ashkhabad</standard>
-					<daylight>Hora de Verão de Ashkhabad</daylight>
-				</long>
-				<short>
-					<generic>Hora do Turquemenistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Hora do Atlântico</generic>
-					<standard>Hora Padrão do Atlântico</standard>
-					<daylight>Hora de Verão do Atlântico</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Hora da Austrália Central</generic>
-					<standard>Hora Padrão da Austrália Central</standard>
-					<daylight>Hora de Verão da Austrália Central</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Hora da Austrália Central Ocidental</generic>
-					<standard>Hora Padrão da Austrália Central Ocidental</standard>
-					<daylight>Hora de Verão da Austrália Central Ocidental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Hora da Austrália Oriental</generic>
-					<standard>Hora Padrão da Austrália Oriental</standard>
-					<daylight>Hora de Verão da Austrália Oriental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Hora da Austrália Ocidental</generic>
-					<standard>Hora Padrão da Austrália Ocidental</standard>
-					<daylight>Hora de Verão da Austrália Ocidental</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<generic>Hora do Azerbeijão</generic>
-					<standard>Hora do Azerbeijão</standard>
-					<daylight>Hora de Verão do Azerbeijão</daylight>
-				</long>
-				<short>
-					<generic>Hora do Azerbeijão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Hora dos Açores</standard>
-					<daylight>Hora de Verão dos Açores</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<generic>Hora do Azerbeijão</generic>
-					<standard>Hora de Baku</standard>
-					<daylight>Hora de Verão de Baku</daylight>
-				</long>
-				<short>
-					<generic>Hora do Azerbeijão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<generic>Hora do Bangladesh</generic>
-					<standard>Hora do Bangladesh</standard>
-				</long>
-				<short>
-					<generic>Hora do Bangladesh</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Hora de Bering</generic>
-					<standard>Hora Padrão de Bering</standard>
-					<daylight>Hora de Verão de Bring</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<generic>Hora do Botão</generic>
-					<standard>Hora do Botão</standard>
-				</long>
-				<short>
-					<generic>Hora do Botão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Hora da Bolívia</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Hora do Bornéu</standard>
-					<daylight>Hora de Verão do Bornéu</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Hora de Brasília</standard>
-					<daylight>Hora de Verão de Brasília</daylight>
-				</long>
-				<commonlyUsed>false</commonlyUsed>
-			</metazone>
-			<metazone type="British">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<generic>Hora do Brunei</generic>
-					<standard>Hora do Brunei Darussalam</standard>
-				</long>
-				<short>
-					<generic>Hora do Brunei</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Hora de Cabo Verde</standard>
-					<daylight>Hora de Verão de Cabo Verde</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Hora de Chamarro</generic>
-					<standard>Hora Padrão de Chamarro</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Hora de Changbai</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Hora Padrão de Chatham</standard>
-					<daylight>Hora de Verão de Chatham</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Hora do Chile</standard>
-					<daylight>Hora de Verão do Chile</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Hora da China</generic>
-					<standard>Hora Padrão da China</standard>
-					<daylight>Hora de Verão da China</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Hora de Choibalsan</standard>
-					<daylight>Hora de Verão de Choibalsan</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Hora da Ilha de Natal</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Hora das Ilhas Cocos</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Hora da Colômbia</standard>
-					<daylight>Hora de Verão da Colômbia</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<generic>Hora das Ilhas Cook</generic>
-					<standard>Hora das Ilhas Cook</standard>
-					<daylight>Hora Intermédia de Verão das Ilhas Cook</daylight>
-				</long>
-				<short>
-					<generic>Hora das Ilhas Cook</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Hora de Cuba</generic>
-					<standard>Hora Padrão de Cuba</standard>
-					<daylight>Hora de Verão de Cuba</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<generic>Hora do Bangladesh</generic>
-					<standard>Hora de Dacca</standard>
-				</long>
-				<short>
-					<generic>Hora do Bangladesh</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Hora de Davis</standard>
-				</long>
-			</metazone>
-			<metazone type="Dominican">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Hora de Dumont-d'Urville</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<generic>Hora do Tajiquistão</generic>
-					<standard>Hora de Dushanbe</standard>
-					<daylight>Hora de Verão de Dushanbe</daylight>
-				</long>
-				<short>
-					<generic>Hora do Tajiquistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Hora da Guiana Holandesa</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<generic>Hora de Timor Leste</generic>
-					<standard>Hora de Timor Leste</standard>
-				</long>
-				<short>
-					<generic>Hora de Timor Leste</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Hora da Ilha de Páscoa</standard>
-					<daylight>Hora de Verão da Ilha de Páscoa</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Hora do Equador</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Horário Padrão da Europa Central</standard>
-					<daylight>Hora de Verão da Europa Central</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Hora da Europa Oriental</standard>
-					<daylight>Hora de Verão da Europa Oriental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Hora da Europa Ocidental</standard>
-					<daylight>Hora de Verão da Europa Ocidental</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Hora das Ilhas Malvinas</standard>
-					<daylight>Hora de Verão das Ilhas Malvinas</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<generic>Hora das Ilhas Fiji</generic>
-					<standard>Hora das Ilhas Fiji</standard>
-					<daylight>Hora de Verão das Ilhas Fiji</daylight>
-				</long>
-				<short>
-					<generic>Hora das Ilhas Fiji</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Hora da Guiana Francesa</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Hora da Antártida e dos Territórios Franceses do Sul</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<generic>Hora do Quirguizistão</generic>
-					<standard>Hora de Frunze</standard>
-					<daylight>Hora de Verão de Frunze</daylight>
-				</long>
-				<short>
-					<generic>Hora do Quirguizistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Hora de Galápagos</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Hora de Gambier</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<generic>Hora da Geórgia</generic>
-					<standard>Hora da Georgia</standard>
-					<daylight>Hora de Verão da Georgia</daylight>
-				</long>
-				<short>
-					<generic>Hora da Geórgia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Hora das Ilhas Gilbert</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Hora do Meridiano de Greenwich</standard>
-				</long>
-			</metazone>
-			<metazone type="Goose_Bay">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Hora da Gronelândia Central</standard>
-					<daylight>Hora de Verão da Gronelândia Central</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Hora Padrão de Guam</standard>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>Hora Padrão do Golfo</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Hora Padrão do Havai</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<generic>Hora de Hong Kong - Região Administrativa Especial da China</generic>
-					<standard>Hora de Hong Kong</standard>
-					<daylight>Hora de Verão de Hong Kong</daylight>
-				</long>
-				<short>
-					<generic>Hora de Hong Kong - Região Administrativa Especial da China</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hora de Hovd</standard>
-					<daylight>Hora de Verão de Hovd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<generic>Hora da �ndia</generic>
-					<standard>Hora Padrão da �ndia</standard>
-				</long>
-				<short>
-					<generic>Hora da �ndia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Hora do Oceano �ndico</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<generic>Hora do Vietname</generic>
-				</long>
-				<short>
-					<generic>Hora do Vietname</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Hora da Indonésia Central</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Hora da Indonésia Oriental</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Hora da Indonésia Ocidental</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>Hora do Irão</generic>
-					<standard>Hora Padrão do Irão</standard>
-					<daylight>Hora de Verão do Irão</daylight>
-				</long>
-				<short>
-					<generic>Hora do Irão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Irish">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Hora de Irkutsk</standard>
-					<daylight>Hora de Verão de Irkutsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Hora de Israel</generic>
-					<standard>Hora Padrão de Israel</standard>
-					<daylight>Hora de Verão de Israel</daylight>
-				</long>
-				<short>
-					<generic>Hora de Israel</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Hora do Japão</generic>
-					<standard>Hora Padrão do Japão</standard>
-					<daylight>Hora de Verão do Japão</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Hora de Petropavlovsk-Kamchatski</standard>
-					<daylight>Hora de Verão de Petropavlovsk-Kamchatski</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<generic>Hora do Paquistão</generic>
-					<standard>Hora de Carachi</standard>
-				</long>
-				<short>
-					<generic>Hora do Paquistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Hora de Kashgar</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>Hora do Casaquistão do Leste</generic>
-					<standard>Hora Padrão do Cazaquistão do Leste</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Hora do Casaquistão do Oeste</generic>
-					<standard>Hora Padrão do Casaquistão do Oeste</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Hora de Kizilorda</standard>
-					<daylight>Hora de Verão de Kizilorda</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Hora da Coreia</generic>
-					<standard>Hora Padrão da Coreia</standard>
-					<daylight>Hora de Verão da Coreia</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Hora de Kosrae</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Hora de Krasnoyarsk</standard>
-					<daylight>Hora de Verão de Krasnoyarsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Hora de Kuybyshev</standard>
-					<daylight>Hora de Verão de Kuybyshev</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Hora de Kwajalein</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<generic>Hora do Quirguizistão</generic>
-					<standard>Hora do Quirguizistão</standard>
-				</long>
-				<short>
-					<generic>Hora do Quirguizistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<generic>Hora do Sri Lanka</generic>
-					<standard>Hora do Sri Lanka</standard>
-				</long>
-				<short>
-					<generic>Hora do Sri Lanka</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Liberia">
-				<long>
-					<generic>Hora da Libéria</generic>
-				</long>
-				<short>
-					<generic>Hora da Libéria</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Hora das Ilhas Line</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Hora de Long-Shu</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Hora de Lord Howe</generic>
-					<standard>Hora Padrão de Lord Howe</standard>
-					<daylight>Hora de Verão de Lord Howe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<generic>Hora de Macau - Região Administrativa Especial da China</generic>
-					<standard>Hora de Macau</standard>
-					<daylight>Hora de Verão de Macau</daylight>
-				</long>
-				<short>
-					<generic>Hora de Macau - Região Administrativa Especial da China</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Hora de Magadan</standard>
-					<daylight>Hora de Verão de Magadan</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<generic>Hora da Malásia</generic>
-					<standard>Hora de Malaia</standard>
-				</long>
-				<short>
-					<generic>Hora da Malásia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Hora da Malásia</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Hora das Ilhas Maldivas</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Hora das Marquesas</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Hora das Ilhas Marshall</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Hora das Ilhas Maurícias</standard>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Hora de Mawson</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Hora de Ulan Bator</standard>
-					<daylight>Hora de Verão de Ulan Bator</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Hora de Moscovo</generic>
-					<standard>Hora Padrão de Moscovo</standard>
-					<daylight>Hora de Verão de Moscovo</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<generic>Hora de Mianmar</generic>
-				</long>
-				<short>
-					<generic>Hora de Mianmar</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Hora de Nauru</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<generic>Hora do Nepal</generic>
-					<standard>Hora do Nepal</standard>
-				</long>
-				<short>
-					<generic>Hora do Nepal</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<generic>Hora da Nova Caledónia</generic>
-					<standard>Hora da Nova Caledónia</standard>
-					<daylight>Hora de Verão da Nova Caledónia</daylight>
-				</long>
-				<short>
-					<generic>Hora da Nova Caledónia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Hora da Nova Zelândia</generic>
-					<standard>Hora Padrão da Nova Zelândia</standard>
-					<daylight>Hora de Verão da Nova Zelândia</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<standard>Horário Padrão da Terra Nova</standard>
-					<daylight>Horário de Verão da Terra Nova</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<generic>Hora de Niue</generic>
-					<standard>Hora de Niue</standard>
-				</long>
-				<short>
-					<generic>Hora de Niue</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<generic>Hora da Ilha Norfolque</generic>
-				</long>
-				<short>
-					<generic>Hora da Ilha Norfolque</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<generic>Hora das Ilhas Mariana do Norte</generic>
-					<standard>Hora das Ilhas Mariana do Norte</standard>
-				</long>
-				<short>
-					<generic>Hora das Ilhas Mariana do Norte</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Hora de Novosibirsk</standard>
-					<daylight>Hora de Verão de Novosibirsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Hora de Omsk</standard>
-					<daylight>Hora de Verão de Omsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Oral">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Hora do Paquistão</standard>
-					<daylight>Hora de Verão do Paquistão</daylight>
-				</long>
-				<short>
-					<generic>Hora do Paquistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<generic>Hora de Palau</generic>
-					<standard>Hora de Palau</standard>
-				</long>
-				<short>
-					<generic>Hora de Palau</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<generic>Hora da Papua Nova Guiné</generic>
-					<standard>Hora da Papua Nova Guiné</standard>
-				</long>
-				<short>
-					<generic>Hora da Papua Nova Guiné</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<generic>Hora das Filipinas</generic>
-					<standard>Hora das Filipinas</standard>
-					<daylight>Hora de Verão das Filipinas</daylight>
-				</long>
-				<short>
-					<generic>Hora das Filipinas</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Hora das Ilhas Fénix</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<generic>Hora de Pitcairn</generic>
-					<standard>Hora de Pitcairn</standard>
-				</long>
-				<short>
-					<generic>Hora de Pitcairn</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Hora de Ponape</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Hora de Qyzylorda</standard>
-					<daylight>Hora de Verão de Qyzylorda</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Hora das Ilhas de Reunião</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Hora de Rothera</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Hora de Sakhalin</standard>
-					<daylight>Hora de Verão de Sakhalin</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Hora de Samara</standard>
-					<daylight>Hora de Verão de Samara</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Hora de Samarkand</standard>
-					<daylight>Hora de Verão de Samarkand</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<generic>Hora da Samoa</generic>
-					<standard>Hora Padrão da Samoa</standard>
-				</long>
-				<short>
-					<generic>Hora da Samoa</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Hora das Ilhas Seicheles</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Hora de Shevchenko</standard>
-					<daylight>Hora de Verão de Shevchenko</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<generic>Hora de Singapura</generic>
-					<standard>Hora Padrão de Singapura</standard>
-				</long>
-				<short>
-					<generic>Hora de Singapura</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<generic>Hora das Ilhas Salomão</generic>
-				</long>
-				<short>
-					<generic>Hora das Ilhas Salomão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Hora da Georgia do Sul</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Hora de Sverdlovsk</standard>
-					<daylight>Hora de Verão de Sverdlovsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Hora de Syowa</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<generic>Hora da Polinésia Francesa</generic>
-					<standard>Hora do Tahiti</standard>
-				</long>
-				<short>
-					<generic>Hora da Polinésia Francesa</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<generic>Hora do Tajiquistão</generic>
-					<standard>Hora do Tajiquistão</standard>
-				</long>
-				<short>
-					<generic>Hora do Tajiquistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<generic>Hora de Tashkent</generic>
-					<standard>Hora de Tashkent</standard>
-					<daylight>Hora de Verão de Tashkent</daylight>
-				</long>
-				<short>
-					<generic>Hora do Uzbequistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<generic>Hora da Geórgia</generic>
-					<standard>Hora de Tbilisi</standard>
-					<daylight>Hora de Verão de Tbilisi</daylight>
-				</long>
-				<short>
-					<generic>Hora de Geórgia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<generic>Hora de Toquelau</generic>
-					<standard>Hora de Toquelau</standard>
-				</long>
-				<short>
-					<generic>Hora de Toquelau</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<generic>Hora de Tonga</generic>
-					<daylight>Hora de Verão de Tonga</daylight>
-				</long>
-				<short>
-					<generic>Hora de Tonga</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Hora de Truk</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Hora da Turquia</standard>
-					<daylight>Hora de Verão da Turquia</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<generic>Hora do Turquemenistão</generic>
-					<standard>Hora do Turquemenistão</standard>
-					<daylight>Hora de Verão do Turquemenistão</daylight>
-				</long>
-				<short>
-					<generic>Hora do Turquemenistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<generic>Hora de Tuvalu</generic>
-				</long>
-				<short>
-					<generic>Hora de Tuvalu</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Hora de Ural'sk</standard>
-					<daylight>Hora de Verão de Ural'sk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Hora de Urumqi</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<generic>Hora do Uzbequistão</generic>
-					<standard>Hora do Uzbequistão</standard>
-					<daylight>Hora de Verão do Uzbequistão</daylight>
-				</long>
-				<short>
-					<generic>Hora do Uzbequistão</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<generic>Hora de Vanuatu</generic>
-					<standard>Hora de Vanuatu</standard>
-				</long>
-				<short>
-					<generic>Hora de Vanuatu</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Hora de Vladivostok</standard>
-					<daylight>Hora de Verão de Vladivostok</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Hora de Volvograd</standard>
-					<daylight>Hora de Verão de Volgograd</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Hora de Vostok</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Hora das Ilhas Wake</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<generic>Hora de Wallis e Futuna</generic>
-					<standard>Hora de Wallis e Futuna</standard>
-				</long>
-				<short>
-					<generic>Hora de Wallis e Futuna</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Hora de Yakutsk</standard>
-					<daylight>Hora de Verão de Yakutsk</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Hora de Yekaterinburg</standard>
-					<daylight>Hora de Verão de Yekaterinburg</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<generic>Hora da Arménia</generic>
-					<standard>Hora de Yerevan</standard>
-					<daylight>Hora de Verão de Yerevan</daylight>
-				</long>
-				<short>
-					<generic>Hora da Arménia</generic>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<group> </group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>Dirham dos Emirados �rabes Unidos</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afeghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afeghani</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Florim das Antilhas Holandesa</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Florim de Aruba</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Dinar da Bósnia-Herzegóvina</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Marco bósnio-herzegóvino conversível</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Franco belga (convertível)</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Rublo novo bielorusso (1994-1999)</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Libra de Chipre</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Coroa da República Checa</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Unidad de Valor Constante (UVC) do Equador</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Dólar das Fiji</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi do Gana</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Dalasi da Gâmbia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franco da Guiné</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal da Guatemala</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Lempira das Honduras</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Dinar koweitiano</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Dólar das Ilhas Caimão</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Dinar macedónio</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Franco do Mali</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Cuacha do Malawi</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Peso Plata mexicano (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Unidad de Inversion (UDI) mexicana</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Córdoba nicaraguano</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Córdoba Ouro nicaraguano</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloti polaco</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Zloti polaco (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<pattern>#,##0.00 ¤;-#,##0.00 ¤</pattern>
-				<decimal>$</decimal>
-				<group>,</group>
-			</currency>
-			<currency type="QAR">
-				<displayName>Rial do Qatar</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Dólar de Singapura</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Xelim de Tanzânia</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Tala de Samoa Ocidental</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Unidade da Moeda Europeia</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Moeda inválida ou desconhecida</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Dinar forte jugoslavo</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Super Dinar jugoslavo</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Dinar conversível jugoslavo</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Dólar do Zimbabwe</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ro.xml b/airtime_mvc/library/Zend/Locale/Data/ro.xml
deleted file mode 100644
index b107d16cc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ro.xml
+++ /dev/null
@@ -1,2478 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.116 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ro"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ab">abhază</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">limbă afro-asiatică</language>
-			<language type="ain">ainu</language>
-			<language type="akk">akkadiană</language>
-			<language type="ale">aleută</language>
-			<language type="alt">altaică meridională</language>
-			<language type="am">amharică</language>
-			<language type="an">aragoneză</language>
-			<language type="ang">engleză veche</language>
-			<language type="apa">limbă apașă</language>
-			<language type="ar">arabă</language>
-			<language type="arc">aramaică</language>
-			<language type="art">limbă artificială</language>
-			<language type="as">asameză</language>
-			<language type="ast">asturiană</language>
-			<language type="aus">limbă australiană</language>
-			<language type="av">avară</language>
-			<language type="ay">aymara</language>
-			<language type="az">azeră</language>
-			<language type="ba">bașkiră</language>
-			<language type="bat">limbă baltică</language>
-			<language type="be">bielorusă</language>
-			<language type="ber">berberă</language>
-			<language type="bg">bulgară</language>
-			<language type="bh">bihari</language>
-			<language type="bn">bengaleză</language>
-			<language type="bnt">bantu</language>
-			<language type="bo">tibetană</language>
-			<language type="br">bretonă</language>
-			<language type="bs">bosniacă</language>
-			<language type="ca">catalană</language>
-			<language type="cai">limbă central-amerindiană</language>
-			<language type="cau">limbă caucaziană</language>
-			<language type="ce">cecenă</language>
-			<language type="cel">limbă celtică</language>
-			<language type="co">corsicană</language>
-			<language type="cop">coptă</language>
-			<language type="cs">cehă</language>
-			<language type="cu">slavonă</language>
-			<language type="cv">ciuvașă</language>
-			<language type="cy">velșă</language>
-			<language type="da">daneză</language>
-			<language type="de">germană</language>
-			<language type="de_AT">germană austriacă</language>
-			<language type="de_CH">germană standard elvețiană</language>
-			<language type="dra">limbă dravidiană</language>
-			<language type="egy">egipteană veche</language>
-			<language type="el">greacă</language>
-			<language type="elx">elamită</language>
-			<language type="en">engleză</language>
-			<language type="en_AU">engleză australiană</language>
-			<language type="en_CA">engleză canadiană</language>
-			<language type="en_GB">engleză britanică</language>
-			<language type="en_US">engleză americană</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spaniolă</language>
-			<language type="es_419">spaniolă latino-americană</language>
-			<language type="es_ES">spaniolă iberică</language>
-			<language type="et">estoniană</language>
-			<language type="eu">bască</language>
-			<language type="fa">persană</language>
-			<language type="fi">finlandeză</language>
-			<language type="fil">filipineză</language>
-			<language type="fiu">limbă fino-ugrică</language>
-			<language type="fj">fijiană</language>
-			<language type="fo">faroeză</language>
-			<language type="fr">franceză</language>
-			<language type="fr_CA">franceză canadiană</language>
-			<language type="fr_CH">franceză elvețiană</language>
-			<language type="fro">franceză veche</language>
-			<language type="frs">frizonă orientală</language>
-			<language type="fy">frizonă occidentală</language>
-			<language type="ga">irlandeză</language>
-			<language type="gd">gaelică scoțiană</language>
-			<language type="gem">limbă germanică</language>
-			<language type="gl">galiciană</language>
-			<language type="gn">guarani</language>
-			<language type="got">gotică</language>
-			<language type="grc">greacă veche</language>
-			<language type="gsw">germană elvețiană</language>
-			<language type="gu">gujarati</language>
-			<language type="haw">hawaiană</language>
-			<language type="he">ebraică</language>
-			<language type="hi">hindi</language>
-			<language type="hit">hitită</language>
-			<language type="hr">croată</language>
-			<language type="ht">haitiană</language>
-			<language type="hu">maghiară</language>
-			<language type="hy">armeană</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indoneziană</language>
-			<language type="ie">interlingue</language>
-			<language type="ik">inupiak</language>
-			<language type="inc">limbă indiană</language>
-			<language type="ine">limbă indo-europeană</language>
-			<language type="ira">limbă iraniană</language>
-			<language type="is">islandeză</language>
-			<language type="it">italiană</language>
-			<language type="ja">japoneză</language>
-			<language type="jpr">iudeo-persană</language>
-			<language type="jrb">iudeo-arabă</language>
-			<language type="jv">javaneză</language>
-			<language type="ka">georgiană</language>
-			<language type="kg">congoleză</language>
-			<language type="kk">kazahă</language>
-			<language type="kl">kalaallisut</language>
-			<language type="km">khmeră</language>
-			<language type="kn">kannada</language>
-			<language type="ko">coreeană</language>
-			<language type="ks">cașmireză</language>
-			<language type="ku">kurdă</language>
-			<language type="ky">kîrgîză</language>
-			<language type="la">latină</language>
-			<language type="lb">luxemburgheză</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laoțiană</language>
-			<language type="lt">lituaniană</language>
-			<language type="lv">letonă</language>
-			<language type="map">austroneziană</language>
-			<language type="mg">malgașă</language>
-			<language type="mi">maori</language>
-			<language type="mis">limbi diverse</language>
-			<language type="mk">macedoneană</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongolă</language>
-			<language type="mnc">manciuriană</language>
-			<language type="mo">moldovenească</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malay</language>
-			<language type="mt">malteză</language>
-			<language type="mul">limbi multiple</language>
-			<language type="mun">limbă munda</language>
-			<language type="mwl">mirandeză</language>
-			<language type="my">birmaneză</language>
-			<language type="myn">limbă mayașă</language>
-			<language type="nai">limbă nord-amerindiană</language>
-			<language type="nap">napolitană</language>
-			<language type="ne">nepaleză</language>
-			<language type="nl">olandeză</language>
-			<language type="nl_BE">flamandă</language>
-			<language type="nn">norvegiană nynorsk</language>
-			<language type="no">norvegiană</language>
-			<language type="nub">limbă nubiană</language>
-			<language type="nv">navajo</language>
-			<language type="oc">occitană</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="ota">turcă otomană</language>
-			<language type="oto">limbă otomi</language>
-			<language type="pa">punjabi</language>
-			<language type="paa">limbă papuașă</language>
-			<language type="peo">persană veche</language>
-			<language type="phi">limbă filipineză</language>
-			<language type="phn">feniciană</language>
-			<language type="pi">pali</language>
-			<language type="pl">poloneză</language>
-			<language type="pro">provensală veche</language>
-			<language type="ps">pașto</language>
-			<language type="pt">portugheză</language>
-			<language type="pt_BR">portugheză braziliană</language>
-			<language type="pt_PT">portugheză iberică</language>
-			<language type="qu">quechua</language>
-			<language type="rm">retoromană</language>
-			<language type="ro">română</language>
-			<language type="roa">limbă romanică</language>
-			<language type="ru">rusă</language>
-			<language type="rup">aromână</language>
-			<language type="sa">sanscrită</language>
-			<language type="sai">limbă sud-amerindiană</language>
-			<language type="sam">aramaică samariteană</language>
-			<language type="sc">sardiniană</language>
-			<language type="scn">siciliană</language>
-			<language type="sco">scots</language>
-			<language type="sd">sindhi</language>
-			<language type="sem">limbă semitică</language>
-			<language type="sga">irlandeză veche</language>
-			<language type="sgn">limbaj mimico-gestual</language>
-			<language type="sh">sârbo-croată</language>
-			<language type="si">singaleză</language>
-			<language type="sit">limbă sino-tibetană</language>
-			<language type="sk">slovacă</language>
-			<language type="sl">slovenă</language>
-			<language type="sla">limbă slavă</language>
-			<language type="sm">samoană</language>
-			<language type="so">somaleză</language>
-			<language type="sq">albaneză</language>
-			<language type="sr">sârbă</language>
-			<language type="st">sesotho</language>
-			<language type="su">sundaneză</language>
-			<language type="sux">sumeriană</language>
-			<language type="sv">suedeză</language>
-			<language type="sw">swahili</language>
-			<language type="syr">siriacă</language>
-			<language type="ta">tamilă</language>
-			<language type="tai">limbă thai</language>
-			<language type="te">telugu</language>
-			<language type="tg">tadjică</language>
-			<language type="th">thailandeză</language>
-			<language type="ti">tigrinya</language>
-			<language type="tk">turkmenă</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingoniană</language>
-			<language type="tn">setswana</language>
-			<language type="tr">turcă</language>
-			<language type="tt">tătară</language>
-			<language type="tut">limbă altaică</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitiană</language>
-			<language type="ug">uigură</language>
-			<language type="uk">ucraineană</language>
-			<language type="und">limbă necunoscută sau nevalidă</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbecă</language>
-			<language type="vi">vietnameză</language>
-			<language type="vo">volapuk</language>
-			<language type="wa">valonă</language>
-			<language type="wo">wolof</language>
-			<language type="xal">calmucă</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">idiÈ™</language>
-			<language type="yo">yoruba</language>
-			<language type="zap">zapotecă</language>
-			<language type="zh">chineză</language>
-			<language type="zh_Hans">chineză simplificată</language>
-			<language type="zh_Hant">chineză tradițională</language>
-			<language type="zu">zulu</language>
-			<language type="zxx">fară conținut lingvistic</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabă</script>
-			<script type="Armn">armeană</script>
-			<script type="Bali">balineză</script>
-			<script type="Beng">bengali</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brai">braille</script>
-			<script type="Cans">silabică aborigenă canadiană unificată</script>
-			<script type="Copt">coptă</script>
-			<script type="Cprt">cipriotă</script>
-			<script type="Cyrl">chirilică</script>
-			<script type="Cyrs">chirilică slavonă bisericească veche</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">mormonă</script>
-			<script type="Egyd">demotică egipteană</script>
-			<script type="Egyh">hieratică egipteană</script>
-			<script type="Egyp">hieroglife egiptene</script>
-			<script type="Ethi">etiopiană</script>
-			<script type="Geok">georgiană bisericească</script>
-			<script type="Geor">georgiană</script>
-			<script type="Glag">glagolitică</script>
-			<script type="Goth">gotică</script>
-			<script type="Grek">greacă</script>
-			<script type="Hang">coreeană</script>
-			<script type="Hani">ideografică</script>
-			<script type="Hans">ideografică simplificată</script>
-			<script type="Hant">ideografică tradițională</script>
-			<script type="Hebr">ebraică</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hrkt">katakana sau hiragana</script>
-			<script type="Hung">maghiară veche</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">italică veche</script>
-			<script type="Java">javaneză</script>
-			<script type="Jpan">japoneză</script>
-			<script type="Kana">katakana</script>
-			<script type="Khmr">khmeră</script>
-			<script type="Laoo">laoțiană</script>
-			<script type="Latf">latină Fraktur</script>
-			<script type="Latg">latină gaelică</script>
-			<script type="Latn">latină</script>
-			<script type="Lina">lineară A</script>
-			<script type="Linb">lineară B</script>
-			<script type="Lydi">lidiană</script>
-			<script type="Maya">hieroglife maya</script>
-			<script type="Mong">mongolă</script>
-			<script type="Mymr">birmană</script>
-			<script type="Phnx">feniciană</script>
-			<script type="Qaai">moștenită</script>
-			<script type="Runr">runică</script>
-			<script type="Sinh">singaleză</script>
-			<script type="Syrc">siriacă</script>
-			<script type="Syrj">siriacă occidentală</script>
-			<script type="Syrn">siriacă orientală</script>
-			<script type="Tfng">berberă</script>
-			<script type="Thai">Thai</script>
-			<script type="Tibt">tibetană</script>
-			<script type="Xpeo">persană veche</script>
-			<script type="Xsux">cuneiformă sumero-akkadiană</script>
-			<script type="Zxxx">nescrisă</script>
-			<script type="Zyyy">comună</script>
-			<script type="Zzzz">scriere necunoscută sau nevalidă</script>
-		</scripts>
-		<territories>
-			<territory type="001">Lume</territory>
-			<territory type="002">Africa</territory>
-			<territory type="003">America de Nord</territory>
-			<territory type="005">America de Sud</territory>
-			<territory type="009">Oceania</territory>
-			<territory type="011">Africa Occidentală</territory>
-			<territory type="013">America Centrală</territory>
-			<territory type="014">Africa Orientală</territory>
-			<territory type="015">Africa Septentrională</territory>
-			<territory type="017">Africa Centrală</territory>
-			<territory type="018">Africa Meridională</territory>
-			<territory type="019">Americi</territory>
-			<territory type="021">America Septentrională</territory>
-			<territory type="029">Caraibe</territory>
-			<territory type="030">Asia Orientală</territory>
-			<territory type="034">Asia Meridională</territory>
-			<territory type="035">Asia de Sud-Est</territory>
-			<territory type="039">Europa Meridională</territory>
-			<territory type="053">Australia și Noua Zeelandă</territory>
-			<territory type="054">Melanezia</territory>
-			<territory type="057">Regiunea Micronezia</territory>
-			<territory type="061">Polinezia</territory>
-			<territory type="062">Asia Centrală de Sud</territory>
-			<territory type="142">Asia</territory>
-			<territory type="143">Asia Centrală</territory>
-			<territory type="145">Asia Occidentală</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Europa Orientală</territory>
-			<territory type="154">Europa Septentrională</territory>
-			<territory type="155">Europa Occidentală</territory>
-			<territory type="172">Comunitatea Statelor Independente</territory>
-			<territory type="419">America Latină și Caraibe</territory>
-			<territory type="830">Insulele Anglo-Normande</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Emiratele Arabe Unite</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua și Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albania</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AN">Antilele Olandeze</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Samoa Americană</territory>
-			<territory type="AT">Austria</territory>
-			<territory type="AU">Australia</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Insulele Aland</territory>
-			<territory type="AZ">Azerbaidjan</territory>
-			<territory type="BA">Bosnia și Herțegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaria</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Sfântul Bartolomeu</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brazilia</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Insula Bouvet</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorusia</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Canada</territory>
-			<territory type="CC">Insulele Cocos</territory>
-			<territory type="CD">Republica Democrată Congo</territory>
-			<territory type="CF">Republica Centrafricană</territory>
-			<territory type="CG">Congo</territory>
-			<territory type="CH">Eleveția</territory>
-			<territory type="CI">Coasta de FildeÈ™</territory>
-			<territory type="CK">Insulele Cook</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Camerun</territory>
-			<territory type="CN">China</territory>
-			<territory type="CO">Columbia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbia și Muntenegru</territory>
-			<territory type="CU">Cuba</territory>
-			<territory type="CV">Capul Verde</territory>
-			<territory type="CX">Insula Christmas</territory>
-			<territory type="CY">Cipru</territory>
-			<territory type="CZ">Republica Cehă</territory>
-			<territory type="DE">Germania</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danemarca</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Republica Dominicană</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estonia</territory>
-			<territory type="EG">Egipt</territory>
-			<territory type="EH">Sahara Occidentală</territory>
-			<territory type="ER">Eritreea</territory>
-			<territory type="ES">Spania</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Finlanda</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Insulele Falkland</territory>
-			<territory type="FM">Micronezia</territory>
-			<territory type="FO">Insulele Feroe</territory>
-			<territory type="FR">Franța</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Marea Britanie</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Guyana Franceză</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Groenlanda</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guineea</territory>
-			<territory type="GP">Guadelupa</territory>
-			<territory type="GQ">Guineea Ecuatorială</territory>
-			<territory type="GR">Grecia</territory>
-			<territory type="GS">Insulele Georgia de Sud și Sandwich de Sud</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guineea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">R.A.S. Hong Kong a Chinei</territory>
-			<territory type="HM">Insula Heard și Insulele McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Croația</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungaria</territory>
-			<territory type="ID">Indonezia</territory>
-			<territory type="IE">Irlanda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Insula Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Teritoriul Britanic din Oceanul Indian</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islanda</territory>
-			<territory type="IT">Italia</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Iordania</territory>
-			<territory type="JP">Japonia</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kârgâzstan</territory>
-			<territory type="KH">Cambodgia</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Comore</territory>
-			<territory type="KN">Sfântul Kitts și Nevis</territory>
-			<territory type="KP">Coreea de Nord</territory>
-			<territory type="KR">Coreea de Sud</territory>
-			<territory type="KW">Kuweit</territory>
-			<territory type="KY">Insulele Cayman</territory>
-			<territory type="KZ">Kazahstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LC">Sfânta Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lituania</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Letonia</territory>
-			<territory type="LY">Libia</territory>
-			<territory type="MA">Maroc</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Republica Moldova</territory>
-			<territory type="ME">Muntenegru</territory>
-			<territory type="MF">Sfântul Martin</territory>
-			<territory type="MG">Madagascar</territory>
-			<territory type="MH">Insulele Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">R.A.S. Macao a Chinei</territory>
-			<territory type="MP">Insulele Mariane de Nord</territory>
-			<territory type="MQ">Martinica</territory>
-			<territory type="MR">Mauritania</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldive</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexic</territory>
-			<territory type="MY">Malaezia</territory>
-			<territory type="MZ">Mozambic</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Noua Caledonie</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Insulele Norfolk</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Olanda</territory>
-			<territory type="NO">Norvegia</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Noua Zeelandă</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Polinezia Franceză</territory>
-			<territory type="PG">Papua Noua Guinee</territory>
-			<territory type="PH">Filipine</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonia</territory>
-			<territory type="PM">Sfântul Pierre și Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Rico</territory>
-			<territory type="PS">Teritoriul Palestinian</territory>
-			<territory type="PT">Portugalia</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Oceania Periferică</territory>
-			<territory type="QU">Uniunea Europeană</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">România</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Rusia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Arabia Saudită</territory>
-			<territory type="SB">Insulele Solomon</territory>
-			<territory type="SC">Seychelles</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Suedia</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Sfânta Elena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbard și Jan Mayen</territory>
-			<territory type="SK">Slovacia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome și Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Siria</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Insulele Turks și Caicos</territory>
-			<territory type="TD">Ciad</territory>
-			<territory type="TF">Teritoriile Australe și Antarctice Franceze</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailanda</territory>
-			<territory type="TJ">Tadjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Timorul de Est</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turcia</territory>
-			<territory type="TT">Trinidad-Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ucraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Insulele mici îndepărtate ale Statelor Unite ale Americii</territory>
-			<territory type="US">Statele Unite ale Americii</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatican</territory>
-			<territory type="VC">Sfântul Vincent și Grenadine</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Insulele Virgine Britanice</territory>
-			<territory type="VI">Insulele Virgine S.U.A.</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis și Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Africa de Sud</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Regiune necunoscută sau nevalidă</territory>
-		</territories>
-		<keys>
-			<key type="collation">ordine de sortare</key>
-			<key type="currency">monedă</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">sortare pentru chineza tradițională - Big5</type>
-			<type type="buddhist" key="calendar">calendar budist</type>
-			<type type="chinese" key="calendar">calendar chinezesc</type>
-			<type type="direct" key="collation">sortare directă</type>
-			<type type="gb2312han" key="collation">sortare pentru chineza simplificată - GB2312</type>
-			<type type="gregorian" key="calendar">calendar gregorian</type>
-			<type type="hebrew" key="calendar">calendar ebraic</type>
-			<type type="indian" key="calendar">calendar național indian</type>
-			<type type="islamic" key="calendar">calendar islamic</type>
-			<type type="islamic-civil" key="calendar">calendar islamic civil</type>
-			<type type="japanese" key="calendar">calendar japonez</type>
-			<type type="phonebook" key="collation">sortare după cartea de telefon</type>
-			<type type="pinyin" key="collation">sortare pinyin</type>
-			<type type="roc" key="calendar">calendar al Republicii Chineze</type>
-			<type type="stroke" key="collation">ordine de sortare după trasare</type>
-			<type type="traditional" key="collation">sortare tradițională</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metric</measurementSystemName>
-			<measurementSystemName type="US">american</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Limbă: {0}</codePattern>
-			<codePattern type="script">Scriere: {0}</codePattern>
-			<codePattern type="territory">Regiune: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="keys">lowercase-words</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="measurementSystemNames">lowercase-words</inText>
-		<inText type="territories">titlecase-firstword</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a ă â b-i î j-p r s ș t ț u v x z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à å ä ç é è ê ë ñ ö q ş ţ ü w y]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a ă â b-i î j-s ș t ț u-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>„</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>«</alternateQuotationStart>
-		<alternateQuotationEnd>»</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} – {1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<eras>
-					<eraNames>
-						<era type="0">era budistă</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">e.b.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM Y</dateFormatItem>
-						<dateFormatItem id="yQ">'T'Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ian.</month>
-							<month type="2">feb.</month>
-							<month type="3">mar.</month>
-							<month type="4">apr.</month>
-							<month type="5">mai</month>
-							<month type="6">iun.</month>
-							<month type="7">iul.</month>
-							<month type="8">aug.</month>
-							<month type="9">sept.</month>
-							<month type="10">oct.</month>
-							<month type="11">nov.</month>
-							<month type="12">dec.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ianuarie</month>
-							<month type="2">februarie</month>
-							<month type="3">martie</month>
-							<month type="4">aprilie</month>
-							<month type="5">mai</month>
-							<month type="6">iunie</month>
-							<month type="7">iulie</month>
-							<month type="8">august</month>
-							<month type="9">septembrie</month>
-							<month type="10">octombrie</month>
-							<month type="11">noiembrie</month>
-							<month type="12">decembrie</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">I</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">I</month>
-							<month type="7">I</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Du</day>
-							<day type="mon">Lu</day>
-							<day type="tue">Ma</day>
-							<day type="wed">Mi</day>
-							<day type="thu">Jo</day>
-							<day type="fri">Vi</day>
-							<day type="sat">Sâ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">duminică</day>
-							<day type="mon">luni</day>
-							<day type="tue">marți</day>
-							<day type="wed">miercuri</day>
-							<day type="thu">joi</day>
-							<day type="fri">vineri</day>
-							<day type="sat">sâmbătă</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun">Du</day>
-							<day type="mon">Lu</day>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">L</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">J</day>
-							<day type="fri">V</day>
-							<day type="sat">S</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sat">sâmbătă</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">trim. I</quarter>
-							<quarter type="2">trim. II</quarter>
-							<quarter type="3">trim. III</quarter>
-							<quarter type="4">trim. IV</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">trimestrul I</quarter>
-							<quarter type="2">trimestrul al II-lea</quarter>
-							<quarter type="3">trimestrul al III-lea</quarter>
-							<quarter type="4">trimestrul al IV-lea</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">T1</quarter>
-							<quarter type="2">T2</quarter>
-							<quarter type="3">T3</quarter>
-							<quarter type="4">T4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">trimestrul I</quarter>
-							<quarter type="2">trimestrul al II-lea</quarter>
-							<quarter type="3">trimestrul al III-lea</quarter>
-							<quarter type="4">trimestrul al IV-lea</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">înainte de Hristos</era>
-						<era type="1">după Hristos</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">î.Hr.</era>
-						<era type="1">d.Hr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEEEd">EEE, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">'trimestrul' Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d MMM - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yyyy - MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy - MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yyyy - E, dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yyyy - E, dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yyyy - E, dd.MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MMMM-MMMM y</greatestDifference>
-							<greatestDifference id="y">MMMM y – MMMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>eră</displayName>
-					</field>
-					<field type="year">
-						<displayName>an</displayName>
-					</field>
-					<field type="month">
-						<displayName>lună</displayName>
-					</field>
-					<field type="week">
-						<displayName>săptămână</displayName>
-					</field>
-					<field type="day">
-						<displayName>zi</displayName>
-						<relative type="-3">răsalaltăieri</relative>
-						<relative type="-2">alaltăieri</relative>
-						<relative type="-1">ieri</relative>
-						<relative type="0">azi</relative>
-						<relative type="1">mâine</relative>
-						<relative type="2">poimâine</relative>
-						<relative type="3">răspoimâine</relative>
-					</field>
-					<field type="weekday">
-						<displayName>zi a săptămânii</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>perioada zilei</displayName>
-					</field>
-					<field type="hour">
-						<displayName>oră</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minut</displayName>
-					</field>
-					<field type="second">
-						<displayName>secundă</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zonă</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Necunoscut</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Polul Sud</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viena</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruxelles</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Insula Paștelui</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Capul Verde</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Copenhaga</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Insulele Canare</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londra</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Guadalupe</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atena</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Georgia de Sud</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budapesta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Ierusalim</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuweit</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kyzylorda</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chișinău</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinica</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldive</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Marchize</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varșovia</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azore</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabona</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Quatar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>București</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moscova</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Ekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnoiarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkuțk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Yakuțk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamciatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyad</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sf. Elena</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damasc</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporoje</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Dakota de Nord</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Centru, Dakota de Nord</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent și Grenadines</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Ora Acre</standard>
-					<daylight>Ora de vară Acre</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Ora Africii Centrale</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Ora Africii Orientale</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Ora Africii Meridionale</generic>
-					<standard>Ora Standard a Africii Meridionale</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Ora Africii Occidentale</standard>
-					<daylight>Ora de vară a Africii Occidentale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Ora zonei Alaska</generic>
-					<standard>Ora standard în zona Alaska</standard>
-					<daylight>Ora de vară în zona Alaska</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Ora zonei Alaska-Hawaii</generic>
-					<standard>Ora standard în zona Alaska-Hawaii</standard>
-					<daylight>Ora de vară în zona Alaska-Hawaii</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Ora Amazon</standard>
-					<daylight>Ora de vară Amazon</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Ora Centrală</generic>
-					<standard>Ora standard centrală</standard>
-					<daylight>Ora de vară centrală</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Ora orientală</generic>
-					<standard>Ora standard orientală</standard>
-					<daylight>Ora de vară orientală</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Ora zonei montane</generic>
-					<standard>Ora standard în zona montană</standard>
-					<daylight>Ora de vară în zona montană</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Ora zonei Pacific</generic>
-					<standard>Ora standard în zona Pacific</standard>
-					<daylight>Ora de vară în zona Pacific</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Ora Argentinei</standard>
-					<daylight>Ora de vară a Argentinei</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Ora Argentinei Occidentale</standard>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Ora zonei Atlantic</generic>
-					<standard>Ora standard în zona Atlantic</standard>
-					<daylight>Ora de vară în zona Atlantic</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Ora Australiei Centrale</generic>
-					<daylight>Ora de vară a Australiei Centrale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Ora Australiei Central Occidentale</generic>
-					<standard>Ora standard a Australiei Central Occidentale</standard>
-					<daylight>Ora de vară a Australiei Central Occidentale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Ora Australiei Orientale</generic>
-					<standard>Ora standard a Australiei Orientale</standard>
-					<daylight>Ora de vară a Australiei Orientale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Ora Australiei Occidentale</generic>
-					<daylight>Ora de vară a Australiei Occidentale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Ora Bering</generic>
-					<standard>Ora standard Bering</standard>
-					<daylight>Ora de vară Bering</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Ora Boliviei</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Ora Davis</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Ora Dumont-d'Urville</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ora Europei Centrale</standard>
-					<daylight>Ora de vară a Europei Centrale</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Ora Europei de Est</standard>
-					<daylight>Ora de vară a Europei de Est</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Ora Europei Occidentale</standard>
-					<daylight>Ora de vară a Europei Occidentale</daylight>
-				</long>
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich Mean Time</standard>
-				</long>
-				<short>
-					<standard>GMT</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Ora Lord Howe</generic>
-					<standard>Ora standard Lord Howe</standard>
-					<daylight>Ora de vară Lord Howe</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Ora Mawson</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Ora Rothera</standard>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Ora Syowa</standard>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Ora Vostok</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>pesetă andorrană</displayName>
-				<displayName count="few">pesete andorrane</displayName>
-				<displayName count="other">pesete andorrane</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>dirham Emiratele Arabe Unite</displayName>
-				<displayName count="few">dirhami Emiratele Arabe Unite</displayName>
-				<displayName count="other">dirhami Emiratele Arabe Unite</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>leka albanez</displayName>
-				<displayName count="few">leka albanezi</displayName>
-				<displayName count="one">leka albanez</displayName>
-				<displayName count="other">leka albanezi</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>dram armenesc</displayName>
-				<displayName count="few">drami armenești</displayName>
-				<displayName count="one">dram armenesc</displayName>
-				<displayName count="other">drami armenești</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>gulden Antilele Olandeze</displayName>
-				<displayName count="few">guldeni Antilele Olandeze</displayName>
-				<displayName count="other">guldeni Antilele Olandeze</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>peso argentinian (1983–1985)</displayName>
-				<displayName count="few">pesos argentinieni (ARP)</displayName>
-				<displayName count="one">peso argentinian (ARP)</displayName>
-				<displayName count="other">pesos argentinieni (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>peso argentinian</displayName>
-				<displayName count="few">pesos argentinieni</displayName>
-				<displayName count="other">pesos argentinieni</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>șiling austriac</displayName>
-				<displayName count="few">șilingi austrieci</displayName>
-				<displayName count="other">șilingi austrieci</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>dolar australian</displayName>
-				<displayName count="few">dolari australieni</displayName>
-				<displayName count="other">dolari australieni</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>manat Azerbaidjan</displayName>
-				<displayName count="few">manați Azerbaidjan</displayName>
-				<displayName count="other">manați Azerbaidjan</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>dinar Bosnia-Herțegovina</displayName>
-				<displayName count="few">dinari Bosnia-Herțegovina</displayName>
-				<displayName count="other">dinari Bosnia-Herțegovina</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>marcă convertibilă bosniacă</displayName>
-				<displayName count="few">mărci convertibile bosniace</displayName>
-				<displayName count="other">mărci convertibile bosniace</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>dolar Barbados</displayName>
-				<displayName count="few">dolari Barbados</displayName>
-				<displayName count="other">dolari Barbados</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>taka BangladeÈ™</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>franc belgian (convertibil)</displayName>
-				<displayName count="few">franci belgieni (convertibili)</displayName>
-				<displayName count="other">franci belgieni (convertibili)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>franc belgian</displayName>
-				<displayName count="few">franci belgieni</displayName>
-				<displayName count="other">franci belgieni</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>franc belgian (financiar)</displayName>
-				<displayName count="few">franci belgieni (financiari)</displayName>
-				<displayName count="other">franci belgieni (financiari)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>leva bulgărească nouă</displayName>
-				<displayName count="few">leva bulgărești noi</displayName>
-				<displayName count="other">leva bulgărești noi</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>franc Burundi</displayName>
-				<displayName count="few">franci Burundi</displayName>
-				<displayName count="other">franci Burundi</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>dolar Bermude</displayName>
-				<displayName count="few">dolari Bermude</displayName>
-				<displayName count="other">dolari Bermude</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>dolar Brunei</displayName>
-				<displayName count="few">dolari Brunei</displayName>
-				<displayName count="other">dolari Brunei</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>bolivian bolivian</displayName>
-				<displayName count="few">bolivieni bolivieni</displayName>
-				<displayName count="other">bolivieni bolivieni</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>peso bolivian</displayName>
-				<displayName count="few">pesos bolivieni</displayName>
-				<displayName count="other">pesos bolivieni</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>mvdol bolivian</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>cruzeiro brazilian (1990–1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>real brazilian</displayName>
-				<displayName count="few">reali brazilieni</displayName>
-				<displayName count="other">reali brazilieni</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>cruzeiro brazilian</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>dolar Bahamas</displayName>
-				<displayName count="few">dolari Bahamas</displayName>
-				<displayName count="other">dolari Bahamas</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>ngultrum Bhutan</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>kyat birman</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>rublă bielorusă</displayName>
-				<displayName count="few">ruble bieloruse</displayName>
-				<displayName count="other">ruble bieloruse</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>dolar Belize</displayName>
-				<displayName count="few">dolari Belize</displayName>
-				<displayName count="other">dolari Belize</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>dolar canadian</displayName>
-				<displayName count="few">dolari canadieni</displayName>
-				<displayName count="other">dolari canadieni</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>franc congolez</displayName>
-				<displayName count="few">franci congolezi</displayName>
-				<displayName count="other">franci congolezi</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>franc elvețian</displayName>
-				<displayName count="few">franci elvețieni</displayName>
-				<displayName count="other">franci elvețieni</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>peso chilian</displayName>
-				<displayName count="few">pesos chilieni</displayName>
-				<displayName count="other">pesos chilieni</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>yuan renminbi chinezesc</displayName>
-				<displayName count="few">yuani renminbi chinezești</displayName>
-				<displayName count="other">yuani renminbi chinezești</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>peso columbian</displayName>
-				<displayName count="few">pesos columbieni</displayName>
-				<displayName count="other">pesos columbieni</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>colon costarican</displayName>
-				<displayName count="few">coloni costaricani</displayName>
-				<displayName count="other">coloni costaricani</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>dinar vechi Serbia și Muntenegru</displayName>
-				<displayName count="few">dinari vechi Serbia și Muntenegru</displayName>
-				<displayName count="other">dinari vechi Serbia și Muntenegru</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>peso cubanez</displayName>
-				<displayName count="few">pesos cubanezi</displayName>
-				<displayName count="other">pesos cubanezi</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>escudo Capul Verde</displayName>
-				<displayName count="few">escudo Capul Verde</displayName>
-				<displayName count="one">escudo Capul Verde</displayName>
-				<displayName count="other">escudo Capul Verde</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>liră cipriotă</displayName>
-				<displayName count="few">lire cipriote</displayName>
-				<displayName count="other">lire cipriote</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>coroană cehă</displayName>
-				<displayName count="few">coroane cehe</displayName>
-				<displayName count="other">coroane cehe</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>marcă est-germană</displayName>
-				<displayName count="few">mărci est-germane</displayName>
-				<displayName count="other">mărci est-germane</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>marcă germană</displayName>
-				<displayName count="few">mărci germane</displayName>
-				<displayName count="other">mărci germane</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>franc Djibouti</displayName>
-				<displayName count="few">franci Djibouti</displayName>
-				<displayName count="other">franci Djibouti</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>coroană daneză</displayName>
-				<displayName count="few">coroane daneze</displayName>
-				<displayName count="other">coroane daneze</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>peso dominican</displayName>
-				<displayName count="few">pesos dominicani</displayName>
-				<displayName count="other">pesos dominicani</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>dinar algerian</displayName>
-				<displayName count="few">dinari algerieni</displayName>
-				<displayName count="other">dinari algerieni</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>sucre Ecuador</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>coroană estoniană</displayName>
-				<displayName count="few">coroane estoniene</displayName>
-				<displayName count="other">coroane estoniene</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>liră egipteană</displayName>
-				<displayName count="few">lire egiptene</displayName>
-				<displayName count="other">lire egiptene</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>peseta spaniolă (cont A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>peseta spaniolă (cont convertibil)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>pesetă spaniolă</displayName>
-				<displayName count="few">pesete spaniole</displayName>
-				<displayName count="other">pesete spaniole</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>birr Etiopia</displayName>
-				<displayName count="few">birr Etiopia</displayName>
-				<displayName count="one">birr Etiopia</displayName>
-				<displayName count="other">birr Etiopia</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>marcă finlandeză</displayName>
-				<displayName count="few">mărci finlandeze</displayName>
-				<displayName count="one">mărci finlandeze</displayName>
-				<displayName count="other">mărci finlandeze</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>dolar Fiji</displayName>
-				<displayName count="few">dolari Fiji</displayName>
-				<displayName count="other">dolari Fiji</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>liră Insulele Falkland</displayName>
-				<displayName count="few">lire Insulele Falkland</displayName>
-				<displayName count="other">lire Insulele Falkland</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>franc francez</displayName>
-				<displayName count="few">franci francezi</displayName>
-				<displayName count="other">franci francezi</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>liră sterlină</displayName>
-				<displayName count="few">lire sterline</displayName>
-				<displayName count="other">lire sterline</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>lari Georgia</displayName>
-				<displayName count="few">lari Georgia</displayName>
-				<displayName count="one">lari Georgia</displayName>
-				<displayName count="other">lari Georgia</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>cedi Ghana</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>liră Gibraltar</displayName>
-				<displayName count="few">lire Gibraltar</displayName>
-				<displayName count="other">lire Gibraltar</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>dalasi Gambia</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>franc Guineea</displayName>
-				<displayName count="few">franci Guineea</displayName>
-				<displayName count="other">franci Guineea</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>drahmă grecească</displayName>
-				<displayName count="few">drahme grecești</displayName>
-				<displayName count="other">drahme grecești</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>quetzal Guatemala</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso Guineea-Bissau</displayName>
-				<displayName count="few">pesos Guineea-Bissau</displayName>
-				<displayName count="other">pesos Guineea-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>dolar Guyana</displayName>
-				<displayName count="few">dolari Guyana</displayName>
-				<displayName count="other">dolari Guyana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>dolar Hong Kong</displayName>
-				<displayName count="few">dolari Hong Kong</displayName>
-				<displayName count="other">dolari Hong Kong</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>lempira Honduras</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>dinar croat</displayName>
-				<displayName count="few">dinari croați</displayName>
-				<displayName count="other">dinari croați</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kuna croată</displayName>
-				<displayName count="few">kune croate</displayName>
-				<displayName count="other">kune croate</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>gourde Haiti</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>forint maghiar</displayName>
-				<displayName count="few">forinți maghiari</displayName>
-				<displayName count="other">forinți maghiari</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>rupie indoneziană</displayName>
-				<displayName count="few">rupii indoneziene</displayName>
-				<displayName count="other">rupii indoneziene</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>liră irlandeză</displayName>
-				<displayName count="few">lire irlandeze</displayName>
-				<displayName count="other">lire irlandeze</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>liră israeliană</displayName>
-				<displayName count="few">lire israeliene</displayName>
-				<displayName count="other">lire israeliene</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>șechel israelian nou</displayName>
-				<displayName count="few">șecheli israelieni noi</displayName>
-				<displayName count="other">șecheli israelieni noi</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>rupie indiană</displayName>
-				<displayName count="few">rupii indiene</displayName>
-				<displayName count="other">rupii indiene</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>dinar irakian</displayName>
-				<displayName count="few">dinari irakieni</displayName>
-				<displayName count="other">dinari irakieni</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>rial iranian</displayName>
-				<displayName count="few">riali iranieni</displayName>
-				<displayName count="other">riali iranieni</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>coroană islandeză</displayName>
-				<displayName count="few">coroane islandeze</displayName>
-				<displayName count="other">coroane islandeze</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>liră italiană</displayName>
-				<displayName count="few">lire italiene</displayName>
-				<displayName count="other">lire italiene</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>dolar jamaican</displayName>
-				<displayName count="few">dolari jamaicani</displayName>
-				<displayName count="other">dolari jamaicani</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>dinar iordanian</displayName>
-				<displayName count="few">dinari iordanieni</displayName>
-				<displayName count="other">dinari iordanieni</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>yen japonez</displayName>
-				<displayName count="few">yeni japonezi</displayName>
-				<displayName count="other">yeni japonezi</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>șiling kenyan</displayName>
-				<displayName count="few">șilingi kenyeni</displayName>
-				<displayName count="other">șilingi kenyeni</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>som Kirghizstan</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>riel cambodgian</displayName>
-				<displayName count="few">rieli cambodgieni</displayName>
-				<displayName count="other">rieli cambodgieni</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>franc comorian</displayName>
-				<displayName count="few">franci comorieni</displayName>
-				<displayName count="other">franci comorieni</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>won nord-coreean</displayName>
-				<displayName count="few">woni nord-coreeni</displayName>
-				<displayName count="other">woni nord-coreeni</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>won sud-coreean</displayName>
-				<displayName count="few">woni sud-coreeni</displayName>
-				<displayName count="other">woni sud-coreeni</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>dinar kuweitian</displayName>
-				<displayName count="few">dinari kuweitieni</displayName>
-				<displayName count="other">dinari kuweitieni</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>dolar Insulele Cayman</displayName>
-				<displayName count="few">dolari Insulele Cayman</displayName>
-				<displayName count="other">dolari Insulele Cayman</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>kip Laos</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>liră libaneză</displayName>
-				<displayName count="few">lire libaneze</displayName>
-				<displayName count="other">lire libaneze</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>rupie Sri Lanka</displayName>
-				<displayName count="few">rupii Sri Lanka</displayName>
-				<displayName count="other">rupii Sri Lanka</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>dolar liberian</displayName>
-				<displayName count="few">dolari liberieni</displayName>
-				<displayName count="other">dolari liberieni</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litu lituanian</displayName>
-				<displayName count="few">lite lituaniene</displayName>
-				<displayName count="other">lite lituaniene</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>franc convertibil luxemburghez</displayName>
-				<displayName count="few">franci convertibili luxemburghezi</displayName>
-				<displayName count="other">franci convertibili luxemburghezi</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>franc luxemburghez</displayName>
-				<displayName count="few">franci luxemburghezi</displayName>
-				<displayName count="other">franci luxemburghezi</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>franc financiar luxemburghez</displayName>
-				<displayName count="few">franci financiari luxemburghezi</displayName>
-				<displayName count="other">franci financiari luxemburghezi</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>lats Letonia</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>rublă Letonia</displayName>
-				<displayName count="few">ruble Letonia</displayName>
-				<displayName count="other">ruble Letonia</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>dinar libian</displayName>
-				<displayName count="few">dinari libieni</displayName>
-				<displayName count="other">dinari libieni</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>dirham marocan</displayName>
-				<displayName count="few">dirhami marocani</displayName>
-				<displayName count="other">dirhami marocani</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>franc marocan</displayName>
-				<displayName count="few">franci marocani</displayName>
-				<displayName count="other">franci marocani</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>leu moldovenesc</displayName>
-				<displayName count="few">lei moldovenești</displayName>
-				<displayName count="other">lei moldovenești</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>franc Madagascar</displayName>
-				<displayName count="few">franci Madagascar</displayName>
-				<displayName count="other">franci Madagascar</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>dinar macedonean</displayName>
-				<displayName count="few">dinari macedoneni</displayName>
-				<displayName count="other">dinari macedoneni</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>franc Mali</displayName>
-				<displayName count="few">franci Mali</displayName>
-				<displayName count="other">franci Mali</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>kyat Myanmar</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>tugrik mongol</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>liră malteză</displayName>
-				<displayName count="few">lire malteze</displayName>
-				<displayName count="other">lire malteze</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>peso mexican</displayName>
-				<displayName count="few">pesos mexicani</displayName>
-				<displayName count="other">pesos mexicani</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>peso mexican de argint (1861–1992)</displayName>
-				<displayName count="few">pesos mexicani de argint (1861–1992</displayName>
-				<displayName count="other">pesos mexicani de argint (1861–1992</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ringgit malaiezian</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>escudo Mozambic</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>metical Mozambic vechi</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>metical Mozambic</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>dolar namibian</displayName>
-				<displayName count="few">dolari namibieni</displayName>
-				<displayName count="other">dolari namibieni</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>cordoba Nicaragua</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>gulden olandez</displayName>
-				<displayName count="few">guldeni olandezi</displayName>
-				<displayName count="other">guldeni olandezi</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>coroană norvegiană</displayName>
-				<displayName count="few">coroane norvegiene</displayName>
-				<displayName count="other">coroane norvegiene</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>rupie nepaleză</displayName>
-				<displayName count="few">rupii nepaleze</displayName>
-				<displayName count="other">rupii nepaleze</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>dolar neozeelandez</displayName>
-				<displayName count="few">dolari neozeelandezi</displayName>
-				<displayName count="other">dolari neozeelandezi</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>riyal Oman</displayName>
-				<displayName count="few">riyali Oman</displayName>
-				<displayName count="other">riyali Oman</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>balboa panameză</displayName>
-				<displayName count="few">balboa panameze</displayName>
-				<displayName count="other">balboa panameze</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>inti peruvian</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>sol nou peruvian</displayName>
-				<displayName count="few">soli noi Peru</displayName>
-				<displayName count="other">soli noi Peru</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>sol peruvian</displayName>
-				<displayName count="few">soli Peru</displayName>
-				<displayName count="other">soli Peru</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina Papua-Noua Guinee</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>peso filipinez</displayName>
-				<displayName count="few">pesos filipinezi</displayName>
-				<displayName count="other">pesos filipinezi</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>rupie pakistaneză</displayName>
-				<displayName count="few">rupii pakistaneze</displayName>
-				<displayName count="other">rupii pakistaneze</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>zlot nou polonez</displayName>
-				<displayName count="few">zloți noi polonezi</displayName>
-				<displayName count="other">zloți noi polonezi</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>zlot polonez (1950–1995)</displayName>
-				<displayName count="few">zloți polonezi (1950–1995)</displayName>
-				<displayName count="other">zloți polonezi (1950–1995)</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>guarani Paraguay</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>riyal Qatar</displayName>
-				<displayName count="few">riyali Qatar</displayName>
-				<displayName count="other">riyali Qatar</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>dolar rhodesian</displayName>
-				<displayName count="few">dolari rhodesieni</displayName>
-				<displayName count="other">dolari rhodesieni</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>leu vechi</displayName>
-				<displayName count="few">lei vechi</displayName>
-				<displayName count="other">lei vechi</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>leu</displayName>
-				<displayName count="few">lei</displayName>
-				<displayName count="other">lei</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>dinar sârbesc</displayName>
-				<displayName count="few">dinari sârbești</displayName>
-				<displayName count="other">dinari sârbești</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>rublă rusească</displayName>
-				<displayName count="few">ruble rusești</displayName>
-				<displayName count="other">ruble rusești</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>franc Rwanda</displayName>
-				<displayName count="few">franci Rwanda</displayName>
-				<displayName count="other">franci Rwanda</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>riyal Arabia Saudită</displayName>
-				<displayName count="few">riyali Arabia Saudită</displayName>
-				<displayName count="other">riyali Arabia Saudită</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>dolar Insulele Solomon</displayName>
-				<displayName count="few">dolari Insulele Solomon</displayName>
-				<displayName count="other">dolari Insulele Solomon</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>rupie Seychelles</displayName>
-				<displayName count="few">rupii Seychelles</displayName>
-				<displayName count="other">rupii Seychelles</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>dinar sudanez</displayName>
-				<displayName count="few">dinari sudanezi</displayName>
-				<displayName count="other">dinari sudanezi</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>liră sudaneză</displayName>
-				<displayName count="few">lire sudaneze</displayName>
-				<displayName count="other">lire sudaneze</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>coroană suedeză</displayName>
-				<displayName count="few">coroane suedeze</displayName>
-				<displayName count="other">coroane suedeze</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>dolar Singapore</displayName>
-				<displayName count="few">dolari Singapore</displayName>
-				<displayName count="other">dolari Singapore</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>liră Insula Sf. Elena</displayName>
-				<displayName count="few">lire Insula Sf. Elena</displayName>
-				<displayName count="other">lire Insula Sf. Elena</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>tolar sloven</displayName>
-				<displayName count="few">tolari sloveni</displayName>
-				<displayName count="other">tolari sloveni</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>coroană slovacă</displayName>
-				<displayName count="few">coroane slovace</displayName>
-				<displayName count="other">coroane slovace</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>leu Sierra Leone</displayName>
-				<displayName count="few">lei Sierra Leone</displayName>
-				<displayName count="other">lei Sierra Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>șiling somalez</displayName>
-				<displayName count="few">șilingi somalezi</displayName>
-				<displayName count="other">șilingi somalezi</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>dolar Surinam</displayName>
-				<displayName count="few">dolari Surinam</displayName>
-				<displayName count="other">dolari Surinam</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>gulden Surinam</displayName>
-				<displayName count="few">guldeni Surinam</displayName>
-				<displayName count="other">guldeni Surinam</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>dobra Sao Tome și Principe</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>rublă sovietică</displayName>
-				<displayName count="few">ruble sovietice</displayName>
-				<displayName count="other">ruble sovietice</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>colon El Salvador</displayName>
-				<displayName count="few">coloni El Salvador</displayName>
-				<displayName count="other">coloni El Salvador</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>liră siriană</displayName>
-				<displayName count="few">lire siriene</displayName>
-				<displayName count="other">lire siriene</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>baht thailandez</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>rublă Tadjikistan</displayName>
-				<displayName count="few">ruble Tadjikistan</displayName>
-				<displayName count="other">ruble Tadjikistan</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>dinar tunisian</displayName>
-				<displayName count="few">dinari tunisieni</displayName>
-				<displayName count="other">dinari tunisieni</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>liră turcească</displayName>
-				<displayName count="other">lire turcești</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>liră turcească nouă</displayName>
-				<displayName count="other">lire turcești noi</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dolar Trinidad-Tobago</displayName>
-				<displayName count="few">dolari Trinidad-Tobago</displayName>
-				<displayName count="other">dolari Trinidad-Tobago</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>dolar nou Taiwan</displayName>
-				<displayName count="few">dolari noi Taiwan</displayName>
-				<displayName count="other">dolari noi Taiwan</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>șiling tanzanian</displayName>
-				<displayName count="few">șilingi tanzanieni</displayName>
-				<displayName count="other">șilingi tanzanieni</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>hryvna ucraineană</displayName>
-				<displayName count="few">hryvna ucrainiene</displayName>
-				<displayName count="other">hryvna ucrainiene</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>carboavă ucraineană</displayName>
-				<displayName count="few">carboave ucrainiene</displayName>
-				<displayName count="other">carboave ucrainiene</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>șiling ugandez (1966–1987)</displayName>
-				<displayName count="few">șilingi ugandezi (1966–1987)</displayName>
-				<displayName count="other">șilingi ugandezi (1966–1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>șiling ugandez</displayName>
-				<displayName count="few">șilingi ugandezi</displayName>
-				<displayName count="other">șilingi ugandezi</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>dolar american</displayName>
-				<displayName count="few">dolari americani</displayName>
-				<displayName count="other">dolari americani</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>dolar american (ziua următoare)</displayName>
-				<displayName count="few">dolari americani (ziua următoare)</displayName>
-				<displayName count="other">dolari americani (ziua următoare)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>dolar american (aceeași zi)</displayName>
-				<displayName count="few">dolari americani (aceeași zi)</displayName>
-				<displayName count="other">dolari americani (aceeași zi)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>peso Uruguay (1975–1993)</displayName>
-				<displayName count="few">pesos Uruguay (1975–1993)</displayName>
-				<displayName count="other">pesos Uruguay (1975–1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>peso nou Uruguay</displayName>
-				<displayName count="few">pesos noi Uruguay</displayName>
-				<displayName count="other">pesos noi Uruguay</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>sum Uzbekistan</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>bolivar Venezuela</displayName>
-				<displayName count="few">bolivari Venezuela</displayName>
-				<displayName count="other">bolivari Venezuela</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>dong vietnamez</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>franc Comunitatea Financiară</displayName>
-				<displayName count="few">franci Comunitatea Financiară</displayName>
-				<displayName count="other">franci Comunitatea Financiară</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>argint</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>aur</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>unitate compusă europeană</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>unitate monetară europeană</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>unitate de cont europeană (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>unitate de cont europeană (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>dolar Caraibele de Est</displayName>
-				<displayName count="few">dolari Caraibele de Est</displayName>
-				<displayName count="other">dolari Caraibele de Est</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>drepturi speciale de tragere</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>unitate de monedă europeană</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>franc francez de aur</displayName>
-				<displayName count="few">franci francezi de aur</displayName>
-				<displayName count="other">franci francezi de aur</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>franc UIC francez</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>paladiu</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platină</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>cod monetar de test</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>monedă necunoscută sau nevalidă</displayName>
-				<displayName count="few">monede necunoscute sau nevalide</displayName>
-				<displayName count="other">monede necunoscute sau nevalide</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>dinar Yemen</displayName>
-				<displayName count="few">dinari Yemen</displayName>
-				<displayName count="other">dinari Yemen</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>riyal Yemen</displayName>
-				<displayName count="few">riyali Yemen</displayName>
-				<displayName count="other">riyali Yemen</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>dinar iugoslav greu</displayName>
-				<displayName count="few">dinari iugoslavi grei</displayName>
-				<displayName count="other">dinari iugoslavi grei</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>dinar iugoslav nou</displayName>
-				<displayName count="few">dinari iugoslavi noi</displayName>
-				<displayName count="other">dinari iugoslavi noi</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>dinar iugoslav convertibil</displayName>
-				<displayName count="few">dinari iugoslavi convertibili</displayName>
-				<displayName count="other">dinari iugoslavi convertibili</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>rand sud-african (financiar)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>rand sud-african</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zair nou</displayName>
-				<displayName count="few">zairi noi</displayName>
-				<displayName count="other">zairi noi</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>dolar Zimbabwe</displayName>
-				<displayName count="few">dolari Zimbabwe</displayName>
-				<displayName count="other">dolari Zimbabwe</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} zile</unitPattern>
-			<unitPattern count="one">{0} zi</unitPattern>
-			<unitPattern count="other">{0} de zile</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} ore</unitPattern>
-			<unitPattern count="one">{0} oră</unitPattern>
-			<unitPattern count="other">{0} de ore</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minute</unitPattern>
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} de minute</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} luni</unitPattern>
-			<unitPattern count="one">{0} lună</unitPattern>
-			<unitPattern count="other">{0} de luni</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} secunde</unitPattern>
-			<unitPattern count="one">{0} secundă</unitPattern>
-			<unitPattern count="other">{0} de secunde</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} săptămâni</unitPattern>
-			<unitPattern count="one">{0} săptămână</unitPattern>
-			<unitPattern count="other">{0} de săptămâni</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} ani</unitPattern>
-			<unitPattern count="one">{0} an</unitPattern>
-			<unitPattern count="other">{0} de ani</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>da:d</yesstr>
-			<nostr>nu:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ro_MD.xml b/airtime_mvc/library/Zend/Locale/Data/ro_MD.xml
deleted file mode 100644
index f5a51d37a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ro_MD.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="ro"/>
-		<territory type="MD"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ro_RO.xml b/airtime_mvc/library/Zend/Locale/Data/ro_RO.xml
deleted file mode 100644
index 66d3612e9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ro_RO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="ro"/>
-		<territory type="RO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/root.xml b/airtime_mvc/library/Zend/Locale/Data/root.xml
deleted file mode 100644
index 3493972fd..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/root.xml
+++ /dev/null
@@ -1,3178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.192 $"/>
-		<generation date="$Date: 2009/06/15 21:39:59 $"/>
-		<language type="root"/>
-	</identity>
-	<fallback/>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation/>
-		<inList>mixed</inList>
-		<inText type="currency">mixed</inText>
-		<inText type="dayWidth">mixed</inText>
-		<inText type="fields">mixed</inText>
-		<inText type="keys">mixed</inText>
-		<inText type="languages">mixed</inText>
-		<inText type="long">mixed</inText>
-		<inText type="measurementSystemNames">mixed</inText>
-		<inText type="monthWidth">mixed</inText>
-		<inText type="quarterWidth">mixed</inText>
-		<inText type="scripts">mixed</inText>
-		<inText type="territories">mixed</inText>
-		<inText type="types">mixed</inText>
-		<inText type="variants">mixed</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} - {1}</dateRangePattern>
-		<calendars>
-			<default choice="gregorian"/>
-			<calendar type="buddhist">
-				<months>
-					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BE</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength"/>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, M/d/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/intervalFormats"/>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE y'x'G-Ml-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Tout</month>
-							<month type="2">Baba</month>
-							<month type="3">Hator</month>
-							<month type="4">Kiahk</month>
-							<month type="5">Toba</month>
-							<month type="6">Amshir</month>
-							<month type="7">Baramhat</month>
-							<month type="8">Baramouda</month>
-							<month type="9">Bashans</month>
-							<month type="10">Paona</month>
-							<month type="11">Epep</month>
-							<month type="12">Mesra</month>
-							<month type="13">Nasie</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-							<month type="13">13</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ERA0</era>
-						<era type="1">ERA1</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Meskerem</month>
-							<month type="2">Tekemt</month>
-							<month type="3">Hedar</month>
-							<month type="4">Tahsas</month>
-							<month type="5">Ter</month>
-							<month type="6">Yekatit</month>
-							<month type="7">Megabit</month>
-							<month type="8">Miazia</month>
-							<month type="9">Genbot</month>
-							<month type="10">Sene</month>
-							<month type="11">Hamle</month>
-							<month type="12">Nehasse</month>
-							<month type="13">Pagumen</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-							<month type="13">13</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ERA0</era>
-						<era type="1">ERA1</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="ethiopic-amete-alem">
-				<months>
-					<alias source="locale" path="../../calendar[@type='ethiopic']/months"/>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ERA0</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<default choice="format"/>
-					<dayContext type="format">
-						<default choice="wide"/>
-						<dayWidth type="abbreviated">
-							<alias source="locale" path="../dayWidth[@type='wide']"/>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<alias source="locale" path="../../dayContext[@type='stand-alone']/dayWidth[@type='narrow']"/>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<alias source="locale" path="../../dayContext[@type='format']/dayWidth[@type='abbreviated']"/>
-						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<alias source="locale" path="../../dayContext[@type='format']/dayWidth[@type='wide']"/>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<alias source="locale" path="../quarterWidth[@type='wide']"/>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<alias source="locale" path="../../quarterContext[@type='stand-alone']/quarterWidth[@type='narrow']"/>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="abbreviated">
-							<alias source="locale" path="../../quarterContext[@type='format']/quarterWidth[@type='abbreviated']"/>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<alias source="locale" path="../../quarterContext[@type='format']/quarterWidth[@type='wide']"/>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<default choice="medium"/>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">y-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, y-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – dd</greatestDifference>
-							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MM-d – d</greatestDifference>
-							<greatestDifference id="M">MM-d – MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MM-d – E, MM-d</greatestDifference>
-							<greatestDifference id="M">E, MM-d – E, MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd – yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">yyyy-MM-d – d</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd – MM-d</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd – yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Year</displayName>
-					</field>
-					<field type="month">
-						<displayName>Month</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Day</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Day of the Week</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hour</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Second</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Tishri</month>
-							<month type="2">Heshvan</month>
-							<month type="3">Kislev</month>
-							<month type="4">Tevet</month>
-							<month type="5">Shevat</month>
-							<month type="6">Adar I</month>
-							<month type="7">Adar</month>
-							<month type="8">Nisan</month>
-							<month type="9">Iyar</month>
-							<month type="10">Sivan</month>
-							<month type="11">Tamuz</month>
-							<month type="12">Av</month>
-							<month type="13">Elul</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-							<month type="13">13</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">AM</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Chaitra</month>
-							<month type="2">Vaisakha</month>
-							<month type="3">Jyaistha</month>
-							<month type="4">Asadha</month>
-							<month type="5">Sravana</month>
-							<month type="6">Bhadra</month>
-							<month type="7">Asvina</month>
-							<month type="8">Kartika</month>
-							<month type="9">Agrahayana</month>
-							<month type="10">Pausa</month>
-							<month type="11">Magha</month>
-							<month type="12">Phalguna</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">SAKA</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Muharram</month>
-							<month type="2">Safar</month>
-							<month type="3">RabiÊ» I</month>
-							<month type="4">RabiÊ» II</month>
-							<month type="5">Jumada I</month>
-							<month type="6">Jumada II</month>
-							<month type="7">Rajab</month>
-							<month type="8">Shaʻban</month>
-							<month type="9">Ramadan</month>
-							<month type="10">Shawwal</month>
-							<month type="11">Dhuʻl-Qiʻdah</month>
-							<month type="12">Dhuʻl-Hijjah</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">AH</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="islamic-civil">
-				<alias source="locale" path="../calendar[@type='islamic']"/>
-			</calendar>
-			<calendar type="japanese">
-				<months>
-					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Taika</era>
-						<era type="1">Hakuchi</era>
-						<era type="2">Hakuh�</era>
-						<era type="3">Shuch�</era>
-						<era type="4">Taih�</era>
-						<era type="5">Keiun</era>
-						<era type="6">Wad�</era>
-						<era type="7">Reiki</era>
-						<era type="8">Y�r�</era>
-						<era type="9">Jinki</era>
-						<era type="10">Tempy�</era>
-						<era type="11">Tempy�-kamp�</era>
-						<era type="12">Tempy�-sh�h�</era>
-						<era type="13">Tempy�-h�ji</era>
-						<era type="14">Temph�-jingo</era>
-						<era type="15">Jingo-keiun</era>
-						<era type="16">H�ki</era>
-						<era type="17">Ten-�</era>
-						<era type="18">Enryaku</era>
-						<era type="19">Daid�</era>
-						<era type="20">K�nin</era>
-						<era type="21">Tench�</era>
-						<era type="22">Sh�wa</era>
-						<era type="23">Kaj�</era>
-						<era type="24">Ninju</era>
-						<era type="25">Saiko</era>
-						<era type="26">Tennan</era>
-						<era type="27">J�gan</era>
-						<era type="28">Genkei</era>
-						<era type="29">Ninna</era>
-						<era type="30">Kampy�</era>
-						<era type="31">Sh�tai</era>
-						<era type="32">Engi</era>
-						<era type="33">Ench�</era>
-						<era type="34">Sh�hei</era>
-						<era type="35">Tengy�</era>
-						<era type="36">Tenryaku</era>
-						<era type="37">Tentoku</era>
-						<era type="38">ÅŒwa</era>
-						<era type="39">K�h�</era>
-						<era type="40">Anna</era>
-						<era type="41">Tenroku</era>
-						<era type="42">Ten-en</era>
-						<era type="43">J�gen</era>
-						<era type="44">Tengen</era>
-						<era type="45">Eikan</era>
-						<era type="46">Kanna</era>
-						<era type="47">Ei-en</era>
-						<era type="48">Eiso</era>
-						<era type="49">Sh�ryaku</era>
-						<era type="50">Ch�toku</era>
-						<era type="51">Ch�h�</era>
-						<era type="52">Kank�</era>
-						<era type="53">Ch�wa</era>
-						<era type="54">Kannin</era>
-						<era type="55">Jian</era>
-						<era type="56">Manju</era>
-						<era type="57">Ch�gen</era>
-						<era type="58">Ch�ryaku</era>
-						<era type="59">Ch�kyū</era>
-						<era type="60">Kantoku</era>
-						<era type="61">Eish�</era>
-						<era type="62">Tengi</era>
-						<era type="63">K�hei</era>
-						<era type="64">Jiryaku</era>
-						<era type="65">Enkyū</era>
-						<era type="66">Sh�ho</era>
-						<era type="67">Sh�ryaku</era>
-						<era type="68">Eiho</era>
-						<era type="69">ÅŒtoku</era>
-						<era type="70">Kanji</era>
-						<era type="71">Kaho</era>
-						<era type="72">Eich�</era>
-						<era type="73">Sh�toku</era>
-						<era type="74">K�wa</era>
-						<era type="75">Ch�ji</era>
-						<era type="76">Kash�</era>
-						<era type="77">Tennin</era>
-						<era type="78">Ten-ei</era>
-						<era type="79">Eikyū</era>
-						<era type="80">Gen-ei</era>
-						<era type="81">Hoan</era>
-						<era type="82">Tenji</era>
-						<era type="83">Daiji</era>
-						<era type="84">Tensh�</era>
-						<era type="85">Ch�sh�</era>
-						<era type="86">Hoen</era>
-						<era type="87">Eiji</era>
-						<era type="88">K�ji</era>
-						<era type="89">Teny�</era>
-						<era type="90">Kyūan</era>
-						<era type="91">Ninpei</era>
-						<era type="92">Kyūju</era>
-						<era type="93">Hogen</era>
-						<era type="94">Heiji</era>
-						<era type="95">Eiryaku</era>
-						<era type="96">ÅŒho</era>
-						<era type="97">Ch�kan</era>
-						<era type="98">Eiman</era>
-						<era type="99">Nin-an</era>
-						<era type="100">Ka�</era>
-						<era type="101">Sh�an</era>
-						<era type="102">Angen</era>
-						<era type="103">Jish�</era>
-						<era type="104">Y�wa</era>
-						<era type="105">Juei</era>
-						<era type="106">Genryuku</era>
-						<era type="107">Bunji</era>
-						<era type="108">Kenkyū</era>
-						<era type="109">Sh�ji</era>
-						<era type="110">Kennin</era>
-						<era type="111">Genkyū</era>
-						<era type="112">Ken-ei</era>
-						<era type="113">Sh�gen</era>
-						<era type="114">Kenryaku</era>
-						<era type="115">Kenp�</era>
-						<era type="116">Sh�kyū</era>
-						<era type="117">J��</era>
-						<era type="118">Gennin</era>
-						<era type="119">Karoku</era>
-						<era type="120">Antei</era>
-						<era type="121">Kanki</era>
-						<era type="122">J�ei</era>
-						<era type="123">Tempuku</era>
-						<era type="124">Bunryaku</era>
-						<era type="125">Katei</era>
-						<era type="126">Ryakunin</era>
-						<era type="127">En-�</era>
-						<era type="128">Ninji</era>
-						<era type="129">Kangen</era>
-						<era type="130">H�ji</era>
-						<era type="131">Kench�</era>
-						<era type="132">K�gen</era>
-						<era type="133">Sh�ka</era>
-						<era type="134">Sh�gen</era>
-						<era type="135">Bun-�</era>
-						<era type="136">K�ch�</era>
-						<era type="137">Bun-ei</era>
-						<era type="138">Kenji</era>
-						<era type="139">K�an</era>
-						<era type="140">Sh��</era>
-						<era type="141">Einin</era>
-						<era type="142">Sh�an</era>
-						<era type="143">Kengen</era>
-						<era type="144">Kagen</era>
-						<era type="145">Tokuji</era>
-						<era type="146">Enkei</era>
-						<era type="147">Ōch�</era>
-						<era type="148">Sh�wa</era>
-						<era type="149">Bunp�</era>
-						<era type="150">Gen�</era>
-						<era type="151">Genky�</era>
-						<era type="152">Sh�chū</era>
-						<era type="153">Kareki</era>
-						<era type="154">Gentoku</era>
-						<era type="155">Genk�</era>
-						<era type="156">Kemmu</era>
-						<era type="157">Engen</era>
-						<era type="158">K�koku</era>
-						<era type="159">Sh�hei</era>
-						<era type="160">Kentoku</era>
-						<era type="161">Bunchũ</era>
-						<era type="162">Tenju</era>
-						<era type="163">K�ryaku</era>
-						<era type="164">K�wa</era>
-						<era type="165">Genchũ</era>
-						<era type="166">Meitoku</era>
-						<era type="167">Kakei</era>
-						<era type="168">K��</era>
-						<era type="169">Meitoku</era>
-						<era type="170">ÅŒei</era>
-						<era type="171">Sh�ch�</era>
-						<era type="172">Eiky�</era>
-						<era type="173">Kakitsu</era>
-						<era type="174">Bun-an</era>
-						<era type="175">H�toku</era>
-						<era type="176">Ky�toku</era>
-						<era type="177">K�sh�</era>
-						<era type="178">Ch�roku</era>
-						<era type="179">Kansh�</era>
-						<era type="180">Bunsh�</era>
-						<era type="181">ÅŒnin</era>
-						<era type="182">Bunmei</era>
-						<era type="183">Ch�ky�</era>
-						<era type="184">Entoku</era>
-						<era type="185">Mei�</era>
-						<era type="186">Bunki</era>
-						<era type="187">Eish�</era>
-						<era type="188">Taiei</era>
-						<era type="189">Ky�roku</era>
-						<era type="190">Tenmon</era>
-						<era type="191">K�ji</era>
-						<era type="192">Eiroku</era>
-						<era type="193">Genki</era>
-						<era type="194">Tensh�</era>
-						<era type="195">Bunroku</era>
-						<era type="196">Keich�</era>
-						<era type="197">Genwa</era>
-						<era type="198">Kan-ei</era>
-						<era type="199">Sh�ho</era>
-						<era type="200">Keian</era>
-						<era type="201">Sh��</era>
-						<era type="202">Meiryaku</era>
-						<era type="203">Manji</era>
-						<era type="204">Kanbun</era>
-						<era type="205">Enp�</era>
-						<era type="206">Tenwa</era>
-						<era type="207">J�ky�</era>
-						<era type="208">Genroku</era>
-						<era type="209">H�ei</era>
-						<era type="210">Sh�toku</era>
-						<era type="211">Ky�h�</era>
-						<era type="212">Genbun</era>
-						<era type="213">Kanp�</era>
-						<era type="214">Enky�</era>
-						<era type="215">Kan-en</era>
-						<era type="216">H�ryaku</era>
-						<era type="217">Meiwa</era>
-						<era type="218">An-ei</era>
-						<era type="219">Tenmei</era>
-						<era type="220">Kansei</era>
-						<era type="221">Ky�wa</era>
-						<era type="222">Bunka</era>
-						<era type="223">Bunsei</era>
-						<era type="224">Tenp�</era>
-						<era type="225">K�ka</era>
-						<era type="226">Kaei</era>
-						<era type="227">Ansei</era>
-						<era type="228">Man-en</era>
-						<era type="229">Bunkyū</era>
-						<era type="230">Genji</era>
-						<era type="231">Kei�</era>
-						<era type="232">Meiji</era>
-						<era type="233">Taish�</era>
-						<era type="234">Sh�wa</era>
-						<era type="235">Heisei</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="232">M</era>
-						<era type="233">T</era>
-						<era type="234">S</era>
-						<era type="235">H</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, G y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>G y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>G y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyyy">yy GGG</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG yy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG yy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">GGGGG yy MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">GGGGG yy MMM d</dateFormatItem>
-						<dateFormatItem id="yyyyQ">GGGGG yy Q</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Farvardin</month>
-							<month type="2">Ordibehesht</month>
-							<month type="3">Khordad</month>
-							<month type="4">Tir</month>
-							<month type="5">Mordad</month>
-							<month type="6">Shahrivar</month>
-							<month type="7">Mehr</month>
-							<month type="8">Aban</month>
-							<month type="9">Azar</month>
-							<month type="10">Dey</month>
-							<month type="11">Bahman</month>
-							<month type="12">Esfand</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">AP</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="roc">
-				<months>
-					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
-				</months>
-				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
-				</days>
-				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Before R.O.C.</era>
-						<era type="1">R.O.C.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<alias source="locale" path="../eraAbbr"/>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G y/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength"/>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyyy">G y</dateFormatItem>
-						<dateFormatItem id="yyyyM">G y/M</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">EEE, G y/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM, G y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">EEE, MMM d, G y</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Q G y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ G y</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/intervalFormats"/>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<hoursFormat>{0}/{1}</hoursFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<abbreviationFallback choice="standard"/>
-			<preferenceOrdering choice=""/>
-			<singleCountries list="Europe/Kiev Pacific/Majuro Africa/Bamako America/Godthab America/Santiago America/Guayaquil Asia/Shanghai Asia/Tashkent Asia/Kuala_Lumpur Europe/Madrid Europe/Lisbon Europe/London Pacific/Auckland Pacific/Tahiti"/>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d'Urville</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. John's</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, North Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, North Dakota</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincennes, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petersburg, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tell City, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Winamac, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevay, Indiana</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monticello, Kentucky</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<short>
-					<standard>ACT (Acre)</standard>
-					<daylight>ACST (Acre)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<short>
-					<standard>AFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<short>
-					<standard>CAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<short>
-					<standard>EAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<short>
-					<standard>SAST</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Western">
-				<short>
-					<standard>WAT</standard>
-					<daylight>WAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<short>
-					<standard>AKTT</standard>
-					<daylight>AKTST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska">
-				<short>
-					<standard>AKST</standard>
-					<daylight>AKDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<short>
-					<standard>AHST</standard>
-					<daylight>AHDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<short>
-					<standard>ALMT</standard>
-					<daylight>ALMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Amazon">
-				<short>
-					<standard>AMT</standard>
-					<daylight>AMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Central">
-				<short>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<short>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<short>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<short>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<short>
-					<standard>ANAT</standard>
-					<daylight>ANAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (Aqtau)</standard>
-					<daylight>AQTST (Aqtau)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (Aqtobe)</standard>
-					<daylight>AQTST (Aqtobe)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<short>
-					<standard>AST (SA)</standard>
-					<daylight>ADT (SA)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<short>
-					<standard>ART</standard>
-					<daylight>ARST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<short>
-					<standard>WART</standard>
-				</short>
-			</metazone>
-			<metazone type="Armenia">
-				<short>
-					<standard>AMT (AM)</standard>
-					<daylight>AMST (AM)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<short>
-					<standard>ASHT</standard>
-					<daylight>ASHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<short>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<short>
-					<standard>ACST</standard>
-					<daylight>ACDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<short>
-					<standard>ACWST</standard>
-					<daylight>ACWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<short>
-					<standard>AEST</standard>
-					<daylight>AEDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<short>
-					<standard>AWST</standard>
-					<daylight>AWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<short>
-					<standard>AZT</standard>
-					<daylight>AZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azores">
-				<short>
-					<standard>AZOT</standard>
-					<daylight>AZOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Baku">
-				<short>
-					<standard>BAKT</standard>
-					<daylight>BAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bangladesh">
-				<short>
-					<standard>BDT</standard>
-					<daylight>BDST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bering">
-				<short>
-					<standard>BST (Bering)</standard>
-					<daylight>BDT (Bering)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<short>
-					<standard>BTT</standard>
-				</short>
-			</metazone>
-			<metazone type="Bolivia">
-				<short>
-					<standard>BOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Borneo">
-				<short>
-					<standard>BORT</standard>
-					<daylight>BORST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<short>
-					<standard>BRT</standard>
-					<daylight>BRST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brunei">
-				<short>
-					<standard>BNT</standard>
-				</short>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<short>
-					<standard>CVT</standard>
-					<daylight>CVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chamorro">
-				<short>
-					<standard>ChST</standard>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<short>
-					<standard>CHAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Chatham">
-				<short>
-					<standard>CHAST</standard>
-					<daylight>CHADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chile">
-				<short>
-					<standard>CLT</standard>
-					<daylight>CLST</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<short>
-					<standard>CST (CN)</standard>
-					<daylight>CDT (CN)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<short>
-					<standard>CHOT</standard>
-					<daylight>CHOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Christmas">
-				<short>
-					<standard>CXT</standard>
-				</short>
-			</metazone>
-			<metazone type="Cocos">
-				<short>
-					<standard>CCT</standard>
-				</short>
-			</metazone>
-			<metazone type="Colombia">
-				<short>
-					<standard>COT</standard>
-					<daylight>COST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cook">
-				<short>
-					<standard>CKT</standard>
-					<daylight>CKHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cuba">
-				<short>
-					<standard>CST (CU)</standard>
-					<daylight>CDT (CU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<short>
-					<standard>DACT</standard>
-				</short>
-			</metazone>
-			<metazone type="Davis">
-				<short>
-					<standard>DAVT</standard>
-				</short>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<short>
-					<standard>DDUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Dushanbe">
-				<short>
-					<standard>DUST</standard>
-					<daylight>DUSST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<short>
-					<standard>NEGT</standard>
-				</short>
-			</metazone>
-			<metazone type="East_Timor">
-				<short>
-					<standard>TLT</standard>
-				</short>
-			</metazone>
-			<metazone type="Easter">
-				<short>
-					<standard>EAST</standard>
-					<daylight>EASST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ecuador">
-				<short>
-					<standard>ECT</standard>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<short>
-					<standard>FKT</standard>
-					<daylight>FKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Fiji">
-				<short>
-					<standard>FJT</standard>
-					<daylight>FJST</daylight>
-				</short>
-			</metazone>
-			<metazone type="French_Guiana">
-				<short>
-					<standard>GFT</standard>
-				</short>
-			</metazone>
-			<metazone type="French_Southern">
-				<short>
-					<standard>TFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Frunze">
-				<short>
-					<standard>FRUT</standard>
-					<daylight>FRUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Galapagos">
-				<short>
-					<standard>GALT</standard>
-				</short>
-			</metazone>
-			<metazone type="Gambier">
-				<short>
-					<standard>GAMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Georgia">
-				<short>
-					<standard>GET</standard>
-					<daylight>GEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<short>
-					<standard>GILT</standard>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<short>
-					<standard>CGT</standard>
-					<daylight>CGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<short>
-					<standard>EGT</standard>
-					<daylight>EGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<short>
-					<standard>WGT</standard>
-					<daylight>WGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Guam">
-				<short>
-					<standard>GST (GU)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<short>
-					<standard>GST</standard>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<short>
-					<standard>GYT</standard>
-				</short>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<short>
-					<standard>HST</standard>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<short>
-					<standard>HKT</standard>
-					<daylight>HKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hovd">
-				<short>
-					<standard>HOVT</standard>
-					<daylight>HOVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<short>
-					<standard>IST</standard>
-				</short>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<short>
-					<standard>IOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indochina">
-				<short>
-					<standard>ICT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<short>
-					<standard>CIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<short>
-					<standard>EIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<short>
-					<standard>WIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Iran">
-				<short>
-					<standard>IRST</standard>
-					<daylight>IRDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Irkutsk">
-				<short>
-					<standard>IRKT</standard>
-					<daylight>IRKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<short>
-					<standard>IST (IL)</standard>
-					<daylight>IDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<short>
-					<standard>JST</standard>
-					<daylight>JDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<short>
-					<standard>PETT</standard>
-					<daylight>PETST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Karachi">
-				<short>
-					<standard>KART</standard>
-				</short>
-			</metazone>
-			<metazone type="Kashgar">
-				<short>
-					<standard>KAST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<short>
-					<standard>EKST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<short>
-					<standard>WKST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kizilorda">
-				<short>
-					<standard>KIZT</standard>
-					<daylight>KIZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Korea">
-				<short>
-					<standard>KST</standard>
-					<daylight>KDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kosrae">
-				<short>
-					<standard>KOST</standard>
-				</short>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<short>
-					<standard>KRAT</standard>
-					<daylight>KRAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<short>
-					<standard>KUYT</standard>
-					<daylight>KUYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kwajalein">
-				<short>
-					<standard>KWAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<short>
-					<standard>KGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Lanka">
-				<short>
-					<standard>LKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Line_Islands">
-				<short>
-					<standard>LINT</standard>
-				</short>
-			</metazone>
-			<metazone type="Long_Shu">
-				<short>
-					<standard>LONT</standard>
-				</short>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<short>
-					<standard>LHST</standard>
-					<daylight>LHDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<short>
-					<standard>MOT</standard>
-					<daylight>MOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Magadan">
-				<short>
-					<standard>MAGT</standard>
-					<daylight>MAGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Malaya">
-				<short>
-					<standard>MALT</standard>
-				</short>
-			</metazone>
-			<metazone type="Malaysia">
-				<short>
-					<standard>MYT</standard>
-				</short>
-			</metazone>
-			<metazone type="Maldives">
-				<short>
-					<standard>MVT</standard>
-				</short>
-			</metazone>
-			<metazone type="Marquesas">
-				<short>
-					<standard>MART</standard>
-				</short>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<short>
-					<standard>MHT</standard>
-				</short>
-			</metazone>
-			<metazone type="Mauritius">
-				<short>
-					<standard>MUT</standard>
-					<daylight>MUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Mawson">
-				<short>
-					<standard>MAWT</standard>
-				</short>
-			</metazone>
-			<metazone type="Mongolia">
-				<short>
-					<standard>ULAT</standard>
-					<daylight>ULAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Moscow">
-				<short>
-					<standard>MSK</standard>
-					<daylight>MSKS</daylight>
-				</short>
-			</metazone>
-			<metazone type="Myanmar">
-				<short>
-					<standard>MMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Nauru">
-				<short>
-					<standard>NRT</standard>
-				</short>
-			</metazone>
-			<metazone type="Nepal">
-				<short>
-					<standard>NPT</standard>
-				</short>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<short>
-					<standard>NCT</standard>
-					<daylight>NCST</daylight>
-				</short>
-			</metazone>
-			<metazone type="New_Zealand">
-				<short>
-					<standard>NZST</standard>
-					<daylight>NZDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<short>
-					<standard>NST</standard>
-					<daylight>NDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<short>
-					<standard>NUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Norfolk">
-				<short>
-					<standard>NFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Noronha">
-				<short>
-					<standard>FNT</standard>
-					<daylight>FNST</daylight>
-				</short>
-			</metazone>
-			<metazone type="North_Mariana">
-				<short>
-					<standard>MPT</standard>
-				</short>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<short>
-					<standard>NOVT</standard>
-					<daylight>NOVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Omsk">
-				<short>
-					<standard>OMST</standard>
-					<daylight>OMSST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Pakistan">
-				<short>
-					<standard>PKT</standard>
-					<daylight>PKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Palau">
-				<short>
-					<standard>PWT</standard>
-				</short>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<short>
-					<standard>PGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Paraguay">
-				<short>
-					<standard>PYT</standard>
-					<daylight>PYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Peru">
-				<short>
-					<standard>PET</standard>
-					<daylight>PEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Philippines">
-				<short>
-					<standard>PHT</standard>
-					<daylight>PHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<short>
-					<standard>PHOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<short>
-					<standard>PMST</standard>
-					<daylight>PMDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<short>
-					<standard>PNT</standard>
-				</short>
-			</metazone>
-			<metazone type="Ponape">
-				<short>
-					<standard>PONT</standard>
-				</short>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<short>
-					<standard>QYZT</standard>
-					<daylight>QYZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Reunion">
-				<short>
-					<standard>RET</standard>
-				</short>
-			</metazone>
-			<metazone type="Rothera">
-				<short>
-					<standard>ROTT</standard>
-				</short>
-			</metazone>
-			<metazone type="Sakhalin">
-				<short>
-					<standard>SAKT</standard>
-					<daylight>SAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samara">
-				<short>
-					<standard>SAMT</standard>
-					<daylight>SAMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (Samarkand)</standard>
-					<daylight>SAMST (Samarkand)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<short>
-					<standard>SST</standard>
-				</short>
-			</metazone>
-			<metazone type="Seychelles">
-				<short>
-					<standard>SCT</standard>
-				</short>
-			</metazone>
-			<metazone type="Shevchenko">
-				<short>
-					<standard>SHET</standard>
-					<daylight>SHEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Singapore">
-				<short>
-					<standard>SGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Solomon">
-				<short>
-					<standard>SBT</standard>
-				</short>
-			</metazone>
-			<metazone type="South_Georgia">
-				<short>
-					<standard>GST (GS)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<short>
-					<standard>SRT</standard>
-				</short>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<short>
-					<standard>SVET</standard>
-					<daylight>SVEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Syowa">
-				<short>
-					<standard>SYOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tahiti">
-				<short>
-					<standard>TAHT</standard>
-				</short>
-			</metazone>
-			<metazone type="Taipei">
-				<short>
-					<standard>CST (TW)</standard>
-					<daylight>CDT (TW)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tajikistan">
-				<short>
-					<standard>TJT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tashkent">
-				<short>
-					<standard>TAST</standard>
-					<daylight>TASST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tbilisi">
-				<short>
-					<standard>TBIT</standard>
-					<daylight>TBIST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tokelau">
-				<short>
-					<standard>TKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tonga">
-				<short>
-					<standard>TOT</standard>
-					<daylight>TOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Truk">
-				<short>
-					<standard>TRUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Turkey">
-				<short>
-					<standard>TRT</standard>
-					<daylight>TRST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<short>
-					<standard>TMT</standard>
-					<daylight>TMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tuvalu">
-				<short>
-					<standard>TVT</standard>
-				</short>
-			</metazone>
-			<metazone type="Uralsk">
-				<short>
-					<standard>URAT</standard>
-					<daylight>URAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Uruguay">
-				<short>
-					<standard>UYT</standard>
-					<daylight>UYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Urumqi">
-				<short>
-					<standard>URUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<short>
-					<standard>UZT</standard>
-					<daylight>UZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Vanuatu">
-				<short>
-					<standard>VUT</standard>
-					<daylight>VUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Venezuela">
-				<short>
-					<standard>VET</standard>
-				</short>
-			</metazone>
-			<metazone type="Vladivostok">
-				<short>
-					<standard>VLAT</standard>
-					<daylight>VLAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Volgograd">
-				<short>
-					<standard>VOLT</standard>
-					<daylight>VOLST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Vostok">
-				<short>
-					<standard>VOST</standard>
-				</short>
-			</metazone>
-			<metazone type="Wake">
-				<short>
-					<standard>WAKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Wallis">
-				<short>
-					<standard>WFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Yakutsk">
-				<short>
-					<standard>YAKT</standard>
-					<daylight>YAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<short>
-					<standard>YEKT</standard>
-					<daylight>YEKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yerevan">
-				<short>
-					<standard>YERT</standard>
-					<daylight>YERST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yukon">
-				<short>
-					<standard>YST</standard>
-					<daylight>YDT</daylight>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencySpacing>
-				<beforeCurrency>
-					<currencyMatch>[:letter:]</currencyMatch>
-					<surroundingMatch>[:digit:]</surroundingMatch>
-					<insertBetween> </insertBetween>
-				</beforeCurrency>
-				<afterCurrency>
-					<currencyMatch>[:letter:]</currencyMatch>
-					<surroundingMatch>[:digit:]</surroundingMatch>
-					<insertBetween> </insertBetween>
-				</afterCurrency>
-			</currencySpacing>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AFN">
-				<symbol>Af</symbol>
-			</currency>
-			<currency type="ANG">
-				<symbol>NAf.</symbol>
-			</currency>
-			<currency type="AOA">
-				<symbol>Kz</symbol>
-			</currency>
-			<currency type="ARA">
-				<symbol>₳</symbol>
-			</currency>
-			<currency type="ARL">
-				<symbol>$L</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>m$n</symbol>
-			</currency>
-			<currency type="ARS">
-				<symbol>AR$</symbol>
-			</currency>
-			<currency type="AUD">
-				<symbol>AU$</symbol>
-			</currency>
-			<currency type="AWG">
-				<symbol>Afl.</symbol>
-			</currency>
-			<currency type="AZN">
-				<symbol>man.</symbol>
-			</currency>
-			<currency type="BAM">
-				<symbol>KM</symbol>
-			</currency>
-			<currency type="BBD">
-				<symbol>Bds$</symbol>
-			</currency>
-			<currency type="BDT">
-				<symbol>Tk</symbol>
-			</currency>
-			<currency type="BEF">
-				<symbol>BF</symbol>
-			</currency>
-			<currency type="BHD">
-				<symbol>BD</symbol>
-			</currency>
-			<currency type="BIF">
-				<symbol>FBu</symbol>
-			</currency>
-			<currency type="BMD">
-				<symbol>BD$</symbol>
-			</currency>
-			<currency type="BND">
-				<symbol>BN$</symbol>
-			</currency>
-			<currency type="BOB">
-				<symbol>Bs</symbol>
-			</currency>
-			<currency type="BOP">
-				<symbol>$b.</symbol>
-			</currency>
-			<currency type="BRL">
-				<symbol>R$</symbol>
-			</currency>
-			<currency type="BSD">
-				<symbol>BS$</symbol>
-			</currency>
-			<currency type="BTN">
-				<symbol>Nu.</symbol>
-			</currency>
-			<currency type="BWP">
-				<symbol>BWP</symbol>
-			</currency>
-			<currency type="BZD">
-				<symbol>BZ$</symbol>
-			</currency>
-			<currency type="CAD">
-				<symbol>CA$</symbol>
-			</currency>
-			<currency type="CDF">
-				<symbol>CDF</symbol>
-			</currency>
-			<currency type="CHF">
-				<symbol>Fr.</symbol>
-			</currency>
-			<currency type="CLE">
-				<symbol>Eº</symbol>
-			</currency>
-			<currency type="CLP">
-				<symbol>CL$</symbol>
-			</currency>
-			<currency type="CNY">
-				<symbol>CNÂ¥</symbol>
-			</currency>
-			<currency type="COP">
-				<symbol>CO$</symbol>
-			</currency>
-			<currency type="CRC">
-				<symbol>â‚¡</symbol>
-			</currency>
-			<currency type="CUC">
-				<symbol>CUC$</symbol>
-			</currency>
-			<currency type="CUP">
-				<symbol>CU$</symbol>
-			</currency>
-			<currency type="CVE">
-				<symbol>CV$</symbol>
-			</currency>
-			<currency type="CYP">
-				<symbol>CY£</symbol>
-			</currency>
-			<currency type="CZK">
-				<symbol>K�</symbol>
-			</currency>
-			<currency type="DEM">
-				<symbol>DM</symbol>
-			</currency>
-			<currency type="DJF">
-				<symbol>Fdj</symbol>
-			</currency>
-			<currency type="DKK">
-				<symbol>Dkr</symbol>
-			</currency>
-			<currency type="DOP">
-				<symbol>RD$</symbol>
-			</currency>
-			<currency type="DZD">
-				<symbol>DA</symbol>
-			</currency>
-			<currency type="EEK">
-				<symbol>Ekr</symbol>
-			</currency>
-			<currency type="EGP">
-				<symbol>EG£</symbol>
-			</currency>
-			<currency type="ERN">
-				<symbol>Nfk</symbol>
-			</currency>
-			<currency type="ESP">
-				<symbol>Pts</symbol>
-			</currency>
-			<currency type="ETB">
-				<symbol>Br</symbol>
-			</currency>
-			<currency type="EUR">
-				<symbol>€</symbol>
-			</currency>
-			<currency type="FIM">
-				<symbol>mk</symbol>
-			</currency>
-			<currency type="FJD">
-				<symbol>FJ$</symbol>
-			</currency>
-			<currency type="FKP">
-				<symbol>FK£</symbol>
-			</currency>
-			<currency type="FRF">
-				<symbol>â‚£</symbol>
-			</currency>
-			<currency type="GBP">
-				<symbol>£</symbol>
-			</currency>
-			<currency type="GHC">
-				<symbol>₵</symbol>
-			</currency>
-			<currency type="GHS">
-				<symbol>GH₵</symbol>
-			</currency>
-			<currency type="GIP">
-				<symbol>GI£</symbol>
-			</currency>
-			<currency type="GMD">
-				<symbol>GMD</symbol>
-			</currency>
-			<currency type="GNF">
-				<symbol>FG</symbol>
-			</currency>
-			<currency type="GRD">
-				<symbol>₯</symbol>
-			</currency>
-			<currency type="GTQ">
-				<symbol>GTQ</symbol>
-			</currency>
-			<currency type="GYD">
-				<symbol>GY$</symbol>
-			</currency>
-			<currency type="HKD">
-				<symbol>HK$</symbol>
-			</currency>
-			<currency type="HNL">
-				<symbol>HNL</symbol>
-			</currency>
-			<currency type="HRK">
-				<symbol>kn</symbol>
-			</currency>
-			<currency type="HTG">
-				<symbol>HTG</symbol>
-			</currency>
-			<currency type="HUF">
-				<symbol>Ft</symbol>
-			</currency>
-			<currency type="IDR">
-				<symbol>Rp</symbol>
-			</currency>
-			<currency type="IEP">
-				<symbol>IR£</symbol>
-			</currency>
-			<currency type="ILP">
-				<symbol>I£</symbol>
-			</currency>
-			<currency type="ILS">
-				<symbol>₪</symbol>
-			</currency>
-			<currency type="INR">
-				<symbol>Rs</symbol>
-			</currency>
-			<currency type="ISK">
-				<symbol>Ikr</symbol>
-			</currency>
-			<currency type="ITL">
-				<symbol>IT₤</symbol>
-			</currency>
-			<currency type="JMD">
-				<symbol>J$</symbol>
-			</currency>
-			<currency type="JOD">
-				<symbol>JD</symbol>
-			</currency>
-			<currency type="JPY">
-				<symbol>JPÂ¥</symbol>
-			</currency>
-			<currency type="KES">
-				<symbol>Ksh</symbol>
-			</currency>
-			<currency type="KMF">
-				<symbol>CF</symbol>
-			</currency>
-			<currency type="KRW">
-				<symbol>â‚©</symbol>
-			</currency>
-			<currency type="KWD">
-				<symbol>KD</symbol>
-			</currency>
-			<currency type="KYD">
-				<symbol>KY$</symbol>
-			</currency>
-			<currency type="LAK">
-				<symbol>â‚­</symbol>
-			</currency>
-			<currency type="LBP">
-				<symbol>LB£</symbol>
-			</currency>
-			<currency type="LKR">
-				<symbol>SLRs</symbol>
-			</currency>
-			<currency type="LRD">
-				<symbol>L$</symbol>
-			</currency>
-			<currency type="LSL">
-				<symbol>LSL</symbol>
-			</currency>
-			<currency type="LTL">
-				<symbol>Lt</symbol>
-			</currency>
-			<currency type="LVL">
-				<symbol>Ls</symbol>
-			</currency>
-			<currency type="LYD">
-				<symbol>LD</symbol>
-			</currency>
-			<currency type="MMK">
-				<symbol>MMK</symbol>
-			</currency>
-			<currency type="MNT">
-				<symbol>â‚®</symbol>
-			</currency>
-			<currency type="MOP">
-				<symbol>MOP$</symbol>
-			</currency>
-			<currency type="MRO">
-				<symbol>UM</symbol>
-			</currency>
-			<currency type="MTL">
-				<symbol>Lm</symbol>
-			</currency>
-			<currency type="MTP">
-				<symbol>MT£</symbol>
-			</currency>
-			<currency type="MUR">
-				<symbol>MURs</symbol>
-			</currency>
-			<currency type="MXP">
-				<symbol>MX$</symbol>
-			</currency>
-			<currency type="MYR">
-				<symbol>RM</symbol>
-			</currency>
-			<currency type="MZM">
-				<symbol>Mt</symbol>
-			</currency>
-			<currency type="MZN">
-				<symbol>MTn</symbol>
-			</currency>
-			<currency type="NAD">
-				<symbol>N$</symbol>
-			</currency>
-			<currency type="NGN">
-				<symbol>₦</symbol>
-			</currency>
-			<currency type="NIO">
-				<symbol>C$</symbol>
-			</currency>
-			<currency type="NLG">
-				<symbol>fl</symbol>
-			</currency>
-			<currency type="NOK">
-				<symbol>Nkr</symbol>
-			</currency>
-			<currency type="NPR">
-				<symbol>NPRs</symbol>
-			</currency>
-			<currency type="NZD">
-				<symbol>NZ$</symbol>
-			</currency>
-			<currency type="PAB">
-				<symbol>B/.</symbol>
-			</currency>
-			<currency type="PEI">
-				<symbol>I/.</symbol>
-			</currency>
-			<currency type="PEN">
-				<symbol>S/.</symbol>
-			</currency>
-			<currency type="PGK">
-				<symbol>PGK</symbol>
-			</currency>
-			<currency type="PHP">
-				<symbol>₱</symbol>
-			</currency>
-			<currency type="PKR">
-				<symbol>PKRs</symbol>
-			</currency>
-			<currency type="PLN">
-				<symbol>zł</symbol>
-			</currency>
-			<currency type="PTE">
-				<symbol>Esc</symbol>
-			</currency>
-			<currency type="PYG">
-				<symbol>₲</symbol>
-			</currency>
-			<currency type="QAR">
-				<symbol>QR</symbol>
-			</currency>
-			<currency type="RHD">
-				<symbol>RH$</symbol>
-			</currency>
-			<currency type="RON">
-				<symbol>RON</symbol>
-			</currency>
-			<currency type="RSD">
-				<symbol>din.</symbol>
-			</currency>
-			<currency type="SAR">
-				<symbol>SR</symbol>
-			</currency>
-			<currency type="SBD">
-				<symbol>SI$</symbol>
-			</currency>
-			<currency type="SCR">
-				<symbol>SRe</symbol>
-			</currency>
-			<currency type="SDD">
-				<symbol>LSd</symbol>
-			</currency>
-			<currency type="SEK">
-				<symbol>Skr</symbol>
-			</currency>
-			<currency type="SGD">
-				<symbol>S$</symbol>
-			</currency>
-			<currency type="SHP">
-				<symbol>SH£</symbol>
-			</currency>
-			<currency type="SKK">
-				<symbol>Sk</symbol>
-			</currency>
-			<currency type="SLL">
-				<symbol>Le</symbol>
-			</currency>
-			<currency type="SOS">
-				<symbol>Ssh</symbol>
-			</currency>
-			<currency type="SRD">
-				<symbol>SR$</symbol>
-			</currency>
-			<currency type="SRG">
-				<symbol>Sf</symbol>
-			</currency>
-			<currency type="STD">
-				<symbol>Db</symbol>
-			</currency>
-			<currency type="SVC">
-				<symbol>SVâ‚¡</symbol>
-			</currency>
-			<currency type="SYP">
-				<symbol>SY£</symbol>
-			</currency>
-			<currency type="SZL">
-				<symbol>SZL</symbol>
-			</currency>
-			<currency type="THB">
-				<symbol>฿</symbol>
-			</currency>
-			<currency type="TMM">
-				<symbol>TMM</symbol>
-			</currency>
-			<currency type="TND">
-				<symbol>DT</symbol>
-			</currency>
-			<currency type="TOP">
-				<symbol>T$</symbol>
-			</currency>
-			<currency type="TRL">
-				<symbol>TRL</symbol>
-			</currency>
-			<currency type="TRY">
-				<symbol>TL</symbol>
-			</currency>
-			<currency type="TTD">
-				<symbol>TT$</symbol>
-			</currency>
-			<currency type="TWD">
-				<symbol>NT$</symbol>
-			</currency>
-			<currency type="TZS">
-				<symbol>TSh</symbol>
-			</currency>
-			<currency type="UAH">
-				<symbol>â‚´</symbol>
-			</currency>
-			<currency type="UGX">
-				<symbol>USh</symbol>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-			<currency type="UYU">
-				<symbol>$U</symbol>
-			</currency>
-			<currency type="VEF">
-				<symbol>Bs.F.</symbol>
-			</currency>
-			<currency type="VND">
-				<symbol>â‚«</symbol>
-			</currency>
-			<currency type="VUV">
-				<symbol>VT</symbol>
-			</currency>
-			<currency type="WST">
-				<symbol>WS$</symbol>
-			</currency>
-			<currency type="XAF">
-				<symbol>FCFA</symbol>
-			</currency>
-			<currency type="XCD">
-				<symbol>EC$</symbol>
-			</currency>
-			<currency type="XOF">
-				<symbol>CFA</symbol>
-			</currency>
-			<currency type="XPF">
-				<symbol>CFPF</symbol>
-			</currency>
-			<currency type="YER">
-				<symbol>YR</symbol>
-			</currency>
-			<currency type="ZAR">
-				<symbol>R</symbol>
-			</currency>
-			<currency type="ZMK">
-				<symbol>ZK</symbol>
-			</currency>
-			<currency type="ZRN">
-				<symbol>NZ</symbol>
-			</currency>
-			<currency type="ZRZ">
-				<symbol>ZRZ</symbol>
-			</currency>
-			<currency type="ZWD">
-				<symbol>Z$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} d</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} h</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} min</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} m</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} s</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} w</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} y</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ru.xml b/airtime_mvc/library/Zend/Locale/Data/ru.xml
deleted file mode 100644
index 0cdba4886..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ru.xml
+++ /dev/null
@@ -1,3949 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.144 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="ru"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">афар</language>
-			<language type="ab">абхаз�кий</language>
-			<language type="ace">ачех�кий</language>
-			<language type="ach">ачоли</language>
-			<language type="ada">адангме</language>
-			<language type="ady">адыгей�кий</language>
-			<language type="ae">аве�тий�кий</language>
-			<language type="af">африкаан�</language>
-			<language type="afa">афразий�кий �зык</language>
-			<language type="afh">африхили</language>
-			<language type="ain">айну</language>
-			<language type="ak">акан</language>
-			<language type="akk">аккад�кий</language>
-			<language type="ale">алеут�кий</language>
-			<language type="alg">алгонкин�кие �зыки</language>
-			<language type="alt">южноалтай�кий</language>
-			<language type="am">амхар�кий</language>
-			<language type="an">арагон�кий</language>
-			<language type="ang">�тароанглий�кий</language>
-			<language type="anp">ангика</language>
-			<language type="apa">апач�кие �зыки</language>
-			<language type="ar">араб�кий</language>
-			<language type="arc">арамей�кий</language>
-			<language type="arn">араукан�кий</language>
-			<language type="arp">арапахо</language>
-			<language type="art">и�ку��твенный �зык</language>
-			<language type="arw">аравак�кий</language>
-			<language type="as">а��ам�кий</language>
-			<language type="ast">а�турий�кий</language>
-			<language type="ath">атапач�кие �зыки</language>
-			<language type="aus">ав�тралий�кий �зык</language>
-			<language type="av">авар�кий</language>
-			<language type="awa">авадхи</language>
-			<language type="ay">аймара</language>
-			<language type="az">азербайджан�кий</language>
-			<language type="ba">башкир�кий</language>
-			<language type="bad">банда</language>
-			<language type="bai">бамилеке �зыки</language>
-			<language type="bal">белудж�кий</language>
-			<language type="ban">балий�кий</language>
-			<language type="bas">ба�а</language>
-			<language type="bat">балтий�кий �зык</language>
-			<language type="be">белору��кий</language>
-			<language type="bej">беджа</language>
-			<language type="bem">бемба</language>
-			<language type="ber">бербер�кий</language>
-			<language type="bg">болгар�кий</language>
-			<language type="bh">бихари</language>
-			<language type="bho">бходжпури</language>
-			<language type="bi">би�лама</language>
-			<language type="bik">биколь�кий</language>
-			<language type="bin">бини</language>
-			<language type="bla">�ик�ика</language>
-			<language type="bm">бамбарий�кий</language>
-			<language type="bn">бенгаль�кий</language>
-			<language type="bnt">банту</language>
-			<language type="bo">тибет�кий</language>
-			<language type="br">бретон�кий</language>
-			<language type="bra">брауи</language>
-			<language type="bs">бо�ний�кий</language>
-			<language type="btk">батак�кий</language>
-			<language type="bua">бур�т�кий</language>
-			<language type="bug">бугий�кий</language>
-			<language type="byn">билин (блин)</language>
-			<language type="ca">каталан�кий</language>
-			<language type="cad">каддо</language>
-			<language type="cai">�зык индейцев Центральной �мерики</language>
-			<language type="car">кариб</language>
-			<language type="cau">кавказ�кий �зык</language>
-			<language type="cch">ат�ам</language>
-			<language type="ce">чечен�кий</language>
-			<language type="ceb">кебуано</language>
-			<language type="cel">кельт�кие другие</language>
-			<language type="ch">чаморро</language>
-			<language type="chb">чибча</language>
-			<language type="chg">чагатай�кий</language>
-			<language type="chk">чукот�кий</language>
-			<language type="chm">марий�кий (череми��кий)</language>
-			<language type="chn">чинук жаргон</language>
-			<language type="cho">чоктав</language>
-			<language type="chp">чипевай�н</language>
-			<language type="chr">чероки</language>
-			<language type="chy">чейенн</language>
-			<language type="cmc">чам�кий �зык</language>
-			<language type="co">кор�икан�кий</language>
-			<language type="cop">копт�кий</language>
-			<language type="cpe">англо-креоль�кие и пиджин</language>
-			<language type="cpf">франко-креоль�кие и пиджины</language>
-			<language type="cpp">португало-креоль�кие и пиджины</language>
-			<language type="cr">криий�кий</language>
-			<language type="crh">крым�ко-татар�кий</language>
-			<language type="crp">креоль�кие и пиджины</language>
-			<language type="cs">чеш�кий</language>
-			<language type="csb">кашубиан�кий</language>
-			<language type="cu">церковно�лав�н�кий</language>
-			<language type="cus">кушит�кий �зык</language>
-			<language type="cv">чуваш�кий</language>
-			<language type="cy">валлий�кий</language>
-			<language type="da">дат�кий</language>
-			<language type="dak">дакота</language>
-			<language type="dar">даргва</language>
-			<language type="day">да�к</language>
-			<language type="de">немецкий</language>
-			<language type="de_AT">ав�трий�кий немецкий</language>
-			<language type="de_CH">Швейцар�кий верхненемецкий</language>
-			<language type="del">делавар�кий</language>
-			<language type="den">�лав�н�кий</language>
-			<language type="dgr">догриб</language>
-			<language type="din">динка</language>
-			<language type="doi">догри</language>
-			<language type="dra">дравидий�кий �зык</language>
-			<language type="dsb">нижнелужицкий</language>
-			<language type="dua">дуала</language>
-			<language type="dum">�редненидерланд�кий</language>
-			<language type="dv">мальдив�кий</language>
-			<language type="dyu">диула (дьюла)</language>
-			<language type="dz">дзонг-к�</language>
-			<language type="ee">�ве</language>
-			<language type="efi">�фик</language>
-			<language type="egy">древнеегипет�кий</language>
-			<language type="eka">�каджук</language>
-			<language type="el">грече�кий</language>
-			<language type="elx">�лам�кий</language>
-			<language type="en">англий�кий</language>
-			<language type="en_AU">ав�тралий�кий англий�кий</language>
-			<language type="en_CA">Канад�кий англий�кий</language>
-			<language type="en_GB">британ�кий англий�кий</language>
-			<language type="en_US">американ�кий англий�кий</language>
-			<language type="enm">�реднеанглий�кий</language>
-			<language type="eo">��перанто</language>
-			<language type="es">и�пан�кий</language>
-			<language type="es_419">Латино-американ�кий и�пан�кий</language>
-			<language type="es_ES">И�пан�кий иберий�кий</language>
-			<language type="et">��тон�кий</language>
-			<language type="eu">ба�к�кий</language>
-			<language type="ewo">�вондо</language>
-			<language type="fa">пер�ид�кий</language>
-			<language type="fan">фанг</language>
-			<language type="fat">фанти</language>
-			<language type="ff">фулах</language>
-			<language type="fi">фин�кий</language>
-			<language type="fil">филиппин�кий</language>
-			<language type="fiu">финно-угор�кий �зык</language>
-			<language type="fj">фиджи</language>
-			<language type="fo">фарер�кий</language>
-			<language type="fon">фон</language>
-			<language type="fr">француз�кий</language>
-			<language type="fr_CA">Канад�кий француз�кий</language>
-			<language type="fr_CH">Швейцар�кий француз�кий</language>
-			<language type="frm">�реднефранцуз�кий</language>
-			<language type="fro">�тарофранцуз�кий</language>
-			<language type="frr">фриз�кий �еверный</language>
-			<language type="frs">во�точный фриз�кий</language>
-			<language type="fur">фриуль�кий</language>
-			<language type="fy">фриз�кий</language>
-			<language type="ga">ирланд�кий</language>
-			<language type="gaa">га</language>
-			<language type="gay">гайо</language>
-			<language type="gba">гба�</language>
-			<language type="gd">г�ль�кий</language>
-			<language type="gem">герман�кий �зык</language>
-			<language type="gez">ге�з</language>
-			<language type="gil">гильберт�кий</language>
-			<language type="gl">гали�ий�кий</language>
-			<language type="gmh">�редневерхненемецкий</language>
-			<language type="gn">гуарани</language>
-			<language type="goh">древневерхненемецкий</language>
-			<language type="gon">гонди</language>
-			<language type="gor">горонтало</language>
-			<language type="got">гот�кий</language>
-			<language type="grb">гребо</language>
-			<language type="grc">древнегрече�кий</language>
-			<language type="gsw">Швейцар�кий немецкий</language>
-			<language type="gu">гуджарати</language>
-			<language type="gv">м�н�кий</language>
-			<language type="gwi">гвичин</language>
-			<language type="ha">хау�а</language>
-			<language type="hai">хайда</language>
-			<language type="haw">гавай�кий</language>
-			<language type="he">иврит</language>
-			<language type="hi">хинди</language>
-			<language type="hil">хилигайнон</language>
-			<language type="him">химачали</language>
-			<language type="hit">хетт�кий</language>
-			<language type="hmn">хмонг</language>
-			<language type="ho">хиримоту</language>
-			<language type="hr">хорват�кий</language>
-			<language type="hsb">верхнелужицкий</language>
-			<language type="ht">гаит�н�кий</language>
-			<language type="hu">венгер�кий</language>
-			<language type="hup">хупа</language>
-			<language type="hy">арм�н�кий</language>
-			<language type="hz">гереро</language>
-			<language type="ia">интерлингва</language>
-			<language type="iba">ибан�кий</language>
-			<language type="id">индонезий�кий</language>
-			<language type="ie">интерлингве</language>
-			<language type="ig">игбо</language>
-			<language type="ii">�ычуань</language>
-			<language type="ijo">иджо</language>
-			<language type="ik">инупиак</language>
-			<language type="ilo">илоко</language>
-			<language type="inc">индий�кий �зык</language>
-			<language type="ine">индоевропей�кий �зык</language>
-			<language type="inh">ингуш�кий</language>
-			<language type="io">идо</language>
-			<language type="ira">иран�кий �зык</language>
-			<language type="iro">ирокез�кие �зыки</language>
-			<language type="is">и�ланд�кий</language>
-			<language type="it">италь�н�кий</language>
-			<language type="iu">инуктитут</language>
-			<language type="ja">�пон�кий</language>
-			<language type="jbo">ложбан</language>
-			<language type="jpr">еврей�ко-пер�ид�кий</language>
-			<language type="jrb">еврей�ко-араб�кий</language>
-			<language type="jv">�ван�кий</language>
-			<language type="ka">грузин�кий</language>
-			<language type="kaa">каракалпак�кий</language>
-			<language type="kab">кабиль�кий</language>
-			<language type="kac">качин�кий</language>
-			<language type="kaj">каджи</language>
-			<language type="kam">камба</language>
-			<language type="kar">карен�кий</language>
-			<language type="kaw">кави</language>
-			<language type="kbd">кабардин�кий</language>
-			<language type="kcg">ть�п</language>
-			<language type="kfo">коро</language>
-			<language type="kg">конго</language>
-			<language type="kha">кха�и</language>
-			<language type="khi">кой�ан�кий �зык</language>
-			<language type="kho">хотан�кий</language>
-			<language type="ki">кикуйю</language>
-			<language type="kj">кунама</language>
-			<language type="kk">казах�кий</language>
-			<language type="kl">��кимо��кий (гренланд�кий)</language>
-			<language type="km">кхмер�кий</language>
-			<language type="kmb">кимбундий�кий</language>
-			<language type="kn">каннада</language>
-			<language type="ko">корей�кий</language>
-			<language type="kok">конкани</language>
-			<language type="kos">ко�раен�кий</language>
-			<language type="kpe">кпелле</language>
-			<language type="kr">канури</language>
-			<language type="krc">карачаево-балкар�кий</language>
-			<language type="krl">карель�кий</language>
-			<language type="kro">кру</language>
-			<language type="kru">курух</language>
-			<language type="ks">кашмири</language>
-			<language type="ku">курд�кий</language>
-			<language type="kum">кумык�кий</language>
-			<language type="kut">кутенаи</language>
-			<language type="kv">коми</language>
-			<language type="kw">корний�кий</language>
-			<language type="ky">киргиз�кий</language>
-			<language type="la">латин�кий</language>
-			<language type="lad">ладино</language>
-			<language type="lah">лахнда</language>
-			<language type="lam">ламба</language>
-			<language type="lb">люк�ембург�кий</language>
-			<language type="lez">лезгин�кий</language>
-			<language type="lg">ганда</language>
-			<language type="li">лимбург�кий</language>
-			<language type="ln">лингала</language>
-			<language type="lo">лао��кий</language>
-			<language type="lol">монго</language>
-			<language type="loz">лози</language>
-			<language type="lt">литов�кий</language>
-			<language type="lu">луба-катанга</language>
-			<language type="lua">луба-лулуа</language>
-			<language type="lui">луи�еньо</language>
-			<language type="lun">лунда</language>
-			<language type="luo">луо (Кени� и Танзани�)</language>
-			<language type="lus">лушай</language>
-			<language type="lv">латыш�кий</language>
-			<language type="mad">мадур�кий</language>
-			<language type="mag">магахи</language>
-			<language type="mai">майтхили</language>
-			<language type="mak">мака��ар�кий</language>
-			<language type="man">мандинго</language>
-			<language type="map">ав�тронезий�кий</language>
-			<language type="mas">ма�аи</language>
-			<language type="mdf">мокшан�кий</language>
-			<language type="mdr">мандар�кий</language>
-			<language type="men">менде</language>
-			<language type="mg">малага�ий�кий</language>
-			<language type="mga">�реднеирланд�кий</language>
-			<language type="mh">маршалль�кий</language>
-			<language type="mi">маори</language>
-			<language type="mic">микмак</language>
-			<language type="min">минангкабау</language>
-			<language type="mis">�мешанные �зыки</language>
-			<language type="mk">македон�кий</language>
-			<language type="mkh">монкхмер�кий �зык</language>
-			<language type="ml">мала�лам</language>
-			<language type="mn">монголь�кий</language>
-			<language type="mnc">маньчжур�кий</language>
-			<language type="mni">манипур�кий</language>
-			<language type="mno">манобо �зыки</language>
-			<language type="mo">молдав�кий</language>
-			<language type="moh">мохаук</language>
-			<language type="mos">мо�и</language>
-			<language type="mr">маратхи</language>
-			<language type="ms">малай�кий</language>
-			<language type="mt">мальтий�кий</language>
-			<language type="mul">не�колько �зыков</language>
-			<language type="mun">мунда �зыки</language>
-			<language type="mus">крик</language>
-			<language type="mwl">мирандий�кий</language>
-			<language type="mwr">марвари</language>
-			<language type="my">бирман�кий</language>
-			<language type="myn">май� �зыки</language>
-			<language type="myv">�рз�</language>
-			<language type="na">науру</language>
-			<language type="nah">ацтек�кий</language>
-			<language type="nai">�зык индейцев Северной �мерики</language>
-			<language type="nap">неаполитан�кий</language>
-			<language type="nb">норвеж�кий букмол</language>
-			<language type="nd">ндебели (�еверный)</language>
-			<language type="nds">нижнегерман�кий</language>
-			<language type="ne">непаль�кий</language>
-			<language type="new">невар�кий</language>
-			<language type="ng">ндонга</language>
-			<language type="nia">ниа�</language>
-			<language type="nic">нигер-кордофан�кий �зык</language>
-			<language type="niu">ниу�</language>
-			<language type="nl">голланд�кий</language>
-			<language type="nl_BE">Бельгий�кий фламанд�кий</language>
-			<language type="nn">норвеж�кий нюнор�к</language>
-			<language type="no">норвеж�кий</language>
-			<language type="nog">ногай�кий</language>
-			<language type="non">�таронорвеж�кий</language>
-			<language type="nqo">нко</language>
-			<language type="nr">ндебели южный</language>
-			<language type="nso">�ото �еверный</language>
-			<language type="nub">нубий�кие �зыки</language>
-			<language type="nv">навахо</language>
-			<language type="nwc">невари (кла��иче�кий)</language>
-			<language type="ny">нь�нджа</language>
-			<language type="nym">нь�мвези</language>
-			<language type="nyn">нь�нколе</language>
-			<language type="nyo">ньоро</language>
-			<language type="nzi">нзима</language>
-			<language type="oc">ок�итан�кий</language>
-			<language type="oj">оджибва</language>
-			<language type="om">оромо</language>
-			<language type="or">ори�</language>
-			<language type="os">о�етин�кий</language>
-			<language type="osa">о�еджи</language>
-			<language type="ota">�таротурецкий</language>
-			<language type="oto">отоманг�кие �зыки</language>
-			<language type="pa">панджаби (пенджаби)</language>
-			<language type="paa">папуа��кий �зык</language>
-			<language type="pag">панга�инан</language>
-			<language type="pal">пехлевий�кий</language>
-			<language type="pam">пампанга</language>
-			<language type="pap">папь�менто</language>
-			<language type="pau">палау</language>
-			<language type="peo">�таропер�ид�кий</language>
-			<language type="phi">филиппин�кий �зык</language>
-			<language type="phn">финикий�кий</language>
-			<language type="pi">пали</language>
-			<language type="pl">поль�кий</language>
-			<language type="pon">понапе</language>
-			<language type="pra">пракриты �зыки</language>
-			<language type="pro">�таропрован�аль�кий</language>
-			<language type="ps">пашто (пушту)</language>
-			<language type="pt">португаль�кий</language>
-			<language type="pt_BR">бразиль�кий португаль�кий</language>
-			<language type="pt_PT">Португаль�кий иберий�кий</language>
-			<language type="qu">кечуа</language>
-			<language type="raj">раджа�тхани</language>
-			<language type="rap">рапануи</language>
-			<language type="rar">раротонган�кий</language>
-			<language type="rm">ретороман�кий</language>
-			<language type="rn">рунди</language>
-			<language type="ro">румын�кий</language>
-			<language type="roa">роман�кий �зык</language>
-			<language type="rom">цыган�кий</language>
-			<language type="root">корневой �зык</language>
-			<language type="ru">ру��кий</language>
-			<language type="rup">арумын�кий</language>
-			<language type="rw">кинь�руанда</language>
-			<language type="sa">�ан�крит</language>
-			<language type="sad">�андаве</language>
-			<language type="sah">�кут�кий</language>
-			<language type="sai">�зык индейцев Южной �мерики</language>
-			<language type="sal">�алиш�кие �зыки</language>
-			<language type="sam">�амарит�н�кий арамей�кий</language>
-			<language type="sas">�а�аки</language>
-			<language type="sat">�антали</language>
-			<language type="sc">�ардин�кий</language>
-			<language type="scn">�ицилий�кий</language>
-			<language type="sco">шотланд�кий</language>
-			<language type="sd">�индхи</language>
-			<language type="se">�аам�кий (�еверный)</language>
-			<language type="sel">�елькуп�кий</language>
-			<language type="sem">�емит�кий �зык</language>
-			<language type="sg">�анго</language>
-			<language type="sga">�тароирланд�кий</language>
-			<language type="sgn">�зык глухонемых</language>
-			<language type="sh">�ерб�кохорват�кий</language>
-			<language type="shn">шан�кий</language>
-			<language type="si">�ингаль�кий</language>
-			<language type="sid">�идама</language>
-			<language type="sio">�иу �зыки</language>
-			<language type="sit">�инотибет�кий �зык</language>
-			<language type="sk">�ловацкий</language>
-			<language type="sl">�ловен�кий</language>
-			<language type="sla">�лав�н�кий �зык</language>
-			<language type="sm">�амоан�кий</language>
-			<language type="sma">�аам�кий (южный)</language>
-			<language type="smi">�аам�кие �зыки</language>
-			<language type="smj">луле-�аам�кий</language>
-			<language type="smn">инари-�аам�кий</language>
-			<language type="sms">�кольт-�аам�кий</language>
-			<language type="sn">шона</language>
-			<language type="snk">�онинке</language>
-			<language type="so">�омали</language>
-			<language type="sog">�огдий�кий</language>
-			<language type="son">cонгаи</language>
-			<language type="sq">албан�кий</language>
-			<language type="sr">�ерб�кий</language>
-			<language type="srn">�ранан тонго</language>
-			<language type="srr">�ерер</language>
-			<language type="ss">�вази</language>
-			<language type="ssa">нило-�ахар�кий �зык</language>
-			<language type="st">�ото южный</language>
-			<language type="su">�ундан�кий</language>
-			<language type="suk">�укума</language>
-			<language type="sus">�у�у</language>
-			<language type="sux">шумер�кий</language>
-			<language type="sv">швед�кий</language>
-			<language type="sw">�уахили</language>
-			<language type="syc">кла��иче�кий �ирий�кий</language>
-			<language type="syr">�ирий�кий</language>
-			<language type="ta">тамиль�кий</language>
-			<language type="tai">тай�кий �зык</language>
-			<language type="te">телугу</language>
-			<language type="tem">темне</language>
-			<language type="ter">терено</language>
-			<language type="tet">тетум</language>
-			<language type="tg">таджик�кий</language>
-			<language type="th">тай�кий</language>
-			<language type="ti">тигринь�</language>
-			<language type="tig">тигре</language>
-			<language type="tiv">тиви</language>
-			<language type="tk">туркмен�кий</language>
-			<language type="tkl">токелай�кий</language>
-			<language type="tl">тагалог</language>
-			<language type="tlh">клингон�кий</language>
-			<language type="tli">тлингит</language>
-			<language type="tmh">тамашек</language>
-			<language type="tn">т�вана</language>
-			<language type="to">тонга</language>
-			<language type="tog">нь��а (тонга)</language>
-			<language type="tpi">ток-пи�ин</language>
-			<language type="tr">турецкий</language>
-			<language type="ts">т�онга</language>
-			<language type="tsi">цимшиан</language>
-			<language type="tt">татар�кий</language>
-			<language type="tum">тумбука</language>
-			<language type="tup">тупи</language>
-			<language type="tut">алтай�кий �зык</language>
-			<language type="tvl">тувалу</language>
-			<language type="tw">тви</language>
-			<language type="ty">таит�н�кий</language>
-			<language type="tyv">тувин�кий</language>
-			<language type="udm">удмурт�кий</language>
-			<language type="ug">уйгур�кий</language>
-			<language type="uga">угарит�кий</language>
-			<language type="uk">украин�кий</language>
-			<language type="umb">умбунду</language>
-			<language type="und">неизве�тный или недей�твительный �зык</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбек�кий</language>
-			<language type="vai">ваи</language>
-			<language type="ve">венда</language>
-			<language type="vi">вьетнам�кий</language>
-			<language type="vo">волапюк</language>
-			<language type="vot">вод�кий</language>
-			<language type="wa">валлон�кий</language>
-			<language type="wak">вакаш�кие �зыки</language>
-			<language type="wal">воламо</language>
-			<language type="war">варай</language>
-			<language type="was">вашо</language>
-			<language type="wen">лужицкие �зыки</language>
-			<language type="wo">волоф</language>
-			<language type="xal">калмыцкий</language>
-			<language type="xh">к�оза</language>
-			<language type="yao">�о</language>
-			<language type="yap">�п</language>
-			<language type="yi">идиш</language>
-			<language type="yo">йоруба</language>
-			<language type="ypk">юпик�кий �зык</language>
-			<language type="za">чжуань</language>
-			<language type="zap">�апотек�кий</language>
-			<language type="zbl">бли��имволика</language>
-			<language type="zen">зенаг�кий</language>
-			<language type="zh">китай�кий</language>
-			<language type="zh_Hans">упрощенный китай�кий</language>
-			<language type="zh_Hant">Традиционный китай�кий</language>
-			<language type="znd">занде</language>
-			<language type="zu">зулу</language>
-			<language type="zun">зуньи</language>
-			<language type="zxx">без �зыкового �одержани�</language>
-			<language type="zza">заза</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�раб�ка�</script>
-			<script type="Armi">�рамей�ка�</script>
-			<script type="Armn">�рм�н�ка�</script>
-			<script type="Avst">�ве�тий�ка�</script>
-			<script type="Bali">Балий�ка�</script>
-			<script type="Batk">Батак�ка�</script>
-			<script type="Beng">Бенгаль�ка�</script>
-			<script type="Blis">Бли��имволика</script>
-			<script type="Bopo">Бопомофо</script>
-			<script type="Brah">Брахми</script>
-			<script type="Brai">Брайл�</script>
-			<script type="Bugi">Бугинизий�ка�</script>
-			<script type="Buhd">Бухид</script>
-			<script type="Cakm">Чакмий�ка�</script>
-			<script type="Cans">Унифицированные Символы Канад�ких �боригенов</script>
-			<script type="Cari">Карий�ка�</script>
-			<script type="Cham">Чам�ка�</script>
-			<script type="Cher">Чероки</script>
-			<script type="Cirt">Кирт</script>
-			<script type="Copt">Копт�ка�</script>
-			<script type="Cprt">Кипр�ка�</script>
-			<script type="Cyrl">Кириллица</script>
-			<script type="Cyrs">Старо�лав�н�ка�</script>
-			<script type="Deva">Деванагари</script>
-			<script type="Dsrt">Дезерет</script>
-			<script type="Egyd">Египет�ка� демотиче�ка�</script>
-			<script type="Egyh">Египет�ка� иератиче�ка�</script>
-			<script type="Egyp">Египет�ка� иероглифиче�ка�</script>
-			<script type="Ethi">Эфиоп�ка�</script>
-			<script type="Geok">Грузин�ка� хуцури</script>
-			<script type="Geor">Грузин�ка�</script>
-			<script type="Glag">Глаголица</script>
-			<script type="Goth">Гот�ка�</script>
-			<script type="Grek">Грече�ка�</script>
-			<script type="Gujr">Гуджарати</script>
-			<script type="Guru">Гурмукхи</script>
-			<script type="Hang">Хангул</script>
-			<script type="Hani">Китай�ка�</script>
-			<script type="Hano">Хануну</script>
-			<script type="Hans">Упрощенна� китай�ка�</script>
-			<script type="Hant">Традиционна� китай�ка�</script>
-			<script type="Hebr">Иврит</script>
-			<script type="Hira">Хирагана</script>
-			<script type="Hmng">Пахау хмонг</script>
-			<script type="Hrkt">Катакана или хирагана</script>
-			<script type="Hung">Старовенгер�ка�</script>
-			<script type="Inds">Харапп�ка� (пи�ьменно�ть долины Инда)</script>
-			<script type="Ital">Староиталь�н�ка�</script>
-			<script type="Java">Яван�ка�</script>
-			<script type="Jpan">Япон�ка�</script>
-			<script type="Kali">Кайа</script>
-			<script type="Kana">Катакана</script>
-			<script type="Khar">Кхароштхи</script>
-			<script type="Khmr">Кхмер�ка�</script>
-			<script type="Knda">Каннада</script>
-			<script type="Kore">Корей�ка�</script>
-			<script type="Kthi">Кайтхи</script>
-			<script type="Lana">Ланна</script>
-			<script type="Laoo">Лао��ка�</script>
-			<script type="Latf">Латин�ка� фрактура</script>
-			<script type="Latg">Г�ль�ка� латин�ка�</script>
-			<script type="Latn">Латиница</script>
-			<script type="Lepc">Лепха</script>
-			<script type="Limb">Лимбу</script>
-			<script type="Lina">Линейное пи�ьмо �</script>
-			<script type="Linb">Линейное пи�ьмо Б</script>
-			<script type="Lyci">Лициан</script>
-			<script type="Lydi">Лидий�ка�</script>
-			<script type="Mand">Мандей�ка�</script>
-			<script type="Mani">Манихей�ка�</script>
-			<script type="Maya">Май�</script>
-			<script type="Mero">Мероит�ка�</script>
-			<script type="Mlym">Мала�ль�ка�</script>
-			<script type="Mong">Монголь�ка�</script>
-			<script type="Moon">�збука Муна</script>
-			<script type="Mtei">Манипури</script>
-			<script type="Mymr">Майанмар�ка�</script>
-			<script type="Nkoo">�ко</script>
-			<script type="Ogam">Огамиче�ка�</script>
-			<script type="Olck">Ол Чики</script>
-			<script type="Orkh">Орхоно-ени�ей�ка�</script>
-			<script type="Orya">Ори�</script>
-			<script type="Osma">О�ман�ка�</script>
-			<script type="Perm">Древнеперм�ка�</script>
-			<script type="Phag">Паг�па</script>
-			<script type="Phlv">Пахлави книжна�</script>
-			<script type="Phnx">Финикий�ка�</script>
-			<script type="Plrd">Поллардов�ка� фонетика</script>
-			<script type="Qaai">Уна�ледованна�</script>
-			<script type="Rjng">Реджанг�ка�</script>
-			<script type="Roro">Ронго-ронго</script>
-			<script type="Runr">Руниче�ка�</script>
-			<script type="Samr">Самарит�н�ка�</script>
-			<script type="Sara">Сарати</script>
-			<script type="Saur">Саураштра</script>
-			<script type="Sgnw">Язык знаков</script>
-			<script type="Shaw">�лфавит Шоу</script>
-			<script type="Sinh">Сингаль�ка�</script>
-			<script type="Sund">Сундан�ка�</script>
-			<script type="Sylo">Силоти �агри</script>
-			<script type="Syrc">Сирий�ка�</script>
-			<script type="Syre">Сирий�ка� ��трангело</script>
-			<script type="Syrj">Западно�ирий�ка�</script>
-			<script type="Syrn">Во�точно-�ирий�ка�</script>
-			<script type="Tagb">Тагбанва</script>
-			<script type="Tale">Тай�кий Ле</script>
-			<script type="Talu">�овый Тай�кий Ле</script>
-			<script type="Taml">Тамиль�ка�</script>
-			<script type="Telu">Телугу</script>
-			<script type="Teng">Тенгвар�ка�</script>
-			<script type="Tfng">Древнеливий�ка�</script>
-			<script type="Tglg">Тагалог</script>
-			<script type="Thaa">Таана</script>
-			<script type="Thai">Тай�ка�</script>
-			<script type="Tibt">Тибет�ка�</script>
-			<script type="Ugar">Угарит�ка�</script>
-			<script type="Vaii">Вай�ка�</script>
-			<script type="Visp">Видима� речь</script>
-			<script type="Xpeo">Старопер�ид�ка�</script>
-			<script type="Xsux">Шумеро-аккад�ка� клинопи�ь</script>
-			<script type="Yiii">Йи (ицзу)</script>
-			<script type="Zxxx">�енапи�анна�</script>
-			<script type="Zyyy">Общеприн�та�</script>
-			<script type="Zzzz">�еизве�тна� или недей�твительна� пи�ьменно�ть</script>
-		</scripts>
-		<territories>
-			<territory type="001">Мир</territory>
-			<territory type="002">�фрика</territory>
-			<territory type="003">Северна� �мерика</territory>
-			<territory type="005">Южна� �мерика</territory>
-			<territory type="009">Океани�</territory>
-			<territory type="011">Западна� �фрика</territory>
-			<territory type="013">Центральна� �мерика</territory>
-			<territory type="014">Во�точна� �фрика</territory>
-			<territory type="015">Северна� �фрика</territory>
-			<territory type="017">Центральна� �фрика</territory>
-			<territory type="018">Южна� �фрика [018]</territory>
-			<territory type="019">Центральна� и Южна� �мерика</territory>
-			<territory type="021">Северна� �мерика (021)</territory>
-			<territory type="029">Карибы</territory>
-			<territory type="030">Во�точна� �зи�</territory>
-			<territory type="034">Южна� �зи�</territory>
-			<territory type="035">Юго-Во�точна� �зи�</territory>
-			<territory type="039">Южна� Европа</territory>
-			<territory type="053">�в�трали� и �ова� Зеланди�</territory>
-			<territory type="054">Меланези�</territory>
-			<territory type="057">Микронези�</territory>
-			<territory type="061">Полинези�</territory>
-			<territory type="062">Юг Средней �зии</territory>
-			<territory type="142">�зи�</territory>
-			<territory type="143">Средн�� �зи�</territory>
-			<territory type="145">Ближний и Средний Во�ток</territory>
-			<territory type="150">Европа</territory>
-			<territory type="151">Во�точна� Европа</territory>
-			<territory type="154">Северна� Европа</territory>
-			<territory type="155">Западна� Европа</territory>
-			<territory type="172">С�Г</territory>
-			<territory type="419">Латин�ка� �мерика и Кариб�кие о-ва</territory>
-			<territory type="830">�орманд�кие о�трова</territory>
-			<territory type="AD">�ндорра</territory>
-			<territory type="AE">Объединенные �раб�кие Эмираты</territory>
-			<territory type="AF">�фгани�тан</territory>
-			<territory type="AG">�нтигуа и Барбуда</territory>
-			<territory type="AI">�нгуилла</territory>
-			<territory type="AL">�лбани�</territory>
-			<territory type="AM">�рмени�</territory>
-			<territory type="AN">�идерланд�кие �нтиль�кие о�трова</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктика</territory>
-			<territory type="AR">�ргентина</territory>
-			<territory type="AS">�мерикан�кое Самоа</territory>
-			<territory type="AT">�в�три�</territory>
-			<territory type="AU">�в�трали�</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�кие о�трова</territory>
-			<territory type="AZ">�зербайджан</territory>
-			<territory type="BA">Бо�ни� и Герцеговина</territory>
-			<territory type="BB">Барбадо�</territory>
-			<territory type="BD">Бангладеш</territory>
-			<territory type="BE">Бельги�</territory>
-			<territory type="BF">Буркина Фа�о</territory>
-			<territory type="BG">Болгари�</territory>
-			<territory type="BH">Бахрейн</territory>
-			<territory type="BI">Бурунди</territory>
-			<territory type="BJ">Бенин</territory>
-			<territory type="BL">О�тров Св�того Бартоломе�</territory>
-			<territory type="BM">Бермуд�кие О�трова</territory>
-			<territory type="BN">Бруней Дару��алам</territory>
-			<territory type="BO">Боливи�</territory>
-			<territory type="BR">Бразили�</territory>
-			<territory type="BS">Багам�кие о�трова</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">О�тров Буве</territory>
-			<territory type="BW">Бот�вана</territory>
-			<territory type="BY">Белару�ь</territory>
-			<territory type="BZ">Белиз</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Коко�овые о�трова</territory>
-			<territory type="CD">Демократиче�ка� Ре�публика Конго</territory>
-			<territory type="CF">Центрально-�фрикан�ка� Ре�публика</territory>
-			<territory type="CG">Конго</territory>
-			<territory type="CH">Швейцари�</territory>
-			<territory type="CI">Кот д’Ивуар</territory>
-			<territory type="CK">О�трова Кука</territory>
-			<territory type="CL">Чили</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Китай</territory>
-			<territory type="CO">Колумби�</territory>
-			<territory type="CR">Ко�та-Рика</territory>
-			<territory type="CS">Серби� и Черногори�</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">О�трова Зеленого Мы�а</territory>
-			<territory type="CX">О�тров Рожде�тва</territory>
-			<territory type="CY">Кипр</territory>
-			<territory type="CZ">Чеш�ка� ре�публика</territory>
-			<territory type="DE">Германи�</territory>
-			<territory type="DJ">Джибути</territory>
-			<territory type="DK">Дани�</territory>
-			<territory type="DM">О�тров Доминика</territory>
-			<territory type="DO">Доминикан�ка� Ре�публика</territory>
-			<territory type="DZ">�лжир</territory>
-			<territory type="EC">Эквадор</territory>
-			<territory type="EE">Э�тони�</territory>
-			<territory type="EG">Египет</territory>
-			<territory type="EH">Западна� Сахара</territory>
-			<territory type="ER">Эритре�</territory>
-			<territory type="ES">И�пани�</territory>
-			<territory type="ET">Эфиопи�</territory>
-			<territory type="FI">Финл�нди�</territory>
-			<territory type="FJ">Фиджи</territory>
-			<territory type="FK">Фолкленд�кие о�трова</territory>
-			<territory type="FM">Федеративные Штаты Микронезии</territory>
-			<territory type="FO">Фарер�кие о�трова</territory>
-			<territory type="FR">Франци�</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Великобритани�</territory>
-			<territory type="GD">Гренада</territory>
-			<territory type="GE">Грузи�</territory>
-			<territory type="GF">Француз�ка� Гвиана</territory>
-			<territory type="GG">Герн�и</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гибралтар</territory>
-			<territory type="GL">Гренланди�</territory>
-			<territory type="GM">Гамби�</territory>
-			<territory type="GN">Гвине�</territory>
-			<territory type="GP">Гваделупа</territory>
-			<territory type="GQ">Экваториальна� Гвине�</territory>
-			<territory type="GR">Греци�</territory>
-			<territory type="GS">Южна� Джорджи� и Южные Сандвичевы О�трова</territory>
-			<territory type="GT">Гватемала</territory>
-			<territory type="GU">Гуам</territory>
-			<territory type="GW">Гвине�-Би��ау</territory>
-			<territory type="GY">Гайана</territory>
-			<territory type="HK">Гонконг, О�обый �дмини�тративный Район Кита�</territory>
-			<territory type="HM">О�трова Херд и Макдональд</territory>
-			<territory type="HN">Гондура�</territory>
-			<territory type="HR">Хорвати�</territory>
-			<territory type="HT">Гаити</territory>
-			<territory type="HU">Венгри�</territory>
-			<territory type="ID">Индонези�</territory>
-			<territory type="IE">Ирланди�</territory>
-			<territory type="IL">Израиль</territory>
-			<territory type="IM">О�тров М�н</territory>
-			<territory type="IN">Инди�</territory>
-			<territory type="IO">Британ�ка� территори� в Индий�ком океане</territory>
-			<territory type="IQ">Ирак</territory>
-			<territory type="IR">Иран</territory>
-			<territory type="IS">И�ланди�</territory>
-			<territory type="IT">Итали�</territory>
-			<territory type="JE">Джер�и</territory>
-			<territory type="JM">Ямайка</territory>
-			<territory type="JO">Иордани�</territory>
-			<territory type="JP">Япони�</territory>
-			<territory type="KE">Кени�</territory>
-			<territory type="KG">Кыргыз�тан</territory>
-			<territory type="KH">Камбоджа</territory>
-			<territory type="KI">Кирибати</territory>
-			<territory type="KM">Комор�кие О�трова</territory>
-			<territory type="KN">Сент-Китт� и �еви�</territory>
-			<territory type="KP">Корей�ка� �ародно-Демократиче�ка� Ре�публика</territory>
-			<territory type="KR">Ре�публика Коре�</territory>
-			<territory type="KW">Кувейт</territory>
-			<territory type="KY">Каймановы о�трова</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">Лао�</territory>
-			<territory type="LB">Ливан</territory>
-			<territory type="LC">Сент-Лю�и�</territory>
-			<territory type="LI">Лихтенштейн</territory>
-			<territory type="LK">Шри-Ланка</territory>
-			<territory type="LR">Либери�</territory>
-			<territory type="LS">Ле�ото</territory>
-			<territory type="LT">Литва</territory>
-			<territory type="LU">Люк�ембург</territory>
-			<territory type="LV">Латви�</territory>
-			<territory type="LY">Ливи�</territory>
-			<territory type="MA">Марокко</territory>
-			<territory type="MC">Монако</territory>
-			<territory type="MD">Молдова</territory>
-			<territory type="ME">Черногори�</territory>
-			<territory type="MF">О�тров Св�того Мартина</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршалловы О�трова</territory>
-			<territory type="MK">Македони�</territory>
-			<territory type="ML">Мали</territory>
-			<territory type="MM">Мь�нма</territory>
-			<territory type="MN">Монголи�</territory>
-			<territory type="MO">Макао (о�обый админи�тративный район К�Р)</territory>
-			<territory type="MP">Северные Мариан�кие О�трова</territory>
-			<territory type="MQ">Мартиник</territory>
-			<territory type="MR">Мавритани�</territory>
-			<territory type="MS">Мон�еррат</territory>
-			<territory type="MT">Мальта</territory>
-			<territory type="MU">Маврикий</territory>
-			<territory type="MV">Мальдивы</territory>
-			<territory type="MW">Малави</territory>
-			<territory type="MX">Мек�ика</territory>
-			<territory type="MY">Малайзи�</territory>
-			<territory type="MZ">Мозамбик</territory>
-			<territory type="NA">�амиби�</territory>
-			<territory type="NC">�ова� Каледони�</territory>
-			<territory type="NE">�игер</territory>
-			<territory type="NF">О�тров �орфолк</territory>
-			<territory type="NG">�игери�</territory>
-			<territory type="NI">�икарагуа</territory>
-			<territory type="NL">�идерланды</territory>
-			<territory type="NO">�орвеги�</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�иуе</territory>
-			<territory type="NZ">�ова� Зеланди�</territory>
-			<territory type="OM">Оман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Француз�ка� Полинези�</territory>
-			<territory type="PG">Папуа-�ова� Гвине�</territory>
-			<territory type="PH">Филиппины</territory>
-			<territory type="PK">Паки�тан</territory>
-			<territory type="PL">Польша</territory>
-			<territory type="PM">Сен-Пьер и Микелон</territory>
-			<territory type="PN">Питкерн</territory>
-			<territory type="PR">Пу�рто-Рико</territory>
-			<territory type="PS">Пале�тин�ка� автономи�</territory>
-			<territory type="PT">Португали�</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвай</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Внешн�� Океани�</territory>
-			<territory type="QU">Европей�кий �оюз</territory>
-			<territory type="RE">Реюньон</territory>
-			<territory type="RO">Румыни�</territory>
-			<territory type="RS">Серби�</territory>
-			<territory type="RU">Ро��и�</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудов�ка� �рави�</territory>
-			<territory type="SB">Соломоновы О�трова</territory>
-			<territory type="SC">Сейшель�кие О�трова</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швеци�</territory>
-			<territory type="SG">Сингапур</territory>
-			<territory type="SH">О�тров Св�той Елены</territory>
-			<territory type="SI">Словени�</territory>
-			<territory type="SJ">Свальбард и Ян-Майен</territory>
-			<territory type="SK">Словаки�</territory>
-			<territory type="SL">Сьерра-Леоне</territory>
-			<territory type="SM">Сан-Марино</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Сомали</territory>
-			<territory type="SR">Суринам</territory>
-			<territory type="ST">Сан-Томе и Прин�ипи</territory>
-			<territory type="SV">Сальвадор</territory>
-			<territory type="SY">Сирий�ка� �раб�ка� Ре�публика</territory>
-			<territory type="SZ">Свазиленд</territory>
-			<territory type="TC">О�трова Тёрк� и Кайко�</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Француз�кие Южные Территории</territory>
-			<territory type="TG">Того</territory>
-			<territory type="TH">Таиланд</territory>
-			<territory type="TJ">Таджики�тан</territory>
-			<territory type="TK">Токелау</territory>
-			<territory type="TL">Во�точный Тимор</territory>
-			<territory type="TM">Туркмени�тан</territory>
-			<territory type="TN">Туни�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Турци�</territory>
-			<territory type="TT">Тринидад и Тобаго</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тайвань</territory>
-			<territory type="TZ">Танзани�</territory>
-			<territory type="UA">Украина</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="UM">Внешние малые о�трова (СШ�)</territory>
-			<territory type="US">СШ�</territory>
-			<territory type="UY">Уругвай</territory>
-			<territory type="UZ">Узбеки�тан</territory>
-			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент-Вин�ент и Гренадины</territory>
-			<territory type="VE">Вене�у�ла</territory>
-			<territory type="VG">Британ�кие Виргин�кие О�трова</territory>
-			<territory type="VI">�мерикан�кие Виргин�кие о�трова</territory>
-			<territory type="VN">Вьетнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уолли� и Футуна</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Йемен</territory>
-			<territory type="YT">Майотта</territory>
-			<territory type="ZA">Южна� �фрика</territory>
-			<territory type="ZM">Замби�</territory>
-			<territory type="ZW">Зимбабве</territory>
-			<territory type="ZZ">�еизве�тный или недей�твительный регион</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Традиционна� немецка� орфографи�</variant>
-			<variant type="1994">Стандартизированна� резь�н�ка� орфографи�</variant>
-			<variant type="1996">Правила немецкой орфографии у�тановленные � 1996 года</variant>
-			<variant type="1606NICT">Поздне-�редневековый француз�кий до 1606 г.</variant>
-			<variant type="AREVELA">Во�точно-арм�н�кий</variant>
-			<variant type="AREVMDA">Западно-арм�н�кий</variant>
-			<variant type="BAKU1926">Унифицированный тюр�ко-латин�кий алфавит</variant>
-			<variant type="FONIPA">Международный фонетиче�кий алфавит</variant>
-			<variant type="MONOTON">Монотонный</variant>
-			<variant type="POLYTON">Многотональный</variant>
-			<variant type="POSIX">Компьютерный</variant>
-			<variant type="ROZAJ">Резь�н�кий</variant>
-			<variant type="SAAHO">Сахо</variant>
-			<variant type="SCOTLAND">�нгло-шотланд�кий</variant>
-			<variant type="TARASK">Тарашкевица</variant>
-			<variant type="VALENCIA">Вален�ий�кий</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Календарь</key>
-			<key type="collation">Сопо�тавление</key>
-			<key type="currency">Валюта</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">традиционный китай�кий - Big5</type>
-			<type type="buddhist" key="calendar">Буддий�кий календарь</type>
-			<type type="chinese" key="calendar">Китай�кий календарь</type>
-			<type type="direct" key="collation">пр�мой пор�док</type>
-			<type type="gb2312han" key="collation">упрощенный китай�кий - GB2312</type>
-			<type type="gregorian" key="calendar">Григориан�кий календарь</type>
-			<type type="hebrew" key="calendar">Еврей�кий календарь</type>
-			<type type="indian" key="calendar">�ациональный календарь Индии</type>
-			<type type="islamic" key="calendar">И�лам�кий календарь</type>
-			<type type="islamic-civil" key="calendar">И�лам�кий граждан�кий календарь</type>
-			<type type="japanese" key="calendar">Япон�кий календарь</type>
-			<type type="phonebook" key="collation">пор�док телефонной книги</type>
-			<type type="pinyin" key="collation">пиньинь</type>
-			<type type="roc" key="calendar">Китай�кий календарь</type>
-			<type type="stroke" key="collation">по чертам</type>
-			<type type="traditional" key="collation">традиционный пор�док</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Метриче�ка�</measurementSystemName>
-			<measurementSystemName type="US">�нгло-американ�ка�</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Язык: {0}</codePattern>
-			<codePattern type="script">�апи�ание: {0}</codePattern>
-			<codePattern type="territory">Регион: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-	</layout>
-	<characters>
-		<exemplarCharacters>[а-е ё ж-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a-e g i m n p r t-x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�нв.</month>
-							<month type="2">февр.</month>
-							<month type="3">марта</month>
-							<month type="4">апр.</month>
-							<month type="5">ма�</month>
-							<month type="6">июн�</month>
-							<month type="7">июл�</month>
-							<month type="8">авг.</month>
-							<month type="9">�ент.</month>
-							<month type="10">окт.</month>
-							<month type="11">но�б.</month>
-							<month type="12">дек.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�нвар�</month>
-							<month type="2">феврал�</month>
-							<month type="3">марта</month>
-							<month type="4">апрел�</month>
-							<month type="5">ма�</month>
-							<month type="6">июн�</month>
-							<month type="7">июл�</month>
-							<month type="8">авгу�та</month>
-							<month type="9">�ент�бр�</month>
-							<month type="10">окт�бр�</month>
-							<month type="11">но�бр�</month>
-							<month type="12">декабр�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">�нв.</month>
-							<month type="2">февр.</month>
-							<month type="3">март</month>
-							<month type="4">апр.</month>
-							<month type="5">май</month>
-							<month type="6">июнь</month>
-							<month type="7">июль</month>
-							<month type="8">авг.</month>
-							<month type="9">�ент.</month>
-							<month type="10">окт.</month>
-							<month type="11">но�б.</month>
-							<month type="12">дек.</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">Я</month>
-							<month type="2">Ф</month>
-							<month type="3">М</month>
-							<month type="4">�</month>
-							<month type="5">М</month>
-							<month type="6">И</month>
-							<month type="7">И</month>
-							<month type="8">�</month>
-							<month type="9">С</month>
-							<month type="10">О</month>
-							<month type="11">�</month>
-							<month type="12">Д</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Январь</month>
-							<month type="2">Февраль</month>
-							<month type="3">Март</month>
-							<month type="4">�прель</month>
-							<month type="5">Май</month>
-							<month type="6">Июнь</month>
-							<month type="7">Июль</month>
-							<month type="8">�вгу�т</month>
-							<month type="9">Сент�брь</month>
-							<month type="10">Окт�брь</month>
-							<month type="11">�о�брь</month>
-							<month type="12">Декабрь</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">В�</day>
-							<day type="mon">Пн</day>
-							<day type="tue">Ð’Ñ‚</day>
-							<day type="wed">Ср</day>
-							<day type="thu">Чт</day>
-							<day type="fri">Пт</day>
-							<day type="sat">Сб</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">во�кре�енье</day>
-							<day type="mon">понедельник</day>
-							<day type="tue">вторник</day>
-							<day type="wed">�реда</day>
-							<day type="thu">четверг</day>
-							<day type="fri">п�тница</day>
-							<day type="sat">�уббота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Ð’</day>
-							<day type="mon">П</day>
-							<day type="tue">Ð’</day>
-							<day type="wed">С</day>
-							<day type="thu">Ч</day>
-							<day type="fri">П</day>
-							<day type="sat">С</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Во�кре�енье</day>
-							<day type="mon">Понедельник</day>
-							<day type="tue">Вторник</day>
-							<day type="wed">Среда</day>
-							<day type="thu">Четверг</day>
-							<day type="fri">П�тница</day>
-							<day type="sat">Суббота</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1-й кв.</quarter>
-							<quarter type="2">2-й кв.</quarter>
-							<quarter type="3">3-й кв.</quarter>
-							<quarter type="4">4-й кв.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1-й квартал</quarter>
-							<quarter type="2">2-й квартал</quarter>
-							<quarter type="3">3-й квартал</quarter>
-							<quarter type="4">4-й квартал</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">до н.�.</era>
-						<era type="1">н.�.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">до н.�.</era>
-						<era type="1">н.�.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y 'г'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y 'г'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d.M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">E, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q y</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyMMMEEEd">EEE, d MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyLLLL">LLLL y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y 'г'.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">d-d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy - MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy - MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy - dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy - dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y 'г'.</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y 'г'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y 'г'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">d-d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y 'г'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL-LLLL y 'г'.</greatestDifference>
-							<greatestDifference id="y">LLLL y - LLLL y 'г'.</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Эра</displayName>
-					</field>
-					<field type="year">
-						<displayName>Год</displayName>
-					</field>
-					<field type="month">
-						<displayName>Ме��ц</displayName>
-					</field>
-					<field type="week">
-						<displayName>�едел�</displayName>
-					</field>
-					<field type="day">
-						<displayName>День</displayName>
-						<relative type="-2">Позавчера</relative>
-						<relative type="-1">Вчера</relative>
-						<relative type="0">Сегодн�</relative>
-						<relative type="1">Завтра</relative>
-						<relative type="2">По�лезавтра</relative>
-					</field>
-					<field type="weekday">
-						<displayName>День недели</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Ча�</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Минута</displayName>
-					</field>
-					<field type="second">
-						<displayName>Секунда</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Ча�овой по��</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Тишрей</month>
-							<month type="2">Хешван</month>
-							<month type="3">Ки�лев</month>
-							<month type="4">Тевет</month>
-							<month type="5">Шеват</month>
-							<month type="7">�дар</month>
-							<month type="8">�и�ан</month>
-							<month type="9">И�р</month>
-							<month type="10">Сиван</month>
-							<month type="11">Таммуз</month>
-							<month type="12">�в</month>
-							<month type="13">Элул</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Мухаррам</month>
-							<month type="2">Сафар</month>
-							<month type="3">Раби-уль-авваль</month>
-							<month type="4">Раби-уль-ахир</month>
-							<month type="5">Джумад-уль-авваль</month>
-							<month type="6">Джумад-уль-ахир</month>
-							<month type="7">Раджаб</month>
-							<month type="8">Шаабан</month>
-							<month type="9">Рамадан</month>
-							<month type="10">Шавваль</month>
-							<month type="11">Зуль-Каада</month>
-							<month type="12">Зуль-Хиджжа</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Фарвардин</month>
-							<month type="2">Ордибехешт</month>
-							<month type="3">Хордад</month>
-							<month type="4">Тир</month>
-							<month type="5">Мордад</month>
-							<month type="6">Шахривер</month>
-							<month type="7">Мехр</month>
-							<month type="8">�бан</month>
-							<month type="9">�зер</month>
-							<month type="10">Дей</month>
-							<month type="11">Бахман</month>
-							<month type="12">Э�фанд</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�еизве�тный</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>�ндорра</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Дубай</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Кабул</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�нтигуа</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�нгиль�</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Тирана</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Ереван</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Кюра�ао</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Луанда</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ротера</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Палмер</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Южный полю�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Сева</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Моу�он</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Дейви�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Во�ток</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Кей�и</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Дюмон-д'Юрвиль</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Мак-Мердо</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Рио-Гальего�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Мендо�а</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Сан-Хуан</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуа�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла-Риоха</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан-Луи�</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Катамарка</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Жужуй</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Тукуман</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Кордова</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Бу�но�-�йре�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Паго-Паго</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Вена</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Перт</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Юкла</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Дарвин</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�делаида</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Брокен-Хилл</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Керри</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Мельбурн</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Хобарт</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Линдеман</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Сидней</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Бри�бен</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд-Хау, о-в</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�руба</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>Мариехамн</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Баку</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>Сараево</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Барбадо�</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Дакка</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Брю��ель</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Уагадугу</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Софи�</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Бахрейн</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Бужумбура</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Порто-�ово</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуды</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Бруней</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Ла-Па�</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Эйрунепе</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Риу-Бранку</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Порту-Велью</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Боа-Ви�та</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Манау�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Ку�ба</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампу-Гранди</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Белен</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�рагуаина</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сан-Паулу</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Баи�</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Форталеза</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Ма�ейо</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ре�ифи</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�оронха</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�а��ау</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Тимпу</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Габороне</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Мин�к</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Белиз</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Доу�он</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Уайтхор�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Инувик</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Ванкувер</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>До�он-Крик</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Йеллоунайф</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Эдмонтон</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Свифт-Карент</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кеймбридж-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Реджайна</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Виннипег</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Резолют</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейни-Ривер</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ранкин-Инлет</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал-Харбор</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�ипигон</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Торонто</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Монреаль</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Икалуит</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртанг</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Монктон</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Галифак�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Гу�-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Глей�-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Бланк-Саблон</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Сент-Джон�</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Коко�овые о�трова</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Кинша�а</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Лубумбаши</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Банги</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Браззавиль</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Цюрих</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>�биджан</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Раротонга</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Па�хи, о-в</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Санть�го</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Дуала</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Кашгар</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Урумчи</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Чунцин</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Шанхай</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Харбин</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Богота</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Ко�та-Рика</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Гавана</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>О�трова Зеленого Мы�а</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Рожде�тва, о-в</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>�ико�и�</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Прага</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Берлин</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Джибути</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Копенгаген</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Доминика</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Санто-Доминго</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�лжир</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Галапаго�, о-ва</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Гуа�киль</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Таллин</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Каир</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Эль-�юн</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>��мера</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Канар�кие о-ва</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Сеута</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Мадрид</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�дди�-�беба</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Хель�инки</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Фиджи</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Ст�нли</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Трук, о-ва</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Понапе, о-в</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Ко�рае</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Фарер�кие о�трова</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Париж</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Либревиль</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Лондон</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Гренада</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Тбили�и</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Кайенна</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>Герн�и</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�ккра</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Гибралтар</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Туле</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Готхоб</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Скор�би�унн</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Денмарк�хавн</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Банжул</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Конакри</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Гваделупа</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Малабо</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�фины</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Ю.Джорджи� и Ю.С�ндвинчевы о-ва</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Гватемала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Гуам</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Би�ау</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Гайана</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Гонконг</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>Тегу�игальпа</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>Загреб</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Порт-о-Прен�</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Будапешт</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Джакарта</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Понтианак</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Мака�ар</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Джайпур</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Дублин</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Иеру�алим</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>М�н, о-в</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Калькутта</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Чаго�</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Багдад</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Тегеран</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Рейкь�вик</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Рим</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>Джер�и</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Ямайка</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>�мман</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Токио</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>�айроби</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Бишкек</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Пномпень</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Эндербери, о-в</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Киритимати</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Тарава</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Комор�кие о�трова</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Сент-Кит�</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Пхень�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Сеул</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Кувейт</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Каймановы о�трова</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ктау</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Орал (Ураль�к)</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�ктобе (�ктюбин�к)</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Кызылорда</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�лматы</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Вьенть�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Бейрут</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Сент-Лю�и�</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Вадуц</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Коломбо</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Монрови�</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Ма�еру</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Вильню�</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Люк�ембург</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Рига</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Триполи</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Ка�абланка</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Монако</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Кишинев</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Подгорица</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�нтананариву</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Кваджалейн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Маджуро</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>Скопье</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Бамако</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Рангун</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Ховд</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Улан-Батор</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Чойбал�ан</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Макао</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Сайпан</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Мартиника</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>�уакшот</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Мон�еррат</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Мальта</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Маврикий</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Мальдивы</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Блантайр</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Тихуана</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Эрмо�ильо</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Ма�атлан</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Чиуауа</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Монтеррей</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Мехико</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Мерида</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Канкун</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Куала-Лумпур</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Кучинг</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Мапуту</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Виндхук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>�умеа</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>�иамей</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�орфолк</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Лаго�</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Манагуа</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�м�тердам</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>О�ло</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Катманду</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>�ауру</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�иу�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Чатем, о-в</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Окленд</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Ма�кат</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Панама</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Лима</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Таити, о-в</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Маркиз�кие о-ва</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбье, о-ва</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Порт-Мор�би</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Манила</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Карачи</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Варшава</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Микелон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Питкерн</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Пу�рто-Рико</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Газа</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�зор�кие о-ва</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Мадейра, о-в</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Ли��абон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Палау</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>��ун�ьон</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Катар</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Реюньон</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Бухаре�т</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Белград</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Калининград</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Мо�ква</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Волгоград</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Екатеринбург</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ом�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�ово�ибир�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Кра�но�р�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Иркут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Якут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Владиво�ток</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сахалин, о-в</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Магадан</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Петропавлов�к-Камчат�кий</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�надырь</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Кигали</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Эр-Ри�д</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Гвадалканал</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Ма�</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Хартум</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Стокгольм</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Сингапур</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Св. Елены, о-в</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>Любл�на</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Лонгйир</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>Брати�лава</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Фритаун</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>Сан-Марино</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Дакар</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Могадишо</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Парамарибо</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сан-Томе</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Сальвадор</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Дама�к</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Мбабане</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Гранд Турк</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�джамена</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Кергелен</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Ломе</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Бангкок</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Душанбе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Факаофо</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Дили</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>�шгабат</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Туни�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Тонгатапу</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Стамбул</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Порт-оф-Спейн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Фунафути</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Тайб�й</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Дар-��-Салам</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Киев</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Симферополь</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожье</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Кампала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Миду�й, о-ва</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джон�тон, ат.</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>У�йк, о-в</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�дак, о-в</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�ом</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Гонолулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�нкоридж</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Якутат</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Джуно</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло�-�нджеле�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Бой�е</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Финик�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Шипрок</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Денвер</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�ью-Салем</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Северна� Дакота - Центр</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чикаго</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Меномини</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Вин�ен�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Петер�бург</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Телл-Сити</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�ок�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Винамак</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Маренго</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Индианаполи�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Луи�вилл</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Вив�й</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монти�елло</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Детройт</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�ью-Йорк</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Монтевидео</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Самарканд</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Ташкент</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>Ватикан</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Сент-Вин�ент</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Карака�</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Тортола</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Сент-Тома�</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Сайгон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Эфате</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Уолли�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�пи�</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>�ден</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Майорка</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Йоханне�бург</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Лу�ака</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Хараре</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<generic>�кри врем�</generic>
-					<standard>�кри �тандартное врем�</standard>
-					<daylight>�кри летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>�кри врем�</generic>
-					<standard>�кри �тандартное врем�</standard>
-					<daylight>�кри летнее врем�</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>�фгани�тан врем�</standard>
-				</long>
-				<short>
-					<standard>�фгани�тан врем�</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Центральноафрикан�кое врем�</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Во�точноафрикан�кое врем�</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>Южноафрикан�кое врем�</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Западноафрикан�кое врем�</standard>
-					<daylight>Западноафрикан�кое летнее врем�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>�ктюбин�к �тандартное врем�</standard>
-					<daylight>�ктюбин�к летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�ктюбин�к �тандартное врем�</standard>
-					<daylight>�ктюбин�к летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>�л��ка врем�</generic>
-					<standard>�л��ка �тандартное врем�</standard>
-					<daylight>�л��ка летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>�л��ка врем�</generic>
-					<standard>�л��ка �тандартное врем�</standard>
-					<daylight>�л��ка летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>�лма-�та �тандартное врем�</standard>
-					<daylight>�лма-�та летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�лма-�та �тандартное врем�</standard>
-					<daylight>�лма-�та летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Средне-американ�кое врем�</generic>
-					<standard>Средне-американ�кое �тандартное врем�</standard>
-					<daylight>Средне-американ�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Средне-американ�кое врем�</generic>
-					<standard>Средне-американ�кое �тандартное врем�</standard>
-					<daylight>Средне-американ�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Во�точно-американ�кое врем�</generic>
-					<standard>Во�точно-американ�кое �тандартное врем�</standard>
-					<daylight>Во�точно-американ�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Во�точно-американ�кое врем�</generic>
-					<standard>Во�точно-американ�кое �тандартное врем�</standard>
-					<daylight>Во�точно-американ�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Горное врем� (СШ�)</generic>
-					<standard>Горное �тандартное врем� (СШ�)</standard>
-					<daylight>Горное летнее врем� (СШ�)</daylight>
-				</long>
-				<short>
-					<generic>Горное врем� (СШ�)</generic>
-					<standard>Горное �тандартное врем� (СШ�)</standard>
-					<daylight>Горное летнее врем� (СШ�)</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Тихоокеан�кое врем�</generic>
-					<standard>Тихоокеан�кое �тандартное врем�</standard>
-					<daylight>Тихоокеан�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Тихоокеан�кое врем�</generic>
-					<standard>Тихоокеан�кое �тандартное врем�</standard>
-					<daylight>Тихоокеан�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>�надырь �тандартное врем�</standard>
-					<daylight>�надырь летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�надырь �тандартное врем�</standard>
-					<daylight>�надырь летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>�ктау �тандартное врем�</standard>
-					<daylight>�ктау летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�ктау �тандартное врем�</standard>
-					<daylight>�ктау летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>�ктобе �тандартное врем�</standard>
-					<daylight>�ктобе летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�ктобе �тандартное врем�</standard>
-					<daylight>�ктобе летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Саудов�ка� �рави� врем�</generic>
-					<standard>Саудов�ка� �рави� �тандартное врем�</standard>
-					<daylight>Саудов�ка� �рави� летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Саудов�ка� �рави� врем�</generic>
-					<standard>Саудов�ка� �рави� �тандартное врем�</standard>
-					<daylight>Саудов�ка� �рави� летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>�ргентина �тандартное врем�</standard>
-					<daylight>�ргентина летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>�ргентина �тандартное врем�</standard>
-					<daylight>�ргентина летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>�ргентина (запад) �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>�ргентина (запад) �тандартное врем�</standard>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<generic>�рмени� врем�</generic>
-					<standard>�рмени� �тандартное врем�</standard>
-					<daylight>�рмени� летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>�рмени� врем�</generic>
-					<standard>�рмени� �тандартное врем�</standard>
-					<daylight>�рмени� летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>�тлантиче�кое врем�</generic>
-					<standard>�тлантиче�кое �тандартное врем�</standard>
-					<daylight>�тлантиче�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>�тлантиче�кое врем�</generic>
-					<standard>�тлантиче�кое �тандартное врем�</standard>
-					<daylight>�тлантиче�кое летнее врем�</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Бразили� �тандартное врем�</standard>
-					<daylight>Бразили� дневное врем�</daylight>
-				</long>
-				<short>
-					<standard>Бразили� �тандартное врем�</standard>
-					<daylight>Бразили� дневное врем�</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>Китай�кое �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Китай�кое �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Центральноевропей�кое врем�</standard>
-					<daylight>Центральноевропей�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Центральноевропей�кое врем�</standard>
-					<daylight>Центральноевропей�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Во�точноевропей�кое врем�</standard>
-					<daylight>Во�точноевропей�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Во�точноевропей�кое врем�</standard>
-					<daylight>Во�точноевропей�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Гонконг�кое �тандартное врем�</standard>
-					<daylight>Гонконг�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Гонконг�кое �тандартное врем�</standard>
-					<daylight>Гонконг�кое летнее врем�</daylight>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Индий�кое �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Индий�кое �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Индокитай�кое �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Индокитай�кое �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Центральна� Индонези� �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Центральна� Индонези� �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Во�точна� Индонези� �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Во�точна� Индонези� �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Западна� Индонези� �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Западна� Индонези� �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Израиль �тандартное врем�</standard>
-					<daylight>Израиль летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Израиль �тандартное врем�</standard>
-					<daylight>Израиль летнее врем�</daylight>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Япон�кое �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Япон�кое �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<standard>Корей�кое �тандартное врем�</standard>
-				</long>
-				<short>
-					<standard>Корей�кое �тандартное врем�</standard>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Куйбышев�кое врем�</standard>
-					<daylight>Куйбышев�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Куйбышев�кое врем�</standard>
-					<daylight>Куйбышев�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Мо�ков�кое врем�</generic>
-					<standard>Мо�ков�кое �тандартное врем�</standard>
-					<daylight>Мо�ков�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Мо�ков�кое врем�</generic>
-					<standard>Мо�ков�кое �тандартное врем�</standard>
-					<daylight>Мо�ков�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Самар�кое �тандартное врем�</standard>
-					<daylight>Самар�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Самар�кое �тандартное врем�</standard>
-					<daylight>Самар�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<generic>Турецкое врем�</generic>
-					<standard>Турецкое �тандартное врем�</standard>
-					<daylight>Турецкое летнее врем�</daylight>
-				</long>
-				<short>
-					<generic>Турецкое врем�</generic>
-					<standard>Турецкое �тандартное врем�</standard>
-					<daylight>Турецкое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Волгоград�кое врем�</standard>
-					<daylight>Волгоград�кое летнее врем�</daylight>
-				</long>
-				<short>
-					<standard>Волгоград�кое врем�</standard>
-					<daylight>Волгоград�кое летнее врем�</daylight>
-				</short>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ндорр�ка� пе�ета</displayName>
-				<displayName count="few">андорр�кие пе�еты</displayName>
-				<displayName count="other">андорр�ких пе�ет</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Дирхам (О�Э)</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�фгани (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�фгани</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�лбан�кий лек</displayName>
-				<displayName count="few">албан�ких лека</displayName>
-				<displayName count="other">албан�ких леков</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>�рм�н�кий драм</displayName>
-				<displayName count="few">арм�н�ких драма</displayName>
-				<displayName count="other">арм�н�ких драмов</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>�идерланд�кий антиль�кий гульден</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�нголь�ка� кванза</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�нголь�ка� кванза (1977-1990)</displayName>
-				<displayName count="few">анголь�кие кванзы</displayName>
-				<displayName count="other">анголь�ких кванз</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�нголь�ка� нова� кванза (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�нголь�ка� кванза рею�тадо (1995-1999)</displayName>
-				<displayName count="few">анголь�кие кванзы рею�тадо (1995-1999)</displayName>
-				<displayName count="other">анголь�ких кванз рею�тадо (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>�ргентин�кий ау�трал</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>�ргентин�кое пе�о (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>�ргентин�кое пе�о</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�в�трий�кий шиллинг</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�в�тралий�кий доллар</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�рубан�кий гульден</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Старый азербайджан�кий манат</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>�зербайджан�кий манат</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Динар Бо�нии и Герцеговины</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Конвертируема� марка Бо�нии и Герцеговины</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Барбадо��кий доллар</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Бангладеш�ка� така</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Бельгий�кий франк (конвертируемый)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Бельгий�кий франк</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Бельгий�кий франк (финан�овый)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Лев</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Болгар�кий лев</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Бахрейн�кий динар</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Бурундий�кий франк</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Бермуд�кий доллар</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Бруней�кий доллар</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Боливиано</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Боливий�кое пе�о</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Боливий�кий мвдол</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Бразиль�кий новый крузейро (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Бразиль�кое крузадо</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Бразиль�кий крузейро (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Бразиль�кий реал</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Бразиль�кое новое крузадо</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Бразиль�кий крузейро</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Багам�кий доллар</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>�гултрум</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Джа</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Бот�ван�ка� пула</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Белору��кий рубль (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Белору��кий рубль</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Белиз�кий доллар</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Канад�кий доллар</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Конголез�кий франк</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR евро</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Швейцар�кий франк</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR франк</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>У�ловна� ра�четна� единица Чили</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Чилий�кое пе�о</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Юань Ренминби</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Колумбий�кое пе�о</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Единица реальной �тоимо�ти Колумбии</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Ко�тарикан�кий колон</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Старый Серб�кий динар</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Чехо�ловацка� тверда� крона</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Кубин�кое пе�о</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Э�кудо Кабо-Верде</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Кипр�кий фунт</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Чеш�ка� крона</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Во�точногерман�ка� марка</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>�емецка� марка</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Франк Джибути</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Дат�ка� крона</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Доминикан�кое пе�о</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�лжир�кий динар</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Эквадор�кий �укре</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>По�то�нна� единица �тоимо�ти Эквадора</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Э�тон�ка� крона</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Египет�кий фунт</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�акфа</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>И�пан�ка� пе�ета (�)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>И�пан�ка� пе�ета (конвертируема�)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>И�пан�ка� пе�ета</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Эфиоп�кий быр</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Евро</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Фин�ка� марка</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Доллар Фиджи</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Фунт Фолкленд�ких о�тровов</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Француз�кий франк</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>�нглий�кий фунт �терлингов</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Грузин�кий купон</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Грузин�кий лари</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ган�кий �еди</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Седи Ганы</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Гибралтар�кий фунт</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Гамбий�кий дала�и</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Гвиней�кий франк</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Гвиней�ка� �или</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Эквеле �кваториальной Гвинеи</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Грече�ка� драхма</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Гватемаль�кий кет�аль</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Э�кудо Португаль�кой Гвинеи</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Пе�о Гвинеи-Би�ау</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Гайан�кий доллар</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Гонконг�кий доллар</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Гондура��ка� лемпира</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Хорват�кий динар</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Хорват�ка� куна</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Гаит�н�кий гурд</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Венгер�кий форинт</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Индонезий�ка� рупи�</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ирланд�кий фунт</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Израиль�кий фунт</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>�овый израиль�кий шекель</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Индий�ка� рупи�</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ирак�кий динар</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Иран�кий риал</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>И�ланд�ка� крона</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Италь�н�ка� лира</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Ямай�кий доллар</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Иордан�кий динар</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Япон�ка� иена</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Кений�кий шиллинг</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Киргиз�кий �ом</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Камбоджий�кий риель</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Франк Комор�ких о�тровов</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Северо-корей�ка� вона</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Вона Ре�публики Кореи</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Кувейт�кий динар</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Доллар Каймановых о�тровов</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Казах�кий тенге</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Кип Л�ДР</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Ливан�кий фунт</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Шри-Ланкий�ка� рупи�</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Либерий�кий доллар</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Лоти</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Литов�кий лит</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Литов�кий талон</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Конвертируемый франк Люк�ембурга</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Люк�ембург�кий франк</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Финан�овый франк Люк�ембурга</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Латвий�кий лат</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Латвий�кий рубль</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Ливий�кий динар</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Мароккан�кий дирхам</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Мароккан�кий франк</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Молдав�кий лей</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>�риари</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Малага�ий�кий франк</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Македон�кий динар</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Малий�кий франк</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Кь�т</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Монголь�кий тугрик</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Патака</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Мавритан�ка� уги�</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Мальтий�ка� лира</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Мальтий�кий фунт</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Маврикий�ка� рупи�</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Мальдив�ка� руфи�</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Малавий�ка� квача</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Мек�икан�кое новое пе�о</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Мек�икан�кое �еребр�ное пе�о (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Мек�икан�ка� пере�четна� единица (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Малайзий�кий ринггит</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Мозамбик�кое ��кудо</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Старый мозамбик�кий метикал</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Метикал</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Доллар �амибии</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�игерий�ка� найра</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>�икарагуан�ка� кордоба</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Золота� кордоба</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>�идерланд�кий гульден</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>�орвеж�ка� крона</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�епаль�ка� рупи�</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�овозеланд�кий доллар</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Оман�кий риал</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Панам�кое бальбоа</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Перуан�кое инти</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Перуан�кий новый �оль</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Перуан�кий �оль</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Кина</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Филиппин�кое пе�о</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Паки�тан�ка� рупи�</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Поль�кий злотый</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Злотый</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Португаль�кое ��кудо</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Парагвай�кий гуарани</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Катар�кий риал</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Родезий�кий доллар</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Старый Румын�кий лей</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Румын�кий лей</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Серб�кий динар</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ро��ий�кий рубль</displayName>
-				<displayName count="few">Ро��ий�ких рубл�</displayName>
-				<displayName count="many">Ро��ий�ких рублей</displayName>
-				<displayName count="one">Ро��ий�кий рубль</displayName>
-				<displayName count="other">Ро��ий�кого рубл�</displayName>
-				<symbol>руб.</symbol>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ро��ий�кий рубль (1991-1998)</displayName>
-				<symbol>Ñ€.</symbol>
-			</currency>
-			<currency type="RWF">
-				<displayName>Франк Руанды</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Саудов�кий риал</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Доллар Соломоновых о�тровов</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Сейшель�ка� рупи�</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Судан�кий динар</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Судан�кий фунт</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Старый �удан�кий фунт</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Швед�ка� крона</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Сингапур�кий доллар</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Фунт о�трова Св�той Елены</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Словен�кий толар</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Словацка� крона</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Леоне</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Сомалий�кий шиллинг</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Суринам�кий доллар</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Суринам�кий гульден</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Добра</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Рубль СССР</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Сальвадор�кий колон</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Сирий�кий фунт</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Свазиленд�кий лилангени</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Таиланд�кий бат</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Таджик�кий рубль</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Таджик�кий �омони</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Туркмен�кий манат</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Туни��кий динар</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Паанга</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Тимор�кое ��кудо</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Турецка� лира</displayName>
-				<displayName count="few">турецкие лиры</displayName>
-				<displayName count="many">турецких лир</displayName>
-				<displayName count="one">туркцка� лира</displayName>
-				<displayName count="other">турецких лир</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>�ова� турецка� лира</displayName>
-				<displayName count="few">новые турецкие лиры</displayName>
-				<displayName count="many">�овых турецких лир</displayName>
-				<displayName count="one">�ова� турецка� лира</displayName>
-				<displayName count="other">новых турецких лир</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Доллар Тринидада и Тобаго</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>�овый тайвань�кий доллар</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Танзаний�кий шиллинг</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Украин�ка� гривна</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Карбованец (украин�кий)</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Старый угандий�кий шиллинг</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Угандий�кий шиллинг</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Доллар СШ�</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>Доллар СШ� �ледующего дн�</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Доллар СШ� текущего дн�</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Уругвай�кий пе�о (индек� инфл�ции)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Уругвай�кое �тарое пе�о (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Уругвай�кое пе�о</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Узбек�кий �ум</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Вене�у�ль�кий боливар</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Вене�у�ль�кий боливар фу�рте</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Вьетнам�кий донг</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Вату</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Тала</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Франк КФ� ВЕ�С</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Серебро</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Золото</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Европей�ка� �о�тавна� единица</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Европей�ка� денежна� единица</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>ра�четна� единица европей�кого валютного �оглашени� (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>ра�четна� единица европей�кого валютного �оглашени� (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Во�точно-кариб�кий доллар</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>СДР (�пециальные права заим�твовани�)</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>ЭКЮ (единица европей�кой валюты)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Француз�кий золотой франк</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Француз�кий UIC-франк</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Франк КФ� ВСЕ�О</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Палладий</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Франк КФП</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Платина</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>единица RINET-фондов</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>те�товый валютный код</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>�еизве�тна� или недей�твительна� валюта</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Йемен�кий динар</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Йемен�кий риал</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Юго�лав�кий твердый динар</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Юго�лав�кий новый динар</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Юго�лав�кий динар</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Южноафрикан�кий р�нд (финан�овый)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Южноафрикан�кий р�нд</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Квача (замбий�ка�)</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>�овый заир</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Заир</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Доллар Зимбабве</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} дн�</unitPattern>
-			<unitPattern count="many">{0} дней</unitPattern>
-			<unitPattern count="one">{0} день</unitPattern>
-			<unitPattern count="other">{0} дн�</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} ча�а</unitPattern>
-			<unitPattern count="many">{0} ча�ов</unitPattern>
-			<unitPattern count="one">{0} ча�</unitPattern>
-			<unitPattern count="other">{0} ча�а</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} минуты</unitPattern>
-			<unitPattern count="many">{0} минут</unitPattern>
-			<unitPattern count="one">{0} минута</unitPattern>
-			<unitPattern count="other">{0} минуты</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} ме��ца</unitPattern>
-			<unitPattern count="many">{0} ме��цев</unitPattern>
-			<unitPattern count="one">{0} ме��ц</unitPattern>
-			<unitPattern count="other">{0} ме��ца</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} �екунды</unitPattern>
-			<unitPattern count="many">{0} �екунд</unitPattern>
-			<unitPattern count="one">{0} �екунда</unitPattern>
-			<unitPattern count="other">{0} �екунды</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} недели</unitPattern>
-			<unitPattern count="many">{0} недель</unitPattern>
-			<unitPattern count="one">{0} недел�</unitPattern>
-			<unitPattern count="other">{0} недели</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} года</unitPattern>
-			<unitPattern count="many">{0} лет</unitPattern>
-			<unitPattern count="one">{0} год</unitPattern>
-			<unitPattern count="other">{0} года</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>да:д</yesstr>
-			<nostr>нет:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ru_RU.xml b/airtime_mvc/library/Zend/Locale/Data/ru_RU.xml
deleted file mode 100644
index 1e31dcb84..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ru_RU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="ru"/>
-		<territory type="RU"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ru_UA.xml b/airtime_mvc/library/Zend/Locale/Data/ru_UA.xml
deleted file mode 100644
index 14fe430f8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ru_UA.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.58 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="ru"/>
-		<territory type="UA"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="apa">апач�кий</language>
-			<language type="den">�л�йви</language>
-			<language type="mh">маршаль�кий</language>
-			<language type="tlh">клингон</language>
-		</languages>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH-HH 'ч.'</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH-HH 'ч.', v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM - E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM - E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d - E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy - E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d-d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM - d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y - d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d - E, d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="M">E, d MMM - E, d MMM y 'г'.</greatestDifference>
-							<greatestDifference id="y">E, d MMM y - E, d MMM y 'г'.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">LLLL-LLLL y</greatestDifference>
-							<greatestDifference id="y">LLLL y - LLLL y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ESB">
-				<displayName>ESB</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>RHD</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>YUM</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/rw.xml b/airtime_mvc/library/Zend/Locale/Data/rw.xml
deleted file mode 100644
index 42999000e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/rw.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.28 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="rw"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Ikinyafurikaneri</language>
-			<language type="am">Inyamuhariki</language>
-			<language type="ar">Icyarabu</language>
-			<language type="as">Icyasamizi</language>
-			<language type="az">Inyazeribayijani</language>
-			<language type="be">Ikibelarusiya</language>
-			<language type="bg">Urunyabuligariya</language>
-			<language type="bh">Inyebihari</language>
-			<language type="bn">Ikibengali</language>
-			<language type="br">Inyebiritoni</language>
-			<language type="bs">Inyebosiniya</language>
-			<language type="ca">Igikatalani</language>
-			<language type="cs">Igiceke</language>
-			<language type="cy">Ikigaluwa</language>
-			<language type="da">Ikidaninwa</language>
-			<language type="de">Ikidage</language>
-			<language type="el">Ikigereki</language>
-			<language type="en">Icyongereza</language>
-			<language type="eo">Icyesiperanto</language>
-			<language type="es">Icyesipanyolo</language>
-			<language type="et">Icyesitoniya</language>
-			<language type="eu">Ikibasiki</language>
-			<language type="fa">Inyeperisi</language>
-			<language type="fi">Igifinilande</language>
-			<language type="fil">Ikinyafilipine</language>
-			<language type="fo">Inyefaroyizi</language>
-			<language type="fr">Igifaransa</language>
-			<language type="fy">Igifiriziyani</language>
-			<language type="ga">Ikirilandi</language>
-			<language type="gd">Ikigaluwa cy'Igisweduwa</language>
-			<language type="gl">Ikigalisiya</language>
-			<language type="gn">Inyaguwarani</language>
-			<language type="gu">Inyegujarati</language>
-			<language type="he">Igiheburayo</language>
-			<language type="hi">Igihindi</language>
-			<language type="hr">Igikorowasiya</language>
-			<language type="hu">Igihongiriya</language>
-			<language type="hy">Ikinyarumeniya</language>
-			<language type="ia">Ururimi Gahuzamiryango</language>
-			<language type="id">Ikinyendoziya</language>
-			<language type="ie">Uruhuzandimi</language>
-			<language type="is">Igisilande</language>
-			<language type="it">Igitaliyani</language>
-			<language type="ja">Ikiyapani</language>
-			<language type="jv">Inyejava</language>
-			<language type="ka">Inyejeworujiya</language>
-			<language type="km">Igikambodiya</language>
-			<language type="kn">Igikanada</language>
-			<language type="ko">Igikoreya</language>
-			<language type="ku">Inyekuridishi</language>
-			<language type="ky">Inkerigizi</language>
-			<language type="la">Ikilatini</language>
-			<language type="ln">Ilingala</language>
-			<language type="lo">Ikilawotiyani</language>
-			<language type="lt">Ikilituwaniya</language>
-			<language type="lv">Ikinyaletoviyani</language>
-			<language type="mk">Ikimasedoniyani</language>
-			<language type="ml">Ikimalayalami</language>
-			<language type="mn">Ikimongoli</language>
-			<language type="mr">Ikimarati</language>
-			<language type="ms">Ikimalayi</language>
-			<language type="mt">Ikimaliteze</language>
-			<language type="ne">Ikinepali</language>
-			<language type="nl">Ikinerilande</language>
-			<language type="nn">Inyenoruveji (Nyonorusiki)</language>
-			<language type="no">Ikinoruveji</language>
-			<language type="oc">Inyogusitani</language>
-			<language type="or">Inyoriya</language>
-			<language type="pa">Igipunjabi</language>
-			<language type="pl">Igipolone</language>
-			<language type="ps">Impashito</language>
-			<language type="pt">Igiporutugali</language>
-			<language type="pt_BR">Inyeporutigali (Brezili)</language>
-			<language type="pt_PT">Inyeporutigali (Igiporutigali)</language>
-			<language type="ro">Ikinyarumaniya</language>
-			<language type="ru">Ikirusiya</language>
-			<language type="sa">Igisansikiri</language>
-			<language type="sd">Igisindi</language>
-			<language type="sh">Inyeseribiya na Korowasiya</language>
-			<language type="si">Inyesimpaleze</language>
-			<language type="sk">Igisilovaki</language>
-			<language type="sl">Ikinyasiloveniya</language>
-			<language type="so">Igisomali</language>
-			<language type="sq">Icyalubaniya</language>
-			<language type="sr">Igiseribe</language>
-			<language type="st">Inyesesoto</language>
-			<language type="su">Inyesudani</language>
-			<language type="sv">Igisuweduwa</language>
-			<language type="sw">Igiswahili</language>
-			<language type="ta">Igitamili</language>
-			<language type="te">Igitelugu</language>
-			<language type="th">Igitayi</language>
-			<language type="ti">Inyatigirinya</language>
-			<language type="tk">Inyeturukimeni</language>
-			<language type="tlh">Inyekilingoni</language>
-			<language type="tr">Igiturukiya</language>
-			<language type="tw">Inyetuwi</language>
-			<language type="ug">Ikiwiguri</language>
-			<language type="uk">Ikinyayukereni</language>
-			<language type="ur">Inyeyurudu</language>
-			<language type="uz">Inyeyuzubeki</language>
-			<language type="vi">Ikinyaviyetinamu</language>
-			<language type="xh">Inyehawusa</language>
-			<language type="yi">Inyeyidishi</language>
-			<language type="zu">Inyezulu</language>
-		</languages>
-		<territories>
-			<territory type="TO">Igitonga</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>«</alternateQuotationStart>
-		<alternateQuotationEnd>»</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">mut.</month>
-							<month type="2">gas.</month>
-							<month type="3">wer.</month>
-							<month type="4">mat.</month>
-							<month type="5">gic.</month>
-							<month type="6">kam.</month>
-							<month type="7">nya.</month>
-							<month type="8">kan.</month>
-							<month type="9">nze.</month>
-							<month type="10">ukw.</month>
-							<month type="11">ugu.</month>
-							<month type="12">uku.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Mutarama</month>
-							<month type="2">Gashyantare</month>
-							<month type="3">Werurwe</month>
-							<month type="4">Mata</month>
-							<month type="5">Gicuransi</month>
-							<month type="6">Kamena</month>
-							<month type="7">Nyakanga</month>
-							<month type="8">Kanama</month>
-							<month type="9">Nzeli</month>
-							<month type="10">Ukwakira</month>
-							<month type="11">Ugushyingo</month>
-							<month type="12">Ukuboza</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">cyu.</day>
-							<day type="mon">mbe.</day>
-							<day type="tue">kab.</day>
-							<day type="wed">gtu.</day>
-							<day type="thu">kan.</day>
-							<day type="fri">gnu.</day>
-							<day type="sat">gnd.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ku cyumweru</day>
-							<day type="mon">Kuwa mbere</day>
-							<day type="tue">Kuwa kabiri</day>
-							<day type="wed">Kuwa gatatu</day>
-							<day type="thu">Kuwa kane</day>
-							<day type="fri">Kuwa gatanu</day>
-							<day type="sat">Kuwa gatandatu</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">I1</quarter>
-							<quarter type="2">I2</quarter>
-							<quarter type="3">I3</quarter>
-							<quarter type="4">I4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">igihembwe cya mbere</quarter>
-							<quarter type="2">igihembwe cya kabiri</quarter>
-							<quarter type="3">igihembwe cya gatatu</quarter>
-							<quarter type="4">igihembwe cya kane</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencies>
-			<currency type="RWF">
-				<symbol>RF</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/rw_RW.xml b/airtime_mvc/library/Zend/Locale/Data/rw_RW.xml
deleted file mode 100644
index 10389360d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/rw_RW.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:39 $"/>
-		<language type="rw"/>
-		<territory type="RW"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sa.xml b/airtime_mvc/library/Zend/Locale/Data/sa.xml
deleted file mode 100644
index c9817742f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sa.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="sa"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">अफर</language>
-			<language type="ab">अब�खासियन�</language>
-			<language type="ace">अचिनीस�</language>
-			<language type="ach">अचोलि</language>
-			<language type="ada">अडङ�गमे</language>
-			<language type="af">अफ�रिक�कान�स�</language>
-			<language type="afa">आफ�रो �ष�यन� भाषा</language>
-			<language type="afh">अफ�रिहिलि</language>
-			<language type="ain">अयिन�</language>
-			<language type="ak">अकन�</language>
-			<language type="akk">अक�काटियान�</language>
-			<language type="ale">अलिय�ट�</language>
-			<language type="alg">अल�गोण�क�यन� भाषा</language>
-			<language type="am">अंहाऱिक�</language>
-			<language type="anp">अङ�गिक</language>
-			<language type="apa">अपाचे भाषा</language>
-			<language type="ar">अऱबिक�</language>
-			<language type="egy">प�राचीन ईजिप�त�यन�</language>
-			<language type="grc">प�रातन यवन भाषा</language>
-			<language type="nb">नोर�वीजियन� बॊकामल�</language>
-			<language type="sa">संस�कृत भाषा</language>
-			<language type="sq">अल�बेनियन�</language>
-			<language type="tut">आळटिक� भाषा</language>
-			<language type="und">अज�ञात भाषा</language>
-		</languages>
-		<scripts>
-			<script type="Arab">अरबिक�</script>
-			<script type="Armi">अर�मि</script>
-			<script type="Armn">अर�मेनियन�</script>
-			<script type="Avst">अवेस�थन�</script>
-			<script type="Bali">बालिनीस�</script>
-			<script type="Batk">बट�टक�</script>
-			<script type="Beng">बंगालि</script>
-		</scripts>
-		<territories>
-			<territory type="IN">भारतम�</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[़ �-ः ॑-॔ � अ-ऋ ॠ ऌ ॡ � � ओ-न र ल ळ व-ह ऽ-ॄ ॢ ॣ े ै ो-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D ०-९ � ऑ ॅ ॉ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>hh:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>hh:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>hh:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>hh:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>deva</defaultNumberingSystem>
-		<symbols>
-			<nativeZeroDigit>0</nativeZeroDigit>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>र�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sa_IN.xml b/airtime_mvc/library/Zend/Locale/Data/sa_IN.xml
deleted file mode 100644
index 6dcb92fb7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sa_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sa"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/se.xml b/airtime_mvc/library/Zend/Locale/Data/se.xml
deleted file mode 100644
index 1fd67386e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/se.xml
+++ /dev/null
@@ -1,740 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="se"/>
-	</identity>
-	<fallback>nb sv en</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="ace">acehgiella</language>
-			<language type="af">afrikánsagiella</language>
-			<language type="an">aragoniagiella</language>
-			<language type="ang">boares eaŋgalasgiella</language>
-			<language type="apa">apacheš giella</language>
-			<language type="ar">arábagiella</language>
-			<language type="ast">asturiagiella</language>
-			<language type="be">vilges-ruoššagiella</language>
-			<language type="bg">bulgáriagiella</language>
-			<language type="bn">bengalgiella</language>
-			<language type="br">bretonagiella</language>
-			<language type="bs">bosniagiella</language>
-			<language type="ca">katalánagiella</language>
-			<language type="cel">kelttalaš gielat</language>
-			<language type="chm">marigiella</language>
-			<language type="co">corsicagiella</language>
-			<language type="cs">�eahkagiella</language>
-			<language type="da">dánskkagiella</language>
-			<language type="de">duiskkagiella</language>
-			<language type="el">greikkagiella</language>
-			<language type="en">eaŋgalsgiella</language>
-			<language type="es">spánskkagiella</language>
-			<language type="et">esttegiella</language>
-			<language type="fa">persijagiella</language>
-			<language type="fi">suomagiella</language>
-			<language type="fiu">fenno-ugrálaš giella</language>
-			<language type="fo">fearagiella</language>
-			<language type="fr">fránskkagiella</language>
-			<language type="fy">oarjifriisagiella</language>
-			<language type="ga">iirragiella</language>
-			<language type="gem">germánalaš gielat</language>
-			<language type="gu">gujaratagiella</language>
-			<language type="gv">manksgiella</language>
-			<language type="hi">hindigiella</language>
-			<language type="hr">kroátiagiella</language>
-			<language type="hy">armeenagiella</language>
-			<language type="is">islánddagiella</language>
-			<language type="it">itáliagiella</language>
-			<language type="ja">japánagiella</language>
-			<language type="krl">gárjilgiella</language>
-			<language type="kv">komigiella</language>
-			<language type="kw">kornagiella</language>
-			<language type="la">láhtengiella</language>
-			<language type="lb">luxemburggagiella</language>
-			<language type="lt">liettuvagiella</language>
-			<language type="lv">látviagiella</language>
-			<language type="mdf">mokšagiella</language>
-			<language type="mk">makedoniagiella</language>
-			<language type="myv">ersagiella</language>
-			<language type="nb">girjedárogiella</language>
-			<language type="nl">hollánddagiella</language>
-			<language type="nn">ođđadárogiella</language>
-			<language type="no">dárogiella</language>
-			<language type="oc">oksitánagiella</language>
-			<language type="pl">polskkagiella</language>
-			<language type="pt">portugálagiella</language>
-			<language type="rm">retorománagiella</language>
-			<language type="ro">romániagiella</language>
-			<language type="roa">románalaš gielat</language>
-			<language type="ru">ruoššagiella</language>
-			<language type="sc">sardigiella</language>
-			<language type="scn">sisiliagiella</language>
-			<language type="se">davvisámegiella</language>
-			<language type="sel">selkupagiella</language>
-			<language type="sk">slovákiagiella</language>
-			<language type="sl">slovenagiella</language>
-			<language type="sma">lullisámegiella</language>
-			<language type="smi">sámegielat</language>
-			<language type="smj">julevsámegiella</language>
-			<language type="smn">anárašgiella</language>
-			<language type="sms">nuortalašgiella</language>
-			<language type="sq">albánagiella</language>
-			<language type="sr">serbiagiella</language>
-			<language type="sv">ruoŧagiella</language>
-			<language type="udm">udmurtagiella</language>
-			<language type="uk">ukrainagiella</language>
-			<language type="wa">vallonagiella</language>
-			<language type="wen">sorbigiella</language>
-			<language type="zh">kiinnágiella</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arába</script>
-			<script type="Cyrl">kyrillalaš</script>
-			<script type="Grek">greikkalaš</script>
-			<script type="Latn">láhtenaš</script>
-		</scripts>
-		<territories>
-			<territory type="001">máilbmi</territory>
-			<territory type="002">Afrihkká</territory>
-			<territory type="003">dávvi-Amerihkká ja gaska-Amerihkká</territory>
-			<territory type="005">mátta-Amerihkká</territory>
-			<territory type="009">Oseania</territory>
-			<territory type="011">oarji-Afrihkká</territory>
-			<territory type="013">gaska-Amerihkká</territory>
-			<territory type="014">nuorta-Afrihkká</territory>
-			<territory type="015">davvi-Afrihkká</territory>
-			<territory type="017">gaska-Afrihkká</territory>
-			<territory type="018">mátta-Afrihkká</territory>
-			<territory type="019">Amerihkká</territory>
-			<territory type="021">dávvi-Amerihkká</territory>
-			<territory type="029">Karibia</territory>
-			<territory type="030">nuorta-�sia</territory>
-			<territory type="034">mátta-�sia</territory>
-			<territory type="035">mátta-nuorta-�sia</territory>
-			<territory type="039">mátta-Eurohpá</territory>
-			<territory type="053">Austrália ja Ođđa-Selánda</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">mátta-gaska-�sia</territory>
-			<territory type="142">�sia</territory>
-			<territory type="143">gaska-�sia</territory>
-			<territory type="145">oarji-�sia</territory>
-			<territory type="150">Eurohpá</territory>
-			<territory type="151">nuorta-Eurohpá</territory>
-			<territory type="154">davvi-Eurohpá</territory>
-			<territory type="155">oarji-Eurohpá</territory>
-			<territory type="419">Lulli-Amerihkká ja Karibia</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Ovttastuvvan Arábaemiráhtat</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua ja Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albánia</territory>
-			<territory type="AM">Armenia</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antárktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerihká Samoa</territory>
-			<territory type="AT">Nuortariika</territory>
-			<territory type="AU">Austrália</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ålánda</territory>
-			<territory type="AZ">Aserbaižan</territory>
-			<territory type="BA">Bosnia-Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgia</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgária</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasil</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet-sullot</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Vilges-Ruošša</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanáda</territory>
-			<territory type="CC">Cocos-sullot</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CH">Å veica</territory>
-			<territory type="CK">Cook-sullot</territory>
-			<territory type="CL">ÄŒiile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kiinná</territory>
-			<territory type="CO">Kolombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CY">Kypros</territory>
-			<territory type="CZ">ÄŒeahkka</territory>
-			<territory type="DE">Duiska</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Dánmárku</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DZ">Algeria</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estlánda</territory>
-			<territory type="EG">Egypta</territory>
-			<territory type="EH">Oarje-Sahára</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spánia</territory>
-			<territory type="ET">Etiopia</territory>
-			<territory type="FI">Suopma</territory>
-			<territory type="FJ">Fijisullot</territory>
-			<territory type="FK">Falklandsullot</territory>
-			<territory type="FM">Mikronesia</territory>
-			<territory type="FO">Fearsullot</territory>
-			<territory type="FR">Frankriika</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Stuorra-Británnia</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgia</territory>
-			<territory type="GF">Frankriikka Guayana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Kalaallit Nunaat</territory>
-			<territory type="GM">Gámbia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatoriála Guinea</territory>
-			<territory type="GR">Greika</territory>
-			<territory type="GS">Lulli Georgia ja Lulli Sandwich-sullot</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroátia</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungár</territory>
-			<territory type="ID">Indonesia</territory>
-			<territory type="IE">Irlánda</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Mann</territory>
-			<territory type="IN">India</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islánda</territory>
-			<territory type="IT">Itália</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordánia</territory>
-			<territory type="JP">Japána</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgisistan</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorosullot</territory>
-			<territory type="KN">Saint Kitts ja Nevis</territory>
-			<territory type="KP">Davvi-Korea</territory>
-			<territory type="KR">Mátta-Korea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Cayman-sullot</territory>
-			<territory type="KZ">Kasakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Lietuva</territory>
-			<territory type="LU">Luxembourg</territory>
-			<territory type="LV">Látvia</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Marokko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldávia</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallsullot</territory>
-			<territory type="MK">Makedonia</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Burma</territory>
-			<territory type="MN">Mongolia</territory>
-			<territory type="MO">Makáo</territory>
-			<territory type="MP">Davvi-Mariánat</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauretánia</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Málta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Malediivvat</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malesia</territory>
-			<territory type="MZ">Mosambik</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">OÄ‘Ä‘a-Kaledonia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolksullot</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Vuolleeatnamat</territory>
-			<territory type="NO">Norga</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Ođđa-Selánda</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PG">Papua-OÄ‘Ä‘a-Guinea</territory>
-			<territory type="PH">Filippiinnat</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">Saint Pierre ja Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestina</territory>
-			<territory type="PT">Portugála</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QU">Eurohpa Uniovdna</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Románia</territory>
-			<territory type="RS">Serbia</territory>
-			<territory type="RU">Ruošša</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudi-Arábia</territory>
-			<territory type="SB">Salomon-sullot</territory>
-			<territory type="SC">Seychellsullot</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Ruoŧŧa</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenia</territory>
-			<territory type="SJ">Svalbárda ja Jan Mayen</territory>
-			<territory type="SK">Slovákia</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somália</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé ja Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syria</territory>
-			<territory type="SZ">Svazieana</territory>
-			<territory type="TC">Turks ja Caicos-sullot</territory>
-			<territory type="TD">T�ad</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thaieana</territory>
-			<territory type="TJ">Tažikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Nuorta-Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisia</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Durka</territory>
-			<territory type="TT">Trinidad ja Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzánia</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="US">Amerihká ovttastuvvan stáhtat</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Usbekistan</territory>
-			<territory type="VA">Vatikána</territory>
-			<territory type="VC">Saint Vincent ja Grenadine</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis ja Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Mátta-Afrihká</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-		</territories>
-		<keys>
-			<key type="calendar">kaleandar</key>
-			<key type="currency">valuhtta</key>
-		</keys>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">SI</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">giella: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á b c � d đ e-n ŋ o p r s š t ŧ u v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[à å ä ã æ ç é è í ń ñ ó ò ö ø q ú ü w-y]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a á à å ä æ b c � d đ e é è f-n ń ŋ o ó ò ö ø p-s š t ŧ u ú v x-z ž]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>�</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>’</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0}–{1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ođđj</month>
-							<month type="2">guov</month>
-							<month type="3">njuk</month>
-							<month type="4">cuo</month>
-							<month type="5">mies</month>
-							<month type="6">geas</month>
-							<month type="7">suoi</month>
-							<month type="8">borg</month>
-							<month type="9">�ak�</month>
-							<month type="10">golg</month>
-							<month type="11">skáb</month>
-							<month type="12">juov</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ođđajagemánnu</month>
-							<month type="2">guovvamánnu</month>
-							<month type="3">njuk�amánnu</month>
-							<month type="4">cuoŋománnu</month>
-							<month type="5">miessemánnu</month>
-							<month type="6">geassemánnu</month>
-							<month type="7">suoidnemánnu</month>
-							<month type="8">borgemánnu</month>
-							<month type="9">�ak�amánnu</month>
-							<month type="10">golggotmánnu</month>
-							<month type="11">skábmamánnu</month>
-							<month type="12">juovlamánnu</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">O</month>
-							<month type="2">G</month>
-							<month type="3">N</month>
-							<month type="4">C</month>
-							<month type="5">M</month>
-							<month type="6">G</month>
-							<month type="7">S</month>
-							<month type="8">B</month>
-							<month type="9">Č</month>
-							<month type="10">G</month>
-							<month type="11">S</month>
-							<month type="12">J</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sotn</day>
-							<day type="mon">vuos</day>
-							<day type="tue">maŋ</day>
-							<day type="wed">gask</day>
-							<day type="thu">duor</day>
-							<day type="fri">bear</day>
-							<day type="sat">láv</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">sotnabeaivi</day>
-							<day type="mon">vuossárga</day>
-							<day type="tue">maŋŋebárga</day>
-							<day type="wed">gaskavahkku</day>
-							<day type="thu">duorasdat</day>
-							<day type="fri">bearjadat</day>
-							<day type="sat">lávvardat</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">s</day>
-							<day type="mon">v</day>
-							<day type="tue">m</day>
-							<day type="wed">g</day>
-							<day type="thu">d</day>
-							<day type="fri">b</day>
-							<day type="sat">L</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ovdal Kristtusa</era>
-						<era type="1">maŋŋel Kristtusa</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">o.Kr.</era>
-						<era type="1">m.Kr.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">o.Kr.</era>
-						<era type="1">m.Kr.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>éra</displayName>
-					</field>
-					<field type="year">
-						<displayName>jáhki</displayName>
-					</field>
-					<field type="month">
-						<displayName>mánnu</displayName>
-					</field>
-					<field type="week">
-						<displayName>váhkku</displayName>
-					</field>
-					<field type="day">
-						<displayName>beaivi</displayName>
-						<relative type="-1">ikte</relative>
-						<relative type="0">odne</relative>
-						<relative type="1">ihttin</relative>
-					</field>
-					<field type="weekday">
-						<displayName>váhkkubeaivi</displayName>
-					</field>
-					<field type="hour">
-						<displayName>diibmu</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minuhtta</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>áigeavádat</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-			<gmtFormat>UTC{0}</gmtFormat>
-			<gmtZeroFormat>UTC</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{0} ({1})</fallbackFormat>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>¤¤¤</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-			<unitPattern count="two">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euro</displayName>
-				<displayName count="two">euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>suoma márkki</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>norgga kruvdno</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>ruoŧŧa kruvdno</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>uns silba</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>golli</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} beaivi</unitPattern>
-			<unitPattern count="other">{0} beaivi</unitPattern>
-			<unitPattern count="two">{0} beaivi</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} tiibmu</unitPattern>
-			<unitPattern count="two">{0} tiibmu</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minuhtta</unitPattern>
-			<unitPattern count="other">{0} minuhtta</unitPattern>
-			<unitPattern count="two">{0} minuhtta</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} mánnu</unitPattern>
-			<unitPattern count="other">{0} mánnu</unitPattern>
-			<unitPattern count="two">{0} mánnu</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekunda</unitPattern>
-			<unitPattern count="two">{0} sekunda</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} váhkku</unitPattern>
-			<unitPattern count="other">{0} váhkku</unitPattern>
-			<unitPattern count="two">{0} váhkku</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} jáhki</unitPattern>
-			<unitPattern count="other">{0} jáhki</unitPattern>
-			<unitPattern count="two">{0} jáhki</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>jo</yesstr>
-			<nostr>ii</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/se_FI.xml b/airtime_mvc/library/Zend/Locale/Data/se_FI.xml
deleted file mode 100644
index 4523b4c17..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/se_FI.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.26 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="se"/>
-		<territory type="FI"/>
-	</identity>
-	<fallback>fi_FI</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="ang">ang</language>
-			<language type="apa">apa</language>
-			<language type="be">be</language>
-			<language type="cs">cs</language>
-			<language type="da">da</language>
-			<language type="de">de</language>
-			<language type="el">el</language>
-			<language type="en">en</language>
-			<language type="es">es</language>
-			<language type="et">et</language>
-			<language type="fi">fi</language>
-			<language type="fiu">fiu</language>
-			<language type="fo">fo</language>
-			<language type="fr">fr</language>
-			<language type="gem">gem</language>
-			<language type="is">is</language>
-			<language type="nb">nb</language>
-			<language type="nn">nn</language>
-			<language type="no">no</language>
-			<language type="ru">ru</language>
-			<language type="se">se</language>
-			<language type="sma">sma</language>
-			<language type="smi">smi</language>
-			<language type="smj">smj</language>
-			<language type="smn">smn</language>
-			<language type="sms">sms</language>
-			<language type="sv">sv</language>
-		</languages>
-		<territories>
-			<territory type="002">Afrihká</territory>
-			<territory type="005">Mátta-Amerihká</territory>
-			<territory type="011">Oarji-Afrihká</territory>
-			<territory type="014">014</territory>
-			<territory type="015">Davvi-Afrihká</territory>
-			<territory type="017">Gaska-Afrihká</territory>
-			<territory type="021">Davvi-Amerihká</territory>
-			<territory type="030">Nuorta-�sia</territory>
-			<territory type="034">Mátta-�sia</territory>
-			<territory type="039">Mátta-Eurohpa</territory>
-			<territory type="143">Gaska-�sia</territory>
-			<territory type="145">Oarji-�sia</territory>
-			<territory type="150">Eurohpa</territory>
-			<territory type="151">Nuorta-Eurohpá</territory>
-			<territory type="154">Davvi-Eurohpa</territory>
-			<territory type="155">Oarji-Eurohpa</territory>
-			<territory type="AT">AT</territory>
-			<territory type="AU">AU</territory>
-			<territory type="AX">AX</territory>
-			<territory type="BE">BE</territory>
-			<territory type="BG">BG</territory>
-			<territory type="BR">BR</territory>
-			<territory type="BY">BY</territory>
-			<territory type="CH">CH</territory>
-			<territory type="CM">CM</territory>
-			<territory type="CN">CN</territory>
-			<territory type="CZ">CZ</territory>
-			<territory type="DE">DE</territory>
-			<territory type="DK">DK</territory>
-			<territory type="EE">EE</territory>
-			<territory type="ES">ES</territory>
-			<territory type="FI">FI</territory>
-			<territory type="FO">FO</territory>
-			<territory type="FR">FR</territory>
-			<territory type="GL">GL</territory>
-			<territory type="GR">GR</territory>
-			<territory type="HR">HR</territory>
-			<territory type="HU">HU</territory>
-			<territory type="IE">IE</territory>
-			<territory type="IQ">IQ</territory>
-			<territory type="IR">IR</territory>
-			<territory type="IS">IS</territory>
-			<territory type="IT">IT</territory>
-			<territory type="JP">JP</territory>
-			<territory type="KP">KP</territory>
-			<territory type="KR">KR</territory>
-			<territory type="LB">LB</territory>
-			<territory type="LT">LT</territory>
-			<territory type="LV">LV</territory>
-			<territory type="MA">MA</territory>
-			<territory type="MG">MG</territory>
-			<territory type="MH">MH</territory>
-			<territory type="MK">MK</territory>
-			<territory type="MP">MP</territory>
-			<territory type="MR">MR</territory>
-			<territory type="MV">MV</territory>
-			<territory type="MY">MY</territory>
-			<territory type="NL">NL</territory>
-			<territory type="NO">NO</territory>
-			<territory type="NZ">NZ</territory>
-			<territory type="PH">PH</territory>
-			<territory type="PL">PL</territory>
-			<territory type="PS">PS</territory>
-			<territory type="RU">RU</territory>
-			<territory type="SE">SE</territory>
-			<territory type="SI">SI</territory>
-			<territory type="SJ">SJ</territory>
-			<territory type="SK">SK</territory>
-			<territory type="SR">SR</territory>
-			<territory type="TD">TD</territory>
-			<territory type="TL">TL</territory>
-			<territory type="TR">TR</territory>
-			<territory type="US">US</territory>
-			<territory type="ZA">ZA</territory>
-		</territories>
-		<keys>
-			<key type="calendar">calendar</key>
-			<key type="currency">currency</key>
-		</keys>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ođđajage</month>
-							<month type="2">guovva</month>
-							<month type="3">njuk�a</month>
-							<month type="4">cuoŋo</month>
-							<month type="5">miesse</month>
-							<month type="6">geasse</month>
-							<month type="7">suoidne</month>
-							<month type="8">borge</month>
-							<month type="9">�ak�a</month>
-							<month type="10">golggot</month>
-							<month type="11">skábma</month>
-							<month type="12">juovla</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">aejlege</day>
-							<day type="mon">måanta</day>
-							<day type="tue">däjsta</day>
-							<day type="wed">gaskevahkoe</day>
-							<day type="thu">dåarsta</day>
-							<day type="fri">bearjadahke</day>
-							<day type="sat">laavadahke</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">D</day>
-							<day type="wed">G</day>
-							<day type="thu">D</day>
-							<day type="fri">B</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<eras>
-					<eraNames>
-						<era type="0">BCE</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-					</eraAbbr>
-				</eras>
-				<fields>
-					<field type="year">
-						<displayName>Year</displayName>
-					</field>
-					<field type="month">
-						<displayName>Month</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Day</displayName>
-					</field>
-					<field type="weekday">
-						<displayName>Day of the Week</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hour</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Second</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="FIM">
-				<displayName>FIM</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>NOK</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>SEK</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>XAG</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>XAU</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/se_NO.xml b/airtime_mvc/library/Zend/Locale/Data/se_NO.xml
deleted file mode 100644
index 2edf42f72..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/se_NO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.21 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="se"/>
-		<territory type="NO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sh.xml b/airtime_mvc/library/Zend/Locale/Data/sh.xml
deleted file mode 100644
index b3778d1a0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sh.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sh"/>
-	</identity>
-	<alias source="sr_Latn" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sh_BA.xml b/airtime_mvc/library/Zend/Locale/Data/sh_BA.xml
deleted file mode 100644
index 4be524930..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sh_BA.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sh"/>
-		<territory type="BA"/>
-	</identity>
-	<alias source="sr_Latn_BA" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sh_CS.xml b/airtime_mvc/library/Zend/Locale/Data/sh_CS.xml
deleted file mode 100644
index 3fd7faee5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sh_CS.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sh"/>
-		<territory type="CS"/>
-	</identity>
-	<alias source="sr_Latn_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sh_YU.xml b/airtime_mvc/library/Zend/Locale/Data/sh_YU.xml
deleted file mode 100644
index 8b4ec0808..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sh_YU.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sh"/>
-		<territory type="YU"/>
-	</identity>
-	<alias source="sr_Latn_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/si.xml b/airtime_mvc/library/Zend/Locale/Data/si.xml
deleted file mode 100644
index e6f031a61..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/si.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.7 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="si"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="si">සිංහල</language>
-		</languages>
-		<scripts>
-			<script type="Sinh">සිංහල</script>
-		</scripts>
-		<territories>
-			<territory type="LK">�්�රී ලංක�ව</territory>
-		</territories>
-		<keys>
-			<key type="calendar">දිනදසුන</key>
-			<key type="currency">මුදල්</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">බුද්�ධ දිනදසුන</type>
-			<type type="gregorian" key="calendar">දිනදසුන</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[අ-� එ-ඖ ං ඃ ක-ඣ ඥ ඤ ට-න ඳ-ර ල ව-ෆ �-\u0DD4 \u0DD6 ෘ ෲ ෟ ෙ-ෞ \u0DCA]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200B-\u200D ඎ-� ඦ ෳ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ජන</month>
-							<month type="2">පෙබ</month>
-							<month type="3">ම�ර්ත</month>
-							<month type="4">අප්�රේල</month>
-							<month type="5">ම�ය</month>
-							<month type="6">ජූන</month>
-							<month type="7">ජූල</month>
-							<month type="8">අග�</month>
-							<month type="9">ස�ප</month>
-							<month type="10">ඔක</month>
-							<month type="11">නොව�</month>
-							<month type="12">දෙස�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ජනව�ර</month>
-							<month type="2">පෙබරව�ර</month>
-							<month type="3">ම�ර්ත</month>
-							<month type="4">අප්�රේල්</month>
-							<month type="5">ම�යි</month>
-							<month type="6">ජූන</month>
-							<month type="7">ජූලි</month>
-							<month type="8">අග�ස්තු</month>
-							<month type="9">ස�ප්ත�ම්බර්</month>
-							<month type="10">ඔක්ත�බර්</month>
-							<month type="11">නොව�ම්බර්</month>
-							<month type="12">දෙස�ම්බර්</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ජ</month>
-							<month type="2">පෙ</month>
-							<month type="3">ම�</month>
-							<month type="4">අ</month>
-							<month type="5">ම�</month>
-							<month type="6">ජූ</month>
-							<month type="7">ජූ</month>
-							<month type="8">අ</month>
-							<month type="9">ස�</month>
-							<month type="10">ඔ</month>
-							<month type="11">නො</month>
-							<month type="12">දෙ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ඉරි</day>
-							<day type="mon">සඳු</day>
-							<day type="tue">අඟ</day>
-							<day type="wed">බද�</day>
-							<day type="thu">බ්�රහ</day>
-							<day type="fri">සිකු</day>
-							<day type="sat">සෙන</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ඉරිද�</day>
-							<day type="mon">සඳුද�</day>
-							<day type="tue">අඟහරුව�ද�</day>
-							<day type="wed">බද�ද�</day>
-							<day type="thu">බ්�රහස්පතින්ද�</day>
-							<day type="fri">සිකුර�ද�</day>
-							<day type="sat">සෙනසුර�ද�</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ඉ</day>
-							<day type="mon">à·ƒ</day>
-							<day type="tue">අ</day>
-							<day type="wed">බ</day>
-							<day type="thu">බ්�ර</day>
-							<day type="fri">සි</day>
-							<day type="sat">සෙ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">ක�ර්:1</quarter>
-							<quarter type="2">ක�ර්:2</quarter>
-							<quarter type="3">ක�ර්:3</quarter>
-							<quarter type="4">ක�ර්:4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1 වන ක�ර්තුව</quarter>
-							<quarter type="2">2 වන ක�ර්තුව</quarter>
-							<quarter type="3">3 වන ක�ර්තුව</quarter>
-							<quarter type="4">4 වන ක�ර්තුව</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>පෙ.ව.</am>
-				<pm>ප.ව.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ක්�රිස්තු පූර්�ව</era>
-						<era type="1">ක්�රිස්තු වර්�ෂ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ක්�රි.පූ.</era>
-						<era type="1">ක්�රි.ව.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<fields>
-					<field type="day">
-						<relative type="-1">ඊයෙ</relative>
-						<relative type="0">අද</relative>
-						<relative type="1">හෙට</relative>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<metazone type="Lanka">
-				<long>
-					<standard>�්�රී ලංක� වේල�ව</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##,##0.00;(¤#,##,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="LKR">
-				<displayName>ලංක� රුපියල්</displayName>
-				<symbol>SL Re</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ඔව්:ඔ</yesstr>
-			<nostr>න�ත:න�</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/si_LK.xml b/airtime_mvc/library/Zend/Locale/Data/si_LK.xml
deleted file mode 100644
index 4f0bbd446..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/si_LK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="si"/>
-		<territory type="LK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sid.xml b/airtime_mvc/library/Zend/Locale/Data/sid.xml
deleted file mode 100644
index 9f85591e4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sid.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="sid"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">Arabic</language>
-			<language type="de">German</language>
-			<language type="en">English</language>
-			<language type="es">Spanish</language>
-			<language type="fr">French</language>
-			<language type="hi">Hindi</language>
-			<language type="it">Italian</language>
-			<language type="ja">Japanese</language>
-			<language type="pt">Portuguese</language>
-			<language type="ru">Russian</language>
-			<language type="sid">Sidaamu Afo</language>
-			<language type="zh">Chinese</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Latin</script>
-		</scripts>
-		<territories>
-			<territory type="BR">Brazil</territory>
-			<territory type="CN">China</territory>
-			<territory type="DE">Germany</territory>
-			<territory type="ET">Itiyoophiya</territory>
-			<territory type="FR">France</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="IN">India</territory>
-			<territory type="IT">Italy</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="RU">Russia</territory>
-			<territory type="US">United States</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">May</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aug</month>
-							<month type="9">Sep</month>
-							<month type="10">Oct</month>
-							<month type="11">Nov</month>
-							<month type="12">Dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">January</month>
-							<month type="2">February</month>
-							<month type="3">March</month>
-							<month type="4">April</month>
-							<month type="5">May</month>
-							<month type="6">June</month>
-							<month type="7">July</month>
-							<month type="8">August</month>
-							<month type="9">September</month>
-							<month type="10">October</month>
-							<month type="11">November</month>
-							<month type="12">December</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Sam</day>
-							<day type="mon">San</day>
-							<day type="tue">Mak</day>
-							<day type="wed">Row</day>
-							<day type="thu">Ham</day>
-							<day type="fri">Arb</day>
-							<day type="sat">Qid</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sambata</day>
-							<day type="mon">Sanyo</day>
-							<day type="tue">Maakisanyo</day>
-							<day type="wed">Roowe</day>
-							<day type="thu">Hamuse</day>
-							<day type="fri">Arbe</day>
-							<day type="sat">Qidaame</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">S</day>
-							<day type="tue">M</day>
-							<day type="wed">R</day>
-							<day type="thu">H</day>
-							<day type="fri">A</day>
-							<day type="sat">Q</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>soodo</am>
-				<pm>hawwaro</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">YIA</era>
-						<era type="1">YIG</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Chinese Yuan Renminbi</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>British Pound Sterling</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indian Rupee</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanese Yen</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russian Ruble</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US Dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sid_ET.xml b/airtime_mvc/library/Zend/Locale/Data/sid_ET.xml
deleted file mode 100644
index 479c972dc..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sid_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sid"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sk.xml b/airtime_mvc/library/Zend/Locale/Data/sk.xml
deleted file mode 100644
index 76757fa58..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sk.xml
+++ /dev/null
@@ -1,1899 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.101 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="sk"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">afar�ina</language>
-			<language type="ab">abcházština</language>
-			<language type="ach">a�oli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adyg�ina</language>
-			<language type="ae">avest�ina</language>
-			<language type="af">afrikán�ina</language>
-			<language type="afa">afroázijské jazyky</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ain�ina</language>
-			<language type="ak">akan�ina</language>
-			<language type="akk">akkad�ina</language>
-			<language type="ale">aleut�ina</language>
-			<language type="alg">algonkinské jazyky</language>
-			<language type="am">amhar�ina</language>
-			<language type="an">aragón�ina</language>
-			<language type="anp">angika</language>
-			<language type="apa">apa�ské jazyky</language>
-			<language type="ar">arab�ina</language>
-			<language type="arn">araukán�ina</language>
-			<language type="arp">arapaho</language>
-			<language type="art">umelý jazyk</language>
-			<language type="arw">arawa�tina</language>
-			<language type="as">ásám�ina</language>
-			<language type="ast">astúr�ina</language>
-			<language type="ath">athabaské jazyky</language>
-			<language type="aus">austrálske jazyky</language>
-			<language type="av">avar�ina</language>
-			<language type="awa">avadh�ina</language>
-			<language type="ay">aymar�ina</language>
-			<language type="az">azerbajdžan�ina</language>
-			<language type="ba">baskir�ina</language>
-			<language type="bai">bamileke</language>
-			<language type="bal">balú�tina</language>
-			<language type="ban">balij�ina</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltské jazyky</language>
-			<language type="be">bieloruština</language>
-			<language type="bej">bedža</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberské jazyky</language>
-			<language type="bg">bulhar�ina</language>
-			<language type="bh">bihárske jazyky</language>
-			<language type="bho">bhódžpur�ina</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bm">bambar�ina</language>
-			<language type="bn">bengál�ina</language>
-			<language type="bnt">bantuské jazyky</language>
-			<language type="bo">tibet�ina</language>
-			<language type="br">bretón�ina</language>
-			<language type="bra">bradž�ina</language>
-			<language type="bs">bosnia�tina</language>
-			<language type="btk">batacké jazyky</language>
-			<language type="bua">buriat�ina</language>
-			<language type="bug">bugiština</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalán�ina</language>
-			<language type="cai">jazyk stredoamerických indiánov</language>
-			<language type="car">karibský</language>
-			<language type="cau">kaukazské jazyky</language>
-			<language type="ce">�e�en�ina</language>
-			<language type="ceb">cebuán�ina</language>
-			<language type="cel">keltské jazyky</language>
-			<language type="ch">�amor�ina</language>
-			<language type="chb">�ib�a</language>
-			<language type="chg">�agataj�ina</language>
-			<language type="chn">�inucký žargón</language>
-			<language type="cho">�oktav�ina</language>
-			<language type="chp">�ipevaj�ina</language>
-			<language type="chr">�erokí</language>
-			<language type="chy">�ejen�ina</language>
-			<language type="cmc">�amaské jazyky</language>
-			<language type="co">korzi�tina</language>
-			<language type="cr">krí</language>
-			<language type="cs">�eština</language>
-			<language type="cu">cirkevná slovan�ina</language>
-			<language type="cv">�uvaština</language>
-			<language type="cy">waleština</language>
-			<language type="da">dán�ina</language>
-			<language type="dak">dakot�ina</language>
-			<language type="dar">dargin�ina</language>
-			<language type="de">nem�ina</language>
-			<language type="del">delawar�ina</language>
-			<language type="den">slovan�ina</language>
-			<language type="dgr">dogrib�ina</language>
-			<language type="din">dinka</language>
-			<language type="doi">dógrí</language>
-			<language type="dra">drávidské jazyky</language>
-			<language type="dua">duala</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">�ula</language>
-			<language type="dz">dzongkä</language>
-			<language type="ee">eweština</language>
-			<language type="efi">efik</language>
-			<language type="egy">staroegyptský</language>
-			<language type="eka">ekadžuk</language>
-			<language type="el">gré�tina</language>
-			<language type="elx">elam�ina</language>
-			<language type="en">angli�tina</language>
-			<language type="en_AU">austrálska angli�tina</language>
-			<language type="en_GB">britská angli�tina</language>
-			<language type="en_US">americká angli�tina</language>
-			<language type="eo">esperanto</language>
-			<language type="es">španiel�ina</language>
-			<language type="et">estón�ina</language>
-			<language type="eu">baski�tina</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">perzština</language>
-			<language type="fan">fang�ina</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulb�ina</language>
-			<language type="fi">fín�ina</language>
-			<language type="fil">filipín�ina</language>
-			<language type="fiu">ugrofínske jazyky</language>
-			<language type="fj">fidžij�ina</language>
-			<language type="fo">faer�ina</language>
-			<language type="fon">fon�ina</language>
-			<language type="fr">francúzština</language>
-			<language type="frs">východná frízština</language>
-			<language type="fur">friul�ina</language>
-			<language type="fy">západná frízština</language>
-			<language type="ga">ír�ina</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaja</language>
-			<language type="gd">škót�ina</language>
-			<language type="gem">germánske jazyky</language>
-			<language type="gl">galícij�ina</language>
-			<language type="gn">guaraní</language>
-			<language type="got">gót�ina</language>
-			<language type="grc">starogré�tina</language>
-			<language type="gsw">švaj�iarska nem�ina</language>
-			<language type="gu">gudžarát�ina</language>
-			<language type="gv">man�ina</language>
-			<language type="ha">hauština</language>
-			<language type="haw">havaj�ina</language>
-			<language type="he">hebrej�ina</language>
-			<language type="hi">hind�ina</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">chorvát�ina</language>
-			<language type="ht">haitský</language>
-			<language type="hu">ma�ar�ina</language>
-			<language type="hy">armén�ina</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="id">indonézština</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">igboština</language>
-			<language type="ine">indoeurópske jazyky</language>
-			<language type="ira">iránske jazyky</language>
-			<language type="is">island�ina</language>
-			<language type="it">talian�ina</language>
-			<language type="ja">japon�ina</language>
-			<language type="jv">jáv�ina</language>
-			<language type="ka">gruzín�ina</language>
-			<language type="kg">konžština</language>
-			<language type="kj">kuaňama</language>
-			<language type="kk">kazaština</language>
-			<language type="kl">grónska eskimá�tina</language>
-			<language type="km">kambodžská khmér�ina</language>
-			<language type="kn">kannad�ina</language>
-			<language type="ko">kórej�ina</language>
-			<language type="kr">kanurij�ina</language>
-			<language type="ks">kašmír�ina</language>
-			<language type="ku">kurd�ina</language>
-			<language type="kv">komij�ina</language>
-			<language type="kw">korn�ina</language>
-			<language type="ky">kirgizština</language>
-			<language type="la">latin�ina</language>
-			<language type="lb">luxembur�ina</language>
-			<language type="lg">gand�ina</language>
-			<language type="ln">lingal�ina</language>
-			<language type="lo">laoština</language>
-			<language type="lol">mongo</language>
-			<language type="lt">litov�ina</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lv">lotyština</language>
-			<language type="map">austronézske jazyky</language>
-			<language type="mg">malgaština</language>
-			<language type="mh">kajin-majol</language>
-			<language type="mi">maorij�ina</language>
-			<language type="mk">macedón�ina</language>
-			<language type="ml">malajálam�ina</language>
-			<language type="mn">mongol�ina</language>
-			<language type="mo">moldav�ina</language>
-			<language type="mr">maráth�ina</language>
-			<language type="ms">malaj�ina</language>
-			<language type="mt">malt�ina</language>
-			<language type="my">barm�ina</language>
-			<language type="myn">mayské jazyky</language>
-			<language type="myv">erzjan�ina</language>
-			<language type="na">nauru</language>
-			<language type="nai">jazyk severoamerických indiánov</language>
-			<language type="nb">bokmål</language>
-			<language type="ne">nepál�ina</language>
-			<language type="ng">ndonga</language>
-			<language type="nl">holand�ina</language>
-			<language type="nn">nórsky nynorsk</language>
-			<language type="no">nór�ina</language>
-			<language type="nv">navajo</language>
-			<language type="ny">�ewa</language>
-			<language type="oc">okcitán�ina</language>
-			<language type="oj">odžibva</language>
-			<language type="om">orom�ina</language>
-			<language type="or">uríj�ina</language>
-			<language type="os">oset�ina</language>
-			<language type="pa">pandžáb�ina</language>
-			<language type="paa">papuánsky</language>
-			<language type="pi">pálí</language>
-			<language type="pl">poľština</language>
-			<language type="ps">paštún�ina</language>
-			<language type="pt">portugal�ina</language>
-			<language type="pt_BR">brazílska portugal�ina</language>
-			<language type="qu">ke�uán�ina</language>
-			<language type="rm">rétoromán�ina</language>
-			<language type="rn">rund�ina</language>
-			<language type="ro">rumun�ina</language>
-			<language type="ru">ruština</language>
-			<language type="rw">rwand�ina</language>
-			<language type="sa">sanskrit</language>
-			<language type="sai">jazyk juhoamerických indiánov</language>
-			<language type="sc">sardín�ina</language>
-			<language type="scn">sicíl�ina</language>
-			<language type="sd">sindh�ina</language>
-			<language type="sg">sango</language>
-			<language type="sgn">znaková re�</language>
-			<language type="sh">srbochorvát�ina</language>
-			<language type="si">sinhal�ina</language>
-			<language type="sk">sloven�ina</language>
-			<language type="sl">slovin�ina</language>
-			<language type="sla">slovenský jazyk</language>
-			<language type="sm">samoj�ina</language>
-			<language type="sn">šon�ina</language>
-			<language type="so">somál�ina</language>
-			<language type="sq">albán�ina</language>
-			<language type="sr">srb�ina</language>
-			<language type="ss">svazij�ina</language>
-			<language type="st">južná soth�ina</language>
-			<language type="su">sund�ina</language>
-			<language type="sux">sumer�ina</language>
-			<language type="sv">švéd�ina</language>
-			<language type="sw">swahil�ina</language>
-			<language type="syr">sýr�ina</language>
-			<language type="ta">tamil�ina</language>
-			<language type="te">telug�ina</language>
-			<language type="tg">tadži�tina</language>
-			<language type="th">thaj�ina</language>
-			<language type="ti">tigrej�ina</language>
-			<language type="tk">turkmén�ina</language>
-			<language type="tl">tagal�ina</language>
-			<language type="tlh">klingón�ina</language>
-			<language type="tn">tswan�ina</language>
-			<language type="to">tonžtina</language>
-			<language type="tr">ture�tina</language>
-			<language type="ts">tsonga</language>
-			<language type="tt">tatár�ina</language>
-			<language type="tut">altajské jazyky</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahit�ina</language>
-			<language type="ug">ujgur�ina</language>
-			<language type="uk">ukrajin�ina</language>
-			<language type="und">neznámy alebo neplatný jazyk</language>
-			<language type="ur">urd�ina</language>
-			<language type="uz">uzbe�tina</language>
-			<language type="ve">vend�ina</language>
-			<language type="vi">vietnam�ina</language>
-			<language type="vo">volapük</language>
-			<language type="wa">valón�ina</language>
-			<language type="wo">wolof</language>
-			<language type="xh">xhosa</language>
-			<language type="yi">jidiš</language>
-			<language type="yo">jorub�ina</language>
-			<language type="za">�uang�ina</language>
-			<language type="zh">�ínština</language>
-			<language type="zh_Hans">zjednodušená �ínština</language>
-			<language type="zh_Hant">tradi�ná �ínština</language>
-			<language type="zu">zuluština</language>
-			<language type="zxx">bez jazykového obsahu</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arabský</script>
-			<script type="Armn">Arménsky</script>
-			<script type="Bali">balijský</script>
-			<script type="Beng">bengálsky</script>
-			<script type="Brai">Braillovo písmo</script>
-			<script type="Cyrl">Cyrilika</script>
-			<script type="Egyp">egyptské hieroglyfy</script>
-			<script type="Ethi">etiópsky</script>
-			<script type="Glag">hlaholika</script>
-			<script type="Goth">gotický</script>
-			<script type="Grek">Grécky</script>
-			<script type="Hebr">hebrejský</script>
-			<script type="Jpan">japonský</script>
-			<script type="Khmr">kmérsky</script>
-			<script type="Kore">kórejský</script>
-			<script type="Latn">latinka</script>
-			<script type="Lina">lineárna A</script>
-			<script type="Linb">lineárna B</script>
-			<script type="Maya">mayské hieroglyfy</script>
-			<script type="Mong">mongolský</script>
-			<script type="Osma">osmanský</script>
-			<script type="Runr">Runové písmo</script>
-			<script type="Tibt">tibetský</script>
-			<script type="Zyyy">Obecný</script>
-		</scripts>
-		<territories>
-			<territory type="001">Svet</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Severná Amerika (003)</territory>
-			<territory type="005">Južná Amerika</territory>
-			<territory type="009">Oceánia</territory>
-			<territory type="011">Západná Afrika</territory>
-			<territory type="013">Stredná Amerika</territory>
-			<territory type="014">Východná Afrika</territory>
-			<territory type="015">Severná Afrika</territory>
-			<territory type="017">Stredná Afrika</territory>
-			<territory type="018">Južná Afrika [018]</territory>
-			<territory type="019">Americký kontinent</territory>
-			<territory type="021">Severná Amerika</territory>
-			<territory type="029">Karibik</territory>
-			<territory type="030">Východná �zia</territory>
-			<territory type="034">Južná �zia</territory>
-			<territory type="035">Juhovýchodná �zia</territory>
-			<territory type="039">Južná Európa</territory>
-			<territory type="053">Austrália a Nový Zéland</territory>
-			<territory type="054">Melanézia</territory>
-			<territory type="057">Mikronésia</territory>
-			<territory type="061">Polynézia</territory>
-			<territory type="062">Stredná a južná �zia</territory>
-			<territory type="142">�zia</territory>
-			<territory type="143">Stredná �zia</territory>
-			<territory type="145">Západná �zia</territory>
-			<territory type="150">Európa</territory>
-			<territory type="151">Východná Európa</territory>
-			<territory type="154">Severná Európa</territory>
-			<territory type="155">Západná Európa</territory>
-			<territory type="172">Spolo�enstvo nezávislých štátov</territory>
-			<territory type="200">ÄŒeskoslovensko</territory>
-			<territory type="419">Latinská Amerika a Karibik</territory>
-			<territory type="830">Kanál La Manche</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Spojené arabské emiráty</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua a Barbados</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albánsko</territory>
-			<territory type="AM">Arménsko</territory>
-			<territory type="AN">Holandské Antily</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarctica</territory>
-			<territory type="AR">Argentína</territory>
-			<territory type="AS">Americká Samoa</territory>
-			<territory type="AT">Rakúsko</territory>
-			<territory type="AU">Austrália</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandské ostrovy</territory>
-			<territory type="AZ">Azerbajdžan</territory>
-			<territory type="BA">Bosna a Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladéš</territory>
-			<territory type="BE">Belgicko</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulharsko</territory>
-			<territory type="BH">Bahrajn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Svätý Bartolomej</territory>
-			<territory type="BM">Bermudy</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolívia</territory>
-			<territory type="BR">Brazília</territory>
-			<territory type="BS">Bahamy</territory>
-			<territory type="BT">Bután</territory>
-			<territory type="BV">Bouvetov ostrov</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Bielorusko</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosové ostrovy</territory>
-			<territory type="CD">Konžská demokratická republika</territory>
-			<territory type="CF">Stredoafrická republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Švaj�iarsko</territory>
-			<territory type="CI">Pobrežie Slonoviny</territory>
-			<territory type="CK">Cookove ostrovy</territory>
-			<territory type="CL">ÄŒile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Čína</territory>
-			<territory type="CO">Kolumbia</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Srbsko a ÄŒierna Hora</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kapverdy</territory>
-			<territory type="CX">Viano�ný ostrov</territory>
-			<territory type="CY">Cyprus</territory>
-			<territory type="CZ">Česká republika</territory>
-			<territory type="DE">Nemecko</territory>
-			<territory type="DJ">Džibuti</territory>
-			<territory type="DK">Dánsko</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikánska republika</territory>
-			<territory type="DZ">Alžírsko</territory>
-			<territory type="EC">Ekvádor</territory>
-			<territory type="EE">Estónsko</territory>
-			<territory type="EG">Egypt</territory>
-			<territory type="EH">Západná Sahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Å panielsko</territory>
-			<territory type="ET">Etiópia</territory>
-			<territory type="FI">Fínsko</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandské ostrovy</territory>
-			<territory type="FM">Mikronézia</territory>
-			<territory type="FO">Faerské ostrovy</territory>
-			<territory type="FR">Francúzsko</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Spojené kráľovstvo</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzínsko</territory>
-			<territory type="GF">Francúzska Guayana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltár</territory>
-			<territory type="GL">Grónsko</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Rovníková Guinea</territory>
-			<territory type="GR">Grécko</territory>
-			<territory type="GS">Južná Georgia a Južné Sandwichove ostrovy</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guayana</territory>
-			<territory type="HK">Hong Kong S.A.R. Číny</territory>
-			<territory type="HM">Heardove ostrovy a McDonaldove ostrovy</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Chorvátsko</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ma�arsko</territory>
-			<territory type="ID">Indonézia</territory>
-			<territory type="IE">�rsko</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Ostrov Man</territory>
-			<territory type="IN">India</territory>
-			<territory type="IO">Britské územie v Indickom oceáne</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Irán</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Taliansko</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordánsko</territory>
-			<territory type="JP">Japonsko</territory>
-			<territory type="KE">Keňa</territory>
-			<territory type="KG">Kirgizsko</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komory</territory>
-			<territory type="KN">Saint Kitts a Nevis</territory>
-			<territory type="KP">Kórejská ľudovodemokratická republika</territory>
-			<territory type="KR">Kórejská republika</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanské ostrovy</territory>
-			<territory type="KZ">Kazachstan</territory>
-			<territory type="LA">Laoská ľudovodemokratická republika</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Svätá Lucia</territory>
-			<territory type="LI">Lichtenštajnsko</territory>
-			<territory type="LK">Srí Lanka</territory>
-			<territory type="LR">Libéria</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litva</territory>
-			<territory type="LU">Luxembursko</territory>
-			<territory type="LV">Lotyšsko</territory>
-			<territory type="LY">Lýbijská arabská džamahírija</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavsko</territory>
-			<territory type="ME">ÄŒierna Hora</territory>
-			<territory type="MF">Svätý Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallove ostrovy</territory>
-			<territory type="MK">Macedónsko</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mjanmarsko</territory>
-			<territory type="MN">Mongolsko</territory>
-			<territory type="MO">Makao S.A.R. Číny</territory>
-			<territory type="MP">Severné Mariány</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mauritánia</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Maurícius</territory>
-			<territory type="MV">Maldivy</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malajzia</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namíbia</territory>
-			<territory type="NC">Nová Kaledónia</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkov ostrov</territory>
-			<territory type="NG">Nigéria</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Holandsko</territory>
-			<territory type="NO">Nórsko</territory>
-			<territory type="NP">Nepál</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nový Zéland</territory>
-			<territory type="OM">Omán</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francúzska Polynézia</territory>
-			<territory type="PG">Papua Nová Guinea</territory>
-			<territory type="PH">Filipíny</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poľsko</territory>
-			<territory type="PM">Saint Pierre a Miquelon</territory>
-			<territory type="PN">Pitcairnove ostrovy</territory>
-			<territory type="PR">Portoriko</territory>
-			<territory type="PS">Palestínske územie</territory>
-			<territory type="PT">Portugalsko</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Tichomorie - ostatné</territory>
-			<territory type="QU">Európska únia</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Rumunsko</territory>
-			<territory type="RS">Srbsko</territory>
-			<territory type="RU">Ruská federácia</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudská Arábia</territory>
-			<territory type="SB">Šalamúnove ostrovy</territory>
-			<territory type="SC">Seychelské ostrovy</territory>
-			<territory type="SD">Sudán</territory>
-			<territory type="SE">Švédsko</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Svätá Helena</territory>
-			<territory type="SI">Slovinsko</territory>
-			<territory type="SJ">Å picbergy a Jan Mayen</territory>
-			<territory type="SK">Slovenská republika</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Maríno</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somálsko</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Svätý Tomáš a Princove ostrovy</territory>
-			<territory type="SV">Salvador</territory>
-			<territory type="SY">Sýrska arabská republika</territory>
-			<territory type="SZ">Svazijsko</territory>
-			<territory type="TC">Turks a Caicos</territory>
-			<territory type="TD">ÄŒad</territory>
-			<territory type="TF">Francúzske južné územia</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thajsko</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Východný Timor</territory>
-			<territory type="TM">Turkménsko</territory>
-			<territory type="TN">Tunisko</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turecko</territory>
-			<territory type="TT">Trinidad a Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajwan</territory>
-			<territory type="TZ">Tanzánia</territory>
-			<territory type="UA">Ukrajina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Menšie odľahlé ostrovy USA</territory>
-			<territory type="US">Spojené štáty</territory>
-			<territory type="UY">Uruguaj</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikán</territory>
-			<territory type="VC">Svätý Vincent a Grenadíny</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britské panenské ostrovy</territory>
-			<territory type="VI">Panenské ostrovy - USA</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis a Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Južná Afrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">Neznámy alebo neplatný región</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Kalendár</key>
-			<key type="collation">Triedenie</key>
-			<key type="currency">Mena</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Tradi�ný �ínsky Big5</type>
-			<type type="buddhist" key="calendar">Buddhistický kalendár</type>
-			<type type="chinese" key="calendar">Čínsky kalendár</type>
-			<type type="direct" key="collation">Priame triedenie</type>
-			<type type="gb2312han" key="collation">Zjednodušený �ínsky GB2312</type>
-			<type type="gregorian" key="calendar">Gregoriánsky kalendár</type>
-			<type type="hebrew" key="calendar">Židovský kalendár</type>
-			<type type="indian" key="calendar">Indický národný kalendár</type>
-			<type type="islamic" key="calendar">Islamský kalendár</type>
-			<type type="islamic-civil" key="calendar">Islamský ob�iansky kalendár</type>
-			<type type="japanese" key="calendar">Japonský kalendár</type>
-			<type type="phonebook" key="collation">Lexikografické triedenie</type>
-			<type type="pinyin" key="collation">Triedenie pinyin</type>
-			<type type="roc" key="calendar">Kalendár Čínskej republiky</type>
-			<type type="stroke" key="collation">Tiedenie podľa ťahov</type>
-			<type type="traditional" key="collation">Tradi�né</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrický</measurementSystemName>
-			<measurementSystemName type="US">Americký</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Jazyk: {0}</codePattern>
-			<codePattern type="script">Skript: {0}</codePattern>
-			<codePattern type="territory">Región: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a á ä b c � d � e é f-h {ch} i í j-l ĺ ľ m n ň o ó ô p-r ŕ s š t ť u ú v-y ý z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[à ă â å � æ ç è ĕ ê ë ē ì ĭ î ï ī ñ ò � ö ø � œ ß ù ŭ û ü ū ÿ]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‚</quotationStart>
-		<quotationEnd>‘</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">máj</month>
-							<month type="6">jún</month>
-							<month type="7">júl</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januára</month>
-							<month type="2">februára</month>
-							<month type="3">marca</month>
-							<month type="4">apríla</month>
-							<month type="5">mája</month>
-							<month type="6">júna</month>
-							<month type="7">júla</month>
-							<month type="8">augusta</month>
-							<month type="9">septembra</month>
-							<month type="10">októbra</month>
-							<month type="11">novembra</month>
-							<month type="12">decembra</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">j</month>
-							<month type="2">f</month>
-							<month type="3">m</month>
-							<month type="4">a</month>
-							<month type="5">m</month>
-							<month type="6">j</month>
-							<month type="7">j</month>
-							<month type="8">a</month>
-							<month type="9">s</month>
-							<month type="10">o</month>
-							<month type="11">n</month>
-							<month type="12">d</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">január</month>
-							<month type="2">február</month>
-							<month type="3">marec</month>
-							<month type="4">apríl</month>
-							<month type="5">máj</month>
-							<month type="6">jún</month>
-							<month type="7">júl</month>
-							<month type="8">august</month>
-							<month type="9">september</month>
-							<month type="10">október</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ne</day>
-							<day type="mon">po</day>
-							<day type="tue">ut</day>
-							<day type="wed">st</day>
-							<day type="thu">Å¡t</day>
-							<day type="fri">pi</day>
-							<day type="sat">so</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">nedeľa</day>
-							<day type="mon">pondelok</day>
-							<day type="tue">utorok</day>
-							<day type="wed">streda</day>
-							<day type="thu">Å¡tvrtok</day>
-							<day type="fri">piatok</day>
-							<day type="sat">sobota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">N</day>
-							<day type="mon">P</day>
-							<day type="tue">U</day>
-							<day type="wed">S</day>
-							<day type="thu">Å </day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. štvrťrok</quarter>
-							<quarter type="2">2. štvrťrok</quarter>
-							<quarter type="3">3. štvrťrok</quarter>
-							<quarter type="4">4. štvrťrok</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>dopoludnia</am>
-				<pm>popoludní</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">pred n.l.</era>
-						<era type="1">n.l.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d.</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE, d.</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Md">d.M.</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M.</dateFormatItem>
-						<dateFormatItem id="MMMd">d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d. MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d. - d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm - HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm - HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm - HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm - HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm - HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm - HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.-M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M. - d.M.</greatestDifference>
-							<greatestDifference id="M">d.M. - d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M. - E, d.M.</greatestDifference>
-							<greatestDifference id="M">E, d.M. - E, d.M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d. - d. MMM</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y - y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yyyy - M.yyyy</greatestDifference>
-							<greatestDifference id="y">M.yyyy - M.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="M">d.M.yy - d.M.yy</greatestDifference>
-							<greatestDifference id="y">d.M.yy - d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="M">E, d.M.yy - E, d.M.yy</greatestDifference>
-							<greatestDifference id="y">E, d.M.yy - E, d.M.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM - MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d. - d. MMM y</greatestDifference>
-							<greatestDifference id="M">d. MMM - d. MMM y</greatestDifference>
-							<greatestDifference id="y">d. MMM y - d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d. - E, d. MMM y</greatestDifference>
-							<greatestDifference id="M">E, d. MMM - E, d. MMM y</greatestDifference>
-							<greatestDifference id="y">E, d. MMM y - E, d. MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Éra</displayName>
-					</field>
-					<field type="year">
-						<displayName>Rok</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mesiac</displayName>
-					</field>
-					<field type="week">
-						<displayName>Týždeň</displayName>
-					</field>
-					<field type="day">
-						<displayName>Deň</displayName>
-						<relative type="-3">Pred tromi dňami</relative>
-						<relative type="-2">Predv�erom</relative>
-						<relative type="-1">V�era</relative>
-						<relative type="0">Dnes</relative>
-						<relative type="1">Zajtra</relative>
-						<relative type="2">Pozajtra</relative>
-						<relative type="3">O tri dni</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Deň v týždni</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Časť dňa</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hodina</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minúta</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Pásmo</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Neznáme �asové pásmo</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Južný pól</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudy</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Veľkono�né ostrovy</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Å anghaj</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kapverdy</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibutsko</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapágy</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanárske ostrovy</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londýn</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibraltár</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvajt</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxembursko</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulanbátar</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinik</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Maurícius</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maledivy</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairnove ostrovy</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portoriko</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorské ostrovy</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsko</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkutsko</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsko</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvádor</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užhorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kyjev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Záporožie</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Aljaška</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Severná Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorská peseta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>UAE dirham</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albánsky lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Armenský dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Nizozemský Antilský guilder</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolská kwanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolská kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolská nová kwanza (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolská kwanza Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentinský austral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinské peso (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinské peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Rakúsky šiling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Austrálsky dolár</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubský guilder</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbaidžanský manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosnianský dinár</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosnianský konvertibilná marka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadoský dolár</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladéšska taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgický frank (konvertibilný)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgický frank</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgický frank (finan�ný)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulharský leva</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bulharský leva nový</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahraiský dinár</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundský frank</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudský dolár</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Bruneiský dolár</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolívijské Boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivíjske peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivíjske mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Bolivíjske Cruzeiro Novo (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Bolivíjske cruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Bolivíjske cruzeiro (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Bolivíjsky real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brazílske Cruzado Novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brazílske cruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamský dolár</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutansky ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmese Kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botswanan Pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Belarussian nový rubeľ (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Belarussian rubeľ</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize dolár</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadský dolár</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Konžský frank Congolais</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Švaj�iarský frank</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Čílske Unidades de Fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Čílske peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Čínsky Yuan Renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Colombijské peso</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kostarikský colon</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Československá koruna</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubánske peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Cape Verde eskudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Cypruská libra</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Česká koruna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Východonemecká marka</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Nemecká marka</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Džibutský frank</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Dánska krone</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominikánske peso</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alžírsky dinár</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ekuadorský sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ekuadorský Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estónska kroon</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egyptská libra</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritrejská nakfa</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Španielská peseta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Ethiopský birr</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finská marka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fiji dolár</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklandská libra</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Francúzsky frank</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Britská libra</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Gruzínsky Kupon Larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gruzínsky lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ghanský cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltarská libra</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambský dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Guinejský frank</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Guinejský syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Rovníková Guinea Ekwele Guineana</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Grécka drachma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemalský quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugalská Guinea eskudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau peso</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyanský dolár</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hong Kongský dolár</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Hoduraská lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Chorvátsky dinár</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Chorvátska kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haitské gourde</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Ma�arský forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonézska rupia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>�rska libra</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Izraelská libra</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Izraelský šekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indijská rupia</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Iracký dinár</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iránsky rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islandská krona</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Talianská lira</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamajský dolár</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordánsky dinár</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japonský yen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Keňský šiling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kyrgyský som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodžský riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Comoro frank</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Severokórejský won</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Juhokórejský won</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuvaitský dinár</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kajmanský dolár</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazažský tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laoský kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Libanonská libra</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Šrilanská rupia</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Libérský dolár</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesothský loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litevská lita</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litevský talonas</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luxemburský frank</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Lotyšský lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Lotyšský rubeľ</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libyjský dinár</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marocký dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marocký frank</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldavský leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskarský ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskarský frank</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Macedónsky denár</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malský frank</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmarský kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolský tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macao Pataca</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritania Ouguiya</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Maltská lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Maltská libra</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritská rupia</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldivská rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malavská kwacha</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Mexické peso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Mexické striborné peso (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Mexické Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malajský ringgit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambijské eskudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Mozambijské metical</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibský dolár</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerská naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaragujská cordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nikaragujská Cordoba Oro</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Nizozemský guilder</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Nórksy krone</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepálska rupia</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Novozélandský dolár</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Ománský rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamská balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruvský inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruvský sol Nuevo</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruvský sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua Nová Guinea kina</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipínske peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistanská rupia</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polský zloty</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Polský zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugalské eskudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguayské guarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Qatarský rial</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Rumunský leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumunský Lei</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Srbský dinár</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ruský rubeľ</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ruský rubeľ (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Rwandský frank</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudský riyal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Solomon Islands dolár</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Sejšelská rupia</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Sudánsky dinár</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Sudánska libra</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Švédska krona</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapúrsky dolár</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Libra</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovinský Tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovenská koruna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leone Leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somálsky šiling</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamský guilder</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome a Principe dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovietský rubeľ</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El Salvadorský colon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Syrská libra</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Swaziland lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Thajský bát</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadžikistanský rubeľ</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikistanský somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkménsky manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tuniský dinár</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tonga Paʻanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timorské eskudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Turecká lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Nová turecká líra</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad a Tobago dolár</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Taiwanský nový dolár</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanský šiling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrainská hrivna</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrainský karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandan Å¡iling (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandský šiling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>US dolár</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>US dolár (Next day)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>US dolár (Same day)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguajské peso (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguajské peso Uruguayo</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekistanský sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuelský bolivar</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnamský dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Západná Samoa tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA frank BEAC</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Zlato</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>East Caribbean dolár</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Špeciálne práva �erpania</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Francúzsky zlatý frank</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Francúzsky UIC-frank</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA frank BCEAO</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP frank</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemenský dinár</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenský rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Juhoslávsky dinár [YUD]</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Juhoslávsky Noviy dinár</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Juhoslávsky dinár</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Juhoafrický rand (financial)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Juhoafrický rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambská kwacha</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairský nový zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairský Zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabský dolár</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dni</unitPattern>
-			<unitPattern count="one">{0} deň</unitPattern>
-			<unitPattern count="other">{0} dní</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} hodiny</unitPattern>
-			<unitPattern count="one">{0} hodina</unitPattern>
-			<unitPattern count="other">{0} hodín</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minúty</unitPattern>
-			<unitPattern count="one">{0} minúta</unitPattern>
-			<unitPattern count="other">{0} minút</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} mesiace</unitPattern>
-			<unitPattern count="one">{0} mesiac</unitPattern>
-			<unitPattern count="other">{0} mesiacov</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekundy</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekúnd</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} týždne</unitPattern>
-			<unitPattern count="one">{0} týždeň</unitPattern>
-			<unitPattern count="other">{0} týždňov</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} roky</unitPattern>
-			<unitPattern count="one">{0} rok</unitPattern>
-			<unitPattern count="other">{0} rokov</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ano:a</yesstr>
-			<nostr>nie:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sk_SK.xml b/airtime_mvc/library/Zend/Locale/Data/sk_SK.xml
deleted file mode 100644
index 3379959d0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sk_SK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sk"/>
-		<territory type="SK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sl.xml b/airtime_mvc/library/Zend/Locale/Data/sl.xml
deleted file mode 100644
index 615ac7b62..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sl.xml
+++ /dev/null
@@ -1,2543 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.114 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="sl"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afarš�ina</language>
-			<language type="ab">abhaš�ina</language>
-			<language type="ace">a�ejš�ina</language>
-			<language type="ach">a�olijš�ina</language>
-			<language type="ada">adangmejš�ina</language>
-			<language type="ady">adigejš�ina</language>
-			<language type="ae">avestijš�ina</language>
-			<language type="af">afrikanš�ina</language>
-			<language type="afa">afroazijski jezik</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainujš�ina</language>
-			<language type="ak">akanš�ina</language>
-			<language type="akk">akadš�ina</language>
-			<language type="ale">aleutš�ina</language>
-			<language type="alg">algonkinski jezik</language>
-			<language type="alt">južna altajš�ina</language>
-			<language type="am">amharš�ina</language>
-			<language type="an">aragonš�ina</language>
-			<language type="ang">stara angleš�ina</language>
-			<language type="anp">angikaš�ina</language>
-			<language type="apa">apaški jezik</language>
-			<language type="ar">arabš�ina</language>
-			<language type="arc">aramejš�ina</language>
-			<language type="arn">aravkanš�ina</language>
-			<language type="arp">arapaš�ina</language>
-			<language type="art">umetni jezik</language>
-			<language type="arw">aravaš�ina</language>
-			<language type="as">asamš�ina</language>
-			<language type="ast">asturijš�ina</language>
-			<language type="ath">atabaški jezik</language>
-			<language type="aus">avstralski jezik</language>
-			<language type="av">avarš�ina</language>
-			<language type="awa">avadš�ina</language>
-			<language type="ay">ajmarš�ina</language>
-			<language type="az">azerbajdžanš�ina</language>
-			<language type="ba">baškirš�ina</language>
-			<language type="bad">bandaški jezik</language>
-			<language type="bai">bamilekejski jezik</language>
-			<language type="bal">beludžijš�ina</language>
-			<language type="ban">balijš�ina</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltski jezik</language>
-			<language type="be">beloruš�ina</language>
-			<language type="bej">bedža</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberš�ina</language>
-			<language type="bg">bolgarš�ina</language>
-			<language type="bh">biharš�ina</language>
-			<language type="bho">bodžpuri</language>
-			<language type="bi">bislamš�ina</language>
-			<language type="bik">bikolski jezik</language>
-			<language type="bin">edo</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambarš�ina</language>
-			<language type="bn">bengalš�ina</language>
-			<language type="bnt">bantujš�ina</language>
-			<language type="bo">tibetanš�ina</language>
-			<language type="br">bretonš�ina</language>
-			<language type="bra">bradžbakanš�ina</language>
-			<language type="bs">bosanš�ina</language>
-			<language type="btk">bataški jezik</language>
-			<language type="bua">burjatš�ina</language>
-			<language type="bug">buginš�ina</language>
-			<language type="byn">blinš�ina</language>
-			<language type="ca">katalonš�ina</language>
-			<language type="cad">kadoš�ina</language>
-			<language type="cai">srednjeameriški indijanski jezik</language>
-			<language type="car">karibski jezik</language>
-			<language type="cau">kavkaški jezik</language>
-			<language type="ce">�e�enš�ina</language>
-			<language type="ceb">sebuanš�ina</language>
-			<language type="cel">keltski jezik</language>
-			<language type="ch">�amorš�ina</language>
-			<language type="chb">�ib�evš�ina</language>
-			<language type="chg">�agatajš�ina</language>
-			<language type="chk">trukeš�ina</language>
-			<language type="chm">marijš�ina</language>
-			<language type="chn">�inuški žargon</language>
-			<language type="cho">�oktavš�ina</language>
-			<language type="chp">�ipevš�ina</language>
-			<language type="chr">�erokeš�ina</language>
-			<language type="chy">�ejenš�ina</language>
-			<language type="cmc">camski jezik</language>
-			<language type="co">korziš�ina</language>
-			<language type="cop">koptš�ina</language>
-			<language type="cpe">angleška kreolš�ina ali pidžinš�ina</language>
-			<language type="cpf">francoska kreolš�ina ali pidžinš�ina</language>
-			<language type="cpp">portugalska kreolš�ina ali pidžinš�ina</language>
-			<language type="cr">krijš�ina</language>
-			<language type="crh">krimska tatarš�ina</language>
-			<language type="crp">kreolš�ina ali pidžinš�ina</language>
-			<language type="cs">�eš�ina</language>
-			<language type="csb">kašubš�ina</language>
-			<language type="cu">stara cerkvena slovanš�ina</language>
-			<language type="cus">kušitš�ina</language>
-			<language type="cv">�uvaš�ina</language>
-			<language type="cy">valižanš�ina</language>
-			<language type="da">danš�ina</language>
-			<language type="dak">dakotš�ina</language>
-			<language type="dar">darginš�ina</language>
-			<language type="day">dajaš�ina</language>
-			<language type="de">nemš�ina</language>
-			<language type="de_CH">visoka nemš�ina (Švica)</language>
-			<language type="del">delavarš�ina</language>
-			<language type="den">slavejš�ina</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidski jezik</language>
-			<language type="dsb">dolnja lužiška srbš�ina</language>
-			<language type="dua">duala</language>
-			<language type="dum">srednja nizozemš�ina</language>
-			<language type="dv">diveš�ina</language>
-			<language type="dyu">diula</language>
-			<language type="dz">dzonka</language>
-			<language type="ee">evenš�ina</language>
-			<language type="efi">efiš�ina</language>
-			<language type="egy">stara egip�anš�ina</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grš�ina</language>
-			<language type="elx">elamš�ina</language>
-			<language type="en">angleš�ina</language>
-			<language type="en_GB">angleš�ina (VB)</language>
-			<language type="en_US">angleš�ina (ZDA)</language>
-			<language type="enm">srednja angleš�ina</language>
-			<language type="eo">esperanto</language>
-			<language type="es">španš�ina</language>
-			<language type="es_419">latinskoameriška španš�ina</language>
-			<language type="es_ES">iberska španš�ina</language>
-			<language type="et">estonš�ina</language>
-			<language type="eu">baskovš�ina</language>
-			<language type="ewo">evondovš�ina</language>
-			<language type="fa">perzijš�ina</language>
-			<language type="fan">fangijš�ina</language>
-			<language type="fat">fantijš�ina</language>
-			<language type="ff">fulš�ina</language>
-			<language type="fi">finš�ina</language>
-			<language type="fil">filipinš�ina</language>
-			<language type="fiu">ugrofinski jezik</language>
-			<language type="fj">fidžijš�ina</language>
-			<language type="fo">ferš�ina</language>
-			<language type="fon">fonš�ina</language>
-			<language type="fr">francoš�ina</language>
-			<language type="frm">srednja francoš�ina</language>
-			<language type="fro">stara francoš�ina</language>
-			<language type="frr">severna frizijš�ina</language>
-			<language type="frs">vzhodna frizijš�ina</language>
-			<language type="fur">furlanš�ina</language>
-			<language type="fy">frizijš�ina</language>
-			<language type="ga">irš�ina</language>
-			<language type="gaa">ga</language>
-			<language type="gay">gajš�ina</language>
-			<language type="gba">gbajš�ina</language>
-			<language type="gd">škotska gelš�ina</language>
-			<language type="gem">germanski jezik</language>
-			<language type="gez">etiopš�ina</language>
-			<language type="gil">kiribatš�ina</language>
-			<language type="gl">galicijš�ina</language>
-			<language type="gmh">srednja visoka nemš�ina</language>
-			<language type="gn">gvaranijš�ina</language>
-			<language type="goh">stara visoka nemš�ina</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalš�ina</language>
-			<language type="got">gotš�ina</language>
-			<language type="grb">grebš�ina</language>
-			<language type="grc">stara grš�ina</language>
-			<language type="gsw">nemš�ina (Švica)</language>
-			<language type="gu">gudžaratš�ina</language>
-			<language type="gv">manš�ina</language>
-			<language type="gwi">gwi</language>
-			<language type="ha">havš�ina</language>
-			<language type="hai">haidš�ina</language>
-			<language type="haw">havajš�ina</language>
-			<language type="he">hebrejš�ina</language>
-			<language type="hi">hindujš�ina</language>
-			<language type="hil">hiligajnonš�ina</language>
-			<language type="him">hima�alš�ina</language>
-			<language type="hit">hetitš�ina</language>
-			<language type="hmn">hmonš�ina</language>
-			<language type="ho">hiri motu</language>
-			<language type="hr">hrvaš�ina</language>
-			<language type="hsb">gornja lužiška srbš�ina</language>
-			<language type="ht">haitijska kreolš�ina</language>
-			<language type="hu">madžarš�ina</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armenš�ina</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingva</language>
-			<language type="iba">ibanš�ina</language>
-			<language type="id">indonezijš�ina</language>
-			<language type="ie">interlingve</language>
-			<language type="ig">igboš�ina</language>
-			<language type="ii">ii</language>
-			<language type="ijo">ijo</language>
-			<language type="ik">inupiaš�ina</language>
-			<language type="ilo">ilokanš�ina</language>
-			<language type="inc">indijski jezik</language>
-			<language type="ine">indoevropski jezik</language>
-			<language type="inh">inguš�ina</language>
-			<language type="io">ido</language>
-			<language type="ira">iranski jezik</language>
-			<language type="iro">irokeški jezik</language>
-			<language type="is">islandš�ina</language>
-			<language type="it">italijanš�ina</language>
-			<language type="iu">inuktitutš�ina</language>
-			<language type="ja">japonš�ina</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judovska perzijš�ina</language>
-			<language type="jrb">judovska arabš�ina</language>
-			<language type="jv">javanš�ina</language>
-			<language type="ka">gruzinš�ina</language>
-			<language type="kaa">karakalpaš�ina</language>
-			<language type="kab">kabilš�ina</language>
-			<language type="kac">ka�inš�ina</language>
-			<language type="kaj">kaj</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karenš�ina</language>
-			<language type="kaw">kavi</language>
-			<language type="kbd">kabardinš�ina</language>
-			<language type="kcg">tjapska nigerijš�ina</language>
-			<language type="kfo">kfo</language>
-			<language type="kg">kongovš�ina</language>
-			<language type="kha">kasi</language>
-			<language type="khi">koisanski jezik</language>
-			<language type="kho">kotanš�ina</language>
-			<language type="ki">kikujš�ina</language>
-			<language type="kj">kvanjama</language>
-			<language type="kk">kazaš�ina</language>
-			<language type="kl">grenlandš�ina</language>
-			<language type="km">kmerš�ina</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kanada</language>
-			<language type="ko">korejš�ina</language>
-			<language type="kok">konkanš�ina</language>
-			<language type="kos">kosrajš�ina</language>
-			<language type="kpe">kpelejš�ina</language>
-			<language type="kr">kanurš�ina</language>
-			<language type="krc">kara�aj-balkarš�ina</language>
-			<language type="krl">karelš�ina</language>
-			<language type="kro">jezik kru</language>
-			<language type="kru">kuruk</language>
-			<language type="ks">kašmirš�ina</language>
-			<language type="ku">kurdš�ina</language>
-			<language type="kum">kumiš�ina</language>
-			<language type="kut">kutenajš�ina</language>
-			<language type="kv">komijš�ina</language>
-			<language type="kw">kornijš�ina</language>
-			<language type="ky">kirgiš�ina</language>
-			<language type="la">latinš�ina</language>
-			<language type="lad">ladinš�ina</language>
-			<language type="lah">landa</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luksemburš�ina</language>
-			<language type="lez">lezginš�ina</language>
-			<language type="lg">ganda</language>
-			<language type="li">limburš�ina</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laoš�ina</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litovš�ina</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luisenš�ina</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">latvijš�ina</language>
-			<language type="mad">madurš�ina</language>
-			<language type="mag">magadš�ina</language>
-			<language type="mai">maitili</language>
-			<language type="mak">makasarš�ina</language>
-			<language type="man">mandingo</language>
-			<language type="map">avstronezijski jezik</language>
-			<language type="mas">masajš�ina</language>
-			<language type="mdf">mokšavš�ina</language>
-			<language type="mdr">mandarš�ina</language>
-			<language type="men">mende</language>
-			<language type="mg">malagaš�ina</language>
-			<language type="mga">srednja irš�ina</language>
-			<language type="mh">marshallovš�ina</language>
-			<language type="mi">maorš�ina</language>
-			<language type="mic">mikmaš�ina</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">drugi jeziki</language>
-			<language type="mk">makedonš�ina</language>
-			<language type="mkh">monsko-kmerski jezik</language>
-			<language type="ml">malajalamš�ina</language>
-			<language type="mn">mongolš�ina</language>
-			<language type="mnc">mandžurš�ina</language>
-			<language type="mni">manipurš�ina</language>
-			<language type="mno">kotabatski manobo</language>
-			<language type="mo">moldavš�ina</language>
-			<language type="moh">mohoš�ina</language>
-			<language type="mos">mosijš�ina</language>
-			<language type="mr">maratš�ina</language>
-			<language type="ms">malajš�ina</language>
-			<language type="mt">malteš�ina</language>
-			<language type="mul">ve� jezikov</language>
-			<language type="mun">mundski jezik</language>
-			<language type="mus">mus</language>
-			<language type="mwl">mirandeš�ina</language>
-			<language type="mwr">marvarš�ina</language>
-			<language type="my">burmanš�ina</language>
-			<language type="myn">majevski jezik</language>
-			<language type="myv">erzjanš�ina</language>
-			<language type="na">naurujš�ina</language>
-			<language type="nah">nahuatl</language>
-			<language type="nai">severnoameriški indijanski jezik</language>
-			<language type="nap">napolitanš�ina</language>
-			<language type="nb">knjižna norveš�ina</language>
-			<language type="nd">severna ndebelš�ina</language>
-			<language type="nds">nizka nemš�ina</language>
-			<language type="ne">nepalš�ina</language>
-			<language type="new">nevarš�ina</language>
-			<language type="ng">ng</language>
-			<language type="nia">niaš�ina</language>
-			<language type="nic">nigrsko-kordofanski jezik</language>
-			<language type="niu">niuejš�ina</language>
-			<language type="nl">nizozemš�ina</language>
-			<language type="nl_BE">flamš�ina</language>
-			<language type="nn">novonorveš�ina</language>
-			<language type="no">norveš�ina</language>
-			<language type="nog">nogajš�ina</language>
-			<language type="non">stara nordijš�ina</language>
-			<language type="nqo">nqo</language>
-			<language type="nr">južna ndebelš�ina</language>
-			<language type="nso">severna sotš�ina</language>
-			<language type="nub">nubijski jezik</language>
-			<language type="nv">navajš�ina</language>
-			<language type="nwc">klasi�na nevarš�ina</language>
-			<language type="ny">njanš�ina</language>
-			<language type="nym">njamveš�ina</language>
-			<language type="nyn">njankole</language>
-			<language type="nyo">njoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">okcitanš�ina</language>
-			<language type="oj">anašinabš�ina</language>
-			<language type="om">oromo</language>
-			<language type="or">orijš�ina</language>
-			<language type="os">osetinš�ina</language>
-			<language type="osa">osage</language>
-			<language type="ota">otomanska turš�ina</language>
-			<language type="oto">otomijski jezik</language>
-			<language type="pa">pandžabš�ina</language>
-			<language type="paa">papuanski jezik</language>
-			<language type="pag">pangasinanš�ina</language>
-			<language type="pal">pal</language>
-			<language type="pam">pampanš�ina</language>
-			<language type="pap">papiamentu</language>
-			<language type="pau">palavanš�ina</language>
-			<language type="peo">stara perzijš�ina</language>
-			<language type="phi">filipinski jezik</language>
-			<language type="phn">feni�anš�ina</language>
-			<language type="pi">palijš�ina</language>
-			<language type="pl">poljš�ina</language>
-			<language type="pon">ponpejš�ina</language>
-			<language type="pra">prakritski jezik</language>
-			<language type="pro">stara provansalš�ina</language>
-			<language type="ps">paštu</language>
-			<language type="pt">portugalš�ina</language>
-			<language type="pt_BR">brazilska portugalš�ina</language>
-			<language type="pt_PT">iberska portugalš�ina</language>
-			<language type="qu">ke�uanš�ina</language>
-			<language type="raj">radžastanš�ina</language>
-			<language type="rap">rapanujš�ina</language>
-			<language type="rar">rarotongš�ina</language>
-			<language type="rm">retoromanš�ina</language>
-			<language type="rn">rundš�ina</language>
-			<language type="ro">romunš�ina</language>
-			<language type="roa">romanski jezik</language>
-			<language type="rom">romš�ina</language>
-			<language type="root">root</language>
-			<language type="ru">ruš�ina</language>
-			<language type="rup">aromunš�ina</language>
-			<language type="rw">ruandš�ina</language>
-			<language type="sa">sanskrt</language>
-			<language type="sad">sad</language>
-			<language type="sah">jakutš�ina</language>
-			<language type="sai">sai</language>
-			<language type="sal">sal</language>
-			<language type="sam">samaritanska aramejš�ina</language>
-			<language type="sas">sasaš�ina</language>
-			<language type="sat">santalš�ina</language>
-			<language type="sc">sardinš�ina</language>
-			<language type="scn">sicilijanš�ina</language>
-			<language type="sco">škotš�ina</language>
-			<language type="sd">sindš�ina</language>
-			<language type="se">severna samijš�ina</language>
-			<language type="sel">selkupš�ina</language>
-			<language type="sem">semitski jezik</language>
-			<language type="sg">sango</language>
-			<language type="sga">stara irš�ina</language>
-			<language type="sgn">znakovni jezik</language>
-			<language type="sh">srbohrvaš�ina</language>
-			<language type="shn">šanš�ina</language>
-			<language type="si">singalš�ina</language>
-			<language type="sid">sidamš�ina</language>
-			<language type="sio">sijuš�ina</language>
-			<language type="sit">kitajsko-tibetanski jezik</language>
-			<language type="sk">slovaš�ina</language>
-			<language type="sl">slovenš�ina</language>
-			<language type="sla">slovanski jezik</language>
-			<language type="sm">samoanš�ina</language>
-			<language type="sma">južna samijš�ina</language>
-			<language type="smi">samijski jezik</language>
-			<language type="smj">luleška samijš�ina</language>
-			<language type="smn">inarska samijš�ina</language>
-			<language type="sms">samijš�ina Skolt</language>
-			<language type="sn">šonš�ina</language>
-			<language type="snk">snk</language>
-			<language type="so">somalš�ina</language>
-			<language type="sog">sog</language>
-			<language type="son">songajš�ina</language>
-			<language type="sq">albanš�ina</language>
-			<language type="sr">srbš�ina</language>
-			<language type="srn">surinamska kreolš�ina</language>
-			<language type="srr">sererš�ina</language>
-			<language type="ss">svazijš�ina</language>
-			<language type="ssa">nilsko-saharski jezik</language>
-			<language type="st">sesoto</language>
-			<language type="su">sundanš�ina</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susujš�ina</language>
-			<language type="sux">sumerš�ina</language>
-			<language type="sv">švedš�ina</language>
-			<language type="sw">svahili</language>
-			<language type="syc">klasi�na sirš�ina</language>
-			<language type="syr">sirš�ina</language>
-			<language type="ta">tamilš�ina</language>
-			<language type="tai">tajski jezik</language>
-			<language type="te">telugijš�ina</language>
-			<language type="tem">temnejš�ina</language>
-			<language type="ter">ter</language>
-			<language type="tet">tetumš�ina</language>
-			<language type="tg">tadžiš�ina</language>
-			<language type="th">tajš�ina</language>
-			<language type="ti">tigrajš�ina</language>
-			<language type="tig">tigrejš�ina</language>
-			<language type="tiv">tivš�ina</language>
-			<language type="tk">turkmenš�ina</language>
-			<language type="tkl">tokelavš�ina</language>
-			<language type="tl">tagalogš�ina</language>
-			<language type="tlh">klingonš�ina</language>
-			<language type="tli">tlingitš�ina</language>
-			<language type="tmh">tamajaš�ina</language>
-			<language type="tn">cvanš�ina</language>
-			<language type="to">tongš�ina</language>
-			<language type="tog">malavijska tongš�ina</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turš�ina</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimš�ina</language>
-			<language type="tt">tatarš�ina</language>
-			<language type="tum">tumbukš�ina</language>
-			<language type="tup">tupijski jezik</language>
-			<language type="tut">altajski jezik</language>
-			<language type="tvl">tuvalujš�ina</language>
-			<language type="tw">tvi</language>
-			<language type="ty">tahitš�ina</language>
-			<language type="tyv">tuvinš�ina</language>
-			<language type="udm">udmurtš�ina</language>
-			<language type="ug">ujgurš�ina</language>
-			<language type="uga">ugaritski jezik</language>
-			<language type="uk">ukrajinš�ina</language>
-			<language type="umb">umbundš�ina</language>
-			<language type="und">neznan ali neveljaven jezik</language>
-			<language type="ur">urdujš�ina</language>
-			<language type="uz">uzbeš�ina</language>
-			<language type="vai">vajš�ina</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamš�ina</language>
-			<language type="vo">volapuk</language>
-			<language type="vot">votjaš�ina</language>
-			<language type="wa">valonš�ina</language>
-			<language type="wak">vakaški jezik</language>
-			<language type="wal">valamš�ina</language>
-			<language type="war">varajš�ina</language>
-			<language type="was">vašajš�ina</language>
-			<language type="wen">lužiško srbski jezik</language>
-			<language type="wo">volofš�ina</language>
-			<language type="xal">kalmiš�ina</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">jaojš�ina</language>
-			<language type="yap">japš�ina</language>
-			<language type="yi">jidiš</language>
-			<language type="yo">jorubš�ina</language>
-			<language type="ypk">jupiški jezik</language>
-			<language type="za">za</language>
-			<language type="zap">zapoteš�ina</language>
-			<language type="zbl">znakovni jezik Bliss</language>
-			<language type="zen">zenaš�ina</language>
-			<language type="zh">kitajš�ina</language>
-			<language type="zh_Hans">poenostavljena kitajš�ina</language>
-			<language type="zh_Hant">tradicionalna kitajš�ina</language>
-			<language type="znd">zandejš�ina</language>
-			<language type="zu">zulujš�ina</language>
-			<language type="zun">zunijš�ina</language>
-			<language type="zxx">brez jezikoslovne vsebine</language>
-			<language type="zza">zazajš�ina</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabski</script>
-			<script type="Armi">imperialno-aramejski</script>
-			<script type="Armn">armenski</script>
-			<script type="Avst">avestanski</script>
-			<script type="Bali">balijski</script>
-			<script type="Batk">bataški</script>
-			<script type="Beng">bengalski</script>
-			<script type="Blis">znakovna pisava Bliss</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">bramanski</script>
-			<script type="Brai">braillova pisava</script>
-			<script type="Bugi">buginski</script>
-			<script type="Buhd">buhidski</script>
-			<script type="Cakm">Cakm</script>
-			<script type="Cans">poenotena zlogovna pisava kanadskih staroselcev</script>
-			<script type="Cari">Cari</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">�erokeški</script>
-			<script type="Cirt">kirt</script>
-			<script type="Copt">koptski</script>
-			<script type="Cprt">ciprski</script>
-			<script type="Cyrl">cirilica</script>
-			<script type="Cyrs">starocerkvenoslovanska cirilica</script>
-			<script type="Deva">devanagarš�ica</script>
-			<script type="Dsrt">fonetska pisava deseret</script>
-			<script type="Egyd">demotska egip�anska pisava</script>
-			<script type="Egyh">hieratska egip�anska pisava</script>
-			<script type="Egyp">egip�anska slikovna pisava</script>
-			<script type="Ethi">etiopski</script>
-			<script type="Geok">cerkvenogruzijski</script>
-			<script type="Geor">gruzijski</script>
-			<script type="Glag">glagoliški</script>
-			<script type="Goth">gotski</script>
-			<script type="Grek">grški</script>
-			<script type="Gujr">gudžaratski</script>
-			<script type="Guru">gurmuki</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">kanji</script>
-			<script type="Hano">hanunski</script>
-			<script type="Hans">poenostavljena pisava han</script>
-			<script type="Hant">tradicionalna pisava han</script>
-			<script type="Hebr">hebrejski</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahavhmonska zlogovna pisava</script>
-			<script type="Hrkt">katakana ali hiragana</script>
-			<script type="Hung">staroogrski</script>
-			<script type="Inds">induški</script>
-			<script type="Ital">staroitalski</script>
-			<script type="Java">javanski</script>
-			<script type="Jpan">japonski</script>
-			<script type="Kali">karenski</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">gandarski</script>
-			<script type="Khmr">kmerski</script>
-			<script type="Knda">kanadski</script>
-			<script type="Kore">korejski</script>
-			<script type="Kthi">kajatski</script>
-			<script type="Lana">Lana</script>
-			<script type="Laoo">laoški</script>
-			<script type="Latf">fraktura</script>
-			<script type="Latg">gelski latini�ni</script>
-			<script type="Latn">latinica</script>
-			<script type="Lepc">lepški</script>
-			<script type="Limb">limbuški</script>
-			<script type="Lina">linearna pisava A</script>
-			<script type="Linb">linearna pisava B</script>
-			<script type="Lyci">licijski</script>
-			<script type="Lydi">lidijski</script>
-			<script type="Mand">mandanski</script>
-			<script type="Mani">manihejski</script>
-			<script type="Maya">majevska slikovna pisava</script>
-			<script type="Mero">meroitski</script>
-			<script type="Mlym">malajalamski</script>
-			<script type="Mong">mongolski</script>
-			<script type="Moon">Moonova pisava za slepe</script>
-			<script type="Mtei">manipurski</script>
-			<script type="Mymr">mjanmarski</script>
-			<script type="Nkoo">Nkoo</script>
-			<script type="Ogam">ogamski</script>
-			<script type="Olck">santalski</script>
-			<script type="Orkh">orkonski</script>
-			<script type="Orya">orijski</script>
-			<script type="Osma">osmanski</script>
-			<script type="Perm">staropermijski</script>
-			<script type="Phag">pagpajski</script>
-			<script type="Phli">vrezani napisi pahlavi</script>
-			<script type="Phlp">psalmski pahlavi</script>
-			<script type="Phlv">knjižno palavanski</script>
-			<script type="Phnx">feni�anski</script>
-			<script type="Plrd">Pollardova fonetska pisava</script>
-			<script type="Prti">Prti</script>
-			<script type="Qaai">podedovan</script>
-			<script type="Rjng">Rjng</script>
-			<script type="Roro">rongorongo</script>
-			<script type="Runr">runski</script>
-			<script type="Samr">samaritanski</script>
-			<script type="Sara">saratski</script>
-			<script type="Saur">Saur</script>
-			<script type="Sgnw">znakovna pisava</script>
-			<script type="Shaw">Å¡ojevski</script>
-			<script type="Sinh">sinhalski</script>
-			<script type="Sund">sundanski</script>
-			<script type="Sylo">siletsko-nagarijski</script>
-			<script type="Syrc">sirijski</script>
-			<script type="Syre">sirska abeceda estrangelo</script>
-			<script type="Syrj">zahodnosirijski</script>
-			<script type="Syrn">vzhodnosirijski</script>
-			<script type="Tagb">tagbanski</script>
-			<script type="Tale">Tale</script>
-			<script type="Talu">Talu</script>
-			<script type="Taml">tamilski</script>
-			<script type="Tavt">tajsko-vietnamski</script>
-			<script type="Telu">teluški</script>
-			<script type="Teng">tengvarski</script>
-			<script type="Tfng">tifinajski</script>
-			<script type="Tglg">tagaloški</script>
-			<script type="Thaa">tanajski</script>
-			<script type="Thai">tajski</script>
-			<script type="Tibt">tibetanski</script>
-			<script type="Ugar">ugaritski</script>
-			<script type="Vaii">zlogovna pisava vai</script>
-			<script type="Visp">vidni govor</script>
-			<script type="Xpeo">staroperzijski</script>
-			<script type="Xsux">sumersko-akadski klinopis</script>
-			<script type="Yiii">Yiii</script>
-			<script type="Zmth">matemati�na znamenja</script>
-			<script type="Zsym">simboli</script>
-			<script type="Zxxx">nenapisano</script>
-			<script type="Zyyy">splošno</script>
-			<script type="Zzzz">neznan ali neveljaven zapis</script>
-		</scripts>
-		<territories>
-			<territory type="001">Svet</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Severna Amerika</territory>
-			<territory type="005">Južna Amerika</territory>
-			<territory type="009">Oceanija</territory>
-			<territory type="011">Zahodna Afrika</territory>
-			<territory type="013">Srednja Amerika</territory>
-			<territory type="014">Vzhodna Afrika</territory>
-			<territory type="015">Severna Afrika</territory>
-			<territory type="017">Srednja Afrika</territory>
-			<territory type="018">Južna Afrika</territory>
-			<territory type="019">Amerike</territory>
-			<territory type="021">severnoameriška celina</territory>
-			<territory type="029">Karibi</territory>
-			<territory type="030">Vzhodna Azija</territory>
-			<territory type="034">Južna Azija</territory>
-			<territory type="035">Jugovzhodna Azija</territory>
-			<territory type="039">Južna Evropa</territory>
-			<territory type="053">Avstralija in Nova Zelandija</territory>
-			<territory type="054">Melanezija</territory>
-			<territory type="057">mikronezijska regija</territory>
-			<territory type="061">Polinezija</territory>
-			<territory type="062">Južna osrednja Azija</territory>
-			<territory type="142">Azija</territory>
-			<territory type="143">Osrednja Azija</territory>
-			<territory type="145">Zahodna Azija</territory>
-			<territory type="150">Evropa</territory>
-			<territory type="151">Vzhodna Evropa</territory>
-			<territory type="154">Severna Evropa</territory>
-			<territory type="155">Zahodna Evropa</territory>
-			<territory type="172">Skupnost neodvisnih držav</territory>
-			<territory type="419">Latinska Amerika in Karibi</territory>
-			<territory type="830">Kanalski otoki</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Združeni arabski emirati</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigva in Barbuda</territory>
-			<territory type="AI">Angvila</territory>
-			<territory type="AL">Albanija</territory>
-			<territory type="AM">Armenija</territory>
-			<territory type="AN">Nizozemski Antili</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Ameriška Samoa</territory>
-			<territory type="AT">Avstrija</territory>
-			<territory type="AU">Avstralija</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandsko oto�je</territory>
-			<territory type="AZ">Azerbajdžan</territory>
-			<territory type="BA">Bosna in Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladeš</territory>
-			<territory type="BE">Belgija</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bolgarija</territory>
-			<territory type="BH">Bahrajn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthelemy</territory>
-			<territory type="BM">Bermudi</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolivija</territory>
-			<territory type="BR">Brazilija</territory>
-			<territory type="BS">Bahami</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Bouvetov otok</territory>
-			<territory type="BW">Bocvana</territory>
-			<territory type="BY">Belorusija</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosovi otoki</territory>
-			<territory type="CD">Demokrati�na republika Kongo</territory>
-			<territory type="CF">Centralnoafriška republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Å vica</territory>
-			<territory type="CI">Slonokoš�ena obala</territory>
-			<territory type="CK">Cookovo oto�je</territory>
-			<territory type="CL">ÄŒile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kitajska</territory>
-			<territory type="CO">Kolumbija</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Srbija in ÄŒrna gora</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Zelenortski otoki</territory>
-			<territory type="CX">Boži�ni otok</territory>
-			<territory type="CY">Ciper</territory>
-			<territory type="CZ">Češka</territory>
-			<territory type="DE">Nem�ija</territory>
-			<territory type="DJ">Džibuti</territory>
-			<territory type="DK">Danska</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikanska republika</territory>
-			<territory type="DZ">Alžirija</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estonija</territory>
-			<territory type="EG">Egipt</territory>
-			<territory type="EH">Zahodna Sahara</territory>
-			<territory type="ER">Eritreja</territory>
-			<territory type="ES">Å panija</territory>
-			<territory type="ET">Etiopija</territory>
-			<territory type="FI">Finska</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Falklandski otoki</territory>
-			<territory type="FM">Mikronezija</territory>
-			<territory type="FO">Ferski otoki</territory>
-			<territory type="FR">Francija</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Velika Britanija</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzija</territory>
-			<territory type="GF">Francoska Gvajana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grenlandija</territory>
-			<territory type="GM">Gambija</territory>
-			<territory type="GN">Gvineja</territory>
-			<territory type="GP">Gvadalupe</territory>
-			<territory type="GQ">Ekvatorialna Gvineja</territory>
-			<territory type="GR">Gr�ija</territory>
-			<territory type="GS">Južna Georgia in Južni Sandwichevi otoki</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gvineja Bissau</territory>
-			<territory type="GY">Gvajana</territory>
-			<territory type="HK">Posebno administrativno obmo�je LR Kitajske Hong Kong</territory>
-			<territory type="HM">Otok Heard in oto�je McDonald</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Hrvaška</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Madžarska</territory>
-			<territory type="ID">Indonezija</territory>
-			<territory type="IE">Irska</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Otok Man</territory>
-			<territory type="IN">Indija</territory>
-			<territory type="IO">Britansko ozemlje v Indijskem oceanu</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Islandija</territory>
-			<territory type="IT">Italija</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordanija</territory>
-			<territory type="JP">Japonska</territory>
-			<territory type="KE">Kenija</territory>
-			<territory type="KG">Kirgizistan</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komori</territory>
-			<territory type="KN">Saint Kitts in Nevis</territory>
-			<territory type="KP">Severna Koreja</territory>
-			<territory type="KR">Južna Koreja</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanski otoki</territory>
-			<territory type="KZ">Kazahstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Lihtenštajn</territory>
-			<territory type="LK">Å rilanka</territory>
-			<territory type="LR">Liberija</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litva</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">Latvija</territory>
-			<territory type="LY">Libija</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavija</territory>
-			<territory type="ME">ÄŒrna gora</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallovi otoki</territory>
-			<territory type="MK">Makedonija</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mjanmar</territory>
-			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Posebno administrativno obmo�je LR Kitajske Macao</territory>
-			<territory type="MP">Severni Marianski otoki</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mavretanija</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldivi</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Mehika</territory>
-			<territory type="MY">Malezija</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibija</territory>
-			<territory type="NC">Nova Kaledonija</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolški otok</territory>
-			<territory type="NG">Nigerija</territory>
-			<territory type="NI">Nikaragva</territory>
-			<territory type="NL">Nizozemska</territory>
-			<territory type="NO">Norveška</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nova Zelandija</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francoska Polinezija</territory>
-			<territory type="PG">Papua Nova Gvineja</territory>
-			<territory type="PH">Filipini</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poljska</territory>
-			<territory type="PM">Saint Pierre in Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Portoriko</territory>
-			<territory type="PS">Palestinsko ozemlje</territory>
-			<territory type="PT">Portugalska</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragvaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Ostala oceanija</territory>
-			<territory type="QU">Evropska unija</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Romunija</territory>
-			<territory type="RS">Srbija</territory>
-			<territory type="RU">Rusija</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudova Arabija</territory>
-			<territory type="SB">Salomonovi otoki</territory>
-			<territory type="SC">Sejšeli</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Å vedska</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Sveta Helena</territory>
-			<territory type="SI">Slovenija</territory>
-			<territory type="SJ">Svalbard in Jan Mayen</territory>
-			<territory type="SK">Slovaška</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalija</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome in Principe</territory>
-			<territory type="SV">Salvador</territory>
-			<territory type="SY">Sirija</territory>
-			<territory type="SZ">Svazi</territory>
-			<territory type="TC">Oto�ji Turks in Caicos</territory>
-			<territory type="TD">ÄŒad</territory>
-			<territory type="TF">Francosko južno ozemlje</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajska</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Vzhodni Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunizija</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Tur�ija</territory>
-			<territory type="TT">Trinidad in Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajvan</territory>
-			<territory type="TZ">Tanzanija</territory>
-			<territory type="UA">Ukrajina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Druga ameriška ozemlja v Tihem oceanu</territory>
-			<territory type="US">Združene države Amerike</territory>
-			<territory type="UY">Urugvaj</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent in Grenadine</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Britanski Deviški otoki</territory>
-			<territory type="VI">Ameriški Deviški otoki</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis in Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Južnoafriška republika</territory>
-			<territory type="ZM">Zambija</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Neznano ali neveljavno obmo�je</territory>
-		</territories>
-		<variants>
-			<variant type="1901">tradicionalni nemški pravopis</variant>
-			<variant type="1994">standardizirani rezijanski pravopis (1994)</variant>
-			<variant type="1996">novi nemški pravopis (1996)</variant>
-			<variant type="1606NICT">pozna srednja francoš�ina (do 1606)</variant>
-			<variant type="1694ACAD">zgodnja sodobna francoš�ina</variant>
-			<variant type="AREVELA">vzhodna armenš�ina</variant>
-			<variant type="AREVMDA">zahodna armenš�ina</variant>
-			<variant type="BAKU1926">modernizirana turška latinica</variant>
-			<variant type="BISKE">rezijansko nare�je Bila (San Giorgio)</variant>
-			<variant type="BOONT">boonvilski jezik</variant>
-			<variant type="FONIPA">mednarodna foneti�na pisava IPA</variant>
-			<variant type="FONUPA">uralska fonetska pisava UPA</variant>
-			<variant type="LIPAW">rezijansko nare�je iz Lipovca (Lipovaz)</variant>
-			<variant type="MONOTON">monotonalni pravopis</variant>
-			<variant type="NEDIS">nadiško nare�je</variant>
-			<variant type="NJIVA">rezijansko nare�je Njiva (Gniva)</variant>
-			<variant type="OSOJS">rezijansko nare�je iz Osojan (Oseacco)</variant>
-			<variant type="POLYTON">politonalni pravopis</variant>
-			<variant type="POSIX">standard prenosljivosti programske opreme</variant>
-			<variant type="REVISED">revidiran pravopis</variant>
-			<variant type="ROZAJ">rezijanš�ina</variant>
-			<variant type="SCOTLAND">standardna škotska angleš�ina</variant>
-			<variant type="SCOUSE">liverpoolsko angleško nare�je scouse</variant>
-			<variant type="SOLBA">rezijansko nare�je iz Solbice (Stolvizza)</variant>
-			<variant type="TARASK">Taraškievi�eva beloruska slovnica</variant>
-			<variant type="VALENCIA">valencijski pravopis</variant>
-		</variants>
-		<keys>
-			<key type="calendar">koledar</key>
-			<key type="collation">razvrš�anje</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">razvrš�anje po sistemu tradicionalne kitajš�ine - Big5</type>
-			<type type="buddhist" key="calendar">budisti�ni koledar</type>
-			<type type="chinese" key="calendar">kitajski koledar</type>
-			<type type="direct" key="collation">neposredno razvrš�anje</type>
-			<type type="gb2312han" key="collation">razvrš�anje po sistemu poenostavljene kitajš�ine - GB2312</type>
-			<type type="gregorian" key="calendar">gregorijanski koledar</type>
-			<type type="hebrew" key="calendar">hebrejski koledar</type>
-			<type type="indian" key="calendar">indijanski koledar</type>
-			<type type="islamic" key="calendar">islamski koledar</type>
-			<type type="islamic-civil" key="calendar">islamski civilni koledar</type>
-			<type type="japanese" key="calendar">japonski koledar</type>
-			<type type="phonebook" key="collation">razvrš�anje po abecedi</type>
-			<type type="pinyin" key="collation">razvrš�anje po sistemu pinjin</type>
-			<type type="roc" key="calendar">kitajski državni koledar</type>
-			<type type="stroke" key="collation">razvrš�anje po zaporedju pisanja pismenk</type>
-			<type type="traditional" key="collation">razvrš�anje po tradicionalnem sistemu</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">metri�ni</measurementSystemName>
-			<measurementSystemName type="US">imperialni</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Jezik: {0}</codePattern>
-			<codePattern type="territory">Regija: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="keys">titlecase-firstword</inText>
-		<inText type="types">titlecase-firstword</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a-c � d-p r s š t-v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å ä � æ ç é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ö ø � œ q ß ú ù ŭ û ü ū w-y ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>»</quotationStart>
-		<quotationEnd>«</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} – {1}</dateRangePattern>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">avg</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">marec</month>
-							<month type="4">april</month>
-							<month type="5">maj</month>
-							<month type="6">junij</month>
-							<month type="7">julij</month>
-							<month type="8">avgust</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">j</month>
-							<month type="2">f</month>
-							<month type="3">m</month>
-							<month type="4">a</month>
-							<month type="5">m</month>
-							<month type="6">j</month>
-							<month type="7">j</month>
-							<month type="8">a</month>
-							<month type="9">s</month>
-							<month type="10">o</month>
-							<month type="11">n</month>
-							<month type="12">d</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ned</day>
-							<day type="mon">pon</day>
-							<day type="tue">tor</day>
-							<day type="wed">sre</day>
-							<day type="thu">�et</day>
-							<day type="fri">pet</day>
-							<day type="sat">sob</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">nedelja</day>
-							<day type="mon">ponedeljek</day>
-							<day type="tue">torek</day>
-							<day type="wed">sreda</day>
-							<day type="thu">�etrtek</day>
-							<day type="fri">petek</day>
-							<day type="sat">sobota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">n</day>
-							<day type="mon">p</day>
-							<day type="tue">t</day>
-							<day type="wed">s</day>
-							<day type="thu">�</day>
-							<day type="fri">p</day>
-							<day type="sat">s</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. �etrtletje</quarter>
-							<quarter type="2">2. �etrtletje</quarter>
-							<quarter type="3">3. �etrtletje</quarter>
-							<quarter type="4">4. �etrtletje</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>dop.</am>
-				<pm>pop.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">pred našim štetjem</era>
-						<era type="1">naše štetje</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">pr. n. Å¡t.</era>
-						<era type="1">po Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd. MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d. MMM. yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d. MM. yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d. M.</dateFormatItem>
-						<dateFormatItem id="MMMMd">d. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd. MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q/yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d.–d.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH–HH</greatestDifference>
-							<greatestDifference id="h">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH–HH v</greatestDifference>
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M.–M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d. – d. M.</greatestDifference>
-							<greatestDifference id="M">d. M. – d. M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E., d. – E., d. M.</greatestDifference>
-							<greatestDifference id="M">E., d. M. – E., d. M.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.–d. MMM.</greatestDifference>
-							<greatestDifference id="M">d. MMM. – d. MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E., d. – E., d. MMM.</greatestDifference>
-							<greatestDifference id="M">E., d. MMM. – E., d. MMM.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d. M. yy – d. M. yy</greatestDifference>
-							<greatestDifference id="M">d. M. – d. M. yy</greatestDifference>
-							<greatestDifference id="y">d. M. yy – d. M. yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E., d. – E., d. M. yy</greatestDifference>
-							<greatestDifference id="M">E., d. M. – E., d. M. yy</greatestDifference>
-							<greatestDifference id="y">E., d. M. yy – E., d. M. yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM. – MMM. y</greatestDifference>
-							<greatestDifference id="y">MMM. y – MMM. y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.–d. MMM. y</greatestDifference>
-							<greatestDifference id="M">d. MMM. – d. MMM. y</greatestDifference>
-							<greatestDifference id="y">d. MMM. y – d. MMM. y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E., d. MMM. – E., d. MMM. y</greatestDifference>
-							<greatestDifference id="M">E., d. MMM. – E., d. MMM. y</greatestDifference>
-							<greatestDifference id="y">E., d. MMM. y – E., d. MMM. y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM–MM yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy – MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Doba</displayName>
-					</field>
-					<field type="year">
-						<displayName>Leto</displayName>
-					</field>
-					<field type="month">
-						<displayName>Mesec</displayName>
-					</field>
-					<field type="week">
-						<displayName>Teden</displayName>
-					</field>
-					<field type="day">
-						<displayName>Dan</displayName>
-						<relative type="-3">Pred tremi dnevi</relative>
-						<relative type="-2">Predv�erajšnjim</relative>
-						<relative type="-1">V�eraj</relative>
-						<relative type="0">Danes</relative>
-						<relative type="1">Jutri</relative>
-						<relative type="2">Pojutrišnjem</relative>
-						<relative type="3">ÄŒez tri dni</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Dan v tednu</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ÄŒas dneva</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Ura</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minuta</displayName>
-					</field>
-					<field type="second">
-						<displayName>Sekunda</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Obmo�je</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>neznano</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubaj</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Erevan</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Južni te�aj</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordova</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Dunaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Daka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bruselj</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrajn</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudi</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Brunej</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Kokosovi</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinšasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lubumbaši</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidžan</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Velikono�ni otok</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kašgar</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Å angaj</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Zelenortski otoki</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Boži�ni</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikozija</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhagen</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžir</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Talin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarski otoki</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Adis Abeba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Ferski otoki</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Pariz</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akra</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Gvadelupe</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atene</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Bisau</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Gvajana</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budimpešta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Džakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rim</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Aman</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biškek</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pjongjang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvajt</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kajman</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Uralsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktobe</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almati</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Bejrut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Vilna</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinik</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivi</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Kara�i</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšava</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Portoriko</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azori</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lizbona</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarešta</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadir</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rijad</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Kartum</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>St. Helena</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadiš</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damask</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅ¡gabat</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Darussalam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijev</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Severna Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Center, Severna Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Sajgon</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Srednjeevropski �as</standard>
-					<daylight>Srednjeevropski poletni �as</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Vzhodnoevropski �as</standard>
-					<daylight>Vzhodnoevropski poletni �as</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>e</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>andorska peseta</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>dirham Združenih arabskih emiratov</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>stari afganistanski afgani (1927–2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afgani</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>albanski lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>armenski dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>nizozemsko-antilski gulden</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>angolska kvanza</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>stara angolska kvanza (1977–1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>angolska nova kvanza (1990–2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>konvertibilna angolska kvanza (1995–1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>argentinski avstral</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>argentinski peso (1983–1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>argentinski peso</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>avstrijski Å¡iling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>avstralski dolar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>arubski florin</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>stari azerbajdžanski manat (1993–2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>azerbajdžanski manat</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>bosansko-hercegovski dinar</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>bosansko-hercegovska konvertibilna marka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>barbadoški dolar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>bangladeška taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>belgijski konvertibilni frank</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>belgijski frank</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>belgijski finan�ni frank</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>stari bolgarski lev</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>bolgarski lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>bahranski dinar</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>burundski frank</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>bermudski dolar</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>brunejski dolar</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>bolivijski boliviano</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>bolivijski peso</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>bolivijski mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>brazilski novi kruzeiro (1967–1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>brazilski kruzado</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>stari brazilski kruzeiro (1990–1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>brazilski real</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>novi brazilski kruzado</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>brazilski kruzeiro</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>bahamski dolar</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>butanski ngultrum</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>burmanski kjat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>bocvanska pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>beloruski novi rubelj (1994–1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>beloruski rubelj</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>belizejski dolar</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>kanadski dolar</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>kongoški frank</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>evro WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å¡vicarski frank</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>frank WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>�ilski unidades de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>�ilski peso</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>kitajski juan renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>kolumbijski peso</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>kolumbijska enota realne vrednosti</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>kostariški kolon</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>stari srbski dinar</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>�eškoslovaška krona</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>kubanski peso</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>zelenortski eskudo</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>ciprski funt</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>�eška krona</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>vzhodnonemška marka</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>nemška marka</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>džibutski frank</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>danska krona</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominikanski peso</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>alžirski dinar</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ekvadorski sukre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ekvadorska enota realne vrednosti (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>estonska krona</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>egiptovski funt</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>eritrejska nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>španska pezeta (ra�un A)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>španska pezeta (ra�un B)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Å¡panska pezeta</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>etiopski bir</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>evro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>finska marka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>fidžijski dolar</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>falklandski funt</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>francoski frank</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>britanski funt</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>gruzijski bon lari</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>gruzijski lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>stari ganski cedi (1979–2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>ganski cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>gibraltarski funt</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>gambijski dalasi</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>gvinejski sili</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekwele Ekvatorialne Gvineje</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>grška drahma</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>gvatemalski kecal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>eskudo Portugalske Gvineje</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>peso Gvineje Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>gvajanski dolar</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>hongkonški dolar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>honduraška lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>hrvaški dinar</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>hrvaška kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>haitski gurd</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>madžarski forint</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>indonezijska rupija</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>irski funt</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>izraelski funt</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>izraelski Å¡ekel</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>indijska rupija</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>iraški dinar</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>iranski rial</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>islandska krona</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>italijanska lira</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>jamajški dolar</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>jordanski dinar</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>japonski jen</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>kenijski Å¡iling</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>kirgiški som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>kamboški riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>komorski frank</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>severnokorejski von</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>južnokorejski von</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>kuvajtski dinar</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>kajmanski dolar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>kazahstanski tenge</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>laoški kip</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>libanonski funt</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>šrilanška rupija</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>liberijski dolar</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>lesoški loti</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litovski litas</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>litvanski litas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luksemburški konvertibilni frank</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>luksemburški frank</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>luksemburški finan�ni frank</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>latvijski lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>latvijski rubelj</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>libijski dinar</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>maroški dirham</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>maroški frank</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>moldavijski leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>malgaški ariarij</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>malgaški frank</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>makedonski denar</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>malijski frank</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>mjanmarski kjat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>mongolski tugrik</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>makavska pataka</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>mavretanska uguija</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>malteška lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>malteški funt</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>mavricijska rupija</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>maldivska rufija</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>malavijska kva�a</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>mehiški peso</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>mehiški srebrni peso (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>mehiška inverzna enota (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>malezijski ringit</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>mozambiški eskudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>stari mozambiški metikal</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>mozambiški metikal</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>namibijski dolar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>nigerijska naira</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>nikaraška kordova</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>nikaraška zlata kordova</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>nizozemski gulden</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>norveška krona</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>nepalska rupija</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>novozelandski dolar</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>omanski rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>panamska balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>perujski inti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>perujski novi sol</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>perujski sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>kina Papue Nove Gvineje</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filipinski peso</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>pakistanska rupija</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>poljski novi zlot</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>stari poljski zlot (1950–1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>portugalski eskudo</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>paragvajski gvarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>katarski rial</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>rodezijski dolar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>stari romunski leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>romunski leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>srbski dinar</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>ruski rubelj</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>ruski rubelj (1991–1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>ruandski frank</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>saudski rial</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>solomonski dolar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>sejšelska rupija</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>stari sudanski dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>sudanski funt</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>stari sudanski funt</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Å¡vedska krona</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>singapurski dolar</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>funt Sv. Helene</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>slovenski tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>slovaška krona</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>sieraleonski leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>somalski Å¡iling</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>surinamski dolar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>surinamski gulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>saotomejska dobra</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>sovjetski rubelj</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>salvadorski kolon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>sirijski funt</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>svazijski lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>tajski baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>tadžikistanski rubelj</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>tadžikistanski somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>turkmenski manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>tunizijski dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>tongovska paanga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>timorski eskudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>stara turška lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>nova turška lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>dolar Trinidada in Tobaga</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>novi tajvanski dolar</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>tanzanijski Å¡iling</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ukrajinska grivna</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>ukrajinski karbovanci</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>stari ugandski šiling (1966–1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ugandski Å¡iling</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ameriški dolar</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>ameriški dolar, naslednji dan</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>ameriški dolar, isti dan</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>stari urugvajski peso (1975–1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>urugvajski peso</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>uzbeški sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venezuelski bolivar</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>venezuelski bolivar fuerte</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>vientnamski dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>vanuatujski vatu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>samoanska tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA frank BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>srebro</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>zlato</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>evropska sestavljena enota</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>evropska monetarna enota</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>evropska obra�unska enota (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>evropska obra�unska enota (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>vzhodnokaribski dolar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>posebne pravice �rpanja</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>evropska denarna enota</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>zlati frank</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>frank UIC</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA frank BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>paladij</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP frank</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>XRE</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>koda za potrebe testiranja</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>neznana ali neveljavna valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>jemenski dinar</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>jemenski rial</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>stari jugoslovanski dinar</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>novi jugoslovanski dinar</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>jugoslovanski konvertibilni dinar</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>južnoafriški finan�ni rand</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>južnoafriški rand</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>zambijska kva�a</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zairski novi zaire</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zairski zaire</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>zimbabvejski dolar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dnevi</unitPattern>
-			<unitPattern count="one">{0} dan</unitPattern>
-			<unitPattern count="other">{0} dni</unitPattern>
-			<unitPattern count="two">{0} dni</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} ure</unitPattern>
-			<unitPattern count="one">{0} ura</unitPattern>
-			<unitPattern count="other">{0} ur</unitPattern>
-			<unitPattern count="two">{0} uri</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minute</unitPattern>
-			<unitPattern count="one">{0} minuta</unitPattern>
-			<unitPattern count="other">{0} minut</unitPattern>
-			<unitPattern count="two">{0} minuti</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} meseci</unitPattern>
-			<unitPattern count="one">{0} mesec</unitPattern>
-			<unitPattern count="other">{0} mesecev</unitPattern>
-			<unitPattern count="two">{0} meseca</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekunde</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekund</unitPattern>
-			<unitPattern count="two">{0} sekundi</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} tedni</unitPattern>
-			<unitPattern count="one">{0} teden</unitPattern>
-			<unitPattern count="other">{0} tednov</unitPattern>
-			<unitPattern count="two">{0} tedna</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} leta</unitPattern>
-			<unitPattern count="one">{0} leto</unitPattern>
-			<unitPattern count="other">{0} let</unitPattern>
-			<unitPattern count="two">{0} leti</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>da:d</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sl_SI.xml b/airtime_mvc/library/Zend/Locale/Data/sl_SI.xml
deleted file mode 100644
index 2c7942071..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sl_SI.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sl"/>
-		<territory type="SI"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/so.xml b/airtime_mvc/library/Zend/Locale/Data/so.xml
deleted file mode 100644
index 23d91e61a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/so.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.68 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="so"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikaanays</language>
-			<language type="am">Amhari</language>
-			<language type="ar">Carabi</language>
-			<language type="as">Asaamiis</language>
-			<language type="az">Azerbaijan</language>
-			<language type="be">Beleruusiyaan</language>
-			<language type="bg">Bulgeeriyaan</language>
-			<language type="bh">Bixaari</language>
-			<language type="bn">Bangaali</language>
-			<language type="br">Bereton</language>
-			<language type="bs">Boosniya</language>
-			<language type="ca">Katalaan</language>
-			<language type="cs">Jeeg</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Danmarkays</language>
-			<language type="de">Jarmal</language>
-			<language type="de_CH">Jarmal (Iswiiserlaand)</language>
-			<language type="el">Giriik</language>
-			<language type="en">Ingiriisi</language>
-			<language type="en_GB">Ingiriisi (Boqortooyada Midowday)</language>
-			<language type="en_US">Ingiriisi (Maraykan)</language>
-			<language type="eo">Isberento</language>
-			<language type="es">Isbaanish</language>
-			<language type="es_419">Isbaanishka Laatiin Ameerika</language>
-			<language type="es_ES">Isbaanish (Isbayn)</language>
-			<language type="et">Istooniyaan</language>
-			<language type="eu">Basquu</language>
-			<language type="fa">Faarisi</language>
-			<language type="fi">Fiinlaandees</language>
-			<language type="fil">Tagalog</language>
-			<language type="fo">Farowsi</language>
-			<language type="fr">Faransiis</language>
-			<language type="fr_CH">Faransiis (Iswiiserlaand)</language>
-			<language type="fy">Firiisiyan Galbeed</language>
-			<language type="ga">Ayrish</language>
-			<language type="gd">Iskot Giilik</language>
-			<language type="gl">Galiisiyaan</language>
-			<language type="gn">Guraani</language>
-			<language type="gu">Gujaraati</language>
-			<language type="he">Cibri</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Koro'eeshiyaan</language>
-			<language type="hu">Hangariyaan</language>
-			<language type="hy">Armeeniyaan</language>
-			<language type="ia">Interlinguwa</language>
-			<language type="id">Indunuusiyaan</language>
-			<language type="ie">Interlingue</language>
-			<language type="is">Ayslandays</language>
-			<language type="it">Talyaani</language>
-			<language type="ja">Jabbaaniis</language>
-			<language type="jv">Jafaaniis</language>
-			<language type="ka">Joorijiyaan</language>
-			<language type="km">Kamboodhian</language>
-			<language type="kn">Kannadays</language>
-			<language type="ko">Kuuriyaan</language>
-			<language type="ku">Kurdishka</language>
-			<language type="ky">Kirgiis</language>
-			<language type="la">Laatiin</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laothian</language>
-			<language type="lt">Lituwaanays</language>
-			<language type="lv">Laatfiyaan</language>
-			<language type="mk">Masadooniyaan</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">Mangooli</language>
-			<language type="mr">Maarati</language>
-			<language type="ms">Malaay</language>
-			<language type="mt">Maltiis</language>
-			<language type="ne">Nebaali</language>
-			<language type="nl">Holandays</language>
-			<language type="nn">Nowrwejiyan (naynoroski)</language>
-			<language type="no">Af Noorwiijiyaan</language>
-			<language type="oc">Okitaan</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Bunjaabi</language>
-			<language type="pl">Boolish</language>
-			<language type="ps">Bashtuu</language>
-			<language type="pt">Boortaqiis</language>
-			<language type="pt_BR">Boortaqiiska Baraasiil</language>
-			<language type="pt_PT">Boortaqiis (Boortuqaal)</language>
-			<language type="ro">Romanka</language>
-			<language type="ru">Ruush</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sd">SINDHI</language>
-			<language type="sh">Serbiyaan</language>
-			<language type="si">Sinhaleys</language>
-			<language type="sk">Isloofaak</language>
-			<language type="sl">Islofeeniyaan</language>
-			<language type="so">Soomaali</language>
-			<language type="sq">Albaaniyaan</language>
-			<language type="sr">Seerbiyaan</language>
-			<language type="st">Sesooto</language>
-			<language type="su">Suudaaniis</language>
-			<language type="sv">Swiidhis</language>
-			<language type="sw">Sawaaxili</language>
-			<language type="ta">Tamiil</language>
-			<language type="te">Teluugu</language>
-			<language type="th">Taaylandays</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tk">Turkumaanish</language>
-			<language type="tlh">Kiligoon</language>
-			<language type="tr">Turkish</language>
-			<language type="tw">Tiwiyan</language>
-			<language type="ug">UIGHUR</language>
-			<language type="uk">Yukreeniyaan</language>
-			<language type="und">Af aan la aqoon ama aan sax ahayn</language>
-			<language type="ur">Urduu</language>
-			<language type="uz">Usbakis</language>
-			<language type="vi">Fiitnaamays</language>
-			<language type="xh">Hoosta</language>
-			<language type="yi">Yadhish</language>
-			<language type="zh">Jayniis</language>
-			<language type="zu">Zuulu</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Laatiin</script>
-			<script type="Zxxx">Aan la qorin</script>
-			<script type="Zzzz">Far aan la aqoon amase aan saxnayn</script>
-		</scripts>
-		<territories>
-			<territory type="014">Afrikada Bari</territory>
-			<territory type="030">Aasiyada Bari</territory>
-			<territory type="151">Yurubta Bari</territory>
-			<territory type="AE">Imaaraadka Carabta ee Midoobay</territory>
-			<territory type="AF">Afgaanistaan</territory>
-			<territory type="AM">Armeeniya</territory>
-			<territory type="AO">Angoola</territory>
-			<territory type="AT">Osteeriya</territory>
-			<territory type="AU">Awstraaliya</territory>
-			<territory type="BA">Boosniya Heersigoviina</territory>
-			<territory type="BB">Baarbadoos</territory>
-			<territory type="BD">Bangaala-Deesh</territory>
-			<territory type="BE">Beljiyam</territory>
-			<territory type="BH">Baxrayn</territory>
-			<territory type="BJ">Beniin</territory>
-			<territory type="BR">Braasiil</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CH">Swiiserlaand</territory>
-			<territory type="CL">Jili</territory>
-			<territory type="CM">Kameruun</territory>
-			<territory type="CN">Shiinaha</territory>
-			<territory type="CU">Kuuba</territory>
-			<territory type="CZ">Jekoslafaakiya</territory>
-			<territory type="DE">Jarmal</territory>
-			<territory type="DJ">Jabuuti</territory>
-			<territory type="DK">Danmaark</territory>
-			<territory type="EC">Ikwadoor</territory>
-			<territory type="EG">Masar</territory>
-			<territory type="ES">Isbeyn</territory>
-			<territory type="ET">Itoobiya</territory>
-			<territory type="FI">Fiinlaand</territory>
-			<territory type="FR">Faransiis</territory>
-			<territory type="GB">United Kingdom</territory>
-			<territory type="GD">Giriinaada</territory>
-			<territory type="GN">Gini</territory>
-			<territory type="GR">Giriigga</territory>
-			<territory type="HR">Korweeshiya</territory>
-			<territory type="HU">Hangeri</territory>
-			<territory type="ID">Indoneesiya</territory>
-			<territory type="IE">Ayrlaanda</territory>
-			<territory type="IL">Israaʼiil</territory>
-			<territory type="IN">Hindiya</territory>
-			<territory type="IQ">Ciraaq</territory>
-			<territory type="IR">Iiraan</territory>
-			<territory type="IS">Iislaand</territory>
-			<territory type="IT">Talyaani</territory>
-			<territory type="JM">Jameyka</territory>
-			<territory type="JO">Urdun</territory>
-			<territory type="JP">Jabbaan</territory>
-			<territory type="KE">Kiiniya</territory>
-			<territory type="KH">Kamboodiya</territory>
-			<territory type="KP">Kuuriyada Waqooyi</territory>
-			<territory type="KR">Kuuriyada Koonfureed</territory>
-			<territory type="KW">Kuwayt</territory>
-			<territory type="KZ">Kasaakhistaan</territory>
-			<territory type="LB">Lubnaan</territory>
-			<territory type="LK">Siirilaanka</territory>
-			<territory type="LR">Laybeeriya</territory>
-			<territory type="LS">Losooto</territory>
-			<territory type="LU">Luksemboorg</territory>
-			<territory type="LV">Laatfiya</territory>
-			<territory type="LY">Liibiya</territory>
-			<territory type="MA">Marooko</territory>
-			<territory type="MC">Moonako</territory>
-			<territory type="MK">Makadooniya</territory>
-			<territory type="ML">Maali</territory>
-			<territory type="MR">Muritaaniya</territory>
-			<territory type="MT">Maalda</territory>
-			<territory type="MV">Maaldiqeen</territory>
-			<territory type="MW">Malaawi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MZ">Musambiig</territory>
-			<territory type="NA">Namiibiya</territory>
-			<territory type="NG">Nayjeeriya</territory>
-			<territory type="NI">Nikaraaguwa</territory>
-			<territory type="NO">Noorweey</territory>
-			<territory type="NZ">Neyuusilaand</territory>
-			<territory type="OM">Cumaan</territory>
-			<territory type="PH">Filibiin</territory>
-			<territory type="PK">Bakistaan</territory>
-			<territory type="PL">Booland</territory>
-			<territory type="PT">Bortuqaal</territory>
-			<territory type="QA">Qadar</territory>
-			<territory type="RO">Rumaaniya</territory>
-			<territory type="RU">Ruush</territory>
-			<territory type="SA">Sacuudi Carabiya</territory>
-			<territory type="SD">Sudaan</territory>
-			<territory type="SE">Iswidhan</territory>
-			<territory type="SL">Siraaliyoon</territory>
-			<territory type="SO">Soomaaliya</territory>
-			<territory type="SY">Suuriya</territory>
-			<territory type="TD">Jaad</territory>
-			<territory type="TG">Toogo</territory>
-			<territory type="TH">Taylaand</territory>
-			<territory type="TN">Tuniisiya</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turki</territory>
-			<territory type="TZ">Tansaaniya</territory>
-			<territory type="UG">Ugaanda</territory>
-			<territory type="US">Qaramada Midoobey ee Maraykanka</territory>
-			<territory type="VA">Faatikaan</territory>
-			<territory type="VE">Fenisuweela</territory>
-			<territory type="VN">Fiyetnaam</territory>
-			<territory type="YE">Yaman</territory>
-			<territory type="ZA">Koonfur Afrika</territory>
-			<territory type="ZM">Saambiya</territory>
-			<territory type="ZW">Simbaabwe</territory>
-			<territory type="ZZ">Far aan la aqoon amase aan saxnayn</territory>
-		</territories>
-		<keys>
-			<key type="calendar">Habeentiris</key>
-			<key type="currency">Lacag</key>
-		</keys>
-		<types>
-			<type type="hebrew" key="calendar">Habeentiriska yuhuudda</type>
-			<type type="islamic" key="calendar">Habeentiriska islaamka</type>
-			<type type="japanese" key="calendar">Habeentiriska jabbaanka</type>
-		</types>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Kob</month>
-							<month type="2">Lab</month>
-							<month type="3">Sad</month>
-							<month type="4">Afr</month>
-							<month type="5">Sha</month>
-							<month type="6">Lix</month>
-							<month type="7">Tod</month>
-							<month type="8">Sid</month>
-							<month type="9">Sag</month>
-							<month type="10">Tob</month>
-							<month type="11">KIT</month>
-							<month type="12">LIT</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Bisha Koobaad</month>
-							<month type="2">Bisha Labaad</month>
-							<month type="3">Bisha Saddexaad</month>
-							<month type="4">Bisha Afraad</month>
-							<month type="5">Bisha Shanaad</month>
-							<month type="6">Bisha Lixaad</month>
-							<month type="7">Bisha Todobaad</month>
-							<month type="8">Bisha Sideedaad</month>
-							<month type="9">Bisha Sagaalaad</month>
-							<month type="10">Bisha Tobnaad</month>
-							<month type="11">Bisha Kow iyo Tobnaad</month>
-							<month type="12">Bisha Laba iyo Tobnaad</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">K</month>
-							<month type="2">L</month>
-							<month type="3">S</month>
-							<month type="4">A</month>
-							<month type="5">S</month>
-							<month type="6">L</month>
-							<month type="7">T</month>
-							<month type="8">S</month>
-							<month type="9">S</month>
-							<month type="10">T</month>
-							<month type="11">K</month>
-							<month type="12">L</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Axa</day>
-							<day type="mon">Isn</day>
-							<day type="tue">Sal</day>
-							<day type="wed">Arb</day>
-							<day type="thu">Kha</day>
-							<day type="fri">Jim</day>
-							<day type="sat">Sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Axad</day>
-							<day type="mon">Isniin</day>
-							<day type="tue">Salaaso</day>
-							<day type="wed">Arbaco</day>
-							<day type="thu">Khamiis</day>
-							<day type="fri">Jimco</day>
-							<day type="sat">Sabti</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">A</day>
-							<day type="mon">I</day>
-							<day type="tue">S</day>
-							<day type="wed">A</day>
-							<day type="thu">K</day>
-							<day type="fri">J</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>sn</am>
-				<pm>gn</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Ciise ka hor</era>
-						<era type="1">Ciise ka dib</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM dd, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a - h a</greatestDifference>
-							<greatestDifference id="h">h-h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a - h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a - h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm-h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm-h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a - h a v</greatestDifference>
-							<greatestDifference id="h">h-h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd/MM - E, dd/MM</greatestDifference>
-							<greatestDifference id="M">E, dd/MM - E, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy - MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy - MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy - dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy - dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">E, dd/MM/yy - E, dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM dd - E, MMM dd, y</greatestDifference>
-							<greatestDifference id="M">E, MMM dd - E, MMM dd, y</greatestDifference>
-							<greatestDifference id="y">E, MMM dd, y - E, MMM dd, y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Far aan la aqoon amase aan saxnayn</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Brazilian Real</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Chinese Yuan Renminbi</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Faran Jabbuuti</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Birta Itoobbiya</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Yuuroo</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>British Pound Sterling</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indian Rupee</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanese Yen</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Russian Ruble</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Shilin soomaali</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Doollar maraykan</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Lacag aan la qoon ama aan saxnayn</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>haa:h</yesstr>
-			<nostr>maya:m</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/so_DJ.xml b/airtime_mvc/library/Zend/Locale/Data/so_DJ.xml
deleted file mode 100644
index b37a402ba..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/so_DJ.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="so"/>
-		<territory type="DJ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/so_ET.xml b/airtime_mvc/library/Zend/Locale/Data/so_ET.xml
deleted file mode 100644
index d009f467c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/so_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="so"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/so_KE.xml b/airtime_mvc/library/Zend/Locale/Data/so_KE.xml
deleted file mode 100644
index 2f3b39705..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/so_KE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="so"/>
-		<territory type="KE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/so_SO.xml b/airtime_mvc/library/Zend/Locale/Data/so_SO.xml
deleted file mode 100644
index 6df94e1ea..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/so_SO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="so"/>
-		<territory type="SO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sq.xml b/airtime_mvc/library/Zend/Locale/Data/sq.xml
deleted file mode 100644
index 684658399..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sq.xml
+++ /dev/null
@@ -1,656 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.81 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="sq"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Afrikanisht</language>
-			<language type="am">Amharike</language>
-			<language type="ar">Arabisht</language>
-			<language type="as">Asamezisht</language>
-			<language type="az">Azerbajxhanisht</language>
-			<language type="be">Bjellorusisht</language>
-			<language type="bg">Bullgarisht</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Bengalisht</language>
-			<language type="br">Breton</language>
-			<language type="bs">Boshnjakisht</language>
-			<language type="ca">Katalonisht</language>
-			<language type="cs">Çekisht</language>
-			<language type="cy">Uellsisht</language>
-			<language type="da">Danisht</language>
-			<language type="de">Gjermanisht</language>
-			<language type="el">Greqisht</language>
-			<language type="en">Anglisht</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanjisht</language>
-			<language type="et">Estonisht</language>
-			<language type="eu">Baskisht</language>
-			<language type="fa">Persisht</language>
-			<language type="fi">Finlandisht</language>
-			<language type="fil">Tagalogisht</language>
-			<language type="fo">Faroisht</language>
-			<language type="fr">Frengjisht</language>
-			<language type="fy">Frizianisht</language>
-			<language type="ga">Irlandisht</language>
-			<language type="gd">Galisht</language>
-			<language type="gl">Galicianisht</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Guxharati</language>
-			<language type="he">Hebraisht</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Kroatisht</language>
-			<language type="hu">Hungarisht</language>
-			<language type="hy">Armen</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonezisht</language>
-			<language type="ie">Gjuha nderkombtare</language>
-			<language type="is">Islandisht</language>
-			<language type="it">Italisht</language>
-			<language type="ja">Japanisht</language>
-			<language type="jv">Javanisht</language>
-			<language type="ka">Gjeorgjisht</language>
-			<language type="km">Kamboxhiane</language>
-			<language type="kn">Kanada</language>
-			<language type="ko">Koreançe</language>
-			<language type="ku">Kurd</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Latinisht</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laosisht</language>
-			<language type="lt">Lituanisht</language>
-			<language type="lv">Letonisht</language>
-			<language type="mk">Maqedonisht</language>
-			<language type="ml">Malajalam</language>
-			<language type="mn">Mongolisht</language>
-			<language type="mr">Marati</language>
-			<language type="ms">Malajzisht</language>
-			<language type="mt">Maltisht</language>
-			<language type="ne">Nepalisht</language>
-			<language type="nl">Holandisht</language>
-			<language type="nn">Norvegjisht (Nynorsk)</language>
-			<language type="no">Norvegjisht</language>
-			<language type="oc">Oksitanisht</language>
-			<language type="or">Orija</language>
-			<language type="pa">Punxhabi</language>
-			<language type="pl">Polonisht</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Portugeze</language>
-			<language type="pt_BR">Portugalisht (Brazil)</language>
-			<language type="pt_PT">Portugalisht (Portugali)</language>
-			<language type="ro">Rumanisht</language>
-			<language type="ru">Rusisht</language>
-			<language type="sa">Sanskritisht</language>
-			<language type="sd">Si'ndi</language>
-			<language type="sh">Serbo-Kroatisht</language>
-			<language type="si">Sinhalezisht</language>
-			<language type="sk">Sllovakisht</language>
-			<language type="sl">Sllovenisht</language>
-			<language type="so">Somalisht</language>
-			<language type="sq">shqipe</language>
-			<language type="sr">Serbisht</language>
-			<language type="st">Sesotho</language>
-			<language type="su">Sundanisht</language>
-			<language type="sv">Suedisht</language>
-			<language type="sw">Suahilisht</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="th">Tajlandisht</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tk">Turk</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Turqisht</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Ujgur</language>
-			<language type="uk">Ukrainisht</language>
-			<language type="und">Unknown or Invalid Language</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbekistanisht</language>
-			<language type="vi">Vietnamisht</language>
-			<language type="xh">Xhosa</language>
-			<language type="yi">Jiden</language>
-			<language type="zh">Kineze</language>
-			<language type="zu">Zulu</language>
-		</languages>
-		<scripts>
-			<script type="Latn">Latine</script>
-			<script type="Zxxx">I pashkruar</script>
-			<script type="Zzzz">Skript i panjohur ose i pavlefshëm</script>
-		</scripts>
-		<territories>
-			<territory type="AD">Andorrë</territory>
-			<territory type="AE">Emiratet Arabe te Bashkuara</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua e Barbuda</territory>
-			<territory type="AL">Shqipëria</territory>
-			<territory type="AM">Armeni</territory>
-			<territory type="AO">Angolë</territory>
-			<territory type="AR">Argjentinë</territory>
-			<territory type="AT">Austri</territory>
-			<territory type="AU">Australi</territory>
-			<territory type="AX">Ishujt Aland</territory>
-			<territory type="AZ">Azerbajxhan</territory>
-			<territory type="BA">Bosnja dhe Hercegovina</territory>
-			<territory type="BE">Belgjikë</territory>
-			<territory type="BG">Bullgari</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolivi</territory>
-			<territory type="BR">Brazili</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Bjellorusi</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CF">Republika Qendrore e Afrikës</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Zvicër</territory>
-			<territory type="CI">Bregu i Fildishtë</territory>
-			<territory type="CL">Kili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kinë</territory>
-			<territory type="CO">Kolumbi</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Serbië en Montenegro</territory>
-			<territory type="CU">Kubë</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CY">Qipro</territory>
-			<territory type="CZ">Republika e Çekisë</territory>
-			<territory type="DE">Gjermani</territory>
-			<territory type="DJ">Xhibuti</territory>
-			<territory type="DK">Danimarkë</territory>
-			<territory type="DM">Dominikë</territory>
-			<territory type="DO">Republika Dominikanë</territory>
-			<territory type="DZ">Algjeri</territory>
-			<territory type="EC">Ekuator</territory>
-			<territory type="EE">Estoni</territory>
-			<territory type="EG">Egjipt</territory>
-			<territory type="EH">Saharaja Perëndimore</territory>
-			<territory type="ER">Eritre</territory>
-			<territory type="ES">Spanjë</territory>
-			<territory type="ET">Etiopi</territory>
-			<territory type="FI">Finlandë</territory>
-			<territory type="FJ">Fixhi</territory>
-			<territory type="FM">Mikronezi</territory>
-			<territory type="FR">Francë</territory>
-			<territory type="GA">Gjabon</territory>
-			<territory type="GB">Mbretëria e Bashkuar</territory>
-			<territory type="GE">Gjeorgji</territory>
-			<territory type="GH">Ganë</territory>
-			<territory type="GM">Gambi</territory>
-			<territory type="GN">Guine</territory>
-			<territory type="GQ">Guineja Ekuatoriale</territory>
-			<territory type="GR">Greqi</territory>
-			<territory type="GT">Guatemalë</territory>
-			<territory type="GW">Guine Bisau</territory>
-			<territory type="GY">Guajana</territory>
-			<territory type="HR">Kroaci</territory>
-			<territory type="HU">Hungari</territory>
-			<territory type="ID">Indonezi</territory>
-			<territory type="IE">Irlandë</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IN">Indi</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IS">Islandë</territory>
-			<territory type="IT">Itali</territory>
-			<territory type="JM">Xhamajkë</territory>
-			<territory type="JO">Jordani</territory>
-			<territory type="JP">Japoni</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KG">Kirgistan</territory>
-			<territory type="KH">Kamboxhi</territory>
-			<territory type="KI">Qiribati</territory>
-			<territory type="KM">Komore</territory>
-			<territory type="KN">Saint Kitts e Nevis</territory>
-			<territory type="KP">Koreja e Veriut</territory>
-			<territory type="KR">Koreja e Jugut</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KZ">Kazakistan</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LI">Lihtënshtajn</territory>
-			<territory type="LR">Liberi</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Lituani</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">Letoni</territory>
-			<territory type="LY">Libi</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavi</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Ishujt Marshall</territory>
-			<territory type="MK">Maqedoni</territory>
-			<territory type="MN">Mongoli</territory>
-			<territory type="MR">Mauritani</territory>
-			<territory type="MT">Maltë</territory>
-			<territory type="MV">Maldivit</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksikë</territory>
-			<territory type="MY">Malajzi</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibi</territory>
-			<territory type="NG">Nigeri</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Vendet e Ulëta</territory>
-			<territory type="NO">Norvegji</territory>
-			<territory type="NZ">Zelanda e Re</territory>
-			<territory type="PG">Papua Guineja e Re</territory>
-			<territory type="PH">Filipine</territory>
-			<territory type="PL">Poloni</territory>
-			<territory type="PT">Portugali</territory>
-			<territory type="PY">Paraguaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="RO">Rumani</territory>
-			<territory type="RU">Rusi</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Arabia Saudite</territory>
-			<territory type="SB">Ishujt Solomon</territory>
-			<territory type="SC">Sishel</territory>
-			<territory type="SE">Suedi</territory>
-			<territory type="SG">Singapor</territory>
-			<territory type="SI">Slloveni</territory>
-			<territory type="SK">Sllovaki</territory>
-			<territory type="SL">Siera Leone</territory>
-			<territory type="SO">Somali</territory>
-			<territory type="ST">Sao Tome e Prinsipe</territory>
-			<territory type="SY">Siri</territory>
-			<territory type="SZ">Svazilandë</territory>
-			<territory type="TD">Çad</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajlandë</territory>
-			<territory type="TJ">Taxhikistan</territory>
-			<territory type="TN">Tunisi</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turqi</territory>
-			<territory type="TT">Trinidad e Tobago</territory>
-			<territory type="TW">Tajvan</territory>
-			<territory type="TZ">Tanzani</territory>
-			<territory type="UA">Ukrainë</territory>
-			<territory type="US">Shtetet e Bashkuara të Amerikës</territory>
-			<territory type="UY">Uruguaj</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent e Grenadinet</territory>
-			<territory type="VE">Venezuelë</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="ZA">Afrika e Jugut</territory>
-			<territory type="ZM">Zambi</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Rajon i panjohur ose i pavlefshëm</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ç d {dh} e ë f g {gj} h-l {ll} m n {nj} o-r {rr} s {sh} t {th} u v x {xh} y z {zh}]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[w]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Shk</month>
-							<month type="3">Mar</month>
-							<month type="4">Pri</month>
-							<month type="5">Maj</month>
-							<month type="6">Qer</month>
-							<month type="7">Kor</month>
-							<month type="8">Gsh</month>
-							<month type="9">Sht</month>
-							<month type="10">Tet</month>
-							<month type="11">Nën</month>
-							<month type="12">Dhj</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">janar</month>
-							<month type="2">shkurt</month>
-							<month type="3">mars</month>
-							<month type="4">prill</month>
-							<month type="5">maj</month>
-							<month type="6">qershor</month>
-							<month type="7">korrik</month>
-							<month type="8">gusht</month>
-							<month type="9">shtator</month>
-							<month type="10">tetor</month>
-							<month type="11">nëntor</month>
-							<month type="12">dhjetor</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">S</month>
-							<month type="3">M</month>
-							<month type="4">P</month>
-							<month type="5">M</month>
-							<month type="6">Q</month>
-							<month type="7">K</month>
-							<month type="8">G</month>
-							<month type="9">S</month>
-							<month type="10">T</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Die</day>
-							<day type="mon">Hën</day>
-							<day type="tue">Mar</day>
-							<day type="wed">Mër</day>
-							<day type="thu">Enj</day>
-							<day type="fri">Pre</day>
-							<day type="sat">Sht</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">e diel</day>
-							<day type="mon">e hënë</day>
-							<day type="tue">e martë</day>
-							<day type="wed">e mërkurë</day>
-							<day type="thu">e enjte</day>
-							<day type="fri">e premte</day>
-							<day type="sat">e shtunë</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">D</day>
-							<day type="mon">H</day>
-							<day type="tue">M</day>
-							<day type="wed">M</day>
-							<day type="thu">E</day>
-							<day type="fri">P</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>PD</am>
-				<pm>MD</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">p.e.r.</era>
-						<era type="1">n.e.r.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h.mm.ss.a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h.mm.ss.a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h.mm.ss.a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h.mm.a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H.mm</dateFormatItem>
-						<dateFormatItem id="Hms">H.mm.ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, d.M</dateFormatItem>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d.M.yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h.a - h.a</greatestDifference>
-							<greatestDifference id="h">h.-h.a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h.mm.a - h.mm.a</greatestDifference>
-							<greatestDifference id="h">h.mm.-h.mm.a</greatestDifference>
-							<greatestDifference id="m">h.mm.-h.mm.a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h.mm.a - h.mm.a v</greatestDifference>
-							<greatestDifference id="h">h.mm.-h.mm.a v</greatestDifference>
-							<greatestDifference id="m">h.mm.-h.mm.a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h.a - h.a v</greatestDifference>
-							<greatestDifference id="h">h.-h.a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-MM - yy-MM</greatestDifference>
-							<greatestDifference id="y">yy-MM - yy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yy-MM-dd - yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd - E, dd MMM y</greatestDifference>
-							<greatestDifference id="M">E, dd MMM - E, dd MMM y</greatestDifference>
-							<greatestDifference id="y">E, dd MMM y - E, dd MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Ora qendrore evropiane</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Ora lindore evropiane</standard>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<standard>Ora standarde e Moskës</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ALL">
-				<symbol>Lek</symbol>
-			</currency>
-			<currency type="BRL">
-				<displayName>Real Brazilian</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Renminbi(Yuan) Kinez</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Paund Sterlina Britanike</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupee indiane</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Jeni Japonez</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rubla ruse</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Dollar amerikan</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Unknown or Invalid Currency</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} ditë</unitPattern>
-			<unitPattern count="other">{0} ditë</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} orë</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minutë</unitPattern>
-			<unitPattern count="other">{0} minuta</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} muaj</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekondë</unitPattern>
-			<unitPattern count="other">{0} sekonda</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} javë</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} vit</unitPattern>
-			<unitPattern count="other">{0} vjet</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>po:p</yesstr>
-			<nostr>jo:j</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sq_AL.xml b/airtime_mvc/library/Zend/Locale/Data/sq_AL.xml
deleted file mode 100644
index d696e2240..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sq_AL.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sq"/>
-		<territory type="AL"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr.xml b/airtime_mvc/library/Zend/Locale/Data/sr.xml
deleted file mode 100644
index 5b70fd8e1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr.xml
+++ /dev/null
@@ -1,5948 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.125 $"/>
-		<generation date="$Date: 2009/06/15 17:12:26 $"/>
-		<language type="sr"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Aфaр�ки</language>
-			<language type="ab">�бказиј�ки</language>
-			<language type="ace">Aчине�ки</language>
-			<language type="ach">Aколи</language>
-			<language type="ada">Aдaнгмеј�ки</language>
-			<language type="ady">Aдигеј�ки</language>
-			<language type="ae">Aве�тaн�ки</language>
-			<language type="af">�фриканер�ки</language>
-			<language type="afa">Aфро-aзијaт�ки</language>
-			<language type="afh">Aфрихили</language>
-			<language type="ain">Aину</language>
-			<language type="ak">Aкaн</language>
-			<language type="akk">�кадиј�ки</language>
-			<language type="ale">Aљут</language>
-			<language type="alg">Aлгонквијaн�ки језик</language>
-			<language type="alt">Јужни aлтaи</language>
-			<language type="am">�мхар�ки</language>
-			<language type="an">Aрaгонежaн�ки</language>
-			<language type="ang">Староенгле�ки</language>
-			<language type="anp">Aнгикa</language>
-			<language type="apa">�пачки језик</language>
-			<language type="ar">�рап�ки</language>
-			<language type="arc">Aрмaј�ки</language>
-			<language type="arn">Aрокaниј�ки</language>
-			<language type="arp">Aрaпaхо</language>
-			<language type="art">Вештaчки</language>
-			<language type="arw">Aрaвaк</language>
-			<language type="as">��емиј�ки</language>
-			<language type="ast">A�туриј�ки</language>
-			<language type="ath">Aтaпa�кaн</language>
-			<language type="aus">�у�тралиј�ки језик</language>
-			<language type="av">�вар�ки</language>
-			<language type="awa">Aвaдхи</language>
-			<language type="ay">Aјмaрa</language>
-			<language type="az">�зербејџан�ки</language>
-			<language type="ba">Башкир</language>
-			<language type="bad">Бaндa</language>
-			<language type="bai">Бaмилеке</language>
-			<language type="bal">Бaлучи</language>
-			<language type="ban">Бaлинезиј�ки</language>
-			<language type="bas">Бa�a</language>
-			<language type="bat">Балтички језик</language>
-			<language type="be">Белору�ки</language>
-			<language type="bej">Беја</language>
-			<language type="bem">Бембa</language>
-			<language type="ber">Бербер</language>
-			<language type="bg">Бугар�ки</language>
-			<language type="bh">Бихар�ки</language>
-			<language type="bho">Бојпури</language>
-			<language type="bi">Би�лама</language>
-			<language type="bik">Бикол</language>
-			<language type="bin">Бини</language>
-			<language type="bla">Си�ика</language>
-			<language type="bm">Бaмбaрa</language>
-			<language type="bn">Бенгла�ки</language>
-			<language type="bnt">Банту</language>
-			<language type="bo">Тибетан�ки</language>
-			<language type="br">Бретон�ки</language>
-			<language type="bra">Брaј</language>
-			<language type="bs">Бо�ан�ки</language>
-			<language type="btk">Бaтaк</language>
-			<language type="bua">Буриaт</language>
-			<language type="bug">Бугинежaн�ки</language>
-			<language type="byn">Блин</language>
-			<language type="ca">Каталон�ки</language>
-			<language type="cad">Кaдо</language>
-			<language type="cai">Централно амерички Индијан�ки језик</language>
-			<language type="car">Кaрип�ки</language>
-			<language type="cau">Кaвкa�ки</language>
-			<language type="cch">�т�ам�ки</language>
-			<language type="ce">Чечен�ки</language>
-			<language type="ceb">Цебуaно</language>
-			<language type="cel">Келт�ки</language>
-			<language type="ch">Чaморо</language>
-			<language type="chb">Чибчa</language>
-			<language type="chg">Чaгaтaи</language>
-			<language type="chk">Чуке�ки</language>
-			<language type="chm">Мaри</language>
-			<language type="chn">Чинук�ки</language>
-			<language type="cho">Чоктaв�ки</language>
-			<language type="chp">Чипвијaн�ки</language>
-			<language type="chr">Чероки</language>
-			<language type="chy">Чејен�ки</language>
-			<language type="cmc">Чaм�ки језик</language>
-			<language type="co">Корзикан�ки</language>
-			<language type="cop">Копт�ки</language>
-			<language type="cpe">Креол�ки или пиџин зa�новaн нa енгле�ком</language>
-			<language type="cpf">Креол�ки или пиџин зa�новaн нa фрaнцу�ком</language>
-			<language type="cpp">Креол�ки или пиџин бaзирaн нa португaл�ком</language>
-			<language type="cr">Кри</language>
-			<language type="crh">Кримеaн�ки тур�ки</language>
-			<language type="crp">креол�ки или пиџин</language>
-			<language type="cs">Чешки</language>
-			<language type="csb">Кaшубијaн�ки</language>
-			<language type="cu">Старо�ловен�ки</language>
-			<language type="cus">Кушитички језик</language>
-			<language type="cv">Чувaшки</language>
-			<language type="cy">Велшки</language>
-			<language type="da">Дан�ки</language>
-			<language type="dak">Дакота</language>
-			<language type="dar">Дaргвa</language>
-			<language type="day">Дaјaшки</language>
-			<language type="de">�емачки</language>
-			<language type="de_AT">�у�триј�ки немачки</language>
-			<language type="de_CH">Швaјцaр�ки ви�оки немaчки</language>
-			<language type="del">Делавер</language>
-			<language type="den">Слaв�ки</language>
-			<language type="dgr">Догриб</language>
-			<language type="din">Динкa</language>
-			<language type="doi">Догри</language>
-			<language type="dra">Дарвидиј�ки језик</language>
-			<language type="dsb">�и�ки �орбијан�ки</language>
-			<language type="dua">Дуaлa</language>
-			<language type="dum">Средњи холaнд�ки</language>
-			<language type="dv">Дивехиј�ки</language>
-			<language type="dyu">Ђулa</language>
-			<language type="dz">�онга</language>
-			<language type="ee">Еве</language>
-			<language type="efi">Ефик�ки</language>
-			<language type="egy">Староегипат�ки</language>
-			<language type="eka">Екaјук</language>
-			<language type="el">Грчки</language>
-			<language type="elx">Елaмит�ки</language>
-			<language type="en">Енгле�ки</language>
-			<language type="en_AU">�у�тралиј�ки енгле�ки</language>
-			<language type="en_CA">Канад�ки енгле�ки</language>
-			<language type="en_GB">Британ�ки енгле�ки</language>
-			<language type="en_US">С�Д енгле�ки</language>
-			<language type="enm">Средњи енгле�ки</language>
-			<language type="eo">Е�перанто</language>
-			<language type="es">Шпан�ки</language>
-			<language type="es_419">Латино-амерички шпан�ки</language>
-			<language type="es_ES">Ибериј�ки шпан�ки</language>
-			<language type="et">Е�тон�ки</language>
-			<language type="eu">Ба�киј�ки</language>
-			<language type="ewo">Евондо</language>
-			<language type="fa">Пер�иј�ки</language>
-			<language type="fan">Фaнг</language>
-			<language type="fat">Фaнти</language>
-			<language type="ff">Фулaх</language>
-			<language type="fi">Фин�ки</language>
-			<language type="fil">Тагалог</language>
-			<language type="fiu">Угро-фин�ки</language>
-			<language type="fj">Фиджиј�ки</language>
-			<language type="fo">Фар�ки</language>
-			<language type="fon">Фон</language>
-			<language type="fr">Францу�ки</language>
-			<language type="fr_CA">Кaнaд�ки францу�ки</language>
-			<language type="fr_CH">Швaјцaр�ки фрaнцу�ки</language>
-			<language type="frm">Средњи фрaнцу�ки</language>
-			<language type="fro">Старофранцу�ки</language>
-			<language type="frr">Северно-фризиј�ки</language>
-			<language type="frs">И�точни фризиј�ки</language>
-			<language type="fur">Фриулиј�ки</language>
-			<language type="fy">Фризиј�ки</language>
-			<language type="ga">Ир�ки</language>
-			<language type="gaa">Гa</language>
-			<language type="gay">Гaјо</language>
-			<language type="gba">Гбaјa</language>
-			<language type="gd">Шкот�ки Гал�ки</language>
-			<language type="gem">Герман�ки језик</language>
-			<language type="gez">�из</language>
-			<language type="gil">Гилбертшки</language>
-			<language type="gl">Гал�ки</language>
-			<language type="gmh">Средњи ви�оки немaчки</language>
-			<language type="gn">Гварани</language>
-			<language type="goh">Старонемачки</language>
-			<language type="gon">Гонди</language>
-			<language type="gor">Горонтaло</language>
-			<language type="got">Гот�ки</language>
-			<language type="grb">Гребо</language>
-			<language type="grc">Старогрчки</language>
-			<language type="gsw">Швајцар�ки немачки</language>
-			<language type="gu">Гуџарати</language>
-			<language type="gv">Мaнк�</language>
-			<language type="gwi">Гвич'ин</language>
-			<language type="ha">Хау�а</language>
-			<language type="hai">Хaидa</language>
-			<language type="haw">Хавај�ки</language>
-			<language type="he">Хебреј�ки</language>
-			<language type="hi">Хинди</language>
-			<language type="hil">Хилигaјнон</language>
-			<language type="him">Химaчaли</language>
-			<language type="hit">Хитите</language>
-			<language type="hmn">Хмонг</language>
-			<language type="ho">Хири Моту</language>
-			<language type="hr">Хрват�ки</language>
-			<language type="hsb">Горњи �орбиј�ки</language>
-			<language type="ht">Хаит�ки</language>
-			<language type="hu">Мађар�ки</language>
-			<language type="hup">Хупа</language>
-			<language type="hy">Јермен�ки</language>
-			<language type="hz">Хереро</language>
-			<language type="ia">Интерлингва</language>
-			<language type="iba">Ибaн</language>
-			<language type="id">Индонежан�ки</language>
-			<language type="ie">Међујезички</language>
-			<language type="ig">Игбо</language>
-			<language type="ii">Сичуaн ји</language>
-			<language type="ijo">Ијо</language>
-			<language type="ik">Унупиак</language>
-			<language type="ilo">Илоко</language>
-			<language type="inc">Индик</language>
-			<language type="ine">Индо-европ�ки језик</language>
-			<language type="inh">Ингвишки</language>
-			<language type="io">Идо</language>
-			<language type="ira">Иран�ки језик</language>
-			<language type="iro">Ироквојaн�ки</language>
-			<language type="is">И�ланд�ки</language>
-			<language type="it">Италијан�ки</language>
-			<language type="iu">Инуктитут</language>
-			<language type="ja">Јапан�ки</language>
-			<language type="jbo">Лојбaн</language>
-			<language type="jpr">Јудео-пер�иј�ки</language>
-			<language type="jrb">Јудео-арап�ки</language>
-			<language type="jv">Јаван�ки</language>
-			<language type="ka">Грузиј�ки</language>
-			<language type="kaa">Кaрa-кaлпaшки</language>
-			<language type="kab">Кaбиле</language>
-			<language type="kac">Кaчин</language>
-			<language type="kaj">Ђу</language>
-			<language type="kam">Кaмбa</language>
-			<language type="kar">Кaрен�ки</language>
-			<language type="kaw">Кaви</language>
-			<language type="kbd">Кaбaрдиј�ки</language>
-			<language type="kcg">Тјaп</language>
-			<language type="kfo">Коро</language>
-			<language type="kg">Конго</language>
-			<language type="kha">Кa�и</language>
-			<language type="khi">Кои�aн�ки језик</language>
-			<language type="kho">Котанешки</language>
-			<language type="ki">Кикују</language>
-			<language type="kj">Куaњaмa</language>
-			<language type="kk">Козачки</language>
-			<language type="kl">Калали�ут</language>
-			<language type="km">Кмер�ки</language>
-			<language type="kmb">Кимбунду</language>
-			<language type="kn">Канада</language>
-			<language type="ko">Кореј�ки</language>
-			<language type="kok">Конкaни</language>
-			<language type="kos">Ко�реaн�ки</language>
-			<language type="kpe">Кпеле</language>
-			<language type="kr">Кaнури</language>
-			<language type="krc">Кaрaчaј-бaлкaр</language>
-			<language type="krl">Кaрелиј�ки</language>
-			<language type="kro">Кру</language>
-			<language type="kru">Курукх</language>
-			<language type="ks">Кашмир�ки</language>
-			<language type="ku">Курд�ки</language>
-			<language type="kum">Кумик</language>
-			<language type="kut">Кутенaи</language>
-			<language type="kv">Коми</language>
-			<language type="kw">Корнишки</language>
-			<language type="ky">Кирги�ки</language>
-			<language type="la">Латин�ки</language>
-			<language type="lad">Лaдино</language>
-			<language type="lah">Лaндa</language>
-			<language type="lam">Лaмбa</language>
-			<language type="lb">Лук�ембуршки</language>
-			<language type="lez">Лезгиaн</language>
-			<language type="lg">Гaндa</language>
-			<language type="li">Лимбургиш</language>
-			<language type="ln">Лингала</language>
-			<language type="lo">Лао�ки</language>
-			<language type="lol">Монго</language>
-			<language type="loz">Лози</language>
-			<language type="lt">Литван�ки</language>
-			<language type="lu">Лубa-кaтaнгa</language>
-			<language type="lua">Лубa-лулуa</language>
-			<language type="lui">Луи�ено</language>
-			<language type="lun">Лундa</language>
-			<language type="luo">Луо</language>
-			<language type="lus">Лушaи</language>
-			<language type="lv">Летон�ки</language>
-			<language type="mad">Мaдурешки</language>
-			<language type="mag">Мaгaхи</language>
-			<language type="mai">Мaитили</language>
-			<language type="mak">Мaкa�aр</language>
-			<language type="man">Мaндинго</language>
-			<language type="map">Aу�тронежaн�ки</language>
-			<language type="mas">Ма�аи</language>
-			<language type="mdf">Мокшa</language>
-			<language type="mdr">Мaндaр</language>
-			<language type="men">Менде</language>
-			<language type="mg">Малага�иј�ки</language>
-			<language type="mga">Средњи ир�ки</language>
-			<language type="mh">Мaршaл�ки</language>
-			<language type="mi">Маор�ки</language>
-			<language type="mic">Микмaк</language>
-			<language type="min">Минaнгкaбaу</language>
-			<language type="mis">Рaзни језици</language>
-			<language type="mk">Македон�ки</language>
-			<language type="mkh">Мон-кмер�ки језик</language>
-			<language type="ml">Малајалам</language>
-			<language type="mn">Монгол�ки</language>
-			<language type="mnc">Мaнчу</language>
-			<language type="mni">Мaнипури</language>
-			<language type="mno">Мaнобо језик</language>
-			<language type="mo">Молдав�ки</language>
-			<language type="moh">Мaхaв�ки</language>
-			<language type="mos">Мо�и</language>
-			<language type="mr">Марати</language>
-			<language type="ms">Малај�ки</language>
-			<language type="mt">Мелтешки</language>
-			<language type="mul">Више језикa</language>
-			<language type="mun">Мундa језик</language>
-			<language type="mus">Кришки</language>
-			<language type="mwl">Мирaндешки</language>
-			<language type="mwr">Мaрвaри</language>
-			<language type="my">Бурман�ки</language>
-			<language type="myn">Мaјaн�ки језик</language>
-			<language type="myv">Ерзијa</language>
-			<language type="na">�ауру</language>
-			<language type="nah">�aхуaтл</language>
-			<language type="nai">Језик �еверноамеричких Индијанаца</language>
-			<language type="nap">�еaполитaн�ки</language>
-			<language type="nb">�орвешки бокмал</language>
-			<language type="nd">Северни ндебеле</language>
-			<language type="nds">�и�ки немачки</language>
-			<language type="ne">�епал�ки</language>
-			<language type="new">�евaри</language>
-			<language type="ng">�донгa</language>
-			<language type="nia">�иa�</language>
-			<language type="nic">�игер-кордофaниј�ки језик</language>
-			<language type="niu">�иуеaн</language>
-			<language type="nl">Холанд�ки</language>
-			<language type="nl_BE">Фламан�ки</language>
-			<language type="nn">�орвешки њор�к</language>
-			<language type="no">�орвешки</language>
-			<language type="nog">�огaи</language>
-			<language type="non">Стaри нор�ки</language>
-			<language type="nqo">�’ко</language>
-			<language type="nr">Јужни ндебеле</language>
-			<language type="nso">Северни �ото</language>
-			<language type="nub">�убиј�ки језик</language>
-			<language type="nv">�авахо</language>
-			<language type="nwc">Клa�ични невaри</language>
-			<language type="ny">Њања</language>
-			<language type="nym">Њaмвези</language>
-			<language type="nyn">Њaнколе</language>
-			<language type="nyo">Њоро</language>
-			<language type="nzi">�зимa</language>
-			<language type="oc">Прован�ал�ки</language>
-			<language type="oj">Ојибвa</language>
-			<language type="om">Оромо</language>
-			<language type="or">Ориј�ки</language>
-			<language type="os">О�ет�ки</language>
-			<language type="osa">О�aге</language>
-			<language type="ota">Отомaн�ки тур�ки</language>
-			<language type="oto">Отомaн�ки језик</language>
-			<language type="pa">Панџаб�ки</language>
-			<language type="paa">Папуан�ки језик</language>
-			<language type="pag">Пaнгa�ин�ки</language>
-			<language type="pal">Пaхлaви</language>
-			<language type="pam">Пaмпaнгa</language>
-			<language type="pap">Пaпиaменто</language>
-			<language type="pau">Пaлaуaн�ки</language>
-			<language type="peo">Старопер�иј�ки</language>
-			<language type="phi">Филипин�ки језик</language>
-			<language type="phn">Феничaн�ки</language>
-			<language type="pi">Пaли</language>
-			<language type="pl">Пољ�ки</language>
-			<language type="pon">Понпеј�ки</language>
-			<language type="pra">Пракрит�ки</language>
-			<language type="pro">Старопрован�ал�ки</language>
-			<language type="ps">Паштун�ки</language>
-			<language type="pt">Португал�ки</language>
-			<language type="pt_BR">Бразил�ки португал�ки</language>
-			<language type="pt_PT">Ибериј�ки португал�ки</language>
-			<language type="qu">Квенчa</language>
-			<language type="raj">Рaђa�тaни</language>
-			<language type="rap">Рaпaнуи</language>
-			<language type="rar">Рaротонгaн</language>
-			<language type="rm">Рето-Роман�ки</language>
-			<language type="rn">Рунди</language>
-			<language type="ro">Румун�ки</language>
-			<language type="roa">Ромaн�ки језик</language>
-			<language type="rom">Ромaни</language>
-			<language type="root">Рут</language>
-			<language type="ru">Ру�ки</language>
-			<language type="rup">Aромaниј�ки</language>
-			<language type="rw">Кинјаруанда</language>
-			<language type="sa">Сан�крит</language>
-			<language type="sad">Сaндaве</language>
-			<language type="sah">Јaкут</language>
-			<language type="sai">Језик јужноамеричких Индијанаца</language>
-			<language type="sal">Сaлишaн�ки језик</language>
-			<language type="sam">Сaмaритaн�ки aрaмеј�ки</language>
-			<language type="sas">Сa�aк</language>
-			<language type="sat">Сaнтaли</language>
-			<language type="sc">Сардиња�ки</language>
-			<language type="scn">Сицилијан�ки</language>
-			<language type="sco">Шкот�ки</language>
-			<language type="sd">Синди</language>
-			<language type="se">Северни �aми</language>
-			<language type="sel">Селкaп</language>
-			<language type="sem">Семит�ки језик</language>
-			<language type="sg">Санго</language>
-			<language type="sga">Староир�ки</language>
-			<language type="sgn">Знаковни језик</language>
-			<language type="sh">Срп�кохрват�ки</language>
-			<language type="shn">Шaн</language>
-			<language type="si">Сингале�ки</language>
-			<language type="sid">Сидамо</language>
-			<language type="sio">Сиуaн�ки језик</language>
-			<language type="sit">Сино-тибетан�ки језик</language>
-			<language type="sk">Словачки</language>
-			<language type="sl">Словеначки</language>
-			<language type="sla">Словен�ки језик</language>
-			<language type="sm">Самоан�ки</language>
-			<language type="sma">Јужни �aми</language>
-			<language type="smi">Сaми језик</language>
-			<language type="smj">Луле �aми</language>
-			<language type="smn">Инaри �aми</language>
-			<language type="sms">Сколт�ки језик</language>
-			<language type="sn">Шонa</language>
-			<language type="snk">Сонинке</language>
-			<language type="so">Сомал�ки</language>
-			<language type="sog">Соџијен�ки</language>
-			<language type="son">Сонгaи</language>
-			<language type="sq">�лбан�ки</language>
-			<language type="sr">Срп�ки</language>
-			<language type="srn">Срaнaн�ки тонго</language>
-			<language type="srr">Серер</language>
-			<language type="ss">Свaти</language>
-			<language type="ssa">�ило-�aхaр�ки језик</language>
-			<language type="st">Се�ото</language>
-			<language type="su">Судан�ки</language>
-			<language type="suk">Сукумa</language>
-			<language type="sus">Су�у</language>
-			<language type="sux">Сумер�ки</language>
-			<language type="sv">Швед�ки</language>
-			<language type="sw">Свахили</language>
-			<language type="syc">Кла�ични �ириј�ки</language>
-			<language type="syr">Сириј�ки</language>
-			<language type="ta">Тамил�ки</language>
-			<language type="tai">Тaи језик</language>
-			<language type="te">Телугу</language>
-			<language type="tem">Тимне</language>
-			<language type="ter">Терено</language>
-			<language type="tet">Тетум</language>
-			<language type="tg">Тађик</language>
-			<language type="th">Тајланд�ки</language>
-			<language type="ti">Тигриња</language>
-			<language type="tig">Тигре</language>
-			<language type="tiv">Тив</language>
-			<language type="tk">Туркмен�ки</language>
-			<language type="tkl">Токелaу</language>
-			<language type="tl">Тагал�ки</language>
-			<language type="tlh">Клингон�ки</language>
-			<language type="tli">Тлингит</language>
-			<language type="tmh">Тaмaшек</language>
-			<language type="tn">Т�вaнa</language>
-			<language type="to">Тонгa</language>
-			<language type="tog">Њa�a тонгa</language>
-			<language type="tpi">Ток Пи�ин</language>
-			<language type="tr">Тур�ки</language>
-			<language type="ts">Т�онгa</language>
-			<language type="tsi">Т�имшиaн</language>
-			<language type="tt">Татар�ки</language>
-			<language type="tum">Тумбукa</language>
-			<language type="tup">Тупи језик</language>
-			<language type="tut">Aлтaички језик</language>
-			<language type="tvl">Тувaлу</language>
-			<language type="tw">Тви</language>
-			<language type="ty">Тахићан�ки</language>
-			<language type="tyv">Тувиниј�ки</language>
-			<language type="udm">Удмурт</language>
-			<language type="ug">Ујгур�ки</language>
-			<language type="uga">Угaрит�ки</language>
-			<language type="uk">Украјин�ки</language>
-			<language type="umb">Умбунду</language>
-			<language type="und">�епознат или неважећи језик</language>
-			<language type="ur">Урду</language>
-			<language type="uz">Узбечки</language>
-			<language type="vai">Вaи</language>
-			<language type="ve">Вендa</language>
-			<language type="vi">Вијетнам�ки</language>
-			<language type="vo">Волапук</language>
-			<language type="vot">Вот�ки</language>
-			<language type="wa">Вaлун</language>
-			<language type="wak">Вaкaшaн�ки језик</language>
-			<language type="wal">Вaлaмо</language>
-			<language type="war">Варај</language>
-			<language type="was">Вашо</language>
-			<language type="wen">Сорбијaн�ки језик</language>
-			<language type="wo">Волоф</language>
-			<language type="xal">Кaлмик</language>
-			<language type="xh">К�хо�а</language>
-			<language type="yao">Јaо</language>
-			<language type="yap">Јaпешки</language>
-			<language type="yi">Јидиш</language>
-			<language type="yo">Јоруба</language>
-			<language type="ypk">Јупик</language>
-			<language type="za">Жуанг</language>
-			<language type="zap">Зaпотечки</language>
-			<language type="zbl">Бли�имболи</language>
-			<language type="zen">Зенaгa</language>
-			<language type="zh">Кине�ки</language>
-			<language type="zh_Hans">Кине�ки (поједно�тављен)</language>
-			<language type="zh_Hant">Кине�ки (традиционални)</language>
-			<language type="znd">Зaнде</language>
-			<language type="zu">Зулу</language>
-			<language type="zun">Зуни</language>
-			<language type="zxx">Без лингви�тичког �адржаја</language>
-			<language type="zza">Зaзa</language>
-		</languages>
-		<scripts>
-			<script type="Arab">арап�ко пи�мо</script>
-			<script type="Armi">империј�ко арамеј�ко пи�мо</script>
-			<script type="Armn">јермен�ко пи�мо</script>
-			<script type="Avst">аве�тан�ко пи�мо</script>
-			<script type="Bali">балиј�ко пи�мо</script>
-			<script type="Batk">батак пи�мо</script>
-			<script type="Beng">бенгал�ко пи�мо</script>
-			<script type="Blis">бли�имболично пи�мо</script>
-			<script type="Bopo">бопомофо пи�мо</script>
-			<script type="Brah">браман�ко пи�мо</script>
-			<script type="Brai">Брајево пи�мо</script>
-			<script type="Bugi">бугин�ко пи�мо</script>
-			<script type="Buhd">бухид�ко пи�мо</script>
-			<script type="Cakm">чакман�ко пи�мо</script>
-			<script type="Cans">уједињени канад�ки абориџин�ки �илабици</script>
-			<script type="Cari">кариј�ко пи�мо</script>
-			<script type="Cham">чам�ко пи�мо</script>
-			<script type="Cher">Чероки</script>
-			<script type="Cirt">цирт пи�мо</script>
-			<script type="Copt">коптичко пи�мо</script>
-			<script type="Cprt">кипар�ко пи�мо</script>
-			<script type="Cyrl">Ћирилица</script>
-			<script type="Cyrs">Старо�ловен�ка црквена ћирилица</script>
-			<script type="Deva">Деванагари</script>
-			<script type="Dsrt">Дезерет</script>
-			<script type="Egyd">египат�ко народно пи�мо</script>
-			<script type="Egyh">египат�ко хијерат�ко пи�мо</script>
-			<script type="Egyp">египат�ки хијероглифи</script>
-			<script type="Ethi">етиоп�ко пи�мо</script>
-			<script type="Geok">грузиј�ко кхут�ури пи�мо</script>
-			<script type="Geor">грузиј�ко пи�мо</script>
-			<script type="Glag">глагољица</script>
-			<script type="Goth">Готика</script>
-			<script type="Grek">грчко пи�мо</script>
-			<script type="Gujr">гујарати пи�мо</script>
-			<script type="Guru">гурмуки пи�мо</script>
-			<script type="Hang">хангул</script>
-			<script type="Hani">хан</script>
-			<script type="Hano">хануно</script>
-			<script type="Hans">поједно�тављено кине�ко пи�мо</script>
-			<script type="Hant">традиционално кине�ко пи�мо</script>
-			<script type="Hebr">хебреј�ко пи�мо</script>
-			<script type="Hira">Хирагана</script>
-			<script type="Hmng">пахав хмонг пи�мо</script>
-			<script type="Hrkt">Катакана или Хирагана</script>
-			<script type="Hung">�таромађар�ко пи�мо</script>
-			<script type="Inds">индушко пи�мо</script>
-			<script type="Ital">�тари италик</script>
-			<script type="Java">јаван�ко пи�мо</script>
-			<script type="Jpan">јапан�ко пи�мо</script>
-			<script type="Kali">кајах-ли пи�мо</script>
-			<script type="Kana">Катакана</script>
-			<script type="Khar">карошти пи�мо</script>
-			<script type="Khmr">кмер�ко пи�мо</script>
-			<script type="Knda">каннада пи�мо</script>
-			<script type="Kore">кореј�ко пи�мо</script>
-			<script type="Kthi">каити</script>
-			<script type="Lana">ланна пи�мо</script>
-			<script type="Laoo">лаошко пи�мо</script>
-			<script type="Latf">латиница (фрактур варијанта)</script>
-			<script type="Latg">гал�ка латиница</script>
-			<script type="Latn">Латиница</script>
-			<script type="Lepc">лепча пи�мо</script>
-			<script type="Limb">лимбу пи�мо</script>
-			<script type="Lina">линеарно � пи�мо</script>
-			<script type="Linb">линеарно Б пи�мо</script>
-			<script type="Lyci">ли�иј�ко пи�мо</script>
-			<script type="Lydi">лидиј�ко пи�мо</script>
-			<script type="Mand">мандеан�ко пи�мо</script>
-			<script type="Mani">манихеј�ко пи�мо</script>
-			<script type="Maya">мајан�ки хијероглифи</script>
-			<script type="Mero">мероитик пи�мо</script>
-			<script type="Mlym">малајалам пи�мо</script>
-			<script type="Mong">монгол�ко пи�мо</script>
-			<script type="Moon">ме�ечево пи�мо</script>
-			<script type="Mtei">меитеи мајек пи�мо</script>
-			<script type="Mymr">мијанмар�ко пи�мо</script>
-			<script type="Nkoo">н’ко пи�мо</script>
-			<script type="Ogam">огам�ко пи�мо</script>
-			<script type="Olck">ол чики пи�мо</script>
-			<script type="Orkh">оркон�ко пи�мо</script>
-			<script type="Orya">оријан�ко пи�мо</script>
-			<script type="Osma">о�мањан�ко пи�мо</script>
-			<script type="Perm">�таро пермик�ко пи�мо</script>
-			<script type="Phag">паг�-па пи�мо</script>
-			<script type="Phli">пи�ани пахлави</script>
-			<script type="Phlp">п�алтер пахлави</script>
-			<script type="Phlv">пахлави пи�мо</script>
-			<script type="Phnx">Феничан�ко пи�мо</script>
-			<script type="Plrd">поралд фонет�ко пи�мо</script>
-			<script type="Prti">пи�ани партиан</script>
-			<script type="Qaai">на�ледно пи�мо</script>
-			<script type="Rjng">рејанг пи�мо</script>
-			<script type="Roro">ронгоронго пи�мо</script>
-			<script type="Runr">рун�ко пи�мо</script>
-			<script type="Samr">�амаритан�ко пи�мо</script>
-			<script type="Sara">�арати пи�мо</script>
-			<script type="Saur">�аураштра пи�мо</script>
-			<script type="Sgnw">знаковно пи�мо</script>
-			<script type="Shaw">шавијан�ко пи�мо</script>
-			<script type="Sinh">�инхала пи�мо</script>
-			<script type="Sund">�удан�ко пи�мо</script>
-			<script type="Sylo">�илоти нагри пи�мо</script>
-			<script type="Syrc">�ириј�ко пи�мо</script>
-			<script type="Syre">�ириј�ко е�трангело пи�мо</script>
-			<script type="Syrj">западно�ириј�ко пи�мо</script>
-			<script type="Syrn">пи�мо и�точне Сирије</script>
-			<script type="Tagb">тагбанва пи�мо</script>
-			<script type="Tale">таи ле пи�мо</script>
-			<script type="Talu">нови таи луе</script>
-			<script type="Taml">тамил�ко пи�мо</script>
-			<script type="Tavt">таи виет пи�мо</script>
-			<script type="Telu">телугу пи�мо</script>
-			<script type="Teng">тенгвар пи�мо</script>
-			<script type="Tfng">тифинаг пи�мо</script>
-			<script type="Tglg">Тагалог</script>
-			<script type="Thaa">тхана пи�мо</script>
-			<script type="Thai">тајланд�ко пи�мо</script>
-			<script type="Tibt">тибетан�ко пи�мо</script>
-			<script type="Ugar">угарит�ко пи�мо</script>
-			<script type="Vaii">ваи пи�мо</script>
-			<script type="Visp">видљиви говор</script>
-			<script type="Xpeo">�таропер�иј�ко пи�мо</script>
-			<script type="Xsux">�умер�ко-акад�ко кунеиформ пи�мо</script>
-			<script type="Yiii">ји пи�мо</script>
-			<script type="Zmth">математичка нотација</script>
-			<script type="Zsym">�имболи</script>
-			<script type="Zxxx">�епи�ани језик</script>
-			<script type="Zyyy">заједничко пи�мо</script>
-			<script type="Zzzz">�епознато или неважеће пи�мо</script>
-		</scripts>
-		<territories>
-			<territory type="001">Свет</territory>
-			<territory type="002">�фрика</territory>
-			<territory type="003">Северноамерички континент</territory>
-			<territory type="005">Јужна �мерика</territory>
-			<territory type="009">Океанија</territory>
-			<territory type="011">Западна �фрика</territory>
-			<territory type="013">Централна �мерика</territory>
-			<territory type="014">И�точна �фрика</territory>
-			<territory type="015">Северна �фрика</territory>
-			<territory type="017">Централна �фрика</territory>
-			<territory type="018">Јужна �фрика</territory>
-			<territory type="019">�мерике</territory>
-			<territory type="021">Северна �мерика</territory>
-			<territory type="029">Кариби</territory>
-			<territory type="030">И�точна �зија</territory>
-			<territory type="034">Јужна �зија</territory>
-			<territory type="035">Југои�точна �зија</territory>
-			<territory type="039">Јужна Европа</territory>
-			<territory type="053">�у�тралија и �ови Зеланд</territory>
-			<territory type="054">Меланезија</territory>
-			<territory type="057">Микронезиј�ки регион</territory>
-			<territory type="061">Полинезија</territory>
-			<territory type="062">Јужно-централна �зија</territory>
-			<territory type="142">�зија</territory>
-			<territory type="143">Централна �зија</territory>
-			<territory type="145">Западна �зија</territory>
-			<territory type="150">Европа</territory>
-			<territory type="151">И�точна Европа</territory>
-			<territory type="154">Северна Европа</territory>
-			<territory type="155">Западна Европа</territory>
-			<territory type="172">Комонвелт незави�них држава</territory>
-			<territory type="419">Латин�ка �мерика и Кариби</territory>
-			<territory type="830">Канал�ка о�трва</territory>
-			<territory type="AD">�ндора</territory>
-			<territory type="AE">Уједињени �рап�ки Емирати</territory>
-			<territory type="AF">�вгани�тан</territory>
-			<territory type="AG">�нтигве и Барбуда</territory>
-			<territory type="AI">�нгвила</territory>
-			<territory type="AL">�лбанија</territory>
-			<territory type="AM">�рменија</territory>
-			<territory type="AN">Холанд�ки �нтили</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктик</territory>
-			<territory type="AR">�ргентина</territory>
-			<territory type="AS">�меричка Самоа</territory>
-			<territory type="AT">�у�трија</territory>
-			<territory type="AU">�у�тралија</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�ка о�трва</territory>
-			<territory type="AZ">�зербејџан</territory>
-			<territory type="BA">Бо�на и Херцеговина</territory>
-			<territory type="BB">Барбадо�</territory>
-			<territory type="BD">Бангладеш</territory>
-			<territory type="BE">Белгија</territory>
-			<territory type="BF">Буркина Фа�о</territory>
-			<territory type="BG">Бугар�ка</territory>
-			<territory type="BH">Бахреин</territory>
-			<territory type="BI">Бурунди</territory>
-			<territory type="BJ">Бенин</territory>
-			<territory type="BL">Свети Бартоломеј</territory>
-			<territory type="BM">Бермуда</territory>
-			<territory type="BN">Брунеј</territory>
-			<territory type="BO">Боливија</territory>
-			<territory type="BR">Бразил</territory>
-			<territory type="BS">Бахами</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">Буве О�трва</territory>
-			<territory type="BW">Боцвана</territory>
-			<territory type="BY">Белору�ија</territory>
-			<territory type="BZ">Белизе</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Коко� (Келинг) О�трва</territory>
-			<territory type="CD">Демократ�ка република Конго</territory>
-			<territory type="CF">Централно �фричка Република</territory>
-			<territory type="CG">Конго</territory>
-			<territory type="CH">Швајцар�ка</territory>
-			<territory type="CI">Обала Слоноваче</territory>
-			<territory type="CK">Кукова О�трва</territory>
-			<territory type="CL">Чиле</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Кина</territory>
-			<territory type="CO">Колумбија</territory>
-			<territory type="CR">Ко�тарика</territory>
-			<territory type="CS">Србија и Црна Гора</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Капе Верде</territory>
-			<territory type="CX">Божићна о�трва</territory>
-			<territory type="CY">Кипар</territory>
-			<territory type="CZ">Чешка</territory>
-			<territory type="DE">�емачка</territory>
-			<territory type="DJ">�ибути</territory>
-			<territory type="DK">Дан�ка</territory>
-			<territory type="DM">Доминика</territory>
-			<territory type="DO">Доминикан�ка Република</territory>
-			<territory type="DZ">�лжир</territory>
-			<territory type="EC">Еквадор</territory>
-			<territory type="EE">Е�тонија</territory>
-			<territory type="EG">Египат</territory>
-			<territory type="EH">Западна Сахара</territory>
-			<territory type="ER">Еритреја</territory>
-			<territory type="ES">Шпанија</territory>
-			<territory type="ET">Етиопија</territory>
-			<territory type="FI">Фин�ка</territory>
-			<territory type="FJ">Фиџи</territory>
-			<territory type="FK">Фолкланд�ка О�трва</territory>
-			<territory type="FM">Микронезија</territory>
-			<territory type="FO">Фар�ка О�трва</territory>
-			<territory type="FR">Францу�ка</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Велика Британија</territory>
-			<territory type="GD">Гренада</territory>
-			<territory type="GE">Грузија</territory>
-			<territory type="GF">Францу�ка Гвајана</territory>
-			<territory type="GG">Гурн�и</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гибралтар</territory>
-			<territory type="GL">Гренланд</territory>
-			<territory type="GM">Гамбија</territory>
-			<territory type="GN">Гвинеја</territory>
-			<territory type="GP">Гваделупе</territory>
-			<territory type="GQ">Екваторијална Гвинеја</territory>
-			<territory type="GR">Грчка</territory>
-			<territory type="GS">Јужна �орџија и Јужна Сендвич О�трва</territory>
-			<territory type="GT">Гватемала</territory>
-			<territory type="GU">Гуам</territory>
-			<territory type="GW">Гвинеја-Би�ао</territory>
-			<territory type="GY">Гвајана</territory>
-			<territory type="HK">Хонг Конг С. �. Р. Кина</territory>
-			<territory type="HM">Херд и Мекдоналд О�трва</territory>
-			<territory type="HN">Хондура�</territory>
-			<territory type="HR">Хрват�ка</territory>
-			<territory type="HT">Хаити</territory>
-			<territory type="HU">Мађар�ка</territory>
-			<territory type="ID">Индонезија</territory>
-			<territory type="IE">Ир�ка</territory>
-			<territory type="IL">Израел</territory>
-			<territory type="IM">О�трво Ман</territory>
-			<territory type="IN">Индија</territory>
-			<territory type="IO">Британ�ка територија у Индиј�ком океану</territory>
-			<territory type="IQ">Ирак</territory>
-			<territory type="IR">Иран</territory>
-			<territory type="IS">И�ланд</territory>
-			<territory type="IT">Италија</territory>
-			<territory type="JE">�ер�и</territory>
-			<territory type="JM">Јамајка</territory>
-			<territory type="JO">Јордан</territory>
-			<territory type="JP">Јапан</territory>
-			<territory type="KE">Кенија</territory>
-			<territory type="KG">Киргиз�тан</territory>
-			<territory type="KH">Камбоџа</territory>
-			<territory type="KI">Кирибати</territory>
-			<territory type="KM">Комор�ка О�трва</territory>
-			<territory type="KN">Сент Кит� и �еви�</territory>
-			<territory type="KP">Северна Кореја</territory>
-			<territory type="KR">Јужна Кореја</territory>
-			<territory type="KW">Кувајт</territory>
-			<territory type="KY">Кајман�ка О�трва</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">Лао�</territory>
-			<territory type="LB">Либан</territory>
-			<territory type="LC">Сент Луција</territory>
-			<territory type="LI">Лихтенштајн</territory>
-			<territory type="LK">Шри Ланка</territory>
-			<territory type="LR">Либерија</territory>
-			<territory type="LS">Ле�ото</territory>
-			<territory type="LT">Литванија</territory>
-			<territory type="LU">Лук�ембург</territory>
-			<territory type="LV">Летонија</territory>
-			<territory type="LY">Либија</territory>
-			<territory type="MA">Мароко</territory>
-			<territory type="MC">Монако</territory>
-			<territory type="MD">Молдавија</territory>
-			<territory type="ME">Црна Гора</territory>
-			<territory type="MF">Сент Мартин</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршал�ка О�трва</territory>
-			<territory type="MK">Македонија</territory>
-			<territory type="ML">Мали</territory>
-			<territory type="MM">Мијанмар</territory>
-			<territory type="MN">Монголија</territory>
-			<territory type="MO">Макао С. �. Р. Кина</territory>
-			<territory type="MP">Северна Маријан�ка О�трва</territory>
-			<territory type="MQ">Мартиник</territory>
-			<territory type="MR">Мауританија</territory>
-			<territory type="MS">Мон�ерат</territory>
-			<territory type="MT">Малта</territory>
-			<territory type="MU">Маурицију�</territory>
-			<territory type="MV">Малдиви</territory>
-			<territory type="MW">Малави</territory>
-			<territory type="MX">Мек�ико</territory>
-			<territory type="MY">Малезија</territory>
-			<territory type="MZ">Мозамбик</territory>
-			<territory type="NA">�амибија</territory>
-			<territory type="NC">�ова Каледонија</territory>
-			<territory type="NE">�игер</territory>
-			<territory type="NF">�орфолк О�трво</territory>
-			<territory type="NG">�игерија</territory>
-			<territory type="NI">�икарагва</territory>
-			<territory type="NL">Холандија</territory>
-			<territory type="NO">�орвешка</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�иуе</territory>
-			<territory type="NZ">�ови Зеланд</territory>
-			<territory type="OM">Оман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Францу�ка Полинезија</territory>
-			<territory type="PG">Папуа �ова Гвинеја</territory>
-			<territory type="PH">Филипини</territory>
-			<territory type="PK">Паки�тан</territory>
-			<territory type="PL">Пољ�ка</territory>
-			<territory type="PM">Сен Пјер и Микелон</territory>
-			<territory type="PN">Питкерн</territory>
-			<territory type="PR">Порто Рико</territory>
-			<territory type="PS">Пале�тин�ка територија</territory>
-			<territory type="PT">Португал</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвај</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">О�тала океанија</territory>
-			<territory type="QU">Европ�ка Унија</territory>
-			<territory type="RE">Реинион</territory>
-			<territory type="RO">Румунија</territory>
-			<territory type="RS">Србија</territory>
-			<territory type="RU">Ру�ија</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудиј�ка �рабија</territory>
-			<territory type="SB">Соломон�ка О�трва</territory>
-			<territory type="SC">Сејшели</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швед�ка</territory>
-			<territory type="SG">Сингапур</territory>
-			<territory type="SH">Света Јелена</territory>
-			<territory type="SI">Словенија</territory>
-			<territory type="SJ">Свалбард и Јанмајен О�трва</territory>
-			<territory type="SK">Словачка</territory>
-			<territory type="SL">Сијера Леоне</territory>
-			<territory type="SM">Сан Марино</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Сомалија</territory>
-			<territory type="SR">Суринам</territory>
-			<territory type="ST">Сао Томе и Принципе</territory>
-			<territory type="SV">Салвадор</territory>
-			<territory type="SY">Сирија</territory>
-			<territory type="SZ">Свазиленд</territory>
-			<territory type="TC">Турк� и Кајко� О�трва</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Францу�ке Јужне Територије</territory>
-			<territory type="TG">Того</territory>
-			<territory type="TH">Тајланд</territory>
-			<territory type="TJ">Таџики�тан</territory>
-			<territory type="TK">Токелау</territory>
-			<territory type="TL">И�точни Тимор</territory>
-			<territory type="TM">Туркмени�тан</territory>
-			<territory type="TN">Туни�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Тур�ка</territory>
-			<territory type="TT">Тринидад и Тобаго</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тајван</territory>
-			<territory type="TZ">Танзанија</territory>
-			<territory type="UA">Украјина</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="UM">Мања удаљена о�трва С�Д</territory>
-			<territory type="US">Сједињене �меричке Државе</territory>
-			<territory type="UY">Уругвај</territory>
-			<territory type="UZ">Узбеки�тан</territory>
-			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент Вин�ент и Гренадини</territory>
-			<territory type="VE">Венецуела</territory>
-			<territory type="VG">Британ�ка Девичан�ка О�трва</territory>
-			<territory type="VI">С.�.Д. Девичан�ка О�трва</territory>
-			<territory type="VN">Вијетнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Вали� и Футуна О�трва</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Јемен</territory>
-			<territory type="YT">Мајоте</territory>
-			<territory type="ZA">Јужноафричка Република</territory>
-			<territory type="ZM">Замбија</territory>
-			<territory type="ZW">Зимбабве</territory>
-			<territory type="ZZ">�епозната или неважећа обла�т</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Традиционална немачка ортографија</variant>
-			<variant type="1994">Стандарднизована ре�ијан�ка ортографија</variant>
-			<variant type="1996">�емачка ортографија из 1996</variant>
-			<variant type="1606NICT">Францу�ки из ка�ног �редњег века до 1606.</variant>
-			<variant type="1694ACAD">Рани модерни францу�ки</variant>
-			<variant type="AREVELA">И�точни армениј�ки</variant>
-			<variant type="AREVMDA">Западно јермен�ка</variant>
-			<variant type="BAKU1926">Уједињен тур�ки латинични алфабет</variant>
-			<variant type="BISKE">Сан Ђорђио/Била дијалект</variant>
-			<variant type="BOONT">Бунтлинг</variant>
-			<variant type="FONIPA">ИП� фонетика</variant>
-			<variant type="FONUPA">УП� фонетика</variant>
-			<variant type="LIPAW">Липовички дијалект ре�ијан�ки</variant>
-			<variant type="MONOTON">Монотоник</variant>
-			<variant type="NEDIS">�ати�оне дијалект</variant>
-			<variant type="NJIVA">Гњива/Њива дијалкект</variant>
-			<variant type="OSOJS">О�еако/О�ојане дијалект</variant>
-			<variant type="POLYTON">Политоник</variant>
-			<variant type="POSIX">Компјутер</variant>
-			<variant type="REVISED">Ревидирана ортографија</variant>
-			<variant type="ROZAJ">Ре�ијан</variant>
-			<variant type="SAAHO">Сахо</variant>
-			<variant type="SCOTLAND">Шкот�ки �тандардни Енгле�ки</variant>
-			<variant type="SCOUSE">Скауз</variant>
-			<variant type="SOLBA">Столвица/Солбица дијалект</variant>
-			<variant type="TARASK">Тара�кијевичка ортографија</variant>
-			<variant type="VALENCIA">Валенциј�ка</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Календар</key>
-			<key type="collation">Сортирање</key>
-			<key type="currency">Валута</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Традиционално кине�ко �ортирање</type>
-			<type type="buddhist" key="calendar">Буди�тички календар</type>
-			<type type="chinese" key="calendar">Кине�ки календар</type>
-			<type type="direct" key="collation">Директно �ортирање</type>
-			<type type="gb2312han" key="collation">Поједно�тављено кине�ко �ортирање</type>
-			<type type="gregorian" key="calendar">Грегоријан�ки календар</type>
-			<type type="hebrew" key="calendar">Хебреј�ки календар</type>
-			<type type="indian" key="calendar">Индиј�ки национални календар</type>
-			<type type="islamic" key="calendar">И�лам�ки календар</type>
-			<type type="islamic-civil" key="calendar">И�лам�ки цивилни календар</type>
-			<type type="japanese" key="calendar">Јапан�ки календар</type>
-			<type type="phonebook" key="collation">Сортирање као телефон�ки именик</type>
-			<type type="pinyin" key="collation">Пињин �ортирање</type>
-			<type type="roc" key="calendar">Календар Републике Кине</type>
-			<type type="stroke" key="collation">Сортирање по броју црта</type>
-			<type type="traditional" key="collation">Традиционално �ортирање</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Метрички</measurementSystemName>
-			<measurementSystemName type="US">С�Д</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а-д ђ е-и ј к л љ м н њ о-т ћ у-ч џ ш]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a á à ă â å ä � æ b c ç d e é è ĕ ê ë ē f-i í ì ĭ î ï ī j-n ñ o ó ò � ô ö ø � œ p-s ß t u ú ù ŭ û ü ū v-y ÿ z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-o º p-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">БЕ</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="chinese">
-				<am>пре подне</am>
-				<pm>поподне</pm>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Таут</month>
-							<month type="2">Баба</month>
-							<month type="3">Хатор</month>
-							<month type="4">Киахк</month>
-							<month type="5">Тоба</month>
-							<month type="6">�мшир</month>
-							<month type="7">Барамхат</month>
-							<month type="8">Барамуда</month>
-							<month type="9">Башан�</month>
-							<month type="10">Паона</month>
-							<month type="11">Епеп</month>
-							<month type="12">Ме�ра</month>
-							<month type="13">�а�и</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Ме�керем</month>
-							<month type="2">Текемт</month>
-							<month type="3">Хедар</month>
-							<month type="4">Тах�а�</month>
-							<month type="5">Тер</month>
-							<month type="6">Јекатит</month>
-							<month type="7">Мегабит</month>
-							<month type="8">Миазиа</month>
-							<month type="9">Генбот</month>
-							<month type="10">Сене</month>
-							<month type="11">Хамле</month>
-							<month type="12">�еха�е</month>
-							<month type="13">Пагумен</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">јан</month>
-							<month type="2">феб</month>
-							<month type="3">мар</month>
-							<month type="4">апр</month>
-							<month type="5">мај</month>
-							<month type="6">јун</month>
-							<month type="7">јул</month>
-							<month type="8">авг</month>
-							<month type="9">�еп</month>
-							<month type="10">окт</month>
-							<month type="11">нов</month>
-							<month type="12">дец</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">јануар</month>
-							<month type="2">фебруар</month>
-							<month type="3">март</month>
-							<month type="4">април</month>
-							<month type="5">мај</month>
-							<month type="6">јун</month>
-							<month type="7">јул</month>
-							<month type="8">авгу�т</month>
-							<month type="9">�ептембар</month>
-							<month type="10">октобар</month>
-							<month type="11">новембар</month>
-							<month type="12">децембар</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ј</month>
-							<month type="2">Ñ„</month>
-							<month type="3">м</month>
-							<month type="4">а</month>
-							<month type="5">м</month>
-							<month type="6">ј</month>
-							<month type="7">ј</month>
-							<month type="8">а</month>
-							<month type="9">�</month>
-							<month type="10">о</month>
-							<month type="11">н</month>
-							<month type="12">д</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">нед</day>
-							<day type="mon">пон</day>
-							<day type="tue">уто</day>
-							<day type="wed">�ре</day>
-							<day type="thu">чет</day>
-							<day type="fri">пет</day>
-							<day type="sat">�уб</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">недеља</day>
-							<day type="mon">понедељак</day>
-							<day type="tue">уторак</day>
-							<day type="wed">�реда</day>
-							<day type="thu">четвртак</day>
-							<day type="fri">петак</day>
-							<day type="sat">�убота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">н</day>
-							<day type="mon">п</day>
-							<day type="tue">у</day>
-							<day type="wed">�</day>
-							<day type="thu">ч</day>
-							<day type="fri">п</day>
-							<day type="sat">�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">К1</quarter>
-							<quarter type="2">К2</quarter>
-							<quarter type="3">К3</quarter>
-							<quarter type="4">К4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Прво троме�ечје</quarter>
-							<quarter type="2">Друго троме�ечје</quarter>
-							<quarter type="3">Треће троме�ечје</quarter>
-							<quarter type="4">Четврто троме�ечје</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Пре нове ере</era>
-						<era type="1">�ове ере</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">п. н. е.</era>
-						<era type="1">н. е</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">п.н.е.</era>
-						<era type="1">н.е.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, dd. MMMM y.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd. MMMM y.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.y.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d.M.yy.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">E d.</dateFormatItem>
-						<dateFormatItem id="EEEd">d. EEE</dateFormatItem>
-						<dateFormatItem id="hhmm">hh.mm a</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh.mm.ss a</dateFormatItem>
-						<dateFormatItem id="Hm">HH.mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d.</dateFormatItem>
-						<dateFormatItem id="MMMdd">dd.MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d. MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d.</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd. MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y.</dateFormatItem>
-						<dateFormatItem id="yM">y-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d. M. yyyy.</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM. y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d. MMM y.</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ. y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMdd">dd.MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMMd">d. MMM yy.</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y.</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH.mm-HH.mm</greatestDifference>
-							<greatestDifference id="h">HH.mm-HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH.mm-HH.mm v</greatestDifference>
-							<greatestDifference id="h">HH.mm-HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d.M - d.M</greatestDifference>
-							<greatestDifference id="M">d.M - d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, d.M - E, d.M</greatestDifference>
-							<greatestDifference id="M">E, d.M - E, d.M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd.-dd. MMM</greatestDifference>
-							<greatestDifference id="M">dd. MMM - dd. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, dd. - E, dd. MMM</greatestDifference>
-							<greatestDifference id="M">E, dd. MMM - E, dd. MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy M - M</greatestDifference>
-							<greatestDifference id="y">yyyy M - M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d.M.yy. - d.M.yy.</greatestDifference>
-							<greatestDifference id="M">d.M.yy. - d.M.yy.</greatestDifference>
-							<greatestDifference id="y">d.M.yy. - d.M.yy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, d.M.yy. - E, d.M.yy.</greatestDifference>
-							<greatestDifference id="M">E, d.M.yy. - E, d.M.yy.</greatestDifference>
-							<greatestDifference id="y">E, d.M.yy. - E, d.M.yy.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y.</greatestDifference>
-							<greatestDifference id="y">MMM y. - MMM y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd.-dd. MMM y.</greatestDifference>
-							<greatestDifference id="M">dd. MMM - dd. MMM y.</greatestDifference>
-							<greatestDifference id="y">dd. MMM y. - dd. MMM y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, dd. - E, dd. MMM y.</greatestDifference>
-							<greatestDifference id="M">E, dd. MMM - E, dd. MMM y.</greatestDifference>
-							<greatestDifference id="y">E, dd. MMM y. - E, dd. MMM y.</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>ера</displayName>
-					</field>
-					<field type="year">
-						<displayName>година</displayName>
-					</field>
-					<field type="month">
-						<displayName>ме�ец</displayName>
-					</field>
-					<field type="week">
-						<displayName>недеља</displayName>
-					</field>
-					<field type="day">
-						<displayName>дан</displayName>
-						<relative type="-3">пре три дана</relative>
-						<relative type="-2">прекјуче</relative>
-						<relative type="-1">јуче</relative>
-						<relative type="0">дана�</relative>
-						<relative type="1">�утра</relative>
-						<relative type="2">преко�утра</relative>
-						<relative type="3">за три дана</relative>
-					</field>
-					<field type="weekday">
-						<displayName>дан у недељи</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>пре подне/поподне</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ча�</displayName>
-					</field>
-					<field type="minute">
-						<displayName>минут</displayName>
-					</field>
-					<field type="second">
-						<displayName>�екунд</displayName>
-					</field>
-					<field type="zone">
-						<displayName>зона</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Тишри</month>
-							<month type="2">Хешван</month>
-							<month type="3">Ки�лев</month>
-							<month type="4">Тевет</month>
-							<month type="5">Шеват</month>
-							<month type="6">�дар I</month>
-							<month type="7">�дар</month>
-							<month type="8">�и�ан</month>
-							<month type="9">Ијар</month>
-							<month type="10">Сиван</month>
-							<month type="11">Тамуз</month>
-							<month type="12">�в</month>
-							<month type="13">Елул</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Чаитра</month>
-							<month type="2">Ваи�ака</month>
-							<month type="3">Јиаи�та</month>
-							<month type="4">��ада</month>
-							<month type="5">Сравана</month>
-							<month type="6">Бадра</month>
-							<month type="7">��вина</month>
-							<month type="8">Картика</month>
-							<month type="9">�ргајана</month>
-							<month type="10">Пауза</month>
-							<month type="11">Мага</month>
-							<month type="12">Фалгуна</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">С�К�</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Мурахам</month>
-							<month type="2">Сафар</month>
-							<month type="3">Рабиʻ I</month>
-							<month type="4">Рабиʻ II</month>
-							<month type="5">Јумада I</month>
-							<month type="6">Јумада II</month>
-							<month type="7">Рађаб</month>
-							<month type="8">Шаʻбан</month>
-							<month type="9">Рамадан</month>
-							<month type="10">Шавал</month>
-							<month type="11">Дуʻл-Киʻда</month>
-							<month type="12">Дуʻл-хиђа</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">�Х</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="japanese">
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Таика</era>
-						<era type="1">Хакучи</era>
-						<era type="2">Хакухо</era>
-						<era type="3">Шучо</era>
-						<era type="4">Таихо</era>
-						<era type="5">Кеиун</era>
-						<era type="6">Вадо</era>
-						<era type="7">Реики</era>
-						<era type="8">Јоро</era>
-						<era type="9">Јинки</era>
-						<era type="10">Темпио</era>
-						<era type="11">Темпио-кампо</era>
-						<era type="12">Темпио-шохо</era>
-						<era type="13">Темпио-хођи</era>
-						<era type="14">Темпо-ђинго</era>
-						<era type="15">Ђинго-кеиун</era>
-						<era type="16">Хоки</era>
-						<era type="17">Тен-о</era>
-						<era type="18">Енрјаку</era>
-						<era type="19">Даидо</era>
-						<era type="20">Конин</era>
-						<era type="21">Тенчо</era>
-						<era type="22">Шова</era>
-						<era type="23">Кајо</era>
-						<era type="24">�ињу</era>
-						<era type="25">Саико</era>
-						<era type="26">Тенан</era>
-						<era type="27">Јоган</era>
-						<era type="28">Генкеи</era>
-						<era type="29">�иња</era>
-						<era type="30">Кампјо</era>
-						<era type="31">Шотаи</era>
-						<era type="32">Енђи</era>
-						<era type="33">Енчо</era>
-						<era type="34">Шохеи</era>
-						<era type="35">Тенгјо</era>
-						<era type="36">Тенриаку</era>
-						<era type="37">Тентоку</era>
-						<era type="38">Ова</era>
-						<era type="39">Кохо</era>
-						<era type="40">�на</era>
-						<era type="41">Тенроку</era>
-						<era type="42">Тен-ен</era>
-						<era type="43">Јоген</era>
-						<era type="44">Тенген</era>
-						<era type="45">Еикан</era>
-						<era type="46">Кана</era>
-						<era type="47">Еи-ен</era>
-						<era type="48">Еи�о</era>
-						<era type="49">Шорјаку</era>
-						<era type="50">Чотоку</era>
-						<era type="51">Чохо</era>
-						<era type="52">Канко</era>
-						<era type="53">Чова</era>
-						<era type="54">Канин</era>
-						<era type="55">Ђиан</era>
-						<era type="56">Мању</era>
-						<era type="57">Чоген</era>
-						<era type="58">Чорјаку</era>
-						<era type="59">Чокју</era>
-						<era type="60">Кантоку</era>
-						<era type="61">Еишо</era>
-						<era type="62">Тенђи</era>
-						<era type="63">Кохеи</era>
-						<era type="64">Ђирјаку</era>
-						<era type="65">Енкју</era>
-						<era type="66">Шохо</era>
-						<era type="67">Шорјаку</era>
-						<era type="68">Еишо</era>
-						<era type="69">Отоку</era>
-						<era type="70">Канђи</era>
-						<era type="71">Кахо</era>
-						<era type="72">Еичо</era>
-						<era type="73">Шотоку</era>
-						<era type="74">Кова</era>
-						<era type="75">Чођи</era>
-						<era type="76">Кашо</era>
-						<era type="77">Тенин</era>
-						<era type="78">Тен-еи</era>
-						<era type="79">Еикју</era>
-						<era type="80">Ђен-еи</era>
-						<era type="81">Хоан</era>
-						<era type="82">Тенђи</era>
-						<era type="83">Даиђи</era>
-						<era type="84">Теншо</era>
-						<era type="85">Чошао</era>
-						<era type="86">Хоен</era>
-						<era type="87">Еиђи</era>
-						<era type="88">Кођи</era>
-						<era type="89">Тењо</era>
-						<era type="90">Кјуан</era>
-						<era type="91">�инпеи</era>
-						<era type="92">Кјују</era>
-						<era type="93">Хоген</era>
-						<era type="94">Хеиђи</era>
-						<era type="95">Еирјаку</era>
-						<era type="96">Охо</era>
-						<era type="97">Чокан</era>
-						<era type="98">Еиман</era>
-						<era type="99">�ин-ан</era>
-						<era type="100">Као</era>
-						<era type="101">Шоан</era>
-						<era type="102">�нген</era>
-						<era type="103">Ђишо</era>
-						<era type="104">Јова</era>
-						<era type="105">Ђуеи</era>
-						<era type="106">Генрјуку</era>
-						<era type="107">Бунђи</era>
-						<era type="108">Кенкју</era>
-						<era type="109">Шођи</era>
-						<era type="110">Кенин</era>
-						<era type="111">Генкју</era>
-						<era type="112">Кен-еи</era>
-						<era type="113">Шоген</era>
-						<era type="114">Кенрјаку</era>
-						<era type="115">Кенпо</era>
-						<era type="116">Шокју</era>
-						<era type="117">Ђу</era>
-						<era type="118">Ђенин</era>
-						<era type="119">Кароку</era>
-						<era type="120">�нтеи</era>
-						<era type="121">Канки</era>
-						<era type="122">Ђоеи</era>
-						<era type="123">Темпуку</era>
-						<era type="124">Бунрјаку</era>
-						<era type="125">Катеи</era>
-						<era type="126">Рјакунин</era>
-						<era type="127">Ен-о</era>
-						<era type="128">�ињи</era>
-						<era type="129">Канген</era>
-						<era type="130">Хођи</era>
-						<era type="131">Кенчо</era>
-						<era type="132">Коген</era>
-						<era type="133">Шока</era>
-						<era type="134">Шоген</era>
-						<era type="135">Бун-о</era>
-						<era type="136">Кочо</era>
-						<era type="137">Бун-еи</era>
-						<era type="138">Кенђи</era>
-						<era type="139">Коан</era>
-						<era type="140">Шу</era>
-						<era type="141">Еинин</era>
-						<era type="142">Шоан</era>
-						<era type="143">Кенген</era>
-						<era type="144">Каген</era>
-						<era type="145">Токуђи</era>
-						<era type="146">Енкеи</era>
-						<era type="147">Очо</era>
-						<era type="148">Шова</era>
-						<era type="149">Бунпо</era>
-						<era type="150">Ђено</era>
-						<era type="151">Ђенкјо</era>
-						<era type="152">Шочу</era>
-						<era type="153">Кареки</era>
-						<era type="154">Гентоку</era>
-						<era type="155">Генко</era>
-						<era type="156">Кему</era>
-						<era type="157">Енген</era>
-						<era type="158">Кококу</era>
-						<era type="159">Шохеи</era>
-						<era type="160">Кентоку</era>
-						<era type="161">Бучу</era>
-						<era type="162">Тењу</era>
-						<era type="163">Корјаку</era>
-						<era type="164">Кова</era>
-						<era type="165">Генчу</era>
-						<era type="166">Меитоку</era>
-						<era type="167">Какеи</era>
-						<era type="168">Ку</era>
-						<era type="169">Меитоку</era>
-						<era type="170">Оеи</era>
-						<era type="171">Шочо</era>
-						<era type="172">Еикјо</era>
-						<era type="173">Какит�у</era>
-						<era type="174">Бун-ан</era>
-						<era type="175">Хотоку</era>
-						<era type="176">Кјотоку</era>
-						<era type="177">Кошо</era>
-						<era type="178">Чороку</era>
-						<era type="179">Каншо</era>
-						<era type="180">Буншо</era>
-						<era type="181">Онин</era>
-						<era type="182">Бунмеи</era>
-						<era type="183">Чокјо</era>
-						<era type="184">Ентоку</era>
-						<era type="185">Меио</era>
-						<era type="186">Бунки</era>
-						<era type="187">Еишо</era>
-						<era type="188">Таиеи</era>
-						<era type="189">Кјороку</era>
-						<era type="190">Тенмон</era>
-						<era type="191">Кођи</era>
-						<era type="192">Еироку</era>
-						<era type="193">Генки</era>
-						<era type="194">Теншо</era>
-						<era type="195">Бунроку</era>
-						<era type="196">Кеичо</era>
-						<era type="197">Генва</era>
-						<era type="198">Кан-еи</era>
-						<era type="199">Шохо</era>
-						<era type="200">Кеиан</era>
-						<era type="201">Шу</era>
-						<era type="202">Меирјаку</era>
-						<era type="203">Мањи</era>
-						<era type="204">Канбун</era>
-						<era type="205">Енпо</era>
-						<era type="206">Тенва</era>
-						<era type="207">Јокјо</era>
-						<era type="208">Генроку</era>
-						<era type="209">Хоеи</era>
-						<era type="210">Шотоку</era>
-						<era type="211">Кјохо</era>
-						<era type="212">Генбун</era>
-						<era type="213">Канпо</era>
-						<era type="214">Енкјо</era>
-						<era type="215">Кан-ен</era>
-						<era type="216">Хорјаку</era>
-						<era type="217">Меива</era>
-						<era type="218">�н-еи</era>
-						<era type="219">Тенмеи</era>
-						<era type="220">Кан�еи</era>
-						<era type="221">Кјова</era>
-						<era type="222">Бунка</era>
-						<era type="223">Бун�еи</era>
-						<era type="224">Тенпо</era>
-						<era type="225">Кока</era>
-						<era type="226">Каеи</era>
-						<era type="227">�н�еи</era>
-						<era type="228">Ман-ен</era>
-						<era type="229">Бункју</era>
-						<era type="230">Генђи</era>
-						<era type="231">Кеико</era>
-						<era type="232">Меиђи</era>
-						<era type="233">Таишо</era>
-						<era type="234">Шова</era>
-						<era type="235">Хаи�еи</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yy G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Фаравадин</month>
-							<month type="2">Ордибехешт</month>
-							<month type="3">Кордад</month>
-							<month type="4">Тир</month>
-							<month type="5">Мордад</month>
-							<month type="6">Шахривар</month>
-							<month type="7">Мехр</month>
-							<month type="8">�бан</month>
-							<month type="9">�зар</month>
-							<month type="10">Деј</month>
-							<month type="11">Бахман</month>
-							<month type="12">Е�фанд</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>пре подне</am>
-				<pm>поподне</pm>
-			</calendar>
-			<calendar type="roc">
-				<am>пре подне</am>
-				<pm>поподне</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Пре РК</era>
-						<era type="1">РК</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�епознат или неважећи град</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>�ндора</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Дубаи</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Кабул</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�нтигва</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�нгвила</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Тирана</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Јереван</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Кира�о</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Луанда</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ротера</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Палмер</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Јужни пол</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Шова</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Мо�он</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Дејви�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Во�ток</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Ка�еј</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Димон д’Урвил</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Макмурдо</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Рио Гелего�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Мендоза</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Сан Хуан</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуаија</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла Риоја</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан Луи</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Катамарка</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Салта</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Жужуи</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Тукуман</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Кордоба</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Буено� �ире�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Паго Паго</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Беч</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Перт</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Иукла</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Дарвин</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�делаида</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Брокен Хил</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Курие</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Мелбурн</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Хобарт</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Линдеман</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Сиднеј</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Бризбејн</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд Хов</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�руба</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Баку</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Барбадо�</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Дака</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Бри�ел</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Уагадугу</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Софија</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Бахреин</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Буџумбура</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Порто �ово</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуди</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Брунеји</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Ла Паз</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Еирунепе</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Рио Бранко</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Порто Вељо</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Боа Ви�та</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Манау�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Куиаба</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Сантарем</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампо Гранде</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Белем</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�рагвајана</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сао Паоло</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Бахиа</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Форталеза</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Ма�ејо</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ре�ифе</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�ороња</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�а�ау</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Тхимпху</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Габорон</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Мин�к</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Белизе</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>До�он</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Вајтхор�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Инувик</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Ванкувер</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>До�он Крик</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Едмонтон</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Свифт Курент</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кембриџ Беј</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Регина</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Винипег</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Ре�олут</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рејни Ривер</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ранкин Инлет</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал Харбур</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер Беј</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�ипигон</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Торонто</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Монтреал</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Иквалуит</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Пангниртунг</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Монктон</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Халифак�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Гу� Беј</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Глеј� Беј</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Бланк-Сејблон</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Св. �он</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Коко�ова о�трва</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Кинша�а</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Лумумбаши</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Бангуи</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Бразавил</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Цирих</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>�биџан</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Раротонга</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>У�кршње о�трво</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Сантијаго</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Дуала</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Кашгар</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Урумкви</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Чонгкинг</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Шангај</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Харбин</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Богота</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Ко�тарика</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Хавана</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Капе Верде</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Божићно о�трво</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>�икозија</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Берлин</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>�ибути</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Копенхаген</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Доминика</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Санто Доминго</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�лжир</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Галапаго�</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Гвајакил</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Талин</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Каиро</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Ел �јун</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>��мера</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Канар�ка о�трва</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Сеута</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Мадрид</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�ди� �беба</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Хел�инки</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Фиџи</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Стенли</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Трук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Понапе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Кошре</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Фар�ка О�трва</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Париз</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Либревил</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Лондон</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Гренада</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Тбили�и</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Кајен</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�кра</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Гибралтар</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Туле</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>�ук</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Скорезби�унд</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Данмарк�хаген</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Банжул</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Конакри</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Гвадалупе</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Малабо</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�тина</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Јужна �орџија</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Гватемала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Гуам</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Би�ао</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Гуана</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Хонг Конг</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Порт-о-Прен�</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Будимпешта</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>�акарта</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Понтианак</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Мака�ар</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>�ајапура</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Даблин</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Чаго�</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Багдад</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Техеран</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Рејкјавик</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Рим</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Јамајка</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>�ман</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Токио</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>�ајроби</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Бишкек</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Пном Пен</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербери</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Киритимати</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Тарава</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Коморо</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Сент Кит�</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Пјонгјанг</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Сеул</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Кувајт</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Кајман�ка о�трва</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ктау</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Орал</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�кутобе</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Кизилорда</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�лмати</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Вијетијан</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Бејрут</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Св. Луција</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Вадуц</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Коломбо</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Монровија</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Ма�еру</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Виљну�</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Лук�ембург</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Рига</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Триполи</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Казабланка</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Монако</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Кишњев</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�нтананариво</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Кваџалејин</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Мајуро</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Бамако</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Рангун</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Ховд</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Улан Батор</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Чојбал�ан</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Макау</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Сајпан</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Мартиник</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>�авакшут</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Монт�ерат</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Малта</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Маурицију�</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Малдиви</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Блантир</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Тихуана</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Хермо�иљо</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Мазатлан</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Чихуахуа</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Монтереј</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Мек�ико Сити</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Мерида</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Канкун</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Куала Лумпур</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Кучинг</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Мапуто</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Виндхук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>�умеа</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>�ијамеј</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�орфолк</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Лаго�</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Манагва</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�м�тердам</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>О�ло</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Катманду</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>�ауру</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�иуе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Катхам</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Окланд</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Му�кат</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Панама</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Лима</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Тахити</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Маркиз</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбије</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Порт Морзби</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Манила</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Карачи</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Варшава</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Микелон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Питкаирн</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Порто Рико</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Газа</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�зори</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Ли�абон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Палау</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>��ун�ион</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Катар</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Уједињење</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Букурешт</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Калининград</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Мо�ква</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Волгоград</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Јекатеринбург</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ом�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�ово�ибир�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Кра�нојар�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Иркуцк</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Јакут�к</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Владиво�ток</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сахалин</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Магадан</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Камчатка</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�надир</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Кигали</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Ријад</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Гвадалканал</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Махе</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Картум</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Стокхолм</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Сингапур</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Света Јелена</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Фритаун</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Дакар</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Могадиш</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Парамирбо</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сао Томе</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Салвадор</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Дама�к</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Мбабане</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Гранд Турк</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�џамена</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Кергелен</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Ломе</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Банкок</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Душанбе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Факаофо</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Дили</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>�шхабад</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Туни�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Тонгатапу</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>И�танбул</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Порт оф Спејн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Фанафути</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Тајпеј</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Дар-е�-Салам</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Кијев</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Симферопол</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запорожје</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Кампала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Мидвеј</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>�он�тон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Вејк</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�дак</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�ом</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Хонолулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Енкориџ</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Жуно</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло� �нђеле�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Бојзи</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Феник�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Шипрок</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Денвер</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�ови Салем, Северна Даткоа</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Центар, Северна Дакота</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чикаго</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Меномини</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Винцене�, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Петер�бург, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Тел Сити</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Кнок�, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Винамак, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Маренго, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Индианаполи�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Луивиле</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Вевај, Индијана</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монтичело, Кентаки</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Детроит</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Њујорк</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Монтевидео</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Самарканд</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Ташкент</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Сент Вин�ент</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Карака�</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Тортола</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Св. Тома</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Ефате</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Вали�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�пија</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>�ден</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Мајоте</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Јохане�бург</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Лу�ака</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Хараре</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>�кре време</standard>
-					<daylight>�кре летње рачунање времена</daylight>
-				</long>
-				<short>
-					<standard>ACT (Aкре)</standard>
-					<daylight>ACST (Aкре)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Централно-афричко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>И�точно-афричко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Јужно-афричко време</generic>
-					<standard>Јужно-афричко �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Западно-афричко време</standard>
-					<daylight>Западно-афричко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>�ктјубин�к време</standard>
-					<daylight>�ктјубин�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>�лмати време</standard>
-					<daylight>�лмати летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>�мазон време</standard>
-					<daylight>�мазон летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Централно време</generic>
-					<standard>Централно �тандардно време</standard>
-					<daylight>Централно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>И�точно време</generic>
-					<standard>И�точно �тандардно време</standard>
-					<daylight>И�точно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Планин�ко време</generic>
-					<standard>Планин�ко �тандардно време</standard>
-					<daylight>Планин�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Пацифичко време</generic>
-					<standard>Пацифичко �тандардно време</standard>
-					<daylight>Пацифичко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>�надир време</standard>
-					<daylight>�надир летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>�кватау време</standard>
-					<daylight>�кватау летње рачунање времена</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aкватау)</standard>
-					<daylight>AQTST (Aкватау)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>�кутобе време</standard>
-					<daylight>�кутобе летње рачунање времена</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aктобе)</standard>
-					<daylight>AQTST (Aктобе)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>�рабиј�ко време</generic>
-					<standard>�рабиј�ко �тандардно време</standard>
-					<daylight>�рабиј�ко летње рачунање времена</daylight>
-				</long>
-				<short>
-					<generic>AT (�рабиј�ко)</generic>
-					<standard>AST (�рабиј�ко)</standard>
-					<daylight>ADT (�рабиј�ко)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>�ргентина време</standard>
-					<daylight>�ргентина летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Западна �ргентина време</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>�рменија време</standard>
-					<daylight>�рменија летње рачунање времена</daylight>
-				</long>
-				<short>
-					<standard>AMT (Aрменија)</standard>
-					<daylight>AMST (Aрменија)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>�шкабад време</standard>
-					<daylight>�шкабад летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>�тлан�ко време</generic>
-					<standard>�тлан�ко �тандардно време</standard>
-					<daylight>�тлан�ко лтње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>�у�тралиј�ко централно време</generic>
-					<standard>�у�тралиј�ко централно �тандардно време</standard>
-					<daylight>�у�тралиј�ко централно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>�у�тралиј�ко централно западно време</generic>
-					<standard>�у�тралиј�ко централно западно �тандардно време</standard>
-					<daylight>�у�тралиј�ко централно западно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>�у�тралиј�ко и�точно време</generic>
-					<standard>�у�тралиј�ко и�точно �тандардно време</standard>
-					<daylight>�у�тралиј�ко и�точно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>�у�тралиј�ко западно време</generic>
-					<standard>�у�тралиј�ко западно �тандардно време</standard>
-					<daylight>�у�тралиј�ко западно летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>�зербејџан време</standard>
-					<daylight>�зербејџан летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>�зори време</standard>
-					<daylight>�зори летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Баку време</standard>
-					<daylight>Баку летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Бангладеш време</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Беринг време</generic>
-					<standard>Беринг �тандардно време</standard>
-					<daylight>Беринг летње рачунање времена</daylight>
-				</long>
-				<short>
-					<generic>BT (Беринг)</generic>
-					<standard>BST (Беринг)</standard>
-					<daylight>BDT (Беринг)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Бутан време</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Боливија време</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Борнео време</standard>
-					<daylight>Борнео летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Бразилија време</standard>
-					<daylight>Бразилија летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Брунеј Дару�алум време</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Зеленирт�ко време</standard>
-					<daylight>Зеленорт�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Чаморо време</generic>
-					<standard>Чаморо �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Чангбаи време</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Чатам �тандардно време</standard>
-					<daylight>Чатам летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Чиле време</standard>
-					<daylight>Чиле летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Кина време</generic>
-					<standard>Кине�ко �тандардно време</standard>
-					<daylight>Кина летње рачунање времена</daylight>
-				</long>
-				<short>
-					<generic>CT (Кина)</generic>
-					<standard>CST (Кина)</standard>
-					<daylight>CDT (Кина)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Чојбал�ан време</standard>
-					<daylight>Чојбал�ан летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Божићна о�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Коко� (Келинг) О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Колумбија време</standard>
-					<daylight>Колумбија летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Кукова о�трва време</standard>
-					<daylight>Кукова о�трва полу-летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Куба време</generic>
-					<standard>Куба �тандардно време</standard>
-					<daylight>Куба летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Дача време</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Дејви� време</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Димон д’Урвил време</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Душанбе време</standard>
-					<daylight>Душанбе летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Холанд�ка Гвајана време</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>И�точни тимор време</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>У�кршња о�трва време</standard>
-					<daylight>У�кршња о�трва летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Еквадор време</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Средњеевроп�ко време</standard>
-					<daylight>Средњеевроп�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>И�точноевроп�ко време</standard>
-					<daylight>И�точноевроп�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Западноевроп�ко време</standard>
-					<daylight>Западноевроп�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Фолкланд�ка О�трва време</standard>
-					<daylight>Фолкланд�ка О�трва летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Фиџи време</standard>
-					<daylight>Фиџи летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Францу�ка Гвајана време</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Францу�ко јужно и антарктичко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Фрунзе време</standard>
-					<daylight>Фрунзе летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Галапаго� време</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Гамбијер време</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Грузија време</standard>
-					<daylight>Грузија летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Гилберт о�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Гринвич �редње време</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Централни Гренланд време</standard>
-					<daylight>Централни Гренланд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>И�точни Гренланд време</standard>
-					<daylight>И�точни Гренланд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Западни Гренланд време</standard>
-					<daylight>Западни Гренланд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Гуам �тандардно време</standard>
-				</long>
-				<short>
-					<standard>GST (Гуам)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Залив време</generic>
-					<standard>Залив �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Гвајана време</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Хавај�ко-алеућан�ко �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Хонг Конг време</standard>
-					<daylight>Хонгконшко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Ховд време</standard>
-					<daylight>Ховд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Индиј�ко �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Индиј�ко океан�ко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Индокина време</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Централно-индонезиј�ко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>И�точно-индонезиј�ко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Западно-индонезиј�ко време</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Иран �тандардно време</standard>
-					<daylight>Иран летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Иркуцк време</standard>
-					<daylight>Иркуцк летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Израел�ко �тандардно време</standard>
-					<daylight>Израел�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<standard>Јапан�ко �тандардно време</standard>
-					<daylight>Јапан�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Петропавлов�ко-камчат�ко време</standard>
-					<daylight>Петропавлов�ко-камчат�ко летње рачунање вемена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Карачи време</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Кашгар време</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>И�точно-казах�тан�ко време</generic>
-					<standard>И�точно-казах�тан�ко �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Западно-казах�тан�ко време</generic>
-					<standard>Западно-казах�тан�ко �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Кизилорда време</standard>
-					<daylight>Кизилорда летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Кореја време</generic>
-					<standard>Кореј�ко �тандардно време</standard>
-					<daylight>Кореј�ко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Кошре време</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Кра�нојар�к време</standard>
-					<daylight>Кра�нојар�клетње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Кујбишев време</standard>
-					<daylight>Кујбишев летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Кваџалејин време</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Киргиз�тан време</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Шри Ланка време</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Лине О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Лонг Шу време</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Лорд Хов време</generic>
-					<standard>Лорд Хов �тандардно време</standard>
-					<daylight>Лорд Хов летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Макао време</standard>
-					<daylight>Макао летње рачунање вемена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Магадан време</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Малаја време</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Малезија време</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Малдиви време</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Маркиз време</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Маршал�ка О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Маурицију� време</standard>
-					<daylight>Маурицију� летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Мо�он време</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Улан Батор време</standard>
-					<daylight>Улан Батор летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Мо�ква време</generic>
-					<standard>Мо�ква �тандардно време</standard>
-					<daylight>Мо�ква летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Мијанмар време</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>�ауру време</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>�епал време</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>�ова Каледонија време</standard>
-					<daylight>�ова Каледонија летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>�ови Зеланд време</generic>
-					<standard>�ови Зеланд �тандардно време</standard>
-					<daylight>�ови Зеланд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Њуфаундленд време</generic>
-					<standard>Њуфаундленд �тандардно време</standard>
-					<daylight>Њуфаундленд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>�иуе време</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>�орфолк О�трво време</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Фернандо де �ороња време</standard>
-					<daylight>Фернандо де �ороња летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Северна Маријан�ка О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>�ово�ибир�к време</standard>
-					<daylight>�ово�ибир�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Ом�к време</standard>
-					<daylight>Ом�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Паки�тан �тандардно време</standard>
-					<daylight>Паки�тан летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Папуа �ова Гвинеја време</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Парагвај време</standard>
-					<daylight>Парагвај летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Перу време</standard>
-					<daylight>Перу летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Филипини време</standard>
-					<daylight>Филипини летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Феник� о�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Пјер и Микелон време</generic>
-					<standard>Пјер и Микелон �тандардно време</standard>
-					<daylight>Пјер и Микелон летње рачунање вемена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Питкерн време</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Понапе време</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Кизилорда време</standard>
-					<daylight>Кизилорда летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Реинион време</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Ротера време</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Сахалин време</standard>
-					<daylight>Сахалин летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<generic>Самара време</generic>
-					<standard>Самара �тандардно време</standard>
-					<daylight>Самара летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Самарканд време</standard>
-					<daylight>Самарканд летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Самоа �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Сејшели време</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Шевченко време</standard>
-					<daylight>Шевченко летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Сингапур �тандардно време</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Соломон�ка О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Јужна �орџија време</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Суринам време</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Свердлов�к време</standard>
-					<daylight>Свердлов�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Шова време</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Тахити време</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Таџики�тан време</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Ташкент време</standard>
-					<daylight>Ташкент летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Тбили�и време</standard>
-					<daylight>Тбили�и летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Токелау време</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Тонга време</standard>
-					<daylight>Тонга летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Трук време</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Тур�ка време</standard>
-					<daylight>Тур�ка летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Туркмени�тан време</standard>
-					<daylight>Туркмени�тан летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Тувалу време</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Урал�к време</standard>
-					<daylight>Урал�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Уругвај време</standard>
-					<daylight>Уругвај летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Урумки време</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Узбеки�тан време</standard>
-					<daylight>Узбеки�тан летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Вануату време</standard>
-					<daylight>Вануату летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Венецуела време</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Владиво�ток време</standard>
-					<daylight>Владиво�ток летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Волгоград време</standard>
-					<daylight>Волгоград летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Во�ток време</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Вејк о�трво време</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Вали� и Футуна О�трва време</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Јакут�к време</standard>
-					<daylight>Јакут�к летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Јекатеринбург време</standard>
-					<daylight>Јекатеринбург летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Јереван време</standard>
-					<daylight>Јереван летње рачунање времена</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Јукон време</generic>
-					<standard>Јукон �тандардно време</standard>
-					<daylight>Јукон летње рачунање времена</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="many">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ндор�ка пезета</displayName>
-				<displayName count="few">андор�ке пезете</displayName>
-				<displayName count="many">андор�ких пезета</displayName>
-				<displayName count="one">андор�ка пезета</displayName>
-				<displayName count="other">андор�ке пезете</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Уједињени арап�ки емирати дирхам</displayName>
-				<displayName count="few">У�Е дирама</displayName>
-				<displayName count="many">У�Е дирама</displayName>
-				<displayName count="one">У�Е дирам</displayName>
-				<displayName count="other">У�Е дирама</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�вгани�тан�ки авган (1927-2002)</displayName>
-				<displayName count="few">aвгани�тан�ка авгана (AFA)</displayName>
-				<displayName count="many">aвгани�тан�ких авгана (AFA)</displayName>
-				<displayName count="one">авгани�тан�ки авган (AFA)</displayName>
-				<displayName count="other">авгани�тан�ких авгана (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�вгани�тан�ки авган</displayName>
-				<displayName count="few">авгани�тан�ка авгана</displayName>
-				<displayName count="many">авгани�тан�ких авгана (AFN)</displayName>
-				<displayName count="one">авгани�тан�ки авган</displayName>
-				<displayName count="other">авгани�тан�ки авгани</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�лбан�ки лек</displayName>
-				<displayName count="few">�лбан�ке леке</displayName>
-				<displayName count="many">�лбан�ких лека</displayName>
-				<displayName count="one">албан�ки лек</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Јермен�ки драм</displayName>
-				<displayName count="few">Јермен�ка драма</displayName>
-				<displayName count="many">Јермен�ких драма</displayName>
-				<displayName count="one">јермен�ки драм</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Холанд�ки антили гилдер</displayName>
-				<displayName count="few">холанд�ка антила</displayName>
-				<displayName count="many">холанд�ко-антил�ких гилдера</displayName>
-				<displayName count="one">холанд�ко-антил�ки гилдер</displayName>
-				<displayName count="other">холанд�ко-антил�ких гилдера</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>aнголиј�ка кванза</displayName>
-				<displayName count="few">анголиј�ке кванзе</displayName>
-				<displayName count="many">анголиј�ких кванзи</displayName>
-				<displayName count="one">анголиј�ка кванза</displayName>
-				<displayName count="other">анголиј�ких кванзи</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>aнголиј�ка кванза (1977-1990)</displayName>
-				<displayName count="few">анголиј�ке кванзе (AOK)</displayName>
-				<displayName count="many">анголиј�ких кванзи (AOK)</displayName>
-				<displayName count="one">анголиј�ка кванза (AOK)</displayName>
-				<displayName count="other">анголиј�ких кванзи (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�нголиј�ка нова кванза (1990-2000)</displayName>
-				<displayName count="few">анголиј�ке нове кванзе</displayName>
-				<displayName count="many">анголиј�ких нових кванзи</displayName>
-				<displayName count="one">анголиј�ка нова кванза</displayName>
-				<displayName count="other">анголиј�ких нових кванзи</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�нгол�ка кванза реађу�тадо (1995-1999)</displayName>
-				<displayName count="few">анголиј�ке кванзе реађу�тадо</displayName>
-				<displayName count="many">анголиј�ких кванзи реађу�тадо</displayName>
-				<displayName count="one">анголиј�ка кванза реађу�тадо</displayName>
-				<displayName count="other">анголиј�ких кванзи реађу�тадо</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>�ргентин�ки ау�трал</displayName>
-				<displayName count="few">аргентин�ка ау�трала</displayName>
-				<displayName count="many">аргентин�ких ау�трала</displayName>
-				<displayName count="one">аргентин�ки ау�трал</displayName>
-				<displayName count="other">аргентин�ких ау�трала</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>aргентин�ки пезо (1983-1985)</displayName>
-				<displayName count="few">аргентин�ка пезо�а (ARP)</displayName>
-				<displayName count="many">аргентин�ких пезо�а (ARP)</displayName>
-				<displayName count="one">аргентин�ки пезо</displayName>
-				<displayName count="other">аргентин�ких пезо�а (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>aргентин�ки пезо</displayName>
-				<displayName count="few">аргентин�ка пезо�а</displayName>
-				<displayName count="many">аргентин�ких пезо�а</displayName>
-				<displayName count="one">аргентин�ки пезо�</displayName>
-				<displayName count="other">аргентин�ких пезо�а</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�у�триј�ки шилинг</displayName>
-				<displayName count="few">ау�триј�ка шилинга</displayName>
-				<displayName count="many">ау�триј�ких шилинга</displayName>
-				<displayName count="one">ау�триј�ки шилинг</displayName>
-				<displayName count="other">ау�триј�ких шилинга</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�у�тралиј�ки долар</displayName>
-				<displayName count="few">�у�тралиј�ка долара</displayName>
-				<displayName count="many">�у�тралиј�ких долара</displayName>
-				<displayName count="one">ау�тралиј�ки долар</displayName>
-				<displayName count="other">ау�тралиј�ких долара</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�рубан�ки флорин</displayName>
-				<displayName count="few">арубан�ка флорина</displayName>
-				<displayName count="many">арубан�ких флорина</displayName>
-				<displayName count="one">арубан�ки флорин</displayName>
-				<displayName count="other">арубан�ких флорина</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>�зербејџан�ки манат (1993-2006)</displayName>
-				<displayName count="few">азербејџан�ка маната (AZM)</displayName>
-				<displayName count="many">азербејџан�ких маната (AZM)</displayName>
-				<displayName count="one">азербејџан�ки манат (AZM)</displayName>
-				<displayName count="other">азербејџан�ких маната (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>�зербејџан�ки манат</displayName>
-				<displayName count="few">азербејџан�ка маната</displayName>
-				<displayName count="many">азербејџан�ких маната</displayName>
-				<displayName count="one">азербејџан�ки манат (AZN)</displayName>
-				<displayName count="other">азербејџан�ких маната</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Бо�ан�ко-Херцеговачки динар</displayName>
-				<displayName count="few">бо�ан�ко-херцеговачка динара</displayName>
-				<displayName count="many">бо�ан�ко-херцеговачких динара</displayName>
-				<displayName count="one">бо�ан�ко-херцеговачки динар</displayName>
-				<displayName count="other">бо�ан�ко-херцеговачких динара</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Конвертибилна марка</displayName>
-				<displayName count="few">бо�ан�ко-херцеговачке конвертибилне марк</displayName>
-				<displayName count="many">бо�ан�ко-херцеговачких конвертабилних марака</displayName>
-				<displayName count="one">бо�ан�ко-херцеговачка конвертибилна марка</displayName>
-				<displayName count="other">бо�ан�ко-херцеговачких конвертибилних марака</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Барбадошки долар</displayName>
-				<displayName count="few">барбадошка долара</displayName>
-				<displayName count="many">барбадошких долара</displayName>
-				<displayName count="one">барбадошки долар</displayName>
-				<displayName count="other">барбадошких долара</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Бангладешка така</displayName>
-				<displayName count="few">бангладешке таке</displayName>
-				<displayName count="many">бангладешких така</displayName>
-				<displayName count="one">бангладешка така</displayName>
-				<displayName count="other">бангладешких така</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Белгиј�ки франак (конвертибилни)</displayName>
-				<displayName count="few">белгиј�ка франка (конвертибилна)</displayName>
-				<displayName count="many">белгиј�ких франака (конвертибилних)</displayName>
-				<displayName count="one">белгиј�ки франак (конвертибилни)</displayName>
-				<displayName count="other">белгиј�ких франака (конвертибилних)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Белгиј�ки франак</displayName>
-				<displayName count="few">белгиј�ка франка</displayName>
-				<displayName count="many">белгиј�ких франака</displayName>
-				<displayName count="one">белгиј�ки франак</displayName>
-				<displayName count="other">белгиј�ких франака</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Белгиј�ки франак (финан�иј�ки)</displayName>
-				<displayName count="few">белгиј�ка франка (финан�иј�ка)</displayName>
-				<displayName count="many">белгиј�ких франака (финан�иј�ких)</displayName>
-				<displayName count="one">белгиј�ки франак (финан�иј�ки)</displayName>
-				<displayName count="other">белгиј�ких франака (финан�иј�ких)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Бугар�ки тврди лев</displayName>
-				<displayName count="few">бугар�ка тврда лева</displayName>
-				<displayName count="many">бугар�ких тврдих лева</displayName>
-				<displayName count="one">бугар�ки тврди лев</displayName>
-				<displayName count="other">бугар�ких тврдих лева</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Бугар�ки лев</displayName>
-				<displayName count="few">бугар�ка лева</displayName>
-				<displayName count="many">бугар�ких лева</displayName>
-				<displayName count="one">бугар�ки лев</displayName>
-				<displayName count="other">бугар�ких лева</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Бахреин�ки динар</displayName>
-				<displayName count="few">бахреин�ких динара</displayName>
-				<displayName count="one">бахреин�ких динара</displayName>
-				<displayName count="other">бахреин�ких динара</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Бурунд�ки франак</displayName>
-				<displayName count="few">бурунд�ка франка</displayName>
-				<displayName count="many">бурунд�ких франака</displayName>
-				<displayName count="one">бурунд�ки франак</displayName>
-				<displayName count="other">бурунд�ки франци</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Бермуд�ки долар</displayName>
-				<displayName count="few">бермуд�ка долара</displayName>
-				<displayName count="many">бермуд�ких долара</displayName>
-				<displayName count="one">бермуд�ки долар</displayName>
-				<displayName count="other">бермуд�ких долара</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Брунеј�ки долар</displayName>
-				<displayName count="few">брунеј�ка долара</displayName>
-				<displayName count="many">брунеј�ких долара</displayName>
-				<displayName count="one">брунеј�ки долар</displayName>
-				<displayName count="other">брунеј�ких долара</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Боливиј�ки Боливиано</displayName>
-				<displayName count="few">боливиј�ка боливиана</displayName>
-				<displayName count="many">боливиј�ких боливиана</displayName>
-				<displayName count="one">боливиј�ки боливиано</displayName>
-				<displayName count="other">боливиј�ких боливиана</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Боливиј�ки пезо</displayName>
-				<displayName count="few">боливиј�ка пезо�а</displayName>
-				<displayName count="many">боливиј�ких пезо�а</displayName>
-				<displayName count="one">боливиј�ки пезо</displayName>
-				<displayName count="other">боливиј�ких пезо�а</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Боливиј�ки мвдол</displayName>
-				<displayName count="few">боливиј�ка мвдола</displayName>
-				<displayName count="many">боливиј�ких мвдола</displayName>
-				<displayName count="one">боливиј�ки мвдол</displayName>
-				<displayName count="other">боливиј�ких мвдола</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Бразил�ки нови крузеиро (1967-1986)</displayName>
-				<displayName count="few">бразил�ка нова крузеира</displayName>
-				<displayName count="many">бразил�ких нових крузеира</displayName>
-				<displayName count="one">бразил�ки нови крузеиро</displayName>
-				<displayName count="other">бразил�ких нових крузеира</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Бразилиј�ки крузадо</displayName>
-				<displayName count="few">бразил�ка крузадо�а</displayName>
-				<displayName count="many">бразил�ких крузадо�а</displayName>
-				<displayName count="one">бразил�ки крузадо�</displayName>
-				<displayName count="other">бразил�ких крузадо�а</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Бразил�ки крузеиро (1990-1993)</displayName>
-				<displayName count="few">бразил�ка крузеира (BRE)</displayName>
-				<displayName count="many">бразил�ких крузеира (BRE)</displayName>
-				<displayName count="one">бразил�ки крузеиро (BRE)</displayName>
-				<displayName count="other">бразил�ких крузеира (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Бразил�ки Реал</displayName>
-				<displayName count="few">бразил�ка реала</displayName>
-				<displayName count="many">бразил�ких реала</displayName>
-				<displayName count="one">бразил�ки реал</displayName>
-				<displayName count="other">бразил�ких реала</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Бразилиј�ки нови крузадо</displayName>
-				<displayName count="few">бразил�ка нова крузада</displayName>
-				<displayName count="many">бразил�ких нових крузада</displayName>
-				<displayName count="one">бразил�ки нови крузадо</displayName>
-				<displayName count="other">бразил�ких нових крузада</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Бразил�ки крузеиро</displayName>
-				<displayName count="few">бразил�ка крузеира</displayName>
-				<displayName count="many">бразил�ких крузеира</displayName>
-				<displayName count="one">бразил�ки крузеиро</displayName>
-				<displayName count="other">бразил�ких крузеира</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Бахам�ки долар</displayName>
-				<displayName count="few">бахам�ка долара</displayName>
-				<displayName count="many">бахам�ких долара</displayName>
-				<displayName count="one">бахам�ки долар</displayName>
-				<displayName count="other">бахам�ких долара</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Бутан�ки нгултрум</displayName>
-				<displayName count="few">бутан�ка нгултрумa</displayName>
-				<displayName count="many">бутан�ких нгултрумa</displayName>
-				<displayName count="one">бутан�ки нгултрум</displayName>
-				<displayName count="other">бутан�ких нгултра</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Бурман�ки кјат</displayName>
-				<displayName count="few">бурман�ка кјата</displayName>
-				<displayName count="many">бурман�ких кјата</displayName>
-				<displayName count="one">бурман�ки кјат</displayName>
-				<displayName count="other">бурман�ких кјата</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Боцван�ка пула</displayName>
-				<displayName count="few">боцван�ке пуле</displayName>
-				<displayName count="many">боцван�ких пула</displayName>
-				<displayName count="one">боцван�ка пула</displayName>
-				<displayName count="other">боцван�ких пула</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Белору�ка нова рубља (1994-1999)</displayName>
-				<displayName count="few">белору�ке нове рубља</displayName>
-				<displayName count="many">белору�ких нових рубљи</displayName>
-				<displayName count="one">белору�ка нова рубља</displayName>
-				<displayName count="other">белору�ких нових рубљи</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Белору�ка рубља</displayName>
-				<displayName count="few">белору�ке рубље</displayName>
-				<displayName count="many">белору�ких рубљи</displayName>
-				<displayName count="one">белору�ка рубља</displayName>
-				<displayName count="other">белору�ке рубље</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Белизе долар</displayName>
-				<displayName count="few">белизеан�ка долара</displayName>
-				<displayName count="many">белизеан�ких долара</displayName>
-				<displayName count="one">белизеан�ки долар</displayName>
-				<displayName count="other">белизеан�ких долара</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Канад�ки долар</displayName>
-				<displayName count="few">канад�ка долара</displayName>
-				<displayName count="many">Канад�ких долара</displayName>
-				<displayName count="one">канад�ки долар</displayName>
-				<displayName count="other">канад�ких долара</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Конгол�ки франак</displayName>
-				<displayName count="few">конгол�ка франка</displayName>
-				<displayName count="many">конгол�ких франака</displayName>
-				<displayName count="one">конгол�ки франак</displayName>
-				<displayName count="other">конгол�ких франака</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR евро</displayName>
-				<displayName count="few">WIR евра</displayName>
-				<displayName count="many">WIR евра</displayName>
-				<displayName count="one">WIR евро</displayName>
-				<displayName count="other">WIR евра</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Швајцар�ки франак</displayName>
-				<displayName count="few">швајцар�ка франка</displayName>
-				<displayName count="many">швајцар�ких франака</displayName>
-				<displayName count="one">швајцар�ки франак</displayName>
-				<displayName count="other">швајцар�ких франака</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR франак</displayName>
-				<displayName count="few">WIR франка</displayName>
-				<displayName count="many">WIR франака</displayName>
-				<displayName count="one">WIR франак</displayName>
-				<displayName count="other">WIR франака</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Чилеов�ки унидаде� �е фоменто</displayName>
-				<displayName count="few">чилеан�ка унидаде� де фомента</displayName>
-				<displayName count="many">чилеан�ких унидаде� де фомента</displayName>
-				<displayName count="one">чилеан�ки унидаде� де фоменто</displayName>
-				<displayName count="other">чилеан�ки унидаде�и де фоменто</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Чилеан�ки пезо</displayName>
-				<displayName count="few">чилеан�ка пезо�а</displayName>
-				<displayName count="many">чилеан�ких пезо�а</displayName>
-				<displayName count="one">чилеан�ки пезо</displayName>
-				<displayName count="other">чилеан�ки пезо�и</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Кине�ки јуан ренминби</displayName>
-				<displayName count="few">кине�ка јуан</displayName>
-				<displayName count="many">кине�ких јуанa</displayName>
-				<displayName count="one">кине�ки јуан</displayName>
-				<displayName count="other">кине�ких јуанa</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Колумбиј�ки пезо</displayName>
-				<displayName count="few">колумбиј�ка пезо�а</displayName>
-				<displayName count="many">колумбиј�ких пезо�а</displayName>
-				<displayName count="one">колумбиј�ки пезо</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Унидад де валоршки реал</displayName>
-				<displayName count="few">нидад де валор реала</displayName>
-				<displayName count="many">унидад де валоршких реала</displayName>
-				<displayName count="one">унидад де валоршки реал</displayName>
-				<displayName count="other">унидад де валоршких реала</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Ко�тарикан�ки колон</displayName>
-				<displayName count="few">ко�тарикан�ка колона</displayName>
-				<displayName count="many">ко�тарикан�ких колона</displayName>
-				<displayName count="one">ко�тарикан�ки колон</displayName>
-				<displayName count="other">ко�тарикан�ки колони</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Стари �рп�ки динар</displayName>
-				<displayName count="few">�тара �рп�ка динара</displayName>
-				<displayName count="many">�тарих �рп�ких динара</displayName>
-				<displayName count="one">�тари �рп�ки динар</displayName>
-				<displayName count="other">�тарих �рп�ких динара</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Чехо�ловачка тврда круна</displayName>
-				<displayName count="few">чехо�ловачке тврде круне</displayName>
-				<displayName count="many">чехо�ловачких тврдих круна</displayName>
-				<displayName count="one">чехо�ловачка тврда круна</displayName>
-				<displayName count="other">чехо�ловачких тврдих круна</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Кубан�ки пезо</displayName>
-				<displayName count="few">кубан�ка пезо�а</displayName>
-				<displayName count="many">кубан�ких пезо�а</displayName>
-				<displayName count="one">кубан�ки пезо�</displayName>
-				<displayName count="other">кубан�ких пезо�а</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Зеленорт�ки е�кудо</displayName>
-				<displayName count="few">зеленорт�ка е�куда</displayName>
-				<displayName count="many">зеленорт�ких е�куда</displayName>
-				<displayName count="one">зеленорт�ки е�кудо</displayName>
-				<displayName count="other">зеленорт�ких е�куда</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Кипар�ка фунта</displayName>
-				<displayName count="few">кипар�ке фунте</displayName>
-				<displayName count="many">кипар�ких фунти</displayName>
-				<displayName count="one">кипар�ка фунта</displayName>
-				<displayName count="other">кипар�ких фунти</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Чешка круна</displayName>
-				<displayName count="few">чешке круне</displayName>
-				<displayName count="many">чешких крунa</displayName>
-				<displayName count="one">чешка круна</displayName>
-				<displayName count="other">чешких круне</displayName>
-				<symbol>Кч</symbol>
-			</currency>
-			<currency type="DDM">
-				<displayName>И�точно-немачка марка</displayName>
-				<displayName count="few">и�точно-немачке марке</displayName>
-				<displayName count="many">и�точно-немачких марака</displayName>
-				<displayName count="one">и�точно-немачка марка</displayName>
-				<displayName count="other">и�точно-немачких марака</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>�емачка марка</displayName>
-				<displayName count="few">немачке марке</displayName>
-				<displayName count="many">немачких марака</displayName>
-				<displayName count="one">немачка марка</displayName>
-				<displayName count="other">немачких марака</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>�ибутан�ки франак</displayName>
-				<displayName count="few">џибут�ка франка</displayName>
-				<displayName count="many">џибут�ких франака</displayName>
-				<displayName count="one">џибут�ки франак</displayName>
-				<displayName count="other">џибут�ки франци</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Дан�ка круна</displayName>
-				<displayName count="few">дан�ке круне</displayName>
-				<displayName count="many">дан�ких круна</displayName>
-				<displayName count="one">дан�ка круна</displayName>
-				<displayName count="other">дан�ких круна</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Доминикан�ки пезо</displayName>
-				<displayName count="few">доминикан�ка пезо�а</displayName>
-				<displayName count="many">доминикан�ких пезо�а</displayName>
-				<displayName count="one">доминикан�ки пезо</displayName>
-				<displayName count="other">доминикан�ких пезо�а</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�лжир�ки динар</displayName>
-				<displayName count="few">алжир�ка динара</displayName>
-				<displayName count="many">алжир�ких динара</displayName>
-				<displayName count="one">алжир�ки динар</displayName>
-				<displayName count="other">алжир�ких динара</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Еквадор�ки �акр</displayName>
-				<displayName count="few">еквадор�ка �акра</displayName>
-				<displayName count="many">еквадор�ких �акра</displayName>
-				<displayName count="one">еквадор�ки �акр</displayName>
-				<displayName count="other">еквадор�ких �акра</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Еквадор�ки унидад де валор кон�танте</displayName>
-				<displayName count="few">еквадор�ка унидад де валор кон�танта</displayName>
-				<displayName count="many">еквадор�ких унидад де валор кон�танта</displayName>
-				<displayName count="one">еквадор�ки унидад де валор кон�танте</displayName>
-				<displayName count="other">еквадор�ких унидад де валор кон�танта</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Е�тон�ка кроон</displayName>
-				<displayName count="few">е�тон�ке круне</displayName>
-				<displayName count="many">е�тон�ких круна</displayName>
-				<displayName count="one">е�тон�ка круна</displayName>
-				<displayName count="other">е�тон�ких круна</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Египат�ка фунта</displayName>
-				<displayName count="few">египат�ке фунте</displayName>
-				<displayName count="many">египат�ких фунти</displayName>
-				<displayName count="one">египат�ка фунта</displayName>
-				<displayName count="other">египат�ких фунти</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Еритреан�ка накфа</displayName>
-				<displayName count="few">еритреј�ке накфе</displayName>
-				<displayName count="many">еритреј�ких накфи</displayName>
-				<displayName count="one">еритреј�ка накфа</displayName>
-				<displayName count="other">еритреан�ких накфки</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Шпан�ка пезета (рачун)</displayName>
-				<displayName count="few">шпан�ке пезете (� рачун)</displayName>
-				<displayName count="many">шпан�ких пезета (� рачун)</displayName>
-				<displayName count="one">шпан�ка пезета (� рачун)</displayName>
-				<displayName count="other">шпан�ких пезета (� рачун)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Шпан�ка пезета (конвертибилнирачун)</displayName>
-				<displayName count="few">шпан�ке пезете (конвертибилан рачун)</displayName>
-				<displayName count="many">шпан�ких пезета (конвертибилан рачун)</displayName>
-				<displayName count="one">шпан�ка пезета (конвертибилан рачун)</displayName>
-				<displayName count="other">шпан�ких пезета</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Шпан�ка пезета</displayName>
-				<displayName count="few">шпан�ка пезета</displayName>
-				<displayName count="many">шпан�ких пезета (ESP)</displayName>
-				<displayName count="one">шпан�ка пезета</displayName>
-				<displayName count="other">шпан�ке пезете</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>етиопиј�ки бир</displayName>
-				<displayName count="few">етиопиј�ка бира</displayName>
-				<displayName count="many">етиопиј�ких бира</displayName>
-				<displayName count="one">етиопиј�ки бир</displayName>
-				<displayName count="other">етиопиј�ких бира</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Евро</displayName>
-				<displayName count="few">евра</displayName>
-				<displayName count="many">евра</displayName>
-				<displayName count="one">евро</displayName>
-				<displayName count="other">евра</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Фин�ка марка</displayName>
-				<displayName count="few">фин�ке марке</displayName>
-				<displayName count="many">фин�ких марака</displayName>
-				<displayName count="one">фин�ка марка</displayName>
-				<displayName count="other">фин�ких марака</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Фиџи долар</displayName>
-				<displayName count="few">фиџŸи долара</displayName>
-				<displayName count="many">фиџи долара</displayName>
-				<displayName count="one">фиџи долар</displayName>
-				<displayName count="other">фиџи долара</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Фокланд�ка о�трва фунта</displayName>
-				<displayName count="few">фолкланд�ке фунте</displayName>
-				<displayName count="many">фолкланд�ких фунти</displayName>
-				<displayName count="one">фолкланд�ка фунта</displayName>
-				<displayName count="other">фолкланд�ких фунти</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Францу�ки франак</displayName>
-				<displayName count="few">францу�ка франка</displayName>
-				<displayName count="many">францу�ких франака</displayName>
-				<displayName count="one">францу�ки франак</displayName>
-				<displayName count="other">францу�ких франака</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Британ�ка фунта �терлинга</displayName>
-				<displayName count="few">британ�ке фунте �терлинга</displayName>
-				<displayName count="many">британ�ких фунти �терлинга</displayName>
-				<displayName count="one">британ�ка фунта �терлинга</displayName>
-				<displayName count="other">британ��ких фунти �терлинга</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Грузиј�ки купон ларит</displayName>
-				<displayName count="few">грузиј�ка купон ларита</displayName>
-				<displayName count="many">грузиј�ких купон ларита</displayName>
-				<displayName count="one">грузиј�ки купон ларит</displayName>
-				<displayName count="other">грузиј�ких купон ларита</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Грузиј�ки лари</displayName>
-				<displayName count="few">грузиј�ка лари�а</displayName>
-				<displayName count="many">грузиј�ких лари�а</displayName>
-				<displayName count="one">грузиј�ки лари�</displayName>
-				<displayName count="other">грузиј�ких лари�а</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ган�ки цеди (1979-2007)</displayName>
-				<displayName count="few">ган�ка цеда (GHC)</displayName>
-				<displayName count="many">ган�ких цеда (GHC)</displayName>
-				<displayName count="one">ган�ки цед (GHC)</displayName>
-				<displayName count="other">ган�ких цеда (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ган�ки цеди</displayName>
-				<displayName count="few">ган�ка цеда</displayName>
-				<displayName count="many">ган�ких цеда</displayName>
-				<displayName count="one">ган�ки цед</displayName>
-				<displayName count="other">ган�ких цеда</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Гибралташка фунта</displayName>
-				<displayName count="few">гибралтар�ке фунте</displayName>
-				<displayName count="many">гибралтар�ких фунти</displayName>
-				<displayName count="one">гибралтар�ка фунта</displayName>
-				<displayName count="other">гибралтар�ких фунти</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Гамбиј�ки дала�и</displayName>
-				<displayName count="few">гамбиј�ка дала�а</displayName>
-				<displayName count="many">гамбиј�ких дала�а</displayName>
-				<displayName count="one">гамбиј�ки дала�</displayName>
-				<displayName count="other">гамбиј�ких дала�а</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Гвинеј�ки франак</displayName>
-				<displayName count="few">гвинеј�ка франка</displayName>
-				<displayName count="many">гвинеј�ких франака</displayName>
-				<displayName count="one">гвинеј�ки франак</displayName>
-				<displayName count="other">гвинеј�ки франци</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Гвинеј�ки �или</displayName>
-				<displayName count="few">гвинеј�ка �ила</displayName>
-				<displayName count="many">гвинеј�ких �ила</displayName>
-				<displayName count="one">гвинеј�ки �или</displayName>
-				<displayName count="other">гвинеј�ких �ила</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Екваторијално-гвинеј�ки еквеле</displayName>
-				<displayName count="few">екваторијално-гвинеј�ка еквела</displayName>
-				<displayName count="many">екваторијално-гвинеј�ких еквела</displayName>
-				<displayName count="one">екваторијално-гвинеј�ки еквеле</displayName>
-				<displayName count="other">екваторијално-гвинеј�ких еквела</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Грчка драхма</displayName>
-				<displayName count="few">грчке драхме</displayName>
-				<displayName count="many">драхми</displayName>
-				<displayName count="one">грчка драхма</displayName>
-				<displayName count="other">грчких драхми</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Гватемал�ки квецал</displayName>
-				<displayName count="few">гватемал�ка квецала</displayName>
-				<displayName count="many">гватемал�ких квецала</displayName>
-				<displayName count="one">гватемал�ки квецал</displayName>
-				<displayName count="other">гватемал�ких квецала</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>португал�ка гвинеја е�кудо</displayName>
-				<displayName count="few">португал�ко-гвинеј�ка е�куда</displayName>
-				<displayName count="many">португал�ких гвинеја е�кудо</displayName>
-				<displayName count="one">португал�ко-гвинеј�ки е�кудо</displayName>
-				<displayName count="other">португал�ко-гвинеј�ких е�куда</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Гвинеја Би�ао Пезо</displayName>
-				<displayName count="few">гвинеја-би�аошка пезо�а</displayName>
-				<displayName count="many">гвинеја-би�аошких пезо�а</displayName>
-				<displayName count="one">гвинеја-би�аошки пезо</displayName>
-				<displayName count="other">гвинеја-би�аошких пезо�а</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Гујан�ки долар</displayName>
-				<displayName count="few">гвајан�ка долара</displayName>
-				<displayName count="many">гвајан�ких долара</displayName>
-				<displayName count="one">гвајан�ки долар</displayName>
-				<displayName count="other">GYD</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Хонгконшки долар</displayName>
-				<displayName count="few">хонгконшка долара</displayName>
-				<displayName count="many">хонгконшких долара</displayName>
-				<displayName count="one">хонгконшки долар</displayName>
-				<displayName count="other">хонгконшких долара</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Хондурашка лемпира</displayName>
-				<displayName count="few">хондурашка лемпира</displayName>
-				<displayName count="many">хондурашких лемпира</displayName>
-				<displayName count="one">хондурашки лемпир</displayName>
-				<displayName count="other">хондурашких лемпира</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Хрват�ки динар</displayName>
-				<displayName count="few">хрват�ка динара</displayName>
-				<displayName count="many">хрват�ких динара</displayName>
-				<displayName count="one">хрват�ки динар</displayName>
-				<displayName count="other">хрват�ких динара</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Хрват�ка куна</displayName>
-				<displayName count="few">хрват�ке куне</displayName>
-				<displayName count="many">хрват�ких куна</displayName>
-				<displayName count="one">хрват�ка куна</displayName>
-				<displayName count="other">хрват�ких куна</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Хаићан�ки гурд</displayName>
-				<displayName count="few">хаићан�ка гурда</displayName>
-				<displayName count="many">хаићан�ких гурда</displayName>
-				<displayName count="one">хаићан�ки гурд</displayName>
-				<displayName count="other">хаићан�ких гурда</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Мађар�ка форинта</displayName>
-				<displayName count="few">мађар�ке форинте</displayName>
-				<displayName count="many">мађар�ких форинти</displayName>
-				<displayName count="one">мађар�ка форинта</displayName>
-				<displayName count="other">мађар�ке форинте</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Индонезиј�ка рупиа</displayName>
-				<displayName count="few">индонежан�ке рупије</displayName>
-				<displayName count="many">индонежан�ких рупија</displayName>
-				<displayName count="one">индонежан�ка рупија</displayName>
-				<displayName count="other">индонежан�ке рупије</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ир�ка фунта</displayName>
-				<displayName count="few">ир�ке фунте</displayName>
-				<displayName count="many">ир�ких фунти</displayName>
-				<displayName count="one">ир�ка фунта</displayName>
-				<displayName count="other">ир�ких фунти</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Израел�ка фунта</displayName>
-				<displayName count="few">израел�ке фунте</displayName>
-				<displayName count="many">израел�ких фунти</displayName>
-				<displayName count="one">израел�ка фунта</displayName>
-				<displayName count="other">израел�ких фунти</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>�тари израел�ки шекели</displayName>
-				<displayName count="few">�тари израел�ки шекели</displayName>
-				<displayName count="many">�тари израел�ки шекели</displayName>
-				<displayName count="one">�тари израел�ки шекели</displayName>
-				<displayName count="other">�тари израел�ки шекели</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Израел�ки нови шекел</displayName>
-				<displayName count="few">израел�ка нова шекела</displayName>
-				<displayName count="many">израел�ких нових шекела</displayName>
-				<displayName count="one">израел�ки нови шекел</displayName>
-				<displayName count="other">израел�ких нових шекела</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Индиј�ки Рупи</displayName>
-				<displayName count="few">индиј�ке рупије</displayName>
-				<displayName count="many">индиј�ких рупија</displayName>
-				<displayName count="one">индиј�ка рупија</displayName>
-				<displayName count="other">индиј�ких рупија</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ирачки динар</displayName>
-				<displayName count="few">ирачка динара</displayName>
-				<displayName count="many">ирачких динара</displayName>
-				<displayName count="one">ирачки динар</displayName>
-				<displayName count="other">ирачки динари</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Иран�ки риал</displayName>
-				<displayName count="few">иран�ка ријала</displayName>
-				<displayName count="many">иран�ких ријала</displayName>
-				<displayName count="one">иран�ки ријал</displayName>
-				<displayName count="other">ираниј�ки ријали</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>�тара и�ланд�ка круна</displayName>
-				<displayName count="few">�тара и�ланд�ка круна</displayName>
-				<displayName count="many">�тара и�ланд�ка круна</displayName>
-				<displayName count="one">�тара и�ланд�ка круна</displayName>
-				<displayName count="other">�тара и�ланд�ка круна</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>И�ланд�ка круна</displayName>
-				<displayName count="few">и�ланд�ке круне</displayName>
-				<displayName count="many">и�ланд�ких круна</displayName>
-				<displayName count="one">и�ланд�ка круна</displayName>
-				<displayName count="other">и�ланд�ке круне</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Италијан�ка лира</displayName>
-				<displayName count="few">италијан�ке лире</displayName>
-				<displayName count="many">италијан�ких лира</displayName>
-				<displayName count="one">италијан�ка лира</displayName>
-				<displayName count="other">италијан�ке лире</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Јамај�ки долар</displayName>
-				<displayName count="few">јамај�ка долара</displayName>
-				<displayName count="many">јамај�ких долара</displayName>
-				<displayName count="one">јамај�ки долар</displayName>
-				<displayName count="other">јамај�ких долара</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Јордан�ки динар</displayName>
-				<displayName count="few">јордан�ких динара</displayName>
-				<displayName count="many">јордан�ких динара</displayName>
-				<displayName count="one">јордан�ких динара</displayName>
-				<displayName count="other">јордан�ких динара</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Јапан�ки јен</displayName>
-				<displayName count="few">јапан�ка јена</displayName>
-				<displayName count="many">јапан�ких јена</displayName>
-				<displayName count="one">јапан�ки јен</displayName>
-				<displayName count="other">јапан�ки јен</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Кениј�ки шилинг</displayName>
-				<displayName count="few">кениј�ка шилинга</displayName>
-				<displayName count="many">кениј�ких шилинга</displayName>
-				<displayName count="one">кениј�ки шилинг</displayName>
-				<displayName count="other">кениј�ких шилинга</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Кирги�тан�ки �ом</displayName>
-				<displayName count="few">кирги�тан�ка �ома</displayName>
-				<displayName count="many">кирги�тан�ких �ома</displayName>
-				<displayName count="one">кирги�тан�ки �ом</displayName>
-				<displayName count="other">кирги�тан�ких �ома</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Камбоџиј�ки риел</displayName>
-				<displayName count="few">камбоџан�ка ријела</displayName>
-				<displayName count="many">камбоџан�ких ријела</displayName>
-				<displayName count="one">камбоџан�ки ријел</displayName>
-				<displayName count="other">камбоџан�ких ријела</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Комор�ки франак</displayName>
-				<displayName count="few">коморан�ка франка</displayName>
-				<displayName count="many">коморан�ких франака</displayName>
-				<displayName count="one">коморан�ки франак</displayName>
-				<displayName count="other">коморан�ки франци</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Севернокореј�ки вон</displayName>
-				<displayName count="few">�евернокореј�ка вона</displayName>
-				<displayName count="many">�евернокореј�ких вона</displayName>
-				<displayName count="one">�евернокореј�ки вон</displayName>
-				<displayName count="other">�евернокореј�ки вон</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Јужнокореј�ки Вон</displayName>
-				<displayName count="few">јужнокореј�ка вона</displayName>
-				<displayName count="many">јужнокореј�ких вона</displayName>
-				<displayName count="one">јужнокореј�ки вон</displayName>
-				<displayName count="other">јужнокореј�ки вон</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Кувајт�ки динар</displayName>
-				<displayName count="few">кувајт�ких динара</displayName>
-				<displayName count="many">кувајт�ких динара</displayName>
-				<displayName count="one">кувајт�ких динара</displayName>
-				<displayName count="other">кувајт�ких динара</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Кајман�ка о�трва долар</displayName>
-				<displayName count="few">кајман�ка долара</displayName>
-				<displayName count="many">кајман�ких долара</displayName>
-				<displayName count="one">кајман�ки долар</displayName>
-				<displayName count="other">кајман�ких долара</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Казах�тан�ки тенџ</displayName>
-				<displayName count="few">казах�тан�ке тенџе</displayName>
-				<displayName count="many">казах�тан�ких тенџи</displayName>
-				<displayName count="one">казах�тан�ка тенџа</displayName>
-				<displayName count="other">казах�тан�ких тенџи</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Лаошки кип</displayName>
-				<displayName count="few">лаошка кипа</displayName>
-				<displayName count="many">лаошких кипа</displayName>
-				<displayName count="one">лаошки кип</displayName>
-				<displayName count="other">лаошки кипи</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Лебан�ка фунта</displayName>
-				<displayName count="few">лебан�ке фунте</displayName>
-				<displayName count="many">лебан�ких фунти</displayName>
-				<displayName count="one">лебан�ка фунта</displayName>
-				<displayName count="other">лебан�ке фунте</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Шриланкан�ки рупи</displayName>
-				<displayName count="few">шриланкан�ка рупија</displayName>
-				<displayName count="many">шриланкан�ких рупија</displayName>
-				<displayName count="one">шриланкан�ки рупиј</displayName>
-				<displayName count="other">шриланкан�ких рупија</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Либериј�ки долар</displayName>
-				<displayName count="few">либериј�ка долара</displayName>
-				<displayName count="many">либериј�ких долара</displayName>
-				<displayName count="one">либериј�ки долар</displayName>
-				<displayName count="other">либериј�ких долара</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Ле�ото лоти</displayName>
-				<displayName count="few">ле�от�ка лоти�а</displayName>
-				<displayName count="many">ле�от�ких лоти�а</displayName>
-				<displayName count="one">ле�от�ки лоти�</displayName>
-				<displayName count="other">ле�от�ких лоти�а</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Литван�ки лита�</displayName>
-				<displayName count="few">литван�ка лита�а</displayName>
-				<displayName count="many">литван�ких лита�а</displayName>
-				<displayName count="one">литван�ки лита�</displayName>
-				<displayName count="other">литван�ких лита�а</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Литван�ки талона�</displayName>
-				<displayName count="few">литван�ка талона�а</displayName>
-				<displayName count="many">литван�ких талона�а</displayName>
-				<displayName count="one">литван�ки талона�</displayName>
-				<displayName count="other">литван�ких талона�а</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Лук�ембуршки конвертибилни франак</displayName>
-				<displayName count="few">лук�ембуршка конвертибилна франка</displayName>
-				<displayName count="many">лук�ембуршких конвертибилних франака</displayName>
-				<displayName count="one">лук�ембуршки конвертибилни франак</displayName>
-				<displayName count="other">лук�ембуршких конвертибилних франака</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Лук�ембуршки франак</displayName>
-				<displayName count="few">лук�ембуршка франка</displayName>
-				<displayName count="many">лук�ембуршких франака</displayName>
-				<displayName count="one">лук�ембуршки франак</displayName>
-				<displayName count="other">лук�ембуршки франци</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Лук�ембуршки финан�иј�ки франак</displayName>
-				<displayName count="few">лук�ембуршка финан�иј�ка франка</displayName>
-				<displayName count="many">лук�ембуршких финан�иј�ких франака</displayName>
-				<displayName count="one">лук�ембуршки финан�иј�ки франак</displayName>
-				<displayName count="other">лук�ембуршких финан�иј�ких франака</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Латвиј�ки лати</displayName>
-				<displayName count="few">латвиј�ка лата</displayName>
-				<displayName count="many">латвиј�ких лата</displayName>
-				<displayName count="one">латвиј�ки лат</displayName>
-				<displayName count="other">латвиј�ких лата</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>атвиј�ка рубља</displayName>
-				<displayName count="few">латвиј�ке рубље</displayName>
-				<displayName count="many">латвиј�ких рубљи</displayName>
-				<displayName count="one">латвиј�ка рубља</displayName>
-				<displayName count="other">латвиј�ких рубљи</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Либиј�ки динар</displayName>
-				<displayName count="few">либиј�ких динара</displayName>
-				<displayName count="many">либиј�ких динара</displayName>
-				<displayName count="one">либиј�ких динара</displayName>
-				<displayName count="other">либиј�ких динара</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Марокан�ки дирхам</displayName>
-				<displayName count="few">марокан�ке дирхаме</displayName>
-				<displayName count="many">марокан�ких дирхама</displayName>
-				<displayName count="one">марокан�ка дирхама</displayName>
-				<displayName count="other">марокан�ких дирхама</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Марокан�ки франак</displayName>
-				<displayName count="few">марокан�ка франка</displayName>
-				<displayName count="many">марокан�ких франака</displayName>
-				<displayName count="one">марокан�ки франак</displayName>
-				<displayName count="other">марокан�ких франака</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Молдов�ки љу</displayName>
-				<displayName count="few">молдов�ка леија</displayName>
-				<displayName count="many">молдов�ких леија</displayName>
-				<displayName count="one">молдов�ки леи</displayName>
-				<displayName count="other">молдов�ких леија</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Малага�иј�ки ариари</displayName>
-				<displayName count="few">малагашај�ка ариарија</displayName>
-				<displayName count="many">малагашај�ких ариарија</displayName>
-				<displayName count="one">малагашај�ки ариариј</displayName>
-				<displayName count="other">малагашај�ки ариарији</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Малага�иј�ки франак</displayName>
-				<displayName count="few">малагашај�ка франка</displayName>
-				<displayName count="many">малагашај�ких франака</displayName>
-				<displayName count="one">малагашај�ки франак</displayName>
-				<displayName count="other">малагашај�ки франци</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Македон�ки денар</displayName>
-				<displayName count="few">македон�ка денара</displayName>
-				<displayName count="many">македон�ких денара</displayName>
-				<displayName count="one">македон�ки денар</displayName>
-				<displayName count="other">македон�ких динара</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Малијан�ки франак</displayName>
-				<displayName count="few">малиј�ка франка</displayName>
-				<displayName count="many">малиј�ких франака</displayName>
-				<displayName count="one">малиј�ки франак</displayName>
-				<displayName count="other">малиј�ких франака</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Мјанмашки кјат</displayName>
-				<displayName count="few">мијанмашка кјата</displayName>
-				<displayName count="many">мијанмашких кјата</displayName>
-				<displayName count="one">мијанмашки кјат</displayName>
-				<displayName count="other">мијанмашки кјати</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Монгол�ки тугрик</displayName>
-				<displayName count="few">монголиј�ка тугрика</displayName>
-				<displayName count="many">монголиј�ких тугрика</displayName>
-				<displayName count="one">монголиј�ки тугрик</displayName>
-				<displayName count="other">монголиј�ки тугрици</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Маканишка патака</displayName>
-				<displayName count="few">маканешке патаке</displayName>
-				<displayName count="many">маканешких патака</displayName>
-				<displayName count="one">маканешка патака</displayName>
-				<displayName count="other">маканешких патака</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Мауританиј�ка угвија</displayName>
-				<displayName count="few">мауританиј�ке угвиље</displayName>
-				<displayName count="many">мауританиј�ких угвиља</displayName>
-				<displayName count="one">мауританиј�ка угвиља</displayName>
-				<displayName count="other">мауританиј�ке угвиље</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Малтешка лира</displayName>
-				<displayName count="few">малтешке лире</displayName>
-				<displayName count="many">малтешких лира</displayName>
-				<displayName count="one">малтешка лира</displayName>
-				<displayName count="other">малтешких лира</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Малтешка фунта</displayName>
-				<displayName count="few">малтешке фунте</displayName>
-				<displayName count="many">малтешких фунти</displayName>
-				<displayName count="one">малтешка фунта</displayName>
-				<displayName count="other">малтешких фунти</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Маурициј�ки рупи</displayName>
-				<displayName count="few">мауританиј�ке рупије</displayName>
-				<displayName count="many">мауританиј�ких рупија</displayName>
-				<displayName count="one">мауританиј�ка рупија</displayName>
-				<displayName count="other">мауританиј�ке рупије</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Малдивиј�ка руфија</displayName>
-				<displayName count="few">малдив�ка руфија�а</displayName>
-				<displayName count="many">малдив�ких руфија�а</displayName>
-				<displayName count="one">малдив�ки руфија�</displayName>
-				<displayName count="other">малдив�ких руфија�а</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Малавиј�ка квача</displayName>
-				<displayName count="few">малавиј�ке кваче</displayName>
-				<displayName count="many">малавиј�ких квача</displayName>
-				<displayName count="one">малавиј�ка квача</displayName>
-				<displayName count="other">малавиј�ких квача</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Мек�ички пезо</displayName>
-				<displayName count="few">мек�ичка пезо�а</displayName>
-				<displayName count="many">мек�ичких пезо�а</displayName>
-				<displayName count="one">мек�ички пезо</displayName>
-				<displayName count="other">мек�ичких пезо�а</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Мек�ички �ребрни пезо (1861-1992)</displayName>
-				<displayName count="few">мек�ичка �ребрна пезо�а</displayName>
-				<displayName count="many">мек�ичких �ребрних пезо�а</displayName>
-				<displayName count="one">мек�ички �ребрни пезо</displayName>
-				<displayName count="other">мек�ичких �ребрних пезо�а</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Мек�ички унидад де инвер�ион (UDI)</displayName>
-				<displayName count="few">мек�ичка унидад� де инверзиона</displayName>
-				<displayName count="many">мек�ичких унидад� де инверзиона</displayName>
-				<displayName count="one">мек�ички унидад� де инверзион</displayName>
-				<displayName count="other">мек�ичких унидад� де инверзиона</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Малезиј�ки ринггит</displayName>
-				<displayName count="few">малезиј�ка ринггита</displayName>
-				<displayName count="many">малезиј�ких ринггита</displayName>
-				<displayName count="one">малезиј�ки ринггит</displayName>
-				<displayName count="other">малезиј�ких ринггита</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Мозамбиј�ки е�кудо</displayName>
-				<displayName count="few">мозамбиј�ка е�куда</displayName>
-				<displayName count="many">мозамбиј�ких е�куда</displayName>
-				<displayName count="one">мозамбиј�ки е�кудо</displayName>
-				<displayName count="other">мозамбиј�ких е�куда</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Стари мозамбиј�ки метикал</displayName>
-				<displayName count="few">�тара мозамбиј�ка метикала</displayName>
-				<displayName count="many">�тарих мозамбиј�ких метикала</displayName>
-				<displayName count="one">�тари мозамбиј�ки метикал</displayName>
-				<displayName count="other">�тарих мозамбиј�ких метикала</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Мозамбиј�ки метикал</displayName>
-				<displayName count="few">мозамбиј�ка метикала</displayName>
-				<displayName count="many">мозамбиј�ких метикала</displayName>
-				<displayName count="one">мозамбиј�ки метикал</displayName>
-				<displayName count="other">мозамбиј�ких метикала</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>намбиј�ки долар</displayName>
-				<displayName count="few">намибиј�ка долара</displayName>
-				<displayName count="many">намибиј�ких долара</displayName>
-				<displayName count="one">намибиј�ки долар</displayName>
-				<displayName count="other">намибиј�ких долара</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�игериј�ка наира</displayName>
-				<displayName count="few">нигериј�ке наире</displayName>
-				<displayName count="many">нигериј�ких наира</displayName>
-				<displayName count="one">нигериј�ка наира</displayName>
-				<displayName count="other">нигериј�ких наира</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>�икарагван�ка кордоба</displayName>
-				<displayName count="few">никарагван�ке кордобе</displayName>
-				<displayName count="many">никарагван�ких кордоба</displayName>
-				<displayName count="one">никарагван�ка кордоба</displayName>
-				<displayName count="other">никарагван�ких кордоба</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>�икарагван�ка златна кордоба</displayName>
-				<displayName count="few">никарагван�ке златне кордобе</displayName>
-				<displayName count="many">никарагван�ких златних кордоба</displayName>
-				<displayName count="one">никарагван�ка златна кордоба</displayName>
-				<displayName count="other">никарагван�ких златних кордоба</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Холанд�ки гулден</displayName>
-				<displayName count="few">холанд�ка гулдена</displayName>
-				<displayName count="many">холанд�ких гулдена</displayName>
-				<displayName count="one">холанд�ки гулден</displayName>
-				<displayName count="other">холанд�ких гулдена</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>�орвешка круна</displayName>
-				<displayName count="few">норвешке круне</displayName>
-				<displayName count="many">норвешких круна</displayName>
-				<displayName count="one">норвешка круна</displayName>
-				<displayName count="other">норвешких круна</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�епал�ки рупи</displayName>
-				<displayName count="few">непал�ке рупије</displayName>
-				<displayName count="many">непал�ких рупија</displayName>
-				<displayName count="one">непал�ка рупија</displayName>
-				<displayName count="other">непал�ких рупија</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�овозеланд�ки долар</displayName>
-				<displayName count="few">новозеланд�ка долара</displayName>
-				<displayName count="many">новозеланд�ких долара</displayName>
-				<displayName count="one">новозеланд�ки долар</displayName>
-				<displayName count="other">новозеланд�ких долара</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Оман�ки ријал</displayName>
-				<displayName count="few">оман�ких ријала</displayName>
-				<displayName count="many">оман�ких ријала</displayName>
-				<displayName count="one">оман�ких ријала</displayName>
-				<displayName count="other">оман�ких ријала</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Панам�ка балбоа</displayName>
-				<displayName count="few">панам�ке балбое</displayName>
-				<displayName count="many">панам�ких балбоа</displayName>
-				<displayName count="one">панам�ка балбоа</displayName>
-				<displayName count="other">панам�ких балбоа</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Перуан�ки инти</displayName>
-				<displayName count="few">перувиј�ка интија</displayName>
-				<displayName count="many">перувиј�ких интија</displayName>
-				<displayName count="one">перувиј�ки инти</displayName>
-				<displayName count="other">перувиј�ких интија</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Перуан�ки нуево �ол</displayName>
-				<displayName count="few">перуан�ка нуево �ола</displayName>
-				<displayName count="many">перуан�ких нуево �ола</displayName>
-				<displayName count="one">перуан�ки нуево �ол</displayName>
-				<displayName count="other">перуан�ких нуево �ола</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Перуан�ки �ол</displayName>
-				<displayName count="few">перуан�ка �ола</displayName>
-				<displayName count="many">перуан�ких �ола</displayName>
-				<displayName count="one">перуан�ки �ол</displayName>
-				<displayName count="other">перуан�ких �ола</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Папуа ново-гвинејшка кина</displayName>
-				<displayName count="few">папуа ново гвинеј�ка долара</displayName>
-				<displayName count="many">папуа ново гвинеј�ких долара</displayName>
-				<displayName count="one">папуа ново гвинеј�ки долар</displayName>
-				<displayName count="other">папуа ново гвинеј�ких долара</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Филипин�ки пезо</displayName>
-				<displayName count="few">филипин�ка пезо�а</displayName>
-				<displayName count="many">филипин�ких пезо�а</displayName>
-				<displayName count="one">филипин�ки пезо</displayName>
-				<displayName count="other">филипин�ких пезо�а</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Паки�тан�ки рупи</displayName>
-				<displayName count="few">паки�тан�ке рупије</displayName>
-				<displayName count="many">паки�тан�ких рупија</displayName>
-				<displayName count="one">паки�тан�ка рупија</displayName>
-				<displayName count="other">паки�тан�ке рупије</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Пољ�ки злот</displayName>
-				<displayName count="few">пољ�ка злота</displayName>
-				<displayName count="many">пољ�ких злота</displayName>
-				<displayName count="one">пољ�ки злот</displayName>
-				<displayName count="other">пољ�ких злота</displayName>
-				<symbol>зл</symbol>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Пољ�ки злоти (1950-1995)</displayName>
-				<displayName count="few">пољ�ка злота (PLZ)</displayName>
-				<displayName count="many">пољ�ких злота (PLZ)</displayName>
-				<displayName count="one">пољ�ки злот (PLZ)</displayName>
-				<displayName count="other">пољ�ких злота (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Португал�ки е�кудо</displayName>
-				<displayName count="few">португал�ка е�куда</displayName>
-				<displayName count="many">португал�ких е�куда</displayName>
-				<displayName count="one">португал�ки е�кудо</displayName>
-				<displayName count="other">португал�ких е�куда</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Парагвај�ки гуарни</displayName>
-				<displayName count="few">парагвај�ка гваранија</displayName>
-				<displayName count="many">парагвај�ких гваранија</displayName>
-				<displayName count="one">парагвај�ки гвараниј</displayName>
-				<displayName count="other">парагвај�ки гваранији</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Катаршки ријал</displayName>
-				<displayName count="few">катар�ка ријала</displayName>
-				<displayName count="many">катар�ких ријала</displayName>
-				<displayName count="one">катар�ки ријал</displayName>
-				<displayName count="other">катар�ких ријала</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Родеј�кидолар</displayName>
-				<displayName count="few">родежан�ка долара</displayName>
-				<displayName count="many">родежан�ких долара</displayName>
-				<displayName count="one">родежан�ки долар</displayName>
-				<displayName count="other">родежан�ких долара</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Стари румун�ки љу</displayName>
-				<displayName count="few">�тара румун�ка леија</displayName>
-				<displayName count="many">�тарих румун�ких леија</displayName>
-				<displayName count="one">�тари румун�ки леиј</displayName>
-				<displayName count="other">�тарих румун�ких леија</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Румун�ки леу</displayName>
-				<displayName count="few">румун�ка леија</displayName>
-				<displayName count="many">румун�ких леија</displayName>
-				<displayName count="one">румун�ки леи</displayName>
-				<displayName count="other">румун�ких леија</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Срп�ки динар</displayName>
-				<displayName count="few">�рп�ка динара</displayName>
-				<displayName count="many">�рп�ких динара</displayName>
-				<displayName count="one">�рп�ки динар</displayName>
-				<displayName count="other">�рп�ки динари</displayName>
-				<symbol>дин.</symbol>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ру�ка рубља</displayName>
-				<displayName count="few">ру�ке рубље</displayName>
-				<displayName count="many">ру�ких рубљи</displayName>
-				<displayName count="one">ру�ка рубља</displayName>
-				<displayName count="other">ру�ких рубљи</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ру�ка рубља (1991-1998)</displayName>
-				<displayName count="few">ру�ке рубље (1991-1998)</displayName>
-				<displayName count="many">ру�ких рубљи (RUR)</displayName>
-				<displayName count="one">ру�ка рубља (1991-1998)</displayName>
-				<displayName count="other">ру�ких рубљи (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Руандан�ки франак</displayName>
-				<displayName count="few">руандан�ка франка</displayName>
-				<displayName count="many">руандан�ких франака</displayName>
-				<displayName count="one">руандан�ки франак</displayName>
-				<displayName count="other">руандан�ки франци</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Саудиј�ки ријал</displayName>
-				<displayName count="few">�аудиј�ка ријала</displayName>
-				<displayName count="many">�аудиј�ких ријала</displayName>
-				<displayName count="one">�аудиј�ки ријал</displayName>
-				<displayName count="other">�аудиј�ких ријала</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Соломон�ко-о�трв�ки долар</displayName>
-				<displayName count="few">�оломон�ко-о�трв�ка долара</displayName>
-				<displayName count="many">�оломон�ко-о�трв�ких долара</displayName>
-				<displayName count="one">�оломон�ко-о�трв�ки долар</displayName>
-				<displayName count="other">�оломон�ко-о�трв�ких долара</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Сејшел�ка рупија</displayName>
-				<displayName count="few">�ејшел�ке рупије</displayName>
-				<displayName count="many">�ејшел�ких рупија</displayName>
-				<displayName count="one">�ејшел�ка рупија</displayName>
-				<displayName count="other">�ејшел�ких рупија</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Стари �удан�ки динар</displayName>
-				<displayName count="few">�тара �удан�ка динара</displayName>
-				<displayName count="many">�тарих �удан�ких динара</displayName>
-				<displayName count="one">�тари �удан�ки динар</displayName>
-				<displayName count="other">�тарих �удан�ких динара</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Судан�ка фунта</displayName>
-				<displayName count="few">�удан�ке фунте</displayName>
-				<displayName count="many">�удан�ких фунти</displayName>
-				<displayName count="one">�удан�ка фунта</displayName>
-				<displayName count="other">�удан�ких фунти</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Стара �удан�ка фунта</displayName>
-				<displayName count="few">�таре �удан�ке фунте</displayName>
-				<displayName count="many">�тарих �удан�ких фунти</displayName>
-				<displayName count="one">�тара �удан�ка фунта</displayName>
-				<displayName count="other">�тарих �удан�ких фунти</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Швед�ка круна</displayName>
-				<displayName count="few">швед�ке круне</displayName>
-				<displayName count="many">швед�ких круна</displayName>
-				<displayName count="one">швед�ка круна</displayName>
-				<displayName count="other">швед�ких круна</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Сингапур�ки долар</displayName>
-				<displayName count="few">�ингапур�ка долара</displayName>
-				<displayName count="many">�ингапур�ких долара</displayName>
-				<displayName count="one">�ингапур�ки долар</displayName>
-				<displayName count="other">�ингапур�ких долара</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Св. јелен�ка фунта</displayName>
-				<displayName count="few">�в. јелен�ке фунте</displayName>
-				<displayName count="many">�в. јелен�ких фунти</displayName>
-				<displayName count="one">�в. јелен�ка фунта</displayName>
-				<displayName count="other">�в. јелен�ких фунти</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Словеначки толар</displayName>
-				<displayName count="few">�ловеначка толара</displayName>
-				<displayName count="many">�ловеначких толара</displayName>
-				<displayName count="one">�ловеначки толар</displayName>
-				<displayName count="other">�ловеначких толара</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Словачка круна</displayName>
-				<displayName count="few">�ловачке круне</displayName>
-				<displayName count="many">�ловачких круна</displayName>
-				<displayName count="one">�ловачка круна</displayName>
-				<displayName count="other">�ловачких круна</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Сијера-леоншки леоне</displayName>
-				<displayName count="few">�ијералеон�ка леона</displayName>
-				<displayName count="many">�ијералеон�ких леона</displayName>
-				<displayName count="one">�ијералеон�ки леоне</displayName>
-				<displayName count="other">�ијералеон�ки леони</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>СОмалиј�ки шилинг</displayName>
-				<displayName count="few">�омалиј�ка шилинга</displayName>
-				<displayName count="many">�омалиј�ких шилинга</displayName>
-				<displayName count="one">�омалиј�ки шилинг</displayName>
-				<displayName count="other">�омалиј�ки шилинзи</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>СУринам�ки долар</displayName>
-				<displayName count="few">�уринам�ка долара</displayName>
-				<displayName count="many">�уринам�ких долара</displayName>
-				<displayName count="one">�уринам�ки долар</displayName>
-				<displayName count="other">�уринам�ких долара</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Суринам�ки гилдер</displayName>
-				<displayName count="few">�уринам�ка гилдера</displayName>
-				<displayName count="many">�уринам�ких гилдера</displayName>
-				<displayName count="one">�уринам�ки гилдер</displayName>
-				<displayName count="other">�уринам�ких гилдера</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Сао Томе и Принципе добра</displayName>
-				<displayName count="few">�ао томе и принципе добра</displayName>
-				<displayName count="many">�ао томе и принципе добра</displayName>
-				<displayName count="one">�ао томе и принципе добар</displayName>
-				<displayName count="other">�ао томе и принципе добри</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Совјет�ка рубља</displayName>
-				<displayName count="few">�овјет�ке рубље</displayName>
-				<displayName count="many">�овјет�ких рубљи</displayName>
-				<displayName count="one">�овјет�ка рубља</displayName>
-				<displayName count="other">�овјет�ких рубљи</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Салвадор�ки колон</displayName>
-				<displayName count="few">�алвадор�ка колона</displayName>
-				<displayName count="many">�алвадор�ких колона</displayName>
-				<displayName count="one">�алвадор�ки колон</displayName>
-				<displayName count="other">�алвадор�ких колона</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Сириј�ка фунта</displayName>
-				<displayName count="few">�ириј�ке фунте</displayName>
-				<displayName count="many">�ириј�ких фунти</displayName>
-				<displayName count="one">�ириј�ка фунта</displayName>
-				<displayName count="other">�ириј�ке фунте</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Свази лилангени</displayName>
-				<displayName count="few">�вази емалангена</displayName>
-				<displayName count="many">�вази емалангена</displayName>
-				<displayName count="one">�вази емаланген</displayName>
-				<displayName count="other">�вази емалангена</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Таи бахт</displayName>
-				<displayName count="few">таи бахта</displayName>
-				<displayName count="many">таи бахта</displayName>
-				<displayName count="one">таи бахт</displayName>
-				<displayName count="other">таи бахта</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Таџихи�тан�ка рубља</displayName>
-				<displayName count="few">таџихи�тан�ке рубље</displayName>
-				<displayName count="many">таџихи�тан�ких рубљи</displayName>
-				<displayName count="one">таџихи�тан�ка рубља</displayName>
-				<displayName count="other">таџихи�тан�ких рубљи</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Таљихи�тан�ки �омони</displayName>
-				<displayName count="few">таџихи�тан�ка �омона</displayName>
-				<displayName count="many">таџихи�тан�ких �омона</displayName>
-				<displayName count="one">таџихи�тан�ки �омон</displayName>
-				<displayName count="other">таџихи�тан�ких �омона</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Туркмени�тан�ки манат</displayName>
-				<displayName count="few">туркмени�тан�ка маната</displayName>
-				<displayName count="many">туркмени�тан�ких маната</displayName>
-				<displayName count="one">туркмени�тан�ки манат</displayName>
-				<displayName count="other">туркмени�тан�ки манат</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Тунизиј�ки долар</displayName>
-				<displayName count="few">тунежан�ких динара</displayName>
-				<displayName count="many">тунежан�ких динара</displayName>
-				<displayName count="one">тунежан�ких динара</displayName>
-				<displayName count="other">тунежан�ких динара</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Тонгоншка Панга</displayName>
-				<displayName count="few">тонгашке панге</displayName>
-				<displayName count="many">тонгашких панга</displayName>
-				<displayName count="one">тонгашка панга</displayName>
-				<displayName count="other">тонгашких панга</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Тиморшки е�кудо</displayName>
-				<displayName count="few">тиморшка е�куда</displayName>
-				<displayName count="many">тиморшких е�куда</displayName>
-				<displayName count="one">тиморшки е�кудо</displayName>
-				<displayName count="other">тиморшких е�куда</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Стара тур�ка лира</displayName>
-				<displayName count="few">�таре тур�ке лире</displayName>
-				<displayName count="many">�тарих тур�ких лира</displayName>
-				<displayName count="one">�тара тур�ка лира</displayName>
-				<displayName count="other">�тара тур�ка лира</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Тур�ка лира</displayName>
-				<displayName count="few">тур�ке лире</displayName>
-				<displayName count="many">тур�ких лира</displayName>
-				<displayName count="one">тур�ка лира</displayName>
-				<displayName count="other">тур�ких лира</displayName>
-				<symbol>Тл</symbol>
-			</currency>
-			<currency type="TTD">
-				<displayName>Тринидад тобагошки долар</displayName>
-				<displayName count="few">тринидад-тобагошка долара</displayName>
-				<displayName count="many">тринидад-тобагошких долара</displayName>
-				<displayName count="one">тринидад-тобагошки долар</displayName>
-				<displayName count="other">тринидад-тобагошких долара</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>�ови тајван�ки долар</displayName>
-				<displayName count="few">нова тајван�ка долара</displayName>
-				<displayName count="many">нових тајван�ких долара</displayName>
-				<displayName count="one">нови тајван�ки долар</displayName>
-				<displayName count="other">нови тајван�ки долари</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Танзаниј�ки шилинг</displayName>
-				<displayName count="few">танзаниј�ка шилинга</displayName>
-				<displayName count="many">танзаниј�ких шилинга</displayName>
-				<displayName count="one">танзаниј�ки шилинг</displayName>
-				<displayName count="other">танзаниј�ки шилинзи</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Украјин�ка хривња</displayName>
-				<displayName count="few">украјин�ке кривње</displayName>
-				<displayName count="many">украјин�ких кривњи</displayName>
-				<displayName count="one">украјин�ка кривња</displayName>
-				<displayName count="other">украјин�ких кривњи</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Украјин�ки карбованети</displayName>
-				<displayName count="few">украјин�ка карбованцива</displayName>
-				<displayName count="many">украјин�ких карбованцива</displayName>
-				<displayName count="one">украјин�ки карбованец</displayName>
-				<displayName count="other">украјин�ких карбованцива</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Уганд�ки шилинг (1966-1987)</displayName>
-				<displayName count="few">угандиј�ка шилинга (UGS)</displayName>
-				<displayName count="many">угандиј�ких шилинга (UGS)</displayName>
-				<displayName count="one">угандиј�ки шилинг (UGS)</displayName>
-				<displayName count="other">угандиј�ких шилинга (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Уганд�ки шилинг</displayName>
-				<displayName count="few">угандиј�ка шилинга</displayName>
-				<displayName count="many">угандиј�ких шилинга</displayName>
-				<displayName count="one">угандиј�ки шилинг</displayName>
-				<displayName count="other">угандиј�ки шилинзи</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�мерички долар</displayName>
-				<displayName count="few">америчка долара</displayName>
-				<displayName count="many">америчких долара</displayName>
-				<displayName count="one">амерички долар</displayName>
-				<displayName count="other">америчких долара</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>С�Д долар (�ледећи дан)</displayName>
-				<displayName count="few">С�Д долара (�ледећи дан)</displayName>
-				<displayName count="many">С�Д долара (�ледећи дан)</displayName>
-				<displayName count="one">С�Д долар (�ледећи дан)</displayName>
-				<displayName count="other">С�Д долара (�ледећи дан)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>С�Д долар (и�ти дан)</displayName>
-				<displayName count="few">С�Д долара (и�ти дан)</displayName>
-				<displayName count="many">С�Д долара (и�ти дан)</displayName>
-				<displayName count="one">С�Д долар (и�ти дан)</displayName>
-				<displayName count="other">С�Д долара (и�ти дан)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Уругвај�ки пезо ен унидаде� индек�ада�</displayName>
-				<displayName count="few">уругвај�ка пезо�а ен унидаде� индек�аде�а</displayName>
-				<displayName count="many">уругвај�ких пезо�а ен унидаде� индек�аде�а</displayName>
-				<displayName count="one">уругвај�ки пезо ен унида΀´е� индек�аде�</displayName>
-				<displayName count="other">угвај�ких пезо�а ен унидаде� индек�аде�а</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Уругвај�ки пезо (1975-1993)</displayName>
-				<displayName count="few">уругвај�ка пезо�а (UYP)</displayName>
-				<displayName count="many">уругвај�ких пезо�а (UYP)</displayName>
-				<displayName count="one">уругвај�ки пезо (UYP)</displayName>
-				<displayName count="other">уругвај�ких пезо�а (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Уругвај�ки пезо</displayName>
-				<displayName count="few">уругвај�ка пезо�а</displayName>
-				<displayName count="many">уругвај�ких пезо�а</displayName>
-				<displayName count="one">уругвај�ки пезо</displayName>
-				<displayName count="other">уругвај�ких пезо�а</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Узбеки�тан�ки �ом</displayName>
-				<displayName count="few">узбеки�тан�ка �ома</displayName>
-				<displayName count="many">узбеки�тан�ких �ома</displayName>
-				<displayName count="one">узбеки�тан�ки �ом</displayName>
-				<displayName count="other">узбеки�тан�ки �ом</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Венецуелан�ки боливар</displayName>
-				<displayName count="few">венецуел΀°н�ка боливара</displayName>
-				<displayName count="many">венецуелан�ких боливара</displayName>
-				<displayName count="one">венецуелан�ки боливар</displayName>
-				<displayName count="other">венецуелан�ких боливара</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Венецуелан�ки боливар фуерте</displayName>
-				<displayName count="few">венецуелан�ка боливара фуерте�</displayName>
-				<displayName count="many">венецуелан�ких боливара фуерте�</displayName>
-				<displayName count="one">венецуелан�ки боливар фуерте�</displayName>
-				<displayName count="other">венецуелан�ких боливара фуерте�</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Вијетнам�ки донг</displayName>
-				<displayName count="few">вијетнам�ка донга</displayName>
-				<displayName count="many">вијетнам�ких донга</displayName>
-				<displayName count="one">вијетнам�ки донг</displayName>
-				<displayName count="other">вијетнам�ки донг</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Вануат�ки вату</displayName>
-				<displayName count="few">вануату ватуа</displayName>
-				<displayName count="many">вануату ватуа</displayName>
-				<displayName count="one">вануату вату</displayName>
-				<displayName count="other">вануату ватуи</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Самоан�ка тала</displayName>
-				<displayName count="few">�амоан�ке тале</displayName>
-				<displayName count="many">�амоан�ких тала</displayName>
-				<displayName count="one">�амоан�ка тала</displayName>
-				<displayName count="other">�амоан�ких тала</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA франак BEAC</displayName>
-				<displayName count="few">CFA франка BEAC</displayName>
-				<displayName count="many">CFA франака BEAC</displayName>
-				<displayName count="one">CFA франак BEAC</displayName>
-				<displayName count="other">CFA франци BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Сребро</displayName>
-				<displayName count="few">�ребра</displayName>
-				<displayName count="many">�ребра</displayName>
-				<displayName count="one">�ребро</displayName>
-				<displayName count="other">�ребра</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Злато</displayName>
-				<displayName count="few">злата</displayName>
-				<displayName count="many">злата</displayName>
-				<displayName count="one">злато</displayName>
-				<displayName count="other">злата</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Европ�ка композитна јединица</displayName>
-				<displayName count="few">европ�ке композитне јединице</displayName>
-				<displayName count="many">европ�ких композитних јединица</displayName>
-				<displayName count="one">европ�ка композитна јединица</displayName>
-				<displayName count="other">европ�ких композитних јединица</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Европ�ка новчана јединица</displayName>
-				<displayName count="few">европ�ке новчане јединице (XBB)</displayName>
-				<displayName count="many">европ�ких новчаних јединица (XBB)</displayName>
-				<displayName count="one">европ�ка новчана јединица (XBB)</displayName>
-				<displayName count="other">европ�ке новчане јединице (XBB)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Европ�ка јединица рачуна (XBC)</displayName>
-				<displayName count="few">европ�ке јединице рачуна (XBC)</displayName>
-				<displayName count="many">европ�ких јединица рачуна (XBC)</displayName>
-				<displayName count="one">европ�ка јединица рачуна (XBC)</displayName>
-				<displayName count="other">европ�ких јединица рачуна (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Европ�ка јединица рачуна (XBD)</displayName>
-				<displayName count="few">европ�ке јединице рачуна (XBD)</displayName>
-				<displayName count="many">европ�ких јединица рачуна (XBD)</displayName>
-				<displayName count="one">европ�ка јединица рачуна (XBD)</displayName>
-				<displayName count="other">европ�ких јединица рачуна (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>И�точно-кариб�ки долар</displayName>
-				<displayName count="few">и�точно-кариб�ка долара</displayName>
-				<displayName count="many">и�точно-кариб�ких долара</displayName>
-				<displayName count="one">и�точно-кариб�ки долар</displayName>
-				<displayName count="other">и�точно-кариб�ких долара</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>По�ебна цртаћа права</displayName>
-				<displayName count="few">по�ебна цртаћа права</displayName>
-				<displayName count="many">по�ебних цртаћих права</displayName>
-				<displayName count="one">по�ебно цртаће право</displayName>
-				<displayName count="other">по�ебних цртаћих права</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Европ�ка валутна јединица</displayName>
-				<displayName count="few">европ�ке новчане јединице (XEU)</displayName>
-				<displayName count="many">европ�ких новчаних јединица (XEU)</displayName>
-				<displayName count="one">европ�ка новчана јединица (XEU)</displayName>
-				<displayName count="other">европ�ких новчаних јединица</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Францу�ки златни франак</displayName>
-				<displayName count="few">францу�ка златна франка</displayName>
-				<displayName count="many">францу�ких златних франака</displayName>
-				<displayName count="one">францу�ки златни франак</displayName>
-				<displayName count="other">францу�ких златних франака</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Францу�ки UIC-франак</displayName>
-				<displayName count="few">францу�ка UIC-франка</displayName>
-				<displayName count="many">францу�ких UIC-франака</displayName>
-				<displayName count="one">францу�ки UIC-франак</displayName>
-				<displayName count="other">францу�ких UIC-франака</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA франак BCEAO</displayName>
-				<displayName count="few">CFA франка BCEAO</displayName>
-				<displayName count="many">CFA франака BCEAO</displayName>
-				<displayName count="one">CFA франак BCEAO</displayName>
-				<displayName count="other">CFA франци BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Паладијум</displayName>
-				<displayName count="few">паладијума</displayName>
-				<displayName count="many">паладијума</displayName>
-				<displayName count="one">паладијум</displayName>
-				<displayName count="other">паладијума</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP франак</displayName>
-				<displayName count="few">CFP франка</displayName>
-				<displayName count="many">CFP франака</displayName>
-				<displayName count="one">CFP франак</displayName>
-				<displayName count="other">CFP франци</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Платина</displayName>
-				<displayName count="few">платине</displayName>
-				<displayName count="many">платина</displayName>
-				<displayName count="one">платина</displayName>
-				<displayName count="other">платина</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET фонд</displayName>
-				<displayName count="few">RINET фонда</displayName>
-				<displayName count="many">RINET фондова</displayName>
-				<displayName count="one">RINET фонд</displayName>
-				<displayName count="other">RINET фондова</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Код те�тиране валуте</displayName>
-				<displayName count="few">кода те�тиране валуте</displayName>
-				<displayName count="many">кодова те�тиране валуте</displayName>
-				<displayName count="one">код те�тиране валуте</displayName>
-				<displayName count="other">кодова те�тиране валуте</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>�епозната или неважећа валута</displayName>
-				<displayName count="few">непознате или неважеће валуте</displayName>
-				<displayName count="many">непознатих или неважећих валута</displayName>
-				<displayName count="one">непозната или неважећа валута</displayName>
-				<displayName count="other">непознатих или неважећих валута</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Јемен�ки динар</displayName>
-				<displayName count="few">јемен�ка долара</displayName>
-				<displayName count="many">јемен�ких долара</displayName>
-				<displayName count="one">јемен�ки долар</displayName>
-				<displayName count="other">јемен�ких долара</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Јемен�ки риал</displayName>
-				<displayName count="few">јемен�ка ријала</displayName>
-				<displayName count="many">јемен�ких ријала</displayName>
-				<displayName count="one">јемен�ки ријал</displayName>
-				<displayName count="other">јемен�ки ријали</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Југо�ловен�ки тврди динар</displayName>
-				<displayName count="few">југо�ловен�ка тврда динара</displayName>
-				<displayName count="many">југо�ловен�ких тврдих динара</displayName>
-				<displayName count="one">југо�ловен�ки тврди динар</displayName>
-				<displayName count="other">југо�ловен�ких тврдих динара</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Југо�ловен�ки нови динар</displayName>
-				<displayName count="few">југо�ловен�ка нова динара</displayName>
-				<displayName count="many">југо�ловен�ких нових динара</displayName>
-				<displayName count="one">југо�ловен�ки нови динар</displayName>
-				<displayName count="other">југо�ловен�ких нових динара</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Југо�ловен�ки конвертибилни динар</displayName>
-				<displayName count="few">југо�ловен�ка конвертибилна динара</displayName>
-				<displayName count="many">југо�ловен�ких конвертибилних динара</displayName>
-				<displayName count="one">југо�ловен�ки конвертибилни динар</displayName>
-				<displayName count="other">југо�ловен�ких конвертибилних динара</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Јужно-афрички ранд (финан�иј�ки)</displayName>
-				<displayName count="few">јужноафричка ранда (финан�иј�ка)</displayName>
-				<displayName count="many">јужноафричких ранда (финан�иј�ких)</displayName>
-				<displayName count="one">јужноафрички ранд (финан�иј�ки)</displayName>
-				<displayName count="other">јужноафричких ранда (финан�иј�ких)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Јужно-афрички ранд</displayName>
-				<displayName count="few">јужно-афричка ранда</displayName>
-				<displayName count="many">јужно-афричких ранда</displayName>
-				<displayName count="one">јужно-афрички ранд</displayName>
-				<displayName count="other">јужно-афричких ранда</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Замбиј�ка квача</displayName>
-				<displayName count="few">замбиј�ке кваче</displayName>
-				<displayName count="many">замбиј�ких квача</displayName>
-				<displayName count="one">замбиј�ка квача</displayName>
-				<displayName count="other">замбиј�ке кваче</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Заир�ки нови заир</displayName>
-				<displayName count="few">заир�ка нова заира</displayName>
-				<displayName count="many">заир�ких нових заира</displayName>
-				<displayName count="one">заир�ки нови заир</displayName>
-				<displayName count="other">заир�ких нових заира</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Заир�ки заир</displayName>
-				<displayName count="few">заир�ка заира</displayName>
-				<displayName count="many">заир�ких заира</displayName>
-				<displayName count="one">заир�ки заир</displayName>
-				<displayName count="other">заир�ких заира</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Зимбабвеј�ки долар</displayName>
-				<displayName count="few">зимбабвеј�ка долара</displayName>
-				<displayName count="many">зимбабвеј�ких долара</displayName>
-				<displayName count="one">зимбабвеј�ки долар</displayName>
-				<displayName count="other">зимбабвеј�ки долари</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} дана</unitPattern>
-			<unitPattern count="many">{0} дана</unitPattern>
-			<unitPattern count="one">{0} дан</unitPattern>
-			<unitPattern count="other">{0} дан</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} �ата</unitPattern>
-			<unitPattern count="many">{0} �ати</unitPattern>
-			<unitPattern count="one">{0} �ат</unitPattern>
-			<unitPattern count="other">{0} �ат</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} минута</unitPattern>
-			<unitPattern count="many">{0} минута</unitPattern>
-			<unitPattern count="one">{0} минут</unitPattern>
-			<unitPattern count="other">{0} минут</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} ме�еца</unitPattern>
-			<unitPattern count="many">{0} ме�еци</unitPattern>
-			<unitPattern count="one">{0} ме�ец</unitPattern>
-			<unitPattern count="other">{0} ме�ец</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} �екунде</unitPattern>
-			<unitPattern count="many">{0} �екунди</unitPattern>
-			<unitPattern count="one">{0} �екунда</unitPattern>
-			<unitPattern count="other">{0} �екунда</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} недеље</unitPattern>
-			<unitPattern count="many">{0} недеља</unitPattern>
-			<unitPattern count="one">{0} недеља</unitPattern>
-			<unitPattern count="other">{0} недеља</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} године</unitPattern>
-			<unitPattern count="many">{0} година</unitPattern>
-			<unitPattern count="one">{0} година</unitPattern>
-			<unitPattern count="other">{0} година</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>да:д</yesstr>
-			<nostr>не:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_BA.xml b/airtime_mvc/library/Zend/Locale/Data/sr_BA.xml
deleted file mode 100644
index cf79f15b1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_BA.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<territory type="BA"/>
-	</identity>
-	<alias source="sr_Cyrl_BA" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_CS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_CS.xml
deleted file mode 100644
index 215504675..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_CS.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<territory type="CS"/>
-	</identity>
-	<alias source="sr_Cyrl_CS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl.xml
deleted file mode 100644
index cb54d62a2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_BA.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_BA.xml
deleted file mode 100644
index 423322d98..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_BA.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-		<territory type="BA"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="sr">�рп�ки</language>
-		</languages>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="6">јуни</month>
-							<month type="7">јули</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="wed">�ри</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="wed">�риједа</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH 'ча�ова', mm 'минута', ss '�екунди' zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd - E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd - E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-MM - yy-MM</greatestDifference>
-							<greatestDifference id="y">yy-MM - yy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yy-MM-dd - yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yy-MM-dd - yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yy-MM-dd - E, yy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="BAM">
-				<displayName>Конвертибилна Марка</displayName>
-				<symbol>КМ.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_CS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_CS.xml
deleted file mode 100644
index 4545e9508..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_CS.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.33 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-		<territory type="CS"/>
-	</identity>
-	<alias source="sr_Cyrl_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_ME.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_ME.xml
deleted file mode 100644
index bb4708073..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_ME.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.9 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-		<territory type="ME"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_RS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_RS.xml
deleted file mode 100644
index 2f81bc3ed..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_RS.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.9 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-		<territory type="RS"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_YU.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_YU.xml
deleted file mode 100644
index 31fec2d4c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Cyrl_YU.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Cyrl"/>
-		<territory type="YU"/>
-	</identity>
-	<alias source="sr_Cyrl_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn.xml
deleted file mode 100644
index 502ebb9e1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn.xml
+++ /dev/null
@@ -1,5378 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.91 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">Afarski</language>
-			<language type="ab">Abkazijski</language>
-			<language type="ace">A�ineski</language>
-			<language type="ach">Akoli</language>
-			<language type="ada">Adangmejski</language>
-			<language type="ady">Adigejski</language>
-			<language type="ae">Avestanski</language>
-			<language type="af">Afrikanerski</language>
-			<language type="afa">Afro-azijatski</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ainu</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akadijski</language>
-			<language type="ale">Aljut</language>
-			<language type="alg">Algonkvijanski jezik</language>
-			<language type="alt">Južni altai</language>
-			<language type="am">Amharski</language>
-			<language type="an">Aragonežanski</language>
-			<language type="ang">Staroengleski</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apa�ki jezik</language>
-			<language type="ar">Arapski</language>
-			<language type="arc">Armajski</language>
-			<language type="arn">Arokanijski</language>
-			<language type="arp">Arapaho</language>
-			<language type="art">Vešta�ki</language>
-			<language type="arw">Aravak</language>
-			<language type="as">Asemijski</language>
-			<language type="ast">Asturijski</language>
-			<language type="ath">Atapaskan</language>
-			<language type="aus">Australijski jezik</language>
-			<language type="av">Avarski</language>
-			<language type="awa">Avadhi</language>
-			<language type="ay">Ajmara</language>
-			<language type="az">Azerbejdžanski</language>
-			<language type="ba">Baškir</language>
-			<language type="bad">Banda</language>
-			<language type="bai">Bamileke</language>
-			<language type="bal">Balu�i</language>
-			<language type="ban">Balinezijski</language>
-			<language type="bas">Basa</language>
-			<language type="bat">Balti�ki jezik</language>
-			<language type="be">Beloruski</language>
-			<language type="bej">Beja</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berber</language>
-			<language type="bg">Bugarski</language>
-			<language type="bh">Biharski</language>
-			<language type="bho">Bojpuri</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengalski</language>
-			<language type="bnt">Bantu</language>
-			<language type="bo">Tibetanski</language>
-			<language type="br">Bretonski</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Bosanski</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Buriat</language>
-			<language type="bug">Buginežanskii</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalonski</language>
-			<language type="cad">Kado</language>
-			<language type="cai">Jezik centralno-ameri�kih Indijanaca</language>
-			<language type="car">Karipski</language>
-			<language type="cau">Kavkaski</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Če�enski</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Keltski jezik</language>
-			<language type="ch">ÄŒamoro</language>
-			<language type="chb">Čib�a</language>
-			<language type="chg">ÄŒagatai</language>
-			<language type="chk">ÄŒukeski</language>
-			<language type="chm">Mari</language>
-			<language type="chn">ÄŒinukski</language>
-			<language type="cho">ÄŒoktavski</language>
-			<language type="chp">ÄŒipvijanski</language>
-			<language type="chr">ÄŒeroki</language>
-			<language type="chy">ÄŒejenski</language>
-			<language type="cmc">ÄŒamski jezik</language>
-			<language type="co">Korzikanski</language>
-			<language type="cop">Koptski</language>
-			<language type="cpe">Kreolski ili pidžin zasnovan na engleskom</language>
-			<language type="cpf">Kreolski ili pidžin zasnovan na francuskom</language>
-			<language type="cpp">Kreolski ili pidžin baziran na portugalskom</language>
-			<language type="cr">Kri</language>
-			<language type="crh">Krimeanski turski</language>
-			<language type="crp">kreolski ili pidžin</language>
-			<language type="cs">Češki</language>
-			<language type="csb">Kašubijanski</language>
-			<language type="cu">Staroslovenski</language>
-			<language type="cus">Kušiti�ki jezik</language>
-			<language type="cv">Čuvaški</language>
-			<language type="cy">Velški</language>
-			<language type="da">Danski</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargva</language>
-			<language type="day">Dajaški</language>
-			<language type="de">Nema�ki</language>
-			<language type="de_AT">Austrijski nema�ki</language>
-			<language type="de_CH">Švajcarski visoki nema�ki</language>
-			<language type="del">Delaver</language>
-			<language type="den">Slavski</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravidijski jezik</language>
-			<language type="dsb">Niski Sorbijanski</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Srednji holandski</language>
-			<language type="dv">Divehijski</language>
-			<language type="dyu">�ula</language>
-			<language type="dz">Džonga</language>
-			<language type="ee">Eve</language>
-			<language type="efi">Efikski</language>
-			<language type="egy">Staroegipatski</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Gr�ki</language>
-			<language type="elx">Elamitski</language>
-			<language type="en">Engleski</language>
-			<language type="en_AU">Australijski engleski</language>
-			<language type="en_CA">Kanadski engleski</language>
-			<language type="en_GB">Britanski engleski</language>
-			<language type="en_US">Engleski (SAD)</language>
-			<language type="enm">Srednji engleski</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Å panski</language>
-			<language type="es_419">Latino-ameri�ki španski</language>
-			<language type="es_ES">Iberijski Å¡panski</language>
-			<language type="et">Estonski</language>
-			<language type="eu">Baskijski</language>
-			<language type="ewo">Evondo</language>
-			<language type="fa">Persijski</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulah</language>
-			<language type="fi">Finski</language>
-			<language type="fil">Filipinski</language>
-			<language type="fiu">Ugro-finski jezik</language>
-			<language type="fj">Fidžijski</language>
-			<language type="fo">Farski</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Francuski</language>
-			<language type="fr_CA">Kanadski francuski</language>
-			<language type="fr_CH">Å vajcarski francuski</language>
-			<language type="frm">Srednji francuski</language>
-			<language type="fro">Starofrancuski</language>
-			<language type="frr">Severno-frizijski</language>
-			<language type="frs">Isto�ni frizijski</language>
-			<language type="fur">Friulijski</language>
-			<language type="fy">Frizijski</language>
-			<language type="ga">Irski</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gajo</language>
-			<language type="gba">Gbaja</language>
-			<language type="gd">Å kotski Galski</language>
-			<language type="gem">Germanski jezik</language>
-			<language type="gez">Džiz</language>
-			<language type="gil">Gilbertški</language>
-			<language type="gl">Galski</language>
-			<language type="gmh">Srednji visoki nema�ki</language>
-			<language type="gn">Gvarani</language>
-			<language type="goh">Staronema�ki</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gotski</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Starogr�ki</language>
-			<language type="gsw">Švajcarsko nema�ki</language>
-			<language type="gu">Gudžarati</language>
-			<language type="gv">Manks</language>
-			<language type="gwi">Gvich'in</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Havajski</language>
-			<language type="he">Hebrejski</language>
-			<language type="hi">Hindi</language>
-			<language type="hil">Hiligajnon</language>
-			<language type="him">Hima�ali</language>
-			<language type="hit">Hitite</language>
-			<language type="hmn">Hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">Hrvatski</language>
-			<language type="hsb">Gornji sorbijski</language>
-			<language type="ht">Haićanski</language>
-			<language type="hu">Mađarski</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Jermenski</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingva</language>
-			<language type="iba">Iban</language>
-			<language type="id">Indonezijski</language>
-			<language type="ie">Interlingve</language>
-			<language type="ig">Igbo</language>
-			<language type="ii">Si�uan ji</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiak</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Indik</language>
-			<language type="ine">Indo-evropski jezik</language>
-			<language type="inh">Ingušetski</language>
-			<language type="io">Ido</language>
-			<language type="ira">Iranski jezik</language>
-			<language type="iro">Irokvojanski</language>
-			<language type="is">Islandski</language>
-			<language type="it">Italijanski</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japanski</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Judeo-persijski</language>
-			<language type="jrb">Judeo-arapski</language>
-			<language type="jv">Javanski</language>
-			<language type="ka">Gruzijski</language>
-			<language type="kaa">Kara-kalpaški</language>
-			<language type="kab">Kabile</language>
-			<language type="kac">Ka�in</language>
-			<language type="kaj">Žju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karenski</language>
-			<language type="kaw">Kavi</language>
-			<language type="kbd">Kabardijski</language>
-			<language type="kcg">Tjap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Kasi</language>
-			<language type="khi">Koisanski jezik</language>
-			<language type="kho">Kotanizijski</language>
-			<language type="ki">Kikuju</language>
-			<language type="kj">Kuanjama</language>
-			<language type="kk">Koza�ki</language>
-			<language type="kl">Kalalisutski</language>
-			<language type="km">Kmerski</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kanada</language>
-			<language type="ko">Korejski</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosreanski</language>
-			<language type="kpe">Kpele</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Kara�aj-balkar</language>
-			<language type="krl">Karelijski</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurukh</language>
-			<language type="ks">Kašmiri</language>
-			<language type="ku">Kurdski</language>
-			<language type="kum">Kumik</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Korniški</language>
-			<language type="ky">Kirgiski</language>
-			<language type="la">Latinski</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Landa</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Luksemburški</language>
-			<language type="lez">Lezgian</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburgiš</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laoški</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Litvanski</language>
-			<language type="lu">Luba-katanga</language>
-			<language type="lua">Luba-lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lušai</language>
-			<language type="lv">Letonski</language>
-			<language type="mad">Madureški</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maitili</language>
-			<language type="mak">Makasar</language>
-			<language type="man">Mandingo</language>
-			<language type="map">Austronežanski</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">Mokša</language>
-			<language type="mdr">Mandar</language>
-			<language type="men">Mende</language>
-			<language type="mg">Malagazijski</language>
-			<language type="mga">Srednji irski</language>
-			<language type="mh">Maršalski</language>
-			<language type="mi">Maorski</language>
-			<language type="mic">Mikmak</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Razni jezici</language>
-			<language type="mk">Makedonski</language>
-			<language type="mkh">Mon-kmerski jezik</language>
-			<language type="ml">Malajalam</language>
-			<language type="mn">Mongolski</language>
-			<language type="mnc">Man�u</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Manobo jezik</language>
-			<language type="mo">Moldavski</language>
-			<language type="moh">Mahavski</language>
-			<language type="mos">Mosi</language>
-			<language type="mr">Marati</language>
-			<language type="ms">Malajski</language>
-			<language type="mt">Melteški</language>
-			<language type="mul">Više jezika</language>
-			<language type="mun">Munda jezik</language>
-			<language type="mus">Kriški</language>
-			<language type="mwl">Mirandeški</language>
-			<language type="mwr">Marvari</language>
-			<language type="my">Burmanski</language>
-			<language type="myn">Majanski jezik</language>
-			<language type="myv">Erzija</language>
-			<language type="na">Nauru</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Jezik severno-ameri�kih Indijanaca</language>
-			<language type="nap">Neapolitanski</language>
-			<language type="nb">Norveški bokmål</language>
-			<language type="nd">Severni ndebele</language>
-			<language type="nds">Niski nema�ki</language>
-			<language type="ne">Nepalski</language>
-			<language type="new">Nevari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Niger-kordofanijski jezik</language>
-			<language type="niu">Niuean</language>
-			<language type="nl">Holandski</language>
-			<language type="nl_BE">Flamanski</language>
-			<language type="nn">Norveški njorsk</language>
-			<language type="no">Norveški</language>
-			<language type="nog">Nogai</language>
-			<language type="non">Stari norski</language>
-			<language type="nqo">N’ko</language>
-			<language type="nr">Južni ndebele</language>
-			<language type="nso">Severni soto</language>
-			<language type="nub">Nubijski jezik</language>
-			<language type="nv">Navaho</language>
-			<language type="nwc">Klasi�ni nevari</language>
-			<language type="ny">Njanja</language>
-			<language type="nym">Njamvezi</language>
-			<language type="nyn">Njankole</language>
-			<language type="nyo">Njoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Provansalski</language>
-			<language type="oj">Ojibva</language>
-			<language type="om">Oromo</language>
-			<language type="or">Orijski</language>
-			<language type="os">Osetski</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Otomanski turski</language>
-			<language type="oto">Otomanski jezik</language>
-			<language type="pa">Pandžabski</language>
-			<language type="paa">Papuanski jezik</language>
-			<language type="pag">Pangasinski</language>
-			<language type="pal">Pahlavi</language>
-			<language type="pam">Pampanga</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palauanski</language>
-			<language type="peo">Staropersijski</language>
-			<language type="phi">Filipinski jezik</language>
-			<language type="phn">Feni�anski</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Poljski</language>
-			<language type="pon">Ponpejski</language>
-			<language type="pra">Prakritski jezik</language>
-			<language type="pro">Staroprovansalski</language>
-			<language type="ps">Paštunski</language>
-			<language type="pt">Portugalski</language>
-			<language type="pt_BR">Brazilski portugalski</language>
-			<language type="pt_PT">Iberijski portugalski</language>
-			<language type="qu">Kven�a</language>
-			<language type="raj">Rađastani</language>
-			<language type="rap">Rapanui</language>
-			<language type="rar">Rarotongan</language>
-			<language type="rm">Reto-Romanski</language>
-			<language type="rn">Rundi</language>
-			<language type="ro">Rumunski</language>
-			<language type="roa">Romanski jezik</language>
-			<language type="rom">Romani</language>
-			<language type="root">Run</language>
-			<language type="ru">Ruski</language>
-			<language type="rup">Aromanijski</language>
-			<language type="rw">Kinjarvanda</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sad">Sandave</language>
-			<language type="sah">Jakut</language>
-			<language type="sai">Jezik južno-ameri�kih Indijanaca</language>
-			<language type="sal">Sališanski jezik</language>
-			<language type="sam">Samaritanski aramejski</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardinijski</language>
-			<language type="scn">Sicilijanski</language>
-			<language type="sco">Å kotski</language>
-			<language type="sd">Sindi</language>
-			<language type="se">Severni sami</language>
-			<language type="sel">Selkap</language>
-			<language type="sem">Semitski jezik</language>
-			<language type="sg">Sango</language>
-			<language type="sga">Staroirski</language>
-			<language type="sgn">Jezik znakova</language>
-			<language type="sh">Srpskohrvatski</language>
-			<language type="shn">Å an</language>
-			<language type="si">Singaleski</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Siuanski jezik</language>
-			<language type="sit">Sino-tibetanski jezik</language>
-			<language type="sk">Slova�ki</language>
-			<language type="sl">Slovena�ki</language>
-			<language type="sla">Slovenski jezik</language>
-			<language type="sm">Samoanski</language>
-			<language type="sma">Južni sami</language>
-			<language type="smi">Sami jezik</language>
-			<language type="smj">Lule sami</language>
-			<language type="smn">Inari sami</language>
-			<language type="sms">Skoltski jezik</language>
-			<language type="sn">Å ona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somalski</language>
-			<language type="sog">Sodžijenski</language>
-			<language type="son">Songai</language>
-			<language type="sq">Albanski</language>
-			<language type="sr">Srpski</language>
-			<language type="srn">Srananski tongo</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Svati</language>
-			<language type="ssa">Nilo-saharski jezik</language>
-			<language type="st">Sesoto</language>
-			<language type="su">Sudanski</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sumerski</language>
-			<language type="sv">Å vedski</language>
-			<language type="sw">Svahili</language>
-			<language type="syc">Klasi�ni sirijski</language>
-			<language type="syr">Sirijski</language>
-			<language type="ta">Tamilski</language>
-			<language type="tai">Tai jezik</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tađik</language>
-			<language type="th">Tajlandski</language>
-			<language type="ti">Tigrinja</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Turkmenski</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Tagalski</language>
-			<language type="tlh">Klingonski</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">Tamašek</language>
-			<language type="tn">Tsvana</language>
-			<language type="to">Tonga</language>
-			<language type="tog">Njasa tonga</language>
-			<language type="tpi">Tok pisin</language>
-			<language type="tr">Turski</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimšian</language>
-			<language type="tt">Tatarski</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi jezik</language>
-			<language type="tut">Altai�ki jezik</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Tvi</language>
-			<language type="ty">Tahićanski</language>
-			<language type="tyv">Tuvinijski</language>
-			<language type="udm">Udmurt</language>
-			<language type="ug">Ujgurski</language>
-			<language type="uga">Ugaritski</language>
-			<language type="uk">Ukrajinski</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Nepoznat ili nevažeći jezik</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbe�ki</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vijetnamski</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Votski</language>
-			<language type="wa">Valun</language>
-			<language type="wak">Vakašanski jezik</language>
-			<language type="wal">Valamo</language>
-			<language type="war">Varej</language>
-			<language type="was">Vašo</language>
-			<language type="wen">Sorbijanski jezik</language>
-			<language type="wo">Volof</language>
-			<language type="xal">Kalmik</language>
-			<language type="xh">Khosa</language>
-			<language type="yao">Jao</language>
-			<language type="yap">Japeški</language>
-			<language type="yi">Jidiš</language>
-			<language type="yo">Jorubanski</language>
-			<language type="ypk">Jupik</language>
-			<language type="za">Zuang</language>
-			<language type="zap">Zapote�ki</language>
-			<language type="zbl">Blisimboli</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Kineski</language>
-			<language type="zh_Hans">Kineski (pojednostavljen)</language>
-			<language type="zh_Hant">Kineski (tradicionalni)</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Bez lingvisti�kog sadržaja</language>
-			<language type="zza">Zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arapsko pismo</script>
-			<script type="Armi">imperijsko aramejsko pismo</script>
-			<script type="Armn">jermensko pismo</script>
-			<script type="Avst">avestansko pismo</script>
-			<script type="Bali">balijsko pismo</script>
-			<script type="Batk">batak pismo</script>
-			<script type="Beng">bengalsko pismo</script>
-			<script type="Blis">blisimboli�no pismo</script>
-			<script type="Bopo">bopomofo pismo</script>
-			<script type="Brah">Bramansko pismo</script>
-			<script type="Brai">Brajevo pismo</script>
-			<script type="Bugi">buginsko pismo</script>
-			<script type="Buhd">buhidsko pismo</script>
-			<script type="Cakm">�akmansko pismo</script>
-			<script type="Cans">Ujedinjeni kanadski aboridžinski silabici</script>
-			<script type="Cari">karijsko pismo</script>
-			<script type="Cham">�amsko pismo</script>
-			<script type="Cher">ÄŒeroki</script>
-			<script type="Cirt">cirt pismo</script>
-			<script type="Copt">kopti�ko pismo</script>
-			<script type="Cprt">kiparsko pismo</script>
-			<script type="Cyrl">Ćirilica</script>
-			<script type="Cyrs">Staroslovenska crkvena ćirilica</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Dezeret</script>
-			<script type="Egyd">egipatsko narodno pismo</script>
-			<script type="Egyh">egipatsko hijeratsko pismo</script>
-			<script type="Egyp">Egipatski hijeroglifi</script>
-			<script type="Ethi">etiopsko pismo</script>
-			<script type="Geok">gruzijsko khutsuri pismo</script>
-			<script type="Geor">gruzijsko pismo</script>
-			<script type="Glag">glagoljica</script>
-			<script type="Goth">Gotika</script>
-			<script type="Grek">gr�ko pismo</script>
-			<script type="Gujr">gužarati pismo</script>
-			<script type="Guru">gurmukhi pismo</script>
-			<script type="Hang">hangul pismo</script>
-			<script type="Hani">han pismo</script>
-			<script type="Hano">hanuno pismo</script>
-			<script type="Hans">pojednostavljeno kinesko pismo</script>
-			<script type="Hant">tradicionalno kinesko pismo</script>
-			<script type="Hebr">hebrejsko pismo</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">pahawh hmong pismo</script>
-			<script type="Hrkt">Katakana ili Hiragana</script>
-			<script type="Hung">Staromađarsko pismo</script>
-			<script type="Inds">induško ismo</script>
-			<script type="Ital">staro italsko pismo</script>
-			<script type="Java">javansko pismo</script>
-			<script type="Jpan">japansko pismo</script>
-			<script type="Kali">kajah li pismo</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">karošti pismo</script>
-			<script type="Khmr">kmersko pismo</script>
-			<script type="Knda">kannada pismo</script>
-			<script type="Kore">Korejsko pismo</script>
-			<script type="Kthi">kaićansko pismo</script>
-			<script type="Lana">lanna pismo</script>
-			<script type="Laoo">lao pismo</script>
-			<script type="Latf">Latinica (Fraktur varijanta)</script>
-			<script type="Latg">Galska latinica</script>
-			<script type="Latn">Latinica</script>
-			<script type="Lepc">lep�a pismo</script>
-			<script type="Limb">limbu pismo</script>
-			<script type="Lina">linearno A pismo</script>
-			<script type="Linb">linearno B pismo</script>
-			<script type="Lyci">lisijsko pismo</script>
-			<script type="Lydi">lidijsko pismo</script>
-			<script type="Mand">mandeansko pismo</script>
-			<script type="Mani">manihejsko pismo</script>
-			<script type="Maya">majanski hijeroglifi</script>
-			<script type="Mero">meroitik pismo</script>
-			<script type="Mlym">malajalam pismo</script>
-			<script type="Mong">Mongolsko pismo</script>
-			<script type="Moon">mese�evo pismo</script>
-			<script type="Mtei">meitei majek pismo</script>
-			<script type="Mymr">mianmarko pismo</script>
-			<script type="Nkoo">n'ko pismo</script>
-			<script type="Ogam">ogham pismo</script>
-			<script type="Olck">ol �iki pismo</script>
-			<script type="Orkh">orkhon pismo</script>
-			<script type="Orya">orija pismo</script>
-			<script type="Osma">osmanja pismo</script>
-			<script type="Perm">staro permiksko pismo</script>
-			<script type="Phag">phags-pa pismo</script>
-			<script type="Phli">pisani pahlavi</script>
-			<script type="Phlp">psalter pahlavi</script>
-			<script type="Phlv">pahlavi pismo</script>
-			<script type="Phnx">Feni�ansko pismo</script>
-			<script type="Plrd">polard fonetsko pismo</script>
-			<script type="Prti">pisani partian</script>
-			<script type="Qaai">nasledno pismo</script>
-			<script type="Rjng">rejang pismo</script>
-			<script type="Roro">rongorongo pismo</script>
-			<script type="Runr">runsko pismo</script>
-			<script type="Samr">samaritansko pismo</script>
-			<script type="Sara">sarati pismo</script>
-			<script type="Saur">sauraštra pismo</script>
-			<script type="Sgnw">znakovno pismo</script>
-			<script type="Shaw">Å¡avian pismo</script>
-			<script type="Sinh">sinhala pismo</script>
-			<script type="Sund">sudansko pismo</script>
-			<script type="Sylo">siloti nagri pismo</script>
-			<script type="Syrc">sirijsko pismo</script>
-			<script type="Syre">sirijsko estrangelo pismo</script>
-			<script type="Syrj">Zapadnosirijsko pismo</script>
-			<script type="Syrn">pismo isto�ne Sirije</script>
-			<script type="Tagb">tagbanva pismo</script>
-			<script type="Tale">tai le pismo</script>
-			<script type="Talu">novo tai lue pismo</script>
-			<script type="Taml">tamilsko pismo</script>
-			<script type="Tavt">tai viet pismo</script>
-			<script type="Telu">telugu pismo</script>
-			<script type="Teng">tengvar pismo</script>
-			<script type="Tfng">tifinag pismo</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">thana pismo</script>
-			<script type="Thai">Tajlandsko pismo</script>
-			<script type="Tibt">tibetansko pismo</script>
-			<script type="Ugar">ugaritsko pismo</script>
-			<script type="Vaii">vai pismo</script>
-			<script type="Visp">vidljivi govor</script>
-			<script type="Xpeo">Staropersijsko pismo</script>
-			<script type="Xsux">sumersko-akadsko kuneiform pismo</script>
-			<script type="Yiii">ji pismo</script>
-			<script type="Zmth">matemati�ka notacija</script>
-			<script type="Zsym">simboli</script>
-			<script type="Zxxx">Nepisani jezik</script>
-			<script type="Zyyy">zajedni�ko pismo</script>
-			<script type="Zzzz">Nepoznato ili nevažeće pismo</script>
-		</scripts>
-		<territories>
-			<territory type="001">Svet</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Severnoameri�ki kontinent</territory>
-			<territory type="005">Južna Amerika</territory>
-			<territory type="009">Okeanija</territory>
-			<territory type="011">Zapadna Afrika</territory>
-			<territory type="013">Centralna Amerika</territory>
-			<territory type="014">Isto�na Afrika</territory>
-			<territory type="015">Severna Afrika</territory>
-			<territory type="017">Centralna Afrika</territory>
-			<territory type="018">Južna Afrika</territory>
-			<territory type="019">Amerike</territory>
-			<territory type="021">Severna Amerika</territory>
-			<territory type="029">Karibi</territory>
-			<territory type="030">Isto�na Azija</territory>
-			<territory type="034">Južna Azija</territory>
-			<territory type="035">Jugoisto�na Azija</territory>
-			<territory type="039">Južna Evropa</territory>
-			<territory type="053">Australija i Novi Zeland</territory>
-			<territory type="054">Melanezija</territory>
-			<territory type="057">Micronezija</territory>
-			<territory type="061">Polinezija</territory>
-			<territory type="062">Južno-centralna Azija</territory>
-			<territory type="142">Azija</territory>
-			<territory type="143">Centralna Azija</territory>
-			<territory type="145">Zapadna Azija</territory>
-			<territory type="150">Evropa</territory>
-			<territory type="151">Isto�na Evropa</territory>
-			<territory type="154">Severna Evropa</territory>
-			<territory type="155">Zapadna Evropa</territory>
-			<territory type="172">Komonvelt nezavisnih država</territory>
-			<territory type="419">Latinska Amerika i Karibi</territory>
-			<territory type="830">Kanalska ostrva</territory>
-			<territory type="AD">Andora</territory>
-			<territory type="AE">Ujedinjeni Arapski Emirati</territory>
-			<territory type="AF">Avganistan</territory>
-			<territory type="AG">Antigva i Barbuda</territory>
-			<territory type="AI">Angvila</territory>
-			<territory type="AL">Albanija</territory>
-			<territory type="AM">Armenija</territory>
-			<territory type="AN">Holandski Antili</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Ameri�ka Samoa</territory>
-			<territory type="AT">Austrija</territory>
-			<territory type="AU">Australija</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Alandska ostrva</territory>
-			<territory type="AZ">Azerbejdžan</territory>
-			<territory type="BA">Bosna i Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladeš</territory>
-			<territory type="BE">Belgija</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bugarska</territory>
-			<territory type="BH">Bahrein</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Sv. Bartolomej</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunej</territory>
-			<territory type="BO">Bolivija</territory>
-			<territory type="BR">Brazil</territory>
-			<territory type="BS">Bahami</territory>
-			<territory type="BT">Butan</territory>
-			<territory type="BV">Buve Ostrva</territory>
-			<territory type="BW">Bocvana</territory>
-			<territory type="BY">Belorusija</territory>
-			<territory type="BZ">Belise</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokos (Keling) Ostrva</territory>
-			<territory type="CD">Demokratska Republika Kongo</territory>
-			<territory type="CF">Centralno Afri�ka Republika</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Å vajcarska</territory>
-			<territory type="CI">Obala Slonova�e</territory>
-			<territory type="CK">Kukova Ostrva</territory>
-			<territory type="CL">ÄŒile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Kolumbija</territory>
-			<territory type="CR">Kostarika</territory>
-			<territory type="CS">Srbija i Crna Gora</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kape Verde</territory>
-			<territory type="CX">Božićna Ostrva</territory>
-			<territory type="CY">Kipar</territory>
-			<territory type="CZ">Češka</territory>
-			<territory type="DE">Nema�ka</territory>
-			<territory type="DJ">Džibuti</territory>
-			<territory type="DK">Danska</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominikanska Republika</territory>
-			<territory type="DZ">Alžir</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estonija</territory>
-			<territory type="EG">Egipat</territory>
-			<territory type="EH">Zapadna Sahara</territory>
-			<territory type="ER">Eritreja</territory>
-			<territory type="ES">Å panija</territory>
-			<territory type="ET">Etiopija</territory>
-			<territory type="FI">Finska</territory>
-			<territory type="FJ">Fidži</territory>
-			<territory type="FK">Folklandska Ostrva</territory>
-			<territory type="FM">Mikronezija</territory>
-			<territory type="FO">Farska Ostrva</territory>
-			<territory type="FR">Francuska</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Velika Britanija</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gruzija</territory>
-			<territory type="GF">Francuska Gvajana</territory>
-			<territory type="GG">Gurnsi</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grenland</territory>
-			<territory type="GM">Gambija</territory>
-			<territory type="GN">Gvineja</territory>
-			<territory type="GP">Gvadelupe</territory>
-			<territory type="GQ">Ekvatorijalna Gvineja</territory>
-			<territory type="GR">Gr�ka</territory>
-			<territory type="GS">Južna Džordžija i Južna Sendvi� Ostrva</territory>
-			<territory type="GT">Gvatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gvineja-Bisao</territory>
-			<territory type="GY">Gvajana</territory>
-			<territory type="HK">Hong Kong (S. A. R. Kina)</territory>
-			<territory type="HM">Herd i Mekdonald Ostrva</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Hrvatska</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Mađarska</territory>
-			<territory type="ID">Indonezija</territory>
-			<territory type="IE">Irska</territory>
-			<territory type="IL">Izrael</territory>
-			<territory type="IM">Ostrvo Man</territory>
-			<territory type="IN">Indija</territory>
-			<territory type="IO">Britansko Indijska Okeanska Teritorija</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italija</territory>
-			<territory type="JE">Džersi</territory>
-			<territory type="JM">Jamajka</territory>
-			<territory type="JO">Jordan</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenija</territory>
-			<territory type="KG">Kirgizstan</territory>
-			<territory type="KH">Kambodža</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorska Ostrva</territory>
-			<territory type="KN">Sent Kits i Nevis</territory>
-			<territory type="KP">Severna Koreja</territory>
-			<territory type="KR">Južna Koreja</territory>
-			<territory type="KW">Kuvajt</territory>
-			<territory type="KY">Kajmanska Ostrva</territory>
-			<territory type="KZ">Kazahstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Liban</territory>
-			<territory type="LC">Sent Lucija</territory>
-			<territory type="LI">Lihtenštajn</territory>
-			<territory type="LK">Å ri Lanka</territory>
-			<territory type="LR">Liberija</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="LT">Litvanija</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="LV">Letonija</territory>
-			<territory type="LY">Libija</territory>
-			<territory type="MA">Maroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldavija</territory>
-			<territory type="ME">Crna Gora</territory>
-			<territory type="MF">Sv. Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Maršalska Ostrva</territory>
-			<territory type="MK">Makedonija</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Mijanmar</territory>
-			<territory type="MN">Mongolija</territory>
-			<territory type="MO">Makao (S. A. R. Kina)</territory>
-			<territory type="MP">Severna Marijanska Ostrva</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Mauritanija</territory>
-			<territory type="MS">Monserat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauricius</territory>
-			<territory type="MV">Maldivi</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malezija</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibija</territory>
-			<territory type="NC">Nova Kaledonija</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolk Ostrvo</territory>
-			<territory type="NG">Nigerija</territory>
-			<territory type="NI">Nikaragva</territory>
-			<territory type="NL">Holandija</territory>
-			<territory type="NO">Norveška</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Novi Zeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Francuska Polinezija</territory>
-			<territory type="PG">Papua Nova Gvineja</territory>
-			<territory type="PH">Filipini</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Poljska</territory>
-			<territory type="PM">Sen Pjer i Mikelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Riko</territory>
-			<territory type="PS">Palestinska Teritorija</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paragvaj</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Ostala okeanija</territory>
-			<territory type="QU">Evropska unija</territory>
-			<territory type="RE">Rejunion</territory>
-			<territory type="RO">Rumunija</territory>
-			<territory type="RS">Srbija</territory>
-			<territory type="RU">Rusija</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Saudijska Arabija</territory>
-			<territory type="SB">Solomonska Ostrva</territory>
-			<territory type="SC">Sejšeli</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Å vedska</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Sveta Jelena</territory>
-			<territory type="SI">Slovenija</territory>
-			<territory type="SJ">Svalbard i Janmajen Ostrva</territory>
-			<territory type="SK">Slova�ka</territory>
-			<territory type="SL">Sijera Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalija</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome i Principe</territory>
-			<territory type="SV">Salvador</territory>
-			<territory type="SY">Sirija</territory>
-			<territory type="SZ">Svazilend</territory>
-			<territory type="TC">Turks i Kajkos Ostrva</territory>
-			<territory type="TD">ÄŒad</territory>
-			<territory type="TF">Francuske Južne Teritorije</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tajland</territory>
-			<territory type="TJ">Tadžikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Isto�ni Timor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunis</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turska</territory>
-			<territory type="TT">Trinidad i Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tajvan</territory>
-			<territory type="TZ">Tanzanija</territory>
-			<territory type="UA">Ukrajina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Manja Udaljena Ostrva SAD</territory>
-			<territory type="US">Sjedinjene Ameri�ke Države</territory>
-			<territory type="UY">Urugvaj</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Sent Vinsent i Grenadini</territory>
-			<territory type="VE">Venecuela</territory>
-			<territory type="VG">Britanska Devi�anska Ostrva</territory>
-			<territory type="VI">S.A.D. Devi�anska Ostrva</territory>
-			<territory type="VN">Vijetnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Valis i Futuna Ostrva</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Majote</territory>
-			<territory type="ZA">Južnoafri�ka Republika</territory>
-			<territory type="ZM">Zambija</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Nepoznat ili nevažeći region</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Tradicionalna nema�ka ortografija</variant>
-			<variant type="1994">Standardizovana rezijanska ortografija</variant>
-			<variant type="1996">Nema�ka ortografija 1996</variant>
-			<variant type="1606NICT">Francuski iz kasnog srednjeg veka do 1606.</variant>
-			<variant type="1694ACAD">Rani moderni francuski</variant>
-			<variant type="AREVELA">Isto�ni jermenski</variant>
-			<variant type="AREVMDA">Zapadno-jermenski</variant>
-			<variant type="BAKU1926">Ujedinjeni turski latini�ni alfabet</variant>
-			<variant type="BISKE">San �orđijo/Bila dijalekt</variant>
-			<variant type="BOONT">Buntling</variant>
-			<variant type="FONIPA">IPA fonetika</variant>
-			<variant type="FONUPA">UPA fonetika</variant>
-			<variant type="LIPAW">Lipovac dijalekt rezijanski</variant>
-			<variant type="MONOTON">Monotonik</variant>
-			<variant type="NEDIS">Natison dijalekt</variant>
-			<variant type="NJIVA">Gnjiva/Njiva dijalekt</variant>
-			<variant type="OSOJS">Oseako/Osojane dijalekt</variant>
-			<variant type="POLYTON">Politonik</variant>
-			<variant type="POSIX">Kompjuter</variant>
-			<variant type="REVISED">Revidirana ortigrafija</variant>
-			<variant type="ROZAJ">Rezijan</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">Å kotski standardni engleski</variant>
-			<variant type="SCOUSE">Skauz</variant>
-			<variant type="SOLBA">Stolvica/Solbica dijalekt</variant>
-			<variant type="TARASK">Taraskijevica ortografija</variant>
-			<variant type="VALENCIA">Valencijski</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Kalendar</key>
-			<key type="collation">Sortiranje</key>
-			<key type="currency">Valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Tradicionalno kinesko sortiranje</type>
-			<type type="buddhist" key="calendar">Budisti�ki kalendar</type>
-			<type type="chinese" key="calendar">Kineski kalendar</type>
-			<type type="direct" key="collation">Direktno sortiranje</type>
-			<type type="gb2312han" key="collation">Pojednostavljeno kinesko sortiranje</type>
-			<type type="gregorian" key="calendar">Gregorijanski kalendar</type>
-			<type type="hebrew" key="calendar">Hebrejski kalendar</type>
-			<type type="indian" key="calendar">Indijski nacionalni kalendar</type>
-			<type type="islamic" key="calendar">Islamski kalendar</type>
-			<type type="islamic-civil" key="calendar">Islamski civilni kalendar</type>
-			<type type="japanese" key="calendar">Japanski kalendar</type>
-			<type type="phonebook" key="collation">Sortiranje kao telefonski imenik</type>
-			<type type="pinyin" key="collation">Pinjin sortiranje</type>
-			<type type="roc" key="calendar">Kalendar Republike Kine</type>
-			<type type="stroke" key="collation">Sortiranje po broju crta</type>
-			<type type="traditional" key="collation">Tradicionalno sortiranje</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metri�ki</measurementSystemName>
-			<measurementSystemName type="US">SAD</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Jezik: {0}</codePattern>
-			<codePattern type="script">Skript: {0}</codePattern>
-			<codePattern type="territory">Region: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c � ć d đ {dž} e-l {lj} m n {nj} o p r s š t-v z ž]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q w-y]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="chinese">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="coptic">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="ethiopic">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">avg</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januar</month>
-							<month type="2">februar</month>
-							<month type="3">mart</month>
-							<month type="4">april</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">avgust</month>
-							<month type="9">septembar</month>
-							<month type="10">oktobar</month>
-							<month type="11">novembar</month>
-							<month type="12">decembar</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">j</month>
-							<month type="2">f</month>
-							<month type="3">m</month>
-							<month type="4">a</month>
-							<month type="5">m</month>
-							<month type="6">j</month>
-							<month type="7">j</month>
-							<month type="8">a</month>
-							<month type="9">s</month>
-							<month type="10">o</month>
-							<month type="11">n</month>
-							<month type="12">d</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ned</day>
-							<day type="mon">pon</day>
-							<day type="tue">uto</day>
-							<day type="wed">sre</day>
-							<day type="thu">�et</day>
-							<day type="fri">pet</day>
-							<day type="sat">sub</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">nedelja</day>
-							<day type="mon">ponedeljak</day>
-							<day type="tue">utorak</day>
-							<day type="wed">sreda</day>
-							<day type="thu">�etvrtak</day>
-							<day type="fri">petak</day>
-							<day type="sat">subota</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">n</day>
-							<day type="mon">p</day>
-							<day type="tue">u</day>
-							<day type="wed">s</day>
-							<day type="thu">�</day>
-							<day type="fri">p</day>
-							<day type="sat">s</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. kvartal</quarter>
-							<quarter type="2">2. kvartal</quarter>
-							<quarter type="3">3. kvartal</quarter>
-							<quarter type="4">4. kvartal</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>pre podne</am>
-				<pm>popodne</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Pre nove ere</era>
-						<era type="1">Nove ere</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">p. n. e.</era>
-						<era type="1">n. e</era>
-					</eraAbbr>
-				</eras>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="Hm">H.mm</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M.yy - M.yy</greatestDifference>
-							<greatestDifference id="y">M.yy - M.yy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>godina</displayName>
-					</field>
-					<field type="month">
-						<displayName>mesec</displayName>
-					</field>
-					<field type="week">
-						<displayName>nedelja</displayName>
-					</field>
-					<field type="day">
-						<displayName>dan</displayName>
-						<relative type="-3">pre tri dana</relative>
-						<relative type="-2">prekju�e</relative>
-						<relative type="-1">ju�e</relative>
-						<relative type="0">danas</relative>
-						<relative type="1">sutra</relative>
-						<relative type="2">prekosutra</relative>
-						<relative type="3">za tri dana</relative>
-					</field>
-					<field type="weekday">
-						<displayName>dan u nedelji</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>pre podne/ popodne</displayName>
-					</field>
-					<field type="hour">
-						<displayName>�as</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minut</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>zona</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="indian">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="islamic">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="japanese">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="persian">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-			</calendar>
-			<calendar type="roc">
-				<am>pre podne</am>
-				<pm>popodne</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">Pre RK</era>
-						<era type="1">RK</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Nepoznat ili nevažeći grad</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andora</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Dubai</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabul</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>Antigva</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>Angvila</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Kiraso</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Luanda</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Rotera</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Palmer</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Južni pol</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Å ova</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Moson</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Dejvis</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Vostok</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Kasej</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dimon d’Urvil</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>MakMurdo</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Rio galegos</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Mendoza (Argentina)</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>San Huan (Argentina)</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>UÅ¡uaia</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>La Rioja</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>San Luis</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Katamarka (Argentina)</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Salta</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Jujui</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Tukuman</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Kordoba (Argentina)</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Buenos Aires</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pago Pago</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Be�</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Pert (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Iukla (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Darvin (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>Adelaida (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Broken Hil (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Kurie (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Melburn (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Horbat (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Lindeman</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Sidnej (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Brizbejn (Australija)</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Lord Hov</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>Aruba</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Baku</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbados</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Daka</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brisel</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Uagadugu</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofija</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrein</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Budžumbura</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Bermudi</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Bruneji</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>La Paz</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepe (Brazil)</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Rio Branko</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Porto Veljo</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Boa Vista</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Manaus</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Kuiaba</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Santarem</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Kampo Grande</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belem</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>Aragvajana</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Sao Paolo</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Bahia (Brazil)</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Fortaleza</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Masejo</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Resife</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>Noronja</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>Nasau</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimphu</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Gaboron</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Minsk</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belize</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Doson (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Vajthors</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Inuvik (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Vankuver (kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Doson Krik (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Jelonajf</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Edmonton (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Svift Kurent</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Kembridž Bej (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Regina</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Vinipeg (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Rezolut</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Rejni river</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Rankin Inlet</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Koral Harbur (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Tander Bej</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>Nipigon</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Toronto (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Montreal (kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ikaluit</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Pangnirtung</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Monkton</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Halifaks (kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Gus Bej (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Glejs Bej (Kanada)</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Blanc-Sejblon (kanada)</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Sv. Džon (Kanada)</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Kokosova ostrva</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Kinšasa</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Lumumbaši</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Bangui</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Brazavil</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Cirih</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>Abidžan</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Rarotonga</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Uskršnje ostrvo</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Santijago</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Duala</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Kašgar (Kina)</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumki</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ÄŒongking (Kina)</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Å angaj</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Harbin (Kina)</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogota</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kostarika</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havana</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kape Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Božićno ostrvo</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>Nikozija</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Berlin</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Džibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhagen</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominika</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Santo Domingo</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alžir</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galapagos</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Gvajakil</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Talin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Ajun</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>Asmera</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarska ostrva</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Seuta</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Madrid</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Adis Abeba</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsinki</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fidži</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Stenli</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Truk</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Ponape</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Košre</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Farska Ostrva</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Pariz</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Librevil</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>London</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Grenada</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tbilisi</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Kajen</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>Akra</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Gibraltar</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Tule</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Nuk</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Skorezbisund</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkšavn</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Banžul</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Konakri</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>Gvadalupe</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Malabo</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atina</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Južna Džordžija</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Gvatemala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Guam</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Bisao</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guana</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Port-o-Prens</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Budimpešta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Džakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Pontianak</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Makasar</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Džajapura</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Dablin</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>ÄŒagos</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Rejkjavik</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rim</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamajka</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>Aman</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Tokio</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>Najrobi</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Biškek</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Pnom Pen</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Enderberi</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Kiritimati</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Tarava</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Komoro</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Sent Kits</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Pjongjang</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuvajt</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kajmanska ostrva</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktau</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Oral (Kazakhstan)</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Akutobe</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kizilorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almati (Kazahstan)</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Vijetijan</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Bejrut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Sv. Lucija</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Vaduc</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Kolombo</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Monrovija</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Maseru</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Viljnus</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luksemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Riga</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Tripoli</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Kazablanka</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Kišnjev</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>Antananarivo</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Kvadžalejin</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Majuro</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Bamako</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Rangun</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Hovd</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ÄŒojbalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makau</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Sajpan</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinik</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>Navakšut</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Montserat</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Malta</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauricijus</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivi</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Blantir</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Tihuana (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Hermosiljo (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlan (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ÄŒihuahua (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Montrej (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Meksiko siti (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Merida (Meksika)</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Kankun (Meksiko)</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Kuala Lumpur</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Ku�ing</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Maputo</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Vindhuk</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>Numea</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>Nijamej</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>Norfolk</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Lagos</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Managva</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>Amsterdam</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>Oslo</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Katmandu</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Nauru</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>Niue</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Katham (Novi Zeland)</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Okland</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muskat</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panama</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Lima</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Tahiti</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markiz</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Gambije</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Port Morzbi</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Manila</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Kara�i</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Varšava</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Mikelon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitkairn</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Riko</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Gaza</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azori</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lisabon</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Palau</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunsion</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Ujedinjenje</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukurešt</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Kaliningrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Volgograd (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Samara (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekatepinburg (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Omsk (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>Novosibirsk (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Irkuck (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Vladivostok (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalin (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Magadan (Rusija)</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kam�atka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadir</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Kigali</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Rijad</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Gvadalkanal</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Mahe</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Kartum</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stokholm</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>Sveta Jelena</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Fritaun</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Dakar</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Mogadiš</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Paramirbo</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Sao Tome</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damask</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Mbabane</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Grand Turk</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>Ndžamena</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>Kergelen</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Lome</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Bankok</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dušanbe</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Fakaofo</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Dili</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅ¡habad</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Tongatapu</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Istanbul</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Port of Spejn</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Fanafuti</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Tajpej</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Dar-es-Salam</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Užgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Kijev</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Simferopol</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporožje</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Kampala</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Midvej</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Džonston</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Vake</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>Adak (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>Nom</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Honolulu (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Enkoridž</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Jakuta</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Žano</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Los Anđeles (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Bojzi (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Feniks (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Å iprok (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Denver (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>Novi Salem, Severna Dakota (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Centar, Severna Dakota (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ÄŒikago (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Menomine</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Vincenis, Indijana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Petesburg (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Tel Siti (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Konks (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Vinamak, Indijana</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Indianapolis (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Luivil (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Vevej, Indijana</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Monti�elo (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Detroit (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Njujork (SAD)</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Montevideo</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Samarkand (Uzbekistan)</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Taškent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Sent Vinsent</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Karakas</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Tortola</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Sv. Toma</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Efate</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Valis</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>Apija</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>Aden</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Majote</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Johanesburg</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Lusaka</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Harare</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre vreme</standard>
-					<daylight>Acre letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<standard>ACT (Acre)</standard>
-					<daylight>ACST (Acre)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Avganistan vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Centralna Afrika vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Isto�na Afrika vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Južna Afrika vreme</generic>
-					<standard>Južna Afrika standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Zapadna Afrika vreme</standard>
-					<daylight>Zapadna Afrika letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktjubinsk vreme</standard>
-					<daylight>Aktjubinsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Aljaska vreme</generic>
-					<standard>Aljaska standardno vreme</standard>
-					<daylight>Aljaska letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Aljaska-Havaji vreme</generic>
-					<standard>Aljaska-Havaji standardno vreme</standard>
-					<daylight>Aljaska-Havaji letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almatu vreme</standard>
-					<daylight>Almatu letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazon vreme</standard>
-					<daylight>Amazon letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Centralno vreme (SAD)</generic>
-					<standard>Centralno standardno vreme (SAD)</standard>
-					<daylight>Centralno letnje merenje vremena (SAD)</daylight>
-				</long>
-				<short>
-					<generic>CT (SAD)</generic>
-					<standard>CST (SAD)</standard>
-					<daylight>CDT (SAD)</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Isto�no vreme (SAD)</generic>
-					<standard>Isto�no standardno vreme (SAD)</standard>
-					<daylight>Isto�no letnje ra�unanje vremena (SAD)</daylight>
-				</long>
-				<short>
-					<generic>ET (SAD)</generic>
-					<standard>EST (SAD)</standard>
-					<daylight>EDT (SAD)</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Planinsko vreme (SAD)</generic>
-					<standard>Planinsko standardno vreme (SAD)</standard>
-					<daylight>Planinsko letnje ra�unanje vremena (SAD)</daylight>
-				</long>
-				<short>
-					<generic>MT (SAD)</generic>
-					<standard>MST (SAD)</standard>
-					<daylight>MDT (SAD)</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pacifi�ko vreme (SAD)</generic>
-					<standard>Pacifi�ko vreme (SAD)</standard>
-					<daylight>Pacifi�ko letnje ra�unanje vremena (SAD)</daylight>
-				</long>
-				<short>
-					<generic>PT (SAD)</generic>
-					<standard>PST (SAD)</standard>
-					<daylight>PDT (SAD)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadir vreme</standard>
-					<daylight>Anadir letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Akvtau vreme</standard>
-					<daylight>Akvtau letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Akvtau)</standard>
-					<daylight>AQTST (Akvtau)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Akvtobe vreme</standard>
-					<daylight>Akvtobe letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Akvtobe)</standard>
-					<daylight>AQTST (Akvtobe)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabijsko vreme</generic>
-					<standard>Arabijsko standardno vreme</standard>
-					<daylight>Arapsko letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<generic>AT (Arabija)</generic>
-					<standard>AST (Arabija)</standard>
-					<daylight>ADT (Arabija)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Argentina vreme</standard>
-					<daylight>Argentina letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Zapadna Argentina vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Armenija vreme</standard>
-					<daylight>Armenija letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>AÅ¡kabad vreme</standard>
-					<daylight>Aškabad letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantsko vreme</generic>
-					<standard>Atlantsko standardno vreme</standard>
-					<daylight>Atlantsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Centralno australijsko vreme</generic>
-					<standard>Centralno australijsko standardno vreme</standard>
-					<daylight>Centralno australijsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Australijsko centralno zapadno vreme</generic>
-					<standard>Australijsko centralno zapadno standardno vreme</standard>
-					<daylight>Australijsko centralno zapadno letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Australijsko isto�no vreme</generic>
-					<standard>Australijsko isto�no standardno vreme</standard>
-					<daylight>Australijsko isto�no letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Australijsko zapadno vreme</generic>
-					<standard>Australijsko zapadno standardno vreme</standard>
-					<daylight>Australijsko zapadno letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Azerbejdžan vreme</standard>
-					<daylight>Azerbejdžan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azori vreme</standard>
-					<daylight>Azori letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Baku vreme</standard>
-					<daylight>Baku letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>Bangladeš vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering vreme</generic>
-					<standard>Bering standardno vreme</standard>
-					<daylight>Bering letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<generic>BT (Bering)</generic>
-					<standard>BST (Bering)</standard>
-					<daylight>BDT (Bering)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Butan vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Bolivija vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo vreme</standard>
-					<daylight>Borneo letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brazilija vreme</standard>
-					<daylight>Brazilija letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunei Darusalam vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Zelenortska ostrva vreme</standard>
-					<daylight>Zelenortska ostrva letnje ra�unanje vermena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>ÄŒamoro vreme</generic>
-					<standard>ÄŒamoro standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>ÄŒangbai vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>ÄŒatam standardno vreme</standard>
-					<daylight>Čatam letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>ÄŒile vreme</standard>
-					<daylight>Čile letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Kina vreme</generic>
-					<standard>Kinesko standardno vreme</standard>
-					<daylight>Kina letnje ra�unanje vremena</daylight>
-				</long>
-				<short>
-					<generic>CT (Kina)</generic>
-					<standard>CST (Kina)</standard>
-					<daylight>CDT (Kina)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>ÄŒojbalsan vreme</standard>
-					<daylight>Čojbalsan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Božićna Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Kokos (Keling) Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Kolumbija vreme</standard>
-					<daylight>Kolumbija letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Kukova ostrva vreme</standard>
-					<daylight>Kukova ostrva, polu-letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Kuba vreme</generic>
-					<standard>Kuba standardno vreme</standard>
-					<daylight>Kuba letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Da�a vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Dejvis vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dimon d’Urvil vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>Dušanbe vreme</standard>
-					<daylight>Dušanbe letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Holandska Gvijana vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>Isto�ni Timor vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Uskršnja ostrva vreme</standard>
-					<daylight>Uskršnja ostrva letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ekvador vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Centralnoevropsko vreme</standard>
-					<daylight>Centralnoevropsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Isto�noevropsko vreme</standard>
-					<daylight>Isto�noevropsko letnje ra�unanje vemena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Zapadna evropsko vreme</standard>
-					<daylight>Zapadno evropsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Folklandska Ostrva vreme</standard>
-					<daylight>Folklandska ostrva letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Fidži vreme</standard>
-					<daylight>Fidži letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Francuska Gvajana vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Francuske Južne Teritorije vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>Frunze vreme</standard>
-					<daylight>Frunze letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagos vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Gambijer vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Gruzija vreme</standard>
-					<daylight>Gruzija letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Grinvi� vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Centralni Grenland vreme</standard>
-					<daylight>Centralni Grenland letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Isto�ni Grenland vreme</standard>
-					<daylight>Isto�ni Grenland letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Zapadni Grenland vreme</standard>
-					<daylight>Zapadni Grenland letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guam standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Zaliv vreme</generic>
-					<standard>Zaliv standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Gvajana vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Havaǰsko-aleućansko standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hong Kong vreme</standard>
-					<daylight>Hong Kong letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Hovd vreme</standard>
-					<daylight>Hovd letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Indijsko standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Indijski okean vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Indokina vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Centralno indonezijsko vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>Isto�no indonezijsko vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Zapadno indonezijsko vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Iran standardno vreme</standard>
-					<daylight>Iran letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Irkuck vreme</standard>
-					<daylight>Irkuck letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>Izraelsko standardno vreme</standard>
-					<daylight>Izraelsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japansko vreme</generic>
-					<standard>Japansko standardno vreme</standard>
-					<daylight>Japan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Petropavlovsk-Kam�atski vreme</standard>
-					<daylight>Petropavlovsk-Kam�atski letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Kara�i vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>Kašgar vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>Isto�ni Kazahstan vreme</generic>
-					<standard>Isto�ni Kazahstan standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Zapadni Kazahstan vreme</generic>
-					<standard>Zapadni Kazahstan standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kizilorda vreme</standard>
-					<daylight>Kizilorda letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Koreja vreme</generic>
-					<standard>Korejsko standardno vreme</standard>
-					<daylight>Korejsko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Košre vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasnojarsk vreme</standard>
-					<daylight>Krasnojarsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>Kujbišev vreme</standard>
-					<daylight>Kujbišev letnje ra�unanje vemena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kvajalejnsko vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kirgizstan vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lanka vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Lajn ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long Å u vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Hov vreme</generic>
-					<standard>Lord Hov standardno vreme</standard>
-					<daylight>Lord Hov letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Makao vreme</standard>
-					<daylight>Makao letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Magadan vreme</standard>
-					<daylight>Magadan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaja vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Malezija vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Maldivi vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Markiz vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Maršalska Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauricijus vreme</standard>
-					<daylight>Mauricijus letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Moson vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulan Bator vreme</standard>
-					<daylight>Ulan Bator letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskva vreme</generic>
-					<standard>Moskva standardno vreme</standard>
-					<daylight>Moskva letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Mijanmar vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Nauru vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepal vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>Nova Kaledonija vreme</standard>
-					<daylight>Nova Kaledonija letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Novi Zeland vreme</generic>
-					<standard>Novi Zeland standardno vreme</standard>
-					<daylight>Novi Zeland letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Njufaundlend vreme</generic>
-					<standard>Njufaundlend standardno vreme</standard>
-					<daylight>Njufaundlend letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Niue vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Norfolk Ostrvo vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronja vreme</standard>
-					<daylight>Fernando de Noronja letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Severna Marijanska Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novosibirsk vreme</standard>
-					<daylight>Novosibirsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omsk vreme</standard>
-					<daylight>Omsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistan vreme</standard>
-					<daylight>Pakistan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Palau vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Papua Nova Gvineja vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paragvaj vreme</standard>
-					<daylight>Paragvaj letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peru vreme</standard>
-					<daylight>Peru letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Filipini vreme</standard>
-					<daylight>Filipini letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Feni�ka ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pjer i Mikelon vreme</generic>
-					<standard>Pjer i Mikelon standardno vreme</standard>
-					<daylight>Pjer i Mikelon letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Pitkairn vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Ponape vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Kizilorda vreme</standard>
-					<daylight>Kizilorda letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Rejunion vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Roter vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sahalin vreme</standard>
-					<daylight>Sahalin letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara vreme</standard>
-					<daylight>Samara letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Samarkand vreme</standard>
-					<daylight>Samarkand letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Samoa standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Sejšeli vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Šev�enko vreme</standard>
-					<daylight>Šev�enko letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Singapur standardno vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Solomonska Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Južna Džordžija vreme</standard>
-				</long>
-				<short>
-					<standard>GST (Sv. Džordžija)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Surinam vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk vreme</standard>
-					<daylight>Sverdlovsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Å ova vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Tahiti vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tadžikistan vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>Taškent vreme</standard>
-					<daylight>Taškent letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tbilisi vreme</standard>
-					<daylight>Tbilisi letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Tokelo vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Tonga vreme</standard>
-					<daylight>Tonga letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Truk vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Turska vreme</standard>
-					<daylight>Turska letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Turkmenistan vreme</standard>
-					<daylight>Turkmenistan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Tuvalu vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Ural'sk vreme</standard>
-					<daylight>Ural'sk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Urugvaj vreme</standard>
-					<daylight>Urugvaj letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumki vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Uzbekistan vreme</standard>
-					<daylight>Uzbekistan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Vanuatu vreme</standard>
-					<daylight>Vanuatu letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venecuela vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vladivostok vreme</standard>
-					<daylight>Vladivostok letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgograd vreme</standard>
-					<daylight>Volgograd Letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vostok vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Vejk vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Valis i Futuna Ostrva vreme</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Jakutsk vreme</standard>
-					<daylight>Jakutsk letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Jekaterinburg vreme</standard>
-					<daylight>Jekaterinburg letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Jerevan vreme</standard>
-					<daylight>Jerevan letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Jukon vreme</generic>
-					<standard>Jukon standardno vreme</standard>
-					<daylight>Jukon letnje ra�unanje vremena</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorska pezeta (ADP)</displayName>
-				<displayName count="few">Andorijske pezete</displayName>
-				<displayName count="many">Andorijskih pezeta</displayName>
-				<displayName count="one">Andorijska pezeta</displayName>
-				<displayName count="other">Andorijske pezete</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Ujedinjeni arapski emirati dirham</displayName>
-				<displayName count="few">UAE dirama</displayName>
-				<displayName count="many">UAE dirama</displayName>
-				<displayName count="one">UAE diram</displayName>
-				<displayName count="other">UAE dirama</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Avganistanski avgani (1927-2002) AFA</displayName>
-				<displayName count="few">Avganistanska avgana (AFA)</displayName>
-				<displayName count="many">Avganistanskih avgana (AFA)</displayName>
-				<displayName count="one">Avganistanski avgan (AFA)</displayName>
-				<displayName count="other">Avganistanski avgan (AFA)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Avganistanski avgani (AFN)</displayName>
-				<displayName count="few">Avganistanska avgana</displayName>
-				<displayName count="one">Avganistanski avgan</displayName>
-				<displayName count="other">Avganistanski avgan</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Albanski lek</displayName>
-				<displayName count="few">Albanska leka</displayName>
-				<displayName count="many">Albanskih leka</displayName>
-				<displayName count="one">albanski lek</displayName>
-				<displayName count="other">albanski lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Jermenski dram</displayName>
-				<displayName count="few">Jermenske drame</displayName>
-				<displayName count="many">Jermenskih drama</displayName>
-				<displayName count="one">jermenski dram</displayName>
-				<displayName count="other">jermenski drami</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Holandski Antili gilder (ANG)</displayName>
-				<displayName count="few">Holandskoantilska gildera</displayName>
-				<displayName count="many">Holandskoantilskih gildera</displayName>
-				<displayName count="one">Holandskoantilski gilder</displayName>
-				<displayName count="other">Holandskoantilski gildera</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angolijska kvanza (AOA)</displayName>
-				<displayName count="few">Angolijske kvanze (AOA)</displayName>
-				<displayName count="many">Angolijskih kvanzi</displayName>
-				<displayName count="one">Angolijska kvanza</displayName>
-				<displayName count="other">Angolijskih kvanzi</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angolijska kvanza (1977-1990) (AOK)</displayName>
-				<displayName count="few">Angolijske kvanze (AOK)</displayName>
-				<displayName count="many">Angolijskih kvanzi (AOK)</displayName>
-				<displayName count="one">Angolijska kvanza (AOK)</displayName>
-				<displayName count="other">Angolijskih kvanzi (AOK)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Angolijska nova kvanza (1990-2000) (AON)</displayName>
-				<displayName count="few">angolijske nove kvanze (AON)</displayName>
-				<displayName count="many">angolijskih novih kvanzi (AON)</displayName>
-				<displayName count="one">angolijska nova kvanza (AON)</displayName>
-				<displayName count="other">angolski novi kvanze (AON)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angolijska kvanza reajustado (1995-1999) (AOR)</displayName>
-				<displayName count="few">angalske kvanze reađustado (AOR)</displayName>
-				<displayName count="many">angolijskih kvanzi reađustado</displayName>
-				<displayName count="one">angolijska kvanza reađustado</displayName>
-				<displayName count="other">angolijskih kvanzi reađustado</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Argentinski austral (ARA)</displayName>
-				<displayName count="few">argentinska australa (ARA)</displayName>
-				<displayName count="many">argentinskih australa (ARA)</displayName>
-				<displayName count="one">argentinski austral (ARA)</displayName>
-				<displayName count="other">argentinski australs (ARA)</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Argentinski pezo (1983-1985) (ARP)</displayName>
-				<displayName count="few">argentinska pezosa (ARP)</displayName>
-				<displayName count="many">argentinskih pezosa (ARP)</displayName>
-				<displayName count="one">argentinski pezo (ARP)</displayName>
-				<displayName count="other">argentinskih pezosa (ARP)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Argentinski pezo</displayName>
-				<displayName count="few">argentinska pezosa</displayName>
-				<displayName count="many">argentinskih pezosa</displayName>
-				<displayName count="one">argentinski pezos</displayName>
-				<displayName count="other">argentinskih pezosa</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Austrijski Å¡iling</displayName>
-				<displayName count="few">austrijska Å¡ilinga</displayName>
-				<displayName count="many">austrijskih Å¡ilinga</displayName>
-				<displayName count="one">austrijski Å¡iling</displayName>
-				<displayName count="other">austrijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Australijski dolar</displayName>
-				<displayName count="few">Australijska dolara</displayName>
-				<displayName count="many">Australijskih dolara</displayName>
-				<displayName count="one">australijski dolar</displayName>
-				<displayName count="other">australijskih dolara</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Arubijski florin (AWG)</displayName>
-				<displayName count="few">arubanska florina</displayName>
-				<displayName count="many">arubanskih florina</displayName>
-				<displayName count="one">arubanski florin</displayName>
-				<displayName count="other">arubanskih florina</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbejdžanski manat (AZM)</displayName>
-				<displayName count="few">azerbejdžanska manata(AZM)</displayName>
-				<displayName count="many">azerbejdžanskih manata (AZM)</displayName>
-				<displayName count="one">azerbejdžanski manat (AZM)</displayName>
-				<displayName count="other">azerbejdžanskih manata (AZM)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbejdžanski manat (AZN)</displayName>
-				<displayName count="few">azerbejdžanska manata</displayName>
-				<displayName count="many">azerbejdžanskih manata</displayName>
-				<displayName count="one">azerbejdžanski manat</displayName>
-				<displayName count="other">azerbejdžanskih manata</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosansko-Hercegova�ki dinar</displayName>
-				<displayName count="few">Bosansko-Hercegova�ka dinara</displayName>
-				<displayName count="many">Bosansko-Hercegova�kih dinara</displayName>
-				<displayName count="one">bosansko-hercegova�ki dinar</displayName>
-				<displayName count="other">bosansko-hercegova�kih dinara</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Bosansko-Hercegova�ka konvertibilna marka</displayName>
-				<displayName count="few">Bosansko-Hercegova�ke konvertibilne marke</displayName>
-				<displayName count="many">Bosansko-Hercegova�kih konvertibilnih maraka</displayName>
-				<displayName count="one">bosansko-hercegova�ka konvertibilna marka</displayName>
-				<displayName count="other">bosansko-hercegova�kih konvertibilnih maraka</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbadoski dolar (BBD)</displayName>
-				<displayName count="few">barbadoška dolara</displayName>
-				<displayName count="many">barbadoških dolara</displayName>
-				<displayName count="one">barbadoški dolar</displayName>
-				<displayName count="other">barbadoških dolara</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeška taka (BDT)</displayName>
-				<displayName count="few">bangladeške take</displayName>
-				<displayName count="many">bangladeških taka</displayName>
-				<displayName count="one">bangladeška taka</displayName>
-				<displayName count="other">bangladeških taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belgijski frank (konvertibilni) (BEC)</displayName>
-				<displayName count="few">belgijska franka (konvertibilna)</displayName>
-				<displayName count="many">belgijskih franaka (BEC) (konvertibilnih)</displayName>
-				<displayName count="one">belgijski franak (konvertibilni)</displayName>
-				<displayName count="other">belgijskih franaka BEC (konvertibilnih)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belgijski franak</displayName>
-				<displayName count="few">belgijska franka</displayName>
-				<displayName count="many">belgijskih franaka</displayName>
-				<displayName count="one">belgijski franak</displayName>
-				<displayName count="other">belgijskih franaka</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belgijski frank (finansijski) (BEL)</displayName>
-				<displayName count="few">belgijska franka (BEL) (finansijska)</displayName>
-				<displayName count="many">belgijskih franaka (BEL) (finansijskih)</displayName>
-				<displayName count="one">belgijski franak (finansijski)</displayName>
-				<displayName count="other">belgijskih franaka BEL (finansijskih)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bugarski tvrdi lev (BGL)</displayName>
-				<displayName count="few">bugarska tvrda leva</displayName>
-				<displayName count="many">bugarskih tvrdih leva</displayName>
-				<displayName count="one">bugarski tvrdi lev</displayName>
-				<displayName count="other">bugarskih tvrdih leva</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Bugarski lev</displayName>
-				<displayName count="few">Bugarska leva</displayName>
-				<displayName count="many">Bugarskih leva</displayName>
-				<displayName count="one">bugarski lev</displayName>
-				<displayName count="other">Bugarskih leva</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreinski dinar (BHD)</displayName>
-				<displayName count="few">bahreinskih dinara</displayName>
-				<displayName count="many">bahreinskih dinara</displayName>
-				<displayName count="one">bahreinskih dinara</displayName>
-				<displayName count="other">bahreinskih dinara</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundski franak (BIF)</displayName>
-				<displayName count="few">burundska franka</displayName>
-				<displayName count="many">burundskih franaka</displayName>
-				<displayName count="one">burundski franak</displayName>
-				<displayName count="other">BIF</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermudski dolar (BMD)</displayName>
-				<displayName count="few">bermudska dolara</displayName>
-				<displayName count="many">bermudskih dolara</displayName>
-				<displayName count="one">bermudski dolar</displayName>
-				<displayName count="other">bermudskih dolara</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunejski dolar</displayName>
-				<displayName count="few">brunejska dolara</displayName>
-				<displayName count="many">brunejskih dolara</displayName>
-				<displayName count="one">brunejski dolar</displayName>
-				<displayName count="other">brunejskih dolara</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivijski boliviano</displayName>
-				<displayName count="few">bolivijska boliviana</displayName>
-				<displayName count="many">bolivijskih boliviana</displayName>
-				<displayName count="one">bolivijski boliviano</displayName>
-				<displayName count="other">bolivijskih boliviana</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivijski pezo (BOP)</displayName>
-				<displayName count="few">Bolivijska pezosa</displayName>
-				<displayName count="many">bolivijskih pezosa</displayName>
-				<displayName count="one">bolivijski pezo</displayName>
-				<displayName count="other">bolivijskih pezosa</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivijski mvdol (BOV)</displayName>
-				<displayName count="few">bolivijska mvdola</displayName>
-				<displayName count="many">bolivijskih mvdola</displayName>
-				<displayName count="one">bolivijski mvdol</displayName>
-				<displayName count="other">bolivijskih mvdola</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Brazilski kruzeiro novo (1967-1986) (BRB)</displayName>
-				<displayName count="few">brazilska nova kruzeira (BRB)</displayName>
-				<displayName count="many">brazilskih novih kruzeira (BRB)</displayName>
-				<displayName count="one">brazilski novi kruzeiro (BRB)</displayName>
-				<displayName count="other">brazilskih novih kruzeira (BRB)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brazilski kruzado (BRC)</displayName>
-				<displayName count="few">brazilska kruzadosa</displayName>
-				<displayName count="many">brazilskih kruzadosa</displayName>
-				<displayName count="one">brazilskih kruzado</displayName>
-				<displayName count="other">brazilskih kruzadosa</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brazilski kruzeiro (1990-1993) (BRE)</displayName>
-				<displayName count="few">brazilska kruzeira (BRE</displayName>
-				<displayName count="many">brazilskih kruzeira (BRE)</displayName>
-				<displayName count="one">brazilski kruzeiro (BRE)</displayName>
-				<displayName count="other">brazilskih kruzeira (BRE)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brazilski real</displayName>
-				<displayName count="few">brazilska reala</displayName>
-				<displayName count="many">brazilskih reala</displayName>
-				<displayName count="one">brazilski real</displayName>
-				<displayName count="other">brazilskih reala</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Brazilski kruzado novo (BRN)</displayName>
-				<displayName count="few">brazilska nova kruzada</displayName>
-				<displayName count="many">brazilskih novih kruzada</displayName>
-				<displayName count="one">brazilski novi kruzado</displayName>
-				<displayName count="other">brazilskih novih kruzada</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brazilski kruzeiro (BRR)</displayName>
-				<displayName count="few">brazilijska kruzeira</displayName>
-				<displayName count="many">brazilskih kruzeira</displayName>
-				<displayName count="one">brazilski kruzeiro</displayName>
-				<displayName count="other">brazilskih kruzeira</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamski dolar (BSD)</displayName>
-				<displayName count="few">bahamska dolara</displayName>
-				<displayName count="many">bahamskih dolara</displayName>
-				<displayName count="one">bahamski dolar</displayName>
-				<displayName count="other">bahamskih dolara</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Butanski ngultrum (BTN)</displayName>
-				<displayName count="few">butanska ngultruma</displayName>
-				<displayName count="many">butanskih ngultruma</displayName>
-				<displayName count="one">butanski ngultrum</displayName>
-				<displayName count="other">butanski ngultruma</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burmanski kjat (BUK)</displayName>
-				<displayName count="few">burmanska kjata</displayName>
-				<displayName count="many">burmanskih kjata</displayName>
-				<displayName count="one">burmanski kjat</displayName>
-				<displayName count="other">burmanskih kjata</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botsvanska pula (BWP)</displayName>
-				<displayName count="few">bocvanske pule</displayName>
-				<displayName count="many">bocvanskih pula</displayName>
-				<displayName count="one">bocvanska pula</displayName>
-				<displayName count="other">bocvanskih pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Beloruska nova rublja (1994-1999) (BYB)</displayName>
-				<displayName count="few">beloruske nove rublje (BYB)</displayName>
-				<displayName count="many">beloruskih novih rublji (BYB)</displayName>
-				<displayName count="one">beloruska nova rublja (BYB)</displayName>
-				<displayName count="other">beloruskih novih rublji (BYB)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Beloruska rublja (BYR)</displayName>
-				<displayName count="few">beloruske rublje</displayName>
-				<displayName count="many">beloruskih rublji</displayName>
-				<displayName count="one">beloruska rublja</displayName>
-				<displayName count="other">bjeloruske rublje</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize dolar (BZD)</displayName>
-				<displayName count="few">belizeanska dolara</displayName>
-				<displayName count="many">belizeanskih dolara</displayName>
-				<displayName count="one">belizeanski dolar</displayName>
-				<displayName count="other">belizeanskih dolara</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanadski dolar</displayName>
-				<displayName count="few">Kanadska dolara</displayName>
-				<displayName count="many">Kanadskih dolara</displayName>
-				<displayName count="one">kanadski dolar</displayName>
-				<displayName count="other">kanadskih dolara</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Kongolski franak (CDF)</displayName>
-				<displayName count="few">kongolska franka</displayName>
-				<displayName count="many">kongoanskih franaka</displayName>
-				<displayName count="one">kongolski franak</displayName>
-				<displayName count="other">kongolskih franaka</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR Evro (CHE)</displayName>
-				<displayName count="few">WIR evra</displayName>
-				<displayName count="many">WIR evra</displayName>
-				<displayName count="one">WIR evro</displayName>
-				<displayName count="other">WIR evra</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Å vajcarski franak</displayName>
-				<displayName count="few">Å vajcarska franka</displayName>
-				<displayName count="many">Å vajcarskih franaka</displayName>
-				<displayName count="one">Å¡vajcarski franak</displayName>
-				<displayName count="other">Å¡vajcarskih franaka</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR franak (CHW)</displayName>
-				<displayName count="few">WIR franka</displayName>
-				<displayName count="many">WIR franaka</displayName>
-				<displayName count="one">WIR franak</displayName>
-				<displayName count="other">WIR franak</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>ÄŒileanski unidades de fomento (CLF)</displayName>
-				<displayName count="few">�ileanska unidades de fomentos</displayName>
-				<displayName count="many">�ileanskih unidades de fomentos</displayName>
-				<displayName count="one">�ileanski unidades de fomentos</displayName>
-				<displayName count="other">�ileanski unidades de fomentos</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>ÄŒileanski pezo</displayName>
-				<displayName count="few">�ileanska pezosa</displayName>
-				<displayName count="many">�ileanskih pezosa</displayName>
-				<displayName count="one">�ileanski pezos</displayName>
-				<displayName count="other">�ileanski pezos</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Kineski Juan Renminbi</displayName>
-				<displayName count="few">kineska juana</displayName>
-				<displayName count="many">kineskih juana</displayName>
-				<displayName count="one">kineski juan</displayName>
-				<displayName count="other">kineskih juana</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolumbijski pezo</displayName>
-				<displayName count="few">kolumbijska pezosa</displayName>
-				<displayName count="many">kolumbijskih pezosa</displayName>
-				<displayName count="one">kolumbijski pezo</displayName>
-				<displayName count="other">kolumbijski pezosi</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor real (COU)</displayName>
-				<displayName count="few">unidad de valor reala</displayName>
-				<displayName count="many">unidad de valor reala</displayName>
-				<displayName count="one">unidad de valor real</displayName>
-				<displayName count="other">unidad de valor real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kostarikanski kolon (CRC)</displayName>
-				<displayName count="few">kostarikanska kolona</displayName>
-				<displayName count="many">kostarikanskih kolona</displayName>
-				<displayName count="one">kostarikanski kolon</displayName>
-				<displayName count="other">CRC</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Stari srpski dinar</displayName>
-				<displayName count="few">stara srpska dinara</displayName>
-				<displayName count="many">starih srpskih dinara</displayName>
-				<displayName count="one">stari srpski dinar</displayName>
-				<displayName count="other">starih srpskih dinara</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Čehoslova�ka tvrda koruna (CSK)</displayName>
-				<displayName count="few">�ehoslova�ke tvrde krune</displayName>
-				<displayName count="many">�ehoslova�kih tvrdih kruna</displayName>
-				<displayName count="one">�ehoslova�ka tvrda kruna</displayName>
-				<displayName count="other">�ehoslova�ka tvrda kruna</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Kubanski pezo (CUP)</displayName>
-				<displayName count="few">kubanska pezosa</displayName>
-				<displayName count="many">kubanskih pezosa</displayName>
-				<displayName count="one">kubanski pezos</displayName>
-				<displayName count="other">kubanskih pezosa</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Kejp verdanški eskudo (CVE)</displayName>
-				<displayName count="few">zelenortska eskuda</displayName>
-				<displayName count="many">zelenortskih eskuda</displayName>
-				<displayName count="one">zelenortski eskudo</displayName>
-				<displayName count="other">zelenortskih eskuda</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Kipratska funta (CYP)</displayName>
-				<displayName count="few">kiparske funte</displayName>
-				<displayName count="many">kiparskih funti</displayName>
-				<displayName count="one">kiparska funta</displayName>
-				<displayName count="other">kiparska funta</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Češka kruna</displayName>
-				<displayName count="few">�eške krune</displayName>
-				<displayName count="many">�eških kruna</displayName>
-				<displayName count="one">�eška kruna</displayName>
-				<displayName count="other">�eških kruna</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Isto�noevropska marka (DDM)</displayName>
-				<displayName count="few">isto�nonema�ke marke</displayName>
-				<displayName count="many">isto�nonema�kih maraka</displayName>
-				<displayName count="one">isto�nonema�ka marka</displayName>
-				<displayName count="other">isto�nonema�kih maraka</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Nema�ka marka</displayName>
-				<displayName count="few">Nema�ke marke</displayName>
-				<displayName count="many">Nema�kih maraka</displayName>
-				<displayName count="one">nema�ka marka</displayName>
-				<displayName count="other">nema�kih maraka</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Džibutanski franak (DJF)</displayName>
-				<displayName count="few">džibutska franka</displayName>
-				<displayName count="many">džibutskih franaka</displayName>
-				<displayName count="one">džibutski franak</displayName>
-				<displayName count="other">džibutski franak</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Danska kruna</displayName>
-				<displayName count="few">danske krune</displayName>
-				<displayName count="many">danskih kruna</displayName>
-				<displayName count="one">danska kruna</displayName>
-				<displayName count="other">danskih kruna</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>DOminikanski pezo (DOP)</displayName>
-				<displayName count="few">dominikanska pezosa</displayName>
-				<displayName count="many">dominikanskih pezosa</displayName>
-				<displayName count="one">dominikanski pezo</displayName>
-				<displayName count="other">dominikanskih pezosa</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Alžirski dinar (DZD)</displayName>
-				<displayName count="few">alžirska dinara</displayName>
-				<displayName count="many">alžirskih dinara</displayName>
-				<displayName count="one">alžirski dinar</displayName>
-				<displayName count="other">alžirskih dinara</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ekvadorijski sukr (ECS)</displayName>
-				<displayName count="few">ekvadorska sakra</displayName>
-				<displayName count="many">ekvadorskih sakra</displayName>
-				<displayName count="one">ekvadorska sakra</displayName>
-				<displayName count="other">ekvadorskih sakra</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ekvadorski unidad de valor konstantin (UVC)</displayName>
-				<displayName count="few">ekvadorska unidad de valor constante (UVC)</displayName>
-				<displayName count="many">ekvadorskih unidad de valor constante (UVC)</displayName>
-				<displayName count="one">ekvadorski unidad de valor constante (UVC)</displayName>
-				<displayName count="other">ekvadorski unidad de valor constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estonska kruna</displayName>
-				<displayName count="few">estonske krune</displayName>
-				<displayName count="many">estonskih kruna</displayName>
-				<displayName count="one">estonska kruna</displayName>
-				<displayName count="other">estonskih kruna</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Egipatska funta</displayName>
-				<displayName count="few">egipatske funte</displayName>
-				<displayName count="many">egipatskih funti</displayName>
-				<displayName count="one">egipatska funta</displayName>
-				<displayName count="other">egipatskih funti</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritreanska nakfa (ERN)</displayName>
-				<displayName count="few">eritrejske nakfe</displayName>
-				<displayName count="many">eritrejskih nakfi</displayName>
-				<displayName count="one">eritrejska nakfa</displayName>
-				<displayName count="other">eritrejska nakfa</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>Španska pezeta (ra�un) ESA</displayName>
-				<displayName count="few">španske pezete (A ra�un)</displayName>
-				<displayName count="many">španskih pezeta (A ra�un)</displayName>
-				<displayName count="one">španska pezeta (A ra�un)</displayName>
-				<displayName count="other">španska pezeta (A ra�un)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>Španska pezeta (konvertibilni ra�un) (ESB)</displayName>
-				<displayName count="few">španske pezete (konvertibilan ra�un)</displayName>
-				<displayName count="many">španskih pezeta (konvertibilan ra�un)</displayName>
-				<displayName count="one">španska pezeta (konvertibilan ra�un)</displayName>
-				<displayName count="other">španska pezeta (konvertibilan ra�un)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>Å panska pezeta</displayName>
-				<displayName count="few">Å¡panska pezeta</displayName>
-				<displayName count="many">Å¡panskih pezeta</displayName>
-				<displayName count="one">španskа pezetа</displayName>
-				<displayName count="other">španskе pezetе</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etopijski bir (ETB)</displayName>
-				<displayName count="few">etiopijska bira</displayName>
-				<displayName count="many">etiopijskih bira</displayName>
-				<displayName count="one">etiopijski bir</displayName>
-				<displayName count="other">etiopijskih bira</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Evro</displayName>
-				<displayName count="few">evra</displayName>
-				<displayName count="many">evra</displayName>
-				<displayName count="one">evro</displayName>
-				<displayName count="other">evra</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Finska marka</displayName>
-				<displayName count="few">Finske marke</displayName>
-				<displayName count="many">Finskih maraka</displayName>
-				<displayName count="one">finska marka</displayName>
-				<displayName count="other">finskih maraka</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fidži dolar</displayName>
-				<displayName count="few">fidži dolara</displayName>
-				<displayName count="many">fidži dolara</displayName>
-				<displayName count="one">fidži dolar</displayName>
-				<displayName count="other">fidži dolara</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Foklandska ostrva funta (FKP)</displayName>
-				<displayName count="few">folklandske funte</displayName>
-				<displayName count="many">folklandskih funti</displayName>
-				<displayName count="one">folklandska funta</displayName>
-				<displayName count="other">folklandska funta</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Francuski franak</displayName>
-				<displayName count="few">Francuska franka</displayName>
-				<displayName count="many">Francuskih franaka</displayName>
-				<displayName count="one">francuski franak</displayName>
-				<displayName count="other">francuskih franaka</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Britanska funta sterlinga</displayName>
-				<displayName count="few">britanske funte sterlinga</displayName>
-				<displayName count="many">britanskih funti sterlinga</displayName>
-				<displayName count="one">britanska funta sterlinga</displayName>
-				<displayName count="other">britanskih funti sterlinga</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Gruzijski kupon larit (GEK)</displayName>
-				<displayName count="few">gruzijska kupon larita</displayName>
-				<displayName count="many">gruzijskih kupon larita</displayName>
-				<displayName count="one">gruzijski kupon larit</displayName>
-				<displayName count="other">gruzijskih kupon larita</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Džordžijski lari (GEL)</displayName>
-				<displayName count="few">gruzijska larisa</displayName>
-				<displayName count="many">gruzijskih larisa</displayName>
-				<displayName count="one">gruzijski laris</displayName>
-				<displayName count="other">gruzijskih larisa</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ganijski cedi (1979-2007) (GHC)</displayName>
-				<displayName count="few">ganska ceda (GHC)</displayName>
-				<displayName count="many">ganskih ceda (GHC)</displayName>
-				<displayName count="one">ganski ced (GHC)</displayName>
-				<displayName count="other">ganskih ceda (GHC)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ganijski cedi (GHS)</displayName>
-				<displayName count="few">ganska ceda</displayName>
-				<displayName count="many">ganskih ceda</displayName>
-				<displayName count="one">ganski cedi</displayName>
-				<displayName count="other">ganski cedi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Gibraltarska funta (GIP)</displayName>
-				<displayName count="few">gibraltarske funte</displayName>
-				<displayName count="many">gibraltarskih funti</displayName>
-				<displayName count="one">gibraltarska funta</displayName>
-				<displayName count="other">gibraltarska funta</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambijski dalasi (GMD)</displayName>
-				<displayName count="few">gambijska dalasa</displayName>
-				<displayName count="many">gambijskih dalasa</displayName>
-				<displayName count="one">gambijski dalas</displayName>
-				<displayName count="other">gambijskih dalasa</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Gvinejski franak (GNF)</displayName>
-				<displayName count="few">gvinejska franka</displayName>
-				<displayName count="many">gvinejskih franaka</displayName>
-				<displayName count="one">gvinejski franak</displayName>
-				<displayName count="other">gvinejski franak</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Gvinejski sili (GNS)</displayName>
-				<displayName count="few">gvinejska silija</displayName>
-				<displayName count="many">gvinejskih silija</displayName>
-				<displayName count="one">gvinejski sili</displayName>
-				<displayName count="other">gvinejski silij</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Evatorijalna gvineja ekvele (GQE)</displayName>
-				<displayName count="few">evatorijаlno-gvinejska ekvelа</displayName>
-				<displayName count="many">evatorijаlno-gvinejskih ekvelа</displayName>
-				<displayName count="one">evatorijаlno-gvinejski ekvele</displayName>
-				<displayName count="other">evatorijаlno-gvinejskih ekvelа</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Drahma</displayName>
-				<displayName count="few">gr�ke drahme</displayName>
-				<displayName count="many">gr�kih drahmi</displayName>
-				<displayName count="one">gr�ka drahma</displayName>
-				<displayName count="other">gr�kih drahmi</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Gvatemalski kvetzal (GTQ)</displayName>
-				<displayName count="few">gvatemalska kvecala</displayName>
-				<displayName count="many">gvatemalskih kvecala</displayName>
-				<displayName count="one">gvatemalski kvecal</displayName>
-				<displayName count="other">gvatemalskih kvecala</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugalska Gvineja eskudo (GWE)</displayName>
-				<displayName count="few">portugalsko-gvinejska eskuda</displayName>
-				<displayName count="many">portugalsko-gvinejskih eskuda</displayName>
-				<displayName count="one">portugalsko-gvinejski eskudo</displayName>
-				<displayName count="other">portugalsko-gvinejski eskudo</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Gvineja bisao pezo (GWP)</displayName>
-				<displayName count="few">gvinejа-bisaoška pezosa</displayName>
-				<displayName count="many">gvinejа-bisaoških pezosa</displayName>
-				<displayName count="one">gvinejа-bisaoški pezo</displayName>
-				<displayName count="other">gvinejsko-bisaoski pezos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guajanski dolar (GYD)</displayName>
-				<displayName count="few">gvajanska dolara</displayName>
-				<displayName count="many">gvajanskih dolara</displayName>
-				<displayName count="one">gvajanski dolar</displayName>
-				<displayName count="other">gvajanski dolari</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Honkonški dolar</displayName>
-				<displayName count="few">hongkonška dolara</displayName>
-				<displayName count="many">hongkonških dolara</displayName>
-				<displayName count="one">hongkonški dolar</displayName>
-				<displayName count="other">hongkonških dolara</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduranska lempira (HNL)</displayName>
-				<displayName count="few">honduraškа lempirа</displayName>
-				<displayName count="many">honduraških lempirа</displayName>
-				<displayName count="one">honduraški lempir</displayName>
-				<displayName count="other">honduraških lempirа</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Hrvatski dinar</displayName>
-				<displayName count="few">Hrvatska dinara</displayName>
-				<displayName count="many">Hrvatskih dinara</displayName>
-				<displayName count="one">hrvatski dinar</displayName>
-				<displayName count="other">hrvatskih dinara</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Hrvatska kuna</displayName>
-				<displayName count="few">Hrvatske kune</displayName>
-				<displayName count="many">Hrvatskih kuna</displayName>
-				<displayName count="one">hrvatska kuna</displayName>
-				<displayName count="other">hrvatskih kuna</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haitski gurd (HTG)</displayName>
-				<displayName count="few">haićanska gourda</displayName>
-				<displayName count="many">haićanskih gourda</displayName>
-				<displayName count="one">haićanski gourd</displayName>
-				<displayName count="other">haićanski gourd</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Mađarska forinta</displayName>
-				<displayName count="few">mađarske forinte</displayName>
-				<displayName count="many">mađarskih forinti</displayName>
-				<displayName count="one">mađarska forinta</displayName>
-				<displayName count="other">mađarske forinte</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Indonezijska rupiah</displayName>
-				<displayName count="few">indonežanske rupije</displayName>
-				<displayName count="many">indonežanskih rupija</displayName>
-				<displayName count="one">indonežanska rupija</displayName>
-				<displayName count="other">indonežanske rupije</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Irska funta</displayName>
-				<displayName count="few">irske funte</displayName>
-				<displayName count="many">irskih funti</displayName>
-				<displayName count="one">irska funta</displayName>
-				<displayName count="other">irskih funti</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Izraelska funta (ILP)</displayName>
-				<displayName count="few">izraelske funte</displayName>
-				<displayName count="many">izraelskih funti</displayName>
-				<displayName count="one">izraelska funta</displayName>
-				<displayName count="other">izraelska funta</displayName>
-			</currency>
-			<currency type="ILR">
-				<displayName>stari izraelski Å¡ekeli</displayName>
-				<displayName count="few">stari izraelski Å¡ekeli</displayName>
-				<displayName count="many">stari izraelski Å¡ekeli</displayName>
-				<displayName count="one">stari izraelski Å¡ekeli</displayName>
-				<displayName count="other">stari izraelski Å¡ekeli</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Izraelski Å¡ekel</displayName>
-				<displayName count="few">nova izraelska Å¡ekela</displayName>
-				<displayName count="many">novih izraelskih Å¡ekela</displayName>
-				<displayName count="one">novi izraelski Å¡ekel</displayName>
-				<displayName count="other">novih izraelskih Å¡ekela</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Indijski rupi</displayName>
-				<displayName count="few">indijske rupije</displayName>
-				<displayName count="many">indijskih rupija</displayName>
-				<displayName count="one">indijska rupija</displayName>
-				<displayName count="other">indijskih rupija</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ira�ki dinar (IQD)</displayName>
-				<displayName count="few">ira�ka dinara</displayName>
-				<displayName count="many">ira�kih dinara</displayName>
-				<displayName count="one">ira�ki dinar</displayName>
-				<displayName count="other">ira�ki dinari</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Iranijski rial (IRR)</displayName>
-				<displayName count="few">iranska rijala</displayName>
-				<displayName count="many">iranskih rijala</displayName>
-				<displayName count="one">iranski rijal</displayName>
-				<displayName count="other">iranski rijali</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>stara islandska kruna</displayName>
-				<displayName count="few">stara islandska kruna</displayName>
-				<displayName count="many">stara islandska kruna</displayName>
-				<displayName count="one">stara islandska kruna</displayName>
-				<displayName count="other">stara islandska kruna</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Islandska kruna (ISK)</displayName>
-				<displayName count="few">islandske krune</displayName>
-				<displayName count="many">islandskih kruna</displayName>
-				<displayName count="one">islandska kruna</displayName>
-				<displayName count="other">islandska kruna</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Italijanska lira</displayName>
-				<displayName count="few">Italijanske lire</displayName>
-				<displayName count="many">Italijanskih lira</displayName>
-				<displayName count="one">italijanska lira</displayName>
-				<displayName count="other">italijanske lire</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamajski dolar (JMD)</displayName>
-				<displayName count="few">jamajska dolara</displayName>
-				<displayName count="many">jamajskih dolara</displayName>
-				<displayName count="one">jamajski dolar</displayName>
-				<displayName count="other">jamajskih dolara</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Jordanski dinar (JOD)</displayName>
-				<displayName count="few">jordanskih dinara</displayName>
-				<displayName count="many">jordanskih dinara</displayName>
-				<displayName count="one">ordanskih dinara</displayName>
-				<displayName count="other">ordanskih dinara</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japanski jen</displayName>
-				<displayName count="few">Japanska jena</displayName>
-				<displayName count="many">Japanskih jena</displayName>
-				<displayName count="one">japanski jen</displayName>
-				<displayName count="other">japanski jen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenijski Å¡iling</displayName>
-				<displayName count="few">kenijska Å¡ilinga</displayName>
-				<displayName count="many">kenijskih Å¡ilinga</displayName>
-				<displayName count="one">kenijski Å¡iling</displayName>
-				<displayName count="other">kenijskih Å¡ilinga</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kirgistanski som (KGS)</displayName>
-				<displayName count="few">kirgistanska soma</displayName>
-				<displayName count="many">kirgistanskih soma</displayName>
-				<displayName count="one">kirgistanski som</displayName>
-				<displayName count="other">kirgijski som</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kambodžijski riel (KHR)</displayName>
-				<displayName count="few">kambodžanska rijela</displayName>
-				<displayName count="many">kambodžanskih rijela</displayName>
-				<displayName count="one">kambodžanski rijal</displayName>
-				<displayName count="other">kambodžanskih rijela</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komoranski franak (KMF)</displayName>
-				<displayName count="few">komoranska franka</displayName>
-				<displayName count="many">komoranskih franaka</displayName>
-				<displayName count="one">komoranski franak</displayName>
-				<displayName count="other">komoranski franci</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Severnokorejski von (KPW)</displayName>
-				<displayName count="few">severnokorejska vona</displayName>
-				<displayName count="many">severnokorejskih vona</displayName>
-				<displayName count="one">severnokorejski von</displayName>
-				<displayName count="other">severnokorejski von</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Južno-korejski Von</displayName>
-				<displayName count="few">južno-korejska vona</displayName>
-				<displayName count="many">južno-korejskih vona</displayName>
-				<displayName count="one">južno-korejski von</displayName>
-				<displayName count="other">južno-korejski von</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuvajtski dinar</displayName>
-				<displayName count="few">kuvajtskih dinara</displayName>
-				<displayName count="many">kuvajtskih dinara</displayName>
-				<displayName count="one">kuvajtskih dinara</displayName>
-				<displayName count="other">kuvajtskih dinara</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Kajmanska ostrva dolar (KYD)</displayName>
-				<displayName count="few">kajmanska dolara</displayName>
-				<displayName count="many">kajmanskih dolara</displayName>
-				<displayName count="one">kajmanski dolar</displayName>
-				<displayName count="other">kajmanski dolar</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazahstanski tendž (JZT)</displayName>
-				<displayName count="few">kazahstanske tendže</displayName>
-				<displayName count="many">kazahstanskih tendži</displayName>
-				<displayName count="one">kazahstanska tendža</displayName>
-				<displayName count="other">kazahstanskih tendži</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laoški kip (LAK)</displayName>
-				<displayName count="few">laoška kipa</displayName>
-				<displayName count="many">laoških kipa</displayName>
-				<displayName count="one">laoški kip</displayName>
-				<displayName count="other">laoški kipovi</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Lebanska funta (LBR)</displayName>
-				<displayName count="few">lebanske funte</displayName>
-				<displayName count="many">lebanskih funti</displayName>
-				<displayName count="one">lebanska funta</displayName>
-				<displayName count="other">lebanske funte</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Å rilankanski rupi (LKR)</displayName>
-				<displayName count="few">Å¡rilankanske rupije</displayName>
-				<displayName count="many">Å¡rilankanskih ruplji</displayName>
-				<displayName count="one">Å¡rilankanska rupija</displayName>
-				<displayName count="other">Å¡rilankanska rupija</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberijski dolar (LRD)</displayName>
-				<displayName count="few">liberijska dolara</displayName>
-				<displayName count="many">liberijskih dolara</displayName>
-				<displayName count="one">liberijski dolar</displayName>
-				<displayName count="other">liberijskih dolara</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesotski loti (LSL)</displayName>
-				<displayName count="few">lesotska lotisa</displayName>
-				<displayName count="many">lesotskih lotisa</displayName>
-				<displayName count="one">lesotski lotis</displayName>
-				<displayName count="other">lesotskih lotisa</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litvanski litas</displayName>
-				<displayName count="few">litvanske lite</displayName>
-				<displayName count="many">litvanskih lita</displayName>
-				<displayName count="one">litvanska lita</displayName>
-				<displayName count="other">litvanskih lita</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litvanski talonas (LTT)</displayName>
-				<displayName count="few">litvanske talone</displayName>
-				<displayName count="many">litvanskih talona</displayName>
-				<displayName count="one">litvanska talona</displayName>
-				<displayName count="other">litvanskih talona</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Luksemburški konvertibilni franak (LUC)</displayName>
-				<displayName count="few">luksemburška konvertibilna franka</displayName>
-				<displayName count="many">luksemburških konvertibilnih franaka</displayName>
-				<displayName count="one">luksemburški konvertibilni franak</displayName>
-				<displayName count="other">luksemburški konvertibilni franak</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Luksemburški franak</displayName>
-				<displayName count="few">luksemburška franka</displayName>
-				<displayName count="many">luksemburških franaka</displayName>
-				<displayName count="one">luksemburški franak</displayName>
-				<displayName count="other">luksemburški franci</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Luksemburški finansijski franak (LUL)</displayName>
-				<displayName count="few">luksemburška financijska franka</displayName>
-				<displayName count="many">luksemburških financijskih franaka</displayName>
-				<displayName count="one">luksemburški financijski franak</displayName>
-				<displayName count="other">luksemburški financijski franak</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Latvijski lats (LVL)</displayName>
-				<displayName count="few">latvijska lata</displayName>
-				<displayName count="many">latvijskih lata</displayName>
-				<displayName count="one">latvijski lat</displayName>
-				<displayName count="other">latvijski lat</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Latvijska rublja (LVR)</displayName>
-				<displayName count="few">latvijska rublja</displayName>
-				<displayName count="many">latvijskih rublji</displayName>
-				<displayName count="one">latvijska rublja</displayName>
-				<displayName count="other">latvijska rublja</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libijski dinar</displayName>
-				<displayName count="few">libijska dinara</displayName>
-				<displayName count="many">Libijskih dinara</displayName>
-				<displayName count="one">Libijskih dinara</displayName>
-				<displayName count="other">libijskih dinara</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Marokanski dirham</displayName>
-				<displayName count="few">marokanske dirame</displayName>
-				<displayName count="many">marokanskih dirama</displayName>
-				<displayName count="one">marokanska dirama</displayName>
-				<displayName count="other">marokanskih dirama</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Marokanski franak (MAF)</displayName>
-				<displayName count="few">marokanska franka</displayName>
-				<displayName count="many">marokanskih franaka</displayName>
-				<displayName count="one">marokanski franak</displayName>
-				<displayName count="other">marokanski franak</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldovski lju (MDL)</displayName>
-				<displayName count="few">moldavska leja</displayName>
-				<displayName count="many">moldavskih leja</displayName>
-				<displayName count="one">moldavski lej</displayName>
-				<displayName count="other">moldavski lej</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Malagasijski ariari (MGA)</displayName>
-				<displayName count="few">madagaskarska ariarija</displayName>
-				<displayName count="many">madagaskarskih ariarija</displayName>
-				<displayName count="one">madagaskarski ariarij</displayName>
-				<displayName count="other">madagaskarski ariariji</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Malagasijski franak (MGF)</displayName>
-				<displayName count="few">madagaskarska franka</displayName>
-				<displayName count="many">madagaskarskih franaka</displayName>
-				<displayName count="one">madagaskarski franak</displayName>
-				<displayName count="other">MGF</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedonski denar</displayName>
-				<displayName count="few">makedonska denara</displayName>
-				<displayName count="many">Makedonskih denara</displayName>
-				<displayName count="one">Makedonski denar</displayName>
-				<displayName count="other">makedonskih dinara</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Malijanski franak (MLF)</displayName>
-				<displayName count="few">malijska franka</displayName>
-				<displayName count="many">malijskih franaka</displayName>
-				<displayName count="one">malijski franak</displayName>
-				<displayName count="other">malijski franak</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Mjanmaški kjat (MMK)</displayName>
-				<displayName count="few">mjanmarska kjata</displayName>
-				<displayName count="many">mjanmarskih kjata</displayName>
-				<displayName count="one">mjanmarski kjat</displayName>
-				<displayName count="other">mjanmarski kjati</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Mongolski tugrik (MNT)</displayName>
-				<displayName count="few">mongolska tugrika</displayName>
-				<displayName count="many">mongolskih tugrika</displayName>
-				<displayName count="one">mongolski tugrik</displayName>
-				<displayName count="other">mongolski tugrici</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Makaniška pataka (MOP)</displayName>
-				<displayName count="few">makaneška patka</displayName>
-				<displayName count="many">makaneških pataka</displayName>
-				<displayName count="one">makaneški patak</displayName>
-				<displayName count="other">makaneški patak</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Mauritanijska ugvija</displayName>
-				<displayName count="few">mauritanijske ouguje</displayName>
-				<displayName count="many">mauritanijskih ouguja</displayName>
-				<displayName count="one">mauritanijska ouguja</displayName>
-				<displayName count="other">mauritanijske ouguje</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Malteška lira</displayName>
-				<displayName count="few">malteške lire</displayName>
-				<displayName count="many">malteških lira</displayName>
-				<displayName count="one">malteška lira</displayName>
-				<displayName count="other">malteških lira</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Malteška funta (MTP)</displayName>
-				<displayName count="few">malteške funte</displayName>
-				<displayName count="many">malteških funti</displayName>
-				<displayName count="one">malteška funta</displayName>
-				<displayName count="other">malteška funta</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauricijska ruplja (MUR)</displayName>
-				<displayName count="few">mauricijske rupije</displayName>
-				<displayName count="many">mauricijskih rupija</displayName>
-				<displayName count="one">mauricijska rupija</displayName>
-				<displayName count="other">mauricijske rupije</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldivijska rufija (MVR)</displayName>
-				<displayName count="few">maldivijske rufije</displayName>
-				<displayName count="many">maldivijskih rufija</displayName>
-				<displayName count="one">maldivijska rufija</displayName>
-				<displayName count="other">maldivijska rufija</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malavijska kva�a (MWK)</displayName>
-				<displayName count="few">malavijske kva�e</displayName>
-				<displayName count="many">malavijskih kva�a</displayName>
-				<displayName count="one">malavijska kva�a</displayName>
-				<displayName count="other">malavijska kva�a</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksi�ki peso</displayName>
-				<displayName count="few">meksi�ka pezosa</displayName>
-				<displayName count="many">meksi�kih pezosa</displayName>
-				<displayName count="one">meksi�ki pezos</displayName>
-				<displayName count="other">meksi�kih pezosa</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Meksijski srebrno pezo (1861-1992) (MXP)</displayName>
-				<displayName count="few">meksi�ka srebrna pezosa (MXP)</displayName>
-				<displayName count="many">meksi�kih srebrnih pezosa (MXP)</displayName>
-				<displayName count="one">meksi�ki srebrni pezos (MXP)</displayName>
-				<displayName count="other">meksi�ki srebrni pezos (MXP)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Meksijski unidad de inverzion (MXV)</displayName>
-				<displayName count="few">meksi�ka unidads de inversion (UDI)</displayName>
-				<displayName count="many">meksi�kih unidads de inversion (UDI)</displayName>
-				<displayName count="one">meksi�ki unidads de inversion (UDI)</displayName>
-				<displayName count="other">meksi�ki unidads de inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malezijski ringit</displayName>
-				<displayName count="few">malezijska ringita</displayName>
-				<displayName count="many">malezijskih ringita</displayName>
-				<displayName count="one">malezijski ringit</displayName>
-				<displayName count="other">malezijskih ringita</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambijski eskudo (MZE)</displayName>
-				<displayName count="few">mozambijska eskuda</displayName>
-				<displayName count="many">mozambijskih eskuda</displayName>
-				<displayName count="one">mozambijski eskudo</displayName>
-				<displayName count="other">mozambijski eskudo</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Stari mozambijski metikal (MZM)</displayName>
-				<displayName count="few">stara mozambijska metikala</displayName>
-				<displayName count="many">starih mozambijskih metikala</displayName>
-				<displayName count="one">stari mozambijski metikal</displayName>
-				<displayName count="other">stari mozambijski metikal</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambijski metikal (MZN)</displayName>
-				<displayName count="few">mozambijska metikala</displayName>
-				<displayName count="many">mozambijskih metikala</displayName>
-				<displayName count="one">mozambijski metikal</displayName>
-				<displayName count="other">mozambijski metikal</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Nambijski dolar (NAD)</displayName>
-				<displayName count="few">namibijska dolara</displayName>
-				<displayName count="many">namibijskih dolara</displayName>
-				<displayName count="one">namibijski dolar</displayName>
-				<displayName count="other">namibijski dolar</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nigerijska naira (NGN)</displayName>
-				<displayName count="few">nigerijska naira</displayName>
-				<displayName count="many">nigerijskih naira</displayName>
-				<displayName count="one">nigerijski nair</displayName>
-				<displayName count="other">nigerijski nair</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaragvanška kordoba (NIC)</displayName>
-				<displayName count="few">nikaragvanske kordobe</displayName>
-				<displayName count="many">nikaragvanskih kordoba</displayName>
-				<displayName count="one">nikaragvanska kordoba</displayName>
-				<displayName count="other">nikaragvanska kordoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nikaragvanška kordoba oro</displayName>
-				<displayName count="few">nikaragvanske zlatne kordobe</displayName>
-				<displayName count="many">nikaragvanskih zlatnih kordoba</displayName>
-				<displayName count="one">nikaragvanska zlatna kordoba</displayName>
-				<displayName count="other">nikaragvanska zlatna kordoba</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Holandski gulden</displayName>
-				<displayName count="few">holandska guldena</displayName>
-				<displayName count="many">holandskih guldena</displayName>
-				<displayName count="one">holandski gulden</displayName>
-				<displayName count="other">holandskih guldena</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norveška kruna</displayName>
-				<displayName count="few">Norveške kune</displayName>
-				<displayName count="many">Norveških kuna</displayName>
-				<displayName count="one">Norveška kuna</displayName>
-				<displayName count="other">norveških kruna</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepalska ruplja (NPR)</displayName>
-				<displayName count="few">nepalske rupije</displayName>
-				<displayName count="many">nepalskih rupija</displayName>
-				<displayName count="one">nepalska rupija</displayName>
-				<displayName count="other">nepalska rupija</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Novozelandski dolar</displayName>
-				<displayName count="few">novozelandska dolara</displayName>
-				<displayName count="many">novozelandskih dolara</displayName>
-				<displayName count="one">novozelandski dolar</displayName>
-				<displayName count="other">novozelandskih dolara</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Omanski rial (OMR)</displayName>
-				<displayName count="few">omanska rijala</displayName>
-				<displayName count="many">omanskih rijala</displayName>
-				<displayName count="one">omanski rijal</displayName>
-				<displayName count="other">omanski rijal</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panamanska balboa (PAB)</displayName>
-				<displayName count="few">panamske balboe</displayName>
-				<displayName count="many">panamskih balboa</displayName>
-				<displayName count="one">panamska balboa</displayName>
-				<displayName count="other">panamska balboa</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peruvijski inti (PEI)</displayName>
-				<displayName count="few">peruanske inte</displayName>
-				<displayName count="many">peruanskih inti</displayName>
-				<displayName count="one">peruanska inta</displayName>
-				<displayName count="other">peruanska inta</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Peruanski nuevo sol</displayName>
-				<displayName count="few">peruanska nuevo sola</displayName>
-				<displayName count="many">peruanskih nuevo sola</displayName>
-				<displayName count="one">peruanski nuevo sol</displayName>
-				<displayName count="other">peruanskih nuevo sola</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peruvijski sol (PES)</displayName>
-				<displayName count="few">peruanska sola</displayName>
-				<displayName count="many">peruanskih sola</displayName>
-				<displayName count="one">peruanski sol</displayName>
-				<displayName count="other">peruanski sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua Nova Gvineja kina (PGK)</displayName>
-				<displayName count="few">kine Papue Nove Gvineje</displayName>
-				<displayName count="many">kina Papue Nove Gvineje</displayName>
-				<displayName count="one">kina Papue Nove Gvineje</displayName>
-				<displayName count="other">kina Papue Nove Gvineje</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipinski peso</displayName>
-				<displayName count="few">filipinska pezosa</displayName>
-				<displayName count="many">filipinskih pezosa</displayName>
-				<displayName count="one">filipinski pezo</displayName>
-				<displayName count="other">filipinskih pezosa</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistanski rupi</displayName>
-				<displayName count="few">pakistanske rupije</displayName>
-				<displayName count="many">pakistanskih rupija</displayName>
-				<displayName count="one">pakistanska rupija</displayName>
-				<displayName count="other">pakistanske rupije</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Poljski zlot (PLN)</displayName>
-				<displayName count="few">poljske zlote</displayName>
-				<displayName count="many">poljskih zlota</displayName>
-				<displayName count="one">poljski zlot</displayName>
-				<displayName count="other">poljski zlot</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Poljski zloti (1950-1995) (PLZ)</displayName>
-				<displayName count="few">poljske zlote (PLZ)</displayName>
-				<displayName count="many">poljskih zlota (PLZ)</displayName>
-				<displayName count="one">poljski zlot (PLZ)</displayName>
-				<displayName count="other">poljski zlot (PLZ)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portugalski eskudo</displayName>
-				<displayName count="few">portugalska eskuda</displayName>
-				<displayName count="many">portugalskih eskuda</displayName>
-				<displayName count="one">portugalski eskudo</displayName>
-				<displayName count="other">portugalskih eskuda</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paragvajski guarni (PYG)</displayName>
-				<displayName count="few">paragvajska gvaranija</displayName>
-				<displayName count="many">paragvajskih gvaranija</displayName>
-				<displayName count="one">paragvajski gvarani</displayName>
-				<displayName count="other">paragvajski gvarani</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Katarski rial (QAR)</displayName>
-				<displayName count="few">katarska rijala</displayName>
-				<displayName count="many">katarskih rijala</displayName>
-				<displayName count="one">katarski rijal</displayName>
-				<displayName count="other">katarski rijal</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rodizijski dolar (RHD)</displayName>
-				<displayName count="few">rodezijska dolara</displayName>
-				<displayName count="many">rodezijskih dolara</displayName>
-				<displayName count="one">rodezijski dolar</displayName>
-				<displayName count="other">rodezijski dolar</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Stari romanski lju (ROL)</displayName>
-				<displayName count="few">stara rumunjska leja</displayName>
-				<displayName count="many">starih rumunjskih leja</displayName>
-				<displayName count="one">stari rumunjski lej</displayName>
-				<displayName count="other">stari rumunjski lej</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Rumunski leu</displayName>
-				<displayName count="few">rumunska leua</displayName>
-				<displayName count="many">rumunskih leua</displayName>
-				<displayName count="one">rumunski leu</displayName>
-				<displayName count="other">rumunskih leua</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Srpski dinar</displayName>
-				<displayName count="few">srpska dinara</displayName>
-				<displayName count="many">srpskih dinara</displayName>
-				<displayName count="one">srpski dinar</displayName>
-				<displayName count="other">srpski dinari</displayName>
-				<symbol>din.</symbol>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ruska rublja</displayName>
-				<displayName count="few">ruske rublje</displayName>
-				<displayName count="many">ruskih rublji</displayName>
-				<displayName count="one">ruska rublja</displayName>
-				<displayName count="other">ruskih rublji</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ruska rublja (1991-1998)</displayName>
-				<displayName count="few">ruske rublje (RUR)</displayName>
-				<displayName count="many">ruskih rublji (RUR)</displayName>
-				<displayName count="one">ruska rublja (RUR)</displayName>
-				<displayName count="other">ruskih rublji (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruandski franak (RWF)</displayName>
-				<displayName count="few">ruandska franka</displayName>
-				<displayName count="many">ruandskih franaka</displayName>
-				<displayName count="one">ruandski franak</displayName>
-				<displayName count="other">ruandski franci</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Saudijski rijal (SAR)</displayName>
-				<displayName count="few">saudijska rijala</displayName>
-				<displayName count="many">saudijskih rijala</displayName>
-				<displayName count="one">saudijski rijal</displayName>
-				<displayName count="other">saudijski rijal</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Solomonska ostrva dolar (SBD)</displayName>
-				<displayName count="few">solomonskoostrvska dolara</displayName>
-				<displayName count="many">solomonskoostrvskih dolara</displayName>
-				<displayName count="one">solomonskoostrvski dolar</displayName>
-				<displayName count="other">solomonskoostrvski dolar</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Sejšelski rupi (SCR)</displayName>
-				<displayName count="few">sejšelske rupije</displayName>
-				<displayName count="many">sejšelskih rupija</displayName>
-				<displayName count="one">sejšelska rupija</displayName>
-				<displayName count="other">sejšelska rupija</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>STari sudanski dinar (SDD)</displayName>
-				<displayName count="few">stara sudanska dinara</displayName>
-				<displayName count="many">starih sudanskih dinara</displayName>
-				<displayName count="one">stari sudanski dinar</displayName>
-				<displayName count="other">stari sudanski dinar</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudanska funta (SDG)</displayName>
-				<displayName count="few">sudanske funte</displayName>
-				<displayName count="many">sudanskih funti</displayName>
-				<displayName count="one">sudanska funta</displayName>
-				<displayName count="other">sudanska funta</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Stara sudanska funta (SDP)</displayName>
-				<displayName count="few">stare sudanske funte</displayName>
-				<displayName count="many">starih sudanskih funti</displayName>
-				<displayName count="one">stara sudanska funta</displayName>
-				<displayName count="other">stara sudanska funta</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Å vedska kruna</displayName>
-				<displayName count="few">Å¡vedske krune</displayName>
-				<displayName count="many">Å¡vedskih kruna</displayName>
-				<displayName count="one">Å¡vedska kruna</displayName>
-				<displayName count="other">Å¡vedskih kruna</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapurski dolar</displayName>
-				<displayName count="few">singapurška dolara</displayName>
-				<displayName count="many">singapurških dolara</displayName>
-				<displayName count="one">singapurški dolar</displayName>
-				<displayName count="other">singapurških dolara</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Sv. Helenska funta (SHP)</displayName>
-				<displayName count="few">sv. jelenske funte</displayName>
-				<displayName count="many">sv. jelenskih funti</displayName>
-				<displayName count="one">sv. jelenska funta</displayName>
-				<displayName count="other">sv. jelenska funta</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovenski tolar</displayName>
-				<displayName count="few">slovena�ka tolara</displayName>
-				<displayName count="many">slovena�kih tolara</displayName>
-				<displayName count="one">slovena�ki tolar</displayName>
-				<displayName count="other">slovena�kih tolara</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slova�ka kruna</displayName>
-				<displayName count="few">slova�ke kune</displayName>
-				<displayName count="many">slova�kih kuna</displayName>
-				<displayName count="one">slova�ka kuna</displayName>
-				<displayName count="other">slova�kih kuna</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sijeraleonski leone (SLL)</displayName>
-				<displayName count="few">sijeraleonske leone</displayName>
-				<displayName count="many">sijeraleonskih leona</displayName>
-				<displayName count="one">sijeraleonska leona</displayName>
-				<displayName count="other">sijeraleonske leone</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somalijski Å¡iling (SOS)</displayName>
-				<displayName count="few">somalijska Å¡ilinga</displayName>
-				<displayName count="many">somalijskih Å¡ilinga</displayName>
-				<displayName count="one">somalijski Å¡iling</displayName>
-				<displayName count="other">somalijski Å¡ilinzi</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinamski dolar (SRD)</displayName>
-				<displayName count="few">surinamska dolara</displayName>
-				<displayName count="many">surinamskih dolara</displayName>
-				<displayName count="one">surinamski dolar</displayName>
-				<displayName count="other">surinamski dolar</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinamski gilder (SRG)</displayName>
-				<displayName count="few">surinamska guldena</displayName>
-				<displayName count="many">surinamskih guldena</displayName>
-				<displayName count="one">surinamski gulden</displayName>
-				<displayName count="other">surinamski gulden</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome i Principe dobra (STD)</displayName>
-				<displayName count="few">dobra Sao Toma i Principa</displayName>
-				<displayName count="many">dobra Sao Toma i Principa</displayName>
-				<displayName count="one">dobra Sao Toma i Principa</displayName>
-				<displayName count="other">dobra Sao Toma i Principa</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovjetska rublja (SUR)</displayName>
-				<displayName count="few">sovjetske rublje</displayName>
-				<displayName count="many">sovjetskih rublji</displayName>
-				<displayName count="one">sovjetska rublja</displayName>
-				<displayName count="other">sovjetske rublje</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Salvadorski kolon (SVC)</displayName>
-				<displayName count="few">salvadorska kolona</displayName>
-				<displayName count="many">salvadorskih kolona</displayName>
-				<displayName count="one">salvadorski kolon</displayName>
-				<displayName count="other">salvadorski kolon</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Sirijska funta (SYP)</displayName>
-				<displayName count="few">sirijske funte</displayName>
-				<displayName count="many">sirijskih funti</displayName>
-				<displayName count="one">sirijska funta</displayName>
-				<displayName count="other">sirijske funtie</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Å vazi lilangeni (SZL)</displayName>
-				<displayName count="few">svazi lilangena</displayName>
-				<displayName count="many">svazi lilangena</displayName>
-				<displayName count="one">svazi lilangena</displayName>
-				<displayName count="other">svazi lilangena</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Tai baht (THB)</displayName>
-				<displayName count="few">tajlandske bahte</displayName>
-				<displayName count="many">tajlandskih bahta</displayName>
-				<displayName count="one">tajlandska bahta</displayName>
-				<displayName count="other">tajlandska bahta</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tadžakistanska rublja (SYR)</displayName>
-				<displayName count="few">tadžikistanske rublje</displayName>
-				<displayName count="many">tadžikistanskih rublji</displayName>
-				<displayName count="one">tadžikistanska rublja</displayName>
-				<displayName count="other">tadžikistanska rublja</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tadžikistanski somoni (TJS)</displayName>
-				<displayName count="few">tadžikistanska somona</displayName>
-				<displayName count="many">tadžikistanskih somona</displayName>
-				<displayName count="one">tadžikistanski somon</displayName>
-				<displayName count="other">tadžikistanski somon</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Turkmenistanski manat (TMM)</displayName>
-				<displayName count="few">turkmenistanska manata</displayName>
-				<displayName count="many">turkmenistanskih manata</displayName>
-				<displayName count="one">turkmenistanski manat</displayName>
-				<displayName count="other">turkmenistanski manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunizijski dinar (TND)</displayName>
-				<displayName count="few">tunizijska dinara</displayName>
-				<displayName count="many">tunizijskih dinara</displayName>
-				<displayName count="one">tunizijski dinar</displayName>
-				<displayName count="other">tunizijski dinar</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tongška Paʻanga (TOP)</displayName>
-				<displayName count="few">tongaške pa'ange</displayName>
-				<displayName count="many">tongaških pa'angi</displayName>
-				<displayName count="one">tongaška pa'anga</displayName>
-				<displayName count="other">tongaška pa'anga</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timorški eskudo (TPE)</displayName>
-				<displayName count="few">timorska eskuda</displayName>
-				<displayName count="many">timorskih eskuda</displayName>
-				<displayName count="one">timorski eskudo</displayName>
-				<displayName count="other">timorski eskudo</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Stara turska lira (TRL)</displayName>
-				<displayName count="few">stare turske lire</displayName>
-				<displayName count="many">starih turskih lira</displayName>
-				<displayName count="one">stara turska lira</displayName>
-				<displayName count="other">stara turska lira</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Turska lira</displayName>
-				<displayName count="few">turske lire</displayName>
-				<displayName count="many">turskih lira</displayName>
-				<displayName count="one">turska lira</displayName>
-				<displayName count="other">novih turskih lira</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad i Tobago dolar (TTD)</displayName>
-				<displayName count="few">trinidadtobaška dolara</displayName>
-				<displayName count="many">trinidadtobaških dolara</displayName>
-				<displayName count="one">trinidadtobaški dolar</displayName>
-				<displayName count="other">trinidadtobaški dolar</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Novi tajvanski dolar</displayName>
-				<displayName count="few">nova tajvanska dolara</displayName>
-				<displayName count="many">novih tajvanskih dolara</displayName>
-				<displayName count="one">novi tajvanski dolar</displayName>
-				<displayName count="other">novi tajvanski dolari</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzijski Å¡iling (TZS)</displayName>
-				<displayName count="few">tanzanijska Å¡ilinga</displayName>
-				<displayName count="many">tanzanijskih Å¡ilinga</displayName>
-				<displayName count="one">tanzanijski Å¡iling</displayName>
-				<displayName count="other">tanzanijski Å¡ilinzi</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrajinska hrivnja</displayName>
-				<displayName count="few">ukrajinske hrivnje</displayName>
-				<displayName count="many">ukrajinskih hrivnji</displayName>
-				<displayName count="one">ukrajinska hrivnja</displayName>
-				<displayName count="other">ukrajinskih hrivnji</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrajinski karbovaneti (UAK)</displayName>
-				<displayName count="few">ukrajinska karbovantsiva</displayName>
-				<displayName count="many">ukrajinskih karbovantsiva</displayName>
-				<displayName count="one">ukrajinski karbovantsiv</displayName>
-				<displayName count="other">ukrajinski karbovantsiv</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Ugandijski Å¡iling (1966-1987) (UGS)</displayName>
-				<displayName count="few">ugandska Å¡ilinga (UGS)</displayName>
-				<displayName count="many">ugandskih Å¡ilinga (UGS)</displayName>
-				<displayName count="one">ugandski Å¡iling (UGS)</displayName>
-				<displayName count="other">ugandski Å¡iling (UGS)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Ugandijski Å¡iling (UGX)</displayName>
-				<displayName count="few">ugandska Å¡ilinga</displayName>
-				<displayName count="many">ugandskih Å¡ilinga</displayName>
-				<displayName count="one">ugandski Å¡iling</displayName>
-				<displayName count="other">ugandski Å¡ilinzi</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Ameri�ki dolar</displayName>
-				<displayName count="few">ameri�ka dolara</displayName>
-				<displayName count="many">ameri�kih dolara</displayName>
-				<displayName count="one">ameri�ki dolar</displayName>
-				<displayName count="other">ameri�kih dolara</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>SAD dolar (sledeći dan) (USN)</displayName>
-				<displayName count="few">ameri�ka dolara (sledeći dan)</displayName>
-				<displayName count="many">ameri�kih dolara (sledeći dan)</displayName>
-				<displayName count="one">ameri�ki dolar (sledeći dan)</displayName>
-				<displayName count="other">ameri�ki dolar (sledeći dan)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>SAD dolar (isti dan) (USS)</displayName>
-				<displayName count="few">ameri�ka dolara (isti dan)</displayName>
-				<displayName count="many">ameri�kih dolara (isti dan)</displayName>
-				<displayName count="one">ameri�ki dolar (isti dan)</displayName>
-				<displayName count="other">ameri�ki dolar (isti dan)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Urugvajski pezo en unidades indeksades (UYI)</displayName>
-				<displayName count="few">urugvajska pesosa en unidades indexadas</displayName>
-				<displayName count="many">urugvajskih pesosa en unidades indexadas</displayName>
-				<displayName count="one">urugvajski pesos en unidades indexadas</displayName>
-				<displayName count="other">urugvajski pesos en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Urugvajski pezo (1975-1993) (UYP)</displayName>
-				<displayName count="few">urugvajska pezosa (UYP)</displayName>
-				<displayName count="many">urugvajskih pezosa (UYP)</displayName>
-				<displayName count="one">urugvajski pezos (UYP)</displayName>
-				<displayName count="other">urugvajski pezos (UYP)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Urugvajski pezo (UYU)</displayName>
-				<displayName count="few">urugvajska pezosa</displayName>
-				<displayName count="many">urugvajskih pezosa</displayName>
-				<displayName count="one">urugvajski pezos</displayName>
-				<displayName count="other">urugvajski pezos</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Uzbekistanski som (UZS)</displayName>
-				<displayName count="few">uzbekistanska soma</displayName>
-				<displayName count="many">uzbekistanskih soma</displayName>
-				<displayName count="one">uzbekistanski som</displayName>
-				<displayName count="other">uzbekistanski som</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venecuelanski bolivar</displayName>
-				<displayName count="few">venecuelska bolivara</displayName>
-				<displayName count="many">venecuelskih bolivara</displayName>
-				<displayName count="one">venecuelski bolivar</displayName>
-				<displayName count="other">venecuelskih bolivara</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Venecuelanska bolivija fuerte (VEF)</displayName>
-				<displayName count="few">venezuelanska bolivara fuertes</displayName>
-				<displayName count="many">venezuelanskih bolivara fuertes</displayName>
-				<displayName count="one">venezuelanski bolivar fuertes</displayName>
-				<displayName count="other">venezuelanski bolivar fuertes</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vijetnamski dong</displayName>
-				<displayName count="few">vijetnamska donga</displayName>
-				<displayName count="many">vijetnamskih donga</displayName>
-				<displayName count="one">vijetnamski dong</displayName>
-				<displayName count="other">vijetnamski dong</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanatuški vatu (VUV)</displayName>
-				<displayName count="few">vanuatska vatua</displayName>
-				<displayName count="many">vanuatskih vatua</displayName>
-				<displayName count="one">vanuatski vatu</displayName>
-				<displayName count="other">vanuatski vatui</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Samoanska tala (WST)</displayName>
-				<displayName count="few">samoanske tale</displayName>
-				<displayName count="many">samoanskih tala</displayName>
-				<displayName count="one">samoanska tala</displayName>
-				<displayName count="other">samoanska tala</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA franak BEAC (XAF)</displayName>
-				<displayName count="few">CFA franka BEAC</displayName>
-				<displayName count="many">CFA franaka BEAC</displayName>
-				<displayName count="one">CFA franak BEAC</displayName>
-				<displayName count="other">CFA franci BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Srebro (CAG)</displayName>
-				<displayName count="few">srebra</displayName>
-				<displayName count="many">srebra</displayName>
-				<displayName count="one">srebro</displayName>
-				<displayName count="other">srebro</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Zlato (XAU)</displayName>
-				<displayName count="few">zlata</displayName>
-				<displayName count="many">zlata</displayName>
-				<displayName count="one">zlato</displayName>
-				<displayName count="other">zlato</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Evropska kompozitna jedinica (XBA)</displayName>
-				<displayName count="few">evropske složene jedinice</displayName>
-				<displayName count="many">evropskih složenih jedinica</displayName>
-				<displayName count="one">evropska složena jedinica</displayName>
-				<displayName count="other">evropska složena jedinica</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Evropska nov�ana jedinica (XBB)</displayName>
-				<displayName count="few">evropske monetarne jedinice</displayName>
-				<displayName count="many">evropskih monetarnih jedinica</displayName>
-				<displayName count="one">evropska monetarna jedinica</displayName>
-				<displayName count="other">evropska monetarna jedinica</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Evropska jedinica ra�una (XBC)</displayName>
-				<displayName count="few">evropske obra�unske jedinice (XBC)</displayName>
-				<displayName count="many">evropskih obra�unskih jedinica (XBC)</displayName>
-				<displayName count="one">evropska obra�unska jedinica (XBC)</displayName>
-				<displayName count="other">evropska obra�unska jedinica (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Evropska jedinica ra�una (XBD)</displayName>
-				<displayName count="few">evropske obra�unske jedinice (XBD)</displayName>
-				<displayName count="many">evropskih obra�unskih jedinica (XBD)</displayName>
-				<displayName count="one">evropska obra�unska jedinica (XBC</displayName>
-				<displayName count="other">evropska obra�unska jedinica (XBC</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Isto�nokaribijski dolar (XCD)</displayName>
-				<displayName count="few">isto�nokaripska dolara</displayName>
-				<displayName count="many">isto�nokaripskih dolara</displayName>
-				<displayName count="one">isto�nokaripski dolar</displayName>
-				<displayName count="other">isto�nokaripski dolar</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Posebna prava (XDR)</displayName>
-				<displayName count="few">posebna crtaća prava</displayName>
-				<displayName count="many">posebnih crtaćih prava</displayName>
-				<displayName count="one">posebno crtaće pravo</displayName>
-				<displayName count="other">posebnih crtaćih prava</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Evropska valutna jedinica (XEU)</displayName>
-				<displayName count="few">evropske monetarne jedinice (ECU)</displayName>
-				<displayName count="many">evropskih monetarnih jedinica (ECU)</displayName>
-				<displayName count="one">evropska monetarna jedinica (ECU)</displayName>
-				<displayName count="other">evropskih monetarnih jedinica (ECU)</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Francuski zlatni frank (XFO)</displayName>
-				<displayName count="few">francuska zlatna franka</displayName>
-				<displayName count="many">francuskih zlatnih franaka</displayName>
-				<displayName count="one">francuski zlatni franak</displayName>
-				<displayName count="other">francuskih zlatnih franaka</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Francuski UIC-frank (XFU)</displayName>
-				<displayName count="few">francuska UIC-franka</displayName>
-				<displayName count="many">francuskih UIC-franaka</displayName>
-				<displayName count="one">francuski UIC-franak</displayName>
-				<displayName count="other">francuskih UIC-franaka</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA franak BCEAO (XOF)</displayName>
-				<displayName count="few">CFA franka BCEAO</displayName>
-				<displayName count="many">CFA franaka BCEAO</displayName>
-				<displayName count="one">CFA franak BCEAO</displayName>
-				<displayName count="other">CFA franci BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladijum (XPD)</displayName>
-				<displayName count="few">paladijuma</displayName>
-				<displayName count="many">paladijuma</displayName>
-				<displayName count="one">paladijum</displayName>
-				<displayName count="other">paladijuma</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP franak (XPF)</displayName>
-				<displayName count="few">CFP franaka</displayName>
-				<displayName count="many">CFP franaka</displayName>
-				<displayName count="one">CFP franak</displayName>
-				<displayName count="other">CFP franci</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platina (XPT)</displayName>
-				<displayName count="few">platine</displayName>
-				<displayName count="many">platina</displayName>
-				<displayName count="one">platina</displayName>
-				<displayName count="other">platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET fondovi (XRE)</displayName>
-				<displayName count="few">RINET fonda</displayName>
-				<displayName count="many">RINET fondova</displayName>
-				<displayName count="one">RINET fond</displayName>
-				<displayName count="other">RINET fondova</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Kod testirane valute (XTS)</displayName>
-				<displayName count="few">ispitna koda valute</displayName>
-				<displayName count="many">ispitnih kodova valute</displayName>
-				<displayName count="one">ispitni kod valute</displayName>
-				<displayName count="other">ispitnih kodova valute</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Nepoznata ili nevažeća valuta</displayName>
-				<displayName count="few">nepoznate ili nevažeće valute</displayName>
-				<displayName count="many">nepoznatih ili nevažećih valuta</displayName>
-				<displayName count="one">nepoznate ili nevažeće valute</displayName>
-				<displayName count="other">nepoznatih ili nevažećih valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Jemenski dinar (YDD)</displayName>
-				<displayName count="few">jemenska dinara</displayName>
-				<displayName count="many">jemenskih dinara</displayName>
-				<displayName count="one">jemenski dinar</displayName>
-				<displayName count="other">jemenskih dinara</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Jemenski rial (YER)</displayName>
-				<displayName count="few">jemenska rijala</displayName>
-				<displayName count="many">jemenskih rijala</displayName>
-				<displayName count="one">jemenski rijal</displayName>
-				<displayName count="other">jemenski rijali</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Jugoslovenski tvrdi dinar (YUD)</displayName>
-				<displayName count="few">jugoslovenska �vrsta dinara</displayName>
-				<displayName count="many">jugoslovenskih �vstih dinara</displayName>
-				<displayName count="one">jugoslovenski �vrsti dinar</displayName>
-				<displayName count="other">jugoslovenskih �vstih dinara</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Jugoslovenski novi dinar (YUM)</displayName>
-				<displayName count="few">jugoslovenska nova dinara</displayName>
-				<displayName count="many">jugoslovenskih novih dinara</displayName>
-				<displayName count="one">jugoslovenski novi dinar</displayName>
-				<displayName count="other">jugoslovenskih novih dinara</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Jugoslovenski konvertibilni dinar (YUN)</displayName>
-				<displayName count="few">jugoslovenska konvertibilna dinara</displayName>
-				<displayName count="many">jugoslovenskih konvertibilnih dinara</displayName>
-				<displayName count="one">jugoslovenski konvertibilni dinar</displayName>
-				<displayName count="other">jugoslovenskih konvertibilnih dinara</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Južnoafri�ki rand (finansijski) ZAL</displayName>
-				<displayName count="few">južnoafri�ka randa (financijska)</displayName>
-				<displayName count="many">južnoafi�kih randa (financijskih)</displayName>
-				<displayName count="one">južnoafri�ki rand (financijski)</displayName>
-				<displayName count="other">južnoafi�kih randa (financijskih)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Južna Afrika Rand</displayName>
-				<displayName count="few">južnoafri�ka randa</displayName>
-				<displayName count="many">južnoafri�kih randa</displayName>
-				<displayName count="one">južnoafri�ki rand</displayName>
-				<displayName count="other">južnoafri�kih randa</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambijska kva�a (ZMK)</displayName>
-				<displayName count="few">zambijske kva�e</displayName>
-				<displayName count="many">zambijskih kva�a</displayName>
-				<displayName count="one">zambijska kva�a</displayName>
-				<displayName count="other">zambijske kva�e</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Zairski novi zair (ZRN)</displayName>
-				<displayName count="few">zairska nova zaira</displayName>
-				<displayName count="many">zairskih novih zaira</displayName>
-				<displayName count="one">zairski novi zair</displayName>
-				<displayName count="other">zairskih novih zaira</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zairski zair (ZRZ)</displayName>
-				<displayName count="few">zairska zaira</displayName>
-				<displayName count="many">zairskih zaira</displayName>
-				<displayName count="one">zairski zair</displayName>
-				<displayName count="other">zairskih zaira</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabvejski dolar (ZWD)</displayName>
-				<displayName count="few">zimbabvejska dolara</displayName>
-				<displayName count="many">zimbabvejskih dolara</displayName>
-				<displayName count="one">zimbabvejski dolar</displayName>
-				<displayName count="other">zimbabvejski dolari</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} dana</unitPattern>
-			<unitPattern count="many">{0} dana</unitPattern>
-			<unitPattern count="one">{0} dan</unitPattern>
-			<unitPattern count="other">{0} dana</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} sata</unitPattern>
-			<unitPattern count="many">{0} sati</unitPattern>
-			<unitPattern count="one">{0} sat</unitPattern>
-			<unitPattern count="other">{0} sati</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} minute</unitPattern>
-			<unitPattern count="many">{0} minuta</unitPattern>
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minuta</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} meseca</unitPattern>
-			<unitPattern count="many">{0} meseci</unitPattern>
-			<unitPattern count="one">{0} mesec</unitPattern>
-			<unitPattern count="other">{0} meseci</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} sekunde</unitPattern>
-			<unitPattern count="many">{0} sekundi</unitPattern>
-			<unitPattern count="one">{0} sekunda</unitPattern>
-			<unitPattern count="other">{0} sekundi</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} nedelje</unitPattern>
-			<unitPattern count="many">{0} nedelja</unitPattern>
-			<unitPattern count="one">{0} nedelja</unitPattern>
-			<unitPattern count="other">{0} nedelja</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} godine</unitPattern>
-			<unitPattern count="many">{0} godina</unitPattern>
-			<unitPattern count="one">{0} godina</unitPattern>
-			<unitPattern count="other">{0} godina</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>da:d</yesstr>
-			<nostr>ne:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_BA.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn_BA.xml
deleted file mode 100644
index 5b2c88287..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_BA.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.29 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-		<territory type="BA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_CS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn_CS.xml
deleted file mode 100644
index b4be5ce92..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_CS.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-		<territory type="CS"/>
-	</identity>
-	<alias source="sr_Latn_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_ME.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn_ME.xml
deleted file mode 100644
index 8db2c8c3d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_ME.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-		<territory type="ME"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d.MM.yyyy.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d.MM - d.MM</greatestDifference>
-							<greatestDifference id="M">d.MM - d.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d.MM - E, d.MM</greatestDifference>
-							<greatestDifference id="M">E, d.MM - E, d.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MM.yyyy - MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy - MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d.MM.yyyy. - d.MM.yyyy.</greatestDifference>
-							<greatestDifference id="M">d.MM.yyyy. - d.MM.yyyy.</greatestDifference>
-							<greatestDifference id="y">d.MM.yyyy. - d.MM.yyyy.</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_RS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn_RS.xml
deleted file mode 100644
index 340ff3e89..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_RS.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.21 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-		<territory type="RS"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_YU.xml b/airtime_mvc/library/Zend/Locale/Data/sr_Latn_YU.xml
deleted file mode 100644
index 5c292043a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_Latn_YU.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<script type="Latn"/>
-		<territory type="YU"/>
-	</identity>
-	<alias source="sr_Latn_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_ME.xml b/airtime_mvc/library/Zend/Locale/Data/sr_ME.xml
deleted file mode 100644
index 63d5994a5..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_ME.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.11 $"/>
-		<generation date="$Date: 2009/06/09 05:36:20 $"/>
-		<language type="sr"/>
-		<territory type="ME"/>
-	</identity>
-	<alias source="sr_Latn_ME" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_RS.xml b/airtime_mvc/library/Zend/Locale/Data/sr_RS.xml
deleted file mode 100644
index 3297d5452..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_RS.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.10 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<territory type="RS"/>
-	</identity>
-	<alias source="sr_Cyrl_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sr_YU.xml b/airtime_mvc/library/Zend/Locale/Data/sr_YU.xml
deleted file mode 100644
index 50ca5fac2..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sr_YU.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sr"/>
-		<territory type="YU"/>
-	</identity>
-	<alias source="sr_Cyrl_RS" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ss.xml b/airtime_mvc/library/Zend/Locale/Data/ss.xml
deleted file mode 100644
index e1014425b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ss.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.27 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="ss"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ss">Siswati</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Bhi</month>
-							<month type="2">Van</month>
-							<month type="3">Vol</month>
-							<month type="4">Mab</month>
-							<month type="5">Nkh</month>
-							<month type="6">Nhl</month>
-							<month type="7">Kho</month>
-							<month type="8">Ngc</month>
-							<month type="9">Nyo</month>
-							<month type="10">Mph</month>
-							<month type="11">Lwe</month>
-							<month type="12">Ngo</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Bhimbidvwane</month>
-							<month type="2">iNdlovana</month>
-							<month type="3">iNdlovu-lenkhulu</month>
-							<month type="4">Mabasa</month>
-							<month type="5">iNkhwekhweti</month>
-							<month type="6">iNhlaba</month>
-							<month type="7">Kholwane</month>
-							<month type="8">iNgci</month>
-							<month type="9">iNyoni</month>
-							<month type="10">iMphala</month>
-							<month type="11">Lweti</month>
-							<month type="12">iNgongoni</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mso</day>
-							<day type="tue">Bil</day>
-							<day type="wed">Tsa</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Mgc</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Lisontfo</day>
-							<day type="mon">uMsombuluko</day>
-							<day type="tue">Lesibili</day>
-							<day type="wed">Lesitsatfu</day>
-							<day type="thu">Lesine</day>
-							<day type="fri">Lesihlanu</day>
-							<day type="sat">uMgcibelo</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="SZL">
-				<symbol>E</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ss_SZ.xml b/airtime_mvc/library/Zend/Locale/Data/ss_SZ.xml
deleted file mode 100644
index 7488fb428..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ss_SZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.5 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="ss"/>
-		<territory type="SZ"/>
-	</identity>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ss_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/ss_ZA.xml
deleted file mode 100644
index 335710222..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ss_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="ss"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/st.xml b/airtime_mvc/library/Zend/Locale/Data/st.xml
deleted file mode 100644
index 1ccceabc6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/st.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.28 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="st"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Seburu</language>
-			<language type="am">Se-amhari</language>
-			<language type="ar">Se-arab</language>
-			<language type="az">Se-azerbaijani</language>
-			<language type="be">Se-belarusia</language>
-			<language type="bg">Se-bulgaria</language>
-			<language type="bh">Se-bihari</language>
-			<language type="bn">Se-bengali</language>
-			<language type="br">Breton</language>
-			<language type="bs">Se-bosnia</language>
-			<language type="ca">Se-catalia</language>
-			<language type="cs">Se-czech</language>
-			<language type="cy">Se-welsh</language>
-			<language type="da">Se-dutch</language>
-			<language type="de">Se-jeremane</language>
-			<language type="el">Se-greek</language>
-			<language type="en">Senyesemane</language>
-			<language type="eo">Se-esperanto</language>
-			<language type="es">Sespain</language>
-			<language type="et">Se-estonia</language>
-			<language type="eu">Se-basque</language>
-			<language type="fa">Se-persia</language>
-			<language type="fi">Se-finnish</language>
-			<language type="fil">Se-tagalog</language>
-			<language type="fo">Se-foroese</language>
-			<language type="fr">Se-french</language>
-			<language type="fy">Se-frisia</language>
-			<language type="ga">Se-irish</language>
-			<language type="gd">Se-scots gaelic</language>
-			<language type="gl">Se-galicia</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Se-gujarati</language>
-			<language type="he">Se-hebrew</language>
-			<language type="hi">Se-hindi</language>
-			<language type="hr">Se-croatia</language>
-			<language type="hu">Se-hungaria</language>
-			<language type="ia">Se-interlingua</language>
-			<language type="id">Se-indonesia</language>
-			<language type="is">Se-iceland</language>
-			<language type="it">Se-tariana</language>
-			<language type="ja">Se-japane</language>
-			<language type="jv">Se-javane</language>
-			<language type="ka">Se-geogia</language>
-			<language type="kn">Se-kannada</language>
-			<language type="ko">Se-korea</language>
-			<language type="ku">Kurdish</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Se-latino</language>
-			<language type="lt">Se-Lithuano</language>
-			<language type="mk">Se-masedonia</language>
-			<language type="ml">Se-malayalam</language>
-			<language type="mr">Se-marathi</language>
-			<language type="ms">Se-malay</language>
-			<language type="mt">Se-maltese</language>
-			<language type="ne">Se-nepali</language>
-			<language type="nl">Dutch</language>
-			<language type="nn">Se-norway (Nynorsk)</language>
-			<language type="no">Se-norway</language>
-			<language type="oc">Se-occitan</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Se-punjabi</language>
-			<language type="pl">Se-polish</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Se-portugal</language>
-			<language type="pt_BR">Seputukesi (sa Brazil)</language>
-			<language type="pt_PT">Se-portugal (Portugal)</language>
-			<language type="ro">Se-romania</language>
-			<language type="ru">Se-rushia</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="si">Se-sinhali</language>
-			<language type="sk">Se-slovak</language>
-			<language type="sl">Se-slovania</language>
-			<language type="sq">Se-albanian</language>
-			<language type="sr">Se-serbian</language>
-			<language type="st">Sesotho</language>
-			<language type="su">Se-sundanese</language>
-			<language type="sv">Se-sweden</language>
-			<language type="sw">Se-swahili</language>
-			<language type="ta">Se-tamil</language>
-			<language type="te">Se-telegu</language>
-			<language type="th">Se-thai</language>
-			<language type="ti">Se-tigrinya</language>
-			<language type="tk">Turkmen</language>
-			<language type="tlh">Se-klingon</language>
-			<language type="tr">Se-theki</language>
-			<language type="tw">Twi</language>
-			<language type="uk">Se-ukrania</language>
-			<language type="ur">Se-urdu</language>
-			<language type="uz">Se-uzbek</language>
-			<language type="vi">Se-vietnam</language>
-			<language type="xh">se Xhosa</language>
-			<language type="yi">Yiddish</language>
-			<language type="zu">se Zulu</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b d-u w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c v x z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Phe</month>
-							<month type="2">Kol</month>
-							<month type="3">Ube</month>
-							<month type="4">Mme</month>
-							<month type="5">Mot</month>
-							<month type="6">Jan</month>
-							<month type="7">Upu</month>
-							<month type="8">Pha</month>
-							<month type="9">Leo</month>
-							<month type="10">Mph</month>
-							<month type="11">Pun</month>
-							<month type="12">Tsh</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Phesekgong</month>
-							<month type="2">Hlakola</month>
-							<month type="3">Hlakubele</month>
-							<month type="4">Mmese</month>
-							<month type="5">Motsheanong</month>
-							<month type="6">Phupjane</month>
-							<month type="7">Phupu</month>
-							<month type="8">Phata</month>
-							<month type="9">Leotshe</month>
-							<month type="10">Mphalane</month>
-							<month type="11">Pundungwane</month>
-							<month type="12">Tshitwe</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mma</day>
-							<day type="tue">Bed</day>
-							<day type="wed">Rar</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Moq</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sontaha</day>
-							<day type="mon">Mmantaha</day>
-							<day type="tue">Labobedi</day>
-							<day type="wed">Laboraru</day>
-							<day type="thu">Labone</day>
-							<day type="fri">Labohlane</day>
-							<day type="sat">Moqebelo</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/st_LS.xml b/airtime_mvc/library/Zend/Locale/Data/st_LS.xml
deleted file mode 100644
index c961408a3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/st_LS.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.5 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="st"/>
-		<territory type="LS"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="LSL">
-				<symbol>M</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/st_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/st_ZA.xml
deleted file mode 100644
index f93bd8ef4..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/st_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="st"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/supplementalData.xml b/airtime_mvc/library/Zend/Locale/Data/supplementalData.xml
deleted file mode 100644
index 568b3d118..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/supplementalData.xml
+++ /dev/null
@@ -1,5359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-    <version number="$Revision: 1.220 $"/>
-    <generation date="$Date: 2009/06/25 20:24:56 $"/>
-    <cldrVersion version="1.7.1"/>
-    <currencyData>
-        <fractions>
-            <info iso4217="ADP" digits="0" rounding="0"/>
-            <info iso4217="AFN" digits="0" rounding="0"/>
-            <info iso4217="ALL" digits="0" rounding="0"/>
-            <info iso4217="AMD" digits="0" rounding="0"/>
-            <info iso4217="BHD" digits="3" rounding="0"/>
-            <info iso4217="BIF" digits="0" rounding="0"/>
-            <info iso4217="BYR" digits="0" rounding="0"/>
-            <info iso4217="CHF" digits="2" rounding="5"/>
-            <info iso4217="CLF" digits="0" rounding="0"/>
-            <info iso4217="CLP" digits="0" rounding="0"/>
-            <info iso4217="COP" digits="0" rounding="0"/>
-            <info iso4217="CRC" digits="0" rounding="0"/>
-            <info iso4217="DEFAULT" digits="2" rounding="0"/>
-            <info iso4217="DJF" digits="0" rounding="0"/>
-            <info iso4217="ESP" digits="0" rounding="0"/>
-            <info iso4217="GNF" digits="0" rounding="0"/>
-            <info iso4217="GYD" digits="0" rounding="0"/>
-            <info iso4217="HUF" digits="0" rounding="0"/>
-            <info iso4217="IDR" digits="0" rounding="0"/>
-            <info iso4217="IQD" digits="0" rounding="0"/>
-            <info iso4217="IRR" digits="0" rounding="0"/>
-            <info iso4217="ISK" digits="0" rounding="0"/>
-            <info iso4217="ITL" digits="0" rounding="0"/>
-            <info iso4217="JOD" digits="3" rounding="0"/>
-            <info iso4217="JPY" digits="0" rounding="0"/>
-            <info iso4217="KMF" digits="0" rounding="0"/>
-            <info iso4217="KPW" digits="0" rounding="0"/>
-            <info iso4217="KRW" digits="0" rounding="0"/>
-            <info iso4217="KWD" digits="3" rounding="0"/>
-            <info iso4217="LAK" digits="0" rounding="0"/>
-            <info iso4217="LBP" digits="0" rounding="0"/>
-            <info iso4217="LUF" digits="0" rounding="0"/>
-            <info iso4217="LYD" digits="3" rounding="0"/>
-            <info iso4217="MGA" digits="0" rounding="0"/>
-            <info iso4217="MGF" digits="0" rounding="0"/>
-            <info iso4217="MMK" digits="0" rounding="0"/>
-            <info iso4217="MNT" digits="0" rounding="0"/>
-            <info iso4217="MRO" digits="0" rounding="0"/>
-            <info iso4217="MUR" digits="0" rounding="0"/>
-            <info iso4217="OMR" digits="3" rounding="0"/>
-            <info iso4217="PKR" digits="0" rounding="0"/>
-            <info iso4217="PYG" digits="0" rounding="0"/>
-            <info iso4217="RSD" digits="0" rounding="0"/>
-            <info iso4217="RWF" digits="0" rounding="0"/>
-            <info iso4217="SLL" digits="0" rounding="0"/>
-            <info iso4217="SOS" digits="0" rounding="0"/>
-            <info iso4217="STD" digits="0" rounding="0"/>
-            <info iso4217="SYP" digits="0" rounding="0"/>
-            <info iso4217="TMM" digits="0" rounding="0"/>
-            <info iso4217="TND" digits="3" rounding="0"/>
-            <info iso4217="TRL" digits="0" rounding="0"/>
-            <info iso4217="TZS" digits="0" rounding="0"/>
-            <info iso4217="UGX" digits="0" rounding="0"/>
-            <info iso4217="UZS" digits="0" rounding="0"/>
-            <info iso4217="VND" digits="0" rounding="0"/>
-            <info iso4217="VUV" digits="0" rounding="0"/>
-            <info iso4217="XAF" digits="0" rounding="0"/>
-            <info iso4217="XOF" digits="0" rounding="0"/>
-            <info iso4217="XPF" digits="0" rounding="0"/>
-            <info iso4217="YER" digits="0" rounding="0"/>
-            <info iso4217="ZMK" digits="0" rounding="0"/>
-            <info iso4217="ZWD" digits="0" rounding="0"/>
-        </fractions>
-       <region iso3166="AD">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ESP" from="1873-01-01" to="2002-02-28"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-            <currency iso4217="ADP" from="1936-01-01" to="2001-12-31"/>
-        </region>
-        <region iso3166="AE">
-            <currency iso4217="AED" from="1973-05-19"/>
-        </region>
-        <region iso3166="AF">
-            <currency iso4217="AFN" from="2002-10-07"/>
-            <currency iso4217="AFA" from="1927-03-14" to="2002-12-31"/>
-        </region>
-        <region iso3166="AG">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="AI">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="AL">
-            <currency iso4217="ALL" from="1965-08-16"/>
-            <currency iso4217="ALK" from="1946-11-01" to="1965-08-16"/>
-        </region>
-        <region iso3166="AM">
-            <currency iso4217="AMD" from="1993-11-22"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1993-11-22"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="AN">
-            <currency iso4217="ANG" from="1940-05-10"/>
-        </region>
-        <region iso3166="AO">
-            <currency iso4217="AOA" from="1999-12-13"/>
-            <currency iso4217="AOR" from="1995-07-01" to="2000-02-01"/>
-            <currency iso4217="AON" from="1990-09-25" to="2000-02-01"/>
-            <currency iso4217="AOK" from="1977-01-08" to="1991-03-01"/>
-        </region>
-        <region iso3166="AQ">
-        <currency iso4217="XXX"/>
-        </region>
-        <region iso3166="AR">
-            <currency iso4217="ARS" from="1992-01-01"/>
-            <currency iso4217="ARA" from="1985-06-14" to="1992-01-01"/>
-            <currency iso4217="ARP" from="1983-06-01" to="1985-06-14"/>
-            <currency iso4217="ARL" from="1970-01-01" to="1983-06-01"/>
-            <currency iso4217="ARM" from="1881-11-05" to="1970-01-01"/>
-        </region>
-        <region iso3166="AS">
-            <currency iso4217="USD" from="1904-07-16"/>
-        </region>
-        <region iso3166="AT">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ATS" from="1947-12-04" to="2002-02-28"/>
-        </region>
-        <region iso3166="AU">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="AW">
-            <currency iso4217="AWG" from="1986-01-01"/>
-            <currency iso4217="ANG" from="1940-05-10" to="1986-01-01"/>
-        </region>
-        <region iso3166="AX">
-            <currency iso4217="EUR" from="1999-01-01"/>
-        </region>
-        <region iso3166="AZ">
-            <currency iso4217="AZN" from="2006-01-01"/>
-            <currency iso4217="AZM" from="1993-11-22" to="2006-12-31"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1994-01-01"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="BA">
-            <currency iso4217="BAM" from="1995-01-01"/>
-            <currency iso4217="BAN" from="1994-08-15" to="1997-07-01"/>
-            <currency iso4217="BAD" from="1992-07-01" to="1994-08-15"/>
-            <currency iso4217="YUR" from="1992-07-01" to="1993-10-01"/>
-            <currency iso4217="YUN" from="1990-01-01" to="1992-07-01"/>
-            <currency iso4217="YUD" from="1966-01-01" to="1990-01-01"/>
-        </region>
-        <region iso3166="BB">
-            <currency iso4217="BBD" from="1973-12-03"/>
-            <currency iso4217="XCD" from="1965-10-06" to="1973-12-03"/>
-        </region>
-        <region iso3166="BD">
-            <currency iso4217="BDT" from="1972-01-01"/>
-            <currency iso4217="PKR" from="1948-04-01" to="1972-01-01"/>
-            <currency iso4217="INR" from="1835-08-17" to="1948-04-01"/>
-        </region>
-        <region iso3166="BE">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="BEF" from="1831-02-07" to="2002-02-28"/>
-            <currency iso4217="NLG" from="1816-12-15" to="1831-02-07"/>
-            <currency iso4217="BEL" tender="false"/>
-            <currency iso4217="BEC" tender="false"/>
-        </region>
-        <region iso3166="BF">
-            <currency iso4217="XOF" from="1984-08-04"/>
-        </region>
-        <region iso3166="BG">
-            <currency iso4217="BGN" from="1999-07-05"/>
-            <currency iso4217="BGL" from="1962-01-01" to="1999-07-05"/>
-            <currency iso4217="BGM" from="1952-05-12" to="1962-01-01"/>
-            <currency iso4217="BGO" from="1879-07-08" to="1952-05-12"/>
-        </region>
-        <region iso3166="BH">
-            <currency iso4217="BHD" from="1965-10-16"/>
-        </region>
-        <region iso3166="BI">
-            <currency iso4217="BIF" from="1964-05-19"/>
-        </region>
-        <region iso3166="BJ">
-            <currency iso4217="XOF" from="1975-11-30"/>
-        </region>
-        <region iso3166="BL">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="BM">
-            <currency iso4217="BMD" from="1970-02-06"/>
-        </region>
-        <region iso3166="BN">
-            <currency iso4217="BND" from="1967-06-12"/>
-            <currency iso4217="MYR" from="1963-09-16" to="1967-06-12"/>
-        </region>
-        <region iso3166="BO">
-            <currency iso4217="BOB" from="1987-01-01"/>
-            <currency iso4217="BOP" from="1963-01-01" to="1986-12-31"/>
-            <currency iso4217="BOL" from="1863-06-23" to="1963-01-01"/>
-            <currency iso4217="BOV" tender="false"/>
-        </region>
-        <region iso3166="BR">
-            <currency iso4217="BRL" from="1994-07-01"/>
-            <currency iso4217="BRR" from="1993-08-01" to="1994-07-01"/>
-            <currency iso4217="BRE" from="1990-03-16" to="1993-08-01"/>
-            <currency iso4217="BRN" from="1989-01-15" to="1990-03-16"/>
-            <currency iso4217="BRC" from="1986-02-28" to="1989-01-15"/>
-            <currency iso4217="BRB" from="1967-02-13" to="1986-02-28"/>
-            <currency iso4217="BRZ" from="1942-11-01" to="1967-02-13"/>
-        </region>
-        <region iso3166="BS">
-            <currency iso4217="BSD" from="1966-05-25"/>
-        </region>
-        <region iso3166="BT">
-            <currency iso4217="BTN" from="1974-04-16"/>
-            <currency iso4217="INR" from="1907-01-01" to="1974-04-16"/>
-        </region>
-        <region iso3166="BU">
-            <currency iso4217="BUK" from="1952-07-01" to="1989-06-18"/>
-        </region>
-        <region iso3166="BV">
-            <currency iso4217="NOK" from="1905-06-07"/>
-        </region>
-        <region iso3166="BW">
-            <currency iso4217="BWP" from="1976-08-23"/>
-            <currency iso4217="ZAR" from="1961-02-14" to="1976-08-23"/>
-        </region>
-        <region iso3166="BY">
-            <currency iso4217="BYR" from="2000-01-01"/>
-            <currency iso4217="BYB" from="1994-08-01" to="2000-12-31"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1994-11-08"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="BZ">
-            <currency iso4217="BZD" from="1974-01-01"/>
-        </region>
-        <region iso3166="CA">
-            <currency iso4217="CAD" from="1858-01-01"/>
-        </region>
-        <region iso3166="CC">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="CD">
-            <currency iso4217="CDF" from="1998-07-01"/>
-            <currency iso4217="ZRN" from="1993-11-01" to="1998-07-01"/>
-            <currency iso4217="ZRZ" from="1971-10-27" to="1993-11-01"/>
-        </region>
-        <region iso3166="CF">
-            <currency iso4217="XAF" from="1993-01-01"/>
-        </region>
-        <region iso3166="CG">
-            <currency iso4217="XAF" from="1993-01-01"/>
-        </region>
-        <region iso3166="CH">
-            <currency iso4217="CHF" from="1799-03-17"/>
-            <currency iso4217="CHE" tender="false"/>
-            <currency iso4217="CHW" tender="false"/>
-        </region>
-        <region iso3166="CI">
-            <currency iso4217="XOF" from="1958-12-04"/>
-        </region>
-        <region iso3166="CK">
-            <currency iso4217="NZD" from="1967-07-10"/>
-        </region>
-        <region iso3166="CL">
-            <currency iso4217="CLP" from="1975-09-29"/>
-            <currency iso4217="CLE" from="1960-01-01" to="1975-09-29"/>
-            <currency iso4217="CLF" tender="false"/>
-        </region>
-        <region iso3166="CM">
-            <currency iso4217="XAF" from="1973-04-01"/>
-        </region>
-        <region iso3166="CN">
-            <currency iso4217="CNY" from="1953-03-01"/>
-            <currency iso4217="CNX" tender="false"/>
-        </region>
-        <region iso3166="CO">
-            <currency iso4217="COP" from="1905-01-01"/>
-            <currency iso4217="COU" tender="false"/>
-        </region>
-        <region iso3166="CR">
-            <currency iso4217="CRC" from="1896-10-26"/>
-        </region>
-        <region iso3166="CS">
-            <currency iso4217="CSD" from="2002-05-15" to="2006-06-03"/>
-            <currency iso4217="EUR" from="2003-02-04" to="2006-06-03"/>
-            <currency iso4217="YUM" from="1994-01-24" to="2002-05-15"/>
-        </region>
-        <region iso3166="CU">
-            <currency iso4217="CUC" from="1994-01-01"/>
-            <currency iso4217="CUP" from="1859-01-01"/>
-            <currency iso4217="USD" from="1899-01-01" to="1959-01-01"/>
-        </region>
-        <region iso3166="CV">
-            <currency iso4217="CVE" from="1914-01-01"/>
-            <currency iso4217="PTE" from="1911-05-22" to="1975-07-05"/>
-        </region>
-        <region iso3166="CX">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="CY">
-            <currency iso4217="EUR" from="2008-01-01"/>
-            <currency iso4217="CYP" from="1914-09-10" to="2008-01-31"/>
-        </region>
-        <region iso3166="CZ">
-            <currency iso4217="CZK" from="1993-01-01"/>
-            <currency iso4217="CSK" from="1953-06-01" to="1993-03-01"/>
-        </region>
-        <region iso3166="DD">
-            <currency iso4217="DDM" from="1948-07-20" to="1990-10-02"/>
-        </region>
-        <region iso3166="DE">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="DEM" from="1948-06-20" to="2002-02-28"/>
-        </region>
-        <region iso3166="DJ">
-            <currency iso4217="DJF" from="1977-06-27"/>
-        </region>
-        <region iso3166="DK">
-            <currency iso4217="DKK" from="1873-05-27"/>
-        </region>
-        <region iso3166="DM">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="DO">
-            <currency iso4217="DOP" from="1947-10-01"/>
-            <currency iso4217="USD" from="1905-06-21" to="1947-10-01"/>
-        </region>
-        <region iso3166="DZ">
-            <currency iso4217="DZD" from="1964-04-01"/>
-        </region>
-        <region iso3166="EC">
-            <currency iso4217="USD" from="2000-10-02"/>
-            <currency iso4217="ECS" from="1884-04-01" to="2000-10-02"/>
-            <currency iso4217="ECV" tender="false"/>
-        </region>
-        <region iso3166="EE">
-            <currency iso4217="EEK" from="1992-06-21"/>
-            <currency iso4217="SUR" from="1961-1-1" to="1992-06-20"/>
-        </region>
-        <region iso3166="EG">
-            <currency iso4217="EGP" from="1885-11-14"/>
-        </region>
-        <region iso3166="EH">
-            <currency iso4217="MAD" from="1976-02-26"/>
-        </region>
-        <region iso3166="ER">
-            <currency iso4217="ERN" from="1997-11-08"/>
-            <currency iso4217="ETB" from="1993-05-24" to="1997-11-08"/>
-        </region>
-        <region iso3166="ES">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ESP" from="1868-10-19" to="2002-02-28"/>
-            <currency iso4217="ESA" tender="false"/>
-            <currency iso4217="ESB" tender="false"/>
-        </region>
-        <region iso3166="ET">
-            <currency iso4217="ETB" from="1976-09-15"/>
-        </region>
-        <region iso3166="FI">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FIM" from="1963-01-01" to="2002-02-28"/>
-        </region>
-        <region iso3166="FJ">
-            <currency iso4217="FJD" from="1969-01-13"/>
-        </region>
-        <region iso3166="FK">
-            <currency iso4217="FKP" from="1901-01-01"/>
-        </region>
-        <region iso3166="FM">
-            <currency iso4217="USD" from="1944-01-01"/>
-            <currency iso4217="JPY" from="1914-10-03" to="1944-01-01"/>
-        </region>
-        <region iso3166="FO">
-            <currency iso4217="DKK" from="1948-01-01"/>
-        </region>
-        <region iso3166="FR">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="GA">
-            <currency iso4217="XAF" from="1993-01-01"/>
-        </region>
-        <region iso3166="GB">
-            <currency iso4217="GBP" from="1694-07-27"/>
-        </region>
-        <region iso3166="GD">
-            <currency iso4217="XCD" from="1967-02-27"/>
-        </region>
-        <region iso3166="GE">
-            <currency iso4217="GEL" from="1995-09-23"/>
-            <currency iso4217="GEK" from="1993-04-05" to="1995-09-25"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1993-06-11"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="GF">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="GG">
-            <currency iso4217="GBP" from="1830-01-01"/>
-        </region>
-        <region iso3166="GH">
-          <currency iso4217="GHS" from="2007-07-03"/>
-          <currency iso4217="GHC" from="1979-03-09" to="2007-12-31"/>
-        </region>
-        <region iso3166="GI">
-            <currency iso4217="GIP" from="1713-01-01"/>
-        </region>
-        <region iso3166="GL">
-            <currency iso4217="DKK" from="1873-05-27"/>
-        </region>
-        <region iso3166="GM">
-            <currency iso4217="GMD" from="1971-07-01"/>
-        </region>
-        <region iso3166="GN">
-            <currency iso4217="GNF" from="1986-01-06"/>
-            <currency iso4217="GNS" from="1972-10-02" to="1986-01-06"/>
-        </region>
-        <region iso3166="GP">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="GQ">
-            <currency iso4217="XAF" from="1993-01-01"/>
-            <currency iso4217="GQE" from="1975-07-07" to="1986-06-01"/>
-        </region>
-        <region iso3166="GR">
-            <currency iso4217="EUR" from="2001-01-01"/>
-            <currency iso4217="GRD" from="1954-05-01" to="2002-02-28"/>
-        </region>
-        <region iso3166="GS">
-            <currency iso4217="GBP" from="1908-01-01"/>
-        </region>
-        <region iso3166="GT">
-            <currency iso4217="GTQ" from="1925-05-27"/>
-        </region>
-        <region iso3166="GU">
-            <currency iso4217="USD" from="1944-08-21"/>
-        </region>
-        <region iso3166="GW">
-            <currency iso4217="GWP" from="1976-02-28"/>
-            <currency iso4217="XOF" from="1997-01-01"/>
-            <currency iso4217="GWE" from="1914-01-01" to="1976-02-28"/>
-        </region>
-        <region iso3166="GY">
-            <currency iso4217="GYD" from="1966-05-26"/>
-        </region>
-        <region iso3166="HK">
-            <currency iso4217="HKD" from="1895-02-02"/>
-        </region>
-        <region iso3166="HM">
-            <currency iso4217="AUD" from="1967-02-16"/>
-        </region>
-        <region iso3166="HN">
-            <currency iso4217="HNL" from="1926-04-03"/>
-        </region>
-        <region iso3166="HR">
-            <currency iso4217="HRK" from="1994-05-30"/>
-            <currency iso4217="HRD" from="1991-12-23" to="1995-01-01"/>
-            <currency iso4217="YUN" from="1990-01-01" to="1991-12-23"/>
-            <currency iso4217="YUD" from="1966-01-01" to="1990-01-01"/>
-        </region>
-        <region iso3166="HT">
-            <currency iso4217="HTG" from="1872-08-26"/>
-            <currency iso4217="USD" from="1915"/>
-        </region>
-        <region iso3166="HU">
-            <currency iso4217="HUF" from="1946-07-23"/>
-        </region>
-        <region iso3166="ID">
-            <currency iso4217="IDR" from="1965-12-13"/>
-        </region>
-        <region iso3166="IE">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="IEP" from="1922-01-01" to="2002-02-09"/>
-            <currency iso4217="GBP" from="1800-01-01" to="1922-01-01"/>
-        </region>
-        <region iso3166="IL">
-            <currency iso4217="ILS" from="1985-09-04"/>
-            <currency iso4217="ILR" from="1980-02-22" to="1985-09-04"/>
-            <currency iso4217="ILP" from="1948-08-16" to="1980-02-22"/>
-        </region>
-        <region iso3166="IM">
-            <currency iso4217="GBP" from="1840-01-03"/>
-        </region>
-        <region iso3166="IN">
-            <currency iso4217="INR" from="1835-08-17"/>
-        </region>
-        <region iso3166="IO">
-            <currency iso4217="USD" from="1965-11-08"/>
-            <currency iso4217="GBP" from="1965-11-08"/>
-        </region>
-        <region iso3166="IQ">
-            <currency iso4217="IQD" from="1931-04-19"/>
-            <currency iso4217="EGP" from="1920-11-11" to="1931-04-19"/>
-            <currency iso4217="INR" from="1920-11-11" to="1931-04-19"/>
-        </region>
-        <region iso3166="IR">
-            <currency iso4217="IRR" from="1932-05-13"/>
-        </region>
-        <region iso3166="IS">
-            <currency iso4217="ISK" from="1981-01-01"/>
-            <currency iso4217="ISJ" from="1918-12-01" to="1981-01-01"/>
-            <currency iso4217="DKK" from="1873-05-27" to="1918-12-01"/>
-        </region>
-        <region iso3166="IT">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ITL" from="1862-08-24" to="2002-02-28"/>
-        </region>
-        <region iso3166="JE">
-            <currency iso4217="GBP" from="1837-01-01"/>
-        </region>
-        <region iso3166="JM">
-            <currency iso4217="JMD" from="1969-09-08"/>
-        </region>
-        <region iso3166="JO">
-            <currency iso4217="JOD" from="1950-07-01"/>
-        </region>
-        <region iso3166="JP">
-            <currency iso4217="JPY" from="1871-06-01"/>
-        </region>
-        <region iso3166="KE">
-            <currency iso4217="KES" from="1966-09-14"/>
-        </region>
-        <region iso3166="KG">
-            <currency iso4217="KGS" from="1993-05-10"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1993-05-10"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="KH">
-            <currency iso4217="KHR" from="1980-03-20"/>
-        </region>
-        <region iso3166="KI">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="KM">
-            <currency iso4217="KMF" from="1975-07-06"/>
-        </region>
-        <region iso3166="KN">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="KP">
-            <currency iso4217="KPW" from="1959-04-17"/>
-        </region>
-        <region iso3166="KR">
-            <currency iso4217="KRW" from="1962-06-10"/>
-            <currency iso4217="KRH" from="1953-02-15" to="1962-06-10"/>
-            <currency iso4217="KRO" from="1945-08-15" to="1953-02-15"/>
-        </region>
-        <region iso3166="KW">
-            <currency iso4217="KWD" from="1961-04-01"/>
-        </region>
-        <region iso3166="KY">
-            <currency iso4217="KYD" from="1971-01-01"/>
-            <currency iso4217="JMD" from="1969-09-08" to="1971-01-01"/>
-        </region>
-        <region iso3166="KZ">
-            <currency iso4217="KZT" from="1993-11-05"/>
-        </region>
-        <region iso3166="LA">
-            <currency iso4217="LAK" from="1979-12-10"/>
-        </region>
-        <region iso3166="LB">
-            <currency iso4217="LBP" from="1948-02-02"/>
-        </region>
-        <region iso3166="LC">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="LI">
-            <currency iso4217="CHF" from="1921-02-01"/>
-        </region>
-        <region iso3166="LK">
-            <currency iso4217="LKR" from="1978-05-22"/>
-        </region>
-        <region iso3166="LR">
-            <currency iso4217="LRD" from="1944-01-01"/>
-        </region>
-        <region iso3166="LS">
-            <currency iso4217="ZAR" from="1961-02-14"/>
-            <currency iso4217="LSL" from="1980-01-22"/>
-        </region>
-        <region iso3166="LT">
-            <currency iso4217="LTL" from="1993-06-25"/>
-            <currency iso4217="LTT" from="1992-10-01" to="1993-06-25"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1992-10-01"/>
-        </region>
-        <region iso3166="LU">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="LUF" from="1944-09-4" to="2002-02-28"/>
-            <currency iso4217="LUC" tender="false"/>
-            <currency iso4217="LUL" tender="false"/>
-        </region>
-        <region iso3166="LV">
-            <currency iso4217="LVL" from="1993-06-28"/>
-            <currency iso4217="LVR" from="1992-05-07" to="1993-10-17"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1992-07-20"/>
-        </region>
-        <region iso3166="LY">
-            <currency iso4217="LYD" from="1971-09-01"/>
-        </region>
-        <region iso3166="MA">
-            <currency iso4217="MAD" from="1959-10-17"/>
-            <currency iso4217="MAF" from="1881-01-01" to="1959-10-17"/>
-        </region>
-        <region iso3166="MC">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-            <currency iso4217="MCF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="MD">
-            <currency iso4217="MDL" from="1993-11-29"/>
-            <currency iso4217="MDC" from="1992-06-01" to="1993-11-29"/>
-        </region>
-        <region iso3166="ME">
-            <currency iso4217="EUR" from="2002-01-01"/>
-            <currency iso4217="DEM" from="1999-10-02" to="2002-05-15"/>
-            <currency iso4217="YUM" from="1994-01-24" to="2002-05-15"/>
-        </region>
-        <region iso3166="MF">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="MG">
-            <currency iso4217="MGA" from="1983-11-01"/>
-            <currency iso4217="MGF" from="1963-07-01" to="2004-12-31"/>
-        </region>
-        <region iso3166="MH">
-            <currency iso4217="USD" from="1944-01-01"/>
-        </region>
-        <region iso3166="MK">
-            <currency iso4217="MKD" from="1993-05-20"/>
-            <currency iso4217="MKN" from="1992-04-26" to="1993-05-20"/>
-        </region>
-        <region iso3166="ML">
-            <currency iso4217="XOF" from="1984-06-01"/>
-            <currency iso4217="MLF" from="1962-07-02" to="1984-08-31"/>
-            <currency iso4217="XOF" from="1958-11-24" to="1962-07-02"/>
-        </region>
-        <region iso3166="MM">
-            <currency iso4217="MMK" from="1989-06-18"/>
-            <currency iso4217="BUK" from="1952-07-01" to="1989-06-18"/>
-        </region>
-        <region iso3166="MN">
-            <currency iso4217="MNT" from="1915-03-01"/>
-        </region>
-        <region iso3166="MO">
-            <currency iso4217="MOP" from="1901-01-01"/>
-        </region>
-        <region iso3166="MP">
-            <currency iso4217="USD" from="1944-01-01"/>
-        </region>
-        <region iso3166="MQ">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1960-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="MR">
-            <currency iso4217="MRO" from="1973-06-29"/>
-            <currency iso4217="XOF" from="1958-11-28" to="1973-06-29"/>
-        </region>
-        <region iso3166="MS">
-            <currency iso4217="XCD" from="1967-02-27"/>
-        </region>
-        <region iso3166="MT">
-            <currency iso4217="EUR" from="2008-01-01"/>
-            <currency iso4217="MTL" from="1968-06-07" to="2008-01-31"/>
-            <currency iso4217="MTP" from="1914-08-13" to="1968-06-07"/>
-        </region>
-        <region iso3166="MU">
-            <currency iso4217="MUR" from="1934-04-01"/>
-        </region>
-        <region iso3166="MV">
-            <currency iso4217="MVR" from="1981-07-01"/>
-        </region>
-        <region iso3166="MW">
-            <currency iso4217="MWK" from="1971-02-15"/>
-        </region>
-        <region iso3166="MX">
-            <currency iso4217="MXN" from="1993-01-01"/>
-            <currency iso4217="MXP" from="1822-01-01" to="1992-12-31"/>
-            <currency iso4217="MXV" tender="false"/>
-        </region>
-        <region iso3166="MY">
-            <currency iso4217="MYR" from="1963-09-16"/>
-        </region>
-        <region iso3166="MZ">
-            <currency iso4217="MZN" from="2006-07-01"/>
-            <currency iso4217="MZM" from="1980-06-16" to="2006-12-31"/>
-            <currency iso4217="MZE" from="1975-06-25" to="1980-06-16"/>
-        </region>
-        <region iso3166="NA">
-            <currency iso4217="NAD" from="1993-01-01"/>
-            <currency iso4217="ZAR" from="1961-02-14" to="1993-01-01"/>
-        </region>
-        <region iso3166="NC">
-            <currency iso4217="XPF" from="1985-01-01"/>
-        </region>
-        <region iso3166="NE">
-            <currency iso4217="XOF" from="1958-12-19"/>
-        </region>
-        <region iso3166="NF">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="NG">
-            <currency iso4217="NGN" from="1973-01-01"/>
-        </region>
-        <region iso3166="NI">
-            <currency iso4217="NIO" from="1991-04-30"/>
-            <currency iso4217="NIC" from="1988-02-15" to="1991-04-30"/>
-        </region>
-        <region iso3166="NL">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="NLG" from="1813-01-01" to="2002-02-28"/>
-        </region>
-        <region iso3166="NO">
-            <currency iso4217="NOK" from="1905-06-07"/>
-            <currency iso4217="SEK" from="1873-05-27" to="1905-06-07"/>
-        </region>
-        <region iso3166="NP">
-            <currency iso4217="NPR" from="1933-01-01"/>
-            <currency iso4217="INR" from="1870-01-01" to="1966-10-17"/>
-        </region>
-        <region iso3166="NR">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="NU">
-            <currency iso4217="NZD" from="1967-07-10"/>
-        </region>
-        <region iso3166="NZ">
-            <currency iso4217="NZD" from="1967-07-10"/>
-        </region>
-        <region iso3166="OM">
-            <currency iso4217="OMR" from="1972-11-11"/>
-        </region>
-        <region iso3166="PA">
-            <currency iso4217="PAB" from="1903-11-04"/>
-            <currency iso4217="USD" from="1903-11-18"/>
-        </region>
-        <region iso3166="PE">
-            <currency iso4217="PEN" from="1991-07-01"/>
-            <currency iso4217="PEI" from="1985-02-01" to="1991-07-01"/>
-            <currency iso4217="PES" from="1863-02-14" to="1985-02-01"/>
-        </region>
-        <region iso3166="PF">
-            <currency iso4217="XPF" from="1945-12-26"/>
-        </region>
-        <region iso3166="PG">
-            <currency iso4217="PGK" from="1975-09-16"/>
-            <currency iso4217="AUD" from="1966-02-14" to="1975-09-16"/>
-        </region>
-        <region iso3166="PH">
-            <currency iso4217="PHP" from="1946-07-04"/>
-        </region>
-        <region iso3166="PK">
-            <currency iso4217="PKR" from="1948-04-01"/>
-            <currency iso4217="INR" from="1835-08-17" to="1947-08-15"/>
-        </region>
-        <region iso3166="PL">
-            <currency iso4217="PLN" from="1995-01-01"/>
-            <currency iso4217="PLZ" from="1950-10-28" to="1994-12-31"/>
-        </region>
-        <region iso3166="PM">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1972-12-21" to="2002-02-17"/>
-        </region>
-        <region iso3166="PN">
-            <currency iso4217="NZD" from="1969-01-13"/>
-        </region>
-        <region iso3166="PR">
-            <currency iso4217="USD" from="1898-12-10"/>
-            <currency iso4217="ESP" from="1800-01-01" to="1898-12-10"/>
-        </region>
-        <region iso3166="PS">
-            <currency iso4217="JOD" from="1996-02-12"/>
-            <currency iso4217="ILS" from="1985-09-04"/>
-            <currency iso4217="ILP" from="1967-06" to="1980-02-22"/>
-            <currency iso4217="JOD" from="1950-07-01" to="1967-06-01"/>
-        </region>
-        <region iso3166="PT">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="PTE" from="1911-05-22" to="2002-02-28"/>
-        </region>
-        <region iso3166="PW">
-            <currency iso4217="USD" from="1944-01-01"/>
-        </region>
-        <region iso3166="PY">
-            <currency iso4217="PYG" from="1943-11-01"/>
-        </region>
-        <region iso3166="QA">
-            <currency iso4217="QAR" from="1973-05-19"/>
-        </region>
-        <region iso3166="QU">
-            <currency iso4217="EUR" from="1999-01-01"/>
-        </region>
-        <region iso3166="RE">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1975-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="RO">
-            <currency iso4217="RON" from="2005-07-01"/>
-            <currency iso4217="ROL" from="1952-01-28" to="2006-12-31"/>
-        </region>
-        <region iso3166="RS">
-            <currency iso4217="RSD" from="2006-10-25"/>
-            <currency iso4217="CSD" from="2002-05-15" to="2006-10-25"/>
-            <currency iso4217="YUM" from="1994-01-24" to="2002-05-15"/>
-        </region>
-        <region iso3166="RU">
-            <currency iso4217="RUB" from="1999-01-01"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1998-12-31"/>
-        </region>
-        <region iso3166="RW">
-            <currency iso4217="RWF" from="1964-05-19"/>
-        </region>
-        <region iso3166="SA">
-            <currency iso4217="SAR" from="1952-10-22"/>
-        </region>
-        <region iso3166="SB">
-            <currency iso4217="SBD" from="1977-10-24"/>
-            <currency iso4217="AUD" from="1966-02-14" to="1978-06-30"/>
-        </region>
-        <region iso3166="SC">
-            <currency iso4217="SCR" from="1903-11-01"/>
-        </region>
-        <region iso3166="SD">
-            <currency iso4217="SDG" from="2007-01-10"/>
-            <currency iso4217="SDD" from="1992-06-08" to="2007-06-30"/>
-            <currency iso4217="SDP" from="1957-04-08" to="1998-06-01"/>
-            <currency iso4217="EGP" from="1889-01-19" to="1958-01-01"/>
-            <currency iso4217="GBP" from="1889-01-19" to="1958-01-01"/>
-        </region>
-        <region iso3166="SE">
-            <currency iso4217="SEK" from="1873-05-27"/>
-        </region>
-        <region iso3166="SG">
-            <currency iso4217="SGD" from="1967-06-12"/>
-            <currency iso4217="MYR" from="1963-09-16" to="1967-06-12"/>
-        </region>
-        <region iso3166="SH">
-            <currency iso4217="SHP" from="1917-02-15"/>
-        </region>
-        <region iso3166="SI">
-            <currency iso4217="EUR" from="2007-01-01"/>
-            <currency iso4217="SIT" from="1992-10-07" to="2007-01-14"/>
-        </region>
-        <region iso3166="SJ">
-            <currency iso4217="NOK" from="1905-06-07"/>
-        </region>
-        <region iso3166="SK">
-            <currency iso4217="EUR" from="2009-01-01"/>
-            <currency iso4217="SKK" from="1992-12-31" to="2009-01-01"/>
-            <currency iso4217="CSK" from="1953-06-01" to="1992-12-31"/>
-        </region>
-        <region iso3166="SL">
-            <currency iso4217="SLL" from="1964-08-04"/>
-            <currency iso4217="GBP" from="1808-11-30" to="1966-02-04"/>
-        </region>
-        <region iso3166="SM">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ITL" from="1865-12-23" to="2001-02-28"/>
-        </region>
-        <region iso3166="SN">
-            <currency iso4217="XOF" from="1959-04-04"/>
-        </region>
-        <region iso3166="SO">
-            <currency iso4217="SOS" from="1960-07-01"/>
-        </region>
-        <region iso3166="SR">
-            <currency iso4217="SRD" from="2004-01-01"/>
-            <currency iso4217="SRG" from="1940-05-10" to="2003-12-31"/>
-            <currency iso4217="NLG" from="1815-11-20" to="1940-05-10"/>
-        </region>
-        <region iso3166="ST">
-            <currency iso4217="STD" from="1977-09-08"/>
-        </region>
-        <region iso3166="SU">
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="SV">
-            <currency iso4217="USD" from="2001-01-01"/>
-            <currency iso4217="SVC" from="1919-11-11" to="2001-01-01"/>
-        </region>
-        <region iso3166="SY">
-            <currency iso4217="SYP" from="1948-01-01"/>
-        </region>
-        <region iso3166="SZ">
-            <currency iso4217="SZL" from="1974-09-06"/>
-        </region>
-        <region iso3166="TC">
-            <currency iso4217="USD" from="1969-09-08"/>
-        </region>
-        <region iso3166="TD">
-            <currency iso4217="XAF" from="1993-01-01"/>
-        </region>
-        <region iso3166="TF">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1959-01-01" to="2002-02-17"/>
-        </region>
-        <region iso3166="TG">
-            <currency iso4217="XOF" from="1958-11-28"/>
-        </region>
-        <region iso3166="TH">
-            <currency iso4217="THB" from="1928-04-15"/>
-        </region>
-        <region iso3166="TJ">
-            <currency iso4217="TJS" from="2000-10-26"/>
-            <currency iso4217="TJR" from="1995-05-10" to="2000-10-25"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1995-05-10"/>
-        </region>
-        <region iso3166="TK">
-            <currency iso4217="NZD" from="1967-07-10"/>
-        </region>
-        <region iso3166="TL">
-            <currency iso4217="USD" from="1999-10-20"/>
-            <currency iso4217="TPE" from="1959-01-02" to="2002-05-20"/>
-            <currency iso4217="IDR" from="1975-12-07" to="2002-05-20"/>
-        </region>
-        <region iso3166="TM">
-            <currency iso4217="TMT" from="2009-01-01"/>
-            <currency iso4217="TMM" from="1993-11-01" to="2009-01-01"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1993-11-01"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="TN">
-            <currency iso4217="TND" from="1958-11-01"/>
-        </region>
-        <region iso3166="TO">
-            <currency iso4217="TOP" from="1966-02-14"/>
-        </region>
-        <region iso3166="TP">
-            <currency iso4217="TPE" from="1959-01-02" to="2002-05-20"/>
-            <currency iso4217="IDR" from="1975-12-07" to="2002-05-20"/>
-        </region>
-        <region iso3166="TR">
-            <currency iso4217="TRY" from="2005-01-01"/>
-            <currency iso4217="TRL" from="1922-11-01" to="2005-12-31"/>
-        </region>
-        <region iso3166="TT">
-            <currency iso4217="TTD" from="1964-01-01"/>
-        </region>
-        <region iso3166="TV">
-            <currency iso4217="AUD" from="1966-02-14"/>
-        </region>
-        <region iso3166="TW">
-            <currency iso4217="TWD" from="1949-06-15"/>
-        </region>
-        <region iso3166="TZ">
-            <currency iso4217="TZS" from="1966-06-14"/>
-        </region>
-        <region iso3166="UA">
-            <currency iso4217="UAH" from="1996-09-02"/>
-            <currency iso4217="UAK" from="1992-11-13" to="1993-10-17"/>
-            <currency iso4217="RUR" from="1991-12-25" to="1992-11-13"/>
-            <currency iso4217="SUR" from="1961-01-01" to="1991-12-25"/>
-        </region>
-        <region iso3166="UG">
-            <currency iso4217="UGX" from="1987-05-15"/>
-            <currency iso4217="UGS" from="1966-08-15" to="1987-05-15"/>
-        </region>
-        <region iso3166="UM">
-            <currency iso4217="USD" from="1944-01-01"/>
-        </region>
-        <region iso3166="US">
-            <currency iso4217="USD" from="1792-01-01"/>
-            <currency iso4217="USN" tender="false"/>
-            <currency iso4217="USS" tender="false"/>
-        </region>
-        <region iso3166="UY">
-            <currency iso4217="UYU" from="1993-03-01"/>
-            <currency iso4217="UYP" from="1975-07-01" to="1993-03-01"/>
-            <currency iso4217="UYI" tender="false"/>
-        </region>
-        <region iso3166="UZ">
-            <currency iso4217="UZS" from="1994-07-01"/>
-        </region>
-        <region iso3166="VA">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="ITL" from="1870-10-19" to="2002-02-28"/>
-        </region>
-        <region iso3166="VC">
-            <currency iso4217="XCD" from="1965-10-06"/>
-        </region>
-        <region iso3166="VE">
-            <currency iso4217="VEF" from="2008-01-01"/>
-            <currency iso4217="VEB" from="1871-05-11" to="2008-06-30"/>
-        </region>
-        <region iso3166="VG">
-            <currency iso4217="USD" from="1833-01-01"/>
-            <currency iso4217="GBP" from="1833-01-01" to="1959-01-01"/>
-        </region>
-        <region iso3166="VI">
-            <currency iso4217="USD" from="1837-01-01"/>
-        </region>
-        <region iso3166="VN">
-            <currency iso4217="VND" from="1985-09-14"/>
-            <currency iso4217="VNN" from="1978-05-03" to="1985-09-14"/>
-        </region>
-        <region iso3166="VU">
-            <currency iso4217="VUV" from="1981-01-01"/>
-        </region>
-        <region iso3166="WF">
-            <currency iso4217="XPF" from="1961-07-30"/>
-        </region>
-        <region iso3166="WS">
-            <currency iso4217="WST" from="1967-07-10"/>
-        </region>
-        <region iso3166="YE">
-            <currency iso4217="YER" from="1990-05-22"/>
-        </region>
-        <region iso3166="YD">
-            <currency iso4217="YDD" from="1965-04-01" to="1996-01-01"/>
-        </region>
-        <region iso3166="YT">
-            <currency iso4217="EUR" from="1999-01-01"/>
-            <currency iso4217="FRF" from="1976-02-23" to="2002-02-17"/>
-            <currency iso4217="KMF" from="1975-01-01" to="1976-02-23"/>
-        </region>
-        <region iso3166="YU">
-            <currency iso4217="YUM" from="1994-01-24" to="2002-05-15"/>
-            <currency iso4217="YUN" from="1990-01-01" to="1992-07-24"/>
-            <currency iso4217="YUD" from="1966-01-01" to="1990-01-01"/>
-        </region>
-        <region iso3166="ZA">
-            <currency iso4217="ZAR" from="1961-02-14"/>
-            <currency iso4217="ZAL" tender="false"/>
-        </region>
-        <region iso3166="ZM">
-            <currency iso4217="ZMK" from="1968-01-16"/>
-        </region>
-        <region iso3166="ZR">
-            <currency iso4217="ZRN" from="1993-11-01" to="1998-07"/>
-            <currency iso4217="ZRZ" from="1971-10-27" to="1993-11-01"/>
-        </region>
-        <region iso3166="ZW">
-            <currency iso4217="ZWL" from="2009-02-02"/>
-            <currency iso4217="ZWR" from="2008-08-01" to="2009-02-02"/>
-            <currency iso4217="ZWD" from="1980-04-18" to="2008-08-01"/>
-            <currency iso4217="RHD" from="1970-02-17" to="1980-04-18"/>
-        </region>
-        <region iso3166="ZZ">
-            <currency iso4217="XAG" tender="false"/>
-            <currency iso4217="XAU" tender="false"/>
-            <currency iso4217="XBA" tender="false"/>
-            <currency iso4217="XBB" tender="false"/>
-            <currency iso4217="XBC" tender="false"/>
-            <currency iso4217="XBD" tender="false"/>
-            <currency iso4217="XDR" tender="false"/>
-            <currency iso4217="XEU" tender="false"/>
-            <currency iso4217="XFO" tender="false"/>
-            <currency iso4217="XFU" tender="false"/>
-            <currency iso4217="XPD" tender="false"/>
-            <currency iso4217="XPT" tender="false"/>
-            <currency iso4217="XRE" tender="false"/>
-            <currency iso4217="XTS" tender="false"/>
-            <currency iso4217="XXX" tender="false"/>
-        </region>
-    </currencyData>
-    <territoryContainment>
-        <group type="001" contains="002 009 019 142 150"/>
-        <group type="011" contains="BF BJ CI CV GH GM GN GW LR ML MR NE NG SH SL SN TG"/>
-        <group type="013" contains="BZ CR GT HN MX NI PA SV"/>
-        <group type="014" contains="BI DJ ER ET KE KM MG MU MW MZ RE RW SC SO TZ UG YT ZM ZW"/>
-        <group type="142" contains="030 035 143 145 034 062"/>
-        <group type="143" contains="TM TJ KG KZ UZ"/>
-        <group type="145" contains="AE AM AZ BH CY GE IL IQ JO KW LB OM PS QA SA NT SY TR YE YD"/>
-        <group type="015" contains="DZ EG EH LY MA SD TN"/>
-        <group type="150" contains="039 151 154 155 QU"/>
-        <group type="151" contains="BG BY CZ HU MD PL RO RU SU SK UA"/>
-        <group type="154" contains="GG IM JE AX DK EE FI FO GB IE IM IS LT LV NO SE SJ"/>
-        <group type="830" contains="GG JE"/>
-        <group type="155" contains="AT BE CH DE DD FR FX LI LU MC NL"/>
-        <group type="017" contains="AO CD ZR CF CG CM GA GQ ST TD"/>
-        <group type="172" contains="AM AZ BY GE KG KZ MD RU TJ TM UA UZ"/>
-        <group type="018" contains="BW LS NA SZ ZA"/>
-        <group type="019" contains="005 013 021 029 003 419"/>
-        <group type="002" contains="011 014 015 017 018"/>
-        <group type="021" contains="BM CA GL PM US"/>
-        <group type="029" contains="AG AI AN AW BB BL BS CU DM DO GD GP HT JM KN KY LC MF MQ MS PR TC TT VC VG VI"/>
-        <group type="003" contains="013 021 029"/>
-        <group type="030" contains="CN HK JP KP KR MN MO TW"/>
-        <group type="035" contains="BN ID KH LA MM BU MY PH SG TH TL TP VN"/>
-        <group type="039" contains="AD AL BA ES GI GR HR IT ME MK MT CS RS PT SI SM VA YU"/>
-        <group type="419" contains="005 013 029"/>
-        <group type="005" contains="AR BO BR CL CO EC FK GF GY PE PY SR UY VE"/>
-        <group type="053" contains="AU NF NZ"/>
-        <group type="054" contains="FJ NC PG SB VU"/>
-        <group type="057" contains="FM GU KI MH MP NR PW"/>
-        <group type="061" contains="AS CK NU PF PN TK TO TV WF WS"/>
-        <group type="062" contains="034 143"/>
-        <group type="034" contains="AF BD BT IN IR LK MV NP PK"/>
-        <group type="009" contains="053 054 057 061 QO"/>
-        <group type="QO" contains="AQ BV CC CX GS HM IO TF UM"/>
-        <group type="QU" contains="AT BE CY CZ DE DK EE ES FI FR GB GR HU IE IT LT LU LV MT NL PL PT SE SI SK BG RO"/>
-    </territoryContainment>
-    <languageData>
-        <language type="aa" scripts="Latn"/>
-        <language type="aa" territories="DJ ET" alt="secondary"/>
-        <language type="ab" scripts="Cyrl"/>
-        <language type="ab" territories="GE" alt="secondary"/>
-        <language type="abq" scripts="Cyrl"/>
-        <language type="abr" territories="GH" alt="secondary"/>
-        <language type="ace" scripts="Latn"/>
-        <language type="ace" territories="ID" alt="secondary"/>
-        <language type="ach" scripts="Latn"/>
-        <language type="ada" scripts="Latn"/>
-        <language type="ady" scripts="Cyrl"/>
-        <language type="ady" territories="RU" alt="secondary"/>
-        <language type="af" scripts="Latn" territories="ZA"/>
-        <language type="aii" scripts="Cyrl"/>
-        <language type="aii" scripts="Syrc" alt="secondary"/>
-        <language type="ain" scripts="Kana Latn" alt="secondary"/>
-        <language type="ak" scripts="Latn"/>
-        <language type="ak" territories="GH" alt="secondary"/>
-        <language type="akk" scripts="Xsux" alt="secondary"/>
-        <language type="ale" scripts="Latn"/>
-        <language type="alt" scripts="Cyrl"/>
-        <language type="am" scripts="Ethi" territories="ET"/>
-        <language type="amo" scripts="Latn"/>
-        <language type="an" scripts="Latn"/>
-        <language type="anp" scripts="Deva"/>
-        <language type="ar" scripts="Arab" territories="AE BH DJ DZ EG EH ER IL IQ JO KM KW LB LY MA MR OM PS QA SA SD SY TD TN YE"/>
-        <language type="ar" scripts="Syrc" territories="IR" alt="secondary"/>
-        <language type="arn" scripts="Latn"/>
-        <language type="arp" scripts="Latn"/>
-        <language type="arw" scripts="Latn" alt="secondary"/>
-        <language type="as" scripts="Beng" territories="IN"/>
-        <language type="ast" scripts="Latn"/>
-        <language type="ast" territories="ES" alt="secondary"/>
-        <language type="av" scripts="Cyrl"/>
-        <language type="av" territories="RU" alt="secondary"/>
-        <language type="awa" scripts="Deva"/>
-        <language type="awa" territories="IN" alt="secondary"/>
-        <language type="ay" scripts="Latn" territories="BO"/>
-        <language type="az" scripts="Arab Cyrl Latn" territories="AZ"/>
-        <language type="az" territories="IR" alt="secondary"/>
-        <language type="ba" scripts="Cyrl"/>
-        <language type="ba" territories="RU" alt="secondary"/>
-        <language type="bal" scripts="Arab Latn"/>
-        <language type="bal" territories="IR PK" alt="secondary"/>
-        <language type="ban" scripts="Latn"/>
-        <language type="ban" scripts="Bali" territories="ID" alt="secondary"/>
-        <language type="bas" scripts="Latn"/>
-        <language type="bbc" scripts="Latn"/>
-        <language type="bbc" scripts="Batk" territories="ID" alt="secondary"/>
-        <language type="bci" territories="CI" alt="secondary"/>
-        <language type="bcl" territories="PH" alt="secondary"/>
-        <language type="be" scripts="Cyrl" territories="BY"/>
-        <language type="bej" scripts="Arab"/>
-        <language type="bem" scripts="Latn"/>
-        <language type="bem" territories="ZM" alt="secondary"/>
-        <language type="bew" territories="ID" alt="secondary"/>
-        <language type="bfq" scripts="Taml"/>
-        <language type="bft" scripts="Arab"/>
-        <language type="bft" scripts="Tibt" alt="secondary"/>
-        <language type="bfy" scripts="Deva"/>
-        <language type="bg" scripts="Cyrl" territories="BG"/>
-        <language type="bgc" territories="IN" alt="secondary"/>
-        <language type="bh" scripts="Deva" alt="secondary"/>
-        <language type="bhb" scripts="Deva"/>
-        <language type="bhb" territories="IN" alt="secondary"/>
-        <language type="bhi" territories="IN" alt="secondary"/>
-        <language type="bhk" territories="PH" alt="secondary"/>
-        <language type="bho" scripts="Deva"/>
-        <language type="bho" territories="IN MU NP" alt="secondary"/>
-        <language type="bi" scripts="Latn" territories="VU"/>
-        <language type="bik" scripts="Latn"/>
-        <language type="bin" scripts="Latn"/>
-        <language type="bin" territories="NG" alt="secondary"/>
-        <language type="bjj" scripts="Deva"/>
-        <language type="bjj" territories="IN" alt="secondary"/>
-        <language type="bjn" territories="ID" alt="secondary"/>
-        <language type="bku" scripts="Latn"/>
-        <language type="bku" scripts="Buhd" alt="secondary"/>
-        <language type="bla" scripts="Latn"/>
-        <language type="bm" scripts="Latn"/>
-        <language type="bm" territories="ML" alt="secondary"/>
-        <language type="bn" scripts="Beng" territories="BD IN"/>
-        <language type="bo" scripts="Tibt"/>
-        <language type="bo" territories="CN" alt="secondary"/>
-        <language type="br" scripts="Latn"/>
-        <language type="bra" scripts="Deva"/>
-        <language type="brh" territories="PK" alt="secondary"/>
-        <language type="bs" scripts="Latn" territories="BA"/>
-        <language type="btv" scripts="Deva"/>
-        <language type="bua" scripts="Cyrl"/>
-        <language type="buc" scripts="Latn"/>
-        <language type="buc" territories="YT" alt="secondary"/>
-        <language type="bug" scripts="Latn"/>
-        <language type="bug" scripts="Bugi" territories="ID" alt="secondary"/>
-        <language type="bxr" scripts="Cyrl"/>
-        <language type="bya" scripts="Latn"/>
-        <language type="bya" scripts="Batk" territories="ID" alt="secondary"/>
-        <language type="byn" scripts="Ethi"/>
-        <language type="ca" scripts="Latn" territories="AD"/>
-        <language type="ca" territories="ES" alt="secondary"/>
-        <language type="cad" scripts="Latn"/>
-        <language type="car" scripts="Latn"/>
-        <language type="cch" scripts="Latn"/>
-        <language type="ccp" scripts="Beng"/>
-        <language type="ccp" scripts="Cakm" alt="secondary"/>
-        <language type="ce" scripts="Cyrl"/>
-        <language type="ce" territories="RU" alt="secondary"/>
-        <language type="ceb" scripts="Latn"/>
-        <language type="ceb" territories="PH" alt="secondary"/>
-        <language type="cgg" territories="UG" alt="secondary"/>
-        <language type="ch" scripts="Latn" territories="GU"/>
-        <language type="chk" scripts="Latn" territories="FM"/>
-        <language type="chm" scripts="Cyrl Latn"/>
-        <language type="chn" scripts="Latn" alt="secondary"/>
-        <language type="cho" scripts="Latn"/>
-        <language type="chp" scripts="Latn"/>
-        <language type="chp" scripts="Cans" alt="secondary"/>
-        <language type="chr" scripts="Cher Latn"/>
-        <language type="chy" scripts="Latn"/>
-        <language type="cja" scripts="Cham"/>
-        <language type="cja" scripts="Deva" alt="secondary"/>
-        <language type="cjm" scripts="Arab"/>
-        <language type="cjm" scripts="Cham" alt="secondary"/>
-        <language type="cjs" scripts="Cyrl"/>
-        <language type="ckt" scripts="Cyrl"/>
-        <language type="co" scripts="Latn"/>
-        <language type="cop" scripts="Arab Copt Grek" alt="secondary"/>
-        <language type="cpe" scripts="Latn" alt="secondary"/>
-        <language type="cr" scripts="Cans Latn"/>
-        <language type="crh" scripts="Cyrl"/>
-        <language type="crk" scripts="Cans"/>
-        <language type="crk" territories="CA" alt="secondary"/>
-        <language type="crs" territories="SC" alt="secondary"/>
-        <language type="cs" scripts="Latn" territories="CZ"/>
-        <language type="csb" scripts="Latn" alt="secondary"/>
-        <language type="cu" scripts="Glag" alt="secondary"/>
-        <language type="cv" scripts="Cyrl"/>
-        <language type="cv" territories="RU" alt="secondary"/>
-        <language type="cwd" scripts="Cans"/>
-        <language type="cwd" territories="CA" alt="secondary"/>
-        <language type="cy" scripts="Latn"/>
-        <language type="cy" territories="GB" alt="secondary"/>
-        <language type="da" scripts="Latn" territories="DK GL"/>
-        <language type="dak" scripts="Latn"/>
-        <language type="dar" scripts="Cyrl"/>
-        <language type="dcc" territories="IN" alt="secondary"/>
-        <language type="de" scripts="Latn" territories="AT BE CH DE LI LU"/>
-        <language type="de" scripts="Runr" territories="BR US" alt="secondary"/>
-        <language type="del" scripts="Latn"/>
-        <language type="den" scripts="Latn"/>
-        <language type="den" scripts="Cans" alt="secondary"/>
-        <language type="dgr" scripts="Latn"/>
-        <language type="dhd" territories="IN" alt="secondary"/>
-        <language type="din" scripts="Latn"/>
-        <language type="diq" territories="TR" alt="secondary"/>
-        <language type="dje" territories="NE" alt="secondary"/>
-        <language type="dng" scripts="Cyrl"/>
-        <language type="doi" scripts="Arab"/>
-        <language type="doi" territories="IN" alt="secondary"/>
-        <language type="dsb" scripts="Latn"/>
-        <language type="dua" scripts="Latn"/>
-        <language type="dv" scripts="Thaa" territories="MV"/>
-        <language type="dyu" scripts="Latn"/>
-        <language type="dyu" territories="BF" alt="secondary"/>
-        <language type="dz" scripts="Tibt" territories="BT"/>
-        <language type="ee" scripts="Latn"/>
-        <language type="ee" territories="GH TG" alt="secondary"/>
-        <language type="efi" scripts="Latn" territories="NG"/>
-        <language type="eka" scripts="Latn"/>
-        <language type="el" scripts="Grek" territories="CY GR"/>
-        <language type="emk" scripts="Nkoo"/>
-        <language type="emk" territories="GN" alt="secondary"/>
-        <language type="en" scripts="Latn" territories="AG AI AS AU BB BM BS BW BZ CA CC CK CM CX DM FJ FK FM GB GD GG GH GI GM GU GY HK HN IE IM JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR RW SB SC SG SH SL SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
-        <language type="en" scripts="Dsrt Shaw" territories="BE DE ES ET FR IN IT MY NL PW" alt="secondary"/>
-        <language type="eo" scripts="Latn"/>
-        <language type="es" scripts="Latn" territories="AR BO CL CO CR CU DO EC ES GQ GT HN MX NI PA PE PH PR PY SV UY VE"/>
-        <language type="es" territories="AD BZ US" alt="secondary"/>
-        <language type="et" scripts="Latn" territories="EE"/>
-        <language type="ett" scripts="Ital Latn" alt="secondary"/>
-        <language type="eu" scripts="Latn"/>
-        <language type="eu" territories="ES" alt="secondary"/>
-        <language type="evn" scripts="Cyrl"/>
-        <language type="ewo" scripts="Latn"/>
-        <language type="fa" scripts="Arab" territories="AF IR"/>
-        <language type="fa" territories="PK" alt="secondary"/>
-        <language type="fan" scripts="Latn"/>
-        <language type="fan" territories="GQ" alt="secondary"/>
-        <language type="fat" scripts="Latn"/>
-        <language type="ff" scripts="Latn"/>
-        <language type="fi" scripts="Latn" territories="FI"/>
-        <language type="fi" territories="SE" alt="secondary"/>
-        <language type="fil" scripts="Latn" territories="PH"/>
-        <language type="fil" scripts="Tglg" alt="secondary"/>
-        <language type="fiu" scripts="Latn" alt="secondary"/>
-        <language type="fj" scripts="Latn" territories="FJ"/>
-        <language type="fo" scripts="Latn" territories="FO"/>
-        <language type="fon" scripts="Latn"/>
-        <language type="fon" territories="BJ" alt="secondary"/>
-        <language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN SY TD TG TN VU WF YT"/>
-        <language type="fr" territories="GB US" alt="secondary"/>
-        <language type="frr" scripts="Latn"/>
-        <language type="frs" scripts="Latn"/>
-        <language type="fud" territories="WF" alt="secondary"/>
-        <language type="fuq" territories="NE" alt="secondary"/>
-        <language type="fur" scripts="Latn"/>
-        <language type="fuv" territories="NG" alt="secondary"/>
-        <language type="fy" scripts="Latn"/>
-        <language type="fy" territories="NL" alt="secondary"/>
-        <language type="ga" scripts="Latn" territories="IE"/>
-        <language type="ga" territories="GB" alt="secondary"/>
-        <language type="gaa" scripts="Latn"/>
-        <language type="gaa" territories="GH" alt="secondary"/>
-        <language type="gag" scripts="Latn"/>
-        <language type="gag" scripts="Cyrl" territories="MD" alt="secondary"/>
-        <language type="gay" scripts="Latn"/>
-        <language type="gba" scripts="Arab"/>
-        <language type="gbm" scripts="Deva"/>
-        <language type="gbm" territories="IN" alt="secondary"/>
-        <language type="gcr" scripts="Latn"/>
-        <language type="gcr" territories="GF" alt="secondary"/>
-        <language type="gd" scripts="Latn"/>
-        <language type="gd" territories="GB" alt="secondary"/>
-        <language type="gez" scripts="Ethi" alt="secondary"/>
-        <language type="gil" scripts="Latn" territories="KI"/>
-        <language type="gl" scripts="Latn"/>
-        <language type="gl" territories="ES" alt="secondary"/>
-        <language type="gld" scripts="Cyrl"/>
-        <language type="glk" territories="IR" alt="secondary"/>
-        <language type="gn" scripts="Latn" territories="PY"/>
-        <language type="gno" territories="IN" alt="secondary"/>
-        <language type="gon" scripts="Deva Telu"/>
-        <language type="gon" territories="IN" alt="secondary"/>
-        <language type="gor" scripts="Latn"/>
-        <language type="got" scripts="Goth" alt="secondary"/>
-        <language type="grb" scripts="Latn"/>
-        <language type="grc" scripts="Cprt Grek Linb" alt="secondary"/>
-        <language type="grt" scripts="Beng"/>
-        <language type="gsw" scripts="Latn"/>
-        <language type="gsw" territories="CH LI" alt="secondary"/>
-        <language type="gu" scripts="Gujr" territories="IN"/>
-        <language type="guz" territories="KE" alt="secondary"/>
-        <language type="gv" scripts="Latn"/>
-        <language type="gwi" scripts="Latn"/>
-        <language type="ha" scripts="Arab Latn" territories="NG"/>
-        <language type="ha" territories="NE" alt="secondary"/>
-        <language type="hai" scripts="Latn"/>
-        <language type="haw" scripts="Latn"/>
-        <language type="haw" territories="US" alt="secondary"/>
-        <language type="haz" territories="AF" alt="secondary"/>
-        <language type="he" scripts="Hebr" territories="IL"/>
-        <language type="hi" scripts="Deva" territories="IN"/>
-        <language type="hi" territories="FJ" alt="secondary"/>
-        <language type="hil" scripts="Latn"/>
-        <language type="hil" territories="PH" alt="secondary"/>
-        <language type="hmn" scripts="Latn"/>
-        <language type="hmn" scripts="Hmng" alt="secondary"/>
-        <language type="hne" scripts="Deva"/>
-        <language type="hne" territories="IN" alt="secondary"/>
-        <language type="hnn" scripts="Latn"/>
-        <language type="hnn" scripts="Hano" alt="secondary"/>
-        <language type="hno" territories="PK" alt="secondary"/>
-        <language type="ho" scripts="Latn" territories="PG"/>
-        <language type="hoc" scripts="Deva"/>
-        <language type="hoc" territories="IN" alt="secondary"/>
-        <language type="hoj" scripts="Deva"/>
-        <language type="hop" scripts="Latn"/>
-        <language type="hr" scripts="Latn" territories="BA HR"/>
-        <language type="hr" territories="AT" alt="secondary"/>
-        <language type="hsb" scripts="Latn"/>
-        <language type="ht" scripts="Latn" territories="HT"/>
-        <language type="hu" scripts="Latn" territories="HU"/>
-        <language type="hu" territories="AT RO RS" alt="secondary"/>
-        <language type="hup" scripts="Latn"/>
-        <language type="hy" scripts="Armn" territories="AM"/>
-        <language type="hz" scripts="Latn"/>
-        <language type="ia" scripts="Latn" alt="secondary"/>
-        <language type="iba" scripts="Latn"/>
-        <language type="ibb" scripts="Latn"/>
-        <language type="ibb" territories="NG" alt="secondary"/>
-        <language type="id" scripts="Latn" territories="ID"/>
-        <language type="id" scripts="Arab" alt="secondary"/>
-        <language type="ig" scripts="Latn" territories="NG"/>
-        <language type="ii" scripts="Yiii"/>
-        <language type="ii" scripts="Latn" territories="CN" alt="secondary"/>
-        <language type="ik" scripts="Latn"/>
-        <language type="ilo" scripts="Latn"/>
-        <language type="ilo" territories="PH" alt="secondary"/>
-        <language type="inh" scripts="Cyrl"/>
-        <language type="inh" scripts="Arab Latn" territories="RU" alt="secondary"/>
-        <language type="is" scripts="Latn" territories="IS"/>
-        <language type="it" scripts="Latn" territories="CH IT SM"/>
-        <language type="it" territories="FR HR US VA" alt="secondary"/>
-        <language type="iu" scripts="Cans"/>
-        <language type="iu" scripts="Latn" territories="CA GL" alt="secondary"/>
-        <language type="ja" scripts="Jpan" territories="JP"/>
-        <language type="jpr" scripts="Hebr"/>
-        <language type="jrb" scripts="Hebr"/>
-        <language type="jv" scripts="Latn"/>
-        <language type="jv" scripts="Java" territories="ID" alt="secondary"/>
-        <language type="ka" scripts="Geor" territories="GE"/>
-        <language type="kaa" scripts="Cyrl"/>
-        <language type="kab" scripts="Latn"/>
-        <language type="kab" territories="DZ" alt="secondary"/>
-        <language type="kac" scripts="Mymr"/>
-        <language type="kaj" scripts="Latn"/>
-        <language type="kam" scripts="Latn"/>
-        <language type="kam" territories="KE" alt="secondary"/>
-        <language type="kbd" scripts="Cyrl"/>
-        <language type="kbd" territories="RU" alt="secondary"/>
-        <language type="kca" scripts="Cyrl"/>
-        <language type="kcg" scripts="Latn"/>
-        <language type="kdt" scripts="Thai"/>
-        <language type="kea" territories="CV" alt="secondary"/>
-        <language type="kfo" scripts="Latn"/>
-        <language type="kfr" scripts="Deva"/>
-        <language type="kfy" territories="IN" alt="secondary"/>
-        <language type="kg" scripts="Latn"/>
-        <language type="kg" territories="CD" alt="secondary"/>
-        <language type="kha" scripts="Latn"/>
-        <language type="kha" scripts="Beng" territories="IN" alt="secondary"/>
-        <language type="khb" scripts="Talu"/>
-        <language type="khn" territories="IN" alt="secondary"/>
-        <language type="kht" scripts="Mymr"/>
-        <language type="ki" scripts="Latn"/>
-        <language type="ki" territories="KE" alt="secondary"/>
-        <language type="kj" scripts="Latn"/>
-        <language type="kj" territories="NA" alt="secondary"/>
-        <language type="kjh" scripts="Cyrl"/>
-        <language type="kk" scripts="Cyrl" territories="KZ"/>
-        <language type="kk" scripts="Arab" territories="CN" alt="secondary"/>
-        <language type="kl" scripts="Latn" territories="GL"/>
-        <language type="kl" territories="DK" alt="secondary"/>
-        <language type="kln" territories="KE" alt="secondary"/>
-        <language type="km" scripts="Khmr" territories="KH"/>
-        <language type="kmb" scripts="Latn"/>
-        <language type="kmb" territories="AO" alt="secondary"/>
-        <language type="kn" scripts="Knda" territories="IN"/>
-        <language type="ko" scripts="Kore" territories="KP KR"/>
-        <language type="ko" territories="CN" alt="secondary"/>
-        <language type="koi" scripts="Cyrl"/>
-        <language type="koi" territories="RU" alt="secondary"/>
-        <language type="kok" scripts="Deva"/>
-        <language type="kok" territories="IN" alt="secondary"/>
-        <language type="kos" scripts="Latn" territories="FM"/>
-        <language type="kpe" scripts="Latn"/>
-        <language type="kpv" scripts="Cyrl"/>
-        <language type="kpv" territories="RU" alt="secondary"/>
-        <language type="kpy" scripts="Cyrl"/>
-        <language type="kr" scripts="Latn"/>
-        <language type="krc" scripts="Cyrl"/>
-        <language type="krc" territories="RU" alt="secondary"/>
-        <language type="kri" territories="SL" alt="secondary"/>
-        <language type="krl" scripts="Cyrl Latn"/>
-        <language type="kru" scripts="Deva"/>
-        <language type="kru" territories="IN" alt="secondary"/>
-        <language type="ks" scripts="Arab Deva" territories="IN"/>
-        <language type="ku" scripts="Arab Cyrl Latn"/>
-        <language type="ku" territories="IQ IR SY TR" alt="secondary"/>
-        <language type="kum" scripts="Cyrl"/>
-        <language type="kum" territories="RU" alt="secondary"/>
-        <language type="kut" scripts="Latn"/>
-        <language type="kv" scripts="Cyrl Latn"/>
-        <language type="kw" scripts="Latn"/>
-        <language type="kxm" territories="TH" alt="secondary"/>
-        <language type="ky" scripts="Arab Cyrl" territories="KG"/>
-        <language type="ky" scripts="Latn" alt="secondary"/>
-        <language type="la" scripts="Latn" territories="VA"/>
-        <language type="lab" scripts="Lina" alt="secondary"/>
-        <language type="lad" scripts="Hebr"/>
-        <language type="lah" scripts="Arab"/>
-        <language type="lah" territories="PK" alt="secondary"/>
-        <language type="laj" territories="UG" alt="secondary"/>
-        <language type="lam" scripts="Latn" alt="secondary"/>
-        <language type="lb" scripts="Latn" territories="LU"/>
-        <language type="lbe" scripts="Cyrl"/>
-        <language type="lbe" territories="RU" alt="secondary"/>
-        <language type="lcp" scripts="Thai"/>
-        <language type="lep" scripts="Lepc"/>
-        <language type="lez" scripts="Cyrl"/>
-        <language type="lez" territories="RU" alt="secondary"/>
-        <language type="lg" scripts="Latn"/>
-        <language type="lg" territories="UG" alt="secondary"/>
-        <language type="li" scripts="Latn"/>
-        <language type="lif" scripts="Deva Limb"/>
-        <language type="lis" scripts="Latn"/>
-        <language type="ljp" territories="ID" alt="secondary"/>
-        <language type="lmn" scripts="Telu"/>
-        <language type="lmn" territories="IN" alt="secondary"/>
-        <language type="ln" scripts="Latn" territories="CD CG"/>
-        <language type="lo" scripts="Laoo" territories="LA"/>
-        <language type="lol" scripts="Latn"/>
-        <language type="loz" scripts="Latn"/>
-        <language type="lrc" territories="IR" alt="secondary"/>
-        <language type="lt" scripts="Latn" territories="LT"/>
-        <language type="lu" scripts="Latn"/>
-        <language type="lu" territories="CD" alt="secondary"/>
-        <language type="lua" scripts="Latn"/>
-        <language type="lua" territories="CD" alt="secondary"/>
-        <language type="lui" scripts="Latn"/>
-        <language type="lun" scripts="Latn"/>
-        <language type="luo" scripts="Latn"/>
-        <language type="luo" territories="KE" alt="secondary"/>
-        <language type="lus" scripts="Beng"/>
-        <language type="lut" scripts="Latn" alt="secondary"/>
-        <language type="luy" territories="KE" alt="secondary"/>
-        <language type="lv" scripts="Latn" territories="LV"/>
-        <language type="lwl" scripts="Thai"/>
-        <language type="mad" scripts="Latn"/>
-        <language type="mad" territories="ID" alt="secondary"/>
-        <language type="mag" scripts="Deva"/>
-        <language type="mag" territories="IN" alt="secondary"/>
-        <language type="mai" scripts="Deva"/>
-        <language type="mai" territories="IN NP" alt="secondary"/>
-        <language type="mak" scripts="Latn"/>
-        <language type="mak" scripts="Bugi" territories="ID" alt="secondary"/>
-        <language type="man" scripts="Latn"/>
-        <language type="mas" scripts="Latn"/>
-        <language type="mdf" scripts="Cyrl"/>
-        <language type="mdf" territories="RU" alt="secondary"/>
-        <language type="mdh" scripts="Latn"/>
-        <language type="mdh" territories="PH" alt="secondary"/>
-        <language type="mdr" scripts="Latn"/>
-        <language type="mdr" scripts="Bugi" alt="secondary"/>
-        <language type="men" scripts="Latn"/>
-        <language type="men" territories="SL" alt="secondary"/>
-        <language type="mer" territories="KE" alt="secondary"/>
-        <language type="mfa" territories="TH" alt="secondary"/>
-        <language type="mfe" scripts="Latn"/>
-        <language type="mfe" territories="MU" alt="secondary"/>
-        <language type="mg" scripts="Latn" territories="MG"/>
-        <language type="mh" scripts="Latn" territories="MH"/>
-        <language type="mi" scripts="Latn" territories="NZ"/>
-        <language type="mic" scripts="Latn"/>
-        <language type="min" scripts="Latn"/>
-        <language type="min" territories="ID" alt="secondary"/>
-        <language type="mk" scripts="Cyrl" territories="MK"/>
-        <language type="ml" scripts="Mlym" territories="IN"/>
-        <language type="mn" scripts="Cyrl Mong" territories="MN"/>
-        <language type="mn" scripts="Phag" territories="CN" alt="secondary"/>
-        <language type="mnc" scripts="Mong" alt="secondary"/>
-        <language type="mni" scripts="Beng"/>
-        <language type="mni" scripts="Mtei" territories="IN" alt="secondary"/>
-        <language type="mns" scripts="Cyrl"/>
-        <language type="mnw" scripts="Mymr"/>
-        <language type="moh" scripts="Latn"/>
-        <language type="mos" scripts="Latn"/>
-        <language type="mos" territories="BF" alt="secondary"/>
-        <language type="mr" scripts="Deva" territories="IN"/>
-        <language type="ms" scripts="Latn" territories="BN MY SG"/>
-        <language type="ms" scripts="Arab" territories="CC ID" alt="secondary"/>
-        <language type="mt" scripts="Latn" territories="MT"/>
-        <language type="mtr" territories="IN" alt="secondary"/>
-        <language type="mup" territories="IN" alt="secondary"/>
-        <language type="mus" scripts="Latn"/>
-        <language type="mwl" scripts="Latn"/>
-        <language type="mwr" scripts="Deva"/>
-        <language type="mwr" territories="IN" alt="secondary"/>
-        <language type="my" scripts="Mymr" territories="MM"/>
-        <language type="myv" scripts="Cyrl"/>
-        <language type="myv" territories="RU" alt="secondary"/>
-        <language type="na" scripts="Latn" territories="NR"/>
-        <language type="nap" scripts="Latn"/>
-        <language type="nap" territories="IT" alt="secondary"/>
-        <language type="nb" scripts="Latn" territories="NO SJ"/>
-        <language type="nbf" scripts="Latn"/>
-        <language type="nd" scripts="Latn"/>
-        <language type="nd" territories="ZW" alt="secondary"/>
-        <language type="ndc" territories="MZ" alt="secondary"/>
-        <language type="nds" scripts="Latn"/>
-        <language type="ne" scripts="Deva" territories="NP"/>
-        <language type="ne" territories="IN" alt="secondary"/>
-        <language type="new" scripts="Deva"/>
-        <language type="ng" scripts="Latn"/>
-        <language type="ng" territories="NA" alt="secondary"/>
-        <language type="ngl" territories="MZ" alt="secondary"/>
-        <language type="nia" scripts="Latn"/>
-        <language type="niu" scripts="Latn" territories="NU"/>
-        <language type="nl" scripts="Latn" territories="AN AW BE NL SR"/>
-        <language type="nn" scripts="Latn" territories="NO"/>
-        <language type="no" scripts="Latn"/>
-        <language type="nod" territories="TH" alt="secondary"/>
-        <language type="noe" territories="IN" alt="secondary"/>
-        <language type="nog" scripts="Cyrl"/>
-        <language type="nqo" scripts="Nkoo"/>
-        <language type="nr" scripts="Latn"/>
-        <language type="nso" scripts="Latn" territories="ZA"/>
-        <language type="nv" scripts="Latn"/>
-        <language type="ny" scripts="Latn" territories="MW"/>
-        <language type="ny" territories="ZM" alt="secondary"/>
-        <language type="nym" scripts="Latn"/>
-        <language type="nym" territories="TZ" alt="secondary"/>
-        <language type="nyn" scripts="Latn"/>
-        <language type="nyn" territories="UG" alt="secondary"/>
-        <language type="nyo" scripts="Latn"/>
-        <language type="nzi" scripts="Latn"/>
-        <language type="oc" scripts="Latn"/>
-        <language type="oc" territories="FR" alt="secondary"/>
-        <language type="oj" scripts="Cans"/>
-        <language type="oj" scripts="Latn" alt="secondary"/>
-        <language type="om" scripts="Latn"/>
-        <language type="om" scripts="Ethi" territories="ET" alt="secondary"/>
-        <language type="or" scripts="Orya" territories="IN"/>
-        <language type="os" scripts="Cyrl Latn"/>
-        <language type="os" territories="GE" alt="secondary"/>
-        <language type="osa" scripts="Latn"/>
-        <language type="osc" scripts="Ital Latn" alt="secondary"/>
-        <language type="pa" scripts="Guru" territories="IN"/>
-        <language type="pa" scripts="Arab" alt="secondary"/>
-        <language type="pag" scripts="Latn"/>
-        <language type="pag" territories="PH" alt="secondary"/>
-        <language type="pam" scripts="Latn"/>
-        <language type="pam" territories="PH" alt="secondary"/>
-        <language type="pap" scripts="Latn" territories="AN"/>
-        <language type="pap" territories="AW" alt="secondary"/>
-        <language type="pau" scripts="Latn" territories="PW"/>
-        <language type="peo" scripts="Xpeo" alt="secondary"/>
-        <language type="phn" scripts="Phnx" alt="secondary"/>
-        <language type="pi" scripts="Deva Sinh Thai" alt="secondary"/>
-        <language type="pl" scripts="Latn" territories="PL"/>
-        <language type="pl" territories="UA" alt="secondary"/>
-        <language type="pon" scripts="Latn" territories="FM"/>
-        <language type="pra" scripts="Khar" alt="secondary"/>
-        <language type="prd" scripts="Arab"/>
-        <language type="prg" scripts="Latn" alt="secondary"/>
-        <language type="ps" scripts="Arab" territories="AF"/>
-        <language type="ps" territories="PK" alt="secondary"/>
-        <language type="pt" scripts="Latn" territories="AO BR CV GW MZ PT ST TL"/>
-        <language type="qu" scripts="Latn" territories="BO PE"/>
-        <language type="raj" scripts="Latn"/>
-        <language type="rap" scripts="Latn"/>
-        <language type="rar" scripts="Latn"/>
-        <language type="rcf" scripts="Latn"/>
-        <language type="rcf" territories="RE" alt="secondary"/>
-        <language type="rej" territories="ID" alt="secondary"/>
-        <language type="rif" territories="MA" alt="secondary"/>
-        <language type="ril" scripts="Beng"/>
-        <language type="rjb" territories="IN" alt="secondary"/>
-        <language type="rm" scripts="Latn" territories="CH"/>
-        <language type="rmt" territories="IR" alt="secondary"/>
-        <language type="rn" scripts="Latn" territories="BI"/>
-        <language type="ro" scripts="Latn" territories="MD RO"/>
-        <language type="ro" scripts="Cyrl" territories="RS" alt="secondary"/>
-        <language type="rom" scripts="Cyrl Latn"/>
-        <language type="ru" scripts="Cyrl" territories="BY KG KZ RU"/>
-        <language type="ru" territories="EE LV SJ UA UZ" alt="secondary"/>
-        <language type="rup" scripts="Latn"/>
-        <language type="rw" scripts="Latn" territories="RW"/>
-        <language type="sa" territories="IN"/>
-        <language type="sa" scripts="Deva Sinh" alt="secondary"/>
-        <language type="sad" scripts="Latn"/>
-        <language type="sah" scripts="Cyrl"/>
-        <language type="sah" territories="RU" alt="secondary"/>
-        <language type="sam" scripts="Hebr Samr" alt="secondary"/>
-        <language type="sas" scripts="Latn"/>
-        <language type="sas" territories="ID" alt="secondary"/>
-        <language type="sat" scripts="Latn"/>
-        <language type="sat" scripts="Beng Deva Olck Orya" territories="IN" alt="secondary"/>
-        <language type="sc" scripts="Latn"/>
-        <language type="sck" territories="IN" alt="secondary"/>
-        <language type="scn" scripts="Latn"/>
-        <language type="scn" territories="IT" alt="secondary"/>
-        <language type="sco" scripts="Latn"/>
-        <language type="sco" territories="GB" alt="secondary"/>
-        <language type="sd" scripts="Arab Deva" territories="IN"/>
-        <language type="sd" territories="PK" alt="secondary"/>
-        <language type="se" scripts="Latn"/>
-        <language type="se" scripts="Cyrl" territories="NO" alt="secondary"/>
-        <language type="sel" scripts="Cyrl" alt="secondary"/>
-        <language type="sg" scripts="Latn" territories="CF"/>
-        <language type="sga" scripts="Latn Ogam" alt="secondary"/>
-        <language type="shn" scripts="Mymr"/>
-        <language type="shn" territories="MM" alt="secondary"/>
-        <language type="si" scripts="Sinh" territories="LK"/>
-        <language type="sid" scripts="Latn"/>
-        <language type="sid" territories="ET" alt="secondary"/>
-        <language type="sk" scripts="Latn" territories="SK"/>
-        <language type="sk" territories="RS" alt="secondary"/>
-        <language type="skr" territories="PK" alt="secondary"/>
-        <language type="sl" scripts="Latn" territories="SI"/>
-        <language type="sl" territories="AT" alt="secondary"/>
-        <language type="sm" scripts="Latn" territories="AS WS"/>
-        <language type="sma" scripts="Latn"/>
-        <language type="smi" scripts="Latn" alt="secondary"/>
-        <language type="smj" scripts="Latn"/>
-        <language type="smn" scripts="Latn"/>
-        <language type="sms" scripts="Latn"/>
-        <language type="sn" scripts="Latn"/>
-        <language type="sn" territories="ZW" alt="secondary"/>
-        <language type="snk" scripts="Latn"/>
-        <language type="so" scripts="Latn" territories="SO"/>
-        <language type="so" scripts="Arab Osma" territories="DJ ET" alt="secondary"/>
-        <language type="son" scripts="Latn" alt="secondary"/>
-        <language type="sou" territories="TH" alt="secondary"/>
-        <language type="sq" scripts="Latn" territories="AL MK"/>
-        <language type="sq" territories="RS" alt="secondary"/>
-        <language type="sr" scripts="Cyrl Latn" territories="BA ME RS"/>
-        <language type="srn" scripts="Latn"/>
-        <language type="srn" territories="SR" alt="secondary"/>
-        <language type="srr" scripts="Latn"/>
-        <language type="srr" territories="SN" alt="secondary"/>
-        <language type="ss" scripts="Latn" territories="SZ ZA"/>
-        <language type="st" scripts="Latn" territories="LS ZA"/>
-        <language type="su" scripts="Latn" territories="ID"/>
-        <language type="su" scripts="Sund" alt="secondary"/>
-        <language type="suk" scripts="Latn"/>
-        <language type="suk" territories="TZ" alt="secondary"/>
-        <language type="sus" scripts="Latn"/>
-        <language type="sus" scripts="Arab" territories="GN" alt="secondary"/>
-        <language type="sv" scripts="Latn" territories="AX FI SE"/>
-        <language type="sw" scripts="Latn" territories="KE TZ UG"/>
-        <language type="sw" territories="CD SO" alt="secondary"/>
-        <language type="swb" scripts="Arab" territories="KM"/>
-        <language type="swb" scripts="Latn" territories="YT" alt="secondary"/>
-        <language type="swv" territories="IN" alt="secondary"/>
-        <language type="syl" scripts="Beng"/>
-        <language type="syl" scripts="Sylo" territories="BD" alt="secondary"/>
-        <language type="syr" scripts="Syrc" alt="secondary"/>
-        <language type="ta" scripts="Taml" territories="IN LK SG"/>
-        <language type="ta" territories="MY" alt="secondary"/>
-        <language type="tab" scripts="Cyrl"/>
-        <language type="tbw" scripts="Latn"/>
-        <language type="tbw" scripts="Tagb" alt="secondary"/>
-        <language type="tcy" scripts="Knda"/>
-        <language type="tcy" territories="IN" alt="secondary"/>
-        <language type="tdd" scripts="Tale"/>
-        <language type="te" scripts="Telu" territories="IN"/>
-        <language type="tem" scripts="Latn"/>
-        <language type="tem" territories="SL" alt="secondary"/>
-        <language type="teo" territories="UG" alt="secondary"/>
-        <language type="ter" scripts="Latn"/>
-        <language type="tet" scripts="Latn" territories="TL"/>
-        <language type="tg" scripts="Arab Cyrl Latn" territories="TJ"/>
-        <language type="th" scripts="Thai" territories="TH"/>
-        <language type="ti" scripts="Ethi" territories="ER"/>
-        <language type="ti" territories="ET" alt="secondary"/>
-        <language type="tig" scripts="Ethi"/>
-        <language type="tig" territories="ER" alt="secondary"/>
-        <language type="tiv" scripts="Latn"/>
-        <language type="tiv" territories="NG" alt="secondary"/>
-        <language type="tk" scripts="Arab Cyrl Latn" territories="TM"/>
-        <language type="tk" territories="IR" alt="secondary"/>
-        <language type="tkl" scripts="Latn" territories="TK"/>
-        <language type="tl" scripts="Latn"/>
-        <language type="tl" territories="PH US" alt="secondary"/>
-        <language type="tli" scripts="Latn"/>
-        <language type="tmh" scripts="Latn"/>
-        <language type="tn" scripts="Latn" territories="BW ZA"/>
-        <language type="to" scripts="Latn" territories="TO"/>
-        <language type="tog" scripts="Latn"/>
-        <language type="tpi" scripts="Latn" territories="PG"/>
-        <language type="tr" scripts="Latn" territories="CY TR"/>
-        <language type="tr" scripts="Arab" territories="DE MK" alt="secondary"/>
-        <language type="tru" scripts="Latn"/>
-        <language type="tru" scripts="Syrc" alt="secondary"/>
-        <language type="ts" scripts="Latn" territories="ZA"/>
-        <language type="ts" territories="MZ" alt="secondary"/>
-        <language type="tsg" scripts="Latn"/>
-        <language type="tsg" territories="PH" alt="secondary"/>
-        <language type="tsi" scripts="Latn"/>
-        <language type="tt" scripts="Cyrl"/>
-        <language type="tt" territories="RU" alt="secondary"/>
-        <language type="tts" scripts="Thai"/>
-        <language type="tts" territories="TH" alt="secondary"/>
-        <language type="ttt" scripts="Cyrl"/>
-        <language type="tum" scripts="Latn"/>
-        <language type="tum" territories="MW" alt="secondary"/>
-        <language type="tut" scripts="Cyrl" alt="secondary"/>
-        <language type="tvl" scripts="Latn" territories="TV"/>
-        <language type="tw" scripts="Latn"/>
-        <language type="tw" territories="GH" alt="secondary"/>
-        <language type="ty" scripts="Latn" territories="PF"/>
-        <language type="tyv" scripts="Cyrl"/>
-        <language type="tyv" territories="RU" alt="secondary"/>
-        <language type="tzm" scripts="Latn Tfng"/>
-        <language type="tzm" territories="MA" alt="secondary"/>
-        <language type="ude" scripts="Cyrl"/>
-        <language type="udm" scripts="Cyrl"/>
-        <language type="udm" scripts="Latn" territories="RU" alt="secondary"/>
-        <language type="ug" scripts="Arab"/>
-        <language type="ug" scripts="Cyrl Latn" territories="CN" alt="secondary"/>
-        <language type="uga" scripts="Ugar" alt="secondary"/>
-        <language type="uk" scripts="Cyrl" territories="UA"/>
-        <language type="uli" scripts="Latn" territories="FM"/>
-        <language type="umb" scripts="Latn"/>
-        <language type="umb" territories="AO" alt="secondary"/>
-        <language type="und" territories="AQ BV GS HM IO TF" alt="secondary"/>
-        <language type="unr" scripts="Beng Deva"/>
-        <language type="unr" territories="IN" alt="secondary"/>
-        <language type="unx" scripts="Beng Deva"/>
-        <language type="ur" scripts="Arab" territories="IN PK"/>
-        <language type="uz" scripts="Arab Cyrl Latn" territories="UZ"/>
-        <language type="uz" territories="AF" alt="secondary"/>
-        <language type="vai" scripts="Vaii"/>
-        <language type="ve" scripts="Latn" territories="ZA"/>
-        <language type="vi" scripts="Latn" territories="VN"/>
-        <language type="vi" scripts="Hani" territories="US" alt="secondary"/>
-        <language type="vmw" territories="MZ" alt="secondary"/>
-        <language type="vo" scripts="Latn" alt="secondary"/>
-        <language type="vot" scripts="Latn" alt="secondary"/>
-        <language type="wa" scripts="Latn"/>
-        <language type="wal" scripts="Ethi"/>
-        <language type="wal" territories="ET" alt="secondary"/>
-        <language type="war" scripts="Latn"/>
-        <language type="war" territories="PH" alt="secondary"/>
-        <language type="was" scripts="Latn"/>
-        <language type="wbq" territories="IN" alt="secondary"/>
-        <language type="wbr" territories="IN" alt="secondary"/>
-        <language type="wls" territories="WF" alt="secondary"/>
-        <language type="wo" scripts="Latn" territories="SN"/>
-        <language type="wo" scripts="Arab" alt="secondary"/>
-        <language type="wtm" territories="IN" alt="secondary"/>
-        <language type="xal" scripts="Cyrl"/>
-        <language type="xh" scripts="Latn" territories="ZA"/>
-        <language type="xnr" territories="IN" alt="secondary"/>
-        <language type="xog" territories="UG" alt="secondary"/>
-        <language type="xsr" scripts="Deva"/>
-        <language type="xum" scripts="Ital Latn" alt="secondary"/>
-        <language type="yao" scripts="Latn"/>
-        <language type="yap" scripts="Latn" territories="FM"/>
-        <language type="yi" scripts="Hebr"/>
-        <language type="yo" scripts="Latn" territories="NG"/>
-        <language type="yrk" scripts="Cyrl"/>
-        <language type="za" scripts="Latn"/>
-        <language type="za" scripts="Hans" territories="CN" alt="secondary"/>
-        <language type="zap" scripts="Latn"/>
-        <language type="zbl" scripts="Blis"/>
-        <language type="zen" scripts="Tfng" alt="secondary"/>
-        <language type="zh" scripts="Hans Hant" territories="CN HK MO SG TW"/>
-        <language type="zh" scripts="Bopo Phag" territories="ID MY TH US" alt="secondary"/>
-        <language type="zu" scripts="Latn" territories="ZA"/>
-        <language type="zun" scripts="Latn"/>
-        <language type="zza" scripts="Arab"/>
-    </languageData>
-    <territoryInfo>
-        <territory type="AD" gdp="3660000000" literacyPercent="100" population="83888">
-            <languagePopulation type="ca" populationPercent="51" officialStatus="official"/>
-            <languagePopulation type="es" populationPercent="40"/>
-            <languagePopulation type="fr" populationPercent="3.1"/>
-        </territory>
-        <territory type="AE" gdp="184600000000" literacyPercent="77.9" population="4798490">
-            <languagePopulation type="ar" populationPercent="78" officialStatus="official"/>
-            <languagePopulation type="ml" populationPercent="7"/>
-            <languagePopulation type="ps" populationPercent="2.9"/>
-            <languagePopulation type="bal" populationPercent="2.3"/>
-            <languagePopulation type="fa" populationPercent="1.9"/>
-        </territory>
-        <territory type="AF" gdp="23030000000" literacyPercent="28.1" population="33609900">
-            <languagePopulation type="fa" populationPercent="50" officialStatus="official"/>
-            <languagePopulation type="ps" populationPercent="43" officialStatus="official"/>
-            <languagePopulation type="haz" populationPercent="5.9"/>
-            <languagePopulation type="uz_Arab" populationPercent="4.7"/>
-            <languagePopulation type="tk" populationPercent="1.7"/>
-            <languagePopulation type="prd" populationPercent="1.2"/>
-            <languagePopulation type="bal" populationPercent="0.67"/>
-            <languagePopulation type="ug" populationPercent="0.0089"/>
-            <languagePopulation type="kk_Arab" populationPercent="0.006"/>
-        </territory>
-        <territory type="AG" gdp="1610000000" literacyPercent="85.8" population="85632">
-            <languagePopulation type="en" populationPercent="86" officialStatus="official"/>
-            <languagePopulation type="pt" populationPercent="1.9"/>
-        </territory>
-        <territory type="AI" gdp="108900000" literacyPercent="95" population="14436">
-            <languagePopulation type="en" populationPercent="95" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="AL" gdp="21820000000" literacyPercent="98.7" population="3639450">
-            <languagePopulation type="sq" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="el" populationPercent="1.9"/>
-            <languagePopulation type="mk" populationPercent="0.47"/>
-        </territory>
-        <territory type="AM" gdp="18920000000" literacyPercent="99.4" population="2967000">
-            <languagePopulation type="hy" populationPercent="98" officialStatus="official"/>
-            <languagePopulation type="az_Latn" populationPercent="5.3"/>
-            <languagePopulation type="ku_Latn" populationPercent="3.3"/>
-        </territory>
-        <territory type="AN" gdp="2800000000" literacyPercent="96.7" population="227049">
-            <languagePopulation type="pap" populationPercent="81" officialStatus="de_facto_official"/>
-            <languagePopulation type="nl" populationPercent="1.8" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.79"/>
-        </territory>
-        <territory type="AO" gdp="110300000000" literacyPercent="67.4" population="12799300">
-            <languagePopulation type="pt" populationPercent="67" officialStatus="official"/>
-            <languagePopulation type="umb" populationPercent="29"/>
-            <languagePopulation type="kmb" populationPercent="25"/>
-        </territory>
-        <territory type="AQ" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" populationPercent="100"/>
-        </territory>
-        <territory type="AR" gdp="575600000000" literacyPercent="97.2" population="40913600">
-            <languagePopulation type="es" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="cy" populationPercent="0.065"/>
-            <languagePopulation type="gn" populationPercent="0.047"/>
-        </territory>
-        <territory type="AS" gdp="575300000" literacyPercent="97" population="65628">
-            <languagePopulation type="sm" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="97" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="AT" gdp="325000000000" literacyPercent="98" population="8210280">
-            <languagePopulation type="de" populationPercent="97" officialStatus="official"/>
-            <languagePopulation type="hr" populationPercent="1.2" officialStatus="official_regional"/>
-            <languagePopulation type="sl" populationPercent="0.37" officialStatus="official_regional"/>
-            <languagePopulation type="hu" populationPercent="0.27" officialStatus="official_regional"/>
-        </territory>
-        <territory type="AU" gdp="800500000000" literacyPercent="99" population="21262600">
-            <languagePopulation type="en" populationPercent="96" officialStatus="de_facto_official"/>
-            <languagePopulation type="zh_Hant" populationPercent="2.1"/>
-            <languagePopulation type="it" populationPercent="1.9"/>
-        </territory>
-        <territory type="AW" gdp="2258000000" literacyPercent="97.3" population="103065">
-            <languagePopulation type="nl" populationPercent="97" officialStatus="official"/>
-            <languagePopulation type="pap" populationPercent="61"/>
-            <languagePopulation type="en" populationPercent="2.9"/>
-        </territory>
-        <territory type="AX" gdp="929800000" literacyPercent="100" population="26200">
-            <languagePopulation type="sv" populationPercent="99" officialStatus="official"/>
-        </territory>
-        <territory type="AZ" gdp="73650000000" literacyPercent="98.8" population="8238670">
-            <languagePopulation type="az_Latn" populationPercent="89" officialStatus="official"/>
-            <languagePopulation type="az_Cyrl" populationPercent="9.9" officialStatus="official"/>
-            <languagePopulation type="ku_Latn" populationPercent="0.24"/>
-        </territory>
-        <territory type="BA" gdp="29900000000" literacyPercent="96.7" population="4613410">
-            <languagePopulation type="bs" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="hr" populationPercent="12" officialStatus="official"/>
-            <languagePopulation type="sr_Cyrl" populationPercent="10" officialStatus="official"/>
-            <languagePopulation type="sr_Latn" writingPercent="5" populationPercent="10" officialStatus="official"/>
-        </territory>
-        <territory type="BB" gdp="5466000000" literacyPercent="99.7" population="284589">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="BD" gdp="224000000000" literacyPercent="47.9" population="156051000">
-            <languagePopulation type="bn" populationPercent="98" officialStatus="official"/>
-            <languagePopulation type="syl" populationPercent="5"/>
-            <languagePopulation type="ccp" populationPercent="0.22"/>
-            <languagePopulation type="my" populationPercent="0.21"/>
-            <languagePopulation type="grt" populationPercent="0.073"/>
-            <languagePopulation type="mni" populationPercent="0.011"/>
-        </territory>
-        <territory type="BE" gdp="390500000000" literacyPercent="99" population="10414300">
-            <languagePopulation type="nl" populationPercent="55" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="49"/>
-            <languagePopulation type="fr" populationPercent="38" officialStatus="official"/>
-            <languagePopulation type="wa" writingPercent="5" populationPercent="5.8"/>
-            <languagePopulation type="de" populationPercent="1.4" officialStatus="official"/>
-        </territory>
-        <territory type="BF" gdp="17820000000" literacyPercent="21.8" population="15746200">
-            <languagePopulation type="mos" populationPercent="40"/>
-            <languagePopulation type="dyu" populationPercent="32"/>
-            <languagePopulation type="fr" populationPercent="22" officialStatus="official"/>
-        </territory>
-        <territory type="BG" gdp="93780000000" literacyPercent="98.2" population="7204690">
-            <languagePopulation type="bg" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="tr" populationPercent="11"/>
-        </territory>
-        <territory type="BH" gdp="26700000000" literacyPercent="86.5" population="727785">
-            <languagePopulation type="ar" populationPercent="87" officialStatus="official"/>
-            <languagePopulation type="ml" populationPercent="3.3"/>
-        </territory>
-        <territory type="BI" gdp="3103000000" literacyPercent="59.3" population="8988090">
-            <languagePopulation type="rn" populationPercent="63" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="59" officialStatus="official"/>
-            <languagePopulation type="sw" populationPercent="0.071"/>
-        </territory>
-        <territory type="BJ" gdp="12840000000" literacyPercent="34.7" population="8791830">
-            <languagePopulation type="fr" populationPercent="35" officialStatus="official"/>
-            <languagePopulation type="fon" populationPercent="25"/>
-            <languagePopulation type="yo" populationPercent="6.7"/>
-        </territory>
-        <territory type="BL" gdp="255000000" literacyPercent="99" population="7448">
-            <languagePopulation type="fr" populationPercent="92" officialStatus="official"/>
-        </territory>
-        <territory type="BM" gdp="4500000000" literacyPercent="98" population="67837">
-            <languagePopulation type="en" populationPercent="92" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="BN" gdp="20250000000" literacyPercent="92.7" population="388190">
-            <languagePopulation type="ms" populationPercent="93" officialStatus="official"/>
-            <languagePopulation type="zh_Hant" populationPercent="11"/>
-            <languagePopulation type="en" populationPercent="2.1"/>
-        </territory>
-        <territory type="BO" gdp="43080000000" literacyPercent="86.7" population="9775250">
-            <languagePopulation type="es" populationPercent="39" officialStatus="official"/>
-            <languagePopulation type="qu" populationPercent="32" officialStatus="official"/>
-            <languagePopulation type="ay" populationPercent="20" officialStatus="official"/>
-            <languagePopulation type="gn" populationPercent="0.45"/>
-        </territory>
-        <territory type="BR" gdp="1990000000000" literacyPercent="88.6" population="198739000">
-            <languagePopulation type="pt" populationPercent="91" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="0.84"/>
-            <languagePopulation type="it" populationPercent="0.28"/>
-            <languagePopulation type="ja" populationPercent="0.21"/>
-            <languagePopulation type="ko" populationPercent="0.021"/>
-            <languagePopulation type="amd" populationPercent="0.014"/>
-            <languagePopulation type="kgp" populationPercent="0.01"/>
-            <languagePopulation type="gub" populationPercent="0.0084"/>
-            <languagePopulation type="xav" populationPercent="0.005"/>
-        </territory>
-        <territory type="BS" gdp="8779000000" literacyPercent="95.6" population="309156">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="BT" gdp="3789000000" literacyPercent="47" population="691141">
-            <languagePopulation type="dz" populationPercent="47" officialStatus="official"/>
-            <languagePopulation type="ne" populationPercent="17"/>
-            <languagePopulation type="tsj" populationPercent="15"/>
-            <languagePopulation type="lep" populationPercent="3.9"/>
-        </territory>
-        <territory type="BV" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" populationPercent="100"/>
-        </territory>
-        <territory type="BW" gdp="26040000000" literacyPercent="81.2" population="1990880">
-            <languagePopulation type="en" populationPercent="81" officialStatus="official"/>
-            <languagePopulation type="tn" populationPercent="62" officialStatus="official"/>
-            <languagePopulation type="af" populationPercent="0.3"/>
-        </territory>
-        <territory type="BY" gdp="114100000000" literacyPercent="99.6" population="9648530">
-            <languagePopulation type="be" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="12" officialStatus="official"/>
-        </territory>
-        <territory type="BZ" gdp="2577000000" literacyPercent="76.9" population="307899">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="es" populationPercent="28"/>
-        </territory>
-        <territory type="CA" gdp="1307000000000" literacyPercent="99" population="33487200">
-            <languagePopulation type="en" populationPercent="79" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="22" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="1.8"/>
-            <languagePopulation type="cwd" populationPercent="0.11" officialStatus="official_regional"/>
-            <languagePopulation type="crk" populationPercent="0.11" officialStatus="official_regional"/>
-            <languagePopulation type="iu" writingPercent="30" populationPercent="0.056" officialStatus="official_regional"/>
-            <languagePopulation type="dgr" populationPercent="0.0063"/>
-        </territory>
-        <territory type="CC" gdp="0" literacyPercent="0" population="596">
-            <languagePopulation type="ms" populationPercent="83"/>
-            <languagePopulation type="en" populationPercent="22" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="CD" gdp="21050000000" literacyPercent="67.2" population="68692500">
-            <languagePopulation type="sw" populationPercent="50"/>
-            <languagePopulation type="lua" populationPercent="9.6"/>
-            <languagePopulation type="fr" populationPercent="3.8" officialStatus="official"/>
-            <languagePopulation type="ln" populationPercent="3.1" officialStatus="official"/>
-            <languagePopulation type="lu" populationPercent="2.3"/>
-            <languagePopulation type="kg" populationPercent="1.5"/>
-            <languagePopulation type="lol" populationPercent="0.61"/>
-            <languagePopulation type="rw" populationPercent="0.38"/>
-        </territory>
-        <territory type="CF" gdp="3239000000" literacyPercent="48.6" population="4511490">
-            <languagePopulation type="fr" populationPercent="49" officialStatus="official"/>
-            <languagePopulation type="sg" populationPercent="49" officialStatus="official"/>
-        </territory>
-        <territory type="CG" gdp="15600000000" literacyPercent="83.8" population="4012810">
-            <languagePopulation type="fr" populationPercent="84" officialStatus="official"/>
-            <languagePopulation type="ln" populationPercent="2.4" officialStatus="official"/>
-        </territory>
-        <territory type="CH" gdp="309900000000" literacyPercent="99" population="7604470">
-            <languagePopulation type="de" populationPercent="57" officialStatus="official"/>
-            <languagePopulation type="gsw" writingPercent="5" populationPercent="57"/>
-            <languagePopulation type="fr" populationPercent="17" officialStatus="official"/>
-            <languagePopulation type="lmo" populationPercent="4.1"/>
-            <languagePopulation type="it" populationPercent="2.6" officialStatus="official"/>
-            <languagePopulation type="rm" populationPercent="0.54" officialStatus="official"/>
-            <languagePopulation type="rmo" populationPercent="0.28"/>
-            <languagePopulation type="wae" populationPercent="0.13"/>
-        </territory>
-        <territory type="CI" gdp="34000000000" literacyPercent="48.7" population="20617100">
-            <languagePopulation type="fr" populationPercent="49" officialStatus="official"/>
-            <languagePopulation type="bci" writingPercent="10" populationPercent="11"/>
-            <languagePopulation type="sef" writingPercent="5" populationPercent="4.3"/>
-            <languagePopulation type="daf" writingPercent="1" populationPercent="4"/>
-            <languagePopulation type="kfo" populationPercent="0.23"/>
-        </territory>
-        <territory type="CK" gdp="183200000" literacyPercent="95" population="11870">
-            <languagePopulation type="en" populationPercent="5.8" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="CL" gdp="245300000000" literacyPercent="95.7" population="16601700">
-            <languagePopulation type="es" populationPercent="86" officialStatus="official"/>
-        </territory>
-        <territory type="CM" gdp="42760000000" literacyPercent="67.9" population="18879300">
-            <languagePopulation type="fr" populationPercent="68" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="14" officialStatus="official"/>
-            <languagePopulation type="ar" populationPercent="0.39"/>
-            <languagePopulation type="ha_Arab" populationPercent="0.14"/>
-        </territory>
-        <territory type="CN" gdp="7800000000000" literacyPercent="90.9" population="1338610000">
-            <languagePopulation type="zh_Hans" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="ii" populationPercent="0.6"/>
-            <languagePopulation type="ug" populationPercent="0.55" officialStatus="official_regional"/>
-            <languagePopulation type="za" populationPercent="0.31" officialStatus="official_regional"/>
-            <languagePopulation type="mn_Mong" populationPercent="0.26" officialStatus="official_regional"/>
-            <languagePopulation type="bo" populationPercent="0.2" officialStatus="official_regional"/>
-            <languagePopulation type="ko" populationPercent="0.15" officialStatus="official_regional"/>
-            <languagePopulation type="kk_Arab" populationPercent="0.086"/>
-            <languagePopulation type="lis" populationPercent="0.045"/>
-            <languagePopulation type="ky_Arab" populationPercent="0.034"/>
-            <languagePopulation type="nbf" populationPercent="0.024"/>
-            <languagePopulation type="khb" populationPercent="0.019"/>
-            <languagePopulation type="tdd" populationPercent="0.019"/>
-            <languagePopulation type="lcp" populationPercent="0.0058"/>
-            <languagePopulation type="en" populationPercent="0.0045"/>
-            <languagePopulation type="ru" populationPercent="0.001"/>
-            <languagePopulation type="vi" populationPercent="0.0005"/>
-            <languagePopulation type="uz_Cyrl" populationPercent="0.0004"/>
-        </territory>
-        <territory type="CO" gdp="399400000000" literacyPercent="92.8" population="45644000">
-            <languagePopulation type="es" populationPercent="93" officialStatus="official"/>
-        </territory>
-        <territory type="CR" gdp="48480000000" literacyPercent="94.9" population="4253880">
-            <languagePopulation type="es" populationPercent="81" officialStatus="official"/>
-        </territory>
-        <territory type="CU" gdp="108200000000" literacyPercent="99.8" population="11451700">
-            <languagePopulation type="es" populationPercent="88" officialStatus="official"/>
-        </territory>
-        <territory type="CV" gdp="1635000000" literacyPercent="76.6" population="429474">
-            <languagePopulation type="kea" populationPercent="92"/>
-            <languagePopulation type="pt" populationPercent="76" officialStatus="official"/>
-        </territory>
-        <territory type="CX" gdp="0" literacyPercent="0" population="1402">
-            <languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="CY" gdp="22690000000" literacyPercent="97.6" population="828140">
-            <languagePopulation type="el" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="tr" populationPercent="23" officialStatus="official"/>
-            <languagePopulation type="hy" populationPercent="0.33"/>
-            <languagePopulation type="ar" populationPercent="0.16"/>
-        </territory>
-        <territory type="CZ" gdp="266300000000" literacyPercent="99" population="10211900">
-            <languagePopulation type="cs" populationPercent="98" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="0.49"/>
-            <languagePopulation type="pl" populationPercent="0.49"/>
-        </territory>
-        <territory type="DE" gdp="2863000000000" literacyPercent="99" population="82329800">
-            <languagePopulation type="de" populationPercent="91" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="44"/>
-            <languagePopulation type="tr" populationPercent="2.5"/>
-            <languagePopulation type="hr" populationPercent="0.79"/>
-            <languagePopulation type="it" populationPercent="0.66"/>
-            <languagePopulation type="ku_Latn" populationPercent="0.66"/>
-            <languagePopulation type="ru" populationPercent="0.44"/>
-            <languagePopulation type="el" populationPercent="0.38"/>
-            <languagePopulation type="pl" populationPercent="0.29"/>
-            <languagePopulation type="es" populationPercent="0.16"/>
-            <languagePopulation type="nl" populationPercent="0.12"/>
-        </territory>
-        <territory type="DJ" gdp="1889000000" literacyPercent="67.9" population="516055">
-            <languagePopulation type="aa" populationPercent="42"/>
-            <languagePopulation type="so" populationPercent="41"/>
-            <languagePopulation type="ar" populationPercent="7.3" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="2.2" officialStatus="official"/>
-        </territory>
-        <territory type="DK" gdp="204900000000" literacyPercent="99" population="5500510">
-            <languagePopulation type="da" populationPercent="93" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="0.43"/>
-            <languagePopulation type="kl" populationPercent="0.13" officialStatus="official_regional"/>
-        </territory>
-        <territory type="DM" gdp="719800000" literacyPercent="94" population="72660">
-            <languagePopulation type="en" populationPercent="94" officialStatus="official"/>
-        </territory>
-        <territory type="DO" gdp="77430000000" literacyPercent="87" population="9650050">
-            <languagePopulation type="es" populationPercent="78" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.083"/>
-        </territory>
-        <territory type="DZ" gdp="235500000000" literacyPercent="69.9" population="34178200">
-            <languagePopulation type="ar" populationPercent="74" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="20" officialStatus="official"/>
-            <languagePopulation type="kab" populationPercent="7.8"/>
-        </territory>
-        <territory type="EC" gdp="107100000000" literacyPercent="91" population="14573100">
-            <languagePopulation type="es" populationPercent="72" officialStatus="official"/>
-        </territory>
-        <territory type="EE" gdp="27720000000" literacyPercent="99.8" population="1299370">
-            <languagePopulation type="et" populationPercent="71" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="30"/>
-        </territory>
-        <territory type="EG" gdp="442600000000" literacyPercent="71.4" population="83082900">
-            <languagePopulation type="ar" populationPercent="94" officialStatus="official"/>
-            <languagePopulation type="el" populationPercent="0.061"/>
-        </territory>
-        <territory type="EH" gdp="900000000" literacyPercent="50" population="405210">
-            <languagePopulation type="ar" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="ER" gdp="3946000000" literacyPercent="58.6" population="5647170">
-            <languagePopulation type="ti" populationPercent="27" officialStatus="de_facto_official"/>
-            <languagePopulation type="tig" populationPercent="18"/>
-            <languagePopulation type="ar" writingPercent="5" populationPercent="4.9" officialStatus="de_facto_official"/>
-            <languagePopulation type="aa" populationPercent="3.6"/>
-            <languagePopulation type="byn" populationPercent="1.6"/>
-        </territory>
-        <territory type="ES" gdp="1378000000000" literacyPercent="97.9" population="40525000">
-            <languagePopulation type="es" populationPercent="68" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="24"/>
-            <languagePopulation type="ca" populationPercent="16" officialStatus="official_regional"/>
-            <languagePopulation type="gl" populationPercent="7.7" officialStatus="official_regional"/>
-            <languagePopulation type="eu" populationPercent="1.4" officialStatus="official_regional"/>
-            <languagePopulation type="ast" populationPercent="1.3" officialStatus="official_regional"/>
-        </territory>
-        <territory type="ET" gdp="66290000000" literacyPercent="42.7" population="85237300">
-            <languagePopulation type="en" populationPercent="43"/>
-            <languagePopulation type="am" populationPercent="33" officialStatus="official"/>
-            <languagePopulation type="om" populationPercent="32"/>
-            <languagePopulation type="so" populationPercent="6"/>
-            <languagePopulation type="ti" populationPercent="6"/>
-            <languagePopulation type="sid" populationPercent="3.5"/>
-            <languagePopulation type="wal" populationPercent="1.8"/>
-            <languagePopulation type="aa" populationPercent="1.4"/>
-        </territory>
-        <territory type="FI" gdp="195200000000" literacyPercent="100" population="5250280">
-            <languagePopulation type="fi" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="sv" populationPercent="5.7" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="0.81"/>
-            <languagePopulation type="en" populationPercent="0.18"/>
-            <languagePopulation type="et" populationPercent="0.11"/>
-            <languagePopulation type="rmf" populationPercent="0.095"/>
-            <languagePopulation type="se" populationPercent="0.038"/>
-            <languagePopulation type="smn" populationPercent="0.011"/>
-            <languagePopulation type="sms" populationPercent="0.011"/>
-        </territory>
-        <territory type="FJ" gdp="3616000000" literacyPercent="93.7" population="944720">
-            <languagePopulation type="hi" populationPercent="44"/>
-            <languagePopulation type="fj" populationPercent="39" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.52" officialStatus="official"/>
-        </territory>
-        <territory type="FK" gdp="105100000" literacyPercent="99" population="3140">
-            <languagePopulation type="en" populationPercent="99" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="FM" gdp="238100000" literacyPercent="89" population="107434">
-            <languagePopulation type="chk" populationPercent="30" officialStatus="official"/>
-            <languagePopulation type="pon" populationPercent="23" officialStatus="official"/>
-            <languagePopulation type="kos" populationPercent="7.4" officialStatus="official"/>
-            <languagePopulation type="yap" populationPercent="6.1" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="5" officialStatus="official"/>
-            <languagePopulation type="uli" populationPercent="2.8" officialStatus="official"/>
-        </territory>
-        <territory type="FO" gdp="1000000000" literacyPercent="99" population="48856">
-            <languagePopulation type="fo" populationPercent="95" officialStatus="official"/>
-        </territory>
-        <territory type="FR" gdp="2097000000000" literacyPercent="99" population="64057800">
-            <languagePopulation type="fr" populationPercent="85" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="27"/>
-            <languagePopulation type="oc" writingPercent="5" populationPercent="3"/>
-            <languagePopulation type="it" populationPercent="1.7"/>
-            <languagePopulation type="pt" populationPercent="1.3"/>
-            <languagePopulation type="gsw" writingPercent="5" populationPercent="0.91"/>
-            <languagePopulation type="br" populationPercent="0.83"/>
-            <languagePopulation type="co" writingPercent="5" populationPercent="0.57"/>
-            <languagePopulation type="ca" populationPercent="0.17"/>
-            <languagePopulation type="nl" populationPercent="0.13"/>
-            <languagePopulation type="eu" populationPercent="0.13"/>
-        </territory>
-        <territory type="GA" gdp="21440000000" literacyPercent="63.2" population="1514990">
-            <languagePopulation type="fr" populationPercent="63" officialStatus="official"/>
-            <languagePopulation type="puu" populationPercent="9"/>
-            <languagePopulation type="mdt" populationPercent="8"/>
-        </territory>
-        <territory type="GB" gdp="2231000000000" literacyPercent="99" population="61113200">
-            <languagePopulation type="en" populationPercent="93" officialStatus="de_facto_official"/>
-            <languagePopulation type="sco" writingPercent="5" populationPercent="2.7"/>
-            <languagePopulation type="cy" populationPercent="0.98" officialStatus="official_regional"/>
-            <languagePopulation type="pa_Guru" populationPercent="0.79"/>
-            <languagePopulation type="bn" populationPercent="0.67"/>
-            <languagePopulation type="zh_Hant" populationPercent="0.54"/>
-            <languagePopulation type="syl" populationPercent="0.51"/>
-            <languagePopulation type="el" populationPercent="0.34"/>
-            <languagePopulation type="it" populationPercent="0.34"/>
-            <languagePopulation type="ks" populationPercent="0.19"/>
-            <languagePopulation type="gd" writingPercent="5" populationPercent="0.099" officialStatus="official_regional"/>
-            <languagePopulation type="ml" populationPercent="0.035"/>
-            <languagePopulation type="ga" populationPercent="0.026" officialStatus="official_regional"/>
-            <languagePopulation type="fr" populationPercent="0.024" officialStatus="official_regional"/>
-            <languagePopulation type="gv" populationPercent="0.0028"/>
-        </territory>
-        <territory type="GD" gdp="1211000000" literacyPercent="96" population="90739">
-            <languagePopulation type="en" populationPercent="96" officialStatus="official"/>
-        </territory>
-        <territory type="GE" gdp="21600000000" literacyPercent="100" population="4615810">
-            <languagePopulation type="ka" populationPercent="86" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="9"/>
-            <languagePopulation type="hy" populationPercent="7"/>
-            <languagePopulation type="ab" populationPercent="2.2" officialStatus="official_regional"/>
-            <languagePopulation type="os" populationPercent="2.2" officialStatus="official_regional"/>
-            <languagePopulation type="ku_Latn" populationPercent="0.89"/>
-        </territory>
-        <territory type="GF" gdp="1551000000" literacyPercent="83" population="199509">
-            <languagePopulation type="fr" populationPercent="77" officialStatus="official"/>
-            <languagePopulation type="gcr" populationPercent="26"/>
-            <languagePopulation type="zh_Hant" populationPercent="2.5"/>
-        </territory>
-        <territory type="GG" gdp="2742000000" literacyPercent="100" population="65870">
-            <languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="GH" gdp="34040000000" literacyPercent="57.9" population="23832500">
-            <languagePopulation type="ak" populationPercent="39"/>
-            <languagePopulation type="tw" populationPercent="33" officialStatus="official_regional"/>
-            <languagePopulation type="ee" populationPercent="11" officialStatus="official_regional"/>
-            <languagePopulation type="abr" populationPercent="5"/>
-            <languagePopulation type="en" populationPercent="4.7" officialStatus="official"/>
-            <languagePopulation type="gaa" populationPercent="2.8" officialStatus="official_regional"/>
-        </territory>
-        <territory type="GI" gdp="1066000000" literacyPercent="80" population="28034">
-            <languagePopulation type="en" populationPercent="80" officialStatus="official"/>
-        </territory>
-        <territory type="GL" gdp="1100000000" literacyPercent="100" population="57600">
-            <languagePopulation type="iu" populationPercent="84"/>
-            <languagePopulation type="kl" populationPercent="84" officialStatus="official"/>
-            <languagePopulation type="da" populationPercent="14" officialStatus="official"/>
-        </territory>
-        <territory type="GM" gdp="2264000000" literacyPercent="40.1" population="1782890">
-            <languagePopulation type="en" populationPercent="40" officialStatus="official"/>
-        </territory>
-        <territory type="GN" gdp="10440000000" literacyPercent="29.5" population="10058000">
-            <languagePopulation type="fr" populationPercent="29" officialStatus="official"/>
-            <languagePopulation type="emk" populationPercent="23"/>
-            <languagePopulation type="sus" populationPercent="11"/>
-            <languagePopulation type="kpe" populationPercent="3.8"/>
-        </territory>
-        <territory type="GP" gdp="3513000000" literacyPercent="90" population="452776">
-            <languagePopulation type="fr" populationPercent="90" officialStatus="official"/>
-        </territory>
-        <territory type="GQ" gdp="19370000000" literacyPercent="87" population="633441">
-            <languagePopulation type="fan" populationPercent="51"/>
-            <languagePopulation type="fr" populationPercent="8.8" officialStatus="official"/>
-            <languagePopulation type="bvb" populationPercent="7.9"/>
-            <languagePopulation type="es" populationPercent="2.3" officialStatus="official"/>
-            <languagePopulation type="syi" populationPercent="2.2"/>
-        </territory>
-        <territory type="GR" gdp="343600000000" literacyPercent="96" population="10737400">
-            <languagePopulation type="el" populationPercent="89" officialStatus="official"/>
-            <languagePopulation type="mk" populationPercent="1.6"/>
-            <languagePopulation type="tr" populationPercent="1.2"/>
-            <languagePopulation type="bg" populationPercent="0.27"/>
-            <languagePopulation type="sq" populationPercent="0.093"/>
-        </territory>
-        <territory type="GS" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" writingPercent="100" populationPercent="100"/>
-        </territory>
-        <territory type="GT" gdp="68020000000" literacyPercent="69.1" population="13276500">
-            <languagePopulation type="es" populationPercent="60" officialStatus="official"/>
-        </territory>
-        <territory type="GU" gdp="2500000000" literacyPercent="99" population="178430">
-            <languagePopulation type="en" populationPercent="38" officialStatus="de_facto_official"/>
-            <languagePopulation type="ch" populationPercent="22" officialStatus="official"/>
-        </territory>
-        <territory type="GW" gdp="857000000" literacyPercent="42.4" population="1533960">
-            <languagePopulation type="pt" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="GY" gdp="3010000000" literacyPercent="98.8" population="772298">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="HK" gdp="307600000000" literacyPercent="93.5" population="7055070">
-            <languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="51" officialStatus="official"/>
-        </territory>
-        <territory type="HM" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" writingPercent="100" populationPercent="100"/>
-        </territory>
-        <territory type="HN" gdp="33630000000" literacyPercent="80" population="7792850">
-            <languagePopulation type="es" populationPercent="78" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.44" officialStatus="official"/>
-        </territory>
-        <territory type="HR" gdp="73360000000" literacyPercent="98.1" population="4489410">
-            <languagePopulation type="hr" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="it" populationPercent="1.6" officialStatus="official_regional"/>
-        </territory>
-        <territory type="HT" gdp="11590000000" literacyPercent="52.9" population="9035540">
-            <languagePopulation type="ht" populationPercent="81" officialStatus="official"/>
-            <languagePopulation type="fr" writingPercent="100" populationPercent="4.7" officialStatus="official"/>
-        </territory>
-        <territory type="HU" gdp="205700000000" literacyPercent="99.4" population="9905600">
-            <languagePopulation type="hu" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="2.5"/>
-            <languagePopulation type="ro" populationPercent="0.99"/>
-            <languagePopulation type="hr" populationPercent="0.32"/>
-            <languagePopulation type="sk" populationPercent="0.11"/>
-            <languagePopulation type="sl" populationPercent="0.05"/>
-        </territory>
-        <territory type="ID" gdp="915900000000" literacyPercent="90.4" population="240272000">
-            <languagePopulation type="id" populationPercent="64" officialStatus="official"/>
-            <languagePopulation type="jv" populationPercent="34"/>
-            <languagePopulation type="su" populationPercent="12" officialStatus="official"/>
-            <languagePopulation type="mad" populationPercent="6.3"/>
-            <languagePopulation type="ms" populationPercent="4.6"/>
-            <languagePopulation type="min" populationPercent="3"/>
-            <languagePopulation type="bya" populationPercent="2.3"/>
-            <languagePopulation type="bjn" populationPercent="2.3"/>
-            <languagePopulation type="ban" populationPercent="1.8"/>
-            <languagePopulation type="bug" populationPercent="1.6"/>
-            <languagePopulation type="ace" populationPercent="1.4"/>
-            <languagePopulation type="bew" populationPercent="1.2"/>
-            <languagePopulation type="sas" populationPercent="0.96"/>
-            <languagePopulation type="bbc" populationPercent="0.92"/>
-            <languagePopulation type="zh_Hant" populationPercent="0.92"/>
-            <languagePopulation type="mak" populationPercent="0.73"/>
-            <languagePopulation type="ljp" populationPercent="0.69"/>
-            <languagePopulation type="rej" populationPercent="0.46"/>
-            <languagePopulation type="gor" populationPercent="0.41"/>
-            <languagePopulation type="nij" populationPercent="0.37"/>
-            <languagePopulation type="kge" populationPercent="0.32"/>
-            <languagePopulation type="aoz" populationPercent="0.27"/>
-            <languagePopulation type="mgy" populationPercent="0.23"/>
-            <languagePopulation type="kvr" populationPercent="0.14"/>
-            <languagePopulation type="lbw" populationPercent="0.13"/>
-            <languagePopulation type="rob" populationPercent="0.11"/>
-            <languagePopulation type="mdr" populationPercent="0.092"/>
-            <languagePopulation type="sxn" populationPercent="0.092"/>
-        </territory>
-        <territory type="IE" gdp="191900000000" literacyPercent="99" population="4203200">
-            <languagePopulation type="en" populationPercent="65" officialStatus="official"/>
-            <languagePopulation type="ga" populationPercent="1.5" officialStatus="official"/>
-        </territory>
-        <territory type="IL" gdp="200700000000" literacyPercent="97.1" population="7233700">
-            <languagePopulation type="he" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="ar" populationPercent="20" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="11"/>
-            <languagePopulation type="ro" populationPercent="3.7"/>
-            <languagePopulation type="en" populationPercent="1.5"/>
-            <languagePopulation type="pl" populationPercent="1.5"/>
-            <languagePopulation type="hu" populationPercent="1"/>
-            <languagePopulation type="am" populationPercent="0.59"/>
-            <languagePopulation type="ti" populationPercent="0.14"/>
-            <languagePopulation type="ml" populationPercent="0.11"/>
-        </territory>
-        <territory type="IM" gdp="2719000000" literacyPercent="99" population="76512">
-            <languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="IN" gdp="3267000000000" literacyPercent="61" population="1166080000">
-            <languagePopulation type="hi" populationPercent="16" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="11"/>
-            <languagePopulation type="bn" populationPercent="6.5" officialStatus="official"/>
-            <languagePopulation type="te" populationPercent="6.4" officialStatus="official"/>
-            <languagePopulation type="mr" populationPercent="6.3" officialStatus="official"/>
-            <languagePopulation type="ta" populationPercent="6.1" officialStatus="official"/>
-            <languagePopulation type="ur" populationPercent="4.5" officialStatus="official"/>
-            <languagePopulation type="gu" populationPercent="4.3" officialStatus="official"/>
-            <languagePopulation type="kn" populationPercent="3.3" officialStatus="official"/>
-            <languagePopulation type="ml" populationPercent="3.3" officialStatus="official"/>
-            <languagePopulation type="or" populationPercent="3" officialStatus="official"/>
-            <languagePopulation type="pa_Guru" populationPercent="2.5" officialStatus="official"/>
-            <languagePopulation type="bho" populationPercent="2.3"/>
-            <languagePopulation type="mai" populationPercent="2" officialStatus="official_regional"/>
-            <languagePopulation type="awa" populationPercent="1.9"/>
-            <languagePopulation type="as" populationPercent="1.4" officialStatus="official"/>
-            <languagePopulation type="bgc" populationPercent="1.2"/>
-            <languagePopulation type="mag" populationPercent="1.2"/>
-            <languagePopulation type="mwr" populationPercent="1.2"/>
-            <languagePopulation type="hne" populationPercent="1.1"/>
-            <languagePopulation type="dcc" populationPercent="0.99"/>
-            <languagePopulation type="dhd" populationPercent="0.83"/>
-            <languagePopulation type="bjj" populationPercent="0.56"/>
-            <languagePopulation type="ne" populationPercent="0.56" officialStatus="official_regional"/>
-            <languagePopulation type="sat" populationPercent="0.55" officialStatus="official_regional"/>
-            <languagePopulation type="wtm" populationPercent="0.46"/>
-            <languagePopulation type="ks" populationPercent="0.41" officialStatus="official"/>
-            <languagePopulation type="kok" populationPercent="0.37" officialStatus="official_regional"/>
-            <languagePopulation type="swv" populationPercent="0.28"/>
-            <languagePopulation type="gbm" populationPercent="0.27"/>
-            <languagePopulation type="lmn" populationPercent="0.27"/>
-            <languagePopulation type="rjb" populationPercent="0.26"/>
-            <languagePopulation type="sd_Arab" populationPercent="0.26" officialStatus="official"/>
-            <languagePopulation type="gon" populationPercent="0.24"/>
-            <languagePopulation type="kfy" populationPercent="0.22"/>
-            <languagePopulation type="doi" populationPercent="0.2"/>
-            <languagePopulation type="kru" populationPercent="0.19"/>
-            <languagePopulation type="sck" populationPercent="0.18"/>
-            <languagePopulation type="gno" populationPercent="0.18"/>
-            <languagePopulation type="tcy" populationPercent="0.18"/>
-            <languagePopulation type="wbq" populationPercent="0.18"/>
-            <languagePopulation type="xnr" populationPercent="0.16"/>
-            <languagePopulation type="wbr" populationPercent="0.15"/>
-            <languagePopulation type="khn" populationPercent="0.15"/>
-            <languagePopulation type="noe" populationPercent="0.13"/>
-            <languagePopulation type="bhb" populationPercent="0.12"/>
-            <languagePopulation type="mni" populationPercent="0.11"/>
-            <languagePopulation type="mup" populationPercent="0.1"/>
-            <languagePopulation type="hoc" populationPercent="0.099"/>
-            <languagePopulation type="mtr" populationPercent="0.098"/>
-            <languagePopulation type="unr" populationPercent="0.095"/>
-            <languagePopulation type="bhi" populationPercent="0.092"/>
-            <languagePopulation type="hoj" populationPercent="0.082"/>
-            <languagePopulation type="kha" writingPercent="29" populationPercent="0.08" officialStatus="official_regional"/>
-            <languagePopulation type="kfr" populationPercent="0.075"/>
-            <languagePopulation type="grt" populationPercent="0.053"/>
-            <languagePopulation type="unx" populationPercent="0.048"/>
-            <languagePopulation type="bfy" populationPercent="0.037"/>
-            <languagePopulation type="saz" populationPercent="0.029"/>
-            <languagePopulation type="ccp" populationPercent="0.028"/>
-            <languagePopulation type="sd_Deva" populationPercent="0.026" officialStatus="official"/>
-            <languagePopulation type="bfq" populationPercent="0.023"/>
-            <languagePopulation type="ria" populationPercent="0.013"/>
-            <languagePopulation type="bo" populationPercent="0.011"/>
-            <languagePopulation type="bft" populationPercent="0.0062"/>
-            <languagePopulation type="bra" populationPercent="0.0041"/>
-            <languagePopulation type="lep" populationPercent="0.0035"/>
-            <languagePopulation type="btv" populationPercent="0.0026"/>
-            <languagePopulation type="lif" populationPercent="0.0026"/>
-            <languagePopulation type="lah" populationPercent="0.0025"/>
-            <languagePopulation type="kht" populationPercent="0.0008"/>
-            <languagePopulation type="sa" populationPercent="0.0005" officialStatus="official"/>
-            <languagePopulation type="dv" populationPercent="0.0004"/>
-            <languagePopulation type="dz" populationPercent="0.0003"/>
-        </territory>
-        <territory type="IO" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" writingPercent="100" populationPercent="100"/>
-        </territory>
-        <territory type="IQ" gdp="112800000000" literacyPercent="74.1" population="28945700">
-            <languagePopulation type="ar" populationPercent="68" officialStatus="official"/>
-            <languagePopulation type="ku_Arab" populationPercent="20" officialStatus="official_regional"/>
-            <languagePopulation type="fa" populationPercent="0.87"/>
-        </territory>
-        <territory type="IR" gdp="842000000000" literacyPercent="77" population="66429300">
-            <languagePopulation type="fa" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="az_Arab" populationPercent="24"/>
-            <languagePopulation type="ku_Arab" populationPercent="7"/>
-            <languagePopulation type="glk" populationPercent="4.6"/>
-            <languagePopulation type="tk" populationPercent="2.8"/>
-            <languagePopulation type="lrc" populationPercent="2.1"/>
-            <languagePopulation type="ar" populationPercent="2"/>
-            <languagePopulation type="bal" populationPercent="2"/>
-            <languagePopulation type="rmt" populationPercent="1.9"/>
-            <languagePopulation type="bqi" populationPercent="1.4"/>
-            <languagePopulation type="luz" populationPercent="1.2"/>
-            <languagePopulation type="prd" populationPercent="0.5"/>
-            <languagePopulation type="hy" populationPercent="0.24"/>
-            <languagePopulation type="ps" populationPercent="0.16"/>
-            <languagePopulation type="ka" populationPercent="0.071"/>
-            <languagePopulation type="kk_Arab" populationPercent="0.0045"/>
-        </territory>
-        <territory type="IS" gdp="12150000000" literacyPercent="99" population="306694">
-            <languagePopulation type="is" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="da" populationPercent="0.73"/>
-        </territory>
-        <territory type="IT" gdp="1821000000000" literacyPercent="98.4" population="58126200">
-            <languagePopulation type="it" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="24"/>
-            <languagePopulation type="nap" populationPercent="12"/>
-            <languagePopulation type="scn" populationPercent="8.4"/>
-            <languagePopulation type="fur" populationPercent="1.4"/>
-            <languagePopulation type="de" populationPercent="0.39"/>
-            <languagePopulation type="fr" populationPercent="0.17"/>
-            <languagePopulation type="sl" populationPercent="0.17"/>
-            <languagePopulation type="ca" populationPercent="0.035"/>
-            <languagePopulation type="el" populationPercent="0.035"/>
-            <languagePopulation type="hr" populationPercent="0.006"/>
-        </territory>
-        <territory type="JE" gdp="5100000000" literacyPercent="99" population="91626">
-            <languagePopulation type="en" populationPercent="95" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="JM" gdp="20880000000" literacyPercent="87.9" population="2825930">
-            <languagePopulation type="en" populationPercent="98" officialStatus="official"/>
-        </territory>
-        <territory type="JO" gdp="30760000000" literacyPercent="89.9" population="6342950">
-            <languagePopulation type="ar" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="JP" gdp="4348000000000" literacyPercent="99" population="127079000">
-            <languagePopulation type="ja" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="ryu" populationPercent="0.77"/>
-            <languagePopulation type="ko" populationPercent="0.52"/>
-        </territory>
-        <territory type="KE" gdp="61830000000" literacyPercent="85.1" population="39002800">
-            <languagePopulation type="en" populationPercent="85" officialStatus="official"/>
-            <languagePopulation type="sw" populationPercent="66" officialStatus="official"/>
-            <languagePopulation type="ki" populationPercent="17"/>
-            <languagePopulation type="luy" populationPercent="11"/>
-            <languagePopulation type="luo" populationPercent="9.8"/>
-            <languagePopulation type="kam" populationPercent="7.6"/>
-            <languagePopulation type="kln" populationPercent="7.6"/>
-            <languagePopulation type="guz" populationPercent="4.9"/>
-            <languagePopulation type="mer" populationPercent="4"/>
-            <languagePopulation type="so" populationPercent="1.3"/>
-            <languagePopulation type="om" populationPercent="0.47"/>
-            <languagePopulation type="ar" populationPercent="0.046"/>
-            <languagePopulation type="pa_Guru" populationPercent="0.026"/>
-            <languagePopulation type="gu" populationPercent="0.013"/>
-        </territory>
-        <territory type="KG" gdp="11410000000" literacyPercent="98.7" population="5431750">
-            <languagePopulation type="ky_Cyrl" populationPercent="48" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="28" officialStatus="official"/>
-        </territory>
-        <territory type="KH" gdp="27950000000" literacyPercent="73.6" population="14494300">
-            <languagePopulation type="km" populationPercent="89" officialStatus="official"/>
-            <languagePopulation type="cja" populationPercent="1.6"/>
-            <languagePopulation type="kdt" populationPercent="0.11"/>
-        </territory>
-        <territory type="KI" gdp="357400000" literacyPercent="90" population="112850">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="gil" populationPercent="60" officialStatus="official"/>
-        </territory>
-        <territory type="KM" gdp="741400000" literacyPercent="56.5" population="752438">
-            <languagePopulation type="ar" populationPercent="66" officialStatus="official"/>
-            <languagePopulation type="swb" populationPercent="37" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="0.23" officialStatus="official"/>
-        </territory>
-        <territory type="KN" gdp="784900000" literacyPercent="97.8" population="40131">
-            <languagePopulation type="en" populationPercent="98" officialStatus="official"/>
-        </territory>
-        <territory type="KP" gdp="40000000000" literacyPercent="99" population="22665300">
-            <languagePopulation type="ko" populationPercent="88" officialStatus="official"/>
-        </territory>
-        <territory type="KR" gdp="1278000000000" literacyPercent="97.9" population="48509000">
-            <languagePopulation type="ko" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="KW" gdp="149100000000" literacyPercent="93.3" population="2691160">
-            <languagePopulation type="ar" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="KY" gdp="1939000000" literacyPercent="98" population="49035">
-            <languagePopulation type="en" populationPercent="98" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="KZ" gdp="176900000000" literacyPercent="99.5" population="15399400">
-            <languagePopulation type="ru" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="kk_Cyrl" populationPercent="64" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="6.4"/>
-            <languagePopulation type="ug" populationPercent="2"/>
-        </territory>
-        <territory type="LA" gdp="13990000000" literacyPercent="68.7" population="6834940">
-            <languagePopulation type="lo" populationPercent="69" officialStatus="official"/>
-            <languagePopulation type="kdt" populationPercent="0.88"/>
-        </territory>
-        <territory type="LB" gdp="44070000000" literacyPercent="87.4" population="4017100">
-            <languagePopulation type="ar" populationPercent="86" officialStatus="official"/>
-            <languagePopulation type="hy" populationPercent="5.2"/>
-            <languagePopulation type="ku_Arab" populationPercent="1.6"/>
-            <languagePopulation type="fr" populationPercent="0.37"/>
-            <languagePopulation type="en" populationPercent="0.082"/>
-        </territory>
-        <territory type="LC" gdp="1801000000" literacyPercent="90.1" population="160267">
-            <languagePopulation type="en" populationPercent="90" officialStatus="official"/>
-        </territory>
-        <territory type="LI" gdp="4160000000" literacyPercent="100" population="34761">
-            <languagePopulation type="de" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="gsw" writingPercent="5" populationPercent="85"/>
-            <languagePopulation type="wae" populationPercent="3.7"/>
-        </territory>
-        <territory type="LK" gdp="91900000000" literacyPercent="90.7" population="21324800">
-            <languagePopulation type="si" populationPercent="68" officialStatus="official"/>
-            <languagePopulation type="ta" populationPercent="15" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.38"/>
-        </territory>
-        <territory type="LR" gdp="1532000000" literacyPercent="57.5" population="3441790">
-            <languagePopulation type="en" populationPercent="20" officialStatus="official"/>
-            <languagePopulation type="kpe" populationPercent="14"/>
-            <languagePopulation type="vai" populationPercent="2.6"/>
-            <languagePopulation type="men" populationPercent="0.57"/>
-        </territory>
-        <territory type="LS" gdp="3370000000" literacyPercent="84.8" population="2130820">
-            <languagePopulation type="st" populationPercent="98" officialStatus="official"/>
-            <languagePopulation type="zu" populationPercent="14"/>
-            <languagePopulation type="ss" populationPercent="2.4"/>
-            <languagePopulation type="en" populationPercent="2.3" officialStatus="official"/>
-            <languagePopulation type="xh" populationPercent="1"/>
-        </territory>
-        <territory type="LT" gdp="63250000000" literacyPercent="99.6" population="3555180">
-            <languagePopulation type="lt" populationPercent="86" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="8"/>
-        </territory>
-        <territory type="LU" gdp="39420000000" literacyPercent="100" population="491775">
-            <languagePopulation type="fr" populationPercent="87" officialStatus="official"/>
-            <languagePopulation type="lb" writingPercent="5" populationPercent="67" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="63" officialStatus="official"/>
-        </territory>
-        <territory type="LV" gdp="38980000000" literacyPercent="99.7" population="2231500">
-            <languagePopulation type="lv" populationPercent="61" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="38"/>
-        </territory>
-        <territory type="LY" gdp="88860000000" literacyPercent="82.6" population="6310430">
-            <languagePopulation type="ar" populationPercent="74" officialStatus="official"/>
-        </territory>
-        <territory type="MA" gdp="137300000000" literacyPercent="52.3" population="34859400">
-            <languagePopulation type="ar" populationPercent="62" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="20" officialStatus="de_facto_official"/>
-            <languagePopulation type="tzm" populationPercent="9.8"/>
-            <languagePopulation type="rif" populationPercent="4.9"/>
-            <languagePopulation type="es" populationPercent="0.065"/>
-        </territory>
-        <territory type="MC" gdp="976300000" literacyPercent="99" population="32965">
-            <languagePopulation type="fr" populationPercent="99" officialStatus="official"/>
-        </territory>
-        <territory type="MD" gdp="10630000000" literacyPercent="99.1" population="4320750">
-            <languagePopulation type="ro" populationPercent="63" officialStatus="official"/>
-            <languagePopulation type="bg" populationPercent="9.4"/>
-            <languagePopulation type="gag" populationPercent="3.3" officialStatus="official_regional"/>
-            <languagePopulation type="ru" populationPercent="3"/>
-        </territory>
-        <territory type="ME" gdp="6600000000" literacyPercent="91.9" population="672180">
-            <languagePopulation type="sr_Latn" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="sq" populationPercent="7.9"/>
-        </territory>
-        <territory type="MF" gdp="449000000" literacyPercent="99" population="29820">
-            <languagePopulation type="fr" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="MG" gdp="20760000000" literacyPercent="68.9" population="20653600">
-            <languagePopulation type="mg" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="69" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="5" officialStatus="official"/>
-        </territory>
-        <territory type="MH" gdp="133500000" literacyPercent="93.7" population="64522">
-            <languagePopulation type="mh" populationPercent="73" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.93" officialStatus="official"/>
-        </territory>
-        <territory type="MK" gdp="18520000000" literacyPercent="96.1" population="2066720">
-            <languagePopulation type="mk" populationPercent="67" officialStatus="official"/>
-            <languagePopulation type="sq" populationPercent="25" officialStatus="de_facto_official"/>
-            <languagePopulation type="tr" populationPercent="9.7" officialStatus="official_regional"/>
-        </territory>
-        <territory type="ML" gdp="14480000000" literacyPercent="46.4" population="12667000">
-            <languagePopulation type="bm" populationPercent="46"/>
-            <languagePopulation type="fr" populationPercent="46" officialStatus="official"/>
-            <languagePopulation type="ffm" populationPercent="7.7"/>
-            <languagePopulation type="snk" populationPercent="5.9"/>
-            <languagePopulation type="mwk" populationPercent="5"/>
-            <languagePopulation type="ses" populationPercent="3.4"/>
-            <languagePopulation type="tmh" populationPercent="2.1"/>
-            <languagePopulation type="khq" populationPercent="1.7"/>
-            <languagePopulation type="dtm" populationPercent="1.1"/>
-            <languagePopulation type="kao" populationPercent="1"/>
-            <languagePopulation type="bzx" populationPercent="0.99"/>
-            <languagePopulation type="ar" populationPercent="0.89"/>
-            <languagePopulation type="bmq" populationPercent="0.86"/>
-            <languagePopulation type="bze" populationPercent="0.84"/>
-        </territory>
-        <territory type="MM" gdp="55040000000" literacyPercent="89.9" population="48137700">
-            <languagePopulation type="my" populationPercent="64" officialStatus="official"/>
-            <languagePopulation type="shn" populationPercent="6.4"/>
-            <languagePopulation type="mnw" populationPercent="1.5"/>
-            <languagePopulation type="kht" populationPercent="0.0088"/>
-        </territory>
-        <territory type="MN" gdp="9557000000" literacyPercent="97.8" population="3041140">
-            <languagePopulation type="mn_Cyrl" populationPercent="93" officialStatus="official"/>
-            <languagePopulation type="kk_Arab" populationPercent="7.2"/>
-            <languagePopulation type="zh_Hans" populationPercent="1.4"/>
-            <languagePopulation type="ru" populationPercent="0.13"/>
-            <languagePopulation type="ug" populationPercent="0.033"/>
-        </territory>
-        <territory type="MO" gdp="18140000000" literacyPercent="91.3" population="559846">
-            <languagePopulation type="zh_Hant" populationPercent="98" officialStatus="official"/>
-            <languagePopulation type="pt" populationPercent="5"/>
-        </territory>
-        <territory type="MP" gdp="900000000" literacyPercent="97" population="88662">
-            <languagePopulation type="en" populationPercent="97" officialStatus="de_facto_official"/>
-            <languagePopulation type="ch" populationPercent="18"/>
-        </territory>
-        <territory type="MQ" gdp="6117000000" literacyPercent="98" population="436131">
-            <languagePopulation type="fr" populationPercent="98" officialStatus="official"/>
-        </territory>
-        <territory type="MR" gdp="6310000000" literacyPercent="51.2" population="3129490">
-            <languagePopulation type="ar" populationPercent="85" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="17"/>
-            <languagePopulation type="wo" populationPercent="0.32"/>
-        </territory>
-        <territory type="MS" gdp="29000000" literacyPercent="97" population="5097">
-            <languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="MT" gdp="9801000000" literacyPercent="92.8" population="405165">
-            <languagePopulation type="mt" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.59" officialStatus="official"/>
-        </territory>
-        <territory type="MU" gdp="15360000000" literacyPercent="84.4" population="1284260">
-            <languagePopulation type="mfe" populationPercent="49"/>
-            <languagePopulation type="bho" populationPercent="27"/>
-            <languagePopulation type="ur" populationPercent="5.2"/>
-            <languagePopulation type="en" populationPercent="3" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="3" officialStatus="official"/>
-            <languagePopulation type="ta" populationPercent="2.5"/>
-        </territory>
-        <territory type="MV" gdp="1738000000" literacyPercent="96.3" population="396334">
-            <languagePopulation type="dv" populationPercent="94" officialStatus="official"/>
-        </territory>
-        <territory type="MW" gdp="11560000000" literacyPercent="62.7" population="14268700">
-            <languagePopulation type="ny" populationPercent="63" officialStatus="official"/>
-            <languagePopulation type="tum" populationPercent="8.4"/>
-            <languagePopulation type="zu" populationPercent="0.33"/>
-            <languagePopulation type="en" populationPercent="0.14" officialStatus="official"/>
-        </territory>
-        <territory type="MX" gdp="1559000000000" literacyPercent="91" population="111212000">
-            <languagePopulation type="es" populationPercent="83" officialStatus="de_facto_official"/>
-            <languagePopulation type="yua" populationPercent="0.67"/>
-            <languagePopulation type="nhe" populationPercent="0.39"/>
-            <languagePopulation type="nhw" populationPercent="0.38"/>
-            <languagePopulation type="maz" populationPercent="0.34"/>
-            <languagePopulation type="nch" populationPercent="0.19"/>
-        </territory>
-        <territory type="MY" gdp="386600000000" literacyPercent="88.7" population="25715800">
-            <languagePopulation type="ms" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="29"/>
-            <languagePopulation type="zh_Hant" populationPercent="17"/>
-            <languagePopulation type="ta" populationPercent="4.2"/>
-            <languagePopulation type="bjn" populationPercent="3.6"/>
-            <languagePopulation type="jv" populationPercent="1.2"/>
-            <languagePopulation type="zmi" populationPercent="1.2"/>
-            <languagePopulation type="ml" populationPercent="0.15"/>
-            <languagePopulation type="bug" populationPercent="0.08"/>
-        </territory>
-        <territory type="MZ" gdp="18950000000" literacyPercent="47.8" population="21669300">
-            <languagePopulation type="pt" populationPercent="27" officialStatus="official"/>
-            <languagePopulation type="vmw" populationPercent="13"/>
-            <languagePopulation type="ndc" populationPercent="9.9"/>
-            <languagePopulation type="ts" populationPercent="7.9"/>
-            <languagePopulation type="ngl" populationPercent="6.8"/>
-            <languagePopulation type="seh" populationPercent="4.6"/>
-            <languagePopulation type="rng" populationPercent="3.4"/>
-            <languagePopulation type="ny" populationPercent="2.6"/>
-            <languagePopulation type="yao" populationPercent="2.4"/>
-            <languagePopulation type="sw" populationPercent="0.043"/>
-            <languagePopulation type="zu" populationPercent="0.0083"/>
-        </territory>
-        <territory type="NA" gdp="11230000000" literacyPercent="85" population="2108670">
-            <languagePopulation type="kj" populationPercent="35"/>
-            <languagePopulation type="ng" populationPercent="21"/>
-            <languagePopulation type="en" populationPercent="7" officialStatus="official"/>
-            <languagePopulation type="af" populationPercent="6.6"/>
-            <languagePopulation type="de" populationPercent="0.63"/>
-            <languagePopulation type="tn" populationPercent="0.29"/>
-        </territory>
-        <territory type="NC" gdp="3158000000" literacyPercent="96.2" population="227436">
-            <languagePopulation type="fr" populationPercent="96" officialStatus="official"/>
-        </territory>
-        <territory type="NE" gdp="9784000000" literacyPercent="28.7" population="15306300">
-            <languagePopulation type="ha_Latn" populationPercent="41"/>
-            <languagePopulation type="fr" populationPercent="29" officialStatus="official"/>
-            <languagePopulation type="dje" populationPercent="17"/>
-            <languagePopulation type="fuq" populationPercent="7"/>
-            <languagePopulation type="tmh" populationPercent="6"/>
-            <languagePopulation type="ar" populationPercent="0.21"/>
-        </territory>
-        <territory type="NF" gdp="0" literacyPercent="0" population="2141">
-            <languagePopulation type="en" populationPercent="78" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="NG" gdp="338100000000" literacyPercent="68" population="149229000">
-            <languagePopulation type="en" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="ha_Latn" populationPercent="13" officialStatus="official"/>
-            <languagePopulation type="ig" populationPercent="13" officialStatus="official"/>
-            <languagePopulation type="yo" populationPercent="13" officialStatus="official"/>
-            <languagePopulation type="fuv" populationPercent="6.7"/>
-            <languagePopulation type="tiv" writingPercent="25" populationPercent="1.6"/>
-            <languagePopulation type="efi" populationPercent="1.4" officialStatus="official"/>
-            <languagePopulation type="ibb" populationPercent="1.4"/>
-            <languagePopulation type="bin" populationPercent="0.71"/>
-            <languagePopulation type="kaj" populationPercent="0.21"/>
-            <languagePopulation type="kcg" populationPercent="0.093"/>
-            <languagePopulation type="ar" populationPercent="0.071"/>
-            <languagePopulation type="cch" populationPercent="0.021"/>
-            <languagePopulation type="amo" populationPercent="0.0088"/>
-        </territory>
-        <territory type="NI" gdp="16830000000" literacyPercent="67.5" population="5891200">
-            <languagePopulation type="es" populationPercent="78" officialStatus="official"/>
-        </territory>
-        <territory type="NL" gdp="670200000000" literacyPercent="99" population="16716000">
-            <languagePopulation type="nl" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="74"/>
-            <languagePopulation type="li" writingPercent="5" populationPercent="5.5"/>
-            <languagePopulation type="fy" populationPercent="4.3" officialStatus="official_regional"/>
-            <languagePopulation type="gos" populationPercent="3.6"/>
-            <languagePopulation type="id" populationPercent="1.8"/>
-            <languagePopulation type="zea" populationPercent="1.4"/>
-            <languagePopulation type="rif" populationPercent="1.2"/>
-            <languagePopulation type="tr" populationPercent="1.2"/>
-        </territory>
-        <territory type="NO" gdp="256500000000" literacyPercent="100" population="4660540">
-            <languagePopulation type="nb" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="nn" populationPercent="25" officialStatus="official"/>
-            <languagePopulation type="se" populationPercent="3.3" officialStatus="official_regional"/>
-        </territory>
-        <territory type="NP" gdp="31090000000" literacyPercent="48.6" population="28563400">
-            <languagePopulation type="ne" populationPercent="44" officialStatus="official"/>
-            <languagePopulation type="mai" populationPercent="11"/>
-            <languagePopulation type="bho" populationPercent="6.8"/>
-            <languagePopulation type="new" populationPercent="3.3"/>
-            <languagePopulation type="jml" populationPercent="3.2"/>
-            <languagePopulation type="taj" populationPercent="3"/>
-            <languagePopulation type="awa" populationPercent="2.2"/>
-            <languagePopulation type="thl" populationPercent="2"/>
-            <languagePopulation type="bap" populationPercent="1.5"/>
-            <languagePopulation type="lif" populationPercent="1.3"/>
-            <languagePopulation type="tdg" populationPercent="1.3"/>
-            <languagePopulation type="thr" populationPercent="1.2"/>
-            <languagePopulation type="mgp" populationPercent="1.1"/>
-            <languagePopulation type="thq" populationPercent="1"/>
-            <languagePopulation type="mrd" populationPercent="0.83"/>
-            <languagePopulation type="bfy" populationPercent="0.54"/>
-            <languagePopulation type="rjb" populationPercent="0.51"/>
-            <languagePopulation type="xsr" populationPercent="0.51"/>
-            <languagePopulation type="tsf" populationPercent="0.43"/>
-            <languagePopulation type="hi" populationPercent="0.42"/>
-            <languagePopulation type="ggn" populationPercent="0.42"/>
-            <languagePopulation type="gvr" populationPercent="0.29"/>
-            <languagePopulation type="bo" populationPercent="0.24"/>
-            <languagePopulation type="tkt" populationPercent="0.24"/>
-            <languagePopulation type="tdh" populationPercent="0.12"/>
-            <languagePopulation type="bn" populationPercent="0.093"/>
-            <languagePopulation type="unr" populationPercent="0.02"/>
-            <languagePopulation type="lep" populationPercent="0.0099"/>
-        </territory>
-        <territory type="NR" gdp="60000000" literacyPercent="99" population="14019">
-            <languagePopulation type="en" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="na" populationPercent="43" officialStatus="official"/>
-        </territory>
-        <territory type="NU" gdp="10010000" literacyPercent="95" population="1398">
-            <languagePopulation type="niu" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="5.6" officialStatus="official"/>
-        </territory>
-        <territory type="NZ" gdp="116600000000" literacyPercent="99" population="4213420">
-            <languagePopulation type="en" populationPercent="79" officialStatus="de_facto_official"/>
-            <languagePopulation type="mi" populationPercent="2.5" officialStatus="official"/>
-        </territory>
-        <territory type="OM" gdp="67000000000" literacyPercent="81.4" population="3418090">
-            <languagePopulation type="ar" populationPercent="81" officialStatus="official"/>
-            <languagePopulation type="bal" populationPercent="4.9"/>
-            <languagePopulation type="fa" populationPercent="0.94"/>
-        </territory>
-        <territory type="PA" gdp="38490000000" literacyPercent="91.9" population="3360470">
-            <languagePopulation type="es" populationPercent="69" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="14"/>
-            <languagePopulation type="zh_Hant" populationPercent="0.18"/>
-        </territory>
-        <territory type="PE" gdp="238900000000" literacyPercent="92.9" population="29547000">
-            <languagePopulation type="es" populationPercent="73" officialStatus="official"/>
-            <languagePopulation type="qu" populationPercent="15" officialStatus="official"/>
-            <languagePopulation type="ay" populationPercent="1.6"/>
-        </territory>
-        <territory type="PF" gdp="4718000000" literacyPercent="98" population="287032">
-            <languagePopulation type="fr" populationPercent="61" officialStatus="official"/>
-            <languagePopulation type="ty" populationPercent="31" officialStatus="official"/>
-            <languagePopulation type="zh_Hant" populationPercent="7.8"/>
-        </territory>
-        <territory type="PG" gdp="13290000000" literacyPercent="57.3" population="6057260">
-            <languagePopulation type="tpi" writingPercent="45" populationPercent="71" officialStatus="official"/>
-            <languagePopulation type="ho" writingPercent="5" populationPercent="2.1" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.89" officialStatus="official"/>
-        </territory>
-        <territory type="PH" gdp="320600000000" literacyPercent="92.6" population="97976600">
-            <languagePopulation type="fil" populationPercent="60" officialStatus="official"/>
-            <languagePopulation type="tl" populationPercent="60" officialStatus="official_regional"/>
-            <languagePopulation type="en" populationPercent="55" officialStatus="official"/>
-            <languagePopulation type="ceb" populationPercent="24" officialStatus="official_regional"/>
-            <languagePopulation type="ilo" populationPercent="9.6" officialStatus="official_regional"/>
-            <languagePopulation type="hil" populationPercent="8.4" officialStatus="official_regional"/>
-            <languagePopulation type="bcl" populationPercent="3"/>
-            <languagePopulation type="war" populationPercent="2.9" officialStatus="official_regional"/>
-            <languagePopulation type="bhk" populationPercent="2.3"/>
-            <languagePopulation type="pam" populationPercent="2.3"/>
-            <languagePopulation type="pag" populationPercent="1.4" officialStatus="official_regional"/>
-            <languagePopulation type="mdh" populationPercent="1.2" officialStatus="official_regional"/>
-            <languagePopulation type="tsg" populationPercent="1.1" officialStatus="official_regional"/>
-            <languagePopulation type="zh_Hant" populationPercent="0.73"/>
-            <languagePopulation type="bto" populationPercent="0.28"/>
-            <languagePopulation type="hnn" populationPercent="0.016"/>
-            <languagePopulation type="tbw" writingPercent="36" populationPercent="0.01"/>
-            <languagePopulation type="bku" populationPercent="0.0082"/>
-            <languagePopulation type="es" populationPercent="0.0027" officialStatus="official"/>
-        </territory>
-        <territory type="PK" gdp="452700000000" literacyPercent="49.9" population="176243000">
-            <languagePopulation type="ur" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="50" officialStatus="official"/>
-            <languagePopulation type="lah" populationPercent="40"/>
-            <languagePopulation type="ps" populationPercent="15"/>
-            <languagePopulation type="sd_Arab" populationPercent="12"/>
-            <languagePopulation type="skr" writingPercent="1" populationPercent="9.1"/>
-            <languagePopulation type="bal" populationPercent="3.7"/>
-            <languagePopulation type="brh" populationPercent="1.3"/>
-            <languagePopulation type="hno" populationPercent="1.2"/>
-            <languagePopulation type="fa" populationPercent="0.66"/>
-            <languagePopulation type="hnd" populationPercent="0.41"/>
-            <languagePopulation type="tg_Arab" populationPercent="0.33"/>
-            <languagePopulation type="gju" populationPercent="0.2"/>
-            <languagePopulation type="bft" populationPercent="0.18"/>
-            <languagePopulation type="kvx" populationPercent="0.16"/>
-            <languagePopulation type="khw" populationPercent="0.15"/>
-            <languagePopulation type="mvy" populationPercent="0.14"/>
-            <languagePopulation type="kxp" populationPercent="0.12"/>
-            <languagePopulation type="gjk" populationPercent="0.11"/>
-            <languagePopulation type="ks" populationPercent="0.069"/>
-            <languagePopulation type="btv" populationPercent="0.019"/>
-        </territory>
-        <territory type="PL" gdp="667400000000" literacyPercent="99.8" population="38482900">
-            <languagePopulation type="pl" populationPercent="96" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="1.3"/>
-            <languagePopulation type="be" populationPercent="0.58"/>
-            <languagePopulation type="uk" populationPercent="0.39"/>
-        </territory>
-        <territory type="PM" gdp="48300000" literacyPercent="99" population="7051">
-            <languagePopulation type="fr" populationPercent="72" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="2.7"/>
-        </territory>
-        <territory type="PN" gdp="0" literacyPercent="0" population="48">
-            <languagePopulation type="en" populationPercent="96" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="PR" gdp="70590000000" literacyPercent="94.1" population="3971020">
-            <languagePopulation type="es" populationPercent="87" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="49" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="PS" gdp="23900000000" literacyPercent="92.4" population="4013130">
-            <languagePopulation type="ar" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="PT" gdp="237300000000" literacyPercent="93.3" population="10707900">
-            <languagePopulation type="pt" populationPercent="96" officialStatus="official"/>
-            <languagePopulation type="gl" populationPercent="0.14"/>
-        </territory>
-        <territory type="PW" gdp="164000000" literacyPercent="92" population="20796">
-            <languagePopulation type="pau" populationPercent="74" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="9" officialStatus="official_regional"/>
-        </territory>
-        <territory type="PY" gdp="28710000000" literacyPercent="94" population="6995660">
-            <languagePopulation type="gn" populationPercent="80" officialStatus="official"/>
-            <languagePopulation type="es" populationPercent="3.2" officialStatus="official"/>
-            <languagePopulation type="de" populationPercent="2.9"/>
-        </territory>
-        <territory type="QA" gdp="85350000000" literacyPercent="89" population="833285">
-            <languagePopulation type="ar" populationPercent="89" officialStatus="official"/>
-            <languagePopulation type="fa" populationPercent="11"/>
-            <languagePopulation type="ml" populationPercent="0.78"/>
-        </territory>
-        <territory type="RE" gdp="4791000000" literacyPercent="88" population="787584">
-            <languagePopulation type="fr" populationPercent="89" officialStatus="official"/>
-            <languagePopulation type="rcf" populationPercent="71"/>
-            <languagePopulation type="ta" populationPercent="15"/>
-        </territory>
-        <territory type="RO" gdp="271200000000" literacyPercent="97.3" population="22215400">
-            <languagePopulation type="ro" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="hu" populationPercent="6.6"/>
-            <languagePopulation type="de" populationPercent="0.21"/>
-            <languagePopulation type="tr" populationPercent="0.13"/>
-            <languagePopulation type="sr_Latn" populationPercent="0.12"/>
-            <languagePopulation type="bg" populationPercent="0.03"/>
-            <languagePopulation type="el" populationPercent="0.019"/>
-            <languagePopulation type="pl" populationPercent="0.012"/>
-        </territory>
-        <territory type="RS" gdp="80740000000" literacyPercent="91.9" population="9184180">
-            <languagePopulation type="sr_Cyrl" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="sr_Latn" writingPercent="5" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="sq" populationPercent="19" officialStatus="official_regional"/>
-            <languagePopulation type="hu" populationPercent="4.8" officialStatus="official_regional"/>
-            <languagePopulation type="ro" populationPercent="2.1" officialStatus="official_regional"/>
-            <languagePopulation type="sk" populationPercent="0.85" officialStatus="official_regional"/>
-        </territory>
-        <territory type="RU" gdp="2225000000000" literacyPercent="99.4" population="140041000">
-            <languagePopulation type="ru" populationPercent="82" officialStatus="official"/>
-            <languagePopulation type="ba" populationPercent="1.3" officialStatus="official_regional"/>
-            <languagePopulation type="cv" populationPercent="1.3"/>
-            <languagePopulation type="ce" populationPercent="0.66" officialStatus="official_regional"/>
-            <languagePopulation type="av" populationPercent="0.39" officialStatus="official_regional"/>
-            <languagePopulation type="udm" populationPercent="0.38" officialStatus="official_regional"/>
-            <languagePopulation type="chm" populationPercent="0.37"/>
-            <languagePopulation type="mhr" populationPercent="0.37"/>
-            <languagePopulation type="tt" populationPercent="0.32" officialStatus="official_regional"/>
-            <languagePopulation type="kbd" populationPercent="0.31" officialStatus="official_regional"/>
-            <languagePopulation type="myv" populationPercent="0.31" officialStatus="official_regional"/>
-            <languagePopulation type="dar" populationPercent="0.26"/>
-            <languagePopulation type="sah" populationPercent="0.25" officialStatus="official_regional"/>
-            <languagePopulation type="bxr" populationPercent="0.22"/>
-            <languagePopulation type="mdf" populationPercent="0.21" officialStatus="official_regional"/>
-            <languagePopulation type="kum" populationPercent="0.2" officialStatus="official_regional"/>
-            <languagePopulation type="kpv" populationPercent="0.18" officialStatus="official_regional"/>
-            <languagePopulation type="lez" populationPercent="0.18" officialStatus="official_regional"/>
-            <languagePopulation type="krc" populationPercent="0.16" officialStatus="official_regional"/>
-            <languagePopulation type="inh" populationPercent="0.16" officialStatus="official_regional"/>
-            <languagePopulation type="tyv" populationPercent="0.13" officialStatus="official_regional"/>
-            <languagePopulation type="ady" populationPercent="0.087" officialStatus="official_regional"/>
-            <languagePopulation type="krl" populationPercent="0.082"/>
-            <languagePopulation type="koi" populationPercent="0.081" officialStatus="official_regional"/>
-            <languagePopulation type="lbe" populationPercent="0.078" officialStatus="official_regional"/>
-            <languagePopulation type="mrj" populationPercent="0.046"/>
-            <languagePopulation type="alt" populationPercent="0.014"/>
-            <languagePopulation type="fi" populationPercent="0.012"/>
-            <languagePopulation type="sr_Latn" populationPercent="0.0036"/>
-            <languagePopulation type="mn_Cyrl" populationPercent="0.0015"/>
-        </territory>
-        <territory type="RW" gdp="9061000000" literacyPercent="70.4" population="10473300">
-            <languagePopulation type="rw" populationPercent="77" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="0.022" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.0029" officialStatus="official"/>
-        </territory>
-        <territory type="SA" gdp="582800000000" literacyPercent="78.8" population="28686600">
-            <languagePopulation type="ar" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="SB" gdp="1078000000" literacyPercent="54" population="595613">
-            <languagePopulation type="en" populationPercent="100" officialStatus="official"/>
-        </territory>
-        <territory type="SC" gdp="1473000000" literacyPercent="91.8" population="87476">
-            <languagePopulation type="crs" populationPercent="98"/>
-            <languagePopulation type="en" populationPercent="4.7" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="1.1" officialStatus="official"/>
-        </territory>
-        <territory type="SD" gdp="87270000000" literacyPercent="61.1" population="41087800">
-            <languagePopulation type="ar" populationPercent="61" officialStatus="official"/>
-            <languagePopulation type="ha_Arab" populationPercent="1.4"/>
-        </territory>
-        <territory type="SE" gdp="348600000000" literacyPercent="99" population="9059650">
-            <languagePopulation type="sv" populationPercent="87" officialStatus="de_facto_official"/>
-            <languagePopulation type="fi" populationPercent="2.2" officialStatus="official_regional"/>
-            <languagePopulation type="se" populationPercent="0.33"/>
-            <languagePopulation type="smj" populationPercent="0.017"/>
-            <languagePopulation type="sma" writingPercent="75" populationPercent="0.0033"/>
-        </territory>
-        <territory type="SG" gdp="240000000000" literacyPercent="92.5" population="4657540">
-            <languagePopulation type="en" populationPercent="93" officialStatus="official"/>
-            <languagePopulation type="zh_Hans" populationPercent="77" officialStatus="official"/>
-            <languagePopulation type="ms" populationPercent="14" officialStatus="official"/>
-            <languagePopulation type="ta" populationPercent="2.1" officialStatus="official"/>
-            <languagePopulation type="ml" populationPercent="0.21"/>
-            <languagePopulation type="pa_Guru" populationPercent="0.2"/>
-        </territory>
-        <territory type="SH" gdp="18000000" literacyPercent="97" population="7637">
-            <languagePopulation type="en" populationPercent="71" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="SI" gdp="59140000000" literacyPercent="99.7" population="2005690">
-            <languagePopulation type="sl" populationPercent="87" officialStatus="official"/>
-            <languagePopulation type="hu" populationPercent="0.46"/>
-            <languagePopulation type="it" populationPercent="0.2"/>
-        </territory>
-        <territory type="SJ" gdp="0" literacyPercent="0" population="2116">
-            <languagePopulation type="nb" populationPercent="71" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="57"/>
-        </territory>
-        <territory type="SK" gdp="119500000000" literacyPercent="99.6" population="5463050">
-            <languagePopulation type="sk" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="hu" populationPercent="11"/>
-            <languagePopulation type="uk" populationPercent="1.9"/>
-            <languagePopulation type="pl" populationPercent="0.93"/>
-            <languagePopulation type="de" populationPercent="0.28"/>
-        </territory>
-        <territory type="SL" gdp="4307000000" literacyPercent="35.1" population="6440050">
-            <languagePopulation type="kri" populationPercent="95"/>
-            <languagePopulation type="men" populationPercent="27"/>
-            <languagePopulation type="tem" writingPercent="6" populationPercent="26"/>
-            <languagePopulation type="en" populationPercent="1.8" officialStatus="official"/>
-        </territory>
-        <territory type="SM" gdp="1662000000" literacyPercent="96" population="30324">
-            <languagePopulation type="it" populationPercent="89" officialStatus="official"/>
-        </territory>
-        <territory type="SN" gdp="21900000000" literacyPercent="39.3" population="13711600">
-            <languagePopulation type="fr" populationPercent="39" officialStatus="official"/>
-            <languagePopulation type="wo" populationPercent="34" officialStatus="official"/>
-            <languagePopulation type="srr" populationPercent="11"/>
-        </territory>
-        <territory type="SO" gdp="5524000000" literacyPercent="37.8" population="9832020">
-            <languagePopulation type="sw" populationPercent="89"/>
-            <languagePopulation type="so" populationPercent="78" officialStatus="official"/>
-            <languagePopulation type="om" populationPercent="0.42"/>
-        </territory>
-        <territory type="SR" gdp="4256000000" literacyPercent="89.6" population="481267">
-            <languagePopulation type="srn" writingPercent="75" populationPercent="68"/>
-            <languagePopulation type="nl" populationPercent="45" officialStatus="official"/>
-            <languagePopulation type="zh_Hant" populationPercent="1.5"/>
-        </territory>
-        <territory type="ST" gdp="276600000" literacyPercent="84.9" population="212679">
-            <languagePopulation type="pt" populationPercent="85" officialStatus="official"/>
-        </territory>
-        <territory type="SV" gdp="43940000000" literacyPercent="80.2" population="7185220">
-            <languagePopulation type="es" populationPercent="89" officialStatus="official"/>
-        </territory>
-        <territory type="SY" gdp="95360000000" literacyPercent="79.6" population="20178500">
-            <languagePopulation type="ar" populationPercent="80" officialStatus="official"/>
-            <languagePopulation type="ku_Arab" populationPercent="8"/>
-            <languagePopulation type="fr" populationPercent="5.9" officialStatus="official"/>
-            <languagePopulation type="hy" populationPercent="1.8"/>
-            <languagePopulation type="syr" writingPercent="5" populationPercent="0.084"/>
-        </territory>
-        <territory type="SZ" gdp="5703000000" literacyPercent="81.6" population="1123910">
-            <languagePopulation type="en" populationPercent="80" officialStatus="official"/>
-            <languagePopulation type="ss" populationPercent="58" officialStatus="official"/>
-            <languagePopulation type="zu" populationPercent="6.8"/>
-            <languagePopulation type="ts" populationPercent="1.7"/>
-        </territory>
-        <territory type="TC" gdp="216000000" literacyPercent="98" population="22942">
-            <languagePopulation type="en" populationPercent="98" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="TD" gdp="16260000000" literacyPercent="25.7" population="10329200">
-            <languagePopulation type="fr" populationPercent="26" officialStatus="official"/>
-            <languagePopulation type="ar" populationPercent="17" officialStatus="official"/>
-        </territory>
-        <territory type="TF" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="und" writingPercent="100" populationPercent="100"/>
-        </territory>
-        <territory type="TG" gdp="5105000000" literacyPercent="60.9" population="6019880">
-            <languagePopulation type="fr" populationPercent="61" officialStatus="official"/>
-            <languagePopulation type="ee" populationPercent="17"/>
-        </territory>
-        <territory type="TH" gdp="553400000000" literacyPercent="92.6" population="65905400">
-            <languagePopulation type="th" populationPercent="32" officialStatus="official"/>
-            <languagePopulation type="tts" populationPercent="24"/>
-            <languagePopulation type="nod" populationPercent="9.6"/>
-            <languagePopulation type="sou" populationPercent="8"/>
-            <languagePopulation type="mfa" populationPercent="5"/>
-            <languagePopulation type="zh_Hant" populationPercent="1.9"/>
-            <languagePopulation type="kxm" populationPercent="1.8"/>
-            <languagePopulation type="kdt" writingPercent="50" populationPercent="0.48"/>
-            <languagePopulation type="mnw" populationPercent="0.17"/>
-            <languagePopulation type="shn" populationPercent="0.096"/>
-            <languagePopulation type="lcp" writingPercent="25" populationPercent="0.011"/>
-            <languagePopulation type="lwl" populationPercent="0.011"/>
-        </territory>
-        <territory type="TJ" gdp="15400000000" literacyPercent="99.5" population="7349150">
-            <languagePopulation type="tg_Cyrl" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="fa" populationPercent="0.78"/>
-            <languagePopulation type="ar" populationPercent="0.014"/>
-        </territory>
-        <territory type="TK" gdp="1500000" literacyPercent="0" population="1416">
-            <languagePopulation type="tkl" writingPercent="5" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="2.8" officialStatus="official"/>
-        </territory>
-        <territory type="TL" gdp="2713000000" literacyPercent="58.6" population="1131610">
-            <languagePopulation type="pt" writingPercent="100" populationPercent="59" officialStatus="official"/>
-            <languagePopulation type="tet" populationPercent="59" officialStatus="official"/>
-        </territory>
-        <territory type="TM" gdp="29650000000" literacyPercent="98.8" population="4884890">
-            <languagePopulation type="tk" populationPercent="70" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="12"/>
-            <languagePopulation type="uz_Latn" populationPercent="9"/>
-            <languagePopulation type="ku_Latn" populationPercent="0.41"/>
-        </territory>
-        <territory type="TN" gdp="81880000000" literacyPercent="74.3" population="10486300">
-            <languagePopulation type="ar" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="74" officialStatus="official"/>
-        </territory>
-        <territory type="TO" gdp="549100000" literacyPercent="98.9" population="120898">
-            <languagePopulation type="to" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="28" officialStatus="official"/>
-        </territory>
-        <territory type="TR" gdp="906500000000" literacyPercent="87.4" population="76805500">
-            <languagePopulation type="tr" populationPercent="65" officialStatus="official"/>
-            <languagePopulation type="ku_Latn" populationPercent="5.5"/>
-            <languagePopulation type="diq" populationPercent="1.4"/>
-            <languagePopulation type="kbd" populationPercent="0.77"/>
-            <languagePopulation type="az_Latn" populationPercent="0.74"/>
-            <languagePopulation type="ar" populationPercent="0.56"/>
-            <languagePopulation type="bgx" populationPercent="0.46"/>
-            <languagePopulation type="bg" populationPercent="0.42"/>
-            <languagePopulation type="ady" populationPercent="0.39"/>
-            <languagePopulation type="hy" populationPercent="0.056"/>
-            <languagePopulation type="ka" populationPercent="0.056"/>
-            <languagePopulation type="sr_Latn" writingPercent="5" populationPercent="0.028"/>
-            <languagePopulation type="sq" populationPercent="0.021"/>
-            <languagePopulation type="ab" populationPercent="0.0052"/>
-            <languagePopulation type="el" populationPercent="0.0052"/>
-            <languagePopulation type="uz_Latn" populationPercent="0.0026"/>
-            <languagePopulation type="ky_Latn" populationPercent="0.0015"/>
-            <languagePopulation type="kk_Cyrl" populationPercent="0.0008"/>
-        </territory>
-        <territory type="TT" gdp="24190000000" literacyPercent="98.6" population="1229950">
-            <languagePopulation type="en" populationPercent="99" officialStatus="official"/>
-            <languagePopulation type="es" populationPercent="0.33"/>
-        </territory>
-        <territory type="TV" gdp="14940000" literacyPercent="95" population="12373">
-            <languagePopulation type="tvl" populationPercent="92" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="8.6" officialStatus="official"/>
-        </territory>
-        <territory type="TW" gdp="738800000000" literacyPercent="96.1" population="22974300">
-            <languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>
-            <languagePopulation type="trv" populationPercent="0.021"/>
-        </territory>
-        <territory type="TZ" gdp="54260000000" literacyPercent="69.4" population="41048500">
-            <languagePopulation type="sw" populationPercent="90" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="69" officialStatus="official"/>
-            <languagePopulation type="suk" populationPercent="8.7"/>
-            <languagePopulation type="nym" populationPercent="3.3"/>
-        </territory>
-        <territory type="UA" gdp="337000000000" literacyPercent="99.4" population="45700400">
-            <languagePopulation type="uk" populationPercent="65" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="24"/>
-            <languagePopulation type="pl" populationPercent="2.4"/>
-            <languagePopulation type="yi" populationPercent="1.3"/>
-            <languagePopulation type="rue" populationPercent="1.2"/>
-            <languagePopulation type="be" populationPercent="0.83"/>
-            <languagePopulation type="ro" populationPercent="0.52"/>
-            <languagePopulation type="bg" populationPercent="0.49"/>
-            <languagePopulation type="tr" populationPercent="0.42"/>
-            <languagePopulation type="hu" populationPercent="0.37"/>
-            <languagePopulation type="el" populationPercent="0.016"/>
-        </territory>
-        <territory type="UG" gdp="35880000000" literacyPercent="66.8" population="32369600">
-            <languagePopulation type="sw" populationPercent="75" officialStatus="official"/>
-            <languagePopulation type="lg" populationPercent="12"/>
-            <languagePopulation type="nyn" populationPercent="6.3"/>
-            <languagePopulation type="cgg" populationPercent="5.4"/>
-            <languagePopulation type="xog" populationPercent="5.3"/>
-            <languagePopulation type="en" populationPercent="3.9" officialStatus="official"/>
-            <languagePopulation type="teo" populationPercent="3.9"/>
-            <languagePopulation type="laj" populationPercent="3.8"/>
-            <languagePopulation type="myx" populationPercent="2.9"/>
-            <languagePopulation type="rw" populationPercent="2.1"/>
-            <languagePopulation type="ttj" populationPercent="1.9"/>
-            <languagePopulation type="hi" populationPercent="0.0068"/>
-        </territory>
-        <territory type="UM" gdp="0" literacyPercent="0" population="1">
-            <languagePopulation type="en" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="US" gdp="14290000000000" literacyPercent="99" population="307212000">
-            <languagePopulation type="en" populationPercent="92" officialStatus="de_facto_official"/>
-            <languagePopulation type="es" populationPercent="9.6" officialStatus="official_regional"/>
-            <languagePopulation type="zh_Hant" populationPercent="0.69"/>
-            <languagePopulation type="fr" populationPercent="0.56"/>
-            <languagePopulation type="de" populationPercent="0.47"/>
-            <languagePopulation type="tl" populationPercent="0.42"/>
-            <languagePopulation type="it" populationPercent="0.34"/>
-            <languagePopulation type="vi" populationPercent="0.34"/>
-            <languagePopulation type="ko" populationPercent="0.3"/>
-            <languagePopulation type="ru" populationPercent="0.24"/>
-            <languagePopulation type="nv" populationPercent="0.05"/>
-            <languagePopulation type="chr" writingPercent="5" populationPercent="0.0077"/>
-            <languagePopulation type="haw" populationPercent="0.0026" officialStatus="official_regional"/>
-            <languagePopulation type="ik" writingPercent="5" populationPercent="0.0026"/>
-        </territory>
-        <territory type="UY" gdp="42460000000" literacyPercent="98" population="3494380">
-            <languagePopulation type="es" populationPercent="88" officialStatus="official"/>
-        </territory>
-        <territory type="UZ" gdp="71630000000" literacyPercent="99.3" population="27606000">
-            <languagePopulation type="uz_Cyrl" populationPercent="56" officialStatus="official"/>
-            <languagePopulation type="uz_Latn" populationPercent="19" officialStatus="official"/>
-            <languagePopulation type="ru" populationPercent="14"/>
-            <languagePopulation type="kaa" populationPercent="1.6"/>
-            <languagePopulation type="tr" populationPercent="0.76"/>
-        </territory>
-        <territory type="VA" gdp="0" literacyPercent="100" population="826">
-            <languagePopulation type="it" populationPercent="100"/>
-            <languagePopulation type="la" populationPercent="100" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="VC" gdp="1103000000" literacyPercent="96" population="104574">
-            <languagePopulation type="en" populationPercent="96" officialStatus="official"/>
-        </territory>
-        <territory type="VE" gdp="357900000000" literacyPercent="93" population="26814800">
-            <languagePopulation type="es" populationPercent="82" officialStatus="official"/>
-        </territory>
-        <territory type="VG" gdp="853400000" literacyPercent="97.8" population="24491">
-            <languagePopulation type="en" populationPercent="98" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="VI" gdp="1577000000" literacyPercent="95" population="109825">
-            <languagePopulation type="en" populationPercent="75" officialStatus="de_facto_official"/>
-        </territory>
-        <territory type="VN" gdp="241800000000" literacyPercent="90.3" population="86967500">
-            <languagePopulation type="vi" populationPercent="80" officialStatus="official"/>
-            <languagePopulation type="zh_Hant" populationPercent="1"/>
-            <languagePopulation type="cjm" writingPercent="60" populationPercent="0.089"/>
-        </territory>
-        <territory type="VU" gdp="983200000" literacyPercent="74" population="218519">
-            <languagePopulation type="bi" populationPercent="23" officialStatus="official"/>
-            <languagePopulation type="fr" populationPercent="2.9" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.87" officialStatus="official"/>
-        </territory>
-        <territory type="WF" gdp="60000000" literacyPercent="50" population="15289">
-            <languagePopulation type="wls" populationPercent="62"/>
-            <languagePopulation type="fud" populationPercent="32"/>
-            <languagePopulation type="fr" populationPercent="11" officialStatus="official"/>
-        </territory>
-        <territory type="WS" gdp="1057000000" literacyPercent="99.7" population="219998">
-            <languagePopulation type="sm" populationPercent="100" officialStatus="official"/>
-            <languagePopulation type="en" populationPercent="0.091" officialStatus="official"/>
-        </territory>
-        <territory type="YE" gdp="55290000000" literacyPercent="50.2" population="23822800">
-            <languagePopulation type="ar" populationPercent="74" officialStatus="official"/>
-        </territory>
-        <territory type="YT" gdp="953600000" literacyPercent="92" population="223765">
-            <languagePopulation type="swb" populationPercent="54"/>
-            <languagePopulation type="fr" populationPercent="35" officialStatus="official"/>
-            <languagePopulation type="buc" populationPercent="23"/>
-            <languagePopulation type="sw" populationPercent="1.2"/>
-        </territory>
-        <territory type="ZA" gdp="489700000000" literacyPercent="86.4" population="49052500">
-            <languagePopulation type="en" writingPercent="99" populationPercent="30" officialStatus="official"/>
-            <languagePopulation type="zu" writingPercent="50" populationPercent="24" officialStatus="official"/>
-            <languagePopulation type="xh" writingPercent="50" populationPercent="18" officialStatus="official"/>
-            <languagePopulation type="af" writingPercent="99" populationPercent="13" officialStatus="official"/>
-            <languagePopulation type="nso" writingPercent="50" populationPercent="8.1" officialStatus="official"/>
-            <languagePopulation type="tn" writingPercent="50" populationPercent="7.2" officialStatus="official"/>
-            <languagePopulation type="st" writingPercent="50" populationPercent="6.8" officialStatus="official"/>
-            <languagePopulation type="ts" writingPercent="50" populationPercent="3.9" officialStatus="official"/>
-            <languagePopulation type="ss" writingPercent="50" populationPercent="2.2" officialStatus="official"/>
-            <languagePopulation type="hi" writingPercent="69" populationPercent="2"/>
-            <languagePopulation type="ve" writingPercent="50" populationPercent="1.9" officialStatus="official"/>
-            <languagePopulation type="nr" writingPercent="50" populationPercent="1.3"/>
-            <languagePopulation type="sw" writingPercent="50" populationPercent="0.002"/>
-        </territory>
-        <territory type="ZM" gdp="17390000000" literacyPercent="80.6" population="11862700">
-            <languagePopulation type="en" populationPercent="81" officialStatus="official"/>
-            <languagePopulation type="bem" populationPercent="31"/>
-            <languagePopulation type="ny" populationPercent="15"/>
-        </territory>
-        <territory type="ZW" gdp="1959000000" literacyPercent="90.7" population="11392600">
-            <languagePopulation type="sn" populationPercent="81"/>
-            <languagePopulation type="nd" populationPercent="12"/>
-            <languagePopulation type="mxc" populationPercent="6.5"/>
-            <languagePopulation type="ndc" populationPercent="6.1"/>
-            <languagePopulation type="kck" populationPercent="5.3"/>
-            <languagePopulation type="en" populationPercent="2.8" officialStatus="official"/>
-            <languagePopulation type="ny" populationPercent="1.9"/>
-            <languagePopulation type="ve" populationPercent="0.64"/>
-            <languagePopulation type="tn" populationPercent="0.22"/>
-        </territory>
-        <territory type="ZZ" gdp="0" literacyPercent="0" population="0">
-        </territory>
-    </territoryInfo>
-       <calendarData>
-           <calendar type="gregorian">
-              <calendarSystem type="solar" />
-              <eras>
-                  <era type="0" end="0" />
-                  <era type="1" start="1" />
-              </eras>
-           </calendar>
-        <calendar type="japanese">
-          <calendarSystem type="solar" />
-          <eras>
-              <era type="0" start="645-6-19"/>
-              <era type="1" start="650-2-15"/>
-              <era type="2" start="672-1-1"/>
-              <era type="3" start="686-7-20"/>
-              <era type="4" start="701-3-21"/>
-              <era type="5" start="704-5-10"/>
-              <era type="6" start="708-1-11"/>
-              <era type="7" start="715-9-2"/>
-              <era type="8" start="717-11-17"/>
-              <era type="9" start="724-2-4"/>
-              <era type="10" start="729-8-5"/>
-              <era type="11" start="749-4-14"/>
-              <era type="12" start="749-7-2"/>
-              <era type="13" start="757-8-18"/>
-              <era type="14" start="765-1-7"/>
-              <era type="15" start="767-8-16"/>
-              <era type="16" start="770-10-1"/>
-              <era type="17" start="781-1-1"/>
-              <era type="18" start="782-8-19"/>
-              <era type="19" start="806-5-18"/>
-              <era type="20" start="810-9-19"/>
-              <era type="21" start="824-1-5"/>
-              <era type="22" start="834-1-3"/>
-              <era type="23" start="848-6-13"/>
-              <era type="24" start="851-4-28"/>
-              <era type="25" start="854-11-30"/>
-              <era type="26" start="857-2-21"/>
-              <era type="27" start="859-4-15"/>
-              <era type="28" start="877-4-16"/>
-              <era type="29" start="885-2-21"/>
-              <era type="30" start="889-4-27"/>
-              <era type="31" start="898-4-26"/>
-              <era type="32" start="901-7-15"/>
-              <era type="33" start="923-4-11"/>
-              <era type="34" start="931-4-26"/>
-              <era type="35" start="938-5-22"/>
-              <era type="36" start="947-4-22"/>
-              <era type="37" start="957-10-27"/>
-              <era type="38" start="961-2-16"/>
-              <era type="39" start="964-7-10"/>
-              <era type="40" start="968-8-13"/>
-              <era type="41" start="970-3-25"/>
-              <era type="42" start="973-12-20"/>
-              <era type="43" start="976-7-13"/>
-              <era type="44" start="978-11-29"/>
-              <era type="45" start="983-4-15"/>
-              <era type="46" start="985-4-27"/>
-              <era type="47" start="987-4-5"/>
-              <era type="48" start="989-8-8"/>
-              <era type="49" start="990-11-7"/>
-              <era type="50" start="995-2-22"/>
-              <era type="51" start="999-1-13"/>
-              <era type="52" start="1004-7-20"/>
-              <era type="53" start="1012-12-25"/>
-              <era type="54" start="1017-4-23"/>
-              <era type="55" start="1021-2-2"/>
-              <era type="56" start="1024-7-13"/>
-              <era type="57" start="1028-7-25"/>
-              <era type="58" start="1037-4-21"/>
-              <era type="59" start="1040-11-10"/>
-              <era type="60" start="1044-11-24"/>
-              <era type="61" start="1046-4-14"/>
-              <era type="62" start="1053-1-11"/>
-              <era type="63" start="1058-8-29"/>
-              <era type="64" start="1065-8-2"/>
-              <era type="65" start="1069-4-13"/>
-              <era type="66" start="1074-8-23"/>
-              <era type="67" start="1077-11-17"/>
-              <era type="68" start="1081-2-10"/>
-              <era type="69" start="1084-2-7"/>
-              <era type="70" start="1087-4-7"/>
-              <era type="71" start="1094-12-15"/>
-              <era type="72" start="1096-12-17"/>
-              <era type="73" start="1097-11-21"/>
-              <era type="74" start="1099-8-28"/>
-              <era type="75" start="1104-2-10"/>
-              <era type="76" start="1106-4-9"/>
-              <era type="77" start="1108-8-3"/>
-              <era type="78" start="1110-7-13"/>
-              <era type="79" start="1113-7-13"/>
-              <era type="80" start="1118-4-3"/>
-              <era type="81" start="1120-4-10"/>
-              <era type="82" start="1124-4-3"/>
-              <era type="83" start="1126-1-22"/>
-              <era type="84" start="1131-1-29"/>
-              <era type="85" start="1132-8-11"/>
-              <era type="86" start="1135-4-27"/>
-              <era type="87" start="1141-7-10"/>
-              <era type="88" start="1142-4-28"/>
-              <era type="89" start="1144-2-23"/>
-              <era type="90" start="1145-7-22"/>
-              <era type="91" start="1151-1-26"/>
-              <era type="92" start="1154-10-28"/>
-              <era type="93" start="1156-4-27"/>
-              <era type="94" start="1159-4-20"/>
-              <era type="95" start="1160-1-10"/>
-              <era type="96" start="1161-9-4"/>
-              <era type="97" start="1163-3-29"/>
-              <era type="98" start="1165-6-5"/>
-              <era type="99" start="1166-8-27"/>
-              <era type="100" start="1169-4-8"/>
-              <era type="101" start="1171-4-21"/>
-              <era type="102" start="1175-7-28"/>
-              <era type="103" start="1177-8-4"/>
-              <era type="104" start="1181-7-14"/>
-              <era type="105" start="1182-5-27"/>
-              <era type="106" start="1184-4-16"/>
-              <era type="107" start="1185-8-14"/>
-              <era type="108" start="1190-4-11"/>
-              <era type="109" start="1199-4-27"/>
-              <era type="110" start="1201-2-13"/>
-              <era type="111" start="1204-2-20"/>
-              <era type="112" start="1206-4-27"/>
-              <era type="113" start="1207-10-25"/>
-              <era type="114" start="1211-3-9"/>
-              <era type="115" start="1213-12-6"/>
-              <era type="116" start="1219-4-12"/>
-              <era type="117" start="1222-4-13"/>
-              <era type="118" start="1224-11-20"/>
-              <era type="119" start="1225-4-20"/>
-              <era type="120" start="1227-12-10"/>
-              <era type="121" start="1229-3-5"/>
-              <era type="122" start="1232-4-2"/>
-              <era type="123" start="1233-4-15"/>
-              <era type="124" start="1234-11-5"/>
-              <era type="125" start="1235-9-19"/>
-              <era type="126" start="1238-11-23"/>
-              <era type="127" start="1239-2-7"/>
-              <era type="128" start="1240-7-16"/>
-              <era type="129" start="1243-2-26"/>
-              <era type="130" start="1247-2-28"/>
-              <era type="131" start="1249-3-18"/>
-              <era type="132" start="1256-10-5"/>
-              <era type="133" start="1257-3-14"/>
-              <era type="134" start="1259-3-26"/>
-              <era type="135" start="1260-4-13"/>
-              <era type="136" start="1261-2-20"/>
-              <era type="137" start="1264-2-28"/>
-              <era type="138" start="1275-4-25"/>
-              <era type="139" start="1278-2-29"/>
-              <era type="140" start="1288-4-28"/>
-              <era type="141" start="1293-8-55"/>
-              <era type="142" start="1299-4-25"/>
-              <era type="143" start="1302-11-21"/>
-              <era type="144" start="1303-8-5"/>
-              <era type="145" start="1306-12-14"/>
-              <era type="146" start="1308-10-9"/>
-              <era type="147" start="1311-4-28"/>
-              <era type="148" start="1312-3-20"/>
-              <era type="149" start="1317-2-3"/>
-              <era type="150" start="1319-4-28"/>
-              <era type="151" start="1321-2-23"/>
-              <era type="152" start="1324-12-9"/>
-              <era type="153" start="1326-4-26"/>
-              <era type="154" start="1329-8-29"/>
-              <era type="155" start="1331-8-9"/>
-              <era type="156" start="1334-1-29"/>
-              <era type="157" start="1336-2-29"/>
-              <era type="158" start="1340-4-28"/>
-              <era type="159" start="1346-12-8"/>
-              <era type="160" start="1370-7-24"/>
-              <era type="161" start="1372-4-1"/>
-              <era type="162" start="1375-5-27"/>
-              <era type="163" start="1379-3-22"/>
-              <era type="164" start="1381-2-10"/>
-              <era type="165" start="1384-4-28"/>
-              <era type="166" start="1384-2-27"/>
-              <era type="167" start="1387-8-23"/>
-              <era type="168" start="1389-2-9"/>
-              <era type="169" start="1390-3-26"/>
-              <era type="170" start="1394-7-5"/>
-              <era type="171" start="1428-4-27"/>
-              <era type="172" start="1429-9-5"/>
-              <era type="173" start="1441-2-17"/>
-              <era type="174" start="1444-2-5"/>
-              <era type="175" start="1449-7-28"/>
-              <era type="176" start="1452-7-25"/>
-              <era type="177" start="1455-7-25"/>
-              <era type="178" start="1457-9-28"/>
-              <era type="179" start="1460-12-21"/>
-              <era type="180" start="1466-2-28"/>
-              <era type="181" start="1467-3-3"/>
-              <era type="182" start="1469-4-28"/>
-              <era type="183" start="1487-7-29"/>
-              <era type="184" start="1489-8-21"/>
-              <era type="185" start="1492-7-19"/>
-              <era type="186" start="1501-2-29"/>
-              <era type="187" start="1504-2-30"/>
-              <era type="188" start="1521-8-23"/>
-              <era type="189" start="1528-8-20"/>
-              <era type="190" start="1532-7-29"/>
-              <era type="191" start="1555-10-23"/>
-              <era type="192" start="1558-2-28"/>
-              <era type="193" start="1570-4-23"/>
-              <era type="194" start="1573-7-28"/>
-              <era type="195" start="1592-12-8"/>
-              <era type="196" start="1596-10-27"/>
-              <era type="197" start="1615-7-13"/>
-              <era type="198" start="1624-2-30"/>
-              <era type="199" start="1644-12-16"/>
-              <era type="200" start="1648-2-15"/>
-              <era type="201" start="1652-9-18"/>
-              <era type="202" start="1655-4-13"/>
-              <era type="203" start="1658-7-23"/>
-              <era type="204" start="1661-4-25"/>
-              <era type="205" start="1673-9-21"/>
-              <era type="206" start="1681-9-29"/>
-              <era type="207" start="1684-2-21"/>
-              <era type="208" start="1688-9-30"/>
-              <era type="209" start="1704-3-13"/>
-              <era type="210" start="1711-4-25"/>
-              <era type="211" start="1716-6-22"/>
-              <era type="212" start="1736-4-28"/>
-              <era type="213" start="1741-2-27"/>
-              <era type="214" start="1744-2-21"/>
-              <era type="215" start="1748-7-12"/>
-              <era type="216" start="1751-10-27"/>
-              <era type="217" start="1764-6-2"/>
-              <era type="218" start="1772-11-16"/>
-              <era type="219" start="1781-4-2"/>
-              <era type="220" start="1789-1-25"/>
-              <era type="221" start="1801-2-5"/>
-              <era type="222" start="1804-2-11"/>
-              <era type="223" start="1818-4-22"/>
-              <era type="224" start="1830-12-10"/>
-              <era type="225" start="1844-12-2"/>
-              <era type="226" start="1848-2-28"/>
-              <era type="227" start="1854-11-27"/>
-              <era type="228" start="1860-3-18"/>
-              <era type="229" start="1861-2-19"/>
-              <era type="230" start="1864-2-20"/>
-              <era type="231" start="1865-4-7"/>
-              <era type="232" start="1868-9-8"/>
-              <era type="233" start="1912-7-30"/>
-              <era type="234" start="1926-12-25"/>
-              <era type="235" start="1989-1-8"/>
-          </eras>
-        </calendar>
-        <calendar type="islamic-civil">
-          <calendarSystem type="lunar" />
-          <eras>
-              <era type="0" start="622-7-15"/>
-          </eras>
-        </calendar>
-        <calendar type="islamic">
-          <calendarSystem type="lunar" />
-          <eras>
-              <era type="0" start="622-7-15"/>
-          </eras>
-        </calendar>
-        <calendar type="chinese">
-          <calendarSystem type="lunisolar"/>
-          <eras>
-              <era type="0" start="-2636"/>
-          </eras>
-        </calendar>
-        <calendar type="hebrew">
-          <calendarSystem type="lunisolar"/>
-          <eras>
-              <era type="0" start="-3760-10-7"/>
-          </eras>
-        </calendar>
-        <calendar type="buddhist">
-          <calendarSystem type="solar" />
-          <eras>
-              <era type="0" start="-542"/>
-          </eras>
-        </calendar>
-        <calendar type="coptic"/>
-        <calendar type="persian">
-          <calendarSystem type="solar"/>
-          <eras>
-              <era type="0" start="622"/>
-          </eras>
-        </calendar>
-        <calendar type="ethiopic"/>
-        <calendar type="indian">
-          <eras>
-              <era type="0" start="79"/>
-          </eras>
-        </calendar>
-        <calendar type="roc">
-          <eras>
-              <era type="0" end="1911"/>
-              <era type="1" start="1912"/>
-          </eras>
-        </calendar>
-
-    </calendarData>
-
-    <calendarPreferenceData>
-        <calendarPreference territories="001" ordering="gregorian"/>
-        <calendarPreference territories="AE BH DJ DZ EH ER IQ JO KM KW LB LY MA MR OM PS QA SA SD SY TD TN YE" ordering="gregorian islamic islamic-civil"/>
-        <calendarPreference territories="AF IR" ordering="gregorian persian islamic islamic-civil"/>
-        <calendarPreference territories="CN CX HK MO SG" ordering="gregorian chinese"/>
-        <calendarPreference territories="EG" ordering="gregorian coptic islamic islamic-civil"/>
-        <calendarPreference territories="ET" ordering="gregorian ethiopic"/>
-        <calendarPreference territories="IL" ordering="gregorian hebrew islamic islamic-civil"/>
-        <calendarPreference territories="IN" ordering="gregorian indian"/>
-        <calendarPreference territories="JP" ordering="gregorian japanese"/>
-        <calendarPreference territories="TH" ordering="buddhist gregorian"/>
-        <calendarPreference territories="TW" ordering="gregorian roc chinese"/>
-    </calendarPreferenceData>
-
-    <weekData>
-          <minDays count="4" territories="001" />
-
-          <firstDay day="mon"  territories="001" />
-          <firstDay day="fri"  territories="MV" />
-          <firstDay day="sat"  territories="AF BH DJ DZ EG ER ET IQ IR JO KE KW LY MA OM QA SA SD SO TN YE" />
-          <firstDay day="sun"  territories="AS AZ BW CA CN FO GE GL GU HK IE IL IN IS JM JP KG KR LA MH MN MO MP MT NZ PH PK SG SY TH TT TW UM US UZ VI ZW" />
-
-          <weekendStart day="thu"  territories="DZ KW OM SA SD YE AF IR"/>
-          <weekendStart day="fri"  territories="AE BH EG IL IQ JO LY MA QA SY TN"/>
-          <weekendStart day="sat"  territories="001"/>
-          <weekendStart day="sun"  territories="IN"/>
-
-          <weekendEnd day="fri"  territories="DZ KW OM SA SD YE AF IR"/>
-          <weekendEnd day="sat"  territories="AE BH EG IL IQ JO LY MA QA SY TN"/>
-          <weekendEnd day="sun"  territories="001"/>
-    </weekData>
-
-    <measurementData>
-          <measurementSystem type="metric"  territories="001"/>
-          <measurementSystem type="US"  territories="LR MM US"/>
-          <paperSize type="A4"  territories="001"/>
-          <paperSize type="US-Letter"  territories="CA CL CO MX PH PR US VE"/>
-    </measurementData>
-    <timezoneData>
-        <mapTimezones type="windows">
-            <mapZone other="AUS Central Standard Time" type="Australia/Darwin"/>
-            <mapZone other="AUS Eastern Standard Time" type="Australia/Sydney"/>
-            <mapZone other="Afghanistan Standard Time" type="Asia/Kabul"/>
-            <mapZone other="Alaskan Standard Time" type="America/Anchorage"/>
-            <mapZone other="Arab Standard Time" type="Asia/Riyadh"/>
-            <mapZone other="Arabian Standard Time" type="Asia/Dubai"/>
-            <mapZone other="Arabic Standard Time" type="Asia/Baghdad"/>
-            <mapZone other="Argentina Standard Time" type="America/Buenos_Aires"/>
-            <mapZone other="Armenian Standard Time" type="Asia/Yerevan"/>
-            <mapZone other="Atlantic Standard Time" type="America/Halifax"/>
-            <mapZone other="Azerbaijan Standard Time" type="Asia/Baku"/>
-            <mapZone other="Azores Standard Time" type="Atlantic/Azores"/>
-            <mapZone other="Canada Central Standard Time" type="America/Regina"/>
-            <mapZone other="Cape Verde Standard Time" type="Atlantic/Cape_Verde"/>
-            <mapZone other="Caucasus Standard Time" type="Asia/Yerevan"/>
-            <mapZone other="Cen. Australia Standard Time" type="Australia/Adelaide"/>
-            <mapZone other="Central America Standard Time" type="America/Guatemala"/>
-            <mapZone other="Central Asia Standard Time" type="Asia/Dhaka"/>
-            <mapZone other="Central Brazilian Standard Time" type="America/Manaus"/>
-            <mapZone other="Central Europe Standard Time" type="Europe/Budapest"/>
-            <mapZone other="Central European Standard Time" type="Europe/Warsaw"/>
-            <mapZone other="Central Pacific Standard Time" type="Pacific/Guadalcanal"/>
-            <mapZone other="Central Standard Time" type="America/Chicago"/>
-            <mapZone other="Central Standard Time (Mexico)" type="America/Mexico_City"/>
-            <mapZone other="China Standard Time" type="Asia/Shanghai"/>
-            <mapZone other="Dateline Standard Time" type="Etc/GMT+12"/>
-            <mapZone other="E. Africa Standard Time" type="Africa/Nairobi"/>
-            <mapZone other="E. Australia Standard Time" type="Australia/Brisbane"/>
-            <mapZone other="E. Europe Standard Time" type="Europe/Minsk"/>
-            <mapZone other="E. South America Standard Time" type="America/Sao_Paulo"/>
-            <mapZone other="Eastern Standard Time" type="America/New_York"/>
-            <mapZone other="Egypt Standard Time" type="Africa/Cairo"/>
-            <mapZone other="Ekaterinburg Standard Time" type="Asia/Yekaterinburg"/>
-            <mapZone other="FLE Standard Time" type="Europe/Kiev"/>
-            <mapZone other="Fiji Standard Time" type="Pacific/Fiji"/>
-            <mapZone other="GMT Standard Time" type="Europe/London"/>
-            <mapZone other="GTB Standard Time" type="Europe/Istanbul"/>
-            <mapZone other="Georgian Standard Time" type="Etc/GMT-3"/>
-            <mapZone other="Greenland Standard Time" type="America/Godthab"/>
-            <mapZone other="Greenwich Standard Time" type="Atlantic/Reykjavik"/>
-            <mapZone other="Hawaiian Standard Time" type="Pacific/Honolulu"/>
-            <mapZone other="India Standard Time" type="Asia/Calcutta"/>
-            <mapZone other="Iran Standard Time" type="Asia/Tehran"/>
-            <mapZone other="Israel Standard Time" type="Asia/Jerusalem"/>
-            <mapZone other="Jordan Standard Time" type="Asia/Amman"/>
-            <mapZone other="Korea Standard Time" type="Asia/Seoul"/>
-            <mapZone other="Mauritius Standard Time" type="Indian/Mauritius"/>
-            <mapZone other="Mexico Standard Time" type="America/Mexico_City"/>
-            <mapZone other="Mexico Standard Time 2" type="America/Chihuahua"/>
-            <mapZone other="Mid-Atlantic Standard Time" type="Atlantic/South_Georgia"/>
-            <mapZone other="Middle East Standard Time" type="Asia/Beirut"/>
-            <mapZone other="Montevideo Standard Time" type="America/Montevideo"/>
-            <mapZone other="Morocco Standard Time" type="Africa/Casablanca"/>
-            <mapZone other="Mountain Standard Time" type="America/Denver"/>
-            <mapZone other="Mountain Standard Time (Mexico)" type="America/Chihuahua"/>
-            <mapZone other="Myanmar Standard Time" type="Asia/Rangoon"/>
-            <mapZone other="N. Central Asia Standard Time" type="Asia/Novosibirsk"/>
-            <mapZone other="Namibia Standard Time" type="Africa/Windhoek"/>
-            <mapZone other="Nepal Standard Time" type="Asia/Katmandu"/>
-            <mapZone other="New Zealand Standard Time" type="Pacific/Auckland"/>
-            <mapZone other="Newfoundland Standard Time" type="America/St_Johns"/>
-            <mapZone other="North Asia East Standard Time" type="Asia/Irkutsk"/>
-            <mapZone other="North Asia Standard Time" type="Asia/Krasnoyarsk"/>
-            <mapZone other="Pacific SA Standard Time" type="America/Santiago"/>
-            <mapZone other="Pacific Standard Time" type="America/Los_Angeles"/>
-            <mapZone other="Pacific Standard Time (Mexico)" type="America/Tijuana"/>
-            <mapZone other="Pakistan Standard Time" type="Asia/Karachi"/>
-            <mapZone other="Romance Standard Time" type="Europe/Paris"/>
-            <mapZone other="Russian Standard Time" type="Europe/Moscow"/>
-            <mapZone other="SA Eastern Standard Time" type="Etc/GMT+3"/>
-            <mapZone other="SA Pacific Standard Time" type="America/Bogota"/>
-            <mapZone other="SA Western Standard Time" type="America/La_Paz"/>
-            <mapZone other="SE Asia Standard Time" type="Asia/Bangkok"/>
-            <mapZone other="Samoa Standard Time" type="Pacific/Apia"/>
-            <mapZone other="Singapore Standard Time" type="Asia/Singapore"/>
-            <mapZone other="South Africa Standard Time" type="Africa/Johannesburg"/>
-            <mapZone other="Sri Lanka Standard Time" type="Asia/Colombo"/>
-            <mapZone other="Taipei Standard Time" type="Asia/Taipei"/>
-            <mapZone other="Tasmania Standard Time" type="Australia/Hobart"/>
-            <mapZone other="Tokyo Standard Time" type="Asia/Tokyo"/>
-            <mapZone other="Tonga Standard Time" type="Pacific/Tongatapu"/>
-            <mapZone other="US Eastern Standard Time" type="Etc/GMT+5"/>
-            <mapZone other="US Mountain Standard Time" type="America/Phoenix"/>
-            <mapZone other="Venezuela Standard Time" type="America/Caracas"/>
-            <mapZone other="Vladivostok Standard Time" type="Asia/Vladivostok"/>
-            <mapZone other="W. Australia Standard Time" type="Australia/Perth"/>
-            <mapZone other="W. Central Africa Standard Time" type="Africa/Lagos"/>
-            <mapZone other="W. Europe Standard Time" type="Europe/Berlin"/>
-            <mapZone other="West Asia Standard Time" type="Asia/Tashkent"/>
-            <mapZone other="West Pacific Standard Time" type="Pacific/Port_Moresby"/>
-            <mapZone other="Yakutsk Standard Time" type="Asia/Yakutsk"/>
-        </mapTimezones>
-        <mapTimezones type="metazones">
-            <mapZone other="Acre" territory="001" type="America/Rio_Branco"/>
-            <mapZone other="Afghanistan" territory="001" type="Asia/Kabul"/>
-            <mapZone other="Africa_Central" territory="001" type="Africa/Maputo"/>
-            <mapZone other="Africa_Central" territory="BI" type="Africa/Bujumbura"/>
-            <mapZone other="Africa_Central" territory="BW" type="Africa/Gaborone"/>
-            <mapZone other="Africa_Central" territory="CD" type="Africa/Lubumbashi"/>
-            <mapZone other="Africa_Central" territory="MW" type="Africa/Blantyre"/>
-            <mapZone other="Africa_Central" territory="RW" type="Africa/Kigali"/>
-            <mapZone other="Africa_Central" territory="ZM" type="Africa/Lusaka"/>
-            <mapZone other="Africa_Central" territory="ZW" type="Africa/Harare"/>
-            <mapZone other="Africa_Eastern" territory="001" type="Africa/Nairobi"/>
-            <mapZone other="Africa_Eastern" territory="DJ" type="Africa/Djibouti"/>
-            <mapZone other="Africa_Eastern" territory="ER" type="Africa/Asmera"/>
-            <mapZone other="Africa_Eastern" territory="ET" type="Africa/Addis_Ababa"/>
-            <mapZone other="Africa_Eastern" territory="KM" type="Indian/Comoro"/>
-            <mapZone other="Africa_Eastern" territory="MG" type="Indian/Antananarivo"/>
-            <mapZone other="Africa_Eastern" territory="SO" type="Africa/Mogadishu"/>
-            <mapZone other="Africa_Eastern" territory="TZ" type="Africa/Dar_es_Salaam"/>
-            <mapZone other="Africa_Eastern" territory="UG" type="Africa/Kampala"/>
-            <mapZone other="Africa_Eastern" territory="YT" type="Indian/Mayotte"/>
-            <mapZone other="Africa_FarWestern" territory="001" type="Africa/El_Aaiun"/>
-            <mapZone other="Africa_FarWestern" territory="GW" type="Africa/Bissau"/>
-            <mapZone other="Africa_Southern" territory="001" type="Africa/Johannesburg"/>
-            <mapZone other="Africa_Southern" territory="LS" type="Africa/Maseru"/>
-            <mapZone other="Africa_Southern" territory="SZ" type="Africa/Mbabane"/>
-            <mapZone other="Africa_Western" territory="001" type="Africa/Lagos"/>
-            <mapZone other="Africa_Western" territory="AO" type="Africa/Luanda"/>
-            <mapZone other="Africa_Western" territory="BJ" type="Africa/Porto-Novo"/>
-            <mapZone other="Africa_Western" territory="CD" type="Africa/Kinshasa"/>
-            <mapZone other="Africa_Western" territory="CF" type="Africa/Bangui"/>
-            <mapZone other="Africa_Western" territory="CG" type="Africa/Brazzaville"/>
-            <mapZone other="Africa_Western" territory="CM" type="Africa/Douala"/>
-            <mapZone other="Africa_Western" territory="GA" type="Africa/Libreville"/>
-            <mapZone other="Africa_Western" territory="GQ" type="Africa/Malabo"/>
-            <mapZone other="Africa_Western" territory="NE" type="Africa/Niamey"/>
-            <mapZone other="Africa_Western" territory="TD" type="Africa/Ndjamena"/>
-            <mapZone other="Aktyubinsk" territory="001" type="Asia/Aqtobe"/>
-            <mapZone other="Alaska" territory="001" type="America/Juneau"/>
-            <mapZone other="Alaska_Hawaii" territory="001" type="America/Anchorage"/>
-            <mapZone other="Almaty" territory="001" type="Asia/Almaty"/>
-            <mapZone other="Amazon" territory="001" type="America/Manaus"/>
-            <mapZone other="America_Central" territory="001" type="America/Chicago"/>
-            <mapZone other="America_Central" territory="BZ" type="America/Belize"/>
-            <mapZone other="America_Central" territory="CA" type="America/Winnipeg"/>
-            <mapZone other="America_Central" territory="CR" type="America/Costa_Rica"/>
-            <mapZone other="America_Central" territory="GT" type="America/Guatemala"/>
-            <mapZone other="America_Central" territory="HN" type="America/Tegucigalpa"/>
-            <mapZone other="America_Central" territory="MX" type="America/Mexico_City"/>
-            <mapZone other="America_Central" territory="SV" type="America/El_Salvador"/>
-            <mapZone other="America_Eastern" territory="001" type="America/New_York"/>
-            <mapZone other="America_Eastern" territory="BS" type="America/Nassau"/>
-            <mapZone other="America_Eastern" territory="CA" type="America/Toronto"/>
-            <mapZone other="America_Eastern" territory="HT" type="America/Port-au-Prince"/>
-            <mapZone other="America_Eastern" territory="JM" type="America/Jamaica"/>
-            <mapZone other="America_Eastern" territory="KY" type="America/Cayman"/>
-            <mapZone other="America_Eastern" territory="PA" type="America/Panama"/>
-            <mapZone other="America_Eastern" territory="TC" type="America/Grand_Turk"/>
-            <mapZone other="America_Mountain" territory="001" type="America/Denver"/>
-            <mapZone other="America_Mountain" territory="CA" type="America/Edmonton"/>
-            <mapZone other="America_Mountain" territory="MX" type="America/Hermosillo"/>
-            <mapZone other="America_Pacific" territory="001" type="America/Los_Angeles"/>
-            <mapZone other="America_Pacific" territory="CA" type="America/Vancouver"/>
-            <mapZone other="America_Pacific" territory="MX" type="America/Tijuana"/>
-            <mapZone other="Anadyr" territory="001" type="Asia/Anadyr"/>
-            <mapZone other="Aqtau" territory="001" type="Asia/Aqtau"/>
-            <mapZone other="Aqtobe" territory="001" type="Asia/Aqtobe"/>
-            <mapZone other="Arabian" territory="001" type="Asia/Riyadh"/>
-            <mapZone other="Arabian" territory="BH" type="Asia/Bahrain"/>
-            <mapZone other="Arabian" territory="IQ" type="Asia/Baghdad"/>
-            <mapZone other="Arabian" territory="KW" type="Asia/Kuwait"/>
-            <mapZone other="Arabian" territory="QA" type="Asia/Qatar"/>
-            <mapZone other="Arabian" territory="YE" type="Asia/Aden"/>
-            <mapZone other="Argentina" territory="001" type="America/Buenos_Aires"/>
-            <mapZone other="Argentina_Western" territory="001" type="America/Mendoza"/>
-            <mapZone other="Armenia" territory="001" type="Asia/Yerevan"/>
-            <mapZone other="Ashkhabad" territory="001" type="Asia/Ashgabat"/>
-            <mapZone other="Atlantic" territory="001" type="America/Halifax"/>
-            <mapZone other="Atlantic" territory="AG" type="America/Antigua"/>
-            <mapZone other="Atlantic" territory="AI" type="America/Anguilla"/>
-            <mapZone other="Atlantic" territory="AN" type="America/Curacao"/>
-            <mapZone other="Atlantic" territory="AW" type="America/Aruba"/>
-            <mapZone other="Atlantic" territory="BB" type="America/Barbados"/>
-            <mapZone other="Atlantic" territory="BM" type="America/Bermuda"/>
-            <mapZone other="Atlantic" territory="DM" type="America/Dominica"/>
-            <mapZone other="Atlantic" territory="GD" type="America/Grenada"/>
-            <mapZone other="Atlantic" territory="GL" type="America/Thule"/>
-            <mapZone other="Atlantic" territory="GP" type="America/Guadaloupe"/>
-            <mapZone other="Atlantic" territory="KN" type="America/St_Kitts"/>
-            <mapZone other="Atlantic" territory="LC" type="America/St_Lucia"/>
-            <mapZone other="Atlantic" territory="MQ" type="America/Martinique"/>
-            <mapZone other="Atlantic" territory="MS" type="America/Montserrat"/>
-            <mapZone other="Atlantic" territory="PR" type="America/Puerto_Rico"/>
-            <mapZone other="Atlantic" territory="TT" type="America/Port_of_Spain"/>
-            <mapZone other="Atlantic" territory="VC" type="America/St_Vincent"/>
-            <mapZone other="Atlantic" territory="VG" type="America/Tortola"/>
-            <mapZone other="Atlantic" territory="VI" type="America/St_Thomas"/>
-            <mapZone other="Australia_Central" territory="001" type="Australia/Adelaide"/>
-            <mapZone other="Australia_CentralWestern" territory="001" type="Australia/Eucla"/>
-            <mapZone other="Australia_Eastern" territory="001" type="Australia/Sydney"/>
-            <mapZone other="Australia_Western" territory="001" type="Australia/Perth"/>
-            <mapZone other="Azerbaijan" territory="001" type="Asia/Baku"/>
-            <mapZone other="Azores" territory="001" type="Atlantic/Azores"/>
-            <mapZone other="Baku" territory="001" type="Asia/Baku"/>
-            <mapZone other="Bangladesh" territory="001" type="Asia/Dhaka"/>
-            <mapZone other="Bering" territory="001" type="America/Adak"/>
-            <mapZone other="Bhutan" territory="001" type="Asia/Thimphu"/>
-            <mapZone other="Bolivia" territory="001" type="America/La_Paz"/>
-            <mapZone other="Borneo" territory="001" type="Asia/Kuching"/>
-            <mapZone other="Brasilia" territory="001" type="America/Sao_Paulo"/>
-            <mapZone other="British" territory="001" type="Europe/London"/>
-            <mapZone other="Brunei" territory="001" type="Asia/Brunei"/>
-            <mapZone other="Cape_Verde" territory="001" type="Atlantic/Cape_Verde"/>
-            <mapZone other="Chamorro" territory="001" type="Pacific/Saipan"/>
-            <mapZone other="Chamorro" territory="GU" type="Pacific/Guam"/>
-            <mapZone other="Changbai" territory="001" type="Asia/Harbin"/>
-            <mapZone other="Chatham" territory="001" type="Pacific/Chatham"/>
-            <mapZone other="Chile" territory="001" type="America/Santiago"/>
-            <mapZone other="Chile" territory="AQ" type="Antarctica/Palmer"/>
-            <mapZone other="China" territory="001" type="Asia/Shanghai"/>
-            <mapZone other="China" territory="MO" type="Asia/Macau"/>
-            <mapZone other="Choibalsan" territory="001" type="Asia/Choibalsan"/>
-            <mapZone other="Christmas" territory="001" type="Indian/Christmas"/>
-            <mapZone other="Cocos" territory="001" type="Indian/Cocos"/>
-            <mapZone other="Colombia" territory="001" type="America/Bogota"/>
-            <mapZone other="Cook" territory="001" type="Pacific/Rarotonga"/>
-            <mapZone other="Cuba" territory="001" type="America/Havana"/>
-            <mapZone other="Dacca" territory="001" type="Asia/Dhaka"/>
-            <mapZone other="Davis" territory="001" type="Antarctica/Davis"/>
-            <mapZone other="Dominican" territory="001" type="America/Santo_Domingo"/>
-            <mapZone other="DumontDUrville" territory="001" type="Antarctica/DumontDUrville"/>
-            <mapZone other="Dushanbe" territory="001" type="Asia/Dushanbe"/>
-            <mapZone other="Dutch_Guiana" territory="001" type="America/Paramaribo"/>
-            <mapZone other="East_Timor" territory="001" type="Asia/Dili"/>
-            <mapZone other="Easter" territory="001" type="Pacific/Easter"/>
-            <mapZone other="Ecuador" territory="001" type="America/Guayaquil"/>
-            <mapZone other="Europe_Central" territory="001" type="Europe/Paris"/>
-            <mapZone other="Europe_Central" territory="AD" type="Europe/Andorra"/>
-            <mapZone other="Europe_Central" territory="AL" type="Europe/Tirane"/>
-            <mapZone other="Europe_Central" territory="AT" type="Europe/Vienna"/>
-            <mapZone other="Europe_Central" territory="BA" type="Europe/Sarajevo"/>
-            <mapZone other="Europe_Central" territory="BE" type="Europe/Brussels"/>
-            <mapZone other="Europe_Central" territory="CH" type="Europe/Zurich"/>
-            <mapZone other="Europe_Central" territory="CZ" type="Europe/Prague"/>
-            <mapZone other="Europe_Central" territory="DE" type="Europe/Berlin"/>
-            <mapZone other="Europe_Central" territory="DK" type="Europe/Copenhagen"/>
-            <mapZone other="Europe_Central" territory="ES" type="Europe/Madrid"/>
-            <mapZone other="Europe_Central" territory="GI" type="Europe/Gibraltar"/>
-            <mapZone other="Europe_Central" territory="HR" type="Europe/Zagreb"/>
-            <mapZone other="Europe_Central" territory="HU" type="Europe/Budapest"/>
-            <mapZone other="Europe_Central" territory="IT" type="Europe/Rome"/>
-            <mapZone other="Europe_Central" territory="LI" type="Europe/Vaduz"/>
-            <mapZone other="Europe_Central" territory="LU" type="Europe/Luxembourg"/>
-            <mapZone other="Europe_Central" territory="MC" type="Europe/Monaco"/>
-            <mapZone other="Europe_Central" territory="ME" type="Europe/Podgorica"/>
-            <mapZone other="Europe_Central" territory="MK" type="Europe/Skopje"/>
-            <mapZone other="Europe_Central" territory="MT" type="Europe/Malta"/>
-            <mapZone other="Europe_Central" territory="NL" type="Europe/Amsterdam"/>
-            <mapZone other="Europe_Central" territory="NO" type="Europe/Oslo"/>
-            <mapZone other="Europe_Central" territory="PL" type="Europe/Warsaw"/>
-            <mapZone other="Europe_Central" territory="RS" type="Europe/Belgrade"/>
-            <mapZone other="Europe_Central" territory="SE" type="Europe/Stockholm"/>
-            <mapZone other="Europe_Central" territory="SI" type="Europe/Ljubljana"/>
-            <mapZone other="Europe_Central" territory="SK" type="Europe/Bratislava"/>
-            <mapZone other="Europe_Central" territory="TN" type="Africa/Tunis"/>
-            <mapZone other="Europe_Eastern" territory="001" type="Europe/Bucharest"/>
-            <mapZone other="Europe_Eastern" territory="BG" type="Europe/Sofia"/>
-            <mapZone other="Europe_Eastern" territory="CY" type="Asia/Nicosia"/>
-            <mapZone other="Europe_Eastern" territory="EG" type="Africa/Cairo"/>
-            <mapZone other="Europe_Eastern" territory="FI" type="Europe/Helsinki"/>
-            <mapZone other="Europe_Eastern" territory="GR" type="Europe/Athens"/>
-            <mapZone other="Europe_Eastern" territory="JO" type="Asia/Amman"/>
-            <mapZone other="Europe_Eastern" territory="LB" type="Asia/Beirut"/>
-            <mapZone other="Europe_Eastern" territory="SY" type="Asia/Damascus"/>
-            <mapZone other="Europe_Western" territory="001" type="Atlantic/Canary"/>
-            <mapZone other="Europe_Western" territory="FO" type="Atlantic/Faeroe"/>
-            <mapZone other="Falkland" territory="001" type="Atlantic/Stanley"/>
-            <mapZone other="Fiji" territory="001" type="Pacific/Fiji"/>
-            <mapZone other="French_Guiana" territory="001" type="America/Cayenne"/>
-            <mapZone other="French_Southern" territory="001" type="Indian/Kerguelen"/>
-            <mapZone other="Frunze" territory="001" type="Asia/Bishkek"/>
-            <mapZone other="Gambier" territory="001" type="Pacific/Gambier"/>
-            <mapZone other="GMT" territory="001" type="Atlantic/Reykjavik"/>
-            <mapZone other="GMT" territory="BF" type="Africa/Ouagadougou"/>
-            <mapZone other="GMT" territory="CI" type="Africa/Abidjan"/>
-            <mapZone other="GMT" territory="GB" type="Europe/London"/>
-            <mapZone other="GMT" territory="GH" type="Africa/Accra"/>
-            <mapZone other="GMT" territory="GM" type="Africa/Banjul"/>
-            <mapZone other="GMT" territory="GN" type="Africa/Conakry"/>
-            <mapZone other="GMT" territory="GW" type="Africa/Bissau"/>
-            <mapZone other="GMT" territory="IE" type="Europe/Dublin"/>
-            <mapZone other="GMT" territory="LR" type="Africa/Monrovia"/>
-            <mapZone other="GMT" territory="ML" type="Africa/Bamako"/>
-            <mapZone other="GMT" territory="MR" type="Africa/Nouakchott"/>
-            <mapZone other="GMT" territory="SH" type="Atlantic/St_Helena"/>
-            <mapZone other="GMT" territory="SL" type="Africa/Freetown"/>
-            <mapZone other="GMT" territory="SN" type="Africa/Dakar"/>
-            <mapZone other="GMT" territory="ST" type="Africa/Sao_Tome"/>
-            <mapZone other="GMT" territory="TG" type="Africa/Lome"/>
-            <mapZone other="Galapagos" territory="001" type="Pacific/Galapagos"/>
-            <mapZone other="Georgia" territory="001" type="Asia/Tbilisi"/>
-            <mapZone other="Gilbert_Islands" territory="001" type="Pacific/Tarawa"/>
-            <mapZone other="Goose_Bay" territory="001" type="America/Goose_Bay"/>
-            <mapZone other="Greenland_Central" territory="001" type="America/Scoresbysund"/>
-            <mapZone other="Greenland_Eastern" territory="001" type="America/Scoresbysund"/>
-            <mapZone other="Greenland_Western" territory="001" type="America/Godthab"/>
-            <mapZone other="Guam" territory="001" type="Pacific/Guam"/>
-            <mapZone other="Gulf" territory="001" type="Asia/Dubai"/>
-            <mapZone other="Gulf" territory="OM" type="Asia/Muscat"/>
-            <mapZone other="Guyana" territory="001" type="America/Guyana"/>
-            <mapZone other="Hawaii_Aleutian" territory="001" type="Pacific/Honolulu"/>
-            <mapZone other="Hong_Kong" territory="001" type="Asia/Hong_Kong"/>
-            <mapZone other="Hovd" territory="001" type="Asia/Hovd"/>
-            <mapZone other="India" territory="001" type="Asia/Calcutta"/>
-            <mapZone other="India" territory="LK" type="Asia/Colombo"/>
-            <mapZone other="Indian_Ocean" territory="001" type="Indian/Chagos"/>
-            <mapZone other="Indochina" territory="001" type="Asia/Saigon"/>
-            <mapZone other="Indochina" territory="KH" type="Asia/Phnom_Penh"/>
-            <mapZone other="Indochina" territory="LA" type="Asia/Vientiane"/>
-            <mapZone other="Indochina" territory="TH" type="Asia/Bangkok"/>
-            <mapZone other="Indonesia_Central" territory="001" type="Asia/Makassar"/>
-            <mapZone other="Indonesia_Eastern" territory="001" type="Asia/Jayapura"/>
-            <mapZone other="Indonesia_Western" territory="001" type="Asia/Jakarta"/>
-            <mapZone other="Iran" territory="001" type="Asia/Tehran"/>
-            <mapZone other="Irkutsk" territory="001" type="Asia/Irkutsk"/>
-            <mapZone other="Irish" territory="001" type="Europe/Dublin"/>
-            <mapZone other="Israel" territory="001" type="Asia/Jerusalem"/>
-            <mapZone other="Japan" territory="001" type="Asia/Tokyo"/>
-            <mapZone other="Kamchatka" territory="001" type="Asia/Kamchatka"/>
-            <mapZone other="Karachi" territory="001" type="Asia/Karachi"/>
-            <mapZone other="Kashgar" territory="001" type="Asia/Kashgar"/>
-            <mapZone other="Kazakhstan_Eastern" territory="001" type="Asia/Almaty"/>
-            <mapZone other="Kazakhstan_Western" territory="001" type="Asia/Aqtobe"/>
-            <mapZone other="Kizilorda" territory="001" type="Asia/Qyzylorda"/>
-            <mapZone other="Korea" territory="001" type="Asia/Seoul"/>
-            <mapZone other="Korea" territory="KP" type="Asia/Pyongyang"/>
-            <mapZone other="Kosrae" territory="001" type="Pacific/Kosrae"/>
-            <mapZone other="Krasnoyarsk" territory="001" type="Asia/Krasnoyarsk"/>
-            <mapZone other="Kuybyshev" territory="001" type="Europe/Samara"/>
-            <mapZone other="Kwajalein" territory="001" type="Pacific/Kwajalein"/>
-            <mapZone other="Kyrgystan" territory="001" type="Asia/Bishkek"/>
-            <mapZone other="Lanka" territory="001" type="Asia/Colombo"/>
-            <mapZone other="Liberia" territory="001" type="Africa/Monrovia"/>
-            <mapZone other="Line_Islands" territory="001" type="Pacific/Kiritimati"/>
-            <mapZone other="Long_Shu" territory="001" type="Asia/Chongqing"/>
-            <mapZone other="Lord_Howe" territory="001" type="Australia/Lord_Howe"/>
-            <mapZone other="Macau" territory="001" type="Asia/Macau"/>
-            <mapZone other="Magadan" territory="001" type="Asia/Magadan"/>
-            <mapZone other="Malaya" territory="001" type="Asia/Kuala_Lumpur"/>
-            <mapZone other="Malaysia" territory="001" type="Asia/Kuching"/>
-            <mapZone other="Maldives" territory="001" type="Indian/Maldives"/>
-            <mapZone other="Marquesas" territory="001" type="Pacific/Marquesas"/>
-            <mapZone other="Marshall_Islands" territory="001" type="Pacific/Majuro"/>
-            <mapZone other="Mauritius" territory="001" type="Indian/Mauritius"/>
-            <mapZone other="Mawson" territory="001" type="Antarctica/Mawson"/>
-            <mapZone other="Mongolia" territory="001" type="Asia/Ulaanbaatar"/>
-            <mapZone other="Moscow" territory="001" type="Europe/Moscow"/>
-            <mapZone other="Myanmar" territory="001" type="Asia/Rangoon"/>
-            <mapZone other="Nauru" territory="001" type="Pacific/Nauru"/>
-            <mapZone other="Nepal" territory="001" type="Asia/Katmandu"/>
-            <mapZone other="New_Caledonia" territory="001" type="Pacific/Noumea"/>
-            <mapZone other="New_Zealand" territory="001" type="Pacific/Auckland"/>
-            <mapZone other="New_Zealand" territory="AQ" type="Antarctica/McMurdo"/>
-            <mapZone other="Newfoundland" territory="001" type="America/St_Johns"/>
-            <mapZone other="Niue" territory="001" type="Pacific/Niue"/>
-            <mapZone other="Norfolk" territory="001" type="Pacific/Norfolk"/>
-            <mapZone other="North_Mariana" territory="001" type="Pacific/Saipan"/>
-            <mapZone other="Noronha" territory="001" type="America/Noronha"/>
-            <mapZone other="Novosibirsk" territory="001" type="Asia/Novosibirsk"/>
-            <mapZone other="Omsk" territory="001" type="Asia/Omsk"/>
-            <mapZone other="Oral" territory="001" type="Asia/Oral"/>
-            <mapZone other="Pakistan" territory="001" type="Asia/Karachi"/>
-            <mapZone other="Palau" territory="001" type="Pacific/Palau"/>
-            <mapZone other="Papua_New_Guinea" territory="001" type="Pacific/Port_Moresby"/>
-            <mapZone other="Paraguay" territory="001" type="America/Asuncion"/>
-            <mapZone other="Peru" territory="001" type="America/Lima"/>
-            <mapZone other="Philippines" territory="001" type="Asia/Manila"/>
-            <mapZone other="Phoenix_Islands" territory="001" type="Pacific/Enderbury"/>
-            <mapZone other="Pierre_Miquelon" territory="001" type="America/Miquelon"/>
-            <mapZone other="Pitcairn" territory="001" type="Pacific/Pitcairn"/>
-            <mapZone other="Ponape" territory="001" type="Pacific/Ponape"/>
-            <mapZone other="Qyzylorda" territory="001" type="Asia/Qyzylorda"/>
-            <mapZone other="Reunion" territory="001" type="Indian/Reunion"/>
-            <mapZone other="Rothera" territory="001" type="Antarctica/Rothera"/>
-            <mapZone other="Sakhalin" territory="001" type="Asia/Sakhalin"/>
-            <mapZone other="Samara" territory="001" type="Europe/Samara"/>
-            <mapZone other="Samarkand" territory="001" type="Asia/Samarkand"/>
-            <mapZone other="Samoa" territory="001" type="Pacific/Apia"/>
-            <mapZone other="Seychelles" territory="001" type="Indian/Mahe"/>
-            <mapZone other="Shevchenko" territory="001" type="Asia/Aqtau"/>
-            <mapZone other="Singapore" territory="001" type="Asia/Singapore"/>
-            <mapZone other="Solomon" territory="001" type="Pacific/Guadalcanal"/>
-            <mapZone other="South_Georgia" territory="001" type="Atlantic/South_Georgia"/>
-            <mapZone other="Suriname" territory="001" type="America/Paramaribo"/>
-            <mapZone other="Sverdlovsk" territory="001" type="Asia/Yekaterinburg"/>
-            <mapZone other="Syowa" territory="001" type="Antarctica/Syowa"/>
-            <mapZone other="Tahiti" territory="001" type="Pacific/Tahiti"/>
-            <mapZone other="Taipei" territory="001" type="Asia/Taipei"/>
-            <mapZone other="Tajikistan" territory="001" type="Asia/Dushanbe"/>
-            <mapZone other="Tashkent" territory="001" type="Asia/Tashkent"/>
-            <mapZone other="Tbilisi" territory="001" type="Asia/Tbilisi"/>
-            <mapZone other="Tokelau" territory="001" type="Pacific/Fakaofo"/>
-            <mapZone other="Tonga" territory="001" type="Pacific/Tongatapu"/>
-            <mapZone other="Truk" territory="001" type="Pacific/Truk"/>
-            <mapZone other="Turkey" territory="001" type="Europe/Istanbul"/>
-            <mapZone other="Turkmenistan" territory="001" type="Asia/Ashgabat"/>
-            <mapZone other="Tuvalu" territory="001" type="Pacific/Funafuti"/>
-            <mapZone other="Uralsk" territory="001" type="Asia/Oral"/>
-            <mapZone other="Uruguay" territory="001" type="America/Montevideo"/>
-            <mapZone other="Urumqi" territory="001" type="Asia/Urumqi"/>
-            <mapZone other="Uzbekistan" territory="001" type="Asia/Tashkent"/>
-            <mapZone other="Vanuatu" territory="001" type="Pacific/Efate"/>
-            <mapZone other="Venezuela" territory="001" type="America/Caracas"/>
-            <mapZone other="Vladivostok" territory="001" type="Asia/Vladivostok"/>
-            <mapZone other="Volgograd" territory="001" type="Europe/Volgograd"/>
-            <mapZone other="Vostok" territory="001" type="Antarctica/Vostok"/>
-            <mapZone other="Wake" territory="001" type="Pacific/Wake"/>
-            <mapZone other="Wallis" territory="001" type="Pacific/Wallis"/>
-            <mapZone other="Yakutsk" territory="001" type="Asia/Yakutsk"/>
-            <mapZone other="Yekaterinburg" territory="001" type="Asia/Yekaterinburg"/>
-            <mapZone other="Yerevan" territory="001" type="Asia/Yerevan"/>
-            <mapZone other="Yukon" territory="001" type="America/Yakutat"/>
-        </mapTimezones>
-        <zoneFormatting multizone="001 AQ AR AU BR CA CD CL CN EC ES FM GL ID KI KZ MH MN MX MY NZ PF PT RU UA UM US UZ" tzidVersion="2009f">
-            <zoneItem type="Africa/Abidjan" territory="CI"/>
-            <zoneItem type="Africa/Accra" territory="GH"/>
-            <zoneItem type="Africa/Addis_Ababa" territory="ET"/>
-            <zoneItem type="Africa/Algiers" territory="DZ"/>
-            <zoneItem type="Africa/Asmera" territory="ER" aliases="Africa/Asmara"/>
-            <zoneItem type="Africa/Bamako" territory="ML" aliases="Africa/Timbuktu"/>
-            <zoneItem type="Africa/Bangui" territory="CF"/>
-            <zoneItem type="Africa/Banjul" territory="GM"/>
-            <zoneItem type="Africa/Bissau" territory="GW"/>
-            <zoneItem type="Africa/Blantyre" territory="MW"/>
-            <zoneItem type="Africa/Brazzaville" territory="CG"/>
-            <zoneItem type="Africa/Bujumbura" territory="BI"/>
-            <zoneItem type="Africa/Cairo" territory="EG" aliases="Egypt"/>
-            <zoneItem type="Africa/Casablanca" territory="MA"/>
-            <zoneItem type="Africa/Ceuta" territory="ES"/>
-            <zoneItem type="Africa/Conakry" territory="GN"/>
-            <zoneItem type="Africa/Dakar" territory="SN"/>
-            <zoneItem type="Africa/Dar_es_Salaam" territory="TZ"/>
-            <zoneItem type="Africa/Djibouti" territory="DJ"/>
-            <zoneItem type="Africa/Douala" territory="CM"/>
-            <zoneItem type="Africa/El_Aaiun" territory="EH"/>
-            <zoneItem type="Africa/Freetown" territory="SL"/>
-            <zoneItem type="Africa/Gaborone" territory="BW"/>
-            <zoneItem type="Africa/Harare" territory="ZW"/>
-            <zoneItem type="Africa/Johannesburg" territory="ZA"/>
-            <zoneItem type="Africa/Kampala" territory="UG"/>
-            <zoneItem type="Africa/Khartoum" territory="SD"/>
-            <zoneItem type="Africa/Kigali" territory="RW"/>
-            <zoneItem type="Africa/Kinshasa" territory="CD"/>
-            <zoneItem type="Africa/Lagos" territory="NG"/>
-            <zoneItem type="Africa/Libreville" territory="GA"/>
-            <zoneItem type="Africa/Lome" territory="TG"/>
-            <zoneItem type="Africa/Luanda" territory="AO"/>
-            <zoneItem type="Africa/Lubumbashi" territory="CD"/>
-            <zoneItem type="Africa/Lusaka" territory="ZM"/>
-            <zoneItem type="Africa/Malabo" territory="GQ"/>
-            <zoneItem type="Africa/Maputo" territory="MZ"/>
-            <zoneItem type="Africa/Maseru" territory="LS"/>
-            <zoneItem type="Africa/Mbabane" territory="SZ"/>
-            <zoneItem type="Africa/Mogadishu" territory="SO"/>
-            <zoneItem type="Africa/Monrovia" territory="LR"/>
-            <zoneItem type="Africa/Nairobi" territory="KE"/>
-            <zoneItem type="Africa/Ndjamena" territory="TD"/>
-            <zoneItem type="Africa/Niamey" territory="NE"/>
-            <zoneItem type="Africa/Nouakchott" territory="MR"/>
-            <zoneItem type="Africa/Ouagadougou" territory="BF"/>
-            <zoneItem type="Africa/Porto-Novo" territory="BJ"/>
-            <zoneItem type="Africa/Sao_Tome" territory="ST"/>
-            <zoneItem type="Africa/Tripoli" territory="LY" aliases="Libya"/>
-            <zoneItem type="Africa/Tunis" territory="TN"/>
-            <zoneItem type="Africa/Windhoek" territory="NA"/>
-            <zoneItem type="America/Adak" territory="US" aliases="America/Atka US/Aleutian"/>
-            <zoneItem type="America/Anchorage" territory="US" aliases="SystemV/YST9YDT US/Alaska"/>
-            <zoneItem type="America/Anguilla" territory="AI"/>
-            <zoneItem type="America/Antigua" territory="AG"/>
-            <zoneItem type="America/Araguaina" territory="BR"/>
-            <zoneItem type="America/Argentina/La_Rioja" territory="AR"/>
-            <zoneItem type="America/Argentina/Rio_Gallegos" territory="AR"/>
-            <zoneItem type="America/Argentina/Salta" territory="AR"/>
-            <zoneItem type="America/Argentina/San_Juan" territory="AR"/>
-            <zoneItem type="America/Argentina/San_Luis" territory="AR"/>
-            <zoneItem type="America/Argentina/Tucuman" territory="AR"/>
-            <zoneItem type="America/Argentina/Ushuaia" territory="AR"/>
-            <zoneItem type="America/Aruba" territory="AW"/>
-            <zoneItem type="America/Asuncion" territory="PY"/>
-            <zoneItem type="America/Bahia" territory="BR"/>
-            <zoneItem type="America/Barbados" territory="BB"/>
-            <zoneItem type="America/Belem" territory="BR"/>
-            <zoneItem type="America/Belize" territory="BZ"/>
-            <zoneItem type="America/Blanc-Sablon" territory="CA"/>
-            <zoneItem type="America/Boa_Vista" territory="BR"/>
-            <zoneItem type="America/Bogota" territory="CO"/>
-            <zoneItem type="America/Boise" territory="US"/>
-            <zoneItem type="America/Buenos_Aires" territory="AR" aliases="America/Argentina/Buenos_Aires"/>
-            <zoneItem type="America/Cambridge_Bay" territory="CA"/>
-            <zoneItem type="America/Campo_Grande" territory="BR"/>
-            <zoneItem type="America/Cancun" territory="MX"/>
-            <zoneItem type="America/Caracas" territory="VE"/>
-            <zoneItem type="America/Catamarca" territory="AR" aliases="America/Argentina/Catamarca America/Argentina/ComodRivadavia"/>
-            <zoneItem type="America/Cayenne" territory="GF"/>
-            <zoneItem type="America/Cayman" territory="KY"/>
-            <zoneItem type="America/Chicago" territory="US" aliases="CST6CDT SystemV/CST6CDT US/Central"/>
-            <zoneItem type="America/Chihuahua" territory="MX"/>
-            <zoneItem type="America/Coral_Harbour" territory="CA" aliases="America/Atikokan"/>
-            <zoneItem type="America/Cordoba" territory="AR" aliases="America/Argentina/Cordoba America/Rosario"/>
-            <zoneItem type="America/Costa_Rica" territory="CR"/>
-            <zoneItem type="America/Cuiaba" territory="BR"/>
-            <zoneItem type="America/Curacao" territory="AN"/>
-            <zoneItem type="America/Danmarkshavn" territory="GL"/>
-            <zoneItem type="America/Dawson" territory="CA"/>
-            <zoneItem type="America/Dawson_Creek" territory="CA"/>
-            <zoneItem type="America/Denver" territory="US" aliases="MST7MDT SystemV/MST7MDT US/Mountain"/>
-            <zoneItem type="America/Detroit" territory="US" aliases="US/Michigan"/>
-            <zoneItem type="America/Dominica" territory="DM"/>
-            <zoneItem type="America/Edmonton" territory="CA" aliases="Canada/Mountain"/>
-            <zoneItem type="America/Eirunepe" territory="BR"/>
-            <zoneItem type="America/El_Salvador" territory="SV"/>
-            <zoneItem type="America/Fortaleza" territory="BR"/>
-            <zoneItem type="America/Glace_Bay" territory="CA"/>
-            <zoneItem type="America/Godthab" territory="GL"/>
-            <zoneItem type="America/Goose_Bay" territory="CA"/>
-            <zoneItem type="America/Grand_Turk" territory="TC"/>
-            <zoneItem type="America/Grenada" territory="GD"/>
-            <zoneItem type="America/Guadeloupe" territory="GP"/>
-            <zoneItem type="America/Guatemala" territory="GT"/>
-            <zoneItem type="America/Guayaquil" territory="EC"/>
-            <zoneItem type="America/Guyana" territory="GY"/>
-            <zoneItem type="America/Halifax" territory="CA" aliases="Canada/Atlantic SystemV/AST4ADT"/>
-            <zoneItem type="America/Havana" territory="CU" aliases="Cuba"/>
-            <zoneItem type="America/Hermosillo" territory="MX"/>
-            <zoneItem type="America/Indiana/Knox" territory="US" aliases="America/Knox_IN US/Indiana-Starke"/>
-            <zoneItem type="America/Indiana/Marengo" territory="US"/>
-            <zoneItem type="America/Indiana/Petersburg" territory="US"/>
-            <zoneItem type="America/Indiana/Tell_City" territory="US"/>
-            <zoneItem type="America/Indiana/Vevay" territory="US"/>
-            <zoneItem type="America/Indiana/Vincennes" territory="US"/>
-            <zoneItem type="America/Indiana/Winamac" territory="US"/>
-            <zoneItem type="America/Indianapolis" territory="US" aliases="America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana"/>
-            <zoneItem type="America/Inuvik" territory="CA"/>
-            <zoneItem type="America/Iqaluit" territory="CA"/>
-            <zoneItem type="America/Jamaica" territory="JM" aliases="Jamaica"/>
-            <zoneItem type="America/Jujuy" territory="AR" aliases="America/Argentina/Jujuy"/>
-            <zoneItem type="America/Juneau" territory="US"/>
-            <zoneItem type="America/Kentucky/Monticello" territory="US"/>
-            <zoneItem type="America/La_Paz" territory="BO"/>
-            <zoneItem type="America/Lima" territory="PE"/>
-            <zoneItem type="America/Los_Angeles" territory="US" aliases="PST8PDT SystemV/PST8PDT US/Pacific US/Pacific-New"/>
-            <zoneItem type="America/Louisville" territory="US" aliases="America/Kentucky/Louisville"/>
-            <zoneItem type="America/Maceio" territory="BR"/>
-            <zoneItem type="America/Managua" territory="NI"/>
-            <zoneItem type="America/Manaus" territory="BR" aliases="Brazil/West"/>
-            <zoneItem type="America/Marigot" territory="MF"/>
-            <zoneItem type="America/Martinique" territory="MQ"/>
-            <zoneItem type="America/Mazatlan" territory="MX" aliases="Mexico/BajaSur"/>
-            <zoneItem type="America/Mendoza" territory="AR" aliases="America/Argentina/Mendoza"/>
-            <zoneItem type="America/Menominee" territory="US"/>
-            <zoneItem type="America/Merida" territory="MX"/>
-            <zoneItem type="America/Mexico_City" territory="MX" aliases="Mexico/General"/>
-            <zoneItem type="America/Miquelon" territory="PM"/>
-            <zoneItem type="America/Moncton" territory="CA"/>
-            <zoneItem type="America/Monterrey" territory="MX"/>
-            <zoneItem type="America/Montevideo" territory="UY"/>
-            <zoneItem type="America/Montreal" territory="CA"/>
-            <zoneItem type="America/Montserrat" territory="MS"/>
-            <zoneItem type="America/Nassau" territory="BS"/>
-            <zoneItem type="America/New_York" territory="US" aliases="EST5EDT SystemV/EST5EDT US/Eastern"/>
-            <zoneItem type="America/Nipigon" territory="CA"/>
-            <zoneItem type="America/Nome" territory="US"/>
-            <zoneItem type="America/Noronha" territory="BR" aliases="Brazil/DeNoronha"/>
-            <zoneItem type="America/North_Dakota/Center" territory="US"/>
-            <zoneItem type="America/North_Dakota/New_Salem" territory="US"/>
-            <zoneItem type="America/Panama" territory="PA"/>
-            <zoneItem type="America/Pangnirtung" territory="CA"/>
-            <zoneItem type="America/Paramaribo" territory="SR"/>
-            <zoneItem type="America/Phoenix" territory="US" aliases="US/Arizona"/>
-            <zoneItem type="America/Port_of_Spain" territory="TT"/>
-            <zoneItem type="America/Port-au-Prince" territory="HT"/>
-            <zoneItem type="America/Porto_Velho" territory="BR"/>
-            <zoneItem type="America/Puerto_Rico" territory="PR"/>
-            <zoneItem type="America/Rainy_River" territory="CA"/>
-            <zoneItem type="America/Rankin_Inlet" territory="CA"/>
-            <zoneItem type="America/Recife" territory="BR"/>
-            <zoneItem type="America/Regina" territory="CA" aliases="Canada/East-Saskatchewan Canada/Saskatchewan"/>
-            <zoneItem type="America/Resolute" territory="CA"/>
-            <zoneItem type="America/Rio_Branco" territory="BR" aliases="America/Porto_Acre Brazil/Acre"/>
-            <zoneItem type="America/Santarem" territory="BR"/>
-            <zoneItem type="America/Santiago" territory="CL" aliases="Chile/Continental"/>
-            <zoneItem type="America/Santo_Domingo" territory="DO"/>
-            <zoneItem type="America/Sao_Paulo" territory="BR" aliases="Brazil/East"/>
-            <zoneItem type="America/Scoresbysund" territory="GL"/>
-            <zoneItem type="America/Shiprock" territory="US" aliases="Navajo"/>
-            <zoneItem type="America/St_Barthelemy" territory="BL"/>
-            <zoneItem type="America/St_Johns" territory="CA" aliases="Canada/Newfoundland"/>
-            <zoneItem type="America/St_Kitts" territory="KN"/>
-            <zoneItem type="America/St_Lucia" territory="LC"/>
-            <zoneItem type="America/St_Thomas" territory="VI" aliases="America/Virgin"/>
-            <zoneItem type="America/St_Vincent" territory="VC"/>
-            <zoneItem type="America/Swift_Current" territory="CA"/>
-            <zoneItem type="America/Tegucigalpa" territory="HN"/>
-            <zoneItem type="America/Thule" territory="GL"/>
-            <zoneItem type="America/Thunder_Bay" territory="CA"/>
-            <zoneItem type="America/Tijuana" territory="MX" aliases="America/Ensenada Mexico/BajaNorte"/>
-            <zoneItem type="America/Toronto" territory="CA" aliases="Canada/Eastern"/>
-            <zoneItem type="America/Tortola" territory="VG"/>
-            <zoneItem type="America/Vancouver" territory="CA" aliases="Canada/Pacific"/>
-            <zoneItem type="America/Whitehorse" territory="CA" aliases="Canada/Yukon"/>
-            <zoneItem type="America/Winnipeg" territory="CA" aliases="Canada/Central"/>
-            <zoneItem type="America/Yakutat" territory="US"/>
-            <zoneItem type="America/Yellowknife" territory="CA"/>
-            <zoneItem type="Antarctica/Casey" territory="AQ"/>
-            <zoneItem type="Antarctica/Davis" territory="AQ"/>
-            <zoneItem type="Antarctica/DumontDUrville" territory="AQ"/>
-            <zoneItem type="Antarctica/Mawson" territory="AQ"/>
-            <zoneItem type="Antarctica/McMurdo" territory="AQ"/>
-            <zoneItem type="Antarctica/Palmer" territory="AQ"/>
-            <zoneItem type="Antarctica/Rothera" territory="AQ"/>
-            <zoneItem type="Antarctica/South_Pole" territory="AQ"/>
-            <zoneItem type="Antarctica/Syowa" territory="AQ"/>
-            <zoneItem type="Antarctica/Vostok" territory="AQ"/>
-            <zoneItem type="Arctic/Longyearbyen" territory="SJ" aliases="Atlantic/Jan_Mayen"/>
-            <zoneItem type="Asia/Aden" territory="YE"/>
-            <zoneItem type="Asia/Almaty" territory="KZ"/>
-            <zoneItem type="Asia/Amman" territory="JO"/>
-            <zoneItem type="Asia/Anadyr" territory="RU"/>
-            <zoneItem type="Asia/Aqtau" territory="KZ"/>
-            <zoneItem type="Asia/Aqtobe" territory="KZ"/>
-            <zoneItem type="Asia/Ashgabat" territory="TM" aliases="Asia/Ashkhabad"/>
-            <zoneItem type="Asia/Baghdad" territory="IQ"/>
-            <zoneItem type="Asia/Bahrain" territory="BH"/>
-            <zoneItem type="Asia/Baku" territory="AZ"/>
-            <zoneItem type="Asia/Bangkok" territory="TH"/>
-            <zoneItem type="Asia/Beirut" territory="LB"/>
-            <zoneItem type="Asia/Bishkek" territory="KG"/>
-            <zoneItem type="Asia/Brunei" territory="BN"/>
-            <zoneItem type="Asia/Calcutta" territory="IN" aliases="Asia/Kolkata"/>
-            <zoneItem type="Asia/Choibalsan" territory="MN"/>
-            <zoneItem type="Asia/Chongqing" territory="CN" aliases="Asia/Chungking"/>
-            <zoneItem type="Asia/Colombo" territory="LK"/>
-            <zoneItem type="Asia/Damascus" territory="SY"/>
-            <zoneItem type="Asia/Dhaka" territory="BD" aliases="Asia/Dacca"/>
-            <zoneItem type="Asia/Dili" territory="TL"/>
-            <zoneItem type="Asia/Dubai" territory="AE"/>
-            <zoneItem type="Asia/Dushanbe" territory="TJ"/>
-            <zoneItem type="Asia/Gaza" territory="PS"/>
-            <zoneItem type="Asia/Harbin" territory="CN"/>
-            <zoneItem type="Asia/Hong_Kong" territory="HK" aliases="Hongkong"/>
-            <zoneItem type="Asia/Hovd" territory="MN"/>
-            <zoneItem type="Asia/Irkutsk" territory="RU"/>
-            <zoneItem type="Asia/Jakarta" territory="ID"/>
-            <zoneItem type="Asia/Jayapura" territory="ID"/>
-            <zoneItem type="Asia/Jerusalem" territory="IL" aliases="Asia/Tel_Aviv Israel"/>
-            <zoneItem type="Asia/Kabul" territory="AF"/>
-            <zoneItem type="Asia/Kamchatka" territory="RU"/>
-            <zoneItem type="Asia/Karachi" territory="PK"/>
-            <zoneItem type="Asia/Kashgar" territory="CN"/>
-            <zoneItem type="Asia/Katmandu" territory="NP" aliases="Asia/Kathmandu"/>
-            <zoneItem type="Asia/Krasnoyarsk" territory="RU"/>
-            <zoneItem type="Asia/Kuala_Lumpur" territory="MY"/>
-            <zoneItem type="Asia/Kuching" territory="MY"/>
-            <zoneItem type="Asia/Kuwait" territory="KW"/>
-            <zoneItem type="Asia/Macau" territory="MO" aliases="Asia/Macao"/>
-            <zoneItem type="Asia/Magadan" territory="RU"/>
-            <zoneItem type="Asia/Makassar" territory="ID" aliases="Asia/Ujung_Pandang"/>
-            <zoneItem type="Asia/Manila" territory="PH"/>
-            <zoneItem type="Asia/Muscat" territory="OM"/>
-            <zoneItem type="Asia/Nicosia" territory="CY" aliases="Europe/Nicosia"/>
-            <zoneItem type="Asia/Novosibirsk" territory="RU"/>
-            <zoneItem type="Asia/Omsk" territory="RU"/>
-            <zoneItem type="Asia/Oral" territory="KZ"/>
-            <zoneItem type="Asia/Phnom_Penh" territory="KH"/>
-            <zoneItem type="Asia/Pontianak" territory="ID"/>
-            <zoneItem type="Asia/Pyongyang" territory="KP"/>
-            <zoneItem type="Asia/Qatar" territory="QA"/>
-            <zoneItem type="Asia/Qyzylorda" territory="KZ"/>
-            <zoneItem type="Asia/Rangoon" territory="MM"/>
-            <zoneItem type="Asia/Riyadh" territory="SA"/>
-            <zoneItem type="Asia/Saigon" territory="VN" aliases="Asia/Ho_Chi_Minh"/>
-            <zoneItem type="Asia/Sakhalin" territory="RU"/>
-            <zoneItem type="Asia/Samarkand" territory="UZ"/>
-            <zoneItem type="Asia/Seoul" territory="KR" aliases="ROK"/>
-            <zoneItem type="Asia/Shanghai" territory="CN" aliases="PRC"/>
-            <zoneItem type="Asia/Singapore" territory="SG" aliases="Singapore"/>
-            <zoneItem type="Asia/Taipei" territory="TW" aliases="ROC"/>
-            <zoneItem type="Asia/Tashkent" territory="UZ"/>
-            <zoneItem type="Asia/Tbilisi" territory="GE"/>
-            <zoneItem type="Asia/Tehran" territory="IR" aliases="Iran"/>
-            <zoneItem type="Asia/Thimphu" territory="BT" aliases="Asia/Thimbu"/>
-            <zoneItem type="Asia/Tokyo" territory="JP" aliases="Japan"/>
-            <zoneItem type="Asia/Ulaanbaatar" territory="MN" aliases="Asia/Ulan_Bator"/>
-            <zoneItem type="Asia/Urumqi" territory="CN"/>
-            <zoneItem type="Asia/Vientiane" territory="LA"/>
-            <zoneItem type="Asia/Vladivostok" territory="RU"/>
-            <zoneItem type="Asia/Yakutsk" territory="RU"/>
-            <zoneItem type="Asia/Yekaterinburg" territory="RU"/>
-            <zoneItem type="Asia/Yerevan" territory="AM"/>
-            <zoneItem type="Atlantic/Azores" territory="PT"/>
-            <zoneItem type="Atlantic/Bermuda" territory="BM"/>
-            <zoneItem type="Atlantic/Canary" territory="ES"/>
-            <zoneItem type="Atlantic/Cape_Verde" territory="CV"/>
-            <zoneItem type="Atlantic/Faeroe" territory="FO" aliases="Atlantic/Faroe"/>
-            <zoneItem type="Atlantic/Madeira" territory="PT"/>
-            <zoneItem type="Atlantic/Reykjavik" territory="IS" aliases="Iceland"/>
-            <zoneItem type="Atlantic/South_Georgia" territory="GS"/>
-            <zoneItem type="Atlantic/St_Helena" territory="SH"/>
-            <zoneItem type="Atlantic/Stanley" territory="FK"/>
-            <zoneItem type="Australia/Adelaide" territory="AU" aliases="Australia/South"/>
-            <zoneItem type="Australia/Brisbane" territory="AU" aliases="Australia/Queensland"/>
-            <zoneItem type="Australia/Broken_Hill" territory="AU" aliases="Australia/Yancowinna"/>
-            <zoneItem type="Australia/Currie" territory="AU"/>
-            <zoneItem type="Australia/Darwin" territory="AU" aliases="Australia/North"/>
-            <zoneItem type="Australia/Eucla" territory="AU"/>
-            <zoneItem type="Australia/Hobart" territory="AU" aliases="Australia/Tasmania"/>
-            <zoneItem type="Australia/Lindeman" territory="AU"/>
-            <zoneItem type="Australia/Lord_Howe" territory="AU" aliases="Australia/LHI"/>
-            <zoneItem type="Australia/Melbourne" territory="AU" aliases="Australia/Victoria"/>
-            <zoneItem type="Australia/Perth" territory="AU" aliases="Australia/West"/>
-            <zoneItem type="Australia/Sydney" territory="AU" aliases="Australia/ACT Australia/Canberra Australia/NSW"/>
-            <zoneItem type="Etc/GMT" territory="001" aliases="Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich Etc/UCT Etc/UTC Etc/Universal Etc/Zulu GMT GMT+0 GMT-0 GMT0 Greenwich UCT UTC Universal Zulu"/>
-            <zoneItem type="Etc/GMT-1" territory="001"/>
-            <zoneItem type="Etc/GMT-2" territory="001"/>
-            <zoneItem type="Etc/GMT-3" territory="001"/>
-            <zoneItem type="Etc/GMT-4" territory="001"/>
-            <zoneItem type="Etc/GMT-5" territory="001"/>
-            <zoneItem type="Etc/GMT-6" territory="001"/>
-            <zoneItem type="Etc/GMT-7" territory="001"/>
-            <zoneItem type="Etc/GMT-8" territory="001"/>
-            <zoneItem type="Etc/GMT-9" territory="001"/>
-            <zoneItem type="Etc/GMT-10" territory="001"/>
-            <zoneItem type="Etc/GMT-11" territory="001"/>
-            <zoneItem type="Etc/GMT-12" territory="001"/>
-            <zoneItem type="Etc/GMT-13" territory="001"/>
-            <zoneItem type="Etc/GMT-14" territory="001"/>
-            <zoneItem type="Etc/GMT+1" territory="001"/>
-            <zoneItem type="Etc/GMT+2" territory="001"/>
-            <zoneItem type="Etc/GMT+3" territory="001"/>
-            <zoneItem type="Etc/GMT+4" territory="001" aliases="SystemV/AST4"/>
-            <zoneItem type="Etc/GMT+5" territory="001" aliases="EST SystemV/EST5"/>
-            <zoneItem type="Etc/GMT+6" territory="001" aliases="SystemV/CST6"/>
-            <zoneItem type="Etc/GMT+7" territory="001" aliases="MST SystemV/MST7"/>
-            <zoneItem type="Etc/GMT+8" territory="001" aliases="SystemV/PST8"/>
-            <zoneItem type="Etc/GMT+9" territory="001" aliases="SystemV/YST9"/>
-            <zoneItem type="Etc/GMT+10" territory="001" aliases="HST SystemV/HST10"/>
-            <zoneItem type="Etc/GMT+11" territory="001"/>
-            <zoneItem type="Etc/GMT+12" territory="001"/>
-            <zoneItem type="Etc/Unknown" territory="001"/>
-            <zoneItem type="Europe/Amsterdam" territory="NL"/>
-            <zoneItem type="Europe/Andorra" territory="AD"/>
-            <zoneItem type="Europe/Athens" territory="GR"/>
-            <zoneItem type="Europe/Belgrade" territory="RS"/>
-            <zoneItem type="Europe/Berlin" territory="DE"/>
-            <zoneItem type="Europe/Bratislava" territory="SK"/>
-            <zoneItem type="Europe/Brussels" territory="BE"/>
-            <zoneItem type="Europe/Bucharest" territory="RO"/>
-            <zoneItem type="Europe/Budapest" territory="HU"/>
-            <zoneItem type="Europe/Chisinau" territory="MD" aliases="Europe/Tiraspol"/>
-            <zoneItem type="Europe/Copenhagen" territory="DK"/>
-            <zoneItem type="Europe/Dublin" territory="IE" aliases="Eire"/>
-            <zoneItem type="Europe/Gibraltar" territory="GI"/>
-            <zoneItem type="Europe/Guernsey" territory="GG"/>
-            <zoneItem type="Europe/Helsinki" territory="FI"/>
-            <zoneItem type="Europe/Isle_of_Man" territory="IM"/>
-            <zoneItem type="Europe/Istanbul" territory="TR" aliases="Asia/Istanbul Turkey"/>
-            <zoneItem type="Europe/Jersey" territory="JE"/>
-            <zoneItem type="Europe/Kaliningrad" territory="RU"/>
-            <zoneItem type="Europe/Kiev" territory="UA"/>
-            <zoneItem type="Europe/Lisbon" territory="PT" aliases="Portugal"/>
-            <zoneItem type="Europe/Ljubljana" territory="SI"/>
-            <zoneItem type="Europe/London" territory="GB" aliases="Europe/Belfast GB GB-Eire"/>
-            <zoneItem type="Europe/Luxembourg" territory="LU"/>
-            <zoneItem type="Europe/Madrid" territory="ES"/>
-            <zoneItem type="Europe/Malta" territory="MT"/>
-            <zoneItem type="Europe/Mariehamn" territory="AX"/>
-            <zoneItem type="Europe/Minsk" territory="BY"/>
-            <zoneItem type="Europe/Monaco" territory="MC"/>
-            <zoneItem type="Europe/Moscow" territory="RU" aliases="W-SU"/>
-            <zoneItem type="Europe/Oslo" territory="NO"/>
-            <zoneItem type="Europe/Paris" territory="FR"/>
-            <zoneItem type="Europe/Podgorica" territory="ME"/>
-            <zoneItem type="Europe/Prague" territory="CZ"/>
-            <zoneItem type="Europe/Riga" territory="LV"/>
-            <zoneItem type="Europe/Rome" territory="IT"/>
-            <zoneItem type="Europe/Samara" territory="RU"/>
-            <zoneItem type="Europe/San_Marino" territory="SM"/>
-            <zoneItem type="Europe/Sarajevo" territory="BA"/>
-            <zoneItem type="Europe/Simferopol" territory="UA"/>
-            <zoneItem type="Europe/Skopje" territory="MK"/>
-            <zoneItem type="Europe/Sofia" territory="BG"/>
-            <zoneItem type="Europe/Stockholm" territory="SE"/>
-            <zoneItem type="Europe/Tallinn" territory="EE"/>
-            <zoneItem type="Europe/Tirane" territory="AL"/>
-            <zoneItem type="Europe/Uzhgorod" territory="UA"/>
-            <zoneItem type="Europe/Vaduz" territory="LI"/>
-            <zoneItem type="Europe/Vatican" territory="VA"/>
-            <zoneItem type="Europe/Vienna" territory="AT"/>
-            <zoneItem type="Europe/Vilnius" territory="LT"/>
-            <zoneItem type="Europe/Volgograd" territory="RU"/>
-            <zoneItem type="Europe/Warsaw" territory="PL" aliases="Poland"/>
-            <zoneItem type="Europe/Zagreb" territory="HR"/>
-            <zoneItem type="Europe/Zaporozhye" territory="UA"/>
-            <zoneItem type="Europe/Zurich" territory="CH"/>
-            <zoneItem type="Indian/Antananarivo" territory="MG"/>
-            <zoneItem type="Indian/Chagos" territory="IO"/>
-            <zoneItem type="Indian/Christmas" territory="CX"/>
-            <zoneItem type="Indian/Cocos" territory="CC"/>
-            <zoneItem type="Indian/Comoro" territory="KM"/>
-            <zoneItem type="Indian/Kerguelen" territory="TF"/>
-            <zoneItem type="Indian/Mahe" territory="SC"/>
-            <zoneItem type="Indian/Maldives" territory="MV"/>
-            <zoneItem type="Indian/Mauritius" territory="MU"/>
-            <zoneItem type="Indian/Mayotte" territory="YT"/>
-            <zoneItem type="Indian/Reunion" territory="RE"/>
-            <zoneItem type="Pacific/Apia" territory="WS"/>
-            <zoneItem type="Pacific/Auckland" territory="NZ" aliases="NZ"/>
-            <zoneItem type="Pacific/Chatham" territory="NZ" aliases="NZ-CHAT"/>
-            <zoneItem type="Pacific/Easter" territory="CL" aliases="Chile/EasterIsland"/>
-            <zoneItem type="Pacific/Efate" territory="VU"/>
-            <zoneItem type="Pacific/Enderbury" territory="KI"/>
-            <zoneItem type="Pacific/Fakaofo" territory="TK"/>
-            <zoneItem type="Pacific/Fiji" territory="FJ"/>
-            <zoneItem type="Pacific/Funafuti" territory="TV"/>
-            <zoneItem type="Pacific/Galapagos" territory="EC"/>
-            <zoneItem type="Pacific/Gambier" territory="PF"/>
-            <zoneItem type="Pacific/Guadalcanal" territory="SB"/>
-            <zoneItem type="Pacific/Guam" territory="GU"/>
-            <zoneItem type="Pacific/Honolulu" territory="US" aliases="US/Hawaii"/>
-            <zoneItem type="Pacific/Johnston" territory="UM"/>
-            <zoneItem type="Pacific/Kiritimati" territory="KI"/>
-            <zoneItem type="Pacific/Kosrae" territory="FM"/>
-            <zoneItem type="Pacific/Kwajalein" territory="MH" aliases="Kwajalein"/>
-            <zoneItem type="Pacific/Majuro" territory="MH"/>
-            <zoneItem type="Pacific/Marquesas" territory="PF"/>
-            <zoneItem type="Pacific/Midway" territory="UM"/>
-            <zoneItem type="Pacific/Nauru" territory="NR"/>
-            <zoneItem type="Pacific/Niue" territory="NU"/>
-            <zoneItem type="Pacific/Norfolk" territory="NF"/>
-            <zoneItem type="Pacific/Noumea" territory="NC"/>
-            <zoneItem type="Pacific/Pago_Pago" territory="AS" aliases="Pacific/Samoa US/Samoa"/>
-            <zoneItem type="Pacific/Palau" territory="PW"/>
-            <zoneItem type="Pacific/Pitcairn" territory="PN"/>
-            <zoneItem type="Pacific/Ponape" territory="FM"/>
-            <zoneItem type="Pacific/Port_Moresby" territory="PG"/>
-            <zoneItem type="Pacific/Rarotonga" territory="CK"/>
-            <zoneItem type="Pacific/Saipan" territory="MP"/>
-            <zoneItem type="Pacific/Tahiti" territory="PF"/>
-            <zoneItem type="Pacific/Tarawa" territory="KI"/>
-            <zoneItem type="Pacific/Tongatapu" territory="TO"/>
-            <zoneItem type="Pacific/Truk" territory="FM" aliases="Pacific/Yap"/>
-            <zoneItem type="Pacific/Wake" territory="UM"/>
-            <zoneItem type="Pacific/Wallis" territory="WF"/>
-        </zoneFormatting>
-    </timezoneData>
-    <codeMappings>
-        <territoryCodes type="AA" numeric="958" alpha3="AAA"/>
-        <territoryCodes type="AD" numeric="020" alpha3="AND" fips10="AN"/>
-        <territoryCodes type="AE" numeric="784" alpha3="ARE"/>
-        <territoryCodes type="AF" numeric="004" alpha3="AFG"/>
-        <territoryCodes type="AG" numeric="028" alpha3="ATG" fips10="AC"/>
-        <territoryCodes type="AI" numeric="660" alpha3="AIA" fips10="AV"/>
-        <territoryCodes type="AL" numeric="008" alpha3="ALB"/>
-        <territoryCodes type="AM" numeric="051" alpha3="ARM"/>
-        <territoryCodes type="AN" numeric="530" alpha3="ANT" fips10="NT"/>
-        <territoryCodes type="AO" numeric="024" alpha3="AGO"/>
-        <territoryCodes type="AQ" numeric="010" alpha3="ATA" fips10="AY"/>
-        <territoryCodes type="AR" numeric="032" alpha3="ARG"/>
-        <territoryCodes type="AS" numeric="016" alpha3="ASM" fips10="AQ"/>
-        <territoryCodes type="AT" numeric="040" alpha3="AUT" fips10="AU"/>
-        <territoryCodes type="AU" numeric="036" alpha3="AUS" fips10="AS"/>
-        <territoryCodes type="AW" numeric="533" alpha3="ABW" fips10="AA"/>
-        <territoryCodes type="AX" numeric="248" alpha3="ALA"/>
-        <territoryCodes type="AZ" numeric="031" alpha3="AZE" fips10="AJ"/>
-        <territoryCodes type="BA" numeric="070" alpha3="BIH" fips10="BK"/>
-        <territoryCodes type="BB" numeric="052" alpha3="BRB"/>
-        <territoryCodes type="BD" numeric="050" alpha3="BGD" fips10="BG"/>
-        <territoryCodes type="BE" numeric="056" alpha3="BEL"/>
-        <territoryCodes type="BF" numeric="854" alpha3="BFA" fips10="UV"/>
-        <territoryCodes type="BG" numeric="100" alpha3="BGR" fips10="BU"/>
-        <territoryCodes type="BH" numeric="048" alpha3="BHR" fips10="BA"/>
-        <territoryCodes type="BI" numeric="108" alpha3="BDI" fips10="BY"/>
-        <territoryCodes type="BJ" numeric="204" alpha3="BEN" fips10="BN"/>
-        <territoryCodes type="BL" numeric="652" alpha3="BLM"/>
-        <territoryCodes type="BM" numeric="060" alpha3="BMU" fips10="BD"/>
-        <territoryCodes type="BN" numeric="096" alpha3="BRN" fips10="BX"/>
-        <territoryCodes type="BO" numeric="068" alpha3="BOL" fips10="BL"/>
-        <territoryCodes type="BR" numeric="076" alpha3="BRA"/>
-        <territoryCodes type="BS" numeric="044" alpha3="BHS" fips10="BF"/>
-        <territoryCodes type="BT" numeric="064" alpha3="BTN"/>
-        <territoryCodes type="BU" numeric="104" alpha3="BUR"/>
-        <territoryCodes type="BV" numeric="074" alpha3="BVT"/>
-        <territoryCodes type="BW" numeric="072" alpha3="BWA" fips10="BC"/>
-        <territoryCodes type="BY" numeric="112" alpha3="BLR" fips10="BO"/>
-        <territoryCodes type="BZ" numeric="084" alpha3="BLZ" fips10="BH"/>
-        <territoryCodes type="CA" numeric="124" alpha3="CAN"/>
-        <territoryCodes type="CC" numeric="166" alpha3="CCK" fips10="CK"/>
-        <territoryCodes type="CD" numeric="180" alpha3="COD" fips10="CG"/>
-        <territoryCodes type="CF" numeric="140" alpha3="CAF" fips10="CT"/>
-        <territoryCodes type="CG" numeric="178" alpha3="COG" fips10="CF"/>
-        <territoryCodes type="CH" numeric="756" alpha3="CHE" fips10="SZ"/>
-        <territoryCodes type="CI" numeric="384" alpha3="CIV" fips10="IV"/>
-        <territoryCodes type="CK" numeric="184" alpha3="COK" fips10="CW"/>
-        <territoryCodes type="CL" numeric="152" alpha3="CHL" fips10="CI"/>
-        <territoryCodes type="CM" numeric="120" alpha3="CMR"/>
-        <territoryCodes type="CN" numeric="156" alpha3="CHN" fips10="CH"/>
-        <territoryCodes type="CO" numeric="170" alpha3="COL"/>
-        <territoryCodes type="CR" numeric="188" alpha3="CRI" fips10="CS"/>
-        <territoryCodes type="CS" numeric="891" alpha3="SCG" fips10="YI" internet="CS YU"/>
-        <territoryCodes type="CU" numeric="192" alpha3="CUB"/>
-        <territoryCodes type="CV" numeric="132" alpha3="CPV"/>
-        <territoryCodes type="CX" numeric="162" alpha3="CXR" fips10="KT"/>
-        <territoryCodes type="CY" numeric="196" alpha3="CYP"/>
-        <territoryCodes type="CZ" numeric="203" alpha3="CZE" fips10="EZ"/>
-        <territoryCodes type="DD" numeric="278" alpha3="DDR"/>
-        <territoryCodes type="DE" numeric="276" alpha3="DEU" fips10="GM"/>
-        <territoryCodes type="DJ" numeric="262" alpha3="DJI"/>
-        <territoryCodes type="DK" numeric="208" alpha3="DNK" fips10="DA"/>
-        <territoryCodes type="DM" numeric="212" alpha3="DMA" fips10="DO"/>
-        <territoryCodes type="DO" numeric="214" alpha3="DOM" fips10="DR"/>
-        <territoryCodes type="DZ" numeric="012" alpha3="DZA" fips10="AG"/>
-        <territoryCodes type="EC" numeric="218" alpha3="ECU"/>
-        <territoryCodes type="EE" numeric="233" alpha3="EST" fips10="EN"/>
-        <territoryCodes type="EG" numeric="818" alpha3="EGY"/>
-        <territoryCodes type="EH" numeric="732" alpha3="ESH" fips10="WI"/>
-        <territoryCodes type="ER" numeric="232" alpha3="ERI"/>
-        <territoryCodes type="ES" numeric="724" alpha3="ESP" fips10="SP"/>
-        <territoryCodes type="ET" numeric="231" alpha3="ETH"/>
-        <territoryCodes type="FI" numeric="246" alpha3="FIN"/>
-        <territoryCodes type="FJ" numeric="242" alpha3="FJI"/>
-        <territoryCodes type="FK" numeric="238" alpha3="FLK"/>
-        <territoryCodes type="FM" numeric="583" alpha3="FSM"/>
-        <territoryCodes type="FO" numeric="234" alpha3="FRO"/>
-        <territoryCodes type="FR" numeric="250" alpha3="FRA"/>
-        <territoryCodes type="FX" numeric="249" alpha3="FXX"/>
-        <territoryCodes type="GA" numeric="266" alpha3="GAB" fips10="GB"/>
-        <territoryCodes type="GB" numeric="826" alpha3="GBR" fips10="UK" internet="UK GB"/>
-        <territoryCodes type="GD" numeric="308" alpha3="GRD" fips10="GJ"/>
-        <territoryCodes type="GE" numeric="268" alpha3="GEO" fips10="GG"/>
-        <territoryCodes type="GF" numeric="254" alpha3="GUF" fips10="FG"/>
-        <territoryCodes type="GG" numeric="831" alpha3="GGY" fips10="GK"/>
-        <territoryCodes type="GH" numeric="288" alpha3="GHA"/>
-        <territoryCodes type="GI" numeric="292" alpha3="GIB"/>
-        <territoryCodes type="GL" numeric="304" alpha3="GRL"/>
-        <territoryCodes type="GM" numeric="270" alpha3="GMB" fips10="GA"/>
-        <territoryCodes type="GN" numeric="324" alpha3="GIN" fips10="GV"/>
-        <territoryCodes type="GP" numeric="312" alpha3="GLP"/>
-        <territoryCodes type="GQ" numeric="226" alpha3="GNQ" fips10="EK"/>
-        <territoryCodes type="GR" numeric="300" alpha3="GRC"/>
-        <territoryCodes type="GS" numeric="239" alpha3="SGS" fips10="SX"/>
-        <territoryCodes type="GT" numeric="320" alpha3="GTM"/>
-        <territoryCodes type="GU" numeric="316" alpha3="GUM" fips10="GQ"/>
-        <territoryCodes type="GW" numeric="624" alpha3="GNB" fips10="PU"/>
-        <territoryCodes type="GY" numeric="328" alpha3="GUY"/>
-        <territoryCodes type="HK" numeric="344" alpha3="HKG"/>
-        <territoryCodes type="HM" numeric="334" alpha3="HMD"/>
-        <territoryCodes type="HN" numeric="340" alpha3="HND" fips10="HO"/>
-        <territoryCodes type="HR" numeric="191" alpha3="HRV"/>
-        <territoryCodes type="HT" numeric="332" alpha3="HTI" fips10="HA"/>
-        <territoryCodes type="HU" numeric="348" alpha3="HUN"/>
-        <territoryCodes type="ID" numeric="360" alpha3="IDN"/>
-        <territoryCodes type="IE" numeric="372" alpha3="IRL" fips10="EI"/>
-        <territoryCodes type="IL" numeric="376" alpha3="ISR" fips10="IS"/>
-        <territoryCodes type="IM" numeric="833" alpha3="IMN"/>
-        <territoryCodes type="IN" numeric="356" alpha3="IND"/>
-        <territoryCodes type="IO" numeric="086" alpha3="IOT"/>
-        <territoryCodes type="IQ" numeric="368" alpha3="IRQ" fips10="IZ"/>
-        <territoryCodes type="IR" numeric="364" alpha3="IRN"/>
-        <territoryCodes type="IS" numeric="352" alpha3="ISL" fips10="IC"/>
-        <territoryCodes type="IT" numeric="380" alpha3="ITA"/>
-        <territoryCodes type="JE" numeric="832" alpha3="JEY"/>
-        <territoryCodes type="JM" numeric="388" alpha3="JAM"/>
-        <territoryCodes type="JO" numeric="400" alpha3="JOR"/>
-        <territoryCodes type="JP" numeric="392" alpha3="JPN" fips10="JA"/>
-        <territoryCodes type="KE" numeric="404" alpha3="KEN"/>
-        <territoryCodes type="KG" numeric="417" alpha3="KGZ"/>
-        <territoryCodes type="KH" numeric="116" alpha3="KHM" fips10="CB"/>
-        <territoryCodes type="KI" numeric="296" alpha3="KIR" fips10="KR"/>
-        <territoryCodes type="KM" numeric="174" alpha3="COM" fips10="CN"/>
-        <territoryCodes type="KN" numeric="659" alpha3="KNA" fips10="SC"/>
-        <territoryCodes type="KP" numeric="408" alpha3="PRK" fips10="KN"/>
-        <territoryCodes type="KR" numeric="410" alpha3="KOR" fips10="KS"/>
-        <territoryCodes type="KW" numeric="414" alpha3="KWT" fips10="KU"/>
-        <territoryCodes type="KY" numeric="136" alpha3="CYM" fips10="CJ"/>
-        <territoryCodes type="KZ" numeric="398" alpha3="KAZ"/>
-        <territoryCodes type="LA" numeric="418" alpha3="LAO"/>
-        <territoryCodes type="LB" numeric="422" alpha3="LBN" fips10="LE"/>
-        <territoryCodes type="LC" numeric="662" alpha3="LCA" fips10="ST"/>
-        <territoryCodes type="LI" numeric="438" alpha3="LIE" fips10="LS"/>
-        <territoryCodes type="LK" numeric="144" alpha3="LKA" fips10="CE"/>
-        <territoryCodes type="LR" numeric="430" alpha3="LBR" fips10="LI"/>
-        <territoryCodes type="LS" numeric="426" alpha3="LSO" fips10="LT"/>
-        <territoryCodes type="LT" numeric="440" alpha3="LTU" fips10="LH"/>
-        <territoryCodes type="LU" numeric="442" alpha3="LUX"/>
-        <territoryCodes type="LV" numeric="428" alpha3="LVA" fips10="LG"/>
-        <territoryCodes type="LY" numeric="434" alpha3="LBY"/>
-        <territoryCodes type="MA" numeric="504" alpha3="MAR" fips10="MO"/>
-        <territoryCodes type="MC" numeric="492" alpha3="MCO" fips10="MN"/>
-        <territoryCodes type="MD" numeric="498" alpha3="MDA"/>
-        <territoryCodes type="ME" numeric="499" alpha3="MNE" fips10="MJ"/>
-        <territoryCodes type="MG" numeric="450" alpha3="MDG" fips10="MA"/>
-        <territoryCodes type="MF" numeric="663" alpha3="MAF"/>
-        <territoryCodes type="MH" numeric="584" alpha3="MHL" fips10="RM"/>
-        <territoryCodes type="MK" numeric="807" alpha3="MKD"/>
-        <territoryCodes type="ML" numeric="466" alpha3="MLI"/>
-        <territoryCodes type="MM" numeric="104" alpha3="MMR" fips10="BM"/>
-        <territoryCodes type="MN" numeric="496" alpha3="MNG" fips10="MG"/>
-        <territoryCodes type="MO" numeric="446" alpha3="MAC" fips10="MC"/>
-        <territoryCodes type="MP" numeric="580" alpha3="MNP" fips10="CQ"/>
-        <territoryCodes type="MQ" numeric="474" alpha3="MTQ" fips10="MB"/>
-        <territoryCodes type="MR" numeric="478" alpha3="MRT"/>
-        <territoryCodes type="MS" numeric="500" alpha3="MSR" fips10="MH"/>
-        <territoryCodes type="MT" numeric="470" alpha3="MLT"/>
-        <territoryCodes type="MU" numeric="480" alpha3="MUS" fips10="MP"/>
-        <territoryCodes type="MV" numeric="462" alpha3="MDV"/>
-        <territoryCodes type="MW" numeric="454" alpha3="MWI" fips10="MI"/>
-        <territoryCodes type="MX" numeric="484" alpha3="MEX"/>
-        <territoryCodes type="MY" numeric="458" alpha3="MYS"/>
-        <territoryCodes type="MZ" numeric="508" alpha3="MOZ"/>
-        <territoryCodes type="NA" numeric="516" alpha3="NAM" fips10="WA"/>
-        <territoryCodes type="NC" numeric="540" alpha3="NCL"/>
-        <territoryCodes type="NE" numeric="562" alpha3="NER" fips10="NG"/>
-        <territoryCodes type="NF" numeric="574" alpha3="NFK"/>
-        <territoryCodes type="NG" numeric="566" alpha3="NGA" fips10="NI"/>
-        <territoryCodes type="NI" numeric="558" alpha3="NIC" fips10="NU"/>
-        <territoryCodes type="NL" numeric="528" alpha3="NLD"/>
-        <territoryCodes type="NO" numeric="578" alpha3="NOR"/>
-        <territoryCodes type="NP" numeric="524" alpha3="NPL"/>
-        <territoryCodes type="NR" numeric="520" alpha3="NRU"/>
-        <territoryCodes type="NT" numeric="536" alpha3="NTZ"/>
-        <territoryCodes type="NU" numeric="570" alpha3="NIU" fips10="NE"/>
-        <territoryCodes type="NZ" numeric="554" alpha3="NZL"/>
-        <territoryCodes type="OM" numeric="512" alpha3="OMN" fips10="MU"/>
-        <territoryCodes type="PA" numeric="591" alpha3="PAN" fips10="PM"/>
-        <territoryCodes type="PE" numeric="604" alpha3="PER"/>
-        <territoryCodes type="PF" numeric="258" alpha3="PYF" fips10="FP"/>
-        <territoryCodes type="PG" numeric="598" alpha3="PNG" fips10="PP"/>
-        <territoryCodes type="PH" numeric="608" alpha3="PHL" fips10="RP"/>
-        <territoryCodes type="PK" numeric="586" alpha3="PAK"/>
-        <territoryCodes type="PL" numeric="616" alpha3="POL"/>
-        <territoryCodes type="PM" numeric="666" alpha3="SPM" fips10="SB"/>
-        <territoryCodes type="PN" numeric="612" alpha3="PCN" fips10="PC"/>
-        <territoryCodes type="PR" numeric="630" alpha3="PRI" fips10="RQ"/>
-        <territoryCodes type="PS" numeric="275" alpha3="PSE" fips10="GZ"/>
-        <territoryCodes type="PT" numeric="620" alpha3="PRT" fips10="PO"/>
-        <territoryCodes type="PW" numeric="585" alpha3="PLW" fips10="PS"/>
-        <territoryCodes type="PY" numeric="600" alpha3="PRY" fips10="PA"/>
-        <territoryCodes type="QA" numeric="634" alpha3="QAT"/>
-        <territoryCodes type="QM" numeric="959" alpha3="QMM"/>
-        <territoryCodes type="QN" numeric="960" alpha3="QNN"/>
-        <territoryCodes type="QO" numeric="961" alpha3="QOO"/>
-        <territoryCodes type="QP" numeric="962" alpha3="QPP"/>
-        <territoryCodes type="QQ" numeric="963" alpha3="QQQ"/>
-        <territoryCodes type="QR" numeric="964" alpha3="QRR"/>
-        <territoryCodes type="QS" numeric="965" alpha3="QSS"/>
-        <territoryCodes type="QT" numeric="966" alpha3="QTT"/>
-        <territoryCodes type="QU" numeric="967" alpha3="QUU" internet="EU"/>
-        <territoryCodes type="QV" numeric="968" alpha3="QVV"/>
-        <territoryCodes type="QW" numeric="969" alpha3="QWW"/>
-        <territoryCodes type="QX" numeric="970" alpha3="QXX"/>
-        <territoryCodes type="QY" numeric="971" alpha3="QYY"/>
-        <territoryCodes type="QZ" numeric="972" alpha3="QZZ"/>
-        <territoryCodes type="RE" numeric="638" alpha3="REU"/>
-        <territoryCodes type="RO" numeric="642" alpha3="ROU"/>
-        <territoryCodes type="RS" numeric="688" alpha3="SRB" fips10="RB"/>
-        <territoryCodes type="RU" numeric="643" alpha3="RUS" fips10="RS" internet="RU RU"/>
-        <territoryCodes type="RW" numeric="646" alpha3="RWA"/>
-        <territoryCodes type="SA" numeric="682" alpha3="SAU"/>
-        <territoryCodes type="SB" numeric="090" alpha3="SLB" fips10="BP"/>
-        <territoryCodes type="SC" numeric="690" alpha3="SYC" fips10="SE"/>
-        <territoryCodes type="SD" numeric="736" alpha3="SDN" fips10="SU"/>
-        <territoryCodes type="SE" numeric="752" alpha3="SWE" fips10="SW"/>
-        <territoryCodes type="SG" numeric="702" alpha3="SGP" fips10="SN"/>
-        <territoryCodes type="SH" numeric="654" alpha3="SHN" internet="SH AC"/>
-        <territoryCodes type="SI" numeric="705" alpha3="SVN"/>
-        <territoryCodes type="SJ" numeric="744" alpha3="SJM" fips10="SV"/>
-        <territoryCodes type="SK" numeric="703" alpha3="SVK" fips10="LO"/>
-        <territoryCodes type="SL" numeric="694" alpha3="SLE"/>
-        <territoryCodes type="SM" numeric="674" alpha3="SMR"/>
-        <territoryCodes type="SN" numeric="686" alpha3="SEN" fips10="SG"/>
-        <territoryCodes type="SO" numeric="706" alpha3="SOM"/>
-        <territoryCodes type="SR" numeric="740" alpha3="SUR" fips10="NS"/>
-        <territoryCodes type="ST" numeric="678" alpha3="STP" fips10="TP"/>
-        <territoryCodes type="SU" numeric="810" alpha3="SUN"/>
-        <territoryCodes type="SV" numeric="222" alpha3="SLV" fips10="ES"/>
-        <territoryCodes type="SY" numeric="760" alpha3="SYR"/>
-        <territoryCodes type="SZ" numeric="748" alpha3="SWZ" fips10="WZ"/>
-        <territoryCodes type="TC" numeric="796" alpha3="TCA" fips10="TK"/>
-        <territoryCodes type="TD" numeric="148" alpha3="TCD" fips10="CD"/>
-        <territoryCodes type="TF" numeric="260" alpha3="ATF" fips10="FS"/>
-        <territoryCodes type="TG" numeric="768" alpha3="TGO" fips10="TO"/>
-        <territoryCodes type="TH" numeric="764" alpha3="THA"/>
-        <territoryCodes type="TJ" numeric="762" alpha3="TJK" fips10="TI"/>
-        <territoryCodes type="TK" numeric="772" alpha3="TKL" fips10="TL"/>
-        <territoryCodes type="TL" numeric="626" alpha3="TLS" fips10="TT" internet="TL TP"/>
-        <territoryCodes type="TM" numeric="795" alpha3="TKM" fips10="TX"/>
-        <territoryCodes type="TN" numeric="788" alpha3="TUN" fips10="TS"/>
-        <territoryCodes type="TO" numeric="776" alpha3="TON" fips10="TN"/>
-        <territoryCodes type="TP" numeric="626" alpha3="TMP"/>
-        <territoryCodes type="TR" numeric="792" alpha3="TUR" fips10="TU"/>
-        <territoryCodes type="TT" numeric="780" alpha3="TTO" fips10="TD"/>
-        <territoryCodes type="TV" numeric="798" alpha3="TUV"/>
-        <territoryCodes type="TW" numeric="158" alpha3="TWN"/>
-        <territoryCodes type="TZ" numeric="834" alpha3="TZA"/>
-        <territoryCodes type="UA" numeric="804" alpha3="UKR" fips10="UP"/>
-        <territoryCodes type="UG" numeric="800" alpha3="UGA"/>
-        <territoryCodes type="UM" numeric="581" alpha3="UMI"/>
-        <territoryCodes type="US" numeric="840" alpha3="USA"/>
-        <territoryCodes type="UY" numeric="858" alpha3="URY"/>
-        <territoryCodes type="UZ" numeric="860" alpha3="UZB"/>
-        <territoryCodes type="VA" numeric="336" alpha3="VAT" fips10="VT"/>
-        <territoryCodes type="VC" numeric="670" alpha3="VCT"/>
-        <territoryCodes type="VE" numeric="862" alpha3="VEN"/>
-        <territoryCodes type="VG" numeric="092" alpha3="VGB" fips10="VI"/>
-        <territoryCodes type="VI" numeric="850" alpha3="VIR" fips10="VQ"/>
-        <territoryCodes type="VN" numeric="704" alpha3="VNM" fips10="VM"/>
-        <territoryCodes type="VU" numeric="548" alpha3="VUT" fips10="NH"/>
-        <territoryCodes type="WF" numeric="876" alpha3="WLF"/>
-        <territoryCodes type="WS" numeric="882" alpha3="WSM"/>
-        <territoryCodes type="XA" numeric="973" alpha3="XAA"/>
-        <territoryCodes type="XB" numeric="974" alpha3="XBB"/>
-        <territoryCodes type="XC" numeric="975" alpha3="XCC"/>
-        <territoryCodes type="XD" numeric="976" alpha3="XDD"/>
-        <territoryCodes type="XE" numeric="977" alpha3="XEE"/>
-        <territoryCodes type="XF" numeric="978" alpha3="XFF"/>
-        <territoryCodes type="XG" numeric="979" alpha3="XGG"/>
-        <territoryCodes type="XH" numeric="980" alpha3="XHH"/>
-        <territoryCodes type="XI" numeric="981" alpha3="XII"/>
-        <territoryCodes type="XJ" numeric="982" alpha3="XJJ"/>
-        <territoryCodes type="XK" numeric="983" alpha3="XKK"/>
-        <territoryCodes type="XL" numeric="984" alpha3="XLL"/>
-        <territoryCodes type="XM" numeric="985" alpha3="XMM"/>
-        <territoryCodes type="XN" numeric="986" alpha3="XNN"/>
-        <territoryCodes type="XO" numeric="987" alpha3="XOO"/>
-        <territoryCodes type="XP" numeric="988" alpha3="XPP"/>
-        <territoryCodes type="XQ" numeric="989" alpha3="XQQ"/>
-        <territoryCodes type="XR" numeric="990" alpha3="XRR"/>
-        <territoryCodes type="XS" numeric="991" alpha3="XSS"/>
-        <territoryCodes type="XT" numeric="992" alpha3="XTT"/>
-        <territoryCodes type="XU" numeric="993" alpha3="XUU"/>
-        <territoryCodes type="XV" numeric="994" alpha3="XVV"/>
-        <territoryCodes type="XW" numeric="995" alpha3="XWW"/>
-        <territoryCodes type="XX" numeric="996" alpha3="XXX"/>
-        <territoryCodes type="XY" numeric="997" alpha3="XYY"/>
-        <territoryCodes type="XZ" numeric="998" alpha3="XZZ"/>
-        <territoryCodes type="YD" numeric="720" alpha3="YMD"/>
-        <territoryCodes type="YE" numeric="887" alpha3="YEM" fips10="YM"/>
-        <territoryCodes type="YT" numeric="175" alpha3="MYT" fips10="MF"/>
-        <territoryCodes type="YU" numeric="891" alpha3="YUG"/>
-        <territoryCodes type="ZA" numeric="710" alpha3="ZAF" fips10="SF"/>
-        <territoryCodes type="ZM" numeric="894" alpha3="ZMB" fips10="ZA"/>
-        <territoryCodes type="ZR" numeric="180" alpha3="ZAR"/>
-        <territoryCodes type="ZW" numeric="716" alpha3="ZWE" fips10="ZI"/>
-        <territoryCodes type="ZZ" numeric="999" alpha3="ZZZ" internet="AERO ARPA BIZ CAT COM COOP EDU GOV INFO INT JOBS MIL MOBI MUSEUM NAME NET ORG PRO TRAVEL"/>
-    </codeMappings>
-
-    <bcp47KeywordMappings>
-        <mapKeys>
-            <keyMap type="collation" bcp47="co"/>
-            <keyMap type="calendar" bcp47="ca"/>
-            <keyMap type="currency" bcp47="cu"/>
-            <keyMap type="numbers" bcp47="nu"/>
-            <keyMap type="timezone" bcp47="tz"/>
-            <keyMap type="colStrength" bcp47="ks"/>
-            <keyMap type="colAlternate" bcp47="ka"/>
-            <keyMap type="colBackwards" bcp47="kb"/>
-            <keyMap type="colNormalization" bcp47="kk"/>
-            <keyMap type="colCaseLevel" bcp47="kc"/>
-            <keyMap type="colCaseFirst" bcp47="kf"/>
-            <keyMap type="colHiraganaQuaternary" bcp47="kh"/>
-            <keyMap type="colNumeric" bcp47="kn"/>
-            <keyMap type="variableTop" bcp47="vt"/>
-        </mapKeys>
-        <mapTypes type="collation">
-            <typeMap type="digits-after" bcp47="digitaft"/>
-            <typeMap type="gb2312han" bcp47="gb2312"/>
-            <typeMap type="phonebook" bcp47="phonebk"/>
-        </mapTypes>
-        <mapTypes type="colStrength">
-            <typeMap type="primary" bcp47="level1"/>
-            <typeMap type="secondary" bcp47="level2"/>
-            <typeMap type="tertiary" bcp47="level3"/>
-            <typeMap type="quaternary" bcp47="level4"/>
-            <typeMap type="identical" bcp47="identic"/>
-        </mapTypes>
-        <mapTypes type="colAlternate">
-            <typeMap type="non-ignorable" bcp47="nonignore"/>
-        </mapTypes>
-        <mapTypes type="colBackwards">
-            <typeMap type="yes" bcp47="true"/>
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="colNormalization">
-            <typeMap type="yes" bcp47="true"/>
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="colCaseLevel">
-            <typeMap type="yes" bcp47="true"/>
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="colCaseFirst">
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="colHiraganaQuaternary">
-            <typeMap type="yes" bcp47="true"/>
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="colNumeric">
-            <typeMap type="yes" bcp47="true"/>
-            <typeMap type="no" bcp47="false"/>
-        </mapTypes>
-        <mapTypes type="calendar">
-            <typeMap type="ethiopic-amete-alem" bcp47="ethiopaa"/>
-            <typeMap type="gregorian" bcp47="gregory"/>
-            <typeMap type="islamic-civil" bcp47="islamicc"/>
-        </mapTypes>
-        <mapTypes type="timezone">
-            <typeMap type="Africa/Abidjan" bcp47="ciabj"/>
-            <typeMap type="Africa/Accra" bcp47="ghacc"/>
-            <typeMap type="Africa/Addis_Ababa" bcp47="etadd"/>
-            <typeMap type="Africa/Algiers" bcp47="dzalg"/>
-            <typeMap type="Africa/Asmera" bcp47="erasm"/>
-            <typeMap type="Africa/Bamako" bcp47="mlbko"/>
-            <typeMap type="Africa/Bangui" bcp47="cfbgf"/>
-            <typeMap type="Africa/Banjul" bcp47="gmbjl"/>
-            <typeMap type="Africa/Bissau" bcp47="gwoxb"/>
-            <typeMap type="Africa/Blantyre" bcp47="mwblz"/>
-            <typeMap type="Africa/Brazzaville" bcp47="cgbzv"/>
-            <typeMap type="Africa/Bujumbura" bcp47="bibjm"/>
-            <typeMap type="Africa/Cairo" bcp47="egcai"/>
-            <typeMap type="Africa/Casablanca" bcp47="macas"/>
-            <typeMap type="Africa/Ceuta" bcp47="esceu"/>
-            <typeMap type="Africa/Conakry" bcp47="gncky"/>
-            <typeMap type="Africa/Dakar" bcp47="sndkr"/>
-            <typeMap type="Africa/Dar_es_Salaam" bcp47="tzdar"/>
-            <typeMap type="Africa/Djibouti" bcp47="djjib"/>
-            <typeMap type="Africa/Douala" bcp47="cmdla"/>
-            <typeMap type="Africa/El_Aaiun" bcp47="eheai"/>
-            <typeMap type="Africa/Freetown" bcp47="slfna"/>
-            <typeMap type="Africa/Gaborone" bcp47="bwgbe"/>
-            <typeMap type="Africa/Harare" bcp47="zwhre"/>
-            <typeMap type="Africa/Johannesburg" bcp47="zajnb"/>
-            <typeMap type="Africa/Kampala" bcp47="ugkla"/>
-            <typeMap type="Africa/Khartoum" bcp47="sdkrt"/>
-            <typeMap type="Africa/Kigali" bcp47="rwkgl"/>
-            <typeMap type="Africa/Kinshasa" bcp47="cdfih"/>
-            <typeMap type="Africa/Lagos" bcp47="nglos"/>
-            <typeMap type="Africa/Libreville" bcp47="galbv"/>
-            <typeMap type="Africa/Lome" bcp47="tglfw"/>
-            <typeMap type="Africa/Luanda" bcp47="aolad"/>
-            <typeMap type="Africa/Lubumbashi" bcp47="cdfbm"/>
-            <typeMap type="Africa/Lusaka" bcp47="zmlun"/>
-            <typeMap type="Africa/Malabo" bcp47="gqssg"/>
-            <typeMap type="Africa/Maputo" bcp47="mzmpm"/>
-            <typeMap type="Africa/Maseru" bcp47="lsmsu"/>
-            <typeMap type="Africa/Mbabane" bcp47="szqmn"/>
-            <typeMap type="Africa/Mogadishu" bcp47="somgq"/>
-            <typeMap type="Africa/Monrovia" bcp47="lrmlw"/>
-            <typeMap type="Africa/Nairobi" bcp47="kenbo"/>
-            <typeMap type="Africa/Ndjamena" bcp47="tdndj"/>
-            <typeMap type="Africa/Niamey" bcp47="nenim"/>
-            <typeMap type="Africa/Nouakchott" bcp47="mrnkc"/>
-            <typeMap type="Africa/Ouagadougou" bcp47="bfoua"/>
-            <typeMap type="Africa/Porto-Novo" bcp47="bjptn"/>
-            <typeMap type="Africa/Sao_Tome" bcp47="sttms"/>
-            <typeMap type="Africa/Tripoli" bcp47="lytip"/>
-            <typeMap type="Africa/Tunis" bcp47="tntun"/>
-            <typeMap type="Africa/Windhoek" bcp47="nawdh"/>
-            <typeMap type="America/Adak" bcp47="usadk"/>
-            <typeMap type="America/Anchorage" bcp47="usanc"/>
-            <typeMap type="America/Anguilla" bcp47="aiaxa"/>
-            <typeMap type="America/Antigua" bcp47="aganu"/>
-            <typeMap type="America/Araguaina" bcp47="braux"/>
-            <typeMap type="America/Argentina/La_Rioja" bcp47="arirj"/>
-            <typeMap type="America/Argentina/Rio_Gallegos" bcp47="arrgl"/>
-            <typeMap type="America/Argentina/Salta" bcp47="arsla"/>
-            <typeMap type="America/Argentina/San_Juan" bcp47="aruaq"/>
-            <typeMap type="America/Argentina/San_Luis" bcp47="arluq"/>
-            <typeMap type="America/Argentina/Tucuman" bcp47="artuc"/>
-            <typeMap type="America/Argentina/Ushuaia" bcp47="arush"/>
-            <typeMap type="America/Aruba" bcp47="awaua"/>
-            <typeMap type="America/Asuncion" bcp47="pyasu"/>
-            <typeMap type="America/Bahia" bcp47="brssa"/>
-            <typeMap type="America/Barbados" bcp47="bbbgi"/>
-            <typeMap type="America/Belem" bcp47="brbel"/>
-            <typeMap type="America/Belize" bcp47="bzbze"/>
-            <typeMap type="America/Blanc-Sablon" bcp47="caybx"/>
-            <typeMap type="America/Boa_Vista" bcp47="brbvb"/>
-            <typeMap type="America/Bogota" bcp47="cobog"/>
-            <typeMap type="America/Boise" bcp47="usboi"/>
-            <typeMap type="America/Buenos_Aires" bcp47="arbue"/>
-            <typeMap type="America/Cambridge_Bay" bcp47="caycb"/>
-            <typeMap type="America/Campo_Grande" bcp47="brcgr"/>
-            <typeMap type="America/Cancun" bcp47="mxcun"/>
-            <typeMap type="America/Caracas" bcp47="veccs"/>
-            <typeMap type="America/Catamarca" bcp47="arctc"/>
-            <typeMap type="America/Cayenne" bcp47="gfcay"/>
-            <typeMap type="America/Cayman" bcp47="kygec"/>
-            <typeMap type="America/Chicago" bcp47="uschi"/>
-            <typeMap type="America/Chihuahua" bcp47="mxchi"/>
-            <typeMap type="America/Coral_Harbour" bcp47="cayzs"/>
-            <typeMap type="America/Cordoba" bcp47="arcor"/>
-            <typeMap type="America/Costa_Rica" bcp47="crsjo"/>
-            <typeMap type="America/Cuiaba" bcp47="brcgb"/>
-            <typeMap type="America/Curacao" bcp47="ancur"/>
-            <typeMap type="America/Danmarkshavn" bcp47="gldkshvn"/>
-            <typeMap type="America/Dawson" bcp47="cayda"/>
-            <typeMap type="America/Dawson_Creek" bcp47="caydq"/>
-            <typeMap type="America/Denver" bcp47="usden"/>
-            <typeMap type="America/Detroit" bcp47="usdet"/>
-            <typeMap type="America/Dominica" bcp47="dmdom"/>
-            <typeMap type="America/Edmonton" bcp47="caedm"/>
-            <typeMap type="America/Eirunepe" bcp47="brern"/>
-            <typeMap type="America/El_Salvador" bcp47="svsal"/>
-            <typeMap type="America/Fortaleza" bcp47="brfor"/>
-            <typeMap type="America/Glace_Bay" bcp47="caglb"/>
-            <typeMap type="America/Godthab" bcp47="glgoh"/>
-            <typeMap type="America/Goose_Bay" bcp47="cagoo"/>
-            <typeMap type="America/Grand_Turk" bcp47="tcgdt"/>
-            <typeMap type="America/Grenada" bcp47="gdgnd"/>
-            <typeMap type="America/Guadeloupe" bcp47="gpbbr"/>
-            <typeMap type="America/Guatemala" bcp47="gtgua"/>
-            <typeMap type="America/Guayaquil" bcp47="ecgye"/>
-            <typeMap type="America/Guyana" bcp47="gygeo"/>
-            <typeMap type="America/Halifax" bcp47="cahal"/>
-            <typeMap type="America/Havana" bcp47="cuhav"/>
-            <typeMap type="America/Hermosillo" bcp47="mxhmo"/>
-            <typeMap type="America/Indiana/Knox" bcp47="usknx"/>
-            <typeMap type="America/Indiana/Marengo" bcp47="usaeg"/>
-            <typeMap type="America/Indiana/Petersburg" bcp47="uswsq"/>
-            <typeMap type="America/Indiana/Tell_City" bcp47="ustel"/>
-            <typeMap type="America/Indiana/Vevay" bcp47="usinvev"/>
-            <typeMap type="America/Indiana/Vincennes" bcp47="usoea"/>
-            <typeMap type="America/Indiana/Winamac" bcp47="uswlz"/>
-            <typeMap type="America/Indianapolis" bcp47="usind"/>
-            <typeMap type="America/Inuvik" bcp47="cayev"/>
-            <typeMap type="America/Iqaluit" bcp47="caiql"/>
-            <typeMap type="America/Jamaica" bcp47="jmkin"/>
-            <typeMap type="America/Jujuy" bcp47="arjuj"/>
-            <typeMap type="America/Juneau" bcp47="usjnu"/>
-            <typeMap type="America/Kentucky/Monticello" bcp47="usmoc"/>
-            <typeMap type="America/La_Paz" bcp47="bolpb"/>
-            <typeMap type="America/Lima" bcp47="pelim"/>
-            <typeMap type="America/Los_Angeles" bcp47="uslax"/>
-            <typeMap type="America/Louisville" bcp47="uslui"/>
-            <typeMap type="America/Maceio" bcp47="brmcz"/>
-            <typeMap type="America/Managua" bcp47="nimga"/>
-            <typeMap type="America/Manaus" bcp47="brmao"/>
-            <typeMap type="America/Marigot" bcp47="gpmsb"/>
-            <typeMap type="America/Martinique" bcp47="mqfdf"/>
-            <typeMap type="America/Mazatlan" bcp47="mxmzt"/>
-            <typeMap type="America/Mendoza" bcp47="armdz"/>
-            <typeMap type="America/Menominee" bcp47="usmnm"/>
-            <typeMap type="America/Merida" bcp47="mxmid"/>
-            <typeMap type="America/Mexico_City" bcp47="mxmex"/>
-            <typeMap type="America/Miquelon" bcp47="pmmqc"/>
-            <typeMap type="America/Moncton" bcp47="camon"/>
-            <typeMap type="America/Monterrey" bcp47="mxmty"/>
-            <typeMap type="America/Montevideo" bcp47="uymvd"/>
-            <typeMap type="America/Montreal" bcp47="camtr"/>
-            <typeMap type="America/Montserrat" bcp47="msmni"/>
-            <typeMap type="America/Nassau" bcp47="bsnas"/>
-            <typeMap type="America/New_York" bcp47="usnyc"/>
-            <typeMap type="America/Nipigon" bcp47="cathu"/>
-            <typeMap type="America/Nome" bcp47="usome"/>
-            <typeMap type="America/Noronha" bcp47="brfen"/>
-            <typeMap type="America/North_Dakota/Center" bcp47="usndcnt"/>
-            <typeMap type="America/North_Dakota/New_Salem" bcp47="usndnsl"/>
-            <typeMap type="America/Panama" bcp47="papty"/>
-            <typeMap type="America/Pangnirtung" bcp47="capnt"/>
-            <typeMap type="America/Paramaribo" bcp47="srpbm"/>
-            <typeMap type="America/Phoenix" bcp47="usphx"/>
-            <typeMap type="America/Port-au-Prince" bcp47="htpap"/>
-            <typeMap type="America/Port_of_Spain" bcp47="ttpos"/>
-            <typeMap type="America/Porto_Velho" bcp47="brpvh"/>
-            <typeMap type="America/Puerto_Rico" bcp47="prsju"/>
-            <typeMap type="America/Rainy_River" bcp47="caffs"/>
-            <typeMap type="America/Rankin_Inlet" bcp47="cayek"/>
-            <typeMap type="America/Recife" bcp47="brrec"/>
-            <typeMap type="America/Regina" bcp47="careg"/>
-            <typeMap type="America/Resolute" bcp47="careb"/>
-            <typeMap type="America/Rio_Branco" bcp47="brrbr"/>
-            <typeMap type="America/Santarem" bcp47="brstm"/>
-            <typeMap type="America/Santiago" bcp47="clscl"/>
-            <typeMap type="America/Santo_Domingo" bcp47="dosdq"/>
-            <typeMap type="America/Sao_Paulo" bcp47="brsao"/>
-            <typeMap type="America/Scoresbysund" bcp47="globy"/>
-            <typeMap type="America/Shiprock" bcp47="usnavajo"/>
-            <typeMap type="America/St_Barthelemy" bcp47="gpsbh"/>
-            <typeMap type="America/St_Johns" bcp47="casjf"/>
-            <typeMap type="America/St_Kitts" bcp47="knbas"/>
-            <typeMap type="America/St_Lucia" bcp47="lccas"/>
-            <typeMap type="America/St_Thomas" bcp47="vistt"/>
-            <typeMap type="America/St_Vincent" bcp47="vcsvd"/>
-            <typeMap type="America/Swift_Current" bcp47="cayyn"/>
-            <typeMap type="America/Tegucigalpa" bcp47="hntgu"/>
-            <typeMap type="America/Thule" bcp47="glthu"/>
-            <typeMap type="America/Thunder_Bay" bcp47="cathu"/>
-            <typeMap type="America/Tijuana" bcp47="mxtij"/>
-            <typeMap type="America/Toronto" bcp47="cator"/>
-            <typeMap type="America/Tortola" bcp47="vgtov"/>
-            <typeMap type="America/Vancouver" bcp47="cavan"/>
-            <typeMap type="America/Whitehorse" bcp47="cayxy"/>
-            <typeMap type="America/Winnipeg" bcp47="cawnp"/>
-            <typeMap type="America/Yakutat" bcp47="usyak"/>
-            <typeMap type="America/Yellowknife" bcp47="cayzf"/>
-            <typeMap type="Antarctica/Casey" bcp47="aqcas"/>
-            <typeMap type="Antarctica/Davis" bcp47="aqdav"/>
-            <typeMap type="Antarctica/DumontDUrville" bcp47="aqddu"/>
-            <typeMap type="Antarctica/Mawson" bcp47="aqmaw"/>
-            <typeMap type="Antarctica/McMurdo" bcp47="aqmcm"/>
-            <typeMap type="Antarctica/Palmer" bcp47="aqplm"/>
-            <typeMap type="Antarctica/Rothera" bcp47="aqrot"/>
-            <typeMap type="Antarctica/South_Pole" bcp47="aqams"/>
-            <typeMap type="Antarctica/Syowa" bcp47="aqsyw"/>
-            <typeMap type="Antarctica/Vostok" bcp47="aqvos"/>
-            <typeMap type="Arctic/Longyearbyen" bcp47="sjlyr"/>
-            <typeMap type="Asia/Aden" bcp47="yeade"/>
-            <typeMap type="Asia/Almaty" bcp47="kzala"/>
-            <typeMap type="Asia/Amman" bcp47="joamm"/>
-            <typeMap type="Asia/Anadyr" bcp47="rudyr"/>
-            <typeMap type="Asia/Aqtau" bcp47="kzaau"/>
-            <typeMap type="Asia/Aqtobe" bcp47="kzakx"/>
-            <typeMap type="Asia/Ashgabat" bcp47="tmasb"/>
-            <typeMap type="Asia/Baghdad" bcp47="iqbgw"/>
-            <typeMap type="Asia/Bahrain" bcp47="bhbah"/>
-            <typeMap type="Asia/Baku" bcp47="azbak"/>
-            <typeMap type="Asia/Bangkok" bcp47="thbkk"/>
-            <typeMap type="Asia/Beirut" bcp47="lbbey"/>
-            <typeMap type="Asia/Bishkek" bcp47="kgfru"/>
-            <typeMap type="Asia/Brunei" bcp47="bnbwn"/>
-            <typeMap type="Asia/Calcutta" bcp47="inccu"/>
-            <typeMap type="Asia/Choibalsan" bcp47="mncoq"/>
-            <typeMap type="Asia/Chongqing" bcp47="cnckg"/>
-            <typeMap type="Asia/Colombo" bcp47="lkcmb"/>
-            <typeMap type="Asia/Damascus" bcp47="sydam"/>
-            <typeMap type="Asia/Dhaka" bcp47="bddac"/>
-            <typeMap type="Asia/Dili" bcp47="tldil"/>
-            <typeMap type="Asia/Dubai" bcp47="aedxb"/>
-            <typeMap type="Asia/Dushanbe" bcp47="tjdyu"/>
-            <typeMap type="Asia/Gaza" bcp47="gaza"/>
-            <typeMap type="Asia/Harbin" bcp47="cnhrb"/>
-            <typeMap type="Asia/Hong_Kong" bcp47="hkhkg"/>
-            <typeMap type="Asia/Hovd" bcp47="mnhvd"/>
-            <typeMap type="Asia/Irkutsk" bcp47="ruikt"/>
-            <typeMap type="Asia/Jakarta" bcp47="idjkt"/>
-            <typeMap type="Asia/Jayapura" bcp47="iddjj"/>
-            <typeMap type="Asia/Jerusalem" bcp47="jeruslm"/>
-            <typeMap type="Asia/Kabul" bcp47="afkbl"/>
-            <typeMap type="Asia/Kamchatka" bcp47="rupkc"/>
-            <typeMap type="Asia/Karachi" bcp47="pkkhi"/>
-            <typeMap type="Asia/Kashgar" bcp47="cnkhg"/>
-            <typeMap type="Asia/Katmandu" bcp47="npktm"/>
-            <typeMap type="Asia/Krasnoyarsk" bcp47="rukra"/>
-            <typeMap type="Asia/Kuala_Lumpur" bcp47="mykul"/>
-            <typeMap type="Asia/Kuching" bcp47="mykch"/>
-            <typeMap type="Asia/Kuwait" bcp47="kwkwi"/>
-            <typeMap type="Asia/Macau" bcp47="momfm"/>
-            <typeMap type="Asia/Magadan" bcp47="rugdx"/>
-            <typeMap type="Asia/Makassar" bcp47="idmak"/>
-            <typeMap type="Asia/Manila" bcp47="phmnl"/>
-            <typeMap type="Asia/Muscat" bcp47="ommct"/>
-            <typeMap type="Asia/Nicosia" bcp47="cynic"/>
-            <typeMap type="Asia/Novosibirsk" bcp47="ruovb"/>
-            <typeMap type="Asia/Omsk" bcp47="ruoms"/>
-            <typeMap type="Asia/Oral" bcp47="kzura"/>
-            <typeMap type="Asia/Phnom_Penh" bcp47="khpnh"/>
-            <typeMap type="Asia/Pontianak" bcp47="idpnk"/>
-            <typeMap type="Asia/Pyongyang" bcp47="kpfnj"/>
-            <typeMap type="Asia/Qatar" bcp47="qadoh"/>
-            <typeMap type="Asia/Qyzylorda" bcp47="kzkzo"/>
-            <typeMap type="Asia/Rangoon" bcp47="mmrgn"/>
-            <typeMap type="Asia/Riyadh" bcp47="saruh"/>
-            <typeMap type="Asia/Saigon" bcp47="vnsgn"/>
-            <typeMap type="Asia/Sakhalin" bcp47="ruuus"/>
-            <typeMap type="Asia/Samarkand" bcp47="uzskd"/>
-            <typeMap type="Asia/Seoul" bcp47="krsel"/>
-            <typeMap type="Asia/Shanghai" bcp47="cnsha"/>
-            <typeMap type="Asia/Singapore" bcp47="sgsin"/>
-            <typeMap type="Asia/Taipei" bcp47="twtpe"/>
-            <typeMap type="Asia/Tashkent" bcp47="uztas"/>
-            <typeMap type="Asia/Tbilisi" bcp47="getbs"/>
-            <typeMap type="Asia/Tehran" bcp47="irthr"/>
-            <typeMap type="Asia/Thimphu" bcp47="btthi"/>
-            <typeMap type="Asia/Tokyo" bcp47="jptyo"/>
-            <typeMap type="Asia/Ulaanbaatar" bcp47="mnuln"/>
-            <typeMap type="Asia/Urumqi" bcp47="cnurc"/>
-            <typeMap type="Asia/Vientiane" bcp47="lavte"/>
-            <typeMap type="Asia/Vladivostok" bcp47="ruvvo"/>
-            <typeMap type="Asia/Yakutsk" bcp47="ruyks"/>
-            <typeMap type="Asia/Yekaterinburg" bcp47="ruyek"/>
-            <typeMap type="Asia/Yerevan" bcp47="amevn"/>
-            <typeMap type="Atlantic/Azores" bcp47="ptpdl"/>
-            <typeMap type="Atlantic/Bermuda" bcp47="bmbda"/>
-            <typeMap type="Atlantic/Canary" bcp47="eslpa"/>
-            <typeMap type="Atlantic/Cape_Verde" bcp47="cvrai"/>
-            <typeMap type="Atlantic/Faeroe" bcp47="fotho"/>
-            <typeMap type="Atlantic/Madeira" bcp47="ptfnc"/>
-            <typeMap type="Atlantic/Reykjavik" bcp47="isrey"/>
-            <typeMap type="Atlantic/South_Georgia" bcp47="gsgrv"/>
-            <typeMap type="Atlantic/St_Helena" bcp47="shshn"/>
-            <typeMap type="Atlantic/Stanley" bcp47="fkpsy"/>
-            <typeMap type="Australia/Adelaide" bcp47="auadl"/>
-            <typeMap type="Australia/Brisbane" bcp47="aubne"/>
-            <typeMap type="Australia/Broken_Hill" bcp47="aubhq"/>
-            <typeMap type="Australia/Currie" bcp47="aukns"/>
-            <typeMap type="Australia/Darwin" bcp47="audrw"/>
-            <typeMap type="Australia/Eucla" bcp47="aueuc"/>
-            <typeMap type="Australia/Hobart" bcp47="auhba"/>
-            <typeMap type="Australia/Lindeman" bcp47="auldc"/>
-            <typeMap type="Australia/Lord_Howe" bcp47="auldh"/>
-            <typeMap type="Australia/Melbourne" bcp47="aumel"/>
-            <typeMap type="Australia/Perth" bcp47="auper"/>
-            <typeMap type="Australia/Sydney" bcp47="ausyd"/>
-            <typeMap type="Etc/GMT" bcp47="utc"/>
-            <typeMap type="Etc/GMT+1" bcp47="utcw01"/>
-            <typeMap type="Etc/GMT+10" bcp47="utcw10"/>
-            <typeMap type="Etc/GMT+11" bcp47="utcw11"/>
-            <typeMap type="Etc/GMT+12" bcp47="utcw12"/>
-            <typeMap type="Etc/GMT+2" bcp47="utcw02"/>
-            <typeMap type="Etc/GMT+3" bcp47="utcw03"/>
-            <typeMap type="Etc/GMT+4" bcp47="utcw04"/>
-            <typeMap type="Etc/GMT+5" bcp47="utcw05"/>
-            <typeMap type="Etc/GMT+6" bcp47="utcw06"/>
-            <typeMap type="Etc/GMT+7" bcp47="utcw07"/>
-            <typeMap type="Etc/GMT+8" bcp47="utcw08"/>
-            <typeMap type="Etc/GMT+9" bcp47="utcw09"/>
-            <typeMap type="Etc/GMT-1" bcp47="utce01"/>
-            <typeMap type="Etc/GMT-10" bcp47="utce10"/>
-            <typeMap type="Etc/GMT-11" bcp47="utce11"/>
-            <typeMap type="Etc/GMT-12" bcp47="utce12"/>
-            <typeMap type="Etc/GMT-13" bcp47="utce13"/>
-            <typeMap type="Etc/GMT-14" bcp47="utce14"/>
-            <typeMap type="Etc/GMT-2" bcp47="utce02"/>
-            <typeMap type="Etc/GMT-3" bcp47="utce03"/>
-            <typeMap type="Etc/GMT-4" bcp47="utce04"/>
-            <typeMap type="Etc/GMT-5" bcp47="utce05"/>
-            <typeMap type="Etc/GMT-6" bcp47="utce06"/>
-            <typeMap type="Etc/GMT-7" bcp47="utce07"/>
-            <typeMap type="Etc/GMT-8" bcp47="utce08"/>
-            <typeMap type="Etc/GMT-9" bcp47="utce09"/>
-            <typeMap type="Etc/Unknown" bcp47="unk"/>
-            <typeMap type="Europe/Amsterdam" bcp47="nlams"/>
-            <typeMap type="Europe/Andorra" bcp47="adalv"/>
-            <typeMap type="Europe/Athens" bcp47="grath"/>
-            <typeMap type="Europe/Belgrade" bcp47="rsbeg"/>
-            <typeMap type="Europe/Berlin" bcp47="deber"/>
-            <typeMap type="Europe/Bratislava" bcp47="skbts"/>
-            <typeMap type="Europe/Brussels" bcp47="bebru"/>
-            <typeMap type="Europe/Bucharest" bcp47="robuh"/>
-            <typeMap type="Europe/Budapest" bcp47="hubud"/>
-            <typeMap type="Europe/Chisinau" bcp47="mdkiv"/>
-            <typeMap type="Europe/Copenhagen" bcp47="dkcph"/>
-            <typeMap type="Europe/Dublin" bcp47="iedub"/>
-            <typeMap type="Europe/Gibraltar" bcp47="gigib"/>
-            <typeMap type="Europe/Guernsey" bcp47="gggci"/>
-            <typeMap type="Europe/Helsinki" bcp47="fihel"/>
-            <typeMap type="Europe/Isle_of_Man" bcp47="imdgs"/>
-            <typeMap type="Europe/Istanbul" bcp47="trist"/>
-            <typeMap type="Europe/Jersey" bcp47="jesth"/>
-            <typeMap type="Europe/Kaliningrad" bcp47="rukgd"/>
-            <typeMap type="Europe/Kiev" bcp47="uaiev"/>
-            <typeMap type="Europe/Lisbon" bcp47="ptlis"/>
-            <typeMap type="Europe/Ljubljana" bcp47="silju"/>
-            <typeMap type="Europe/London" bcp47="gblon"/>
-            <typeMap type="Europe/Luxembourg" bcp47="lulux"/>
-            <typeMap type="Europe/Madrid" bcp47="esmad"/>
-            <typeMap type="Europe/Malta" bcp47="mtmla"/>
-            <typeMap type="Europe/Mariehamn" bcp47="fimhq"/>
-            <typeMap type="Europe/Minsk" bcp47="bymsq"/>
-            <typeMap type="Europe/Monaco" bcp47="mcmon"/>
-            <typeMap type="Europe/Moscow" bcp47="rumow"/>
-            <typeMap type="Europe/Oslo" bcp47="noosl"/>
-            <typeMap type="Europe/Paris" bcp47="frpar"/>
-            <typeMap type="Europe/Podgorica" bcp47="metgd"/>
-            <typeMap type="Europe/Prague" bcp47="czprg"/>
-            <typeMap type="Europe/Riga" bcp47="lvrix"/>
-            <typeMap type="Europe/Rome" bcp47="itrom"/>
-            <typeMap type="Europe/Samara" bcp47="rukuf"/>
-            <typeMap type="Europe/San_Marino" bcp47="smsai"/>
-            <typeMap type="Europe/Sarajevo" bcp47="basjj"/>
-            <typeMap type="Europe/Simferopol" bcp47="uasip"/>
-            <typeMap type="Europe/Skopje" bcp47="mkskp"/>
-            <typeMap type="Europe/Sofia" bcp47="bgsof"/>
-            <typeMap type="Europe/Stockholm" bcp47="sesto"/>
-            <typeMap type="Europe/Tallinn" bcp47="eetll"/>
-            <typeMap type="Europe/Tirane" bcp47="altia"/>
-            <typeMap type="Europe/Uzhgorod" bcp47="uauzh"/>
-            <typeMap type="Europe/Vaduz" bcp47="livdz"/>
-            <typeMap type="Europe/Vatican" bcp47="vavat"/>
-            <typeMap type="Europe/Vienna" bcp47="atvie"/>
-            <typeMap type="Europe/Vilnius" bcp47="ltvno"/>
-            <typeMap type="Europe/Volgograd" bcp47="ruvog"/>
-            <typeMap type="Europe/Warsaw" bcp47="plwaw"/>
-            <typeMap type="Europe/Zagreb" bcp47="hrzag"/>
-            <typeMap type="Europe/Zaporozhye" bcp47="uaozh"/>
-            <typeMap type="Europe/Zurich" bcp47="chzrh"/>
-            <typeMap type="Indian/Antananarivo" bcp47="mgtnr"/>
-            <typeMap type="Indian/Chagos" bcp47="iodga"/>
-            <typeMap type="Indian/Christmas" bcp47="cxxch"/>
-            <typeMap type="Indian/Cocos" bcp47="cccck"/>
-            <typeMap type="Indian/Comoro" bcp47="kmyva"/>
-            <typeMap type="Indian/Kerguelen" bcp47="tfpfr"/>
-            <typeMap type="Indian/Mahe" bcp47="scmaw"/>
-            <typeMap type="Indian/Maldives" bcp47="mvmle"/>
-            <typeMap type="Indian/Mauritius" bcp47="muplu"/>
-            <typeMap type="Indian/Mayotte" bcp47="ytmam"/>
-            <typeMap type="Indian/Reunion" bcp47="rereu"/>
-            <typeMap type="Pacific/Apia" bcp47="wsapw"/>
-            <typeMap type="Pacific/Auckland" bcp47="nzakl"/>
-            <typeMap type="Pacific/Chatham" bcp47="nzcht"/>
-            <typeMap type="Pacific/Easter" bcp47="clipc"/>
-            <typeMap type="Pacific/Efate" bcp47="vuvli"/>
-            <typeMap type="Pacific/Enderbury" bcp47="kipho"/>
-            <typeMap type="Pacific/Fakaofo" bcp47="tkfko"/>
-            <typeMap type="Pacific/Fiji" bcp47="fjsuv"/>
-            <typeMap type="Pacific/Funafuti" bcp47="tvfun"/>
-            <typeMap type="Pacific/Galapagos" bcp47="ecgps"/>
-            <typeMap type="Pacific/Gambier" bcp47="pfgmr"/>
-            <typeMap type="Pacific/Guadalcanal" bcp47="sbhir"/>
-            <typeMap type="Pacific/Guam" bcp47="gugum"/>
-            <typeMap type="Pacific/Honolulu" bcp47="ushnl"/>
-            <typeMap type="Pacific/Johnston" bcp47="umjon"/>
-            <typeMap type="Pacific/Kiritimati" bcp47="kicxi"/>
-            <typeMap type="Pacific/Kosrae" bcp47="fmksa"/>
-            <typeMap type="Pacific/Kwajalein" bcp47="mhkwa"/>
-            <typeMap type="Pacific/Majuro" bcp47="mhmaj"/>
-            <typeMap type="Pacific/Marquesas" bcp47="pfnhv"/>
-            <typeMap type="Pacific/Midway" bcp47="ummdy"/>
-            <typeMap type="Pacific/Nauru" bcp47="nrinu"/>
-            <typeMap type="Pacific/Niue" bcp47="nuiue"/>
-            <typeMap type="Pacific/Norfolk" bcp47="nfnlk"/>
-            <typeMap type="Pacific/Noumea" bcp47="ncnou"/>
-            <typeMap type="Pacific/Pago_Pago" bcp47="asppg"/>
-            <typeMap type="Pacific/Palau" bcp47="pwror"/>
-            <typeMap type="Pacific/Pitcairn" bcp47="pnpcn"/>
-            <typeMap type="Pacific/Ponape" bcp47="fmpni"/>
-            <typeMap type="Pacific/Port_Moresby" bcp47="pgpom"/>
-            <typeMap type="Pacific/Rarotonga" bcp47="ckrar"/>
-            <typeMap type="Pacific/Saipan" bcp47="mpspn"/>
-            <typeMap type="Pacific/Tahiti" bcp47="pfppt"/>
-            <typeMap type="Pacific/Tarawa" bcp47="kitrw"/>
-            <typeMap type="Pacific/Tongatapu" bcp47="totbu"/>
-            <typeMap type="Pacific/Truk" bcp47="fmtkk"/>
-            <typeMap type="Pacific/Wake" bcp47="umawk"/>
-            <typeMap type="Pacific/Wallis" bcp47="wfmau"/>
-        </mapTypes>
-    </bcp47KeywordMappings>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sv.xml b/airtime_mvc/library/Zend/Locale/Data/sv.xml
deleted file mode 100644
index 992c34ec0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sv.xml
+++ /dev/null
@@ -1,4722 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.151 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="sv"/>
-	</identity>
-	<fallback>nn nb da en</fallback>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">afar</language>
-			<language type="ab">abchasiska</language>
-			<language type="ace">achinesiska</language>
-			<language type="ach">acoli</language>
-			<language type="ada">adangme</language>
-			<language type="ady">adygeiska</language>
-			<language type="ae">avestiska</language>
-			<language type="af">afrikaans</language>
-			<language type="afa">afroasiatiskt språk</language>
-			<language type="afh">afrihili</language>
-			<language type="ain">ainu</language>
-			<language type="ak">akan</language>
-			<language type="akk">akkadiska</language>
-			<language type="ale">aleutiska</language>
-			<language type="alg">algonkinskt språk</language>
-			<language type="alt">sydaltaiska</language>
-			<language type="am">amhariska</language>
-			<language type="an">aragonesiska</language>
-			<language type="ang">fornengelska</language>
-			<language type="anp">angika</language>
-			<language type="apa">apachespråk</language>
-			<language type="ar">arabiska</language>
-			<language type="arc">arameiska</language>
-			<language type="arn">araukanska</language>
-			<language type="arp">arapaho</language>
-			<language type="art">konstgjort språk</language>
-			<language type="arw">arawakiska</language>
-			<language type="as">assamesiska</language>
-			<language type="ast">asturiska</language>
-			<language type="ath">athapaskiskt språk</language>
-			<language type="aus">australiskt språk</language>
-			<language type="av">avariskt språk</language>
-			<language type="awa">awadhi</language>
-			<language type="ay">aymara</language>
-			<language type="az">azerbajdzjanska</language>
-			<language type="ba">basjkiriska</language>
-			<language type="bad">banda</language>
-			<language type="bai">bamilekespråk</language>
-			<language type="bal">baluchi</language>
-			<language type="ban">balinesiska</language>
-			<language type="bas">basa</language>
-			<language type="bat">baltiskt språk</language>
-			<language type="be">vitryska</language>
-			<language type="bej">beyja</language>
-			<language type="bem">bemba</language>
-			<language type="ber">berberspråk</language>
-			<language type="bg">bulgariska</language>
-			<language type="bh">bihari</language>
-			<language type="bho">bhojpuri</language>
-			<language type="bi">bislama</language>
-			<language type="bik">bikol</language>
-			<language type="bin">bini</language>
-			<language type="bla">siksika</language>
-			<language type="bm">bambara</language>
-			<language type="bn">bengali</language>
-			<language type="bnt">bantuspråk</language>
-			<language type="bo">tibetanska</language>
-			<language type="br">bretonska</language>
-			<language type="bra">braj</language>
-			<language type="bs">bosniska</language>
-			<language type="btk">batak</language>
-			<language type="bua">burjätiska</language>
-			<language type="bug">buginesiska</language>
-			<language type="byn">blin</language>
-			<language type="ca">katalanska</language>
-			<language type="cad">caddo</language>
-			<language type="cai">centralamerikanskt indianspråk</language>
-			<language type="car">karibiska</language>
-			<language type="cau">kaukasiskt språk</language>
-			<language type="cch">atsam</language>
-			<language type="ce">tjetjenska</language>
-			<language type="ceb">cebuano</language>
-			<language type="cel">keltiskt språk</language>
-			<language type="ch">chamorro</language>
-			<language type="chb">chibcha</language>
-			<language type="chg">chagatai</language>
-			<language type="chk">chuukesiska</language>
-			<language type="chm">mari</language>
-			<language type="chn">chinook</language>
-			<language type="cho">choctaw</language>
-			<language type="chp">chipewyan</language>
-			<language type="chr">cherokesiska</language>
-			<language type="chy">cheyenne</language>
-			<language type="cmc">chamispråk</language>
-			<language type="co">korsikanska</language>
-			<language type="cop">koptiska</language>
-			<language type="cpe">engelskbaserat kreol- eller pidginspråk</language>
-			<language type="cpf">franskbaserat kreol- eller pidginspråk</language>
-			<language type="cpp">portugisiskbaserat kreol- eller pidginspråk</language>
-			<language type="cr">cree</language>
-			<language type="crh">krimtatariska</language>
-			<language type="crp">kreol- eller pidginspråk</language>
-			<language type="cs">tjeckiska</language>
-			<language type="csb">kasjubiska</language>
-			<language type="cu">kyrkslaviska</language>
-			<language type="cus">kusjitiskt språk</language>
-			<language type="cv">tjuvasjiska</language>
-			<language type="cy">walesiska</language>
-			<language type="da">danska</language>
-			<language type="dak">dakota</language>
-			<language type="dar">darginska</language>
-			<language type="day">dajakiska</language>
-			<language type="de">tyska</language>
-			<language type="de_AT">österrikisk tyska</language>
-			<language type="de_CH">schweizisk högtyska</language>
-			<language type="del">delaware</language>
-			<language type="den">slavej</language>
-			<language type="dgr">dogrib</language>
-			<language type="din">dinka</language>
-			<language type="doi">dogri</language>
-			<language type="dra">dravidiskt språk</language>
-			<language type="dsb">lågsorbiska</language>
-			<language type="dua">duala</language>
-			<language type="dum">medelnederländska</language>
-			<language type="dv">divehi</language>
-			<language type="dyu">dyula</language>
-			<language type="dz">bhutanesiska</language>
-			<language type="ee">ewe</language>
-			<language type="efi">efik</language>
-			<language type="egy">fornegyptiska</language>
-			<language type="eka">ekajuk</language>
-			<language type="el">grekiska</language>
-			<language type="elx">elamitiska</language>
-			<language type="en">engelska</language>
-			<language type="en_AU">australisk engelska</language>
-			<language type="en_CA">kanadensisk engelska</language>
-			<language type="en_GB">brittisk engelska</language>
-			<language type="en_US">amerikansk engelska</language>
-			<language type="enm">medelengelska</language>
-			<language type="eo">esperanto</language>
-			<language type="es">spanska</language>
-			<language type="es_419">latinamerikansk spanska</language>
-			<language type="es_ES">europeisk spanska</language>
-			<language type="et">estniska</language>
-			<language type="eu">baskiska</language>
-			<language type="ewo">ewondo</language>
-			<language type="fa">persiska</language>
-			<language type="fan">fang</language>
-			<language type="fat">fanti</language>
-			<language type="ff">fulani</language>
-			<language type="fi">finska</language>
-			<language type="fil">filippinska</language>
-			<language type="fiu">finskugriskt språk</language>
-			<language type="fj">fidjianska</language>
-			<language type="fo">färöiska</language>
-			<language type="fon">fonspråket</language>
-			<language type="fr">franska</language>
-			<language type="fr_CA">kanadensisk franska</language>
-			<language type="fr_CH">schweizisk franska</language>
-			<language type="frm">medelfranska</language>
-			<language type="fro">fornfranska</language>
-			<language type="frr">nordfrisiska</language>
-			<language type="frs">östfrisiska</language>
-			<language type="fur">friulianska</language>
-			<language type="fy">västfrisiska</language>
-			<language type="ga">iriska</language>
-			<language type="gaa">gã</language>
-			<language type="gay">gayo</language>
-			<language type="gba">gbaya</language>
-			<language type="gd">höglandsskotska</language>
-			<language type="gem">germanskt språk</language>
-			<language type="gez">etiopiska</language>
-			<language type="gil">gilbertiska</language>
-			<language type="gl">galiciska</language>
-			<language type="gmh">medelhögtyska</language>
-			<language type="gn">guaraní</language>
-			<language type="goh">fornhögtyska</language>
-			<language type="gon">gondi</language>
-			<language type="gor">gorontalo</language>
-			<language type="got">gotiska</language>
-			<language type="grb">grebo</language>
-			<language type="grc">forngrekiska</language>
-			<language type="gsw">schweizertyska</language>
-			<language type="gu">gujarati</language>
-			<language type="gv">manx</language>
-			<language type="gwi">gwichin</language>
-			<language type="ha">haussa</language>
-			<language type="hai">haida</language>
-			<language type="haw">hawaiiska</language>
-			<language type="he">hebreiska</language>
-			<language type="hi">hindi</language>
-			<language type="hil">hiligaynon</language>
-			<language type="him">himachali</language>
-			<language type="hit">hettitiska</language>
-			<language type="hmn">hmongspråk</language>
-			<language type="ho">hirimotu</language>
-			<language type="hr">kroatiska</language>
-			<language type="hsb">högsorbiska</language>
-			<language type="ht">haitiska</language>
-			<language type="hu">ungerska</language>
-			<language type="hup">hupa</language>
-			<language type="hy">armeniska</language>
-			<language type="hz">herero</language>
-			<language type="ia">interlingua</language>
-			<language type="iba">ibanska</language>
-			<language type="id">indonesiska</language>
-			<language type="ie">interlingue</language>
-			<language type="ig">ibo</language>
-			<language type="ii">szezuan i</language>
-			<language type="ijo">ijospråket</language>
-			<language type="ik">inupiak</language>
-			<language type="ilo">iloko</language>
-			<language type="inc">indiskt språk</language>
-			<language type="ine">indoeuropeiskt språk</language>
-			<language type="inh">ingusjiska</language>
-			<language type="io">ido</language>
-			<language type="ira">iranskt språk</language>
-			<language type="iro">irokesiskt språk</language>
-			<language type="is">isländska</language>
-			<language type="it">italienska</language>
-			<language type="iu">inuktitut</language>
-			<language type="ja">japanska</language>
-			<language type="jbo">lojban</language>
-			<language type="jpr">judisk persiska</language>
-			<language type="jrb">judisk arabiska</language>
-			<language type="jv">javanesiska</language>
-			<language type="ka">georgiska</language>
-			<language type="kaa">karakalpakiska</language>
-			<language type="kab">kabyliska</language>
-			<language type="kac">kachin</language>
-			<language type="kaj">jju</language>
-			<language type="kam">kamba</language>
-			<language type="kar">karenska</language>
-			<language type="kaw">kawi</language>
-			<language type="kbd">kabardinska</language>
-			<language type="kcg">tyap</language>
-			<language type="kfo">koro</language>
-			<language type="kg">kikongo</language>
-			<language type="kha">khasi</language>
-			<language type="khi">khoisanspråk</language>
-			<language type="kho">khotanesiska</language>
-			<language type="ki">kikuyu</language>
-			<language type="kj">kuanyama</language>
-			<language type="kk">kazakiska</language>
-			<language type="kl">grönländska</language>
-			<language type="km">kambodjanska</language>
-			<language type="kmb">kimbundu</language>
-			<language type="kn">kannada</language>
-			<language type="ko">koreanska</language>
-			<language type="kok">konkani</language>
-			<language type="kos">kosreanska</language>
-			<language type="kpe">kpelle</language>
-			<language type="kr">kanuri</language>
-			<language type="krc">karachay-balkar</language>
-			<language type="krl">karelska</language>
-			<language type="kro">kru</language>
-			<language type="kru">kurukh</language>
-			<language type="ks">kashmiriska</language>
-			<language type="ku">kurdiska</language>
-			<language type="kum">kumykiska</language>
-			<language type="kut">kutenaj</language>
-			<language type="kv">kome</language>
-			<language type="kw">korniska</language>
-			<language type="ky">kirgisiska</language>
-			<language type="la">latin</language>
-			<language type="lad">ladino</language>
-			<language type="lah">lahnda</language>
-			<language type="lam">lamba</language>
-			<language type="lb">luxemburgiska</language>
-			<language type="lez">lezghien</language>
-			<language type="lg">luganda</language>
-			<language type="li">limburgiska</language>
-			<language type="ln">lingala</language>
-			<language type="lo">laotiska</language>
-			<language type="lol">mongo</language>
-			<language type="loz">lozi</language>
-			<language type="lt">litauiska</language>
-			<language type="lu">luba-katanga</language>
-			<language type="lua">luba-lulua</language>
-			<language type="lui">luiseño</language>
-			<language type="lun">lunda</language>
-			<language type="luo">luo</language>
-			<language type="lus">lushai</language>
-			<language type="lv">lettiska</language>
-			<language type="mad">maduresiska</language>
-			<language type="mag">magahi</language>
-			<language type="mai">maithili</language>
-			<language type="mak">makasar</language>
-			<language type="man">mande</language>
-			<language type="map">austronesiskt språk</language>
-			<language type="mas">massajiska</language>
-			<language type="mdf">moksja</language>
-			<language type="mdr">mandar</language>
-			<language type="men">mende</language>
-			<language type="mg">malagassiska</language>
-			<language type="mga">medeliriska</language>
-			<language type="mh">marshalliska</language>
-			<language type="mi">maori</language>
-			<language type="mic">mic-mac</language>
-			<language type="min">minangkabau</language>
-			<language type="mis">annat språk</language>
-			<language type="mk">makedonska</language>
-			<language type="mkh">mon-khmeriskt språk</language>
-			<language type="ml">malayalam</language>
-			<language type="mn">mongoliska</language>
-			<language type="mnc">manchuriska</language>
-			<language type="mni">manipuri</language>
-			<language type="mno">manobospråk</language>
-			<language type="mo">moldaviska</language>
-			<language type="moh">mohawk</language>
-			<language type="mos">mossi</language>
-			<language type="mr">marathi</language>
-			<language type="ms">malajiska</language>
-			<language type="mt">maltesiska</language>
-			<language type="mul">flera språk</language>
-			<language type="mun">mundaspråk</language>
-			<language type="mus">muskogee</language>
-			<language type="mwl">mirandesiska</language>
-			<language type="mwr">marwari</language>
-			<language type="my">burmesiska</language>
-			<language type="myn">mayaspråk</language>
-			<language type="myv">erjya</language>
-			<language type="na">nauru</language>
-			<language type="nah">aztekiska</language>
-			<language type="nai">nordamerikanskt indianspråk</language>
-			<language type="nap">napolitanska</language>
-			<language type="nb">norskt bokmål</language>
-			<language type="nd">nordndebele</language>
-			<language type="nds">lågtyska</language>
-			<language type="ne">nepalesiska</language>
-			<language type="new">newariska</language>
-			<language type="ng">ndonga</language>
-			<language type="nia">nias</language>
-			<language type="nic">Niger-Kongospråk</language>
-			<language type="niu">niueanska</language>
-			<language type="nl">nederländska</language>
-			<language type="nl_BE">flamländska</language>
-			<language type="nn">nynorska</language>
-			<language type="no">norska</language>
-			<language type="nog">nogai</language>
-			<language type="non">fornnordiska</language>
-			<language type="nqo">n-kå</language>
-			<language type="nr">sydndebele</language>
-			<language type="nso">nordsotho</language>
-			<language type="nub">nubiskt språk</language>
-			<language type="nv">navaho</language>
-			<language type="nwc">klassisk newariska</language>
-			<language type="ny">nyanja</language>
-			<language type="nym">nyamwezi</language>
-			<language type="nyn">nyankole</language>
-			<language type="nyo">nyoro</language>
-			<language type="nzi">nzima</language>
-			<language type="oc">occitanska</language>
-			<language type="oj">odjibwa</language>
-			<language type="om">oromo</language>
-			<language type="or">oriya</language>
-			<language type="os">ossetiska</language>
-			<language type="osa">osage</language>
-			<language type="ota">ottomanska</language>
-			<language type="oto">otomispråk</language>
-			<language type="pa">punjabi</language>
-			<language type="paa">papuanskt språk</language>
-			<language type="pag">pangasinan</language>
-			<language type="pal">medelpersiska</language>
-			<language type="pam">pampanga</language>
-			<language type="pap">papiamento</language>
-			<language type="pau">palau</language>
-			<language type="peo">fornpersiska</language>
-			<language type="phi">filippinskt språk</language>
-			<language type="phn">feniciska</language>
-			<language type="pi">pali</language>
-			<language type="pl">polska</language>
-			<language type="pon">ponape</language>
-			<language type="pra">prakritspråk</language>
-			<language type="pro">fornprovensalska</language>
-			<language type="ps">afghanska</language>
-			<language type="pt">portugisiska</language>
-			<language type="pt_BR">brasiliansk portugisiska</language>
-			<language type="pt_PT">europeisk portugisiska</language>
-			<language type="qu">quechua</language>
-			<language type="raj">rajasthani</language>
-			<language type="rap">rapanui</language>
-			<language type="rar">rarotonganska</language>
-			<language type="rm">rätoromanska</language>
-			<language type="rn">rundi</language>
-			<language type="ro">rumänska</language>
-			<language type="roa">romanskt språk</language>
-			<language type="rom">romani</language>
-			<language type="root">rot</language>
-			<language type="ru">ryska</language>
-			<language type="rup">arumänska</language>
-			<language type="rw">kinjarwanda</language>
-			<language type="sa">sanskrit</language>
-			<language type="sad">sandawe</language>
-			<language type="sah">jakutiska</language>
-			<language type="sai">sydamerikanskt indianspråk</language>
-			<language type="sal">salikiskt språk</language>
-			<language type="sam">samaritanska</language>
-			<language type="sas">sasak</language>
-			<language type="sat">santali</language>
-			<language type="sc">sardiska</language>
-			<language type="scn">sicilianska</language>
-			<language type="sco">skotska</language>
-			<language type="sd">sindhi</language>
-			<language type="se">nordsamiska</language>
-			<language type="sel">selkup</language>
-			<language type="sem">semitiskt språk</language>
-			<language type="sg">sango</language>
-			<language type="sga">forniriska</language>
-			<language type="sgn">teckenspråk</language>
-			<language type="sh">serbokroatiska</language>
-			<language type="shn">shan</language>
-			<language type="si">singalesiska</language>
-			<language type="sid">sidamo</language>
-			<language type="sio">siouxspråk</language>
-			<language type="sit">sinotibetanskt språk</language>
-			<language type="sk">slovakiska</language>
-			<language type="sl">slovenska</language>
-			<language type="sla">slaviskt språk</language>
-			<language type="sm">samoanska</language>
-			<language type="sma">sydsamiska</language>
-			<language type="smi">samiskt språk</language>
-			<language type="smj">lulesamiska</language>
-			<language type="smn">enaresamiska</language>
-			<language type="sms">skoltsamiska</language>
-			<language type="sn">shona</language>
-			<language type="snk">soninke</language>
-			<language type="so">somaliska</language>
-			<language type="sog">sogdiska</language>
-			<language type="son">songhai</language>
-			<language type="sq">albanska</language>
-			<language type="sr">serbiska</language>
-			<language type="srn">sranan tongo</language>
-			<language type="srr">serer</language>
-			<language type="ss">swati</language>
-			<language type="ssa">nilosahariskt språk</language>
-			<language type="st">sydsotho</language>
-			<language type="su">sundanesiska</language>
-			<language type="suk">sukuma</language>
-			<language type="sus">susu</language>
-			<language type="sux">sumeriska</language>
-			<language type="sv">svenska</language>
-			<language type="sw">swahili</language>
-			<language type="syc">klassisk syriska</language>
-			<language type="syr">syriska</language>
-			<language type="ta">tamil</language>
-			<language type="tai">thaispråk</language>
-			<language type="te">telugiska</language>
-			<language type="tem">temne</language>
-			<language type="ter">tereno</language>
-			<language type="tet">tetum</language>
-			<language type="tg">tadzjikiska</language>
-			<language type="th">thailändska</language>
-			<language type="ti">tigrinja</language>
-			<language type="tig">tigré</language>
-			<language type="tiv">tivi</language>
-			<language type="tk">turkmeniska</language>
-			<language type="tkl">tokelauiska</language>
-			<language type="tl">tagalog</language>
-			<language type="tlh">klingonska</language>
-			<language type="tli">tlingit</language>
-			<language type="tmh">tamashek</language>
-			<language type="tn">tswana</language>
-			<language type="to">tonganska</language>
-			<language type="tog">nyasatonganska</language>
-			<language type="tpi">tok pisin</language>
-			<language type="tr">turkiska</language>
-			<language type="ts">tsonga</language>
-			<language type="tsi">tsimshian</language>
-			<language type="tt">tatariska</language>
-			<language type="tum">tumbuka</language>
-			<language type="tup">tupíspråk</language>
-			<language type="tut">altaiskt språk</language>
-			<language type="tvl">tuvaluanska</language>
-			<language type="tw">twi</language>
-			<language type="ty">tahitiska</language>
-			<language type="tyv">tuviniska</language>
-			<language type="udm">udmurtiska</language>
-			<language type="ug">uiguriska</language>
-			<language type="uga">ugaritiska</language>
-			<language type="uk">ukrainska</language>
-			<language type="umb">umbundu</language>
-			<language type="und">obestämt språk</language>
-			<language type="ur">urdu</language>
-			<language type="uz">uzbekiska</language>
-			<language type="vai">vaj</language>
-			<language type="ve">venda</language>
-			<language type="vi">vietnamesiska</language>
-			<language type="vo">volapük</language>
-			<language type="vot">votiska</language>
-			<language type="wa">vallonska</language>
-			<language type="wak">wakusjiskt språk</language>
-			<language type="wal">walamo</language>
-			<language type="war">waray</language>
-			<language type="was">washo</language>
-			<language type="wen">sorbiskt språk</language>
-			<language type="wo">wolof</language>
-			<language type="xal">kalmuckiska</language>
-			<language type="xh">xhosa</language>
-			<language type="yao">kiyao</language>
-			<language type="yap">japetiska</language>
-			<language type="yi">jiddisch</language>
-			<language type="yo">yoruba</language>
-			<language type="ypk">eskimåspråk</language>
-			<language type="za">zhuang</language>
-			<language type="zap">zapotek</language>
-			<language type="zbl">blissymboler</language>
-			<language type="zen">zenaga</language>
-			<language type="zh">kinesiska</language>
-			<language type="zh_Hans">förenklad kinesiska</language>
-			<language type="zh_Hant">traditionell kinesiska</language>
-			<language type="znd">zandé</language>
-			<language type="zu">zulu</language>
-			<language type="zun">zuni</language>
-			<language type="zxx">inget språkligt innehåll</language>
-			<language type="zza">zaza</language>
-		</languages>
-		<scripts>
-			<script type="Arab">arabiska</script>
-			<script type="Armi">imperisk arameiska</script>
-			<script type="Armn">armeniska</script>
-			<script type="Avst">avestiska</script>
-			<script type="Bali">balinesiska</script>
-			<script type="Batk">batak</script>
-			<script type="Beng">bengaliska</script>
-			<script type="Blis">blissymboler</script>
-			<script type="Bopo">bopomofo</script>
-			<script type="Brah">brami</script>
-			<script type="Brai">blindskrift</script>
-			<script type="Bugi">buginesiska</script>
-			<script type="Buhd">buhid</script>
-			<script type="Cakm">chakma</script>
-			<script type="Cans">kanadensiska stavelsetecken</script>
-			<script type="Cari">kariska</script>
-			<script type="Cham">cham</script>
-			<script type="Cher">cherokee</script>
-			<script type="Cirt">cirt</script>
-			<script type="Copt">koptiska</script>
-			<script type="Cprt">cypriotiska</script>
-			<script type="Cyrl">kyrilliska</script>
-			<script type="Cyrs">fornkyrkoslavisk kyrilliska</script>
-			<script type="Deva">devanagari</script>
-			<script type="Dsrt">deseret</script>
-			<script type="Egyd">demotiska</script>
-			<script type="Egyh">hieratiska</script>
-			<script type="Egyp">egyptiska hieroglyfer</script>
-			<script type="Ethi">etiopiska</script>
-			<script type="Geok">kutsuri</script>
-			<script type="Geor">georgiska</script>
-			<script type="Glag">glagolitiska</script>
-			<script type="Goth">gotiska</script>
-			<script type="Grek">grekiska</script>
-			<script type="Gujr">gujarati</script>
-			<script type="Guru">gurmukhi</script>
-			<script type="Hang">hangul</script>
-			<script type="Hani">han</script>
-			<script type="Hano">hanunå</script>
-			<script type="Hans">förenklad han</script>
-			<script type="Hant">traditionell han</script>
-			<script type="Hebr">hebreiska</script>
-			<script type="Hira">hiragana</script>
-			<script type="Hmng">pahaw mong</script>
-			<script type="Hrkt">katakana/hiragana</script>
-			<script type="Hung">fornungerska</script>
-			<script type="Inds">indus</script>
-			<script type="Ital">fornitaliska</script>
-			<script type="Java">javanska</script>
-			<script type="Jpan">japanska</script>
-			<script type="Kali">kaya li</script>
-			<script type="Kana">katakana</script>
-			<script type="Khar">kharoshti</script>
-			<script type="Khmr">khmeriska</script>
-			<script type="Knda">kanaresiska</script>
-			<script type="Kore">koreanska</script>
-			<script type="Kthi">kaithiska</script>
-			<script type="Lana">lanna</script>
-			<script type="Laoo">laotiska</script>
-			<script type="Latf">frakturlatin</script>
-			<script type="Latg">gaeliskt latin</script>
-			<script type="Latn">latinska</script>
-			<script type="Lepc">rong</script>
-			<script type="Limb">limbu</script>
-			<script type="Lina">linjär A</script>
-			<script type="Linb">linjär B</script>
-			<script type="Lyci">lykiska</script>
-			<script type="Lydi">lydiska</script>
-			<script type="Mand">mandaéiska</script>
-			<script type="Mani">manikeanska</script>
-			<script type="Maya">mayahieroglyfer</script>
-			<script type="Mero">meriotiska</script>
-			<script type="Mlym">malayalam</script>
-			<script type="Mong">mongoliska</script>
-			<script type="Moon">moon</script>
-			<script type="Mtei">meitei-mayek</script>
-			<script type="Mymr">burmesiska</script>
-			<script type="Nkoo">n-kå</script>
-			<script type="Ogam">ogham</script>
-			<script type="Olck">ol-chiki</script>
-			<script type="Orkh">orkon</script>
-			<script type="Orya">oriya</script>
-			<script type="Osma">osmanja</script>
-			<script type="Perm">fornpermiska</script>
-			<script type="Phag">phags-pa</script>
-			<script type="Phli">tidig pahlavi</script>
-			<script type="Phlp">psaltaren-pahlavi</script>
-			<script type="Phlv">bokpahlavi</script>
-			<script type="Phnx">fenikiska</script>
-			<script type="Plrd">pollardtecken</script>
-			<script type="Prti">tidig parthianska</script>
-			<script type="Qaai">ärvda</script>
-			<script type="Rjng">rejang</script>
-			<script type="Roro">rongo-rongo</script>
-			<script type="Runr">runor</script>
-			<script type="Samr">samaritiska</script>
-			<script type="Sara">sarati</script>
-			<script type="Saur">saurashtra</script>
-			<script type="Sgnw">teckningsskrift</script>
-			<script type="Shaw">shawiska</script>
-			<script type="Sinh">singalesiska</script>
-			<script type="Sund">sundanesiska</script>
-			<script type="Sylo">syloti nagri</script>
-			<script type="Syrc">syriska</script>
-			<script type="Syre">estrangelosyriska</script>
-			<script type="Syrj">västsyriska</script>
-			<script type="Syrn">östsyriska</script>
-			<script type="Tagb">tagbanwa</script>
-			<script type="Tale">tai le</script>
-			<script type="Talu">tai lue</script>
-			<script type="Taml">tamil</script>
-			<script type="Tavt">tai viet</script>
-			<script type="Telu">telugu</script>
-			<script type="Teng">tengwar</script>
-			<script type="Tfng">tifinagh</script>
-			<script type="Tglg">tagalog</script>
-			<script type="Thaa">taana</script>
-			<script type="Thai">thailändska</script>
-			<script type="Tibt">tibetanska</script>
-			<script type="Ugar">ugaritiska</script>
-			<script type="Vaii">vaj</script>
-			<script type="Visp">synligt tal</script>
-			<script type="Xpeo">fornpersiska</script>
-			<script type="Xsux">sumeo-akkadisk kilskrift</script>
-			<script type="Yiii">yi</script>
-			<script type="Zmth">matematisk notation</script>
-			<script type="Zsym">symboler</script>
-			<script type="Zxxx">oskrivet språk</script>
-			<script type="Zyyy">gemensamma</script>
-			<script type="Zzzz">okodat skript</script>
-		</scripts>
-		<territories>
-			<territory type="001">världen</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Nordamerika</territory>
-			<territory type="005">Sydamerika</territory>
-			<territory type="009">Oceanien</territory>
-			<territory type="011">Västafrika</territory>
-			<territory type="013">Centralamerika</territory>
-			<territory type="014">Östafrika</territory>
-			<territory type="015">Nordafrika</territory>
-			<territory type="017">Centralafrika</territory>
-			<territory type="018">södra Afrika</territory>
-			<territory type="019">Nord- och Sydamerika</territory>
-			<territory type="021">norra Amerika</territory>
-			<territory type="029">Karibien</territory>
-			<territory type="030">Östasien</territory>
-			<territory type="034">södra Asien</territory>
-			<territory type="035">Sydostasien</territory>
-			<territory type="039">Sydeuropa</territory>
-			<territory type="053">Australien och Nya Zeeland</territory>
-			<territory type="054">Melanesien</territory>
-			<territory type="057">Mikronesiska öarna</territory>
-			<territory type="061">Polynesien</territory>
-			<territory type="062">södra Centralasien</territory>
-			<territory type="142">Asien</territory>
-			<territory type="143">Centralasien</territory>
-			<territory type="145">Västasien</territory>
-			<territory type="150">Europa</territory>
-			<territory type="151">Östeuropa</territory>
-			<territory type="154">Nordeuropa</territory>
-			<territory type="155">Västeuropa</territory>
-			<territory type="172">Oberoende staters samvälde</territory>
-			<territory type="419">Latinamerika och Karibien</territory>
-			<territory type="830">Kanalöarna</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Förenade Arabemiraten</territory>
-			<territory type="AF">Afghanistan</territory>
-			<territory type="AG">Antigua och Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Albanien</territory>
-			<territory type="AM">Armenien</territory>
-			<territory type="AN">Nederländska Antillerna</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktis</territory>
-			<territory type="AR">Argentina</territory>
-			<territory type="AS">Amerikanska Samoa</territory>
-			<territory type="AT">Österrike</territory>
-			<territory type="AU">Australien</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Ã…land</territory>
-			<territory type="AZ">Azerbajdzjan</territory>
-			<territory type="BA">Bosnien och Hercegovina</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">Bangladesh</territory>
-			<territory type="BE">Belgien</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgarien</territory>
-			<territory type="BH">Bahrain</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">S:t Barthélemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivia</territory>
-			<territory type="BR">Brasilien</territory>
-			<territory type="BS">Bahamas</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvetön</territory>
-			<territory type="BW">Botswana</territory>
-			<territory type="BY">Vitryssland</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Kokosöarna</territory>
-			<territory type="CD">Kongo-Kinshasa</territory>
-			<territory type="CF">Centralafrikanska republiken</territory>
-			<territory type="CG">Kongo-Brazzaville</territory>
-			<territory type="CH">Schweiz</territory>
-			<territory type="CI">Elfenbenskusten</territory>
-			<territory type="CK">Cooköarna</territory>
-			<territory type="CL">Chile</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Kina</territory>
-			<territory type="CO">Colombia</territory>
-			<territory type="CR">Costa Rica</territory>
-			<territory type="CS">Serbien och Montenegro</territory>
-			<territory type="CU">Kuba</territory>
-			<territory type="CV">Kap Verde</territory>
-			<territory type="CX">Julön</territory>
-			<territory type="CY">Cypern</territory>
-			<territory type="CZ">Tjeckien</territory>
-			<territory type="DE">Tyskland</territory>
-			<territory type="DJ">Djibouti</territory>
-			<territory type="DK">Danmark</territory>
-			<territory type="DM">Dominica</territory>
-			<territory type="DO">Dominikanska republiken</territory>
-			<territory type="DZ">Algeriet</territory>
-			<territory type="EC">Ecuador</territory>
-			<territory type="EE">Estland</territory>
-			<territory type="EG">Egypten</territory>
-			<territory type="EH">Västsahara</territory>
-			<territory type="ER">Eritrea</territory>
-			<territory type="ES">Spanien</territory>
-			<territory type="ET">Etiopien</territory>
-			<territory type="FI">Finland</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falklandsöarna</territory>
-			<territory type="FM">Mikronesien</territory>
-			<territory type="FO">Färöarna</territory>
-			<territory type="FR">Frankrike</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Storbritannien</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Georgien</territory>
-			<territory type="GF">Franska Guyana</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Ghana</territory>
-			<territory type="GI">Gibraltar</territory>
-			<territory type="GL">Grönland</territory>
-			<territory type="GM">Gambia</territory>
-			<territory type="GN">Guinea</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvatorialguinea</territory>
-			<territory type="GR">Grekland</territory>
-			<territory type="GS">Sydgeorgien och Södra Sandwichöarna</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Guinea-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hongkong (S.A.R. Kina)</territory>
-			<territory type="HM">Heard- och McDonaldöarna</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Kroatien</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Ungern</territory>
-			<territory type="ID">Indonesien</territory>
-			<territory type="IE">Irland</territory>
-			<territory type="IL">Israel</territory>
-			<territory type="IM">Isle of Man</territory>
-			<territory type="IN">Indien</territory>
-			<territory type="IO">Brittiska Indiska oceanöarna</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Iran</territory>
-			<territory type="IS">Island</territory>
-			<territory type="IT">Italien</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaica</territory>
-			<territory type="JO">Jordanien</territory>
-			<territory type="JP">Japan</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kirgizistan</territory>
-			<territory type="KH">Kambodja</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorerna</territory>
-			<territory type="KN">S:t Kitts och Nevis</territory>
-			<territory type="KP">Nordkorea</territory>
-			<territory type="KR">Sydkorea</territory>
-			<territory type="KW">Kuwait</territory>
-			<territory type="KY">Caymanöarna</territory>
-			<territory type="KZ">Kazakstan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Libanon</territory>
-			<territory type="LC">S:t Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberia</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litauen</territory>
-			<territory type="LU">Luxemburg</territory>
-			<territory type="LV">Lettland</territory>
-			<territory type="LY">Libyen</territory>
-			<territory type="MA">Marocko</territory>
-			<territory type="MC">Monaco</territory>
-			<territory type="MD">Moldavien</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">S:t Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshallöarna</territory>
-			<territory type="MK">Makedonien</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">Mongoliet</territory>
-			<territory type="MO">Macao (S.A.R. Kina)</territory>
-			<territory type="MP">Nordmarianerna</territory>
-			<territory type="MQ">Martinique</territory>
-			<territory type="MR">Mauretanien</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldiverna</territory>
-			<territory type="MW">Malawi</territory>
-			<territory type="MX">Mexiko</territory>
-			<territory type="MY">Malaysia</territory>
-			<territory type="MZ">Moçambique</territory>
-			<territory type="NA">Namibia</territory>
-			<territory type="NC">Nya Kaledonien</territory>
-			<territory type="NE">Niger</territory>
-			<territory type="NF">Norfolkön</territory>
-			<territory type="NG">Nigeria</territory>
-			<territory type="NI">Nicaragua</territory>
-			<territory type="NL">Nederländerna</territory>
-			<territory type="NO">Norge</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Nya Zeeland</territory>
-			<territory type="OM">Oman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Franska Polynesien</territory>
-			<territory type="PG">Papua Nya Guinea</territory>
-			<territory type="PH">Filippinerna</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polen</territory>
-			<territory type="PM">S:t Pierre och Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Puerto Rico</territory>
-			<territory type="PS">Palestinska territoriet</territory>
-			<territory type="PT">Portugal</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Qatar</territory>
-			<territory type="QO">Yttre öar i Oceanien</territory>
-			<territory type="QU">Europeiska unionen</territory>
-			<territory type="RE">Réunion</territory>
-			<territory type="RO">Rumänien</territory>
-			<territory type="RS">Serbien</territory>
-			<territory type="RU">Ryssland</territory>
-			<territory type="RW">Rwanda</territory>
-			<territory type="SA">Saudiarabien</territory>
-			<territory type="SB">Salomonöarna</territory>
-			<territory type="SC">Seychellerna</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">Sverige</territory>
-			<territory type="SG">Singapore</territory>
-			<territory type="SH">S:t Helena</territory>
-			<territory type="SI">Slovenien</territory>
-			<territory type="SJ">Svalbard och Jan Mayen</territory>
-			<territory type="SK">Slovakien</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somalia</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">São Tomé och Príncipe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Syrien</territory>
-			<territory type="SZ">Swaziland</territory>
-			<territory type="TC">Turks- och Caicosöarna</territory>
-			<territory type="TD">Tchad</territory>
-			<territory type="TF">Franska Sydterritorierna</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Thailand</territory>
-			<territory type="TJ">Tadzjikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">Östtimor</territory>
-			<territory type="TM">Turkmenistan</territory>
-			<territory type="TN">Tunisien</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Turkiet</territory>
-			<territory type="TT">Trinidad och Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Taiwan</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="UA">Ukraina</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">USA:s yttre öar</territory>
-			<territory type="US">USA</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Uzbekistan</territory>
-			<territory type="VA">Vatikanstaten</territory>
-			<territory type="VC">S:t Vincent och Grenadinerna</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">Brittiska Jungfruöarna</territory>
-			<territory type="VI">Amerikanska Jungfruöarna</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis- och Futunaöarna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Jemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Sydafrika</territory>
-			<territory type="ZM">Zambia</territory>
-			<territory type="ZW">Zimbabwe</territory>
-			<territory type="ZZ">okänd eller ogiltig regionkod</territory>
-		</territories>
-		<variants>
-			<variant type="1901">traditionell tysk stavning</variant>
-			<variant type="1994">1994 års resisk stavning</variant>
-			<variant type="1996">1996 års reformerad tysk stavning</variant>
-			<variant type="1606NICT">1606 års stavning</variant>
-			<variant type="1694ACAD">1694 års stavning</variant>
-			<variant type="AREVELA">östarmeniska</variant>
-			<variant type="AREVMDA">västarmeniska</variant>
-			<variant type="BAKU1926">1926 års stavning</variant>
-			<variant type="BISKE">Bila-dialekt</variant>
-			<variant type="BOONT">boontling</variant>
-			<variant type="FONIPA">internationell fonetisk notation - IPA</variant>
-			<variant type="FONUPA">uralisk fonetisk notation</variant>
-			<variant type="LIPAW">Lipovaz-dialekt</variant>
-			<variant type="MONOTON">monotonisk stavning</variant>
-			<variant type="NEDIS">natisonsk dialekt</variant>
-			<variant type="NJIVA">Njiva-dialekt</variant>
-			<variant type="OSOJS">Osojane-dialekt</variant>
-			<variant type="POLYTON">polytonisk stavning</variant>
-			<variant type="REVISED">reformerad stavning</variant>
-			<variant type="ROZAJ">resisk dialekt</variant>
-			<variant type="SAAHO">saho-dialekt</variant>
-			<variant type="SCOTLAND">skotska</variant>
-			<variant type="SCOUSE">scouse</variant>
-			<variant type="SOLBA">Solbica-dialekt</variant>
-			<variant type="TARASK">Taraskievika-stavning</variant>
-			<variant type="VALENCIA">valensisk dialekt</variant>
-		</variants>
-		<keys>
-			<key type="calendar">kalender</key>
-			<key type="collation">sorteringsordning</key>
-			<key type="currency">valuta</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">traditionell kinesiska i big5-ordning</type>
-			<type type="buddhist" key="calendar">buddistisk kalender</type>
-			<type type="chinese" key="calendar">kinesisk kalender</type>
-			<type type="direct" key="collation">direkt ordning</type>
-			<type type="gb2312han" key="collation">förenklad kinesiska i gb2312-ordning</type>
-			<type type="gregorian" key="calendar">gregoriansk kalender</type>
-			<type type="hebrew" key="calendar">hebreisk kalender</type>
-			<type type="indian" key="calendar">indisk kalender</type>
-			<type type="islamic" key="calendar">islamisk kalender</type>
-			<type type="islamic-civil" key="calendar">islamisk civil kalender</type>
-			<type type="japanese" key="calendar">japansk kalender</type>
-			<type type="phonebook" key="collation">telefonkatalogsordning</type>
-			<type type="pinyin" key="collation">pinyinordning</type>
-			<type type="roc" key="calendar">kinesiska republikens kalender</type>
-			<type type="stroke" key="collation">streckordning</type>
-			<type type="traditional" key="collation">traditionell ordning</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">SI-enheter</measurementSystemName>
-			<measurementSystemName type="US">engelska enheter</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">språk: {0}</codePattern>
-			<codePattern type="script">skrift: {0}</codePattern>
-			<codePattern type="territory">område: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="fields">lowercase-words</inText>
-		<inText type="keys">lowercase-words</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="long">lowercase-words</inText>
-		<inText type="quarterWidth">lowercase-words</inText>
-		<inText type="scripts">lowercase-words</inText>
-		<inText type="territories">titlecase-words</inText>
-		<inText type="types">lowercase-words</inText>
-		<inText type="variants">lowercase-words</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[a à b-e é f-z å ä ö]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á â ã � ç ë í-ï ī ñ ó ú ÿ ü æ ø]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>�</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>’</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<dateRangePattern>{0} till {1}</dateRangePattern>
-		<calendars>
-			<calendar type="buddhist">
-				<am>fm</am>
-				<pm>em</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyMMM">MMM -yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">tout</month>
-							<month type="2">bâbâ</month>
-							<month type="3">hâtour</month>
-							<month type="4">kiahk</month>
-							<month type="5">toubah</month>
-							<month type="6">amshîr</month>
-							<month type="7">barmahât</month>
-							<month type="8">barmoudah</month>
-							<month type="9">bashans</month>
-							<month type="10">ba’ounah</month>
-							<month type="11">abîb</month>
-							<month type="12">misra</month>
-							<month type="13">al-nasi</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">mäskäräm</month>
-							<month type="2">teqemt</month>
-							<month type="3">hedar</month>
-							<month type="4">tahesas</month>
-							<month type="6">yäkatit</month>
-							<month type="7">mägabit</month>
-							<month type="8">miyazya</month>
-							<month type="9">guenbot</month>
-							<month type="10">säné</month>
-							<month type="11">hamlé</month>
-							<month type="12">nähasé</month>
-							<month type="13">pagumén</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">jan</month>
-							<month type="2">feb</month>
-							<month type="3">mar</month>
-							<month type="4">apr</month>
-							<month type="5">maj</month>
-							<month type="6">jun</month>
-							<month type="7">jul</month>
-							<month type="8">aug</month>
-							<month type="9">sep</month>
-							<month type="10">okt</month>
-							<month type="11">nov</month>
-							<month type="12">dec</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">januari</month>
-							<month type="2">februari</month>
-							<month type="3">mars</month>
-							<month type="4">april</month>
-							<month type="5">maj</month>
-							<month type="6">juni</month>
-							<month type="7">juli</month>
-							<month type="8">augusti</month>
-							<month type="9">september</month>
-							<month type="10">oktober</month>
-							<month type="11">november</month>
-							<month type="12">december</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">sön</day>
-							<day type="mon">mån</day>
-							<day type="tue">tis</day>
-							<day type="wed">ons</day>
-							<day type="thu">tors</day>
-							<day type="fri">fre</day>
-							<day type="sat">lör</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">söndag</day>
-							<day type="mon">måndag</day>
-							<day type="tue">tisdag</day>
-							<day type="wed">onsdag</day>
-							<day type="thu">torsdag</day>
-							<day type="fri">fredag</day>
-							<day type="sat">lördag</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">O</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">L</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1:a kvartalet</quarter>
-							<quarter type="2">2:a kvartalet</quarter>
-							<quarter type="3">3:e kvartalet</quarter>
-							<quarter type="4">4:e kvartalet</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>fm</am>
-				<pm>em</pm>
-				<eras>
-					<eraNames>
-						<era type="0">före Kristus</era>
-						<era type="1">efter Kristus</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">f.Kr.</era>
-						<era type="1">e.Kr.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>'kl'. HH.mm.ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH.mm.ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH.mm.ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH.mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="hhmm">hh.mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH.mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">h.mm.ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH.mm.ss</dateFormatItem>
-						<dateFormatItem id="Hm">H.mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E d/M</dateFormatItem>
-						<dateFormatItem id="MMd">d/M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEEEd">EEE d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm.ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">yy-MM</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM -yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">yyyy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH–HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="h">HH.mm–HH.mm</greatestDifference>
-							<greatestDifference id="m">HH.mm–HH.mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="h">HH.mm–HH.mm v</greatestDifference>
-							<greatestDifference id="m">HH.mm-HH.mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH–HH v</greatestDifference>
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d–d/M</greatestDifference>
-							<greatestDifference id="M">d/M – d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d/M – E d/M</greatestDifference>
-							<greatestDifference id="M">E d/M – E d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM–MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d – E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL–LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd – yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y – MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM–d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y–d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E dd MMM–E dd MMM y</greatestDifference>
-							<greatestDifference id="M">E dd MMM–E dd MMM y</greatestDifference>
-							<greatestDifference id="y">E dd MMM y–E dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Ã¥r</displayName>
-					</field>
-					<field type="month">
-						<displayName>månad</displayName>
-					</field>
-					<field type="week">
-						<displayName>vecka</displayName>
-					</field>
-					<field type="day">
-						<displayName>dag</displayName>
-						<relative type="-3">för tre dagar sedan</relative>
-						<relative type="-2">i förrgår</relative>
-						<relative type="-1">igår</relative>
-						<relative type="0">idag</relative>
-						<relative type="1">imorgon</relative>
-						<relative type="2">i övermorgon</relative>
-						<relative type="3">om tre dagar</relative>
-					</field>
-					<field type="weekday">
-						<displayName>veckodag</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>fm/em</displayName>
-					</field>
-					<field type="hour">
-						<displayName>timme</displayName>
-					</field>
-					<field type="minute">
-						<displayName>minut</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekund</displayName>
-					</field>
-					<field type="zone">
-						<displayName>tidszon</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">tishrí</month>
-							<month type="2">heshván</month>
-							<month type="3">kislév</month>
-							<month type="4">tevét</month>
-							<month type="5">shevát</month>
-							<month type="6">adár</month>
-							<month type="7">adár II</month>
-							<month type="8">nisán</month>
-							<month type="9">ijjár</month>
-							<month type="10">siván</month>
-							<month type="11">tammúz</month>
-							<month type="12">ab</month>
-							<month type="13">elúl</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="indian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">chaitra</month>
-							<month type="2">vaish�kh</month>
-							<month type="3">jyaishtha</month>
-							<month type="4">�sh�dha</month>
-							<month type="5">shr�vana</month>
-							<month type="6">bh�drapad</month>
-							<month type="7">�shwin</month>
-							<month type="8">k�rtik</month>
-							<month type="9">m�rgashīrsha</month>
-							<month type="10">paush</month>
-							<month type="11">m�gh</month>
-							<month type="12">ph�lgun</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraNames>
-						<era type="0">Saka-eran</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">SE</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">muharram</month>
-							<month type="2">safar</month>
-							<month type="3">rabi’ al-awwal</month>
-							<month type="4">rabi’ al-akhir</month>
-							<month type="5">jumada-l-ula</month>
-							<month type="6">jumada-l-akhira</month>
-							<month type="7">rajab</month>
-							<month type="8">sha’ban</month>
-							<month type="9">ramadan</month>
-							<month type="10">shawwal</month>
-							<month type="11">dhu-l-ga’da</month>
-							<month type="12">dhu-l-hijja</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">farvardin</month>
-							<month type="2">ordibehesht</month>
-							<month type="3">khord�d</month>
-							<month type="4">tir</month>
-							<month type="5">mord�d</month>
-							<month type="6">shahrivar</month>
-							<month type="7">mehr</month>
-							<month type="8">�b�n</month>
-							<month type="9">�zar</month>
-							<month type="10">dey</month>
-							<month type="11">bahman</month>
-							<month type="12">esfand</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraAbbr>
-						<era type="0">före R.K.</era>
-						<era type="1">R.K.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH.mm;-HH.mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>UTC</gmtZeroFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Okänd</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tirana</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Jerevan</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Curaçao</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>sydpolen</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ushuaïa</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>San Salvador de Jujuy</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Córdoba</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Pango Pango</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Wien</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Dacca</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Bryssel</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Porto Novo</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Eirunepé</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Cuiabá</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Belém</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>São Paulo</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Maceió</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Thimpu</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Gabonore</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Régina</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Montréal</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>St. Johns</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürich</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>Påskön</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Bogotá</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Havanna</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Kap Verde</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Julön</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Prag</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Köpenhamn</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Alger</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Galápagos</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Tallin</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kairo</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarieöarna</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>Addis Abeba</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Helsingfors</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Torshamn</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Qaanaaq</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Godthåb</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Ittoqqortoormiit</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkshamn</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Malobo</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Aten</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Grytviken</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hongkong</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>Tequciqalpa</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Port au Prince</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Kolkata</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Bagdad</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Teheran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Rom</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>S:t Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Söul</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aqtöbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Alma-Ata</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>S:t Lucia</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Vadus</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxemburg</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Chrisinau</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Podgorika</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Bator</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Tjojbalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Macao</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldiverna</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Mazatlán</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Mérida</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Cancún</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Kathmandu</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Muskat</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Manilla</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Warszawa</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azorerna</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lissabon</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>Asunción</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Réunion</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bukarest</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Belgrad</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskva</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Jekaterinburg</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Krasnojarsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Jakutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sachalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamtjatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadir</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>Ljubliana</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>São Tomé</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>San Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Damaskus</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Dusjanbe</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Uzjgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporizjzja</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>North Dakota</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Tasjkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Saint Thomas</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Lukasa</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<generic>västbrasiliansk tid</generic>
-					<standard>västbrasiliansk normaltid</standard>
-					<daylight>västbrasiliansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<generic>afghanisk tid</generic>
-					<standard>afghanisk normalid</standard>
-					<daylight>afghanisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<generic>centralafrikansk tid</generic>
-					<standard>centralafrikansk tid</standard>
-					<daylight>centralafrikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<generic>östafrikansk tid</generic>
-					<standard>östafrikansk normaltid</standard>
-					<daylight>östafrikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_FarWestern">
-				<long>
-					<generic>västsaharisk tid</generic>
-					<standard>västsaharisk normaltid</standard>
-					<daylight>västsaharisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>sydafrikansk tid</generic>
-					<standard>sydafrikansk normaltid</standard>
-					<daylight>sydafrikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<generic>västafrikansk tid</generic>
-					<standard>västafrikansk normaltid</standard>
-					<daylight>västafrikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<generic>Aqtöbetid</generic>
-					<standard>Aqtöbenormaltid</standard>
-					<daylight>Aqtöbesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>alaskatid</generic>
-					<standard>Alaska, normaltid</standard>
-					<daylight>Alaska, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>hawaiiansk tid</generic>
-					<standard>hawaiisk normaltid</standard>
-					<daylight>hawaiisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<generic>Alma-Atatid</generic>
-					<standard>Alma-Atanormaltid</standard>
-					<daylight>Alma-Atasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<generic>amazonastid</generic>
-					<standard>Amazonasnormaltid</standard>
-					<daylight>Amazonassommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>centralnordamerikansk tid</generic>
-					<standard>Central, normaltid</standard>
-					<daylight>Central, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>östnordamerikansk tid</generic>
-					<standard>Eastern, normaltid</standard>
-					<daylight>Eastern, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Klippiga Bergentid</generic>
-					<standard>Mountain, normaltid</standard>
-					<daylight>Mountain, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>västnordamerikansk tid</generic>
-					<standard>Pacific, normaltid</standard>
-					<daylight>Pacific, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<generic>Anadirtid</generic>
-					<standard>Anadirnormaltid</standard>
-					<daylight>Anadirsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<generic>Aqtautid</generic>
-					<standard>Aqtaunormaltid</standard>
-					<daylight>Aqtausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<generic>Aqtöbetid</generic>
-					<standard>Aqtöbenormaltid</standard>
-					<daylight>Aqtöbesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>saudiarabisk tid</generic>
-					<standard>saudiarabisk normaltid</standard>
-					<daylight>saudiarabisk sommartid</daylight>
-				</long>
-				<short>
-					<generic>AT (saudiarabisk)</generic>
-					<standard>AST (saudiarabisk)</standard>
-					<daylight>ADT (saudiarabisk)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<generic>östargentinsk tid</generic>
-					<standard>östargentinsk normaltid</standard>
-					<daylight>östargentinsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<generic>västargentinsk tid</generic>
-					<standard>västargentinsk normaltid</standard>
-					<daylight>västargentinsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<generic>armenisk tid</generic>
-					<standard>armenisk normaltid</standard>
-					<daylight>armenisk somartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<generic>Ashkhabadtid</generic>
-					<standard>Ashkhabadnormaltid</standard>
-					<daylight>Ashkhabadsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>nordamerikansk atlanttid</generic>
-					<standard>Atlantic, normaltid</standard>
-					<daylight>Atlantic, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>centralaustralisk tid</generic>
-					<standard>centralaustralisk normaltid</standard>
-					<daylight>centralaustralisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Euclatid</generic>
-					<standard>Euclanormaltid</standard>
-					<daylight>Euclasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>östaustralisk tid</generic>
-					<standard>östaustralisk normaltid</standard>
-					<daylight>östaustralisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>västaustralisk tid</generic>
-					<standard>västaustralisk normaltid</standard>
-					<daylight>västaustralisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<generic>azerbajdzjansk tid</generic>
-					<standard>azerbajdzjansk normaltid</standard>
-					<daylight>azerbajdzjansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<generic>azorisk tid</generic>
-					<standard>azorisk normaltid</standard>
-					<daylight>azorisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<generic>Bakutid</generic>
-					<standard>Bakunormaltid</standard>
-					<daylight>Bakusommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<generic>bangladeshisk tid</generic>
-					<standard>bangladeshisk normaltid</standard>
-					<daylight>bangladeshisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>beringsundstid</generic>
-					<standard>beringsundsnormaltid</standard>
-					<daylight>beringsundssommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<generic>bhutansk tid</generic>
-					<standard>bhutansk normaltid</standard>
-					<daylight>bhutansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<generic>boliviansk tid</generic>
-					<standard>boliviansk normaltid</standard>
-					<daylight>boliviansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<generic>borneotid</generic>
-					<standard>Borneonormaltid</standard>
-					<daylight>Borneosommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<generic>brasiliansk tid</generic>
-					<standard>Brasilianormaltid</standard>
-					<daylight>Brasiliasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="British">
-				<long>
-					<generic>brittisk tid</generic>
-					<standard>brittisk normaltid</standard>
-					<daylight>brittisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<generic>Bruneitid</generic>
-					<standard>Bruneinormaltid</standard>
-					<daylight>Bruneisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<generic>Kap Verdetid</generic>
-					<standard>Kap Verdenormaltid</standard>
-					<daylight>Kap Verdesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>chamorrotid</generic>
-					<standard>Chamorronormaltid</standard>
-					<daylight>Chamorrosommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<generic>changbaitid</generic>
-					<standard>Changbainormaltid</standard>
-					<daylight>Changbaisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<generic>Chathamtid</generic>
-					<standard>Chathamnormaltid</standard>
-					<daylight>Chathamsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<generic>chilensk tid</generic>
-					<standard>chilensk normaltid</standard>
-					<daylight>chilensk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>kinesisk tid</generic>
-					<standard>Kina, normaltid</standard>
-					<daylight>Kina, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<generic>Choibalsantid</generic>
-					<standard>Choibalsannormaltid</standard>
-					<daylight>Choibalsansommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<generic>Julöns tid</generic>
-					<standard>Julöns normaltid</standard>
-					<daylight>Julöns sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<generic>Keelingöarnas tid</generic>
-					<standard>Keelingöarnas normaltid</standard>
-					<daylight>Keelingöarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<generic>colombiansk tid</generic>
-					<standard>colombiansk normaltid</standard>
-					<daylight>colombiansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<generic>Cooköarnas tid</generic>
-					<standard>Cooköarnas normaltid</standard>
-					<daylight>Cooköarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>kubansk tid</generic>
-					<standard>kubansk normaltid</standard>
-					<daylight>kubansk sommartid</daylight>
-				</long>
-				<short>
-					<generic>CT (Kuba)</generic>
-					<standard>CST (Kuba)</standard>
-					<daylight>CDT (Kuba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<generic>daccatid</generic>
-					<standard>Dhakanormaltid</standard>
-					<daylight>Dhakasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dominican">
-				<long>
-					<generic>dominikansk tid</generic>
-					<standard>dominikansk normaltid</standard>
-					<daylight>dominikansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<generic>Dushanbetid</generic>
-					<standard>Dushanbenormaltid</standard>
-					<daylight>Dushanbesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<generic>Holländska Guianatid</generic>
-					<standard>Holländska Guiananormaltid</standard>
-					<daylight>Holländska Guianasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<generic>östimoransk tid</generic>
-					<standard>östimorisk normaltid</standard>
-					<daylight>östimorisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<generic>Påsköns tid</generic>
-					<standard>Påsköns normaltid</standard>
-					<daylight>Påsköns sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<generic>equadoriansk tid</generic>
-					<standard>equadoriansk normaltid</standard>
-					<daylight>equadoriansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<generic>centraleuropeisk tid</generic>
-					<standard>Centraleuropa, normaltid</standard>
-					<daylight>Centraleuropa, sommartid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<generic>östeuropeisk tid</generic>
-					<standard>Östeuropa, normaltid</standard>
-					<daylight>Östeuropa, sommartid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<generic>västeuropeisk tid</generic>
-					<standard>västeuropeisk normaltid</standard>
-					<daylight>västeuropeisk sommartid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<generic>falklandsöarnas tid</generic>
-					<standard>falklandsöarnas normaltid</standard>
-					<daylight>falklandsöarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<generic>Fijis tid</generic>
-					<standard>Fijis normaltid</standard>
-					<daylight>Fijis sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<generic>Franska Guianatid</generic>
-					<standard>Franska Guiananormaltid</standard>
-					<daylight>Franska Guianasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<generic>Franska Sydterritoriernas tid</generic>
-					<standard>Franska Sydterritoriernas normaltid</standard>
-					<daylight>Franska Sydterritoriernassommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<generic>Bisjkektid</generic>
-					<standard>Bisjkeknormaltid</standard>
-					<daylight>Bisjkeksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<generic>galapagostid</generic>
-					<standard>Galápagosnormaltid</standard>
-					<daylight>Galápagossommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<generic>Gambiertid</generic>
-					<standard>Gambiernormaltid</standard>
-					<daylight>Gambiersommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<generic>georgientid</generic>
-					<standard>georgisk normaltid</standard>
-					<daylight>georgisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<generic>Kiribatitid</generic>
-					<standard>Kiribatinormaltid</standard>
-					<daylight>Kiribatisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<generic>Greenwichtid</generic>
-					<standard>Greenwichtid</standard>
-					<daylight>Greenwichtid har per definition ingen sommartid</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Goose_Bay">
-				<long>
-					<generic>Goose Baytid</generic>
-					<standard>Goose Baynormaltid</standard>
-					<daylight>Goose Baysommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<generic>centralgrönländsk tid</generic>
-					<standard>centralgrönländsk normaltid</standard>
-					<daylight>centralgrönländsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<generic>östgrönländsk tid</generic>
-					<standard>östgrönländsk normaltid</standard>
-					<daylight>östgrönländsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<generic>västgrönländsk tid</generic>
-					<standard>västgrönländsk normaltid</standard>
-					<daylight>västgrönländsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<generic>Guamtid</generic>
-					<standard>Guamnormaltid</standard>
-					<daylight>Guamsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>persiska golfen-tid</generic>
-					<standard>persiska golfen-tid</standard>
-					<daylight>Persiska Golfensommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<generic>Guyanatid</generic>
-					<standard>Guyananormaltid</standard>
-					<daylight>Guyanasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<generic>Honolulutid</generic>
-					<standard>Honolulunormaltid</standard>
-					<daylight>Honolulusommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<generic>Hongkongtid</generic>
-					<standard>Hongkongnormaltid</standard>
-					<daylight>Hongkongsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<generic>Hovdtid</generic>
-					<standard>Hovdnormaltid</standard>
-					<daylight>Hovdsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<generic>indisk tid</generic>
-					<standard>indisk normaltid</standard>
-					<daylight>indisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<generic>Brittiska Indiska oceanöarnas tdi</generic>
-					<standard>Brittiska Indiska oceanöarnas normaltdi</standard>
-					<daylight>Brittiska Indiska oceanöarnas sommartdi</daylight>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<generic>indokinesisk tid</generic>
-					<standard>indokinesisk normaltid</standard>
-					<daylight>indokinesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<generic>centralindonesisk tid</generic>
-					<standard>centralindonesisk normaltid</standard>
-					<daylight>centralindonesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<generic>östindonesisk tid</generic>
-					<standard>östindonesisk normaltid</standard>
-					<daylight>östindonesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<generic>västindonesisk tid</generic>
-					<standard>västindonesisk normaltid</standard>
-					<daylight>västindonesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<generic>iransk tid</generic>
-					<standard>iransk normaltid</standard>
-					<daylight>iransk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irish">
-				<long>
-					<generic>irländsk tid</generic>
-					<standard>irländsk normaltid</standard>
-					<daylight>irländsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<generic>Irkutsktid</generic>
-					<standard>Irkutsknormaltid</standard>
-					<daylight>Irkutsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>israelisk tid</generic>
-					<standard>Israel, normaltid</standard>
-					<daylight>Israel, sommartid</daylight>
-				</long>
-				<short>
-					<standard>IST (Israel)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>japansk tid</generic>
-					<standard>Japan, normaltid</standard>
-					<daylight>Japan, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<generic>Kamtjatkatid</generic>
-					<standard>Kamtjatkanormaltid</standard>
-					<daylight>Kamtjatkasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<generic>Karachitid</generic>
-					<standard>Karachinormaltid</standard>
-					<daylight>Karachisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<generic>Kashgartid</generic>
-					<standard>Kashgarnormaltid</standard>
-					<daylight>Kashgarsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>Alma-Atatid</generic>
-					<standard>Alma-Atanormaltid</standard>
-					<daylight>Alma-Atasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Aktautid</generic>
-					<standard>Aktaunormaltid</standard>
-					<daylight>Aktausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<generic>Qyzylordatid</generic>
-					<standard>Qyzylordanormaltid</standard>
-					<daylight>Qyzylordasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>koreansk tid</generic>
-					<standard>koreansk normaltid</standard>
-					<daylight>koreansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<generic>Kosraetid</generic>
-					<standard>Kosraenormaltid</standard>
-					<daylight>Kosraesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<generic>Krasnojarsktid</generic>
-					<standard>Krasnojarsknormaltid</standard>
-					<daylight>Krasnojarsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<generic>Kuybyshevtid</generic>
-					<standard>Kuybyshevnormaltid</standard>
-					<daylight>Kuybyshevsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<generic>Marshallöarnas tid</generic>
-					<standard>Marshallöarnas normaltid</standard>
-					<daylight>Marshallöarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<generic>kirgizisk tid</generic>
-					<standard>kirgizisk normaltid</standard>
-					<daylight>kirgizisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<generic>Sri Lankatid</generic>
-					<standard>Sri Lankanormaltid</standard>
-					<daylight>Sri Lankasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Liberia">
-				<long>
-					<generic>liberiansk tid</generic>
-					<standard>liberiansk normaltid</standard>
-					<daylight>liberiansk sommartid</daylight>
-				</long>
-				<short>
-					<standard>LBT</standard>
-					<daylight>LBST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<generic>Lineöarnas tid</generic>
-					<standard>Lineöarnas normaltid</standard>
-					<daylight>Lineöarnas sommartid</daylight>
-				</long>
-				<short>
-					<generic>LINT</generic>
-					<daylight>LINST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<generic>Chongqingtid</generic>
-					<standard>Chongqingnormaltid</standard>
-					<daylight>Chongqingsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howetid</generic>
-					<standard>Lord Howenormaltid</standard>
-					<daylight>Lord Howesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<generic>Macautid</generic>
-					<standard>Macaunormaltid</standard>
-					<daylight>Macausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<generic>Magadantid</generic>
-					<standard>Magadannormaltid</standard>
-					<daylight>Magadansommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<generic>malaysisk tid</generic>
-					<standard>malaysisk normaltid</standard>
-					<daylight>malaysisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<generic>malaysisk tid</generic>
-					<standard>malaysisk normaltid</standard>
-					<daylight>malaysisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<generic>Maldivernas tid</generic>
-					<standard>Maldivernas normaltid</standard>
-					<daylight>Maldivernas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<generic>Marquesastid</generic>
-					<standard>Marquesasnormaltid</standard>
-					<daylight>Marquesassommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<generic>Marshallötid</generic>
-					<standard>Marshallönormaltid</standard>
-					<daylight>Marshallösommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<generic>Mauritiustid</generic>
-					<standard>Mauritiustid</standard>
-					<daylight>Mauritiussommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<generic>Ulan Bator-tid</generic>
-					<standard>Ulan Batornormaltid</standard>
-					<daylight>Ulan Batorsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskvatid</generic>
-					<standard>Moskvanormaltid</standard>
-					<daylight>Moskvasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<generic>burmesisk tid</generic>
-					<standard>burmesisk normaltid</standard>
-					<daylight>burmesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<generic>Naurutid</generic>
-					<standard>Naurunormaltid</standard>
-					<daylight>Naurusommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<generic>nepalesisk tid</generic>
-					<standard>nepalesisk normaltid</standard>
-					<daylight>nepalesisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<generic>Nya Kaledonientid</generic>
-					<standard>Nya Kaledoniennormaltid</standard>
-					<daylight>Nya Kaledoniensommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>nyzeeländsk tid</generic>
-					<standard>nyzeeländsk normaltid</standard>
-					<daylight>nyzeeländsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>New Foundland-tid</generic>
-					<standard>Newfoundland, normaltid</standard>
-					<daylight>Newfoundland, sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<generic>Niuetid</generic>
-					<standard>Niuenormaltid</standard>
-					<daylight>Niuesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<generic>Norfolköns tid</generic>
-					<standard>Norfolköns normaltid</standard>
-					<daylight>Norfolköns sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<generic>Fernando de Noronhatid</generic>
-					<standard>Fernando de Noronhanormalid</standard>
-					<daylight>Fernando de Noronhasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<generic>Nordmarianernas tid</generic>
-					<standard>Nordmarianernas normaltid</standard>
-					<daylight>Nordmarianernas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<generic>Novosibirsktid</generic>
-					<standard>Novosibirsknormaltid</standard>
-					<daylight>Novosibirsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<generic>Omsktid</generic>
-					<standard>Omsknormaltid</standard>
-					<daylight>Omsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Oral">
-				<long>
-					<generic>Oraltid</generic>
-					<standard>Oralnormaltid</standard>
-					<daylight>Oralsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<generic>pakistansk tid</generic>
-					<standard>pakistansk normaltid</standard>
-					<daylight>pakistansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<generic>Palautid</generic>
-					<standard>Palaunormaltid</standard>
-					<daylight>Palausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<generic>Papua Nya Guineas tid</generic>
-					<standard>Papua Nya Guineas normaltid</standard>
-					<daylight>Papua Nya Guineas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<generic>paraguyansk tid</generic>
-					<standard>paraguyansk normalid</standard>
-					<daylight>paraguyansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<generic>peruansk tid</generic>
-					<standard>peruansk normalid</standard>
-					<daylight>peruansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<generic>filippinsk tid</generic>
-					<standard>filippinsk normaltid</standard>
-					<daylight>filippinsk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<generic>Enderburytid</generic>
-					<standard>Enderburynormaltid</standard>
-					<daylight>Enderburysommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre och Miquelontid</generic>
-					<standard>Pierre och Miquelonnormalid</standard>
-					<daylight>Pierre och Miquelonsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<generic>Pitcairntid</generic>
-					<standard>Pitcairnnormaltid</standard>
-					<daylight>Pitcairnsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<generic>Ponapetid</generic>
-					<standard>Ponapenormaltid</standard>
-					<daylight>Ponapesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<generic>Qyzylordatid</generic>
-					<standard>Qyzylordanormaltid</standard>
-					<daylight>Qyzylordasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<generic>Réuniontid</generic>
-					<standard>Réunionnormaltid</standard>
-					<daylight>Réunionsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<generic>Sachalintid</generic>
-					<standard>Sachalinnormaltid</standard>
-					<daylight>Sachalinsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<generic>Samaratid</generic>
-					<standard>Samaranormaltid</standard>
-					<daylight>Samarasommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<generic>Samarkandtid</generic>
-					<standard>Samarkandnormaltid</standard>
-					<daylight>Samarkandsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<generic>samoansk tid</generic>
-					<standard>samoansk normaltid</standard>
-					<daylight>samoansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<generic>Seychellernas tid</generic>
-					<standard>Seychellernas normaltid</standard>
-					<daylight>Seychellernas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<generic>Aqtautid</generic>
-					<standard>Aqtaunormaltid</standard>
-					<daylight>Aqtausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<generic>Singaporetid</generic>
-					<standard>Singaporenormaltid</standard>
-					<daylight>Singaporesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<generic>Salomonöarnas tid</generic>
-					<standard>Salomonöarnas normaltid</standard>
-					<daylight>Salomonöarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<generic>sydgeorgisk tid</generic>
-					<standard>sydgeorgisk normaltid</standard>
-					<daylight>sydgeorgisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<generic>Surinamtid</generic>
-					<standard>Surinamnormaltid</standard>
-					<daylight>Surinamsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<generic>Sverdlovsktid</generic>
-					<standard>Sverdlovsknormaltid</standard>
-					<daylight>Sverdlovsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<generic>Tahititid</generic>
-					<standard>Tahitinormaltid</standard>
-					<daylight>Tahitisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<generic>Tadzjikistantid</generic>
-					<standard>Tadzjikistannormaltid</standard>
-					<daylight>Tadzjikistansommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<generic>uzbekisk tid</generic>
-					<standard>uzbekisk normaltid</standard>
-					<daylight>uzbekisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<generic>georgisk tid</generic>
-					<standard>georgisk normaltid</standard>
-					<daylight>georgisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<generic>Tokelautid</generic>
-					<standard>Tokelaunormaltid</standard>
-					<daylight>Tokelausommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<generic>Tongatid</generic>
-					<standard>Tongatid</standard>
-					<daylight>Tongasommmartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<generic>Truktid</generic>
-					<standard>Truknormaltid</standard>
-					<daylight>Truksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<generic>turkisk tid</generic>
-					<standard>turkisk normaltid</standard>
-					<daylight>turkisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<generic>turkmenisk tid</generic>
-					<standard>turkmenisk normaltid</standard>
-					<daylight>turkmenisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<generic>Tuvalutid</generic>
-					<standard>Tuvalunormaltid</standard>
-					<daylight>Tuvalusommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<generic>Oraltid</generic>
-					<standard>Oralnormaltid</standard>
-					<daylight>Oralsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<generic>uruguayansk tid</generic>
-					<standard>uruguayansk normaltid</standard>
-					<daylight>uruguayansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<generic>Urumqitid</generic>
-					<standard>Urumqinormaltid</standard>
-					<daylight>Urumqisommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<generic>uzbeskisk tid</generic>
-					<standard>uzbeskisk normaltid</standard>
-					<daylight>uzbeskisk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<generic>Vanuatutid</generic>
-					<standard>Vanuatunormaltid</standard>
-					<daylight>Vanuatusommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<generic>venezulansk tid</generic>
-					<standard>venezulansk normaltid</standard>
-					<daylight>venezulansk sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<generic>Vladivostoktid</generic>
-					<standard>Vladivostoknormaltid</standard>
-					<daylight>Vladivostoksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<generic>Volvogradtid</generic>
-					<standard>Volvogradnormaltid</standard>
-					<daylight>Volvogradsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<generic>Waketid</generic>
-					<standard>Wakenormaltid</standard>
-					<daylight>Wakesommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<generic>Wallis- och Futunaöarnas tid</generic>
-					<standard>Wallis- och Futunaöarnas normaltid</standard>
-					<daylight>Wallis- och Futunaöarnas sommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<generic>Jakutsktid</generic>
-					<standard>Jakutsknormaltid</standard>
-					<daylight>Jakutsksommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<generic>Jekaterinburgtid</generic>
-					<standard>Jekaterinburgnormaltid</standard>
-					<daylight>Jekaterinburgsommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<generic>Yerevantid</generic>
-					<standard>Yerevannormaltid</standard>
-					<daylight>Yerevansommartid</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukontid</generic>
-					<standard>Yukonnormaltid</standard>
-					<daylight>Yukonsommartid</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>−</minusSign>
-			<exponential>×10^</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>¤¤¤</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0 %</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">{0} {1}</unitPattern>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>andorransk peseta</displayName>
-				<displayName count="one">andorransk peseta</displayName>
-				<displayName count="other">andorranska pesetas</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Förenade Arabemiratens dirham</displayName>
-				<displayName count="one">Förenade Arabemiratens dirham</displayName>
-				<displayName count="other">Förenade Arabemiratens dirham</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>afghani (1927-2002)</displayName>
-				<displayName count="one">afghani (1927-2002)</displayName>
-				<displayName count="other">afghani (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>afghani</displayName>
-				<displayName count="one">afghani</displayName>
-				<displayName count="other">afghani</displayName>
-				<symbol>AFN</symbol>
-			</currency>
-			<currency type="ALK">
-				<displayName>albansk gamla lek</displayName>
-				<displayName count="one">albansk gammal lek</displayName>
-				<displayName count="other">albanska gamla lek</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>albansk lek</displayName>
-				<displayName count="one">albansk lek</displayName>
-				<displayName count="other">albanska lek</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>armenisk dram</displayName>
-				<displayName count="one">armenisk dram</displayName>
-				<displayName count="other">armeniska dram</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Nederländska Antillernas gulden</displayName>
-				<displayName count="one">Nederländska Antillernas gulden</displayName>
-				<displayName count="other">Nederländska Antillernas gulden</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>angolansk kwanza</displayName>
-				<displayName count="one">angolansk kwanza</displayName>
-				<displayName count="other">angolanska kwanza</displayName>
-				<symbol>AOA</symbol>
-			</currency>
-			<currency type="AOK">
-				<displayName>angolansk kwanza (1977-1990)</displayName>
-				<displayName count="one">angolansk kwanza (1977-1990)</displayName>
-				<displayName count="other">angolanska kwanza (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>angolansk ny kwanza (1990-2000)</displayName>
-				<displayName count="one">angolansk kwanza (1990-1995)</displayName>
-				<displayName count="other">angolanska nya kwanza (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>angolansk kwanza reajustado (1995-1999)</displayName>
-				<displayName count="one">angolansk kwanza reajustado (1995-1999)</displayName>
-				<displayName count="other">angolanska kwanza reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>argentinsk austral</displayName>
-				<displayName count="one">argentinsk austral</displayName>
-				<displayName count="other">argentinska australer</displayName>
-				<symbol>ARA</symbol>
-			</currency>
-			<currency type="ARL">
-				<symbol>ARL</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>ARM</symbol>
-			</currency>
-			<currency type="ARP">
-				<displayName>argentinsk peso (1983-1985)</displayName>
-				<displayName count="one">argentinsk peso (1983-1985)</displayName>
-				<displayName count="other">argentinska pesos (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>argentinsk peso</displayName>
-				<displayName count="one">argentinsk peso</displayName>
-				<displayName count="other">argentinska pesos</displayName>
-				<symbol>ARS</symbol>
-			</currency>
-			<currency type="ATS">
-				<displayName>österrikisk schilling</displayName>
-				<displayName count="one">österrikisk schilling</displayName>
-				<displayName count="other">österrikiska schilling</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>australisk dollar</displayName>
-				<displayName count="one">australisk dollar</displayName>
-				<displayName count="other">australiska dollar</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba-gulden</displayName>
-				<displayName count="one">Aruba-gulden</displayName>
-				<displayName count="other">Aruba-gulden</displayName>
-				<symbol>AWG</symbol>
-			</currency>
-			<currency type="AZM">
-				<displayName>azerbajdzjansk manat (1993-2006)</displayName>
-				<displayName count="one">azerbajdzjansk manat (1993-2006)</displayName>
-				<displayName count="other">azerbajdzjanska manat (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>azerbajdzjansk manat</displayName>
-				<displayName count="one">azerbajdzjansk manat</displayName>
-				<displayName count="other">AZN</displayName>
-				<symbol>AZN</symbol>
-			</currency>
-			<currency type="BAD">
-				<displayName>bosnisk-hercegovinsk dinar</displayName>
-				<displayName count="one">bosnisk-hercegovinsk dinar</displayName>
-				<displayName count="other">bosnisk-hercegovinska dinarer</displayName>
-				<symbol>BAD</symbol>
-			</currency>
-			<currency type="BAM">
-				<displayName>bosnisk-hercegovinsk mark (konvertibel)</displayName>
-				<displayName count="one">bosnisk-hercegovinsk mark (konvertibel)</displayName>
-				<displayName count="other">bosnisk-hercegovinska mark (konvertibla)</displayName>
-				<symbol>BAM</symbol>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbados-dollar</displayName>
-				<displayName count="one">Barbados-dollar</displayName>
-				<displayName count="other">Barbados-dollar</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>bangladeshisk taka</displayName>
-				<displayName count="one">bangladeshisk taka</displayName>
-				<displayName count="other">bangladeshiska taka</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>belgisk franc (konvertibel)</displayName>
-				<displayName count="one">belgisk franc (konvertibel)</displayName>
-				<displayName count="other">belgiska franc (konvertibla)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>belgisk franc</displayName>
-				<displayName count="one">belgisk franc</displayName>
-				<displayName count="other">belgiska franc</displayName>
-				<symbol>BEF</symbol>
-			</currency>
-			<currency type="BEL">
-				<displayName>belgisk franc (finansiell)</displayName>
-				<displayName count="one">belgisk franc (finansiell)</displayName>
-				<displayName count="other">belgiska franc (finansiella)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>bulgarisk lev (1962–1999)</displayName>
-				<displayName count="one">bulgarisk hård lev (1962–1999)</displayName>
-				<displayName count="other">bulgariska lev (1962–1999)</displayName>
-			</currency>
-			<currency type="BGM">
-				<displayName>bulgarisk lev (1952–1962)</displayName>
-				<displayName count="other">bulgariska lev (1952–1962)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>bulgarisk ny lev</displayName>
-				<displayName count="one">bulgarisk lev</displayName>
-				<displayName count="other">bulgariska nya lev</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahrain-dinar</displayName>
-				<displayName count="one">Bahrain-dinar</displayName>
-				<displayName count="other">BHD</displayName>
-				<symbol>BHD</symbol>
-			</currency>
-			<currency type="BIF">
-				<displayName>burundisk franc</displayName>
-				<displayName count="one">burundisk franc</displayName>
-				<displayName count="other">burundiska franc</displayName>
-				<symbol>BIF</symbol>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda-dollar</displayName>
-				<displayName count="one">Bermuda-dollar</displayName>
-				<displayName count="other">Bermuda-dollar</displayName>
-				<symbol>BMD</symbol>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei-dollar</displayName>
-				<displayName count="one">Brunei-dollar</displayName>
-				<displayName count="other">Brunei-dollar</displayName>
-				<symbol>BND</symbol>
-			</currency>
-			<currency type="BOB">
-				<displayName>boliviano</displayName>
-				<displayName count="one">boliviansk boliviano</displayName>
-				<displayName count="other">boliviano</displayName>
-				<symbol>BOB</symbol>
-			</currency>
-			<currency type="BOP">
-				<displayName>boliviansk peso</displayName>
-				<displayName count="one">boliviansk peso</displayName>
-				<displayName count="other">bolivianska pesos</displayName>
-				<symbol>BOP</symbol>
-			</currency>
-			<currency type="BOV">
-				<displayName>boliviansk mvdol</displayName>
-				<displayName count="one">boliviansk mvdol</displayName>
-				<displayName count="other">bolivianska mvdol</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>brasiliansk cruzeiro novo (1967-1986)</displayName>
-				<displayName count="one">brasiliansk cruzeiro (1967-1986)</displayName>
-				<displayName count="other">brasilianska cruzeiro novo (1967-1986)</displayName>
-				<symbol>BRB</symbol>
-			</currency>
-			<currency type="BRC">
-				<displayName>brasiliansk cruzado</displayName>
-				<displayName count="one">brasiliansk cruzado</displayName>
-				<displayName count="other">brasilianska cruzado</displayName>
-				<symbol>BRC</symbol>
-			</currency>
-			<currency type="BRE">
-				<displayName>brasiliansk cruzeiro (1990-1993)</displayName>
-				<displayName count="one">brasiliansk cruzeiro (1990-1993)</displayName>
-				<displayName count="other">brasilianska cruzeiro (1990-1993)</displayName>
-				<symbol>BRE</symbol>
-			</currency>
-			<currency type="BRL">
-				<displayName>brasiliansk real</displayName>
-				<displayName count="one">brasiliansk real</displayName>
-				<displayName count="other">brasilianska real</displayName>
-				<symbol>BRL</symbol>
-			</currency>
-			<currency type="BRN">
-				<displayName>brasiliansk cruzado novo</displayName>
-				<displayName count="one">brasiliansk cruzado novo</displayName>
-				<displayName count="other">brasilianska cruzado novo</displayName>
-				<symbol>BRN</symbol>
-			</currency>
-			<currency type="BRR">
-				<displayName>brasiliansk cruzeiro</displayName>
-				<displayName count="one">brasiliansk cruzeiro</displayName>
-				<displayName count="other">brasilianska cruzeiros</displayName>
-				<symbol>BRR</symbol>
-			</currency>
-			<currency type="BRZ">
-				<symbol>BRZ</symbol>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahamas-dollar</displayName>
-				<displayName count="one">Bahamas-dollar</displayName>
-				<displayName count="other">Bahamas-dollar</displayName>
-				<symbol>BSD</symbol>
-			</currency>
-			<currency type="BTN">
-				<displayName>bhutanesisk ngultrum</displayName>
-				<displayName count="one">bhutanesisk ngultrum</displayName>
-				<displayName count="other">bhutanesiska ngultrum</displayName>
-				<symbol>BTN</symbol>
-			</currency>
-			<currency type="BUK">
-				<displayName>burmesisk kyat</displayName>
-				<displayName count="one">burmesisk kyat</displayName>
-				<displayName count="other">burmesiska kyat</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>botswansk pula</displayName>
-				<displayName count="one">botswansk pula</displayName>
-				<displayName count="other">botswanska pula</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>vitrysk ny rubel (1994-1999)</displayName>
-				<displayName count="one">vitrysk rubel (1994-1999)</displayName>
-				<displayName count="other">vitryska nya rubel (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>vitrysk rubel</displayName>
-				<displayName count="one">vitrysk rubel</displayName>
-				<displayName count="other">vitryska rubel</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>belizisk dollar</displayName>
-				<displayName count="one">belizisk dollar</displayName>
-				<displayName count="other">BZD</displayName>
-				<symbol>BZD</symbol>
-			</currency>
-			<currency type="CAD">
-				<displayName>kanadensisk dollar</displayName>
-				<displayName count="one">kanadensisk dollar</displayName>
-				<displayName count="other">kanadensiska dollar</displayName>
-				<symbol>CAD</symbol>
-			</currency>
-			<currency type="CDF">
-				<displayName>kongolesisk franc</displayName>
-				<displayName count="one">kongolesisk franc</displayName>
-				<displayName count="other">kongolesiska franc</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>euro (konvertibelt konto, WIR Bank, Schweiz)</displayName>
-				<displayName count="one">euro (WIR Bank)</displayName>
-				<displayName count="other">euro (konvertibelt konto, WIR Bank, Schweiz)</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>schweizisk franc</displayName>
-				<displayName count="one">schweizisk franc</displayName>
-				<displayName count="other">schweiziska franc</displayName>
-				<symbol>CHF</symbol>
-			</currency>
-			<currency type="CHW">
-				<displayName>franc (konvertibelt konto, WIR Bank, Schweiz)</displayName>
-				<displayName count="one">franc (WIR Bank)</displayName>
-				<displayName count="other">franc (konvertibelt konto, WIR Bank, Schweiz)</displayName>
-			</currency>
-			<currency type="CLE">
-				<symbol>CLE</symbol>
-			</currency>
-			<currency type="CLF">
-				<displayName>chilensk unidad de fomento</displayName>
-				<displayName count="one">chilensk unidad de fomento</displayName>
-				<displayName count="other">chilenska unidad de fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>chilensk peso</displayName>
-				<displayName count="one">chilensk peso</displayName>
-				<displayName count="other">chilenska pesos</displayName>
-				<symbol>CLP</symbol>
-			</currency>
-			<currency type="CNX">
-				<displayName>kinesisk dollar</displayName>
-				<displayName count="one">kinesisk dollar</displayName>
-				<displayName count="other">kinesiska dollar</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>kinesisk yuan renminbi</displayName>
-				<displayName count="one">kinesisk yuan renminbi</displayName>
-				<displayName count="other">kinesiska yuan renminbi</displayName>
-				<symbol>CNY</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>colombiansk peso</displayName>
-				<displayName count="one">colombiansk peso</displayName>
-				<displayName count="other">colombianska pesos</displayName>
-				<symbol>COP</symbol>
-			</currency>
-			<currency type="COU">
-				<displayName>colombiansk unidad de valor real</displayName>
-				<displayName count="one">colombiansk unidad de valor real</displayName>
-				<displayName count="other">colombianska unidad de valor real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>costarikansk colón</displayName>
-				<displayName count="one">costarikansk colón</displayName>
-				<displayName count="other">costarikanska colón</displayName>
-				<symbol>CRC</symbol>
-			</currency>
-			<currency type="CSD">
-				<displayName>jugoslavisk dinar</displayName>
-				<displayName count="one">gammal serbisk dinar</displayName>
-				<displayName count="other">gamla serbiska dinarer</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>tjeckisk hård koruna</displayName>
-				<displayName count="one">tjeckoslovakisk hård koruna</displayName>
-				<displayName count="other">tjeckiska hårda koruna</displayName>
-			</currency>
-			<currency type="CUC">
-				<symbol>CUC</symbol>
-			</currency>
-			<currency type="CUP">
-				<displayName>kubansk peso</displayName>
-				<displayName count="one">kubansk peso</displayName>
-				<displayName count="other">kubanska pesos</displayName>
-				<symbol>CUP</symbol>
-			</currency>
-			<currency type="CVE">
-				<displayName>kapverdisk escudo</displayName>
-				<displayName count="one">kapverdisk escudo</displayName>
-				<displayName count="other">kapverdiska escudos</displayName>
-				<symbol>CVE</symbol>
-			</currency>
-			<currency type="CYP">
-				<displayName>cypriotiskt pund</displayName>
-				<displayName count="one">cypriotiskt pund</displayName>
-				<displayName count="other">cypriotiska pund</displayName>
-				<symbol>CYP</symbol>
-			</currency>
-			<currency type="CZK">
-				<displayName>tjeckisk koruna</displayName>
-				<displayName count="one">tjeckisk koruna</displayName>
-				<displayName count="other">tjeckiska koruna</displayName>
-				<symbol>CZK</symbol>
-			</currency>
-			<currency type="DDM">
-				<displayName>östtysk mark</displayName>
-				<displayName count="one">östtysk mark</displayName>
-				<displayName count="other">östtyska mark</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>tysk mark</displayName>
-				<displayName count="one">tysk mark</displayName>
-				<displayName count="other">tyska mark</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>djiboutisk franc</displayName>
-				<displayName count="one">djiboutisk franc</displayName>
-				<displayName count="other">djiboutiska franc</displayName>
-				<symbol>DJF</symbol>
-			</currency>
-			<currency type="DKK">
-				<displayName>dansk krona</displayName>
-				<displayName count="one">dansk krona</displayName>
-				<displayName count="other">danska kronor</displayName>
-				<symbol>DKK</symbol>
-			</currency>
-			<currency type="DOP">
-				<displayName>dominikansk peso</displayName>
-				<displayName count="one">dominikansk peso</displayName>
-				<displayName count="other">dominikanska pesos</displayName>
-				<symbol>DOP</symbol>
-			</currency>
-			<currency type="DZD">
-				<displayName>algerisk dinar</displayName>
-				<displayName count="one">algerisk dinar</displayName>
-				<displayName count="other">algeriska dinarer</displayName>
-				<symbol>DZD</symbol>
-			</currency>
-			<currency type="ECS">
-				<displayName>ecuadoriansk sucre</displayName>
-				<displayName count="one">ecuadoriansk sucre</displayName>
-				<displayName count="other">ecuadorianska sucre</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>ecuadoriansk unidad de valor constante</displayName>
-				<displayName count="one">ecuadoriansk unidad de valor constante</displayName>
-				<displayName count="other">ecuadorianska unidad de valor constante</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>estnisk krona</displayName>
-				<displayName count="one">estnisk krona</displayName>
-				<displayName count="other">estniska kronor</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>egyptiskt pund</displayName>
-				<displayName count="one">egyptiskt pund</displayName>
-				<displayName count="other">egyptiska pund</displayName>
-				<symbol>EGP</symbol>
-			</currency>
-			<currency type="ERN">
-				<displayName>eritreansk nakfa</displayName>
-				<displayName count="one">eritreansk nakfa</displayName>
-				<displayName count="other">eritreanska nakfa</displayName>
-				<symbol>ERN</symbol>
-			</currency>
-			<currency type="ESA">
-				<displayName>spansk peseta (konto)</displayName>
-				<displayName count="one">spansk peseta (konto)</displayName>
-				<displayName count="other">spanska pesetas (konto)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>spansk peseta (konvertibelt konto)</displayName>
-				<displayName count="one">spansk peseta (konvertibelt konto)</displayName>
-				<displayName count="other">spanska pesetas (konvertibelt konto)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>spansk peseta</displayName>
-				<displayName count="one">spansk peseta</displayName>
-				<displayName count="other">spanska pesetas</displayName>
-				<symbol>ESP</symbol>
-			</currency>
-			<currency type="ETB">
-				<displayName>etiopisk birr</displayName>
-				<displayName count="one">etiopisk birr</displayName>
-				<displayName count="other">etiopiska birr</displayName>
-				<symbol>ETB</symbol>
-			</currency>
-			<currency type="EUR">
-				<displayName>euro</displayName>
-				<displayName count="one">euro</displayName>
-				<displayName count="other">euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>finsk mark</displayName>
-				<displayName count="one">finsk mark</displayName>
-				<displayName count="other">finska mark</displayName>
-				<symbol>FIM</symbol>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fiji-dollar</displayName>
-				<displayName count="one">Fiji-dollar</displayName>
-				<displayName count="other">Fiji-dollar</displayName>
-				<symbol>FJD</symbol>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falklandsöarnas pund</displayName>
-				<displayName count="one">Falklandsöarnas pund</displayName>
-				<displayName count="other">Falklandsöarnas pund</displayName>
-				<symbol>FKP</symbol>
-			</currency>
-			<currency type="FRF">
-				<displayName>fransk franc</displayName>
-				<displayName count="one">fransk franc</displayName>
-				<displayName count="other">franska franc</displayName>
-				<symbol>FRF</symbol>
-			</currency>
-			<currency type="GBP">
-				<displayName>brittiskt pund sterling</displayName>
-				<displayName count="one">brittiskt pund sterling</displayName>
-				<displayName count="other">brittiska pund sterling</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>georgisk kupon larit</displayName>
-				<displayName count="one">georgisk kupon larit</displayName>
-				<displayName count="other">georgiska kupon larit</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>georgisk lari</displayName>
-				<displayName count="one">georgisk lari</displayName>
-				<displayName count="other">georgiska lari</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>ghanansk cedi (1979-2007)</displayName>
-				<displayName count="one">ghanansk cedi (1979-2007)</displayName>
-				<displayName count="other">ghananska cedi (1979-2007)</displayName>
-				<symbol>GHC</symbol>
-			</currency>
-			<currency type="GHS">
-				<displayName>ghanansk cedi</displayName>
-				<displayName count="one">ghanansk cedi</displayName>
-				<displayName count="other">ghananska cedi</displayName>
-				<symbol>GHS</symbol>
-			</currency>
-			<currency type="GIP">
-				<displayName>gibraltiskt pund</displayName>
-				<displayName count="one">gibraltiskt pund</displayName>
-				<displayName count="other">gibraltiska pund</displayName>
-				<symbol>GIP</symbol>
-			</currency>
-			<currency type="GMD">
-				<displayName>gambisk dalasi</displayName>
-				<displayName count="one">gambisk dalasi</displayName>
-				<displayName count="other">gambiska dalasi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>guineansk franc</displayName>
-				<displayName count="one">guineansk franc</displayName>
-				<displayName count="other">guineanska franc</displayName>
-				<symbol>GNF</symbol>
-			</currency>
-			<currency type="GNS">
-				<displayName>guineansk syli</displayName>
-				<displayName count="one">guineansk syli</displayName>
-				<displayName count="other">guineanska syli</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>ekvatorialguineansk ekwele</displayName>
-				<displayName count="one">ekvatorialguineansk ekwele</displayName>
-				<displayName count="other">ekvatorialguineanska ekweler</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>grekisk drachma</displayName>
-				<displayName count="one">grekisk drachma</displayName>
-				<displayName count="other">grekiska drachmer</displayName>
-				<symbol>GRD</symbol>
-			</currency>
-			<currency type="GTQ">
-				<displayName>guatemalansk quetzal</displayName>
-				<displayName count="one">guatemalansk quetzal</displayName>
-				<displayName count="other">guatemalanska quetzal</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portugisiska Guinea-escudo</displayName>
-				<displayName count="one">Portugisiska Guinea-escudo</displayName>
-				<displayName count="other">Portugisiska Guinea-escudos</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Guinea-Bissau-peso</displayName>
-				<displayName count="one">Guinea-Bissau-peso</displayName>
-				<displayName count="other">Guinea-Bissau-pesos</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>guyanansk dollar</displayName>
-				<displayName count="one">Guyana-dollar</displayName>
-				<displayName count="other">guyanska dollar</displayName>
-				<symbol>GYD</symbol>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hongkong-dollar</displayName>
-				<displayName count="one">Hongkong-dollar</displayName>
-				<displayName count="other">Hongkong-dollar</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>honduransk lempira</displayName>
-				<displayName count="one">honduransk lempira</displayName>
-				<displayName count="other">honduranska lempira</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>kroatisk dinar</displayName>
-				<displayName count="one">kroatisk dinar</displayName>
-				<displayName count="other">kroatiska dinarer</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>kroatisk kuna</displayName>
-				<displayName count="one">kroatisk kuna</displayName>
-				<displayName count="other">kroatiska kunor</displayName>
-				<symbol>HRK</symbol>
-			</currency>
-			<currency type="HTG">
-				<displayName>haitisk gourde</displayName>
-				<displayName count="one">haitisk gourde</displayName>
-				<displayName count="other">haitiska gourder</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>ungersk forint</displayName>
-				<displayName count="one">ungersk forint</displayName>
-				<displayName count="other">ungerska forinter</displayName>
-				<symbol>HUF</symbol>
-			</currency>
-			<currency type="IDR">
-				<displayName>indonesisk rupiah</displayName>
-				<displayName count="one">indonesisk rupiah</displayName>
-				<displayName count="other">indonesiska rupier</displayName>
-				<symbol>IDR</symbol>
-			</currency>
-			<currency type="IEP">
-				<displayName>irländskt pund</displayName>
-				<displayName count="one">irländskt pund</displayName>
-				<displayName count="other">irländska pund</displayName>
-				<symbol>IEP</symbol>
-			</currency>
-			<currency type="ILP">
-				<displayName>israeliskt pund</displayName>
-				<displayName count="one">israeliskt pund</displayName>
-				<displayName count="other">israeliska pund</displayName>
-				<symbol>ILP</symbol>
-			</currency>
-			<currency type="ILR">
-				<displayName>israelisk gammal shekel</displayName>
-				<displayName count="one">israelisk gammal shekel</displayName>
-				<displayName count="other">israeliska gamla shekel</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>israelisk ny shekel</displayName>
-				<displayName count="one">israelisk ny shekel</displayName>
-				<displayName count="other">israeliska nya shekel</displayName>
-				<symbol>ILS</symbol>
-			</currency>
-			<currency type="INR">
-				<displayName>indisk rupie</displayName>
-				<displayName count="one">indisk rupie</displayName>
-				<displayName count="other">indiska rupier</displayName>
-				<symbol>INR</symbol>
-			</currency>
-			<currency type="IQD">
-				<displayName>irakisk dinar</displayName>
-				<displayName count="one">irakisk dinar</displayName>
-				<displayName count="other">irakiska dinarer</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>iransk rial</displayName>
-				<displayName count="one">iransk rial</displayName>
-				<displayName count="other">iranska rial</displayName>
-			</currency>
-			<currency type="ISJ">
-				<displayName>isländsk gammal krona</displayName>
-				<displayName count="one">isländsk gammal krona</displayName>
-				<displayName count="other">isländska kronor (1874–1981)</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>isländsk krona</displayName>
-				<displayName count="one">isländsk krona</displayName>
-				<displayName count="other">isländska kronor</displayName>
-				<symbol>ISK</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>italiensk lira</displayName>
-				<displayName count="one">italiensk lire</displayName>
-				<displayName count="other">italienska lire</displayName>
-				<symbol>ITL</symbol>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaica-dollar</displayName>
-				<displayName count="one">Jamaica-dollar</displayName>
-				<displayName count="other">Jamaica-dollar</displayName>
-				<symbol>JMD</symbol>
-			</currency>
-			<currency type="JOD">
-				<displayName>jordansk dinar</displayName>
-				<displayName count="one">jordansk dinar</displayName>
-				<displayName count="other">jordanska dinarer</displayName>
-				<symbol>JOD</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>japansk yen</displayName>
-				<displayName count="one">japansk yen</displayName>
-				<displayName count="other">japanska yen</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>kenyansk shilling</displayName>
-				<displayName count="one">kenyansk shilling</displayName>
-				<displayName count="other">kenyanska shilling</displayName>
-				<symbol>KES</symbol>
-			</currency>
-			<currency type="KGS">
-				<displayName>kirgizisk som</displayName>
-				<displayName count="one">kirgizisk som</displayName>
-				<displayName count="other">kirgiziska somer</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>kambodjansk riel</displayName>
-				<displayName count="one">kambodjansk riel</displayName>
-				<displayName count="other">kambodjanska riel</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>komorisk franc</displayName>
-				<displayName count="one">komorisk franc</displayName>
-				<displayName count="other">komoriska franc</displayName>
-				<symbol>KMF</symbol>
-			</currency>
-			<currency type="KPW">
-				<displayName>nordkoreansk won</displayName>
-				<displayName count="one">nordkoreansk won</displayName>
-				<displayName count="other">nordkoreanska won</displayName>
-				<symbol>KPW</symbol>
-			</currency>
-			<currency type="KRW">
-				<displayName>sydkoreansk won</displayName>
-				<displayName count="one">sydkoreansk won</displayName>
-				<displayName count="other">sydkoreanska won</displayName>
-				<symbol>KRW</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>kuwaitisk dinar</displayName>
-				<displayName count="one">kuwaitisk dinar</displayName>
-				<displayName count="other">kuwaitiska dinarer</displayName>
-				<symbol>KWD</symbol>
-			</currency>
-			<currency type="KYD">
-				<displayName>Cayman-dollar</displayName>
-				<displayName count="one">Cayman-dollar</displayName>
-				<displayName count="other">Cayman-dollar</displayName>
-				<symbol>KYD</symbol>
-			</currency>
-			<currency type="KZT">
-				<displayName>kazakisk tenge</displayName>
-				<displayName count="one">kazakisk tenge</displayName>
-				<displayName count="other">kazakiska tenger</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>laotisk kip</displayName>
-				<displayName count="one">laotisk kip</displayName>
-				<displayName count="other">laotiska kiper</displayName>
-				<symbol>LAK</symbol>
-			</currency>
-			<currency type="LBP">
-				<displayName>libanesiskt pund</displayName>
-				<displayName count="one">libanesiskt pund</displayName>
-				<displayName count="other">libanesiska pund</displayName>
-				<symbol>LBP</symbol>
-			</currency>
-			<currency type="LKR">
-				<displayName>srilankesisk rupie</displayName>
-				<displayName count="one">srilankesisk rupie</displayName>
-				<displayName count="other">srilankesiska rupier</displayName>
-				<symbol>LKR</symbol>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberia-dollar</displayName>
-				<displayName count="one">Liberia-dollar</displayName>
-				<displayName count="other">Liberia-dollar</displayName>
-				<symbol>LRD</symbol>
-			</currency>
-			<currency type="LSL">
-				<displayName>lesothisk loti</displayName>
-				<displayName count="one">lesothisk loti</displayName>
-				<displayName count="other">lesothiska lotier</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>litauisk litas</displayName>
-				<displayName count="one">litauisk litas</displayName>
-				<displayName count="other">litauiska litas</displayName>
-				<symbol>LTL</symbol>
-			</currency>
-			<currency type="LTT">
-				<displayName>litauisk talonas</displayName>
-				<displayName count="one">litauisk talonas</displayName>
-				<displayName count="other">litauiska talonas</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>luxemburgsk franc (konvertibel)</displayName>
-				<displayName count="one">luxemburgsk franc (konvertibel)</displayName>
-				<displayName count="other">luxemburgska franc (konvertibla)</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>luxemburgsk franc</displayName>
-				<displayName count="one">luxemburgsk franc</displayName>
-				<displayName count="other">luxemburgska franc</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>luxemburgsk franc (finansiell)</displayName>
-				<displayName count="one">luxemburgsk franc (finansiell)</displayName>
-				<displayName count="other">luxemburgska franc (finansiella)</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>lettisk lats</displayName>
-				<displayName count="one">lettisk lats</displayName>
-				<displayName count="other">lettiska lats</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>lettisk rubel</displayName>
-				<displayName count="one">lettisk rubel</displayName>
-				<displayName count="other">lettiska rubel</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>libysk dinar</displayName>
-				<displayName count="one">libysk dinar</displayName>
-				<displayName count="other">libyska dinarer</displayName>
-				<symbol>LYD</symbol>
-			</currency>
-			<currency type="MAD">
-				<displayName>marockansk dirham</displayName>
-				<displayName count="one">marockansk dirham</displayName>
-				<displayName count="other">marockanska dirhamer</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>marockansk franc</displayName>
-				<displayName count="one">marockansk franc</displayName>
-				<displayName count="other">marockanska franc</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>moldavisk leu</displayName>
-				<displayName count="one">moldavisk leu</displayName>
-				<displayName count="other">moldaviska leu</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>madagaskisk ariary</displayName>
-				<displayName count="one">madagaskisk ariary</displayName>
-				<displayName count="other">madagaskiska ariary</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>madagaskisk franc</displayName>
-				<displayName count="one">madagaskisk franc</displayName>
-				<displayName count="other">madagaskiska franc</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>makedonisk denar</displayName>
-				<displayName count="one">makedonisk denar</displayName>
-				<displayName count="other">makedoniska denarer</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>malisk franc</displayName>
-				<displayName count="one">malisk franc</displayName>
-				<displayName count="other">maliska franc</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>myanmarisk kyat</displayName>
-				<displayName count="one">myanmarisk kyat</displayName>
-				<displayName count="other">myanmariska kyat</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>mongolisk tugrik</displayName>
-				<displayName count="one">mongolisk tugrik</displayName>
-				<displayName count="other">mongoliska tugrik</displayName>
-				<symbol>MNT</symbol>
-			</currency>
-			<currency type="MOP">
-				<displayName>Macao-pataca</displayName>
-				<displayName count="one">Macao-pataca</displayName>
-				<displayName count="other">Macao-pataca</displayName>
-				<symbol>MOP</symbol>
-			</currency>
-			<currency type="MRO">
-				<displayName>mauretansk ouguiya</displayName>
-				<displayName count="one">mauretansk ouguiya</displayName>
-				<displayName count="other">mauretanska ouguiya</displayName>
-				<symbol>MRO</symbol>
-			</currency>
-			<currency type="MTL">
-				<displayName>maltesisk lira</displayName>
-				<displayName count="one">maltesisk lire</displayName>
-				<displayName count="other">maltesiska lire</displayName>
-				<symbol>MTL</symbol>
-			</currency>
-			<currency type="MTP">
-				<displayName>maltesiskt pund</displayName>
-				<displayName count="one">maltesiskt pund</displayName>
-				<displayName count="other">maltesiska pund</displayName>
-				<symbol>MTP</symbol>
-			</currency>
-			<currency type="MUR">
-				<displayName>mauritisk rupie</displayName>
-				<displayName count="one">mauritisk rupie</displayName>
-				<displayName count="other">mauritiska rupier</displayName>
-				<symbol>MUR</symbol>
-			</currency>
-			<currency type="MVR">
-				<displayName>maldivisk rufiyaa</displayName>
-				<displayName count="one">maldivisk rufiyaa</displayName>
-				<displayName count="other">maldiviska rufiyer</displayName>
-				<symbol>MVR</symbol>
-			</currency>
-			<currency type="MWK">
-				<displayName>malawisk kwacha</displayName>
-				<displayName count="one">malawisk kwacha</displayName>
-				<displayName count="other">malawiska kwacha</displayName>
-				<symbol>MWK</symbol>
-			</currency>
-			<currency type="MXN">
-				<displayName>mexikansk peso</displayName>
-				<displayName count="one">mexikansk peso</displayName>
-				<displayName count="other">mexikanska pesos</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>mexikansk silverpeso (1861-1992)</displayName>
-				<displayName count="one">mexikansk silverpeso (1861-1992)</displayName>
-				<displayName count="other">mexikanska silverpesos (1861-1992)</displayName>
-				<symbol>MXP</symbol>
-			</currency>
-			<currency type="MXV">
-				<displayName>mexikansk unidad de inversion</displayName>
-				<displayName count="one">mexikansk unidad de inversion</displayName>
-				<displayName count="other">mexikanska unidad de inversion</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>malaysisk ringgit</displayName>
-				<displayName count="one">malaysisk ringgit</displayName>
-				<displayName count="other">malaysiska ringgiter</displayName>
-				<symbol>MYR</symbol>
-			</currency>
-			<currency type="MZE">
-				<displayName>moçambikisk escudo</displayName>
-				<displayName count="one">moçambikisk escudo (1914–1980)</displayName>
-				<displayName count="other">moçambikiska escudos</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>gammal moçambikisk metical</displayName>
-				<displayName count="one">moçambikisk metical (1980-2006)</displayName>
-				<displayName count="other">gammla moçambikiska metical</displayName>
-				<symbol>MZM</symbol>
-			</currency>
-			<currency type="MZN">
-				<displayName>moçambikisk metical</displayName>
-				<displayName count="one">moçambikisk metical</displayName>
-				<displayName count="other">moçambikiska metical</displayName>
-				<symbol>MZN</symbol>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibia-dollar</displayName>
-				<displayName count="one">Namibia-dollar</displayName>
-				<displayName count="other">Namibia-dollar</displayName>
-				<symbol>NAD</symbol>
-			</currency>
-			<currency type="NGN">
-				<displayName>nigeriansk naira</displayName>
-				<displayName count="one">nigeriansk naira</displayName>
-				<displayName count="other">nigerianska naira</displayName>
-				<symbol>NGN</symbol>
-			</currency>
-			<currency type="NIC">
-				<displayName>nicaraguansk córdoba</displayName>
-				<displayName count="one">nicaraguansk córdoba</displayName>
-				<displayName count="other">nicaraguanska córdoba</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>nicaraguansk córdoba oro</displayName>
-				<displayName count="one">nicaraguansk córdoba oro</displayName>
-				<displayName count="other">nicaraguanska córdoba oro</displayName>
-				<symbol>NIO</symbol>
-			</currency>
-			<currency type="NLG">
-				<displayName>nederländsk gulden</displayName>
-				<displayName count="one">nederländsk gulden</displayName>
-				<displayName count="other">nederländska gulden</displayName>
-				<symbol>NLG</symbol>
-			</currency>
-			<currency type="NOK">
-				<displayName>norsk krona</displayName>
-				<displayName count="one">norsk krona</displayName>
-				<displayName count="other">norska kronor</displayName>
-				<symbol>NKr</symbol>
-			</currency>
-			<currency type="NPR">
-				<displayName>nepalesisk rupie</displayName>
-				<displayName count="one">nepalesisk rupie</displayName>
-				<displayName count="other">nepalesiska rupier</displayName>
-				<symbol>NPR</symbol>
-			</currency>
-			<currency type="NZD">
-				<displayName>nyzeeländsk dollar</displayName>
-				<displayName count="one">nyzeeländsk dollar</displayName>
-				<displayName count="other">nyzeeländska dollar</displayName>
-				<symbol>NZD</symbol>
-			</currency>
-			<currency type="OMR">
-				<displayName>omansk rial</displayName>
-				<displayName count="one">omansk rial</displayName>
-				<displayName count="other">omanska rial</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>panamansk balboa</displayName>
-				<displayName count="one">panamansk balboa</displayName>
-				<displayName count="other">panamanska balboa</displayName>
-				<symbol>PAB</symbol>
-			</currency>
-			<currency type="PEI">
-				<displayName>peruansk inti</displayName>
-				<displayName count="one">peruansk inti</displayName>
-				<displayName count="other">peruanska intier</displayName>
-				<symbol>PEI</symbol>
-			</currency>
-			<currency type="PEN">
-				<displayName>peruansk sol nuevo</displayName>
-				<displayName count="one">peruansk sol nuevo</displayName>
-				<displayName count="other">peruanska sol nuevo</displayName>
-				<symbol>PEN</symbol>
-			</currency>
-			<currency type="PES">
-				<displayName>peruansk sol</displayName>
-				<displayName count="one">peruansk sol</displayName>
-				<displayName count="other">peruanska sol</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>papuansk kina</displayName>
-				<displayName count="one">papuansk kina</displayName>
-				<displayName count="other">papuanska kinor</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>filippinsk peso</displayName>
-				<displayName count="one">filippinsk peso</displayName>
-				<displayName count="other">filippinska pesos</displayName>
-				<symbol>PHP</symbol>
-			</currency>
-			<currency type="PKR">
-				<displayName>pakistansk rupie</displayName>
-				<displayName count="one">pakistansk rupie</displayName>
-				<displayName count="other">pakistanska rupier</displayName>
-				<symbol>PKR</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName>polsk zloty</displayName>
-				<displayName count="one">polsk zloty</displayName>
-				<displayName count="other">polska zloty</displayName>
-				<symbol>PLN</symbol>
-			</currency>
-			<currency type="PLZ">
-				<displayName>polsk zloty (1950-1995)</displayName>
-				<displayName count="one">polsk zloty (1950-1995)</displayName>
-				<displayName count="other">polska zloty (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>portugisisk escudo</displayName>
-				<displayName count="one">portugisisk escudo</displayName>
-				<displayName count="other">portugisiska escudos</displayName>
-				<symbol>PTE</symbol>
-			</currency>
-			<currency type="PYG">
-				<displayName>paraguaysk guarani</displayName>
-				<displayName count="one">paraguaysk guarani</displayName>
-				<displayName count="other">paraguayska guarani</displayName>
-				<symbol>PYG</symbol>
-			</currency>
-			<currency type="QAR">
-				<displayName>qatarisk rial</displayName>
-				<displayName count="one">qatarisk rial</displayName>
-				<displayName count="other">qatariska rial</displayName>
-				<symbol>QAR</symbol>
-			</currency>
-			<currency type="RHD">
-				<displayName>rhodesisk dollar</displayName>
-				<displayName count="one">rhodesisk dollar</displayName>
-				<displayName count="other">rhodesiska dollar</displayName>
-				<symbol>RHD</symbol>
-			</currency>
-			<currency type="ROL">
-				<displayName>gammal rumänsk leu</displayName>
-				<displayName count="one">rumänsk leu (1952-2005)</displayName>
-				<displayName count="other">gamla rumänska leu</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>rumänsk leu</displayName>
-				<displayName count="one">rumänsk leu</displayName>
-				<displayName count="other">rumänska leu</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Serbisk dinar</displayName>
-				<displayName count="one">serbisk dinar</displayName>
-				<displayName count="other">serbiska dinarer</displayName>
-				<symbol>RSD</symbol>
-			</currency>
-			<currency type="RUB">
-				<displayName>rysk rubel</displayName>
-				<displayName count="one">rysk rubel</displayName>
-				<displayName count="other">ryska rubel</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>rysk rubel (1991-1998)</displayName>
-				<displayName count="one">rysk rubel (1991-1998)</displayName>
-				<displayName count="other">ryska rubel (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>rwandisk franc</displayName>
-				<displayName count="one">rwandisk franc</displayName>
-				<displayName count="other">rwandiska franc</displayName>
-				<symbol>RWF</symbol>
-			</currency>
-			<currency type="SAR">
-				<displayName>saudisk riyal</displayName>
-				<displayName count="one">saudisk riyal</displayName>
-				<displayName count="other">saudiska riyal</displayName>
-				<symbol>SAR</symbol>
-			</currency>
-			<currency type="SBD">
-				<displayName>Salomon-dollar</displayName>
-				<displayName count="one">Salomon-dollar</displayName>
-				<displayName count="other">Salomon-dollar</displayName>
-				<symbol>SBD</symbol>
-			</currency>
-			<currency type="SCR">
-				<displayName>seychellisk rupie</displayName>
-				<displayName count="one">seychellisk rupie</displayName>
-				<displayName count="other">seychelliska rupier</displayName>
-				<symbol>SCR</symbol>
-			</currency>
-			<currency type="SDD">
-				<displayName>sudanesisk dinar</displayName>
-				<displayName count="one">sudansk dinar (1992-2007)</displayName>
-				<displayName count="other">sudanska gamla dinarer</displayName>
-				<symbol>SDD</symbol>
-			</currency>
-			<currency type="SDG">
-				<displayName>sudanesiskt pund</displayName>
-				<displayName count="one">sudanskt pund</displayName>
-				<displayName count="other">sudanska pund</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>gammalt sudanesiskt pund</displayName>
-				<displayName count="one">sudanskt pund (1916-1992)</displayName>
-				<displayName count="other">sudanska gamla pund</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>svensk krona</displayName>
-				<displayName count="one">svensk krona</displayName>
-				<displayName count="other">svenska kronor</displayName>
-				<symbol>kr</symbol>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapore-dollar</displayName>
-				<displayName count="one">Singapore-dollar</displayName>
-				<displayName count="other">Singapore-dollar</displayName>
-				<symbol>SGD</symbol>
-			</currency>
-			<currency type="SHP">
-				<displayName>S:t Helena-pund</displayName>
-				<displayName count="one">S:t Helena-pund</displayName>
-				<displayName count="other">S:t Helena-pund</displayName>
-				<symbol>SHP</symbol>
-			</currency>
-			<currency type="SIT">
-				<displayName>slovensk tolar</displayName>
-				<displayName count="one">slovensk tolar</displayName>
-				<displayName count="other">slovenska tolar</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>slovakisk koruna</displayName>
-				<displayName count="one">slovakisk koruna</displayName>
-				<displayName count="other">slovakiska korunor</displayName>
-				<symbol>SKK</symbol>
-			</currency>
-			<currency type="SLL">
-				<displayName>sierraleonsk leone</displayName>
-				<displayName count="one">sierraleonsk leone</displayName>
-				<displayName count="other">sierraleonska leoner</displayName>
-				<symbol>SLL</symbol>
-			</currency>
-			<currency type="SOS">
-				<displayName>somalisk shilling</displayName>
-				<displayName count="one">somalisk shilling</displayName>
-				<displayName count="other">somaliska shilling</displayName>
-				<symbol>SOS</symbol>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinam-dollar</displayName>
-				<displayName count="one">Surinam-dollar</displayName>
-				<displayName count="other">Surinam-dollar</displayName>
-				<symbol>SRD</symbol>
-			</currency>
-			<currency type="SRG">
-				<displayName>surinamesisk gulden</displayName>
-				<displayName count="one">Surinam-gulden</displayName>
-				<displayName count="other">Surinam-gulden</displayName>
-				<symbol>SRG</symbol>
-			</currency>
-			<currency type="STD">
-				<displayName>São Tomé och Príncipe-dobra</displayName>
-				<displayName count="one">São Tomé och Príncipe-dobra</displayName>
-				<displayName count="other">São Tomé och Príncipe-dobror</displayName>
-				<symbol>STD</symbol>
-			</currency>
-			<currency type="SUR">
-				<displayName>sovjetisk rubel</displayName>
-				<displayName count="one">sovjetisk rubel</displayName>
-				<displayName count="other">sovjetiska rubler</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>salvadoransk colón</displayName>
-				<displayName count="one">salvadoransk colón</displayName>
-				<displayName count="other">salvadoranska colón</displayName>
-				<symbol>SVC</symbol>
-			</currency>
-			<currency type="SYP">
-				<displayName>syriskt pund</displayName>
-				<displayName count="one">syriskt pund</displayName>
-				<displayName count="other">syriska pund</displayName>
-				<symbol>SYP</symbol>
-			</currency>
-			<currency type="SZL">
-				<displayName>swaziländsk lilangeni</displayName>
-				<displayName count="one">swaziländsk lilangeni</displayName>
-				<displayName count="other">swaziländska lilangeni</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>thailändsk baht</displayName>
-				<displayName count="one">thailändsk baht</displayName>
-				<displayName count="other">thailändska baht</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>tadzjikisk rubel</displayName>
-				<displayName count="one">tadzjikisk rubel</displayName>
-				<displayName count="other">tadzjikiska rubler</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>tadzjikisk somoni</displayName>
-				<displayName count="one">tadzjikisk somoni</displayName>
-				<displayName count="other">tadzjikiska somoni</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>turkmensk manat</displayName>
-				<displayName count="one">turkmensk manat</displayName>
-				<displayName count="other">turkmenska manat</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>tunisisk dinar</displayName>
-				<displayName count="one">tunisisk dinar</displayName>
-				<displayName count="other">tunisiska dinarer</displayName>
-				<symbol>TND</symbol>
-			</currency>
-			<currency type="TOP">
-				<displayName>tongansk paʻanga</displayName>
-				<displayName count="one">tongansk paʻanga</displayName>
-				<displayName count="other">tonganska paʻanga</displayName>
-				<symbol>TOP</symbol>
-			</currency>
-			<currency type="TPE">
-				<displayName>timoriansk escudo</displayName>
-				<displayName count="one">östtimoresisk escudo</displayName>
-				<displayName count="other">timorianska escudos</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>gammal turkisk lira</displayName>
-				<displayName count="one">gammal turkisk lira</displayName>
-				<displayName count="other">gamla turkiska lire</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ny turkisk lira</displayName>
-				<displayName count="one">turkisk lira</displayName>
-				<displayName count="other">turkiska lire</displayName>
-				<symbol>TRY</symbol>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad ochTobago-dollar</displayName>
-				<displayName count="one">Trinidad ochTobago-dollar</displayName>
-				<displayName count="other">Trinidad ochTobago-dollar</displayName>
-				<symbol>TTD</symbol>
-			</currency>
-			<currency type="TWD">
-				<displayName>taiwanesisk ny dollar</displayName>
-				<displayName count="one">taiwanesisk ny dollar</displayName>
-				<displayName count="other">taiwanesiska nya dollar</displayName>
-				<symbol>TWD</symbol>
-			</currency>
-			<currency type="TZS">
-				<displayName>tanzanisk shilling</displayName>
-				<displayName count="one">tanzanisk shilling</displayName>
-				<displayName count="other">tanzaniska shilling</displayName>
-				<symbol>TZS</symbol>
-			</currency>
-			<currency type="UAH">
-				<displayName>ukrainsk hryvnia</displayName>
-				<displayName count="one">ukrainsk hryvnia</displayName>
-				<displayName count="other">ukrainska hryvnia</displayName>
-				<symbol>UAH</symbol>
-			</currency>
-			<currency type="UAK">
-				<displayName>ukrainsk karbovanetz</displayName>
-				<displayName count="one">ukrainsk karbovanetz</displayName>
-				<displayName count="other">ukrainska karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ugandisk shilling (1966-1987)</displayName>
-				<displayName count="one">ugandisk shilling (1966-1987)</displayName>
-				<displayName count="other">ugandiska shilling (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ugandisk shilling</displayName>
-				<displayName count="one">ugandisk shilling</displayName>
-				<displayName count="other">ugandiska shilling</displayName>
-				<symbol>UGX</symbol>
-			</currency>
-			<currency type="USD">
-				<displayName>US-dollar</displayName>
-				<displayName count="one">US-dollar</displayName>
-				<displayName count="other">US-dollar</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>US-dollar (nästa dag)</displayName>
-				<displayName count="one">US-dollar (nästa dag)</displayName>
-				<displayName count="other">US-dollar (nästa dag)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>US-dollar (samma dag)</displayName>
-				<displayName count="one">US-dollar (samma dag)</displayName>
-				<displayName count="other">US-dollar (samma dag)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>uruguayansk peso en unidades indexadas</displayName>
-				<displayName count="one">uruguayansk peso en unidades indexadas</displayName>
-				<displayName count="other">uruguayanska peso en unidades indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>uruguayansk peso (1975-1993)</displayName>
-				<displayName count="one">uruguayansk peso (1975-1993)</displayName>
-				<displayName count="other">uruguayanska pesos (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>uruguayansk peso</displayName>
-				<displayName count="one">uruguayansk peso</displayName>
-				<displayName count="other">uruguayanska pesos</displayName>
-				<symbol>UYU</symbol>
-			</currency>
-			<currency type="UZS">
-				<displayName>uzbekisk sum</displayName>
-				<displayName count="one">uzbekisk sum</displayName>
-				<displayName count="other">uzbekiska sum</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>venezuelansk bolivar</displayName>
-				<displayName count="one">venezuelansk bolivar</displayName>
-				<displayName count="other">venezuelanska bolivar</displayName>
-				<symbol>VEB</symbol>
-			</currency>
-			<currency type="VEF">
-				<displayName>venezuelansk bolivar fuerte</displayName>
-				<displayName count="one">venezuelansk bolivar fuerte</displayName>
-				<displayName count="other">venezuelanska bolivar fuerte</displayName>
-				<symbol>VEF</symbol>
-			</currency>
-			<currency type="VND">
-				<displayName>vietnamesisk dong</displayName>
-				<displayName count="one">vietnamesisk dong</displayName>
-				<displayName count="other">vietnamesiska dong</displayName>
-				<symbol>VND</symbol>
-			</currency>
-			<currency type="VUV">
-				<displayName>vanuatisk vatu</displayName>
-				<displayName count="one">vanuatisk vatu</displayName>
-				<displayName count="other">vanuatiska vatu</displayName>
-				<symbol>VUV</symbol>
-			</currency>
-			<currency type="WST">
-				<displayName>västsamoansk tala</displayName>
-				<displayName count="one">västsamoansk tala</displayName>
-				<displayName count="other">västsamoanska tala</displayName>
-				<symbol>WST</symbol>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA Franc BEAC</displayName>
-				<displayName count="one">centralafrikansk franc</displayName>
-				<displayName count="other">centralafrikanska franc</displayName>
-				<symbol>XAF</symbol>
-			</currency>
-			<currency type="XAG">
-				<displayName>silver</displayName>
-				<displayName count="one">uns silver</displayName>
-				<displayName count="other">silveruns</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>guld</displayName>
-				<displayName count="one">uns guld</displayName>
-				<displayName count="other">gulduns</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>europeisk kompositenhet</displayName>
-				<displayName count="one">europeisk gammal kompositenhet</displayName>
-				<displayName count="other">europeiska kompositenheter</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>europeisk monetär enhet</displayName>
-				<displayName count="one">europeisk gammal monetär enhet</displayName>
-				<displayName count="other">europeiska monetära enheter</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>europeisk kontoenhet (XBC)</displayName>
-				<displayName count="one">europeisk gammal kontoenhet-9</displayName>
-				<displayName count="other">europeiska kontoenheter (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>europeisk kontoenhet (XBD)</displayName>
-				<displayName count="one">europeisk kontoenhet (XBD)</displayName>
-				<displayName count="other">europeiska kontoenheter (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>östkaribisk dollar</displayName>
-				<displayName count="one">östkaribisk dollar</displayName>
-				<displayName count="other">östkaribiska dollar</displayName>
-				<symbol>XCD</symbol>
-			</currency>
-			<currency type="XDR">
-				<displayName>IMF särskild dragningsrätt</displayName>
-				<displayName count="one">IMF särskild dragningsrätt</displayName>
-				<displayName count="other">IMF särskilda dragningsrätter</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>europeisk valutaenhet</displayName>
-				<displayName count="one">europeisk valutaenhet</displayName>
-				<displayName count="other">europeiska valutaenheter</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>fransk guldfranc</displayName>
-				<displayName count="one">fransk guldfranc</displayName>
-				<displayName count="other">franska guldfranc</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>French UIC-Franc</displayName>
-				<displayName count="one">internationella järnvägsunionens franc</displayName>
-				<displayName count="other">internationella järnvägsunionens franc</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA Franc BCEAO</displayName>
-				<displayName count="one">västafrikansk franc</displayName>
-				<displayName count="other">västafrikanska franc</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>palladium</displayName>
-				<displayName count="one">uns palladium</displayName>
-				<displayName count="other">palladium</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP-franc</displayName>
-				<displayName count="one">Stilla Havet-franc</displayName>
-				<displayName count="other">Stilla Havet-franc</displayName>
-				<symbol>XPF</symbol>
-			</currency>
-			<currency type="XPT">
-				<displayName>platina</displayName>
-				<displayName count="one">uns platina</displayName>
-				<displayName count="other">platina</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET-fond</displayName>
-				<displayName count="one">RINET-fond</displayName>
-				<displayName count="other">RINET-fond</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>test-valutakod</displayName>
-				<displayName count="one">(valutakod för teständamål)</displayName>
-				<displayName count="other">test-valutakod</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>okänd eller ogiltig valuta</displayName>
-				<displayName count="one">okänd/ogiltig valuta</displayName>
-				<displayName count="other">okänd eller ogiltig valuta</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>jemenitisk dinar</displayName>
-				<displayName count="one">jemenitisk dinar</displayName>
-				<displayName count="other">jemenitiska dinarer</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>jemenitisk rial</displayName>
-				<displayName count="one">jemenitisk rial</displayName>
-				<displayName count="other">jemenitiska rial</displayName>
-				<symbol>YER</symbol>
-			</currency>
-			<currency type="YUD">
-				<displayName>jugoslavisk hård dinar</displayName>
-				<displayName count="one">jugoslavisk hård dinar</displayName>
-				<displayName count="other">jugoslaviska hårda dinarer</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>jugoslavisk ny dinar</displayName>
-				<displayName count="one">jugoslavisk ny dinar</displayName>
-				<displayName count="other">jugoslaviska nya dinarer</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>jugoslavisk dinar (konvertibel)</displayName>
-				<displayName count="one">jugoslavisk dinar (konvertibel)</displayName>
-				<displayName count="other">jugoslaviska dinarer (konvertibla)</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>sydafrikansk rand (finansiell)</displayName>
-				<displayName count="one">sydafrikansk rand (finansiell)</displayName>
-				<displayName count="other">sydafrikanska rand (finansiella)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>sydafrikansk rand</displayName>
-				<displayName count="one">sydafrikansk rand</displayName>
-				<displayName count="other">sydafrikanska rand</displayName>
-				<symbol>ZAR</symbol>
-			</currency>
-			<currency type="ZMK">
-				<displayName>zambisk kwacha</displayName>
-				<displayName count="one">zambisk kwacha</displayName>
-				<displayName count="other">zambiska kwacha</displayName>
-				<symbol>ZMK</symbol>
-			</currency>
-			<currency type="ZRN">
-				<displayName>zairisk ny zaire</displayName>
-				<displayName count="one">zaïrisk ny zaïre</displayName>
-				<displayName count="other">zaïriska nya zaïre</displayName>
-				<symbol>ZRN</symbol>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>zairisk zaire</displayName>
-				<displayName count="one">zaïrisk zaïre</displayName>
-				<displayName count="other">zaïriska zaïre</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabwe-dollar</displayName>
-				<displayName count="one">Zimbabwe-dollar</displayName>
-				<displayName count="other">Zimbabwe-dollar</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="one">{0} dag</unitPattern>
-			<unitPattern count="other">{0} dagar</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="one">{0} timme</unitPattern>
-			<unitPattern count="other">{0} timmar</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="one">{0} minut</unitPattern>
-			<unitPattern count="other">{0} minuter</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="one">{0} månad</unitPattern>
-			<unitPattern count="other">{0} månader</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="one">{0} sekund</unitPattern>
-			<unitPattern count="other">{0} sekunder</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="one">{0} vecka</unitPattern>
-			<unitPattern count="other">{0} veckor</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="one">{0} år</unitPattern>
-			<unitPattern count="other">{0} år</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ja:j</yesstr>
-			<nostr>nej:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sv_FI.xml b/airtime_mvc/library/Zend/Locale/Data/sv_FI.xml
deleted file mode 100644
index 5437624be..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sv_FI.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.60 $"/>
-		<generation date="$Date: 2009/06/12 23:03:31 $"/>
-		<language type="sv"/>
-		<territory type="FI"/>
-	</identity>
-	<localeDisplayNames>
-		<territories>
-			<territory type="UM">USA:s yttre öar</territory>
-		</territories>
-		<variants>
-			<variant type="1996">1996 års stavning</variant>
-		</variants>
-		<types>
-			<type type="big5han" key="collation">kinesiska i big5-sorteringsordning</type>
-			<type type="gb2312han" key="collation">kinesiska i gb2312-sorteringsordning</type>
-			<type type="phonebook" key="collation">telefonkatalogssorteringsordning</type>
-			<type type="pinyin" key="collation">kinesiska i pinyin-sorteringsordning</type>
-			<type type="stroke" key="collation">kinesiska i strecksorteringsordning</type>
-			<type type="traditional" key="collation">traditionell sorteringsordning</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="US">imperiska enheter</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à b-e é f-v x-z å ä ö]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ã ç ë í ñ ó š ÿ ü ž]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<fields>
-					<field type="dayperiod">
-						<displayName>dagsperiod</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;−HH:mm</hourFormat>
-		</timeZoneNames>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sv_SE.xml b/airtime_mvc/library/Zend/Locale/Data/sv_SE.xml
deleted file mode 100644
index 626fe9c84..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sv_SE.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sv"/>
-		<territory type="SE"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sw.xml b/airtime_mvc/library/Zend/Locale/Data/sw.xml
deleted file mode 100644
index 91f1039d3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sw.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.74 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sw"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">kiafrikans</language>
-			<language type="am">kiamhariki</language>
-			<language type="ar">kiarabu</language>
-			<language type="as">kubafu</language>
-			<language type="az">kiazabaijani</language>
-			<language type="be">kibelarusi</language>
-			<language type="bg">kibulgaria</language>
-			<language type="bh">kibihari</language>
-			<language type="bn">kibengali; kibangla</language>
-			<language type="br">kibreton</language>
-			<language type="bs">kibosnia</language>
-			<language type="ca">kikatalan</language>
-			<language type="cs">kicheki</language>
-			<language type="cy">kiwelsh</language>
-			<language type="da">kidenmarki</language>
-			<language type="de">kijerumani</language>
-			<language type="el">kigiriki</language>
-			<language type="en">kiingereza</language>
-			<language type="eo">kiesperanto</language>
-			<language type="es">kihispania</language>
-			<language type="et">kiestonia</language>
-			<language type="eu">kibaski</language>
-			<language type="fa">kiajemi</language>
-			<language type="fi">kifinlandi</language>
-			<language type="fil">kitagalog</language>
-			<language type="fo">kifaroe</language>
-			<language type="fr">kifaransa</language>
-			<language type="fy">kifrisia</language>
-			<language type="ga">kiairish</language>
-			<language type="gd">kiskotlandi</language>
-			<language type="gl">kigalisia</language>
-			<language type="gn">guarani</language>
-			<language type="gu">kigujarati</language>
-			<language type="he">kiyahudi</language>
-			<language type="hi">kihindi</language>
-			<language type="hr">kikroeshia</language>
-			<language type="hu">kihungari</language>
-			<language type="hy">muarmeni</language>
-			<language type="ia">kiinterlingua</language>
-			<language type="id">kiindonesia</language>
-			<language type="ie">lugha ya kisayansi</language>
-			<language type="is">kiaislandi</language>
-			<language type="it">kiitaliano</language>
-			<language type="ja">kijapani</language>
-			<language type="jv">kijava</language>
-			<language type="ka">kijiojia</language>
-			<language type="km">kicambodia</language>
-			<language type="kn">kikannada</language>
-			<language type="ko">kikorea</language>
-			<language type="ku">kikurdi</language>
-			<language type="ky">kugizi</language>
-			<language type="la">kirumi</language>
-			<language type="ln">kilingala</language>
-			<language type="lo">kilaosi</language>
-			<language type="lt">kilithuania</language>
-			<language type="lv">kilatvia</language>
-			<language type="mk">kimasedonia</language>
-			<language type="ml">kimalayalam</language>
-			<language type="mn">kimongolia</language>
-			<language type="mr">kimarathi</language>
-			<language type="ms">kimalaysia</language>
-			<language type="mt">kimalta</language>
-			<language type="ne">kinepali</language>
-			<language type="nl">kiholanzi</language>
-			<language type="no">kinorwei</language>
-			<language type="oc">kiositani</language>
-			<language type="or">kioriya</language>
-			<language type="pa">kipunjabi</language>
-			<language type="pl">kipolandi</language>
-			<language type="ps">kipashto</language>
-			<language type="pt">kireno</language>
-			<language type="pt_BR">kireno (brazil)</language>
-			<language type="pt_PT">kireno (ureno)</language>
-			<language type="ro">kiromania</language>
-			<language type="ru">kirusi</language>
-			<language type="sa">kisanskriti</language>
-			<language type="sd">msindhi</language>
-			<language type="sh">kiserbia-kroeshia</language>
-			<language type="si">kisinhali</language>
-			<language type="sk">kislovakia</language>
-			<language type="sl">kislovenia</language>
-			<language type="so">kisomali</language>
-			<language type="sq">kialbania</language>
-			<language type="sr">kiserbia</language>
-			<language type="st">sesotho</language>
-			<language type="su">kinubi</language>
-			<language type="sv">kisweden</language>
-			<language type="sw">Kiswahili</language>
-			<language type="ta">kitamil</language>
-			<language type="te">kitelugu</language>
-			<language type="th">kithailand</language>
-			<language type="ti">kitigrinya</language>
-			<language type="tk">wataki weume</language>
-			<language type="tlh">kiklingon</language>
-			<language type="tr">kituruki</language>
-			<language type="tw">kitwii</language>
-			<language type="ug">ombwa</language>
-			<language type="uk">kiukrania</language>
-			<language type="ur">kiurdu</language>
-			<language type="uz">kiuzbeki</language>
-			<language type="vi">kivietnam</language>
-			<language type="xh">kikhosa</language>
-			<language type="yi">kiyidish</language>
-			<language type="zh">kichina</language>
-			<language type="zu">kizulu</language>
-		</languages>
-		<territories>
-			<territory type="AE">Muugano wa Falme za Nchi za Kiarabu</territory>
-			<territory type="AG">Antigua na Barbuda</territory>
-			<territory type="AR">Ajentina</territory>
-			<territory type="BA">Bosnia na Herzegowina</territory>
-			<territory type="BE">Ubelgiji</territory>
-			<territory type="BR">Brazili</territory>
-			<territory type="BS">Visiwa vya Bahama</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CF">Jamhuri ya Afrika ya Kati</territory>
-			<territory type="CG">Kongo</territory>
-			<territory type="CH">Uswisi</territory>
-			<territory type="CI">Pwani ya Pembe</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Uchina</territory>
-			<territory type="CO">Kolombia</territory>
-			<territory type="CS">Serbiya da Montenegro</territory>
-			<territory type="CV">Rasi Verde</territory>
-			<territory type="CZ">Jamhuri ya Czech</territory>
-			<territory type="DE">Udachi</territory>
-			<territory type="DJ">Jibuti</territory>
-			<territory type="DK">Udenmarki</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Jamhuri ya Dominikan</territory>
-			<territory type="EC">Ekvado</territory>
-			<territory type="EG">Misri</territory>
-			<territory type="ES">Uhispania</territory>
-			<territory type="ET">Uhabeshi</territory>
-			<territory type="FR">Ufaransa</territory>
-			<territory type="GB">Uingereza</territory>
-			<territory type="GQ">Guinea ya Ikweta</territory>
-			<territory type="HR">Kroatia</territory>
-			<territory type="HU">Hungaria</territory>
-			<territory type="IL">Uyahudi</territory>
-			<territory type="IN">Uhindi</territory>
-			<territory type="IQ">Iraki</territory>
-			<territory type="IR">Uajemi</territory>
-			<territory type="IS">Barafu</territory>
-			<territory type="IT">Uitaliani</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JP">Ujapani</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KH">Kampuchea</territory>
-			<territory type="KM">Visiwa vya Komoro</territory>
-			<territory type="KN">Saint Kitts na Nevis</territory>
-			<territory type="KP">Korea ya Kaskazini</territory>
-			<territory type="KR">Korea ya Kusini</territory>
-			<territory type="LU">Luksemburg</territory>
-			<territory type="MA">Moroko</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MH">Visiwa vya Marshall</territory>
-			<territory type="MX">Meksiko</territory>
-			<territory type="MY">Malasya</territory>
-			<territory type="MZ">Msumbiji</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Uholanzi</territory>
-			<territory type="NO">Unorwe</territory>
-			<territory type="NP">Nepali</territory>
-			<territory type="PG">Papua Guinea Mpya</territory>
-			<territory type="PH">Filipino</territory>
-			<territory type="PT">Ureno</territory>
-			<territory type="PY">Paragwai</territory>
-			<territory type="RU">Urusi</territory>
-			<territory type="SA">Arabuni Saudi</territory>
-			<territory type="SB">Visiwa vya Solomon</territory>
-			<territory type="SC">Visiwa vya Shelisheli</territory>
-			<territory type="SE">Uswidi</territory>
-			<territory type="SO">Somali</territory>
-			<territory type="ST">Sao Tome na Principe</territory>
-			<territory type="TD">Chadi</territory>
-			<territory type="TL">Timor ya Mashariki</territory>
-			<territory type="TO">Kitonga</territory>
-			<territory type="TR">Uturuki</territory>
-			<territory type="TT">Trinidad na Tobago</territory>
-			<territory type="TZ">Tanzania</territory>
-			<territory type="US">Muungano wa Nchi za Amerika</territory>
-			<territory type="UY">Urugwai</territory>
-			<territory type="VA">Vatikano</territory>
-			<territory type="VC">Saint Vincent na Grenadines</territory>
-			<territory type="YE">Yemeni</territory>
-			<territory type="ZA">Afrika ya Kusini</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-d {dh} e-n {ng} {ng'} {ny} o p r s {sh} t {th} u-w y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[q x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mac</month>
-							<month type="4">Apr</month>
-							<month type="5">Mei</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Ago</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Des</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januari</month>
-							<month type="2">Februari</month>
-							<month type="3">Machi</month>
-							<month type="4">Aprili</month>
-							<month type="5">Mei</month>
-							<month type="6">Juni</month>
-							<month type="7">Julai</month>
-							<month type="8">Agosti</month>
-							<month type="9">Septemba</month>
-							<month type="10">Oktoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Desemba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Jpi</day>
-							<day type="mon">Jtt</day>
-							<day type="tue">Jnn</day>
-							<day type="wed">Jtn</day>
-							<day type="thu">Alh</day>
-							<day type="fri">Iju</day>
-							<day type="sat">Jmo</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Jumapili</day>
-							<day type="mon">Jumatatu</day>
-							<day type="tue">Jumanne</day>
-							<day type="wed">Jumatano</day>
-							<day type="thu">Alhamisi</day>
-							<day type="fri">Ijumaa</day>
-							<day type="sat">Jumamosi</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">R1</quarter>
-							<quarter type="2">R2</quarter>
-							<quarter type="3">R3</quarter>
-							<quarter type="4">R4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">robo ya kwanza</quarter>
-							<quarter type="2">robo ya pili</quarter>
-							<quarter type="3">robo ya tatu</quarter>
-							<quarter type="4">robo ya nne</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Kabla ya Kristo</era>
-						<era type="1">Baada ya Kristo</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">KK</era>
-						<era type="1">BK</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Saa za Africa Mashariki</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="TZS">
-				<displayName>Shilingi ya Tanzania</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/sw_KE.xml b/airtime_mvc/library/Zend/Locale/Data/sw_KE.xml
deleted file mode 100644
index 6045a5f0d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sw_KE.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sw"/>
-		<territory type="KE"/>
-	</identity>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/sw_TZ.xml b/airtime_mvc/library/Zend/Locale/Data/sw_TZ.xml
deleted file mode 100644
index 6667509fa..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/sw_TZ.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.52 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="sw"/>
-		<territory type="TZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/syr.xml b/airtime_mvc/library/Zend/Locale/Data/syr.xml
deleted file mode 100644
index 2503c59e7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/syr.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="syr"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="syr">ܣܘܪ���</language>
-		</languages>
-		<territories>
-			<territory type="SY">ܣܘܪ���</territory>
-		</territories>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u0711 \u0730-\u074A ܃-܉ � ܂ ܀ ܊-� � ܒ-ܔ ܖ ܕ ܗ-ܬ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[�\u200C \u200D ܭ-ܯ �-�]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">�ܟܢ �ܒ</month>
-							<month type="2">Ü«Ü’Ü›</month>
-							<month type="3">�ܕܪ</month>
-							<month type="4">ܢ�ܣܢ</month>
-							<month type="5">��ܪ</month>
-							<month type="6">ܚܙ�ܪܢ</month>
-							<month type="7">ܬܡܘܙ</month>
-							<month type="8">�ܒ</month>
-							<month type="9">��ܠܘܠ</month>
-							<month type="10">�ܬܫ ��</month>
-							<month type="11">�ܬܫ �ܒ</month>
-							<month type="12">�ܟܢ ��</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>dd MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM, y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###;#,##0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00;¤ #,##0.00-</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="SYP">
-				<symbol>ل.س.�</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/syr_SY.xml b/airtime_mvc/library/Zend/Locale/Data/syr_SY.xml
deleted file mode 100644
index eadbe9cc9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/syr_SY.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.40 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="syr"/>
-		<territory type="SY"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ta.xml b/airtime_mvc/library/Zend/Locale/Data/ta.xml
deleted file mode 100644
index 25227af62..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ta.xml
+++ /dev/null
@@ -1,1190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.83 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ta"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">அஃபார�</language>
-			<language type="ab">அப�காஜியான�</language>
-			<language type="ace">ஆச�சினீஸ�</language>
-			<language type="ach">அகோலி</language>
-			<language type="ada">அதாங�மே</language>
-			<language type="ady">அதகே</language>
-			<language type="ae">அவெஸ�தான�</language>
-			<language type="af">ஆஃப�ரிகான�ஸ�</language>
-			<language type="afa">அஃப�ரோ-�சியாடிக� மொழி</language>
-			<language type="afh">அஃப�ரிஹிலி</language>
-			<language type="ain">�ன�</language>
-			<language type="ak">அகான�</language>
-			<language type="akk">அக�கேதியன�</language>
-			<language type="ale">அலூட�</language>
-			<language type="alg">அல�கான�கியன� மொழி</language>
-			<language type="alt">தெற�க� அல�தை</language>
-			<language type="am">அம�ஹாரிக�</language>
-			<language type="an">ஆர�கோனீஸ�</language>
-			<language type="ang">பழைய ஆங�கிலம�</language>
-			<language type="anp">அங�கிகா</language>
-			<language type="apa">அபாச�சி மொழி</language>
-			<language type="ar">அரப�</language>
-			<language type="arc">அராமைக�</language>
-			<language type="arn">அரௌகேனியன�</language>
-			<language type="arp">அரபஹோ</language>
-			<language type="art">செயற�கையான மொழி</language>
-			<language type="arw">அராவாக�</language>
-			<language type="as">அஸ�ஸாமி</language>
-			<language type="ast">அஸ�த�ரியன�</language>
-			<language type="ath">அதாபஸ�கான� மொழி</language>
-			<language type="aus">ஆஸ�த�ரேலிய மொழி</language>
-			<language type="av">அவேரிக�</language>
-			<language type="awa">அவதி</language>
-			<language type="ay">அய�மரா</language>
-			<language type="az">அசர�பாய�ஜானி</language>
-			<language type="ba">பாஷ�கிர�</language>
-			<language type="bad">பாண�டா</language>
-			<language type="bai">பமிலெகே மொழி</language>
-			<language type="bal">பெல�சி</language>
-			<language type="ban">பலினீஸ�</language>
-			<language type="bas">பாஸா</language>
-			<language type="bat">பால�டிக� மொழி</language>
-			<language type="be">பைலோர�ஷ�ன�</language>
-			<language type="bej">பேஜா</language>
-			<language type="bem">பெம�பா</language>
-			<language type="ber">பெர�பெர�</language>
-			<language type="bg">பல�கேரியன�</language>
-			<language type="bh">பிஹாரி</language>
-			<language type="bho">போஜ�பூரி</language>
-			<language type="bi">பிஸ�லாமா</language>
-			<language type="bik">பிகோல�</language>
-			<language type="bin">பினி</language>
-			<language type="bla">சிக�சிகா</language>
-			<language type="bm">பம�பாரா</language>
-			<language type="bn">வங�காளம�</language>
-			<language type="bnt">பான�ட�</language>
-			<language type="bo">திபெத�த�</language>
-			<language type="br">பிரிடன�</language>
-			<language type="bra">ப�ராஜ�</language>
-			<language type="bs">போஸ�னியன�</language>
-			<language type="btk">பாடாக�</language>
-			<language type="bua">ப�ரியாத�</language>
-			<language type="bug">ப�கினீஸ�</language>
-			<language type="byn">ப�லின�</language>
-			<language type="ca">காடலான�</language>
-			<language type="cad">கேடோ</language>
-			<language type="cai">மத�திய அமெரிக�கன� இன�டியன� மொழி</language>
-			<language type="car">கரீப�</language>
-			<language type="cau">காகேஷியன� மொழி</language>
-			<language type="cch">ஆட�சம�</language>
-			<language type="ce">செசென�</language>
-			<language type="ceb">செப�வானோ</language>
-			<language type="cel">கெல�டிக� மொழி</language>
-			<language type="ch">சாமோரோ</language>
-			<language type="chb">சிப�சா</language>
-			<language type="chg">ஷகதை</language>
-			<language type="chk">சூகிசே</language>
-			<language type="chm">மாரி</language>
-			<language type="chn">சினூக� ஜார�கான�</language>
-			<language type="cho">சோக�தௌ</language>
-			<language type="chp">சிபெவ�யான�</language>
-			<language type="chr">செரூக�கி</language>
-			<language type="chy">செயேனி</language>
-			<language type="cmc">சாமிக� மொழி</language>
-			<language type="co">கார�சியன�</language>
-			<language type="cop">காப�டிக�</language>
-			<language type="cpe">ஆங�கில அடைப�படையிலான கிரியோல� மற�ற�ம� பிஜின�</language>
-			<language type="cpf">ஃப�ரென�ச� அடைப�படையிலான கிரியோல� மற�ற�ம� பிஜின�</language>
-			<language type="cpp">போர�ச�க�கீஸ� அடைப�படையிலான கிரியோல� மற�ற�ம� பிஜின�</language>
-			<language type="cr">க�ரீ</language>
-			<language type="crh">கிரிமியன� த�ர�க�கி</language>
-			<language type="crp">கிரியோல� மற�ற�ம� பிஜின�</language>
-			<language type="cs">செக�</language>
-			<language type="csb">கஷ�பியன�</language>
-			<language type="cu">சர�ச� ஸ�லாவிக�</language>
-			<language type="cus">க�ஷிடிக� மொழி</language>
-			<language type="cv">ச�வாஷ�</language>
-			<language type="cy">வெல�ஷ�</language>
-			<language type="da">டானிஷ�</language>
-			<language type="dak">தகோடா</language>
-			<language type="dar">தார�க�வா</language>
-			<language type="day">தயாக�</language>
-			<language type="de">ஜெர�மன�</language>
-			<language type="del">தெலாவேர�</language>
-			<language type="den">ஸ�லாவ�</language>
-			<language type="dgr">டோக�ரிப�</language>
-			<language type="din">டின�கா</language>
-			<language type="doi">டோக�ரி</language>
-			<language type="dra">திராவிட மொழி</language>
-			<language type="dsb">லோவர� சோர�பியன�</language>
-			<language type="dua">த�வாலா</language>
-			<language type="dum">மத�திய டச�ச�</language>
-			<language type="dv">திவேஹி</language>
-			<language type="dyu">ட�யூலா</language>
-			<language type="dz">பூடானி</language>
-			<language type="ee">ஈஓயே</language>
-			<language type="efi">எஃபிக�</language>
-			<language type="egy">பண�டைய எகிப�தியன�</language>
-			<language type="eka">ஈகாஜ�க�</language>
-			<language type="el">கிரேக�கம�</language>
-			<language type="elx">எலமைட�</language>
-			<language type="en">ஆங�கிலம�</language>
-			<language type="enm">மத�திய ஆங�கிலம�</language>
-			<language type="eo">எஸ�பரேன�டோ</language>
-			<language type="es">ஸ�பேனிஷ�</language>
-			<language type="et">எஸ�டோனியன�</language>
-			<language type="eu">பஸ�க�</language>
-			<language type="ewo">எவோன�டோ</language>
-			<language type="fa">பர�ஸியன�</language>
-			<language type="fan">ஃபங�க�</language>
-			<language type="fat">ஃபான�டி</language>
-			<language type="ff">ஃப�லா</language>
-			<language type="fi">பின�னிஷ�</language>
-			<language type="fil">ஃபிலிபினோ</language>
-			<language type="fiu">ஃபினோ-உக�ரைன� மொழி</language>
-			<language type="fj">ஃபிஜி</language>
-			<language type="fo">ஃபரிஸ�த�</language>
-			<language type="fon">ஃபான�</language>
-			<language type="fr">பிரெஞ�ச�</language>
-			<language type="frm">மத�திய ஃப�ரென�ச�</language>
-			<language type="fro">பழைய ஃப�ரென�ச�</language>
-			<language type="frr">வடக�க� ஃப�ரிஸியான�</language>
-			<language type="frs">கிழக�க� ஃப�ரிஸியான�</language>
-			<language type="fur">ஃப�ரியூலியன�</language>
-			<language type="fy">மேற�கத�திய பிரிஷிய</language>
-			<language type="ga">�ரிஷ�</language>
-			<language type="gaa">கா</language>
-			<language type="gay">கயோ</language>
-			<language type="gba">பயா</language>
-			<language type="gd">ஸ�காட�ஸ� கேலிக�</language>
-			<language type="gem">ஜெர�மானிய மொழி</language>
-			<language type="gez">கீஜ�</language>
-			<language type="gil">கில�பெர�டீஸ�</language>
-			<language type="gl">காலிஸியன�</language>
-			<language type="gmh">மத�திய ஹை ஜெர�மன�</language>
-			<language type="gn">க�ரானி</language>
-			<language type="goh">பழைய ஹை ஜெர�மன�</language>
-			<language type="gon">கோன�டி</language>
-			<language type="gor">கோரோன�டலோ</language>
-			<language type="got">கோதிக�</language>
-			<language type="grb">க�ரேபோ</language>
-			<language type="grc">பண�டைய கிரேக�கம�</language>
-			<language type="gsw">ஸ�விஸ� ஜெர�மன�</language>
-			<language type="gu">க�ஜராத�தி</language>
-			<language type="gv">மேங�க�ஸ�</language>
-			<language type="gwi">க�விசின�</language>
-			<language type="ha">ஹௌஸா</language>
-			<language type="hai">ஹைடா</language>
-			<language type="haw">ஹவாய�யான�</language>
-			<language type="he">ஹ�ப�ர�</language>
-			<language type="hi">இந�தி</language>
-			<language type="hil">ஹிலிகாய�னான�</language>
-			<language type="him">ஹிமாச�சலி</language>
-			<language type="hit">ஹிட�டைட�</language>
-			<language type="hmn">மாங�க�</language>
-			<language type="ho">ஹிரி மோட�ட�</language>
-			<language type="hr">கரோஷியன�</language>
-			<language type="hsb">அப�பர� சோர�பியான�</language>
-			<language type="ht">ஹைத�தியன�</language>
-			<language type="hu">ஹங�கேரியன�</language>
-			<language type="hup">ஹ�பா</language>
-			<language type="hy">ஆர�மேனியன�</language>
-			<language type="hz">ஹெரேரோ</language>
-			<language type="ia">இன�டர�லிங�க�வா</language>
-			<language type="iba">இபான�</language>
-			<language type="id">இந�தோனேஷியன�</language>
-			<language type="ie">இன�டர�லிங�</language>
-			<language type="ig">இக�போ</language>
-			<language type="ii">சிச�வான� ஈ</language>
-			<language type="ijo">இஜோ</language>
-			<language type="ik">இன�பியாக�</language>
-			<language type="ilo">இலோகோ</language>
-			<language type="inc">இந�திய மொழி</language>
-			<language type="ine">இன�டோ-�ரோப�பியன� மொழி</language>
-			<language type="inh">இங�க�ஷ�</language>
-			<language type="io">இடோ</language>
-			<language type="ira">இரானியன� மொழி</language>
-			<language type="iro">இரோகோயியன� மொழி</language>
-			<language type="is">�ஸ�லென�டிக�</language>
-			<language type="it">இத�தாலியன�</language>
-			<language type="iu">இன�கிடூட�</language>
-			<language type="ja">ஜப�பானீஸ�</language>
-			<language type="jbo">லோஜ�பன�</language>
-			<language type="jpr">ஜூதேயோ-பெர�ஷியன�</language>
-			<language type="jrb">ஜூதேயோ-அராபிக�</language>
-			<language type="jv">ஜாவானீஸ�</language>
-			<language type="ka">ஜியோர�ஜியன�</language>
-			<language type="kaa">காரா-கல�பாக�</language>
-			<language type="kab">கபாய�ல�</language>
-			<language type="kac">காசின�</language>
-			<language type="kaj">ஜ�ஜூ</language>
-			<language type="kam">கம�பா</language>
-			<language type="kar">கரேன�</language>
-			<language type="kaw">காவி</language>
-			<language type="kbd">கபார�டியன�</language>
-			<language type="kcg">தையாப�</language>
-			<language type="kfo">கோரோ</language>
-			<language type="kg">காங�கோ</language>
-			<language type="kha">காஸி</language>
-			<language type="khi">கொய�ஸன� மொழி</language>
-			<language type="kho">கோதானீஸ�</language>
-			<language type="ki">கிக�யூ</language>
-			<language type="kj">க�வான�யாமா</language>
-			<language type="kk">கசாக�</language>
-			<language type="kl">கலாலிசூட�</language>
-			<language type="km">கெமெர�</language>
-			<language type="kmb">கிம�ப�ன�த�</language>
-			<language type="kn">கன�னடம�</language>
-			<language type="ko">கொரியன�</language>
-			<language type="kok">கொங�கனி</language>
-			<language type="kos">கோஸ�ரைன�</language>
-			<language type="kpe">க�பெல�லே</language>
-			<language type="kr">கன�ரி</language>
-			<language type="krc">கராசே-பல�கார�</language>
-			<language type="krl">கரேலியன�</language>
-			<language type="kro">க�ர�</language>
-			<language type="kru">க�ர�க�</language>
-			<language type="ks">காஷ�மிரி</language>
-			<language type="ku">க�ர�திஷ�</language>
-			<language type="kum">க�ம�இக�</language>
-			<language type="kut">க�டேனை</language>
-			<language type="kv">கோமி</language>
-			<language type="kw">கார�னிஷ�</language>
-			<language type="ky">கிர�கிஷ�</language>
-			<language type="la">லத�தின�</language>
-			<language type="lad">லடினோ</language>
-			<language type="lah">லஹன�டா</language>
-			<language type="lam">லம�பா</language>
-			<language type="lb">லக�க�ஷெம�பர�கிஷ�</language>
-			<language type="lez">லெஜ�ஜியன�</language>
-			<language type="lg">கான�டா</language>
-			<language type="li">லிம�பர�கிஷ�</language>
-			<language type="ln">லிங�காலா</language>
-			<language type="lo">லோத�தியன�</language>
-			<language type="lol">மோங�கோ</language>
-			<language type="loz">லோஜி</language>
-			<language type="lt">லித�வேனியன�</language>
-			<language type="lu">ல�பா-கடாங�கா</language>
-			<language type="lua">ல�பா-ல�லௌ</language>
-			<language type="lui">ல�ய�சேனோ</language>
-			<language type="lun">லூன�டா</language>
-			<language type="luo">ல�யோ</language>
-			<language type="lus">ல�ஷய�</language>
-			<language type="lv">லேட�வியன�</language>
-			<language type="mad">மத�ரீஸ�</language>
-			<language type="mag">மகாஹி</language>
-			<language type="mai">மைதிலி</language>
-			<language type="mak">மகாசார�</language>
-			<language type="man">மான�டிங�கோ</language>
-			<language type="map">ஆஸ�ட�ரோனேஷியன�</language>
-			<language type="mas">மாசாய�</language>
-			<language type="mdf">மோக�க�ஷா</language>
-			<language type="mdr">மான�டார�</language>
-			<language type="men">மென�டீ</language>
-			<language type="mg">மலகாஸி</language>
-			<language type="mga">மத�திய �ரிஷ�</language>
-			<language type="mh">மார�ஷெலிஷ�</language>
-			<language type="mi">மௌரி</language>
-			<language type="mic">மிக�மாக�</language>
-			<language type="min">மின�னாங�கபௌ</language>
-			<language type="mis">பலதரப�பட�ட மொழிகள�</language>
-			<language type="mk">மாஸிடோனியன�</language>
-			<language type="mkh">மான�-க�மெர� மொழி</language>
-			<language type="ml">மலையாளம�</language>
-			<language type="mn">மங�கோலியன�</language>
-			<language type="mnc">மன�ச�</language>
-			<language type="mni">மனிபூரி</language>
-			<language type="mno">மனோபோ மொழி</language>
-			<language type="mo">மோல�டாவியன�</language>
-			<language type="moh">மோஹாவ�க�</language>
-			<language type="mos">மோஸ�ஸி</language>
-			<language type="mr">மராத�தி</language>
-			<language type="ms">மலாய�</language>
-			<language type="mt">மால�டிஸ�</language>
-			<language type="mul">பல மொழிகள�</language>
-			<language type="mun">ம�ண�டா மொழி</language>
-			<language type="mus">க�ரீக�</language>
-			<language type="mwl">மிரான�டீஸ�</language>
-			<language type="mwr">மார�வாரி</language>
-			<language type="my">பர�மிஸ�</language>
-			<language type="myn">மாயான� மொழி</language>
-			<language type="myv">�ர�ஜியா</language>
-			<language type="na">நவ�ரூ</language>
-			<language type="nah">நஹ�வால�</language>
-			<language type="nai">வடக�க� அமெரிக�கன� இன�டியன� மொழி</language>
-			<language type="nap">நியோபோலிடன�</language>
-			<language type="nb">நார�வே பொக�மால�</language>
-			<language type="nd">வடக�க� தெபெலே</language>
-			<language type="nds">லோ ஜெர�மன�</language>
-			<language type="ne">நேபாளி</language>
-			<language type="new">நெவாரி</language>
-			<language type="ng">தோங�கா</language>
-			<language type="nia">நியாஸ�</language>
-			<language type="nic">நைஜர�-கோரடோஃபனியன� மொழி</language>
-			<language type="niu">நியூவான�</language>
-			<language type="nl">டச�ச�</language>
-			<language type="nn">நார�வேஜியன� நியூநார�ஸ�க�</language>
-			<language type="no">நார�வே</language>
-			<language type="nog">நோகை</language>
-			<language type="non">பழைய நோர�ஸ�</language>
-			<language type="nqo">என�'கோ</language>
-			<language type="nr">தெற�க� தெபெலே</language>
-			<language type="nso">வடக�க� சோதோ</language>
-			<language type="nub">நியூபியன� மொழி</language>
-			<language type="nv">நவாஜோ</language>
-			<language type="nwc">பாரம�பரிய நேவாரி</language>
-			<language type="ny">நயன�ஜா</language>
-			<language type="nym">நியாம�வேஜி</language>
-			<language type="nyn">நியான�கோலே</language>
-			<language type="nyo">நியோரோ</language>
-			<language type="nzi">நிஜ�மா</language>
-			<language type="oc">ஆகிடியன�</language>
-			<language type="oj">ஓஜிபவா</language>
-			<language type="om">ஒரோமோ</language>
-			<language type="or">ஒரியா</language>
-			<language type="os">ஒசெட�டிக�</language>
-			<language type="osa">ஓசேஜ�</language>
-			<language type="ota">ஒட�டோமன� த�ர�க�கி</language>
-			<language type="oto">ஒட�டோமன� மொழி</language>
-			<language type="pa">பஞ�சாபி</language>
-			<language type="paa">பப�வான� மொழி</language>
-			<language type="pag">பன�காசினன�</language>
-			<language type="pal">பாஹ�லவி</language>
-			<language type="pam">பம�பாங�கா</language>
-			<language type="pap">பபியேமென�டோ</language>
-			<language type="pau">பலௌவ�ன�</language>
-			<language type="peo">பழைய பெர�ஷியன�</language>
-			<language type="phi">பிலிபைன� மொழி</language>
-			<language type="phn">ஃபொனிஷியன�</language>
-			<language type="pi">பாலி</language>
-			<language type="pl">போலிஷ�</language>
-			<language type="pon">ஃபோன�பெயென�</language>
-			<language type="pra">பராக�ரித� மொழி</language>
-			<language type="pro">பழைய ப�ரோவென�சால�</language>
-			<language type="ps">பாஷ�டோ</language>
-			<language type="pt">போர�ச�ச�க�கீஸ�</language>
-			<language type="pt_BR">பிரேசிலியன� போர�ச�ச�கீசியம�</language>
-			<language type="pt_PT">�பேரியன� போர�ச�ச�கீசியம�</language>
-			<language type="qu">கிவேச�வா</language>
-			<language type="raj">ராஜஸ�தானி</language>
-			<language type="rap">ரபன�ய�</language>
-			<language type="rar">ரரோடோங�கன�</language>
-			<language type="rm">ரைட�டோ-ரோமென�ஸ�</language>
-			<language type="rn">ர�ண�டி</language>
-			<language type="ro">ரோமேனியன�</language>
-			<language type="roa">ரோமன�ஸ� மொழி</language>
-			<language type="rom">ரோமானி</language>
-			<language type="root">ரூட�</language>
-			<language type="ru">ரஷியன�</language>
-			<language type="rup">அரோமானியன�</language>
-			<language type="rw">கின�யார�வான�டா</language>
-			<language type="sa">சமஸ�கிர�தம�</language>
-			<language type="sad">சான�டாவே</language>
-			<language type="sah">யாக�ட�</language>
-			<language type="sai">தென� அமெரிக�க இன�டியன� மொழி</language>
-			<language type="sal">சாலிஷன� மொழி</language>
-			<language type="sam">சமாரிடன� அராமைக�</language>
-			<language type="sas">சாசாக�</language>
-			<language type="sat">சான�டாலி</language>
-			<language type="sc">சாடினியன�</language>
-			<language type="scn">சிசிலியன�</language>
-			<language type="sco">ஸ�காட�ஸ�</language>
-			<language type="sd">சிந�தி</language>
-			<language type="se">வடக�க� சாமி</language>
-			<language type="sel">செல�க�ப�</language>
-			<language type="sem">செமிடிக� மொழி</language>
-			<language type="sg">சாங�கோ</language>
-			<language type="sga">பழைய �ரிஷ�</language>
-			<language type="sgn">சங�கேத மொழி</language>
-			<language type="sh">செர�போ-க�ரோஷியன�</language>
-			<language type="shn">ஷான�</language>
-			<language type="si">சிங�களம�</language>
-			<language type="sid">சிடாமோ</language>
-			<language type="sio">சியோய�வான� மொழி</language>
-			<language type="sit">சினோ-திபேத�தியன� மொழி</language>
-			<language type="sk">ஸ�லோவாக�</language>
-			<language type="sl">ஸ�லோவினேயின�</language>
-			<language type="sla">ஸ�லாவிக� மொழி</language>
-			<language type="sm">ஸாமோவான�</language>
-			<language type="sma">தெற�க� சாமி</language>
-			<language type="smi">சாமி மொழி</language>
-			<language type="smj">ல�லே சாமி</language>
-			<language type="smn">இனாரி சாமி</language>
-			<language type="sms">ஸ�கோல�ட� சாமி</language>
-			<language type="sn">ஷோனா</language>
-			<language type="snk">சோனின�கே</language>
-			<language type="so">சோமாலி</language>
-			<language type="sog">சோக�தியன�</language>
-			<language type="son">சோங�காய�</language>
-			<language type="sq">அல�பெனியன�</language>
-			<language type="sr">சர�பியன�</language>
-			<language type="srn">ஸ�ரானன� டோங�கோ</language>
-			<language type="srr">செரெர�</language>
-			<language type="ss">ஸ�வாடீ</language>
-			<language type="ssa">நிலோ-சஹாரன� மொழி</language>
-			<language type="st">தெற�க� ஸோதோ</language>
-			<language type="su">ச�டானீஸ�</language>
-			<language type="suk">ச�க�மா</language>
-			<language type="sus">ச�ச�</language>
-			<language type="sux">ச�மேரியன�</language>
-			<language type="sv">ஷீவிடிஸ�</language>
-			<language type="sw">ச�வாஹிலி</language>
-			<language type="syc">பாரம�பரிய சிரியாக�</language>
-			<language type="syr">சிரியாக�</language>
-			<language type="ta">தமிழ�</language>
-			<language type="tai">தாய� மொழி</language>
-			<language type="te">தெல�ங�க�</language>
-			<language type="tem">டிம�னே</language>
-			<language type="ter">டெரெனோ</language>
-			<language type="tet">டெட�ம�</language>
-			<language type="tg">தாஜிக�</language>
-			<language type="th">தாய�</language>
-			<language type="ti">டிக�ரின�யா</language>
-			<language type="tig">டைக�ரே</language>
-			<language type="tiv">டிவ�</language>
-			<language type="tk">டர�க�மென�</language>
-			<language type="tkl">டோகேலௌ</language>
-			<language type="tl">டாகாலோக�</language>
-			<language type="tlh">கிளிங�கன�</language>
-			<language type="tli">டிலிங�கிட�</language>
-			<language type="tmh">டாமாஷேக�</language>
-			<language type="tn">ஸ�வானா</language>
-			<language type="to">டோங�கா</language>
-			<language type="tog">நயாசா டோங�கா</language>
-			<language type="tpi">டோக� பிஸின�</language>
-			<language type="tr">டர�கிஷ�</language>
-			<language type="ts">ஸோங�கா</language>
-			<language type="tsi">ட�ஸிம�ஷியன�</language>
-			<language type="tt">டாடர�</language>
-			<language type="tum">ட�ம�ப�கா</language>
-			<language type="tup">த�பி மொழி</language>
-			<language type="tut">அல�தேய�க� மொழி</language>
-			<language type="tvl">ட�வால�</language>
-			<language type="tw">ட�வி</language>
-			<language type="ty">டஹிதியான�</language>
-			<language type="tyv">ட�வினியன�</language>
-			<language type="udm">உட�ம�ர�ட�</language>
-			<language type="ug">ய�க�ர�</language>
-			<language type="uga">உகாரிட�க�</language>
-			<language type="uk">உக�ரேனியன�</language>
-			<language type="umb">அம�பொண�ட�</language>
-			<language type="und">தெரியாத அல�லத� செல�லாத பிரதேசம�</language>
-			<language type="ur">உர�த�</language>
-			<language type="uz">உஸ�பெக�</language>
-			<language type="vai">வை</language>
-			<language type="ve">வென�டா</language>
-			<language type="vi">வியட�நாமிஸ�</language>
-			<language type="vo">ஒலாபூக�</language>
-			<language type="vot">வோட�க�</language>
-			<language type="wa">ஒவாலூன�</language>
-			<language type="wak">வகாஷான� மொழி</language>
-			<language type="wal">வாலாமோ</language>
-			<language type="war">வாரே</language>
-			<language type="was">வாஷோ</language>
-			<language type="wen">சொர�பியன� மொழி</language>
-			<language type="wo">ஒலூஃப�</language>
-			<language type="xal">கல�மிக�</language>
-			<language type="xh">ஹோஷா</language>
-			<language type="yao">யாவ�</language>
-			<language type="yap">யாபேசி</language>
-			<language type="yi">ஈத�திஷ</language>
-			<language type="yo">யோர�ப�பா</language>
-			<language type="ypk">ய�பிக� மொழி</language>
-			<language type="za">ஜ�வாங�</language>
-			<language type="zap">ஜாபோடெக�</language>
-			<language type="zbl">ப�லிஸ�ஸிம�பால�ஸ�</language>
-			<language type="zen">ஜெனகா</language>
-			<language type="zh">சீனம�</language>
-			<language type="zh_Hans">எளிய சீனம�</language>
-			<language type="zh_Hant">மரப� சீனம�</language>
-			<language type="znd">ஜான�டே</language>
-			<language type="zu">ஜூலூ</language>
-			<language type="zun">ஜூனி</language>
-			<language type="zxx">மொழிக�கிணங�க உள�ளடக�கம� இல�லை</language>
-			<language type="zza">ஜாஜா</language>
-		</languages>
-		<scripts>
-			<script type="Arab">அரபிக�</script>
-			<script type="Armi">இம�பேரியல� அரமெய�க�</script>
-			<script type="Armn">அர�மேனியன�</script>
-			<script type="Avst">அவெஸ�தான�</script>
-			<script type="Bali">பாலினீஸ�</script>
-			<script type="Batk">பாடாக�</script>
-			<script type="Beng">வங�காளம�</script>
-			<script type="Blis">ப�லிஸ�ஸிமிபால�ஸ�</script>
-			<script type="Bopo">ப�ரபோமோஃபோ</script>
-			<script type="Brah">பிரம�மி</script>
-			<script type="Brai">ப�ரைல�</script>
-			<script type="Bugi">ப�கினீஸ�</script>
-			<script type="Buhd">ப�கித�</script>
-			<script type="Cakm">சக�மா</script>
-			<script type="Cans">ய�னிஃபைட� கனடியன� அபொரிஜினல� சிலபிக�ஸ�</script>
-			<script type="Cari">கரியன�</script>
-			<script type="Cham">சாம�</script>
-			<script type="Cher">செரோக�கி</script>
-			<script type="Cirt">கிர�த�</script>
-			<script type="Copt">காப�டிக�</script>
-			<script type="Cprt">சைப�ரியாட�</script>
-			<script type="Cyrl">சிரிலிக�</script>
-			<script type="Cyrs">பழைய சர�ச� ஸ�லவோனிக� சிரிலிக�</script>
-			<script type="Deva">தேவனாகரி</script>
-			<script type="Dsrt">டெசராட�</script>
-			<script type="Egyd">எகிப�தியன� டெமோட�டிக�</script>
-			<script type="Egyh">எகிப�தியன� ஹைரேட�டிக�</script>
-			<script type="Egyp">எகிப�தியன� ஹைரோகிளிப�ஸ�</script>
-			<script type="Ethi">யெத�தியோப�பிக�</script>
-			<script type="Geok">ஜியார�ஜியன� க�ட�ச�ரி</script>
-			<script type="Geor">ஜார�ஜியன�</script>
-			<script type="Glag">க�லாகோலிடிக�</script>
-			<script type="Goth">கோதிக�</script>
-			<script type="Grek">கிரேக�கம�</script>
-			<script type="Gujr">க�ஜராத�தி</script>
-			<script type="Guru">க�ர�ம�கி</script>
-			<script type="Hang">ஹங�க�ல�</script>
-			<script type="Hani">ஹான�</script>
-			<script type="Hano">ஹன�னூ</script>
-			<script type="Hans">எளிய ஹான�</script>
-			<script type="Hant">கலாச�சார ஹான�</script>
-			<script type="Hebr">ஹிப�ரூ</script>
-			<script type="Hira">ஹிராகானா</script>
-			<script type="Hmng">பஹாவ� மாங�க�</script>
-			<script type="Hrkt">கடாகானா அல�லத� ஹிராகானா</script>
-			<script type="Hung">பழைய ஹங�கேரியன�</script>
-			<script type="Inds">சிந�த�</script>
-			<script type="Ital">பழைய இத�தாலி</script>
-			<script type="Java">ஜாவனீஸ�</script>
-			<script type="Jpan">ஜாப�பனீஸ�</script>
-			<script type="Kali">கயாஹ� லீ</script>
-			<script type="Kana">கடகனா</script>
-			<script type="Khar">கரோஷ�டி</script>
-			<script type="Khmr">கமெர�</script>
-			<script type="Knda">கன�னடம�</script>
-			<script type="Kore">கொரியன�</script>
-			<script type="Kthi">காய�தி</script>
-			<script type="Lana">லன�னா</script>
-			<script type="Laoo">லௌ</script>
-			<script type="Latf">ஃப�ரக�டூர� லெத�தின�</script>
-			<script type="Latg">கேலிக� லெத�தின�</script>
-			<script type="Latn">லத�தின�</script>
-			<script type="Lepc">லெப�சா</script>
-			<script type="Limb">லிம�ப�</script>
-			<script type="Lina">லினியர� �</script>
-			<script type="Linb">லினியர� பி</script>
-			<script type="Lyci">லிசியன�</script>
-			<script type="Lydi">லிடியன�</script>
-			<script type="Mand">மேன�டியன�</script>
-			<script type="Mani">மனிசெய�ன�</script>
-			<script type="Maya">மயான� ஹைரோகிளிப�</script>
-			<script type="Mero">மெராய�டிக�</script>
-			<script type="Mlym">மலையாளம�</script>
-			<script type="Mong">மங�கோலியன�</script>
-			<script type="Moon">மூன�</script>
-			<script type="Mtei">மெய�தெய� மயக�</script>
-			<script type="Mymr">மியான�மர�</script>
-			<script type="Nkoo">என�'கோ</script>
-			<script type="Ogam">ஒகாம�</script>
-			<script type="Olck">ஒல� சிக�கி</script>
-			<script type="Orkh">ஆர�கான�</script>
-			<script type="Orya">ஒரியா</script>
-			<script type="Osma">ஒஸ�மான�யா</script>
-			<script type="Perm">பழைய பெர�மிக�</script>
-			<script type="Phag">பக�ஸ�-பா</script>
-			<script type="Phli">இன�ஸ�கிரிப�ஷனல� பஹலவி</script>
-			<script type="Phlp">சால�டர� பஹலவி</script>
-			<script type="Phlv">ப�க� பஹலவி</script>
-			<script type="Phnx">ஃபோனேஷியன�</script>
-			<script type="Plrd">போலார�ட� ஃபொனெட�டிக�</script>
-			<script type="Prti">இன�ஸ�கிரிப�ஷனல� பார�த�தியன�</script>
-			<script type="Qaai">பாரம�பரியமான</script>
-			<script type="Rjng">ரெஜெய�ன�</script>
-			<script type="Roro">ரொங�கோரொங�கோ</script>
-			<script type="Runr">ர�னிக�</script>
-			<script type="Samr">சமாரிடன�</script>
-			<script type="Sara">சாராதி</script>
-			<script type="Saur">சௌராஷ�ட�ரா</script>
-			<script type="Sgnw">ஸைன�எழ�த�த�</script>
-			<script type="Shaw">ஷவியான�</script>
-			<script type="Sinh">சிங�கலம�</script>
-			<script type="Sund">ச�ந�தானீஸ�</script>
-			<script type="Sylo">சிலோடி நக�ரி</script>
-			<script type="Syrc">சிரியாக�</script>
-			<script type="Syre">எஸ�ட�ரெங�கெலோ சிரியாக�</script>
-			<script type="Syrj">மேற�க� சிரியாக�</script>
-			<script type="Syrn">கிழக�க� சிரியாக�</script>
-			<script type="Tagb">தகோவானா</script>
-			<script type="Tale">தாய� லே</script>
-			<script type="Talu">ப�திய தை லூ</script>
-			<script type="Taml">தமிழ�</script>
-			<script type="Tavt">தை வியத�</script>
-			<script type="Telu">தெல�ங�க�</script>
-			<script type="Teng">தெங�வார�</script>
-			<script type="Tfng">டிஃபினாக�</script>
-			<script type="Tglg">தகலாக�</script>
-			<script type="Thaa">தானா</script>
-			<script type="Thai">தாய�</script>
-			<script type="Tibt">திபேத�தியன�</script>
-			<script type="Ugar">உகாரதிக�</script>
-			<script type="Vaii">வை</script>
-			<script type="Visp">விசிபிள� ஸ�பீச�</script>
-			<script type="Xpeo">பழைய பெர�ஷியன�</script>
-			<script type="Xsux">ச�மெரோ-அக�கடியன� க�யூனிஃபார�ம�</script>
-			<script type="Yiii">யீ</script>
-			<script type="Zmth">கணிதக�க�றியீட�</script>
-			<script type="Zsym">சின�னங�கள�</script>
-			<script type="Zxxx">எழ�தப�படாதத�</script>
-			<script type="Zyyy">சாதரண</script>
-			<script type="Zzzz">தெரியாத அல�லத� செல�லாத ஸ�கிரிப�ட�</script>
-		</scripts>
-		<territories>
-			<territory type="001">உலகம�</territory>
-			<territory type="002">ஆப�ரிக�கா</territory>
-			<territory type="003">வடக�க� அமெரிக�கா கண�டம�</territory>
-			<territory type="005">தெற�க� அமெரிக�கா</territory>
-			<territory type="009">ஓஷெனியா</territory>
-			<territory type="011">மேற�க� ஆப�ரிக�கா</territory>
-			<territory type="013">மத�திய அமெரிக�கா</territory>
-			<territory type="014">கிழக�க� ஆப�ரிக�கா</territory>
-			<territory type="015">வடக�க� ஆப�ரிக�கா</territory>
-			<territory type="017">மத�திய ஆப�ரிக�கா</territory>
-			<territory type="018">தென�னாப�ரிக�கா</territory>
-			<territory type="019">அமெர�க�காஸ�</territory>
-			<territory type="021">வடக�க� அமெரிக�கா</territory>
-			<territory type="029">கரீபியன�</territory>
-			<territory type="030">கிழக�க� ஆசியா</territory>
-			<territory type="034">தெற�க� ஆசியா</territory>
-			<territory type="035">தென�-கிழக�க� ஆசியா</territory>
-			<territory type="039">தெற�க� �ரோப�பா</territory>
-			<territory type="053">ஆஸ�திரேலியா மற�ற�ம� நியூசிலாந�த�</territory>
-			<territory type="054">மெலனேஷியா</territory>
-			<territory type="057">மைக�ரோ நேஷியா பிரதேசம�</territory>
-			<territory type="061">பாலினேஷியா</territory>
-			<territory type="062">மத�திய-தெற�காசியா</territory>
-			<territory type="142">ஆசியா</territory>
-			<territory type="143">மத�திய ஆசியா</territory>
-			<territory type="145">மேற�க� ஆசியா</territory>
-			<territory type="150">ஈரோப�</territory>
-			<territory type="151">கிழக�க� �ரோப�பா</territory>
-			<territory type="154">வடக�க� �ரோப�பா</territory>
-			<territory type="155">மேற�க� �ரோப�பா</territory>
-			<territory type="172">ச�தந�திர மாநிலங�களின� காமன�வெல�த�</territory>
-			<territory type="200">செகோஸ�லோவாக�யா</territory>
-			<territory type="419">லத�தீன� அமெரிக�கா மற�ற�ம� கரீபியன�</territory>
-			<territory type="830">சேனல� தீவ�கள�</territory>
-			<territory type="AD">அன�டோரா</territory>
-			<territory type="AE">�க�கிய அரப� கூட�டாட�சி</territory>
-			<territory type="AF">ஆப�கானிஸ�தான�</territory>
-			<territory type="AG">ஆன�டிக�வா மற�ற�ம� பார�ப�டா</territory>
-			<territory type="AI">அங�க�ய�லா</territory>
-			<territory type="AL">அல�பேனியா</territory>
-			<territory type="AM">ஆர�மேனியா</territory>
-			<territory type="AN">நெதெர�லேண�ட� ஆண�டிலிஸ�</territory>
-			<territory type="AO">அங�கோலா</territory>
-			<territory type="AQ">அன�டார�டிகா</territory>
-			<territory type="AR">அர�ஜெண�டினா</territory>
-			<territory type="AS">அமெரிக�க சமோவா</territory>
-			<territory type="AT">ஆஸ�திரியா</territory>
-			<territory type="AU">ஆஸ�திரேலியா</territory>
-			<territory type="AW">அரூபா</territory>
-			<territory type="AX">ஆலந�த� தீவ�கள�</territory>
-			<territory type="AZ">அஜர�பைஜான�</territory>
-			<territory type="BA">போஸ�னியா மற�ற�ம� ஹெர�ஸிகோவினா</territory>
-			<territory type="BB">பார�படோஸ�</territory>
-			<territory type="BD">பங�களாதேஷ�</territory>
-			<territory type="BE">பெல�ஜியம�</territory>
-			<territory type="BF">ப�ர�கினா ஃபாஸோ</territory>
-			<territory type="BG">பல�கேரியா</territory>
-			<territory type="BH">பஹ�ரைன�</territory>
-			<territory type="BI">ப�ர�ண�டி</territory>
-			<territory type="BJ">பெனின�</territory>
-			<territory type="BL">செயின�ட� பார�தேலெமி</territory>
-			<territory type="BM">பெர�ம�டா</territory>
-			<territory type="BN">ப�ரூனேய�</territory>
-			<territory type="BO">பொலிவியா</territory>
-			<territory type="BR">பிரேஸில�</territory>
-			<territory type="BS">பஹமாஸ�</territory>
-			<territory type="BT">பூடான�</territory>
-			<territory type="BV">பொவேட� தீவ�கள�</territory>
-			<territory type="BW">போட�ஸ�வானா</territory>
-			<territory type="BY">பெலாரூஸ�</territory>
-			<territory type="BZ">பெலிஸ�</territory>
-			<territory type="CA">கனடா</territory>
-			<territory type="CC">காகோஸ� தீவ�கள�</territory>
-			<territory type="CD">காங�கோ - கின�சாசா</territory>
-			<territory type="CF">மத�திய ஆப�ரிக�கக� க�டியரச�</territory>
-			<territory type="CG">காங�கோ - ப�ராஸாவில�லே</territory>
-			<territory type="CH">ஸ�விட�சர�லாந�த�</territory>
-			<territory type="CI">�வரி கோஸ�ட�</territory>
-			<territory type="CK">க�க� தீவ�கள�</territory>
-			<territory type="CL">சிலி</territory>
-			<territory type="CM">கேமரூன�</territory>
-			<territory type="CN">சீனா</territory>
-			<territory type="CO">கொலம�பியா</territory>
-			<territory type="CR">கோஸ�டாரிகா</territory>
-			<territory type="CS">செர�பியா மற�ற�ம� மான�டேநெக�ரோ</territory>
-			<territory type="CU">கியூபா</territory>
-			<territory type="CV">கேப� வெர�டே</territory>
-			<territory type="CX">கிறிஸ�த�மஸ� தீவ�</territory>
-			<territory type="CY">சைப�ரஸ�</territory>
-			<territory type="CZ">செக� க�டியரச�</territory>
-			<territory type="DE">ஜெர�மன�</territory>
-			<territory type="DJ">ஜிபௌடி</territory>
-			<territory type="DK">டென�மார�க�</territory>
-			<territory type="DM">டொமினிகா</territory>
-			<territory type="DO">டொமினிகன� க�டியரச�</territory>
-			<territory type="DZ">அல�ஜீரியா</territory>
-			<territory type="EC">ஈக�வடார�</territory>
-			<territory type="EE">எஸ�டோனியா</territory>
-			<territory type="EG">எகிப�த�</territory>
-			<territory type="EH">மேற�க� சஹாரா</territory>
-			<territory type="ER">எரிட�ரியா</territory>
-			<territory type="ES">ஸ�பெயின�</territory>
-			<territory type="ET">எதியோப�பியா</territory>
-			<territory type="FI">பின�லாந�த�</territory>
-			<territory type="FJ">ஃபிஜி</territory>
-			<territory type="FK">ஃபாக�லான�ட� தீவ�கள�</territory>
-			<territory type="FM">மைக�ரோனேஷியா</territory>
-			<territory type="FO">ஃபெரௌ தீவ�கள�</territory>
-			<territory type="FR">பிரான�ஸ�</territory>
-			<territory type="GA">கேபான�</territory>
-			<territory type="GB">பிரிடிஷ� கூட�டரச�</territory>
-			<territory type="GD">கிரனெடா</territory>
-			<territory type="GE">ஜார�ஜியா</territory>
-			<territory type="GF">ஃப�ரென�ச� கயானா</territory>
-			<territory type="GG">கெர�ன�சி</territory>
-			<territory type="GH">கானா</territory>
-			<territory type="GI">ஜிப�ரால�டர�</territory>
-			<territory type="GL">கிரீன�லாண�ட�</territory>
-			<territory type="GM">காம�பியா</territory>
-			<territory type="GN">கினி</territory>
-			<territory type="GP">க�வாதேலோப�</territory>
-			<territory type="GQ">ஈக�க�வாடோரியல� கினி</territory>
-			<territory type="GR">கிரீஸ�</territory>
-			<territory type="GS">தென� ஜியார�ஜியா மற�ற�ம� தென� சான�ட�விச� தீவ�கள�</territory>
-			<territory type="GT">க�வாத�தாமாலா</territory>
-			<territory type="GU">க�வாம�</territory>
-			<territory type="GW">கினி-பிஸ�ஸாவ�</territory>
-			<territory type="GY">கயானா</territory>
-			<territory type="HK">ஹாங� காங� எஸ�.�.ஆர� சைனா</territory>
-			<territory type="HM">ஹேர�ட� மற�ற�ம� மெக�டொனால�ட�</territory>
-			<territory type="HN">ஹாண�ட�ராஸ�</territory>
-			<territory type="HR">க�ரோசியா</territory>
-			<territory type="HT">ஹெய�தி</territory>
-			<territory type="HU">ஹங�கேரி</territory>
-			<territory type="ID">இந�தோனேஷியா</territory>
-			<territory type="IE">அயர�லாந�த�</territory>
-			<territory type="IL">இஸ�ரேல�</territory>
-			<territory type="IM">�ல� ஆஃப� மேன�</territory>
-			<territory type="IN">இந�தியா</territory>
-			<territory type="IO">பிரிட�டிஷ� இந�தியப� பெர�ங�கடல� மாஹாணம�</territory>
-			<territory type="IQ">இராக�</territory>
-			<territory type="IR">ஈரான�</territory>
-			<territory type="IS">�ஸ�லாந�த�</territory>
-			<territory type="IT">இத�தாலி</territory>
-			<territory type="JE">ஜெர�சி</territory>
-			<territory type="JM">ஜமாய�க�கா</territory>
-			<territory type="JO">ஜொர�டான�</territory>
-			<territory type="JP">ஜப�பான�</territory>
-			<territory type="KE">கென�யா</territory>
-			<territory type="KG">கிர�கிஸ�தான�</territory>
-			<territory type="KH">கம�போடியா</territory>
-			<territory type="KI">கிரிபடி</territory>
-			<territory type="KM">கோமரோஸ�</territory>
-			<territory type="KN">செயின�ட� கிட�ஸ� மற�ற�ம� நெவிஸ�</territory>
-			<territory type="KP">வட கொரியா</territory>
-			<territory type="KR">தென� கொரியா</territory>
-			<territory type="KW">க�வைத�த�</territory>
-			<territory type="KY">கேமென� தீவ�கள�</territory>
-			<territory type="KZ">கஜகஸ�தான�</territory>
-			<territory type="LA">லாவோஸ�</territory>
-			<territory type="LB">லெபனான�</territory>
-			<territory type="LC">செயின�ட� லூசியா</territory>
-			<territory type="LI">லிச�செண�ஸ�டெய�ன�</territory>
-			<territory type="LK">இலங�கை</territory>
-			<territory type="LR">லைபேரியா</territory>
-			<territory type="LS">லெசோதோ</territory>
-			<territory type="LT">லித�வேனியா</territory>
-			<territory type="LU">லக�ஸ�சம�பர�க�</territory>
-			<territory type="LV">லாட�வியா</territory>
-			<territory type="LY">லிப�யா</territory>
-			<territory type="MA">மொரோக�கோ</territory>
-			<territory type="MC">மொனாக�கோ</territory>
-			<territory type="MD">மால�டோவா</territory>
-			<territory type="ME">மான�டேனெக�ரோ</territory>
-			<territory type="MF">செயின� மார�டீன�</territory>
-			<territory type="MG">மடகாஸ�கர�</territory>
-			<territory type="MH">மார�ஷல� தீவ�கள�</territory>
-			<territory type="MK">மசெடோணியா</territory>
-			<territory type="ML">மாலீ</territory>
-			<territory type="MM">மியான�மார�</territory>
-			<territory type="MN">மங�கோலியா</territory>
-			<territory type="MO">மெக�கௌ</territory>
-			<territory type="MP">வடக�க� மரியானா தீவ�கள�</territory>
-			<territory type="MQ">மார�டினிக�</territory>
-			<territory type="MR">மௌரிடானியா</territory>
-			<territory type="MS">மௌன�ட�செராட�</territory>
-			<territory type="MT">மால�டா</territory>
-			<territory type="MU">மொரிசியஸ�</territory>
-			<territory type="MV">மாலத�தீவ�</territory>
-			<territory type="MW">மலாவீ</territory>
-			<territory type="MX">மெக�சிகோ</territory>
-			<territory type="MY">மலேஷியா</territory>
-			<territory type="MZ">மொசாம�பிக�</territory>
-			<territory type="NA">நமீபியா</territory>
-			<territory type="NC">ப�திய கலிடோன�யா</territory>
-			<territory type="NE">நைஜர�</territory>
-			<territory type="NF">நார�ஃபாக� தீவ�கள�</territory>
-			<territory type="NG">நைஜீரியா</territory>
-			<territory type="NI">நிகாராக�வா</territory>
-			<territory type="NL">நெதர�லாந�த�</territory>
-			<territory type="NO">நார�வே</territory>
-			<territory type="NP">நேபாளம�</territory>
-			<territory type="NR">நௌர�</territory>
-			<territory type="NU">நியூ</territory>
-			<territory type="NZ">நியூசிலாந�த�</territory>
-			<territory type="OM">ஓமான�</territory>
-			<territory type="PA">பனாமா</territory>
-			<territory type="PE">பெர�</territory>
-			<territory type="PF">ஃப�ரென�ச� பாலினேஷியா</territory>
-			<territory type="PG">பாப�ப�வா நியூ கினி</territory>
-			<territory type="PH">பிலிப�பைன�ஸ�</territory>
-			<territory type="PK">பாகிஸ�தான�</territory>
-			<territory type="PL">போலந�த�</territory>
-			<territory type="PM">செயின�ட� பியர� மற�ற�ம� மிக�வேலான�</territory>
-			<territory type="PN">பிட�கேன�</territory>
-			<territory type="PR">போர�த�த ரிக�கோ</territory>
-			<territory type="PS">பாலஸ�தீனியன� மாஹாணம�</territory>
-			<territory type="PT">போர�ச�ச�க�கல�</territory>
-			<territory type="PW">பலவ�</territory>
-			<territory type="PY">பாரக�வே</territory>
-			<territory type="QA">காடார�</territory>
-			<territory type="QO">ஔட�லையிங� ஓசானியா</territory>
-			<territory type="QU">�ரோப�பியன� யூனியன�</territory>
-			<territory type="RE">ரீயூனியன�</territory>
-			<territory type="RO">ர�மேனியா</territory>
-			<territory type="RS">செர�பியா</territory>
-			<territory type="RU">ரஷ�யா</territory>
-			<territory type="RW">ர�வான�டா</territory>
-			<territory type="SA">சவூதி அரேபியா</territory>
-			<territory type="SB">சாலமன� தீவ�கள�</territory>
-			<territory type="SC">செஷெல�ஸ�</territory>
-			<territory type="SD">சூடான�</territory>
-			<territory type="SE">ஸ�வீடன�</territory>
-			<territory type="SG">சிங�கப�பூர�</territory>
-			<territory type="SH">செயின�ட� ஹெலெனா</territory>
-			<territory type="SI">ஸ�லோவேனியா</territory>
-			<territory type="SJ">ஸ�வல�பார�ட� மற�ற�ம� ஜான� மேயன�</territory>
-			<territory type="SK">ஸ�லோவாகியா</territory>
-			<territory type="SL">சியேரா லியோன�</territory>
-			<territory type="SM">சான� மெரினோ</territory>
-			<territory type="SN">செனெகல�</territory>
-			<territory type="SO">சொமாலியா</territory>
-			<territory type="SR">சூரினாம�</territory>
-			<territory type="ST">சாவ� தோம� மற�ற�ம� ப�ரின�சிபி</territory>
-			<territory type="SV">எல� சால�வடார�</territory>
-			<territory type="SY">சிரியா</territory>
-			<territory type="SZ">ஸ�வாஸிலாண�ட�</territory>
-			<territory type="TC">டர�க�ஸ� மற�ற�ம� கைகோஸ� தீவ�கள�</territory>
-			<territory type="TD">சாட�</territory>
-			<territory type="TF">ஃப�ரென�ச� தெற�க� மாஹாணங�கள�</territory>
-			<territory type="TG">டோகோ</territory>
-			<territory type="TH">தாய�லாந�த�</territory>
-			<territory type="TJ">தாஜிகிஸ�தான�</territory>
-			<territory type="TK">டோகேலோ</territory>
-			<territory type="TL">கிழக�க� திமோர�</territory>
-			<territory type="TM">த�ர�க�மெனிஸ�தான�</territory>
-			<territory type="TN">ட�னிசியா</territory>
-			<territory type="TO">டோங�கா</territory>
-			<territory type="TR">த�ர�க�கி</territory>
-			<territory type="TT">திரினிடாட� மற�ற�ம� தொபாகோ</territory>
-			<territory type="TV">த�வாலூ</territory>
-			<territory type="TW">தைவான�</territory>
-			<territory type="TZ">டான�சானியா</territory>
-			<territory type="UA">உக�ரைன�</territory>
-			<territory type="UG">உகாண�டா</territory>
-			<territory type="UM">ய�னைட�டட� ஸ�டேட�ஸ�ம� சிறிய அவ�ட�லைன� தீவ�கள�ம�</territory>
-			<territory type="US">�க�கிய அமெரிக�க க�டியரச�</territory>
-			<territory type="UY">உர�க�வே</territory>
-			<territory type="UZ">உஸ�பெகிஸ�தான�</territory>
-			<territory type="VA">வாடிகன�</territory>
-			<territory type="VC">செயின� வின�சன�ட� மற�ற�ம� கிரெனடைன�ஸ�</territory>
-			<territory type="VE">வெனஜ�வேலா</territory>
-			<territory type="VG">பிரிட�டீஷ� கன�னித� தீவ�கள�</territory>
-			<territory type="VI">யூ.எஸ� கன�னித� தீவ�கள�</territory>
-			<territory type="VN">வியட�நாம�</territory>
-			<territory type="VU">வன�வாட�ட�</territory>
-			<territory type="WF">வாலிஸ� மற�ற�ம� ஃப�யூச�னா</territory>
-			<territory type="WS">சமோவா</territory>
-			<territory type="YE">யேமன�</territory>
-			<territory type="YT">மயோத�</territory>
-			<territory type="ZA">தென� ஆப�ரிக�கா</territory>
-			<territory type="ZM">சாம�பியா</territory>
-			<territory type="ZW">ஜிம�பாப�வே</territory>
-			<territory type="ZZ">தெரியாத அல�லத� செல�லாத பிரதேசம�</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[ஃ அ-ஊ எ-� ஒ-க ங ச ஜ ஞ ட ண த ந-ப ம-வ ஷ-ஹ ா-ூ ெ-ை ொ-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[a g i m t]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ஜன.</month>
-							<month type="2">பிப�.</month>
-							<month type="3">மார�.</month>
-							<month type="4">�ப�.</month>
-							<month type="5">மே</month>
-							<month type="6">ஜூன�</month>
-							<month type="7">ஜூலை</month>
-							<month type="8">ஆக.</month>
-							<month type="9">செப�.</month>
-							<month type="10">அக�.</month>
-							<month type="11">நவ.</month>
-							<month type="12">டிச.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ஜனவரி</month>
-							<month type="2">பிப�ரவரி</month>
-							<month type="3">மார�ச�</month>
-							<month type="4">�ப�ரல�</month>
-							<month type="5">மே</month>
-							<month type="6">ஜூன�</month>
-							<month type="7">ஜூலை</month>
-							<month type="8">ஆகஸ�ட�</month>
-							<month type="9">செப�டம�பர�</month>
-							<month type="10">அக�டோபர�</month>
-							<month type="11">நவம�பர�</month>
-							<month type="12">டிசம�பர�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ஜ</month>
-							<month type="2">பி</month>
-							<month type="3">மா</month>
-							<month type="4">�</month>
-							<month type="5">மே</month>
-							<month type="6">ஜூ</month>
-							<month type="7">ஜூ</month>
-							<month type="8">ஆ</month>
-							<month type="9">செ</month>
-							<month type="10">à®…</month>
-							<month type="11">ந</month>
-							<month type="12">டி</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ஞா</day>
-							<day type="mon">தி</day>
-							<day type="tue">செ</day>
-							<day type="wed">ப�</day>
-							<day type="thu">வி</day>
-							<day type="fri">வெ</day>
-							<day type="sat">ச</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ஞாயிற�</day>
-							<day type="mon">திங�கள�</day>
-							<day type="tue">செவ�வாய�</day>
-							<day type="wed">ப�தன�</day>
-							<day type="thu">வியாழன�</day>
-							<day type="fri">வெள�ளி</day>
-							<day type="sat">சனி</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ஞா</day>
-							<day type="mon">தி</day>
-							<day type="tue">செ</day>
-							<day type="wed">ப�</day>
-							<day type="thu">வி</day>
-							<day type="fri">வெ</day>
-							<day type="sat">ச</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1ஆம� காலாண�ட�</quarter>
-							<quarter type="2">2ஆம� காலாண�ட�</quarter>
-							<quarter type="3">3ஆம� காலாண�ட�</quarter>
-							<quarter type="4">4ஆம� காலாண�ட�</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">கிறிஸ�த�வ�க�க� ம�ன�</era>
-						<era type="1">அனோ டோமினி</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">கிம�</era>
-						<era type="1">கிபி</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM, y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d-M-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} நேரம�</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>பிரிஸ�பேன�</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>கேம�போ கிராண�டே</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>கேம�பிரிட�ஜ� பே</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>ஈஸ�டர�</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>ஜகார�த�தா</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>ஜெயபூரா</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>லாஸ� �ஞ�சல�ஸ�</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ஃபோனிக�ஸ�</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>தேன�வர�</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>மையம�, வடக�க� டகோடா</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>சிகாகோ</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>இந�தியானாபோலிஸ�</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>நியூயார�க�</exemplarCity>
-			</zone>
-			<metazone type="India">
-				<long>
-					<standard>இந�திய நேரப�படி</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="INR">
-				<symbol>ரூ</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ஆம�:ஆ</yesstr>
-			<nostr>இல�லை:இ</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ta_IN.xml b/airtime_mvc/library/Zend/Locale/Data/ta_IN.xml
deleted file mode 100644
index 45d64a329..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ta_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="ta"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/te.xml b/airtime_mvc/library/Zend/Locale/Data/te.xml
deleted file mode 100644
index 3ea9e3286..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/te.xml
+++ /dev/null
@@ -1,1154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.81 $"/>
-		<generation date="$Date: 2009/06/15 03:46:26 $"/>
-		<language type="te"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">అఫార�</language>
-			<language type="ab">అబ�ఖాజియన�</language>
-			<language type="ace">ఆఖినీస�</language>
-			<language type="ach">అకోలి</language>
-			<language type="ada">అడాంగ�మే</language>
-			<language type="ady">అడిగాబ�జే</language>
-			<language type="ae">అవేస�టాన�</language>
-			<language type="af">ఆఫ�రికాన�స�</language>
-			<language type="afa">ఆఫ�రో-ఆశియా భాష</language>
-			<language type="afh">అఫ�రిహిలి</language>
-			<language type="ain">�న�</language>
-			<language type="ak">అకాన�</language>
-			<language type="akk">అక�కాడియాన�</language>
-			<language type="ale">అలియ�ట�</language>
-			<language type="alg">ఆల�గొంక�వియన� భాష</language>
-			<language type="alt">దక�షిణ ఆల�టై</language>
-			<language type="am">అమ�హారిక�</language>
-			<language type="an">అరగోనిస�</language>
-			<language type="ang">ప�రాచీన ఆగ�లం</language>
-			<language type="anp">ఆంగిక</language>
-			<language type="apa">అప�పాచి భాష</language>
-			<language type="ar">అరబిక�</language>
-			<language type="arc">అరామేక�</language>
-			<language type="arn">అరౌకేనియన�</language>
-			<language type="arp">అరాపాహో</language>
-			<language type="art">కృత�రిమ భాష</language>
-			<language type="arw">అరావాక�</language>
-			<language type="as">అస�సామీస�</language>
-			<language type="ast">అస�ట�రియాన�</language>
-			<language type="ath">ఆతాపాస�కన� భాష</language>
-			<language type="aus">ఆస�ట�రేలియన� భాష</language>
-			<language type="av">అవారిక�</language>
-			<language type="awa">అవధి</language>
-			<language type="ay">�మారా</language>
-			<language type="az">అజర�బైజాని</language>
-			<language type="ba">బష�కిర�</language>
-			<language type="bad">బాండా</language>
-			<language type="bai">బమిలేకే భాష</language>
-			<language type="bal">బాల�చి</language>
-			<language type="ban">బాలినీస�</language>
-			<language type="bas">బసా</language>
-			<language type="bat">బాల�టిక� భాష</language>
-			<language type="be">బెలర�శియన�</language>
-			<language type="bej">బేజా</language>
-			<language type="bem">బెంబా</language>
-			<language type="ber">బెర�బెర�</language>
-			<language type="bg">బల�గేరియన�</language>
-			<language type="bh">బిహారి</language>
-			<language type="bho">భోజ� పూరి</language>
-			<language type="bi">బిస�లామా</language>
-			<language type="bik">బికోల�</language>
-			<language type="bin">బిని</language>
-			<language type="bla">సిక� సికా</language>
-			<language type="bm">బంబారా</language>
-			<language type="bn">బెంగాలి</language>
-			<language type="bnt">బంట�</language>
-			<language type="bo">టిబెటన�</language>
-			<language type="br">బ�రెటన�</language>
-			<language type="bra">బ�రాజ�</language>
-			<language type="bs">బాస�నియన�</language>
-			<language type="btk">బటక�</language>
-			<language type="bua">బ�రియట�</language>
-			<language type="bug">బ�య�గినిస�</language>
-			<language type="byn">బ�లిన�</language>
-			<language type="ca">కెటలాన�</language>
-			<language type="cad">కేడ�డో</language>
-			<language type="cai">మధ�య అమెరికెన� ఇండియన� భాష</language>
-			<language type="car">కేరిబ�</language>
-			<language type="cau">కోకేషియన� భాష</language>
-			<language type="cch">అట�సామ�</language>
-			<language type="ce">చెచెన�</language>
-			<language type="ceb">సేబ�ఆనో</language>
-			<language type="cel">సెల�టిక� భాష</language>
-			<language type="ch">చమర�రో</language>
-			<language type="chb">చిబ�చా</language>
-			<language type="chg">చాగటై</language>
-			<language type="chk">చూకిస�</language>
-			<language type="chm">మారి</language>
-			<language type="chn">చినూక� జార�గన�</language>
-			<language type="cho">చొచ�కతావ�</language>
-			<language type="chp">చిపెవ�యాన�</language>
-			<language type="chr">చిరోకి</language>
-			<language type="chy">చేయేన�</language>
-			<language type="cmc">చామిక� భాష</language>
-			<language type="co">కార�సికన�</language>
-			<language type="cop">కోప�టిక�</language>
-			<language type="cpe">ఆంగ�లం ఆధారిత క�రియోల� లేదా పిగ�డిన�</language>
-			<language type="cpf">ప�రెంచ� -ఆధారిత క�రియోల� లేదా పిగ�డిన�</language>
-			<language type="cpp">పోర�చ�గీస� -ఆధారిత క�రియోల� లేదా పిగ�డిన�</language>
-			<language type="cr">క�రి</language>
-			<language type="crh">క�రిమియన� టర�కిష�</language>
-			<language type="crp">క�రియోల� లేదా పిగ�డిన�</language>
-			<language type="cs">చెక�</language>
-			<language type="csb">కష�బియన�</language>
-			<language type="cu">చర�చ స�లావిక�</language>
-			<language type="cus">క�షిటిక� భాష</language>
-			<language type="cv">చ�వాష�</language>
-			<language type="cy">వెల�ష�</language>
-			<language type="da">డేనిష�</language>
-			<language type="dak">డకోటా</language>
-			<language type="dar">డార�గ�వా</language>
-			<language type="day">దయక�</language>
-			<language type="de">ఙర�మన�</language>
-			<language type="del">డెలావేర�</language>
-			<language type="den">స�లేవ�</language>
-			<language type="dgr">డోగ�రిబ�</language>
-			<language type="din">à°¡à°¿à°‚à°•à°¾</language>
-			<language type="doi">డోగ�రి</language>
-			<language type="dra">ద�రవిడియన� భాష</language>
-			<language type="dsb">లోవర� సోర�బియన�</language>
-			<language type="dua">ద�ఆలా</language>
-			<language type="dum">మధ�యమ డచ�</language>
-			<language type="dv">దివేహి</language>
-			<language type="dyu">డ�య�లా</language>
-			<language type="dz">జొన�ఖా</language>
-			<language type="ee">ఇవే</language>
-			<language type="efi">ఎఫిక�</language>
-			<language type="egy">ప�రాచీన ఇజిప�షియన�</language>
-			<language type="eka">�కాజక�</language>
-			<language type="el">గ�రీక�</language>
-			<language type="elx">ఎలామైట�</language>
-			<language type="en">ఆంగ�లం</language>
-			<language type="enm">మధ�యమ ఆంగ�లం</language>
-			<language type="eo">ఎస�పరెన�టొ</language>
-			<language type="es">స�పానిష�</language>
-			<language type="et">ఈస�టొనియన�</language>
-			<language type="eu">బాస�క�</language>
-			<language type="ewo">ఎవోండొ</language>
-			<language type="fa">పర�షియన�</language>
-			<language type="fan">ఫాంగ�</language>
-			<language type="fat">ఫాంటి</language>
-			<language type="ff">ఫ�య�ల</language>
-			<language type="fi">ఫిన�నిష�</language>
-			<language type="fil">ఫిలిపినో</language>
-			<language type="fiu">ఫిన�నో- య�గ�రియన� భాష</language>
-			<language type="fj">ఫిజియన�</language>
-			<language type="fo">ఫారొఈస�</language>
-			<language type="fon">ఫాన�</language>
-			<language type="fr">ఫ�రెంచ�</language>
-			<language type="frm">మధ�యమ ప�రెంచ�</language>
-			<language type="fro">ప�రాచీన ప�రెంచ�</language>
-			<language type="frr">ఉత�తర ఫ�రిసియన�</language>
-			<language type="frs">తూర�ప� ఫ�రిసియన�</language>
-			<language type="fur">ఫ�రియ�లియన�</language>
-			<language type="fy">పశ�చిమ ఫ�రిసియన�</language>
-			<language type="ga">�రిష�</language>
-			<language type="gaa">à°—à°¾</language>
-			<language type="gay">గాయో</language>
-			<language type="gba">గ�బాయా</language>
-			<language type="gd">స�కాటిష� గేలిక�</language>
-			<language type="gem">జర�మేనిక� భాష</language>
-			<language type="gez">జీజ�</language>
-			<language type="gil">గిల�బర�టీస�</language>
-			<language type="gl">గెలిషియన�</language>
-			<language type="gmh">మధ�యమ హై జర�మన�</language>
-			<language type="gn">గ�రాని</language>
-			<language type="goh">ప�రాచీన హై జర�మన�</language>
-			<language type="gon">గోండి</language>
-			<language type="gor">గోరోంటలా</language>
-			<language type="got">గోథిక�</language>
-			<language type="grb">గ�రేబో</language>
-			<language type="grc">ప�రాచీన గ�రీక�</language>
-			<language type="gsw">స�విస� జర�మన�</language>
-			<language type="gu">గ�జరాతి</language>
-			<language type="gv">మంకస�</language>
-			<language type="gwi">గ�విచిన�</language>
-			<language type="ha">హౌసా</language>
-			<language type="hai">హైడా</language>
-			<language type="haw">హవాయియన�</language>
-			<language type="he">హీబ�ర�</language>
-			<language type="hi">హిందీ</language>
-			<language type="hil">హిలి గేయినోన�</language>
-			<language type="him">హిమాచలి</language>
-			<language type="hit">హిట�టిటే</language>
-			<language type="hmn">మోంగ�</language>
-			<language type="ho">హిరి మోట�</language>
-			<language type="hr">క�రొయెషియన�</language>
-			<language type="hsb">అప�పర� సోర�బియన�</language>
-			<language type="ht">హైయేతియన�</language>
-			<language type="hu">హన�గేరియన�</language>
-			<language type="hup">హ�పా</language>
-			<language type="hy">ఆర�మేనియన�</language>
-			<language type="hz">హిరేరో</language>
-			<language type="ia">ఇంటర�లింగ�వా</language>
-			<language type="iba">�బాన�</language>
-			<language type="id">ఇండోనిషియ</language>
-			<language type="ie">ఇంటర� లింగ�</language>
-			<language type="ig">ఇగ�బో</language>
-			<language type="ii">శిష�వన� ఈ</language>
-			<language type="ijo">�జో</language>
-			<language type="ik">ఇనూపై�క�</language>
-			<language type="ilo">�యోకో</language>
-			<language type="inc">భారతీయ భాష</language>
-			<language type="ine">ఇండో-�రోపియన� భాష</language>
-			<language type="inh">ఇంగ�ష�</language>
-			<language type="io">ఈడౌ</language>
-			<language type="ira">ఇరానియన� భాష</language>
-			<language type="iro">ఇరోక�వియన� భాష</language>
-			<language type="is">�స�లాండిక�</language>
-			<language type="it">ఇటాలియన�</language>
-			<language type="iu">ఇన�క�టిట�ట�</language>
-			<language type="ja">జాపనీస�</language>
-			<language type="jbo">లోజ�బాన�</language>
-			<language type="jpr">జ�య�డియో-పర�షియన�</language>
-			<language type="jrb">జ�య�డియో-అరబిక�</language>
-			<language type="jv">జావనీస�</language>
-			<language type="ka">జార�జియన�</language>
-			<language type="kaa">కారా-కల�పాక�</language>
-			<language type="kab">కాబిల�</language>
-			<language type="kac">కాచిన�</language>
-			<language type="kaj">జ�యూ</language>
-			<language type="kam">కంబా</language>
-			<language type="kar">కరెన�</language>
-			<language type="kaw">కావి</language>
-			<language type="kbd">కబార�డియన�</language>
-			<language type="kcg">ట�యాప�</language>
-			<language type="kfo">కోరో</language>
-			<language type="kg">కాంగో</language>
-			<language type="kha">ఖాసి</language>
-			<language type="khi">ఖోఇసన� భాష</language>
-			<language type="kho">ఖటోనీస�</language>
-			<language type="ki">కిక�య�</language>
-			<language type="kj">క�వాన�యామ</language>
-			<language type="kk">కాజాక�</language>
-			<language type="kl">కలాల�లిసూట�</language>
-			<language type="km">ఖమ�ర�</language>
-			<language type="kmb">కిమ�బ�ండ�</language>
-			<language type="kn">కన�నడ</language>
-			<language type="ko">కొరియన�</language>
-			<language type="kok">కొంకణి</language>
-			<language type="kos">కోస�రేయన�</language>
-			<language type="kpe">పెల�లే</language>
-			<language type="kr">కాన�రి</language>
-			<language type="krc">కరచే-బల�కార�</language>
-			<language type="krl">కరేలియన�</language>
-			<language type="kro">కృ</language>
-			<language type="kru">కూర�ఖ�</language>
-			<language type="ks">కాశ�మీరి</language>
-			<language type="ku">కర�డిష�</language>
-			<language type="kum">క�మ�యిక�</language>
-			<language type="kut">క�టేనై</language>
-			<language type="kv">కోమి</language>
-			<language type="kw">కోర�నిష�</language>
-			<language type="ky">కిర�గిజ�</language>
-			<language type="la">లాటిన�</language>
-			<language type="lad">లాడినో</language>
-			<language type="lah">లాహండా</language>
-			<language type="lam">లాంబా</language>
-			<language type="lb">ల�క�సంబర�గిష�</language>
-			<language type="lez">లేజ�ఘియన�</language>
-			<language type="lg">గాండా</language>
-			<language type="li">లిమ�బర�గిష�</language>
-			<language type="ln">లింగాల</language>
-			<language type="lo">లాఓ</language>
-			<language type="lol">మొంగో</language>
-			<language type="loz">లోజి</language>
-			<language type="lt">లిథ�యేనియన�</language>
-			<language type="lu">లూబ-కటాంగ</language>
-			<language type="lua">లూబా- ల�ల�యా</language>
-			<language type="lui">ల�ఇసేనో</language>
-			<language type="lun">ల�ండా</language>
-			<language type="luo">ల�వో</language>
-			<language type="lus">ల�షై</language>
-			<language type="lv">లాట�వియన�</language>
-			<language type="mad">మాద�రీస�</language>
-			<language type="mag">మగాహి</language>
-			<language type="mai">మైథిలి</language>
-			<language type="mak">మకాసార�</language>
-			<language type="man">మండింగో</language>
-			<language type="map">ఆస�ట�రోనిశియన�</language>
-			<language type="mas">మాసాయి</language>
-			<language type="mdf">మొక�షా</language>
-			<language type="mdr">మండార�</language>
-			<language type="men">మెండే</language>
-			<language type="mg">మాలాగసి</language>
-			<language type="mga">మధ�యమ �రిష�</language>
-			<language type="mh">మార�షలీస�</language>
-			<language type="mi">మయోరి</language>
-			<language type="mic">మికమాక�</language>
-			<language type="min">మినాంగ�కాబో</language>
-			<language type="mis">మిశ�రమ భాష</language>
-			<language type="mk">మసడోనియన�</language>
-			<language type="mkh">మోన�-ఖ�మేర� భాష</language>
-			<language type="ml">మలయాళం</language>
-			<language type="mn">మంగోలియన�</language>
-			<language type="mnc">మంచ�</language>
-			<language type="mni">మణిపూరి</language>
-			<language type="mno">మనోబో భాష</language>
-			<language type="mo">మొల�డావియన�</language>
-			<language type="moh">మోహ�క�</language>
-			<language type="mos">మోస�సి</language>
-			<language type="mr">మరాటి</language>
-			<language type="ms">మలేయ�</language>
-			<language type="mt">మాల�టీస�</language>
-			<language type="mul">బహ�ళ భాషల�</language>
-			<language type="mun">మ�ండ భాష</language>
-			<language type="mus">క�రీక�</language>
-			<language type="mwl">మిరాండిస�</language>
-			<language type="mwr">మార�వాడి</language>
-			<language type="my">బర�మీస�</language>
-			<language type="myn">మాయన� భాష</language>
-			<language type="myv">ఎర�జియా</language>
-			<language type="na">నౌర�</language>
-			<language type="nah">నాహ�అటిల�</language>
-			<language type="nai">ఉత�తర అమెరికా ఇండియన� భాష</language>
-			<language type="nap">నియాపోలిటన�</language>
-			<language type="nb">నార�వీజియన� బొక�మాల�</language>
-			<language type="nd">ఉత�తర దెబెలె</language>
-			<language type="nds">లో జర�మన�</language>
-			<language type="ne">నేపాలి</language>
-			<language type="new">నెవారి</language>
-			<language type="ng">దోంగా</language>
-			<language type="nia">నియాస�</language>
-			<language type="nic">నైజర�- కోర�దోఫియన� భాష</language>
-			<language type="niu">నియూఇయాన�</language>
-			<language type="nl">డచ�</language>
-			<language type="nn">నార�విజియాన� న�యోర�స�క�</language>
-			<language type="no">నార�విజియాన�</language>
-			<language type="nog">నోగై</language>
-			<language type="non">ప�రాచిన నోర�స�</language>
-			<language type="nqo">న�కో</language>
-			<language type="nr">దక�షిణ దెబెలె</language>
-			<language type="nso">ఉత�తర సోతో</language>
-			<language type="nub">నూబియన� భాష</language>
-			<language type="nv">నవాహో</language>
-			<language type="nwc">సాంప�రదాయ న�య�ఆరి</language>
-			<language type="nym">న�యంవేజి</language>
-			<language type="nyn">న�యాన�కోలె</language>
-			<language type="nyo">నిఓరో</language>
-			<language type="nzi">జీమా</language>
-			<language type="oc">ఆక�సిటాన�</language>
-			<language type="oj">చేవా</language>
-			<language type="om">ఒరోమో</language>
-			<language type="or">ఒరియా</language>
-			<language type="os">ఒసేటిక�</language>
-			<language type="osa">ఒసాజ�</language>
-			<language type="ota">ఒట�టోమన� టర�కిష�</language>
-			<language type="oto">ఒటోమియన� భాష</language>
-			<language type="pa">పంజాబీ</language>
-			<language type="paa">పాప�అన� భాష</language>
-			<language type="pag">పంగా సినాన�</language>
-			<language type="pal">పహ�లావి</language>
-			<language type="pam">పంపగ�న</language>
-			<language type="pap">పపియమేంటో</language>
-			<language type="pau">పాల�ఆన�</language>
-			<language type="peo">ప�రాచీన పర�షియన�</language>
-			<language type="phi">ఫిలిప�పీన� భాష</language>
-			<language type="phn">ఫోనికన�</language>
-			<language type="pi">పాలీ</language>
-			<language type="pl">పోలిష�</language>
-			<language type="pon">పోహ�న�పెయన�</language>
-			<language type="pra">ప�రాక�రిత� భాష</language>
-			<language type="pro">ప�రాచీన ప�రోవెంసాల�</language>
-			<language type="ps">పాష�టో</language>
-			<language type="pt">పోర�చ�గీస�</language>
-			<language type="qu">కెష�యా</language>
-			<language type="raj">రాజస�తాని</language>
-			<language type="rap">రాపన�య�యి</language>
-			<language type="rar">రారోటొంగాన�</language>
-			<language type="rm">ర�హెతో-రోమాన�స�</language>
-			<language type="rn">à°°à°‚à°¡à°¿</language>
-			<language type="ro">రోమానియన�</language>
-			<language type="roa">రోమాన�స� భాష</language>
-			<language type="rom">రోమానీ</language>
-			<language type="root">రూట�</language>
-			<language type="ru">రష�యన�</language>
-			<language type="rup">ఆరోమేనియన�</language>
-			<language type="rw">కిన�యర�వాండా</language>
-			<language type="sa">సంసృతం</language>
-			<language type="sad">సండావి</language>
-			<language type="sah">యాక�ట�</language>
-			<language type="sai">దక�షిణ అమెరికా ఇండియన� భాష</language>
-			<language type="sal">సాలిషాన� భాష</language>
-			<language type="sam">సమారిటన� అరమేక�</language>
-			<language type="sas">ససక�</language>
-			<language type="sat">సంటాలి</language>
-			<language type="sc">సార�డీనియన�</language>
-			<language type="scn">సిసిలియన�</language>
-			<language type="sco">స�కాట�స�</language>
-			<language type="sd">సింధీ</language>
-			<language type="se">ఉత�తర సామి</language>
-			<language type="sel">సేల�కప�</language>
-			<language type="sem">సెమిటిక� భాష</language>
-			<language type="sg">సాంగో</language>
-			<language type="sga">ప�రాచీన �రిష�</language>
-			<language type="sgn">సంజ�ఞ భాష</language>
-			<language type="sh">సేర�బో-క�రొయేషియన�</language>
-			<language type="shn">షాన�</language>
-			<language type="si">సింహాల</language>
-			<language type="sid">సిడామో</language>
-			<language type="sio">షిఒయన� భాష</language>
-			<language type="sit">సైనో- టిబిటన� భాష</language>
-			<language type="sk">స�లోవాక�</language>
-			<language type="sl">స�లోవేనియాన�</language>
-			<language type="sla">స�లావిక� భాష</language>
-			<language type="sm">సమోవన�</language>
-			<language type="sma">దక�షిణ సామి</language>
-			<language type="smi">సామి భాష</language>
-			<language type="smj">ల�లే సామి</language>
-			<language type="smn">ఇనారి సామి</language>
-			<language type="sms">స�కోల�ట� సామి</language>
-			<language type="sn">షోన</language>
-			<language type="snk">సోనింకి</language>
-			<language type="so">సోమాలి</language>
-			<language type="sog">సోగ�డియన�</language>
-			<language type="son">సొంఘై</language>
-			<language type="sq">అల�బేనియన�</language>
-			<language type="sr">సెర�బియన�</language>
-			<language type="srn">స�రానన� టోనగో</language>
-			<language type="srr">సెరేర�</language>
-			<language type="ss">స�వాతి</language>
-			<language type="ssa">నీలో సహారా భాష</language>
-			<language type="st">దక�షిణ సోతో</language>
-			<language type="su">స�డానీస�</language>
-			<language type="suk">స�క�మా</language>
-			<language type="sus">స�స�</language>
-			<language type="sux">స�మేరియాన�</language>
-			<language type="sv">స�వీడిష�</language>
-			<language type="sw">స�వాహిలి</language>
-			<language type="syc">సాంప�రదాయ సిరియాక�</language>
-			<language type="syr">సిరియాక�</language>
-			<language type="ta">తమిళమ�</language>
-			<language type="tai">టై భాష</language>
-			<language type="te">తెల�గ�</language>
-			<language type="tem">టింనే</language>
-			<language type="ter">టెరెనో</language>
-			<language type="tet">టేటం</language>
-			<language type="tg">తాజిక�</language>
-			<language type="th">థాయ�</language>
-			<language type="ti">తిగ�రిన�యా</language>
-			<language type="tig">టీగ�రె</language>
-			<language type="tiv">టివ�</language>
-			<language type="tk">త�ర�కమెన�</language>
-			<language type="tkl">టోకెలావ�</language>
-			<language type="tl">తగలోగ�</language>
-			<language type="tlh">క�లింగన�</language>
-			<language type="tli">లింగిట�</language>
-			<language type="tmh">టామషేక�</language>
-			<language type="tn">సెటస�వానా</language>
-			<language type="to">టోంగా</language>
-			<language type="tog">న�యాసా టోన�గా</language>
-			<language type="tpi">టోక� పిసిన�</language>
-			<language type="tr">టర�కిష�</language>
-			<language type="ts">సోంగా</language>
-			<language type="tsi">శింషీయన�</language>
-			<language type="tt">టాటర�</language>
-			<language type="tum">టంబ�క</language>
-			<language type="tup">ట�పి భాష</language>
-			<language type="tut">ఆల�టియాక� భాష</language>
-			<language type="tvl">ట�వాల�</language>
-			<language type="tw">ట�వి</language>
-			<language type="ty">తహితియన�</language>
-			<language type="tyv">ట�వినియన�</language>
-			<language type="udm">ఉడ�మ�ర�ట�</language>
-			<language type="ug">ఉయ�ఘ�ర�</language>
-			<language type="uga">ఉగారిటిక�</language>
-			<language type="uk">య�క�రేనియాన�</language>
-			<language type="umb">ఉమ�బ�ండ�</language>
-			<language type="und">తెలియని లేదా చెల�లని భాష</language>
-			<language type="ur">ఉర�దూ</language>
-			<language type="uz">ఉజ�బెక�</language>
-			<language type="vai">వాయి</language>
-			<language type="ve">వెండా</language>
-			<language type="vi">వియత�నామీస�</language>
-			<language type="vo">వోలాప�క�</language>
-			<language type="vot">వోటిక�</language>
-			<language type="wa">వాలూన�</language>
-			<language type="wak">వాక�షన� భాష</language>
-			<language type="wal">వాలామో</language>
-			<language type="war">వారే</language>
-			<language type="was">వాషో</language>
-			<language type="wen">సోర�బియన� భాష</language>
-			<language type="wo">వొలాఫ�</language>
-			<language type="xal">కల�మిక�</language>
-			<language type="xh">షోసా</language>
-			<language type="yao">యాఒ</language>
-			<language type="yap">యాపిస�</language>
-			<language type="yi">యిడ�డిష�</language>
-			<language type="yo">యోర�బా</language>
-			<language type="ypk">య�పిక� భాష</language>
-			<language type="za">జ�వాన�</language>
-			<language type="zap">జపోటెక�</language>
-			<language type="zbl">బ�లిసింబల�స�</language>
-			<language type="zen">జెనాగా</language>
-			<language type="zh">చైనీస�</language>
-			<language type="znd">జండే</language>
-			<language type="zu">జూలూ</language>
-			<language type="zun">జ�ని</language>
-			<language type="zxx">ఈ లిపి లేద�</language>
-			<language type="zza">జాజా</language>
-		</languages>
-		<scripts>
-			<script type="Arab">అరబిక�</script>
-			<script type="Armi">ఇంపీరియల� అరామాక�</script>
-			<script type="Armn">అర�మేనియన�</script>
-			<script type="Avst">అవేస�టాన�</script>
-			<script type="Bali">బాలినీస�</script>
-			<script type="Batk">బాటక�</script>
-			<script type="Beng">బెంగాలి</script>
-			<script type="Blis">బ�లిస�సింబల�స�</script>
-			<script type="Bopo">బోపోమోఫో</script>
-			<script type="Brah">బ�రాహ�మి</script>
-			<script type="Brai">బ�రెయిల�</script>
-			<script type="Bugi">బ�య�గినీస�</script>
-			<script type="Buhd">బ�హిడ�</script>
-			<script type="Cakm">చక�మా</script>
-			<script type="Cans">య�నిఫైడ� కెనెడియన� అబొరిజినల� సిలబిక�స�</script>
-			<script type="Cari">కారియన�</script>
-			<script type="Cham">చామ�</script>
-			<script type="Cher">చిరోకి</script>
-			<script type="Cirt">సిర�థ�</script>
-			<script type="Copt">కోప�టిక�</script>
-			<script type="Cprt">సైప�రోట�</script>
-			<script type="Cyrl">సిరిలిక�</script>
-			<script type="Cyrs">ప�రాచీన చర�చ స�లావోనిక� సిరిలిక�</script>
-			<script type="Deva">దేవనాగరి</script>
-			<script type="Dsrt">డేసెరెట�</script>
-			<script type="Egyd">ఇజిప�షియన� డెమోటిక�</script>
-			<script type="Egyh">ఇజిప�షియన� హైరాటిక�</script>
-			<script type="Egyp">ఇజిప�షియన� హైరోగ�లైఫ�స�</script>
-			<script type="Ethi">ఇతియోపిక�</script>
-			<script type="Geok">జార�జియన� ఖట�సూరి</script>
-			<script type="Geor">జార�జియన�</script>
-			<script type="Glag">గ�లాగో లిటిక�</script>
-			<script type="Goth">గోతిక�</script>
-			<script type="Grek">గ�రీక�</script>
-			<script type="Gujr">గ�జరాతీ</script>
-			<script type="Guru">గ�ర�మ�ఖి</script>
-			<script type="Hang">హంగ�ల�</script>
-			<script type="Hani">హాన�</script>
-			<script type="Hano">హన�నూ</script>
-			<script type="Hans">సరళీక�రితమైన హాన�</script>
-			<script type="Hant">సాంప�రదాయ హాన�</script>
-			<script type="Hebr">హీబ�ర�</script>
-			<script type="Hira">హిరాగాన</script>
-			<script type="Hmng">పాహవా హ�మోంగ�</script>
-			<script type="Hrkt">కాటాకాన లేదా హిరాగన</script>
-			<script type="Hung">ప�రాచీన హంగేరియన�</script>
-			<script type="Inds">సింధ�</script>
-			<script type="Ital">ప�రాచిన �టాలిక�</script>
-			<script type="Java">జావనీస�</script>
-			<script type="Jpan">జాపనీస�</script>
-			<script type="Kali">కాయాహ� లి</script>
-			<script type="Kana">కాటాకాన</script>
-			<script type="Khar">ఖరోషథి</script>
-			<script type="Khmr">ఖమ�ర�</script>
-			<script type="Knda">కన�నడ</script>
-			<script type="Kore">కొరియన�</script>
-			<script type="Kthi">కైథి</script>
-			<script type="Lana">లన�నా</script>
-			<script type="Laoo">లాఓ</script>
-			<script type="Latf">ఫ�రాక�టూర� లాటిన�</script>
-			<script type="Latg">గేలిక� లాటిన�</script>
-			<script type="Latn">లాటిన�</script>
-			<script type="Lepc">లేప�చా</script>
-			<script type="Limb">లింబ�</script>
-			<script type="Lina">లినియర� ఎ</script>
-			<script type="Linb">లినియర� బి</script>
-			<script type="Lyci">లిసియన�</script>
-			<script type="Lydi">లిడియన�</script>
-			<script type="Mand">మాన�డియన�</script>
-			<script type="Mani">మానిచేన�</script>
-			<script type="Maya">మాయన� హైరోగ�లైఫ�స�</script>
-			<script type="Mero">మెరోఇటిక�</script>
-			<script type="Mlym">మలయాళం</script>
-			<script type="Mong">మంగోలియన�</script>
-			<script type="Moon">మూన�</script>
-			<script type="Mtei">మీటి మయెక�</script>
-			<script type="Mymr">మయాన�మార�</script>
-			<script type="Nkoo">న�కో</script>
-			<script type="Ogam">ఒఘమ�</script>
-			<script type="Olck">ఓల� చికి</script>
-			<script type="Orkh">ఓర�ఖోన�</script>
-			<script type="Orya">ఒరియా</script>
-			<script type="Osma">ఓసమాన�య</script>
-			<script type="Perm">ప�రాచీన పెర�మిక�</script>
-			<script type="Phag">ఫాగ�స�-పా</script>
-			<script type="Phli">ఇంస�క�రిప�షనాల� పహ�లావి</script>
-			<script type="Phlp">సల�టార� పహ�లావి</script>
-			<script type="Phlv">ప�స�తక పహ�లావి</script>
-			<script type="Phnx">ఫోనిశియన�</script>
-			<script type="Plrd">పోల�లర�డ� ఫోనెటిక�</script>
-			<script type="Prti">ఇంస�క�రిప�షనాల� పార�థియన�</script>
-			<script type="Qaai">వారసత�వం</script>
-			<script type="Rjng">రేజాంగ�</script>
-			<script type="Roro">రోంగో రోంగో</script>
-			<script type="Runr">రూనిక�</script>
-			<script type="Samr">సమారిటన�</script>
-			<script type="Sara">సరాటి</script>
-			<script type="Saur">సౌరాష�ట�ర</script>
-			<script type="Sgnw">సంజ�ఞ లిపి</script>
-			<script type="Shaw">షవియాన�</script>
-			<script type="Sinh">సింహాల</script>
-			<script type="Sund">స�డానీస�</script>
-			<script type="Sylo">స�లోటి నాగ�రి</script>
-			<script type="Syrc">సిరియాక�</script>
-			<script type="Syre">ఎస�ట�రానజీలో సిరియాక�</script>
-			<script type="Syrj">పశ�చిమ సిరియాక�</script>
-			<script type="Syrn">తూర�ప� సిరియాక�</script>
-			<script type="Tagb">టాగ�బానవా</script>
-			<script type="Tale">తై లీ</script>
-			<script type="Talu">క�రొత�త టై ల�ఇ</script>
-			<script type="Taml">తమిళమ�</script>
-			<script type="Tavt">టై వియట�</script>
-			<script type="Telu">తెల�గ�</script>
-			<script type="Teng">టేంగ�వార�</script>
-			<script type="Tfng">టిఫీనాఘ�</script>
-			<script type="Tglg">టగలాగ�</script>
-			<script type="Thaa">థానా</script>
-			<script type="Thai">థాయ�</script>
-			<script type="Tibt">టిబెటన�</script>
-			<script type="Ugar">య�గారిటిక�</script>
-			<script type="Vaii">వాయి</script>
-			<script type="Visp">కనిపించే భాష</script>
-			<script type="Xpeo">ప�రాచీన పర�షియన�</script>
-			<script type="Xsux">స�మేరో- అక�కడియన� క�య�నిఫార�మ�</script>
-			<script type="Yiii">యి</script>
-			<script type="Zmth">గణిత సంకేతలిపి</script>
-			<script type="Zsym">చిహ�నాల�</script>
-			<script type="Zxxx">లిపి లేని</script>
-			<script type="Zyyy">సామాన�య</script>
-			<script type="Zzzz">అజ�ఞాత లేదా చెల�లని లిపి</script>
-		</scripts>
-		<territories>
-			<territory type="001">ప�రపంచం</territory>
-			<territory type="002">ఆఫ�రికా</territory>
-			<territory type="003">ఉత�తర అమెరికా ఖండమ�</territory>
-			<territory type="005">దక�షిణ అమెరికా</territory>
-			<territory type="009">ఒషేనియ</territory>
-			<territory type="011">పడమటి ఆఫ�రికా</territory>
-			<territory type="013">మధ�యమ అమెరికా</territory>
-			<territory type="014">తూర�ప� ఆఫ�రికా</territory>
-			<territory type="015">ఉత�తర ఆఫ�రికా</territory>
-			<territory type="017">మధ�యమ ఆఫ�రికా</territory>
-			<territory type="018">దక�షిణ ఆఫ�రికా</territory>
-			<territory type="019">అమెరికాల�</territory>
-			<territory type="021">ఉత�తర అమెరికా</territory>
-			<territory type="029">కరిబ�బియన�</territory>
-			<territory type="030">తూర�ప� ఆశియా</territory>
-			<territory type="034">దక�షిణ ఆశియా</territory>
-			<territory type="035">నైర�తి ఆశియా</territory>
-			<territory type="039">దక�షిణ �రోపా</territory>
-			<territory type="053">ఆస�ట�రేలియా మరియ� న�యూజిలాండ�</territory>
-			<territory type="054">మెలనేశియ</territory>
-			<territory type="057">మైక�రోనేశియ ప�రాంతం</territory>
-			<territory type="061">పాలినేషియా</territory>
-			<territory type="062">దక�షిణ మధ�యమ ఆశియా</territory>
-			<territory type="142">ఆశియా</territory>
-			<territory type="143">మధ�యమ ఆశియా</territory>
-			<territory type="145">పడమటి ఆశియా</territory>
-			<territory type="150">�రోపా</territory>
-			<territory type="151">తూర�ప� �రోపా</territory>
-			<territory type="154">ఉత�తర �రోపా</territory>
-			<territory type="155">పడమటి �రోపా</territory>
-			<territory type="172">స�వతంత�ర రాష�ట�రాల కామన� వెల�త�</territory>
-			<territory type="200">చెకస�లొవేకియ</territory>
-			<territory type="419">లాటిన� అమెరికా మరియ� కేరబ�బియన�</territory>
-			<territory type="830">చానెల� దీవ�ల�</territory>
-			<territory type="AD">అన�డోరా</territory>
-			<territory type="AE">య�నైటెడ� ఆరబ� ఎమిరేట�స�</territory>
-			<territory type="AF">ఆఫ�ఘానిస�తాన�</territory>
-			<territory type="AG">ఆంటిగ�వా మరియ� బార�బ�డా</territory>
-			<territory type="AI">ఆంగవిల�లా</territory>
-			<territory type="AL">అల�బేనియా</territory>
-			<territory type="AM">ఆర�మేనియా</territory>
-			<territory type="AN">నేదేర�లేండ�స� అంటిల�లిస�</territory>
-			<territory type="AO">అంగోలా</territory>
-			<territory type="AQ">అంటార�కటికా</territory>
-			<territory type="AR">ఆర�జెంటినా</territory>
-			<territory type="AS">అమెరికన� సమోవా</territory>
-			<territory type="AT">ఆస�ట�రియా</territory>
-			<territory type="AU">ఆస�ట�రేలియా</territory>
-			<territory type="AW">అర�బా</territory>
-			<territory type="AX">ఆలేండ� దీవ�ల�</territory>
-			<territory type="AZ">అజర�బైజాన�</territory>
-			<territory type="BA">బాస�నియా మరియ� హీర�జిగోవినా</territory>
-			<territory type="BB">బార�బడోస�</territory>
-			<territory type="BD">బాంగ�లాదేష�</territory>
-			<territory type="BE">బెల�జియం</territory>
-			<territory type="BF">బ�ర�కినా ఫాసో</territory>
-			<territory type="BG">బల�గేరియా</territory>
-			<territory type="BH">బహరేన�</territory>
-			<territory type="BI">బ�ర�ండి</territory>
-			<territory type="BJ">బెనిన�</territory>
-			<territory type="BL">సెంట� బర�తేలెమీ</territory>
-			<territory type="BM">బర�మయ�డా</territory>
-			<territory type="BN">బ�ర�నై</territory>
-			<territory type="BO">బొలీవియా</territory>
-			<territory type="BR">బ�రజిల�</territory>
-			<territory type="BS">బహామాస�</territory>
-			<territory type="BT">భూటాన�</territory>
-			<territory type="BV">బొవెట� దీవి</territory>
-			<territory type="BW">బోట�స�వానా</territory>
-			<territory type="BY">బెలారస�</territory>
-			<territory type="BZ">బెలీజ�</territory>
-			<territory type="CA">కెనడా</territory>
-			<territory type="CC">కోకోస� దీవ�ల�</territory>
-			<territory type="CD">కాంగో- కిన�షాసా</territory>
-			<territory type="CF">మధ�యమ ఆఫ�రికా రిపబ�లిక�</territory>
-			<territory type="CG">కాంగో- బ�రాజావిల�లి</territory>
-			<territory type="CH">స�విట�జర�లేండ�</territory>
-			<territory type="CI">�వరీ కోస�ట�</territory>
-			<territory type="CK">క�క� దీవ�ల�</territory>
-			<territory type="CL">చిలి</territory>
-			<territory type="CM">కెమరూన�</territory>
-			<territory type="CN">చైనా</territory>
-			<territory type="CO">కొలంబియా</territory>
-			<territory type="CR">కోస�టారికా</territory>
-			<territory type="CS">సర�బియా మరియ� మంటెనీగ�రో</territory>
-			<territory type="CU">క�యూబా</territory>
-			<territory type="CV">కేప� వెర�డే</territory>
-			<territory type="CX">క�రిస�మస� దీవి</territory>
-			<territory type="CY">సైప�రస�</territory>
-			<territory type="CZ">చెక� గణరాజ�యం</territory>
-			<territory type="DE">ఙర�మని</territory>
-			<territory type="DJ">జిబౌటి</territory>
-			<territory type="DK">డెన�మార�క�</territory>
-			<territory type="DM">డోమెనిక</territory>
-			<territory type="DO">డొమినికన� గణ రాజ�యం</territory>
-			<territory type="DZ">అల�జీరియా</territory>
-			<territory type="EC">ఈక�వడోర�</territory>
-			<territory type="EE">ఎస�టోనియా</territory>
-			<territory type="EG">ఈజిప�ట�</territory>
-			<territory type="EH">పడమటి సహారా</territory>
-			<territory type="ER">ఎరిట�రియా</territory>
-			<territory type="ES">స�పేన�</territory>
-			<territory type="ET">ఇథియోపియా</territory>
-			<territory type="FI">ఫిన�లాండ�</territory>
-			<territory type="FJ">ఫిజి</territory>
-			<territory type="FK">ఫాక� లేండ� దీవ�ల�</territory>
-			<territory type="FM">మైక�రోనేశియ</territory>
-			<territory type="FO">ఫారో దీవ�ల�</territory>
-			<territory type="FR">ఫ�రాన�స�‌</territory>
-			<territory type="GA">గేబన�</territory>
-			<territory type="GB">బ�రిటన�</territory>
-			<territory type="GD">గ�రెనెడా</territory>
-			<territory type="GE">జార�జియా</territory>
-			<territory type="GF">ఫ�రెంచ� గియానా</territory>
-			<territory type="GG">గ�వేర�నసే</territory>
-			<territory type="GH">ఘానా</territory>
-			<territory type="GI">జిబ�రాల�టార�</territory>
-			<territory type="GL">గ�రీన�లేండ�</territory>
-			<territory type="GM">గాంబియా</territory>
-			<territory type="GN">గినియా</territory>
-			<territory type="GP">గ�వాడేలోప�</territory>
-			<territory type="GQ">ఎక�వేటోరియాల� గినియా</territory>
-			<territory type="GR">గ�రీస�</territory>
-			<territory type="GS">దక�షిణ జార�జియా మరియ� దక�షిణ సాండ�విచ� దీవ�ల�</territory>
-			<territory type="GT">గ�వాటిమాల</territory>
-			<territory type="GU">గ�వామ�</territory>
-			<territory type="GW">గినియా-బిస�సావ�</territory>
-			<territory type="GY">గయానా</territory>
-			<territory type="HK">చైనా యొక�క హాంగ�కాంగ�</territory>
-			<territory type="HM">హెర�డ� దీవి మరియ� మాక� డోనాల�డ� దీవ�ల�</territory>
-			<territory type="HN">హోండోరాస�</territory>
-			<territory type="HR">క�రోయేషియా</territory>
-			<territory type="HT">హైటి</territory>
-			<territory type="HU">హన�గేరి</territory>
-			<territory type="ID">ఇండోనేషియా</territory>
-			<territory type="IE">�ర� లాండ�</territory>
-			<territory type="IL">ఇస�రాయేల�</territory>
-			<territory type="IM">�ల� ఆఫ� మాన�</territory>
-			<territory type="IN">భారత దేశం</territory>
-			<territory type="IO">బ�రిటిష� భారతీయ ఓషన� ప�రాంతం</territory>
-			<territory type="IQ">ఇరాక�</territory>
-			<territory type="IR">ఇరాన�</territory>
-			<territory type="IS">�స�లాండ�</territory>
-			<territory type="IT">ఇటలి</territory>
-			<territory type="JE">జర�సి</territory>
-			<territory type="JM">జమైకా</territory>
-			<territory type="JO">జార�డాన�</territory>
-			<territory type="JP">జపాన�</territory>
-			<territory type="KE">కెన�యా</territory>
-			<territory type="KG">కిర�జిస�తాన�</territory>
-			<territory type="KH">కంబోడియా</territory>
-			<territory type="KI">కిరిబాటి</territory>
-			<territory type="KM">కొమొరోస�</territory>
-			<territory type="KN">సెంట� కిట�ట�స� మరియ� నెవిస�</territory>
-			<territory type="KP">ఉత�తర కొరియా</territory>
-			<territory type="KR">దక�షిణ కొరియా</territory>
-			<territory type="KW">క�వైట�</territory>
-			<territory type="KY">కేమాన� దీవ�ల�</territory>
-			<territory type="KZ">కజాఖస�తాన�</territory>
-			<territory type="LA">లావోస�</territory>
-			<territory type="LB">లెబనాన�</territory>
-			<territory type="LC">సెంట� లూసియా</territory>
-			<territory type="LI">లిక�టెస�టేన�</territory>
-			<territory type="LK">శ�రీలంక</territory>
-			<territory type="LR">లైబీరియా</territory>
-			<territory type="LS">లెసోతో</territory>
-			<territory type="LT">లిథ�యేనియా</territory>
-			<territory type="LU">లక�సంబర�గ�</territory>
-			<territory type="LV">లాట�వియ</territory>
-			<territory type="LY">లిబియా</territory>
-			<territory type="MA">మొరాక�కో</territory>
-			<territory type="MC">మొనాకో</territory>
-			<territory type="MD">మోల� డోవ</territory>
-			<territory type="ME">మోంటేనేగ�రో</territory>
-			<territory type="MF">సెంట� మార�టిన�</territory>
-			<territory type="MG">మాడ�గాస�కార�</territory>
-			<territory type="MH">మార�షల� దీవ�ల�</territory>
-			<territory type="MK">మేసెడోనియా</territory>
-			<territory type="ML">మాలి</territory>
-			<territory type="MM">మ�యాన�మార�</territory>
-			<territory type="MN">మంగోలియా</territory>
-			<territory type="MO">మాకావ� SAR చైనా</territory>
-			<territory type="MP">ఉత�తర మరియానా దీవ�ల�</territory>
-			<territory type="MQ">మార�టినిక�</territory>
-			<territory type="MR">మౌరిటేనియా</territory>
-			<territory type="MS">మోంట�సేర�రాట�</territory>
-			<territory type="MT">మాల�టా</territory>
-			<territory type="MU">మారిషస�</territory>
-			<territory type="MV">మాల�దీవ�ల�</territory>
-			<territory type="MW">మాలావి</territory>
-			<territory type="MX">మెక�సికో</territory>
-			<territory type="MY">మలేషియా</territory>
-			<territory type="MZ">మొజాంబిక�</territory>
-			<territory type="NA">నమీబియా</territory>
-			<territory type="NC">క�రొత�త కాలెడోనియా</territory>
-			<territory type="NE">నైజర�</territory>
-			<territory type="NF">నార�ఫాక� దీవి</territory>
-			<territory type="NG">నైజీరియా</territory>
-			<territory type="NI">నికరాగ�వా</territory>
-			<territory type="NL">నేదర�లాండ�స�</territory>
-			<territory type="NO">నారవే</territory>
-			<territory type="NP">నేపాల�</territory>
-			<territory type="NR">నౌర�</territory>
-			<territory type="NU">నియ�</territory>
-			<territory type="NZ">న�య�జిలేండ�</territory>
-			<territory type="OM">ఒమాన�</territory>
-			<territory type="PA">పనామా</territory>
-			<territory type="PE">పెరూ</territory>
-			<territory type="PF">ఫ�రెంచ� పోలినిషియా</territory>
-			<territory type="PG">పాప�వా న�య� గినియా</territory>
-			<territory type="PH">ఫిలి పైన�స�</territory>
-			<territory type="PK">పాకిస�తాన�</territory>
-			<territory type="PL">పోలాండ�</territory>
-			<territory type="PM">సెంట� పియెర� మరియ� మికెలాన�</territory>
-			<territory type="PN">పిట�కెర�న�</territory>
-			<territory type="PR">పోటోరికో</territory>
-			<territory type="PS">పాలిస�తినియాన� ప�రాంతం</territory>
-			<territory type="PT">పోర�చ�గల�</territory>
-			<territory type="PW">పలావ�</territory>
-			<territory type="PY">పెరగ�వే</territory>
-			<territory type="QA">కతర�</territory>
-			<territory type="QO">ఒషేనియా బయట�న�నవి</territory>
-			<territory type="QU">య�రోపియన� య�నియన�</territory>
-			<territory type="RE">రియూనియన�</territory>
-			<territory type="RO">రోమానియా</territory>
-			<territory type="RS">సెర�బియా</territory>
-			<territory type="RU">రష�య</territory>
-			<territory type="RW">ర�వాండా</territory>
-			<territory type="SA">సౌదీ అరేబియా</territory>
-			<territory type="SB">సోలోమన� దీవ�ల�</territory>
-			<territory type="SC">సీషెల�స�</territory>
-			<territory type="SD">స�డాన�</territory>
-			<territory type="SE">స�వీడన�</territory>
-			<territory type="SG">సింగపూర�</territory>
-			<territory type="SH">సెంట� హెలినా</territory>
-			<territory type="SI">స�లోవేనియా</territory>
-			<territory type="SJ">స�వాల�బార�డ� మరియ� యాన� మాయేన�</territory>
-			<territory type="SK">స�లోవేకియా</territory>
-			<territory type="SL">సియెర�రా లియాన�</territory>
-			<territory type="SM">సాన� మారినో</territory>
-			<territory type="SN">సెనెగల�</territory>
-			<territory type="SO">సోమాలియా</territory>
-			<territory type="SR">స�రినామ�</territory>
-			<territory type="ST">సావోటోమ� మరియ� ప�రిన�సిపే</territory>
-			<territory type="SV">ఎల� సాల�వడోర�</territory>
-			<territory type="SY">సిరియా</territory>
-			<territory type="SZ">స�వాజీలేండ�</territory>
-			<territory type="TC">త�ర�క� మరియ� కాలికోస� దీవ�ల�</territory>
-			<territory type="TD">చాద�</territory>
-			<territory type="TF">ఫ�రెంచ� దక�షిణ ప�రాంతాల�</territory>
-			<territory type="TG">టోగో</territory>
-			<territory type="TH">థాయ� లాండ�</territory>
-			<territory type="TJ">టాజీకిస�తాన�</territory>
-			<territory type="TK">టోకేలావ�</territory>
-			<territory type="TL">తూర�ప� టిమోర�</territory>
-			<territory type="TM">త�ర�కమెస�తాన�</territory>
-			<territory type="TN">ట�య�నీషియా</territory>
-			<territory type="TO">టోంగా</territory>
-			<territory type="TR">టర�కీ</territory>
-			<territory type="TT">ట�రినిడేడ� మరియ� టొబాగో</territory>
-			<territory type="TV">ట�వాల�</territory>
-			<territory type="TW">టైవాన�</territory>
-			<territory type="TZ">టాంజానియా</territory>
-			<territory type="UA">య�క�రెన�</territory>
-			<territory type="UG">య�గాండా</territory>
-			<territory type="UM">సంయ�క�త రాజ�య అమెరికా య�నైటెడ� స�టేట�స� మైనర� బయట ఉన�న దీవ�ల�</territory>
-			<territory type="US">సంయ�క�త రాజ�య అమెరికా</territory>
-			<territory type="UY">ఉర�గ�వే</territory>
-			<territory type="UZ">ఉజ�బెకిస�తాన�</territory>
-			<territory type="VA">వేటికెన�</territory>
-			<territory type="VC">సెంట� విన�సెంట� మరియ� గ�రెనడీన�స�</territory>
-			<territory type="VE">వెన�జ�వేలా</territory>
-			<territory type="VG">బ�రిటిష� వర�జిన� దీవ�ల�</territory>
-			<territory type="VI">య�.ఎస�. వర�జిన� దీవ�ల�</territory>
-			<territory type="VN">వియట�నాం</territory>
-			<territory type="VU">వనౌట�</territory>
-			<territory type="WF">వాలిస� మరియ� ఫ�య�త�య�నా</territory>
-			<territory type="WS">సమోవా</territory>
-			<territory type="YE">యెమెన�</territory>
-			<territory type="YT">మాయొట�టి</territory>
-			<territory type="ZA">దక�షిణ ఆఫ�రికా రాజ�యం</territory>
-			<territory type="ZM">జాంబియా</territory>
-			<territory type="ZW">జింబాబ�వే</territory>
-			<territory type="ZZ">తెలియని లేదా చెల�లని ప�రాంతం</territory>
-		</territories>
-		<variants>
-			<variant type="1901">ప�రాచీన ఙర�మన వర�ణక�రమం</variant>
-			<variant type="1996">1996 ఙర�మన వర�ణక�రమం</variant>
-			<variant type="REVISED">సవరించబడిన వర�ణక�రమం</variant>
-		</variants>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[అ-ఋ ౠ ఌ ౡ ఎ-� ఒ-న ప-ళ వ-హ �-ః � ా-ౄ ె-ై ొ-ౌ ౕ ౖ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D ౦-౯ b c e g m q t]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>'</quotationStart>
-		<quotationEnd>'</quotationEnd>
-		<alternateQuotationStart>&quot;</alternateQuotationStart>
-		<alternateQuotationEnd>&quot;</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">జనవరి</month>
-							<month type="2">ఫిబ�రవరి</month>
-							<month type="3">మార�చి</month>
-							<month type="4">�ప�రిల�</month>
-							<month type="5">మే</month>
-							<month type="6">జూన�</month>
-							<month type="7">జూలై</month>
-							<month type="8">ఆగస�ట�</month>
-							<month type="9">సెప�టెంబర�</month>
-							<month type="10">అక�టోబర�</month>
-							<month type="11">నవంబర�</month>
-							<month type="12">డిసెంబర�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">జ</month>
-							<month type="2">à°«à°¿</month>
-							<month type="3">à°®</month>
-							<month type="4">à°Ž</month>
-							<month type="5">మె</month>
-							<month type="6">జ�</month>
-							<month type="7">జ�</month>
-							<month type="8">à°†</month>
-							<month type="9">సె</month>
-							<month type="10">à°…</month>
-							<month type="11">à°¨</month>
-							<month type="12">à°¡à°¿</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ఆది</day>
-							<day type="mon">సోమ</day>
-							<day type="tue">మంగళ</day>
-							<day type="wed">బ�ధ</day>
-							<day type="thu">గ�ర�</day>
-							<day type="fri">శ�క�ర</day>
-							<day type="sat">శని</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ఆదివారం</day>
-							<day type="mon">సోమవారం</day>
-							<day type="tue">మంగళవారం</day>
-							<day type="wed">బ�ధవారం</day>
-							<day type="thu">గ�ర�వారం</day>
-							<day type="fri">శ�క�రవారం</day>
-							<day type="sat">శనివారం</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">à°†</day>
-							<day type="mon">సో</day>
-							<day type="tue">à°®</day>
-							<day type="wed">భ�</day>
-							<day type="thu">గ�</day>
-							<day type="fri">శ�</day>
-							<day type="sat">à°¶</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">à°’à°•à°Ÿà°¿ 1</quarter>
-							<quarter type="2">రెండ� 2</quarter>
-							<quarter type="3">మూడ� 3</quarter>
-							<quarter type="4">నాల�గ� 4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>am</am>
-				<pm>pm</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ఈసాపూర�వ.</era>
-						<era type="1">సన�.</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BCE</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AFN">
-				<displayName>ఆఫ�ఘాన� ఆఫ�ఘాని</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>బ�రజిల� దేశ రియాల�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>చైనా దేశ య�వాన� రెన�‌మిన�‌బి</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>య�రొ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>బ�ిటిష� పౌన�డ స�టెర�లిగ�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>రూపాయి</displayName>
-				<symbol>రూ.</symbol>
-			</currency>
-			<currency type="JPY">
-				<displayName>జపాన� దేశ యెస�</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>రష�య దేశ రూబల�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�క�య రాష�ట�ర అమెరిక డాలర�</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>అవన�</yesstr>
-			<nostr>కాద�</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/te_IN.xml b/airtime_mvc/library/Zend/Locale/Data/te_IN.xml
deleted file mode 100644
index ded6bf954..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/te_IN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.56 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="te"/>
-		<territory type="IN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/telephoneCodeData.xml b/airtime_mvc/library/Zend/Locale/Data/telephoneCodeData.xml
deleted file mode 100644
index c01872d81..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/telephoneCodeData.xml
+++ /dev/null
@@ -1,746 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<supplementalData>
-    <version number="$Revision: 1.3 $"/>
-    <generation date="$Date: 2009/05/05 23:15:57 $"/>
-	<telephoneCodeData>
-		<codesByTerritory territory="001">
-			<telephoneCountryCode code="388"/>
-			<telephoneCountryCode code="800"/>
-			<telephoneCountryCode code="808"/>
-			<telephoneCountryCode code="870"/>
-			<telephoneCountryCode code="871"/>
-			<telephoneCountryCode code="872"/>
-			<telephoneCountryCode code="873"/>
-			<telephoneCountryCode code="874"/>
-			<telephoneCountryCode code="878"/>
-			<telephoneCountryCode code="881"/>
-			<telephoneCountryCode code="882"/>
-			<telephoneCountryCode code="883"/>
-			<telephoneCountryCode code="888"/>
-			<telephoneCountryCode code="979"/>
-			<telephoneCountryCode code="991"/>
-		</codesByTerritory>
-
-		<codesByTerritory territory="AC">
-			<telephoneCountryCode code="247"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AD">
-			<telephoneCountryCode code="376"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AE">
-			<telephoneCountryCode code="971"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AF">
-			<telephoneCountryCode code="93"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AG">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AI">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AL">
-			<telephoneCountryCode code="355"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AM">
-			<telephoneCountryCode code="374"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AN">
-			<telephoneCountryCode code="599"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AO">
-			<telephoneCountryCode code="244"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AQ">
-			<telephoneCountryCode code="672"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AR">
-			<telephoneCountryCode code="54"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AS">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AT">
-			<telephoneCountryCode code="43"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AU">
-			<telephoneCountryCode code="61"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AW">
-			<telephoneCountryCode code="297"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AX">
-			<telephoneCountryCode code="358"/>
-		</codesByTerritory>
-		<codesByTerritory territory="AZ">
-			<telephoneCountryCode code="994"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BA">
-			<telephoneCountryCode code="387"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BB">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BD">
-			<telephoneCountryCode code="880"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BE">
-			<telephoneCountryCode code="32"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BF">
-			<telephoneCountryCode code="226"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BG">
-			<telephoneCountryCode code="359"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BH">
-			<telephoneCountryCode code="973"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BI">
-			<telephoneCountryCode code="257"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BJ">
-			<telephoneCountryCode code="229"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BL">
-			<telephoneCountryCode code="590"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BM">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BN">
-			<telephoneCountryCode code="673"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BO">
-			<telephoneCountryCode code="591"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BR">
-			<telephoneCountryCode code="55"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BS">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BT">
-			<telephoneCountryCode code="975"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BW">
-			<telephoneCountryCode code="267"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BY">
-			<telephoneCountryCode code="375"/>
-		</codesByTerritory>
-		<codesByTerritory territory="BZ">
-			<telephoneCountryCode code="501"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CA">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CC">
-			<telephoneCountryCode code="61"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CD">
-			<telephoneCountryCode code="243"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CF">
-			<telephoneCountryCode code="236"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CG">
-			<telephoneCountryCode code="242"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CH">
-			<telephoneCountryCode code="41"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CI">
-			<telephoneCountryCode code="225"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CK">
-			<telephoneCountryCode code="682"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CL">
-			<telephoneCountryCode code="56"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CM">
-			<telephoneCountryCode code="237"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CN">
-			<telephoneCountryCode code="86"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CO">
-			<telephoneCountryCode code="57"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CR">
-			<telephoneCountryCode code="506"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CU">
-			<telephoneCountryCode code="53"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CV">
-			<telephoneCountryCode code="238"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CX">
-			<telephoneCountryCode code="61"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CY">
-			<telephoneCountryCode code="357"/>
-		</codesByTerritory>
-		<codesByTerritory territory="CZ">
-			<telephoneCountryCode code="420"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DE">
-			<telephoneCountryCode code="49"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DJ">
-			<telephoneCountryCode code="253"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DK">
-			<telephoneCountryCode code="45"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DM">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DO">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="DZ">
-			<telephoneCountryCode code="213"/>
-		</codesByTerritory>
-		<codesByTerritory territory="EC">
-			<telephoneCountryCode code="593"/>
-		</codesByTerritory>
-		<codesByTerritory territory="EE">
-			<telephoneCountryCode code="372"/>
-		</codesByTerritory>
-		<codesByTerritory territory="EG">
-			<telephoneCountryCode code="20"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ER">
-			<telephoneCountryCode code="291"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ES">
-			<telephoneCountryCode code="34"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ET">
-			<telephoneCountryCode code="251"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FI">
-			<telephoneCountryCode code="358"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FJ">
-			<telephoneCountryCode code="679"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FK">
-			<telephoneCountryCode code="500"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FM">
-			<telephoneCountryCode code="691"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FO">
-			<telephoneCountryCode code="298"/>
-		</codesByTerritory>
-		<codesByTerritory territory="FR">
-			<telephoneCountryCode code="33"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GA">
-			<telephoneCountryCode code="241"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GB">
-			<telephoneCountryCode code="44"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GD">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GE">
-			<telephoneCountryCode code="995"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GF">
-			<telephoneCountryCode code="594"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GG">
-			<telephoneCountryCode code="44"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GH">
-			<telephoneCountryCode code="233"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GI">
-			<telephoneCountryCode code="350"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GL">
-			<telephoneCountryCode code="299"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GM">
-			<telephoneCountryCode code="220"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GN">
-			<telephoneCountryCode code="224"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GP">
-			<telephoneCountryCode code="590"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GQ">
-			<telephoneCountryCode code="240"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GR">
-			<telephoneCountryCode code="30"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GT">
-			<telephoneCountryCode code="502"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GU">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GW">
-			<telephoneCountryCode code="245"/>
-		</codesByTerritory>
-		<codesByTerritory territory="GY">
-			<telephoneCountryCode code="592"/>
-		</codesByTerritory>
-		<codesByTerritory territory="HK">
-			<telephoneCountryCode code="852"/>
-		</codesByTerritory>
-		<codesByTerritory territory="HN">
-			<telephoneCountryCode code="504"/>
-		</codesByTerritory>
-		<codesByTerritory territory="HR">
-			<telephoneCountryCode code="385"/>
-		</codesByTerritory>
-		<codesByTerritory territory="HT">
-			<telephoneCountryCode code="509"/>
-		</codesByTerritory>
-		<codesByTerritory territory="HU">
-			<telephoneCountryCode code="36"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ID">
-			<telephoneCountryCode code="62"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IE">
-			<telephoneCountryCode code="353"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IL">
-			<telephoneCountryCode code="972"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IM">
-			<telephoneCountryCode code="44"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IN">
-			<telephoneCountryCode code="91"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IO">
-			<telephoneCountryCode code="246"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IQ">
-			<telephoneCountryCode code="964"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IR">
-			<telephoneCountryCode code="98"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IS">
-			<telephoneCountryCode code="354"/>
-		</codesByTerritory>
-		<codesByTerritory territory="IT">
-			<telephoneCountryCode code="39"/>
-		</codesByTerritory>
-		<codesByTerritory territory="JE">
-			<telephoneCountryCode code="44"/>
-		</codesByTerritory>
-		<codesByTerritory territory="JM">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="JO">
-			<telephoneCountryCode code="962"/>
-		</codesByTerritory>
-		<codesByTerritory territory="JP">
-			<telephoneCountryCode code="81"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KE">
-			<telephoneCountryCode code="254"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KG">
-			<telephoneCountryCode code="996"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KH">
-			<telephoneCountryCode code="855"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KI">
-			<telephoneCountryCode code="686"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KM">
-			<telephoneCountryCode code="269"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KN">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KP">
-			<telephoneCountryCode code="850"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KR">
-			<telephoneCountryCode code="82"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KW">
-			<telephoneCountryCode code="965"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KY">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="KZ">
-			<telephoneCountryCode code="7"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LA">
-			<telephoneCountryCode code="856"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LB">
-			<telephoneCountryCode code="961"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LC">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LI">
-			<telephoneCountryCode code="423"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LK">
-			<telephoneCountryCode code="94"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LR">
-			<telephoneCountryCode code="231"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LS">
-			<telephoneCountryCode code="266"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LT">
-			<telephoneCountryCode code="370"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LU">
-			<telephoneCountryCode code="352"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LV">
-			<telephoneCountryCode code="371"/>
-		</codesByTerritory>
-		<codesByTerritory territory="LY">
-			<telephoneCountryCode code="218"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MA">
-			<telephoneCountryCode code="212"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MC">
-			<telephoneCountryCode code="377"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MD">
-			<telephoneCountryCode code="373"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ME">
-			<telephoneCountryCode code="382"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MG">
-			<telephoneCountryCode code="261"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MH">
-			<telephoneCountryCode code="692"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MK">
-			<telephoneCountryCode code="389"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ML">
-			<telephoneCountryCode code="223"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MM">
-			<telephoneCountryCode code="95"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MN">
-			<telephoneCountryCode code="976"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MO">
-			<telephoneCountryCode code="853"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MP">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MQ">
-			<telephoneCountryCode code="596"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MR">
-			<telephoneCountryCode code="222"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MS">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MT">
-			<telephoneCountryCode code="356"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MU">
-			<telephoneCountryCode code="230"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MV">
-			<telephoneCountryCode code="960"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MW">
-			<telephoneCountryCode code="265"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MX">
-			<telephoneCountryCode code="52"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MY">
-			<telephoneCountryCode code="60"/>
-		</codesByTerritory>
-		<codesByTerritory territory="MZ">
-			<telephoneCountryCode code="258"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NA">
-			<telephoneCountryCode code="264"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NC">
-			<telephoneCountryCode code="687"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NE">
-			<telephoneCountryCode code="227"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NF">
-			<telephoneCountryCode code="672"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NG">
-			<telephoneCountryCode code="234"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NI">
-			<telephoneCountryCode code="505"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NL">
-			<telephoneCountryCode code="31"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NO">
-			<telephoneCountryCode code="47"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NP">
-			<telephoneCountryCode code="977"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NR">
-			<telephoneCountryCode code="674"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NU">
-			<telephoneCountryCode code="683"/>
-		</codesByTerritory>
-		<codesByTerritory territory="NZ">
-			<telephoneCountryCode code="64"/>
-		</codesByTerritory>
-		<codesByTerritory territory="OM">
-			<telephoneCountryCode code="968"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PA">
-			<telephoneCountryCode code="507"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PE">
-			<telephoneCountryCode code="51"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PF">
-			<telephoneCountryCode code="689"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PG">
-			<telephoneCountryCode code="675"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PH">
-			<telephoneCountryCode code="63"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PK">
-			<telephoneCountryCode code="92"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PL">
-			<telephoneCountryCode code="48"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PM">
-			<telephoneCountryCode code="508"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PR">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PS">
-			<telephoneCountryCode code="972"/>
-			<telephoneCountryCode code="970"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PT">
-			<telephoneCountryCode code="351"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PW">
-			<telephoneCountryCode code="680"/>
-		</codesByTerritory>
-		<codesByTerritory territory="PY">
-			<telephoneCountryCode code="595"/>
-		</codesByTerritory>
-		<codesByTerritory territory="QA">
-			<telephoneCountryCode code="974"/>
-		</codesByTerritory>
-		<codesByTerritory territory="RE">
-			<telephoneCountryCode code="262"/>
-		</codesByTerritory>
-		<codesByTerritory territory="RO">
-			<telephoneCountryCode code="40"/>
-		</codesByTerritory>
-		<codesByTerritory territory="RS">
-			<telephoneCountryCode code="381"/>
-		</codesByTerritory>
-		<codesByTerritory territory="RU">
-			<telephoneCountryCode code="7"/>
-		</codesByTerritory>
-		<codesByTerritory territory="RW">
-			<telephoneCountryCode code="250"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SA">
-			<telephoneCountryCode code="966"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SB">
-			<telephoneCountryCode code="677"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SC">
-			<telephoneCountryCode code="248"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SD">
-			<telephoneCountryCode code="249"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SE">
-			<telephoneCountryCode code="46"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SG">
-			<telephoneCountryCode code="65"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SH">
-			<telephoneCountryCode code="290"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SI">
-			<telephoneCountryCode code="386"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SJ">
-			<telephoneCountryCode code="47"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SK">
-			<telephoneCountryCode code="421"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SL">
-			<telephoneCountryCode code="232"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SM">
-			<telephoneCountryCode code="378"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SN">
-			<telephoneCountryCode code="221"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SO">
-			<telephoneCountryCode code="252"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SR">
-			<telephoneCountryCode code="597"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ST">
-			<telephoneCountryCode code="239"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SV">
-			<telephoneCountryCode code="503"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SY">
-			<telephoneCountryCode code="963"/>
-		</codesByTerritory>
-		<codesByTerritory territory="SZ">
-			<telephoneCountryCode code="268"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TC">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TD">
-			<telephoneCountryCode code="235"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TF">
-			<telephoneCountryCode code="262"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TG">
-			<telephoneCountryCode code="228"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TH">
-			<telephoneCountryCode code="66"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TJ">
-			<telephoneCountryCode code="992"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TK">
-			<telephoneCountryCode code="690"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TL">
-			<telephoneCountryCode code="670"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TM">
-			<telephoneCountryCode code="993"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TN">
-			<telephoneCountryCode code="216"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TO">
-			<telephoneCountryCode code="676"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TR">
-			<telephoneCountryCode code="90"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TT">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TV">
-			<telephoneCountryCode code="688"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TW">
-			<telephoneCountryCode code="886"/>
-		</codesByTerritory>
-		<codesByTerritory territory="TZ">
-			<telephoneCountryCode code="255"/>
-		</codesByTerritory>
-		<codesByTerritory territory="UA">
-			<telephoneCountryCode code="380"/>
-		</codesByTerritory>
-		<codesByTerritory territory="UG">
-			<telephoneCountryCode code="256"/>
-		</codesByTerritory>
-		<codesByTerritory territory="US">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="UY">
-			<telephoneCountryCode code="598"/>
-		</codesByTerritory>
-		<codesByTerritory territory="UZ">
-			<telephoneCountryCode code="998"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VA">
-			<telephoneCountryCode code="39"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VC">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VE">
-			<telephoneCountryCode code="58"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VG">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VI">
-			<telephoneCountryCode code="1"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VN">
-			<telephoneCountryCode code="84"/>
-		</codesByTerritory>
-		<codesByTerritory territory="VU">
-			<telephoneCountryCode code="678"/>
-		</codesByTerritory>
-		<codesByTerritory territory="WF">
-			<telephoneCountryCode code="681"/>
-		</codesByTerritory>
-		<codesByTerritory territory="WS">
-			<telephoneCountryCode code="685"/>
-		</codesByTerritory>
-		<codesByTerritory territory="YE">
-			<telephoneCountryCode code="967"/>
-		</codesByTerritory>
-		<codesByTerritory territory="YT">
-			<telephoneCountryCode code="262"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ZA">
-			<telephoneCountryCode code="27"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ZM">
-			<telephoneCountryCode code="260"/>
-		</codesByTerritory>
-		<codesByTerritory territory="ZW">
-			<telephoneCountryCode code="263"/>
-		</codesByTerritory>
-	</telephoneCodeData>
-</supplementalData>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tg.xml b/airtime_mvc/library/Zend/Locale/Data/tg.xml
deleted file mode 100644
index 57decc8a8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tg.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="tg"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="be">Белору�ӣ</language>
-			<language type="bg">Булғорӣ</language>
-			<language type="bh">Биҳарӣ</language>
-			<language type="bn">Бенгалӣ</language>
-			<language type="br">Бретонӣ</language>
-			<language type="bs">Бо�ни�гӣ</language>
-			<language type="ca">Каталанӣ</language>
-			<language type="cs">Чехӣ</language>
-			<language type="da">Дани�гӣ</language>
-			<language type="de">�еми�ӣ</language>
-			<language type="el">Юнонӣ</language>
-			<language type="en">�нгли�ӣ</language>
-			<language type="eo">Э�перанто</language>
-			<language type="es">И�панӣ</language>
-			<language type="et">Э�тонӣ</language>
-			<language type="eu">Ба�кӣ</language>
-			<language type="fa">Фор�ӣ</language>
-			<language type="fi">Финнӣ</language>
-			<language type="fil">Филиппинӣ</language>
-			<language type="fo">Фарозӣ</language>
-			<language type="fr">Фарон�авӣ</language>
-			<language type="fy">Фри�ианӣ</language>
-			<language type="ga">Ирландӣ</language>
-			<language type="gd">Шотландӣ-Галикӣ</language>
-			<language type="gl">Гали�ианӣ</language>
-			<language type="gn">Горанӣ</language>
-			<language type="gu">Гуҷаратӣ</language>
-			<language type="he">Яҳудӣ</language>
-			<language type="hi">Ҳиндӣ</language>
-			<language type="hu">Маҷорӣ</language>
-			<language type="ia">Байни забонӣ</language>
-			<language type="id">Индонезӣ</language>
-			<language type="is">И�ландӣ</language>
-			<language type="ja">Ҷопонӣ</language>
-			<language type="jv">Ҷаванизӣ</language>
-			<language type="ka">Гурҷӣ</language>
-			<language type="ky">Қирғизӣ</language>
-			<language type="la">Лотинӣ</language>
-			<language type="lo">Лао�ӣ</language>
-			<language type="lt">Литвонӣ</language>
-			<language type="lv">Латви�гӣ</language>
-			<language type="nl">Ҳолландӣ</language>
-			<language type="no">�орвегӣ</language>
-			<language type="or">Ури�оӣ</language>
-			<language type="pl">Лаҳи�тонӣ</language>
-			<language type="pt">Португалӣ</language>
-			<language type="pt_BR">Португалӣ (Бразили�)</language>
-			<language type="ro">Руминӣ</language>
-			<language type="ru">Ру�ӣ</language>
-			<language type="sv">Шведӣ</language>
-			<language type="ug">Ӯйғурӣ</language>
-			<language type="uk">Украинӣ</language>
-			<language type="ur">Урду</language>
-			<language type="uz">Ӯзбекӣ</language>
-			<language type="yi">Яҳудии �врупои шарқӣ</language>
-			<language type="zh">Чинӣ</language>
-			<language type="zu">Зулу</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�рабӣ</script>
-		</scripts>
-		<territories>
-			<territory type="AF">�фғони�тан</territory>
-			<territory type="TO">Тонга</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а-г ғ д е ё ж-и ӣ й к қ л-у ӯ ф х ҳ ч ҷ ш ъ �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ц щ ы ь]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>«</alternateQuotationStart>
-		<alternateQuotationEnd>„</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Янв</month>
-							<month type="2">Фев</month>
-							<month type="3">Мар</month>
-							<month type="4">�пр</month>
-							<month type="5">Май</month>
-							<month type="6">Июн</month>
-							<month type="7">Июл</month>
-							<month type="8">�вг</month>
-							<month type="9">Сен</month>
-							<month type="10">Окт</month>
-							<month type="11">�о�</month>
-							<month type="12">Дек</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Январ</month>
-							<month type="2">Феврал</month>
-							<month type="3">Март</month>
-							<month type="4">�прел</month>
-							<month type="5">Май</month>
-							<month type="6">Июн</month>
-							<month type="7">Июл</month>
-							<month type="8">�вгу�т</month>
-							<month type="9">Сент�бр</month>
-							<month type="10">Окт�бр</month>
-							<month type="11">�о�бр</month>
-							<month type="12">Декабр</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Яшб</day>
-							<day type="mon">Дшб</day>
-							<day type="tue">Сшб</day>
-							<day type="wed">Чшб</day>
-							<day type="thu">Пшб</day>
-							<day type="fri">Ҷмъ</day>
-							<day type="sat">Шнб</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Якшанбе</day>
-							<day type="mon">Душанбе</day>
-							<day type="tue">Сешанбе</day>
-							<day type="wed">Чоршанбе</day>
-							<day type="thu">Панҷшанбе</day>
-							<day type="fri">Ҷумъа</day>
-							<day type="sat">Шанбе</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<am>пе. чо.</am>
-				<pm>па. чо.</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Пеш аз милод</era>
-						<era type="1">ПаМ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ПеМ</era>
-						<era type="1">ПаМ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="TJS">
-				<displayName>Сомонӣ</displayName>
-				<symbol>�ом</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl.xml
deleted file mode 100644
index 2e7947139..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="tg"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl_TJ.xml b/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl_TJ.xml
deleted file mode 100644
index 4a49f6a45..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tg_Cyrl_TJ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.3 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="tg"/>
-		<script type="Cyrl"/>
-		<territory type="TJ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tg_TJ.xml b/airtime_mvc/library/Zend/Locale/Data/tg_TJ.xml
deleted file mode 100644
index 7a189a02d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tg_TJ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:40 $"/>
-		<language type="tg"/>
-		<territory type="TJ"/>
-	</identity>
-	<alias source="tg_Cyrl_TJ" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/th.xml b/airtime_mvc/library/Zend/Locale/Data/th.xml
deleted file mode 100644
index b7ed49ace..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/th.xml
+++ /dev/null
@@ -1,4437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.136 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="th"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">อะฟาร์</language>
-			<language type="ab">อับคาซ</language>
-			<language type="ace">อาเจะห์</language>
-			<language type="ach">อาโคลิ</language>
-			<language type="ada">อา�ดงมี</language>
-			<language type="ady">อะดืยเ�</language>
-			<language type="ae">อเวสตะ</language>
-			<language type="af">�อฟริ�านส์</language>
-			<language type="afa">ภาษา�อฟโร-เอเชียติ�</language>
-			<language type="afh">�อฟริฮีลี</language>
-			<language type="ain">ไอนุ</language>
-			<language type="ak">อาคัน</language>
-			<language type="akk">อั��าด</language>
-			<language type="ale">อาลิวต์</language>
-			<language type="alg">ภาษาอัล�องเควียน</language>
-			<language type="alt">อัลไตใต้</language>
-			<language type="am">อัมฮารา</language>
-			<language type="an">อารา�อน</language>
-			<language type="ang">อัง�ฤษโบราณ</language>
-			<language type="anp">อังคิ�า</language>
-			<language type="apa">ภาษาอาปาเช่</language>
-			<language type="ar">อาหรับ</language>
-			<language type="arc">อราเมอิ�</language>
-			<language type="arn">อาเราคาเนียน</language>
-			<language type="arp">อาราปาโฮ</language>
-			<language type="art">ภาษาประดิษ�์</language>
-			<language type="arw">อาราวั�</language>
-			<language type="as">อัสสัม</language>
-			<language type="ast">อัสตูเรียส</language>
-			<language type="ath">ภาษาอาทาพาส�าน</language>
-			<language type="aus">ภาษาออสเตรเลีย</language>
-			<language type="av">อาวาร์</language>
-			<language type="awa">อวธี</language>
-			<language type="ay">ไอย์มารา</language>
-			<language type="az">อาเซอร์ไบจาน</language>
-			<language type="ba">บัชคีร์</language>
-			<language type="bad">บันดา</language>
-			<language type="bai">ภาษาบามีเล�์</language>
-			<language type="bal">บาลูชิ</language>
-			<language type="ban">บาหลี</language>
-			<language type="bas">บาสา</language>
-			<language type="bat">ภาษาบอลติ�</language>
-			<language type="be">เบลารุส</language>
-			<language type="bej">เบจา</language>
-			<language type="bem">เบมบา</language>
-			<language type="ber">เบอร์เบอร์</language>
-			<language type="bg">บัล��เรีย</language>
-			<language type="bh">พิหาร</language>
-			<language type="bho">โภชปุรี</language>
-			<language type="bi">บิสลามา</language>
-			<language type="bik">บิ�อล</language>
-			<language type="bin">บินี</language>
-			<language type="bla">สิ�สิ�า</language>
-			<language type="bm">บัมบารา</language>
-			<language type="bn">เบง�าลี</language>
-			<language type="bnt">บันตู</language>
-			<language type="bo">ทิเบต</language>
-			<language type="br">เบรตัน</language>
-			<language type="bra">พัรช</language>
-			<language type="bs">บอสเนีย</language>
-			<language type="btk">บาตั�</language>
-			<language type="bua">บูเรียต</language>
-			<language type="bug">บู�ิส</language>
-			<language type="byn">บลิน</language>
-			<language type="ca">�าตาลัง</language>
-			<language type="cad">คัดโด</language>
-			<language type="cai">ภาษาอเมริ�ันอินเดียน�ลาง</language>
-			<language type="car">คาริบ</language>
-			<language type="cau">ภาษาคอเคเซียน</language>
-			<language type="cch">�อต�ซม</language>
-			<language type="ce">เชเชน</language>
-			<language type="ceb">เซบู</language>
-			<language type="cel">ภาษาเซลติ�</language>
-			<language type="ch">ชามอร์โร</language>
-			<language type="chb">ชิบชา</language>
-			<language type="chg">ชะ�ะไต</language>
-			<language type="chk">ชู�</language>
-			<language type="chm">มารี</language>
-			<language type="chn">ชินุ�จาร์�อน</language>
-			<language type="cho">ช็อ�ทอว์</language>
-			<language type="chp">ชิพิวยัน</language>
-			<language type="chr">เชอโร�ี</language>
-			<language type="chy">เชเยนเน</language>
-			<language type="cmc">ภาษาชามิ�</language>
-			<language type="co">คอร์ซิ�า</language>
-			<language type="cop">คอปติ�</language>
-			<language type="cpe">ครีโอลหรือพิดจิ้นที่มาจา�ภาษาอัง�ฤษ</language>
-			<language type="cpf">ครีโอลหรือพิดจิ้นที่มาจา�ภาษา�รั่งเศส</language>
-			<language type="cpp">ครีโอลหรือพิดจิ้นที่มาจา�ภาษาโปรตุเ�ส</language>
-			<language type="cr">ครี</language>
-			<language type="crh">ตุร�ีไครเมีย</language>
-			<language type="crp">ครีโอลหรือพิดจิ้น</language>
-			<language type="cs">เช็�</language>
-			<language type="csb">คาซูเบียน</language>
-			<language type="cu">เชอร์ชสลาวิ�</language>
-			<language type="cus">ภาษาคูชิทิ�</language>
-			<language type="cv">ชูวัช</language>
-			<language type="cy">เวลส์</language>
-			<language type="da">เดนมาร์�</language>
-			<language type="dak">ดาโ�ทา</language>
-			<language type="dar">ดาร์�ิน</language>
-			<language type="day">ดายั�</language>
-			<language type="de">เยอรมัน</language>
-			<language type="de_AT">เยอรมัน - ออสเตรีย</language>
-			<language type="de_CH">เยอรมันสูง (สวิส)</language>
-			<language type="del">เดลา�วร์</language>
-			<language type="den">สเลวี</language>
-			<language type="dgr">โด�ริบ</language>
-			<language type="din">ดิง�า</language>
-			<language type="doi">โฑครี</language>
-			<language type="dra">ภาษาดราวิเดียน</language>
-			<language type="dsb">ซอร์บส์ตอนล่าง</language>
-			<language type="dua">ดัวลา</language>
-			<language type="dum">ดัตช์�ลาง</language>
-			<language type="dv">ธิเวหิ</language>
-			<language type="dyu">ดิวลา</language>
-			<language type="dz">ซองคา</language>
-			<language type="ee">เอเว</language>
-			<language type="efi">อีฟิ�</language>
-			<language type="egy">อียิปต์โบราณ</language>
-			<language type="eka">อี�าจุ�</language>
-			<language type="el">�รี�</language>
-			<language type="elx">อีลาไมต์</language>
-			<language type="en">อัง�ฤษ</language>
-			<language type="en_AU">อัง�ฤษ - ออสเตรเลีย</language>
-			<language type="en_CA">อัง�ฤษ - �คนาดา</language>
-			<language type="en_GB">อัง�ฤษ - สหราชอาณาจั�ร</language>
-			<language type="en_US">อัง�ฤษ - อเมริ�ัน</language>
-			<language type="enm">อัง�ฤษ�ลาง</language>
-			<language type="eo">เอสเปอรันโต</language>
-			<language type="es">สเปน</language>
-			<language type="es_419">สเปน (ละตินอเมริ�า)</language>
-			<language type="es_ES">สเปน (ไอบีเรีย)</language>
-			<language type="et">เอสโตเนีย</language>
-			<language type="eu">บัสเ�</language>
-			<language type="ewo">อีวันโด</language>
-			<language type="fa">เปอร์เซีย</language>
-			<language type="fan">ฟอง</language>
-			<language type="fat">ฟันติ</language>
-			<language type="ff">ฟูลาฮ์</language>
-			<language type="fi">ฟิน�ลนด์</language>
-			<language type="fil">ฟิลิปปินส์</language>
-			<language type="fiu">ภาษาฟินโน-อู�ริ�</language>
-			<language type="fj">ฟิจิ</language>
-			<language type="fo">�ฟโร</language>
-			<language type="fon">ฟอน</language>
-			<language type="fr">�รั่งเศส</language>
-			<language type="fr_CH">�รั่งเศส (สวิส)</language>
-			<language type="frm">�รั่งเศส�ลาง</language>
-			<language type="fro">�รั่งเศสโบราณ</language>
-			<language type="frr">ฟริเซียนเหนือ</language>
-			<language type="frs">ฟริเซียนตะวันออ�</language>
-			<language type="fur">ฟรูลี</language>
-			<language type="fy">ฟริเซียนตะวันต�</language>
-			<language type="ga">ไอริช</language>
-			<language type="gaa">�า</language>
-			<language type="gay">�าโย</language>
-			<language type="gba">�บายา</language>
-			<language type="gd">ส�อตส์�าลิ�</language>
-			<language type="gem">ภาษาเจอร์เมนิ�</language>
-			<language type="gez">�ีซ</language>
-			<language type="gil">�ิลเบอร์ต</language>
-			<language type="gl">�าลิเซีย</language>
-			<language type="gmh">เยอรมันสูง�ลาง</language>
-			<language type="gn">�วารานี</language>
-			<language type="goh">เยอรมันสูงโบราณ</language>
-			<language type="gon">�อนดิ</language>
-			<language type="gor">�อรอนทาโล</language>
-			<language type="got">โ�ธิ�</language>
-			<language type="grb">เ�รโบ</language>
-			<language type="grc">�รี�โบราณ</language>
-			<language type="gsw">เยอรมันสวิส</language>
-			<language type="gu">คุชราต</language>
-			<language type="gv">มานซ์</language>
-			<language type="gwi">�วิชอิน</language>
-			<language type="ha">เฮาชา</language>
-			<language type="hai">ไฮดา</language>
-			<language type="haw">ฮาวาย</language>
-			<language type="he">ฮิบรู</language>
-			<language type="hi">ฮินดี</language>
-			<language type="hil">ฮีลี�ัยนน</language>
-			<language type="him">หิมาจัล</language>
-			<language type="hit">ฮิตไตต์</language>
-			<language type="hmn">ม้ง</language>
-			<language type="ho">ฮีรีโมตู</language>
-			<language type="hr">โครเอเชีย</language>
-			<language type="hsb">ซอร์บส์ตอนบน</language>
-			<language type="ht">เฮติ</language>
-			<language type="hu">ฮัง�ารี</language>
-			<language type="hup">ฮูปา</language>
-			<language type="hy">อาร์เมเนีย</language>
-			<language type="hz">เฮเรโร</language>
-			<language type="ia">อินเตอร์ลิง�ัว</language>
-			<language type="iba">อิบาน</language>
-			<language type="id">อินโดนีเชีย</language>
-			<language type="ie">อินเตอร์ลิง�ิว</language>
-			<language type="ig">อิ�โบ</language>
-			<language type="ii">เสฉวนยิ</language>
-			<language type="ijo">อิโจ</language>
-			<language type="ik">อีนูเปีย�</language>
-			<language type="ilo">อีโลโ�</language>
-			<language type="inc">ภาษาอินดิ�</language>
-			<language type="ine">ภาษาอินโด-ยุโรป</language>
-			<language type="inh">อิน�ุช</language>
-			<language type="io">อีโด</language>
-			<language type="ira">ภาษาอิหร่าน</language>
-			<language type="iro">ภาษาอีโร�ัวส์</language>
-			<language type="is">ไอซ์�ลนด์</language>
-			<language type="it">อิตาลี</language>
-			<language type="iu">อินุ�ติตุต</language>
-			<language type="ja">�ี่ปุ่น</language>
-			<language type="jbo">โลชบัน</language>
-			<language type="jpr">ยิว-เปอร์เซีย</language>
-			<language type="jrb">ยิว-อาหรับ</language>
-			<language type="jv">ชวา</language>
-			<language type="ka">จอร์เจีย</language>
-			<language type="kaa">�ารา-�าลพา�</language>
-			<language type="kab">�าไบล</language>
-			<language type="kac">�ะฉิ่น</language>
-			<language type="kaj">คจู</language>
-			<language type="kam">คัมบา</language>
-			<language type="kar">�ะเหรี่ยง</language>
-			<language type="kaw">�วี</language>
-			<language type="kbd">คาร์บาเดีย</language>
-			<language type="kcg">ที�ยป</language>
-			<language type="kfo">โคโร</language>
-			<language type="kg">คองโ�</language>
-			<language type="kha">�าสี</language>
-			<language type="khi">ภาษาคอยซาน</language>
-			<language type="kho">โคตัน</language>
-			<language type="ki">�ี�ูยู</language>
-			<language type="kj">�วนยามา</language>
-			<language type="kk">คาซัค</language>
-			<language type="kl">�รีน�ลนด์</language>
-			<language type="km">เขมร</language>
-			<language type="kmb">คิมบุนดู</language>
-			<language type="kn">�ันนาดา</language>
-			<language type="ko">เ�าหลี</language>
-			<language type="kok">�อน�านี</language>
-			<language type="kos">คูสไร</language>
-			<language type="kpe">�า�ปล</language>
-			<language type="kr">คานูรี</language>
-			<language type="krc">คาราไช-บัลคาร์</language>
-			<language type="krl">��รเลียน</language>
-			<language type="kro">ครู</language>
-			<language type="kru">�ุรุข</language>
-			<language type="ks">�ัศมีร์</language>
-			<language type="ku">เคิร์ด</language>
-			<language type="kum">คูมืยค์</language>
-			<language type="kut">คูเทไน</language>
-			<language type="kv">โ�มิ</language>
-			<language type="kw">คอร์นิช</language>
-			<language type="ky">คีร์�ีซ</language>
-			<language type="la">ละติน</language>
-			<language type="lad">ลาดิโน</language>
-			<language type="lah">ลาฮ์นดา</language>
-			<language type="lam">�ลมบา</language>
-			<language type="lb">ลั�เซมเบิร์�</language>
-			<language type="lez">เลซเ�ียน</language>
-			<language type="lg">ยู�ันดา</language>
-			<language type="li">ลิมเบิร์�</language>
-			<language type="ln">ลิง�าลา</language>
-			<language type="lo">ลาว</language>
-			<language type="lol">มองโ�</language>
-			<language type="loz">โลซิ</language>
-			<language type="lt">ลิทัวเนีย</language>
-			<language type="lu">ลูบา-�าตอง�า</language>
-			<language type="lua">ลูบา-ลูลัว</language>
-			<language type="lui">ลุยเซโน</language>
-			<language type="lun">ลันดา</language>
-			<language type="luo">ลัว</language>
-			<language type="lus">ลูไช</language>
-			<language type="lv">ลัตเวีย</language>
-			<language type="mad">มาดูรา</language>
-			<language type="mag">มคหี</language>
-			<language type="mai">ไมถิลี</language>
-			<language type="mak">มา�าซาร์</language>
-			<language type="man">มันดิง�า</language>
-			<language type="map">ออสโตรนีเซียน</language>
-			<language type="mas">มาไซ</language>
-			<language type="mdf">มอคชา</language>
-			<language type="mdr">มานดาร์</language>
-			<language type="men">เมนเด</language>
-			<language type="mg">มาลา�าซี</language>
-			<language type="mga">ไอริช�ลาง</language>
-			<language type="mh">มาร์�ชลลิส</language>
-			<language type="mi">เมารี</language>
-			<language type="mic">มิ��ม�</language>
-			<language type="min">มีนัง�าเบา</language>
-			<language type="mis">ภาษาอื่นๆ</language>
-			<language type="mk">มาซิโดเนีย</language>
-			<language type="mkh">ภาษามอ�-เขมร</language>
-			<language type="ml">มาลายาลัม</language>
-			<language type="mn">มองโ�เลีย</language>
-			<language type="mnc">�มนจู</language>
-			<language type="mni">มณีปุระ</language>
-			<language type="mno">ภาษามาโนโบ</language>
-			<language type="mo">มอลโดวา</language>
-			<language type="moh">โมฮอว์�</language>
-			<language type="mos">โมซี</language>
-			<language type="mr">มรา�ี</language>
-			<language type="ms">มาเลย์</language>
-			<language type="mt">มอลตา</language>
-			<language type="mul">หลายภาษา</language>
-			<language type="mun">ภาษามันดา</language>
-			<language type="mus">ครี�</language>
-			<language type="mwl">มีรันดา</language>
-			<language type="mwr">มารวาฑี</language>
-			<language type="my">พม่า</language>
-			<language type="myn">ภาษามายา</language>
-			<language type="myv">เอียร์ซยา</language>
-			<language type="na">นาอูรู</language>
-			<language type="nah">นาฮัว</language>
-			<language type="nai">ภาษาอินเดียอเมริ�าเหนือ</language>
-			<language type="nap">นาโปลี</language>
-			<language type="nb">นอร์เวย์บุคมอล</language>
-			<language type="nd">เอ็นเดเบเลเหนือ</language>
-			<language type="nds">เยอรมันต่ำ - �ซ�ซอนต่ำ</language>
-			<language type="ne">เนปาล</language>
-			<language type="new">เนวาร์</language>
-			<language type="ng">ดอง�า</language>
-			<language type="nia">นีอัส</language>
-			<language type="nic">ภาษาไนเจอร์-คอร์โดฟาเนียน</language>
-			<language type="niu">นีอู</language>
-			<language type="nl">ดัตช์</language>
-			<language type="nl_BE">เฟลมิช</language>
-			<language type="nn">นอร์เวย์นีนอส�์</language>
-			<language type="no">นอร์เวย์</language>
-			<language type="nog">โนไ�</language>
-			<language type="non">นอร์สโบราณ</language>
-			<language type="nqo">เอ็นโ�</language>
-			<language type="nr">เอ็นเดเบเลใต้</language>
-			<language type="nso">โซโทเหนือ</language>
-			<language type="nub">ภาษานูเบียน</language>
-			<language type="nv">นาวาโฮ</language>
-			<language type="nwc">เนวาร์ดั้งเดิม</language>
-			<language type="ny">เนียนจา</language>
-			<language type="nym">เนียมเวซี</language>
-			<language type="nyn">เนียนโ�เล</language>
-			<language type="nyo">นิโอโร</language>
-			<language type="nzi">นซิมา</language>
-			<language type="oc">อ็อ�ซิตัน</language>
-			<language type="oj">โอจิบวา</language>
-			<language type="om">โอโรโม</language>
-			<language type="or">โอริยา</language>
-			<language type="os">ออสเซเตีย</language>
-			<language type="osa">โอซา�ี</language>
-			<language type="ota">ตุร�ีออตโตมัน</language>
-			<language type="oto">ภาษาโอโตมี</language>
-			<language type="pa">ปั�จาบ</language>
-			<language type="paa">ภาษาปาปัว</language>
-			<language type="pag">ปางาซีนัน</language>
-			<language type="pal">ปะห์ลาวี</language>
-			<language type="pam">ปัมปางา</language>
-			<language type="pap">ปาเปียเมนโต</language>
-			<language type="pau">ปาเลา</language>
-			<language type="peo">เปอร์เซียโบราณ</language>
-			<language type="phi">ภาษาฟิลิปปิน</language>
-			<language type="phn">ฟินิเชีย</language>
-			<language type="pi">บาลี</language>
-			<language type="pl">โป�ลนด์</language>
-			<language type="pon">พอห์นเพ</language>
-			<language type="pra">ภาษาปรา�ฤต</language>
-			<language type="pro">โปรวองซาลโบราณ</language>
-			<language type="ps">พาชตู</language>
-			<language type="pt">โปรตุเ�ส</language>
-			<language type="pt_BR">โปรตุเ�ส - บราซิล</language>
-			<language type="pt_PT">โปรตุเ�ส - ไอบีเรีย</language>
-			<language type="qu">ควิชัว</language>
-			<language type="raj">ราชสถาน</language>
-			<language type="rap">ราปานู</language>
-			<language type="rar">ราโรทอง�า</language>
-			<language type="rm">เรโต-โร�มนซ์</language>
-			<language type="rn">บุรุนดี</language>
-			<language type="ro">โรมาเนีย</language>
-			<language type="roa">ภาษาโรมานซ์</language>
-			<language type="rom">โรมานี</language>
-			<language type="root">รูท</language>
-			<language type="ru">รัสเซีย</language>
-			<language type="rup">อาโรมาเนียน</language>
-			<language type="rw">รวันดา</language>
-			<language type="sa">สันส�ฤต</language>
-			<language type="sad">ซันดาเว</language>
-			<language type="sah">ยาคุต</language>
-			<language type="sai">ภาษาอเมริ�ันอินเดียนใต้</language>
-			<language type="sal">ภาษาชาลิช</language>
-			<language type="sam">อราเมอิ�ซามาเรีย</language>
-			<language type="sas">ซาซั�</language>
-			<language type="sat">สันตาลี</language>
-			<language type="sc">ซาร์เด�า</language>
-			<language type="scn">ซิซิลี</language>
-			<language type="sco">ส�อตส์</language>
-			<language type="sd">สินธุ</language>
-			<language type="se">ซามิเหนือ</language>
-			<language type="sel">เซลคุป</language>
-			<language type="sem">ภาษาเซมิติ�</language>
-			<language type="sg">�ซงโ�</language>
-			<language type="sga">ไอริชโบราณ</language>
-			<language type="sgn">ภาษาสั��าณ</language>
-			<language type="sh">เซอร์โบ-โครเอเชีย</language>
-			<language type="shn">ไทให�่</language>
-			<language type="si">สิงหล</language>
-			<language type="sid">ซิดาโม</language>
-			<language type="sio">ภาษาซิอวน</language>
-			<language type="sit">ภาษาซิโน-ทิเบต</language>
-			<language type="sk">สโลวั�</language>
-			<language type="sl">สโลวีเนีย</language>
-			<language type="sla">ภาษาสลาวิ�</language>
-			<language type="sm">ซามัว</language>
-			<language type="sma">ซามิใต้</language>
-			<language type="smi">ภาษาซามิ</language>
-			<language type="smj">ซามิลูเล</language>
-			<language type="smn">ซามิอีนารี</language>
-			<language type="sms">ซามิสคอลต์</language>
-			<language type="sn">โชนา</language>
-			<language type="snk">โซนีนเ�</language>
-			<language type="so">โซมาลี</language>
-			<language type="sog">ซอ�ดีน</language>
-			<language type="son">ซองไฮ</language>
-			<language type="sq">�อลเบเนีย</language>
-			<language type="sr">เซอร์เบีย</language>
-			<language type="srn">ซูรินาเม</language>
-			<language type="srr">เซ�รร์</language>
-			<language type="ss">สวาติ</language>
-			<language type="ssa">ภาษานิโล-ซาฮารัน</language>
-			<language type="st">โซโทใต้</language>
-			<language type="su">ซุนดา</language>
-			<language type="suk">ซูคูมา</language>
-			<language type="sus">ซูซู</language>
-			<language type="sux">ซูเมอ</language>
-			<language type="sv">สวีเดน</language>
-			<language type="sw">สวาฮีลี</language>
-			<language type="syc">ซีเรีย�บบดั้งเดิม</language>
-			<language type="syr">ซีเรีย</language>
-			<language type="ta">ทมิฬ</language>
-			<language type="tai">ภาษาไท</language>
-			<language type="te">เตลู�ู</language>
-			<language type="tem">ทิมเน</language>
-			<language type="ter">เทเรโน</language>
-			<language type="tet">เตตุม</language>
-			<language type="tg">ทาจิ�</language>
-			<language type="th">ไทย</language>
-			<language type="ti">ติ�ริ��า</language>
-			<language type="tig">ตีเ�ร</language>
-			<language type="tiv">ทิฟ</language>
-			<language type="tk">เติร์�เมนิสถาน</language>
-			<language type="tkl">โตเ�เลา</language>
-			<language type="tl">ตา�าล็อ�</language>
-			<language type="tlh">คลิง�อน</language>
-			<language type="tli">ทลิง�ิต</language>
-			<language type="tmh">ทามาเช�</language>
-			<language type="tn">บอตสวานา</language>
-			<language type="to">ตอง�า</language>
-			<language type="tog">ไนอะซาตอง�า</language>
-			<language type="tpi">ท็อ�พิซิน</language>
-			<language type="tr">ตุร�ี</language>
-			<language type="ts">ซิิตซอง�า</language>
-			<language type="tsi">ซิมชี�อน</language>
-			<language type="tt">ตาตาร์</language>
-			<language type="tum">ทุมบู�า</language>
-			<language type="tup">ภาษาตูปี</language>
-			<language type="tut">ภาษาอัลตาอิ�</language>
-			<language type="tvl">ตูวาลู</language>
-			<language type="tw">ทวิ</language>
-			<language type="ty">ตาฮิตี</language>
-			<language type="tyv">ตูวา</language>
-			<language type="udm">อุดมูร์ต</language>
-			<language type="ug">อุย�ัว</language>
-			<language type="uga">ยู�าริต</language>
-			<language type="uk">ยูเครน</language>
-			<language type="umb">อุมบุนดู</language>
-			<language type="und">ไม่มีข้อมูล</language>
-			<language type="ur">อูรดู</language>
-			<language type="uz">อุซเบ�</language>
-			<language type="vai">ไว</language>
-			<language type="ve">เวนดา</language>
-			<language type="vi">เวียดนาม</language>
-			<language type="vo">โวลาพึค</language>
-			<language type="vot">โวทิ�</language>
-			<language type="wa">วาโลนี</language>
-			<language type="wak">ภาษาวา�าชาน</language>
-			<language type="wal">วาลาโม</language>
-			<language type="war">วาเรย์</language>
-			<language type="was">วาโช</language>
-			<language type="wen">ภาษาซอร์บส์</language>
-			<language type="wo">โวลอฟ</language>
-			<language type="xal">คัลมืยค์</language>
-			<language type="xh">คะห์โอซา</language>
-			<language type="yao">เย้า</language>
-			<language type="yap">ยัป</language>
-			<language type="yi">ยิว</language>
-			<language type="yo">โยรูบา</language>
-			<language type="ypk">ภาษาอูย์ปิค</language>
-			<language type="za">จ้วง</language>
-			<language type="zap">ซาโปเต�</language>
-			<language type="zbl">บลิสซิมโบลส์</language>
-			<language type="zen">เซนา�า</language>
-			<language type="zh">จีน</language>
-			<language type="zh_Hans">จีนประยุ�ต์</language>
-			<language type="zh_Hant">จีนดั้งเดิม</language>
-			<language type="znd">ซันเด</language>
-			<language type="zu">ซูลู</language>
-			<language type="zun">ซูนิ</language>
-			<language type="zxx">ไม่มีข้อมูลภาษา</language>
-			<language type="zza">ซาซา</language>
-		</languages>
-		<scripts>
-			<script type="Arab">อาหรับ</script>
-			<script type="Armi">อิมพีเรียล อราเมอิ�</script>
-			<script type="Armn">อาร์เมเนีย</script>
-			<script type="Avst">อเวสตะ</script>
-			<script type="Bali">บาหลี</script>
-			<script type="Batk">บาตั�</script>
-			<script type="Beng">เบง�าลี</script>
-			<script type="Blis">บลิสซิมโบลส์</script>
-			<script type="Bopo">ปอพอมอฟอ</script>
-			<script type="Brah">พราหมี</script>
-			<script type="Brai">เบรลล์</script>
-			<script type="Bugi">บู�ิส</script>
-			<script type="Buhd">บูฮิด</script>
-			<script type="Cakm">ชา�มา</script>
-			<script type="Cans">สั�ลั�ษณ์ชนเผ่าพื้นเมือง�คนาดา</script>
-			<script type="Cari">คาเรีย</script>
-			<script type="Cham">จาม</script>
-			<script type="Cher">เชอโร�ี</script>
-			<script type="Cirt">เซิร์ท</script>
-			<script type="Copt">คอปติ�</script>
-			<script type="Cprt">ไซเปรียท</script>
-			<script type="Cyrl">ซีริลลิ�</script>
-			<script type="Cyrs">เชอร์ชสลาโวนิ�ซีริลลิ�โบราณ</script>
-			<script type="Deva">เทวนาครี</script>
-			<script type="Dsrt">เดเซเรท</script>
-			<script type="Egyd">ดีโมติ�อียิปต์</script>
-			<script type="Egyh">เฮียราติ�อียิปต์</script>
-			<script type="Egyp">เฮียโร�ลิฟส์อียิปต์</script>
-			<script type="Ethi">เอทิโอปิ�</script>
-			<script type="Geok">คัตซูรีจอร์เจีย</script>
-			<script type="Geor">จอร์เจีย</script>
-			<script type="Glag">�ลาโ�ลิติ�</script>
-			<script type="Goth">โ�ธิ�</script>
-			<script type="Grek">�รี�</script>
-			<script type="Gujr">คุชราต</script>
-			<script type="Guru">�ูร์มูคี</script>
-			<script type="Hang">ฮัน�ูล</script>
-			<script type="Hani">ฮั่น</script>
-			<script type="Hano">ฮานูโนโอ</script>
-			<script type="Hans">ฮั่นประยุ�ต์</script>
-			<script type="Hant">ฮั่นดั้งเดิม</script>
-			<script type="Hebr">ฮีบรู</script>
-			<script type="Hira">ฮิระงะนะ</script>
-			<script type="Hmng">ปาเฮาห์ม้ง</script>
-			<script type="Hrkt">คะตะ�ะนะหรือฮิระงะนะ</script>
-			<script type="Hung">ฮัง�ารีโบราณ</script>
-			<script type="Inds">อินดัส</script>
-			<script type="Ital">อิตาลีโบราณ</script>
-			<script type="Java">ชวา</script>
-			<script type="Jpan">�ี่ปุ่น</script>
-			<script type="Kali">คยาห์</script>
-			<script type="Kana">คะตะ�ะนะ</script>
-			<script type="Khar">ขโรษ�ี</script>
-			<script type="Khmr">เขมร</script>
-			<script type="Knda">�ันนาดา</script>
-			<script type="Kore">เ�าหลี</script>
-			<script type="Kthi">�ายติ</script>
-			<script type="Lana">ล้านนา</script>
-			<script type="Laoo">ลาว</script>
-			<script type="Latf">ลาติน - ฟรังเตอร์</script>
-			<script type="Latg">ลาติน - ��ลิ�</script>
-			<script type="Latn">ลาติน</script>
-			<script type="Lepc">เลปชา</script>
-			<script type="Limb">ลิมบู</script>
-			<script type="Lina">ลีเนียร์เอ</script>
-			<script type="Linb">ลีเนียร์บี</script>
-			<script type="Lyci">ไลเซีย</script>
-			<script type="Lydi">ลีเดีย</script>
-			<script type="Mand">�มนเดียน</script>
-			<script type="Mani">มานิ�ชน</script>
-			<script type="Maya">มายาไฮโร�ลิฟส์</script>
-			<script type="Mero">เมโรติ�</script>
-			<script type="Mlym">มาลายาลัม</script>
-			<script type="Mong">มองโ�เลีย</script>
-			<script type="Moon">มูน</script>
-			<script type="Mtei">เมเทมาเย�</script>
-			<script type="Mymr">พม่า</script>
-			<script type="Nkoo">เอ็นโ�</script>
-			<script type="Ogam">โอคัม</script>
-			<script type="Olck">โอลชิ�ิ</script>
-			<script type="Orkh">ออร์คอน</script>
-			<script type="Orya">โอริยา</script>
-			<script type="Osma">ออสมันยา</script>
-			<script type="Perm">เปอร์มิ�โบราณ</script>
-			<script type="Phag">ฟา�ส์-ปา</script>
-			<script type="Phli">ปะห์ลาวีอินสคริปชัน�นล</script>
-			<script type="Phlp">ปะห์ลาวีซอลเตอร์</script>
-			<script type="Phlv">ปะห์ลาวีบุ๊�</script>
-			<script type="Phnx">ฟินิเชีย</script>
-			<script type="Plrd">สัทศาสตร์พอลลาร์ด</script>
-			<script type="Prti">พาร์เทียอินสคริปชัน�นล</script>
-			<script type="Qaai">อินเฮอริต</script>
-			<script type="Rjng">เรจัง</script>
-			<script type="Roro">รองโ�รองโ�</script>
-			<script type="Runr">รูนิ�</script>
-			<script type="Samr">ซามาเรีย</script>
-			<script type="Sara">ซาราติ</script>
-			<script type="Saur">โสวรัสตระ</script>
-			<script type="Sgnw">ไซน์ไรติ้ง</script>
-			<script type="Shaw">ซอเวียน</script>
-			<script type="Sinh">สิงหล</script>
-			<script type="Sund">ซุนดา</script>
-			<script type="Sylo">ซิโลตินา�รี</script>
-			<script type="Syrc">ซีเรีย</script>
-			<script type="Syre">ซีเรียเอสทรานจีโล</script>
-			<script type="Syrj">ซีเรียตะวันต�</script>
-			<script type="Syrn">ซีเรียตะวันออ�</script>
-			<script type="Tagb">ตั�บันวา</script>
-			<script type="Tale">ไทเล</script>
-			<script type="Talu">ไทลื้อใหม่</script>
-			<script type="Taml">ทมิฬ</script>
-			<script type="Tavt">ไทเวียต</script>
-			<script type="Telu">เทลู�ู</script>
-			<script type="Teng">เทง�วาร์</script>
-			<script type="Tfng">ทิฟินา�</script>
-			<script type="Tglg">ตา�าล็อ�</script>
-			<script type="Thaa">ทานา</script>
-			<script type="Thai">ไทย</script>
-			<script type="Tibt">ทิเบต</script>
-			<script type="Ugar">ยู�าริต</script>
-			<script type="Vaii">ไว</script>
-			<script type="Visp">คำพูดที่มองเห็นได้</script>
-			<script type="Xpeo">เปอร์เซียโบราณ</script>
-			<script type="Xsux">อั�ษรรูปลิ่มสุเมเรีย-อัคคาเดีย</script>
-			<script type="Yiii">ยิ</script>
-			<script type="Zmth">เครื่องหมายทางคณิตศาสตร์</script>
-			<script type="Zsym">ซิมโบลส์</script>
-			<script type="Zxxx">ไม่มีภาษาเขียน</script>
-			<script type="Zyyy">สามั�</script>
-			<script type="Zzzz">ไม่ทราบภาษา</script>
-		</scripts>
-		<territories>
-			<territory type="001">โล�</territory>
-			<territory type="002">�อฟริ�า</territory>
-			<territory type="003">อเมริ�าเหนือ</territory>
-			<territory type="005">อเมริ�าใต้</territory>
-			<territory type="009">โอเชียเนีย</territory>
-			<territory type="011">�อฟริ�าตะวันต�</territory>
-			<territory type="013">อเมริ�า�ลาง</territory>
-			<territory type="014">�อฟริ�าตะวันออ�</territory>
-			<territory type="015">�อฟริ�าเหนือ</territory>
-			<territory type="017">�อฟริ�า�ลาง</territory>
-			<territory type="018">�อฟริ�าใต้ [018]</territory>
-			<territory type="019">อเมริ�า</territory>
-			<territory type="021">อเมริ�าตอนเหนือ</territory>
-			<territory type="029">�คริบเบียน</territory>
-			<territory type="030">เอเชียตะวันออ�</territory>
-			<territory type="034">เอเชียใต้</territory>
-			<territory type="035">เอเชียตะวันออ�เฉียงใต้</territory>
-			<territory type="039">ยุโรปใต้</territory>
-			<territory type="053">ออสเตรเลีย�ละนิวซี�ลนด์</territory>
-			<territory type="054">เมลานีเซีย</territory>
-			<territory type="057">เขตไมโครนีเซีย</territory>
-			<territory type="061">โปลินีเซีย</territory>
-			<territory type="062">เอเชีย�ลางตอนใต้</territory>
-			<territory type="142">เอเชีย</territory>
-			<territory type="143">เอเชีย�ลาง</territory>
-			<territory type="145">เอเชียตะวันต�</territory>
-			<territory type="150">ยุโรป</territory>
-			<territory type="151">ยุโรปตะวันออ�</territory>
-			<territory type="154">ยุโรปเหนือ</territory>
-			<territory type="155">ยุโรปตะวันต�</territory>
-			<territory type="172">เครือรั�อิสระ</territory>
-			<territory type="419">ละตินอเมริ�า�ละ�คริบเบียน</territory>
-			<territory type="830">หมู่เ�าะ�ชนเนล</territory>
-			<territory type="AD">อันดอร์รา</territory>
-			<territory type="AE">สหรั�อาหรับเอมิเรตส์</territory>
-			<territory type="AF">อัฟ�านิสถาน</territory>
-			<territory type="AG">�อนติ�า�ละบาร์บูดา</territory>
-			<territory type="AI">�อง�วิลลา</territory>
-			<territory type="AL">�อลเบเนีย</territory>
-			<territory type="AM">อาร์เมเนีย</territory>
-			<territory type="AN">เนเธอร์�ลนด์�อนทิลลิส</territory>
-			<territory type="AO">�องโ�ลา</territory>
-			<territory type="AQ">�อนตาร์�ติ�า</territory>
-			<territory type="AR">อาร์เจนตินา</territory>
-			<territory type="AS">อเมริ�ันซามัว</territory>
-			<territory type="AT">ออสเตรีย</territory>
-			<territory type="AU">ออสเตรเลีย</territory>
-			<territory type="AW">อารูบา</territory>
-			<territory type="AX">หมู่เ�าะโอลันด์</territory>
-			<territory type="AZ">อาเซอร์ไบจาน</territory>
-			<territory type="BA">บอสเนีย�ละเฮอร์เซโ�วีนา</territory>
-			<territory type="BB">บาร์เบโดส</territory>
-			<territory type="BD">บัง�ลาเทศ</territory>
-			<territory type="BE">เบลเยียม</territory>
-			<territory type="BF">บูร์�ินาฟาโซ</territory>
-			<territory type="BG">บัล��เรีย</territory>
-			<territory type="BH">บาห์เรน</territory>
-			<territory type="BI">บุรุนดี</territory>
-			<territory type="BJ">เบนิน</territory>
-			<territory type="BL">เซนต์บาร์เธเลมี</territory>
-			<territory type="BM">เบอร์มิวดา</territory>
-			<territory type="BN">บรูไน</territory>
-			<territory type="BO">โบลิเวีย</territory>
-			<territory type="BR">บราซิล</territory>
-			<territory type="BS">บาฮามาส</territory>
-			<territory type="BT">ภู�าน</territory>
-			<territory type="BV">เ�าะบูเวต</territory>
-			<territory type="BW">บอตสวานา</territory>
-			<territory type="BY">เบลารุส</territory>
-			<territory type="BZ">เบลีซ</territory>
-			<territory type="CA">�คนาดา</territory>
-			<territory type="CC">หมู่เ�าะโคโคส</territory>
-			<territory type="CD">คองโ�-�ินชาซา</territory>
-			<territory type="CF">สาธารณรั��อฟริ�า�ลาง</territory>
-			<territory type="CG">คองโ�-บราซซาวิล</territory>
-			<territory type="CH">สวิตเซอร์�ลนด์</territory>
-			<territory type="CI">ไอวอรี่โคสต์</territory>
-			<territory type="CK">หมู่เ�าะคุ�</territory>
-			<territory type="CL">ชิลี</territory>
-			<territory type="CM">�คเมอรูน</territory>
-			<territory type="CN">จีน</territory>
-			<territory type="CO">โคลอมเบีย</territory>
-			<territory type="CR">คอสตาริ�า</territory>
-			<territory type="CS">เซอร์เบีย�ละมอนเตเนโ�ร</territory>
-			<territory type="CU">คิวบา</territory>
-			<territory type="CV">เคปเวิร์ด</territory>
-			<territory type="CX">เ�าะคริสต์มาส</territory>
-			<territory type="CY">ไซปรัส</territory>
-			<territory type="CZ">สาธารณรั�เช็�</territory>
-			<territory type="DE">เยอรมนี</territory>
-			<territory type="DJ">จิบูตี</territory>
-			<territory type="DK">เดนมาร์�</territory>
-			<territory type="DM">โดมินิ�า</territory>
-			<territory type="DO">สาธารณรั�โดมินิ�ัน</territory>
-			<territory type="DZ">�อลจีเรีย</territory>
-			<territory type="EC">เอ�วาดอร์</territory>
-			<territory type="EE">เอสโตเนีย</territory>
-			<territory type="EG">อียิปต์</territory>
-			<territory type="EH">ซาฮาราตะวันต�</territory>
-			<territory type="ER">เอริเทรีย</territory>
-			<territory type="ES">สเปน</territory>
-			<territory type="ET">เอธิโอเปีย</territory>
-			<territory type="FI">ฟิน�ลนด์</territory>
-			<territory type="FJ">ฟิจิ</territory>
-			<territory type="FK">หมู่เ�าะฟอล์��ลนด์</territory>
-			<territory type="FM">ไมโครนีเซีย</territory>
-			<territory type="FO">หมู่เ�าะ�ฟโร</territory>
-			<territory type="FR">�รั่งเศส</territory>
-			<territory type="GA">�าบอง</territory>
-			<territory type="GB">สหราชอาณาจั�ร</territory>
-			<territory type="GD">เ�รเนดา</territory>
-			<territory type="GE">จอร์เจีย</territory>
-			<territory type="GF">เฟรนช์เ�ียนา</territory>
-			<territory type="GG">เ�ิร์นซีย์</territory>
-			<territory type="GH">�านา</territory>
-			<territory type="GI">ยิบรอลตาร์</territory>
-			<territory type="GL">�รีน�ลนด์</territory>
-			<territory type="GM">��มเบีย</territory>
-			<territory type="GN">�ินี</territory>
-			<territory type="GP">�วาเดอลูป</territory>
-			<territory type="GQ">อิเควทอเรียล�ินี</territory>
-			<territory type="GR">�รีซ</territory>
-			<territory type="GS">เ�าะเซาท์จอร์เจีย�ละหมู่เ�าะเซาท์�ซนด์วิช</territory>
-			<territory type="GT">�ัวเตมาลา</territory>
-			<territory type="GU">�วม</territory>
-			<territory type="GW">�ินี-บิสเซา</territory>
-			<territory type="GY">�ายอานา</territory>
-			<territory type="HK">ฮ่อง�ง เขตป�ครองพิเศษประเทศจีน</territory>
-			<territory type="HM">เ�าะเฮิร์ด�ละหมู่เ�าะ�ม�ดอนัลด์</territory>
-			<territory type="HN">ฮอนดูรัส</territory>
-			<territory type="HR">โครเอเชีย</territory>
-			<territory type="HT">เฮติ</territory>
-			<territory type="HU">ฮัง�ารี</territory>
-			<territory type="ID">อินโดนีเซีย</territory>
-			<territory type="IE">ไอร์�ลนด์</territory>
-			<territory type="IL">อิสราเอล</territory>
-			<territory type="IM">เ�าะ�มน</territory>
-			<territory type="IN">อินเดีย</territory>
-			<territory type="IO">บริติชอินเดียนโอเชียนเทร์ริทอรี</territory>
-			<territory type="IQ">อิรั�</territory>
-			<territory type="IR">อิหร่าน</territory>
-			<territory type="IS">ไอซ์�ลนด์</territory>
-			<territory type="IT">อิตาลี</territory>
-			<territory type="JE">เจอร์ซีย์</territory>
-			<territory type="JM">จาเม�า</territory>
-			<territory type="JO">จอร์�ดน</territory>
-			<territory type="JP">�ี่ปุ่น</territory>
-			<territory type="KE">เคนยา</territory>
-			<territory type="KG">คีร์�ีซสถาน</territory>
-			<territory type="KH">�ัมพูชา</territory>
-			<territory type="KI">คิริบาส</territory>
-			<territory type="KM">คอโมโรส</territory>
-			<territory type="KN">เซนต์คิตส์�ละเนวิส</territory>
-			<territory type="KP">เ�าหลีเหนือ</territory>
-			<territory type="KR">เ�าหลีใต้</territory>
-			<territory type="KW">คูเวต</territory>
-			<territory type="KY">หมู่เ�าะเคย์�มน</territory>
-			<territory type="KZ">คาซัคสถาน</territory>
-			<territory type="LA">ลาว</territory>
-			<territory type="LB">เลบานอน</territory>
-			<territory type="LC">เซนต์ลูเซีย</territory>
-			<territory type="LI">ลิ�เตนสไตน์</territory>
-			<territory type="LK">ศรีลัง�า</territory>
-			<territory type="LR">ไลบีเรีย</territory>
-			<territory type="LS">เลโซโท</territory>
-			<territory type="LT">ลิทัวเนีย</territory>
-			<territory type="LU">ลั�เซมเบิร์�</territory>
-			<territory type="LV">ลัตเวีย</territory>
-			<territory type="LY">ลิเบีย</territory>
-			<territory type="MA">โมร็อ�โ�</territory>
-			<territory type="MC">โมนาโ�</territory>
-			<territory type="MD">มอลโดวา</territory>
-			<territory type="ME">มอนเตเนโ�ร</territory>
-			<territory type="MF">เซนต์มาติน</territory>
-			<territory type="MG">มาดา�ัส�าร์</territory>
-			<territory type="MH">หมู่เ�าะมาร์�ชลล์</territory>
-			<territory type="MK">มาซิโดเนีย</territory>
-			<territory type="ML">มาลี</territory>
-			<territory type="MM">พม่า</territory>
-			<territory type="MN">มองโ�เลีย</territory>
-			<territory type="MO">มาเ�๊า เขตป�ครองพิเศษประเทศจีน</territory>
-			<territory type="MP">หมู่เ�าะนอร์เทิร์นมาเรียนา</territory>
-			<territory type="MQ">มาร์ตินี�</territory>
-			<territory type="MR">มอริเตเนีย</territory>
-			<territory type="MS">มอนต์เซอร์รัต</territory>
-			<territory type="MT">มอลตา</territory>
-			<territory type="MU">มอริเชียส</territory>
-			<territory type="MV">มัลดีฟส์</territory>
-			<territory type="MW">มาลาวี</territory>
-			<territory type="MX">เม็�ซิโ�</territory>
-			<territory type="MY">มาเลเซีย</territory>
-			<territory type="MZ">โมซัมบิ�</territory>
-			<territory type="NA">นามิเบีย</territory>
-			<territory type="NC">นิว�คลิโดเนีย</territory>
-			<territory type="NE">ไนเจอร์</territory>
-			<territory type="NF">เ�าะนอร์ฟอล์�</territory>
-			<territory type="NG">ไนจีเรีย</territory>
-			<territory type="NI">นิ�ารา�ัว</territory>
-			<territory type="NL">เนเธอร์�ลนด์</territory>
-			<territory type="NO">นอร์เวย์</territory>
-			<territory type="NP">เนปาล</territory>
-			<territory type="NR">นาอูรู</territory>
-			<territory type="NU">นีอูเอ</territory>
-			<territory type="NZ">นิวซี�ลนด์</territory>
-			<territory type="OM">โอมาน</territory>
-			<territory type="PA">ปานามา</territory>
-			<territory type="PE">เปรู</territory>
-			<territory type="PF">เฟรนช์โปลินีเซีย</territory>
-			<territory type="PG">ปาปัวนิว�ินี</territory>
-			<territory type="PH">ฟิลิปปินส์</territory>
-			<territory type="PK">ปา�ีสถาน</territory>
-			<territory type="PL">โป�ลนด์</territory>
-			<territory type="PM">�ซงปี�ยร์�ละมีเ�อลง</territory>
-			<territory type="PN">พิต�คร์น</territory>
-			<territory type="PR">เปอร์โตริโ�</territory>
-			<territory type="PS">ปาเลสไตน์</territory>
-			<territory type="PT">โปรตุเ�ส</territory>
-			<territory type="PW">ปาเลา</territory>
-			<territory type="PY">ปารา�วัย</territory>
-			<territory type="QA">�าตาร์</territory>
-			<territory type="QO">เอาต์ไลอิงโอเชียเนีย</territory>
-			<territory type="QU">สหภาพยุโรป</territory>
-			<territory type="RE">เรอูนียง</territory>
-			<territory type="RO">โรมาเนีย</territory>
-			<territory type="RS">เซอร์เบีย</territory>
-			<territory type="RU">รัสเซีย</territory>
-			<territory type="RW">รวันดา</territory>
-			<territory type="SA">ซาอุดีอาระเบีย</territory>
-			<territory type="SB">หมู่เ�าะโซโลมอน</territory>
-			<territory type="SC">เซเชลส์</territory>
-			<territory type="SD">ซูดาน</territory>
-			<territory type="SE">สวีเดน</territory>
-			<territory type="SG">สิงคโปร์</territory>
-			<territory type="SH">เซนต์เฮเลนา</territory>
-			<territory type="SI">สโลวีเนีย</territory>
-			<territory type="SJ">สฟาลบาร์�ละยานไมเอน</territory>
-			<territory type="SK">สโลวะเ�ีย</territory>
-			<territory type="SL">เซียร์ราลีโอน</territory>
-			<territory type="SM">ซานมารีโน</territory>
-			<territory type="SN">เซเน�ัล</territory>
-			<territory type="SO">โซมาเลีย</territory>
-			<territory type="SR">ซูรินาเม</territory>
-			<territory type="ST">เซาตูเม�ละปรินซิปี</territory>
-			<territory type="SV">เอลซัลวาดอร์</territory>
-			<territory type="SY">ซีเรีย</territory>
-			<territory type="SZ">สวาซิ�ลนด์</territory>
-			<territory type="TC">หมู่เ�าะเติ�ส์�ละหมู่เ�าะเคคอส</territory>
-			<territory type="TD">ชาด</territory>
-			<territory type="TF">เฟรนช์เซาเทิร์นเทร์ริทอรีส์</territory>
-			<territory type="TG">โตโ�</territory>
-			<territory type="TH">ไทย</territory>
-			<territory type="TJ">ทาจิ�ิสถาน</territory>
-			<territory type="TK">โตเ�เลา</territory>
-			<territory type="TL">ติมอร์ตะวันออ�</territory>
-			<territory type="TM">เติร์�เมนิสถาน</territory>
-			<territory type="TN">ตูนิเซีย</territory>
-			<territory type="TO">ตอง�า</territory>
-			<territory type="TR">ตุร�ี</territory>
-			<territory type="TT">ตรินิ�ดด�ละโตเบโ�</territory>
-			<territory type="TV">ตูวาลู</territory>
-			<territory type="TW">ไต้หวัน</territory>
-			<territory type="TZ">�ทนซาเนีย</territory>
-			<territory type="UA">ยูเครน</territory>
-			<territory type="UG">ยู�ันดา</territory>
-			<territory type="UM">หมู่เ�าะสหรั�ไมเนอร์เอาต์ไลอิง</territory>
-			<territory type="US">สหรั�อเมริ�า</territory>
-			<territory type="UY">อุรุ�วัย</territory>
-			<territory type="UZ">อุซเบ�ิสถาน</territory>
-			<territory type="VA">วาติ�ัน</territory>
-			<territory type="VC">เซนต์วินเซนต์�ละเ�รนาดีนส์</territory>
-			<territory type="VE">เวเนซุเอลา</territory>
-			<territory type="VG">หมู่เ�าะบริติชเวอร์จิน</territory>
-			<territory type="VI">หมู่เ�าะยูเอสเวอร์จิน</territory>
-			<territory type="VN">เวียดนาม</territory>
-			<territory type="VU">วานูอาตู</territory>
-			<territory type="WF">วาลลิส�ละฟุตูนา</territory>
-			<territory type="WS">ซามัว</territory>
-			<territory type="YE">เยเมน</territory>
-			<territory type="YT">มายอต</territory>
-			<territory type="ZA">�อฟริ�าใต้</territory>
-			<territory type="ZM">�ซมเบีย</territory>
-			<territory type="ZW">ซิมบับเว</territory>
-			<territory type="ZZ">ไม่ทราบ</territory>
-		</territories>
-		<variants>
-			<variant type="1901">เยอรมันออร์โธ�ราฟีดั้งเดิม</variant>
-			<variant type="1996">เยอรมันออร์โธ�ราฟีปี 1996</variant>
-			<variant type="AREVELA">อาร์เมเนียตะวันออ�</variant>
-			<variant type="AREVMDA">อาร์เมเนียตะวันต�</variant>
-			<variant type="FONIPA">สัทอั�ษรสา�ล</variant>
-			<variant type="NEDIS">ภาษาพื้นเมืองนาทิโซเน</variant>
-			<variant type="POLYTON">โพลีโทนิ�</variant>
-			<variant type="POSIX">คอมพิวเตอร์</variant>
-			<variant type="REVISED">ออร์โธ�ราฟิปรับปรุง</variant>
-			<variant type="ROZAJ">เรเซียน</variant>
-			<variant type="SAAHO">ซาโฮ</variant>
-		</variants>
-		<keys>
-			<key type="calendar">ป�ิทิน</key>
-			<key type="collation">�ารเรียงลำดับ</key>
-			<key type="currency">เงินตรา</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">เรียงตามอั�ษรจีนดั้งเดิม</type>
-			<type type="buddhist" key="calendar">ป�ิทินพุทธ</type>
-			<type type="chinese" key="calendar">ป�ิทินจีน</type>
-			<type type="direct" key="collation">เรียงตามลำดับโดยตรง</type>
-			<type type="gb2312han" key="collation">เรียงตามอั�ษรจีนประยุ�ต์</type>
-			<type type="gregorian" key="calendar">ป�ิทินเ�ร�อเรียน</type>
-			<type type="hebrew" key="calendar">ป�ิทินฮิบรู</type>
-			<type type="indian" key="calendar">ป�ิทิน�ห่งชาติอินเดีย</type>
-			<type type="islamic" key="calendar">ป�ิทินอิสลาม</type>
-			<type type="islamic-civil" key="calendar">ป�ิทินอิสลามซีวิล</type>
-			<type type="japanese" key="calendar">ป�ิทิน�ี่ปุ่น</type>
-			<type type="phonebook" key="collation">เรียงตามสมุดโทรศัพท์</type>
-			<type type="pinyin" key="collation">เรียงตาม�ารถอดเสียงภาษาจีน</type>
-			<type type="roc" key="calendar">ป�ิทินไต้หวัน</type>
-			<type type="stroke" key="collation">เรียงตาม�ารลา�เส้น</type>
-			<type type="traditional" key="collation">เรียงตาม�บบดั้งเดิม</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">เมตริ�</measurementSystemName>
-			<measurementSystemName type="US">อเมริ�ัน</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">{0}</codePattern>
-			<codePattern type="script">{0}</codePattern>
-			<codePattern type="territory">{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[ฯ ๆ \u0E4E \u0E47-\u0E4D �-ฮ ะ-\u0E3A เ-ๅ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200B a e g m n p q t]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<default choice="buddhist"/>
-			<calendar type="buddhist">
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-				<eras>
-					<eraNames>
-						<era type="0">พุทธศั�ราช</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">พ.ศ.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEที่ d MMMM G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="EEEd">EEEท d</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">Eท d/M</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">Eท d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEEEd">EEEท d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM yyyy</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yyMM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="chinese">
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-			</calendar>
-			<calendar type="coptic">
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ม.ค.</month>
-							<month type="2">�.พ.</month>
-							<month type="3">มี.ค.</month>
-							<month type="4">เม.ย.</month>
-							<month type="5">พ.ค.</month>
-							<month type="6">มิ.ย.</month>
-							<month type="7">�.ค.</month>
-							<month type="8">ส.ค.</month>
-							<month type="9">�.ย.</month>
-							<month type="10">ต.ค.</month>
-							<month type="11">พ.ย.</month>
-							<month type="12">ธ.ค.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ม�ราคม</month>
-							<month type="2">�ุมภาพันธ์</month>
-							<month type="3">มีนาคม</month>
-							<month type="4">เมษายน</month>
-							<month type="5">พฤษภาคม</month>
-							<month type="6">มิถุนายน</month>
-							<month type="7">�ร�ฎาคม</month>
-							<month type="8">สิงหาคม</month>
-							<month type="9">�ันยายน</month>
-							<month type="10">ตุลาคม</month>
-							<month type="11">พฤศจิ�ายน</month>
-							<month type="12">ธันวาคม</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ม.ค.</month>
-							<month type="2">�.พ.</month>
-							<month type="3">มี.ค.</month>
-							<month type="4">เม.ย.</month>
-							<month type="5">พ.ค.</month>
-							<month type="6">มิ.ย.</month>
-							<month type="7">�.ค.</month>
-							<month type="8">ส.ค.</month>
-							<month type="9">�.ย.</month>
-							<month type="10">ต.ค.</month>
-							<month type="11">พ.ย.</month>
-							<month type="12">ธ.ค.</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">อา.</day>
-							<day type="mon">จ.</day>
-							<day type="tue">อ.</day>
-							<day type="wed">พ.</day>
-							<day type="thu">พฤ.</day>
-							<day type="fri">ศ.</day>
-							<day type="sat">ส.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">วันอาทิตย์</day>
-							<day type="mon">วันจันทร์</day>
-							<day type="tue">วันอังคาร</day>
-							<day type="wed">วันพุธ</day>
-							<day type="thu">วันพฤหัสบดี</day>
-							<day type="fri">วันศุ�ร์</day>
-							<day type="sat">วันเสาร์</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">อ</day>
-							<day type="mon">จ</day>
-							<day type="tue">อ</day>
-							<day type="wed">พ</day>
-							<day type="thu">พ</day>
-							<day type="fri">ศ</day>
-							<day type="sat">ส</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">ไตรมาส 1</quarter>
-							<quarter type="2">ไตรมาส 2</quarter>
-							<quarter type="3">ไตรมาส 3</quarter>
-							<quarter type="4">ไตรมาส 4</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ปี�่อนคริสต์ศั�ราช</era>
-						<era type="1">คริสต์ศั�ราช</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ปี�่อน ค.ศ.</era>
-						<era type="1">ค.ศ.</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">�่อน ค.ศ.</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEที่ d MMMM G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H นาฬิ�า m นาที ss วินาที zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H นาฬิ�า m นาที ss วินาที z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}, {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d/M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d/M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">H-H</greatestDifference>
-							<greatestDifference id="h">H-H</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="h">H:mm-H:mm</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="h">H:mm-H:mm v</greatestDifference>
-							<greatestDifference id="m">H:mm-H:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">H-H v</greatestDifference>
-							<greatestDifference id="h">H-H v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">d/M - d/M</greatestDifference>
-							<greatestDifference id="M">d/M - d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E d – E d/M</greatestDifference>
-							<greatestDifference id="M">E d – E d/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d – d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E d – E d MMM</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">M/yy – M/yy</greatestDifference>
-							<greatestDifference id="y">M/yy – M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">d-d/M/yy</greatestDifference>
-							<greatestDifference id="M">d/M/yy – d/M/yy</greatestDifference>
-							<greatestDifference id="y">d/M/yy – d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E d – E d/M/yy</greatestDifference>
-							<greatestDifference id="M">E d/M/yy – E d/M/yy</greatestDifference>
-							<greatestDifference id="y">E d/M/yy – E d/M/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E d – E d MMM y</greatestDifference>
-							<greatestDifference id="M">E d MMM – E d MMM y</greatestDifference>
-							<greatestDifference id="y">E d MMM y – E d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">M–M/yyyy</greatestDifference>
-							<greatestDifference id="y">M/yyyy – M/yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>สมัย</displayName>
-					</field>
-					<field type="year">
-						<displayName>ปี</displayName>
-					</field>
-					<field type="month">
-						<displayName>เดือน</displayName>
-					</field>
-					<field type="week">
-						<displayName>สัปดาห์</displayName>
-					</field>
-					<field type="day">
-						<displayName>วัน</displayName>
-						<relative type="-3">สามวัน�่อน</relative>
-						<relative type="-2">เมื่อวานซืน</relative>
-						<relative type="-1">เมื่อวาน</relative>
-						<relative type="0">วันนี้</relative>
-						<relative type="1">พรุ่งนี้</relative>
-						<relative type="2">มะรืนนี้</relative>
-						<relative type="3">สามวันต่อจา�นี้</relative>
-					</field>
-					<field type="weekday">
-						<displayName>วันในสัปดาห์</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>ช่วงวัน</displayName>
-					</field>
-					<field type="hour">
-						<displayName>ชั่วโมง</displayName>
-					</field>
-					<field type="minute">
-						<displayName>นาที</displayName>
-					</field>
-					<field type="second">
-						<displayName>วินาที</displayName>
-					</field>
-					<field type="zone">
-						<displayName>เขต</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="2">เฮวาน</month>
-							<month type="3">�ีสเลฟ</month>
-							<month type="4">เตเวต</month>
-							<month type="5">เชวัต</month>
-							<month type="6">อาดาร์  I</month>
-							<month type="7">อาดาร์</month>
-							<month type="8">นิสซาน</month>
-							<month type="9">อิยาร์</month>
-							<month type="10">สีวัน</month>
-							<month type="11">ตามูซ</month>
-							<month type="12">อัฟ</month>
-							<month type="13">เอลอุล</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">ย.ศ.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">มุฮะร์รอม</month>
-							<month type="2">ซอฟาร์</month>
-							<month type="3">รอบี I</month>
-							<month type="4">รอบี II</month>
-							<month type="5">จุมาดา I</month>
-							<month type="6">จุมาดา II</month>
-							<month type="7">รอจับ</month>
-							<month type="8">ชะอะบาน</month>
-							<month type="9">รอมะดอน</month>
-							<month type="10">เชาวัล</month>
-							<month type="11">ดฮุุอัล�ิดะห์</month>
-							<month type="12">ดฮุอัลฮิจจะห์</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ฮิจเราะห์ศั�ราช</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ฮ.ศ.</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-			<calendar type="japanese">
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ทะอิ�ะ</era>
-						<era type="1">ฮะ�ุชิ</era>
-						<era type="2">ฮา�ุโฮ</era>
-						<era type="3">ชุโช</era>
-						<era type="4">ทะอิโฮ</era>
-						<era type="5">เคอุง</era>
-						<era type="6">วะโด</era>
-						<era type="7">เร�ิ</era>
-						<era type="8">โยโร</era>
-						<era type="9">จิง�ิ</era>
-						<era type="10">เท็มเพียว</era>
-						<era type="11">เท็มเพียว-คัมโป</era>
-						<era type="12">เท็มเพียว-โชโฮ</era>
-						<era type="13">เท็มเพียว-โฮจิ</era>
-						<era type="14">เท็มเพียว-จิงโงะ</era>
-						<era type="15">จิงโงะ-เคอุง</era>
-						<era type="16">โฮ�ิ</era>
-						<era type="17">เท็นโอ</era>
-						<era type="18">เอ็นเรียะ�ุ</era>
-						<era type="19">ดะอิโด</era>
-						<era type="20">โคนิง</era>
-						<era type="21">เท็นโช</era>
-						<era type="22">โชวะ</era>
-						<era type="23">คะโจ</era>
-						<era type="24">นินจุ</era>
-						<era type="25">ซะอิโ�ะ</era>
-						<era type="26">เท็นนัง</era>
-						<era type="27">โจงัง</era>
-						<era type="28">เ�็งเ�</era>
-						<era type="29">นินนะ</era>
-						<era type="30">คัมเพียว</era>
-						<era type="31">โชตะอิ</era>
-						<era type="32">เอ็งงิ</era>
-						<era type="33">เอ็นโช</era>
-						<era type="34">โชเฮ</era>
-						<era type="35">เท็งเงียว</era>
-						<era type="36">เท็นเรียะ�ุ</era>
-						<era type="37">เท็นโตะ�ุ</era>
-						<era type="38">โอวะ</era>
-						<era type="39">โคโฮ</era>
-						<era type="40">อันนะ</era>
-						<era type="41">เท็นโระ�ุ</era>
-						<era type="42">เท็นเอ็ง</era>
-						<era type="43">โจเง็ง</era>
-						<era type="44">เท็งเง็ง</era>
-						<era type="45">เอ�ัง</era>
-						<era type="46">คันนะ</era>
-						<era type="47">เอเอ็ง</era>
-						<era type="48">เอโซ</era>
-						<era type="49">โชเรียะ�ุ</era>
-						<era type="50">โชโตะ�ุ</era>
-						<era type="51">โชโฮ</era>
-						<era type="52">คันโ�</era>
-						<era type="53">โชวะ</era>
-						<era type="54">คันนิง</era>
-						<era type="55">จิอัง</era>
-						<era type="56">มันจุ</era>
-						<era type="57">โชเง็ง</era>
-						<era type="58">โชเรียะ�ุ</era>
-						<era type="59">โชคีว</era>
-						<era type="60">คันโตะ�ุ</era>
-						<era type="61">เอโช</era>
-						<era type="62">เท็งงิ</era>
-						<era type="63">โคเฮ</era>
-						<era type="64">จิเรียะ�ุ</era>
-						<era type="65">เอ็งคีว</era>
-						<era type="66">โชโฮ</era>
-						<era type="67">โชเรียะ�ุ</era>
-						<era type="68">เอโฮะ</era>
-						<era type="69">โอโตะ�ุ</era>
-						<era type="70">คันจิ</era>
-						<era type="71">คะโฮะ</era>
-						<era type="72">เอโช</era>
-						<era type="73">โชโตะ�ุ</era>
-						<era type="74">โควะ</era>
-						<era type="75">โชจิ</era>
-						<era type="76">คะโช</era>
-						<era type="77">เท็นนิง</era>
-						<era type="78">เท็นเอ</era>
-						<era type="79">เอ�ีว</era>
-						<era type="80">เ�็นเอ</era>
-						<era type="81">โฮะอัง</era>
-						<era type="82">เท็นจิ</era>
-						<era type="83">ดะอิจิ</era>
-						<era type="84">เท็นโช</era>
-						<era type="85">โชโช</era>
-						<era type="86">โฮะเอ็ง</era>
-						<era type="87">เอจิ</era>
-						<era type="88">โคจิ</era>
-						<era type="89">เท็นโย</era>
-						<era type="90">คีวอัง</era>
-						<era type="91">นิมเป</era>
-						<era type="92">คีวจุ</era>
-						<era type="93">โฮะเง็ง</era>
-						<era type="94">เฮจิ</era>
-						<era type="95">เอเรียะ�ุ</era>
-						<era type="96">โอโฮ</era>
-						<era type="97">โช�ัง</era>
-						<era type="98">เอมัง</era>
-						<era type="99">นินอัง</era>
-						<era type="100">คะโอ</era>
-						<era type="101">โชอัง</era>
-						<era type="102">อังเง็ง</era>
-						<era type="103">จิโช</era>
-						<era type="104">โยวะ</era>
-						<era type="105">จุเอ</era>
-						<era type="106">เ�็นเรียะ�ุ</era>
-						<era type="107">บุนจิ</era>
-						<era type="108">เค็ง�ีว</era>
-						<era type="109">โชจิ</era>
-						<era type="110">เค็นนิง</era>
-						<era type="111">เ�็ง�ีว</era>
-						<era type="112">เค็นเอ</era>
-						<era type="113">โชเ�็ง</era>
-						<era type="114">เค็นเรียะ�ุ</era>
-						<era type="115">เค็มโป</era>
-						<era type="116">โช�ีว</era>
-						<era type="117">โจโอ</era>
-						<era type="118">เ�็นนิง</era>
-						<era type="119">คะโระ�ุ</era>
-						<era type="120">อันเต</era>
-						<era type="121">คัง�ิ</era>
-						<era type="122">โจเอ</era>
-						<era type="123">เท็มปุ�ุ</era>
-						<era type="124">บุนเรียะ�ุ</era>
-						<era type="125">คะเต</era>
-						<era type="126">เรียะ�ุนิง</era>
-						<era type="127">เอ็นโอ</era>
-						<era type="128">นินจิ</era>
-						<era type="129">คังเง็ง</era>
-						<era type="130">โฮจิ</era>
-						<era type="131">เค็นโช</era>
-						<era type="132">โคเง็ง</era>
-						<era type="133">โช�ะ</era>
-						<era type="134">โชเง็ง</era>
-						<era type="135">บุนโอ</era>
-						<era type="136">โคโช</era>
-						<era type="137">บุนเอ</era>
-						<era type="138">เค็นจิ</era>
-						<era type="139">โคอัง</era>
-						<era type="140">โชโอ</era>
-						<era type="141">เอนิง</era>
-						<era type="142">โชอัง</era>
-						<era type="143">เค็งเง็ง</era>
-						<era type="144">คะเง็ง</era>
-						<era type="145">โทะ�ุจิ</era>
-						<era type="146">เอ็งเ�</era>
-						<era type="147">โอโช</era>
-						<era type="148">โชวะ</era>
-						<era type="149">บุมโป</era>
-						<era type="150">เ�็นโอ</era>
-						<era type="151">เ�็งเ�ียว</era>
-						<era type="152">โชชู</era>
-						<era type="153">คะเระ�ิ</era>
-						<era type="154">เ�็นโตะ�ุ</era>
-						<era type="155">เ�็งโ�</era>
-						<era type="156">เค็มมุ</era>
-						<era type="157">เอ็งเง็ง</era>
-						<era type="158">โคโ�ะ�ุ</era>
-						<era type="159">โชเฮ</era>
-						<era type="160">เค็นโตะ�ุ</era>
-						<era type="161">บุนชู</era>
-						<era type="162">เท็นจุ</era>
-						<era type="163">โคเรียะ�ุ</era>
-						<era type="164">โควะ</era>
-						<era type="165">เ�็นชู</era>
-						<era type="166">เมโตะ�ุ</era>
-						<era type="167">คะเค</era>
-						<era type="168">โคโอ</era>
-						<era type="169">เมโตะ�ุ</era>
-						<era type="170">โอเอ</era>
-						<era type="171">โชโช</era>
-						<era type="172">เอเ�ียว</era>
-						<era type="173">คะ�ิสึ</era>
-						<era type="174">บุนอัง</era>
-						<era type="175">โฮโตะ�ุ</era>
-						<era type="176">เคียวโตะ�ุ</era>
-						<era type="177">โคโช</era>
-						<era type="178">โชโระ�ุ</era>
-						<era type="179">คันโช</era>
-						<era type="180">บุนโช</era>
-						<era type="181">โอนิง</era>
-						<era type="182">บุมเม</era>
-						<era type="183">โชเ�ียว</era>
-						<era type="184">เอ็นโตะ�ุ</era>
-						<era type="185">เมโอ</era>
-						<era type="186">บุง�ิ</era>
-						<era type="187">เอโช</era>
-						<era type="188">ทะอิเอ</era>
-						<era type="189">เคียวโระ�ุ</era>
-						<era type="190">เท็มมน</era>
-						<era type="191">โคจิ</era>
-						<era type="192">เอโระ�ุ</era>
-						<era type="193">เ�็ง�ิ</era>
-						<era type="194">เท็นโช</era>
-						<era type="195">บุนโระ�ุ</era>
-						<era type="196">เคโช</era>
-						<era type="197">เ�็งวะ</era>
-						<era type="198">คันเอ</era>
-						<era type="199">โชโฮ</era>
-						<era type="200">เคอัง</era>
-						<era type="201">โชโอ</era>
-						<era type="202">เมเรียะ�ุ</era>
-						<era type="203">มันจิ</era>
-						<era type="204">คัมบุง</era>
-						<era type="205">เอ็มโป</era>
-						<era type="206">เท็นวะ</era>
-						<era type="207">โจเ�ียว</era>
-						<era type="208">เ�็นโระ�ุ</era>
-						<era type="209">โฮเอ</era>
-						<era type="210">โชโตะ�ุ</era>
-						<era type="211">เคียวโฮ</era>
-						<era type="212">เ�็มบุง</era>
-						<era type="213">คัมโป</era>
-						<era type="214">เอ็งเ�ียว</era>
-						<era type="215">คันเอ็ง</era>
-						<era type="216">โฮเรียะ�ุ</era>
-						<era type="217">เมวะ</era>
-						<era type="218">อันเอ</era>
-						<era type="219">เท็มเม</era>
-						<era type="220">คันเซ</era>
-						<era type="221">เคียววะ</era>
-						<era type="222">บุง�ะ</era>
-						<era type="223">บุนเซ</era>
-						<era type="224">เท็มโป</era>
-						<era type="225">โค�ะ</era>
-						<era type="226">คะเอ</era>
-						<era type="227">อันเซ</era>
-						<era type="228">มันเอ็ง</era>
-						<era type="229">บุง�ีว</era>
-						<era type="230">เ�็นจิ</era>
-						<era type="231">เคโอ</era>
-						<era type="232">เมจิ</era>
-						<era type="233">ทะอิโช</era>
-						<era type="234">โชวะ</era>
-						<era type="235">เฮเซ</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">ทะอิ�ะ</era>
-						<era type="1">ฮะ�ุชิ</era>
-						<era type="2">ฮา�ุโฮ</era>
-						<era type="3">ชุโช</era>
-						<era type="4">ทะอิโฮ</era>
-						<era type="5">เคอุง</era>
-						<era type="6">วะโด</era>
-						<era type="7">เร�ิ</era>
-						<era type="8">โยโร</era>
-						<era type="9">จิง�ิ</era>
-						<era type="10">เท็มเพียว</era>
-						<era type="11">เท็มเพียว-คัมโป</era>
-						<era type="12">เท็มเพียว-โชโฮ</era>
-						<era type="13">เท็มเพียว-โฮจิ</era>
-						<era type="14">เท็มเพียว-จิงโงะ</era>
-						<era type="15">จิงโงะ-เคอุง</era>
-						<era type="16">โฮ�ิ</era>
-						<era type="17">เท็นโอ</era>
-						<era type="18">เอ็นเรียะ�ุ</era>
-						<era type="19">ดะอิโด</era>
-						<era type="20">โคนิง</era>
-						<era type="21">เท็นโช</era>
-						<era type="22">โชวะ</era>
-						<era type="23">คะโจ</era>
-						<era type="24">นินจุ</era>
-						<era type="25">ซะอิโ�ะ</era>
-						<era type="26">เท็นนัง</era>
-						<era type="27">โจงัง</era>
-						<era type="28">เ�็งเ�</era>
-						<era type="29">นินนะ</era>
-						<era type="30">คัมเพียว</era>
-						<era type="31">โชตะอิ</era>
-						<era type="32">เอ็งงิ</era>
-						<era type="33">เอ็นโช</era>
-						<era type="34">โชเฮ</era>
-						<era type="35">เท็งเงียว</era>
-						<era type="36">เท็นเรียะ�ุ</era>
-						<era type="37">เท็นโตะ�ุ</era>
-						<era type="38">โอวะ</era>
-						<era type="39">โคโฮ</era>
-						<era type="40">อันนะ</era>
-						<era type="41">เท็นโระ�ุ</era>
-						<era type="42">เท็นเอ็ง</era>
-						<era type="43">โจเง็ง</era>
-						<era type="44">เท็งเง็ง</era>
-						<era type="45">เอ�ัง</era>
-						<era type="46">คันนะ</era>
-						<era type="47">เอเอ็ง</era>
-						<era type="48">เอโซ</era>
-						<era type="49">โชเรียะ�ุ</era>
-						<era type="50">โชโตะ�ุ</era>
-						<era type="51">โชโฮ</era>
-						<era type="52">คันโ�</era>
-						<era type="53">โชวะ</era>
-						<era type="54">คันนิง</era>
-						<era type="55">จิอัง</era>
-						<era type="56">มันจุ</era>
-						<era type="57">โชเง็ง</era>
-						<era type="58">โชเรียะ�ุ</era>
-						<era type="59">โชคีว</era>
-						<era type="60">คันโตะ�ุ</era>
-						<era type="61">เอโช</era>
-						<era type="62">เท็งงิ</era>
-						<era type="63">โคเฮ</era>
-						<era type="64">จิเรียะ�ุ</era>
-						<era type="65">เอ็งคีว</era>
-						<era type="66">โชโฮ</era>
-						<era type="67">โชเรียะ�ุ</era>
-						<era type="68">เอโฮะ</era>
-						<era type="69">โอโตะ�ุ</era>
-						<era type="70">คันจิ</era>
-						<era type="71">คะโฮะ</era>
-						<era type="72">เอโช</era>
-						<era type="73">โชโตะ�ุ</era>
-						<era type="74">โควะ</era>
-						<era type="75">โชจิ</era>
-						<era type="76">คะโช</era>
-						<era type="77">เท็นนิง</era>
-						<era type="78">เท็นเอ</era>
-						<era type="79">เอ�ีว</era>
-						<era type="80">เ�็นเอ</era>
-						<era type="81">โฮะอัง</era>
-						<era type="82">เท็นจิ</era>
-						<era type="83">ดะอิจิ</era>
-						<era type="84">เท็นโช</era>
-						<era type="85">โชโช</era>
-						<era type="86">โฮะเอ็ง</era>
-						<era type="87">เอจิ</era>
-						<era type="88">โคจิ</era>
-						<era type="89">เท็นโย</era>
-						<era type="90">คีวอัง</era>
-						<era type="91">นิมเป</era>
-						<era type="92">คีวจุ</era>
-						<era type="93">โฮะเง็ง</era>
-						<era type="94">เฮจิ</era>
-						<era type="95">เอเรียะ�ุ</era>
-						<era type="96">โอโฮ</era>
-						<era type="97">โช�ัง</era>
-						<era type="98">เอมัง</era>
-						<era type="99">นินอัง</era>
-						<era type="100">คะโอ</era>
-						<era type="101">โชอัง</era>
-						<era type="102">อังเง็ง</era>
-						<era type="103">จิโช</era>
-						<era type="104">โยวะ</era>
-						<era type="105">จุเอ</era>
-						<era type="106">เ�็นเรียะ�ุ</era>
-						<era type="107">บุนจิ</era>
-						<era type="108">เค็ง�ีว</era>
-						<era type="109">โชจิ</era>
-						<era type="110">เค็นนิง</era>
-						<era type="111">เ�็ง�ีว</era>
-						<era type="112">เค็นเอ</era>
-						<era type="113">โชเ�็ง</era>
-						<era type="114">เค็นเรียะ�ุ</era>
-						<era type="115">เค็มโป</era>
-						<era type="116">โช�ีว</era>
-						<era type="117">โจโอ</era>
-						<era type="118">เ�็นนิง</era>
-						<era type="119">คะโระ�ุ</era>
-						<era type="120">อันเต</era>
-						<era type="121">คัง�ิ</era>
-						<era type="122">โจเอ</era>
-						<era type="123">เท็มปุ�ุ</era>
-						<era type="124">บุนเรียะ�ุ</era>
-						<era type="125">คะเต</era>
-						<era type="126">เรียะ�ุนิง</era>
-						<era type="127">เอ็นโอ</era>
-						<era type="128">นินจิ</era>
-						<era type="129">คังเง็ง</era>
-						<era type="130">โฮจิ</era>
-						<era type="131">เค็นโช</era>
-						<era type="132">โคเง็ง</era>
-						<era type="133">โช�ะ</era>
-						<era type="134">โชเง็ง</era>
-						<era type="135">บุนโอ</era>
-						<era type="136">โคโช</era>
-						<era type="137">บุนเอ</era>
-						<era type="138">เค็นจิ</era>
-						<era type="139">โคอัง</era>
-						<era type="140">โชโอ</era>
-						<era type="141">เอนิง</era>
-						<era type="142">โชอัง</era>
-						<era type="143">เค็งเง็ง</era>
-						<era type="144">คะเง็ง</era>
-						<era type="145">โทะ�ุจิ</era>
-						<era type="146">เอ็งเ�</era>
-						<era type="147">โอโช</era>
-						<era type="148">โชวะ</era>
-						<era type="149">บุมโป</era>
-						<era type="150">เ�็นโอ</era>
-						<era type="151">เ�็งเ�ียว</era>
-						<era type="152">โชชู</era>
-						<era type="153">คะเระ�ิ</era>
-						<era type="154">เ�็นโตะ�ุ</era>
-						<era type="155">เ�็งโ�</era>
-						<era type="156">เค็มมุ</era>
-						<era type="157">เอ็งเง็ง</era>
-						<era type="158">โคโ�ะ�ุ</era>
-						<era type="159">โชเฮ</era>
-						<era type="160">เค็นโตะ�ุ</era>
-						<era type="161">บุนชู</era>
-						<era type="162">เท็นจุ</era>
-						<era type="163">โคเรียะ�ุ</era>
-						<era type="164">โควะ</era>
-						<era type="165">เ�็นชู</era>
-						<era type="166">เมโตะ�ุ</era>
-						<era type="167">คะเค</era>
-						<era type="168">โคโอ</era>
-						<era type="169">เมโตะ�ุ</era>
-						<era type="170">โอเอ</era>
-						<era type="171">โชโช</era>
-						<era type="172">เอเ�ียว</era>
-						<era type="173">คะ�ิสึ</era>
-						<era type="174">บุนอัง</era>
-						<era type="175">โฮโตะ�ุ</era>
-						<era type="176">เคียวโตะ�ุ</era>
-						<era type="177">โคโช</era>
-						<era type="178">โชโระ�ุ</era>
-						<era type="179">คันโช</era>
-						<era type="180">บุนโช</era>
-						<era type="181">โอนิง</era>
-						<era type="182">บุมเม</era>
-						<era type="183">โชเ�ียว</era>
-						<era type="184">เอ็นโตะ�ุ</era>
-						<era type="185">เมโอ</era>
-						<era type="186">บุง�ิ</era>
-						<era type="187">เอโช</era>
-						<era type="188">ทะอิเอ</era>
-						<era type="189">เคียวโระ�ุ</era>
-						<era type="190">เท็มมน</era>
-						<era type="191">โคจิ</era>
-						<era type="192">เอโระ�ุ</era>
-						<era type="193">เ�็ง�ิ</era>
-						<era type="194">เท็นโช</era>
-						<era type="195">บุนโระ�ุ</era>
-						<era type="196">เคโช</era>
-						<era type="197">เ�็งวะ</era>
-						<era type="198">คันเอ</era>
-						<era type="199">โชโฮ</era>
-						<era type="200">เคอัง</era>
-						<era type="201">โชโอ</era>
-						<era type="202">เมเรียะ�ุ</era>
-						<era type="203">มันจิ</era>
-						<era type="204">คัมบุง</era>
-						<era type="205">เอ็มโป</era>
-						<era type="206">เท็นวะ</era>
-						<era type="207">โจเ�ียว</era>
-						<era type="208">เ�็นโระ�ุ</era>
-						<era type="209">โฮเอ</era>
-						<era type="210">โชโตะ�ุ</era>
-						<era type="211">เคียวโฮ</era>
-						<era type="212">เ�็มบุง</era>
-						<era type="213">คัมโป</era>
-						<era type="214">เอ็งเ�ียว</era>
-						<era type="215">คันเอ็ง</era>
-						<era type="216">โฮเรียะ�ุ</era>
-						<era type="217">เมวะ</era>
-						<era type="218">อันเอ</era>
-						<era type="219">เท็มเม</era>
-						<era type="220">คันเซ</era>
-						<era type="221">เคียววะ</era>
-						<era type="222">บุง�ะ</era>
-						<era type="223">บุนเซ</era>
-						<era type="224">เท็มโป</era>
-						<era type="225">โค�ะ</era>
-						<era type="226">คะเอ</era>
-						<era type="227">อันเซ</era>
-						<era type="228">มันเอ็ง</era>
-						<era type="229">บุง�ีว</era>
-						<era type="230">เ�็นจิ</era>
-						<era type="231">เคโอ</era>
-						<era type="232">เมจิ</era>
-						<era type="233">ทะอิโช</era>
-						<era type="234">โชวะ</era>
-						<era type="235">เฮเซ</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="232">ม</era>
-						<era type="233">ท</era>
-						<era type="234">ช</era>
-						<era type="235">ฮ</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEที่ d MMMM ปีGที่ y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM ปีG y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyyy">GGG yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">M/GGGGG yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM GGGGG yy</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Q GGGGG yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="persian">
-				<am>�่อนเที่ยง</am>
-				<pm>หลังเที่ยง</pm>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>ไม่ทราบ</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>อันดอร์รา</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>ดูใบ</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>คาบูล</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�อนติ�า</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�อง�ิลลา</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>ติรานา</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>เยเรวาน</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>ลูอันดา</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>โรเทรา</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>พาล์เมอร์</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>ขั้วโล�ใต้</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>เซียวา</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>มาว์ซัน</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>ดาวีส์</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>วอสต็อค</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>เคซีย์</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>ดูมอนต์ดียูร์วิลล์</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>�มคมัวโด</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>ริโอ�าลเล�อส</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>เมนดูซา</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>ซานฮวน</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>อูชูเอีย</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>ลาริโอจา</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>ซันลูอิส</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>�าตามาร์�า</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>จูจิว</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>ทูคู�มน</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>คอร์โดบา</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>บัวโนสไอเรส</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>ปาโ� ปาโ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>เวียนนา</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>เพิิร์ท</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>ยูคลา</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>ดาร์วิน</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�อดิเลด</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>โบร�เคนฮิลล์</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>คูร์รี</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>เมลเบิร์น</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>โฮบาร์ต</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>ลินดี�มน</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>ซิดนีย์</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>บริสเบน</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>ลอร์ดโฮวี</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>อารูบา</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>บา�ู</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>บาร์เบโดส</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>ดา�า</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>บรัสเซลส์</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>วา�าดู�ู</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>โซเฟีย</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>บาห์เรน</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>บูจุมบูรา</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>ปอร์โต-โนโว</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>เบอร์มิวดา</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>บรูไนดารุสซาลาม</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>ลาปาซ</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>เอรูเนเป</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>รีโอบรังโ�</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>ปอร์ตูเวลโย</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>บัววีชตา</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>มาเนาส์</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>�ุยาบา</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>ซันตาเรม</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>�ัมปู�รันดี</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>เบเลง</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>อารา�ัวนา</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>เซาเปาลู</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>บาเยีย</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>ฟอร์ตาเลซา</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>มาเซโอ</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>เรซีเฟ</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>โนรอนฮา</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�นสซอ</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>ทิมพู</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>�าโบโรเน</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>เบลีซ</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>ดอว์สัน</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>ไวต์ฮอร์ส</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>อินูวิ�</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>�วนคูเวอร์</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>ดอว์สัน ครี�</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>เยลโลว์ไนฟ์</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>เอดมันตัน</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>สวิฟต์เคอร์เรนต์</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>อ่าว�คมบริดจ์</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>ริไจนา</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>วินนิเพ�</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>เรโซลูท</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>เรนนี่ริเวอร์</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>�รง�ินอินเล็ต</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>คอรัลฮาร์เบอร์</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>ทันเดอร์เบย์</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>นิปิ�อน</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>โทรอนโต</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>มอนทรีอัล</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>อี�วาลิต</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>พางนีทัง</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>มองตัน</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>�ฮลิ�ฟ�ซ์</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>�ูสเบย์</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>��ลซเบย์</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>บลังค์-ซาบลอน</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>เซนต์จอนส์</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>โคโคส</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>�ินชาซา</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>ลูบัมบาชิ</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>บัง�ี</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>บราซซาวิล</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>ซูริค</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>อีสเตอร์</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>ซันติอาโ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>�ัช�าร์</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>อุรุมชี</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>ฉงชิ่ง</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>เซี่ยงไฮ้</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>ฮาร์บิน</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>โบโ�ตา</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>คอสตาริ�า</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>ฮาวานา</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>เคปเวิร์ด</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>คริสต์มาส</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>นิโคเซีย</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>เบอร์ลิน</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>จิบูตี</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>โคเปนเฮเ�น</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>โดมินิ�า</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>ซานโต โดมิงโ�</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�อลเจียร์</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>�าลาปาโ�ส</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>�ัวยา�ิล</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>ไคโร</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>เอลไอย์อุง</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>�อสมารา</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>คะเนรี</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>เซวตา</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>มาดริด</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�อดดิสอาบาบา</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>เฮลซิง�ิ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>ฟิจิ</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>ส�ตนลีย์</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>ทรั�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>โปนาเป</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>คอส�ร</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>ปารีส</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>ลีเบรอวิล</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>ลอนดอน</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>เ�รนาดา</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>ทบิลิซิ</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>�า�ยน</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>อั��รา</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>ยิบรอลตาร์</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>ทูเล</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>�อด�ธบ</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>ส�อเรสไบซันด์</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>ดานมาร์�สฮาวน์</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>บันจูล</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>โ�นา�รี</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>�วาเดอลูป</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>มาลาโบ</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>เอเธนส์</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>เซาท์ จอร์เจีย</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>�ัวเตมาลา</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>�วม</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>บิสเซา</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>�ายอานา</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>ฮ่อง�ง</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>บูดาเปส</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>จา�าร์ตา</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>พอนเทียนั�</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>มา�ัสซาร์</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>จายาปุระ</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>ดับบลิน</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>เยรูซาเร็ม</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>�บ��ดด</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>เตหะราน</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>เรคยาวิ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>โรม</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>จาเม�า</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>อัมมาน</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>โตเ�ียว</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>ไนโรเบีย</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>บิชเค�</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>พนมเป�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>เอนเดอร์เบอร์รี</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>คิริทิมาตี</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>ตาระวา</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>โคโมโร</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>เปียงยาง</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>โซล</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>คูเวต</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>เคย์�มน</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>อัคตาอู</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>ออรัล</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>อัคโทบี</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>ไคซีลอร์ดา</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>อัลมาตี</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>เวียงจันทน์</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>เบรุต</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>เซนต์ลูเซีย</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>วาดุซ</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>โคลัมโบ</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>มันโรเวีย</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>มาเซรู</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>วิลนีอุส</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>ลั�เซมเบิร์�</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>ตรีโปลี</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>คาสซาบลาง�้า</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>โมนาโ�</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>อันตานานาริโว</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>ควาจาเลน</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>มาจูโร</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>บามาโ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>ย่าง�ุ้ง</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>ฮอฟด์</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>อูลานบาตอร์</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>ชอยบาลซาน</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>มาเ�๊า</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>ไซปัน</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>มาร์ตินี�</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>นู�อ�ชอต</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>มอนเซอร์รัต</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>มอลตา</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>มอริเชียส</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>มัลดีฟส์</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>ทิฮัวนา</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>เอร์โมซีโย</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>มาซาทลาน</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>ชีวาวา</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>มอนเต••ร์เรย์</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>เม็�ซิโ�ซิตี</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>เมรีดา</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>�คนคุน</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>�ัวล¥¥¥าลัมเปอร์</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>�ูชิง</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>มาปูโต</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>วินด์ฮุ�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>นูเมอา</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>นีอาเมย์</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>ลา�อส</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>อัมสเตอดัม</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>ออสโล</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>�าตมัน™ดุ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>นาอูรู</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>นีอูเอ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>�ช�ทม</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>โอค�ลนด์</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>มัส�ัต</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>ปานามา</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>ลิมา</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>ทาฮิติ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>มาร์เควซัส</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>��มเบียร์</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>พอร์ตมอร์สบี</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>มะนิลา</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>�าราจี</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>วอร์ซอ</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>มีเ�อลง</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>พิต�คร์น</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>เปอโตริโ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>�าซา</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>อาซอเรส</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>มาเดรา</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>ลิสบอน</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>ปาเลา</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>อะซุนซิออง</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>�าตาร์</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>เรอูนียง</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>บูคาเรส</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>คาลินิง�ราด</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>มอสโ�</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>วอลโ��ราด</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>ซามารา</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>ยีคาเตอรินเบิร์�</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>โอมส�์</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>โนโวซิบิร์ส�์</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>ครัสโนยาร์ส�์</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>อีร์คุตสค์</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>ยาคุตสค์</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>วลาดิโวสต็อ�</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>ซาคาลิน</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>มา�าดาน</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>คามชัต�า</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>อานาดีร์</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>คิ�าลี</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>ริยาร์ด</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>�ัวดัลคานัล</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>คาร์ทูม</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>สตอ�โฮล์ม</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>สิงคโปร์</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>เซนต์เฮเลนา</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>ลองเยียร์เบียน</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>ฟรีทาวน์</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>ดา�าร์</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>โม�าดิชู</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>ปารามาริโบ</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>ซาโอโตเมะ</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>เอลซัลวาดอร์</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>ดามัส�ัส</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>อัมบาบาเน</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>โลเม</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>�รุงเทพ</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>ดูชานเบ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>ฟาเคาโฟ</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>ดิลี</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>อาช�าบัต</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>ตูนิส</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>ตอง�าตาปู</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>อิสตันบูล</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>พอร์ทออฟสเปน</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>ฟูนะฟูตี</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>ไทเป</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>อัซโ�ร็อด</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>เคียฟ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>ซิมเฟอโรโปล</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>ซาโปโรซี</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>คัมพาลา</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>มิดเวย์</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>จอห์นสตัน</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>เว�</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>เอดั�</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>นอม</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>โฮโนลูลู</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�องเคอเรจ</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>ยา�ูทัต</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>จูโน</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>ลอส�องเจลิส</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>บอยซี</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>ฟีนิ�ซ์</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>ชิปร็อ�</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>เดนเวอร์</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>นิวเซเลม, นอร์ทดาโคตา</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>เซนเตอร์, นอร์ทดาโคตา</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>ชิคาโ�</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>เมโนมินี</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>วินเซนเนส, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>ปีเตอร์สเบิร์�, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>เทลล์ซิตี, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>นอ�ซ์, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>วินา�มค, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>มาเรงโ�, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>อินเดีย�นโพลิส</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>ลูส์วิลล์</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>วีเวย์, อินดี�อนา</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>มอนติเซลโล</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>ดีทรอยต์</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>นิวยอร์�</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>มอนเตวิเดโอ</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>ซามาร์�านด์</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>ทาชเคนต์</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>เซนต์วินเซนต์</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>คาราคัส</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>เซนต์โธมัส</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>ไซง่อน</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>วาลลิส</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>อาปีอา</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>เอเดน</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>มาโยเต</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>โจฮันเนสเบอร์�</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>ลูซา�า</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>ฮาราเร</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>เวลาอาเ�ร</standard>
-					<daylight>เวลาฤดูร้อนอาเ�ร</daylight>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>เวลา�อฟริ�า�ลาง</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>เวลา�อฟริ�าตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<standard>เวลามาตร�าน�อฟริ�าใต้</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>เวลา�อฟริ�าตะวันต�</standard>
-					<daylight>เวลาฤดูร้อน�อฟริ�าตะวันต�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>เวลาอะ�ลส�า</generic>
-					<standard>เวลามาตร�านอะ�ลส�า</standard>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<standard>เวลามาตร�านอะ�ลส�า-ฮาวาย</standard>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>เวลาอะเมซอน</standard>
-					<daylight>เวลาฤดูร้อนอะเมซอน</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>เวลา�ลาง</generic>
-					<standard>เวลามาตร�าน�ลาง</standard>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>เวลาตะวันออ�</generic>
-					<standard>เวลามาตร�านตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>เวลา�ปซิฟิค</generic>
-					<standard>เวลามาตร�าน�ปซิฟิค</standard>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>เวลาอัคตาอู</standard>
-					<daylight>เวลาฤดูร้อนอัคตาอู</daylight>
-				</long>
-				<short>
-					<standard>AQTT (อัคตาอู)</standard>
-					<daylight>AQTST (อัคตาอู)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>เวลาอาระเบีย</generic>
-					<standard>เวลามาตร�านอาระเบีย</standard>
-				</long>
-				<short>
-					<standard>AST (อาระเบีย)</standard>
-					<daylight>ADT (อาระเบีย)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>เวลาอาร์เจนตินา</standard>
-					<daylight>เวลาฤดูร้อนอาร์เจนตินา</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>เวลาอาร์เจนตินาตะวันต�</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>เวลาอาร์เมเนีย</standard>
-					<daylight>เวลาฤดูร้อนอาร์เมเนีย</daylight>
-				</long>
-				<short>
-					<standard>AMT (อาร์เมเนีย)</standard>
-					<daylight>AMST (อาร์เมเนีย)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>เวลา�อต�ลนติ�</generic>
-					<standard>เวลามาตร�าน�อต�ลนติ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>เวลาออสเตรเลีย�ลาง</generic>
-					<standard>เวลามาตร�านออสเตรเลีย�ลาง</standard>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>เวลาออสเตรเลียตะวันออ�</generic>
-					<standard>เวลามาตร�านออสเตรเลียตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>เวลาออสเตรเลียตะวันต�</generic>
-					<standard>เวลามาตร�านออสเตรเลียตะวันต�</standard>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>เวลาฤดูร้อนอาโซเรช</standard>
-					<daylight>เวลาฤดูร้อนอาโซเรช</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>เวลาบา�ู</standard>
-					<daylight>เวลาฤดูร้อนบา�ู</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>เวลาบัง�ลาเทศ</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>เวลาเบริง</generic>
-					<standard>เวลามาตร�านเบริง</standard>
-				</long>
-				<short>
-					<standard>BST (เบริง)</standard>
-					<daylight>BDT (เบริง)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>เวลาภู�าน</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>เวลาบอร์เนียว</standard>
-					<daylight>เวลาฤดูร้อนบอร์เนียว</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>เวลาบราซิเลีย</standard>
-					<daylight>เวลาฤดูร้อนบราซิเลีย</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>เวลามาตร�านชามอร์โร</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>เวลาชิลี</standard>
-					<daylight>เวลาฤดูร้อนชิลี</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<standard>เวลามาตร�านจีน</standard>
-				</long>
-				<short>
-					<standard>CST (จีน)</standard>
-					<daylight>CDT (จีน)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>เวลาดูชานเบ</standard>
-					<daylight>เวลาฤดูร้อนดูชานเบ</daylight>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>เวลาติมอร์ตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>เวลาเอ�วาดอร์</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>เวลายุโรป�ลาง</standard>
-					<daylight>เวลาฤดูร้อนยุโรป�ลาง</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>เวลายุโรปตะวันออ�</standard>
-					<daylight>เวลาฤดูร้อนยุโรปตะวันออ�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>เวลายุโรปตะวันต�</standard>
-					<daylight>เวลาฤดูร้อนยุโรปตะวันต�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>เวลา�าลาปาโ�ส</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>เวลาจอร์เจีย</standard>
-					<daylight>เวลาฤดูร้อนจอร์เจีย</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>เวลามาตร�าน�รีนิช</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>เวลา�รีน�ลนด์�ลาง</standard>
-					<daylight>เวลาฤดูร้อน�รีน�ลนด์�ลาง</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>เวลา�รีน�ลนด์ตะวันออ�</standard>
-					<daylight>เวลาฤดูร้อน�รีน�ลนด์ตะวันออ�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>เวลา�รีน�ลนด์ตะวันต�</standard>
-					<daylight>เวลาฤดูร้อน�รีน�ลนด์ตะวันต�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>เวลามาตร�าน�วม</standard>
-				</long>
-				<short>
-					<standard>GST (�วม)</standard>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>เวลามาตร�านอินเดีย</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>เวลาอินโดนีเซีย�ลาง</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>เวลาอินโดนีเซียตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>เวลาอินโดนีเซียตะวันต�</standard>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<standard>เวลามาตร�านอิสราเอล</standard>
-				</long>
-				<short>
-					<standard>IST (อิสราเอล)</standard>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<standard>เวลามาตร�านคาซัคสถานตะวันออ�</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<standard>เวลามาตร�านคาซัคสถาน</standard>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>เวลาเ�าหลี</generic>
-					<standard>เวลามาตร�านเ�าหลี</standard>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>เวลาควาจาเลน</standard>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>เวลามาเ�๊า</standard>
-					<daylight>เวลาฤดูร้อนมาเ�๊า</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>เวลามาลายา</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>เวลามาเลเซีย</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>เวลาหมู่เ�าะมาร์�ชลล์</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>เวลาอูลานบาตอร์</standard>
-					<daylight>เวลาฤดูร้อนอูลานบาตอร์</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>เวลานิวซี�ลนด์</generic>
-					<standard>เวลามาตร�านนิวซี�ลนด์</standard>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>เวลานิวฟันด์�ลนด์</generic>
-					<standard>เวลามาตร�านนิวฟันด์�ลนด์</standard>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>เวลาหมู่เ�าะมาเรียนาเหนือ</standard>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>เวลาปา�ีสถาน</standard>
-					<daylight>เวลาฤดูร้อนปา�ีสถาน</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>ปี�ยร์�ละมีเ�อลง</generic>
-					<standard>เวลามาตร�านปี�ยร์�ละมีเ�อลง</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>เวลาคืยซิลออร์ดา</standard>
-					<daylight>เวลาฤดูร้อนคืยซิลออร์ดา</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>เวลาซามารา</standard>
-					<daylight>เวลาฤดูร้อนซามารา</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>เวลาซามาร์คันด์</standard>
-					<daylight>เวลาฤดูร้อนซามาร์คันด์</daylight>
-				</long>
-				<short>
-					<standard>SAMT (ซามาร์คันด์)</standard>
-					<daylight>SAMST (ซามาร์คันด์)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>เวลามาตร�านซามัว</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>เวลาซูรินาเม</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>เวลาสเวียร์ดลอฟสค์</standard>
-					<daylight>เวลาฤดูร้อนสเวียร์ดลอฟสค์</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>เวลาทาจิ�ิสถาน</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<daylight>เวลาฤดูร้อนทาชเคนต์</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>เวลาทบิลิซิ</standard>
-					<daylight>เวลาฤดูร้อนทบิลิซิ</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>เวลาตุร�ี</standard>
-					<daylight>เวลาฤดูร้อนตุร�ี</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>เวลาเติร์�เมนิสถาน</standard>
-					<daylight>เวลาฤดูร้อนเติร์�เมนิสถาน</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>เวลาอุซเบ�ิสถาน</standard>
-					<daylight>เวลาฤดูร้อนอุซเบ�ิสถาน</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>เวลาเยคาเตรินบูร์�</standard>
-					<daylight>เวลาฤดูร้อนเยคาเตรินบูร์�</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>เวลาเยเรวาน</standard>
-					<daylight>เวลาฤดูร้อนเยเรวาน</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>เวลายูคอน</generic>
-					<standard>เวลามาตร�านยูคอน</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;¤-#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>เปเซตาอันดอร์รา</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>เดอร์�ฮมสหรั�อาหรับเอมิเรตส์</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>อัฟ�านีอัฟ�านิสถาน (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>อัฟ�านีอัฟ�านิสถาน</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>เล��อลเบเนีย</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>�ดรมอาร์เมเนีย</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>�ิลเดอร์เนเธอร์�ลนด์�อนทิลลิส</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�วานซา�องโ�ลา</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�วานซา�องโ�ลา (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>นิว�วานซา�องโ�ลา (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�วานซารีจัสทาโด�องโ�ลา (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>ออสตรัลอาร์เจนตินา</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>เปโซอาร์เจนตินา (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>เปโซอาร์เจนตินา</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>ชิลลิงออสเตรีย</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>ดอลลาร์ออสเตรเลีย</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>ฟลอรินอารูบา</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>มานัตอาเซอร์ไบจาน (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>มานัตอาเซอร์ไบจาน</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>ดีนาร์บอสเนีย-เฮอร์เซโ�วีนา</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>มาร​์�บอสเนีย-เฮอร์เซโ�วีนา</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>ดอลลาร์บาร์เบโดส</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>ตา�าบัง�ลาเทศ</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>ฟรัง�์เบลเยียม (เปลี่ยน�ปลงได้)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>ฟรัง�์เบลเยียม</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>ฟรัง�์เบลเยียม (�ารเงิน)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>ฮาร์ดเลฟบัล��เรีย</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>เลฟบัล��เรีย</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>ดีนาร์บาห์เรน</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>ฟรัง�์บุรุนดี</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>ดอลลาร์เบอร์มิวดา</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>ดอลลาร์บรูไน</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>โบลิเวียโนโบลิเวีย</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>เปโซโบลิเวีย</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>มฟดอลโบลิเวีย</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>ครูเซโรโนโวบราซิล (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>ครูซาโดบราซิล</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>ครูเซโรบราซิล (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>เรียลบราซิล</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>ครูซาโดโนโวบราซิล</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>ครูเซโรบราซิล</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>ดอลลาร์บาฮามาส</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>เอ็ง�ุลตรัมภู�าน</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>จ๊าดพม่า</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>ปูลาบอตสวานา</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>นิวรูเบิลเบลารุส (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>รูเบิลเบลารุส</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>ดอลลาร์เบลีซ</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>ดอลลาร์�คนาดา</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>ฟรัง�์คองโ�</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>ยูโรดับเบิลยูไออาร์</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>ฟรัง�์สวิส</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>ฟรัง�์ดับเบิลยูไออาร์</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>ฟูเมนโตชิลี</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>เปโซชิลี</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>หยวนเหรินหมินปี้ (สาธารณรั�ประชาชนจีน)</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>เปโซโคลอมเบีย</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>วาเลอร์เรียลโคลอมเบีย</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>โ�ลองคอสตาริ�า</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>ดีนาร์เซอร์เบียเ�่า</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>ฮาร์ดโครูนาเช็�โ�สโลวั�</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>เปโซคิวบา</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>เอสคูโดเคปเวิร์ด</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>ปอนด์ไซปรัส</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>โครูนาสาธารณรั�เช็�</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>มาร์�เยอรมันตะวันออ�</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>มาร์�เยอรมัน</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>ฟรัง�์จิบูตี</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>โครนเดนมาร์�</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>เปโซโดมินิ�ัน</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>ดีนาร์�อลจีเรีย</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>ซูเ�รเอ�วาดอร์</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>วาเลอร์คอนส�ตนต์เอ�วาดอร์</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>ครูนเอสโตเนีย</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>ปอนด์อียิปต์</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>�น�ฟาเอริเทรีย</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>เปเซตาสเปน (บั�ชีเอ)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>เปเซตาสเปน (บั�ชีที่เปลี่ยน�ปลงได้)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>เปเซตาสเปน</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>เบอรร์เอธิโอเปีย</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>ยูโร</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>มาร์��าฟิน�ลนด์</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>ดอลลาร์ฟิจิ</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>ปอนด์หมู่เ�าะฟอล์��ลนด์</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>ฟรัง�์�รั่งเศส</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>ปอนด์สเตอร์ลิง (สหราชอาณาจั�ร)</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>คูปอนลาริตจอร์เจีย</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>ลารีจอร์เจีย</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>เซดี�านา (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>เซดี�านา</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>ปอนด์ยิบรอลตาร์</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>ดาลาซี��มเบีย</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>ฟรัง�์�ินี</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>ไซลี�ินี</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>เอ็�เวเลอิเควทอเรียล�ินี</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>ดรัชมา�รี�</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>เควตซัล�ัวเตมาลา</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>เอสคูโด�ินีโปรตุเ�ส</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>เปโซ�ินี-บิสเซา</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>ดอลลาร์�ายอานา</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>ดอลลาร์ฮ่อง�ง</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>เลมปิราฮอดูรัส</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>ดีนาร์โครเอเชีย</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>คูนาโครเอเชีย</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>�ูร์ดเฮติ</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>ฟอรินต์ฮัง�ารี</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>รูเปียห์อินโดนีเซีย</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>ปอนด์ไอริช</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>ปอนด์อิสราเอล</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>นิวเชเ�ลอิสราเอล</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>รูปีอินเดีย</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>ดีนาร์อิรั�</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>เรียลอิหร่าน</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>โครนาไอซ์�ลนด์</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>ลีราอิตาลี</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>ดอลลาร์จาเม�า</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>ดีนาร์จอร์�ดน</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>เยน�ี่ปุ่น</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>ชิลลิ่งเคนยา</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>ซอมคีร์�ีซสถาน</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>เรียล�ัมพูชา</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>ฟรัง�์คอโมโรส</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>วอนเ�าหลีเหนือ</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>วอนเ�าหลีใต้</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>ดีนาร์คูเวต</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>ดอลลาร์หมู่เ�าะเคย์�มน</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>เทงเจคาซัคสถาน</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>�ีบลาว</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>ปอนด์เลบานอน</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>รูปีศรีลัง�า</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>ดอลลาร์ไลบีเรีย</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>โลตีเลโซโท</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>ลีตัสลิทัวเนีย</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>ทาโลนัสลิทัวเนีย</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>คอนเวอร์ทิเบิลฟรัง�์ลั�เซมเบิร์�</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>ฟรัง�์ลั�เซมเบิร์�</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>ไฟ�นลเชียลฟรัง�์ลั�เซมเบิร์�</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>ลัตส์ลัตเวีย</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>รูเบิลลัตเวีย</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>ดีนาร์ลิเบีย</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>ดี�รห์มโมร็อ�โ�</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>ฟรัง�์โมร็อ�โ�</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>ลิวมอลโดวา</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>อาเรียรีมาดา�ัส�าร์</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>ฟรัง�์มาดา�ัส�าร์</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>ดีนาร์มาซิโดเนีย</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>ฟรัง�์มาลี</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>จัคพม่า</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>ทู�ริ�มองโ�เลีย</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>ปาตา�ามาเ�๊า</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>ออ�ิวยามอริเตเนีย</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>ลีรามอลตา</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>ปอนด์มอลตา</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>รูปีมอริเชียส</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>รูฟิยามัลดีฟส์</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>ควาชามาลาวี</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>เปโซเม็�ซิโ�</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>เงินเปโซเม็�ซิโ� (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>ยูนิ�ดด ดี อินเวอร์ชั่น เม็�ซิโ�</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ริง�ิตมาเลเซีย</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>เอสคูโดโมซัมบิ�</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>เมติคัลโมซัมบิ�เ�่า</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>เมติคัลโมซัมบิ�</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>ดอลลาร์นามิเบีย</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>ไนราไนจีเรีย</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>คอร์โดบานิ�ารา�ัว</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>คอร์โดบาโอโรนิ�ารา�ัว</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>�ิลเดอร์เนเธอร์�ลนด์</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>โครนนอร์เวย์</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>รูปีเนปาล</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>ดอลลาร์นิวซี�ลนด์</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>เรียลโอมาน</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>บัลบัวปานามา</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>อินตีเปรู</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>นูโวซอลเปรู</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>ซอลเปรู</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>�ีนาปาปัวนิว�ีนี</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>เปโซฟิลิปปินส์</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>รูปีปา�ีสถาน</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>ซลอตีโป�ลนด์</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>ซลอตีโป�ลนด์ (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>เอสคูโดโปรตุเ�ส</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>�วารานีปารา�วัย</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>เรียล�าตาร์</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>ดอลลาร์โรดีเซีย</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>ลิวโรมาเนียเ�่า</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>ลิวโรมาเนีย</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>ดีนาร์เซอร์เบีย</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>รูเบิลรัสเซีย</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>รูเบิลรัสเซีย (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>ฟรัง�์รวันดา</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>ริยัลซาอุดีอาระเบีย</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>ดอลลาร์หมู่เ�าะโซโลมอน</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>รูปีเซเชลส์</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>ดีนาร์ซูดานเ�่า</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>ปอนด์ซูดาน</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>ปอนด์ซูดานเ�่า</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>โครนาสวีเดน</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>ดอลลาร์สิงคโปร์</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>ปอนด์เซนต์เฮเลนา</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>ทอลาร์สโลวีเนีย</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>โครูนาสโลวั�</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>ลีโอนเซียร์ราลีโอน</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>ชิลลิงโซมาเลีย</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>ดอลลาร์ซูรินาเม</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>�ิลเดอร์ซูรินาเม</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>ดอบราเซาตูเม�ละปรินซิปี</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>รูเบิลโซเวียต</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>โคลอนเอลซัลวาดอร์</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>ปอนด์ซีเรีย</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>ลิลัน�ีนีสวาซิ�ลนด์</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>บาทไทย</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>รูเบิลทาจิ�ิสถาน</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>โซโมนีทาจิ�ิสถาน</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>มานัตเติร์�เมนิสถาน</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>ดีนาร์ตูนิเซีย</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>พา�อง�าตอง�า</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>เอสคูโดติมอร์</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>ลีราตุร�ีเ�่า</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>ลีราตุร�ี</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>ดอลลาร์ตรินิ�ดด�ละโตเบโ�</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>ดอลลาร์ไต้หวันใหม่</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>ชิลลิง�ทนซาเนีย</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>ฮรีฟเนียยูเครน</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>คาร์โบวาเนตซ์ยูเครน</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>ชิลลิงยู�ันดา (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>ชิลลิงยู�ันดา</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ดอลลาร์สหรั�</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>ดอลลาร์สหรั� (วันถัดไป)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>ดอลลาร์สหรั� (วันเดียว�ัน)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>เปโซเอนยูนิ�ดดเซสอินเด็�ซา�ดสอุรุ�วัย</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>เปโซอุรุ�วัย (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>เปโซอุรุ�วัย</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>ซอมอุซเบ�ิสถาน</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>โบลิวาร์เวเนซุเอลา</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>โบลิวาร์ฟูร์เตเวเนซุเอลา</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>ดองเวียดนาม</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>วาตูวานูอาตู</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>ทาลาซามัว</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>ฟรัง�์เซฟาธนาคารรั��อฟริ�า�ลาง</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>เงิน</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>ทอง</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>หน่วยคอมโพสิตยุโรป</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>หน่วยโมเนทารียุโรป</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>หน่วยบั�ชียุโรป [XBC]</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>หน่วยบั�ชียุโรป [XBD]</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>ดอลลาร์�คริบเบียนตะวันออ�</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>สิทธิถอนเงินพิเศษ</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>หน่วยส�ุลเงินยุโรป</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>ฟรัง�์ทอง�รั่งเศส</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>ฟรัง�์ยูไอซี�รั่งเศส</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>ฟรัง�์เซฟาธนาคาร�ลางรั��อฟริ�าตะวันต�</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>พัลเลเดียม</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>ฟรัง�์ซีเอฟพี</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>�พลตินัม</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>�องทุน™ไรเน็ต</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>รหัสทดสอบส�ุลเงิน</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>ไม่มีหน่ว§ยส�ุลเงิน</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>ดีนาร์เยเมน</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>เรียลเยเมน</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>ฮาร์ดดีนาร์ยูโ�สลาเวีย</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>โนวิย์ดีนาร์ยูโ�สลาเวีย</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>คอนเวอร์ทิเบิลดีนาร์ยูโ�สลาเวีย</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>�รนด์�อฟริ�าใต้ (�ารเงิน)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>�รนด์�อฟริ�าใต้</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>ควาชา�ซมเบีย</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>นิว�ซร์คองโ�</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>�ซร์คองโ�</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>ดอลลาร์ซิมบับเว</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} วัน</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} ชั่วโมง</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} นาที</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} เดือน</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} วินาที</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} สัปดาห์</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} ปี</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ใช่</yesstr>
-			<nostr>ไม่ใช่</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/th_TH.xml b/airtime_mvc/library/Zend/Locale/Data/th_TH.xml
deleted file mode 100644
index f7213240f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/th_TH.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.49 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="th"/>
-		<territory type="TH"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ti.xml b/airtime_mvc/library/Zend/Locale/Data/ti.xml
deleted file mode 100644
index 34ab7a1aa..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ti.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.70 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="ti"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">አ�ሪቃንሰኛ</language>
-			<language type="am">አ��ረኛ</language>
-			<language type="ar">ዓረበኛ</language>
-			<language type="az">አዜርባይጃንኛ</language>
-			<language type="be">ቤላራሻኛ</language>
-			<language type="bg">ቡ�ጋሪኛ</language>
-			<language type="bh">ቢሃሪ</language>
-			<language type="bn">በንጋሊኛ</language>
-			<language type="br">ብሬቶን</language>
-			<language type="bs">ቦስኒያን</language>
-			<language type="ca">ካታላን</language>
-			<language type="cs">ቼክኛ</language>
-			<language type="cy">ወ�ሽ</language>
-			<language type="da">ዴኒሽ</language>
-			<language type="de">ጀርመን</language>
-			<language type="el">�ሪከኛ</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="eo">ኤስ�ራንቶ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="et">ኤስቶኒአን</language>
-			<language type="eu">ባስክኛ</language>
-			<language type="fa">�ርሲያኛ</language>
-			<language type="fi">�ኒሽ</language>
-			<language type="fil">ታጋሎገኛ</language>
-			<language type="fo">�ሮኛ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="fy">�ሪሰኛ</language>
-			<language type="ga">አይሪሽ</language>
-			<language type="gd">እስኮትስ ጌ�ክኛ</language>
-			<language type="gl">ጋለቪኛ</language>
-			<language type="gn">ጓራኒ</language>
-			<language type="gu">ጉጃራቲኛ</language>
-			<language type="he">ዕብራስጥ</language>
-			<language type="hi">ሕንደኛ</language>
-			<language type="hr">ክሮሽያንኛ</language>
-			<language type="hu">ሀንጋሪኛ</language>
-			<language type="ia">ኢንቴር ቋንቋ</language>
-			<language type="id">እንዶኑሲኛ</language>
-			<language type="is">አይስላንደኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="jv">ጃቫንኛ</language>
-			<language type="ka">ጊዮርጊያኛ</language>
-			<language type="kn">ካማደኛ</language>
-			<language type="ko">ኮሪያኛ</language>
-			<language type="ku">ኩርድሽ</language>
-			<language type="ky">ኪሩጋዚ</language>
-			<language type="la">ላቲንኛ</language>
-			<language type="lt">ሊቱአኒየን</language>
-			<language type="lv">ላቲቪያን</language>
-			<language type="mk">ማክዶኒኛ</language>
-			<language type="ml">ማላያላ�ኛ</language>
-			<language type="mr">ማራቲኛ</language>
-			<language type="ms">ማላይኛ</language>
-			<language type="mt">ማ�ቲስኛ</language>
-			<language type="ne">ኔ�ሊኛ</language>
-			<language type="nl">ደች</language>
-			<language type="nn">ኖርዌይኛ (ናይ �ኖርስክ)</language>
-			<language type="no">ኖርዌጂያን</language>
-			<language type="oc">ኦኪታንኛ</language>
-			<language type="or">ኦሪያ</language>
-			<language type="pa">�ንጃቢኛ</language>
-			<language type="pl">�ሊሽ</language>
-			<language type="ps">�ሽቶ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="pt_BR">�ርቱጋ�ኛ (ናይ ብራዚ�)</language>
-			<language type="pt_PT">�ርቱጋ�ኛ (ናይ �ርቱጋ�)</language>
-			<language type="ro">ሮማኒያን</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="sh">ሰርቦ- ክሮዊታን</language>
-			<language type="si">ስንሃ�ኛ</language>
-			<language type="sk">ስሎቨክኛ</language>
-			<language type="sl">ስ�ቪኛ</language>
-			<language type="sq">አ�ቤኒኛ</language>
-			<language type="sr">ሰርቢኛ</language>
-			<language type="st">ሰሴቶ</language>
-			<language type="su">ሱዳንኛ</language>
-			<language type="sv">ስዊድንኛ</language>
-			<language type="sw">ሰዋሂሊኛ</language>
-			<language type="ta">ታሚ�ኛ</language>
-			<language type="te">ተሉጉኛ</language>
-			<language type="th">ታይኛ</language>
-			<language type="ti">ት�ርኛ</language>
-			<language type="tk">ናይ ቱርኪ ሰብዓይ (ቱርካዊ)</language>
-			<language type="tlh">ክሊን�ኦንኛ</language>
-			<language type="tr">ቱርከኛ</language>
-			<language type="tw">ትዊ</language>
-			<language type="uk">ዩክረኒኛ</language>
-			<language type="ur">ኡርዱኛ</language>
-			<language type="uz">ኡ�በክኛ</language>
-			<language type="vi">ቪትና�ኛ</language>
-			<language type="xh">ዞሳኛ</language>
-			<language type="yi">ዪዲሽ</language>
-			<language type="zu">ዙሉኛ</language>
-		</languages>
-		<scripts>
-			<script type="Ethi">�ደ�</script>
-			<script type="Latn">ላቲን</script>
-		</scripts>
-		<territories>
-			<alias source="am"/>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F ሀ-ሆ ለ-ቆ ቈ ቊ-� �-ቖ ቘ ቚ-� በ-ኆ ኈ ኊ-� �-ኮ ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዎ �-ዖ ዘ-ዮ ደ-ዷ ጀ-ጎ � ጒ-ጕ ጠ-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[�-᎙ ሇ ⶀ ᎀ-ᎃ �-ⶄ ቇ ᎄ-ᎇ ⶅ-ⶇ ኇ ⶈ-ⶊ ኯ � ⶋ ዯ ⶌ ዸ-ዿ � ⶎ � ጘ-ጟ ⶓ-ⶖ �-ⶑ � ᎈ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጃንዩ</month>
-							<month type="2">�ብሩ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስ</month>
-							<month type="9">ሴ�ቴ</month>
-							<month type="10">ኦክተ</month>
-							<month type="11">ኖቬ�</month>
-							<month type="12">ዲሴ�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጃንዩወሪ</month>
-							<month type="2">�ብሩወሪ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ�</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስት</month>
-							<month type="9">ሴ�ቴ�በር</month>
-							<month type="10">ኦክተ�በር</month>
-							<month type="11">ኖቬ�በር</month>
-							<month type="12">ዲሴ�በር</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ጃ</month>
-							<month type="2">�</month>
-							<month type="3">ማ</month>
-							<month type="4">ኤ</month>
-							<month type="5">ሜ</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">ኦ</month>
-							<month type="9">ሴ</month>
-							<month type="10">ኦ</month>
-							<month type="11">ኖ</month>
-							<month type="12">ዲ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ሰንበ</day>
-							<day type="mon">ሰኑይ</day>
-							<day type="tue">ሠሉስ</day>
-							<day type="wed">ረቡዕ</day>
-							<day type="thu">ኃሙስ</day>
-							<day type="fri">ዓርቢ</day>
-							<day type="sat">ቀዳ�</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ሰንበት</day>
-							<day type="mon">ሰኑይ</day>
-							<day type="tue">ሠሉስ</day>
-							<day type="wed">ረቡዕ</day>
-							<day type="thu">ኃሙስ</day>
-							<day type="fri">ዓርቢ</day>
-							<day type="sat">ቀዳ�</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ሰ</day>
-							<day type="mon">ሰ</day>
-							<day type="tue">ሠ</day>
-							<day type="wed">ረ</day>
-							<day type="thu">ኃ</day>
-							<day type="fri">á‹“</day>
-							<day type="sat">ቀ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ንጉሆ ሰዓተ</am>
-				<pm>ድሕር ሰዓት</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">á‹“/á‹“</era>
-						<era type="1">ዓ/�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM መዓ�ቲ y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>አ�ሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ti_ER.xml b/airtime_mvc/library/Zend/Locale/Data/ti_ER.xml
deleted file mode 100644
index 9b38a0eed..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ti_ER.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.57 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="ti"/>
-		<territory type="ER"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[\u135F � �-� � � � �-� �-� ሀ-ሆ ለ-ሟ ረ-ቆ ቈ ቊ-� �-ቖ ቘ ቚ-� በ-ኆ ኈ ኊ-� �-ኮ ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዎ �-ዖ ዘ-ዮ ደ-ዷ ጀ-ጎ � ጒ-ጕ ጠ-ጯ ጸ-ጿ �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[�-᎙ ሇ ⶀ ᎀ-ᎃ � ሠ-ሧ ⶂ-ⶄ ቇ ᎄ-ᎇ ⶅ-ⶇ ኇ ⶈ-ⶊ ኯ � ⶋ ዯ ⶌ ዸ-ዿ � ⶎ � ጘ-ጟ ⶓ-ⶖ �-ⶑ �-� ᎈ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጥሪ</month>
-							<month type="2">ለካቲ</month>
-							<month type="3">መጋቢ</month>
-							<month type="4">ሚያ�</month>
-							<month type="5">�ንቦ</month>
-							<month type="6">ሰ�</month>
-							<month type="7">ሓ�ለ</month>
-							<month type="8">�ሓሰ</month>
-							<month type="9">መስከ</month>
-							<month type="10">ጥቅ�</month>
-							<month type="11">ሕዳር</month>
-							<month type="12">ታሕሳ</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጥሪ</month>
-							<month type="2">ለካቲት</month>
-							<month type="3">መጋቢት</month>
-							<month type="4">ሚያ�ያ</month>
-							<month type="5">�ንቦት</month>
-							<month type="6">ሰ�</month>
-							<month type="7">ሓ�ለ</month>
-							<month type="8">�ሓሰ</month>
-							<month type="9">መስከረ�</month>
-							<month type="10">ጥቅ�ቲ</month>
-							<month type="11">ሕዳር</month>
-							<month type="12">ታሕሳስ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="tue">ሰሉስ</day>
-							<day type="thu">ሓሙስ</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="tue">ሰሉስ</day>
-							<day type="thu">ሓሙስ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM መዓ�ቲ y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd - MM-dd</greatestDifference>
-							<greatestDifference id="M">MM-dd - MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E� MM-dd - E� MM-dd</greatestDifference>
-							<greatestDifference id="M">E� MM-dd - E� MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d-d</greatestDifference>
-							<greatestDifference id="M">MMM d - MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E� MMM d - E� MMM d</greatestDifference>
-							<greatestDifference id="M">E� MMM d - E� MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM - yyyy-MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM - yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd - yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E� yyyy-MM-dd - E� yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E� yyyy-MM-dd - E� yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E� yyyy-MM-dd - E� yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y MMM-MMM</greatestDifference>
-							<greatestDifference id="y">y MMM - y MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y MMM d-d</greatestDifference>
-							<greatestDifference id="M">y MMM d - MMM d</greatestDifference>
-							<greatestDifference id="y">y MMM d - y MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E� dd MMM መዓ�ቲ y G - E� dd MMM መዓ�ቲ y G</greatestDifference>
-							<greatestDifference id="M">E� dd MMM መዓ�ቲ y G - E� dd MMM መዓ�ቲ y G</greatestDifference>
-							<greatestDifference id="y">E� dd MMM መዓ�ቲ y G - E� dd MMM መዓ�ቲ y G</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ti_ET.xml b/airtime_mvc/library/Zend/Locale/Data/ti_ET.xml
deleted file mode 100644
index 398862d5d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ti_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ti"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tig.xml b/airtime_mvc/library/Zend/Locale/Data/tig.xml
deleted file mode 100644
index 8eb974072..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tig.xml
+++ /dev/null
@@ -1,500 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.62 $"/>
-		<generation date="$Date: 2009/06/15 03:46:24 $"/>
-		<language type="tig"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">አ�ርኛ</language>
-			<language type="ab">አብ�ዚኛ</language>
-			<language type="af">አ�ሪቃንስኛ</language>
-			<language type="am">አ��ረኛ</language>
-			<language type="ar">�ርቢኛ</language>
-			<language type="as">አሳሜዛዊ</language>
-			<language type="ay">አያማርኛ</language>
-			<language type="az">አዜርባይጃንኛ</language>
-			<language type="ba">ባስኪርኛ</language>
-			<language type="be">ቤላራሻኛ</language>
-			<language type="bg">ቡ�ጋሪኛ</language>
-			<language type="bh">ቢሃሪ</language>
-			<language type="bi">ቢስላ�ኛ</language>
-			<language type="bn">በንጋሊኛ</language>
-			<language type="bo">ትበትንኛ</language>
-			<language type="br">ብሬቶንኛ</language>
-			<language type="byn">ብሊን</language>
-			<language type="ca">ካታላንኛ</language>
-			<language type="co">ኮርሲካኛ</language>
-			<language type="cs">ቼክኛ</language>
-			<language type="cy">ወ�ሽ</language>
-			<language type="da">ዴኒሽ</language>
-			<language type="de">ጀርመን</language>
-			<language type="dz">ድዞን�ኻኛ</language>
-			<language type="el">�ሪክኛ</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="eo">ኤስ�ራንቶ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="et">ኤስቶኒአን</language>
-			<language type="eu">ባስክኛ</language>
-			<language type="fa">�ርሲያኛ</language>
-			<language type="fi">�ኒሽ</language>
-			<language type="fj">�ጂኛ</language>
-			<language type="fo">�ሮኛ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="fy">�ሪስኛ</language>
-			<language type="ga">አይሪሽ</language>
-			<language type="gd">እስኮትስ ጌ�ክኛ</language>
-			<language type="gez">�ዕ�ኛ</language>
-			<language type="gl">ጋለጋኛ</language>
-			<language type="gn">ጓራኒኛ</language>
-			<language type="gu">ጉጃርቲኛ</language>
-			<language type="ha">ሃ�ሳኛ</language>
-			<language type="he">ዕብራስጥ</language>
-			<language type="hi">�ንድኛ</language>
-			<language type="hr">ክሮሽያንኛ</language>
-			<language type="hu">ሀንጋሪኛ</language>
-			<language type="hy">አርመናዊ</language>
-			<language type="ia">ኢንቴርሊንጓ</language>
-			<language type="id">እንዶኒሲኛ</language>
-			<language type="ie">እንተርሊን�ወ</language>
-			<language type="ik">እኑ�ያቅኛ</language>
-			<language type="is">አይስላንድኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="iu">እኑክቲቱትኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="jv">ጃቫንኛ</language>
-			<language type="ka">ጊዮርጊያን</language>
-			<language type="kk">ካዛክኛ</language>
-			<language type="kl">ካላሊሱትኛ</language>
-			<language type="km">ክመርኛ</language>
-			<language type="kn">ካናዳኛ</language>
-			<language type="ko">ኮሪያኛ</language>
-			<language type="ks">ካሽሚርኛ</language>
-			<language type="ku">ኩርድሽኛ</language>
-			<language type="ky">ኪርጊ�ኛ</language>
-			<language type="la">ላቲንኛ</language>
-			<language type="ln">ሊንጋላኛ</language>
-			<language type="lo">ላ�ስኛ</language>
-			<language type="lt">ሊቱአኒያን</language>
-			<language type="lv">ላትቪያን</language>
-			<language type="mg">ማላጋስኛ</language>
-			<language type="mi">ማዮሪኛ</language>
-			<language type="mk">ማከዶኒኛ</language>
-			<language type="ml">ማላያላ�ኛ</language>
-			<language type="mn">ሞንጎላዊኛ</language>
-			<language type="mo">ሞ�ዳቫዊና</language>
-			<language type="mr">ማራዚኛ</language>
-			<language type="ms">ማላይኛ</language>
-			<language type="mt">ማ�ቲስኛ</language>
-			<language type="my">ቡርማኛ</language>
-			<language type="na">ናኡሩ</language>
-			<language type="ne">ኔ�ሊኛ</language>
-			<language type="nl">ደች</language>
-			<language type="no">ኖርዌጂያን</language>
-			<language type="oc">ኦኪታንኛ</language>
-			<language type="om">ኦሮ�ኛ</language>
-			<language type="or">ኦሪያኛ</language>
-			<language type="pa">�ንጃቢኛ</language>
-			<language type="pl">�ሊሽ</language>
-			<language type="ps">�ሽቶኛ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="qu">ኵቿኛ</language>
-			<language type="rm">ሮማንስ</language>
-			<language type="rn">ሩንዲኛ</language>
-			<language type="ro">ሮማኒያን</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="rw">ኪንያርዋንድኛ</language>
-			<language type="sa">ሳንስክሪትኛ</language>
-			<language type="sd">ሲንድሂኛ</language>
-			<language type="sg">ሳንጎኛ</language>
-			<language type="si">ስንሃ�ኛ</language>
-			<language type="sid">ሲዳ�ኛ</language>
-			<language type="sk">ስሎቫክኛ</language>
-			<language type="sl">ስሎቪኛ</language>
-			<language type="sm">ሳሞአኛ</language>
-			<language type="sn">ሾናኛ</language>
-			<language type="so">ሱማ�ኛ</language>
-			<language type="sq">�ቤኒኛ</language>
-			<language type="sr">ሰርቢኛ</language>
-			<language type="ss">ስዋቲኛ</language>
-			<language type="st">ሶዞኛ</language>
-			<language type="su">ሱዳንኛ</language>
-			<language type="sv">ስዊድንኛ</language>
-			<language type="sw">ስዋሂሊኛ</language>
-			<language type="ta">ታሚ�ኛ</language>
-			<language type="te">ተሉጉኛ</language>
-			<language type="tg">ታጂኪኛ</language>
-			<language type="th">ታይኛ</language>
-			<language type="ti">ት�ርኛ</language>
-			<language type="tig">ት�ረ</language>
-			<language type="tk">ቱርክመንኛ</language>
-			<language type="tl">ታጋሎገኛ</language>
-			<language type="tn">ጽዋናዊኛ</language>
-			<language type="to">ቶንጋ</language>
-			<language type="tr">ቱርክኛ</language>
-			<language type="ts">ጾንጋኛ</language>
-			<language type="tt">ታታርኛ</language>
-			<language type="tw">ትዊኛ</language>
-			<language type="ug">ኡዊ��ርኛ</language>
-			<language type="uk">ዩክረኒኛ</language>
-			<language type="ur">ኡርዱኛ</language>
-			<language type="uz">ኡ�በክኛ</language>
-			<language type="vi">ቪትና�ኛ</language>
-			<language type="vo">ቮላ�ክኛ</language>
-			<language type="wo">ዎሎ�ኛ</language>
-			<language type="xh">ዞሳኛ</language>
-			<language type="yi">ይዲሻዊኛ</language>
-			<language type="yo">ዮሩባዊኛ</language>
-			<language type="za">ዡዋን�ኛ</language>
-			<language type="zh">ቻይንኛ</language>
-			<language type="zu">ዙሉኛ</language>
-		</languages>
-		<scripts>
-			<script type="Latn">ላቲን</script>
-		</scripts>
-		<territories>
-			<territory type="AD">አንዶራ</territory>
-			<territory type="AE">የተባበሩት አረብ ኤ�ሬትስ</territory>
-			<territory type="AL">አ�ባኒያ</territory>
-			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ አንቲ�ስ</territory>
-			<territory type="AR">አርጀንቲና</territory>
-			<territory type="AT">ኦስትሪያ</territory>
-			<territory type="AU">አ�ስትሬሊያ</territory>
-			<territory type="AZ">አዘርባጃን</territory>
-			<territory type="BA">ቦስኒያ እና ሄርዞጎቪኒያ</territory>
-			<territory type="BB">ባርቤዶስ</territory>
-			<territory type="BE">ቤ�ጄ�</territory>
-			<territory type="BG">ቡ�ጌሪያ</territory>
-			<territory type="BH">ባህሬን</territory>
-			<territory type="BM">ቤርሙዳ</territory>
-			<territory type="BO">ቦሊቪያ</territory>
-			<territory type="BR">ብራዚ�</territory>
-			<territory type="BT">ቡህታን</territory>
-			<territory type="BY">ቤላሩስ</territory>
-			<territory type="BZ">ቤሊዘ</territory>
-			<territory type="CD">ኮንጎ</territory>
-			<territory type="CF">የመካከለኛ� አ�ሪካ ሪ�ብሊክ</territory>
-			<territory type="CH">ስዊዘርላንድ</territory>
-			<territory type="CL">ቺሊ</territory>
-			<territory type="CM">ካሜሩን</territory>
-			<territory type="CN">ቻይና</territory>
-			<territory type="CO">ኮሎ�ቢያ</territory>
-			<territory type="CS">ሰርቢያ</territory>
-			<territory type="CV">ኬ� ቬርዴ</territory>
-			<territory type="CY">ሳይ�ረስ</territory>
-			<territory type="CZ">ቼክ ሪ�ብሊክ</territory>
-			<territory type="DE">ጀርመን</territory>
-			<territory type="DK">ዴንማርክ</territory>
-			<territory type="DM">ዶሚኒካ</territory>
-			<territory type="DO">ዶሚኒክ ሪ�ብሊክ</territory>
-			<territory type="DZ">አ�ጄሪያ</territory>
-			<territory type="EC">ኢኳዶር</territory>
-			<territory type="EE">ኤስቶኒያ</territory>
-			<territory type="EG">�ብጽ</territory>
-			<territory type="EH">�ዕራባዊ ሳህራ</territory>
-			<territory type="ER">ኤርትራ</territory>
-			<territory type="ES">ስ�ን</territory>
-			<territory type="ET">ኢትዮጵያ</territory>
-			<territory type="FI">�ንላንድ</territory>
-			<territory type="FJ">�ጂ</territory>
-			<territory type="FM">ሚክሮኔዢያ</territory>
-			<territory type="FR">�ረንሳይ</territory>
-			<territory type="GB">እን�ሊ�</territory>
-			<territory type="GE">ጆርጂያ</territory>
-			<territory type="GF">የ�ረንሳይ ጉዊአና</territory>
-			<territory type="GM">ጋ�ቢያ</territory>
-			<territory type="GN">ጊኒ</territory>
-			<territory type="GQ">ኢኳቶሪያ� ጊኒ</territory>
-			<territory type="GR">�ሪክ</territory>
-			<territory type="GW">ቢሳዎ</territory>
-			<territory type="GY">ጉያና</territory>
-			<territory type="HK">ሆን� ኮን�</territory>
-			<territory type="HR">ክሮኤሽያ</territory>
-			<territory type="HT">ሀይቲ</territory>
-			<territory type="HU">ሀንጋሪ</territory>
-			<territory type="ID">ኢንዶኔዢያ</territory>
-			<territory type="IE">አየርላንድ</territory>
-			<territory type="IL">እስራኤ�</territory>
-			<territory type="IN">ህንድ</territory>
-			<territory type="IQ">ኢራቅ</territory>
-			<territory type="IS">አይስላንድ</territory>
-			<territory type="IT">ጣሊያን</territory>
-			<territory type="JM">ጃማይካ</territory>
-			<territory type="JO">ጆርዳን</territory>
-			<territory type="JP">ጃ�ን</territory>
-			<territory type="KH">ካ�ቦዲያ</territory>
-			<territory type="KM">ኮሞሮስ</territory>
-			<territory type="KP">ደቡብ ኮሪያ</territory>
-			<territory type="KR">ሰሜን ኮሪያ</territory>
-			<territory type="KW">ክዌት</territory>
-			<territory type="LB">ሊባኖስ</territory>
-			<territory type="LT">ሊቱዌኒያ</territory>
-			<territory type="LV">ላትቪያ</territory>
-			<territory type="LY">ሊቢያ</territory>
-			<territory type="MA">ሞሮኮ</territory>
-			<territory type="MD">ሞ�ዶቫ</territory>
-			<territory type="MK">ማከዶኒያ</territory>
-			<territory type="MN">ሞንጎሊያ</territory>
-			<territory type="MO">ማካዎ</territory>
-			<territory type="MR">ሞሪቴኒያ</territory>
-			<territory type="MT">ማ�ታ</territory>
-			<territory type="MU">ማሩሸስ</territory>
-			<territory type="MX">ሜክሲኮ</territory>
-			<territory type="MY">ማሌዢያ</territory>
-			<territory type="NA">ናሚቢያ</territory>
-			<territory type="NC">ኒ� ካሌዶኒያ</territory>
-			<territory type="NG">ናይጄሪያ</territory>
-			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
-			<territory type="NP">ኔ��</territory>
-			<territory type="NZ">ኒ� ዚላንድ</territory>
-			<territory type="PE">�ሩ</territory>
-			<territory type="PF">የ�ረንሳይ �ሊኔዢያ</territory>
-			<territory type="PG">��ዋ ኒ� ጊኒ</territory>
-			<territory type="PL">�ላንድ</territory>
-			<territory type="PR">�ርታ ሪኮ</territory>
-			<territory type="RO">ሮሜኒያ</territory>
-			<territory type="RU">ራሺያ</territory>
-			<territory type="SA">ሳ�ድአረቢያ</territory>
-			<territory type="SD">ሱዳን</territory>
-			<territory type="SE">ስዊድን</territory>
-			<territory type="SG">ሲንጋ�ር</territory>
-			<territory type="SI">ስሎቬኒያ</territory>
-			<territory type="SK">ስሎቫኪያ</territory>
-			<territory type="SN">ሴኔጋ�</territory>
-			<territory type="SO">ሱማሌ</territory>
-			<territory type="SY">ሲሪያ</territory>
-			<territory type="TD">ቻድ</territory>
-			<territory type="TF">የ�ረንሳይ ደቡባዊ �ዛቶች</territory>
-			<territory type="TH">ታይላንድ</territory>
-			<territory type="TJ">ታጃኪስታን</territory>
-			<territory type="TL">�ስራቅ ቲሞር</territory>
-			<territory type="TN">ቱኒዚያ</territory>
-			<territory type="TR">ቱርክ</territory>
-			<territory type="TT">ትሪኒዳድ እና ቶባጎ</territory>
-			<territory type="TZ">ታንዛኒያ</territory>
-			<territory type="UG">ዩጋንዳ</territory>
-			<territory type="US">አሜሪካ</territory>
-			<territory type="UZ">ዩ�በኪስታን</territory>
-			<territory type="VE">ቬንዙዌላ</territory>
-			<territory type="VG">የእን�ሊ� ድን�� ደሴቶች</territory>
-			<territory type="VI">የአሜሪካ ቨርጂን ደሴቶች</territory>
-			<territory type="YE">የመን</territory>
-			<territory type="ZA">ደቡብ አ�ሪካ</territory>
-			<territory type="ZM">ዛ�ቢያ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F � �-� � � � �-᎙ �-� �-� ሀ-� ⶀ �-ሟ ᎀ-ᎃ � ሠ-ሯ ⶂ ሰ-ሷ ⶃ ሸ-ሿ ⶄ ቀ-ቈ ቊ-� �-ቖ ቘ ቚ-� በ-ቧ ᎄ-ᎇ ⶅ ቨ-ቷ ⶆ ቸ-ቿ ⶇ ኀ-ኈ ኊ-� �-ኗ ⶈ ኘ-ኟ ⶉ አ-ኧ ⶊ ከ-ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዖ ዘ-ዟ ⶋ ዠ-ዷ ⶌ ዸ-ዿ � ጀ-ጇ ⶎ ገ-� ጒ-ጕ ጘ-ጟ ⶓ-ⶖ ጠ-ጧ � ጨ-ጯ � ጰ-ጷ ⶑ ጸ-� ᎈ-ᎋ �-� ᎌ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጃንዩ</month>
-							<month type="2">�ብሩ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስ</month>
-							<month type="9">ሴ�ቴ</month>
-							<month type="10">ኦክተ</month>
-							<month type="11">ኖቬ�</month>
-							<month type="12">ዲሴ�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጃንዩወሪ</month>
-							<month type="2">�ብሩወሪ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ�</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስት</month>
-							<month type="9">ሴ�ቴ�በር</month>
-							<month type="10">ኦክተ�በር</month>
-							<month type="11">ኖቬ�በር</month>
-							<month type="12">ዲሴ�በር</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ጃ</month>
-							<month type="2">�</month>
-							<month type="3">ማ</month>
-							<month type="4">ኤ</month>
-							<month type="5">ሜ</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">ኦ</month>
-							<month type="9">ሴ</month>
-							<month type="10">ኦ</month>
-							<month type="11">ኖ</month>
-							<month type="12">ዲ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ሰ/ዓ</day>
-							<day type="mon">ሰኖ</day>
-							<day type="tue">ታላሸ</day>
-							<day type="wed">ኣረር</day>
-							<day type="thu">ከሚሽ</day>
-							<day type="fri">ጅ�ዓ</day>
-							<day type="sat">ሰ/ን</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">ሰንበት ዓባይ</day>
-							<day type="mon">ሰኖ</day>
-							<day type="tue">ታላሸኖ</day>
-							<day type="wed">ኣረርባዓ</day>
-							<day type="thu">ከሚሽ</day>
-							<day type="fri">ጅ�ዓት</day>
-							<day type="sat">ሰንበት ንኢሽ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ሰ</day>
-							<day type="mon">ሰ</day>
-							<day type="tue">ታ</day>
-							<day type="wed">ኣ</day>
-							<day type="thu">ከ</day>
-							<day type="fri">ጅ</day>
-							<day type="sat">ሰ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>ቀደ� ሰር�ዕ�</am>
-				<pm>ሓቆ ስር�ዕ�</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">á‹“/á‹“</era>
-						<era type="1">ዓ/�</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM ዮ� y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>አ�ሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/tig_ER.xml b/airtime_mvc/library/Zend/Locale/Data/tig_ER.xml
deleted file mode 100644
index f2490f578..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tig_ER.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.36 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tig"/>
-		<territory type="ER"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tl.xml b/airtime_mvc/library/Zend/Locale/Data/tl.xml
deleted file mode 100644
index 4095f03ba..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.9 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tl"/>
-	</identity>
-	<alias source="fil" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tn.xml b/airtime_mvc/library/Zend/Locale/Data/tn.xml
deleted file mode 100644
index a93bf3b7d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tn.xml
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Seburu</language>
-			<language type="am">Amhariki</language>
-			<language type="ar">Arabic</language>
-			<language type="az">Azerbaijani</language>
-			<language type="be">Belarusian</language>
-			<language type="bg">Bulgarian</language>
-			<language type="bh">Bihari</language>
-			<language type="bn">Bengali</language>
-			<language type="bs">SeBosnia</language>
-			<language type="ca">Catalan</language>
-			<language type="cs">Se Czeck</language>
-			<language type="cy">Welsh</language>
-			<language type="da">Danish</language>
-			<language type="de">German</language>
-			<language type="el">SeGerika</language>
-			<language type="en">Sekgoa</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Spanish</language>
-			<language type="et">Estonian</language>
-			<language type="eu">Basque</language>
-			<language type="fa">Mo/SePerishia</language>
-			<language type="fi">Se-Finland</language>
-			<language type="fil">Tagalog</language>
-			<language type="fo">Faroese</language>
-			<language type="fr">Se Fora</language>
-			<language type="fy">Frisian</language>
-			<language type="ga">Irish</language>
-			<language type="gd">Scots Gaelic</language>
-			<language type="gl">Galician</language>
-			<language type="gu">Gujarati</language>
-			<language type="he">Se heberu</language>
-			<language type="hi">Hindi</language>
-			<language type="hr">Croatian</language>
-			<language type="hu">Hungarian</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Indonesian</language>
-			<language type="is">Icelandic</language>
-			<language type="it">Se Italiano</language>
-			<language type="ja">Se Japan</language>
-			<language type="jv">Javanese</language>
-			<language type="ka">Mo/SeJojia</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Se Korea</language>
-			<language type="la">Latin</language>
-			<language type="lt">Lithuanian</language>
-			<language type="lv">Latvian</language>
-			<language type="mk">Macedonian</language>
-			<language type="ml">Malayalam</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malay</language>
-			<language type="mt">Maltese</language>
-			<language type="ne">Nepali</language>
-			<language type="nl">Se Dutch</language>
-			<language type="no">Puo ya kwa Norway</language>
-			<language type="oc">Occitan</language>
-			<language type="pa">Punjabi</language>
-			<language type="pl">Se Poland</language>
-			<language type="pt">Se Potoketsi</language>
-			<language type="ro">Se Roma</language>
-			<language type="ru">Russian</language>
-			<language type="sk">Slovak</language>
-			<language type="sl">Slovenian</language>
-			<language type="sq">Albanian</language>
-			<language type="sr">Serbian</language>
-			<language type="su">Mo/SeSundane</language>
-			<language type="sv">Swedish</language>
-			<language type="sw">Swahili</language>
-			<language type="ta">Tamil</language>
-			<language type="te">Telugu</language>
-			<language type="th">Thai</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tlh">Klingon</language>
-			<language type="tn">Setswana</language>
-			<language type="tr">Turkish</language>
-			<language type="uk">Ukrainian</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Uzbek</language>
-			<language type="vi">Vietnamese</language>
-			<language type="xh">IsiXhosa</language>
-			<language type="zu">IsiZulu</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b d e ê f-o ô p r-u w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q v x z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Fer</month>
-							<month type="2">Tlh</month>
-							<month type="3">Mop</month>
-							<month type="4">Mor</month>
-							<month type="5">Mot</month>
-							<month type="6">See</month>
-							<month type="7">Phu</month>
-							<month type="8">Pha</month>
-							<month type="9">Lwe</month>
-							<month type="10">Dip</month>
-							<month type="11">Ngw</month>
-							<month type="12">Sed</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ferikgong</month>
-							<month type="2">Tlhakole</month>
-							<month type="3">Mopitlo</month>
-							<month type="4">Moranang</month>
-							<month type="5">Motsheganang</month>
-							<month type="6">Seetebosigo</month>
-							<month type="7">Phukwi</month>
-							<month type="8">Phatwe</month>
-							<month type="9">Lwetse</month>
-							<month type="10">Diphalane</month>
-							<month type="11">Ngwanatsele</month>
-							<month type="12">Sedimonthole</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Tsh</day>
-							<day type="mon">Mos</day>
-							<day type="tue">Bed</day>
-							<day type="wed">Rar</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Tla</day>
-							<day type="sat">Mat</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Tshipi</day>
-							<day type="mon">Mosopulogo</day>
-							<day type="tue">Labobedi</day>
-							<day type="wed">Laboraro</day>
-							<day type="thu">Labone</day>
-							<day type="fri">Labotlhano</day>
-							<day type="sat">Matlhatso</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/tn_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/tn_ZA.xml
deleted file mode 100644
index 969ca7f0c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tn_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tn"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/to.xml b/airtime_mvc/library/Zend/Locale/Data/to.xml
deleted file mode 100644
index 8e098fdce..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/to.xml
+++ /dev/null
@@ -1,611 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="to"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ar">lea fakaʻalepea</language>
-			<language type="art">lea faʻu pē kehe</language>
-			<language type="de">lea fakasiamane</language>
-			<language type="el">lea fakakalisi</language>
-			<language type="en">lea fakapilit�nia</language>
-			<language type="es">lea fakasepeni</language>
-			<language type="fa">lea fakapēsia</language>
-			<language type="fi">lea fakafinilani</language>
-			<language type="fj">lea fakafisi</language>
-			<language type="fr">lea fakafalanisē</language>
-			<language type="ga">lea fakaʻaealani</language>
-			<language type="gil">lea fakakilipasi</language>
-			<language type="grc">lea fakakalisimuʻa</language>
-			<language type="haw">lea fakahauaiʻi</language>
-			<language type="he">lea fakahepelū</language>
-			<language type="it">lea fakaʻītali</language>
-			<language type="ja">lea fakasiapani</language>
-			<language type="ko">lea fakak�lea</language>
-			<language type="la">lea fakalatina</language>
-			<language type="mh">lea fakam�solo</language>
-			<language type="mi">lea fakamauli</language>
-			<language type="mis">lea kehekehe</language>
-			<language type="ms">lea fakamalei</language>
-			<language type="my">lea fakapema</language>
-			<language type="na">lea fakanaulu</language>
-			<language type="niu">lea fakaniuē</language>
-			<language type="nl">lea fakaholani</language>
-			<language type="no">lea fakanoauē</language>
-			<language type="pt">lea fakapotukali</language>
-			<language type="pt_BR">lea fakapotukali-pal�sili</language>
-			<language type="rap">lea fakalapanui</language>
-			<language type="rar">lea fakalalotonga</language>
-			<language type="ru">lea fakalusia</language>
-			<language type="sco">lea fakasikotilani</language>
-			<language type="sgn">lea fakaʻilonga</language>
-			<language type="sm">lea fakahaʻamoa</language>
-			<language type="sv">lea fakasueteni</language>
-			<language type="tkl">lea fakatokelau</language>
-			<language type="to">lea fakatonga</language>
-			<language type="tr">lea fakatoake</language>
-			<language type="tvl">lea fakatūvalu</language>
-			<language type="ty">lea fakatahisi</language>
-			<language type="und">lea taʻeʻiloa</language>
-			<language type="zh">lea fakasiaina</language>
-			<language type="zh_Hans">lea fakasiaina fakangofua</language>
-			<language type="zh_Hant">lea fakasiaina tukufakaholo</language>
-			<language type="zxx">ʻikai ha lea</language>
-		</languages>
-		<scripts>
-			<script type="Arab">tohinima fakaʻalepea</script>
-			<script type="Brai">tohinima maʻa e kakai kui</script>
-			<script type="Cyrl">tohinima fakalūsia</script>
-			<script type="Grek">tohinima fakakalisi</script>
-			<script type="Hani">tohinima fakasiaina</script>
-			<script type="Hans">tohinima fakasiaina fakafaingofua</script>
-			<script type="Hant">tohinima fakasiaina fakatukutala</script>
-			<script type="Hebr">tohinima fakahepelū</script>
-			<script type="Jpan">tohinima fakasiapani</script>
-			<script type="Kore">tohinima fakakolea</script>
-			<script type="Latn">tohinima fakalatina</script>
-			<script type="Zxxx">tohinima taʻetohitohiʻi</script>
-			<script type="Zyyy">tohinima meʻataha</script>
-			<script type="Zzzz">tohinima taʻeʻiloa</script>
-		</scripts>
-		<territories>
-			<territory type="001">M�mani</territory>
-			<territory type="002">ʻAfelika</territory>
-			<territory type="003">ʻAmelika tokelau</territory>
-			<territory type="005">ʻAmelika tonga</territory>
-			<territory type="009">ʻOseania</territory>
-			<territory type="011">ʻAfelika hihifo</territory>
-			<territory type="013">ʻAmelika lotoloto</territory>
-			<territory type="014">ʻAfelika hahake</territory>
-			<territory type="015">ʻAfelika tokelau</territory>
-			<territory type="017">ʻAfelika lotoloto</territory>
-			<territory type="018">ʻAfelika fakatonga</territory>
-			<territory type="019">Ongo ʻAmelika</territory>
-			<territory type="021">ʻAmelika tonga ange</territory>
-			<territory type="029">Kalipea</territory>
-			<territory type="030">ʻĒsia hahake</territory>
-			<territory type="034">ʻĒsia tonga</territory>
-			<territory type="035">ʻĒsia tongahahake</territory>
-			<territory type="039">ʻEulope tonga</territory>
-			<territory type="053">ʻAositelēlia mo Nuʻusila</territory>
-			<territory type="054">Melanisia</territory>
-			<territory type="057">Potu fonua Mikolonisia</territory>
-			<territory type="061">Polinisia</territory>
-			<territory type="062">ʻĒsia tongalotoloto</territory>
-			<territory type="142">ʻĒsia</territory>
-			<territory type="143">ʻĒsia lotoloto</territory>
-			<territory type="145">ʻĒsia hihifo</territory>
-			<territory type="150">ʻEulope</territory>
-			<territory type="151">ʻEulope hahake</territory>
-			<territory type="154">ʻEulope tokelau</territory>
-			<territory type="155">ʻEulope hihifo</territory>
-			<territory type="172">Komoniueli</territory>
-			<territory type="419">ʻAmelika fakalatina mo Kalipea</territory>
-			<territory type="AG">Anitikua mo Palaputa</territory>
-			<territory type="AI">Anikuila</territory>
-			<territory type="AQ">ʻAnet�tika</territory>
-			<territory type="AS">Haʻamoa fakaʻamelika</territory>
-			<territory type="AU">ʻAositelēlia</territory>
-			<territory type="BE">Pelesiume</territory>
-			<territory type="BR">Pal�sili</territory>
-			<territory type="BS">Pahama</territory>
-			<territory type="BV">Motu Puveti</territory>
-			<territory type="BW">Potisiuana</territory>
-			<territory type="BZ">Pelise</territory>
-			<territory type="CA">K�nata</territory>
-			<territory type="CH">Suisilani</territory>
-			<territory type="CK">ʻOtumotu Kuki</territory>
-			<territory type="CN">Siaina</territory>
-			<territory type="CX">Motu Kilisimasi</territory>
-			<territory type="DE">Siamane</territory>
-			<territory type="DM">Tominika</territory>
-			<territory type="EG">ʻIsipite</territory>
-			<territory type="ES">Sepeni</territory>
-			<territory type="FI">Finilani</territory>
-			<territory type="FJ">Fisi</territory>
-			<territory type="FM">Mikolonisia</territory>
-			<territory type="FR">Falanisē</territory>
-			<territory type="GB">Pilit�nia</territory>
-			<territory type="GD">Kelenat�</territory>
-			<territory type="GG">Kuenisī</territory>
-			<territory type="GH">Kana</territory>
-			<territory type="GI">Sipal�lit�</territory>
-			<territory type="GM">Kamipia</territory>
-			<territory type="GR">Kalisi</territory>
-			<territory type="GS">ʻOtumotu Siosia-tonga mo Saniuisi-tonga</territory>
-			<territory type="GU">Kuami</territory>
-			<territory type="GY">Kuiana</territory>
-			<territory type="HK">Hongi Kongi SAR Siaina</territory>
-			<territory type="HM">ʻOtumotu Heati mo Makitonali</territory>
-			<territory type="HN">Honitulasi</territory>
-			<territory type="IE">ʻAealani</territory>
-			<territory type="IL">ʻIsileli</territory>
-			<territory type="IM">Motu Mani</territory>
-			<territory type="IN">ʻInitia</territory>
-			<territory type="IO">Potu fonua moana ʻInitia fakapilit�nia</territory>
-			<territory type="IT">ʻĪtali</territory>
-			<territory type="JE">Selusī</territory>
-			<territory type="JP">Siapani</territory>
-			<territory type="KE">Kenia</territory>
-			<territory type="KI">Kilipasi</territory>
-			<territory type="KP">K�loa tokelau</territory>
-			<territory type="KR">K�lea tonga</territory>
-			<territory type="LK">SÄ«loni</territory>
-			<territory type="LR">Laipelia</territory>
-			<territory type="LS">Lesoto</territory>
-			<territory type="MH">ʻOtumotu M�solo</territory>
-			<territory type="MP">ʻOtumotu Maliana tokelau</territory>
-			<territory type="MS">Moʻungaselati</territory>
-			<territory type="MT">Malita</territory>
-			<territory type="MU">Maulitiusi</territory>
-			<territory type="MW">Malaui</territory>
-			<territory type="MX">Mekesik�</territory>
-			<territory type="NA">Namipia</territory>
-			<territory type="NC">Niu Kaletonia</territory>
-			<territory type="NF">Motu N�foliki</territory>
-			<territory type="NG">Naisilia</territory>
-			<territory type="NL">Holani</territory>
-			<territory type="NO">Noauē</territory>
-			<territory type="NR">Naulu</territory>
-			<territory type="NU">Niuē</territory>
-			<territory type="NZ">Nuʻusila</territory>
-			<territory type="PA">Panam�</territory>
-			<territory type="PF">Polinisia fakafalanisē</territory>
-			<territory type="PG">Papuaniukini</territory>
-			<territory type="PK">Pakisitani</territory>
-			<territory type="PN">Pitikeni</territory>
-			<territory type="PT">Potukali</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="QU">ʻEulope fakataha</territory>
-			<territory type="RU">LÅ«sia</territory>
-			<territory type="RW">Luanit�</territory>
-			<territory type="SB">ʻOtumotu Solomone</territory>
-			<territory type="SC">ʻOtumotu Seiseli</territory>
-			<territory type="SE">Suēteni</territory>
-			<territory type="SG">Singapula</territory>
-			<territory type="TF">Potu fonua tonga fakafalanisē</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Toake</territory>
-			<territory type="TT">Tilinitati mo Topako</territory>
-			<territory type="TV">TÅ«valu</territory>
-			<territory type="UM">ʻOtumotu siʻi ʻo ʻAmelika</territory>
-			<territory type="US">Puleʻanga fakataha ʻAmelika</territory>
-			<territory type="VA">Vatikani</territory>
-			<territory type="VG">ʻOtumotu Vilikini fakapilit�nia</territory>
-			<territory type="VI">ʻOtumotu Vilikini fakaʻamelika</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">ʻUvea mo Futuna</territory>
-			<territory type="WS">Haʻamoa</territory>
-			<territory type="ZA">ʻAfelika tonga</territory>
-			<territory type="ZW">Simipapue</territory>
-			<territory type="ZZ">Potu fonua taʻeʻiloa pe hala</territory>
-		</territories>
-		<keys>
-			<key type="calendar">tohi m�hina</key>
-			<key type="collation">tohi hokohoko</key>
-			<key type="currency">paʻanga</key>
-		</keys>
-		<types>
-			<type type="buddhist" key="calendar">fakaputa</type>
-			<type type="chinese" key="calendar">fakasiaina</type>
-			<type type="direct" key="collation">hangatonu</type>
-			<type type="gregorian" key="calendar">fakakelekolia</type>
-			<type type="hebrew" key="calendar">fakahepelū</type>
-			<type type="indian" key="calendar">fakaʻinitia</type>
-			<type type="islamic" key="calendar">fakamohameti</type>
-			<type type="islamic-civil" key="calendar">fakamohameti-sivile</type>
-			<type type="japanese" key="calendar">fakasiapani</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">fakamita</measurementSystemName>
-			<measurementSystemName type="US">fakaʻamelika</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á � e é ē f h ʻ i í ī k-n {ng} o ó � p s-u ú ū v]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[à ă â å ä æ b c ç d è ĕ ê ë g ì ĭ î ï j ñ ò � ô ö ø œ q r ß ù ŭ û ü w-y ÿ z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>«</alternateQuotationStart>
-		<alternateQuotationEnd>»</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">S�n</month>
-							<month type="2">FÄ“p</month>
-							<month type="3">Maʻa</month>
-							<month type="4">ʻEpe</month>
-							<month type="5">MÄ“</month>
-							<month type="6">Sun</month>
-							<month type="7">Siu</month>
-							<month type="8">ʻAok</month>
-							<month type="9">SÄ“p</month>
-							<month type="10">ʻOka</month>
-							<month type="11">N�v</month>
-							<month type="12">Tis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">S�nuali</month>
-							<month type="2">FÄ“pueli</month>
-							<month type="3">Maʻasi</month>
-							<month type="4">ʻEpeleli</month>
-							<month type="5">MÄ“</month>
-							<month type="6">Sune</month>
-							<month type="7">Siulai</month>
-							<month type="8">ʻAokosi</month>
-							<month type="9">SÄ“pitema</month>
-							<month type="10">ʻOkatopa</month>
-							<month type="11">N�vema</month>
-							<month type="12">Tisema</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">S</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">E</month>
-							<month type="5">M</month>
-							<month type="6">S</month>
-							<month type="7">S</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">T</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">S�p</day>
-							<day type="mon">M�n</day>
-							<day type="tue">Tus</day>
-							<day type="wed">Pul</day>
-							<day type="thu">Tuʻa</day>
-							<day type="fri">Fal</day>
-							<day type="sat">Tok</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">S�pate</day>
-							<day type="mon">M�nite</day>
-							<day type="tue">Tusite</day>
-							<day type="wed">Pulelulu</day>
-							<day type="thu">Tuʻapulelulu</day>
-							<day type="fri">Falaite</day>
-							<day type="sat">Tokonaki</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">T</day>
-							<day type="wed">P</day>
-							<day type="thu">T</day>
-							<day type="fri">F</day>
-							<day type="sat">T</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">kuata ʻuluaki</quarter>
-							<quarter type="2">kuata ua</quarter>
-							<quarter type="3">kuata tolu</quarter>
-							<quarter type="4">kuata f�</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">kuata 1</quarter>
-							<quarter type="2">kuata 2</quarter>
-							<quarter type="3">kuata 3</quarter>
-							<quarter type="4">kuata 4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>HH</am>
-				<pm>EA</pm>
-				<eras>
-					<eraNames>
-						<era type="0">ki muʻa</era>
-						<era type="1">taʻu ʻo Sīsū</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">KM</era>
-						<era type="1">TS</era>
-					</eraAbbr>
-					<eraNarrow>
-						<era type="0">K�M�</era>
-						<era type="1">T�S�</era>
-					</eraNarrow>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
-						<dateFormatItem id="MEd">E d-M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">MM-yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>kuonga</displayName>
-					</field>
-					<field type="year">
-						<displayName>taʻu</displayName>
-					</field>
-					<field type="month">
-						<displayName>m�hina</displayName>
-					</field>
-					<field type="week">
-						<displayName>uike</displayName>
-					</field>
-					<field type="day">
-						<displayName>ʻaho</displayName>
-						<relative type="-2">ʻaneheafi</relative>
-						<relative type="-1">ʻaneafi</relative>
-						<relative type="0">ʻahó ni</relative>
-						<relative type="1">ʻapongipongi</relative>
-						<relative type="2">ʻahepongipongi</relative>
-					</field>
-					<field type="weekday">
-						<displayName>ʻaho ʻo e uike</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>HH/EA</displayName>
-					</field>
-					<field type="hour">
-						<displayName>houa</displayName>
-					</field>
-					<field type="minute">
-						<displayName>miniti</displayName>
-					</field>
-					<field type="second">
-						<displayName>sekoni</displayName>
-					</field>
-					<field type="zone">
-						<displayName>vahetaimi</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>Houa {0}</regionFormat>
-			<metazone type="Fiji">
-				<long>
-					<standard>houa fakafisi</standard>
-					<daylight>houa fakafisi fakamaama</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>houa fakahauaʻi</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>houa fakanuʻusila</generic>
-					<standard>houa fakanuʻusila fakasīpinga</standard>
-					<daylight>houa fakanuʻusila fakamaama</daylight>
-				</long>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>houa fakaniuē</standard>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>houa fakahaʻamoa</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>houa fakatahisi</standard>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>houa fakatokelau</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>houa fakatonga</standard>
-					<daylight>houa fakatonga lotohē</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>houa fakatūvalu</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>houa fakaʻuvea mo futuna</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} ʻa</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} m</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} u</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} t</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>ʻio</yesstr>
-			<nostr>ʻikai</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/to_TO.xml b/airtime_mvc/library/Zend/Locale/Data/to_TO.xml
deleted file mode 100644
index 8610c3bc7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/to_TO.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.7 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="to"/>
-		<territory type="TO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tr.xml b/airtime_mvc/library/Zend/Locale/Data/tr.xml
deleted file mode 100644
index eca63b7fb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tr.xml
+++ /dev/null
@@ -1,3770 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.126 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="tr"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">Afar</language>
-			<language type="ab">Abazca</language>
-			<language type="ace">Achinese</language>
-			<language type="ach">Acoli</language>
-			<language type="ada">Adangme</language>
-			<language type="ady">Çerkezce</language>
-			<language type="ae">Avestçe</language>
-			<language type="af">Afrikaan Dili</language>
-			<language type="afa">Afro-Asyatik Diller</language>
-			<language type="afh">Afrihili</language>
-			<language type="ain">Ayni Dili</language>
-			<language type="ak">Akan</language>
-			<language type="akk">Akad Dili</language>
-			<language type="ale">Aleut</language>
-			<language type="alg">Algonkin Dili</language>
-			<language type="alt">Güney Altayca</language>
-			<language type="am">Amharca</language>
-			<language type="an">Aragonca</language>
-			<language type="ang">Eski Ä°ngilizce</language>
-			<language type="anp">Angika</language>
-			<language type="apa">Apaçi Dilleri</language>
-			<language type="ar">Arapça</language>
-			<language type="arc">Aramice</language>
-			<language type="arn">Araukanya Dili</language>
-			<language type="arp">Arapaho Dili</language>
-			<language type="art">Yapay Diller</language>
-			<language type="arw">Arawak Dili</language>
-			<language type="as">Assamca</language>
-			<language type="ast">Asturyasca</language>
-			<language type="ath">AtabaÅŸkan Dilleri</language>
-			<language type="aus">Avustralya Dilleri</language>
-			<language type="av">Avar Dili</language>
-			<language type="awa">Awadhi</language>
-			<language type="ay">Aymara</language>
-			<language type="az">Azerice</language>
-			<language type="ba">Başkırtça</language>
-			<language type="bad">Banda Dili</language>
-			<language type="bai">Bamileke Dilleri</language>
-			<language type="bal">Baluchi</language>
-			<language type="ban">Bali Dili</language>
-			<language type="bas">Basa Dili</language>
-			<language type="bat">Baltık Dilleri</language>
-			<language type="be">Beyaz Rusça</language>
-			<language type="bej">Beja Dili</language>
-			<language type="bem">Bemba</language>
-			<language type="ber">Berberi</language>
-			<language type="bg">Bulgarca</language>
-			<language type="bh">Bihari</language>
-			<language type="bho">Arayanice</language>
-			<language type="bi">Bislama</language>
-			<language type="bik">Bikol</language>
-			<language type="bin">Bini</language>
-			<language type="bla">Siksika</language>
-			<language type="bm">Bambara</language>
-			<language type="bn">Bengalce</language>
-			<language type="bnt">Bantu Dili</language>
-			<language type="bo">Tibetçe</language>
-			<language type="br">Bretonca</language>
-			<language type="bra">Braj</language>
-			<language type="bs">Boşnakça</language>
-			<language type="btk">Batak</language>
-			<language type="bua">Buryat</language>
-			<language type="bug">Bugis</language>
-			<language type="byn">Blin</language>
-			<language type="ca">Katalanca</language>
-			<language type="cad">Caddo</language>
-			<language type="cai">Orta Amerika Yerli Dilleri</language>
-			<language type="car">Carib</language>
-			<language type="cau">Kafkas Dilleri</language>
-			<language type="cch">Atsam</language>
-			<language type="ce">Çeçence</language>
-			<language type="ceb">Cebuano</language>
-			<language type="cel">Kelt Dilleri</language>
-			<language type="ch">Chamorro</language>
-			<language type="chb">Chibcha</language>
-			<language type="chg">Çağatay Dili</language>
-			<language type="chk">Chuukese</language>
-			<language type="chm">Mari</language>
-			<language type="chn">Chinook Jargon</language>
-			<language type="cho">Choctaw</language>
-			<language type="chp">Chipewyan</language>
-			<language type="chr">Çeroki</language>
-			<language type="chy">Åžayen Dili</language>
-			<language type="cmc">Chamic Dilleri</language>
-			<language type="co">Korsikaca</language>
-			<language type="cop">Kiptice</language>
-			<language type="cpe">İngilizce tabanlı Creole ve Pidgin Dilleri</language>
-			<language type="cpf">Fransızca tabanlı Creole ve Pidgin Dilleri</language>
-			<language type="cpp">Portekizce tabanlı Creole ve Pidgin Dilleri</language>
-			<language type="cr">Cree</language>
-			<language type="crh">Kırım Türkçesi</language>
-			<language type="crp">Creole ve Pidgin Dilleri</language>
-			<language type="cs">Çekçe</language>
-			<language type="csb">Kashubian</language>
-			<language type="cu">Kilise Slavcası</language>
-			<language type="cus">KuÅŸitik Diller</language>
-			<language type="cv">Çuvaşça</language>
-			<language type="cy">Galce</language>
-			<language type="da">Danca</language>
-			<language type="dak">Dakota</language>
-			<language type="dar">Dargince</language>
-			<language type="day">Dayak</language>
-			<language type="de">Almanca</language>
-			<language type="de_AT">Avusturya Almancası</language>
-			<language type="de_CH">İsviçre Yüksek Almancası</language>
-			<language type="del">Delaware</language>
-			<language type="den">Slavey</language>
-			<language type="dgr">Dogrib</language>
-			<language type="din">Dinka</language>
-			<language type="doi">Dogri</language>
-			<language type="dra">Dravid Dilleri</language>
-			<language type="dsb">Aşağı Sorbça</language>
-			<language type="dua">Duala</language>
-			<language type="dum">Ortaçağ Felemenkçesi</language>
-			<language type="dv">Divehi</language>
-			<language type="dyu">Dyula</language>
-			<language type="dz">Butan Dili</language>
-			<language type="ee">Ewe</language>
-			<language type="efi">Efik</language>
-			<language type="egy">Eski Mısır Dili</language>
-			<language type="eka">Ekajuk</language>
-			<language type="el">Yunanca</language>
-			<language type="elx">Elam</language>
-			<language type="en">Ä°ngilizce</language>
-			<language type="en_AU">Avustralya Ä°ngilizcesi</language>
-			<language type="en_CA">Kanada Ä°ngilizcesi</language>
-			<language type="en_GB">Ä°ngiliz Ä°ngilizcesi</language>
-			<language type="en_US">Amerikan Ä°ngilizcesi</language>
-			<language type="enm">Ortaçağ İngilizcesi</language>
-			<language type="eo">Esperanto</language>
-			<language type="es">Ä°spanyolca</language>
-			<language type="es_419">Latin Amerika İspanyolcası</language>
-			<language type="es_ES">İber İspanyolcası</language>
-			<language type="et">Estonya Dili</language>
-			<language type="eu">Baskça</language>
-			<language type="ewo">Ewondo</language>
-			<language type="fa">Farsça</language>
-			<language type="fan">Fang</language>
-			<language type="fat">Fanti</language>
-			<language type="ff">Fulah</language>
-			<language type="fi">Fince</language>
-			<language type="fil">Filipino</language>
-			<language type="fiu">Finno - Ugrik Diller</language>
-			<language type="fj">Fiji Dili</language>
-			<language type="fo">Faroe Dili</language>
-			<language type="fon">Fon</language>
-			<language type="fr">Fransızca</language>
-			<language type="fr_CA">Kanada Fransızcası</language>
-			<language type="fr_CH">İsviçre Fransızcası</language>
-			<language type="frm">Ortaçağ Fransızcası</language>
-			<language type="fro">Eski Fransızca</language>
-			<language type="frr">Kuzey Frizce</language>
-			<language type="frs">DoÄŸu Frizcesi</language>
-			<language type="fur">Friulian</language>
-			<language type="fy">Batı Frizcesi</language>
-			<language type="ga">Ä°rlanda Dili</language>
-			<language type="gaa">Ga</language>
-			<language type="gay">Gayo</language>
-			<language type="gba">Gbaya</language>
-			<language type="gd">İskoç Gal Dili</language>
-			<language type="gem">Cermen Dilleri</language>
-			<language type="gez">Geez</language>
-			<language type="gil">Kiribati Dili</language>
-			<language type="gl">Galiçyaca</language>
-			<language type="gmh">Ortaçağ Yüksek Almancası</language>
-			<language type="gn">Guarani</language>
-			<language type="goh">Eski Yüksek Almanca</language>
-			<language type="gon">Gondi</language>
-			<language type="gor">Gorontalo</language>
-			<language type="got">Gotça</language>
-			<language type="grb">Grebo</language>
-			<language type="grc">Antik Yunanca</language>
-			<language type="gsw">İsviçre Almancası</language>
-			<language type="gu">Gujarati</language>
-			<language type="gv">Manks</language>
-			<language type="gwi">Gwichʼin</language>
-			<language type="ha">Hausa</language>
-			<language type="hai">Haida</language>
-			<language type="haw">Hawaii Dili</language>
-			<language type="he">Ä°branice</language>
-			<language type="hi">Hintçe</language>
-			<language type="hil">Hiligaynon</language>
-			<language type="him">Himachali</language>
-			<language type="hit">Hititçe</language>
-			<language type="hmn">Hmong</language>
-			<language type="ho">Hiri Motu</language>
-			<language type="hr">Hırvatça</language>
-			<language type="hsb">Yukarı Sorbça</language>
-			<language type="ht">Haiti Dili</language>
-			<language type="hu">Macarca</language>
-			<language type="hup">Hupa</language>
-			<language type="hy">Ermenice</language>
-			<language type="hz">Herero</language>
-			<language type="ia">Interlingua</language>
-			<language type="iba">Iban</language>
-			<language type="id">Endonezce</language>
-			<language type="ie">Interlingue</language>
-			<language type="ig">Ä°bo Dili</language>
-			<language type="ii">Sichuan Yi</language>
-			<language type="ijo">Ijo</language>
-			<language type="ik">Inupiak</language>
-			<language type="ilo">Iloko</language>
-			<language type="inc">Hint Dilleri</language>
-			<language type="ine">Hint-Avrupa Dilleri</language>
-			<language type="inh">Ä°nguÅŸ Dili</language>
-			<language type="io">Ido</language>
-			<language type="ira">Ä°ran Dilleri</language>
-			<language type="iro">Ä°roqu Dili</language>
-			<language type="is">Ä°zlandaca</language>
-			<language type="it">Ä°talyanca</language>
-			<language type="iu">Inuktitut</language>
-			<language type="ja">Japonca</language>
-			<language type="jbo">Lojban</language>
-			<language type="jpr">Yahudi Farsçası</language>
-			<language type="jrb">Yahudi Arapçası</language>
-			<language type="jv">Cava Dili</language>
-			<language type="ka">Gürcüce</language>
-			<language type="kaa">Karakalpakça</language>
-			<language type="kab">Kabile</language>
-			<language type="kac">Kaçin</language>
-			<language type="kaj">Jju</language>
-			<language type="kam">Kamba</language>
-			<language type="kar">Karen</language>
-			<language type="kaw">Kawi</language>
-			<language type="kbd">Kabardeyce</language>
-			<language type="kcg">Tyap</language>
-			<language type="kfo">Koro</language>
-			<language type="kg">Kongo</language>
-			<language type="kha">Khasi</language>
-			<language type="khi">Hoisan Dilleri</language>
-			<language type="kho">Hotanca</language>
-			<language type="ki">Kikuyu</language>
-			<language type="kj">Kuanyama</language>
-			<language type="kk">Kazakça</language>
-			<language type="kl">Grönland Dili</language>
-			<language type="km">Kamboçya Dili</language>
-			<language type="kmb">Kimbundu</language>
-			<language type="kn">Kannada</language>
-			<language type="ko">Korece</language>
-			<language type="kok">Konkani</language>
-			<language type="kos">Kosraean</language>
-			<language type="kpe">Kpelle</language>
-			<language type="kr">Kanuri</language>
-			<language type="krc">Karaçay-Balkarça</language>
-			<language type="krl">Karelyaca</language>
-			<language type="kro">Kru</language>
-			<language type="kru">Kurukh</language>
-			<language type="ks">KeÅŸmirce</language>
-			<language type="ku">Kürtçe</language>
-			<language type="kum">Kumukça</language>
-			<language type="kut">Kutenai</language>
-			<language type="kv">Komi</language>
-			<language type="kw">Kernevekçe</language>
-			<language type="ky">Kırgızca</language>
-			<language type="la">Latince</language>
-			<language type="lad">Ladino</language>
-			<language type="lah">Lahnda</language>
-			<language type="lam">Lamba</language>
-			<language type="lb">Lüksemburgca</language>
-			<language type="lez">Lezgice</language>
-			<language type="lg">Ganda</language>
-			<language type="li">Limburgca</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laos Dili</language>
-			<language type="lol">Mongo</language>
-			<language type="loz">Lozi</language>
-			<language type="lt">Litvanyaca</language>
-			<language type="lu">Luba-Katanga</language>
-			<language type="lua">Luba-Lulua</language>
-			<language type="lui">Luiseno</language>
-			<language type="lun">Lunda</language>
-			<language type="luo">Luo</language>
-			<language type="lus">Lushai</language>
-			<language type="lv">Letonca</language>
-			<language type="mad">Madura Dili</language>
-			<language type="mag">Magahi</language>
-			<language type="mai">Maithili</language>
-			<language type="mak">Makasar</language>
-			<language type="man">Mandingo</language>
-			<language type="map">Avustronezya Dili</language>
-			<language type="mas">Masai</language>
-			<language type="mdf">MokÅŸa Dili</language>
-			<language type="mdr">Mandar</language>
-			<language type="men">Mende</language>
-			<language type="mg">Malagasi</language>
-			<language type="mga">Ortaçağ İrlandacası</language>
-			<language type="mh">Marshall Adaları Dili</language>
-			<language type="mi">Maori</language>
-			<language type="mic">Micmac</language>
-			<language type="min">Minangkabau</language>
-			<language type="mis">Çeşitli Diller</language>
-			<language type="mk">Makedonca</language>
-			<language type="mkh">Mon-Khmer Dilleri</language>
-			<language type="ml">Malayalam</language>
-			<language type="mn">MoÄŸolca</language>
-			<language type="mnc">Mançurya Dili</language>
-			<language type="mni">Manipuri</language>
-			<language type="mno">Manobo Dilleri</language>
-			<language type="mo">Moldovaca</language>
-			<language type="moh">Mohawk</language>
-			<language type="mos">Mossi</language>
-			<language type="mr">Marathi</language>
-			<language type="ms">Malay</language>
-			<language type="mt">Malta Dili</language>
-			<language type="mul">Birden Fazla Dil</language>
-			<language type="mun">Munda Dilleri</language>
-			<language type="mus">Creek</language>
-			<language type="mwl">Miranda Dili</language>
-			<language type="mwr">Marwari</language>
-			<language type="my">Birmanya Dili</language>
-			<language type="myn">Maya Dilleri</language>
-			<language type="myv">Erzya</language>
-			<language type="na">Nauru Dili</language>
-			<language type="nah">Nahuatl</language>
-			<language type="nai">Kuzey Amerika Yerli Dilleri</language>
-			<language type="nap">Napolice</language>
-			<language type="nb">Norveççe Bokmål</language>
-			<language type="nd">Kuzey Ndebele</language>
-			<language type="nds">Aşağı Almanca</language>
-			<language type="ne">Nepalce</language>
-			<language type="new">Newari</language>
-			<language type="ng">Ndonga</language>
-			<language type="nia">Nias</language>
-			<language type="nic">Nijer-Kordofan Dilleri</language>
-			<language type="niu">Niuean</language>
-			<language type="nl">Hollanda Dili</language>
-			<language type="nl_BE">Felemenkçe</language>
-			<language type="nn">Norveççe Nynorsk</language>
-			<language type="no">Norveççe</language>
-			<language type="nog">Nogayca</language>
-			<language type="non">Eski Norse</language>
-			<language type="nqo">N’Ko</language>
-			<language type="nr">Güney Ndebele</language>
-			<language type="nso">Kuzey Sotho</language>
-			<language type="nub">Nubian Dilleri</language>
-			<language type="nv">Navaho Dili</language>
-			<language type="nwc">Klasik Nevari</language>
-			<language type="ny">Nyanja</language>
-			<language type="nym">Nyamwezi</language>
-			<language type="nyn">Nyankole</language>
-			<language type="nyo">Nyoro</language>
-			<language type="nzi">Nzima</language>
-			<language type="oc">Oksitanca</language>
-			<language type="oj">Ojibva Dili</language>
-			<language type="om">Oromo</language>
-			<language type="or">Oriya</language>
-			<language type="os">Osetçe</language>
-			<language type="osa">Osage</language>
-			<language type="ota">Osmanlı Türkçesi</language>
-			<language type="oto">Otomi Dilleri</language>
-			<language type="pa">Pencap Dili</language>
-			<language type="paa">Papua Dilleri</language>
-			<language type="pag">Pangasinan</language>
-			<language type="pal">Pehlevi Dili</language>
-			<language type="pam">Pampanga</language>
-			<language type="pap">Papiamento</language>
-			<language type="pau">Palau Dili</language>
-			<language type="peo">Eski Farsça</language>
-			<language type="phi">Filipinler Dilleri</language>
-			<language type="phn">Fenike Dili</language>
-			<language type="pi">Pali</language>
-			<language type="pl">Lehçe</language>
-			<language type="pon">Pohnpeian</language>
-			<language type="pra">Prakrit Dilleri</language>
-			<language type="pro">Eski Provensal</language>
-			<language type="ps">PeÅŸtuca</language>
-			<language type="pt">Portekizce</language>
-			<language type="pt_BR">Brezilya Portekizcesi</language>
-			<language type="pt_PT">Ä°ber Portekizcesi</language>
-			<language type="qu">Quechua</language>
-			<language type="raj">Rajasthani</language>
-			<language type="rap">Rapanui</language>
-			<language type="rar">Rarotongan</language>
-			<language type="rm">Rhaeto-Roman Dili</language>
-			<language type="rn">Kirundi</language>
-			<language type="ro">Romence</language>
-			<language type="roa">Roman Dilleri</language>
-			<language type="rom">Romanca</language>
-			<language type="root">Köken</language>
-			<language type="ru">Rusça</language>
-			<language type="rup">Ulahça</language>
-			<language type="rw">Kinyarwanda</language>
-			<language type="sa">Sanskritçe</language>
-			<language type="sad">Sandawe</language>
-			<language type="sah">Yakutça</language>
-			<language type="sai">Güney Amerika Yerli Dilleri</language>
-			<language type="sal">Salishan Dilleri</language>
-			<language type="sam">Samarit Aramcası</language>
-			<language type="sas">Sasak</language>
-			<language type="sat">Santali</language>
-			<language type="sc">Sardunya Dili</language>
-			<language type="scn">Sicilyaca</language>
-			<language type="sco">Scots</language>
-			<language type="sd">Sindhi</language>
-			<language type="se">Kuzey Sami</language>
-			<language type="sel">Selkup</language>
-			<language type="sem">Semitik Diller</language>
-			<language type="sg">Sangho</language>
-			<language type="sga">Eski Ä°rlandaca</language>
-			<language type="sgn">Ä°ÅŸaret Dilleri</language>
-			<language type="sh">Sırp-Hırvat Dili</language>
-			<language type="shn">Shan Dili</language>
-			<language type="si">Seylanca</language>
-			<language type="sid">Sidamo</language>
-			<language type="sio">Siu Dilleri</language>
-			<language type="sit">Sino-Tibet Dilleri</language>
-			<language type="sk">Slovakça</language>
-			<language type="sl">Slovence</language>
-			<language type="sla">Slav Dilleri</language>
-			<language type="sm">Samoa Dili</language>
-			<language type="sma">Güney Sami</language>
-			<language type="smi">Sami Dilleri</language>
-			<language type="smj">Lule Sami</language>
-			<language type="smn">Inari Sami</language>
-			<language type="sms">Skolt Sami</language>
-			<language type="sn">Shona</language>
-			<language type="snk">Soninke</language>
-			<language type="so">Somali Dili</language>
-			<language type="sog">Sogdiana Dili</language>
-			<language type="son">Songhai</language>
-			<language type="sq">Arnavutça</language>
-			<language type="sr">Sırpça</language>
-			<language type="srn">Sranan Tongo</language>
-			<language type="srr">Serer</language>
-			<language type="ss">Siswati</language>
-			<language type="ssa">Nil-Sahara Dilleri</language>
-			<language type="st">Güney Sotho</language>
-			<language type="su">Sunda Dili</language>
-			<language type="suk">Sukuma</language>
-			<language type="sus">Susu</language>
-			<language type="sux">Sümerce</language>
-			<language type="sv">İsveççe</language>
-			<language type="sw">Swahili</language>
-			<language type="syc">Klasik Süryanice</language>
-			<language type="syr">Süryanice</language>
-			<language type="ta">Tamilce</language>
-			<language type="tai">Tai Dili</language>
-			<language type="te">Telugu</language>
-			<language type="tem">Timne</language>
-			<language type="ter">Tereno</language>
-			<language type="tet">Tetum</language>
-			<language type="tg">Tacikçe</language>
-			<language type="th">Tayca</language>
-			<language type="ti">Tigrinya</language>
-			<language type="tig">Tigre</language>
-			<language type="tiv">Tiv</language>
-			<language type="tk">Türkmence</language>
-			<language type="tkl">Tokelau</language>
-			<language type="tl">Takalotça</language>
-			<language type="tlh">Klingon</language>
-			<language type="tli">Tlingit</language>
-			<language type="tmh">TamaÅŸek</language>
-			<language type="tn">Setswana</language>
-			<language type="to">Tonga</language>
-			<language type="tog">Nyasa Tonga</language>
-			<language type="tpi">Tok Pisin</language>
-			<language type="tr">Türkçe</language>
-			<language type="ts">Tsonga</language>
-			<language type="tsi">Tsimshian</language>
-			<language type="tt">Tatarca</language>
-			<language type="tum">Tumbuka</language>
-			<language type="tup">Tupi Dilleri</language>
-			<language type="tut">Altay Dilleri</language>
-			<language type="tvl">Tuvalu</language>
-			<language type="tw">Twi</language>
-			<language type="ty">Tahiti Dili</language>
-			<language type="tyv">Tuvaca</language>
-			<language type="udm">Udmurtça</language>
-			<language type="ug">Uygurca</language>
-			<language type="uga">Ugarit Dili</language>
-			<language type="uk">Ukraynaca</language>
-			<language type="umb">Umbundu</language>
-			<language type="und">Bilinmeyen veya Geçersiz Dil</language>
-			<language type="ur">Urduca</language>
-			<language type="uz">Özbekçe</language>
-			<language type="vai">Vai</language>
-			<language type="ve">Venda</language>
-			<language type="vi">Vietnamca</language>
-			<language type="vo">Volapük</language>
-			<language type="vot">Votic</language>
-			<language type="wa">Valonca</language>
-			<language type="wak">Wakashan Dilleri</language>
-			<language type="wal">Walamo</language>
-			<language type="war">Waray</language>
-			<language type="was">Washo</language>
-			<language type="wen">Sorb Dilleri</language>
-			<language type="wo">Volofca</language>
-			<language type="xal">Kalmıkça</language>
-			<language type="xh">Xhosa</language>
-			<language type="yao">Yao</language>
-			<language type="yap">Yapça</language>
-			<language type="yi">YidiÅŸ</language>
-			<language type="yo">Yoruba</language>
-			<language type="ypk">Yupik Dili</language>
-			<language type="za">Zhuang</language>
-			<language type="zap">Zapotek Dili</language>
-			<language type="zbl">Blis Sembolleri</language>
-			<language type="zen">Zenaga</language>
-			<language type="zh">Çince</language>
-			<language type="zh_Hans">Basitleştirilmiş Çince</language>
-			<language type="zh_Hant">Geleneksel Çince</language>
-			<language type="znd">Zande</language>
-			<language type="zu">Zulu</language>
-			<language type="zun">Zuni</language>
-			<language type="zxx">Dilbilim içeriği yok</language>
-			<language type="zza">Zazaca</language>
-		</languages>
-		<scripts>
-			<script type="Arab">Arap</script>
-			<script type="Armi">Ä°mparatorluk Aramicesi</script>
-			<script type="Armn">Ermeni</script>
-			<script type="Avst">Avesta</script>
-			<script type="Bali">Bali Dili</script>
-			<script type="Batk">Batak</script>
-			<script type="Beng">Bengal</script>
-			<script type="Blis">Blis Sembolleri</script>
-			<script type="Bopo">Bopomofo</script>
-			<script type="Brah">Brahmi</script>
-			<script type="Brai">Braille</script>
-			<script type="Bugi">Bugis</script>
-			<script type="Buhd">Buhid</script>
-			<script type="Cakm">Chakma</script>
-			<script type="Cans">UCAS</script>
-			<script type="Cari">Karya</script>
-			<script type="Cham">Cham</script>
-			<script type="Cher">Çeroki</script>
-			<script type="Cirt">Cirth</script>
-			<script type="Copt">Koptik</script>
-			<script type="Cprt">Kıbrıs</script>
-			<script type="Cyrl">Kiril</script>
-			<script type="Cyrs">Eski Kilise Slavcası Kiril</script>
-			<script type="Deva">Devanagari</script>
-			<script type="Dsrt">Deseret</script>
-			<script type="Egyd">Demotik Mısır</script>
-			<script type="Egyh">Hiyeratik Mısır</script>
-			<script type="Egyp">Hiyeroglif Mısır</script>
-			<script type="Ethi">Etiyopya</script>
-			<script type="Geok">Hutsuri Gürcü</script>
-			<script type="Geor">Gürcü</script>
-			<script type="Glag">Glagolit</script>
-			<script type="Goth">Gotik</script>
-			<script type="Grek">Yunan</script>
-			<script type="Gujr">Gujarati</script>
-			<script type="Guru">Gurmukhi</script>
-			<script type="Hang">Hangıl</script>
-			<script type="Hani">Han</script>
-			<script type="Hano">Hanunoo</script>
-			<script type="Hans">BasitleÅŸtirilmiÅŸ Han</script>
-			<script type="Hant">Geleneksel Han</script>
-			<script type="Hebr">Ä°brani</script>
-			<script type="Hira">Hiragana</script>
-			<script type="Hmng">Pahawh Hmong</script>
-			<script type="Hrkt">Katakana veya Hiragana</script>
-			<script type="Hung">Eski Macar</script>
-			<script type="Inds">Indus</script>
-			<script type="Ital">Eski Ä°talyan</script>
-			<script type="Java">Cava Dili</script>
-			<script type="Jpan">Japon</script>
-			<script type="Kali">Kayah Li</script>
-			<script type="Kana">Katakana</script>
-			<script type="Khar">Kharoshthi</script>
-			<script type="Khmr">Khmer</script>
-			<script type="Knda">Kannada</script>
-			<script type="Kore">Kore</script>
-			<script type="Kthi">Kaithi</script>
-			<script type="Lana">Lanna</script>
-			<script type="Laoo">Lao Dili</script>
-			<script type="Latf">Fraktur Latin</script>
-			<script type="Latg">Gael Latin</script>
-			<script type="Latn">Latin</script>
-			<script type="Lepc">Lepcha</script>
-			<script type="Limb">Limbu</script>
-			<script type="Lina">Lineer A</script>
-			<script type="Linb">Lineer B</script>
-			<script type="Lyci">Likya</script>
-			<script type="Lydi">Lidya</script>
-			<script type="Mand">Manden</script>
-			<script type="Mani">Mani</script>
-			<script type="Maya">Maya Hiyeroglifleri</script>
-			<script type="Mero">Meroitik</script>
-			<script type="Mlym">Malayalam</script>
-			<script type="Mong">MoÄŸol</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">Meitei Mayek</script>
-			<script type="Mymr">Myanmar</script>
-			<script type="Nkoo">N’Ko</script>
-			<script type="Ogam">Ogham</script>
-			<script type="Olck">Ol Chiki</script>
-			<script type="Orkh">Orhun</script>
-			<script type="Orya">Oriya</script>
-			<script type="Osma">Osmanya</script>
-			<script type="Perm">Eski Permik</script>
-			<script type="Phag">Phags-pa</script>
-			<script type="Phli">Pehlevi Kitabe Dili</script>
-			<script type="Phlp">Psalter Pehlevi</script>
-			<script type="Phlv">Kitap Pehlevi Dili</script>
-			<script type="Phnx">Fenike</script>
-			<script type="Plrd">Pollard Fonetik</script>
-			<script type="Prti">Partça Kitabe Dili</script>
-			<script type="Qaai">Kalıtsal</script>
-			<script type="Rjng">Rejang</script>
-			<script type="Roro">Rongorongo</script>
-			<script type="Runr">Runik</script>
-			<script type="Samr">Samarit</script>
-			<script type="Sara">Sarati</script>
-			<script type="Saur">Saurashtra</script>
-			<script type="Sgnw">Ä°ÅŸaret Dili</script>
-			<script type="Shaw">Shavian</script>
-			<script type="Sinh">Sinhal</script>
-			<script type="Sund">Sunda</script>
-			<script type="Sylo">Syloti Nagri</script>
-			<script type="Syrc">Süryani</script>
-			<script type="Syre">Estrangela Süryani</script>
-			<script type="Syrj">Batı Süryani</script>
-			<script type="Syrn">Doğu Süryani</script>
-			<script type="Tagb">Tagbanwa</script>
-			<script type="Tale">Tai Le</script>
-			<script type="Talu">New Tai Lue</script>
-			<script type="Taml">Tamil</script>
-			<script type="Tavt">Tai Viet</script>
-			<script type="Telu">Telugu</script>
-			<script type="Teng">Tengwar</script>
-			<script type="Tfng">Tifinagh</script>
-			<script type="Tglg">Takalot</script>
-			<script type="Thaa">Thaana</script>
-			<script type="Thai">Tay</script>
-			<script type="Tibt">Tibet</script>
-			<script type="Ugar">Ugarit Çivi Yazısı</script>
-			<script type="Vaii">Vai</script>
-			<script type="Visp">Konuşma Sesleri Çizimlemesi</script>
-			<script type="Xpeo">Eski Fars</script>
-			<script type="Xsux">Sümer-Akad Çivi Yazısı</script>
-			<script type="Yiii">Yi</script>
-			<script type="Zmth">Matematiksel Gösterim</script>
-			<script type="Zsym">Sembol</script>
-			<script type="Zxxx">Yazılı Olmayan</script>
-			<script type="Zyyy">Ortak</script>
-			<script type="Zzzz">Bilinmeyen veya Geçersiz Betik</script>
-		</scripts>
-		<territories>
-			<territory type="001">Dünya</territory>
-			<territory type="002">Afrika</territory>
-			<territory type="003">Kuzey Amerika</territory>
-			<territory type="005">Güney Amerika</territory>
-			<territory type="009">Okyanusya</territory>
-			<territory type="011">Batı Afrika</territory>
-			<territory type="013">Orta Amerika</territory>
-			<territory type="014">DoÄŸu Afrika</territory>
-			<territory type="015">Kuzey Afrika</territory>
-			<territory type="017">Orta Afrika</territory>
-			<territory type="018">Afrika'nın Güneyi</territory>
-			<territory type="019">Amerika</territory>
-			<territory type="021">Amerika'nın Kuzeyi</territory>
-			<territory type="029">Karayipler</territory>
-			<territory type="030">DoÄŸu Asya</territory>
-			<territory type="034">Güney Asya</territory>
-			<territory type="035">Güney Doğu Asya</territory>
-			<territory type="039">Güney Avrupa</territory>
-			<territory type="053">Avustralya ve Yeni Zelanda</territory>
-			<territory type="054">Melanezya</territory>
-			<territory type="057">Mikronezya</territory>
-			<territory type="061">Polinezya</territory>
-			<territory type="062">Güney Orta Asya</territory>
-			<territory type="142">Asya</territory>
-			<territory type="143">Orta Asya</territory>
-			<territory type="145">Batı Asya</territory>
-			<territory type="150">Avrupa</territory>
-			<territory type="151">DoÄŸu Avrupa</territory>
-			<territory type="154">Kuzey Avrupa</territory>
-			<territory type="155">Batı Avrupa</territory>
-			<territory type="172">Bağımsız Devletler Topluluğu</territory>
-			<territory type="419">Latin Amerika ve Karayipler</territory>
-			<territory type="830">Kanal Adaları</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">BirleÅŸik Arap Emirlikleri</territory>
-			<territory type="AF">Afganistan</territory>
-			<territory type="AG">Antigua ve Barbuda</territory>
-			<territory type="AI">Anguilla</territory>
-			<territory type="AL">Arnavutluk</territory>
-			<territory type="AM">Ermenistan</territory>
-			<territory type="AN">Hollanda Antilleri</territory>
-			<territory type="AO">Angola</territory>
-			<territory type="AQ">Antarktika</territory>
-			<territory type="AR">Arjantin</territory>
-			<territory type="AS">Amerikan Samoası</territory>
-			<territory type="AT">Avusturya</territory>
-			<territory type="AU">Avustralya</territory>
-			<territory type="AW">Aruba</territory>
-			<territory type="AX">Aland Adaları</territory>
-			<territory type="AZ">Azerbaycan</territory>
-			<territory type="BA">Bosna Hersek</territory>
-			<territory type="BB">Barbados</territory>
-			<territory type="BD">BangladeÅŸ</territory>
-			<territory type="BE">Belçika</territory>
-			<territory type="BF">Burkina Faso</territory>
-			<territory type="BG">Bulgaristan</territory>
-			<territory type="BH">Bahreyn</territory>
-			<territory type="BI">Burundi</territory>
-			<territory type="BJ">Benin</territory>
-			<territory type="BL">Saint Barthelemy</territory>
-			<territory type="BM">Bermuda</territory>
-			<territory type="BN">Brunei</territory>
-			<territory type="BO">Bolivya</territory>
-			<territory type="BR">Brezilya</territory>
-			<territory type="BS">Bahamalar</territory>
-			<territory type="BT">Bhutan</territory>
-			<territory type="BV">Bouvet Adası</territory>
-			<territory type="BW">Botsvana</territory>
-			<territory type="BY">Beyaz Rusya</territory>
-			<territory type="BZ">Belize</territory>
-			<territory type="CA">Kanada</territory>
-			<territory type="CC">Cocos Adaları</territory>
-			<territory type="CD">Kongo - KinÅŸasa</territory>
-			<territory type="CF">Orta Afrika Cumhuriyeti</territory>
-			<territory type="CG">Kongo - Brazavil</territory>
-			<territory type="CH">İsviçre</territory>
-			<territory type="CI">FildiÅŸi Sahili</territory>
-			<territory type="CK">Cook Adaları</territory>
-			<territory type="CL">Åžili</territory>
-			<territory type="CM">Kamerun</territory>
-			<territory type="CN">Çin</territory>
-			<territory type="CO">Kolombiya</territory>
-			<territory type="CR">Kosta Rika</territory>
-			<territory type="CS">Sırbistan-Karadağ</territory>
-			<territory type="CU">Küba</territory>
-			<territory type="CV">Cape Verde</territory>
-			<territory type="CX">Christmas Adası</territory>
-			<territory type="CY">Güney Kıbrıs Rum Kesimi</territory>
-			<territory type="CZ">Çek Cumhuriyeti</territory>
-			<territory type="DE">Almanya</territory>
-			<territory type="DJ">Cibuti</territory>
-			<territory type="DK">Danimarka</territory>
-			<territory type="DM">Dominika</territory>
-			<territory type="DO">Dominik Cumhuriyeti</territory>
-			<territory type="DZ">Cezayir</territory>
-			<territory type="EC">Ekvador</territory>
-			<territory type="EE">Estonya</territory>
-			<territory type="EG">Mısır</territory>
-			<territory type="EH">Batı Sahara</territory>
-			<territory type="ER">Eritre</territory>
-			<territory type="ES">Ä°spanya</territory>
-			<territory type="ET">Etiyopya</territory>
-			<territory type="FI">Finlandiya</territory>
-			<territory type="FJ">Fiji</territory>
-			<territory type="FK">Falkland Adaları</territory>
-			<territory type="FM">Mikronezya Federal Eyaletleri</territory>
-			<territory type="FO">Faroe Adaları</territory>
-			<territory type="FR">Fransa</territory>
-			<territory type="GA">Gabon</territory>
-			<territory type="GB">Birleşik Krallık</territory>
-			<territory type="GD">Grenada</territory>
-			<territory type="GE">Gürcistan</territory>
-			<territory type="GF">Fransız Guyanası</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gana</territory>
-			<territory type="GI">Cebelitarık</territory>
-			<territory type="GL">Grönland</territory>
-			<territory type="GM">Gambiya</territory>
-			<territory type="GN">Gine</territory>
-			<territory type="GP">Guadeloupe</territory>
-			<territory type="GQ">Ekvator Ginesi</territory>
-			<territory type="GR">Yunanistan</territory>
-			<territory type="GS">Güney Georgia ve Güney Sandwich Adaları</territory>
-			<territory type="GT">Guatemala</territory>
-			<territory type="GU">Guam</territory>
-			<territory type="GW">Gine-Bissau</territory>
-			<territory type="GY">Guyana</territory>
-			<territory type="HK">Hong Kong SAR - Çin</territory>
-			<territory type="HM">Heard Adası ve McDonald Adaları</territory>
-			<territory type="HN">Honduras</territory>
-			<territory type="HR">Hırvatistan</territory>
-			<territory type="HT">Haiti</territory>
-			<territory type="HU">Macaristan</territory>
-			<territory type="ID">Endonezya</territory>
-			<territory type="IE">Ä°rlanda</territory>
-			<territory type="IL">Ä°srail</territory>
-			<territory type="IM">Man Adası</territory>
-			<territory type="IN">Hindistan</territory>
-			<territory type="IO">Hint Okyanusu İngiliz Bölgesi</territory>
-			<territory type="IQ">Irak</territory>
-			<territory type="IR">Ä°ran</territory>
-			<territory type="IS">Ä°zlanda</territory>
-			<territory type="IT">Ä°talya</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Jamaika</territory>
-			<territory type="JO">Ürdün</territory>
-			<territory type="JP">Japonya</territory>
-			<territory type="KE">Kenya</territory>
-			<territory type="KG">Kırgızistan</territory>
-			<territory type="KH">Kamboçya</territory>
-			<territory type="KI">Kiribati</territory>
-			<territory type="KM">Komorlar</territory>
-			<territory type="KN">Saint Kitts ve Nevis</territory>
-			<territory type="KP">Kuzey Kore</territory>
-			<territory type="KR">Güney Kore</territory>
-			<territory type="KW">Kuveyt</territory>
-			<territory type="KY">Cayman Adaları</territory>
-			<territory type="KZ">Kazakistan</territory>
-			<territory type="LA">Laos</territory>
-			<territory type="LB">Lübnan</territory>
-			<territory type="LC">Saint Lucia</territory>
-			<territory type="LI">Liechtenstein</territory>
-			<territory type="LK">Sri Lanka</territory>
-			<territory type="LR">Liberya</territory>
-			<territory type="LS">Lesotho</territory>
-			<territory type="LT">Litvanya</territory>
-			<territory type="LU">Lüksemburg</territory>
-			<territory type="LV">Letonya</territory>
-			<territory type="LY">Libya</territory>
-			<territory type="MA">Fas</territory>
-			<territory type="MC">Monako</territory>
-			<territory type="MD">Moldova</territory>
-			<territory type="ME">KaradaÄŸ</territory>
-			<territory type="MF">Saint Martin</territory>
-			<territory type="MG">Madagaskar</territory>
-			<territory type="MH">Marshall Adaları</territory>
-			<territory type="MK">Makedonya</territory>
-			<territory type="ML">Mali</territory>
-			<territory type="MM">Myanmar</territory>
-			<territory type="MN">MoÄŸolistan</territory>
-			<territory type="MO">Makao S.A.R. Çin</territory>
-			<territory type="MP">Kuzey Mariana Adaları</territory>
-			<territory type="MQ">Martinik</territory>
-			<territory type="MR">Moritanya</territory>
-			<territory type="MS">Montserrat</territory>
-			<territory type="MT">Malta</territory>
-			<territory type="MU">Mauritius</territory>
-			<territory type="MV">Maldivler</territory>
-			<territory type="MW">Malavi</territory>
-			<territory type="MX">Meksika</territory>
-			<territory type="MY">Malezya</territory>
-			<territory type="MZ">Mozambik</territory>
-			<territory type="NA">Namibya</territory>
-			<territory type="NC">Yeni Kaledonya</territory>
-			<territory type="NE">Nijer</territory>
-			<territory type="NF">Norfolk Adası</territory>
-			<territory type="NG">Nijerya</territory>
-			<territory type="NI">Nikaragua</territory>
-			<territory type="NL">Hollanda</territory>
-			<territory type="NO">Norveç</territory>
-			<territory type="NP">Nepal</territory>
-			<territory type="NR">Nauru</territory>
-			<territory type="NU">Niue</territory>
-			<territory type="NZ">Yeni Zelanda</territory>
-			<territory type="OM">Umman</territory>
-			<territory type="PA">Panama</territory>
-			<territory type="PE">Peru</territory>
-			<territory type="PF">Fransız Polinezyası</territory>
-			<territory type="PG">Papua Yeni Gine</territory>
-			<territory type="PH">Filipinler</territory>
-			<territory type="PK">Pakistan</territory>
-			<territory type="PL">Polonya</territory>
-			<territory type="PM">Saint Pierre ve Miquelon</territory>
-			<territory type="PN">Pitcairn</territory>
-			<territory type="PR">Porto Riko</territory>
-			<territory type="PS">Filistin Bölgesi</territory>
-			<territory type="PT">Portekiz</territory>
-			<territory type="PW">Palau</territory>
-			<territory type="PY">Paraguay</territory>
-			<territory type="QA">Katar</territory>
-			<territory type="QO">Uzak Okyanusya</territory>
-			<territory type="QU">Avrupa BirliÄŸi</territory>
-			<territory type="RE">Reunion</territory>
-			<territory type="RO">Romanya</territory>
-			<territory type="RS">Sırbistan</territory>
-			<territory type="RU">Rusya Federasyonu</territory>
-			<territory type="RW">Ruanda</territory>
-			<territory type="SA">Suudi Arabistan</territory>
-			<territory type="SB">Solomon Adaları</territory>
-			<territory type="SC">Seyşel Adaları</territory>
-			<territory type="SD">Sudan</territory>
-			<territory type="SE">İsveç</territory>
-			<territory type="SG">Singapur</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Slovenya</territory>
-			<territory type="SJ">Svalbard ve Jan Mayen</territory>
-			<territory type="SK">Slovakya</territory>
-			<territory type="SL">Sierra Leone</territory>
-			<territory type="SM">San Marino</territory>
-			<territory type="SN">Senegal</territory>
-			<territory type="SO">Somali</territory>
-			<territory type="SR">Surinam</territory>
-			<territory type="ST">Sao Tome ve Principe</territory>
-			<territory type="SV">El Salvador</territory>
-			<territory type="SY">Suriye</territory>
-			<territory type="SZ">Svaziland</territory>
-			<territory type="TC">Turks ve Caicos Adaları</territory>
-			<territory type="TD">Çad</territory>
-			<territory type="TF">Fransız Güney Bölgeleri</territory>
-			<territory type="TG">Togo</territory>
-			<territory type="TH">Tayland</territory>
-			<territory type="TJ">Tacikistan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">DoÄŸu Timor</territory>
-			<territory type="TM">Türkmenistan</territory>
-			<territory type="TN">Tunus</territory>
-			<territory type="TO">Tonga</territory>
-			<territory type="TR">Türkiye</territory>
-			<territory type="TT">Trinidad ve Tobago</territory>
-			<territory type="TV">Tuvalu</territory>
-			<territory type="TW">Tayvan</territory>
-			<territory type="TZ">Tanzanya</territory>
-			<territory type="UA">Ukrayna</territory>
-			<territory type="UG">Uganda</territory>
-			<territory type="UM">Amerika Birleşik Devletleri Küçük Dış Adaları</territory>
-			<territory type="US">Amerika BirleÅŸik Devletleri</territory>
-			<territory type="UY">Uruguay</territory>
-			<territory type="UZ">Özbekistan</territory>
-			<territory type="VA">Vatikan</territory>
-			<territory type="VC">Saint Vincent ve Grenadinler</territory>
-			<territory type="VE">Venezuela</territory>
-			<territory type="VG">İngiliz Virgin Adaları</territory>
-			<territory type="VI">ABD Virgin Adaları</territory>
-			<territory type="VN">Vietnam</territory>
-			<territory type="VU">Vanuatu</territory>
-			<territory type="WF">Wallis ve Futuna</territory>
-			<territory type="WS">Samoa</territory>
-			<territory type="YE">Yemen</territory>
-			<territory type="YT">Mayotte</territory>
-			<territory type="ZA">Güney Afrika</territory>
-			<territory type="ZM">Zambiya</territory>
-			<territory type="ZW">Zimbabve</territory>
-			<territory type="ZZ">Bilinmeyen veya Geçersiz Bölge</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Geleneksel Almanca Yazım Kuralları</variant>
-			<variant type="1994">Standart Resia Yazım Kuralları</variant>
-			<variant type="1996">1996 Almanca Yazım Kuralları</variant>
-			<variant type="1606NICT">1606'ya Dek Geç Ortaçağ Fransızcası</variant>
-			<variant type="1694ACAD">Erken Modern Fransızca</variant>
-			<variant type="AREVELA">DoÄŸu Ermenicesi</variant>
-			<variant type="AREVMDA">Batı Ermenicesi</variant>
-			<variant type="BAKU1926">Birleştirilmiş Yeni Türk Alfabesi</variant>
-			<variant type="BISKE">San Giorgio/Bila Lehçesi</variant>
-			<variant type="BOONT">Boontling</variant>
-			<variant type="FONIPA">IPA Ses Bilimi</variant>
-			<variant type="FONUPA">UPA Ses Bilimi</variant>
-			<variant type="LIPAW">Resia Lipovaz Lehçesi</variant>
-			<variant type="MONOTON">Monotonik</variant>
-			<variant type="NEDIS">Natisone Lehçesi</variant>
-			<variant type="NJIVA">Gniva/Njiva Lehçesi</variant>
-			<variant type="OSOJS">Oseacco/Osojane Lehçesi</variant>
-			<variant type="POLYTON">Politonik</variant>
-			<variant type="POSIX">Bilgisayar</variant>
-			<variant type="REVISED">Gözden Geçirilmiş Yazım Kuralları</variant>
-			<variant type="ROZAJ">Resia Lehçesi</variant>
-			<variant type="SAAHO">Saho</variant>
-			<variant type="SCOTLAND">İskoç Standart İngilizcesi</variant>
-			<variant type="SCOUSE">Scouse</variant>
-			<variant type="SOLBA">Stolvizza/Solbica Lehçesi</variant>
-			<variant type="TARASK">Taraskievica Yazım Kuralları</variant>
-			<variant type="VALENCIA">Valensiyaca</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Takvim</key>
-			<key type="collation">Sıralama</key>
-			<key type="currency">Para Birimi</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Geleneksel Çince Sıralaması - Big5</type>
-			<type type="buddhist" key="calendar">Budist Takvimi</type>
-			<type type="chinese" key="calendar">Çin Takvimi</type>
-			<type type="direct" key="collation">Düz Sıralama</type>
-			<type type="gb2312han" key="collation">Basitleştirilmiş Çince Sıralaması - GB2312</type>
-			<type type="gregorian" key="calendar">Miladi Takvim</type>
-			<type type="hebrew" key="calendar">Yahudi Takvimi</type>
-			<type type="indian" key="calendar">Ulusal Hint Takvimi</type>
-			<type type="islamic" key="calendar">Hicri Takvim</type>
-			<type type="islamic-civil" key="calendar">Arap Takvimi</type>
-			<type type="japanese" key="calendar">Japon Takvimi</type>
-			<type type="phonebook" key="collation">Telefon Defteri Sıralaması</type>
-			<type type="pinyin" key="collation">Pinyin Sıralaması</type>
-			<type type="roc" key="calendar">Çin Cumhuriyeti Takvimi</type>
-			<type type="stroke" key="collation">Stroke Sıralaması</type>
-			<type type="traditional" key="collation">Geleneksel Sıralama</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metrik</measurementSystemName>
-			<measurementSystemName type="US">ABD</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Dil: {0}</codePattern>
-			<codePattern type="script">Betik: {0}</codePattern>
-			<codePattern type="territory">Bölge: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-c ç d-g ğ h ı i İ {i\u0307} j-o ö p r s ş t u ü v y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă â å ä � æ é è ĕ ê ë ē í ì ĭ î ï ī ñ ó ò � ô ø � œ q ß ú ù ŭ û ū w x ÿ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c � d-l ł m-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="chinese">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyMMM">yy MMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Tût</month>
-							<month type="2">Bâbe</month>
-							<month type="3">Hatur</month>
-							<month type="4">Keyhek</month>
-							<month type="5">Tûbe</month>
-							<month type="6">ImÅŸir</month>
-							<month type="7">Bermuhat</month>
-							<month type="8">Bermude</month>
-							<month type="9">PeyÅŸtes</month>
-							<month type="10">Bune</month>
-							<month type="11">Ebip</month>
-							<month type="12">Mısrî</month>
-							<month type="13">Nesî</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="ethiopic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="2">Tikimt</month>
-							<month type="3">Hidar</month>
-							<month type="5">Tir</month>
-							<month type="6">Yakatit</month>
-							<month type="7">Magabit</month>
-							<month type="8">Miyazya</month>
-							<month type="9">Ginbot</month>
-							<month type="12">Nehasa</month>
-							<month type="13">Pagumiene</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Oca</month>
-							<month type="2">Åžub</month>
-							<month type="3">Mar</month>
-							<month type="4">Nis</month>
-							<month type="5">May</month>
-							<month type="6">Haz</month>
-							<month type="7">Tem</month>
-							<month type="8">AÄŸu</month>
-							<month type="9">Eyl</month>
-							<month type="10">Eki</month>
-							<month type="11">Kas</month>
-							<month type="12">Ara</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Ocak</month>
-							<month type="2">Åžubat</month>
-							<month type="3">Mart</month>
-							<month type="4">Nisan</month>
-							<month type="5">Mayıs</month>
-							<month type="6">Haziran</month>
-							<month type="7">Temmuz</month>
-							<month type="8">AÄŸustos</month>
-							<month type="9">Eylül</month>
-							<month type="10">Ekim</month>
-							<month type="11">Kasım</month>
-							<month type="12">Aralık</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">O</month>
-							<month type="2">Åž</month>
-							<month type="3">M</month>
-							<month type="4">N</month>
-							<month type="5">M</month>
-							<month type="6">H</month>
-							<month type="7">T</month>
-							<month type="8">A</month>
-							<month type="9">E</month>
-							<month type="10">E</month>
-							<month type="11">K</month>
-							<month type="12">A</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Paz</day>
-							<day type="mon">Pzt</day>
-							<day type="tue">Sal</day>
-							<day type="wed">Çar</day>
-							<day type="thu">Per</day>
-							<day type="fri">Cum</day>
-							<day type="sat">Cmt</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Pazar</day>
-							<day type="mon">Pazartesi</day>
-							<day type="tue">Salı</day>
-							<day type="wed">Çarşamba</day>
-							<day type="thu">PerÅŸembe</day>
-							<day type="fri">Cuma</day>
-							<day type="sat">Cumartesi</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">P</day>
-							<day type="mon">P</day>
-							<day type="tue">S</day>
-							<day type="wed">Ç</day>
-							<day type="thu">P</day>
-							<day type="fri">C</day>
-							<day type="sat">C</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Ç1</quarter>
-							<quarter type="2">Ç2</quarter>
-							<quarter type="3">Ç3</quarter>
-							<quarter type="4">Ç4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1. çeyrek</quarter>
-							<quarter type="2">2. çeyrek</quarter>
-							<quarter type="3">3. çeyrek</quarter>
-							<quarter type="4">4. çeyrek</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Milattan Önce</era>
-						<era type="1">Milattan Sonra</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">MÖ</era>
-						<era type="1">MS</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>dd MMMM y EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Ed">d E</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="hhmm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hhmmss">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">dd/MM</dateFormatItem>
-						<dateFormatItem id="MEd">dd/MM E</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">dd MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">dd MMM E</dateFormatItem>
-						<dateFormatItem id="MMMMd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">dd MMMM E</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/yyyy</dateFormatItem>
-						<dateFormatItem id="yMEd">dd.MM.yyyy EEE</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">dd MMM y EEE</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">MMM yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyQQQQ">QQQQ yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM - dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM - dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">dd.MM E - dd.MM E</greatestDifference>
-							<greatestDifference id="M">dd.MM E - dd.MM E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">dd-dd MMM</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">dd MMM E - dd MMM E</greatestDifference>
-							<greatestDifference id="M">dd MMM E - dd MMM E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yyyy - MM.yyyy</greatestDifference>
-							<greatestDifference id="y">MM.yyyy - MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yyyy - dd.MM.yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">dd.MM.yyyy E - dd.MM.yyyy E</greatestDifference>
-							<greatestDifference id="M">dd.MM.yyyy E - dd.MM.yyyy E</greatestDifference>
-							<greatestDifference id="y">dd.MM.yyyy E - dd.MM.yyyy E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM-MMM y</greatestDifference>
-							<greatestDifference id="y">MMM y - MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">dd-dd MMM y</greatestDifference>
-							<greatestDifference id="M">dd MMM - dd MMM y</greatestDifference>
-							<greatestDifference id="y">dd MMM y - dd MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">dd MMM y E - dd MMM y E</greatestDifference>
-							<greatestDifference id="M">dd MMM y E - dd MMM y E</greatestDifference>
-							<greatestDifference id="y">dd MMM y E - dd MMM y E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">MM – MM yyyy</greatestDifference>
-							<greatestDifference id="y">MM-yyyy – MM-yyyy</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Miladi Dönem</displayName>
-					</field>
-					<field type="year">
-						<displayName>Yıl</displayName>
-					</field>
-					<field type="month">
-						<displayName>Ay</displayName>
-					</field>
-					<field type="week">
-						<displayName>Hafta</displayName>
-					</field>
-					<field type="day">
-						<displayName>Gün</displayName>
-						<relative type="-3">Üç gün önce</relative>
-						<relative type="-2">Evvelsi gün</relative>
-						<relative type="-1">Dün</relative>
-						<relative type="0">Bugün</relative>
-						<relative type="1">Yarın</relative>
-						<relative type="2">Yarından sonraki gün</relative>
-						<relative type="3">Üç gün sonra</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Haftanın Günü</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>AM/PM</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Saat</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Dakika</displayName>
-					</field>
-					<field type="second">
-						<displayName>Saniye</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Saat Dilimi</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">TiÅŸri</month>
-							<month type="2">HeÅŸvan</month>
-							<month type="5">Åževat</month>
-							<month type="6">Veadar</month>
-							<month type="9">Ä°yar</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Muharrem</month>
-							<month type="2">Safer</month>
-							<month type="3">Rebiülevvel</month>
-							<month type="4">Rebiülahir</month>
-							<month type="5">Cemaziyelevvel</month>
-							<month type="6">Cemaziyelahir</month>
-							<month type="7">Recep</month>
-							<month type="8">Åžaban</month>
-							<month type="9">Ramazan</month>
-							<month type="10">Åževval</month>
-							<month type="11">Zilkade</month>
-							<month type="12">Zilhicce</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Ferverdin</month>
-							<month type="2">OrdibeheÅŸt</month>
-							<month type="3">Hordad</month>
-							<month type="6">Åžehriver</month>
-							<month type="9">Azer</month>
-							<month type="11">Behmen</month>
-							<month type="12">Esfend</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0} Saati</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Bilinmeyen</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Kabil</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Tiran</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Güney Kutbu</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Viyana</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Sidney</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Bakü</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Brüksel</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Sofya</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahreyn</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>KinÅŸasa</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Zürih</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>KaÅŸgar</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Urumçi</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Çunking</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Åžangay</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Kosta Rika</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>Noel</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>LefkoÅŸa</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Cibuti</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Kopenhag</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominik</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>Cezayir</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Kahire</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>El Ayun</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Kanarya Adaları</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Septe</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Londra</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Tiflis</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Cebelitarık</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>Atina</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Güney Gürcistan</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>BudapeÅŸte</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Cakarta</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Kudüs</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>BaÄŸdat</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Tahran</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Roma</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jameika</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>BiÅŸkek</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>St. Kitts</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Seul</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuveyt</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Kayman</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>Aktav</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Uralsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>Aktöbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Kızılorda</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>Almatı</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Beyrut</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>St. Lucia</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Kolombo</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Lüksemburg</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Trablus</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Kazablanka</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monako</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Kobdo</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Ulan Batur</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Çoybalsan</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Makau</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Martinik</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Moritus</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldivler</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Meksiko City</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Kuçing</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Nauru Adası</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Markiz Adaları</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Karaçi</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>VarÅŸova</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Pitcairn Adaları</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Porto Riko</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Gazze</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>Azor Adaları</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Lizbon</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Katar</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Reunion Adası</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Bükreş</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Moskova</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Ä°rkutsk</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Sahalin</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Kamçatka</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>Anadır</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Riyad</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Kartum</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Stokholm</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapur</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Salvador</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Åžam</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>DuÅŸanbe</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>AÅŸkabat</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Tunus</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Ä°stanbul</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>İspanya Limanı</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ujgorod</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Akmescit</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Zaporojye</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>New Salem, Kuzey Dakota</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Merkez, Kuzey Dakota</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>Knox</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Marengo</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Semerkand</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>TaÅŸkent</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>St. Vincent</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>St. Thomas</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Saygon</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Mayote</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>Acre Saati</standard>
-					<daylight>Acre Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>Afganistan Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>Orta Afrika Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>DoÄŸu Afrika Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>Güney Afrika Saati</generic>
-					<standard>Güney Afrika Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>Batı Afrika Saati</standard>
-					<daylight>Batı Afrika Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>Aktyubinsk Saati</standard>
-					<daylight>Aktyubinsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>Alaska Saati</generic>
-					<standard>Alaska Standart Saati</standard>
-					<daylight>Alaska Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AKT</generic>
-				</short>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>Alaska-Hawaii Saati</generic>
-					<standard>Alaska-Hawaii Standart Saati</standard>
-					<daylight>Alaska-Hawaii Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>Almatı Saati</standard>
-					<daylight>Almatı Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>Amazon Saati</standard>
-					<daylight>Amazon Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Merkezi Saat</generic>
-					<standard>Merkezi Standart Saati</standard>
-					<daylight>Merkezi Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>CT</generic>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>DoÄŸu Saati</generic>
-					<standard>DoÄŸu Standart Saati</standard>
-					<daylight>DoÄŸu Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>ET</generic>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>ABD Sıradağlar Saati</generic>
-					<standard>ABD Sıradağlar Standart Saati</standard>
-					<daylight>ABD Sıradağlar Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>MT</generic>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Pasifik Saati</generic>
-					<standard>Pasifik Standart Saati</standard>
-					<daylight>Pasifik Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>PT</generic>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>Anadır Saati</standard>
-					<daylight>Anadır Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>Aktav Saati</standard>
-					<daylight>Aktav Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aktav)</standard>
-					<daylight>AQTST (Aktav)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>Aktöbe Saati</standard>
-					<daylight>Aktöbe Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>AQTT (Aktöbe)</standard>
-					<daylight>AQTST (Aktöbe)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabistan Saati</generic>
-					<standard>Arabistan Standart Saati</standard>
-					<daylight>Arabistan Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AT (Arabistan)</generic>
-					<standard>AST (Arabistan)</standard>
-					<daylight>ADT (Arabistan)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>Arjantin Saati</standard>
-					<daylight>Arjantin Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>Batı Arjantin Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>Ermenistan Saati</standard>
-					<daylight>Ermenistan Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>AMT (Ermenistan)</standard>
-					<daylight>AMST (Ermenistan)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>AÅŸkabat Saati</standard>
-					<daylight>AÅŸkabat Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Atlantik Saati</generic>
-					<standard>Atlantik Standart Saati</standard>
-					<daylight>Atlantik Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>Orta Avustralya Saati</generic>
-					<standard>Orta Avustralya Standart Saati</standard>
-					<daylight>Orta Avustralya Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>ACT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>Batı Merkezi Avustralya Saati</generic>
-					<standard>Batı Merkezi Avustralya Standart Saati</standard>
-					<daylight>Batı Merkezi Avustralya Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>ACWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>DoÄŸu Avustralya Saati</generic>
-					<standard>DoÄŸu Avustralya Standart Saati</standard>
-					<daylight>DoÄŸu Avustralya Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AET</generic>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>Batı Avustralya Saati</generic>
-					<standard>Batı Avustralya Standart Saati</standard>
-					<daylight>Batı Avustralya Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>AWT</generic>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>Azerbaycan Saati</standard>
-					<daylight>Azerbaycan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>Azor Adaları Saati</standard>
-					<daylight>Azor Adaları Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>Bakü Saati</standard>
-					<daylight>Bakü Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>BangladeÅŸ Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>Bering Saati</generic>
-					<standard>Bering Standart Saati</standard>
-					<daylight>Bering Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>BT (Bering)</generic>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>Bhutan Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>Bolivya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>Borneo Saati</standard>
-					<daylight>Borneo Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>Brasilia Saati</standard>
-					<daylight>Brasilia Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>Brunei Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<long>
-					<standard>Cape Verde Saati</standard>
-					<daylight>Cape Verde Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<generic>Chamorro Saati</generic>
-					<standard>Chamorro Standart Saati</standard>
-				</long>
-				<short>
-					<generic>ChT</generic>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>Changbai Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Chatham">
-				<long>
-					<standard>Chatham Standart Saati</standard>
-					<daylight>Chatham Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>Åžili Saati</standard>
-					<daylight>Åžili Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>Çin Saati</generic>
-					<standard>Çin Standart Saati</standard>
-					<daylight>Çin Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>CT (Çin)</generic>
-					<standard>CST (Çin)</standard>
-					<daylight>CDT (Çin)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>Çoybalsan Saati</standard>
-					<daylight>Çoybalsan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Christmas">
-				<long>
-					<standard>Christmas Adası Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Cocos">
-				<long>
-					<standard>Cocos Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>Kolombiya Saati</standard>
-					<daylight>Kolombiya Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cook">
-				<long>
-					<standard>Cook Adaları Saati</standard>
-					<daylight>Cook Adaları Yarı Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>Küba Saati</generic>
-					<standard>Küba Standart Saati</standard>
-					<daylight>Küba Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>CST (Küba)</standard>
-					<daylight>CDT (Küba)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>Dakka Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Davis">
-				<long>
-					<standard>Davis Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<long>
-					<standard>Dumont-d'Urville Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>DuÅŸanbe Saati</standard>
-					<daylight>DuÅŸanbe Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>Hollanda Guyanası Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>DoÄŸu Timor Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Easter">
-				<long>
-					<standard>Easter Adası Saati</standard>
-					<daylight>Easter Adası Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>Ekvador Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Orta Avrupa Saati</standard>
-					<daylight>Orta Avrupa Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>DoÄŸu Avrupa Saati</standard>
-					<daylight>DoÄŸu Avrupa Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Batı Avrupa Saati</standard>
-					<daylight>Batı Avrupa Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Falkland">
-				<long>
-					<standard>Falkland Adaları Saati</standard>
-					<daylight>Falkland Adaları Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Fiji">
-				<long>
-					<standard>Fiji Saati</standard>
-					<daylight>Fiji Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>Fransız Guyanası Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="French_Southern">
-				<long>
-					<standard>Fransız Güney ve Antarktika Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>BiÅŸkek Saati</standard>
-					<daylight>BiÅŸkek Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>Galapagos Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Gambier">
-				<long>
-					<standard>Gambier Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>Gürcistan Saati</standard>
-					<daylight>Gürcistan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<long>
-					<standard>Gilbert Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Greenwich Merkez Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>Orta Grönland Saati</standard>
-					<daylight>Orta Grönland Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>Doğu Grönland Saati</standard>
-					<daylight>Doğu Grönland Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>Batı Grönland Saati</standard>
-					<daylight>Batı Grönland Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>Guam Standart Saati</standard>
-				</long>
-				<short>
-					<standard>GST (Guam)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<generic>Körfez Saati</generic>
-					<standard>Körfez Standart Saati</standard>
-				</long>
-				<short>
-					<generic>GT</generic>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>Guyana Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>Hawaii-Aleutian Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>Hong Kong Saati</standard>
-					<daylight>Hong Kong Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>Kobdo Saati</standard>
-					<daylight>Kobdo Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>Hindistan Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<long>
-					<standard>Hint Okyanusu Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Indochina">
-				<long>
-					<standard>Çinhindi Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>Orta Endonezya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>DoÄŸu Endonezya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>Batı Endonezya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>Ä°ran Standart Saati</standard>
-					<daylight>Ä°ran Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>Ä°rkutsk Saati</standard>
-					<daylight>Ä°rkutsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>Ä°srail Saati</generic>
-					<standard>Ä°srail Standart Saati</standard>
-					<daylight>Ä°srail Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>IST (Ä°srail)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>Japonya Saati</generic>
-					<standard>Japonya Standart Saati</standard>
-					<daylight>Japonya Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>JT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>Petropavlovsk-Kamçatski Saati</standard>
-					<daylight>Petropavlovsk-Kamçatski Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>Karaçi Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>KaÅŸgar Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>DoÄŸu Kazakistan Saati</generic>
-					<standard>DoÄŸu Kazakistan Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>Batı Kazakistan Saati</generic>
-					<standard>Batı Kazakistan Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>Kızılorda Saati</standard>
-					<daylight>Kızılorda Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>Kore Saati</generic>
-					<standard>Kore Standart Saati</standard>
-					<daylight>Kore Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kosrae">
-				<long>
-					<standard>Kosrae Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>Krasnoyarsk Saati</standard>
-					<daylight>Krasnoyarsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>KuybiÅŸev Saati</standard>
-					<daylight>KuybiÅŸev Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>Kwajalein Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>Kırgızistan Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>Lanka Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Line_Islands">
-				<long>
-					<standard>Line Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>Long-Shu Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>Lord Howe Saati</generic>
-					<standard>Lord Howe Standart Saati</standard>
-					<daylight>Lord Howe Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>LHT</generic>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>Makao Saati</standard>
-					<daylight>Makao Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>Magadan Saati</standard>
-					<daylight>Magadan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>Malaya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>Malezya Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Maldives">
-				<long>
-					<standard>Maldivler Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Marquesas">
-				<long>
-					<standard>Markiz Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>Marshall Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Mauritius">
-				<long>
-					<standard>Mauritius Saati</standard>
-					<daylight>Mauritius Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Mawson">
-				<long>
-					<standard>Mawson Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>Ulan Batur Saati</standard>
-					<daylight>Ulan Batur Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moskova Saati</generic>
-					<standard>Moskova Standart Saati</standard>
-					<daylight>Moskova Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>Myanmar Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Nauru">
-				<long>
-					<standard>Nauru Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>Nepal Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<long>
-					<standard>Yeni Kaledonya Saati</standard>
-					<daylight>Yeni Kaledonya Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>Yeni Zelanda Saati</generic>
-					<standard>Yeni Zelanda Standart Saati</standard>
-					<daylight>Yeni Zelanda Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>NZT</generic>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>Newfoundland Saati</generic>
-					<standard>Newfoundland Standart Saati</standard>
-					<daylight>Newfoundland Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>NT</generic>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<long>
-					<standard>Niue Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Norfolk">
-				<long>
-					<standard>Norfolk Adası Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>Fernando de Noronha Saati</standard>
-					<daylight>Fernando de Noronha Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>Kuzey Mariana Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>Novosibirsk Saati</standard>
-					<daylight>Novosibirsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>Omsk Saati</standard>
-					<daylight>Omsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>Pakistan Saati</standard>
-					<daylight>Pakistan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Palau">
-				<long>
-					<standard>Palau Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<long>
-					<standard>Papua Yeni Gine Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>Paraguay Saati</standard>
-					<daylight>Paraguay Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>Peru Saati</standard>
-					<daylight>Peru Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>Filipinler Saati</standard>
-					<daylight>Filipinler Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<long>
-					<standard>Phoenix Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>Pierre ve Miquelon Saati</generic>
-					<standard>Pierre ve Miquelon Standart Saati</standard>
-					<daylight>Pierre ve Miquelon Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>PMT</generic>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<long>
-					<standard>Pitcairn Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Ponape">
-				<long>
-					<standard>Ponape Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>Kızılorda Saati</standard>
-					<daylight>Kızılorda Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Reunion">
-				<long>
-					<standard>Reunion Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Rothera">
-				<long>
-					<standard>Rothera Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>Sakhalin Saati</standard>
-					<daylight>Sakhalin Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>Samara Saati</standard>
-					<daylight>Samara Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>Semerkand Saati</standard>
-					<daylight>Semerkand Yaz Saati</daylight>
-				</long>
-				<short>
-					<standard>SAMT (Semerkand)</standard>
-					<daylight>SAMST (Semerkand)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>Samoa Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Seychelles">
-				<long>
-					<standard>Seyşel Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>Şevçenko Saati</standard>
-					<daylight>Şevçenko Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>Singapur Standart Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Solomon">
-				<long>
-					<standard>Solomon Adaları Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="South_Georgia">
-				<long>
-					<standard>Güney Georgia Saati</standard>
-				</long>
-				<short>
-					<standard>GST (Güney Georgia)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>Surinam Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>Sverdlovsk Saati</standard>
-					<daylight>Sverdlovsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Syowa">
-				<long>
-					<standard>Showa Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Tahiti">
-				<long>
-					<standard>Tahiti Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>Tacikistan Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>TaÅŸkent Saati</standard>
-					<daylight>TaÅŸkent Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>Tiflis Saati</standard>
-					<daylight>Tiflis Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tokelau">
-				<long>
-					<standard>Tokelau Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Tonga">
-				<long>
-					<standard>Tonga Saati</standard>
-					<daylight>Tonga Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Truk">
-				<long>
-					<standard>Truk Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>Türkiye Saati</standard>
-					<daylight>Türkiye Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>Türkmenistan Saati</standard>
-					<daylight>Türkmenistan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tuvalu">
-				<long>
-					<standard>Tuvalu Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>Oral Saati</standard>
-					<daylight>Oral Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>Uruguay Saati</standard>
-					<daylight>Uruguay Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>Urumçi Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>Özbekistan Saati</standard>
-					<daylight>Özbekistan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vanuatu">
-				<long>
-					<standard>Vanuatu Saati</standard>
-					<daylight>Vanuatu Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>Venezuela Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>Vladivostok Saati</standard>
-					<daylight>Vladivostok Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>Volgograd Saati</standard>
-					<daylight>Volgograd Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vostok">
-				<long>
-					<standard>Vostok Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Wake">
-				<long>
-					<standard>Wake Adası Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Wallis">
-				<long>
-					<standard>Wallis ve Futuna Saati</standard>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>Yakutsk Saati</standard>
-					<daylight>Yakutsk Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>Yekaterinburg Saati</standard>
-					<daylight>Yekaterinburg Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>Erivan Saati</standard>
-					<daylight>Erivan Yaz Saati</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>Yukon Saati</generic>
-					<standard>Yukon Standart Saati</standard>
-					<daylight>Yukon Yaz Saati</daylight>
-				</long>
-				<short>
-					<generic>YT</generic>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>% #,##0</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>Andorra Pezetası</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>BirleÅŸik Arap Emirlikleri Dirhemi</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>Afganistan Afganisi (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>Afganistan Afganisi</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>Arnavutluk Leki</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Ermenistan Dramı</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Hollanda Antilleri Guldeni</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>Angola Kvanzası</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>Angola Kvanzası (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>Yeni Angola Kvanzası (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>Angola Kvanzası Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>Arjantin Australi</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>Arjantin Pezosu (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>Arjantin Pezosu</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>Avusturya Åžilini</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>Avustralya Doları</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>Aruba Florini</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>Azerbaycan Manatı (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>Azerbaycan Manatı</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Bosna Hersek Dinarı</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Konvertibl Bosna Hersek Markı</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Barbados Doları</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Bangladeş Takası</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Belçika Frangı (konvertibl)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Belçika Frangı</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Belçika Frangı (finansal)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Bulgar Levası (Hard)</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Yeni Bulgar Levası</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Bahreyn Dinarı</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Burundi Frangı</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Bermuda Doları</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Brunei Doları</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Bolivya Bolivyanosu</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Bolivya Pezosu</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Bolivya Mvdolu</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Yeni Brezilya Kruzeirosu (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Brezilya Kruzadosu</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Brezilya Kruzeirosu (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Brezilya Reali</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Yeni Brezilya Kruzadosu</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Brezilya Kruzeirosu</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Bahama Doları</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Bhutan Ngultrumu</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Burma Kyatı</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Botsvana Pulası</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Yeni Beyaz Rusya Rublesi (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Beyaz Rusya Rublesi</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Belize Doları</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Kanada Doları</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Kongo Frangı</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR Avrosu</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>İsviçre Frangı</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR Frangı</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Åžili Unidades de Fomento</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Åžili Pezosu</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Çin Yuanı Renminbi</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Kolombiya Pezosu</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Unidad de Valor Real</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Kosta Rika Kolonu</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Eski Sırbistan Dinarı</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Çekoslavak Korunası (Hard)</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Küba Pezosu</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Cape Verde Esküdosu</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Güney Kıbrıs Lirası</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Çek Cumhuriyeti Korunası</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Doğu Alman Markı</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>Alman Markı</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Cibuti Frangı</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Danimarka Kronu</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Dominik Pezosu</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>Cezayir Dinarı</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Ekvador Sukresi</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Ekvador Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Estonya Krunu</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Mısır Lirası</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Eritre Nakfası</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>İspanyol Pezetası (A hesabı)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>İspanyol Pezetası (konvertibl hesap)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>İspanyol Pezetası</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Etiyopya Birri</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Fin Markkası</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Fiji Doları</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Falkland Adaları Lirası</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Fransız Frangı</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Ä°ngiliz Sterlini</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Gürcistan Kupon Larisi</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Gürcistan Larisi</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Gana Sedisi (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Gana Sedisi</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Cebelitarık Lirası</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Gambiya Dalasisi</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Gine Frangı</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Gine Sylisi</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Ekvator Ginesi Ekuelesi</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Yunan Drahmisi</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Guatemala Ketzali</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Portekiz Ginesi Esküdosu</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Gine-Bissau Pezosu</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Guyana Doları</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Hong Kong Doları</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduras Lempirası</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Hırvatistan Dinarı</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Hırvatistan Kunası</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Haiti Gurdu</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Macar Forinti</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Endonezya Rupiahı</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>İrlanda Lirası</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>İsrail Lirası</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Yeni Ä°srail Åžekeli</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Hindistan Rupisi</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Irak Dinarı</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Ä°ran Riyali</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>Ä°zlanda Kronu</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Ä°talyan Lireti</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Jamaika Doları</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Ürdün Dinarı</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Japon Yeni</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Kenya Åžilini</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Kırgız Somu</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Kamboçya Rieli</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Komorlar Frangı</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Kuzey Kore Wonu</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Güney Kore Wonu</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Kuveyt Dinarı</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Cayman Adaları Doları</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazakistan Tengesi</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Laos Kipi</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Lübnan Lirası</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Sri Lanka Rupisi</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Liberya Doları</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Lesotho Lotisi</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litvanya Litası</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Litvanya Talonu</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Konvertibl Lüksemburg Frangı</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Lüksemburg Frangı</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Finansal Lüksemburg Frangı</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Letonya Latı</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Letonya Rublesi</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Libya Dinarı</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Fas Dirhemi</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Fas Frangı</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Moldova Leyi</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Madagaskar Ariarisi</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Madagaskar Frangı</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Makedonya Dinarı</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Mali Frangı</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Myanmar Kyatı</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>MoÄŸol Tugriki</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Makao Patacası</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Moritanya Ouguiyası</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Malta Lirası</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Malta Sterlini</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Mauritius Rupisi</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Maldiv Adaları Rufiyaa</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Malavi Kvaçası</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Meksika Pezosu</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Gümüş Meksika Pezosu (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Meksika Unidad de Inversion (UDI)</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Malezya Ringiti</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Mozambik Esküdosu</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Eski Mozambik Metikali</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Mozambik Metikali</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>Namibya Doları</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>Nijerya Nairası</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>Nikaragua Kordobası</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>Nikaragua Kordobası (Oro)</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>Hollanda Florini</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Norveç Kronu</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>Nepal Rupisi</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>Yeni Zelanda Doları</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Umman Riyali</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Panama Balboası</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Peru Ä°nti</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Yeni Peru Solu</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Peru Solu</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Papua Yeni Gine Kinası</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Filipinler Pezosu</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Pakistan Rupisi</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Polonya Zlotisi</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Polonya Zlotisi (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Portekiz Esküdosu</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Paraguay Guaranisi</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Katar Riyali</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Rodezya Doları</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Eski Romen Leyi</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Romen Leyi</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Sırp Dinarı</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rus Rublesi</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>Rus Rublesi (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Ruanda Frangı</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Suudi Arabistan Riyali</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Solomon Adaları Doları</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>SeyÅŸel Rupisi</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Eski Sudan Dinarı</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Sudan Lirası</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Eski Sudan Lirası</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>İsveç Kronu</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Singapur Doları</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Saint Helena Lirası</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Slovenya Toları</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Slovak Korunası</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Sierra Leone Leonesi</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Somali Åžilini</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Surinam Doları</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Surinam Guldeni</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Sao Tome ve Principe Dobrası</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Sovyet Rublesi</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>El Salvador Kolonu</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Suriye Lirası</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Svaziland Lilangenisi</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Tayland Bahtı</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Tacikistan Rublesi</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Tacikistan Somonisi</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Türkmenistan Manatı</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Tunus Dinarı</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Tonga Paʻangası</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Timor Esküdosu</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Eski Türk Lirası</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Türk Lirası</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Trinidad ve Tobago Doları</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>Yeni Tayvan Doları</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Tanzanya Åžilini</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Ukrayna Grivnası</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Ukrayna Karbovanetz</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>Uganda Åžilini (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Uganda Åžilini</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>ABD Doları</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>ABD Doları (Ertesi gün)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>ABD Doları (Aynı gün)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Uruguay Peso en Unidades Indexadas</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Uruguay Pezosu (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Uruguay Pezosu (Uruguayo)</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Özbekistan Somu</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Venezuela Bolivarı</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Güçlü Venezuela Bolivarı</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Vietnam Dongu</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Vanuatu Vatusu</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Batı Samoa Talası</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>CFA Frangı BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Gümüş</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Altın</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>BirleÅŸik Avrupa Birimi</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Avrupa Para Birimi (EMU)</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Avrupa Hesap Birimi (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Avrupa Hesap Birimi (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Doğu Karayip Doları</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Özel Çekme Hakkı (SDR)</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Avrupa Para Birimi</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Fransız Altın Frangı</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Fransız UIC-Frangı</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>CFA Frangı BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Paladyum</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP Frangı</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Platin</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET Fonları</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Test Para Birimi Kodu</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Bilinmeyen veya Geçersiz Para Birimi</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Yemen Dinarı</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Yemen Riyali</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Yugoslav Dinarı (Hard)</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Yeni Yugoslav Dinarı</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Konvertibl Yugoslav Dinarı</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Güney Afrika Randı (finansal)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Güney Afrika Randı</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Zambiya Kvaçası</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Yeni Zaire Zairesi</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Zaire Zairesi</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Zimbabve Doları</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} gün</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} saat</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} dakika</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} ay</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} saniye</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} hafta</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} yıl</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>evet:e</yesstr>
-			<nostr>hayır:hayir:h</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/tr_TR.xml b/airtime_mvc/library/Zend/Locale/Data/tr_TR.xml
deleted file mode 100644
index 44f33851b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tr_TR.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.48 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tr"/>
-		<territory type="TR"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/trv.xml b/airtime_mvc/library/Zend/Locale/Data/trv.xml
deleted file mode 100644
index 20e78cae3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/trv.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.12 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="trv"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="bn">patas Monchiara</language>
-			<language type="de">patas Towjih</language>
-			<language type="en">patas Ingrisi</language>
-			<language type="es">patas Espanniu</language>
-			<language type="fr">patas Bosey</language>
-			<language type="hi">patas Heyti</language>
-			<language type="it">patas Itariya</language>
-			<language type="ja">patas Nihong</language>
-			<language type="pt">patas Bowdu</language>
-			<language type="pt_BR">patas Pajey</language>
-			<language type="ru">patas Ruski</language>
-			<language type="sr">patas Srpian</language>
-			<language type="und">Ini klayna patas ni</language>
-			<language type="ur">patas Yurtu</language>
-			<language type="zh">patas Ipaw</language>
-			<language type="zh_Hans">Qantan Ipaw patas</language>
-			<language type="zh_Hant">Baday Ipaw patas</language>
-		</languages>
-		<scripts>
-			<script type="Arab">tasan Arapit</script>
-			<script type="Cyrl">tasan Sirorik</script>
-			<script type="Hans">Qantan tasan Ipaw</script>
-			<script type="Hant">Baday tasan Ipaw</script>
-			<script type="Latn">tasan Ratin</script>
-			<script type="Zxxx">Unat tasan</script>
-			<script type="Zzzz">ini klayi tasan ni</script>
-		</scripts>
-		<territories>
-			<territory type="AQ">alang Nanci</territory>
-			<territory type="BA">alang Posniya</territory>
-			<territory type="BR">alang Pajey</territory>
-			<territory type="BV">alang Puwei</territory>
-			<territory type="CH">alang Switjrrant</territory>
-			<territory type="CN">alang Ipaw</territory>
-			<territory type="DE">alang Towjih</territory>
-			<territory type="FR">alang Posey</territory>
-			<territory type="GB">alang Inglis</territory>
-			<territory type="GS">alang Nanjiouya ni Nansanminji</territory>
-			<territory type="HM">alang Htee ni Mayktan</territory>
-			<territory type="HR">alang Krowtia</territory>
-			<territory type="IN">alang Intu</territory>
-			<territory type="IO">alang Inglis niq Intu</territory>
-			<territory type="IT">alang Itariya</territory>
-			<territory type="JP">alang Nihong</territory>
-			<territory type="ME">alang Mondineygrw</territory>
-			<territory type="RS">alang Srbia</territory>
-			<territory type="RU">alang Ruski</territory>
-			<territory type="SM">alang Snmarinow</territory>
-			<territory type="TF">alang Posey niq Nan</territory>
-			<territory type="US">alang Amarika</territory>
-			<territory type="ZZ">ini klayi na alang ni</territory>
-		</territories>
-		<types>
-			<type type="gregorian" key="calendar">Jiyax Yisu Thulang</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Snamrika</measurementSystemName>
-			<measurementSystemName type="US">Snyunaydi</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Kari: {0}</codePattern>
-			<codePattern type="script">Patas: {0}</codePattern>
-			<codePattern type="territory">Alang: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-e g-n {ng} o-u w-y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[� f ɨ ḻ ṟ ṯ ʉ v z ʼ]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Kii</month>
-							<month type="2">Dhi</month>
-							<month type="3">Tri</month>
-							<month type="4">Spi</month>
-							<month type="5">Rii</month>
-							<month type="6">Mti</month>
-							<month type="7">Emi</month>
-							<month type="8">Mai</month>
-							<month type="9">Mni</month>
-							<month type="10">Mxi</month>
-							<month type="11">Mxk</month>
-							<month type="12">Mxd</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Kingal idas</month>
-							<month type="2">Dha idas</month>
-							<month type="3">Tru idas</month>
-							<month type="4">Spat idas</month>
-							<month type="5">Rima idas</month>
-							<month type="6">Mataru idas</month>
-							<month type="7">Empitu idas</month>
-							<month type="8">Maspat idas</month>
-							<month type="9">Mngari idas</month>
-							<month type="10">Maxal idas</month>
-							<month type="11">Maxal kingal idas</month>
-							<month type="12">Maxal dha idas</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">K</month>
-							<month type="2">D</month>
-							<month type="3">T</month>
-							<month type="4">S</month>
-							<month type="5">R</month>
-							<month type="6">M</month>
-							<month type="7">E</month>
-							<month type="8">P</month>
-							<month type="9">A</month>
-							<month type="10">M</month>
-							<month type="11">K</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Emp</day>
-							<day type="mon">Kin</day>
-							<day type="tue">Dha</day>
-							<day type="wed">Tru</day>
-							<day type="thu">Spa</day>
-							<day type="fri">Rim</day>
-							<day type="sat">Mat</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Jiyax sngayan</day>
-							<day type="mon">tgKingal jiyax iyax sngayan</day>
-							<day type="tue">tgDha jiyax iyax sngayan</day>
-							<day type="wed">tgTru jiyax iyax sngayan</day>
-							<day type="thu">tgSpac jiyax iyax sngayan</day>
-							<day type="fri">tgRima jiyax iyax sngayan</day>
-							<day type="sat">tgMataru jiyax iyax sngayan</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">E</day>
-							<day type="mon">K</day>
-							<day type="tue">D</day>
-							<day type="wed">T</day>
-							<day type="thu">S</day>
-							<day type="fri">R</day>
-							<day type="sat">M</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">mn1</quarter>
-							<quarter type="2">mn2</quarter>
-							<quarter type="3">mn3</quarter>
-							<quarter type="4">mn4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">mnprxan</quarter>
-							<quarter type="2">mndha</quarter>
-							<quarter type="3">mntru</quarter>
-							<quarter type="4">mnspat</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>Brax kndaax</am>
-				<pm>Baubau kndaax</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Brah jikan Yisu Thulang</era>
-						<era type="1">Bukuy jikan Yisu Thulang</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BRY</era>
-						<era type="1">BUY</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-M-d</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">yyyy Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Hngkawas</displayName>
-					</field>
-					<field type="year">
-						<displayName>hngkawas</displayName>
-					</field>
-					<field type="month">
-						<displayName>Idas</displayName>
-					</field>
-					<field type="week">
-						<displayName>Jiyax iyax sngayan</displayName>
-					</field>
-					<field type="day">
-						<displayName>Jiyax</displayName>
-						<relative type="-1">Shiga</relative>
-						<relative type="0">Jiyax sayang</relative>
-						<relative type="1">Saman</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Jiyax quri jiyax iyax sngayan</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Jikan</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Tuki</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Spngan</displayName>
-					</field>
-					<field type="second">
-						<displayName>Seykn</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Alang</displayName>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>JQG{0}</gmtFormat>
-			<regionFormat>Jikan {0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Ini klayi ka Jikan hini</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Jikan alang Purank</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Jikan alang Grad</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Jikan alang Snpaurow</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Jikan alang Honoruru</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>Jikan alang Ankriji</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Jikan alang Rosanci</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Jikan alang Bonhuan</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Jikan alang Tanbo</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Jikan alang Jiciak</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Jikan alang Intiannaporis</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>Jikan alang Niuyue</exemplarCity>
-			</zone>
-			<metazone type="America_Central">
-				<long>
-					<generic>Jikan Con-Amarika</generic>
-					<standard>Snegun Jikan Con-Amarika</standard>
-					<daylight>Jikan Con-Amarika o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<generic>JCA</generic>
-					<standard>SJCA</standard>
-					<daylight>JCAKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>Jikan Ton-Amarika</generic>
-					<standard>Snegun Jikan Ton-Amarika</standard>
-					<daylight>Jikan Ton-Amarika o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<generic>JTA</generic>
-					<standard>SJTA</standard>
-					<daylight>JTAKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>Jikan Yama-Amarika</generic>
-					<standard>Snegun Jikan Yama-Amarika</standard>
-					<daylight>Jikan Hidaw niq Yama-Amarika</daylight>
-				</long>
-				<short>
-					<generic>JYA</generic>
-					<standard>SJYA</standard>
-					<daylight>JHYA</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>Jikan Daybinyan</generic>
-					<standard>Snegun Jikan Amarika-Daybinyan</standard>
-					<daylight>Jikan Amarika-Daybinyan o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<generic>JD</generic>
-					<standard>SJAD</standard>
-					<daylight>JADKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>Jikan Yayun Tasiyan</generic>
-					<standard>Snegun Jikan Yayun Tasiyan</standard>
-					<daylight>Jikan Yayun Tasiyan o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<generic>JYT</generic>
-					<standard>SJYT</standard>
-					<daylight>JYTKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>Jikan Conow</standard>
-					<daylight>Jikan Conow o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<standard>JC</standard>
-					<daylight>JCKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>Jikan Tonow</standard>
-					<daylight>Jikan Tonow o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<standard>JT</standard>
-					<daylight>JTKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>Jikan Siow</standard>
-					<daylight>Jikan Siow o Karat Rbagan</daylight>
-				</long>
-				<short>
-					<standard>JS</standard>
-					<daylight>JSKR</daylight>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>Jikan Quri Grinweyji</standard>
-				</long>
-				<short>
-					<standard>JQG</standard>
-				</short>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AUD">
-				<displayName>pila Autaria</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>pila Pajey</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>pila Ipaw</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>pila Irow</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>pila Inglis</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>pila Hong Kong</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>pila Intia</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>pila Nihong</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>pila Macao</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>pila Nowey</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>pila Ruski</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>pila Taiwan</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>pila America</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>ini klayi pila ni</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} Jiyax</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} Tuki</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} spngan</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} Idas</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} Seykn</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} Jiyax iyax sngayan</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} Hnkawas</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>yiru:y</yesstr>
-			<nostr>mnan:m</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/trv_TW.xml b/airtime_mvc/library/Zend/Locale/Data/trv_TW.xml
deleted file mode 100644
index f52b5a143..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/trv_TW.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="trv"/>
-		<territory type="TW"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ts.xml b/airtime_mvc/library/Zend/Locale/Data/ts.xml
deleted file mode 100644
index 5f6b8f74f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ts.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.29 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ts"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="cs">Xi Czech</language>
-			<language type="da">Xi Danish</language>
-			<language type="de">Xi Jarimani</language>
-			<language type="el">Xi Giriki</language>
-			<language type="en">Xi Nghezi</language>
-			<language type="es">Xi spain</language>
-			<language type="et">hi xi Estonia</language>
-			<language type="fi">Xi Finnish</language>
-			<language type="fr">Xi Furwa</language>
-			<language type="he">XiHeberu</language>
-			<language type="hu">hi xi Hungary</language>
-			<language type="is">hi xi Iceland</language>
-			<language type="it">Xi Ithali</language>
-			<language type="ja">Xi Japani</language>
-			<language type="ko">Xikorea</language>
-			<language type="lt">hi xi Lithuania</language>
-			<language type="lv">hi xi Latvia</language>
-			<language type="nl">Xi bunu</language>
-			<language type="no">Xi Norway</language>
-			<language type="pl">Xi Polixi</language>
-			<language type="pt">Putukezi</language>
-			<language type="ro">hi xi Romania</language>
-			<language type="ru">Xi Rhaxiya</language>
-			<language type="sv">Xi Swiden</language>
-			<language type="ts">Xitsonga</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Sun</month>
-							<month type="2">Yan</month>
-							<month type="3">Kul</month>
-							<month type="4">Dzi</month>
-							<month type="5">Mud</month>
-							<month type="6">Kho</month>
-							<month type="7">Maw</month>
-							<month type="8">Mha</month>
-							<month type="9">Ndz</month>
-							<month type="10">Nhl</month>
-							<month type="11">Huk</month>
-							<month type="12">N'w</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Sunguti</month>
-							<month type="2">Nyenyenyani</month>
-							<month type="3">Nyenyankulu</month>
-							<month type="4">Dzivamisoko</month>
-							<month type="5">Mudyaxihi</month>
-							<month type="6">Khotavuxika</month>
-							<month type="7">Mawuwani</month>
-							<month type="8">Mhawuri</month>
-							<month type="9">Ndzhati</month>
-							<month type="10">Nhlangula</month>
-							<month type="11">Hukuri</month>
-							<month type="12">N'wendzamhala</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mus</day>
-							<day type="tue">Bir</day>
-							<day type="wed">Har</day>
-							<day type="thu">Ne</day>
-							<day type="fri">Tlh</day>
-							<day type="sat">Mug</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sonto</day>
-							<day type="mon">Musumbhunuku</day>
-							<day type="tue">Ravumbirhi</day>
-							<day type="wed">Ravunharhu</day>
-							<day type="thu">Ravumune</day>
-							<day type="fri">Ravuntlhanu</day>
-							<day type="sat">Mugqivela</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Kotara yo sungula</quarter>
-							<quarter type="2">Kotara ya vumbirhi</quarter>
-							<quarter type="3">Kotara ya vunharhu</quarter>
-							<quarter type="4">Kotara ya vumune</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ts_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/ts_ZA.xml
deleted file mode 100644
index 11c1f2938..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ts_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ts"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/tt.xml b/airtime_mvc/library/Zend/Locale/Data/tt.xml
deleted file mode 100644
index 945111d92..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tt.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="tt"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="tt">Татар</language>
-		</languages>
-		<territories>
-			<territory type="RU">Ро��и�</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а ә б-е ё ж җ з-о ө п-у ү ф х һ ц-�]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Hmm">H:mm</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM.yyyy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="RUR">
-				<symbol>Ñ€.</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/tt_RU.xml b/airtime_mvc/library/Zend/Locale/Data/tt_RU.xml
deleted file mode 100644
index 8806ab16b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/tt_RU.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.39 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="tt"/>
-		<territory type="RU"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ug.xml b/airtime_mvc/library/Zend/Locale/Data/ug.xml
deleted file mode 100644
index 52cd580d6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ug.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ug"/>
-	</identity>
-	<localeDisplayNames>
-		<variants>
-			<variant type="REVISED">Uyghur</variant>
-		</variants>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[ئ-ب پ ت ج چ خ د ر ز ژ س ش غ �-ك ڭ گ ل-ه ە و ۆ-ۈ ۋ ى ي �]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ug_Arab.xml b/airtime_mvc/library/Zend/Locale/Data/ug_Arab.xml
deleted file mode 100644
index 9b73e0203..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ug_Arab.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.5 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ug"/>
-		<script type="Arab"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ug_Arab_CN.xml b/airtime_mvc/library/Zend/Locale/Data/ug_Arab_CN.xml
deleted file mode 100644
index 90a090cb3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ug_Arab_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ug"/>
-		<script type="Arab"/>
-		<territory type="CN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ug_CN.xml b/airtime_mvc/library/Zend/Locale/Data/ug_CN.xml
deleted file mode 100644
index 9aad98c6f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ug_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ug"/>
-		<territory type="CN"/>
-	</identity>
-	<alias source="ug_Arab_CN" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uk.xml b/airtime_mvc/library/Zend/Locale/Data/uk.xml
deleted file mode 100644
index dcbf954d3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uk.xml
+++ /dev/null
@@ -1,3813 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.131 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="uk"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="aa">афар�ька</language>
-			<language type="ab">абхазька</language>
-			<language type="ace">ачех�ька</language>
-			<language type="ach">ачолі</language>
-			<language type="ada">адангме</language>
-			<language type="ady">адигей�ька</language>
-			<language type="ae">аве�тій�ька</language>
-			<language type="af">африкаан�</language>
-			<language type="afa">афро-азій�ька мова</language>
-			<language type="afh">африхілі</language>
-			<language type="ain">айн�ька</language>
-			<language type="ak">акан</language>
-			<language type="akk">аккад�ька</language>
-			<language type="ale">алеут�ька</language>
-			<language type="alg">алгонкін�ькі мови</language>
-			<language type="alt">південноалтай�ька</language>
-			<language type="am">амхар�ька</language>
-			<language type="an">арагон�ька</language>
-			<language type="ang">давньоанглій�ька</language>
-			<language type="anp">ангіка</language>
-			<language type="apa">апачі мови</language>
-			<language type="ar">араб�ька</language>
-			<language type="arc">арамей�ька</language>
-			<language type="arn">араукан�ька</language>
-			<language type="arp">арапахо</language>
-			<language type="art">штучна мова</language>
-			<language type="arw">аравак�ька</language>
-			<language type="as">а��ам�ька</language>
-			<language type="ast">а�тур�ька</language>
-			<language type="ath">атапа�к�ькі мови</language>
-			<language type="aus">ав�тралій�ькі мови</language>
-			<language type="av">авар�ька</language>
-			<language type="awa">авадхі</language>
-			<language type="ay">аймара</language>
-			<language type="az">азербайджан�ька</language>
-			<language type="ba">башкир�ька</language>
-			<language type="bad">банда</language>
-			<language type="bai">бамілеке мови</language>
-			<language type="bal">балучі</language>
-			<language type="ban">балій�ька</language>
-			<language type="bas">ба�а</language>
-			<language type="bat">балтій�ька мова</language>
-			<language type="be">білору�ька</language>
-			<language type="bej">беджа</language>
-			<language type="bem">бемба</language>
-			<language type="ber">бербер�ька</language>
-			<language type="bg">болгар�ька</language>
-			<language type="bh">біхарі</language>
-			<language type="bho">бходжпурі</language>
-			<language type="bi">бі�лама</language>
-			<language type="bik">біколь�ька</language>
-			<language type="bin">біні</language>
-			<language type="bla">�ік�іка</language>
-			<language type="bm">бамбара</language>
-			<language type="bn">бенгаль�ька</language>
-			<language type="bnt">банту</language>
-			<language type="bo">тибет�ька</language>
-			<language type="br">бретон�ька</language>
-			<language type="bra">брадж</language>
-			<language type="bs">бо�ній�ька</language>
-			<language type="btk">батак</language>
-			<language type="bua">бур�т�ька</language>
-			<language type="bug">бугій�ька</language>
-			<language type="byn">блін</language>
-			<language type="ca">каталон�ька</language>
-			<language type="cad">каддо</language>
-			<language type="cai">центральноамерикань�ких індіанців мова</language>
-			<language type="car">каріб�ька</language>
-			<language type="cau">кавказька мова</language>
-			<language type="cch">ат�ам</language>
-			<language type="ce">чечен�ька</language>
-			<language type="ceb">�ебуан�ька</language>
-			<language type="cel">кельт�ька мова</language>
-			<language type="ch">чаморро</language>
-			<language type="chb">чібча</language>
-			<language type="chg">чагатай�ька</language>
-			<language type="chk">чуук�ька</language>
-			<language type="chm">марій�ька</language>
-			<language type="chn">чинук жаргон</language>
-			<language type="cho">чокто</language>
-			<language type="chp">чіпев’�н</language>
-			<language type="chr">черокі</language>
-			<language type="chy">чейєнн</language>
-			<language type="cmc">хаміт�ькі мови</language>
-			<language type="co">кор�икан�ька</language>
-			<language type="cop">копт�ька</language>
-			<language type="cpe">англо-креоль�ькі та піджінізовані англій�ькі мови</language>
-			<language type="cpf">франко-креоль�ькі та піджінізовані франкофонні мови</language>
-			<language type="cpp">португаль�ько-креоль�ькі та піджінізовані португаль�ькі мови</language>
-			<language type="cr">крі</language>
-			<language type="crh">крим�ькотатар�ька</language>
-			<language type="crp">креоль�ькі та піджінізовані мови</language>
-			<language type="cs">че�ька</language>
-			<language type="csb">кашуб�ька</language>
-			<language type="cu">церковно�лов’�н�ька</language>
-			<language type="cus">кушіт�ька мова</language>
-			<language type="cv">чува�ька</language>
-			<language type="cy">валлій�ька</language>
-			<language type="da">дан�ька</language>
-			<language type="dak">дакота</language>
-			<language type="dar">даргін�ька</language>
-			<language type="day">да�к</language>
-			<language type="de">німецька</language>
-			<language type="de_AT">німецька ав�трій�ька</language>
-			<language type="de_CH">верхньонімецька швейцар�ька</language>
-			<language type="del">делавар�ька</language>
-			<language type="den">�лейв</language>
-			<language type="dgr">догриб�ька</language>
-			<language type="din">дінка</language>
-			<language type="doi">догрі</language>
-			<language type="dra">дравідій�ька мова</language>
-			<language type="dsb">нижньолужицька</language>
-			<language type="dua">дуала</language>
-			<language type="dum">�ередньонідерланд�ька</language>
-			<language type="dv">дівехі</language>
-			<language type="dyu">діула</language>
-			<language type="dz">дзонг-ке</language>
-			<language type="ee">еве</language>
-			<language type="efi">ефік</language>
-			<language type="egy">давньоєгипет�ька</language>
-			<language type="eka">екаджук</language>
-			<language type="el">грецька</language>
-			<language type="elx">елам�ька</language>
-			<language type="en">англій�ька</language>
-			<language type="en_AU">англій�ька ав�тралій�ька</language>
-			<language type="en_CA">англій�ька канад�ька</language>
-			<language type="en_GB">англій�ька британ�ька</language>
-			<language type="en_US">англій�ька СШ�</language>
-			<language type="enm">�ередньоанглій�ька</language>
-			<language type="eo">е�перанто</language>
-			<language type="es">і�пан�ька</language>
-			<language type="es_419">латиноамерикан�ька і�пан�ька</language>
-			<language type="es_ES">іберій�ька і�пан�ька</language>
-			<language type="et">е�тон�ька</language>
-			<language type="eu">ба�ків</language>
-			<language type="ewo">евондо</language>
-			<language type="fa">пер�ька</language>
-			<language type="fan">фанг</language>
-			<language type="fat">фанті</language>
-			<language type="ff">фула</language>
-			<language type="fi">фін�ька</language>
-			<language type="fil">філіппін�ька</language>
-			<language type="fiu">фінно-угор�ькі мови</language>
-			<language type="fj">фіджі</language>
-			<language type="fo">фарер�ька</language>
-			<language type="fon">фон</language>
-			<language type="fr">французька</language>
-			<language type="fr_CA">французька канад�ька</language>
-			<language type="fr_CH">французька швейцар�ька</language>
-			<language type="frm">�ередньофранцузька</language>
-			<language type="fro">давньофранцузька</language>
-			<language type="frr">фризька північна</language>
-			<language type="frs">фризька �хідна</language>
-			<language type="fur">фріуль�ька</language>
-			<language type="fy">фризька</language>
-			<language type="ga">ірланд�ька</language>
-			<language type="gaa">га</language>
-			<language type="gay">гайо</language>
-			<language type="gba">гбай�</language>
-			<language type="gd">гаель�ька</language>
-			<language type="gem">герман�ька мова</language>
-			<language type="gez">гєез</language>
-			<language type="gil">гільберт�ька</language>
-			<language type="gl">галі�ій�ька</language>
-			<language type="gmh">�ередньоверхньонімецька</language>
-			<language type="gn">гуарані</language>
-			<language type="goh">давньоверхньонімецька</language>
-			<language type="gon">гонді</language>
-			<language type="gor">горонтало</language>
-			<language type="got">гот�ька</language>
-			<language type="grb">гребо</language>
-			<language type="grc">давньогрецька</language>
-			<language type="gsw">німецька швейцар�ька</language>
-			<language type="gu">гуджараті</language>
-			<language type="gv">менк�ька</language>
-			<language type="gwi">кучін</language>
-			<language type="ha">хау�а</language>
-			<language type="hai">хайда</language>
-			<language type="haw">гавай�ька</language>
-			<language type="he">іврит</language>
-			<language type="hi">гінді</language>
-			<language type="hil">хілігайнон</language>
-			<language type="him">хімачалі</language>
-			<language type="hit">Ñ…Ñ–Ñ‚Ñ–Ñ‚Ñ–</language>
-			<language type="hmn">хмонг</language>
-			<language type="ho">хірі-моту</language>
-			<language type="hr">хорват�ька</language>
-			<language type="hsb">верхньолужицька</language>
-			<language type="ht">гаїт�н�ька</language>
-			<language type="hu">угор�ька</language>
-			<language type="hup">хупа</language>
-			<language type="hy">вірмен�ька</language>
-			<language type="hz">гереро</language>
-			<language type="ia">інтерлінгва</language>
-			<language type="iba">ібан�ька</language>
-			<language type="id">індонезій�ька</language>
-			<language type="ie">інтерлінгве</language>
-			<language type="ig">ігбо</language>
-			<language type="ii">�ичуань</language>
-			<language type="ijo">іджо</language>
-			<language type="ik">інупіак</language>
-			<language type="ilo">ілокан�ька</language>
-			<language type="inc">індій�ькі мови</language>
-			<language type="ine">індоєвропей�ькі мови</language>
-			<language type="inh">інгу�ька</language>
-			<language type="io">ідо</language>
-			<language type="ira">іран�ька</language>
-			<language type="iro">ірокезькі мови</language>
-			<language type="is">і�ланд�ька</language>
-			<language type="it">італій�ька</language>
-			<language type="iu">інуктітут</language>
-			<language type="ja">�пон�ька</language>
-			<language type="jbo">ложбан</language>
-			<language type="jpr">іудео-пер�ька</language>
-			<language type="jrb">іудео-араб�ька</language>
-			<language type="jv">�ван�ька</language>
-			<language type="ka">грузин�ька</language>
-			<language type="kaa">каракалпацька</language>
-			<language type="kab">кабиль�ька</language>
-			<language type="kac">качін</language>
-			<language type="kaj">йю</language>
-			<language type="kam">камба</language>
-			<language type="kar">карен�ька</language>
-			<language type="kaw">каві</language>
-			<language type="kbd">кабардин�ька</language>
-			<language type="kcg">тіап</language>
-			<language type="kfo">коро</language>
-			<language type="kg">конґолезька</language>
-			<language type="kha">кха�і</language>
-			<language type="khi">кой�ан�ькі мови</language>
-			<language type="kho">хотано�ак�ька</language>
-			<language type="ki">кікуйю</language>
-			<language type="kj">кунама</language>
-			<language type="kk">казах�ька</language>
-			<language type="kl">калааллі�ут</language>
-			<language type="km">кхмер�ька</language>
-			<language type="kmb">кімбунду</language>
-			<language type="kn">каннада</language>
-			<language type="ko">корей�ька</language>
-			<language type="kok">конкані</language>
-			<language type="kos">ко�рае</language>
-			<language type="kpe">кпеллє</language>
-			<language type="kr">канурі</language>
-			<language type="krc">карачаєво-балкар�ька</language>
-			<language type="krl">карель�ька</language>
-			<language type="kro">кру</language>
-			<language type="kru">курукх</language>
-			<language type="ks">кашмір�ька</language>
-			<language type="ku">курд�ька</language>
-			<language type="kum">кумицька</language>
-			<language type="kut">кутенаї</language>
-			<language type="kv">комі</language>
-			<language type="kw">корній�ька</language>
-			<language type="ky">киргизька</language>
-			<language type="la">латин�ька</language>
-			<language type="lad">ладіно</language>
-			<language type="lah">ланда</language>
-			<language type="lam">ламба</language>
-			<language type="lb">люк�ембурзька</language>
-			<language type="lez">лезгін�ька</language>
-			<language type="lg">ганда</language>
-			<language type="li">лімбургій�ька</language>
-			<language type="ln">лінгала</language>
-			<language type="lo">лао�ька</language>
-			<language type="lol">монго</language>
-			<language type="loz">лозі</language>
-			<language type="lt">литов�ька</language>
-			<language type="lu">луба-катанга</language>
-			<language type="lua">луба-лулуа</language>
-			<language type="lui">луї�еньо</language>
-			<language type="lun">лунда</language>
-			<language type="luo">луо</language>
-			<language type="lus">лушей</language>
-			<language type="lv">латвій�ька</language>
-			<language type="mad">мадур�ька</language>
-			<language type="mag">магадхі</language>
-			<language type="mai">майтхілі</language>
-			<language type="mak">мака�ар�ька</language>
-			<language type="man">мандінго</language>
-			<language type="map">ав�тронезій�ька мова</language>
-			<language type="mas">ма�аї</language>
-			<language type="mdf">мокша</language>
-			<language type="mdr">мандар�ька</language>
-			<language type="men">менде</language>
-			<language type="mg">малага�ій�ька</language>
-			<language type="mga">�ередньоірланд�ька</language>
-			<language type="mh">маршалль�ька</language>
-			<language type="mi">маорі</language>
-			<language type="mic">мікмак</language>
-			<language type="min">мінангкабау</language>
-			<language type="mis">інші мови</language>
-			<language type="mk">македон�ька</language>
-			<language type="mkh">мон-кхмер�ькі мови</language>
-			<language type="ml">малай�лам</language>
-			<language type="mn">монголь�ька</language>
-			<language type="mnc">манчжур�ька</language>
-			<language type="mni">маніпурі</language>
-			<language type="mno">манобо мови</language>
-			<language type="mo">молдав�ька</language>
-			<language type="moh">магавк</language>
-			<language type="mos">мо��і</language>
-			<language type="mr">маратхі</language>
-			<language type="ms">малай�ька</language>
-			<language type="mt">мальтій�ька</language>
-			<language type="mul">декілька мов</language>
-			<language type="mun">мунда мови</language>
-			<language type="mus">крік</language>
-			<language type="mwl">міранд�ька</language>
-			<language type="mwr">марварі</language>
-			<language type="my">бірман�ька</language>
-			<language type="myn">май� мови</language>
-			<language type="myv">ерз�</language>
-			<language type="na">науру</language>
-			<language type="nah">нахуатль</language>
-			<language type="nai">північноамерикан�ьких індіанців мови</language>
-			<language type="nap">неаполітан�ька</language>
-			<language type="nb">норвезька букмол</language>
-			<language type="nd">ндебелє північна</language>
-			<language type="nds">нижньонімецька</language>
-			<language type="ne">непаль�ька</language>
-			<language type="new">неварі</language>
-			<language type="ng">ндонга</language>
-			<language type="nia">ніа�ька</language>
-			<language type="nic">ніґеро-кордофан�ькі мови</language>
-			<language type="niu">ніуе</language>
-			<language type="nl">голланд�ька</language>
-			<language type="nl_BE">фламанд�ька</language>
-			<language type="nn">норвезька нюнор�ьк</language>
-			<language type="no">норвезька</language>
-			<language type="nog">ногай�ька</language>
-			<language type="non">давньонорвезька</language>
-			<language type="nqo">нко</language>
-			<language type="nr">ндебелє південна</language>
-			<language type="nso">�ото північна</language>
-			<language type="nub">нубій�ькі мови</language>
-			<language type="nv">навахо</language>
-			<language type="nwc">неварі кла�ична</language>
-			<language type="ny">нь�нджа</language>
-			<language type="nym">нь�мвезі</language>
-			<language type="nyn">нь�нколе</language>
-			<language type="nyo">ньоро</language>
-			<language type="nzi">нзіма</language>
-			<language type="oc">окитан</language>
-			<language type="oj">оджібва</language>
-			<language type="om">оромо</language>
-			<language type="or">орі�</language>
-			<language type="os">о�етин�ька</language>
-			<language type="osa">о�ейдж</language>
-			<language type="ota">о�ман�ька</language>
-			<language type="oto">отомі мови</language>
-			<language type="pa">панджабі</language>
-			<language type="paa">папуа�ькі мови</language>
-			<language type="pag">панга�інан�ька</language>
-			<language type="pal">пехлеві</language>
-			<language type="pam">пампанга</language>
-			<language type="pap">пап’�менто</language>
-			<language type="pau">палауан�ька</language>
-			<language type="peo">давньопер�ька</language>
-			<language type="phi">філіппін�ькі мови</language>
-			<language type="phn">фінікій�ько-пунічна</language>
-			<language type="pi">палі</language>
-			<language type="pl">поль�ька</language>
-			<language type="pon">понапе</language>
-			<language type="pra">пракріті мови</language>
-			<language type="pro">давньопрован�аль�ька</language>
-			<language type="ps">пушту</language>
-			<language type="pt">португаль�ька</language>
-			<language type="pt_BR">португаль�ька бразиль�ька</language>
-			<language type="pt_PT">португаль�ька іберій�ька</language>
-			<language type="qu">кечуа</language>
-			<language type="raj">раджа�тхані</language>
-			<language type="rap">рапануї</language>
-			<language type="rar">раротонга</language>
-			<language type="rm">ретороман�ька</language>
-			<language type="rn">рунді</language>
-			<language type="ro">румун�ька</language>
-			<language type="roa">роман�ькі мови</language>
-			<language type="rom">циган�ька</language>
-			<language type="root">корінь</language>
-			<language type="ru">ро�ій�ька</language>
-			<language type="rup">арумун�ька</language>
-			<language type="rw">кінь�руанда</language>
-			<language type="sa">�ан�крит</language>
-			<language type="sad">�андаве</language>
-			<language type="sah">�кут�ька</language>
-			<language type="sai">південноамерикан�ьких індіанців мови</language>
-			<language type="sal">�аліш�ькі мови</language>
-			<language type="sam">�амарит�н�ька арамей�ька</language>
-			<language type="sas">�а�ак�ька</language>
-			<language type="sat">�анталь�ька</language>
-			<language type="sc">�ардин�ька</language>
-			<language type="scn">�ицилій�ька</language>
-			<language type="sco">шотланд�ька</language>
-			<language type="sd">�індхі</language>
-			<language type="se">�аам�ька північна</language>
-			<language type="sel">�елькуп�ька</language>
-			<language type="sem">�еміт�ькі мови</language>
-			<language type="sg">�анго</language>
-			<language type="sga">давньоірланд�ька</language>
-			<language type="sgn">знакові мови</language>
-			<language type="sh">�ерб�ько-хорват�ька</language>
-			<language type="shn">шан�ька</language>
-			<language type="si">�ингаль�ька</language>
-			<language type="sid">�ідамо</language>
-			<language type="sio">�іу мови</language>
-			<language type="sit">китай�ько-тибет�ькі мови</language>
-			<language type="sk">�ловацька</language>
-			<language type="sl">�ловен�ька</language>
-			<language type="sla">�лов’�н�ькі мови</language>
-			<language type="sm">�амоан�ька</language>
-			<language type="sma">�аам�ька південна</language>
-			<language type="smi">�аам�ькі мови</language>
-			<language type="smj">�аам�ька луле</language>
-			<language type="smn">�аам�ька інарі</language>
-			<language type="sms">�аам�ька �кольт</language>
-			<language type="sn">шона</language>
-			<language type="snk">�онінке</language>
-			<language type="so">�омалі</language>
-			<language type="sog">�огдій�ька</language>
-			<language type="son">�онгай</language>
-			<language type="sq">албан�ька</language>
-			<language type="sr">�ерб�ька</language>
-			<language type="srn">�ранан тонго</language>
-			<language type="srr">�ерер</language>
-			<language type="ss">�і�ваті</language>
-			<language type="ssa">ніло-�ахар�ькі мови</language>
-			<language type="st">�ото південна</language>
-			<language type="su">�ундан�ька</language>
-			<language type="suk">�укума</language>
-			<language type="sus">�у�у</language>
-			<language type="sux">шумер�ька</language>
-			<language type="sv">швед�ька</language>
-			<language type="sw">�уахілі</language>
-			<language type="syc">�ирій�ька кла�ична</language>
-			<language type="syr">�ирій�ька</language>
-			<language type="ta">таміль�ька</language>
-			<language type="tai">тай�ькі мови</language>
-			<language type="te">телугу</language>
-			<language type="tem">темне</language>
-			<language type="ter">терено</language>
-			<language type="tet">тетум</language>
-			<language type="tg">таджицька</language>
-			<language type="th">тай�ька</language>
-			<language type="ti">тигріні</language>
-			<language type="tig">тигре</language>
-			<language type="tiv">тів</language>
-			<language type="tk">туркмен�ька</language>
-			<language type="tkl">токелау</language>
-			<language type="tl">тагаль�ька</language>
-			<language type="tlh">клінгон</language>
-			<language type="tli">тлінгіт</language>
-			<language type="tmh">тамашек</language>
-			<language type="tn">т�вана</language>
-			<language type="to">Тонга</language>
-			<language type="tog">нь��а тонга</language>
-			<language type="tpi">ток-пі�ін</language>
-			<language type="tr">турецька</language>
-			<language type="ts">т�онга</language>
-			<language type="tsi">цимшиан</language>
-			<language type="tt">татар�ька</language>
-			<language type="tum">тумбука</language>
-			<language type="tup">тупі</language>
-			<language type="tut">алтай�ька мова</language>
-			<language type="tvl">тувалу</language>
-			<language type="tw">тві</language>
-			<language type="ty">таїт�н�ька</language>
-			<language type="tyv">тувин�ька</language>
-			<language type="udm">удмурт�ька</language>
-			<language type="ug">уйгур�ька</language>
-			<language type="uga">угарит�ька</language>
-			<language type="uk">україн�ька</language>
-			<language type="umb">умбунду</language>
-			<language type="und">невизначена мова</language>
-			<language type="ur">урду</language>
-			<language type="uz">узбецька</language>
-			<language type="vai">ваї</language>
-			<language type="ve">венда</language>
-			<language type="vi">вʼєтнам�ька</language>
-			<language type="vo">волап’юк</language>
-			<language type="vot">вод�ька</language>
-			<language type="wa">валлон�ька</language>
-			<language type="wak">вакаш�ькі мови</language>
-			<language type="wal">валамо</language>
-			<language type="war">варай</language>
-			<language type="was">вашо</language>
-			<language type="wen">лужицькі мови</language>
-			<language type="wo">волоф</language>
-			<language type="xal">калмицька</language>
-			<language type="xh">кхо�а</language>
-			<language type="yao">�о</language>
-			<language type="yap">�п</language>
-			<language type="yi">ідиш</language>
-			<language type="yo">йоруба</language>
-			<language type="ypk">юпік мови</language>
-			<language type="za">чжуан</language>
-			<language type="zap">�апотек�ька</language>
-			<language type="zbl">блі��а мова</language>
-			<language type="zen">зенага</language>
-			<language type="zh">китай�ька</language>
-			<language type="zh_Hans">китай�ька �прощена</language>
-			<language type="zh_Hant">китай�ька традиційна</language>
-			<language type="znd">занде</language>
-			<language type="zu">зулу�ька</language>
-			<language type="zun">зуньї</language>
-			<language type="zxx">немає мовного вмі�ту</language>
-			<language type="zza">зазакі</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�раб�ький</script>
-			<script type="Armi">�рмі</script>
-			<script type="Armn">Вірмен�ький</script>
-			<script type="Avst">�ве�тій�ький</script>
-			<script type="Bali">Балій�ький</script>
-			<script type="Batk">Батак</script>
-			<script type="Beng">Бенгаль�ький</script>
-			<script type="Blis">Символи Блі��а</script>
-			<script type="Bopo">Бопомофо</script>
-			<script type="Brah">Брахмі</script>
-			<script type="Brai">Шрифт Брайл�</script>
-			<script type="Bugi">Бугій�ький</script>
-			<script type="Buhd">Бухід</script>
-			<script type="Cakm">Чакма</script>
-			<script type="Cans">Уніфіковані �имволи канад�ьких тубільців</script>
-			<script type="Cari">Каріан�ький</script>
-			<script type="Cham">Хаміт�ький</script>
-			<script type="Cher">Черокі</script>
-			<script type="Cirt">Кирт</script>
-			<script type="Copt">Копт�ький</script>
-			<script type="Cprt">Кіпр�ький</script>
-			<script type="Cyrl">Кириличний</script>
-			<script type="Cyrs">Давньоцерковно�лов'�н�ький</script>
-			<script type="Deva">Деванагарі</script>
-			<script type="Dsrt">Дезерет</script>
-			<script type="Egyd">Єгипет�ький демотичний</script>
-			<script type="Egyh">Єгипет�ький ієратичний</script>
-			<script type="Egyp">Єгипет�ький ієрогліфічний</script>
-			<script type="Ethi">Ефіоп�ький</script>
-			<script type="Geok">Кхут�урі</script>
-			<script type="Geor">Грузин�ький</script>
-			<script type="Glag">Глаголичний</script>
-			<script type="Goth">Готичний</script>
-			<script type="Grek">Грецький</script>
-			<script type="Gujr">Гуджараті</script>
-			<script type="Guru">Гурмухі</script>
-			<script type="Hang">Хангул</script>
-			<script type="Hani">Китай�ький</script>
-			<script type="Hano">Хануну</script>
-			<script type="Hans">Китай�ький �прощений</script>
-			<script type="Hant">Китай�ький традиційний</script>
-			<script type="Hebr">Іврит</script>
-			<script type="Hira">Хірагана</script>
-			<script type="Hmng">Пахау хмонг</script>
-			<script type="Hrkt">Катакана чи хірагана</script>
-			<script type="Hung">Давньоугор�ький</script>
-			<script type="Inds">Харап�ький</script>
-			<script type="Ital">Давньоіталій�ький</script>
-			<script type="Java">Яван�ький</script>
-			<script type="Jpan">Япон�ький</script>
-			<script type="Kali">Ка� Лі</script>
-			<script type="Kana">Катакана</script>
-			<script type="Khar">Кхароштхі</script>
-			<script type="Khmr">Кхмер�ький</script>
-			<script type="Knda">Каннада</script>
-			<script type="Kore">Корей�ький</script>
-			<script type="Kthi">Каїті</script>
-			<script type="Lana">Ланна</script>
-			<script type="Laoo">Лао�ький</script>
-			<script type="Latf">Латин�ький фрактурний</script>
-			<script type="Latg">Латин�ький гель�ький</script>
-			<script type="Latn">Латин�ький</script>
-			<script type="Lepc">Лепча</script>
-			<script type="Limb">Лімбу</script>
-			<script type="Lina">Лінійний �</script>
-			<script type="Linb">Лінійний В</script>
-			<script type="Lyci">Лікій�ький</script>
-			<script type="Lydi">Лідій�ький</script>
-			<script type="Mand">Мандей�ький</script>
-			<script type="Mani">Маніхей�ький</script>
-			<script type="Maya">Май� ієрогліфічний</script>
-			<script type="Mero">Мероїт�ький</script>
-			<script type="Mlym">Малай�лам</script>
-			<script type="Mong">Монголь�ький</script>
-			<script type="Moon">Мун</script>
-			<script type="Mtei">Мейтей майєк</script>
-			<script type="Mymr">Мʼ�нмар</script>
-			<script type="Nkoo">�ко</script>
-			<script type="Ogam">Огамічний</script>
-			<script type="Olck">Санталь�ький</script>
-			<script type="Orkh">Орхон�ький</script>
-			<script type="Orya">Орі�</script>
-			<script type="Osma">О�ман�ький</script>
-			<script type="Perm">Давньоперм�ький</script>
-			<script type="Phag">Пхаг�-па</script>
-			<script type="Phli">Пехлеві напи�ів</script>
-			<script type="Phlp">Пехлеві релігійний</script>
-			<script type="Phlv">Пехлеві літературний</script>
-			<script type="Phnx">Фінікій�ький</script>
-			<script type="Plrd">Пи�емні�ть Полларда</script>
-			<script type="Prti">Парф�н�ький</script>
-			<script type="Qaai">У�падкований</script>
-			<script type="Rjng">Реджанг</script>
-			<script type="Roro">Ронго-ронго</script>
-			<script type="Runr">Рунічний</script>
-			<script type="Samr">Самарит�н�ький</script>
-			<script type="Sara">Сараті</script>
-			<script type="Saur">Саураштра</script>
-			<script type="Sgnw">Знаковий</script>
-			<script type="Shaw">Шоу</script>
-			<script type="Sinh">Сингаль�ький</script>
-			<script type="Sund">Сундан�ький</script>
-			<script type="Sylo">Сілоті нагрі</script>
-			<script type="Syrc">Сирій�ький</script>
-			<script type="Syre">Давньо�ирій�ький е�трангело</script>
-			<script type="Syrj">Давньо�ирій�ький західний</script>
-			<script type="Syrn">Давньо�ирій�ький �хідний</script>
-			<script type="Tagb">Тагбанва</script>
-			<script type="Tale">Тай-лі</script>
-			<script type="Talu">�овий тай�ький луе</script>
-			<script type="Taml">Таміль�ький</script>
-			<script type="Tavt">Тай-в'єт</script>
-			<script type="Telu">Телугу</script>
-			<script type="Teng">Тенгвар</script>
-			<script type="Tfng">Тифінаг</script>
-			<script type="Tglg">Тагаль�ький</script>
-			<script type="Thaa">Таана</script>
-			<script type="Thai">Тай�ький</script>
-			<script type="Tibt">Тибет�ький</script>
-			<script type="Ugar">Угарит�ький</script>
-			<script type="Vaii">Ваї</script>
-			<script type="Visp">Фонетична тран�крипці� Белла</script>
-			<script type="Xpeo">Давньопер�ький</script>
-			<script type="Xsux">Шумеро-аккад�ький клінопи�</script>
-			<script type="Yiii">Йї</script>
-			<script type="Zmth">Математичний</script>
-			<script type="Zsym">Символьний</script>
-			<script type="Zxxx">Безпи�емний</script>
-			<script type="Zyyy">�евизначений</script>
-			<script type="Zzzz">�евідомий</script>
-		</scripts>
-		<territories>
-			<territory type="001">Світ</territory>
-			<territory type="002">�фрика</territory>
-			<territory type="003">Північноамерикан�ький континент</territory>
-			<territory type="005">Південна �мерика</territory>
-			<territory type="009">Океані�</territory>
-			<territory type="011">Західна �фрика</territory>
-			<territory type="013">Центральна �мерика</territory>
-			<territory type="014">Східна �фрика</territory>
-			<territory type="015">Північна �фрика</territory>
-			<territory type="017">Центральна �фрика</territory>
-			<territory type="018">Південна �фрика</territory>
-			<territory type="019">�мерики</territory>
-			<territory type="021">Північна �мерика</territory>
-			<territory type="029">Кариб�ький ба�ейн</territory>
-			<territory type="030">Східна �зі�</territory>
-			<territory type="034">Південна �зі�</territory>
-			<territory type="035">Південно-Східна �зі�</territory>
-			<territory type="039">Південна Європа</territory>
-			<territory type="053">�в�тралі� та �ова Зеланді�</territory>
-			<territory type="054">Меланезі�</territory>
-			<territory type="057">Мікронезій�ький регіон</territory>
-			<territory type="061">Полінезі�</territory>
-			<territory type="062">Південно-Центральна �зі�</territory>
-			<territory type="142">�зі�</territory>
-			<territory type="143">Центральна �зі�</territory>
-			<territory type="145">Західна �зі�</territory>
-			<territory type="150">Європа</territory>
-			<territory type="151">Східна Європа</territory>
-			<territory type="154">Північна Європа</territory>
-			<territory type="155">Західна Європа</territory>
-			<territory type="172">Співдружні�ть �езалежних Держав</territory>
-			<territory type="419">Латин�ька �мерика і Кариб�ький ба�ейн</territory>
-			<territory type="830">�орманд�ькі о�трови</territory>
-			<territory type="AD">�ндорра</territory>
-			<territory type="AE">Обʼєднані �раб�ькі Емірати</territory>
-			<territory type="AF">�фгані�тан</territory>
-			<territory type="AG">�нтигуа і Барбуда</territory>
-			<territory type="AI">�нгіль�</territory>
-			<territory type="AL">�лбані�</territory>
-			<territory type="AM">Вірмені�</territory>
-			<territory type="AN">�ідерланд�ькі �нтиль�ькі О�трови</territory>
-			<territory type="AO">�нгола</territory>
-			<territory type="AQ">�нтарктида</territory>
-			<territory type="AR">�ргентина</territory>
-			<territory type="AS">�мерикан�ьке Самоа</territory>
-			<territory type="AT">�в�трі�</territory>
-			<territory type="AU">�в�тралі�</territory>
-			<territory type="AW">�руба</territory>
-			<territory type="AX">�ланд�ькі о�трови</territory>
-			<territory type="AZ">�зербайджан</territory>
-			<territory type="BA">Бо�ні� і Герцоговина</territory>
-			<territory type="BB">Барбадо�</territory>
-			<territory type="BD">Бангладеш</territory>
-			<territory type="BE">Бельгі�</territory>
-			<territory type="BF">Буркіна-Фа�о</territory>
-			<territory type="BG">Болгарі�</territory>
-			<territory type="BH">Бахрейн</territory>
-			<territory type="BI">Бурунді</territory>
-			<territory type="BJ">Бенін</territory>
-			<territory type="BL">О�трів Св�того Бартоломе�</territory>
-			<territory type="BM">Бермуди</territory>
-			<territory type="BN">Бруней</territory>
-			<territory type="BO">Боліві�</territory>
-			<territory type="BR">Бразилі�</territory>
-			<territory type="BS">Багами</territory>
-			<territory type="BT">Бутан</territory>
-			<territory type="BV">О�трів Буве</territory>
-			<territory type="BW">Бот�вана</territory>
-			<territory type="BY">Білору�ь</territory>
-			<territory type="BZ">Беліз</territory>
-			<territory type="CA">Канада</territory>
-			<territory type="CC">Коко�ові о�трови</territory>
-			<territory type="CD">Демократична Ре�публіка Конґо</territory>
-			<territory type="CF">Центральноафрикан�ька Ре�публіка</territory>
-			<territory type="CG">Конґо - Браззавіль</territory>
-			<territory type="CH">Швейцарі�</territory>
-			<territory type="CI">Кот д’Івуар</territory>
-			<territory type="CK">О�трови Кука</territory>
-			<territory type="CL">Чилі</territory>
-			<territory type="CM">Камерун</territory>
-			<territory type="CN">Китай</territory>
-			<territory type="CO">Колумбі�</territory>
-			<territory type="CR">Ко�та-Рика</territory>
-			<territory type="CS">Сербі� та Чорногорі�</territory>
-			<territory type="CU">Куба</territory>
-			<territory type="CV">Кабо-Верде</territory>
-			<territory type="CX">О�трів Різдва</territory>
-			<territory type="CY">Кіпр</territory>
-			<territory type="CZ">Че�ька ре�публіка</territory>
-			<territory type="DE">�імеччина</territory>
-			<territory type="DJ">Джібуті</territory>
-			<territory type="DK">Дані�</territory>
-			<territory type="DM">Домінік</territory>
-			<territory type="DO">Домінікан�ька Ре�публіка</territory>
-			<territory type="DZ">�лжир</territory>
-			<territory type="EC">Еквадор</territory>
-			<territory type="EE">Е�тоні�</territory>
-			<territory type="EG">Єгипет</territory>
-			<territory type="EH">Західна Сахара</territory>
-			<territory type="ER">Еритре�</territory>
-			<territory type="ES">І�пані�</territory>
-			<territory type="ET">Ефіопі�</territory>
-			<territory type="FI">Фінл�нді�</territory>
-			<territory type="FJ">Фіджі</territory>
-			<territory type="FK">Фолкленд�ькі о�трови</territory>
-			<territory type="FM">Мікронезі�</territory>
-			<territory type="FO">Фарер�ькі о�трови</territory>
-			<territory type="FR">Франці�</territory>
-			<territory type="GA">Габон</territory>
-			<territory type="GB">Великобритані�</territory>
-			<territory type="GD">Гренада</territory>
-			<territory type="GE">Грузі�</territory>
-			<territory type="GF">Французька Гвіана</territory>
-			<territory type="GG">Герн�і</territory>
-			<territory type="GH">Гана</territory>
-			<territory type="GI">Гібралтар</territory>
-			<territory type="GL">Гренланді�</territory>
-			<territory type="GM">Гамбі�</territory>
-			<territory type="GN">Гвіне�</territory>
-			<territory type="GP">Гваделупа</territory>
-			<territory type="GQ">Екваторіальна Гвіне�</territory>
-			<territory type="GR">Греці�</territory>
-			<territory type="GS">Південна Джорджі� та Південні Сандвічеві О�трови</territory>
-			<territory type="GT">Гватемала</territory>
-			<territory type="GU">Гуам</territory>
-			<territory type="GW">Гвіне�-Бі��ау</territory>
-			<territory type="GY">Гайана</territory>
-			<territory type="HK">Гонконґ О.�.Р. Китаю</territory>
-			<territory type="HM">О�трови Херд і Мак-Дональд</territory>
-			<territory type="HN">Гондура�</territory>
-			<territory type="HR">Хорваті�</territory>
-			<territory type="HT">Гаїті</territory>
-			<territory type="HU">Угорщина</territory>
-			<territory type="ID">Індонезі�</territory>
-			<territory type="IE">Ірланді�</territory>
-			<territory type="IL">Ізраїль</territory>
-			<territory type="IM">О�трів Мен</territory>
-			<territory type="IN">Інді�</territory>
-			<territory type="IO">Британ�ькі території Індій�ького океану</territory>
-			<territory type="IQ">Ірак</territory>
-			<territory type="IR">Іран</territory>
-			<territory type="IS">І�ланді�</territory>
-			<territory type="IT">Італі�</territory>
-			<territory type="JE">Джер�і</territory>
-			<territory type="JM">Ямайка</territory>
-			<territory type="JO">Йордані�</territory>
-			<territory type="JP">Японі�</territory>
-			<territory type="KE">Кені�</territory>
-			<territory type="KG">Киргиз�тан</territory>
-			<territory type="KH">Камбоджа</territory>
-			<territory type="KI">Кірибаті</territory>
-			<territory type="KM">Комор�ькі О�трови</territory>
-			<territory type="KN">Сент-Кіт� і �еві�</territory>
-			<territory type="KP">Північна Коре�</territory>
-			<territory type="KR">Південна Коре�</territory>
-			<territory type="KW">Кувейт</territory>
-			<territory type="KY">Кайманові о�трови</territory>
-			<territory type="KZ">Казах�тан</territory>
-			<territory type="LA">Лао�</territory>
-			<territory type="LB">Ліван</territory>
-			<territory type="LC">Сент-Лю�і�</territory>
-			<territory type="LI">Ліхтенштейн</territory>
-			<territory type="LK">Шрі-Ланка</territory>
-			<territory type="LR">Лібері�</territory>
-			<territory type="LS">Ле�ото</territory>
-			<territory type="LT">Литва</territory>
-			<territory type="LU">Люк�ембург</territory>
-			<territory type="LV">Латві�</territory>
-			<territory type="LY">Ліві�</territory>
-			<territory type="MA">Марокко</territory>
-			<territory type="MC">Монако</territory>
-			<territory type="MD">Молдова</territory>
-			<territory type="ME">Чорногорі�</territory>
-			<territory type="MF">О�трів Св�того Мартіна</territory>
-			<territory type="MG">Мадага�кар</territory>
-			<territory type="MH">Маршаллові О�трови</territory>
-			<territory type="MK">Македоні�</territory>
-			<territory type="ML">Малі</territory>
-			<territory type="MM">Мʼ�нма</territory>
-			<territory type="MN">Монголі�</territory>
-			<territory type="MO">Макао О.�.Р. Китаю</territory>
-			<territory type="MP">Північні Маріан�ькі О�трови</territory>
-			<territory type="MQ">Мартиніка</territory>
-			<territory type="MR">Мавритані�</territory>
-			<territory type="MS">Мон�еррат</territory>
-			<territory type="MT">Мальта</territory>
-			<territory type="MU">Маврикій</territory>
-			<territory type="MV">Мальдіви</territory>
-			<territory type="MW">Малаві</territory>
-			<territory type="MX">Мек�ика</territory>
-			<territory type="MY">Малайзі�</territory>
-			<territory type="MZ">Мозамбік</territory>
-			<territory type="NA">�амібі�</territory>
-			<territory type="NC">�ова Каледоні�</territory>
-			<territory type="NE">�ігер</territory>
-			<territory type="NF">О�трів �орфолк</territory>
-			<territory type="NG">�ігері�</territory>
-			<territory type="NI">�ікарагуа</territory>
-			<territory type="NL">�ідерланди</territory>
-			<territory type="NO">�орвегі�</territory>
-			<territory type="NP">�епал</territory>
-			<territory type="NR">�ауру</territory>
-			<territory type="NU">�і�</territory>
-			<territory type="NZ">�ова Зеланді�</territory>
-			<territory type="OM">Оман</territory>
-			<territory type="PA">Панама</territory>
-			<territory type="PE">Перу</territory>
-			<territory type="PF">Французька Полінезі�</territory>
-			<territory type="PG">Папуа �ова Гвіне�</territory>
-			<territory type="PH">Філіппіни</territory>
-			<territory type="PK">Паки�тан</territory>
-			<territory type="PL">Польща</territory>
-			<territory type="PM">Сен-Пʼєр і Мікелон</territory>
-			<territory type="PN">Піткерн</territory>
-			<territory type="PR">Пуерто-Ріко</territory>
-			<territory type="PS">Пале�тина</territory>
-			<territory type="PT">Португалі�</territory>
-			<territory type="PW">Палау</territory>
-			<territory type="PY">Парагвай</territory>
-			<territory type="QA">Катар</territory>
-			<territory type="QO">Інша Океані�</territory>
-			<territory type="QU">Європей�ький Союз</territory>
-			<territory type="RE">Реюньйон</territory>
-			<territory type="RO">Румуні�</territory>
-			<territory type="RS">Сербі�</territory>
-			<territory type="RU">Ро�і�</territory>
-			<territory type="RW">Руанда</territory>
-			<territory type="SA">Саудів�ька �раві�</territory>
-			<territory type="SB">Соломонові О�трови</territory>
-			<territory type="SC">Сейшели</territory>
-			<territory type="SD">Судан</territory>
-			<territory type="SE">Швеці�</territory>
-			<territory type="SG">Сінгапур</territory>
-			<territory type="SH">О�трів Св�тої Єлени</territory>
-			<territory type="SI">Словені�</territory>
-			<territory type="SJ">О�трови Свальбард та Ян-Маєн</territory>
-			<territory type="SK">Словакі�</territory>
-			<territory type="SL">Сьєрра-Леоне</territory>
-			<territory type="SM">Сан-Марино</territory>
-			<territory type="SN">Сенегал</territory>
-			<territory type="SO">Сомалі</territory>
-			<territory type="SR">Суринам</territory>
-			<territory type="ST">Сан-Томе і Прін�іпі</territory>
-			<territory type="SV">Сальвадор</territory>
-			<territory type="SY">Сирі�</territory>
-			<territory type="SZ">Свазіленд</territory>
-			<territory type="TC">Терк� і Кайко�</territory>
-			<territory type="TD">Чад</territory>
-			<territory type="TF">Французькі Південні Території</territory>
-			<territory type="TG">Того</territory>
-			<territory type="TH">Таїланд</territory>
-			<territory type="TJ">Таджики�тан</territory>
-			<territory type="TK">Токелау</territory>
-			<territory type="TL">Східний Тимор</territory>
-			<territory type="TM">Туркмени�тан</territory>
-			<territory type="TN">Туні�</territory>
-			<territory type="TO">Тонга</territory>
-			<territory type="TR">Туреччина</territory>
-			<territory type="TT">Тринідад і Тобаго</territory>
-			<territory type="TV">Тувалу</territory>
-			<territory type="TW">Тайвань</territory>
-			<territory type="TZ">Танзані�</territory>
-			<territory type="UA">Україна</territory>
-			<territory type="UG">Уганда</territory>
-			<territory type="UM">Віддалені О�трови СШ�</territory>
-			<territory type="US">СШ�</territory>
-			<territory type="UY">Уругвай</territory>
-			<territory type="UZ">Узбеки�тан</territory>
-			<territory type="VA">Ватикан</territory>
-			<territory type="VC">Сент-Він�ент і Гренадини</territory>
-			<territory type="VE">Вене�уела</territory>
-			<territory type="VG">Віргін�ькі о�трови Британії</territory>
-			<territory type="VI">Віргін�ькі о�трови СШ�</territory>
-			<territory type="VN">Вʼєтнам</territory>
-			<territory type="VU">Вануату</territory>
-			<territory type="WF">Уоллі� і Футуна</territory>
-			<territory type="WS">Самоа</territory>
-			<territory type="YE">Ємен</territory>
-			<territory type="YT">Майот</territory>
-			<territory type="ZA">П�Р</territory>
-			<territory type="ZM">Замбі�</territory>
-			<territory type="ZW">Зімбабве</territory>
-			<territory type="ZZ">�евідомий або неправильний регіон</territory>
-		</territories>
-		<variants>
-			<variant type="1901">Традиційна німецька орфографі�</variant>
-			<variant type="1994">Стандартизована резь�н�ька орфографі�</variant>
-			<variant type="1996">�ова німецька орфографі� з 1996 р.</variant>
-			<variant type="1606NICT">Пізньо�ередньофранцуз�ька до 1606</variant>
-			<variant type="AREVELA">Східновірмен�ький</variant>
-			<variant type="AREVMDA">Західновірмен�ький</variant>
-			<variant type="BAKU1926">Уніфікований турецький латин�ький алфавіт</variant>
-			<variant type="BISKE">Діалект Сан-Джорджіо/Біла</variant>
-			<variant type="BOONT">Бунтлінг</variant>
-			<variant type="FONIPA">Міжнародний фонетичний алфавіт</variant>
-			<variant type="FONUPA">Ураль�ький фонетичний алфавіт</variant>
-			<variant type="LIPAW">Ліповаз�ький діалект резь�н�ької мови</variant>
-			<variant type="MONOTON">Монотонічний</variant>
-			<variant type="NEDIS">�аті�он�ький діалект</variant>
-			<variant type="NJIVA">Діалект �джіва</variant>
-			<variant type="OSOJS">О�о�н�ький діалект</variant>
-			<variant type="POLYTON">Політонічний</variant>
-			<variant type="POSIX">Комп'ютерний</variant>
-			<variant type="REVISED">�ова орфографі�</variant>
-			<variant type="ROZAJ">Резь�н�ький</variant>
-			<variant type="SAAHO">Сахо</variant>
-			<variant type="SCOTLAND">Шотланд�ька англій�ька</variant>
-			<variant type="SCOUSE">Ліверпуль�ький діалект</variant>
-			<variant type="SOLBA">Діалект Столвіца/Солбіка</variant>
-			<variant type="TARASK">Орфографі� Тара�кевича</variant>
-			<variant type="VALENCIA">Вален�ій�ька</variant>
-		</variants>
-		<keys>
-			<key type="calendar">Календар</key>
-			<key type="collation">Сортуванн�</key>
-			<key type="currency">Валюта</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">Китай�ький традиційний</type>
-			<type type="buddhist" key="calendar">Буддій�ький календар</type>
-			<type type="chinese" key="calendar">Китай�ький календар</type>
-			<type type="direct" key="collation">Пр�мий пор�док</type>
-			<type type="gb2312han" key="collation">Китай�ький �прощений</type>
-			<type type="gregorian" key="calendar">Григоріан�ький календар</type>
-			<type type="hebrew" key="calendar">Єврей�ький календар</type>
-			<type type="indian" key="calendar">Індій�ький �віт�ький календар</type>
-			<type type="islamic" key="calendar">Му�ульман�ький календар</type>
-			<type type="islamic-civil" key="calendar">Му�ульман�ький �віт�ький календар</type>
-			<type type="japanese" key="calendar">Япон�ький календар</type>
-			<type type="phonebook" key="collation">Телефонна книга</type>
-			<type type="pinyin" key="collation">Пор�док піньїн</type>
-			<type type="roc" key="calendar">Китай�ький григоріан�ький</type>
-			<type type="stroke" key="collation">Пор�док нати�канн� клавіш</type>
-			<type type="traditional" key="collation">Традиційний</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Метрична</measurementSystemName>
-			<measurementSystemName type="US">СШ�</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">Мова з кодом {0}</codePattern>
-			<codePattern type="script">Скрипт із кодом {0}</codePattern>
-			<codePattern type="territory">Територі� з кодом {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<inList>titlecase-firstword</inList>
-		<inText type="currency">lowercase-words</inText>
-		<inText type="fields">titlecase-firstword</inText>
-		<inText type="keys">lowercase-words</inText>
-		<inText type="languages">lowercase-words</inText>
-		<inText type="quarterWidth">lowercase-words</inText>
-		<inText type="types">titlecase-firstword</inText>
-	</layout>
-	<characters>
-		<exemplarCharacters>[ʼ а-г ґ д е є ж-и і ї й-щ ь ю �]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[i v x]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>«</quotationStart>
-		<quotationEnd>»</quotationEnd>
-		<alternateQuotationStart>„</alternateQuotationStart>
-		<alternateQuotationEnd>“</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="coptic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Тот</month>
-							<month type="2">Бабе</month>
-							<month type="3">Хатур</month>
-							<month type="4">Кіхак</month>
-							<month type="5">Тобе</month>
-							<month type="6">�мшир</month>
-							<month type="7">Барамхат</month>
-							<month type="8">Бармуда</month>
-							<month type="9">Башна�</month>
-							<month type="10">Бауна</month>
-							<month type="11">�біб</month>
-							<month type="12">Ми�ра</month>
-							<month type="13">�а�і</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">�іч.</month>
-							<month type="2">лют.</month>
-							<month type="3">бер.</month>
-							<month type="4">квіт.</month>
-							<month type="5">трав.</month>
-							<month type="6">черв.</month>
-							<month type="7">лип.</month>
-							<month type="8">�ерп.</month>
-							<month type="9">вер.</month>
-							<month type="10">жовт.</month>
-							<month type="11">ли�т.</month>
-							<month type="12">груд.</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">�ічн�</month>
-							<month type="2">лютого</month>
-							<month type="3">березн�</month>
-							<month type="4">квітн�</month>
-							<month type="5">травн�</month>
-							<month type="6">червн�</month>
-							<month type="7">липн�</month>
-							<month type="8">�ерпн�</month>
-							<month type="9">вере�н�</month>
-							<month type="10">жовтн�</month>
-							<month type="11">ли�топада</month>
-							<month type="12">грудн�</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">Січ</month>
-							<month type="2">Лют</month>
-							<month type="3">Бер</month>
-							<month type="4">Кві</month>
-							<month type="5">Тра</month>
-							<month type="6">Чер</month>
-							<month type="7">Лип</month>
-							<month type="8">Сер</month>
-							<month type="9">Вер</month>
-							<month type="10">Жов</month>
-							<month type="11">Ли�</month>
-							<month type="12">Гру</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">С</month>
-							<month type="2">Л</month>
-							<month type="3">Б</month>
-							<month type="4">К</month>
-							<month type="5">Т</month>
-							<month type="6">Ч</month>
-							<month type="7">Л</month>
-							<month type="8">С</month>
-							<month type="9">Ð’</month>
-							<month type="10">Ж</month>
-							<month type="11">Л</month>
-							<month type="12">Г</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Січень</month>
-							<month type="2">Лютий</month>
-							<month type="3">Березень</month>
-							<month type="4">Квітень</month>
-							<month type="5">Травень</month>
-							<month type="6">Червень</month>
-							<month type="7">Липень</month>
-							<month type="8">Серпень</month>
-							<month type="9">Вере�ень</month>
-							<month type="10">Жовтень</month>
-							<month type="11">Ли�топад</month>
-							<month type="12">Грудень</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">�д</day>
-							<day type="mon">Пн</day>
-							<day type="tue">Ð’Ñ‚</day>
-							<day type="wed">Ср</day>
-							<day type="thu">Чт</day>
-							<day type="fri">Пт</day>
-							<day type="sat">Сб</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�еділ�</day>
-							<day type="mon">Понеділок</day>
-							<day type="tue">Вівторок</day>
-							<day type="wed">Середа</day>
-							<day type="thu">Четвер</day>
-							<day type="fri">Пʼ�тниц�</day>
-							<day type="sat">Субота</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">�</day>
-							<day type="mon">П</day>
-							<day type="tue">Ð’</day>
-							<day type="wed">С</day>
-							<day type="thu">Ч</day>
-							<day type="fri">П</day>
-							<day type="sat">С</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">I кв.</quarter>
-							<quarter type="2">II кв.</quarter>
-							<quarter type="3">III кв.</quarter>
-							<quarter type="4">IV кв.</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">I квартал</quarter>
-							<quarter type="2">II квартал</quarter>
-							<quarter type="3">III квартал</quarter>
-							<quarter type="4">IV квартал</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>дп</am>
-				<pm>пп</pm>
-				<eras>
-					<eraNames>
-						<era type="0">до нашої ери</era>
-						<era type="1">нашої ери</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">до н.е.</era>
-						<era type="1">н.е.</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d MMMM y 'Ñ€'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y 'Ñ€'.</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd.MM.yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="MMdd">dd.MM</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E, d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yMMM">LLL y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yyMM">MM.yy</dateFormatItem>
-						<dateFormatItem id="yyMMM">LLL yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">LLLL y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQQ">QQQQ y 'Ñ€'.</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d–d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm–HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm–HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="h">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M–M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd.MM – dd.MM</greatestDifference>
-							<greatestDifference id="M">dd.MM – dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, dd.MM – E, dd.MM</greatestDifference>
-							<greatestDifference id="M">E, dd.MM – E, dd.MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">d–d MMM</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, d – E, d MMM</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y–y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM.yy – MM.yy</greatestDifference>
-							<greatestDifference id="y">MM.yy – MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd.MM.yy – dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">dd.MM.yy – dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">dd.MM.yy – dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, dd.MM.yy – E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="M">E, dd.MM.yy – E, dd.MM.yy</greatestDifference>
-							<greatestDifference id="y">E, dd.MM.yy – E, dd.MM.yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">LLL–LLL y</greatestDifference>
-							<greatestDifference id="y">LLL y – LLL y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">d–d MMM y</greatestDifference>
-							<greatestDifference id="M">d MMM – d MMM y</greatestDifference>
-							<greatestDifference id="y">d MMM y – d MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, d – E, d MMM y</greatestDifference>
-							<greatestDifference id="M">E, d MMM – E, d MMM y</greatestDifference>
-							<greatestDifference id="y">E, d MMM y – E, d MMM y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Ера</displayName>
-					</field>
-					<field type="year">
-						<displayName>Рік</displayName>
-					</field>
-					<field type="month">
-						<displayName>Мі��ць</displayName>
-					</field>
-					<field type="week">
-						<displayName>Тиждень</displayName>
-					</field>
-					<field type="day">
-						<displayName>День</displayName>
-						<relative type="-3">Три дні тому</relative>
-						<relative type="-2">Позавчора</relative>
-						<relative type="-1">Вчора</relative>
-						<relative type="0">Сьогодні</relative>
-						<relative type="1">Завтра</relative>
-						<relative type="2">Пі�л�завтра</relative>
-						<relative type="3">Через три дні з цього моменту</relative>
-					</field>
-					<field type="weekday">
-						<displayName>День тижн�</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Ча�тина доби</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Година</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Хвилина</displayName>
-					</field>
-					<field type="second">
-						<displayName>Секунда</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Зона</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="hebrew">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Тішри</month>
-							<month type="2">Марчешван</month>
-							<month type="3">Чи�льов</month>
-							<month type="4">Тебет</month>
-							<month type="5">Шеват</month>
-							<month type="6">�дар Ⅰ</month>
-							<month type="7">�дар</month>
-							<month type="8">�і�ан</month>
-							<month type="9">Іар</month>
-							<month type="10">Сиван</month>
-							<month type="11">Таммуз</month>
-							<month type="12">�б</month>
-							<month type="13">Елул</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="wide">
-							<month type="6">�дар I</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Мухаррам</month>
-							<month type="2">Сафар</month>
-							<month type="3">Рабі I</month>
-							<month type="4">Рабі II</month>
-							<month type="5">Джумада I</month>
-							<month type="6">Джумада II</month>
-							<month type="7">Раджаб</month>
-							<month type="8">Шаабан</month>
-							<month type="9">Рамадан</month>
-							<month type="10">Даввал</month>
-							<month type="11">Зу-ль-каада</month>
-							<month type="12">Зу-ль-хіджа</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="persian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">Фарвардін</month>
-							<month type="2">Ордібехешт</month>
-							<month type="3">Хордад</month>
-							<month type="4">Тір</month>
-							<month type="5">Мордад</month>
-							<month type="6">Шахрівер</month>
-							<month type="7">Мехр</month>
-							<month type="8">�бан</month>
-							<month type="9">�зер</month>
-							<month type="10">Дей</month>
-							<month type="11">Бахман</month>
-							<month type="12">Е�фанд</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>�евідомо</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>�ндора</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>Дубаї</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>Кабул</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>�нтигуа</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>�нґіль�</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>Тірана</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>Єреван</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>Кюра�ао</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>Луанда</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>Ротера</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>Палмер</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>Південний полю�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>Сьова</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>Моу�он</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>Деві�</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>Во�ток</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>Кей�і</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Дюмон-д'Юрвіль</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>Мак-Мердо</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>Ріо-�алеґо�</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>Мендо�а</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>Сан-Хуан</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>Ушуа�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>Ла-Ріоха</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>Сан-Луї�</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>Катамарка</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Salta">
-				<exemplarCity>Сальта</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>Жужуй</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>Тукуман</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>Кордоба</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>Буено�-�йре�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>Паго Паго</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>Відень</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>Перт</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>Евкла</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>Дарвін</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>�делаїда</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>Брокен-Гіл</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>Каррі</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>Мельбурн</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>Хобарт</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>Ліндеман</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>Сідней</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>Бри�бен</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>Лорд-Хау</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>�руба</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>�ланд�ькі о�трови</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>Баку</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>Сараєво</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Барбадо�</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>Дака</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>Брю��ель</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>Уагадугу</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>Софі�</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Бахрейн</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>Бужумбура</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>Порто-�ово</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>Бермуди</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>Бруней</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>Ла-Па�</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>Ейрунепе</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>Ріо-Бранко</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>Порто-Велью</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>Боа-Ві�та</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>Манау�</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>Ку�ба</exemplarCity>
-			</zone>
-			<zone type="America/Santarem">
-				<exemplarCity>Сантарен</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>Кампу-Гранді</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>Белен</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>�рагуайна</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>Сан-Паулу</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>Бай�</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>Форталеза</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>Ма�ейо</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>Ре�іфі</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>�оронь�</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>�а�ау</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>Тхімпху</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>Габороне</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>Мін�ьк</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Беліз</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>Доу�он</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>Вайтгор�</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>Інувік</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>Ванкувер</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>Доу�он-Крік</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>Єллоунайф</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>Едмонтон</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>Свіфт-Каррент</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>Кембридж-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>Реджайна</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>Вінніпеґ</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>Резолют</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>Рейні-Рівер</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>Ренкін-Інлет</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>Корал-Харбор</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>Тандер-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>�іпігон</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>Торонто</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>Монреаль</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>Ікалуіт</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>Панґніртунґ</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>Монктон</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>Галіфак�</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>Гуз-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>Глей�-Бей</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>Бланк-Саблон</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>Сент-Джон�</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>Коко�ові о�трови</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>Кінша�а</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>Лубумбаші</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>Бангі</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>Браззавіль</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>Цюріх</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>�біджан</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>Раротонга</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>О�трів Па�хи</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>Санть�го</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>Дуала</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>Кашгар</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>Урумчі</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>Чунцин</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>Шанхай</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>Харбін</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>Богота</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Ко�та Ріка</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>Гавана</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Кабо-Верде</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>О�трів Різдва</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>�іко�і�</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>Прага</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>Берлін</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Джибуті</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>Копенгаген</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Домініка</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>Санто-Домінго</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>�лжир</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>Галапаго�ькі о�трови (Еквадор)</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>Гуа�кіль</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>Таллін</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>Каїр</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>Ель-�юн</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>��мера</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Канари</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>Сеута</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>Мадрид</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>�дди�-�беба</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>Гель�інкі</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Фіджи</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>Стенлі</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>Трук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>Понапе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>Ко�рае</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>Фарер�ькі о�трови</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>Париж</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>Лібревіль</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>Лондон</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Гренада</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>Тбілі�і</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>Кайенна</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>�ерн�і</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>�ккра</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>Гібралтар</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>Туле</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>Готхоб</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>Скор�би�ун</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Денмарк�хавн</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>Банжул</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>Конакрі</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>�ваделупа</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>Малабо</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>�фіни</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>Південна Джорджі�</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Гватемала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>Гуам</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>Бі�ау</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>�айана</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Гонконг</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>Тегу�ігальпа</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>Загреб</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>Порт-о-Прен�</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>Будапешт</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>Джакарта</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>Понтіанак</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>Мака�ар</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>Джайпур</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>Дублін</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>Єру�алим</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>О�трів Мен</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>Калькутта</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>Чаго�</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>Багдад</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>Тегеран</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>Рейк'�вік</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>Рим</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>Джер�і</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Ямайка</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>�мман</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>Токіо</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>�айробі</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>Бішкек</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>Пномпень</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>Ендербері</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>Кірітіматі</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>Тарава</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>Комори</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Сент-Кіт� і �еві�</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>Пхень�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>Сеул</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Кувейт</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>Кайманові о�трови</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>�ктау</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>Орал</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>�ктобе</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>Кзил-Орда</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>�лмати</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>В’єнть�н</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>Бейрут</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Сент-Лу�і�</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>Вадуц</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>Коломбо</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>Монрові�</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>Ма�еру</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>Вільню�</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Люк�ембург</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>Рига</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>Тріполі</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>Ка�абланка</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Монако</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>Кишинів</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>Подгориц�</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>�нтананаріву</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>Кваджалейн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>Маджуро</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>Скоп'є</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>Бамако</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>Рангун</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>Говд</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>Улан-Батор</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>Чойбал�ан</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>Макао</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>Сайпан</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>Мартініка</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>�уакшот</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>Мон�ерат</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Мальта</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Маврикій</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Мальдіви</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>Блантир</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>Тіхуана</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>Ермо�ільйо</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>Ма�атлан</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>Чіуауа</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>Монтерей</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>Мехіко</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>Меріда</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>Канкун</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>Куала-Лумпур</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>Кучінґ</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>Мапуту</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>Віндхук</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>�умеа</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>�іамей</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>�орфолк</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>Лаго�</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>Манагуа</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�м�тердам</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>О�ло</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>Катманду</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>�ауру</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�іуе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>Чатем</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>Окленд</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>Ма�кат</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Панама</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>Ліма</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>Таїті</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>Маркизькі о-ви</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>Гамбер</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>Порт-Мор�бі</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>Маніла</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>Карачі</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>Варшава</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>Мікелон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>Піткерн</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>Пуерто Ріко</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>Газа</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>�зор�ькі о�трови</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>Мадейра</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>Лі�абон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Палау</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>��ун�ьйон</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Катар</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>Реюньйон</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>Бухаре�т</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>Белград</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>Калінінград</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>Мо�ква</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>Волгоград</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>Самара</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>Єкатеринбург</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>Ом�ьк</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>�ово�ибір�ьк</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>Кра�но�р�ьк</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>Іркут�ьк</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>Якут�ьк</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>Владиво�ток</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>Сахалін</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>Магадан</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>Камчатка</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>�надир</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>Кігалі</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>Ер-Рі�д</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>Гвадалканал</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>Махе</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>Хартум</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>Стокгольм</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Сингапур</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>О�трів Св�тої Єлени</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>Любл�на</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>Лонгербюйн</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>Брати�лава</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>Фрітаун</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>Сан-Маріно</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>Дакар</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>Могадішо</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>Парамарібо</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>Сан-Томе і Прин�іпі</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>Сальвадор</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>Дама�к</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>Мбабане</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>Гранд-Терк</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�джамена</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>О�трів Кергелен</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>Ломе</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>Бангкок</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>Душанбе</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>Факаофо</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>Ділі</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>�шгабат</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>Туні�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>Тонгатапу</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>Стамбул</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>Порт-оф-Спейн</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>Фунафуті</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Тайпей</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>Дар-е�-Салаам</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>Ужгород</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>Київ</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>Сімферополь</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>Запоріжж�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>Кампала</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>Мідуей</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>Джон�тон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>Вейк</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>�дак</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>�ом</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>Гонолулу</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>�нкоридж</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>Якутат</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>Джуно</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>Ло�-�нджеле�</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>Бой�е</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>Фінік�</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>Шипрок</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>Денвер</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�ью-Салем</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>Центр</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>Чикаго</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>Меноміні</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>Він�ен�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>Петербург</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>Телл-�іті</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>�ок�</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>Вінамак</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>Маренго</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>Індіанаполі�</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>Луї�вілль</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>Вівей</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>Монтичелло</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>Детройт</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�ью-Йорк</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>Монтевідео</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>Самарканд</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>Ташкент</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>Ватикан</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Сент-Він�ент</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>Карака�</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>Тортола</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>Сент-Тома�</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Сайгон</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>Ефате</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>Уоллі�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>�піа</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>�ден</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>Майорка</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>Йоганне�бург</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>Лу�ака</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>Хараре</exemplarCity>
-			</zone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>за центральноафрикан�ьким ча�ом</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>за �хідноафрикан�ьким ча�ом</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>за південноафрикан�ьким ча�ом</generic>
-					<standard>за південноафрикан�ьким �тандартним ча�ом</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>за західноафрикан�ьким ча�ом</standard>
-					<daylight>за західноафрикан�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>за північноамерикан�ьким центральним ча�ом</generic>
-					<standard>за північноамерикан�ьким центральним �тандартним ча�ом</standard>
-					<daylight>за північноамерикан�ьким центральним літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>за північноамерикан�ьким �хідним ча�ом</generic>
-					<standard>за північноамерикан�ьким �хідним �тандартним ча�ом</standard>
-					<daylight>за північноамерикан�ьким �хідним літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>за північноамерикан�ьким гірним ча�ом</generic>
-					<standard>за північноамерикан�ьким гірним �тандартним ча�ом</standard>
-					<daylight>за північноамерикан�ьким гірним літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>за північноамерикан�ьким тихоокеан�ьким ча�ом</generic>
-					<standard>за північноамерикан�ьким тихоокеан�ьким �тандартним ча�ом</standard>
-					<daylight>за північноамерикан�ьким тихоокеан�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>за вірмен�ьким ча�ом</standard>
-					<daylight>за вірмен�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>за атлантичним ча�ом</generic>
-					<standard>за атлантичним �тандартним ча�ом</standard>
-					<daylight>за атлантичним літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>за центральноєвропей�ьким ча�ом</standard>
-					<daylight>за центральноєвропей�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>за �хідноєвропей�ьким ча�ом</standard>
-					<daylight>за �хідноєвропей�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>за західноєвропей�ьким ча�ом</standard>
-					<daylight>за західноєвропей�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>за Грінвічем</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>за іран�ьким �тандартним ча�ом</standard>
-					<daylight>за іран�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>за іркут�ьким ча�ом</standard>
-					<daylight>за іркут�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>за ізраїль�ьким ча�ом</generic>
-				</long>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>за �пон�ьким ча�ом</generic>
-					<daylight>за �пон�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kamchatka">
-				<long>
-					<standard>за камчат�ьким ча�ом</standard>
-					<daylight>за камчат�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<long>
-					<standard>за кра�но�р�ьким ча�ом</standard>
-					<daylight>за кра�но�р�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>за куйбишев�ьким ча�ом</standard>
-					<daylight>за куйбишев�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>за магадан�ьким ча�ом</standard>
-					<daylight>за магадан�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>за мо�ков�ьким ча�ом</generic>
-					<standard>за мо�ков�ьким �тандартним ча�ом</standard>
-					<daylight>за мо�ков�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>за ново�ибір�ьким ча�ом</standard>
-					<daylight>за ново�ибір�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>за ом�ьким ча�ом</standard>
-					<daylight>за ом�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>за �амар�ьким ча�ом</standard>
-					<daylight>за �амар�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>за турецьким ча�ом</standard>
-					<daylight>за турецьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>за владиво�тоцьким ча�ом</standard>
-					<daylight>за владиво�тоцьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Volgograd">
-				<long>
-					<standard>за волгоград�ьким ча�ом</standard>
-					<daylight>за волгоград�ьким літнім ча�ом</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>за �кут�ьким ча�ом</standard>
-					<daylight>за �кут�ьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>за єкатеринбурзьким ча�ом</standard>
-					<daylight>за єкатеринбурзьким літнім ча�ом</daylight>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="few">{0} {1}</unitPattern>
-			<unitPattern count="many">{0} {1}</unitPattern>
-			<unitPattern count="one">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>�ндорр�ька пе�ета</displayName>
-				<displayName count="few">�ндорр�ькі пе�ети</displayName>
-				<displayName count="many">�ндорр�ьких пе�ет</displayName>
-				<displayName count="other">�ндорр�ьких пе�ет</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>Дирхем О�Е</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>�фгані (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>�фгані</displayName>
-				<displayName count="other">�фгані</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>�лбан�ький лек</displayName>
-				<displayName count="few">�лбан�ькі леки</displayName>
-				<displayName count="many">�лбан�ьких леків</displayName>
-				<displayName count="other">албан�ьких леків</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>Вірмен�ький драм</displayName>
-				<displayName count="few">вірмен�ькі драми</displayName>
-				<displayName count="many">Вірмен�ьких драмів</displayName>
-				<displayName count="other">Вірмен�ьких драмів</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>Гульден �ідерланд�ьких �нтіл</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>�нголь�ька кванза</displayName>
-				<displayName count="few">анголь�ькі кванзи</displayName>
-				<displayName count="many">анголь�ьких кванз</displayName>
-				<displayName count="other">анголь�ької кванзи</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>�нголь�ька кванза (1977-1990)</displayName>
-				<displayName count="few">�нголь�ькі кванзи (1977-1990)</displayName>
-				<displayName count="many">�нголь�ьких кванз (1977-1990)</displayName>
-				<displayName count="other">�нголь�ької кванзи (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>�нголь�ька нова кванза (1990-2000)</displayName>
-				<displayName count="few">�нголь�ькі нові кванзи (1990-2000)</displayName>
-				<displayName count="many">анголь�ьких нових кванз (1990-2000)</displayName>
-				<displayName count="other">�нголь�ької нової кванзи (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>�нголь�ька кванза реаджа�тадо (1995-1999)</displayName>
-				<displayName count="few">анголь�ькі кванзи реаджа�тадо (1995-1999)</displayName>
-				<displayName count="many">анголь�ьких кванз реаджа�тадо (1995-1999)</displayName>
-				<displayName count="one">анголь�ька кванза реаджа�тадо (1995-1999)</displayName>
-				<displayName count="other">анголь�ької кванзи реаджа�тадо (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>�ргентин�ький ав�трал</displayName>
-				<displayName count="few">�ргентин�ькі ав�трали</displayName>
-				<displayName count="many">�ргентин�ьких ав�тралів</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>�ргентин�ький пе�о (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>�ргентин�ький пе�о</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>�в�трій�ький шилінг</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>�в�тралій�ький долар</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>�руб�ький гульден</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>�зербайджан�ький манат (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>�зербайджан�ький манат</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>Динар (Бо�ні� і Герцеговина)</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>Конвертована марка Бо�нії і Герцоговини</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>Барбадо�ький долар</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>Бангладе�ька така</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>Бельгій�ький франк (конвертований)</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>Бельгій�ький франк</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>Бельгій�ький¹ франк (фінан�овий)</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>Болгар�ький твердий лев</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Болгар�ький новий лев</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>Бахрейн�ький динар</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>Бурундій�ький франк</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>Бермуд�ький долар</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>Бруней�ький долар</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>Болівіано</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>Болівій�ьке пе�о</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>Болівій�ький мвдол</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>Бразиль�ьке нове крузейро (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>Бразиль�ьке крузадо</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>Бразиль�ьке крузейро (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>Бразиль�ький реал</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>Бразиль�ьке нове крузадо</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>Бразиль�ьке крузейро</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>Багам�ький долар</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>Бутан�ький нгултрум</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>Бірман�ький кіат</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>Бот�ван�ька пула</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>Білору�ький новий рубль (1994-1999)</displayName>
-				<displayName count="few">білору�ькі нові рублі (1994-1999)</displayName>
-				<displayName count="many">білору�ьких нових рублів (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>Білору�ький рубль</displayName>
-				<displayName count="few">білору�ькі рублі</displayName>
-				<displayName count="many">білору�ьких рублів</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>Белізький долар</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>Канад�ький долар</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>Конголезький франк</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>Євро WIR</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Швейцар�ький франк</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>Франк WIR</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>Чилій�ький юнідаде� де фоменто</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>Чілій�ький пе�о</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Китай�ький юань</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>Колумбій�ький пе�о</displayName>
-			</currency>
-			<currency type="COU">
-				<displayName>Одиниц� реальної варто�ті</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>Ко�тарикан�ький колон</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>Старий �ерб�ький динар</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>Чехо�ловацька тверда крона</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>Кубин�ький пе�о</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>Е�кудо Кабо-Верде</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>Кіпр�ький фунт</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>Че�ька крона</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>Марка �ДР</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>�імецька марка</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>Джибутій�ький франк</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>Дат�ька крона</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>Домінікан�ький пе�о</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>�лжир�ький динар</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>Еквадор�ький �укре</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>Еквадор�ький юнідад де валор кон�танте</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Е�тон�ька крона</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>Єгипет�ький фунт</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>Еритрей�ька накфа</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>І�пан�ька пе�ета (&quot;�&quot; рахунок)</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>І�пан�ька пе�ета (конвертовані рахунки)</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>І�пан�ька пе�ета</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>Ефіоп�ький бір</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Євро</displayName>
-				<displayName count="few">євро</displayName>
-				<displayName count="many">євро</displayName>
-				<displayName count="one">євро</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>Фінл�нд�ька марка</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>Долар Фіджі</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>Фолкленд�ький фунт</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Французький франк</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>�нглій�ький фунт �терлінгів</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>Грузин�ький купон</displayName>
-				<displayName count="few">грузин�ькі купони</displayName>
-				<displayName count="many">грузин�ьких купонів</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Грузин�ький ларі</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Ган�ький �еді (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Ган�ький �еді</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Гібралтар�ький фунт</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>Гамбій�ька дала�і</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Гвійней�ький франк</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Гвіней�ьке �ілі</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>Еквеле (Екваторіальна �віне�)</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Грецька драхма</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Гватемаль�ький кет�аль</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>Е�кудо Португаль�ької Гвінеї</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Пе�о Гвінеї-Бі�ау</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>Гай�н�ький долар</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>Гонконгів�ький долар</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Гондура�ька лемпіра</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>Хорват�ький динар</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>Хорват�ька куна</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Гаїт�н�ький гурд</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Угор�ький форинт</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Індонезій�ька рупі�</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Ірланд�ький фунт</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Ізраїль�ький фунт</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Ізраїль�ький новий шекель</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Індій�ька рупі�</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Ірак�ький динар</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Іран�ький ріал</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>І�ланд�ька крона</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Італій�ька ліра</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>Ямай�ький долар</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Йордан�ький динар</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Япон�ька єна</displayName>
-				<symbol>Â¥</symbol>
-			</currency>
-			<currency type="KES">
-				<displayName>Кеній�ький шилінг</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>Киргизький �ом</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>Камбоджій�ький рієль</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>Комор�ький франк</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>Вона Північної Кореї</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Вона Південної Кореї</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>Кувейт�ький динар</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>Долар Кайманових о�тровів</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Казах�тан�ький тенге</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>Лао�ький кіп</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>Ліван�ький фунт</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>Шрі-ланкій�ька рупі�</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>Ліберій�ький долар</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>Ле�от�ький лоті</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Литов�ький літ</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>Литов�ький талон</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>Люк�ембурґ�ький франк (Конвертований)</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>Люк�ембурзький франк</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>Люк�ембурґ�ький франк (Фінан�овий)</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>Латвій�ький лат</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>Латвій�ький рубль</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>Лівій�ький динар</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>Мароккан�ький дирхем</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>Мароккан�ький франк</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>Молдов�ький лей</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>Мадага�кар�ький аріарі</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>Мадага�кар�ький франк</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>Македон�ький динар</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>Малій�ький франк</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>Кʼ�т Мʼ�нми</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>Монголь�ький тугрик</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>Макао патака</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>Мавритан�ька угі�</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Мальтій�ька ліра</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>Мальтій�ький фунт</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>Маврикій�ька рупі�</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>Мальдів�ька руфі�</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>Квача (Малаві)</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Мек�икан�ьке пе�о</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>Мек�икан�ьке �рібне пе�о (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>Мек�икан�ький юнідад де інвер�іон</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Малайзій�ький рингіт</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>Мозамбіцький е�кудо</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>Старий мозамбіцький метикал</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>Мозамбіцький метикал</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>�амібій�ький долар</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>�ігерій�ька найра</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>�ікарагуан�ька кордоба</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>�ікарагуан�ька кордоба оро</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>�ідерланд�ький гульден</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>�орвезька крона</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>�епаль�ька рупі�</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�овозеланд�ький долар</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>Оман�ький ріал</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>Панам�ька бальбоа</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>Перуан�ький інті</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Перуан�ький новий �ол</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>Перуан�ький �ол</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>Кіна Папуа �ової Гвінеї</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Філіппін�ьке пе�о</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Паки�тан�ька рупі�</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Поль�ький злотий</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>Поль�ький злотий (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>Португаль�ький е�кудо</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>Парагвай�ький гуарані</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>Катар�ький ріал</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>Родезій�ький долар</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>Старий румун�ький лей</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Румун�ький лей</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>Серб�ький динар</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ро�ій�ький рубль</displayName>
-				<displayName count="few">ро�ій�ькі рублі</displayName>
-				<displayName count="many">ро�ій�ьких рублів</displayName>
-				<displayName count="one">Ро�ій�ький рубль</displayName>
-				<symbol>руб.</symbol>
-			</currency>
-			<currency type="RUR">
-				<displayName>Ро�ій�ький рубль (1991-1998)</displayName>
-				<displayName count="few">ро�ій�ькі рублі (RUR)</displayName>
-				<displayName count="many">ро�ій�ьких рублів (RUR)</displayName>
-				<displayName count="one">ро�ій�ький рубль (RUR)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>Руандій�ький франк</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Саудів�ький ріал</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>Долар Соломонових О�тровів</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>Сейшель�ька рупі�</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>Судан�ький динар</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>Судан�ький фунт</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>Старий �удан�ький фунт</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Швед�ька крона</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>Сінгапур�ький долар</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>Фунт Св�тої Єлени</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Словен�ький толар</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Словацька крона</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>Леоне Сьєрра-Леоне</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>Сомалій�ький шилінг</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>Суринам�ький долар</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>Суринам�ький гульден</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>Добра Сан-Томе і Прін�іпі</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>Рад�н�ький рубль</displayName>
-				<displayName count="few">рад�н�ькі рублі</displayName>
-				<displayName count="many">рад�н�ьких рублів</displayName>
-				<displayName count="one">рад�н�ький рубль</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>Сальвадор�ький колон</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>Сирій�ький фунт</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>Свазіленд�ькі лілангені</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Таїланд�ький бат</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>Таджицький рубль</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>Таджицький �омоні</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>Туркмен�ький манат</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>Туні�ький динар</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>Паанга Тонго</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>Тімор�ький е�кудо</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Стара турецька ліра</displayName>
-				<displayName count="few">�тарі турецькі ліри</displayName>
-				<displayName count="many">�тарих турецьких лір</displayName>
-				<displayName count="one">�тара турецька ліра</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Турецька ліра</displayName>
-				<displayName count="few">турецькі ліри</displayName>
-				<displayName count="many">турецьких лір</displayName>
-				<displayName count="one">турецька ліра</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>Долар Тринідаду і Тобаго</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>�овий тайван�ький долар</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>Танзаній�ький шилінг</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Україн�ька гривн�</displayName>
-				<displayName count="few">гривні</displayName>
-				<displayName count="many">гривень</displayName>
-				<displayName count="one">гривн�</displayName>
-				<displayName count="other">гривні</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>Україн�ький карбованець</displayName>
-				<displayName count="few">україн�ькі карбованці</displayName>
-				<displayName count="many">україн�ьких карбованців</displayName>
-				<displayName count="one">україн�ький карбованець</displayName>
-				<displayName count="other">україн�ького карбованц�</displayName>
-				<symbol>крб.</symbol>
-			</currency>
-			<currency type="UGS">
-				<displayName>Угандій�ький шилінг (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>Угандій�ький шилінг</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>Долар СШ�</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>Долар СШ� (на�тупного дн�)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>Долар СШ� (цього дн�)</displayName>
-			</currency>
-			<currency type="UYI">
-				<displayName>Уругвай�ький пе�о в індек�ованих одиниц�х</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>Уругвай�ьке пе�о (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>Уругвай�ьке пе�о</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Узбецький �ум</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Вене�уель�ький болівар</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>Вене�уель�ький болівар фуерте</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>Вʼєтнам�ький донг</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>Вануат�ька вату</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>Тала Західного Самоа</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>Франк Центральноафрикан�ького фінан�ового товари�тва</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>Срібло</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Золото</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>Європей�ька �кладена валютна одиниц�</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>Одиниц� Європей�ького валютного фонду</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>Європей�ька розрахункова одиниц� XBC</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>Європей�ька розрахункова одиниц� XBD</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>Східнокариб�ький долар</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>Спеціальні права запозиченн�</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>Європей�ька валютна одиниц�</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>Французький золотий франк</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>Французький франк UIC</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>Франк Західноафрикан�ького фінан�ового товари�тва</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>Паладій</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>Французький тихоокеан�ький франк</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>Платина</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>Фонди RINET</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>Код те�туванн� валюти</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>�евідома грошова одиниц�</displayName>
-				<displayName count="few">невідомі грошові одиниці</displayName>
-				<displayName count="many">невідомих грошових одиниць</displayName>
-				<displayName count="one">невідома грошова одиниц�</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>Ємен�ький динар</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>Ємен�ький ріал</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>Юго�лав�ький твердий динар</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>Юго�лав�ький новий динар</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>Юго�лав�ький конвертований динар</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>Південноафрикан�ький фінан�овий ранд</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Південноафрикан�ький ранд</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>Квача (Замбі�)</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>Заїр�ький новий заїр</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>Заїр�ький заїр</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>Зімбабвій�ький долар</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="few">{0} дні</unitPattern>
-			<unitPattern count="many">{0} днів</unitPattern>
-			<unitPattern count="one">{0} день</unitPattern>
-			<unitPattern count="other">{0} дн�</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="few">{0} години</unitPattern>
-			<unitPattern count="many">{0} годин</unitPattern>
-			<unitPattern count="one">{0} година</unitPattern>
-			<unitPattern count="other">{0} години</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="few">{0} хвилини</unitPattern>
-			<unitPattern count="many">{0} хвилин</unitPattern>
-			<unitPattern count="one">{0} хвилина</unitPattern>
-			<unitPattern count="other">{0} хвилини</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="few">{0} мі��ці</unitPattern>
-			<unitPattern count="many">{0} мі��ців</unitPattern>
-			<unitPattern count="one">{0} мі��ць</unitPattern>
-			<unitPattern count="other">{0} мі��ц�</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="few">{0} �екунди</unitPattern>
-			<unitPattern count="many">{0} �екунд</unitPattern>
-			<unitPattern count="one">{0} �екунда</unitPattern>
-			<unitPattern count="other">{0} �екунди</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="few">{0} тижні</unitPattern>
-			<unitPattern count="many">{0} тижнів</unitPattern>
-			<unitPattern count="one">{0} тиждень</unitPattern>
-			<unitPattern count="other">{0} тижн�</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="few">{0} роки</unitPattern>
-			<unitPattern count="many">{0} років</unitPattern>
-			<unitPattern count="one">{0} рік</unitPattern>
-			<unitPattern count="other">{0} року</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>так:т</yesstr>
-			<nostr>ні:н</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/uk_UA.xml b/airtime_mvc/library/Zend/Locale/Data/uk_UA.xml
deleted file mode 100644
index aa9d2686f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uk_UA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uk"/>
-		<territory type="UA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ur.xml b/airtime_mvc/library/Zend/Locale/Data/ur.xml
deleted file mode 100644
index 73d13fd50..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ur.xml
+++ /dev/null
@@ -1,1020 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.66 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="ur"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">اي�ريکانز</language>
-			<language type="am">ام�اری</language>
-			<language type="ar">عربی</language>
-			<language type="as">آسامی</language>
-			<language type="az">آزربائیجانی</language>
-			<language type="be">بيلاروسی</language>
-			<language type="bg">بلغاری</language>
-			<language type="bh">ب��اری</language>
-			<language type="bn">بنگالی</language>
-			<language type="br">بر�یٹن</language>
-			<language type="bs">بوسنی</language>
-			<language type="ca">کاٹالانين</language>
-			<language type="cs">Ú†ÙŠÚ©</language>
-			<language type="cy">ويلش</language>
-			<language type="da">ڈينش</language>
-			<language type="de">جرمن</language>
-			<language type="el">يونانی</language>
-			<language type="en">انگريزی</language>
-			<language type="en_GB">برطانوی انگریزی</language>
-			<language type="en_US">امریک� کی انگریزی</language>
-			<language type="eo">ايسپرانٹو</language>
-			<language type="es">�سپانوی</language>
-			<language type="et">اسٹونين</language>
-			<language type="eu">باسکی</language>
-			<language type="fa">�ارسی</language>
-			<language type="fi">�نّن�ش</language>
-			<language type="fil">ٹيگالاگی</language>
-			<language type="fo">�یروئیز</language>
-			<language type="fr">�رانسيسی</language>
-			<language type="fy">�ريژين</language>
-			<language type="ga">آئير�ش</language>
-			<language type="gd">سکاٹ گيل�ک</language>
-			<language type="gl">گاليشيائی</language>
-			<language type="gn">گ�ارانی</language>
-			<language type="gu">گجراتی</language>
-			<language type="he">عبرانی</language>
-			<language type="hi">�ندی</language>
-			<language type="hr">کراتی</language>
-			<language type="hu">�نگیرین</language>
-			<language type="hy">ارمینی</language>
-			<language type="ia">انٹرلنگوی</language>
-			<language type="id">انڈونيثيائی</language>
-			<language type="is">بر�ستانی</language>
-			<language type="it">اطالوی</language>
-			<language type="ja">جاپانی</language>
-			<language type="jv">جاوی</language>
-			<language type="ka">جارجی</language>
-			<language type="km">کمبوڈیَن</language>
-			<language type="kn">کنّاڈا</language>
-			<language type="ko">کورين</language>
-			<language type="ku">كردش</language>
-			<language type="ky">کرغیزی</language>
-			<language type="la">لاطينی</language>
-			<language type="ln">ل�نگَلا</language>
-			<language type="lo">لاؤش�یَن</language>
-			<language type="lt">لتھ�واینین</language>
-			<language type="lv">ليٹوين</language>
-			<language type="mk">مقدونيائی</language>
-			<language type="ml">مالايالم</language>
-			<language type="mn">منگؤلی</language>
-			<language type="mr">مراٹهی</language>
-			<language type="ms">مالائی</language>
-			<language type="mt">مالٹی</language>
-			<language type="ne">نيپالی</language>
-			<language type="nl">ÚˆÚ†</language>
-			<language type="nn">نورویجینی (نینورسک)</language>
-			<language type="no">نارويجين</language>
-			<language type="oc">آکيٹانی</language>
-			<language type="or">اور�یا</language>
-			<language type="pa">پنجابی</language>
-			<language type="pl">پولستانی</language>
-			<language type="ps">پشتو</language>
-			<language type="pt">پ�رتگالی</language>
-			<language type="pt_BR">پرتگالی (ﺑﺮ�ﺯﻳﻞ)</language>
-			<language type="pt_PT">پرتگالی (پرتگال)</language>
-			<language type="ro">رومنی</language>
-			<language type="ru">روسی</language>
-			<language type="sa">سَنسکر�ت</language>
-			<language type="sd">سندھی</language>
-			<language type="sh">سربو-کروئیشین</language>
-			<language type="si">سن�الی</language>
-			<language type="sk">سلاواکی</language>
-			<language type="sl">سلوينی</language>
-			<language type="so">سومالی</language>
-			<language type="sq">البانی</language>
-			<language type="sr">صربی</language>
-			<language type="st">سیسوتھو</language>
-			<language type="su">س�وڈانی</language>
-			<language type="sv">سويڈش</language>
-			<language type="sw">سوا�یلی</language>
-			<language type="ta">تام�ل</language>
-			<language type="te">تيلوگو</language>
-			<language type="th">تهائی</language>
-			<language type="ti">تگرینی</language>
-			<language type="tk">ترکمانی</language>
-			<language type="tl">ٹیگا لوگ</language>
-			<language type="tlh">کلنگان</language>
-			<language type="tr">ترکی</language>
-			<language type="tw">توی</language>
-			<language type="ug">ا�ئ�یگ�ور</language>
-			<language type="uk">ي�وکرينی</language>
-			<language type="ur">اردو</language>
-			<language type="uz">ازبک</language>
-			<language type="vi">ويتنامی</language>
-			<language type="xh">خوس�</language>
-			<language type="yi">يادش</language>
-			<language type="zh_Hans">چینی (آسان کرد�)</language>
-			<language type="zh_Hant">چینی (روایتی)</language>
-			<language type="zu">ز�ول�و</language>
-		</languages>
-		<scripts>
-			<script type="Arab">العربية</script>
-			<script type="Zxxx">Zxxx</script>
-			<script type="Zzzz">Zzzz</script>
-		</scripts>
-		<territories>
-			<territory type="AE">متحد� عرب امارات</territory>
-			<territory type="AF">ا�غانستان</territory>
-			<territory type="AG">انٹیگوا اور باربودا</territory>
-			<territory type="AL">البانیا</territory>
-			<territory type="AM">آر مینیا</territory>
-			<territory type="AN">نیدرلینڈز انٹیلیز</territory>
-			<territory type="AO">انگولا</territory>
-			<territory type="AQ">انٹار ٹکا</territory>
-			<territory type="AR">ارجنٹینا</territory>
-			<territory type="AS">امریکی ساموا</territory>
-			<territory type="AT">آسٹریا</territory>
-			<territory type="AU">آسٹریلیا</territory>
-			<territory type="AZ">آذر بائجان</territory>
-			<territory type="BA">بوسنیا �رزگوینا</territory>
-			<territory type="BD">بنگلا دیش</territory>
-			<territory type="BE">بیلجئیم</territory>
-			<territory type="BF">برکینا �اسو</territory>
-			<territory type="BG">بلغاری�</territory>
-			<territory type="BI">برنڈی</territory>
-			<territory type="BJ">بینن</territory>
-			<territory type="BO">بولیویا</territory>
-			<territory type="BR">برازیل</territory>
-			<territory type="BS">باھا ماس</territory>
-			<territory type="BT">بھوٹان</territory>
-			<territory type="BV">جزیر� بووٹ</territory>
-			<territory type="BW">بوٹسوانا</territory>
-			<territory type="BY">بیلا رس</territory>
-			<territory type="CA">کینیڈا</territory>
-			<territory type="CC">جزائر کوکوز</territory>
-			<territory type="CD">کانگو، جم�وری ریاست</territory>
-			<territory type="CF">جم�وری� وسطی ا�ریق�</territory>
-			<territory type="CG">کانگو</territory>
-			<territory type="CH">سوئزر لینڈ</territory>
-			<territory type="CK">جزائر ک�ک</territory>
-			<territory type="CL">چلی</territory>
-			<territory type="CM">کیمرون</territory>
-			<territory type="CN">چین</territory>
-			<territory type="CO">کولمبیا</territory>
-			<territory type="CS">سربیا اور مانٹینیگرو</territory>
-			<territory type="CU">کیوبا</territory>
-			<territory type="CX">جزیر� کرسمس</territory>
-			<territory type="CY">قبرص</territory>
-			<territory type="CZ">جم�وری� چیک</territory>
-			<territory type="DE">جرمنی</territory>
-			<territory type="DK">ڈنمارک</territory>
-			<territory type="DO">ڈومینیکن ریپبلک</territory>
-			<territory type="DZ">الجیریا</territory>
-			<territory type="EC">ایکواڈور</territory>
-			<territory type="EE">ایسٹونیا</territory>
-			<territory type="EG">مصر</territory>
-			<territory type="EH">مغربی صحارا</territory>
-			<territory type="ER">اریٹیریا</territory>
-			<territory type="ES">سپین</territory>
-			<territory type="ET">ایتھوپیا</territory>
-			<territory type="FI">�ن لینڈ</territory>
-			<territory type="FK">جزائر �اک لینڈ</territory>
-			<territory type="FM">مائکرونیزیا</territory>
-			<territory type="FO">جزائر�ارو</territory>
-			<territory type="FR">�رانس</territory>
-			<territory type="GA">غیبون</territory>
-			<territory type="GB">برطانی�</territory>
-			<territory type="GE">جارجیا</territory>
-			<territory type="GF">�رانسیسی گی آنا</territory>
-			<territory type="GG">گرنزی</territory>
-			<territory type="GH">گھانا</territory>
-			<territory type="GL">گرین لینڈ</territory>
-			<territory type="GM">گیمبیا</territory>
-			<territory type="GN">گنی</territory>
-			<territory type="GQ">استوائی گنی</territory>
-			<territory type="GR">یونان</territory>
-			<territory type="GS">جنوبی جارجیا اور جزائر جنوبی سینڈوچ</territory>
-			<territory type="GW">گنی بسائو</territory>
-			<territory type="HM">جزیر� �رڈ اور جزائر مکڈونلڈ</territory>
-			<territory type="HN">�ونڈوراس</territory>
-			<territory type="HR">کروشیا</territory>
-			<territory type="HT">�ائٹی</territory>
-			<territory type="HU">�نگری</territory>
-			<territory type="ID">انڈونیشیا</territory>
-			<territory type="IE">آئر لینڈ</territory>
-			<territory type="IL">اسرائیل</territory>
-			<territory type="IN">بھارت</territory>
-			<territory type="IO">بحرھند کا برٹش علاق�</territory>
-			<territory type="IQ">عراق</territory>
-			<territory type="IR">ایران</territory>
-			<territory type="IS">آئس لینڈ</territory>
-			<territory type="IT">اٹلی</territory>
-			<territory type="JE">جرسی</territory>
-			<territory type="JO">اردن</territory>
-			<territory type="JP">جاپان</territory>
-			<territory type="KE">کینیا</territory>
-			<territory type="KG">کرغستان</territory>
-			<territory type="KH">کمبوڈیا</territory>
-			<territory type="KI">ک�رباتی</territory>
-			<territory type="KM">کوموروس</territory>
-			<territory type="KN">سینٹ کٹس اور نیوس</territory>
-			<territory type="KP">شمالی کوریا</territory>
-			<territory type="KR">جنوبی کوریا</territory>
-			<territory type="KY">جزائر کیمن</territory>
-			<territory type="KZ">قزاقستان</territory>
-			<territory type="LA">لاؤس</territory>
-			<territory type="LB">لبنان</territory>
-			<territory type="LC">سینٹ لوسیا</territory>
-			<territory type="LI">لکٹنسٹائن</territory>
-			<territory type="LK">سری لنکا</territory>
-			<territory type="LR">لائبیریا</territory>
-			<territory type="LS">لیسوتھو</territory>
-			<territory type="LT">لتھوانیا</territory>
-			<territory type="LV">لٹو�یا</territory>
-			<territory type="LY">لیبیا</territory>
-			<territory type="MA">مراکش</territory>
-			<territory type="MD">مالدووا</territory>
-			<territory type="MG">مڈغاسکر</territory>
-			<territory type="MH">جزائر مارشل</territory>
-			<territory type="MK">مقدونی�</territory>
-			<territory type="ML">مالی</territory>
-			<territory type="MM">میانمر</territory>
-			<territory type="MN">منگولیا</territory>
-			<territory type="MO">ماکاؤ</territory>
-			<territory type="MP">شمالی ماریاناجزائر</territory>
-			<territory type="MR">موریطانی�</territory>
-			<territory type="MW">ملاوی</territory>
-			<territory type="MX">میکسیکو</territory>
-			<territory type="MY">ملائیشیا</territory>
-			<territory type="MZ">موزنبیق</territory>
-			<territory type="NA">نمیبیا</territory>
-			<territory type="NC">نیو کیلیڈونیا</territory>
-			<territory type="NE">نائیجر</territory>
-			<territory type="NF">جزیر� نار�ولک</territory>
-			<territory type="NG">نائیجیریا</territory>
-			<territory type="NI">نکاراگوا</territory>
-			<territory type="NL">نیدرلینڈ</territory>
-			<territory type="NO">ناروے</territory>
-			<territory type="NP">نیپال</territory>
-			<territory type="NZ">نیوزی لینڈ</territory>
-			<territory type="OM">عمان</territory>
-			<territory type="PE">پیرو</territory>
-			<territory type="PF">�رانسیسی پولینیسیا</territory>
-			<territory type="PG">پاپوا نیو گنی</territory>
-			<territory type="PH">�لپائن</territory>
-			<territory type="PK">پاکستان</territory>
-			<territory type="PL">پولینڈ</territory>
-			<territory type="PM">سینٹ پائرے اور میکویلون</territory>
-			<territory type="PS">�لسطین</territory>
-			<territory type="PT">پرتگال</territory>
-			<territory type="PY">پیراگوئے</territory>
-			<territory type="RO">رومانی�</territory>
-			<territory type="RU">روس</territory>
-			<territory type="RW">روانڈا</territory>
-			<territory type="SA">سعودی عرب</territory>
-			<territory type="SB">جزائرسولمون</territory>
-			<territory type="SC">سے شلز</territory>
-			<territory type="SD">سوڈان</territory>
-			<territory type="SE">سویڈن</territory>
-			<territory type="SH">سینٹ ھیلینا</territory>
-			<territory type="SI">سلوانی�</territory>
-			<territory type="SK">سلوواکی�</territory>
-			<territory type="SL">سیرالیون</territory>
-			<territory type="SM">سان میرینو</territory>
-			<territory type="SN">سینیگال</territory>
-			<territory type="SO">صوپالی�</territory>
-			<territory type="SR">سورینام</territory>
-			<territory type="SY">سیریا</territory>
-			<territory type="SZ">سوازی لینڈ</territory>
-			<territory type="TC">جزائر کیکس اور ترکیّ�</territory>
-			<territory type="TD">چاڈ</territory>
-			<territory type="TF">جنوبی �رانسیسی علاق� جات</territory>
-			<territory type="TG">ٹوگو</territory>
-			<territory type="TH">تھائی لینڈ</territory>
-			<territory type="TJ">تاجکستان</territory>
-			<territory type="TK">ٹوکیلاؤ</territory>
-			<territory type="TL">مشرقی تیمور</territory>
-			<territory type="TM">ترکمانستان</territory>
-			<territory type="TN">تیونس</territory>
-			<territory type="TO">تونگا</territory>
-			<territory type="TR">ترکی</territory>
-			<territory type="TT">ٹرینیڈاڈ اور ٹوباگو</territory>
-			<territory type="TV">ٹوالو</territory>
-			<territory type="TW">تائیوان</territory>
-			<territory type="TZ">تنزانی�</territory>
-			<territory type="UA">یوکرائن</territory>
-			<territory type="UG">یوگنڈا</territory>
-			<territory type="UM">ریاست �ائے متحد� اور بیرونی جزائر</territory>
-			<territory type="US">ریاست �ائے متحد� امریکا</territory>
-			<territory type="UY">�وراگوئے</territory>
-			<territory type="UZ">ازبکستان</territory>
-			<territory type="VA">ویٹیکن سٹی</territory>
-			<territory type="VC">سینٹ کیرن اور گریناڈائنز</territory>
-			<territory type="VE">وینزولا</territory>
-			<territory type="VG">جزائر ورجن، برٹش</territory>
-			<territory type="VI">جزائر ورجن، امریک�</territory>
-			<territory type="VN">ویت نام</territory>
-			<territory type="VU">وانواٹو</territory>
-			<territory type="WF">والس اور �تون�</territory>
-			<territory type="WS">ساموا</territory>
-			<territory type="YE">یمن</territory>
-			<territory type="ZA">جنوبی ا�ریق�</territory>
-			<territory type="ZM">زیمبیا</territory>
-			<territory type="ZW">زمبابوے</territory>
-			<territory type="ZZ">Unknown or Invalid Region</territory>
-		</territories>
-		<keys>
-			<key type="calendar">کیلنڈر</key>
-			<key type="collation">موازن�</key>
-			<key type="currency">کرنسی</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">روایتی چینی چھانٹ ترتیب-Big5</type>
-			<type type="buddhist" key="calendar">بدھ کیلنڈر</type>
-			<type type="chinese" key="calendar">روایتی چینی کیلنڈر</type>
-			<type type="direct" key="collation">بلاواسط� چھانٹ ترتیب</type>
-			<type type="gb2312han" key="collation">ساد� چینی چھانٹ ترتیب-GB2312</type>
-			<type type="gregorian" key="calendar">گریگوری کیلنڈر</type>
-			<type type="hebrew" key="calendar">عبرانی کیلنڈر</type>
-			<type type="indian" key="calendar">�ندی کیلنڈر</type>
-			<type type="islamic" key="calendar">اسلامی کیلنڈر</type>
-			<type type="islamic-civil" key="calendar">�جری کیلنڈر</type>
-			<type type="japanese" key="calendar">جاپانی کیلنڈر</type>
-			<type type="phonebook" key="collation">�ون نام� چھانٹ ترتیب</type>
-			<type type="pinyin" key="collation">پن ین چھانٹ ترتیب</type>
-			<type type="roc" key="calendar">ساد� چینی کیلنڈر</type>
-			<type type="stroke" key="collation">لکیری چھانٹ ترتیب</type>
-			<type type="traditional" key="collation">روایتی چھانٹ ترتیب</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">اعشاری</measurementSystemName>
-			<measurementSystemName type="US">امریکی</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">زبان:{0}</codePattern>
-			<codePattern type="script">رسم الخط:{0}</codePattern>
-			<codePattern type="territory">خط�:{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[أ ؤ ا آ ب پ ت ٹ ث ج چ ح-د ڈ ذ ر ڑ ز ژ س-غ � ق ک گ ل-ن ں و � ی ء ئ ے ٻ ة ٺ ټ ٽ ه ھ ي]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u0610 \u0611 \u0613 \u0614 \u064E \u0650 \u064F \u0670 \u064B \u0651]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">جنوری</month>
-							<month type="2">�روری</month>
-							<month type="3">مار چ</month>
-							<month type="4">اپريل</month>
-							<month type="5">مئ</month>
-							<month type="6">جون</month>
-							<month type="7">جولائ</month>
-							<month type="8">اگست</month>
-							<month type="9">ستمبر</month>
-							<month type="10">اکتوبر</month>
-							<month type="11">نومبر</month>
-							<month type="12">دسمبر</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ج</month>
-							<month type="2">Ù�</month>
-							<month type="3">Ù…</month>
-							<month type="4">ا</month>
-							<month type="5">Ù…</month>
-							<month type="6">ج</month>
-							<month type="7">ج</month>
-							<month type="8">ا</month>
-							<month type="9">س</month>
-							<month type="10">ا</month>
-							<month type="11">Ù†</month>
-							<month type="12">د</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="narrow">
-							<day type="sun">ا</day>
-							<day type="mon">Ù¾</day>
-							<day type="tue">Ù…</day>
-							<day type="wed">ب</day>
-							<day type="thu">ج</day>
-							<day type="fri">ج</day>
-							<day type="sat">Û�</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">اتوار</day>
-							<day type="mon">پير</day>
-							<day type="tue">منگل</day>
-							<day type="wed">بده</day>
-							<day type="thu">جمعرات</day>
-							<day type="fri">جمع�</day>
-							<day type="sat">��ت�</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1س� ما�ی</quarter>
-							<quarter type="2">2س� ما�ی</quarter>
-							<quarter type="3">3س� ما�ی</quarter>
-							<quarter type="4">4س� ما�ی</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">پ�لی س� ما�ی</quarter>
-							<quarter type="2">دوسری س� ما�ی</quarter>
-							<quarter type="3">تيسری س� ما�ی</quarter>
-							<quarter type="4">چوتهی س� ما�ی</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>قبل دوپ�ر</am>
-				<pm>بعد دوپ�ر</pm>
-				<eras>
-					<eraNames>
-						<era type="0">قبل مسيح</era>
-						<era type="1">عيسوی سن</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Ù‚ Ù…</era>
-						<era type="1">عيسوی سن</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, d, MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d, MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d, MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>d/M/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="d">د</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="M">LL</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, yyyy-d-M</dateFormatItem>
-						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-						<dateFormatItem id="yyQ">yy Q</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">h a تا h a</greatestDifference>
-							<greatestDifference id="h">h–h a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">h:mm a تا h:mm a</greatestDifference>
-							<greatestDifference id="h">h:mm تا h:mm a</greatestDifference>
-							<greatestDifference id="m">h:mm تا h:mm a</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
-							<greatestDifference id="h">h:mm تا h:mm a v</greatestDifference>
-							<greatestDifference id="m">h:mm تا h:mm a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">h a – h a v</greatestDifference>
-							<greatestDifference id="h">h تا h a v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M تا M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d تا d</greatestDifference>
-							<greatestDifference id="M">MM-dd تا MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MMM dd – E, MMM dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd تا E, MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MMM d تا d</greatestDifference>
-							<greatestDifference id="M">MMM d تا MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y تا y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM تا MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM تا yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd تا dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd تا MM-dd</greatestDifference>
-							<greatestDifference id="y">MM-dd-yyyy تا MM-dd-yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd تا E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">MMM–MMM y</greatestDifference>
-							<greatestDifference id="y">MMM–MMM y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">MMM d–d, y</greatestDifference>
-							<greatestDifference id="M">MMM d تا MMM d, y</greatestDifference>
-							<greatestDifference id="y">MMM d, y تا MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, MMM d – E, MMM d, y</greatestDifference>
-							<greatestDifference id="M">E, MMM d – E, MMM d, y</greatestDifference>
-							<greatestDifference id="y">E, MMM d, y تا E, MMM d, y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM تا MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM تا yyyy-MM</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>دور</displayName>
-					</field>
-					<field type="year">
-						<displayName>سال</displayName>
-					</field>
-					<field type="month">
-						<displayName>م�ین�</displayName>
-					</field>
-					<field type="week">
-						<displayName>��ت�</displayName>
-					</field>
-					<field type="day">
-						<displayName>دن</displayName>
-						<relative type="-3">ترسوں</relative>
-						<relative type="-2">پرسوں</relative>
-						<relative type="-1">Ú©Ù„</relative>
-						<relative type="0">آج</relative>
-						<relative type="1">Ú©Ù„</relative>
-						<relative type="2">پرسوں</relative>
-						<relative type="3">ترسوں</relative>
-					</field>
-					<field type="weekday">
-						<displayName>��تے کا دن</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>رات/صبح</displayName>
-					</field>
-					<field type="hour">
-						<displayName>گھنٹ�</displayName>
-					</field>
-					<field type="minute">
-						<displayName>منٹ</displayName>
-					</field>
-					<field type="second">
-						<displayName>سیکنڈ</displayName>
-					</field>
-					<field type="zone">
-						<displayName>زون</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="1">محرم</month>
-							<month type="2">ص�ر</month>
-							<month type="3">ر بيع الاول</month>
-							<month type="4">ر بيع الثانی</month>
-							<month type="5">جمادی الاول</month>
-							<month type="6">جمادی الثانی</month>
-							<month type="7">رجب</month>
-							<month type="8">شعبان</month>
-							<month type="9">رمضان</month>
-							<month type="10">شوال</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<eras>
-					<eraNames>
-						<era type="1">عيسوی سن</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">Ù‚ Ù…</era>
-						<era type="1">CE</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>انڈورا</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>انگویلا</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>اروبا</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>بار باڈوس</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>بحرین</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>برمود�</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>برونائی</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>بیلیز</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>کوسٹا ریکا</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>کیپ ورڈ</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>جبوتی</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>ڈومینیکا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>�جی</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>غرناط�</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>جبرالٹر</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>گواڈیلوپ</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>گوئٹے مالا</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>گوام</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>گیانا</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>�انگ کانگ</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>جمائیکا</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>کویت</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>لیگزمبرگ</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>موناکو</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>مکائو</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>مارٹنیک</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>مونٹ سراٹ</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>مالٹا</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>ماریشس</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>مالدیپ</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>نورو</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>نیوئے</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>پانام�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>پٹ کیرن</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>پورٹو ریکو</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>پالائو</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>قطر</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>ری یونین</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>سنگاپور</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>ایلسلواڈور</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>مایوٹ</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="one">�{0} {1} �</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>متحد� عرب اماراتی در�م</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>ارجنٹائن پیس�</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>آسٹریلین ڈالر</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>بلغارین لیو</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>بولیوین بولیویانو</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>برازیلی ریئل</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>کنیڈین ڈالر</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>سوئس �رانکس</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>چلّین پیس�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>یوآن رینمنبی</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>کولمبین پیس�</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>چیک کرونا</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>ڈچ مارکس</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>ڈنمارک کرونر</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>ایسٹونین کرون</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>مصری پائونڈ</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>یورو</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>�رانسیسی �رانک</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>انگلستانی پاونڈ سٹرلنگ</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>ھانگ کانگ ڈالر</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>کروشین کونا</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>�نگرین �ورنٹ</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>انڈونیشین روپی�</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>اسرائیلی شیکل</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>انڈین روپی�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>جاپانی ین</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>جنوبی کوریائی جیتا۔</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>لیتھوانی لیٹاس</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>مراکشی در�م</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>میکسیکی پیس�</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>ملائیشین رنگٹ</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>ناروے کرونر</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>نیوزی لینڈ ڈالر</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>پیروین نیووسول</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>�لپائینی پیس�</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>پاکستانی روپی�</displayName>
-				<symbol>روپے</symbol>
-			</currency>
-			<currency type="PLN">
-				<displayName>پولش نیو زلوٹی</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>نیا رومانیائی لیو</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>سربین دینار</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>روسی روبل</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>سعودی ریال</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>سویڈن کرونر</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>سنگا پور ڈالر</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>سلوانین ٹولر</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>سلووک کرونا</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>تھائی با�ت</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>ترکی لیرا</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>نیا ترکی لیرا</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>نیو تائیوان ڈالر</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>امریکی ڈالر</displayName>
-				<symbol>ڈالر</symbol>
-			</currency>
-			<currency type="VEB">
-				<displayName>وینزویلا بولیور</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>جنوبی ا�ریقی رانڈ</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/ur_IN.xml b/airtime_mvc/library/Zend/Locale/Data/ur_IN.xml
deleted file mode 100644
index 4cd59474f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ur_IN.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.16 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ur"/>
-		<territory type="IN"/>
-	</identity>
-	<numbers>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤ #,##,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ur_PK.xml b/airtime_mvc/library/Zend/Locale/Data/ur_PK.xml
deleted file mode 100644
index 57703ac5a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ur_PK.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.35 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ur"/>
-		<territory type="PK"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz.xml b/airtime_mvc/library/Zend/Locale/Data/uz.xml
deleted file mode 100644
index 920747e20..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.53 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">�рабча</language>
-			<language type="de">Олмонча</language>
-			<language type="en">Инглизча</language>
-			<language type="es">И�панча</language>
-			<language type="fr">Французча</language>
-			<language type="hi">Ҳиндча</language>
-			<language type="it">Итал�нча</language>
-			<language type="ja">Японча</language>
-			<language type="pt">Португалча</language>
-			<language type="ru">Ру�ча</language>
-			<language type="uz">Ўзбек</language>
-			<language type="zh">Хитойча</language>
-		</languages>
-		<scripts>
-			<script type="Arab">�раб</script>
-			<script type="Cyrl">Кирил</script>
-			<script type="Latn">Лотин</script>
-		</scripts>
-		<territories>
-			<territory type="AF">�фғони�тон</territory>
-			<territory type="BR">Бразили�</territory>
-			<territory type="CN">Хитой</territory>
-			<territory type="DE">Олмони�</territory>
-			<territory type="FR">Франци�</territory>
-			<territory type="GB">Бирлашган Қироллик</territory>
-			<territory type="IN">Ҳинди�тон</territory>
-			<territory type="IT">Итали�</territory>
-			<territory type="JP">Япони�</territory>
-			<territory type="RU">Ро��и�</territory>
-			<territory type="US">Қўшма Штатлар</territory>
-			<territory type="UZ">Ўзбеки�тон</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[а-г ғ д е ё ж-к қ л-у ў ф х ҳ ч ш ъ �-�]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ц щ ы ь]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Янв</month>
-							<month type="2">Фев</month>
-							<month type="3">Мар</month>
-							<month type="4">�пр</month>
-							<month type="5">Май</month>
-							<month type="6">Июн</month>
-							<month type="7">Июл</month>
-							<month type="8">�вг</month>
-							<month type="9">Сен</month>
-							<month type="10">Окт</month>
-							<month type="11">�о�</month>
-							<month type="12">Дек</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Муҳаррам</month>
-							<month type="2">Сафар</month>
-							<month type="3">Рабиул-аввал</month>
-							<month type="4">Рабиул-охир</month>
-							<month type="5">Жумодиул-уло</month>
-							<month type="6">Жумодиул-ухро</month>
-							<month type="7">Ражаб</month>
-							<month type="8">Шаъбон</month>
-							<month type="9">Рамазон</month>
-							<month type="10">Шаввол</month>
-							<month type="11">Зил-қаъда</month>
-							<month type="12">Зил-ҳижжа</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Я</month>
-							<month type="2">Ф</month>
-							<month type="3">М</month>
-							<month type="4">�</month>
-							<month type="5">М</month>
-							<month type="6">И</month>
-							<month type="7">И</month>
-							<month type="8">�</month>
-							<month type="9">С</month>
-							<month type="10">О</month>
-							<month type="11">�</month>
-							<month type="12">Д</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Якш</day>
-							<day type="mon">Душ</day>
-							<day type="tue">Сеш</day>
-							<day type="wed">Чор</day>
-							<day type="thu">Пай</day>
-							<day type="fri">Жум</day>
-							<day type="sat">Шан</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">�кшанба</day>
-							<day type="mon">душанба</day>
-							<day type="tue">�ешанба</day>
-							<day type="wed">чоршанба</day>
-							<day type="thu">пайшанба</day>
-							<day type="fri">жума</day>
-							<day type="sat">шанба</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Я</day>
-							<day type="mon">Д</day>
-							<day type="tue">С</day>
-							<day type="wed">Ч</day>
-							<day type="thu">П</day>
-							<day type="fri">Ж</day>
-							<day type="sat">Ш</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Asia/Kabul">
-				<exemplarCity>کابل</exemplarCity>
-			</zone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>ا�غانستان وقتی</standard>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Бразил реали</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Хитой юани</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Евро</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Инглиз фунт �терлинги</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Ҳинд рупи��и</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Япон йена�и</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Ру� рубли</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�ҚШ доллари</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Ўзбеки�тон �ўм</displayName>
-				<symbol>�ўм</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_AF.xml b/airtime_mvc/library/Zend/Locale/Data/uz_AF.xml
deleted file mode 100644
index 3c91fbdc9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_AF.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.42 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<territory type="AF"/>
-	</identity>
-	<alias source="uz_Arab_AF" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Arab.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Arab.xml
deleted file mode 100644
index c81c03b9c..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Arab.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/06/15 05:50:27 $"/>
-		<language type="uz"/>
-		<script type="Arab"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="fa">دری</language>
-			<language type="ps">پشتو</language>
-			<language type="uz">اۉزب�ک</language>
-		</languages>
-		<territories>
-			<territory type="AF">ا�غانستان</territory>
-		</territories>
-	</localeDisplayNames>
-	<layout>
-		<orientation characters="right-to-left"/>
-	</layout>
-	<characters>
-		<exemplarCharacters>[\u064B-\u0652 \u0654 \u0670 ء-ؤ ئ-ب پ ة-ث ټ ج چ ح خ � څ د ذ ډ ر ز ړ ږ ژ س ش ښ ص-غ � ق ک ګ گ ل-ن ڼ ه و ۇ ۉ ي ی � �]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[\u200C \u200D]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">جنو</month>
-							<month type="2">�بر</month>
-							<month type="3">مار</month>
-							<month type="4">اپر</month>
-							<month type="5">مـی</month>
-							<month type="6">جون</month>
-							<month type="7">جول</month>
-							<month type="8">اگس</month>
-							<month type="9">سپت</month>
-							<month type="10">اکت</month>
-							<month type="11">نوم</month>
-							<month type="12">دسم</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جنوری</month>
-							<month type="2">�بروری</month>
-							<month type="3">مارچ</month>
-							<month type="4">اپریل</month>
-							<month type="5">می</month>
-							<month type="6">جون</month>
-							<month type="7">جولای</month>
-							<month type="8">اگست</month>
-							<month type="9">سپتمبر</month>
-							<month type="10">اکتوبر</month>
-							<month type="11">نومبر</month>
-							<month type="12">دسمبر</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">ی.</day>
-							<day type="mon">د.</day>
-							<day type="tue">س.</day>
-							<day type="wed">Ú†.</day>
-							<day type="thu">Ù¾.</day>
-							<day type="fri">ج.</day>
-							<day type="sat">Ø´.</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">یکشنبه</day>
-							<day type="mon">دوشنبه</day>
-							<day type="tue">سه‌شنبه</day>
-							<day type="wed">چهارشنبه</day>
-							<day type="thu">پنجشنبه</day>
-							<day type="fri">جمعه</day>
-							<day type="sat">شنبه</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<eras>
-					<eraAbbr>
-						<era type="0">Ù‚.Ù….</era>
-						<era type="1">Ù….</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y نچی ییل d نچی MMMM EEEE کونی</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d نچی MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>H:mm:ss (zzzz)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>H:mm:ss (z)</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>H:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>H:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MMMMd">d نچی MMMM</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<defaultNumberingSystem>arabext</defaultNumberingSystem>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<minusSign>−</minusSign>
-			<exponential>E</exponential>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AFN">
-				<displayName>ا�غانی</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Arab_AF.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Arab_AF.xml
deleted file mode 100644
index 3f1022d96..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Arab_AF.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<script type="Arab"/>
-		<territory type="AF"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl.xml
deleted file mode 100644
index fe9f64c0a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<script type="Cyrl"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl_UZ.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl_UZ.xml
deleted file mode 100644
index aa643a829..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Cyrl_UZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<script type="Cyrl"/>
-		<territory type="UZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Latn.xml
deleted file mode 100644
index c86e6ba19..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Latn.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="uz"/>
-		<script type="Latn"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">arabcha</language>
-			<language type="de">olmoncha</language>
-			<language type="en">inglizcha</language>
-			<language type="es">ispancha</language>
-			<language type="fr">fransuzcha</language>
-			<language type="hi">hindcha</language>
-			<language type="it">italyancha</language>
-			<language type="ja">yaponcha</language>
-			<language type="pt">portugalcha</language>
-			<language type="ru">ruscha</language>
-			<language type="uz">o'zbekcha</language>
-			<language type="zh">xitoycha</language>
-		</languages>
-		<scripts>
-			<script type="Cyrl">Kiril</script>
-			<script type="Latn">Lotin</script>
-		</scripts>
-		<territories>
-			<territory type="AF">Afgʿoniston</territory>
-			<territory type="BR">Braziliya</territory>
-			<territory type="CN">Xitoy</territory>
-			<territory type="DE">Olmoniya</territory>
-			<territory type="FR">Fransiya</territory>
-			<territory type="GB">Birlashgan Qirollik</territory>
-			<territory type="IN">Hindiston</territory>
-			<territory type="IT">Italiya</territory>
-			<territory type="JP">Yaponiya</territory>
-			<territory type="RU">Rossiya</territory>
-			<territory type="US">Qo'shma Shtatlar</territory>
-			<territory type="UZ">OÊ¿zbekiston</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-v x-z Ê¿]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Yanv</month>
-							<month type="2">Fev</month>
-							<month type="3">Mar</month>
-							<month type="4">Apr</month>
-							<month type="5">May</month>
-							<month type="6">Iyun</month>
-							<month type="7">Iyul</month>
-							<month type="8">Avg</month>
-							<month type="9">Sen</month>
-							<month type="10">Okt</month>
-							<month type="11">Noya</month>
-							<month type="12">Dek</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">Y</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">I</month>
-							<month type="7">I</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Yaksh</day>
-							<day type="mon">Dush</day>
-							<day type="tue">Sesh</day>
-							<day type="wed">Chor</day>
-							<day type="thu">Pay</day>
-							<day type="fri">Jum</day>
-							<day type="sat">Shan</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">yakshanba</day>
-							<day type="mon">dushanba</day>
-							<day type="tue">seshanba</day>
-							<day type="wed">chorshanba</day>
-							<day type="thu">payshanba</day>
-							<day type="fri">juma</day>
-							<day type="sat">shanba</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">Y</day>
-							<day type="mon">D</day>
-							<day type="tue">S</day>
-							<day type="wed">C</day>
-							<day type="thu">P</day>
-							<day type="fri">J</day>
-							<day type="sat">S</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-			</calendar>
-			<calendar type="islamic">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="3">Rabiul-avval</month>
-							<month type="4">Rabiul-oxir</month>
-							<month type="5">Jumodiul-ulo</month>
-							<month type="6">Jumodiul-uxro</month>
-							<month type="8">Shaʿbon</month>
-							<month type="9">Ramazon</month>
-							<month type="10">Shavvol</month>
-							<month type="11">Zil-qaʿda</month>
-							<month type="12">Zil-hijja</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="BRL">
-				<displayName>Brazil reali</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>Xitoy yuani</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Evro</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Ingliz funt sterlingi</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Hind rupiyasi</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yapon yenasi</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rus rubli</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>AQSH dollari</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>Oʿzbekiston soʿm</displayName>
-				<symbol>soʿm</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_Latn_UZ.xml b/airtime_mvc/library/Zend/Locale/Data/uz_Latn_UZ.xml
deleted file mode 100644
index 732883a5b..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_Latn_UZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<script type="Latn"/>
-		<territory type="UZ"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/uz_UZ.xml b/airtime_mvc/library/Zend/Locale/Data/uz_UZ.xml
deleted file mode 100644
index 30196daa9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/uz_UZ.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.39 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="uz"/>
-		<territory type="UZ"/>
-	</identity>
-	<alias source="uz_Cyrl_UZ" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ve.xml b/airtime_mvc/library/Zend/Locale/Data/ve.xml
deleted file mode 100644
index 3a1dd675f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ve.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ve"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ve">Tshivenḓa</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b d ḓ e-i k l ḽ m n ṅ ṋ o p r-t ṱ u-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c j q]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Pha</month>
-							<month type="2">Luh</month>
-							<month type="3">á¹°ha</month>
-							<month type="4">Lam</month>
-							<month type="5">Shu</month>
-							<month type="6">Lwi</month>
-							<month type="7">Lwa</month>
-							<month type="8">á¹°ha</month>
-							<month type="9">Khu</month>
-							<month type="10">Tsh</month>
-							<month type="11">Ḽar</month>
-							<month type="12">Nye</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Phando</month>
-							<month type="2">Luhuhi</month>
-							<month type="3">á¹°hafamuhwe</month>
-							<month type="4">Lambamai</month>
-							<month type="5">Shundunthule</month>
-							<month type="6">Fulwi</month>
-							<month type="7">Fulwana</month>
-							<month type="8">á¹°hangule</month>
-							<month type="9">Khubvumedzi</month>
-							<month type="10">Tshimedzi</month>
-							<month type="11">Ḽara</month>
-							<month type="12">Nyendavhusiku</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Swo</day>
-							<day type="mon">Mus</day>
-							<day type="tue">Vhi</day>
-							<day type="wed">Rar</day>
-							<day type="thu">Ṋa</day>
-							<day type="fri">á¹°an</day>
-							<day type="sat">Mug</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Swondaha</day>
-							<day type="mon">Musumbuluwo</day>
-							<day type="tue">Ḽavhuvhili</day>
-							<day type="wed">Ḽavhuraru</day>
-							<day type="thu">Ḽavhuṋa</day>
-							<day type="fri">Ḽavhuṱanu</day>
-							<day type="sat">Mugivhela</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">K1</quarter>
-							<quarter type="2">K2</quarter>
-							<quarter type="3">K3</quarter>
-							<quarter type="4">K4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">Kotara ya u thoma</quarter>
-							<quarter type="2">Kotara ya vhuvhili</quarter>
-							<quarter type="3">Kotara ya vhuraru</quarter>
-							<quarter type="4">Kotara ya vhuṋa</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/MM/dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/ve_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/ve_ZA.xml
deleted file mode 100644
index 49dc1c1c0..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/ve_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="ve"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/vi.xml b/airtime_mvc/library/Zend/Locale/Data/vi.xml
deleted file mode 100644
index 6b9a629a1..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/vi.xml
+++ /dev/null
@@ -1,1055 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.86 $"/>
-		<generation date="$Date: 2009/06/15 20:34:50 $"/>
-		<language type="vi"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="af">Tiếng Nam Phi</language>
-			<language type="am">Tiếng Amharic</language>
-			<language type="ar">Tiếng A-rập</language>
-			<language type="as">Tiếng Assam</language>
-			<language type="ay">Tiếng Aymara</language>
-			<language type="az">Tiếng Ai-déc-bai-gian</language>
-			<language type="be">Tiếng Bê-la-rút</language>
-			<language type="bg">Tiếng Bun-ga-ri</language>
-			<language type="bh">Tiếng Bihari</language>
-			<language type="bn">Tiếng Bengali (Ấn �ộ)</language>
-			<language type="bo">Tiếng Tây Tạng</language>
-			<language type="br">Tiếng Breton</language>
-			<language type="bs">Tiếng Nam Tư</language>
-			<language type="ca">Tiếng Ca-ta-lăng</language>
-			<language type="cs">Tiếng Séc</language>
-			<language type="cy">Tiếng Xentơ</language>
-			<language type="da">Tiếng �an Mạch</language>
-			<language type="de">Tiếng �ức</language>
-			<language type="el">Tiếng Hy Lạp</language>
-			<language type="en">Tiếng Anh</language>
-			<language type="en_GB">Tiếng Anh (Anh)</language>
-			<language type="en_US">Tiếng Anh (Mỹ)</language>
-			<language type="eo">Tiếng Quốc Tế Ngữ</language>
-			<language type="es">Tiếng Tây Ban Nha</language>
-			<language type="et">Tiếng E-xtô-ni-a</language>
-			<language type="eu">Tiếng Basque</language>
-			<language type="fa">Tiếng Ba Tư</language>
-			<language type="fi">Tiếng Phần Lan</language>
-			<language type="fil">Tiếng Philipin</language>
-			<language type="fo">Tiếng Faore</language>
-			<language type="fr">Tiếng Pháp</language>
-			<language type="fy">Tiếng Frisian</language>
-			<language type="ga">Tiếng Ai-len</language>
-			<language type="gd">Tiếng Xentơ (Xcốt len)</language>
-			<language type="gl">Tiếng Galician</language>
-			<language type="gn">Tiếng Guarani</language>
-			<language type="gu">Tiếng Gujarati</language>
-			<language type="he">Tiếng Hê-brơ</language>
-			<language type="hi">Tiếng Hin-đi</language>
-			<language type="hr">Tiếng Crô-a-ti-a</language>
-			<language type="hu">Tiếng Hung-ga-ri</language>
-			<language type="hy">Tiếng �c-mê-ni</language>
-			<language type="ia">Tiếng Khoa H�c Quốc Tế</language>
-			<language type="id">Tiếng In-đô-nê-xia</language>
-			<language type="is">Tiếng Ai-xơ-len</language>
-			<language type="it">Tiếng �</language>
-			<language type="ja">Tiếng Nhật</language>
-			<language type="jv">Tiếng Gia-va</language>
-			<language type="ka">Tiếng Georgian</language>
-			<language type="km">Tiếng Campuchia</language>
-			<language type="kn">Tiếng Kan-na-đa</language>
-			<language type="ko">Tiếng Hàn Quốc</language>
-			<language type="ks">Tiếng Kashmiri</language>
-			<language type="ku">Tiếng Kurd (Iran)</language>
-			<language type="ky">Tiếng Kyrgyz</language>
-			<language type="la">Tiếng La-tinh</language>
-			<language type="ln">Tiếng Lingala</language>
-			<language type="lo">Tiếng Lào</language>
-			<language type="lt">Tiếng Lít-va</language>
-			<language type="lv">Tiếng Lát-vi-a</language>
-			<language type="mk">Tiếng Ma-xê-đô-ni-a</language>
-			<language type="ml">Tiếng Malayalam</language>
-			<language type="mn">Tiếng Mông Cổ</language>
-			<language type="mr">Tiếng Marathi</language>
-			<language type="ms">Tiếng Ma-lay-xi-a</language>
-			<language type="mt">Tiếng Mantơ</language>
-			<language type="ne">Tiếng Nê-pan</language>
-			<language type="nl">Tiếng Hà Lan</language>
-			<language type="nn">Tiếng Na Uy (Nynorsk)</language>
-			<language type="no">Tiếng Na Uy</language>
-			<language type="oc">Tiếng Occitan</language>
-			<language type="or">Tiếng Ô-ri-a</language>
-			<language type="pa">Tiếng Punjabi</language>
-			<language type="pl">Tiếng Ba Lan</language>
-			<language type="ps">Tiếng Pa-tô</language>
-			<language type="pt">Tiếng Bồ �ào Nha</language>
-			<language type="pt_BR">Tiếng Bồ �ào Nha (Braxin)</language>
-			<language type="pt_PT">Tiếng Bồ �ào Nha (I-bê-ri)</language>
-			<language type="rm">Tiếng Rhaeto-Romance</language>
-			<language type="ro">Tiếng Ru-ma-ni</language>
-			<language type="ru">Tiếng Nga</language>
-			<language type="sa">Tiếng Phạn</language>
-			<language type="sd">Tiếng Sin-hi</language>
-			<language type="sh">Tiếng Xéc bi - Croatia</language>
-			<language type="si">Tiếng Sinhala</language>
-			<language type="sk">Tiếng Xlô-vác</language>
-			<language type="sl">Tiếng Xlô-ven</language>
-			<language type="so">Tiếng Xô-ma-li</language>
-			<language type="sq">Tiếng An-ba-ni</language>
-			<language type="sr">Tiếng Séc-bi</language>
-			<language type="st">Tiếng Sesotho</language>
-			<language type="su">Tiếng Xu đăng</language>
-			<language type="sv">Tiếng Thụy �iển</language>
-			<language type="sw">Tiếng Bantu (�ông Phi)</language>
-			<language type="ta">Tiếng Tamil</language>
-			<language type="te">Tiếng Telugu</language>
-			<language type="th">Tiếng Thái</language>
-			<language type="ti">Tiếng Tigrigya</language>
-			<language type="tk">Tiếng Tuôc-men</language>
-			<language type="tl">Tiếng Tagalog</language>
-			<language type="tlh">Tiếng Klingon</language>
-			<language type="tr">Tiếng Thổ Nhĩ Kỳ</language>
-			<language type="tw">Tiếng Twi</language>
-			<language type="ug">Tiếng Uighur</language>
-			<language type="uk">Tiếng U-crai-na</language>
-			<language type="und">und</language>
-			<language type="ur">Tiếng Uđu</language>
-			<language type="uz">Tiếng U-dơ-bếch</language>
-			<language type="vi">Tiếng Việt</language>
-			<language type="wo">Tiếng Wolof</language>
-			<language type="xh">Tiếng Bantu</language>
-			<language type="yi">Tiếng Y-đit</language>
-			<language type="zh">Tiếng Trung Quốc</language>
-			<language type="zh_Hans">Tiếng Trung Quốc (Giản thể)</language>
-			<language type="zh_Hant">Tiếng Trung Quốc (Phồn thể)</language>
-			<language type="zu">Tiếng Zulu</language>
-		</languages>
-		<scripts>
-			<script type="Zxxx">Zxxx</script>
-			<script type="Zzzz">Zzzz</script>
-		</scripts>
-		<territories>
-			<territory type="001">Thế giới</territory>
-			<territory type="002">Châu Phi</territory>
-			<territory type="003">Bắc Mỹ</territory>
-			<territory type="005">Nam Mỹ</territory>
-			<territory type="009">Châu �ại Dương</territory>
-			<territory type="011">Tây Phi</territory>
-			<territory type="013">Trung Mỹ</territory>
-			<territory type="014">�ông Phí</territory>
-			<territory type="015">Bắc Phi</territory>
-			<territory type="017">Trung Phi</territory>
-			<territory type="018">Mi�n Nam Châu Phi</territory>
-			<territory type="019">Châu Mỹ</territory>
-			<territory type="021">Mi�n Bắc Châu Mỹ</territory>
-			<territory type="029">Ca-ri-bê</territory>
-			<territory type="030">�ông �</territory>
-			<territory type="034">Nam �</territory>
-			<territory type="035">�ông Nam �</territory>
-			<territory type="039">Nam Âu</territory>
-			<territory type="053">Úc và New Zealand</territory>
-			<territory type="054">Melanesia</territory>
-			<territory type="057">Vùng Micronesian</territory>
-			<territory type="061">Polynesia</territory>
-			<territory type="062">Trung Nam �</territory>
-			<territory type="142">Châu �</territory>
-			<territory type="143">Trung �</territory>
-			<territory type="145">Tây �</territory>
-			<territory type="150">Âu Châu</territory>
-			<territory type="151">�ông Âu</territory>
-			<territory type="154">Mi�n Bắc Châu Âu</territory>
-			<territory type="155">Tây Âu</territory>
-			<territory type="419">Châu Mỹ La-tinh và Ca-ri-be</territory>
-			<territory type="AD">Andorra</territory>
-			<territory type="AE">Các Tiểu Vương quốc A-rập Thống nhất</territory>
-			<territory type="AF">�p-ga-ni-xtan</territory>
-			<territory type="AG">An-ti-gu-a và Ba-bu-đa</territory>
-			<territory type="AL">An-ba-ni</territory>
-			<territory type="AM">�c-mê-ni-a</territory>
-			<territory type="AN">Tây Ấn Hà Lan</territory>
-			<territory type="AO">Ăng-gô-la</territory>
-			<territory type="AQ">Nam Cá»±c</territory>
-			<territory type="AR">�c-hen-ti-na</territory>
-			<territory type="AS">�ảo Somoa thuộc Mỹ</territory>
-			<territory type="AT">�o</territory>
-			<territory type="AU">Úc</territory>
-			<territory type="AX">Quần đảo Aland</territory>
-			<territory type="AZ">Ai-déc-bai-gian</territory>
-			<territory type="BA">Bô-xni-a Héc-xê-gô-vi-na</territory>
-			<territory type="BB">Bác-ba-đốt</territory>
-			<territory type="BD">Băng-la-đét</territory>
-			<territory type="BE">Bỉ</territory>
-			<territory type="BF">Buốc-ki-na Pha-xô</territory>
-			<territory type="BG">Bun-ga-ri</territory>
-			<territory type="BH">Ba-ren</territory>
-			<territory type="BI">Bu-run-Ä‘i</territory>
-			<territory type="BJ">Bê-nanh</territory>
-			<territory type="BL">BL</territory>
-			<territory type="BN">Bru-nây</territory>
-			<territory type="BO">Bô-li-vi-a</territory>
-			<territory type="BR">Bra-xin</territory>
-			<territory type="BS">Ba-ha-ma</territory>
-			<territory type="BT">Bu-tan (Bhutan)</territory>
-			<territory type="BV">�ảo Bouvet (Na Uy)</territory>
-			<territory type="BW">Bốt-xoa-na</territory>
-			<territory type="BY">Bê-la-rút</territory>
-			<territory type="BZ">Bê-li-xê</territory>
-			<territory type="CA">Ca-na-Ä‘a</territory>
-			<territory type="CC">Quần đảo Cocos</territory>
-			<territory type="CD">Cộng hoà dân chủ Côngô</territory>
-			<territory type="CF">Cộng hòa Trung Phi</territory>
-			<territory type="CG">Công-gô</territory>
-			<territory type="CH">Thụy Sĩ</territory>
-			<territory type="CI">B� Biển Ngà</territory>
-			<territory type="CK">Quần �ảo Cook</territory>
-			<territory type="CL">Chi-lê</territory>
-			<territory type="CM">Ca-mơ-run</territory>
-			<territory type="CN">Trung Quốc</territory>
-			<territory type="CO">Cô-lôm-bi-a</territory>
-			<territory type="CR">Cốt-xta Ri-ca</territory>
-			<territory type="CS">Séc-bia</territory>
-			<territory type="CU">Cu Ba</territory>
-			<territory type="CV">Cáp-ve</territory>
-			<territory type="CX">�ảo Giáng Sinh</territory>
-			<territory type="CY">Síp</territory>
-			<territory type="CZ">Cộng hòa Séc</territory>
-			<territory type="DE">�ức</territory>
-			<territory type="DJ">Gi-bu-ti</territory>
-			<territory type="DK">�an Mạch</territory>
-			<territory type="DO">Cộng hoà �ô-mi-ni-ca</territory>
-			<territory type="DZ">An-giê-ri</territory>
-			<territory type="EC">Ê-cu-a-đo</territory>
-			<territory type="EE">E-xtô-ni-a</territory>
-			<territory type="EG">Ai Cập</territory>
-			<territory type="EH">Tây Sahara</territory>
-			<territory type="ER">Ê-ri-tơ-rê-a</territory>
-			<territory type="ES">Tây Ban Nha</territory>
-			<territory type="ET">Ê-ti-ô-pi-a</territory>
-			<territory type="FI">Phần Lan</territory>
-			<territory type="FJ">Phi-gi</territory>
-			<territory type="FK">Quần �ảo Falkland</territory>
-			<territory type="FM">Mi-crô-nê-xi-a</territory>
-			<territory type="FO">Quần �ảo Faroe</territory>
-			<territory type="FR">Pháp</territory>
-			<territory type="GA">Ga-bông</territory>
-			<territory type="GB">Vương quốc Anh</territory>
-			<territory type="GD">Grê-na-đa</territory>
-			<territory type="GE">Gru-di-a</territory>
-			<territory type="GF">Quiana thuộc Pháp</territory>
-			<territory type="GG">Guernsey</territory>
-			<territory type="GH">Gha-na</territory>
-			<territory type="GL">Băng �ảo</territory>
-			<territory type="GM">Găm-bi-a</territory>
-			<territory type="GN">Ghi-nê</territory>
-			<territory type="GQ">Ghi-nê Xích-đạo</territory>
-			<territory type="GR">Hy Lạp</territory>
-			<territory type="GS">Quần đảo Nam Georgia và Nam Sandwich</territory>
-			<territory type="GT">Goa-tê-ma-la</territory>
-			<territory type="GU">�ảo Gu-am</territory>
-			<territory type="GW">Ghi-nê Bít-xao</territory>
-			<territory type="GY">Guy-a-na</territory>
-			<territory type="HK">�ặc khu hành chính Hồng Kông thuộc CHND Trung Hoa</territory>
-			<territory type="HM">�ảo Heard và Quần đảo McDonald</territory>
-			<territory type="HN">Hôn-đu-rát</territory>
-			<territory type="HR">Crô-a-ti-a</territory>
-			<territory type="HT">Ha-i-ti</territory>
-			<territory type="HU">Hung-ga-ri</territory>
-			<territory type="ID">Nam DÆ°Æ¡ng</territory>
-			<territory type="IE">Ai-len</territory>
-			<territory type="IL">I-xra-en</territory>
-			<territory type="IM">�ảo Man</territory>
-			<territory type="IN">Ấn �ộ</territory>
-			<territory type="IO">Thuộc địa Anh tại Ấn �ộ Dương</territory>
-			<territory type="IQ">I-rắc</territory>
-			<territory type="IR">I-ran</territory>
-			<territory type="IS">Ai-xơ-len</territory>
-			<territory type="IT">�</territory>
-			<territory type="JE">Jersey</territory>
-			<territory type="JM">Ha-mai-ca</territory>
-			<territory type="JO">Gióc-đa-ni</territory>
-			<territory type="JP">Nhật Bản</territory>
-			<territory type="KE">Kê-ni-a</territory>
-			<territory type="KG">Cư-rơ-gư-xtan</territory>
-			<territory type="KH">Campuchia</territory>
-			<territory type="KI">Ki-ri-ba-ti</territory>
-			<territory type="KM">Cô-mô</territory>
-			<territory type="KN">Xan-kít và Nê-vi</territory>
-			<territory type="KP">Bắc Tri�u Tiên</territory>
-			<territory type="KR">Hàn Quốc</territory>
-			<territory type="KW">Cô-oét</territory>
-			<territory type="KY">Quần �ảo Cayman</territory>
-			<territory type="KZ">Ka-dắc-xtan</territory>
-			<territory type="LA">Lào</territory>
-			<territory type="LB">Li-băng</territory>
-			<territory type="LC">Xan Lu-xi</territory>
-			<territory type="LI">Lich-ten-xtên</territory>
-			<territory type="LK">Xri Lan-ca</territory>
-			<territory type="LR">Li-bê-ri-a</territory>
-			<territory type="LS">Lê-xô-thô</territory>
-			<territory type="LT">Li-tu-a-ni-a</territory>
-			<territory type="LU">Lúc-xăm-bua</territory>
-			<territory type="LV">Lát-vi-a</territory>
-			<territory type="LY">Li-bi</territory>
-			<territory type="MA">Ma-rốc</territory>
-			<territory type="MC">Mô-na-cô</territory>
-			<territory type="MD">Môn-đô-va</territory>
-			<territory type="ME">Montenegro</territory>
-			<territory type="MF">MF</territory>
-			<territory type="MG">Ma-đa-gát-xca</territory>
-			<territory type="MH">Quần đảo Mác-san</territory>
-			<territory type="MK">Ma-xê-đô-ni-a</territory>
-			<territory type="ML">Ma-li</territory>
-			<territory type="MM">Mi-an-ma</territory>
-			<territory type="MN">Mông Cổ</territory>
-			<territory type="MO">�ặc khu hành chính Macao thuộc CHND Trung Hoa</territory>
-			<territory type="MP">Quần �ảo Bắc Mariana</territory>
-			<territory type="MQ">MQ</territory>
-			<territory type="MR">Mô-ri-ta-ni</territory>
-			<territory type="MT">Man-ta</territory>
-			<territory type="MU">Mô-ri-xơ</territory>
-			<territory type="MV">Man-đi-vơ</territory>
-			<territory type="MW">Ma-la-uy</territory>
-			<territory type="MX">Mê-hi-cô</territory>
-			<territory type="MY">Ma-lay-xi-a</territory>
-			<territory type="MZ">Mô-dăm-bích</territory>
-			<territory type="NA">Nam-mi-bi-a</territory>
-			<territory type="NC">New Caledonia</territory>
-			<territory type="NE">Ni-giê</territory>
-			<territory type="NF">�ảo Norfolk</territory>
-			<territory type="NG">Ni-giê-ri-a</territory>
-			<territory type="NI">Ni-ca-ra-goa</territory>
-			<territory type="NL">Hà Lan</territory>
-			<territory type="NO">Na Uy</territory>
-			<territory type="NP">Nê-pan</territory>
-			<territory type="NZ">Niu Di-lân</territory>
-			<territory type="OM">Ô-man</territory>
-			<territory type="PA">Pa-na-ma</territory>
-			<territory type="PE">Pê-ru</territory>
-			<territory type="PF">Polynesia thuộc Pháp</territory>
-			<territory type="PG">Pa-pu-a Niu Ghi-nê</territory>
-			<territory type="PH">Phi-lip-pin</territory>
-			<territory type="PK">Pa-ki-xtan</territory>
-			<territory type="PL">Ba Lan</territory>
-			<territory type="PM">Saint Pierre và Miquelon</territory>
-			<territory type="PS">Lãnh thổ Palestine</territory>
-			<territory type="PT">Bồ �ào Nha</territory>
-			<territory type="PY">Pa-ra-goay</territory>
-			<territory type="QA">Ca-ta</territory>
-			<territory type="QO">Vùng xa xôi thuộc Châu �ại Dương</territory>
-			<territory type="QU">Liên Minh Châu Âu</territory>
-			<territory type="RE">RE</territory>
-			<territory type="RO">Ru-ma-ni</territory>
-			<territory type="RS">Xéc-bi</territory>
-			<territory type="RU">Nga</territory>
-			<territory type="RW">Ru-an-Ä‘a</territory>
-			<territory type="SA">A-rập Xê-út</territory>
-			<territory type="SB">Quần đảo Xô-lô-mông</territory>
-			<territory type="SC">Xây-sen</territory>
-			<territory type="SD">Xu-đăng</territory>
-			<territory type="SE">Thụy �iển</territory>
-			<territory type="SG">Xin-ga-po</territory>
-			<territory type="SH">Saint Helena</territory>
-			<territory type="SI">Xlô-ven-ni-a</territory>
-			<territory type="SJ">Svalbard và Jan Mayen</territory>
-			<territory type="SK">Xlô-va-ki-a</territory>
-			<territory type="SL">Xi-ê-ra Lê-ôn</territory>
-			<territory type="SM">Xan Ma-ri-nô</territory>
-			<territory type="SN">Xê-nê-gan</territory>
-			<territory type="SO">Xô-ma-li</territory>
-			<territory type="SR">Xu-ri-nam</territory>
-			<territory type="ST">Xao Tô-mê và Prin-xi-pê</territory>
-			<territory type="SV">En-san-va-Ä‘o</territory>
-			<territory type="SY">Xi-ri</territory>
-			<territory type="SZ">Xoa-di-len</territory>
-			<territory type="TC">Quần �ảo Turk và Caicos</territory>
-			<territory type="TD">Sát</territory>
-			<territory type="TF">Thuộc �ịa Nam của Pháp</territory>
-			<territory type="TG">Tô-gô</territory>
-			<territory type="TH">Thái Lan</territory>
-			<territory type="TJ">Tát-gi-ki-xtan</territory>
-			<territory type="TK">Tokelau</territory>
-			<territory type="TL">�ông Ti-mo</territory>
-			<territory type="TM">Tuốc-mê-ni-xtan</territory>
-			<territory type="TN">Tuy-ni-di</territory>
-			<territory type="TO">Tông-ga</territory>
-			<territory type="TR">Thổ Nhĩ Kỳ</territory>
-			<territory type="TT">Tri-ni-đát và Tô-ba-gô</territory>
-			<territory type="TV">Tu-va-lu</territory>
-			<territory type="TW">�ài Loan</territory>
-			<territory type="TZ">Tan-da-ni-a</territory>
-			<territory type="UA">U-crai-na</territory>
-			<territory type="UG">U-gan-Ä‘a</territory>
-			<territory type="UM">Các đảo nh� xa trung tâm thuộc Mỹ</territory>
-			<territory type="US">Hoa Kỳ</territory>
-			<territory type="UY">U-ru-goay</territory>
-			<territory type="UZ">U-dơ-bê-ki-xtan</territory>
-			<territory type="VA">Va-ti-căng</territory>
-			<territory type="VC">Xan Vin-xen và Grê-na-din</territory>
-			<territory type="VE">Vê-nê-zu-ê-la</territory>
-			<territory type="VG">�ảo Virgin, thuộc Anh</territory>
-			<territory type="VI">Quần đảo Virgin, Mỹ</territory>
-			<territory type="VN">Việt Nam</territory>
-			<territory type="VU">Va-nu-a-tu</territory>
-			<territory type="WF">Wallis và Futuna</territory>
-			<territory type="WS">Xa-moa</territory>
-			<territory type="YE">Y-ê-men</territory>
-			<territory type="YT">YT</territory>
-			<territory type="ZA">Nam Phi</territory>
-			<territory type="ZM">Dăm-bi-a</territory>
-			<territory type="ZW">Dim-ba-bu-ê</territory>
-			<territory type="ZZ">Vùng Chưa biết hoặc không Hợp lệ</territory>
-		</territories>
-		<types>
-			<type type="gregorian" key="calendar">gregorian</type>
-		</types>
-		<codePatterns>
-			<codePattern type="language">Ngôn ngữ: {0}</codePattern>
-			<codePattern type="script">Chữ viết: {0}</codePattern>
-			<codePattern type="territory">Vùng: {0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à ả ã á ạ ă ằ ẳ ẵ ắ ặ â ầ ẩ ẫ ấ ậ b-d đ e è ẻ ẽ é ẹ ê � ể ễ ế ệ f-i ì ỉ ĩ í ị j-o ò � õ ó � ô ồ ổ ỗ ố ộ ơ � ở ỡ ớ ợ p-u ù ủ ũ ú ụ ư ừ ử ữ ứ ự v-y ỳ ỷ ỹ ý ỵ z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-d Ä‘ e-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">thg 1</month>
-							<month type="2">thg 2</month>
-							<month type="3">thg 3</month>
-							<month type="4">thg 4</month>
-							<month type="5">thg 5</month>
-							<month type="6">thg 6</month>
-							<month type="7">thg 7</month>
-							<month type="8">thg 8</month>
-							<month type="9">thg 9</month>
-							<month type="10">thg 10</month>
-							<month type="11">thg 11</month>
-							<month type="12">thg 12</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">tháng một</month>
-							<month type="2">tháng hai</month>
-							<month type="3">tháng ba</month>
-							<month type="4">tháng tư</month>
-							<month type="5">tháng năm</month>
-							<month type="6">tháng sáu</month>
-							<month type="7">tháng bảy</month>
-							<month type="8">tháng tám</month>
-							<month type="9">tháng chín</month>
-							<month type="10">tháng mư�i</month>
-							<month type="11">tháng mư�i một</month>
-							<month type="12">tháng mư�i hai</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">CN</day>
-							<day type="mon">Th 2</day>
-							<day type="tue">Th 3</day>
-							<day type="wed">Th 4</day>
-							<day type="thu">Th 5</day>
-							<day type="fri">Th 6</day>
-							<day type="sat">Th 7</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Chủ nhật</day>
-							<day type="mon">Thứ hai</day>
-							<day type="tue">Thứ ba</day>
-							<day type="wed">Thứ tư</day>
-							<day type="thu">Thứ năm</day>
-							<day type="fri">Thứ sáu</day>
-							<day type="sat">Thứ bảy</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<am>SA</am>
-				<pm>CH</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">tr. CN</era>
-						<era type="1">sau CN</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, 'ngày' dd MMMM 'năm' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>'Ngày' dd 'tháng' M 'năm' y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MM-yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>HH:mm:ss zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>HH:mm:ss z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>HH:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>HH:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{0} {1}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="HHmm">HH:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">d-M</dateFormatItem>
-						<dateFormatItem id="MEd">E, d-M</dateFormatItem>
-						<dateFormatItem id="MMdd">dd-MM</dateFormatItem>
-						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
-						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
-						<dateFormatItem id="MMMMd">d MMMM</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem>
-						<dateFormatItem id="mmss">mm:ss</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, d-M-yyyy</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, d MMM y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM y</dateFormatItem>
-						<dateFormatItem id="yQ">Q yyyy</dateFormatItem>
-						<dateFormatItem id="yQQQ">QQQ y</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyy">y</dateFormatItem>
-						<dateFormatItem id="yyyyMM">MM-yyyy</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0} - {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">'Ngày' d-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH'h' - HH'h'</greatestDifference>
-							<greatestDifference id="h">HH'h' - HH'h'</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH'h'-HH'h' v</greatestDifference>
-							<greatestDifference id="h">HH'h'-HH'h' v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">'Tháng' M - 'Tháng' M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM - dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM - dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">EEEE, dd/MM - EEEE, dd/MM</greatestDifference>
-							<greatestDifference id="M">EEEE, dd/MM - EEEE, dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">MMM-MMM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M</greatestDifference>
-							<greatestDifference id="M">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">EEEE, 'ngày' dd - EEEE, 'ngày' dd 'tháng' M</greatestDifference>
-							<greatestDifference id="M">EEEE, 'ngày' dd 'tháng' M - EEEE, 'ngày' dd 'tháng' M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yyyy - MM/yyyy</greatestDifference>
-							<greatestDifference id="y">MM/yyyy - MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyyy - dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="M">EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy</greatestDifference>
-							<greatestDifference id="y">EEEE, dd/MM/yyyy - EEEE, dd/MM/yyyy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">'Tháng' M - 'Tháng' M 'năm' y</greatestDifference>
-							<greatestDifference id="y">'Tháng' M 'năm' y - 'Tháng' M 'năm' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
-							<greatestDifference id="M">'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
-							<greatestDifference id="y">'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">EEEE, 'ngày' dd MMM - EEEE, 'ngày' dd MMM 'năm' y</greatestDifference>
-							<greatestDifference id="M">EEEE, 'ngày' dd MMM - EEEE, 'ngày' dd MMM 'năm' y</greatestDifference>
-							<greatestDifference id="y">EEEE, 'ngày' dd MMM 'năm' y - EEEE, 'ngày' dd MMM 'năm' y</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Không rõ</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>Andorra Time</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont D'Urville</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>Barbados Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>Bahrain Time</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>Belize Time</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>Costa Rica Time</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>Cape Verde Time</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>Djibouti Time</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>Dominica Time</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>Quần �ảo Canary</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>Fiji Time</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>Grenada Time</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>South Georgia and the South Sandwich Islands Time</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>Guatemala Time</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>Guyana Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>Hong Kong SAR China Time</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>Jamaica Time</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>Saint Kitts and Nevis Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>Kuwait Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>Laos Time</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>Saint Lucia Time</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>Luxembourg Time</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>Monaco Time</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>Malta Time</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>Mauritius Time</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>Maldives Time</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>Nauru Time</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>Panama Time</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>Palau Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>Qatar Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>Singapore Time</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>El Salvador Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>Taiwan Time</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>Saint Vincent and the Grenadines Time</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>U.S. Virgin Islands Time</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>Gi� Việt Nam</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group>.</group>
-			<list>;</list>
-			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
-			<plusSign>+</plusSign>
-			<minusSign>-</minusSign>
-			<exponential>E</exponential>
-			<perMille>‰</perMille>
-			<infinity>∞</infinity>
-			<nan>NaN</nan>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>#,##0.00 ¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-			<unitPattern count="other">{0} {1}</unitPattern>
-		</currencyFormats>
-		<currencies>
-			<currency type="AED">
-				<displayName>�iram UAE</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>Lép Bungari</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>BRL</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>Franc Thụy sĩ</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>CNY</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>Crun Extônia</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>Euro</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>�ô-la Fi-ji</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>Franc Pháp</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>Bảng Anh</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>Lari Georgia</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>Cedi Ghana (1979-2007)</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>Cedi Ghana</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>Pao Gibraltar</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>Franc Guinea</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>Syli Guinea</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>Drachma Hy Lạp</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>Quetzal Guatemala</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>Peso Guinea-Bissau</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>�ô-la Guyana</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>�ô-la Hồng Kông</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>Honduras Lempira</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>Gourde Haiti</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>Phôrin Hungari</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>Rupia Inđônêxia</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>Pao Ai-len</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>Pao Ixraen</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>Sêken Ixraen</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>Rupi Ấn �ộ</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>Dinar I-rắc</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>Rial I-ran</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>Lia �</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>�ô la Jamaica</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>Dinar Jordan</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>Yên Nhật</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>Si-ling Kê-ny-a</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>Won Hàn Quốc</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>Kazakhstan Tenge</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>Litat Lituani</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>�iaham Marốc</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>Lia xứ Man-tơ</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>Peso Mêhicô</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>Rinhgit Malaixia</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>Curon Na Uy</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�ô-la New Zealand</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>Nuevo Sol Pêru</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>Peso Philíppin</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>Rupi Pakistan</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>Zloty Ba Lan</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>Lây Rumani</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>�ina Xéc-bi</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>Rúp Nga</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>Rian Ả rập Xêút</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>Cua-ron Thuỵ �iển</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>�ô-la Singapore</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>Tôla Xlôvênia</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>Cuaron Xlôvác</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>Bạt Thái Lan</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>Lia Thổ Nhĩ Kỳ</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>Lia Thổ Nhĩ Kỳ Mới</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>�ô-la �ài Loan</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>Rúp U-crai-na</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>�ô-la Mỹ</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>Bôliva Vênêduêla</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>đồng</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>Vàng</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>Ti�n tệ chưa biết hoặc không hợp lệ</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>Ran Nam Phi</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} ngày</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} gi�</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} phút</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} tháng</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} giây</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} tuần</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} năm</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/vi_VN.xml b/airtime_mvc/library/Zend/Locale/Data/vi_VN.xml
deleted file mode 100644
index 9d7be62eb..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/vi_VN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.41 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="vi"/>
-		<territory type="VN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/wal.xml b/airtime_mvc/library/Zend/Locale/Data/wal.xml
deleted file mode 100644
index d71deb0a9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wal.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.61 $"/>
-		<generation date="$Date: 2009/06/15 04:15:33 $"/>
-		<language type="wal"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="ar">�ርቢኛ</language>
-			<language type="de">ጀርመን</language>
-			<language type="en">እን�ሊ�ኛ</language>
-			<language type="es">ስ�ኒሽ</language>
-			<language type="fr">�ረንሳይኛ</language>
-			<language type="hi">�ንድኛ</language>
-			<language type="it">ጣሊያንኛ</language>
-			<language type="ja">ጃ�ንኛ</language>
-			<language type="pt">�ርቱጋሊኛ</language>
-			<language type="ru">ራሽኛ</language>
-			<language type="wal">ወላይታቱ</language>
-			<language type="zh">ቻይንኛ</language>
-		</languages>
-		<scripts>
-			<script type="Latn">ላቲን</script>
-		</scripts>
-		<territories>
-			<territory type="AD">አንዶራ</territory>
-			<territory type="AE">የተባበሩት አረብ ኤ�ሬትስ</territory>
-			<territory type="AL">አ�ባኒያ</territory>
-			<territory type="AM">አርሜኒያ</territory>
-			<territory type="AN">ኔዘርላንድስ አንቲ�ስ</territory>
-			<territory type="AR">አርጀንቲና</territory>
-			<territory type="AT">ኦስትሪያ</territory>
-			<territory type="AU">አ�ስትሬሊያ</territory>
-			<territory type="AZ">አዘርባጃን</territory>
-			<territory type="BA">ቦስኒያ እና ሄርዞጎቪኒያ</territory>
-			<territory type="BB">ባርቤዶስ</territory>
-			<territory type="BE">ቤ�ጄ�</territory>
-			<territory type="BG">ቡ�ጌሪያ</territory>
-			<territory type="BH">ባህሬን</territory>
-			<territory type="BM">ቤርሙዳ</territory>
-			<territory type="BO">ቦሊቪያ</territory>
-			<territory type="BR">ብራዚ�</territory>
-			<territory type="BT">ቡህታን</territory>
-			<territory type="BY">ቤላሩስ</territory>
-			<territory type="BZ">ቤሊዘ</territory>
-			<territory type="CD">ኮንጎ</territory>
-			<territory type="CF">የመካከለኛ� አ�ሪካ ሪ�ብሊክ</territory>
-			<territory type="CH">ስዊዘርላንድ</territory>
-			<territory type="CL">ቺሊ</territory>
-			<territory type="CM">ካሜሩን</territory>
-			<territory type="CN">ቻይና</territory>
-			<territory type="CO">ኮሎ�ቢያ</territory>
-			<territory type="CS">ሰርቢያ</territory>
-			<territory type="CV">ኬ� ቬርዴ</territory>
-			<territory type="CY">ሳይ�ረስ</territory>
-			<territory type="CZ">ቼክ ሪ�ብሊክ</territory>
-			<territory type="DE">ጀርመን</territory>
-			<territory type="DK">ዴንማርክ</territory>
-			<territory type="DM">ዶሚኒካ</territory>
-			<territory type="DO">ዶሚኒክ ሪ�ብሊክ</territory>
-			<territory type="DZ">አ�ጄሪያ</territory>
-			<territory type="EC">ኢኳዶር</territory>
-			<territory type="EE">ኤስቶኒያ</territory>
-			<territory type="EG">�ብጽ</territory>
-			<territory type="EH">�ዕራባዊ ሳህራ</territory>
-			<territory type="ER">ኤርትራ</territory>
-			<territory type="ES">ስ�ን</territory>
-			<territory type="ET">ኢትዮጵያ</territory>
-			<territory type="FI">�ንላንድ</territory>
-			<territory type="FJ">�ጂ</territory>
-			<territory type="FM">ሚክሮኔዢያ</territory>
-			<territory type="FR">�ረንሳይ</territory>
-			<territory type="GB">እን�ሊ�</territory>
-			<territory type="GE">ጆርጂያ</territory>
-			<territory type="GF">የ�ረንሳይ ጉዊአና</territory>
-			<territory type="GM">ጋ�ቢያ</territory>
-			<territory type="GN">ጊኒ</territory>
-			<territory type="GQ">ኢኳቶሪያ� ጊኒ</territory>
-			<territory type="GR">�ሪክ</territory>
-			<territory type="GW">ቢሳዎ</territory>
-			<territory type="GY">ጉያና</territory>
-			<territory type="HK">ሆን� ኮን�</territory>
-			<territory type="HR">ክሮኤሽያ</territory>
-			<territory type="HT">ሀይቲ</territory>
-			<territory type="HU">ሀንጋሪ</territory>
-			<territory type="ID">ኢንዶኔዢያ</territory>
-			<territory type="IE">አየርላንድ</territory>
-			<territory type="IL">እስራኤ�</territory>
-			<territory type="IN">ህንድ</territory>
-			<territory type="IQ">ኢራቅ</territory>
-			<territory type="IS">አይስላንድ</territory>
-			<territory type="IT">ጣሊያን</territory>
-			<territory type="JM">ጃማይካ</territory>
-			<territory type="JO">ጆርዳን</territory>
-			<territory type="JP">ጃ�ን</territory>
-			<territory type="KH">ካ�ቦዲያ</territory>
-			<territory type="KM">ኮሞሮስ</territory>
-			<territory type="KP">ደቡብ ኮሪያ</territory>
-			<territory type="KR">ሰሜን ኮሪያ</territory>
-			<territory type="KW">ክዌት</territory>
-			<territory type="LB">ሊባኖስ</territory>
-			<territory type="LT">ሊቱዌኒያ</territory>
-			<territory type="LV">ላትቪያ</territory>
-			<territory type="LY">ሊቢያ</territory>
-			<territory type="MA">ሞሮኮ</territory>
-			<territory type="MD">ሞ�ዶቫ</territory>
-			<territory type="MK">ማከዶኒያ</territory>
-			<territory type="MN">ሞንጎሊያ</territory>
-			<territory type="MO">ማካዎ</territory>
-			<territory type="MR">ሞሪቴኒያ</territory>
-			<territory type="MT">ማ�ታ</territory>
-			<territory type="MU">ማሩሸስ</territory>
-			<territory type="MX">ሜክሲኮ</territory>
-			<territory type="MY">ማሌዢያ</territory>
-			<territory type="NA">ናሚቢያ</territory>
-			<territory type="NC">ኒ� ካሌዶኒያ</territory>
-			<territory type="NG">ናይጄሪያ</territory>
-			<territory type="NL">ኔዘርላንድ</territory>
-			<territory type="NO">ኖርዌ</territory>
-			<territory type="NP">ኔ��</territory>
-			<territory type="NZ">ኒ� ዚላንድ</territory>
-			<territory type="PE">�ሩ</territory>
-			<territory type="PF">የ�ረንሳይ �ሊኔዢያ</territory>
-			<territory type="PG">��ዋ ኒ� ጊኒ</territory>
-			<territory type="PL">�ላንድ</territory>
-			<territory type="PR">�ርታ ሪኮ</territory>
-			<territory type="RO">ሮሜኒያ</territory>
-			<territory type="RU">ራሺያ</territory>
-			<territory type="SA">ሳ�ድአረቢያ</territory>
-			<territory type="SD">ሱዳን</territory>
-			<territory type="SE">ስዊድን</territory>
-			<territory type="SG">ሲንጋ�ር</territory>
-			<territory type="SI">ስሎቬኒያ</territory>
-			<territory type="SK">ስሎቫኪያ</territory>
-			<territory type="SN">ሴኔጋ�</territory>
-			<territory type="SO">ሱማሌ</territory>
-			<territory type="SY">ሲሪያ</territory>
-			<territory type="TD">ቻድ</territory>
-			<territory type="TF">የ�ረንሳይ ደቡባዊ �ዛቶች</territory>
-			<territory type="TH">ታይላንድ</territory>
-			<territory type="TJ">ታጃኪስታን</territory>
-			<territory type="TL">�ስራቅ ቲሞር</territory>
-			<territory type="TN">ቱኒዚያ</territory>
-			<territory type="TR">ቱርክ</territory>
-			<territory type="TT">ትሪኒዳድ እና ቶባጎ</territory>
-			<territory type="TZ">ታንዛኒያ</territory>
-			<territory type="UG">ዩጋንዳ</territory>
-			<territory type="US">አሜሪካ</territory>
-			<territory type="UZ">ዩ�በኪስታን</territory>
-			<territory type="VE">ቬንዙዌላ</territory>
-			<territory type="VG">የእን�ሊ� ድን�� ደሴቶች</territory>
-			<territory type="VI">የአሜሪካ ቨርጂን ደሴቶች</territory>
-			<territory type="YE">የመን</territory>
-			<territory type="ZA">ደቡብ አ�ሪካ</territory>
-			<territory type="ZM">ዛ�ቢያ</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[\u135F �-᎙ ሀ-� ⶀ �-ሟ ᎀ-ᎃ � ሠ-ሯ ⶂ ሰ-ሷ ⶃ ሸ-ሿ ⶄ ቀ-ቈ ቊ-� �-ቖ ቘ ቚ-� በ-ቧ ᎄ-ᎇ ⶅ ቨ-ቷ ⶆ ቸ-ቿ ⶇ ኀ-ኈ ኊ-� �-ኗ ⶈ ኘ-ኟ ⶉ አ-ኧ ⶊ ከ-ኰ ኲ-ኵ ኸ-ኾ ዀ ዂ-ዅ ወ-ዖ ዘ-ዟ ⶋ ዠ-ዷ ⶌ ዸ-ዿ � ጀ-ጇ ⶎ ገ-� ጒ-ጕ ጘ-ጟ ⶓ-ⶖ ጠ-ጧ � ጨ-ጯ � ጰ-ጷ ⶑ ጸ-� ᎈ-ᎋ �-� ᎌ-� ⶒ �-� ⶠ-ⶦ ⶨ-ⶮ ⶰ-ⶶ ⶸ-ⶾ ⷀ-ⷆ ⷈ-ⷎ �-ⷖ ⷘ-ⷞ]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">ጃንዩ</month>
-							<month type="2">�ብሩ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስ</month>
-							<month type="9">ሴ�ቴ</month>
-							<month type="10">ኦክተ</month>
-							<month type="11">ኖቬ�</month>
-							<month type="12">ዲሴ�</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">ጃንዩወሪ</month>
-							<month type="2">�ብሩወሪ</month>
-							<month type="3">ማርች</month>
-							<month type="4">ኤ�ረ�</month>
-							<month type="5">ሜይ</month>
-							<month type="6">�ን</month>
-							<month type="7">�ላይ</month>
-							<month type="8">ኦገስት</month>
-							<month type="9">ሴ�ቴ�በር</month>
-							<month type="10">ኦክተ�በር</month>
-							<month type="11">ኖቬ�በር</month>
-							<month type="12">ዲሴ�በር</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">ጃ</month>
-							<month type="2">�</month>
-							<month type="3">ማ</month>
-							<month type="4">ኤ</month>
-							<month type="5">ሜ</month>
-							<month type="6">�</month>
-							<month type="7">�</month>
-							<month type="8">ኦ</month>
-							<month type="9">ሴ</month>
-							<month type="10">ኦ</month>
-							<month type="11">ኖ</month>
-							<month type="12">ዲ</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="wide">
-							<day type="sun">ወጋ</day>
-							<day type="mon">ሳይኖ</day>
-							<day type="tue">ማቆሳኛ</day>
-							<day type="wed">አሩዋ</day>
-							<day type="thu">ሃሙሳ</day>
-							<day type="fri">አርባ</day>
-							<day type="sat">ቄራ</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">ወ</day>
-							<day type="mon">ሳ</day>
-							<day type="tue">ማ</day>
-							<day type="wed">አ</day>
-							<day type="thu">ሃ</day>
-							<day type="fri">አ</day>
-							<day type="sat">ቄ</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<am>ማለዶ</am>
-				<pm>ቃማ</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">አዳ ዎዴ</era>
-						<era type="1">�ሮተታ ላይታ</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE� dd MMMM ጋላሳ y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>dd-MMM-y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMdd">dd/MM</dateFormatItem>
-						<dateFormatItem id="MMMMdd">dd MMMM</dateFormatItem>
-						<dateFormatItem id="yyMM">MM/yy</dateFormatItem>
-						<dateFormatItem id="yyQ">Q yy</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">MMMM y</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<group>’</group>
-		</symbols>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="BRL">
-				<displayName>የብራዚ� ሪ�</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>የቻይና ዩአን ረንሚንቢ</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>የኢትዮጵያ ብር</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>አ�ሮ</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>የእን�ሊ� ��ንድ ስተርሊን�</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>የሕንድ ሩ�</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>የጃ�ን የን</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>የራሻ ሩብ�</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>የአሜሪካን ዶላር</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/wal_ET.xml b/airtime_mvc/library/Zend/Locale/Data/wal_ET.xml
deleted file mode 100644
index 26c527a99..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wal_ET.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="wal"/>
-		<territory type="ET"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/wo.xml b/airtime_mvc/library/Zend/Locale/Data/wo.xml
deleted file mode 100644
index ee1c52bf3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wo.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="wo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="da">Danwaa</language>
-			<language type="de">Almaa</language>
-			<language type="en">Angale</language>
-			<language type="es">Españool</language>
-			<language type="fi">Finlaande</language>
-			<language type="fr">Fraañse</language>
-			<language type="it">Itaaliee</language>
-			<language type="ja">Jappone</language>
-			<language type="nl">Olaande</language>
-			<language type="no">Norweejiee</language>
-			<language type="pt">Portugees</language>
-			<language type="sv">Suweedwaa</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a à b-e é ë f g i-n ñ ŋ o ó p-u w-y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[ã h v z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/wo_Latn.xml b/airtime_mvc/library/Zend/Locale/Data/wo_Latn.xml
deleted file mode 100644
index fc7eded0f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wo_Latn.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.14 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="wo"/>
-		<script type="Latn"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/wo_Latn_SN.xml b/airtime_mvc/library/Zend/Locale/Data/wo_Latn_SN.xml
deleted file mode 100644
index d23038bc7..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wo_Latn_SN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.14 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="wo"/>
-		<script type="Latn"/>
-		<territory type="SN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/wo_SN.xml b/airtime_mvc/library/Zend/Locale/Data/wo_SN.xml
deleted file mode 100644
index b6c400f1f..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/wo_SN.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.17 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="wo"/>
-		<territory type="SN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/xh.xml b/airtime_mvc/library/Zend/Locale/Data/xh.xml
deleted file mode 100644
index 77fa96cde..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/xh.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.30 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="xh"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">isiBhulu</language>
-			<language type="am">Isi-Amharic</language>
-			<language type="ar">Isi-Arabic</language>
-			<language type="as">isiAssamese</language>
-			<language type="az">Isi-Azerbaijani</language>
-			<language type="be">Isi-Belarusian</language>
-			<language type="bg">Isi-Bulgaria</language>
-			<language type="bh">Isi-Bihari</language>
-			<language type="bn">Isi-Bengali</language>
-			<language type="br">Breton</language>
-			<language type="bs">Isi-Bosnia</language>
-			<language type="ca">Isi-Calatan</language>
-			<language type="cs">Isi-Czech</language>
-			<language type="cy">Isi-Welsh</language>
-			<language type="da">Isi-Danish</language>
-			<language type="de">Isi-German</language>
-			<language type="el">Isi-Greek</language>
-			<language type="en">isiNgesi</language>
-			<language type="eo">Isi-Esperanto</language>
-			<language type="es">Isi-Spanish</language>
-			<language type="et">Isi-Estonian</language>
-			<language type="eu">Isi-Basque</language>
-			<language type="fa">Isi-Persia</language>
-			<language type="fi">Isi-Finnish</language>
-			<language type="fil">Isi-Taglog</language>
-			<language type="fo">Isi-Faroese</language>
-			<language type="fr">Isi-French</language>
-			<language type="fy">Isi-Frisian</language>
-			<language type="ga">Isi-Irish</language>
-			<language type="gd">Scots Gaelic</language>
-			<language type="gl">Isi-Galician</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Isi-Gujarati</language>
-			<language type="he">Isi-Hebrew</language>
-			<language type="hi">Isi-Hindi</language>
-			<language type="hr">Isi-Croatia</language>
-			<language type="hu">Isi-Hungarian</language>
-			<language type="hy">isiArmenian</language>
-			<language type="ia">Interlingua</language>
-			<language type="id">Isi-Indonesian</language>
-			<language type="ie">isiInterlingue</language>
-			<language type="is">Isi-Icelandic</language>
-			<language type="it">Isi-Italian</language>
-			<language type="ja">Isi-Japanese</language>
-			<language type="jv">Isi-Javanese</language>
-			<language type="ka">Isi-Georgia</language>
-			<language type="km">isiCambodia</language>
-			<language type="kn">Isi-Kannada</language>
-			<language type="ko">Isi-Korean</language>
-			<language type="ku">Kurdish</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Isi-Latin</language>
-			<language type="ln">Iilwimi</language>
-			<language type="lo">IsiLoathian</language>
-			<language type="lt">Isi-Lithuanian</language>
-			<language type="lv">Isi-Latvian</language>
-			<language type="mk">Isi-Macedonian</language>
-			<language type="ml">Isi-Malayalam</language>
-			<language type="mn">IsiMongolian</language>
-			<language type="mr">Isi-Marathi</language>
-			<language type="ms">Isi-Malay</language>
-			<language type="mt">Isi-Maltese</language>
-			<language type="ne">Isi-Nepali</language>
-			<language type="nl">Isi-Dutch</language>
-			<language type="nn">Isi-Norwegia (Nynorsk)</language>
-			<language type="no">Isi-Norwegian</language>
-			<language type="oc">Iso-Occitan</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Isi-Punjabi</language>
-			<language type="pl">Isi-Polish</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Isi-Portuguese</language>
-			<language type="pt_BR">portokugusseee</language>
-			<language type="pt_PT">Isi-Portuguese (Portugal)</language>
-			<language type="ro">Isi-Romanian</language>
-			<language type="ru">Isi-Russian</language>
-			<language type="sa">iSanskrit</language>
-			<language type="sd">isiSindhi</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="si">Isi-Sinhalese</language>
-			<language type="sk">Isi-Slovak</language>
-			<language type="sl">Isi-Slovenian</language>
-			<language type="so">IsiSomaliya</language>
-			<language type="sq">Isi-Albania</language>
-			<language type="sr">Isi-Serbia</language>
-			<language type="st">Sesotho</language>
-			<language type="su">Isi-Sudanese</language>
-			<language type="sv">Isi-Swedish</language>
-			<language type="sw">Isi-Swahili</language>
-			<language type="ta">Isi-Tamil</language>
-			<language type="te">Isi-Telegu</language>
-			<language type="th">Isi-Thai</language>
-			<language type="ti">Isi-Tigrinya</language>
-			<language type="tk">Turkmen</language>
-			<language type="tlh">Klingon</language>
-			<language type="tr">Isi-Turkish</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Isi Uighur</language>
-			<language type="uk">Isi-Ukranian</language>
-			<language type="ur">Urdu</language>
-			<language type="uz">Isi-Uzbek</language>
-			<language type="vi">Isi-Vietnamese</language>
-			<language type="xh">isiXhosa</language>
-			<language type="yi">Yiddish</language>
-			<language type="zu">isiZulu</language>
-		</languages>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a-z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mat</month>
-							<month type="4">Epr</month>
-							<month type="5">Mey</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aga</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Janyuwari</month>
-							<month type="2">Februwari</month>
-							<month type="3">Matshi</month>
-							<month type="4">Epreli</month>
-							<month type="5">Meyi</month>
-							<month type="6">Juni</month>
-							<month type="7">Julayi</month>
-							<month type="8">Agasti</month>
-							<month type="9">Septemba</month>
-							<month type="10">Okthoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Caw</day>
-							<day type="mon">Mvu</day>
-							<day type="tue">Bin</day>
-							<day type="wed">Tha</day>
-							<day type="thu">Sin</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Mgq</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Cawe</day>
-							<day type="mon">Mvulo</day>
-							<day type="tue">Lwesibini</day>
-							<day type="wed">Lwesithathu</day>
-							<day type="thu">Lwesine</day>
-							<day type="fri">Lwesihlanu</day>
-							<day type="sat">Mgqibelo</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">Q1</quarter>
-							<quarter type="2">Q2</quarter>
-							<quarter type="3">Q3</quarter>
-							<quarter type="4">Q4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">1 unyangantathu</quarter>
-							<quarter type="2">2 unyangantathu</quarter>
-							<quarter type="3">3 unyangantathu</quarter>
-							<quarter type="4">4 unyangantathu</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraNames>
-						<era type="0">BC</era>
-						<era type="1">umnyaka wokuzalwa kukaYesu</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>ewe:e</yesstr>
-			<nostr>hayi:h</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/xh_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/xh_ZA.xml
deleted file mode 100644
index 83e46fa6e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/xh_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="xh"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/yo.xml b/airtime_mvc/library/Zend/Locale/Data/yo.xml
deleted file mode 100644
index 9e055d5bd..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/yo.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.37 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="yo"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">Ede Afrikani</language>
-			<language type="am">Ede Amharic</language>
-			<language type="ar">Ede Arabia</language>
-			<language type="as">Ti Assam</language>
-			<language type="az">Ede Azerbaijani</language>
-			<language type="be">Ede Belarusi</language>
-			<language type="bg">Ede Bulgaria</language>
-			<language type="bh">Ede Bihari</language>
-			<language type="bn">Ede Bengali</language>
-			<language type="br">Bretoni</language>
-			<language type="bs">Ede Bosnia</language>
-			<language type="ca">Ede Catala</language>
-			<language type="cs">Orile-ede Tseki</language>
-			<language type="cy">Ede Welshi</language>
-			<language type="da">Èdè Ilẹ̀ Denmark</language>
-			<language type="de">Èdè Ilẹ̀ Germany</language>
-			<language type="el">giriki</language>
-			<language type="en">Èdè Gẹ̀ẹ�sì</language>
-			<language type="eo">Ede Esperanto</language>
-			<language type="es">Panyan</language>
-			<language type="et">Ede Estonia</language>
-			<language type="eu">Ede Baski</language>
-			<language type="fa">Ede Persia</language>
-			<language type="fi">Finisi</language>
-			<language type="fil">Ede Tagalogi</language>
-			<language type="fo">Ede Faroesi</language>
-			<language type="fr">Èdè Faransé</language>
-			<language type="fy">Ede Frisia</language>
-			<language type="ga">Ede Ireland</language>
-			<language type="gd">Ede Gaelik ti Ilu Scotland</language>
-			<language type="gl">Ede Galicia</language>
-			<language type="gn">Guarani</language>
-			<language type="gu">Ede Gujarati</language>
-			<language type="he">Heberu</language>
-			<language type="hi">Ede Hindi</language>
-			<language type="hr">Ede Kroatia</language>
-			<language type="hu">Ede Hungaria</language>
-			<language type="hy">Ile Armenia</language>
-			<language type="ia">Ede pipo</language>
-			<language type="id">Ede Indonesia</language>
-			<language type="ie">Iru Ede</language>
-			<language type="is">Ede Icelandic</language>
-			<language type="it">Italiani</language>
-			<language type="ja">Japanisi</language>
-			<language type="jv">Ede Javana</language>
-			<language type="ka">Ede Georgia</language>
-			<language type="km">Cambodian</language>
-			<language type="kn">Ede Kannada</language>
-			<language type="ko">Korean</language>
-			<language type="ku">Kurdish</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">Ede Latini</language>
-			<language type="ln">Ta</language>
-			<language type="lo">ara Laos</language>
-			<language type="lt">Ede Lithuania</language>
-			<language type="lv">Ede Latvianu</language>
-			<language type="mk">Ede Macedonia</language>
-			<language type="ml">Ede Malayalami</language>
-			<language type="mn">ara Mangoli</language>
-			<language type="mr">Ede marathi</language>
-			<language type="ms">Ede Malaya</language>
-			<language type="mt">Ede Malta</language>
-			<language type="ne">Ede Nepali</language>
-			<language type="nl">Ede Dutch</language>
-			<language type="no">Ede Norway</language>
-			<language type="oc">Ede Occitani</language>
-			<language type="or">Oriya</language>
-			<language type="pa">Ede Punjabi</language>
-			<language type="pl">Èdè Ilẹ̀ Polandi</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">Ede Portugi</language>
-			<language type="pt_PT">Ede Portugal</language>
-			<language type="ro">Ede Romania</language>
-			<language type="ru">Ede Roosia</language>
-			<language type="sa">ede awon ara Indo</language>
-			<language type="sd">Sindhi</language>
-			<language type="sh">Serbo-Croatiani</language>
-			<language type="si">Ede Sinhalese</language>
-			<language type="sk">Ede Slovaki</language>
-			<language type="sl">Ede Slovenia</language>
-			<language type="so">ara Somalia</language>
-			<language type="sq">Ede Albania</language>
-			<language type="sr">Ede Serbia</language>
-			<language type="st">Sesoto</language>
-			<language type="su">Ede Sudani</language>
-			<language type="sv">suwidiisi</language>
-			<language type="sw">Ede Swahili</language>
-			<language type="ta">Ede Tamili</language>
-			<language type="te">Ede Telugu</language>
-			<language type="th">Ede Thai</language>
-			<language type="ti">Ede Tigrinya</language>
-			<language type="tk">Turkmen</language>
-			<language type="tlh">Ede Klingoni</language>
-			<language type="tr">Ede Turkey</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Ede Ukrani</language>
-			<language type="ur">Ede Urdu</language>
-			<language type="uz">Ede Uzbek</language>
-			<language type="vi">Ede Vietnamu</language>
-			<language type="xh">Ede Xhosa</language>
-			<language type="yi">Yiddishi</language>
-			<language type="yo">Yorùbá</language>
-			<language type="zu">Ede Zulu</language>
-		</languages>
-		<territories>
-			<territory type="BW">BW</territory>
-			<territory type="NG">NG</territory>
-			<territory type="TO">Tonga</territory>
-		</territories>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">Metric</measurementSystemName>
-			<measurementSystemName type="US">US</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a á à b d e é è ẹ {ẹ\u0301} {ẹ\u0300} f g {gb} h i í ì j-o ó ò � {�\u0301} {�\u0300} p r s ṣ t u ú ù w y]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[c q v x z]</exemplarCharacters>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Ṣẹ�rẹ�</month>
-							<month type="2">Èrèlè</month>
-							<month type="3">Ẹrẹ̀nà</month>
-							<month type="4">Ìgbé</month>
-							<month type="5">Ẹ̀bibi</month>
-							<month type="6">Òkúdu</month>
-							<month type="7">Agẹm�</month>
-							<month type="8">Ògún</month>
-							<month type="9">Owewe</month>
-							<month type="10">Ọ̀wàrà</month>
-							<month type="11">Bélú</month>
-							<month type="12">Ọ̀pẹ̀</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Oṣù Ṣẹ�rẹ�</month>
-							<month type="2">Oṣù Èrèlè</month>
-							<month type="3">Oṣù Ẹrẹ̀nà</month>
-							<month type="4">Oṣù Ìgbé</month>
-							<month type="5">Oṣù Ẹ̀bibi</month>
-							<month type="6">Oṣù Òkúdu</month>
-							<month type="7">Oṣù Agẹm�</month>
-							<month type="8">Oṣù Ògún</month>
-							<month type="9">Oṣù Owewe</month>
-							<month type="10">Oṣù Ọ̀wàrà</month>
-							<month type="11">Oṣù Bélú</month>
-							<month type="12">Oṣù Ọ̀pẹ̀</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Àìkú</day>
-							<day type="mon">Ajé</day>
-							<day type="tue">Ìsẹ�gun</day>
-							<day type="wed">Ọj��rú</day>
-							<day type="thu">Àṣẹ̀ṣẹ̀dáiyé</day>
-							<day type="fri">Ẹtì</day>
-							<day type="sat">Àbámẹ�ta</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Ọj�� Àìkú</day>
-							<day type="mon">Ọj�� Ajé</day>
-							<day type="tue">Ọj�� Ìsẹ�gun</day>
-							<day type="wed">Ọj��rú</day>
-							<day type="thu">Ọj�� Àṣẹ̀ṣẹ̀dáiyé</day>
-							<day type="fri">Ọj�� Ẹtì</day>
-							<day type="sat">Ọj�� Àbámẹ�ta</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<am>àár�̀</am>
-				<pm>�̀sán</pm>
-				<eras>
-					<eraNames>
-						<era type="0">Saju Kristi</era>
-						<era type="1">Lehin Kristi</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">SK</era>
-						<era type="1">LK</era>
-					</eraAbbr>
-				</eras>
-				<fields>
-					<field type="day">
-						<displayName>Ọj��</displayName>
-						<relative type="-3">íjẹrin</relative>
-						<relative type="-2">íjẹta</relative>
-						<relative type="-1">ànón</relative>
-						<relative type="0">�̀ní</relative>
-						<relative type="1">�̣̀la</relative>
-						<relative type="2">òtúùnla</relative>
-						<relative type="3">�j��mẹ�rin-òní</relative>
-					</field>
-				</fields>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Africa/​Lagos/​exemplarCity</exemplarCity>
-			</zone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="NGN">
-				<displayName>Naira</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/yo_NG.xml b/airtime_mvc/library/Zend/Locale/Data/yo_NG.xml
deleted file mode 100644
index 0fec9ea9d..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/yo_NG.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="yo"/>
-		<territory type="NG"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh.xml b/airtime_mvc/library/Zend/Locale/Data/zh.xml
deleted file mode 100644
index 3008513df..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh.xml
+++ /dev/null
@@ -1,4248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.164 $"/>
-		<generation date="$Date: 2009/06/19 20:09:12 $"/>
-		<language type="zh"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern>{0}（{1}）</localePattern>
-			<localeSeparator>�</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="aa">阿法文</language>
-			<language type="ab">阿布哈西亚文</language>
-			<language type="ace">亚�文</language>
-			<language type="ach">阿乔利文</language>
-			<language type="ada">阿当梅文</language>
-			<language type="ady">阿迪何文</language>
-			<language type="ae">阿维斯塔文</language>
-			<language type="af">���兰文</language>
-			<language type="afa">其他亚�语系</language>
-			<language type="afh">阿弗里希利文</language>
-			<language type="ain">阿伊努文</language>
-			<language type="ak">阿肯文</language>
-			<language type="akk">阿�德文</language>
-			<language type="ale">阿留申文</language>
-			<language type="alg">其他阿尔贡语系</language>
-			<language type="alt">�阿尔泰文</language>
-			<language type="am">阿姆哈拉文</language>
-			<language type="an">阿拉贡文</language>
-			<language type="ang">�英文</language>
-			<language type="anp">昂加语</language>
-			<language type="apa">阿帕切文</language>
-			<language type="ar">阿拉伯文</language>
-			<language type="arc">阿拉米文</language>
-			<language type="arn">阿劳�文</language>
-			<language type="arp">阿拉帕�文</language>
-			<language type="art">其他人工语系</language>
-			<language type="arw">阿拉瓦克文</language>
-			<language type="as">阿�姆文</language>
-			<language type="ast">阿斯图里亚�特文</language>
-			<language type="ath">阿�帕斯�语系</language>
-			<language type="aus">澳大利亚语系</language>
-			<language type="av">阿瓦尔文</language>
-			<language type="awa">阿瓦乔文</language>
-			<language type="ay">艾马拉文</language>
-			<language type="az">阿塞拜疆文</language>
-			<language type="ba">巴什客尔文</language>
-			<language type="bad">�达文</language>
-			<language type="bai">巴米累克语系</language>
-			<language type="bal">俾路支文</language>
-			<language type="ban">巴里文</language>
-			<language type="bas">巴�文</language>
-			<language type="bat">其他波罗的语系</language>
-			<language type="be">白俄罗斯文</language>
-			<language type="bej">别札文</language>
-			<language type="bem">别姆巴文</language>
-			<language type="ber">��尔文</language>
-			<language type="bg">�加利亚文</language>
-			<language type="bh">比哈尔文</language>
-			<language type="bho">��普尔文</language>
-			<language type="bi">比斯拉马文</language>
-			<language type="bik">毕库尔文</language>
-			<language type="bin">比尼文</language>
-			<language type="bla">�克��文</language>
-			<language type="bm">�巴拉文</language>
-			<language type="bn">孟加拉文</language>
-			<language type="bnt">�图文</language>
-			<language type="bo">�文</language>
-			<language type="br">布里多尼文</language>
-			<language type="bra">布拉�文</language>
-			<language type="bs">波斯尼亚文</language>
-			<language type="btk">巴塔克文</language>
-			<language type="bua">布里亚特文</language>
-			<language type="bug">布�文</language>
-			<language type="byn">布林文</language>
-			<language type="ca">加泰罗尼亚文</language>
-			<language type="cad">�多文</language>
-			<language type="cai">其他中美�第安语系</language>
-			<language type="car">巴勒比文</language>
-			<language type="cau">其他高加索语系</language>
-			<language type="cch">cch</language>
-			<language type="ce">车臣文</language>
-			<language type="ceb">宿务文</language>
-			<language type="cel">其他凯尔特语系</language>
-			<language type="ch">查莫罗文</language>
-			<language type="chb">契布�文</language>
-			<language type="chg">查加文</language>
-			<language type="chk">楚�克文</language>
-			<language type="chm">马里文</language>
-			<language type="chn">契努克文</language>
-			<language type="cho">乔克托文</language>
-			<language type="chp">佩瓦扬文</language>
-			<language type="chr">彻罗基文</language>
-			<language type="chy">�延文</language>
-			<language type="cmc">查米克文</language>
-			<language type="co">科西嘉文</language>
-			<language type="cop">科普特文</language>
-			<language type="cpe">其他以英文为基础的克里奥尔混�语系</language>
-			<language type="cpf">其他以法文为基础的克里奥尔混�语系</language>
-			<language type="cpp">其他以葡�牙文为基础的克里奥尔混�语系</language>
-			<language type="cr">克里�文</language>
-			<language type="crh">克里米亚土耳其文；克里米亚塔塔文</language>
-			<language type="crp">其他克里奥尔混�语系</language>
-			<language type="cs">�克文</language>
-			<language type="csb">�舒文</language>
-			<language type="cu">宗教斯拉夫文</language>
-			<language type="cus">其他库施特语系</language>
-			<language type="cv">楚瓦什文</language>
-			<language type="cy">�尔士文</language>
-			<language type="da">丹麦文</language>
-			<language type="dak">达科他文</language>
-			<language type="dar">达尔格瓦文</language>
-			<language type="day">达雅克文</language>
-			<language type="de">å¾·æ–‡</language>
-			<language type="de_AT">奥地利德语</language>
-			<language type="de_CH">高地德文 (瑞士)</language>
-			<language type="del">特拉�文</language>
-			<language type="den">�雷夫文</language>
-			<language type="dgr">多格里布文</language>
-			<language type="din">��文</language>
-			<language type="doi">多格拉文</language>
-			<language type="dra">其他德拉维语系</language>
-			<language type="dsb">下索布文</language>
-			<language type="dua">都阿拉文</language>
-			<language type="dum">中��兰文</language>
-			<language type="dv">迪维希文</language>
-			<language type="dyu">迪尤拉文</language>
-			<language type="dz">�丹文</language>
-			<language type="ee">埃维文</language>
-			<language type="efi">埃�克文</language>
-			<language type="egy">�埃�文</language>
-			<language type="eka">埃克丘克文</language>
-			<language type="el">希腊文</language>
-			<language type="elx">艾拉米特文</language>
-			<language type="en">英文</language>
-			<language type="en_AU">英语（澳大利亚）</language>
-			<language type="en_CA">加拿大英语</language>
-			<language type="en_GB">英语（英国）</language>
-			<language type="en_US">英语（美国）</language>
-			<language type="enm">中�英文</language>
-			<language type="eo">世界文</language>
-			<language type="es">西�牙文</language>
-			<language type="es_419">拉�美洲西�牙语</language>
-			<language type="es_ES">西�牙语（伊比利亚）</language>
-			<language type="et">爱沙尼亚文</language>
-			<language type="eu">巴斯克文</language>
-			<language type="ewo">旺�文</language>
-			<language type="fa">波斯文</language>
-			<language type="fan">芳格文</language>
-			<language type="fat">芳蒂文</language>
-			<language type="ff">夫拉文</language>
-			<language type="fi">芬兰文</language>
-			<language type="fil">�律宾文</language>
-			<language type="fiu">其他芬兰乌戈尔语系</language>
-			<language type="fj">�济文</language>
-			<language type="fo">法罗文</language>
-			<language type="fon">丰文</language>
-			<language type="fr">法文</language>
-			<language type="fr_CA">加拿大法语</language>
-			<language type="fr_CH">瑞士法语</language>
-			<language type="frm">中�法文</language>
-			<language type="fro">�法文</language>
-			<language type="frr">北弗里西亚语</language>
-			<language type="frs">东弗里西亚文</language>
-			<language type="fur">弗留利文</language>
-			<language type="fy">弗里斯兰文</language>
-			<language type="ga">爱尔兰文</language>
-			<language type="gaa">加文</language>
-			<language type="gay">迦约文</language>
-			<language type="gba">葛巴亚文</language>
-			<language type="gd">�格兰盖尔文</language>
-			<language type="gem">其他日尔曼语系</language>
-			<language type="gez">�兹文</language>
-			<language type="gil">�尔伯特斯文</language>
-			<language type="gl">加利西亚文</language>
-			<language type="gmh">中�高地德文</language>
-			<language type="gn">瓜拉尼文</language>
-			<language type="goh">�高地德文</language>
-			<language type="gon">å²—å¾·æ–‡</language>
-			<language type="gor">科洛涅达罗文</language>
-			<language type="got">哥特文</language>
-			<language type="grb">格列�文</language>
-			<language type="grc">�希腊文</language>
-			<language type="gsw">瑞士德文</language>
-			<language type="gu">�加拉�文</language>
-			<language type="gv">马�岛文</language>
-			<language type="gwi">�维克�文</language>
-			<language type="ha">豪撒文</language>
-			<language type="hai">海达文</language>
-			<language type="haw">��夷文</language>
-			<language type="he">希伯�文</language>
-			<language type="hi">�地文</language>
-			<language type="hil">希利盖农文</language>
-			<language type="him">赫马查利文</language>
-			<language type="hit">赫梯文</language>
-			<language type="hmn">赫蒙文</language>
-			<language type="ho">希里莫图文</language>
-			<language type="hr">克罗地亚文</language>
-			<language type="hsb">上索布文</language>
-			<language type="ht">海地文</language>
-			<language type="hu">匈牙利文</language>
-			<language type="hup">胡帕文</language>
-			<language type="hy">亚美尼亚文</language>
-			<language type="hz">赫雷罗文</language>
-			<language type="ia">国际语</language>
-			<language type="iba">伊�文</language>
-			<language type="id">�度尼西亚文</language>
-			<language type="ie">国际语E</language>
-			<language type="ig">伊格�文</language>
-			<language type="ii">四��</language>
-			<language type="ijo">伊乔文</language>
-			<language type="ik">�奴皮维克文</language>
-			<language type="ilo">伊洛干诺文</language>
-			<language type="inc">其他�度语系</language>
-			<language type="ine">其他�欧语系</language>
-			<language type="inh">��什文</language>
-			<language type="io">伊多文</language>
-			<language type="ira">伊朗文</language>
-			<language type="iro">伊洛�语系</language>
-			<language type="is">冰岛文</language>
-			<language type="it">�大利文</language>
-			<language type="iu">伊努伊特文</language>
-			<language type="ja">日文</language>
-			<language type="jbo">逻辑文</language>
-			<language type="jpr">犹太波斯文</language>
-			<language type="jrb">犹太阿拉伯文</language>
-			<language type="jv">爪哇文</language>
-			<language type="ka">格��亚文</language>
-			<language type="kaa">�拉�尔帕克文</language>
-			<language type="kab">�比尔文</language>
-			<language type="kac">��文</language>
-			<language type="kaj">kaj</language>
-			<language type="kam">�姆巴文</language>
-			<language type="kar">喀伦文</language>
-			<language type="kaw">��文</language>
-			<language type="kbd">�巴尔达文</language>
-			<language type="kcg">kcg</language>
-			<language type="kfo">科罗语</language>
-			<language type="kg">刚果文</language>
-			<language type="kha">�西文</language>
-			<language type="khi">其他科伊桑语系</language>
-			<language type="kho">和田文</language>
-			<language type="ki">�库尤文</language>
-			<language type="kj">宽亚玛文</language>
-			<language type="kk">哈�克文</language>
-			<language type="kl">格陵兰文</language>
-			<language type="km">柬埔寨文</language>
-			<language type="kmb">金邦�文</language>
-			<language type="kn">�纳达文</language>
-			<language type="ko">韩文</language>
-			<language type="kok">刚�尼文</language>
-			<language type="kos">科斯拉伊文</language>
-			<language type="kpe">克佩列文</language>
-			<language type="kr">�努里文</language>
-			<language type="krc">�拉�伊巴尔�尔文</language>
-			<language type="krl">�累利阿文</language>
-			<language type="kro">克�文</language>
-			<language type="kru">库�克文</language>
-			<language type="ks">克什米尔文</language>
-			<language type="ku">库尔德文</language>
-			<language type="kum">库梅克文</language>
-			<language type="kut">库特内文</language>
-			<language type="kv">科米文</language>
-			<language type="kw">凯尔特文</language>
-			<language type="ky">�尔�斯文</language>
-			<language type="la">拉�文</language>
-			<language type="lad">拉迪诺文</language>
-			<language type="lah">拉亨达文</language>
-			<language type="lam">å…°å·´æ–‡</language>
-			<language type="lb">�森堡文</language>
-			<language type="lez">莱兹�昂文</language>
-			<language type="lg">�干达文</language>
-			<language type="li">淋布尔�文</language>
-			<language type="ln">林加拉文</language>
-			<language type="lo">��文</language>
-			<language type="lol">芒戈文</language>
-			<language type="loz">洛兹文</language>
-			<language type="lt">立陶宛文</language>
-			<language type="lu">�巴加丹加文</language>
-			<language type="lua">�巴�瓦文</language>
-			<language type="lui">路易塞诺文</language>
-			<language type="lun">隆达文</language>
-			<language type="luo">�奥文</language>
-			<language type="lus">�晒文</language>
-			<language type="lv">拉脱维亚文</language>
-			<language type="mad">马都拉文</language>
-			<language type="mag">马加伊文</language>
-			<language type="mai">迈蒂利文</language>
-			<language type="mak">望加锡文</language>
-			<language type="man">曼�哥文</language>
-			<language type="map">澳斯特罗尼西亚语系</language>
-			<language type="mas">�伊语</language>
-			<language type="mdf">莫克沙文</language>
-			<language type="mdr">曼达尔</language>
-			<language type="men">门迪文</language>
-			<language type="mg">马尔加什文</language>
-			<language type="mga">中�爱尔兰文</language>
-			<language type="mh">马�尔文</language>
-			<language type="mi">毛利文</language>
-			<language type="mic">米克马克文</language>
-			<language type="min">米���文</language>
-			<language type="mis">����语系</language>
-			<language type="mk">马其顿文</language>
-			<language type="mkh">其他孟高棉语系</language>
-			<language type="ml">马�亚拉姆文</language>
-			<language type="mn">蒙�文</language>
-			<language type="mnc">满文</language>
-			<language type="mni">曼尼普里文</language>
-			<language type="mno">马诺�语系</language>
-			<language type="mo">摩尔多瓦文</language>
-			<language type="moh">摩�克文</language>
-			<language type="mos">莫西文</language>
-			<language type="mr">马拉地文</language>
-			<language type="ms">马�文</language>
-			<language type="mt">马耳他文</language>
-			<language type="mul">多�语系</language>
-			<language type="mun">蒙达语系</language>
-			<language type="mus">克里克文</language>
-			<language type="mwl">米兰德斯文</language>
-			<language type="mwr">马尔瓦利文</language>
-			<language type="my">缅甸文</language>
-			<language type="myn">玛雅语系</language>
-			<language type="myv">俄日亚文</language>
-			<language type="na">瑙�文</language>
-			<language type="nah">纳瓦特尔文</language>
-			<language type="nai">其他北美�第安语系</language>
-			<language type="nap">拿波里文</language>
-			<language type="nb">挪��克马尔文</language>
-			<language type="nd">北�德�勒文</language>
-			<language type="nds">低地德文；低地撒克逊文</language>
-			<language type="ne">尼泊尔文</language>
-			<language type="new">尼瓦尔文</language>
-			<language type="ng">�东加文</language>
-			<language type="nia">尼亚斯文</language>
-			<language type="nic">其他尼日尔科尔多凡语系</language>
-			<language type="niu">纽埃文</language>
-			<language type="nl">�兰文</language>
-			<language type="nl_BE">弗拉芒语</language>
-			<language type="nn">挪�尼诺斯克文</language>
-			<language type="no">挪�文</language>
-			<language type="nog">诺盖文</language>
-			<language type="non">�诺尔斯文</language>
-			<language type="nqo">西�书�语言</language>
-			<language type="nr">�部�德�勒文</language>
-			<language type="nso">北索托文</language>
-			<language type="nub">努比亚语系</language>
-			<language type="nv">纳瓦�文</language>
-			<language type="nwc">尼瓦尔文 Classical Newari</language>
-			<language type="ny">尼扬贾文；�切瓦文；切瓦文</language>
-			<language type="nym">尼亚姆韦�文</language>
-			<language type="nyn">尼昂科勒文</language>
-			<language type="nyo">尼约罗文</language>
-			<language type="nzi">�济马文</language>
-			<language type="oc">奥克西�语</language>
-			<language type="oj">奥�布瓦文</language>
-			<language type="om">奥洛莫文</language>
-			<language type="or">欧里亚文</language>
-			<language type="os">奥塞梯文</language>
-			<language type="osa">奥�格文</language>
-			<language type="ota">奥托曼土耳其文</language>
-			<language type="oto">奥托米语系</language>
-			<language type="pa">��普文</language>
-			<language type="paa">其他巴布亚文</language>
-			<language type="pag">邦阿西楠语</language>
-			<language type="pal">帕拉维文</language>
-			<language type="pam">邦�牙文</language>
-			<language type="pap">帕皮亚门托文</language>
-			<language type="pau">帕劳文</language>
-			<language type="peo">��波斯语</language>
-			<language type="phi">其他�律宾语系</language>
-			<language type="phn">腓尼基文</language>
-			<language type="pi">巴利文</language>
-			<language type="pl">波兰文</language>
-			<language type="pon">波纳佩文</language>
-			<language type="pra">普拉克里特诸语言</language>
-			<language type="pro">普罗文斯文</language>
-			<language type="ps">普什图文</language>
-			<language type="pt">葡�牙文</language>
-			<language type="pt_BR">葡�牙语（巴西）</language>
-			<language type="pt_PT">�伯利亚葡�牙文</language>
-			<language type="qu">盖丘亚文</language>
-			<language type="raj">拉贾斯�文</language>
-			<language type="rap">拉帕努伊文</language>
-			<language type="rar">拉罗汤加文</language>
-			<language type="rm">列托�罗曼文</language>
-			<language type="rn">基隆迪文</language>
-			<language type="ro">罗马尼亚文</language>
-			<language type="roa">其他拉�语系</language>
-			<language type="rom">�普赛文</language>
-			<language type="root">根语言</language>
-			<language type="ru">ä¿„æ–‡</language>
-			<language type="rup">亚美尼亚语</language>
-			<language type="rw">�旺达文</language>
-			<language type="sa">梵文</language>
-			<language type="sad">散达维文</language>
-			<language type="sah">雅库特文</language>
-			<language type="sai">其他�美�第安文</language>
-			<language type="sal">�利什文</language>
-			<language type="sam">�玛利亚文</language>
-			<language type="sas">��克文</language>
-			<language type="sat">桑塔利文</language>
-			<language type="sc">��文</language>
-			<language type="scn">西西里文</language>
-			<language type="sco">�格兰文</language>
-			<language type="sd">ä¿¡å¾·æ–‡</language>
-			<language type="se">北�米文</language>
-			<language type="sel">塞尔库普文</language>
-			<language type="sem">其他闪�语系</language>
-			<language type="sg">桑戈文</language>
-			<language type="sga">�爱尔兰文</language>
-			<language type="sgn">手语</language>
-			<language type="sh">塞尔维亚-克罗地亚文</language>
-			<language type="shn">掸文</language>
-			<language type="si">僧伽罗文</language>
-			<language type="sid">悉达摩文</language>
-			<language type="sio">�语诸语言</language>
-			<language type="sit">其他汉�语系</language>
-			<language type="sk">斯洛�克文</language>
-			<language type="sl">斯洛文尼亚文</language>
-			<language type="sla">其他斯拉夫语系</language>
-			<language type="sm">�摩亚文</language>
-			<language type="sma">��米文</language>
-			<language type="smi">其他�米文</language>
-			<language type="smj">律勒欧�莫斯语</language>
-			<language type="smn">伊纳里�米语</language>
-			<language type="sms">斯科特�米文</language>
-			<language type="sn">�纳文</language>
-			<language type="snk">索尼基文</language>
-			<language type="so">索马里文</language>
-			<language type="sog">�粟特语</language>
-			<language type="son">æ¡‘æµ·æ–‡</language>
-			<language type="sq">阿尔巴尼亚文</language>
-			<language type="sr">塞尔维亚文</language>
-			<language type="srn">Sranan Tongo（�于克里奥尔语）</language>
-			<language type="srr">谢列尔文</language>
-			<language type="ss">斯瓦特文</language>
-			<language type="ssa">�洲撒哈拉沙漠边缘地带语言</language>
-			<language type="st">塞索托文</language>
-			<language type="su">巽他语</language>
-			<language type="suk">�库马文</language>
-			<language type="sus">��文</language>
-			<language type="sux">�马文</language>
-			<language type="sv">瑞典文</language>
-			<language type="sw">斯瓦希里文</language>
-			<language type="syr">�利亚文</language>
-			<language type="ta">泰米尔文</language>
-			<language type="tai">傣语诸语言（其他）</language>
-			<language type="te">泰�固文</language>
-			<language type="tem">滕内语</language>
-			<language type="ter">特列纳文</language>
-			<language type="tet">特塔姆文</language>
-			<language type="tg">塔�克文</language>
-			<language type="th">æ³°æ–‡</language>
-			<language type="ti">�格里尼亚文</language>
-			<language type="tig">�格雷文</language>
-			<language type="tiv">蒂夫文</language>
-			<language type="tk">土库曼文</language>
-			<language type="tkl">托克劳文</language>
-			<language type="tl">塔加洛语</language>
-			<language type="tlh">å…‹æž—è´¡æ–‡</language>
-			<language type="tli">特林�特文</language>
-			<language type="tmh">塔马奇克文</language>
-			<language type="tn">塞茨瓦纳文</language>
-			<language type="to">汤加文</language>
-			<language type="tog">汤加文（尼亚�地区）</language>
-			<language type="tpi">托克皮辛文</language>
-			<language type="tr">土耳其文</language>
-			<language type="ts">宗加文</language>
-			<language type="tsi">蒂姆西亚文</language>
-			<language type="tt">塔塔尔文</language>
-			<language type="tum">通布�文</language>
-			<language type="tup">图皮语系</language>
-			<language type="tut">阿尔泰诸语言（其他）</language>
-			<language type="tvl">图瓦�文</language>
-			<language type="tw">特�文</language>
-			<language type="ty">塔西�文</language>
-			<language type="tyv">图瓦文</language>
-			<language type="udm">乌德穆尔特文</language>
-			<language type="ug">维�尔文</language>
-			<language type="uga">乌加里特文</language>
-			<language type="uk">乌克兰文</language>
-			<language type="umb">�本�文</language>
-			<language type="und">未定语�</language>
-			<language type="ur">乌尔都文</language>
-			<language type="uz">乌兹别克文</language>
-			<language type="vai">瓦伊文</language>
-			<language type="ve">文达文</language>
-			<language type="vi">越�文</language>
-			<language type="vo">沃拉普克文</language>
-			<language type="vot">沃�克文</language>
-			<language type="wa">瓦隆文</language>
-			<language type="wak">瓦�什诸语言</language>
-			<language type="wal">瓦拉莫文</language>
-			<language type="war">瓦赖文</language>
-			<language type="was">瓦�文</language>
-			<language type="wen">索布诸语言</language>
-			<language type="wo">沃洛夫文</language>
-			<language type="xal">�尔梅克文</language>
-			<language type="xh">科�文</language>
-			<language type="yao">瑶�文</language>
-			<language type="yap">雅浦文</language>
-			<language type="yi">�地文</language>
-			<language type="yo">约�巴文</language>
-			<language type="ypk">尤皮克诸语言</language>
-			<language type="za">壮语</language>
-			<language type="zap">�波蒂克文</language>
-			<language type="zen">泽纳加文</language>
-			<language type="zh">中文</language>
-			<language type="zh_Hans">中文（简体）</language>
-			<language type="zh_Hant">中文（�体）</language>
-			<language type="znd">赞德文</language>
-			<language type="zu">祖�文</language>
-			<language type="zun">祖尼语</language>
-			<language type="zxx">无语言内容</language>
-			<language type="zza">扎扎文</language>
-		</languages>
-		<scripts>
-			<script type="Arab">阿拉伯语</script>
-			<script type="Armn">亚美尼亚语</script>
-			<script type="Bali">巴厘语</script>
-			<script type="Batk">巴塔克语</script>
-			<script type="Beng">孟加拉语</script>
-			<script type="Blis">布列斯符�</script>
-			<script type="Bopo">汉语拼音</script>
-			<script type="Brah">婆罗米文字</script>
-			<script type="Brai">布莱�盲文</script>
-			<script type="Bugi">布�语</script>
-			<script type="Buhd">布希德语</script>
-			<script type="Cans">加拿大土著统一符�语</script>
-			<script type="Cari">�里亚语</script>
-			<script type="Cham">�语</script>
-			<script type="Cher">切罗基语</script>
-			<script type="Cirt">色斯文</script>
-			<script type="Copt">克普特语</script>
-			<script type="Cprt">塞浦路斯语</script>
-			<script type="Cyrl">西里尔语</script>
-			<script type="Cyrs">西里尔文字（�教会斯拉夫语的�体）</script>
-			<script type="Deva">梵文</script>
-			<script type="Dsrt">德塞莱特文</script>
-			<script type="Egyd">�期埃�语</script>
-			<script type="Egyh">�埃�僧侣书写体</script>
-			<script type="Egyp">�埃�象形文</script>
-			<script type="Ethi">埃塞俄比亚语</script>
-			<script type="Geok">格��亚语文字 (Asomtavruli and Nuskhuri)</script>
-			<script type="Geor">格��亚语</script>
-			<script type="Glag">格拉哥里语</script>
-			<script type="Goth">哥特语</script>
-			<script type="Grek">希腊语</script>
-			<script type="Gujr">��拉特语</script>
-			<script type="Guru">果�穆奇语</script>
-			<script type="Hang">韩文</script>
-			<script type="Hani">汉语</script>
-			<script type="Hano">汉奴罗语</script>
-			<script type="Hans">简体中文</script>
-			<script type="Hant">�体中文</script>
-			<script type="Hebr">希伯�语</script>
-			<script type="Hira">平��</script>
-			<script type="Hmng">��录苗文</script>
-			<script type="Hrkt">片��或平��</script>
-			<script type="Hung">�匈牙利语</script>
-			<script type="Inds">�希腊哈拉潘</script>
-			<script type="Ital">��大利语</script>
-			<script type="Java">爪哇语</script>
-			<script type="Jpan">日语</script>
-			<script type="Kali">克耶�文字</script>
-			<script type="Kana">片��</script>
-			<script type="Khar">�罗须�文</script>
-			<script type="Khmr">高棉语</script>
-			<script type="Knda">�纳塔克语</script>
-			<script type="Kore">韩语</script>
-			<script type="Lana">兰拿语</script>
-			<script type="Laoo">��语</script>
-			<script type="Latf">拉�文（哥特�字体�体）</script>
-			<script type="Latg">拉�文（盖尔语�体）</script>
-			<script type="Latn">拉�语</script>
-			<script type="Lepc">雷布查语</script>
-			<script type="Limb">林布语</script>
-			<script type="Lina">线形文字 A</script>
-			<script type="Linb">线形文字 B</script>
-			<script type="Lyci">利西亚语</script>
-			<script type="Lydi">�底亚语</script>
-			<script type="Mand">阿拉米语</script>
-			<script type="Maya">玛雅圣符文</script>
-			<script type="Mero">麦若�克文</script>
-			<script type="Mlym">马拉亚拉姆语</script>
-			<script type="Mong">蒙�语</script>
-			<script type="Moon">韩文语系</script>
-			<script type="Mtei">曼尼普尔语</script>
-			<script type="Mymr">缅甸</script>
-			<script type="Nkoo">N’Ko（西�书�语言）</script>
-			<script type="Ogam">欧甘语</script>
-			<script type="Olck">桑塔利语</script>
-			<script type="Orkh">鄂尔浑文</script>
-			<script type="Orya">奥里亚语</script>
-			<script type="Osma">奥斯曼亚语</script>
-			<script type="Perm">�彼尔姆诸语</script>
-			<script type="Phag">八�巴文</script>
-			<script type="Phnx">腓尼基语</script>
-			<script type="Plrd">波拉德音标文字</script>
-			<script type="Qaai">�传学术语</script>
-			<script type="Rjng">拉让语</script>
-			<script type="Roro">朗格朗格文</script>
-			<script type="Runr">�代北欧文</script>
-			<script type="Sara">沙拉堤文</script>
-			<script type="Saur">索拉什特拉语</script>
-			<script type="Sgnw">书写符�</script>
-			<script type="Shaw">�伯纳�语</script>
-			<script type="Sinh">辛哈拉语</script>
-			<script type="Sund">巽他文</script>
-			<script type="Sylo">Syloti Nagri 书写体</script>
-			<script type="Syrc">�利亚语</script>
-			<script type="Syre">�音体�利亚文</script>
-			<script type="Syrj">西�利亚语</script>
-			<script type="Syrn">东�利亚语</script>
-			<script type="Tagb">塔格�瓦语</script>
-			<script type="Tale">泰�语</script>
-			<script type="Talu">新傣文</script>
-			<script type="Taml">泰米尔语</script>
-			<script type="Telu">泰�固语</script>
-			<script type="Teng">腾格瓦文字</script>
-			<script type="Tfng">��纳文</script>
-			<script type="Tglg">塔加路语</script>
-			<script type="Thaa">塔安娜语</script>
-			<script type="Thai">泰语</script>
-			<script type="Tibt">�语</script>
-			<script type="Ugar">乌加里特语</script>
-			<script type="Vaii">瓦�语</script>
-			<script type="Visp">��语言</script>
-			<script type="Xpeo">�波斯语</script>
-			<script type="Xsux">�美尔-阿�德楔形文字</script>
-			<script type="Yiii">�语</script>
-			<script type="Zxxx">撤销写入</script>
-			<script type="Zyyy">通用</script>
-			<script type="Zzzz">脚本未知或者无效</script>
-		</scripts>
-		<territories>
-			<territory type="001">世界</territory>
-			<territory type="002">�洲</territory>
-			<territory type="003">北美洲</territory>
-			<territory type="005">�美洲</territory>
-			<territory type="009">大洋洲</territory>
-			<territory type="011">西�</territory>
-			<territory type="013">中美洲</territory>
-			<territory type="014">东�</territory>
-			<territory type="015">北�</territory>
-			<territory type="017">中�</territory>
-			<territory type="018">�部�洲</territory>
-			<territory type="019">美洲</territory>
-			<territory type="021">美洲北部</territory>
-			<territory type="029">加勒比海</territory>
-			<territory type="030">东亚</territory>
-			<territory type="034">�亚</territory>
-			<territory type="035">东�亚</territory>
-			<territory type="039">�欧</territory>
-			<territory type="053">澳大利亚和新西兰</territory>
-			<territory type="054">美拉尼西亚</territory>
-			<territory type="057">密克罗尼西亚</territory>
-			<territory type="061">玻利尼西亚</territory>
-			<territory type="062">中�亚</territory>
-			<territory type="142">亚洲</territory>
-			<territory type="143">中亚</territory>
-			<territory type="145">西亚</territory>
-			<territory type="150">欧洲</territory>
-			<territory type="151">东欧</territory>
-			<territory type="154">北欧</territory>
-			<territory type="155">西欧</territory>
-			<territory type="172">独�体</territory>
-			<territory type="419">拉�美洲和加勒比海</territory>
-			<territory type="830">海峡群岛</territory>
-			<territory type="AD">安�尔</territory>
-			<territory type="AE">阿拉伯��酋长国</territory>
-			<territory type="AF">阿富汗</territory>
-			<territory type="AG">安�瓜和巴布达</territory>
-			<territory type="AI">安圭拉</territory>
-			<territory type="AL">阿尔巴尼亚</territory>
-			<territory type="AM">亚美尼亚</territory>
-			<territory type="AN">�属安的列斯群岛</territory>
-			<territory type="AO">安哥拉</territory>
-			<territory type="AQ">��洲</territory>
-			<territory type="AR">阿根廷</territory>
-			<territory type="AS">美属�摩亚</territory>
-			<territory type="AT">奥地利</territory>
-			<territory type="AU">澳大利亚</territory>
-			<territory type="AW">阿�巴</territory>
-			<territory type="AX">奥兰群岛</territory>
-			<territory type="AZ">阿塞拜疆</territory>
-			<territory type="BA">波斯尼亚和黑塞哥维那</territory>
-			<territory type="BB">巴巴多斯</territory>
-			<territory type="BD">孟加拉国</territory>
-			<territory type="BE">比利时</territory>
-			<territory type="BF">布基纳法索</territory>
-			<territory type="BG">�加利亚</territory>
-			<territory type="BH">å·´æž—</territory>
-			<territory type="BI">布隆迪</territory>
-			<territory type="BJ">��</territory>
-			<territory type="BL">圣巴泰勒米</territory>
-			<territory type="BM">百慕大</territory>
-			<territory type="BN">文莱</territory>
-			<territory type="BO">玻利维亚</territory>
-			<territory type="BR">巴西</territory>
-			<territory type="BS">巴哈马</territory>
-			<territory type="BT">�丹</territory>
-			<territory type="BV">布维特岛</territory>
-			<territory type="BW">�茨瓦纳</territory>
-			<territory type="BY">白俄罗斯</territory>
-			<territory type="BZ">伯利兹</territory>
-			<territory type="CA">加拿大</territory>
-			<territory type="CC">科科斯群岛</territory>
-			<territory type="CD">刚果（金）</territory>
-			<territory type="CF">中�共和国</territory>
-			<territory type="CG">刚果（布）</territory>
-			<territory type="CH">瑞士</territory>
-			<territory type="CI">象牙海岸</territory>
-			<territory type="CK">库克群岛</territory>
-			<territory type="CL">智利</territory>
-			<territory type="CM">喀麦隆</territory>
-			<territory type="CN">中国</territory>
-			<territory type="CO">哥伦比亚</territory>
-			<territory type="CR">哥斯达黎加</territory>
-			<territory type="CS">塞尔维亚和黑山</territory>
-			<territory type="CU">�巴</territory>
-			<territory type="CV">佛得角</territory>
-			<territory type="CX">圣诞岛</territory>
-			<territory type="CY">塞浦路斯</territory>
-			<territory type="CZ">�克共和国</territory>
-			<territory type="DE">德国</territory>
-			<territory type="DJ">�布�</territory>
-			<territory type="DK">丹麦</territory>
-			<territory type="DM">多米尼加</territory>
-			<territory type="DO">多米尼加共和国</territory>
-			<territory type="DZ">阿尔�利亚</territory>
-			<territory type="EC">厄瓜多尔</territory>
-			<territory type="EE">爱沙尼亚</territory>
-			<territory type="EG">埃�</territory>
-			<territory type="EH">西撒哈拉</territory>
-			<territory type="ER">厄立特里亚</territory>
-			<territory type="ES">西�牙</territory>
-			<territory type="ET">埃塞俄比亚</territory>
-			<territory type="FI">芬兰</territory>
-			<territory type="FJ">�济</territory>
-			<territory type="FK">�克兰群岛</territory>
-			<territory type="FM">密克罗尼西亚�邦</territory>
-			<territory type="FO">法罗群岛</territory>
-			<territory type="FR">法国</territory>
-			<territory type="GA">加蓬</territory>
-			<territory type="GB">英国</territory>
-			<territory type="GD">格林纳达</territory>
-			<territory type="GE">格��亚</territory>
-			<territory type="GF">法属圭亚那</territory>
-			<territory type="GG">格�西岛</territory>
-			<territory type="GH">加纳</territory>
-			<territory type="GI">直布罗陀</territory>
-			<territory type="GL">格陵兰</territory>
-			<territory type="GM">冈比亚</territory>
-			<territory type="GN">几内亚</territory>
-			<territory type="GP">瓜德罗普岛</territory>
-			<territory type="GQ">赤�几内亚</territory>
-			<territory type="GR">希腊</territory>
-			<territory type="GS">�乔治亚岛和�桑��群岛</territory>
-			<territory type="GT">�地马拉</territory>
-			<territory type="GU">关岛</territory>
-			<territory type="GW">几内亚比�</territory>
-			<territory type="GY">圭亚那</territory>
-			<territory type="HK">中国香港特别行政区</territory>
-			<territory type="HM">赫德与麦克�纳群岛</territory>
-			<territory type="HN">洪都拉斯</territory>
-			<territory type="HR">克罗地亚</territory>
-			<territory type="HT">海地</territory>
-			<territory type="HU">匈牙利</territory>
-			<territory type="ID">�度尼西亚</territory>
-			<territory type="IE">爱尔兰</territory>
-			<territory type="IL">以色列</territory>
-			<territory type="IM">曼岛</territory>
-			<territory type="IN">�度</territory>
-			<territory type="IO">英属�度洋领地</territory>
-			<territory type="IQ">伊拉克</territory>
-			<territory type="IR">伊朗</territory>
-			<territory type="IS">冰岛</territory>
-			<territory type="IT">�大利</territory>
-			<territory type="JE">泽西岛</territory>
-			<territory type="JM">牙买加</territory>
-			<territory type="JO">约旦</territory>
-			<territory type="JP">日本</territory>
-			<territory type="KE">肯尼亚</territory>
-			<territory type="KG">�尔�斯斯�</territory>
-			<territory type="KH">柬埔寨</territory>
-			<territory type="KI">基里巴斯</territory>
-			<territory type="KM">科摩罗</territory>
-			<territory type="KN">圣基茨和尼维斯</territory>
-			<territory type="KP">�鲜</territory>
-			<territory type="KR">韩国</territory>
-			<territory type="KW">科�特</territory>
-			<territory type="KY">开曼群岛</territory>
-			<territory type="KZ">哈�克斯�</territory>
-			<territory type="LA">��人民民主共和国</territory>
-			<territory type="LB">黎巴嫩</territory>
-			<territory type="LC">圣�西亚</territory>
-			<territory type="LI">列支敦士登</territory>
-			<territory type="LK">斯里兰�</territory>
-			<territory type="LR">利比里亚</territory>
-			<territory type="LS">莱索托</territory>
-			<territory type="LT">立陶宛</territory>
-			<territory type="LU">�森堡</territory>
-			<territory type="LV">拉脱维亚</territory>
-			<territory type="LY">利比亚</territory>
-			<territory type="MA">摩洛哥</territory>
-			<territory type="MC">摩纳哥</territory>
-			<territory type="MD">摩尔多瓦</territory>
-			<territory type="ME">黑山共和国</territory>
-			<territory type="MF">圣马�</territory>
-			<territory type="MG">马达加斯加</territory>
-			<territory type="MH">马�尔群岛</territory>
-			<territory type="MK">马其顿</territory>
-			<territory type="ML">马里</territory>
-			<territory type="MM">缅甸</territory>
-			<territory type="MN">蒙�</territory>
-			<territory type="MO">中国澳门特别行政区</territory>
-			<territory type="MP">北马里亚纳群岛</territory>
-			<territory type="MQ">马�尼克群岛</territory>
-			<territory type="MR">毛里塔尼亚</territory>
-			<territory type="MS">蒙塞拉特群岛</territory>
-			<territory type="MT">马耳他</territory>
-			<territory type="MU">毛里求斯</territory>
-			<territory type="MV">马尔代夫</territory>
-			<territory type="MW">马拉维</territory>
-			<territory type="MX">墨西哥</territory>
-			<territory type="MY">马�西亚</territory>
-			<territory type="MZ">莫桑比克</territory>
-			<territory type="NA">纳米比亚</territory>
-			<territory type="NC">新喀里多尼亚</territory>
-			<territory type="NE">尼日尔</territory>
-			<territory type="NF">诺�克岛</territory>
-			<territory type="NG">尼日利亚</territory>
-			<territory type="NI">尼加拉瓜</territory>
-			<territory type="NL">�兰</territory>
-			<territory type="NO">挪�</territory>
-			<territory type="NP">尼泊尔</territory>
-			<territory type="NR">瑙�</territory>
-			<territory type="NU">纽埃</territory>
-			<territory type="NZ">新西兰</territory>
-			<territory type="OM">阿曼</territory>
-			<territory type="PA">巴拿马</territory>
-			<territory type="PE">秘�</territory>
-			<territory type="PF">法属波利尼西亚</territory>
-			<territory type="PG">巴布亚新几内亚</territory>
-			<territory type="PH">�律宾</territory>
-			<territory type="PK">巴基斯�</territory>
-			<territory type="PL">波兰</territory>
-			<territory type="PM">圣皮埃尔和密克隆</territory>
-			<territory type="PN">皮特凯�</territory>
-			<territory type="PR">波多黎�</territory>
-			<territory type="PS">巴勒斯�领土</territory>
-			<territory type="PT">葡�牙</territory>
-			<territory type="PW">帕劳</territory>
-			<territory type="PY">巴拉圭</territory>
-			<territory type="QA">�塔尔</territory>
-			<territory type="QO">大洋洲边远群岛</territory>
-			<territory type="QU">欧盟</territory>
-			<territory type="RE">留尼汪</territory>
-			<territory type="RO">罗马尼亚</territory>
-			<territory type="RS">塞尔维亚</territory>
-			<territory type="RU">ä¿„ç½—æ–¯</territory>
-			<territory type="RW">�旺达</territory>
-			<territory type="SA">沙特阿拉伯</territory>
-			<territory type="SB">所罗门群岛</territory>
-			<territory type="SC">塞舌尔群岛</territory>
-			<territory type="SD">�丹</territory>
-			<territory type="SE">ç‘žå…¸</territory>
-			<territory type="SG">新加�</territory>
-			<territory type="SH">圣赫勒拿</territory>
-			<territory type="SI">斯洛文尼亚</territory>
-			<territory type="SJ">斯瓦尔巴特和扬马延</territory>
-			<territory type="SK">斯洛�克</territory>
-			<territory type="SL">塞拉利昂</territory>
-			<territory type="SM">圣马力诺</territory>
-			<territory type="SN">塞内加尔</territory>
-			<territory type="SO">索马里</territory>
-			<territory type="SR">�里�</territory>
-			<territory type="ST">圣多美和普林西比</territory>
-			<territory type="SV">�尔瓦多</territory>
-			<territory type="SY">�利亚</territory>
-			<territory type="SZ">斯�士兰</territory>
-			<territory type="TC">特克斯和凯科斯群岛</territory>
-			<territory type="TD">�得</territory>
-			<territory type="TF">法属�部领土</territory>
-			<territory type="TG">多哥</territory>
-			<territory type="TH">泰国</territory>
-			<territory type="TJ">塔�克斯�</territory>
-			<territory type="TK">托克劳</territory>
-			<territory type="TL">东�汶</territory>
-			<territory type="TM">土库曼斯�</territory>
-			<territory type="TN">�尼斯</territory>
-			<territory type="TO">汤加</territory>
-			<territory type="TR">土耳其</territory>
-			<territory type="TT">特立尼达和多巴哥</territory>
-			<territory type="TV">图瓦�</territory>
-			<territory type="TW">�湾</territory>
-			<territory type="TZ">�桑尼亚</territory>
-			<territory type="UA">乌克兰</territory>
-			<territory type="UG">乌干达</territory>
-			<territory type="UM">美国边远�岛</territory>
-			<territory type="US">美国</territory>
-			<territory type="UY">乌拉圭</territory>
-			<territory type="UZ">乌兹别克斯�</territory>
-			<territory type="VA">梵蒂冈</territory>
-			<territory type="VC">圣文森特和格林纳�斯</territory>
-			<territory type="VE">委内瑞拉</territory>
-			<territory type="VG">英属维京群岛</territory>
-			<territory type="VI">美属维京群岛</territory>
-			<territory type="VN">越�</territory>
-			<territory type="VU">瓦努阿图</territory>
-			<territory type="WF">瓦利斯和富图纳</territory>
-			<territory type="WS">�摩亚</territory>
-			<territory type="YE">也门</territory>
-			<territory type="YT">马约特</territory>
-			<territory type="ZA">��</territory>
-			<territory type="ZM">赞比亚</territory>
-			<territory type="ZW">津巴布韦</territory>
-			<territory type="ZZ">未知或无效地区</territory>
-		</territories>
-		<variants>
-			<variant type="1901">传统德语拼字学</variant>
-			<variant type="1996">1996 年的德语拼字学</variant>
-			<variant type="AREVELA">东亚美尼亚语</variant>
-			<variant type="AREVMDA">西亚美尼亚语</variant>
-			<variant type="FONIPA">国际音标</variant>
-			<variant type="POLYTON">多音</variant>
-			<variant type="POSIX">电脑</variant>
-			<variant type="REVISED">已修订的拼字学</variant>
-			<variant type="SAAHO">��</variant>
-		</variants>
-		<keys>
-			<key type="calendar">日历</key>
-			<key type="collation">对照</key>
-			<key type="currency">货�</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">�体中文(Big5)</type>
-			<type type="buddhist" key="calendar">佛教日历</type>
-			<type type="chinese" key="calendar">农历</type>
-			<type type="direct" key="collation">顺�</type>
-			<type type="gb2312han" key="collation">简体中文(GB2312)</type>
-			<type type="gregorian" key="calendar">公历</type>
-			<type type="hebrew" key="calendar">希伯�日历</type>
-			<type type="indian" key="calendar">�度国家日历</type>
-			<type type="islamic" key="calendar">伊斯兰日历</type>
-			<type type="islamic-civil" key="calendar">伊斯兰希��历</type>
-			<type type="japanese" key="calendar">日本日历</type>
-			<type type="phonebook" key="collation">电�簿顺�</type>
-			<type type="pinyin" key="collation">拼音顺�</type>
-			<type type="roc" key="calendar">中�民国日历</type>
-			<type type="stroke" key="collation">笔划顺�</type>
-			<type type="traditional" key="collation">传统历法</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">公制</measurementSystemName>
-			<measurementSystemName type="US">美制</measurementSystemName>
-		</measurementSystemNames>
-		<codePatterns>
-			<codePattern type="language">语言：{0}</codePattern>
-			<codePattern type="script">脚本：{0}</codePattern>
-			<codePattern type="territory">区域：{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[一 � 七 丈-与 专 且 世 丘-业 东 � 丢 两 严 丧 个 中 丰 串 临 丸-主 丽 举 乃 久 么 义 之-� 乔 乖 乘 乙 � 也-乡 书 买 乱 乾 了 予 争 事 二 于 � 云 互 五 井 亚 些 亡 交 亦 亨 享 京 亮 亲 人 亿-� 仅 仇 今 介 � 从 仔 他 付 仙 代-以 仪 们 仰 仲 件 任 份 仿 � 伊 � �-休 众 伙 会 伟 传 伤 伦 伯 估 伴 伸 似 伽 但 �-佑 体 何 余 佛 作 你 佤 佩 佳 使 例 供 � 侠 侦-侨 侬 侯 侵 便 促 俄 俊 俗 � 信 俩 修 俱 俾 � 倒 候 倚 借 倦 值 倾 � � � � � � � � 储 催 傲 傻 � 僧 儒 � 元-充 先 光 克 � 兑 兔 入 全 八-兮 兰 共 关-兹 养-兽 内 冈 � 冒 写 军 农 冠 冬 冰 冲 冷 准 凌 � 几 凡 凤 凭 凯 凰 出 击 函 刀 分 切 刊 刑 划 列-创 � 判 利 别 到 制-券 刺 刻 剂 � 剑 剧 剩 剪 副 割 力 �-务 劣 动-劫 励-劳 势 勇 勉 勋 勒 勤 勾 勿 包 匆 匈 化 北 匙 匹-医 � � � � � � � � � �-� � �-� � � � � � 厄-历 厉 压-� 厚 原 去 县 � �-� � � �-� �-� �-� � � � � �-� � � �-� �-� � � � � � � � � � � � � � � � 呀 呆 呈 告 � 员 呜 呢 呦 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咯 咱 哀 � 哇-哉 � 哎 哟 哥 哦 哩 哪 哭 哲 唉 � 唤 唬 售 唯 唱 唷 商 啊 啡 啥 啦 啪 喀 喂 善 喇 喊 � 喔 喜 � 喵 喷 喻 嗒 嗨 嗯 嘉 嘛 嘴 嘻 嘿 器 四 回 因 团 园 困 围 固 国 图 圆 圈 土 圣 在 圭 地 场 圾 � � � � � � �-� � � � � 垂 垃 型 垒 埃 埋 城 埔 域 培 基 堂 堆 堕 堡 堪 塑 塔 塞 填 境 增 墨 � 士 壮 声 处 备 � � 夕 外 多 夜 夥 大 天-夫 央 失 头 夷-夺 奇-奉 奋 � 契 奔 套 奥 女 奴 奶 她 好 如 妇 妈 妖 妙 妥 妨 妮 妹 妻 姆 姊 始 � 姑 姓 委 姿 � 娃 娄 娘 娜 娟 婆 婚 媒 � 嫌 嫩 � 孔 孕 字-孙 孜 � 孟 季 孤 学 孩 � 它 宇-安 宋 完 � 宗-实 审-室 宪 害 家 容 宽-宿 寂 寄 密 寇 富 寒 �-察 寡 寨 寸 对 寻 导 寿 � 射 将 尊 � 少 尔 尖 尘 尚 � 尤 就 尺 尼-尾 局-层 居 屋 � 展 属 屠 山 � 岂 岗 岘 岚 岛 岳 岸 峡 峰 崇 崩 � 州 巡 工-巨 巫 差 己 已 巴 巷 �-布 帅 师 希 � 帕 � 带 席 帮 常 帽 幅 幕 干-年 幸 幻-幽 广 庆 床 � 库-底 店 庙 府 庞 废 度 座 庭 康 庸 廉 廖 延 廷 建 开 弃 弄 弊 � 引 弗 弘 弟 张 弥 弦 弯 弱 弹 归 当 � 形 彩 彬 彭 彰 影 彷 役 彻 彼 往 � 径 待 很 律 後 � 徒 得 循 微 徵 德 心 必 忆 忌 � 志-忙 忠 忧 快 念 忽 怀 � 怎 怒 怕 怖 � 怡 急 性 怨 怪 总 � � � � � � � � � � 悄 悉 悔 悟 悠 患 您 悲 情 惑 惜 惠 惧 惨 惯 想 惹 � 愈 愉 � 愚 感 愧 慈 慎 慕 慢 慧 慰 憾 懂 懒 戈 �-戒 或 战 截 戴 房-� 扇 手 � 扎 扑 打 托 扣 执 扩 扫-扯 批 找-技 抄 把 抑 抓 投 抗 折 抢 护 报 披 抬 抱 抵 抹 抽 担 拆 拉 � 拒 拔 拖 拘 招 拜 拟 拥 拦 拨 择 括 拳 拷 拼 拾 拿 � 指 按 挑 挖 � 挡 挤 挥 挪 振 挺 � � � � � � � 授 掉 掌 排 探 接 控-措 掸 � � � � � � � � � 摄 摆 摊 摔 摘 摩 摸 撒 撞 播 � 擎 擦 支 收 改 攻 放 政 故 效 敌 � 救 教 � 敢 散 敦 敬 数 敲 整 文 斋 � 斗 料 斜 斥 断 斯 新 方 於 施 � 旅 旋 � 旗 无 既 日-早 旭 时 旺 昂 昆 昌 明 � 易 星 映 春 昨 昭 是 显 晃 晋 晒 晓 晚 晨 普 景 晴 晶 智 暂 暑 暖 暗 暮 暴 曰 曲 更 曹 曼 曾-最 月 有 朋 � 朗 望 � 期 木 未-札 术 朱 朵 � � � � � � � � � � � � � � � � � � 林 果 � 枢 枪 枫 架 � � 染 柔 查 柬 柯 柳 柴 标 栋 � 树 校 样-根 格 桃 框 案 桌 桑 档 桥 � 梅 梦 梯 械 梵 检 棉 棋 棒 棚 森 椅 � 椰 楚 楼 概 榜 模 樱 檀 欠-欣 欧 欲 欺 款 歉 歌 止-武 歪 死 殊 残 段 毅 � � 毒 比 毕 毛 毫 � 民 氛 水 永 求 汉 汗 � 江-污 汤 汪 汶 汽 沃 沈 沉 沙 沟 沧 河 油 治 沿 泉 泊 法 泛 泡-泣 泥 注 泰 泳 泽 洋 洗 洛 洞 津 洪 洲 活 洽 派 � 浅 测 济 浑 浓 浦 浩 浪 浮 浴 海 涅 消 涉 涛 涨 涯 液 涵 淋 淑 淘 淡 深 混 添 清 � 渡 渣 温 港 渴 游 湖 湾 � 溜 溪 滋 滑 满 滥 滨 滴 漂 � 演 漠 漫 潘 潜 潮 澎 澳 激 � � � � � � � 炉 炎 炮 炸 点 烂 烈 烤 烦 烧 热 焦 然 煌 煞 照 煮 熊 熟 燃 燕 爆 爪 爬 爱 爵-爸 爽 片 版 牌 牙 牛 牡 牢 牧 物 牲 牵 特 牺 犯 状 犹 狂 � 狗 狠 独 狮 狱 狼 猛 猜 献 玄 率 玉 王 玛 玩 玫 环 现 玲 玻 � � � � � � � � � � 瑙 瑜 瑞 瑟 瑰 瑶 璃 瓜 瓦 瓶 甘 甚 甜 生 用 田-申 电 男 甸 画 畅 界 留 略 番 疆 � 疑 疗 疯 疲 疼 疾 病 痕 痛 痴 登 白 百 的 皆 皇 皮 盈 益 监 盒 盖 盘 盛 盟 目 直 相 盼 盾 � 眉 看 真 眠 眼 � � � 瞧 矛 矣 知 短 石 矶 � 砂 � 研 破 础 硕 硬 � 碎 碗 碟 碧 碰 � 磅 磨 示 礼 社 祖 � 神 祥 票 祸 � 禅 � 秀 � 秋 � 科 秒 秘 租 秤 秦 秩 积 称 移 稀 程 � 稣 稳 稿 穆 究 穷 穹 空 穿 � 窗 � 立 站 竞-章 童 端 竹 笑 笔 笛 符 笨 第 等 筋 答 策 筹 签 简 算 管 箭 箱 篇 篮 簿 � 米 类 粉 粒 粗 粹 精 糊 糕 糖 糟 系 素 索 紧 紫 累 � 红 约 级 纪 纯 纲 纳 纵 纷 纸 纽 练 组 细-终 � � 结 绕 绘 给 络 统 继 绩 绪 续 维 绵 综 缅 缓 编 缘 缠 缩 缴 缶 缸 缺 � 罕 罗 罚 罢 罪 置 署 羊 美 羞 群 羯 羽 � 翅 翔 翘 翠 翰 翻 翼 耀 � 考 者 而 � � 耗 耳 耶 � � � � � 肉 肚 股 肤 肥 肩 肯 育 � 胆 背 胎 胖 胞 胡 胶 胸 能 脆 脑 脱 脸 腊 � 腓 腰 腹 腾 腿 臂 臣 自 臭 至 致 舌 � 舒 舞 舟 航 般 舰 船 良 色 艺 艾 节 芒 � 芦 芬 芭 花 芳 � � 苗 若 苦 英 茂 茨 茫 茶 � � � � � 莉 莎 莪 莫 莱 莲 获 � � � � � � � � � � 著 葛 葡 蒂 蒋 蒙 蓉 � 蓬 蔑 蔡 薄 薪 藉 � 藤 虎 虑 虫 虹 虽 虾 � 蛇 蛋 蛙 蛮 蜂 蜜 � � 蟹 蠢 血 行 街 衡 衣 补 表 袋 被 袭 � 裂 装 裕 裤 西 � 覆 � 观 规 视 览 觉 角 解 言 誉 誓 警 计 订 认 讨 让 训-记 讲 许 论 设 访 � 评 识 诉 � 译 试 诗 诚 � 诞 询 该 详 语 误 说 请 诸 诺 读 课 � 调 谅 谈 谊 谋 谓 谜 谢 谨 谱 谷 豆 象 豪 貌 �-负 贡-败 货-贪 购 贯 贱 贴 贵 费 贺 贼 贾 资 赋 赌 � � 赔 赖 赚 赛 赞 赠 赢 赤 赫 走 赵 起 � 超 越 趋 趣 足 跃 跌 跑 � 跟 路 跳 � 踢 踩 身 躲 车 轨 轩 转 轮-轰 轻 载 较 辅 辆 辈 辉 辑 输 辛 辞 辨 辩 辱 边 达 � 迅 过 迈 迎 � 近 返 还 这 进-迟 迦 迪 迫 述 迷 追 退 � 逃 逆 选 逊 � � 递 途 通 逛 � 速 造 逢 逸 逻 逼 � � � � � � � � 邀 邓 那 邦 邪 邮 邱 邻 郎 郑 部 郭 都 鄂 酋 � 酒 酷 酸 醉 醒 采 释 里-� 金 针 钓 钟 钢 钦 钱 钻 � 铃 铢 铭 银 销 � 锅 锋 错 锡 锦 键 锺 镇 镜 镭 长 门 闪 闭 问 间 闷 闹 闻 � � 阔 队 阮 防-阶 阻 阿 陀 附-陆 陈 � � 院 除 险 陪 陵-陷 隆 � � 隔 障 难 雄-集 雨 雪 雯 雳 零 雷 雾 需 震 � 霖 露 霸 霹 � � � � � � � � 鞋 鞑 韦 韩 音 页 顶 项-须 顽-顿 预 领 颇 频 颗 题 � 风 飘 飙 飞 食 � 饭 饮 饰 饱 饼 馆 首 香 馨 马 驱 驶 驻 驾 验 骑 骗 骚 骤 骨 高 鬼 魂 魅 魔 鱼 � 鲜 鸟 鸣 鸭 鸿 鹅 鹤 鹰 鹿 麦 麻 黄 黎 黑 默 鼓 鼠 鼻 � 齿 龄 龙 龟]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[侣 傣 � 厘 � 堤 奎 巽 录 户 撤 楔 楠 滕 瑚 甫 盲 禄 粟 线 脚 钯 铂 锑 镑 �]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">一月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">�月</month>
-							<month type="10">�月</month>
-							<month type="11">�一月</month>
-							<month type="12">�二月</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">一月</month>
-							<month type="2">二月</month>
-							<month type="3">三月</month>
-							<month type="4">四月</month>
-							<month type="5">五月</month>
-							<month type="6">六月</month>
-							<month type="7">七月</month>
-							<month type="8">八月</month>
-							<month type="9">�月</month>
-							<month type="10">�月</month>
-							<month type="11">�一月</month>
-							<month type="12">�二月</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">周日</day>
-							<day type="mon">周一</day>
-							<day type="tue">周二</day>
-							<day type="wed">周三</day>
-							<day type="thu">周四</day>
-							<day type="fri">周五</day>
-							<day type="sat">周六</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">星期日</day>
-							<day type="mon">星期一</day>
-							<day type="tue">星期二</day>
-							<day type="wed">星期三</day>
-							<day type="thu">星期四</day>
-							<day type="fri">星期五</day>
-							<day type="sat">星期六</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">æ—¥</day>
-							<day type="mon">一</day>
-							<day type="tue">二</day>
-							<day type="wed">三</day>
-							<day type="thu">å››</day>
-							<day type="fri">五</day>
-							<day type="sat">å…­</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1">1å­£</quarter>
-							<quarter type="2">2å­£</quarter>
-							<quarter type="3">3å­£</quarter>
-							<quarter type="4">4å­£</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1">第1季度</quarter>
-							<quarter type="2">第2季度</quarter>
-							<quarter type="3">第3季度</quarter>
-							<quarter type="4">第4季度</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
-						<quarterWidth type="narrow">
-							<quarter type="1">1</quarter>
-							<quarter type="2">2</quarter>
-							<quarter type="3">3</quarter>
-							<quarter type="4">4</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<am>上�</am>
-				<pm>下�</pm>
-				<eras>
-					<eraNames>
-						<era type="0">公元�</era>
-						<era type="1">公元</era>
-					</eraNames>
-					<eraAbbr>
-						<era type="0">公元�</era>
-						<era type="1">公元</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy-M-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy-M-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>zzzzah时mm分ss秒</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>zah时mm分ss秒</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>ahh:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>ah:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">dæ—¥</dateFormatItem>
-						<dateFormatItem id="Ed">dæ—¥E</dateFormatItem>
-						<dateFormatItem id="H">Hæ—¶</dateFormatItem>
-						<dateFormatItem id="HHmmss">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="hm">ah:mm</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">M-dE</dateFormatItem>
-						<dateFormatItem id="MMdd">MM-dd</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMMdæ—¥</dateFormatItem>
-						<dateFormatItem id="MMMEd">MMMdæ—¥E</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMMdæ—¥</dateFormatItem>
-						<dateFormatItem id="MMMMdd">MMMMddæ—¥</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMMdæ—¥E</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">yå¹´</dateFormatItem>
-						<dateFormatItem id="yM">yyyy-M</dateFormatItem>
-						<dateFormatItem id="yMEd">y年M月d日，E</dateFormatItem>
-						<dateFormatItem id="yMMM">yå¹´MMM</dateFormatItem>
-						<dateFormatItem id="yMMMd">yå¹´MMMdæ—¥</dateFormatItem>
-						<dateFormatItem id="yMMMEd">yå¹´MMMdæ—¥EEE</dateFormatItem>
-						<dateFormatItem id="yMMMM">yå¹´MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">yå¹´QQQ</dateFormatItem>
-						<dateFormatItem id="yQQQ">yå¹´QQQ</dateFormatItem>
-						<dateFormatItem id="yyMM">yy-MM</dateFormatItem>
-						<dateFormatItem id="yyMMM">yyå¹´MMM</dateFormatItem>
-						<dateFormatItem id="yyQ">yy年第Q季度</dateFormatItem>
-						<dateFormatItem id="yyyy">yå¹´</dateFormatItem>
-						<dateFormatItem id="yyyyM">y年M月</dateFormatItem>
-						<dateFormatItem id="yyyyMMMM">yå¹´MMMM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}–{1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d">d日至d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">ah至ah时</greatestDifference>
-							<greatestDifference id="h">ah至h时</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">ah:mm至ah:mm</greatestDifference>
-							<greatestDifference id="h">ah:mm至h:mm</greatestDifference>
-							<greatestDifference id="m">ah:mm至h:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">vah:mm至ah:mm</greatestDifference>
-							<greatestDifference id="h">vah:mm至h:mm</greatestDifference>
-							<greatestDifference id="m">vah:mm至h:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">vah至ah时</greatestDifference>
-							<greatestDifference id="h">vah至h时</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">L至L</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M-d至M-d</greatestDifference>
-							<greatestDifference id="M">M-d至M-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M-dE至M-dE</greatestDifference>
-							<greatestDifference id="M">M-dE至M-dE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">M月d日至d日</greatestDifference>
-							<greatestDifference id="M">M月d日至M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">M月d日E至M月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y至y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy-M至yy-M</greatestDifference>
-							<greatestDifference id="y">yy-M至yy-M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy-M-d至yy-M-d</greatestDifference>
-							<greatestDifference id="M">yy-M-d至yy-M-d</greatestDifference>
-							<greatestDifference id="y">yy-M-d至yy-M-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yy-M-dE至yy-M-dE</greatestDifference>
-							<greatestDifference id="M">yy-M-dE至yy-M-dE</greatestDifference>
-							<greatestDifference id="y">yy-M-dE至yy-M-dE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y年M月至y年M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">y年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">y年M月d日至y年M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y年M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">y年M月d日E至M月d日E</greatestDifference>
-							<greatestDifference id="y">y年M月d日E至y年M月d日E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>时期</displayName>
-					</field>
-					<field type="year">
-						<displayName>å¹´</displayName>
-					</field>
-					<field type="month">
-						<displayName>月</displayName>
-					</field>
-					<field type="week">
-						<displayName>周</displayName>
-					</field>
-					<field type="day">
-						<displayName>æ—¥</displayName>
-						<relative type="-2">�天</relative>
-						<relative type="-1">昨天</relative>
-						<relative type="0">今天</relative>
-						<relative type="1">明天</relative>
-						<relative type="2">�天</relative>
-					</field>
-					<field type="weekday">
-						<displayName>周天</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>上�/下�</displayName>
-					</field>
-					<field type="hour">
-						<displayName>�时</displayName>
-					</field>
-					<field type="minute">
-						<displayName>分钟</displayName>
-					</field>
-					<field type="second">
-						<displayName>秒钟</displayName>
-					</field>
-					<field type="zone">
-						<displayName>区域</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="roc">
-				<eras>
-					<eraAbbr>
-						<era type="0">民国�</era>
-						<era type="1">民国</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>Gy年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>Gy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>Gy-M-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>Gy-M-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="hm">ah:mm</dateFormatItem>
-						<dateFormatItem id="hms">ah:mm:ss</dateFormatItem>
-						<dateFormatItem id="yyyyM">Gy/M</dateFormatItem>
-						<dateFormatItem id="yyyyMd">Gy/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">Gy/M/d（EEE）</dateFormatItem>
-						<dateFormatItem id="yyyyMM">Gy/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">Gyå¹´MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">Gy年M月d日</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Gy年第Q季度</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">y/M至y/M</greatestDifference>
-							<greatestDifference id="y">y/M至y/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">y/M/d至y/M/d</greatestDifference>
-							<greatestDifference id="M">y/M/d至y/M/d</greatestDifference>
-							<greatestDifference id="y">y/M/d至y/M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">y/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="M">y/M/dE至y/M/dE</greatestDifference>
-							<greatestDifference id="y">y/M/dE至y/M/dE</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HHmm;-HHmm</hourFormat>
-			<gmtFormat>格林尼治标准时间{0}</gmtFormat>
-			<gmtZeroFormat>格林尼治标准时间</gmtZeroFormat>
-			<regionFormat>{0}时间</regionFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>未知</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>安�尔</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>迪拜</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>喀布尔</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>安�瓜</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>安圭拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>地拉那</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>埃里温</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>库拉�</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>罗安达</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>罗瑟拉</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>帕默尔</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>斯尤瓦</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Mawson">
-				<exemplarCity>莫森</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>戴维斯</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>沃斯托克</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>�塞</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>�蒙��勒</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>马克默多</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>里奥加耶戈斯</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>门多�</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>圣胡安</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>乌斯怀亚</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>拉里奥哈</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>�塔马�</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>胡胡伊</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>图库曼</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>科尔多瓦</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>布宜诺斯艾利斯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>帕果-帕果</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>维也纳</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>佩�</exemplarCity>
-			</zone>
-			<zone type="Australia/Eucla">
-				<exemplarCity>尤克拉</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>达尔文</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>阿德莱德</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>布罗肯希尔</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>库利</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>墨尔本</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>�巴特</exemplarCity>
-			</zone>
-			<zone type="Australia/Lindeman">
-				<exemplarCity>林德曼</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>悉尼</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>布里斯�</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>豪勋爵</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>阿�巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>玛丽港</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>巴库</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>�拉热�</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>巴巴多斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>达�</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>布�塞尔</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>瓦加��</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>索�亚</exemplarCity>
-			</zone>
-			<zone type="Asia/Bahrain">
-				<exemplarCity>å·´æž—</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>布�布拉</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>波多诺�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>百慕大</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>文莱</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>拉巴斯</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>�伦尼�</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>里奥布郎库</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>波多韦柳</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>�阿维斯塔</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>马瑙斯</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>库亚巴</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>大�普</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>�伦</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>阿拉瓜伊纳</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>圣�罗</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>巴伊亚</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>�塔雷�</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>马塞约</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>累西腓</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>洛罗尼亚</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>拿骚</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>廷布</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>哈�罗内</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>明斯克</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>伯利兹</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>�森</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>怀特�斯</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>伊努维克</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>温哥�</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>�森克里克</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>耶洛奈夫</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>埃德蒙顿</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>斯�夫特�伦特</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>�布里季�</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>里贾纳</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>温尼伯</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雨河</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>雷今海�</exemplarCity>
-			</zone>
-			<zone type="America/Coral_Harbour">
-				<exemplarCity>�瑚港</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>æ¡‘å¾·è´�</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮贡</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>多伦多</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>蒙特利尔</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>伊��伊特</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>�涅�</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>蒙克顿</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>哈利法克斯</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>�斯湾</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>格莱斯�</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>圣约翰</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>��斯</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>金沙�</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>�本巴希</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>布拉扎维</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>�黎世</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>阿比让</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>拉罗汤加</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>�活节岛</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>圣地亚哥</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>�阿拉</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>喀什葛尔</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>乌�木�</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>�庆</exemplarCity>
-			</zone>
-			<zone type="Asia/Shanghai">
-				<exemplarCity>上海</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>哈尔滨</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>波哥大</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>哥斯达黎加</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>哈瓦那</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>佛得角</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>圣诞岛</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>尼科西亚</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>布拉格</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>�林</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>�布�</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>哥本哈根</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>多米尼加</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>圣多明�</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>阿尔�尔</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>加拉帕哥斯</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>瓜亚基尔</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>塔林</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>开罗</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>阿尤�</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>阿斯马拉</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>加那利</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>休达</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>马德里</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>亚的斯亚�巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>赫尔辛基</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>�济</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>�丹利</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>特�克群岛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>波纳佩岛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>库赛埃</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>法罗</exemplarCity>
-			</zone>
-			<zone type="Europe/Paris">
-				<exemplarCity>巴黎</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>利伯维尔</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<short>
-					<daylight>BST</daylight>
-				</short>
-				<exemplarCity>伦敦</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>格林纳达</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>第比利斯</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>�宴</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>根西岛</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>阿克拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>直布罗陀</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>图勒</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>戈特�布</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>斯科列斯比桑德</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>Danmarkshavn（格陵兰东北城市）</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>��尔</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>科纳克里</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>瓜德罗普</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>马拉�</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>é›…å…¸</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>�乔治亚</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>�地马拉</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>关岛</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>比�</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>圭亚那</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>香港</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>特�西加尔巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>�格勒布</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>太�港</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>布达佩斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>雅加达</exemplarCity>
-			</zone>
-			<zone type="Asia/Pontianak">
-				<exemplarCity>�甸</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>望加锡</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>查亚普拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>都�林</exemplarCity>
-			</zone>
-			<zone type="Asia/Jerusalem">
-				<exemplarCity>耶路撒冷</exemplarCity>
-			</zone>
-			<zone type="Europe/Isle_of_Man">
-				<exemplarCity>马�岛</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>加尔�答</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>查戈斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>巴格达</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>德黑兰</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>雷克雅未克</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>罗马</exemplarCity>
-			</zone>
-			<zone type="Europe/Jersey">
-				<exemplarCity>泽西岛</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>牙买加</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>安曼</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>东京</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>内罗毕</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>比什凯克</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>金边</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�德�里</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>基里地马地岛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tarawa">
-				<exemplarCity>塔拉瓦</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>科摩罗</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>圣基茨</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>平壤</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>首尔</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuwait">
-				<exemplarCity>科�特</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>开曼</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>阿克图</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>乌拉尔</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>阿克托别</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>克孜勒奥尔达</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>阿拉木图</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>万象</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>��特</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>圣�西亚</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>瓦�兹</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>科伦�</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>蒙罗维亚</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>马塞�</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>维尔纽斯</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>�森堡</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>里加</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>的黎波里</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>��布兰�</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>摩纳哥</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>基希讷乌</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>波德戈里察</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>安塔那利佛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>夸贾林</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>马朱罗</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>斯科普里</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>巴马科</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>ä»°å…‰</exemplarCity>
-			</zone>
-			<zone type="Asia/Hovd">
-				<exemplarCity>科布多</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>乌兰巴托</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>�巴尔塞</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>澳门</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>塞�</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>马�尼克</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>努瓦克肖特</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>蒙特塞拉特</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>马耳他</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>毛里求斯</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>马尔代夫</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>布兰太尔</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>��纳</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>埃莫西约</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>马�特兰</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>奇瓦瓦</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>蒙特雷</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>墨西哥城</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>梅里达</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>�昆</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuala_Lumpur">
-				<exemplarCity>�隆�</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>�晋</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>马普托</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>温得和克</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>努美阿</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>尼亚美</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>诺�克</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>拉�斯</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>马那瓜</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>阿姆斯特丹</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>奥斯陆</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>加德满都</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>瑙�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>纽埃</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>查塔姆</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>奥克兰</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>马斯喀特</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>巴拿马</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>利马</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>塔希�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>马克�斯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>甘比尔</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>莫尔兹比港</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>马尼拉</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>�拉奇</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>�沙</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>密克隆</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>皮特凯�</exemplarCity>
-			</zone>
-			<zone type="America/Puerto_Rico">
-				<exemplarCity>波多黎�</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>加沙</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>亚述尔群岛</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>马德拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Lisbon">
-				<exemplarCity>里斯本</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>帕劳</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>亚�森</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>�塔尔</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>留尼旺</exemplarCity>
-			</zone>
-			<zone type="Europe/Bucharest">
-				<exemplarCity>布加勒斯特</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>�尔格莱德</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>加里�格勒</exemplarCity>
-			</zone>
-			<zone type="Europe/Moscow">
-				<exemplarCity>莫斯科</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>�尔加格勒</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>�马拉</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>���林堡</exemplarCity>
-			</zone>
-			<zone type="Asia/Omsk">
-				<exemplarCity>鄂木斯克</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>诺沃西比尔斯克</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>克拉斯诺亚尔斯克</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>伊尔库茨克</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>雅库茨克</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>符拉迪沃斯托克</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>�哈林</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>马加丹</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>堪察加</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>阿纳德尔</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>基加利</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>利雅得</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>瓜达尔�纳尔</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>马埃</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>哈土穆</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>斯德哥尔摩</exemplarCity>
-			</zone>
-			<zone type="Asia/Singapore">
-				<exemplarCity>新加�</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>圣赫勒拿</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>�布尔维</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>朗伊尔城</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>布拉迪斯拉�</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>弗里敦</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>圣马力诺</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>达喀尔</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>摩加迪沙</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>帕拉马利玻</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>圣多美</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>�尔瓦多</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>大马士�</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>姆巴巴纳</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>大土耳其</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�贾梅纳</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>凯尔盖朗</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>洛美</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>曼谷</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>�尚别</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>法考�</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>�力</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>阿什哈巴德</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>�尼斯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>东加塔布</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>伊斯�布尔</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>西�牙港</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>富纳富�</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>�北</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>达累斯�拉姆</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>乌日戈罗德</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>基辅</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>辛�罗波尔</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>扎波罗热</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>�帕拉</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>中途岛</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>约翰斯顿</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wake">
-				<exemplarCity>�克</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>艾德克</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>诺姆</exemplarCity>
-			</zone>
-			<zone type="Pacific/Honolulu">
-				<exemplarCity>檀香山</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>安克雷奇</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>亚库塔特</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>朱诺</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>洛�矶</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>�伊西</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>凤凰城</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>舰石城</exemplarCity>
-			</zone>
-			<zone type="America/Denver">
-				<exemplarCity>丹佛</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>北达科他</exemplarCity>
-			</zone>
-			<zone type="America/Chicago">
-				<exemplarCity>�加哥</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>密诺米尼</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>温森斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>彼得斯堡</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>诺克斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>马伦戈</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>�地安纳波利斯</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>路易斯维尔</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>维维市（�第安纳州）</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>蒙蒂塞洛</exemplarCity>
-			</zone>
-			<zone type="America/Detroit">
-				<exemplarCity>底特律</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>纽约</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>蒙得维的亚</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>撒马尔罕</exemplarCity>
-			</zone>
-			<zone type="Asia/Tashkent">
-				<exemplarCity>塔什干</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>梵蒂冈</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>圣文森特</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>加拉加斯</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>托尔托拉</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>圣托马斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>胡志明市</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>埃法特</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>瓦利斯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>阿皮亚</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>亚�</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>马约特</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>约翰内斯堡</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>���</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>哈拉雷</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>阿克里标准时间</standard>
-					<daylight>阿克里�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>阿富汗时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>中部�洲标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>东部�洲标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>�洲�部时间</generic>
-					<standard>�部�洲标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>西部�洲标准时间</standard>
-					<daylight>西部�洲�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>阿尔�斯标准时间</standard>
-					<daylight>阿尔�斯�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>阿拉斯加时间</generic>
-					<standard>阿拉斯加标准时间</standard>
-					<daylight>阿拉斯加�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>阿拉斯加���夷时间</generic>
-					<standard>阿拉斯加���夷标准时间</standard>
-					<daylight>阿拉斯加���夷�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>阿拉木图标准时间</standard>
-					<daylight>阿拉木图�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>亚马逊标准时间</standard>
-					<daylight>亚马逊�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>美国中部时间</generic>
-					<standard>中部标准时间</standard>
-					<daylight>中部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>美国东部时间</generic>
-					<standard>东部标准时间</standard>
-					<daylight>东部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>美国山区时间</generic>
-					<standard>山区标准时间</standard>
-					<daylight>山区�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>美国太平洋时间</generic>
-					<standard>太平洋标准时间</standard>
-					<daylight>太平洋�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>阿纳德尔标准时间</standard>
-					<daylight>阿纳德尔�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>阿克图标准时间</standard>
-					<daylight>阿克图�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>阿克托别标准时间</standard>
-					<daylight>阿克托别�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>阿拉伯时间</generic>
-					<standard>阿拉伯标准时间</standard>
-					<daylight>阿拉伯�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>阿根廷标准时间</standard>
-					<daylight>阿根廷�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>阿根廷西部标准时间</standard>
-					<daylight>阿根廷西部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>亚美尼亚标准时间</standard>
-					<daylight>亚美尼亚�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>阿什哈巴德标准时间</standard>
-					<daylight>阿什哈巴德�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>大西洋时间</generic>
-					<standard>大西洋标准时间</standard>
-					<daylight>大西洋�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>澳大利亚中部时间</generic>
-					<standard>澳大利亚中部标准时间</standard>
-					<daylight>澳大利亚中部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<standard>澳大利亚中西部标准时间</standard>
-					<daylight>澳大利亚中西部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>澳大利亚东部时间</generic>
-					<standard>澳大利亚东部标准时间</standard>
-					<daylight>澳大利亚东部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>澳大利亚西部时间</generic>
-					<standard>澳大利亚西部标准时间</standard>
-					<daylight>澳大利亚西部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>阿塞拜疆标准时间</standard>
-					<daylight>阿塞拜疆�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>亚述尔群岛时间</standard>
-					<daylight>亚述尔群岛�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>巴库标准时间</standard>
-					<daylight>巴库�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<standard>孟加拉标准时间</standard>
-					<daylight>孟加拉�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>白令时间</generic>
-					<standard>白令标准时间</standard>
-					<daylight>白令�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>�丹标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>玻利维亚时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>婆罗洲标准时间</standard>
-					<daylight>婆罗洲�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>巴西利亚标准时间</standard>
-					<daylight>巴西利亚�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>汶�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>查莫罗标准时区</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>长白山时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>智利标准时间</standard>
-					<daylight>智利�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>中国时间</generic>
-					<standard>中国标准时间</standard>
-					<daylight>中国�令时间</daylight>
-				</long>
-				<short>
-					<generic>CT（中国）</generic>
-					<standard>CST（中国）</standard>
-					<daylight>CDT（中国）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>乔巴山标准时间</standard>
-					<daylight>乔巴山�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>哥伦比亚时间</standard>
-					<daylight>哥伦比亚�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>�巴时间</generic>
-					<standard>�巴标准时间</standard>
-					<daylight>�巴�令时间</daylight>
-				</long>
-				<short>
-					<standard>CST（�巴）</standard>
-					<daylight>CDT（�巴）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>达�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>�尚别标准时间</standard>
-					<daylight>�尚别�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>�属圭亚那标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>东�汶标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>厄瓜多尔标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>中欧标准时间</standard>
-					<daylight>中欧�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>东欧标准时间</standard>
-					<daylight>东欧�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>欧洲西部时间</standard>
-					<daylight>欧洲西部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>法属圭亚那时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>�龙�标准时间</standard>
-					<daylight>�龙��令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>加拉帕戈斯时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>格��亚标准时间</standard>
-					<daylight>格��亚�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>格林尼治标准时间</standard>
-				</long>
-				<commonlyUsed>true</commonlyUsed>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>格林兰中部标准时间</standard>
-					<daylight>格林兰中部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>格林兰东部标准时间</standard>
-					<daylight>格林兰东部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>格林兰西部标准时间</standard>
-					<daylight>格林兰西部�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>关岛标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>海湾标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>盖亚那时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>��夷—阿留申标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>香港时间</standard>
-					<daylight>香港�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>科布多时间</standard>
-					<daylight>科布多�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>�度标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>�度尼西亚中部标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>�度尼西亚东部标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>�度尼西亚西部标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>伊朗标准时间</standard>
-					<daylight>伊朗�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>伊尔库茨克时间</standard>
-					<daylight>伊尔库茨克�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>以色列时间</generic>
-					<standard>以色列标准时间</standard>
-					<daylight>以色列�令时间</daylight>
-				</long>
-				<short>
-					<standard>IST (以色列)</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>日本时间</generic>
-					<standard>日本标准时间</standard>
-					<daylight>日本�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>�拉奇标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>喀什标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>哈�克斯�东部时间</generic>
-					<standard>哈�克斯�东部标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>哈�克斯�西部时间</generic>
-					<standard>哈�克斯�西部标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>克孜勒奥尔达标准时间</standard>
-					<daylight>克孜勒奥尔达�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>韩国时间</generic>
-					<standard>韩国标准时间</standard>
-					<daylight>韩国�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>�比雪夫时间</standard>
-					<daylight>�比雪夫�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>夸贾林时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>�尔�斯斯�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>斯里兰�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>罗德毫岛时间</generic>
-					<standard>罗德毫岛标准时间</standard>
-					<daylight>罗德毫岛�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>澳门标准时间</standard>
-					<daylight>澳门�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>马加丹时间</standard>
-					<daylight>马加丹�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>马�亚标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>马�西亚标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>马�尔群岛时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>乌兰巴托标准时间</standard>
-					<daylight>乌兰巴托�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>莫斯科时间</generic>
-					<standard>莫斯科标准时间</standard>
-					<daylight>莫斯科�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>缅甸时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>尼泊尔时间</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>新西兰时间</generic>
-					<standard>新西兰标准时间</standard>
-					<daylight>新西兰�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>纽芬兰时间</generic>
-					<standard>纽芬兰标准时间</standard>
-					<daylight>纽芬兰�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>费尔�多-迪诺罗尼亚岛时间</standard>
-					<daylight>费尔�多-迪诺罗尼亚岛�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>北马里亚纳群岛时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>新西伯利亚时间</standard>
-					<daylight>新西伯利亚�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>鄂木斯克时间</standard>
-					<daylight>鄂木斯克�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>巴基斯�标准时间</standard>
-					<daylight>巴基斯��令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>巴拉圭时间</standard>
-					<daylight>巴拉圭�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>秘�时间</standard>
-					<daylight>秘��»¤时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>�律宾时间</standard>
-					<daylight>�律宾�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>彼得岛和米克隆岛时间</generic>
-					<standard>彼得岛和米克隆岛标准时间</standard>
-					<daylight>彼得岛和米克隆岛�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>克孜勒奥尔达标准时间</standard>
-					<daylight>克孜勒奥尔达�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>库页岛时间</standard>
-					<daylight>库页岛�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>�马拉时间</standard>
-					<daylight>�马拉�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>撒马尔罕标准时间</standard>
-					<daylight>撒马尔罕�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>�摩亚标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>�甫�科时间</standard>
-					<daylight>�甫�科�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>新加�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>�里�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>斯维尔德洛夫斯克标准时间</standard>
-					<daylight>斯维尔德洛夫斯克�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Taipei">
-				<long>
-					<generic>�北时间</generic>
-					<standard>�北标准时间</standard>
-					<daylight>�北�令时间</daylight>
-				</long>
-				<short>
-					<generic>CT（�北）</generic>
-					<standard>CST（�北）</standard>
-					<daylight>CDT（�北）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>塔�克斯�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>塔什干标准时间</standard>
-					<daylight>塔什干�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>第比利斯标准时间</standard>
-					<daylight>第比利斯�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>土耳其时间</standard>
-					<daylight>土耳其�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>土库曼斯�标准时间</standard>
-					<daylight>土库曼斯��令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>乌拉尔斯克标准时间</standard>
-					<daylight>乌拉尔斯克�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>乌拉圭时间</standard>
-					<daylight>乌拉圭�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>乌�木�标准时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>乌兹别克斯�标准时间</standard>
-					<daylight>¹Œ兹别克斯��令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>委内瑞拉时间</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>海�崴时间</standard>
-					<daylight>海�崴�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>雅库茨克时间</standard>
-					<daylight>雅库茨克�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>����堡标准时间</standard>
-					<daylight>����堡�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>埃里温标准时间</standard>
-					<daylight>埃里温�令时间</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>育空时间</generic>
-					<standard>育空标准时间</standard>
-					<daylight>育空�令时间</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="ADP">
-				<displayName>安�尔比塞塔</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>阿�酋迪拉姆</displayName>
-			</currency>
-			<currency type="AFA">
-				<displayName>阿富汗尼 (1927-2002)</displayName>
-			</currency>
-			<currency type="AFN">
-				<displayName>阿富汗尼</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>阿尔巴尼亚列克</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>亚美尼亚德拉姆</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>�兰安替兰盾</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>安哥拉宽扎</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>安哥拉宽扎 (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>安哥拉新宽扎 (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>安哥拉宽扎 Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>阿根廷奥斯特</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>阿根廷比索 (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>阿根廷比索</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>奥地利先令</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>澳大利亚元</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>阿�巴基尔德元</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>阿塞拜疆马纳特 (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>阿塞拜疆马纳特</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>波士尼亚-赫塞哥维纳第纳尔</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>波士尼亚-赫塞哥维纳兑�券</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>巴巴多斯元</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>孟加拉塔�</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>比利时法郎兑�券</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>比利时法郎</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>比利时法郎（金�）</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>�加利亚硬列弗</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>�加利亚新列弗</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>巴林第纳尔</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>布隆迪法郎</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>百慕大元</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>文莱元</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>玻利维亚诺</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>玻利维亚比索</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>玻利维亚 Mvdol（资金）</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>巴西克�赛罗 Novo (1967-1986)</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>巴西克�扎多</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>巴西克�塞罗 (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>巴西雷亚尔</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>巴西克�扎多 Novo</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>巴西克�塞罗</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>巴哈马元</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>�丹努扎姆</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>ç¼…å…ƒ</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>�茨瓦纳普拉</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>白俄罗斯新�布 (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>白俄罗斯�布</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>伯利兹元</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>加拿大元</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>刚果法郎</displayName>
-			</currency>
-			<currency type="CHF">
-				<displayName>瑞士法郎</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>智利 Unidades de Fomento（资金）</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>智利比索</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>人民�</displayName>
-				<symbol>ï¿¥</symbol>
-			</currency>
-			<currency type="COP">
-				<displayName>哥伦比亚比索</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>哥斯达黎加科朗</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>旧塞尔维亚第纳尔</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>�克硬克郎</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>�巴比索</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>佛得角埃斯库多</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>塞浦路斯镑</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>�克克郎</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>东德奥斯特马克</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>德国马克</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>�布�法郎</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>丹麦克朗</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>多米尼加比索</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>阿尔�利亚第纳尔</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>厄瓜多尔�克雷</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>厄瓜多尔 Unidad de Valor Constante (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>爱沙尼亚克朗</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>埃�镑</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>厄立特里亚纳克法</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>西�牙比塞塔（�户 A）</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>西�牙比塞塔（兑��户）</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>西�牙比塞塔</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>埃塞俄比亚比尔</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>欧元</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>芬兰马克</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>�济元</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>�克兰镑</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>法国法郎</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>英镑</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>乔治亚库蓬拉瑞特</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>乔治亚拉瑞</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>加纳塞第</displayName>
-			</currency>
-			<currency type="GHS">
-				<displayName>加纳塞地</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>直布罗陀镑</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>冈比亚达拉西</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>几内亚法郎</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>几内亚西里</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>赤�几内亚埃奎勒</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>希腊德拉克马</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>�地马拉格查尔</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>葡�牙几内亚埃斯库多</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>几内亚比�比索</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>圭亚那元</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>港元</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>洪都拉斯拉伦皮拉</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>克罗地亚第纳尔</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>克罗地亚库纳</displayName>
-			</currency>
-			<currency type="HTG">
-				<displayName>海地�德</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>匈牙利�林</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>�度尼西亚盾</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>爱尔兰镑</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>以色列镑</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>以色列新谢克尔</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>�度�比</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>伊拉克第纳尔</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>伊朗里亚尔</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>冰岛克朗</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>�大利里拉</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>牙买加元</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>约旦第纳尔</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>日元</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>肯尼亚先令</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>�尔�斯斯�索姆</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>柬埔寨瑞尔</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>科摩罗法郎</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>�鲜圆</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>韩圆</displayName>
-				<symbol>￦</symbol>
-			</currency>
-			<currency type="KWD">
-				<displayName>科�特第纳尔</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>开曼元</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>哈�克斯��戈</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>��基普</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>黎巴嫩镑</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>斯里兰��比</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>利比亚元</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>莱索托洛蒂</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>立陶宛立特</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>立陶宛塔咯��</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>�森堡�兑�法郎</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>�森堡法郎</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>�森堡金�法郎</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>拉脱维亚拉特</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>拉脱维亚�布</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>利比亚第纳尔</displayName>
-			</currency>
-			<currency type="MAD">
-				<displayName>摩洛哥迪拉姆</displayName>
-			</currency>
-			<currency type="MAF">
-				<displayName>摩洛哥法郎</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>摩尔多瓦列伊</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>马达加斯加阿里亚里</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>马达加斯加法郎</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>马其顿戴代纳尔</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>马里法郎</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>缅甸开亚特</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>蒙�图格里克</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>澳门元</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>毛里塔尼亚乌�亚</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>马耳他里拉</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>马耳他镑</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>毛里求斯�比</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>马尔代夫拉�亚</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>马拉维克瓦查</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>墨西哥比索</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>墨西哥银比索 (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>墨西哥 Unidad de Inversion (UDI)（资金）</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>马�西亚林�特</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>莫桑比克埃斯库多</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>旧莫桑比克美��</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>莫桑比克美��</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>纳米比亚元</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>尼日利亚奈拉</displayName>
-			</currency>
-			<currency type="NIC">
-				<displayName>尼加拉瓜科多巴</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>尼加拉瓜金科多巴</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>�兰盾</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>挪�克朗</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>尼泊尔�比</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>新西兰元</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>阿曼里亚尔</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>巴拿马巴波亚</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>秘��第</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>秘�新索尔</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>秘�索尔</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>巴布亚新几内亚基那</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>�律宾比索</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>巴基斯��比</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>波兰兹罗�</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>波兰兹罗� (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>葡�牙埃斯库多</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>巴拉圭瓜拉尼</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>�塔尔里亚尔</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>罗得西亚元</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>旧罗马尼亚列伊</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>罗马尼亚列伊</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>塞尔维亚第纳尔</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>俄国�布</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>俄国�布 (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>�旺达法郎</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>沙特里亚尔</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>所罗门群岛元</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>塞舌尔�比</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>�丹第纳尔</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>�丹镑</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>旧�丹镑</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>瑞典克朗</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>新加�元</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>圣赫勒拿群岛磅</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>斯洛文尼亚托拉尔</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>斯洛�克克朗</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>塞拉利昂利昂</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>索马里先令</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>�里�元</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>�里�盾</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>圣多美和普林西比多布拉</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>���布</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>�尔瓦多科朗</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>�利亚镑</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>斯�士兰里兰�尼</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>æ³°é“¢</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>塔�克斯��布</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>塔�克斯�索莫尼</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>土库曼斯�马纳特</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>�尼斯第纳尔</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>汤加潘加</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>�汶埃斯库多</displayName>
-			</currency>
-			<currency type="TRL">
-				<displayName>土耳其里拉</displayName>
-			</currency>
-			<currency type="TRY">
-				<displayName>新土耳其里拉</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>特立尼达和多巴哥元</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>新��</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>�桑尼亚先令</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>乌克兰格里夫尼亚</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>乌克兰�</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>乌干达先令 (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>乌干达先令</displayName>
-			</currency>
-			<currency type="USD">
-				<displayName>美元</displayName>
-			</currency>
-			<currency type="USN">
-				<displayName>美元（次日）</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>美元（当日）</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>乌拉圭新比索 (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>乌拉圭比索</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>乌兹别克斯�姆</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>委内瑞拉�利瓦</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>委内瑞拉强势玻利瓦</displayName>
-			</currency>
-			<currency type="VND">
-				<displayName>越�盾</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>瓦努阿图瓦图</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>西�摩亚塔拉</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>中�金��作法郎</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>银</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>黄金</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>欧洲����</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>欧洲货��盟</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>欧洲计算�� (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>欧洲计算�� (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>东加勒比元</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>特别�款�</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>欧洲货���</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>法国金法郎</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>法国 UIC 法郎</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>�洲金�共�体法郎</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>é’¯</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>太平洋法郎</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>é“‚</displayName>
-			</currency>
-			<currency type="XRE">
-				<displayName>RINET 基金</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>为测试�留的代�</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>货�未知或无效</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>也门第纳尔</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>也门里亚尔</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>�斯拉夫硬第纳尔</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>�斯拉夫��第纳尔</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>�斯拉夫�兑�第纳尔</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>��兰特 (金�)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>��兰特</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>赞比亚克瓦查</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>新扎伊尔</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>扎伊尔</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>津巴布韦元</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="day">
-			<unitPattern count="other">{0}æ—¥</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0}�时</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0}分</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0}月</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0}秒</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0}周</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0}å¹´</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>是:确定</yesstr>
-			<nostr>�:�定</nostr>
-		</messages>
-	</posix>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_CN.xml b/airtime_mvc/library/Zend/Locale/Data/zh_CN.xml
deleted file mode 100644
index e3e99acd9..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.47 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<territory type="CN"/>
-	</identity>
-	<alias source="zh_Hans_CN" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_HK.xml b/airtime_mvc/library/Zend/Locale/Data/zh_HK.xml
deleted file mode 100644
index ae671f724..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_HK.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.44 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<territory type="HK"/>
-	</identity>
-	<alias source="zh_Hant_HK" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hans.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hans.xml
deleted file mode 100644
index 20abcba3e..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hans.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.50 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<script type="Hans"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_CN.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hans_CN.xml
deleted file mode 100644
index bcb72d314..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_CN.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.38 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<script type="Hans"/>
-		<territory type="CN"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_HK.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hans_HK.xml
deleted file mode 100644
index 393b0a46a..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_HK.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.5 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<script type="Hans"/>
-		<territory type="HK"/>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="HKD">
-				<symbol>$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_MO.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hans_MO.xml
deleted file mode 100644
index 25d7ceaa8..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_MO.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.4 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<script type="Hans"/>
-		<territory type="MO"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_SG.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hans_SG.xml
deleted file mode 100644
index 6c1eaa2d6..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hans_SG.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.63 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="zh"/>
-		<script type="Hans"/>
-		<territory type="SG"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>dd/MM/yy</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>ahh:mm:ssz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>ahh:mm</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Md">M月d日</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">ahh至ahh</greatestDifference>
-							<greatestDifference id="h">ahh至hh</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hm">
-							<greatestDifference id="a">ahh:mm至ahh:mm</greatestDifference>
-							<greatestDifference id="h">ahh:mm至hh:mm</greatestDifference>
-							<greatestDifference id="m">ahh:mm至hh:mm</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">ahh:mm至ahh:mmv</greatestDifference>
-							<greatestDifference id="h">ahh:mm至hh:mmv</greatestDifference>
-							<greatestDifference id="m">ahh:mm至hh:mmv</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">ahh至ahhv</greatestDifference>
-							<greatestDifference id="h">ahh至hhv</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">dd/MM至dd/MM</greatestDifference>
-							<greatestDifference id="M">dd/MM至dd/MM</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">dd/MME至dd/MME</greatestDifference>
-							<greatestDifference id="M">dd/MME至dd/MME</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">MM/yy至MM/yy</greatestDifference>
-							<greatestDifference id="y">MM/yy至MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">dd/MM/yy至dd/MM/yy</greatestDifference>
-							<greatestDifference id="M">dd/MM/yy至dd/MM/yy</greatestDifference>
-							<greatestDifference id="y">dd/MM/yy至dd/MM/yy</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">dd/MM/yyE至dd/MM/yyE</greatestDifference>
-							<greatestDifference id="M">dd/MM/yyE至dd/MM/yyE</greatestDifference>
-							<greatestDifference id="y">dd/MM/yyE至dd/MM/yyE</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hant.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hant.xml
deleted file mode 100644
index 9d41caf16..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hant.xml
+++ /dev/null
@@ -1,3784 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.141 $"/>
-		<generation date="$Date: 2009/06/22 12:56:45 $"/>
-		<language type="zh"/>
-		<script type="Hant"/>
-	</identity>
-	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localeSeparator>，</localeSeparator>
-		</localeDisplayPattern>
-		<languages>
-			<language type="ab">阿布哈茲文</language>
-			<language type="ace">亞齊文</language>
-			<language type="ach">阿僑利文</language>
-			<language type="ada">阿當莫文</language>
-			<language type="ady">阿迪�文</language>
-			<language type="ae">阿緯斯陀文</language>
-			<language type="af">���蘭文</language>
-			<language type="afa">亞�諸語言</language>
-			<language type="ain">愛努文</language>
-			<language type="ak">阿�文</language>
-			<language type="ale">阿留申文</language>
-			<language type="alg">阿爾岡昆諸語言</language>
-			<language type="alt">�阿爾泰文</language>
-			<language type="an">阿拉貢文</language>
-			<language type="ang">�英文</language>
-			<language type="apa">阿帕切諸語言</language>
-			<language type="arn">阿勞�文</language>
-			<language type="art">人工語言</language>
-			<language type="as">阿薩姆文</language>
-			<language type="ast">阿斯圖里亞文</language>
-			<language type="ath">阿薩帕斯�諸語言</language>
-			<language type="aus">澳洲諸語言</language>
-			<language type="av">阿瓦爾文</language>
-			<language type="awa">阿瓦文</language>
-			<language type="ay">艾馬拉文</language>
-			<language type="az">亞塞拜然文</language>
-			<language type="ba">巴什客爾文</language>
-			<language type="bad">��文</language>
-			<language type="bai">巴米累克諸語言</language>
-			<language type="ban">峇里文</language>
-			<language type="bas">å·´è–©æ–‡</language>
-			<language type="bat">波羅的海諸語言</language>
-			<language type="be">白俄羅斯文</language>
-			<language type="bej">�扎文</language>
-			<language type="bem">別姆巴文</language>
-			<language type="ber">��爾文</language>
-			<language type="bg">�加利亞文</language>
-			<language type="bh">比哈爾文</language>
-			<language type="bho">�傑普爾文</language>
-			<language type="bi">比斯拉馬文</language>
-			<language type="bik">比科爾文</language>
-			<language type="bla">錫克錫�文</language>
-			<language type="bnt">�圖諸語言</language>
-			<language type="bo">�文</language>
-			<language type="bs">波士尼亞文</language>
-			<language type="bua">布里阿特文</language>
-			<language type="bug">布�斯文</language>
-			<language type="byn">比林文</language>
-			<language type="ca">加泰羅尼亞文</language>
-			<language type="cai">中美�第安諸語言</language>
-			<language type="car">加勒比文</language>
-			<language type="cau">高加索諸語言</language>
-			<language type="cch">阿燦文</language>
-			<language type="ce">車臣文</language>
-			<language type="ceb">宿霧文</language>
-			<language type="cel">凱爾特諸語言</language>
-			<language type="ch">查莫洛文</language>
-			<language type="chb">奇布查文</language>
-			<language type="chk">處奇斯文</language>
-			<language type="chm">馬里文</language>
-			<language type="chn">契奴克文</language>
-			<language type="cho">喬克托文</language>
-			<language type="chp">奇佩瓦�文</language>
-			<language type="chr">柴羅基文</language>
-			<language type="chy">沙伊安文</language>
-			<language type="cmc">佔語諸語言</language>
-			<language type="cpe">�洲腔調和洋涇濱，�自英文的(其他)</language>
-			<language type="cpf">�洲腔調和洋涇濱，�自法文的(其他)</language>
-			<language type="cpp">�洲腔調和洋涇濱，�自葡�牙文的(其他)</language>
-			<language type="cr">克裡文</language>
-			<language type="crh">克里米亞�島的土耳其文；克里米亞�島的塔塔爾文</language>
-			<language type="crp">克里奧爾文和皮欽文</language>
-			<language type="csb">�舒布文</language>
-			<language type="cus">庫施特諸語言</language>
-			<language type="cy">�爾斯文</language>
-			<language type="da">丹麥文</language>
-			<language type="dak">�科他文</language>
-			<language type="dar">�爾格瓦文</language>
-			<language type="day">迪雅克文</language>
-			<language type="de_AT">德文 (奧地利)</language>
-			<language type="del">德拉瓦文</language>
-			<language type="den">斯拉夫</language>
-			<language type="dgr">多格里布文</language>
-			<language type="doi">多格來文</language>
-			<language type="dra">德拉�諸語言</language>
-			<language type="dsb">下索布文</language>
-			<language type="dua">�亞拉文</language>
-			<language type="dum">中��蘭文</language>
-			<language type="dv">迪維西文</language>
-			<language type="ee">埃維文</language>
-			<language type="efi">埃�克文</language>
-			<language type="egy">�埃�文</language>
-			<language type="eka">艾�朱克文</language>
-			<language type="el">希臘文</language>
-			<language type="elx">埃蘭文</language>
-			<language type="en_AU">英文 (澳洲)</language>
-			<language type="en_GB">英文 (英國)</language>
-			<language type="en_US">英文 (美國)</language>
-			<language type="eo">世界語</language>
-			<language type="es_419">西�牙文 (拉�美洲)</language>
-			<language type="es_ES">西�牙文 (西�牙)</language>
-			<language type="et">愛沙尼亞文</language>
-			<language type="ewo">�汪都文</language>
-			<language type="fan">芳�文</language>
-			<language type="ff">富拉文</language>
-			<language type="fi">芬蘭文</language>
-			<language type="fil">�律賓文</language>
-			<language type="fiu">芬�諸語言</language>
-			<language type="fj">�濟文</language>
-			<language type="fo">法羅文</language>
-			<language type="fon">�文</language>
-			<language type="fr_CH">法文 (瑞士)</language>
-			<language type="frr">北弗里西亞文</language>
-			<language type="frs">�弗里西亞文</language>
-			<language type="fy">西弗里西亞文</language>
-			<language type="ga">愛爾蘭文</language>
-			<language type="gaa">加�文</language>
-			<language type="gay">加約文</language>
-			<language type="gba">葛巴亞文</language>
-			<language type="gd">蘇格蘭 - 蓋爾文</language>
-			<language type="gem">日耳曼諸語言</language>
-			<language type="gez">�茲文</language>
-			<language type="gil">�爾伯特群島文</language>
-			<language type="gl">加里西亞文</language>
-			<language type="gmh">中�高地日耳曼文</language>
-			<language type="goh">�高地日耳曼文</language>
-			<language type="gon">岡德文</language>
-			<language type="gor">科隆�羅文</language>
-			<language type="got">哥德文</language>
-			<language type="grc">�希臘文</language>
-			<language type="gu">�亞拉塔文</language>
-			<language type="gv">曼島文</language>
-			<language type="gwi">圭契文</language>
-			<language type="hai">海�文</language>
-			<language type="he">希伯來文</language>
-			<language type="hi">北�度文</language>
-			<language type="hil">希利蓋農文</language>
-			<language type="him">赫馬查利文</language>
-			<language type="hit">赫梯文</language>
-			<language type="hmn">å­Ÿæ–‡</language>
-			<language type="ho">西里莫圖土文</language>
-			<language type="hr">克羅埃西亞文</language>
-			<language type="ht">海地文</language>
-			<language type="hy">亞美尼亞文</language>
-			<language type="hz">赫雷羅文</language>
-			<language type="ia">國際文A</language>
-			<language type="id">�尼文</language>
-			<language type="ie">國際文E</language>
-			<language type="ig">伊布文</language>
-			<language type="ii">四��文</language>
-			<language type="ijo">伊喬文</language>
-			<language type="ik">�奴皮維克文</language>
-			<language type="ilo">伊洛闊文</language>
-			<language type="inc">�度諸語言</language>
-			<language type="ine">��諸語言</language>
-			<language type="io">伊朗文</language>
-			<language type="ira">伊朗諸語言</language>
-			<language type="iro">易洛�文</language>
-			<language type="is">冰島文</language>
-			<language type="it">義大利文</language>
-			<language type="iu">因�特文</language>
-			<language type="jbo">�輯文</language>
-			<language type="jpr">猶太教-波斯文</language>
-			<language type="jrb">猶太阿拉伯文</language>
-			<language type="ka">喬治亞文</language>
-			<language type="kaa">�拉�爾帕克文</language>
-			<language type="kab">�比爾文</language>
-			<language type="kar">克倫文</language>
-			<language type="kbd">�巴爾�文</language>
-			<language type="kfo">科羅文</language>
-			<language type="kg">剛果文</language>
-			<language type="khi">科�桑諸語言</language>
-			<language type="kho">和�文</language>
-			<language type="ki">�庫尤文</language>
-			<language type="kj">廣亞馬文</language>
-			<language type="kk">哈薩克文</language>
-			<language type="kl">格陵蘭文</language>
-			<language type="km">高棉文</language>
-			<language type="kn">�那�文</language>
-			<language type="ko">韓文</language>
-			<language type="kok">貢根文</language>
-			<language type="kos">科斯雷�文</language>
-			<language type="kr">�努裡文</language>
-			<language type="krc">�拉柴-包爾�爾文</language>
-			<language type="kro">克魯文</language>
-			<language type="kru">庫魯科文</language>
-			<language type="ks">克什米爾文</language>
-			<language type="ku">庫爾德文</language>
-			<language type="kum">庫密克文</language>
-			<language type="kut">庫特奈文</language>
-			<language type="kw">康瓦耳文</language>
-			<language type="ky">�爾�斯文</language>
-			<language type="lad">拉迪諾文</language>
-			<language type="lah">拉亨�文</language>
-			<language type="lam">蘭巴文</language>
-			<language type="lb">盧森堡文</language>
-			<language type="lez">列茲干文</language>
-			<language type="lg">干�文</language>
-			<language type="li">æž—å ¡æ–‡</language>
-			<language type="lo">寮國文</language>
-			<language type="lol">芒戈文</language>
-			<language type="loz">洛齊文</language>
-			<language type="lt">立陶宛語</language>
-			<language type="lu">魯巴加丹加文</language>
-			<language type="lua">魯巴魯魯亞文</language>
-			<language type="lui">路易塞諾文</language>
-			<language type="lun">盧��文</language>
-			<language type="luo">盧奧文</language>
-			<language type="lus">盧晒文</language>
-			<language type="lv">拉脫維亞文</language>
-			<language type="mad">馬都拉文</language>
-			<language type="mag">馬加伊文</language>
-			<language type="mai">�蒂利文</language>
-			<language type="mak">望加錫文</language>
-			<language type="map">�島諸語言</language>
-			<language type="mas">馬賽文</language>
-			<language type="mdr">曼�文</language>
-			<language type="men">門德文</language>
-			<language type="mg">馬爾加什文</language>
-			<language type="mga">中�愛爾蘭文</language>
-			<language type="mh">馬紹爾文</language>
-			<language type="mic">米克馬克文</language>
-			<language type="min">米��堡文</language>
-			<language type="mis">混雜語諸語言</language>
-			<language type="mk">馬其頓文</language>
-			<language type="mkh">孟高棉諸語言</language>
-			<language type="ml">馬來亞拉姆文</language>
-			<language type="mnc">滿�文</language>
-			<language type="mni">曼尼普裡文</language>
-			<language type="mno">馬諾�諸語言</language>
-			<language type="mo">摩爾多瓦文</language>
-			<language type="moh">莫�克文</language>
-			<language type="mr">馬拉地文</language>
-			<language type="ms">馬來文</language>
-			<language type="mt">馬爾他文</language>
-			<language type="mul">多種語言</language>
-			<language type="mun">蒙�諸語言</language>
-			<language type="mus">克里克文</language>
-			<language type="mwl">米蘭德斯文</language>
-			<language type="mwr">馬爾尼裡文</language>
-			<language type="my">緬甸文</language>
-			<language type="myn">馬雅諸語言</language>
-			<language type="myv">厄爾茲亞文</language>
-			<language type="na">諾魯文</language>
-			<language type="nah">�瓦特文</language>
-			<language type="nai">北美�第安諸語言</language>
-			<language type="nb">挪�波克默爾文</language>
-			<language type="nd">北地畢列文</language>
-			<language type="nds">低地日耳曼文；低地薩克�文</language>
-			<language type="ne">尼泊爾文</language>
-			<language type="new">尼瓦爾文</language>
-			<language type="ng">��加文</language>
-			<language type="nia">尼亞斯文</language>
-			<language type="nic">尼日爾科爾多凡諸語言</language>
-			<language type="niu">�埃文</language>
-			<language type="nl">�蘭文</language>
-			<language type="nl_BE">法蘭德斯文</language>
-			<language type="nn">新挪�文</language>
-			<language type="nog">諾蓋文</language>
-			<language type="non">�諾爾斯文</language>
-			<language type="nqo">西�書�語言（N'ko）</language>
-			<language type="nr">�地畢列文</language>
-			<language type="nub">努比亞諸語言</language>
-			<language type="nv">�瓦約文</language>
-			<language type="nwc">�尼瓦爾文</language>
-			<language type="ny">尼�賈文</language>
-			<language type="nym">尼�韋齊文</language>
-			<language type="nyn">尼�科�文</language>
-			<language type="nyo">尼奧囉文</language>
-			<language type="nzi">尼茲馬文</language>
-			<language type="oc">奧克西�文</language>
-			<language type="oj">奧�布瓦文</language>
-			<language type="om">阿曼文</language>
-			<language type="or">�里亞文</language>
-			<language type="os">奧塞�文</language>
-			<language type="osa">�塞奇文</language>
-			<language type="ota">鄂圖曼土耳其文 (1500-1928)</language>
-			<language type="oto">奧托米諸語言</language>
-			<language type="paa">巴布亞諸語言</language>
-			<language type="pag">潘加辛文</language>
-			<language type="pal">巴列維文</language>
-			<language type="pam">潘帕嘉文</language>
-			<language type="pap">帕皮阿門托文</language>
-			<language type="pau">帛�文</language>
-			<language type="peo">�波斯文 (ca.600-400 B.C.)</language>
-			<language type="phi">�律賓諸語言</language>
-			<language type="pl">波蘭文</language>
-			<language type="pon">波那�文</language>
-			<language type="pra">普拉克里特諸語言</language>
-			<language type="pro">�普羅旺斯文</language>
-			<language type="ps">普什圖文</language>
-			<language type="pt_PT">葡�牙文 (葡�牙)</language>
-			<language type="qu">蓋丘亞文</language>
-			<language type="raj">拉賈斯�諸文</language>
-			<language type="rap">復活島文</language>
-			<language type="rar">拉羅通加文</language>
-			<language type="rm">里托羅曼斯文</language>
-			<language type="rn">隆迪文</language>
-			<language type="ro">羅馬尼亞文</language>
-			<language type="roa">羅曼諸語言</language>
-			<language type="rom">�普賽文</language>
-			<language type="root">根語言</language>
-			<language type="rup">羅馬尼亞語系</language>
-			<language type="rw">盧安�文</language>
-			<language type="sad">桑�韋文</language>
-			<language type="sah">雅庫特文</language>
-			<language type="sai">�美�第安諸語言</language>
-			<language type="sal">薩利什諸語言</language>
-			<language type="sam">薩瑪利亞阿拉姆文</language>
-			<language type="sas">æ’’æ’’å…‹æ–‡</language>
-			<language type="sat">散塔利文</language>
-			<language type="sc">撒�文</language>
-			<language type="sco">蘇格蘭文</language>
-			<language type="sd">�度語</language>
-			<language type="se">北方薩米文</language>
-			<language type="sel">瑟爾�普文</language>
-			<language type="sem">閃語諸語言</language>
-			<language type="sga">�愛爾蘭文（至 900）</language>
-			<language type="sgn">手語</language>
-			<language type="sh">塞爾維亞克羅埃西亞文</language>
-			<language type="shn">撣文</language>
-			<language type="si">僧伽羅文</language>
-			<language type="sid">希�摩文</language>
-			<language type="sio">蘇語諸語言</language>
-			<language type="sit">漢�諸語言</language>
-			<language type="sl">斯洛維尼亞文</language>
-			<language type="sla">斯拉夫諸語言</language>
-			<language type="sm">薩摩亞文</language>
-			<language type="sma">�薩米文</language>
-			<language type="smi">薩米諸語言</language>
-			<language type="smj">魯勒薩米文</language>
-			<language type="smn">伊�裡薩米文</language>
-			<language type="sms">斯科特薩米文</language>
-			<language type="sn">塞內加爾文</language>
-			<language type="so">索馬利文</language>
-			<language type="sog">索格底亞�文</language>
-			<language type="sq">阿爾巴尼亞文</language>
-			<language type="sr">塞爾維亞文</language>
-			<language type="srn">蘇拉��墎文</language>
-			<language type="srr">塞雷爾文</language>
-			<language type="ssa">尼羅撒哈拉諸語言</language>
-			<language type="su">巽他語</language>
-			<language type="suk">蘇庫馬文</language>
-			<language type="sus">蘇蘇文</language>
-			<language type="sux">蘇美文</language>
-			<language type="sw">�瓦希里文</language>
-			<language type="syc">�敘利亞文</language>
-			<language type="syr">敘利亞文</language>
-			<language type="ta">�米爾文</language>
-			<language type="tai">傣語諸語言</language>
-			<language type="te">泰盧固文</language>
-			<language type="tem">�姆文</language>
-			<language type="ter">泰雷諾文</language>
-			<language type="tet">æ³°é “æ–‡</language>
-			<language type="ti">�格利尼亞文</language>
-			<language type="tig">蒂格雷文</language>
-			<language type="tiv">�夫文</language>
-			<language type="tk">土庫曼文</language>
-			<language type="tkl">托克勞文</language>
-			<language type="tl">塔加路�文</language>
-			<language type="tlh">克林貢文</language>
-			<language type="tli">特林基特文</language>
-			<language type="tmh">塔馬奇克文</language>
-			<language type="tn">�尼西亞文</language>
-			<language type="to">�加文</language>
-			<language type="tog">湯加文(尼亞薩文)</language>
-			<language type="tpi">托比辛文</language>
-			<language type="ts">特�加文</language>
-			<language type="tsi">欽西安文</language>
-			<language type="tt">韃�文</language>
-			<language type="tum">圖姆布�文</language>
-			<language type="tup">圖皮諸語言</language>
-			<language type="tut">阿爾泰諸語言（其他）</language>
-			<language type="tvl">�瓦魯文</language>
-			<language type="ty">大溪地文</language>
-			<language type="tyv">土凡文</language>
-			<language type="udm">沃蒂艾克文</language>
-			<language type="ug">維�爾文</language>
-			<language type="uga">�加列文</language>
-			<language type="uk">�克蘭文</language>
-			<language type="umb">姆本�文</language>
-			<language type="und">未確定的</language>
-			<language type="ur">�爾都文</language>
-			<language type="uz">�茲別克文</language>
-			<language type="vai">越�文 Vai</language>
-			<language type="ve">溫�文</language>
-			<language type="wak">瓦�什諸語言</language>
-			<language type="war">瓦瑞文</language>
-			<language type="was">瓦紹文</language>
-			<language type="wen">索布諸語言</language>
-			<language type="wo">沃爾夫文</language>
-			<language type="xal">�爾梅克文</language>
-			<language type="xh">科薩文</language>
-			<language type="yao">瑤文</language>
-			<language type="yi">�第緒文</language>
-			<language type="yo">約魯巴文</language>
-			<language type="ypk">尤皮克諸語言</language>
-			<language type="za">壯文</language>
-			<language type="zap">薩波特克文</language>
-			<language type="zbl">布列斯符號</language>
-			<language type="zen">澤�加文</language>
-			<language type="zh_Hans">簡體中文</language>
-			<language type="zh_Hant">�體中文</language>
-			<language type="znd">è´Šå¾·æ–‡</language>
-			<language type="zu">祖魯文</language>
-			<language type="zun">祖尼文</language>
-			<language type="zxx">無語言內容</language>
-		</languages>
-		<scripts>
-			<script type="Arab">阿拉伯文</script>
-			<script type="Armi">皇室亞美尼亞文</script>
-			<script type="Armn">亞美尼亞文</script>
-			<script type="Avst">阿維斯陀文</script>
-			<script type="Bali">峇里文</script>
-			<script type="Batk">巴塔克文</script>
-			<script type="Beng">孟加拉文</script>
-			<script type="Blis">布列斯文</script>
-			<script type="Bopo">注音符號</script>
-			<script type="Brah">婆羅米文</script>
-			<script type="Brai">盲人用點字法</script>
-			<script type="Bugi">布�斯文</script>
-			<script type="Buhd">布希德文</script>
-			<script type="Cakm">查克馬文</script>
-			<script type="Cans">加拿大原�民通用字符</script>
-			<script type="Cari">�里亞文</script>
-			<script type="Cham">�文</script>
-			<script type="Cher">柴羅基文</script>
-			<script type="Copt">科普特文</script>
-			<script type="Cprt">塞浦路斯文</script>
-			<script type="Cyrl">西里俄语</script>
-			<script type="Cyrs">西里爾文（�教會斯拉夫文變體）</script>
-			<script type="Dsrt">德瑟雷特文</script>
-			<script type="Egyd">�埃�世俗體</script>
-			<script type="Egyh">�埃�僧侶體</script>
-			<script type="Egyp">�埃�象形文字</script>
-			<script type="Ethi">衣索匹亞文</script>
-			<script type="Geok">格魯�亞語系（阿索他路里和努斯克胡里文）</script>
-			<script type="Geor">喬治亞文</script>
-			<script type="Glag">格拉哥里文</script>
-			<script type="Goth">歌德文</script>
-			<script type="Grek">希臘文</script>
-			<script type="Gujr">��拉特文</script>
-			<script type="Guru">�爾穆奇文</script>
-			<script type="Hang">諺文</script>
-			<script type="Hani">漢語</script>
-			<script type="Hano">哈努諾文</script>
-			<script type="Hans">簡體中文</script>
-			<script type="Hant">�體中文</script>
-			<script type="Hebr">希伯來文</script>
-			<script type="Hmng">楊�錄苗文</script>
-			<script type="Hung">�匈牙利文</script>
-			<script type="Inds">�度河�域（哈拉帕文）</script>
-			<script type="Ital">��大利文</script>
-			<script type="Java">爪哇文</script>
-			<script type="Jpan">日文</script>
-			<script type="Kali">克耶�文</script>
-			<script type="Khar">�羅須�文</script>
-			<script type="Khmr">高棉文</script>
-			<script type="Knda">�那�文</script>
-			<script type="Kore">韓文</script>
-			<script type="Lana">�拿文</script>
-			<script type="Laoo">寮國文</script>
-			<script type="Latf">拉�文（尖角體活字變體）</script>
-			<script type="Latg">拉�文（蓋爾語變體）</script>
-			<script type="Latn">拉�文</script>
-			<script type="Lepc">雷布查文</script>
-			<script type="Limb">林佈文</script>
-			<script type="Lina">線性文字 A</script>
-			<script type="Linb">線性文字 B</script>
-			<script type="Lyci">呂西亞語</script>
-			<script type="Lydi">里底亞語</script>
-			<script type="Mand">曼安底文</script>
-			<script type="Maya">瑪雅象形文字</script>
-			<script type="Mero">麥羅埃文</script>
-			<script type="Mlym">馬來亞拉姆文</script>
-			<script type="Mong">蒙�文</script>
-			<script type="Moon">Moon</script>
-			<script type="Mtei">曼尼普爾文</script>
-			<script type="Mymr">緬甸文</script>
-			<script type="Nkoo">西�書�語言 (N’Ko)</script>
-			<script type="Ogam">�甘文</script>
-			<script type="Olck">桑塔利文</script>
-			<script type="Orkh">鄂爾渾文</script>
-			<script type="Orya">�利亞文</script>
-			<script type="Osma">�斯曼亞文</script>
-			<script type="Perm">�彼爾姆諸文</script>
-			<script type="Phnx">腓尼基文</script>
-			<script type="Plrd">�格�拼音符</script>
-			<script type="Qaai">Qaai</script>
-			<script type="Rjng">拉讓文</script>
-			<script type="Roro">朗格朗格象形文</script>
-			<script type="Runr">�北�文字</script>
-			<script type="Saur">索拉什特拉文</script>
-			<script type="Sgnw">手語書寫符號</script>
-			<script type="Shaw">簫��字符</script>
-			<script type="Sinh">錫蘭文</script>
-			<script type="Sylo">希洛弟�格里文</script>
-			<script type="Syrc">�利亞文</script>
-			<script type="Syre">敘利亞文（�音體文字變體）</script>
-			<script type="Syrj">敘利亞文（西方文字變體）</script>
-			<script type="Syrn">敘利亞文（�方文字變體）</script>
-			<script type="Tagb">�島文</script>
-			<script type="Tale">傣哪文</script>
-			<script type="Taml">�米爾文</script>
-			<script type="Telu">泰魯�文</script>
-			<script type="Teng">談格瓦文</script>
-			<script type="Tfng">���（��爾文）</script>
-			<script type="Tglg">塔加拉文</script>
-			<script type="Thaa">塔安那文</script>
-			<script type="Thai">æ³°æ–‡</script>
-			<script type="Tibt">西�文</script>
-			<script type="Ugar">�加列文</script>
-			<script type="Vaii">瓦�文</script>
-			<script type="Visp">視覺語音文</script>
-			<script type="Xpeo">�波斯文</script>
-			<script type="Xsux">蘇米魯亞甲文楔形文字</script>
-			<script type="Yiii">彞文</script>
-			<script type="Zxxx">�書寫語言碼</script>
-			<script type="Zyyy">一般文字</script>
-			<script type="Zzzz">未編碼工�指令碼</script>
-		</scripts>
-		<territories>
-			<territory type="014">��</territory>
-			<territory type="018">�洲�部</territory>
-			<territory type="030">�亞</territory>
-			<territory type="034">�亞</territory>
-			<territory type="035">��亞</territory>
-			<territory type="039">��</territory>
-			<territory type="053">澳洲與�西蘭</territory>
-			<territory type="054">美拉尼西亞</territory>
-			<territory type="057">密克羅尼西亞</territory>
-			<territory type="061">玻里尼西亞</territory>
-			<territory type="062">中�亞</territory>
-			<territory type="142">亞洲</territory>
-			<territory type="143">中亞</territory>
-			<territory type="145">西亞</territory>
-			<territory type="150">�洲</territory>
-			<territory type="151">��</territory>
-			<territory type="154">北�</territory>
-			<territory type="155">西�</territory>
-			<territory type="172">�立國�</territory>
-			<territory type="830">海峽群島</territory>
-			<territory type="AD">安�爾</territory>
-			<territory type="AE">阿拉伯��大公國</territory>
-			<territory type="AG">安地��巴布�</territory>
-			<territory type="AI">安圭拉島</territory>
-			<territory type="AL">阿爾巴尼亞</territory>
-			<territory type="AM">亞美尼亞</territory>
-			<territory type="AN">�屬安地列斯</territory>
-			<territory type="AQ">�極洲</territory>
-			<territory type="AS">美屬薩摩亞群島</territory>
-			<territory type="AT">奧地利</territory>
-			<territory type="AU">澳洲</territory>
-			<territory type="AW">阿路巴</territory>
-			<territory type="AX">亞蘭群島</territory>
-			<territory type="AZ">亞塞拜然</territory>
-			<territory type="BA">波士尼亞與赫塞格維�</territory>
-			<territory type="BB">巴�多</territory>
-			<territory type="BD">孟加拉</territory>
-			<territory type="BE">比利時</territory>
-			<territory type="BF">布��法索</territory>
-			<territory type="BG">�加利亞</territory>
-			<territory type="BI">蒲隆地</territory>
-			<territory type="BJ">��</territory>
-			<territory type="BL">�巴瑟米</territory>
-			<territory type="BM">百慕�</territory>
-			<territory type="BN">汶�</territory>
-			<territory type="BO">玻利維亞</territory>
-			<territory type="BS">巴哈馬</territory>
-			<territory type="BV">布�島</territory>
-			<territory type="BW">波札那</territory>
-			<territory type="BY">白俄羅斯</territory>
-			<territory type="BZ">�里斯</territory>
-			<territory type="CC">��斯群島</territory>
-			<territory type="CD">剛果民主共和國</territory>
-			<territory type="CF">中�共和國</territory>
-			<territory type="CG">剛果</territory>
-			<territory type="CI">科特迪瓦</territory>
-			<territory type="CK">庫克群島</territory>
-			<territory type="CM">喀麥隆</territory>
-			<territory type="CN">中�人民共和國</territory>
-			<territory type="CO">哥倫比亞</territory>
-			<territory type="CR">哥斯大黎加</territory>
-			<territory type="CS">塞爾維亞和蒙特尼哥羅</territory>
-			<territory type="CV">維德角</territory>
-			<territory type="CX">�誕島</territory>
-			<territory type="CY">賽普勒斯</territory>
-			<territory type="CZ">�克共和國</territory>
-			<territory type="DE">德國</territory>
-			<territory type="DJ">�布地</territory>
-			<territory type="DK">丹麥</territory>
-			<territory type="DM">多明尼加</territory>
-			<territory type="DO">多明尼加共和國</territory>
-			<territory type="DZ">阿爾�利亞</territory>
-			<territory type="EC">厄瓜多</territory>
-			<territory type="EE">愛沙尼亞</territory>
-			<territory type="ER">厄利垂亞</territory>
-			<territory type="ET">衣索比亞</territory>
-			<territory type="FI">芬蘭</territory>
-			<territory type="FJ">�濟</territory>
-			<territory type="FK">�克蘭群島</territory>
-			<territory type="FM">密克羅尼西亞群島</territory>
-			<territory type="FO">法羅群島</territory>
-			<territory type="FR">法國</territory>
-			<territory type="GA">加彭</territory>
-			<territory type="GB">英國</territory>
-			<territory type="GD">格瑞��</territory>
-			<territory type="GE">喬治亞共和國</territory>
-			<territory type="GF">法屬圭亞那</territory>
-			<territory type="GG">根西島</territory>
-			<territory type="GH">迦�</territory>
-			<territory type="GI">直布羅陀</territory>
-			<territory type="GL">格陵蘭</territory>
-			<territory type="GM">甘比亞</territory>
-			<territory type="GN">幾內亞</territory>
-			<territory type="GP">哥德普洛</territory>
-			<territory type="GQ">赤�幾內亞</territory>
-			<territory type="GR">希臘</territory>
-			<territory type="GS">�喬治亞與�三明治群島</territory>
-			<territory type="GT">瓜地馬拉</territory>
-			<territory type="GU">關島</territory>
-			<territory type="GW">幾內亞比索</territory>
-			<territory type="GY">蓋亞�</territory>
-			<territory type="HK">中�人民共和國香港特別行政�</territory>
-			<territory type="HM">赫德與麥克當諾群島</territory>
-			<territory type="HN">�都拉斯</territory>
-			<territory type="HR">克羅埃西亞</territory>
-			<territory type="ID">�尼</territory>
-			<territory type="IE">愛爾蘭</territory>
-			<territory type="IM">曼島</territory>
-			<territory type="IO">英屬�度洋領土</territory>
-			<territory type="IS">冰島</territory>
-			<territory type="IT">義大利</territory>
-			<territory type="JE">澤西島</territory>
-			<territory type="JM">牙買加</territory>
-			<territory type="JO">ç´„æ—¦</territory>
-			<territory type="KE">肯亞</territory>
-			<territory type="KG">�爾�斯</territory>
-			<territory type="KI">�里巴斯</territory>
-			<territory type="KM">科摩羅群島</territory>
-			<territory type="KN">�克里斯多��尼維斯</territory>
-			<territory type="KP">北韓</territory>
-			<territory type="KR">�韓</territory>
-			<territory type="KY">開曼群島</territory>
-			<territory type="KZ">哈薩克</territory>
-			<territory type="LA">寮國</territory>
-			<territory type="LC">�露西亞</territory>
-			<territory type="LI">列支敦斯登</territory>
-			<territory type="LK">斯里蘭�</territory>
-			<territory type="LR">賴比瑞亞</territory>
-			<territory type="LS">賴索扥</territory>
-			<territory type="LU">盧森堡</territory>
-			<territory type="LV">拉脫維亞</territory>
-			<territory type="LY">利比亞</territory>
-			<territory type="MC">摩�哥</territory>
-			<territory type="MD">摩爾多瓦</territory>
-			<territory type="ME">蒙特內哥羅</territory>
-			<territory type="MF">�馬�</territory>
-			<territory type="MG">馬�加斯加</territory>
-			<territory type="MH">馬紹爾群島</territory>
-			<territory type="MK">馬其頓</territory>
-			<territory type="ML">馬利</territory>
-			<territory type="MM">緬甸</territory>
-			<territory type="MO">中�人民共和國澳門特別行政�</territory>
-			<territory type="MP">北馬里亞�群島</territory>
-			<territory type="MQ">馬�尼克島</territory>
-			<territory type="MR">茅利塔尼亞</territory>
-			<territory type="MS">蒙特色拉特島</territory>
-			<territory type="MT">馬爾他</territory>
-			<territory type="MU">模里西斯</territory>
-			<territory type="MV">馬爾地夫</territory>
-			<territory type="MW">馬拉�</territory>
-			<territory type="MY">馬來西亞</territory>
-			<territory type="MZ">莫三比克</territory>
-			<territory type="NA">�米比亞</territory>
-			<territory type="NC">新喀里多尼亞群島</territory>
-			<territory type="NE">尼日</territory>
-			<territory type="NF">諾�克島</territory>
-			<territory type="NG">奈�利亞</territory>
-			<territory type="NL">�蘭</territory>
-			<territory type="NP">尼泊爾</territory>
-			<territory type="NR">諾魯</territory>
-			<territory type="NU">��島</territory>
-			<territory type="NZ">�西蘭</territory>
-			<territory type="OM">阿曼王國</territory>
-			<territory type="PA">巴拿馬</territory>
-			<territory type="PE">秘魯</territory>
-			<territory type="PF">法屬玻里尼西亞</territory>
-			<territory type="PG">巴布亞�幾內亞</territory>
-			<territory type="PH">�律賓</territory>
-			<territory type="PL">波蘭</territory>
-			<territory type="PM">�彼德與密啟崙</territory>
-			<territory type="PN">皮特康</territory>
-			<territory type="PS">巴勒斯�</territory>
-			<territory type="PW">帛�</territory>
-			<territory type="QA">��</territory>
-			<territory type="QO">大洋洲邊疆群島</territory>
-			<territory type="QU">�盟</territory>
-			<territory type="RE">留尼旺</territory>
-			<territory type="RO">羅馬尼亞</territory>
-			<territory type="RS">塞爾維亞</territory>
-			<territory type="RU">ä¿„ç¾…æ–¯</territory>
-			<territory type="RW">盧安�</territory>
-			<territory type="SA">沙�地阿拉伯</territory>
-			<territory type="SB">索羅門群島</territory>
-			<territory type="SC">塞席爾</territory>
-			<territory type="SD">蘇丹</territory>
-			<territory type="SH">�赫勒拿島</territory>
-			<territory type="SI">斯洛維尼亞</territory>
-			<territory type="SJ">冷岸�央麥�群島</territory>
-			<territory type="SL">��山</territory>
-			<territory type="SM">�馬利諾</territory>
-			<territory type="SN">塞內加爾</territory>
-			<territory type="SO">索馬利亞</territory>
-			<territory type="SR">蘇利�</territory>
-			<territory type="ST">�多美�普林西比</territory>
-			<territory type="SV">薩爾瓦多</territory>
-			<territory type="SY">敘利亞</territory>
-			<territory type="SZ">�瓦濟蘭</territory>
-			<territory type="TC">土克斯�開科斯群島</territory>
-			<territory type="TD">查德</territory>
-			<territory type="TF">法屬�方屬地</territory>
-			<territory type="TG">多哥共和國</territory>
-			<territory type="TH">泰國</territory>
-			<territory type="TJ">塔�克</territory>
-			<territory type="TK">托克勞群島</territory>
-			<territory type="TL">��汶</territory>
-			<territory type="TM">土庫曼</territory>
-			<territory type="TN">�尼西亞</territory>
-			<territory type="TO">�加</territory>
-			<territory type="TT">�里��托巴哥</territory>
-			<territory type="TV">�瓦魯</territory>
-			<territory type="TW">��</territory>
-			<territory type="TZ">�尚尼亞</territory>
-			<territory type="UA">�克蘭</territory>
-			<territory type="UG">�干�</territory>
-			<territory type="UM">美屬邊疆群島</territory>
-			<territory type="US">美國</territory>
-			<territory type="UY">�拉圭</territory>
-			<territory type="UZ">�茲別克</territory>
-			<territory type="VA">梵蒂岡</territory>
-			<territory type="VC">�文森�格瑞那�</territory>
-			<territory type="VE">委內瑞拉</territory>
-			<territory type="VG">英屬維京群島</territory>
-			<territory type="VI">美屬維京群島</territory>
-			<territory type="VU">�那�</territory>
-			<territory type="WF">瓦利斯和���群島</territory>
-			<territory type="WS">薩摩亞群島</territory>
-			<territory type="YE">葉門</territory>
-			<territory type="YT">馬約特</territory>
-			<territory type="ZM">尚比亞</territory>
-			<territory type="ZW">辛巴�</territory>
-			<territory type="ZZ">未確定的�域</territory>
-		</territories>
-		<variants>
-			<variant type="1901">傳統德語拼字學</variant>
-			<variant type="1996">1996 年的德語拼字學</variant>
-			<variant type="AREVELA">亞美尼亞�部</variant>
-			<variant type="AREVMDA">亞美尼亞西部</variant>
-			<variant type="FONIPA">IPA 拼音</variant>
-			<variant type="FONUPA">UPA 拼音</variant>
-			<variant type="MONOTON">單音</variant>
-			<variant type="NEDIS">Natisone 方言</variant>
-			<variant type="POSIX">電腦</variant>
-			<variant type="REVISED">已修訂的拼字學</variant>
-			<variant type="SAAHO">SAAHO</variant>
-		</variants>
-		<keys>
-			<key type="calendar">日曆</key>
-			<key type="collation">æ ¡å°�</key>
-			<key type="currency">貨幣</key>
-		</keys>
-		<types>
-			<type type="big5han" key="collation">�體中文排� - Big5</type>
-			<type type="buddhist" key="calendar">佛教曆法</type>
-			<type type="chinese" key="calendar">農曆</type>
-			<type type="direct" key="collation">直接排�</type>
-			<type type="gb2312han" key="collation">簡體中文排� - GB2312</type>
-			<type type="gregorian" key="calendar">公曆</type>
-			<type type="hebrew" key="calendar">希伯來曆法</type>
-			<type type="indian" key="calendar">�度國家曆法</type>
-			<type type="islamic" key="calendar">伊斯蘭曆法</type>
-			<type type="islamic-civil" key="calendar">伊斯蘭城市曆法</type>
-			<type type="japanese" key="calendar">日本曆法</type>
-			<type type="phonebook" key="collation">電話簿排�</type>
-			<type type="pinyin" key="collation">拼音排�</type>
-			<type type="roc" key="calendar">中�民國曆</type>
-			<type type="stroke" key="collation">筆劃排�</type>
-			<type type="traditional" key="collation">傳統排�</type>
-		</types>
-		<codePatterns>
-			<codePattern type="language">語言：{0}</codePattern>
-			<codePattern type="script">文字：{0}</codePattern>
-			<codePattern type="territory">地�：{0}</codePattern>
-		</codePatterns>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[一 � 七 丈-� 且 世 丘 丙 丟 並 中 串 丸 丹 主 乃 久 么 之 乎 � 乖 乘 乙 � 也 乾 亂 了 予 事 二 于 云 互 五 井 些 亞 亡 交 亦 亨 享 京 亮 人 什 � 仇 今 介 � 仔 他 付 仙 代-以 仰 仲 件 任 份 � 伊 � � 休 伙 伯 估 伴 伸 似 伽 但 佈 �-� 佔 何 余 佛 作 你 佩 佳 使 來 例 供 � 侯 侵 便 係-俄 俊 俗 � 俠 信 修 俱 俾 個 � 們 倒 候 倚 借 倫 值 � � � � � � �-� 傑 備 傢 傲 傳 傷 傻 傾 僅 � 僑 僧 價 儀 億 儒 儘 優 � 元-充 兇-光 克 � 兒 兔 入 內-兩 八-兮 共 兵-典 兼 冊 � 冒 冠 冬 冰 冷 准 凌 � 凡 凰 凱 出 函 刀 分 切 刊 列 � 判 別 利 刪 到 制 刷 刺 刻 則 � 剛 剩 剪 副 割 創 劃 劇 劉 � 力 功 加 助-劫 � 勇 勉 勒 動 務 � 勞 勢 勤 勵 勸 勿 包 匈 化 北 匹 � � � � � � �-� � � � � � � � � 厄 厘 厚 原 厭 厲 去 � � � � � � � � �-� �-� � � � � � � � �-� �-� � � � �-� � � � � � � � � 呀 呂 呆 告 呢 周 味 呵 呼 命 和 咖 咦 咧 咪 咬 咱 哀 � 哇-哉 哎 員 哥 哦 哩 哪 哭 哲 唉 � 唬 售 唯 唱 唷 唸 商 啊 � 啟 啡 啥 啦 啪 喀 喂 善 喇 喊 喔 喜 � 喬 單 喵 嗎 嗚 嗨 嗯 嘆 嘉 嘗 嘛 嘴 嘻 嘿 器 噴 嚇 嚴 囉 四 回 因 困 固 圈 國 � 園 圓 圖 團 圜 土 在 圭 地 圾 � � � � � � � � 垂 垃 型 埃 城 埔 域 執 培 基 堂 堅 堆 堡 堪 報 場 塊 塔 塗 塞 填 塵 境 增 墨 墮 � 壓 壘 壞 壢 士 壯 壽 � 夕 外 多 夜 夠 夢 夥 大 天-夫 央 失 夷 夸 夾 奇-奉 奎 � 契 奔 套 奧 奪 奮 女 奴 奶 她 好 如 妙 妥 妨 妮 妳 妹 妻 姆 姊 始 � 姑 姓 委 姿 � 娃 娘 � 婆 婚 婦 媒 媽 嫌 嫩 � 孔 字 存 � 孟 季 孤 孩 孫 學 它 宅 宇-安 宋 完 � 宗-宜 客-室 宮 害 家 容 宿 寂 寄 密 富 寒 寞 察 寢 實-審 寫 寬 寮 寶 � 射 將 專 尊 尋 �-� 少 尖 尚 尤 就 尺 尼 尾 局 � 居 屆 屋 � 展 屠 層 屬 山 岡 岩 岸 峰 島 峽 崇 崙 崴 � 嶺 � 州 巡 工-巨 巫 差 己 已 巴 巷 市 布 希 帕 帛 � 帥 師 席 帳 帶 常 帽 幅 幕 幣 幫 干-年 幸 幹 幻-幾 床 � 底 店 府 度 座 庫 庭 康 庸 廉 廖 廠 廢 廣 廳 延 廷 建 弄 � 引 弗 弘 弟 弦 弱 張 強 彈 彊 彌 彎 彞 形 彥 彩 彬 彭 彰 影 役 彼 往 � 待 很 律 後 �-徒 得 從 復 微 徵 德 徹 心 必 忌 � 志-忙 忠 快 念 忽 怎 怒 怕 怖 � 怡 急 性 怨 怪 � � � � � � � � � 悅 悉 悔 悟 悠 您 悲 悶 情 惑 惜 惠 惡 惱 想 惹 � 愈 愉 � 愚 愛 感 慈 態 慕 慘 慢 慣 慧 慮 慰 慶 慾 憂 � 憑 憲 憶 憾 懂 應 懶 懷 懼 戀 戈 �-戒 或 截 戰 戲 戴 戶 房-� 扇 手 � 扎 打 托 扣 扥 扭 扯 批 找-技 抄 把 抓 投 抗 折 披 抬 抱 抵 抹 抽 拆 拉 拋 � 拒 拔 拖 招 拜 括 拳 拼 拾 拿 � 指 按 挑 挖 挪 振 挺 � � � � � 掃 授 掉 掌 排 掛 採 探 接 控 推 措 � � � � � � � � � � � � � � 摘 摩 摸 � 撒 撞 撣 撥 播 撾 撿 � 擇 擊 擋 � 擎 擔 據 擠 擦 擬 擴 擺 擾 � 支 收 改 攻 放 政 故 效 � � 救 敗-教 � 敢 散 敦 敬 整 敵 數 文 � 斗 料 斯 新 斷 方 於 施 � 旅 旋 � 旗 既 日 旦 早 旭 旺 昂 昆 昇 昌 明 � 易 星 映 春 昨 昭 是 時 晉 晒 晚 晨 普 景 晴 晶 智 暑 暖 暗 暫 暴 曆 曉 曰 曲 更 書 曼 曾-最 會 月 有 朋 � 朗 望 � 期 木 未-札 朱 朵 � � � � � � �-� � � � 林 果 � 架 � � 染 柔 查 柬 柳 柴 校 核 根 格 桃 案 桌 桑 � 梅 � 梨 梯 械 梵 棄 棉 棋 棒 棚 森 椅 � 椰 楊 楓 楚 業 極 概 榜 榮 構 � 樂 樓 標 樞 模 樣 樹 橋 機 橫 檀 檔 檢 欄 權 次 欣 欲 欺 欽 款 歉 歌 � 歡-武 歲 歷 歸 死 殊 殘 段 殺 殼 毀 毅 � � 毒 比 毛 毫 � 民 氣 水 永 求 汗 � 江-污 汪 汶 決 汽 沃 沈 沉 沒 沖 沙 河 油 治 沿 � 泉 泊 法 泡 波 泥 注 泰 泳 洋 洗 洛 洞 洩 洪 洲 活 洽 派 � 浦 浩 浪 浮 海 涇-涉 涯 液 涵 涼 淑 淚 淡 淨 深 混 淺 清 減 渡 測 港 游 湖 湯 � 準 � 溪 溫 滄 滅 滋 滑 滴 滾 滿 漂 � 演 漠 漢 漫 漲 漸 潔 潘 潛 潮 澤 澳 激 濃 濟 濤 濫 濱 � � � � � 炎 炮 炸 為 烈 � 烤 無 焦 然 煙 煞 照 煩 熊 熟 熱 燃 燈 燒 營 爆 � 爛 爪 爬 爭 爵 父 爸 爺 爽 爾 牆-版 牌 牙 牛 牠 牧 物 牲 特 牽 犧 犯 狀 狂 � 狗 狠 狼 猛 猜 猶 � � � � � � � 玄 率 玉 王 玩 玫 玲 玻 � � � � � � � � � � 瑙 瑜 瑞 瑟 瑤 瑪 瑰 環 瓜 瓦 瓶 甘 甚 甜 生 產 用 田-申 男 甸 界 留 畢 略 番 畫 異 當 疆 � 疑 疼 病 痕 痛 痴 瘋 療 癡 登-百 的 皆 皇 皮 盃 益 盛 盜 盟 盡 監 盤 盧 目 盲 直 相 盼 盾 � 眉 看 真 眠 眼 眾 � � � 瞧 瞭 矛 矣 知 短 石 砂 � 研 砲 破 硬 碎 碗 碟 碧 碩 碰 確 碼 � 磨 磯 礎 礙 示 社 祕 祖 � 神 祥 票 � � � 禪 禮 秀 � 秋 科 秒 秘 租 秤 秦 移 稅 程 � 種 稱 稿 穆 穌 � 穩 究 穹 空 穿 � 窗 窩 窮 立 站 竟 章 童 端 競 竹 笑 笛 符 笨 第 筆 等 筋 答 策 简 算 管 箭 箱 節 範 篇 築 簡 簫 簽 簿 籃 籌 � 米 粉 粗 精 糊 糕 糟 系 糾 紀 約 紅 � � 純 紙-紛 素 索 紫 累 細 紹 終 組 � 絕 絡 給 統 絲 經 綜 綠 維 綱 網 緊 緒 線 緣 編 緩 緬 緯 練 縣 縮 縱 總 績 � 織 繞 繪 繳 繼 續 缸 缺 罕 罪 置 罰 署 罵 罷 羅 羊 美 羞 群 義 羽 � 習 翔 翰 翹 翻 翼 耀 � 考 者 而 � � 耗 耳 耶 � � � � � � � � � 肉 肚 股 肥 肩 肯 育 背 胎 胖 胞 胡 胸 能 脆 脫 腓 腔 腦 腰 腳 腿 膽 臉 臘 臣 臥 臨 自 臭 至 致 臺 與-舊 舌 � 舒 舞 舟 航 般 船 艦 良 色 艾 � 芬 花 芳 若 苦 英 茅 茫 茲 茶 � � � 莉 莊 莎 莫 � � � � � � � � 葉 著 葛 葡 蒂 蒙 蒲 蒼 蓋 蓮 蔕 蔡 蔣 蕭 薄 薦 薩 薪 藉 � � � 藤 藥 蘆 蘇 蘭 虎 處 虛 號 虧 蛋 蛙 蜂 蜜 � � 螢 蟲 蟹 � 蠻 血 行 術 街 衛 � 衡 衣 表 袋 被 � 裂 裕 補 � 裡 製 複 褲 西 � 覆 見 � 視 親 覺 覽 觀 角 解 觸 言 訂 計 訊 討 訓 託 記 訪 設 許 訴 註 証 評 詞 詢 試 詩 話-詳 誇 誌 � 誓 誕 語 誠 誤 說 誰 課 誼 調 談 請 諒 論 諸 諺 諾 謀 謂 講 � 證 識 譜 警 譯 議 護 譽 讀 變 讓 讚 谷 豆 豈 � 象 豪 豬 貌 貓 � 貞 負-貢 貨 貪-責 貴 買 費 貼 賀 資 賈 賓 賜 賞 賢-賤 賦 質 賭 賴 賺 購 賽 贈 贊 � 赤 赫 走 起 超 越 趕 趙 趣 趨 足 跌 跎 跑 � 跟 跡 路 跳 � 踢 蹟 蹤 � 身 躲 車 軌 � 軒 軟 較 載 輔 輕 輛 � 輩 輪 輯 輸 轉 轟 辛 辦 辨 辭 辯 辱 農 迅 迎 近 迦 迪 迫 述 迴 迷 追 退 � 逃 逆 � � 途 這-逛 � 速 造 逢 連 週 進 逸 逼 � � � � � �-� � � � � � � � � � � �-� 還 邊 � 那 邦 邪 邱 郎 部 郭 郵 都 鄂 鄉 鄭 鄰 � 酒 酷 酸 醉 醒 醜 醫 采 釋-� 金 � 釣 鈴 銀 銖 銘 銳 銷 鋒 鋼 錄 錢 錦 錫 錯 � � � 鎊 鎖 鎮 � � � 鑑 長 門 閃 閉 開 閒 間 閣 閱 闆 闊 � 關 闡 防 阻 阿 陀 附 � � 院-除 陪 陰 陳 陵-陸 陽 隆 隊 階 隔 際 障 隨 險 隱 隻 雄-集 雖 雙 雜 雞 離 難 雨 雪 雲 零 雷 電 需 震 � 霧 露 霸 霹 � � � � � � � � � � 鞋 韃 韋 韓 音 韻 響 � 頂 項 順 須 � 頑 頓 頗 領 頭 頻 顆 題 � � 願 類 顧 顯 風 飄 飛 食 飯 飲 飽 飾 餅 養 � 餘 館 首 香 馬 � 駕 駛 騎 騙 騷 驅 驗 驚 骨 體 高 髮 鬆 鬥 鬧 鬱 鬼 � 魂 魅 魔 魚 魯 鮮 鳥 鳳 鳴 鴻 � 鷹 鹿 麗 麥 麵 麻 麼 黃 黎 黑 默 點 黨 鼓 鼠 鼻 齊 齋 齒 齡 � 龜]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[� 侶 兌 兹 别 勳 � � � 堤 墎 奥 孜 峇 巽 � 楔 渾 燦 狄 � 瑚 甫 � 芒 苗 茨 蚩 蜀 隴]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>「</quotationStart>
-		<quotationEnd>�</quotationEnd>
-		<alternateQuotationStart>『</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="chinese">
-				<am>上�</am>
-				<pm>下�</pm>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEEy'x'G-Ml-d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">1月</month>
-							<month type="2">2月</month>
-							<month type="3">3月</month>
-							<month type="4">4月</month>
-							<month type="5">5月</month>
-							<month type="6">6月</month>
-							<month type="7">7月</month>
-							<month type="8">8月</month>
-							<month type="9">9月</month>
-							<month type="10">10月</month>
-							<month type="11">11月</month>
-							<month type="12">12月</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">週日</day>
-							<day type="mon">週一</day>
-							<day type="tue">週二</day>
-							<day type="wed">週三</day>
-							<day type="thu">週四</day>
-							<day type="fri">週五</day>
-							<day type="sat">週六</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<quarters>
-					<quarterContext type="format">
-						<quarterWidth type="wide">
-							<quarter type="1">第1季</quarter>
-							<quarter type="2">第2季</quarter>
-							<quarter type="3">第3季</quarter>
-							<quarter type="4">第4季</quarter>
-						</quarterWidth>
-					</quarterContext>
-				</quarters>
-				<eras>
-					<eraNames>
-						<era type="0">西元�</era>
-						<era type="1">西元</era>
-					</eraNames>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>yyyy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>zzzzah時mm分ss秒</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>zah時mm分ss秒</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>ah:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="Ed">dæ—¥(E)</dateFormatItem>
-						<dateFormatItem id="H">H時</dateFormatItem>
-						<dateFormatItem id="HHmm">H:mm</dateFormatItem>
-						<dateFormatItem id="HHmmss">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">M-d（E）</dateFormatItem>
-						<dateFormatItem id="MMdd">MM/dd</dateFormatItem>
-						<dateFormatItem id="MMMMEd">MMMMdæ—¥(E)</dateFormatItem>
-						<dateFormatItem id="yM">yyyy/M</dateFormatItem>
-						<dateFormatItem id="yMEd">yyyy/M/d（EEE）</dateFormatItem>
-						<dateFormatItem id="yMMM">y年M月</dateFormatItem>
-						<dateFormatItem id="yMMMEd">y年M月d日EEE</dateFormatItem>
-						<dateFormatItem id="yMMMM">y年M月</dateFormatItem>
-						<dateFormatItem id="yyMM">yyyy/MM</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatFallback>{0}至{1}</intervalFormatFallback>
-						<intervalFormatItem id="h">
-							<greatestDifference id="a">ah時至ah時</greatestDifference>
-							<greatestDifference id="h">ah時至h時</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">vah時至ah時</greatestDifference>
-							<greatestDifference id="h">vah時至h時</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="M">
-							<greatestDifference id="M">M月至M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M/d至M/d</greatestDifference>
-							<greatestDifference id="M">M/d至M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M/dE至M/dE</greatestDifference>
-							<greatestDifference id="M">M/dE至M/dE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL至LLLL</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy/M至yyyy/M</greatestDifference>
-							<greatestDifference id="y">yyyy/M至yyyy/M</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy/M/d至yyyy/M/d</greatestDifference>
-							<greatestDifference id="M">yyyy/M/d至yyyy/M/d</greatestDifference>
-							<greatestDifference id="y">yyyy/M/d至yyyy/M/d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yyyy/M/dE至yyyy/M/dE</greatestDifference>
-							<greatestDifference id="M">yyyy/M/dE至yyyy/M/dE</greatestDifference>
-							<greatestDifference id="y">yyyy/M/dE至yyyy/M/dE</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">y年M月至M月</greatestDifference>
-							<greatestDifference id="y">y/M至y/M</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>年代</displayName>
-					</field>
-					<field type="week">
-						<displayName>週</displayName>
-					</field>
-					<field type="day">
-						<relative type="-3">大�天</relative>
-						<relative type="2">後天</relative>
-						<relative type="3">大後天</relative>
-					</field>
-					<field type="weekday">
-						<displayName>週天</displayName>
-					</field>
-					<field type="hour">
-						<displayName>�時</displayName>
-					</field>
-					<field type="minute">
-						<displayName>分�</displayName>
-					</field>
-					<field type="second">
-						<displayName>秒</displayName>
-					</field>
-					<field type="zone">
-						<displayName>�域</displayName>
-					</field>
-				</fields>
-			</calendar>
-			<calendar type="roc">
-				<am>上�</am>
-				<pm>下�</pm>
-				<eras>
-					<eraAbbr>
-						<era type="0">民國�</era>
-						<era type="1">民國</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>Gy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>Gy/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMd">M月d日</dateFormatItem>
-						<dateFormatItem id="MMMEd">M月d日EEE</dateFormatItem>
-						<dateFormatItem id="yyyy">Gy</dateFormatItem>
-						<dateFormatItem id="yyyyM">y/M</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">y/M/d（EEE）</dateFormatItem>
-						<dateFormatItem id="yyyyMM">y/MM</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">Gy年M月</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">Gy年M月d日EEE</dateFormatItem>
-						<dateFormatItem id="yyyyQ">y年第Q季度</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">Gy QQQ</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<gmtZeroFormat>GMT</gmtZeroFormat>
-			<regionFormat>{0}時間</regionFormat>
-			<fallbackFormat>{1}({0})</fallbackFormat>
-			<zone type="Etc/Unknown">
-				<exemplarCity>未知地�</exemplarCity>
-			</zone>
-			<zone type="Europe/Andorra">
-				<exemplarCity>安�爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Dubai">
-				<exemplarCity>�拜</exemplarCity>
-			</zone>
-			<zone type="Asia/Kabul">
-				<exemplarCity>阿富汗</exemplarCity>
-			</zone>
-			<zone type="America/Antigua">
-				<exemplarCity>安地��巴布�</exemplarCity>
-			</zone>
-			<zone type="America/Anguilla">
-				<exemplarCity>安�拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Tirane">
-				<exemplarCity>阿爾巴尼亞</exemplarCity>
-			</zone>
-			<zone type="Asia/Yerevan">
-				<exemplarCity>亞美尼亞</exemplarCity>
-			</zone>
-			<zone type="America/Curacao">
-				<exemplarCity>�屬安地列斯</exemplarCity>
-			</zone>
-			<zone type="Africa/Luanda">
-				<exemplarCity>安哥拉</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Rothera">
-				<exemplarCity>羅瑟拉</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Palmer">
-				<exemplarCity>帕麥</exemplarCity>
-			</zone>
-			<zone type="Antarctica/South_Pole">
-				<exemplarCity>�極</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Syowa">
-				<exemplarCity>昭和</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Davis">
-				<exemplarCity>戴維斯</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Vostok">
-				<exemplarCity>莫斯托克</exemplarCity>
-			</zone>
-			<zone type="Antarctica/Casey">
-				<exemplarCity>凱西</exemplarCity>
-			</zone>
-			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>�蒙�爾維爾</exemplarCity>
-			</zone>
-			<zone type="Antarctica/McMurdo">
-				<exemplarCity>麥克馬多</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Rio_Gallegos">
-				<exemplarCity>加拉哥斯</exemplarCity>
-			</zone>
-			<zone type="America/Mendoza">
-				<exemplarCity>門多薩</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Juan">
-				<exemplarCity>�胡安</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Ushuaia">
-				<exemplarCity>�斯懷亞</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/La_Rioja">
-				<exemplarCity>拉略哈</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/San_Luis">
-				<exemplarCity>�路易</exemplarCity>
-			</zone>
-			<zone type="America/Catamarca">
-				<exemplarCity>�塔馬�</exemplarCity>
-			</zone>
-			<zone type="America/Jujuy">
-				<exemplarCity>胡韋</exemplarCity>
-			</zone>
-			<zone type="America/Argentina/Tucuman">
-				<exemplarCity>�庫曼</exemplarCity>
-			</zone>
-			<zone type="America/Cordoba">
-				<exemplarCity>哥多�</exemplarCity>
-			</zone>
-			<zone type="America/Buenos_Aires">
-				<exemplarCity>布宜諾斯艾利斯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pago_Pago">
-				<exemplarCity>派哥派哥</exemplarCity>
-			</zone>
-			<zone type="Europe/Vienna">
-				<exemplarCity>奧地利</exemplarCity>
-			</zone>
-			<zone type="Australia/Perth">
-				<exemplarCity>伯斯</exemplarCity>
-			</zone>
-			<zone type="Australia/Darwin">
-				<exemplarCity>�爾文</exemplarCity>
-			</zone>
-			<zone type="Australia/Adelaide">
-				<exemplarCity>阿得雷德</exemplarCity>
-			</zone>
-			<zone type="Australia/Broken_Hill">
-				<exemplarCity>斷丘市</exemplarCity>
-			</zone>
-			<zone type="Australia/Currie">
-				<exemplarCity>克黎</exemplarCity>
-			</zone>
-			<zone type="Australia/Melbourne">
-				<exemplarCity>墨爾本</exemplarCity>
-			</zone>
-			<zone type="Australia/Hobart">
-				<exemplarCity>�巴特</exemplarCity>
-			</zone>
-			<zone type="Australia/Sydney">
-				<exemplarCity>雪梨</exemplarCity>
-			</zone>
-			<zone type="Australia/Brisbane">
-				<exemplarCity>布利斯�</exemplarCity>
-			</zone>
-			<zone type="Australia/Lord_Howe">
-				<exemplarCity>羅豪島</exemplarCity>
-			</zone>
-			<zone type="America/Aruba">
-				<exemplarCity>阿魯巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Mariehamn">
-				<exemplarCity>奧蘭群島</exemplarCity>
-			</zone>
-			<zone type="Asia/Baku">
-				<exemplarCity>亞塞拜然</exemplarCity>
-			</zone>
-			<zone type="Europe/Sarajevo">
-				<exemplarCity>沙拉耶佛</exemplarCity>
-			</zone>
-			<zone type="America/Barbados">
-				<exemplarCity>巴�多</exemplarCity>
-			</zone>
-			<zone type="Asia/Dhaka">
-				<exemplarCity>孟加拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Brussels">
-				<exemplarCity>布魯塞爾</exemplarCity>
-			</zone>
-			<zone type="Africa/Ouagadougou">
-				<exemplarCity>布��法索</exemplarCity>
-			</zone>
-			<zone type="Europe/Sofia">
-				<exemplarCity>�加利亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Bujumbura">
-				<exemplarCity>蒲隆地</exemplarCity>
-			</zone>
-			<zone type="Africa/Porto-Novo">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Bermuda">
-				<exemplarCity>百慕�</exemplarCity>
-			</zone>
-			<zone type="Asia/Brunei">
-				<exemplarCity>汶�</exemplarCity>
-			</zone>
-			<zone type="America/La_Paz">
-				<exemplarCity>玻利維亞</exemplarCity>
-			</zone>
-			<zone type="America/Eirunepe">
-				<exemplarCity>艾魯內佩</exemplarCity>
-			</zone>
-			<zone type="America/Rio_Branco">
-				<exemplarCity>布蘭科</exemplarCity>
-			</zone>
-			<zone type="America/Porto_Velho">
-				<exemplarCity>維留港</exemplarCity>
-			</zone>
-			<zone type="America/Boa_Vista">
-				<exemplarCity>�維斯塔</exemplarCity>
-			</zone>
-			<zone type="America/Manaus">
-				<exemplarCity>瑪瑙斯</exemplarCity>
-			</zone>
-			<zone type="America/Cuiaba">
-				<exemplarCity>�雅巴</exemplarCity>
-			</zone>
-			<zone type="America/Campo_Grande">
-				<exemplarCity>格蘭場</exemplarCity>
-			</zone>
-			<zone type="America/Belem">
-				<exemplarCity>�倫</exemplarCity>
-			</zone>
-			<zone type="America/Araguaina">
-				<exemplarCity>阿拉圭那</exemplarCity>
-			</zone>
-			<zone type="America/Sao_Paulo">
-				<exemplarCity>��羅</exemplarCity>
-			</zone>
-			<zone type="America/Bahia">
-				<exemplarCity>巴伊阿</exemplarCity>
-			</zone>
-			<zone type="America/Fortaleza">
-				<exemplarCity>��塔力莎</exemplarCity>
-			</zone>
-			<zone type="America/Maceio">
-				<exemplarCity>馬瑟�</exemplarCity>
-			</zone>
-			<zone type="America/Recife">
-				<exemplarCity>雷西�</exemplarCity>
-			</zone>
-			<zone type="America/Noronha">
-				<exemplarCity>諾倫哈</exemplarCity>
-			</zone>
-			<zone type="America/Nassau">
-				<exemplarCity>巴哈馬</exemplarCity>
-			</zone>
-			<zone type="Asia/Thimphu">
-				<exemplarCity>�丹</exemplarCity>
-			</zone>
-			<zone type="Africa/Gaborone">
-				<exemplarCity>波札那</exemplarCity>
-			</zone>
-			<zone type="Europe/Minsk">
-				<exemplarCity>白俄羅斯</exemplarCity>
-			</zone>
-			<zone type="America/Belize">
-				<exemplarCity>�里斯</exemplarCity>
-			</zone>
-			<zone type="America/Dawson">
-				<exemplarCity>�生河</exemplarCity>
-			</zone>
-			<zone type="America/Whitehorse">
-				<exemplarCity>懷特�斯</exemplarCity>
-			</zone>
-			<zone type="America/Inuvik">
-				<exemplarCity>伊奴維克</exemplarCity>
-			</zone>
-			<zone type="America/Vancouver">
-				<exemplarCity>溫哥�</exemplarCity>
-			</zone>
-			<zone type="America/Dawson_Creek">
-				<exemplarCity>�生�</exemplarCity>
-			</zone>
-			<zone type="America/Yellowknife">
-				<exemplarCity>�羅�佛</exemplarCity>
-			</zone>
-			<zone type="America/Edmonton">
-				<exemplarCity>艾德蒙�</exemplarCity>
-			</zone>
-			<zone type="America/Swift_Current">
-				<exemplarCity>瑞夫�倫特</exemplarCity>
-			</zone>
-			<zone type="America/Cambridge_Bay">
-				<exemplarCity>�橋�</exemplarCity>
-			</zone>
-			<zone type="America/Regina">
-				<exemplarCity>利宅那</exemplarCity>
-			</zone>
-			<zone type="America/Winnipeg">
-				<exemplarCity>溫尼伯</exemplarCity>
-			</zone>
-			<zone type="America/Resolute">
-				<exemplarCity>羅斯魯特</exemplarCity>
-			</zone>
-			<zone type="America/Rainy_River">
-				<exemplarCity>雨河鎮</exemplarCity>
-			</zone>
-			<zone type="America/Rankin_Inlet">
-				<exemplarCity>蘭今�</exemplarCity>
-			</zone>
-			<zone type="America/Thunder_Bay">
-				<exemplarCity>�德�</exemplarCity>
-			</zone>
-			<zone type="America/Nipigon">
-				<exemplarCity>尼皮岡</exemplarCity>
-			</zone>
-			<zone type="America/Toronto">
-				<exemplarCity>多倫多</exemplarCity>
-			</zone>
-			<zone type="America/Montreal">
-				<exemplarCity>蒙特�</exemplarCity>
-			</zone>
-			<zone type="America/Iqaluit">
-				<exemplarCity>伊�特</exemplarCity>
-			</zone>
-			<zone type="America/Pangnirtung">
-				<exemplarCity>潘尼爾�</exemplarCity>
-			</zone>
-			<zone type="America/Moncton">
-				<exemplarCity>蒙克頓</exemplarCity>
-			</zone>
-			<zone type="America/Halifax">
-				<exemplarCity>哈里法克斯</exemplarCity>
-			</zone>
-			<zone type="America/Goose_Bay">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="America/Glace_Bay">
-				<exemplarCity>格雷斯�</exemplarCity>
-			</zone>
-			<zone type="America/Blanc-Sablon">
-				<exemplarCity>白朗薩布隆</exemplarCity>
-			</zone>
-			<zone type="America/St_Johns">
-				<exemplarCity>�約翰</exemplarCity>
-			</zone>
-			<zone type="Indian/Cocos">
-				<exemplarCity>科科斯群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Kinshasa">
-				<exemplarCity>金�沙</exemplarCity>
-			</zone>
-			<zone type="Africa/Lubumbashi">
-				<exemplarCity>蘆佈巴西</exemplarCity>
-			</zone>
-			<zone type="Africa/Bangui">
-				<exemplarCity>中�共和國</exemplarCity>
-			</zone>
-			<zone type="Africa/Brazzaville">
-				<exemplarCity>剛果共和國</exemplarCity>
-			</zone>
-			<zone type="Europe/Zurich">
-				<exemplarCity>瑞士</exemplarCity>
-			</zone>
-			<zone type="Africa/Abidjan">
-				<exemplarCity>象牙海岸</exemplarCity>
-			</zone>
-			<zone type="Pacific/Rarotonga">
-				<exemplarCity>拉洛�加島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Easter">
-				<exemplarCity>復活島</exemplarCity>
-			</zone>
-			<zone type="America/Santiago">
-				<exemplarCity>�地牙哥</exemplarCity>
-			</zone>
-			<zone type="Africa/Douala">
-				<exemplarCity>喀麥隆</exemplarCity>
-			</zone>
-			<zone type="Asia/Kashgar">
-				<exemplarCity>喀什米爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Urumqi">
-				<exemplarCity>�魯木齊</exemplarCity>
-			</zone>
-			<zone type="Asia/Chongqing">
-				<exemplarCity>�慶</exemplarCity>
-			</zone>
-			<zone type="Asia/Harbin">
-				<exemplarCity>哈爾濱</exemplarCity>
-			</zone>
-			<zone type="America/Bogota">
-				<exemplarCity>哥倫比亞</exemplarCity>
-			</zone>
-			<zone type="America/Costa_Rica">
-				<exemplarCity>哥斯大黎加</exemplarCity>
-			</zone>
-			<zone type="America/Havana">
-				<exemplarCity>�巴</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Cape_Verde">
-				<exemplarCity>維德角</exemplarCity>
-			</zone>
-			<zone type="Indian/Christmas">
-				<exemplarCity>�誕島</exemplarCity>
-			</zone>
-			<zone type="Asia/Nicosia">
-				<exemplarCity>塞浦勒斯</exemplarCity>
-			</zone>
-			<zone type="Europe/Prague">
-				<exemplarCity>�克</exemplarCity>
-			</zone>
-			<zone type="Europe/Berlin">
-				<exemplarCity>德國</exemplarCity>
-			</zone>
-			<zone type="Africa/Djibouti">
-				<exemplarCity>�布地</exemplarCity>
-			</zone>
-			<zone type="Europe/Copenhagen">
-				<exemplarCity>丹麥</exemplarCity>
-			</zone>
-			<zone type="America/Dominica">
-				<exemplarCity>多明尼加</exemplarCity>
-			</zone>
-			<zone type="America/Santo_Domingo">
-				<exemplarCity>多明尼加共和國</exemplarCity>
-			</zone>
-			<zone type="Africa/Algiers">
-				<exemplarCity>阿爾�利亞</exemplarCity>
-			</zone>
-			<zone type="Pacific/Galapagos">
-				<exemplarCity>加拉巴哥群島</exemplarCity>
-			</zone>
-			<zone type="America/Guayaquil">
-				<exemplarCity>瓜亞基爾</exemplarCity>
-			</zone>
-			<zone type="Europe/Tallinn">
-				<exemplarCity>愛沙尼亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Cairo">
-				<exemplarCity>埃�</exemplarCity>
-			</zone>
-			<zone type="Africa/El_Aaiun">
-				<exemplarCity>西撒哈拉</exemplarCity>
-			</zone>
-			<zone type="Africa/Asmera">
-				<exemplarCity>厄利垂亞</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Canary">
-				<exemplarCity>加�利</exemplarCity>
-			</zone>
-			<zone type="Africa/Ceuta">
-				<exemplarCity>休�</exemplarCity>
-			</zone>
-			<zone type="Europe/Madrid">
-				<exemplarCity>馬德里</exemplarCity>
-			</zone>
-			<zone type="Africa/Addis_Ababa">
-				<exemplarCity>衣索比亞</exemplarCity>
-			</zone>
-			<zone type="Europe/Helsinki">
-				<exemplarCity>芬蘭</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fiji">
-				<exemplarCity>�濟</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Stanley">
-				<exemplarCity>���</exemplarCity>
-			</zone>
-			<zone type="Pacific/Truk">
-				<exemplarCity>土魯克群島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Ponape">
-				<exemplarCity>波�佩</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kosrae">
-				<exemplarCity>科斯里</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Faeroe">
-				<exemplarCity>法羅群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Libreville">
-				<exemplarCity>加彭</exemplarCity>
-			</zone>
-			<zone type="Europe/London">
-				<exemplarCity>倫敦</exemplarCity>
-			</zone>
-			<zone type="America/Grenada">
-				<exemplarCity>格瑞��</exemplarCity>
-			</zone>
-			<zone type="Asia/Tbilisi">
-				<exemplarCity>喬治亞</exemplarCity>
-			</zone>
-			<zone type="America/Cayenne">
-				<exemplarCity>法屬蓋亞那</exemplarCity>
-			</zone>
-			<zone type="Europe/Guernsey">
-				<exemplarCity>根�</exemplarCity>
-			</zone>
-			<zone type="Africa/Accra">
-				<exemplarCity>迦�</exemplarCity>
-			</zone>
-			<zone type="Europe/Gibraltar">
-				<exemplarCity>直布羅陀</exemplarCity>
-			</zone>
-			<zone type="America/Thule">
-				<exemplarCity>�里</exemplarCity>
-			</zone>
-			<zone type="America/Godthab">
-				<exemplarCity>高特哈市</exemplarCity>
-			</zone>
-			<zone type="America/Scoresbysund">
-				<exemplarCity>斯�比海峽</exemplarCity>
-			</zone>
-			<zone type="America/Danmarkshavn">
-				<exemplarCity>丹馬沙文</exemplarCity>
-			</zone>
-			<zone type="Africa/Banjul">
-				<exemplarCity>斑竹</exemplarCity>
-			</zone>
-			<zone type="Africa/Conakry">
-				<exemplarCity>幾內亞</exemplarCity>
-			</zone>
-			<zone type="America/Guadeloupe">
-				<exemplarCity>瓜德羅普</exemplarCity>
-			</zone>
-			<zone type="Africa/Malabo">
-				<exemplarCity>赤�幾內亞</exemplarCity>
-			</zone>
-			<zone type="Europe/Athens">
-				<exemplarCity>希臘</exemplarCity>
-			</zone>
-			<zone type="Atlantic/South_Georgia">
-				<exemplarCity>�喬治亞與�三明治島</exemplarCity>
-			</zone>
-			<zone type="America/Guatemala">
-				<exemplarCity>瓜地馬拉</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guam">
-				<exemplarCity>關島</exemplarCity>
-			</zone>
-			<zone type="Africa/Bissau">
-				<exemplarCity>幾內亞比索</exemplarCity>
-			</zone>
-			<zone type="America/Guyana">
-				<exemplarCity>圭亞那</exemplarCity>
-			</zone>
-			<zone type="Asia/Hong_Kong">
-				<exemplarCity>中�人民共和國香港特別行政�</exemplarCity>
-			</zone>
-			<zone type="America/Tegucigalpa">
-				<exemplarCity>德�斯加巴</exemplarCity>
-			</zone>
-			<zone type="Europe/Zagreb">
-				<exemplarCity>克羅埃西亞</exemplarCity>
-			</zone>
-			<zone type="America/Port-au-Prince">
-				<exemplarCity>海地</exemplarCity>
-			</zone>
-			<zone type="Europe/Budapest">
-				<exemplarCity>匈牙利</exemplarCity>
-			</zone>
-			<zone type="Asia/Jakarta">
-				<exemplarCity>雅加�</exemplarCity>
-			</zone>
-			<zone type="Asia/Makassar">
-				<exemplarCity>馬�沙爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Jayapura">
-				<exemplarCity>加亞布拉</exemplarCity>
-			</zone>
-			<zone type="Europe/Dublin">
-				<exemplarCity>愛爾蘭</exemplarCity>
-			</zone>
-			<zone type="Asia/Calcutta">
-				<exemplarCity>�度</exemplarCity>
-			</zone>
-			<zone type="Indian/Chagos">
-				<exemplarCity>英屬�度洋領地</exemplarCity>
-			</zone>
-			<zone type="Asia/Baghdad">
-				<exemplarCity>伊拉克</exemplarCity>
-			</zone>
-			<zone type="Asia/Tehran">
-				<exemplarCity>伊朗</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Reykjavik">
-				<exemplarCity>冰島</exemplarCity>
-			</zone>
-			<zone type="Europe/Rome">
-				<exemplarCity>羅馬</exemplarCity>
-			</zone>
-			<zone type="America/Jamaica">
-				<exemplarCity>牙買加</exemplarCity>
-			</zone>
-			<zone type="Asia/Amman">
-				<exemplarCity>ç´„æ—¦</exemplarCity>
-			</zone>
-			<zone type="Asia/Tokyo">
-				<exemplarCity>�京</exemplarCity>
-			</zone>
-			<zone type="Africa/Nairobi">
-				<exemplarCity>奈洛比</exemplarCity>
-			</zone>
-			<zone type="Asia/Bishkek">
-				<exemplarCity>�爾�斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Phnom_Penh">
-				<exemplarCity>柬埔寨</exemplarCity>
-			</zone>
-			<zone type="Pacific/Enderbury">
-				<exemplarCity>�得伯�島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kiritimati">
-				<exemplarCity>�里巴斯</exemplarCity>
-			</zone>
-			<zone type="Indian/Comoro">
-				<exemplarCity>科摩羅群島</exemplarCity>
-			</zone>
-			<zone type="America/St_Kitts">
-				<exemplarCity>�啟斯與尼維斯</exemplarCity>
-			</zone>
-			<zone type="Asia/Pyongyang">
-				<exemplarCity>北韓</exemplarCity>
-			</zone>
-			<zone type="Asia/Seoul">
-				<exemplarCity>首爾</exemplarCity>
-			</zone>
-			<zone type="America/Cayman">
-				<exemplarCity>開曼</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtau">
-				<exemplarCity>艾克陶</exemplarCity>
-			</zone>
-			<zone type="Asia/Oral">
-				<exemplarCity>奧拉爾</exemplarCity>
-			</zone>
-			<zone type="Asia/Aqtobe">
-				<exemplarCity>阿克糾賓</exemplarCity>
-			</zone>
-			<zone type="Asia/Qyzylorda">
-				<exemplarCity>奎茲羅答</exemplarCity>
-			</zone>
-			<zone type="Asia/Almaty">
-				<exemplarCity>阿拉木圖</exemplarCity>
-			</zone>
-			<zone type="Asia/Vientiane">
-				<exemplarCity>寮國</exemplarCity>
-			</zone>
-			<zone type="Asia/Beirut">
-				<exemplarCity>��特特</exemplarCity>
-			</zone>
-			<zone type="America/St_Lucia">
-				<exemplarCity>�露西亞</exemplarCity>
-			</zone>
-			<zone type="Europe/Vaduz">
-				<exemplarCity>列支敦斯登</exemplarCity>
-			</zone>
-			<zone type="Asia/Colombo">
-				<exemplarCity>�倫�</exemplarCity>
-			</zone>
-			<zone type="Africa/Monrovia">
-				<exemplarCity>蒙羅維亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Maseru">
-				<exemplarCity>賴索托</exemplarCity>
-			</zone>
-			<zone type="Europe/Vilnius">
-				<exemplarCity>立陶宛</exemplarCity>
-			</zone>
-			<zone type="Europe/Luxembourg">
-				<exemplarCity>盧森堡</exemplarCity>
-			</zone>
-			<zone type="Europe/Riga">
-				<exemplarCity>拉脫維亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Tripoli">
-				<exemplarCity>利比亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Casablanca">
-				<exemplarCity>�薩布蘭�</exemplarCity>
-			</zone>
-			<zone type="Europe/Monaco">
-				<exemplarCity>摩�哥</exemplarCity>
-			</zone>
-			<zone type="Europe/Chisinau">
-				<exemplarCity>奇西瑙</exemplarCity>
-			</zone>
-			<zone type="Europe/Podgorica">
-				<exemplarCity>波多里察</exemplarCity>
-			</zone>
-			<zone type="Indian/Antananarivo">
-				<exemplarCity>馬�加斯加</exemplarCity>
-			</zone>
-			<zone type="Pacific/Kwajalein">
-				<exemplarCity>瓜加林島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Majuro">
-				<exemplarCity>馬朱諾</exemplarCity>
-			</zone>
-			<zone type="Europe/Skopje">
-				<exemplarCity>斯科普耶</exemplarCity>
-			</zone>
-			<zone type="Africa/Bamako">
-				<exemplarCity>巴馬科</exemplarCity>
-			</zone>
-			<zone type="Asia/Rangoon">
-				<exemplarCity>緬甸</exemplarCity>
-			</zone>
-			<zone type="Asia/Ulaanbaatar">
-				<exemplarCity>�蘭巴托</exemplarCity>
-			</zone>
-			<zone type="Asia/Choibalsan">
-				<exemplarCity>�巴爾塞</exemplarCity>
-			</zone>
-			<zone type="Asia/Macau">
-				<exemplarCity>中�人民共和國澳門特別行政�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Saipan">
-				<exemplarCity>北馬里亞�群島</exemplarCity>
-			</zone>
-			<zone type="America/Martinique">
-				<exemplarCity>馬�尼克</exemplarCity>
-			</zone>
-			<zone type="Africa/Nouakchott">
-				<exemplarCity>茅利塔尼亞</exemplarCity>
-			</zone>
-			<zone type="America/Montserrat">
-				<exemplarCity>蒙賽拉特</exemplarCity>
-			</zone>
-			<zone type="Europe/Malta">
-				<exemplarCity>馬爾他</exemplarCity>
-			</zone>
-			<zone type="Indian/Mauritius">
-				<exemplarCity>模里西斯</exemplarCity>
-			</zone>
-			<zone type="Indian/Maldives">
-				<exemplarCity>馬爾地夫</exemplarCity>
-			</zone>
-			<zone type="Africa/Blantyre">
-				<exemplarCity>馬拉�</exemplarCity>
-			</zone>
-			<zone type="America/Tijuana">
-				<exemplarCity>���</exemplarCity>
-			</zone>
-			<zone type="America/Hermosillo">
-				<exemplarCity>厄莫休</exemplarCity>
-			</zone>
-			<zone type="America/Mazatlan">
-				<exemplarCity>馬薩特蘭</exemplarCity>
-			</zone>
-			<zone type="America/Chihuahua">
-				<exemplarCity>奇��</exemplarCity>
-			</zone>
-			<zone type="America/Monterrey">
-				<exemplarCity>蒙特瑞</exemplarCity>
-			</zone>
-			<zone type="America/Mexico_City">
-				<exemplarCity>墨西哥市</exemplarCity>
-			</zone>
-			<zone type="America/Merida">
-				<exemplarCity>美里�</exemplarCity>
-			</zone>
-			<zone type="America/Cancun">
-				<exemplarCity>康庫</exemplarCity>
-			</zone>
-			<zone type="Asia/Kuching">
-				<exemplarCity>�晉</exemplarCity>
-			</zone>
-			<zone type="Africa/Maputo">
-				<exemplarCity>莫三比克</exemplarCity>
-			</zone>
-			<zone type="Africa/Windhoek">
-				<exemplarCity>溫�克</exemplarCity>
-			</zone>
-			<zone type="Pacific/Noumea">
-				<exemplarCity>新喀里多尼亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Niamey">
-				<exemplarCity>尼日</exemplarCity>
-			</zone>
-			<zone type="Pacific/Norfolk">
-				<exemplarCity>諾�克群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Lagos">
-				<exemplarCity>奈�利亞</exemplarCity>
-			</zone>
-			<zone type="America/Managua">
-				<exemplarCity>尼加拉瓜</exemplarCity>
-			</zone>
-			<zone type="Europe/Amsterdam">
-				<exemplarCity>�蘭</exemplarCity>
-			</zone>
-			<zone type="Europe/Oslo">
-				<exemplarCity>奧斯陸</exemplarCity>
-			</zone>
-			<zone type="Asia/Katmandu">
-				<exemplarCity>尼泊爾</exemplarCity>
-			</zone>
-			<zone type="Pacific/Nauru">
-				<exemplarCity>諾魯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Niue">
-				<exemplarCity>�埃</exemplarCity>
-			</zone>
-			<zone type="Pacific/Chatham">
-				<exemplarCity>查�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Auckland">
-				<exemplarCity>奧克蘭</exemplarCity>
-			</zone>
-			<zone type="Asia/Muscat">
-				<exemplarCity>阿曼</exemplarCity>
-			</zone>
-			<zone type="America/Panama">
-				<exemplarCity>巴拿馬</exemplarCity>
-			</zone>
-			<zone type="America/Lima">
-				<exemplarCity>秘魯</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tahiti">
-				<exemplarCity>大溪地</exemplarCity>
-			</zone>
-			<zone type="Pacific/Marquesas">
-				<exemplarCity>馬�薩斯島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Gambier">
-				<exemplarCity>岡必爾群島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Port_Moresby">
-				<exemplarCity>巴布亞新幾內亞</exemplarCity>
-			</zone>
-			<zone type="Asia/Manila">
-				<exemplarCity>�律賓</exemplarCity>
-			</zone>
-			<zone type="Asia/Karachi">
-				<exemplarCity>喀拉蚩</exemplarCity>
-			</zone>
-			<zone type="Europe/Warsaw">
-				<exemplarCity>波蘭</exemplarCity>
-			</zone>
-			<zone type="America/Miquelon">
-				<exemplarCity>�皮里�米圭隆</exemplarCity>
-			</zone>
-			<zone type="Pacific/Pitcairn">
-				<exemplarCity>匹特開�群島</exemplarCity>
-			</zone>
-			<zone type="Asia/Gaza">
-				<exemplarCity>加薩</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Azores">
-				<exemplarCity>亞速爾群島</exemplarCity>
-			</zone>
-			<zone type="Atlantic/Madeira">
-				<exemplarCity>馬得拉群島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Palau">
-				<exemplarCity>帛�</exemplarCity>
-			</zone>
-			<zone type="America/Asuncion">
-				<exemplarCity>巴拉圭</exemplarCity>
-			</zone>
-			<zone type="Asia/Qatar">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Indian/Reunion">
-				<exemplarCity>留尼旺島</exemplarCity>
-			</zone>
-			<zone type="Europe/Belgrade">
-				<exemplarCity>塞爾維亞</exemplarCity>
-			</zone>
-			<zone type="Europe/Kaliningrad">
-				<exemplarCity>加里寧格勒</exemplarCity>
-			</zone>
-			<zone type="Europe/Volgograd">
-				<exemplarCity>�爾加格勒</exemplarCity>
-			</zone>
-			<zone type="Europe/Samara">
-				<exemplarCity>沙馬拉</exemplarCity>
-			</zone>
-			<zone type="Asia/Yekaterinburg">
-				<exemplarCity>葉��林堡</exemplarCity>
-			</zone>
-			<zone type="Asia/Novosibirsk">
-				<exemplarCity>新西伯利亞</exemplarCity>
-			</zone>
-			<zone type="Asia/Krasnoyarsk">
-				<exemplarCity>克拉斯諾雅斯克</exemplarCity>
-			</zone>
-			<zone type="Asia/Irkutsk">
-				<exemplarCity>伊爾庫次克</exemplarCity>
-			</zone>
-			<zone type="Asia/Yakutsk">
-				<exemplarCity>雅庫次克</exemplarCity>
-			</zone>
-			<zone type="Asia/Vladivostok">
-				<exemplarCity>海�崴</exemplarCity>
-			</zone>
-			<zone type="Asia/Sakhalin">
-				<exemplarCity>庫�島</exemplarCity>
-			</zone>
-			<zone type="Asia/Magadan">
-				<exemplarCity>馬加丹</exemplarCity>
-			</zone>
-			<zone type="Asia/Kamchatka">
-				<exemplarCity>堪查加</exemplarCity>
-			</zone>
-			<zone type="Asia/Anadyr">
-				<exemplarCity>阿那底河</exemplarCity>
-			</zone>
-			<zone type="Africa/Kigali">
-				<exemplarCity>盧安�</exemplarCity>
-			</zone>
-			<zone type="Asia/Riyadh">
-				<exemplarCity>利雅德</exemplarCity>
-			</zone>
-			<zone type="Pacific/Guadalcanal">
-				<exemplarCity>瓜���</exemplarCity>
-			</zone>
-			<zone type="Indian/Mahe">
-				<exemplarCity>塞席爾</exemplarCity>
-			</zone>
-			<zone type="Africa/Khartoum">
-				<exemplarCity>�土穆</exemplarCity>
-			</zone>
-			<zone type="Europe/Stockholm">
-				<exemplarCity>斯德哥爾摩</exemplarCity>
-			</zone>
-			<zone type="Atlantic/St_Helena">
-				<exemplarCity>�赫勒拿島</exemplarCity>
-			</zone>
-			<zone type="Europe/Ljubljana">
-				<exemplarCity>斯洛維尼亞</exemplarCity>
-			</zone>
-			<zone type="Arctic/Longyearbyen">
-				<exemplarCity>隆�耳拜�</exemplarCity>
-			</zone>
-			<zone type="Europe/Bratislava">
-				<exemplarCity>布拉�拉瓦</exemplarCity>
-			</zone>
-			<zone type="Africa/Freetown">
-				<exemplarCity>��山</exemplarCity>
-			</zone>
-			<zone type="Europe/San_Marino">
-				<exemplarCity>�馬利諾</exemplarCity>
-			</zone>
-			<zone type="Africa/Dakar">
-				<exemplarCity>塞內加爾</exemplarCity>
-			</zone>
-			<zone type="Africa/Mogadishu">
-				<exemplarCity>摩加迪休</exemplarCity>
-			</zone>
-			<zone type="America/Paramaribo">
-				<exemplarCity>巴拉馬利波</exemplarCity>
-			</zone>
-			<zone type="Africa/Sao_Tome">
-				<exemplarCity>�多美普林西比</exemplarCity>
-			</zone>
-			<zone type="America/El_Salvador">
-				<exemplarCity>薩爾瓦多</exemplarCity>
-			</zone>
-			<zone type="Asia/Damascus">
-				<exemplarCity>敘利亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Mbabane">
-				<exemplarCity>�瓦濟蘭</exemplarCity>
-			</zone>
-			<zone type="America/Grand_Turk">
-				<exemplarCity>土克斯和開�斯群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Ndjamena">
-				<exemplarCity>�加�美</exemplarCity>
-			</zone>
-			<zone type="Indian/Kerguelen">
-				<exemplarCity>克格連群島</exemplarCity>
-			</zone>
-			<zone type="Africa/Lome">
-				<exemplarCity>多哥</exemplarCity>
-			</zone>
-			<zone type="Asia/Bangkok">
-				<exemplarCity>泰國</exemplarCity>
-			</zone>
-			<zone type="Asia/Dushanbe">
-				<exemplarCity>塔�克</exemplarCity>
-			</zone>
-			<zone type="Pacific/Fakaofo">
-				<exemplarCity>托克勞</exemplarCity>
-			</zone>
-			<zone type="Asia/Dili">
-				<exemplarCity>��汶</exemplarCity>
-			</zone>
-			<zone type="Asia/Ashgabat">
-				<exemplarCity>土庫曼</exemplarCity>
-			</zone>
-			<zone type="Africa/Tunis">
-				<exemplarCity>�尚尼亞</exemplarCity>
-			</zone>
-			<zone type="Pacific/Tongatapu">
-				<exemplarCity>�加</exemplarCity>
-			</zone>
-			<zone type="Europe/Istanbul">
-				<exemplarCity>伊斯�堡</exemplarCity>
-			</zone>
-			<zone type="America/Port_of_Spain">
-				<exemplarCity>�里�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Funafuti">
-				<exemplarCity>�瓦魯</exemplarCity>
-			</zone>
-			<zone type="Asia/Taipei">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Africa/Dar_es_Salaam">
-				<exemplarCity>尚尼亞</exemplarCity>
-			</zone>
-			<zone type="Europe/Uzhgorod">
-				<exemplarCity>�茲哥洛</exemplarCity>
-			</zone>
-			<zone type="Europe/Kiev">
-				<exemplarCity>基輔</exemplarCity>
-			</zone>
-			<zone type="Europe/Simferopol">
-				<exemplarCity>辛�洛浦</exemplarCity>
-			</zone>
-			<zone type="Europe/Zaporozhye">
-				<exemplarCity>札波羅�</exemplarCity>
-			</zone>
-			<zone type="Africa/Kampala">
-				<exemplarCity>康培拉</exemplarCity>
-			</zone>
-			<zone type="Pacific/Midway">
-				<exemplarCity>中途島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Johnston">
-				<exemplarCity>強斯頓</exemplarCity>
-			</zone>
-			<zone type="America/Adak">
-				<exemplarCity>艾�克</exemplarCity>
-			</zone>
-			<zone type="America/Nome">
-				<exemplarCity>諾姆</exemplarCity>
-			</zone>
-			<zone type="America/Anchorage">
-				<exemplarCity>安克里治</exemplarCity>
-			</zone>
-			<zone type="America/Yakutat">
-				<exemplarCity>雅庫塔</exemplarCity>
-			</zone>
-			<zone type="America/Juneau">
-				<exemplarCity>朱諾</exemplarCity>
-			</zone>
-			<zone type="America/Los_Angeles">
-				<exemplarCity>洛�磯</exemplarCity>
-			</zone>
-			<zone type="America/Boise">
-				<exemplarCity>波伊斯</exemplarCity>
-			</zone>
-			<zone type="America/Phoenix">
-				<exemplarCity>鳳凰城</exemplarCity>
-			</zone>
-			<zone type="America/Shiprock">
-				<exemplarCity>船岩峰</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/New_Salem">
-				<exemplarCity>�沙倫，北�科他州</exemplarCity>
-			</zone>
-			<zone type="America/North_Dakota/Center">
-				<exemplarCity>申特城</exemplarCity>
-			</zone>
-			<zone type="America/Menominee">
-				<exemplarCity>美諾米克</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vincennes">
-				<exemplarCity>溫森斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Petersburg">
-				<exemplarCity>彼得堡，�第安那州</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Tell_City">
-				<exemplarCity>泰爾城</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Knox">
-				<exemplarCity>諾克斯</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Winamac">
-				<exemplarCity>��麥克，�第安那州</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Marengo">
-				<exemplarCity>馬倫哥</exemplarCity>
-			</zone>
-			<zone type="America/Indianapolis">
-				<exemplarCity>�第安那波里斯</exemplarCity>
-			</zone>
-			<zone type="America/Louisville">
-				<exemplarCity>路易斯維爾</exemplarCity>
-			</zone>
-			<zone type="America/Indiana/Vevay">
-				<exemplarCity>維�</exemplarCity>
-			</zone>
-			<zone type="America/Kentucky/Monticello">
-				<exemplarCity>蒙�瑟洛</exemplarCity>
-			</zone>
-			<zone type="America/New_York">
-				<exemplarCity>�約</exemplarCity>
-			</zone>
-			<zone type="America/Montevideo">
-				<exemplarCity>�拉圭</exemplarCity>
-			</zone>
-			<zone type="Asia/Samarkand">
-				<exemplarCity>撒馬爾罕</exemplarCity>
-			</zone>
-			<zone type="Europe/Vatican">
-				<exemplarCity>梵蒂岡</exemplarCity>
-			</zone>
-			<zone type="America/St_Vincent">
-				<exemplarCity>�文森</exemplarCity>
-			</zone>
-			<zone type="America/Caracas">
-				<exemplarCity>�拉�斯</exemplarCity>
-			</zone>
-			<zone type="America/Tortola">
-				<exemplarCity>托托拉島</exemplarCity>
-			</zone>
-			<zone type="America/St_Thomas">
-				<exemplarCity>美屬維京群島</exemplarCity>
-			</zone>
-			<zone type="Asia/Saigon">
-				<exemplarCity>越�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Efate">
-				<exemplarCity>愛發�</exemplarCity>
-			</zone>
-			<zone type="Pacific/Wallis">
-				<exemplarCity>瓦利斯與富圖�群島</exemplarCity>
-			</zone>
-			<zone type="Pacific/Apia">
-				<exemplarCity>亞庇</exemplarCity>
-			</zone>
-			<zone type="Asia/Aden">
-				<exemplarCity>葉門</exemplarCity>
-			</zone>
-			<zone type="Indian/Mayotte">
-				<exemplarCity>馬約特島</exemplarCity>
-			</zone>
-			<zone type="Africa/Johannesburg">
-				<exemplarCity>��</exemplarCity>
-			</zone>
-			<zone type="Africa/Lusaka">
-				<exemplarCity>尚比亞</exemplarCity>
-			</zone>
-			<zone type="Africa/Harare">
-				<exemplarCity>辛巴�</exemplarCity>
-			</zone>
-			<metazone type="Acre">
-				<long>
-					<standard>艾克時間</standard>
-					<daylight>艾克�令時間</daylight>
-				</long>
-				<short>
-					<standard>ACT（艾克）</standard>
-					<daylight>ACST（艾克）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<long>
-					<standard>阿富汗時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Central">
-				<long>
-					<standard>中�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>��時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<long>
-					<generic>��時間</generic>
-					<standard>��標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Africa_Western">
-				<long>
-					<standard>西�時間</standard>
-					<daylight>西��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<long>
-					<standard>阿克秋賓斯克時間</standard>
-					<daylight>阿克秋賓斯克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska">
-				<long>
-					<generic>阿拉斯加時間</generic>
-					<standard>阿拉斯加標準時間</standard>
-					<daylight>阿拉斯加�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<long>
-					<generic>阿拉斯加-��夷時間</generic>
-					<standard>阿拉斯加-��夷標準時間</standard>
-					<daylight>阿拉斯加-��夷�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Almaty">
-				<long>
-					<standard>阿拉木圖時間</standard>
-					<daylight>阿拉木圖�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Amazon">
-				<long>
-					<standard>亞馬�時間</standard>
-					<daylight>亞馬��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Central">
-				<long>
-					<generic>中部時間</generic>
-					<standard>中部標準時間</standard>
-					<daylight>中部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Eastern">
-				<long>
-					<generic>�部時間</generic>
-					<standard>�部標準時間</standard>
-					<daylight>�部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Mountain">
-				<long>
-					<generic>山�時間</generic>
-					<standard>山�標準時間</standard>
-					<daylight>山�日光節約時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="America_Pacific">
-				<long>
-					<generic>太平洋時間</generic>
-					<standard>太平洋標準時間</standard>
-					<daylight>太平洋�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Anadyr">
-				<long>
-					<standard>阿那底河標準時間</standard>
-					<daylight>阿那底河�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Aqtau">
-				<long>
-					<standard>阿克陶時間</standard>
-					<daylight>阿克陶�令時間</daylight>
-				</long>
-				<short>
-					<standard>AQTT (阿克陶)</standard>
-					<daylight>AQTST (阿克陶)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<long>
-					<standard>阿克托比時間</standard>
-					<daylight>阿克托比�令時間</daylight>
-				</long>
-				<short>
-					<standard>AQTT (阿克托比)</standard>
-					<daylight>AQTST (阿克托比)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>阿拉伯時間</generic>
-					<standard>阿拉伯標準時間</standard>
-					<daylight>阿拉伯�令時間</daylight>
-				</long>
-				<short>
-					<generic>AT（阿拉伯）</generic>
-					<standard>AST（阿拉伯）</standard>
-					<daylight>ADT ( 阿拉伯 )</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<long>
-					<standard>阿根廷時間</standard>
-					<daylight>阿根廷�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<long>
-					<standard>阿根廷西部時間</standard>
-					<daylight>阿根廷西部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Armenia">
-				<long>
-					<standard>亞美尼亞時間</standard>
-					<daylight>亞美尼亞�令時間</daylight>
-				</long>
-				<short>
-					<standard>AMT（亞美尼亞）</standard>
-					<daylight>AMST（亞美尼亞）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<long>
-					<standard>阿什哈巴德時間</standard>
-					<daylight>阿什哈巴德�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Atlantic">
-				<long>
-					<generic>大西洋時間</generic>
-					<standard>大西洋標準時間</standard>
-					<daylight>大西洋�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Central">
-				<long>
-					<generic>澳洲中部時間</generic>
-					<standard>澳洲中部標準時間</standard>
-					<daylight>澳洲中部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<long>
-					<generic>澳洲中西部時間</generic>
-					<standard>澳洲中西部標準時間</standard>
-					<daylight>澳洲中西部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<long>
-					<generic>澳洲�部時間</generic>
-					<standard>澳洲�部標準時間</standard>
-					<daylight>澳洲�部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Australia_Western">
-				<long>
-					<generic>澳洲西部時間</generic>
-					<standard>澳洲西部標準時間</standard>
-					<daylight>澳洲西部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<long>
-					<standard>亞塞拜然時間</standard>
-					<daylight>亞塞拜然�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Azores">
-				<long>
-					<standard>亞速爾群島時間</standard>
-					<daylight>亞速爾群島�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Baku">
-				<long>
-					<standard>巴庫時間</standard>
-					<daylight>巴庫�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bangladesh">
-				<long>
-					<generic>孟加拉時間</generic>
-					<standard>孟加拉標準時間</standard>
-					<daylight>孟加拉�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Bering">
-				<long>
-					<generic>白令時間</generic>
-					<standard>白令標準時間</standard>
-					<daylight>白令�令時間</daylight>
-				</long>
-				<short>
-					<generic>BT（白令）</generic>
-					<standard>BST（白令）</standard>
-					<daylight>BDT（白令）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<long>
-					<standard>�丹時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Bolivia">
-				<long>
-					<standard>玻利維亞時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Borneo">
-				<long>
-					<standard>婆羅洲時間</standard>
-					<daylight>婆羅洲�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brasilia">
-				<long>
-					<standard>巴西利亞時間</standard>
-					<daylight>巴西利亞�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Brunei">
-				<long>
-					<standard>汶�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Chamorro">
-				<long>
-					<standard>關島-北馬里亞�群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Changbai">
-				<long>
-					<standard>長白山時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Chile">
-				<long>
-					<standard>智利時間</standard>
-					<daylight>智利�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="China">
-				<long>
-					<generic>中國時間</generic>
-					<standard>中國標準時間</standard>
-					<daylight>中國�令時間</daylight>
-				</long>
-				<short>
-					<generic>CT（中國）</generic>
-					<standard>CST（中國）</standard>
-					<daylight>CDT（中國）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<long>
-					<standard>喬巴山時間</standard>
-					<daylight>喬巴山�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Colombia">
-				<long>
-					<standard>哥倫比亞時間</standard>
-					<daylight>哥倫比亞�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Cuba">
-				<long>
-					<generic>�巴時間</generic>
-					<standard>�巴標準時間</standard>
-					<daylight>�巴�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dacca">
-				<long>
-					<standard>��時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Dushanbe">
-				<long>
-					<standard>�尚別時間</standard>
-					<daylight>�尚別�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<long>
-					<standard>�屬圭亞那時間</standard>
-				</long>
-			</metazone>
-			<metazone type="East_Timor">
-				<long>
-					<standard>��汶時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Ecuador">
-				<long>
-					<standard>厄瓜多時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Europe_Central">
-				<long>
-					<standard>中�標準時間</standard>
-					<daylight>中��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<long>
-					<standard>��標準時間</standard>
-					<daylight>���令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Europe_Western">
-				<long>
-					<standard>西�時間</standard>
-					<daylight>西��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="French_Guiana">
-				<long>
-					<standard>法屬圭亞那時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Frunze">
-				<long>
-					<standard>���時間</standard>
-					<daylight>����令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Galapagos">
-				<long>
-					<standard>加拉帕戈群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Georgia">
-				<long>
-					<standard>喬治亞時間</standard>
-					<daylight>喬治亞�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="GMT">
-				<long>
-					<standard>格林�治標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<long>
-					<standard>格陵蘭中部時間</standard>
-					<daylight>格陵蘭中部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<long>
-					<standard>格陵蘭�部時間</standard>
-					<daylight>格陵蘭�部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<long>
-					<standard>格陵蘭西部時間</standard>
-					<daylight>格陵蘭西部�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Guam">
-				<long>
-					<standard>關島標準時間</standard>
-				</long>
-				<short>
-					<standard>GST (關島)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<long>
-					<standard>波斯�海域標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Guyana">
-				<long>
-					<standard>蓋亞�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<long>
-					<standard>��夷-阿留申標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<long>
-					<standard>香港時間</standard>
-					<daylight>香港�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Hovd">
-				<long>
-					<standard>科布多時間</standard>
-					<daylight>科布多�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="India">
-				<long>
-					<standard>�度標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<long>
-					<standard>�尼中部時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<long>
-					<standard>�尼�部時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<long>
-					<standard>�尼西部時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Iran">
-				<long>
-					<standard>伊朗標準時間</standard>
-					<daylight>伊朗�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Irkutsk">
-				<long>
-					<standard>伊爾庫次克時間</standard>
-					<daylight>伊爾庫次克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Israel">
-				<long>
-					<generic>以色列時間</generic>
-					<standard>以色列標準時間</standard>
-					<daylight>以色列�令時間</daylight>
-				</long>
-				<short>
-					<standard>IST（以色列）</standard>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<long>
-					<generic>日本時間</generic>
-					<standard>日本標準時間</standard>
-					<daylight>日本�令時間</daylight>
-				</long>
-				<short>
-					<generic>JT</generic>
-				</short>
-			</metazone>
-			<metazone type="Karachi">
-				<long>
-					<standard>喀拉蚩時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Kashgar">
-				<long>
-					<standard>喀什時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<long>
-					<generic>�哈薩克時間</generic>
-					<standard>�哈薩克標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<long>
-					<generic>西哈薩克時間</generic>
-					<standard>西哈薩克標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Kizilorda">
-				<long>
-					<standard>�力羅�時間</standard>
-					<daylight>�力羅��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Korea">
-				<long>
-					<generic>韓國時間</generic>
-					<standard>韓國標準時間</standard>
-					<daylight>韓國�令時間</daylight>
-				</long>
-				<short>
-					<generic>KT</generic>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<long>
-					<standard>�比雪夫時間</standard>
-					<daylight>�比雪夫�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Kwajalein">
-				<long>
-					<standard>瓜加林環�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<long>
-					<standard>�爾�斯時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Lanka">
-				<long>
-					<standard>蘭�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Long_Shu">
-				<long>
-					<standard>隴蜀時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<long>
-					<generic>豪勳爵島時間</generic>
-					<standard>豪勳爵島標準時間</standard>
-					<daylight>豪勳爵島�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Macau">
-				<long>
-					<standard>澳門時間</standard>
-					<daylight>澳門�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Magadan">
-				<long>
-					<standard>馬加丹時間</standard>
-					<daylight>馬加丹�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Malaya">
-				<long>
-					<standard>馬來亞時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Malaysia">
-				<long>
-					<standard>馬來西亞時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<long>
-					<standard>馬紹爾群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Mongolia">
-				<long>
-					<standard>�蘭巴托時間</standard>
-					<daylight>�蘭巴托�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>莫斯科時間</generic>
-					<standard>莫斯科標準時間</standard>
-					<daylight>莫斯科�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Myanmar">
-				<long>
-					<standard>緬甸時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Nepal">
-				<long>
-					<standard>尼泊爾時間</standard>
-				</long>
-			</metazone>
-			<metazone type="New_Zealand">
-				<long>
-					<generic>�西蘭時間</generic>
-					<standard>�西蘭標準時間</standard>
-					<daylight>�西蘭�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Newfoundland">
-				<long>
-					<generic>�芬蘭時間</generic>
-					<standard>�芬蘭標準時間</standard>
-					<daylight >�芬蘭�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Noronha">
-				<long>
-					<standard>諾倫哈時間</standard>
-					<daylight>諾倫哈�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="North_Mariana">
-				<long>
-					<standard>北馬里亞�群島時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<long>
-					<standard>新西伯利亞時間</standard>
-					<daylight>新西伯利亞�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Omsk">
-				<long>
-					<standard>鄂木斯克時間</standard>
-					<daylight>鄂木斯克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pakistan">
-				<long>
-					<standard>巴基斯�時間</standard>
-					<daylight>巴基斯��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Paraguay">
-				<long>
-					<standard>巴拉圭時間</standard>
-					<daylight>巴拉圭�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Peru">
-				<long>
-					<standard>秘魯時間</standard>
-					<daylight>秘魯�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Philippines">
-				<long>
-					<standard>�律賓時間</standard>
-					<daylight>�律賓�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<long>
-					<generic>�彼德與密啟崙時間</generic>
-					<standard>�彼德與密啟崙標準時間</standard>
-					<daylight>�彼德與密啟崙�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<long>
-					<standard>克孜勒奧爾�時間</standard>
-					<daylight>克孜勒奧爾��令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Sakhalin">
-				<long>
-					<standard>庫�島時間</standard>
-					<daylight>庫�島�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samara">
-				<long>
-					<standard>薩馬拉時間</standard>
-					<daylight>薩馬拉�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Samarkand">
-				<long>
-					<standard>撒馬爾罕時間</standard>
-					<daylight>撒馬爾罕�令時間</daylight>
-				</long>
-				<short>
-					<standard>SAMT（撒馬爾罕）</standard>
-					<daylight>SAMST（撒馬爾罕）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<long>
-					<standard>薩摩亞標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Shevchenko">
-				<long>
-					<standard>�甫�科時間</standard>
-					<daylight>�甫�科�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Singapore">
-				<long>
-					<standard>新加�標準時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Suriname">
-				<long>
-					<standard>蘇利�時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<long>
-					<standard>斯維爾德洛夫斯克時間</standard>
-					<daylight>斯維爾德洛夫斯克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Taipei">
-				<long>
-					<generic>中原時間</generic>
-					<standard>中原標準時間</standard>
-					<daylight>中原�令時間</daylight>
-				</long>
-				<short>
-					<generic>CT（中原）</generic>
-					<standard>CST（中原）</standard>
-					<daylight>CDT（中原）</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tajikistan">
-				<long>
-					<standard>塔�克時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Tashkent">
-				<long>
-					<standard>塔什干時間</standard>
-					<daylight>塔什干�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Tbilisi">
-				<long>
-					<standard>第比利斯時間</standard>
-					<daylight>第比利斯�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkey">
-				<long>
-					<standard>土耳其時間</standard>
-					<daylight>土耳其�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<long>
-					<standard>土庫曼時間</standard>
-					<daylight>土庫曼�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uralsk">
-				<long>
-					<standard>�拉斯克時間</standard>
-					<daylight>�拉斯克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Uruguay">
-				<long>
-					<standard>�拉圭時間</standard>
-					<daylight>�拉圭�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Urumqi">
-				<long>
-					<standard>�魯木齊時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<long>
-					<standard>�茲別克時間</standard>
-					<daylight>�茲別克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Venezuela">
-				<long>
-					<standard>委內瑞拉時間</standard>
-				</long>
-			</metazone>
-			<metazone type="Vladivostok">
-				<long>
-					<standard>海�崴時間</standard>
-					<daylight>海�崴�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yakutsk">
-				<long>
-					<standard>雅庫次克時間</standard>
-					<daylight>雅庫次克�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<long>
-					<standard>凱薩�堡時間</standard>
-					<daylight>凱薩�堡�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yerevan">
-				<long>
-					<standard>葉里溫時間</standard>
-					<daylight>葉里溫�令時間</daylight>
-				</long>
-			</metazone>
-			<metazone type="Yukon">
-				<long>
-					<generic>育空時間</generic>
-					<standard>育空標準時間</standard>
-					<daylight>育空�令時間</daylight>
-				</long>
-			</metazone>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="ADP">
-				<displayName>安�爾陪士特</displayName>
-			</currency>
-			<currency type="AED">
-				<displayName>阿拉伯��大公國迪爾汗</displayName>
-			</currency>
-			<currency type="ALL">
-				<displayName>阿爾巴尼亞列克</displayName>
-			</currency>
-			<currency type="AMD">
-				<displayName>亞美尼亞德拉姆</displayName>
-			</currency>
-			<currency type="ANG">
-				<displayName>�屬安地列斯盾</displayName>
-			</currency>
-			<currency type="AOA">
-				<displayName>安哥拉寬扎</displayName>
-			</currency>
-			<currency type="AOK">
-				<displayName>安哥拉寬扎 (1977-1990)</displayName>
-			</currency>
-			<currency type="AON">
-				<displayName>安哥拉新寬扎 (1990-2000)</displayName>
-			</currency>
-			<currency type="AOR">
-				<displayName>安哥拉新寬扎 Reajustado (1995-1999)</displayName>
-			</currency>
-			<currency type="ARA">
-				<displayName>阿根廷奧斯特�爾</displayName>
-			</currency>
-			<currency type="ARP">
-				<displayName>阿根廷披索 (1983-1985)</displayName>
-			</currency>
-			<currency type="ARS">
-				<displayName>阿根廷披索</displayName>
-			</currency>
-			<currency type="ATS">
-				<displayName>奧地利先令</displayName>
-			</currency>
-			<currency type="AUD">
-				<displayName>澳幣</displayName>
-			</currency>
-			<currency type="AWG">
-				<displayName>阿魯巴盾</displayName>
-			</currency>
-			<currency type="AZM">
-				<displayName>亞塞拜然馬�特 (1993-2006)</displayName>
-			</currency>
-			<currency type="AZN">
-				<displayName>亞塞拜然馬�特</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>波士尼亞-黑塞哥維那第�爾</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>波士尼亞-黑塞哥維那�轉�馬克</displayName>
-			</currency>
-			<currency type="BBD">
-				<displayName>巴�多元</displayName>
-			</currency>
-			<currency type="BDT">
-				<displayName>孟加拉塔�</displayName>
-			</currency>
-			<currency type="BEC">
-				<displayName>比利時法郎（�轉�）</displayName>
-			</currency>
-			<currency type="BEF">
-				<displayName>比利時法郎</displayName>
-			</currency>
-			<currency type="BEL">
-				<displayName>比利時法郎（金�）</displayName>
-			</currency>
-			<currency type="BGL">
-				<displayName>�加利亞硬列弗</displayName>
-			</currency>
-			<currency type="BGN">
-				<displayName>�加利亞新列弗</displayName>
-			</currency>
-			<currency type="BHD">
-				<displayName>巴林第�爾</displayName>
-			</currency>
-			<currency type="BIF">
-				<displayName>蒲隆地法郎</displayName>
-			</currency>
-			<currency type="BMD">
-				<displayName>百慕�幣</displayName>
-			</currency>
-			<currency type="BND">
-				<displayName>汶�元</displayName>
-			</currency>
-			<currency type="BOB">
-				<displayName>玻利維亞貨幣單�</displayName>
-			</currency>
-			<currency type="BOP">
-				<displayName>玻利維亞披索</displayName>
-			</currency>
-			<currency type="BOV">
-				<displayName>玻利維亞幕多</displayName>
-			</currency>
-			<currency type="BRB">
-				<displayName>巴西克魯薩多農瓦（1967-1986）</displayName>
-			</currency>
-			<currency type="BRC">
-				<displayName>巴西克魯賽羅 (1986-1989)</displayName>
-			</currency>
-			<currency type="BRE">
-				<displayName>巴西克魯賽羅 (1990-1993)</displayName>
-			</currency>
-			<currency type="BRL">
-				<displayName>巴西里拉</displayName>
-			</currency>
-			<currency type="BRN">
-				<displayName>巴西克如爾�農瓦</displayName>
-			</currency>
-			<currency type="BRR">
-				<displayName>巴西克魯賽羅</displayName>
-			</currency>
-			<currency type="BSD">
-				<displayName>巴哈馬元</displayName>
-			</currency>
-			<currency type="BTN">
-				<displayName>�丹那特倫</displayName>
-			</currency>
-			<currency type="BUK">
-				<displayName>緬甸基雅特</displayName>
-			</currency>
-			<currency type="BWP">
-				<displayName>波札那普拉</displayName>
-			</currency>
-			<currency type="BYB">
-				<displayName>白俄羅斯新盧布 (1994-1999)</displayName>
-			</currency>
-			<currency type="BYR">
-				<displayName>白俄羅斯盧布</displayName>
-			</currency>
-			<currency type="BZD">
-				<displayName>�里斯元</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>加幣</displayName>
-			</currency>
-			<currency type="CDF">
-				<displayName>剛果法郎</displayName>
-			</currency>
-			<currency type="CHE">
-				<displayName>WIR �元</displayName>
-			</currency>
-			<currency type="CHW">
-				<displayName>WIR 法郎</displayName>
-			</currency>
-			<currency type="CLF">
-				<displayName>�林油�佛曼跎</displayName>
-			</currency>
-			<currency type="CLP">
-				<displayName>智利披索</displayName>
-			</currency>
-			<currency type="CNY">
-				<displayName>人民幣</displayName>
-			</currency>
-			<currency type="COP">
-				<displayName>哥倫比亞披索</displayName>
-			</currency>
-			<currency type="CRC">
-				<displayName>哥斯大黎加科郎</displayName>
-			</currency>
-			<currency type="CSD">
-				<displayName>舊塞爾維亞第�爾</displayName>
-			</currency>
-			<currency type="CSK">
-				<displayName>�克斯洛�克硬克朗</displayName>
-			</currency>
-			<currency type="CUP">
-				<displayName>�巴披索</displayName>
-			</currency>
-			<currency type="CVE">
-				<displayName>維德角埃斯庫多</displayName>
-			</currency>
-			<currency type="CYP">
-				<displayName>賽普勒斯鎊</displayName>
-			</currency>
-			<currency type="CZK">
-				<displayName>�克克朗</displayName>
-			</currency>
-			<currency type="DDM">
-				<displayName>�德奧斯特馬克</displayName>
-			</currency>
-			<currency type="DEM">
-				<displayName>德國馬克</displayName>
-			</currency>
-			<currency type="DJF">
-				<displayName>�布地法郎</displayName>
-			</currency>
-			<currency type="DKK">
-				<displayName>丹麥克羅�</displayName>
-			</currency>
-			<currency type="DOP">
-				<displayName>多明尼加披索</displayName>
-			</currency>
-			<currency type="DZD">
-				<displayName>阿爾�利亞第�爾</displayName>
-			</currency>
-			<currency type="ECS">
-				<displayName>厄瓜多蘇克雷</displayName>
-			</currency>
-			<currency type="ECV">
-				<displayName>厄瓜多爾由里�瓦康斯� (UVC)</displayName>
-			</currency>
-			<currency type="EEK">
-				<displayName>愛沙尼亞克朗</displayName>
-			</currency>
-			<currency type="EGP">
-				<displayName>埃�鎊</displayName>
-			</currency>
-			<currency type="ERN">
-				<displayName>厄立特里亞�克法</displayName>
-			</currency>
-			<currency type="ESA">
-				<displayName>西�牙比塞塔（會計單�）</displayName>
-			</currency>
-			<currency type="ESB">
-				<displayName>西�牙比塞塔（�轉�會計單�）</displayName>
-			</currency>
-			<currency type="ESP">
-				<displayName>西�牙陪士特</displayName>
-			</currency>
-			<currency type="ETB">
-				<displayName>衣索比亞比爾</displayName>
-			</currency>
-			<currency type="EUR">
-				<displayName>�元</displayName>
-			</currency>
-			<currency type="FIM">
-				<displayName>芬蘭馬克</displayName>
-			</currency>
-			<currency type="FJD">
-				<displayName>�濟元</displayName>
-			</currency>
-			<currency type="FKP">
-				<displayName>�克蘭群島鎊</displayName>
-			</currency>
-			<currency type="FRF">
-				<displayName>法國法郎</displayName>
-			</currency>
-			<currency type="GBP">
-				<displayName>英鎊</displayName>
-			</currency>
-			<currency type="GEK">
-				<displayName>喬治庫�拉里</displayName>
-			</currency>
-			<currency type="GEL">
-				<displayName>喬治拉里</displayName>
-			</currency>
-			<currency type="GHC">
-				<displayName>迦�仙蔕</displayName>
-			</currency>
-			<currency type="GIP">
-				<displayName>直布羅陀鎊</displayName>
-			</currency>
-			<currency type="GMD">
-				<displayName>甘比亞�拉西</displayName>
-			</currency>
-			<currency type="GNF">
-				<displayName>幾內亞法郎</displayName>
-			</currency>
-			<currency type="GNS">
-				<displayName>幾內亞西里</displayName>
-			</currency>
-			<currency type="GQE">
-				<displayName>赤�幾內亞埃奎勒</displayName>
-			</currency>
-			<currency type="GRD">
-				<displayName>希臘德拉克馬</displayName>
-			</currency>
-			<currency type="GTQ">
-				<displayName>瓜地馬拉格查爾</displayName>
-			</currency>
-			<currency type="GWE">
-				<displayName>葡屬幾內亞埃斯庫多</displayName>
-			</currency>
-			<currency type="GWP">
-				<displayName>幾內亞比索披索</displayName>
-			</currency>
-			<currency type="GYD">
-				<displayName>圭亞那元</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>港幣</displayName>
-			</currency>
-			<currency type="HNL">
-				<displayName>洪都拉斯倫皮拉</displayName>
-			</currency>
-			<currency type="HRD">
-				<displayName>克羅地亞第�爾</displayName>
-			</currency>
-			<currency type="HRK">
-				<displayName>克羅地亞庫�</displayName>
-			</currency>
-			<currency type="HUF">
-				<displayName>匈牙利�林</displayName>
-			</currency>
-			<currency type="IDR">
-				<displayName>�尼盾</displayName>
-			</currency>
-			<currency type="IEP">
-				<displayName>愛爾蘭鎊</displayName>
-			</currency>
-			<currency type="ILP">
-				<displayName>以色列鎊</displayName>
-			</currency>
-			<currency type="ILS">
-				<displayName>以色列新�克爾</displayName>
-			</currency>
-			<currency type="INR">
-				<displayName>�度盧比</displayName>
-			</currency>
-			<currency type="IQD">
-				<displayName>伊拉克第�爾</displayName>
-			</currency>
-			<currency type="IRR">
-				<displayName>伊朗里亞爾</displayName>
-			</currency>
-			<currency type="ISK">
-				<displayName>冰島克朗</displayName>
-			</currency>
-			<currency type="ITL">
-				<displayName>義大利里拉</displayName>
-			</currency>
-			<currency type="JMD">
-				<displayName>牙買加元</displayName>
-			</currency>
-			<currency type="JOD">
-				<displayName>約旦第�爾</displayName>
-			</currency>
-			<currency type="JPY">
-				<displayName>日圓</displayName>
-			</currency>
-			<currency type="KES">
-				<displayName>肯尼亞先令</displayName>
-			</currency>
-			<currency type="KGS">
-				<displayName>�爾�斯索馬</displayName>
-			</currency>
-			<currency type="KHR">
-				<displayName>柬埔寨瑞爾</displayName>
-			</currency>
-			<currency type="KMF">
-				<displayName>科摩羅法郎</displayName>
-			</currency>
-			<currency type="KPW">
-				<displayName>北韓圜</displayName>
-			</currency>
-			<currency type="KRW">
-				<displayName>韓圜</displayName>
-			</currency>
-			<currency type="KWD">
-				<displayName>科�特第�爾</displayName>
-			</currency>
-			<currency type="KYD">
-				<displayName>開曼群島美元</displayName>
-			</currency>
-			<currency type="KZT">
-				<displayName>�扎克斯���</displayName>
-			</currency>
-			<currency type="LAK">
-				<displayName>寮國基普</displayName>
-			</currency>
-			<currency type="LBP">
-				<displayName>黎巴嫩鎊</displayName>
-			</currency>
-			<currency type="LKR">
-				<displayName>斯里蘭�盧布</displayName>
-			</currency>
-			<currency type="LRD">
-				<displayName>賴比瑞亞元</displayName>
-			</currency>
-			<currency type="LSL">
-				<displayName>賴索托羅蒂</displayName>
-			</currency>
-			<currency type="LTL">
-				<displayName>立陶宛里塔</displayName>
-			</currency>
-			<currency type="LTT">
-				<displayName>立陶宛特羅</displayName>
-			</currency>
-			<currency type="LUC">
-				<displayName>盧森堡�兌�法郎</displayName>
-			</currency>
-			<currency type="LUF">
-				<displayName>盧森堡法郎</displayName>
-			</currency>
-			<currency type="LUL">
-				<displayName>盧森堡金�法郎</displayName>
-			</currency>
-			<currency type="LVL">
-				<displayName>拉脫維亞拉特銀幣</displayName>
-			</currency>
-			<currency type="LVR">
-				<displayName>拉脫維亞盧布</displayName>
-			</currency>
-			<currency type="LYD">
-				<displayName>利比亞第�爾</displayName>
-			</currency>
-			<currency type="MDL">
-				<displayName>摩�雲列伊</displayName>
-			</currency>
-			<currency type="MGA">
-				<displayName>馬�加斯加艾瑞爾</displayName>
-			</currency>
-			<currency type="MGF">
-				<displayName>馬�加斯加法郎</displayName>
-			</currency>
-			<currency type="MKD">
-				<displayName>馬其頓第�爾</displayName>
-			</currency>
-			<currency type="MLF">
-				<displayName>馬里法郎</displayName>
-			</currency>
-			<currency type="MMK">
-				<displayName>緬甸元</displayName>
-			</currency>
-			<currency type="MNT">
-				<displayName>蒙�圖格里克</displayName>
-			</currency>
-			<currency type="MOP">
-				<displayName>澳門元</displayName>
-			</currency>
-			<currency type="MRO">
-				<displayName>茅利塔尼亞��亞</displayName>
-			</currency>
-			<currency type="MTL">
-				<displayName>馬爾他里拉</displayName>
-			</currency>
-			<currency type="MTP">
-				<displayName>馬爾他鎊</displayName>
-			</currency>
-			<currency type="MUR">
-				<displayName>模里西斯盧布</displayName>
-			</currency>
-			<currency type="MVR">
-				<displayName>馬爾地夫海島盧�亞</displayName>
-			</currency>
-			<currency type="MWK">
-				<displayName>馬拉維克瓦查</displayName>
-			</currency>
-			<currency type="MXN">
-				<displayName>墨西哥披索</displayName>
-			</currency>
-			<currency type="MXP">
-				<displayName>墨西哥銀披索 (1861-1992)</displayName>
-			</currency>
-			<currency type="MXV">
-				<displayName>墨西哥轉�單�（UDI）</displayName>
-			</currency>
-			<currency type="MYR">
-				<displayName>馬來西亞令�</displayName>
-			</currency>
-			<currency type="MZE">
-				<displayName>莫三比克埃斯庫多</displayName>
-			</currency>
-			<currency type="MZM">
-				<displayName>莫三比克梅蒂�爾</displayName>
-			</currency>
-			<currency type="MZN">
-				<displayName>莫三比克美��</displayName>
-			</currency>
-			<currency type="NAD">
-				<displayName>�米比亞元</displayName>
-			</currency>
-			<currency type="NGN">
-				<displayName>奈�利亞奈拉</displayName>
-			</currency>
-			<currency type="NIO">
-				<displayName>尼加拉瓜金科多巴</displayName>
-			</currency>
-			<currency type="NLG">
-				<displayName>�蘭盾</displayName>
-			</currency>
-			<currency type="NOK">
-				<displayName>挪�克羅�</displayName>
-			</currency>
-			<currency type="NPR">
-				<displayName>尼泊爾盧布</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�西蘭幣</displayName>
-			</currency>
-			<currency type="OMR">
-				<displayName>阿曼里奧</displayName>
-			</currency>
-			<currency type="PAB">
-				<displayName>巴拿馬巴波亞</displayName>
-			</currency>
-			<currency type="PEI">
-				<displayName>祕魯因蒂</displayName>
-			</currency>
-			<currency type="PEN">
-				<displayName>秘魯新太陽幣</displayName>
-			</currency>
-			<currency type="PES">
-				<displayName>秘魯太陽幣</displayName>
-			</currency>
-			<currency type="PGK">
-				<displayName>巴布亞�幾內亞基那</displayName>
-			</currency>
-			<currency type="PHP">
-				<displayName>�律賓披索</displayName>
-			</currency>
-			<currency type="PKR">
-				<displayName>巴基斯�盧布</displayName>
-			</currency>
-			<currency type="PLN">
-				<displayName>波蘭茲羅�</displayName>
-			</currency>
-			<currency type="PLZ">
-				<displayName>波蘭茲羅� (1950-1995)</displayName>
-			</currency>
-			<currency type="PTE">
-				<displayName>葡�牙埃斯庫多</displayName>
-			</currency>
-			<currency type="PYG">
-				<displayName>巴拉圭瓜拉尼</displayName>
-			</currency>
-			<currency type="QAR">
-				<displayName>��爾里亞爾</displayName>
-			</currency>
-			<currency type="RHD">
-				<displayName>羅德西亞元</displayName>
-			</currency>
-			<currency type="ROL">
-				<displayName>舊羅馬尼亞列伊</displayName>
-			</currency>
-			<currency type="RON">
-				<displayName>羅馬尼亞列伊</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>塞爾維亞戴�</displayName>
-			</currency>
-			<currency type="RUB">
-				<displayName>俄羅斯盧布</displayName>
-			</currency>
-			<currency type="RUR">
-				<displayName>俄羅斯盧布 (1991-1998)</displayName>
-			</currency>
-			<currency type="RWF">
-				<displayName>盧安�法郎</displayName>
-			</currency>
-			<currency type="SAR">
-				<displayName>沙�地里雅</displayName>
-			</currency>
-			<currency type="SBD">
-				<displayName>索羅門群島元</displayName>
-			</currency>
-			<currency type="SCR">
-				<displayName>塞席爾盧比</displayName>
-			</currency>
-			<currency type="SDD">
-				<displayName>蘇丹第�爾</displayName>
-			</currency>
-			<currency type="SDG">
-				<displayName>蘇丹鎊</displayName>
-			</currency>
-			<currency type="SDP">
-				<displayName>舊蘇丹鎊</displayName>
-			</currency>
-			<currency type="SEK">
-				<displayName>瑞典克羅�</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>新加�幣</displayName>
-			</currency>
-			<currency type="SHP">
-				<displayName>�赫勒拿鎊</displayName>
-			</currency>
-			<currency type="SIT">
-				<displayName>斯洛維尼亞托勒</displayName>
-			</currency>
-			<currency type="SKK">
-				<displayName>斯洛�克克朗</displayName>
-			</currency>
-			<currency type="SLL">
-				<displayName>��山利昂</displayName>
-			</currency>
-			<currency type="SOS">
-				<displayName>索馬利亞先令</displayName>
-			</currency>
-			<currency type="SRD">
-				<displayName>蘇利�元</displayName>
-			</currency>
-			<currency type="SRG">
-				<displayName>蘇利�基爾</displayName>
-			</currency>
-			<currency type="STD">
-				<displayName>�多美島和普林西比島多布拉</displayName>
-			</currency>
-			<currency type="SUR">
-				<displayName>蘇�盧布</displayName>
-			</currency>
-			<currency type="SVC">
-				<displayName>薩爾瓦多科郎</displayName>
-			</currency>
-			<currency type="SYP">
-				<displayName>敘利亞鎊</displayName>
-			</currency>
-			<currency type="SZL">
-				<displayName>�瓦濟蘭里朗�尼</displayName>
-			</currency>
-			<currency type="THB">
-				<displayName>泰銖</displayName>
-			</currency>
-			<currency type="TJR">
-				<displayName>塔�克盧布</displayName>
-			</currency>
-			<currency type="TJS">
-				<displayName>塔�克索莫尼</displayName>
-			</currency>
-			<currency type="TMM">
-				<displayName>土庫曼馬�特</displayName>
-			</currency>
-			<currency type="TND">
-				<displayName>�尼西亞第�爾</displayName>
-			</currency>
-			<currency type="TOP">
-				<displayName>�加潘加</displayName>
-			</currency>
-			<currency type="TPE">
-				<displayName>�汶埃斯庫多</displayName>
-			</currency>
-			<currency type="TTD">
-				<displayName>�里��托巴哥元</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>新臺幣</displayName>
-			</currency>
-			<currency type="TZS">
-				<displayName>�尚尼亞先令</displayName>
-			</currency>
-			<currency type="UAH">
-				<displayName>�克蘭格里夫那</displayName>
-			</currency>
-			<currency type="UAK">
-				<displayName>�克蘭�本瓦那茲</displayName>
-			</currency>
-			<currency type="UGS">
-				<displayName>�干�先令 (1966-1987)</displayName>
-			</currency>
-			<currency type="UGX">
-				<displayName>�干�先令</displayName>
-			</currency>
-			<currency type="USD">
-				<symbol>$</symbol>
-			</currency>
-			<currency type="USN">
-				<displayName>美元 (第二天)</displayName>
-			</currency>
-			<currency type="USS">
-				<displayName>美元 (�一天)</displayName>
-			</currency>
-			<currency type="UYP">
-				<displayName>�拉圭披索 (1975-1993)</displayName>
-			</currency>
-			<currency type="UYU">
-				<displayName>�拉圭披索</displayName>
-			</currency>
-			<currency type="UZS">
-				<displayName>�茲別克索姆</displayName>
-			</currency>
-			<currency type="VEB">
-				<displayName>委內瑞拉玻利瓦</displayName>
-			</currency>
-			<currency type="VEF">
-				<displayName>委內瑞拉強勢玻利瓦</displayName>
-			</currency>
-			<currency type="VUV">
-				<displayName>�那���</displayName>
-			</currency>
-			<currency type="WST">
-				<displayName>西薩摩亞塔拉</displayName>
-			</currency>
-			<currency type="XAF">
-				<displayName>西�法郎 BEAC</displayName>
-			</currency>
-			<currency type="XAG">
-				<displayName>XAG</displayName>
-			</currency>
-			<currency type="XAU">
-				<displayName>黃金</displayName>
-			</currency>
-			<currency type="XBA">
-				<displayName>�洲綜�單�</displayName>
-			</currency>
-			<currency type="XBB">
-				<displayName>�洲貨幣單� XBB</displayName>
-			</currency>
-			<currency type="XBC">
-				<displayName>�洲會計單� (XBC)</displayName>
-			</currency>
-			<currency type="XBD">
-				<displayName>�洲會計單� (XBD)</displayName>
-			</currency>
-			<currency type="XCD">
-				<displayName>格瑞那�元</displayName>
-			</currency>
-			<currency type="XDR">
-				<displayName>特殊�款權</displayName>
-			</currency>
-			<currency type="XEU">
-				<displayName>�洲貨幣單� XEU</displayName>
-			</currency>
-			<currency type="XFO">
-				<displayName>法國金法郎</displayName>
-			</currency>
-			<currency type="XFU">
-				<displayName>法國 UIC 法郎</displayName>
-			</currency>
-			<currency type="XOF">
-				<displayName>西�法郎 BCEAO</displayName>
-			</currency>
-			<currency type="XPD">
-				<displayName>帕拉狄昂</displayName>
-			</currency>
-			<currency type="XPF">
-				<displayName>CFP 法郎</displayName>
-			</currency>
-			<currency type="XPT">
-				<displayName>白金</displayName>
-			</currency>
-			<currency type="XTS">
-				<displayName>XTS</displayName>
-			</currency>
-			<currency type="XXX">
-				<displayName>XXX</displayName>
-			</currency>
-			<currency type="YDD">
-				<displayName>葉門第�爾</displayName>
-			</currency>
-			<currency type="YER">
-				<displayName>葉門里雅</displayName>
-			</currency>
-			<currency type="YUD">
-				<displayName>�斯拉夫第�爾硬幣</displayName>
-			</currency>
-			<currency type="YUM">
-				<displayName>�斯拉夫挪�亞第�爾</displayName>
-			</currency>
-			<currency type="YUN">
-				<displayName>�斯拉夫 �轉�第�爾</displayName>
-			</currency>
-			<currency type="ZAL">
-				<displayName>��蘭特 (金�)</displayName>
-			</currency>
-			<currency type="ZAR">
-				<displayName>��蘭特</displayName>
-			</currency>
-			<currency type="ZMK">
-				<displayName>尚比亞克瓦查</displayName>
-			</currency>
-			<currency type="ZRN">
-				<displayName>薩伊新扎伊爾</displayName>
-			</currency>
-			<currency type="ZRZ">
-				<displayName>薩伊扎伊爾</displayName>
-			</currency>
-			<currency type="ZWD">
-				<displayName>辛巴�元</displayName>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="hour">
-			<unitPattern count="other">{0}�時</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} 週</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>是:確定</yesstr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_HK.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hant_HK.xml
deleted file mode 100644
index b74989cc3..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_HK.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.78 $"/>
-		<generation date="$Date: 2009/06/15 03:46:23 $"/>
-		<language type="zh"/>
-		<script type="Hant"/>
-		<territory type="HK"/>
-	</identity>
-	<localeDisplayNames>
-		<languages>
-			<language type="it">�大利文</language>
-			<language type="lol">蒙�語</language>
-		</languages>
-		<scripts>
-			<script type="Hang">韓文字�</script>
-		</scripts>
-		<variants>
-			<variant type="1901">傳統德國拼字法</variant>
-			<variant type="1996">1996 德國拼字法</variant>
-			<variant type="BISKE">San Giorgio/Bila 方言</variant>
-			<variant type="NJIVA">Gniva/Njiva 方言</variant>
-			<variant type="OSOJS">Oseacco/Osojane 方言</variant>
-			<variant type="REVISED">已修訂拼字法</variant>
-			<variant type="SCOTLAND">蘇格蘭標準英語</variant>
-			<variant type="SOLBA">Stolvizza/Solbica 方言</variant>
-		</variants>
-		<types>
-			<type type="big5han" key="collation">�體中文順� - Big5</type>
-			<type type="gb2312han" key="collation">簡體中文順� - GB2312</type>
-		</types>
-		<measurementSystemNames>
-			<measurementSystemName type="metric">�進制</measurementSystemName>
-		</measurementSystemNames>
-	</localeDisplayNames>
-	<dates>
-		<calendars>
-			<calendar type="chinese">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="MMMMEd">M月d日E</dateFormatItem>
-						<dateFormatItem id="yMEd">y年M月d日，E</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y年M月d日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>ahh:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1}{0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">ah至h時</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">ah:mm至ah:mmv</greatestDifference>
-							<greatestDifference id="h">ah:mm至h:mmv</greatestDifference>
-							<greatestDifference id="m">ah:mm至h:mmv</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">ah時至ah時v</greatestDifference>
-							<greatestDifference id="h">ah至h時v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M月d日至d日</greatestDifference>
-							<greatestDifference id="M">M月d日至M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">M月d日E至M月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy年M月至M月</greatestDifference>
-							<greatestDifference id="y">yy年M月至yy年M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">yy年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">yy年M月d日至yy年M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yy年M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">yy年M月d日E至M月d日E</greatestDifference>
-							<greatestDifference id="y">yy年M月d日E至yy年M月d日E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-		<currencies>
-			<currency type="AUD">
-				<displayName>澳元</displayName>
-			</currency>
-			<currency type="BAD">
-				<displayName>波斯尼亞-黑塞哥維那第�爾</displayName>
-			</currency>
-			<currency type="BAM">
-				<displayName>波斯尼亞-黑塞哥維那�轉�馬克</displayName>
-			</currency>
-			<currency type="CAD">
-				<displayName>加元</displayName>
-			</currency>
-			<currency type="HKD">
-				<displayName>港元</displayName>
-				<symbol>$</symbol>
-			</currency>
-			<currency type="ITL">
-				<displayName>�大利里拉</displayName>
-			</currency>
-			<currency type="NZD">
-				<displayName>�西蘭元</displayName>
-			</currency>
-			<currency type="RSD">
-				<displayName>塞爾維亞第�爾</displayName>
-			</currency>
-			<currency type="SGD">
-				<displayName>新加�元</displayName>
-			</currency>
-			<currency type="TWD">
-				<displayName>新�幣</displayName>
-			</currency>
-			<currency type="USD">
-				<symbol>US$</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<units>
-		<unit type="hour">
-			<unitPattern count="other">{0}時</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0}星期</unitPattern>
-		</unit>
-	</units>
-	<posix>
-		<messages>
-			<yesstr>是</yesstr>
-			<nostr>�</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_MO.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hant_MO.xml
deleted file mode 100644
index 56f538884..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_MO.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.64 $"/>
-		<generation date="$Date: 2009/06/15 03:46:25 $"/>
-		<language type="zh"/>
-		<script type="Hant"/>
-		<territory type="MO"/>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="chinese">
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-					</availableFormats>
-				</dateTimeFormats>
-			</calendar>
-			<calendar type="gregorian">
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>y年MM月dd日EEEE</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>y年MM月dd日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>y年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yy年M月d日</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>ahh:mm:ss</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-				<dateTimeFormats>
-					<availableFormats>
-						<dateFormatItem id="yyyyM">yyyy/M</dateFormatItem>
-					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="h">
-							<greatestDifference id="h">ah至h時</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">ah:mm至ah:mmv</greatestDifference>
-							<greatestDifference id="h">ah:mm至h:mmv</greatestDifference>
-							<greatestDifference id="m">ah:mm至h:mmv</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="hv">
-							<greatestDifference id="a">ah時至ah時v</greatestDifference>
-							<greatestDifference id="h">ah至h時v</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Md">
-							<greatestDifference id="d">M月d日至d日</greatestDifference>
-							<greatestDifference id="M">M月d日至M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">M月d日E至M月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MM月d日至d日</greatestDifference>
-							<greatestDifference id="M">MM月d日至MM月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">MM月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">MM月d日E至MM月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yy年M月至M月</greatestDifference>
-							<greatestDifference id="y">yy年M月至yy年M月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yy年M月d日至d日</greatestDifference>
-							<greatestDifference id="M">yy年M月d日至M月d日</greatestDifference>
-							<greatestDifference id="y">yy年M月d日至yy年M月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">yy年M月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">yy年M月d日E至M月d日E</greatestDifference>
-							<greatestDifference id="y">yy年M月d日E至yy年M月d日E</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">y年MM月至MM月</greatestDifference>
-							<greatestDifference id="y">y年MM月至y年MM月</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">y年MM月d日至d日</greatestDifference>
-							<greatestDifference id="M">y年MM月d日至MM月d日</greatestDifference>
-							<greatestDifference id="y">y年MM月d日至y年MM月d日</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">y年MM月d日E至d日E</greatestDifference>
-							<greatestDifference id="M">y年MM月d日E至MM月d日E</greatestDifference>
-							<greatestDifference id="y">y年MM月d日E至y年MM月d日E</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
-				</dateTimeFormats>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_TW.xml b/airtime_mvc/library/Zend/Locale/Data/zh_Hant_TW.xml
deleted file mode 100644
index 30fc77dea..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_Hant_TW.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.39 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<script type="Hant"/>
-		<territory type="TW"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_MO.xml b/airtime_mvc/library/Zend/Locale/Data/zh_MO.xml
deleted file mode 100644
index 435a03b02..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_MO.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<territory type="MO"/>
-	</identity>
-	<alias source="zh_Hant_MO" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_SG.xml b/airtime_mvc/library/Zend/Locale/Data/zh_SG.xml
deleted file mode 100644
index 7eab83100..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_SG.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.46 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<territory type="SG"/>
-	</identity>
-	<alias source="zh_Hans_SG" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zh_TW.xml b/airtime_mvc/library/Zend/Locale/Data/zh_TW.xml
deleted file mode 100644
index 052da3e57..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zh_TW.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.51 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zh"/>
-		<territory type="TW"/>
-	</identity>
-	<alias source="zh_Hant_TW" path="//ldml"/>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Data/zu.xml b/airtime_mvc/library/Zend/Locale/Data/zu.xml
deleted file mode 100644
index c248ec024..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zu.xml
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.31 $"/>
-		<generation date="$Date: 2009/05/05 23:06:41 $"/>
-		<language type="zu"/>
-	</identity>
-	<fallback>en_ZA</fallback>
-	<localeDisplayNames>
-		<languages>
-			<language type="af">isiBhunu</language>
-			<language type="am">Isi-Amaharikhi</language>
-			<language type="ar">isi-Alabhu</language>
-			<language type="as">Assamese</language>
-			<language type="az">Isi-Azebhayijani</language>
-			<language type="be">IsiBhelarashiyani</language>
-			<language type="bg">Isi-Bulgaria</language>
-			<language type="bh">IsiBhihari</language>
-			<language type="bn">IsiBhengali</language>
-			<language type="br">isihlobo sase Britain</language>
-			<language type="bs">IsiBhosiniyani</language>
-			<language type="ca">IsiKhathalani</language>
-			<language type="cs">Isi-Czech</language>
-			<language type="cy">IsiWelshi</language>
-			<language type="da">IsiDenishi</language>
-			<language type="de">isiJalimani</language>
-			<language type="el">IsiGreki</language>
-			<language type="en">isiNgisi</language>
-			<language type="eo">Isi-Esperanto</language>
-			<language type="es">isiSpeyini</language>
-			<language type="et">Isi-Esistoniya</language>
-			<language type="eu">Isi-Basque</language>
-			<language type="fa">IsiPheshiyani</language>
-			<language type="fi">isiFinnish</language>
-			<language type="fil">IsiThagalogi</language>
-			<language type="fo">Isifaro</language>
-			<language type="fr">isiFulentshi</language>
-			<language type="fy">IsiFriziyani</language>
-			<language type="ga">Isi-Irishi</language>
-			<language type="gd">I-Scots Gaelic</language>
-			<language type="gl">Isi-Galashiya</language>
-			<language type="gn">Gurani</language>
-			<language type="gu">IsiGujarati</language>
-			<language type="he">IsiHebheru</language>
-			<language type="hi">isiHindi</language>
-			<language type="hr">Isi-Croatia</language>
-			<language type="hu">IsiHangari</language>
-			<language type="hy">Armenian</language>
-			<language type="ia">Izilimi ezihlangene</language>
-			<language type="id">Isi-Indonesia</language>
-			<language type="ie">Izilimu</language>
-			<language type="is">Isi-Icelandic</language>
-			<language type="it">isItalian</language>
-			<language type="ja">IsiJaphani</language>
-			<language type="jv">IsiJavanisi</language>
-			<language type="ka">IsiJojiyani</language>
-			<language type="km">Cambodian</language>
-			<language type="kn">Ikhanada</language>
-			<language type="ko">IsiKoriya</language>
-			<language type="ku">ulimu lwama Kudishi</language>
-			<language type="ky">Kyrgyz</language>
-			<language type="la">IsiLathini</language>
-			<language type="ln">Lingala</language>
-			<language type="lo">Laothian</language>
-			<language type="lt">Isi-Lithuanian</language>
-			<language type="lv">Isi-Latvian</language>
-			<language type="mk">IsiMakhedoniya</language>
-			<language type="ml">IsiMalayami</language>
-			<language type="mn">Mongolian</language>
-			<language type="mr">IsiMarathi</language>
-			<language type="ms">IsiMalayi</language>
-			<language type="mt">IsiMalithize</language>
-			<language type="ne">IsiNepali</language>
-			<language type="nl">Isi-Dutch</language>
-			<language type="nn">IsiNowejiyani (Nynorsk)</language>
-			<language type="no">IsiNoweyi</language>
-			<language type="oc">Isi-Osithani</language>
-			<language type="or">Oriya</language>
-			<language type="pa">IsiPhunjabi</language>
-			<language type="pl">IsiPholisi</language>
-			<language type="ps">Pashto</language>
-			<language type="pt">IsiPotukezi</language>
-			<language type="pt_BR">Isiputukezi (Brazil)</language>
-			<language type="pt_PT">IsiPotukezi (Ephothugali)</language>
-			<language type="ro">IsiRomani</language>
-			<language type="ru">IsiRashiya</language>
-			<language type="sa">Sanskrit</language>
-			<language type="sd">Sindhi</language>
-			<language type="sh">Serbo-Croatian</language>
-			<language type="si">IsiSinhalese</language>
-			<language type="sk">IsiSlovaki</language>
-			<language type="sl">IsiSlovakiyani</language>
-			<language type="so">Somali</language>
-			<language type="sq">Isi-Albania</language>
-			<language type="sr">Isi-Sebhiya</language>
-			<language type="st">isiSuthu</language>
-			<language type="su">IsiSundanizi</language>
-			<language type="sv">IsiSwidishi</language>
-			<language type="sw">isiSwahili</language>
-			<language type="ta">IsiThamil</language>
-			<language type="te">IsiThelugu</language>
-			<language type="th">IsiThayi</language>
-			<language type="ti">IsiTigrinya</language>
-			<language type="tk">umuntu wase Turkmenistan.</language>
-			<language type="tlh">IsiKlingoni</language>
-			<language type="tr">IsiThekishi</language>
-			<language type="tw">Twi</language>
-			<language type="ug">Uighur</language>
-			<language type="uk">Isi-Ukrain</language>
-			<language type="ur">Isi-Udu</language>
-			<language type="uz">Isi-Uzibheki</language>
-			<language type="vi">IsiVietnamise</language>
-			<language type="xh">isiXhosa</language>
-			<language type="yi">ulimu olwi Yidish</language>
-			<language type="zu">isiZulu</language>
-		</languages>
-		<territories>
-			<territory type="ZA">iNingizimu Afrika</territory>
-		</territories>
-	</localeDisplayNames>
-	<characters>
-		<exemplarCharacters>[a b {bh} c {ch} d {dl} {dy} e-g {gc} {gq} {gx} h {hh} {hl} i-k {kh} {kl} {kp} l-n {nc} {ngc} {ngq} {ngx} {nhl} {nk} {nkc} {nkq} {nkx} {nq} {ntsh} {nx} {ny} o p {ph} q {qh} r {rh} s {sh} t {th} {tl} {ts} {tsh} u-x {xh} y z]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-z]</exemplarCharacters>
-	</characters>
-	<delimiters>
-		<quotationStart>‘</quotationStart>
-		<quotationEnd>’</quotationEnd>
-		<alternateQuotationStart>“</alternateQuotationStart>
-		<alternateQuotationEnd>�</alternateQuotationEnd>
-	</delimiters>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">Jan</month>
-							<month type="2">Feb</month>
-							<month type="3">Mas</month>
-							<month type="4">Apr</month>
-							<month type="5">Mey</month>
-							<month type="6">Jun</month>
-							<month type="7">Jul</month>
-							<month type="8">Aga</month>
-							<month type="9">Sep</month>
-							<month type="10">Okt</month>
-							<month type="11">Nov</month>
-							<month type="12">Dis</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">Januwari</month>
-							<month type="2">Februwari</month>
-							<month type="3">Mashi</month>
-							<month type="4">Apreli</month>
-							<month type="5">Meyi</month>
-							<month type="6">Juni</month>
-							<month type="7">Julayi</month>
-							<month type="8">Agasti</month>
-							<month type="9">Septhemba</month>
-							<month type="10">Okthoba</month>
-							<month type="11">Novemba</month>
-							<month type="12">Disemba</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">J</month>
-							<month type="2">F</month>
-							<month type="3">M</month>
-							<month type="4">A</month>
-							<month type="5">M</month>
-							<month type="6">J</month>
-							<month type="7">J</month>
-							<month type="8">A</month>
-							<month type="9">S</month>
-							<month type="10">O</month>
-							<month type="11">N</month>
-							<month type="12">D</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">uJanuwari</month>
-							<month type="2">uFebruwari</month>
-							<month type="3">uMashi</month>
-							<month type="4">u-Apreli</month>
-							<month type="5">uMeyi</month>
-							<month type="6">uJuni</month>
-							<month type="7">uJulayi</month>
-							<month type="8">uAgasti</month>
-							<month type="9">uSepthemba</month>
-							<month type="10">u-Okthoba</month>
-							<month type="11">uNovemba</month>
-							<month type="12">uDisemba</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-				<days>
-					<dayContext type="format">
-						<dayWidth type="abbreviated">
-							<day type="sun">Son</day>
-							<day type="mon">Mso</day>
-							<day type="tue">Bil</day>
-							<day type="wed">Tha</day>
-							<day type="thu">Sin</day>
-							<day type="fri">Hla</day>
-							<day type="sat">Mgq</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun">Sonto</day>
-							<day type="mon">Msombuluko</day>
-							<day type="tue">Lwesibili</day>
-							<day type="wed">Lwesithathu</day>
-							<day type="thu">uLwesine</day>
-							<day type="fri">Lwesihlanu</day>
-							<day type="sat">Mgqibelo</day>
-						</dayWidth>
-					</dayContext>
-					<dayContext type="stand-alone">
-						<dayWidth type="narrow">
-							<day type="sun">S</day>
-							<day type="mon">M</day>
-							<day type="tue">B</day>
-							<day type="wed">T</day>
-							<day type="thu">S</day>
-							<day type="fri">H</day>
-							<day type="sat">M</day>
-						</dayWidth>
-					</dayContext>
-				</days>
-				<eras>
-					<eraAbbr>
-						<era type="0">BC</era>
-						<era type="1">AD</era>
-					</eraAbbr>
-				</eras>
-				<dateFormats>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE dd MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>d MMMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>d MMM y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-				</dateFormats>
-				<timeFormats>
-					<timeFormatLength type="full">
-						<timeFormat>
-							<pattern>h:mm:ss a zzzz</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="long">
-						<timeFormat>
-							<pattern>h:mm:ss a z</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="medium">
-						<timeFormat>
-							<pattern>h:mm:ss a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-					<timeFormatLength type="short">
-						<timeFormat>
-							<pattern>h:mm a</pattern>
-						</timeFormat>
-					</timeFormatLength>
-				</timeFormats>
-			</calendar>
-		</calendars>
-		<timeZoneNames>
-			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<gmtFormat>GMT{0}</gmtFormat>
-			<regionFormat>{0}</regionFormat>
-		</timeZoneNames>
-	</dates>
-	<numbers>
-		<symbols>
-			<decimal>,</decimal>
-			<group> </group>
-		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats>
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern>#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats>
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat>
-					<pattern>¤#,##0.00</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
-	</numbers>
-	<posix>
-		<messages>
-			<yesstr>yebo:y</yesstr>
-			<nostr>cha:c</nostr>
-		</messages>
-	</posix>
-</ldml>
-
diff --git a/airtime_mvc/library/Zend/Locale/Data/zu_ZA.xml b/airtime_mvc/library/Zend/Locale/Data/zu_ZA.xml
deleted file mode 100644
index f75d9e9be..000000000
--- a/airtime_mvc/library/Zend/Locale/Data/zu_ZA.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ldml>
-	<identity>
-		<version number="$Revision: 1.15 $"/>
-		<generation date="$Date: 2009/05/05 23:06:42 $"/>
-		<language type="zu"/>
-		<territory type="ZA"/>
-	</identity>
-</ldml>
diff --git a/airtime_mvc/library/Zend/Locale/Exception.php b/airtime_mvc/library/Zend/Locale/Exception.php
deleted file mode 100644
index 321814c48..000000000
--- a/airtime_mvc/library/Zend/Locale/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Locale/Format.php b/airtime_mvc/library/Zend/Locale/Format.php
deleted file mode 100644
index 2b2510f3b..000000000
--- a/airtime_mvc/library/Zend/Locale/Format.php
+++ /dev/null
@@ -1,1241 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @subpackage Format
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Format.php 21493 2010-03-14 12:01:43Z thomas $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * include needed classes
- */
-require_once 'Zend/Locale/Data.php';
-
-/**
- * @category   Zend
- * @package    Zend_Locale
- * @subpackage Format
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Format
-{
-    const STANDARD   = 'auto';
-
-    private static $_options = array('date_format'   => null,
-                                     'number_format' => null,
-                                     'format_type'   => 'iso',
-                                     'fix_date'      => false,
-                                     'locale'        => null,
-                                     'cache'         => null,
-                                     'disableCache'  => false,
-                                     'precision'     => null);
-
-    /**
-     * Sets class wide options, if no option was given, the actual set options will be returned
-     * The 'precision' option of a value is used to truncate or stretch extra digits. -1 means not to touch the extra digits.
-     * The 'locale' option helps when parsing numbers and dates using separators and month names.
-     * The date format 'format_type' option selects between CLDR/ISO date format specifier tokens and PHP's date() tokens.
-     * The 'fix_date' option enables or disables heuristics that attempt to correct invalid dates.
-     * The 'number_format' option can be used to specify a default number format string
-     * The 'date_format' option can be used to specify a default date format string, but beware of using getDate(),
-     * checkDateFormat() and getTime() after using setOptions() with a 'format'.  To use these four methods
-     * with the default date format for a locale, use array('date_format' => null, 'locale' => $locale) for their options.
-     *
-     * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
-     *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
-     * @throws Zend_Locale_Exception
-     * @return Options array if no option was given
-     */
-    public static function setOptions(array $options = array())
-    {
-        self::$_options = self::_checkOptions($options) + self::$_options;
-        return self::$_options;
-    }
-
-    /**
-     * Internal function for checking the options array of proper input values
-     * See {@link setOptions()} for details.
-     *
-     * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
-     *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
-     * @throws Zend_Locale_Exception
-     * @return Options array if no option was given
-     */
-    private static function _checkOptions(array $options = array())
-    {
-        if (count($options) == 0) {
-            return self::$_options;
-        }
-        foreach ($options as $name => $value) {
-            $name  = strtolower($name);
-            if ($name !== 'locale') {
-                if (gettype($value) === 'string') {
-                    $value = strtolower($value);
-                }
-            }
-
-            switch($name) {
-                case 'number_format' :
-                    if ($value == Zend_Locale_Format::STANDARD) {
-                        $locale = self::$_options['locale'];
-                        if (isset($options['locale'])) {
-                            $locale = $options['locale'];
-                        }
-                        $options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber');
-                    } else if ((gettype($value) !== 'string') and ($value !== NULL)) {
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. "
-                            . "Format '$value' must be a valid number format string.");
-                    }
-                    break;
-
-                case 'date_format' :
-                    if ($value == Zend_Locale_Format::STANDARD) {
-                        $locale = self::$_options['locale'];
-                        if (isset($options['locale'])) {
-                            $locale = $options['locale'];
-                        }
-                        $options['date_format'] = Zend_Locale_Format::getDateFormat($locale);
-                    } else if ((gettype($value) !== 'string') and ($value !== NULL)) {
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. "
-                            . "Format '$value' must be a valid ISO or PHP date format string.");
-                    } else {
-                        if (((isset($options['format_type']) === true) and ($options['format_type'] == 'php')) or
-                            ((isset($options['format_type']) === false) and (self::$_options['format_type'] == 'php'))) {
-                            $options['date_format'] = Zend_Locale_Format::convertPhpToIsoFormat($value);
-                        }
-                    }
-                    break;
-
-                case 'format_type' :
-                    if (($value != 'php') && ($value != 'iso')) {
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unknown date format type '$value'. Only 'iso' and 'php'"
-                           . " are supported.");
-                    }
-                    break;
-
-                case 'fix_date' :
-                    if (($value !== true) && ($value !== false)) {
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Enabling correction of dates must be either true or false"
-                            . "(fix_date='$value').");
-                    }
-                    break;
-
-                case 'locale' :
-                    $options['locale'] = Zend_Locale::findLocale($value);
-                    break;
-
-                case 'cache' :
-                    if ($value instanceof Zend_Cache_Core) {
-                        Zend_Locale_Data::setCache($value);
-                    }
-                    break;
-
-                case 'disablecache' :
-                    Zend_Locale_Data::disableCache($value);
-                    break;
-
-                case 'precision' :
-                    if ($value === NULL) {
-                        $value = -1;
-                    }
-
-                    if (($value < -1) || ($value > 30)) {
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("'$value' precision is not a whole number less than 30.");
-                    }
-                    break;
-
-                default:
-                    require_once 'Zend/Locale/Exception.php';
-                    throw new Zend_Locale_Exception("Unknown option: '$name' = '$value'");
-                    break;
-
-            }
-        }
-
-        return $options;
-    }
-
-    /**
-     * Changes the numbers/digits within a given string from one script to another
-     * 'Decimal' representated the stardard numbers 0-9, if a script does not exist
-     * an exception will be thrown.
-     *
-     * Examples for conversion from Arabic to Latin numerals:
-     *   convertNumerals('١١٠ Tests', 'Arab'); -> returns '100 Tests'
-     * Example for conversion from Latin to Arabic numerals:
-     *   convertNumerals('100 Tests', 'Latn', 'Arab'); -> returns '١١٠ Tests'
-     *
-     * @param  string  $input  String to convert
-     * @param  string  $from   Script to parse, see {@link Zend_Locale::getScriptList()} for details.
-     * @param  string  $to     OPTIONAL Script to convert to
-     * @return string  Returns the converted input
-     * @throws Zend_Locale_Exception
-     */
-    public static function convertNumerals($input, $from, $to = null)
-    {
-        $from   = strtolower($from);
-        $source = Zend_Locale_Data::getContent('en', 'numberingsystem', $from);
-        if (empty($source)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("Unknown script '$from'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9.");
-        }
-
-        if ($to !== null) {
-            $to     = strtolower($to);
-            $target = Zend_Locale_Data::getContent('en', 'numberingsystem', $to);
-            if (empty($target)) {
-                require_once 'Zend/Locale/Exception.php';
-                throw new Zend_Locale_Exception("Unknown script '$to'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9.");
-            }
-        } else {
-            $target = '0123456789';
-        }
-
-        for ($x = 0; $x < 10; ++$x) {
-            $asource[$x] = "/" . iconv_substr($source, $x, 1, 'UTF-8') . "/u";
-            $atarget[$x] = iconv_substr($target, $x, 1, 'UTF-8');
-        }
-
-        return preg_replace($asource, $atarget, $input);
-    }
-
-    /**
-     * Returns the normalized number from a localized one
-     * Parsing depends on given locale (grouping and decimal)
-     *
-     * Examples for input:
-     * '2345.4356,1234' = 23455456.1234
-     * '+23,3452.123' = 233452.123
-     * '12343 ' = 12343
-     * '-9456' = -9456
-     * '0' = 0
-     *
-     * @param  string $input    Input string to parse for numbers
-     * @param  array  $options  Options: locale, precision. See {@link setOptions()} for details.
-     * @return string Returns the extracted number
-     * @throws Zend_Locale_Exception
-     */
-    public static function getNumber($input, array $options = array())
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-        if (!is_string($input)) {
-            return $input;
-        }
-
-        if (!self::isNumber($input, $options)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception('No localized value in ' . $input . ' found, or the given number does not match the localized format');
-        }
-
-        // Get correct signs for this locale
-        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
-        // Change locale input to be default number
-        if ((strpos($input, $symbols['minus']) !== false) ||
-            (strpos($input, '-') !== false)) {
-            $input = strtr($input, array($symbols['minus'] => '', '-' => ''));
-            $input = '-' . $input;
-        }
-
-        $input = str_replace($symbols['group'],'', $input);
-        if (strpos($input, $symbols['decimal']) !== false) {
-            if ($symbols['decimal'] != '.') {
-                $input = str_replace($symbols['decimal'], ".", $input);
-            }
-
-            $pre = substr($input, strpos($input, '.') + 1);
-            if ($options['precision'] === null) {
-                $options['precision'] = strlen($pre);
-            }
-
-            if (strlen($pre) >= $options['precision']) {
-                $input = substr($input, 0, strlen($input) - strlen($pre) + $options['precision']);
-            }
-
-            if (($options['precision'] == 0) && ($input[strlen($input) - 1] == '.')) {
-                $input = substr($input, 0, -1);
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Returns a locale formatted number depending on the given options.
-     * The seperation and fraction sign is used from the set locale.
-     * ##0.#  -> 12345.12345 -> 12345.12345
-     * ##0.00 -> 12345.12345 -> 12345.12
-     * ##,##0.00 -> 12345.12345 -> 12,345.12
-     *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: number_format, locale, precision. See {@link setOptions()} for details.
-     * @return  string  locale formatted number
-     * @throws Zend_Locale_Exception
-     */
-    public static function toNumber($value, array $options = array())
-    {
-        // load class within method for speed
-        require_once 'Zend/Locale/Math.php';
-
-        $value             = Zend_Locale_Math::normalize($value);
-        $value             = Zend_Locale_Math::floatalize($value);
-        $options           = self::_checkOptions($options) + self::$_options;
-        $options['locale'] = (string) $options['locale'];
-
-        // Get correct signs for this locale
-        $symbols = Zend_Locale_Data::getList($options['locale'], 'symbols');
-        $oenc = iconv_get_encoding('internal_encoding');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
-        // Get format
-        $format = $options['number_format'];
-        if ($format === null) {
-            $format  = Zend_Locale_Data::getContent($options['locale'], 'decimalnumber');
-            $format  = self::_seperateFormat($format, $value, $options['precision']);
-
-            if ($options['precision'] !== null) {
-                $value   = Zend_Locale_Math::normalize(Zend_Locale_Math::round($value, $options['precision']));
-            }
-        } else {
-            // seperate negative format pattern when available
-            $format  = self::_seperateFormat($format, $value, $options['precision']);
-            if (strpos($format, '.')) {
-                if (is_numeric($options['precision'])) {
-                    $value = Zend_Locale_Math::round($value, $options['precision']);
-                } else {
-                    if (substr($format, iconv_strpos($format, '.') + 1, 3) == '###') {
-                        $options['precision'] = null;
-                    } else {
-                        $options['precision'] = iconv_strlen(iconv_substr($format, iconv_strpos($format, '.') + 1,
-                                                             iconv_strrpos($format, '0') - iconv_strpos($format, '.')));
-                        $format = iconv_substr($format, 0, iconv_strpos($format, '.') + 1) . '###'
-                                . iconv_substr($format, iconv_strrpos($format, '0') + 1);
-                    }
-                }
-            } else {
-                $value = Zend_Locale_Math::round($value, 0);
-                $options['precision'] = 0;
-            }
-            $value = Zend_Locale_Math::normalize($value);
-        }
-
-        if (iconv_strpos($format, '0') === false) {
-            iconv_set_encoding('internal_encoding', $oenc);
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception('Wrong format... missing 0');
-        }
-
-        // get number parts
-        $pos = iconv_strpos($value, '.');
-        if ($pos !== false) {
-            if ($options['precision'] === null) {
-                $precstr = iconv_substr($value, $pos + 1);
-            } else {
-                $precstr = iconv_substr($value, $pos + 1, $options['precision']);
-                if (iconv_strlen($precstr) < $options['precision']) {
-                    $precstr = $precstr . str_pad("0", ($options['precision'] - iconv_strlen($precstr)), "0");
-                }
-            }
-        } else {
-            if ($options['precision'] > 0) {
-                $precstr = str_pad("0", ($options['precision']), "0");
-            }
-        }
-
-        if ($options['precision'] === null) {
-            if (isset($precstr)) {
-                $options['precision'] = iconv_strlen($precstr);
-            } else {
-                $options['precision'] = 0;
-            }
-        }
-
-        // get fraction and format lengths
-        if (strpos($value, '.') !== false) {
-            $number = substr((string) $value, 0, strpos($value, '.'));
-        } else {
-            $number = $value;
-        }
-
-        $prec = call_user_func(Zend_Locale_Math::$sub, $value, $number, $options['precision']);
-        $prec = Zend_Locale_Math::floatalize($prec);
-        $prec = Zend_Locale_Math::normalize($prec);
-        if (iconv_strpos($prec, '-') !== false) {
-            $prec = iconv_substr($prec, 1);
-        }
-
-        if (($prec == 0) and ($options['precision'] > 0)) {
-            $prec = "0.0";
-        }
-
-        if (($options['precision'] + 2) > iconv_strlen($prec)) {
-            $prec = str_pad((string) $prec, $options['precision'] + 2, "0", STR_PAD_RIGHT);
-        }
-
-        if (iconv_strpos($number, '-') !== false) {
-            $number = iconv_substr($number, 1);
-        }
-        $group  = iconv_strrpos($format, ',');
-        $group2 = iconv_strpos ($format, ',');
-        $point  = iconv_strpos ($format, '0');
-        // Add fraction
-        $rest = "";
-        if (iconv_strpos($format, '.')) {
-            $rest   = iconv_substr($format, iconv_strpos($format, '.') + 1);
-            $length = iconv_strlen($rest);
-            for($x = 0; $x < $length; ++$x) {
-                if (($rest[0] == '0') || ($rest[0] == '#')) {
-                    $rest = iconv_substr($rest, 1);
-                }
-            }
-            $format = iconv_substr($format, 0, iconv_strlen($format) - iconv_strlen($rest));
-        }
-
-        if ($options['precision'] == '0') {
-            if (iconv_strrpos($format, '-') != 0) {
-                $format = iconv_substr($format, 0, $point)
-                        . iconv_substr($format, iconv_strrpos($format, '#') + 2);
-            } else {
-                $format = iconv_substr($format, 0, $point);
-            }
-        } else {
-            $format = iconv_substr($format, 0, $point) . $symbols['decimal']
-                               . iconv_substr($prec, 2);
-        }
-
-        $format .= $rest;
-        // Add seperation
-        if ($group == 0) {
-            // no seperation
-            $format = $number . iconv_substr($format, $point);
-        } else if ($group == $group2) {
-            // only 1 seperation
-            $seperation = ($point - $group);
-            for ($x = iconv_strlen($number); $x > $seperation; $x -= $seperation) {
-                if (iconv_substr($number, 0, $x - $seperation) !== "") {
-                    $number = iconv_substr($number, 0, $x - $seperation) . $symbols['group']
-                            . iconv_substr($number, $x - $seperation);
-                }
-            }
-            $format = iconv_substr($format, 0, iconv_strpos($format, '#')) . $number . iconv_substr($format, $point);
-        } else {
-
-            // 2 seperations
-            if (iconv_strlen($number) > ($point - $group)) {
-                $seperation = ($point - $group);
-                $number = iconv_substr($number, 0, iconv_strlen($number) - $seperation) . $symbols['group']
-                        . iconv_substr($number, iconv_strlen($number) - $seperation);
-
-                if ((iconv_strlen($number) - 1) > ($point - $group + 1)) {
-                    $seperation2 = ($group - $group2 - 1);
-                    for ($x = iconv_strlen($number) - $seperation2 - 2; $x > $seperation2; $x -= $seperation2) {
-                        $number = iconv_substr($number, 0, $x - $seperation2) . $symbols['group']
-                                . iconv_substr($number, $x - $seperation2);
-                    }
-                }
-
-            }
-            $format = iconv_substr($format, 0, iconv_strpos($format, '#')) . $number . iconv_substr($format, $point);
-        }
-        // set negative sign
-        if (call_user_func(Zend_Locale_Math::$comp, $value, 0, $options['precision']) < 0) {
-            if (iconv_strpos($format, '-') === false) {
-                $format = $symbols['minus'] . $format;
-            } else {
-                $format = str_replace('-', $symbols['minus'], $format);
-            }
-        }
-
-        iconv_set_encoding('internal_encoding', $oenc);
-        return (string) $format;
-    }
-
-    private static function _seperateFormat($format, $value, $precision)
-    {
-        if (iconv_strpos($format, ';') !== false) {
-            if (call_user_func(Zend_Locale_Math::$comp, $value, 0, $precision) < 0) {
-                $tmpformat = iconv_substr($format, iconv_strpos($format, ';') + 1);
-                if ($tmpformat[0] == '(') {
-                    $format = iconv_substr($format, 0, iconv_strpos($format, ';'));
-                } else {
-                    $format = $tmpformat;
-                }
-            } else {
-                $format = iconv_substr($format, 0, iconv_strpos($format, ';'));
-            }
-        }
-
-        return $format;
-    }
-
-
-    /**
-     * Checks if the input contains a normalized or localized number
-     *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  boolean           Returns true if a number was found
-     */
-    public static function isNumber($input, array $options = array())
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-
-        // Get correct signs for this locale
-        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
-
-        $regexs = Zend_Locale_Format::_getRegexForType('decimalnumber', $options);
-        $regexs = array_merge($regexs, Zend_Locale_Format::_getRegexForType('scientificnumber', $options));
-        if (!empty($input) && ($input[0] == $symbols['decimal'])) {
-            $input = 0 . $input;
-        }
-        foreach ($regexs as $regex) {
-            preg_match($regex, $input, $found);
-            if (isset($found[0])) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal method to convert cldr number syntax into regex
-     *
-     * @param  string $type
-     * @return string
-     */
-    private static function _getRegexForType($type, $options)
-    {
-        $decimal  = Zend_Locale_Data::getContent($options['locale'], $type);
-        $decimal  = preg_replace('/[^#0,;\.\-Ee]/u', '',$decimal);
-        $patterns = explode(';', $decimal);
-
-        if (count($patterns) == 1) {
-            $patterns[1] = '-' . $patterns[0];
-        }
-
-        $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
-
-        foreach($patterns as $pkey => $pattern) {
-            $regex[$pkey]  = '/^';
-            $rest   = 0;
-            $end    = null;
-            if (strpos($pattern, '.') !== false) {
-                $end     = substr($pattern, strpos($pattern, '.') + 1);
-                $pattern = substr($pattern, 0, -strlen($end) - 1);
-            }
-
-            if (strpos($pattern, ',') !== false) {
-                $parts = explode(',', $pattern);
-                $count = count($parts);
-                foreach($parts as $key => $part) {
-                    switch ($part) {
-                        case '#':
-                        case '-#':
-                            if ($part[0] == '-') {
-                                $regex[$pkey] .= '[' . $symbols['minus'] . '-]{0,1}';
-                            } else {
-                                $regex[$pkey] .= '[' . $symbols['plus'] . '+]{0,1}';
-                            }
-
-                            if (($parts[$key + 1]) == '##0')  {
-                                $regex[$pkey] .= '[0-9]{1,3}';
-                            } else if (($parts[$key + 1]) == '##') {
-                                $regex[$pkey] .= '[0-9]{1,2}';
-                            } else {
-                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 1):"' . $pattern . '"');
-                            }
-                            break;
-                        case '##':
-                            if ($parts[$key + 1] == '##0') {
-                                $regex[$pkey] .=  '(\\' . $symbols['group'] . '{0,1}[0-9]{2})*';
-                            } else {
-                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 2):"' . $pattern . '"');
-                            }
-                            break;
-                        case '##0':
-                            if ($parts[$key - 1] == '##') {
-                                $regex[$pkey] .= '[0-9]';
-                            } else if (($parts[$key - 1] == '#') || ($parts[$key - 1] == '-#')) {
-                                $regex[$pkey] .= '(\\' . $symbols['group'] . '{0,1}[0-9]{3})*';
-                            } else {
-                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 3):"' . $pattern . '"');
-                            }
-                            break;
-                        case '#0':
-                            if ($key == 0) {
-                                $regex[$pkey] .= '[0-9]*';
-                            } else {
-                                throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 4):"' . $pattern . '"');
-                            }
-                            break;
-                    }
-                }
-            }
-
-            if (strpos($pattern, 'E') !== false) {
-                if (($pattern == '#E0') || ($pattern == '#E00')) {
-                    $regex[$pkey] .= '[' . $symbols['plus']. '+]{0,1}[0-9]{1,}(\\' . $symbols['decimal'] . '[0-9]{1,})*[eE][' . $symbols['plus']. '+]{0,1}[0-9]{1,}';
-                } else if (($pattern == '-#E0') || ($pattern == '-#E00')) {
-                    $regex[$pkey] .= '[' . $symbols['minus']. '-]{0,1}[0-9]{1,}(\\' . $symbols['decimal'] . '[0-9]{1,})*[eE][' . $symbols['minus']. '-]{0,1}[0-9]{1,}';
-                } else {
-                    throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 5):"' . $pattern . '"');
-                }
-            }
-
-            if (!empty($end)) {
-                if ($end == '###') {
-                    $regex[$pkey] .= '(\\' . $symbols['decimal'] . '{1}[0-9]{1,}){0,1}';
-                } else if ($end == '###-') {
-                    $regex[$pkey] .= '(\\' . $symbols['decimal'] . '{1}[0-9]{1,}){0,1}[' . $symbols['minus']. '-]';
-                } else {
-                    throw new Zend_Locale_Exception('Unsupported token for numberformat (Pos 6):"' . $pattern . '"');
-                }
-            }
-
-            $regex[$pkey] .= '$/u';
-        }
-
-        return $regex;
-    }
-
-    /**
-     * Alias for getNumber
-     *
-     * @param   string  $value    Number to localize
-     * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
-     * @return  float
-     */
-    public static function getFloat($input, array $options = array())
-    {
-        return floatval(self::getNumber($input, $options));
-    }
-
-    /**
-     * Returns a locale formatted integer number
-     * Alias for toNumber()
-     *
-     * @param   string  $value    Number to normalize
-     * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
-     * @return  string  Locale formatted number
-     */
-    public static function toFloat($value, array $options = array())
-    {
-        $options['number_format'] = Zend_Locale_Format::STANDARD;
-        return self::toNumber($value, $options);
-    }
-
-    /**
-     * Returns if a float was found
-     * Alias for isNumber()
-     *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  boolean           Returns true if a number was found
-     */
-    public static function isFloat($value, array $options = array())
-    {
-        return self::isNumber($value, $options);
-    }
-
-    /**
-     * Returns the first found integer from an string
-     * Parsing depends on given locale (grouping and decimal)
-     *
-     * Examples for input:
-     * '  2345.4356,1234' = 23455456
-     * '+23,3452.123' = 233452
-     * ' 12343 ' = 12343
-     * '-9456km' = -9456
-     * '0' = 0
-     * '(-){0,1}(\d+(\.){0,1})*(\,){0,1})\d+'
-     *
-     * @param   string   $input    Input string to parse for numbers
-     * @param   array    $options  Options: locale. See {@link setOptions()} for details.
-     * @return  integer            Returns the extracted number
-     */
-    public static function getInteger($input, array $options = array())
-    {
-        $options['precision'] = 0;
-        return intval(self::getFloat($input, $options));
-    }
-
-    /**
-     * Returns a localized number
-     *
-     * @param   string  $value    Number to normalize
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  string            Locale formatted number
-     */
-    public static function toInteger($value, array $options = array())
-    {
-        $options['precision'] = 0;
-        $options['number_format'] = Zend_Locale_Format::STANDARD;
-        return self::toNumber($value, $options);
-    }
-
-    /**
-     * Returns if a integer was found
-     *
-     * @param   string  $input    Localized number string
-     * @param   array   $options  Options: locale. See {@link setOptions()} for details.
-     * @return  boolean           Returns true if a integer was found
-     */
-    public static function isInteger($value, array $options = array())
-    {
-        if (!self::isNumber($value, $options)) {
-            return false;
-        }
-
-        if (self::getInteger($value, $options) == self::getFloat($value, $options)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Converts a format string from PHP's date format to ISO format
-     * Remember that Zend Date always returns localized string, so a month name which returns the english
-     * month in php's date() will return the translated month name with this function... use 'en' as locale
-     * if you are in need of the original english names
-     *
-     * The conversion has the following restrictions:
-     * 'a', 'A' - Meridiem is not explicit upper/lowercase, you have to upper/lowercase the translated value yourself
-     *
-     * @param  string  $format  Format string in PHP's date format
-     * @return string           Format string in ISO format
-     */
-    public static function convertPhpToIsoFormat($format)
-    {
-        if ($format === null) {
-            return null;
-        }
-
-        $convert = array('d' => 'dd'  , 'D' => 'EE'  , 'j' => 'd'   , 'l' => 'EEEE', 'N' => 'eee' , 'S' => 'SS'  ,
-                         'w' => 'e'   , 'z' => 'D'   , 'W' => 'ww'  , 'F' => 'MMMM', 'm' => 'MM'  , 'M' => 'MMM' ,
-                         'n' => 'M'   , 't' => 'ddd' , 'L' => 'l'   , 'o' => 'YYYY', 'Y' => 'yyyy', 'y' => 'yy'  ,
-                         'a' => 'a'   , 'A' => 'a'   , 'B' => 'B'   , 'g' => 'h'   , 'G' => 'H'   , 'h' => 'hh'  ,
-                         'H' => 'HH'  , 'i' => 'mm'  , 's' => 'ss'  , 'e' => 'zzzz', 'I' => 'I'   , 'O' => 'Z'   ,
-                         'P' => 'ZZZZ', 'T' => 'z'   , 'Z' => 'X'   , 'c' => 'yyyy-MM-ddTHH:mm:ssZZZZ',
-                         'r' => 'r'   , 'U' => 'U');
-        $values = str_split($format);
-        foreach ($values as $key => $value) {
-            if (isset($convert[$value]) === true) {
-                $values[$key] = $convert[$value];
-            }
-        }
-
-        return join($values);
-    }
-
-    /**
-     * Parse date and split in named array fields
-     *
-     * @param   string  $date     Date string to parse
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
-     */
-    private static function _parseDate($date, $options)
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-        $test = array('h', 'H', 'm', 's', 'y', 'Y', 'M', 'd', 'D', 'E', 'S', 'l', 'B', 'I',
-                       'X', 'r', 'U', 'G', 'w', 'e', 'a', 'A', 'Z', 'z', 'v');
-
-        $format = $options['date_format'];
-        $number = $date; // working copy
-        $result['date_format'] = $format; // save the format used to normalize $number (convenience)
-        $result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience)
-
-        $oenc = iconv_get_encoding('internal_encoding');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-        $day   = iconv_strpos($format, 'd');
-        $month = iconv_strpos($format, 'M');
-        $year  = iconv_strpos($format, 'y');
-        $hour  = iconv_strpos($format, 'H');
-        $min   = iconv_strpos($format, 'm');
-        $sec   = iconv_strpos($format, 's');
-        $am    = null;
-        if ($hour === false) {
-            $hour = iconv_strpos($format, 'h');
-        }
-        if ($year === false) {
-            $year = iconv_strpos($format, 'Y');
-        }
-        if ($day === false) {
-            $day = iconv_strpos($format, 'E');
-            if ($day === false) {
-                $day = iconv_strpos($format, 'D');
-            }
-        }
-
-        if ($day !== false) {
-            $parse[$day]   = 'd';
-            if (!empty($options['locale']) && ($options['locale'] !== 'root') &&
-                (!is_object($options['locale']) || ((string) $options['locale'] !== 'root'))) {
-                // erase day string
-                    $daylist = Zend_Locale_Data::getList($options['locale'], 'day');
-                foreach($daylist as $key => $name) {
-                    if (iconv_strpos($number, $name) !== false) {
-                        $number = str_replace($name, "EEEE", $number);
-                        break;
-                    }
-                }
-            }
-        }
-        $position = false;
-
-        if ($month !== false) {
-            $parse[$month] = 'M';
-            if (!empty($options['locale']) && ($options['locale'] !== 'root') &&
-                (!is_object($options['locale']) || ((string) $options['locale'] !== 'root'))) {
-                    // prepare to convert month name to their numeric equivalents, if requested,
-                    // and we have a $options['locale']
-                    $position = self::_replaceMonth($number, Zend_Locale_Data::getList($options['locale'],
-                        'month'));
-                if ($position === false) {
-                    $position = self::_replaceMonth($number, Zend_Locale_Data::getList($options['locale'],
-                        'month', array('gregorian', 'format', 'abbreviated')));
-                }
-            }
-        }
-        if ($year !== false) {
-            $parse[$year]  = 'y';
-        }
-        if ($hour !== false) {
-            $parse[$hour] = 'H';
-        }
-        if ($min !== false) {
-            $parse[$min] = 'm';
-        }
-        if ($sec !== false) {
-            $parse[$sec] = 's';
-        }
-
-        if (empty($parse)) {
-            iconv_set_encoding('internal_encoding', $oenc);
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found");
-        }
-        ksort($parse);
-
-        // get daytime
-        if (iconv_strpos($format, 'a') !== false) {
-            if (iconv_strpos(strtoupper($number), strtoupper(Zend_Locale_Data::getContent($options['locale'], 'am'))) !== false) {
-                $am = true;
-            } else if (iconv_strpos(strtoupper($number), strtoupper(Zend_Locale_Data::getContent($options['locale'], 'pm'))) !== false) {
-                $am = false;
-            }
-        }
-
-        // split number parts
-        $split = false;
-        preg_match_all('/\d+/u', $number, $splitted);
-
-        if (count($splitted[0]) == 0) {
-            iconv_set_encoding('internal_encoding', $oenc);
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("No date part in '$date' found.");
-        }
-        if (count($splitted[0]) == 1) {
-            $split = 0;
-        }
-        $cnt = 0;
-        foreach($parse as $key => $value) {
-
-            switch($value) {
-                case 'd':
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['day']    = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['day'] = iconv_substr($splitted[0][0], $split, 2);
-                        $split += 2;
-                    }
-                    ++$cnt;
-                    break;
-                case 'M':
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['month']  = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['month'] = iconv_substr($splitted[0][0], $split, 2);
-                        $split += 2;
-                    }
-                    ++$cnt;
-                    break;
-                case 'y':
-                    $length = 2;
-                    if ((iconv_substr($format, $year, 4) == 'yyyy')
-                     || (iconv_substr($format, $year, 4) == 'YYYY')) {
-                        $length = 4;
-                    }
-
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['year']   = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['year']   = iconv_substr($splitted[0][0], $split, $length);
-                        $split += $length;
-                    }
-
-                    ++$cnt;
-                    break;
-                case 'H':
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['hour']   = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['hour']   = iconv_substr($splitted[0][0], $split, 2);
-                        $split += 2;
-                    }
-                    ++$cnt;
-                    break;
-                case 'm':
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['minute'] = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['minute'] = iconv_substr($splitted[0][0], $split, 2);
-                        $split += 2;
-                    }
-                    ++$cnt;
-                    break;
-                case 's':
-                    if ($split === false) {
-                        if (count($splitted[0]) > $cnt) {
-                            $result['second'] = $splitted[0][$cnt];
-                        }
-                    } else {
-                        $result['second'] = iconv_substr($splitted[0][0], $split, 2);
-                        $split += 2;
-                    }
-                    ++$cnt;
-                    break;
-            }
-        }
-
-        // AM/PM correction
-        if ($hour !== false) {
-            if (($am === true) and ($result['hour'] == 12)){
-                $result['hour'] = 0;
-            } else if (($am === false) and ($result['hour'] != 12)) {
-                $result['hour'] += 12;
-            }
-        }
-
-        if ($options['fix_date'] === true) {
-            $result['fixed'] = 0; // nothing has been "fixed" by swapping date parts around (yet)
-        }
-
-        if ($day !== false) {
-            // fix false month
-            if (isset($result['day']) and isset($result['month'])) {
-                if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or
-                                               (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) {
-                    if ($options['fix_date'] !== true) {
-                        iconv_set_encoding('internal_encoding', $oenc);
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format
-                            . "' (false month, $position, $month)");
-                    }
-                    $temp = $result['day'];
-                    $result['day']   = $result['month'];
-                    $result['month'] = $temp;
-                    $result['fixed'] = 1;
-                }
-            }
-
-            // fix switched values d <> y
-            if (isset($result['day']) and isset($result['year'])) {
-                if ($result['day'] > 31) {
-                    if ($options['fix_date'] !== true) {
-                        iconv_set_encoding('internal_encoding', $oenc);
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
-                                                      . $format . "' (d <> y)");
-                    }
-                    $temp = $result['year'];
-                    $result['year'] = $result['day'];
-                    $result['day']  = $temp;
-                    $result['fixed'] = 2;
-                }
-            }
-
-            // fix switched values M <> y
-            if (isset($result['month']) and isset($result['year'])) {
-                if ($result['month'] > 31) {
-                    if ($options['fix_date'] !== true) {
-                        iconv_set_encoding('internal_encoding', $oenc);
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
-                                                      . $format . "' (M <> y)");
-                    }
-                    $temp = $result['year'];
-                    $result['year']  = $result['month'];
-                    $result['month'] = $temp;
-                    $result['fixed'] = 3;
-                }
-            }
-
-            // fix switched values M <> d
-            if (isset($result['month']) and isset($result['day'])) {
-                if ($result['month'] > 12) {
-                    if ($options['fix_date'] !== true || $result['month'] > 31) {
-                        iconv_set_encoding('internal_encoding', $oenc);
-                        require_once 'Zend/Locale/Exception.php';
-                        throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
-                                                      . $format . "' (M <> d)");
-                    }
-                    $temp = $result['day'];
-                    $result['day']   = $result['month'];
-                    $result['month'] = $temp;
-                    $result['fixed'] = 4;
-                }
-            }
-        }
-
-        if (isset($result['year'])) {
-            if (((iconv_strlen($result['year']) == 2) && ($result['year'] < 10)) ||
-                (((iconv_strpos($format, 'yy') !== false) && (iconv_strpos($format, 'yyyy') === false)) ||
-                ((iconv_strpos($format, 'YY') !== false) && (iconv_strpos($format, 'YYYY') === false)))) {
-                if (($result['year'] >= 0) && ($result['year'] < 100)) {
-                    if ($result['year'] < 70) {
-                        $result['year'] = (int) $result['year'] + 100;
-                    }
-
-                    $result['year'] = (int) $result['year'] + 1900;
-                }
-            }
-        }
-
-        iconv_set_encoding('internal_encoding', $oenc);
-        return $result;
-    }
-
-    /**
-     * Search $number for a month name found in $monthlist, and replace if found.
-     *
-     * @param  string  $number     Date string (modified)
-     * @param  array   $monthlist  List of month names
-     *
-     * @return int|false           Position of replaced string (false if nothing replaced)
-     */
-    protected static function _replaceMonth(&$number, $monthlist)
-    {
-        // If $locale was invalid, $monthlist will default to a "root" identity
-        // mapping for each month number from 1 to 12.
-        // If no $locale was given, or $locale was invalid, do not use this identity mapping to normalize.
-        // Otherwise, translate locale aware month names in $number to their numeric equivalents.
-        $position = false;
-        if ($monthlist && $monthlist[1] != 1) {
-            foreach($monthlist as $key => $name) {
-                if (($position = iconv_strpos($number, $name, 0, 'UTF-8')) !== false) {
-                    $number   = str_ireplace($name, $key, $number);
-                    return $position;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the default date format for $locale.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
-     * @return string  format
-     * @throws Zend_Locale_Exception  throws an exception when locale data is broken
-     */
-    public static function getDateFormat($locale = null)
-    {
-        $format = Zend_Locale_Data::getContent($locale, 'date');
-        if (empty($format)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
-        }
-
-        return $format;
-    }
-
-    /**
-     * Returns an array with the normalized date from an locale date
-     * a input of 10.01.2006 without a $locale would return:
-     * array ('day' => 10, 'month' => 1, 'year' => 2006)
-     * The 'locale' option is only used to convert human readable day
-     * and month names to their numeric equivalents.
-     * The 'format' option allows specification of self-defined date formats,
-     * when not using the default format for the 'locale'.
-     *
-     * @param   string  $date     Date string
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
-     */
-    public static function getDate($date, array $options = array())
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-        if (empty($options['date_format'])) {
-            $options['format_type'] = 'iso';
-            $options['date_format'] = self::getDateFormat($options['locale']);
-        }
-
-        return self::_parseDate($date, $options);
-    }
-
-    /**
-     * Returns if the given datestring contains all date parts from the given format.
-     * If no format is given, the default date format from the locale is used
-     * If you want to check if the date is a proper date you should use Zend_Date::isDate()
-     *
-     * @param   string  $date     Date string
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  boolean
-     */
-    public static function checkDateFormat($date, array $options = array())
-    {
-        try {
-            $date = self::getDate($date, $options);
-        } catch (Exception $e) {
-            return false;
-        }
-
-        if (empty($options['date_format'])) {
-            $options['format_type'] = 'iso';
-            $options['date_format'] = self::getDateFormat($options['locale']);
-        }
-        $options = self::_checkOptions($options) + self::$_options;
-
-        // day expected but not parsed
-        if ((iconv_strpos($options['date_format'], 'd', 0, 'UTF-8') !== false) and (!isset($date['day']) or ($date['day'] == ""))) {
-            return false;
-        }
-
-        // month expected but not parsed
-        if ((iconv_strpos($options['date_format'], 'M', 0, 'UTF-8') !== false) and (!isset($date['month']) or ($date['month'] == ""))) {
-            return false;
-        }
-
-        // year expected but not parsed
-        if (((iconv_strpos($options['date_format'], 'Y', 0, 'UTF-8') !== false) or
-             (iconv_strpos($options['date_format'], 'y', 0, 'UTF-8') !== false)) and (!isset($date['year']) or ($date['year'] == ""))) {
-            return false;
-        }
-
-        // second expected but not parsed
-        if ((iconv_strpos($options['date_format'], 's', 0, 'UTF-8') !== false) and (!isset($date['second']) or ($date['second'] == ""))) {
-            return false;
-        }
-
-        // minute expected but not parsed
-        if ((iconv_strpos($options['date_format'], 'm', 0, 'UTF-8') !== false) and (!isset($date['minute']) or ($date['minute'] == ""))) {
-            return false;
-        }
-
-        // hour expected but not parsed
-        if (((iconv_strpos($options['date_format'], 'H', 0, 'UTF-8') !== false) or
-             (iconv_strpos($options['date_format'], 'h', 0, 'UTF-8') !== false)) and (!isset($date['hour']) or ($date['hour'] == ""))) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns the default time format for $locale.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
-     * @return string  format
-     */
-    public static function getTimeFormat($locale = null)
-    {
-        $format = Zend_Locale_Data::getContent($locale, 'time');
-        if (empty($format)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
-        }
-        return $format;
-    }
-
-    /**
-     * Returns an array with 'hour', 'minute', and 'second' elements extracted from $time
-     * according to the order described in $format.  For a format of 'H:m:s', and
-     * an input of 11:20:55, getTime() would return:
-     * array ('hour' => 11, 'minute' => 20, 'second' => 55)
-     * The optional $locale parameter may be used to help extract times from strings
-     * containing both a time and a day or month name.
-     *
-     * @param   string  $time     Time string
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
-     */
-    public static function getTime($time, array $options = array())
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-        if (empty($options['date_format'])) {
-            $options['format_type'] = 'iso';
-            $options['date_format'] = self::getTimeFormat($options['locale']);
-        }
-        return self::_parseDate($time, $options);
-    }
-
-    /**
-     * Returns the default datetime format for $locale.
-     *
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
-     * @return string  format
-     */
-    public static function getDateTimeFormat($locale = null)
-    {
-        $format = Zend_Locale_Data::getContent($locale, 'datetime');
-        if (empty($format)) {
-            require_once 'Zend/Locale/Exception.php';
-            throw new Zend_Locale_Exception("failed to receive data from locale $locale");
-        }
-        return $format;
-    }
-
-    /**
-     * Returns an array with 'year', 'month', 'day', 'hour', 'minute', and 'second' elements
-     * extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:m:s',
-     * and an input of 10.05.1985 11:20:55, getDateTime() would return:
-     * array ('year' => 1985, 'month' => 5, 'day' => 10, 'hour' => 11, 'minute' => 20, 'second' => 55)
-     * The optional $locale parameter may be used to help extract times from strings
-     * containing both a time and a day or month name.
-     *
-     * @param   string  $datetime DateTime string
-     * @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-     * @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
-     */
-    public static function getDateTime($datetime, array $options = array())
-    {
-        $options = self::_checkOptions($options) + self::$_options;
-        if (empty($options['date_format'])) {
-            $options['format_type'] = 'iso';
-            $options['date_format'] = self::getDateTimeFormat($options['locale']);
-        }
-        return self::_parseDate($datetime, $options);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Locale/Math.php b/airtime_mvc/library/Zend/Locale/Math.php
deleted file mode 100644
index f34ba57fa..000000000
--- a/airtime_mvc/library/Zend/Locale/Math.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Math.php 21179 2010-02-23 21:59:42Z matthew $
- */
-
-
-/**
- * Utility class for proxying math function to bcmath functions, if present,
- * otherwise to PHP builtin math operators, with limited detection of overflow conditions.
- * Sampling of PHP environments and platforms suggests that at least 80% to 90% support bcmath.
- * Thus, this file should be as light as possible.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Locale_Math
-{
-    // support unit testing without using bcmath functions
-    public static $_bcmathDisabled = false;
-
-    public static $add   = array('Zend_Locale_Math', 'Add');
-    public static $sub   = array('Zend_Locale_Math', 'Sub');
-    public static $pow   = array('Zend_Locale_Math', 'Pow');
-    public static $mul   = array('Zend_Locale_Math', 'Mul');
-    public static $div   = array('Zend_Locale_Math', 'Div');
-    public static $comp  = array('Zend_Locale_Math', 'Comp');
-    public static $sqrt  = array('Zend_Locale_Math', 'Sqrt');
-    public static $mod   = array('Zend_Locale_Math', 'Mod');
-    public static $scale = 'bcscale';
-
-    public static function isBcmathDisabled()
-    {
-        return self::$_bcmathDisabled;
-    }
-
-    /**
-     * Surprisingly, the results of this implementation of round()
-     * prove better than the native PHP round(). For example, try:
-     *   round(639.795, 2);
-     *   round(267.835, 2);
-     *   round(0.302515, 5);
-     *   round(0.36665, 4);
-     * then try:
-     *   Zend_Locale_Math::round('639.795', 2);
-     */
-    public static function round($op1, $precision = 0)
-    {
-        if (self::$_bcmathDisabled) {
-            $op1 = round($op1, $precision);
-            if (strpos((string) $op1, 'E') === false) {
-                return self::normalize(round($op1, $precision));
-            }
-        }
-
-        if (strpos($op1, 'E') !== false) {
-            $op1 = self::floatalize($op1);
-        }
-
-        $op1    = trim(self::normalize($op1));
-        $length = strlen($op1);
-        if (($decPos = strpos($op1, '.')) === false) {
-            $op1 .= '.0';
-            $decPos = $length;
-            $length += 2;
-        }
-        if ($precision < 0 && abs($precision) > $decPos) {
-            return '0';
-        }
-
-        $digitsBeforeDot = $length - ($decPos + 1);
-        if ($precision >= ($length - ($decPos + 1))) {
-            return $op1;
-        }
-
-        if ($precision === 0) {
-            $triggerPos = 1;
-            $roundPos   = -1;
-        } elseif ($precision > 0) {
-            $triggerPos = $precision + 1;
-            $roundPos   = $precision;
-        } else {
-            $triggerPos = $precision;
-            $roundPos   = $precision -1;
-        }
-
-        $triggerDigit = $op1[$triggerPos + $decPos];
-        if ($precision < 0) {
-            // zero fill digits to the left of the decimal place
-            $op1 = substr($op1, 0, $decPos + $precision) . str_pad('', abs($precision), '0');
-        }
-
-        if ($triggerDigit >= '5') {
-            if ($roundPos + $decPos == -1) {
-                return str_pad('1', $decPos + 1, '0');
-            }
-
-            $roundUp = str_pad('', $length, '0');
-            $roundUp[$decPos] = '.';
-            $roundUp[$roundPos + $decPos] = '1';
-
-            if ($op1 > 0) {
-                if (self::$_bcmathDisabled) {
-                    return Zend_Locale_Math_PhpMath::Add($op1, $roundUp, $precision);
-                }
-                return self::Add($op1, $roundUp, $precision);
-            } else {
-                if (self::$_bcmathDisabled) {
-                    return Zend_Locale_Math_PhpMath::Sub($op1, $roundUp, $precision);
-                }
-                return self::Sub($op1, $roundUp, $precision);
-            }
-        } elseif ($precision >= 0) {
-            return substr($op1, 0, $decPos + ($precision ? $precision + 1: 0));
-        }
-
-        return (string) $op1;
-    }
-
-    /**
-     * Convert a scientific notation to float
-     * Additionally fixed a problem with PHP <= 5.2.x with big integers
-     *
-     * @param string $value
-     */
-    public static function floatalize($value)
-    {
-        $value = strtoupper($value);
-        if (strpos($value, 'E') === false) {
-            return $value;
-        }
-
-        $number = substr($value, 0, strpos($value, 'E'));
-        if (strpos($number, '.') !== false) {
-            $post   = strlen(substr($number, strpos($number, '.') + 1));
-            $mantis = substr($value, strpos($value, 'E') + 1);
-            if ($mantis < 0) {
-                $post += abs((int) $mantis);
-            }
-
-            $value = number_format($value, $post, '.', '');
-        } else {
-            $value = number_format($value, 0, '.', '');
-        }
-
-        return $value;
-    }
-
-    /**
-     * Normalizes an input to standard english notation
-     * Fixes a problem of BCMath with setLocale which is PHP related
-     *
-     * @param   integer  $value  Value to normalize
-     * @return  string           Normalized string without BCMath problems
-     */
-    public static function normalize($value)
-    {
-        $convert = localeconv();
-        $value = str_replace($convert['thousands_sep'], "",(string) $value);
-        $value = str_replace($convert['positive_sign'], "", $value);
-        $value = str_replace($convert['decimal_point'], ".",$value);
-        if (!empty($convert['negative_sign']) and (strpos($value, $convert['negative_sign']))) {
-            $value = str_replace($convert['negative_sign'], "", $value);
-            $value = "-" . $value;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Localizes an input from standard english notation
-     * Fixes a problem of BCMath with setLocale which is PHP related
-     *
-     * @param   integer  $value  Value to normalize
-     * @return  string           Normalized string without BCMath problems
-     */
-    public static function localize($value)
-    {
-        $convert = localeconv();
-        $value = str_replace(".", $convert['decimal_point'], (string) $value);
-        if (!empty($convert['negative_sign']) and (strpos($value, "-"))) {
-            $value = str_replace("-", $convert['negative_sign'], $value);
-        }
-        return $value;
-    }
-
-    /**
-     * Changes exponential numbers to plain string numbers
-     * Fixes a problem of BCMath with numbers containing exponents
-     *
-     * @param integer $value Value to erase the exponent
-     * @param integer $scale (Optional) Scale to use
-     * @return string
-     */
-    public static function exponent($value, $scale = null)
-    {
-        if (!extension_loaded('bcmath')) {
-            return $value;
-        }
-
-        $split = explode('e', $value);
-        if (count($split) == 1) {
-            $split = explode('E', $value);
-        }
-
-        if (count($split) > 1) {
-            $value = bcmul($split[0], bcpow(10, $split[1], $scale), $scale);
-        }
-
-        return $value;
-    }
-
-    /**
-     * BCAdd - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Add($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-
-        return bcadd($op1, $op2, $scale);
-    }
-
-    /**
-     * BCSub - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Sub($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-        return bcsub($op1, $op2, $scale);
-    }
-
-    /**
-     * BCPow - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Pow($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-        return bcpow($op1, $op2, $scale);
-    }
-
-    /**
-     * BCMul - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Mul($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-        return bcmul($op1, $op2, $scale);
-    }
-
-    /**
-     * BCDiv - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Div($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-        return bcdiv($op1, $op2, $scale);
-    }
-
-    /**
-     * BCSqrt - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Sqrt($op1, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        return bcsqrt($op1, $scale);
-    }
-
-    /**
-     * BCMod - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @return string
-     */
-    public static function Mod($op1, $op2)
-    {
-        $op1 = self::exponent($op1);
-        $op2 = self::exponent($op2);
-        return bcmod($op1, $op2);
-    }
-
-    /**
-     * BCComp - fixes a problem of BCMath and exponential numbers
-     *
-     * @param  string  $op1
-     * @param  string  $op2
-     * @param  integer $scale
-     * @return string
-     */
-    public static function Comp($op1, $op2, $scale = null)
-    {
-        $op1 = self::exponent($op1, $scale);
-        $op2 = self::exponent($op2, $scale);
-        return bccomp($op1, $op2, $scale);
-    }
-}
-
-if (!extension_loaded('bcmath')
-    || (defined('TESTS_ZEND_LOCALE_BCMATH_ENABLED') && !TESTS_ZEND_LOCALE_BCMATH_ENABLED)
-) {
-    require_once 'Zend/Locale/Math/PhpMath.php';
-    Zend_Locale_Math_PhpMath::disable();
-}
diff --git a/airtime_mvc/library/Zend/Locale/Math/Exception.php b/airtime_mvc/library/Zend/Locale/Math/Exception.php
deleted file mode 100644
index dd4a529e3..000000000
--- a/airtime_mvc/library/Zend/Locale/Math/Exception.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Locale/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Math_Exception extends Zend_Locale_Exception
-{
-    protected $op1 = null;
-    protected $op2 = null;
-    protected $result = null;
-
-    public function __construct($message, $op1 = null, $op2 = null, $result = null)
-    {
-        $this->op1 = $op1;
-        $this->op2 = $op2;
-        $this->result = $result;
-        parent::__construct($message);
-    }
-
-    public function getResults()
-    {
-        return array($this->op1, $this->op2, $this->result);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Locale/Math/PhpMath.php b/airtime_mvc/library/Zend/Locale/Math/PhpMath.php
deleted file mode 100644
index f06d30d74..000000000
--- a/airtime_mvc/library/Zend/Locale/Math/PhpMath.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhpMath.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Utility class for proxying math function to bcmath functions, if present,
- * otherwise to PHP builtin math operators, with limited detection of overflow conditions.
- * Sampling of PHP environments and platforms suggests that at least 80% to 90% support bcmath.
- * This file should only be loaded for the 10% to 20% lacking access to the bcmath extension.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Locale_Math_PhpMath extends Zend_Locale_Math
-{
-    public static function disable()
-    {
-        self::$_bcmathDisabled = true;
-        self::$add   = array('Zend_Locale_Math_PhpMath', 'Add');
-        self::$sub   = array('Zend_Locale_Math_PhpMath', 'Sub');
-        self::$pow   = array('Zend_Locale_Math_PhpMath', 'Pow');
-        self::$mul   = array('Zend_Locale_Math_PhpMath', 'Mul');
-        self::$div   = array('Zend_Locale_Math_PhpMath', 'Div');
-        self::$comp  = array('Zend_Locale_Math_PhpMath', 'Comp');
-        self::$sqrt  = array('Zend_Locale_Math_PhpMath', 'Sqrt');
-        self::$mod   = array('Zend_Locale_Math_PhpMath', 'Mod');
-        self::$scale = array('Zend_Locale_Math_PhpMath', 'Scale');
-
-        self::$defaultScale     = 0;
-        self::$defaultPrecision = 1;
-    }
-
-    public static $defaultScale;
-    public static $defaultPrecision;
-
-
-    public static function Add($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
-            $precision = Zend_Locale_Math_PhpMath::$defaultPrecision;
-        } else {
-            $precision = pow(10, -$scale);
-        }
-
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-        $result = $op1 + $op2;
-        if (is_infinite($result)  or  (abs($result - $op2 - $op1) > $precision)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("addition overflow: $op1 + $op2 != $result", $op1, $op2, $result);
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Sub($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
-            $precision = Zend_Locale_Math_PhpMath::$defaultPrecision;
-        } else {
-            $precision = pow(10, -$scale);
-        }
-
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1  = self::normalize($op1);
-        $op2  = self::normalize($op2);
-        $result = $op1 - $op2;
-        if (is_infinite($result)  or  (abs($result + $op2 - $op1) > $precision)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("subtraction overflow: $op1 - $op2 != $result", $op1, $op2, $result);
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Pow($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
-        }
-
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-
-        // BCMath extension doesn't use decimal part of the power
-        // Provide the same behavior
-        $op2 = ($op2 > 0) ? floor($op2) : ceil($op2);
-
-        $result = pow($op1, $op2);
-        if (is_infinite($result)  or  is_nan($result)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("power overflow: $op1 ^ $op2", $op1, $op2, $result);
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Mul($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
-        }
-
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-        $result = $op1 * $op2;
-        if (is_infinite($result)  or  is_nan($result)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("multiplication overflow: $op1 * $op2 != $result", $op1, $op2, $result);
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Div($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
-        }
-
-        if (empty($op2)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("can not divide by zero", $op1, $op2, null);
-        }
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-        $result = $op1 / $op2;
-        if (is_infinite($result)  or  is_nan($result)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("division overflow: $op1 / $op2 != $result", $op1, $op2, $result);
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Sqrt($op1, $scale = null)
-    {
-        if ($scale === null) {
-            $scale = Zend_Locale_Math_PhpMath::$defaultScale;
-        }
-
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1 = self::normalize($op1);
-        $result = sqrt($op1);
-        if (is_nan($result)) {
-            return NULL;
-        }
-
-        return self::round(self::normalize($result), $scale);
-    }
-
-    public static function Mod($op1, $op2)
-    {
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        if (empty($op2)) {
-            return NULL;
-        }
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-        if ((int)$op2 == 0) {
-            return NULL;
-        }
-        $result = $op1 % $op2;
-        if (is_nan($result)  or  (($op1 - $result) % $op2 != 0)) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("modulus calculation error: $op1 % $op2 != $result", $op1, $op2, $result);
-        }
-
-        return self::normalize($result);
-    }
-
-    public static function Comp($op1, $op2, $scale = null)
-    {
-        if ($scale === null) {
-            $scale     = Zend_Locale_Math_PhpMath::$defaultScale;
-        }
-
-        if (empty($op1)) {
-            $op1 = 0;
-        }
-        $op1 = self::normalize($op1);
-        $op2 = self::normalize($op2);
-        if ($scale <> 0) {
-            $op1 = self::round($op1, $scale);
-            $op2 = self::round($op2, $scale);
-        } else {
-            $op1 = ($op1 > 0) ? floor($op1) : ceil($op1);
-            $op2 = ($op2 > 0) ? floor($op2) : ceil($op2);
-        }
-        if ($op1 > $op2) {
-            return 1;
-        } else if ($op1 < $op2) {
-            return -1;
-        }
-        return 0;
-    }
-
-    public static function Scale($scale)
-    {
-        if ($scale > 9) {
-            require_once 'Zend/Locale/Math/Exception.php';
-            throw new Zend_Locale_Math_Exception("can not scale to precision $scale", $scale, null, null);
-        }
-        self::$defaultScale     = $scale;
-        self::$defaultPrecision = pow(10, -$scale);
-        return true;
-    }
-}
-
-Zend_Locale_Math_PhpMath::disable(); // disable use of bcmath functions
diff --git a/airtime_mvc/library/Zend/Log.php b/airtime_mvc/library/Zend/Log.php
deleted file mode 100644
index 7e552d73e..000000000
--- a/airtime_mvc/library/Zend/Log.php
+++ /dev/null
@@ -1,425 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Log.php 20893 2010-02-03 22:59:25Z yoshida@zend.co.jp $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Log.php 20893 2010-02-03 22:59:25Z yoshida@zend.co.jp $
- */
-class Zend_Log
-{
-    const EMERG   = 0;  // Emergency: system is unusable
-    const ALERT   = 1;  // Alert: action must be taken immediately
-    const CRIT    = 2;  // Critical: critical conditions
-    const ERR     = 3;  // Error: error conditions
-    const WARN    = 4;  // Warning: warning conditions
-    const NOTICE  = 5;  // Notice: normal but significant condition
-    const INFO    = 6;  // Informational: informational messages
-    const DEBUG   = 7;  // Debug: debug messages
-
-    /**
-     * @var array of priorities where the keys are the
-     * priority numbers and the values are the priority names
-     */
-    protected $_priorities = array();
-
-    /**
-     * @var array of Zend_Log_Writer_Abstract
-     */
-    protected $_writers = array();
-
-    /**
-     * @var array of Zend_Log_Filter_Interface
-     */
-    protected $_filters = array();
-
-    /**
-     * @var array of extra log event
-     */
-    protected $_extras = array();
-
-    /**
-     *
-     * @var string
-     */
-    protected $_defaultWriterNamespace = 'Zend_Log_Writer';
-
-    /**
-     *
-     * @var string
-     */
-    protected $_defaultFilterNamespace = 'Zend_Log_Filter';
-
-
-    /**
-     * Class constructor.  Create a new logger
-     *
-     * @param Zend_Log_Writer_Abstract|null  $writer  default writer
-     */
-    public function __construct(Zend_Log_Writer_Abstract $writer = null)
-    {
-        $r = new ReflectionClass($this);
-        $this->_priorities = array_flip($r->getConstants());
-
-        if ($writer !== null) {
-            $this->addWriter($writer);
-        }
-    }
-
-    /**
-     * Factory to construct the logger and one or more writers
-     * based on the configuration array
-     *
-     * @param  array|Zend_Config Array or instance of Zend_Config
-     * @return Zend_Log
-     */
-    static public function factory($config = array())
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        }
-
-        if (!is_array($config) || empty($config)) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config');
-        }
-
-        $log = new Zend_Log;
-
-        if (!is_array(current($config))) {
-            $log->addWriter(current($config));
-        } else {
-            foreach($config as $writer) {
-                $log->addWriter($writer);
-            }
-        }
-
-        return $log;
-    }
-
-
-    /**
-     * Construct a writer object based on a configuration array
-     *
-     * @param  array $spec config array with writer spec
-     * @return Zend_Log_Writer_Abstract
-     */
-    protected function _constructWriterFromConfig($config)
-    {
-        $writer = $this->_constructFromConfig('writer', $config, $this->_defaultWriterNamespace);
-
-        if (!$writer instanceof Zend_Log_Writer_Abstract) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception("{$writerName} does not extend Zend_Log_Writer_Abstract!");
-        }
-
-        if (isset($config['filterName'])) {
-            $filter = $this->_constructFilterFromConfig($config);
-            $writer->addFilter($filter);
-        }
-
-        return $writer;
-    }
-
-    /**
-     * Construct filter object from configuration array or Zend_Config object
-     *
-     * @param  array|Zend_Config $config Zend_Config or Array
-     * @return Zend_Log_Filter_Interface
-     */
-    protected function _constructFilterFromConfig($config)
-    {
-        $filter = $this->_constructFromConfig('filter', $config, $this->_defaultFilterNamespace);
-
-        if (!$filter instanceof Zend_Log_Filter_Interface) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception("{$filterName} does not implement Zend_Log_Filter_Interface");
-        }
-
-        return $filter;
-    }
-
-    /**
-     * Construct a filter or writer from config
-     *
-     * @param string $type 'writer' of 'filter'
-     * @param mixed $config Zend_Config or Array
-     * @param string $namespace
-     * @return object
-     */
-    protected function _constructFromConfig($type, $config, $namespace)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        }
-
-        if (!is_array($config) || empty($config)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception(
-                'Configuration must be an array or instance of Zend_Config'
-            );
-        }
-
-        $params    = isset($config[ $type .'Params' ]) ? $config[ $type .'Params' ] : array();
-        $className = $this->getClassName($config, $type, $namespace);
-        if (!class_exists($className)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($className);
-        }
-
-        $reflection = new ReflectionClass($className);
-        if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception(
-                'Driver does not implement Zend_Log_FactoryInterface and can not be constructed from config.'
-            );
-        }
-
-        return call_user_func(array($className, 'factory'), $params);
-    }
-
-    /**
-     * Get the writer or filter full classname
-     *
-     * @param array $config
-     * @param string $type filter|writer
-     * @param string $defaultNamespace
-     * @return string full classname
-     */
-    protected function getClassName($config, $type, $defaultNamespace)
-    {
-        if (!isset($config[ $type . 'Name' ])) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception("Specify {$type}Name in the configuration array");
-        }
-        $className = $config[ $type . 'Name' ];
-
-        $namespace = $defaultNamespace;
-        if (isset($config[ $type . 'Namespace' ])) {
-            $namespace = $config[ $type . 'Namespace' ];
-        }
-
-        $fullClassName = $namespace . '_' . $className;
-        return $fullClassName;
-    }
-
-    /**
-     * Class destructor.  Shutdown log writers
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        foreach($this->_writers as $writer) {
-            $writer->shutdown();
-        }
-    }
-
-    /**
-     * Undefined method handler allows a shortcut:
-     *   $log->priorityName('message')
-     *     instead of
-     *   $log->log('message', Zend_Log::PRIORITY_NAME)
-     *
-     * @param  string  $method  priority name
-     * @param  string  $params  message to log
-     * @return void
-     * @throws Zend_Log_Exception
-     */
-    public function __call($method, $params)
-    {
-        $priority = strtoupper($method);
-        if (($priority = array_search($priority, $this->_priorities)) !== false) {
-            switch (count($params)) {
-                case 0:
-                    /** @see Zend_Log_Exception */
-                    require_once 'Zend/Log/Exception.php';
-                    throw new Zend_Log_Exception('Missing log message');
-                case 1:
-                    $message = array_shift($params);
-                    $extras = null;
-                    break;
-                default:
-                    $message = array_shift($params);
-                    $extras  = array_shift($params);
-                    break;
-            }
-            $this->log($message, $priority, $extras);
-        } else {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Bad log priority');
-        }
-    }
-
-    /**
-     * Log a message at a priority
-     *
-     * @param  string   $message   Message to log
-     * @param  integer  $priority  Priority of message
-     * @param  mixed    $extras    Extra information to log in event
-     * @return void
-     * @throws Zend_Log_Exception
-     */
-    public function log($message, $priority, $extras = null)
-    {
-        // sanity checks
-        if (empty($this->_writers)) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('No writers were added');
-        }
-
-        if (! isset($this->_priorities[$priority])) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Bad log priority');
-        }
-
-        // pack into event required by filters and writers
-        $event = array_merge(array('timestamp'    => date('c'),
-                                    'message'      => $message,
-                                    'priority'     => $priority,
-                                    'priorityName' => $this->_priorities[$priority]),
-                              $this->_extras);
-
-        // Check to see if any extra information was passed
-        if (!empty($extras)) {
-            $info = array();
-            if (is_array($extras)) {
-                foreach ($extras as $key => $value) {
-                    if (is_string($key)) {
-                        $event[$key] = $value;
-                    } else {
-                        $info[] = $value;
-                    }
-                }
-            } else {
-                $info = $extras;
-            }
-            if (!empty($info)) {
-                $event['info'] = $info;
-            }
-        }
-
-        // abort if rejected by the global filters
-        foreach ($this->_filters as $filter) {
-            if (! $filter->accept($event)) {
-                return;
-            }
-        }
-
-        // send to each writer
-        foreach ($this->_writers as $writer) {
-            $writer->write($event);
-        }
-    }
-
-    /**
-     * Add a custom priority
-     *
-     * @param  string   $name      Name of priority
-     * @param  integer  $priority  Numeric priority
-     * @throws Zend_Log_InvalidArgumentException
-     */
-    public function addPriority($name, $priority)
-    {
-        // Priority names must be uppercase for predictability.
-        $name = strtoupper($name);
-
-        if (isset($this->_priorities[$priority])
-            || array_search($name, $this->_priorities)) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Existing priorities cannot be overwritten');
-        }
-
-        $this->_priorities[$priority] = $name;
-    }
-
-    /**
-     * Add a filter that will be applied before all log writers.
-     * Before a message will be received by any of the writers, it
-     * must be accepted by all filters added with this method.
-     *
-     * @param  int|Zend_Log_Filter_Interface $filter
-     * @return void
-     */
-    public function addFilter($filter)
-    {
-        if (is_integer($filter)) {
-            /** @see Zend_Log_Filter_Priority */
-            require_once 'Zend/Log/Filter/Priority.php';
-            $filter = new Zend_Log_Filter_Priority($filter);
-
-        } elseif ($filter instanceof Zend_Config || is_array($filter)) {
-            $filter = $this->_constructFilterFromConfig($filter);
-
-        } elseif(! $filter instanceof Zend_Log_Filter_Interface) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Invalid filter provided');
-        }
-
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Add a writer.  A writer is responsible for taking a log
-     * message and writing it out to storage.
-     *
-     * @param  mixed $writer Zend_Log_Writer_Abstract or Config array
-     * @return void
-     */
-    public function addWriter($writer)
-    {
-        if (is_array($writer) || $writer instanceof  Zend_Config) {
-            $writer = $this->_constructWriterFromConfig($writer);
-        }
-
-        if (!$writer instanceof Zend_Log_Writer_Abstract) {
-            /** @see Zend_Log_Exception */
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception(
-                'Writer must be an instance of Zend_Log_Writer_Abstract'
-                . ' or you should pass a configuration array'
-            );
-        }
-
-        $this->_writers[] = $writer;
-    }
-
-    /**
-     * Set an extra item to pass to the log writers.
-     *
-     * @param  $name    Name of the field
-     * @param  $value   Value of the field
-     * @return void
-     */
-    public function setEventItem($name, $value) {
-        $this->_extras = array_merge($this->_extras, array($name => $value));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Exception.php b/airtime_mvc/library/Zend/Log/Exception.php
deleted file mode 100644
index 08557db8f..000000000
--- a/airtime_mvc/library/Zend/Log/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Log/FactoryInterface.php b/airtime_mvc/library/Zend/Log/FactoryInterface.php
deleted file mode 100644
index 20a270747..000000000
--- a/airtime_mvc/library/Zend/Log/FactoryInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-interface Zend_Log_FactoryInterface
-{
-    /**
-     * Construct a Zend_Log driver
-     * 
-     * @param  array|Zen_Config $config
-     * @return Zend_Log_FactoryInterface
-     */
-    static public function factory($config);
-}
diff --git a/airtime_mvc/library/Zend/Log/Filter/Abstract.php b/airtime_mvc/library/Zend/Log/Filter/Abstract.php
deleted file mode 100644
index 72edad1f6..000000000
--- a/airtime_mvc/library/Zend/Log/Filter/Abstract.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/** @see Zend_Log_Filter_Interface */
-require_once 'Zend/Log/Filter/Interface.php';
-
-/** @see Zend_Log_FactoryInterface */
-require_once 'Zend/Log/FactoryInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-abstract class Zend_Log_Filter_Abstract 
-    implements Zend_Log_Filter_Interface, Zend_Log_FactoryInterface
-{
-    /**
-     * Validate and optionally convert the config to array
-     * 
-     * @param  array|Zend_Config $config Zend_Config or Array
-     * @return array
-     * @throws Zend_Log_Exception
-     */
-    static protected function _parseConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        }
-
-        if (!is_array($config)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config');
-        }
-
-        return $config;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Filter/Interface.php b/airtime_mvc/library/Zend/Log/Filter/Interface.php
deleted file mode 100644
index c2165d2ba..000000000
--- a/airtime_mvc/library/Zend/Log/Filter/Interface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Log_Filter_Interface
-{
-    /**
-     * Returns TRUE to accept the message, FALSE to block it.
-     *
-     * @param  array    $event    event data
-     * @return boolean            accepted?
-     */
-    public function accept($event);
-}
diff --git a/airtime_mvc/library/Zend/Log/Filter/Message.php b/airtime_mvc/library/Zend/Log/Filter/Message.php
deleted file mode 100644
index 96433f640..000000000
--- a/airtime_mvc/library/Zend/Log/Filter/Message.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20982 2010-02-08 15:51:36Z matthew $
- */
-
-/** Zend_Log_Filter_Abstract */
-require_once 'Zend/Log/Filter/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20982 2010-02-08 15:51:36Z matthew $
- */
-class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract
-{
-    /**
-     * @var string
-     */
-    protected $_regexp;
-
-    /**
-     * Filter out any log messages not matching $regexp.
-     *
-     * @param  string  $regexp     Regular expression to test the log message
-     * @throws Zend_Log_Exception
-     */
-    public function __construct($regexp)
-    {
-        if (@preg_match($regexp, '') === false) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception("Invalid regular expression '$regexp'");
-        }
-        $this->_regexp = $regexp;
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Filter_Message
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Filter_Message
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config) 
-    {
-        $config = self::_parseConfig($config);
-        $config = array_merge(array(
-            'regexp' => null
-        ), $config);
-
-        return new self(
-            $config['regexp']
-        );
-    }
-
-    /**
-     * Returns TRUE to accept the message, FALSE to block it.
-     *
-     * @param  array    $event    event data
-     * @return boolean            accepted?
-     */
-    public function accept($event)
-    {
-        return preg_match($this->_regexp, $event['message']) > 0;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Filter/Priority.php b/airtime_mvc/library/Zend/Log/Filter/Priority.php
deleted file mode 100644
index 1835c9a29..000000000
--- a/airtime_mvc/library/Zend/Log/Filter/Priority.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Priority.php 20260 2010-01-13 18:29:22Z ralph $
- */
-
-/** Zend_Log_Filter_Abstract */
-require_once 'Zend/Log/Filter/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Priority.php 20260 2010-01-13 18:29:22Z ralph $
- */
-class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract
-{
-    /**
-     * @var integer
-     */
-    protected $_priority;
-
-    /**
-     * @var string
-     */
-    protected $_operator;
-
-    /**
-     * Filter logging by $priority.  By default, it will accept any log
-     * event whose priority value is less than or equal to $priority.
-     *
-     * @param  integer  $priority  Priority
-     * @param  string   $operator  Comparison operator
-     * @throws Zend_Log_Exception
-     */
-    public function __construct($priority, $operator = NULL)
-    {
-        if (! is_integer($priority)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Priority must be an integer');
-        }
-
-        $this->_priority = $priority;
-        $this->_operator = is_null($operator) ? '<=' : $operator;
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Filter_Priority
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Filter_Priority
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config) 
-    {
-        $config = self::_parseConfig($config);
-        $config = array_merge(array(
-            'priority' => null, 
-            'operator' => null,
-        ), $config);
-
-        // Add support for constants
-        if (!is_numeric($config['priority']) && isset($config['priority']) && defined($config['priority'])) {
-            $config['priority'] = constant($config['priority']);
-        }
-
-        return new self(
-            (int) $config['priority'], 
-            $config['operator']
-        );
-    }
-
-    /**
-     * Returns TRUE to accept the message, FALSE to block it.
-     *
-     * @param  array    $event    event data
-     * @return boolean            accepted?
-     */
-    public function accept($event)
-    {
-        return version_compare($event['priority'], $this->_priority, $this->_operator);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Filter/Suppress.php b/airtime_mvc/library/Zend/Log/Filter/Suppress.php
deleted file mode 100644
index 14b74ae60..000000000
--- a/airtime_mvc/library/Zend/Log/Filter/Suppress.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Suppress.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Filter_Interface */
-require_once 'Zend/Log/Filter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Filter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Suppress.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Filter_Suppress extends Zend_Log_Filter_Abstract
-{
-    /**
-     * @var boolean
-     */
-    protected $_accept = true;
-
-    /**
-     * This is a simple boolean filter.
-     *
-     * Call suppress(true) to suppress all log events.
-     * Call suppress(false) to accept all log events.
-     *
-     * @param  boolean  $suppress  Should all log events be suppressed?
-     * @return  void
-     */
-    public function suppress($suppress)
-    {
-        $this->_accept = (! $suppress);
-    }
-
-    /**
-     * Returns TRUE to accept the message, FALSE to block it.
-     *
-     * @param  array    $event    event data
-     * @return boolean            accepted?
-     */
-    public function accept($event)
-    {
-        return $this->_accept;
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Filter_Suppress
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Filter_Suppress
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        return new self();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Formatter/Firebug.php b/airtime_mvc/library/Zend/Log/Formatter/Firebug.php
deleted file mode 100644
index ef155a599..000000000
--- a/airtime_mvc/library/Zend/Log/Formatter/Firebug.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Formatter_Interface */
-require_once 'Zend/Log/Formatter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Log_Formatter_Firebug implements Zend_Log_Formatter_Interface
-{
-    /**
-     * This method formats the event for the firebug writer.
-     *
-     * The default is to just send the message parameter, but through
-     * extension of this class and calling the
-     * {@see Zend_Log_Writer_Firebug::setFormatter()} method you can
-     * pass as much of the event data as you are interested in.
-     *
-     * @param  array    $event    event data
-     * @return mixed              event message
-     */
-    public function format($event)
-    {
-        return $event['message'];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Formatter/Interface.php b/airtime_mvc/library/Zend/Log/Formatter/Interface.php
deleted file mode 100644
index 2d05145a3..000000000
--- a/airtime_mvc/library/Zend/Log/Formatter/Interface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Log_Formatter_Interface
-{
-    /**
-     * Formats data into a single line to be written by the writer.
-     *
-     * @param  array    $event    event data
-     * @return string             formatted line to write to the log
-     */
-    public function format($event);
-
-}
diff --git a/airtime_mvc/library/Zend/Log/Formatter/Simple.php b/airtime_mvc/library/Zend/Log/Formatter/Simple.php
deleted file mode 100644
index c53b7c0d6..000000000
--- a/airtime_mvc/library/Zend/Log/Formatter/Simple.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Formatter_Interface */
-require_once 'Zend/Log/Formatter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Formatter_Simple implements Zend_Log_Formatter_Interface
-{
-    /**
-     * @var string
-     */
-    protected $_format;
-
-    const DEFAULT_FORMAT = '%timestamp% %priorityName% (%priority%): %message%';
-
-    /**
-     * Class constructor
-     *
-     * @param  null|string  $format  Format specifier for log messages
-     * @throws Zend_Log_Exception
-     */
-    public function __construct($format = null)
-    {
-        if ($format === null) {
-            $format = self::DEFAULT_FORMAT . PHP_EOL;
-        }
-
-        if (! is_string($format)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Format must be a string');
-        }
-
-        $this->_format = $format;
-    }
-
-    /**
-     * Formats data into a single line to be written by the writer.
-     *
-     * @param  array    $event    event data
-     * @return string             formatted line to write to the log
-     */
-    public function format($event)
-    {
-        $output = $this->_format;
-        foreach ($event as $name => $value) {
-
-            if ((is_object($value) && !method_exists($value,'__toString'))
-                || is_array($value)) {
-
-                $value = gettype($value);
-            }
-
-            $output = str_replace("%$name%", $value, $output);
-        }
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Log/Formatter/Xml.php b/airtime_mvc/library/Zend/Log/Formatter/Xml.php
deleted file mode 100644
index a0af504bc..000000000
--- a/airtime_mvc/library/Zend/Log/Formatter/Xml.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $
- */
-
-/** Zend_Log_Formatter_Interface */
-require_once 'Zend/Log/Formatter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Formatter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $
- */
-class Zend_Log_Formatter_Xml implements Zend_Log_Formatter_Interface
-{
-    /**
-     * @var Relates XML elements to log data field keys.
-     */
-    protected $_rootElement;
-
-    /**
-     * @var Relates XML elements to log data field keys.
-     */
-    protected $_elementMap;
-
-    /**
-     * @var string Encoding to use in XML
-     */
-    protected $_encoding;
-
-    /**
-     * Class constructor
-     *
-     * @param string $rootElement Name of root element
-     * @param array $elementMap
-     * @param string $encoding Encoding to use (defaults to UTF-8)
-     */
-    public function __construct($rootElement = 'logEntry', $elementMap = null, $encoding = 'UTF-8')
-    {
-        $this->_rootElement = $rootElement;
-        $this->_elementMap  = $elementMap;
-        $this->setEncoding($encoding);
-    }
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $value
-     * @return Zend_Log_Formatter_Xml
-     */
-    public function setEncoding($value)
-    {
-        $this->_encoding = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Formats data into a single line to be written by the writer.
-     *
-     * @param  array    $event    event data
-     * @return string             formatted line to write to the log
-     */
-    public function format($event)
-    {
-        if ($this->_elementMap === null) {
-            $dataToInsert = $event;
-        } else {
-            $dataToInsert = array();
-            foreach ($this->_elementMap as $elementName => $fieldKey) {
-                $dataToInsert[$elementName] = $event[$fieldKey];
-            }
-        }
-
-        $enc = $this->getEncoding();
-        $dom = new DOMDocument('1.0', $enc);
-        $elt = $dom->appendChild(new DOMElement($this->_rootElement));
-
-        foreach ($dataToInsert as $key => $value) {
-            if($key == "message") {
-                $value = htmlspecialchars($value, ENT_COMPAT, $enc);
-            }
-            $elt->appendChild(new DOMElement($key, $value));
-        }
-
-        $xml = $dom->saveXML();
-        $xml = preg_replace('/<\?xml version="1.0"( encoding="[^\"]*")?\?>\n/u', '', $xml);
-
-        return $xml . PHP_EOL;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Abstract.php b/airtime_mvc/library/Zend/Log/Writer/Abstract.php
deleted file mode 100644
index 979375a83..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Abstract.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Filter_Priority */
-require_once 'Zend/Log/Filter/Priority.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface
-{
-    /**
-     * @var array of Zend_Log_Filter_Interface
-     */
-    protected $_filters = array();
-
-    /**
-     * Formats the log message before writing.
-     * @var Zend_Log_Formatter_Interface
-     */
-    protected $_formatter;
-
-    /**
-     * Add a filter specific to this writer.
-     *
-     * @param  Zend_Log_Filter_Interface  $filter
-     * @return void
-     */
-    public function addFilter($filter)
-    {
-        if (is_integer($filter)) {
-            $filter = new Zend_Log_Filter_Priority($filter);
-        }
-
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Log a message to this writer.
-     *
-     * @param  array     $event  log data event
-     * @return void
-     */
-    public function write($event)
-    {
-        foreach ($this->_filters as $filter) {
-            if (! $filter->accept($event)) {
-                return;
-            }
-        }
-
-        // exception occurs on error
-        $this->_write($event);
-    }
-
-    /**
-     * Set a new formatter for this writer
-     *
-     * @param  Zend_Log_Formatter_Interface $formatter
-     * @return void
-     */
-    public function setFormatter($formatter)
-    {
-        $this->_formatter = $formatter;
-    }
-
-    /**
-     * Perform shutdown activites such as closing open resources
-     *
-     * @return void
-     */
-    public function shutdown()
-    {}
-
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  log data event
-     * @return void
-     */
-    abstract protected function _write($event);
-
-    /**
-     * Validate and optionally convert the config to array
-     * 
-     * @param  array|Zend_Config $config Zend_Config or Array
-     * @return array
-     * @throws Zend_Log_Exception
-     */
-    static protected function _parseConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        }
-
-        if (!is_array($config)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception(
-				'Configuration must be an array or instance of Zend_Config'
-			);
-        }
-
-        return $config;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Db.php b/airtime_mvc/library/Zend/Log/Writer/Db.php
deleted file mode 100644
index 63660aec6..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Db.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Database adapter instance
-     * @var Zend_Db_Adapter
-     */
-    private $_db;
-
-    /**
-     * Name of the log table in the database
-     * @var string
-     */
-    private $_table;
-
-    /**
-     * Relates database columns names to log data field keys.
-     *
-     * @var null|array
-     */
-    private $_columnMap;
-
-    /**
-     * Class constructor
-     *
-     * @param Zend_Db_Adapter $db   Database adapter instance
-     * @param string $table         Log table in database
-     * @param array $columnMap
-     */
-    public function __construct($db, $table, $columnMap = null)
-    {
-        $this->_db    = $db;
-        $this->_table = $table;
-        $this->_columnMap = $columnMap;
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Writer_Db
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Db
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        $config = self::_parseConfig($config);
-        $config = array_merge(array(
-            'db'        => null, 
-            'table'     => null, 
-            'columnMap' => null,
-        ), $config);
-        
-        if (isset($config['columnmap'])) {
-            $config['columnMap'] = $config['columnmap'];
-        }
-        
-        return new self(
-            $config['db'],
-            $config['table'],
-            $config['columnMap']
-        );
-    }
-
-    /**
-     * Formatting is not possible on this writer
-     */
-    public function setFormatter($formatter)
-    {
-        require_once 'Zend/Log/Exception.php';
-        throw new Zend_Log_Exception(get_class() . ' does not support formatting');
-    }
-
-    /**
-     * Remove reference to database adapter
-     *
-     * @return void
-     */
-    public function shutdown()
-    {
-        $this->_db = null;
-    }
-
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-        if ($this->_db === null) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception('Database adapter is null');
-        }
-
-        if ($this->_columnMap === null) {
-            $dataToInsert = $event;
-        } else {
-            $dataToInsert = array();
-            foreach ($this->_columnMap as $columnName => $fieldKey) {
-                $dataToInsert[$columnName] = $event[$fieldKey];
-            }
-        }
-
-        $this->_db->insert($this->_table, $dataToInsert);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Firebug.php b/airtime_mvc/library/Zend/Log/Writer/Firebug.php
deleted file mode 100644
index 5afd75240..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Firebug.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Firebug.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log */
-require_once 'Zend/Log.php';
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/** Zend_Log_Formatter_Firebug */
-require_once 'Zend/Log/Formatter/Firebug.php';
-
-/** Zend_Wildfire_Plugin_FirePhp */
-require_once 'Zend/Wildfire/Plugin/FirePhp.php';
-
-/**
- * Writes log messages to the Firebug Console via FirePHP.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract
-{
-
-    /**
-     * Maps logging priorities to logging display styles
-     * @var array
-     */
-    protected $_priorityStyles = array(Zend_Log::EMERG  => Zend_Wildfire_Plugin_FirePhp::ERROR,
-                                       Zend_Log::ALERT  => Zend_Wildfire_Plugin_FirePhp::ERROR,
-                                       Zend_Log::CRIT   => Zend_Wildfire_Plugin_FirePhp::ERROR,
-                                       Zend_Log::ERR    => Zend_Wildfire_Plugin_FirePhp::ERROR,
-                                       Zend_Log::WARN   => Zend_Wildfire_Plugin_FirePhp::WARN,
-                                       Zend_Log::NOTICE => Zend_Wildfire_Plugin_FirePhp::INFO,
-                                       Zend_Log::INFO   => Zend_Wildfire_Plugin_FirePhp::INFO,
-                                       Zend_Log::DEBUG  => Zend_Wildfire_Plugin_FirePhp::LOG);
-
-    /**
-     * The default logging style for un-mapped priorities
-     * @var string
-     */
-    protected $_defaultPriorityStyle = Zend_Wildfire_Plugin_FirePhp::LOG;
-
-    /**
-     * Flag indicating whether the log writer is enabled
-     * @var boolean
-     */
-    protected $_enabled = true;
-
-    /**
-     * Class constructor
-     */
-    public function __construct()
-    {
-        if (php_sapi_name() == 'cli') {
-            $this->setEnabled(false);
-        }
-
-        $this->_formatter = new Zend_Log_Formatter_Firebug();
-    }
-   
-    /**
-     * Create a new instance of Zend_Log_Writer_Firebug
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Firebug
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        return new self();
-    }
-
-    /**
-     * Enable or disable the log writer.
-     *
-     * @param boolean $enabled Set to TRUE to enable the log writer
-     * @return boolean The previous value.
-     */
-    public function setEnabled($enabled)
-    {
-        $previous = $this->_enabled;
-        $this->_enabled = $enabled;
-        return $previous;
-    }
-
-    /**
-     * Determine if the log writer is enabled.
-     *
-     * @return boolean Returns TRUE if the log writer is enabled.
-     */
-    public function getEnabled()
-    {
-        return $this->_enabled;
-    }
-
-    /**
-     * Set the default display style for user-defined priorities
-     *
-     * @param string $style The default log display style
-     * @return string Returns previous default log display style
-     */
-    public function setDefaultPriorityStyle($style)
-    {
-        $previous = $this->_defaultPriorityStyle;
-        $this->_defaultPriorityStyle = $style;
-        return $previous;
-    }
-
-    /**
-     * Get the default display style for user-defined priorities
-     *
-     * @return string Returns the default log display style
-     */
-    public function getDefaultPriorityStyle()
-    {
-        return $this->_defaultPriorityStyle;
-    }
-
-    /**
-     * Set a display style for a logging priority
-     *
-     * @param int $priority The logging priority
-     * @param string $style The logging display style
-     * @return string|boolean The previous logging display style if defined or TRUE otherwise
-     */
-    public function setPriorityStyle($priority, $style)
-    {
-        $previous = true;
-        if (array_key_exists($priority,$this->_priorityStyles)) {
-            $previous = $this->_priorityStyles[$priority];
-        }
-        $this->_priorityStyles[$priority] = $style;
-        return $previous;
-    }
-
-    /**
-     * Get a display style for a logging priority
-     *
-     * @param int $priority The logging priority
-     * @return string|boolean The logging display style if defined or FALSE otherwise
-     */
-    public function getPriorityStyle($priority)
-    {
-        if (array_key_exists($priority,$this->_priorityStyles)) {
-            return $this->_priorityStyles[$priority];
-        }
-        return false;
-    }
-
-    /**
-     * Log a message to the Firebug Console.
-     *
-     * @param array $event The event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-        if (!$this->getEnabled()) {
-            return;
-        }
-
-        if (array_key_exists($event['priority'],$this->_priorityStyles)) {
-            $type = $this->_priorityStyles[$event['priority']];
-        } else {
-            $type = $this->_defaultPriorityStyle;
-        }
-
-        $message = $this->_formatter->format($event);
-
-        $label = isset($event['firebugLabel'])?$event['firebugLabel']:null;
-
-        Zend_Wildfire_Plugin_FirePhp::getInstance()->send($message,
-                                                          $label,
-                                                          $type,
-                                                          array('traceOffset'=>6));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Mail.php b/airtime_mvc/library/Zend/Log/Writer/Mail.php
deleted file mode 100644
index 2d47670e1..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Mail.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mail.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/** Zend_Log_Exception */
-require_once 'Zend/Log/Exception.php';
-
-/** Zend_Log_Formatter_Simple*/
-require_once 'Zend/Log/Formatter/Simple.php';
-
-/**
- * Class used for writing log messages to email via Zend_Mail.
- *
- * Allows for emailing log messages at and above a certain level via a
- * Zend_Mail object.  Note that this class only sends the email upon
- * completion, so any log entries accumulated are sent in a single email.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mail.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Array of formatted events to include in message body.
-     *
-     * @var array
-     */
-    protected $_eventsToMail = array();
-
-    /**
-     * Array of formatted lines for use in an HTML email body; these events
-     * are formatted with an optional formatter if the caller is using
-     * Zend_Layout.
-     *
-     * @var array
-     */
-    protected $_layoutEventsToMail = array();
-
-    /**
-     * Zend_Mail instance to use
-     *
-     * @var Zend_Mail
-     */
-    protected $_mail;
-
-    /**
-     * Zend_Layout instance to use; optional.
-     *
-     * @var Zend_Layout
-     */
-    protected $_layout;
-
-    /**
-     * Optional formatter for use when rendering with Zend_Layout.
-     *
-     * @var Zend_Log_Formatter_Interface
-     */
-    protected $_layoutFormatter;
-
-    /**
-     * Array keeping track of the number of entries per priority level.
-     *
-     * @var array
-     */
-    protected $_numEntriesPerPriority = array();
-
-    /**
-     * Subject prepend text.
-     *
-     * Can only be used of the Zend_Mail object has not already had its
-     * subject line set.  Using this will cause the subject to have the entry
-     * counts per-priority level appended to it.
-     *
-     * @var string|null
-     */
-    protected $_subjectPrependText;
-
-    /**
-     * Class constructor.
-     *
-     * Constructs the mail writer; requires a Zend_Mail instance, and takes an
-     * optional Zend_Layout instance.  If Zend_Layout is being used,
-     * $this->_layout->events will be set for use in the layout template.
-     *
-     * @param  Zend_Mail $mail Mail instance
-     * @param  Zend_Layout $layout Layout instance; optional
-     * @return void
-     */
-    public function __construct(Zend_Mail $mail, Zend_Layout $layout = null)
-    {
-        $this->_mail      = $mail;
-        $this->_layout    = $layout;
-        $this->_formatter = new Zend_Log_Formatter_Simple();
-    }
-    
-    /**
-     * Create a new instance of Zend_Log_Writer_Mail
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Mail
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        throw new Zend_Exception('Zend_Log_Writer_Mail does not currently implement a factory');
-    }
-
-    /**
-     * Places event line into array of lines to be used as message body.
-     *
-     * Handles the formatting of both plaintext entries, as well as those
-     * rendered with Zend_Layout.
-     *
-     * @param  array $event Event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-        // Track the number of entries per priority level.
-        if (!isset($this->_numEntriesPerPriority[$event['priorityName']])) {
-            $this->_numEntriesPerPriority[$event['priorityName']] = 1;
-        } else {
-            $this->_numEntriesPerPriority[$event['priorityName']]++;
-        }
-
-        $formattedEvent = $this->_formatter->format($event);
-
-        // All plaintext events are to use the standard formatter.
-        $this->_eventsToMail[] = $formattedEvent;
-
-        // If we have a Zend_Layout instance, use a specific formatter for the
-        // layout if one exists.  Otherwise, just use the event with its
-        // default format.
-        if ($this->_layout) {
-            if ($this->_layoutFormatter) {
-                $this->_layoutEventsToMail[] =
-                    $this->_layoutFormatter->format($event);
-            } else {
-                $this->_layoutEventsToMail[] = $formattedEvent;
-            }
-        }
-    }
-
-    /**
-     * Gets instance of Zend_Log_Formatter_Instance used for formatting a
-     * message using Zend_Layout, if applicable.
-     *
-     * @return Zend_Log_Formatter_Interface|null The formatter, or null.
-     */
-    public function getLayoutFormatter()
-    {
-        return $this->_layoutFormatter;
-    }
-
-    /**
-     * Sets a specific formatter for use with Zend_Layout events.
-     *
-     * Allows use of a second formatter on lines that will be rendered with
-     * Zend_Layout.  In the event that Zend_Layout is not being used, this
-     * formatter cannot be set, so an exception will be thrown.
-     *
-     * @param  Zend_Log_Formatter_Interface $formatter
-     * @return Zend_Log_Writer_Mail
-     * @throws Zend_Log_Exception
-     */
-    public function setLayoutFormatter(Zend_Log_Formatter_Interface $formatter)
-    {
-        if (!$this->_layout) {
-            throw new Zend_Log_Exception(
-                'cannot set formatter for layout; ' .
-                    'a Zend_Layout instance is not in use');
-        }
-
-        $this->_layoutFormatter = $formatter;
-        return $this;
-    }
-
-    /**
-     * Allows caller to have the mail subject dynamically set to contain the
-     * entry counts per-priority level.
-     *
-     * Sets the text for use in the subject, with entry counts per-priority
-     * level appended to the end.  Since a Zend_Mail subject can only be set
-     * once, this method cannot be used if the Zend_Mail object already has a
-     * subject set.
-     *
-     * @param  string $subject Subject prepend text.
-     * @return Zend_Log_Writer_Mail
-     */
-    public function setSubjectPrependText($subject)
-    {
-        if ($this->_mail->getSubject()) {
-            throw new Zend_Log_Exception(
-                'subject already set on mail; ' .
-                    'cannot set subject prepend text');
-        }
-
-        $this->_subjectPrependText = (string) $subject;
-        return $this;
-    }
-
-    /**
-     * Sends mail to recipient(s) if log entries are present.  Note that both
-     * plaintext and HTML portions of email are handled here.
-     *
-     * @return void
-     */
-    public function shutdown()
-    {
-        // If there are events to mail, use them as message body.  Otherwise,
-        // there is no mail to be sent.
-        if (empty($this->_eventsToMail)) {
-            return;
-        }
-
-        if ($this->_subjectPrependText !== null) {
-            // Tack on the summary of entries per-priority to the subject
-            // line and set it on the Zend_Mail object.
-            $numEntries = $this->_getFormattedNumEntriesPerPriority();
-            $this->_mail->setSubject(
-                "{$this->_subjectPrependText} ({$numEntries})");
-        }
-
-
-        // Always provide events to mail as plaintext.
-        $this->_mail->setBodyText(implode('', $this->_eventsToMail));
-
-        // If a Zend_Layout instance is being used, set its "events"
-        // value to the lines formatted for use with the layout.
-        if ($this->_layout) {
-            // Set the required "messages" value for the layout.  Here we
-            // are assuming that the layout is for use with HTML.
-            $this->_layout->events =
-                implode('', $this->_layoutEventsToMail);
-
-            // If an exception occurs during rendering, convert it to a notice
-            // so we can avoid an exception thrown without a stack frame.
-            try {
-                $this->_mail->setBodyHtml($this->_layout->render());
-            } catch (Exception $e) {
-                trigger_error(
-                    "exception occurred when rendering layout; " .
-                        "unable to set html body for message; " .
-                        "message = {$e->getMessage()}; " .
-                        "code = {$e->getCode()}; " .
-                        "exception class = " . get_class($e),
-                    E_USER_NOTICE);
-            }
-        }
-
-        // Finally, send the mail.  If an exception occurs, convert it into a
-        // warning-level message so we can avoid an exception thrown without a
-        // stack frame.
-        try {
-            $this->_mail->send();
-        } catch (Exception $e) {
-            trigger_error(
-                "unable to send log entries via email; " .
-                    "message = {$e->getMessage()}; " .
-                    "code = {$e->getCode()}; " .
-                        "exception class = " . get_class($e),
-                E_USER_WARNING);
-        }
-    }
-
-    /**
-     * Gets a string of number of entries per-priority level that occurred, or
-     * an emptry string if none occurred.
-     *
-     * @return string
-     */
-    protected function _getFormattedNumEntriesPerPriority()
-    {
-        $strings = array();
-
-        foreach ($this->_numEntriesPerPriority as $priority => $numEntries) {
-            $strings[] = "{$priority}={$numEntries}";
-        }
-
-        return implode(', ', $strings);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Mock.php b/airtime_mvc/library/Zend/Log/Writer/Mock.php
deleted file mode 100644
index f946219a9..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Mock.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Writer_Mock extends Zend_Log_Writer_Abstract
-{
-    /**
-     * array of log events
-     */
-    public $events = array();
-
-    /**
-     * shutdown called?
-     */
-    public $shutdown = false;
-
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  event data
-     * @return void
-     */
-    public function _write($event)
-    {
-        $this->events[] = $event;
-    }
-
-    /**
-     * Record shutdown
-     *
-     * @return void
-     */
-    public function shutdown()
-    {
-        $this->shutdown = true;
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Writer_Mock
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Mock
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config) 
-    {
-        return new self();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Null.php b/airtime_mvc/library/Zend/Log/Writer/Null.php
deleted file mode 100644
index d86b69b58..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Null.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-    }
-    
-    /**
-     * Create a new instance of Zend_Log_Writer_Null
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Null
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        return new self();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Stream.php b/airtime_mvc/library/Zend/Log/Writer/Stream.php
deleted file mode 100644
index fdf924efd..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Stream.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/** Zend_Log_Formatter_Simple */
-require_once 'Zend/Log/Formatter/Simple.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Holds the PHP stream to log to.
-     * @var null|stream
-     */
-    protected $_stream = null;
-
-    /**
-     * Class Constructor
-     *
-     * @param  streamOrUrl     Stream or URL to open as a stream
-     * @param  mode            Mode, only applicable if a URL is given
-     */
-    public function __construct($streamOrUrl, $mode = NULL)
-    {
-        // Setting the default
-        if ($mode === NULL) {
-            $mode = 'a';
-        }
-
-        if (is_resource($streamOrUrl)) {
-            if (get_resource_type($streamOrUrl) != 'stream') {
-                require_once 'Zend/Log/Exception.php';
-                throw new Zend_Log_Exception('Resource is not a stream');
-            }
-
-            if ($mode != 'a') {
-                require_once 'Zend/Log/Exception.php';
-                throw new Zend_Log_Exception('Mode cannot be changed on existing streams');
-            }
-
-            $this->_stream = $streamOrUrl;
-        } else {
-            if (is_array($streamOrUrl) && isset($streamOrUrl['stream'])) {
-                $streamOrUrl = $streamOrUrl['stream'];
-            }
-
-            if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) {
-                require_once 'Zend/Log/Exception.php';
-                $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\"";
-                throw new Zend_Log_Exception($msg);
-            }
-        }
-
-        $this->_formatter = new Zend_Log_Formatter_Simple();
-    }
-    
-    /**
-     * Create a new instance of Zend_Log_Writer_Mock
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Mock
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        $config = self::_parseConfig($config);
-        $config = array_merge(array(
-            'stream' => null, 
-            'mode'   => null,
-        ), $config);
-
-        $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream']; 
-        
-        return new self(
-            $streamOrUrl, 
-            $config['mode']
-        );
-    }
-    
-    /**
-     * Close the stream resource.
-     *
-     * @return void
-     */
-    public function shutdown()
-    {
-        if (is_resource($this->_stream)) {
-            fclose($this->_stream);
-        }
-    }
-
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-        $line = $this->_formatter->format($event);
-
-        if (false === @fwrite($this->_stream, $line)) {
-            require_once 'Zend/Log/Exception.php';
-            throw new Zend_Log_Exception("Unable to write to stream");
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/Syslog.php b/airtime_mvc/library/Zend/Log/Writer/Syslog.php
deleted file mode 100644
index 96fbe5692..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/Syslog.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Syslog.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/**
- * Writes log messages to syslog
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Maps Zend_Log priorities to PHP's syslog priorities
-     * @var array
-     */
-    protected $_priorities = array(
-        Zend_Log::EMERG  => LOG_EMERG,
-        Zend_Log::ALERT  => LOG_ALERT,
-        Zend_Log::CRIT   => LOG_CRIT,
-        Zend_Log::ERR    => LOG_ERR,
-        Zend_Log::WARN   => LOG_WARNING,
-        Zend_Log::NOTICE => LOG_NOTICE,
-        Zend_Log::INFO   => LOG_INFO,
-        Zend_Log::DEBUG  => LOG_DEBUG,
-    );
-
-    /**
-     * The default log priority - for unmapped custom priorities
-     * @var string
-     */
-    protected $_defaultPriority = LOG_NOTICE;
-
-    /**
-     * Last application name set by a syslog-writer instance
-     * @var string
-     */
-    protected static $_lastApplication;
-
-    /**
-     * Last facility name set by a syslog-writer instance
-     * @var string
-     */
-    protected static $_lastFacility;
-
-    /**
-     * Application name used by this syslog-writer instance
-     * @var string
-     */
-    protected $_application = 'Zend_Log';
-
-    /**
-     * Facility used by this syslog-writer instance
-     * @var string
-     */
-    protected $_facility = LOG_USER;
-
-    /**
-     * Class constructor
-     *
-     * @param  array $options Array of options; may include "application" and "facility" keys
-     * @return void
-     */
-    public function __construct(array $params = array())
-    {
-        if (isset($params['application'])) {
-            $this->_application = $params['application'];
-        }
-        if (isset($params['facility'])) {
-            $this->_facility = $params['facility'];
-        }
-        $this->_initializeSyslog();
-    }
-    
-    /**
-     * Create a new instance of Zend_Log_Writer_Syslog
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Syslog
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        return new self(self::_parseConfig($config));
-    }
-
-    /**
-     * Initialize syslog / set application name and facility
-     *
-     * @param  string $application Application name
-     * @param  string $facility Syslog facility
-     * @return void
-     */
-    protected function _initializeSyslog()
-    {
-        self::$_lastApplication = $this->_application;
-        self::$_lastFacility    = $this->_facility;
-        openlog($this->_application, LOG_PID, $this->_facility);
-    }
-
-    /**
-     * Set syslog facility
-     *
-     * @param  string $facility Syslog facility
-     * @return void
-     */
-    public function setFacility($facility)
-    {
-        if ($this->_facility === $facility) {
-            return;
-        }
-        $this->_facility = $facility;
-        $this->_initializeSyslog();
-    }
-
-    /**
-     * Set application name
-     *
-     * @param  string $application Application name
-     * @return void
-     */
-    public function setApplicationName($application)
-    {
-        if ($this->_application === $application) {
-            return;
-        }
-        $this->_application = $application;
-        $this->_initializeSyslog();
-    }
-
-    /**
-     * Close syslog.
-     *
-     * @return void
-     */
-    public function shutdown()
-    {
-        closelog();
-    }
-
-    /**
-     * Write a message to syslog.
-     *
-     * @param  array $event  event data
-     * @return void
-     */
-    protected function _write($event)
-    {
-        if (array_key_exists($event['priority'], $this->_priorities)) {
-            $priority = $this->_priorities[$event['priority']];
-        } else {
-            $priority = $this->_defaultPriority;
-        }
-
-        if ($this->_application !== self::$_lastApplication
-            || $this->_facility !== self::$_lastFacility)
-        {
-            $this->_initializeSyslog();
-        }
-
-        syslog($priority, $event['message']);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Log/Writer/ZendMonitor.php b/airtime_mvc/library/Zend/Log/Writer/ZendMonitor.php
deleted file mode 100644
index 082f2a4f5..000000000
--- a/airtime_mvc/library/Zend/Log/Writer/ZendMonitor.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/** Zend_Log_Writer_Abstract */
-require_once 'Zend/Log/Writer/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Log
- * @subpackage Writer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-class Zend_Log_Writer_ZendMonitor extends Zend_Log_Writer_Abstract
-{
-    /**
-     * Is Zend Monitor enabled?
-     * @var bool
-     */
-    protected $_isEnabled = true;
-
-    /**
-     * @throws Zend_Log_Exception if Zend Monitor extension not present
-     */
-    public function __construct()
-    {
-        if (!function_exists('monitor_custom_event')) {
-            $this->_isEnabled = false;
-        }
-    }
-
-    /**
-     * Create a new instance of Zend_Log_Writer_ZendMonitor
-     * 
-     * @param  array|Zend_Config $config
-     * @return Zend_Log_Writer_Syslog
-     * @throws Zend_Log_Exception
-     */
-    static public function factory($config)
-    {
-        return new self();
-    }
-
-    /**
-     * Is logging to this writer enabled?
-     *
-     * If the Zend Monitor extension is not enabled, this log writer will 
-     * fail silently. You can query this method to determine if the log 
-     * writer is enabled.
-     * 
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->_isEnabled;
-    }
-
-    /**
-     * Log a message to this writer.
-     *
-     * @param  array $event  log data event
-     * @return void
-     */
-    public function write($event)
-    {
-        if (!$this->isEnabled()) {
-            return;
-        }
-
-        parent::write($event);
-    }
-
-    /**
-     * Write a message to the log.
-     *
-     * @param  array  $event  log data event
-     * @return void
-     */
-    protected function _write($event)
-    {
-        $priority = $event['priority'];
-        $message  = $event['message'];
-        unset($event['priority'], $event['message']);
-
-        if (!empty($event)) {
-            monitor_custom_event($priority, $message, $event);
-        } else {
-            monitor_custom_event($priority, $message);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail.php b/airtime_mvc/library/Zend/Mail.php
deleted file mode 100644
index 2f9c50f1f..000000000
--- a/airtime_mvc/library/Zend/Mail.php
+++ /dev/null
@@ -1,1261 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mail.php 20783 2010-01-31 08:06:30Z yoshida@zend.co.jp $
- */
-
-
-/**
- * @see Zend_Mail_Transport_Abstract
- */
-require_once 'Zend/Mail/Transport/Abstract.php';
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * @see Zend_Mime_Message
- */
-require_once 'Zend/Mime/Message.php';
-
-/**
- * @see Zend_Mime_Part
- */
-require_once 'Zend/Mime/Part.php';
-
-
-/**
- * Class for sending an email.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail extends Zend_Mime_Message
-{
-    /**#@+
-     * @access protected
-     */
-
-    /**
-     * @var Zend_Mail_Transport_Abstract
-     * @static
-     */
-    protected static $_defaultTransport = null;
-
-    /**
-     * @var array
-     * @static
-     */
-    protected static $_defaultFrom;
-
-    /**
-     * @var array
-     * @static
-     */
-    protected static $_defaultReplyTo;
-
-    /**
-     * Mail character set
-     * @var string
-     */
-    protected $_charset = null;
-
-    /**
-     * Mail headers
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * Encoding of Mail headers
-     * @var string
-     */
-    protected $_headerEncoding = Zend_Mime::ENCODING_QUOTEDPRINTABLE;
-
-    /**
-     * From: address
-     * @var string
-     */
-    protected $_from = null;
-
-    /**
-     * To: addresses
-     * @var array
-     */
-    protected $_to = array();
-
-    /**
-     * Array of all recipients
-     * @var array
-     */
-    protected $_recipients = array();
-
-    /**
-     * Reply-To header
-     * @var string
-     */
-    protected $_replyTo = null;
-
-    /**
-     * Return-Path header
-     * @var string
-     */
-    protected $_returnPath = null;
-
-    /**
-     * Subject: header
-     * @var string
-     */
-    protected $_subject = null;
-
-    /**
-     * Date: header
-     * @var string
-     */
-    protected $_date = null;
-
-    /**
-     * Message-ID: header
-     * @var string
-     */
-    protected $_messageId = null;
-
-    /**
-     * text/plain MIME part
-     * @var false|Zend_Mime_Part
-     */
-    protected $_bodyText = false;
-
-    /**
-     * text/html MIME part
-     * @var false|Zend_Mime_Part
-     */
-    protected $_bodyHtml = false;
-
-    /**
-     * MIME boundary string
-     * @var string
-     */
-    protected $_mimeBoundary = null;
-
-    /**
-     * Content type of the message
-     * @var string
-     */
-    protected $_type = null;
-
-    /**#@-*/
-
-    /**
-     * Flag: whether or not email has attachments
-     * @var boolean
-     */
-    public $hasAttachments = false;
-
-
-    /**
-     * Sets the default mail transport for all following uses of
-     * Zend_Mail::send();
-     *
-     * @todo Allow passing a string to indicate the transport to load
-     * @todo Allow passing in optional options for the transport to load
-     * @param  Zend_Mail_Transport_Abstract $transport
-     */
-    public static function setDefaultTransport(Zend_Mail_Transport_Abstract $transport)
-    {
-        self::$_defaultTransport = $transport;
-    }
-
-    /**
-     * Gets the default mail transport for all following uses of
-     * unittests
-     *
-     * @todo Allow passing a string to indicate the transport to load
-     * @todo Allow passing in optional options for the transport to load
-     */
-    public static function getDefaultTransport()
-    {
-        return self::$_defaultTransport;
-    }
-
-    /**
-     * Clear the default transport property
-     */
-    public static function clearDefaultTransport()
-    {
-        self::$_defaultTransport = null;
-    }
-
-    /**
-     * Public constructor
-     *
-     * @param string $charset
-     */
-    public function __construct($charset = 'iso-8859-1')
-    {
-        $this->_charset = $charset;
-    }
-
-    /**
-     * Return charset string
-     *
-     * @return string
-     */
-    public function getCharset()
-    {
-        return $this->_charset;
-    }
-
-    /**
-     * Set content type
-     *
-     * Should only be used for manually setting multipart content types.
-     *
-     * @param  string $type Content type
-     * @return Zend_Mail Implements fluent interface
-     * @throws Zend_Mail_Exception for types not supported by Zend_Mime
-     */
-    public function setType($type)
-    {
-        $allowed = array(
-            Zend_Mime::MULTIPART_ALTERNATIVE,
-            Zend_Mime::MULTIPART_MIXED,
-            Zend_Mime::MULTIPART_RELATED,
-        );
-        if (!in_array($type, $allowed)) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Invalid content type "' . $type . '"');
-        }
-
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Get content type of the message
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set an arbitrary mime boundary for the message
-     *
-     * If not set, Zend_Mime will generate one.
-     *
-     * @param  string    $boundary
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function setMimeBoundary($boundary)
-    {
-        $this->_mimeBoundary = $boundary;
-
-        return $this;
-    }
-
-    /**
-     * Return the boundary string used for the message
-     *
-     * @return string
-     */
-    public function getMimeBoundary()
-    {
-        return $this->_mimeBoundary;
-    }
-
-    /**
-     * Return encoding of mail headers
-     *
-     * @deprecated use {@link getHeaderEncoding()} instead
-     * @return string
-     */
-    public function getEncodingOfHeaders()
-    {
-        return $this->getHeaderEncoding();
-    }
-
-    /**
-     * Return the encoding of mail headers
-     *
-     * Either Zend_Mime::ENCODING_QUOTEDPRINTABLE or Zend_Mime::ENCODING_BASE64
-     *
-     * @return string
-     */
-    public function getHeaderEncoding()
-    {
-        return $this->_headerEncoding;
-    }
-
-    /**
-     * Set the encoding of mail headers
-     *
-     * @deprecated Use {@link setHeaderEncoding()} instead.
-     * @param  string $encoding
-     * @return Zend_Mail
-     */
-    public function setEncodingOfHeaders($encoding)
-    {
-        return $this->setHeaderEncoding($encoding);
-    }
-
-    /**
-     * Set the encoding of mail headers
-     *
-     * @param  string $encoding Zend_Mime::ENCODING_QUOTEDPRINTABLE or Zend_Mime::ENCODING_BASE64
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function setHeaderEncoding($encoding)
-    {
-        $allowed = array(
-            Zend_Mime::ENCODING_BASE64,
-            Zend_Mime::ENCODING_QUOTEDPRINTABLE
-        );
-        if (!in_array($encoding, $allowed)) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Invalid encoding "' . $encoding . '"');
-        }
-        $this->_headerEncoding = $encoding;
-
-        return $this;
-    }
-
-    /**
-     * Sets the text body for the message.
-     *
-     * @param  string $txt
-     * @param  string $charset
-     * @param  string $encoding
-     * @return Zend_Mail Provides fluent interface
-    */
-    public function setBodyText($txt, $charset = null, $encoding = Zend_Mime::ENCODING_QUOTEDPRINTABLE)
-    {
-        if ($charset === null) {
-            $charset = $this->_charset;
-        }
-
-        $mp = new Zend_Mime_Part($txt);
-        $mp->encoding = $encoding;
-        $mp->type = Zend_Mime::TYPE_TEXT;
-        $mp->disposition = Zend_Mime::DISPOSITION_INLINE;
-        $mp->charset = $charset;
-
-        $this->_bodyText = $mp;
-
-        return $this;
-    }
-
-    /**
-     * Return text body Zend_Mime_Part or string
-     *
-     * @param  bool textOnly Whether to return just the body text content or the MIME part; defaults to false, the MIME part
-     * @return false|Zend_Mime_Part|string
-     */
-    public function getBodyText($textOnly = false)
-    {
-        if ($textOnly && $this->_bodyText) {
-            $body = $this->_bodyText;
-            return $body->getContent();
-        }
-
-        return $this->_bodyText;
-    }
-
-    /**
-     * Sets the HTML body for the message
-     *
-     * @param  string    $html
-     * @param  string    $charset
-     * @param  string    $encoding
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function setBodyHtml($html, $charset = null, $encoding = Zend_Mime::ENCODING_QUOTEDPRINTABLE)
-    {
-        if ($charset === null) {
-            $charset = $this->_charset;
-        }
-
-        $mp = new Zend_Mime_Part($html);
-        $mp->encoding = $encoding;
-        $mp->type = Zend_Mime::TYPE_HTML;
-        $mp->disposition = Zend_Mime::DISPOSITION_INLINE;
-        $mp->charset = $charset;
-
-        $this->_bodyHtml = $mp;
-
-        return $this;
-    }
-
-    /**
-     * Return Zend_Mime_Part representing body HTML
-     *
-     * @param  bool $htmlOnly Whether to return the body HTML only, or the MIME part; defaults to false, the MIME part
-     * @return false|Zend_Mime_Part|string
-     */
-    public function getBodyHtml($htmlOnly = false)
-    {
-        if ($htmlOnly && $this->_bodyHtml) {
-            $body = $this->_bodyHtml;
-            return $body->getContent();
-        }
-
-        return $this->_bodyHtml;
-    }
-
-    /**
-     * Adds an existing attachment to the mail message
-     *
-     * @param  Zend_Mime_Part $attachment
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function addAttachment(Zend_Mime_Part $attachment)
-    {
-        $this->addPart($attachment);
-        $this->hasAttachments = true;
-
-        return $this;
-    }
-
-    /**
-     * Creates a Zend_Mime_Part attachment
-     *
-     * Attachment is automatically added to the mail object after creation. The
-     * attachment object is returned to allow for further manipulation.
-     *
-     * @param  string         $body
-     * @param  string         $mimeType
-     * @param  string         $disposition
-     * @param  string         $encoding
-     * @param  string         $filename OPTIONAL A filename for the attachment
-     * @return Zend_Mime_Part Newly created Zend_Mime_Part object (to allow
-     * advanced settings)
-     */
-    public function createAttachment($body,
-                                     $mimeType    = Zend_Mime::TYPE_OCTETSTREAM,
-                                     $disposition = Zend_Mime::DISPOSITION_ATTACHMENT,
-                                     $encoding    = Zend_Mime::ENCODING_BASE64,
-                                     $filename    = null)
-    {
-
-        $mp = new Zend_Mime_Part($body);
-        $mp->encoding = $encoding;
-        $mp->type = $mimeType;
-        $mp->disposition = $disposition;
-        $mp->filename = $filename;
-
-        $this->addAttachment($mp);
-
-        return $mp;
-    }
-
-    /**
-     * Return a count of message parts
-     *
-     * @return integer
-     */
-    public function getPartCount()
-    {
-        return count($this->_parts);
-    }
-
-    /**
-     * Encode header fields
-     *
-     * Encodes header content according to RFC1522 if it contains non-printable
-     * characters.
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _encodeHeader($value)
-    {
-        if (Zend_Mime::isPrintable($value) === false) {
-            if ($this->getHeaderEncoding() === Zend_Mime::ENCODING_QUOTEDPRINTABLE) {
-                $value = Zend_Mime::encodeQuotedPrintableHeader($value, $this->getCharset(), Zend_Mime::LINELENGTH, Zend_Mime::LINEEND);
-            } else {
-                $value = Zend_Mime::encodeBase64Header($value, $this->getCharset(), Zend_Mime::LINELENGTH, Zend_Mime::LINEEND);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Add a header to the message
-     *
-     * Adds a header to this message. If append is true and the header already
-     * exists, raises a flag indicating that the header should be appended.
-     *
-     * @param string  $headerName
-     * @param string  $value
-     * @param bool $append
-     */
-    protected function _storeHeader($headerName, $value, $append = false)
-    {
-        if (isset($this->_headers[$headerName])) {
-            $this->_headers[$headerName][] = $value;
-        } else {
-            $this->_headers[$headerName] = array($value);
-        }
-
-        if ($append) {
-            $this->_headers[$headerName]['append'] = true;
-        }
-
-    }
-
-    /**
-     * Clear header from the message
-     *
-     * @param string $headerName
-     */
-    protected function _clearHeader($headerName)
-    {
-        if (isset($this->_headers[$headerName])){
-            unset($this->_headers[$headerName]);
-        }
-    }
-
-    /**
-     * Helper function for adding a recipient and the corresponding header
-     *
-     * @param string $headerName
-     * @param string $email
-     * @param string $name
-     */
-    protected function _addRecipientAndHeader($headerName, $email, $name)
-    {
-        $email = $this->_filterEmail($email);
-        $name  = $this->_filterName($name);
-        // prevent duplicates
-        $this->_recipients[$email] = 1;
-        $this->_storeHeader($headerName, $this->_formatAddress($email, $name), true);
-    }
-
-    /**
-     * Adds To-header and recipient, $email can be an array, or a single string address
-     *
-     * @param  string|array $email
-     * @param  string $name
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function addTo($email, $name='')
-    {
-        if (!is_array($email)) {
-            $email = array($name => $email);
-        }
-
-        foreach ($email as $n => $recipient) {
-            $this->_addRecipientAndHeader('To', $recipient, is_int($n) ? '' : $n);
-            $this->_to[] = $recipient;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds Cc-header and recipient, $email can be an array, or a single string address
-     *
-     * @param  string|array    $email
-     * @param  string    $name
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function addCc($email, $name='')
-    {
-        if (!is_array($email)) {
-            $email = array($name => $email);
-        }
-
-        foreach ($email as $n => $recipient) {
-            $this->_addRecipientAndHeader('Cc', $recipient, is_int($n) ? '' : $n);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds Bcc recipient, $email can be an array, or a single string address
-     *
-     * @param  string|array    $email
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function addBcc($email)
-    {
-        if (!is_array($email)) {
-            $email = array($email);
-        }
-
-        foreach ($email as $recipient) {
-            $this->_addRecipientAndHeader('Bcc', $recipient, '');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return list of recipient email addresses
-     *
-     * @return array (of strings)
-     */
-    public function getRecipients()
-    {
-        return array_keys($this->_recipients);
-    }
-
-    /**
-     * Clears list of recipient email addresses
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function clearRecipients()
-    {
-        $this->_recipients = array();
-        $this->_to = array();
-
-        $this->_clearHeader('To');
-        $this->_clearHeader('Cc');
-        $this->_clearHeader('Bcc');
-
-        return $this;
-    }
-
-    /**
-     * Sets From-header and sender of the message
-     *
-     * @param  string    $email
-     * @param  string    $name
-     * @return Zend_Mail Provides fluent interface
-     * @throws Zend_Mail_Exception if called subsequent times
-     */
-    public function setFrom($email, $name = null)
-    {
-        if (null !== $this->_from) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('From Header set twice');
-        }
-
-        $email = $this->_filterEmail($email);
-        $name  = $this->_filterName($name);
-        $this->_from = $email;
-        $this->_storeHeader('From', $this->_formatAddress($email, $name), true);
-
-        return $this;
-    }
-
-    /**
-     * Set Reply-To Header
-     *
-     * @param string $email
-     * @param string $name
-     * @return Zend_Mail
-     * @throws Zend_Mail_Exception if called more than one time
-     */
-    public function setReplyTo($email, $name = null)
-    {
-        if (null !== $this->_replyTo) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Reply-To Header set twice');
-        }
-
-        $email = $this->_filterEmail($email);
-        $name  = $this->_filterName($name);
-        $this->_replyTo = $email;
-        $this->_storeHeader('Reply-To', $this->_formatAddress($email, $name), true);
-
-        return $this;
-    }
-
-    /**
-     * Returns the sender of the mail
-     *
-     * @return string
-     */
-    public function getFrom()
-    {
-        return $this->_from;
-    }
-
-    /**
-     * Returns the current Reply-To address of the message
-     *
-     * @return string|null Reply-To address, null when not set
-     */
-    public function getReplyTo()
-    {
-        return $this->_replyTo;
-    }
-
-    /**
-     * Clears the sender from the mail
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function clearFrom()
-    {
-        $this->_from = null;
-        $this->_clearHeader('From');
-
-        return $this;
-    }
-
-     /**
-      * Clears the current Reply-To address from the message
-      *
-      * @return Zend_Mail Provides fluent interface
-      */
-    public function clearReplyTo()
-    {
-        $this->_replyTo = null;
-        $this->_clearHeader('Reply-To');
-
-        return $this;
-    }
-
-    /**
-     * Sets Default From-email and name of the message
-     *
-     * @param  string               $email
-     * @param  string    Optional   $name
-     * @return void
-     */
-    public static function setDefaultFrom($email, $name = null)
-    {
-        self::$_defaultFrom = array('email' => $email, 'name' => $name);
-    }
-
-    /**
-     * Returns the default sender of the mail
-     *
-     * @return null|array   Null if none was set.
-     */
-    public static function getDefaultFrom()
-    {
-        return self::$_defaultFrom;
-    }
-
-    /**
-     * Clears the default sender from the mail
-     *
-     * @return void
-     */
-    public static function clearDefaultFrom()
-    {
-        self::$_defaultFrom = null;
-    }
-
-    /**
-     * Sets From-name and -email based on the defaults
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function setFromToDefaultFrom() {
-        $from = self::getDefaultFrom();
-        if($from === null) {
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception(
-                'No default From Address set to use');
-        }
-
-        $this->setFrom($from['email'], $from['name']);
-
-        return $this;
-    }
-
-    /**
-     * Sets Default ReplyTo-address and -name of the message
-     *
-     * @param  string               $email
-     * @param  string    Optional   $name
-     * @return void
-     */
-    public static function setDefaultReplyTo($email, $name = null)
-    {
-        self::$_defaultReplyTo = array('email' => $email, 'name' => $name);
-    }
-
-    /**
-     * Returns the default Reply-To Address and Name of the mail
-     *
-     * @return null|array   Null if none was set.
-     */
-    public static function getDefaultReplyTo()
-    {
-        return self::$_defaultReplyTo;
-    }
-
-    /**
-     * Clears the default ReplyTo-address and -name from the mail
-     *
-     * @return void
-     */
-    public static function clearDefaultReplyTo()
-    {
-        self::$_defaultReplyTo = null;
-    }
-
-    /**
-     * Sets ReplyTo-name and -email based on the defaults
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function setReplyToFromDefault() {
-        $replyTo = self::getDefaultReplyTo();
-        if($replyTo === null) {
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception(
-                'No default Reply-To Address set to use');
-        }
-
-        $this->setReplyTo($replyTo['email'], $replyTo['name']);
-
-        return $this;
-    }
-
-    /**
-     * Sets the Return-Path header of the message
-     *
-     * @param  string    $email
-     * @return Zend_Mail Provides fluent interface
-     * @throws Zend_Mail_Exception if set multiple times
-     */
-    public function setReturnPath($email)
-    {
-        if ($this->_returnPath === null) {
-            $email = $this->_filterEmail($email);
-            $this->_returnPath = $email;
-            $this->_storeHeader('Return-Path', $email, false);
-        } else {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Return-Path Header set twice');
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the current Return-Path address of the message
-     *
-     * If no Return-Path header is set, returns the value of {@link $_from}.
-     *
-     * @return string
-     */
-    public function getReturnPath()
-    {
-        if (null !== $this->_returnPath) {
-            return $this->_returnPath;
-        }
-
-        return $this->_from;
-    }
-
-    /**
-     * Clears the current Return-Path address from the message
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function clearReturnPath()
-    {
-        $this->_returnPath = null;
-        $this->_clearHeader('Return-Path');
-
-        return $this;
-    }
-
-    /**
-     * Sets the subject of the message
-     *
-     * @param   string    $subject
-     * @return  Zend_Mail Provides fluent interface
-     * @throws  Zend_Mail_Exception
-     */
-    public function setSubject($subject)
-    {
-        if ($this->_subject === null) {
-            $subject = $this->_filterOther($subject);
-            $this->_subject = $this->_encodeHeader($subject);
-            $this->_storeHeader('Subject', $this->_subject);
-        } else {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Subject set twice');
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the encoded subject of the message
-     *
-     * @return string
-     */
-    public function getSubject()
-    {
-        return $this->_subject;
-    }
-
-    /**
-     * Clears the encoded subject from the message
-     *
-     * @return  Zend_Mail Provides fluent interface
-     */
-    public function clearSubject()
-    {
-        $this->_subject = null;
-        $this->_clearHeader('Subject');
-
-        return $this;
-    }
-
-    /**
-     * Sets Date-header
-     *
-     * @param  timestamp|string|Zend_Date $date
-     * @return Zend_Mail Provides fluent interface
-     * @throws Zend_Mail_Exception if called subsequent times or wrong date format.
-     */
-    public function setDate($date = null)
-    {
-        if ($this->_date === null) {
-            if ($date === null) {
-                $date = date('r');
-            } else if (is_int($date)) {
-                $date = date('r', $date);
-            } else if (is_string($date)) {
-                $date = strtotime($date);
-                if ($date === false || $date < 0) {
-                    /**
-                     * @see Zend_Mail_Exception
-                     */
-                    require_once 'Zend/Mail/Exception.php';
-                    throw new Zend_Mail_Exception('String representations of Date Header must be ' .
-                                                  'strtotime()-compatible');
-                }
-                $date = date('r', $date);
-            } else if ($date instanceof Zend_Date) {
-                $date = $date->get(Zend_Date::RFC_2822);
-            } else {
-                /**
-                 * @see Zend_Mail_Exception
-                 */
-                require_once 'Zend/Mail/Exception.php';
-                throw new Zend_Mail_Exception(__METHOD__ . ' only accepts UNIX timestamps, Zend_Date objects, ' .
-                                              ' and strtotime()-compatible strings');
-            }
-            $this->_date = $date;
-            $this->_storeHeader('Date', $date);
-        } else {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Date Header set twice');
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the formatted date of the message
-     *
-     * @return string
-     */
-    public function getDate()
-    {
-        return $this->_date;
-    }
-
-    /**
-     * Clears the formatted date from the message
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function clearDate()
-    {
-        $this->_date = null;
-        $this->_clearHeader('Date');
-
-        return $this;
-    }
-
-    /**
-     * Sets the Message-ID of the message
-     *
-     * @param   boolean|string  $id
-     * true  :Auto
-     * false :No set
-     * null  :No set
-     * string:Sets given string (Angle brackets is not necessary)
-     * @return  Zend_Mail Provides fluent interface
-     * @throws  Zend_Mail_Exception
-     */
-    public function setMessageId($id = true)
-    {
-        if ($id === null || $id === false) {
-            return $this;
-        } elseif ($id === true) {
-            $id = $this->createMessageId();
-        }
-
-        if ($this->_messageId === null) {
-            $id = $this->_filterOther($id);
-            $this->_messageId = $id;
-            $this->_storeHeader('Message-Id', '<' . $this->_messageId . '>');
-        } else {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Message-ID set twice');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the Message-ID of the message
-     *
-     * @return string
-     */
-    public function getMessageId()
-    {
-        return $this->_messageId;
-    }
-
-
-    /**
-     * Clears the Message-ID from the message
-     *
-     * @return Zend_Mail Provides fluent interface
-     */
-    public function clearMessageId()
-    {
-        $this->_messageId = null;
-        $this->_clearHeader('Message-Id');
-
-        return $this;
-    }
-
-    /**
-     * Creates the Message-ID
-     *
-     * @return string
-     */
-    public function createMessageId() {
-
-        $time = time();
-
-        if ($this->_from !== null) {
-            $user = $this->_from;
-        } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-            $user = $_SERVER['REMOTE_ADDR'];
-        } else {
-            $user = getmypid();
-        }
-
-        $rand = mt_rand();
-
-        if ($this->_recipients !== array()) {
-            $recipient = array_rand($this->_recipients);
-        } else {
-            $recipient = 'unknown';
-        }
-
-        if (isset($_SERVER["SERVER_NAME"])) {
-            $hostName = $_SERVER["SERVER_NAME"];
-        } else {
-            $hostName = php_uname('n');
-        }
-
-        return sha1($time . $user . $rand . $recipient) . '@' . $hostName;
-    }
-
-    /**
-     * Add a custom header to the message
-     *
-     * @param  string              $name
-     * @param  string              $value
-     * @param  boolean             $append
-     * @return Zend_Mail           Provides fluent interface
-     * @throws Zend_Mail_Exception on attempts to create standard headers
-     */
-    public function addHeader($name, $value, $append = false)
-    {
-        $prohibit = array('to', 'cc', 'bcc', 'from', 'subject',
-                          'reply-to', 'return-path',
-                          'date', 'message-id',
-                         );
-        if (in_array(strtolower($name), $prohibit)) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('Cannot set standard header from addHeader()');
-        }
-
-        $value = $this->_filterOther($value);
-        $value = $this->_encodeHeader($value);
-        $this->_storeHeader($name, $value, $append);
-
-        return $this;
-    }
-
-    /**
-     * Return mail headers
-     *
-     * @return void
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Sends this email using the given transport or a previously
-     * set DefaultTransport or the internal mail function if no
-     * default transport had been set.
-     *
-     * @param  Zend_Mail_Transport_Abstract $transport
-     * @return Zend_Mail                    Provides fluent interface
-     */
-    public function send($transport = null)
-    {
-        if ($transport === null) {
-            if (! self::$_defaultTransport instanceof Zend_Mail_Transport_Abstract) {
-                require_once 'Zend/Mail/Transport/Sendmail.php';
-                $transport = new Zend_Mail_Transport_Sendmail();
-            } else {
-                $transport = self::$_defaultTransport;
-            }
-        }
-
-        if ($this->_date === null) {
-            $this->setDate();
-        }
-
-        if(null === $this->_from && null !== self::getDefaultFrom()) {
-            $this->setFromToDefaultFrom();
-        }
-
-        if(null === $this->_replyTo && null !== self::getDefaultReplyTo()) {
-            $this->setReplyToFromDefault();
-        }
-
-        $transport->send($this);
-
-        return $this;
-    }
-
-    /**
-     * Filter of email data
-     *
-     * @param string $email
-     * @return string
-     */
-    protected function _filterEmail($email)
-    {
-        $rule = array("\r" => '',
-                      "\n" => '',
-                      "\t" => '',
-                      '"'  => '',
-                      ','  => '',
-                      '<'  => '',
-                      '>'  => '',
-        );
-
-        return strtr($email, $rule);
-    }
-
-    /**
-     * Filter of name data
-     *
-     * @param string $name
-     * @return string
-     */
-    protected function _filterName($name)
-    {
-        $rule = array("\r" => '',
-                      "\n" => '',
-                      "\t" => '',
-                      '"'  => "'",
-                      '<'  => '[',
-                      '>'  => ']',
-        );
-
-        return trim(strtr($name, $rule));
-    }
-
-    /**
-     * Filter of other data
-     *
-     * @param string $data
-     * @return string
-     */
-    protected function _filterOther($data)
-    {
-        $rule = array("\r" => '',
-                      "\n" => '',
-                      "\t" => '',
-        );
-
-        return strtr($data, $rule);
-    }
-
-    /**
-     * Formats e-mail address
-     *
-     * @param string $email
-     * @param string $name
-     * @return string
-     */
-    protected function _formatAddress($email, $name)
-    {
-        if ($name === '' || $name === null || $name === $email) {
-            return $email;
-        } else {
-            $encodedName = $this->_encodeHeader($name);
-            if ($encodedName === $name &&
-                    ((strpos($name, '@') !== false) || (strpos($name, ',') !== false))) {
-                $format = '"%s" <%s>';
-            } else {
-                $format = '%s <%s>';
-            }
-            return sprintf($format, $encodedName, $email);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Mail/Exception.php b/airtime_mvc/library/Zend/Mail/Exception.php
deleted file mode 100644
index 470fc3d54..000000000
--- a/airtime_mvc/library/Zend/Mail/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Mail/Message.php b/airtime_mvc/library/Zend/Mail/Message.php
deleted file mode 100644
index 2bb96bc2f..000000000
--- a/airtime_mvc/library/Zend/Mail/Message.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Mail_Part
- */
-require_once 'Zend/Mail/Part.php';
-
-/**
- * Zend_Mail_Message_Interface
- */
-require_once 'Zend/Mail/Message/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Interface
-{
-    /**
-     * flags for this message
-     * @var array
-     */
-    protected $_flags = array();
-
-    /**
-     * Public constructor
-     *
-     * In addition to the parameters of Zend_Mail_Part::__construct() this constructor supports:
-     * - file  filename or file handle of a file with raw message content
-     * - flags array with flags for message, keys are ignored, use constants defined in Zend_Mail_Storage
-     *
-     * @param  string $rawMessage  full message with or without headers
-     * @throws Zend_Mail_Exception
-     */
-    public function __construct(array $params)
-    {
-        if (isset($params['file'])) {
-            if (!is_resource($params['file'])) {
-                $params['raw'] = @file_get_contents($params['file']);
-                if ($params['raw'] === false) {
-                    /**
-                     * @see Zend_Mail_Exception
-                     */
-                    require_once 'Zend/Mail/Exception.php';
-                    throw new Zend_Mail_Exception('could not open file');
-                }
-            } else {
-                $params['raw'] = stream_get_contents($params['file']);
-            }
-        }
-
-        if (!empty($params['flags'])) {
-            // set key and value to the same value for easy lookup
-            $this->_flags = array_combine($params['flags'], $params['flags']);
-        }
-
-        parent::__construct($params);
-    }
-
-    /**
-     * return toplines as found after headers
-     *
-     * @return string toplines
-     */
-    public function getTopLines()
-    {
-        return $this->_topLines;
-    }
-
-    /**
-     * check if flag is set
-     *
-     * @param mixed $flag a flag name, use constants defined in Zend_Mail_Storage
-     * @return bool true if set, otherwise false
-     */
-    public function hasFlag($flag)
-    {
-        return isset($this->_flags[$flag]);
-    }
-
-    /**
-     * get all set flags
-     *
-     * @return array array with flags, key and value are the same for easy lookup
-     */
-    public function getFlags()
-    {
-        return $this->_flags;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Message/File.php b/airtime_mvc/library/Zend/Mail/Message/File.php
deleted file mode 100644
index 3714f9ecf..000000000
--- a/airtime_mvc/library/Zend/Mail/Message/File.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Mail_Part
- */
-require_once 'Zend/Mail/Part/File.php';
-
-/**
- * Zend_Mail_Message_Interface
- */
-require_once 'Zend/Mail/Message/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Message_File extends Zend_Mail_Part_File implements Zend_Mail_Message_Interface
-{
-    /**
-     * flags for this message
-     * @var array
-     */
-    protected $_flags = array();
-
-    /**
-     * Public constructor
-     *
-     * In addition to the parameters of Zend_Mail_Part::__construct() this constructor supports:
-     * - flags array with flags for message, keys are ignored, use constants defined in Zend_Mail_Storage
-     *
-     * @param  string $rawMessage  full message with or without headers
-     * @throws Zend_Mail_Exception
-     */
-    public function __construct(array $params)
-    {
-        if (!empty($params['flags'])) {
-            // set key and value to the same value for easy lookup
-            $this->_flags = array_combine($params['flags'], $params['flags']);
-        }
-
-        parent::__construct($params);
-    }
-
-    /**
-     * return toplines as found after headers
-     *
-     * @return string toplines
-     */
-    public function getTopLines()
-    {
-        return $this->_topLines;
-    }
-
-    /**
-     * check if flag is set
-     *
-     * @param mixed $flag a flag name, use constants defined in Zend_Mail_Storage
-     * @return bool true if set, otherwise false
-     */
-    public function hasFlag($flag)
-    {
-        return isset($this->_flags[$flag]);
-    }
-
-    /**
-     * get all set flags
-     *
-     * @return array array with flags, key and value are the same for easy lookup
-     */
-    public function getFlags()
-    {
-        return $this->_flags;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Message/Interface.php b/airtime_mvc/library/Zend/Mail/Message/Interface.php
deleted file mode 100644
index 833be6b44..000000000
--- a/airtime_mvc/library/Zend/Mail/Message/Interface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-interface Zend_Mail_Message_Interface
-{
-    /**
-     * return toplines as found after headers
-     *
-     * @return string toplines
-     */
-    public function getTopLines();
-
-    /**
-     * check if flag is set
-     *
-     * @param mixed $flag a flag name, use constants defined in Zend_Mail_Storage
-     * @return bool true if set, otherwise false
-     */
-    public function hasFlag($flag);
-
-    /**
-     * get all set flags
-     *
-     * @return array array with flags, key and value are the same for easy lookup
-     */
-    public function getFlags();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Mail/Part.php b/airtime_mvc/library/Zend/Mail/Part.php
deleted file mode 100644
index 51818e71e..000000000
--- a/airtime_mvc/library/Zend/Mail/Part.php
+++ /dev/null
@@ -1,520 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mime_Decode
- */
-require_once 'Zend/Mime/Decode.php';
-
-/**
- * @see Zend_Mail_Part_Interface
- */
-require_once 'Zend/Mail/Part/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface
-{
-    /**
-     * headers of part as array
-     * @var null|array
-     */
-    protected $_headers;
-
-    /**
-     * raw part body
-     * @var null|string
-     */
-    protected $_content;
-
-    /**
-     * toplines as fetched with headers
-     * @var string
-     */
-    protected $_topLines = '';
-
-    /**
-     * parts of multipart message
-     * @var array
-     */
-    protected $_parts = array();
-
-    /**
-     * count of parts of a multipart message
-     * @var null|int
-     */
-    protected $_countParts;
-
-    /**
-     * current position of iterator
-     * @var int
-     */
-    protected $_iterationPos = 1;
-
-    /**
-     * mail handler, if late fetch is active
-     * @var null|Zend_Mail_Storage_Abstract
-     */
-    protected $_mail;
-
-    /**
-     * message number for mail handler
-     * @var int
-     */
-    protected $_messageNum = 0;
-
-    /**
-     * Public constructor
-     *
-     * Zend_Mail_Part supports different sources for content. The possible params are:
-     * - handler    a instance of Zend_Mail_Storage_Abstract for late fetch
-     * - id         number of message for handler
-     * - raw        raw content with header and body as string
-     * - headers    headers as array (name => value) or string, if a content part is found it's used as toplines
-     * - noToplines ignore content found after headers in param 'headers'
-     * - content    content as string
-     *
-     * @param   array $params  full message with or without headers
-     * @throws  Zend_Mail_Exception
-     */
-    public function __construct(array $params)
-    {
-        if (isset($params['handler'])) {
-            if (!$params['handler'] instanceof Zend_Mail_Storage_Abstract) {
-                /**
-                 * @see Zend_Mail_Exception
-                 */
-                require_once 'Zend/Mail/Exception.php';
-                throw new Zend_Mail_Exception('handler is not a valid mail handler');
-            }
-            if (!isset($params['id'])) {
-                /**
-                 * @see Zend_Mail_Exception
-                 */
-                require_once 'Zend/Mail/Exception.php';
-                throw new Zend_Mail_Exception('need a message id with a handler');
-            }
-
-            $this->_mail       = $params['handler'];
-            $this->_messageNum = $params['id'];
-        }
-
-        if (isset($params['raw'])) {
-            Zend_Mime_Decode::splitMessage($params['raw'], $this->_headers, $this->_content);
-        } else if (isset($params['headers'])) {
-            if (is_array($params['headers'])) {
-                $this->_headers = $params['headers'];
-            } else {
-                if (!empty($params['noToplines'])) {
-                    Zend_Mime_Decode::splitMessage($params['headers'], $this->_headers, $null);
-                } else {
-                    Zend_Mime_Decode::splitMessage($params['headers'], $this->_headers, $this->_topLines);
-                }
-            }
-            if (isset($params['content'])) {
-                $this->_content = $params['content'];
-            }
-        }
-    }
-
-    /**
-     * Check if part is a multipart message
-     *
-     * @return bool if part is multipart
-     */
-    public function isMultipart()
-    {
-        try {
-            return stripos($this->contentType, 'multipart/') === 0;
-        } catch(Zend_Mail_Exception $e) {
-            return false;
-        }
-    }
-
-
-    /**
-     * Body of part
-     *
-     * If part is multipart the raw content of this part with all sub parts is returned
-     *
-     * @return string body
-     * @throws Zend_Mail_Exception
-     */
-    public function getContent()
-    {
-        if ($this->_content !== null) {
-            return $this->_content;
-        }
-
-        if ($this->_mail) {
-            return $this->_mail->getRawContent($this->_messageNum);
-        } else {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('no content');
-        }
-    }
-
-    /**
-     * Return size of part
-     *
-     * Quite simple implemented currently (not decoding). Handle with care.
-     *
-     * @return int size
-     */
-    public function getSize() {
-        return strlen($this->getContent());
-    }
-
-
-    /**
-     * Cache content and split in parts if multipart
-     *
-     * @return null
-     * @throws Zend_Mail_Exception
-     */
-    protected function _cacheContent()
-    {
-        // caching content if we can't fetch parts
-        if ($this->_content === null && $this->_mail) {
-            $this->_content = $this->_mail->getRawContent($this->_messageNum);
-        }
-
-        if (!$this->isMultipart()) {
-            return;
-        }
-
-        // split content in parts
-        $boundary = $this->getHeaderField('content-type', 'boundary');
-        if (!$boundary) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('no boundary found in content type to split message');
-        }
-        $parts = Zend_Mime_Decode::splitMessageStruct($this->_content, $boundary);
-        if ($parts === null) {
-            return;
-        }
-        $counter = 1;
-        foreach ($parts as $part) {
-            $this->_parts[$counter++] = new self(array('headers' => $part['header'], 'content' => $part['body']));
-        }
-    }
-
-    /**
-     * Get part of multipart message
-     *
-     * @param  int $num number of part starting with 1 for first part
-     * @return Zend_Mail_Part wanted part
-     * @throws Zend_Mail_Exception
-     */
-    public function getPart($num)
-    {
-        if (isset($this->_parts[$num])) {
-            return $this->_parts[$num];
-        }
-
-        if (!$this->_mail && $this->_content === null) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('part not found');
-        }
-
-        if ($this->_mail && $this->_mail->hasFetchPart) {
-            // TODO: fetch part
-            // return
-        }
-
-        $this->_cacheContent();
-
-        if (!isset($this->_parts[$num])) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('part not found');
-        }
-
-        return $this->_parts[$num];
-    }
-
-    /**
-     * Count parts of a multipart part
-     *
-     * @return int number of sub-parts
-     */
-    public function countParts()
-    {
-        if ($this->_countParts) {
-            return $this->_countParts;
-        }
-
-        $this->_countParts = count($this->_parts);
-        if ($this->_countParts) {
-            return $this->_countParts;
-        }
-
-        if ($this->_mail && $this->_mail->hasFetchPart) {
-            // TODO: fetch part
-            // return
-        }
-
-        $this->_cacheContent();
-
-        $this->_countParts = count($this->_parts);
-        return $this->_countParts;
-    }
-
-
-    /**
-     * Get all headers
-     *
-     * The returned headers are as saved internally. All names are lowercased. The value is a string or an array
-     * if a header with the same name occurs more than once.
-     *
-     * @return array headers as array(name => value)
-     */
-    public function getHeaders()
-    {
-        if ($this->_headers === null) {
-            if (!$this->_mail) {
-                $this->_headers = array();
-            } else {
-                $part = $this->_mail->getRawHeader($this->_messageNum);
-                Zend_Mime_Decode::splitMessage($part, $this->_headers, $null);
-            }
-        }
-
-        return $this->_headers;
-    }
-
-    /**
-     * Get a header in specificed format
-     *
-     * Internally headers that occur more than once are saved as array, all other as string. If $format
-     * is set to string implode is used to concat the values (with Zend_Mime::LINEEND as delim).
-     *
-     * @param  string $name   name of header, matches case-insensitive, but camel-case is replaced with dashes
-     * @param  string $format change type of return value to 'string' or 'array'
-     * @return string|array value of header in wanted or internal format
-     * @throws Zend_Mail_Exception
-     */
-    public function getHeader($name, $format = null)
-    {
-        if ($this->_headers === null) {
-            $this->getHeaders();
-        }
-
-        $lowerName = strtolower($name);
-
-        if ($this->headerExists($name) == false) {
-            $lowerName = strtolower(preg_replace('%([a-z])([A-Z])%', '\1-\2', $name));
-            if($this->headerExists($lowerName) == false) {
-                /**
-                 * @see Zend_Mail_Exception
-                 */
-                require_once 'Zend/Mail/Exception.php';
-                throw new Zend_Mail_Exception("no Header with Name $name or $lowerName found");
-            }
-        }
-        $name = $lowerName;
-
-        $header = $this->_headers[$name];
-
-        switch ($format) {
-            case 'string':
-                if (is_array($header)) {
-                    $header = implode(Zend_Mime::LINEEND, $header);
-                }
-                break;
-            case 'array':
-                $header = (array)$header;
-            default:
-                // do nothing
-        }
-
-        return $header;
-    }
-
-    /**
-     * Check wheater the Mail part has a specific header.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function headerExists($name)
-    {
-        $name = strtolower($name);
-        if(isset($this->_headers[$name])) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get a specific field from a header like content type or all fields as array
-     *
-     * If the header occurs more than once, only the value from the first header
-     * is returned.
-     *
-     * Throws a Zend_Mail_Exception if the requested header does not exist. If
-     * the specific header field does not exist, returns null.
-     *
-     * @param  string $name       name of header, like in getHeader()
-     * @param  string $wantedPart the wanted part, default is first, if null an array with all parts is returned
-     * @param  string $firstName  key name for the first part
-     * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-     * @throws Zend_Exception, Zend_Mail_Exception
-     */
-    public function getHeaderField($name, $wantedPart = 0, $firstName = 0) {
-        return Zend_Mime_Decode::splitHeaderField(current($this->getHeader($name, 'array')), $wantedPart, $firstName);
-    }
-
-
-    /**
-     * Getter for mail headers - name is matched in lowercase
-     *
-     * This getter is short for Zend_Mail_Part::getHeader($name, 'string')
-     *
-     * @see Zend_Mail_Part::getHeader()
-     *
-     * @param  string $name header name
-     * @return string value of header
-     * @throws Zend_Mail_Exception
-     */
-    public function __get($name)
-    {
-        return $this->getHeader($name, 'string');
-    }
-
-    /**
-     * Isset magic method proxy to hasHeader
-     *
-     * This method is short syntax for Zend_Mail_Part::hasHeader($name);
-     *
-     * @see Zend_Mail_Part::hasHeader
-     *
-     * @param  string
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        return $this->headerExists($name);
-    }
-
-    /**
-     * magic method to get content of part
-     *
-     * @return string content
-     */
-    public function __toString()
-    {
-        return $this->getContent();
-    }
-
-    /**
-     * implements RecursiveIterator::hasChildren()
-     *
-     * @return bool current element has children/is multipart
-     */
-    public function hasChildren()
-    {
-        $current = $this->current();
-        return $current && $current instanceof Zend_Mail_Part && $current->isMultipart();
-    }
-
-    /**
-     * implements RecursiveIterator::getChildren()
-     *
-     * @return Zend_Mail_Part same as self::current()
-     */
-    public function getChildren()
-    {
-        return $this->current();
-    }
-
-    /**
-     * implements Iterator::valid()
-     *
-     * @return bool check if there's a current element
-     */
-    public function valid()
-    {
-        if ($this->_countParts === null) {
-            $this->countParts();
-        }
-        return $this->_iterationPos && $this->_iterationPos <= $this->_countParts;
-    }
-
-    /**
-     * implements Iterator::next()
-     *
-     * @return null
-     */
-    public function next()
-    {
-        ++$this->_iterationPos;
-    }
-
-    /**
-     * implements Iterator::key()
-     *
-     * @return string key/number of current part
-     */
-    public function key()
-    {
-        return $this->_iterationPos;
-    }
-
-    /**
-     * implements Iterator::current()
-     *
-     * @return Zend_Mail_Part current part
-     */
-    public function current()
-    {
-        return $this->getPart($this->_iterationPos);
-    }
-
-    /**
-     * implements Iterator::rewind()
-     *
-     * @return null
-     */
-    public function rewind()
-    {
-        $this->countParts();
-        $this->_iterationPos = 1;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Part/File.php b/airtime_mvc/library/Zend/Mail/Part/File.php
deleted file mode 100644
index 9e8700934..000000000
--- a/airtime_mvc/library/Zend/Mail/Part/File.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mime_Decode
- */
-require_once 'Zend/Mime/Decode.php';
-
-/**
- * @see Zend_Mail_Part
- */
-require_once 'Zend/Mail/Part.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Part_File extends Zend_Mail_Part
-{
-    protected $_contentPos = array();
-    protected $_partPos = array();
-    protected $_fh;
-
-    /**
-     * Public constructor
-     *
-     * This handler supports the following params:
-     * - file     filename or open file handler with message content (required)
-     * - startPos start position of message or part in file (default: current position)
-     * - endPos   end position of message or part in file (default: end of file)
-     *
-     * @param   array $params  full message with or without headers
-     * @throws  Zend_Mail_Exception
-     */
-    public function __construct(array $params)
-    {
-        if (empty($params['file'])) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('no file given in params');
-        }
-
-        if (!is_resource($params['file'])) {
-            $this->_fh = fopen($params['file'], 'r');
-        } else {
-            $this->_fh = $params['file'];
-        }
-        if (!$this->_fh) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('could not open file');
-        }
-        if (isset($params['startPos'])) {
-            fseek($this->_fh, $params['startPos']);
-        }
-        $header = '';
-        $endPos = isset($params['endPos']) ? $params['endPos'] : null;
-        while (($endPos === null || ftell($this->_fh) < $endPos) && trim($line = fgets($this->_fh))) {
-            $header .= $line;
-        }
-
-        Zend_Mime_Decode::splitMessage($header, $this->_headers, $null);
-
-        $this->_contentPos[0] = ftell($this->_fh);
-        if ($endPos !== null) {
-            $this->_contentPos[1] = $endPos;
-        } else {
-            fseek($this->_fh, 0, SEEK_END);
-            $this->_contentPos[1] = ftell($this->_fh);
-        }
-        if (!$this->isMultipart()) {
-            return;
-        }
-
-        $boundary = $this->getHeaderField('content-type', 'boundary');
-        if (!$boundary) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('no boundary found in content type to split message');
-        }
-
-        $part = array();
-        $pos = $this->_contentPos[0];
-        fseek($this->_fh, $pos);
-        while (!feof($this->_fh) && ($endPos === null || $pos < $endPos)) {
-            $line = fgets($this->_fh);
-            if ($line === false) {
-                if (feof($this->_fh)) {
-                    break;
-                }
-                /**
-                 * @see Zend_Mail_Exception
-                 */
-                require_once 'Zend/Mail/Exception.php';
-                throw new Zend_Mail_Exception('error reading file');
-            }
-
-            $lastPos = $pos;
-            $pos = ftell($this->_fh);
-            $line = trim($line);
-
-            if ($line == '--' . $boundary) {
-                if ($part) {
-                    // not first part
-                    $part[1] = $lastPos;
-                    $this->_partPos[] = $part;
-                }
-                $part = array($pos);
-            } else if ($line == '--' . $boundary . '--') {
-                $part[1] = $lastPos;
-                $this->_partPos[] = $part;
-                break;
-            }
-        }
-        $this->_countParts = count($this->_partPos);
-
-    }
-
-
-    /**
-     * Body of part
-     *
-     * If part is multipart the raw content of this part with all sub parts is returned
-     *
-     * @return string body
-     * @throws Zend_Mail_Exception
-     */
-    public function getContent($stream = null)
-    {
-        fseek($this->_fh, $this->_contentPos[0]);
-        if ($stream !== null) {
-            return stream_copy_to_stream($this->_fh, $stream, $this->_contentPos[1] - $this->_contentPos[0]);
-        }
-        $length = $this->_contentPos[1] - $this->_contentPos[0];
-        return $length < 1 ? '' : fread($this->_fh, $length);
-    }
-
-    /**
-     * Return size of part
-     *
-     * Quite simple implemented currently (not decoding). Handle with care.
-     *
-     * @return int size
-     */
-    public function getSize() {
-        return $this->_contentPos[1] - $this->_contentPos[0];
-    }
-
-    /**
-     * Get part of multipart message
-     *
-     * @param  int $num number of part starting with 1 for first part
-     * @return Zend_Mail_Part wanted part
-     * @throws Zend_Mail_Exception
-     */
-    public function getPart($num)
-    {
-        --$num;
-        if (!isset($this->_partPos[$num])) {
-            /**
-             * @see Zend_Mail_Exception
-             */
-            require_once 'Zend/Mail/Exception.php';
-            throw new Zend_Mail_Exception('part not found');
-        }
-
-        return new self(array('file' => $this->_fh, 'startPos' => $this->_partPos[$num][0],
-                              'endPos' => $this->_partPos[$num][1]));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Part/Interface.php b/airtime_mvc/library/Zend/Mail/Part/Interface.php
deleted file mode 100644
index 2d8f6f894..000000000
--- a/airtime_mvc/library/Zend/Mail/Part/Interface.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-interface Zend_Mail_Part_Interface extends RecursiveIterator
-{
-    /**
-     * Check if part is a multipart message
-     *
-     * @return bool if part is multipart
-     */
-    public function isMultipart();
-
-
-    /**
-     * Body of part
-     *
-     * If part is multipart the raw content of this part with all sub parts is returned
-     *
-     * @return string body
-     * @throws Zend_Mail_Exception
-     */
-    public function getContent();
-
-    /**
-     * Return size of part
-     *
-     * @return int size
-     */
-    public function getSize();
-
-    /**
-     * Get part of multipart message
-     *
-     * @param  int $num number of part starting with 1 for first part
-     * @return Zend_Mail_Part wanted part
-     * @throws Zend_Mail_Exception
-     */
-    public function getPart($num);
-
-    /**
-     * Count parts of a multipart part
-     *
-     * @return int number of sub-parts
-     */
-    public function countParts();
-
-
-    /**
-     * Get all headers
-     *
-     * The returned headers are as saved internally. All names are lowercased. The value is a string or an array
-     * if a header with the same name occurs more than once.
-     *
-     * @return array headers as array(name => value)
-     */
-    public function getHeaders();
-
-    /**
-     * Get a header in specificed format
-     *
-     * Internally headers that occur more than once are saved as array, all other as string. If $format
-     * is set to string implode is used to concat the values (with Zend_Mime::LINEEND as delim).
-     *
-     * @param  string $name   name of header, matches case-insensitive, but camel-case is replaced with dashes
-     * @param  string $format change type of return value to 'string' or 'array'
-     * @return string|array value of header in wanted or internal format
-     * @throws Zend_Mail_Exception
-     */
-    public function getHeader($name, $format = null);
-
-    /**
-     * Get a specific field from a header like content type or all fields as array
-     *
-     * If the header occurs more than once, only the value from the first header
-     * is returned.
-     *
-     * Throws a Zend_Mail_Exception if the requested header does not exist. If
-     * the specific header field does not exist, returns null.
-     *
-     * @param  string $name       name of header, like in getHeader()
-     * @param  string $wantedPart the wanted part, default is first, if null an array with all parts is returned
-     * @param  string $firstName  key name for the first part
-     * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-     * @throws Zend_Exception, Zend_Mail_Exception
-     */
-    public function getHeaderField($name, $wantedPart = 0, $firstName = 0);
-
-
-    /**
-     * Getter for mail headers - name is matched in lowercase
-     *
-     * This getter is short for Zend_Mail_Part::getHeader($name, 'string')
-     *
-     * @see Zend_Mail_Part::getHeader()
-     *
-     * @param  string $name header name
-     * @return string value of header
-     * @throws Zend_Mail_Exception
-     */
-    public function __get($name);
-
-    /**
-     * magic method to get content of part
-     *
-     * @return string content
-     */
-    public function __toString();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Abstract.php b/airtime_mvc/library/Zend/Mail/Protocol/Abstract.php
deleted file mode 100644
index 80c8e2fa9..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Abstract.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21635 2010-03-24 15:25:13Z yoshida@zend.co.jp $
- */
-
-
-/**
- * @see Zend_Validate
- */
-require_once 'Zend/Validate.php';
-
-
-/**
- * @see Zend_Validate_Hostname
- */
-require_once 'Zend/Validate/Hostname.php';
-
-
-/**
- * Zend_Mail_Protocol_Abstract
- *
- * Provides low-level methods for concrete adapters to communicate with a remote mail server and track requests and responses.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 21635 2010-03-24 15:25:13Z yoshida@zend.co.jp $
- * @todo Implement proxy settings
- */
-abstract class Zend_Mail_Protocol_Abstract
-{
-    /**
-     * Mail default EOL string
-     */
-    const EOL = "\r\n";
-
-
-    /**
-     * Default timeout in seconds for initiating session
-     */
-    const TIMEOUT_CONNECTION = 30;
-
-    /**
-     * Maximum of the transaction log
-     */
-    const MAXIMUM_LOG = 64;
-
-
-    /**
-     * Hostname or IP address of remote server
-     * @var string
-     */
-    protected $_host;
-
-
-    /**
-     * Port number of connection
-     * @var integer
-     */
-    protected $_port;
-
-
-    /**
-     * Instance of Zend_Validate to check hostnames
-     * @var Zend_Validate
-     */
-    protected $_validHost;
-
-
-    /**
-     * Socket connection resource
-     * @var resource
-     */
-    protected $_socket;
-
-
-    /**
-     * Last request sent to server
-     * @var string
-     */
-    protected $_request;
-
-
-    /**
-     * Array of server responses to last request
-     * @var array
-     */
-    protected $_response;
-
-
-    /**
-     * String template for parsing server responses using sscanf (default: 3 digit code and response string)
-     * @var resource
-     * @deprecated Since 1.10.3
-     */
-    protected $_template = '%d%s';
-
-
-    /**
-     * Log of mail requests and server responses for a session
-     * @var array
-     */
-    private $_log = array();
-
-
-    /**
-     * Constructor.
-     *
-     * @param  string  $host OPTIONAL Hostname of remote connection (default: 127.0.0.1)
-     * @param  integer $port OPTIONAL Port number (default: null)
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function __construct($host = '127.0.0.1', $port = null)
-    {
-        $this->_validHost = new Zend_Validate();
-        $this->_validHost->addValidator(new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL));
-
-        if (!$this->_validHost->isValid($host)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages()));
-        }
-
-        $this->_host = $host;
-        $this->_port = $port;
-    }
-
-
-    /**
-     * Class destructor to cleanup open resources
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        $this->_disconnect();
-    }
-
-
-    /**
-     * Create a connection to the remote host
-     *
-     * Concrete adapters for this class will implement their own unique connect scripts, using the _connect() method to create the socket resource.
-     */
-    abstract public function connect();
-
-
-    /**
-     * Retrieve the last client request
-     *
-     * @return string
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-
-    /**
-     * Retrieve the last server response
-     *
-     * @return array
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-
-    /**
-     * Retrieve the transaction log
-     *
-     * @return string
-     */
-    public function getLog()
-    {
-        return implode('', $this->_log);
-    }
-
-
-    /**
-     * Reset the transaction log
-     *
-     * @return void
-     */
-    public function resetLog()
-    {
-        $this->_log = array();
-    }
-
-    /**
-     * Add the transaction log
-     *
-     * @param  string new transaction
-     * @return void
-     */
-    protected function _addLog($value)
-    {
-        if (count($this->_log) >= self::MAXIMUM_LOG) {
-            array_shift($this->_log);
-        }
-
-        $this->_log[] = $value;
-    }
-
-    /**
-     * Connect to the server using the supplied transport and target
-     *
-     * An example $remote string may be 'tcp://mail.example.com:25' or 'ssh://hostname.com:2222'
-     *
-     * @param  string $remote Remote
-     * @throws Zend_Mail_Protocol_Exception
-     * @return boolean
-     */
-    protected function _connect($remote)
-    {
-        $errorNum = 0;
-        $errorStr = '';
-
-        // open connection
-        $this->_socket = @stream_socket_client($remote, $errorNum, $errorStr, self::TIMEOUT_CONNECTION);
-
-        if ($this->_socket === false) {
-            if ($errorNum == 0) {
-                $errorStr = 'Could not open socket';
-            }
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception($errorStr);
-        }
-
-        if (($result = stream_set_timeout($this->_socket, self::TIMEOUT_CONNECTION)) === false) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('Could not set stream timeout');
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Disconnect from remote host and free resource
-     *
-     * @return void
-     */
-    protected function _disconnect()
-    {
-        if (is_resource($this->_socket)) {
-            fclose($this->_socket);
-        }
-    }
-
-
-    /**
-     * Send the given request followed by a LINEEND to the server.
-     *
-     * @param  string $request
-     * @throws Zend_Mail_Protocol_Exception
-     * @return integer|boolean Number of bytes written to remote host
-     */
-    protected function _send($request)
-    {
-        if (!is_resource($this->_socket)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host);
-        }
-
-        $this->_request = $request;
-
-        $result = fwrite($this->_socket, $request . self::EOL);
-
-        // Save request to internal log
-        $this->_addLog($request . self::EOL);
-
-        if ($result === false) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('Could not send request to ' . $this->_host);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Get a line from the stream.
-     *
-     * @var    integer $timeout Per-request timeout value if applicable
-     * @throws Zend_Mail_Protocol_Exception
-     * @return string
-     */
-    protected function _receive($timeout = null)
-    {
-        if (!is_resource($this->_socket)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host);
-        }
-
-        // Adapters may wish to supply per-commend timeouts according to appropriate RFC
-        if ($timeout !== null) {
-           stream_set_timeout($this->_socket, $timeout);
-        }
-
-        // Retrieve response
-        $reponse = fgets($this->_socket, 1024);
-
-        // Save request to internal log
-        $this->_addLog($reponse);
-
-        // Check meta data to ensure connection is still valid
-        $info = stream_get_meta_data($this->_socket);
-
-        if (!empty($info['timed_out'])) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception($this->_host . ' has timed out');
-        }
-
-        if ($reponse === false) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('Could not read from ' . $this->_host);
-        }
-
-        return $reponse;
-    }
-
-
-    /**
-     * Parse server response for successful codes
-     *
-     * Read the response from the stream and check for expected return code.
-     * Throws a Zend_Mail_Protocol_Exception if an unexpected code is returned.
-     *
-     * @param  string|array $code One or more codes that indicate a successful response
-     * @throws Zend_Mail_Protocol_Exception
-     * @return string Last line of response string
-     */
-    protected function _expect($code, $timeout = null)
-    {
-        $this->_response = array();
-        $cmd  = '';
-        $more = '';
-        $msg  = '';
-        $errMsg = '';
-
-        if (!is_array($code)) {
-            $code = array($code);
-        }
-
-        do {
-            $this->_response[] = $result = $this->_receive($timeout);
-            list($cmd, $more, $msg) = preg_split('/([\s-]+)/', $result, 2, PREG_SPLIT_DELIM_CAPTURE);
-
-            if ($errMsg !== '') {
-                $errMsg .= ' ' . $msg;
-            } elseif ($cmd === null || !in_array($cmd, $code)) {
-                $errMsg =  $msg;
-            }
-
-        } while (strpos($more, '-') === 0); // The '-' message prefix indicates an information string instead of a response string.
-
-        if ($errMsg !== '') {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception($errMsg);
-        }
-
-        return $msg;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Exception.php b/airtime_mvc/library/Zend/Mail/Protocol/Exception.php
deleted file mode 100644
index 15f446836..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Mail/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Exception extends Zend_Mail_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Imap.php b/airtime_mvc/library/Zend/Mail/Protocol/Imap.php
deleted file mode 100644
index 77c2ee32c..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Imap.php
+++ /dev/null
@@ -1,838 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Imap
-{
-    /**
-     * Default timeout in seconds for initiating session
-     */
-    const TIMEOUT_CONNECTION = 30;
-
-    /**
-     * socket to imap server
-     * @var resource|null
-     */
-    protected $_socket;
-
-    /**
-     * counter for request tag
-     * @var int
-     */
-    protected $_tagCount = 0;
-
-    /**
-     * Public constructor
-     *
-     * @param  string   $host  hostname or IP address of IMAP server, if given connect() is called
-     * @param  int|null $port  port of IMAP server, null for default (143 or 993 for ssl)
-     * @param  bool     $ssl   use ssl? 'SSL', 'TLS' or false
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    function __construct($host = '', $port = null, $ssl = false)
-    {
-        if ($host) {
-            $this->connect($host, $port, $ssl);
-        }
-    }
-
-    /**
-     * Public destructor
-     */
-    public function __destruct()
-    {
-        $this->logout();
-    }
-
-    /**
-     * Open connection to IMAP server
-     *
-     * @param  string      $host  hostname or IP address of IMAP server
-     * @param  int|null    $port  of IMAP server, default is 143 (993 for ssl)
-     * @param  string|bool $ssl   use 'SSL', 'TLS' or false
-     * @return string welcome message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function connect($host, $port = null, $ssl = false)
-    {
-        if ($ssl == 'SSL') {
-            $host = 'ssl://' . $host;
-        }
-
-        if ($port === null) {
-            $port = $ssl === 'SSL' ? 993 : 143;
-        }
-
-        $errno  =  0;
-        $errstr = '';
-        $this->_socket = @fsockopen($host, $port, $errno, $errstr, self::TIMEOUT_CONNECTION);
-        if (!$this->_socket) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr .
-                                                   ' (errno = ' . $errno . ' )');
-        }
-
-        if (!$this->_assumedNextLine('* OK')) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('host doesn\'t allow connection');
-        }
-
-        if ($ssl === 'TLS') {
-            $result = $this->requestAndResponse('STARTTLS');
-            $result = $result && stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
-            if (!$result) {
-                /**
-                 * @see Zend_Mail_Protocol_Exception
-                 */
-                require_once 'Zend/Mail/Protocol/Exception.php';
-                throw new Zend_Mail_Protocol_Exception('cannot enable TLS');
-            }
-        }
-    }
-
-    /**
-     * get the next line from socket with error checking, but nothing else
-     *
-     * @return string next line
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    protected function _nextLine()
-    {
-        $line = @fgets($this->_socket);
-        if ($line === false) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('cannot read - connection closed?');
-        }
-
-        return $line;
-    }
-
-    /**
-     * get next line and assume it starts with $start. some requests give a simple
-     * feedback so we can quickly check if we can go on.
-     *
-     * @param  string $start the first bytes we assume to be in the next line
-     * @return bool line starts with $start
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    protected function _assumedNextLine($start)
-    {
-        $line = $this->_nextLine();
-        return strpos($line, $start) === 0;
-    }
-
-    /**
-     * get next line and split the tag. that's the normal case for a response line
-     *
-     * @param  string $tag tag of line is returned by reference
-     * @return string next line
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    protected function _nextTaggedLine(&$tag)
-    {
-        $line = $this->_nextLine();
-
-        // seperate tag from line
-        list($tag, $line) = explode(' ', $line, 2);
-
-        return $line;
-    }
-
-    /**
-     * split a given line in tokens. a token is literal of any form or a list
-     *
-     * @param  string $line line to decode
-     * @return array tokens, literals are returned as string, lists as array
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    protected function _decodeLine($line)
-    {
-        $tokens = array();
-        $stack = array();
-
-        /*
-            We start to decode the response here. The unterstood tokens are:
-                literal
-                "literal" or also "lit\\er\"al"
-                {bytes}<NL>literal
-                (literals*)
-            All tokens are returned in an array. Literals in braces (the last unterstood
-            token in the list) are returned as an array of tokens. I.e. the following response:
-                "foo" baz {3}<NL>bar ("f\\\"oo" bar)
-            would be returned as:
-                array('foo', 'baz', 'bar', array('f\\\"oo', 'bar'));
-
-            // TODO: add handling of '[' and ']' to parser for easier handling of response text
-        */
-        //  replace any trailling <NL> including spaces with a single space
-        $line = rtrim($line) . ' ';
-        while (($pos = strpos($line, ' ')) !== false) {
-            $token = substr($line, 0, $pos);
-            while ($token[0] == '(') {
-                array_push($stack, $tokens);
-                $tokens = array();
-                $token = substr($token, 1);
-            }
-            if ($token[0] == '"') {
-                if (preg_match('%^\(*"((.|\\\\|\\")*?)" *%', $line, $matches)) {
-                    $tokens[] = $matches[1];
-                    $line = substr($line, strlen($matches[0]));
-                    continue;
-                }
-            }
-            if ($token[0] == '{') {
-                $endPos = strpos($token, '}');
-                $chars = substr($token, 1, $endPos - 1);
-                if (is_numeric($chars)) {
-                    $token = '';
-                    while (strlen($token) < $chars) {
-                        $token .= $this->_nextLine();
-                    }
-                    $line = '';
-                    if (strlen($token) > $chars) {
-                        $line = substr($token, $chars);
-                        $token = substr($token, 0, $chars);
-                    } else {
-                        $line .= $this->_nextLine();
-                    }
-                    $tokens[] = $token;
-                    $line = trim($line) . ' ';
-                    continue;
-                }
-            }
-            if ($stack && $token[strlen($token) - 1] == ')') {
-                // closing braces are not seperated by spaces, so we need to count them
-                $braces = strlen($token);
-                $token = rtrim($token, ')');
-                // only count braces if more than one
-                $braces -= strlen($token) + 1;
-                // only add if token had more than just closing braces
-                if (rtrim($token) != '') {
-                    $tokens[] = rtrim($token);
-                }
-                $token = $tokens;
-                $tokens = array_pop($stack);
-                // special handline if more than one closing brace
-                while ($braces-- > 0) {
-                    $tokens[] = $token;
-                    $token = $tokens;
-                    $tokens = array_pop($stack);
-                }
-            }
-            $tokens[] = $token;
-            $line = substr($line, $pos + 1);
-        }
-
-        // maybe the server forgot to send some closing braces
-        while ($stack) {
-            $child = $tokens;
-            $tokens = array_pop($stack);
-            $tokens[] = $child;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * read a response "line" (could also be more than one real line if response has {..}<NL>)
-     * and do a simple decode
-     *
-     * @param  array|string  $tokens    decoded tokens are returned by reference, if $dontParse
-     *                                  is true the unparsed line is returned here
-     * @param  string        $wantedTag check for this tag for response code. Default '*' is
-     *                                  continuation tag.
-     * @param  bool          $dontParse if true only the unparsed line is returned $tokens
-     * @return bool if returned tag matches wanted tag
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function readLine(&$tokens = array(), $wantedTag = '*', $dontParse = false)
-    {
-        $line = $this->_nextTaggedLine($tag);
-        if (!$dontParse) {
-            $tokens = $this->_decodeLine($line);
-        } else {
-            $tokens = $line;
-        }
-
-        // if tag is wanted tag we might be at the end of a multiline response
-        return $tag == $wantedTag;
-    }
-
-    /**
-     * read all lines of response until given tag is found (last line of response)
-     *
-     * @param  string       $tag       the tag of your request
-     * @param  string|array $filter    you can filter the response so you get only the
-     *                                 given response lines
-     * @param  bool         $dontParse if true every line is returned unparsed instead of
-     *                                 the decoded tokens
-     * @return null|bool|array tokens if success, false if error, null if bad request
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function readResponse($tag, $dontParse = false)
-    {
-        $lines = array();
-        while (!$this->readLine($tokens, $tag, $dontParse)) {
-            $lines[] = $tokens;
-        }
-
-        if ($dontParse) {
-            // last to chars are still needed for response code
-            $tokens = array(substr($tokens, 0, 2));
-        }
-        // last line has response code
-        if ($tokens[0] == 'OK') {
-            return $lines ? $lines : true;
-        } else if ($tokens[0] == 'NO'){
-            return false;
-        }
-        return null;
-    }
-
-    /**
-     * send a request
-     *
-     * @param  string $command your request command
-     * @param  array  $tokens  additional parameters to command, use escapeString() to prepare
-     * @param  string $tag     provide a tag otherwise an autogenerated is returned
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function sendRequest($command, $tokens = array(), &$tag = null)
-    {
-        if (!$tag) {
-            ++$this->_tagCount;
-            $tag = 'TAG' . $this->_tagCount;
-        }
-
-        $line = $tag . ' ' . $command;
-
-        foreach ($tokens as $token) {
-            if (is_array($token)) {
-                if (@fputs($this->_socket, $line . ' ' . $token[0] . "\r\n") === false) {
-                    /**
-                     * @see Zend_Mail_Protocol_Exception
-                     */
-                    require_once 'Zend/Mail/Protocol/Exception.php';
-                    throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?');
-                }
-                if (!$this->_assumedNextLine('+ ')) {
-                    /**
-                     * @see Zend_Mail_Protocol_Exception
-                     */
-                    require_once 'Zend/Mail/Protocol/Exception.php';
-                    throw new Zend_Mail_Protocol_Exception('cannot send literal string');
-                }
-                $line = $token[1];
-            } else {
-                $line .= ' ' . $token;
-            }
-        }
-
-        if (@fputs($this->_socket, $line . "\r\n") === false) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?');
-        }
-    }
-
-    /**
-     * send a request and get response at once
-     *
-     * @param  string $command   command as in sendRequest()
-     * @param  array  $tokens    parameters as in sendRequest()
-     * @param  bool   $dontParse if true unparsed lines are returned instead of tokens
-     * @return mixed response as in readResponse()
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function requestAndResponse($command, $tokens = array(), $dontParse = false)
-    {
-        $this->sendRequest($command, $tokens, $tag);
-        $response = $this->readResponse($tag, $dontParse);
-
-        return $response;
-    }
-
-    /**
-     * escape one or more literals i.e. for sendRequest
-     *
-     * @param  string|array $string the literal/-s
-     * @return string|array escape literals, literals with newline ar returned
-     *                      as array('{size}', 'string');
-     */
-    public function escapeString($string)
-    {
-        if (func_num_args() < 2) {
-            if (strpos($string, "\n") !== false) {
-                return array('{' . strlen($string) . '}', $string);
-            } else {
-                return '"' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $string) . '"';
-            }
-        }
-        $result = array();
-        foreach (func_get_args() as $string) {
-            $result[] = $this->escapeString($string);
-        }
-        return $result;
-    }
-
-    /**
-     * escape a list with literals or lists
-     *
-     * @param  array $list list with literals or lists as PHP array
-     * @return string escaped list for imap
-     */
-    public function escapeList($list)
-    {
-        $result = array();
-        foreach ($list as $k => $v) {
-            if (!is_array($v)) {
-//              $result[] = $this->escapeString($v);
-                $result[] = $v;
-                continue;
-            }
-            $result[] = $this->escapeList($v);
-        }
-        return '(' . implode(' ', $result) . ')';
-    }
-
-    /**
-     * Login to IMAP server.
-     *
-     * @param  string $user      username
-     * @param  string $password  password
-     * @return bool success
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function login($user, $password)
-    {
-        return $this->requestAndResponse('LOGIN', $this->escapeString($user, $password), true);
-    }
-
-    /**
-     * logout of imap server
-     *
-     * @return bool success
-     */
-    public function logout()
-    {
-        $result = false;
-        if ($this->_socket) {
-            try {
-                $result = $this->requestAndResponse('LOGOUT', array(), true);
-            } catch (Zend_Mail_Protocol_Exception $e) {
-                // ignoring exception
-            }
-            fclose($this->_socket);
-            $this->_socket = null;
-        }
-        return $result;
-    }
-
-
-    /**
-     * Get capabilities from IMAP server
-     *
-     * @return array list of capabilities
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function capability()
-    {
-        $response = $this->requestAndResponse('CAPABILITY');
-
-        if (!$response) {
-            return $response;
-        }
-
-        $capabilities = array();
-        foreach ($response as $line) {
-            $capabilities = array_merge($capabilities, $line);
-        }
-        return $capabilities;
-    }
-
-    /**
-     * Examine and select have the same response. The common code for both
-     * is in this method
-     *
-     * @param  string $command can be 'EXAMINE' or 'SELECT' and this is used as command
-     * @param  string $box which folder to change to or examine
-     * @return bool|array false if error, array with returned information
-     *                    otherwise (flags, exists, recent, uidvalidity)
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function examineOrSelect($command = 'EXAMINE', $box = 'INBOX')
-    {
-        $this->sendRequest($command, array($this->escapeString($box)), $tag);
-
-        $result = array();
-        while (!$this->readLine($tokens, $tag)) {
-            if ($tokens[0] == 'FLAGS') {
-                array_shift($tokens);
-                $result['flags'] = $tokens;
-                continue;
-            }
-            switch ($tokens[1]) {
-                case 'EXISTS':
-                case 'RECENT':
-                    $result[strtolower($tokens[1])] = $tokens[0];
-                    break;
-                case '[UIDVALIDITY':
-                    $result['uidvalidity'] = (int)$tokens[2];
-                    break;
-                default:
-                    // ignore
-            }
-        }
-
-        if ($tokens[0] != 'OK') {
-            return false;
-        }
-        return $result;
-    }
-
-    /**
-     * change folder
-     *
-     * @param  string $box change to this folder
-     * @return bool|array see examineOrselect()
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function select($box = 'INBOX')
-    {
-        return $this->examineOrSelect('SELECT', $box);
-    }
-
-    /**
-     * examine folder
-     *
-     * @param  string $box examine this folder
-     * @return bool|array see examineOrselect()
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function examine($box = 'INBOX')
-    {
-        return $this->examineOrSelect('EXAMINE', $box);
-    }
-
-    /**
-     * fetch one or more items of one or more messages
-     *
-     * @param  string|array $items items to fetch from message(s) as string (if only one item)
-     *                             or array of strings
-     * @param  int          $from  message for items or start message if $to !== null
-     * @param  int|null     $to    if null only one message ($from) is fetched, else it's the
-     *                             last message, INF means last message avaible
-     * @return string|array if only one item of one message is fetched it's returned as string
-     *                      if items of one message are fetched it's returned as (name => value)
-     *                      if one items of messages are fetched it's returned as (msgno => value)
-     *                      if items of messages are fetchted it's returned as (msgno => (name => value))
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function fetch($items, $from, $to = null)
-    {
-        if (is_array($from)) {
-            $set = implode(',', $from);
-        } else if ($to === null) {
-            $set = (int)$from;
-        } else if ($to === INF) {
-            $set = (int)$from . ':*';
-        } else {
-            $set = (int)$from . ':' . (int)$to;
-        }
-
-        $items = (array)$items;
-        $itemList = $this->escapeList($items);
-
-        $this->sendRequest('FETCH', array($set, $itemList), $tag);
-
-        $result = array();
-        while (!$this->readLine($tokens, $tag)) {
-            // ignore other responses
-            if ($tokens[1] != 'FETCH') {
-                continue;
-            }
-            // ignore other messages
-            if ($to === null && !is_array($from) && $tokens[0] != $from) {
-                continue;
-            }
-            // if we only want one item we return that one directly
-            if (count($items) == 1) {
-                if ($tokens[2][0] == $items[0]) {
-                    $data = $tokens[2][1];
-                } else {
-                    // maybe the server send an other field we didn't wanted
-                    $count = count($tokens[2]);
-                    // we start with 2, because 0 was already checked
-                    for ($i = 2; $i < $count; $i += 2) {
-                        if ($tokens[2][$i] != $items[0]) {
-                            continue;
-                        }
-                        $data = $tokens[2][$i + 1];
-                        break;
-                    }
-                }
-            } else {
-                $data = array();
-                while (key($tokens[2]) !== null) {
-                    $data[current($tokens[2])] = next($tokens[2]);
-                    next($tokens[2]);
-                }
-            }
-            // if we want only one message we can ignore everything else and just return
-            if ($to === null && !is_array($from) && $tokens[0] == $from) {
-                // we still need to read all lines
-                while (!$this->readLine($tokens, $tag));
-                return $data;
-            }
-            $result[$tokens[0]] = $data;
-        }
-
-        if ($to === null && !is_array($from)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('the single id was not found in response');
-        }
-
-        return $result;
-    }
-
-    /**
-     * get mailbox list
-     *
-     * this method can't be named after the IMAP command 'LIST', as list is a reserved keyword
-     *
-     * @param  string $reference mailbox reference for list
-     * @param  string $mailbox   mailbox name match with wildcards
-     * @return array mailboxes that matched $mailbox as array(globalName => array('delim' => .., 'flags' => ..))
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function listMailbox($reference = '', $mailbox = '*')
-    {
-        $result = array();
-        $list = $this->requestAndResponse('LIST', $this->escapeString($reference, $mailbox));
-        if (!$list || $list === true) {
-            return $result;
-        }
-
-        foreach ($list as $item) {
-            if (count($item) != 4 || $item[0] != 'LIST') {
-                continue;
-            }
-            $result[$item[3]] = array('delim' => $item[2], 'flags' => $item[1]);
-        }
-
-        return $result;
-    }
-
-    /**
-     * set flags
-     *
-     * @param  array       $flags  flags to set, add or remove - see $mode
-     * @param  int         $from   message for items or start message if $to !== null
-     * @param  int|null    $to     if null only one message ($from) is fetched, else it's the
-     *                             last message, INF means last message avaible
-     * @param  string|null $mode   '+' to add flags, '-' to remove flags, everything else sets the flags as given
-     * @param  bool        $silent if false the return values are the new flags for the wanted messages
-     * @return bool|array new flags if $silent is false, else true or false depending on success
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function store(array $flags, $from, $to = null, $mode = null, $silent = true)
-    {
-        $item = 'FLAGS';
-        if ($mode == '+' || $mode == '-') {
-            $item = $mode . $item;
-        }
-        if ($silent) {
-            $item .= '.SILENT';
-        }
-
-        $flags = $this->escapeList($flags);
-        $set = (int)$from;
-        if ($to != null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
-        }
-
-        $result = $this->requestAndResponse('STORE', array($set, $item, $flags), $silent);
-
-        if ($silent) {
-            return $result ? true : false;
-        }
-
-        $tokens = $result;
-        $result = array();
-        foreach ($tokens as $token) {
-            if ($token[1] != 'FETCH' || $token[2][0] != 'FLAGS') {
-                continue;
-            }
-            $result[$token[0]] = $token[2][1];
-        }
-
-        return $result;
-    }
-
-    /**
-     * append a new message to given folder
-     *
-     * @param string $folder  name of target folder
-     * @param string $message full message content
-     * @param array  $flags   flags for new message
-     * @param string $date    date for new message
-     * @return bool success
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function append($folder, $message, $flags = null, $date = null)
-    {
-        $tokens = array();
-        $tokens[] = $this->escapeString($folder);
-        if ($flags !== null) {
-            $tokens[] = $this->escapeList($flags);
-        }
-        if ($date !== null) {
-            $tokens[] = $this->escapeString($date);
-        }
-        $tokens[] = $this->escapeString($message);
-
-        return $this->requestAndResponse('APPEND', $tokens, true);
-    }
-
-    /**
-     * copy message set from current folder to other folder
-     *
-     * @param string   $folder destination folder
-     * @param int|null $to     if null only one message ($from) is fetched, else it's the
-     *                         last message, INF means last message avaible
-     * @return bool success
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function copy($folder, $from, $to = null)
-    {
-        $set = (int)$from;
-        if ($to != null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
-        }
-
-        return $this->requestAndResponse('COPY', array($set, $this->escapeString($folder)), true);
-    }
-
-    /**
-     * create a new folder (and parent folders if needed)
-     *
-     * @param string $folder folder name
-     * @return bool success
-     */
-    public function create($folder)
-    {
-        return $this->requestAndResponse('CREATE', array($this->escapeString($folder)), true);
-    }
-
-    /**
-     * rename an existing folder
-     *
-     * @param string $old old name
-     * @param string $new new name
-     * @return bool success
-     */
-    public function rename($old, $new)
-    {
-        return $this->requestAndResponse('RENAME', $this->escapeString($old, $new), true);
-    }
-
-    /**
-     * remove a folder
-     *
-     * @param string $folder folder name
-     * @return bool success
-     */
-    public function delete($folder)
-    {
-        return $this->requestAndResponse('DELETE', array($this->escapeString($folder)), true);
-    }
-
-    /**
-     * permanently remove messages
-     *
-     * @return bool success
-     */
-    public function expunge()
-    {
-        // TODO: parse response?
-        return $this->requestAndResponse('EXPUNGE');
-    }
-
-    /**
-     * send noop
-     *
-     * @return bool success
-     */
-    public function noop()
-    {
-        // TODO: parse response
-        return $this->requestAndResponse('NOOP');
-    }
-
-    /**
-     * do a search request
-     *
-     * This method is currently marked as internal as the API might change and is not
-     * safe if you don't take precautions.
-     *
-     * @internal
-     * @return array message ids
-     */
-    public function search(array $params)
-    {
-        $response = $this->requestAndResponse('SEARCH', $params);
-        if (!$response) {
-            return $response;
-        }
-
-        foreach ($response as $ids) {
-            if ($ids[0] == 'SEARCH') {
-                array_shift($ids);
-                return $ids;
-            }
-        }
-        return array();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Pop3.php b/airtime_mvc/library/Zend/Mail/Protocol/Pop3.php
deleted file mode 100644
index 7678b345d..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Pop3.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Pop3
-{
-    /**
-     * Default timeout in seconds for initiating session
-     */
-    const TIMEOUT_CONNECTION = 30;
-
-    /**
-     * saves if server supports top
-     * @var null|bool
-     */
-    public $hasTop = null;
-
-    /**
-     * socket to pop3
-     * @var null|resource
-     */
-    protected $_socket;
-
-    /**
-     * greeting timestamp for apop
-     * @var null|string
-     */
-    protected $_timestamp;
-
-
-    /**
-     * Public constructor
-     *
-     * @param  string      $host  hostname or IP address of POP3 server, if given connect() is called
-     * @param  int|null    $port  port of POP3 server, null for default (110 or 995 for ssl)
-     * @param  bool|string $ssl   use ssl? 'SSL', 'TLS' or false
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function __construct($host = '', $port = null, $ssl = false)
-    {
-        if ($host) {
-            $this->connect($host, $port, $ssl);
-        }
-    }
-
-
-    /**
-     * Public destructor
-     */
-    public function __destruct()
-    {
-        $this->logout();
-    }
-
-
-    /**
-     * Open connection to POP3 server
-     *
-     * @param  string      $host  hostname or IP address of POP3 server
-     * @param  int|null    $port  of POP3 server, default is 110 (995 for ssl)
-     * @param  string|bool $ssl   use 'SSL', 'TLS' or false
-     * @return string welcome message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function connect($host, $port = null, $ssl = false)
-    {
-        if ($ssl == 'SSL') {
-            $host = 'ssl://' . $host;
-        }
-
-        if ($port === null) {
-            $port = $ssl == 'SSL' ? 995 : 110;
-        }
-
-        $errno  =  0;
-        $errstr = '';
-        $this->_socket = @fsockopen($host, $port, $errno, $errstr, self::TIMEOUT_CONNECTION);
-        if (!$this->_socket) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr .
-                                                   ' (errno = ' . $errno . ' )');
-        }
-
-        $welcome = $this->readResponse();
-
-        strtok($welcome, '<');
-        $this->_timestamp = strtok('>');
-        if (!strpos($this->_timestamp, '@')) {
-            $this->_timestamp = null;
-        } else {
-            $this->_timestamp = '<' . $this->_timestamp . '>';
-        }
-
-        if ($ssl === 'TLS') {
-            $this->request('STLS');
-            $result = stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
-            if (!$result) {
-                /**
-                 * @see Zend_Mail_Protocol_Exception
-                 */
-                require_once 'Zend/Mail/Protocol/Exception.php';
-                throw new Zend_Mail_Protocol_Exception('cannot enable TLS');
-            }
-        }
-
-        return $welcome;
-    }
-
-
-    /**
-     * Send a request
-     *
-     * @param string $request your request without newline
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function sendRequest($request)
-    {
-        $result = @fputs($this->_socket, $request . "\r\n");
-        if (!$result) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('send failed - connection closed?');
-        }
-    }
-
-
-    /**
-     * read a response
-     *
-     * @param  boolean $multiline response has multiple lines and should be read until "<nl>.<nl>"
-     * @return string response
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function readResponse($multiline = false)
-    {
-        $result = @fgets($this->_socket);
-        if (!is_string($result)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('read failed - connection closed?');
-        }
-
-        $result = trim($result);
-        if (strpos($result, ' ')) {
-            list($status, $message) = explode(' ', $result, 2);
-        } else {
-            $status = $result;
-            $message = '';
-        }
-
-        if ($status != '+OK') {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('last request failed');
-        }
-
-        if ($multiline) {
-            $message = '';
-            $line = fgets($this->_socket);
-            while ($line && rtrim($line, "\r\n") != '.') {
-                if ($line[0] == '.') {
-                    $line = substr($line, 1);
-                }
-                $message .= $line;
-                $line = fgets($this->_socket);
-            };
-        }
-
-        return $message;
-    }
-
-
-    /**
-     * Send request and get resposne
-     *
-     * @see sendRequest(), readResponse()
-     *
-     * @param  string $request    request
-     * @param  bool   $multiline  multiline response?
-     * @return string             result from readResponse()
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function request($request, $multiline = false)
-    {
-        $this->sendRequest($request);
-        return $this->readResponse($multiline);
-    }
-
-
-    /**
-     * End communication with POP3 server (also closes socket)
-     *
-     * @return null
-     */
-    public function logout()
-    {
-        if (!$this->_socket) {
-            return;
-        }
-
-        try {
-            $this->request('QUIT');
-        } catch (Zend_Mail_Protocol_Exception $e) {
-            // ignore error - we're closing the socket anyway
-        }
-
-        fclose($this->_socket);
-        $this->_socket = null;
-    }
-
-
-    /**
-     * Get capabilities from POP3 server
-     *
-     * @return array list of capabilities
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function capa()
-    {
-        $result = $this->request('CAPA', true);
-        return explode("\n", $result);
-    }
-
-
-    /**
-     * Login to POP3 server. Can use APOP
-     *
-     * @param  string $user      username
-     * @param  string $password  password
-     * @param  bool   $try_apop  should APOP be tried?
-     * @return void
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function login($user, $password, $tryApop = true)
-    {
-        if ($tryApop && $this->_timestamp) {
-            try {
-                $this->request("APOP $user " . md5($this->_timestamp . $password));
-                return;
-            } catch (Zend_Mail_Protocol_Exception $e) {
-                // ignore
-            }
-        }
-
-        $result = $this->request("USER $user");
-        $result = $this->request("PASS $password");
-    }
-
-
-    /**
-     * Make STAT call for message count and size sum
-     *
-     * @param  int $messages  out parameter with count of messages
-     * @param  int $octets    out parameter with size in octects of messages
-     * @return void
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function status(&$messages, &$octets)
-    {
-        $messages = 0;
-        $octets = 0;
-        $result = $this->request('STAT');
-
-        list($messages, $octets) = explode(' ', $result);
-    }
-
-
-    /**
-     * Make LIST call for size of message(s)
-     *
-     * @param  int|null $msgno number of message, null for all
-     * @return int|array size of given message or list with array(num => size)
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getList($msgno = null)
-    {
-        if ($msgno !== null) {
-            $result = $this->request("LIST $msgno");
-
-            list(, $result) = explode(' ', $result);
-            return (int)$result;
-        }
-
-        $result = $this->request('LIST', true);
-        $messages = array();
-        $line = strtok($result, "\n");
-        while ($line) {
-            list($no, $size) = explode(' ', trim($line));
-            $messages[(int)$no] = (int)$size;
-            $line = strtok("\n");
-        }
-
-        return $messages;
-    }
-
-
-    /**
-     * Make UIDL call for getting a uniqueid
-     *
-     * @param  int|null $msgno number of message, null for all
-     * @return string|array uniqueid of message or list with array(num => uniqueid)
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function uniqueid($msgno = null)
-    {
-        if ($msgno !== null) {
-            $result = $this->request("UIDL $msgno");
-
-            list(, $result) = explode(' ', $result);
-            return $result;
-        }
-
-        $result = $this->request('UIDL', true);
-
-        $result = explode("\n", $result);
-        $messages = array();
-        foreach ($result as $line) {
-            if (!$line) {
-                continue;
-            }
-            list($no, $id) = explode(' ', trim($line), 2);
-            $messages[(int)$no] = $id;
-        }
-
-        return $messages;
-
-    }
-
-
-    /**
-     * Make TOP call for getting headers and maybe some body lines
-     * This method also sets hasTop - before it it's not known if top is supported
-     *
-     * The fallback makes normale RETR call, which retrieves the whole message. Additional
-     * lines are not removed.
-     *
-     * @param  int  $msgno    number of message
-     * @param  int  $lines    number of wanted body lines (empty line is inserted after header lines)
-     * @param  bool $fallback fallback with full retrieve if top is not supported
-     * @return string message headers with wanted body lines
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function top($msgno, $lines = 0, $fallback = false)
-    {
-        if ($this->hasTop === false) {
-            if ($fallback) {
-                return $this->retrieve($msgno);
-            } else {
-                /**
-                 * @see Zend_Mail_Protocol_Exception
-                 */
-                require_once 'Zend/Mail/Protocol/Exception.php';
-                throw new Zend_Mail_Protocol_Exception('top not supported and no fallback wanted');
-            }
-        }
-        $this->hasTop = true;
-
-        $lines = (!$lines || $lines < 1) ? 0 : (int)$lines;
-
-        try {
-            $result = $this->request("TOP $msgno $lines", true);
-        } catch (Zend_Mail_Protocol_Exception $e) {
-            $this->hasTop = false;
-            if ($fallback) {
-                $result = $this->retrieve($msgno);
-            } else {
-                throw $e;
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Make a RETR call for retrieving a full message with headers and body
-     *
-     * @deprecated since 1.1.0; this method has a typo - please use retrieve()
-     * @param  int $msgno  message number
-     * @return string message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function retrive($msgno)
-    {
-        return $this->retrieve($msgno);
-    }
-
-
-    /**
-     * Make a RETR call for retrieving a full message with headers and body
-     *
-     * @param  int $msgno  message number
-     * @return string message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function retrieve($msgno)
-    {
-        $result = $this->request("RETR $msgno", true);
-        return $result;
-    }
-
-    /**
-     * Make a NOOP call, maybe needed for keeping the server happy
-     *
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function noop()
-    {
-        $this->request('NOOP');
-    }
-
-
-    /**
-     * Make a DELE count to remove a message
-     *
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function delete($msgno)
-    {
-        $this->request("DELE $msgno");
-    }
-
-
-    /**
-     * Make RSET call, which rollbacks delete requests
-     *
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function undelete()
-    {
-        $this->request('RSET');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Smtp.php b/airtime_mvc/library/Zend/Mail/Protocol/Smtp.php
deleted file mode 100644
index acd5c5425..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Smtp.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-
-/**
- * @see Zend_Mail_Protocol_Abstract
- */
-require_once 'Zend/Mail/Protocol/Abstract.php';
-
-
-/**
- * Smtp implementation of Zend_Mail_Protocol_Abstract
- *
- * Minimum implementation according to RFC2821: EHLO, MAIL FROM, RCPT TO, DATA, RSET, NOOP, QUIT
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract
-{
-    /**
-     * The transport method for the socket
-     *
-     * @var string
-     */
-    protected $_transport = 'tcp';
-
-
-    /**
-     * Indicates that a session is requested to be secure
-     *
-     * @var string
-     */
-    protected $_secure;
-
-
-    /**
-     * Indicates an smtp session has been started by the HELO command
-     *
-     * @var boolean
-     */
-    protected $_sess = false;
-
-
-    /**
-     * Indicates the HELO command has been issues
-     *
-     * @var unknown_type
-     */
-    protected $_helo = false;
-
-
-    /**
-     * Indicates an smtp AUTH has been issued and authenticated
-     *
-     * @var unknown_type
-     */
-    protected $_auth = false;
-
-
-    /**
-     * Indicates a MAIL command has been issued
-     *
-     * @var unknown_type
-     */
-    protected $_mail = false;
-
-
-    /**
-     * Indicates one or more RCTP commands have been issued
-     *
-     * @var unknown_type
-     */
-    protected $_rcpt = false;
-
-
-    /**
-     * Indicates that DATA has been issued and sent
-     *
-     * @var unknown_type
-     */
-    protected $_data = null;
-
-
-    /**
-     * Constructor.
-     *
-     * @param  string  $host
-     * @param  integer $port
-     * @param  array   $config
-     * @return void
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function __construct($host = '127.0.0.1', $port = null, array $config = array())
-    {
-        if (isset($config['ssl'])) {
-            switch (strtolower($config['ssl'])) {
-                case 'tls':
-                    $this->_secure = 'tls';
-                    break;
-
-                case 'ssl':
-                    $this->_transport = 'ssl';
-                    $this->_secure = 'ssl';
-                    if ($port == null) {
-                        $port = 465;
-                    }
-                    break;
-
-                default:
-                    /**
-                     * @see Zend_Mail_Protocol_Exception
-                     */
-                    require_once 'Zend/Mail/Protocol/Exception.php';
-                    throw new Zend_Mail_Protocol_Exception($config['ssl'] . ' is unsupported SSL type');
-                    break;
-            }
-        }
-
-        // If no port has been specified then check the master PHP ini file. Defaults to 25 if the ini setting is null.
-        if ($port == null) {
-            if (($port = ini_get('smtp_port')) == '') {
-                $port = 25;
-            }
-        }
-
-        parent::__construct($host, $port);
-    }
-
-
-    /**
-     * Connect to the server with the parameters given in the constructor.
-     *
-     * @return boolean
-     */
-    public function connect()
-    {
-        return $this->_connect($this->_transport . '://' . $this->_host . ':'. $this->_port);
-    }
-
-
-    /**
-     * Initiate HELO/EHLO sequence and set flag to indicate valid smtp session
-     *
-     * @param  string $host The client hostname or IP address (default: 127.0.0.1)
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function helo($host = '127.0.0.1')
-    {
-        // Respect RFC 2821 and disallow HELO attempts if session is already initiated.
-        if ($this->_sess === true) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('Cannot issue HELO to existing session');
-        }
-
-        // Validate client hostname
-        if (!$this->_validHost->isValid($host)) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages()));
-        }
-
-        // Initiate helo sequence
-        $this->_expect(220, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-        $this->_ehlo($host);
-
-        // If a TLS session is required, commence negotiation
-        if ($this->_secure == 'tls') {
-            $this->_send('STARTTLS');
-            $this->_expect(220, 180);
-            if (!stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-                /**
-                 * @see Zend_Mail_Protocol_Exception
-                 */
-                require_once 'Zend/Mail/Protocol/Exception.php';
-                throw new Zend_Mail_Protocol_Exception('Unable to connect via TLS');
-            }
-            $this->_ehlo($host);
-        }
-
-        $this->_startSession();
-        $this->auth();
-    }
-
-
-    /**
-     * Send EHLO or HELO depending on capabilities of smtp host
-     *
-     * @param  string $host The client hostname or IP address (default: 127.0.0.1)
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    protected function _ehlo($host)
-    {
-        // Support for older, less-compliant remote servers. Tries multiple attempts of EHLO or HELO.
-        try {
-            $this->_send('EHLO ' . $host);
-            $this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-        } catch (Zend_Mail_Protocol_Exception $e) {
-            $this->_send('HELO ' . $host);
-            $this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-        } catch (Zend_Mail_Protocol_Exception $e) {
-            throw $e;
-        }
-    }
-
-
-    /**
-     * Issues MAIL command
-     *
-     * @param  string $from Sender mailbox
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function mail($from)
-    {
-        if ($this->_sess !== true) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('A valid session has not been started');
-        }
-
-        $this->_send('MAIL FROM:<' . $from . '>');
-        $this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-
-        // Set mail to true, clear recipients and any existing data flags as per 4.1.1.2 of RFC 2821
-        $this->_mail = true;
-        $this->_rcpt = false;
-        $this->_data = false;
-    }
-
-
-    /**
-     * Issues RCPT command
-     *
-     * @param  string $to Receiver(s) mailbox
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function rcpt($to)
-    {
-        if ($this->_mail !== true) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('No sender reverse path has been supplied');
-        }
-
-        // Set rcpt to true, as per 4.1.1.3 of RFC 2821
-        $this->_send('RCPT TO:<' . $to . '>');
-        $this->_expect(array(250, 251), 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-        $this->_rcpt = true;
-    }
-
-
-    /**
-     * Issues DATA command
-     *
-     * @param  string $data
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function data($data)
-    {
-        // Ensure recipients have been set
-        if ($this->_rcpt !== true) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('No recipient forward path has been supplied');
-        }
-
-        $this->_send('DATA');
-        $this->_expect(354, 120); // Timeout set for 2 minutes as per RFC 2821 4.5.3.2
-
-        foreach (explode(Zend_Mime::LINEEND, $data) as $line) {
-            if (strpos($line, '.') === 0) {
-                // Escape lines prefixed with a '.'
-                $line = '.' . $line;
-            }
-            $this->_send($line);
-        }
-
-        $this->_send('.');
-        $this->_expect(250, 600); // Timeout set for 10 minutes as per RFC 2821 4.5.3.2
-        $this->_data = true;
-    }
-
-
-    /**
-     * Issues the RSET command end validates answer
-     *
-     * Can be used to restore a clean smtp communication state when a transaction has been cancelled or commencing a new transaction.
-     *
-     * @return void
-     */
-    public function rset()
-    {
-        $this->_send('RSET');
-        // MS ESMTP doesn't follow RFC, see [ZF-1377]
-        $this->_expect(array(250, 220));
-
-        $this->_mail = false;
-        $this->_rcpt = false;
-        $this->_data = false;
-    }
-
-
-    /**
-     * Issues the NOOP command end validates answer
-     *
-     * Not used by Zend_Mail, could be used to keep a connection alive or check if it is still open.
-     *
-     * @return void
-     */
-    public function noop()
-    {
-        $this->_send('NOOP');
-        $this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-    }
-
-
-    /**
-     * Issues the VRFY command end validates answer
-     *
-     * Not used by Zend_Mail.
-     *
-     * @param  string $user User Name or eMail to verify
-     * @return void
-     */
-    public function vrfy($user)
-    {
-        $this->_send('VRFY ' . $user);
-        $this->_expect(array(250, 251, 252), 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-    }
-
-
-    /**
-     * Issues the QUIT command and clears the current session
-     *
-     * @return void
-     */
-    public function quit()
-    {
-        if ($this->_sess) {
-            $this->_send('QUIT');
-            $this->_expect(221, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
-            $this->_stopSession();
-        }
-    }
-
-
-    /**
-     * Default authentication method
-     *
-     * This default method is implemented by AUTH adapters to properly authenticate to a remote host.
-     *
-     * @throws Zend_Mail_Protocol_Exception
-     * @return void
-     */
-    public function auth()
-    {
-        if ($this->_auth === true) {
-            /**
-             * @see Zend_Mail_Protocol_Exception
-             */
-            require_once 'Zend/Mail/Protocol/Exception.php';
-            throw new Zend_Mail_Protocol_Exception('Already authenticated for this session');
-        }
-    }
-
-
-    /**
-     * Closes connection
-     *
-     * @return void
-     */
-    public function disconnect()
-    {
-        $this->_disconnect();
-    }
-
-
-    /**
-     * Start mail session
-     *
-     * @return void
-     */
-    protected function _startSession()
-    {
-        $this->_sess = true;
-    }
-
-
-    /**
-     * Stop mail session
-     *
-     * @return void
-     */
-    protected function _stopSession()
-    {
-        $this->_sess = false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
deleted file mode 100644
index 4b2aa4b28..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Crammd5.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Protocol_Smtp
- */
-require_once 'Zend/Mail/Protocol/Smtp.php';
-
-
-/**
- * Performs CRAM-MD5 authentication
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Smtp_Auth_Crammd5 extends Zend_Mail_Protocol_Smtp
-{
-    /**
-     * Constructor.
-     *
-     * @param  string $host   (Default: 127.0.0.1)
-     * @param  int    $port   (Default: null)
-     * @param  array  $config Auth-specific parameters
-     * @return void
-     */
-    public function __construct($host = '127.0.0.1', $port = null, $config = null)
-    {
-        if (is_array($config)) {
-            if (isset($config['username'])) {
-                $this->_username = $config['username'];
-            }
-            if (isset($config['password'])) {
-                $this->_password = $config['password'];
-            }
-        }
-
-        parent::__construct($host, $port, $config);
-    }
-
-
-    /**
-     * @todo Perform CRAM-MD5 authentication with supplied credentials
-     *
-     * @return void
-     */
-    public function auth()
-    {
-        // Ensure AUTH has not already been initiated.
-        parent::auth();
-
-        $this->_send('AUTH CRAM-MD5');
-        $challenge = $this->_expect(334);
-        $challenge = base64_decode($challenge);
-        $digest = $this->_hmacMd5($this->_password, $challenge);
-        $this->_send(base64_encode($this->_username . ' ' . $digest));
-        $this->_expect(235);
-        $this->_auth = true;
-    }
-
-
-    /**
-     * Prepare CRAM-MD5 response to server's ticket
-     *
-     * @param  string $key   Challenge key (usually password)
-     * @param  string $data  Challenge data
-     * @param  string $block Length of blocks
-     * @return string
-     */
-    protected function _hmacMd5($key, $data, $block = 64)
-    {
-        if (strlen($key) > 64) {
-            $key = pack('H32', md5($key));
-        } elseif (strlen($key) < 64) {
-            $key = str_pad($key, $block, chr(0));
-        }
-
-        $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
-        $inner = pack('H32', md5($k_ipad . $data));
-        $digest = md5($k_opad . $inner);
-
-        return $digest;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
deleted file mode 100644
index ab79748ae..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Protocol_Smtp
- */
-require_once 'Zend/Mail/Protocol/Smtp.php';
-
-
-/**
- * Performs LOGIN authentication
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Smtp_Auth_Login extends Zend_Mail_Protocol_Smtp
-{
-    /**
-     * LOGIN username
-     *
-     * @var string
-     */
-    protected $_username;
-
-
-    /**
-     * LOGIN password
-     *
-     * @var string
-     */
-    protected $_password;
-
-
-    /**
-     * Constructor.
-     *
-     * @param  string $host   (Default: 127.0.0.1)
-     * @param  int    $port   (Default: null)
-     * @param  array  $config Auth-specific parameters
-     * @return void
-     */
-    public function __construct($host = '127.0.0.1', $port = null, $config = null)
-    {
-        if (is_array($config)) {
-            if (isset($config['username'])) {
-                $this->_username = $config['username'];
-            }
-            if (isset($config['password'])) {
-                $this->_password = $config['password'];
-            }
-        }
-
-        parent::__construct($host, $port, $config);
-    }
-
-
-    /**
-     * Perform LOGIN authentication with supplied credentials
-     *
-     * @return void
-     */
-    public function auth()
-    {
-        // Ensure AUTH has not already been initiated.
-        parent::auth();
-
-        $this->_send('AUTH LOGIN');
-        $this->_expect(334);
-        $this->_send(base64_encode($this->_username));
-        $this->_expect(334);
-        $this->_send(base64_encode($this->_password));
-        $this->_expect(235);
-        $this->_auth = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
deleted file mode 100644
index a8c2f61f8..000000000
--- a/airtime_mvc/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Plain.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Protocol_Smtp
- */
-require_once 'Zend/Mail/Protocol/Smtp.php';
-
-
-/**
- * Performs PLAIN authentication
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Protocol_Smtp_Auth_Plain extends Zend_Mail_Protocol_Smtp
-{
-    /**
-     * PLAIN username
-     *
-     * @var string
-     */
-    protected $_username;
-
-
-    /**
-     * PLAIN password
-     *
-     * @var string
-     */
-    protected $_password;
-
-
-    /**
-     * Constructor.
-     *
-     * @param  string $host   (Default: 127.0.0.1)
-     * @param  int    $port   (Default: null)
-     * @param  array  $config Auth-specific parameters
-     * @return void
-     */
-    public function __construct($host = '127.0.0.1', $port = null, $config = null)
-    {
-        if (is_array($config)) {
-            if (isset($config['username'])) {
-                $this->_username = $config['username'];
-            }
-            if (isset($config['password'])) {
-                $this->_password = $config['password'];
-            }
-        }
-
-        parent::__construct($host, $port, $config);
-    }
-
-
-    /**
-     * Perform PLAIN authentication with supplied credentials
-     *
-     * @return void
-     */
-    public function auth()
-    {
-        // Ensure AUTH has not already been initiated.
-        parent::auth();
-
-        $this->_send('AUTH PLAIN');
-        $this->_expect(334);
-        $this->_send(base64_encode(chr(0) . $this->_username . chr(0) . $this->_password));
-        $this->_expect(235);
-        $this->_auth = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage.php b/airtime_mvc/library/Zend/Mail/Storage.php
deleted file mode 100644
index 771f7ae23..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage
-{
-    // maildir and IMAP flags, using IMAP names, where possible to be able to distinguish between IMAP
-    // system flags and other flags
-    const FLAG_PASSED   = 'Passed';
-    const FLAG_SEEN     = '\Seen';
-    const FLAG_ANSWERED = '\Answered';
-    const FLAG_FLAGGED  = '\Flagged';
-    const FLAG_DELETED  = '\Deleted';
-    const FLAG_DRAFT    = '\Draft';
-    const FLAG_RECENT   = '\Recent';
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Abstract.php b/airtime_mvc/library/Zend/Mail/Storage/Abstract.php
deleted file mode 100644
index 344a07d7e..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Abstract.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, SeekableIterator
-{
-    /**
-     * class capabilities with default values
-     * @var array
-     */
-    protected $_has = array('uniqueid'  => true,
-                            'delete'    => false,
-                            'create'    => false,
-                            'top'       => false,
-                            'fetchPart' => true,
-                            'flags'     => false);
-
-    /**
-     * current iteration position
-     * @var int
-     */
-    protected $_iterationPos = 0;
-
-    /**
-     * maximum iteration position (= message count)
-     * @var null|int
-     */
-    protected $_iterationMax = null;
-
-    /**
-     * used message class, change it in an extened class to extend the returned message class
-     * @var string
-     */
-    protected $_messageClass = 'Zend_Mail_Message';
-
-    /**
-     * Getter for has-properties. The standard has properties
-     * are: hasFolder, hasUniqueid, hasDelete, hasCreate, hasTop
-     *
-     * The valid values for the has-properties are:
-     *   - true if a feature is supported
-     *   - false if a feature is not supported
-     *   - null is it's not yet known or it can't be know if a feature is supported
-     *
-     * @param  string $var  property name
-     * @return bool         supported or not
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __get($var)
-    {
-        if (strpos($var, 'has') === 0) {
-            $var = strtolower(substr($var, 3));
-            return isset($this->_has[$var]) ? $this->_has[$var] : null;
-        }
-
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception($var . ' not found');
-    }
-
-
-    /**
-     * Get a full list of features supported by the specific mail lib and the server
-     *
-     * @return array list of features as array(featurename => true|false[|null])
-     */
-    public function getCapabilities()
-    {
-        return $this->_has;
-    }
-
-
-    /**
-     * Count messages messages in current box/folder
-     *
-     * @return int number of messages
-     * @throws Zend_Mail_Storage_Exception
-     */
-    abstract public function countMessages();
-
-
-    /**
-     * Get a list of messages with number and size
-     *
-     * @param  int $id  number of message
-     * @return int|array size of given message of list with all messages as array(num => size)
-     */
-    abstract public function getSize($id = 0);
-
-
-    /**
-     * Get a message with headers and body
-     *
-     * @param  $id int number of message
-     * @return Zend_Mail_Message
-     */
-    abstract public function getMessage($id);
-
-
-    /**
-     * Get raw header of message or part
-     *
-     * @param  int               $id       number of message
-     * @param  null|array|string $part     path to part or null for messsage header
-     * @param  int               $topLines include this many lines with header (after an empty line)
-     * @return string raw header
-     */
-    abstract public function getRawHeader($id, $part = null, $topLines = 0);
-
-    /**
-     * Get raw content of message or part
-     *
-     * @param  int               $id   number of message
-     * @param  null|array|string $part path to part or null for messsage content
-     * @return string raw content
-     */
-    abstract public function getRawContent($id, $part = null);
-
-    /**
-     * Create instance with parameters
-     *
-     * @param  array $params mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    abstract public function __construct($params);
-
-
-    /**
-     * Destructor calls close() and therefore closes the resource.
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-
-    /**
-     * Close resource for mail lib. If you need to control, when the resource
-     * is closed. Otherwise the destructor would call this.
-     *
-     * @return null
-     */
-    abstract public function close();
-
-
-    /**
-     * Keep the resource alive.
-     *
-     * @return null
-     */
-    abstract public function noop();
-
-    /**
-     * delete a message from current box/folder
-     *
-     * @return null
-     */
-    abstract public function removeMessage($id);
-
-    /**
-     * get unique id for one or all messages
-     *
-     * if storage does not support unique ids it's the same as the message number
-     *
-     * @param int|null $id message number
-     * @return array|string message number for given message or all messages as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    abstract public function getUniqueId($id = null);
-
-    /**
-     * get a message number from a unique id
-     *
-     * I.e. if you have a webmailer that supports deleting messages you should use unique ids
-     * as parameter and use this method to translate it to message number right before calling removeMessage()
-     *
-     * @param string $id unique id
-     * @return int message number
-     * @throws Zend_Mail_Storage_Exception
-     */
-    abstract public function getNumberByUniqueId($id);
-
-    // interface implementations follows
-
-    /**
-     * Countable::count()
-     *
-     * @return   int
-     */
-     public function count()
-     {
-        return $this->countMessages();
-     }
-
-
-     /**
-      * ArrayAccess::offsetExists()
-      *
-      * @param    int     $id
-      * @return   boolean
-      */
-     public function offsetExists($id)
-     {
-        try {
-            if ($this->getMessage($id)) {
-                return true;
-            }
-        } catch(Zend_Mail_Storage_Exception $e) {}
-
-        return false;
-     }
-
-
-     /**
-      * ArrayAccess::offsetGet()
-      *
-      * @param    int $id
-      * @return   Zend_Mail_Message message object
-      */
-     public function offsetGet($id)
-     {
-        return $this->getMessage($id);
-     }
-
-
-     /**
-      * ArrayAccess::offsetSet()
-      *
-      * @param    id     $id
-      * @param    mixed  $value
-      * @throws   Zend_Mail_Storage_Exception
-      * @return   void
-      */
-     public function offsetSet($id, $value)
-     {
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('cannot write mail messages via array access');
-     }
-
-
-     /**
-      * ArrayAccess::offsetUnset()
-      *
-      * @param    int   $id
-      * @return   boolean success
-      */
-     public function offsetUnset($id)
-     {
-        return $this->removeMessage($id);
-     }
-
-
-     /**
-      * Iterator::rewind()
-      *
-      * Rewind always gets the new count from the storage. Thus if you use
-      * the interfaces and your scripts take long you should use reset()
-      * from time to time.
-      *
-      * @return   void
-      */
-     public function rewind()
-     {
-        $this->_iterationMax = $this->countMessages();
-        $this->_iterationPos = 1;
-     }
-
-
-     /**
-      * Iterator::current()
-      *
-      * @return   Zend_Mail_Message current message
-      */
-     public function current()
-     {
-        return $this->getMessage($this->_iterationPos);
-     }
-
-
-     /**
-      * Iterator::key()
-      *
-      * @return   int id of current position
-      */
-     public function key()
-     {
-        return $this->_iterationPos;
-     }
-
-
-     /**
-      * Iterator::next()
-      *
-      * @return   void
-      */
-     public function next()
-     {
-        ++$this->_iterationPos;
-     }
-
-
-     /**
-      * Iterator::valid()
-      *
-      * @return   boolean
-      */
-     public function valid()
-     {
-        if ($this->_iterationMax === null) {
-          $this->_iterationMax = $this->countMessages();
-        }
-        return $this->_iterationPos && $this->_iterationPos <= $this->_iterationMax;
-     }
-
-
-     /**
-      * SeekableIterator::seek()
-      *
-      * @param  int $pos
-      * @return void
-      * @throws OutOfBoundsException
-      */
-     public function seek($pos)
-     {
-        if ($this->_iterationMax === null) {
-          $this->_iterationMax = $this->countMessages();
-        }
-
-        if ($pos > $this->_iterationMax) {
-            throw new OutOfBoundsException('this position does not exist');
-        }
-        $this->_iterationPos = $pos;
-     }
-
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Exception.php b/airtime_mvc/library/Zend/Mail/Storage/Exception.php
deleted file mode 100644
index 96219196c..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Exception
- */
-require_once 'Zend/Mail/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Exception extends Zend_Mail_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Folder.php b/airtime_mvc/library/Zend/Mail/Storage/Folder.php
deleted file mode 100644
index 10b368a9b..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Folder.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Folder.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Folder implements RecursiveIterator
-{
-    /**
-     * subfolders of folder array(localName => Zend_Mail_Storage_Folder folder)
-     * @var array
-     */
-    protected $_folders;
-
-    /**
-     * local name (name of folder in parent folder)
-     * @var string
-     */
-    protected $_localName;
-
-    /**
-     * global name (absolute name of folder)
-     * @var string
-     */
-    protected $_globalName;
-
-    /**
-     * folder is selectable if folder is able to hold messages, else it's just a parent folder
-     * @var bool
-     */
-    protected $_selectable = true;
-
-    /**
-     * create a new mail folder instance
-     *
-     * @param string $localName  name of folder in current subdirectory
-     * @param string $globalName absolute name of folder
-     * @param bool   $selectable if true folder holds messages, if false it's just a parent for subfolders
-     * @param array  $folders    init with given instances of Zend_Mail_Storage_Folder as subfolders
-     */
-    public function __construct($localName, $globalName = '', $selectable = true, array $folders = array())
-    {
-        $this->_localName  = $localName;
-        $this->_globalName = $globalName ? $globalName : $localName;
-        $this->_selectable = $selectable;
-        $this->_folders    = $folders;
-    }
-
-    /**
-     * implements RecursiveIterator::hasChildren()
-     *
-     * @return bool current element has children
-     */
-    public function hasChildren()
-    {
-        $current = $this->current();
-        return $current && $current instanceof Zend_Mail_Storage_Folder && !$current->isLeaf();
-    }
-
-    /**
-     * implements RecursiveIterator::getChildren()
-     *
-     * @return Zend_Mail_Storage_Folder same as self::current()
-     */
-    public function getChildren()
-    {
-        return $this->current();
-    }
-
-    /**
-     * implements Iterator::valid()
-     *
-     * @return bool check if there's a current element
-     */
-    public function valid()
-    {
-        return key($this->_folders) !== null;
-    }
-
-    /**
-     * implements Iterator::next()
-     *
-     * @return null
-     */
-    public function next()
-    {
-        next($this->_folders);
-    }
-
-    /**
-     * implements Iterator::key()
-     *
-     * @return string key/local name of current element
-     */
-    public function key()
-    {
-        return key($this->_folders);
-    }
-
-    /**
-     * implements Iterator::current()
-     *
-     * @return Zend_Mail_Storage_Folder current folder
-     */
-    public function current()
-    {
-        return current($this->_folders);
-    }
-
-    /**
-     * implements Iterator::rewind()
-     *
-     * @return null
-     */
-    public function rewind()
-    {
-        reset($this->_folders);
-    }
-
-    /**
-     * get subfolder named $name
-     *
-     * @param  string $name wanted subfolder
-     * @return Zend_Mail_Storage_Folder folder named $folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __get($name)
-    {
-        if (!isset($this->_folders[$name])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("no subfolder named $name");
-        }
-
-        return $this->_folders[$name];
-    }
-
-    /**
-     * add or replace subfolder named $name
-     *
-     * @param string $name local name of subfolder
-     * @param Zend_Mail_Storage_Folder $folder instance for new subfolder
-     * @return null
-     */
-    public function __set($name, Zend_Mail_Storage_Folder $folder)
-    {
-        $this->_folders[$name] = $folder;
-    }
-
-    /**
-     * remove subfolder named $name
-     *
-     * @param string $name local name of subfolder
-     * @return null
-     */
-    public function __unset($name)
-    {
-        unset($this->_folders[$name]);
-    }
-
-    /**
-     * magic method for easy output of global name
-     *
-     * @return string global name of folder
-     */
-    public function __toString()
-    {
-        return (string)$this->getGlobalName();
-    }
-
-    /**
-     * get local name
-     *
-     * @return string local name
-     */
-    public function getLocalName()
-    {
-        return $this->_localName;
-    }
-
-    /**
-     * get global name
-     *
-     * @return string global name
-     */
-    public function getGlobalName()
-    {
-        return $this->_globalName;
-    }
-
-    /**
-     * is this folder selectable?
-     *
-     * @return bool selectable
-     */
-    public function isSelectable()
-    {
-        return $this->_selectable;
-    }
-
-    /**
-     * check if folder has no subfolder
-     *
-     * @return bool true if no subfolders
-     */
-    public function isLeaf()
-    {
-        return empty($this->_folders);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Folder/Interface.php b/airtime_mvc/library/Zend/Mail/Storage/Folder/Interface.php
deleted file mode 100644
index b5c89ac91..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Folder/Interface.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Mail_Storage_Folder_Interface
-{
-    /**
-     * get root folder or given folder
-     *
-     * @param string $rootFolder get folder structure for given folder, else root
-     * @return Zend_Mail_Storage_Folder root or wanted folder
-     */
-    public function getFolders($rootFolder = null);
-
-    /**
-     * select given folder
-     *
-     * folder must be selectable!
-     *
-     * @param Zend_Mail_Storage_Folder|string $globalName global name of folder or instance for subfolder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function selectFolder($globalName);
-
-
-    /**
-     * get Zend_Mail_Storage_Folder instance for current folder
-     *
-     * @return Zend_Mail_Storage_Folder instance of current folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getCurrentFolder();
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Folder/Maildir.php b/airtime_mvc/library/Zend/Mail/Storage/Folder/Maildir.php
deleted file mode 100644
index d486703c5..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Folder/Maildir.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Folder
- */
-require_once 'Zend/Mail/Storage/Folder.php';
-
-/**
- * @see Zend_Mail_Storage_Folder_Interface
- */
-require_once 'Zend/Mail/Storage/Folder/Interface.php';
-
-/**
- * @see Zend_Mail_Storage_Maildir
- */
-require_once 'Zend/Mail/Storage/Maildir.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir implements Zend_Mail_Storage_Folder_Interface
-{
-    /**
-     * Zend_Mail_Storage_Folder root folder for folder structure
-     * @var Zend_Mail_Storage_Folder
-     */
-    protected $_rootFolder;
-
-    /**
-     * rootdir of folder structure
-     * @var string
-     */
-    protected $_rootdir;
-
-    /**
-     * name of current folder
-     * @var string
-     */
-    protected $_currentFolder;
-
-    /**
-     * delim char for subfolders
-     * @var string
-     */
-    protected $_delim;
-
-    /**
-     * Create instance with parameters
-     * Supported parameters are:
-     *   - dirname rootdir of maildir structure
-     *   - delim   delim char for folder structur, default is '.'
-     *   - folder intial selected folder, default is 'INBOX'
-     *
-     * @param  $params array mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        if (!isset($params->dirname) || !is_dir($params->dirname)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('no valid dirname given in params');
-        }
-
-        $this->_rootdir = rtrim($params->dirname, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-        $this->_delim = isset($params->delim) ? $params->delim : '.';
-
-        $this->_buildFolderTree();
-        $this->selectFolder(!empty($params->folder) ? $params->folder : 'INBOX');
-        $this->_has['top'] = true;
-        $this->_has['flags'] = true;
-    }
-
-    /**
-     * find all subfolders and mbox files for folder structure
-     *
-     * Result is save in Zend_Mail_Storage_Folder instances with the root in $this->_rootFolder.
-     * $parentFolder and $parentGlobalName are only used internally for recursion.
-     *
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _buildFolderTree()
-    {
-        $this->_rootFolder = new Zend_Mail_Storage_Folder('/', '/', false);
-        $this->_rootFolder->INBOX = new Zend_Mail_Storage_Folder('INBOX', 'INBOX', true);
-
-        $dh = @opendir($this->_rootdir);
-        if (!$dh) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("can't read folders in maildir");
-        }
-        $dirs = array();
-        while (($entry = readdir($dh)) !== false) {
-            // maildir++ defines folders must start with .
-            if ($entry[0] != '.' || $entry == '.' || $entry == '..') {
-                continue;
-            }
-            if ($this->_isMaildir($this->_rootdir . $entry)) {
-                $dirs[] = $entry;
-            }
-        }
-        closedir($dh);
-
-        sort($dirs);
-        $stack = array(null);
-        $folderStack = array(null);
-        $parentFolder = $this->_rootFolder;
-        $parent = '.';
-
-        foreach ($dirs as $dir) {
-            do {
-                if (strpos($dir, $parent) === 0) {
-                    $local = substr($dir, strlen($parent));
-                    if (strpos($local, $this->_delim) !== false) {
-                        /**
-                         * @see Zend_Mail_Storage_Exception
-                         */
-                        require_once 'Zend/Mail/Storage/Exception.php';
-                        throw new Zend_Mail_Storage_Exception('error while reading maildir');
-                    }
-                    array_push($stack, $parent);
-                    $parent = $dir . $this->_delim;
-                    $folder = new Zend_Mail_Storage_Folder($local, substr($dir, 1), true);
-                    $parentFolder->$local = $folder;
-                    array_push($folderStack, $parentFolder);
-                    $parentFolder = $folder;
-                    break;
-                } else if ($stack) {
-                    $parent = array_pop($stack);
-                    $parentFolder = array_pop($folderStack);
-                }
-            } while ($stack);
-            if (!$stack) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('error while reading maildir');
-            }
-        }
-    }
-
-    /**
-     * get root folder or given folder
-     *
-     * @param string $rootFolder get folder structure for given folder, else root
-     * @return Zend_Mail_Storage_Folder root or wanted folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getFolders($rootFolder = null)
-    {
-        if (!$rootFolder || $rootFolder == 'INBOX') {
-            return $this->_rootFolder;
-        }
-
-        // rootdir is same as INBOX in maildir
-        if (strpos($rootFolder, 'INBOX' . $this->_delim) === 0) {
-            $rootFolder = substr($rootFolder, 6);
-        }
-        $currentFolder = $this->_rootFolder;
-        $subname = trim($rootFolder, $this->_delim);
-        while ($currentFolder) {
-            @list($entry, $subname) = @explode($this->_delim, $subname, 2);
-            $currentFolder = $currentFolder->$entry;
-            if (!$subname) {
-                break;
-            }
-        }
-
-        if ($currentFolder->getGlobalName() != rtrim($rootFolder, $this->_delim)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("folder $rootFolder not found");
-        }
-        return $currentFolder;
-    }
-
-    /**
-     * select given folder
-     *
-     * folder must be selectable!
-     *
-     * @param Zend_Mail_Storage_Folder|string $globalName global name of folder or instance for subfolder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function selectFolder($globalName)
-    {
-        $this->_currentFolder = (string)$globalName;
-
-        // getting folder from folder tree for validation
-        $folder = $this->getFolders($this->_currentFolder);
-
-        try {
-            $this->_openMaildir($this->_rootdir . '.' . $folder->getGlobalName());
-        } catch(Zend_Mail_Storage_Exception $e) {
-            // check what went wrong
-            if (!$folder->isSelectable()) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e);
-            }
-            // seems like file has vanished; rebuilding folder tree - but it's still an exception
-            $this->_buildFolderTree($this->_rootdir);
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('seems like the maildir has vanished, I\'ve rebuild the ' .
-                                                         'folder tree, search for an other folder and try again', 0, $e);
-        }
-    }
-
-    /**
-     * get Zend_Mail_Storage_Folder instance for current folder
-     *
-     * @return Zend_Mail_Storage_Folder instance of current folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getCurrentFolder()
-    {
-        return $this->_currentFolder;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Folder/Mbox.php b/airtime_mvc/library/Zend/Mail/Storage/Folder/Mbox.php
deleted file mode 100644
index 0c5cfd88e..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Folder/Mbox.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Folder
- */
-require_once 'Zend/Mail/Storage/Folder.php';
-
-/**
- * @see Zend_Mail_Storage_Folder_Interface
- */
-require_once 'Zend/Mail/Storage/Folder/Interface.php';
-
-/**
- * @see Zend_Mail_Storage_Mbox
- */
-require_once 'Zend/Mail/Storage/Mbox.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Zend_Mail_Storage_Folder_Interface
-{
-    /**
-     * Zend_Mail_Storage_Folder root folder for folder structure
-     * @var Zend_Mail_Storage_Folder
-     */
-    protected $_rootFolder;
-
-    /**
-     * rootdir of folder structure
-     * @var string
-     */
-    protected $_rootdir;
-
-    /**
-     * name of current folder
-     * @var string
-     */
-    protected $_currentFolder;
-
-    /**
-     * Create instance with parameters
-     *
-     * Disallowed parameters are:
-     *   - filename use Zend_Mail_Storage_Mbox for a single file
-     * Supported parameters are:
-     *   - dirname rootdir of mbox structure
-     *   - folder intial selected folder, default is 'INBOX'
-     *
-     * @param  $params array mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        if (isset($params->filename)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('use Zend_Mail_Storage_Mbox for a single file');
-        }
-
-        if (!isset($params->dirname) || !is_dir($params->dirname)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('no valid dirname given in params');
-        }
-
-        $this->_rootdir = rtrim($params->dirname, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-        $this->_buildFolderTree($this->_rootdir);
-        $this->selectFolder(!empty($params->folder) ? $params->folder : 'INBOX');
-        $this->_has['top']      = true;
-        $this->_has['uniqueid'] = false;
-    }
-
-    /**
-     * find all subfolders and mbox files for folder structure
-     *
-     * Result is save in Zend_Mail_Storage_Folder instances with the root in $this->_rootFolder.
-     * $parentFolder and $parentGlobalName are only used internally for recursion.
-     *
-     * @param string $currentDir call with root dir, also used for recursion.
-     * @param Zend_Mail_Storage_Folder|null $parentFolder used for recursion
-     * @param string $parentGlobalName used for rescursion
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _buildFolderTree($currentDir, $parentFolder = null, $parentGlobalName = '')
-    {
-        if (!$parentFolder) {
-            $this->_rootFolder = new Zend_Mail_Storage_Folder('/', '/', false);
-            $parentFolder = $this->_rootFolder;
-        }
-
-        $dh = @opendir($currentDir);
-        if (!$dh) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("can't read dir $currentDir");
-        }
-        while (($entry = readdir($dh)) !== false) {
-            // ignore hidden files for mbox
-            if ($entry[0] == '.') {
-                continue;
-            }
-            $absoluteEntry = $currentDir . $entry;
-            $globalName = $parentGlobalName . DIRECTORY_SEPARATOR . $entry;
-            if (is_file($absoluteEntry) && $this->_isMboxFile($absoluteEntry)) {
-                $parentFolder->$entry = new Zend_Mail_Storage_Folder($entry, $globalName);
-                continue;
-            }
-            if (!is_dir($absoluteEntry) /* || $entry == '.' || $entry == '..' */) {
-                continue;
-            }
-            $folder = new Zend_Mail_Storage_Folder($entry, $globalName, false);
-            $parentFolder->$entry = $folder;
-            $this->_buildFolderTree($absoluteEntry . DIRECTORY_SEPARATOR, $folder, $globalName);
-        }
-
-        closedir($dh);
-    }
-
-    /**
-     * get root folder or given folder
-     *
-     * @param string $rootFolder get folder structure for given folder, else root
-     * @return Zend_Mail_Storage_Folder root or wanted folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getFolders($rootFolder = null)
-    {
-        if (!$rootFolder) {
-            return $this->_rootFolder;
-        }
-
-        $currentFolder = $this->_rootFolder;
-        $subname = trim($rootFolder, DIRECTORY_SEPARATOR);
-        while ($currentFolder) {
-            @list($entry, $subname) = @explode(DIRECTORY_SEPARATOR, $subname, 2);
-            $currentFolder = $currentFolder->$entry;
-            if (!$subname) {
-                break;
-            }
-        }
-
-        if ($currentFolder->getGlobalName() != DIRECTORY_SEPARATOR . trim($rootFolder, DIRECTORY_SEPARATOR)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("folder $rootFolder not found");
-        }
-        return $currentFolder;
-    }
-
-    /**
-     * select given folder
-     *
-     * folder must be selectable!
-     *
-     * @param Zend_Mail_Storage_Folder|string $globalName global name of folder or instance for subfolder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function selectFolder($globalName)
-    {
-        $this->_currentFolder = (string)$globalName;
-
-        // getting folder from folder tree for validation
-        $folder = $this->getFolders($this->_currentFolder);
-
-        try {
-            $this->_openMboxFile($this->_rootdir . $folder->getGlobalName());
-        } catch(Zend_Mail_Storage_Exception $e) {
-            // check what went wrong
-            if (!$folder->isSelectable()) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e);
-            }
-            // seems like file has vanished; rebuilding folder tree - but it's still an exception
-            $this->_buildFolderTree($this->_rootdir);
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('seems like the mbox file has vanished, I\'ve rebuild the ' .
-                                                         'folder tree, search for an other folder and try again', 0, $e);
-        }
-    }
-
-    /**
-     * get Zend_Mail_Storage_Folder instance for current folder
-     *
-     * @return Zend_Mail_Storage_Folder instance of current folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getCurrentFolder()
-    {
-        return $this->_currentFolder;
-    }
-
-    /**
-     * magic method for serialize()
-     *
-     * with this method you can cache the mbox class
-     *
-     * @return array name of variables
-     */
-    public function __sleep()
-    {
-        return array_merge(parent::__sleep(), array('_currentFolder', '_rootFolder', '_rootdir'));
-    }
-
-    /**
-     * magic method for unserialize()
-     *
-     * with this method you can cache the mbox class
-     *
-     * @return null
-     */
-    public function __wakeup()
-    {
-        // if cache is stall selectFolder() rebuilds the tree on error
-        parent::__wakeup();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Imap.php b/airtime_mvc/library/Zend/Mail/Storage/Imap.php
deleted file mode 100644
index 0910e6fe6..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Imap.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Abstract
- */
-require_once 'Zend/Mail/Storage/Abstract.php';
-
-/**
- * @see Zend_Mail_Protocol_Imap
- */
-require_once 'Zend/Mail/Protocol/Imap.php';
-
-/**
- * @see Zend_Mail_Storage_Writable_Interface
- */
-require_once 'Zend/Mail/Storage/Writable/Interface.php';
-
-/**
- * @see Zend_Mail_Storage_Folder_Interface
- */
-require_once 'Zend/Mail/Storage/Folder/Interface.php';
-
-/**
- * @see Zend_Mail_Storage_Folder
- */
-require_once 'Zend/Mail/Storage/Folder.php';
-
-/**
- * @see Zend_Mail_Message
- */
-require_once 'Zend/Mail/Message.php';
-
-/**
- * @see Zend_Mail_Storage
- */
-require_once 'Zend/Mail/Storage.php';
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract
-                             implements Zend_Mail_Storage_Folder_Interface, Zend_Mail_Storage_Writable_Interface
-{
-    // TODO: with an internal cache we could optimize this class, or create an extra class with
-    // such optimizations. Especially the various fetch calls could be combined to one cache call
-
-    /**
-     * protocol handler
-     * @var null|Zend_Mail_Protocol_Imap
-     */
-    protected $_protocol;
-
-    /**
-     * name of current folder
-     * @var string
-     */
-    protected $_currentFolder = '';
-
-    /**
-     * imap flags to constants translation
-     * @var array
-     */
-    protected static $_knownFlags = array('\Passed'   => Zend_Mail_Storage::FLAG_PASSED,
-                                          '\Answered' => Zend_Mail_Storage::FLAG_ANSWERED,
-                                          '\Seen'     => Zend_Mail_Storage::FLAG_SEEN,
-                                          '\Deleted'  => Zend_Mail_Storage::FLAG_DELETED,
-                                          '\Draft'    => Zend_Mail_Storage::FLAG_DRAFT,
-                                          '\Flagged'  => Zend_Mail_Storage::FLAG_FLAGGED);
-
-    /**
-     * map flags to search criterias
-     * @var array
-     */
-    protected static $_searchFlags = array('\Recent'   => 'RECENT',
-                                           '\Answered' => 'ANSWERED',
-                                           '\Seen'     => 'SEEN',
-                                           '\Deleted'  => 'DELETED',
-                                           '\Draft'    => 'DRAFT',
-                                           '\Flagged'  => 'FLAGGED');
-
-    /**
-     * Count messages all messages in current box
-     *
-     * @return int number of messages
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function countMessages($flags = null)
-    {
-        if (!$this->_currentFolder) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('No selected folder to count');
-        }
-
-        if ($flags === null) {
-            return count($this->_protocol->search(array('ALL')));
-        }
-
-        $params = array();
-        foreach ((array)$flags as $flag) {
-            if (isset(self::$_searchFlags[$flag])) {
-                $params[] = self::$_searchFlags[$flag];
-            } else {
-                $params[] = 'KEYWORD';
-                $params[] = $this->_protocol->escapeString($flag);
-            }
-        }
-        return count($this->_protocol->search($params));
-    }
-
-    /**
-     * get a list of messages with number and size
-     *
-     * @param int $id number of message
-     * @return int|array size of given message of list with all messages as array(num => size)
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getSize($id = 0)
-    {
-        if ($id) {
-            return $this->_protocol->fetch('RFC822.SIZE', $id);
-        }
-        return $this->_protocol->fetch('RFC822.SIZE', 1, INF);
-    }
-
-    /**
-     * Fetch a message
-     *
-     * @param int $id number of message
-     * @return Zend_Mail_Message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getMessage($id)
-    {
-        $data = $this->_protocol->fetch(array('FLAGS', 'RFC822.HEADER'), $id);
-        $header = $data['RFC822.HEADER'];
-
-        $flags = array();
-        foreach ($data['FLAGS'] as $flag) {
-            $flags[] = isset(self::$_knownFlags[$flag]) ? self::$_knownFlags[$flag] : $flag;
-        }
-
-        return new $this->_messageClass(array('handler' => $this, 'id' => $id, 'headers' => $header, 'flags' => $flags));
-    }
-
-    /*
-     * Get raw header of message or part
-     *
-     * @param  int               $id       number of message
-     * @param  null|array|string $part     path to part or null for messsage header
-     * @param  int               $topLines include this many lines with header (after an empty line)
-     * @param  int $topLines include this many lines with header (after an empty line)
-     * @return string raw header
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawHeader($id, $part = null, $topLines = 0)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        // TODO: toplines
-        return $this->_protocol->fetch('RFC822.HEADER', $id);
-    }
-
-    /*
-     * Get raw content of message or part
-     *
-     * @param  int               $id   number of message
-     * @param  null|array|string $part path to part or null for messsage content
-     * @return string raw content
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawContent($id, $part = null)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        return $this->_protocol->fetch('RFC822.TEXT', $id);
-    }
-
-    /**
-     * create instance with parameters
-     * Supported paramters are
-     *   - user username
-     *   - host hostname or ip address of IMAP server [optional, default = 'localhost']
-     *   - password password for user 'username' [optional, default = '']
-     *   - port port for IMAP server [optional, default = 110]
-     *   - ssl 'SSL' or 'TLS' for secure sockets
-     *   - folder select this folder [optional, default = 'INBOX']
-     *
-     * @param  array $params mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        $this->_has['flags'] = true;
-
-        if ($params instanceof Zend_Mail_Protocol_Imap) {
-            $this->_protocol = $params;
-            try {
-                $this->selectFolder('INBOX');
-            } catch(Zend_Mail_Storage_Exception $e) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?', 0, $e);
-            }
-            return;
-        }
-
-        if (!isset($params->user)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('need at least user in params');
-        }
-
-        $host     = isset($params->host)     ? $params->host     : 'localhost';
-        $password = isset($params->password) ? $params->password : '';
-        $port     = isset($params->port)     ? $params->port     : null;
-        $ssl      = isset($params->ssl)      ? $params->ssl      : false;
-
-        $this->_protocol = new Zend_Mail_Protocol_Imap();
-        $this->_protocol->connect($host, $port, $ssl);
-        if (!$this->_protocol->login($params->user, $password)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot login, user or password wrong');
-        }
-        $this->selectFolder(isset($params->folder) ? $params->folder : 'INBOX');
-    }
-
-    /**
-     * Close resource for mail lib. If you need to control, when the resource
-     * is closed. Otherwise the destructor would call this.
-     *
-     * @return null
-     */
-    public function close()
-    {
-        $this->_currentFolder = '';
-        $this->_protocol->logout();
-    }
-
-    /**
-     * Keep the server busy.
-     *
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function noop()
-    {
-        if (!$this->_protocol->noop()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('could not do nothing');
-        }
-    }
-
-    /**
-     * Remove a message from server. If you're doing that from a web enviroment
-     * you should be careful and use a uniqueid as parameter if possible to
-     * identify the message.
-     *
-     * @param   int $id number of message
-     * @return  null
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function removeMessage($id)
-    {
-        if (!$this->_protocol->store(array(Zend_Mail_Storage::FLAG_DELETED), $id, null, '+')) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot set deleted flag');
-        }
-        // TODO: expunge here or at close? we can handle an error here better and are more fail safe
-        if (!$this->_protocol->expunge()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('message marked as deleted, but could not expunge');
-        }
-    }
-
-    /**
-     * get unique id for one or all messages
-     *
-     * if storage does not support unique ids it's the same as the message number
-     *
-     * @param int|null $id message number
-     * @return array|string message number for given message or all messages as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getUniqueId($id = null)
-    {
-        if ($id) {
-            return $this->_protocol->fetch('UID', $id);
-        }
-
-        return $this->_protocol->fetch('UID', 1, INF);
-    }
-
-    /**
-     * get a message number from a unique id
-     *
-     * I.e. if you have a webmailer that supports deleting messages you should use unique ids
-     * as parameter and use this method to translate it to message number right before calling removeMessage()
-     *
-     * @param string $id unique id
-     * @return int message number
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getNumberByUniqueId($id)
-    {
-        // TODO: use search to find number directly
-        $ids = $this->getUniqueId();
-        foreach ($ids as $k => $v) {
-            if ($v == $id) {
-                return $k;
-            }
-        }
-
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('unique id not found');
-    }
-
-
-    /**
-     * get root folder or given folder
-     *
-     * @param  string $rootFolder get folder structure for given folder, else root
-     * @return Zend_Mail_Storage_Folder root or wanted folder
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getFolders($rootFolder = null)
-    {
-        $folders = $this->_protocol->listMailbox((string)$rootFolder);
-        if (!$folders) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('folder not found');
-        }
-
-        ksort($folders, SORT_STRING);
-        $root = new Zend_Mail_Storage_Folder('/', '/', false);
-        $stack = array(null);
-        $folderStack = array(null);
-        $parentFolder = $root;
-        $parent = '';
-
-        foreach ($folders as $globalName => $data) {
-            do {
-                if (!$parent || strpos($globalName, $parent) === 0) {
-                    $pos = strrpos($globalName, $data['delim']);
-                    if ($pos === false) {
-                        $localName = $globalName;
-                    } else {
-                        $localName = substr($globalName, $pos + 1);
-                    }
-                    $selectable = !$data['flags'] || !in_array('\\Noselect', $data['flags']);
-
-                    array_push($stack, $parent);
-                    $parent = $globalName . $data['delim'];
-                    $folder = new Zend_Mail_Storage_Folder($localName, $globalName, $selectable);
-                    $parentFolder->$localName = $folder;
-                    array_push($folderStack, $parentFolder);
-                    $parentFolder = $folder;
-                    break;
-                } else if ($stack) {
-                    $parent = array_pop($stack);
-                    $parentFolder = array_pop($folderStack);
-                }
-            } while ($stack);
-            if (!$stack) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('error while constructing folder tree');
-            }
-        }
-
-        return $root;
-    }
-
-    /**
-     * select given folder
-     *
-     * folder must be selectable!
-     *
-     * @param  Zend_Mail_Storage_Folder|string $globalName global name of folder or instance for subfolder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function selectFolder($globalName)
-    {
-        $this->_currentFolder = $globalName;
-        if (!$this->_protocol->select($this->_currentFolder)) {
-            $this->_currentFolder = '';
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot change folder, maybe it does not exist');
-        }
-    }
-
-
-    /**
-     * get Zend_Mail_Storage_Folder instance for current folder
-     *
-     * @return Zend_Mail_Storage_Folder instance of current folder
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getCurrentFolder()
-    {
-        return $this->_currentFolder;
-    }
-
-    /**
-     * create a new folder
-     *
-     * This method also creates parent folders if necessary. Some mail storages may restrict, which folder
-     * may be used as parent or which chars may be used in the folder name
-     *
-     * @param  string                          $name         global name of folder, local name if $parentFolder is set
-     * @param  string|Zend_Mail_Storage_Folder $parentFolder parent folder for new folder, else root folder is parent
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function createFolder($name, $parentFolder = null)
-    {
-        // TODO: we assume / as the hierarchy delim - need to get that from the folder class!
-        if ($parentFolder instanceof Zend_Mail_Storage_Folder) {
-            $folder = $parentFolder->getGlobalName() . '/' . $name;
-        } else if ($parentFolder != null) {
-            $folder = $parentFolder . '/' . $name;
-        } else {
-            $folder = $name;
-        }
-
-        if (!$this->_protocol->create($folder)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot create folder');
-        }
-    }
-
-    /**
-     * remove a folder
-     *
-     * @param  string|Zend_Mail_Storage_Folder $name      name or instance of folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function removeFolder($name)
-    {
-        if ($name instanceof Zend_Mail_Storage_Folder) {
-            $name = $name->getGlobalName();
-        }
-
-        if (!$this->_protocol->delete($name)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot delete folder');
-        }
-    }
-
-    /**
-     * rename and/or move folder
-     *
-     * The new name has the same restrictions as in createFolder()
-     *
-     * @param  string|Zend_Mail_Storage_Folder $oldName name or instance of folder
-     * @param  string                          $newName new global name of folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function renameFolder($oldName, $newName)
-    {
-        if ($oldName instanceof Zend_Mail_Storage_Folder) {
-            $oldName = $oldName->getGlobalName();
-        }
-
-        if (!$this->_protocol->rename($oldName, $newName)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot rename folder');
-        }
-    }
-
-    /**
-     * append a new message to mail storage
-     *
-     * @param  string                                     $message message as string or instance of message class
-     * @param  null|string|Zend_Mail_Storage_Folder       $folder  folder for new message, else current folder is taken
-     * @param  null|array                                 $flags   set flags for new message, else a default set is used
-     * @throws Zend_Mail_Storage_Exception
-     */
-     // not yet * @param string|Zend_Mail_Message|Zend_Mime_Message $message message as string or instance of message class
-    public function appendMessage($message, $folder = null, $flags = null)
-    {
-        if ($folder === null) {
-            $folder = $this->_currentFolder;
-        }
-
-        if ($flags === null) {
-            $flags = array(Zend_Mail_Storage::FLAG_SEEN);
-        }
-
-        // TODO: handle class instances for $message
-        if (!$this->_protocol->append($folder, $message, $flags)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot create message, please check if the folder exists and your flags');
-        }
-    }
-
-    /**
-     * copy an existing message
-     *
-     * @param  int                             $id     number of message
-     * @param  string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function copyMessage($id, $folder)
-    {
-        if (!$this->_protocol->copy($folder, $id)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot copy message, does the folder exist?');
-        }
-    }
-
-    /**
-     * move an existing message
-     *
-     * NOTE: imap has no native move command, thus it's emulated with copy and delete
-     *
-     * @param  int                             $id     number of message
-     * @param  string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function moveMessage($id, $folder) {
-        $this->copyMessage($id, $folder);
-        $this->removeMessage($id);
-    }
-
-    /**
-     * set flags for message
-     *
-     * NOTE: this method can't set the recent flag.
-     *
-     * @param  int   $id    number of message
-     * @param  array $flags new flags for message
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function setFlags($id, $flags)
-    {
-        if (!$this->_protocol->store($flags, $id)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot set flags, have you tried to set the recent flag or special chars?');
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Maildir.php b/airtime_mvc/library/Zend/Mail/Storage/Maildir.php
deleted file mode 100644
index 2bb4b00e9..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Maildir.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Abstract
- */
-require_once 'Zend/Mail/Storage/Abstract.php';
-
-/**
- * @see Zend_Mail_Message_File
- */
-require_once 'Zend/Mail/Message/File.php';
-
-/**
- * @see Zend_Mail_Storage
- */
-require_once 'Zend/Mail/Storage.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract
-{
-    /**
-     * used message class, change it in an extened class to extend the returned message class
-     * @var string
-     */
-    protected $_messageClass = 'Zend_Mail_Message_File';
-
-    /**
-     * data of found message files in maildir dir
-     * @var array
-     */
-    protected $_files = array();
-
-    /**
-     * known flag chars in filenames
-     *
-     * This list has to be in alphabetical order for setFlags()
-     *
-     * @var array
-     */
-    protected static $_knownFlags = array('D' => Zend_Mail_Storage::FLAG_DRAFT,
-                                          'F' => Zend_Mail_Storage::FLAG_FLAGGED,
-                                          'P' => Zend_Mail_Storage::FLAG_PASSED,
-                                          'R' => Zend_Mail_Storage::FLAG_ANSWERED,
-                                          'S' => Zend_Mail_Storage::FLAG_SEEN,
-                                          'T' => Zend_Mail_Storage::FLAG_DELETED);
-
-    // TODO: getFlags($id) for fast access if headers are not needed (i.e. just setting flags)?
-
-    /**
-     * Count messages all messages in current box
-     *
-     * @return int number of messages
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function countMessages($flags = null)
-    {
-        if ($flags === null) {
-            return count($this->_files);
-        }
-
-        $count = 0;
-        if (!is_array($flags)) {
-            foreach ($this->_files as $file) {
-                if (isset($file['flaglookup'][$flags])) {
-                    ++$count;
-                }
-            }
-            return $count;
-        }
-
-        $flags = array_flip($flags);
-           foreach ($this->_files as $file) {
-               foreach ($flags as $flag => $v) {
-                   if (!isset($file['flaglookup'][$flag])) {
-                       continue 2;
-                   }
-               }
-               ++$count;
-           }
-           return $count;
-    }
-
-    /**
-     * Get one or all fields from file structure. Also checks if message is valid
-     *
-     * @param  int         $id    message number
-     * @param  string|null $field wanted field
-     * @return string|array wanted field or all fields as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _getFileData($id, $field = null)
-    {
-        if (!isset($this->_files[$id - 1])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('id does not exist');
-        }
-
-        if (!$field) {
-            return $this->_files[$id - 1];
-        }
-
-        if (!isset($this->_files[$id - 1][$field])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('field does not exist');
-        }
-
-        return $this->_files[$id - 1][$field];
-    }
-
-    /**
-     * Get a list of messages with number and size
-     *
-     * @param  int|null $id number of message or null for all messages
-     * @return int|array size of given message of list with all messages as array(num => size)
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getSize($id = null)
-    {
-        if ($id !== null) {
-            $filedata = $this->_getFileData($id);
-            return isset($filedata['size']) ? $filedata['size'] : filesize($filedata['filename']);
-        }
-
-        $result = array();
-        foreach ($this->_files as $num => $data) {
-            $result[$num + 1] = isset($data['size']) ? $data['size'] : filesize($data['filename']);
-        }
-
-        return $result;
-    }
-
-
-
-    /**
-     * Fetch a message
-     *
-     * @param  int $id number of message
-     * @return Zend_Mail_Message_File
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getMessage($id)
-    {
-        // TODO that's ugly, would be better to let the message class decide
-        if (strtolower($this->_messageClass) == 'zend_mail_message_file' || is_subclass_of($this->_messageClass, 'zend_mail_message_file')) {
-            return new $this->_messageClass(array('file'  => $this->_getFileData($id, 'filename'),
-                                                  'flags' => $this->_getFileData($id, 'flags')));
-        }
-
-        return new $this->_messageClass(array('handler' => $this, 'id' => $id, 'headers' => $this->getRawHeader($id),
-                                              'flags'   => $this->_getFileData($id, 'flags')));
-    }
-
-    /*
-     * Get raw header of message or part
-     *
-     * @param  int               $id       number of message
-     * @param  null|array|string $part     path to part or null for messsage header
-     * @param  int               $topLines include this many lines with header (after an empty line)
-     * @return string raw header
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawHeader($id, $part = null, $topLines = 0)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        $fh = fopen($this->_getFileData($id, 'filename'), 'r');
-
-        $content = '';
-        while (!feof($fh)) {
-            $line = fgets($fh);
-            if (!trim($line)) {
-                break;
-            }
-            $content .= $line;
-        }
-
-        fclose($fh);
-        return $content;
-    }
-
-    /*
-     * Get raw content of message or part
-     *
-     * @param  int               $id   number of message
-     * @param  null|array|string $part path to part or null for messsage content
-     * @return string raw content
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawContent($id, $part = null)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        $fh = fopen($this->_getFileData($id, 'filename'), 'r');
-
-        while (!feof($fh)) {
-            $line = fgets($fh);
-            if (!trim($line)) {
-                break;
-            }
-        }
-
-        $content = stream_get_contents($fh);
-        fclose($fh);
-        return $content;
-    }
-
-    /**
-     * Create instance with parameters
-     * Supported parameters are:
-     *   - dirname dirname of mbox file
-     *
-     * @param  $params array mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        if (!isset($params->dirname) || !is_dir($params->dirname)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('no valid dirname given in params');
-        }
-
-        if (!$this->_isMaildir($params->dirname)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('invalid maildir given');
-        }
-
-        $this->_has['top'] = true;
-        $this->_has['flags'] = true;
-        $this->_openMaildir($params->dirname);
-    }
-
-    /**
-     * check if a given dir is a valid maildir
-     *
-     * @param string $dirname name of dir
-     * @return bool dir is valid maildir
-     */
-    protected function _isMaildir($dirname)
-    {
-        if (file_exists($dirname . '/new') && !is_dir($dirname . '/new')) {
-            return false;
-        }
-        if (file_exists($dirname . '/tmp') && !is_dir($dirname . '/tmp')) {
-            return false;
-        }
-        return is_dir($dirname . '/cur');
-    }
-
-    /**
-     * open given dir as current maildir
-     *
-     * @param string $dirname name of maildir
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _openMaildir($dirname)
-    {
-        if ($this->_files) {
-            $this->close();
-        }
-
-        $dh = @opendir($dirname . '/cur/');
-        if (!$dh) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot open maildir');
-        }
-        $this->_getMaildirFiles($dh, $dirname . '/cur/');
-        closedir($dh);
-
-        $dh = @opendir($dirname . '/new/');
-        if ($dh) {
-            $this->_getMaildirFiles($dh, $dirname . '/new/', array(Zend_Mail_Storage::FLAG_RECENT));
-            closedir($dh);
-        } else if (file_exists($dirname . '/new/')) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot read recent mails in maildir');
-        }
-    }
-
-    /**
-     * find all files in opened dir handle and add to maildir files
-     *
-     * @param resource $dh            dir handle used for search
-     * @param string   $dirname       dirname of dir in $dh
-     * @param array    $default_flags default flags for given dir
-     * @return null
-     */
-    protected function _getMaildirFiles($dh, $dirname, $default_flags = array())
-    {
-        while (($entry = readdir($dh)) !== false) {
-            if ($entry[0] == '.' || !is_file($dirname . $entry)) {
-                continue;
-            }
-
-            @list($uniq, $info) = explode(':', $entry, 2);
-            @list(,$size) = explode(',', $uniq, 2);
-            if ($size && $size[0] == 'S' && $size[1] == '=') {
-                $size = substr($size, 2);
-            }
-            if (!ctype_digit($size)) {
-                $size = null;
-            }
-            @list($version, $flags) = explode(',', $info, 2);
-            if ($version != 2) {
-                $flags = '';
-            }
-
-            $named_flags = $default_flags;
-            $length = strlen($flags);
-            for ($i = 0; $i < $length; ++$i) {
-                $flag = $flags[$i];
-                $named_flags[$flag] = isset(self::$_knownFlags[$flag]) ? self::$_knownFlags[$flag] : $flag;
-            }
-
-            $data = array('uniq'       => $uniq,
-                          'flags'      => $named_flags,
-                          'flaglookup' => array_flip($named_flags),
-                          'filename'   => $dirname . $entry);
-            if ($size !== null) {
-                $data['size'] = (int)$size;
-            }
-            $this->_files[] = $data;
-        }
-    }
-
-
-    /**
-     * Close resource for mail lib. If you need to control, when the resource
-     * is closed. Otherwise the destructor would call this.
-     *
-     * @return void
-     */
-    public function close()
-    {
-        $this->_files = array();
-    }
-
-
-    /**
-     * Waste some CPU cycles doing nothing.
-     *
-     * @return void
-     */
-    public function noop()
-    {
-        return true;
-    }
-
-
-    /**
-     * stub for not supported message deletion
-     *
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function removeMessage($id)
-    {
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('maildir is (currently) read-only');
-    }
-
-    /**
-     * get unique id for one or all messages
-     *
-     * if storage does not support unique ids it's the same as the message number
-     *
-     * @param int|null $id message number
-     * @return array|string message number for given message or all messages as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getUniqueId($id = null)
-    {
-        if ($id) {
-            return $this->_getFileData($id, 'uniq');
-        }
-
-        $ids = array();
-        foreach ($this->_files as $num => $file) {
-            $ids[$num + 1] = $file['uniq'];
-        }
-        return $ids;
-    }
-
-    /**
-     * get a message number from a unique id
-     *
-     * I.e. if you have a webmailer that supports deleting messages you should use unique ids
-     * as parameter and use this method to translate it to message number right before calling removeMessage()
-     *
-     * @param string $id unique id
-     * @return int message number
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getNumberByUniqueId($id)
-    {
-        foreach ($this->_files as $num => $file) {
-            if ($file['uniq'] == $id) {
-                return $num + 1;
-            }
-        }
-
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('unique id not found');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Mbox.php b/airtime_mvc/library/Zend/Mail/Storage/Mbox.php
deleted file mode 100644
index 3398c31b9..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Mbox.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Loader
- * May be used in constructor, but commented out for now
- */
-// require_once 'Zend/Loader.php';
-
-/**
- * @see Zend_Mail_Storage_Abstract
- */
-require_once 'Zend/Mail/Storage/Abstract.php';
-
-/**
- * @see Zend_Mail_Message_File
- */
-require_once 'Zend/Mail/Message/File.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract
-{
-    /**
-     * file handle to mbox file
-     * @var null|resource
-     */
-    protected $_fh;
-
-    /**
-     * filename of mbox file for __wakeup
-     * @var string
-     */
-    protected $_filename;
-
-    /**
-     * modification date of mbox file for __wakeup
-     * @var int
-     */
-    protected $_filemtime;
-
-    /**
-     * start and end position of messages as array('start' => start, 'seperator' => headersep, 'end' => end)
-     * @var array
-     */
-    protected $_positions;
-
-    /**
-     * used message class, change it in an extened class to extend the returned message class
-     * @var string
-     */
-    protected $_messageClass = 'Zend_Mail_Message_File';
-
-    /**
-     * Count messages all messages in current box
-     *
-     * @return int number of messages
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function countMessages()
-    {
-        return count($this->_positions);
-    }
-
-
-    /**
-     * Get a list of messages with number and size
-     *
-     * @param  int|null $id  number of message or null for all messages
-     * @return int|array size of given message of list with all messages as array(num => size)
-     */
-    public function getSize($id = 0)
-    {
-        if ($id) {
-            $pos = $this->_positions[$id - 1];
-            return $pos['end'] - $pos['start'];
-        }
-
-        $result = array();
-        foreach ($this->_positions as $num => $pos) {
-            $result[$num + 1] = $pos['end'] - $pos['start'];
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Get positions for mail message or throw exeption if id is invalid
-     *
-     * @param int $id number of message
-     * @return array positions as in _positions
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _getPos($id)
-    {
-        if (!isset($this->_positions[$id - 1])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('id does not exist');
-        }
-
-        return $this->_positions[$id - 1];
-    }
-
-
-    /**
-     * Fetch a message
-     *
-     * @param  int $id number of message
-     * @return Zend_Mail_Message_File
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getMessage($id)
-    {
-        // TODO that's ugly, would be better to let the message class decide
-        if (strtolower($this->_messageClass) == 'zend_mail_message_file' || is_subclass_of($this->_messageClass, 'zend_mail_message_file')) {
-            // TODO top/body lines
-            $messagePos = $this->_getPos($id);
-            return new $this->_messageClass(array('file' => $this->_fh, 'startPos' => $messagePos['start'],
-                                                  'endPos' => $messagePos['end']));
-        }
-
-        $bodyLines = 0; // TODO: need a way to change that
-
-        $message = $this->getRawHeader($id);
-        // file pointer is after headers now
-        if ($bodyLines) {
-            $message .= "\n";
-            while ($bodyLines-- && ftell($this->_fh) < $this->_positions[$id - 1]['end']) {
-                $message .= fgets($this->_fh);
-            }
-        }
-
-        return new $this->_messageClass(array('handler' => $this, 'id' => $id, 'headers' => $message));
-    }
-
-    /*
-     * Get raw header of message or part
-     *
-     * @param  int               $id       number of message
-     * @param  null|array|string $part     path to part or null for messsage header
-     * @param  int               $topLines include this many lines with header (after an empty line)
-     * @return string raw header
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawHeader($id, $part = null, $topLines = 0)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-        $messagePos = $this->_getPos($id);
-        // TODO: toplines
-        return stream_get_contents($this->_fh, $messagePos['separator'] - $messagePos['start'], $messagePos['start']);
-    }
-
-    /*
-     * Get raw content of message or part
-     *
-     * @param  int               $id   number of message
-     * @param  null|array|string $part path to part or null for messsage content
-     * @return string raw content
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawContent($id, $part = null)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-        $messagePos = $this->_getPos($id);
-        return stream_get_contents($this->_fh, $messagePos['end'] - $messagePos['separator'], $messagePos['separator']);
-    }
-
-    /**
-     * Create instance with parameters
-     * Supported parameters are:
-     *   - filename filename of mbox file
-     *
-     * @param  $params array mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        if (!isset($params->filename) /* || Zend_Loader::isReadable($params['filename']) */) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('no valid filename given in params');
-        }
-
-        $this->_openMboxFile($params->filename);
-        $this->_has['top']      = true;
-        $this->_has['uniqueid'] = false;
-    }
-
-    /**
-     * check if given file is a mbox file
-     *
-     * if $file is a resource its file pointer is moved after the first line
-     *
-     * @param  resource|string $file stream resource of name of file
-     * @param  bool $fileIsString file is string or resource
-     * @return bool file is mbox file
-     */
-    protected function _isMboxFile($file, $fileIsString = true)
-    {
-        if ($fileIsString) {
-            $file = @fopen($file, 'r');
-            if (!$file) {
-                return false;
-            }
-        } else {
-            fseek($file, 0);
-        }
-
-        $result = false;
-
-        $line = fgets($file);
-        if (strpos($line, 'From ') === 0) {
-            $result = true;
-        }
-
-        if ($fileIsString) {
-            @fclose($file);
-        }
-
-        return $result;
-    }
-
-    /**
-     * open given file as current mbox file
-     *
-     * @param  string $filename filename of mbox file
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    protected function _openMboxFile($filename)
-    {
-        if ($this->_fh) {
-            $this->close();
-        }
-
-        $this->_fh = @fopen($filename, 'r');
-        if (!$this->_fh) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot open mbox file');
-        }
-        $this->_filename = $filename;
-        $this->_filemtime = filemtime($this->_filename);
-
-        if (!$this->_isMboxFile($this->_fh, false)) {
-            @fclose($this->_fh);
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('file is not a valid mbox format');
-        }
-
-        $messagePos = array('start' => ftell($this->_fh), 'separator' => 0, 'end' => 0);
-        while (($line = fgets($this->_fh)) !== false) {
-            if (strpos($line, 'From ') === 0) {
-                $messagePos['end'] = ftell($this->_fh) - strlen($line) - 2; // + newline
-                if (!$messagePos['separator']) {
-                    $messagePos['separator'] = $messagePos['end'];
-                }
-                $this->_positions[] = $messagePos;
-                $messagePos = array('start' => ftell($this->_fh), 'separator' => 0, 'end' => 0);
-            }
-            if (!$messagePos['separator'] && !trim($line)) {
-                $messagePos['separator'] = ftell($this->_fh);
-            }
-        }
-
-        $messagePos['end'] = ftell($this->_fh);
-        if (!$messagePos['separator']) {
-            $messagePos['separator'] = $messagePos['end'];
-        }
-        $this->_positions[] = $messagePos;
-    }
-
-    /**
-     * Close resource for mail lib. If you need to control, when the resource
-     * is closed. Otherwise the destructor would call this.
-     *
-     * @return void
-     */
-    public function close()
-    {
-        @fclose($this->_fh);
-        $this->_positions = array();
-    }
-
-
-    /**
-     * Waste some CPU cycles doing nothing.
-     *
-     * @return void
-     */
-    public function noop()
-    {
-        return true;
-    }
-
-
-    /**
-     * stub for not supported message deletion
-     *
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function removeMessage($id)
-    {
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('mbox is read-only');
-    }
-
-    /**
-     * get unique id for one or all messages
-     *
-     * Mbox does not support unique ids (yet) - it's always the same as the message number.
-     * That shouldn't be a problem, because we can't change mbox files. Therefor the message
-     * number is save enough.
-     *
-     * @param int|null $id message number
-     * @return array|string message number for given message or all messages as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getUniqueId($id = null)
-    {
-        if ($id) {
-            // check if id exists
-            $this->_getPos($id);
-            return $id;
-        }
-
-        $range = range(1, $this->countMessages());
-        return array_combine($range, $range);
-    }
-
-    /**
-     * get a message number from a unique id
-     *
-     * I.e. if you have a webmailer that supports deleting messages you should use unique ids
-     * as parameter and use this method to translate it to message number right before calling removeMessage()
-     *
-     * @param string $id unique id
-     * @return int message number
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getNumberByUniqueId($id)
-    {
-        // check if id exists
-        $this->_getPos($id);
-        return $id;
-    }
-
-    /**
-     * magic method for serialize()
-     *
-     * with this method you can cache the mbox class
-     *
-     * @return array name of variables
-     */
-    public function __sleep()
-    {
-        return array('_filename', '_positions', '_filemtime');
-    }
-
-    /**
-     * magic method for unserialize()
-     *
-     * with this method you can cache the mbox class
-     * for cache validation the mtime of the mbox file is used
-     *
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __wakeup()
-    {
-        if ($this->_filemtime != @filemtime($this->_filename)) {
-            $this->close();
-            $this->_openMboxFile($this->_filename);
-        } else {
-            $this->_fh = @fopen($this->_filename, 'r');
-            if (!$this->_fh) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('cannot open mbox file');
-            }
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Pop3.php b/airtime_mvc/library/Zend/Mail/Storage/Pop3.php
deleted file mode 100644
index 78d8dea30..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Pop3.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Abstract
- */
-require_once 'Zend/Mail/Storage/Abstract.php';
-
-/**
- * @see Zend_Mail_Protocol_Pop3
- */
-require_once 'Zend/Mail/Protocol/Pop3.php';
-
-/**
- * @see Zend_Mail_Message
- */
-require_once 'Zend/Mail/Message.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract
-{
-    /**
-     * protocol handler
-     * @var null|Zend_Mail_Protocol_Pop3
-     */
-    protected $_protocol;
-
-
-    /**
-     * Count messages all messages in current box
-     *
-     * @return int number of messages
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function countMessages()
-    {
-        $this->_protocol->status($count, $null);
-        return (int)$count;
-    }
-
-    /**
-     * get a list of messages with number and size
-     *
-     * @param int $id number of message
-     * @return int|array size of given message of list with all messages as array(num => size)
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getSize($id = 0)
-    {
-        $id = $id ? $id : null;
-        return $this->_protocol->getList($id);
-    }
-
-    /**
-     * Fetch a message
-     *
-     * @param int $id number of message
-     * @return Zend_Mail_Message
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function getMessage($id)
-    {
-        $bodyLines = 0;
-        $message = $this->_protocol->top($id, $bodyLines, true);
-
-        return new $this->_messageClass(array('handler' => $this, 'id' => $id, 'headers' => $message,
-                                              'noToplines' => $bodyLines < 1));
-    }
-
-    /*
-     * Get raw header of message or part
-     *
-     * @param  int               $id       number of message
-     * @param  null|array|string $part     path to part or null for messsage header
-     * @param  int               $topLines include this many lines with header (after an empty line)
-     * @return string raw header
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawHeader($id, $part = null, $topLines = 0)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        return $this->_protocol->top($id, 0, true);
-    }
-
-    /*
-     * Get raw content of message or part
-     *
-     * @param  int               $id   number of message
-     * @param  null|array|string $part path to part or null for messsage content
-     * @return string raw content
-     * @throws Zend_Mail_Protocol_Exception
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getRawContent($id, $part = null)
-    {
-        if ($part !== null) {
-            // TODO: implement
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('not implemented');
-        }
-
-        $content = $this->_protocol->retrieve($id);
-        // TODO: find a way to avoid decoding the headers
-        Zend_Mime_Decode::splitMessage($content, $null, $body);
-        return $body;
-    }
-
-    /**
-     * create instance with parameters
-     * Supported paramters are
-     *   - host hostname or ip address of POP3 server
-     *   - user username
-     *   - password password for user 'username' [optional, default = '']
-     *   - port port for POP3 server [optional, default = 110]
-     *   - ssl 'SSL' or 'TLS' for secure sockets
-     *
-     * @param  $params array  mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function __construct($params)
-    {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        $this->_has['fetchPart'] = false;
-        $this->_has['top']       = null;
-        $this->_has['uniqueid']  = null;
-
-        if ($params instanceof Zend_Mail_Protocol_Pop3) {
-            $this->_protocol = $params;
-            return;
-        }
-
-        if (!isset($params->user)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('need at least user in params');
-        }
-
-        $host     = isset($params->host)     ? $params->host     : 'localhost';
-        $password = isset($params->password) ? $params->password : '';
-        $port     = isset($params->port)     ? $params->port     : null;
-        $ssl      = isset($params->ssl)      ? $params->ssl      : false;
-
-        $this->_protocol = new Zend_Mail_Protocol_Pop3();
-        $this->_protocol->connect($host, $port, $ssl);
-        $this->_protocol->login($params->user, $password);
-    }
-
-    /**
-     * Close resource for mail lib. If you need to control, when the resource
-     * is closed. Otherwise the destructor would call this.
-     *
-     * @return null
-     */
-    public function close()
-    {
-        $this->_protocol->logout();
-    }
-
-    /**
-     * Keep the server busy.
-     *
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function noop()
-    {
-        return $this->_protocol->noop();
-    }
-
-    /**
-     * Remove a message from server. If you're doing that from a web enviroment
-     * you should be careful and use a uniqueid as parameter if possible to
-     * identify the message.
-     *
-     * @param  int $id number of message
-     * @return null
-     * @throws Zend_Mail_Protocol_Exception
-     */
-    public function removeMessage($id)
-    {
-        $this->_protocol->delete($id);
-    }
-
-    /**
-     * get unique id for one or all messages
-     *
-     * if storage does not support unique ids it's the same as the message number
-     *
-     * @param int|null $id message number
-     * @return array|string message number for given message or all messages as array
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getUniqueId($id = null)
-    {
-        if (!$this->hasUniqueid) {
-            if ($id) {
-                return $id;
-            }
-            $count = $this->countMessages();
-            if ($count < 1) {
-                return array();
-            }
-            $range = range(1, $count);
-            return array_combine($range, $range);
-        }
-
-        return $this->_protocol->uniqueid($id);
-    }
-
-    /**
-     * get a message number from a unique id
-     *
-     * I.e. if you have a webmailer that supports deleting messages you should use unique ids
-     * as parameter and use this method to translate it to message number right before calling removeMessage()
-     *
-     * @param string $id unique id
-     * @return int message number
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function getNumberByUniqueId($id)
-    {
-        if (!$this->hasUniqueid) {
-            return $id;
-        }
-
-        $ids = $this->getUniqueId();
-        foreach ($ids as $k => $v) {
-            if ($v == $id) {
-                return $k;
-            }
-        }
-
-        /**
-         * @see Zend_Mail_Storage_Exception
-         */
-        require_once 'Zend/Mail/Storage/Exception.php';
-        throw new Zend_Mail_Storage_Exception('unique id not found');
-    }
-
-    /**
-     * Special handling for hasTop and hasUniqueid. The headers of the first message is
-     * retrieved if Top wasn't needed/tried yet.
-     *
-     * @see Zend_Mail_Storage_Abstract:__get()
-     * @param  string $var
-     * @return string
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __get($var)
-    {
-        $result = parent::__get($var);
-        if ($result !== null) {
-            return $result;
-        }
-
-        if (strtolower($var) == 'hastop') {
-            if ($this->_protocol->hasTop === null) {
-                // need to make a real call, because not all server are honest in their capas
-                try {
-                    $this->_protocol->top(1, 0, false);
-                } catch(Zend_Mail_Exception $e) {
-                    // ignoring error
-                }
-            }
-            $this->_has['top'] = $this->_protocol->hasTop;
-            return $this->_protocol->hasTop;
-        }
-
-        if (strtolower($var) == 'hasuniqueid') {
-            $id = null;
-            try {
-                $id = $this->_protocol->uniqueid(1);
-            } catch(Zend_Mail_Exception $e) {
-                // ignoring error
-            }
-            $this->_has['uniqueid'] = $id ? true : false;
-            return $this->_has['uniqueid'];
-        }
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Writable/Interface.php b/airtime_mvc/library/Zend/Mail/Storage/Writable/Interface.php
deleted file mode 100644
index 982b44eeb..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Writable/Interface.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-interface Zend_Mail_Storage_Writable_Interface
-{
-    /**
-     * create a new folder
-     *
-     * This method also creates parent folders if necessary. Some mail storages may restrict, which folder
-     * may be used as parent or which chars may be used in the folder name
-     *
-     * @param string                          $name         global name of folder, local name if $parentFolder is set
-     * @param string|Zend_Mail_Storage_Folder $parentFolder parent folder for new folder, else root folder is parent
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function createFolder($name, $parentFolder = null);
-
-    /**
-     * remove a folder
-     *
-     * @param string|Zend_Mail_Storage_Folder $name      name or instance of folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function removeFolder($name);
-
-    /**
-     * rename and/or move folder
-     *
-     * The new name has the same restrictions as in createFolder()
-     *
-     * @param string|Zend_Mail_Storage_Folder $oldName name or instance of folder
-     * @param string                          $newName new global name of folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function renameFolder($oldName, $newName);
-
-    /**
-     * append a new message to mail storage
-     *
-     * @param  string|Zend_Mail_Message|Zend_Mime_Message $message message as string or instance of message class
-     * @param  null|string|Zend_Mail_Storage_Folder       $folder  folder for new message, else current folder is taken
-     * @param  null|array                                 $flags   set flags for new message, else a default set is used
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function appendMessage($message, $folder = null, $flags = null);
-
-    /**
-     * copy an existing message
-     *
-     * @param  int                             $id     number of message
-     * @param  string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function copyMessage($id, $folder);
-
-    /**
-     * move an existing message
-     *
-     * @param  int                             $id     number of message
-     * @param  string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function moveMessage($id, $folder);
-
-    /**
-     * set flags for message
-     *
-     * NOTE: this method can't set the recent flag.
-     *
-     * @param  int   $id    number of message
-     * @param  array $flags new flags for message
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function setFlags($id, $flags);
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Mail/Storage/Writable/Maildir.php b/airtime_mvc/library/Zend/Mail/Storage/Writable/Maildir.php
deleted file mode 100644
index 328804055..000000000
--- a/airtime_mvc/library/Zend/Mail/Storage/Writable/Maildir.php
+++ /dev/null
@@ -1,1049 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Storage_Folder_Maildir
- */
-require_once 'Zend/Mail/Storage/Folder/Maildir.php';
-
-/**
- * @see Zend_Mail_Storage_Writable_Interface
- */
-require_once 'Zend/Mail/Storage/Writable/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Storage_Writable_Maildir extends    Zend_Mail_Storage_Folder_Maildir
-                                         implements Zend_Mail_Storage_Writable_Interface
-{
-    // TODO: init maildir (+ constructor option create if not found)
-
-    /**
-     * use quota and size of quota if given
-     * @var bool|int
-     */
-    protected $_quota;
-
-    /**
-     * create a new maildir
-     *
-     * If the given dir is already a valid maildir this will not fail.
-     *
-     * @param string $dir directory for the new maildir (may already exist)
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public static function initMaildir($dir)
-    {
-        if (file_exists($dir)) {
-            if (!is_dir($dir)) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('maildir must be a directory if already exists');
-            }
-        } else {
-            if (!mkdir($dir)) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                $dir = dirname($dir);
-                if (!file_exists($dir)) {
-                    throw new Zend_Mail_Storage_Exception("parent $dir not found");
-                } else if (!is_dir($dir)) {
-                    throw new Zend_Mail_Storage_Exception("parent $dir not a directory");
-                } else {
-                    throw new Zend_Mail_Storage_Exception('cannot create maildir');
-                }
-            }
-        }
-
-        foreach (array('cur', 'tmp', 'new') as $subdir) {
-            if (!@mkdir($dir . DIRECTORY_SEPARATOR . $subdir)) {
-                // ignore if dir exists (i.e. was already valid maildir or two processes try to create one)
-                if (!file_exists($dir . DIRECTORY_SEPARATOR . $subdir)) {
-                    /**
-                     * @see Zend_Mail_Storage_Exception
-                     */
-                    require_once 'Zend/Mail/Storage/Exception.php';
-                    throw new Zend_Mail_Storage_Exception('could not create subdir ' . $subdir);
-                }
-            }
-        }
-    }
-
-    /**
-     * Create instance with parameters
-     * Additional parameters are (see parent for more):
-     *   - create if true a new maildir is create if none exists
-     *
-     * @param  $params array mail reader specific parameters
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function __construct($params) {
-        if (is_array($params)) {
-            $params = (object)$params;
-        }
-
-        if (!empty($params->create) && isset($params->dirname) && !file_exists($params->dirname . DIRECTORY_SEPARATOR . 'cur')) {
-            self::initMaildir($params->dirname);
-        }
-
-        parent::__construct($params);
-    }
-
-    /**
-     * create a new folder
-     *
-     * This method also creates parent folders if necessary. Some mail storages may restrict, which folder
-     * may be used as parent or which chars may be used in the folder name
-     *
-     * @param   string                          $name         global name of folder, local name if $parentFolder is set
-     * @param   string|Zend_Mail_Storage_Folder $parentFolder parent folder for new folder, else root folder is parent
-     * @return  string only used internally (new created maildir)
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function createFolder($name, $parentFolder = null)
-    {
-        if ($parentFolder instanceof Zend_Mail_Storage_Folder) {
-            $folder = $parentFolder->getGlobalName() . $this->_delim . $name;
-        } else if ($parentFolder != null) {
-            $folder = rtrim($parentFolder, $this->_delim) . $this->_delim . $name;
-        } else {
-            $folder = $name;
-        }
-
-        $folder = trim($folder, $this->_delim);
-
-        // first we check if we try to create a folder that does exist
-        $exists = null;
-        try {
-            $exists = $this->getFolders($folder);
-        } catch (Zend_Mail_Exception $e) {
-            // ok
-        }
-        if ($exists) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('folder already exists');
-        }
-
-        if (strpos($folder, $this->_delim . $this->_delim) !== false) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('invalid name - folder parts may not be empty');
-        }
-
-        if (strpos($folder, 'INBOX' . $this->_delim) === 0) {
-            $folder = substr($folder, 6);
-        }
-
-        $fulldir = $this->_rootdir . '.' . $folder;
-
-        // check if we got tricked and would create a dir outside of the rootdir or not as direct child
-        if (strpos($folder, DIRECTORY_SEPARATOR) !== false || strpos($folder, '/') !== false
-            || dirname($fulldir) . DIRECTORY_SEPARATOR != $this->_rootdir) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('invalid name - no directory seprator allowed in folder name');
-        }
-
-        // has a parent folder?
-        $parent = null;
-        if (strpos($folder, $this->_delim)) {
-            // let's see if the parent folder exists
-            $parent = substr($folder, 0, strrpos($folder, $this->_delim));
-            try {
-                $this->getFolders($parent);
-            } catch (Zend_Mail_Exception $e) {
-                // does not - create parent folder
-                $this->createFolder($parent);
-            }
-        }
-
-        if (!@mkdir($fulldir) || !@mkdir($fulldir . DIRECTORY_SEPARATOR . 'cur')) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('error while creating new folder, may be created incompletly');
-        }
-
-        mkdir($fulldir . DIRECTORY_SEPARATOR . 'new');
-        mkdir($fulldir . DIRECTORY_SEPARATOR . 'tmp');
-
-        $localName = $parent ? substr($folder, strlen($parent) + 1) : $folder;
-        $this->getFolders($parent)->$localName = new Zend_Mail_Storage_Folder($localName, $folder, true);
-
-        return $fulldir;
-    }
-
-    /**
-     * remove a folder
-     *
-     * @param   string|Zend_Mail_Storage_Folder $name      name or instance of folder
-     * @return  null
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function removeFolder($name)
-    {
-        // TODO: This could fail in the middle of the task, which is not optimal.
-        // But there is no defined standard way to mark a folder as removed and there is no atomar fs-op
-        // to remove a directory. Also moving the folder to a/the trash folder is not possible, as
-        // all parent folders must be created. What we could do is add a dash to the front of the
-        // directory name and it should be ignored as long as other processes obey the standard.
-
-        if ($name instanceof Zend_Mail_Storage_Folder) {
-            $name = $name->getGlobalName();
-        }
-
-        $name = trim($name, $this->_delim);
-        if (strpos($name, 'INBOX' . $this->_delim) === 0) {
-            $name = substr($name, 6);
-        }
-
-        // check if folder exists and has no children
-        if (!$this->getFolders($name)->isLeaf()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('delete children first');
-        }
-
-        if ($name == 'INBOX' || $name == DIRECTORY_SEPARATOR || $name == '/') {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('wont delete INBOX');
-        }
-
-        if ($name == $this->getCurrentFolder()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('wont delete selected folder');
-        }
-
-        foreach (array('tmp', 'new', 'cur', '.') as $subdir) {
-            $dir = $this->_rootdir . '.' . $name . DIRECTORY_SEPARATOR . $subdir;
-            if (!file_exists($dir)) {
-                continue;
-            }
-            $dh = opendir($dir);
-            if (!$dh) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception("error opening $subdir");
-            }
-            while (($entry = readdir($dh)) !== false) {
-                if ($entry == '.' || $entry == '..') {
-                    continue;
-                }
-                if (!unlink($dir . DIRECTORY_SEPARATOR . $entry)) {
-                    /**
-                     * @see Zend_Mail_Storage_Exception
-                     */
-                    require_once 'Zend/Mail/Storage/Exception.php';
-                    throw new Zend_Mail_Storage_Exception("error cleaning $subdir");
-                }
-            }
-            closedir($dh);
-            if ($subdir !== '.') {
-                if (!rmdir($dir)) {
-                    /**
-                     * @see Zend_Mail_Storage_Exception
-                     */
-                    require_once 'Zend/Mail/Storage/Exception.php';
-                    throw new Zend_Mail_Storage_Exception("error removing $subdir");
-                }
-            }
-        }
-
-        if (!rmdir($this->_rootdir . '.' . $name)) {
-            // at least we should try to make it a valid maildir again
-            mkdir($this->_rootdir . '.' . $name . DIRECTORY_SEPARATOR . 'cur');
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("error removing maindir");
-        }
-
-        $parent = strpos($name, $this->_delim) ? substr($name, 0, strrpos($name, $this->_delim)) : null;
-        $localName = $parent ? substr($name, strlen($parent) + 1) : $name;
-        unset($this->getFolders($parent)->$localName);
-    }
-
-    /**
-     * rename and/or move folder
-     *
-     * The new name has the same restrictions as in createFolder()
-     *
-     * @param   string|Zend_Mail_Storage_Folder $oldName name or instance of folder
-     * @param   string                          $newName new global name of folder
-     * @return  null
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function renameFolder($oldName, $newName)
-    {
-        // TODO: This is also not atomar and has similar problems as removeFolder()
-
-        if ($oldName instanceof Zend_Mail_Storage_Folder) {
-            $oldName = $oldName->getGlobalName();
-        }
-
-        $oldName = trim($oldName, $this->_delim);
-        if (strpos($oldName, 'INBOX' . $this->_delim) === 0) {
-            $oldName = substr($oldName, 6);
-        }
-
-        $newName = trim($newName, $this->_delim);
-        if (strpos($newName, 'INBOX' . $this->_delim) === 0) {
-            $newName = substr($newName, 6);
-        }
-
-        if (strpos($newName, $oldName . $this->_delim) === 0) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('new folder cannot be a child of old folder');
-        }
-
-        // check if folder exists and has no children
-        $folder = $this->getFolders($oldName);
-
-        if ($oldName == 'INBOX' || $oldName == DIRECTORY_SEPARATOR || $oldName == '/') {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('wont rename INBOX');
-        }
-
-        if ($oldName == $this->getCurrentFolder()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('wont rename selected folder');
-        }
-
-        $newdir = $this->createFolder($newName);
-
-        if (!$folder->isLeaf()) {
-            foreach ($folder as $k => $v) {
-                $this->renameFolder($v->getGlobalName(), $newName . $this->_delim . $k);
-            }
-        }
-
-        $olddir = $this->_rootdir . '.' . $folder;
-        foreach (array('tmp', 'new', 'cur') as $subdir) {
-            $subdir = DIRECTORY_SEPARATOR . $subdir;
-            if (!file_exists($olddir . $subdir)) {
-                continue;
-            }
-            // using copy or moving files would be even better - but also much slower
-            if (!rename($olddir . $subdir, $newdir . $subdir)) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('error while moving ' . $subdir);
-            }
-        }
-        // create a dummy if removing fails - otherwise we can't read it next time
-        mkdir($olddir . DIRECTORY_SEPARATOR . 'cur');
-        $this->removeFolder($oldName);
-    }
-
-    /**
-     * create a uniqueid for maildir filename
-     *
-     * This is nearly the format defined in the maildir standard. The microtime() call should already
-     * create a uniqueid, the pid is for multicore/-cpu machine that manage to call this function at the
-     * exact same time, and uname() gives us the hostname for multiple machines accessing the same storage.
-     *
-     * If someone disables posix we create a random number of the same size, so this method should also
-     * work on Windows - if you manage to get maildir working on Windows.
-     * Microtime could also be disabled, altough I've never seen it.
-     *
-     * @return string new uniqueid
-     */
-    protected function _createUniqueId()
-    {
-        $id = '';
-        $id .= function_exists('microtime') ? microtime(true) : (time() . ' ' . rand(0, 100000));
-        $id .= '.' . (function_exists('posix_getpid') ? posix_getpid() : rand(50, 65535));
-        $id .= '.' . php_uname('n');
-
-        return $id;
-    }
-
-    /**
-     * open a temporary maildir file
-     *
-     * makes sure tmp/ exists and create a file with a unique name
-     * you should close the returned filehandle!
-     *
-     * @param   string $folder name of current folder without leading .
-     * @return  array array('dirname' => dir of maildir folder, 'uniq' => unique id, 'filename' => name of create file
-     *                     'handle'  => file opened for writing)
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    protected function _createTmpFile($folder = 'INBOX')
-    {
-        if ($folder == 'INBOX') {
-            $tmpdir = $this->_rootdir . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR;
-        } else {
-            $tmpdir = $this->_rootdir . '.' . $folder . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR;
-        }
-        if (!file_exists($tmpdir)) {
-            if (!mkdir($tmpdir)) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('problems creating tmp dir');
-            }
-        }
-
-        // we should retry to create a unique id if a file with the same name exists
-        // to avoid a script timeout we only wait 1 second (instead of 2) and stop
-        // after a defined retry count
-        // if you change this variable take into account that it can take up to $max_tries seconds
-        // normally we should have a valid unique name after the first try, we're just following the "standard" here
-        $max_tries = 5;
-        for ($i = 0; $i < $max_tries; ++$i) {
-            $uniq = $this->_createUniqueId();
-            if (!file_exists($tmpdir . $uniq)) {
-                // here is the race condition! - as defined in the standard
-                // to avoid having a long time between stat()ing the file and creating it we're opening it here
-                // to mark the filename as taken
-                $fh = fopen($tmpdir . $uniq, 'w');
-                if (!$fh) {
-                    /**
-                     * @see Zend_Mail_Storage_Exception
-                     */
-                    require_once 'Zend/Mail/Storage/Exception.php';
-                    throw new Zend_Mail_Storage_Exception('could not open temp file');
-                }
-                break;
-            }
-            sleep(1);
-        }
-
-        if (!$fh) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception("tried $max_tries unique ids for a temp file, but all were taken"
-                                                . ' - giving up');
-        }
-
-        return array('dirname' => $this->_rootdir . '.' . $folder, 'uniq' => $uniq, 'filename' => $tmpdir . $uniq,
-                     'handle' => $fh);
-    }
-
-    /**
-     * create an info string for filenames with given flags
-     *
-     * @param   array $flags wanted flags, with the reference you'll get the set flags with correct key (= char for flag)
-     * @return  string info string for version 2 filenames including the leading colon
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    protected function _getInfoString(&$flags)
-    {
-        // accessing keys is easier, faster and it removes duplicated flags
-        $wanted_flags = array_flip($flags);
-        if (isset($wanted_flags[Zend_Mail_Storage::FLAG_RECENT])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('recent flag may not be set');
-        }
-
-        $info = ':2,';
-        $flags = array();
-        foreach (Zend_Mail_Storage_Maildir::$_knownFlags as $char => $flag) {
-            if (!isset($wanted_flags[$flag])) {
-                continue;
-            }
-            $info .= $char;
-            $flags[$char] = $flag;
-            unset($wanted_flags[$flag]);
-        }
-
-        if (!empty($wanted_flags)) {
-            $wanted_flags = implode(', ', array_keys($wanted_flags));
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('unknown flag(s): ' . $wanted_flags);
-        }
-
-        return $info;
-    }
-
-    /**
-     * append a new message to mail storage
-     *
-     * @param   string|stream                              $message message as string or stream resource
-     * @param   null|string|Zend_Mail_Storage_Folder       $folder  folder for new message, else current folder is taken
-     * @param   null|array                                 $flags   set flags for new message, else a default set is used
-     * @param   bool                                       $recent  handle this mail as if recent flag has been set,
-     *                                                              should only be used in delivery
-     * @throws  Zend_Mail_Storage_Exception
-     */
-     // not yet * @param string|Zend_Mail_Message|Zend_Mime_Message $message message as string or instance of message class
-
-    public function appendMessage($message, $folder = null, $flags = null, $recent = false)
-    {
-        if ($this->_quota && $this->checkQuota()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('storage is over quota!');
-        }
-
-        if ($folder === null) {
-            $folder = $this->_currentFolder;
-        }
-
-        if (!($folder instanceof Zend_Mail_Storage_Folder)) {
-            $folder = $this->getFolders($folder);
-        }
-
-        if ($flags === null) {
-            $flags = array(Zend_Mail_Storage::FLAG_SEEN);
-        }
-        $info = $this->_getInfoString($flags);
-        $temp_file = $this->_createTmpFile($folder->getGlobalName());
-
-        // TODO: handle class instances for $message
-        if (is_resource($message) && get_resource_type($message) == 'stream') {
-            stream_copy_to_stream($message, $temp_file['handle']);
-        } else {
-            fputs($temp_file['handle'], $message);
-        }
-        fclose($temp_file['handle']);
-
-        // we're adding the size to the filename for maildir++
-        $size = filesize($temp_file['filename']);
-        if ($size !== false) {
-            $info = ',S=' . $size . $info;
-        }
-        $new_filename = $temp_file['dirname'] . DIRECTORY_SEPARATOR;
-        $new_filename .= $recent ? 'new' : 'cur';
-        $new_filename .= DIRECTORY_SEPARATOR . $temp_file['uniq'] . $info;
-
-        // we're throwing any exception after removing our temp file and saving it to this variable instead
-        $exception = null;
-
-        if (!link($temp_file['filename'], $new_filename)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir');
-        }
-        @unlink($temp_file['filename']);
-
-        if ($exception) {
-            throw $exception;
-        }
-
-        $this->_files[] = array('uniq'     => $temp_file['uniq'],
-                                'flags'    => $flags,
-                                'filename' => $new_filename);
-        if ($this->_quota) {
-            $this->_addQuotaEntry((int)$size, 1);
-        }
-    }
-
-    /**
-     * copy an existing message
-     *
-     * @param   int                             $id     number of message
-     * @param   string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return  null
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function copyMessage($id, $folder)
-    {
-        if ($this->_quota && $this->checkQuota()) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('storage is over quota!');
-        }
-
-        if (!($folder instanceof Zend_Mail_Storage_Folder)) {
-            $folder = $this->getFolders($folder);
-        }
-
-        $filedata = $this->_getFileData($id);
-        $old_file = $filedata['filename'];
-        $flags = $filedata['flags'];
-
-        // copied message can't be recent
-        while (($key = array_search(Zend_Mail_Storage::FLAG_RECENT, $flags)) !== false) {
-            unset($flags[$key]);
-        }
-        $info = $this->_getInfoString($flags);
-
-        // we're creating the copy as temp file before moving to cur/
-        $temp_file = $this->_createTmpFile($folder->getGlobalName());
-        // we don't write directly to the file
-        fclose($temp_file['handle']);
-
-        // we're adding the size to the filename for maildir++
-        $size = filesize($old_file);
-        if ($size !== false) {
-            $info = ',S=' . $size . $info;
-        }
-
-        $new_file = $temp_file['dirname'] . DIRECTORY_SEPARATOR . 'cur' . DIRECTORY_SEPARATOR . $temp_file['uniq'] . $info;
-
-        // we're throwing any exception after removing our temp file and saving it to this variable instead
-        $exception = null;
-
-        if (!copy($old_file, $temp_file['filename'])) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            $exception = new Zend_Mail_Storage_Exception('cannot copy message file');
-        } else if (!link($temp_file['filename'], $new_file)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir');
-        }
-        @unlink($temp_file['filename']);
-
-        if ($exception) {
-            throw $exception;
-        }
-
-        if ($folder->getGlobalName() == $this->_currentFolder
-            || ($this->_currentFolder == 'INBOX' && $folder->getGlobalName() == '/')) {
-            $this->_files[] = array('uniq'     => $temp_file['uniq'],
-                                    'flags'    => $flags,
-                                    'filename' => $new_file);
-        }
-
-        if ($this->_quota) {
-            $this->_addQuotaEntry((int)$size, 1);
-        }
-    }
-
-    /**
-     * move an existing message
-     *
-     * @param  int                             $id     number of message
-     * @param  string|Zend_Mail_Storage_Folder $folder name or instance of targer folder
-     * @return null
-     * @throws Zend_Mail_Storage_Exception
-     */
-    public function moveMessage($id, $folder) {
-        if (!($folder instanceof Zend_Mail_Storage_Folder)) {
-            $folder = $this->getFolders($folder);
-        }
-
-        if ($folder->getGlobalName() == $this->_currentFolder
-            || ($this->_currentFolder == 'INBOX' && $folder->getGlobalName() == '/')) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('target is current folder');
-        }
-
-        $filedata = $this->_getFileData($id);
-        $old_file = $filedata['filename'];
-        $flags = $filedata['flags'];
-
-        // moved message can't be recent
-        while (($key = array_search(Zend_Mail_Storage::FLAG_RECENT, $flags)) !== false) {
-            unset($flags[$key]);
-        }
-        $info = $this->_getInfoString($flags);
-
-        // reserving a new name
-        $temp_file = $this->_createTmpFile($folder->getGlobalName());
-        fclose($temp_file['handle']);
-
-        // we're adding the size to the filename for maildir++
-        $size = filesize($old_file);
-        if ($size !== false) {
-            $info = ',S=' . $size . $info;
-        }
-
-        $new_file = $temp_file['dirname'] . DIRECTORY_SEPARATOR . 'cur' . DIRECTORY_SEPARATOR . $temp_file['uniq'] . $info;
-
-        // we're throwing any exception after removing our temp file and saving it to this variable instead
-        $exception = null;
-
-        if (!rename($old_file, $new_file)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            $exception = new Zend_Mail_Storage_Exception('cannot move message file');
-        }
-        @unlink($temp_file['filename']);
-
-        if ($exception) {
-            throw $exception;
-        }
-
-        unset($this->_files[$id - 1]);
-        // remove the gap
-        $this->_files = array_values($this->_files);
-    }
-
-
-    /**
-     * set flags for message
-     *
-     * NOTE: this method can't set the recent flag.
-     *
-     * @param   int   $id    number of message
-     * @param   array $flags new flags for message
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function setFlags($id, $flags)
-    {
-        $info = $this->_getInfoString($flags);
-        $filedata = $this->_getFileData($id);
-
-        // NOTE: double dirname to make sure we always move to cur. if recent flag has been set (message is in new) it will be moved to cur.
-        $new_filename = dirname(dirname($filedata['filename'])) . DIRECTORY_SEPARATOR . 'cur' . DIRECTORY_SEPARATOR . "$filedata[uniq]$info";
-
-        if (!@rename($filedata['filename'], $new_filename)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot rename file');
-        }
-
-        $filedata['flags']    = $flags;
-        $filedata['filename'] = $new_filename;
-
-        $this->_files[$id - 1] = $filedata;
-    }
-
-
-    /**
-     * stub for not supported message deletion
-     *
-     * @return  null
-     * @throws  Zend_Mail_Storage_Exception
-     */
-    public function removeMessage($id)
-    {
-        $filename = $this->_getFileData($id, 'filename');
-
-        if ($this->_quota) {
-            $size = filesize($filename);
-        }
-
-        if (!@unlink($filename)) {
-            /**
-             * @see Zend_Mail_Storage_Exception
-             */
-            require_once 'Zend/Mail/Storage/Exception.php';
-            throw new Zend_Mail_Storage_Exception('cannot remove message');
-        }
-        unset($this->_files[$id - 1]);
-        // remove the gap
-        $this->_files = array_values($this->_files);
-        if ($this->_quota) {
-            $this->_addQuotaEntry(0 - (int)$size, -1);
-        }
-    }
-
-    /**
-     * enable/disable quota and set a quota value if wanted or needed
-     *
-     * You can enable/disable quota with true/false. If you don't have
-     * a MDA or want to enforce a quota value you can also set this value
-     * here. Use array('size' => SIZE_QUOTA, 'count' => MAX_MESSAGE) do
-     * define your quota. Order of these fields does matter!
-     *
-     * @param bool|array $value new quota value
-     * @return null
-     */
-    public function setQuota($value) {
-        $this->_quota = $value;
-    }
-
-    /**
-     * get currently set quota
-     *
-     * @see Zend_Mail_Storage_Writable_Maildir::setQuota()
-     *
-     * @return bool|array
-     */
-    public function getQuota($fromStorage = false) {
-        if ($fromStorage) {
-            $fh = @fopen($this->_rootdir . 'maildirsize', 'r');
-            if (!$fh) {
-                /**
-                 * @see Zend_Mail_Storage_Exception
-                 */
-                require_once 'Zend/Mail/Storage/Exception.php';
-                throw new Zend_Mail_Storage_Exception('cannot open maildirsize');
-            }
-            $definition = fgets($fh);
-            fclose($fh);
-            $definition = explode(',', trim($definition));
-            $quota = array();
-            foreach ($definition as $member) {
-                $key = $member[strlen($member) - 1];
-                if ($key == 'S' || $key == 'C') {
-                    $key = $key == 'C' ? 'count' : 'size';
-                }
-                $quota[$key] = substr($member, 0, -1);
-            }
-            return $quota;
-        }
-
-        return $this->_quota;
-    }
-
-    /**
-     * @see http://www.inter7.com/courierimap/README.maildirquota.html "Calculating maildirsize"
-     */
-    protected function _calculateMaildirsize() {
-        $timestamps = array();
-        $messages = 0;
-        $total_size = 0;
-
-        if (is_array($this->_quota)) {
-            $quota = $this->_quota;
-        } else {
-            try {
-                $quota = $this->getQuota(true);
-            } catch (Zend_Mail_Storage_Exception $e) {
-                throw new Zend_Mail_Storage_Exception('no quota definition found', 0, $e);
-            }
-        }
-
-        $folders = new RecursiveIteratorIterator($this->getFolders(), RecursiveIteratorIterator::SELF_FIRST);
-        foreach ($folders as $folder) {
-            $subdir = $folder->getGlobalName();
-            if ($subdir == 'INBOX') {
-                $subdir = '';
-            } else {
-                $subdir = '.' . $subdir;
-            }
-            if ($subdir == 'Trash') {
-                continue;
-            }
-
-            foreach (array('cur', 'new') as $subsubdir) {
-                $dirname = $this->_rootdir . $subdir . DIRECTORY_SEPARATOR . $subsubdir . DIRECTORY_SEPARATOR;
-                if (!file_exists($dirname)) {
-                    continue;
-                }
-                // NOTE: we are using mtime instead of "the latest timestamp". The latest would be atime
-                // and as we are accessing the directory it would make the whole calculation useless.
-                $timestamps[$dirname] = filemtime($dirname);
-
-                $dh = opendir($dirname);
-                // NOTE: Should have been checked in constructor. Not throwing an exception here, quotas will
-                // therefore not be fully enforeced, but next request will fail anyway, if problem persists.
-                if (!$dh) {
-                    continue;
-                }
-
-
-                while (($entry = readdir()) !== false) {
-                    if ($entry[0] == '.' || !is_file($dirname . $entry)) {
-                        continue;
-                    }
-
-                    if (strpos($entry, ',S=')) {
-                        strtok($entry, '=');
-                        $filesize = strtok(':');
-                        if (is_numeric($filesize)) {
-                            $total_size += $filesize;
-                            ++$messages;
-                            continue;
-                        }
-                    }
-                    $size = filesize($dirname . $entry);
-                    if ($size === false) {
-                        // ignore, as we assume file got removed
-                        continue;
-                    }
-                    $total_size += $size;
-                    ++$messages;
-                }
-            }
-        }
-
-        $tmp = $this->_createTmpFile();
-        $fh = $tmp['handle'];
-        $definition = array();
-        foreach ($quota as $type => $value) {
-            if ($type == 'size' || $type == 'count') {
-                $type = $type == 'count' ? 'C' : 'S';
-            }
-            $definition[] = $value . $type;
-        }
-        $definition = implode(',', $definition);
-        fputs($fh, "$definition\n");
-        fputs($fh, "$total_size $messages\n");
-        fclose($fh);
-        rename($tmp['filename'], $this->_rootdir . 'maildirsize');
-        foreach ($timestamps as $dir => $timestamp) {
-            if ($timestamp < filemtime($dir)) {
-                unlink($this->_rootdir . 'maildirsize');
-                break;
-            }
-        }
-
-        return array('size' => $total_size, 'count' => $messages, 'quota' => $quota);
-    }
-
-    /**
-     * @see http://www.inter7.com/courierimap/README.maildirquota.html "Calculating the quota for a Maildir++"
-     */
-    protected function _calculateQuota($forceRecalc = false) {
-        $fh = null;
-        $total_size = 0;
-        $messages   = 0;
-        $maildirsize = '';
-        if (!$forceRecalc && file_exists($this->_rootdir . 'maildirsize') && filesize($this->_rootdir . 'maildirsize') < 5120) {
-            $fh = fopen($this->_rootdir . 'maildirsize', 'r');
-        }
-        if ($fh) {
-            $maildirsize = fread($fh, 5120);
-            if (strlen($maildirsize) >= 5120) {
-                fclose($fh);
-                $fh = null;
-                $maildirsize = '';
-            }
-        }
-        if (!$fh) {
-            $result = $this->_calculateMaildirsize();
-            $total_size = $result['size'];
-            $messages   = $result['count'];
-            $quota      = $result['quota'];
-        } else {
-            $maildirsize = explode("\n", $maildirsize);
-            if (is_array($this->_quota)) {
-                $quota = $this->_quota;
-            } else {
-                $definition = explode(',', $maildirsize[0]);
-                $quota = array();
-                foreach ($definition as $member) {
-                    $key = $member[strlen($member) - 1];
-                    if ($key == 'S' || $key == 'C') {
-                        $key = $key == 'C' ? 'count' : 'size';
-                    }
-                    $quota[$key] = substr($member, 0, -1);
-                }
-            }
-            unset($maildirsize[0]);
-            foreach ($maildirsize as $line) {
-                list($size, $count) = explode(' ', trim($line));
-                $total_size += $size;
-                $messages   += $count;
-            }
-        }
-
-        $over_quota = false;
-        $over_quota = $over_quota || (isset($quota['size'])  && $total_size > $quota['size']);
-        $over_quota = $over_quota || (isset($quota['count']) && $messages   > $quota['count']);
-        // NOTE: $maildirsize equals false if it wasn't set (AKA we recalculated) or it's only
-        // one line, because $maildirsize[0] gets unsetted.
-        // Also we're using local time to calculate the 15 minute offset. Touching a file just for known the
-        // local time of the file storage isn't worth the hassle.
-        if ($over_quota && ($maildirsize || filemtime($this->_rootdir . 'maildirsize') > time() - 900)) {
-            $result = $this->_calculateMaildirsize();
-            $total_size = $result['size'];
-            $messages   = $result['count'];
-            $quota      = $result['quota'];
-            $over_quota = false;
-            $over_quota = $over_quota || (isset($quota['size'])  && $total_size > $quota['size']);
-            $over_quota = $over_quota || (isset($quota['count']) && $messages   > $quota['count']);
-        }
-
-        if ($fh) {
-            // TODO is there a safe way to keep the handle open for writing?
-            fclose($fh);
-        }
-
-        return array('size' => $total_size, 'count' => $messages, 'quota' => $quota, 'over_quota' => $over_quota);
-    }
-
-    protected function _addQuotaEntry($size, $count = 1) {
-        if (!file_exists($this->_rootdir . 'maildirsize')) {
-            // TODO: should get file handler from _calculateQuota
-        }
-        $size = (int)$size;
-        $count = (int)$count;
-        file_put_contents($this->_rootdir . 'maildirsize', "$size $count\n", FILE_APPEND);
-    }
-
-    /**
-     * check if storage is currently over quota
-     *
-     * @param bool $detailedResponse return known data of quota and current size and message count @see _calculateQuota()
-     * @return bool|array over quota state or detailed response
-     */
-    public function checkQuota($detailedResponse = false, $forceRecalc = false) {
-        $result = $this->_calculateQuota($forceRecalc);
-        return $detailedResponse ? $result : $result['over_quota'];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Transport/Abstract.php b/airtime_mvc/library/Zend/Mail/Transport/Abstract.php
deleted file mode 100644
index 1d225a3e6..000000000
--- a/airtime_mvc/library/Zend/Mail/Transport/Abstract.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-
-/**
- * Abstract for sending eMails through different
- * ways of transport
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Mail_Transport_Abstract
-{
-    /**
-     * Mail body
-     * @var string
-     * @access public
-     */
-    public $body = '';
-
-    /**
-     * MIME boundary
-     * @var string
-     * @access public
-     */
-    public $boundary = '';
-
-    /**
-     * Mail header string
-     * @var string
-     * @access public
-     */
-    public $header = '';
-
-    /**
-     * Array of message headers
-     * @var array
-     * @access protected
-     */
-    protected $_headers = array();
-
-    /**
-     * Message is a multipart message
-     * @var boolean
-     * @access protected
-     */
-    protected $_isMultipart = false;
-
-    /**
-     * Zend_Mail object
-     * @var false|Zend_Mail
-     * @access protected
-     */
-    protected $_mail = false;
-
-    /**
-     * Array of message parts
-     * @var array
-     * @access protected
-     */
-    protected $_parts = array();
-
-    /**
-     * Recipients string
-     * @var string
-     * @access public
-     */
-    public $recipients = '';
-
-    /**
-     * EOL character string used by transport
-     * @var string
-     * @access public
-     */
-    public $EOL = "\r\n";
-
-    /**
-     * Send an email independent from the used transport
-     *
-     * The requisite information for the email will be found in the following
-     * properties:
-     *
-     * - {@link $recipients} - list of recipients (string)
-     * - {@link $header} - message header
-     * - {@link $body} - message body
-     */
-    abstract protected function _sendMail();
-
-    /**
-     * Return all mail headers as an array
-     *
-     * If a boundary is given, a multipart header is generated with a
-     * Content-Type of either multipart/alternative or multipart/mixed depending
-     * on the mail parts present in the {@link $_mail Zend_Mail object} present.
-     *
-     * @param string $boundary
-     * @return array
-     */
-    protected function _getHeaders($boundary)
-    {
-        if (null !== $boundary) {
-            // Build multipart mail
-            $type = $this->_mail->getType();
-            if (!$type) {
-                if ($this->_mail->hasAttachments) {
-                    $type = Zend_Mime::MULTIPART_MIXED;
-                } elseif ($this->_mail->getBodyText() && $this->_mail->getBodyHtml()) {
-                    $type = Zend_Mime::MULTIPART_ALTERNATIVE;
-                } else {
-                    $type = Zend_Mime::MULTIPART_MIXED;
-                }
-            }
-
-            $this->_headers['Content-Type'] = array(
-                $type . ';'
-                . $this->EOL
-                . " " . 'boundary="' . $boundary . '"'
-            );
-            $this->boundary = $boundary;
-        }
-
-        $this->_headers['MIME-Version'] = array('1.0');
-
-        return $this->_headers;
-    }
-
-    /**
-     * Prepend header name to header value
-     *
-     * @param string $item
-     * @param string $key
-     * @param string $prefix
-     * @static
-     * @access protected
-     * @return void
-     */
-    protected static function _formatHeader(&$item, $key, $prefix)
-    {
-        $item = $prefix . ': ' . $item;
-    }
-
-    /**
-     * Prepare header string for use in transport
-     *
-     * Prepares and generates {@link $header} based on the headers provided.
-     *
-     * @param mixed $headers
-     * @access protected
-     * @return void
-     * @throws Zend_Mail_Transport_Exception if any header lines exceed 998
-     * characters
-     */
-    protected function _prepareHeaders($headers)
-    {
-        if (!$this->_mail) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('Missing Zend_Mail object in _mail property');
-        }
-
-        $this->header = '';
-
-        foreach ($headers as $header => $content) {
-            if (isset($content['append'])) {
-                unset($content['append']);
-                $value = implode(',' . $this->EOL . ' ', $content);
-                $this->header .= $header . ': ' . $value . $this->EOL;
-            } else {
-                array_walk($content, array(get_class($this), '_formatHeader'), $header);
-                $this->header .= implode($this->EOL, $content) . $this->EOL;
-            }
-        }
-
-        // Sanity check on headers -- should not be > 998 characters
-        $sane = true;
-        foreach (explode($this->EOL, $this->header) as $line) {
-            if (strlen(trim($line)) > 998) {
-                $sane = false;
-                break;
-            }
-        }
-        if (!$sane) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Exception('At least one mail header line is too long');
-        }
-    }
-
-    /**
-     * Generate MIME compliant message from the current configuration
-     *
-     * If both a text and HTML body are present, generates a
-     * multipart/alternative Zend_Mime_Part containing the headers and contents
-     * of each. Otherwise, uses whichever of the text or HTML parts present.
-     *
-     * The content part is then prepended to the list of Zend_Mime_Parts for
-     * this message.
-     *
-     * @return void
-     */
-    protected function _buildBody()
-    {
-        if (($text = $this->_mail->getBodyText())
-            && ($html = $this->_mail->getBodyHtml()))
-        {
-            // Generate unique boundary for multipart/alternative
-            $mime = new Zend_Mime(null);
-            $boundaryLine = $mime->boundaryLine($this->EOL);
-            $boundaryEnd  = $mime->mimeEnd($this->EOL);
-
-            $text->disposition = false;
-            $html->disposition = false;
-
-            $body = $boundaryLine
-                  . $text->getHeaders($this->EOL)
-                  . $this->EOL
-                  . $text->getContent($this->EOL)
-                  . $this->EOL
-                  . $boundaryLine
-                  . $html->getHeaders($this->EOL)
-                  . $this->EOL
-                  . $html->getContent($this->EOL)
-                  . $this->EOL
-                  . $boundaryEnd;
-
-            $mp           = new Zend_Mime_Part($body);
-            $mp->type     = Zend_Mime::MULTIPART_ALTERNATIVE;
-            $mp->boundary = $mime->boundary();
-
-            $this->_isMultipart = true;
-
-            // Ensure first part contains text alternatives
-            array_unshift($this->_parts, $mp);
-
-            // Get headers
-            $this->_headers = $this->_mail->getHeaders();
-            return;
-        }
-
-        // If not multipart, then get the body
-        if (false !== ($body = $this->_mail->getBodyHtml())) {
-            array_unshift($this->_parts, $body);
-        } elseif (false !== ($body = $this->_mail->getBodyText())) {
-            array_unshift($this->_parts, $body);
-        }
-
-        if (!$body) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('No body specified');
-        }
-
-        // Get headers
-        $this->_headers = $this->_mail->getHeaders();
-        $headers = $body->getHeadersArray($this->EOL);
-        foreach ($headers as $header) {
-            // Headers in Zend_Mime_Part are kept as arrays with two elements, a
-            // key and a value
-            $this->_headers[$header[0]] = array($header[1]);
-        }
-    }
-
-    /**
-     * Send a mail using this transport
-     *
-     * @param  Zend_Mail $mail
-     * @access public
-     * @return void
-     * @throws Zend_Mail_Transport_Exception if mail is empty
-     */
-    public function send(Zend_Mail $mail)
-    {
-        $this->_isMultipart = false;
-        $this->_mail        = $mail;
-        $this->_parts       = $mail->getParts();
-        $mime               = $mail->getMime();
-
-        // Build body content
-        $this->_buildBody();
-
-        // Determine number of parts and boundary
-        $count    = count($this->_parts);
-        $boundary = null;
-        if ($count < 1) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('Empty mail cannot be sent');
-        }
-
-        if ($count > 1) {
-            // Multipart message; create new MIME object and boundary
-            $mime     = new Zend_Mime($this->_mail->getMimeBoundary());
-            $boundary = $mime->boundary();
-        } elseif ($this->_isMultipart) {
-            // multipart/alternative -- grab boundary
-            $boundary = $this->_parts[0]->boundary;
-        }
-
-        // Determine recipients, and prepare headers
-        $this->recipients = implode(',', $mail->getRecipients());
-        $this->_prepareHeaders($this->_getHeaders($boundary));
-
-        // Create message body
-        // This is done so that the same Zend_Mail object can be used in
-        // multiple transports
-        $message = new Zend_Mime_Message();
-        $message->setParts($this->_parts);
-        $message->setMime($mime);
-        $this->body = $message->generateMessage($this->EOL);
-
-        // Send to transport!
-        $this->_sendMail();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mail/Transport/Exception.php b/airtime_mvc/library/Zend/Mail/Transport/Exception.php
deleted file mode 100644
index 63bf1cd4f..000000000
--- a/airtime_mvc/library/Zend/Mail/Transport/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mail_Exception
- */
-require_once 'Zend/Mail/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Transport_Exception extends Zend_Mail_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Mail/Transport/Sendmail.php b/airtime_mvc/library/Zend/Mail/Transport/Sendmail.php
deleted file mode 100644
index 6111ba7cf..000000000
--- a/airtime_mvc/library/Zend/Mail/Transport/Sendmail.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sendmail.php 21605 2010-03-22 15:09:03Z yoshida@zend.co.jp $
- */
-
-
-/**
- * @see Zend_Mail_Transport_Abstract
- */
-require_once 'Zend/Mail/Transport/Abstract.php';
-
-
-/**
- * Class for sending eMails via the PHP internal mail() function
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract
-{
-    /**
-     * Subject
-     * @var string
-     * @access public
-     */
-    public $subject = null;
-
-
-    /**
-     * Config options for sendmail parameters
-     *
-     * @var string
-     */
-    public $parameters;
-
-    /**
-     * EOL character string
-     * @var string
-     * @access public
-     */
-    public $EOL = PHP_EOL;
-
-    /**
-     * error information
-     * @var string
-     */
-    protected $_errstr;
-
-    /**
-     * Constructor.
-     *
-     * @param  string|array|Zend_Config $parameters OPTIONAL (Default: null)
-     * @return void
-     */
-    public function __construct($parameters = null)
-    {
-        if ($parameters instanceof Zend_Config) { 
-            $parameters = $parameters->toArray(); 
-        }
-
-        if (is_array($parameters)) { 
-            $parameters = implode(' ', $parameters);
-        }
-        
-        $this->parameters = $parameters;
-    }
-
-
-    /**
-     * Send mail using PHP native mail()
-     *
-     * @access public
-     * @return void
-     * @throws Zend_Mail_Transport_Exception if parameters is set
-     *         but not a string
-     * @throws Zend_Mail_Transport_Exception on mail() failure
-     */
-    public function _sendMail()
-    {
-        if ($this->parameters === null) {
-            set_error_handler(array($this, '_handleMailErrors'));
-            $result = mail(
-                $this->recipients,
-                $this->_mail->getSubject(),
-                $this->body,
-                $this->header);
-            restore_error_handler();
-        } else {
-            if(!is_string($this->parameters)) {
-                /**
-                 * @see Zend_Mail_Transport_Exception
-                 * 
-                 * Exception is thrown here because
-                 * $parameters is a public property
-                 */
-                require_once 'Zend/Mail/Transport/Exception.php';
-                throw new Zend_Mail_Transport_Exception(
-                    'Parameters were set but are not a string'
-                );
-            }
-
-            set_error_handler(array($this, '_handleMailErrors'));
-            $result = mail(
-                $this->recipients,
-                $this->_mail->getSubject(),
-                $this->body,
-                $this->header,
-                $this->parameters);
-            restore_error_handler();
-        }
-
-        if ($this->_errstr !== null || !$result) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('Unable to send mail. ' . $this->_errstr);
-        }
-    }
-
-
-    /**
-     * Format and fix headers
-     *
-     * mail() uses its $to and $subject arguments to set the To: and Subject:
-     * headers, respectively. This method strips those out as a sanity check to
-     * prevent duplicate header entries.
-     *
-     * @access  protected
-     * @param   array $headers
-     * @return  void
-     * @throws  Zend_Mail_Transport_Exception
-     */
-    protected function _prepareHeaders($headers)
-    {
-        if (!$this->_mail) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object');
-        }
-
-        // mail() uses its $to parameter to set the To: header, and the $subject
-        // parameter to set the Subject: header. We need to strip them out.
-        if (0 === strpos(PHP_OS, 'WIN')) {
-            // If the current recipients list is empty, throw an error
-            if (empty($this->recipients)) {
-                /**
-                 * @see Zend_Mail_Transport_Exception
-                 */
-                require_once 'Zend/Mail/Transport/Exception.php';
-                throw new Zend_Mail_Transport_Exception('Missing To addresses');
-            }
-        } else {
-            // All others, simply grab the recipients and unset the To: header
-            if (!isset($headers['To'])) {
-                /**
-                 * @see Zend_Mail_Transport_Exception
-                 */
-                require_once 'Zend/Mail/Transport/Exception.php';
-                throw new Zend_Mail_Transport_Exception('Missing To header');
-            }
-
-            unset($headers['To']['append']);
-            $this->recipients = implode(',', $headers['To']);
-        }
-
-        // Remove recipient header
-        unset($headers['To']);
-
-        // Remove subject header, if present
-        if (isset($headers['Subject'])) {
-            unset($headers['Subject']);
-        }
-
-        // Prepare headers
-        parent::_prepareHeaders($headers);
-
-        // Fix issue with empty blank line ontop when using Sendmail Trnasport
-        $this->header = rtrim($this->header);
-    }
-
-    /**
-     * Temporary error handler for PHP native mail().
-     *
-     * @param int    $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param string $errline
-     * @param array  $errcontext
-     * @return true
-     */
-    public function _handleMailErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
-    {
-        $this->_errstr = $errstr;
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Mail/Transport/Smtp.php b/airtime_mvc/library/Zend/Mail/Transport/Smtp.php
deleted file mode 100644
index 4175d8b84..000000000
--- a/airtime_mvc/library/Zend/Mail/Transport/Smtp.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * @see Zend_Mail_Protocol_Smtp
- */
-require_once 'Zend/Mail/Protocol/Smtp.php';
-
-/**
- * @see Zend_Mail_Transport_Abstract
- */
-require_once 'Zend/Mail/Transport/Abstract.php';
-
-
-/**
- * SMTP connection object
- *
- * Loads an instance of Zend_Mail_Protocol_Smtp and forwards smtp transactions
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Transport
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract
-{
-    /**
-     * EOL character string used by transport
-     * @var string
-     * @access public
-     */
-    public $EOL = "\n";
-
-    /**
-     * Remote smtp hostname or i.p.
-     *
-     * @var string
-     */
-    protected $_host;
-
-
-    /**
-     * Port number
-     *
-     * @var integer|null
-     */
-    protected $_port;
-
-
-    /**
-     * Local client hostname or i.p.
-     *
-     * @var string
-     */
-    protected $_name = 'localhost';
-
-
-    /**
-     * Authentication type OPTIONAL
-     *
-     * @var string
-     */
-    protected $_auth;
-
-
-    /**
-     * Config options for authentication
-     *
-     * @var array
-     */
-    protected $_config;
-
-
-    /**
-     * Instance of Zend_Mail_Protocol_Smtp
-     *
-     * @var Zend_Mail_Protocol_Smtp
-     */
-    protected $_connection;
-
-
-    /**
-     * Constructor.
-     *
-     * @param  string $host OPTIONAL (Default: 127.0.0.1)
-     * @param  array|null $config OPTIONAL (Default: null)
-     * @return void
-     * 
-     * @todo Someone please make this compatible
-     *       with the SendMail transport class.
-     */
-    public function __construct($host = '127.0.0.1', Array $config = array())
-    {
-        if (isset($config['name'])) {
-            $this->_name = $config['name'];
-        }
-        if (isset($config['port'])) {
-            $this->_port = $config['port'];
-        }
-        if (isset($config['auth'])) {
-            $this->_auth = $config['auth'];
-        }
-
-        $this->_host = $host;
-        $this->_config = $config;
-    }
-
-
-    /**
-     * Class destructor to ensure all open connections are closed
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        if ($this->_connection instanceof Zend_Mail_Protocol_Smtp) {
-            try {
-                $this->_connection->quit();
-            } catch (Zend_Mail_Protocol_Exception $e) {
-                // ignore
-            }
-            $this->_connection->disconnect();
-        }
-    }
-
-
-    /**
-     * Sets the connection protocol instance
-     *
-     * @param Zend_Mail_Protocol_Abstract $client
-     *
-     * @return void
-     */
-    public function setConnection(Zend_Mail_Protocol_Abstract $connection)
-    {
-        $this->_connection = $connection;
-    }
-
-
-    /**
-     * Gets the connection protocol instance
-     *
-     * @return Zend_Mail_Protocol|null
-     */
-    public function getConnection()
-    {
-        return $this->_connection;
-    }
-
-    /**
-     * Send an email via the SMTP connection protocol
-     *
-     * The connection via the protocol adapter is made just-in-time to allow a
-     * developer to add a custom adapter if required before mail is sent.
-     *
-     * @return void
-     * @todo Rename this to sendMail, it's a public method...
-     */
-    public function _sendMail()
-    {
-        // If sending multiple messages per session use existing adapter
-        if (!($this->_connection instanceof Zend_Mail_Protocol_Smtp)) {
-            // Check if authentication is required and determine required class
-            $connectionClass = 'Zend_Mail_Protocol_Smtp';
-            if ($this->_auth) {
-                $connectionClass .= '_Auth_' . ucwords($this->_auth);
-            }
-            if (!class_exists($connectionClass)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($connectionClass);
-            }
-            $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config));
-            $this->_connection->connect();
-            $this->_connection->helo($this->_name);
-        } else {
-            // Reset connection to ensure reliable transaction
-            $this->_connection->rset();
-        }
-
-        // Set sender email address
-        $this->_connection->mail($this->_mail->getFrom());
-
-        // Set recipient forward paths
-        foreach ($this->_mail->getRecipients() as $recipient) {
-            $this->_connection->rcpt($recipient);
-        }
-
-        // Issue DATA command to client
-        $this->_connection->data($this->header . Zend_Mime::LINEEND . $this->body);
-    }
-
-    /**
-     * Format and fix headers
-     *
-     * Some SMTP servers do not strip BCC headers. Most clients do it themselves as do we.
-     *
-     * @access  protected
-     * @param   array $headers
-     * @return  void
-     * @throws  Zend_Transport_Exception
-     */
-    protected function _prepareHeaders($headers)
-    {
-        if (!$this->_mail) {
-            /**
-             * @see Zend_Mail_Transport_Exception
-             */
-            require_once 'Zend/Mail/Transport/Exception.php';
-            throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object');
-        }
-
-        unset($headers['Bcc']);
-
-        // Prepare headers
-        parent::_prepareHeaders($headers);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Markup.php b/airtime_mvc/library/Zend/Markup.php
deleted file mode 100644
index 44cc21c20..000000000
--- a/airtime_mvc/library/Zend/Markup.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Markup.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Loader_PluginLoader
- */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup
-{
-    const CALLBACK = 'callback';
-    const REPLACE  = 'replace';
-
-
-    /**
-     * The parser loader
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected static $_parserLoader;
-
-    /**
-     * The renderer loader
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected static $_rendererLoader;
-
-
-    /**
-     * Disable instantiation of Zend_Markup
-     */
-    private function __construct() { }
-
-    /**
-     * Get the parser loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getParserLoader()
-    {
-        if (!(self::$_parserLoader instanceof Zend_Loader_PluginLoader)) {
-            self::$_parserLoader = new Zend_Loader_PluginLoader(array(
-                'Zend_Markup_Parser' => 'Zend/Markup/Parser/',
-            ));
-        }
-
-        return self::$_parserLoader;
-    }
-
-    /**
-     * Get the renderer loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getRendererLoader()
-    {
-        if (!(self::$_rendererLoader instanceof Zend_Loader_PluginLoader)) {
-            self::$_rendererLoader = new Zend_Loader_PluginLoader(array(
-                'Zend_Markup_Renderer' => 'Zend/Markup/Renderer/',
-            ));
-        }
-
-        return self::$_rendererLoader;
-    }
-
-    /**
-     * Add a parser path
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function addParserPath($prefix, $path)
-    {
-        return self::getParserLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Add a renderer path
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function addRendererPath($prefix, $path)
-    {
-        return self::getRendererLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Factory pattern
-     *
-     * @param  string $parser
-     * @param  string $renderer
-     * @param  array $options
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public static function factory($parser, $renderer = 'Html', array $options = array())
-    {
-        $parserClass   = self::getParserLoader()->load($parser);
-        $rendererClass = self::getRendererLoader()->load($renderer);
-
-        $parser            = new $parserClass();
-        $options['parser'] = $parser;
-        $renderer          = new $rendererClass($options);
-
-        return $renderer;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Markup/Exception.php b/airtime_mvc/library/Zend/Markup/Exception.php
deleted file mode 100644
index b1d1c8f91..000000000
--- a/airtime_mvc/library/Zend/Markup/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Markup
- *
- * @category   Zend 
- * @uses       Zend_Exception
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Markup/Parser/Bbcode.php b/airtime_mvc/library/Zend/Markup/Parser/Bbcode.php
deleted file mode 100644
index 0a018780d..000000000
--- a/airtime_mvc/library/Zend/Markup/Parser/Bbcode.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Bbcode.php 21128 2010-02-21 15:36:07Z kokx $
- */
-
-/**
- * @see Zend_Markup_TokenList
- */
-require_once 'Zend/Markup/TokenList.php';
-
-/**
- * @see Zend_Markup_Parser_ParserInterface
- */
-require_once 'Zend/Markup/Parser/ParserInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Parser_Bbcode implements Zend_Markup_Parser_ParserInterface
-{
-    const NEWLINE   = "[newline\0]";
-
-    // there is a parsing difference between the default tags and single tags
-    const TYPE_DEFAULT = 'default';
-    const TYPE_SINGLE  = 'single';
-
-    const NAME_CHARSET = '^\[\]=\s';
-
-    const STATE_SCAN       = 0;
-    const STATE_SCANATTRS  = 1;
-    const STATE_PARSEVALUE = 2;
-
-    /**
-     * Token tree
-     *
-     * @var Zend_Markup_TokenList
-     */
-    protected $_tree;
-
-    /**
-     * Current token
-     *
-     * @var Zend_Markup_Token
-     */
-    protected $_current;
-
-    /**
-     * Source to tokenize
-     *
-     * @var string
-     */
-    protected $_value = '';
-
-    /**
-     * Length of the value
-     *
-     * @var int
-     */
-    protected $_valueLen = 0;
-
-    /**
-     * Current pointer
-     *
-     * @var int
-     */
-    protected $_pointer = 0;
-
-    /**
-     * The buffer
-     *
-     * @var string
-     */
-    protected $_buffer = '';
-
-    /**
-     * Temporary tag storage
-     *
-     * @var array
-     */
-    protected $_temp;
-
-    /**
-     * Stoppers that we are searching for
-     *
-     * @var array
-     */
-    protected $_searchedStoppers = array();
-
-    /**
-     * Tag information
-     *
-     * @var array
-     */
-    protected $_tags = array(
-        'Zend_Markup_Root' => array(
-            'type'     => self::TYPE_DEFAULT,
-            'stoppers' => array(),
-        ),
-        '*' => array(
-            'type'     => self::TYPE_DEFAULT,
-            'stoppers' => array(self::NEWLINE, '[/*]', '[/]'),
-        ),
-        'hr' => array(
-            'type'     => self::TYPE_SINGLE,
-            'stoppers' => array(),
-        ),
-        'code' => array(
-            'type'         => self::TYPE_DEFAULT,
-            'stoppers'     => array('[/code]', '[/]'),
-            'parse_inside' => false
-        )
-    );
-
-    /**
-     * Token array
-     *
-     * @var array
-     */
-    protected $_tokens = array();
-
-    /**
-     * State
-     *
-     * @var int
-     */
-    protected $_state = self::STATE_SCAN;
-
-
-    /**
-     * Prepare the parsing of a bbcode string, the real parsing is done in {@link _parse()}
-     *
-     * @param  string $value
-     * @return Zend_Markup_TokenList
-     */
-    public function parse($value)
-    {
-        if (!is_string($value)) {
-            /**
-             * @see Zend_Markup_Parser_Exception
-             */
-            require_once 'Zend/Markup/Parser/Exception.php';
-            throw new Zend_Markup_Parser_Exception('Value to parse should be a string.');
-        }
-
-        if (empty($value)) {
-            /**
-             * @see Zend_Markup_Parser_Exception
-             */
-            require_once 'Zend/Markup/Parser/Exception.php';
-            throw new Zend_Markup_Parser_Exception('Value to parse cannot be left empty.');
-        }
-
-        $this->_value = str_replace(array("\r\n", "\r", "\n"), self::NEWLINE, $value);
-
-        // variable initialization for tokenizer
-        $this->_valueLen         = strlen($this->_value);
-        $this->_pointer          = 0;
-        $this->_buffer           = '';
-        $this->_temp             = array();
-        $this->_state            = self::STATE_SCAN;
-        $this->_tokens           = array();
-
-        $this->_tokenize();
-
-        // variable initialization for treebuilder
-        $this->_searchedStoppers = array();
-        $this->_tree             = new Zend_Markup_TokenList();
-        $this->_current          = new Zend_Markup_Token(
-            '',
-            Zend_Markup_Token::TYPE_NONE,
-            'Zend_Markup_Root'
-        );
-
-        $this->_tree->addChild($this->_current);
-
-        $this->_createTree();
-
-        return $this->_tree;
-    }
-
-    /**
-     * Tokenize
-     *
-     * @param string $input
-     *
-     * @return void
-     */
-    protected function _tokenize()
-    {
-        $attribute = '';
-
-        while ($this->_pointer < $this->_valueLen) {
-            switch ($this->_state) {
-                case self::STATE_SCAN:
-                    $matches = array();
-                    $regex   = '#\G(?<text>[^\[]*)(?<open>\[(?<name>[' . self::NAME_CHARSET . ']+)?)?#';
-                    preg_match($regex, $this->_value, $matches, null, $this->_pointer);
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    if (!empty($matches['text'])) {
-                        $this->_buffer .= $matches['text'];
-                    }
-
-                    if (!isset($matches['open'])) {
-                        // great, no tag, we are ending the string
-                        break;
-                    }
-                    if (!isset($matches['name'])) {
-                        $this->_buffer .= $matches['open'];
-                        break;
-                    }
-
-                    $this->_temp = array(
-                        'tag'        => '[' . $matches['name'],
-                        'name'       => $matches['name'],
-                        'attributes' => array()
-                    );
-
-                    if ($this->_pointer >= $this->_valueLen) {
-                        // damn, no tag
-                        $this->_buffer .= $this->_temp['tag'];
-                        break 2;
-                    }
-
-                    if ($this->_value[$this->_pointer] == '=') {
-                        $this->_pointer++;
-
-                        $this->_temp['tag'] .= '=';
-                        $this->_state        = self::STATE_PARSEVALUE;
-                        $attribute           = $this->_temp['name'];
-                    } else {
-                        $this->_state = self::STATE_SCANATTRS;
-                    }
-                    break;
-                case self::STATE_SCANATTRS:
-                    $matches = array();
-                    $regex   = '#\G((?<end>\s*\])|\s+(?<attribute>[' . self::NAME_CHARSET . ']+)(?<eq>=?))#';
-                    if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) {
-                        break 2;
-                    }
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    if (!empty($matches['end'])) {
-                        if (!empty($this->_buffer)) {
-                            $this->_tokens[] = array(
-                                'tag' => $this->_buffer,
-                                'type' => Zend_Markup_Token::TYPE_NONE
-                            );
-                            $this->_buffer = '';
-                        }
-                        $this->_temp['tag'] .= $matches['end'];
-                        $this->_temp['type'] = Zend_Markup_Token::TYPE_TAG;
-
-                        $this->_tokens[] = $this->_temp;
-                        $this->_temp     = array();
-
-                        $this->_state = self::STATE_SCAN;
-                    } else {
-                        // attribute name
-                        $attribute = $matches['attribute'];
-
-                        $this->_temp['tag'] .= $matches[0];
-
-                        $this->_temp['attributes'][$attribute] = '';
-
-                        if (empty($matches['eq'])) {
-                            $this->_state = self::STATE_SCANATTRS;
-                        } else {
-                            $this->_state = self::STATE_PARSEVALUE;
-                        }
-                    }
-                    break;
-                case self::STATE_PARSEVALUE:
-                    $matches = array();
-                    $regex   = '#\G((?<quote>"|\')(?<valuequote>.*?)\\2|(?<value>[^\]\s]+))#';
-                    if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) {
-                        $this->_state = self::STATE_SCANATTRS;
-                        break;
-                    }
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    if (!empty($matches['quote'])) {
-                        $this->_temp['attributes'][$attribute] = $matches['valuequote'];
-                    } else {
-                        $this->_temp['attributes'][$attribute] = $matches['value'];
-                    }
-                    $this->_temp['tag'] .= $matches[0];
-
-                    $this->_state = self::STATE_SCANATTRS;
-                    break;
-            }
-        }
-
-        if (!empty($this->_buffer)) {
-            $this->_tokens[] = array(
-                'tag'  => $this->_buffer,
-                'type' => Zend_Markup_Token::TYPE_NONE
-            );
-        }
-    }
-
-    /**
-     * Parse the token array into a tree
-     *
-     * @param array $tokens
-     *
-     * @return void
-     */
-    public function _createTree()
-    {
-        foreach ($this->_tokens as $token) {
-            // first we want to know if this tag is a stopper, or at least a searched one
-            if ($this->_isStopper($token['tag'])) {
-                // find the stopper
-                $oldItems = array();
-
-                while (!in_array($token['tag'], $this->_tags[$this->_current->getName()]['stoppers'])) {
-                    $oldItems[]     = clone $this->_current;
-                    $this->_current = $this->_current->getParent();
-                }
-
-                // we found the stopper, so stop the tag
-                $this->_current->setStopper($token['tag']);
-                $this->_removeFromSearchedStoppers($this->_current);
-                $this->_current = $this->_current->getParent();
-
-                // add the old items again if there are any
-                if (!empty($oldItems)) {
-                    foreach (array_reverse($oldItems) as $item) {
-                        /* @var $token Zend_Markup_Token */
-                        $this->_current->addChild($item);
-                        $item->setParent($this->_current);
-                        $this->_current = $item;
-                    }
-                }
-            } else {
-                if ($token['type'] == Zend_Markup_Token::TYPE_TAG) {
-                    if ($token['tag'] == self::NEWLINE) {
-                        // this is a newline tag, add it as a token
-                        $this->_current->addChild(new Zend_Markup_Token(
-                            "\n",
-                            Zend_Markup_Token::TYPE_NONE,
-                            '',
-                            array(),
-                            $this->_current
-                        ));
-                    } elseif (isset($token['name']) && ($token['name'][0] == '/')) {
-                        // this is a stopper, add it as a empty token
-                        $this->_current->addChild(new Zend_Markup_Token(
-                            $token['tag'],
-                            Zend_Markup_Token::TYPE_NONE,
-                            '',
-                            array(),
-                            $this->_current
-                        ));
-                    } elseif (isset($this->_tags[$this->_current->getName()]['parse_inside'])
-                        && !$this->_tags[$this->_current->getName()]['parse_inside']
-                    ) {
-                        $this->_current->addChild(new Zend_Markup_Token(
-                            $token['tag'],
-                            Zend_Markup_Token::TYPE_NONE,
-                            '',
-                            array(),
-                            $this->_current
-                        ));
-                    } else {
-                        // add the tag
-                        $child = new Zend_Markup_Token(
-                            $token['tag'],
-                            $token['type'],
-                            $token['name'],
-                            $token['attributes'],
-                            $this->_current
-                        );
-                        $this->_current->addChild($child);
-
-                        // add stoppers for this tag, if its has stoppers
-                        if ($this->_getType($token['name']) == self::TYPE_DEFAULT) {
-                            $this->_current = $child;
-
-                            $this->_addToSearchedStoppers($this->_current);
-                        }
-                    }
-                } else {
-                    // no tag, just add it as a simple token
-                    $this->_current->addChild(new Zend_Markup_Token(
-                        $token['tag'],
-                        Zend_Markup_Token::TYPE_NONE,
-                        '',
-                        array(),
-                        $this->_current
-                    ));
-                }
-            }
-        }
-    }
-
-    /**
-     * Check if there is a tag declaration, and if it isnt there, add it
-     *
-     * @param string $name
-     *
-     * @return void
-     */
-    protected function _checkTagDeclaration($name)
-    {
-        if (!isset($this->_tags[$name])) {
-            $this->_tags[$name] = array(
-                'type'     => self::TYPE_DEFAULT,
-                'stoppers' => array(
-                    '[/' . $name . ']',
-                    '[/]'
-                )
-            );
-        }
-    }
-    /**
-     * Check the tag's type
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _getType($name)
-    {
-        $this->_checkTagDeclaration($name);
-
-        return $this->_tags[$name]['type'];
-    }
-
-    /**
-     * Check if the tag is a stopper
-     *
-     * @param  string $tag
-     * @return bool
-     */
-    protected function _isStopper($tag)
-    {
-        $this->_checkTagDeclaration($this->_current->getName());
-
-        if (!empty($this->_searchedStoppers[$tag])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Add to searched stoppers
-     *
-     * @param  Zend_Markup_Token $token
-     * @return void
-     */
-    protected function _addToSearchedStoppers(Zend_Markup_Token $token)
-    {
-        $this->_checkTagDeclaration($token->getName());
-
-        foreach ($this->_tags[$token->getName()]['stoppers'] as $stopper) {
-            if (!isset($this->_searchedStoppers[$stopper])) {
-                $this->_searchedStoppers[$stopper] = 0;
-            }
-            ++$this->_searchedStoppers[$stopper];
-        }
-    }
-
-    /**
-     * Remove from searched stoppers
-     *
-     * @param  Zend_Markup_Token $token
-     * @return void
-     */
-    protected function _removeFromSearchedStoppers(Zend_Markup_Token $token)
-    {
-        $this->_checkTagDeclaration($token->getName());
-
-        foreach ($this->_tags[$token->getName()]['stoppers'] as $stopper) {
-            --$this->_searchedStoppers[$stopper];
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Parser/Exception.php b/airtime_mvc/library/Zend/Markup/Parser/Exception.php
deleted file mode 100644
index 65a42b411..000000000
--- a/airtime_mvc/library/Zend/Markup/Parser/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Markup_Exception
- */
-require_once 'Zend/Markup/Exception.php';
-
-/**
- * Exception class for Zend_Markup_Parser
- *
- * @category   Zend 
- * @uses       Zend_Markup_Exception
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Parser_Exception extends Zend_Markup_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Markup/Parser/ParserInterface.php b/airtime_mvc/library/Zend/Markup/Parser/ParserInterface.php
deleted file mode 100644
index 9eaa0ab37..000000000
--- a/airtime_mvc/library/Zend/Markup/Parser/ParserInterface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ParserInterface.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Markup_Parser_ParserInterface
-{
-    /**
-     * Parse a string
-     *
-     * This should output something like this:
-     *
-     * <code>
-     * array(
-     *     array(
-     *         'tag'        => '[tag="a" attr=val]',
-     *         'type'       => Zend_Markup::TYPE_TAG,
-     *         'name'       => 'tag',
-     *         'stoppers'   => array('[/]', '[/tag]'),
-     *         'attributes' => array(
-     *             'tag'  => 'a',
-     *             'attr' => 'val'
-     *         )
-     *     ),
-     *     array(
-     *         'tag'   => 'value',
-     *         'type'  => Zend_Markup::TYPE_NONE
-     *     ),
-     *     array(
-     *         'tag'        => '[/tag]',
-     *         'type'       => Zend_Markup::TYPE_STOPPER,
-     *         'name'       => 'tag',
-     *         'stoppers'   => array(),
-     *         'attributes' => array()
-     *     )
-     * )
-     * </code>
-     *
-     * @param  string $value
-     * @return array
-     */
-    public function parse($value);
-}
diff --git a/airtime_mvc/library/Zend/Markup/Parser/Textile.php b/airtime_mvc/library/Zend/Markup/Parser/Textile.php
deleted file mode 100644
index aff102623..000000000
--- a/airtime_mvc/library/Zend/Markup/Parser/Textile.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Textile.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Markup_TokenList
- */
-require_once 'Zend/Markup/TokenList.php';
-
-/**
- * @see Zend_Markup_Parser_ParserInterface
- */
-require_once 'Zend/Markup/Parser/ParserInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Parser_Textile implements Zend_Markup_Parser_ParserInterface
-{
-
-    const STATE_SCAN          = 0;
-    const STATE_NEW_PARAGRAPH = 1;
-    const STATE_NEWLINE       = 2;
-
-    const MATCH_ATTR_CLASSID = '\((?<attr_class>[a-zA-Z0-9_]+)?(?:\#(?<attr_id>[a-zA-Z0-9_]+))?\)';
-    const MATCH_ATTR_STYLE   = "\{(?<attr_style>[^\}\n]+)\}";
-    const MATCH_ATTR_LANG    = '\[(?<attr_lang>[a-zA-Z_]+)\]';
-    const MATCH_ATTR_ALIGN   = '(?<attr_align>\<\>?|\>|=)';
-
-
-
-    /**
-     * Token tree
-     *
-     * @var Zend_Markup_TokenList
-     */
-    protected $_tree;
-
-    /**
-     * Current token
-     *
-     * @var Zend_Markup_Token
-     */
-    protected $_current;
-
-    /**
-     * Source to tokenize
-     *
-     * @var string
-     */
-    protected $_value = '';
-
-    /**
-     * Length of the value
-     *
-     * @var int
-     */
-    protected $_valueLen = 0;
-
-    /**
-     * Current pointer
-     *
-     * @var int
-     */
-    protected $_pointer = 0;
-
-    /**
-     * The buffer
-     *
-     * @var string
-     */
-    protected $_buffer = '';
-
-    /**
-     * Simple tag translation
-     *
-     * @var array
-     */
-    protected $_simpleTags = array(
-        '*'  => 'strong',
-        '**' => 'bold',
-        '_'  => 'emphasized',
-        '__' => 'italic',
-        '??' => 'citation',
-        '-'  => 'deleted',
-        '+'  => 'insert',
-        '^'  => 'superscript',
-        '~'  => 'subscript',
-        '%'  => 'span',
-        // these are a little more complicated
-        '@'  => 'code',
-        '!'  => 'img',
-    );
-
-    /**
-     * Token array
-     *
-     * @var array
-     */
-    protected $_tokens = array();
-
-
-    /**
-     * Prepare the parsing of a Textile string, the real parsing is done in {@link _parse()}
-     *
-     * @param string $value
-     *
-     * @return array
-     */
-    public function parse($value)
-    {
-        if (!is_string($value)) {
-            /**
-             * @see Zend_Markup_Parser_Exception
-             */
-            require_once 'Zend/Markup/Parser/Exception.php';
-            throw new Zend_Markup_Parser_Exception('Value to parse should be a string.');
-        }
-        if (empty($value)) {
-            /**
-             * @see Zend_Markup_Parser_Exception
-             */
-            require_once 'Zend/Markup/Parser/Exception.php';
-            throw new Zend_Markup_Parser_Exception('Value to parse cannot be left empty.');
-        }
-
-        // first make we only have LF newlines, also trim the value
-        $this->_value = str_replace(array("\r\n", "\r"), "\n", $value);
-        $this->_value = trim($this->_value);
-
-        // initialize variables and tokenize
-        $this->_valueLen = iconv_strlen($this->_value, 'UTF-8');
-        $this->_pointer  = 0;
-        $this->_buffer   = '';
-        $this->_temp     = array();
-        $this->_tokens   = array();
-
-        $this->_tokenize();
-
-        // create the tree
-        $this->_tree     = new Zend_Markup_TokenList();
-
-        $this->_current  = new Zend_Markup_Token('', Zend_Markup_Token::TYPE_NONE, 'Zend_Markup_Root');
-        $this->_tree->addChild($this->_current);
-
-        $this->_createTree();
-
-        return $this->_tree;
-    }
-
-    /**
-     * Tokenize a textile string
-     *
-     * @return array
-     */
-    protected function _tokenize()
-    {
-        $state    = self::STATE_NEW_PARAGRAPH;
-
-        $attrsMatch = implode('|', array(
-            self::MATCH_ATTR_CLASSID,
-            self::MATCH_ATTR_STYLE,
-            self::MATCH_ATTR_LANG,
-            self::MATCH_ATTR_ALIGN
-        ));
-
-        $paragraph = '';
-
-        while ($this->_pointer < $this->_valueLen) {
-            switch ($state) {
-                case self::STATE_SCAN:
-                    $matches = array(); //[^\n*_?+~%@!-]
-                    $acronym = '(?<acronym>[A-Z]{2,})\((?<title>[^\)]+)\)';
-                    $regex   = '#\G(?<text>.*?)(?:'
-                             . "(?:(?<nl_paragraph>\n{2,})|(?<nl_break>\n))|"
-                             . '(?<tag>'
-                             . "(?<name>\*{1,2}|_{1,2}|\?{2}|\-|\+|\~|\^|%|@|!|$|{$acronym}"
-                             . '|":(?<url>[^\s]+)|")'
-                             . "(?:{$attrsMatch})*)"
-                             . ')#si';
-                    preg_match($regex, $this->_value, $matches, null, $this->_pointer);
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    if (!empty($matches['text'])) {
-                        $this->_buffer .= $matches['text'];
-                    }
-
-                    // first add the buffer
-                    if (!empty($this->_buffer)) {
-                        $this->_tokens[] = array(
-                            'tag'  => $this->_buffer,
-                            'type' => Zend_Markup_Token::TYPE_NONE
-                        );
-                        $this->_buffer = '';
-                    }
-
-                    if (!empty($matches['nl_paragraph'])) {
-                        $this->_temp = array(
-                            'tag'        => $matches['nl_paragraph'],
-                            'name'       => 'p',
-                            'type'       => Zend_Markup_Token::TYPE_TAG,
-                            'attributes' => array()
-                        );
-
-                        $state = self::STATE_NEW_PARAGRAPH;
-                    } elseif (!empty($matches['nl_break'])) {
-                        $this->_tokens[] = array(
-                            'tag'        => $matches['nl_break'],
-                            'name'       => 'break',
-                            'type'       => Zend_Markup_Token::TYPE_TAG,
-                            'attributes' => array()
-                        );
-
-                        $state   = self::STATE_NEWLINE;
-                    } elseif (!empty($matches['tag'])) {
-                        if (isset($this->_simpleTags[$matches['name']])) {
-                            // now add the new token
-                            $this->_tokens[] = array(
-                                'tag'        => $matches['tag'],
-                                'type'       => Zend_Markup_Token::TYPE_TAG,
-                                'name'       => $this->_simpleTags[$matches['name']],
-                                'attributes' => $this->_extractAttributes($matches)
-                            );
-                        } else {
-                            $attributes = $this->_extractAttributes($matches);
-                            if ($matches['tag'][0] == '"') {
-                                $name = 'url';
-                                if (isset($matches['url'])) {
-                                    $attributes['url'] = $matches['url'];
-                                }
-                                $this->_tokens[] = array(
-                                    'tag'        => $matches['tag'],
-                                    'type'       => Zend_Markup_Token::TYPE_TAG,
-                                    'name'       => $name,
-                                    'attributes' => $attributes
-                                );
-                            } else {
-                                $name = 'acronym';
-                                $this->_tokens[] = array(
-                                    'tag'        => '',
-                                    'type'       => Zend_Markup_Token::TYPE_TAG,
-                                    'name'       => 'acronym',
-                                    'attributes' => array(
-                                        'title' => $matches['title']
-                                    )
-                                );
-                                $this->_tokens[] = array(
-                                    'tag'  => $matches['acronym'],
-                                    'type' => Zend_Markup_Token::TYPE_NONE
-                                );
-                                $this->_tokens[] = array(
-                                    'tag'        => '(' . $matches['title'] . ')',
-                                    'type'       => Zend_Markup_Token::TYPE_TAG,
-                                    'name'       => 'acronym',
-                                    'attributes' => array()
-                                );
-                            }
-                        }
-                        $state = self::STATE_SCAN;
-                    }
-
-                    break;
-                case self::STATE_NEW_PARAGRAPH:
-                    if (empty($this->_temp)) {
-                        $this->_temp = array(
-                            'tag'        => '',
-                            'name'       => 'p',
-                            'type'       => Zend_Markup_token::TYPE_TAG,
-                            'attributes' => array()
-                        );
-                    } else {
-                        $this->_tokens[] = array(
-                            'tag'        => "\n",
-                            'name'       => 'p',
-                            'type'       => Zend_Markup_Token::TYPE_TAG,
-                            'attributes' => array()
-                        );
-                        $this->_temp['tag'] = substr($this->_temp['tag'], 1);
-                    }
-
-                    $matches = array(); //[^\n*_?+~%@!-] (\()? [^()]+ (?(1)\))
-                    $regex   = "#\G(?<name>(h[1-6]|p)|(?:\#|\*))(?:{$attrsMatch})*(?(2)\.\s|\s)#i";
-                    if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) {
-                        $this->_tokens[] = $this->_temp;
-                        $state    = self::STATE_SCAN;
-                        break;
-                    }
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    if ($matches['name'] == 'p') {
-                        $this->_temp['tag']       .= $matches[0];
-                        $this->_temp['attributes'] = $this->_extractAttributes($matches);
-
-                        $this->_tokens[]    = $this->_temp;
-                        $this->_temp = array();
-                    } else {
-                        $this->_tokens[] = $this->_temp;
-                        $this->_temp = array();
-
-                        $name       = $matches['name'];
-                        $attributes = $this->_extractAttributes($matches);
-
-                        if ($name == '#') {
-                            $name               = 'list';
-                            $attributes['list'] = 'decimal';
-                        } elseif ($name == '*') {
-                            $name = 'list';
-                        }
-
-                        $this->_tokens[] = array(
-                            'tag'        => $matches[0],
-                            'name'       => $name,
-                            'type'       => Zend_Markup_Token::TYPE_TAG,
-                            'attributes' => $attributes
-                        );
-                    }
-
-                    $state = self::STATE_SCAN;
-                    break;
-                case self::STATE_NEWLINE:
-                    $matches = array(); //[^\n*_?+~%@!-]
-                    $regex   = "#\G(?<name>(h[1-6])|(?:\#|\*))(?:{$attrsMatch})*(?(2)\.\s|\s)#si";
-                    if (!preg_match($regex, $this->_value, $matches, null, $this->_pointer)) {
-                        $state = self::STATE_SCAN;
-                        break;
-                    }
-
-                    $this->_pointer += strlen($matches[0]);
-
-                    $name       = $matches['name'];
-                    $attributes = $this->_extractAttributes($matches);
-
-                    if ($name == '#') {
-                        $name               = 'list';
-                        $attributes['list'] = 'decimal';
-                    } elseif ($name == '*') {
-                        $name = 'list';
-                    }
-
-                    $this->_tokens[] = array(
-                        'tag'        => $matches[0],
-                        'name'       => $name,
-                        'type'       => Zend_Markup_Token::TYPE_TAG,
-                        'attributes' => $attributes
-                    );
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Create a tree from the tokenized text
-     *
-     * @return void
-     */
-    protected function _createTree()
-    {
-        $inside = true;
-
-        foreach ($this->_tokens as $key => $token) {
-            // first check if the token is a stopper
-            if ($this->_isStopper($token, $this->_current)) {
-                if ($this->_current->getName() == 'li') {
-                    // list items are handled differently
-                    if (isset($this->_tokens[$key + 1])
-                        && ($this->_tokens[$key + 1]['type'] == Zend_Markup_Token::TYPE_TAG)
-                        && ($this->_tokens[$key + 1]['name'] == 'list')
-                    ) {
-                        // the next item is a correct tag
-                        $this->_current->setStopper($token['tag']);
-
-                        $this->_current = $this->_current->getParent();
-                    } else {
-                        // close the list
-                        $this->_current->setStopper($token['tag']);
-
-                        $this->_current = $this->_current->getParent()->getParent();
-
-                        // go up in the tree until we found the end
-                        while ($this->_isStopper($token, $this->_current)) {
-                            $this->_current->setStopper($token['tag']);
-
-                            $this->_current = $this->_current->getParent();
-                        }
-                    }
-                } else {
-                    // go up in the tree until we found the end of stoppers
-                    while ($this->_isStopper($token, $this->_current)) {
-                        $this->_current->setStopper($token['tag']);
-
-                        if (!empty($token['attributes'])) {
-                            foreach ($token['attributes'] as $name => $value) {
-                                $this->_current->addAttribute($name, $value);
-                            }
-                        }
-
-                        $this->_current = $this->_current->getParent();
-                    }
-                }
-                $inside = true;
-            } elseif (($token['type'] == Zend_Markup_Token::TYPE_TAG) && $inside) {
-                if ($token['name'] == 'break') {
-                    // add the newline and continue parsing
-                    $this->_current->addChild(new Zend_Markup_Token(
-                        $token['tag'],
-                        Zend_Markup_Token::TYPE_NONE,
-                        '',
-                        array(),
-                        $this->_current
-                    ));
-                } else {
-                    // handle a list item
-                    if ($token['name'] == 'list') {
-                        $attributes = array();
-                        if (isset($token['attributes']['list'])) {
-                            $attributes['list'] = $token['attributes']['list'];
-                            unset($token['attributes']['list']);
-                        }
-
-                        if ($this->_current->getName() != 'list') {
-                            // the list isn't started yet, create it
-                            $child = new Zend_Markup_Token(
-                                '',
-                                Zend_Markup_Token::TYPE_TAG,
-                                'list',
-                                $attributes,
-                                $this->_current
-                            );
-
-                            $this->_current->addChild($child);
-
-                            $this->_current = $child;
-                        }
-                        $token['name'] = 'li';
-                    } elseif (($token['name'] == 'img') || ($token['name'] == 'url')) {
-                        $inside = false;
-                    }
-
-                    // add the token
-                    $child = new Zend_Markup_Token(
-                        $token['tag'],
-                        Zend_Markup_Token::TYPE_TAG,
-                        $token['name'],
-                        $token['attributes'],
-                        $this->_current
-                    );
-
-                    $this->_current->addChild($child);
-
-                    $this->_current = $child;
-                }
-            } else {
-                // simply add the token as text
-                $this->_current->addChild(new Zend_Markup_Token(
-                    $token['tag'],
-                    Zend_Markup_Token::TYPE_NONE,
-                    '',
-                    array(),
-                    $this->_current
-                ));
-            }
-        }
-    }
-
-    /**
-     * Check if a tag is a stopper
-     *
-     * @param array $token
-     * @param Zend_Markup_Token $current
-     *
-     * @return bool
-     */
-    protected function _isStopper(array $token, Zend_Markup_Token $current)
-    {
-        switch ($current->getName()) {
-            case 'h1':
-            case 'h2':
-            case 'h3':
-            case 'h4':
-            case 'h5':
-            case 'h6':
-            case 'list':
-            case 'li':
-                if (($token['type'] == Zend_Markup_Token::TYPE_TAG)
-                    && (($token['name'] == 'break') || ($token['name'] == 'p'))
-                ) {
-                    return true;
-                }
-                break;
-            case 'break':
-                return false;
-                break;
-            default:
-                if (($token['type'] == Zend_Markup_Token::TYPE_TAG) && ($token['name'] == $current->getName())) {
-                    return true;
-                }
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Extract the attributes
-     *
-     * @param array $matches
-     *
-     * @return array
-     */
-    protected function _extractAttributes(array $matches)
-    {
-        $attributes = array();
-
-        if (!empty($matches['attr_class'])) {
-            $attributes['class'] = $matches['attr_class'];
-        }
-        if (!empty($matches['attr_id'])) {
-            $attributes['id'] = $matches['attr_id'];
-        }
-        if (!empty($matches['attr_style'])) {
-            $attributes['style'] = $matches['attr_style'];
-        }
-        if (!empty($matches['attr_lang'])) {
-            $attributes['lang'] = $matches['attr_lang'];
-        }
-        if (!empty($matches['attr_align'])) {
-            switch ($matches['attr_align']) {
-                case '=':
-                    $attributes['align'] = 'center';
-                    break;
-                case '>':
-                    $attributes['align'] = 'right';
-                    break;
-                case '<>':
-                    $attributes['align'] = 'justify';
-                    break;
-                default:
-                case '<':
-                    $attributes['align'] = 'left';
-                    break;
-            }
-        }
-
-        return $attributes;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Exception.php b/airtime_mvc/library/Zend/Markup/Renderer/Exception.php
deleted file mode 100644
index d1aed232a..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Markup_Exception
- */
-require_once 'Zend/Markup/Exception.php';
-
-/**
- * Exception class for Zend_Markup_Renderer
- *
- * @category   Zend
- * @uses       Zend_Markup_Exception
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Exception extends Zend_Markup_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html.php b/airtime_mvc/library/Zend/Markup/Renderer/Html.php
deleted file mode 100644
index b81c5899c..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Html.php 21551 2010-03-18 17:19:11Z kokx $
- */
-
-/**
- * @see Zend_Filter_HtmlEntities
- */
-require_once 'Zend/Filter/HtmlEntities.php';
-/**
- * @see Zend_Filter_PregReplace
- */
-require_once 'Zend/Filter/PregReplace.php';
-/**
- * @see Zend_Filter_Callback
- */
-require_once 'Zend/Filter/Callback.php';
-/**
- * @see Zend_Markup_Renderer_RendererAbstract
- */
-require_once 'Zend/Markup/Renderer/RendererAbstract.php';
-
-/**
- * HTML renderer
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract
-{
-
-    /**
-     * Element groups
-     *
-     * @var array
-     */
-    protected $_groups = array(
-        'block'        => array('block', 'inline', 'block-empty', 'inline-empty', 'list'),
-        'inline'       => array('inline', 'inline-empty'),
-        'list'         => array('list-item'),
-        'list-item'    => array('inline', 'inline-empty', 'list'),
-        'block-empty'  => array(),
-        'inline-empty' => array(),
-    );
-
-    /**
-     * The current group
-     *
-     * @var string
-     */
-    protected $_group = 'block';
-
-    /**
-     * Default attributes
-     *
-     * @var array
-     */
-    protected static $_defaultAttributes = array(
-        'id'    => '',
-        'class' => '',
-        'style' => '',
-        'lang'  => '',
-        'title' => ''
-    );
-
-
-    /**
-     * Constructor
-     *
-     * @param array|Zend_Config $options
-     *
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        $this->_pluginLoader = new Zend_Loader_PluginLoader(array(
-            'Zend_Markup_Renderer_Html' => 'Zend/Markup/Renderer/Html/'
-        ));
-
-        $this->_defineDefaultMarkups();
-
-        parent::__construct($options);
-    }
-
-    /**
-     * Define the default markups
-     *
-     * @return void
-     */
-    protected function _defineDefaultMarkups()
-    {
-        $this->_markups = array(
-            'b' => array(
-                'type'   => 10, // self::TYPE_REPLACE | self::TAG_NORMAL
-                'tag'    => 'strong',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'u' => array(
-                'type'        => 10,
-                'tag'         => 'span',
-                'attributes'  => array(
-                    'style' => 'text-decoration: underline;',
-                ),
-                'group'       => 'inline',
-                'filter'      => true,
-            ),
-            'i' => array(
-                'type'   => 10,
-                'tag'    => 'em',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'cite' => array(
-                'type'   => 10,
-                'tag'    => 'cite',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'del' => array(
-                'type'   => 10,
-                'tag'    => 'del',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'ins' => array(
-                'type'   => 10,
-                'tag'    => 'ins',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'sub' => array(
-                'type'   => 10,
-                'tag'    => 'sub',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'sup' => array(
-                'type'   => 10,
-                'tag'    => 'sup',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'span' => array(
-                'type'   => 10,
-                'tag'    => 'span',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'acronym'  => array(
-                'type'   => 10,
-                'tag'    => 'acronym',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            // headings
-            'h1' => array(
-                'type'   => 10,
-                'tag'    => 'h1',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'h2' => array(
-                'type'   => 10,
-                'tag'    => 'h2',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'h3' => array(
-                'type'   => 10,
-                'tag'    => 'h3',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'h4' => array(
-                'type'   => 10,
-                'tag'    => 'h4',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'h5' => array(
-                'type'   => 10,
-                'tag'    => 'h5',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            'h6' => array(
-                'type'   => 10,
-                'tag'    => 'h6',
-                'group'  => 'inline',
-                'filter' => true,
-            ),
-            // callback tags
-            'url' => array(
-                'type'     => 6, // self::TYPE_CALLBACK | self::TAG_NORMAL
-                'callback' => null,
-                'group'    => 'inline',
-                'filter'   => true,
-            ),
-            'img' => array(
-                'type'     => 6,
-                'callback' => null,
-                'group'    => 'inline-empty',
-                'filter'   => true,
-            ),
-            'code' => array(
-                'type'     => 6,
-                'callback' => null,
-                'group'    => 'block-empty',
-                'filter'   => false,
-            ),
-            'p' => array(
-                'type'   => 10,
-                'tag'    => 'p',
-                'group'  => 'block',
-                'filter' => true,
-            ),
-            'ignore' => array(
-                'type'   => 10,
-                'start'  => '',
-                'end'    => '',
-                'group'  => 'block-empty',
-                'filter' => true,
-            ),
-            'quote' => array(
-                'type'   => 10,
-                'tag'    => 'blockquote',
-                'group'  => 'block',
-                'filter' => true,
-            ),
-            'list' => array(
-                'type'     => 6,
-                'callback' => null,
-                'group'    => 'list',
-                'filter'   => new Zend_Filter_PregReplace('/.*/is', ''),
-            ),
-            '*' => array(
-                'type'   => 10,
-                'tag'    => 'li',
-                'group'  => 'list-item',
-                'filter' => true,
-            ),
-            'hr' => array(
-                'type'    => 9, // self::TYPE_REPLACE | self::TAG_SINGLE
-                'tag'     => 'hr',
-                'group'   => 'block',
-                'empty'   => true,
-            ),
-            // aliases
-            'bold' => array(
-                'type' => 16,
-                'name' => 'b',
-            ),
-            'strong' => array(
-                'type' => 16,
-                'name' => 'b',
-            ),
-            'italic' => array(
-                'type' => 16,
-                'name' => 'i',
-            ),
-            'em' => array(
-                'type' => 16,
-                'name' => 'i',
-            ),
-            'emphasized' => array(
-                'type' => 16,
-                'name' => 'i',
-            ),
-            'underline' => array(
-                'type' => 16,
-                'name' => 'u',
-            ),
-            'citation' => array(
-                'type' => 16,
-                'name' => 'cite',
-            ),
-            'deleted' => array(
-                'type' => 16,
-                'name' => 'del',
-            ),
-            'insert' => array(
-                'type' => 16,
-                'name' => 'ins',
-            ),
-            'strike' => array(
-                'type' => 16,
-                'name' => 's',
-            ),
-            's' => array(
-                'type' => 16,
-                'name' => 'del',
-            ),
-            'subscript' => array(
-                'type' => 16,
-                'name' => 'sub',
-            ),
-            'superscript' => array(
-                'type' => 16,
-                'name' => 'sup',
-            ),
-            'a' => array(
-                'type' => 16,
-                'name' => 'url',
-            ),
-            'image' => array(
-                'type' => 16,
-                'name' => 'img',
-            ),
-            'li' => array(
-                'type' => 16,
-                'name' => '*',
-            ),
-            'color' => array(
-                'type' => 16,
-                'name' => 'span',
-            ),
-        );
-    }
-
-    /**
-     * Add the default filters
-     *
-     * @return void
-     */
-    public function addDefaultFilters()
-    {
-        $this->_defaultFilter = new Zend_Filter();
-
-        $this->_defaultFilter->addFilter(new Zend_Filter_HtmlEntities(array('encoding' => self::getEncoding())));
-        $this->_defaultFilter->addFilter(new Zend_Filter_Callback('nl2br'));
-    }
-
-    /**
-     * Execute a replace token
-     *
-     * @param  Zend_Markup_Token $token
-     * @param  array $markup
-     * @return string
-     */
-    protected function _executeReplace(Zend_Markup_Token $token, $markup)
-    {
-        if (isset($markup['tag'])) {
-            if (!isset($markup['attributes'])) {
-                $markup['attributes'] = array();
-            }
-            $attrs = self::renderAttributes($token, $markup['attributes']);
-            return "<{$markup['tag']}{$attrs}>{$this->_render($token)}</{$markup['tag']}>";
-        }
-
-        return parent::_executeReplace($token, $markup);
-    }
-
-    /**
-     * Execute a single replace token
-     *
-     * @param  Zend_Markup_Token $token
-     * @param  array $markup
-     * @return string
-     */
-    protected function _executeSingleReplace(Zend_Markup_Token $token, $markup)
-    {
-        if (isset($markup['tag'])) {
-            if (!isset($markup['attributes'])) {
-                $markup['attributes'] = array();
-            }
-            $attrs = self::renderAttributes($token, $markup['attributes']);
-            return "<{$markup['tag']}{$attrs} />";
-        }
-        return parent::_executeSingleReplace($token, $markup);
-    }
-
-    /**
-     * Render some attributes
-     *
-     * @param  Zend_Markup_Token $token
-     * @param  array $attributes
-     * @return string
-     */
-    public static function renderAttributes(Zend_Markup_Token $token, array $attributes = array())
-    {
-        $attributes = array_merge(self::$_defaultAttributes, $attributes);
-
-        $return = '';
-
-        $tokenAttributes = $token->getAttributes();
-
-        // correct style attribute
-        if (isset($tokenAttributes['style'])) {
-            $tokenAttributes['style'] = trim($tokenAttributes['style']);
-
-            if ($tokenAttributes['style'][strlen($tokenAttributes['style']) - 1] != ';') {
-                $tokenAttributes['style'] .= ';';
-            }
-        } else {
-            $tokenAttributes['style'] = '';
-        }
-
-        // special treathment for 'align' and 'color' attribute
-        if (isset($tokenAttributes['align'])) {
-            $tokenAttributes['style'] .= 'text-align: ' . $tokenAttributes['align'] . ';';
-            unset($tokenAttributes['align']);
-        }
-        if (isset($tokenAttributes['color']) && self::checkColor($tokenAttributes['color'])) {
-            $tokenAttributes['style'] .= 'color: ' . $tokenAttributes['color'] . ';';
-            unset($tokenAttributes['color']);
-        }
-
-        /*
-         * loop through all the available attributes, and check if there is
-         * a value defined by the token
-         * if there is no value defined by the token, use the default value or
-         * don't set the attribute
-         */
-        foreach ($attributes as $attribute => $value) {
-            if (isset($tokenAttributes[$attribute]) && !empty($tokenAttributes[$attribute])) {
-                $return .= ' ' . $attribute . '="' . htmlentities($tokenAttributes[$attribute],
-                                                                  ENT_QUOTES,
-                                                                  self::getEncoding()) . '"';
-            } elseif (!empty($value)) {
-                $return .= ' ' . $attribute . '="' . htmlentities($value, ENT_QUOTES, self::getEncoding()) . '"';
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Check if a color is a valid HTML color
-     *
-     * @param string $color
-     *
-     * @return bool
-     */
-    public static function checkColor($color)
-    {
-        /*
-         * aqua, black, blue, fuchsia, gray, green, lime, maroon, navy, olive,
-         * purple, red, silver, teal, white, and yellow.
-         */
-        $colors = array(
-            'aqua', 'black', 'blue', 'fuchsia', 'gray', 'green', 'lime',
-            'maroon', 'navy', 'olive', 'purple', 'red', 'silver', 'teal',
-            'white', 'yellow'
-        );
-
-        if (in_array($color, $colors)) {
-            return true;
-        }
-
-        if (preg_match('/\#[0-9a-f]{6}/i', $color)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the URI is valid
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    public static function isValidUri($uri)
-    {
-        if (!preg_match('/^([a-z][a-z+\-.]*):/i', $uri, $matches)) {
-            return false;
-        }
-
-        $scheme = strtolower($matches[1]);
-
-        switch ($scheme) {
-            case 'javascript':
-                // JavaScript scheme is not allowed for security reason
-                return false;
-
-            case 'http':
-            case 'https':
-            case 'ftp':
-                $components = @parse_url($uri);
-
-                if ($components === false) {
-                    return false;
-                }
-
-                if (!isset($components['host'])) {
-                    return false;
-                }
-
-                return true;
-
-            default:
-                return true;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html/Code.php b/airtime_mvc/library/Zend/Markup/Renderer/Html/Code.php
deleted file mode 100644
index e7d63b395..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html/Code.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Code.php 20270 2010-01-13 22:37:41Z kokx $
- */
-
-/**
- * @see Zend_Markup_Renderer_Html_HtmlAbstract
- */
-require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php';
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Html_Code extends Zend_Markup_Renderer_Html_HtmlAbstract
-{
-
-    /**
-     * Convert the token
-     *
-     * @param Zend_Markup_Token $token
-     * @param string $text
-     *
-     * @return string
-     */
-    public function convert(Zend_Markup_Token $token, $text)
-    {
-        return highlight_string($text, true);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html/HtmlAbstract.php b/airtime_mvc/library/Zend/Markup/Renderer/Html/HtmlAbstract.php
deleted file mode 100644
index 2cbb2acfa..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html/HtmlAbstract.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlAbstract.php 20271 2010-01-13 23:27:34Z kokx $
- */
-
-/**
- * @see Zend_Markup_Renderer_TokenConverterInterface
- */
-require_once 'Zend/Markup/Renderer/TokenConverterInterface.php';
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Markup_Renderer_Html_HtmlAbstract implements Zend_Markup_Renderer_TokenConverterInterface
-{
-
-    /**
-     * The HTML renderer
-     *
-     * @var Zend_Markup_Renderer_Html
-     */
-    protected $_renderer;
-
-
-    /**
-     * Set the HTML renderer instance
-     *
-     * @param Zend_Markup_Renderer_Html $renderer
-     *
-     * @return Zend_Markup_Renderer_Html_HtmlAbstract
-     */
-    public function setRenderer(Zend_Markup_Renderer_Html $renderer)
-    {
-        $this->_renderer = $renderer;
-    }
-
-    /**
-     * Get the HTML renderer instance
-     *
-     * @return Zend_Markup_Renderer_Html
-     */
-    public function getRenderer()
-    {
-        return $this->_renderer;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html/Img.php b/airtime_mvc/library/Zend/Markup/Renderer/Html/Img.php
deleted file mode 100644
index 79d2ca7c3..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html/Img.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Img.php 20664 2010-01-26 18:46:20Z kokx $
- */
-
-/**
- * @see Zend_Markup_Renderer_Html
- */
-require_once 'Zend/Markup/Renderer/Html.php';
-/**
- * @see Zend_Markup_Renderer_Html_HtmlAbstract
- */
-require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php';
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Html_Img extends Zend_Markup_Renderer_Html_HtmlAbstract
-{
-
-    /**
-     * Convert the token
-     *
-     * @param Zend_Markup_Token $token
-     * @param string $text
-     *
-     * @return string
-     */
-    public function convert(Zend_Markup_Token $token, $text)
-    {
-        $uri = $text;
-
-        if (!preg_match('/^([a-z][a-z+\-.]*):/i', $uri)) {
-            $uri = 'http://' . $uri;
-        }
-
-        // check if the URL is valid
-        if (!Zend_Markup_Renderer_Html::isValidUri($uri)) {
-            return $text;
-        }
-
-        if ($token->hasAttribute('alt')) {
-            $alt = $token->getAttribute('alt');
-        } else {
-            // try to get the alternative from the URL
-            $alt = rtrim($text, '/');
-            $alt = strrchr($alt, '/');
-            if (false !== strpos($alt, '.')) {
-                $alt = substr($alt, 1, strpos($alt, '.') - 1);
-            }
-        }
-
-        // run the URI and alt through htmlentities
-        $uri = htmlentities($uri, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
-        $alt = htmlentities($alt, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
-
-
-        return "<img src=\"{$uri}\" alt=\"{$alt}\"" . Zend_Markup_Renderer_Html::renderAttributes($token) . " />";
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html/List.php b/airtime_mvc/library/Zend/Markup/Renderer/Html/List.php
deleted file mode 100644
index 706f27fbc..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html/List.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: List.php 20270 2010-01-13 22:37:41Z kokx $
- */
-
-/**
- * @see Zend_Markup_Renderer_Html_HtmlAbstract
- */
-require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php';
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Html_List extends Zend_Markup_Renderer_Html_HtmlAbstract
-{
-
-    /**
-     * Convert the token
-     *
-     * @param Zend_Markup_Token $token
-     * @param string $text
-     *
-     * @return string
-     */
-    public function convert(Zend_Markup_Token $token, $text)
-    {
-        $type = null;
-        if ($token->hasAttribute('list')) {
-            // because '01' == '1'
-            if ($token->getAttribute('list') === '01') {
-                $type = 'decimal-leading-zero';
-            } else {
-                switch ($token->getAttribute('list')) {
-                    case '1':
-                        $type = 'decimal';
-                        break;
-                    case 'i':
-                        $type = 'lower-roman';
-                        break;
-                    case 'I':
-                        $type = 'upper-roman';
-                        break;
-                    case 'a':
-                        $type = 'lower-alpha';
-                        break;
-                    case 'A':
-                        $type = 'upper-alpha';
-                        break;
-
-                    // the following type is unsupported by IE (including IE8)
-                    case 'alpha':
-                        $type = 'lower-greek';
-                        break;
-
-                    // the CSS names itself
-                    case 'armenian': // unsupported by IE (including IE8)
-                    case 'decimal':
-                    case 'decimal-leading-zero': // unsupported by IE (including IE8)
-                    case 'georgian': // unsupported by IE (including IE8)
-                    case 'lower-alpha':
-                    case 'lower-greek': // unsupported by IE (including IE8)
-                    case 'lower-latin': // unsupported by IE (including IE8)
-                    case 'lower-roman':
-                    case 'upper-alpha':
-                    case 'upper-latin': // unsupported by IE (including IE8)
-                    case 'upper-roman':
-                        $type = $token->getAttribute('list');
-                        break;
-                }
-            }
-        }
-
-        if (null !== $type) {
-            return "<ol style=\"list-style-type: {$type}\">{$text}</ol>";
-        } else {
-            return "<ul>{$text}</ul>";
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/Html/Url.php b/airtime_mvc/library/Zend/Markup/Renderer/Html/Url.php
deleted file mode 100644
index 3a93614ba..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/Html/Url.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Url.php 20664 2010-01-26 18:46:20Z kokx $
- */
-
-/**
- * @see Zend_Markup_Renderer_Html
- */
-require_once 'Zend/Markup/Renderer/Html.php';
-/**
- * @see Zend_Markup_Renderer_Html_HtmlAbstract
- */
-require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php';
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer_Html
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Renderer_Html_Url extends Zend_Markup_Renderer_Html_HtmlAbstract
-{
-
-    /**
-     * Convert the token
-     *
-     * @param Zend_Markup_Token $token
-     * @param string $text
-     *
-     * @return string
-     */
-    public function convert(Zend_Markup_Token $token, $text)
-    {
-        if ($token->hasAttribute('url')) {
-            $uri = $token->getAttribute('url');
-        } else {
-            $uri = $text;
-        }
-
-        if (!preg_match('/^([a-z][a-z+\-.]*):/i', $uri)) {
-            $uri = 'http://' . $uri;
-        }
-
-        // check if the URL is valid
-        if (!Zend_Markup_Renderer_Html::isValidUri($uri)) {
-            return $text;
-        }
-
-        $attributes = Zend_Markup_Renderer_Html::renderAttributes($token);
-
-        // run the URI through htmlentities
-        $uri = htmlentities($uri, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
-
-        return "<a href=\"{$uri}\"{$attributes}>{$text}</a>";
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/RendererAbstract.php b/airtime_mvc/library/Zend/Markup/Renderer/RendererAbstract.php
deleted file mode 100644
index 348413c91..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/RendererAbstract.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RendererAbstract.php 20956 2010-02-06 17:58:58Z kokx $
- */
-
-/**
- * @see Zend_config
- */
-require_once 'Zend/Config.php';
-/**
- * @see Zend_Filter
- */
-require_once 'Zend/Filter.php';
-/**
- * @see Zend_Markup_Renderer_TokenConverterInterface
- */
-require_once 'Zend/Markup/Renderer/TokenConverterInterface.php';
-
-/**
- * Defines the basic rendering functionality
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Markup_Renderer_RendererAbstract
-{
-    const TYPE_CALLBACK = 4;
-    const TYPE_REPLACE  = 8;
-    const TYPE_ALIAS    = 16;
-
-    /**
-     * Tag info
-     *
-     * @var array
-     */
-    protected $_markups = array();
-
-    /**
-     * Parser
-     *
-     * @var Zend_Markup_Parser_ParserInterface
-     */
-    protected $_parser;
-
-    /**
-     * What filter to use
-     *
-     * @var bool
-     */
-    protected $_filter;
-
-    /**
-     * Filter chain
-     *
-     * @var Zend_Filter
-     */
-    protected $_defaultFilter;
-
-    /**
-     * The current group
-     *
-     * @var string
-     */
-    protected $_group;
-
-    /**
-     * Groups definition
-     *
-     * @var array
-     */
-    protected $_groups = array();
-
-    /**
-     * Plugin loader for tags
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected $_pluginLoader;
-
-    /**
-     * The current token
-     *
-     * @var Zend_Markup_Token
-     */
-    protected $_token;
-
-    /**
-     * Encoding
-     *
-     * @var string
-     */
-    protected static $_encoding = 'UTF-8';
-
-
-    /**
-     * Constructor
-     *
-     * @param array|Zend_Config $options
-     *
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (isset($options['encoding'])) {
-            $this->setEncoding($options['encoding']);
-        }
-        if (isset($options['parser'])) {
-            $this->setParser($options['parser']);
-        }
-        if (isset($options['useDefaultTags']) && ($options['useDefaultTags'] === false)) {
-            $this->removeDefaultTags();
-        }
-        if (!isset($options['useDefaultFilters']) || ($options['useDefaultFilters'] === true)) {
-            $this->addDefaultFilters();
-        }
-        if (isset($options['defaultFilter'])) {
-            $this->addDefaultFilter($options['defaultFilter']);
-        }
-    }
-
-    /**
-     * Set the parser
-     *
-     * @param  Zend_Markup_Parser_ParserInterface $parser
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public function setParser(Zend_Markup_Parser_ParserInterface $parser)
-    {
-        $this->_parser = $parser;
-        return $this;
-    }
-
-    /**
-     * Get the parser
-     *
-     * @return Zend_Markup_Parser_ParserInterface
-     */
-    public function getParser()
-    {
-        return $this->_parser;
-    }
-
-    /**
-     * Get the plugin loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader()
-    {
-        return $this->_pluginLoader;
-    }
-
-    /**
-     * Set the renderer's encoding
-     *
-     * @param string $encoding
-     *
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public static function setEncoding($encoding)
-    {
-        self::$_encoding = $encoding;
-
-        return $this;
-    }
-
-    /**
-     * Get the renderer's encoding
-     *
-     * @return string
-     */
-    public static function getEncoding()
-    {
-        return self::$_encoding;
-    }
-
-    /**
-     * Add a new markup
-     *
-     * @param string $name
-     * @param string $type
-     * @param array $options
-     *
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public function addMarkup($name, $type, array $options)
-    {
-        if (!isset($options['group']) && ($type ^ self::TYPE_ALIAS)) {
-            require_once 'Zend/Markup/Renderer/Exception.php';
-            throw new Zend_Markup_Renderer_Exception("There is no render group defined.");
-        }
-
-        // add the filter
-        if (isset($options['filter'])) {
-            if ($options['filter'] instanceof Zend_Filter_Interface) {
-                $filter = $options['filter'];
-            } elseif ($options['filter'] === true) {
-                $filter = $this->getDefaultFilter();
-            } else {
-                $filter = false;
-            }
-        } else {
-            $filter = $this->getDefaultFilter();
-        }
-
-        // check the type
-        if ($type & self::TYPE_CALLBACK) {
-            // add a callback tag
-            if (isset($options['callback'])) {
-                if (!($options['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) {
-                    require_once 'Zend/Markup/Renderer/Exception.php';
-                    throw new Zend_Markup_Renderer_Exception("Not a valid tag callback.");
-                }
-                if (method_exists($options['callback'], 'setRenderer')) {
-                    $options['callback']->setRenderer($this);
-                }
-            } else {
-                $options['callback'] = null;
-            }
-
-            $options['type'] = $type;
-            $options['filter'] = $filter;
-
-            $this->_markups[$name] = $options;
-        } elseif ($type & self::TYPE_ALIAS) {
-            // add an alias
-            if (empty($options['name'])) {
-                require_once 'Zend/Markup/Renderer/Exception.php';
-                throw new Zend_Markup_Renderer_Exception(
-                        'No alias was provided but tag was defined as such');
-            }
-
-            $this->_markups[$name] = array(
-                'type' => self::TYPE_ALIAS,
-                'name' => $options['name']
-            );
-        } else {
-            if ($type && array_key_exists('empty', $options) && $options['empty']) {
-                // add a single replace markup
-                $options['type']   = $type;
-                $options['filter'] = $filter;
-
-                $this->_markups[$name] = $options;
-            } else {
-                // add a replace markup
-                $options['type']   = $type;
-                $options['filter'] = $filter;
-
-                $this->_markups[$name] = $options;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a markup
-     *
-     * @param string $name
-     *
-     * @return void
-     */
-    public function removeMarkup($name)
-    {
-        unset($this->_markups[$name]);
-    }
-
-    /**
-     * Remove the default tags
-     *
-     * @return void
-     */
-    public function clearMarkups()
-    {
-        $this->_markups = array();
-    }
-
-    /**
-     * Render function
-     *
-     * @param  Zend_Markup_TokenList|string $tokenList
-     * @return string
-     */
-    public function render($value)
-    {
-        if ($value instanceof Zend_Markup_TokenList) {
-            $tokenList = $value;
-        } else {
-            $tokenList = $this->getParser()->parse($value);
-        }
-
-        $root = $tokenList->current();
-
-        $this->_filter = $this->getDefaultFilter();
-
-        return $this->_render($root);
-    }
-
-    /**
-     * Render a single token
-     *
-     * @param  Zend_Markup_Token $token
-     * @return string
-     */
-    protected function _render(Zend_Markup_Token $token)
-    {
-        $return    = '';
-
-        $this->_token = $token;
-
-        // if this tag has children, execute them
-        if ($token->hasChildren()) {
-            foreach ($token->getChildren() as $child) {
-                $return .= $this->_execute($child);
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get the group of a token
-     *
-     * @param  Zend_Markup_Token $token
-     * @return string|bool
-     */
-    protected function _getGroup(Zend_Markup_Token $token)
-    {
-        if (!isset($this->_markups[$token->getName()])) {
-            return false;
-        }
-
-        $tag = $this->_markups[$token->getName()];
-
-        // alias processing
-        while ($tag['type'] & self::TYPE_ALIAS) {
-            $tag = $this->_markups[$tag['name']];
-        }
-
-        return isset($tag['group']) ? $tag['group'] : false;
-    }
-
-    /**
-     * Execute the token
-     *
-     * @param  Zend_Markup_Token $token
-     * @return string
-     */
-    protected function _execute(Zend_Markup_Token $token)
-    {
-        // first return the normal text tags
-        if ($token->getType() == Zend_Markup_Token::TYPE_NONE) {
-            return $this->_filter($token->getTag());
-        }
-
-        // if the token doesn't have a notation, return the plain text
-        if (!isset($this->_markups[$token->getName()])) {
-            $oldToken  = $this->_token;
-            $return = $this->_filter($token->getTag()) . $this->_render($token) . $token->getStopper();
-            $this->_token = $oldToken;
-            return $return;
-        }
-
-        $name   = $this->_getMarkupName($token);
-        $markup = (!$name) ? false : $this->_markups[$name];
-        $empty  = (is_array($markup) && array_key_exists('empty', $markup) && $markup['empty']);
-
-        // check if the tag has content
-        if (!$empty && !$token->hasChildren()) {
-            return '';
-        }
-
-        // check for the context
-        if (is_array($markup) && !in_array($markup['group'], $this->_groups[$this->_group])) {
-            $oldToken = $this->_token;
-            $return   = $this->_filter($token->getTag()) . $this->_render($token) . $token->getStopper();
-            $this->_token = $oldToken;
-            return $return;
-        }
-
-        // check for the filter
-        if (!isset($markup['filter'])
-            || (!($markup['filter'] instanceof Zend_Filter_Interface) && ($markup['filter'] !== false))) {
-            $this->_markups[$name]['filter'] = $this->getDefaultFilter();
-        }
-
-        // save old values to reset them after the work is done
-        $oldFilter = $this->_filter;
-        $oldGroup  = $this->_group;
-
-        $return = '';
-
-        // set the filter and the group
-        $this->_filter = $this->getFilter($name);
-
-        if ($group = $this->_getGroup($token)) {
-            $this->_group = $group;
-        }
-
-        // callback
-        if (is_array($markup) && ($markup['type'] & self::TYPE_CALLBACK)) {
-            // load the callback if the tag doesn't exist
-            if (!($markup['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) {
-                $class = $this->getPluginLoader()->load($name);
-
-                $markup['callback'] = new $class;
-
-                if (!($markup['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) {
-                    require_once 'Zend/Markup/Renderer/Exception.php';
-                    throw new Zend_Markup_Renderer_Exception("Callback for tag '$name' found, but it isn't valid.");
-                }
-
-                if (method_exists($markup['callback'], 'setRenderer')) {
-                    $markup['callback']->setRenderer($this);
-                }
-            }
-            if ($markup['type'] && !$empty) {
-                $return = $markup['callback']->convert($token, $this->_render($token));
-            } else {
-                $return = $markup['callback']->convert($token, null);
-            }
-        } else {
-            // replace
-            if ($markup['type'] && !$empty) {
-                $return = $this->_executeReplace($token, $markup);
-            } else {
-                $return = $this->_executeSingleReplace($token, $markup);
-            }
-        }
-
-        // reset to the old values
-        $this->_filter = $oldFilter;
-        $this->_group  = $oldGroup;
-
-        return $return;
-    }
-
-    /**
-     * Filter method
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    protected function _filter($value)
-    {
-        if ($this->_filter instanceof Zend_Filter_Interface) {
-            return $this->_filter->filter($value);
-        }
-        return $value;
-    }
-
-    /**
-     * Get the markup name
-     *
-     * @param Zend_Markup_Token
-     *
-     * @return string
-     */
-    protected function _getMarkupName(Zend_Markup_Token $token)
-    {
-        $name = $token->getName();
-        if (empty($name)) {
-            return false;
-        }
-
-        return $this->_resolveMarkupName($name);
-    }
-
-    /**
-     * Resolve aliases for a markup name
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function _resolveMarkupName($name)
-    {
-        while (($type = $this->_getMarkupType($name))
-               && ($type & self::TYPE_ALIAS)
-        ) {
-            $name = $this->_markups[$name]['name'];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Retrieve markup type
-     *
-     * @param  string $name
-     * @return false|int
-     */
-    protected function _getMarkupType($name)
-    {
-        if (!isset($this->_markups[$name])) {
-            return false;
-        }
-        if (!isset($this->_markups[$name]['type'])) {
-            return false;
-        }
-        return $this->_markups[$name]['type'];
-    }
-
-    /**
-     * Execute a replace token
-     *
-     * @param  Zend_Markup_Token $token
-     * @param  array $tag
-     * @return string
-     */
-    protected function _executeReplace(Zend_Markup_Token $token, $tag)
-    {
-        return $tag['start'] . $this->_render($token) . $tag['end'];
-    }
-
-    /**
-     * Execute a single replace token
-     *
-     * @param  Zend_Markup_Token $token
-     * @param  array $tag
-     * @return string
-     */
-    protected function _executeSingleReplace(Zend_Markup_Token $token, $tag)
-    {
-        return $tag['replace'];
-    }
-
-    /**
-     * Get the default filter
-     *
-     * @return void
-     */
-    public function getDefaultFilter()
-    {
-        if (null === $this->_defaultFilter) {
-            $this->setDefaultFilter();
-        }
-
-        return $this->_defaultFilter;
-    }
-
-    /**
-     * Add a default filter
-     *
-     * @param string $filter
-     *
-     * @return void
-     */
-    public function addDefaultFilter(Zend_Filter_Interface $filter, $placement = Zend_Filter::CHAIN_APPEND)
-    {
-        if (!($this->_defaultFilter instanceof Zend_Filter)) {
-            $defaultFilter = new Zend_Filter();
-            $defaultFilter->addFilter($filter);
-            $this->_defaultFilter = $defaultFilter;
-        }
-
-        $this->_defaultFilter->addFilter($filter, $placement);
-    }
-
-    /**
-     * Set the default filter
-     *
-     * @param Zend_Filter_Interface $filter
-     *
-     * @return void
-     */
-    public function setDefaultFilter(Zend_Filter_Interface $filter)
-    {
-        $this->_defaultFilter = $filter;
-    }
-
-    /**
-     * Get the filter for an existing markup
-     *
-     * @param string $markup
-     *
-     * @return Zend_Filter_Interface
-     */
-    public function getFilter($markup)
-    {
-        $markup = $this->_resolveMarkupName($markup);
-
-        if (!isset($this->_markups[$markup]['filter'])
-            || !($this->_markups[$markup]['filter'] instanceof Zend_Filter_Interface)
-        ) {
-            if (isset($this->_markups[$markup]['filter']) && $this->_markups[$markup]['filter']) {
-                $this->_markups[$markup]['filter'] = $this->getDefaultFilter();
-            } else {
-                return false;
-            }
-        }
-
-        return $this->_markups[$markup]['filter'];
-    }
-
-    /**
-     * Add a filter for an existing markup
-     *
-     * @param Zend_Filter_Interface $filter
-     * @param string $markup
-     * @param string $placement
-     *
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public function addFilter(Zend_Filter_Interface $filter, $markup, $placement = Zend_Filter::CHAIN_APPEND)
-    {
-        $markup = $this->_resolveMarkupName($markup);
-
-        $oldFilter = $this->getFilter($markup);
-
-        // if this filter is the default filter, clone it first
-        if ($oldFilter === $this->getDefaultFilter()) {
-            $oldFilter = clone $oldFilter;
-        }
-
-        if (!($oldFilter instanceof Zend_Filter)) {
-            $this->_markups[$markup]['filter'] = new Zend_Filter();
-
-            if ($oldFilter instanceof Zend_Filter_Interface) {
-                $this->_markups[$markup]['filter']->addFilter($oldFilter);
-            }
-        } else {
-            $this->_markups[$markup]['filter'] = $oldFilter;
-        }
-
-        $this->_markups[$markup]['filter']->addFilter($filter, $placement);
-
-        return $this;
-    }
-
-    /**
-     * Set the filter for an existing
-     *
-     * @param Zend_Filter_Interface $filter
-     * @param string $markup
-     *
-     * @return Zend_Markup_Renderer_RendererAbstract
-     */
-    public function setFilter(Zend_Filter_Interface $filter, $markup)
-    {
-        $markup = $this->_resolveMarkupName($markup);
-
-        $this->_markups[$markup]['filter'] = $filter;
-
-        return $this;
-    }
-
-    /**
-     * Add a render group
-     *
-     * @param string $name
-     * @param array $allowedInside
-     * @param array $allowsInside
-     *
-     * @return void
-     */
-    public function addGroup($name, array $allowedInside = array(), array $allowsInside = array())
-    {
-        $this->_groups[$name] = $allowsInside;
-
-        foreach ($allowedInside as $group) {
-            $this->_groups[$group][] = $name;
-        }
-    }
-
-    /**
-     * Get group definitions
-     *
-     * @return array
-     */
-    public function getGroups()
-    {
-        return $this->_groups;
-    }
-
-    /**
-     * Set the default filters
-     *
-     * @return void
-     */
-    abstract public function addDefaultFilters();
-
-}
diff --git a/airtime_mvc/library/Zend/Markup/Renderer/TokenConverterInterface.php b/airtime_mvc/library/Zend/Markup/Renderer/TokenConverterInterface.php
deleted file mode 100644
index 8c9383747..000000000
--- a/airtime_mvc/library/Zend/Markup/Renderer/TokenConverterInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TokenConverterInterface.php 20271 2010-01-13 23:27:34Z kokx $
- */
-
-/**
- * Tag interface
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Renderer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Markup_Renderer_TokenConverterInterface
-{
-
-    /**
-     * Convert the token
-     *
-     * @param Zend_Markup_Token $token
-     * @param string $text
-     *
-     * @return string
-     */
-    public function convert(Zend_Markup_Token $token, $text);
-}
diff --git a/airtime_mvc/library/Zend/Markup/Token.php b/airtime_mvc/library/Zend/Markup/Token.php
deleted file mode 100644
index 6b5b6f549..000000000
--- a/airtime_mvc/library/Zend/Markup/Token.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @subpackage Parser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Token.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Markup_TokenList
- */
-require_once 'Zend/Markup/TokenList.php';
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_Token
-{
-    const TYPE_NONE    = 'none';
-    const TYPE_TAG     = 'tag';
-
-    /**
-     * Children of this token
-     *
-     * @var Zend_Markup_TokenList
-     */
-    protected $_children;
-
-    /**
-     * The complete tag
-     *
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * The tag's type
-     *
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Tag name
-     *
-     * @var string
-     */
-    protected $_name = '';
-
-    /**
-     * Tag attributes
-     *
-     * @var array
-     */
-    protected $_attributes = array();
-
-    /**
-     * The used tag stopper (empty when none is found)
-     *
-     * @var string
-     */
-    protected $_stopper = '';
-
-    /**
-     * The parent token
-     *
-     * @var Zend_Markup_Token
-     */
-    protected $_parent;
-
-
-    /**
-     * Construct the token
-     *
-     * @param  string $tag
-     * @param  string $type
-     * @param  string $name
-     * @param  array $attributes
-     * @param  Zend_Markup_Token $parent
-     * @return void
-     */
-    public function __construct(
-        $tag,
-        $type,
-        $name = '',
-        array $attributes = array(),
-        Zend_Markup_Token $parent = null
-    ) {
-        $this->_tag        = $tag;
-        $this->_type       = $type;
-        $this->_name       = $name;
-        $this->_attributes = $attributes;
-        $this->_parent     = $parent;
-    }
-
-    // accessors
-
-    /**
-     * Set the stopper
-     *
-     * @param string $stopper
-     * @return Zend_Markup_Token
-     */
-    public function setStopper($stopper)
-    {
-        $this->_stopper = $stopper;
-
-        return $this;
-    }
-
-    /**
-     * Get the stopper
-     *
-     * @return string
-     */
-    public function getStopper()
-    {
-        return $this->_stopper;
-    }
-
-    /**
-     * Get the token's name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get the token's type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Get the complete tag
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * Get an attribute
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public function getAttribute($name)
-    {
-        return isset($this->_attributes[$name]) ? $this->_attributes[$name] : null;
-    }
-
-    /**
-     * Check if the token has an attribute
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasAttribute($name)
-    {
-        return isset($this->_attributes[$name]);
-    }
-
-    /**
-     * Get all the attributes
-     *
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->_attributes;
-    }
-
-    /**
-     * Add an attribute
-     *
-     * @return Zend_Markup_Token
-     */
-    public function addAttribute($name, $value)
-    {
-        $this->_attributes[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Check if an attribute is empty
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function attributeIsEmpty($name)
-    {
-        return empty($this->_attributes[$name]);
-    }
-
-    // functions for child/parent tokens
-
-    /**
-     * Add a child token
-     *
-     * @return void
-     */
-    public function addChild(Zend_Markup_Token $child)
-    {
-        $this->getChildren()->addChild($child);
-    }
-
-    /**
-     * Set the children token list
-     *
-     * @param  Zend_Markup_TokenList $children
-     * @return Zend_Markup_Token
-     */
-    public function setChildren(Zend_Markup_TokenList $children)
-    {
-        $this->_children = $children;
-        return $this;
-    }
-
-    /**
-     * Get the children for this token
-     *
-     * @return Zend_Markup_TokenList
-     */
-    public function getChildren()
-    {
-        if (null === $this->_children) {
-            $this->setChildren(new Zend_Markup_TokenList());
-        }
-        return $this->_children;
-    }
-
-	/**
-     * Does this token have any children
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return !empty($this->_children);
-    }
-
-    /**
-     * Get the parent token (if any)
-     *
-     * @return Zend_Markup_Token
-     */
-    public function getParent()
-    {
-        return $this->_parent;
-    }
-
-    /**
-     * Set a parent token
-     *
-     * @param  Zend_Markup_Token $parent
-     * @return Zend_Markup_Token
-     */
-    public function setParent(Zend_Markup_Token $parent)
-    {
-        $this->_parent = $parent;
-        return $this;
-    }
-
-    /**
-     * Magic clone function
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        $this->_parent   = null;
-        $this->_children = null;
-        $this->_tag      = '';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Markup/TokenList.php b/airtime_mvc/library/Zend/Markup/TokenList.php
deleted file mode 100644
index 5a5563794..000000000
--- a/airtime_mvc/library/Zend/Markup/TokenList.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TokenList.php 20277 2010-01-14 14:17:12Z kokx $
- */
-
-/**
- * @see Zend_Markup_Token
- */
-require_once 'Zend/Markup/Token.php';
-
-/**
- * @category   Zend
- * @package    Zend_Markup
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Markup_TokenList implements RecursiveIterator
-{
-
-    /**
-     * Array of tokens
-     *
-     * @var array
-     */
-    protected $_tokens = array();
-
-    /**
-     * Get the current token
-     *
-     * @return Zend_Markup_Token
-     */
-    public function current()
-    {
-        return current($this->_tokens);
-    }
-
-    /**
-     * Get the children of the current token
-     *
-     * @return Zend_Markup_TokenList
-     */
-    public function getChildren()
-    {
-        return current($this->_tokens)->getChildren();
-    }
-
-    /**
-     * Add a new child token
-     *
-     * @param Zend_Markup_Token $child
-     *
-     * @return void
-     */
-    public function addChild(Zend_Markup_Token $child)
-    {
-        $this->_tokens[] = $child;
-    }
-
-    /**
-     * Check if the current token has children
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return current($this->_tokens)->hasChildren();
-    }
-
-    /**
-     * Get the key of the current token
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return key($this->_tokens);
-    }
-
-    /**
-     * Go to the next token
-     *
-     * @return Zend_Markup_Token
-     */
-    public function next()
-    {
-        return next($this->_tokens);
-    }
-
-    /**
-     * Rewind the iterator
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        reset($this->_tokens);
-    }
-
-    /**
-     * Check if the element is valid
-     *
-     * @return void
-     */
-    public function valid()
-    {
-        return $this->current() !== false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Measure/Abstract.php b/airtime_mvc/library/Zend/Measure/Abstract.php
deleted file mode 100644
index 48e6d957c..000000000
--- a/airtime_mvc/library/Zend/Measure/Abstract.php
+++ /dev/null
@@ -1,418 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Abstract.php 21330 2010-03-04 22:07:38Z thomas $
- */
-
-/**
- * @see Zend_Locale
- */
-require_once 'Zend/Locale.php';
-
-/**
- * @see Zend_Locale_Math
- */
-require_once 'Zend/Locale/Math.php';
-
-/**
- * @see Zend_Locale_Format
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * Abstract class for all measurements
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Measure_Abstract
-{
-    /**
-     * Plain value in standard unit
-     *
-     * @var string $_value
-     */
-    protected $_value;
-
-    /**
-     * Original type for this unit
-     *
-     * @var string $_type
-     */
-    protected $_type;
-
-    /**
-     * Locale identifier
-     *
-     * @var string $_locale
-     */
-    protected $_locale = null;
-
-    /**
-     * Unit types for this measurement
-     */
-    protected $_units = array();
-
-    /**
-     * Zend_Measure_Abstract is an abstract class for the different measurement types
-     *
-     * @param  $value  mixed  - Value as string, integer, real or float
-     * @param  $type   type   - OPTIONAL a measure type f.e. Zend_Measure_Length::METER
-     * @param  $locale locale - OPTIONAL a Zend_Locale Type
-     * @throws Zend_Measure_Exception
-     */
-    public function __construct($value, $type = null, $locale = null)
-    {
-        if (($type !== null) and (Zend_Locale::isLocale($type, null, false))) {
-            $locale = $type;
-            $type = null;
-        }
-
-        $this->setLocale($locale);
-        if ($type === null) {
-            $type = $this->_units['STANDARD'];
-        }
-
-        if (isset($this->_units[$type]) === false) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception("Type ($type) is unknown");
-        }
-
-        $this->setValue($value, $type, $this->_locale);
-    }
-
-    /**
-     * Returns the actual set locale
-     *
-     * @return string
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets a new locale for the value representation
-     *
-     * @param string|Zend_Locale $locale (Optional) New locale to set
-     * @param boolean            $check  False, check but don't set; True, set the new locale
-     * @return Zend_Measure_Abstract
-     */
-    public function setLocale($locale = null, $check = false)
-    {
-        if (empty($locale)) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale') === true) {
-                $locale = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        if ($locale === null) {
-            $locale = new Zend_Locale();
-        }
-
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, false, false)) {
-                require_once 'Zend/Measure/Exception.php';
-                throw new Zend_Measure_Exception("Language (" . (string) $locale . ") is unknown");
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        if (!$check) {
-            $this->_locale = (string) $locale;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the internal value
-     *
-     * @param integer            $round  (Optional) Rounds the value to an given precision,
-     *                                              Default is -1 which returns without rounding
-     * @param string|Zend_Locale $locale (Optional) Locale for number representation
-     * @return integer|string
-     */
-    public function getValue($round = -1, $locale = null)
-    {
-        if ($round < 0) {
-            $return = $this->_value;
-        } else {
-            $return = Zend_Locale_Math::round($this->_value, $round);
-        }
-
-        if ($locale !== null) {
-            $this->setLocale($locale, true);
-            return Zend_Locale_Format::toNumber($return, array('locale' => $locale));
-        }
-
-        return $return;
-    }
-
-    /**
-     * Set a new value
-     *
-     * @param  integer|string      $value   Value as string, integer, real or float
-     * @param  string              $type    OPTIONAL A measure type f.e. Zend_Measure_Length::METER
-     * @param  string|Zend_Locale  $locale  OPTIONAL Locale for parsing numbers
-     * @throws Zend_Measure_Exception
-     * @return Zend_Measure_Abstract
-     */
-    public function setValue($value, $type = null, $locale = null)
-    {
-        if (($type !== null) and (Zend_Locale::isLocale($type, null, false))) {
-            $locale = $type;
-            $type = null;
-        }
-
-        if ($locale === null) {
-            $locale = $this->_locale;
-        }
-
-        $this->setLocale($locale, true);
-        if ($type === null) {
-            $type = $this->_units['STANDARD'];
-        }
-
-        if (empty($this->_units[$type])) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception("Type ($type) is unknown");
-        }
-
-        try {
-            $value = Zend_Locale_Format::getNumber($value, array('locale' => $locale));
-        } catch(Exception $e) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $this->_value = $value;
-        $this->setType($type);
-        return $this;
-    }
-
-    /**
-     * Returns the original type
-     *
-     * @return type
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set a new type, and convert the value
-     *
-     * @param  string $type New type to set
-     * @throws Zend_Measure_Exception
-     * @return Zend_Measure_Abstract
-     */
-    public function setType($type)
-    {
-        if (empty($this->_units[$type])) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception("Type ($type) is unknown");
-        }
-
-        if (empty($this->_type)) {
-            $this->_type = $type;
-        } else {
-            // Convert to standard value
-            $value = $this->_value;
-            if (is_array($this->_units[$this->getType()][0])) {
-                foreach ($this->_units[$this->getType()][0] as $key => $found) {
-                    switch ($key) {
-                        case "/":
-                            if ($found != 0) {
-                                $value = call_user_func(Zend_Locale_Math::$div, $value, $found, 25);
-                            }
-                            break;
-                        case "+":
-                            $value = call_user_func(Zend_Locale_Math::$add, $value, $found, 25);
-                            break;
-                        case "-":
-                            $value = call_user_func(Zend_Locale_Math::$sub, $value, $found, 25);
-                            break;
-                        default:
-                            $value = call_user_func(Zend_Locale_Math::$mul, $value, $found, 25);
-                            break;
-                    }
-                }
-            } else {
-                $value = call_user_func(Zend_Locale_Math::$mul, $value, $this->_units[$this->getType()][0], 25);
-            }
-
-            // Convert to expected value
-            if (is_array($this->_units[$type][0])) {
-                foreach (array_reverse($this->_units[$type][0]) as $key => $found) {
-                    switch ($key) {
-                        case "/":
-                            $value = call_user_func(Zend_Locale_Math::$mul, $value, $found, 25);
-                            break;
-                        case "+":
-                            $value = call_user_func(Zend_Locale_Math::$sub, $value, $found, 25);
-                            break;
-                        case "-":
-                            $value = call_user_func(Zend_Locale_Math::$add, $value, $found, 25);
-                            break;
-                        default:
-                            if ($found != 0) {
-                                $value = call_user_func(Zend_Locale_Math::$div, $value, $found, 25);
-                            }
-                            break;
-                    }
-                }
-            } else {
-                $value = call_user_func(Zend_Locale_Math::$div, $value, $this->_units[$type][0], 25);
-            }
-
-            $slength = strlen($value);
-            $length  = 0;
-            for($i = 1; $i <= $slength; ++$i) {
-                if ($value[$slength - $i] != '0') {
-                    $length = 26 - $i;
-                    break;
-                }
-            }
-
-            $this->_value = Zend_Locale_Math::round($value, $length);
-            $this->_type  = $type;
-        }
-        return $this;
-    }
-
-    /**
-     * Compare if the value and type is equal
-     *
-     * @param  Zend_Measure_Abstract $object object to compare
-     * @return boolean
-     */
-    public function equals($object)
-    {
-        if ((string) $object == $this->toString()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a string representation
-     *
-     * @param  integer            $round  (Optional) Runds the value to an given exception
-     * @param  string|Zend_Locale $locale (Optional) Locale to set for the number
-     * @return string
-     */
-    public function toString($round = -1, $locale = null)
-    {
-        if ($locale === null) {
-            $locale = $this->_locale;
-        }
-
-        return $this->getValue($round, $locale) . ' ' . $this->_units[$this->getType()][1];
-    }
-
-    /**
-     * Returns a string representation
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Returns the conversion list
-     *
-     * @return array
-     */
-    public function getConversionList()
-    {
-        return $this->_units;
-    }
-
-    /**
-     * Alias function for setType returning the converted unit
-     *
-     * @param  string             $type   Constant Type
-     * @param  integer            $round  (Optional) Rounds the value to a given precision
-     * @param  string|Zend_Locale $locale (Optional) Locale to set for the number
-     * @return string
-     */
-    public function convertTo($type, $round = 2, $locale = null)
-    {
-        $this->setType($type);
-        return $this->toString($round, $locale);
-    }
-
-    /**
-     * Adds an unit to another one
-     *
-     * @param  Zend_Measure_Abstract $object object of same unit type
-     * @return Zend_Measure_Abstract
-     */
-    public function add($object)
-    {
-        $object->setType($this->getType());
-        $value  = $this->getValue(-1) + $object->getValue(-1);
-
-        $this->setValue($value, $this->getType(), $this->_locale);
-        return $this;
-    }
-
-    /**
-     * Substracts an unit from another one
-     *
-     * @param  Zend_Measure_Abstract $object object of same unit type
-     * @return Zend_Measure_Abstract
-     */
-    public function sub($object)
-    {
-        $object->setType($this->getType());
-        $value  = $this->getValue(-1) - $object->getValue(-1);
-
-        $this->setValue($value, $this->getType(), $this->_locale);
-        return $this;
-    }
-
-    /**
-     * Compares two units
-     *
-     * @param  Zend_Measure_Abstract $object object of same unit type
-     * @return boolean
-     */
-    public function compare($object)
-    {
-        $object->setType($this->getType());
-        $value  = $this->getValue(-1) - $object->getValue(-1);
-
-        if ($value < 0) {
-            return -1;
-        } else if ($value > 0) {
-            return 1;
-        }
-
-        return 0;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Measure/Acceleration.php b/airtime_mvc/library/Zend/Measure/Acceleration.php
deleted file mode 100644
index 8d94ef48f..000000000
--- a/airtime_mvc/library/Zend/Measure/Acceleration.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Acceleration.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling acceleration conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Acceleration
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Acceleration extends Zend_Measure_Abstract
-{
-    const STANDARD = 'METER_PER_SQUARE_SECOND';
-
-    const CENTIGAL                     = 'CENTIGAL';
-    const CENTIMETER_PER_SQUARE_SECOND = 'CENTIMETER_PER_SQUARE_SECOND';
-    const DECIGAL                      = 'DECIGAL';
-    const DECIMETER_PER_SQUARE_SECOND  = 'DECIMETER_PER_SQUARE_SECOND';
-    const DEKAMETER_PER_SQUARE_SECOND  = 'DEKAMETER_PER_SQUARE_SECOND';
-    const FOOT_PER_SQUARE_SECOND       = 'FOOT_PER_SQUARE_SECOND';
-    const G                            = 'G';
-    const GAL                          = 'GAL';
-    const GALILEO                      = 'GALILEO';
-    const GRAV                         = 'GRAV';
-    const HECTOMETER_PER_SQUARE_SECOND = 'HECTOMETER_PER_SQUARE_SECOND';
-    const INCH_PER_SQUARE_SECOND       = 'INCH_PER_SQUARE_SECOND';
-    const KILOMETER_PER_HOUR_SECOND    = 'KILOMETER_PER_HOUR_SECOND';
-    const KILOMETER_PER_SQUARE_SECOND  = 'KILOMETER_PER_SQUARE_SECOND';
-    const METER_PER_SQUARE_SECOND      = 'METER_PER_SQUARE_SECOND';
-    const MILE_PER_HOUR_MINUTE         = 'MILE_PER_HOUR_MINUTE';
-    const MILE_PER_HOUR_SECOND         = 'MILE_PER_HOUR_SECOND';
-    const MILE_PER_SQUARE_SECOND       = 'MILE_PER_SQUARE_SECOND';
-    const MILLIGAL                     = 'MILLIGAL';
-    const MILLIMETER_PER_SQUARE_SECOND = 'MILLIMETER_PER_SQUARE_SECOND';
-
-    /**
-     * Calculations for all acceleration units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CENTIGAL'                     => array('0.0001',   'cgal'),
-        'CENTIMETER_PER_SQUARE_SECOND' => array('0.01',     'cm/s²'),
-        'DECIGAL'                      => array('0.001',    'dgal'),
-        'DECIMETER_PER_SQUARE_SECOND'  => array('0.1',      'dm/s²'),
-        'DEKAMETER_PER_SQUARE_SECOND'  => array('10',       'dam/s²'),
-        'FOOT_PER_SQUARE_SECOND'       => array('0.3048',   'ft/s²'),
-        'G'                            => array('9.80665',  'g'),
-        'GAL'                          => array('0.01',     'gal'),
-        'GALILEO'                      => array('0.01',     'gal'),
-        'GRAV'                         => array('9.80665',  'g'),
-        'HECTOMETER_PER_SQUARE_SECOND' => array('100',      'h/s²'),
-        'INCH_PER_SQUARE_SECOND'       => array('0.0254',   'in/s²'),
-        'KILOMETER_PER_HOUR_SECOND'    => array(array('' => '5','/' => '18'), 'km/h²'),
-        'KILOMETER_PER_SQUARE_SECOND'  => array('1000',     'km/s²'),
-        'METER_PER_SQUARE_SECOND'      => array('1',        'm/s²'),
-        'MILE_PER_HOUR_MINUTE'         => array(array('' => '22', '/' => '15', '*' => '0.3048', '/' => '60'), 'mph/m'),
-        'MILE_PER_HOUR_SECOND'         => array(array('' => '22', '/' => '15', '*' => '0.3048'), 'mph/s'),
-        'MILE_PER_SQUARE_SECOND'       => array('1609.344', 'mi/s²'),
-        'MILLIGAL'                     => array('0.00001',  'mgal'),
-        'MILLIMETER_PER_SQUARE_SECOND' => array('0.001',    'mm/s²'),
-        'STANDARD'                     => 'METER_PER_SQUARE_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Angle.php b/airtime_mvc/library/Zend/Measure/Angle.php
deleted file mode 100644
index 6f02d1f32..000000000
--- a/airtime_mvc/library/Zend/Measure/Angle.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Angle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling angle conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Angle
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Angle extends Zend_Measure_Abstract
-{
-    const STANDARD = 'RADIAN';
-
-    const RADIAN      = 'RADIAN';
-    const MIL         = 'MIL';
-    const GRAD        = 'GRAD';
-    const DEGREE      = 'DEGREE';
-    const MINUTE      = 'MINUTE';
-    const SECOND      = 'SECOND';
-    const POINT       = 'POINT';
-    const CIRCLE_16   = 'CIRCLE_16';
-    const CIRCLE_10   = 'CIRCLE_10';
-    const CIRCLE_8    = 'CIRCLE_8';
-    const CIRCLE_6    = 'CIRCLE_6';
-    const CIRCLE_4    = 'CIRCLE_4';
-    const CIRCLE_2    = 'CIRCLE_2';
-    const FULL_CIRCLE = 'FULL_CIRCLE';
-
-    /**
-     * Calculations for all angle units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'RADIAN'      => array('1','rad'),
-        'MIL'         => array(array('' => M_PI,'/' => '3200'),   'mil'),
-        'GRAD'        => array(array('' => M_PI,'/' => '200'),    'gr'),
-        'DEGREE'      => array(array('' => M_PI,'/' => '180'),    '°'),
-        'MINUTE'      => array(array('' => M_PI,'/' => '10800'),  "'"),
-        'SECOND'      => array(array('' => M_PI,'/' => '648000'), '"'),
-        'POINT'       => array(array('' => M_PI,'/' => '16'),     'pt'),
-        'CIRCLE_16'   => array(array('' => M_PI,'/' => '8'),      'per 16 circle'),
-        'CIRCLE_10'   => array(array('' => M_PI,'/' => '5'),      'per 10 circle'),
-        'CIRCLE_8'    => array(array('' => M_PI,'/' => '4'),      'per 8 circle'),
-        'CIRCLE_6'    => array(array('' => M_PI,'/' => '3'),      'per 6 circle'),
-        'CIRCLE_4'    => array(array('' => M_PI,'/' => '2'),      'per 4 circle'),
-        'CIRCLE_2'    => array(M_PI,                            'per 2 circle'),
-        'FULL_CIRCLE' => array(array('' => M_PI,'*' => '2'),      'cir'),
-        'STANDARD'    => 'RADIAN'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Area.php b/airtime_mvc/library/Zend/Measure/Area.php
deleted file mode 100644
index bc018d568..000000000
--- a/airtime_mvc/library/Zend/Measure/Area.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Area.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling area conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Area
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Area extends Zend_Measure_Abstract
-{
-    const STANDARD = 'SQUARE_METER';
-
-    const ACRE                       = 'ACRE';
-    const ACRE_COMMERCIAL            = 'ACRE_COMMERCIAL';
-    const ACRE_SURVEY                = 'ACRE_SURVEY';
-    const ACRE_IRELAND               = 'ACRE_IRELAND';
-    const ARE                        = 'ARE';
-    const ARPENT                     = 'ARPENT';
-    const BARN                       = 'BARN';
-    const BOVATE                     = 'BOVATE';
-    const BUNDER                     = 'BUNDER';
-    const CABALLERIA                 = 'CABALLERIA';
-    const CABALLERIA_AMERICA         = 'CABALLERIA_AMERICA';
-    const CABALLERIA_CUBA            = 'CABALLERIA_CUBA';
-    const CARREAU                    = 'CARREAU';
-    const CARUCATE                   = 'CARUCATE';
-    const CAWNEY                     = 'CAWNEY';
-    const CENTIARE                   = 'CENTIARE';
-    const CONG                       = 'CONG';
-    const COVER                      = 'COVER';
-    const CUERDA                     = 'CUERDA';
-    const DEKARE                     = 'DEKARE';
-    const DESSIATINA                 = 'DESSIATINA';
-    const DHUR                       = 'DHUR';
-    const DUNUM                      = 'DUNUM';
-    const DUNHAM                     = 'DUNHAM';
-    const FALL_SCOTS                 = 'FALL_SCOTS';
-    const FALL                       = 'FALL';
-    const FANEGA                     = 'FANEGA';
-    const FARTHINGDALE               = 'FARTHINGDALE';
-    const HACIENDA                   = 'HACIENDA';
-    const HECTARE                    = 'HECTARE';
-    const HIDE                       = 'HIDE';
-    const HOMESTEAD                  = 'HOMESTEAD';
-    const HUNDRED                    = 'HUNDRED';
-    const JERIB                      = 'JERIB';
-    const JITRO                      = 'JITRO';
-    const JOCH                       = 'JOCH';
-    const JUTRO                      = 'JUTRO';
-    const JO                         = 'JO';
-    const KAPPLAND                   = 'KAPPLAND';
-    const KATTHA                     = 'KATTHA';
-    const LABOR                      = 'LABOR';
-    const LEGUA                      = 'LEGUA';
-    const MANZANA_COSTA_RICA         = 'MANZANA_COSTA_RICA';
-    const MANZANA                    = 'MANZANA';
-    const MORGEN                     = 'MORGEN';
-    const MORGEN_AFRICA              = 'MORGEN_AFRICA';
-    const MU                         = 'MU';
-    const NGARN                      = 'NGARN';
-    const NOOK                       = 'NOOK';
-    const OXGANG                     = 'OXGANG';
-    const PERCH                      = 'PERCH';
-    const PERCHE                     = 'PERCHE';
-    const PING                       = 'PING';
-    const PYONG                      = 'PYONG';
-    const RAI                        = 'RAI';
-    const ROOD                       = 'ROOD';
-    const SECTION                    = 'SECTION';
-    const SHED                       = 'SHED';
-    const SITIO                      = 'SITIO';
-    const SQUARE                     = 'SQUARE';
-    const SQUARE_ANGSTROM            = 'SQUARE_ANGSTROM';
-    const SQUARE_ASTRONOMICAL_UNIT   = 'SQUARE_ASTRONOMICAL_UNIT';
-    const SQUARE_ATTOMETER           = 'SQUARE_ATTOMETER';
-    const SQUARE_BICRON              = 'SQUARE_BICRON';
-    const SQUARE_CENTIMETER          = 'SQUARE_CENTIMETER';
-    const SQUARE_CHAIN               = 'SQUARE_CHAIN';
-    const SQUARE_CHAIN_ENGINEER      = 'SQUARE_CHAIN_ENGINEER';
-    const SQUARE_CITY_BLOCK_US_EAST  = 'SQUARE_CITY_BLOCK_US_EAST';
-    const SQUARE_CITY_BLOCK_US_WEST  = 'SQUARE_CITY_BLOCK_US_WEST';
-    const SQUARE_CITY_BLOCK_US_SOUTH = 'SQUARE_CITY_BLOCK_US_SOUTH';
-    const SQUARE_CUBIT               = 'SQUARE_CUBIT';
-    const SQUARE_DECIMETER           = 'SQUARE_DECIMETER';
-    const SQUARE_DEKAMETER           = 'SQUARE_DEKAMETER';
-    const SQUARE_EXAMETER            = 'SQUARE_EXAMETER';
-    const SQUARE_FATHOM              = 'SQUARE_FATHOM';
-    const SQUARE_FEMTOMETER          = 'SQUARE_FEMTOMETER';
-    const SQUARE_FERMI               = 'SQUARE_FERMI';
-    const SQUARE_FOOT                = 'SQUARE_FOOT';
-    const SQUARE_FOOT_SURVEY         = 'SQUARE_FOOT_SURVEY';
-    const SQUARE_FURLONG             = 'SQUARE_FURLONG';
-    const SQUARE_GIGAMETER           = 'SQUARE_GIGAMETER';
-    const SQUARE_HECTOMETER          = 'SQUARE_HECTOMETER';
-    const SQUARE_INCH                = 'SQUARE_INCH';
-    const SQUARE_INCH_SURVEY         = 'SQUARE_INCH_SURVEY';
-    const SQUARE_KILOMETER           = 'SQUARE_KILOMETER';
-    const SQUARE_LEAGUE_NAUTIC       = 'SQUARE_LEAGUE_NAUTIC';
-    const SQUARE_LEAGUE              = 'SQUARE_LEAGUE';
-    const SQUARE_LIGHT_YEAR          = 'SQUARE_LIGHT_YEAR';
-    const SQUARE_LINK                = 'SQUARE_LINK';
-    const SQUARE_LINK_ENGINEER       = 'SQUARE_LINK_ENGINEER';
-    const SQUARE_MEGAMETER           = 'SQUARE_MEGAMETER';
-    const SQUARE_METER               = 'SQUARE_METER';
-    const SQUARE_MICROINCH           = 'SQUARE_MICROINCH';
-    const SQUARE_MICROMETER          = 'SQUARE_MICROMETER';
-    const SQUARE_MICROMICRON         = 'SQUARE_MICROMICRON';
-    const SQUARE_MICRON              = 'SQUARE_MICRON';
-    const SQUARE_MIL                 = 'SQUARE_MIL';
-    const SQUARE_MILE                = 'SQUARE_MILE';
-    const SQUARE_MILE_NAUTIC         = 'SQUARE_MILE_NAUTIC';
-    const SQUARE_MILE_SURVEY         = 'SQUARE_MILE_SURVEY';
-    const SQUARE_MILLIMETER          = 'SQUARE_MILLIMETER';
-    const SQUARE_MILLIMICRON         = 'SQUARE_MILLIMICRON';
-    const SQUARE_MYRIAMETER          = 'SQUARE_MYRIAMETER';
-    const SQUARE_NANOMETER           = 'SQUARE_NANOMETER';
-    const SQUARE_PARIS_FOOT          = 'SQUARE_PARIS_FOOT';
-    const SQUARE_PARSEC              = 'SQUARE_PARSEC';
-    const SQUARE_PERCH               = 'SQUARE_PERCH';
-    const SQUARE_PERCHE              = 'SQUARE_PERCHE';
-    const SQUARE_PETAMETER           = 'SQUARE_PETAMETER';
-    const SQUARE_PICOMETER           = 'SQUARE_PICOMETER';
-    const SQUARE_ROD                 = 'SQUARE_ROD';
-    const SQUARE_TENTHMETER          = 'SQUARE_TENTHMETER';
-    const SQUARE_TERAMETER           = 'SQUARE_TERAMETER';
-    const SQUARE_THOU                = 'SQUARE_THOU';
-    const SQUARE_VARA                = 'SQUARE_VARA';
-    const SQUARE_VARA_TEXAS          = 'SQUARE_VARA_TEXAS';
-    const SQUARE_YARD                = 'SQUARE_YARD';
-    const SQUARE_YARD_SURVEY         = 'SQUARE_YARD_SURVEY';
-    const SQUARE_YOCTOMETER          = 'SQUARE_YOCTOMETER';
-    const SQUARE_YOTTAMETER          = 'SQUARE_YOTTAMETER';
-    const STANG                      = 'STANG';
-    const STREMMA                    = 'STREMMA';
-    const TAREA                      = 'TAREA';
-    const TATAMI                     = 'TATAMI';
-    const TONDE_LAND                 = 'TONDE_LAND';
-    const TOWNSHIP                   = 'TOWNSHIP';
-    const TSUBO                      = 'TSUBO';
-    const TUNNLAND                   = 'TUNNLAND';
-    const YARD                       = 'YARD';
-    const VIRGATE                    = 'VIRGATE';
-
-    /**
-     * Calculations for all area units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ACRE'               => array('4046.856422',      'A'),
-        'ACRE_COMMERCIAL'    => array('3344.50944',       'A'),
-        'ACRE_SURVEY'        => array('4046.872627',      'A'),
-        'ACRE_IRELAND'       => array('6555',             'A'),
-        'ARE'                => array('100',              'a'),
-        'ARPENT'             => array('3418.89',          'arpent'),
-        'BARN'               => array('1e-28',            'b'),
-        'BOVATE'             => array('60000',            'bovate'),
-        'BUNDER'             => array('10000',            'bunder'),
-        'CABALLERIA'         => array('400000',           'caballeria'),
-        'CABALLERIA_AMERICA' => array('450000',           'caballeria'),
-        'CABALLERIA_CUBA'    => array('134200',           'caballeria'),
-        'CARREAU'            => array('12900',            'carreau'),
-        'CARUCATE'           => array('486000',           'carucate'),
-        'CAWNEY'             => array('5400',             'cawney'),
-        'CENTIARE'           => array('1',                'ca'),
-        'CONG'               => array('1000',             'cong'),
-        'COVER'              => array('2698',             'cover'),
-        'CUERDA'             => array('3930',             'cda'),
-        'DEKARE'             => array('1000',             'dekare'),
-        'DESSIATINA'         => array('10925',            'dessiantina'),
-        'DHUR'               => array('16.929',           'dhur'),
-        'DUNUM'              => array('1000',             'dunum'),
-        'DUNHAM'             => array('1000',             'dunham'),
-        'FALL_SCOTS'         => array('32.15',            'fall'),
-        'FALL'               => array('47.03',            'fall'),
-        'FANEGA'             => array('6430',             'fanega'),
-        'FARTHINGDALE'       => array('1012',             'farthingdale'),
-        'HACIENDA'           => array('89600000',         'hacienda'),
-        'HECTARE'            => array('10000',            'ha'),
-        'HIDE'               => array('486000',           'hide'),
-        'HOMESTEAD'          => array('647500',           'homestead'),
-        'HUNDRED'            => array('50000000',         'hundred'),
-        'JERIB'              => array('2000',             'jerib'),
-        'JITRO'              => array('5755',             'jitro'),
-        'JOCH'               => array('5755',             'joch'),
-        'JUTRO'              => array('5755',             'jutro'),
-        'JO'                 => array('1.62',             'jo'),
-        'KAPPLAND'           => array('154.26',           'kappland'),
-        'KATTHA'             => array('338',              'kattha'),
-        'LABOR'              => array('716850',           'labor'),
-        'LEGUA'              => array('17920000',         'legua'),
-        'MANZANA_COSTA_RICA' => array('6988.96',          'manzana'),
-        'MANZANA'            => array('10000',            'manzana'),
-        'MORGEN'             => array('2500',             'morgen'),
-        'MORGEN_AFRICA'      => array('8567',             'morgen'),
-        'MU'                 => array(array('' => '10000', '/' => '15'), 'mu'),
-        'NGARN'              => array('400',              'ngarn'),
-        'NOOK'               => array('80937.128',        'nook'),
-        'OXGANG'             => array('60000',            'oxgang'),
-        'PERCH'              => array('25.29285264',      'perch'),
-        'PERCHE'             => array('34.19',            'perche'),
-        'PING'               => array('3.305',            'ping'),
-        'PYONG'              => array('3.306',            'pyong'),
-        'RAI'                => array('1600',             'rai'),
-        'ROOD'               => array('1011.7141',        'rood'),
-        'SECTION'            => array('2589998.5',        'sec'),
-        'SHED'               => array('10e-52',           'shed'),
-        'SITIO'              => array('18000000',         'sitio'),
-        'SQUARE'             => array('9.290304',         'sq'),
-        'SQUARE_ANGSTROM'    => array('1.0e-20',          'A²'),
-        'SQUARE_ASTRONOMICAL_UNIT'   => array('2.2379523e+22', 'AU²'),
-        'SQUARE_ATTOMETER'   => array('1.0e-36',          'am²'),
-        'SQUARE_BICRON'      => array('1.0e-24',          'µµ²'),
-        'SQUARE_CENTIMETER'  => array('0.0001',           'cm²'),
-        'SQUARE_CHAIN'       => array('404.68726',        'ch²'),
-        'SQUARE_CHAIN_ENGINEER'      => array('929.03412',   'ch²'),
-        'SQUARE_CITY_BLOCK_US_EAST'  => array('4.97027584',  'sq block'),
-        'SQUARE_CITY_BLOCK_US_WEST'  => array('17.141056',   'sq block'),
-        'SQUARE_CITY_BLOCK_US_SOUTH' => array('99.88110336', 'sq block'),
-        'SQUARE_CUBIT'       => array('0.20903184',       'sq cubit'),
-        'SQUARE_DECIMETER'   => array('0.01',             'dm²'),
-        'SQUARE_DEKAMETER'   => array('100',              'dam²'),
-        'SQUARE_EXAMETER'    => array('1.0e+36',          'Em²'),
-        'SQUARE_FATHOM'      => array('3.3445228',        'fth²'),
-        'SQUARE_FEMTOMETER'  => array('1.0e-30',          'fm²'),
-        'SQUARE_FERMI'       => array('1.0e-30',          'f²'),
-        'SQUARE_FOOT'        => array('0.09290304',       'ft²'),
-        'SQUARE_FOOT_SURVEY' => array('0.092903412',      'ft²'),
-        'SQUARE_FURLONG'     => array('40468.726',        'fur²'),
-        'SQUARE_GIGAMETER'   => array('1.0e+18',          'Gm²'),
-        'SQUARE_HECTOMETER'  => array('10000',            'hm²'),
-        'SQUARE_INCH'        => array(array('' => '0.09290304','/' => '144'),  'in²'),
-        'SQUARE_INCH_SURVEY' => array(array('' => '0.092903412','/' => '144'), 'in²'),
-        'SQUARE_KILOMETER'   => array('1000000',          'km²'),
-        'SQUARE_LEAGUE_NAUTIC' => array('3.0869136e+07',  'sq league'),
-        'SQUARE_LEAGUE'      => array('2.3309986e+07',    'sq league'),
-        'SQUARE_LIGHT_YEAR'  => array('8.9505412e+31',    'ly²'),
-        'SQUARE_LINK'        => array('0.040468726',      'sq link'),
-        'SQUARE_LINK_ENGINEER' => array('0.092903412',    'sq link'),
-        'SQUARE_MEGAMETER'   => array('1.0e+12',          'Mm²'),
-        'SQUARE_METER'       => array('1',                'm²'),
-        'SQUARE_MICROINCH'   => array(array('' => '1.0e-6','*' => '6.4516e-10'), 'µin²'),
-        'SQUARE_MICROMETER'  => array('1.0e-12',          'µm²'),
-        'SQUARE_MICROMICRON' => array('1.0e-24',          'µµ²'),
-        'SQUARE_MICRON'      => array('1.0e-12',          'µ²'),
-        'SQUARE_MIL'         => array('6.4516e-10',       'sq mil'),
-        'SQUARE_MILE'        => array(array('' => '0.09290304','*' => '27878400'), 'mi²'),
-        'SQUARE_MILE_NAUTIC' => array('3429904',          'mi²'),
-        'SQUARE_MILE_SURVEY' => array('2589998.5',        'mi²'),
-        'SQUARE_MILLIMETER'  => array('0.000001',         'mm²'),
-        'SQUARE_MILLIMICRON' => array('1.0e-18',          'mµ²'),
-        'SQUARE_MYRIAMETER'  => array('1.0e+8',           'mym²'),
-        'SQUARE_NANOMETER'   => array('1.0e-18',          'nm²'),
-        'SQUARE_PARIS_FOOT'  => array('0.1055',           'sq paris foot'),
-        'SQUARE_PARSEC'      => array('9.5214087e+32',    'pc²'),
-        'SQUARE_PERCH'       => array('25.292954',        'sq perch'),
-        'SQUARE_PERCHE'      => array('51.072',           'sq perche'),
-        'SQUARE_PETAMETER'   => array('1.0e+30',          'Pm²'),
-        'SQUARE_PICOMETER'   => array('1.0e-24',          'pm²'),
-        'SQUARE_ROD'         => array(array('' => '0.092903412','*' => '272.25'), 'rd²'),
-        'SQUARE_TENTHMETER'  => array('1.0e-20',          'sq tenth-meter'),
-        'SQUARE_TERAMETER'   => array('1.0e+24',          'Tm²'),
-        'SQUARE_THOU'        => array('6.4516e-10',       'sq thou'),
-        'SQUARE_VARA'        => array('0.70258205',       'sq vara'),
-        'SQUARE_VARA_TEXAS'  => array('0.71684731',       'sq vara'),
-        'SQUARE_YARD'        => array('0.83612736',       'yd²'),
-        'SQUARE_YARD_SURVEY' => array('0.836130708',      'yd²'),
-        'SQUARE_YOCTOMETER'  => array('1.0e-48',          'ym²'),
-        'SQUARE_YOTTAMETER'  => array('1.0e+48',          'Ym²'),
-        'STANG'              => array('2709',             'stang'),
-        'STREMMA'            => array('1000',             'stremma'),
-        'TAREA'              => array('628.8',            'tarea'),
-        'TATAMI'             => array('1.62',             'tatami'),
-        'TONDE_LAND'         => array('5516',             'tonde land'),
-        'TOWNSHIP'           => array('93239945.3196288', 'twp'),
-        'TSUBO'              => array('3.3058',           'tsubo'),
-        'TUNNLAND'           => array('4936.4',           'tunnland'),
-        'YARD'               => array('0.83612736',       'yd'),
-        'VIRGATE'            => array('120000',           'virgate'),
-        'STANDARD'           => 'SQUARE_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Binary.php b/airtime_mvc/library/Zend/Measure/Binary.php
deleted file mode 100644
index f8f2b0077..000000000
--- a/airtime_mvc/library/Zend/Measure/Binary.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling binary conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Binary
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Binary extends Zend_Measure_Abstract
-{
-    const STANDARD = 'BYTE';
-
-    const BIT               = 'BIT';
-    const CRUMB             = 'CRUMB';
-    const NIBBLE            = 'NIBBLE';
-    const BYTE              = 'BYTE';
-    const KILOBYTE          = 'KILOBYTE';
-    const KIBIBYTE          = 'KIBIBYTE';
-    const KILO_BINARY_BYTE  = 'KILO_BINARY_BYTE';
-    const KILOBYTE_SI       = 'KILOBYTE_SI';
-    const MEGABYTE          = 'MEGABYTE';
-    const MEBIBYTE          = 'MEBIBYTE';
-    const MEGA_BINARY_BYTE  = 'MEGA_BINARY_BYTE';
-    const MEGABYTE_SI       = 'MEGABYTE_SI';
-    const GIGABYTE          = 'GIGABYTE';
-    const GIBIBYTE          = 'GIBIBYTE';
-    const GIGA_BINARY_BYTE  = 'GIGA_BINARY_BYTE';
-    const GIGABYTE_SI       = 'GIGABYTE_SI';
-    const TERABYTE          = 'TERABYTE';
-    const TEBIBYTE          = 'TEBIBYTE';
-    const TERA_BINARY_BYTE  = 'TERA_BINARY_BYTE';
-    const TERABYTE_SI       = 'TERABYTE_SI';
-    const PETABYTE          = 'PETABYTE';
-    const PEBIBYTE          = 'PEBIBYTE';
-    const PETA_BINARY_BYTE  = 'PETA_BINARY_BYTE';
-    const PETABYTE_SI       = 'PETABYTE_SI';
-    const EXABYTE           = 'EXABYTE';
-    const EXBIBYTE          = 'EXBIBYTE';
-    const EXA_BINARY_BYTE   = 'EXA_BINARY_BYTE';
-    const EXABYTE_SI        = 'EXABYTE_SI';
-    const ZETTABYTE         = 'ZETTABYTE';
-    const ZEBIBYTE          = 'ZEBIBYTE';
-    const ZETTA_BINARY_BYTE = 'ZETTA_BINARY_BYTE';
-    const ZETTABYTE_SI      = 'ZETTABYTE_SI';
-    const YOTTABYTE         = 'YOTTABYTE';
-    const YOBIBYTE          = 'YOBIBYTE';
-    const YOTTA_BINARY_BYTE = 'YOTTA_BINARY_BYTE';
-    const YOTTABYTE_SI      = 'YOTTABYTE_SI';
-
-    /**
-     * Calculations for all binary units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'BIT'              => array('0.125',                     'b'),
-        'CRUMB'            => array('0.25',                      'crumb'),
-        'NIBBLE'           => array('0.5',                       'nibble'),
-        'BYTE'             => array('1',                         'B'),
-        'KILOBYTE'         => array('1024',                      'kB'),
-        'KIBIBYTE'         => array('1024',                      'KiB'),
-        'KILO_BINARY_BYTE' => array('1024',                      'KiB'),
-        'KILOBYTE_SI'      => array('1000',                      'kB.'),
-        'MEGABYTE'         => array('1048576',                   'MB'),
-        'MEBIBYTE'         => array('1048576',                   'MiB'),
-        'MEGA_BINARY_BYTE' => array('1048576',                   'MiB'),
-        'MEGABYTE_SI'      => array('1000000',                   'MB.'),
-        'GIGABYTE'         => array('1073741824',                'GB'),
-        'GIBIBYTE'         => array('1073741824',                'GiB'),
-        'GIGA_BINARY_BYTE' => array('1073741824',                'GiB'),
-        'GIGABYTE_SI'      => array('1000000000',                'GB.'),
-        'TERABYTE'         => array('1099511627776',             'TB'),
-        'TEBIBYTE'         => array('1099511627776',             'TiB'),
-        'TERA_BINARY_BYTE' => array('1099511627776',             'TiB'),
-        'TERABYTE_SI'      => array('1000000000000',             'TB.'),
-        'PETABYTE'         => array('1125899906842624',          'PB'),
-        'PEBIBYTE'         => array('1125899906842624',          'PiB'),
-        'PETA_BINARY_BYTE' => array('1125899906842624',          'PiB'),
-        'PETABYTE_SI'      => array('1000000000000000',          'PB.'),
-        'EXABYTE'          => array('1152921504606846976',       'EB'),
-        'EXBIBYTE'         => array('1152921504606846976',       'EiB'),
-        'EXA_BINARY_BYTE'  => array('1152921504606846976',       'EiB'),
-        'EXABYTE_SI'       => array('1000000000000000000',       'EB.'),
-        'ZETTABYTE'        => array('1180591620717411303424',    'ZB'),
-        'ZEBIBYTE'         => array('1180591620717411303424',    'ZiB'),
-        'ZETTA_BINARY_BYTE'=> array('1180591620717411303424',    'ZiB'),
-        'ZETTABYTE_SI'     => array('1000000000000000000000',    'ZB.'),
-        'YOTTABYTE'        => array('1208925819614629174706176', 'YB'),
-        'YOBIBYTE'         => array('1208925819614629174706176', 'YiB'),
-        'YOTTA_BINARY_BYTE'=> array('1208925819614629174706176', 'YiB'),
-        'YOTTABYTE_SI'     => array('1000000000000000000000000', 'YB.'),
-        'STANDARD'         => 'BYTE'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Capacitance.php b/airtime_mvc/library/Zend/Measure/Capacitance.php
deleted file mode 100644
index 8a50ad67b..000000000
--- a/airtime_mvc/library/Zend/Measure/Capacitance.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Capacitance.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling capacitance conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Capacitance
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Capacitance extends Zend_Measure_Abstract
-{
-    const STANDARD = 'FARAD';
-
-    const ABFARAD                = 'ABFARAD';
-    const AMPERE_PER_SECOND_VOLT = 'AMPERE_PER_SECOND_VOLT';
-    const CENTIFARAD             = 'CENTIFARAD';
-    const COULOMB_PER_VOLT       = 'COULOMB_PER_VOLT';
-    const DECIFARAD              = 'DECIFARAD';
-    const DEKAFARAD              = 'DEKAFARAD';
-    const ELECTROMAGNETIC_UNIT   = 'ELECTROMAGNETIC_UNIT';
-    const ELECTROSTATIC_UNIT     = 'ELECTROSTATIC_UNIT';
-    const FARAD                  = 'FARAD';
-    const FARAD_INTERNATIONAL    = 'FARAD_INTERNATIONAL';
-    const GAUSSIAN               = 'GAUSSIAN';
-    const GIGAFARAD              = 'GIGAFARAD';
-    const HECTOFARAD             = 'HECTOFARAD';
-    const JAR                    = 'JAR';
-    const KILOFARAD              = 'KILOFARAD';
-    const MEGAFARAD              = 'MEGAFARAD';
-    const MICROFARAD             = 'MICROFARAD';
-    const MILLIFARAD             = 'MILLIFARAD';
-    const NANOFARAD              = 'NANOFARAD';
-    const PICOFARAD              = 'PICOFARAD';
-    const PUFF                   = 'PUFF';
-    const SECOND_PER_OHM         = 'SECOND_PER_OHM';
-    const STATFARAD              = 'STATFARAD';
-    const TERAFARAD              = 'TERAFARAD';
-
-    /**
-     * Calculations for all capacitance units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ABFARAD'              => array('1.0e+9',      'abfarad'),
-        'AMPERE_PER_SECOND_VOLT' => array('1',         'A/sV'),
-        'CENTIFARAD'           => array('0.01',        'cF'),
-        'COULOMB_PER_VOLT'     => array('1',           'C/V'),
-        'DECIFARAD'            => array('0.1',         'dF'),
-        'DEKAFARAD'            => array('10',          'daF'),
-        'ELECTROMAGNETIC_UNIT' => array('1.0e+9',      'capacity emu'),
-        'ELECTROSTATIC_UNIT'   => array('1.11265e-12', 'capacity esu'),
-        'FARAD'                => array('1',           'F'),
-        'FARAD_INTERNATIONAL'  => array('0.99951',     'F'),
-        'GAUSSIAN'             => array('1.11265e-12', 'G'),
-        'GIGAFARAD'            => array('1.0e+9',      'GF'),
-        'HECTOFARAD'           => array('100',         'hF'),
-        'JAR'                  => array('1.11265e-9',  'jar'),
-        'KILOFARAD'            => array('1000',        'kF'),
-        'MEGAFARAD'            => array('1000000',     'MF'),
-        'MICROFARAD'           => array('0.000001',    'µF'),
-        'MILLIFARAD'           => array('0.001',       'mF'),
-        'NANOFARAD'            => array('1.0e-9',      'nF'),
-        'PICOFARAD'            => array('1.0e-12',     'pF'),
-        'PUFF'                 => array('1.0e-12',     'pF'),
-        'SECOND_PER_OHM'       => array('1',           's/Ohm'),
-        'STATFARAD'            => array('1.11265e-12', 'statfarad'),
-        'TERAFARAD'            => array('1.0e+12',     'TF'),
-        'STANDARD'             => 'FARAD'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Cooking/Volume.php b/airtime_mvc/library/Zend/Measure/Cooking/Volume.php
deleted file mode 100644
index 006c0a308..000000000
--- a/airtime_mvc/library/Zend/Measure/Cooking/Volume.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling cooking volume conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Cooking_Volume
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Cooking_Volume extends Zend_Measure_Abstract
-{
-    const STANDARD = 'CUBIC_METER';
-
-    const CAN_2POINT5       = 'CAN_2POINT5';
-    const CAN_10            = 'CAN_10';
-    const BARREL_WINE       = 'BARREL_WINE';
-    const BARREL            = 'BARREL';
-    const BARREL_US_DRY     = 'BARREL_US_DRY';
-    const BARREL_US_FEDERAL = 'BARREL_US_FEDERAL';
-    const BARREL_US         = 'BARREL_US';
-    const BUCKET            = 'BUCKET';
-    const BUCKET_US         = 'BUCKET_US';
-    const BUSHEL            = 'BUSHEL';
-    const BUSHEL_US         = 'BUSHEL_US';
-    const CENTILITER        = 'CENTILITER';
-    const COFFEE_SPOON      = 'COFFEE_SPOON';
-    const CUBIC_CENTIMETER  = 'CUBIC_CENTIMETER';
-    const CUBIC_DECIMETER   = 'CUBIC_DECIMETER';
-    const CUBIC_FOOT        = 'CUBIC_FOOT';
-    const CUBIC_INCH        = 'CUBIC_INCH';
-    const CUBIC_METER       = 'CUBIC_METER';
-    const CUBIC_MICROMETER  = 'CUBIC_MICROMETER';
-    const CUBIC_MILLIMETER  = 'CUBIC_MILLIMETER';
-    const CUP_CANADA        = 'CUP_CANADA';
-    const CUP               = 'CUP';
-    const CUP_US            = 'CUP_US';
-    const DASH              = 'DASH';
-    const DECILITER         = 'DECILITER';
-    const DEKALITER         = 'DEKALITER';
-    const DEMI              = 'DEMI';
-    const DRAM              = 'DRAM';
-    const DROP              = 'DROP';
-    const FIFTH             = 'FIFTH';
-    const GALLON            = 'GALLON';
-    const GALLON_US_DRY     = 'GALLON_US_DRY';
-    const GALLON_US         = 'GALLON_US';
-    const GILL              = 'GILL';
-    const GILL_US           = 'GILL_US';
-    const HECTOLITER        = 'HECTOLITER';
-    const HOGSHEAD          = 'HOGSHEAD';
-    const HOGSHEAD_US       = 'HOGSHEAD_US';
-    const JIGGER            = 'JIGGER';
-    const KILOLITER         = 'KILOLITER';
-    const LITER             = 'LITER';
-    const MEASURE           = 'MEASURE';
-    const MEGALITER         = 'MEGALITER';
-    const MICROLITER        = 'MICROLITER';
-    const MILLILITER        = 'MILLILITER';
-    const MINIM             = 'MINIM';
-    const MINIM_US          = 'MINIM_US';
-    const OUNCE             = 'OUNCE';
-    const OUNCE_US          = 'OUNCE_US';
-    const PECK              = 'PECK';
-    const PECK_US           = 'PECK_US';
-    const PINCH             = 'PINCH';
-    const PINT              = 'PINT';
-    const PINT_US_DRY       = 'PINT_US_DRY';
-    const PINT_US           = 'PINT_US';
-    const PIPE              = 'PIPE';
-    const PIPE_US           = 'PIPE_US';
-    const PONY              = 'PONY';
-    const QUART_GERMANY     = 'QUART_GERMANY';
-    const QUART_ANCIENT     = 'QUART_ANCIENT';
-    const QUART             = 'QUART';
-    const QUART_US_DRY      = 'QUART_US_DRY';
-    const QUART_US          = 'QUART_US';
-    const SHOT              = 'SHOT';
-    const TABLESPOON        = 'TABLESPOON';
-    const TABLESPOON_UK     = 'TABLESPOON_UK';
-    const TABLESPOON_US     = 'TABLESPOON_US';
-    const TEASPOON          = 'TEASPOON';
-    const TEASPOON_UK       = 'TEASPOON_UK';
-    const TEASPOON_US       = 'TEASPOON_US';
-
-    /**
-     * Calculations for all cooking volume units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CAN_2POINT5'       => array(array('' => '0.0037854118', '/' => '16', '' => '3.5'), '2.5th can'),
-        'CAN_10'            => array(array('' => '0.0037854118', '*' => '0.75'),          '10th can'),
-        'BARREL_WINE'       => array('0.143201835',   'bbl'),
-        'BARREL'            => array('0.16365924',    'bbl'),
-        'BARREL_US_DRY'     => array(array('' => '26.7098656608', '/' => '231'), 'bbl'),
-        'BARREL_US_FEDERAL' => array('0.1173477658',  'bbl'),
-        'BARREL_US'         => array('0.1192404717',  'bbl'),
-        'BUCKET'            => array('0.01818436',    'bucket'),
-        'BUCKET_US'         => array('0.018927059',   'bucket'),
-        'BUSHEL'            => array('0.03636872',    'bu'),
-        'BUSHEL_US'         => array('0.03523907',    'bu'),
-        'CENTILITER'        => array('0.00001',       'cl'),
-        'COFFEE_SPOON'      => array(array('' => '0.0037854118', '/' => '1536'), 'coffee spoon'),
-        'CUBIC_CENTIMETER'  => array('0.000001',      'cm³'),
-        'CUBIC_DECIMETER'   => array('0.001',         'dm³'),
-        'CUBIC_FOOT'        => array(array('' => '6.54119159', '/' => '231'),   'ft³'),
-        'CUBIC_INCH'        => array(array('' => '0.0037854118', '/' => '231'), 'in³'),
-        'CUBIC_METER'       => array('1',             'm³'),
-        'CUBIC_MICROMETER'  => array('1.0e-18',       'µm³'),
-        'CUBIC_MILLIMETER'  => array('1.0e-9',        'mm³'),
-        'CUP_CANADA'        => array('0.0002273045',  'c'),
-        'CUP'               => array('0.00025',       'c'),
-        'CUP_US'            => array(array('' => '0.0037854118', '/' => '16'),   'c'),
-        'DASH'              => array(array('' => '0.0037854118', '/' => '6144'), 'ds'),
-        'DECILITER'         => array('0.0001',        'dl'),
-        'DEKALITER'         => array('0.001',         'dal'),
-        'DEMI'              => array('0.00025',       'demi'),
-        'DRAM'              => array(array('' => '0.0037854118', '/' => '1024'),  'dr'),
-        'DROP'              => array(array('' => '0.0037854118', '/' => '73728'), 'ggt'),
-        'FIFTH'             => array('0.00075708236', 'fifth'),
-        'GALLON'            => array('0.00454609',    'gal'),
-        'GALLON_US_DRY'     => array('0.0044048838',  'gal'),
-        'GALLON_US'         => array('0.0037854118',  'gal'),
-        'GILL'              => array(array('' => '0.00454609', '/' => '32'),   'gi'),
-        'GILL_US'           => array(array('' => '0.0037854118', '/' => '32'), 'gi'),
-        'HECTOLITER'        => array('0.1',           'hl'),
-        'HOGSHEAD'          => array('0.28640367',    'hhd'),
-        'HOGSHEAD_US'       => array('0.2384809434',  'hhd'),
-        'JIGGER'            => array(array('' => '0.0037854118', '/' => '128', '*' => '1.5'), 'jigger'),
-        'KILOLITER'         => array('1',             'kl'),
-        'LITER'             => array('0.001',         'l'),
-        'MEASURE'           => array('0.0077',        'measure'),
-        'MEGALITER'         => array('1000',          'Ml'),
-        'MICROLITER'        => array('1.0e-9',        'µl'),
-        'MILLILITER'        => array('0.000001',      'ml'),
-        'MINIM'             => array(array('' => '0.00454609', '/' => '76800'),  'min'),
-        'MINIM_US'          => array(array('' => '0.0037854118','/' => '61440'), 'min'),
-        'OUNCE'             => array(array('' => '0.00454609', '/' => '160'),    'oz'),
-        'OUNCE_US'          => array(array('' => '0.0037854118', '/' => '128'),  'oz'),
-        'PECK'              => array('0.00909218',    'pk'),
-        'PECK_US'           => array('0.0088097676',  'pk'),
-        'PINCH'             => array(array('' => '0.0037854118', '/' => '12288'), 'pinch'),
-        'PINT'              => array(array('' => '0.00454609', '/' => '8'),       'pt'),
-        'PINT_US_DRY'       => array(array('' => '0.0044048838', '/' => '8'),     'pt'),
-        'PINT_US'           => array(array('' => '0.0037854118', '/' => '8'),     'pt'),
-        'PIPE'              => array('0.49097772',    'pipe'),
-        'PIPE_US'           => array('0.4769618868',  'pipe'),
-        'PONY'              => array(array('' => '0.0037854118', '/' => '128'), 'pony'),
-        'QUART_GERMANY'     => array('0.00114504',    'qt'),
-        'QUART_ANCIENT'     => array('0.00108',       'qt'),
-        'QUART'             => array(array('' => '0.00454609', '/' => '4'),     'qt'),
-        'QUART_US_DRY'      => array(array('' => '0.0044048838', '/' => '4'),   'qt'),
-        'QUART_US'          => array(array('' => '0.0037854118', '/' => '4'),   'qt'),
-        'SHOT'              => array(array('' => '0.0037854118', '/' => '128'), 'shot'),
-        'TABLESPOON'        => array('0.000015',      'tbsp'),
-        'TABLESPOON_UK'     => array(array('' => '0.00454609', '/' => '320'),   'tbsp'),
-        'TABLESPOON_US'     => array(array('' => '0.0037854118', '/' => '256'), 'tbsp'),
-        'TEASPOON'          => array('0.000005',      'tsp'),
-        'TEASPOON_UK'       => array(array('' => '0.00454609', '/' => '1280'),  'tsp'),
-        'TEASPOON_US'       => array(array('' => '0.0037854118', '/' => '768'), 'tsp'),
-        'STANDARD'          => 'CUBIC_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Cooking/Weight.php b/airtime_mvc/library/Zend/Measure/Cooking/Weight.php
deleted file mode 100644
index 05be6fabb..000000000
--- a/airtime_mvc/library/Zend/Measure/Cooking/Weight.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling cooking weight conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Cooking_Weight
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Cooking_Weight extends Zend_Measure_Abstract
-{
-    const STANDARD = 'GRAM';
-
-    const HALF_STICK    = 'HALF_STICK';
-    const STICK         = 'STICK';
-    const CUP           = 'CUP';
-    const GRAM          = 'GRAM';
-    const OUNCE         = 'OUNCE';
-    const POUND         = 'POUND';
-    const TEASPOON      = 'TEASPOON';
-    const TEASPOON_US   = 'TEASPOON_US';
-    const TABLESPOON    = 'TABLESPOON';
-    const TABLESPOON_US = 'TABLESPOON_US';
-
-    /**
-     * Calculations for all cooking weight units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'HALF_STICK'    => array(array('' => '453.59237', '/' => '8'),                    'half stk'),
-        'STICK'         => array(array('' => '453.59237', '/' => '4'),                    'stk'),
-        'CUP'           => array(array('' => '453.59237', '/' => '2'),                    'c'),
-        'GRAM'          => array('1',                                                   'g'),
-        'OUNCE'         => array(array('' => '453.59237', '/' => '16'),                   'oz'),
-        'POUND'         => array('453.59237',                                           'lb'),
-        'TEASPOON'      => array(array('' => '1.2503332', '' => '453.59237', '/' => '128'), 'tsp'),
-        'TEASPOON_US'   => array(array('' => '453.59237', '/' => '96'),                   'tsp'),
-        'TABLESPOON'    => array(array('' => '1.2503332', '' => '453.59237', '/' => '32'),  'tbsp'),
-        'TABLESPOON_US' => array(array('' => '453.59237', '/' => '32'),                   'tbsp'),
-        'STANDARD'      => 'GRAM'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Current.php b/airtime_mvc/library/Zend/Measure/Current.php
deleted file mode 100644
index 7c02686e2..000000000
--- a/airtime_mvc/library/Zend/Measure/Current.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Current.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling current conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Current
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Current extends Zend_Measure_Abstract
-{
-    const STANDARD = 'AMPERE';
-
-    const ABAMPERE             = 'ABAMPERE';
-    const AMPERE               = 'AMPERE';
-    const BIOT                 = 'BIOT';
-    const CENTIAMPERE          = 'CENTIAMPERE';
-    const COULOMB_PER_SECOND   = 'COULOMB_PER_SECOND';
-    const DECIAMPERE           = 'DECIAMPERE';
-    const DEKAAMPERE           = 'DEKAAMPERE';
-    const ELECTROMAGNETIC_UNIT = 'ELECTROMAGNATIC_UNIT';
-    const ELECTROSTATIC_UNIT   = 'ELECTROSTATIC_UNIT';
-    const FRANCLIN_PER_SECOND  = 'FRANCLIN_PER_SECOND';
-    const GAUSSIAN             = 'GAUSSIAN';
-    const GIGAAMPERE           = 'GIGAAMPERE';
-    const GILBERT              = 'GILBERT';
-    const HECTOAMPERE          = 'HECTOAMPERE';
-    const KILOAMPERE           = 'KILOAMPERE';
-    const MEGAAMPERE           = 'MEGAAMPERE';
-    const MICROAMPERE          = 'MICROAMPERE';
-    const MILLIAMPERE          = 'MILLIAMPERE';
-    const NANOAMPERE           = 'NANOAMPERE';
-    const PICOAMPERE           = 'PICOAMPERE';
-    const SIEMENS_VOLT         = 'SIEMENS_VOLT';
-    const STATAMPERE           = 'STATAMPERE';
-    const TERAAMPERE           = 'TERAAMPERE';
-    const VOLT_PER_OHM         = 'VOLT_PER_OHM';
-    const WATT_PER_VOLT        = 'WATT_PER_VOLT';
-    const WEBER_PER_HENRY      = 'WEBER_PER_HENRY';
-
-    /**
-     * Calculations for all current units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ABAMPERE'             => array('10',           'abampere'),
-        'AMPERE'               => array('1',            'A'),
-        'BIOT'                 => array('10',           'Bi'),
-        'CENTIAMPERE'          => array('0.01',         'cA'),
-        'COULOMB_PER_SECOND'   => array('1',            'C/s'),
-        'DECIAMPERE'           => array('0.1',          'dA'),
-        'DEKAAMPERE'           => array('10',           'daA'),
-        'ELECTROMAGNATIC_UNIT' => array('10',           'current emu'),
-        'ELECTROSTATIC_UNIT'   => array('3.335641e-10', 'current esu'),
-        'FRANCLIN_PER_SECOND'  => array('3.335641e-10', 'Fr/s'),
-        'GAUSSIAN'             => array('3.335641e-10', 'G current'),
-        'GIGAAMPERE'           => array('1.0e+9',       'GA'),
-        'GILBERT'              => array('0.79577472',   'Gi'),
-        'HECTOAMPERE'          => array('100',          'hA'),
-        'KILOAMPERE'           => array('1000',         'kA'),
-        'MEGAAMPERE'           => array('1000000',      'MA') ,
-        'MICROAMPERE'          => array('0.000001',     'µA'),
-        'MILLIAMPERE'          => array('0.001',        'mA'),
-        'NANOAMPERE'           => array('1.0e-9',       'nA'),
-        'PICOAMPERE'           => array('1.0e-12',      'pA'),
-        'SIEMENS_VOLT'         => array('1',            'SV'),
-        'STATAMPERE'           => array('3.335641e-10', 'statampere'),
-        'TERAAMPERE'           => array('1.0e+12',      'TA'),
-        'VOLT_PER_OHM'         => array('1',            'V/Ohm'),
-        'WATT_PER_VOLT'        => array('1',            'W/V'),
-        'WEBER_PER_HENRY'      => array('1',            'Wb/H'),
-        'STANDARD'             => 'AMPERE'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Density.php b/airtime_mvc/library/Zend/Measure/Density.php
deleted file mode 100644
index 7c27745b5..000000000
--- a/airtime_mvc/library/Zend/Measure/Density.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Density.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling density conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Density
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Density extends Zend_Measure_Abstract
-{
-    const STANDARD = 'KILOGRAM_PER_CUBIC_METER';
-
-    const ALUMINIUM                      = 'ALUMINIUM';
-    const COPPER                         = 'COPPER';
-    const GOLD                           = 'GOLD';
-    const GRAIN_PER_CUBIC_FOOT           = 'GRAIN_PER_CUBIC_FOOT';
-    const GRAIN_PER_CUBIC_INCH           = 'GRAIN_PER_CUBIC_INCH';
-    const GRAIN_PER_CUBIC_YARD           = 'GRAIN_PER_CUBIC_YARD';
-    const GRAIN_PER_GALLON               = 'GRAIN_PER_GALLON';
-    const GRAIN_PER_GALLON_US            = 'GRAIN_PER_GALLON_US';
-    const GRAM_PER_CUBIC_CENTIMETER      = 'GRAM_PER_CUBIC_CENTIMETER';
-    const GRAM_PER_CUBIC_DECIMETER       = 'GRAM_PER_CUBIC_DECIMETER';
-    const GRAM_PER_CUBIC_METER           = 'GRAM_PER_CUBIC_METER';
-    const GRAM_PER_LITER                 = 'GRAM_PER_LITER';
-    const GRAM_PER_MILLILITER            = 'GRAM_PER_MILLILITER';
-    const IRON                           = 'IRON';
-    const KILOGRAM_PER_CUBIC_CENTIMETER  = 'KILOGRAM_PER_CUBIC_CENTIMETER';
-    const KILOGRAM_PER_CUBIC_DECIMETER   = 'KILOGRAM_PER_CUBIC_DECIMETER';
-    const KILOGRAM_PER_CUBIC_METER       = 'KILOGRAM_PER_CUBIC_METER';
-    const KILOGRAM_PER_CUBIC_MILLIMETER  = 'KILOGRAM_PER_CUBIC_MILLIMETER';
-    const KILOGRAM_PER_LITER             = 'KILOGRAM_PER_LITER';
-    const KILOGRAM_PER_MILLILITER        = 'KILOGRAM_PER_MILLILITER';
-    const LEAD                           = 'LEAD';
-    const MEGAGRAM_PER_CUBIC_CENTIMETER  = 'MEGAGRAM_PER_CUBIC_CENTIMETER';
-    const MEGAGRAM_PER_CUBIC_DECIMETER   = 'MEGAGRAM_PER_CUBIC_DECIMETER';
-    const MEGAGRAM_PER_CUBIC_METER       = 'MEGAGRAM_PER_CUBIC_METER';
-    const MEGAGRAM_PER_LITER             = 'MEGAGRAM_PER_LITER';
-    const MEGAGRAM_PER_MILLILITER        = 'MEGAGRAM_PER_MILLILITER';
-    const MICROGRAM_PER_CUBIC_CENTIMETER = 'MICROGRAM_PER_CUBIC_CENTIMETER';
-    const MICROGRAM_PER_CUBIC_DECIMETER  = 'MICROGRAM_PER_CUBIC_DECIMETER';
-    const MICROGRAM_PER_CUBIC_METER      = 'MICROGRAM_PER_CUBIC_METER';
-    const MICROGRAM_PER_LITER            = 'MICROGRAM_PER_LITER';
-    const MICROGRAM_PER_MILLILITER       = 'MICROGRAM_PER_MILLILITER';
-    const MILLIGRAM_PER_CUBIC_CENTIMETER = 'MILLIGRAM_PER_CUBIC_CENTIMETER';
-    const MILLIGRAM_PER_CUBIC_DECIMETER  = 'MILLIGRAM_PER_CUBIC_DECIMETER';
-    const MILLIGRAM_PER_CUBIC_METER      = 'MILLIGRAM_PER_CUBIC_METER';
-    const MILLIGRAM_PER_LITER            = 'MILLIGRAM_PER_LITER';
-    const MILLIGRAM_PER_MILLILITER       = 'MILLIGRAM_PER_MILLILITER';
-    const OUNCE_PER_CUBIC_FOOT           = 'OUNCE_PER_CUBIC_FOOT';
-    const OUNCR_PER_CUBIC_FOOT_TROY      = 'OUNCE_PER_CUBIC_FOOT_TROY';
-    const OUNCE_PER_CUBIC_INCH           = 'OUNCE_PER_CUBIC_INCH';
-    const OUNCE_PER_CUBIC_INCH_TROY      = 'OUNCE_PER_CUBIC_INCH_TROY';
-    const OUNCE_PER_CUBIC_YARD           = 'OUNCE_PER_CUBIC_YARD';
-    const OUNCE_PER_CUBIC_YARD_TROY      = 'OUNCE_PER_CUBIC_YARD_TROY';
-    const OUNCE_PER_GALLON               = 'OUNCE_PER_GALLON';
-    const OUNCE_PER_GALLON_US            = 'OUNCE_PER_GALLON_US';
-    const OUNCE_PER_GALLON_TROY          = 'OUNCE_PER_GALLON_TROY';
-    const OUNCE_PER_GALLON_US_TROY       = 'OUNCE_PER_GALLON_US_TROY';
-    const POUND_PER_CIRCULAR_MIL_FOOT    = 'POUND_PER_CIRCULAR_MIL_FOOT';
-    const POUND_PER_CUBIC_FOOT           = 'POUND_PER_CUBIC_FOOT';
-    const POUND_PER_CUBIC_INCH           = 'POUND_PER_CUBIC_INCH';
-    const POUND_PER_CUBIC_YARD           = 'POUND_PER_CUBIC_YARD';
-    const POUND_PER_GALLON               = 'POUND_PER_GALLON';
-    const POUND_PER_KILOGALLON           = 'POUND_PER_KILOGALLON';
-    const POUND_PER_MEGAGALLON           = 'POUND_PER_MEGAGALLON';
-    const POUND_PER_GALLON_US            = 'POUND_PER_GALLON_US';
-    const POUND_PER_KILOGALLON_US        = 'POUND_PER_KILOGALLON_US';
-    const POUND_PER_MEGAGALLON_US        = 'POUND_PER_MEGAGALLON_US';
-    const SILVER                         = 'SILVER';
-    const SLUG_PER_CUBIC_FOOT            = 'SLUG_PER_CUBIC_FOOT';
-    const SLUG_PER_CUBIC_INCH            = 'SLUG_PER_CUBIC_INCH';
-    const SLUG_PER_CUBIC_YARD            = 'SLUG_PER_CUBIC_YARD';
-    const SLUG_PER_GALLON                = 'SLUG_PER_GALLON';
-    const SLUG_PER_GALLON_US             = 'SLUG_PER_GALLON_US';
-    const TON_PER_CUBIC_FOOT_LONG        = 'TON_PER_CUBIC_FOOT_LONG';
-    const TON_PER_CUBIC_FOOT             = 'TON_PER_CUBIC_FOOT';
-    const TON_PER_CUBIC_INCH_LONG        = 'TON_PER_CUBIC_INCH_LONG';
-    const TON_PER_CUBIC_INCH             = 'TON_PER_CUBIC_INCH';
-    const TON_PER_CUBIC_YARD_LONG        = 'TON_PER_CUBIC_YARD_LONG';
-    const TON_PER_CUBIC_YARD             = 'TON_PER_CUBIC_YARD';
-    const TON_PER_GALLON_LONG            = 'TON_PER_GALLON_LONG';
-    const TON_PER_GALLON_US_LONG         = 'TON_PER_GALLON_US_LONG';
-    const TON_PER_GALLON                 = 'TON_PER_GALLON';
-    const TON_PER_GALLON_US              = 'TON_PER_GALLON_US';
-    const TONNE_PER_CUBIC_CENTIMETER     = 'TONNE_PER_CUBIC_CENTIMETER';
-    const TONNE_PER_CUBIC_DECIMETER      = 'TONNE_PER_CUBIC_DECIMETER';
-    const TONNE_PER_CUBIC_METER          = 'TONNE_PER_CUBIC_METER';
-    const TONNE_PER_LITER                = 'TONNE_PER_LITER';
-    const TONNE_PER_MILLILITER           = 'TONNE_PER_MILLILITER';
-    const WATER                          = 'WATER';
-
-    /**
-     * Calculations for all density units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ALUMINIUM'                 => array('2643',           'aluminium'),
-        'COPPER'                    => array('8906',           'copper'),
-        'GOLD'                      => array('19300',          'gold'),
-        'GRAIN_PER_CUBIC_FOOT'      => array('0.0022883519',   'gr/ft³'),
-        'GRAIN_PER_CUBIC_INCH'      => array('3.9542721',      'gr/in³'),
-        'GRAIN_PER_CUBIC_YARD'      => array('0.000084753774', 'gr/yd³'),
-        'GRAIN_PER_GALLON'          => array('0.014253768',    'gr/gal'),
-        'GRAIN_PER_GALLON_US'       => array('0.017118061',    'gr/gal'),
-        'GRAM_PER_CUBIC_CENTIMETER' => array('1000',           'g/cm³'),
-        'GRAM_PER_CUBIC_DECIMETER'  => array('1',              'g/dm³'),
-        'GRAM_PER_CUBIC_METER'      => array('0.001',          'g/m³'),
-        'GRAM_PER_LITER'            => array('1',              'g/l'),
-        'GRAM_PER_MILLILITER'       => array('1000',           'g/ml'),
-        'IRON'                      => array('7658',           'iron'),
-        'KILOGRAM_PER_CUBIC_CENTIMETER' => array('1000000',    'kg/cm³'),
-        'KILOGRAM_PER_CUBIC_DECIMETER'  => array('1000',       'kg/dm³'),
-        'KILOGRAM_PER_CUBIC_METER'  => array('1',              'kg/m³'),
-        'KILOGRAM_PER_CUBIC_MILLIMETER' => array('1000000000', 'kg/l'),
-        'KILOGRAM_PER_LITER'        => array('1000',           'kg/ml'),
-        'KILOGRAM_PER_MILLILITER'   => array('1000000',        'kg/ml'),
-        'LEAD'                      => array('11370',          'lead'),
-        'MEGAGRAM_PER_CUBIC_CENTIMETER' => array('1.0e+9',     'Mg/cm³'),
-        'MEGAGRAM_PER_CUBIC_DECIMETER'  => array('1000000',    'Mg/dm³'),
-        'MEGAGRAM_PER_CUBIC_METER'  => array('1000',           'Mg/m³'),
-        'MEGAGRAM_PER_LITER'        => array('1000000',        'Mg/l'),
-        'MEGAGRAM_PER_MILLILITER'   => array('1.0e+9',         'Mg/ml'),
-        'MICROGRAM_PER_CUBIC_CENTIMETER' => array('0.001',     'µg/cm³'),
-        'MICROGRAM_PER_CUBIC_DECIMETER'  => array('1.0e-6',    'µg/dm³'),
-        'MICROGRAM_PER_CUBIC_METER' => array('1.0e-9',         'µg/m³'),
-        'MICROGRAM_PER_LITER'       => array('1.0e-6',         'µg/l'),
-        'MICROGRAM_PER_MILLILITER'  => array('0.001',          'µg/ml'),
-        'MILLIGRAM_PER_CUBIC_CENTIMETER' => array('1',         'mg/cm³'),
-        'MILLIGRAM_PER_CUBIC_DECIMETER'  => array('0.001',     'mg/dm³'),
-        'MILLIGRAM_PER_CUBIC_METER' => array('0.000001',       'mg/m³'),
-        'MILLIGRAM_PER_LITER'       => array('0.001',          'mg/l'),
-        'MILLIGRAM_PER_MILLILITER'  => array('1',              'mg/ml'),
-        'OUNCE_PER_CUBIC_FOOT'      => array('1.001154',       'oz/ft³'),
-        'OUNCE_PER_CUBIC_FOOT_TROY' => array('1.0984089',      'oz/ft³'),
-        'OUNCE_PER_CUBIC_INCH'      => array('1729.994',       'oz/in³'),
-        'OUNCE_PER_CUBIC_INCH_TROY' => array('1898.0506',      'oz/in³'),
-        'OUNCE_PER_CUBIC_YARD'      => array('0.037079776',    'oz/yd³'),
-        'OUNCE_PER_CUBIC_YARD_TROY' => array('0.040681812',    'oz/yd³'),
-        'OUNCE_PER_GALLON'          => array('6.2360233',      'oz/gal'),
-        'OUNCE_PER_GALLON_US'       => array('7.4891517',      'oz/gal'),
-        'OUNCE_PER_GALLON_TROY'     => array('6.8418084',      'oz/gal'),
-        'OUNCE_PER_GALLON_US_TROY'  => array('8.2166693',      'oz/gal'),
-        'POUND_PER_CIRCULAR_MIL_FOOT' => array('2.9369291',    'lb/cmil ft'),
-        'POUND_PER_CUBIC_FOOT'      => array('16.018463',      'lb/in³'),
-        'POUND_PER_CUBIC_INCH'      => array('27679.905',      'lb/in³'),
-        'POUND_PER_CUBIC_YARD'      => array('0.59327642',     'lb/yd³'),
-        'POUND_PER_GALLON'          => array('99.776373',      'lb/gal'),
-        'POUND_PER_KILOGALLON'      => array('0.099776373',    'lb/kgal'),
-        'POUND_PER_MEGAGALLON'      => array('0.000099776373', 'lb/Mgal'),
-        'POUND_PER_GALLON_US'       => array('119.82643',      'lb/gal'),
-        'POUND_PER_KILOGALLON_US'   => array('0.11982643',     'lb/kgal'),
-        'POUND_PER_MEGAGALLON_US'   => array('0.00011982643',  'lb/Mgal'),
-        'SILVER'                    => array('10510',          'silver'),
-        'SLUG_PER_CUBIC_FOOT'       => array('515.37882',      'slug/ft³'),
-        'SLUG_PER_CUBIC_INCH'       => array('890574.6',       'slug/in³'),
-        'SLUG_PER_CUBIC_YARD'       => array('19.088104',      'slug/yd³'),
-        'SLUG_PER_GALLON'           => array('3210.2099',      'slug/gal'),
-        'SLUG_PER_GALLON_US'        => array('3855.3013',      'slug/gal'),
-        'TON_PER_CUBIC_FOOT_LONG'   => array('35881.358',      't/ft³'),
-        'TON_PER_CUBIC_FOOT'        => array('32036.927',      't/ft³'),
-        'TON_PER_CUBIC_INCH_LONG'   => array('6.2202987e+7',   't/in³'),
-        'TON_PER_CUBIC_INCH'        => array('5.5359809e+7',   't/in³'),
-        'TON_PER_CUBIC_YARD_LONG'   => array('1328.9392',      't/yd³'),
-        'TON_PER_CUBIC_YARD'        => array('1186.5528',      't/yd³'),
-        'TON_PER_GALLON_LONG'       => array('223499.07',      't/gal'),
-        'TON_PER_GALLON_US_LONG'    => array('268411.2',       't/gal'),
-        'TON_PER_GALLON'            => array('199522.75',      't/gal'),
-        'TON_PER_GALLON_US'         => array('239652.85',      't/gal'),
-        'TONNE_PER_CUBIC_CENTIMETER' => array('1.0e+9',        't/cm³'),
-        'TONNE_PER_CUBIC_DECIMETER'  => array('1000000',       't/dm³'),
-        'TONNE_PER_CUBIC_METER'     => array('1000',           't/m³'),
-        'TONNE_PER_LITER'           => array('1000000',        't/l'),
-        'TONNE_PER_MILLILITER'      => array('1.0e+9',         't/ml'),
-        'WATER'                     => array('1000',           'water'),
-        'STANDARD'                  => 'KILOGRAM_PER_CUBIC_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Energy.php b/airtime_mvc/library/Zend/Measure/Energy.php
deleted file mode 100644
index 47a6d3650..000000000
--- a/airtime_mvc/library/Zend/Measure/Energy.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Energy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling energy conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Energy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Energy extends Zend_Measure_Abstract
-{
-    const STANDARD = 'JOULE';
-
-    const ATTOJOULE                  = 'ATTOJOULE';
-    const BOARD_OF_TRADE_UNIT        = 'BOARD_OF_TRADE_UNIT';
-    const BTU                        = 'BTU';
-    const BTU_THERMOCHEMICAL         = 'BTU_TERMOCHEMICAL';
-    const CALORIE                    = 'CALORIE';
-    const CALORIE_15C                = 'CALORIE_15C';
-    const CALORIE_NUTRITIONAL        = 'CALORIE_NUTRITIONAL';
-    const CALORIE_THERMOCHEMICAL     = 'CALORIE_THERMOCHEMICAL';
-    const CELSIUS_HEAT_UNIT          = 'CELSIUS_HEAT_UNIT';
-    const CENTIJOULE                 = 'CENTIJOULE';
-    const CHEVAL_VAPEUR_HEURE        = 'CHEVAL_VAPEUR_HEURE';
-    const DECIJOULE                  = 'DECIJOULE';
-    const DEKAJOULE                  = 'DEKAJOULE';
-    const DEKAWATT_HOUR              = 'DEKAWATT_HOUR';
-    const DEKATHERM                  = 'DEKATHERM';
-    const ELECTRONVOLT               = 'ELECTRONVOLT';
-    const ERG                        = 'ERG';
-    const EXAJOULE                   = 'EXAJOULE';
-    const EXAWATT_HOUR               = 'EXAWATT_HOUR';
-    const FEMTOJOULE                 = 'FEMTOJOULE';
-    const FOOT_POUND                 = 'FOOT_POUND';
-    const FOOT_POUNDAL               = 'FOOT_POUNDAL';
-    const GALLON_UK_AUTOMOTIVE       = 'GALLON_UK_AUTOMOTIVE';
-    const GALLON_US_AUTOMOTIVE       = 'GALLON_US_AUTOMOTIVE';
-    const GALLON_UK_AVIATION         = 'GALLON_UK_AVIATION';
-    const GALLON_US_AVIATION         = 'GALLON_US_AVIATION';
-    const GALLON_UK_DIESEL           = 'GALLON_UK_DIESEL';
-    const GALLON_US_DIESEL           = 'GALLON_US_DIESEL';
-    const GALLON_UK_DISTILATE        = 'GALLON_UK_DISTILATE';
-    const GALLON_US_DISTILATE        = 'GALLON_US_DISTILATE';
-    const GALLON_UK_KEROSINE_JET     = 'GALLON_UK_KEROSINE_JET';
-    const GALLON_US_KEROSINE_JET     = 'GALLON_US_KEROSINE_JET';
-    const GALLON_UK_LPG              = 'GALLON_UK_LPG';
-    const GALLON_US_LPG              = 'GALLON_US_LPG';
-    const GALLON_UK_NAPHTA           = 'GALLON_UK_NAPHTA';
-    const GALLON_US_NAPHTA           = 'GALLON_US_NAPHTA';
-    const GALLON_UK_KEROSENE         = 'GALLON_UK_KEROSINE';
-    const GALLON_US_KEROSENE         = 'GALLON_US_KEROSINE';
-    const GALLON_UK_RESIDUAL         = 'GALLON_UK_RESIDUAL';
-    const GALLON_US_RESIDUAL         = 'GALLON_US_RESIDUAL';
-    const GIGAELECTRONVOLT           = 'GIGAELECTRONVOLT';
-    const GIGACALORIE                = 'GIGACALORIE';
-    const GIGACALORIE_15C            = 'GIGACALORIE_15C';
-    const GIGAJOULE                  = 'GIGAJOULE';
-    const GIGAWATT_HOUR              = 'GIGAWATT_HOUR';
-    const GRAM_CALORIE               = 'GRAM_CALORIE';
-    const HARTREE                    = 'HARTREE';
-    const HECTOJOULE                 = 'HECTOJOULE';
-    const HECTOWATT_HOUR             = 'HECTOWATT_HOUR';
-    const HORSEPOWER_HOUR            = 'HORSEPOWER_HOUR';
-    const HUNDRED_CUBIC_FOOT_GAS     = 'HUNDRED_CUBIC_FOOT_GAS';
-    const INCH_OUNCE                 = 'INCH_OUNCE';
-    const INCH_POUND                 = 'INCH_POUND';
-    const JOULE                      = 'JOULE';
-    const KILOCALORIE_15C            = 'KILOCALORIE_15C';
-    const KILOCALORIE                = 'KILOCALORIE';
-    const KILOCALORIE_THERMOCHEMICAL = 'KILOCALORIE_THERMOCHEMICAL';
-    const KILOELECTRONVOLT           = 'KILOELECTRONVOLT';
-    const KILOGRAM_CALORIE           = 'KILOGRAM_CALORIE';
-    const KILOGRAM_FORCE_METER       = 'KILOGRAM_FORCE_METER';
-    const KILOJOULE                  = 'KILOJOULE';
-    const KILOPOND_METER             = 'KILOPOND_METER';
-    const KILOTON                    = 'KILOTON';
-    const KILOWATT_HOUR              = 'KILOWATT_HOUR';
-    const LITER_ATMOSPHERE           = 'LITER_ATMOSPHERE';
-    const MEGAELECTRONVOLT           = 'MEGAELECTRONVOLT';
-    const MEGACALORIE                = 'MEGACALORIE';
-    const MEGACALORIE_15C            = 'MEGACALORIE_15C';
-    const MEGAJOULE                  = 'MEGAJOULE';
-    const MEGALERG                   = 'MEGALERG';
-    const MEGATON                    = 'MEGATON';
-    const MEGAWATTHOUR               = 'MEGAWATTHOUR';
-    const METER_KILOGRAM_FORCE       = 'METER_KILOGRAM_FORCE';
-    const MICROJOULE                 = 'MICROJOULE';
-    const MILLIJOULE                 = 'MILLIJOULE';
-    const MYRIAWATT_HOUR             = 'MYRIAWATT_HOUR';
-    const NANOJOULE                  = 'NANOJOULE';
-    const NEWTON_METER               = 'NEWTON_METER';
-    const PETAJOULE                  = 'PETAJOULE';
-    const PETAWATTHOUR               = 'PETAWATTHOUR';
-    const PFERDESTAERKENSTUNDE       = 'PFERDESTAERKENSTUNDE';
-    const PICOJOULE                  = 'PICOJOULE';
-    const Q_UNIT                     = 'Q_UNIT';
-    const QUAD                       = 'QUAD';
-    const TERAELECTRONVOLT           = 'TERAELECTRONVOLT';
-    const TERAJOULE                  = 'TERAJOULE';
-    const TERAWATTHOUR               = 'TERAWATTHOUR';
-    const THERM                      = 'THERM';
-    const THERM_US                   = 'THERM_US';
-    const THERMIE                    = 'THERMIE';
-    const TON                        = 'TON';
-    const TONNE_COAL                 = 'TONNE_COAL';
-    const TONNE_OIL                  = 'TONNE_OIL';
-    const WATTHOUR                   = 'WATTHOUR';
-    const WATTSECOND                 = 'WATTSECOND';
-    const YOCTOJOULE                 = 'YOCTOJOULE';
-    const YOTTAJOULE                 = 'YOTTAJOULE';
-    const YOTTAWATTHOUR              = 'YOTTAWATTHOUR';
-    const ZEPTOJOULE                 = 'ZEPTOJOULE';
-    const ZETTAJOULE                 = 'ZETTAJOULE';
-    const ZETTAWATTHOUR              = 'ZETTAWATTHOUR';
-
-    /**
-     * Calculations for all energy units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ATTOJOULE'              => array('1.0e-18',           'aJ'),
-        'BOARD_OF_TRADE_UNIT'    => array('3600000',           'BOTU'),
-        'BTU'                    => array('1055.0559',         'Btu'),
-        'BTU_TERMOCHEMICAL'      => array('1054.3503',         'Btu'),
-        'CALORIE'                => array('4.1868',            'cal'),
-        'CALORIE_15C'            => array('6.1858',            'cal'),
-        'CALORIE_NUTRITIONAL'    => array('4186.8',            'cal'),
-        'CALORIE_THERMOCHEMICAL' => array('4.184',             'cal'),
-        'CELSIUS_HEAT_UNIT'      => array('1899.1005',         'Chu'),
-        'CENTIJOULE'             => array('0.01',              'cJ'),
-        'CHEVAL_VAPEUR_HEURE'    => array('2647795.5',         'cv heure'),
-        'DECIJOULE'              => array('0.1',               'dJ'),
-        'DEKAJOULE'              => array('10',                'daJ'),
-        'DEKAWATT_HOUR'          => array('36000',             'daWh'),
-        'DEKATHERM'              => array('1.055057e+9',       'dathm'),
-        'ELECTRONVOLT'           => array('1.6021773e-19',     'eV'),
-        'ERG'                    => array('0.0000001',         'erg'),
-        'EXAJOULE'               => array('1.0e+18',           'EJ'),
-        'EXAWATT_HOUR'           => array('3.6e+21',           'EWh'),
-        'FEMTOJOULE'             => array('1.0e-15',           'fJ'),
-        'FOOT_POUND'             => array('1.3558179',         'ft lb'),
-        'FOOT_POUNDAL'           => array('0.04214011',        'ft poundal'),
-        'GALLON_UK_AUTOMOTIVE'   => array('158237172',         'gal car gasoline'),
-        'GALLON_US_AUTOMOTIVE'   => array('131760000',         'gal car gasoline'),
-        'GALLON_UK_AVIATION'     => array('158237172',         'gal jet gasoline'),
-        'GALLON_US_AVIATION'     => array('131760000',         'gal jet gasoline'),
-        'GALLON_UK_DIESEL'       => array('175963194',         'gal diesel'),
-        'GALLON_US_DIESEL'       => array('146520000',         'gal diesel'),
-        'GALLON_UK_DISTILATE'    => array('175963194',         'gal destilate fuel'),
-        'GALLON_US_DISTILATE'    => array('146520000',         'gal destilate fuel'),
-        'GALLON_UK_KEROSINE_JET' => array('170775090',         'gal jet kerosine'),
-        'GALLON_US_KEROSINE_JET' => array('142200000',         'gal jet kerosine'),
-        'GALLON_UK_LPG'          => array('121005126.0865275', 'gal lpg'),
-        'GALLON_US_LPG'          => array('100757838.45',      'gal lpg'),
-        'GALLON_UK_NAPHTA'       => array('160831224',         'gal jet fuel'),
-        'GALLON_US_NAPHTA'       => array('133920000',         'gal jet fuel'),
-        'GALLON_UK_KEROSINE'     => array('170775090',         'gal kerosine'),
-        'GALLON_US_KEROSINE'     => array('142200000',         'gal kerosine'),
-        'GALLON_UK_RESIDUAL'     => array('189798138',         'gal residual fuel'),
-        'GALLON_US_RESIDUAL'     => array('158040000',         'gal residual fuel'),
-        'GIGAELECTRONVOLT'       => array('1.6021773e-10',     'GeV'),
-        'GIGACALORIE'            => array('4186800000',        'Gcal'),
-        'GIGACALORIE_15C'        => array('4185800000',        'Gcal'),
-        'GIGAJOULE'              => array('1.0e+9',            'GJ'),
-        'GIGAWATT_HOUR'          => array('3.6e+12',           'GWh'),
-        'GRAM_CALORIE'           => array('4.1858',            'g cal'),
-        'HARTREE'                => array('4.3597482e-18',     'Eh'),
-        'HECTOJOULE'             => array('100',               'hJ'),
-        'HECTOWATT_HOUR'         => array('360000',            'hWh'),
-        'HORSEPOWER_HOUR'        => array('2684519.5',         'hph'),
-        'HUNDRED_CUBIC_FOOT_GAS' => array('108720000',         'hundred ft� gas'),
-        'INCH_OUNCE'             => array('0.0070615518',      'in oc'),
-        'INCH_POUND'             => array('0.112984825',       'in lb'),
-        'JOULE'                  => array('1',                 'J'),
-        'KILOCALORIE_15C'        => array('4185.8',            'kcal'),
-        'KILOCALORIE'            => array('4186','8',          'kcal'),
-        'KILOCALORIE_THERMOCHEMICAL' => array('4184',          'kcal'),
-        'KILOELECTRONVOLT'       => array('1.6021773e-16',     'keV'),
-        'KILOGRAM_CALORIE'       => array('4185.8',            'kg cal'),
-        'KILOGRAM_FORCE_METER'   => array('9.80665',           'kgf m'),
-        'KILOJOULE'              => array('1000',              'kJ'),
-        'KILOPOND_METER'         => array('9.80665',           'kp m'),
-        'KILOTON'                => array('4.184e+12',         'kt'),
-        'KILOWATT_HOUR'          => array('3600000',           'kWh'),
-        'LITER_ATMOSPHERE'       => array('101.325',           'l atm'),
-        'MEGAELECTRONVOLT'       => array('1.6021773e-13',     'MeV'),
-        'MEGACALORIE'            => array('4186800',           'Mcal'),
-        'MEGACALORIE_15C'        => array('4185800',           'Mcal'),
-        'MEGAJOULE'              => array('1000000',           'MJ'),
-        'MEGALERG'               => array('0.1',               'megalerg'),
-        'MEGATON'                => array('4.184e+15',         'Mt'),
-        'MEGAWATTHOUR'           => array('3.6e+9',            'MWh'),
-        'METER_KILOGRAM_FORCE'   => array('9.80665',           'm kgf'),
-        'MICROJOULE'             => array('0.000001',          '�J'),
-        'MILLIJOULE'             => array('0.001',             'mJ'),
-        'MYRIAWATT_HOUR'         => array('3.6e+7',            'myWh'),
-        'NANOJOULE'              => array('1.0e-9',            'nJ'),
-        'NEWTON_METER'           => array('1',                 'Nm'),
-        'PETAJOULE'              => array('1.0e+15',           'PJ'),
-        'PETAWATTHOUR'           => array('3.6e+18',           'PWh'),
-        'PFERDESTAERKENSTUNDE'   => array('2647795.5',         'ps h'),
-        'PICOJOULE'              => array('1.0e-12',           'pJ'),
-        'Q_UNIT'                 => array('1.0550559e+21',     'Q unit'),
-        'QUAD'                   => array('1.0550559e+18',     'quad'),
-        'TERAELECTRONVOLT'       => array('1.6021773e-7',      'TeV'),
-        'TERAJOULE'              => array('1.0e+12',           'TJ'),
-        'TERAWATTHOUR'           => array('3.6e+15',           'TWh'),
-        'THERM'                  => array('1.0550559e+8',      'thm'),
-        'THERM_US'               => array('1.054804e+8',       'thm'),
-        'THERMIE'                => array('4185800',           'th'),
-        'TON'                    => array('4.184e+9',          'T explosive'),
-        'TONNE_COAL'             => array('2.93076e+10',       'T coal'),
-        'TONNE_OIL'              => array('4.1868e+10',        'T oil'),
-        'WATTHOUR'               => array('3600',              'Wh'),
-        'WATTSECOND'             => array('1',                 'Ws'),
-        'YOCTOJOULE'             => array('1.0e-24',           'yJ'),
-        'YOTTAJOULE'             => array('1.0e+24',           'YJ'),
-        'YOTTAWATTHOUR'          => array('3.6e+27',           'YWh'),
-        'ZEPTOJOULE'             => array('1.0e-21',           'zJ'),
-        'ZETTAJOULE'             => array('1.0e+21',           'ZJ'),
-        'ZETTAWATTHOUR'          => array('3.6e+24',           'ZWh'),
-        'STANDARD'               => 'JOULE'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Exception.php b/airtime_mvc/library/Zend/Measure/Exception.php
deleted file mode 100644
index 48a7b2a5f..000000000
--- a/airtime_mvc/library/Zend/Measure/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Measure/Flow/Mass.php b/airtime_mvc/library/Zend/Measure/Flow/Mass.php
deleted file mode 100644
index 1fbd518dd..000000000
--- a/airtime_mvc/library/Zend/Measure/Flow/Mass.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Mass.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling flow mass conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Flow_Mass
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Flow_Mass extends Zend_Measure_Abstract
-{
-    const STANDARD = 'KILOGRAM_PER_SECOND';
-
-    const CENTIGRAM_PER_DAY    = 'CENTIGRAM_PER_DAY';
-    const CENTIGRAM_PER_HOUR   = 'CENTIGRAM_PER_HOUR';
-    const CENTIGRAM_PER_MINUTE = 'CENTIGRAM_PER_MINUTE';
-    const CENTIGRAM_PER_SECOND = 'CENTIGRAM_PER_SECOND';
-    const GRAM_PER_DAY         = 'GRAM_PER_DAY';
-    const GRAM_PER_HOUR        = 'GRAM_PER_HOUR';
-    const GRAM_PER_MINUTE      = 'GRAM_PER_MINUTE';
-    const GRAM_PER_SECOND      = 'GRAM_PER_SECOND';
-    const KILOGRAM_PER_DAY     = 'KILOGRAM_PER_DAY';
-    const KILOGRAM_PER_HOUR    = 'KILOGRAM_PER_HOUR';
-    const KILOGRAM_PER_MINUTE  = 'KILOGRAM_PER_MINUTE';
-    const KILOGRAM_PER_SECOND  = 'KILOGRAM_PER_SECOND';
-    const MILLIGRAM_PER_DAY    = 'MILLIGRAM_PER_DAY';
-    const MILLIGRAM_PER_HOUR   = 'MILLIGRAM_PER_HOUR';
-    const MILLIGRAM_PER_MINUTE = 'MILLIGRAM_PER_MINUTE';
-    const MILLIGRAM_PER_SECOND = 'MILLIGRAM_PER_SECOND';
-    const OUNCE_PER_DAY        = 'OUNCE_PER_DAY';
-    const OUNCE_PER_HOUR       = 'OUNCE_PER_HOUR';
-    const OUNCE_PER_MINUTE     = 'OUNCE_PER_MINUTE';
-    const OUNCE_PER_SECOND     = 'OUNCE_PER_SECOND';
-    const POUND_PER_DAY        = 'POUND_PER_DAY';
-    const POUND_PER_HOUR       = 'POUND_PER_HOUR';
-    const POUND_PER_MINUTE     = 'POUND_PER_MINUTE';
-    const POUND_PER_SECOND     = 'POUND_PER_SECOND';
-    const TON_LONG_PER_DAY     = 'TON_LONG_PER_DAY';
-    const TON_LONG_PER_HOUR    = 'TON_LONG_PER_HOUR';
-    const TON_LONG_PER_MINUTE  = 'TON_LONG_PER_MINUTE';
-    const TON_LONG_PER_SECOND  = 'TON_LONG_PER_SECOND';
-    const TON_PER_DAY          = 'TON_PER_DAY';
-    const TON_PER_HOUR         = 'TON_PER_HOUR';
-    const TON_PER_MINUTE       = 'TON_PER_MINUTE';
-    const TON_PER_SECOND       = 'TON_PER_SECOND';
-    const TON_SHORT_PER_DAY    = 'TON_SHORT_PER_DAY';
-    const TON_SHORT_PER_HOUR   = 'TON_SHORT_PER_HOUR';
-    const TON_SHORT_PER_MINUTE = 'TON_SHORT_PER_MINUTE';
-    const TON_SHORT_PER_SECOND = 'TON_SHORT_PER_SECOND';
-
-    /**
-     * Calculations for all flow mass units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CENTIGRAM_PER_DAY'    => array(array('' => '0.00001', '/' => '86400'),    'cg/day'),
-        'CENTIGRAM_PER_HOUR'   => array(array('' => '0.00001', '/' => '3600'),     'cg/h'),
-        'CENTIGRAM_PER_MINUTE' => array(array('' => '0.00001', '/' => '60'),       'cg/m'),
-        'CENTIGRAM_PER_SECOND' => array('0.00001',                               'cg/s'),
-        'GRAM_PER_DAY'         => array(array('' => '0.001', '/' => '86400'),      'g/day'),
-        'GRAM_PER_HOUR'        => array(array('' => '0.001', '/' => '3600'),       'g/h'),
-        'GRAM_PER_MINUTE'      => array(array('' => '0.001', '/' => '60'),         'g/m'),
-        'GRAM_PER_SECOND'      => array('0.001',                                 'g/s'),
-        'KILOGRAM_PER_DAY'     => array(array('' => '1', '/' => '86400'),          'kg/day'),
-        'KILOGRAM_PER_HOUR'    => array(array('' => '1', '/' => '3600'),           'kg/h'),
-        'KILOGRAM_PER_MINUTE'  => array(array('' => '1', '/' => '60'),             'kg/m'),
-        'KILOGRAM_PER_SECOND'  => array('1',                                     'kg/s'),
-        'MILLIGRAM_PER_DAY'    => array(array('' => '0.000001', '/' => '86400'),   'mg/day'),
-        'MILLIGRAM_PER_HOUR'   => array(array('' => '0.000001', '/' => '3600'),    'mg/h'),
-        'MILLIGRAM_PER_MINUTE' => array(array('' => '0.000001', '/' => '60'),      'mg/m'),
-        'MILLIGRAM_PER_SECOND' => array('0.000001',                              'mg/s'),
-        'OUNCE_PER_DAY'        => array(array('' => '0.0283495', '/' => '86400'),  'oz/day'),
-        'OUNCE_PER_HOUR'       => array(array('' => '0.0283495', '/' => '3600'),   'oz/h'),
-        'OUNCE_PER_MINUTE'     => array(array('' => '0.0283495', '/' => '60'),     'oz/m'),
-        'OUNCE_PER_SECOND'     => array('0.0283495',                             'oz/s'),
-        'POUND_PER_DAY'        => array(array('' => '0.453592', '/' => '86400'),   'lb/day'),
-        'POUND_PER_HOUR'       => array(array('' => '0.453592', '/' => '3600'),    'lb/h'),
-        'POUND_PER_MINUTE'     => array(array('' => '0.453592', '/' => '60'),      'lb/m'),
-        'POUND_PER_SECOND'     => array('0.453592',                              'lb/s'),
-        'TON_LONG_PER_DAY'     => array(array('' => '1016.04608', '/' => '86400'), 't/day'),
-        'TON_LONG_PER_HOUR'    => array(array('' => '1016.04608', '/' => '3600'),  't/h'),
-        'TON_LONG_PER_MINUTE'  => array(array('' => '1016.04608', '/' => '60'),    't/m'),
-        'TON_LONG_PER_SECOND'  => array('1016.04608',                            't/s'),
-        'TON_PER_DAY'          => array(array('' => '1000', '/' => '86400'),       't/day'),
-        'TON_PER_HOUR'         => array(array('' => '1000', '/' => '3600'),        't/h'),
-        'TON_PER_MINUTE'       => array(array('' => '1000', '/' => '60'),          't/m'),
-        'TON_PER_SECOND'       => array('1000',                                  't/s'),
-        'TON_SHORT_PER_DAY'    => array(array('' => '907.184', '/' => '86400'),    't/day'),
-        'TON_SHORT_PER_HOUR'   => array(array('' => '907.184', '/' => '3600'),     't/h'),
-        'TON_SHORT_PER_MINUTE' => array(array('' => '907.184', '/' => '60'),       't/m'),
-        'TON_SHORT_PER_SECOND' => array('907.184',                               't/s'),
-        'STANDARD'             => 'KILOGRAM_PER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Flow/Mole.php b/airtime_mvc/library/Zend/Measure/Flow/Mole.php
deleted file mode 100644
index 852b8f947..000000000
--- a/airtime_mvc/library/Zend/Measure/Flow/Mole.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Mole.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling flow mole conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Flow_Mole
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Flow_Mole extends Zend_Measure_Abstract
-{
-    const STANDARD = 'MOLE_PER_SECOND';
-
-    const CENTIMOLE_PER_DAY    = 'CENTIMOLE_PER_DAY';
-    const CENTIMOLE_PER_HOUR   = 'CENTIMOLE_PER_HOUR';
-    const CENTIMOLE_PER_MINUTE = 'CENTIMOLE_PER_MINUTE';
-    const CENTIMOLE_PER_SECOND = 'CENTIMOLE_PER_SECOND';
-    const MEGAMOLE_PER_DAY     = 'MEGAMOLE_PER_DAY';
-    const MEGAMOLE_PER_HOUR    = 'MEGAMOLE_PER_HOUR';
-    const MEGAMOLE_PER_MINUTE  = 'MEGAMOLE_PER_MINUTE';
-    const MEGAMOLE_PER_SECOND  = 'MEGAMOLE_PER_SECOND';
-    const MICROMOLE_PER_DAY    = 'MICROMOLE_PER_DAY';
-    const MICROMOLE_PER_HOUR   = 'MICROMOLE_PER_HOUR';
-    const MICROMOLE_PER_MINUTE = 'MICROMOLE_PER_MINUTE';
-    const MICROMOLE_PER_SECOND = 'MICROMOLE_PER_SECOND';
-    const MILLIMOLE_PER_DAY    = 'MILLIMOLE_PER_DAY';
-    const MILLIMOLE_PER_HOUR   = 'MILLIMOLE_PER_HOUR';
-    const MILLIMOLE_PER_MINUTE = 'MILLIMOLE_PER_MINUTE';
-    const MILLIMOLE_PER_SECOND = 'MILLIMOLE_PER_SECOND';
-    const MOLE_PER_DAY         = 'MOLE_PER_DAY';
-    const MOLE_PER_HOUR        = 'MOLE_PER_HOUR';
-    const MOLE_PER_MINUTE      = 'MOLE_PER_MINUTE';
-    const MOLE_PER_SECOND      = 'MOLE_PER_SECOND';
-
-    /**
-     * Calculations for all flow mole units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CENTIMOLE_PER_DAY'    => array(array('' => '0.01', '/' => '86400'),     'cmol/day'),
-        'CENTIMOLE_PER_HOUR'   => array(array('' => '0.01', '/' => '3600'),      'cmol/h'),
-        'CENTIMOLE_PER_MINUTE' => array(array('' => '0.01', '/' => '60'),        'cmol/m'),
-        'CENTIMOLE_PER_SECOND' => array('0.01',     'cmol/s'),
-        'MEGAMOLE_PER_DAY'     => array(array('' => '1000000', '/' => '86400'),  'Mmol/day'),
-        'MEGAMOLE_PER_HOUR'    => array(array('' => '1000000', '/' => '3600'),   'Mmol/h'),
-        'MEGAMOLE_PER_MINUTE'  => array(array('' => '1000000', '/' => '60'),     'Mmol/m'),
-        'MEGAMOLE_PER_SECOND'  => array('1000000',  'Mmol/s'),
-        'MICROMOLE_PER_DAY'    => array(array('' => '0.000001', '/' => '86400'), 'µmol/day'),
-        'MICROMOLE_PER_HOUR'   => array(array('' => '0.000001', '/' => '3600'),  'µmol/h'),
-        'MICROMOLE_PER_MINUTE' => array(array('' => '0.000001', '/' => '60'),    'µmol/m'),
-        'MICROMOLE_PER_SECOND' => array('0.000001', 'µmol/s'),
-        'MILLIMOLE_PER_DAY'    => array(array('' => '0.001', '/' => '86400'),    'mmol/day'),
-        'MILLIMOLE_PER_HOUR'   => array(array('' => '0.001', '/' => '3600'),     'mmol/h'),
-        'MILLIMOLE_PER_MINUTE' => array(array('' => '0.001', '/' => '60'),       'mmol/m'),
-        'MILLIMOLE_PER_SECOND' => array('0.001',    'mmol/s'),
-        'MOLE_PER_DAY'         => array(array('' => '1', '/' => '86400'),        'mol/day'),
-        'MOLE_PER_HOUR'        => array(array('' => '1', '/' => '3600'),         'mol/h'),
-        'MOLE_PER_MINUTE'      => array(array('' => '1', '/' => '60'),           'mol/m'),
-        'MOLE_PER_SECOND'      => array('1',        'mol/s'),
-        'STANDARD'             => 'MOLE_PER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Flow/Volume.php b/airtime_mvc/library/Zend/Measure/Flow/Volume.php
deleted file mode 100644
index ef6450e28..000000000
--- a/airtime_mvc/library/Zend/Measure/Flow/Volume.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling flow volume conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Flow_Volume
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Flow_Volume extends Zend_Measure_Abstract
-{
-    const STANDARD = 'CUBIC_METER_PER_SECOND';
-
-    const ACRE_FOOT_PER_DAY              = 'ACRE_FOOT_PER_DAY';
-    const ACRE_FOOT_PER_HOUR             = 'ACRE_FOOT_PER_HOUR';
-    const ACRE_FOOT_PER_MINUTE           = 'ACRE_FOOT_PER_MINUTE';
-    const ACRE_FOOT_PER_SECOND           = 'ACRE_FOOT_PER_SECOND';
-    const ACRE_FOOT_SURVEY_PER_DAY       = 'ACRE_FOOT_SURVEY_PER_DAY';
-    const ACRE_FOOT_SURVEY_PER_HOUR      = 'ACRE_FOOT_SURVEY_PER_HOUR';
-    const ACRE_FOOT_SURVEY_PER_MINUTE    = 'ACRE_FOOT_SURVEY_PER_MINUTE';
-    const ACRE_FOOT_SURVEY_PER_SECOND    = 'ACRE_FOOT_SURVEY_PER_SECOND';
-    const ACRE_INCH_PER_DAY              = 'ACRE_INCH_PER_DAY';
-    const ACRE_INCH_PER_HOUR             = 'ACRE_INCH_PER_HOUR';
-    const ACRE_INCH_PER_MINUTE           = 'ACRE_INCH_PER_MINUTE';
-    const ACRE_INCH_PER_SECOND           = 'ACRE_INCH_PER_SECOND';
-    const ACRE_INCH_SURVEY_PER_DAY       = 'ACRE_INCH_SURVEY_PER_DAY';
-    const ACRE_INCH_SURVEY_PER_HOUR      = 'ACRE_INCH_SURVEY_PER_HOUR';
-    const ACRE_INCH_SURVEY_PER_MINUTE    = 'ACRE_INCH_SURVEY_PER_MINUTE';
-    const ACRE_INCH_SURVEY_PER_SECOND    = 'ACRE_INCH_SURVEY_PER_SECOND';
-    const BARREL_PETROLEUM_PER_DAY       = 'BARREL_PETROLEUM_PER_DAY';
-    const BARREL_PETROLEUM_PER_HOUR      = 'BARREL_PETROLEUM_PER_HOUR';
-    const BARREL_PETROLEUM_PER_MINUTE    = 'BARREL_PETROLEUM_PER_MINUTE';
-    const BARREL_PETROLEUM_PER_SECOND    = 'BARREL_PETROLEUM_PER_SECOND';
-    const BARREL_PER_DAY                 = 'BARREL_PER_DAY';
-    const BARREL_PER_HOUR                = 'BARREL_PER_HOUR';
-    const BARREL_PER_MINUTE              = 'BARREL_PER_MINUTE';
-    const BARREL_PER_SECOND              = 'BARREL_PER_SECOND';
-    const BARREL_US_PER_DAY              = 'BARREL_US_PER_DAY';
-    const BARREL_US_PER_HOUR             = 'BARREL_US_PER_HOUR';
-    const BARREL_US_PER_MINUTE           = 'BARREL_US_PER_MINUTE';
-    const BARREL_US_PER_SECOND           = 'BARREL_US_PER_SECOND';
-    const BARREL_WINE_PER_DAY            = 'BARREL_WINE_PER_DAY';
-    const BARREL_WINE_PER_HOUR           = 'BARREL_WINE_PER_HOUR';
-    const BARREL_WINE_PER_MINUTE         = 'BARREL_WINE_PER_MINUTE';
-    const BARREL_WINE_PER_SECOND         = 'BARREL_WINE_PER_SECOND';
-    const BARREL_BEER_PER_DAY            = 'BARREL_BEER_PER_DAY';
-    const BARREL_BEER_PER_HOUR           = 'BARREL_BEER_PER_HOUR';
-    const BARREL_BEER_PER_MINUTE         = 'BARREL_BEER_PER_MINUTE';
-    const BARREL_BEER_PER_SECOND         = 'BARREL_BEER_PER_SECOND';
-    const BILLION_CUBIC_FOOT_PER_DAY     = 'BILLION_CUBIC_FOOT_PER_DAY';
-    const BILLION_CUBIC_FOOT_PER_HOUR    = 'BILLION_CUBIC_FOOT_PER_HOUR';
-    const BILLION_CUBIC_FOOT_PER_MINUTE  = 'BILLION_CUBIC_FOOT_PER_MINUTE';
-    const BILLION_CUBIC_FOOT_PER_SECOND  = 'BILLION_CUBIC_FOOT_PER_SECOND';
-    const CENTILITER_PER_DAY             = 'CENTILITER_PER_DAY';
-    const CENTILITER_PER_HOUR            = 'CENTILITER_PER_HOUR';
-    const CENTILITER_PER_MINUTE          = 'CENTILITER_PER_MINUTE';
-    const CENTILITER_PER_SECOND          = 'CENTILITER_PER_SECOND';
-    const CUBEM_PER_DAY                  = 'CUBEM_PER_DAY';
-    const CUBEM_PER_HOUR                 = 'CUBEM_PER_HOUR';
-    const CUBEM_PER_MINUTE               = 'CUBEM_PER_MINUTE';
-    const CUBEM_PER_SECOND               = 'CUBEM_PER_SECOND';
-    const CUBIC_CENTIMETER_PER_DAY       = 'CUBIC_CENTIMETER_PER_DAY';
-    const CUBIC_CENTIMETER_PER_HOUR      = 'CUBIC_CENTIMETER_PER_HOUR';
-    const CUBIC_CENTIMETER_PER_MINUTE    = 'CUBIC_CENTIMETER_PER_MINUTE';
-    const CUBIC_CENTIMETER_PER_SECOND    = 'CUBIC_CENTIMETER_PER_SECOND';
-    const CUBIC_DECIMETER_PER_DAY        = 'CUBIC_DECIMETER_PER_DAY';
-    const CUBIC_DECIMETER_PER_HOUR       = 'CUBIC_DECIMETER_PER_HOUR';
-    const CUBIC_DECIMETER_PER_MINUTE     = 'CUBIC_DECIMETER_PER_MINUTE';
-    const CUBIC_DECIMETER_PER_SECOND     = 'CUBIC_DECIMETER_PER_SECOND';
-    const CUBIC_DEKAMETER_PER_DAY        = 'CUBIC_DEKAMETER_PER_DAY';
-    const CUBIC_DEKAMETER_PER_HOUR       = 'CUBIC_DEKAMETER_PER_HOUR';
-    const CUBIC_DEKAMETER_PER_MINUTE     = 'CUBIC_DEKAMETER_PER_MINUTE';
-    const CUBIC_DEKAMETER_PER_SECOND     = 'CUBIC_DEKAMETER_PER_SECOND';
-    const CUBIC_FOOT_PER_DAY             = 'CUBIC_FOOT_PER_DAY';
-    const CUBIC_FOOT_PER_HOUR            = 'CUBIC_FOOT_PER_HOUR';
-    const CUBIC_FOOT_PER_MINUTE          = 'CUBIC_FOOT_PER_MINUTE';
-    const CUBIC_FOOT_PER_SECOND          = 'CUBIC_FOOT_PER_SECOND';
-    const CUBIC_INCH_PER_DAY             = 'CUBIC_INCH_PER_DAY';
-    const CUBIC_INCH_PER_HOUR            = 'CUBIC_INCH_PER_HOUR';
-    const CUBIC_INCH_PER_MINUTE          = 'CUBIC_INCH_PER_MINUTE';
-    const CUBIC_INCH_PER_SECOND          = 'CUBIC_INCH_PER_SECOND';
-    const CUBIC_KILOMETER_PER_DAY        = 'CUBIC_KILOMETER_PER_DAY';
-    const CUBIC_KILOMETER_PER_HOUR       = 'CUBIC_KILOMETER_PER_HOUR';
-    const CUBIC_KILOMETER_PER_MINUTE     = 'CUBIC_KILOMETER_PER_MINUTE';
-    const CUBIC_KILOMETER_PER_SECOND     = 'CUBIC_KILOMETER_PER_SECOND';
-    const CUBIC_METER_PER_DAY            = 'CUBIC_METER_PER_DAY';
-    const CUBIC_METER_PER_HOUR           = 'CUBIC_METER_PER_HOUR';
-    const CUBIC_METER_PER_MINUTE         = 'CUBIC_METER_PER_MINUTE';
-    const CUBIC_METER_PER_SECOND         = 'CUBIC_METER_PER_SECOND';
-    const CUBIC_MILE_PER_DAY             = 'CUBIC_MILE_PER_DAY';
-    const CUBIC_MILE_PER_HOUR            = 'CUBIC_MILE_PER_HOUR';
-    const CUBIC_MILE_PER_MINUTE          = 'CUBIC_MILE_PER_MINUTE';
-    const CUBIC_MILE_PER_SECOND          = 'CUBIC_MILE_PER_SECOND';
-    const CUBIC_MILLIMETER_PER_DAY       = 'CUBIC_MILLIMETER_PER_DAY';
-    const CUBIC_MILLIMETER_PER_HOUR      = 'CUBIC_MILLIMETER_PER_HOUR';
-    const CUBIC_MILLIMETER_PER_MINUTE    = 'CUBIC_MILLIMETER_PER_MINUTE';
-    const CUBIC_MILLIMETER_PER_SECOND    = 'CUBIC_MILLIMETER_PER_SECOND';
-    const CUBIC_YARD_PER_DAY             = 'CUBIC_YARD_PER_DAY';
-    const CUBIC_YARD_PER_HOUR            = 'CUBIC_YARD_PER_HOUR';
-    const CUBIC_YARD_PER_MINUTE          = 'CUBIC_YARD_PER_MINUTE';
-    const CUBIC_YARD_PER_SECOND          = 'CUBIC_YARD_PER_SECOND';
-    const CUSEC                          = 'CUSEC';
-    const DECILITER_PER_DAY              = 'DECILITER_PER_DAY';
-    const DECILITER_PER_HOUR             = 'DECILITER_PER_HOUR';
-    const DECILITER_PER_MINUTE           = 'DECILITER_PER_MINUTE';
-    const DECILITER_PER_SECOND           = 'DECILITER_PER_SECOND';
-    const DEKALITER_PER_DAY              = 'DEKALITER_PER_DAY';
-    const DEKALITER_PER_HOUR             = 'DEKALITER_PER_HOUR';
-    const DEKALITER_PER_MINUTE           = 'DEKALITER_PER_MINUTE';
-    const DEKALITER_PER_SECOND           = 'DEKALITER_PER_SECOND';
-    const GALLON_PER_DAY                 = 'GALLON_PER_DAY';
-    const GALLON_PER_HOUR                = 'GALLON_PER_HOUR';
-    const GALLON_PER_MINUTE              = 'GALLON_PER_MINUTE';
-    const GALLON_PER_SECOND              = 'GALLON_PER_SECOND';
-    const GALLON_US_PER_DAY              = 'GALLON_US_PER_DAY';
-    const GALLON_US_PER_HOUR             = 'GALLON_US_PER_HOUR';
-    const GALLON_US_PER_MINUTE           = 'GALLON_US_PER_MINUTE';
-    const GALLON_US_PER_SECOND           = 'GALLON_US_PER_SECOND';
-    const HECTARE_METER_PER_DAY          = 'HECTARE_METER_PER_DAY';
-    const HECTARE_METER_PER_HOUR         = 'HECTARE_METER_PER_HOUR';
-    const HECTARE_METER_PER_MINUTE       = 'HECTARE_METER_PER_MINUTE';
-    const HECTARE_METER_PER_SECOND       = 'HECTARE_METER_PER_SECOND';
-    const HECTOLITER_PER_DAY             = 'HECTOLITER_PER_DAY';
-    const HECTOLITER_PER_HOUR            = 'HECTOLITER_PER_HOUR';
-    const HECTOLITER_PER_MINUTE          = 'HECTOLITER_PER_MINUTE';
-    const HECTOLITER_PER_SECOND          = 'HECTOLITER_PER_SECOND';
-    const KILOLITER_PER_DAY              = 'KILOLITER_PER_DAY';
-    const KILOLITER_PER_HOUR             = 'KILOLITER_PER_HOUR';
-    const KILOLITER_PER_MINUTE           = 'KILOLITER_PER_MINUTE';
-    const KILOLITER_PER_SECOND           = 'KILOLITER_PER_SECOND';
-    const LAMBDA_PER_DAY                 = 'LAMBDA_PER_DAY';
-    const LAMBDA_PER_HOUR                = 'LAMBDA_PER_HOUR';
-    const LAMBDA_PER_MINUTE              = 'LAMBDA_PER_MINUTE';
-    const LAMBDA_PER_SECOND              = 'LAMBDA_PER_SECOND';
-    const LITER_PER_DAY                  = 'LITER_PER_DAY';
-    const LITER_PER_HOUR                 = 'LITER_PER_HOUR';
-    const LITER_PER_MINUTE               = 'LITER_PER_MINUTE';
-    const LITER_PER_SECOND               = 'LITER_PER_SECOND';
-    const MILLILITER_PER_DAY             = 'MILLILITER_PER_DAY';
-    const MILLILITER_PER_HOUR            = 'MILLILITER_PER_HOUR';
-    const MILLILITER_PER_MINUTE          = 'MILLILITER_PER_MINUTE';
-    const MILLILITER_PER_SECOND          = 'MILLILITER_PER_SECOND';
-    const MILLION_ACRE_FOOT_PER_DAY      = 'MILLION_ACRE_FOOT_PER_DAY';
-    const MILLION_ACRE_FOOT_PER_HOUR     = 'MILLION_ACRE_FOOT_PER_HOUR';
-    const MILLION_ACRE_FOOT_PER_MINUTE   = 'MILLION_ACRE_FOOT_PER_MINUTE';
-    const MILLION_ACRE_FOOT_PER_SECOND   = 'MILLION_ACRE_FOOT_PER_SECOND';
-    const MILLION_CUBIC_FOOT_PER_DAY     = 'MILLION_CUBIC_FOOT_PER_DAY';
-    const MILLION_CUBIC_FOOT_PER_HOUR    = 'MILLION_CUBIC_FOOT_PER_HOUR';
-    const MILLION_CUBIC_FOOT_PER_MINUTE  = 'MILLION_CUBIC_FOOT_PER_MINUTE';
-    const MILLION_CUBIC_FOOT_PER_SECOND  = 'MILLION_CUBIC_FOOT_PER_SECOND';
-    const MILLION_GALLON_PER_DAY         = 'MILLION_GALLON_PER_DAY';
-    const MILLION_GALLON_PER_HOUR        = 'MILLION_GALLON_PER_HOUR';
-    const MILLION_GALLON_PER_MINUTE      = 'MILLION_GALLON_PER_MINUTE';
-    const MILLION_GALLON_PER_SECOND      = 'MILLION_GALLON_PER_SECOND';
-    const MILLION_GALLON_US_PER_DAY      = 'MILLION_GALLON_US_PER_DAY';
-    const MILLION_GALLON_US_PER_HOUR     = 'MILLION_GALLON_US_PER_HOUR';
-    const MILLION_GALLON_US_PER_MINUTE   = 'MILLION_GALLON_US_PER_MINUTE';
-    const MILLION_GALLON_US_PER_SECOND   = 'MILLION_GALLON_US_PER_SECOND';
-    const MINERS_INCH_AZ                 = 'MINERS_INCH_AZ';
-    const MINERS_INCH_CA                 = 'MINERS_INCH_CA';
-    const MINERS_INCH_OR                 = 'MINERS_INCH_OR';
-    const MINERS_INCH_CO                 = 'MINERS_INCH_CO';
-    const MINERS_INCH_ID                 = 'MINERS_INCH_ID';
-    const MINERS_INCH_WA                 = 'MINERS_INCH_WA';
-    const MINERS_INCH_NM                 = 'MINERS_INCH_NM';
-    const OUNCE_PER_DAY                  = 'OUNCE_PER_DAY';
-    const OUNCE_PER_HOUR                 = 'OUNCE_PER_HOUR';
-    const OUNCE_PER_MINUTE               = 'OUNCE_PER_MINUTE';
-    const OUNCE_PER_SECOND               = 'OUNCE_PER_SECOND';
-    const OUNCE_US_PER_DAY               = 'OUNCE_US_PER_DAY';
-    const OUNCE_US_PER_HOUR              = 'OUNCE_US_PER_HOUR';
-    const OUNCE_US_PER_MINUTE            = 'OUNCE_US_PER_MINUTE';
-    const OUNCE_US_PER_SECOND            = 'OUNCE_US_PER_SECOND';
-    const PETROGRAD_STANDARD_PER_DAY     = 'PETROGRAD_STANDARD_PER_DAY';
-    const PETROGRAD_STANDARD_PER_HOUR    = 'PETROGRAD_STANDARD_PER_HOUR';
-    const PETROGRAD_STANDARD_PER_MINUTE  = 'PETROGRAD_STANDARD_PER_MINUTE';
-    const PETROGRAD_STANDARD_PER_SECOND  = 'PETROGRAD_STANDARD_PER_SECOND';
-    const STERE_PER_DAY                  = 'STERE_PER_DAY';
-    const STERE_PER_HOUR                 = 'STERE_PER_HOUR';
-    const STERE_PER_MINUTE               = 'STERE_PER_MINUTE';
-    const STERE_PER_SECOND               = 'STERE_PER_SECOND';
-    const THOUSAND_CUBIC_FOOT_PER_DAY    = 'THOUSAND_CUBIC_FOOT_PER_DAY';
-    const THOUSAND_CUBIC_FOOT_PER_HOUR   = 'THOUSAND_CUBIC_FOOT_PER_HOUR';
-    const THOUSAND_CUBIC_FOOT_PER_MINUTE = 'THOUSAND_CUBIC_FOOT_PER_MINUTE';
-    const THOUSAND_CUBIC_FOOT_PER_SECOND = 'THOUSAND_CUBIC_FOOT_PER_SECOND';
-    const TRILLION_CUBIC_FOOT_PER_DAY    = 'TRILLION_CUBIC_FOOT_PER_DAY';
-    const TRILLION_CUBIC_FOOT_PER_HOUR   = 'TRILLION_CUBIC_FOOT_PER_HOUR';
-    const TRILLION_CUBIC_FOOT_PER_MINUTE = 'TRILLION_CUBIC_FOOT_PER_MINUTE';
-    const TRILLION_CUBIC_FOOT_PER_SECOND = 'TRILLION_CUBIC_FOOT_PER_';
-
-    /**
-     * Calculations for all flow volume units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ACRE_FOOT_PER_DAY'           => array(array('' => '1233.48184', '/' => '86400'),      'ac ft/day'),
-        'ACRE_FOOT_PER_HOUR'          => array(array('' => '1233.48184', '/' => '3600'),       'ac ft/h'),
-        'ACRE_FOOT_PER_MINUTE'        => array(array('' => '1233.48184', '/' => '60'),         'ac ft/m'),
-        'ACRE_FOOT_PER_SECOND'        => array('1233.48184',                                 'ac ft/s'),
-        'ACRE_FOOT_SURVEY_PER_DAY'    => array(array('' => '1233.48924', '/' => '86400'),      'ac ft/day'),
-        'ACRE_FOOT_SURVEY_PER_HOUR'   => array(array('' => '1233.48924', '/' => '3600'),       'ac ft/h'),
-        'ACRE_FOOT_SURVEY_PER_MINUTE' => array(array('' => '1233.48924', '/' => '60'),         'ac ft/m'),
-        'ACRE_FOOT_SURVEY_PER_SECOND' => array('1233.48924',                                 'ac ft/s'),
-        'ACRE_INCH_PER_DAY'           => array(array('' => '1233.48184', '/' => '1036800'),    'ac in/day'),
-        'ACRE_INCH_PER_HOUR'          => array(array('' => '1233.48184', '/' => '43200'),      'ac in/h'),
-        'ACRE_INCH_PER_MINUTE'        => array(array('' => '1233.48184', '/' => '720'),        'ac in/m'),
-        'ACRE_INCH_PER_SECOND'        => array(array('' => '1233.48184', '/' => '12'),         'ac in/s'),
-        'ACRE_INCH_SURVEY_PER_DAY'    => array(array('' => '1233.48924', '/' => '1036800'),    'ac in/day'),
-        'ACRE_INCH_SURVEY_PER_HOUR'   => array(array('' => '1233.48924', '/' => '43200'),      'ac in/h'),
-        'ACRE_INCH_SURVEY_PER_MINUTE' => array(array('' => '1233.48924', '/' => '720'),        'ac in /m'),
-        'ACRE_INCH_SURVEY_PER_SECOND' => array(array('' => '1233.48924', '/' => '12'),         'ac in/s'),
-        'BARREL_PETROLEUM_PER_DAY'    => array(array('' => '0.1589872956', '/' => '86400'),    'bbl/day'),
-        'BARREL_PETROLEUM_PER_HOUR'   => array(array('' => '0.1589872956', '/' => '3600'),     'bbl/h'),
-        'BARREL_PETROLEUM_PER_MINUTE' => array(array('' => '0.1589872956', '/' => '60'),       'bbl/m'),
-        'BARREL_PETROLEUM_PER_SECOND' => array('0.1589872956',                               'bbl/s'),
-        'BARREL_PER_DAY'              => array(array('' => '0.16365924', '/' => '86400'),      'bbl/day'),
-        'BARREL_PER_HOUR'             => array(array('' => '0.16365924', '/' => '3600'),       'bbl/h'),
-        'BARREL_PER_MINUTE'           => array(array('' => '0.16365924', '/' => '60'),         'bbl/m'),
-        'BARREL_PER_SECOND'           => array('0.16365924',                                 'bbl/s'),
-        'BARREL_US_PER_DAY'           => array(array('' => '0.1192404717', '/' => '86400'),    'bbl/day'),
-        'BARREL_US_PER_HOUR'          => array(array('' => '0.1192404717', '/' => '3600'),     'bbl/h'),
-        'BARREL_US_PER_MINUTE'        => array(array('' => '0.1192404717', '/' => '60'),       'bbl/m'),
-        'BARREL_US_PER_SECOND'        => array('0.1192404717',                               'bbl/s'),
-        'BARREL_WINE_PER_DAY'         => array(array('' => '0.1173477658', '/' => '86400'),    'bbl/day'),
-        'BARREL_WINE_PER_HOUR'        => array(array('' => '0.1173477658', '/' => '3600'),     'bbl/h'),
-        'BARREL_WINE_PER_MINUTE'      => array(array('' => '0.1173477658', '/' => '60'),       'bbl/m'),
-        'BARREL_WINE_PER_SECOND'      => array('0.1173477658',                               'bbl/s'),
-        'BARREL_BEER_PER_DAY'         => array(array('' => '0.1173477658', '/' => '86400'),    'bbl/day'),
-        'BARREL_BEER_PER_HOUR'        => array(array('' => '0.1173477658', '/' => '3600'),     'bbl/h'),
-        'BARREL_BEER_PER_MINUTE'      => array(array('' => '0.1173477658', '/' => '60'),       'bbl/m'),
-        'BARREL_BEER_PER_SECOND'      => array('0.1173477658',                               'bbl/s'),
-        'BILLION_CUBIC_FOOT_PER_DAY'  => array(array('' => '28316847', '/' => '86400'),        'bn ft³/day'),
-        'BILLION_CUBIC_FOOT_PER_HOUR' => array(array('' => '28316847', '/' => '3600'),         'bn ft³/h'),
-        'BILLION_CUBIC_FOOT_PER_MINUTE' => array(array('' => '28316847', '/' => '60'),         'bn ft³/m'),
-        'BILLION_CUBIC_FOOT_PER_SECOND' => array('28316847',                                 'bn ft³/s'),
-        'CENTILITER_PER_DAY'          => array(array('' => '0.00001', '/' => '86400'),         'cl/day'),
-        'CENTILITER_PER_HOUR'         => array(array('' => '0.00001', '/' => '3600'),          'cl/h'),
-        'CENTILITER_PER_MINUTE'       => array(array('' => '0.00001', '/' => '60'),            'cl/m'),
-        'CENTILITER_PER_SECOND'       => array('0.00001',                                    'cl/s'),
-        'CUBEM_PER_DAY'               => array(array('' => '4168181830', '/' => '86400'),      'cubem/day'),
-        'CUBEM_PER_HOUR'              => array(array('' => '4168181830', '/' => '3600'),       'cubem/h'),
-        'CUBEM_PER_MINUTE'            => array(array('' => '4168181830', '/' => '60'),         'cubem/m'),
-        'CUBEM_PER_SECOND'            => array('4168181830',                                 'cubem/s'),
-        'CUBIC_CENTIMETER_PER_DAY'    => array(array('' => '0.000001', '/' => '86400'),        'cm³/day'),
-        'CUBIC_CENTIMETER_PER_HOUR'   => array(array('' => '0.000001', '/' => '3600'),         'cm³/h'),
-        'CUBIC_CENTIMETER_PER_MINUTE' => array(array('' => '0.000001', '/' => '60'),           'cm³/m'),
-        'CUBIC_CENTIMETER_PER_SECOND' => array('0.000001',                                   'cm³/s'),
-        'CUBIC_DECIMETER_PER_DAY'     => array(array('' => '0.001', '/' => '86400'),           'dm³/day'),
-        'CUBIC_DECIMETER_PER_HOUR'    => array(array('' => '0.001', '/' => '3600'),            'dm³/h'),
-        'CUBIC_DECIMETER_PER_MINUTE'  => array(array('' => '0.001', '/' => '60'),              'dm³/m'),
-        'CUBIC_DECIMETER_PER_SECOND'  => array('0.001',                                      'dm³/s'),
-        'CUBIC_DEKAMETER_PER_DAY'     => array(array('' => '1000', '/' => '86400'),            'dam³/day'),
-        'CUBIC_DEKAMETER_PER_HOUR'    => array(array('' => '1000', '/' => '3600'),             'dam³/h'),
-        'CUBIC_DEKAMETER_PER_MINUTE'  => array(array('' => '1000', '/' => '60'),               'dam³/m'),
-        'CUBIC_DEKAMETER_PER_SECOND'  => array('1000',                                       'dam³/s'),
-        'CUBIC_FOOT_PER_DAY'          => array(array('' => '0.028316847', '/' => '86400'),     'ft³/day'),
-        'CUBIC_FOOT_PER_HOUR'         => array(array('' => '0.028316847', '/' => '3600'),      'ft³/h'),
-        'CUBIC_FOOT_PER_MINUTE'       => array(array('' => '0.028316847', '/' => '60'),        'ft³/m'),
-        'CUBIC_FOOT_PER_SECOND'       => array('0.028316847',                                'ft³/s'),
-        'CUBIC_INCH_PER_DAY'          => array(array('' => '0.028316847', '/' => '149299200'), 'in³/day'),
-        'CUBIC_INCH_PER_HOUR'         => array(array('' => '0.028316847', '/' => '6220800'),   'in³/h'),
-        'CUBIC_INCH_PER_MINUTE'       => array(array('' => '0.028316847', '/' => '103680'),    'in³/m'),
-        'CUBIC_INCH_PER_SECOND'       => array('0.028316847',                                'in³/s'),
-        'CUBIC_KILOMETER_PER_DAY'     => array(array('' => '1000000000', '/' => '86400'),      'km³/day'),
-        'CUBIC_KILOMETER_PER_HOUR'    => array(array('' => '1000000000', '/' => '3600'),       'km³/h'),
-        'CUBIC_KILOMETER_PER_MINUTE'  => array(array('' => '1000000000', '/' => '60'),         'km³/m'),
-        'CUBIC_KILOMETER_PER_SECOND'  => array('1000000000',                                 'km³/s'),
-        'CUBIC_METER_PER_DAY'         => array(array('' => '1', '/' => '86400'),               'm³/day'),
-        'CUBIC_METER_PER_HOUR'        => array(array('' => '1', '/' => '3600'),                'm³/h'),
-        'CUBIC_METER_PER_MINUTE'      => array(array('' => '1', '/' => '60'),                  'm³/m'),
-        'CUBIC_METER_PER_SECOND'      => array('1',                                          'm³/s'),
-        'CUBIC_MILE_PER_DAY'          => array(array('' => '4168181830', '/' => '86400'),      'mi³/day'),
-        'CUBIC_MILE_PER_HOUR'         => array(array('' => '4168181830', '/' => '3600'),       'mi³/h'),
-        'CUBIC_MILE_PER_MINUTE'       => array(array('' => '4168181830', '/' => '60'),         'mi³/m'),
-        'CUBIC_MILE_PER_SECOND'       => array('4168181830',                                 'mi³/s'),
-        'CUBIC_MILLIMETER_PER_DAY'    => array(array('' => '0.000000001', '/' => '86400'),     'mm³/day'),
-        'CUBIC_MILLIMETER_PER_HOUR'   => array(array('' => '0.000000001', '/' => '3600'),      'mm³/h'),
-        'CUBIC_MILLIMETER_PER_MINUTE' => array(array('' => '0.000000001', '/' => '60'),        'mm³/m'),
-        'CUBIC_MILLIMETER_PER_SECOND' => array('0.000000001',                                'mm³/s'),
-        'CUBIC_YARD_PER_DAY'          => array(array('' => '0.764554869', '/' => '86400'),     'yd³/day'),
-        'CUBIC_YARD_PER_HOUR'         => array(array('' => '0.764554869', '/' => '3600'),      'yd³/h'),
-        'CUBIC_YARD_PER_MINUTE'       => array(array('' => '0.764554869', '/' => '60'),        'yd³/m'),
-        'CUBIC_YARD_PER_SECOND'       => array('0.764554869',                                'yd³/s'),
-        'CUSEC'                       => array('0.028316847',                                'cusec'),
-        'DECILITER_PER_DAY'           => array(array('' => '0.0001', '/' => '86400'),          'dl/day'),
-        'DECILITER_PER_HOUR'          => array(array('' => '0.0001', '/' => '3600'),           'dl/h'),
-        'DECILITER_PER_MINUTE'        => array(array('' => '0.0001', '/' => '60'),             'dl/m'),
-        'DECILITER_PER_SECOND'        => array('0.0001',                                     'dl/s'),
-        'DEKALITER_PER_DAY'           => array(array('' => '0.01', '/' => '86400'),            'dal/day'),
-        'DEKALITER_PER_HOUR'          => array(array('' => '0.01', '/' => '3600'),             'dal/h'),
-        'DEKALITER_PER_MINUTE'        => array(array('' => '0.01', '/' => '60'),               'dal/m'),
-        'DEKALITER_PER_SECOND'        => array('0.01',                                       'dal/s'),
-        'GALLON_PER_DAY'              => array(array('' => '0.00454609', '/' => '86400'),      'gal/day'),
-        'GALLON_PER_HOUR'             => array(array('' => '0.00454609', '/' => '3600'),       'gal/h'),
-        'GALLON_PER_MINUTE'           => array(array('' => '0.00454609', '/' => '60'),         'gal/m'),
-        'GALLON_PER_SECOND'           => array('0.00454609',                                 'gal/s'),
-        'GALLON_US_PER_DAY'           => array(array('' => '0.0037854118', '/' => '86400'),    'gal/day'),
-        'GALLON_US_PER_HOUR'          => array(array('' => '0.0037854118', '/' => '3600'),     'gal/h'),
-        'GALLON_US_PER_MINUTE'        => array(array('' => '0.0037854118', '/' => '60'),       'gal/m'),
-        'GALLON_US_PER_SECOND'        => array('0.0037854118',                               'gal/s'),
-        'HECTARE_METER_PER_DAY'       => array(array('' => '10000', '/' => '86400'),           'ha m/day'),
-        'HECTARE_METER_PER_HOUR'      => array(array('' => '10000', '/' => '3600'),            'ha m/h'),
-        'HECTARE_METER_PER_MINUTE'    => array(array('' => '10000', '/' => '60'),              'ha m/m'),
-        'HECTARE_METER_PER_SECOND'    => array('10000',                                      'ha m/s'),
-        'HECTOLITER_PER_DAY'          => array(array('' => '0.1', '/' => '86400'),             'hl/day'),
-        'HECTOLITER_PER_HOUR'         => array(array('' => '0.1', '/' => '3600'),              'hl/h'),
-        'HECTOLITER_PER_MINUTE'       => array(array('' => '0.1', '/' => '60'),                'hl/m'),
-        'HECTOLITER_PER_SECOND'       => array('0.1',                                        'hl/s'),
-        'KILOLITER_PER_DAY'           => array(array('' => '1', '/' => '86400'),               'kl/day'),
-        'KILOLITER_PER_HOUR'          => array(array('' => '1', '/' => '3600'),                'kl/h'),
-        'KILOLITER_PER_MINUTE'        => array(array('' => '1', '/' => '60'),                  'kl/m'),
-        'KILOLITER_PER_SECOND'        => array('1',                                          'kl/s'),
-        'LAMBDA_PER_DAY'              => array(array('' => '0.000000001', '/' => '86400'),     'λ/day'),
-        'LAMBDA_PER_HOUR'             => array(array('' => '0.000000001', '/' => '3600'),      'λ/h'),
-        'LAMBDA_PER_MINUTE'           => array(array('' => '0.000000001', '/' => '60'),        'λ/m'),
-        'LAMBDA_PER_SECOND'           => array('0.000000001',                                'λ/s'),
-        'LITER_PER_DAY'               => array(array('' => '0.001', '/' => '86400'),           'l/day'),
-        'LITER_PER_HOUR'              => array(array('' => '0.001', '/' => '3600'),            'l/h'),
-        'LITER_PER_MINUTE'            => array(array('' => '0.001', '/' => '60'),              'l/m'),
-        'LITER_PER_SECOND'            => array('0.001',                                      'l/s'),
-        'MILLILITER_PER_DAY'          => array(array('' => '0.000001', '/' => '86400'),        'ml/day'),
-        'MILLILITER_PER_HOUR'         => array(array('' => '0.000001', '/' => '3600'),         'ml/h'),
-        'MILLILITER_PER_MINUTE'       => array(array('' => '0.000001', '/' => '60'),           'ml/m'),
-        'MILLILITER_PER_SECOND'       => array('0.000001',                                   'ml/s'),
-        'MILLION_ACRE_FOOT_PER_DAY'   => array(array('' => '1233481840', '/' => '86400'),      'million ac ft/day'),
-        'MILLION_ACRE_FOOT_PER_HOUR'  => array(array('' => '1233481840', '/' => '3600'),       'million ac ft/h'),
-        'MILLION_ACRE_FOOT_PER_MINUTE'  => array(array('' => '1233481840', '/' => '60'),       'million ac ft/m'),
-        'MILLION_ACRE_FOOT_PER_SECOND'  => array('1233481840',                               'million ac ft/s'),
-        'MILLION_CUBIC_FOOT_PER_DAY'    => array(array('' => '28316.847', '/' => '86400'),     'million ft³/day'),
-        'MILLION_CUBIC_FOOT_PER_HOUR'   => array(array('' => '28316.847', '/' => '3600'),      'million ft³/h'),
-        'MILLION_CUBIC_FOOT_PER_MINUTE' => array(array('' => '28316.847', '/' => '60'),        'million ft³/m'),
-        'MILLION_CUBIC_FOOT_PER_SECOND' => array('28316.847',                                'million ft³/s'),
-        'MILLION_GALLON_PER_DAY'      => array(array('' => '4546.09', '/' => '86400'),         'million gal/day'),
-        'MILLION_GALLON_PER_HOUR'     => array(array('' => '4546.09', '/' => '3600'),          'million gal/h'),
-        'MILLION_GALLON_PER_MINUTE'   => array(array('' => '4546.09', '/' => '60'),            'million gal/m'),
-        'MILLION_GALLON_PER_SECOND'   => array('4546.09',                                    'million gal/s'),
-        'MILLION_GALLON_US_PER_DAY'   => array(array('' => '3785.4118', '/' => '86400'),       'million gal/day'),
-        'MILLION_GALLON_US_PER_HOUR'  => array(array('' => '3785.4118', '/' => '3600'),        'million gal/h'),
-        'MILLION_GALLON_US_PER_MINUTE'=> array(array('' => '3785.4118', '/' => '60'),          'million gal/m'),
-        'MILLION_GALLON_US_PER_SECOND'=> array('3785.4118',                                  'million gal/s'),
-        'MINERS_INCH_AZ'              => array(array('' => '0.0424752705', '/' => '60'),       "miner's inch"),
-        'MINERS_INCH_CA'              => array(array('' => '0.0424752705', '/' => '60'),       "miner's inch"),
-        'MINERS_INCH_OR'              => array(array('' => '0.0424752705', '/' => '60'),       "miner's inch"),
-        'MINERS_INCH_CO'              => array(array('' => '0.0442450734375', '/' => '60'),    "miner's inch"),
-        'MINERS_INCH_ID'              => array(array('' => '0.0340687062', '/' => '60'),       "miner's inch"),
-        'MINERS_INCH_WA'              => array(array('' => '0.0340687062', '/' => '60'),       "miner's inch"),
-        'MINERS_INCH_NM'              => array(array('' => '0.0340687062', '/' => '60'),       "miner's inch"),
-        'OUNCE_PER_DAY'               => array(array('' => '0.00454609', '/' => '13824000'),   'oz/day'),
-        'OUNCE_PER_HOUR'              => array(array('' => '0.00454609', '/' => '576000'),     'oz/h'),
-        'OUNCE_PER_MINUTE'            => array(array('' => '0.00454609', '/' => '9600'),       'oz/m'),
-        'OUNCE_PER_SECOND'            => array(array('' => '0.00454609', '/' => '160'),        'oz/s'),
-        'OUNCE_US_PER_DAY'            => array(array('' => '0.0037854118', '/' => '11059200'), 'oz/day'),
-        'OUNCE_US_PER_HOUR'           => array(array('' => '0.0037854118', '/' => '460800'),   'oz/h'),
-        'OUNCE_US_PER_MINUTE'         => array(array('' => '0.0037854118', '/' => '7680'),     'oz/m'),
-        'OUNCE_US_PER_SECOND'         => array(array('' => '0.0037854118', '/' => '128'),      'oz/s'),
-        'PETROGRAD_STANDARD_PER_DAY'  => array(array('' => '4.672279755', '/' => '86400'),     'petrograd standard/day'),
-        'PETROGRAD_STANDARD_PER_HOUR' => array(array('' => '4.672279755', '/' => '3600'),      'petrograd standard/h'),
-        'PETROGRAD_STANDARD_PER_MINUTE' => array(array('' => '4.672279755', '/' => '60'),      'petrograd standard/m'),
-        'PETROGRAD_STANDARD_PER_SECOND' => array('4.672279755',                              'petrograd standard/s'),
-        'STERE_PER_DAY'               => array(array('' => '1', '/' => '86400'),               'st/day'),
-        'STERE_PER_HOUR'              => array(array('' => '1', '/' => '3600'),                'st/h'),
-        'STERE_PER_MINUTE'            => array(array('' => '1', '/' => '60'),                  'st/m'),
-        'STERE_PER_SECOND'            => array('1',                                          'st/s'),
-        'THOUSAND_CUBIC_FOOT_PER_DAY' => array(array('' => '28.316847', '/' => '86400'),       'thousand ft³/day'),
-        'THOUSAND_CUBIC_FOOT_PER_HOUR'   => array(array('' => '28.316847', '/' => '3600'),     'thousand ft³/h'),
-        'THOUSAND_CUBIC_FOOT_PER_MINUTE' => array(array('' => '28.316847', '/' => '60'),       'thousand ft³/m'),
-        'THOUSAND_CUBIC_FOOT_PER_SECOND' => array('28.316847',                               'thousand ft³/s'),
-        'TRILLION_CUBIC_FOOT_PER_DAY'    => array(array('' => '28316847000', '/' => '86400'),  'trillion ft³/day'),
-        'TRILLION_CUBIC_FOOT_PER_HOUR'   => array(array('' => '28316847000', '/' => '3600'),   'trillion ft³/h'),
-        'TRILLION_CUBIC_FOOT_PER_MINUTE' => array(array('' => '28316847000', '/' => '60'),     'trillion ft³/m'),
-        'TRILLION_CUBIC_FOOT_PER_'       => array('28316847000',                             'trillion ft³/s'),
-        'STANDARD'                    => 'CUBIC_METER_PER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Force.php b/airtime_mvc/library/Zend/Measure/Force.php
deleted file mode 100644
index 96f9f33b7..000000000
--- a/airtime_mvc/library/Zend/Measure/Force.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Force.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling force conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Force
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Force extends Zend_Measure_Abstract
-{
-    const STANDARD = 'NEWTON';
-
-    const ATTONEWTON      = 'ATTONEWTON';
-    const CENTINEWTON     = 'CENTINEWTON';
-    const DECIGRAM_FORCE  = 'DECIGRAM_FORCE';
-    const DECINEWTON      = 'DECINEWTON';
-    const DEKAGRAM_FORCE  = 'DEKAGRAM_FORCE';
-    const DEKANEWTON      = 'DEKANEWTON';
-    const DYNE            = 'DYNE';
-    const EXANEWTON       = 'EXANEWTON';
-    const FEMTONEWTON     = 'FEMTONEWTON';
-    const GIGANEWTON      = 'GIGANEWTON';
-    const GRAM_FORCE      = 'GRAM_FORCE';
-    const HECTONEWTON     = 'HECTONEWTON';
-    const JOULE_PER_METER = 'JOULE_PER_METER';
-    const KILOGRAM_FORCE  = 'KILOGRAM_FORCE';
-    const KILONEWTON      = 'KILONEWTON';
-    const KILOPOND        = 'KILOPOND';
-    const KIP             = 'KIP';
-    const MEGANEWTON      = 'MEGANEWTON';
-    const MEGAPOND        = 'MEGAPOND';
-    const MICRONEWTON     = 'MICRONEWTON';
-    const MILLINEWTON     = 'MILLINEWTON';
-    const NANONEWTON      = 'NANONEWTON';
-    const NEWTON          = 'NEWTON';
-    const OUNCE_FORCE     = 'OUNCE_FORCE';
-    const PETANEWTON      = 'PETANEWTON';
-    const PICONEWTON      = 'PICONEWTON';
-    const POND            = 'POND';
-    const POUND_FORCE     = 'POUND_FORCE';
-    const POUNDAL         = 'POUNDAL';
-    const STHENE          = 'STHENE';
-    const TERANEWTON      = 'TERANEWTON';
-    const TON_FORCE_LONG  = 'TON_FORCE_LONG';
-    const TON_FORCE       = 'TON_FORCE';
-    const TON_FORCE_SHORT = 'TON_FORCE_SHORT';
-    const YOCTONEWTON     = 'YOCTONEWTON';
-    const YOTTANEWTON     = 'YOTTANEWTON';
-    const ZEPTONEWTON     = 'ZEPTONEWTON';
-    const ZETTANEWTON     = 'ZETTANEWTON';
-
-    /**
-     * Calculations for all force units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ATTONEWTON'      => array('1.0e-18',     'aN'),
-        'CENTINEWTON'     => array('0.01',        'cN'),
-        'DECIGRAM_FORCE'  => array('0.000980665', 'dgf'),
-        'DECINEWTON'      => array('0.1',         'dN'),
-        'DEKAGRAM_FORCE'  => array('0.0980665',   'dagf'),
-        'DEKANEWTON'      => array('10',          'daN'),
-        'DYNE'            => array('0.00001',     'dyn'),
-        'EXANEWTON'       => array('1.0e+18',     'EN'),
-        'FEMTONEWTON'     => array('1.0e-15',     'fN'),
-        'GIGANEWTON'      => array('1.0e+9',      'GN'),
-        'GRAM_FORCE'      => array('0.00980665',  'gf'),
-        'HECTONEWTON'     => array('100',         'hN'),
-        'JOULE_PER_METER' => array('1',           'J/m'),
-        'KILOGRAM_FORCE'  => array('9.80665',     'kgf'),
-        'KILONEWTON'      => array('1000',        'kN'),
-        'KILOPOND'        => array('9.80665',     'kp'),
-        'KIP'             => array('4448.2216',   'kip'),
-        'MEGANEWTON'      => array('1000000',     'Mp'),
-        'MEGAPOND'        => array('9806.65',     'MN'),
-        'MICRONEWTON'     => array('0.000001',    'µN'),
-        'MILLINEWTON'     => array('0.001',       'mN'),
-        'NANONEWTON'      => array('0.000000001', 'nN'),
-        'NEWTON'          => array('1',           'N'),
-        'OUNCE_FORCE'     => array('0.27801385',  'ozf'),
-        'PETANEWTON'      => array('1.0e+15',     'PN'),
-        'PICONEWTON'      => array('1.0e-12',     'pN'),
-        'POND'            => array('0.00980665',  'pond'),
-        'POUND_FORCE'     => array('4.4482216',   'lbf'),
-        'POUNDAL'         => array('0.13825495',  'pdl'),
-        'STHENE'          => array('1000',        'sn'),
-        'TERANEWTON'      => array('1.0e+12',     'TN'),
-        'TON_FORCE_LONG'  => array('9964.016384', 'tnf'),
-        'TON_FORCE'       => array('9806.65',     'tnf'),
-        'TON_FORCE_SHORT' => array('8896.4432',   'tnf'),
-        'YOCTONEWTON'     => array('1.0e-24',     'yN'),
-        'YOTTANEWTON'     => array('1.0e+24',     'YN'),
-        'ZEPTONEWTON'     => array('1.0e-21',     'zN'),
-        'ZETTANEWTON'     => array('1.0e+21',     'ZN'),
-        'STANDARD'        => 'NEWTON'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Frequency.php b/airtime_mvc/library/Zend/Measure/Frequency.php
deleted file mode 100644
index b7327cdaf..000000000
--- a/airtime_mvc/library/Zend/Measure/Frequency.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Frequency.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling flow volume conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Frequency
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Frequency extends Zend_Measure_Abstract
-{
-    const STANDARD = 'HERTZ';
-
-    const ONE_PER_SECOND        = 'ONE_PER_SECOND';
-    const CYCLE_PER_SECOND      = 'CYCLE_PER_SECOND';
-    const DEGREE_PER_HOUR       = 'DEGREE_PER_HOUR';
-    const DEGREE_PER_MINUTE     = 'DEGREE_PER_MINUTE';
-    const DEGREE_PER_SECOND     = 'DEGREE_PER_SECOND';
-    const GIGAHERTZ             = 'GIGAHERTZ';
-    const HERTZ                 = 'HERTZ';
-    const KILOHERTZ             = 'KILOHERTZ';
-    const MEGAHERTZ             = 'MEGAHERTZ';
-    const MILLIHERTZ            = 'MILLIHERTZ';
-    const RADIAN_PER_HOUR       = 'RADIAN_PER_HOUR';
-    const RADIAN_PER_MINUTE     = 'RADIAN_PER_MINUTE';
-    const RADIAN_PER_SECOND     = 'RADIAN_PER_SECOND';
-    const REVOLUTION_PER_HOUR   = 'REVOLUTION_PER_HOUR';
-    const REVOLUTION_PER_MINUTE = 'REVOLUTION_PER_MINUTE';
-    const REVOLUTION_PER_SECOND = 'REVOLUTION_PER_SECOND';
-    const RPM                   = 'RPM';
-    const TERRAHERTZ            = 'TERRAHERTZ';
-
-    /**
-     * Calculations for all frequency units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ONE_PER_SECOND'        => array('1',             '1/s'),
-        'CYCLE_PER_SECOND'      => array('1',             'cps'),
-        'DEGREE_PER_HOUR'       => array(array('' => '1', '/' => '1296000'), '°/h'),
-        'DEGREE_PER_MINUTE'     => array(array('' => '1', '/' => '21600'),   '°/m'),
-        'DEGREE_PER_SECOND'     => array(array('' => '1', '/' => '360'),     '°/s'),
-        'GIGAHERTZ'             => array('1000000000',    'GHz'),
-        'HERTZ'                 => array('1',             'Hz'),
-        'KILOHERTZ'             => array('1000',          'kHz'),
-        'MEGAHERTZ'             => array('1000000',       'MHz'),
-        'MILLIHERTZ'            => array('0.001',         'mHz'),
-        'RADIAN_PER_HOUR'       => array(array('' => '1', '/' => '22619.467'), 'rad/h'),
-        'RADIAN_PER_MINUTE'     => array(array('' => '1', '/' => '376.99112'), 'rad/m'),
-        'RADIAN_PER_SECOND'     => array(array('' => '1', '/' => '6.2831853'), 'rad/s'),
-        'REVOLUTION_PER_HOUR'   => array(array('' => '1', '/' => '3600'), 'rph'),
-        'REVOLUTION_PER_MINUTE' => array(array('' => '1', '/' => '60'),   'rpm'),
-        'REVOLUTION_PER_SECOND' => array('1',             'rps'),
-        'RPM'                   => array(array('' => '1', '/' => '60'), 'rpm'),
-        'TERRAHERTZ'            => array('1000000000000', 'THz'),
-        'STANDARD'              =>'HERTZ'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Illumination.php b/airtime_mvc/library/Zend/Measure/Illumination.php
deleted file mode 100644
index 42409ae83..000000000
--- a/airtime_mvc/library/Zend/Measure/Illumination.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Illumination.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling illumination conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Illumination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Illumination extends Zend_Measure_Abstract
-{
-    const STANDARD = 'LUX';
-
-    const FOOTCANDLE                  = 'FOOTCANDLE';
-    const KILOLUX                     = 'KILOLUX';
-    const LUMEN_PER_SQUARE_CENTIMETER = 'LUMEN_PER_SQUARE_CENTIMETER';
-    const LUMEN_PER_SQUARE_FOOT       = 'LUMEN_PER_SQUARE_FOOT';
-    const LUMEN_PER_SQUARE_INCH       = 'LUMEN_PER_SQUARE_INCH';
-    const LUMEN_PER_SQUARE_METER      = 'LUMEN_PER_SQUARE_METER';
-    const LUX                         = 'LUX';
-    const METERCANDLE                 = 'METERCANDLE';
-    const MILLIPHOT                   = 'MILLIPHOT';
-    const NOX                         = 'NOX';
-    const PHOT                        = 'PHOT';
-
-    /**
-     * Calculations for all illumination units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'FOOTCANDLE'              => array('10.7639104',   'fc'),
-        'KILOLUX'                 => array('1000',         'klx'),
-        'LUMEN_PER_SQUARE_CENTIMETER' => array('10000',    'lm/cm²'),
-        'LUMEN_PER_SQUARE_FOOT'   => array('10.7639104',   'lm/ft²'),
-        'LUMEN_PER_SQUARE_INCH'   => array('1550.0030976', 'lm/in²'),
-        'LUMEN_PER_SQUARE_METER'  => array('1',            'lm/m²'),
-        'LUX'                     => array('1',            'lx'),
-        'METERCANDLE'             => array('1',            'metercandle'),
-        'MILLIPHOT'               => array('10',           'mph'),
-        'NOX'                     => array('0.001',        'nox'),
-        'PHOT'                    => array('10000',        'ph'),
-        'STANDARD'                => 'LUX'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Length.php b/airtime_mvc/library/Zend/Measure/Length.php
deleted file mode 100644
index 32e0ffbe1..000000000
--- a/airtime_mvc/library/Zend/Measure/Length.php
+++ /dev/null
@@ -1,674 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Length.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling length conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Length
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Length extends Zend_Measure_Abstract
-{
-    const STANDARD = 'METER';
-
-    const AGATE                 = 'AGATE';
-    const ALEN_DANISH           = 'ALEN_DANISH';
-    const ALEN                  = 'ALEN';
-    const ALEN_SWEDISH          = 'ALEN_SWEDISH';
-    const ANGSTROM              = 'ANGSTROM';
-    const ARMS                  = 'ARMS';
-    const ARPENT_CANADIAN       = 'ARPENT_CANADIAN';
-    const ARPENT                = 'ARPENT';
-    const ARSHEEN               = 'ARSHEEN';
-    const ARSHIN                = 'ARSHIN';
-    const ARSHIN_IRAQ           = 'ARSHIN_IRAQ';
-    const ASTRONOMICAL_UNIT     = 'ASTRONOMICAL_UNIT';
-    const ATTOMETER             = 'ATTOMETER';
-    const BAMBOO                = 'BAMBOO';
-    const BARLEYCORN            = 'BARLEYCORN';
-    const BEE_SPACE             = 'BEE_SPACE';
-    const BICRON                = 'BICRON';
-    const BLOCK_US_EAST         = 'BLOCK_US_EAST';
-    const BLOCK_US_WEST         = 'BLOCK_US_WEST';
-    const BLOCK_US_SOUTH        = 'BLOCK_US_SOUTH';
-    const BOHR                  = 'BOHR';
-    const BRACCIO               = 'BRACCIO';
-    const BRAZA_ARGENTINA       = 'BRAZA_ARGENTINA';
-    const BRAZA                 = 'BRAZA';
-    const BRAZA_US              = 'BRAZA_US';
-    const BUTTON                = 'BUTTON';
-    const CABLE_US              = 'CABLE_US';
-    const CABLE_UK              = 'CABLE_UK';
-    const CALIBER               = 'CALIBER';
-    const CANA                  = 'CANA';
-    const CAPE_FOOT             = 'CAPE_FOOT';
-    const CAPE_INCH             = 'CAPE_INCH';
-    const CAPE_ROOD             = 'CAPE_ROOD';
-    const CENTIMETER            = 'CENTIMETER';
-    const CHAIN                 = 'CHAIN';
-    const CHAIN_ENGINEER        = 'CHAIN_ENGINEER';
-    const CHIH                  = 'CHIH';
-    const CHINESE_FOOT          = 'CHINESE_FOOT';
-    const CHINESE_INCH          = 'CHINESE_INCH';
-    const CHINESE_MILE          = 'CHINESE_MILE';
-    const CHINESE_YARD          = 'CHINESE_YARD';
-    const CITY_BLOCK_US_EAST    = 'CITY_BLOCK_US_EAST';
-    const CITY_BLOCK_US_WEST    = 'CITY_BLOCK_US_WEST';
-    const CITY_BLOCK_US_SOUTH   = 'CITY_BLOCK_US_SOUTH';
-    const CLICK                 = 'CLICK';
-    const CUADRA                = 'CUADRA';
-    const CUADRA_ARGENTINA      = 'CUADRA_ARGENTINA';
-    const CUBIT_EGYPT           = 'Length:CUBIT_EGYPT';
-    const CUBIT_ROYAL           = 'CUBIT_ROYAL';
-    const CUBIT_UK              = 'CUBIT_UK';
-    const CUBIT                 = 'CUBIT';
-    const CUERDA                = 'CUERDA';
-    const DECIMETER             = 'DECIMETER';
-    const DEKAMETER             = 'DEKAMETER';
-    const DIDOT_POINT           = 'DIDOT_POINT';
-    const DIGIT                 = 'DIGIT';
-    const DIRAA                 = 'DIRAA';
-    const DONG                  = 'DONG';
-    const DOUZIEME_WATCH        = 'DOUZIEME_WATCH';
-    const DOUZIEME              = 'DOUZIEME';
-    const DRA_IRAQ              = 'DRA_IRAQ';
-    const DRA                   = 'DRA';
-    const EL                    = 'EL';
-    const ELL                   = 'ELL';
-    const ELL_SCOTTISH          = 'ELL_SCOTTISH';
-    const ELLE                  = 'ELLE';
-    const ELLE_VIENNA           = 'ELLE_VIENNA';
-    const EM                    = 'EM';
-    const ESTADIO_PORTUGAL      = 'ESTADIO_PORTUGAL';
-    const ESTADIO               = 'ESTADIO';
-    const EXAMETER              = 'EXAMETER';
-    const FADEN_AUSTRIA         = 'FADEN_AUSTRIA';
-    const FADEN                 = 'FADEN';
-    const FALL                  = 'FALL';
-    const FALL_SCOTTISH         = 'FALL_SCOTTISH';
-    const FATHOM                = 'FATHOM';
-    const FATHOM_ANCIENT        = 'FATHOM_ANCIENT';
-    const FAUST                 = 'FAUST';
-    const FEET_OLD_CANADIAN     = 'FEET_OLD_CANADIAN';
-    const FEET_EGYPT            = 'FEET_EGYPT';
-    const FEET_FRANCE           = 'FEET_FRANCE';
-    const FEET                  = 'FEET';
-    const FEET_IRAQ             = 'FEET_IRAQ';
-    const FEET_NETHERLAND       = 'FEET_NETHERLAND';
-    const FEET_ITALIC           = 'FEET_ITALIC';
-    const FEET_SURVEY           = 'FEET_SURVEY';
-    const FEMTOMETER            = 'FEMTOMETER';
-    const FERMI                 = 'FERMI';
-    const FINGER                = 'FINGER';
-    const FINGERBREADTH         = 'FINGERBREADTH';
-    const FIST                  = 'FIST';
-    const FOD                   = 'FOD';
-    const FOOT_EGYPT            = 'FOOT_EGYPT';
-    const FOOT_FRANCE           = 'FOOT_FRANCE';
-    const FOOT                  = 'FOOT';
-    const FOOT_IRAQ             = 'FOOT_IRAQ';
-    const FOOT_NETHERLAND       = 'FOOT_NETHERLAND';
-    const FOOT_ITALIC           = 'FOOT_ITALIC';
-    const FOOT_SURVEY           = 'FOOT_SURVEY';
-    const FOOTBALL_FIELD_CANADA = 'FOOTBALL_FIELD_CANADA';
-    const FOOTBALL_FIELD_US     = 'FOOTBALL_FIELD_US';
-    const FOOTBALL_FIELD        = 'FOOTBALL_FIELD';
-    const FURLONG               = 'FURLONG';
-    const FURLONG_SURVEY        = 'FURLONG_SURVEY';
-    const FUSS                  = 'FUSS';
-    const GIGAMETER             = 'GIGAMETER';
-    const GIGAPARSEC            = 'GIGAPARSEC';
-    const GNATS_EYE             = 'GNATS_EYE';
-    const GOAD                  = 'GOAD';
-    const GRY                   = 'GRY';
-    const HAIRS_BREADTH         = 'HAIRS_BREADTH';
-    const HAND                  = 'HAND';
-    const HANDBREADTH           = 'HANDBREADTH';
-    const HAT                   = 'HAT';
-    const HECTOMETER            = 'HECTOMETER';
-    const HEER                  = 'HEER';
-    const HIRO                  = 'HIRO';
-    const HUBBLE                = 'HUBBLE';
-    const HVAT                  = 'HVAT';
-    const INCH                  = 'INCH';
-    const IRON                  = 'IRON';
-    const KEN                   = 'KEN';
-    const KERAT                 = 'KERAT';
-    const KILOFOOT              = 'KILOFOOT';
-    const KILOMETER             = 'KILOMETER';
-    const KILOPARSEC            = 'KILOPARSEC';
-    const KILOYARD              = 'KILOYARD';
-    const KIND                  = 'KIND';
-    const KLAFTER               = 'KLAFTER';
-    const KLAFTER_SWISS         = 'KLAFTER_SWISS';
-    const KLICK                 = 'KLICK';
-    const KYU                   = 'KYU';
-    const LAP_ANCIENT           = 'LAP_ANCIENT';
-    const LAP                   = 'LAP';
-    const LAP_POOL              = 'LAP_POOL';
-    const LEAGUE_ANCIENT        = 'LEAGUE_ANCIENT';
-    const LEAGUE_NAUTIC         = 'LEAGUE_NAUTIC';
-    const LEAGUE_UK_NAUTIC      = 'LEAGUE_UK_NAUTIC';
-    const LEAGUE                = 'LEAGUE';
-    const LEAGUE_US             = 'LEAGUE_US';
-    const LEAP                  = 'LEAP';
-    const LEGOA                 = 'LEGOA';
-    const LEGUA                 = 'LEGUA';
-    const LEGUA_US              = 'LEGUA_US';
-    const LEGUA_SPAIN_OLD       = 'LEGUA_SPAIN_OLD';
-    const LEGUA_SPAIN           = 'LEGUA_SPAIN';
-    const LI_ANCIENT            = 'LI_ANCIENT';
-    const LI_IMPERIAL           = 'LI_IMPERIAL';
-    const LI                    = 'LI';
-    const LIEUE                 = 'LIEUE';
-    const LIEUE_METRIC          = 'LIEUE_METRIC';
-    const LIEUE_NAUTIC          = 'LIEUE_NAUTIC';
-    const LIGHT_SECOND          = 'LIGHT_SECOND';
-    const LIGHT_MINUTE          = 'LIGHT_MINUTE';
-    const LIGHT_HOUR            = 'LIGHT_HOUR';
-    const LIGHT_DAY             = 'LIGHT_DAY';
-    const LIGHT_YEAR            = 'LIGHT_YEAR';
-    const LIGNE                 = 'LIGNE';
-    const LIGNE_SWISS           = 'LIGNE_SWISS';
-    const LINE                  = 'LINE';
-    const LINE_SMALL            = 'LINE_SMALL';
-    const LINK                  = 'LINK';
-    const LINK_ENGINEER         = 'LINK_ENGINEER';
-    const LUG                   = 'LUG';
-    const LUG_GREAT             = 'LUG_GREAT';
-    const MARATHON              = 'MARATHON';
-    const MARK_TWAIN            = 'MARK_TWAIN';
-    const MEGAMETER             = 'MEGAMETER';
-    const MEGAPARSEC            = 'MEGAPARSEC';
-    const MEILE_AUSTRIAN        = 'MEILE_AUSTRIAN';
-    const MEILE                 = 'MEILE';
-    const MEILE_GERMAN          = 'MEILE_GERMAN';
-    const METER                 = 'METER';
-    const METRE                 = 'METRE';
-    const METRIC_MILE           = 'METRIC_MILE';
-    const METRIC_MILE_US        = 'METRIC_MILE_US';
-    const MICROINCH             = 'MICROINCH';
-    const MICROMETER            = 'MICROMETER';
-    const MICROMICRON           = 'MICROMICRON';
-    const MICRON                = 'MICRON';
-    const MIGLIO                = 'MIGLIO';
-    const MIIL                  = 'MIIL';
-    const MIIL_DENMARK          = 'MIIL_DENMARK';
-    const MIIL_SWEDISH          = 'MIIL_SWEDISH';
-    const MIL                   = 'MIL';
-    const MIL_SWEDISH           = 'MIL_SWEDISH';
-    const MILE_UK               = 'MILE_UK';
-    const MILE_IRISH            = 'MILE_IRISH';
-    const MILE                  = 'MILE';
-    const MILE_NAUTIC           = 'MILE_NAUTIC';
-    const MILE_NAUTIC_UK        = 'MILE_NAUTIC_UK';
-    const MILE_NAUTIC_US        = 'MILE_NAUTIC_US';
-    const MILE_ANCIENT          = 'MILE_ANCIENT';
-    const MILE_SCOTTISH         = 'MILE_SCOTTISH';
-    const MILE_STATUTE          = 'MILE_STATUTE';
-    const MILE_US               = 'MILE_US';
-    const MILHA                 = 'MILHA';
-    const MILITARY_PACE         = 'MILITARY_PACE';
-    const MILITARY_PACE_DOUBLE  = 'MILITARY_PACE_DOUBLE';
-    const MILLA                 = 'MILLA';
-    const MILLE                 = 'MILLE';
-    const MILLIARE              = 'MILLIARE';
-    const MILLIMETER            = 'MILLIMETER';
-    const MILLIMICRON           = 'MILLIMICRON';
-    const MKONO                 = 'MKONO';
-    const MOOT                  = 'MOOT';
-    const MYRIAMETER            = 'MYRIAMETER';
-    const NAIL                  = 'NAIL';
-    const NANOMETER             = 'NANOMETER';
-    const NANON                 = 'NANON';
-    const PACE                  = 'PACE';
-    const PACE_ROMAN            = 'PACE_ROMAN';
-    const PALM_DUTCH            = 'PALM_DUTCH';
-    const PALM_UK               = 'PALM_UK';
-    const PALM                  = 'PALM';
-    const PALMO_PORTUGUESE      = 'PALMO_PORTUGUESE';
-    const PALMO                 = 'PALMO';
-    const PALMO_US              = 'PALMO_US';
-    const PARASANG              = 'PARASANG';
-    const PARIS_FOOT            = 'PARIS_FOOT';
-    const PARSEC                = 'PARSEC';
-    const PE                    = 'PE';
-    const PEARL                 = 'PEARL';
-    const PERCH                 = 'PERCH';
-    const PERCH_IRELAND         = 'PERCH_IRELAND';
-    const PERTICA               = 'PERTICA';
-    const PES                   = 'PES';
-    const PETAMETER             = 'PETAMETER';
-    const PICA                  = 'PICA';
-    const PICOMETER             = 'PICOMETER';
-    const PIE_ARGENTINA         = 'PIE_ARGENTINA';
-    const PIE_ITALIC            = 'PIE_ITALIC';
-    const PIE                   = 'PIE';
-    const PIE_US                = 'PIE_US';
-    const PIED_DE_ROI           = 'PIED_DE_ROI';
-    const PIK                   = 'PIK';
-    const PIKE                  = 'PIKE';
-    const POINT_ADOBE           = 'POINT_ADOBE';
-    const POINT                 = 'POINT';
-    const POINT_DIDOT           = 'POINT_DIDOT';
-    const POINT_TEX             = 'POINT_TEX';
-    const POLE                  = 'POLE';
-    const POLEGADA              = 'POLEGADA';
-    const POUCE                 = 'POUCE';
-    const PU                    = 'PU';
-    const PULGADA               = 'PULGADA';
-    const PYGME                 = 'PYGME';
-    const Q                     = 'Q';
-    const QUADRANT              = 'QUADRANT';
-    const QUARTER               = 'QUARTER';
-    const QUARTER_CLOTH         = 'QUARTER_CLOTH';
-    const QUARTER_PRINT         = 'QUARTER_PRINT';
-    const RANGE                 = 'RANGE';
-    const REED                  = 'REED';
-    const RI                    = 'RI';
-    const RIDGE                 = 'RIDGE';
-    const RIVER                 = 'RIVER';
-    const ROD                   = 'ROD';
-    const ROD_SURVEY            = 'ROD_SURVEY';
-    const ROEDE                 = 'ROEDE';
-    const ROOD                  = 'ROOD';
-    const ROPE                  = 'ROPE';
-    const ROYAL_FOOT            = 'ROYAL_FOOT';
-    const RUTE                  = 'RUTE';
-    const SADZHEN               = 'SADZHEN';
-    const SAGENE                = 'SAGENE';
-    const SCOTS_FOOT            = 'SCOTS_FOOT';
-    const SCOTS_MILE            = 'SCOTS_MILE';
-    const SEEMEILE              = 'SEEMEILE';
-    const SHACKLE               = 'SHACKLE';
-    const SHAFTMENT             = 'SHAFTMENT';
-    const SHAFTMENT_ANCIENT     = 'SHAFTMENT_ANCIENT';
-    const SHAKU                 = 'SHAKU';
-    const SIRIOMETER            = 'SIRIOMETER';
-    const SMOOT                 = 'SMOOT';
-    const SPAN                  = 'SPAN';
-    const SPAT                  = 'SPAT';
-    const STADIUM               = 'STADIUM';
-    const STEP                  = 'STEP';
-    const STICK                 = 'STICK';
-    const STORY                 = 'STORY';
-    const STRIDE                = 'STRIDE';
-    const STRIDE_ROMAN          = 'STRIDE_ROMAN';
-    const TENTHMETER            = 'TENTHMETER';
-    const TERAMETER             = 'TERAMETER';
-    const THOU                  = 'THOU';
-    const TOISE                 = 'TOISE';
-    const TOWNSHIP              = 'TOWNSHIP';
-    const T_SUN                 = 'T_SUN';
-    const TU                    = 'TU';
-    const TWAIN                 = 'TWAIN';
-    const TWIP                  = 'TWIP';
-    const U                     = 'U';
-    const VARA_CALIFORNIA       = 'VARA_CALIFORNIA';
-    const VARA_MEXICAN          = 'VARA_MEXICAN';
-    const VARA_PORTUGUESE       = 'VARA_PORTUGUESE';
-    const VARA_AMERICA          = 'VARA_AMERICA';
-    const VARA                  = 'VARA';
-    const VARA_TEXAS            = 'VARA_TEXAS';
-    const VERGE                 = 'VERGE';
-    const VERSHOK               = 'VERSHOK';
-    const VERST                 = 'VERST';
-    const WAH                   = 'WAH';
-    const WERST                 = 'WERST';
-    const X_UNIT                = 'X_UNIT';
-    const YARD                  = 'YARD';
-    const YOCTOMETER            = 'YOCTOMETER';
-    const YOTTAMETER            = 'YOTTAMETER';
-    const ZEPTOMETER            = 'ZEPTOMETER';
-    const ZETTAMETER            = 'ZETTAMETER';
-    const ZOLL                  = 'ZOLL';
-    const ZOLL_SWISS            = 'ZOLL_SWISS';
-
-    /**
-     * Calculations for all length units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'AGATE'           => array(array('' => '0.0254', '/' => '72'), 'agate'),
-        'ALEN_DANISH'     => array('0.6277',           'alen'),
-        'ALEN'            => array('0.6',              'alen'),
-        'ALEN_SWEDISH'    => array('0.5938',           'alen'),
-        'ANGSTROM'        => array('1.0e-10',          'â„«'),
-        'ARMS'            => array('0.7',              'arms'),
-        'ARPENT_CANADIAN' => array('58.47',            'arpent'),
-        'ARPENT'          => array('58.471308',        'arpent'),
-        'ARSHEEN'         => array('0.7112',           'arsheen'),
-        'ARSHIN'          => array('1.04',             'arshin'),
-        'ARSHIN_IRAQ'     => array('74.5',             'arshin'),
-        'ASTRONOMICAL_UNIT' => array('149597870691',   'AU'),
-        'ATTOMETER'       => array('1.0e-18',          'am'),
-        'BAMBOO'          => array('3.2',              'bamboo'),
-        'BARLEYCORN'      => array('0.0085',           'barleycorn'),
-        'BEE_SPACE'       => array('0.0065',           'bee space'),
-        'BICRON'          => array('1.0e-12',          '��'),
-        'BLOCK_US_EAST'   => array('80.4672',          'block'),
-        'BLOCK_US_WEST'   => array('100.584',          'block'),
-        'BLOCK_US_SOUTH'  => array('160.9344',         'block'),
-        'BOHR'            => array('52.918e-12',       'a�'),
-        'BRACCIO'         => array('0.7',              'braccio'),
-        'BRAZA_ARGENTINA' => array('1.733',            'braza'),
-        'BRAZA'           => array('1.67',             'braza'),
-        'BRAZA_US'        => array('1.693',            'braza'),
-        'BUTTON'          => array('0.000635',         'button'),
-        'CABLE_US'        => array('219.456',          'cable'),
-        'CABLE_UK'        => array('185.3184',         'cable'),
-        'CALIBER'         => array('0.0254',           'cal'),
-        'CANA'            => array('2',                'cana'),
-        'CAPE_FOOT'       => array('0.314858',         'cf'),
-        'CAPE_INCH'       => array(array('' => '0.314858','/' => '12'), 'ci'),
-        'CAPE_ROOD'       => array('3.778296',         'cr'),
-        'CENTIMETER'      => array('0.01',             'cm'),
-        'CHAIN'           => array(array('' => '79200','/' => '3937'),  'ch'),
-        'CHAIN_ENGINEER'  => array('30.48',            'ch'),
-        'CHIH'            => array('0.35814',          "ch'ih"),
-        'CHINESE_FOOT'    => array('0.371475',         'ft'),
-        'CHINESE_INCH'    => array('0.0371475',        'in'),
-        'CHINESE_MILE'    => array('557.21',           'mi'),
-        'CHINESE_YARD'    => array('0.89154',          'yd'),
-        'CITY_BLOCK_US_EAST'  => array('80.4672',      'block'),
-        'CITY_BLOCK_US_WEST'  => array('100.584',      'block'),
-        'CITY_BLOCK_US_SOUTH' => array('160.9344',     'block'),
-        'CLICK'           => array('1000',             'click'),
-        'CUADRA'          => array('84',               'cuadra'),
-        'CUADRA_ARGENTINA'=> array('130',              'cuadra'),
-        'Length:CUBIT_EGYPT'      => array('0.45',             'cubit'),
-        'CUBIT_ROYAL'     => array('0.5235',           'cubit'),
-        'CUBIT_UK'        => array('0.4572',           'cubit'),
-        'CUBIT'           => array('0.444',            'cubit'),
-        'CUERDA'          => array('21',               'cda'),
-        'DECIMETER'       => array('0.1',              'dm'),
-        'DEKAMETER'       => array('10',               'dam'),
-        'DIDOT_POINT'     => array('0.000377',         'didot point'),
-        'DIGIT'           => array('0.019',            'digit'),
-        'DIRAA'           => array('0.58',             ''),
-        'DONG'            => array(array('' => '7','/' => '300'), 'dong'),
-        'DOUZIEME_WATCH'  => array('0.000188',         'douzi�me'),
-        'DOUZIEME'        => array('0.00017638888889', 'douzi�me'),
-        'DRA_IRAQ'        => array('0.745',            'dra'),
-        'DRA'             => array('0.7112',           'dra'),
-        'EL'              => array('0.69',             'el'),
-        'ELL'             => array('1.143',            'ell'),
-        'ELL_SCOTTISH'    => array('0.945',            'ell'),
-        'ELLE'            => array('0.6',              'ellen'),
-        'ELLE_VIENNA'     => array('0.7793',           'ellen'),
-        'EM'              => array('0.0042175176',     'em'),
-        'ESTADIO_PORTUGAL'=> array('261',              'estadio'),
-        'ESTADIO'         => array('174',              'estadio'),
-        'EXAMETER'        => array('1.0e+18',          'Em'),
-        'FADEN_AUSTRIA'   => array('1.8965',           'faden'),
-        'FADEN'           => array('1.8',              'faden'),
-        'FALL'            => array('6.858',            'fall'),
-        'FALL_SCOTTISH'   => array('5.67',             'fall'),
-        'FATHOM'          => array('1.8288',           'fth'),
-        'FATHOM_ANCIENT'  => array('1.829',            'fth'),
-        'FAUST'           => array('0.10536',          'faust'),
-        'FEET_OLD_CANADIAN' => array('0.325',          'ft'),
-        'FEET_EGYPT'      => array('0.36',             'ft'),
-        'FEET_FRANCE'     => array('0.3248406',        'ft'),
-        'FEET'            => array('0.3048',           'ft'),
-        'FEET_IRAQ'       => array('0.316',            'ft'),
-        'FEET_NETHERLAND' => array('0.28313',          'ft'),
-        'FEET_ITALIC'     => array('0.296',            'ft'),
-        'FEET_SURVEY'     => array(array('' => '1200', '/' => '3937'), 'ft'),
-        'FEMTOMETER'      => array('1.0e-15',          'fm'),
-        'FERMI'           => array('1.0e-15',          'f'),
-        'FINGER'          => array('0.1143',           'finger'),
-        'FINGERBREADTH'   => array('0.01905',          'fingerbreadth'),
-        'FIST'            => array('0.1',              'fist'),
-        'FOD'             => array('0.3141',           'fod'),
-        'FOOT_EGYPT'      => array('0.36',             'ft'),
-        'FOOT_FRANCE'     => array('0.3248406',        'ft'),
-        'FOOT'            => array('0.3048',           'ft'),
-        'FOOT_IRAQ'       => array('0.316',            'ft'),
-        'FOOT_NETHERLAND' => array('0.28313',          'ft'),
-        'FOOT_ITALIC'     => array('0.296',            'ft'),
-        'FOOT_SURVEY'     => array(array('' => '1200', '/' => '3937'), 'ft'),
-        'FOOTBALL_FIELD_CANADA' => array('100.584',    'football field'),
-        'FOOTBALL_FIELD_US'     => array('91.44',      'football field'),
-        'FOOTBALL_FIELD'  => array('109.728',          'football field'),
-        'FURLONG'         => array('201.168',          'fur'),
-        'FURLONG_SURVEY'  => array(array('' => '792000', '/' => '3937'), 'fur'),
-        'FUSS'            => array('0.31608',          'fuss'),
-        'GIGAMETER'       => array('1.0e+9',           'Gm'),
-        'GIGAPARSEC'      => array('30.85678e+24',     'Gpc'),
-        'GNATS_EYE'       => array('0.000125',         "gnat's eye"),
-        'GOAD'            => array('1.3716',           'goad'),
-        'GRY'             => array('0.000211667',      'gry'),
-        'HAIRS_BREADTH'   => array('0.0001',           "hair's breadth"),
-        'HAND'            => array('0.1016',           'hand'),
-        'HANDBREADTH'     => array('0.08',             "hand's breadth"),
-        'HAT'             => array('0.5',              'hat'),
-        'HECTOMETER'      => array('100',              'hm'),
-        'HEER'            => array('73.152',           'heer'),
-        'HIRO'            => array('1.818',            'hiro'),
-        'HUBBLE'          => array('9.4605e+24',       'hubble'),
-        'HVAT'            => array('1.8965',           'hvat'),
-        'INCH'            => array('0.0254',           'in'),
-        'IRON'            => array(array('' => '0.0254', '/' => '48'), 'iron'),
-        'KEN'             => array('1.818',            'ken'),
-        'KERAT'           => array('0.0286',           'kerat'),
-        'KILOFOOT'        => array('304.8',            'kft'),
-        'KILOMETER'       => array('1000',             'km'),
-        'KILOPARSEC'      => array('3.0856776e+19',    'kpc'),
-        'KILOYARD'        => array('914.4',            'kyd'),
-        'KIND'            => array('0.5',              'kind'),
-        'KLAFTER'         => array('1.8965',           'klafter'),
-        'KLAFTER_SWISS'   => array('1.8',              'klafter'),
-        'KLICK'           => array('1000',             'klick'),
-        'KYU'             => array('0.00025',          'kyu'),
-        'LAP_ANCIENT'     => array('402.336',          ''),
-        'LAP'             => array('400',              'lap'),
-        'LAP_POOL'        => array('100',              'lap'),
-        'LEAGUE_ANCIENT'  => array('2275',             'league'),
-        'LEAGUE_NAUTIC'   => array('5556',             'league'),
-        'LEAGUE_UK_NAUTIC'=> array('5559.552',         'league'),
-        'LEAGUE'          => array('4828',             'league'),
-        'LEAGUE_US'       => array('4828.0417',        'league'),
-        'LEAP'            => array('2.0574',           'leap'),
-        'LEGOA'           => array('6174.1',           'legoa'),
-        'LEGUA'           => array('4200',             'legua'),
-        'LEGUA_US'        => array('4233.4',           'legua'),
-        'LEGUA_SPAIN_OLD' => array('4179.4',           'legua'),
-        'LEGUA_SPAIN'     => array('6680',             'legua'),
-        'LI_ANCIENT'      => array('500',              'li'),
-        'LI_IMPERIAL'     => array('644.65',           'li'),
-        'LI'              => array('500',              'li'),
-        'LIEUE'           => array('3898',             'lieue'),
-        'LIEUE_METRIC'    => array('4000',             'lieue'),
-        'LIEUE_NAUTIC'    => array('5556',             'lieue'),
-        'LIGHT_SECOND'    => array('299792458',        'light second'),
-        'LIGHT_MINUTE'    => array('17987547480',      'light minute'),
-        'LIGHT_HOUR'      => array('1079252848800',    'light hour'),
-        'LIGHT_DAY'       => array('25902068371200',   'light day'),
-        'LIGHT_YEAR'      => array('9460528404879000', 'ly'),
-        'LIGNE'           => array('0.0021167',        'ligne'),
-        'LIGNE_SWISS'     => array('0.002256',         'ligne'),
-        'LINE'            => array('0.0021167',        'li'),
-        'LINE_SMALL'      => array('0.000635',         'li'),
-        'LINK'            => array(array('' => '792','/' => '3937'), 'link'),
-        'LINK_ENGINEER'   => array('0.3048',           'link'),
-        'LUG'             => array('5.0292',           'lug'),
-        'LUG_GREAT'       => array('6.4008',           'lug'),
-        'MARATHON'        => array('42194.988',        'marathon'),
-        'MARK_TWAIN'      => array('3.6576074',        'mark twain'),
-        'MEGAMETER'       => array('1000000',          'Mm'),
-        'MEGAPARSEC'      => array('3.085677e+22',     'Mpc'),
-        'MEILE_AUSTRIAN'  => array('7586',             'meile'),
-        'MEILE'           => array('7412.7',           'meile'),
-        'MEILE_GERMAN'    => array('7532.5',           'meile'),
-        'METER'           => array('1',                'm'),
-        'METRE'           => array('1',                'm'),
-        'METRIC_MILE'     => array('1500',             'metric mile'),
-        'METRIC_MILE_US'  => array('1600',             'metric mile'),
-        'MICROINCH'       => array('2.54e-08',         '�in'),
-        'MICROMETER'      => array('0.000001',         '�m'),
-        'MICROMICRON'     => array('1.0e-12',          '��'),
-        'MICRON'          => array('0.000001',         '�'),
-        'MIGLIO'          => array('1488.6',           'miglio'),
-        'MIIL'            => array('7500',             'miil'),
-        'MIIL_DENMARK'    => array('7532.5',           'miil'),
-        'MIIL_SWEDISH'    => array('10687',            'miil'),
-        'MIL'             => array('0.0000254',        'mil'),
-        'MIL_SWEDISH'     => array('10000',            'mil'),
-        'MILE_UK'         => array('1609',             'mi'),
-        'MILE_IRISH'      => array('2048',             'mi'),
-        'MILE'            => array('1609.344',         'mi'),
-        'MILE_NAUTIC'     => array('1852',             'mi'),
-        'MILE_NAUTIC_UK'  => array('1853.184',         'mi'),
-        'MILE_NAUTIC_US'  => array('1852',             'mi'),
-        'MILE_ANCIENT'    => array('1520',             'mi'),
-        'MILE_SCOTTISH'   => array('1814',             'mi'),
-        'MILE_STATUTE'    => array('1609.344',         'mi'),
-        'MILE_US'         => array(array('' => '6336000','/' => '3937'), 'mi'),
-        'MILHA'           => array('2087.3',           'milha'),
-        'MILITARY_PACE'   => array('0.762',            'mil. pace'),
-        'MILITARY_PACE_DOUBLE' => array('0.9144',      'mil. pace'),
-        'MILLA'           => array('1392',             'milla'),
-        'MILLE'           => array('1949',             'mille'),
-        'MILLIARE'        => array('0.001478',         'milliare'),
-        'MILLIMETER'      => array('0.001',            'mm'),
-        'MILLIMICRON'     => array('1.0e-9',           'm�'),
-        'MKONO'           => array('0.4572',           'mkono'),
-        'MOOT'            => array('0.0762',           'moot'),
-        'MYRIAMETER'      => array('10000',            'mym'),
-        'NAIL'            => array('0.05715',          'nail'),
-        'NANOMETER'       => array('1.0e-9',           'nm'),
-        'NANON'           => array('1.0e-9',           'nanon'),
-        'PACE'            => array('1.524',            'pace'),
-        'PACE_ROMAN'      => array('1.48',             'pace'),
-        'PALM_DUTCH'      => array('0.10',             'palm'),
-        'PALM_UK'         => array('0.075',            'palm'),
-        'PALM'            => array('0.2286',           'palm'),
-        'PALMO_PORTUGUESE'=> array('0.22',             'palmo'),
-        'PALMO'           => array('0.20',             'palmo'),
-        'PALMO_US'        => array('0.2117',           'palmo'),
-        'PARASANG'        => array('6000',             'parasang'),
-        'PARIS_FOOT'      => array('0.3248406',        'paris foot'),
-        'PARSEC'          => array('3.0856776e+16',    'pc'),
-        'PE'              => array('0.33324',          'p�'),
-        'PEARL'           => array('0.001757299',      'pearl'),
-        'PERCH'           => array('5.0292',           'perch'),
-        'PERCH_IRELAND'   => array('6.4008',           'perch'),
-        'PERTICA'         => array('2.96',             'pertica'),
-        'PES'             => array('0.2967',           'pes'),
-        'PETAMETER'       => array('1.0e+15',          'Pm'),
-        'PICA'            => array('0.0042175176',     'pi'),
-        'PICOMETER'       => array('1.0e-12',          'pm'),
-        'PIE_ARGENTINA'   => array('0.2889',           'pie'),
-        'PIE_ITALIC'      => array('0.298',            'pie'),
-        'PIE'             => array('0.2786',           'pie'),
-        'PIE_US'          => array('0.2822',           'pie'),
-        'PIED_DE_ROI'     => array('0.3248406',        'pied de roi'),
-        'PIK'             => array('0.71',             'pik'),
-        'PIKE'            => array('0.71',             'pike'),
-        'POINT_ADOBE'     => array(array('' => '0.3048', '/' => '864'), 'pt'),
-        'POINT'           => array('0.00035',          'pt'),
-        'POINT_DIDOT'     => array('0.000377',         'pt'),
-        'POINT_TEX'       => array('0.0003514598035',  'pt'),
-        'POLE'            => array('5.0292',           'pole'),
-        'POLEGADA'        => array('0.02777',          'polegada'),
-        'POUCE'           => array('0.02707',          'pouce'),
-        'PU'              => array('1.7907',           'pu'),
-        'PULGADA'         => array('0.02365',          'pulgada'),
-        'PYGME'           => array('0.346',            'pygme'),
-        'Q'               => array('0.00025',          'q'),
-        'QUADRANT'        => array('10001300',         'quad'),
-        'QUARTER'         => array('402.336',          'Q'),
-        'QUARTER_CLOTH'   => array('0.2286',           'Q'),
-        'QUARTER_PRINT'   => array('0.00025',          'Q'),
-        'RANGE'           => array(array('' => '38016000','/' => '3937'), 'range'),
-        'REED'            => array('2.679',            'reed'),
-        'RI'              => array('3927',             'ri'),
-        'RIDGE'           => array('6.1722',           'ridge'),
-        'RIVER'           => array('2000',             'river'),
-        'ROD'             => array('5.0292',           'rd'),
-        'ROD_SURVEY'      => array(array('' => '19800', '/' => '3937'), 'rd'),
-        'ROEDE'           => array('10',               'roede'),
-        'ROOD'            => array('3.7783',           'rood'),
-        'ROPE'            => array('3.7783',           'rope'),
-        'ROYAL_FOOT'      => array('0.3248406',        'royal foot'),
-        'RUTE'            => array('3.75',             'rute'),
-        'SADZHEN'         => array('2.1336',           'sadzhen'),
-        'SAGENE'          => array('2.1336',           'sagene'),
-        'SCOTS_FOOT'      => array('0.30645',          'scots foot'),
-        'SCOTS_MILE'      => array('1814.2',           'scots mile'),
-        'SEEMEILE'        => array('1852',             'seemeile'),
-        'SHACKLE'         => array('27.432',           'shackle'),
-        'SHAFTMENT'       => array('0.15124',          'shaftment'),
-        'SHAFTMENT_ANCIENT' => array('0.165',          'shaftment'),
-        'SHAKU'           => array('0.303',            'shaku'),
-        'SIRIOMETER'      => array('1.4959787e+17',    'siriometer'),
-        'SMOOT'           => array('1.7018',           'smoot'),
-        'SPAN'            => array('0.2286',           'span'),
-        'SPAT'            => array('1.0e+12',          'spat'),
-        'STADIUM'         => array('185',              'stadium'),
-        'STEP'            => array('0.762',            'step'),
-        'STICK'           => array('3.048',            'stk'),
-        'STORY'           => array('3.3',              'story'),
-        'STRIDE'          => array('1.524',            'stride'),
-        'STRIDE_ROMAN'    => array('1.48',             'stride'),
-        'TENTHMETER'      => array('1.0e-10',          'tenth-meter'),
-        'TERAMETER'       => array('1.0e+12',          'Tm'),
-        'THOU'            => array('0.0000254',        'thou'),
-        'TOISE'           => array('1.949',            'toise'),
-        'TOWNSHIP'        => array(array('' => '38016000','/' => '3937'), 'twp'),
-        'T_SUN'           => array('0.0358',           "t'sun"),
-        'TU'              => array('161130',           'tu'),
-        'TWAIN'           => array('3.6576074',        'twain'),
-        'TWIP'            => array('0.000017639',      'twip'),
-        'U'               => array('0.04445',          'U'),
-        'VARA_CALIFORNIA' => array('0.83820168',       'vara'),
-        'VARA_MEXICAN'    => array('0.83802',          'vara'),
-        'VARA_PORTUGUESE' => array('1.10',             'vara'),
-        'VARA_AMERICA'    => array('0.864',            'vara'),
-        'VARA'            => array('0.83587',          'vara'),
-        'VARA_TEXAS'      => array('0.84666836',       'vara'),
-        'VERGE'           => array('0.9144',           'verge'),
-        'VERSHOK'         => array('0.04445',          'vershok'),
-        'VERST'           => array('1066.8',           'verst'),
-        'WAH'             => array('2',                'wah'),
-        'WERST'           => array('1066.8',           'werst'),
-        'X_UNIT'          => array('1.0020722e-13',    'Xu'),
-        'YARD'            => array('0.9144',           'yd'),
-        'YOCTOMETER'      => array('1.0e-24',          'ym'),
-        'YOTTAMETER'      => array('1.0e+24',          'Ym'),
-        'ZEPTOMETER'      => array('1.0e-21',          'zm'),
-        'ZETTAMETER'      => array('1.0e+21',          'Zm'),
-        'ZOLL'            => array('0.02634',          'zoll'),
-        'ZOLL_SWISS'      => array('0.03',             'zoll'),
-        'STANDARD'        => 'METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Lightness.php b/airtime_mvc/library/Zend/Measure/Lightness.php
deleted file mode 100644
index 25b6ceea4..000000000
--- a/airtime_mvc/library/Zend/Measure/Lightness.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Lightness.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling temperature conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Lightness
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Lightness extends Zend_Measure_Abstract
-{
-    const STANDARD = 'CANDELA_PER_SQUARE_METER';
-
-    const APOSTILB                          = 'APOSTILB';
-    const BLONDEL                           = 'BLONDEL';
-    const CANDELA_PER_SQUARE_CENTIMETER     = 'CANDELA_PER_SQUARE_CENTIMETER';
-    const CANDELA_PER_SQUARE_FOOT           = 'CANDELA_PER_SQUARE_FOOT';
-    const CANDELA_PER_SQUARE_INCH           = 'CANDELA_PER_SQUARE_INCH';
-    const CANDELA_PER_SQUARE_METER          = 'CANDELA_PER_SQUARE_METER';
-    const FOOTLAMBERT                       = 'FOOTLAMBERT';
-    const KILOCANDELA_PER_SQUARE_CENTIMETER = 'KILOCANDELA_PER_SQUARE_CENTIMETER';
-    const KILOCANDELA_PER_SQUARE_FOOT       = 'KILOCANDELA_PER_SQUARE_FOOT';
-    const KILOCANDELA_PER_SQUARE_INCH       = 'KILOCANDELA_PER_SQUARE_INCH';
-    const KILOCANDELA_PER_SQUARE_METER      = 'KILOCANDELA_PER_SQUARE_METER';
-    const LAMBERT                           = 'LAMBERT';
-    const MILLILAMBERT                      = 'MILLILAMBERT';
-    const NIT                               = 'NIT';
-    const STILB                             = 'STILB';
-
-    /**
-     * Calculations for all lightness units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'APOSTILB'                      => array('0.31830989',   'asb'),
-        'BLONDEL'                       => array('0.31830989',   'blondel'),
-        'CANDELA_PER_SQUARE_CENTIMETER' => array('10000',        'cd/cm²'),
-        'CANDELA_PER_SQUARE_FOOT'       => array('10.76391',     'cd/ft²'),
-        'CANDELA_PER_SQUARE_INCH'       => array('1550.00304',   'cd/in²'),
-        'CANDELA_PER_SQUARE_METER'      => array('1',            'cd/m²'),
-        'FOOTLAMBERT'                   => array('3.4262591',    'ftL'),
-        'KILOCANDELA_PER_SQUARE_CENTIMETER' => array('10000000', 'kcd/cm²'),
-        'KILOCANDELA_PER_SQUARE_FOOT'   => array('10763.91',     'kcd/ft²'),
-        'KILOCANDELA_PER_SQUARE_INCH'   => array('1550003.04',   'kcd/in²'),
-        'KILOCANDELA_PER_SQUARE_METER'  => array('1000',         'kcd/m²'),
-        'LAMBERT'                       => array('3183.0989',    'L'),
-        'MILLILAMBERT'                  => array('3.1830989',    'mL'),
-        'NIT'                           => array('1',            'nt'),
-        'STILB'                         => array('10000',        'sb'),
-        'STANDARD'                      => 'CANDELA_PER_SQUARE_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Number.php b/airtime_mvc/library/Zend/Measure/Number.php
deleted file mode 100644
index 217f8abfb..000000000
--- a/airtime_mvc/library/Zend/Measure/Number.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Number.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling number conversions
- *
- * This class can only handle numbers without precision
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Number
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Number extends Zend_Measure_Abstract
-{
-    const STANDARD = 'DECIMAL';
-
-    const BINARY      = 'BINARY';
-    const TERNARY     = 'TERNARY';
-    const QUATERNARY  = 'QUATERNARY';
-    const QUINARY     = 'QUINARY';
-    const SENARY      = 'SENARY';
-    const SEPTENARY   = 'SEPTENARY';
-    const OCTAL       = 'OCTAL';
-    const NONARY      = 'NONARY';
-    const DECIMAL     = 'DECIMAL';
-    const DUODECIMAL  = 'DUODECIMAL';
-    const HEXADECIMAL = 'HEXADECIMAL';
-    const ROMAN       = 'ROMAN';
-
-    /**
-     * Calculations for all number units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'BINARY'      => array(2,  '⑵'),
-        'TERNARY'     => array(3,  '⑶'),
-        'QUATERNARY'  => array(4,  'â‘·'),
-        'QUINARY'     => array(5,  '⑸'),
-        'SENARY'      => array(6,  '⑹'),
-        'SEPTENARY'   => array(7,  '⑺'),
-        'OCTAL'       => array(8,  'â‘»'),
-        'NONARY'      => array(9,  '⑼'),
-        'DECIMAL'     => array(10, '⑽'),
-        'DUODECIMAL'  => array(12, 'â‘¿'),
-        'HEXADECIMAL' => array(16, 'â’ƒ'),
-        'ROMAN'       => array(99, ''),
-        'STANDARD'    => 'DECIMAL'
-    );
-
-    /**
-     * Definition of all roman signs
-     *
-     * @var array $_roman
-     */
-    private static $_roman = array(
-        'I' => 1,
-        'A' => 4,
-        'V' => 5,
-        'B' => 9,
-        'X' => 10,
-        'E' => 40,
-        'L' => 50,
-        'F' => 90,
-        'C' => 100,
-        'G' => 400,
-        'D' => 500,
-        'H' => 900,
-        'M' => 1000,
-        'J' => 4000,
-        'P' => 5000,
-        'K' => 9000,
-        'Q' => 10000,
-        'N' => 40000,
-        'R' => 50000,
-        'W' => 90000,
-        'S' => 100000,
-        'Y' => 400000,
-        'T' => 500000,
-        'Z' => 900000,
-        'U' => 1000000
-    );
-
-    /**
-     * Convertion table for roman signs
-     *
-     * @var array $_romanconvert
-     */
-    private static $_romanconvert = array(
-        '/_V/' => '/P/',
-        '/_X/' => '/Q/',
-        '/_L/' => '/R/',
-        '/_C/' => '/S/',
-        '/_D/' => '/T/',
-        '/_M/' => '/U/',
-        '/IV/' => '/A/',
-        '/IX/' => '/B/',
-        '/XL/' => '/E/',
-        '/XC/' => '/F/',
-        '/CD/' => '/G/',
-        '/CM/' => '/H/',
-        '/M_V/'=> '/J/',
-        '/MQ/' => '/K/',
-        '/QR/' => '/N/',
-        '/QS/' => '/W/',
-        '/ST/' => '/Y/',
-        '/SU/' => '/Z/'
-    );
-
-    /**
-     * Zend_Measure_Abstract is an abstract class for the different measurement types
-     *
-     * @param  integer            $value  Value
-     * @param  string             $type   (Optional) A Zend_Measure_Number Type
-     * @param  string|Zend_Locale $locale (Optional) A Zend_Locale
-     * @throws Zend_Measure_Exception When language is unknown
-     * @throws Zend_Measure_Exception When type is unknown
-     */
-    public function __construct($value, $type, $locale = null)
-    {
-        if (($type !== null) and (Zend_Locale::isLocale($type, null, false))) {
-            $locale = $type;
-            $type = null;
-        }
-
-        if ($locale === null) {
-            $locale = new Zend_Locale();
-        }
-
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, true, false)) {
-                require_once 'Zend/Measure/Exception.php';
-                throw new Zend_Measure_Exception("Language (" . (string) $locale . ") is unknown");
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        $this->_locale = (string) $locale;
-
-        if ($type === null) {
-            $type = $this->_units['STANDARD'];
-        }
-
-        if (isset($this->_units[$type]) === false) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception("Type ($type) is unknown");
-        }
-
-        $this->setValue($value, $type, $this->_locale);
-    }
-
-    /**
-     * Set a new value
-     *
-     * @param  integer            $value  Value
-     * @param  string             $type   (Optional) A Zend_Measure_Number Type
-     * @param  string|Zend_Locale $locale (Optional) A Zend_Locale Type
-     * @throws Zend_Measure_Exception
-     */
-    public function setValue($value, $type = null, $locale = null)
-    {
-        if (empty($locale)) {
-            $locale = $this->_locale;
-        }
-
-        if (empty($this->_units[$type])) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception('unknown type of number:' . $type);
-        }
-
-        switch($type) {
-            case 'BINARY':
-                preg_match('/[01]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'TERNARY':
-                preg_match('/[012]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'QUATERNARY':
-                preg_match('/[0123]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'QUINARY':
-                preg_match('/[01234]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'SENARY':
-                preg_match('/[012345]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'SEPTENARY':
-                preg_match('/[0123456]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'OCTAL':
-                preg_match('/[01234567]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'NONARY':
-                preg_match('/[012345678]+/', $value, $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'DUODECIMAL':
-                preg_match('/[0123456789AB]+/', strtoupper($value), $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'HEXADECIMAL':
-                preg_match('/[0123456789ABCDEF]+/', strtoupper($value), $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            case 'ROMAN':
-                preg_match('/[IVXLCDM_]+/', strtoupper($value), $ergebnis);
-                $value = $ergebnis[0];
-                break;
-
-            default:
-                try {
-                    $value = Zend_Locale_Format::getInteger($value, array('locale' => $locale));
-                } catch (Exception $e) {
-                    require_once 'Zend/Measure/Exception.php';
-                    throw new Zend_Measure_Exception($e->getMessage(), $e->getCode(), $e);
-                }
-                if (call_user_func(Zend_Locale_Math::$comp, $value, 0) < 0) {
-                    $value = call_user_func(Zend_Locale_Math::$sqrt, call_user_func(Zend_Locale_Math::$pow, $value, 2));
-                }
-                break;
-        }
-
-        $this->_value = $value;
-        $this->_type  = $type;
-    }
-
-    /**
-     * Convert input to decimal value string
-     *
-     * @param  integer $input Input string
-     * @param  string  $type  Type from which to convert to decimal
-     * @return string
-     */
-    private function _toDecimal($input, $type)
-    {
-        $value = '';
-        // Convert base xx values
-        if ($this->_units[$type][0] <= 16) {
-            $split  = str_split($input);
-            $length = strlen($input);
-            for ($x = 0; $x < $length; ++$x) {
-                $split[$x] = hexdec($split[$x]);
-                $value     = call_user_func(Zend_Locale_Math::$add, $value,
-                            call_user_func(Zend_Locale_Math::$mul, $split[$x],
-                            call_user_func(Zend_Locale_Math::$pow, $this->_units[$type][0], ($length - $x - 1))));
-            }
-        }
-
-        // Convert roman numbers
-        if ($type === 'ROMAN') {
-            $input = strtoupper($input);
-            $input = preg_replace(array_keys(self::$_romanconvert), array_values(self::$_romanconvert), $input);
-
-            $split = preg_split('//', strrev($input), -1, PREG_SPLIT_NO_EMPTY);
-
-            for ($x =0; $x < sizeof($split); $x++) {
-                if ($split[$x] == '/') {
-                    continue;
-                }
-
-                $num = self::$_roman[$split[$x]];
-                if (($x > 0 and ($split[$x-1] != '/') and ($num < self::$_roman[$split[$x-1]]))) {
-                    $num -= $num;
-                }
-
-                $value += $num;
-            }
-
-            str_replace('/', '', $value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Convert input to type value string
-     *
-     * @param  integer $value Input string
-     * @param  string  $type  Type to convert to
-     * @return string
-     * @throws Zend_Measure_Exception When more than 200 digits are calculated
-     */
-    private function _fromDecimal($value, $type)
-    {
-        $tempvalue = $value;
-        if ($this->_units[$type][0] <= 16) {
-            $newvalue = '';
-            $count    = 200;
-            $base     = $this->_units[$type][0];
-
-            while (call_user_func(Zend_Locale_Math::$comp, $value, 0, 25) <> 0) {
-                $target = call_user_func(Zend_Locale_Math::$mod, $value, $base);
-
-                $newvalue = strtoupper(dechex($target)) . $newvalue;
-
-                $value = call_user_func(Zend_Locale_Math::$sub, $value, $target, 0);
-                $value = call_user_func(Zend_Locale_Math::$div, $value, $base, 0);
-
-                --$count;
-                if ($count === 0) {
-                    require_once 'Zend/Measure/Exception.php';
-                    throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits");
-                }
-            }
-
-            if ($newvalue === '') {
-                $newvalue = '0';
-            }
-        }
-
-        if ($type === 'ROMAN') {
-            $i        = 0;
-            $newvalue = '';
-            $romanval = array_values(array_reverse(self::$_roman));
-            $romankey = array_keys(array_reverse(self::$_roman));
-            $count    = 200;
-            while (call_user_func(Zend_Locale_Math::$comp, $value, 0, 25) <> 0) {
-                while ($value >= $romanval[$i]) {
-                    $value    -= $romanval[$i];
-                    $newvalue .= $romankey[$i];
-
-                    if ($value < 1) {
-                        break;
-                    }
-
-                    --$count;
-                    if ($count === 0) {
-                        require_once 'Zend/Measure/Exception.php';
-                        throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits");
-                    }
-                }
-
-                $i++;
-            }
-
-            $newvalue = str_replace('/', '', preg_replace(array_values(self::$_romanconvert), array_keys(self::$_romanconvert), $newvalue));
-        }
-
-        return $newvalue;
-    }
-
-    /**
-     * Set a new type, and convert the value
-     *
-     * @param  string $type New type to set
-     * @throws Zend_Measure_Exception When a unknown type is given
-     * @return void
-     */
-    public function setType($type)
-    {
-        if (empty($this->_units[$type]) === true) {
-            require_once 'Zend/Measure/Exception.php';
-            throw new Zend_Measure_Exception('Unknown type of number:' . $type);
-        }
-
-        $value = $this->_toDecimal($this->getValue(-1), $this->getType(-1));
-        $value = $this->_fromDecimal($value, $type);
-
-        $this->_value = $value;
-        $this->_type  = $type;
-    }
-
-    /**
-     * Alias function for setType returning the converted unit
-     * Default is 0 as this class only handles numbers without precision
-     *
-     * @param  string  $type  Type to convert to
-     * @param  integer $round (Optional) Precision to add, will always be 0
-     * @return string
-     */
-    public function convertTo($type, $round = 0, $locale = null)
-    {
-        $this->setType($type);
-        return $this->toString($round, $locale);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Measure/Power.php b/airtime_mvc/library/Zend/Measure/Power.php
deleted file mode 100644
index 00f694ecb..000000000
--- a/airtime_mvc/library/Zend/Measure/Power.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Power.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling power conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Power
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Power extends Zend_Measure_Abstract
-{
-    const STANDARD = 'WATT';
-
-    const ATTOWATT                               = 'ATTOWATT';
-    const BTU_PER_HOUR                           = 'BTU_PER_HOUR';
-    const BTU_PER_MINUTE                         = 'BTU_PER_MINUTE';
-    const BTU_PER_SECOND                         = 'BTU_PER_SECOND';
-    const CALORIE_PER_HOUR                       = 'CALORIE_PER_HOUR';
-    const CALORIE_PER_MINUTE                     = 'CALORIE_PER_MINUTE';
-    const CALORIE_PER_SECOND                     = 'CALORIE_PER_SECOND';
-    const CENTIWATT                              = 'CENTIWATT';
-    const CHEVAL_VAPEUR                          = 'CHEVAL_VAPEUR';
-    const CLUSEC                                 = 'CLUSEC';
-    const DECIWATT                               = 'DECIWATT';
-    const DEKAWATT                               = 'DEKAWATT';
-    const DYNE_CENTIMETER_PER_HOUR               = 'DYNE_CENTIMETER_PER_HOUR';
-    const DYNE_CENTIMETER_PER_MINUTE             = 'DYNE_CENTIMETER_PER_MINUTE';
-    const DYNE_CENTIMETER_PER_SECOND             = 'DYNE_CENTIMETER_PER_SECOND';
-    const ERG_PER_HOUR                           = 'ERG_PER_HOUR';
-    const ERG_PER_MINUTE                         = 'ERG_PER_MINUTE';
-    const ERG_PER_SECOND                         = 'ERG_PER_SECOND';
-    const EXAWATT                                = 'EXAWATT';
-    const FEMTOWATT                              = 'FEMTOWATT';
-    const FOOT_POUND_FORCE_PER_HOUR              = 'FOOT_POUND_FORCE_PER_HOUR';
-    const FOOT_POUND_FORCE_PER_MINUTE            = 'FOOT_POUND_FORCE_PER_MINUTE';
-    const FOOT_POUND_FORCE_PER_SECOND            = 'FOOT_POUND_FORCE_PER_SECOND';
-    const FOOT_POUNDAL_PER_HOUR                  = 'FOOT_POUNDAL_PER_HOUR';
-    const FOOT_POUNDAL_PER_MINUTE                = 'FOOT_POUNDAL_PER_MINUTE';
-    const FOOT_POUNDAL_PER_SECOND                = 'FOOT_POUNDAL_PER_SECOND';
-    const GIGAWATT                               = 'GIGAWATT';
-    const GRAM_FORCE_CENTIMETER_PER_HOUR         = 'GRAM_FORCE_CENTIMETER_PER_HOUR';
-    const GRAM_FORCE_CENTIMETER_PER_MINUTE       = 'GRAM_FORCE_CENTIMETER_PER_MINUTE';
-    const GRAM_FORCE_CENTIMETER_PER_SECOND       = 'GRAM_FORCE_CENTIMETER_PER_SECOND';
-    const HECTOWATT                              = 'HECTOWATT';
-    const HORSEPOWER_INTERNATIONAL               = 'HORSEPOWER_INTERNATIONAL';
-    const HORSEPOWER_ELECTRIC                    = 'HORSEPOWER_ELECTRIC';
-    const HORSEPOWER                             = 'HORSEPOWER';
-    const HORSEPOWER_WATER                       = 'HORSEPOWER_WATER';
-    const INCH_OUNCE_FORCE_REVOLUTION_PER_MINUTE = 'INCH_OUNCH_FORCE_REVOLUTION_PER_MINUTE';
-    const JOULE_PER_HOUR                         = 'JOULE_PER_HOUR';
-    const JOULE_PER_MINUTE                       = 'JOULE_PER_MINUTE';
-    const JOULE_PER_SECOND                       = 'JOULE_PER_SECOND';
-    const KILOCALORIE_PER_HOUR                   = 'KILOCALORIE_PER_HOUR';
-    const KILOCALORIE_PER_MINUTE                 = 'KILOCALORIE_PER_MINUTE';
-    const KILOCALORIE_PER_SECOND                 = 'KILOCALORIE_PER_SECOND';
-    const KILOGRAM_FORCE_METER_PER_HOUR          = 'KILOGRAM_FORCE_METER_PER_HOUR';
-    const KILOGRAM_FORCE_METER_PER_MINUTE        = 'KILOGRAM_FORCE_METER_PER_MINUTE';
-    const KILOGRAM_FORCE_METER_PER_SECOND        = 'KILOGRAM_FORCE_METER_PER_SECOND';
-    const KILOPOND_METER_PER_HOUR                = 'KILOPOND_METER_PER_HOUR';
-    const KILOPOND_METER_PER_MINUTE              = 'KILOPOND_METER_PER_MINUTE';
-    const KILOPOND_METER_PER_SECOND              = 'KILOPOND_METER_PER_SECOND';
-    const KILOWATT                               = 'KILOWATT';
-    const MEGAWATT                               = 'MEGAWATT';
-    const MICROWATT                              = 'MICROWATT';
-    const MILLION_BTU_PER_HOUR                   = 'MILLION_BTU_PER_HOUR';
-    const MILLIWATT                              = 'MILLIWATT';
-    const NANOWATT                               = 'NANOWATT';
-    const NEWTON_METER_PER_HOUR                  = 'NEWTON_METER_PER_HOUR';
-    const NEWTON_METER_PER_MINUTE                = 'NEWTON_METER_PER_MINUTE';
-    const NEWTON_METER_PER_SECOND                = 'NEWTON_METER_PER_SECOND';
-    const PETAWATT                               = 'PETAWATT';
-    const PFERDESTAERKE                          = 'PFERDESTAERKE';
-    const PICOWATT                               = 'PICOWATT';
-    const PONCELET                               = 'PONCELET';
-    const POUND_SQUARE_FOOR_PER_CUBIC_SECOND     = 'POUND_SQUARE_FOOT_PER_CUBIC_SECOND';
-    const TERAWATT                               = 'TERAWATT';
-    const TON_OF_REFRIGERATION                   = 'TON_OF_REFRIGERATION';
-    const WATT                                   = 'WATT';
-    const YOCTOWATT                              = 'YOCTOWATT';
-    const YOTTAWATT                              = 'YOTTAWATT';
-    const ZEPTOWATT                              = 'ZEPTOWATT';
-    const ZETTAWATT                              = 'ZETTAWATT';
-
-    /**
-     * Calculations for all power units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ATTOWATT'                    => array('1.0e-18',           'aW'),
-        'BTU_PER_HOUR'                => array('0.29307197',        'BTU/h'),
-        'BTU_PER_MINUTE'              => array('17.5843182',        'BTU/m'),
-        'BTU_PER_SECOND'              => array('1055.059092',       'BTU/s'),
-        'CALORIE_PER_HOUR'            => array(array('' => '11630', '*' => '1.0e-7'),    'cal/h'),
-        'CALORIE_PER_MINUTE'          => array(array('' => '697800', '*' => '1.0e-7'),   'cal/m'),
-        'CALORIE_PER_SECOND'          => array(array('' => '41868000', '*' => '1.0e-7'), 'cal/s'),
-        'CENTIWATT'                   => array('0.01',              'cW'),
-        'CHEVAL_VAPEUR'               => array('735.49875',         'cv'),
-        'CLUSEC'                      => array('0.0000013332237',   'clusec'),
-        'DECIWATT'                    => array('0.1',               'dW'),
-        'DEKAWATT'                    => array('10',                'daW'),
-        'DYNE_CENTIMETER_PER_HOUR'    => array(array('' => '1.0e-7','/' => '3600'), 'dyn cm/h'),
-        'DYNE_CENTIMETER_PER_MINUTE'  => array(array('' => '1.0e-7','/' => '60'),   'dyn cm/m'),
-        'DYNE_CENTIMETER_PER_SECOND'  => array('1.0e-7',            'dyn cm/s'),
-        'ERG_PER_HOUR'                => array(array('' => '1.0e-7','/' => '3600'), 'erg/h'),
-        'ERG_PER_MINUTE'              => array(array('' => '1.0e-7','/' => '60'),   'erg/m'),
-        'ERG_PER_SECOND'              => array('1.0e-7',            'erg/s'),
-        'EXAWATT'                     => array('1.0e+18',           'EW'),
-        'FEMTOWATT'                   => array('1.0e-15',           'fW'),
-        'FOOT_POUND_FORCE_PER_HOUR'   => array(array('' => '1.3558179', '/' => '3600'), 'ft lb/h'),
-        'FOOT_POUND_FORCE_PER_MINUTE' => array(array('' => '1.3558179', '/' => '60'),   'ft lb/m'),
-        'FOOT_POUND_FORCE_PER_SECOND' => array('1.3558179',         'ft lb/s'),
-        'FOOT_POUNDAL_PER_HOUR'       => array(array('' => '0.04214011','/' => '3600'), 'ft pdl/h'),
-        'FOOT_POUNDAL_PER_MINUTE'     => array(array('' => '0.04214011', '/' => '60'),  'ft pdl/m'),
-        'FOOT_POUNDAL_PER_SECOND'     => array('0.04214011',        'ft pdl/s'),
-        'GIGAWATT'                    => array('1.0e+9',            'GW'),
-        'GRAM_FORCE_CENTIMETER_PER_HOUR' => array(array('' => '0.0000980665','/' => '3600'), 'gf cm/h'),
-        'GRAM_FORCE_CENTIMETER_PER_MINUTE' => array(array('' => '0.0000980665','/' => '60'), 'gf cm/m'),
-        'GRAM_FORCE_CENTIMETER_PER_SECOND' => array('0.0000980665', 'gf cm/s'),
-        'HECTOWATT'                   => array('100',               'hW'),
-        'HORSEPOWER_INTERNATIONAL'    => array('745.69987',         'hp'),
-        'HORSEPOWER_ELECTRIC'         => array('746',               'hp'),
-        'HORSEPOWER'                  => array('735.49875',         'hp'),
-        'HORSEPOWER_WATER'            => array('746.043',           'hp'),
-        'INCH_OUNCH_FORCE_REVOLUTION_PER_MINUTE' => array('0.00073948398',    'in ocf/m'),
-        'JOULE_PER_HOUR'              => array(array('' => '1', '/' => '3600'), 'J/h'),
-        'JOULE_PER_MINUTE'            => array(array('' => '1', '/' => '60'),   'J/m'),
-        'JOULE_PER_SECOND'            => array('1',                 'J/s'),
-        'KILOCALORIE_PER_HOUR'        => array('1.163',             'kcal/h'),
-        'KILOCALORIE_PER_MINUTE'      => array('69.78',             'kcal/m'),
-        'KILOCALORIE_PER_SECOND'      => array('4186.8',            'kcal/s'),
-        'KILOGRAM_FORCE_METER_PER_HOUR' => array(array('' => '9.80665', '/' => '3600'), 'kgf m/h'),
-        'KILOGRAM_FORCE_METER_PER_MINUTE' => array(array('' => '9.80665', '/' => '60'), 'kfg m/m'),
-        'KILOGRAM_FORCE_METER_PER_SECOND' => array('9.80665',       'kfg m/s'),
-        'KILOPOND_METER_PER_HOUR'     => array(array('' => '9.80665', '/' => '3600'), 'kp/h'),
-        'KILOPOND_METER_PER_MINUTE'   => array(array('' => '9.80665', '/' => '60'),   'kp/m'),
-        'KILOPOND_METER_PER_SECOND'   => array('9.80665',           'kp/s'),
-        'KILOWATT'                    => array('1000',              'kW'),
-        'MEGAWATT'                    => array('1000000',           'MW'),
-        'MICROWATT'                   => array('0.000001',          'µW'),
-        'MILLION_BTU_PER_HOUR'        => array('293071.07',         'mio BTU/h'),
-        'MILLIWATT'                   => array('0.001',             'mM'),
-        'NANOWATT'                    => array('1.0e-9',            'nN'),
-        'NEWTON_METER_PER_HOUR'       => array(array('' => '1', '/' => '3600'), 'Nm/h'),
-        'NEWTON_METER_PER_MINUTE'     => array(array('' => '1', '/' => '60'),   'Nm/m'),
-        'NEWTON_METER_PER_SECOND'     => array('1',                 'Nm/s'),
-        'PETAWATT'                    => array('1.0e+15',           'PW'),
-        'PFERDESTAERKE'               => array('735.49875',         'PS'),
-        'PICOWATT'                    => array('1.0e-12',           'pW'),
-        'PONCELET'                    => array('980.665',           'p'),
-        'POUND_SQUARE_FOOT_PER_CUBIC_SECOND' => array('0.04214011', 'lb ft²/s³'),
-        'TERAWATT'                    => array('1.0e+12',           'TW'),
-        'TON_OF_REFRIGERATION'        => array('3516.85284',        'RT'),
-        'WATT'                        => array('1',                 'W'),
-        'YOCTOWATT'                   => array('1.0e-24',           'yW'),
-        'YOTTAWATT'                   => array('1.0e+24',           'YW'),
-        'ZEPTOWATT'                   => array('1.0e-21',           'zW'),
-        'ZETTAWATT'                   => array('1.0e+21',           'ZW'),
-        'STANDARD'                    => 'WATT'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Pressure.php b/airtime_mvc/library/Zend/Measure/Pressure.php
deleted file mode 100644
index 45cbcef0a..000000000
--- a/airtime_mvc/library/Zend/Measure/Pressure.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Pressure.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling pressure conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Pressure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Pressure extends Zend_Measure_Abstract
-{
-    const STANDARD = 'NEWTON_PER_SQUARE_METER';
-
-    const ATMOSPHERE                           = 'ATMOSPHERE';
-    const ATMOSPHERE_TECHNICAL                 = 'ATMOSPHERE_TECHNICAL';
-    const ATTOBAR                              = 'ATTOBAR';
-    const ATTOPASCAL                           = 'ATTOPASCAL';
-    const BAR                                  = 'BAR';
-    const BARAD                                = 'BARAD';
-    const BARYE                                = 'BARYE';
-    const CENTIBAR                             = 'CENTIBAR';
-    const CENTIHG                              = 'CENTIHG';
-    const CENTIMETER_MERCURY_0C                = 'CENTIMETER_MERCURY_0C';
-    const CENTIMETER_WATER_4C                  = 'CENTIMETER_WATER_4C';
-    const CENTIPASCAL                          = 'CENTIPASCAL';
-    const CENTITORR                            = 'CENTITORR';
-    const DECIBAR                              = 'DECIBAR';
-    const DECIPASCAL                           = 'DECIPASCAL';
-    const DECITORR                             = 'DECITORR';
-    const DEKABAR                              = 'DEKABAR';
-    const DEKAPASCAL                           = 'DEKAPASCAL';
-    const DYNE_PER_SQUARE_CENTIMETER           = 'DYNE_PER_SQUARE_CENTIMETER';
-    const EXABAR                               = 'EXABAR';
-    const EXAPASCAL                            = 'EXAPASCAL';
-    const FEMTOBAR                             = 'FEMTOBAR';
-    const FEMTOPASCAL                          = 'FEMTOPASCAL';
-    const FOOT_AIR_0C                          = 'FOOT_AIR_0C';
-    const FOOT_AIR_15C                         = 'FOOT_AIR_15C';
-    const FOOT_HEAD                            = 'FOOT_HEAD';
-    const FOOT_MERCURY_0C                      = 'FOOT_MERCURY_0C';
-    const FOOT_WATER_4C                        = 'FOOT_WATER_4C';
-    const GIGABAR                              = 'GIGABAR';
-    const GIGAPASCAL                           = 'GIGAPASCAL';
-    const GRAM_FORCE_SQUARE_CENTIMETER         = 'GRAM_FORCE_SQUARE_CENTIMETER';
-    const HECTOBAR                             = 'HECTOBAR';
-    const HECTOPASCAL                          = 'HECTOPASCAL';
-    const INCH_AIR_0C                          = 'INCH_AIR_0C';
-    const INCH_AIR_15C                         = 'INCH_AIR_15C';
-    const INCH_MERCURY_0C                      = 'INCH_MERCURY_0C';
-    const INCH_WATER_4C                        = 'INCH_WATER_4C';
-    const KILOBAR                              = 'KILOBAR';
-    const KILOGRAM_FORCE_PER_SQUARE_CENTIMETER = 'KILOGRAM_FORCE_PER_SQUARE_CENTIMETER';
-    const KILOGRAM_FORCE_PER_SQUARE_METER      = 'KILOGRAM_FORCE_PER_SQUARE_METER';
-    const KILOGRAM_FORCE_PER_SQUARE_MILLIMETER = 'KILOGRAM_FORCE_PER_SQUARE_MILLIMETER';
-    const KILONEWTON_PER_SQUARE_METER          = 'KILONEWTON_PER_SQUARE_METER';
-    const KILOPASCAL                           = 'KILOPASCAL';
-    const KILOPOND_PER_SQUARE_CENTIMETER       = 'KILOPOND_PER_SQUARE_CENTIMETER';
-    const KILOPOND_PER_SQUARE_METER            = 'KILOPOND_PER_SQUARE_METER';
-    const KILOPOND_PER_SQUARE_MILLIMETER       = 'KILOPOND_PER_SQUARE_MILLIMETER';
-    const KIP_PER_SQUARE_FOOT                  = 'KIP_PER_SQUARE_FOOT';
-    const KIP_PER_SQUARE_INCH                  = 'KIP_PER_SQUARE_INCH';
-    const MEGABAR                              = 'MEGABAR';
-    const MEGANEWTON_PER_SQUARE_METER          = 'MEGANEWTON_PER_SQUARE_METER';
-    const MEGAPASCAL                           = 'MEGAPASCAL';
-    const METER_AIR_0C                         = 'METER_AIR_0C';
-    const METER_AIR_15C                        = 'METER_AIR_15C';
-    const METER_HEAD                           = 'METER_HEAD';
-    const MICROBAR                             = 'MICROBAR';
-    const MICROMETER_MERCURY_0C                = 'MICROMETER_MERCURY_0C';
-    const MICROMETER_WATER_4C                  = 'MICROMETER_WATER_4C';
-    const MICRON_MERCURY_0C                    = 'MICRON_MERCURY_0C';
-    const MICROPASCAL                          = 'MICROPASCAL';
-    const MILLIBAR                             = 'MILLIBAR';
-    const MILLIHG                              = 'MILLIHG';
-    const MILLIMETER_MERCURY_0C                = 'MILLIMETER_MERCURY_0C';
-    const MILLIMETER_WATER_4C                  = 'MILLIMETER_WATER_4C';
-    const MILLIPASCAL                          = 'MILLIPASCAL';
-    const MILLITORR                            = 'MILLITORR';
-    const NANOBAR                              = 'NANOBAR';
-    const NANOPASCAL                           = 'NANOPASCAL';
-    const NEWTON_PER_SQUARE_METER              = 'NEWTON_PER_SQUARE_METER';
-    const NEWTON_PER_SQUARE_MILLIMETER         = 'NEWTON_PER_SQUARE_MILLIMETER';
-    const OUNCE_PER_SQUARE_INCH                = 'OUNCE_PER_SQUARE_INCH';
-    const PASCAL                               = 'PASCAL';
-    const PETABAR                              = 'PETABAR';
-    const PETAPASCAL                           = 'PETAPASCAL';
-    const PICOBAR                              = 'PICOBAR';
-    const PICOPASCAL                           = 'PICOPASCAL';
-    const PIEZE                                = 'PIEZE';
-    const POUND_PER_SQUARE_FOOT                = 'POUND_PER_SQUARE_FOOT';
-    const POUND_PER_SQUARE_INCH                = 'POUND_PER_SQUARE_INCH';
-    const POUNDAL_PER_SQUARE_FOOT              = 'POUNDAL_PER_SQUARE_FOOT';
-    const STHENE_PER_SQUARE_METER              = 'STHENE_PER_SQUARE_METER';
-    const TECHNICAL_ATMOSPHERE                 = 'TECHNICAL_ATMOSPHERE';
-    const TERABAR                              = 'TERABAR';
-    const TERAPASCAL                           = 'TERAPASCAL';
-    const TON_PER_SQUARE_FOOT                  = 'TON_PER_SQUARE_FOOT';
-    const TON_PER_SQUARE_FOOT_SHORT            = 'TON_PER_SQUARE_FOOT_SHORT';
-    const TON_PER_SQUARE_INCH                  = 'TON_PER_SQUARE_INCH';
-    const TON_PER_SQUARE_INCH_SHORT            = 'TON_PER_SQUARE_INCH_SHORT';
-    const TON_PER_SQUARE_METER                 = 'TON_PER_SQUARE_METER';
-    const TORR                                 = 'TORR';
-    const WATER_COLUMN_CENTIMETER              = 'WATER_COLUMN_CENTIMETER';
-    const WATER_COLUMN_INCH                    = 'WATER_COLUMN_INCH';
-    const WATER_COLUMN_MILLIMETER              = 'WATER_COLUMN_MILLIMETER';
-    const YOCTOBAR                             = 'YOCTOBAR';
-    const YOCTOPASCAL                          = 'YOCTOPASCAL';
-    const YOTTABAR                             = 'YOTTABAR';
-    const YOTTAPASCAL                          = 'YOTTAPASCAL';
-    const ZEPTOBAR                             = 'ZEPTOBAR';
-    const ZEPTOPASCAL                          = 'ZEPTOPASCAL';
-    const ZETTABAR                             = 'ZETTABAR';
-    const ZETTAPASCAL                          = 'ZETTAPASCAL';
-
-    /**
-     * Calculations for all pressure units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ATMOSPHERE'            => array('101325.01', 'atm'),
-        'ATMOSPHERE_TECHNICAL'  => array('98066.5',   'atm'),
-        'ATTOBAR'               => array('1.0e-13',   'ab'),
-        'ATTOPASCAL'            => array('1.0e-18',   'aPa'),
-        'BAR'                   => array('100000',    'b'),
-        'BARAD'                 => array('0.1',       'barad'),
-        'BARYE'                 => array('0.1',       'ba'),
-        'CENTIBAR'              => array('1000',      'cb'),
-        'CENTIHG'               => array('1333.2239', 'cHg'),
-        'CENTIMETER_MERCURY_0C' => array('1333.2239', 'cm mercury (0°C)'),
-        'CENTIMETER_WATER_4C'   => array('98.0665',   'cm water (4°C)'),
-        'CENTIPASCAL'           => array('0.01',      'cPa'),
-        'CENTITORR'             => array('1.3332237', 'cTorr'),
-        'DECIBAR'               => array('10000',     'db'),
-        'DECIPASCAL'            => array('0.1',       'dPa'),
-        'DECITORR'              => array('13.332237', 'dTorr'),
-        'DEKABAR'               => array('1000000',   'dab'),
-        'DEKAPASCAL'            => array('10',        'daPa'),
-        'DYNE_PER_SQUARE_CENTIMETER' => array('0.1',  'dyn/cm²'),
-        'EXABAR'                => array('1.0e+23',   'Eb'),
-        'EXAPASCAL'             => array('1.0e+18',   'EPa'),
-        'FEMTOBAR'              => array('1.0e-10',   'fb'),
-        'FEMTOPASCAL'           => array('1.0e-15',   'fPa'),
-        'FOOT_AIR_0C'           => array('3.8640888', 'ft air (0°C)'),
-        'FOOT_AIR_15C'          => array('3.6622931', 'ft air (15°C)'),
-        'FOOT_HEAD'             => array('2989.0669', 'ft head'),
-        'FOOT_MERCURY_0C'       => array('40636.664', 'ft mercury (0°C)'),
-        'FOOT_WATER_4C'         => array('2989.0669', 'ft water (4°C)'),
-        'GIGABAR'               => array('1.0e+14',   'Gb'),
-        'GIGAPASCAL'            => array('1.0e+9',    'GPa'),
-        'GRAM_FORCE_SQUARE_CENTIMETER' => array('98.0665', 'gf'),
-        'HECTOBAR'              => array('1.0e+7',    'hb'),
-        'HECTOPASCAL'           => array('100',       'hPa'),
-        'INCH_AIR_0C'           => array(array('' => '3.8640888', '/' => '12'), 'in air (0°C)'),
-        'INCH_AIR_15C'          => array(array('' => '3.6622931', '/' => '12'), 'in air (15°C)'),
-        'INCH_MERCURY_0C'       => array(array('' => '40636.664', '/' => '12'), 'in mercury (0°C)'),
-        'INCH_WATER_4C'         => array(array('' => '2989.0669', '/' => '12'), 'in water (4°C)'),
-        'KILOBAR'               => array('1.0e+8',    'kb'),
-        'KILOGRAM_FORCE_PER_SQUARE_CENTIMETER' => array('98066.5', 'kgf/cm²'),
-        'KILOGRAM_FORCE_PER_SQUARE_METER'      => array('9.80665', 'kgf/m²'),
-        'KILOGRAM_FORCE_PER_SQUARE_MILLIMETER' => array('9806650', 'kgf/mm²'),
-        'KILONEWTON_PER_SQUARE_METER'          => array('1000',    'kN/m²'),
-        'KILOPASCAL'            => array('1000',      'kPa'),
-        'KILOPOND_PER_SQUARE_CENTIMETER' => array('98066.5', 'kp/cm²'),
-        'KILOPOND_PER_SQUARE_METER'      => array('9.80665', 'kp/m²'),
-        'KILOPOND_PER_SQUARE_MILLIMETER' => array('9806650', 'kp/mm²'),
-        'KIP_PER_SQUARE_FOOT'   => array(array('' => '430.92233', '/' => '0.009'),   'kip/ft²'),
-        'KIP_PER_SQUARE_INCH'   => array(array('' => '62052.81552', '/' => '0.009'), 'kip/in²'),
-        'MEGABAR'               => array('1.0e+11',    'Mb'),
-        'MEGANEWTON_PER_SQUARE_METER' => array('1000000', 'MN/m²'),
-        'MEGAPASCAL'            => array('1000000',    'MPa'),
-        'METER_AIR_0C'          => array('12.677457',  'm air (0°C)'),
-        'METER_AIR_15C'         => array('12.015397',  'm air (15°C)'),
-        'METER_HEAD'            => array('9804.139432', 'm head'),
-        'MICROBAR'              => array('0.1',        'µb'),
-        'MICROMETER_MERCURY_0C' => array('0.13332239', 'µm mercury (0°C)'),
-        'MICROMETER_WATER_4C'   => array('0.00980665', 'µm water (4°C)'),
-        'MICRON_MERCURY_0C'     => array('0.13332239', 'µ mercury (0°C)'),
-        'MICROPASCAL'           => array('0.000001',   'µPa'),
-        'MILLIBAR'              => array('100',        'mb'),
-        'MILLIHG'               => array('133.32239',  'mHg'),
-        'MILLIMETER_MERCURY_0C' => array('133.32239',  'mm mercury (0°C)'),
-        'MILLIMETER_WATER_4C'   => array('9.80665',    'mm water (0°C)'),
-        'MILLIPASCAL'           => array('0.001',      'mPa'),
-        'MILLITORR'             => array('0.13332237', 'mTorr'),
-        'NANOBAR'               => array('0.0001',     'nb'),
-        'NANOPASCAL'            => array('1.0e-9',     'nPa'),
-        'NEWTON_PER_SQUARE_METER'      => array('1',   'N/m²'),
-        'NEWTON_PER_SQUARE_MILLIMETER' => array('1000000',   'N/mm²'),
-        'OUNCE_PER_SQUARE_INCH'        => array('430.92233', 'oz/in²'),
-        'PASCAL'                => array('1',          'Pa'),
-        'PETABAR'               => array('1.0e+20',    'Pb'),
-        'PETAPASCAL'            => array('1.0e+15',    'PPa'),
-        'PICOBAR'               => array('0.0000001',  'pb'),
-        'PICOPASCAL'            => array('1.0e-12',    'pPa'),
-        'PIEZE'                 => array('1000',       'pz'),
-        'POUND_PER_SQUARE_FOOT' => array(array('' => '430.92233', '/' => '9'), 'lb/ft²'),
-        'POUND_PER_SQUARE_INCH' => array('6894.75728', 'lb/in²'),
-        'POUNDAL_PER_SQUARE_FOOT' => array('1.4881639', 'pdl/ft²'),
-        'STHENE_PER_SQUARE_METER' => array('1000',     'sn/m²'),
-        'TECHNICAL_ATMOSPHERE'  => array('98066.5',    'at'),
-        'TERABAR'               => array('1.0e+17',    'Tb'),
-        'TERAPASCAL'            => array('1.0e+12',    'TPa'),
-        'TON_PER_SQUARE_FOOT'   => array(array('' => '120658.2524', '/' => '1.125'),      't/ft²'),
-        'TON_PER_SQUARE_FOOT_SHORT' => array(array('' => '430.92233', '/' => '0.0045'),   't/ft²'),
-        'TON_PER_SQUARE_INCH'   => array(array('' => '17374788.3456', '/' => '1.125'),    't/in²'),
-        'TON_PER_SQUARE_INCH_SHORT' => array(array('' => '62052.81552', '/' => '0.0045'), 't/in²'),
-        'TON_PER_SQUARE_METER'  => array('9806.65',    't/m²'),
-        'TORR'                  => array('133.32237',  'Torr'),
-        'WATER_COLUMN_CENTIMETER' => array('98.0665',  'WC (cm)'),
-        'WATER_COLUMN_INCH'       => array(array('' => '2989.0669', '/' => '12'), 'WC (in)'),
-        'WATER_COLUMN_MILLIMETER' => array('9.80665',  'WC (mm)'),
-        'YOCTOBAR'              => array('1.0e-19',    'yb'),
-        'YOCTOPASCAL'           => array('1.0e-24',    'yPa'),
-        'YOTTABAR'              => array('1.0e+29',    'Yb'),
-        'YOTTAPASCAL'           => array('1.0e+24',    'YPa'),
-        'ZEPTOBAR'              => array('1.0e-16',    'zb'),
-        'ZEPTOPASCAL'           => array('1.0e-21',    'zPa'),
-        'ZETTABAR'              => array('1.0e+26',    'Zb'),
-        'ZETTAPASCAL'           => array('1.0e+21',    'ZPa'),
-        'STANDARD'              => 'NEWTON_PER_SQUARE_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Speed.php b/airtime_mvc/library/Zend/Measure/Speed.php
deleted file mode 100644
index 40c15e264..000000000
--- a/airtime_mvc/library/Zend/Measure/Speed.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Speed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling speed conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Speed
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Speed extends Zend_Measure_Abstract
-{
-    const STANDARD = 'METER_PER_SECOND';
-
-    const BENZ                           = 'BENZ';
-    const CENTIMETER_PER_DAY             = 'CENTIMETER_PER_DAY';
-    const CENTIMETER_PER_HOUR            = 'CENTIMETER_PER_HOUR';
-    const CENTIMETER_PER_MINUTE          = 'CENTIMETER_PER_MINUTE';
-    const CENTIMETER_PER_SECOND          = 'CENTIMETER_PER_SECOND';
-    const DEKAMETER_PER_DAY              = 'DEKAMETER_PER_DAY';
-    const DEKAMETER_PER_HOUR             = 'DEKAMETER_PER_HOUR';
-    const DEKAMETER_PER_MINUTE           = 'DEKAMETER_PER_MINUTE';
-    const DEKAMETER_PER_SECOND           = 'DEKAMETER_PER_SECOND';
-    const FOOT_PER_DAY                   = 'FOOT_PER_DAY';
-    const FOOT_PER_HOUR                  = 'FOOT_PER_HOUR';
-    const FOOT_PER_MINUTE                = 'FOOT_PER_MINUTE';
-    const FOOT_PER_SECOND                = 'FOOT_PER_SECOND';
-    const FURLONG_PER_DAY                = 'FURLONG_PER_DAY';
-    const FURLONG_PER_FORTNIGHT          = 'FURLONG_PER_FORTNIGHT';
-    const FURLONG_PER_HOUR               = 'FURLONG_PER_HOUR';
-    const FURLONG_PER_MINUTE             = 'FURLONG_PER_MINUTE';
-    const FURLONG_PER_SECOND             = 'FURLONG_PER_SECOND';
-    const HECTOMETER_PER_DAY             = 'HECTOMETER_PER_DAY';
-    const HECTOMETER_PER_HOUR            = 'HECTOMETER_PER_HOUR';
-    const HECTOMETER_PER_MINUTE          = 'HECTOMETER_PER_MINUTE';
-    const HECTOMETER_PER_SECOND          = 'HECTOMETER_PER_SECOND';
-    const INCH_PER_DAY                   = 'INCH_PER_DAY';
-    const INCH_PER_HOUR                  = 'INCH_PER_HOUR';
-    const INCH_PER_MINUTE                = 'INCH_PER_MINUTE';
-    const INCH_PER_SECOND                = 'INCH_PER_SECOND';
-    const KILOMETER_PER_DAY              = 'KILOMETER_PER_DAY';
-    const KILOMETER_PER_HOUR             = 'KILOMETER_PER_HOUR';
-    const KILOMETER_PER_MINUTE           = 'KILOMETER_PER_MINUTE';
-    const KILOMETER_PER_SECOND           = 'KILOMETER_PER_SECOND';
-    const KNOT                           = 'KNOT';
-    const LEAGUE_PER_DAY                 = 'LEAGUE_PER_DAY';
-    const LEAGUE_PER_HOUR                = 'LEAGUE_PER_HOUR';
-    const LEAGUE_PER_MINUTE              = 'LEAGUE_PER_MINUTE';
-    const LEAGUE_PER_SECOND              = 'LEAGUE_PER_SECOND';
-    const MACH                           = 'MACH';
-    const MEGAMETER_PER_DAY              = 'MEGAMETER_PER_DAY';
-    const MEGAMETER_PER_HOUR             = 'MEGAMETER_PER_HOUR';
-    const MEGAMETER_PER_MINUTE           = 'MEGAMETER_PER_MINUTE';
-    const MEGAMETER_PER_SECOND           = 'MEGAMETER_PER_SECOND';
-    const METER_PER_DAY                  = 'METER_PER_DAY';
-    const METER_PER_HOUR                 = 'METER_PER_HOUR';
-    const METER_PER_MINUTE               = 'METER_PER_MINUTE';
-    const METER_PER_SECOND               = 'METER_PER_SECOND';
-    const MILE_PER_DAY                   = 'MILE_PER_DAY';
-    const MILE_PER_HOUR                  = 'MILE_PER_HOUR';
-    const MILE_PER_MINUTE                = 'MILE_PER_MINUTE';
-    const MILE_PER_SECOND                = 'MILE_PER_SECOND';
-    const MILLIMETER_PER_DAY             = 'MILLIMETER_PER_DAY';
-    const MILLIMETER_PER_HOUR            = 'MILLIMETER_PER_HOUR';
-    const MILLIMETER_PER_MINUTE          = 'MILLIMETER_PER_MINUTE';
-    const MILLIMETER_PER_SECOND          = 'MILLIMETER_PER_SECOND';
-    const MILLIMETER_PER_MICROSECOND     = 'MILLIMETER_PER_MICROSECOND';
-    const MILLIMETER_PER_100_MICROSECOND = 'MILLIMETER_PER_100_MICROSECOND';
-    const NAUTIC_MILE_PER_DAY            = 'NAUTIC_MILE_PER_DAY';
-    const NAUTIC_MILE_PER_HOUR           = 'NAUTIC_MILE_PER_HOUR';
-    const NAUTIC_MILE_PER_MINUTE         = 'NAUTIC_MILE_PER_MINUTE';
-    const NAUTIC_MILE_PER_SECOND         = 'NAUTIC_MILE_PER_SECOND';
-    const LIGHTSPEED_AIR                 = 'LIGHTSPEED_AIR';
-    const LIGHTSPEED_GLASS               = 'LIGHTSPEED_GLASS';
-    const LIGHTSPEED_ICE                 = 'LIGHTSPEED_ICE';
-    const LIGHTSPEED_VACUUM              = 'LIGHTSPEED_VACUUM';
-    const LIGHTSPEED_WATER               = 'LIGHTSPEED_WATER';
-    const SOUNDSPEED_AIR                 = 'SOUNDSPEED_AIT';
-    const SOUNDSPEED_METAL               = 'SOUNDSPEED_METAL';
-    const SOUNDSPEED_WATER               = 'SOUNDSPEED_WATER';
-    const YARD_PER_DAY                   = 'YARD_PER_DAY';
-    const YARD_PER_HOUR                  = 'YARD_PER_HOUR';
-    const YARD_PER_MINUTE                = 'YARD_PER_MINUTE';
-    const YARD_PER_SECOND                = 'YARD_PER_SECOND';
-
-    /**
-     * Calculations for all speed units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'BENZ'                           => array('1',                                     'Bz'),
-        'CENTIMETER_PER_DAY'             => array(array('' => '0.01', '/' => '86400'),       'cm/day'),
-        'CENTIMETER_PER_HOUR'            => array(array('' => '0.01', '/' => '3600'),        'cm/h'),
-        'CENTIMETER_PER_MINUTE'          => array(array('' => '0.01', '/' => '60'),          'cm/m'),
-        'CENTIMETER_PER_SECOND'          => array('0.01',                                  'cd/s'),
-        'DEKAMETER_PER_DAY'              => array(array('' => '10', '/' => '86400'),         'dam/day'),
-        'DEKAMETER_PER_HOUR'             => array(array('' => '10', '/' => '3600'),          'dam/h'),
-        'DEKAMETER_PER_MINUTE'           => array(array('' => '10', '/' => '60'),            'dam/m'),
-        'DEKAMETER_PER_SECOND'           => array('10',                                    'dam/s'),
-        'FOOT_PER_DAY'                   => array(array('' => '0.3048', '/' => '86400'),     'ft/day'),
-        'FOOT_PER_HOUR'                  => array(array('' => '0.3048', '/' => '3600'),      'ft/h'),
-        'FOOT_PER_MINUTE'                => array(array('' => '0.3048', '/' => '60'),        'ft/m'),
-        'FOOT_PER_SECOND'                => array('0.3048',                                'ft/s'),
-        'FURLONG_PER_DAY'                => array(array('' => '201.1684', '/' => '86400'),   'fur/day'),
-        'FURLONG_PER_FORTNIGHT'          => array(array('' => '201.1684', '/' => '1209600'), 'fur/fortnight'),
-        'FURLONG_PER_HOUR'               => array(array('' => '201.1684', '/' => '3600'),    'fur/h'),
-        'FURLONG_PER_MINUTE'             => array(array('' => '201.1684', '/' => '60'),      'fur/m'),
-        'FURLONG_PER_SECOND'             => array('201.1684',                              'fur/s'),
-        'HECTOMETER_PER_DAY'             => array(array('' => '100', '/' => '86400'),        'hm/day'),
-        'HECTOMETER_PER_HOUR'            => array(array('' => '100', '/' => '3600'),         'hm/h'),
-        'HECTOMETER_PER_MINUTE'          => array(array('' => '100', '/' => '60'),           'hm/m'),
-        'HECTOMETER_PER_SECOND'          => array('100',                                   'hm/s'),
-        'INCH_PER_DAY'                   => array(array('' => '0.0254', '/' => '86400'),     'in/day'),
-        'INCH_PER_HOUR'                  => array(array('' => '0.0254', '/' => '3600'),      'in/h'),
-        'INCH_PER_MINUTE'                => array(array('' => '0.0254', '/' => '60'),        'in/m'),
-        'INCH_PER_SECOND'                => array('0.0254',                                'in/s'),
-        'KILOMETER_PER_DAY'              => array(array('' => '1000', '/' => '86400'),       'km/day'),
-        'KILOMETER_PER_HOUR'             => array(array('' => '1000', '/' => '3600'),        'km/h'),
-        'KILOMETER_PER_MINUTE'           => array(array('' => '1000', '/' => '60'),          'km/m'),
-        'KILOMETER_PER_SECOND'           => array('1000',                                  'km/s'),
-        'KNOT'                           => array(array('' => '1852', '/' => '3600'),        'kn'),
-        'LEAGUE_PER_DAY'                 => array(array('' => '4828.0417', '/' => '86400'),  'league/day'),
-        'LEAGUE_PER_HOUR'                => array(array('' => '4828.0417', '/' => '3600'),   'league/h'),
-        'LEAGUE_PER_MINUTE'              => array(array('' => '4828.0417', '/' => '60'),     'league/m'),
-        'LEAGUE_PER_SECOND'              => array('4828.0417',                             'league/s'),
-        'MACH'                           => array('340.29',                                'M'),
-        'MEGAMETER_PER_DAY'              => array(array('' => '1000000', '/' => '86400'),    'Mm/day'),
-        'MEGAMETER_PER_HOUR'             => array(array('' => '1000000', '/' => '3600'),     'Mm/h'),
-        'MEGAMETER_PER_MINUTE'           => array(array('' => '1000000', '/' => '60'),       'Mm/m'),
-        'MEGAMETER_PER_SECOND'           => array('1000000',                               'Mm/s'),
-        'METER_PER_DAY'                  => array(array('' => '1', '/' => '86400'),          'm/day'),
-        'METER_PER_HOUR'                 => array(array('' => '1', '/' => '3600'),           'm/h'),
-        'METER_PER_MINUTE'               => array(array('' => '1', '/' => '60'),             'm/m'),
-        'METER_PER_SECOND'               => array('1',                                     'm/s'),
-        'MILE_PER_DAY'                   => array(array('' => '1609.344', '/' => '86400'),   'mi/day'),
-        'MILE_PER_HOUR'                  => array(array('' => '1609.344', '/' => '3600'),    'mi/h'),
-        'MILE_PER_MINUTE'                => array(array('' => '1609.344', '/' => '60'),      'mi/m'),
-        'MILE_PER_SECOND'                => array('1609.344',                              'mi/s'),
-        'MILLIMETER_PER_DAY'             => array(array('' => '0.001', '/' => '86400'),      'mm/day'),
-        'MILLIMETER_PER_HOUR'            => array(array('' => '0.001', '/' => '3600'),       'mm/h'),
-        'MILLIMETER_PER_MINUTE'          => array(array('' => '0.001', '/' => '60'),         'mm/m'),
-        'MILLIMETER_PER_SECOND'          => array('0.001',                                 'mm/s'),
-        'MILLIMETER_PER_MICROSECOND'     => array('1000',                                  'mm/µs'),
-        'MILLIMETER_PER_100_MICROSECOND' => array('10',                                    'mm/100µs'),
-        'NAUTIC_MILE_PER_DAY'            => array(array('' => '1852', '/' => '86400'),       'nmi/day'),
-        'NAUTIC_MILE_PER_HOUR'           => array(array('' => '1852', '/' => '3600'),        'nmi/h'),
-        'NAUTIC_MILE_PER_MINUTE'         => array(array('' => '1852', '/' => '60'),          'nmi/m'),
-        'NAUTIC_MILE_PER_SECOND'         => array('1852',                                  'nmi/s'),
-        'LIGHTSPEED_AIR'                 => array('299702547',                             'speed of light (air)'),
-        'LIGHTSPEED_GLASS'               => array('199861638',                             'speed of light (glass)'),
-        'LIGHTSPEED_ICE'                 => array('228849204',                             'speed of light (ice)'),
-        'LIGHTSPEED_VACUUM'              => array('299792458',                             'speed of light (vacuum)'),
-        'LIGHTSPEED_WATER'               => array('225407863',                             'speed of light (water)'),
-        'SOUNDSPEED_AIT'                 => array('340.29',                                'speed of sound (air)'),
-        'SOUNDSPEED_METAL'               => array('5000',                                  'speed of sound (metal)'),
-        'SOUNDSPEED_WATER'               => array('1500',                                  'speed of sound (water)'),
-        'YARD_PER_DAY'                   => array(array('' => '0.9144', '/' => '86400'),     'yd/day'),
-        'YARD_PER_HOUR'                  => array(array('' => '0.9144', '/' => '3600'),      'yd/h'),
-        'YARD_PER_MINUTE'                => array(array('' => '0.9144', '/' => '60'),        'yd/m'),
-        'YARD_PER_SECOND'                => array('0.9144',                                'yd/s'),
-        'STANDARD'                       => 'METER_PER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Temperature.php b/airtime_mvc/library/Zend/Measure/Temperature.php
deleted file mode 100644
index a482775f8..000000000
--- a/airtime_mvc/library/Zend/Measure/Temperature.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Temperature.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling temperature conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Temperature
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Temperature extends Zend_Measure_Abstract
-{
-    const STANDARD = 'KELVIN';
-
-    const CELSIUS    = 'CELSIUS';
-    const FAHRENHEIT = 'FAHRENHEIT';
-    const RANKINE    = 'RANKINE';
-    const REAUMUR    = 'REAUMUR';
-    const KELVIN     = 'KELVIN';
-
-    /**
-     * Calculations for all temperature units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CELSIUS'    => array(array('' => '1', '+' => '273.15'),'°C'),
-        'FAHRENHEIT' => array(array('' => '1', '-' => '32', '/' => '1.8', '+' => '273.15'),'°F'),
-        'RANKINE'    => array(array('' => '1', '/' => '1.8'),'°R'),
-        'REAUMUR'    => array(array('' => '1', '*' => '1.25', '+' => '273.15'),'°r'),
-        'KELVIN'     => array(1,'°K'),
-        'STANDARD'   => 'KELVIN'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Time.php b/airtime_mvc/library/Zend/Measure/Time.php
deleted file mode 100644
index 14bcf45a3..000000000
--- a/airtime_mvc/library/Zend/Measure/Time.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling time conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Time
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Time extends Zend_Measure_Abstract
-{
-    const STANDARD = 'SECOND';
-
-    const ANOMALISTIC_YEAR  = 'ANOMALISTIC_YEAR';
-    const ATTOSECOND        = 'ATTOSECOND';
-    const CENTURY           = 'CENTURY';
-    const DAY               = 'DAY';
-    const DECADE            = 'DECADE';
-    const DRACONIC_YEAR     = 'DRACONTIC_YEAR';
-    const EXASECOND         = 'EXASECOND';
-    const FEMTOSECOND       = 'FEMTOSECOND';
-    const FORTNIGHT         = 'FORTNIGHT';
-    const GAUSSIAN_YEAR     = 'GAUSSIAN_YEAR';
-    const GIGASECOND        = 'GIGASECOND';
-    const GREGORIAN_YEAR    = 'GREGORIAN_YEAR';
-    const HOUR              = 'HOUR';
-    const JULIAN_YEAR       = 'JULIAN_YEAR';
-    const KILOSECOND        = 'KILOSECOND';
-    const LEAPYEAR          = 'LEAPYEAR';
-    const MEGASECOND        = 'MEGASECOND';
-    const MICROSECOND       = 'MICROSECOND';
-    const MILLENIUM         = 'MILLENIUM';
-    const MILLISECOND       = 'MILLISECOND';
-    const MINUTE            = 'MINUTE';
-    const MONTH             = 'MONTH';
-    const NANOSECOND        = 'NANOSECOND';
-    const PETASECOND        = 'PETASECOND';
-    const PICOSECOND        = 'PICOSECOND';
-    const QUARTER           = 'QUARTER';
-    const SECOND            = 'SECOND';
-    const SHAKE             = 'SHAKE';
-    const SIDEREAL_YEAR     = 'SYNODIC_MONTH';
-    const TERASECOND        = 'TERASECOND';
-    const TROPICAL_YEAR     = 'TROPIC_YEAR';
-    const WEEK              = 'WEEK';
-    const YEAR              = 'YEAR';
-
-    /**
-     * Calculations for all time units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ANOMALISTIC_YEAR'  => array('31558432', 'anomalistic year'),
-        'ATTOSECOND'        => array('1.0e-18', 'as'),
-        'CENTURY'           => array('3153600000', 'century'),
-        'DAY'               => array('86400', 'day'),
-        'DECADE'            => array('315360000', 'decade'),
-        'DRACONIC_YEAR'     => array('29947974', 'draconic year'),
-        'EXASECOND'         => array('1.0e+18', 'Es'),
-        'FEMTOSECOND'       => array('1.0e-15', 'fs'),
-        'FORTNIGHT'         => array('1209600', 'fortnight'),
-        'GAUSSIAN_YEAR'     => array('31558196', 'gaussian year'),
-        'GIGASECOND'        => array('1.0e+9', 'Gs'),
-        'GREAT_YEAR'        => array(array('*' => '31536000', '*' => '25700'), 'great year'),
-        'GREGORIAN_YEAR'    => array('31536000', 'year'),
-        'HOUR'              => array('3600', 'h'),
-        'JULIAN_YEAR'       => array('31557600', 'a'),
-        'KILOSECOND'        => array('1000', 'ks'),
-        'LEAPYEAR'          => array('31622400', 'year'),
-        'MEGASECOND'        => array('1000000', 'Ms'),
-        'MICROSECOND'       => array('0.000001', 'µs'),
-        'MILLENIUM'         => array('31536000000', 'millenium'),
-        'MILLISECOND'       => array('0.001', 'ms'),
-        'MINUTE'            => array('60', 'min'),
-        'MONTH'             => array('2628600', 'month'),
-        'NANOSECOND'        => array('1.0e-9', 'ns'),
-        'PETASECOND'        => array('1.0e+15', 'Ps'),
-        'PICOSECOND'        => array('1.0e-12', 'ps'),
-        'QUARTER'           => array('7884000', 'quarter'),
-        'SECOND'            => array('1', 's'),
-        'SHAKE'             => array('1.0e-9', 'shake'),
-        'SIDEREAL_YEAR'     => array('31558149.7676', 'sidereal year'),
-        'TERASECOND'        => array('1.0e+12', 'Ts'),
-        'TROPICAL_YEAR'     => array('31556925', 'tropical year'),
-        'WEEK'              => array('604800', 'week'),
-        'YEAR'              => array('31536000', 'year'),
-        'STANDARD'          => 'SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Torque.php b/airtime_mvc/library/Zend/Measure/Torque.php
deleted file mode 100644
index 990bba1d9..000000000
--- a/airtime_mvc/library/Zend/Measure/Torque.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Torque.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling torque conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Torque
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Torque extends Zend_Measure_Abstract
-{
-    const STANDARD = 'NEWTON_METER';
-
-    const DYNE_CENTIMETER     = 'DYNE_CENTIMETER';
-    const GRAM_CENTIMETER     = 'GRAM_CENTIMETER';
-    const KILOGRAM_CENTIMETER = 'KILOGRAM_CENTIMETER';
-    const KILOGRAM_METER      = 'KILOGRAM_METER';
-    const KILONEWTON_METER    = 'KILONEWTON_METER';
-    const KILOPOND_METER      = 'KILOPOND_METER';
-    const MEGANEWTON_METER    = 'MEGANEWTON_METER';
-    const MICRONEWTON_METER   = 'MICRONEWTON_METER';
-    const MILLINEWTON_METER   = 'MILLINEWTON_METER';
-    const NEWTON_CENTIMETER   = 'NEWTON_CENTIMETER';
-    const NEWTON_METER        = 'NEWTON_METER';
-    const OUNCE_FOOT          = 'OUNCE_FOOT';
-    const OUNCE_INCH          = 'OUNCE_INCH';
-    const POUND_FOOT          = 'POUND_FOOT';
-    const POUNDAL_FOOT        = 'POUNDAL_FOOT';
-    const POUND_INCH          = 'POUND_INCH';
-
-    /**
-     * Calculations for all torque units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'DYNE_CENTIMETER'     => array('0.0000001',          'dyncm'),
-        'GRAM_CENTIMETER'     => array('0.0000980665',       'gcm'),
-        'KILOGRAM_CENTIMETER' => array('0.0980665',          'kgcm'),
-        'KILOGRAM_METER'      => array('9.80665',            'kgm'),
-        'KILONEWTON_METER'    => array('1000',               'kNm'),
-        'KILOPOND_METER'      => array('9.80665',            'kpm'),
-        'MEGANEWTON_METER'    => array('1000000',            'MNm'),
-        'MICRONEWTON_METER'   => array('0.000001',           'µNm'),
-        'MILLINEWTON_METER'   => array('0.001',              'mNm'),
-        'NEWTON_CENTIMETER'   => array('0.01',               'Ncm'),
-        'NEWTON_METER'        => array('1',                  'Nm'),
-        'OUNCE_FOOT'          => array('0.084738622',        'ozft'),
-        'OUNCE_INCH'          => array(array('' => '0.084738622', '/' => '12'), 'ozin'),
-        'POUND_FOOT'          => array(array('' => '0.084738622', '*' => '16'), 'lbft'),
-        'POUNDAL_FOOT'        => array('0.0421401099752144', 'plft'),
-        'POUND_INCH'          => array(array('' => '0.084738622', '/' => '12', '*' => '16'), 'lbin'),
-        'STANDARD'            => 'NEWTON_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Viscosity/Dynamic.php b/airtime_mvc/library/Zend/Measure/Viscosity/Dynamic.php
deleted file mode 100644
index 09b4485a3..000000000
--- a/airtime_mvc/library/Zend/Measure/Viscosity/Dynamic.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling acceleration conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Viscosity_Dynamic
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Viscosity_Dynamic extends Zend_Measure_Abstract
-{
-    const STANDARD = 'KILOGRAM_PER_METER_SECOND';
-
-    const CENTIPOISE                              = 'CENTIPOISE';
-    const DECIPOISE                               = 'DECIPOISE';
-    const DYNE_SECOND_PER_SQUARE_CENTIMETER       = 'DYNE_SECOND_PER_SQUARE_CENTIMETER';
-    const GRAM_FORCE_SECOND_PER_SQUARE_CENTIMETER = 'GRAM_FORCE_SECOND_PER_SQUARE_CENTIMETER';
-    const GRAM_PER_CENTIMETER_SECOND              = 'GRAM_PER_CENTIMETER_SECOND';
-    const KILOGRAM_FORCE_SECOND_PER_SQUARE_METER  = 'KILOGRAM_FORCE_SECOND_PER_SQUARE_METER';
-    const KILOGRAM_PER_METER_HOUR                 = 'KILOGRAM_PER_METER_HOUR';
-    const KILOGRAM_PER_METER_SECOND               = 'KILOGRAM_PER_METER_SECOND';
-    const MILLIPASCAL_SECOND                      = 'MILLIPASCAL_SECOND';
-    const MILLIPOISE                              = 'MILLIPOISE';
-    const NEWTON_SECOND_PER_SQUARE_METER          = 'NEWTON_SECOND_PER_SQUARE_METER';
-    const PASCAL_SECOND                           = 'PASCAL_SECOND';
-    const POISE                                   = 'POISE';
-    const POISEUILLE                              = 'POISEUILLE';
-    const POUND_FORCE_SECOND_PER_SQUARE_FEET      = 'POUND_FORCE_SECOND_PER_SQUARE_FEET';
-    const POUND_FORCE_SECOND_PER_SQUARE_INCH      = 'POUND_FORCE_SECOND_PER_SQUARE_INCH';
-    const POUND_PER_FOOT_HOUR                     = 'POUND_PER_FOOT_HOUR';
-    const POUND_PER_FOOT_SECOND                   = 'POUND_PER_FOOT_SECOND';
-    const POUNDAL_HOUR_PER_SQUARE_FOOT            = 'POUNDAL_HOUR_PER_SQUARE_FOOT';
-    const POUNDAL_SECOND_PER_SQUARE_FOOT          = 'POUNDAL_SECOND_PER_SQUARE_FOOT';
-    const REYN                                    = 'REYN';
-    const SLUG_PER_FOOT_SECOND                    = 'SLUG_PER_FOOT_SECOND';
-    const LBFS_PER_SQUARE_FOOT                    = 'LBFS_PER_SQUARE_FOOT';
-    const NS_PER_SQUARE_METER                     = 'NS_PER_SQUARE_METER';
-    const WATER_20C                               = 'WATER_20C';
-    const WATER_40C                               = 'WATER_40C';
-    const HEAVY_OIL_20C                           = 'HEAVY_OIL_20C';
-    const HEAVY_OIL_40C                           = 'HEAVY_OIL_40C';
-    const GLYCERIN_20C                            = 'GLYCERIN_20C';
-    const GLYCERIN_40C                            = 'GLYCERIN_40C';
-    const SAE_5W_MINUS18C                         = 'SAE_5W_MINUS18C';
-    const SAE_10W_MINUS18C                        = 'SAE_10W_MINUS18C';
-    const SAE_20W_MINUS18C                        = 'SAE_20W_MINUS18C';
-    const SAE_5W_99C                              = 'SAE_5W_99C';
-    const SAE_10W_99C                             = 'SAE_10W_99C';
-    const SAE_20W_99C                             = 'SAE_20W_99C';
-
-    /**
-     * Calculations for all dynamic viscosity units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CENTIPOISE'          => array('0.001',      'cP'),
-        'DECIPOISE'           => array('0.01',       'dP'),
-        'DYNE_SECOND_PER_SQUARE_CENTIMETER'       => array('0.1',     'dyn s/cm²'),
-        'GRAM_FORCE_SECOND_PER_SQUARE_CENTIMETER' => array('98.0665', 'gf s/cm²'),
-        'GRAM_PER_CENTIMETER_SECOND'              => array('0.1',     'g/cm s'),
-        'KILOGRAM_FORCE_SECOND_PER_SQUARE_METER'  => array('9.80665', 'kgf s/m²'),
-        'KILOGRAM_PER_METER_HOUR'    => array(array('' => '1', '/' => '3600'), 'kg/m h'),
-        'KILOGRAM_PER_METER_SECOND'  => array('1',   'kg/ms'),
-        'MILLIPASCAL_SECOND'  => array('0.001',      'mPa s'),
-        'MILLIPOISE'          => array('0.0001',     'mP'),
-        'NEWTON_SECOND_PER_SQUARE_METER' => array('1', 'N s/m²'),
-        'PASCAL_SECOND'       => array('1',          'Pa s'),
-        'POISE'               => array('0.1',        'P'),
-        'POISEUILLE'          => array('1',          'Pl'),
-        'POUND_FORCE_SECOND_PER_SQUARE_FEET' => array('47.880259',  'lbf s/ft²'),
-        'POUND_FORCE_SECOND_PER_SQUARE_INCH' => array('6894.75729', 'lbf s/in²'),
-        'POUND_PER_FOOT_HOUR' => array('0.00041337887',             'lb/ft h'),
-        'POUND_PER_FOOT_SECOND'          => array('1.4881639',      'lb/ft s'),
-        'POUNDAL_HOUR_PER_SQUARE_FOOT'   => array('0.00041337887',  'pdl h/ft²'),
-        'POUNDAL_SECOND_PER_SQUARE_FOOT' => array('1.4881639',      'pdl s/ft²'),
-        'REYN'                => array('6894.75729', 'reyn'),
-        'SLUG_PER_FOOT_SECOND'=> array('47.880259',  'slug/ft s'),
-        'WATER_20C'           => array('0.001',      'water (20°)'),
-        'WATER_40C'           => array('0.00065',    'water (40°)'),
-        'HEAVY_OIL_20C'       => array('0.45',       'oil (20°)'),
-        'HEAVY_OIL_40C'       => array('0.11',       'oil (40°)'),
-        'GLYCERIN_20C'        => array('1.41',       'glycerin (20°)'),
-        'GLYCERIN_40C'        => array('0.284',      'glycerin (40°)'),
-        'SAE_5W_MINUS18C'     => array('1.2',        'SAE 5W (-18°)'),
-        'SAE_10W_MINUS18C'    => array('2.4',        'SAE 10W (-18°)'),
-        'SAE_20W_MINUS18C'    => array('9.6',        'SAE 20W (-18°)'),
-        'SAE_5W_99C'          => array('0.0039',     'SAE 5W (99°)'),
-        'SAE_10W_99C'         => array('0.0042',     'SAE 10W (99°)'),
-        'SAE_20W_99C'         => array('0.0057',     'SAE 20W (99°)'),
-        'STANDARD'            => 'KILOGRAM_PER_METER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Viscosity/Kinematic.php b/airtime_mvc/library/Zend/Measure/Viscosity/Kinematic.php
deleted file mode 100644
index d24bb784f..000000000
--- a/airtime_mvc/library/Zend/Measure/Viscosity/Kinematic.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Kinematic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling acceleration conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Viscosity_Kinematic
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Viscosity_Kinematic extends Zend_Measure_Abstract
-{
-    const STANDARD = 'SQUARE_METER_PER_SECOND';
-
-    const CENTISTOKES                     = 'CENTISTOKES';
-    const LENTOR                          = 'LENTOR';
-    const LITER_PER_CENTIMETER_DAY        = 'LITER_PER_CENTIMETER_DAY';
-    const LITER_PER_CENTIMETER_HOUR       = 'LITER_PER_CENTIMETER_HOUR';
-    const LITER_PER_CENTIMETER_MINUTE     = 'LITER_PER_CENTIMETER_MINUTE';
-    const LITER_PER_CENTIMETER_SECOND     = 'LITER_PER_CENTIMETER_SECOND';
-    const POISE_CUBIC_CENTIMETER_PER_GRAM = 'POISE_CUBIC_CENTIMETER_PER_GRAM';
-    const SQUARE_CENTIMETER_PER_DAY       = 'SQUARE_CENTIMETER_PER_DAY';
-    const SQUARE_CENTIMETER_PER_HOUR      = 'SQUARE_CENTIMETER_PER_HOUR';
-    const SQUARE_CENTIMETER_PER_MINUTE    = 'SQUARE_CENTIMETER_PER_MINUTE';
-    const SQUARE_CENTIMETER_PER_SECOND    = 'SQUARE_CENTIMETER_PER_SECOND';
-    const SQUARE_FOOT_PER_DAY             = 'SQUARE_FOOT_PER_DAY';
-    const SQUARE_FOOT_PER_HOUR            = 'SQUARE_FOOT_PER_HOUR';
-    const SQUARE_FOOT_PER_MINUTE          = 'SQUARE_FOOT_PER_MINUTE';
-    const SQUARE_FOOT_PER_SECOND          = 'SQUARE_FOOT_PER_SECOND';
-    const SQUARE_INCH_PER_DAY             = 'SQUARE_INCH_PER_DAY';
-    const SQUARE_INCH_PER_HOUR            = 'SQUARE_INCH_PER_HOUR';
-    const SQUARE_INCH_PER_MINUTE          = 'SQUARE_INCH_PER_MINUTE';
-    const SQUARE_INCH_PER_SECOND          = 'SQUARE_INCH_PER_SECOND';
-    const SQUARE_METER_PER_DAY            = 'SQUARE_METER_PER_DAY';
-    const SQUARE_METER_PER_HOUR           = 'SQUARE_METER_PER_HOUR';
-    const SQUARE_METER_PER_MINUTE         = 'SQUARE_METER_PER_MINUTE';
-    const SQUARE_METER_PER_SECOND         = 'SQUARE_METER_PER_SECOND';
-    const SQUARE_MILLIMETER_PER_DAY       = 'SQUARE_MILLIMETER_PER_DAY';
-    const SQUARE_MILLIMETER_PER_HOUR      = 'SQUARE_MILLIMETER_PER_HOUR';
-    const SQUARE_MILLIMETER_PER_MINUTE    = 'SQUARE_MILLIMETER_PER_MINUTE';
-    const SQUARE_MILLIMETER_PER_SECOND    = 'SQUARE_MILLIMETER_PER_SECOND';
-    const STOKES                          = 'STOKES';
-
-    /**
-     * Calculations for all kinematic viscosity units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'CENTISTOKES'                  => array('0.000001',        'cSt'),
-        'LENTOR'                       => array('0.0001',          'lentor'),
-        'LITER_PER_CENTIMETER_DAY'     => array(array('' => '1', '/' => '864000'), 'l/cm day'),
-        'LITER_PER_CENTIMETER_HOUR'    => array(array('' => '1', '/' => '36000'),  'l/cm h'),
-        'LITER_PER_CENTIMETER_MINUTE'  => array(array('' => '1', '/' => '600'),    'l/cm m'),
-        'LITER_PER_CENTIMETER_SECOND'  => array('0.1',             'l/cm s'),
-        'POISE_CUBIC_CENTIMETER_PER_GRAM' => array('0.0001',       'P cm³/g'),
-        'SQUARE_CENTIMETER_PER_DAY'    => array(array('' => '1', '/' => '864000000'),'cm²/day'),
-        'SQUARE_CENTIMETER_PER_HOUR'   => array(array('' => '1', '/' => '36000000'),'cm²/h'),
-        'SQUARE_CENTIMETER_PER_MINUTE' => array(array('' => '1', '/' => '600000'),'cm²/m'),
-        'SQUARE_CENTIMETER_PER_SECOND' => array('0.0001',          'cm²/s'),
-        'SQUARE_FOOT_PER_DAY'          => array('0.0000010752667', 'ft²/day'),
-        'SQUARE_FOOT_PER_HOUR'         => array('0.0000258064',    'ft²/h'),
-        'SQUARE_FOOT_PER_MINUTE'       => array('0.001548384048',  'ft²/m'),
-        'SQUARE_FOOT_PER_SECOND'       => array('0.09290304',      'ft²/s'),
-        'SQUARE_INCH_PER_DAY'          => array('7.4671296e-9',    'in²/day'),
-        'SQUARE_INCH_PER_HOUR'         => array('0.00000017921111', 'in²/h'),
-        'SQUARE_INCH_PER_MINUTE'       => array('0.000010752667',  'in²/m'),
-        'SQUARE_INCH_PER_SECOND'       => array('0.00064516',      'in²/s'),
-        'SQUARE_METER_PER_DAY'         => array(array('' => '1', '/' => '86400'), 'm²/day'),
-        'SQUARE_METER_PER_HOUR'        => array(array('' => '1', '/' => '3600'),  'm²/h'),
-        'SQUARE_METER_PER_MINUTE'      => array(array('' => '1', '/' => '60'),    'm²/m'),
-        'SQUARE_METER_PER_SECOND'      => array('1',               'm²/s'),
-        'SQUARE_MILLIMETER_PER_DAY'    => array(array('' => '1', '/' => '86400000000'), 'mm²/day'),
-        'SQUARE_MILLIMETER_PER_HOUR'   => array(array('' => '1', '/' => '3600000000'),  'mm²/h'),
-        'SQUARE_MILLIMETER_PER_MINUTE' => array(array('' => '1', '/' => '60000000'),    'mm²/m'),
-        'SQUARE_MILLIMETER_PER_SECOND' => array('0.000001',        'mm²/s'),
-        'STOKES'                       => array('0.0001',          'St'),
-        'STANDARD'                     => 'SQUARE_METER_PER_SECOND'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Volume.php b/airtime_mvc/library/Zend/Measure/Volume.php
deleted file mode 100644
index 337017965..000000000
--- a/airtime_mvc/library/Zend/Measure/Volume.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling acceleration conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Volume
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Volume extends Zend_Measure_Abstract
-{
-    const STANDARD = 'CUBIC_METER';
-
-    const ACRE_FOOT           = 'ACRE_FOOT';
-    const ACRE_FOOT_SURVEY    = 'ACRE_FOOT_SURVEY';
-    const ACRE_INCH           = 'ACRE_INCH';
-    const BARREL_WINE         = 'BARREL_WINE';
-    const BARREL              = 'BARREL';
-    const BARREL_US_DRY       = 'BARREL_US_DRY';
-    const BARREL_US_FEDERAL   = 'BARREL_US_FEDERAL';
-    const BARREL_US           = 'BARREL_US';
-    const BARREL_US_PETROLEUM = 'BARREL_US_PETROLEUM';
-    const BOARD_FOOT          = 'BOARD_FOOT';
-    const BUCKET              = 'BUCKET';
-    const BUCKET_US           = 'BUCKET_US';
-    const BUSHEL              = 'BUSHEL';
-    const BUSHEL_US           = 'BUSHEL_US';
-    const CENTILTER           = 'CENTILITER';
-    const CORD                = 'CORD';
-    const CORD_FOOT           = 'CORD_FOOT';
-    const CUBIC_CENTIMETER    = 'CUBIC_CENTIMETER';
-    const CUBIC_CUBIT         = 'CUBIC_CUBIT';
-    const CUBIC_DECIMETER     = 'CUBIC_DECIMETER';
-    const CUBIC_DEKAMETER     = 'CUBIC_DEKAMETER';
-    const CUBIC_FOOT          = 'CUBIC_FOOT';
-    const CUBIC_INCH          = 'CUBIC_INCH';
-    const CUBIC_KILOMETER     = 'CUBIC_KILOMETER';
-    const CUBIC_METER         = 'CUBIC_METER';
-    const CUBIC_MILE          = 'CUBIC_MILE';
-    const CUBIC_MICROMETER    = 'CUBIC_MICROMETER';
-    const CUBIC_MILLIMETER    = 'CUBIC_MILLIMETER';
-    const CUBIC_YARD          = 'CUBIC_YARD';
-    const CUP_CANADA          = 'CUP_CANADA';
-    const CUP                 = 'CUP';
-    const CUP_US              = 'CUP_US';
-    const DECILITER           = 'DECILITER';
-    const DEKALITER           = 'DEKALITER';
-    const DRAM                = 'DRAM';
-    const DRUM_US             = 'DRUM_US';
-    const DRUM                = 'DRUM';
-    const FIFTH               = 'FIFTH';
-    const GALLON              = 'GALLON';
-    const GALLON_US_DRY       = 'GALLON_US_DRY';
-    const GALLON_US           = 'GALLON_US';
-    const GILL                = 'GILL';
-    const GILL_US             = 'GILL_US';
-    const HECTARE_METER       = 'HECTARE_METER';
-    const HECTOLITER          = 'HECTOLITER';
-    const HOGSHEAD            = 'HOGSHEAD';
-    const HOGSHEAD_US         = 'HOGSHEAD_US';
-    const JIGGER              = 'JIGGER';
-    const KILOLITER           = 'KILOLITER';
-    const LITER               = 'LITER';
-    const MEASURE             = 'MEASURE';
-    const MEGALITER           = 'MEGALITER';
-    const MICROLITER          = 'MICROLITER';
-    const MILLILITER          = 'MILLILITER';
-    const MINIM               = 'MINIM';
-    const MINIM_US            = 'MINIM_US';
-    const OUNCE               = 'OUNCE';
-    const OUNCE_US            = 'OUNCE_US';
-    const PECK                = 'PECK';
-    const PECK_US             = 'PECK_US';
-    const PINT                = 'PINT';
-    const PINT_US_DRY         = 'PINT_US_DRY';
-    const PINT_US             = 'PINT_US';
-    const PIPE                = 'PIPE';
-    const PIPE_US             = 'PIPE_US';
-    const PONY                = 'PONY';
-    const QUART_GERMANY       = 'QUART_GERMANY';
-    const QUART_ANCIENT       = 'QUART_ANCIENT';
-    const QUART               = 'QUART';
-    const QUART_US_DRY        = 'QUART_US_DRY';
-    const QUART_US            = 'QUART_US';
-    const QUART_UK            = 'QUART_UK';
-    const SHOT                = 'SHOT';
-    const STERE               = 'STERE';
-    const TABLESPOON          = 'TABLESPOON';
-    const TABLESPOON_UK       = 'TABLESPOON_UK';
-    const TABLESPOON_US       = 'TABLESPOON_US';
-    const TEASPOON            = 'TEASPOON';
-    const TEASPOON_UK         = 'TEASPOON_UK';
-    const TEASPOON_US         = 'TEASPOON_US';
-    const YARD                = 'YARD';
-
-    /**
-     * Calculations for all volume units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ACRE_FOOT'           => array('1233.48185532', 'ac ft'),
-        'ACRE_FOOT_SURVEY'    => array('1233.489',      'ac ft'),
-        'ACRE_INCH'           => array('102.79015461',  'ac in'),
-        'BARREL_WINE'         => array('0.143201835',   'bbl'),
-        'BARREL'              => array('0.16365924',    'bbl'),
-        'BARREL_US_DRY'       => array(array('' => '26.7098656608', '/' => '231'), 'bbl'),
-        'BARREL_US_FEDERAL'   => array('0.1173477658',  'bbl'),
-        'BARREL_US'           => array('0.1192404717',  'bbl'),
-        'BARREL_US_PETROLEUM' => array('0.1589872956',  'bbl'),
-        'BOARD_FOOT'          => array(array('' => '6.5411915904', '/' => '2772'), 'board foot'),
-        'BUCKET'              => array('0.01818436',    'bucket'),
-        'BUCKET_US'           => array('0.018927059',   'bucket'),
-        'BUSHEL'              => array('0.03636872',    'bu'),
-        'BUSHEL_US'           => array('0.03523907',    'bu'),
-        'CENTILITER'          => array('0.00001',       'cl'),
-        'CORD'                => array('3.624556416',   'cd'),
-        'CORD_FOOT'           => array('0.453069552',   'cd ft'),
-        'CUBIC_CENTIMETER'    => array('0.000001',      'cm³'),
-        'CUBIC_CUBIT'         => array('0.144',         'cubit³'),
-        'CUBIC_DECIMETER'     => array('0.001',         'dm³'),
-        'CUBIC_DEKAMETER'     => array('1000',          'dam³'),
-        'CUBIC_FOOT'          => array(array('' => '6.54119159', '/' => '231'),   'ft³'),
-        'CUBIC_INCH'          => array(array('' => '0.0037854118', '/' => '231'), 'in³'),
-        'CUBIC_KILOMETER'     => array('1.0e+9',        'km³'),
-        'CUBIC_METER'         => array('1',             'm³'),
-        'CUBIC_MILE'          => array(array('' => '0.0037854118', '/' => '231', '*' => '75271680', '*' => '3379200'),
-                                       'mi³'),
-        'CUBIC_MICROMETER'    => array('1.0e-18',       'µm³'),
-        'CUBIC_MILLIMETER'    => array('1.0e-9',        'mm³'),
-        'CUBIC_YARD'          => array(array('' => '0.0037854118', '/' => '231', '*' => '46656'), 'yd³'),
-        'CUP_CANADA'          => array('0.0002273045',  'c'),
-        'CUP'                 => array('0.00025',       'c'),
-        'CUP_US'              => array(array('' => '0.0037854118', '/' => '16'), 'c'),
-        'DECILITER'           => array('0.0001',        'dl'),
-        'DEKALITER'           => array('0.001',         'dal'),
-        'DRAM'                => array(array('' => '0.0037854118', '/' => '1024'), 'dr'),
-        'DRUM_US'             => array('0.208197649',   'drum'),
-        'DRUM'                => array('0.2',           'drum'),
-        'FIFTH'               => array('0.00075708236', 'fifth'),
-        'GALLON'              => array('0.00454609',    'gal'),
-        'GALLON_US_DRY'       => array('0.0044048838',  'gal'),
-        'GALLON_US'           => array('0.0037854118',  'gal'),
-        'GILL'                => array(array('' => '0.00454609', '/' => '32'),   'gi'),
-        'GILL_US'             => array(array('' => '0.0037854118', '/' => '32'), 'gi'),
-        'HECTARE_METER'       => array('10000',         'ha m'),
-        'HECTOLITER'          => array('0.1',           'hl'),
-        'HOGSHEAD'            => array('0.28640367',    'hhd'),
-        'HOGSHEAD_US'         => array('0.2384809434',  'hhd'),
-        'JIGGER'              => array(array('' => '0.0037854118', '/' => '128', '*' => '1.5'), 'jigger'),
-        'KILOLITER'           => array('1',             'kl'),
-        'LITER'               => array('0.001',         'l'),
-        'MEASURE'             => array('0.0077',        'measure'),
-        'MEGALITER'           => array('1000',          'Ml'),
-        'MICROLITER'          => array('1.0e-9',        'µl'),
-        'MILLILITER'          => array('0.000001',      'ml'),
-        'MINIM'               => array(array('' => '0.00454609', '/' => '76800'),  'min'),
-        'MINIM_US'            => array(array('' => '0.0037854118','/' => '61440'), 'min'),
-        'OUNCE'               => array(array('' => '0.00454609', '/' => '160'),    'oz'),
-        'OUNCE_US'            => array(array('' => '0.0037854118', '/' => '128'),  'oz'),
-        'PECK'                => array('0.00909218',    'pk'),
-        'PECK_US'             => array('0.0088097676',  'pk'),
-        'PINT'                => array(array('' => '0.00454609', '/' => '8'),   'pt'),
-        'PINT_US_DRY'         => array(array('' => '0.0044048838', '/' => '8'), 'pt'),
-        'PINT_US'             => array(array('' => '0.0037854118', '/' => '8'), 'pt'),
-        'PIPE'                => array('0.49097772',    'pipe'),
-        'PIPE_US'             => array('0.4769618868',  'pipe'),
-        'PONY'                => array(array('' => '0.0037854118', '/' => '128'), 'pony'),
-        'QUART_GERMANY'       => array('0.00114504',    'qt'),
-        'QUART_ANCIENT'       => array('0.00108',       'qt'),
-        'QUART'               => array(array('' => '0.00454609', '/' => '4'),   'qt'),
-        'QUART_US_DRY'        => array(array('' => '0.0044048838', '/' => '4'), 'qt'),
-        'QUART_US'            => array(array('' => '0.0037854118', '/' => '4'), 'qt'),
-        'QUART_UK'            => array('0.29094976',    'qt'),
-        'SHOT'                => array(array('' => '0.0037854118', '/' => '128'), 'shot'),
-        'STERE'               => array('1',             'st'),
-        'TABLESPOON'          => array('0.000015',      'tbsp'),
-        'TABLESPOON_UK'       => array(array('' => '0.00454609', '/' => '320'),   'tbsp'),
-        'TABLESPOON_US'       => array(array('' => '0.0037854118', '/' => '256'), 'tbsp'),
-        'TEASPOON'            => array('0.000005',      'tsp'),
-        'TEASPOON_UK'         => array(array('' => '0.00454609', '/' => '1280'),    'tsp'),
-        'TEASPOON_US'         => array(array('' => '0.0037854118', '/' => '768'),   'tsp'),
-        'YARD'                => array(array('' => '176.6121729408', '/' => '231'), 'yd'),
-        'STANDARD'            => 'CUBIC_METER'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Measure/Weight.php b/airtime_mvc/library/Zend/Measure/Weight.php
deleted file mode 100644
index 6ac787973..000000000
--- a/airtime_mvc/library/Zend/Measure/Weight.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Measure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Implement needed classes
- */
-require_once 'Zend/Measure/Abstract.php';
-require_once 'Zend/Locale.php';
-
-/**
- * Class for handling weight conversions
- *
- * @category   Zend
- * @package    Zend_Measure
- * @subpackage Zend_Measure_Weigth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Measure_Weight extends Zend_Measure_Abstract
-{
-    const STANDARD = 'KILOGRAM';
-
-    const ARRATEL                 = 'ARRATEL';
-    const ARTEL                   = 'ARTEL';
-    const ARROBA_PORTUGUESE       = 'ARROBA_PORTUGUESE';
-    const ARROBA                  = 'ARROBA';
-    const AS_                     = 'AS_';
-    const ASS                     = 'ASS';
-    const ATOMIC_MASS_UNIT_1960   = 'ATOMIC_MASS_UNIT_1960';
-    const ATOMIC_MASS_UNIT_1973   = 'ATOMIC_MASS_UNIT_1973';
-    const ATOMIC_MASS_UNIT_1986   = 'ATOMIC_MASS_UNIT_1986';
-    const ATOMIC_MASS_UNIT        = 'ATOMIC_MASS_UNIT';
-    const AVOGRAM                 = 'AVOGRAM';
-    const BAG                     = 'BAG';
-    const BAHT                    = 'BAHT';
-    const BALE                    = 'BALE';
-    const BALE_US                 = 'BALE_US';
-    const BISMAR_POUND            = 'BISMAR_POUND';
-    const CANDY                   = 'CANDY';
-    const CARAT_INTERNATIONAL     = 'CARAT_INTERNATIONAL';
-    const CARAT                   = 'CARAT';
-    const CARAT_UK                = 'CARAT_UK';
-    const CARAT_US_1913           = 'CARAT_US_1913';
-    const CARGA                   = 'CARGA';
-    const CATTI                   = 'CATTI';
-    const CATTI_JAPANESE          = 'CATTI_JAPANESE';
-    const CATTY                   = 'CATTY';
-    const CATTY_JAPANESE          = 'CATTY_JAPANESE';
-    const CATTY_THAI              = 'CATTY_THAI';
-    const CENTAL                  = 'CENTAL';
-    const CENTIGRAM               = 'CENTIGRAM';
-    const CENTNER                 = 'CENTNER';
-    const CENTNER_RUSSIAN         = 'CENTNER_RUSSIAN';
-    const CHALDER                 = 'CHALDER';
-    const CHALDRON                = 'CHALDRON';
-    const CHIN                    = 'CHIN';
-    const CHIN_JAPANESE           = 'CHIN_JAPANESE';
-    const CLOVE                   = 'CLOVE';
-    const CRITH                   = 'CRITH';
-    const DALTON                  = 'DALTON';
-    const DAN                     = 'DAN';
-    const DAN_JAPANESE            = 'DAN_JAPANESE';
-    const DECIGRAM                = 'DECIGRAM';
-    const DECITONNE               = 'DECITONNE';
-    const DEKAGRAM                = 'DEKAGRAM';
-    const DEKATONNE               = 'DEKATONNE';
-    const DENARO                  = 'DENARO';
-    const DENIER                  = 'DENIER';
-    const DRACHME                 = 'DRACHME';
-    const DRAM                    = 'DRAM';
-    const DRAM_APOTHECARIES       = 'DRAM_APOTHECARIES';
-    const DYNE                    = 'DYNE';
-    const ELECTRON                = 'ELECTRON';
-    const ELECTRONVOLT            = 'ELECTRONVOLT';
-    const ETTO                    = 'ETTO';
-    const EXAGRAM                 = 'EXAGRAM';
-    const FEMTOGRAM               = 'FEMTOGRAM';
-    const FIRKIN                  = 'FIRKIN';
-    const FLASK                   = 'FLASK';
-    const FOTHER                  = 'FOTHER';
-    const FOTMAL                  = 'FOTMAL';
-    const FUNT                    = 'FUNT';
-    const FUNTE                   = 'FUNTE';
-    const GAMMA                   = 'GAMMA';
-    const GIGAELECTRONVOLT        = 'GIGAELECTRONVOLT';
-    const GIGAGRAM                = 'GIGAGRAM';
-    const GIGATONNE               = 'GIGATONNE';
-    const GIN                     = 'GIN';
-    const GIN_JAPANESE            = 'GIN_JAPANESE';
-    const GRAIN                   = 'GRAIN';
-    const GRAM                    = 'GRAM';
-    const GRAN                    = 'GRAN';
-    const GRANO                   = 'GRANO';
-    const GRANI                   = 'GRANI';
-    const GROS                    = 'GROS';
-    const HECTOGRAM               = 'HECTOGRAM';
-    const HUNDRETWEIGHT           = 'HUNDRETWEIGHT';
-    const HUNDRETWEIGHT_US        = 'HUNDRETWEIGHT_US';
-    const HYL                     = 'HYL';
-    const JIN                     = 'JIN';
-    const JUPITER                 = 'JUPITER';
-    const KATI                    = 'KATI';
-    const KATI_JAPANESE           = 'KATI_JAPANESE';
-    const KEEL                    = 'KEEL';
-    const KEG                     = 'KEG';
-    const KILODALTON              = 'KILODALTON';
-    const KILOGRAM                = 'KILOGRAM';
-    const KILOGRAM_FORCE          = 'KILOGRAM_FORCE';
-    const KILOTON                 = 'KILOTON';
-    const KILOTON_US              = 'KILOTON_US';
-    const KILOTONNE               = 'KILOTONNE';
-    const KIN                     = 'KIN';
-    const KIP                     = 'KIP';
-    const KOYAN                   = 'KOYAN';
-    const KWAN                    = 'KWAN';
-    const LAST_GERMANY            = 'LAST_GERMANY';
-    const LAST                    = 'LAST';
-    const LAST_WOOL               = 'LAST_WOOL';
-    const LB                      = 'LB';
-    const LBS                     = 'LBS';
-    const LIANG                   = 'LIANG';
-    const LIBRA_ITALIAN           = 'LIBRE_ITALIAN';
-    const LIBRA_SPANISH           = 'LIBRA_SPANISH';
-    const LIBRA_PORTUGUESE        = 'LIBRA_PORTUGUESE';
-    const LIBRA_ANCIENT           = 'LIBRA_ANCIENT';
-    const LIBRA                   = 'LIBRA';
-    const LIVRE                   = 'LIVRE';
-    const LONG_TON                = 'LONG_TON';
-    const LOT                     = 'LOT';
-    const MACE                    = 'MACE';
-    const MAHND                   = 'MAHND';
-    const MARC                    = 'MARC';
-    const MARCO                   = 'MARCO';
-    const MARK                    = 'MARK';
-    const MARK_GERMAN             = 'MARK_GERMANY';
-    const MAUND                   = 'MAUND';
-    const MAUND_PAKISTAN          = 'MAUND_PAKISTAN';
-    const MEGADALTON              = 'MEGADALTON';
-    const MEGAGRAM                = 'MEGAGRAM';
-    const MEGATONNE               = 'MEGATONNE';
-    const MERCANTILE_POUND        = 'MERCANTILE_POUND';
-    const METRIC_TON              = 'METRIC_TON';
-    const MIC                     = 'MIC';
-    const MICROGRAM               = 'MICROGRAM';
-    const MILLIDALTON             = 'MILLIDALTON';
-    const MILLIER                 = 'MILLIER';
-    const MILLIGRAM               = 'MILLIGRAM';
-    const MILLIMASS_UNIT          = 'MILLIMASS_UNIT';
-    const MINA                    = 'MINA';
-    const MOMME                   = 'MOMME';
-    const MYRIAGRAM               = 'MYRIAGRAM';
-    const NANOGRAM                = 'NANOGRAM';
-    const NEWTON                  = 'NEWTON';
-    const OBOL                    = 'OBOL';
-    const OBOLOS                  = 'OBOLOS';
-    const OBOLUS                  = 'OBOLUS';
-    const OBOLOS_ANCIENT          = 'OBOLOS_ANCIENT';
-    const OBOLUS_ANCIENT          = 'OBOLUS_ANCIENT';
-    const OKA                     = 'OKA';
-    const ONCA                    = 'ONCA';
-    const ONCE                    = 'ONCE';
-    const ONCIA                   = 'ONCIA';
-    const ONZA                    = 'ONZA';
-    const ONS                     = 'ONS';
-    const OUNCE                   = 'OUNCE';
-    const OUNCE_FORCE             = 'OUNCE_FORCE';
-    const OUNCE_TROY              = 'OUNCE_TROY';
-    const PACKEN                  = 'PACKEN';
-    const PENNYWEIGHT             = 'PENNYWEIGHT';
-    const PETAGRAM                = 'PETAGRAM';
-    const PFUND                   = 'PFUND';
-    const PICOGRAM                = 'PICOGRAM';
-    const POINT                   = 'POINT';
-    const POND                    = 'POND';
-    const POUND                   = 'POUND';
-    const POUND_FORCE             = 'POUND_FORCE';
-    const POUND_METRIC            = 'POUND_METRIC';
-    const POUND_TROY              = 'POUND_TROY';
-    const PUD                     = 'PUD';
-    const POOD                    = 'POOD';
-    const PUND                    = 'PUND';
-    const QIAN                    = 'QIAN';
-    const QINTAR                  = 'QINTAR';
-    const QUARTER                 = 'QUARTER';
-    const QUARTER_US              = 'QUARTER_US';
-    const QUARTER_TON             = 'QUARTER_TON';
-    const QUARTERN                = 'QUARTERN';
-    const QUARTERN_LOAF           = 'QUARTERN_LOAF';
-    const QUINTAL_FRENCH          = 'QUINTAL_FRENCH';
-    const QUINTAL                 = 'QUINTAL';
-    const QUINTAL_PORTUGUESE      = 'QUINTAL_PORTUGUESE';
-    const QUINTAL_SPAIN           = 'QUINTAL_SPAIN';
-    const REBAH                   = 'REBAH';
-    const ROTL                    = 'ROTL';
-    const ROTEL                   = 'ROTEL';
-    const ROTTLE                  = 'ROTTLE';
-    const RATEL                   = 'RATEL';
-    const SACK                    = 'SACK';
-    const SCRUPLE                 = 'SCRUPLE';
-    const SEER                    = 'SEER';
-    const SEER_PAKISTAN           = 'SEER_PAKISTAN';
-    const SHEKEL                  = 'SHEKEL';
-    const SHORT_TON               = 'SHORT_TON';
-    const SLINCH                  = 'SLINCH';
-    const SLUG                    = 'SLUG';
-    const STONE                   = 'STONE';
-    const TAEL                    = 'TAEL';
-    const TAHIL_JAPANESE          = 'TAHIL_JAPANESE';
-    const TAHIL                   = 'TAHIL';
-    const TALENT                  = 'TALENT';
-    const TAN                     = 'TAN';
-    const TECHNISCHE_MASS_EINHEIT = 'TECHNISCHE_MASS_EINHEIT';
-    const TERAGRAM                = 'TERAGRAM';
-    const TETRADRACHM             = 'TETRADRACHM';
-    const TICAL                   = 'TICAL';
-    const TOD                     = 'TOD';
-    const TOLA                    = 'TOLA';
-    const TOLA_PAKISTAN           = 'TOLA_PAKISTAN';
-    const TON_UK                  = 'TON_UK';
-    const TON                     = 'TON';
-    const TON_US                  = 'TON_US';
-    const TONELADA_PORTUGUESE     = 'TONELADA_PORTUGUESE';
-    const TONELADA                = 'TONELADA';
-    const TONNE                   = 'TONNE';
-    const TONNEAU                 = 'TONNEAU';
-    const TOVAR                   = 'TOVAR';
-    const TROY_OUNCE              = 'TROY_OUNCE';
-    const TROY_POUND              = 'TROY_POUND';
-    const TRUSS                   = 'TRUSS';
-    const UNCIA                   = 'UNCIA';
-    const UNZE                    = 'UNZE';
-    const VAGON                   = 'VAGON';
-    const YOCTOGRAM               = 'YOCTOGRAM';
-    const YOTTAGRAM               = 'YOTTAGRAM';
-    const ZENTNER                 = 'ZENTNER';
-    const ZEPTOGRAM               = 'ZEPTOGRAM';
-    const ZETTAGRAM               = 'ZETTAGRAM';
-
-    /**
-     * Calculations for all weight units
-     *
-     * @var array
-     */
-    protected $_units = array(
-        'ARRATEL'               => array('0.5',            'arratel'),
-        'ARTEL'                 => array('0.5',            'artel'),
-        'ARROBA_PORTUGUESE'     => array('14.69',          'arroba'),
-        'ARROBA'                => array('11.502',         '@'),
-        'AS_'                   => array('0.000052',       'as'),
-        'ASS'                   => array('0.000052',       'ass'),
-        'ATOMIC_MASS_UNIT_1960' => array('1.6603145e-27',  'amu'),
-        'ATOMIC_MASS_UNIT_1973' => array('1.6605655e-27',  'amu'),
-        'ATOMIC_MASS_UNIT_1986' => array('1.6605402e-27',  'amu'),
-        'ATOMIC_MASS_UNIT'      => array('1.66053873e-27', 'amu'),
-        'AVOGRAM'               => array('1.6605402e-27',  'avogram'),
-        'BAG'                   => array('42.63768278',    'bag'),
-        'BAHT'                  => array('0.015',          'baht'),
-        'BALE'                  => array('326.5865064',    'bl'),
-        'BALE_US'               => array('217.7243376',    'bl'),
-        'BISMAR_POUND'          => array('5.993',          'bismar pound'),
-        'CANDY'                 => array('254',            'candy'),
-        'CARAT_INTERNATIONAL'   => array('0.0002',         'ct'),
-        'CARAT'                 => array('0.0002',         'ct'),
-        'CARAT_UK'              => array('0.00025919564',  'ct'),
-        'CARAT_US_1913'         => array('0.0002053',      'ct'),
-        'CARGA'                 => array('140',            'carga'),
-        'CATTI'                 => array('0.604875',       'catti'),
-        'CATTI_JAPANESE'        => array('0.594',          'catti'),
-        'CATTY'                 => array('0.5',            'catty'),
-        'CATTY_JAPANESE'        => array('0.6',            'catty'),
-        'CATTY_THAI'            => array('0.6',            'catty'),
-        'CENTAL'                => array('45.359237',      'cH'),
-        'CENTIGRAM'             => array('0.00001',        'cg'),
-        'CENTNER'               => array('50',             'centner'),
-        'CENTNER_RUSSIAN'       => array('100',            'centner'),
-        'CHALDER'               => array('2692.52',        'chd'),
-        'CHALDRON'              => array('2692.52',        'chd'),
-        'CHIN'                  => array('0.5',            'chin'),
-        'CHIN_JAPANESE'         => array('0.6',            'chin'),
-        'CLOVE'                 => array('3.175',          'clove'),
-        'CRITH'                 => array('0.000089885',    'crith'),
-        'DALTON'                => array('1.6605402e-27',  'D'),
-        'DAN'                   => array('50',             'dan'),
-        'DAN_JAPANESE'          => array('60',             'dan'),
-        'DECIGRAM'              => array('0.0001',         'dg'),
-        'DECITONNE'             => array('100',            'dt'),
-        'DEKAGRAM'              => array('0.01',           'dag'),
-        'DEKATONNE'             => array('10000',          'dat'),
-        'DENARO'                => array('0.0011',         'denaro'),
-        'DENIER'                => array('0.001275',       'denier'),
-        'DRACHME'               => array('0.0038',         'drachme'),
-        'DRAM'                  => array(array('' => '0.45359237', '/' => '256'), 'dr'),
-        'DRAM_APOTHECARIES'     => array('0.0038879346',   'dr'),
-        'DYNE'                  => array('1.0197162e-6',   'dyn'),
-        'ELECTRON'              => array('9.109382e-31',   'e−'),
-        'ELECTRONVOLT'          => array('1.782662e-36',   'eV'),
-        'ETTO'                  => array('0.1',            'hg'),
-        'EXAGRAM'               => array('1.0e+15',        'Eg'),
-        'FEMTOGRAM'             => array('1.0e-18',        'fg'),
-        'FIRKIN'                => array('25.40117272',    'fir'),
-        'FLASK'                 => array('34.7',           'flask'),
-        'FOTHER'                => array('979.7595192',    'fother'),
-        'FOTMAL'                => array('32.65865064',    'fotmal'),
-        'FUNT'                  => array('0.4095',         'funt'),
-        'FUNTE'                 => array('0.4095',         'funte'),
-        'GAMMA'                 => array('0.000000001',    'gamma'),
-        'GIGAELECTRONVOLT'      => array('1.782662e-27',   'GeV'),
-        'GIGAGRAM'              => array('1000000',        'Gg'),
-        'GIGATONNE'             => array('1.0e+12',        'Gt'),
-        'GIN'                   => array('0.6',            'gin'),
-        'GIN_JAPANESE'          => array('0.594',          'gin'),
-        'GRAIN'                 => array('0.00006479891',  'gr'),
-        'GRAM'                  => array('0.001',          'g'),
-        'GRAN'                  => array('0.00082',        'gran'),
-        'GRANO'                 => array('0.00004905',     'grano'),
-        'GRANI'                 => array('0.00004905',     'grani'),
-        'GROS'                  => array('0.003824',       'gros'),
-        'HECTOGRAM'             => array('0.1',            'hg'),
-        'HUNDRETWEIGHT'         => array('50.80234544',    'cwt'),
-        'HUNDRETWEIGHT_US'      => array('45.359237',      'cwt'),
-        'HYL'                   => array('9.80665',        'hyl'),
-        'JIN'                   => array('0.5',            'jin'),
-        'JUPITER'               => array('1.899e+27',      'jupiter'),
-        'KATI'                  => array('0.5',            'kati'),
-        'KATI_JAPANESE'         => array('0.6',            'kati'),
-        'KEEL'                  => array('21540.19446656', 'keel'),
-        'KEG'                   => array('45.359237',      'keg'),
-        'KILODALTON'            => array('1.6605402e-24',  'kD'),
-        'KILOGRAM'              => array('1',              'kg'),
-        'KILOGRAM_FORCE'        => array('1',              'kgf'),
-        'KILOTON'               => array('1016046.9088',   'kt'),
-        'KILOTON_US'            => array('907184.74',      'kt'),
-        'KILOTONNE'             => array('1000000',        'kt'),
-        'KIN'                   => array('0.6',            'kin'),
-        'KIP'                   => array('453.59237',      'kip'),
-        'KOYAN'                 => array('2419',           'koyan'),
-        'KWAN'                  => array('3.75',           'kwan'),
-        'LAST_GERMANY'          => array('2000',           'last'),
-        'LAST'                  => array('1814.36948',     'last'),
-        'LAST_WOOL'             => array('1981.29147216',  'last'),
-        'LB'                    => array('0.45359237',     'lb'),
-        'LBS'                   => array('0.45359237',     'lbs'),
-        'LIANG'                 => array('0.05',           'liang'),
-        'LIBRE_ITALIAN'         => array('0.339',          'lb'),
-        'LIBRA_SPANISH'         => array('0.459',          'lb'),
-        'LIBRA_PORTUGUESE'      => array('0.459',          'lb'),
-        'LIBRA_ANCIENT'         => array('0.323',          'lb'),
-        'LIBRA'                 => array('1',              'lb'),
-        'LIVRE'                 => array('0.4895',         'livre'),
-        'LONG_TON'              => array('1016.0469088',   't'),
-        'LOT'                   => array('0.015',          'lot'),
-        'MACE'                  => array('0.003778',       'mace'),
-        'MAHND'                 => array('0.9253284348',   'mahnd'),
-        'MARC'                  => array('0.24475',        'marc'),
-        'MARCO'                 => array('0.23',           'marco'),
-        'MARK'                  => array('0.2268',         'mark'),
-        'MARK_GERMANY'          => array('0.2805',         'mark'),
-        'MAUND'                 => array('37.3242',        'maund'),
-        'MAUND_PAKISTAN'        => array('40',             'maund'),
-        'MEGADALTON'            => array('1.6605402e-21',  'MD'),
-        'MEGAGRAM'              => array('1000',           'Mg'),
-        'MEGATONNE'             => array('1.0e+9',         'Mt'),
-        'MERCANTILE_POUND'      => array('0.46655',        'lb merc'),
-        'METRIC_TON'            => array('1000',           't'),
-        'MIC'                   => array('1.0e-9',         'mic'),
-        'MICROGRAM'             => array('1.0e-9',         '�g'),
-        'MILLIDALTON'           => array('1.6605402e-30',  'mD'),
-        'MILLIER'               => array('1000',           'millier'),
-        'MILLIGRAM'             => array('0.000001',       'mg'),
-        'MILLIMASS_UNIT'        => array('1.6605402e-30',  'mmu'),
-        'MINA'                  => array('0.499',          'mina'),
-        'MOMME'                 => array('0.00375',        'momme'),
-        'MYRIAGRAM'             => array('10',             'myg'),
-        'NANOGRAM'              => array('1.0e-12',        'ng'),
-        'NEWTON'                => array('0.101971621',    'N'),
-        'OBOL'                  => array('0.0001',         'obol'),
-        'OBOLOS'                => array('0.0001',         'obolos'),
-        'OBOLUS'                => array('0.0001',         'obolus'),
-        'OBOLOS_ANCIENT'        => array('0.0005',         'obolos'),
-        'OBOLUS_ANCIENT'        => array('0.00057',        'obolos'),
-        'OKA'                   => array('1.28',           'oka'),
-        'ONCA'                  => array('0.02869',        'onca'),
-        'ONCE'                  => array('0.03059',        'once'),
-        'ONCIA'                 => array('0.0273',         'oncia'),
-        'ONZA'                  => array('0.02869',        'onza'),
-        'ONS'                   => array('0.1',            'ons'),
-        'OUNCE'                 => array(array('' => '0.45359237', '/' => '16'),    'oz'),
-        'OUNCE_FORCE'           => array(array('' => '0.45359237', '/' => '16'),    'ozf'),
-        'OUNCE_TROY'            => array(array('' => '65.31730128', '/' => '2100'), 'oz'),
-        'PACKEN'                => array('490.79',         'packen'),
-        'PENNYWEIGHT'           => array(array('' => '65.31730128', '/' => '42000'), 'dwt'),
-        'PETAGRAM'              => array('1.0e+12',        'Pg'),
-        'PFUND'                 => array('0.5',            'pfd'),
-        'PICOGRAM'              => array('1.0e-15',        'pg'),
-        'POINT'                 => array('0.000002',       'pt'),
-        'POND'                  => array('0.5',            'pond'),
-        'POUND'                 => array('0.45359237',     'lb'),
-        'POUND_FORCE'           => array('0.4535237',      'lbf'),
-        'POUND_METRIC'          => array('0.5',            'lb'),
-        'POUND_TROY'            => array(array('' => '65.31730128', '/' => '175'), 'lb'),
-        'PUD'                   => array('16.3',           'pud'),
-        'POOD'                  => array('16.3',           'pood'),
-        'PUND'                  => array('0.5',            'pund'),
-        'QIAN'                  => array('0.005',          'qian'),
-        'QINTAR'                => array('50',             'qintar'),
-        'QUARTER'               => array('12.70058636',    'qtr'),
-        'QUARTER_US'            => array('11.33980925',    'qtr'),
-        'QUARTER_TON'           => array('226.796185',     'qtr'),
-        'QUARTERN'              => array('1.587573295',    'quartern'),
-        'QUARTERN_LOAF'         => array('1.81436948',     'quartern-loaf'),
-        'QUINTAL_FRENCH'        => array('48.95',          'q'),
-        'QUINTAL'               => array('100',            'q'),
-        'QUINTAL_PORTUGUESE'    => array('58.752',         'q'),
-        'QUINTAL_SPAIN'         => array('45.9',           'q'),
-        'REBAH'                 => array('0.2855',         'rebah'),
-        'ROTL'                  => array('0.5',            'rotl'),
-        'ROTEL'                 => array('0.5',            'rotel'),
-        'ROTTLE'                => array('0.5',            'rottle'),
-        'RATEL'                 => array('0.5',            'ratel'),
-        'SACK'                  => array('165.10762268',   'sack'),
-        'SCRUPLE'               => array(array('' => '65.31730128', '/' => '50400'), 's'),
-        'SEER'                  => array('0.933105',       'seer'),
-        'SEER_PAKISTAN'         => array('1',              'seer'),
-        'SHEKEL'                => array('0.01142',        'shekel'),
-        'SHORT_TON'             => array('907.18474',      'st'),
-        'SLINCH'                => array('175.126908',     'slinch'),
-        'SLUG'                  => array('14.593903',      'slug'),
-        'STONE'                 => array('6.35029318',     'st'),
-        'TAEL'                  => array('0.03751',        'tael'),
-        'TAHIL_JAPANESE'        => array('0.03751',        'tahil'),
-        'TAHIL'                 => array('0.05',           'tahil'),
-        'TALENT'                => array('30',             'talent'),
-        'TAN'                   => array('50',             'tan'),
-        'TECHNISCHE_MASS_EINHEIT' => array('9.80665',      'TME'),
-        'TERAGRAM'              => array('1.0e+9',         'Tg'),
-        'TETRADRACHM'           => array('0.014',          'tetradrachm'),
-        'TICAL'                 => array('0.0164',         'tical'),
-        'TOD'                   => array('12.70058636',    'tod'),
-        'TOLA'                  => array('0.0116638125',   'tola'),
-        'TOLA_PAKISTAN'         => array('0.0125',         'tola'),
-        'TON_UK'                => array('1016.0469088',   't'),
-        'TON'                   => array('1000',           't'),
-        'TON_US'                => array('907.18474',      't'),
-        'TONELADA_PORTUGUESE'   => array('793.15',         'tonelada'),
-        'TONELADA'              => array('919.9',          'tonelada'),
-        'TONNE'                 => array('1000',           't'),
-        'TONNEAU'               => array('979',            'tonneau'),
-        'TOVAR'                 => array('128.8',          'tovar'),
-        'TROY_OUNCE'            => array(array('' => '65.31730128', '/' => '2100'), 'troy oz'),
-        'TROY_POUND'            => array(array('' => '65.31730128', '/' => '175'),  'troy lb'),
-        'TRUSS'                 => array('25.40117272',    'truss'),
-        'UNCIA'                 => array('0.0272875',      'uncia'),
-        'UNZE'                  => array('0.03125',        'unze'),
-        'VAGON'                 => array('10000',          'vagon'),
-        'YOCTOGRAM'             => array('1.0e-27',        'yg'),
-        'YOTTAGRAM'             => array('1.0e+21',        'Yg'),
-        'ZENTNER'               => array('50',             'Ztr'),
-        'ZEPTOGRAM'             => array('1.0e-24',        'zg'),
-        'ZETTAGRAM'             => array('1.0e+18',        'Zg'),
-        'STANDARD'              => 'KILOGRAM'
-    );
-}
diff --git a/airtime_mvc/library/Zend/Memory.php b/airtime_mvc/library/Zend/Memory.php
deleted file mode 100644
index 78f23c96b..000000000
--- a/airtime_mvc/library/Zend/Memory.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Memory.php 20805 2010-02-01 15:52:15Z alexander $
- */
-
-/** Zend_Memory_Exception */
-require_once 'Zend/Memory/Manager.php';
-
-/** Zend_Memory_Value */
-require_once 'Zend/Memory/Value.php';
-
-/** Zend_Memory_Container */
-require_once 'Zend/Memory/Container.php';
-
-/** Zend_Memory_Exception */
-require_once 'Zend/Cache.php';
-
-/**
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory
-{
-    /**
-     * Factory
-     *
-     * @param string $backend backend name
-     * @param array $backendOptions associative array of options for the corresponding backend constructor
-     * @return Zend_Memory_Manager
-     * @throws Zend_Memory_Exception
-     */
-    public static function factory($backend, $backendOptions = array())
-    {
-        if (strcasecmp($backend, 'none') == 0) {
-            return new Zend_Memory_Manager();
-        }
-
-        // Look through available backendsand
-        // (that allows to specify it in any case)
-        $backendIsFound = false;
-        foreach (Zend_Cache::$availableBackends as $zendCacheBackend) {
-            if (strcasecmp($backend, $zendCacheBackend) == 0) {
-                $backend = $zendCacheBackend;
-                $backendIsFound = true;
-                break;
-            }
-        }
-
-        if (!$backendIsFound) {
-            require_once 'Zend/Memory/Exception.php';
-            throw new Zend_Memory_Exception("Incorrect backend ($backend)");
-        }
-
-        $backendClass = 'Zend_Cache_Backend_' . $backend;
-
-        // For perfs reasons, we do not use the Zend_Loader::loadClass() method
-        // (security controls are explicit)
-        require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-
-        $backendObject = new $backendClass($backendOptions);
-
-        return new Zend_Memory_Manager($backendObject);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Memory/AccessController.php b/airtime_mvc/library/Zend/Memory/AccessController.php
deleted file mode 100644
index f8f9d3e78..000000000
--- a/airtime_mvc/library/Zend/Memory/AccessController.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccessController.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Memory_Container_Interface
- */
-require_once 'Zend/Memory/Container/Interface.php';
-
-/**
- * Memory object container access controller.
- *
- * Memory manager stores a list of generated objects to control them.
- * So container objects always have at least one reference and can't be automatically destroyed.
- *
- * This class is intended to be an userland proxy to memory container object.
- * It's not referenced by memory manager and class destructor is invoked immidiately after gouing
- * out of scope or unset operation.
- *
- * Class also provides Zend_Memory_Container_Interface interface and works as proxy for such cases.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory_AccessController implements Zend_Memory_Container_Interface
-{
-    /**
-     * Memory container object
-     *
-     * @var Zend_Memory_Container
-     */
-    private $_memContainer;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Memory_Container_Movable $memoryManager
-     */
-    public function __construct(Zend_Memory_Container_Movable $memContainer)
-    {
-        $this->_memContainer = $memContainer;
-    }
-
-    /**
-     * Object destructor
-     */
-    public function __destruct()
-    {
-        $this->_memContainer->destroy();
-    }
-
-
-    /**
-     * Get string value reference
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @return &string
-     */
-    public function &getRef()
-    {
-        return $this->_memContainer->getRef();
-    }
-
-    /**
-     * Signal, that value is updated by external code.
-     *
-     * Should be used together with getRef()
-     */
-    public function touch()
-    {
-        $this->_memContainer->touch();
-    }
-
-    /**
-     * Lock object in memory.
-     */
-    public function lock()
-    {
-        $this->_memContainer->lock();
-    }
-
-
-    /**
-     * Unlock object
-     */
-    public function unlock()
-    {
-        $this->_memContainer->unlock();
-    }
-
-    /**
-     * Return true if object is locked
-     *
-     * @return boolean
-     */
-    public function isLocked()
-    {
-        return $this->_memContainer->isLocked();
-    }
-
-    /**
-     * Get handler
-     *
-     * Loads object if necessary and moves it to the top of loaded objects list.
-     * Swaps objects from the bottom of loaded objects list, if necessary.
-     *
-     * @param string $property
-     * @return string
-     * @throws Zend_Memory_Exception
-     */
-    public function __get($property)
-    {
-        return $this->_memContainer->$property;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  string $value
-     * @throws Zend_Exception
-     */
-    public function __set($property, $value)
-    {
-        $this->_memContainer->$property = $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Memory/Container.php b/airtime_mvc/library/Zend/Memory/Container.php
deleted file mode 100644
index 37ef369dc..000000000
--- a/airtime_mvc/library/Zend/Memory/Container.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Memory_Container_Interface */
-require_once 'Zend/Memory/Container/Interface.php';
-
-/**
- * Memory value container
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Memory_Container implements Zend_Memory_Container_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/Memory/Container/Interface.php b/airtime_mvc/library/Zend/Memory/Container/Interface.php
deleted file mode 100644
index 2c7fb5038..000000000
--- a/airtime_mvc/library/Zend/Memory/Container/Interface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Memory value container interface
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Memory_Container_Interface
-{
-    /**
-     * Get string value reference
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @return &string
-     */
-    public function &getRef();
-
-    /**
-     * Signal, that value is updated by external code.
-     *
-     * Should be used together with getRef()
-     */
-    public function touch();
-
-    /**
-     * Lock object in memory.
-     */
-    public function lock();
-
-    /**
-     * Unlock object
-     */
-    public function unlock();
-
-    /**
-     * Return true if object is locked
-     *
-     * @return boolean
-     */
-    public function isLocked();
-}
-
diff --git a/airtime_mvc/library/Zend/Memory/Container/Locked.php b/airtime_mvc/library/Zend/Memory/Container/Locked.php
deleted file mode 100644
index 377650c97..000000000
--- a/airtime_mvc/library/Zend/Memory/Container/Locked.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Locked.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Memory_Container */
-require_once 'Zend/Memory/Container.php';
-
-/**
- * Memory value container
- *
- * Locked (always stored in memory).
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory_Container_Locked extends Zend_Memory_Container
-{
-    /**
-     * Value object
-     *
-     * @var string
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Memory_Manager $memoryManager
-     * @param integer $id
-     * @param string $value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Lock object in memory.
-     */
-    public function lock()
-    {
-        /* Do nothing */
-    }
-
-    /**
-     * Unlock object
-     */
-    public function unlock()
-    {
-        /* Do nothing */
-    }
-
-    /**
-     * Return true if object is locked
-     *
-     * @return boolean
-     */
-    public function isLocked()
-    {
-        return true;
-    }
-
-    /**
-     * Get string value reference
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @return &string
-     */
-    public function &getRef()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Signal, that value is updated by external code.
-     *
-     * Should be used together with getRef()
-     */
-    public function touch()
-    {
-        /* Do nothing */
-    }
-
-    /**
-     * Destroy memory container and remove it from memory manager list
-     */
-    public function destroy()
-    {
-        /* Do nothing */
-    }
-}
diff --git a/airtime_mvc/library/Zend/Memory/Container/Movable.php b/airtime_mvc/library/Zend/Memory/Container/Movable.php
deleted file mode 100644
index f3019f678..000000000
--- a/airtime_mvc/library/Zend/Memory/Container/Movable.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Movable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Memory_Container */
-require_once 'Zend/Memory/Container.php';
-
-/** Zend_Memory_Value */
-require_once 'Zend/Memory/Value.php';
-
-/**
- * Memory value container
- *
- * Movable (may be swapped with specified backend and unloaded).
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory_Container_Movable extends Zend_Memory_Container {
-    /**
-     * Internal object Id
-     *
-     * @var integer
-     */
-    protected $_id;
-
-    /**
-     * Memory manager reference
-     *
-     * @var Zend_Memory_Manager
-     */
-    private $_memManager;
-
-    /**
-     * Value object
-     *
-     * @var Zend_Memory_Value
-     */
-    private $_value;
-
-    /** Value states */
-    const LOADED   = 1;
-    const SWAPPED  = 2;
-    const LOCKED   = 4;
-
-    /**
-     * Value state (LOADED/SWAPPED/LOCKED)
-     *
-     * @var integer
-     */
-    private $_state;
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Memory_Manager $memoryManager
-     * @param integer $id
-     * @param string $value
-     */
-    public function __construct(Zend_Memory_Manager $memoryManager, $id, $value)
-    {
-        $this->_memManager = $memoryManager;
-        $this->_id    = $id;
-        $this->_state = self::LOADED;
-        $this->_value = new Zend_Memory_Value($value, $this);
-    }
-
-    /**
-     * Lock object in memory.
-     */
-    public function lock()
-    {
-        if ( !($this->_state & self::LOADED) ) {
-            $this->_memManager->load($this, $this->_id);
-            $this->_state |= self::LOADED;
-        }
-
-        $this->_state |= self::LOCKED;
-
-        /**
-         * @todo
-         * It's possible to set "value" container attribute to avoid modification tracing, while it's locked
-         * Check, if it's  more effective
-         */
-    }
-
-    /**
-     * Unlock object
-     */
-    public function unlock()
-    {
-        // Clear LOCKED state bit
-        $this->_state &= ~self::LOCKED;
-    }
-
-    /**
-     * Return true if object is locked
-     *
-     * @return boolean
-     */
-    public function isLocked()
-    {
-        return $this->_state & self::LOCKED;
-    }
-
-    /**
-     * Get handler
-     *
-     * Loads object if necessary and moves it to the top of loaded objects list.
-     * Swaps objects from the bottom of loaded objects list, if necessary.
-     *
-     * @param string $property
-     * @return string
-     * @throws Zend_Memory_Exception
-     */
-    public function __get($property)
-    {
-        if ($property != 'value') {
-            require_once 'Zend/Memory/Exception.php';
-            throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property);
-        }
-
-        if ( !($this->_state & self::LOADED) ) {
-            $this->_memManager->load($this, $this->_id);
-            $this->_state |= self::LOADED;
-        }
-
-        return $this->_value;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  string $value
-     * @throws Zend_Exception
-     */
-    public function __set($property, $value)
-    {
-        if ($property != 'value') {
-            require_once 'Zend/Memory/Exception.php';
-            throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property);
-        }
-
-        $this->_state = self::LOADED;
-        $this->_value = new Zend_Memory_Value($value, $this);
-
-        $this->_memManager->processUpdate($this, $this->_id);
-    }
-
-
-    /**
-     * Get string value reference
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @return &string
-     */
-    public function &getRef()
-    {
-        if ( !($this->_state & self::LOADED) ) {
-            $this->_memManager->load($this, $this->_id);
-            $this->_state |= self::LOADED;
-        }
-
-        return $this->_value->getRef();
-    }
-
-    /**
-     * Signal, that value is updated by external code.
-     *
-     * Should be used together with getRef()
-     */
-    public function touch()
-    {
-        $this->_memManager->processUpdate($this, $this->_id);
-    }
-
-    /**
-     * Process container value update.
-     * Must be called only by value object
-     *
-     * @internal
-     */
-    public function processUpdate()
-    {
-        // Clear SWAPPED state bit
-        $this->_state &= ~self::SWAPPED;
-
-        $this->_memManager->processUpdate($this, $this->_id);
-    }
-
-    /**
-     * Start modifications trace
-     *
-     * @internal
-     */
-    public function startTrace()
-    {
-        if ( !($this->_state & self::LOADED) ) {
-            $this->_memManager->load($this, $this->_id);
-            $this->_state |= self::LOADED;
-        }
-
-        $this->_value->startTrace();
-    }
-
-    /**
-     * Set value (used by memory manager when value is loaded)
-     *
-     * @internal
-     */
-    public function setValue($value)
-    {
-        $this->_value = new Zend_Memory_Value($value, $this);
-    }
-
-    /**
-     * Clear value (used by memory manager when value is swapped)
-     *
-     * @internal
-     */
-    public function unloadValue()
-    {
-        // Clear LOADED state bit
-        $this->_state &= ~self::LOADED;
-
-        $this->_value = null;
-    }
-
-    /**
-     * Mark, that object is swapped
-     *
-     * @internal
-     */
-    public function markAsSwapped()
-    {
-        // Clear LOADED state bit
-        $this->_state |= self::LOADED;
-    }
-
-    /**
-     * Check if object is marked as swapped
-     *
-     * @internal
-     * @return boolean
-     */
-    public function isSwapped()
-    {
-        return $this->_state & self::SWAPPED;
-    }
-
-    /**
-     * Get object id
-     *
-     * @internal
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-    /**
-     * Destroy memory container and remove it from memory manager list
-     *
-     * @internal
-     */
-    public function destroy()
-    {
-        /**
-         * We don't clean up swap because of performance considerations
-         * Cleaning is performed by Memory Manager destructor
-         */
-
-        $this->_memManager->unlink($this, $this->_id);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Memory/Exception.php b/airtime_mvc/library/Zend/Memory/Exception.php
deleted file mode 100644
index 193cffe14..000000000
--- a/airtime_mvc/library/Zend/Memory/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Controller_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Memory/Manager.php b/airtime_mvc/library/Zend/Memory/Manager.php
deleted file mode 100644
index 3adf57f6c..000000000
--- a/airtime_mvc/library/Zend/Memory/Manager.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manager.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Memory_Container_Movable */
-require_once 'Zend/Memory/Container/Movable.php';
-
-/** Zend_Memory_Container_Locked */
-require_once 'Zend/Memory/Container/Locked.php';
-
-/** Zend_Memory_AccessController */
-require_once 'Zend/Memory/AccessController.php';
-
-
-/**
- * Memory manager
- *
- * This class encapsulates memory menagement operations, when PHP works
- * in limited memory mode.
- *
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Memory_Manager
-{
-    /**
-     * Object storage backend
-     *
-     * @var Zend_Cache_Backend_Interface
-     */
-    private $_backend = null;
-
-    /**
-     * Memory grow limit.
-     * Default value is 2/3 of memory_limit php.ini variable
-     * Negative value means no limit
-     *
-     * @var integer
-     */
-    private $_memoryLimit = -1;
-
-    /**
-     * Minimum value size to be swapped.
-     * Default value is 16K
-     * Negative value means that memory objects are never swapped
-     *
-     * @var integer
-     */
-    private $_minSize = 16384;
-
-    /**
-     * Overall size of memory, used by values
-     *
-     * @var integer
-     */
-    private $_memorySize = 0;
-
-    /**
-     * Id for next Zend_Memory object
-     *
-     * @var integer
-     */
-    private $_nextId = 0;
-
-    /**
-     * List of candidates to unload
-     *
-     * It also represents objects access history. Last accessed objects are moved to the end of array
-     *
-     * array(
-     *     <id> => <memory container object>,
-     *     ...
-     *      )
-     *
-     * @var array
-     */
-    private $_unloadCandidates = array();
-
-    /**
-     * List of object sizes.
-     *
-     * This list is used to calculate modification of object sizes
-     *
-     * array( <id> => <size>, ...)
-     *
-     * @var array
-     */
-    private $_sizes = array();
-
-    /**
-     * Last modified object
-     *
-     * It's used to reduce number of calls necessary to trace objects' modifications
-     * Modification is not processed by memory manager until we do not switch to another
-     * object.
-     * So we have to trace only _first_ object modification and do nothing for others
-     *
-     * @var Zend_Memory_Container_Movable
-     */
-    private $_lastModified = null;
-
-    /**
-     * Unique memory manager id
-     *
-     * @var integer
-     */
-    private $_managerId;
-
-    /**
-     * Tags array, used by backend to categorize stored values
-     *
-     * @var array
-     */
-    private $_tags;
-
-    /**
-     * This function is intended to generate unique id, used by memory manager
-     */
-    private function _generateMemManagerId()
-    {
-        /**
-         * @todo !!!
-         * uniqid() php function doesn't really garantee the id to be unique
-         * it should be changed by something else
-         * (Ex. backend interface should be extended to provide this functionality)
-         */
-        $this->_managerId = uniqid('ZendMemManager', true);
-        $this->_tags = array($this->_managerId);
-        $this->_managerId .= '_';
-    }
-
-
-    /**
-     * Memory manager constructor
-     *
-     * If backend is not specified, then memory objects are never swapped
-     *
-     * @param Zend_Cache_Backend $backend
-     * @param array $backendOptions associative array of options for the corresponding backend constructor
-     */
-    public function __construct($backend = null)
-    {
-        if ($backend === null) {
-            return;
-        }
-
-        $this->_backend = $backend;
-        $this->_generateMemManagerId();
-
-        $memoryLimitStr = trim(ini_get('memory_limit'));
-        if ($memoryLimitStr != ''  &&  $memoryLimitStr != -1) {
-            $this->_memoryLimit = (integer)$memoryLimitStr;
-            switch (strtolower($memoryLimitStr[strlen($memoryLimitStr)-1])) {
-                case 'g':
-                    $this->_memoryLimit *= 1024;
-                    // Break intentionally omitted
-                case 'm':
-                    $this->_memoryLimit *= 1024;
-                    // Break intentionally omitted
-                case 'k':
-                    $this->_memoryLimit *= 1024;
-                    break;
-
-                default:
-                    break;
-            }
-
-            $this->_memoryLimit = (int)($this->_memoryLimit*2/3);
-        } // No limit otherwise
-    }
-
-    /**
-     * Object destructor
-     *
-     * Clean up backend storage
-     */
-    public function __destruct()
-    {
-        if ($this->_backend !== null) {
-            $this->_backend->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, $this->_tags);
-        }
-    }
-
-    /**
-     * Set memory grow limit
-     *
-     * @param integer $newLimit
-     * @throws Zend_Exception
-     */
-    public function setMemoryLimit($newLimit)
-    {
-        $this->_memoryLimit = $newLimit;
-
-        $this->_swapCheck();
-    }
-
-    /**
-     * Get memory grow limit
-     *
-     * @return integer
-     */
-    public function getMemoryLimit()
-    {
-        return $this->_memoryLimit;
-    }
-
-    /**
-     * Set minimum size of values, which may be swapped
-     *
-     * @param integer $newSize
-     */
-    public function setMinSize($newSize)
-    {
-        $this->_minSize = $newSize;
-    }
-
-    /**
-     * Get minimum size of values, which may be swapped
-     *
-     * @return integer
-     */
-    public function getMinSize()
-    {
-        return $this->_minSize;
-    }
-
-    /**
-     * Create new Zend_Memory value container
-     *
-     * @param string $value
-     * @return Zend_Memory_Container_Interface
-     * @throws Zend_Memory_Exception
-     */
-    public function create($value = '')
-    {
-        return $this->_create($value,  false);
-    }
-
-    /**
-     * Create new Zend_Memory value container, which has value always
-     * locked in memory
-     *
-     * @param string $value
-     * @return Zend_Memory_Container_Interface
-     * @throws Zend_Memory_Exception
-     */
-    public function createLocked($value = '')
-    {
-        return $this->_create($value, true);
-    }
-
-    /**
-     * Create new Zend_Memory object
-     *
-     * @param string $value
-     * @param boolean $locked
-     * @return Zend_Memory_Container_Interface
-     * @throws Zend_Memory_Exception
-     */
-    private function _create($value, $locked)
-    {
-        $id = $this->_nextId++;
-
-        if ($locked  ||  ($this->_backend === null) /* Use only memory locked objects if backend is not specified */) {
-            return new Zend_Memory_Container_Locked($value);
-        }
-
-        // Commit other objects modifications
-        $this->_commit();
-
-        $valueObject = new Zend_Memory_Container_Movable($this, $id, $value);
-
-        // Store last object size as 0
-        $this->_sizes[$id] = 0;
-        // prepare object for next modifications
-        $this->_lastModified = $valueObject;
-
-        return new Zend_Memory_AccessController($valueObject);
-    }
-
-    /**
-     * Unlink value container from memory manager
-     *
-     * Used by Memory container destroy() method
-     *
-     * @internal
-     * @param integer $id
-     * @return Zend_Memory_Container
-     */
-    public function unlink(Zend_Memory_Container_Movable $container, $id)
-    {
-        if ($this->_lastModified === $container) {
-            // Drop all object modifications
-            $this->_lastModified = null;
-            unset($this->_sizes[$id]);
-            return;
-        }
-
-        if (isset($this->_unloadCandidates[$id])) {
-            unset($this->_unloadCandidates[$id]);
-        }
-
-        $this->_memorySize -= $this->_sizes[$id];
-        unset($this->_sizes[$id]);
-    }
-
-    /**
-     * Process value update
-     *
-     * @internal
-     * @param Zend_Memory_Container_Movable $container
-     * @param integer $id
-     */
-    public function processUpdate(Zend_Memory_Container_Movable $container, $id)
-    {
-        /**
-         * This method is automatically invoked by memory container only once per
-         * "modification session", but user may call memory container touch() method
-         * several times depending on used algorithm. So we have to use this check
-         * to optimize this case.
-         */
-        if ($container === $this->_lastModified) {
-            return;
-        }
-
-        // Remove just updated object from list of candidates to unload
-        if( isset($this->_unloadCandidates[$id])) {
-            unset($this->_unloadCandidates[$id]);
-        }
-
-        // Reduce used memory mark
-        $this->_memorySize -= $this->_sizes[$id];
-
-        // Commit changes of previously modified object if necessary
-        $this->_commit();
-
-        $this->_lastModified = $container;
-    }
-
-    /**
-     * Commit modified object and put it back to the loaded objects list
-     */
-    private function _commit()
-    {
-        if (($container = $this->_lastModified) === null) {
-            return;
-        }
-
-        $this->_lastModified = null;
-
-        $id = $container->getId();
-
-        // Calculate new object size and increase used memory size by this value
-        $this->_memorySize += ($this->_sizes[$id] = strlen($container->getRef()));
-
-        if ($this->_sizes[$id] > $this->_minSize) {
-            // Move object to "unload candidates list"
-            $this->_unloadCandidates[$id] = $container;
-        }
-
-        $container->startTrace();
-
-        $this->_swapCheck();
-    }
-
-    /**
-     * Check and swap objects if necessary
-     *
-     * @throws Zend_MemoryException
-     */
-    private function _swapCheck()
-    {
-        if ($this->_memoryLimit < 0  ||  $this->_memorySize < $this->_memoryLimit) {
-            // Memory limit is not reached
-            // Do nothing
-            return;
-        }
-
-        // walk through loaded objects in access history order
-        foreach ($this->_unloadCandidates as $id => $container) {
-            $this->_swap($container, $id);
-            unset($this->_unloadCandidates[$id]);
-
-            if ($this->_memorySize < $this->_memoryLimit) {
-                // We've swapped enough objects
-                return;
-            }
-        }
-
-        require_once 'Zend/Memory/Exception.php';
-        throw new Zend_Memory_Exception('Memory manager can\'t get enough space.');
-    }
-
-
-    /**
-     * Swap object data to disk
-     * Actualy swaps data or only unloads it from memory,
-     * if object is not changed since last swap
-     *
-     * @param Zend_Memory_Container_Movable $container
-     * @param integer $id
-     */
-    private function _swap(Zend_Memory_Container_Movable $container, $id)
-    {
-        if ($container->isLocked()) {
-            return;
-        }
-
-        if (!$container->isSwapped()) {
-            $this->_backend->save($container->getRef(), $this->_managerId . $id, $this->_tags);
-        }
-
-        $this->_memorySize -= $this->_sizes[$id];
-
-        $container->markAsSwapped();
-        $container->unloadValue();
-    }
-
-    /**
-     * Load value from swap file.
-     *
-     * @internal
-     * @param Zend_Memory_Container_Movable $container
-     * @param integer $id
-     */
-    public function load(Zend_Memory_Container_Movable $container, $id)
-    {
-        $value = $this->_backend->load($this->_managerId . $id, true);
-
-        // Try to swap other objects if necessary
-        // (do not include specified object into check)
-        $this->_memorySize += strlen($value);
-        $this->_swapCheck();
-
-        // Add loaded obect to the end of loaded objects list
-        $container->setValue($value);
-
-        if ($this->_sizes[$id] > $this->_minSize) {
-            // Add object to the end of "unload candidates list"
-            $this->_unloadCandidates[$id] = $container;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Memory/Value.php b/airtime_mvc/library/Zend/Memory/Value.php
deleted file mode 100644
index 7eb6c61f6..000000000
--- a/airtime_mvc/library/Zend/Memory/Value.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Value.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * String value object
- *
- * It's an OO string wrapper.
- * Used to intercept string updates.
- *
- * @category   Zend
- * @package    Zend_Memory
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @todo       also implement Countable for PHP 5.1 but not yet to stay 5.0 compatible
- */
-class Zend_Memory_Value implements ArrayAccess {
-    /**
-     * Value
-     *
-     * @var string
-     */
-    private $_value;
-
-    /**
-     * Container
-     *
-     * @var Zend_Memory_Container_Interface
-     */
-    private $_container;
-
-    /**
-     * Boolean flag which signals to trace value modifications
-     *
-     * @var boolean
-     */
-    private $_trace;
-
-
-    /**
-     * Object constructor
-     *
-     * @param string $value
-     * @param Zend_Memory_Container_Movable $container
-     */
-    public function __construct($value, Zend_Memory_Container_Movable $container)
-    {
-        $this->_container = $container;
-
-        $this->_value = (string)$value;
-
-        /**
-         * Object is marked as just modified by memory manager
-         * So we don't need to trace followed object modifications and
-         * object is processed (and marked as traced) when another
-         * memory object is modified.
-         *
-         * It reduces overall numberr of calls necessary to modification trace
-         */
-        $this->_trace = false;
-    }
-
-
-    /**
-     * ArrayAccess interface method
-     * returns true if string offset exists
-     *
-     * @param integer $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return $offset >= 0  &&  $offset < strlen($this->_value);
-    }
-
-    /**
-     * ArrayAccess interface method
-     * Get character at $offset position
-     *
-     * @param integer $offset
-     * @return string
-     */
-    public function offsetGet($offset)
-    {
-        return $this->_value[$offset];
-    }
-
-    /**
-     * ArrayAccess interface method
-     * Set character at $offset position
-     *
-     * @param integer $offset
-     * @param string $char
-     */
-    public function offsetSet($offset, $char)
-    {
-        $this->_value[$offset] = $char;
-
-        if ($this->_trace) {
-            $this->_trace = false;
-            $this->_container->processUpdate();
-        }
-    }
-
-    /**
-     * ArrayAccess interface method
-     * Unset character at $offset position
-     *
-     * @param integer $offset
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->_value[$offset]);
-
-        if ($this->_trace) {
-            $this->_trace = false;
-            $this->_container->processUpdate();
-        }
-    }
-
-
-    /**
-     * To string conversion
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_value;
-    }
-
-
-    /**
-     * Get string value reference
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @internal
-     * @return string
-     */
-    public function &getRef()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Start modifications trace
-     *
-     * _Must_ be used for value access before PHP v 5.2
-     * or _may_ be used for performance considerations
-     *
-     * @internal
-     */
-    public function startTrace()
-    {
-        $this->_trace = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mime.php b/airtime_mvc/library/Zend/Mime.php
deleted file mode 100644
index aa3582efe..000000000
--- a/airtime_mvc/library/Zend/Mime.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mime.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Support class for MultiPart Mime Messages
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime
-{
-    const TYPE_OCTETSTREAM = 'application/octet-stream';
-    const TYPE_TEXT = 'text/plain';
-    const TYPE_HTML = 'text/html';
-    const ENCODING_7BIT = '7bit';
-    const ENCODING_8BIT = '8bit';
-    const ENCODING_QUOTEDPRINTABLE = 'quoted-printable';
-    const ENCODING_BASE64 = 'base64';
-    const DISPOSITION_ATTACHMENT = 'attachment';
-    const DISPOSITION_INLINE = 'inline';
-    const LINELENGTH = 72;
-    const LINEEND = "\n";
-    const MULTIPART_ALTERNATIVE = 'multipart/alternative';
-    const MULTIPART_MIXED = 'multipart/mixed';
-    const MULTIPART_RELATED = 'multipart/related';
-
-    protected $_boundary;
-    protected static $makeUnique = 0;
-
-    // lookup-Tables for QuotedPrintable
-    public static $qpKeys = array(
-        "\x00","\x01","\x02","\x03","\x04","\x05","\x06","\x07",
-        "\x08","\x09","\x0A","\x0B","\x0C","\x0D","\x0E","\x0F",
-        "\x10","\x11","\x12","\x13","\x14","\x15","\x16","\x17",
-        "\x18","\x19","\x1A","\x1B","\x1C","\x1D","\x1E","\x1F",
-        "\x7F","\x80","\x81","\x82","\x83","\x84","\x85","\x86",
-        "\x87","\x88","\x89","\x8A","\x8B","\x8C","\x8D","\x8E",
-        "\x8F","\x90","\x91","\x92","\x93","\x94","\x95","\x96",
-        "\x97","\x98","\x99","\x9A","\x9B","\x9C","\x9D","\x9E",
-        "\x9F","\xA0","\xA1","\xA2","\xA3","\xA4","\xA5","\xA6",
-        "\xA7","\xA8","\xA9","\xAA","\xAB","\xAC","\xAD","\xAE",
-        "\xAF","\xB0","\xB1","\xB2","\xB3","\xB4","\xB5","\xB6",
-        "\xB7","\xB8","\xB9","\xBA","\xBB","\xBC","\xBD","\xBE",
-        "\xBF","\xC0","\xC1","\xC2","\xC3","\xC4","\xC5","\xC6",
-        "\xC7","\xC8","\xC9","\xCA","\xCB","\xCC","\xCD","\xCE",
-        "\xCF","\xD0","\xD1","\xD2","\xD3","\xD4","\xD5","\xD6",
-        "\xD7","\xD8","\xD9","\xDA","\xDB","\xDC","\xDD","\xDE",
-        "\xDF","\xE0","\xE1","\xE2","\xE3","\xE4","\xE5","\xE6",
-        "\xE7","\xE8","\xE9","\xEA","\xEB","\xEC","\xED","\xEE",
-        "\xEF","\xF0","\xF1","\xF2","\xF3","\xF4","\xF5","\xF6",
-        "\xF7","\xF8","\xF9","\xFA","\xFB","\xFC","\xFD","\xFE",
-        "\xFF"
-        );
-
-    public static $qpReplaceValues = array(
-        "=00","=01","=02","=03","=04","=05","=06","=07",
-        "=08","=09","=0A","=0B","=0C","=0D","=0E","=0F",
-        "=10","=11","=12","=13","=14","=15","=16","=17",
-        "=18","=19","=1A","=1B","=1C","=1D","=1E","=1F",
-        "=7F","=80","=81","=82","=83","=84","=85","=86",
-        "=87","=88","=89","=8A","=8B","=8C","=8D","=8E",
-        "=8F","=90","=91","=92","=93","=94","=95","=96",
-        "=97","=98","=99","=9A","=9B","=9C","=9D","=9E",
-        "=9F","=A0","=A1","=A2","=A3","=A4","=A5","=A6",
-        "=A7","=A8","=A9","=AA","=AB","=AC","=AD","=AE",
-        "=AF","=B0","=B1","=B2","=B3","=B4","=B5","=B6",
-        "=B7","=B8","=B9","=BA","=BB","=BC","=BD","=BE",
-        "=BF","=C0","=C1","=C2","=C3","=C4","=C5","=C6",
-        "=C7","=C8","=C9","=CA","=CB","=CC","=CD","=CE",
-        "=CF","=D0","=D1","=D2","=D3","=D4","=D5","=D6",
-        "=D7","=D8","=D9","=DA","=DB","=DC","=DD","=DE",
-        "=DF","=E0","=E1","=E2","=E3","=E4","=E5","=E6",
-        "=E7","=E8","=E9","=EA","=EB","=EC","=ED","=EE",
-        "=EF","=F0","=F1","=F2","=F3","=F4","=F5","=F6",
-        "=F7","=F8","=F9","=FA","=FB","=FC","=FD","=FE",
-        "=FF"
-        );
-
-    public static $qpKeysString =
-         "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
-
-    /**
-     * Check if the given string is "printable"
-     *
-     * Checks that a string contains no unprintable characters. If this returns
-     * false, encode the string for secure delivery.
-     *
-     * @param string $str
-     * @return boolean
-     */
-    public static function isPrintable($str)
-    {
-        return (strcspn($str, self::$qpKeysString) == strlen($str));
-    }
-
-    /**
-     * Encode a given string with the QUOTED_PRINTABLE mechanism and wrap the lines.
-     *
-     * @param string $str
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeQuotedPrintable($str,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        $out = '';
-        $str = self::_encodeQuotedPrintable($str);
-
-        // Split encoded text into separate lines
-        while ($str) {
-            $ptr = strlen($str);
-            if ($ptr > $lineLength) {
-                $ptr = $lineLength;
-            }
-
-            // Ensure we are not splitting across an encoded character
-            $pos = strrpos(substr($str, 0, $ptr), '=');
-            if ($pos !== false && $pos >= $ptr - 2) {
-                $ptr = $pos;
-            }
-
-            // Check if there is a space at the end of the line and rewind
-            if ($ptr > 0 && $str[$ptr - 1] == ' ') {
-                --$ptr;
-            }
-
-            // Add string and continue
-            $out .= substr($str, 0, $ptr) . '=' . $lineEnd;
-            $str = substr($str, $ptr);
-        }
-
-        $out = rtrim($out, $lineEnd);
-        $out = rtrim($out, '=');
-        return $out;
-    }
-
-    /**
-     * Converts a string into quoted printable format.
-     *
-     * @param  string $str
-     * @return string
-     */
-    private static function _encodeQuotedPrintable($str)
-    {
-        $str = str_replace('=', '=3D', $str);
-        $str = str_replace(self::$qpKeys, self::$qpReplaceValues, $str);
-        $str = rtrim($str);
-        return $str;
-    }
-
-    /**
-     * Encode a given string with the QUOTED_PRINTABLE mechanism for Mail Headers.
-     *
-     * Mail headers depend on an extended quoted printable algorithm otherwise
-     * a range of bugs can occur.
-     *
-     * @param string $str
-     * @param string $charset
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeQuotedPrintableHeader($str, $charset,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        // Reduce line-length by the length of the required delimiter, charsets and encoding
-        $prefix = sprintf('=?%s?Q?', $charset);
-        $lineLength = $lineLength-strlen($prefix)-3;
-
-        $str = self::_encodeQuotedPrintable($str);
-
-        // Mail-Header required chars have to be encoded also:
-        $str = str_replace(array('?', ' ', '_'), array('=3F', '=20', '=5F'), $str);
-
-        // initialize first line, we need it anyways
-        $lines = array(0 => "");
-
-        // Split encoded text into separate lines
-        $tmp = "";
-        while(strlen($str) > 0) {
-            $currentLine = max(count($lines)-1, 0);
-            $token       = self::getNextQuotedPrintableToken($str);
-            $str         = substr($str, strlen($token));
-
-            $tmp .= $token;
-            if($token == '=20') {
-                // only if we have a single char token or space, we can append the
-                // tempstring it to the current line or start a new line if necessary.
-                if(strlen($lines[$currentLine].$tmp) > $lineLength) {
-                    $lines[$currentLine+1] = $tmp;
-                } else {
-                    $lines[$currentLine] .= $tmp;
-                }
-                $tmp = "";
-            }
-            // don't forget to append the rest to the last line
-            if(strlen($str) == 0) {
-                $lines[$currentLine] .= $tmp;
-            }
-        }
-
-        // assemble the lines together by pre- and appending delimiters, charset, encoding.
-        for($i = 0; $i < count($lines); $i++) {
-            $lines[$i] = " ".$prefix.$lines[$i]."?=";
-        }
-        $str = trim(implode($lineEnd, $lines));
-        return $str;
-    }
-
-    /**
-     * Retrieves the first token from a quoted printable string.
-     *
-     * @param  string $str
-     * @return string
-     */
-    private static function getNextQuotedPrintableToken($str)
-    {
-        if(substr($str, 0, 1) == "=") {
-            $token = substr($str, 0, 3);
-        } else {
-            $token = substr($str, 0, 1);
-        }
-        return $token;
-    }
-
-    /**
-     * Encode a given string in mail header compatible base64 encoding.
-     *
-     * @param string $str
-     * @param string $charset
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeBase64Header($str,
-        $charset,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        $prefix = '=?' . $charset . '?B?';
-        $suffix = '?=';
-        $remainingLength = $lineLength - strlen($prefix) - strlen($suffix);
-
-        $encodedValue = self::encodeBase64($str, $remainingLength, $lineEnd);
-        $encodedValue = str_replace($lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue);
-        $encodedValue = $prefix . $encodedValue . $suffix;
-        return $encodedValue;
-    }
-
-    /**
-     * Encode a given string in base64 encoding and break lines
-     * according to the maximum linelength.
-     *
-     * @param string $str
-     * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
-     * @return string
-     */
-    public static function encodeBase64($str,
-        $lineLength = self::LINELENGTH,
-        $lineEnd = self::LINEEND)
-    {
-        return rtrim(chunk_split(base64_encode($str), $lineLength, $lineEnd));
-    }
-
-    /**
-     * Constructor
-     *
-     * @param null|string $boundary
-     * @access public
-     * @return void
-     */
-    public function __construct($boundary = null)
-    {
-        // This string needs to be somewhat unique
-        if ($boundary === null) {
-            $this->_boundary = '=_' . md5(microtime(1) . self::$makeUnique++);
-        } else {
-            $this->_boundary = $boundary;
-        }
-    }
-
-    /**
-     * Encode the given string with the given encoding.
-     *
-     * @param string $str
-     * @param string $encoding
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return string
-     */
-    public static function encode($str, $encoding, $EOL = self::LINEEND)
-    {
-        switch ($encoding) {
-            case self::ENCODING_BASE64:
-                return self::encodeBase64($str, self::LINELENGTH, $EOL);
-
-            case self::ENCODING_QUOTEDPRINTABLE:
-                return self::encodeQuotedPrintable($str, self::LINELENGTH, $EOL);
-
-            default:
-                /**
-                 * @todo 7Bit and 8Bit is currently handled the same way.
-                 */
-                return $str;
-        }
-    }
-
-    /**
-     * Return a MIME boundary
-     *
-     * @access public
-     * @return string
-     */
-    public function boundary()
-    {
-        return $this->_boundary;
-    }
-
-    /**
-     * Return a MIME boundary line
-     *
-     * @param mixed $EOL Defaults to {@link LINEEND}
-     * @access public
-     * @return string
-     */
-    public function boundaryLine($EOL = self::LINEEND)
-    {
-        return $EOL . '--' . $this->_boundary . $EOL;
-    }
-
-    /**
-     * Return MIME ending
-     *
-     * @access public
-     * @return string
-     */
-    public function mimeEnd($EOL = self::LINEEND)
-    {
-        return $EOL . '--' . $this->_boundary . '--' . $EOL;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mime/Decode.php b/airtime_mvc/library/Zend/Mime/Decode.php
deleted file mode 100644
index 5e4c0a7af..000000000
--- a/airtime_mvc/library/Zend/Mime/Decode.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decode.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Decode
-{
-    /**
-     * Explode MIME multipart string into seperate parts
-     *
-     * Parts consist of the header and the body of each MIME part.
-     *
-     * @param  string $body     raw body of message
-     * @param  string $boundary boundary as found in content-type
-     * @return array parts with content of each part, empty if no parts found
-     * @throws Zend_Exception
-     */
-    public static function splitMime($body, $boundary)
-    {
-        // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
-        $body = str_replace("\r", '', $body);
-
-        $start = 0;
-        $res = array();
-        // find every mime part limiter and cut out the
-        // string before it.
-        // the part before the first boundary string is discarded:
-        $p = strpos($body, '--' . $boundary . "\n", $start);
-        if ($p === false) {
-            // no parts found!
-            return array();
-        }
-
-        // position after first boundary line
-        $start = $p + 3 + strlen($boundary);
-
-        while (($p = strpos($body, '--' . $boundary . "\n", $start)) !== false) {
-            $res[] = substr($body, $start, $p-$start);
-            $start = $p + 3 + strlen($boundary);
-        }
-
-        // no more parts, find end boundary
-        $p = strpos($body, '--' . $boundary . '--', $start);
-        if ($p===false) {
-            throw new Zend_Exception('Not a valid Mime Message: End Missing');
-        }
-
-        // the remaining part also needs to be parsed:
-        $res[] = substr($body, $start, $p-$start);
-        return $res;
-    }
-
-    /**
-     * decodes a mime encoded String and returns a
-     * struct of parts with header and body
-     *
-     * @param  string $message  raw message content
-     * @param  string $boundary boundary as found in content-type
-     * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
-     * @throws Zend_Exception
-     */
-    public static function splitMessageStruct($message, $boundary, $EOL = Zend_Mime::LINEEND)
-    {
-        $parts = self::splitMime($message, $boundary);
-        if (count($parts) <= 0) {
-            return null;
-        }
-        $result = array();
-        foreach ($parts as $part) {
-            self::splitMessage($part, $headers, $body, $EOL);
-            $result[] = array('header' => $headers,
-                              'body'   => $body    );
-        }
-        return $result;
-    }
-
-    /**
-     * split a message in header and body part, if no header or an
-     * invalid header is found $headers is empty
-     *
-     * The charset of the returned headers depend on your iconv settings.
-     *
-     * @param  string $message raw message with header and optional content
-     * @param  array  $headers output param, array with headers as array(name => value)
-     * @param  string $body    output param, content of message
-     * @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return null
-     */
-    public static function splitMessage($message, &$headers, &$body, $EOL = Zend_Mime::LINEEND)
-    {
-        // check for valid header at first line
-        $firstline = strtok($message, "\n");
-        if (!preg_match('%^[^\s]+[^:]*:%', $firstline)) {
-            $headers = array();
-            // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
-            $body = str_replace(array("\r", "\n"), array('', $EOL), $message);
-            return;
-        }
-
-        // find an empty line between headers and body
-        // default is set new line
-        if (strpos($message, $EOL . $EOL)) {
-            list($headers, $body) = explode($EOL . $EOL, $message, 2);
-        // next is the standard new line
-        } else if ($EOL != "\r\n" && strpos($message, "\r\n\r\n")) {
-            list($headers, $body) = explode("\r\n\r\n", $message, 2);
-        // next is the other "standard" new line
-        } else if ($EOL != "\n" && strpos($message, "\n\n")) {
-            list($headers, $body) = explode("\n\n", $message, 2);
-        // at last resort find anything that looks like a new line
-        } else {
-            @list($headers, $body) = @preg_split("%([\r\n]+)\\1%U", $message, 2);
-        }
-
-        $headers = iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-
-        if ($headers === false ) {
-            // an error occurs during the decoding
-            return;
-        }
-
-        // normalize header names
-        foreach ($headers as $name => $header) {
-            $lower = strtolower($name);
-            if ($lower == $name) {
-                continue;
-            }
-            unset($headers[$name]);
-            if (!isset($headers[$lower])) {
-                $headers[$lower] = $header;
-                continue;
-            }
-            if (is_array($headers[$lower])) {
-                $headers[$lower][] = $header;
-                continue;
-            }
-            $headers[$lower] = array($headers[$lower], $header);
-        }
-    }
-
-    /**
-     * split a content type in its different parts
-     *
-     * @param  string $type       content-type
-     * @param  string $wantedPart the wanted part, else an array with all parts is returned
-     * @return string|array wanted part or all parts as array('type' => content-type, partname => value)
-     */
-    public static function splitContentType($type, $wantedPart = null)
-    {
-        return self::splitHeaderField($type, $wantedPart, 'type');
-    }
-
-    /**
-     * split a header field like content type in its different parts
-     *
-     * @param  string $type       header field
-     * @param  string $wantedPart the wanted part, else an array with all parts is returned
-     * @param  string $firstName  key name for the first part
-     * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-     * @throws Zend_Exception
-     */
-    public static function splitHeaderField($field, $wantedPart = null, $firstName = 0)
-    {
-        $wantedPart = strtolower($wantedPart);
-        $firstName = strtolower($firstName);
-
-        // special case - a bit optimized
-        if ($firstName === $wantedPart) {
-            $field = strtok($field, ';');
-            return $field[0] == '"' ? substr($field, 1, -1) : $field;
-        }
-
-        $field = $firstName . '=' . $field;
-        if (!preg_match_all('%([^=\s]+)\s*=\s*("[^"]+"|[^;]+)(;\s*|$)%', $field, $matches)) {
-            throw new Zend_Exception('not a valid header field');
-        }
-
-        if ($wantedPart) {
-            foreach ($matches[1] as $key => $name) {
-                if (strcasecmp($name, $wantedPart)) {
-                    continue;
-                }
-                if ($matches[2][$key][0] != '"') {
-                    return $matches[2][$key];
-                }
-                return substr($matches[2][$key], 1, -1);
-            }
-            return null;
-        }
-
-        $split = array();
-        foreach ($matches[1] as $key => $name) {
-            $name = strtolower($name);
-            if ($matches[2][$key][0] == '"') {
-                $split[$name] = substr($matches[2][$key], 1, -1);
-            } else {
-                $split[$name] = $matches[2][$key];
-            }
-        }
-
-        return $split;
-    }
-
-    /**
-     * decode a quoted printable encoded string
-     *
-     * The charset of the returned string depends on your iconv settings.
-     *
-     * @param  string encoded string
-     * @return string decoded string
-     */
-    public static function decodeQuotedPrintable($string)
-    {
-        return iconv_mime_decode($string, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mime/Exception.php b/airtime_mvc/library/Zend/Mime/Exception.php
deleted file mode 100644
index a38affe97..000000000
--- a/airtime_mvc/library/Zend/Mime/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Mime/Message.php b/airtime_mvc/library/Zend/Mime/Message.php
deleted file mode 100644
index 6207bda13..000000000
--- a/airtime_mvc/library/Zend/Mime/Message.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * Zend_Mime_Part
- */
-require_once 'Zend/Mime/Part.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Message
-{
-
-    protected $_parts = array();
-    protected $_mime = null;
-
-    /**
-     * Returns the list of all Zend_Mime_Parts in the message
-     *
-     * @return array of Zend_Mime_Part
-     */
-    public function getParts()
-    {
-        return $this->_parts;
-    }
-
-    /**
-     * Sets the given array of Zend_Mime_Parts as the array for the message
-     *
-     * @param array $parts
-     */
-    public function setParts($parts)
-    {
-        $this->_parts = $parts;
-    }
-
-    /**
-     * Append a new Zend_Mime_Part to the current message
-     *
-     * @param Zend_Mime_Part $part
-     */
-    public function addPart(Zend_Mime_Part $part)
-    {
-        /**
-         * @todo check for duplicate object handle
-         */
-        $this->_parts[] = $part;
-    }
-
-    /**
-     * Check if message needs to be sent as multipart
-     * MIME message or if it has only one part.
-     *
-     * @return boolean
-     */
-    public function isMultiPart()
-    {
-        return (count($this->_parts) > 1);
-    }
-
-    /**
-     * Set Zend_Mime object for the message
-     *
-     * This can be used to set the boundary specifically or to use a subclass of
-     * Zend_Mime for generating the boundary.
-     *
-     * @param Zend_Mime $mime
-     */
-    public function setMime(Zend_Mime $mime)
-    {
-        $this->_mime = $mime;
-    }
-
-    /**
-     * Returns the Zend_Mime object in use by the message
-     *
-     * If the object was not present, it is created and returned. Can be used to
-     * determine the boundary used in this message.
-     *
-     * @return Zend_Mime
-     */
-    public function getMime()
-    {
-        if ($this->_mime === null) {
-            $this->_mime = new Zend_Mime();
-        }
-
-        return $this->_mime;
-    }
-
-    /**
-     * Generate MIME-compliant message from the current configuration
-     *
-     * This can be a multipart message if more than one MIME part was added. If
-     * only one part is present, the content of this part is returned. If no
-     * part had been added, an empty string is returned.
-     *
-     * Parts are seperated by the mime boundary as defined in Zend_Mime. If
-     * {@link setMime()} has been called before this method, the Zend_Mime
-     * object set by this call will be used. Otherwise, a new Zend_Mime object
-     * is generated and used.
-     *
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return string
-     */
-    public function generateMessage($EOL = Zend_Mime::LINEEND)
-    {
-        if (! $this->isMultiPart()) {
-            $body = array_shift($this->_parts);
-            $body = $body->getContent($EOL);
-        } else {
-            $mime = $this->getMime();
-
-            $boundaryLine = $mime->boundaryLine($EOL);
-            $body = 'This is a message in Mime Format.  If you see this, '
-                  . "your mail reader does not support this format." . $EOL;
-
-            foreach (array_keys($this->_parts) as $p) {
-                $body .= $boundaryLine
-                       . $this->getPartHeaders($p, $EOL)
-                       . $EOL
-                       . $this->getPartContent($p, $EOL);
-            }
-
-            $body .= $mime->mimeEnd($EOL);
-        }
-
-        return trim($body);
-    }
-
-    /**
-     * Get the headers of a given part as an array
-     *
-     * @param int $partnum
-     * @return array
-     */
-    public function getPartHeadersArray($partnum)
-    {
-        return $this->_parts[$partnum]->getHeadersArray();
-    }
-
-    /**
-     * Get the headers of a given part as a string
-     *
-     * @param int $partnum
-     * @return string
-     */
-    public function getPartHeaders($partnum, $EOL = Zend_Mime::LINEEND)
-    {
-        return $this->_parts[$partnum]->getHeaders($EOL);
-    }
-
-    /**
-     * Get the (encoded) content of a given part as a string
-     *
-     * @param int $partnum
-     * @return string
-     */
-    public function getPartContent($partnum, $EOL = Zend_Mime::LINEEND)
-    {
-        return $this->_parts[$partnum]->getContent($EOL);
-    }
-
-    /**
-     * Explode MIME multipart string into seperate parts
-     *
-     * Parts consist of the header and the body of each MIME part.
-     *
-     * @param string $body
-     * @param string $boundary
-     * @return array
-     */
-    protected static function _disassembleMime($body, $boundary)
-    {
-        $start = 0;
-        $res = array();
-        // find every mime part limiter and cut out the
-        // string before it.
-        // the part before the first boundary string is discarded:
-        $p = strpos($body, '--'.$boundary."\n", $start);
-        if ($p === false) {
-            // no parts found!
-            return array();
-        }
-
-        // position after first boundary line
-        $start = $p + 3 + strlen($boundary);
-
-        while (($p = strpos($body, '--' . $boundary . "\n", $start)) !== false) {
-            $res[] = substr($body, $start, $p-$start);
-            $start = $p + 3 + strlen($boundary);
-        }
-
-        // no more parts, find end boundary
-        $p = strpos($body, '--' . $boundary . '--', $start);
-        if ($p===false) {
-            throw new Zend_Exception('Not a valid Mime Message: End Missing');
-        }
-
-        // the remaining part also needs to be parsed:
-        $res[] = substr($body, $start, $p-$start);
-        return $res;
-    }
-
-    /**
-     * Decodes a MIME encoded string and returns a Zend_Mime_Message object with
-     * all the MIME parts set according to the given string
-     *
-     * @param string $message
-     * @param string $boundary
-     * @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
-     * @return Zend_Mime_Message
-     */
-    public static function createFromMessage($message, $boundary, $EOL = Zend_Mime::LINEEND)
-    {
-        require_once 'Zend/Mime/Decode.php';
-        $parts = Zend_Mime_Decode::splitMessageStruct($message, $boundary, $EOL);
-
-        $res = new self();
-        foreach ($parts as $part) {
-            // now we build a new MimePart for the current Message Part:
-            $newPart = new Zend_Mime_Part($part['body']);
-            foreach ($part['header'] as $key => $value) {
-                /**
-                 * @todo check for characterset and filename
-                 */
-                switch(strtolower($key)) {
-                    case 'content-type':
-                        $newPart->type = $value;
-                        break;
-                    case 'content-transfer-encoding':
-                        $newPart->encoding = $value;
-                        break;
-                    case 'content-id':
-                        $newPart->id = trim($value,'<>');
-                        break;
-                    case 'content-disposition':
-                        $newPart->disposition = $value;
-                        break;
-                    case 'content-description':
-                        $newPart->description = $value;
-                        break;
-                    case 'content-location':
-                        $newPart->location = $value;
-                        break;
-                    case 'content-language':
-                        $newPart->language = $value;
-                        break;
-                    default:
-                        throw new Zend_Exception('Unknown header ignored for MimePart:' . $key);
-                }
-            }
-            $res->addPart($newPart);
-        }
-        return $res;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Mime/Part.php b/airtime_mvc/library/Zend/Mime/Part.php
deleted file mode 100644
index eb0c97813..000000000
--- a/airtime_mvc/library/Zend/Mime/Part.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Mime
- */
-require_once 'Zend/Mime.php';
-
-/**
- * Class representing a MIME part.
- *
- * @category   Zend
- * @package    Zend_Mime
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Mime_Part {
-
-    public $type = Zend_Mime::TYPE_OCTETSTREAM;
-    public $encoding = Zend_Mime::ENCODING_8BIT;
-    public $id;
-    public $disposition;
-    public $filename;
-    public $description;
-    public $charset;
-    public $boundary;
-    public $location;
-    public $language;
-    protected $_content;
-    protected $_isStream = false;
-
-
-    /**
-     * create a new Mime Part.
-     * The (unencoded) content of the Part as passed
-     * as a string or stream
-     *
-     * @param mixed $content  String or Stream containing the content
-     */
-    public function __construct($content)
-    {
-        $this->_content = $content;
-        if (is_resource($content)) {
-            $this->_isStream = true;
-        }
-    }
-
-    /**
-     * @todo setters/getters
-     * @todo error checking for setting $type
-     * @todo error checking for setting $encoding
-     */
-
-    /**
-     * check if this part can be read as a stream.
-     * if true, getEncodedStream can be called, otherwise
-     * only getContent can be used to fetch the encoded
-     * content of the part
-     *
-     * @return bool
-     */
-    public function isStream()
-    {
-      return $this->_isStream;
-    }
-
-    /**
-     * if this was created with a stream, return a filtered stream for
-     * reading the content. very useful for large file attachments.
-     *
-     * @return stream
-     * @throws Zend_Mime_Exception if not a stream or unable to append filter
-     */
-    public function getEncodedStream()
-    {
-        if (!$this->_isStream) {
-            require_once 'Zend/Mime/Exception.php';
-            throw new Zend_Mime_Exception('Attempt to get a stream from a string part');
-        }
-
-        //stream_filter_remove(); // ??? is that right?
-        switch ($this->encoding) {
-            case Zend_Mime::ENCODING_QUOTEDPRINTABLE:
-                $filter = stream_filter_append(
-                    $this->_content,
-                    'convert.quoted-printable-encode',
-                    STREAM_FILTER_READ,
-                    array(
-                        'line-length'      => 76,
-                        'line-break-chars' => Zend_Mime::LINEEND
-                    )
-                );
-                if (!is_resource($filter)) {
-                    require_once 'Zend/Mime/Exception.php';
-                    throw new Zend_Mime_Exception('Failed to append quoted-printable filter');
-                }
-                break;
-            case Zend_Mime::ENCODING_BASE64:
-                $filter = stream_filter_append(
-                    $this->_content,
-                    'convert.base64-encode',
-                    STREAM_FILTER_READ,
-                    array(
-                        'line-length'      => 76,
-                        'line-break-chars' => Zend_Mime::LINEEND
-                    )
-                );
-                if (!is_resource($filter)) {
-                    require_once 'Zend/Mime/Exception.php';
-                    throw new Zend_Mime_Exception('Failed to append base64 filter');
-                }
-                break;
-            default:
-        }
-        return $this->_content;
-    }
-
-    /**
-     * Get the Content of the current Mime Part in the given encoding.
-     *
-     * @return String
-     */
-    public function getContent($EOL = Zend_Mime::LINEEND)
-    {
-        if ($this->_isStream) {
-            return stream_get_contents($this->getEncodedStream());
-        } else {
-            return Zend_Mime::encode($this->_content, $this->encoding, $EOL);
-        }
-    }
-
-    /**
-     * Create and return the array of headers for this MIME part
-     *
-     * @access public
-     * @return array
-     */
-    public function getHeadersArray($EOL = Zend_Mime::LINEEND)
-    {
-        $headers = array();
-
-        $contentType = $this->type;
-        if ($this->charset) {
-            $contentType .= '; charset=' . $this->charset;
-        }
-
-        if ($this->boundary) {
-            $contentType .= ';' . $EOL
-                          . " boundary=\"" . $this->boundary . '"';
-        }
-
-        $headers[] = array('Content-Type', $contentType);
-
-        if ($this->encoding) {
-            $headers[] = array('Content-Transfer-Encoding', $this->encoding);
-        }
-
-        if ($this->id) {
-            $headers[]  = array('Content-ID', '<' . $this->id . '>');
-        }
-
-        if ($this->disposition) {
-            $disposition = $this->disposition;
-            if ($this->filename) {
-                $disposition .= '; filename="' . $this->filename . '"';
-            }
-            $headers[] = array('Content-Disposition', $disposition);
-        }
-
-        if ($this->description) {
-            $headers[] = array('Content-Description', $this->description);
-        }
-
-        if ($this->location) {
-            $headers[] = array('Content-Location', $this->location);
-        }
-
-        if ($this->language){
-            $headers[] = array('Content-Language', $this->language);
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Return the headers for this part as a string
-     *
-     * @return String
-     */
-    public function getHeaders($EOL = Zend_Mime::LINEEND)
-    {
-        $res = '';
-        foreach ($this->getHeadersArray($EOL) as $header) {
-            $res .= $header[0] . ': ' . $header[1] . $EOL;
-        }
-
-        return $res;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Navigation.php b/airtime_mvc/library/Zend/Navigation.php
deleted file mode 100644
index 5bb81ce82..000000000
--- a/airtime_mvc/library/Zend/Navigation.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Navigation_Container
- */
-require_once 'Zend/Navigation/Container.php';
-
-/**
- * A simple container class for {@link Zend_Navigation_Page} pages
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Navigation extends Zend_Navigation_Container
-{
-    /**
-     * Creates a new navigation container
-     *
-     * @param array|Zend_Config $pages    [optional] pages to add
-     * @throws Zend_Navigation_Exception  if $pages is invalid
-     */
-    public function __construct($pages = null)
-    {
-        if (is_array($pages) || $pages instanceof Zend_Config) {
-            $this->addPages($pages);
-        } elseif (null !== $pages) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $pages must be an array, an ' .
-                    'instance of Zend_Config, or null');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Navigation/Container.php b/airtime_mvc/library/Zend/Navigation/Container.php
deleted file mode 100644
index bd123991f..000000000
--- a/airtime_mvc/library/Zend/Navigation/Container.php
+++ /dev/null
@@ -1,503 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Navigation_Container
- *
- * Container class for Zend_Navigation_Page classes.
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Navigation_Container implements RecursiveIterator, Countable
-{
-    /**
-     * Contains sub pages
-     *
-     * @var array
-     */
-    protected $_pages = array();
-
-    /**
-     * An index that contains the order in which to iterate pages
-     *
-     * @var array
-     */
-    protected $_index = array();
-
-    /**
-     * Whether index is dirty and needs to be re-arranged
-     *
-     * @var bool
-     */
-    protected $_dirtyIndex = false;
-
-    // Internal methods:
-
-    /**
-     * Sorts the page index according to page order
-     *
-     * @return void
-     */
-    protected function _sort()
-    {
-        if ($this->_dirtyIndex) {
-            $newIndex = array();
-            $index = 0;
-
-            foreach ($this->_pages as $hash => $page) {
-                $order = $page->getOrder();
-                if ($order === null) {
-                    $newIndex[$hash] = $index;
-                    $index++;
-                } else {
-                    $newIndex[$hash] = $order;
-                }
-            }
-
-            asort($newIndex);
-            $this->_index = $newIndex;
-            $this->_dirtyIndex = false;
-        }
-    }
-
-    // Public methods:
-
-    /**
-     * Notifies container that the order of pages are updated
-     *
-     * @return void
-     */
-    public function notifyOrderUpdated()
-    {
-        $this->_dirtyIndex = true;
-    }
-
-    /**
-     * Adds a page to the container
-     *
-     * This method will inject the container as the given page's parent by
-     * calling {@link Zend_Navigation_Page::setParent()}.
-     *
-     * @param  Zend_Navigation_Page|array|Zend_Config $page  page to add
-     * @return Zend_Navigation_Container                     fluent interface,
-     *                                                       returns self
-     * @throws Zend_Navigation_Exception                     if page is invalid
-     */
-    public function addPage($page)
-    {
-        if ($page === $this) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                'A page cannot have itself as a parent');
-        }
-
-        if (is_array($page) || $page instanceof Zend_Config) {
-            require_once 'Zend/Navigation/Page.php';
-            $page = Zend_Navigation_Page::factory($page);
-        } elseif (!$page instanceof Zend_Navigation_Page) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $page must be an instance of ' .
-                    'Zend_Navigation_Page or Zend_Config, or an array');
-        }
-
-        $hash = $page->hashCode();
-
-        if (array_key_exists($hash, $this->_index)) {
-            // page is already in container
-            return $this;
-        }
-
-        // adds page to container and sets dirty flag
-        $this->_pages[$hash] = $page;
-        $this->_index[$hash] = $page->getOrder();
-        $this->_dirtyIndex = true;
-
-        // inject self as page parent
-        $page->setParent($this);
-
-        return $this;
-    }
-
-    /**
-     * Adds several pages at once
-     *
-     * @param  array|Zend_Config $pages   pages to add
-     * @return Zend_Navigation_Container  fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if $pages is not array or Zend_Config
-     */
-    public function addPages($pages)
-    {
-        if ($pages instanceof Zend_Config) {
-            $pages = $pages->toArray();
-        }
-
-        if (!is_array($pages)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $pages must be an array or an ' .
-                    'instance of Zend_Config');
-        }
-
-        foreach ($pages as $page) {
-            $this->addPage($page);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets pages this container should have, removing existing pages
-     *
-     * @param  array $pages               pages to set
-     * @return Zend_Navigation_Container  fluent interface, returns self
-     */
-    public function setPages(array $pages)
-    {
-        $this->removePages();
-        return $this->addPages($pages);
-    }
-
-    /**
-     * Returns pages in the container
-     *
-     * @return array  array of Zend_Navigation_Page instances
-     */
-    public function getPages()
-    {
-        return $this->_pages;
-    }
-
-    /**
-     * Removes the given page from the container
-     *
-     * @param  Zend_Navigation_Page|int $page  page to remove, either a page
-     *                                         instance or a specific page order
-     * @return bool                            whether the removal was
-     *                                         successful
-     */
-    public function removePage($page)
-    {
-        if ($page instanceof Zend_Navigation_Page) {
-            $hash = $page->hashCode();
-        } elseif (is_int($page)) {
-            $this->_sort();
-            if (!$hash = array_search($page, $this->_index)) {
-                return false;
-            }
-        } else {
-            return false;
-        }
-
-        if (isset($this->_pages[$hash])) {
-            unset($this->_pages[$hash]);
-            unset($this->_index[$hash]);
-            $this->_dirtyIndex = true;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes all pages in container
-     *
-     * @return Zend_Navigation_Container  fluent interface, returns self
-     */
-    public function removePages()
-    {
-        $this->_pages = array();
-        $this->_index = array();
-        return $this;
-    }
-
-    /**
-     * Checks if the container has the given page
-     *
-     * @param  Zend_Navigation_Page $page       page to look for
-     * @param  bool                 $recursive  [optional] whether to search
-     *                                          recursively. Default is false.
-     * @return bool                             whether page is in container
-     */
-    public function hasPage(Zend_Navigation_Page $page, $recursive = false)
-    {
-        if (array_key_exists($page->hashCode(), $this->_index)) {
-            return true;
-        } elseif ($recursive) {
-            foreach ($this->_pages as $childPage) {
-                if ($childPage->hasPage($page, true)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if container contains any pages
-     *
-     * @return bool  whether container has any pages
-     */
-    public function hasPages()
-    {
-        return count($this->_index) > 0;
-    }
-
-    /**
-     * Returns a child page matching $property == $value, or null if not found
-     *
-     * @param  string $property           name of property to match against
-     * @param  mixed  $value              value to match property against
-     * @return Zend_Navigation_Page|null  matching page or null
-     */
-    public function findOneBy($property, $value)
-    {
-        $iterator = new RecursiveIteratorIterator($this,
-                            RecursiveIteratorIterator::SELF_FIRST);
-
-        foreach ($iterator as $page) {
-            if ($page->get($property) == $value) {
-                return $page;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns all child pages matching $property == $value, or an empty array
-     * if no pages are found
-     *
-     * @param  string $property  name of property to match against
-     * @param  mixed  $value     value to match property against
-     * @return array             array containing only Zend_Navigation_Page
-     *                           instances
-     */
-    public function findAllBy($property, $value)
-    {
-        $found = array();
-
-        $iterator = new RecursiveIteratorIterator($this,
-                            RecursiveIteratorIterator::SELF_FIRST);
-
-        foreach ($iterator as $page) {
-            if ($page->get($property) == $value) {
-                $found[] = $page;
-            }
-        }
-
-        return $found;
-    }
-
-    /**
-     * Returns page(s) matching $property == $value
-     *
-     * @param  string $property  name of property to match against
-     * @param  mixed  $value     value to match property against
-     * @param  bool   $all       [optional] whether an array of all matching
-     *                           pages should be returned, or only the first.
-     *                           If true, an array will be returned, even if not
-     *                           matching pages are found. If false, null will
-     *                           be returned if no matching page is found.
-     *                           Default is false.
-     * @return Zend_Navigation_Page|null  matching page or null
-     */
-    public function findBy($property, $value, $all = false)
-    {
-        if ($all) {
-            return $this->findAllBy($property, $value);
-        } else {
-            return $this->findOneBy($property, $value);
-        }
-    }
-
-    /**
-     * Magic overload: Proxy calls to finder methods
-     *
-     * Examples of finder calls:
-     * <code>
-     * // METHOD                    // SAME AS
-     * $nav->findByLabel('foo');    // $nav->findOneBy('label', 'foo');
-     * $nav->findOneByLabel('foo'); // $nav->findOneBy('label', 'foo');
-     * $nav->findAllByClass('foo'); // $nav->findAllBy('class', 'foo');
-     * </code>
-     *
-     * @param  string $method             method name
-     * @param  array  $arguments          method arguments
-     * @throws Zend_Navigation_Exception  if method does not exist
-     */
-    public function __call($method, $arguments)
-    {
-        if (@preg_match('/(find(?:One|All)?By)(.+)/', $method, $match)) {
-            return $this->{$match[1]}($match[2], $arguments[0]);
-        }
-
-        require_once 'Zend/Navigation/Exception.php';
-        throw new Zend_Navigation_Exception(sprintf(
-                'Bad method call: Unknown method %s::%s',
-                get_class($this),
-                $method));
-    }
-
-    /**
-     * Returns an array representation of all pages in container
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $pages = array();
-        
-        $this->_dirtyIndex = true;
-        $this->_sort();
-        $indexes = array_keys($this->_index);
-        foreach ($indexes as $hash) {
-            $pages[] = $this->_pages[$hash]->toArray();
-        }
-        return $pages;
-    }
-
-    // RecursiveIterator interface:
-
-    /**
-     * Returns current page
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return Zend_Navigation_Page       current page or null
-     * @throws Zend_Navigation_Exception  if the index is invalid
-     */
-    public function current()
-    {
-        $this->_sort();
-        current($this->_index);
-        $hash = key($this->_index);
-
-        if (isset($this->_pages[$hash])) {
-            return $this->_pages[$hash];
-        } else {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Corruption detected in container; ' .
-                    'invalid key found in internal iterator');
-        }
-    }
-
-    /**
-     * Returns hash code of current page
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return string  hash code of current page
-     */
-    public function key()
-    {
-        $this->_sort();
-        return key($this->_index);
-    }
-
-    /**
-     * Moves index pointer to next page in the container
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_sort();
-        next($this->_index);
-    }
-
-    /**
-     * Sets index pointer to first page in the container
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_sort();
-        reset($this->_index);
-    }
-
-    /**
-     * Checks if container index is valid
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        $this->_sort();
-        return current($this->_index) !== false;
-    }
-
-    /**
-     * Proxy to hasPages()
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return bool  whether container has any pages
-     */
-    public function hasChildren()
-    {
-        return $this->hasPages();
-    }
-
-    /**
-     * Returns the child container.
-     *
-     * Implements RecursiveIterator interface.
-     *
-     * @return Zend_Navigation_Page|null
-     */
-    public function getChildren()
-    {
-        $hash = key($this->_index);
-
-        if (isset($this->_pages[$hash])) {
-            return $this->_pages[$hash];
-        }
-
-        return null;
-    }
-
-    // Countable interface:
-
-    /**
-     * Returns number of pages in container
-     *
-     * Implements Countable interface.
-     *
-     * @return int  number of pages in the container
-     */
-    public function count()
-    {
-        return count($this->_index);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Navigation/Exception.php b/airtime_mvc/library/Zend/Navigation/Exception.php
deleted file mode 100644
index 17c5d9a13..000000000
--- a/airtime_mvc/library/Zend/Navigation/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Navigation exception
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Navigation_Exception extends Zend_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Navigation/Page.php b/airtime_mvc/library/Zend/Navigation/Page.php
deleted file mode 100644
index 10793a023..000000000
--- a/airtime_mvc/library/Zend/Navigation/Page.php
+++ /dev/null
@@ -1,1119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Page.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Navigation_Container
- */
-require_once 'Zend/Navigation/Container.php';
-
-/**
- * Base class for Zend_Navigation_Page pages
- *
- * @category  Zend
- * @package   Zend_Navigation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Navigation_Page extends Zend_Navigation_Container
-{
-    /**
-     * Page label
-     *
-     * @var string|null
-     */
-    protected $_label;
-
-    /**
-     * Page id
-     *
-     * @var string|null
-     */
-    protected $_id;
-
-    /**
-     * Style class for this page (CSS)
-     *
-     * @var string|null
-     */
-    protected $_class;
-
-    /**
-     * A more descriptive title for this page
-     *
-     * @var string|null
-     */
-    protected $_title;
-
-    /**
-     * This page's target
-     *
-     * @var string|null
-     */
-    protected $_target;
-
-    /**
-     * Forward links to other pages
-     *
-     * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
-     *
-     * @var array
-     */
-    protected $_rel = array();
-
-    /**
-     * Reverse links to other pages
-     *
-     * @link http://www.w3.org/TR/html4/struct/links.html#h-12.3.1
-     *
-     * @var array
-     */
-    protected $_rev = array();
-
-    /**
-     * Page order used by parent container
-     *
-     * @var int|null
-     */
-    protected $_order;
-
-    /**
-     * ACL resource associated with this page
-     *
-     * @var string|Zend_Acl_Resource_Interface|null
-     */
-    protected $_resource;
-
-    /**
-     * ACL privilege associated with this page
-     *
-     * @var string|null
-     */
-    protected $_privilege;
-
-    /**
-     * Whether this page should be considered active
-     *
-     * @var bool
-     */
-    protected $_active = false;
-
-    /**
-     * Whether this page should be considered visible
-     *
-     * @var bool
-     */
-    protected $_visible = true;
-
-    /**
-     * Parent container
-     *
-     * @var Zend_Navigation_Container|null
-     */
-    protected $_parent;
-
-    /**
-     * Custom page properties, used by __set(), __get() and __isset()
-     *
-     * @var array
-     */
-    protected $_properties = array();
-
-    // Initialization:
-
-    /**
-     * Factory for Zend_Navigation_Page classes
-     *
-     * A specific type to construct can be specified by specifying the key
-     * 'type' in $options. If type is 'uri' or 'mvc', the type will be resolved
-     * to Zend_Navigation_Page_Uri or Zend_Navigation_Page_Mvc. Any other value
-     * for 'type' will be considered the full name of the class to construct.
-     * A valid custom page class must extend Zend_Navigation_Page.
-     *
-     * If 'type' is not given, the type of page to construct will be determined
-     * by the following rules:
-     * - If $options contains either of the keys 'action', 'controller',
-     *   'module', or 'route', a Zend_Navigation_Page_Mvc page will be created.
-     * - If $options contains the key 'uri', a Zend_Navigation_Page_Uri page
-     *   will be created.
-     *
-     * @param  array|Zend_Config $options  options used for creating page
-     * @return Zend_Navigation_Page        a page instance
-     * @throws Zend_Navigation_Exception   if $options is not array/Zend_Config
-     * @throws Zend_Exception              if 'type' is specified and
-     *                                     Zend_Loader is unable to load the
-     *                                     class
-     * @throws Zend_Navigation_Exception   if something goes wrong during
-     *                                     instantiation of the page
-     * @throws Zend_Navigation_Exception   if 'type' is given, and the specified
-     *                                     type does not extend this class
-     * @throws Zend_Navigation_Exception   if unable to determine which class
-     *                                     to instantiate
-     */
-    public static function factory($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (!is_array($options)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                'Invalid argument: $options must be an array or Zend_Config');
-        }
-
-        if (isset($options['type'])) {
-            $type = $options['type'];
-            if (is_string($type) && !empty($type)) {
-                switch (strtolower($type)) {
-                    case 'mvc':
-                        $type = 'Zend_Navigation_Page_Mvc';
-                        break;
-                    case 'uri':
-                        $type = 'Zend_Navigation_Page_Uri';
-                        break;
-                }
-
-                if (!class_exists($type)) {
-                    require_once 'Zend/Loader.php';
-                    @Zend_Loader::loadClass($type);
-                }
-
-                $page = new $type($options);
-                if (!$page instanceof Zend_Navigation_Page) {
-                    require_once 'Zend/Navigation/Exception.php';
-                    throw new Zend_Navigation_Exception(sprintf(
-                            'Invalid argument: Detected type "%s", which ' .
-                            'is not an instance of Zend_Navigation_Page',
-                            $type));
-                }
-                return $page;
-            }
-        }
-
-        $hasUri = isset($options['uri']);
-        $hasMvc = isset($options['action']) || isset($options['controller']) ||
-                  isset($options['module']) || isset($options['route']);
-
-        if ($hasMvc) {
-            require_once 'Zend/Navigation/Page/Mvc.php';
-            return new Zend_Navigation_Page_Mvc($options);
-        } elseif ($hasUri) {
-            require_once 'Zend/Navigation/Page/Uri.php';
-            return new Zend_Navigation_Page_Uri($options);
-        } else {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                'Invalid argument: Unable to determine class to instantiate');
-        }
-    }
-
-    /**
-     * Page constructor
-     *
-     * @param  array|Zend_Config $options   [optional] page options. Default is
-     *                                      null, which should set defaults.
-     * @throws Zend_Navigation_Exception    if invalid options are given
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } elseif ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        // do custom initialization
-        $this->_init();
-    }
-
-    /**
-     * Initializes page (used by subclasses)
-     *
-     * @return void
-     */
-    protected function _init()
-    {
-    }
-
-    /**
-     * Sets page properties using a Zend_Config object
-     *
-     * @param  Zend_Config $config        config object to get properties from
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid options are given
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Sets page properties using options from an associative array
-     *
-     * Each key in the array corresponds to the according set*() method, and
-     * each word is separated by underscores, e.g. the option 'target'
-     * corresponds to setTarget(), and the option 'reset_params' corresponds to
-     * the method setResetParams().
-     *
-     * @param  array $options             associative array of options to set
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid options are given
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $this->set($key, $value);
-        }
-
-        return $this;
-    }
-
-    // Accessors:
-
-    /**
-     * Sets page label
-     *
-     * @param  string $label              new page label
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if empty/no string is given
-     */
-    public function setLabel($label)
-    {
-        if (null !== $label && !is_string($label)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $label must be a string or null');
-        }
-
-        $this->_label = $label;
-        return $this;
-    }
-
-    /**
-     * Returns page label
-     *
-     * @return string  page label or null
-     */
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    /**
-     * Sets page id
-     *
-     * @param  string|null $id            [optional] id to set. Default is null,
-     *                                    which sets no id.
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if not given string or null
-     */
-    public function setId($id = null)
-    {
-        if (null !== $id && !is_string($id) && !is_numeric($id)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $id must be a string, number or null');
-        }
-
-        $this->_id = null === $id ? $id : (string) $id;
-
-        return $this;
-    }
-
-    /**
-     * Returns page id
-     *
-     * @return string|null  page id or null
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Sets page CSS class
-     *
-     * @param  string|null $class         [optional] CSS class to set. Default
-     *                                    is null, which sets no CSS class.
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if not given string or null
-     */
-    public function setClass($class = null)
-    {
-        if (null !== $class && !is_string($class)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $class must be a string or null');
-        }
-
-        $this->_class = $class;
-        return $this;
-    }
-
-    /**
-     * Returns page class (CSS)
-     *
-     * @return string|null  page's CSS class or null
-     */
-    public function getClass()
-    {
-        return $this->_class;
-    }
-
-    /**
-     * Sets page title
-     *
-     * @param  string $title              [optional] page title. Default is
-     *                                    null, which sets no title.
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if not given string or null
-     */
-    public function setTitle($title = null)
-    {
-        if (null !== $title && !is_string($title)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $title must be a non-empty string');
-        }
-
-        $this->_title = $title;
-        return $this;
-    }
-
-    /**
-     * Returns page title
-     *
-     * @return string|null  page title or null
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Sets page target
-     *
-     * @param  string|null $target        [optional] target to set. Default is
-     *                                    null, which sets no target.
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if target is not string or null
-     */
-    public function setTarget($target = null)
-    {
-        if (null !== $target && !is_string($target)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $target must be a string or null');
-        }
-
-        $this->_target = $target;
-        return $this;
-    }
-
-    /**
-     * Returns page target
-     *
-     * @return string|null  page target or null
-     */
-    public function getTarget()
-    {
-        return $this->_target;
-    }
-
-    /**
-     * Sets the page's forward links to other pages
-     *
-     * This method expects an associative array of forward links to other pages,
-     * where each element's key is the name of the relation (e.g. alternate,
-     * prev, next, help, etc), and the value is a mixed value that could somehow
-     * be considered a page.
-     *
-     * @param  array|Zend_Config $relations  [optional] an associative array of
-     *                                       forward links to other pages
-     * @return Zend_Navigation_Page          fluent interface, returns self
-     */
-    public function setRel($relations = null)
-    {
-        $this->_rel = array();
-
-        if (null !== $relations) {
-            if ($relations instanceof Zend_Config) {
-                $relations = $relations->toArray();
-            }
-
-            if (!is_array($relations)) {
-                require_once 'Zend/Navigation/Exception.php';
-                throw new Zend_Navigation_Exception(
-                        'Invalid argument: $relations must be an ' .
-                        'array or an instance of Zend_Config');
-            }
-
-            foreach ($relations as $name => $relation) {
-                if (is_string($name)) {
-                    $this->_rel[$name] = $relation;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the page's forward links to other pages
-     *
-     * This method returns an associative array of forward links to other pages,
-     * where each element's key is the name of the relation (e.g. alternate,
-     * prev, next, help, etc), and the value is a mixed value that could somehow
-     * be considered a page.
-     *
-     * @param  string $relation  [optional] name of relation to return. If not
-     *                           given, all relations will be returned.
-     * @return array             an array of relations. If $relation is not
-     *                           specified, all relations will be returned in
-     *                           an associative array.
-     */
-    public function getRel($relation = null)
-    {
-        if (null !== $relation) {
-            return isset($this->_rel[$relation]) ?
-                   $this->_rel[$relation] :
-                   null;
-        }
-
-        return $this->_rel;
-    }
-
-    /**
-     * Sets the page's reverse links to other pages
-     *
-     * This method expects an associative array of reverse links to other pages,
-     * where each element's key is the name of the relation (e.g. alternate,
-     * prev, next, help, etc), and the value is a mixed value that could somehow
-     * be considered a page.
-     *
-     * @param  array|Zend_Config $relations  [optional] an associative array of
-     *                                       reverse links to other pages
-     * @return Zend_Navigation_Page          fluent interface, returns self
-     */
-    public function setRev($relations = null)
-    {
-        $this->_rev = array();
-
-        if (null !== $relations) {
-            if ($relations instanceof Zend_Config) {
-                $relations = $relations->toArray();
-            }
-
-            if (!is_array($relations)) {
-                require_once 'Zend/Navigation/Exception.php';
-                throw new Zend_Navigation_Exception(
-                        'Invalid argument: $relations must be an ' .
-                        'array or an instance of Zend_Config');
-            }
-
-            foreach ($relations as $name => $relation) {
-                if (is_string($name)) {
-                    $this->_rev[$name] = $relation;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the page's reverse links to other pages
-     *
-     * This method returns an associative array of forward links to other pages,
-     * where each element's key is the name of the relation (e.g. alternate,
-     * prev, next, help, etc), and the value is a mixed value that could somehow
-     * be considered a page.
-     *
-     * @param  string $relation  [optional] name of relation to return. If not
-     *                           given, all relations will be returned.
-     * @return array             an array of relations. If $relation is not
-     *                           specified, all relations will be returned in
-     *                           an associative array.
-     */
-    public function getRev($relation = null)
-    {
-        if (null !== $relation) {
-            return isset($this->_rev[$relation]) ?
-                   $this->_rev[$relation] :
-                   null;
-        }
-
-        return $this->_rev;
-    }
-
-    /**
-     * Sets page order to use in parent container
-     *
-     * @param  int $order                 [optional] page order in container.
-     *                                    Default is null, which sets no
-     *                                    specific order.
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if order is not integer or null
-     */
-    public function setOrder($order = null)
-    {
-        if (is_string($order)) {
-            $temp = (int) $order;
-            if ($temp < 0 || $temp > 0 || $order == '0') {
-                $order = $temp;
-            }
-        }
-
-        if (null !== $order && !is_int($order)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $order must be an integer or null, ' .
-                    'or a string that casts to an integer');
-        }
-
-        $this->_order = $order;
-
-        // notify parent, if any
-        if (isset($this->_parent)) {
-            $this->_parent->notifyOrderUpdated();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns page order used in parent container
-     *
-     * @return int|null  page order or null
-     */
-    public function getOrder()
-    {
-        return $this->_order;
-    }
-
-    /**
-     * Sets ACL resource assoicated with this page
-     *
-     * @param  string|Zend_Acl_Resource_Interface $resource  [optional] resource
-     *                                                       to associate with
-     *                                                       page. Default is
-     *                                                       null, which sets no
-     *                                                       resource.
-     * @throws Zend_Navigation_Exception                     if $resource if
-     *                                                       invalid
-     * @return Zend_Navigation_Page                          fluent interface,
-     *                                                       returns self
-     */
-    public function setResource($resource = null)
-    {
-        if (null === $resource || is_string($resource) ||
-            $resource instanceof Zend_Acl_Resource_Interface) {
-            $this->_resource = $resource;
-        } else {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $resource must be null, a string, ' .
-                    ' or an instance of Zend_Acl_Resource_Interface');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns ACL resource assoicated with this page
-     *
-     * @return string|Zend_Acl_Resource_Interface|null  ACL resource or null
-     */
-    public function getResource()
-    {
-        return $this->_resource;
-    }
-
-    /**
-     * Sets ACL privilege associated with this page
-     *
-     * @param  string|null $privilege  [optional] ACL privilege to associate
-     *                                 with this page. Default is null, which
-     *                                 sets no privilege.
-     * @return Zend_Navigation_Page    fluent interface, returns self
-     */
-    public function setPrivilege($privilege = null)
-    {
-        $this->_privilege = is_string($privilege) ? $privilege : null;
-        return $this;
-    }
-
-    /**
-     * Returns ACL privilege associated with this page
-     *
-     * @return string|null  ACL privilege or null
-     */
-    public function getPrivilege()
-    {
-        return $this->_privilege;
-    }
-
-    /**
-     * Sets whether page should be considered active or not
-     *
-     * @param  bool $active          [optional] whether page should be
-     *                               considered active or not. Default is true.
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function setActive($active = true)
-    {
-        $this->_active = (bool) $active;
-        return $this;
-    }
-
-    /**
-     * Returns whether page should be considered active or not
-     *
-     * @param  bool $recursive  [optional] whether page should be considered
-     *                          active if any child pages are active. Default is
-     *                          false.
-     * @return bool             whether page should be considered active
-     */
-    public function isActive($recursive = false)
-    {
-        if (!$this->_active && $recursive) {
-            foreach ($this->_pages as $page) {
-                if ($page->isActive(true)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        return $this->_active;
-    }
-
-    /**
-     * Proxy to isActive()
-     *
-     * @param  bool $recursive  [optional] whether page should be considered
-     *                          active if any child pages are active. Default
-     *                          is false.
-     * @return bool             whether page should be considered active
-     */
-    public function getActive($recursive = false)
-    {
-        return $this->isActive($recursive);
-    }
-
-    /**
-     * Sets whether the page should be visible or not
-     *
-     * @param  bool $visible         [optional] whether page should be
-     *                               considered visible or not. Default is true.
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function setVisible($visible = true)
-    {
-        $this->_visible = (bool) $visible;
-        return $this;
-    }
-
-    /**
-     * Returns a boolean value indicating whether the page is visible
-     *
-     * @param  bool $recursive  [optional] whether page should be considered
-     *                          invisible if parent is invisible. Default is
-     *                          false.
-     * @return bool             whether page should be considered visible
-     */
-    public function isVisible($recursive = false)
-    {
-        if ($recursive && isset($this->_parent) &&
-            $this->_parent instanceof Zend_Navigation_Page) {
-            if (!$this->_parent->isVisible(true)) {
-                return false;
-            }
-        }
-
-        return $this->_visible;
-    }
-
-    /**
-     * Proxy to isVisible()
-     *
-     * Returns a boolean value indicating whether the page is visible
-     *
-     * @param  bool $recursive  [optional] whether page should be considered
-     *                          invisible if parent is invisible. Default is
-     *                          false.
-     * @return bool             whether page should be considered visible
-     */
-    public function getVisible($recursive = false)
-    {
-        return $this->isVisible($recursive);
-    }
-
-    /**
-     * Sets parent container
-     *
-     * @param  Zend_Navigation_Container $parent  [optional] new parent to set.
-     *                                            Default is null which will set
-     *                                            no parent.
-     * @return Zend_Navigation_Page               fluent interface, returns self
-     */
-    public function setParent(Zend_Navigation_Container $parent = null)
-    {
-        if ($parent === $this) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                'A page cannot have itself as a parent');
-        }
-
-        // return if the given parent already is parent
-        if ($parent === $this->_parent) {
-            return $this;
-        }
-
-        // remove from old parent
-        if (null !== $this->_parent) {
-            $this->_parent->removePage($this);
-        }
-
-        // set new parent
-        $this->_parent = $parent;
-
-        // add to parent if page and not already a child
-        if (null !== $this->_parent && !$this->_parent->hasPage($this, false)) {
-            $this->_parent->addPage($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns parent container
-     *
-     * @return Zend_Navigation_Container|null  parent container or null
-     */
-    public function getParent()
-    {
-        return $this->_parent;
-    }
-
-    /**
-     * Sets the given property
-     *
-     * If the given property is native (id, class, title, etc), the matching
-     * set method will be used. Otherwise, it will be set as a custom property.
-     *
-     * @param  string $property           property name
-     * @param  mixed  $value              value to set
-     * @return Zend_Navigation_Page       fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if property name is invalid
-     */
-    public function set($property, $value)
-    {
-        if (!is_string($property) || empty($property)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $property must be a non-empty string');
-        }
-
-        $method = 'set' . self::_normalizePropertyName($property);
-
-        if ($method != 'setOptions' && $method != 'setConfig' &&
-            method_exists($this, $method)) {
-            $this->$method($value);
-        } else {
-            $this->_properties[$property] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the value of the given property
-     *
-     * If the given property is native (id, class, title, etc), the matching
-     * get method will be used. Otherwise, it will return the matching custom
-     * property, or null if not found.
-     *
-     * @param  string $property           property name
-     * @return mixed                      the property's value or null
-     * @throws Zend_Navigation_Exception  if property name is invalid
-     */
-    public function get($property)
-    {
-        if (!is_string($property) || empty($property)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $property must be a non-empty string');
-        }
-
-        $method = 'get' . self::_normalizePropertyName($property);
-
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        } elseif (isset($this->_properties[$property])) {
-            return $this->_properties[$property];
-        }
-
-        return null;
-    }
-
-    // Magic overloads:
-
-    /**
-     * Sets a custom property
-     *
-     * Magic overload for enabling <code>$page->propname = $value</code>.
-     *
-     * @param  string $name               property name
-     * @param  mixed  $value              value to set
-     * @return void
-     * @throws Zend_Navigation_Exception  if property name is invalid
-     */
-    public function __set($name, $value)
-    {
-        $this->set($name, $value);
-    }
-
-    /**
-     * Returns a property, or null if it doesn't exist
-     *
-     * Magic overload for enabling <code>$page->propname</code>.
-     *
-     * @param  string $name               property name
-     * @return mixed                      property value or null
-     * @throws Zend_Navigation_Exception  if property name is invalid
-     */
-    public function __get($name)
-    {
-        return $this->get($name);
-    }
-
-    /**
-     * Checks if a property is set
-     *
-     * Magic overload for enabling <code>isset($page->propname)</code>.
-     *
-     * Returns true if the property is native (id, class, title, etc), and
-     * true or false if it's a custom property (depending on whether the
-     * property actually is set).
-     *
-     * @param  string $name  property name
-     * @return bool          whether the given property exists
-     */
-    public function __isset($name)
-    {
-        $method = 'get' . self::_normalizePropertyName($name);
-        if (method_exists($this, $method)) {
-            return true;
-        }
-
-        return isset($this->_properties[$name]);
-    }
-
-    /**
-     * Unsets the given custom property
-     *
-     * Magic overload for enabling <code>unset($page->propname)</code>.
-     *
-     * @param  string $name               property name
-     * @return void
-     * @throws Zend_Navigation_Exception  if the property is native
-     */
-    public function __unset($name)
-    {
-        $method = 'set' . self::_normalizePropertyName($name);
-        if (method_exists($this, $method)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(sprintf(
-                    'Unsetting native property "%s" is not allowed',
-                    $name));
-        }
-
-        if (isset($this->_properties[$name])) {
-            unset($this->_properties[$name]);
-        }
-    }
-
-    /**
-     * Returns page label
-     *
-     * Magic overload for enabling <code>echo $page</code>.
-     *
-     * @return string  page label
-     */
-    public function __toString()
-    {
-        return $this->_label;
-    }
-
-    // Public methods:
-
-    /**
-     * Adds a forward relation to the page
-     *
-     * @param  string $relation      relation name (e.g. alternate, glossary,
-     *                               canonical, etc)
-     * @param  mixed  $value         value to set for relation
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function addRel($relation, $value)
-    {
-        if (is_string($relation)) {
-            $this->_rel[$relation] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Adds a reverse relation to the page
-     *
-     * @param  string $relation      relation name (e.g. alternate, glossary,
-     *                               canonical, etc)
-     * @param  mixed  $value         value to set for relation
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function addRev($relation, $value)
-    {
-        if (is_string($relation)) {
-            $this->_rev[$relation] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Removes a forward relation from the page
-     *
-     * @param  string $relation      name of relation to remove
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function removeRel($relation)
-    {
-        if (isset($this->_rel[$relation])) {
-            unset($this->_rel[$relation]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Removes a reverse relation from the page
-     *
-     * @param  string $relation      name of relation to remove
-     * @return Zend_Navigation_Page  fluent interface, returns self
-     */
-    public function removeRev($relation)
-    {
-        if (isset($this->_rev[$relation])) {
-            unset($this->_rev[$relation]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns an array containing the defined forward relations
-     *
-     * @return array  defined forward relations
-     */
-    public function getDefinedRel()
-    {
-        return array_keys($this->_rel);
-    }
-
-    /**
-     * Returns an array containing the defined reverse relations
-     *
-     * @return array  defined reverse relations
-     */
-    public function getDefinedRev()
-    {
-        return array_keys($this->_rev);
-    }
-
-    /**
-     * Returns custom properties as an array
-     *
-     * @return array  an array containing custom properties
-     */
-    public function getCustomProperties()
-    {
-        return $this->_properties;
-    }
-
-    /**
-     * Returns a hash code value for the page
-     *
-     * @return string  a hash code value for this page
-     */
-    public final function hashCode()
-    {
-        return spl_object_hash($this);
-    }
-
-    /**
-     * Returns an array representation of the page
-     *
-     * @return array  associative array containing all page properties
-     */
-    public function toArray()
-    {
-        return array_merge(
-            $this->getCustomProperties(),
-            array(
-                'label'     => $this->getlabel(),
-                'id'        => $this->getId(),
-                'class'     => $this->getClass(),
-                'title'     => $this->getTitle(),
-                'target'    => $this->getTarget(),
-                'rel'       => $this->getRel(),
-                'rev'       => $this->getRev(),
-                'order'     => $this->getOrder(),
-                'resource'  => $this->getResource(),
-                'privilege' => $this->getPrivilege(),
-                'active'    => $this->isActive(),
-                'visible'   => $this->isVisible(),
-                'type'      => get_class($this),
-                'pages'     => parent::toArray()
-            ));
-    }
-
-    // Internal methods:
-
-    /**
-     * Normalizes a property name
-     *
-     * @param  string $property  property name to normalize
-     * @return string            normalized property name
-     */
-    protected static function _normalizePropertyName($property)
-    {
-        return str_replace(' ', '', ucwords(str_replace('_', ' ', $property)));
-    }
-
-    // Abstract methods:
-
-    /**
-     * Returns href for this page
-     *
-     * @return string  the page's href
-     */
-    abstract public function getHref();
-}
diff --git a/airtime_mvc/library/Zend/Navigation/Page/Mvc.php b/airtime_mvc/library/Zend/Navigation/Page/Mvc.php
deleted file mode 100644
index 05f9ca914..000000000
--- a/airtime_mvc/library/Zend/Navigation/Page/Mvc.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Navigation
- * @subpackage Page
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Mvc.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Navigation_Page
- */
-require_once 'Zend/Navigation/Page.php';
-
-/**
- * @see Zend_Controller_Action_HelperBroker
- */
-require_once 'Zend/Controller/Action/HelperBroker.php';
-
-/**
- * Used to check if page is active
- *
- * @see Zend_Controller_Front
- */
-require_once 'Zend/Controller/Front.php';
-
-/**
- * Represents a page that is defined using module, controller, action, route
- * name and route params to assemble the href
- *
- * @category   Zend
- * @package    Zend_Navigation
- * @subpackage Page
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
-{
-    /**
-     * Action name to use when assembling URL
-     *
-     * @var string
-     */
-    protected $_action;
-
-    /**
-     * Controller name to use when assembling URL
-     *
-     * @var string
-     */
-    protected $_controller;
-
-    /**
-     * Module name to use when assembling URL
-     *
-     * @var string
-     */
-    protected $_module;
-
-    /**
-     * Params to use when assembling URL
-     *
-     * @see getHref()
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Route name to use when assembling URL
-     *
-     * @see getHref()
-     * @var string
-     */
-    protected $_route;
-
-    /**
-     * Whether params should be reset when assembling URL
-     *
-     * @see getHref()
-     * @var bool
-     */
-    protected $_resetParams = true;
-
-    /**
-     * Cached href
-     *
-     * The use of this variable minimizes execution time when getHref() is
-     * called more than once during the lifetime of a request. If a property
-     * is updated, the cache is invalidated.
-     *
-     * @var string
-     */
-    protected $_hrefCache;
-
-    /**
-     * Action helper for assembling URLs
-     *
-     * @see getHref()
-     * @var Zend_Controller_Action_Helper_Url
-     */
-    protected static $_urlHelper = null;
-
-    // Accessors:
-
-    /**
-     * Returns whether page should be considered active or not
-     *
-     * This method will compare the page properties against the request object
-     * that is found in the front controller.
-     *
-     * @param  bool $recursive  [optional] whether page should be considered
-     *                          active if any child pages are active. Default is
-     *                          false.
-     * @return bool             whether page should be considered active or not
-     */
-    public function isActive($recursive = false)
-    {
-        if (!$this->_active) {
-            $front = Zend_Controller_Front::getInstance();
-            $reqParams = $front->getRequest()->getParams();
-
-            if (!array_key_exists('module', $reqParams)) {
-                $reqParams['module'] = $front->getDefaultModule();
-            }
-
-            $myParams = $this->_params;
-
-            if (null !== $this->_module) {
-                $myParams['module'] = $this->_module;
-            } else {
-                $myParams['module'] = $front->getDefaultModule();
-            }
-
-            if (null !== $this->_controller) {
-                $myParams['controller'] = $this->_controller;
-            } else {
-                $myParams['controller'] = $front->getDefaultControllerName();
-            }
-
-            if (null !== $this->_action) {
-                $myParams['action'] = $this->_action;
-            } else {
-                $myParams['action'] = $front->getDefaultAction();
-            }
-
-            if (count(array_intersect_assoc($reqParams, $myParams)) ==
-                count($myParams)) {
-                $this->_active = true;
-                return true;
-            }
-        }
-
-        return parent::isActive($recursive);
-    }
-
-    /**
-     * Returns href for this page
-     *
-     * This method uses {@link Zend_Controller_Action_Helper_Url} to assemble
-     * the href based on the page's properties.
-     *
-     * @return string  page href
-     */
-    public function getHref()
-    {
-        if ($this->_hrefCache) {
-            return $this->_hrefCache;
-        }
-
-        if (null === self::$_urlHelper) {
-            self::$_urlHelper =
-                Zend_Controller_Action_HelperBroker::getStaticHelper('Url');
-        }
-
-        $params = $this->getParams();
-
-        if ($param = $this->getModule()) {
-            $params['module'] = $param;
-        }
-
-        if ($param = $this->getController()) {
-            $params['controller'] = $param;
-        }
-
-        if ($param = $this->getAction()) {
-            $params['action'] = $param;
-        }
-
-        $url = self::$_urlHelper->url($params,
-                                      $this->getRoute(),
-                                      $this->getResetParams());
-
-        return $this->_hrefCache = $url;
-    }
-
-    /**
-     * Sets action name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  string $action             action name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid $action is given
-     */
-    public function setAction($action)
-    {
-        if (null !== $action && !is_string($action)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $action must be a string or null');
-        }
-
-        $this->_action = $action;
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns action name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return string|null  action name
-     */
-    public function getAction()
-    {
-        return $this->_action;
-    }
-
-    /**
-     * Sets controller name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  string|null $controller    controller name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid controller name is given
-     */
-    public function setController($controller)
-    {
-        if (null !== $controller && !is_string($controller)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $controller must be a string or null');
-        }
-
-        $this->_controller = $controller;
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns controller name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return string|null  controller name or null
-     */
-    public function getController()
-    {
-        return $this->_controller;
-    }
-
-    /**
-     * Sets module name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  string|null $module        module name
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid module name is given
-     */
-    public function setModule($module)
-    {
-        if (null !== $module && !is_string($module)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $module must be a string or null');
-        }
-
-        $this->_module = $module;
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns module name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return string|null  module name or null
-     */
-    public function getModule()
-    {
-        return $this->_module;
-    }
-
-    /**
-     * Sets params to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  array|null $params        [optional] page params. Default is null
-     *                                   which sets no params.
-     * @return Zend_Navigation_Page_Mvc  fluent interface, returns self
-     */
-    public function setParams(array $params = null)
-    {
-        if (null === $params) {
-            $this->_params = array();
-        } else {
-            // TODO: do this more intelligently?
-            $this->_params = $params;
-        }
-
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns params to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return array  page params
-     */
-    public function getParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Sets route name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  string $route              route name to use when assembling URL
-     * @return Zend_Navigation_Page_Mvc   fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if invalid $route is given
-     */
-    public function setRoute($route)
-    {
-        if (null !== $route && (!is_string($route) || strlen($route) < 1)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                 'Invalid argument: $route must be a non-empty string or null');
-        }
-
-        $this->_route = $route;
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns route name to use when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return string  route name
-     */
-    public function getRoute()
-    {
-        return $this->_route;
-    }
-
-    /**
-     * Sets whether params should be reset when assembling URL
-     *
-     * @see getHref()
-     *
-     * @param  bool $resetParams         whether params should be reset when
-     *                                   assembling URL
-     * @return Zend_Navigation_Page_Mvc  fluent interface, returns self
-     */
-    public function setResetParams($resetParams)
-    {
-        $this->_resetParams = (bool) $resetParams;
-        $this->_hrefCache = null;
-        return $this;
-    }
-
-    /**
-     * Returns whether params should be reset when assembling URL
-     *
-     * @see getHref()
-     *
-     * @return bool  whether params should be reset when assembling URL
-     */
-    public function getResetParams()
-    {
-        return $this->_resetParams;
-    }
-
-    /**
-     * Sets action helper for assembling URLs
-     *
-     * @see getHref()
-     *
-     * @param  Zend_Controller_Action_Helper_Url $uh  URL helper
-     * @return void
-     */
-    public static function setUrlHelper(Zend_Controller_Action_Helper_Url $uh)
-    {
-        self::$_urlHelper = $uh;
-    }
-
-    // Public methods:
-
-    /**
-     * Returns an array representation of the page
-     *
-     * @return array  associative array containing all page properties
-     */
-    public function toArray()
-    {
-        return array_merge(
-            parent::toArray(),
-            array(
-                'action'       => $this->getAction(),
-                'controller'   => $this->getController(),
-                'module'       => $this->getModule(),
-                'params'       => $this->getParams(),
-                'route'        => $this->getRoute(),
-                'reset_params' => $this->getResetParams()
-            ));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Navigation/Page/Uri.php b/airtime_mvc/library/Zend/Navigation/Page/Uri.php
deleted file mode 100644
index a38ef72ae..000000000
--- a/airtime_mvc/library/Zend/Navigation/Page/Uri.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Navigation
- * @subpackage Page
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Navigation_Page_Abstract
- */
-require_once 'Zend/Navigation/Page.php';
-
-/**
- * Represents a page that is defined by specifying a URI
- *
- * @category   Zend
- * @package    Zend_Navigation
- * @subpackage Page
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Navigation_Page_Uri extends Zend_Navigation_Page
-{
-    /**
-     * Page URI
-     *
-     * @var string|null
-     */
-    protected $_uri = null;
-
-    /**
-     * Sets page URI
-     *
-     * @param  string $uri                page URI, must a string or null
-     * @return Zend_Navigation_Page_Uri   fluent interface, returns self
-     * @throws Zend_Navigation_Exception  if $uri is invalid
-     */
-    public function setUri($uri)
-    {
-        if (null !== $uri && !is_string($uri)) {
-            require_once 'Zend/Navigation/Exception.php';
-            throw new Zend_Navigation_Exception(
-                    'Invalid argument: $uri must be a string or null');
-        }
-
-        $this->_uri = $uri;
-        return $this;
-    }
-
-    /**
-     * Returns URI
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Returns href for this page
-     *
-     * @return string
-     */
-    public function getHref()
-    {
-        return $this->getUri();
-    }
-
-    // Public methods:
-
-    /**
-     * Returns an array representation of the page
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return array_merge(
-            parent::toArray(),
-            array(
-                'uri' => $this->getUri()
-            ));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth.php b/airtime_mvc/library/Zend/Oauth.php
deleted file mode 100644
index 8e48764e8..000000000
--- a/airtime_mvc/library/Zend/Oauth.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Oauth.php 21071 2010-02-16 14:35:00Z padraic $
- */
-
-/** Zend_Http_Client */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth
-{
-    const REQUEST_SCHEME_HEADER      = 'header';
-    const REQUEST_SCHEME_POSTBODY    = 'postbody';
-    const REQUEST_SCHEME_QUERYSTRING = 'querystring';
-    const GET                        = 'GET';
-    const POST                       = 'POST';
-    const PUT                        = 'PUT';
-    const DELETE                     = 'DELETE';
-    const HEAD                       = 'HEAD';
-
-    /**
-     * Singleton instance if required of the HTTP client
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $httpClient = null;
-
-    /**
-     * Allows the external environment to make Zend_Oauth use a specific
-     * Client instance.
-     *
-     * @param Zend_Http_Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$httpClient = $httpClient;
-    }
-
-    /**
-     * Return the singleton instance of the HTTP Client. Note that
-     * the instance is reset and cleared of previous parameters and
-     * Authorization header values.
-     *
-     * @return Zend_Http_Client
-     */
-    public static function getHttpClient()
-    {
-        if (!isset(self::$httpClient)) {
-            self::$httpClient = new Zend_Http_Client;
-        } else {
-            self::$httpClient->setHeaders('Authorization', null);
-            self::$httpClient->resetParameters();
-        }
-        return self::$httpClient;
-    }
-
-    /**
-     * Simple mechanism to delete the entire singleton HTTP Client instance
-     * which forces an new instantiation for subsequent requests.
-     *
-     * @return void
-     */
-    public static function clearHttpClient()
-    {
-        self::$httpClient = null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Client.php b/airtime_mvc/library/Zend/Oauth/Client.php
deleted file mode 100644
index caf785b6d..000000000
--- a/airtime_mvc/library/Zend/Oauth/Client.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 21071 2010-02-16 14:35:00Z padraic $
- */
-
-/** Zend_Oauth */
-require_once 'Zend/Oauth.php';
-
-/** Zend_Http_Client */
-require_once 'Zend/Http/Client.php';
-
-/** Zend_Oauth_Http_Utility */
-require_once 'Zend/Oauth/Http/Utility.php';
-
-/** Zend_Oauth_Config */
-require_once 'Zend/Oauth/Config.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Client extends Zend_Http_Client
-{
-    /**
-     * Flag to indicate that the client has detected the server as supporting
-     * OAuth 1.0a
-     */
-    public static $supportsRevisionA = false;
-
-    /**
-     * Holds the current OAuth Configuration set encapsulated in an instance
-     * of Zend_Oauth_Config; it's not a Zend_Config instance since that level
-     * of abstraction is unnecessary and doesn't let me escape the accessors
-     * and mutators anyway!
-     *
-     * @var Zend_Oauth_Config
-     */
-    protected $_config = null;
-
-    /**
-     * Constructor; creates a new HTTP Client instance which itself is
-     * just a typical Zend_Http_Client subclass with some OAuth icing to
-     * assist in automating OAuth parameter generation, addition and
-     * cryptographioc signing of requests.
-     *
-     * @param  array $oauthOptions
-     * @param  string $uri
-     * @param  array|Zend_Config $config
-     * @return void
-     */
-    public function __construct(array $oauthOptions, $uri = null, $config = null)
-    {
-        parent::__construct($uri, $config);
-        $this->_config = new Zend_Oauth_Config;
-        if (!is_null($oauthOptions)) {
-            if ($oauthOptions instanceof Zend_Config) {
-                $oauthOptions = $oauthOptions->toArray();
-            }
-            $this->_config->setOptions($oauthOptions);
-        }
-    }
-
-    /**
-     * Same as Zend_Http_Client::setMethod() except it also creates an
-     * Oauth specific reference to the method type.
-     * Might be defunct and removed in a later iteration.
-     *
-     * @param  string $method
-     * @return Zend_Http_Client
-     */
-    public function setMethod($method = self::GET)
-    {
-        if ($method == self::GET) {
-            $this->setRequestMethod(self::GET);
-        } elseif($method == self::POST) {
-            $this->setRequestMethod(self::POST);
-        } elseif($method == self::PUT) {
-            $this->setRequestMethod(self::PUT);
-        }  elseif($method == self::DELETE) {
-            $this->setRequestMethod(self::DELETE);
-        }   elseif($method == self::HEAD) {
-            $this->setRequestMethod(self::HEAD);
-        }
-        return parent::setMethod($method);
-    }
-
-    /**
-     * Same as Zend_Http_Client::request() except just before the request is
-     * executed, we automatically append any necessary OAuth parameters and
-     * sign the request using the relevant signature method.
-     *
-     * @param  string $method
-     * @return Zend_Http_Response
-     */
-    public function request($method = null)
-    {
-        if (!is_null($method)) {
-            $this->setMethod($method);
-        }
-        $this->prepareOauth();
-        return parent::request();
-    }
-
-    /**
-     * Performs OAuth preparation on the request before sending.
-     *
-     * This primarily means taking a request, correctly encoding and signing
-     * all parameters, and applying the correct OAuth scheme to the method
-     * being used.
-     *
-     * @return void
-     * @throws Zend_Oauth_Exception If POSTBODY scheme requested, but GET request method used; or if invalid request scheme provided
-     */
-    public function prepareOauth()
-    {
-        $requestScheme = $this->getRequestScheme();
-        $requestMethod = $this->getRequestMethod();
-        $query = null;
-        if ($requestScheme == Zend_Oauth::REQUEST_SCHEME_HEADER) {
-            $params = array();
-            if (!empty($this->paramsGet)) {
-                $params = array_merge($params, $this->paramsGet);
-                $query  = $this->getToken()->toQueryString(
-                    $this->getUri(true), $this->_config, $params
-                );
-            }
-            if (!empty($this->paramsPost)) {
-                $params = array_merge($params, $this->paramsPost);
-                $query  = $this->getToken()->toQueryString(
-                    $this->getUri(true), $this->_config, $params
-                );
-            }
-            $oauthHeaderValue = $this->getToken()->toHeader(
-                $this->getUri(true), $this->_config, $params
-            );
-            $this->setHeaders('Authorization', $oauthHeaderValue);
-        } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) {
-            if ($requestMethod == self::GET) {
-                require_once 'Zend/Oauth/Exception.php';
-                throw new Zend_Oauth_Exception(
-                    'The client is configured to'
-                    . ' pass OAuth parameters through a POST body but request method'
-                    . ' is set to GET'
-                );
-            }
-            $raw = $this->getToken()->toQueryString(
-                $this->getUri(true), $this->_config, $this->paramsPost
-            );
-            $this->setRawData($raw);
-            $this->paramsPost = array();
-        } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_QUERYSTRING) {
-            $params = array();
-            $query = $this->getUri()->getQuery();
-            if ($query) {
-                $queryParts = split('&', $this->getUri()->getQuery());
-                foreach ($queryParts as $queryPart) {
-                    $kvTuple = split('=', $queryPart);
-                    $params[$kvTuple[0]] = 
-                        (array_key_exists(1, $kvTuple) ? $kvTuple[1] : NULL);
-                }
-            }
-
-            $query = $this->getToken()->toQueryString(
-                $this->getUri(true), $this->_config, $params
-            );
-            $this->getUri()->setQuery($query);
-            $this->paramsGet = array();
-        } else {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Invalid request scheme: ' . $requestScheme);
-        }
-    }
-
-    /**
-     * Simple Proxy to the current Zend_Oauth_Config method. It's that instance
-     * which holds all configuration methods and values this object also presents
-     * as it's API.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Oauth_Exception if method does not exist in config object
-     */
-    public function __call($method, array $args)
-    {
-        if (!method_exists($this->_config, $method)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Method does not exist: ' . $method);
-        }
-        return call_user_func_array(array($this->_config,$method), $args);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Config.php b/airtime_mvc/library/Zend/Oauth/Config.php
deleted file mode 100644
index 1260eea02..000000000
--- a/airtime_mvc/library/Zend/Oauth/Config.php
+++ /dev/null
@@ -1,658 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Config.php 20232 2010-01-12 17:56:33Z matthew $
- */
-
-/** Zend_Oauth */
-require_once 'Zend/Oauth.php';
-
-/** Zend_Uri */
-require_once 'Zend/Uri.php';
-
-/** Zend_Oauth_Config_Interface */
-require_once 'Zend/Oauth/Config/ConfigInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface
-{
-    /**
-     * Signature method used when signing all parameters for an HTTP request
-     *
-     * @var string
-     */
-    protected $_signatureMethod = 'HMAC-SHA1';
-
-    /**
-     * Three request schemes are defined by OAuth, of which passing
-     * all OAuth parameters by Header is preferred. The other two are
-     * POST Body and Query String.
-     *
-     * @var string
-     */
-    protected $_requestScheme = Zend_Oauth::REQUEST_SCHEME_HEADER;
-
-    /**
-     * Preferred request Method - one of GET or POST - which Zend_Oauth
-     * will enforce as standard throughout the library. Generally a default
-     * of POST works fine unless a Provider specifically requires otherwise.
-     *
-     * @var string
-     */
-    protected $_requestMethod = Zend_Oauth::POST;
-
-    /**
-     * OAuth Version; This defaults to 1.0 - Must not be changed!
-     *
-     * @var string
-     */
-    protected $_version = '1.0';
-
-    /**
-     * This optional value is used to define where the user is redirected to
-     * after authorizing a Request Token from an OAuth Providers website.
-     * It's optional since a Provider may ask for this to be defined in advance
-     * when registering a new application for a Consumer Key.
-     *
-     * @var string
-     */
-    protected $_callbackUrl = null;
-
-    /**
-     * The URL root to append default OAuth endpoint paths.
-     *
-     * @var string
-     */
-    protected $_siteUrl = null;
-
-    /**
-     * The URL to which requests for a Request Token should be directed.
-     * When absent, assumed siteUrl+'/request_token'
-     *
-     * @var string
-     */
-    protected $_requestTokenUrl = null;
-
-    /**
-     * The URL to which requests for an Access Token should be directed.
-     * When absent, assumed siteUrl+'/access_token'
-     *
-     * @var string
-     */
-    protected $_accessTokenUrl = null;
-
-    /**
-     * The URL to which users should be redirected to authorize a Request Token.
-     * When absent, assumed siteUrl+'/authorize'
-     *
-     * @var string
-     */
-    protected $_authorizeUrl = null;
-
-    /**
-     * An OAuth application's Consumer Key.
-     *
-     * @var string
-     */
-    protected $_consumerKey = null;
-
-    /**
-     * Every Consumer Key has a Consumer Secret unless you're in RSA-land.
-     *
-     * @var string
-     */
-    protected $_consumerSecret = null;
-
-    /**
-     * If relevant, a PEM encoded RSA private key encapsulated as a
-     * Zend_Crypt_Rsa Key
-     *
-     * @var Zend_Crypt_Rsa_Key_Private
-     */
-    protected $_rsaPrivateKey = null;
-
-    /**
-     * If relevant, a PEM encoded RSA public key encapsulated as a
-     * Zend_Crypt_Rsa Key
-     *
-     * @var Zend_Crypt_Rsa_Key_Public
-     */
-    protected $_rsaPublicKey = null;
-
-    /**
-     * Generally this will nearly always be an Access Token represented as a
-     * Zend_Oauth_Token_Access object.
-     *
-     * @var Zend_Oauth_Token
-     */
-    protected $_token = null;
-
-    /**
-     * Constructor; create a new object with an optional array|Zend_Config
-     * instance containing initialising options.
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if (!is_null($options)) {
-            if ($options instanceof Zend_Config) {
-                $options = $options->toArray();
-            }
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Parse option array or Zend_Config instance and setup options using their
-     * relevant mutators.
-     *
-     * @param  array|Zend_Config $options
-     * @return Zend_Oauth_Config
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            switch ($key) {
-                case 'consumerKey':
-                    $this->setConsumerKey($value);
-                    break;
-                case 'consumerSecret':
-                    $this->setConsumerSecret($value);
-                    break;
-                case 'signatureMethod':
-                    $this->setSignatureMethod($value);
-                    break;
-                case 'version':
-                    $this->setVersion($value);
-                    break;
-                case 'callbackUrl':
-                    $this->setCallbackUrl($value);
-                    break;
-                case 'siteUrl':
-                    $this->setSiteUrl($value);
-                    break;
-                case 'requestTokenUrl':
-                    $this->setRequestTokenUrl($value);
-                    break;
-                case 'accessTokenUrl':
-                    $this->setAccessTokenUrl($value);
-                    break;
-                case 'userAuthorizationUrl':
-                    $this->setUserAuthorizationUrl($value);
-                    break;
-                case 'authorizeUrl':
-                    $this->setAuthorizeUrl($value);
-                    break;
-                case 'requestMethod':
-                    $this->setRequestMethod($value);
-                    break;
-                case 'rsaPrivateKey':
-                    $this->setRsaPrivateKey($value);
-                    break;
-                case 'rsaPublicKey':
-                    $this->setRsaPublicKey($value);
-                    break;
-            }
-        }
-        if (isset($options['requestScheme'])) {
-            $this->setRequestScheme($options['requestScheme']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set consumer key
-     *
-     * @param  string $key
-     * @return Zend_Oauth_Config
-     */
-    public function setConsumerKey($key)
-    {
-        $this->_consumerKey = $key;
-        return $this;
-    }
-
-    /**
-     * Get consumer key
-     *
-     * @return string
-     */
-    public function getConsumerKey()
-    {
-        return $this->_consumerKey;
-    }
-
-    /**
-     * Set consumer secret
-     *
-     * @param  string $secret
-     * @return Zend_Oauth_Config
-     */
-    public function setConsumerSecret($secret)
-    {
-        $this->_consumerSecret = $secret;
-        return $this;
-    }
-
-    /**
-     * Get consumer secret
-     *
-     * Returns RSA private key if set; otherwise, returns any previously set 
-     * consumer secret.
-     *
-     * @return string
-     */
-    public function getConsumerSecret()
-    {
-        if (!is_null($this->_rsaPrivateKey)) {
-            return $this->_rsaPrivateKey;
-        }
-        return $this->_consumerSecret;
-    }
-
-    /**
-     * Set signature method
-     *
-     * @param  string $method
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception if unsupported signature method specified
-     */
-    public function setSignatureMethod($method)
-    {
-        $method = strtoupper($method);
-        if (!in_array($method, array(
-                'HMAC-SHA1', 'HMAC-SHA256', 'RSA-SHA1', 'PLAINTEXT'
-            ))
-        ) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Unsupported signature method: '
-                . $method
-                . '. Supported are HMAC-SHA1, RSA-SHA1, PLAINTEXT and HMAC-SHA256');
-        }
-        $this->_signatureMethod = $method;;
-        return $this;
-    }
-
-    /**
-     * Get signature method
-     *
-     * @return string
-     */
-    public function getSignatureMethod()
-    {
-        return $this->_signatureMethod;
-    }
-
-    /**
-     * Set request scheme
-     *
-     * @param  string $scheme
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception if invalid scheme specified, or if POSTBODY set when request method of GET is specified
-     */
-    public function setRequestScheme($scheme)
-    {
-        $scheme = strtolower($scheme);
-        if (!in_array($scheme, array(
-                Zend_Oauth::REQUEST_SCHEME_HEADER,
-                Zend_Oauth::REQUEST_SCHEME_POSTBODY,
-                Zend_Oauth::REQUEST_SCHEME_QUERYSTRING,
-            ))
-        ) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $scheme . '\' is an unsupported request scheme'
-            );
-        }
-        if ($scheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY
-            && $this->getRequestMethod() == Zend_Oauth::GET
-        ) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                'Cannot set POSTBODY request method if HTTP method set to GET'
-            );
-        }
-        $this->_requestScheme = $scheme;
-        return $this;
-    }
-
-    /**
-     * Get request scheme
-     *
-     * @return string
-     */
-    public function getRequestScheme()
-    {
-        return $this->_requestScheme;
-    }
-
-    /**
-     * Set version
-     *
-     * @param  string $version
-     * @return Zend_Oauth_Config
-     */
-    public function setVersion($version)
-    {
-        $this->_version = $version;
-        return $this;
-    }
-
-    /**
-     * Get version
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-
-    /**
-     * Set callback URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setCallbackUrl($url)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $this->_callbackUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Get callback URL
-     *
-     * @return string
-     */
-    public function getCallbackUrl()
-    {
-        return $this->_callbackUrl;
-    }
-
-    /**
-     * Set site URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setSiteUrl($url)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $this->_siteUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Get site URL
-     *
-     * @return string
-     */
-    public function getSiteUrl()
-    {
-        return $this->_siteUrl;
-    }
-
-    /**
-     * Set request token URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setRequestTokenUrl($url)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $this->_requestTokenUrl = rtrim($url, '/');
-        return $this;
-    }
-
-    /**
-     * Get request token URL
-     *
-     * If no request token URL has been set, but a site URL has, returns the 
-     * site URL with the string "/request_token" appended.
-     *
-     * @return string
-     */
-    public function getRequestTokenUrl()
-    {
-        if (!$this->_requestTokenUrl && $this->_siteUrl) {
-            return $this->_siteUrl . '/request_token';
-        }
-        return $this->_requestTokenUrl;
-    }
-
-    /**
-     * Set access token URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setAccessTokenUrl($url)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $this->_accessTokenUrl = rtrim($url, '/');
-        return $this;
-    }
-
-    /**
-     * Get access token URL
-     *
-     * If no access token URL has been set, but a site URL has, returns the 
-     * site URL with the string "/access_token" appended.
-     *
-     * @return string
-     */
-    public function getAccessTokenUrl()
-    {
-        if (!$this->_accessTokenUrl && $this->_siteUrl) {
-            return $this->_siteUrl . '/access_token';
-        }
-        return $this->_accessTokenUrl;
-    }
-
-    /**
-     * Set user authorization URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setUserAuthorizationUrl($url)
-    {
-        return $this->setAuthorizeUrl($url);
-    }
-
-    /**
-     * Set authorization URL
-     *
-     * @param  string $url
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid URLs
-     */
-    public function setAuthorizeUrl($url)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $this->_authorizeUrl = rtrim($url, '/');
-        return $this;
-    }
-
-    /**
-     * Get user authorization URL
-     *
-     * @return string
-     */
-    public function getUserAuthorizationUrl()
-    {
-        return $this->getAuthorizeUrl();
-    }
-
-    /**
-     * Get authorization URL
-     *
-     * If no authorization URL has been set, but a site URL has, returns the 
-     * site URL with the string "/authorize" appended.
-     *
-     * @return string
-     */
-    public function getAuthorizeUrl()
-    {
-        if (!$this->_authorizeUrl && $this->_siteUrl) {
-            return $this->_siteUrl . '/authorize';
-        }
-        return $this->_authorizeUrl;
-    }
-
-    /**
-     * Set request method
-     *
-     * @param  string $method
-     * @return Zend_Oauth_Config
-     * @throws Zend_Oauth_Exception for invalid request methods
-     */
-    public function setRequestMethod($method)
-    {
-        $method = strtoupper($method);
-        if (!in_array($method, array(
-                Zend_Oauth::GET, 
-                Zend_Oauth::POST, 
-                Zend_Oauth::PUT, 
-                Zend_Oauth::DELETE,
-            ))
-        ) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Invalid method: ' . $method);
-        }
-        $this->_requestMethod = $method;
-        return $this;
-    }
-
-    /**
-     * Get request method
-     *
-     * @return string
-     */
-    public function getRequestMethod()
-    {
-        return $this->_requestMethod;
-    }
-
-    /**
-     * Set RSA public key
-     *
-     * @param  Zend_Crypt_Rsa_Key_Public $key
-     * @return Zend_Oauth_Config
-     */
-    public function setRsaPublicKey(Zend_Crypt_Rsa_Key_Public $key)
-    {
-        $this->_rsaPublicKey = $key;
-        return $this;
-    }
-
-    /**
-     * Get RSA public key
-     *
-     * @return Zend_Crypt_Rsa_Key_Public
-     */
-    public function getRsaPublicKey()
-    {
-        return $this->_rsaPublicKey;
-    }
-
-    /**
-     * Set RSA private key
-     *
-     * @param  Zend_Crypt_Rsa_Key_Private $key
-     * @return Zend_Oauth_Config
-     */
-    public function setRsaPrivateKey(Zend_Crypt_Rsa_Key_Private $key)
-    {
-        $this->_rsaPrivateKey = $key;
-        return $this;
-    }
-
-    /**
-     * Get RSA private key
-     *
-     * @return Zend_Crypt_Rsa_Key_Private
-     */
-    public function getRsaPrivateKey()
-    {
-        return $this->_rsaPrivateKey;
-    }
-
-    /**
-     * Set OAuth token
-     *
-     * @param  Zend_Oauth_Token $token
-     * @return Zend_Oauth_Config
-     */
-    public function setToken(Zend_Oauth_Token $token)
-    {
-        $this->_token = $token;
-        return $this;
-    }
-
-    /**
-     * Get OAuth token
-     *
-     * @return Zend_Oauth_Token
-     */
-    public function getToken()
-    {
-        return $this->_token;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Config/ConfigInterface.php b/airtime_mvc/library/Zend/Oauth/Config/ConfigInterface.php
deleted file mode 100644
index 77f3d6039..000000000
--- a/airtime_mvc/library/Zend/Oauth/Config/ConfigInterface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConfigInterface.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Oauth_Config_ConfigInterface
-{
-    public function setOptions(array $options);
-
-    public function setConsumerKey($key);
-
-    public function getConsumerKey();
-
-    public function setConsumerSecret($secret);
-
-    public function getConsumerSecret();
-
-    public function setSignatureMethod($method);
-
-    public function getSignatureMethod();
-
-    public function setRequestScheme($scheme);
-
-    public function getRequestScheme();
-
-    public function setVersion($version);
-
-    public function getVersion();
-
-    public function setCallbackUrl($url);
-
-    public function getCallbackUrl();
-
-    public function setRequestTokenUrl($url);
-
-    public function getRequestTokenUrl();
-
-    public function setRequestMethod($method);
-
-    public function getRequestMethod();
-
-    public function setAccessTokenUrl($url);
-
-    public function getAccessTokenUrl();
-
-    public function setUserAuthorizationUrl($url);
-
-    public function getUserAuthorizationUrl();
-
-    public function setToken(Zend_Oauth_Token $token);
-
-    public function getToken();
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Consumer.php b/airtime_mvc/library/Zend/Oauth/Consumer.php
deleted file mode 100644
index 0f63fe7e9..000000000
--- a/airtime_mvc/library/Zend/Oauth/Consumer.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Consumer.php 20232 2010-01-12 17:56:33Z matthew $
- */
-
-/** Zend_Oauth */
-require_once 'Zend/Oauth.php';
-
-/** Zend_Uri */
-require_once 'Zend/Uri.php';
-
-/** Zend_Oauth_Http_RequestToken */
-require_once 'Zend/Oauth/Http/RequestToken.php';
-
-/** Zend_Oauth_Http_UserAuthorization */
-require_once 'Zend/Oauth/Http/UserAuthorization.php';
-
-/** Zend_Oauth_Http_AccessToken */
-require_once 'Zend/Oauth/Http/AccessToken.php';
-
-/** Zend_Oauth_Token_AuthorizedRequest */
-require_once 'Zend/Oauth/Token/AuthorizedRequest.php';
-
-/** Zend_Oauth_Config */
-require_once 'Zend/Oauth/Config.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Consumer extends Zend_Oauth
-{
-    public $switcheroo = false; // replace later when this works
-
-    /**
-     * Request Token retrieved from OAuth Provider
-     *
-     * @var Zend_Oauth_Token_Request
-     */
-    protected $_requestToken = null;
-
-    /**
-     * Access token retrieved from OAuth Provider
-     *
-     * @var Zend_Oauth_Token_Access
-     */
-    protected $_accessToken = null;
-
-    /**
-     * @var Zend_Oauth_Config
-     */
-    protected $_config = null;
-
-    /**
-     * Constructor; create a new object with an optional array|Zend_Config
-     * instance containing initialising options.
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        $this->_config = new Zend_Oauth_Config;
-        if (!is_null($options)) {
-            if ($options instanceof Zend_Config) {
-                $options = $options->toArray();
-            }
-            $this->_config->setOptions($options);
-        }
-    }
-
-    /**
-     * Attempts to retrieve a Request Token from an OAuth Provider which is
-     * later exchanged for an authorized Access Token used to access the
-     * protected resources exposed by a web service API.
-     *
-     * @param  null|array $customServiceParameters Non-OAuth Provider-specified parameters
-     * @param  null|string $httpMethod
-     * @param  null|Zend_Oauth_Http_RequestToken $request
-     * @return Zend_Oauth_Token_Request
-     */
-    public function getRequestToken(
-        array $customServiceParameters = null,
-        $httpMethod = null,
-        Zend_Oauth_Http_RequestToken $request = null
-    ) {
-        if (is_null($request)) {
-            $request = new Zend_Oauth_Http_RequestToken($this, $customServiceParameters);
-        } elseif(!is_null($customServiceParameters)) {
-            $request->setParameters($customServiceParameters);
-        }
-        if (!is_null($httpMethod)) {
-            $request->setMethod($httpMethod);
-        } else {
-            $request->setMethod($this->getRequestMethod());
-        }
-        $this->_requestToken = $request->execute();
-        return $this->_requestToken;
-    }
-
-    /**
-     * After a Request Token is retrieved, the user may be redirected to the
-     * OAuth Provider to authorize the application's access to their
-     * protected resources - the redirect URL being provided by this method.
-     * Once the user has authorized the application for access, they are
-     * redirected back to the application which can now exchange the previous
-     * Request Token for a fully authorized Access Token.
-     *
-     * @param  null|array $customServiceParameters
-     * @param  null|Zend_Oauth_Token_Request $token
-     * @param  null|Zend_OAuth_Http_UserAuthorization $redirect
-     * @return string
-     */
-    public function getRedirectUrl(
-        array $customServiceParameters = null,
-        Zend_Oauth_Token_Request $token = null,
-        Zend_Oauth_Http_UserAuthorization $redirect = null
-    ) {
-        if (is_null($redirect)) {
-            $redirect = new Zend_Oauth_Http_UserAuthorization($this, $customServiceParameters);
-        } elseif(!is_null($customServiceParameters)) {
-            $redirect->setParameters($customServiceParameters);
-        }
-        if (!is_null($token)) {
-            $this->_requestToken = $token;
-        }
-        return $redirect->getUrl();
-    }
-
-    /**
-     * Rather than retrieve a redirect URL for use, e.g. from a controller,
-     * one may perform an immediate redirect.
-     *
-     * Sends headers and exit()s on completion.
-     *
-     * @param  null|array $customServiceParameters
-     * @param  null|Zend_Oauth_Http_UserAuthorization $request
-     * @return void
-     */
-    public function redirect(
-        array $customServiceParameters = null,
-        Zend_Oauth_Http_UserAuthorization $request = null
-    ) {
-        $redirectUrl = $this->getRedirectUrl($customServiceParameters, $request);
-        header('Location: ' . $redirectUrl);
-        exit(1);
-    }
-
-    /**
-     * Retrieve an Access Token in exchange for a previously received/authorized
-     * Request Token.
-     *
-     * @param  array $queryData GET data returned in user's redirect from Provider
-     * @param  Zend_Oauth_Token_Request Request Token information
-     * @param  string $httpMethod
-     * @param  Zend_Oauth_Http_AccessToken $request
-     * @return Zend_Oauth_Token_Access
-     * @throws Zend_Oauth_Exception on invalid authorization token, non-matching response authorization token, or unprovided authorization token
-     */
-    public function getAccessToken(
-        $queryData, 
-        Zend_Oauth_Token_Request $token,
-        $httpMethod = null, 
-        Zend_Oauth_Http_AccessToken $request = null
-    ) {
-        $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData);
-        if (!$authorizedToken->isValid()) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                'Response from Service Provider is not a valid authorized request token');
-        }
-        if (is_null($request)) {
-            $request = new Zend_Oauth_Http_AccessToken($this);
-        }
-
-        // OAuth 1.0a Verifier
-        if (!is_null($authorizedToken->getParam('oauth_verifier'))) {
-            $request->setParameters(array(
-                'oauth_verifier' => $authorizedToken->getParam('oauth_verifier')
-            ));
-        }
-        if (!is_null($httpMethod)) {
-            $request->setMethod($httpMethod);
-        } else {
-            $request->setMethod($this->getRequestMethod());
-        }
-        if (isset($token)) {
-            if ($authorizedToken->getToken() !== $token->getToken()) {
-                require_once 'Zend/Oauth/Exception.php';
-                throw new Zend_Oauth_Exception(
-                    'Authorized token from Service Provider does not match'
-                    . ' supplied Request Token details'
-                );
-            }
-        } else {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Request token must be passed to method');
-        }
-        $this->_requestToken = $token;
-        $this->_accessToken = $request->execute();
-        return $this->_accessToken;
-    }
-
-    /**
-     * Return whatever the last Request Token retrieved was while using the
-     * current Consumer instance.
-     *
-     * @return Zend_Oauth_Token_Request
-     */
-    public function getLastRequestToken()
-    {
-        return $this->_requestToken;
-    }
-
-    /**
-     * Return whatever the last Access Token retrieved was while using the
-     * current Consumer instance.
-     *
-     * @return Zend_Oauth_Token_Access
-     */
-    public function getLastAccessToken()
-    {
-        return $this->_accessToken;
-    }
-
-    /**
-     * Alias to self::getLastAccessToken()
-     *
-     * @return Zend_Oauth_Token_Access
-     */
-    public function getToken()
-    {
-        return $this->_accessToken;
-    }
-
-    /**
-     * Simple Proxy to the current Zend_Oauth_Config method. It's that instance
-     * which holds all configuration methods and values this object also presents
-     * as it's API.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Oauth_Exception if method does not exist in config object
-     */
-    public function __call($method, array $args)
-    {
-        if (!method_exists($this->_config, $method)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Method does not exist: '.$method);
-        }
-        return call_user_func_array(array($this->_config,$method), $args);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Exception.php b/airtime_mvc/library/Zend/Oauth/Exception.php
deleted file mode 100644
index 3c20ac50e..000000000
--- a/airtime_mvc/library/Zend/Oauth/Exception.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Exception extends Zend_Exception {}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Oauth/Http.php b/airtime_mvc/library/Zend/Oauth/Http.php
deleted file mode 100644
index 182f0db45..000000000
--- a/airtime_mvc/library/Zend/Oauth/Http.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Http.php 20232 2010-01-12 17:56:33Z matthew $
- */
-
-/** Zend_Oauth_Http_Utility */
-require_once 'Zend/Oauth/Http/Utility.php';
-
-/** Zend_Uri_Http */
-require_once 'Zend/Uri/Http.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Http
-{
-    /**
-     * Array of all custom service parameters to be sent in the HTTP request
-     * in addition to the usual OAuth parameters.
-     *
-     * @var array
-     */
-    protected $_parameters = array();
-
-    /**
-     * Reference to the Zend_Oauth_Consumer instance in use.
-     *
-     * @var string
-     */
-    protected $_consumer = null;
-
-    /**
-     * OAuth specifies three request methods, this holds the current preferred
-     * one which by default uses the Authorization Header approach for passing
-     * OAuth parameters, and a POST body for non-OAuth custom parameters.
-     *
-     * @var string
-     */
-    protected $_preferredRequestScheme = null;
-
-    /**
-     * Request Method for the HTTP Request.
-     *
-     * @var string
-     */
-    protected $_preferredRequestMethod = Zend_Oauth::POST;
-
-    /**
-     * Instance of the general Zend_Oauth_Http_Utility class.
-     *
-     * @var Zend_Oauth_Http_Utility
-     */
-    protected $_httpUtility = null;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_Oauth_Consumer $consumer
-     * @param  null|array $parameters
-     * @param  null|Zend_Oauth_Http_Utility $utility
-     * @return void
-     */
-    public function __construct(
-        Zend_Oauth_Consumer $consumer, 
-        array $parameters = null,
-        Zend_Oauth_Http_Utility $utility = null
-    ) {
-        $this->_consumer = $consumer;
-        $this->_preferredRequestScheme = $this->_consumer->getRequestScheme();
-        if (!is_null($parameters)) {
-            $this->setParameters($parameters);
-        }
-        if (!is_null($utility)) {
-            $this->_httpUtility = $utility;
-        } else {
-            $this->_httpUtility = new Zend_Oauth_Http_Utility;
-        }
-    }
-
-    /**
-     * Set a preferred HTTP request method.
-     *
-     * @param  string $method
-     * @return Zend_Oauth_Http
-     */
-    public function setMethod($method)
-    {
-        if (!in_array($method, array(Zend_Oauth::POST, Zend_Oauth::GET))) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('invalid HTTP method: ' . $method);
-        }
-        $this->_preferredRequestMethod = $method;
-        return $this;
-    }
-
-    /**
-     * Preferred HTTP request method accessor.
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->_preferredRequestMethod;
-    }
-
-    /**
-     * Mutator to set an array of custom parameters for the HTTP request.
-     *
-     * @param  array $customServiceParameters
-     * @return Zend_Oauth_Http
-     */
-    public function setParameters(array $customServiceParameters)
-    {
-        $this->_parameters = $customServiceParameters;
-        return $this;
-    }
-
-    /**
-     * Accessor for an array of custom parameters.
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->_parameters;
-    }
-
-    /**
-     * Return the Consumer instance in use.
-     *
-     * @return Zend_Oauth_Consumer
-     */
-    public function getConsumer()
-    {
-        return $this->_consumer;
-    }
-
-    /**
-     * Commence a request cycle where the current HTTP method and OAuth
-     * request scheme set an upper preferred HTTP request style and where
-     * failures generate a new HTTP request style further down the OAuth
-     * preference list for OAuth Request Schemes.
-     * On success, return the Request object that results for processing.
-     *
-     * @param  array $params
-     * @return Zend_Http_Response
-     * @throws Zend_Oauth_Exception on HTTP request errors
-     * @todo   Remove cycling?; Replace with upfront do-or-die configuration
-     */
-    public function startRequestCycle(array $params)
-    {
-        $response = null;
-        $body     = null;
-        $status   = null;
-        try {
-            $response = $this->_attemptRequest($params);
-        } catch (Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception('Error in HTTP request', null, $e);
-        }
-        if (!is_null($response)) {
-            $body   = $response->getBody();
-            $status = $response->getStatus();
-        }
-        if (is_null($response) // Request failure/exception
-            || $status == 500  // Internal Server Error
-            || $status == 400  // Bad Request
-            || $status == 401  // Unauthorized
-            || empty($body)    // Missing token
-        ) {
-            $this->_assessRequestAttempt($response);
-            $response = $this->startRequestCycle($params);
-        }
-        return $response;
-    }
-
-    /**
-     * Return an instance of Zend_Http_Client configured to use the Query
-     * String scheme for an OAuth driven HTTP request.
-     *
-     * @param array $params
-     * @param string $url
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemeQueryStringClient(array $params, $url)
-    {
-        $client = Zend_Oauth::getHttpClient();
-        $client->setUri($url);
-        $client->getUri()->setQuery(
-            $this->_httpUtility->toEncodedQueryString($params)
-        );
-        $client->setMethod($this->_preferredRequestMethod);
-        return $client;
-    }
-
-    /**
-     * Manages the switch from OAuth request scheme to another lower preference
-     * scheme during a request cycle.
-     *
-     * @param  Zend_Http_Response
-     * @return void
-     * @throws Zend_Oauth_Exception if unable to retrieve valid token response
-     */
-    protected function _assessRequestAttempt(Zend_Http_Response $response = null)
-    {
-        switch ($this->_preferredRequestScheme) {
-            case Zend_Oauth::REQUEST_SCHEME_HEADER:
-                $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_POSTBODY;
-                break;
-            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
-                $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_QUERYSTRING;
-                break;
-            default:
-                require_once 'Zend/Oauth/Exception.php';
-                throw new Zend_Oauth_Exception(
-                    'Could not retrieve a valid Token response from Token URL:'
-                    . (!is_null($response) 
-                        ? PHP_EOL . $response->getBody()
-                        : ' No body - check for headers')
-                );
-        }
-    }
-
-    /**
-     * Generates a valid OAuth Authorization header based on the provided
-     * parameters and realm.
-     *
-     * @param  array $params
-     * @param  string $realm
-     * @return string
-     */
-    protected function _toAuthorizationHeader(array $params, $realm = null)
-    {
-        $headerValue = array();
-        $headerValue[] = 'OAuth realm="' . $realm . '"';
-        foreach ($params as $key => $value) {
-            if (!preg_match("/^oauth_/", $key)) {
-                continue;
-            }
-            $headerValue[] = Zend_Oauth_Http_Utility::urlEncode($key)
-                           . '="'
-                           . Zend_Oauth_Http_Utility::urlEncode($value)
-                           . '"';
-        }
-        return implode(",", $headerValue);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Http/AccessToken.php b/airtime_mvc/library/Zend/Oauth/Http/AccessToken.php
deleted file mode 100644
index cd1aeadb0..000000000
--- a/airtime_mvc/library/Zend/Oauth/Http/AccessToken.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccessToken.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Http */
-require_once 'Zend/Oauth/Http.php';
-
-/** Zend_Oauth_Token_Access */
-require_once 'Zend/Oauth/Token/Access.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Http_AccessToken extends Zend_Oauth_Http
-{
-    /**
-     * Singleton instance if required of the HTTP client
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient = null;
-
-    /**
-     * Initiate a HTTP request to retrieve an Access Token.
-     *
-     * @return Zend_Oauth_Token_Access
-     */
-    public function execute()
-    {
-        $params   = $this->assembleParams();
-        $response = $this->startRequestCycle($params);
-        $return   = new Zend_Oauth_Token_Access($response);
-        return $return;
-    }
-
-    /**
-     * Assemble all parameters for an OAuth Access Token request.
-     *
-     * @return array
-     */
-    public function assembleParams()
-    {
-        $params = array(
-            'oauth_consumer_key'     => $this->_consumer->getConsumerKey(),
-            'oauth_nonce'            => $this->_httpUtility->generateNonce(),
-            'oauth_signature_method' => $this->_consumer->getSignatureMethod(),
-            'oauth_timestamp'        => $this->_httpUtility->generateTimestamp(),
-            'oauth_token'            => $this->_consumer->getLastRequestToken()->getToken(),
-            'oauth_version'          => $this->_consumer->getVersion(),
-        );
-
-        if (!empty($this->_parameters)) {
-            $params = array_merge($params, $this->_parameters);
-        }
-
-        $params['oauth_signature'] = $this->_httpUtility->sign(
-            $params,
-            $this->_consumer->getSignatureMethod(),
-            $this->_consumer->getConsumerSecret(),
-            $this->_consumer->getLastRequestToken()->getTokenSecret(),
-            $this->_preferredRequestMethod,
-            $this->_consumer->getAccessTokenUrl()
-        );
-
-        return $params;
-    }
-
-    /**
-     * Generate and return a HTTP Client configured for the Header Request Scheme
-     * specified by OAuth, for use in requesting an Access Token.
-     *
-     * @param  array $params
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemeHeaderClient(array $params)
-    {
-        $params      = $this->_cleanParamsOfIllegalCustomParameters($params);
-        $headerValue = $this->_toAuthorizationHeader($params);
-        $client      = Zend_Oauth::getHttpClient();
-
-        $client->setUri($this->_consumer->getAccessTokenUrl());
-        $client->setHeaders('Authorization', $headerValue);
-        $client->setMethod($this->_preferredRequestMethod);
-
-        return $client;
-    }
-
-    /**
-     * Generate and return a HTTP Client configured for the POST Body Request
-     * Scheme specified by OAuth, for use in requesting an Access Token.
-     *
-     * @param  array $params
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemePostBodyClient(array $params)
-    {
-        $params = $this->_cleanParamsOfIllegalCustomParameters($params);
-        $client = Zend_Oauth::getHttpClient();
-        $client->setUri($this->_consumer->getAccessTokenUrl());
-        $client->setMethod($this->_preferredRequestMethod);
-        $client->setRawData(
-            $this->_httpUtility->toEncodedQueryString($params)
-        );
-        $client->setHeaders(
-            Zend_Http_Client::CONTENT_TYPE,
-            Zend_Http_Client::ENC_URLENCODED
-        );
-        return $client;
-    }
-
-    /**
-     * Generate and return a HTTP Client configured for the Query String Request
-     * Scheme specified by OAuth, for use in requesting an Access Token.
-     *
-     * @param  array $params
-     * @param  string $url
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemeQueryStringClient(array $params, $url)
-    {
-        $params = $this->_cleanParamsOfIllegalCustomParameters($params);
-        return parent::getRequestSchemeQueryStringClient($params, $url);
-    }
-
-    /**
-     * Attempt a request based on the current configured OAuth Request Scheme and
-     * return the resulting HTTP Response.
-     *
-     * @param  array $params
-     * @return Zend_Http_Response
-     */
-    protected function _attemptRequest(array $params)
-    {
-        switch ($this->_preferredRequestScheme) {
-            case Zend_Oauth::REQUEST_SCHEME_HEADER:
-                $httpClient = $this->getRequestSchemeHeaderClient($params);
-                break;
-            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
-                $httpClient = $this->getRequestSchemePostBodyClient($params);
-                break;
-            case Zend_Oauth::REQUEST_SCHEME_QUERYSTRING:
-                $httpClient = $this->getRequestSchemeQueryStringClient($params,
-                    $this->_consumer->getAccessTokenUrl());
-                break;
-        }
-        return $httpClient->request();
-    }
-
-    /**
-     * Access Token requests specifically may not contain non-OAuth parameters.
-     * So these should be striped out and excluded. Detection is easy since
-     * specified OAuth parameters start with "oauth_", Extension params start
-     * with "xouth_", and no other parameters should use these prefixes.
-     *
-     * xouth params are not currently allowable.
-     *
-     * @param  array $params
-     * @return array
-     */
-    protected function _cleanParamsOfIllegalCustomParameters(array $params)
-    {
-        foreach ($params as $key=>$value) {
-            if (!preg_match("/^oauth_/", $key)) {
-                unset($params[$key]);
-            }
-        }
-        return $params;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Http/RequestToken.php b/airtime_mvc/library/Zend/Oauth/Http/RequestToken.php
deleted file mode 100644
index 974c7ea29..000000000
--- a/airtime_mvc/library/Zend/Oauth/Http/RequestToken.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RequestToken.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Http */
-require_once 'Zend/Oauth/Http.php';
-
-/** Zend_Oauth_Token_Request */
-require_once 'Zend/Oauth/Token/Request.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Http_RequestToken extends Zend_Oauth_Http
-{
-    /**
-     * Singleton instance if required of the HTTP client
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient = null;
-
-    /**
-     * Initiate a HTTP request to retrieve a Request Token.
-     *
-     * @return Zend_Oauth_Token_Request
-     */
-    public function execute()
-    {
-        $params   = $this->assembleParams();
-        $response = $this->startRequestCycle($params);
-        $return   = new Zend_Oauth_Token_Request($response);
-        return $return;
-    }
-
-    /**
-     * Assemble all parameters for an OAuth Request Token request.
-     *
-     * @return array
-     */
-    public function assembleParams()
-    {
-        $params = array(
-            'oauth_consumer_key'     => $this->_consumer->getConsumerKey(),
-            'oauth_nonce'            => $this->_httpUtility->generateNonce(),
-            'oauth_timestamp'        => $this->_httpUtility->generateTimestamp(),
-            'oauth_signature_method' => $this->_consumer->getSignatureMethod(),
-            'oauth_version'          => $this->_consumer->getVersion(),
-        );
-
-        // indicates we support 1.0a
-        if ($this->_consumer->getCallbackUrl()) {
-            $params['oauth_callback'] = $this->_consumer->getCallbackUrl();
-        } else {
-            $params['oauth_callback'] = 'oob';
-        }
-
-        if (!empty($this->_parameters)) {
-            $params = array_merge($params, $this->_parameters);
-        }
-
-        $params['oauth_signature'] = $this->_httpUtility->sign(
-            $params,
-            $this->_consumer->getSignatureMethod(),
-            $this->_consumer->getConsumerSecret(),
-            null,
-            $this->_preferredRequestMethod,
-            $this->_consumer->getRequestTokenUrl()
-        );
-
-        return $params;
-    }
-
-    /**
-     * Generate and return a HTTP Client configured for the Header Request Scheme
-     * specified by OAuth, for use in requesting a Request Token.
-     *
-     * @param array $params
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemeHeaderClient(array $params)
-    {
-        $headerValue = $this->_httpUtility->toAuthorizationHeader(
-            $params
-        );
-        $client = Zend_Oauth::getHttpClient();
-        $client->setUri($this->_consumer->getRequestTokenUrl());
-        $client->setHeaders('Authorization', $headerValue);
-        $rawdata = $this->_httpUtility->toEncodedQueryString($params, true);
-        if (!empty($rawdata)) {
-            $client->setRawData($rawdata);
-        }
-        $client->setMethod($this->_preferredRequestMethod);
-        return $client;
-    }
-
-    /**
-     * Generate and return a HTTP Client configured for the POST Body Request
-     * Scheme specified by OAuth, for use in requesting a Request Token.
-     *
-     * @param  array $params
-     * @return Zend_Http_Client
-     */
-    public function getRequestSchemePostBodyClient(array $params)
-    {
-        $client = Zend_Oauth::getHttpClient();
-        $client->setUri($this->_consumer->getRequestTokenUrl());
-        $client->setMethod($this->_preferredRequestMethod);
-        $client->setRawData(
-            $this->_httpUtility->toEncodedQueryString($params)
-        );
-        $client->setHeaders(
-            Zend_Http_Client::CONTENT_TYPE,
-            Zend_Http_Client::ENC_URLENCODED
-        );
-        return $client;
-    }
-
-    /**
-     * Attempt a request based on the current configured OAuth Request Scheme and
-     * return the resulting HTTP Response.
-     *
-     * @param  array $params
-     * @return Zend_Http_Response
-     */
-    protected function _attemptRequest(array $params)
-    {
-        switch ($this->_preferredRequestScheme) {
-            case Zend_Oauth::REQUEST_SCHEME_HEADER:
-                $httpClient = $this->getRequestSchemeHeaderClient($params);
-                break;
-            case Zend_Oauth::REQUEST_SCHEME_POSTBODY:
-                $httpClient = $this->getRequestSchemePostBodyClient($params);
-                break;
-            case Zend_Oauth::REQUEST_SCHEME_QUERYSTRING:
-                $httpClient = $this->getRequestSchemeQueryStringClient($params,
-                    $this->_consumer->getRequestTokenUrl());
-                break;
-        }
-        return $httpClient->request();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Http/UserAuthorization.php b/airtime_mvc/library/Zend/Oauth/Http/UserAuthorization.php
deleted file mode 100644
index 373afb444..000000000
--- a/airtime_mvc/library/Zend/Oauth/Http/UserAuthorization.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UserAuthorization.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Http */
-require_once 'Zend/Oauth/Http.php';
-
-/** Zend_Uri_Http */
-require_once 'Zend/Uri/Http.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Http_UserAuthorization extends Zend_Oauth_Http
-{
-    /**
-     * Generate a redirect URL from the allowable parameters and configured
-     * values.
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        $params = $this->assembleParams();
-        $uri    = Zend_Uri_Http::fromString($this->_consumer->getUserAuthorizationUrl());
-
-        $uri->setQuery(
-            $this->_httpUtility->toEncodedQueryString($params)
-        );
-
-        return $uri->getUri();
-    }
-
-    /**
-     * Assemble all parameters for inclusion in a redirect URL.
-     *
-     * @return array
-     */
-    public function assembleParams()
-    {
-        $params = array(
-            'oauth_token' => $this->_consumer->getLastRequestToken()->getToken(),
-        );
-
-        if (!Zend_Oauth_Client::$supportsRevisionA) {
-            $callback = $this->_consumer->getCallbackUrl();
-            if (!empty($callback)) {
-                $params['oauth_callback'] = $callback;
-            }
-        }
-
-        if (!empty($this->_parameters)) {
-            $params = array_merge($params, $this->_parameters);
-        }
-
-        return $params;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Http/Utility.php b/airtime_mvc/library/Zend/Oauth/Http/Utility.php
deleted file mode 100644
index 5b180beaf..000000000
--- a/airtime_mvc/library/Zend/Oauth/Http/Utility.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Utility.php 21233 2010-02-28 13:48:58Z padraic $
- */
-
-/** Zend_Oauth */
-require_once 'Zend/Oauth.php';
-
-/** Zend_Oauth_Http */
-require_once 'Zend/Oauth/Http.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Http_Utility
-{
-    /**
-     * Assemble all parameters for a generic OAuth request - i.e. no special
-     * params other than the defaults expected for any OAuth query.
-     *
-     * @param  string $url
-     * @param  Zend_Oauth_Config_ConfigInterface $config
-     * @param  null|array $serviceProviderParams
-     * @return array
-     */
-    public function assembleParams(
-        $url, 
-        Zend_Oauth_Config_ConfigInterface $config,
-        array $serviceProviderParams = null
-    ) {
-        $params = array(
-            'oauth_consumer_key'     => $config->getConsumerKey(),
-            'oauth_nonce'            => $this->generateNonce(),
-            'oauth_signature_method' => $config->getSignatureMethod(),
-            'oauth_timestamp'        => $this->generateTimestamp(),
-            'oauth_version'          => $config->getVersion(),
-        );
-        
-        if ($config->getToken()->getToken() != null) {
-            $params['oauth_token'] = $config->getToken()->getToken();
-        }
-
-
-        if (!is_null($serviceProviderParams)) {
-            $params = array_merge($params, $serviceProviderParams);
-        }
-
-        $params['oauth_signature'] = $this->sign(
-            $params,
-            $config->getSignatureMethod(),
-            $config->getConsumerSecret(),
-            $config->getToken()->getTokenSecret(),
-            $config->getRequestMethod(),
-            $url
-        );
-
-        return $params;
-    }
-
-    /**
-     * Given both OAuth parameters and any custom parametere, generate an
-     * encoded query string. This method expects parameters to have been
-     * assembled and signed beforehand.
-     *
-     * @param array $params
-     * @param bool $customParamsOnly Ignores OAuth params e.g. for requests using OAuth Header
-     * @return string
-     */
-    public function toEncodedQueryString(array $params, $customParamsOnly = false)
-    {
-        if ($customParamsOnly) {
-            foreach ($params as $key=>$value) {
-                if (preg_match("/^oauth_/", $key)) {
-                    unset($params[$key]);
-                }
-            }
-        }
-        $encodedParams = array();
-        foreach ($params as $key => $value) {
-            $encodedParams[] = self::urlEncode($key) 
-                             . '=' 
-                             . self::urlEncode($value);
-        }
-        return implode('&', $encodedParams);
-    }
-
-    /**
-     * Cast to authorization header
-     * 
-     * @param  array $params 
-     * @param  null|string $realm 
-     * @param  bool $excludeCustomParams 
-     * @return void
-     */
-    public function toAuthorizationHeader(array $params, $realm = null, $excludeCustomParams = true)
-    {
-        $headerValue = array(
-            'OAuth realm="' . $realm . '"',
-        );
-
-        foreach ($params as $key => $value) {
-            if ($excludeCustomParams) {
-                if (!preg_match("/^oauth_/", $key)) {
-                    continue;
-                }
-            }
-            $headerValue[] = self::urlEncode($key) 
-                           . '="'
-                           . self::urlEncode($value) . '"';
-        }
-        return implode(",", $headerValue);
-    }
-
-    /**
-     * Sign request
-     * 
-     * @param  array $params 
-     * @param  string $signatureMethod 
-     * @param  string $consumerSecret 
-     * @param  null|string $tokenSecret 
-     * @param  null|string $method 
-     * @param  null|string $url 
-     * @return string
-     */
-    public function sign(
-        array $params, $signatureMethod, $consumerSecret, $tokenSecret = null, $method = null, $url = null
-    ) {
-        $className = '';
-        $hashAlgo  = null;
-        $parts     = explode('-', $signatureMethod);
-        if (count($parts) > 1) {
-            $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($parts[0]));
-            $hashAlgo  = $parts[1];
-        } else {
-            $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($signatureMethod));
-        }
-
-        require_once str_replace('_', '/', $className) . '.php';
-        $signatureObject = new $className($consumerSecret, $tokenSecret, $hashAlgo);
-        return $signatureObject->sign($params, $method, $url);
-    }
-
-    /**
-     * Parse query string
-     * 
-     * @param  mixed $query 
-     * @return array
-     */
-    public function parseQueryString($query)
-    {
-        $params = array();
-        if (empty($query)) {
-            return array();
-        }
-
-        // Not remotely perfect but beats parse_str() which converts
-        // periods and uses urldecode, not rawurldecode.
-        $parts = explode('&', $query);
-        foreach ($parts as $pair) {
-            $kv = explode('=', $pair);
-            $params[rawurldecode($kv[0])] = rawurldecode($kv[1]);
-        }
-        return $params;
-    }
-
-    /**
-     * Generate nonce
-     * 
-     * @return string
-     */
-    public function generateNonce()
-    {
-        return md5(uniqid(rand(), true));
-    }
-
-    /**
-     * Generate timestamp
-     * 
-     * @return int
-     */
-    public function generateTimestamp()
-    {
-        return time();
-    }
-
-    /**
-     * urlencode a value
-     * 
-     * @param  string $value 
-     * @return string
-     */
-    public static function urlEncode($value)
-    {
-        $encoded = rawurlencode($value);
-        $encoded = str_replace('%7E', '~', $encoded);
-        return $encoded;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Signature/Hmac.php b/airtime_mvc/library/Zend/Oauth/Signature/Hmac.php
deleted file mode 100644
index ff95e9b86..000000000
--- a/airtime_mvc/library/Zend/Oauth/Signature/Hmac.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hmac.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Signature_SignatureAbstract */
-require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
-
-/** Zend_Crypt_Hmac */
-require_once 'Zend/Crypt/Hmac.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Signature_Hmac extends Zend_Oauth_Signature_SignatureAbstract
-{
-    /**
-     * Sign a request
-     * 
-     * @param  array $params 
-     * @param  mixed $method 
-     * @param  mixed $url 
-     * @return string
-     */
-    public function sign(array $params, $method = null, $url = null)
-    {
-        $binaryHash = Zend_Crypt_Hmac::compute(
-            $this->_key,
-            $this->_hashAlgorithm,
-            $this->_getBaseSignatureString($params, $method, $url),
-            Zend_Crypt_Hmac::BINARY
-        );
-        return base64_encode($binaryHash);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Signature/Plaintext.php b/airtime_mvc/library/Zend/Oauth/Signature/Plaintext.php
deleted file mode 100644
index 7d1e6d9ff..000000000
--- a/airtime_mvc/library/Zend/Oauth/Signature/Plaintext.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Plaintext.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Signature_SignatureAbstract */
-require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Signature_Plaintext extends Zend_Oauth_Signature_SignatureAbstract
-{
-    /**
-     * Sign a request
-     * 
-     * @param  array $params 
-     * @param  null|string $method 
-     * @param  null|string $url 
-     * @return string
-     */
-    public function sign(array $params, $method = null, $url = null)
-    {
-        if (is_null($this->_tokenSecret)) {
-            return $this->_consumerSecret . '&';
-        }
-        $return = implode('&', array($this->_consumerSecret, $this->_tokenSecret));
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Signature/Rsa.php b/airtime_mvc/library/Zend/Oauth/Signature/Rsa.php
deleted file mode 100644
index 20587ccf1..000000000
--- a/airtime_mvc/library/Zend/Oauth/Signature/Rsa.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rsa.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Signature_SignatureAbstract */
-require_once 'Zend/Oauth/Signature/SignatureAbstract.php';
-
-/** Zend_Crypt_Rsa */
-require_once 'Zend/Crypt/Rsa.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Signature_Rsa extends Zend_Oauth_Signature_SignatureAbstract
-{
-    /**
-     * Sign a request
-     * 
-     * @param  array $params 
-     * @param  null|string $method 
-     * @param  null|string $url 
-     * @return string
-     */
-    public function sign(array $params, $method = null, $url = null) 
-    {
-        $rsa = new Zend_Crypt_Rsa;
-        $rsa->setHashAlgorithm($this->_hashAlgorithm);
-        $sign = $rsa->sign(
-            $this->_getBaseSignatureString($params, $method, $url),
-            $this->_key,
-            Zend_Crypt_Rsa::BASE64
-        );
-        return $sign;
-    }
-
-    /**
-     * Assemble encryption key
-     * 
-     * @return string
-     */
-    protected function _assembleKey()
-    {
-        return $this->_consumerSecret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Signature/SignatureAbstract.php b/airtime_mvc/library/Zend/Oauth/Signature/SignatureAbstract.php
deleted file mode 100644
index 9f3b210f5..000000000
--- a/airtime_mvc/library/Zend/Oauth/Signature/SignatureAbstract.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SignatureAbstract.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Http_Utility */
-require_once 'Zend/Oauth/Http/Utility.php';
-
-/** Zend_Uri_Http */
-require_once 'Zend/Uri/Http.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Oauth_Signature_SignatureAbstract
-{
-    /**
-     * Hash algorithm to use when generating signature
-     * @var string
-     */
-    protected $_hashAlgorithm = null;
-
-    /**
-     * Key to use when signing
-     * @var string
-     */
-    protected $_key = null;
-
-    /**
-     * Consumer secret
-     * @var string
-     */
-    protected $_consumerSecret = null;
-
-    /**
-     * Token secret
-     * @var string
-     */
-    protected $_tokenSecret = '';
-
-    /**
-     * Constructor
-     * 
-     * @param  string $consumerSecret 
-     * @param  null|string $tokenSecret 
-     * @param  null|string $hashAlgo 
-     * @return void
-     */
-    public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = null)
-    {
-        $this->_consumerSecret = $consumerSecret;
-        if (isset($tokenSecret)) {
-            $this->_tokenSecret = $tokenSecret;
-        }
-        $this->_key = $this->_assembleKey();
-        if (isset($hashAlgo)) {
-            $this->_hashAlgorithm = $hashAlgo;
-        }
-    }
-
-    /**
-     * Sign a request
-     * 
-     * @param  array $params 
-     * @param  null|string $method 
-     * @param  null|string $url 
-     * @return string
-     */
-    public abstract function sign(array $params, $method = null, $url = null);
-
-    /**
-     * Normalize the base signature URL
-     * 
-     * @param  string $url 
-     * @return string
-     */
-    public function normaliseBaseSignatureUrl($url)
-    {
-        $uri = Zend_Uri_Http::fromString($url);
-        if ($uri->getScheme() == 'http' && $uri->getPort() == '80') {
-            $uri->setPort('');
-        } elseif ($uri->getScheme() == 'https' && $uri->getPort() == '443') {
-            $uri->setPort('');
-        }
-        $uri->setQuery('');
-        $uri->setFragment('');
-        $uri->setHost(strtolower($uri->getHost()));
-        return $uri->getUri(true);
-    }
-
-    /**
-     * Assemble key from consumer and token secrets
-     * 
-     * @return string
-     */
-    protected function _assembleKey()
-    {
-        $parts = array($this->_consumerSecret);
-        if (!is_null($this->_tokenSecret)) {
-            $parts[] = $this->_tokenSecret;
-        }
-        foreach ($parts as $key => $secret) {
-            $parts[$key] = Zend_Oauth_Http_Utility::urlEncode($secret);
-        }
-        return implode('&', $parts);
-    }
-
-    /**
-     * Get base signature string
-     * 
-     * @param  array $params 
-     * @param  null|string $method 
-     * @param  null|string $url 
-     * @return string
-     */
-    protected function _getBaseSignatureString(array $params, $method = null, $url = null)
-    {
-        $encodedParams = array();
-        foreach ($params as $key => $value) {
-            $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] = 
-                Zend_Oauth_Http_Utility::urlEncode($value);
-        }
-        $baseStrings = array();
-        if (isset($method)) {
-            $baseStrings[] = strtoupper($method);
-        }
-        if (isset($url)) {
-            // should normalise later
-            $baseStrings[] = Zend_Oauth_Http_Utility::urlEncode(
-                $this->normaliseBaseSignatureUrl($url)
-            );
-        }
-        if (isset($encodedParams['oauth_signature'])) {
-            unset($encodedParams['oauth_signature']);
-        }
-        $baseStrings[] = Zend_Oauth_Http_Utility::urlEncode(
-            $this->_toByteValueOrderedQueryString($encodedParams)
-        );
-        return implode('&', $baseStrings);
-    }
-
-    /**
-     * Transform an array to a byte value ordered query string
-     * 
-     * @param  array $params 
-     * @return string
-     */
-    protected function _toByteValueOrderedQueryString(array $params)
-    {
-        $return = array();
-        uksort($params, 'strnatcmp');
-        foreach ($params as $key => $value) {
-            if (is_array($value)) {
-                natsort($value);
-                foreach ($value as $keyduplicate) {
-                    $return[] = $key . '=' . $keyduplicate;
-                }
-            } else {
-                $return[] = $key . '=' . $value;
-            }
-        }
-        return implode('&', $return);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Token.php b/airtime_mvc/library/Zend/Oauth/Token.php
deleted file mode 100644
index 3b2b51253..000000000
--- a/airtime_mvc/library/Zend/Oauth/Token.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Token.php 20232 2010-01-12 17:56:33Z matthew $
- */
-
-/** Zend_Oauth_Http_Utility */
-require_once 'Zend/Oauth/Http/Utility.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Oauth_Token
-{
-    /**@+
-     * Token constants
-     */
-    const TOKEN_PARAM_KEY                = 'oauth_token';
-    const TOKEN_SECRET_PARAM_KEY         = 'oauth_token_secret';
-    const TOKEN_PARAM_CALLBACK_CONFIRMED = 'oauth_callback_confirmed';
-    /**@-*/
-
-    /**
-     * Token parameters
-     * 
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * OAuth response object
-     * 
-     * @var Zend_Http_Response
-     */
-    protected $_response = null;
-
-    /**
-     * @var Zend_Oauth_Http_Utility
-     */
-    protected $_httpUtility = null;
-
-    /**
-     * Constructor; basic setup for any Token subclass.
-     *
-     * @param  null|Zend_Http_Response $response
-     * @param  null|Zend_Oauth_Http_Utility $utility
-     * @return void
-     */
-    public function __construct(
-        Zend_Http_Response $response = null,
-        Zend_Oauth_Http_Utility $utility = null
-    ) {
-        if (!is_null($response)) {
-            $this->_response = $response;
-            $params = $this->_parseParameters($response);
-            if (count($params) > 0) {
-                $this->setParams($params);
-            }
-        }
-        if (!is_null($utility)) {
-            $this->_httpUtility = $utility;
-        } else {
-            $this->_httpUtility = new Zend_Oauth_Http_Utility;
-        }
-    }
-
-    /**
-     * Attempts to validate the Token parsed from the HTTP response - really
-     * it's just very basic existence checks which are minimal.
-     *
-     * @return bool
-     */
-    public function isValid()
-    {
-        if (isset($this->_params[self::TOKEN_PARAM_KEY])
-            && !empty($this->_params[self::TOKEN_PARAM_KEY])
-            && isset($this->_params[self::TOKEN_SECRET_PARAM_KEY])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Return the HTTP response object used to initialise this instance.
-     *
-     * @return Zend_Http_Response
-     */
-    public function getResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Sets the value for the this Token's secret which may be used when signing
-     * requests with this Token.
-     *
-     * @param  string $secret
-     * @return Zend_Oauth_Token
-     */
-    public function setTokenSecret($secret)
-    {
-        $this->setParam(self::TOKEN_SECRET_PARAM_KEY, $secret);
-        return $this;
-    }
-
-    /**
-     * Retrieve this Token's secret which may be used when signing
-     * requests with this Token.
-     *
-     * @return string
-     */
-    public function getTokenSecret()
-    {
-        return $this->getParam(self::TOKEN_SECRET_PARAM_KEY);
-    }
-
-    /**
-     * Sets the value for a parameter (e.g. token secret or other) and run
-     * a simple filter to remove any trailing newlines.
-     *
-     * @param  string $key
-     * @param  string $value
-     * @return Zend_Oauth_Token
-     */
-    public function setParam($key, $value)
-    {
-        $this->_params[$key] = trim($value, "\n");
-        return $this;
-    }
-
-    /**
-     * Sets the value for some parameters (e.g. token secret or other) and run
-     * a simple filter to remove any trailing newlines.
-     *
-     * @param  array $params
-     * @return Zend_Oauth_Token
-     */
-    public function setParams(array $params)
-    {
-        foreach ($params as $key=>$value) {
-            $this->setParam($key, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Get the value for a parameter (e.g. token secret or other).
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function getParam($key)
-    {
-        if (isset($this->_params[$key])) {
-            return $this->_params[$key];
-        }
-        return null;
-    }
-
-    /**
-     * Sets the value for a Token.
-     *
-     * @param  string $token
-     * @return Zend_Oauth_Token
-     */
-    public function setToken($token)
-    {
-        $this->setParam(self::TOKEN_PARAM_KEY, $token);
-        return $this;
-    }
-
-    /**
-     * Gets the value for a Token.
-     *
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->getParam(self::TOKEN_PARAM_KEY);
-    }
-
-    /**
-     * Generic accessor to enable access as public properties.
-     *
-     * @return string
-     */
-    public function __get($key)
-    {
-        return $this->getParam($key);
-    }
-
-    /**
-     * Generic mutator to enable access as public properties.
-     *
-     * @param  string $key
-     * @param  string $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this->setParam($key, $value);
-    }
-
-    /**
-     * Convert Token to a string, specifically a raw encoded query string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->_httpUtility->toEncodedQueryString($this->_params);
-    }
-
-    /**
-     * Convert Token to a string, specifically a raw encoded query string.
-     * Aliases to self::toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Parse a HTTP response body and collect returned parameters
-     * as raw url decoded key-value pairs in an associative array.
-     *
-     * @param  Zend_Http_Response $response
-     * @return array
-     */
-    protected function _parseParameters(Zend_Http_Response $response)
-    {
-        $params = array();
-        $body   = $response->getBody();
-        if (empty($body)) {
-            return;
-        }
-
-        // validate body based on acceptable characters...todo
-        $parts = explode('&', $body);
-        foreach ($parts as $kvpair) {
-            $pair = explode('=', $kvpair);
-            $params[rawurldecode($pair[0])] = rawurldecode($pair[1]);
-        }
-        return $params;
-    }
-    
-    /**
-     * Limit serialisation stored data to the parameters
-     */
-    public function __sleep() 
-    {
-        return array('_params');
-    }
-
-    /**
-     * After serialisation, re-instantiate a HTTP utility class for use
-     */
-    public function __wakeup() 
-    {
-        if (is_null($this->_httpUtility)) {
-            $this->_httpUtility = new Zend_Oauth_Http_Utility;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Token/Access.php b/airtime_mvc/library/Zend/Oauth/Token/Access.php
deleted file mode 100644
index 402330043..000000000
--- a/airtime_mvc/library/Zend/Oauth/Token/Access.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Access.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Token */
-require_once 'Zend/Oauth/Token.php';
-
-/** Zend_Oauth_Http */
-require_once 'Zend/Oauth/Http.php';
-
-/** Zend_Uri_Http */
-require_once 'Zend/Uri/Http.php';
-
-/** Zend_Oauth_Client */
-require_once 'Zend/Oauth/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Token_Access extends Zend_Oauth_Token
-{
-    /**
-     * Cast to HTTP header
-     * 
-     * @param  string $url 
-     * @param  Zend_Oauth_Config_ConfigInterface $config 
-     * @param  null|array $customParams 
-     * @param  null|string $realm 
-     * @return string
-     */
-    public function toHeader(
-        $url, Zend_Oauth_Config_ConfigInterface $config, array $customParams = null, $realm = null
-    ) {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $params = $this->_httpUtility->assembleParams($url, $config, $customParams);
-        return $this->_httpUtility->toAuthorizationHeader($params, $realm);
-    }
-
-    /**
-     * Cast to HTTP query string
-     * 
-     * @param  mixed $url 
-     * @param  Zend_Oauth_Config_ConfigInterface $config 
-     * @param  null|array $params 
-     * @return string
-     */
-    public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null)
-    {
-        if (!Zend_Uri::check($url)) {
-            require_once 'Zend/Oauth/Exception.php';
-            throw new Zend_Oauth_Exception(
-                '\'' . $url . '\' is not a valid URI'
-            );
-        }
-        $params = $this->_httpUtility->assembleParams($url, $config, $params);
-        return $this->_httpUtility->toEncodedQueryString($params);
-    }
-
-    /**
-     * Get OAuth client
-     * 
-     * @param  array $oauthOptions 
-     * @param  null|string $uri 
-     * @param  null|array|Zend_Config $config 
-     * @param  bool $excludeCustomParamsFromHeader 
-     * @return Zend_Oauth_Client
-     */
-    public function getHttpClient(array $oauthOptions, $uri = null, $config = null, $excludeCustomParamsFromHeader = true)
-    {
-        $client = new Zend_Oauth_Client($oauthOptions, $uri, $config, $excludeCustomParamsFromHeader);
-        $client->setToken($this);
-        return $client;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Token/AuthorizedRequest.php b/airtime_mvc/library/Zend/Oauth/Token/AuthorizedRequest.php
deleted file mode 100644
index aa9f75e51..000000000
--- a/airtime_mvc/library/Zend/Oauth/Token/AuthorizedRequest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AuthorizedRequest.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Token */
-require_once 'Zend/Oauth/Token.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Token_AuthorizedRequest extends Zend_Oauth_Token
-{
-    /**
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $data
-     * @param  null|Zend_Oauth_Http_Utility $utility
-     * @return void
-     */
-    public function __construct(array $data = null, Zend_Oauth_Http_Utility $utility = null)
-    {
-        if (!is_null($data)) {
-            $this->_data = $data;
-            $params = $this->_parseData();
-            if (count($params) > 0) {
-                $this->setParams($params);
-            }
-        }
-        if (!is_null($utility)) {
-            $this->_httpUtility = $utility;
-        } else {
-            $this->_httpUtility = new Zend_Oauth_Http_Utility;
-        }
-    }
-
-    /**
-     * Retrieve token data
-     * 
-     * @return array
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Indicate if token is valid
-     * 
-     * @return bool
-     */
-    public function isValid()
-    {
-        if (isset($this->_params[self::TOKEN_PARAM_KEY])
-            && !empty($this->_params[self::TOKEN_PARAM_KEY])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Parse string data into array
-     * 
-     * @return array
-     */
-    protected function _parseData()
-    {
-        $params = array();
-        if (empty($this->_data)) {
-            return;
-        }
-        foreach ($this->_data as $key => $value) {
-            $params[rawurldecode($key)] = rawurldecode($value);
-        }
-        return $params;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Oauth/Token/Request.php b/airtime_mvc/library/Zend/Oauth/Token/Request.php
deleted file mode 100644
index 0d449d78b..000000000
--- a/airtime_mvc/library/Zend/Oauth/Token/Request.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Request.php 20217 2010-01-12 16:01:57Z matthew $
- */
-
-/** Zend_Oauth_Token */
-require_once 'Zend/Oauth/Token.php';
-
-/**
- * @category   Zend
- * @package    Zend_Oauth
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Oauth_Token_Request extends Zend_Oauth_Token
-{
-    /**
-     * Constructor
-     *
-     * @param null|Zend_Http_Response $response
-     * @param null|Zend_Oauth_Http_Utility $utility
-     */
-    public function __construct(
-        Zend_Http_Response $response = null,
-        Zend_Oauth_Http_Utility $utility = null
-    ) {
-        parent::__construct($response, $utility);
-
-        // detect if server supports OAuth 1.0a
-        if (isset($this->_params[Zend_Oauth_Token::TOKEN_PARAM_CALLBACK_CONFIRMED])) {
-            Zend_Oauth_Client::$supportsRevisionA = true;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId.php b/airtime_mvc/library/Zend/OpenId.php
deleted file mode 100644
index 48853d19b..000000000
--- a/airtime_mvc/library/Zend/OpenId.php
+++ /dev/null
@@ -1,753 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenId.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Response_Abstract
- */
-require_once "Zend/Controller/Response/Abstract.php";
-
-/**
- * Static class that contains common utility functions for
- * {@link Zend_OpenId_Consumer} and {@link Zend_OpenId_Provider}.
- *
- * This class implements common utility functions that are used by both
- * Consumer and Provider. They include functions for Diffie-Hellman keys
- * generation and exchange, URL normalization, HTTP redirection and some others.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId
-{
-    /**
-     * Default Diffie-Hellman key generator (1024 bit)
-     */
-    const DH_P   = 'dcf93a0b883972ec0e19989ac5a2ce310e1d37717e8d9571bb7623731866e61ef75a2e27898b057f9891c2e27a639c3f29b60814581cd3b2ca3986d2683705577d45c2e7e52dc81c7a171876e5cea74b1448bfdfaf18828efd2519f14e45e3826634af1949e5b535cc829a483b8a76223e5d490a257f05bdff16f2fb22c583ab';
-
-    /**
-     * Default Diffie-Hellman prime number (should be 2 or 5)
-     */
-    const DH_G   = '02';
-
-    /**
-     * OpenID 2.0 namespace. All OpenID 2.0 messages MUST contain variable
-     * openid.ns with its value.
-     */
-    const NS_2_0 = 'http://specs.openid.net/auth/2.0';
-
-    /**
-     * Allows enable/disable stoping execution of PHP script after redirect()
-     */
-    static public $exitOnRedirect = true;
-
-    /**
-     * Alternative request URL that can be used to override the default
-     * selfUrl() response
-     */
-    static public $selfUrl = null;
-
-    /**
-     * Sets alternative request URL that can be used to override the default
-     * selfUrl() response
-     *
-     * @param string $selfUrl the URL to be set
-     * @return string the old value of overriding URL
-     */
-    static public function setSelfUrl($selfUrl = null)
-    {
-        $ret = self::$selfUrl;
-        self::$selfUrl = $selfUrl;
-        return $ret;
-    }
-
-    /**
-     * Returns a full URL that was requested on current HTTP request.
-     *
-     * @return string
-     */
-    static public function selfUrl()
-    {
-        if (self::$selfUrl !== null) {
-            return self::$selfUrl;
-        } if (isset($_SERVER['SCRIPT_URI'])) {
-            return $_SERVER['SCRIPT_URI'];
-        }
-        $url = '';
-        $port = '';
-        if (isset($_SERVER['HTTP_HOST'])) {
-            if (($pos = strpos($_SERVER['HTTP_HOST'], ':')) === false) {
-                if (isset($_SERVER['SERVER_PORT'])) {
-                    $port = ':' . $_SERVER['SERVER_PORT'];
-                }
-                $url = $_SERVER['HTTP_HOST'];
-            } else {
-                $url = substr($_SERVER['HTTP_HOST'], 0, $pos);
-                $port = substr($_SERVER['HTTP_HOST'], $pos);
-            }
-        } else if (isset($_SERVER['SERVER_NAME'])) {
-            $url = $_SERVER['SERVER_NAME'];
-            if (isset($_SERVER['SERVER_PORT'])) {
-                $port = ':' . $_SERVER['SERVER_PORT'];
-            }
-        }
-        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
-            $url = 'https://' . $url;
-            if ($port == ':443') {
-                $port = '';
-            }
-        } else {
-            $url = 'http://' . $url;
-            if ($port == ':80') {
-                $port = '';
-            }
-        }
-
-        $url .= $port;
-        if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-            $url .= $_SERVER['HTTP_X_REWRITE_URL'];
-        } elseif (isset($_SERVER['REQUEST_URI'])) {
-            $query = strpos($_SERVER['REQUEST_URI'], '?');
-            if ($query === false) {
-                $url .= $_SERVER['REQUEST_URI'];
-            } else {
-                $url .= substr($_SERVER['REQUEST_URI'], 0, $query);
-            }
-        } else if (isset($_SERVER['SCRIPT_URL'])) {
-            $url .= $_SERVER['SCRIPT_URL'];
-        } else if (isset($_SERVER['REDIRECT_URL'])) {
-            $url .= $_SERVER['REDIRECT_URL'];
-        } else if (isset($_SERVER['PHP_SELF'])) {
-            $url .= $_SERVER['PHP_SELF'];
-        } else if (isset($_SERVER['SCRIPT_NAME'])) {
-            $url .= $_SERVER['SCRIPT_NAME'];
-            if (isset($_SERVER['PATH_INFO'])) {
-                $url .= $_SERVER['PATH_INFO'];
-            }
-        }
-        return $url;
-    }
-
-    /**
-     * Returns an absolute URL for the given one
-     *
-     * @param string $url absilute or relative URL
-     * @return string
-     */
-    static public function absoluteUrl($url)
-    {
-        if (empty($url)) {
-            return Zend_OpenId::selfUrl();
-        } else if (!preg_match('|^([^:]+)://|', $url)) {
-            if (preg_match('|^([^:]+)://([^:@]*(?:[:][^@]*)?@)?([^/:@?#]*)(?:[:]([^/?#]*))?(/[^?]*)?((?:[?](?:[^#]*))?(?:#.*)?)$|', Zend_OpenId::selfUrl(), $reg)) {
-                $scheme = $reg[1];
-                $auth = $reg[2];
-                $host = $reg[3];
-                $port = $reg[4];
-                $path = $reg[5];
-                $query = $reg[6];
-                if ($url[0] == '/') {
-                    return $scheme
-                        . '://'
-                        . $auth
-                        . $host
-                        . (empty($port) ? '' : (':' . $port))
-                        . $url;
-                } else {
-                    $dir = dirname($path);
-                    return $scheme
-                        . '://'
-                        . $auth
-                        . $host
-                        . (empty($port) ? '' : (':' . $port))
-                        . (strlen($dir) > 1 ? $dir : '')
-                        . '/'
-                        . $url;
-                }
-            }
-        }
-        return $url;
-    }
-
-    /**
-     * Converts variable/value pairs into URL encoded query string
-     *
-     * @param array $params variable/value pairs
-     * @return string URL encoded query string
-     */
-    static public function paramsToQuery($params)
-    {
-        foreach($params as $key => $value) {
-            if (isset($query)) {
-                $query .= '&' . $key . '=' . urlencode($value);
-            } else {
-                $query = $key . '=' . urlencode($value);
-            }
-        }
-        return isset($query) ? $query : '';
-    }
-
-    /**
-     * Normalizes URL according to RFC 3986 to use it in comparison operations.
-     * The function gets URL argument by reference and modifies it.
-     * It returns true on success and false of failure.
-     *
-     * @param string &$id url to be normalized
-     * @return bool
-     */
-    static public function normalizeUrl(&$id)
-    {
-        // RFC 3986, 6.2.2.  Syntax-Based Normalization
-
-        // RFC 3986, 6.2.2.2 Percent-Encoding Normalization
-        $i = 0;
-        $n = strlen($id);
-        $res = '';
-        while ($i < $n) {
-            if ($id[$i] == '%') {
-                if ($i + 2 >= $n) {
-                    return false;
-                }
-                ++$i;
-                if ($id[$i] >= '0' && $id[$i] <= '9') {
-                    $c = ord($id[$i]) - ord('0');
-                } else if ($id[$i] >= 'A' && $id[$i] <= 'F') {
-                    $c = ord($id[$i]) - ord('A') + 10;
-                } else if ($id[$i] >= 'a' && $id[$i] <= 'f') {
-                    $c = ord($id[$i]) - ord('a') + 10;
-                } else {
-                    return false;
-                }
-                ++$i;
-                if ($id[$i] >= '0' && $id[$i] <= '9') {
-                    $c = ($c << 4) | (ord($id[$i]) - ord('0'));
-                } else if ($id[$i] >= 'A' && $id[$i] <= 'F') {
-                    $c = ($c << 4) | (ord($id[$i]) - ord('A') + 10);
-                } else if ($id[$i] >= 'a' && $id[$i] <= 'f') {
-                    $c = ($c << 4) | (ord($id[$i]) - ord('a') + 10);
-                } else {
-                    return false;
-                }
-                ++$i;
-                $ch = chr($c);
-                if (($ch >= 'A' && $ch <= 'Z') ||
-                    ($ch >= 'a' && $ch <= 'z') ||
-                    $ch == '-' ||
-                    $ch == '.' ||
-                    $ch == '_' ||
-                    $ch == '~') {
-                    $res .= $ch;
-                } else {
-                    $res .= '%';
-                    if (($c >> 4) < 10) {
-                        $res .= chr(($c >> 4) + ord('0'));
-                    } else {
-                        $res .= chr(($c >> 4) - 10 + ord('A'));
-                    }
-                    $c = $c & 0xf;
-                    if ($c < 10) {
-                        $res .= chr($c + ord('0'));
-                    } else {
-                        $res .= chr($c - 10 + ord('A'));
-                    }
-                }
-            } else {
-                $res .= $id[$i++];
-            }
-        }
-
-        if (!preg_match('|^([^:]+)://([^:@]*(?:[:][^@]*)?@)?([^/:@?#]*)(?:[:]([^/?#]*))?(/[^?#]*)?((?:[?](?:[^#]*))?)((?:#.*)?)$|', $res, $reg)) {
-            return false;
-        }
-        $scheme = $reg[1];
-        $auth = $reg[2];
-        $host = $reg[3];
-        $port = $reg[4];
-        $path = $reg[5];
-        $query = $reg[6];
-        $fragment = $reg[7]; /* strip it */
-
-        if (empty($scheme) || empty($host)) {
-            return false;
-        }
-
-        // RFC 3986, 6.2.2.1.  Case Normalization
-        $scheme = strtolower($scheme);
-        $host = strtolower($host);
-
-        // RFC 3986, 6.2.2.3.  Path Segment Normalization
-        if (!empty($path)) {
-            $i = 0;
-            $n = strlen($path);
-            $res = "";
-            while ($i < $n) {
-                if ($path[$i] == '/') {
-                    ++$i;
-                    while ($i < $n && $path[$i] == '/') {
-                        ++$i;
-                    }
-                    if ($i < $n && $path[$i] == '.') {
-                        ++$i;
-                        if ($i < $n && $path[$i] == '.') {
-                            ++$i;
-                            if ($i == $n || $path[$i] == '/') {
-                                if (($pos = strrpos($res, '/')) !== false) {
-                                    $res = substr($res, 0, $pos);
-                                }
-                            } else {
-                                    $res .= '/..';
-                            }
-                        } else if ($i != $n && $path[$i] != '/') {
-                            $res .= '/.';
-                        }
-                    } else {
-                        $res .= '/';
-                    }
-                } else {
-                    $res .= $path[$i++];
-                }
-            }
-            $path = $res;
-        }
-
-        // RFC 3986,6.2.3.  Scheme-Based Normalization
-        if ($scheme == 'http') {
-            if ($port == 80) {
-                $port = '';
-            }
-        } else if ($scheme == 'https') {
-            if ($port == 443) {
-                $port = '';
-            }
-        }
-        if (empty($path)) {
-            $path = '/';
-        }
-
-        $id = $scheme
-            . '://'
-            . $auth
-            . $host
-            . (empty($port) ? '' : (':' . $port))
-            . $path
-            . $query;
-        return true;
-    }
-
-    /**
-     * Normalizes OpenID identifier that can be URL or XRI name.
-     * Returns true on success and false of failure.
-     *
-     * Normalization is performed according to the following rules:
-     * 1. If the user's input starts with one of the "xri://", "xri://$ip*",
-     *    or "xri://$dns*" prefixes, they MUST be stripped off, so that XRIs
-     *    are used in the canonical form, and URI-authority XRIs are further
-     *    considered URL identifiers.
-     * 2. If the first character of the resulting string is an XRI Global
-     *    Context Symbol ("=", "@", "+", "$", "!"), then the input SHOULD be
-     *    treated as an XRI.
-     * 3. Otherwise, the input SHOULD be treated as an http URL; if it does
-     *    not include a "http" or "https" scheme, the Identifier MUST be
-     *    prefixed with the string "http://".
-     * 4. URL identifiers MUST then be further normalized by both following
-     *    redirects when retrieving their content and finally applying the
-     *    rules in Section 6 of [RFC3986] to the final destination URL.
-     * @param string &$id identifier to be normalized
-     * @return bool
-     */
-    static public function normalize(&$id)
-    {
-        $id = trim($id);
-        if (strlen($id) === 0) {
-            return true;
-        }
-
-        // 7.2.1
-        if (strpos($id, 'xri://$ip*') === 0) {
-            $id = substr($id, strlen('xri://$ip*'));
-        } else if (strpos($id, 'xri://$dns*') === 0) {
-            $id = substr($id, strlen('xri://$dns*'));
-        } else if (strpos($id, 'xri://') === 0) {
-            $id = substr($id, strlen('xri://'));
-        }
-
-        // 7.2.2
-        if ($id[0] == '=' ||
-            $id[0] == '@' ||
-            $id[0] == '+' ||
-            $id[0] == '$' ||
-            $id[0] == '!') {
-            return true;
-        }
-
-        // 7.2.3
-        if (strpos($id, "://") === false) {
-            $id = 'http://' . $id;
-        }
-
-        // 7.2.4
-        return self::normalizeURL($id);
-    }
-
-    /**
-     * Performs a HTTP redirection to specified URL with additional data.
-     * It may generate redirected request using GET or POST HTTP method.
-     * The function never returns.
-     *
-     * @param string $url URL to redirect to
-     * @param array $params additional variable/value pairs to send
-     * @param Zend_Controller_Response_Abstract $response
-     * @param string $method redirection method ('GET' or 'POST')
-     */
-    static public function redirect($url, $params = null,
-        Zend_Controller_Response_Abstract $response = null, $method = 'GET')
-    {
-        $url = Zend_OpenId::absoluteUrl($url);
-        $body = "";
-        if (null === $response) {
-            require_once "Zend/Controller/Response/Http.php";
-            $response = new Zend_Controller_Response_Http();
-        }
-
-        if ($method == 'POST') {
-            $body = "<html><body onLoad=\"document.forms[0].submit();\">\n";
-            $body .= "<form method=\"POST\" action=\"$url\">\n";
-            if (is_array($params) && count($params) > 0) {
-                foreach($params as $key => $value) {
-                    $body .= '<input type="hidden" name="' . $key . '" value="' . $value . "\">\n";
-                }
-            }
-            $body .= "<input type=\"submit\" value=\"Continue OpenID transaction\">\n";
-            $body .= "</form></body></html>\n";
-        } else if (is_array($params) && count($params) > 0) {
-            if (strpos($url, '?') === false) {
-                $url .= '?' . self::paramsToQuery($params);
-            } else {
-                $url .= '&' . self::paramsToQuery($params);
-            }
-        }
-        if (!empty($body)) {
-            $response->setBody($body);
-        } else if (!$response->canSendHeaders()) {
-            $response->setBody("<script language=\"JavaScript\"" .
-                 " type=\"text/javascript\">window.location='$url';" .
-                 "</script>");
-        } else {
-            $response->setRedirect($url);
-        }
-        $response->sendResponse();
-        if (self::$exitOnRedirect) {
-            exit();
-        }
-    }
-
-    /**
-     * Produces string of random byte of given length.
-     *
-     * @param integer $len length of requested string
-     * @return string RAW random binary string
-     */
-    static public function randomBytes($len)
-    {
-        $key = '';
-        for($i=0; $i < $len; $i++) {
-            $key .= chr(mt_rand(0, 255));
-        }
-        return $key;
-    }
-
-    /**
-     * Generates a hash value (message digest) according to given algorithm.
-     * It returns RAW binary string.
-     *
-     * This is a wrapper function that uses one of available internal function
-     * dependent on given PHP configuration. It may use various functions from
-     *  ext/openssl, ext/hash, ext/mhash or ext/standard.
-     *
-     * @param string $func digest algorithm
-     * @param string $data data to sign
-     * @return string RAW digital signature
-     * @throws Zend_OpenId_Exception
-     */
-    static public function digest($func, $data)
-    {
-        if (function_exists('openssl_digest')) {
-            return openssl_digest($data, $func, true);
-        } else if (function_exists('hash')) {
-            return hash($func, $data, true);
-        } else if ($func === 'sha1') {
-            return sha1($data, true);
-        } else if ($func === 'sha256') {
-            if (function_exists('mhash')) {
-                return mhash(MHASH_SHA256 , $data);
-            }
-        }
-        require_once "Zend/OpenId/Exception.php";
-        throw new Zend_OpenId_Exception(
-            'Unsupported digest algorithm "' . $func . '".',
-            Zend_OpenId_Exception::UNSUPPORTED_DIGEST);
-    }
-
-    /**
-     * Generates a keyed hash value using the HMAC method. It uses ext/hash
-     * if available or user-level PHP implementation, that is not significantly
-     * slower.
-     *
-     * @param string $macFunc name of selected hashing algorithm (sha1, sha256)
-     * @param string $data data to sign
-     * @param string $secret shared secret key used for generating the HMAC
-     *  variant of the message digest
-     * @return string RAW HMAC value
-     */
-    static public function hashHmac($macFunc, $data, $secret)
-    {
-//        require_once "Zend/Crypt/Hmac.php";
-//        return Zend_Crypt_Hmac::compute($secret, $macFunc, $data, Zend_Crypt_Hmac::BINARY);
-        if (function_exists('hash_hmac')) {
-            return hash_hmac($macFunc, $data, $secret, 1);
-        } else {
-            if (Zend_OpenId::strlen($secret) > 64) {
-                $secret = self::digest($macFunc, $secret);
-            }
-            $secret = str_pad($secret, 64, chr(0x00));
-            $ipad = str_repeat(chr(0x36), 64);
-            $opad = str_repeat(chr(0x5c), 64);
-            $hash1 = self::digest($macFunc, ($secret ^ $ipad) . $data);
-            return self::digest($macFunc, ($secret ^ $opad) . $hash1);
-        }
-    }
-
-    /**
-     * Converts binary representation into ext/gmp or ext/bcmath big integer
-     * representation.
-     *
-     * @param string $bin binary representation of big number
-     * @return mixed
-     * @throws Zend_OpenId_Exception
-     */
-    static protected function binToBigNum($bin)
-    {
-        if (extension_loaded('gmp')) {
-            return gmp_init(bin2hex($bin), 16);
-        } else if (extension_loaded('bcmath')) {
-            $bn = 0;
-            $len = Zend_OpenId::strlen($bin);
-            for ($i = 0; $i < $len; $i++) {
-                $bn = bcmul($bn, 256);
-                $bn = bcadd($bn, ord($bin[$i]));
-            }
-            return $bn;
-        }
-        require_once "Zend/OpenId/Exception.php";
-        throw new Zend_OpenId_Exception(
-            'The system doesn\'t have proper big integer extension',
-            Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH);
-    }
-
-    /**
-     * Converts internal ext/gmp or ext/bcmath big integer representation into
-     * binary string.
-     *
-     * @param mixed $bn big number
-     * @return string
-     * @throws Zend_OpenId_Exception
-     */
-    static protected function bigNumToBin($bn)
-    {
-        if (extension_loaded('gmp')) {
-            $s = gmp_strval($bn, 16);
-            if (strlen($s) % 2 != 0) {
-                $s = '0' . $s;
-            } else if ($s[0] > '7') {
-                $s = '00' . $s;
-            }
-            return pack("H*", $s);
-        } else if (extension_loaded('bcmath')) {
-            $cmp = bccomp($bn, 0);
-            if ($cmp == 0) {
-                return (chr(0));
-            } else if ($cmp < 0) {
-                require_once "Zend/OpenId/Exception.php";
-                throw new Zend_OpenId_Exception(
-                    'Big integer arithmetic error',
-                    Zend_OpenId_Exception::ERROR_LONG_MATH);
-            }
-            $bin = "";
-            while (bccomp($bn, 0) > 0) {
-                $bin = chr(bcmod($bn, 256)) . $bin;
-                $bn = bcdiv($bn, 256);
-            }
-            if (ord($bin[0]) > 127) {
-                $bin = chr(0) . $bin;
-            }
-            return $bin;
-        }
-        require_once "Zend/OpenId/Exception.php";
-        throw new Zend_OpenId_Exception(
-            'The system doesn\'t have proper big integer extension',
-            Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH);
-    }
-
-    /**
-     * Performs the first step of a Diffie-Hellman key exchange by generating
-     * private and public DH values based on given prime number $p and
-     * generator $g. Both sides of key exchange MUST have the same prime number
-     * and generator. In this case they will able to create a random shared
-     * secret that is never send from one to the other.
-     *
-     * @param string $p prime number in binary representation
-     * @param string $g generator in binary representation
-     * @param string $priv_key private key in binary representation
-     * @return mixed
-     */
-    static public function createDhKey($p, $g, $priv_key = null)
-    {
-        if (function_exists('openssl_dh_compute_key')) {
-            $dh_details = array(
-                    'p' => $p,
-                    'g' => $g
-                );
-            if ($priv_key !== null) {
-                $dh_details['priv_key'] = $priv_key;
-            }
-            return openssl_pkey_new(array('dh'=>$dh_details));
-        } else {
-            $bn_p        = self::binToBigNum($p);
-            $bn_g        = self::binToBigNum($g);
-            if ($priv_key === null) {
-                $priv_key    = self::randomBytes(Zend_OpenId::strlen($p));
-            }
-            $bn_priv_key = self::binToBigNum($priv_key);
-            if (extension_loaded('gmp')) {
-                $bn_pub_key  = gmp_powm($bn_g, $bn_priv_key, $bn_p);
-            } else if (extension_loaded('bcmath')) {
-                $bn_pub_key  = bcpowmod($bn_g, $bn_priv_key, $bn_p);
-            }
-            $pub_key     = self::bigNumToBin($bn_pub_key);
-
-            return array(
-                'p'        => $bn_p,
-                'g'        => $bn_g,
-                'priv_key' => $bn_priv_key,
-                'pub_key'  => $bn_pub_key,
-                'details'  => array(
-                    'p'        => $p,
-                    'g'        => $g,
-                    'priv_key' => $priv_key,
-                    'pub_key'  => $pub_key));
-        }
-    }
-
-    /**
-     * Returns an associative array with Diffie-Hellman key components in
-     * binary representation. The array includes original prime number 'p' and
-     * generator 'g', random private key 'priv_key' and corresponding public
-     * key 'pub_key'.
-     *
-     * @param mixed $dh Diffie-Hellman key
-     * @return array
-     */
-    static public function getDhKeyDetails($dh)
-    {
-        if (function_exists('openssl_dh_compute_key')) {
-            $details = openssl_pkey_get_details($dh);
-            if (isset($details['dh'])) {
-                return $details['dh'];
-            }
-        } else {
-            return $dh['details'];
-        }
-    }
-
-    /**
-     * Computes the shared secret from the private DH value $dh and the other
-     * party's public value in $pub_key
-     *
-     * @param string $pub_key other party's public value
-     * @param mixed $dh Diffie-Hellman key
-     * @return string
-     * @throws Zend_OpenId_Exception
-     */
-    static public function computeDhSecret($pub_key, $dh)
-    {
-        if (function_exists('openssl_dh_compute_key')) {
-            $ret = openssl_dh_compute_key($pub_key, $dh);
-            if (ord($ret[0]) > 127) {
-                $ret = chr(0) . $ret;
-            }
-            return $ret;
-        } else if (extension_loaded('gmp')) {
-            $bn_pub_key = self::binToBigNum($pub_key);
-            $bn_secret  = gmp_powm($bn_pub_key, $dh['priv_key'], $dh['p']);
-            return self::bigNumToBin($bn_secret);
-        } else if (extension_loaded('bcmath')) {
-            $bn_pub_key = self::binToBigNum($pub_key);
-            $bn_secret  = bcpowmod($bn_pub_key, $dh['priv_key'], $dh['p']);
-            return self::bigNumToBin($bn_secret);
-        }
-        require_once "Zend/OpenId/Exception.php";
-        throw new Zend_OpenId_Exception(
-            'The system doesn\'t have proper big integer extension',
-            Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH);
-    }
-
-    /**
-     * Takes an arbitrary precision integer and returns its shortest big-endian
-     * two's complement representation.
-     *
-     * Arbitrary precision integers MUST be encoded as big-endian signed two's
-     * complement binary strings. Henceforth, "btwoc" is a function that takes
-     * an arbitrary precision integer and returns its shortest big-endian two's
-     * complement representation. All integers that are used with
-     * Diffie-Hellman Key Exchange are positive. This means that the left-most
-     * bit of the two's complement representation MUST be zero. If it is not,
-     * implementations MUST add a zero byte at the front of the string.
-     *
-     * @param string $str binary representation of arbitrary precision integer
-     * @return string big-endian signed representation
-     */
-    static public function btwoc($str)
-    {
-        if (ord($str[0]) > 127) {
-            return chr(0) . $str;
-        }
-        return $str;
-    }
-
-    /**
-     * Returns lenght of binary string in bytes
-     *
-     * @param string $str
-     * @return int the string lenght
-     */
-    static public function strlen($str)
-    {
-        if (extension_loaded('mbstring') &&
-            (((int)ini_get('mbstring.func_overload')) & 2)) {
-            return mb_strlen($str, 'latin1');
-        } else {
-            return strlen($str);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Consumer.php b/airtime_mvc/library/Zend/OpenId/Consumer.php
deleted file mode 100644
index f6daf5d16..000000000
--- a/airtime_mvc/library/Zend/OpenId/Consumer.php
+++ /dev/null
@@ -1,958 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Consumer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId
- */
-require_once "Zend/OpenId.php";
-
-/**
- * @see Zend_OpenId_Extension
- */
-require_once "Zend/OpenId/Extension.php";
-
-/**
- * @see Zend_OpenId_Consumer_Storage
- */
-require_once "Zend/OpenId/Consumer/Storage.php";
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * OpenID consumer implementation
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Consumer
-{
-
-    /**
-     * Reference to an implementation of storage object
-     *
-     * @var Zend_OpenId_Consumer_Storage $_storage
-     */
-    protected $_storage = null;
-
-    /**
-     * Enables or disables consumer to use association with server based on
-     * Diffie-Hellman key agreement
-     *
-     * @var Zend_OpenId_Consumer_Storage $_dumbMode
-     */
-    protected $_dumbMode = false;
-
-    /**
-     * Internal cache to prevent unnecessary access to storage
-     *
-     * @var array $_cache
-     */
-    protected $_cache = array();
-
-    /**
-     * HTTP client to make HTTP requests
-     *
-     * @var Zend_Http_Client $_httpClient
-     */
-    private $_httpClient = null;
-
-    /**
-     * HTTP session to store climed_id between requests
-     *
-     * @var Zend_Session_Namespace $_session
-     */
-    private $_session = null;
-
-    /**
-     * Last error message for logi, check or verify failure
-     *
-     * @var string $_error
-     */
-    private $_error = '';
-
-    /**
-     * Constructs a Zend_OpenId_Consumer object with given $storage.
-     * Enables or disables future association with server based on
-     * Diffie-Hellman key agreement.
-     *
-     * @param Zend_OpenId_Consumer_Storage $storage implementation of custom
-     *  storage object
-     * @param bool $dumbMode Enables or disables consumer to use association
-     *  with server based on Diffie-Hellman key agreement
-     */
-    public function __construct(Zend_OpenId_Consumer_Storage $storage = null,
-                                $dumbMode = false)
-    {
-        if ($storage === null) {
-            require_once "Zend/OpenId/Consumer/Storage/File.php";
-            $this->_storage = new Zend_OpenId_Consumer_Storage_File();
-        } else {
-            $this->_storage = $storage;
-        }
-        $this->_dumbMode = $dumbMode;
-    }
-
-    /**
-     * Performs check (with possible user interaction) of OpenID identity.
-     *
-     * This is the first step of OpenID authentication process.
-     * On success the function does not return (it does HTTP redirection to
-     * server and exits). On failure it returns false.
-     *
-     * @param string $id OpenID identity
-     * @param string $returnTo URL to redirect response from server to
-     * @param string $root HTTP URL to identify consumer on server
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *  object to perform HTTP or HTML form redirection
-     * @return bool
-     */
-    public function login($id, $returnTo = null, $root = null, $extensions = null,
-                          Zend_Controller_Response_Abstract $response = null)
-    {
-        return $this->_checkId(
-            false,
-            $id,
-            $returnTo,
-            $root,
-            $extensions,
-            $response);
-    }
-
-    /**
-     * Performs immediate check (without user interaction) of OpenID identity.
-     *
-     * This is the first step of OpenID authentication process.
-     * On success the function does not return (it does HTTP redirection to
-     * server and exits). On failure it returns false.
-     *
-     * @param string $id OpenID identity
-     * @param string $returnTo HTTP URL to redirect response from server to
-     * @param string $root HTTP URL to identify consumer on server
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *  object to perform HTTP or HTML form redirection
-     * @return bool
-     */
-    public function check($id, $returnTo=null, $root=null, $extensions = null,
-                          Zend_Controller_Response_Abstract $response = null)
-
-    {
-        return $this->_checkId(
-            true,
-            $id,
-            $returnTo,
-            $root,
-            $extensions,
-            $response);
-    }
-
-    /**
-     * Verifies authentication response from OpenID server.
-     *
-     * This is the second step of OpenID authentication process.
-     * The function returns true on successful authentication and false on
-     * failure.
-     *
-     * @param array $params HTTP query data from OpenID server
-     * @param string &$identity this argument is set to end-user's claimed
-     *  identifier or OpenID provider local identifier.
-     * @param mixed $extensions extension object or array of extensions objects
-     * @return bool
-     */
-    public function verify($params, &$identity = "", $extensions = null)
-    {
-        $this->_setError('');
-
-        $version = 1.1;
-        if (isset($params['openid_ns']) &&
-            $params['openid_ns'] == Zend_OpenId::NS_2_0) {
-            $version = 2.0;
-        }
-
-        if (isset($params["openid_claimed_id"])) {
-            $identity = $params["openid_claimed_id"];
-        } else if (isset($params["openid_identity"])){
-            $identity = $params["openid_identity"];
-        } else {
-            $identity = "";
-        }
-
-        if ($version < 2.0 && !isset($params["openid_claimed_id"])) {
-            if ($this->_session !== null) {
-                if ($this->_session->identity === $identity) {
-                    $identity = $this->_session->claimed_id;
-                }
-            } else if (defined('SID')) {
-                if (isset($_SESSION["zend_openid"]["identity"]) &&
-                    isset($_SESSION["zend_openid"]["claimed_id"]) &&
-                    $_SESSION["zend_openid"]["identity"] === $identity) {
-                    $identity = $_SESSION["zend_openid"]["claimed_id"];
-                }
-            } else {
-                require_once "Zend/Session/Namespace.php";
-                $this->_session = new Zend_Session_Namespace("zend_openid");
-                if ($this->_session->identity === $identity) {
-                    $identity = $this->_session->claimed_id;
-                }
-            }
-        }
-
-        if (empty($params['openid_mode'])) {
-            $this->_setError("Missing openid.mode");
-            return false;
-        }
-        if (empty($params['openid_return_to'])) {
-            $this->_setError("Missing openid.return_to");
-            return false;
-        }
-        if (empty($params['openid_signed'])) {
-            $this->_setError("Missing openid.signed");
-            return false;
-        }
-        if (empty($params['openid_sig'])) {
-            $this->_setError("Missing openid.sig");
-            return false;
-        }
-        if ($params['openid_mode'] != 'id_res') {
-            $this->_setError("Wrong openid.mode '".$params['openid_mode']."' != 'id_res'");
-            return false;
-        }
-        if (empty($params['openid_assoc_handle'])) {
-            $this->_setError("Missing openid.assoc_handle");
-            return false;
-        }
-        if ($params['openid_return_to'] != Zend_OpenId::selfUrl()) {
-            /* Ignore query part in openid.return_to */
-            $pos = strpos($params['openid_return_to'], '?');
-            if ($pos === false ||
-                SUBSTR($params['openid_return_to'], 0 , $pos) != Zend_OpenId::selfUrl()) {
-
-                $this->_setError("Wrong openid.return_to '".
-                    $params['openid_return_to']."' != '" . Zend_OpenId::selfUrl() ."'");
-                return false;
-            }
-        }
-
-        if ($version >= 2.0) {
-            if (empty($params['openid_response_nonce'])) {
-                $this->_setError("Missing openid.response_nonce");
-                return false;
-            }
-            if (empty($params['openid_op_endpoint'])) {
-                $this->_setError("Missing openid.op_endpoint");
-                return false;
-            /* OpenID 2.0 (11.3) Checking the Nonce */
-            } else if (!$this->_storage->isUniqueNonce($params['openid_op_endpoint'], $params['openid_response_nonce'])) {
-                $this->_setError("Duplicate openid.response_nonce");
-                return false;
-            }
-        }
-
-
-        if (!empty($params['openid_invalidate_handle'])) {
-            if ($this->_storage->getAssociationByHandle(
-                $params['openid_invalidate_handle'],
-                $url,
-                $macFunc,
-                $secret,
-                $expires)) {
-                $this->_storage->delAssociation($url);
-            }
-        }
-
-        if ($this->_storage->getAssociationByHandle(
-                $params['openid_assoc_handle'],
-                $url,
-                $macFunc,
-                $secret,
-                $expires)) {
-            $signed = explode(',', $params['openid_signed']);
-            $data = '';
-            foreach ($signed as $key) {
-                $data .= $key . ':' . $params['openid_' . strtr($key,'.','_')] . "\n";
-            }
-            if (base64_decode($params['openid_sig']) ==
-                Zend_OpenId::hashHmac($macFunc, $data, $secret)) {
-                if (!Zend_OpenId_Extension::forAll($extensions, 'parseResponse', $params)) {
-                    $this->_setError("Extension::parseResponse failure");
-                    return false;
-                }
-                /* OpenID 2.0 (11.2) Verifying Discovered Information */
-                if (isset($params['openid_claimed_id'])) {
-                    $id = $params['openid_claimed_id'];
-                    if (!Zend_OpenId::normalize($id)) {
-                        $this->_setError("Normalization failed");
-                        return false;
-                    } else if (!$this->_discovery($id, $discovered_server, $discovered_version)) {
-                        $this->_setError("Discovery failed: " . $this->getError());
-                        return false;
-                    } else if ((!empty($params['openid_identity']) &&
-                                $params["openid_identity"] != $id) ||
-                               (!empty($params['openid_op_endpoint']) &&
-                                $params['openid_op_endpoint'] != $discovered_server) ||
-                               $discovered_version != $version) {
-                        $this->_setError("Discovery information verification failed");
-                        return false;
-                    }
-                }
-                return true;
-            }
-            $this->_storage->delAssociation($url);
-            $this->_setError("Signature check failed");
-            return false;
-        }
-        else
-        {
-            /* Use dumb mode */
-            if (isset($params['openid_claimed_id'])) {
-                $id = $params['openid_claimed_id'];
-            } else if (isset($params['openid_identity'])) {
-                $id = $params['openid_identity'];
-            } else {
-                $this->_setError("Missing openid.claimed_id and openid.identity");
-                return false;
-            }
-
-            if (!Zend_OpenId::normalize($id)) {
-                $this->_setError("Normalization failed");
-                return false;
-            } else if (!$this->_discovery($id, $server, $discovered_version)) {
-                $this->_setError("Discovery failed: " . $this->getError());
-                return false;
-            }
-
-            /* OpenID 2.0 (11.2) Verifying Discovered Information */
-            if ((isset($params['openid_identity']) &&
-                 $params["openid_identity"] != $id) ||
-                (isset($params['openid_op_endpoint']) &&
-                 $params['openid_op_endpoint'] != $server) ||
-                $discovered_version != $version) {
-                $this->_setError("Discovery information verification failed");
-                return false;
-            }
-
-            $params2 = array();
-            foreach ($params as $key => $val) {
-                if (strpos($key, 'openid_ns_') === 0) {
-                    $key = 'openid.ns.' . substr($key, strlen('openid_ns_'));
-                } else if (strpos($key, 'openid_sreg_') === 0) {
-                    $key = 'openid.sreg.' . substr($key, strlen('openid_sreg_'));
-                } else if (strpos($key, 'openid_') === 0) {
-                    $key = 'openid.' . substr($key, strlen('openid_'));
-                }
-                $params2[$key] = $val;
-            }
-            $params2['openid.mode'] = 'check_authentication';
-            $ret = $this->_httpRequest($server, 'POST', $params2, $status);
-            if ($status != 200) {
-                $this->_setError("'Dumb' signature verification HTTP request failed");
-                return false;
-            }
-            $r = array();
-            if (is_string($ret)) {
-                foreach(explode("\n", $ret) as $line) {
-                    $line = trim($line);
-                    if (!empty($line)) {
-                        $x = explode(':', $line, 2);
-                        if (is_array($x) && count($x) == 2) {
-                            list($key, $value) = $x;
-                            $r[trim($key)] = trim($value);
-                        }
-                    }
-                }
-            }
-            $ret = $r;
-            if (!empty($ret['invalidate_handle'])) {
-                if ($this->_storage->getAssociationByHandle(
-                    $ret['invalidate_handle'],
-                    $url,
-                    $macFunc,
-                    $secret,
-                    $expires)) {
-                    $this->_storage->delAssociation($url);
-                }
-            }
-            if (isset($ret['is_valid']) && $ret['is_valid'] == 'true') {
-                if (!Zend_OpenId_Extension::forAll($extensions, 'parseResponse', $params)) {
-                    $this->_setError("Extension::parseResponse failure");
-                    return false;
-                }
-                return true;
-            }
-            $this->_setError("'Dumb' signature verification failed");
-            return false;
-        }
-    }
-
-    /**
-     * Store assiciation in internal chace and external storage
-     *
-     * @param string $url OpenID server url
-     * @param string $handle association handle
-     * @param string $macFunc HMAC function (sha1 or sha256)
-     * @param string $secret shared secret
-     * @param integer $expires expiration UNIX time
-     * @return void
-     */
-    protected function _addAssociation($url, $handle, $macFunc, $secret, $expires)
-    {
-        $this->_cache[$url] = array($handle, $macFunc, $secret, $expires);
-        return $this->_storage->addAssociation(
-            $url,
-            $handle,
-            $macFunc,
-            $secret,
-            $expires);
-    }
-
-    /**
-     * Retrive assiciation information for given $url from internal cahce or
-     * external storage
-     *
-     * @param string $url OpenID server url
-     * @param string &$handle association handle
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param integer &$expires expiration UNIX time
-     * @return void
-     */
-    protected function _getAssociation($url, &$handle, &$macFunc, &$secret, &$expires)
-    {
-        if (isset($this->_cache[$url])) {
-            $handle   = $this->_cache[$url][0];
-            $macFunc = $this->_cache[$url][1];
-            $secret   = $this->_cache[$url][2];
-            $expires  = $this->_cache[$url][3];
-            return true;
-        }
-        if ($this->_storage->getAssociation(
-                $url,
-                $handle,
-                $macFunc,
-                $secret,
-                $expires)) {
-            $this->_cache[$url] = array($handle, $macFunc, $secret, $expires);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Performs HTTP request to given $url using given HTTP $method.
-     * Send additinal query specified by variable/value array,
-     * On success returns HTTP response without headers, false on failure.
-     *
-     * @param string $url OpenID server url
-     * @param string $method HTTP request method 'GET' or 'POST'
-     * @param array $params additional qwery parameters to be passed with
-     * @param int &$staus HTTP status code
-     *  request
-     * @return mixed
-     */
-    protected function _httpRequest($url, $method = 'GET', array $params = array(), &$status = null)
-    {
-        $client = $this->_httpClient;
-        if ($client === null) {
-            $client = new Zend_Http_Client(
-                    $url,
-                    array(
-                        'maxredirects' => 4,
-                        'timeout'      => 15,
-                        'useragent'    => 'Zend_OpenId'
-                    )
-                );
-        } else {
-            $client->setUri($url);
-        }
-
-        $client->resetParameters();
-        if ($method == 'POST') {
-            $client->setMethod(Zend_Http_Client::POST);
-            $client->setParameterPost($params);
-        } else {
-            $client->setMethod(Zend_Http_Client::GET);
-            $client->setParameterGet($params);
-        }
-
-        try {
-            $response = $client->request();
-        } catch (Exception $e) {
-            $this->_setError('HTTP Request failed: ' . $e->getMessage());
-            return false;
-        }
-        $status = $response->getStatus();
-        $body = $response->getBody();
-        if ($status == 200 || ($status == 400 && !empty($body))) {
-            return $body;
-        }else{
-            $this->_setError('Bad HTTP response');
-            return false;
-        }
-    }
-
-    /**
-     * Create (or reuse existing) association between OpenID consumer and
-     * OpenID server based on Diffie-Hellman key agreement. Returns true
-     * on success and false on failure.
-     *
-     * @param string $url OpenID server url
-     * @param float $version OpenID protocol version
-     * @param string $priv_key for testing only
-     * @return bool
-     */
-    protected function _associate($url, $version, $priv_key=null)
-    {
-
-        /* Check if we already have association in chace or storage */
-        if ($this->_getAssociation(
-                $url,
-                $handle,
-                $macFunc,
-                $secret,
-                $expires)) {
-            return true;
-        }
-
-        if ($this->_dumbMode) {
-            /* Use dumb mode */
-            return true;
-        }
-
-        $params = array();
-
-        if ($version >= 2.0) {
-            $params = array(
-                'openid.ns'           => Zend_OpenId::NS_2_0,
-                'openid.mode'         => 'associate',
-                'openid.assoc_type'   => 'HMAC-SHA256',
-                'openid.session_type' => 'DH-SHA256',
-            );
-        } else {
-            $params = array(
-                'openid.mode'         => 'associate',
-                'openid.assoc_type'   => 'HMAC-SHA1',
-                'openid.session_type' => 'DH-SHA1',
-            );
-        }
-
-        $dh = Zend_OpenId::createDhKey(pack('H*', Zend_OpenId::DH_P),
-                                       pack('H*', Zend_OpenId::DH_G),
-                                       $priv_key);
-        $dh_details = Zend_OpenId::getDhKeyDetails($dh);
-
-        $params['openid.dh_modulus']         = base64_encode(
-            Zend_OpenId::btwoc($dh_details['p']));
-        $params['openid.dh_gen']             = base64_encode(
-            Zend_OpenId::btwoc($dh_details['g']));
-        $params['openid.dh_consumer_public'] = base64_encode(
-            Zend_OpenId::btwoc($dh_details['pub_key']));
-
-        while(1) {
-            $ret = $this->_httpRequest($url, 'POST', $params, $status);
-            if ($ret === false) {
-                $this->_setError("HTTP request failed");
-                return false;
-            }
-
-            $r = array();
-            $bad_response = false;
-            foreach(explode("\n", $ret) as $line) {
-                $line = trim($line);
-                if (!empty($line)) {
-                    $x = explode(':', $line, 2);
-                    if (is_array($x) && count($x) == 2) {
-                        list($key, $value) = $x;
-                        $r[trim($key)] = trim($value);
-                    } else {
-                        $bad_response = true;
-                    }
-                }
-            }
-            if ($bad_response && strpos($ret, 'Unknown session type') !== false) {
-                $r['error_code'] = 'unsupported-type';
-            }
-            $ret = $r;
-
-            if (isset($ret['error_code']) &&
-                $ret['error_code'] == 'unsupported-type') {
-                if ($params['openid.session_type'] == 'DH-SHA256') {
-                    $params['openid.session_type'] = 'DH-SHA1';
-                    $params['openid.assoc_type'] = 'HMAC-SHA1';
-                } else if ($params['openid.session_type'] == 'DH-SHA1') {
-                    $params['openid.session_type'] = 'no-encryption';
-                } else {
-                    $this->_setError("The OpenID service responded with: " . $ret['error_code']);
-                    return false;
-                }
-            } else {
-                break;
-            }
-        }
-
-        if ($status != 200) {
-            $this->_setError("The server responded with status code: " . $status);
-            return false;
-        }
-
-        if ($version >= 2.0 &&
-            isset($ret['ns']) &&
-            $ret['ns'] != Zend_OpenId::NS_2_0) {
-            $this->_setError("Wrong namespace definition in the server response");
-            return false;
-        }
-
-        if (!isset($ret['assoc_handle']) ||
-            !isset($ret['expires_in']) ||
-            !isset($ret['assoc_type']) ||
-            $params['openid.assoc_type'] != $ret['assoc_type']) {
-            if ($params['openid.assoc_type'] != $ret['assoc_type']) {
-                $this->_setError("The returned assoc_type differed from the supplied openid.assoc_type");
-            } else {
-                $this->_setError("Missing required data from provider (assoc_handle, expires_in, assoc_type are required)");
-            }
-            return false;
-        }
-
-        $handle     = $ret['assoc_handle'];
-        $expiresIn = $ret['expires_in'];
-
-        if ($ret['assoc_type'] == 'HMAC-SHA1') {
-            $macFunc = 'sha1';
-        } else if ($ret['assoc_type'] == 'HMAC-SHA256' &&
-            $version >= 2.0) {
-            $macFunc = 'sha256';
-        } else {
-            $this->_setError("Unsupported assoc_type");
-            return false;
-        }
-
-        if ((empty($ret['session_type']) ||
-             ($version >= 2.0 && $ret['session_type'] == 'no-encryption')) &&
-             isset($ret['mac_key'])) {
-            $secret = base64_decode($ret['mac_key']);
-        } else if (isset($ret['session_type']) &&
-            $ret['session_type'] == 'DH-SHA1' &&
-            !empty($ret['dh_server_public']) &&
-            !empty($ret['enc_mac_key'])) {
-            $dhFunc = 'sha1';
-        } else if (isset($ret['session_type']) &&
-            $ret['session_type'] == 'DH-SHA256' &&
-            $version >= 2.0 &&
-            !empty($ret['dh_server_public']) &&
-            !empty($ret['enc_mac_key'])) {
-            $dhFunc = 'sha256';
-        } else {
-            $this->_setError("Unsupported session_type");
-            return false;
-        }
-        if (isset($dhFunc)) {
-            $serverPub = base64_decode($ret['dh_server_public']);
-            $dhSec = Zend_OpenId::computeDhSecret($serverPub, $dh);
-            if ($dhSec === false) {
-                $this->_setError("DH secret comutation failed");
-                return false;
-            }
-            $sec = Zend_OpenId::digest($dhFunc, $dhSec);
-            if ($sec === false) {
-                $this->_setError("Could not create digest");
-                return false;
-            }
-            $secret = $sec ^ base64_decode($ret['enc_mac_key']);
-        }
-        if ($macFunc == 'sha1') {
-            if (Zend_OpenId::strlen($secret) != 20) {
-                $this->_setError("The length of the sha1 secret must be 20");
-                return false;
-            }
-        } else if ($macFunc == 'sha256') {
-            if (Zend_OpenId::strlen($secret) != 32) {
-                $this->_setError("The length of the sha256 secret must be 32");
-                return false;
-            }
-        }
-        $this->_addAssociation(
-            $url,
-            $handle,
-            $macFunc,
-            $secret,
-            time() + $expiresIn);
-        return true;
-    }
-
-    /**
-     * Performs discovery of identity and finds OpenID URL, OpenID server URL
-     * and OpenID protocol version. Returns true on succees and false on
-     * failure.
-     *
-     * @param string &$id OpenID identity URL
-     * @param string &$server OpenID server URL
-     * @param float &$version OpenID protocol version
-     * @return bool
-     * @todo OpenID 2.0 (7.3) XRI and Yadis discovery
-     */
-    protected function _discovery(&$id, &$server, &$version)
-    {
-        $realId = $id;
-        if ($this->_storage->getDiscoveryInfo(
-                $id,
-                $realId,
-                $server,
-                $version,
-                $expire)) {
-            $id = $realId;
-            return true;
-        }
-
-        /* TODO: OpenID 2.0 (7.3) XRI and Yadis discovery */
-
-        /* HTML-based discovery */
-        $response = $this->_httpRequest($id, 'GET', array(), $status);
-        if ($status != 200 || !is_string($response)) {
-            return false;
-        }
-        if (preg_match(
-                '/<link[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid2.provider[ \t]*[^"\']*\\1[^>]*href=(["\'])([^"\']+)\\2[^>]*\/?>/i',
-                $response,
-                $r)) {
-            $version = 2.0;
-            $server = $r[3];
-        } else if (preg_match(
-                '/<link[^>]*href=(["\'])([^"\']+)\\1[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid2.provider[ \t]*[^"\']*\\3[^>]*\/?>/i',
-                $response,
-                $r)) {
-            $version = 2.0;
-            $server = $r[2];
-        } else if (preg_match(
-                '/<link[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid.server[ \t]*[^"\']*\\1[^>]*href=(["\'])([^"\']+)\\2[^>]*\/?>/i',
-                $response,
-                $r)) {
-            $version = 1.1;
-            $server = $r[3];
-        } else if (preg_match(
-                '/<link[^>]*href=(["\'])([^"\']+)\\1[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid.server[ \t]*[^"\']*\\3[^>]*\/?>/i',
-                $response,
-                $r)) {
-            $version = 1.1;
-            $server = $r[2];
-        } else {
-            return false;
-        }
-        if ($version >= 2.0) {
-            if (preg_match(
-                    '/<link[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid2.local_id[ \t]*[^"\']*\\1[^>]*href=(["\'])([^"\']+)\\2[^>]*\/?>/i',
-                    $response,
-                    $r)) {
-                $realId = $r[3];
-            } else if (preg_match(
-                    '/<link[^>]*href=(["\'])([^"\']+)\\1[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid2.local_id[ \t]*[^"\']*\\3[^>]*\/?>/i',
-                    $response,
-                    $r)) {
-                $realId = $r[2];
-            }
-        } else {
-            if (preg_match(
-                    '/<link[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid.delegate[ \t]*[^"\']*\\1[^>]*href=(["\'])([^"\']+)\\2[^>]*\/?>/i',
-                    $response,
-                    $r)) {
-                $realId = $r[3];
-            } else if (preg_match(
-                    '/<link[^>]*href=(["\'])([^"\']+)\\1[^>]*rel=(["\'])[ \t]*(?:[^ \t"\']+[ \t]+)*?openid.delegate[ \t]*[^"\']*\\3[^>]*\/?>/i',
-                    $response,
-                    $r)) {
-                $realId = $r[2];
-            }
-        }
-
-        $expire = time() + 60 * 60;
-        $this->_storage->addDiscoveryInfo($id, $realId, $server, $version, $expire);
-        $id = $realId;
-        return true;
-    }
-
-    /**
-     * Performs check of OpenID identity.
-     *
-     * This is the first step of OpenID authentication process.
-     * On success the function does not return (it does HTTP redirection to
-     * server and exits). On failure it returns false.
-     *
-     * @param bool $immediate enables or disables interaction with user
-     * @param string $id OpenID identity
-     * @param string $returnTo HTTP URL to redirect response from server to
-     * @param string $root HTTP URL to identify consumer on server
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *  object to perform HTTP or HTML form redirection
-     * @return bool
-     */
-    protected function _checkId($immediate, $id, $returnTo=null, $root=null,
-        $extensions=null, Zend_Controller_Response_Abstract $response = null)
-    {
-        $this->_setError('');
-
-        if (!Zend_OpenId::normalize($id)) {
-            $this->_setError("Normalisation failed");
-            return false;
-        }
-        $claimedId = $id;
-
-        if (!$this->_discovery($id, $server, $version)) {
-            $this->_setError("Discovery failed: " . $this->getError());
-            return false;
-        }
-        if (!$this->_associate($server, $version)) {
-            $this->_setError("Association failed: " . $this->getError());
-            return false;
-        }
-        if (!$this->_getAssociation(
-                $server,
-                $handle,
-                $macFunc,
-                $secret,
-                $expires)) {
-            /* Use dumb mode */
-            unset($handle);
-            unset($macFunc);
-            unset($secret);
-            unset($expires);
-        }
-
-        $params = array();
-        if ($version >= 2.0) {
-            $params['openid.ns'] = Zend_OpenId::NS_2_0;
-        }
-
-        $params['openid.mode'] = $immediate ?
-            'checkid_immediate' : 'checkid_setup';
-
-        $params['openid.identity'] = $id;
-
-        $params['openid.claimed_id'] = $claimedId;
-
-        if ($version <= 2.0) {
-            if ($this->_session !== null) {
-                $this->_session->identity = $id;
-                $this->_session->claimed_id = $claimedId;
-            } else if (defined('SID')) {
-                $_SESSION["zend_openid"] = array(
-                    "identity" => $id,
-                    "claimed_id" => $claimedId);
-            } else {
-                require_once "Zend/Session/Namespace.php";
-                $this->_session = new Zend_Session_Namespace("zend_openid");
-                $this->_session->identity = $id;
-                $this->_session->claimed_id = $claimedId;
-            }
-        }
-
-        if (isset($handle)) {
-            $params['openid.assoc_handle'] = $handle;
-        }
-
-        $params['openid.return_to'] = Zend_OpenId::absoluteUrl($returnTo);
-
-        if (empty($root)) {
-            $root = Zend_OpenId::selfUrl();
-            if ($root[strlen($root)-1] != '/') {
-                $root = dirname($root);
-            }
-        }
-        if ($version >= 2.0) {
-            $params['openid.realm'] = $root;
-        } else {
-            $params['openid.trust_root'] = $root;
-        }
-
-        if (!Zend_OpenId_Extension::forAll($extensions, 'prepareRequest', $params)) {
-            $this->_setError("Extension::prepareRequest failure");
-            return false;
-        }
-
-        Zend_OpenId::redirect($server, $params, $response);
-        return true;
-    }
-
-    /**
-     * Sets HTTP client object to make HTTP requests
-     *
-     * @param Zend_Http_Client $client HTTP client object to be used
-     */
-    public function setHttpClient($client) {
-        $this->_httpClient = $client;
-    }
-
-    /**
-     * Returns HTTP client object that will be used to make HTTP requests
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient() {
-        return $this->_httpClient;
-    }
-
-    /**
-     * Sets session object to store climed_id
-     *
-     * @param Zend_Session_Namespace $session HTTP client object to be used
-     */
-    public function setSession(Zend_Session_Namespace $session) {
-        $this->_session = $session;
-    }
-
-    /**
-     * Returns session object that is used to store climed_id
-     *
-     * @return Zend_Session_Namespace
-     */
-    public function getSession() {
-        return $this->_session;
-    }
-
-    /**
-     * Saves error message
-     *
-     * @param string $message error message
-     */
-    protected function _setError($message)
-    {
-        $this->_error = $message;
-    }
-
-    /**
-     * Returns error message that explains failure of login, check or verify
-     *
-     * @return string
-     */
-    public function getError()
-    {
-        return $this->_error;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Consumer/Storage.php b/airtime_mvc/library/Zend/OpenId/Consumer/Storage.php
deleted file mode 100644
index 91b8bb010..000000000
--- a/airtime_mvc/library/Zend/OpenId/Consumer/Storage.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class to implement external storage for OpenID consumer
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_OpenId_Consumer_Storage
-{
-
-    /**
-     * Stores information about association identified by $url/$handle
-     *
-     * @param string $url OpenID server URL
-     * @param string $handle assiciation handle
-     * @param string $macFunc HMAC function (sha1 or sha256)
-     * @param string $secret shared secret
-     * @param long $expires expiration UNIX time
-     * @return void
-     */
-    abstract public function addAssociation($url, $handle, $macFunc, $secret, $expires);
-
-    /**
-     * Gets information about association identified by $url
-     * Returns true if given association found and not expired and false
-     * otherwise
-     *
-     * @param string $url OpenID server URL
-     * @param string &$handle assiciation handle
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    abstract public function getAssociation($url, &$handle, &$macFunc, &$secret, &$expires);
-
-    /**
-     * Gets information about association identified by $handle
-     * Returns true if given association found and not expired and false
-     * othverwise
-     *
-     * @param string $handle assiciation handle
-     * @param string &$url OpenID server URL
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    abstract public function getAssociationByHandle($handle, &$url, &$macFunc, &$secret, &$expires);
-
-    /**
-     * Deletes association identified by $url
-     *
-     * @param string $url OpenID server URL
-     * @return void
-     */
-    abstract public function delAssociation($url);
-
-    /**
-     * Stores information discovered from identity $id
-     *
-     * @param string $id identity
-     * @param string $realId discovered real identity URL
-     * @param string $server discovered OpenID server URL
-     * @param float $version discovered OpenID protocol version
-     * @param long $expires expiration UNIX time
-     * @return void
-     */
-    abstract public function addDiscoveryInfo($id, $realId, $server, $version, $expires);
-
-    /**
-     * Gets information discovered from identity $id
-     * Returns true if such information exists and false otherwise
-     *
-     * @param string $id identity
-     * @param string &$realId discovered real identity URL
-     * @param string &$server discovered OpenID server URL
-     * @param float &$version discovered OpenID protocol version
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    abstract public function getDiscoveryInfo($id, &$realId, &$server, &$version, &$expires);
-
-    /**
-     * Removes cached information discovered from identity $id
-     *
-     * @param string $id identity
-     * @return bool
-     */
-    abstract public function delDiscoveryInfo($id);
-
-    /**
-     * The function checks the uniqueness of openid.response_nonce
-     *
-     * @param string $provider openid.openid_op_endpoint field from authentication response
-     * @param string $nonce openid.response_nonce field from authentication response
-     * @return bool
-     */
-    abstract public function isUniqueNonce($provider, $nonce);
-
-    /**
-     * Removes data from the uniqueness database that is older then given date
-     *
-     * @param string $date Date of expired data
-     */
-    abstract public function purgeNonces($date=null);
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Consumer/Storage/File.php b/airtime_mvc/library/Zend/OpenId/Consumer/Storage/File.php
deleted file mode 100644
index 375a583c8..000000000
--- a/airtime_mvc/library/Zend/OpenId/Consumer/Storage/File.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId_Consumer_Storage
- */
-require_once "Zend/OpenId/Consumer/Storage.php";
-
-/**
- * External storage implemmentation using serialized files
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Consumer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage
-{
-
-    /**
-     * Directory name to store data files in
-     *
-     * @var string $_dir
-     */
-    private $_dir;
-
-    /**
-     * Constructs storage object and creates storage directory
-     *
-     * @param string $dir directory name to store data files in
-     * @throws Zend_OpenId_Exception
-     */
-    public function __construct($dir = null)
-    {
-        if ($dir === null) {
-            $tmp = getenv('TMP');
-            if (empty($tmp)) {
-                $tmp = getenv('TEMP');
-                if (empty($tmp)) {
-                    $tmp = "/tmp";
-                }
-            }
-            $user = get_current_user();
-            if (is_string($user) && !empty($user)) {
-                $tmp .= '/' . $user;
-            }
-            $dir = $tmp . '/openid/consumer';
-        }
-        $this->_dir = $dir;
-        if (!is_dir($this->_dir)) {
-            if (!@mkdir($this->_dir, 0700, 1)) {
-                /**
-                 * @see Zend_OpenId_Exception
-                 */
-                require_once 'Zend/OpenId/Exception.php';
-                throw new Zend_OpenId_Exception(
-                    'Cannot access storage directory ' . $dir,
-                    Zend_OpenId_Exception::ERROR_STORAGE);
-            }
-        }
-        if (($f = fopen($this->_dir.'/assoc.lock', 'w+')) === null) {
-            /**
-             * @see Zend_OpenId_Exception
-             */
-            require_once 'Zend/OpenId/Exception.php';
-            throw new Zend_OpenId_Exception(
-                'Cannot create a lock file in the directory ' . $dir,
-                Zend_OpenId_Exception::ERROR_STORAGE);
-        }
-        fclose($f);
-        if (($f = fopen($this->_dir.'/discovery.lock', 'w+')) === null) {
-            /**
-             * @see Zend_OpenId_Exception
-             */
-            require_once 'Zend/OpenId/Exception.php';
-            throw new Zend_OpenId_Exception(
-                'Cannot create a lock file in the directory ' . $dir,
-                Zend_OpenId_Exception::ERROR_STORAGE);
-        }
-        fclose($f);
-        if (($f = fopen($this->_dir.'/nonce.lock', 'w+')) === null) {
-            /**
-             * @see Zend_OpenId_Exception
-             */
-            require_once 'Zend/OpenId/Exception.php';
-            throw new Zend_OpenId_Exception(
-                'Cannot create a lock file in the directory ' . $dir,
-                Zend_OpenId_Exception::ERROR_STORAGE);
-        }
-        fclose($f);
-    }
-
-    /**
-     * Stores information about association identified by $url/$handle
-     *
-     * @param string $url OpenID server URL
-     * @param string $handle assiciation handle
-     * @param string $macFunc HMAC function (sha1 or sha256)
-     * @param string $secret shared secret
-     * @param long $expires expiration UNIX time
-     * @return bool
-     */
-    public function addAssociation($url, $handle, $macFunc, $secret, $expires)
-    {
-        $name1 = $this->_dir . '/assoc_url_' . md5($url);
-        $name2 = $this->_dir . '/assoc_handle_' . md5($handle);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name1, 'w+');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $data = serialize(array($url, $handle, $macFunc, $secret, $expires));
-            fwrite($f, $data);
-            if (function_exists('symlink')) {
-                @unlink($name2);
-                if (symlink($name1, $name2)) {
-                    fclose($f);
-                    fclose($lock);
-                    return true;
-                }
-            }
-            $f2 = @fopen($name2, 'w+');
-            if ($f2) {
-                fwrite($f2, $data);
-                fclose($f2);
-                @unlink($name1);
-                $ret = true;
-            } else {
-                $ret = false;
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Gets information about association identified by $url
-     * Returns true if given association found and not expired and false
-     * otherwise
-     *
-     * @param string $url OpenID server URL
-     * @param string &$handle assiciation handle
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    public function getAssociation($url, &$handle, &$macFunc, &$secret, &$expires)
-    {
-        $name1 = $this->_dir . '/assoc_url_' . md5($url);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name1, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedUrl, $handle, $macFunc, $secret, $expires) = unserialize($data);
-                if ($url === $storedUrl && $expires > time()) {
-                    $ret = true;
-                } else {
-                    $name2 = $this->_dir . '/assoc_handle_' . md5($handle);
-                    fclose($f);
-                    @unlink($name2);
-                    @unlink($name1);
-                    fclose($lock);
-                    return false;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Gets information about association identified by $handle
-     * Returns true if given association found and not expired and false
-     * otherwise
-     *
-     * @param string $handle assiciation handle
-     * @param string &$url OpenID server URL
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    public function getAssociationByHandle($handle, &$url, &$macFunc, &$secret, &$expires)
-    {
-        $name2 = $this->_dir . '/assoc_handle_' . md5($handle);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name2, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($url, $storedHandle, $macFunc, $secret, $expires) = unserialize($data);
-                if ($handle === $storedHandle && $expires > time()) {
-                    $ret = true;
-                } else {
-                    fclose($f);
-                    @unlink($name2);
-                    $name1 = $this->_dir . '/assoc_url_' . md5($url);
-                    @unlink($name1);
-                    fclose($lock);
-                    return false;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Deletes association identified by $url
-     *
-     * @param string $url OpenID server URL
-     * @return bool
-     */
-    public function delAssociation($url)
-    {
-        $name1 = $this->_dir . '/assoc_url_' . md5($url);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name1, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedUrl, $handle, $macFunc, $secret, $expires) = unserialize($data);
-                if ($url === $storedUrl) {
-                    $name2 = $this->_dir . '/assoc_handle_' . md5($handle);
-                    fclose($f);
-                    @unlink($name2);
-                    @unlink($name1);
-                    fclose($lock);
-                    return true;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Stores information discovered from identity $id
-     *
-     * @param string $id identity
-     * @param string $realId discovered real identity URL
-     * @param string $server discovered OpenID server URL
-     * @param float $version discovered OpenID protocol version
-     * @param long $expires expiration UNIX time
-     * @return bool
-     */
-    public function addDiscoveryInfo($id, $realId, $server, $version, $expires)
-    {
-        $name = $this->_dir . '/discovery_' . md5($id);
-        $lock = @fopen($this->_dir . '/discovery.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'w+');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $data = serialize(array($id, $realId, $server, $version, $expires));
-            fwrite($f, $data);
-            fclose($f);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Gets information discovered from identity $id
-     * Returns true if such information exists and false otherwise
-     *
-     * @param string $id identity
-     * @param string &$realId discovered real identity URL
-     * @param string &$server discovered OpenID server URL
-     * @param float &$version discovered OpenID protocol version
-     * @param long &$expires expiration UNIX time
-     * @return bool
-     */
-    public function getDiscoveryInfo($id, &$realId, &$server, &$version, &$expires)
-    {
-        $name = $this->_dir . '/discovery_' . md5($id);
-        $lock = @fopen($this->_dir . '/discovery.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedId, $realId, $server, $version, $expires) = unserialize($data);
-                if ($id === $storedId && $expires > time()) {
-                    $ret = true;
-                } else {
-                    fclose($f);
-                    @unlink($name);
-                    fclose($lock);
-                    return false;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Removes cached information discovered from identity $id
-     *
-     * @param string $id identity
-     * @return bool
-     */
-    public function delDiscoveryInfo($id)
-    {
-        $name = $this->_dir . '/discovery_' . md5($id);
-        $lock = @fopen($this->_dir . '/discovery.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            @unlink($name);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * The function checks the uniqueness of openid.response_nonce
-     *
-     * @param string $provider openid.openid_op_endpoint field from authentication response
-     * @param  string $nonce openid.response_nonce field from authentication response
-     * @return bool
-     */
-    public function isUniqueNonce($provider, $nonce)
-    {
-        $name = $this->_dir . '/nonce_' . md5($provider.';'.$nonce);
-        $lock = @fopen($this->_dir . '/nonce.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'x');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            fwrite($f, $provider.';'.$nonce);
-            fclose($f);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Removes data from the uniqueness database that is older then given date
-     *
-     * @param mixed $date date of expired data
-     */
-    public function purgeNonces($date=null)
-    {
-        $lock = @fopen($this->_dir . '/nonce.lock', 'w+');
-        if ($lock !== false) {
-            flock($lock, LOCK_EX);
-        }
-        try {
-            if (!is_int($date) && !is_string($date)) {
-                foreach (glob($this->_dir . '/nonce_*') as $name) {
-                    @unlink($name);
-                }
-            } else {
-                if (is_string($date)) {
-                    $time = time($date);
-                } else {
-                    $time = $date;
-                }
-                foreach (glob($this->_dir . '/nonce_*') as $name) {
-                    if (filemtime($name) < $time) {
-                        @unlink($name);
-                    }
-                }
-            }
-            if ($lock !== false) {
-                fclose($lock);
-            }
-        } catch (Exception $e) {
-            if ($lock !== false) {
-                fclose($lock);
-            }
-            throw $e;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Exception.php b/airtime_mvc/library/Zend/OpenId/Exception.php
deleted file mode 100644
index f8205a0e5..000000000
--- a/airtime_mvc/library/Zend/OpenId/Exception.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once "Zend/Exception.php";
-
-/**
- * Exception class for Zend_OpenId
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Exception extends Zend_Exception
-{
-
-    /**
-     * The specified digest algotithm is not supported by this PHP installation
-     */
-    const UNSUPPORTED_DIGEST    = 1;
-
-    /**
-     * The long math arithmetick is not supported by this PHP installation
-     */
-    const UNSUPPORTED_LONG_MATH = 2;
-
-    /**
-     * Internal long math arithmetic error
-     */
-    const ERROR_LONG_MATH       = 3;
-
-    /**
-     * Iternal storage error
-     */
-    const ERROR_STORAGE         = 4;
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Extension.php b/airtime_mvc/library/Zend/OpenId/Extension.php
deleted file mode 100644
index 38420eb28..000000000
--- a/airtime_mvc/library/Zend/OpenId/Extension.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract extension class for Zend_OpenId
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_OpenId_Extension
-{
-
-    /**
-     * Calls given function with given argument for all extensions
-     *
-     * @param mixed $extensions list of extensions or one extension
-     * @param string $func function to be called
-     * @param mixed &$params argument to pass to given funcion
-     * @return bool
-     */
-    static public function forAll($extensions, $func, &$params)
-    {
-        if ($extensions !== null) {
-            if (is_array($extensions)) {
-                foreach ($extensions as $ext) {
-                    if ($ext instanceof Zend_OpenId_Extension) {
-                        if (!$ext->$func($params)) {
-                            return false;
-                        }
-                    } else {
-                        return false;
-                    }
-                }
-            } else if (!is_object($extensions) ||
-                       !($extensions instanceof Zend_OpenId_Extension) ||
-                       !$extensions->$func($params)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Method to add additional data to OpenId 'checkid_immediate' or
-     * 'checkid_setup' request. This method addes nothing but inherited class
-     * may add additional data into request.
-     *
-     * @param array &$params request's var/val pairs
-     * @return bool
-     */
-    public function prepareRequest(&$params)
-    {
-        return true;
-    }
-
-    /**
-     * Method to parse OpenId 'checkid_immediate' or 'checkid_setup' request
-     * and initialize object with passed data. This method parses nothing but
-     * inherited class may override this method to do somthing.
-     *
-     * @param array $params request's var/val pairs
-     * @return bool
-     */
-    public function parseRequest($params)
-    {
-        return true;
-    }
-
-    /**
-     * Method to add additional data to OpenId 'id_res' response. This method
-     * addes nothing but inherited class may add additional data into response.
-     *
-     * @param array &$params response's var/val pairs
-     * @return bool
-     */
-    public function prepareResponse(&$params)
-    {
-        return true;
-    }
-
-    /**
-     * Method to parse OpenId 'id_res' response and initialize object with
-     * passed data. This method parses nothing but inherited class may override
-     * this method to do somthing.
-     *
-     * @param array $params response's var/val pairs
-     * @return bool
-     */
-    public function parseResponse($params)
-    {
-        return true;
-    }
-
-    /**
-     * Method to prepare data to store it in trusted servers database.
-     *
-     * @param array &$data data to be stored in tusted servers database
-     * @return bool
-     */
-    public function getTrustData(&$data)
-    {
-        return true;
-    }
-
-    /**
-     * Method to check if data from trusted servers database is enough to
-     * sutisfy request.
-     *
-     * @param array $data data from tusted servers database
-     * @return bool
-     */
-    public function checkTrustData($data)
-    {
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Extension/Sreg.php b/airtime_mvc/library/Zend/OpenId/Extension/Sreg.php
deleted file mode 100644
index 7ed7ec641..000000000
--- a/airtime_mvc/library/Zend/OpenId/Extension/Sreg.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sreg.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId_Extension
- */
-require_once "Zend/OpenId/Extension.php";
-
-/**
- * 'Simple Refistration Extension' for Zend_OpenId
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Extension_Sreg extends Zend_OpenId_Extension
-{
-    /**
-     * SREG 1.1 namespace. All OpenID SREG 1.1 messages MUST contain variable
-     * openid.ns.sreg with its value.
-     */
-    const NAMESPACE_1_1 = "http://openid.net/extensions/sreg/1.1";
-
-    private $_props;
-    private $_policy_url;
-    private $_version;
-
-    /**
-     * Creates SREG extension object
-     *
-     * @param array $props associative array of SREG variables
-     * @param string $policy_url SREG policy URL
-     * @param float $version SREG version
-     * @return array
-     */
-    public function __construct(array $props=null, $policy_url=null, $version=1.0)
-    {
-        $this->_props = $props;
-        $this->_policy_url = $policy_url;
-        $this->_version = $version;
-    }
-
-    /**
-     * Returns associative array of SREG variables
-     *
-     * @return array
-     */
-    public function getProperties() {
-        if (is_array($this->_props)) {
-            return $this->_props;
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Returns SREG policy URL
-     *
-     * @return string
-     */
-    public function getPolicyUrl() {
-        return $this->_policy_url;
-    }
-
-    /**
-     * Returns SREG protocol version
-     *
-     * @return float
-     */
-    public function getVersion() {
-        return $this->_version;
-    }
-
-    /**
-     * Returns array of allowed SREG variable names.
-     *
-     * @return array
-     */
-    public static function getSregProperties()
-    {
-        return array(
-            "nickname",
-            "email",
-            "fullname",
-            "dob",
-            "gender",
-            "postcode",
-            "country",
-            "language",
-            "timezone"
-        );
-    }
-
-    /**
-     * Adds additional SREG data to OpenId 'checkid_immediate' or
-     * 'checkid_setup' request.
-     *
-     * @param array &$params request's var/val pairs
-     * @return bool
-     */
-    public function prepareRequest(&$params)
-    {
-        if (is_array($this->_props) && count($this->_props) > 0) {
-            foreach ($this->_props as $prop => $req) {
-                if ($req) {
-                    if (isset($required)) {
-                        $required .= ','.$prop;
-                    } else {
-                        $required = $prop;
-                    }
-                } else {
-                    if (isset($optional)) {
-                        $optional .= ','.$prop;
-                    } else {
-                        $optional = $prop;
-                    }
-                }
-            }
-            if ($this->_version >= 1.1) {
-                $params['openid.ns.sreg'] = Zend_OpenId_Extension_Sreg::NAMESPACE_1_1;
-            }
-            if (!empty($required)) {
-                $params['openid.sreg.required'] = $required;
-            }
-            if (!empty($optional)) {
-                $params['openid.sreg.optional'] = $optional;
-            }
-            if (!empty($this->_policy_url)) {
-                $params['openid.sreg.policy_url'] = $this->_policy_url;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Parses OpenId 'checkid_immediate' or 'checkid_setup' request,
-     * extracts SREG variables and sets ovject properties to corresponding
-     * values.
-     *
-     * @param array $params request's var/val pairs
-     * @return bool
-     */
-    public function parseRequest($params)
-    {
-        if (isset($params['openid_ns_sreg']) &&
-            $params['openid_ns_sreg'] === Zend_OpenId_Extension_Sreg::NAMESPACE_1_1) {
-            $this->_version= 1.1;
-        } else {
-            $this->_version= 1.0;
-        }
-        if (!empty($params['openid_sreg_policy_url'])) {
-            $this->_policy_url = $params['openid_sreg_policy_url'];
-        } else {
-            $this->_policy_url = null;
-        }
-        $props = array();
-        if (!empty($params['openid_sreg_optional'])) {
-            foreach (explode(',', $params['openid_sreg_optional']) as $prop) {
-                $prop = trim($prop);
-                $props[$prop] = false;
-            }
-        }
-        if (!empty($params['openid_sreg_required'])) {
-            foreach (explode(',', $params['openid_sreg_required']) as $prop) {
-                $prop = trim($prop);
-                $props[$prop] = true;
-            }
-        }
-        $props2 = array();
-        foreach (self::getSregProperties() as $prop) {
-            if (isset($props[$prop])) {
-                $props2[$prop] = $props[$prop];
-            }
-        }
-
-        $this->_props = (count($props2) > 0) ? $props2 : null;
-        return true;
-    }
-
-    /**
-     * Adds additional SREG data to OpenId 'id_res' response.
-     *
-     * @param array &$params response's var/val pairs
-     * @return bool
-     */
-    public function prepareResponse(&$params)
-    {
-        if (is_array($this->_props) && count($this->_props) > 0) {
-            if ($this->_version >= 1.1) {
-                $params['openid.ns.sreg'] = Zend_OpenId_Extension_Sreg::NAMESPACE_1_1;
-            }
-            foreach (self::getSregProperties() as $prop) {
-                if (!empty($this->_props[$prop])) {
-                    $params['openid.sreg.' . $prop] = $this->_props[$prop];
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Parses OpenId 'id_res' response and sets object's properties according
-     * to 'openid.sreg.*' variables in response
-     *
-     * @param array $params response's var/val pairs
-     * @return bool
-     */
-    public function parseResponse($params)
-    {
-        if (isset($params['openid_ns_sreg']) &&
-            $params['openid_ns_sreg'] === Zend_OpenId_Extension_Sreg::NAMESPACE_1_1) {
-            $this->_version= 1.1;
-        } else {
-            $this->_version= 1.0;
-        }
-        $props = array();
-        foreach (self::getSregProperties() as $prop) {
-            if (!empty($params['openid_sreg_' . $prop])) {
-                $props[$prop] = $params['openid_sreg_' . $prop];
-            }
-        }
-        if (isset($this->_props) && is_array($this->_props)) {
-            foreach (self::getSregProperties() as $prop) {
-                if (isset($this->_props[$prop]) &&
-                    $this->_props[$prop] &&
-                    !isset($props[$prop])) {
-                    return false;
-                }
-            }
-        }
-        $this->_props = (count($props) > 0) ? $props : null;
-        return true;
-    }
-
-    /**
-     * Addes SREG properties that are allowed to be send to consumer to
-     * the given $data argument.
-     *
-     * @param array &$data data to be stored in tusted servers database
-     * @return bool
-     */
-    public function getTrustData(&$data)
-    {
-        $data[get_class()] = $this->getProperties();
-        return true;
-    }
-
-    /**
-     * Check if given $data contains necessury SREG properties to sutisfy
-     * OpenId request. On success sets SREG response properties from given
-     * $data and returns true, on failure returns false.
-     *
-     * @param array $data data from tusted servers database
-     * @return bool
-     */
-    public function checkTrustData($data)
-    {
-        if (is_array($this->_props) && count($this->_props) > 0) {
-            $props = array();
-            $name = get_class();
-            if (isset($data[$name])) {
-                $props = $data[$name];
-            } else {
-                $props = array();
-            }
-            $props2 = array();
-            foreach ($this->_props as $prop => $req) {
-                if (empty($props[$prop])) {
-                    if ($req) {
-                        return false;
-                    }
-                } else {
-                    $props2[$prop] = $props[$prop];
-                }
-            }
-            $this->_props = (count($props2) > 0) ? $props2 : null;
-        }
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Provider.php b/airtime_mvc/library/Zend/OpenId/Provider.php
deleted file mode 100644
index 0d5abc8ae..000000000
--- a/airtime_mvc/library/Zend/OpenId/Provider.php
+++ /dev/null
@@ -1,781 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Provider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId
- */
-require_once "Zend/OpenId.php";
-
-/**
- * @see Zend_OpenId_Extension
- */
-require_once "Zend/OpenId/Extension.php";
-
-/**
- * OpenID provider (server) implementation
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Provider
-{
-
-    /**
-     * Reference to an implementation of storage object
-     *
-     * @var Zend_OpenId_Provider_Storage $_storage
-     */
-    private $_storage;
-
-    /**
-     * Reference to an implementation of user object
-     *
-     * @var Zend_OpenId_Provider_User $_user
-     */
-    private $_user;
-
-    /**
-     * Time to live of association session in secconds
-     *
-     * @var integer $_sessionTtl
-     */
-    private $_sessionTtl;
-
-    /**
-     * URL to peform interactive user login
-     *
-     * @var string $_loginUrl
-     */
-    private $_loginUrl;
-
-    /**
-     * URL to peform interactive validation of consumer by user
-     *
-     * @var string $_trustUrl
-     */
-    private $_trustUrl;
-
-    /**
-     * The OP Endpoint URL
-     *
-     * @var string $_opEndpoint
-     */
-    private $_opEndpoint;
-
-    /**
-     * Constructs a Zend_OpenId_Provider object with given parameters.
-     *
-     * @param string $loginUrl is an URL that provides login screen for
-     *  end-user (by default it is the same URL with additional GET variable
-     *  openid.action=login)
-     * @param string $trustUrl is an URL that shows a question if end-user
-     *  trust to given consumer (by default it is the same URL with additional
-     *  GET variable openid.action=trust)
-     * @param Zend_OpenId_Provider_User $user is an object for communication
-     *  with User-Agent and store information about logged-in user (it is a
-     *  Zend_OpenId_Provider_User_Session object by default)
-     * @param Zend_OpenId_Provider_Storage $storage is an object for keeping
-     *  persistent database (it is a Zend_OpenId_Provider_Storage_File object
-     *  by default)
-     * @param integer $sessionTtl is a default time to live for association
-     *   session in seconds (1 hour by default). Consumer must reestablish
-     *   association after that time.
-     */
-    public function __construct($loginUrl = null,
-                                $trustUrl = null,
-                                Zend_OpenId_Provider_User $user = null,
-                                Zend_OpenId_Provider_Storage $storage = null,
-                                $sessionTtl = 3600)
-    {
-        if ($loginUrl === null) {
-            $loginUrl = Zend_OpenId::selfUrl() . '?openid.action=login';
-        } else {
-            $loginUrl = Zend_OpenId::absoluteUrl($loginUrl);
-        }
-        $this->_loginUrl = $loginUrl;
-        if ($trustUrl === null) {
-            $trustUrl = Zend_OpenId::selfUrl() . '?openid.action=trust';
-        } else {
-            $trustUrl = Zend_OpenId::absoluteUrl($trustUrl);
-        }
-        $this->_trustUrl = $trustUrl;
-        if ($user === null) {
-            require_once "Zend/OpenId/Provider/User/Session.php";
-            $this->_user = new Zend_OpenId_Provider_User_Session();
-        } else {
-            $this->_user = $user;
-        }
-        if ($storage === null) {
-            require_once "Zend/OpenId/Provider/Storage/File.php";
-            $this->_storage = new Zend_OpenId_Provider_Storage_File();
-        } else {
-            $this->_storage = $storage;
-        }
-        $this->_sessionTtl = $sessionTtl;
-    }
-
-    /**
-     * Sets the OP Endpoint URL
-     *
-     * @param string $url the OP Endpoint URL
-     * @return null
-     */
-    public function setOpEndpoint($url)
-    {
-        $this->_opEndpoint = $url;
-    }
-
-    /**
-     * Registers a new user with given $id and $password
-     * Returns true in case of success and false if user with given $id already
-     * exists
-     *
-     * @param string $id user identity URL
-     * @param string $password encoded user password
-     * @return bool
-     */
-    public function register($id, $password)
-    {
-        if (!Zend_OpenId::normalize($id) || empty($id)) {
-            return false;
-        }
-        return $this->_storage->addUser($id, md5($id.$password));
-    }
-
-    /**
-     * Returns true if user with given $id exists and false otherwise
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    public function hasUser($id) {
-        if (!Zend_OpenId::normalize($id)) {
-            return false;
-        }
-        return $this->_storage->hasUser($id);
-    }
-
-    /**
-     * Performs login of user with given $id and $password
-     * Returns true in case of success and false otherwise
-     *
-     * @param string $id user identity URL
-     * @param string $password user password
-     * @return bool
-     */
-    public function login($id, $password)
-    {
-        if (!Zend_OpenId::normalize($id)) {
-            return false;
-        }
-        if (!$this->_storage->checkUser($id, md5($id.$password))) {
-            return false;
-        }
-        $this->_user->setLoggedInUser($id);
-        return true;
-    }
-
-    /**
-     * Performs logout. Clears information about logged in user.
-     *
-     * @return void
-     */
-    public function logout()
-    {
-        $this->_user->delLoggedInUser();
-        return true;
-    }
-
-    /**
-     * Returns identity URL of current logged in user or false
-     *
-     * @return mixed
-     */
-    public function getLoggedInUser() {
-        return $this->_user->getLoggedInUser();
-    }
-
-    /**
-     * Retrieve consumer's root URL from request query.
-     * Returns URL or false in case of failure
-     *
-     * @param array $params query arguments
-     * @return mixed
-     */
-    public function getSiteRoot($params)
-    {
-        $version = 1.1;
-        if (isset($params['openid_ns']) &&
-            $params['openid_ns'] == Zend_OpenId::NS_2_0) {
-            $version = 2.0;
-        }
-        if ($version >= 2.0 && isset($params['openid_realm'])) {
-            $root = $params['openid_realm'];
-        } else if ($version < 2.0 && isset($params['openid_trust_root'])) {
-            $root = $params['openid_trust_root'];
-        } else if (isset($params['openid_return_to'])) {
-            $root = $params['openid_return_to'];
-        } else {
-            return false;
-        }
-        if (Zend_OpenId::normalizeUrl($root) && !empty($root)) {
-            return $root;
-        }
-        return false;
-    }
-
-    /**
-     * Allows consumer with given root URL to authenticate current logged
-     * in user. Returns true on success and false on error.
-     *
-     * @param string $root root URL
-     * @param mixed $extensions extension object or array of extensions objects
-     * @return bool
-     */
-    public function allowSite($root, $extensions=null)
-    {
-        $id = $this->getLoggedInUser();
-        if ($id === false) {
-            return false;
-        }
-        if ($extensions !== null) {
-            $data = array();
-            Zend_OpenId_Extension::forAll($extensions, 'getTrustData', $data);
-        } else {
-            $data = true;
-        }
-        $this->_storage->addSite($id, $root, $data);
-        return true;
-    }
-
-    /**
-     * Prohibit consumer with given root URL to authenticate current logged
-     * in user. Returns true on success and false on error.
-     *
-     * @param string $root root URL
-     * @return bool
-     */
-    public function denySite($root)
-    {
-        $id = $this->getLoggedInUser();
-        if ($id === false) {
-            return false;
-        }
-        $this->_storage->addSite($id, $root, false);
-        return true;
-    }
-
-    /**
-     * Delete consumer with given root URL from known sites of current logged
-     * in user. Next time this consumer will try to authenticate the user,
-     * Provider will ask user's confirmation.
-     * Returns true on success and false on error.
-     *
-     * @param string $root root URL
-     * @return bool
-     */
-    public function delSite($root)
-    {
-        $id = $this->getLoggedInUser();
-        if ($id === false) {
-            return false;
-        }
-        $this->_storage->addSite($id, $root, null);
-        return true;
-    }
-
-    /**
-     * Returns list of known consumers for current logged in user or false
-     * if he is not logged in.
-     *
-     * @return mixed
-     */
-    public function getTrustedSites()
-    {
-        $id = $this->getLoggedInUser();
-        if ($id === false) {
-            return false;
-        }
-        return $this->_storage->getTrustedSites($id);
-    }
-
-    /**
-     * Handles HTTP request from consumer
-     *
-     * @param array $params GET or POST variables. If this parameter is omited
-     *  or set to null, then $_GET or $_POST superglobal variable is used
-     *  according to REQUEST_METHOD.
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *  object to perform HTTP or HTML form redirection
-     * @return mixed
-     */
-    public function handle($params=null, $extensions=null,
-                           Zend_Controller_Response_Abstract $response = null)
-    {
-        if ($params === null) {
-            if ($_SERVER["REQUEST_METHOD"] == "GET") {
-                $params = $_GET;
-            } else if ($_SERVER["REQUEST_METHOD"] == "POST") {
-                $params = $_POST;
-            } else {
-                return false;
-            }
-        }
-        $version = 1.1;
-        if (isset($params['openid_ns']) &&
-            $params['openid_ns'] == Zend_OpenId::NS_2_0) {
-            $version = 2.0;
-        }
-        if (isset($params['openid_mode'])) {
-            if ($params['openid_mode'] == 'associate') {
-                $response = $this->_associate($version, $params);
-                $ret = '';
-                foreach ($response as $key => $val) {
-                    $ret .= $key . ':' . $val . "\n";
-                }
-                return $ret;
-            } else if ($params['openid_mode'] == 'checkid_immediate') {
-                $ret = $this->_checkId($version, $params, 1, $extensions, $response);
-                if (is_bool($ret)) return $ret;
-                if (!empty($params['openid_return_to'])) {
-                    Zend_OpenId::redirect($params['openid_return_to'], $ret, $response);
-                }
-                return true;
-            } else if ($params['openid_mode'] == 'checkid_setup') {
-                $ret = $this->_checkId($version, $params, 0, $extensions, $response);
-                if (is_bool($ret)) return $ret;
-                if (!empty($params['openid_return_to'])) {
-                    Zend_OpenId::redirect($params['openid_return_to'], $ret, $response);
-                }
-                return true;
-            } else if ($params['openid_mode'] == 'check_authentication') {
-                $response = $this->_checkAuthentication($version, $params);
-                $ret = '';
-                foreach ($response as $key => $val) {
-                    $ret .= $key . ':' . $val . "\n";
-                }
-                return $ret;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Generates a secret key for given hash function, returns RAW key or false
-     * if function is not supported
-     *
-     * @param string $func hash function (sha1 or sha256)
-     * @return mixed
-     */
-    protected function _genSecret($func)
-    {
-        if ($func == 'sha1') {
-            $macLen = 20; /* 160 bit */
-        } else if ($func == 'sha256') {
-            $macLen = 32; /* 256 bit */
-        } else {
-            return false;
-        }
-        return Zend_OpenId::randomBytes($macLen);
-    }
-
-    /**
-     * Processes association request from OpenID consumerm generates secret
-     * shared key and send it back using Diffie-Hellman encruption.
-     * Returns array of variables to push back to consumer.
-     *
-     * @param float $version OpenID version
-     * @param array $params GET or POST request variables
-     * @return array
-     */
-    protected function _associate($version, $params)
-    {
-        $ret = array();
-
-        if ($version >= 2.0) {
-            $ret['ns'] = Zend_OpenId::NS_2_0;
-        }
-
-        if (isset($params['openid_assoc_type']) &&
-            $params['openid_assoc_type'] == 'HMAC-SHA1') {
-            $macFunc = 'sha1';
-        } else if (isset($params['openid_assoc_type']) &&
-            $params['openid_assoc_type'] == 'HMAC-SHA256' &&
-            $version >= 2.0) {
-            $macFunc = 'sha256';
-        } else {
-            $ret['error'] = 'Wrong "openid.assoc_type"';
-            $ret['error-code'] = 'unsupported-type';
-            return $ret;
-        }
-
-        $ret['assoc_type'] = $params['openid_assoc_type'];
-
-        $secret = $this->_genSecret($macFunc);
-
-        if (empty($params['openid_session_type']) ||
-            $params['openid_session_type'] == 'no-encryption') {
-            $ret['mac_key'] = base64_encode($secret);
-        } else if (isset($params['openid_session_type']) &&
-            $params['openid_session_type'] == 'DH-SHA1') {
-            $dhFunc = 'sha1';
-        } else if (isset($params['openid_session_type']) &&
-            $params['openid_session_type'] == 'DH-SHA256' &&
-            $version >= 2.0) {
-            $dhFunc = 'sha256';
-        } else {
-            $ret['error'] = 'Wrong "openid.session_type"';
-            $ret['error-code'] = 'unsupported-type';
-            return $ret;
-        }
-
-        if (isset($params['openid_session_type'])) {
-            $ret['session_type'] = $params['openid_session_type'];
-        }
-
-        if (isset($dhFunc)) {
-            if (empty($params['openid_dh_consumer_public'])) {
-                $ret['error'] = 'Wrong "openid.dh_consumer_public"';
-                return $ret;
-            }
-            if (empty($params['openid_dh_gen'])) {
-                $g = pack('H*', Zend_OpenId::DH_G);
-            } else {
-                $g = base64_decode($params['openid_dh_gen']);
-            }
-            if (empty($params['openid_dh_modulus'])) {
-                $p = pack('H*', Zend_OpenId::DH_P);
-            } else {
-                $p = base64_decode($params['openid_dh_modulus']);
-            }
-
-            $dh = Zend_OpenId::createDhKey($p, $g);
-            $dh_details = Zend_OpenId::getDhKeyDetails($dh);
-
-            $sec = Zend_OpenId::computeDhSecret(
-                base64_decode($params['openid_dh_consumer_public']), $dh);
-            if ($sec === false) {
-                $ret['error'] = 'Wrong "openid.session_type"';
-                $ret['error-code'] = 'unsupported-type';
-                return $ret;
-            }
-            $sec = Zend_OpenId::digest($dhFunc, $sec);
-            $ret['dh_server_public'] = base64_encode(
-                Zend_OpenId::btwoc($dh_details['pub_key']));
-            $ret['enc_mac_key']      = base64_encode($secret ^ $sec);
-        }
-
-        $handle = uniqid();
-        $expiresIn = $this->_sessionTtl;
-
-        $ret['assoc_handle'] = $handle;
-        $ret['expires_in'] = $expiresIn;
-
-        $this->_storage->addAssociation($handle,
-            $macFunc, $secret, time() + $expiresIn);
-
-        return $ret;
-    }
-
-    /**
-     * Performs authentication (or authentication check).
-     *
-     * @param float $version OpenID version
-     * @param array $params GET or POST request variables
-     * @param bool $immediate enables or disables interaction with user
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response
-     * @return array
-     */
-    protected function _checkId($version, $params, $immediate, $extensions=null,
-        Zend_Controller_Response_Abstract $response = null)
-    {
-        $ret = array();
-
-        if ($version >= 2.0) {
-            $ret['openid.ns'] = Zend_OpenId::NS_2_0;
-        }
-        $root = $this->getSiteRoot($params);
-        if ($root === false) {
-            return false;
-        }
-
-        if (isset($params['openid_identity']) &&
-            !$this->_storage->hasUser($params['openid_identity'])) {
-            $ret['openid.mode'] = ($immediate && $version >= 2.0) ? 'setup_needed': 'cancel';
-            return $ret;
-        }
-
-        /* Check if user already logged in into the server */
-        if (!isset($params['openid_identity']) ||
-            $this->_user->getLoggedInUser() !== $params['openid_identity']) {
-            $params2 = array();
-            foreach ($params as $key => $val) {
-                if (strpos($key, 'openid_ns_') === 0) {
-                    $key = 'openid.ns.' . substr($key, strlen('openid_ns_'));
-                } else if (strpos($key, 'openid_sreg_') === 0) {
-                    $key = 'openid.sreg.' . substr($key, strlen('openid_sreg_'));
-                } else if (strpos($key, 'openid_') === 0) {
-                    $key = 'openid.' . substr($key, strlen('openid_'));
-                }
-                $params2[$key] = $val;
-            }
-            if ($immediate) {
-                $params2['openid.mode'] = 'checkid_setup';
-                $ret['openid.mode'] = ($version >= 2.0) ? 'setup_needed': 'id_res';
-                $ret['openid.user_setup_url'] = $this->_loginUrl
-                    . (strpos($this->_loginUrl, '?') === false ? '?' : '&')
-                    . Zend_OpenId::paramsToQuery($params2);
-                return $ret;
-            } else {
-                /* Redirect to Server Login Screen */
-                Zend_OpenId::redirect($this->_loginUrl, $params2, $response);
-                return true;
-            }
-        }
-
-        if (!Zend_OpenId_Extension::forAll($extensions, 'parseRequest', $params)) {
-            $ret['openid.mode'] = ($immediate && $version >= 2.0) ? 'setup_needed': 'cancel';
-            return $ret;
-        }
-
-        /* Check if user trusts to the consumer */
-        $trusted = null;
-        $sites = $this->_storage->getTrustedSites($params['openid_identity']);
-        if (isset($params['openid_return_to'])) {
-            $root = $params['openid_return_to'];
-        }
-        if (isset($sites[$root])) {
-            $trusted = $sites[$root];
-        } else {
-            foreach ($sites as $site => $t) {
-                if (strpos($root, $site) === 0) {
-                    $trusted = $t;
-                    break;
-                } else {
-                    /* OpenID 2.0 (9.2) check for realm wild-card matching */
-                    $n = strpos($site, '://*.');
-                    if ($n != false) {
-                        $regex = '/^'
-                               . preg_quote(substr($site, 0, $n+3), '/')
-                               . '[A-Za-z1-9_\.]+?'
-                               . preg_quote(substr($site, $n+4), '/')
-                               . '/';
-                        if (preg_match($regex, $root)) {
-                            $trusted = $t;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (is_array($trusted)) {
-            if (!Zend_OpenId_Extension::forAll($extensions, 'checkTrustData', $trusted)) {
-                $trusted = null;
-            }
-        }
-
-        if ($trusted === false) {
-            $ret['openid.mode'] = 'cancel';
-            return $ret;
-        } else if ($trusted === null) {
-            /* Redirect to Server Trust Screen */
-            $params2 = array();
-            foreach ($params as $key => $val) {
-                if (strpos($key, 'openid_ns_') === 0) {
-                    $key = 'openid.ns.' . substr($key, strlen('openid_ns_'));
-                } else if (strpos($key, 'openid_sreg_') === 0) {
-                    $key = 'openid.sreg.' . substr($key, strlen('openid_sreg_'));
-                } else if (strpos($key, 'openid_') === 0) {
-                    $key = 'openid.' . substr($key, strlen('openid_'));
-                }
-                $params2[$key] = $val;
-            }
-            if ($immediate) {
-                $params2['openid.mode'] = 'checkid_setup';
-                $ret['openid.mode'] = ($version >= 2.0) ? 'setup_needed': 'id_res';
-                $ret['openid.user_setup_url'] = $this->_trustUrl
-                    . (strpos($this->_trustUrl, '?') === false ? '?' : '&')
-                    . Zend_OpenId::paramsToQuery($params2);
-                return $ret;
-            } else {
-                Zend_OpenId::redirect($this->_trustUrl, $params2, $response);
-                return true;
-            }
-        }
-
-        return $this->_respond($version, $ret, $params, $extensions);
-    }
-
-    /**
-     * Perepares information to send back to consumer's authentication request,
-     * signs it using shared secret and send back through HTTP redirection
-     *
-     * @param array $params GET or POST request variables
-     * @param mixed $extensions extension object or array of extensions objects
-     * @param Zend_Controller_Response_Abstract $response an optional response
-     *  object to perform HTTP or HTML form redirection
-     * @return bool
-     */
-    public function respondToConsumer($params, $extensions=null,
-                           Zend_Controller_Response_Abstract $response = null)
-    {
-        $version = 1.1;
-        if (isset($params['openid_ns']) &&
-            $params['openid_ns'] == Zend_OpenId::NS_2_0) {
-            $version = 2.0;
-        }
-        $ret = array();
-        if ($version >= 2.0) {
-            $ret['openid.ns'] = Zend_OpenId::NS_2_0;
-        }
-        $ret = $this->_respond($version, $ret, $params, $extensions);
-        if (!empty($params['openid_return_to'])) {
-            Zend_OpenId::redirect($params['openid_return_to'], $ret, $response);
-        }
-        return true;
-    }
-
-    /**
-     * Perepares information to send back to consumer's authentication request
-     * and signs it using shared secret.
-     *
-     * @param float $version OpenID protcol version
-     * @param array $ret arguments to be send back to consumer
-     * @param array $params GET or POST request variables
-     * @param mixed $extensions extension object or array of extensions objects
-     * @return array
-     */
-    protected function _respond($version, $ret, $params, $extensions=null)
-    {
-        if (empty($params['openid_assoc_handle']) ||
-            !$this->_storage->getAssociation($params['openid_assoc_handle'],
-                $macFunc, $secret, $expires)) {
-            /* Use dumb mode */
-            if (!empty($params['openid_assoc_handle'])) {
-                $ret['openid.invalidate_handle'] = $params['openid_assoc_handle'];
-            }
-            $macFunc = $version >= 2.0 ? 'sha256' : 'sha1';
-            $secret = $this->_genSecret($macFunc);
-            $handle = uniqid();
-            $expiresIn = $this->_sessionTtl;
-            $this->_storage->addAssociation($handle,
-                $macFunc, $secret, time() + $expiresIn);
-            $ret['openid.assoc_handle'] = $handle;
-        } else {
-            $ret['openid.assoc_handle'] = $params['openid_assoc_handle'];
-        }
-        if (isset($params['openid_return_to'])) {
-            $ret['openid.return_to'] = $params['openid_return_to'];
-        }
-        if (isset($params['openid_claimed_id'])) {
-            $ret['openid.claimed_id'] = $params['openid_claimed_id'];
-        }
-        if (isset($params['openid_identity'])) {
-            $ret['openid.identity'] = $params['openid_identity'];
-        }
-
-        if ($version >= 2.0) {
-            if (!empty($this->_opEndpoint)) {
-                $ret['openid.op_endpoint'] = $this->_opEndpoint;
-            } else {
-                $ret['openid.op_endpoint'] = Zend_OpenId::selfUrl();
-            }
-        }
-        $ret['openid.response_nonce'] = gmdate('Y-m-d\TH:i:s\Z') . uniqid();
-        $ret['openid.mode'] = 'id_res';
-
-        Zend_OpenId_Extension::forAll($extensions, 'prepareResponse', $ret);
-
-        $signed = '';
-        $data = '';
-        foreach ($ret as $key => $val) {
-            if (strpos($key, 'openid.') === 0) {
-                $key = substr($key, strlen('openid.'));
-                if (!empty($signed)) {
-                    $signed .= ',';
-                }
-                $signed .= $key;
-                $data .= $key . ':' . $val . "\n";
-            }
-        }
-        $signed .= ',signed';
-        $data .= 'signed:' . $signed . "\n";
-        $ret['openid.signed'] = $signed;
-
-        $ret['openid.sig'] = base64_encode(
-            Zend_OpenId::hashHmac($macFunc, $data, $secret));
-
-        return $ret;
-    }
-
-    /**
-     * Performs authentication validation for dumb consumers
-     * Returns array of variables to push back to consumer.
-     * It MUST contain 'is_valid' variable with value 'true' or 'false'.
-     *
-     * @param float $version OpenID version
-     * @param array $params GET or POST request variables
-     * @return array
-     */
-    protected function _checkAuthentication($version, $params)
-    {
-        $ret = array();
-        if ($version >= 2.0) {
-            $ret['ns'] = Zend_OpenId::NS_2_0;
-        }
-        $ret['openid.mode'] = 'id_res';
-
-        if (empty($params['openid_assoc_handle']) ||
-            empty($params['openid_signed']) ||
-            empty($params['openid_sig']) ||
-            !$this->_storage->getAssociation($params['openid_assoc_handle'],
-                $macFunc, $secret, $expires)) {
-            $ret['is_valid'] = 'false';
-            return $ret;
-        }
-
-        $signed = explode(',', $params['openid_signed']);
-        $data = '';
-        foreach ($signed as $key) {
-            $data .= $key . ':';
-            if ($key == 'mode') {
-                $data .= "id_res\n";
-            } else {
-                $data .= $params['openid_' . strtr($key,'.','_')]."\n";
-            }
-        }
-        if (base64_decode($params['openid_sig']) ===
-            Zend_OpenId::hashHmac($macFunc, $data, $secret)) {
-            $ret['is_valid'] = 'true';
-        } else {
-            $ret['is_valid'] = 'false';
-        }
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Provider/Storage.php b/airtime_mvc/library/Zend/OpenId/Provider/Storage.php
deleted file mode 100644
index ece488916..000000000
--- a/airtime_mvc/library/Zend/OpenId/Provider/Storage.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class to implement external storage for OpenID consumer
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_OpenId_Provider_Storage
-{
-
-    /**
-     * Stores information about session identified by $handle
-     *
-     * @param string $handle assiciation handle
-     * @param string $macFunc HMAC function (sha1 or sha256)
-     * @param string $secret shared secret
-     * @param string $expires expiration UNIX time
-     * @return void
-     */
-    abstract public function addAssociation($handle, $macFunc, $secret, $expires);
-
-    /**
-     * Gets information about association identified by $handle
-     * Returns true if given association found and not expired and false
-     * otherwise
-     *
-     * @param string $handle assiciation handle
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param string &$expires expiration UNIX time
-     * @return bool
-     */
-    abstract public function getAssociation($handle, &$macFunc, &$secret, &$expires);
-
-    /**
-     * Register new user with given $id and $password
-     * Returns true in case of success and false if user with given $id already
-     * exists
-     *
-     * @param string $id user identity URL
-     * @param string $password encoded user password
-     * @return bool
-     */
-    abstract public function addUser($id, $password);
-
-    /**
-     * Returns true if user with given $id exists and false otherwise
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    abstract public function hasUser($id);
-
-    /**
-     * Verify if user with given $id exists and has specified $password
-     *
-     * @param string $id user identity URL
-     * @param string $password user password
-     * @return bool
-     */
-    abstract public function checkUser($id, $password);
-
-    /**
-     * Returns array of all trusted/untrusted sites for given user identified
-     * by $id
-     *
-     * @param string $id user identity URL
-     * @return array
-     */
-    abstract public function getTrustedSites($id);
-
-    /**
-     * Stores information about trusted/untrusted site for given user
-     *
-     * @param string $id user identity URL
-     * @param string $site site URL
-     * @param mixed $trusted trust data from extensions or just a boolean value
-     * @return bool
-     */
-    abstract public function addSite($id, $site, $trusted);
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Provider/Storage/File.php b/airtime_mvc/library/Zend/OpenId/Provider/Storage/File.php
deleted file mode 100644
index 0db4b31fd..000000000
--- a/airtime_mvc/library/Zend/OpenId/Provider/Storage/File.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId_Provider_Storage
- */
-require_once "Zend/OpenId/Provider/Storage.php";
-
-/**
- * External storage implemmentation using serialized files
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Provider_Storage_File extends Zend_OpenId_Provider_Storage
-{
-
-    /**
-     * Directory name to store data files in
-     *
-     * @var string $_dir
-     */
-    private $_dir;
-
-    /**
-     * Constructs storage object and creates storage directory
-     *
-     * @param string $dir directory name to store data files in
-     * @throws Zend_OpenId_Exception
-     */
-    public function __construct($dir = null)
-    {
-        if ($dir === null) {
-            $tmp = getenv('TMP');
-            if (empty($tmp)) {
-                $tmp = getenv('TEMP');
-                if (empty($tmp)) {
-                    $tmp = "/tmp";
-                }
-            }
-            $user = get_current_user();
-            if (is_string($user) && !empty($user)) {
-                $tmp .= '/' . $user;
-            }
-            $dir = $tmp . '/openid/provider';
-        }
-        $this->_dir = $dir;
-        if (!is_dir($this->_dir)) {
-            if (!@mkdir($this->_dir, 0700, 1)) {
-                throw new Zend_OpenId_Exception(
-                    "Cannot access storage directory $dir",
-                    Zend_OpenId_Exception::ERROR_STORAGE);
-            }
-        }
-        if (($f = fopen($this->_dir.'/assoc.lock', 'w+')) === null) {
-            throw new Zend_OpenId_Exception(
-                'Cannot create a lock file in the directory ' . $dir,
-                Zend_OpenId_Exception::ERROR_STORAGE);
-        }
-        fclose($f);
-        if (($f = fopen($this->_dir.'/user.lock', 'w+')) === null) {
-            throw new Zend_OpenId_Exception(
-                'Cannot create a lock file in the directory ' . $dir,
-                Zend_OpenId_Exception::ERROR_STORAGE);
-        }
-        fclose($f);
-    }
-
-    /**
-     * Stores information about session identified by $handle
-     *
-     * @param string $handle assiciation handle
-     * @param string $macFunc HMAC function (sha1 or sha256)
-     * @param string $secret shared secret
-     * @param string $expires expiration UNIX time
-     * @return bool
-     */
-    public function addAssociation($handle, $macFunc, $secret, $expires)
-    {
-        $name = $this->_dir . '/assoc_' . md5($handle);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'w+');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $data = serialize(array($handle, $macFunc, $secret, $expires));
-            fwrite($f, $data);
-            fclose($f);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Gets information about association identified by $handle
-     * Returns true if given association found and not expired and false
-     * otherwise
-     *
-     * @param string $handle assiciation handle
-     * @param string &$macFunc HMAC function (sha1 or sha256)
-     * @param string &$secret shared secret
-     * @param string &$expires expiration UNIX time
-     * @return bool
-     */
-    public function getAssociation($handle, &$macFunc, &$secret, &$expires)
-    {
-        $name = $this->_dir . '/assoc_' . md5($handle);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedHandle, $macFunc, $secret, $expires) = unserialize($data);
-                if ($handle === $storedHandle && $expires > time()) {
-                    $ret = true;
-                } else {
-                    fclose($f);
-                    @unlink($name);
-                    fclose($lock);
-                    return false;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Removes information about association identified by $handle
-     *
-     * @param string $handle assiciation handle
-     * @return bool
-     */
-    public function delAssociation($handle)
-    {
-        $name = $this->_dir . '/assoc_' . md5($handle);
-        $lock = @fopen($this->_dir . '/assoc.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            @unlink($name);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Register new user with given $id and $password
-     * Returns true in case of success and false if user with given $id already
-     * exists
-     *
-     * @param string $id user identity URL
-     * @param string $password encoded user password
-     * @return bool
-     */
-    public function addUser($id, $password)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'x');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $data = serialize(array($id, $password, array()));
-            fwrite($f, $data);
-            fclose($f);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns true if user with given $id exists and false otherwise
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    public function hasUser($id)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_SH)) {
-            fclose($lock);
-            return false;
-        }
-        try { 
-            $f = @fopen($name, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedId, $storedPassword, $trusted) = unserialize($data);
-                if ($id === $storedId) {
-                    $ret = true;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Verify if user with given $id exists and has specified $password
-     *
-     * @param string $id user identity URL
-     * @param string $password user password
-     * @return bool
-     */
-    public function checkUser($id, $password)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_SH)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedId, $storedPassword, $trusted) = unserialize($data);
-                if ($id === $storedId && $password === $storedPassword) {
-                    $ret = true;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Removes information abou specified user
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    public function delUser($id)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            @unlink($name);
-            fclose($lock);
-            return true;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns array of all trusted/untrusted sites for given user identified
-     * by $id
-     *
-     * @param string $id user identity URL
-     * @return array
-     */
-    public function getTrustedSites($id)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_SH)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'r');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedId, $storedPassword, $trusted) = unserialize($data);
-                if ($id === $storedId) {
-                    $ret = $trusted;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-
-    /**
-     * Stores information about trusted/untrusted site for given user
-     *
-     * @param string $id user identity URL
-     * @param string $site site URL
-     * @param mixed $trusted trust data from extension or just a boolean value
-     * @return bool
-     */
-    public function addSite($id, $site, $trusted)
-    {
-        $name = $this->_dir . '/user_' . md5($id);
-        $lock = @fopen($this->_dir . '/user.lock', 'w+');
-        if ($lock === false) {
-            return false;
-        }
-        if (!flock($lock, LOCK_EX)) {
-            fclose($lock);
-            return false;
-        }
-        try {
-            $f = @fopen($name, 'r+');
-            if ($f === false) {
-                fclose($lock);
-                return false;
-            }
-            $ret = false;
-            $data = stream_get_contents($f);
-            if (!empty($data)) {
-                list($storedId, $storedPassword, $sites) = unserialize($data);
-                if ($id === $storedId) {
-                    if ($trusted === null) {
-                        unset($sites[$site]);
-                    } else {
-                        $sites[$site] = $trusted;
-                    }
-                    rewind($f);
-                    ftruncate($f, 0);
-                    $data = serialize(array($id, $storedPassword, $sites));
-                    fwrite($f, $data);
-                    $ret = true;
-                }
-            }
-            fclose($f);
-            fclose($lock);
-            return $ret;
-        } catch (Exception $e) {
-            fclose($lock);
-            throw $e;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Provider/User.php b/airtime_mvc/library/Zend/OpenId/Provider/User.php
deleted file mode 100644
index 87cefab31..000000000
--- a/airtime_mvc/library/Zend/OpenId/Provider/User.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class to get/store information about logged in user in Web Browser
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_OpenId_Provider_User
-{
-
-    /**
-     * Stores information about logged in user
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    abstract public function setLoggedInUser($id);
-
-    /**
-     * Returns identity URL of logged in user or false
-     *
-     * @return mixed
-     */
-    abstract public function getLoggedInUser();
-
-    /**
-     * Performs logout. Clears information about logged in user.
-     *
-     * @return bool
-     */
-    abstract public function delLoggedInUser();
-}
diff --git a/airtime_mvc/library/Zend/OpenId/Provider/User/Session.php b/airtime_mvc/library/Zend/OpenId/Provider/User/Session.php
deleted file mode 100644
index 6f8fdca9f..000000000
--- a/airtime_mvc/library/Zend/OpenId/Provider/User/Session.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_OpenId_Provider_User
- */
-require_once "Zend/OpenId/Provider/User.php";
-
-/**
- * @see Zend_Session_Namespace
- */
-require_once "Zend/Session/Namespace.php";
-
-/**
- * Class to get/store information about logged in user in Web Browser using
- * PHP session
- *
- * @category   Zend
- * @package    Zend_OpenId
- * @subpackage Zend_OpenId_Provider
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_OpenId_Provider_User_Session extends Zend_OpenId_Provider_User
-{
-    /**
-     * Reference to an implementation of Zend_Session_Namespace object
-     *
-     * @var Zend_Session_Namespace $_session
-     */
-    private $_session = null;
-
-    /**
-     * Creates Zend_OpenId_Provider_User_Session object with given session
-     * namespace or creates new session namespace named "openid"
-     *
-     * @param Zend_Session_Namespace $session
-     */
-    public function __construct(Zend_Session_Namespace $session = null)
-    {
-        if ($session === null) {
-            $this->_session = new Zend_Session_Namespace("openid");
-        } else {
-            $this->_session = $session;
-        }
-    }
-
-    /**
-     * Stores information about logged in user in session data
-     *
-     * @param string $id user identity URL
-     * @return bool
-     */
-    public function setLoggedInUser($id)
-    {
-        $this->_session->logged_in = $id;
-        return true;
-    }
-
-    /**
-     * Returns identity URL of logged in user or false
-     *
-     * @return mixed
-     */
-    public function getLoggedInUser()
-    {
-        if (isset($this->_session->logged_in)) {
-            return $this->_session->logged_in;
-        }
-        return false;
-    }
-
-    /**
-     * Performs logout. Clears information about logged in user.
-     *
-     * @return bool
-     */
-    public function delLoggedInUser()
-    {
-        unset($this->_session->logged_in);
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Paginator.php b/airtime_mvc/library/Zend/Paginator.php
deleted file mode 100644
index 2fd03c08b..000000000
--- a/airtime_mvc/library/Zend/Paginator.php
+++ /dev/null
@@ -1,1113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Paginator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Loader_PluginLoader
- */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator implements Countable, IteratorAggregate
-{
-    /**
-     * Specifies that the factory should try to detect the proper adapter type first
-     *
-     * @var string
-     */
-    const INTERNAL_ADAPTER = 'Zend_Paginator_Adapter_Internal';
-
-    /**
-     * The cache tag prefix used to namespace Paginator results in the cache
-     *
-     */
-    const CACHE_TAG_PREFIX = 'Zend_Paginator_';
-
-    /**
-     * Adapter plugin loader
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected static $_adapterLoader = null;
-
-    /**
-     * Configuration file
-     *
-     * @var Zend_Config
-     */
-    protected static $_config = null;
-
-    /**
-     * Default scrolling style
-     *
-     * @var string
-     */
-    protected static $_defaultScrollingStyle = 'Sliding';
-
-    /**
-     * Default item count per page
-     *
-     * @var int
-     */
-    protected static $_defaultItemCountPerPage = 10;
-
-    /**
-     * Scrolling style plugin loader
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected static $_scrollingStyleLoader = null;
-
-    /**
-     * Cache object
-     *
-     * @var Zend_Cache_Core
-     */
-    protected static $_cache;
-
-    /**
-     * Enable or desable the cache by Zend_Paginator instance
-     *
-     * @var bool
-     */
-    protected $_cacheEnabled = true;
-
-    /**
-     * Adapter
-     *
-     * @var Zend_Paginator_Adapter_Interface
-     */
-    protected $_adapter = null;
-
-    /**
-     * Number of items in the current page
-     *
-     * @var integer
-     */
-    protected $_currentItemCount = null;
-
-    /**
-     * Current page items
-     *
-     * @var Traversable
-     */
-    protected $_currentItems = null;
-
-    /**
-     * Current page number (starting from 1)
-     *
-     * @var integer
-     */
-    protected $_currentPageNumber = 1;
-
-    /**
-     * Result filter
-     *
-     * @var Zend_Filter_Interface
-     */
-    protected $_filter = null;
-
-    /**
-     * Number of items per page
-     *
-     * @var integer
-     */
-    protected $_itemCountPerPage = null;
-
-    /**
-     * Number of pages
-     *
-     * @var integer
-     */
-    protected $_pageCount = null;
-
-    /**
-     * Number of local pages (i.e., the number of discrete page numbers
-     * that will be displayed, including the current page number)
-     *
-     * @var integer
-     */
-    protected $_pageRange = 10;
-
-    /**
-     * Pages
-     *
-     * @var array
-     */
-    protected $_pages = null;
-
-    /**
-     * View instance used for self rendering
-     *
-     * @var Zend_View_Interface
-     */
-    protected $_view = null;
-
-    /**
-     * Adds an adapter prefix path to the plugin loader.
-     *
-     * @param string $prefix
-     * @param string $path
-     */
-    public static function addAdapterPrefixPath($prefix, $path)
-    {
-        self::getAdapterLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Adds an array of adapter prefix paths to the plugin
-     * loader.
-     *
-     * <code>
-     * $prefixPaths = array(
-     *     'My_Paginator_Adapter'   => 'My/Paginator/Adapter/',
-     *     'Your_Paginator_Adapter' => 'Your/Paginator/Adapter/'
-     * );
-     * </code>
-     *
-     * @param array $prefixPaths
-     */
-    public static function addAdapterPrefixPaths(array $prefixPaths)
-    {
-        if (isset($prefixPaths['prefix']) && isset($prefixPaths['path'])) {
-            self::addAdapterPrefixPath($prefixPaths['prefix'], $prefixPaths['path']);
-        } else {
-            foreach ($prefixPaths as $prefix => $path) {
-                if (is_array($path) && isset($path['prefix']) && isset($path['path'])) {
-                    $prefix = $path['prefix'];
-                    $path   = $path['path'];
-                }
-
-                self::addAdapterPrefixPath($prefix, $path);
-            }
-        }
-    }
-
-    /**
-     * Adds a scrolling style prefix path to the plugin loader.
-     *
-     * @param string $prefix
-     * @param string $path
-     */
-    public static function addScrollingStylePrefixPath($prefix, $path)
-    {
-        self::getScrollingStyleLoader()->addPrefixPath($prefix, $path);
-    }
-
-    /**
-     * Adds an array of scrolling style prefix paths to the plugin
-     * loader.
-     *
-     * <code>
-     * $prefixPaths = array(
-     *     'My_Paginator_ScrollingStyle'   => 'My/Paginator/ScrollingStyle/',
-     *     'Your_Paginator_ScrollingStyle' => 'Your/Paginator/ScrollingStyle/'
-     * );
-     * </code>
-     *
-     * @param array $prefixPaths
-     */
-    public static function addScrollingStylePrefixPaths(array $prefixPaths)
-    {
-        if (isset($prefixPaths['prefix']) && isset($prefixPaths['path'])) {
-            self::addScrollingStylePrefixPath($prefixPaths['prefix'], $prefixPaths['path']);
-        } else {
-            foreach ($prefixPaths as $prefix => $path) {
-                if (is_array($path) && isset($path['prefix']) && isset($path['path'])) {
-                    $prefix = $path['prefix'];
-                    $path   = $path['path'];
-                }
-
-                self::addScrollingStylePrefixPath($prefix, $path);
-            }
-        }
-    }
-
-    /**
-     * Factory.
-     *
-     * @param  mixed $data
-     * @param  string $adapter
-     * @param  array $prefixPaths
-     * @return Zend_Paginator
-     */
-    public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
-                                   array $prefixPaths = null)
-    {
-        if ($data instanceof Zend_Paginator_AdapterAggregate) {
-            return new self($data->getPaginatorAdapter());
-        } else {
-            if ($adapter == self::INTERNAL_ADAPTER) {
-                if (is_array($data)) {
-                    $adapter = 'Array';
-                } else if ($data instanceof Zend_Db_Table_Select) {
-                    $adapter = 'DbTableSelect';
-                } else if ($data instanceof Zend_Db_Select) {
-                    $adapter = 'DbSelect';
-                } else if ($data instanceof Iterator) {
-                    $adapter = 'Iterator';
-                } else if (is_integer($data)) {
-                    $adapter = 'Null';
-                } else {
-                    $type = (is_object($data)) ? get_class($data) : gettype($data);
-
-                    /**
-                     * @see Zend_Paginator_Exception
-                     */
-                    require_once 'Zend/Paginator/Exception.php';
-
-                    throw new Zend_Paginator_Exception('No adapter for type ' . $type);
-                }
-            }
-
-            $pluginLoader = self::getAdapterLoader();
-
-            if (null !== $prefixPaths) {
-                foreach ($prefixPaths as $prefix => $path) {
-                    $pluginLoader->addPrefixPath($prefix, $path);
-                }
-            }
-
-            $adapterClassName = $pluginLoader->load($adapter);
-
-            return new self(new $adapterClassName($data));
-        }
-    }
-
-    /**
-     * Returns the adapter loader.  If it doesn't exist it's created.
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getAdapterLoader()
-    {
-        if (self::$_adapterLoader === null) {
-            self::$_adapterLoader = new Zend_Loader_PluginLoader(
-                array('Zend_Paginator_Adapter' => 'Zend/Paginator/Adapter')
-            );
-        }
-
-        return self::$_adapterLoader;
-    }
-
-    /**
-     * Set a global config
-     *
-     * @param Zend_Config $config
-     */
-    public static function setConfig(Zend_Config $config)
-    {
-        self::$_config = $config;
-
-        $adapterPaths = $config->get('adapterpaths');
-
-        if ($adapterPaths != null) {
-            self::addAdapterPrefixPaths($adapterPaths->adapterpath->toArray());
-        }
-
-        $prefixPaths = $config->get('prefixpaths');
-
-        if ($prefixPaths != null) {
-            self::addScrollingStylePrefixPaths($prefixPaths->prefixpath->toArray());
-        }
-
-        $scrollingStyle = $config->get('scrollingstyle');
-
-        if ($scrollingStyle != null) {
-            self::setDefaultScrollingStyle($scrollingStyle);
-        }
-    }
-
-    /**
-     * Returns the default scrolling style.
-     *
-     * @return  string
-     */
-    public static function getDefaultScrollingStyle()
-    {
-        return self::$_defaultScrollingStyle;
-    }
-
-    /**
-     * Get the default item count per page
-     *
-     * @return int
-     */
-    public static function getDefaultItemCountPerPage()
-    {
-        return self::$_defaultItemCountPerPage;
-    }
-
-    /**
-     * Set the default item count per page
-     *
-     * @param int $count
-     */
-    public static function setDefaultItemCountPerPage($count)
-    {
-        self::$_defaultItemCountPerPage = (int) $count;
-    }
-
-    /**
-     * Sets a cache object
-     *
-     * @param Zend_Cache_Core $cache
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Sets the default scrolling style.
-     *
-     * @param  string $scrollingStyle
-     */
-    public static function setDefaultScrollingStyle($scrollingStyle = 'Sliding')
-    {
-        self::$_defaultScrollingStyle = $scrollingStyle;
-    }
-
-    /**
-     * Returns the scrolling style loader.  If it doesn't exist it's
-     * created.
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getScrollingStyleLoader()
-    {
-        if (self::$_scrollingStyleLoader === null) {
-            self::$_scrollingStyleLoader = new Zend_Loader_PluginLoader(
-                array('Zend_Paginator_ScrollingStyle' => 'Zend/Paginator/ScrollingStyle')
-            );
-        }
-
-        return self::$_scrollingStyleLoader;
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param Zend_Paginator_Adapter_Interface|Zend_Paginator_AdapterAggregate $adapter
-     */
-    public function __construct($adapter)
-    {
-        if ($adapter instanceof Zend_Paginator_Adapter_Interface) {
-            $this->_adapter = $adapter;
-        } else if ($adapter instanceof Zend_Paginator_AdapterAggregate) {
-            $this->_adapter = $adapter->getPaginatorAdapter();
-        } else {
-            /**
-             * @see Zend_Paginator_Exception
-             */
-            require_once 'Zend/Paginator/Exception.php';
-
-            throw new Zend_Paginator_Exception(
-                'Zend_Paginator only accepts instances of the type ' .
-                'Zend_Paginator_Adapter_Interface or Zend_Paginator_AdapterAggregate.'
-            );
-        }
-
-        $config = self::$_config;
-
-        if ($config != null) {
-            $setupMethods = array('ItemCountPerPage', 'PageRange');
-
-            foreach ($setupMethods as $setupMethod) {
-                $value = $config->get(strtolower($setupMethod));
-
-                if ($value != null) {
-                    $setupMethod = 'set' . $setupMethod;
-                    $this->$setupMethod($value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Serializes the object as a string.  Proxies to {@link render()}.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->render();
-            return $return;
-        } catch (Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
-
-        return '';
-    }
-
-    /**
-     * Enables/Disables the cache for this instance
-     *
-     * @param bool $enable
-     * @return Zend_Paginator
-     */
-    public function setCacheEnabled($enable)
-    {
-        $this->_cacheEnabled = (bool)$enable;
-        return $this;
-    }
-
-    /**
-     * Returns the number of pages.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        if (!$this->_pageCount) {
-            $this->_pageCount = $this->_calculatePageCount();
-        }
-
-        return $this->_pageCount;
-    }
-
-    /**
-     * Returns the total number of items available.
-     *
-     * @return integer
-     */
-    public function getTotalItemCount()
-    {
-        return count($this->getAdapter());
-    }
-
-    /**
-     * Clear the page item cache.
-     *
-     * @param int $pageNumber
-     * @return Zend_Paginator
-     */
-    public function clearPageItemCache($pageNumber = null)
-    {
-        if (!$this->_cacheEnabled()) {
-            return $this;
-        }
-
-        if (null === $pageNumber) {
-            $cleanTags = self::CACHE_TAG_PREFIX;
-            foreach (self::$_cache->getIdsMatchingTags(array($this->_getCacheInternalId())) as $id) {
-                if (preg_match('|'.self::CACHE_TAG_PREFIX."(\d+)_.*|", $id, $page)) {
-                    self::$_cache->remove($this->_getCacheId($page[1]));
-                }
-            }
-        } else {
-            $cleanId = $this->_getCacheId($pageNumber);
-            self::$_cache->remove($cleanId);
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the absolute item number for the specified item.
-     *
-     * @param  integer $relativeItemNumber Relative item number
-     * @param  integer $pageNumber Page number
-     * @return integer
-     */
-    public function getAbsoluteItemNumber($relativeItemNumber, $pageNumber = null)
-    {
-        $relativeItemNumber = $this->normalizeItemNumber($relativeItemNumber);
-
-        if ($pageNumber == null) {
-            $pageNumber = $this->getCurrentPageNumber();
-        }
-
-        $pageNumber = $this->normalizePageNumber($pageNumber);
-
-        return (($pageNumber - 1) * $this->getItemCountPerPage()) + $relativeItemNumber;
-    }
-
-    /**
-     * Returns the adapter.
-     *
-     * @return Zend_Paginator_Adapter_Interface
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Returns the number of items for the current page.
-     *
-     * @return integer
-     */
-    public function getCurrentItemCount()
-    {
-        if ($this->_currentItemCount === null) {
-            $this->_currentItemCount = $this->getItemCount($this->getCurrentItems());
-        }
-
-        return $this->_currentItemCount;
-    }
-
-    /**
-     * Returns the items for the current page.
-     *
-     * @return Traversable
-     */
-    public function getCurrentItems()
-    {
-        if ($this->_currentItems === null) {
-            $this->_currentItems = $this->getItemsByPage($this->getCurrentPageNumber());
-        }
-
-        return $this->_currentItems;
-    }
-
-    /**
-     * Returns the current page number.
-     *
-     * @return integer
-     */
-    public function getCurrentPageNumber()
-    {
-        return $this->normalizePageNumber($this->_currentPageNumber);
-    }
-
-    /**
-     * Sets the current page number.
-     *
-     * @param  integer $pageNumber Page number
-     * @return Zend_Paginator $this
-     */
-    public function setCurrentPageNumber($pageNumber)
-    {
-        $this->_currentPageNumber = (integer) $pageNumber;
-        $this->_currentItems      = null;
-        $this->_currentItemCount  = null;
-
-        return $this;
-    }
-
-    /**
-     * Get the filter
-     *
-     * @return Zend_Filter_Interface
-     */
-    public function getFilter()
-    {
-        return $this->_filter;
-    }
-
-    /**
-     * Set a filter chain
-     *
-     * @param Zend_Filter_Interface $filter
-     * @return Zend_Paginator
-     */
-    public function setFilter(Zend_Filter_Interface $filter)
-    {
-        $this->_filter = $filter;
-
-        return $this;
-    }
-
-    /**
-     * Returns an item from a page.  The current page is used if there's no
-     * page sepcified.
-     *
-     * @param  integer $itemNumber Item number (1 to itemCountPerPage)
-     * @param  integer $pageNumber
-     * @return mixed
-     */
-    public function getItem($itemNumber, $pageNumber = null)
-    {
-        if ($pageNumber == null) {
-            $pageNumber = $this->getCurrentPageNumber();
-        } else if ($pageNumber < 0) {
-            $pageNumber = ($this->count() + 1) + $pageNumber;
-        }
-
-        $page = $this->getItemsByPage($pageNumber);
-        $itemCount = $this->getItemCount($page);
-
-        if ($itemCount == 0) {
-            /**
-             * @see Zend_Paginator_Exception
-             */
-            require_once 'Zend/Paginator/Exception.php';
-
-            throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not exist');
-        }
-
-        if ($itemNumber < 0) {
-            $itemNumber = ($itemCount + 1) + $itemNumber;
-        }
-
-        $itemNumber = $this->normalizeItemNumber($itemNumber);
-
-        if ($itemNumber > $itemCount) {
-            /**
-             * @see Zend_Paginator_Exception
-             */
-            require_once 'Zend/Paginator/Exception.php';
-
-            throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not'
-                                             . ' contain item number ' . $itemNumber);
-        }
-
-        return $page[$itemNumber - 1];
-    }
-
-    /**
-     * Returns the number of items per page.
-     *
-     * @return integer
-     */
-    public function getItemCountPerPage()
-    {
-        if (empty($this->_itemCountPerPage)) {
-            $this->_itemCountPerPage = self::getDefaultItemCountPerPage();
-        }
-
-        return $this->_itemCountPerPage;
-    }
-
-    /**
-     * Sets the number of items per page.
-     *
-     * @param  integer $itemCountPerPage
-     * @return Zend_Paginator $this
-     */
-    public function setItemCountPerPage($itemCountPerPage)
-    {
-        $this->_itemCountPerPage = (integer) $itemCountPerPage;
-        if ($this->_itemCountPerPage < 1) {
-            $this->_itemCountPerPage = $this->getItemCountPerPage();
-        }
-        $this->_pageCount        = $this->_calculatePageCount();
-        $this->_currentItems     = null;
-        $this->_currentItemCount = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the number of items in a collection.
-     *
-     * @param  mixed $items Items
-     * @return integer
-     */
-    public function getItemCount($items)
-    {
-        $itemCount = 0;
-
-        if (is_array($items) || $items instanceof Countable) {
-            $itemCount = count($items);
-        } else { // $items is something like LimitIterator
-            $itemCount = iterator_count($items);
-        }
-
-        return $itemCount;
-    }
-
-    /**
-     * Returns the items for a given page.
-     *
-     * @return Traversable
-     */
-    public function getItemsByPage($pageNumber)
-    {
-        $pageNumber = $this->normalizePageNumber($pageNumber);
-
-        if ($this->_cacheEnabled()) {
-            $data = self::$_cache->load($this->_getCacheId($pageNumber));
-            if ($data !== false) {
-                return $data;
-            }
-        }
-
-        $offset = ($pageNumber - 1) * $this->getItemCountPerPage();
-
-        $items = $this->_adapter->getItems($offset, $this->getItemCountPerPage());
-
-        $filter = $this->getFilter();
-
-        if ($filter !== null) {
-            $items = $filter->filter($items);
-        }
-
-        if (!$items instanceof Traversable) {
-            $items = new ArrayIterator($items);
-        }
-
-        if ($this->_cacheEnabled()) {
-            self::$_cache->save($items, $this->_getCacheId($pageNumber), array($this->_getCacheInternalId()));
-        }
-
-        return $items;
-    }
-
-    /**
-     * Returns a foreach-compatible iterator.
-     *
-     * @return Traversable
-     */
-    public function getIterator()
-    {
-        return $this->getCurrentItems();
-    }
-
-    /**
-     * Returns the page range (see property declaration above).
-     *
-     * @return integer
-     */
-    public function getPageRange()
-    {
-        return $this->_pageRange;
-    }
-
-    /**
-     * Sets the page range (see property declaration above).
-     *
-     * @param  integer $pageRange
-     * @return Zend_Paginator $this
-     */
-    public function setPageRange($pageRange)
-    {
-        $this->_pageRange = (integer) $pageRange;
-
-        return $this;
-    }
-
-    /**
-     * Returns the page collection.
-     *
-     * @param  string $scrollingStyle Scrolling style
-     * @return array
-     */
-    public function getPages($scrollingStyle = null)
-    {
-        if ($this->_pages === null) {
-            $this->_pages = $this->_createPages($scrollingStyle);
-        }
-
-        return $this->_pages;
-    }
-
-    /**
-     * Returns a subset of pages within a given range.
-     *
-     * @param  integer $lowerBound Lower bound of the range
-     * @param  integer $upperBound Upper bound of the range
-     * @return array
-     */
-    public function getPagesInRange($lowerBound, $upperBound)
-    {
-        $lowerBound = $this->normalizePageNumber($lowerBound);
-        $upperBound = $this->normalizePageNumber($upperBound);
-
-        $pages = array();
-
-        for ($pageNumber = $lowerBound; $pageNumber <= $upperBound; $pageNumber++) {
-            $pages[$pageNumber] = $pageNumber;
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Returns the page item cache.
-     *
-     * @return array
-     */
-    public function getPageItemCache()
-    {
-        $data = array();
-        if ($this->_cacheEnabled()) {
-            foreach (self::$_cache->getIdsMatchingTags(array($this->_getCacheInternalId())) as $id) {
-                    if (preg_match('|'.self::CACHE_TAG_PREFIX."(\d+)_.*|", $id, $page)) {
-                        $data[$page[1]] = self::$_cache->load($this->_getCacheId($page[1]));
-                    }
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Retrieves the view instance.  If none registered, attempts to pull f
-     * rom ViewRenderer.
-     *
-     * @return Zend_View_Interface|null
-     */
-    public function getView()
-    {
-        if ($this->_view === null) {
-            /**
-             * @see Zend_Controller_Action_HelperBroker
-             */
-            require_once 'Zend/Controller/Action/HelperBroker.php';
-
-            $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-            if ($viewRenderer->view === null) {
-                $viewRenderer->initView();
-            }
-            $this->_view = $viewRenderer->view;
-        }
-
-        return $this->_view;
-    }
-
-    /**
-     * Sets the view object.
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_Paginator
-     */
-    public function setView(Zend_View_Interface $view = null)
-    {
-        $this->_view = $view;
-
-        return $this;
-    }
-
-    /**
-     * Brings the item number in range of the page.
-     *
-     * @param  integer $itemNumber
-     * @return integer
-     */
-    public function normalizeItemNumber($itemNumber)
-    {
-        if ($itemNumber < 1) {
-            $itemNumber = 1;
-        }
-
-        if ($itemNumber > $this->getItemCountPerPage()) {
-            $itemNumber = $this->getItemCountPerPage();
-        }
-
-        return $itemNumber;
-    }
-
-    /**
-     * Brings the page number in range of the paginator.
-     *
-     * @param  integer $pageNumber
-     * @return integer
-     */
-    public function normalizePageNumber($pageNumber)
-    {
-        if ($pageNumber < 1) {
-            $pageNumber = 1;
-        }
-
-        $pageCount = $this->count();
-
-        if ($pageCount > 0 && $pageNumber > $pageCount) {
-            $pageNumber = $pageCount;
-        }
-
-        return $pageNumber;
-    }
-
-    /**
-     * Renders the paginator.
-     *
-     * @param  Zend_View_Interface $view
-     * @return string
-     */
-    public function render(Zend_View_Interface $view = null)
-    {
-        if (null !== $view) {
-            $this->setView($view);
-        }
-
-        $view = $this->getView();
-
-        return $view->paginationControl($this);
-    }
-
-    /**
-     * Returns the items of the current page as JSON.
-     *
-     * @return string
-     */
-    public function toJson()
-    {
-        $currentItems = $this->getCurrentItems();
-
-        if ($currentItems instanceof Zend_Db_Table_Rowset_Abstract) {
-            return Zend_Json::encode($currentItems->toArray());
-        } else {
-            return Zend_Json::encode($currentItems);
-        }
-    }
-
-    /**
-     * Tells if there is an active cache object
-     * and if the cache has not been desabled
-     *
-     * @return bool
-     */
-    protected function _cacheEnabled()
-    {
-        return ((self::$_cache !== null) && $this->_cacheEnabled);
-    }
-
-    /**
-     * Makes an Id for the cache
-     * Depends on the adapter object and the page number
-     *
-     * Used to store item in cache from that Paginator instance
-     *  and that current page
-     *
-     * @param int $page
-     * @return string
-     */
-    protected function _getCacheId($page = null)
-    {
-        if ($page === null) {
-            $page = $this->getCurrentPageNumber();
-        }
-        return self::CACHE_TAG_PREFIX . $page . '_' . $this->_getCacheInternalId();
-    }
-
-    /**
-     * Get the internal cache id
-     * Depends on the adapter and the item count per page
-     *
-     * Used to tag that unique Paginator instance in cache
-     *
-     * @return string
-     */
-    protected function _getCacheInternalId()
-    {
-        return md5(serialize($this->getAdapter()) . $this->getItemCountPerPage());
-    }
-
-    /**
-     * Calculates the page count.
-     *
-     * @return integer
-     */
-    protected function _calculatePageCount()
-    {
-        return (integer) ceil($this->getAdapter()->count() / $this->getItemCountPerPage());
-    }
-
-    /**
-     * Creates the page collection.
-     *
-     * @param  string $scrollingStyle Scrolling style
-     * @return stdClass
-     */
-    protected function _createPages($scrollingStyle = null)
-    {
-        $pageCount         = $this->count();
-        $currentPageNumber = $this->getCurrentPageNumber();
-
-        $pages = new stdClass();
-        $pages->pageCount        = $pageCount;
-        $pages->itemCountPerPage = $this->getItemCountPerPage();
-        $pages->first            = 1;
-        $pages->current          = $currentPageNumber;
-        $pages->last             = $pageCount;
-
-        // Previous and next
-        if ($currentPageNumber - 1 > 0) {
-            $pages->previous = $currentPageNumber - 1;
-        }
-
-        if ($currentPageNumber + 1 <= $pageCount) {
-            $pages->next = $currentPageNumber + 1;
-        }
-
-        // Pages in range
-        $scrollingStyle = $this->_loadScrollingStyle($scrollingStyle);
-        $pages->pagesInRange     = $scrollingStyle->getPages($this);
-        $pages->firstPageInRange = min($pages->pagesInRange);
-        $pages->lastPageInRange  = max($pages->pagesInRange);
-
-        // Item numbers
-        if ($this->getCurrentItems() !== null) {
-            $pages->currentItemCount = $this->getCurrentItemCount();
-            $pages->itemCountPerPage = $this->getItemCountPerPage();
-            $pages->totalItemCount   = $this->getTotalItemCount();
-            $pages->firstItemNumber  = (($currentPageNumber - 1) * $this->getItemCountPerPage()) + 1;
-            $pages->lastItemNumber   = $pages->firstItemNumber + $pages->currentItemCount - 1;
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Loads a scrolling style.
-     *
-     * @param string $scrollingStyle
-     * @return Zend_Paginator_ScrollingStyle_Interface
-     */
-    protected function _loadScrollingStyle($scrollingStyle = null)
-    {
-        if ($scrollingStyle === null) {
-            $scrollingStyle = self::$_defaultScrollingStyle;
-        }
-
-        switch (strtolower(gettype($scrollingStyle))) {
-            case 'object':
-                if (!$scrollingStyle instanceof Zend_Paginator_ScrollingStyle_Interface) {
-                    /**
-                     * @see Zend_View_Exception
-                     */
-                    require_once 'Zend/View/Exception.php';
-
-                    throw new Zend_View_Exception('Scrolling style must implement ' .
-                        'Zend_Paginator_ScrollingStyle_Interface');
-                }
-
-                return $scrollingStyle;
-
-            case 'string':
-                $className = self::getScrollingStyleLoader()->load($scrollingStyle);
-
-                return new $className();
-
-            case 'null':
-                // Fall through to default case
-
-            default:
-                /**
-                 * @see Zend_View_Exception
-                 */
-                require_once 'Zend/View/Exception.php';
-
-                throw new Zend_View_Exception('Scrolling style must be a class ' .
-                    'name or object implementing Zend_Paginator_ScrollingStyle_Interface');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/Array.php b/airtime_mvc/library/Zend/Paginator/Adapter/Array.php
deleted file mode 100644
index 570a505a4..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/Array.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_Adapter_Interface
- */
-require_once 'Zend/Paginator/Adapter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Adapter_Array implements Zend_Paginator_Adapter_Interface
-{
-    /**
-     * Array
-     *
-     * @var array
-     */
-    protected $_array = null;
-
-    /**
-     * Item count
-     *
-     * @var integer
-     */
-    protected $_count = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $array Array to paginate
-     */
-    public function __construct(array $array)
-    {
-        $this->_array = $array;
-        $this->_count = count($array);
-    }
-
-    /**
-     * Returns an array of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        return array_slice($this->_array, $offset, $itemCountPerPage);
-    }
-
-    /**
-     * Returns the total number of rows in the array.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_count;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/DbSelect.php b/airtime_mvc/library/Zend/Paginator/Adapter/DbSelect.php
deleted file mode 100644
index 91bf3bc7d..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/DbSelect.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_Adapter_Interface
- */
-require_once 'Zend/Paginator/Adapter/Interface.php';
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @see Zend_Db_Select
- */
-require_once 'Zend/Db/Select.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Adapter_DbSelect implements Zend_Paginator_Adapter_Interface
-{
-    /**
-     * Name of the row count column
-     *
-     * @var string
-     */
-    const ROW_COUNT_COLUMN = 'zend_paginator_row_count';
-
-    /**
-     * The COUNT query
-     *
-     * @var Zend_Db_Select
-     */
-    protected $_countSelect = null;
-
-    /**
-     * Database query
-     *
-     * @var Zend_Db_Select
-     */
-    protected $_select = null;
-
-    /**
-     * Total item count
-     *
-     * @var integer
-     */
-    protected $_rowCount = null;
-
-    /**
-     * Constructor.
-     *
-     * @param Zend_Db_Select $select The select query
-     */
-    public function __construct(Zend_Db_Select $select)
-    {
-        $this->_select = $select;
-    }
-
-    /**
-     * Sets the total row count, either directly or through a supplied
-     * query.  Without setting this, {@link getPages()} selects the count
-     * as a subquery (SELECT COUNT ... FROM (SELECT ...)).  While this
-     * yields an accurate count even with queries containing clauses like
-     * LIMIT, it can be slow in some circumstances.  For example, in MySQL,
-     * subqueries are generally slow when using the InnoDB storage engine.
-     * Users are therefore encouraged to profile their queries to find
-     * the solution that best meets their needs.
-     *
-     * @param  Zend_Db_Select|integer $totalRowCount Total row count integer
-     *                                               or query
-     * @return Zend_Paginator_Adapter_DbSelect $this
-     * @throws Zend_Paginator_Exception
-     */
-    public function setRowCount($rowCount)
-    {
-        if ($rowCount instanceof Zend_Db_Select) {
-            $columns = $rowCount->getPart(Zend_Db_Select::COLUMNS);
-
-            $countColumnPart = $columns[0][1];
-
-            if ($countColumnPart instanceof Zend_Db_Expr) {
-                $countColumnPart = $countColumnPart->__toString();
-            }
-
-            $rowCountColumn = $this->_select->getAdapter()->foldCase(self::ROW_COUNT_COLUMN);
-
-            // The select query can contain only one column, which should be the row count column
-            if (false === strpos($countColumnPart, $rowCountColumn)) {
-                /**
-                 * @see Zend_Paginator_Exception
-                 */
-                require_once 'Zend/Paginator/Exception.php';
-
-                throw new Zend_Paginator_Exception('Row count column not found');
-            }
-
-            $result = $rowCount->query(Zend_Db::FETCH_ASSOC)->fetch();
-
-            $this->_rowCount = count($result) > 0 ? $result[$rowCountColumn] : 0;
-        } else if (is_integer($rowCount)) {
-            $this->_rowCount = $rowCount;
-        } else {
-            /**
-             * @see Zend_Paginator_Exception
-             */
-            require_once 'Zend/Paginator/Exception.php';
-
-            throw new Zend_Paginator_Exception('Invalid row count');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns an array of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        $this->_select->limit($itemCountPerPage, $offset);
-
-        return $this->_select->query()->fetchAll();
-    }
-
-    /**
-     * Returns the total number of rows in the result set.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        if ($this->_rowCount === null) {
-            $this->setRowCount(
-                $this->getCountSelect()
-            );
-        }
-
-        return $this->_rowCount;
-    }
-
-    /**
-     * Get the COUNT select object for the provided query
-     *
-     * TODO: Have a look at queries that have both GROUP BY and DISTINCT specified.
-     * In that use-case I'm expecting problems when either GROUP BY or DISTINCT
-     * has one column.
-     *
-     * @return Zend_Db_Select
-     */
-    public function getCountSelect()
-    {
-        /**
-         * We only need to generate a COUNT query once. It will not change for
-         * this instance.
-         */
-        if ($this->_countSelect !== null) {
-            return $this->_countSelect;
-        }
-
-        $rowCount = clone $this->_select;
-        $rowCount->__toString(); // Workaround for ZF-3719 and related
-
-        $db = $rowCount->getAdapter();
-
-        $countColumn = $db->quoteIdentifier($db->foldCase(self::ROW_COUNT_COLUMN));
-        $countPart   = 'COUNT(1) AS ';
-        $groupPart   = null;
-        $unionParts  = $rowCount->getPart(Zend_Db_Select::UNION);
-
-        /**
-         * If we're dealing with a UNION query, execute the UNION as a subquery
-         * to the COUNT query.
-         */
-        if (!empty($unionParts)) {
-            $expression = new Zend_Db_Expr($countPart . $countColumn);
-
-            $rowCount = $db->select()->from($rowCount, $expression);
-        } else {
-            $columnParts = $rowCount->getPart(Zend_Db_Select::COLUMNS);
-            $groupParts  = $rowCount->getPart(Zend_Db_Select::GROUP);
-            $havingParts = $rowCount->getPart(Zend_Db_Select::HAVING);
-            $isDistinct  = $rowCount->getPart(Zend_Db_Select::DISTINCT);
-
-            /**
-             * If there is more than one column AND it's a DISTINCT query, more
-             * than one group, or if the query has a HAVING clause, then take
-             * the original query and use it as a subquery os the COUNT query.
-             */
-            if (($isDistinct && count($columnParts) > 1) || count($groupParts) > 1 || !empty($havingParts)) {
-                $rowCount = $db->select()->from($this->_select);
-            } else if ($isDistinct) {
-                $part = $columnParts[0];
-
-                if ($part[1] !== Zend_Db_Select::SQL_WILDCARD && !($part[1] instanceof Zend_Db_Expr)) {
-                    $column = $db->quoteIdentifier($part[1], true);
-
-                    if (!empty($part[0])) {
-                        $column = $db->quoteIdentifier($part[0], true) . '.' . $column;
-                    }
-
-                    $groupPart = $column;
-                }
-            } else if (!empty($groupParts) && $groupParts[0] !== Zend_Db_Select::SQL_WILDCARD &&
-                       !($groupParts[0] instanceof Zend_Db_Expr)) {
-                $groupPart = $db->quoteIdentifier($groupParts[0], true);
-            }
-
-            /**
-             * If the original query had a GROUP BY or a DISTINCT part and only
-             * one column was specified, create a COUNT(DISTINCT ) query instead
-             * of a regular COUNT query.
-             */
-            if (!empty($groupPart)) {
-                $countPart = 'COUNT(DISTINCT ' . $groupPart . ') AS ';
-            }
-
-            /**
-             * Create the COUNT part of the query
-             */
-            $expression = new Zend_Db_Expr($countPart . $countColumn);
-
-            $rowCount->reset(Zend_Db_Select::COLUMNS)
-                     ->reset(Zend_Db_Select::ORDER)
-                     ->reset(Zend_Db_Select::LIMIT_OFFSET)
-                     ->reset(Zend_Db_Select::GROUP)
-                     ->reset(Zend_Db_Select::DISTINCT)
-                     ->reset(Zend_Db_Select::HAVING)
-                     ->columns($expression);
-        }
-
-        $this->_countSelect = $rowCount;
-
-        return $rowCount;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/DbTableSelect.php b/airtime_mvc/library/Zend/Paginator/Adapter/DbTableSelect.php
deleted file mode 100644
index e60ddca94..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/DbTableSelect.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTableSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_Adapter_DbSelect
- */
-require_once 'Zend/Paginator/Adapter/DbSelect.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Adapter_DbTableSelect extends Zend_Paginator_Adapter_DbSelect
-{
-    /**
-     * Returns a Zend_Db_Table_Rowset_Abstract of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return Zend_Db_Table_Rowset_Abstract
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        $this->_select->limit($itemCountPerPage, $offset);
-
-        return $this->_select->getTable()->fetchAll($this->_select);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/Interface.php b/airtime_mvc/library/Zend/Paginator/Adapter/Interface.php
deleted file mode 100644
index bf8eea44a..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/Interface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for pagination adapters.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Paginator_Adapter_Interface extends Countable
-{
-    /**
-     * Returns the total number of rows in the collection.
-     *
-     * @return integer
-     */
-    //public function count();
-
-    /**
-     * Returns an collection of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage);
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/Iterator.php b/airtime_mvc/library/Zend/Paginator/Adapter/Iterator.php
deleted file mode 100644
index e4ef3c3fd..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/Iterator.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_Adapter_Interface
- */
-require_once 'Zend/Paginator/Adapter/Interface.php';
-
-/**
- * @see Zend_Paginator_SerializableLimitIterator
- */
-require_once 'Zend/Paginator/SerializableLimitIterator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Adapter_Iterator implements Zend_Paginator_Adapter_Interface
-{
-    /**
-     * Iterator which implements Countable
-     *
-     * @var Iterator
-     */
-    protected $_iterator = null;
-
-    /**
-     * Item count
-     *
-     * @var integer
-     */
-    protected $_count = null;
-
-    /**
-     * Constructor.
-     *
-     * @param  Iterator $iterator Iterator to paginate
-     * @throws Zend_Paginator_Exception
-     */
-    public function __construct(Iterator $iterator)
-    {
-        if (!$iterator instanceof Countable) {
-            /**
-             * @see Zend_Paginator_Exception
-             */
-            require_once 'Zend/Paginator/Exception.php';
-
-            throw new Zend_Paginator_Exception('Iterator must implement Countable');
-        }
-
-        $this->_iterator = $iterator;
-        $this->_count = count($iterator);
-    }
-
-    /**
-     * Returns an iterator of items for a page, or an empty array.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return LimitIterator|array
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        if ($this->_count == 0) {
-            return array();
-        }
-
-        // @link http://bugs.php.net/bug.php?id=49906 | ZF-8084
-        // return new LimitIterator($this->_iterator, $offset, $itemCountPerPage);
-        return new Zend_Paginator_SerializableLimitIterator($this->_iterator, $offset, $itemCountPerPage);
-    }
-
-    /**
-     * Returns the total number of rows in the collection.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_count;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/Adapter/Null.php b/airtime_mvc/library/Zend/Paginator/Adapter/Null.php
deleted file mode 100644
index 2097d9782..000000000
--- a/airtime_mvc/library/Zend/Paginator/Adapter/Null.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 21151 2010-02-23 16:34:14Z matthew $
- */
-
-/**
- * @see Zend_Paginator_Adapter_Interface
- */
-require_once 'Zend/Paginator/Adapter/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Adapter_Null implements Zend_Paginator_Adapter_Interface
-{
-    /**
-     * Item count
-     *
-     * @var integer
-     */
-    protected $_count = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $count Total item count
-     */
-    public function __construct($count = 0)
-    {
-        $this->_count = $count;
-    }
-
-    /**
-     * Returns an array of items for a page.
-     *
-     * @param  integer $offset Page offset
-     * @param  integer $itemCountPerPage Number of items per page
-     * @return array
-     */
-    public function getItems($offset, $itemCountPerPage)
-    {
-        if ($offset >= $this->count()) {
-            return array();
-        }
-
-        $remainItemCount  = $this->count() - $offset;
-        $currentItemCount = $remainItemCount > $itemCountPerPage ? $itemCountPerPage : $remainItemCount;
-
-        return array_fill(0, $currentItemCount, null);
-    }
-
-    /**
-     * Returns the total number of rows in the array.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_count;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/AdapterAggregate.php b/airtime_mvc/library/Zend/Paginator/AdapterAggregate.php
deleted file mode 100644
index 1020e0d86..000000000
--- a/airtime_mvc/library/Zend/Paginator/AdapterAggregate.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterAggregate.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface that aggregates a Zend_Paginator_Adapter_Abstract just like IteratorAggregate does for Iterators.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Paginator_AdapterAggregate
-{
-    /**
-     * Return a fully configured Paginator Adapter from this method.
-     *
-     * @return Zend_Paginator_Adapter_Abstract
-     */
-    public function getPaginatorAdapter();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/Exception.php b/airtime_mvc/library/Zend/Paginator/Exception.php
deleted file mode 100644
index 1aaec7845..000000000
--- a/airtime_mvc/library/Zend/Paginator/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/All.php b/airtime_mvc/library/Zend/Paginator/ScrollingStyle/All.php
deleted file mode 100644
index 5687b23c8..000000000
--- a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/All.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: All.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Interface
- */
-require_once 'Zend/Paginator/ScrollingStyle/Interface.php';
-
-/**
- * A scrolling style that returns every page in the collection.
- * Useful when it is necessary to make every page available at
- * once--for example, when using a dropdown menu pagination control.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_ScrollingStyle_All implements Zend_Paginator_ScrollingStyle_Interface
-{
-    /**
-     * Returns an array of all pages given a page number and range.
-     *
-     * @param  Zend_Paginator $paginator
-     * @param  integer $pageRange Unused
-     * @return array
-     */
-    public function getPages(Zend_Paginator $paginator, $pageRange = null)
-    {
-        return $paginator->getPagesInRange(1, $paginator->count());
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Elastic.php b/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Elastic.php
deleted file mode 100644
index 574f9c492..000000000
--- a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Elastic.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Elastic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Sliding
- */
-require_once 'Zend/Paginator/ScrollingStyle/Sliding.php';
-
-/**
- * A Google-like scrolling style.  Incrementally expands the range to about
- * twice the given page range, then behaves like a slider.  See the example
- * link.
- *
- * @link       http://www.google.com/search?q=Zend+Framework
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_ScrollingStyle_Elastic extends Zend_Paginator_ScrollingStyle_Sliding
-{
-    /**
-     * Returns an array of "local" pages given a page number and range.
-     *
-     * @param  Zend_Paginator $paginator
-     * @param  integer $pageRange Unused
-     * @return array
-     */
-    public function getPages(Zend_Paginator $paginator, $pageRange = null)
-    {
-        $pageRange  = $paginator->getPageRange();
-        $pageNumber = $paginator->getCurrentPageNumber();
-
-        $originalPageRange = $pageRange;
-        $pageRange         = $pageRange * 2 - 1;
-
-        if ($originalPageRange + $pageNumber - 1 < $pageRange) {
-            $pageRange = $originalPageRange + $pageNumber - 1;
-        } else if ($originalPageRange + $pageNumber - 1 > count($paginator)) {
-            $pageRange = $originalPageRange + count($paginator) - $pageNumber;
-        }
-
-        return parent::getPages($paginator, $pageRange);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Interface.php b/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Interface.php
deleted file mode 100644
index abdfbc486..000000000
--- a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Interface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Paginator_ScrollingStyle_Interface
-{
-    /**
-     * Returns an array of "local" pages given a page number and range.
-     *
-     * @param  Zend_Paginator $paginator
-     * @param  integer $pageRange (Optional) Page range
-     * @return array
-     */
-    public function getPages(Zend_Paginator $paginator, $pageRange = null);
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Jumping.php b/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Jumping.php
deleted file mode 100644
index 56525f043..000000000
--- a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Jumping.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Jumping.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Interface
- */
-require_once 'Zend/Paginator/ScrollingStyle/Interface.php';
-
-/**
- * A scrolling style in which the cursor advances to the upper bound
- * of the page range, the page range "jumps" to the next section, and
- * the cursor moves back to the beginning of the range.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_ScrollingStyle_Jumping implements Zend_Paginator_ScrollingStyle_Interface
-{
-    /**
-     * Returns an array of "local" pages given a page number and range.
-     *
-     * @param  Zend_Paginator $paginator
-     * @param  integer $pageRange Unused
-     * @return array
-     */
-    public function getPages(Zend_Paginator $paginator, $pageRange = null)
-    {
-        $pageRange  = $paginator->getPageRange();
-        $pageNumber = $paginator->getCurrentPageNumber();
-
-        $delta = $pageNumber % $pageRange;
-
-        if ($delta == 0) {
-            $delta = $pageRange;
-        }
-
-        $offset     = $pageNumber - $delta;
-        $lowerBound = $offset + 1;
-        $upperBound = $offset + $pageRange;
-
-        return $paginator->getPagesInRange($lowerBound, $upperBound);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Sliding.php b/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Sliding.php
deleted file mode 100644
index 535ad936a..000000000
--- a/airtime_mvc/library/Zend/Paginator/ScrollingStyle/Sliding.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sliding.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Paginator_ScrollingStyle_Interface
- */
-require_once 'Zend/Paginator/ScrollingStyle/Interface.php';
-
-/**
- * A Yahoo! Search-like scrolling style.  The cursor will advance to
- * the middle of the range, then remain there until the user reaches
- * the end of the page set, at which point it will continue on to
- * the end of the range and the last page in the set.
- *
- * @link       http://search.yahoo.com/search?p=Zend+Framework
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_ScrollingStyle_Sliding implements Zend_Paginator_ScrollingStyle_Interface
-{
-    /**
-     * Returns an array of "local" pages given a page number and range.
-     *
-     * @param  Zend_Paginator $paginator
-     * @param  integer $pageRange (Optional) Page range
-     * @return array
-     */
-    public function getPages(Zend_Paginator $paginator, $pageRange = null)
-    {
-        if ($pageRange === null) {
-            $pageRange = $paginator->getPageRange();
-        }
-
-        $pageNumber = $paginator->getCurrentPageNumber();
-        $pageCount  = count($paginator);
-
-        if ($pageRange > $pageCount) {
-            $pageRange = $pageCount;
-        }
-
-        $delta = ceil($pageRange / 2);
-
-        if ($pageNumber - $delta > $pageCount - $pageRange) {
-            $lowerBound = $pageCount - $pageRange + 1;
-            $upperBound = $pageCount;
-        } else {
-            if ($pageNumber - $delta < 0) {
-                $delta = $pageNumber;
-            }
-
-            $offset     = $pageNumber - $delta;
-            $lowerBound = $offset + 1;
-            $upperBound = $offset + $pageRange;
-        }
-
-        return $paginator->getPagesInRange($lowerBound, $upperBound);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Paginator/SerializableLimitIterator.php b/airtime_mvc/library/Zend/Paginator/SerializableLimitIterator.php
deleted file mode 100644
index 4055d3d19..000000000
--- a/airtime_mvc/library/Zend/Paginator/SerializableLimitIterator.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 17687 2009-08-20 12:55:34Z thomas $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Paginator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Paginator_SerializableLimitIterator extends LimitIterator implements Serializable
-{
-
-    /**
-     * Offset to first element
-     *
-     * @var int
-     */
-    private $_offset;
-
-    /**
-     * Maximum number of elements to show or -1 for all
-     *
-     * @var int
-     */
-    private $_count;
-
-    /**
-     * Construct a Zend_Paginator_SerializableLimitIterator
-     *
-     * @param Iterator $it Iterator to limit (must be serializable by un-/serialize)
-     * @param int $offset Offset to first element
-     * @param int $count Maximum number of elements to show or -1 for all
-     * @see LimitIterator::__construct
-     */
-    public function __construct (Iterator $it, $offset=0, $count=-1)
-    {
-        parent::__construct($it, $offset, $count);
-        $this->_offset = $offset;
-        $this->_count = $count;
-    }
-
-    /**
-     * @return string representation of the instance
-     */
-    public function serialize()
-    {
-        return serialize(array(
-            'it'     => $this->getInnerIterator(),
-            'offset' => $this->_offset,
-            'count'  => $this->_count,
-            'pos'    => $this->getPosition(),
-        ));
-    }
-
-    /**
-     * @param string $data representation of the instance
-     */
-    public function unserialize($data)
-    {
-        $dataArr = unserialize($data);
-        $this->__construct($dataArr['it'], $dataArr['offset'], $dataArr['count']);
-        $this->seek($dataArr['pos']+$dataArr['offset']);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf.php b/airtime_mvc/library/Zend/Pdf.php
deleted file mode 100644
index 436aa5c68..000000000
--- a/airtime_mvc/library/Zend/Pdf.php
+++ /dev/null
@@ -1,1404 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pdf.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** User land classes and interfaces turned on by Zend/Pdf.php file inclusion. */
-/** @todo Section should be removed with ZF 2.0 release as obsolete            */
-
-/** Zend_Pdf_Page */
-require_once 'Zend/Pdf/Page.php';
-
-/** Zend_Pdf_Style */
-require_once 'Zend/Pdf/Style.php';
-
-/** Zend_Pdf_Color_GrayScale */
-require_once 'Zend/Pdf/Color/GrayScale.php';
-
-/** Zend_Pdf_Color_Rgb */
-require_once 'Zend/Pdf/Color/Rgb.php';
-
-/** Zend_Pdf_Color_Cmyk */
-require_once 'Zend/Pdf/Color/Cmyk.php';
-
-/** Zend_Pdf_Color_Html */
-require_once 'Zend/Pdf/Color/Html.php';
-
-/** Zend_Pdf_Image */
-require_once 'Zend/Pdf/Image.php';
-
-/** Zend_Pdf_Font */
-require_once 'Zend/Pdf/Font.php';
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/String/Binary.php';
-require_once 'Zend/Pdf/Element/Boolean.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Null.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/**
- * General entity which describes PDF document.
- * It implements document abstraction with a document level operations.
- *
- * Class is used to create new PDF document or load existing document.
- * See details in a class constructor description
- *
- * Class agregates document level properties and entities (pages, bookmarks,
- * document level actions, attachments, form object, etc)
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf
-{
-  /**** Class Constants ****/
-
-    /**
-     * Version number of generated PDF documents.
-     */
-    const PDF_VERSION = '1.4';
-
-    /**
-     * PDF file header.
-     */
-    const PDF_HEADER  = "%PDF-1.4\n%\xE2\xE3\xCF\xD3\n";
-
-
-
-    /**
-     * Pages collection
-     *
-     * @todo implement it as a class, which supports ArrayAccess and Iterator interfaces,
-     *       to provide incremental parsing and pages tree updating.
-     *       That will give good performance and memory (PDF size) benefits.
-     *
-     * @var array   - array of Zend_Pdf_Page object
-     */
-    public $pages = array();
-
-    /**
-     * Document properties
-     *
-     * It's an associative array with PDF meta information, values may
-     * be string, boolean or float.
-     * Returned array could be used directly to access, add, modify or remove
-     * document properties.
-     *
-     * Standard document properties: Title (must be set for PDF/X documents), Author,
-     * Subject, Keywords (comma separated list), Creator (the name of the application,
-     * that created document, if it was converted from other format), Trapped (must be
-     * true, false or null, can not be null for PDF/X documents)
-     *
-     * @var array
-     */
-    public $properties = array();
-
-    /**
-     * Original properties set.
-     *
-     * Used for tracking properties changes
-     *
-     * @var array
-     */
-    protected $_originalProperties = array();
-
-    /**
-     * Document level javascript
-     *
-     * @var string
-     */
-    protected $_javaScript = null;
-
-    /**
-     * Document named destinations or "GoTo..." actions, used to refer
-     * document parts from outside PDF
-     *
-     * @var array   - array of Zend_Pdf_Target objects
-     */
-    protected $_namedTargets = array();
-
-    /**
-     * Document outlines
-     *
-     * @var array - array of Zend_Pdf_Outline objects
-     */
-    public $outlines = array();
-
-    /**
-     * Original document outlines list
-     * Used to track outlines update
-     *
-     * @var array - array of Zend_Pdf_Outline objects
-     */
-    protected $_originalOutlines = array();
-
-    /**
-     * Original document outlines open elements count
-     * Used to track outlines update
-     *
-     * @var integer
-     */
-    protected $_originalOpenOutlinesCount = 0;
-
-    /**
-     * Pdf trailer (last or just created)
-     *
-     * @var Zend_Pdf_Trailer
-     */
-    protected $_trailer = null;
-
-    /**
-     * PDF objects factory.
-     *
-     * @var Zend_Pdf_ElementFactory_Interface
-     */
-    protected $_objFactory = null;
-
-    /**
-     * Memory manager for stream objects
-     *
-     * @var Zend_Memory_Manager|null
-     */
-    protected static $_memoryManager = null;
-
-    /**
-     * Pdf file parser.
-     * It's not used, but has to be destroyed only with Zend_Pdf object
-     *
-     * @var Zend_Pdf_Parser
-     */
-    protected $_parser;
-
-
-    /**
-     * List of inheritable attributesfor pages tree
-     *
-     * @var array
-     */
-    protected static $_inheritableAttributes = array('Resources', 'MediaBox', 'CropBox', 'Rotate');
-
-    /**
-     * Request used memory manager
-     *
-     * @return Zend_Memory_Manager
-     */
-    static public function getMemoryManager()
-    {
-        if (self::$_memoryManager === null) {
-            require_once 'Zend/Memory.php';
-            self::$_memoryManager = Zend_Memory::factory('none');
-        }
-
-        return self::$_memoryManager;
-    }
-
-    /**
-     * Set user defined memory manager
-     *
-     * @param Zend_Memory_Manager $memoryManager
-     */
-    static public function setMemoryManager(Zend_Memory_Manager $memoryManager)
-    {
-        self::$_memoryManager = $memoryManager;
-    }
-
-
-    /**
-     * Create new PDF document from a $source string
-     *
-     * @param string $source
-     * @param integer $revision
-     * @return Zend_Pdf
-     */
-    public static function parse(&$source = null, $revision = null)
-    {
-        return new Zend_Pdf($source, $revision);
-    }
-
-    /**
-     * Load PDF document from a file
-     *
-     * @param string $source
-     * @param integer $revision
-     * @return Zend_Pdf
-     */
-    public static function load($source = null, $revision = null)
-    {
-        return new Zend_Pdf($source, $revision, true);
-    }
-
-    /**
-     * Render PDF document and save it.
-     *
-     * If $updateOnly is true, then it only appends new section to the end of file.
-     *
-     * @param string $filename
-     * @param boolean $updateOnly
-     * @throws Zend_Pdf_Exception
-     */
-    public function save($filename, $updateOnly = false)
-    {
-        if (($file = @fopen($filename, $updateOnly ? 'ab':'wb')) === false ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Can not open '$filename' file for writing." );
-        }
-
-        $this->render($updateOnly, $file);
-
-        fclose($file);
-    }
-
-    /**
-     * Creates or loads PDF document.
-     *
-     * If $source is null, then it creates a new document.
-     *
-     * If $source is a string and $load is false, then it loads document
-     * from a binary string.
-     *
-     * If $source is a string and $load is true, then it loads document
-     * from a file.
-
-     * $revision used to roll back document to specified version
-     * (0 - currtent version, 1 - previous version, 2 - ...)
-     *
-     * @param string  $source - PDF file to load
-     * @param integer $revision
-     * @throws Zend_Pdf_Exception
-     * @return Zend_Pdf
-     */
-    public function __construct($source = null, $revision = null, $load = false)
-    {
-        require_once 'Zend/Pdf/ElementFactory.php';
-        $this->_objFactory = Zend_Pdf_ElementFactory::createFactory(1);
-
-        if ($source !== null) {
-            require_once 'Zend/Pdf/Parser.php';
-            $this->_parser           = new Zend_Pdf_Parser($source, $this->_objFactory, $load);
-            $this->_pdfHeaderVersion = $this->_parser->getPDFVersion();
-            $this->_trailer          = $this->_parser->getTrailer();
-            if ($this->_trailer->Encrypt !== null) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Encrypted document modification is not supported');
-            }
-            if ($revision !== null) {
-                $this->rollback($revision);
-            } else {
-                $this->_loadPages($this->_trailer->Root->Pages);
-            }
-
-            $this->_loadNamedDestinations($this->_trailer->Root, $this->_parser->getPDFVersion());
-            $this->_loadOutlines($this->_trailer->Root);
-
-            if ($this->_trailer->Info !== null) {
-                $this->properties = $this->_trailer->Info->toPhp();
-
-                if (isset($this->properties['Trapped'])) {
-                    switch ($this->properties['Trapped']) {
-                        case 'True':
-                            $this->properties['Trapped'] = true;
-                            break;
-
-                        case 'False':
-                            $this->properties['Trapped'] = false;
-                            break;
-
-                        case 'Unknown':
-                            $this->properties['Trapped'] = null;
-                            break;
-
-                        default:
-                            // Wrong property value
-                            // Do nothing
-                            break;
-                    }
-                }
-
-                $this->_originalProperties = $this->properties;
-            }
-        } else {
-            $this->_pdfHeaderVersion = Zend_Pdf::PDF_VERSION;
-
-            $trailerDictionary = new Zend_Pdf_Element_Dictionary();
-
-            /**
-             * Document id
-             */
-            $docId = md5(uniqid(rand(), true));   // 32 byte (128 bit) identifier
-            $docIdLow  = substr($docId,  0, 16);  // first 16 bytes
-            $docIdHigh = substr($docId, 16, 16);  // second 16 bytes
-
-            $trailerDictionary->ID = new Zend_Pdf_Element_Array();
-            $trailerDictionary->ID->items[] = new Zend_Pdf_Element_String_Binary($docIdLow);
-            $trailerDictionary->ID->items[] = new Zend_Pdf_Element_String_Binary($docIdHigh);
-
-            $trailerDictionary->Size = new Zend_Pdf_Element_Numeric(0);
-
-            require_once 'Zend/Pdf/Trailer/Generator.php';
-            $this->_trailer = new Zend_Pdf_Trailer_Generator($trailerDictionary);
-
-            /**
-             * Document catalog indirect object.
-             */
-            $docCatalog = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-            $docCatalog->Type    = new Zend_Pdf_Element_Name('Catalog');
-            $docCatalog->Version = new Zend_Pdf_Element_Name(Zend_Pdf::PDF_VERSION);
-            $this->_trailer->Root = $docCatalog;
-
-            /**
-             * Pages container
-             */
-            $docPages = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-            $docPages->Type  = new Zend_Pdf_Element_Name('Pages');
-            $docPages->Kids  = new Zend_Pdf_Element_Array();
-            $docPages->Count = new Zend_Pdf_Element_Numeric(0);
-            $docCatalog->Pages = $docPages;
-        }
-    }
-
-    /**
-     * Retrive number of revisions.
-     *
-     * @return integer
-     */
-    public function revisions()
-    {
-        $revisions = 1;
-        $currentTrailer = $this->_trailer;
-
-        while ($currentTrailer->getPrev() !== null && $currentTrailer->getPrev()->Root !== null ) {
-            $revisions++;
-            $currentTrailer = $currentTrailer->getPrev();
-        }
-
-        return $revisions++;
-    }
-
-    /**
-     * Rollback document $steps number of revisions.
-     * This method must be invoked before any changes, applied to the document.
-     * Otherwise behavior is undefined.
-     *
-     * @param integer $steps
-     */
-    public function rollback($steps)
-    {
-        for ($count = 0; $count < $steps; $count++) {
-            if ($this->_trailer->getPrev() !== null && $this->_trailer->getPrev()->Root !== null) {
-                $this->_trailer = $this->_trailer->getPrev();
-            } else {
-                break;
-            }
-        }
-        $this->_objFactory->setObjectCount($this->_trailer->Size->value);
-
-        // Mark content as modified to force new trailer generation at render time
-        $this->_trailer->Root->touch();
-
-        $this->pages = array();
-        $this->_loadPages($this->_trailer->Root->Pages);
-    }
-
-
-    /**
-     * Load pages recursively
-     *
-     * @param Zend_Pdf_Element_Reference $pages
-     * @param array|null $attributes
-     */
-    protected function _loadPages(Zend_Pdf_Element_Reference $pages, $attributes = array())
-    {
-        if ($pages->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong argument');
-        }
-
-        foreach ($pages->getKeys() as $property) {
-            if (in_array($property, self::$_inheritableAttributes)) {
-                $attributes[$property] = $pages->$property;
-                $pages->$property = null;
-            }
-        }
-
-
-        foreach ($pages->Kids->items as $child) {
-            if ($child->Type->value == 'Pages') {
-                $this->_loadPages($child, $attributes);
-            } else if ($child->Type->value == 'Page') {
-                foreach (self::$_inheritableAttributes as $property) {
-                    if ($child->$property === null && array_key_exists($property, $attributes)) {
-                        /**
-                         * Important note.
-                         * If any attribute or dependant object is an indirect object, then it's still
-                         * shared between pages.
-                         */
-                        if ($attributes[$property] instanceof Zend_Pdf_Element_Object  ||
-                            $attributes[$property] instanceof Zend_Pdf_Element_Reference) {
-                            $child->$property = $attributes[$property];
-                        } else {
-                            $child->$property = $this->_objFactory->newObject($attributes[$property]);
-                        }
-                    }
-                }
-
-                require_once 'Zend/Pdf/Page.php';
-                $this->pages[] = new Zend_Pdf_Page($child, $this->_objFactory);
-            }
-        }
-    }
-
-    /**
-     * Load named destinations recursively
-     *
-     * @param Zend_Pdf_Element_Reference $root Document catalog entry
-     * @param string $pdfHeaderVersion
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _loadNamedDestinations(Zend_Pdf_Element_Reference $root, $pdfHeaderVersion)
-    {
-        if ($root->Version !== null  &&  version_compare($root->Version->value, $pdfHeaderVersion, '>')) {
-            $versionIs_1_2_plus = version_compare($root->Version->value,    '1.1', '>');
-        } else {
-            $versionIs_1_2_plus = version_compare($pdfHeaderVersion, '1.1', '>');
-        }
-
-        if ($versionIs_1_2_plus) {
-            // PDF version is 1.2+
-            // Look for Destinations structure at Name dictionary
-            if ($root->Names !== null  &&  $root->Names->Dests !== null) {
-                require_once 'Zend/Pdf/NameTree.php';
-                require_once 'Zend/Pdf/Target.php';
-                foreach (new Zend_Pdf_NameTree($root->Names->Dests) as $name => $destination) {
-                    $this->_namedTargets[$name] = Zend_Pdf_Target::load($destination);
-                }
-            }
-        } else {
-            // PDF version is 1.1 (or earlier)
-            // Look for Destinations sructure at Dest entry of document catalog
-            if ($root->Dests !== null) {
-                if ($root->Dests->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Document catalog Dests entry must be a dictionary.');
-                }
-
-                require_once 'Zend/Pdf/Target.php';
-                foreach ($root->Dests->getKeys() as $destKey) {
-                    $this->_namedTargets[$destKey] = Zend_Pdf_Target::load($root->Dests->$destKey);
-                }
-            }
-        }
-    }
-
-    /**
-     * Load outlines recursively
-     *
-     * @param Zend_Pdf_Element_Reference $root Document catalog entry
-     */
-    protected function _loadOutlines(Zend_Pdf_Element_Reference $root)
-    {
-        if ($root->Outlines === null) {
-            return;
-        }
-
-        if ($root->Outlines->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Document catalog Outlines entry must be a dictionary.');
-        }
-
-        if ($root->Outlines->Type !== null  &&  $root->Outlines->Type->value != 'Outlines') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Outlines Type entry must be an \'Outlines\' string.');
-        }
-
-        if ($root->Outlines->First === null) {
-            return;
-        }
-
-        $outlineDictionary = $root->Outlines->First;
-        $processedDictionaries = new SplObjectStorage();
-        while ($outlineDictionary !== null  &&  !$processedDictionaries->contains($outlineDictionary)) {
-            $processedDictionaries->attach($outlineDictionary);
-
-            require_once 'Zend/Pdf/Outline/Loaded.php';
-            $this->outlines[] = new Zend_Pdf_Outline_Loaded($outlineDictionary);
-
-            $outlineDictionary = $outlineDictionary->Next;
-        }
-
-        $this->_originalOutlines = $this->outlines;
-
-        if ($root->Outlines->Count !== null) {
-            $this->_originalOpenOutlinesCount = $root->Outlines->Count->value;
-        }
-    }
-
-    /**
-     * Orginize pages to tha pages tree structure.
-     *
-     * @todo atomatically attach page to the document, if it's not done yet.
-     * @todo check, that page is attached to the current document
-     *
-     * @todo Dump pages as a balanced tree instead of a plain set.
-     */
-    protected function _dumpPages()
-    {
-        $root = $this->_trailer->Root;
-        $pagesContainer = $root->Pages;
-
-        $pagesContainer->touch();
-        $pagesContainer->Kids->items = array();
-
-        foreach ($this->pages as $page ) {
-            $page->render($this->_objFactory);
-
-            $pageDictionary = $page->getPageDictionary();
-            $pageDictionary->touch();
-            $pageDictionary->Parent = $pagesContainer;
-
-            $pagesContainer->Kids->items[] = $pageDictionary;
-        }
-
-        $this->_refreshPagesHash();
-
-        $pagesContainer->Count->touch();
-        $pagesContainer->Count->value = count($this->pages);
-
-
-        // Refresh named destinations list
-        foreach ($this->_namedTargets as $name => $namedTarget) {
-            if ($namedTarget instanceof Zend_Pdf_Destination_Explicit) {
-                // Named target is an explicit destination
-                if ($this->resolveDestination($namedTarget, false) === null) {
-                    unset($this->_namedTargets[$name]);
-                }
-            } else if ($namedTarget instanceof Zend_Pdf_Action) {
-                // Named target is an action
-                if ($this->_cleanUpAction($namedTarget, false) === null) {
-                    // Action is a GoTo action with an unresolved destination
-                    unset($this->_namedTargets[$name]);
-                }
-            } else {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Wrong type of named targed (\'' . get_class($namedTarget) . '\').');
-            }
-        }
-
-        // Refresh outlines
-        require_once 'Zend/Pdf/RecursivelyIteratableObjectsContainer.php';
-        $iterator = new RecursiveIteratorIterator(new Zend_Pdf_RecursivelyIteratableObjectsContainer($this->outlines), RecursiveIteratorIterator::SELF_FIRST);
-        foreach ($iterator as $outline) {
-            $target = $outline->getTarget();
-
-            if ($target !== null) {
-                if ($target instanceof Zend_Pdf_Destination) {
-                    // Outline target is a destination
-                    if ($this->resolveDestination($target, false) === null) {
-                        $outline->setTarget(null);
-                    }
-                } else if ($target instanceof Zend_Pdf_Action) {
-                    // Outline target is an action
-                    if ($this->_cleanUpAction($target, false) === null) {
-                        // Action is a GoTo action with an unresolved destination
-                        $outline->setTarget(null);
-                    }
-                } else {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Wrong outline target.');
-                }
-            }
-        }
-
-        $openAction = $this->getOpenAction();
-        if ($openAction !== null) {
-            if ($openAction instanceof Zend_Pdf_Action) {
-                // OpenAction is an action
-                if ($this->_cleanUpAction($openAction, false) === null) {
-                    // Action is a GoTo action with an unresolved destination
-                    $this->setOpenAction(null);
-                }
-            } else if ($openAction instanceof Zend_Pdf_Destination) {
-                // OpenAction target is a destination
-                if ($this->resolveDestination($openAction, false) === null) {
-                    $this->setOpenAction(null);
-                }
-            } else {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('OpenAction has to be either PDF Action or Destination.');
-            }
-        }
-    }
-
-    /**
-     * Dump named destinations
-     *
-     * @todo Create a balanced tree instead of plain structure.
-     */
-    protected function _dumpNamedDestinations()
-    {
-        ksort($this->_namedTargets, SORT_STRING);
-
-        $destArrayItems = array();
-        foreach ($this->_namedTargets as $name => $destination) {
-            $destArrayItems[] = new Zend_Pdf_Element_String($name);
-
-            if ($destination instanceof Zend_Pdf_Target) {
-                $destArrayItems[] = $destination->getResource();
-            } else {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('PDF named destinations must be a Zend_Pdf_Target object.');
-            }
-        }
-        $destArray = $this->_objFactory->newObject(new Zend_Pdf_Element_Array($destArrayItems));
-
-        $DestTree = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-        $DestTree->Names = $destArray;
-
-        $root = $this->_trailer->Root;
-
-        if ($root->Names === null) {
-            $root->touch();
-            $root->Names = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-        } else {
-            $root->Names->touch();
-        }
-        $root->Names->Dests = $DestTree;
-    }
-
-    /**
-     * Dump outlines recursively
-     */
-    protected function _dumpOutlines()
-    {
-        $root = $this->_trailer->Root;
-
-        if ($root->Outlines === null) {
-            if (count($this->outlines) == 0) {
-                return;
-            } else {
-                $root->Outlines = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-                $root->Outlines->Type = new Zend_Pdf_Element_Name('Outlines');
-                $updateOutlinesNavigation = true;
-            }
-        } else {
-            $updateOutlinesNavigation = false;
-            if (count($this->_originalOutlines) != count($this->outlines)) {
-                // If original and current outlines arrays have different size then outlines list was updated
-                $updateOutlinesNavigation = true;
-            } else if ( !(array_keys($this->_originalOutlines) === array_keys($this->outlines)) ) {
-                // If original and current outlines arrays have different keys (with a glance to an order) then outlines list was updated
-                $updateOutlinesNavigation = true;
-            } else {
-                foreach ($this->outlines as $key => $outline) {
-                    if ($this->_originalOutlines[$key] !== $outline) {
-                        $updateOutlinesNavigation = true;
-                    }
-                }
-            }
-        }
-
-        $lastOutline = null;
-        $openOutlinesCount = 0;
-        if ($updateOutlinesNavigation) {
-            $root->Outlines->touch();
-            $root->Outlines->First = null;
-
-            foreach ($this->outlines as $outline) {
-                if ($lastOutline === null) {
-                    // First pass. Update Outlines dictionary First entry using corresponding value
-                    $lastOutline = $outline->dumpOutline($this->_objFactory, $updateOutlinesNavigation, $root->Outlines);
-                    $root->Outlines->First = $lastOutline;
-                } else {
-                    // Update previous outline dictionary Next entry (Prev is updated within dumpOutline() method)
-                    $currentOutlineDictionary = $outline->dumpOutline($this->_objFactory, $updateOutlinesNavigation, $root->Outlines, $lastOutline);
-                    $lastOutline->Next = $currentOutlineDictionary;
-                    $lastOutline       = $currentOutlineDictionary;
-                }
-                $openOutlinesCount += $outline->openOutlinesCount();
-            }
-
-            $root->Outlines->Last  = $lastOutline;
-        } else {
-            foreach ($this->outlines as $outline) {
-                $lastOutline = $outline->dumpOutline($this->_objFactory, $updateOutlinesNavigation, $root->Outlines, $lastOutline);
-                $openOutlinesCount += $outline->openOutlinesCount();
-            }
-        }
-
-        if ($openOutlinesCount != $this->_originalOpenOutlinesCount) {
-            $root->Outlines->touch;
-            $root->Outlines->Count = new Zend_Pdf_Element_Numeric($openOutlinesCount);
-        }
-    }
-
-    /**
-     * Create page object, attached to the PDF document.
-     * Method signatures:
-     *
-     * 1. Create new page with a specified pagesize.
-     *    If $factory is null then it will be created and page must be attached to the document to be
-     *    included into output.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(string $pagesize);
-     * ---------------------------------------------------------
-     *
-     * 2. Create new page with a specified pagesize (in default user space units).
-     *    If $factory is null then it will be created and page must be attached to the document to be
-     *    included into output.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(numeric $width, numeric $height);
-     * ---------------------------------------------------------
-     *
-     * @param mixed $param1
-     * @param mixed $param2
-     * @return Zend_Pdf_Page
-     */
-    public function newPage($param1, $param2 = null)
-    {
-        require_once 'Zend/Pdf/Page.php';
-        if ($param2 === null) {
-            return new Zend_Pdf_Page($param1, $this->_objFactory);
-        } else {
-            return new Zend_Pdf_Page($param1, $param2, $this->_objFactory);
-        }
-    }
-
-    /**
-     * Return the document-level Metadata
-     * or null Metadata stream is not presented
-     *
-     * @return string
-     */
-    public function getMetadata()
-    {
-        if ($this->_trailer->Root->Metadata !== null) {
-            return $this->_trailer->Root->Metadata->value;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the document-level Metadata (mast be valid XMP document)
-     *
-     * @param string $metadata
-     */
-    public function setMetadata($metadata)
-    {
-        $metadataObject = $this->_objFactory->newStreamObject($metadata);
-        $metadataObject->dictionary->Type    = new Zend_Pdf_Element_Name('Metadata');
-        $metadataObject->dictionary->Subtype = new Zend_Pdf_Element_Name('XML');
-
-        $this->_trailer->Root->Metadata = $metadataObject;
-        $this->_trailer->Root->touch();
-    }
-
-    /**
-     * Return the document-level JavaScript
-     * or null if there is no JavaScript for this document
-     *
-     * @return string
-     */
-    public function getJavaScript()
-    {
-        return $this->_javaScript;
-    }
-
-    /**
-     * Get open Action
-     * Returns Zend_Pdf_Target (Zend_Pdf_Destination or Zend_Pdf_Action object)
-     *
-     * @return Zend_Pdf_Target
-     */
-    public function getOpenAction()
-    {
-        if ($this->_trailer->Root->OpenAction !== null) {
-            require_once 'Zend/Pdf/Target.php';
-            return Zend_Pdf_Target::load($this->_trailer->Root->OpenAction);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set open Action which is actually Zend_Pdf_Destination or Zend_Pdf_Action object
-     *
-     * @param Zend_Pdf_Target $openAction
-     * @returns Zend_Pdf
-     */
-    public function setOpenAction(Zend_Pdf_Target $openAction = null)
-    {
-        $root = $this->_trailer->Root;
-        $root->touch();
-
-        if ($openAction === null) {
-            $root->OpenAction = null;
-        } else {
-            $root->OpenAction = $openAction->getResource();
-
-            if ($openAction instanceof Zend_Pdf_Action)  {
-                $openAction->dumpAction($this->_objFactory);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return an associative array containing all the named destinations (or GoTo actions) in the PDF.
-     * Named targets can be used to reference from outside
-     * the PDF, ex: 'http://www.something.com/mydocument.pdf#MyAction'
-     *
-     * @return array
-     */
-    public function getNamedDestinations()
-    {
-        return $this->_namedTargets;
-    }
-
-    /**
-     * Return specified named destination
-     *
-     * @param string $name
-     * @return Zend_Pdf_Destination_Explicit|Zend_Pdf_Action_GoTo
-     */
-    public function getNamedDestination($name)
-    {
-        if (isset($this->_namedTargets[$name])) {
-            return $this->_namedTargets[$name];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set specified named destination
-     *
-     * @param string $name
-     * @param Zend_Pdf_Destination_Explicit|Zend_Pdf_Action_GoTo $target
-     */
-    public function setNamedDestination($name, $destination = null)
-    {
-        if ($destination !== null  &&
-            !$destination instanceof Zend_Pdf_Action_GoTo  &&
-            !$destination instanceof Zend_Pdf_Destination_Explicit) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('PDF named destination must refer an explicit destination or a GoTo PDF action.');
-        }
-
-        if ($destination !== null) {
-           $this->_namedTargets[$name] = $destination;
-        } else {
-            unset($this->_namedTargets[$name]);
-        }
-    }
-
-    /**
-     * Pages collection hash:
-     * <page dictionary object hash id> => Zend_Pdf_Page
-     *
-     * @var SplObjectStorage
-     */
-    protected $_pageReferences = null;
-
-    /**
-     * Pages collection hash:
-     * <page number> => Zend_Pdf_Page
-     *
-     * @var array
-     */
-    protected $_pageNumbers = null;
-
-    /**
-     * Refresh page collection hashes
-     *
-     * @return Zend_Pdf
-     */
-    protected function _refreshPagesHash()
-    {
-        $this->_pageReferences = array();
-        $this->_pageNumbers    = array();
-        $count = 1;
-        foreach ($this->pages as $page) {
-            $pageDictionaryHashId = spl_object_hash($page->getPageDictionary()->getObject());
-            $this->_pageReferences[$pageDictionaryHashId] = $page;
-            $this->_pageNumbers[$count++]                 = $page;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Resolve destination.
-     *
-     * Returns Zend_Pdf_Page page object or null if destination is not found within PDF document.
-     *
-     * @param Zend_Pdf_Destination $destination  Destination to resolve
-     * @param boolean $refreshPagesHash  Refresh page collection hashes before processing
-     * @return Zend_Pdf_Page|null
-     * @throws Zend_Pdf_Exception
-     */
-    public function resolveDestination(Zend_Pdf_Destination $destination, $refreshPageCollectionHashes = true)
-    {
-        if ($this->_pageReferences === null  ||  $refreshPageCollectionHashes) {
-            $this->_refreshPagesHash();
-        }
-
-        if ($destination instanceof Zend_Pdf_Destination_Named) {
-            if (!isset($this->_namedTargets[$destination->getName()])) {
-                return null;
-            }
-            $destination = $this->getNamedDestination($destination->getName());
-
-            if ($destination instanceof Zend_Pdf_Action) {
-                if (!$destination instanceof Zend_Pdf_Action_GoTo) {
-                    return null;
-                }
-                $destination = $destination->getDestination();
-            }
-
-            if (!$destination instanceof Zend_Pdf_Destination_Explicit) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Named destination target has to be an explicit destination.');
-            }
-        }
-
-        // Named target is an explicit destination
-        $pageElement = $destination->getResource()->items[0];
-
-        if ($pageElement->getType() == Zend_Pdf_Element::TYPE_NUMERIC) {
-            // Page reference is a PDF number
-            if (!isset($this->_pageNumbers[$pageElement->value])) {
-                return null;
-            }
-
-            return $this->_pageNumbers[$pageElement->value];
-        }
-
-        // Page reference is a PDF page dictionary reference
-        $pageDictionaryHashId = spl_object_hash($pageElement->getObject());
-        if (!isset($this->_pageReferences[$pageDictionaryHashId])) {
-            return null;
-        }
-        return $this->_pageReferences[$pageDictionaryHashId];
-    }
-
-    /**
-     * Walk through action and its chained actions tree and remove nodes
-     * if they are GoTo actions with an unresolved target.
-     *
-     * Returns null if root node is deleted or updated action overwise.
-     *
-     * @todo Give appropriate name and make method public
-     *
-     * @param Zend_Pdf_Action $action
-     * @param boolean $refreshPagesHash  Refresh page collection hashes before processing
-     * @return Zend_Pdf_Action|null
-     */
-    protected function _cleanUpAction(Zend_Pdf_Action $action, $refreshPageCollectionHashes = true)
-    {
-        if ($this->_pageReferences === null  ||  $refreshPageCollectionHashes) {
-            $this->_refreshPagesHash();
-        }
-
-        // Named target is an action
-        if ($action instanceof Zend_Pdf_Action_GoTo  &&
-            $this->resolveDestination($action->getDestination(), false) === null) {
-            // Action itself is a GoTo action with an unresolved destination
-            return null;
-        }
-
-        // Walk through child actions
-        $iterator = new RecursiveIteratorIterator($action, RecursiveIteratorIterator::SELF_FIRST);
-
-        $actionsToClean        = array();
-        $deletionCandidateKeys = array();
-        foreach ($iterator as $chainedAction) {
-            if ($chainedAction instanceof Zend_Pdf_Action_GoTo  &&
-                $this->resolveDestination($chainedAction->getDestination(), false) === null) {
-                // Some child action is a GoTo action with an unresolved destination
-                // Mark it as a candidate for deletion
-                $actionsToClean[]        = $iterator->getSubIterator();
-                $deletionCandidateKeys[] = $iterator->getSubIterator()->key();
-            }
-        }
-        foreach ($actionsToClean as $id => $action) {
-            unset($action->next[$deletionCandidateKeys[$id]]);
-        }
-
-        return $action;
-    }
-
-    /**
-     * Extract fonts attached to the document
-     *
-     * returns array of Zend_Pdf_Resource_Font_Extracted objects
-     *
-     * @return array
-     * @throws Zend_Pdf_Exception
-     */
-    public function extractFonts()
-    {
-        $fontResourcesUnique = array();
-        foreach ($this->pages as $page) {
-            $pageResources = $page->extractResources();
-
-            if ($pageResources->Font === null) {
-                // Page doesn't contain have any font reference
-                continue;
-            }
-
-            $fontResources = $pageResources->Font;
-
-            foreach ($fontResources->getKeys() as $fontResourceName) {
-                $fontDictionary = $fontResources->$fontResourceName;
-
-                if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference  ||
-                       $fontDictionary instanceof Zend_Pdf_Element_Object) ) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.');
-                }
-
-                $fontResourcesUnique[spl_object_hash($fontDictionary->getObject())] = $fontDictionary;
-            }
-        }
-
-        $fonts = array();
-        require_once 'Zend/Pdf/Exception.php';
-        foreach ($fontResourcesUnique as $resourceId => $fontDictionary) {
-            try {
-                // Try to extract font
-                require_once 'Zend/Pdf/Resource/Font/Extracted.php';
-                $extractedFont = new Zend_Pdf_Resource_Font_Extracted($fontDictionary);
-
-                $fonts[$resourceId] = $extractedFont;
-            } catch (Zend_Pdf_Exception $e) {
-                if ($e->getMessage() != 'Unsupported font type.') {
-                    throw $e;
-                }
-            }
-        }
-
-        return $fonts;
-    }
-
-    /**
-     * Extract font attached to the page by specific font name
-     *
-     * $fontName should be specified in UTF-8 encoding
-     *
-     * @return Zend_Pdf_Resource_Font_Extracted|null
-     * @throws Zend_Pdf_Exception
-     */
-    public function extractFont($fontName)
-    {
-        $fontResourcesUnique = array();
-        require_once 'Zend/Pdf/Exception.php';
-        foreach ($this->pages as $page) {
-            $pageResources = $page->extractResources();
-
-            if ($pageResources->Font === null) {
-                // Page doesn't contain have any font reference
-                continue;
-            }
-
-            $fontResources = $pageResources->Font;
-
-            foreach ($fontResources->getKeys() as $fontResourceName) {
-                $fontDictionary = $fontResources->$fontResourceName;
-
-                if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference  ||
-                       $fontDictionary instanceof Zend_Pdf_Element_Object) ) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.');
-                }
-
-                $resourceId = spl_object_hash($fontDictionary->getObject());
-                if (isset($fontResourcesUnique[$resourceId])) {
-                    continue;
-                } else {
-                    // Mark resource as processed
-                    $fontResourcesUnique[$resourceId] = 1;
-                }
-
-                if ($fontDictionary->BaseFont->value != $fontName) {
-                    continue;
-                }
-
-                try {
-                    // Try to extract font
-                    require_once 'Zend/Pdf/Resource/Font/Extracted.php';
-                    return new Zend_Pdf_Resource_Font_Extracted($fontDictionary);
-                } catch (Zend_Pdf_Exception $e) {
-                    if ($e->getMessage() != 'Unsupported font type.') {
-                        throw $e;
-                    }
-                    // Continue searhing
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Render the completed PDF to a string.
-     * If $newSegmentOnly is true, then only appended part of PDF is returned.
-     *
-     * @param boolean $newSegmentOnly
-     * @param resource $outputStream
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function render($newSegmentOnly = false, $outputStream = null)
-    {
-        // Save document properties if necessary
-        if ($this->properties != $this->_originalProperties) {
-            $docInfo = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-
-            foreach ($this->properties as $key => $value) {
-                switch ($key) {
-                    case 'Trapped':
-                        switch ($value) {
-                            case true:
-                                $docInfo->$key = new Zend_Pdf_Element_Name('True');
-                                break;
-
-                            case false:
-                                $docInfo->$key = new Zend_Pdf_Element_Name('False');
-                                break;
-
-                            case null:
-                                $docInfo->$key = new Zend_Pdf_Element_Name('Unknown');
-                                break;
-
-                            default:
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception('Wrong Trapped document property vale: \'' . $value . '\'. Only true, false and null values are allowed.');
-                                break;
-                        }
-
-                    case 'CreationDate':
-                        // break intentionally omitted
-                    case 'ModDate':
-                        $docInfo->$key = new Zend_Pdf_Element_String((string)$value);
-                        break;
-
-                    case 'Title':
-                        // break intentionally omitted
-                    case 'Author':
-                        // break intentionally omitted
-                    case 'Subject':
-                        // break intentionally omitted
-                    case 'Keywords':
-                        // break intentionally omitted
-                    case 'Creator':
-                        // break intentionally omitted
-                    case 'Producer':
-                        if (extension_loaded('mbstring') === true) {
-                            $detected = mb_detect_encoding($value);
-                            if ($detected !== 'ASCII') {
-                                $value = chr(254) . chr(255) . mb_convert_encoding($value, 'UTF-16', $detected);
-                            }
-                        }
-                        $docInfo->$key = new Zend_Pdf_Element_String((string)$value);
-                        break;
-
-                    default:
-                        // Set property using PDF type based on PHP type
-                        $docInfo->$key = Zend_Pdf_Element::phpToPdf($value);
-                        break;
-                }
-            }
-
-            $this->_trailer->Info = $docInfo;
-        }
-
-        $this->_dumpPages();
-        $this->_dumpNamedDestinations();
-        $this->_dumpOutlines();
-
-        // Check, that PDF file was modified
-        // File is always modified by _dumpPages() now, but future implementations may eliminate this.
-        if (!$this->_objFactory->isModified()) {
-            if ($newSegmentOnly) {
-                // Do nothing, return
-                return '';
-            }
-
-            if ($outputStream === null) {
-                return $this->_trailer->getPDFString();
-            } else {
-                $pdfData = $this->_trailer->getPDFString();
-                while ( strlen($pdfData) > 0 && ($byteCount = fwrite($outputStream, $pdfData)) != false ) {
-                    $pdfData = substr($pdfData, $byteCount);
-                }
-
-                return '';
-            }
-        }
-
-        // offset (from a start of PDF file) of new PDF file segment
-        $offset = $this->_trailer->getPDFLength();
-        // Last Object number in a list of free objects
-        $lastFreeObject = $this->_trailer->getLastFreeObject();
-
-        // Array of cross-reference table subsections
-        $xrefTable = array();
-        // Object numbers of first objects in each subsection
-        $xrefSectionStartNums = array();
-
-        // Last cross-reference table subsection
-        $xrefSection = array();
-        // Dummy initialization of the first element (specail case - header of linked list of free objects).
-        $xrefSection[] = 0;
-        $xrefSectionStartNums[] = 0;
-        // Object number of last processed PDF object.
-        // Used to manage cross-reference subsections.
-        // Initialized by zero (specail case - header of linked list of free objects).
-        $lastObjNum = 0;
-
-        if ($outputStream !== null) {
-            if (!$newSegmentOnly) {
-                $pdfData = $this->_trailer->getPDFString();
-                while ( strlen($pdfData) > 0 && ($byteCount = fwrite($outputStream, $pdfData)) != false ) {
-                    $pdfData = substr($pdfData, $byteCount);
-                }
-            }
-        } else {
-            $pdfSegmentBlocks = ($newSegmentOnly) ? array() : array($this->_trailer->getPDFString());
-        }
-
-        // Iterate objects to create new reference table
-        foreach ($this->_objFactory->listModifiedObjects() as $updateInfo) {
-            $objNum = $updateInfo->getObjNum();
-
-            if ($objNum - $lastObjNum != 1) {
-                // Save cross-reference table subsection and start new one
-                $xrefTable[] = $xrefSection;
-                $xrefSection = array();
-                $xrefSectionStartNums[] = $objNum;
-            }
-
-            if ($updateInfo->isFree()) {
-                // Free object cross-reference table entry
-                $xrefSection[]  = sprintf("%010d %05d f \n", $lastFreeObject, $updateInfo->getGenNum());
-                $lastFreeObject = $objNum;
-            } else {
-                // In-use object cross-reference table entry
-                $xrefSection[]  = sprintf("%010d %05d n \n", $offset, $updateInfo->getGenNum());
-
-                $pdfBlock = $updateInfo->getObjectDump();
-                $offset += strlen($pdfBlock);
-
-                if ($outputStream === null) {
-                    $pdfSegmentBlocks[] = $pdfBlock;
-                } else {
-                    while ( strlen($pdfBlock) > 0 && ($byteCount = fwrite($outputStream, $pdfBlock)) != false ) {
-                        $pdfBlock = substr($pdfBlock, $byteCount);
-                    }
-                }
-            }
-            $lastObjNum = $objNum;
-        }
-        // Save last cross-reference table subsection
-        $xrefTable[] = $xrefSection;
-
-        // Modify first entry (specail case - header of linked list of free objects).
-        $xrefTable[0][0] = sprintf("%010d 65535 f \n", $lastFreeObject);
-
-        $xrefTableStr = "xref\n";
-        foreach ($xrefTable as $sectId => $xrefSection) {
-            $xrefTableStr .= sprintf("%d %d \n", $xrefSectionStartNums[$sectId], count($xrefSection));
-            foreach ($xrefSection as $xrefTableEntry) {
-                $xrefTableStr .= $xrefTableEntry;
-            }
-        }
-
-        $this->_trailer->Size->value = $this->_objFactory->getObjectCount();
-
-        $pdfBlock = $xrefTableStr
-                 .  $this->_trailer->toString()
-                 . "startxref\n" . $offset . "\n"
-                 . "%%EOF\n";
-
-        $this->_objFactory->cleanEnumerationShiftCache();
-
-        if ($outputStream === null) {
-            $pdfSegmentBlocks[] = $pdfBlock;
-
-            return implode('', $pdfSegmentBlocks);
-        } else {
-            while ( strlen($pdfBlock) > 0 && ($byteCount = fwrite($outputStream, $pdfBlock)) != false ) {
-                $pdfBlock = substr($pdfBlock, $byteCount);
-            }
-
-            return '';
-        }
-    }
-
-
-    /**
-     * Set the document-level JavaScript
-     *
-     * @param string $javascript
-     */
-    public function setJavaScript($javascript)
-    {
-        $this->_javaScript = $javascript;
-    }
-
-
-    /**
-     * Convert date to PDF format (it's close to ASN.1 (Abstract Syntax Notation
-     * One) defined in ISO/IEC 8824).
-     *
-     * @todo This really isn't the best location for this method. It should
-     *   probably actually exist as Zend_Pdf_Element_Date or something like that.
-     *
-     * @todo Address the following E_STRICT issue:
-     *   PHP Strict Standards:  date(): It is not safe to rely on the system's
-     *   timezone settings. Please use the date.timezone setting, the TZ
-     *   environment variable or the date_default_timezone_set() function. In
-     *   case you used any of those methods and you are still getting this
-     *   warning, you most likely misspelled the timezone identifier.
-     *
-     * @param integer $timestamp (optional) If omitted, uses the current time.
-     * @return string
-     */
-    public static function pdfDate($timestamp = null)
-    {
-        if ($timestamp === null) {
-            $date = date('\D\:YmdHisO');
-        } else {
-            $date = date('\D\:YmdHisO', $timestamp);
-        }
-        return substr_replace($date, '\'', -2, 0) . '\'';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Action.php b/airtime_mvc/library/Zend/Pdf/Action.php
deleted file mode 100644
index d649893b5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Action.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-
-
-/** Zend_Pdf_Target */
-require_once 'Zend/Pdf/Target.php';
-
-
-/**
- * Abstract PDF action representation class
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Action extends Zend_Pdf_Target implements RecursiveIterator, Countable
-{
-    /**
-     * Action dictionary
-     *
-     * @var Zend_Pdf_Element_Dictionary|Zend_Pdf_Element_Object|Zend_Pdf_Element_Reference
-     */
-    protected $_actionDictionary;
-
-
-    /**
-     * An original list of chained actions
-     *
-     * @var array  Array of Zend_Pdf_Action objects
-     */
-    protected $_originalNextList;
-
-    /**
-     * A list of next actions in actions tree (used for actions chaining)
-     *
-     * @var array  Array of Zend_Pdf_Action objects
-     */
-    public $next = array();
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dictionary
-     * @param SplObjectStorage            $processedActions  list of already processed action dictionaries, used to avoid cyclic references
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $processedActions)
-    {
-        require_once 'Zend/Pdf/Element.php';
-        if ($dictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$dictionary mast be a direct or an indirect dictionary object.');
-        }
-
-        $this->_actionDictionary = $dictionary;
-
-        if ($dictionary->Next !== null) {
-            if ($dictionary->Next instanceof Zend_Pdf_Element_Dictionary) {
-                // Check if dictionary object is not already processed
-                if (!$processedActions->contains($dictionary->Next)) {
-                    $processedActions->attach($dictionary->Next);
-                    $this->next[] = Zend_Pdf_Action::load($dictionary->Next, $processedActions);
-                }
-            } else if ($dictionary->Next instanceof Zend_Pdf_Element_Array) {
-                foreach ($dictionary->Next->items as $chainedActionDictionary) {
-                    // Check if dictionary object is not already processed
-                    if (!$processedActions->contains($chainedActionDictionary)) {
-                        $processedActions->attach($chainedActionDictionary);
-                        $this->next[] = Zend_Pdf_Action::load($chainedActionDictionary, $processedActions);
-                    }
-                }
-            } else {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('PDF Action dictionary Next entry must be a dictionary or an array.');
-            }
-        }
-
-        $this->_originalNextList = $this->next;
-    }
-
-    /**
-     * Load PDF action object using specified dictionary
-     *
-     * @internal
-     * @param Zend_Pdf_Element $dictionary (It's actually Dictionary or Dictionary Object or Reference to a Dictionary Object)
-     * @param SplObjectStorage $processedActions  list of already processed action dictionaries, used to avoid cyclic references
-     * @return Zend_Pdf_Action
-     * @throws Zend_Pdf_Exception
-     */
-    public static function load(Zend_Pdf_Element $dictionary, SplObjectStorage $processedActions = null)
-    {
-        if ($processedActions === null) {
-            $processedActions = new SplObjectStorage();
-        }
-
-        require_once 'Zend/Pdf/Element.php';
-        if ($dictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$dictionary mast be a direct or an indirect dictionary object.');
-        }
-        if (isset($dictionary->Type)  &&  $dictionary->Type->value != 'Action') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Action dictionary Type entry must be set to \'Action\'.');
-        }
-
-        if ($dictionary->S === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Action dictionary must contain S entry');
-        }
-
-        switch ($dictionary->S->value) {
-            case 'GoTo':
-                require_once 'Zend/Pdf/Action/GoTo.php';
-                return new Zend_Pdf_Action_GoTo($dictionary, $processedActions);
-                brake;
-
-            case 'GoToR':
-                require_once 'Zend/Pdf/Action/GoToR.php';
-                return new Zend_Pdf_Action_GoToR($dictionary, $processedActions);
-                brake;
-
-            case 'GoToE':
-                require_once 'Zend/Pdf/Action/GoToE.php';
-                return new Zend_Pdf_Action_GoToE($dictionary, $processedActions);
-                brake;
-
-            case 'Launch':
-                require_once 'Zend/Pdf/Action/Launch.php';
-                return new Zend_Pdf_Action_Launch($dictionary, $processedActions);
-                brake;
-
-            case 'Thread':
-                require_once 'Zend/Pdf/Action/Thread.php';
-                return new Zend_Pdf_Action_Thread($dictionary, $processedActions);
-                brake;
-
-            case 'URI':
-                require_once 'Zend/Pdf/Action/URI.php';
-                return new Zend_Pdf_Action_URI($dictionary, $processedActions);
-                brake;
-
-            case 'Sound':
-                require_once 'Zend/Pdf/Action/Sound.php';
-                return new Zend_Pdf_Action_Sound($dictionary, $processedActions);
-                brake;
-
-            case 'Movie':
-                require_once 'Zend/Pdf/Action/Movie.php';
-                return new Zend_Pdf_Action_Movie($dictionary, $processedActions);
-                brake;
-
-            case 'Hide':
-                require_once 'Zend/Pdf/Action/Hide.php';
-                return new Zend_Pdf_Action_Hide($dictionary, $processedActions);
-                brake;
-
-            case 'Named':
-                require_once 'Zend/Pdf/Action/Named.php';
-                return new Zend_Pdf_Action_Named($dictionary, $processedActions);
-                brake;
-
-            case 'SubmitForm':
-                require_once 'Zend/Pdf/Action/SubmitForm.php';
-                return new Zend_Pdf_Action_SubmitForm($dictionary, $processedActions);
-                brake;
-
-            case 'ResetForm':
-                require_once 'Zend/Pdf/Action/ResetForm.php';
-                return new Zend_Pdf_Action_ResetForm($dictionary, $processedActions);
-                brake;
-
-            case 'ImportData':
-                require_once 'Zend/Pdf/Action/ImportData.php';
-                return new Zend_Pdf_Action_ImportData($dictionary, $processedActions);
-                brake;
-
-            case 'JavaScript':
-                require_once 'Zend/Pdf/Action/JavaScript.php';
-                return new Zend_Pdf_Action_JavaScript($dictionary, $processedActions);
-                brake;
-
-            case 'SetOCGState':
-                require_once 'Zend/Pdf/Action/SetOCGState.php';
-                return new Zend_Pdf_Action_SetOCGState($dictionary, $processedActions);
-                brake;
-
-            case 'Rendition':
-                require_once 'Zend/Pdf/Action/Rendition.php';
-                return new Zend_Pdf_Action_Rendition($dictionary, $processedActions);
-                brake;
-
-            case 'Trans':
-                require_once 'Zend/Pdf/Action/Trans.php';
-                return new Zend_Pdf_Action_Trans($dictionary, $processedActions);
-                brake;
-
-            case 'GoTo3DView':
-                require_once 'Zend/Pdf/Action/GoTo3DView.php';
-                return new Zend_Pdf_Action_GoTo3DView($dictionary, $processedActions);
-                brake;
-
-            default:
-                require_once 'Zend/Pdf/Action/Unknown.php';
-                return new Zend_Pdf_Action_Unknown($dictionary, $processedActions);
-                brake;
-        }
-    }
-
-    /**
-     * Get resource
-     *
-     * @internal
-     * @return Zend_Pdf_Element
-     */
-    public function getResource()
-    {
-        return $this->_actionDictionary;
-    }
-
-    /**
-     * Dump Action and its child actions into PDF structures
-     *
-     * Returns dictionary indirect object or reference
-     *
-     * @internal
-     * @param Zend_Pdf_ElementFactory $factory   Object factory for newly created indirect objects
-     * @param SplObjectStorage $processedActions  list of already processed actions (used to prevent infinity loop caused by cyclic references)
-     * @return Zend_Pdf_Element_Object|Zend_Pdf_Element_Reference   Dictionary indirect object
-     */
-    public function dumpAction(Zend_Pdf_ElementFactory_Interface $factory, SplObjectStorage $processedActions = null)
-    {
-        if ($processedActions === null) {
-            $processedActions = new SplObjectStorage();
-        }
-        if ($processedActions->contains($this)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Action chain cyclyc reference is detected.');
-        }
-        $processedActions->attach($this);
-
-        $childListUpdated = false;
-        if (count($this->_originalNextList) != count($this->next)) {
-            // If original and current children arrays have different size then children list was updated
-            $childListUpdated = true;
-        } else if ( !(array_keys($this->_originalNextList) === array_keys($this->next)) ) {
-            // If original and current children arrays have different keys (with a glance to an order) then children list was updated
-            $childListUpdated = true;
-        } else {
-            foreach ($this->next as $key => $childAction) {
-                if ($this->_originalNextList[$key] !== $childAction) {
-                    $childListUpdated = true;
-                    break;
-                }
-            }
-        }
-
-        if ($childListUpdated) {
-            $this->_actionDictionary->touch();
-            switch (count($this->next)) {
-                case 0:
-                    $this->_actionDictionary->Next = null;
-                    break;
-
-                case 1:
-                    $child = reset($this->next);
-                    $this->_actionDictionary->Next = $child->dumpAction($factory, $processedActions);
-                    break;
-
-                default:
-                    require_once 'Zend/Pdf/Element/Array.php';
-                    $pdfChildArray = new Zend_Pdf_Element_Array();
-                    foreach ($this->next as $child) {
-
-                        $pdfChildArray->items[] = $child->dumpAction($factory, $processedActions);
-                    }
-                    $this->_actionDictionary->Next = $pdfChildArray;
-                    break;
-            }
-        } else {
-            foreach ($this->next as $child) {
-                $child->dumpAction($factory, $processedActions);
-            }
-        }
-
-        if ($this->_actionDictionary instanceof Zend_Pdf_Element_Dictionary) {
-            // It's a newly created action. Register it within object factory and return indirect object
-            return $factory->newObject($this->_actionDictionary);
-        } else {
-            // It's a loaded object
-            return $this->_actionDictionary;
-        }
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////
-    //  RecursiveIterator interface methods
-    //////////////
-
-    /**
-     * Returns current child action.
-     *
-     * @return Zend_Pdf_Action
-     */
-    public function current()
-    {
-        return current($this->next);
-    }
-
-    /**
-     * Returns current iterator key
-     *
-     * @return integer
-     */
-    public function key()
-    {
-        return key($this->next);
-    }
-
-    /**
-     * Go to next child
-     */
-    public function next()
-    {
-        return next($this->next);
-    }
-
-    /**
-     * Rewind children
-     */
-    public function rewind()
-    {
-        return reset($this->next);
-    }
-
-    /**
-     * Check if current position is valid
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return current($this->next) !== false;
-    }
-
-    /**
-     * Returns the child action.
-     *
-     * @return Zend_Pdf_Action|null
-     */
-    public function getChildren()
-    {
-        return current($this->next);
-    }
-
-    /**
-     * Implements RecursiveIterator interface.
-     *
-     * @return bool  whether container has any pages
-     */
-    public function hasChildren()
-    {
-        return count($this->next) > 0;
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////
-    //  Countable interface methods
-    //////////////
-
-    /**
-     * count()
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->childOutlines);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Action/GoTo.php b/airtime_mvc/library/Zend/Pdf/Action/GoTo.php
deleted file mode 100644
index 91bc286bc..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/GoTo.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GoTo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Destination.php';
-
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-/**
- * PDF 'Go to' action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_GoTo extends Zend_Pdf_Action
-{
-    /**
-     * GoTo Action destination
-     *
-     * @var Zend_Pdf_Destination
-     */
-    protected $_destination;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dictionary
-     * @param SplObjectStorage            $processedActions  list of already processed action dictionaries, used to avoid cyclic references
-     */
-    public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $processedActions)
-    {
-        parent::__construct($dictionary, $processedActions);
-
-        $this->_destination = Zend_Pdf_Destination::load($dictionary->D);
-    }
-
-    /**
-     * Create new Zend_Pdf_Action_GoTo object using specified destination
-     *
-     * @param Zend_Pdf_Destination|string $destination
-     * @return Zend_Pdf_Action_GoTo
-     */
-    public static function create($destination)
-    {
-        if (is_string($destination)) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            $destination = Zend_Pdf_Destination_Named::create($destination);
-        }
-
-        if (!$destination instanceof Zend_Pdf_Destination) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$destination parameter must be a Zend_Pdf_Destination object or string.');
-        }
-
-        $dictionary = new Zend_Pdf_Element_Dictionary();
-        $dictionary->Type = new Zend_Pdf_Element_Name('Action');
-        $dictionary->S    = new Zend_Pdf_Element_Name('GoTo');
-        $dictionary->Next = null;
-        $dictionary->D    = $destination->getResource();
-
-        return new Zend_Pdf_Action_GoTo($dictionary, new SplObjectStorage());
-    }
-
-    /**
-     * Set goto action destination
-     *
-     * @param Zend_Pdf_Destination|string $destination
-     * @return Zend_Pdf_Action_GoTo
-     */
-    public function setDestination(Zend_Pdf_Destination $destination)
-    {
-        $this->_destination = $destination;
-
-        $this->_actionDictionary->touch();
-        $this->_actionDictionary->D = $destination->getResource();
-
-        return $this;
-    }
-
-    /**
-     * Get goto action destination
-     *
-     * @return Zend_Pdf_Destination
-     */
-    public function getDestination()
-    {
-        return $this->_destination;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Action/GoTo3DView.php b/airtime_mvc/library/Zend/Pdf/Action/GoTo3DView.php
deleted file mode 100644
index 8b786e8e5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/GoTo3DView.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GoTo3DView.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Set the current view of a 3D annotation' action
- * PDF 1.6+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_GoTo3DView extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/GoToE.php b/airtime_mvc/library/Zend/Pdf/Action/GoToE.php
deleted file mode 100644
index 64930aeca..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/GoToE.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GoToE.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Go to a destination in an embedded file' action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_GoToE extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/GoToR.php b/airtime_mvc/library/Zend/Pdf/Action/GoToR.php
deleted file mode 100644
index 85c0983f5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/GoToR.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GoToR.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Go to a destination in another document' action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_GoToR extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Hide.php b/airtime_mvc/library/Zend/Pdf/Action/Hide.php
deleted file mode 100644
index 749e36c9a..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Hide.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hide.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Set an annotation’s Hidden flag' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Hide extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/ImportData.php b/airtime_mvc/library/Zend/Pdf/Action/ImportData.php
deleted file mode 100644
index 15a1a8839..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/ImportData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ImportData.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Import field values from a file' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_ImportData extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/JavaScript.php b/airtime_mvc/library/Zend/Pdf/Action/JavaScript.php
deleted file mode 100644
index 425e08f74..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/JavaScript.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: JavaScript.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Execute a JavaScript script' action
- * PDF 1.3+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_JavaScript extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Launch.php b/airtime_mvc/library/Zend/Pdf/Action/Launch.php
deleted file mode 100644
index 033f1df69..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Launch.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Launch.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Launch an application, usually to open a file' action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Launch extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Movie.php b/airtime_mvc/library/Zend/Pdf/Action/Movie.php
deleted file mode 100644
index 18b4f7ad2..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Movie.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Movie.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Play a movie' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Movie extends Zend_Pdf_Action
-{
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Named.php b/airtime_mvc/library/Zend/Pdf/Action/Named.php
deleted file mode 100644
index 3dea8c7e8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Named.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Execute an action predefined by the viewer application' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Named extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Rendition.php b/airtime_mvc/library/Zend/Pdf/Action/Rendition.php
deleted file mode 100644
index 94c50ba6e..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Rendition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rendition.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Controls the playing of multimedia content' action
- * PDF 1.5+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Rendition extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/ResetForm.php b/airtime_mvc/library/Zend/Pdf/Action/ResetForm.php
deleted file mode 100644
index a37dbd88e..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/ResetForm.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResetForm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Set fields to their default values' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_ResetForm extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/SetOCGState.php b/airtime_mvc/library/Zend/Pdf/Action/SetOCGState.php
deleted file mode 100644
index c961ddac5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/SetOCGState.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SetOCGState.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Set the states of optional content groups' action
- * PDF 1.5+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_SetOCGState extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Sound.php b/airtime_mvc/library/Zend/Pdf/Action/Sound.php
deleted file mode 100644
index 75b82e41a..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Sound.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sound.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Play a sound' action representation class
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Sound extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/SubmitForm.php b/airtime_mvc/library/Zend/Pdf/Action/SubmitForm.php
deleted file mode 100644
index 8cc677f9a..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/SubmitForm.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SubmitForm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Send data to a uniform resource locator' action
- * PDF 1.2+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_SubmitForm extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Thread.php b/airtime_mvc/library/Zend/Pdf/Action/Thread.php
deleted file mode 100644
index 89a3a35b3..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Thread.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Thread.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Begin reading an article thread' action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Thread extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Trans.php b/airtime_mvc/library/Zend/Pdf/Action/Trans.php
deleted file mode 100644
index 069714826..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Trans.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Trans.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Updates the display of a document, using a transition dictionary' action
- * PDF 1.5+ feature
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Trans extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Action/URI.php b/airtime_mvc/library/Zend/Pdf/Action/URI.php
deleted file mode 100644
index 326f37c4b..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/URI.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: URI.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/String.php';
-require_once 'Zend/Pdf/Element/Boolean.php';
-
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * PDF 'Resolve a uniform resource identifier' action
- *
- * A URI action causes a URI to be resolved.
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_URI extends Zend_Pdf_Action
-{
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dictionary
-     * @param SplObjectStorage            $processedActions  list of already processed action dictionaries, used to avoid cyclic references
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $processedActions)
-    {
-        parent::__construct($dictionary, $processedActions);
-
-        if ($dictionary->URI === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('URI action dictionary entry is required');
-        }
-    }
-
-    /**
-     * Validate URI
-     *
-     * @param string $uri
-     * @return true
-     * @throws Zend_Pdf_Exception
-     */
-    protected static function _validateUri($uri)
-    {
-        $scheme = parse_url((string)$uri, PHP_URL_SCHEME);
-        if ($scheme === false || $scheme === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Invalid URI');
-        }
-    }
-
-    /**
-     * Create new Zend_Pdf_Action_URI object using specified uri
-     *
-     * @param string  $uri    The URI to resolve, encoded in 7-bit ASCII
-     * @param boolean $isMap  A flag specifying whether to track the mouse position when the URI is resolved
-     * @return Zend_Pdf_Action_URI
-     */
-    public static function create($uri, $isMap = false)
-    {
-        self::_validateUri($uri);
-
-        $dictionary = new Zend_Pdf_Element_Dictionary();
-        $dictionary->Type = new Zend_Pdf_Element_Name('Action');
-        $dictionary->S    = new Zend_Pdf_Element_Name('URI');
-        $dictionary->Next = null;
-        $dictionary->URI  = new Zend_Pdf_Element_String($uri);
-        if ($isMap) {
-            $dictionary->IsMap = new Zend_Pdf_Element_Boolean(true);
-        }
-
-        return new Zend_Pdf_Action_URI($dictionary, new SplObjectStorage());
-    }
-
-    /**
-     * Set URI to resolve
-     *
-     * @param string $uri   The uri to resolve, encoded in 7-bit ASCII.
-     * @return Zend_Pdf_Action_URI
-     */
-    public function setUri($uri)
-    {
-        $this->_validateUri($uri);
-
-        $this->_actionDictionary->touch();
-        $this->_actionDictionary->URI = new Zend_Pdf_Element_String($uri);
-
-        return $this;
-    }
-
-    /**
-     * Get URI to resolve
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_actionDictionary->URI->value;
-    }
-
-    /**
-     * Set IsMap property
-     *
-     * If the IsMap flag is true and the user has triggered the URI action by clicking
-     * an annotation, the coordinates of the mouse position at the time the action is
-     * performed should be transformed from device space to user space and then offset
-     * relative to the upper-left corner of the annotation rectangle.
-     *
-     * @param boolean $isMap  A flag specifying whether to track the mouse position when the URI is resolved
-     * @return Zend_Pdf_Action_URI
-     */
-    public function setIsMap($isMap)
-    {
-        $this->_actionDictionary->touch();
-
-        if ($isMap) {
-            $this->_actionDictionary->IsMap = new Zend_Pdf_Element_Boolean(true);
-        } else {
-            $this->_actionDictionary->IsMap = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get IsMap property
-     *
-     * If the IsMap flag is true and the user has triggered the URI action by clicking
-     * an annotation, the coordinates of the mouse position at the time the action is
-     * performed should be transformed from device space to user space and then offset
-     * relative to the upper-left corner of the annotation rectangle.
-     *
-     * @return boolean
-     */
-    public function getIsMap()
-    {
-        return $this->_actionDictionary->IsMap !== null  &&
-               $this->_actionDictionary->IsMap->value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Action/Unknown.php b/airtime_mvc/library/Zend/Pdf/Action/Unknown.php
deleted file mode 100644
index 0131f55ae..000000000
--- a/airtime_mvc/library/Zend/Pdf/Action/Unknown.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Action */
-require_once 'Zend/Pdf/Action.php';
-
-
-/**
- * Unrecognized PDF action
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Action_Unknown extends Zend_Pdf_Action
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Annotation.php b/airtime_mvc/library/Zend/Pdf/Annotation.php
deleted file mode 100644
index 98478b056..000000000
--- a/airtime_mvc/library/Zend/Pdf/Annotation.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Annotation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-
-/**
- * Abstract PDF annotation representation class
- *
- * An annotation associates an object such as a note, sound, or movie with a location
- * on a page of a PDF document, or provides a way to interact with the user by
- * means of the mouse and keyboard.
- *
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Annotation
-{
-    /**
-     * Annotation dictionary
-     *
-     * @var Zend_Pdf_Element_Dictionary|Zend_Pdf_Element_Object|Zend_Pdf_Element_Reference
-     */
-    protected $_annotationDictionary;
-
-    /**
-     * Get annotation dictionary
-     *
-     * @internal
-     * @return Zend_Pdf_Element
-     */
-    public function getResource()
-    {
-        return $this->_annotationDictionary;
-    }
-
-
-    /**
-     * Set bottom edge of the annotation rectangle.
-     *
-     * @param float $bottom
-     * @return Zend_Pdf_Annotation
-     */
-    public function setBottom($bottom) {
-        $this->_annotationDictionary->Rect->items[1]->touch();
-        $this->_annotationDictionary->Rect->items[1]->value = $bottom;
-
-        return $this;
-    }
-
-    /**
-     * Get bottom edge of the annotation rectangle.
-     *
-     * @return float
-     */
-    public function getBottom() {
-        return $this->_annotationDictionary->Rect->items[1]->value;
-    }
-
-    /**
-     * Set top edge of the annotation rectangle.
-     *
-     * @param float $top
-     * @return Zend_Pdf_Annotation
-     */
-    public function setTop($top) {
-        $this->_annotationDictionary->Rect->items[3]->touch();
-        $this->_annotationDictionary->Rect->items[3]->value = $top;
-
-        return $this;
-    }
-
-    /**
-     * Get top edge of the annotation rectangle.
-     *
-     * @return float
-     */
-    public function getTop() {
-        return $this->_annotationDictionary->Rect->items[3]->value;
-    }
-
-    /**
-     * Set right edge of the annotation rectangle.
-     *
-     * @param float $right
-     * @return Zend_Pdf_Annotation
-     */
-    public function setRight($right) {
-        $this->_annotationDictionary->Rect->items[2]->touch();
-        $this->_annotationDictionary->Rect->items[2]->value = $right;
-
-        return $this;
-    }
-
-    /**
-     * Get right edge of the annotation rectangle.
-     *
-     * @return float
-     */
-    public function getRight() {
-        return $this->_annotationDictionary->Rect->items[2]->value;
-    }
-
-    /**
-     * Set left edge of the annotation rectangle.
-     *
-     * @param float $left
-     * @return Zend_Pdf_Annotation
-     */
-    public function setLeft($left) {
-        $this->_annotationDictionary->Rect->items[0]->touch();
-        $this->_annotationDictionary->Rect->items[0]->value = $left;
-
-        return $this;
-    }
-
-    /**
-     * Get left edge of the annotation rectangle.
-     *
-     * @return float
-     */
-    public function getLeft() {
-        return $this->_annotationDictionary->Rect->items[0]->value;
-    }
-
-    /**
-     * Return text to be displayed for the annotation or, if this type of annotation
-     * does not display text, an alternate description of the annotation’s contents
-     * in human-readable form.
-     *
-     * @return string
-     */
-    public function getText() {
-        if ($this->_annotationDictionary->Contents === null) {
-            return '';
-        }
-
-        return $this->_annotationDictionary->Contents->value;
-    }
-
-    /**
-     * Set text to be displayed for the annotation or, if this type of annotation
-     * does not display text, an alternate description of the annotation’s contents
-     * in human-readable form.
-     *
-     * @param string $text
-     * @return Zend_Pdf_Annotation
-     */
-    public function setText($text) {
-        require_once 'Zend/Pdf/Element/String.php';
-
-        if ($this->_annotationDictionary->Contents === null) {
-            $this->_annotationDictionary->touch();
-            $this->_annotationDictionary->Contents = new Zend_Pdf_Element_String($text);
-        } else {
-            $this->_annotationDictionary->Contents->touch();
-            $this->_annotationDictionary->Contents->value = new Zend_Pdf_Element_String($text);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Annotation object constructor
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $annotationDictionary)
-    {
-        if ($annotationDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Annotation dictionary resource has to be a dictionary.');
-        }
-
-        $this->_annotationDictionary = $annotationDictionary;
-
-        if ($this->_annotationDictionary->Type !== null  &&
-            $this->_annotationDictionary->Type->value != 'Annot') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong resource type. \'Annot\' expected.');
-        }
-
-        if ($this->_annotationDictionary->Rect === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('\'Rect\' dictionary entry is required.');
-        }
-
-        if (count($this->_annotationDictionary->Rect->items) != 4 ||
-            $this->_annotationDictionary->Rect->items[0]->getType() != Zend_Pdf_Element::TYPE_NUMERIC ||
-            $this->_annotationDictionary->Rect->items[1]->getType() != Zend_Pdf_Element::TYPE_NUMERIC ||
-            $this->_annotationDictionary->Rect->items[2]->getType() != Zend_Pdf_Element::TYPE_NUMERIC ||
-            $this->_annotationDictionary->Rect->items[3]->getType() != Zend_Pdf_Element::TYPE_NUMERIC ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('\'Rect\' dictionary entry must be an array of four numeric elements.');
-        }
-    }
-
-    /**
-     * Load Annotation object from a specified resource
-     *
-     * @internal
-     * @param $destinationArray
-     * @return Zend_Pdf_Annotation
-     */
-    public static function load(Zend_Pdf_Element $resource)
-    {
-        /** @todo implementation */
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Annotation/FileAttachment.php b/airtime_mvc/library/Zend/Pdf/Annotation/FileAttachment.php
deleted file mode 100644
index a17aea14c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Annotation/FileAttachment.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FileAttachment.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Annotation */
-require_once 'Zend/Pdf/Annotation.php';
-
-/**
- * A file attachment annotation contains a reference to a file,
- * which typically is embedded in the PDF file.
- *
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Annotation_FileAttachment extends Zend_Pdf_Annotation
-{
-    /**
-     * Annotation object constructor
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $annotationDictionary)
-    {
-        if ($annotationDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Annotation dictionary resource has to be a dictionary.');
-        }
-
-        if ($annotationDictionary->Subtype === null  ||
-            $annotationDictionary->Subtype->getType() != Zend_Pdf_Element::TYPE_NAME  ||
-            $annotationDictionary->Subtype->value != 'FileAttachment') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Subtype => FileAttachment entry is requires');
-        }
-
-        parent::__construct($annotationDictionary);
-    }
-
-    /**
-     * Create link annotation object
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param string $fileSpecification
-     * @return Zend_Pdf_Annotation_FileAttachment
-     */
-    public static function create($x1, $y1, $x2, $y2, $fileSpecification)
-    {
-        $annotationDictionary = new Zend_Pdf_Element_Dictionary();
-
-        $annotationDictionary->Type    = new Zend_Pdf_Element_Name('Annot');
-        $annotationDictionary->Subtype = new Zend_Pdf_Element_Name('FileAttachment');
-
-        $rectangle = new Zend_Pdf_Element_Array();
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x2);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y2);
-        $annotationDictionary->Rect = $rectangle;
-
-        $fsDictionary = new Zend_Pdf_Element_Dictionary();
-        $fsDictionary->Type = new Zend_Pdf_Element_Name('Filespec');
-        $fsDictionary->F    = new Zend_Pdf_Element_String($fileSpecification);
-
-        $annotationDictionary->FS = $fsDictionary;
-
-
-        return new Zend_Pdf_Annotation_FileAttachment($annotationDictionary);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Annotation/Link.php b/airtime_mvc/library/Zend/Pdf/Annotation/Link.php
deleted file mode 100644
index cb8a70a41..000000000
--- a/airtime_mvc/library/Zend/Pdf/Annotation/Link.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Annotation */
-require_once 'Zend/Pdf/Annotation.php';
-
-/**
- * A link annotation represents either a hypertext link to a destination elsewhere in
- * the document or an action to be performed.
- *
- * Only destinations are used now since only GoTo action can be created by user
- * in current implementation.
- *
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Annotation_Link extends Zend_Pdf_Annotation
-{
-    /**
-     * Annotation object constructor
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $annotationDictionary)
-    {
-        if ($annotationDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Annotation dictionary resource has to be a dictionary.');
-        }
-
-        if ($annotationDictionary->Subtype === null  ||
-            $annotationDictionary->Subtype->getType() != Zend_Pdf_Element::TYPE_NAME  ||
-            $annotationDictionary->Subtype->value != 'Link') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Subtype => Link entry is requires');
-        }
-
-        parent::__construct($annotationDictionary);
-    }
-
-    /**
-     * Create link annotation object
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param Zend_Pdf_Target|string $target
-     * @return Zend_Pdf_Annotation_Link
-     */
-    public static function create($x1, $y1, $x2, $y2, $target)
-    {
-        if (is_string($target)) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            $destination = Zend_Pdf_Destination_Named::create($target);
-        }
-        if (!$target instanceof Zend_Pdf_Target) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$target parameter must be a Zend_Pdf_Target object or a string.');
-        }
-
-        $annotationDictionary = new Zend_Pdf_Element_Dictionary();
-
-        $annotationDictionary->Type    = new Zend_Pdf_Element_Name('Annot');
-        $annotationDictionary->Subtype = new Zend_Pdf_Element_Name('Link');
-
-        $rectangle = new Zend_Pdf_Element_Array();
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x2);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y2);
-        $annotationDictionary->Rect = $rectangle;
-
-        if ($target instanceof Zend_Pdf_Destination) {
-            $annotationDictionary->Dest = $target->getResource();
-        } else {
-            $annotationDictionary->A = $target->getResource();
-        }
-
-        return new Zend_Pdf_Annotation_Link($annotationDictionary);
-    }
-
-    /**
-     * Set link annotation destination
-     *
-     * @param Zend_Pdf_Target|string $target
-     * @return Zend_Pdf_Annotation_Link
-     */
-    public function setDestination($target)
-    {
-        if (is_string($target)) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            $destination = Zend_Pdf_Destination_Named::create($target);
-        }
-        if (!$target instanceof Zend_Pdf_Target) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$target parameter must be a Zend_Pdf_Target object or a string.');
-        }
-
-        $this->_annotationDictionary->touch();
-        $this->_annotationDictionary->Dest = $destination->getResource();
-        if ($target instanceof Zend_Pdf_Destination) {
-            $this->_annotationDictionary->Dest = $target->getResource();
-            $this->_annotationDictionary->A    = null;
-        } else {
-            $this->_annotationDictionary->Dest = null;
-            $this->_annotationDictionary->A    = $target->getResource();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get link annotation destination
-     *
-     * @return Zend_Pdf_Target|null
-     */
-    public function getDestination()
-    {
-        if ($this->_annotationDictionary->Dest === null  &&
-            $this->_annotationDictionary->A    === null) {
-            return null;
-        }
-
-        if ($this->_annotationDictionary->Dest !== null) {
-            require_once 'Zend/Pdf/Destination.php';
-            return Zend_Pdf_Destination::load($this->_annotationDictionary->Dest);
-        } else {
-            require_once 'Zend/Pdf/Action.php';
-            return Zend_Pdf_Action::load($this->_annotationDictionary->A);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Annotation/Markup.php b/airtime_mvc/library/Zend/Pdf/Annotation/Markup.php
deleted file mode 100644
index 17c355e68..000000000
--- a/airtime_mvc/library/Zend/Pdf/Annotation/Markup.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Annotation */
-require_once 'Zend/Pdf/Annotation.php';
-
-/**
- * A markup annotation
- *
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Annotation_Markup extends Zend_Pdf_Annotation
-{
-    /**
-     * Annotation subtypes
-     */
-    const SUBTYPE_HIGHLIGHT = 'Highlight';
-    const SUBTYPE_UNDERLINE = 'Underline';
-    const SUBTYPE_SQUIGGLY  = 'Squiggly';
-    const SUBTYPE_STRIKEOUT = 'StrikeOut';
-
-    /**
-     * Annotation object constructor
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $annotationDictionary)
-    {
-        if ($annotationDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Annotation dictionary resource has to be a dictionary.');
-        }
-
-        if ($annotationDictionary->Subtype === null  ||
-            $annotationDictionary->Subtype->getType() != Zend_Pdf_Element::TYPE_NAME  ||
-            !in_array( $annotationDictionary->Subtype->value,
-                       array(self::SUBTYPE_HIGHLIGHT,
-                             self::SUBTYPE_UNDERLINE,
-                             self::SUBTYPE_SQUIGGLY,
-                             self::SUBTYPE_STRIKEOUT) )) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Subtype => Markup entry is omitted or has wrong value.');
-        }
-
-        parent::__construct($annotationDictionary);
-    }
-
-    /**
-     * Create markup annotation object
-     *
-     * Text markup annotations appear as highlights, underlines, strikeouts or
-     * jagged ("squiggly") underlines in the text of a document. When opened,
-     * they display a pop-up window containing the text of the associated note.
-     *
-     * $subType parameter may contain
-     *     Zend_Pdf_Annotation_Markup::SUBTYPE_HIGHLIGHT
-     *     Zend_Pdf_Annotation_Markup::SUBTYPE_UNDERLINE
-     *     Zend_Pdf_Annotation_Markup::SUBTYPE_SQUIGGLY
-     *     Zend_Pdf_Annotation_Markup::SUBTYPE_STRIKEOUT
-     * for for a highlight, underline, squiggly-underline, or strikeout annotation,
-     * respectively.
-     *
-     * $quadPoints is an array of 8xN numbers specifying the coordinates of
-     * N quadrilaterals default user space. Each quadrilateral encompasses a word or
-     * group of contiguous words in the text underlying the annotation.
-     * The coordinates for each quadrilateral are given in the order
-     *     x1 y1 x2 y2 x3 y3 x4 y4
-     * specifying the quadrilateral’s four vertices in counterclockwise order
-     * starting from left bottom corner.
-     * The text is oriented with respect to the edge connecting points
-     * (x1, y1) and (x2, y2).
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param string $text
-     * @param string $subType
-     * @param array $quadPoints  [x1 y1 x2 y2 x3 y3 x4 y4]
-     * @return Zend_Pdf_Annotation_Markup
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($x1, $y1, $x2, $y2, $text, $subType, $quadPoints)
-    {
-        $annotationDictionary = new Zend_Pdf_Element_Dictionary();
-
-        $annotationDictionary->Type    = new Zend_Pdf_Element_Name('Annot');
-        $annotationDictionary->Subtype = new Zend_Pdf_Element_Name($subType);
-
-        $rectangle = new Zend_Pdf_Element_Array();
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x2);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y2);
-        $annotationDictionary->Rect = $rectangle;
-
-        $annotationDictionary->Contents = new Zend_Pdf_Element_String($text);
-
-        if (!is_array($quadPoints)  ||  count($quadPoints) == 0  ||  count($quadPoints) % 8 != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$quadPoints parameter must be an array of 8xN numbers');
-        }
-        $points = new Zend_Pdf_Element_Array();
-        foreach ($quadPoints as $quadPoint) {
-            $points->items[] = new Zend_Pdf_Element_Numeric($quadPoint);
-        }
-        $annotationDictionary->QuadPoints = $points;
-
-        return new Zend_Pdf_Annotation_Markup($annotationDictionary);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Annotation/Text.php b/airtime_mvc/library/Zend/Pdf/Annotation/Text.php
deleted file mode 100644
index 1895485ea..000000000
--- a/airtime_mvc/library/Zend/Pdf/Annotation/Text.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Annotation */
-require_once 'Zend/Pdf/Annotation.php';
-
-/**
- * A text annotation represents a "sticky note" attached to a point in the PDF document.
- *
- * @package    Zend_Pdf
- * @subpackage Annotation
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Annotation_Text extends Zend_Pdf_Annotation
-{
-    /**
-     * Annotation object constructor
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $annotationDictionary)
-    {
-        if ($annotationDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Annotation dictionary resource has to be a dictionary.');
-        }
-
-        if ($annotationDictionary->Subtype === null  ||
-            $annotationDictionary->Subtype->getType() != Zend_Pdf_Element::TYPE_NAME  ||
-            $annotationDictionary->Subtype->value != 'Text') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Subtype => Text entry is requires');
-        }
-
-        parent::__construct($annotationDictionary);
-    }
-
-    /**
-     * Create link annotation object
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param string $text
-     * @return Zend_Pdf_Annotation_Text
-     */
-    public static function create($x1, $y1, $x2, $y2, $text)
-    {
-        $annotationDictionary = new Zend_Pdf_Element_Dictionary();
-
-        $annotationDictionary->Type    = new Zend_Pdf_Element_Name('Annot');
-        $annotationDictionary->Subtype = new Zend_Pdf_Element_Name('Text');
-
-        $rectangle = new Zend_Pdf_Element_Array();
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y1);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($x2);
-        $rectangle->items[] = new Zend_Pdf_Element_Numeric($y2);
-        $annotationDictionary->Rect = $rectangle;
-
-        $annotationDictionary->Contents = new Zend_Pdf_Element_String($text);
-
-        return new Zend_Pdf_Annotation_Text($annotationDictionary);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Cmap.php b/airtime_mvc/library/Zend/Pdf/Cmap.php
deleted file mode 100644
index d009e4127..000000000
--- a/airtime_mvc/library/Zend/Pdf/Cmap.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cmap.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract helper class for {@link Zend_Pdf_Resource_Font} which manages font
- * character maps.
- *
- * Defines the public interface for concrete subclasses which are responsible
- * for mapping Unicode characters to the font's glyph numbers. Also provides
- * shared utility methods.
- *
- * Cmap objects should ordinarily be obtained through the factory method
- * {@link cmapWithTypeData()}.
- *
- * The supported character map types are those found in the OpenType spec. For
- * additional detail on the internal binary format of these tables, see:
- * <ul>
- *  <li>{@link http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6cmap.html}
- *  <li>{@link http://www.microsoft.com/OpenType/OTSpec/cmap.htm}
- *  <li>{@link http://partners.adobe.com/public/developer/opentype/index_cmap.html}
- * </ul>
- *
- * @todo Write code for Zend_Pdf_FontCmap_HighByteMapping class.
- * @todo Write code for Zend_Pdf_FontCmap_MixedCoverage class.
- * @todo Write code for Zend_Pdf_FontCmap_TrimmedArray class.
- * @todo Write code for Zend_Pdf_FontCmap_SegmentedCoverage class.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Cmap
-{
-  /**** Class Constants ****/
-
-
-  /* Cmap Table Types */
-
-    /**
-     * Byte Encoding character map table type.
-     */
-    const TYPE_BYTE_ENCODING = 0x00;
-
-    /**
-     * High Byte Mapping character map table type.
-     */
-    const TYPE_HIGH_BYTE_MAPPING = 0x02;
-
-    /**
-     * Segment Value to Delta Mapping character map table type.
-     */
-    const TYPE_SEGMENT_TO_DELTA = 0x04;
-
-    /**
-     * Trimmed Table character map table type.
-     */
-    const TYPE_TRIMMED_TABLE = 0x06;
-
-    /**
-     * Mixed Coverage character map table type.
-     */
-    const TYPE_MIXED_COVERAGE = 0x08;
-
-    /**
-     * Trimmed Array character map table type.
-     */
-    const TYPE_TRIMMED_ARRAY = 0x0a;
-
-    /**
-     * Segmented Coverage character map table type.
-     */
-    const TYPE_SEGMENTED_COVERAGE = 0x0c;
-
-    /**
-     * Static Byte Encoding character map table type. Variant of
-     * {@link TYPE_BYTEENCODING}.
-     */
-    const TYPE_BYTE_ENCODING_STATIC = 0xf1;
-
-    /**
-     * Unknown character map table type.
-     */
-    const TYPE_UNKNOWN = 0xff;
-
-
-  /* Special Glyph Names */
-
-    /**
-     * Glyph representing missing characters.
-     */
-    const MISSING_CHARACTER_GLYPH = 0x00;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Factory Methods */
-
-    /**
-     * Instantiates the appropriate concrete subclass based on the type of cmap
-     * table and returns the instance.
-     *
-     * The cmap type must be one of the following values:
-     * <ul>
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_BYTE_ENCODING}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_HIGH_BYTE_MAPPING}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_SEGMENT_TO_DELTA}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_TRIMMED_TABLE}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_MIXED_COVERAGE}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_TRIMMED_ARRAY}
-     *  <li>{@link Zend_Pdf_Cmap::TYPE_SEGMENTED_COVERAGE}
-     * </ul>
-     *
-     * Throws an exception if the table type is invalid or the cmap table data
-     * cannot be validated.
-     *
-     * @param integer $cmapType Type of cmap.
-     * @param mixed $cmapData Cmap table data. Usually a string or array.
-     * @return Zend_Pdf_Cmap
-     * @throws Zend_Pdf_Exception
-     */
-    public static function cmapWithTypeData($cmapType, $cmapData)
-    {
-        switch ($cmapType) {
-            case Zend_Pdf_Cmap::TYPE_BYTE_ENCODING:
-                require_once 'Zend/Pdf/Cmap/ByteEncoding.php';
-                return new Zend_Pdf_Cmap_ByteEncoding($cmapData);
-
-            case Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC:
-                require_once 'Zend/Pdf/Cmap/ByteEncoding/Static.php';
-                return new Zend_Pdf_Cmap_ByteEncoding_Static($cmapData);
-
-            case Zend_Pdf_Cmap::TYPE_HIGH_BYTE_MAPPING:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('High byte mapping cmap currently unsupported',
-                                             Zend_Pdf_Exception::CMAP_TYPE_UNSUPPORTED);
-
-            case Zend_Pdf_Cmap::TYPE_SEGMENT_TO_DELTA:
-                require_once 'Zend/Pdf/Cmap/SegmentToDelta.php';
-                return new Zend_Pdf_Cmap_SegmentToDelta($cmapData);
-
-            case Zend_Pdf_Cmap::TYPE_TRIMMED_TABLE:
-                require_once 'Zend/Pdf/Cmap/TrimmedTable.php';
-                return new Zend_Pdf_Cmap_TrimmedTable($cmapData);
-
-            case Zend_Pdf_Cmap::TYPE_MIXED_COVERAGE:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Mixed coverage cmap currently unsupported',
-                                             Zend_Pdf_Exception::CMAP_TYPE_UNSUPPORTED);
-
-            case Zend_Pdf_Cmap::TYPE_TRIMMED_ARRAY:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Trimmed array cmap currently unsupported',
-                                             Zend_Pdf_Exception::CMAP_TYPE_UNSUPPORTED);
-
-            case Zend_Pdf_Cmap::TYPE_SEGMENTED_COVERAGE:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Segmented coverage cmap currently unsupported',
-                                             Zend_Pdf_Exception::CMAP_TYPE_UNSUPPORTED);
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Unknown cmap type: $cmapType",
-                                             Zend_Pdf_Exception::CMAP_UNKNOWN_TYPE);
-        }
-    }
-
-
-  /* Abstract Methods */
-
-    /**
-     * Object constructor
-     *
-     * Parses the raw binary table data. Throws an exception if the table is
-     * malformed.
-     *
-     * @param string $cmapData Raw binary cmap table data.
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function __construct($cmapData);
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    abstract public function glyphNumbersForCharacters($characterCodes);
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    abstract public function glyphNumberForCharacter($characterCode);
-
-    /**
-     * Returns an array containing the Unicode characters that have entries in
-     * this character map.
-     *
-     * @return array Unicode character codes.
-     */
-    abstract public function getCoveredCharacters();
-
-    /**
-     * Returns an array containing the glyphs numbers that have entries in this character map.
-     * Keys are Unicode character codes (integers)
-     *
-     * This functionality is partially covered by glyphNumbersForCharacters(getCoveredCharacters())
-     * call, but this method do it in more effective way (prepare complete list instead of searching
-     * glyph for each character code).
-     *
-     * @internal
-     * @return array Array representing <Unicode character code> => <glyph number> pairs.
-     */
-    abstract public function getCoveredCharactersGlyphs();
-
-
-  /**** Internal Methods ****/
-
-
-  /* Internal Utility Methods */
-
-    /**
-     * Extracts a signed 2-byte integer from a string.
-     *
-     * Integers are always big-endian. Throws an exception if the index is out
-     * of range.
-     *
-     * @param string &$data
-     * @param integer $index Position in string of integer.
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _extractInt2(&$data, $index)
-    {
-        if (($index < 0) | (($index + 1) > strlen($data))) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Index out of range: $index",
-                                         Zend_Pdf_Exception::INDEX_OUT_OF_RANGE);
-        }
-        $number = ord($data[$index]);
-        if (($number & 0x80) == 0x80) {    // negative
-            $number = ~((((~ $number) & 0xff) << 8) | ((~ ord($data[++$index])) & 0xff));
-        } else {
-            $number = ($number << 8) | ord($data[++$index]);
-        }
-        return $number;
-    }
-
-    /**
-     * Extracts an unsigned 2-byte integer from a string.
-     *
-     * Integers are always big-endian. Throws an exception if the index is out
-     * of range.
-     *
-     * @param string &$data
-     * @param integer $index Position in string of integer.
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _extractUInt2(&$data, $index)
-    {
-        if (($index < 0) | (($index + 1) > strlen($data))) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Index out of range: $index",
-                                         Zend_Pdf_Exception::INDEX_OUT_OF_RANGE);
-        }
-        $number = (ord($data[$index]) << 8) | ord($data[++$index]);
-        return $number;
-    }
-
-    /**
-     * Extracts an unsigned 4-byte integer from a string.
-     *
-     * Integers are always big-endian. Throws an exception if the index is out
-     * of range.
-     *
-     * NOTE: If you ask for a 4-byte unsigned integer on a 32-bit machine, the
-     * resulting value WILL BE SIGNED because PHP uses signed integers internally
-     * for everything. To guarantee portability, be sure to use bitwise or
-     * similar operators on large integers!
-     *
-     * @param string &$data
-     * @param integer $index Position in string of integer.
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _extractUInt4(&$data, $index)
-    {
-        if (($index < 0) | (($index + 3) > strlen($data))) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Index out of range: $index",
-                                         Zend_Pdf_Exception::INDEX_OUT_OF_RANGE);
-        }
-        $number = (ord($data[$index]) << 24) | (ord($data[++$index]) << 16) |
-                  (ord($data[++$index]) << 8) | ord($data[++$index]);
-        return $number;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding.php b/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding.php
deleted file mode 100644
index 7e7395c49..000000000
--- a/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ByteEncoding.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Cmap */
-require_once 'Zend/Pdf/Cmap.php';
-
-
-/**
- * Implements the "byte encoding" character map (type 0).
- *
- * This is the (legacy) Apple standard encoding mechanism and provides coverage
- * for characters in the Mac Roman character set only. Consequently, this cmap
- * type should be used only as a last resort.
- *
- * The mapping from Mac Roman to Unicode can be found at
- * {@link http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Cmap_ByteEncoding extends Zend_Pdf_Cmap
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Glyph index array. Stores the actual glyph numbers. The array keys are
-     * the translated Unicode code points.
-     * @var array
-     */
-    protected $_glyphIndexArray = array();
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        $glyphNumbers = array();
-        foreach ($characterCodes as $key => $characterCode) {
-
-           if (! isset($this->_glyphIndexArray[$characterCode])) {
-                $glyphNumbers[$key] = Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-                continue;
-            }
-
-            $glyphNumbers[$key] = $this->_glyphIndexArray[$characterCode];
-
-        }
-        return $glyphNumbers;
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        if (! isset($this->_glyphIndexArray[$characterCode])) {
-            return Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-        }
-        return $this->_glyphIndexArray[$characterCode];
-    }
-
-    /**
-     * Returns an array containing the Unicode characters that have entries in
-     * this character map.
-     *
-     * @return array Unicode character codes.
-     */
-    public function getCoveredCharacters()
-    {
-        return array_keys($this->_glyphIndexArray);
-    }
-
-    /**
-     * Returns an array containing the glyphs numbers that have entries in this character map.
-     * Keys are Unicode character codes (integers)
-     *
-     * This functionality is partially covered by glyphNumbersForCharacters(getCoveredCharacters())
-     * call, but this method do it in more effective way (prepare complete list instead of searching
-     * glyph for each character code).
-     *
-     * @internal
-     * @return array Array representing <Unicode character code> => <glyph number> pairs.
-     */
-    public function getCoveredCharactersGlyphs()
-    {
-        return $this->_glyphIndexArray;
-    }
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     *
-     * Parses the raw binary table data. Throws an exception if the table is
-     * malformed.
-     *
-     * @param string $cmapData Raw binary cmap table data.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($cmapData)
-    {
-        /* Sanity check: This table must be exactly 262 bytes long.
-         */
-        $actualLength = strlen($cmapData);
-        if ($actualLength != 262) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Insufficient table data',
-                                         Zend_Pdf_Exception::CMAP_TABLE_DATA_TOO_SMALL);
-        }
-
-        /* Sanity check: Make sure this is right data for this table type.
-         */
-        $type = $this->_extractUInt2($cmapData, 0);
-        if ($type != Zend_Pdf_Cmap::TYPE_BYTE_ENCODING) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong cmap table type',
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_TYPE);
-        }
-
-        $length = $this->_extractUInt2($cmapData, 2);
-        if ($length != $actualLength) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Table length ($length) does not match actual length ($actualLength)",
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_LENGTH);
-        }
-
-        /* Mapping tables should be language-independent. The font may not work
-         * as expected if they are not. Unfortunately, many font files in the
-         * wild incorrectly record a language ID in this field, so we can't
-         * call this a failure.
-         */
-        $language = $this->_extractUInt2($cmapData, 4);
-        if ($language != 0) {
-            // Record a warning here somehow?
-        }
-
-        /* The mapping between the Mac Roman and Unicode characters is static.
-         * For simplicity, just put all 256 glyph indices into one array keyed
-         * off the corresponding Unicode character.
-         */
-        $i = 6;
-        $this->_glyphIndexArray[0x00]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x01]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x03]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x04]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x05]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x06]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x07]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x08]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x09]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x10]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x11]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x12]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x13]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x14]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x15]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x16]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x17]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x18]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x19]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x1f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x20]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x21]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x22]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x23]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x24]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x25]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x26]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x27]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x28]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x29]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x30]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x31]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x32]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x33]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x34]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x35]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x36]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x37]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x38]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x39]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x3f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x40]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x41]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x42]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x43]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x44]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x45]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x46]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x47]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x48]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x49]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x4f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x50]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x51]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x52]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x53]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x54]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x55]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x56]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x57]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x58]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x59]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x5f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x60]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x61]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x62]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x63]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x64]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x65]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x66]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x67]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x68]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x69]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x6f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x70]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x71]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x72]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x73]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x74]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x75]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x76]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x77]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x78]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x79]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7a]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7b]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7c]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7d]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7e]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x7f]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc4]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc7]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc9]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd6]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xdc]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe0]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe2]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe4]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe3]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe7]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe9]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xea]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xeb]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xed]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xec]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xee]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xef]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf3]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf2]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf4]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf6]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xfa]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf9]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xfb]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xfc]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2020] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb0]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa2]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa3]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa7]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2022] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb6]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xdf]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xae]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa9]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2122] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb4]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2260] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc6]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x221e] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2264] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2265] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2202] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2211] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x220f] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x03c0] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x222b] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xaa]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xba]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x03a9] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xe6]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xbf]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xac]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x221a] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0192] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2248] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2206] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xab]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xbb]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2026] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xa0]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc0]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc3]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd5]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0152] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0153] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2013] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2014] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x201c] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x201d] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2018] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2019] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf7]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x25ca] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xff]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0178] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2044] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x20ac] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2039] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x203a] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xfb01] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xfb02] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2021] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb7]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x201a] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x201e] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x2030] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc2]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xca]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc1]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xcb]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xc8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xcd]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xce]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xcf]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xcc]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd3]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd4]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xf8ff] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd2]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xda]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xdb]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xd9]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x0131] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02c6] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02dc] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xaf]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02d8] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02d9] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02da] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0xb8]   = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02dd] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02db] = ord($cmapData[$i++]);
-        $this->_glyphIndexArray[0x02c7] = ord($cmapData[$i]);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding/Static.php b/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding/Static.php
deleted file mode 100644
index a10f7b7a8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Cmap/ByteEncoding/Static.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Static.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Cmap_ByteEncoding */
-require_once 'Zend/Pdf/Cmap/ByteEncoding.php';
-
-
-/**
- * Custom cmap type used for the Adobe Standard 14 PDF fonts.
- *
- * Just like {@link Zend_Pdf_Cmap_ByteEncoding} except that the constructor
- * takes a predefined array of glyph numbers and can cover any Unicode character.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Cmap_ByteEncoding_Static extends Zend_Pdf_Cmap_ByteEncoding
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     *
-     * @param array $cmapData Array whose keys are Unicode character codes and
-     *   values are glyph numbers.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($cmapData)
-    {
-        if (! is_array($cmapData)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Constructor parameter must be an array',
-                                         Zend_Pdf_Exception::BAD_PARAMETER_TYPE);
-        }
-        $this->_glyphIndexArray = $cmapData;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Cmap/SegmentToDelta.php b/airtime_mvc/library/Zend/Pdf/Cmap/SegmentToDelta.php
deleted file mode 100644
index b46e87648..000000000
--- a/airtime_mvc/library/Zend/Pdf/Cmap/SegmentToDelta.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SegmentToDelta.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Cmap */
-require_once 'Zend/Pdf/Cmap.php';
-
-
-/**
- * Implements the "segment mapping to delta values" character map (type 4).
- *
- * This is the Microsoft standard mapping table type for OpenType fonts. It
- * provides the ability to cover multiple contiguous ranges of the Unicode
- * character set, with the exception of Unicode Surrogates (U+D800 - U+DFFF).
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Cmap_SegmentToDelta extends Zend_Pdf_Cmap
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * The number of segments in the table.
-     * @var integer
-     */
-    protected $_segmentCount = 0;
-
-    /**
-     * The size of the binary search range for segments.
-     * @var integer
-     */
-    protected $_searchRange = 0;
-
-    /**
-     * The number of binary search steps required to cover the entire search
-     * range.
-     * @var integer
-     */
-    protected $_searchIterations = 0;
-
-    /**
-     * Array of ending character codes for each segment.
-     * @var array
-     */
-    protected $_segmentTableEndCodes = array();
-
-    /**
-     * The ending character code for the segment at the end of the low search
-     * range.
-     * @var integer
-     */
-    protected $_searchRangeEndCode = 0;
-
-    /**
-     * Array of starting character codes for each segment.
-     * @var array
-     */
-    protected $_segmentTableStartCodes = array();
-
-    /**
-     * Array of character code to glyph delta values for each segment.
-     * @var array
-     */
-    protected $_segmentTableIdDeltas = array();
-
-    /**
-     * Array of offsets into the glyph index array for each segment.
-     * @var array
-     */
-    protected $_segmentTableIdRangeOffsets = array();
-
-    /**
-     * Glyph index array. Stores glyph numbers, used with range offset.
-     * @var array
-     */
-    protected $_glyphIndexArray = array();
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        $glyphNumbers = array();
-        foreach ($characterCodes as $key => $characterCode) {
-
-            /* These tables only cover the 16-bit character range.
-             */
-            if ($characterCode > 0xffff) {
-                $glyphNumbers[$key] = Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-                continue;
-            }
-
-            /* Determine where to start the binary search. The segments are
-             * ordered from lowest-to-highest. We are looking for the first
-             * segment whose end code is greater than or equal to our character
-             * code.
-             *
-             * If the end code at the top of the search range is larger, then
-             * our target is probably below it.
-             *
-             * If it is smaller, our target is probably above it, so move the
-             * search range to the end of the segment list.
-             */
-            if ($this->_searchRangeEndCode >= $characterCode) {
-                $searchIndex = $this->_searchRange;
-            } else {
-                $searchIndex = $this->_segmentCount;
-            }
-
-            /* Now do a binary search to find the first segment whose end code
-             * is greater or equal to our character code. No matter the number
-             * of segments (there may be hundreds in a large font), we will only
-             * need to perform $this->_searchIterations.
-             */
-            for ($i = 1; $i <= $this->_searchIterations; $i++) {
-                if ($this->_segmentTableEndCodes[$searchIndex] >= $characterCode) {
-                    $subtableIndex = $searchIndex;
-                    $searchIndex -= $this->_searchRange >> $i;
-                } else {
-                    $searchIndex += $this->_searchRange >> $i;
-                }
-            }
-
-            /* If the segment's start code is greater than our character code,
-             * that character is not represented in this font. Move on.
-             */
-            if ($this->_segmentTableStartCodes[$subtableIndex] > $characterCode) {
-                $glyphNumbers[$key] = Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-                continue;
-            }
-
-            if ($this->_segmentTableIdRangeOffsets[$subtableIndex] == 0) {
-                /* This segment uses a simple mapping from character code to
-                 * glyph number.
-                 */
-                $glyphNumbers[$key] = ($characterCode + $this->_segmentTableIdDeltas[$subtableIndex]) % 65536;
-
-            } else {
-                /* This segment relies on the glyph index array to determine the
-                 * glyph number. The calculation below determines the correct
-                 * index into that array. It's a little odd because the range
-                 * offset in the font file is designed to quickly provide an
-                 * address of the index in the raw binary data instead of the
-                 * index itself. Since we've parsed the data into arrays, we
-                 * must process it a bit differently.
-                 */
-                $glyphIndex = ($characterCode - $this->_segmentTableStartCodes[$subtableIndex] +
-                               $this->_segmentTableIdRangeOffsets[$subtableIndex] - $this->_segmentCount +
-                               $subtableIndex - 1);
-                $glyphNumbers[$key] = $this->_glyphIndexArray[$glyphIndex];
-
-            }
-
-        }
-        return $glyphNumbers;
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        /* This code is pretty much a copy of glyphNumbersForCharacters().
-         * See that method for inline documentation.
-         */
-
-        if ($characterCode > 0xffff) {
-            return Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-        }
-
-        if ($this->_searchRangeEndCode >= $characterCode) {
-            $searchIndex = $this->_searchRange;
-        } else {
-            $searchIndex = $this->_segmentCount;
-        }
-
-        for ($i = 1; $i <= $this->_searchIterations; $i++) {
-            if ($this->_segmentTableEndCodes[$searchIndex] >= $characterCode) {
-                $subtableIndex = $searchIndex;
-                $searchIndex -= $this->_searchRange >> $i;
-            } else {
-                $searchIndex += $this->_searchRange >> $i;
-            }
-        }
-
-        if ($this->_segmentTableStartCodes[$subtableIndex] > $characterCode) {
-            return Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-        }
-
-        if ($this->_segmentTableIdRangeOffsets[$subtableIndex] == 0) {
-            $glyphNumber = ($characterCode + $this->_segmentTableIdDeltas[$subtableIndex]) % 65536;
-        } else {
-            $glyphIndex = ($characterCode - $this->_segmentTableStartCodes[$subtableIndex] +
-                           $this->_segmentTableIdRangeOffsets[$subtableIndex] - $this->_segmentCount +
-                           $subtableIndex - 1);
-            $glyphNumber = $this->_glyphIndexArray[$glyphIndex];
-        }
-        return $glyphNumber;
-    }
-
-    /**
-     * Returns an array containing the Unicode characters that have entries in
-     * this character map.
-     *
-     * @return array Unicode character codes.
-     */
-    public function getCoveredCharacters()
-    {
-        $characterCodes = array();
-        for ($i = 1; $i <= $this->_segmentCount; $i++) {
-            for ($code = $this->_segmentTableStartCodes[$i]; $code <= $this->_segmentTableEndCodes[$i]; $code++) {
-                $characterCodes[] = $code;
-            }
-        }
-        return $characterCodes;
-    }
-
-
-    /**
-     * Returns an array containing the glyphs numbers that have entries in this character map.
-     * Keys are Unicode character codes (integers)
-     *
-     * This functionality is partially covered by glyphNumbersForCharacters(getCoveredCharacters())
-     * call, but this method do it in more effective way (prepare complete list instead of searching
-     * glyph for each character code).
-     *
-     * @internal
-     * @return array Array representing <Unicode character code> => <glyph number> pairs.
-     */
-    public function getCoveredCharactersGlyphs()
-    {
-        $glyphNumbers = array();
-
-        for ($segmentNum = 1; $segmentNum <= $this->_segmentCount; $segmentNum++) {
-            if ($this->_segmentTableIdRangeOffsets[$segmentNum] == 0) {
-                $delta = $this->_segmentTableIdDeltas[$segmentNum];
-
-                for ($code =  $this->_segmentTableStartCodes[$segmentNum];
-                     $code <= $this->_segmentTableEndCodes[$segmentNum];
-                     $code++) {
-                    $glyphNumbers[$code] = ($code + $delta) % 65536;
-                }
-            } else {
-                $code       = $this->_segmentTableStartCodes[$segmentNum];
-                $glyphIndex = $this->_segmentTableIdRangeOffsets[$segmentNum] - ($this->_segmentCount - $segmentNum) - 1;
-
-                while ($code <= $this->_segmentTableEndCodes[$segmentNum]) {
-                    $glyphNumbers[$code] = $this->_glyphIndexArray[$glyphIndex];
-
-                    $code++;
-                    $glyphIndex++;
-                }
-            }
-        }
-
-        return $glyphNumbers;
-    }
-
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     *
-     * Parses the raw binary table data. Throws an exception if the table is
-     * malformed.
-     *
-     * @param string $cmapData Raw binary cmap table data.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($cmapData)
-    {
-        /* Sanity check: The table should be at least 23 bytes in size.
-         */
-        $actualLength = strlen($cmapData);
-        if ($actualLength < 23) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Insufficient table data',
-                                         Zend_Pdf_Exception::CMAP_TABLE_DATA_TOO_SMALL);
-        }
-
-        /* Sanity check: Make sure this is right data for this table type.
-         */
-        $type = $this->_extractUInt2($cmapData, 0);
-        if ($type != Zend_Pdf_Cmap::TYPE_SEGMENT_TO_DELTA) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong cmap table type',
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_TYPE);
-        }
-
-        $length = $this->_extractUInt2($cmapData, 2);
-        if ($length != $actualLength) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Table length ($length) does not match actual length ($actualLength)",
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_LENGTH);
-        }
-
-        /* Mapping tables should be language-independent. The font may not work
-         * as expected if they are not. Unfortunately, many font files in the
-         * wild incorrectly record a language ID in this field, so we can't
-         * call this a failure.
-         */
-        $language = $this->_extractUInt2($cmapData, 4);
-        if ($language != 0) {
-            // Record a warning here somehow?
-        }
-
-        /* These two values are stored premultiplied by two which is convienent
-         * when using the binary data directly, but we're parsing it out to
-         * native PHP data types, so divide by two.
-         */
-        $this->_segmentCount = $this->_extractUInt2($cmapData, 6) >> 1;
-        $this->_searchRange  = $this->_extractUInt2($cmapData, 8) >> 1;
-
-        $this->_searchIterations = $this->_extractUInt2($cmapData, 10) + 1;
-
-        $offset = 14;
-        for ($i = 1; $i <= $this->_segmentCount; $i++, $offset += 2) {
-            $this->_segmentTableEndCodes[$i] = $this->_extractUInt2($cmapData, $offset);
-        }
-
-        $this->_searchRangeEndCode = $this->_segmentTableEndCodes[$this->_searchRange];
-
-        $offset += 2;    // reserved bytes
-
-        for ($i = 1; $i <= $this->_segmentCount; $i++, $offset += 2) {
-            $this->_segmentTableStartCodes[$i] = $this->_extractUInt2($cmapData, $offset);
-        }
-
-        for ($i = 1; $i <= $this->_segmentCount; $i++, $offset += 2) {
-            $this->_segmentTableIdDeltas[$i] = $this->_extractInt2($cmapData, $offset);    // signed
-        }
-
-        /* The range offset helps determine the index into the glyph index array.
-         * Like the segment count and search range above, it's stored as a byte
-         * multiple in the font, so divide by two as we extract the values.
-         */
-        for ($i = 1; $i <= $this->_segmentCount; $i++, $offset += 2) {
-            $this->_segmentTableIdRangeOffsets[$i] = $this->_extractUInt2($cmapData, $offset) >> 1;
-        }
-
-        /* The size of the glyph index array varies by font and depends on the
-         * extent of the usage of range offsets versus deltas. Some fonts may
-         * not have any entries in this array.
-         */
-        for (; $offset < $length; $offset += 2) {
-            $this->_glyphIndexArray[] = $this->_extractUInt2($cmapData, $offset);
-        }
-
-        /* Sanity check: After reading all of the data, we should be at the end
-         * of the table.
-         */
-        if ($offset != $length) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Ending offset ($offset) does not match length ($length)",
-                                         Zend_Pdf_Exception::CMAP_FINAL_OFFSET_NOT_LENGTH);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Cmap/TrimmedTable.php b/airtime_mvc/library/Zend/Pdf/Cmap/TrimmedTable.php
deleted file mode 100644
index 30ced8d19..000000000
--- a/airtime_mvc/library/Zend/Pdf/Cmap/TrimmedTable.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TrimmedTable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Cmap */
-require_once 'Zend/Pdf/Cmap.php';
-
-
-/**
- * Implements the "trimmed table mapping" character map (type 6).
- *
- * This table type is preferred over the {@link Zend_Pdf_Cmap_SegmentToDelta}
- * table when the Unicode characters covered by the font fall into a single
- * contiguous range.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Cmap_TrimmedTable extends Zend_Pdf_Cmap
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * The starting character code covered by this table.
-     * @var integer
-     */
-    protected $_startCode = 0;
-
-    /**
-     * The ending character code covered by this table.
-     * @var integer
-     */
-    protected $_endCode = 0;
-
-    /**
-     * Glyph index array. Stores the actual glyph numbers.
-     * @var array
-     */
-    protected $_glyphIndexArray = array();
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        $glyphNumbers = array();
-        foreach ($characterCodes as $key => $characterCode) {
-
-            if (($characterCode < $this->_startCode) || ($characterCode > $this->_endCode)) {
-                $glyphNumbers[$key] = Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-                continue;
-            }
-
-            $glyphIndex = $characterCode - $this->_startCode;
-            $glyphNumbers[$key] = $this->_glyphIndexArray[$glyphIndex];
-
-        }
-        return $glyphNumbers;
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        if (($characterCode < $this->_startCode) || ($characterCode > $this->_endCode)) {
-            return Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH;
-        }
-        $glyphIndex = $characterCode - $this->_startCode;
-        return $this->_glyphIndexArray[$glyphIndex];
-    }
-
-    /**
-     * Returns an array containing the Unicode characters that have entries in
-     * this character map.
-     *
-     * @return array Unicode character codes.
-     */
-    public function getCoveredCharacters()
-    {
-        $characterCodes = array();
-        for ($code = $this->_startCode; $code <= $this->_endCode; $code++) {
-            $characterCodes[] = $code;
-        }
-        return $characterCodes;
-    }
-
-
-    /**
-     * Returns an array containing the glyphs numbers that have entries in this character map.
-     * Keys are Unicode character codes (integers)
-     *
-     * This functionality is partially covered by glyphNumbersForCharacters(getCoveredCharacters())
-     * call, but this method do it in more effective way (prepare complete list instead of searching
-     * glyph for each character code).
-     *
-     * @internal
-     * @return array Array representing <Unicode character code> => <glyph number> pairs.
-     */
-    public function getCoveredCharactersGlyphs()
-    {
-        $glyphNumbers = array();
-        for ($code = $this->_startCode; $code <= $this->_endCode; $code++) {
-            $glyphNumbers[$code] = $this->_glyphIndexArray[$code - $this->_startCode];
-        }
-
-        return $glyphNumbers;
-    }
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     *
-     * Parses the raw binary table data. Throws an exception if the table is
-     * malformed.
-     *
-     * @param string $cmapData Raw binary cmap table data.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($cmapData)
-    {
-        /* Sanity check: The table should be at least 9 bytes in size.
-         */
-        $actualLength = strlen($cmapData);
-        if ($actualLength < 9) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Insufficient table data',
-                                         Zend_Pdf_Exception::CMAP_TABLE_DATA_TOO_SMALL);
-        }
-
-        /* Sanity check: Make sure this is right data for this table type.
-         */
-        $type = $this->_extractUInt2($cmapData, 0);
-        if ($type != Zend_Pdf_Cmap::TYPE_TRIMMED_TABLE) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong cmap table type',
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_TYPE);
-        }
-
-        $length = $this->_extractUInt2($cmapData, 2);
-        if ($length != $actualLength) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Table length ($length) does not match actual length ($actualLength)",
-                                         Zend_Pdf_Exception::CMAP_WRONG_TABLE_LENGTH);
-        }
-
-        /* Mapping tables should be language-independent. The font may not work
-         * as expected if they are not. Unfortunately, many font files in the
-         * wild incorrectly record a language ID in this field, so we can't
-         * call this a failure.
-         */
-        $language = $this->_extractUInt2($cmapData, 4);
-        if ($language != 0) {
-            // Record a warning here somehow?
-        }
-
-        $this->_startCode = $this->_extractUInt2($cmapData, 6);
-
-        $entryCount = $this->_extractUInt2($cmapData, 8);
-        $expectedCount = ($length - 10) >> 1;
-        if ($entryCount != $expectedCount) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Entry count is wrong; expected: $expectedCount; actual: $entryCount",
-                                         Zend_Pdf_Exception::CMAP_WRONG_ENTRY_COUNT);
-        }
-
-        $this->_endCode = $this->_startCode + $entryCount - 1;
-
-        $offset = 10;
-        for ($i = 0; $i < $entryCount; $i++, $offset += 2) {
-            $this->_glyphIndexArray[] = $this->_extractUInt2($cmapData, $offset);
-        }
-
-        /* Sanity check: After reading all of the data, we should be at the end
-         * of the table.
-         */
-        if ($offset != $length) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Ending offset ($offset) does not match length ($length)",
-                                         Zend_Pdf_Exception::CMAP_FINAL_OFFSET_NOT_LENGTH);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Color.php b/airtime_mvc/library/Zend/Pdf/Color.php
deleted file mode 100644
index 652fca88e..000000000
--- a/airtime_mvc/library/Zend/Pdf/Color.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF provides a powerfull facilities for specifying the colors of graphics objects.
- * This class encapsulates color behaviour.
- *
- * Some colors interact with PDF document (create additional objects in a PDF),
- * others don't do it. That is defined in a subclasses.
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Color
-{
-    /**
-     * Instructions, which can be directly inserted into content stream
-     * to switch color.
-     * Color set instructions differ for stroking and nonstroking operations.
-     *
-     * @param boolean $stroking
-     * @return string
-     */
-    abstract public function instructions($stroking);
-
-    /**
-     * Get color components (color space dependent)
-     *
-     * @return array
-     */
-    abstract public function getComponents();
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Color/Cmyk.php b/airtime_mvc/library/Zend/Pdf/Color/Cmyk.php
deleted file mode 100644
index 27768b95f..000000000
--- a/airtime_mvc/library/Zend/Pdf/Color/Cmyk.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cmyk.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Color */
-require_once 'Zend/Pdf/Color.php';
-
-/**
- * CMYK color implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Color_Cmyk extends Zend_Pdf_Color
-{
-    /**
-     * Cyan level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_c;
-
-    /**
-     * Magenta level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_m;
-
-    /**
-     * Yellow level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_y;
-
-    /**
-     * Key (BlacK) level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_k;
-
-
-    /**
-     * Object constructor
-     *
-     * @param float $c
-     * @param float $m
-     * @param float $y
-     * @param float $k
-     */
-    public function __construct($c, $m, $y, $k)
-    {
-        if ($c < 0) { $c = 0; }
-        if ($c > 1) { $c = 1; }
-
-        if ($m < 0) { $m = 0; }
-        if ($m > 1) { $m = 1; }
-
-        if ($y < 0) { $y = 0; }
-        if ($y > 1) { $y = 1; }
-
-        if ($k < 0) { $k = 0; }
-        if ($k > 1) { $k = 1; }
-
-        $this->_c = new Zend_Pdf_Element_Numeric($c);
-        $this->_m = new Zend_Pdf_Element_Numeric($m);
-        $this->_y = new Zend_Pdf_Element_Numeric($y);
-        $this->_k = new Zend_Pdf_Element_Numeric($k);
-    }
-
-    /**
-     * Instructions, which can be directly inserted into content stream
-     * to switch color.
-     * Color set instructions differ for stroking and nonstroking operations.
-     *
-     * @param boolean $stroking
-     * @return string
-     */
-    public function instructions($stroking)
-    {
-        return $this->_c->toString() . ' '
-             . $this->_m->toString() . ' '
-             . $this->_y->toString() . ' '
-             . $this->_k->toString() .     ($stroking? " K\n" : " k\n");
-    }
-
-    /**
-     * Get color components (color space dependent)
-     *
-     * @return array
-     */
-    public function getComponents()
-    {
-        return array($this->_c->value, $this->_m->value, $this->_y->value, $this->_k->value);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Color/GrayScale.php b/airtime_mvc/library/Zend/Pdf/Color/GrayScale.php
deleted file mode 100644
index b68c30f04..000000000
--- a/airtime_mvc/library/Zend/Pdf/Color/GrayScale.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GrayScale.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Color */
-require_once 'Zend/Pdf/Color.php';
-
-/**
- * GrayScale color implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Color_GrayScale extends Zend_Pdf_Color
-{
-    /**
-     * GrayLevel.
-     * 0.0 (black) - 1.0 (white)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_grayLevel;
-
-    /**
-     * Object constructor
-     *
-     * @param float $grayLevel
-     */
-    public function __construct($grayLevel)
-    {
-        if ($grayLevel < 0) { $grayLevel = 0; }
-        if ($grayLevel > 1) { $grayLevel = 1; }
-
-        $this->_grayLevel = new Zend_Pdf_Element_Numeric($grayLevel);
-    }
-
-    /**
-     * Instructions, which can be directly inserted into content stream
-     * to switch color.
-     * Color set instructions differ for stroking and nonstroking operations.
-     *
-     * @param boolean $stroking
-     * @return string
-     */
-    public function instructions($stroking)
-    {
-        return $this->_grayLevel->toString() . ($stroking? " G\n" : " g\n");
-    }
-
-    /**
-     * Get color components (color space dependent)
-     *
-     * @return array
-     */
-    public function getComponents()
-    {
-        return array($this->_grayLevel->value);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Color/Html.php b/airtime_mvc/library/Zend/Pdf/Color/Html.php
deleted file mode 100644
index b931d3af0..000000000
--- a/airtime_mvc/library/Zend/Pdf/Color/Html.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Html.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Color */
-require_once 'Zend/Pdf/Color.php';
-
-
-/**
- * HTML color implementation
- *
- * Factory class which vends Zend_Pdf_Color objects from typical HTML
- * representations.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Color_Html extends Zend_Pdf_Color
-{
-
-    /**
-     * Color
-     *
-     * @var Zend_Pdf_Color
-     */
-    private $_color;
-
-    /**
-     * Class constructor.
-     *
-     * @param mixed $color
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($color)
-    {
-        $this->_color = self::color($color);
-    }
-
-
-    /**
-     * Instructions, which can be directly inserted into content stream
-     * to switch color.
-     * Color set instructions differ for stroking and nonstroking operations.
-     *
-     * @param boolean $stroking
-     * @return string
-     */
-    public function instructions($stroking)
-    {
-        return $this->_color->instructions($stroking);
-    }
-
-    /**
-     * Get color components (color space dependent)
-     *
-     * @return array
-     */
-    public function getComponents()
-    {
-        return $this->_color->getComponents();
-    }
-
-    /**
-     * Creates a Zend_Pdf_Color object from the HTML representation.
-     *
-     * @param string $color May either be a hexidecimal number of the form
-     *    #rrggbb or one of the 140 well-known names (black, white, blue, etc.)
-     * @return Zend_Pdf_Color
-     */
-    public static function color($color)
-    {
-        $pattern = '/^#([A-Fa-f0-9]{2})([A-Fa-f0-9]{2})([A-Fa-f0-9]{2})$/';
-        if (preg_match($pattern, $color, $matches)) {
-            $r = round((hexdec($matches[1]) / 255), 3);
-            $g = round((hexdec($matches[2]) / 255), 3);
-            $b = round((hexdec($matches[3]) / 255), 3);
-            if (($r == $g) && ($g == $b)) {
-                require_once 'Zend/Pdf/Color/GrayScale.php';
-                return new Zend_Pdf_Color_GrayScale($r);
-            } else {
-                require_once 'Zend/Pdf/Color/Rgb.php';
-                return new Zend_Pdf_Color_Rgb($r, $g, $b);
-            }
-        } else {
-            return Zend_Pdf_Color_Html::namedColor($color);
-        }
-    }
-
-    /**
-     * Creates a Zend_Pdf_Color object from the named color.
-     *
-     * @param string $color One of the 140 well-known color names (black, white,
-     *    blue, etc.)
-     * @return Zend_Pdf_Color
-     */
-    public static function namedColor($color)
-    {
-        switch (strtolower($color)) {
-            case 'aqua':
-                $r = 0.0;   $g = 1.0;   $b = 1.0;   break;
-            case 'black':
-                $r = 0.0;   $g = 0.0;   $b = 0.0;   break;
-            case 'blue':
-                $r = 0.0;   $g = 0.0;   $b = 1.0;   break;
-            case 'fuchsia':
-                $r = 1.0;   $g = 0.0;   $b = 1.0;   break;
-            case 'gray':
-                $r = 0.502; $g = 0.502; $b = 0.502; break;
-            case 'green':
-                $r = 0.0;   $g = 0.502; $b = 0.0;   break;
-            case 'lime':
-                $r = 0.0;   $g = 1.0;   $b = 0.0;   break;
-            case 'maroon':
-                $r = 0.502; $g = 0.0;   $b = 0.0;   break;
-            case 'navy':
-                $r = 0.0;   $g = 0.0;   $b = 0.502; break;
-            case 'olive':
-                $r = 0.502; $g = 0.502; $b = 0.0;   break;
-            case 'purple':
-                $r = 0.502; $g = 0.0;   $b = 0.502; break;
-            case 'red':
-                $r = 1.0;   $g = 0.0;   $b = 0.0;   break;
-            case 'silver':
-                $r = 0.753; $g = 0.753; $b = 0.753; break;
-            case 'teal':
-                $r = 0.0;   $g = 0.502; $b = 0.502; break;
-            case 'white':
-                $r = 1.0;   $g = 1.0;   $b = 1.0;   break;
-            case 'yellow':
-                $r = 1.0;   $g = 1.0;   $b = 0.0;   break;
-
-            case 'aliceblue':
-                $r = 0.941; $g = 0.973; $b = 1.0;   break;
-            case 'antiquewhite':
-                $r = 0.980; $g = 0.922; $b = 0.843; break;
-            case 'aquamarine':
-                $r = 0.498; $g = 1.0;   $b = 0.831; break;
-            case 'azure':
-                $r = 0.941; $g = 1.0;   $b = 1.0;   break;
-            case 'beige':
-                $r = 0.961; $g = 0.961; $b = 0.863; break;
-            case 'bisque':
-                $r = 1.0;   $g = 0.894; $b = 0.769; break;
-            case 'blanchedalmond':
-                $r = 1.0;   $g = 1.0;   $b = 0.804; break;
-            case 'blueviolet':
-                $r = 0.541; $g = 0.169; $b = 0.886; break;
-            case 'brown':
-                $r = 0.647; $g = 0.165; $b = 0.165; break;
-            case 'burlywood':
-                $r = 0.871; $g = 0.722; $b = 0.529; break;
-            case 'cadetblue':
-                $r = 0.373; $g = 0.620; $b = 0.627; break;
-            case 'chartreuse':
-                $r = 0.498; $g = 1.0;   $b = 0.0;   break;
-            case 'chocolate':
-                $r = 0.824; $g = 0.412; $b = 0.118; break;
-            case 'coral':
-                $r = 1.0;   $g = 0.498; $b = 0.314; break;
-            case 'cornflowerblue':
-                $r = 0.392; $g = 0.584; $b = 0.929; break;
-            case 'cornsilk':
-                $r = 1.0;   $g = 0.973; $b = 0.863; break;
-            case 'crimson':
-                $r = 0.863; $g = 0.078; $b = 0.235; break;
-            case 'cyan':
-                $r = 0.0;   $g = 1.0;   $b = 1.0;   break;
-            case 'darkblue':
-                $r = 0.0;   $g = 0.0;   $b = 0.545; break;
-            case 'darkcyan':
-                $r = 0.0;   $g = 0.545; $b = 0.545; break;
-            case 'darkgoldenrod':
-                $r = 0.722; $g = 0.525; $b = 0.043; break;
-            case 'darkgray':
-                $r = 0.663; $g = 0.663; $b = 0.663; break;
-            case 'darkgreen':
-                $r = 0.0;   $g = 0.392; $b = 0.0;   break;
-            case 'darkkhaki':
-                $r = 0.741; $g = 0.718; $b = 0.420; break;
-            case 'darkmagenta':
-                $r = 0.545; $g = 0.0;   $b = 0.545; break;
-            case 'darkolivegreen':
-                $r = 0.333; $g = 0.420; $b = 0.184; break;
-            case 'darkorange':
-                $r = 1.0;   $g = 0.549; $b = 0.0;   break;
-            case 'darkorchid':
-                $r = 0.6;   $g = 0.196; $b = 0.8;   break;
-            case 'darkred':
-                $r = 0.545; $g = 0.0;   $b = 0.0;   break;
-            case 'darksalmon':
-                $r = 0.914; $g = 0.588; $b = 0.478; break;
-            case 'darkseagreen':
-                $r = 0.561; $g = 0.737; $b = 0.561; break;
-            case 'darkslateblue':
-                $r = 0.282; $g = 0.239; $b = 0.545; break;
-            case 'darkslategray':
-                $r = 0.184; $g = 0.310; $b = 0.310; break;
-            case 'darkturquoise':
-                $r = 0.0;   $g = 0.808; $b = 0.820; break;
-            case 'darkviolet':
-                $r = 0.580; $g = 0.0;   $b = 0.827; break;
-            case 'deeppink':
-                $r = 1.0;   $g = 0.078; $b = 0.576; break;
-            case 'deepskyblue':
-                $r = 0.0;   $g = 0.749; $b = 1.0;   break;
-            case 'dimgray':
-                $r = 0.412; $g = 0.412; $b = 0.412; break;
-            case 'dodgerblue':
-                $r = 0.118; $g = 0.565; $b = 1.0;   break;
-            case 'firebrick':
-                $r = 0.698; $g = 0.133; $b = 0.133; break;
-            case 'floralwhite':
-                $r = 1.0;   $g = 0.980; $b = 0.941; break;
-            case 'forestgreen':
-                $r = 0.133; $g = 0.545; $b = 0.133; break;
-            case 'gainsboro':
-                $r = 0.863; $g = 0.863; $b = 0.863; break;
-            case 'ghostwhite':
-                $r = 0.973; $g = 0.973; $b = 1.0;   break;
-            case 'gold':
-                $r = 1.0;   $g = 0.843; $b = 0.0;   break;
-            case 'goldenrod':
-                $r = 0.855; $g = 0.647; $b = 0.125; break;
-            case 'greenyellow':
-                $r = 0.678; $g = 1.0;   $b = 0.184; break;
-            case 'honeydew':
-                $r = 0.941; $g = 1.0;   $b = 0.941; break;
-            case 'hotpink':
-                $r = 1.0;   $g = 0.412; $b = 0.706; break;
-            case 'indianred':
-                $r = 0.804; $g = 0.361; $b = 0.361; break;
-            case 'indigo':
-                $r = 0.294; $g = 0.0;   $b = 0.510; break;
-            case 'ivory':
-                $r = 1.0;   $g = 0.941; $b = 0.941; break;
-            case 'khaki':
-                $r = 0.941; $g = 0.902; $b = 0.549; break;
-            case 'lavender':
-                $r = 0.902; $g = 0.902; $b = 0.980; break;
-            case 'lavenderblush':
-                $r = 1.0;   $g = 0.941; $b = 0.961; break;
-            case 'lawngreen':
-                $r = 0.486; $g = 0.988; $b = 0.0;   break;
-            case 'lemonchiffon':
-                $r = 1.0;   $g = 0.980; $b = 0.804; break;
-            case 'lightblue':
-                $r = 0.678; $g = 0.847; $b = 0.902; break;
-            case 'lightcoral':
-                $r = 0.941; $g = 0.502; $b = 0.502; break;
-            case 'lightcyan':
-                $r = 0.878; $g = 1.0;   $b = 1.0;   break;
-            case 'lightgoldenrodyellow':
-                $r = 0.980; $g = 0.980; $b = 0.824; break;
-            case 'lightgreen':
-                $r = 0.565; $g = 0.933; $b = 0.565; break;
-            case 'lightgrey':
-                $r = 0.827; $g = 0.827; $b = 0.827; break;
-            case 'lightpink':
-                $r = 1.0;   $g = 0.714; $b = 0.757; break;
-            case 'lightsalmon':
-                $r = 1.0;   $g = 0.627; $b = 0.478; break;
-            case 'lightseagreen':
-                $r = 0.125; $g = 0.698; $b = 0.667; break;
-            case 'lightskyblue':
-                $r = 0.529; $g = 0.808; $b = 0.980; break;
-            case 'lightslategray':
-                $r = 0.467; $g = 0.533; $b = 0.6;   break;
-            case 'lightsteelblue':
-                $r = 0.690; $g = 0.769; $b = 0.871; break;
-            case 'lightyellow':
-                $r = 1.0;   $g = 1.0;   $b = 0.878; break;
-            case 'limegreen':
-                $r = 0.196; $g = 0.804; $b = 0.196; break;
-            case 'linen':
-                $r = 0.980; $g = 0.941; $b = 0.902; break;
-            case 'magenta':
-                $r = 1.0;   $g = 0.0;   $b = 1.0;   break;
-            case 'mediumaquamarine':
-                $r = 0.4;   $g = 0.804; $b = 0.667; break;
-            case 'mediumblue':
-                $r = 0.0;   $g = 0.0;   $b = 0.804; break;
-            case 'mediumorchid':
-                $r = 0.729; $g = 0.333; $b = 0.827; break;
-            case 'mediumpurple':
-                $r = 0.576; $g = 0.439; $b = 0.859; break;
-            case 'mediumseagreen':
-                $r = 0.235; $g = 0.702; $b = 0.443; break;
-            case 'mediumslateblue':
-                $r = 0.482; $g = 0.408; $b = 0.933; break;
-            case 'mediumspringgreen':
-                $r = 0.0;   $g = 0.980; $b = 0.604; break;
-            case 'mediumturquoise':
-                $r = 0.282; $g = 0.820; $b = 0.8;   break;
-            case 'mediumvioletred':
-                $r = 0.780; $g = 0.082; $b = 0.522; break;
-            case 'midnightblue':
-                $r = 0.098; $g = 0.098; $b = 0.439; break;
-            case 'mintcream':
-                $r = 0.961; $g = 1.0;   $b = 0.980; break;
-            case 'mistyrose':
-                $r = 1.0;   $g = 0.894; $b = 0.882; break;
-            case 'moccasin':
-                $r = 1.0;   $g = 0.894; $b = 0.710; break;
-            case 'navajowhite':
-                $r = 1.0;   $g = 0.871; $b = 0.678; break;
-            case 'oldlace':
-                $r = 0.992; $g = 0.961; $b = 0.902; break;
-            case 'olivedrab':
-                $r = 0.420; $g = 0.557; $b = 0.137; break;
-            case 'orange':
-                $r = 1.0;   $g = 0.647; $b = 0.0;   break;
-            case 'orangered':
-                $r = 1.0;   $g = 0.271; $b = 0.0;   break;
-            case 'orchid':
-                $r = 0.855; $g = 0.439; $b = 0.839; break;
-            case 'palegoldenrod':
-                $r = 0.933; $g = 0.910; $b = 0.667; break;
-            case 'palegreen':
-                $r = 0.596; $g = 0.984; $b = 0.596; break;
-            case 'paleturquoise':
-                $r = 0.686; $g = 0.933; $b = 0.933; break;
-            case 'palevioletred':
-                $r = 0.859; $g = 0.439; $b = 0.576; break;
-            case 'papayawhip':
-                $r = 1.0;   $g = 0.937; $b = 0.835; break;
-            case 'peachpuff':
-                $r = 1.0;   $g = 0.937; $b = 0.835; break;
-            case 'peru':
-                $r = 0.804; $g = 0.522; $b = 0.247; break;
-            case 'pink':
-                $r = 1.0;   $g = 0.753; $b = 0.796; break;
-            case 'plum':
-                $r = 0.867; $g = 0.627; $b = 0.867; break;
-            case 'powderblue':
-                $r = 0.690; $g = 0.878; $b = 0.902; break;
-            case 'rosybrown':
-                $r = 0.737; $g = 0.561; $b = 0.561; break;
-            case 'royalblue':
-                $r = 0.255; $g = 0.412; $b = 0.882; break;
-            case 'saddlebrown':
-                $r = 0.545; $g = 0.271; $b = 0.075; break;
-            case 'salmon':
-                $r = 0.980; $g = 0.502; $b = 0.447; break;
-            case 'sandybrown':
-                $r = 0.957; $g = 0.643; $b = 0.376; break;
-            case 'seagreen':
-                $r = 0.180; $g = 0.545; $b = 0.341; break;
-            case 'seashell':
-                $r = 1.0;   $g = 0.961; $b = 0.933; break;
-            case 'sienna':
-                $r = 0.627; $g = 0.322; $b = 0.176; break;
-            case 'skyblue':
-                $r = 0.529; $g = 0.808; $b = 0.922; break;
-            case 'slateblue':
-                $r = 0.416; $g = 0.353; $b = 0.804; break;
-            case 'slategray':
-                $r = 0.439; $g = 0.502; $b = 0.565; break;
-            case 'snow':
-                $r = 1.0;   $g = 0.980; $b = 0.980; break;
-            case 'springgreen':
-                $r = 0.0;   $g = 1.0;   $b = 0.498; break;
-            case 'steelblue':
-                $r = 0.275; $g = 0.510; $b = 0.706; break;
-            case 'tan':
-                $r = 0.824; $g = 0.706; $b = 0.549; break;
-            case 'thistle':
-                $r = 0.847; $g = 0.749; $b = 0.847; break;
-            case 'tomato':
-                $r = 0.992; $g = 0.388; $b = 0.278; break;
-            case 'turquoise':
-                $r = 0.251; $g = 0.878; $b = 0.816; break;
-            case 'violet':
-                $r = 0.933; $g = 0.510; $b = 0.933; break;
-            case 'wheat':
-                $r = 0.961; $g = 0.871; $b = 0.702; break;
-            case 'whitesmoke':
-                $r = 0.961; $g = 0.961; $b = 0.961; break;
-            case 'yellowgreen':
-                $r = 0.604; $g = 0.804; $b = 0.196; break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Unknown color name: ' . $color);
-        }
-        if (($r == $g) && ($g == $b)) {
-            require_once 'Zend/Pdf/Color/GrayScale.php';
-            return new Zend_Pdf_Color_GrayScale($r);
-        } else {
-            require_once 'Zend/Pdf/Color/Rgb.php';
-            return new Zend_Pdf_Color_Rgb($r, $g, $b);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Color/Rgb.php b/airtime_mvc/library/Zend/Pdf/Color/Rgb.php
deleted file mode 100644
index 7a7e14c27..000000000
--- a/airtime_mvc/library/Zend/Pdf/Color/Rgb.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Rgb.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Color */
-require_once 'Zend/Pdf/Color.php';
-
-/**
- * RGB color implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Color_Rgb extends Zend_Pdf_Color
-{
-    /**
-     * Red level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_r;
-
-    /**
-     * Green level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_g;
-
-    /**
-     * Blue level.
-     * 0.0 (zero concentration) - 1.0 (maximum concentration)
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_b;
-
-
-    /**
-     * Object constructor
-     *
-     * @param float $r
-     * @param float $g
-     * @param float $b
-     */
-    public function __construct($r, $g, $b)
-    {
-        /** Clamp values to legal limits. */
-        if ($r < 0) { $r = 0; }
-        if ($r > 1) { $r = 1; }
-
-        if ($g < 0) { $g = 0; }
-        if ($g > 1) { $g = 1; }
-
-        if ($b < 0) { $b = 0; }
-        if ($b > 1) { $b = 1; }
-
-        $this->_r = new Zend_Pdf_Element_Numeric($r);
-        $this->_g = new Zend_Pdf_Element_Numeric($g);
-        $this->_b = new Zend_Pdf_Element_Numeric($b);
-    }
-
-    /**
-     * Instructions, which can be directly inserted into content stream
-     * to switch color.
-     * Color set instructions differ for stroking and nonstroking operations.
-     *
-     * @param boolean $stroking
-     * @return string
-     */
-    public function instructions($stroking)
-    {
-        return $this->_r->toString() . ' '
-             . $this->_g->toString() . ' '
-             . $this->_b->toString() .     ($stroking? " RG\n" : " rg\n");
-    }
-
-    /**
-     * Get color components (color space dependent)
-     *
-     * @return array
-     */
-    public function getComponents()
-    {
-        return array($this->_r->value, $this->_g->value, $this->_b->value);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Destination.php b/airtime_mvc/library/Zend/Pdf/Destination.php
deleted file mode 100644
index f47337962..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Destination.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-
-
-/** Zend_Pdf_Target */
-require_once 'Zend/Pdf/Target.php';
-
-
-/**
- * Abstract PDF destination representation class
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Destination extends Zend_Pdf_Target
-{
-    /**
-     * Load Destination object from a specified resource
-     *
-     * @internal
-     * @param $destinationArray
-     * @return Zend_Pdf_Destination
-     */
-    public static function load(Zend_Pdf_Element $resource)
-    {
-        require_once 'Zend/Pdf/Element.php';
-        if ($resource->getType() == Zend_Pdf_Element::TYPE_NAME  ||  $resource->getType() == Zend_Pdf_Element::TYPE_STRING) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            return new Zend_Pdf_Destination_Named($resource);
-        }
-
-        if ($resource->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('An explicit destination must be a direct or an indirect array object.');
-        }
-        if (count($resource->items) < 2) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('An explicit destination array must contain at least two elements.');
-        }
-
-        switch ($resource->items[1]->value) {
-            case 'XYZ':
-                require_once 'Zend/Pdf/Destination/Zoom.php';
-                return new Zend_Pdf_Destination_Zoom($resource);
-                break;
-
-            case 'Fit':
-                require_once 'Zend/Pdf/Destination/Fit.php';
-                return new Zend_Pdf_Destination_Fit($resource);
-                break;
-
-            case 'FitH':
-                require_once 'Zend/Pdf/Destination/FitHorizontally.php';
-                return new Zend_Pdf_Destination_FitHorizontally($resource);
-                break;
-
-            case 'FitV':
-                require_once 'Zend/Pdf/Destination/FitVertically.php';
-                return new Zend_Pdf_Destination_FitVertically($resource);
-                break;
-
-            case 'FitR':
-                require_once 'Zend/Pdf/Destination/FitRectangle.php';
-                return new Zend_Pdf_Destination_FitRectangle($resource);
-                break;
-
-            case 'FitB':
-                require_once 'Zend/Pdf/Destination/FitBoundingBox.php';
-                return new Zend_Pdf_Destination_FitBoundingBox($resource);
-                break;
-
-            case 'FitBH':
-                require_once 'Zend/Pdf/Destination/FitBoundingBoxHorizontally.php';
-                return new Zend_Pdf_Destination_FitBoundingBoxHorizontally($resource);
-                break;
-
-            case 'FitBV':
-                require_once 'Zend/Pdf/Destination/FitBoundingBoxVertically.php';
-                return new Zend_Pdf_Destination_FitBoundingBoxVertically($resource);
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Destination/Unknown.php';
-                return new Zend_Pdf_Destination_Unknown($resource);
-                break;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/Explicit.php b/airtime_mvc/library/Zend/Pdf/Destination/Explicit.php
deleted file mode 100644
index 695d437ee..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/Explicit.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Explicit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-
-
-/** Zend_Pdf_Destination */
-require_once 'Zend/Pdf/Destination.php';
-
-/**
- * Abstract PDF explicit destination representation class
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Destination_Explicit extends Zend_Pdf_Destination
-{
-    /**
-     * Destination description array
-     *
-     * @var Zend_Pdf_Element_Array
-     */
-    protected $_destinationArray;
-
-    /**
-     * True if it's a remote destination
-     *
-     * @var boolean
-     */
-    protected $_isRemote;
-
-    /**
-     * Explicit destination object constructor
-     *
-     * @param Zend_Pdf_Element $destinationArray
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $destinationArray)
-    {
-        if ($destinationArray->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Explicit destination resource Array must be a direct or an indirect array object.');
-        }
-
-        $this->_destinationArray = $destinationArray;
-
-        switch (count($this->_destinationArray->items)) {
-            case 0:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Destination array must contain a page reference.');
-                break;
-
-            case 1:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Destination array must contain a destination type name.');
-                break;
-
-            default:
-                // Do nothing
-                break;
-        }
-
-        switch ($this->_destinationArray->items[0]->getType()) {
-            case Zend_Pdf_Element::TYPE_NUMERIC:
-                $this->_isRemote = true;
-                break;
-
-            case Zend_Pdf_Element::TYPE_DICTIONARY:
-                $this->_isRemote = false;
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Destination target must be a page number or page dictionary object.');
-                break;
-        }
-    }
-
-    /**
-     * Returns true if it's a remote destination
-     *
-     * @return boolean
-     */
-    public function isRemote()
-    {
-        return $this->_isRemote;
-    }
-
-    /**
-     * Get resource
-     *
-     * @internal
-     * @return Zend_Pdf_Element
-     */
-    public function getResource()
-    {
-        return $this->_destinationArray;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/Fit.php b/airtime_mvc/library/Zend/Pdf/Destination/Fit.php
deleted file mode 100644
index 9f0758eda..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/Fit.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_Fit explicit detination
- *
- * Destination array: [page /Fit]
- *
- * Display the page designated by page, with its contents magnified just enough
- * to fit the entire page within the window both horizontally and vertically. If
- * the required horizontal and vertical magnification factors are different, use
- * the smaller of the two, centering the page within the window in the other
- * dimension.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_Fit extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @return Zend_Pdf_Destination_Fit
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('Fit');
-
-        return new Zend_Pdf_Destination_Fit($destinationArray);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBox.php b/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBox.php
deleted file mode 100644
index 4995f5d4c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBox.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitBoundingBox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitBoundingBox explicit detination
- *
- * Destination array: [page /FitB]
- *
- * (PDF 1.1) Display the page designated by page, with its contents magnified
- * just enough to fit its bounding box entirely within the window both horizontally
- * and vertically. If the required horizontal and vertical magnification
- * factors are different, use the smaller of the two, centering the bounding box
- * within the window in the other dimension.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitBoundingBox extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @return Zend_Pdf_Destination_FitBoundingBox
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitB');
-
-        return new Zend_Pdf_Destination_FitBoundingBox($destinationArray);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php b/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
deleted file mode 100644
index c5eb0bb5a..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitBoundingBoxHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitBoundingBoxHorizontally explicit detination
- *
- * Destination array: [page /FitBH top]
- *
- * (PDF 1.1) Display the page designated by page, with the vertical coordinate
- * top positioned at the top edge of the window and the contents of the page
- * magnified just enough to fit the entire width of its bounding box within the
- * window.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitBoundingBoxHorizontally extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $top   Top edge of displayed page
-     * @return Zend_Pdf_Destination_FitBoundingBoxHorizontally
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $top)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitBH');
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($top);
-
-        return new Zend_Pdf_Destination_FitBoundingBoxHorizontally($destinationArray);
-    }
-
-    /**
-     * Get top edge of the displayed page
-     *
-     * @return float
-     */
-    public function getTopEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set top edge of the displayed page
-     *
-     * @param float $top
-     * @return Zend_Pdf_Action_FitBoundingBoxHorizontally
-     */
-    public function setTopEdge($top)
-    {
-        $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($top);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php b/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
deleted file mode 100644
index c38e8145d..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitBoundingBoxVertically.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitBoundingBoxVertically explicit detination
- *
- * Destination array: [page /FitBV left]
- *
- * (PDF 1.1) Display the page designated by page, with the horizontal coordinate
- * left positioned at the left edge of the window and the contents of the page
- * magnified just enough to fit the entire height of its bounding box within the
- * window.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitBoundingBoxVertically extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $left  Left edge of displayed page
-     * @return Zend_Pdf_Destination_FitBoundingBoxVertically
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $left)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitBV');
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($left);
-
-        return new Zend_Pdf_Destination_FitBoundingBoxVertically($destinationArray);
-    }
-
-    /**
-     * Get left edge of the displayed page
-     *
-     * @return float
-     */
-    public function getLeftEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set left edge of the displayed page
-     *
-     * @param float $left
-     * @return Zend_Pdf_Action_FitBoundingBoxVertically
-     */
-    public function setLeftEdge($left)
-    {
-        $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($left);
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitHorizontally.php b/airtime_mvc/library/Zend/Pdf/Destination/FitHorizontally.php
deleted file mode 100644
index 780c465f0..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitHorizontally.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitHorizontally explicit detination
- *
- * Destination array: [page /FitH top]
- *
- * Display the page designated by page, with the vertical coordinate top positioned
- * at the top edge of the window and the contents of the page magnified
- * just enough to fit the entire width of the page within the window.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitHorizontally extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $top  Top edge of displayed page
-     * @return Zend_Pdf_Destination_FitHorizontally
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $top)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitH');
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($top);
-
-        return new Zend_Pdf_Destination_FitHorizontally($destinationArray);
-    }
-
-    /**
-     * Get top edge of the displayed page
-     *
-     * @return float
-     */
-    public function getTopEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set top edge of the displayed page
-     *
-     * @param float $top
-     * @return Zend_Pdf_Action_FitHorizontally
-     */
-    public function setTopEdge($top)
-    {
-        $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($top);
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitRectangle.php b/airtime_mvc/library/Zend/Pdf/Destination/FitRectangle.php
deleted file mode 100644
index 8740e60f1..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitRectangle.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitRectangle.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitRectangle explicit detination
- *
- * Destination array: [page /FitR left bottom right top]
- *
- * Display the page designated by page, with its contents magnified just enough
- * to fit the rectangle specified by the coordinates left, bottom, right, and top
- * entirely within the window both horizontally and vertically. If the required
- * horizontal and vertical magnification factors are different, use the smaller of
- * the two, centering the rectangle within the window in the other dimension.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitRectangle extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $left    Left edge of displayed page
-     * @param float $bottom  Bottom edge of displayed page
-     * @param float $right   Right edge of displayed page
-     * @param float $top     Top edge of displayed page
-     * @return Zend_Pdf_Destination_FitRectangle
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $left, $bottom, $right, $top)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitR');
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($left);
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($bottom);
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($right);
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($top);
-
-        return new Zend_Pdf_Destination_FitRectangle($destinationArray);
-    }
-
-    /**
-     * Get left edge of the displayed page
-     *
-     * @return float
-     */
-    public function getLeftEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set left edge of the displayed page
-     *
-     * @param float $left
-     * @return Zend_Pdf_Action_FitRectangle
-     */
-    public function setLeftEdge($left)
-    {
-        $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($left);
-        return $this;
-    }
-
-    /**
-     * Get bottom edge of the displayed page
-     *
-     * @return float
-     */
-    public function getBottomEdge()
-    {
-        return $this->_destinationArray->items[3]->value;
-    }
-
-    /**
-     * Set bottom edge of the displayed page
-     *
-     * @param float $bottom
-     * @return Zend_Pdf_Action_FitRectangle
-     */
-    public function setBottomEdge($bottom)
-    {
-        $this->_destinationArray->items[3] = new Zend_Pdf_Element_Numeric($bottom);
-        return $this;
-    }
-
-    /**
-     * Get right edge of the displayed page
-     *
-     * @return float
-     */
-    public function getRightEdge()
-    {
-        return $this->_destinationArray->items[4]->value;
-    }
-
-    /**
-     * Set right edge of the displayed page
-     *
-     * @param float $right
-     * @return Zend_Pdf_Action_FitRectangle
-     */
-    public function setRightEdge($right)
-    {
-        $this->_destinationArray->items[4] = new Zend_Pdf_Element_Numeric($right);
-        return $this;
-    }
-
-    /**
-     * Get top edge of the displayed page
-     *
-     * @return float
-     */
-    public function getTopEdge()
-    {
-        return $this->_destinationArray->items[5]->value;
-    }
-
-    /**
-     * Set top edge of the displayed page
-     *
-     * @param float $top
-     * @return Zend_Pdf_Action_FitRectangle
-     */
-    public function setTopEdge($top)
-    {
-        $this->_destinationArray->items[5] = new Zend_Pdf_Element_Numeric($top);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/FitVertically.php b/airtime_mvc/library/Zend/Pdf/Destination/FitVertically.php
deleted file mode 100644
index a3e74ec10..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/FitVertically.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FitVertically.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_FitVertically explicit detination
- *
- * Destination array: [page /FitV left]
- *
- * Display the page designated by page, with the horizontal coordinate left positioned
- * at the left edge of the window and the contents of the page magnified
- * just enough to fit the entire height of the page within the window.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_FitVertically extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $left  Left edge of displayed page
-     * @return Zend_Pdf_Destination_FitVertically
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $left)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('FitV');
-        $destinationArray->items[] = new Zend_Pdf_Element_Numeric($left);
-
-        return new Zend_Pdf_Destination_FitVertically($destinationArray);
-    }
-
-    /**
-     * Get left edge of the displayed page
-     *
-     * @return float
-     */
-    public function getLeftEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set left edge of the displayed page
-     *
-     * @param float $left
-     * @return Zend_Pdf_Action_FitVertically
-     */
-    public function setLeftEdge($left)
-    {
-        $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($left);
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/Named.php b/airtime_mvc/library/Zend/Pdf/Destination/Named.php
deleted file mode 100644
index d3291818e..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/Named.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Destination */
-require_once 'Zend/Pdf/Destination.php';
-
-/**
- * Destination array: [page /Fit]
- *
- * Display the page designated by page, with its contents magnified just enough
- * to fit the entire page within the window both horizontally and vertically. If
- * the required horizontal and vertical magnification factors are different, use
- * the smaller of the two, centering the page within the window in the other
- * dimension.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_Named extends Zend_Pdf_Destination
-{
-    /**
-     * Destination name
-     *
-     * @var Zend_Pdf_Element_Name|Zend_Pdf_Element_String
-     */
-    protected $_nameElement;
-
-    /**
-     * Named destination object constructor
-     *
-     * @param $resource
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $resource)
-    {
-        if ($resource->getType() != Zend_Pdf_Element::TYPE_NAME  &&  $resource->getType() != Zend_Pdf_Element::TYPE_STRING) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Named destination resource must be a PDF name or a PDF string.');
-        }
-
-        $this->_nameElement = $resource;
-    }
-
-    /**
-     * Create named destination object
-     *
-     * @param string $name
-     * @return Zend_Pdf_Destination_Named
-     */
-    public static function create($name)
-    {
-        return new Zend_Pdf_Destination_Named(new Zend_Pdf_Element_String($name));
-    }
-
-    /**
-     * Get name
-     *
-     * @return Zend_Pdf_Element
-     */
-    public function getName()
-    {
-        return $this->_nameElement->value;
-    }
-
-    /**
-     * Get resource
-     *
-     * @internal
-     * @return Zend_Pdf_Element
-     */
-    public function getResource()
-    {
-        return $this->_nameElement;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/Unknown.php b/airtime_mvc/library/Zend/Pdf/Destination/Unknown.php
deleted file mode 100644
index 455203c16..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/Unknown.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-
-/**
- * Unrecognized explicit destination representation class
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_Unknown extends Zend_Pdf_Destination_Explicit
-{
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Destination/Zoom.php b/airtime_mvc/library/Zend/Pdf/Destination/Zoom.php
deleted file mode 100644
index 2c159bf17..000000000
--- a/airtime_mvc/library/Zend/Pdf/Destination/Zoom.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Zoom.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Null.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Destination_Explicit */
-require_once 'Zend/Pdf/Destination/Explicit.php';
-
-/**
- * Zend_Pdf_Destination_Zoom explicit detination
- *
- * Destination array: [page /XYZ left top zoom]
- *
- * Display the page designated by page, with the coordinates (left, top) positioned
- * at the upper-left corner of the window and the contents of the page
- * magnified by the factor zoom. A null value for any of the parameters left, top,
- * or zoom specifies that the current value of that parameter is to be retained unchanged.
- * A zoom value of 0 has the same meaning as a null value.
- *
- * @package    Zend_Pdf
- * @subpackage Destination
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Destination_Zoom extends Zend_Pdf_Destination_Explicit
-{
-    /**
-     * Create destination object
-     *
-     * @param Zend_Pdf_Page|integer $page  Page object or page number
-     * @param float $left  Left edge of displayed page
-     * @param float $top   Top edge of displayed page
-     * @param float $zoom  Zoom factor
-     * @return Zend_Pdf_Destination_Zoom
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($page, $left = null, $top = null, $zoom = null)
-    {
-        $destinationArray = new Zend_Pdf_Element_Array();
-
-        if ($page instanceof Zend_Pdf_Page) {
-            $destinationArray->items[] = $page->getPageDictionary();
-        } else if (is_integer($page)) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($page);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page entry must be a Zend_Pdf_Page object or a page number.');
-        }
-
-        $destinationArray->items[] = new Zend_Pdf_Element_Name('XYZ');
-
-        if ($left === null) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Null();
-        } else {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($left);
-        }
-
-        if ($top === null) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Null();
-        } else {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($top);
-        }
-
-        if ($zoom === null) {
-            $destinationArray->items[] = new Zend_Pdf_Element_Null();
-        } else {
-            $destinationArray->items[] = new Zend_Pdf_Element_Numeric($zoom);
-        }
-
-        return new Zend_Pdf_Destination_Zoom($destinationArray);
-    }
-
-    /**
-     * Get left edge of the displayed page (null means viewer application 'current value')
-     *
-     * @return float
-     */
-    public function getLeftEdge()
-    {
-        return $this->_destinationArray->items[2]->value;
-    }
-
-    /**
-     * Set left edge of the displayed page (null means viewer application 'current value')
-     *
-     * @param float $left
-     * @return Zend_Pdf_Action_Zoom
-     */
-    public function setLeftEdge($left)
-    {
-        if ($left === null) {
-            $this->_destinationArray->items[2] = new Zend_Pdf_Element_Null();
-        } else {
-            $this->_destinationArray->items[2] = new Zend_Pdf_Element_Numeric($left);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get top edge of the displayed page (null means viewer application 'current value')
-     *
-     * @return float
-     */
-    public function getTopEdge()
-    {
-        return $this->_destinationArray->items[3]->value;
-    }
-
-    /**
-     * Set top edge of the displayed page (null means viewer application 'current viewer')
-     *
-     * @param float $top
-     * @return Zend_Pdf_Action_Zoom
-     */
-    public function setTopEdge($top)
-    {
-        if ($top === null) {
-            $this->_destinationArray->items[3] = new Zend_Pdf_Element_Null();
-        } else {
-            $this->_destinationArray->items[3] = new Zend_Pdf_Element_Numeric($top);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get ZoomFactor of the displayed page (null or 0 means viewer application 'current value')
-     *
-     * @return float
-     */
-    public function getZoomFactor()
-    {
-        return $this->_destinationArray->items[4]->value;
-    }
-
-    /**
-     * Set ZoomFactor of the displayed page (null or 0 means viewer application 'current viewer')
-     *
-     * @param float $zoom
-     * @return Zend_Pdf_Action_Zoom
-     */
-    public function setZoomFactor($zoom)
-    {
-        if ($zoom === null) {
-            $this->_destinationArray->items[4] = new Zend_Pdf_Element_Null();
-        } else {
-            $this->_destinationArray->items[4] = new Zend_Pdf_Element_Numeric($zoom);
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element.php b/airtime_mvc/library/Zend/Pdf/Element.php
deleted file mode 100644
index dbfa2077e..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF file element implementation
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Element
-{
-    const TYPE_BOOL        = 1;
-    const TYPE_NUMERIC     = 2;
-    const TYPE_STRING      = 3;
-    const TYPE_NAME        = 4;
-    const TYPE_ARRAY       = 5;
-    const TYPE_DICTIONARY  = 6;
-    const TYPE_STREAM      = 7;
-    const TYPE_NULL        = 11;
-
-    /**
-     * Reference to the top level indirect object, which contains this element.
-     *
-     * @var Zend_Pdf_Element_Object
-     */
-    private $_parentObject = null;
-
-    /**
-     * Return type of the element.
-     * See ZPdfPDFConst for possible values
-     *
-     * @return integer
-     */
-    abstract public function getType();
-
-    /**
-     * Convert element to a string, which can be directly
-     * written to a PDF file.
-     *
-     * $factory parameter defines operation context.
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    abstract public function toString($factory = null);
-
-
-    /**
-     * Set top level parent indirect object.
-     *
-     * @param Zend_Pdf_Element_Object $parent
-     */
-    public function setParentObject(Zend_Pdf_Element_Object $parent)
-    {
-        $this->_parentObject = $parent;
-    }
-
-
-    /**
-     * Get top level parent indirect object.
-     *
-     * @return Zend_Pdf_Element_Object
-     */
-    public function getParentObject()
-    {
-        return $this->_parentObject;
-    }
-
-
-    /**
-     * Mark object as modified, to include it into new PDF file segment.
-     *
-     * We don't automate this action to keep control on PDF update process.
-     * All new objects are treated as "modified" automatically.
-     */
-    public function touch()
-    {
-        if ($this->_parentObject !== null) {
-            $this->_parentObject->touch();
-        }
-    }
-
-    /**
-     * Clean up resources, used by object
-     */
-    public function cleanUp()
-    {
-        // Do nothing
-    }
-
-    /**
-     * Convert PDF element to PHP type.
-     *
-     * @return mixed
-     */
-    public function toPhp()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Convert PHP value into PDF element.
-     *
-     * @param mixed $input
-     * @return Zend_Pdf_Element
-     */
-    public static function phpToPdf($input)
-    {
-        if (is_numeric($input)) {
-            require_once 'Zend/Pdf/Element/Numeric.php';
-            return new Zend_Pdf_Element_Numeric($input);
-        } else if (is_bool($input)) {
-            require_once 'Zend/Pdf/Element/Boolean.php';
-            return new Zend_Pdf_Element_Boolean($input);
-        } else if (is_array($input)) {
-            $pdfElementsArray = array();
-            $isDictionary = false;
-
-            foreach ($input as $key => $value) {
-                if (is_string($key)) {
-                    $isDictionary = true;
-                }
-                $pdfElementsArray[$key] = Zend_Pdf_Element::phpToPdf($value);
-            }
-
-            if ($isDictionary) {
-                require_once 'Zend/Pdf/Element/Dictionary.php';
-                return new Zend_Pdf_Element_Dictionary($pdfElementsArray);
-            } else {
-                require_once 'Zend/Pdf/Element/Array.php';
-                return new Zend_Pdf_Element_Array($pdfElementsArray);
-            }
-        } else {
-            require_once 'Zend/Pdf/Element/String.php';
-            return new Zend_Pdf_Element_String((string)$input);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Array.php b/airtime_mvc/library/Zend/Pdf/Element/Array.php
deleted file mode 100644
index 01209d967..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Array.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'array' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Array extends Zend_Pdf_Element
-{
-    /**
-     * Array element items
-     *
-     * Array of Zend_Pdf_Element objects
-     *
-     * @var array
-     */
-    public $items;
-
-
-    /**
-     * Object constructor
-     *
-     * @param array $val   - array of Zend_Pdf_Element objects
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val = null)
-    {
-        $this->items = new ArrayObject();
-
-        if ($val !== null  &&  is_array($val)) {
-            foreach ($val as $element) {
-                if (!$element instanceof Zend_Pdf_Element) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Array elements must be Zend_Pdf_Element objects');
-                }
-                $this->items[] = $element;
-            }
-        } else if ($val !== null){
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Argument must be an array');
-        }
-    }
-
-
-    /**
-     * Getter
-     *
-     * @param string $property
-     * @throws Zend_Pdf_Exception
-     */
-    public function __get($property) {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Undefined property: Zend_Pdf_Element_Array::$' . $property);
-    }
-
-
-    /**
-     * Setter
-     *
-     * @param mixed $offset
-     * @param mixed $value
-     * @throws Zend_Pdf_Exception
-     */
-    public function __set($property, $value) {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Undefined property: Zend_Pdf_Element_Array::$' . $property);
-    }
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_ARRAY;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        $outStr = '[';
-        $lastNL = 0;
-
-        foreach ($this->items as $element) {
-            if (strlen($outStr) - $lastNL > 128)  {
-                $outStr .= "\n";
-                $lastNL = strlen($outStr);
-            }
-
-            $outStr .= $element->toString($factory) . ' ';
-        }
-        $outStr .= ']';
-
-        return $outStr;
-    }
-
-    /**
-     * Convert PDF element to PHP type.
-     *
-     * Dictionary is returned as an associative array
-     *
-     * @return mixed
-     */
-    public function toPhp()
-    {
-        $phpArray = array();
-
-        foreach ($this->items as $item) {
-            $phpArray[] = $item->toPhp();
-        }
-
-        return $phpArray;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Boolean.php b/airtime_mvc/library/Zend/Pdf/Element/Boolean.php
deleted file mode 100644
index 656292a9f..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Boolean.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'boolean' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Boolean extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var boolean
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     *
-     * @param boolean $val
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val)
-    {
-        if (! is_bool($val)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Argument must be boolean.');
-        }
-
-        $this->value   = $val;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_BOOL;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return $this->value ? 'true' : 'false';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Dictionary.php b/airtime_mvc/library/Zend/Pdf/Element/Dictionary.php
deleted file mode 100644
index a946e64a3..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Dictionary.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dictionary.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-/**
- * PDF file 'dictionary' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Dictionary extends Zend_Pdf_Element
-{
-    /**
-     * Dictionary elements
-     * Array of Zend_Pdf_Element objects ('name' => Zend_Pdf_Element)
-     *
-     * @var array
-     */
-    private $_items = array();
-
-
-    /**
-     * Object constructor
-     *
-     * @param array $val   - array of Zend_Pdf_Element objects
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val = null)
-    {
-        if ($val === null) {
-            return;
-        } else if (!is_array($val)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Argument must be an array');
-        }
-
-        foreach ($val as $name => $element) {
-            if (!$element instanceof Zend_Pdf_Element) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Array elements must be Zend_Pdf_Element objects');
-            }
-            if (!is_string($name)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Array keys must be strings');
-            }
-            $this->_items[$name] = $element;
-        }
-    }
-
-
-    /**
-     * Add element to an array
-     *
-     * @name Zend_Pdf_Element_Name $name
-     * @param Zend_Pdf_Element $val   - Zend_Pdf_Element object
-     * @throws Zend_Pdf_Exception
-     */
-    public function add(Zend_Pdf_Element_Name $name, Zend_Pdf_Element $val)
-    {
-        $this->_items[$name->value] = $val;
-    }
-
-    /**
-     * Return dictionary keys
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        return array_keys($this->_items);
-    }
-
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return Zend_Pdf_Element | null
-     */
-    public function __get($item)
-    {
-        $element = isset($this->_items[$item]) ? $this->_items[$item]
-                                               : null;
-
-        return $element;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($item, $value)
-    {
-        if ($value === null) {
-            unset($this->_items[$item]);
-        } else {
-            $this->_items[$item] = $value;
-        }
-    }
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_DICTIONARY;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        $outStr = '<<';
-        $lastNL = 0;
-
-        foreach ($this->_items as $name => $element) {
-            if (!is_object($element)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Wrong data');
-            }
-
-            if (strlen($outStr) - $lastNL > 128)  {
-                $outStr .= "\n";
-                $lastNL = strlen($outStr);
-            }
-
-            $nameObj = new Zend_Pdf_Element_Name($name);
-            $outStr .= $nameObj->toString($factory) . ' ' . $element->toString($factory) . ' ';
-        }
-        $outStr .= '>>';
-
-        return $outStr;
-    }
-
-
-    /**
-     * Convert PDF element to PHP type.
-     *
-     * Dictionary is returned as an associative array
-     *
-     * @return mixed
-     */
-    public function toPhp()
-    {
-        $phpArray = array();
-
-        foreach ($this->_items as $itemName => $item) {
-            $phpArray[$itemName] = $item->toPhp();
-        }
-
-        return $phpArray;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Name.php b/airtime_mvc/library/Zend/Pdf/Element/Name.php
deleted file mode 100644
index 129749e04..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Name.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'name' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Name extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var string
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     *
-     * @param string $val
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val)
-    {
-        settype($val, 'string');
-        if (strpos($val,"\x00") !== false) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Null character is not allowed in PDF Names');
-        }
-        $this->value   = (string)$val;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_NAME;
-    }
-
-
-    /**
-     * Escape string according to the PDF rules
-     *
-     * @param string $inStr
-     * @return string
-     */
-    public static function escape($inStr)
-    {
-        $outStr = '';
-
-        for ($count = 0; $count < strlen($inStr); $count++) {
-            $nextCode = ord($inStr[$count]);
-
-            switch ($inStr[$count]) {
-                case '(':
-                // fall through to next case
-                case ')':
-                // fall through to next case
-                case '<':
-                // fall through to next case
-                case '>':
-                // fall through to next case
-                case '[':
-                // fall through to next case
-                case ']':
-                // fall through to next case
-                case '{':
-                // fall through to next case
-                case '}':
-                // fall through to next case
-                case '/':
-                // fall through to next case
-                case '%':
-                // fall through to next case
-                case '\\':
-                // fall through to next case
-                case '#':
-                    $outStr .= sprintf('#%02X', $nextCode);
-                    break;
-
-                default:
-                    if ($nextCode >= 33 && $nextCode <= 126 ) {
-                        // Visible ASCII symbol
-                        $outStr .= $inStr[$count];
-                    } else {
-                        $outStr .= sprintf('#%02X', $nextCode);
-                    }
-            }
-
-        }
-
-        return $outStr;
-    }
-
-
-    /**
-     * Unescape string according to the PDF rules
-     *
-     * @param string $inStr
-     * @return string
-     */
-    public static function unescape($inStr)
-    {
-        $outStr = '';
-
-        for ($count = 0; $count < strlen($inStr); $count++) {
-            if ($inStr[$count] != '#' )  {
-                $outStr .= $inStr[$count];
-            } else {
-                // Escape sequence
-                $outStr .= chr(base_convert(substr($inStr, $count+1, 2), 16, 10 ));
-                $count +=2;
-            }
-        }
-        return $outStr;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return '/' . self::escape((string)$this->value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Null.php b/airtime_mvc/library/Zend/Pdf/Element/Null.php
deleted file mode 100644
index 2332c5cdc..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Null.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'null' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Null extends Zend_Pdf_Element
-{
-    /**
-     * Object value. Always null.
-     *
-     * @var mixed
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        $this->value = null;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_NULL;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return 'null';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Numeric.php b/airtime_mvc/library/Zend/Pdf/Element/Numeric.php
deleted file mode 100644
index b49cfc908..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Numeric.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Numeric.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'numeric' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Numeric extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var numeric
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     *
-     * @param numeric $val
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val)
-    {
-        if ( !is_numeric($val) ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Argument must be numeric');
-        }
-
-        $this->value = $val;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_NUMERIC;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        if (is_integer($this->value)) {
-            return (string)$this->value;
-        }
-
-        /**
-         * PDF doesn't support exponental format.
-         * Fixed point format must be used instead
-         */
-        $prec = 0; $v = $this->value;
-        while (abs( floor($v) - $v ) > 1e-10) {
-            $prec++; $v *= 10;
-        }
-        return sprintf("%.{$prec}F", $this->value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Object.php b/airtime_mvc/library/Zend/Pdf/Element/Object.php
deleted file mode 100644
index 6bb295706..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Object.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Object.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF file 'indirect object' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Object extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var Zend_Pdf_Element
-     */
-    protected $_value;
-
-    /**
-     * Object number within PDF file
-     *
-     * @var integer
-     */
-    protected $_objNum;
-
-    /**
-     * Generation number
-     *
-     * @var integer
-     */
-    protected $_genNum;
-
-    /**
-     * Reference to the factory.
-     *
-     * @var Zend_Pdf_ElementFactory
-     */
-    protected $_factory;
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element $val
-     * @param integer $objNum
-     * @param integer $genNum
-     * @param Zend_Pdf_ElementFactory $factory
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $val, $objNum, $genNum, Zend_Pdf_ElementFactory $factory)
-    {
-        if ($val instanceof self) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object number must not be an instance of Zend_Pdf_Element_Object.');
-        }
-
-        if ( !(is_integer($objNum) && $objNum > 0) ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object number must be positive integer.');
-        }
-
-        if ( !(is_integer($genNum) && $genNum >= 0) ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Generation number must be non-negative integer.');
-        }
-
-        $this->_value   = $val;
-        $this->_objNum  = $objNum;
-        $this->_genNum  = $genNum;
-        $this->_factory = $factory;
-
-        $this->setParentObject($this);
-
-        $factory->registerObject($this, $objNum . ' ' . $genNum);
-    }
-
-
-    /**
-     * Check, that object is generated by specified factory
-     *
-     * @return Zend_Pdf_ElementFactory
-     */
-    public function getFactory()
-    {
-        return $this->_factory;
-    }
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return $this->_value->getType();
-    }
-
-
-    /**
-     * Get object number
-     *
-     * @return integer
-     */
-    public function getObjNum()
-    {
-        return $this->_objNum;
-    }
-
-
-    /**
-     * Get generation number
-     *
-     * @return integer
-     */
-    public function getGenNum()
-    {
-        return $this->_genNum;
-    }
-
-
-    /**
-     * Return reference to the object
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        if ($factory === null) {
-            $shift = 0;
-        } else {
-            $shift = $factory->getEnumerationShift($this->_factory);
-        }
-
-        return $this->_objNum + $shift . ' ' . $this->_genNum . ' R';
-    }
-
-
-    /**
-     * Dump object to a string to save within PDF file.
-     *
-     * $factory parameter defines operation context.
-     *
-     * @param Zend_Pdf_ElementFactory $factory
-     * @return string
-     */
-    public function dump(Zend_Pdf_ElementFactory $factory)
-    {
-        $shift = $factory->getEnumerationShift($this->_factory);
-
-        return  $this->_objNum + $shift . " " . $this->_genNum . " obj \n"
-             .  $this->_value->toString($factory) . "\n"
-             . "endobj\n";
-    }
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        return $this->_value->$property;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($property, $value)
-    {
-        $this->_value->$property = $value;
-    }
-
-    /**
-     * Call handler
-     *
-     * @param string $method
-     * @param array  $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->_value, $method), $args);
-    }
-
-
-    /**
-     * Mark object as modified, to include it into new PDF file segment
-     */
-    public function touch()
-    {
-        $this->_factory->markAsModified($this);
-    }
-
-    /**
-     * Return object, which can be used to identify object and its references identity
-     *
-     * @return Zend_Pdf_Element_Object
-     */
-    public function getObject()
-    {
-        return $this;
-    }
-
-    /**
-     * Clean up resources, used by object
-     */
-    public function cleanUp()
-    {
-        $this->_value = null;
-    }
-
-    /**
-     * Convert PDF element to PHP type.
-     *
-     * @return mixed
-     */
-    public function toPhp()
-    {
-        return $this->_value->toPhp();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Object/Stream.php b/airtime_mvc/library/Zend/Pdf/Element/Object/Stream.php
deleted file mode 100644
index 5d7926d67..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Object/Stream.php
+++ /dev/null
@@ -1,422 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Stream.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Element_Object */
-require_once 'Zend/Pdf/Element/Object.php';
-
-/**
- * PDF file 'stream object' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Object_Stream extends Zend_Pdf_Element_Object
-{
-    /**
-     * StreamObject dictionary
-     * Required enries:
-     * Length
-     *
-     * @var Zend_Pdf_Element_Dictionary
-     */
-    private $_dictionary;
-
-    /**
-     * Flag which signals, that stream is decoded
-     *
-     * @var boolean
-     */
-    private $_streamDecoded;
-
-    /**
-     * Stored original stream object dictionary.
-     * Used to decode stream during an access time.
-     *
-     * The only properties, which affect decoding, are sored here.
-     *
-     * @var array|null
-     */
-    private $_originalDictionary = null;
-
-    /**
-     * Object constructor
-     *
-     * @param mixed $val
-     * @param integer $objNum
-     * @param integer $genNum
-     * @param Zend_Pdf_ElementFactory $factory
-     * @param Zend_Pdf_Element_Dictionary|null $dictionary
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($val, $objNum, $genNum, Zend_Pdf_ElementFactory $factory, $dictionary = null)
-    {
-        parent::__construct(new Zend_Pdf_Element_Stream($val), $objNum, $genNum, $factory);
-
-        if ($dictionary === null) {
-            $this->_dictionary    = new Zend_Pdf_Element_Dictionary();
-            $this->_dictionary->Length = new Zend_Pdf_Element_Numeric(strlen( $val ));
-            $this->_streamDecoded = true;
-        } else {
-            $this->_dictionary    = $dictionary;
-            $this->_streamDecoded = false;
-        }
-    }
-
-
-    /**
-     * Store original dictionary information in $_originalDictionary class member.
-     * Used to store information and to normalize filters information before defiltering.
-     *
-     */
-    private function _storeOriginalDictionary()
-    {
-        $this->_originalDictionary = array();
-
-        $this->_originalDictionary['Filter']      = array();
-        $this->_originalDictionary['DecodeParms'] = array();
-        if ($this->_dictionary->Filter === null) {
-            // Do nothing.
-        } else if ($this->_dictionary->Filter->getType() == Zend_Pdf_Element::TYPE_ARRAY) {
-            foreach ($this->_dictionary->Filter->items as $id => $filter) {
-                $this->_originalDictionary['Filter'][$id]      = $filter->value;
-                $this->_originalDictionary['DecodeParms'][$id] = array();
-
-                if ($this->_dictionary->DecodeParms !== null ) {
-                    if ($this->_dictionary->DecodeParms->items[$id] !== null &&
-                        $this->_dictionary->DecodeParms->items[$id]->value !== null ) {
-                        foreach ($this->_dictionary->DecodeParms->items[$id]->getKeys() as $paramKey) {
-                            $this->_originalDictionary['DecodeParms'][$id][$paramKey] =
-                                  $this->_dictionary->DecodeParms->items[$id]->$paramKey->value;
-                        }
-                    }
-                }
-            }
-        } else if ($this->_dictionary->Filter->getType() != Zend_Pdf_Element::TYPE_NULL) {
-            $this->_originalDictionary['Filter'][0]      = $this->_dictionary->Filter->value;
-            $this->_originalDictionary['DecodeParms'][0] = array();
-            if ($this->_dictionary->DecodeParms !== null ) {
-                foreach ($this->_dictionary->DecodeParms->getKeys() as $paramKey) {
-                    $this->_originalDictionary['DecodeParms'][0][$paramKey] =
-                          $this->_dictionary->DecodeParms->$paramKey->value;
-                }
-            }
-        }
-
-        if ($this->_dictionary->F !== null) {
-            $this->_originalDictionary['F'] = $this->_dictionary->F->value;
-        }
-
-        $this->_originalDictionary['FFilter']      = array();
-        $this->_originalDictionary['FDecodeParms'] = array();
-        if ($this->_dictionary->FFilter === null) {
-            // Do nothing.
-        } else if ($this->_dictionary->FFilter->getType() == Zend_Pdf_Element::TYPE_ARRAY) {
-            foreach ($this->_dictionary->FFilter->items as $id => $filter) {
-                $this->_originalDictionary['FFilter'][$id]      = $filter->value;
-                $this->_originalDictionary['FDecodeParms'][$id] = array();
-
-                if ($this->_dictionary->FDecodeParms !== null ) {
-                    if ($this->_dictionary->FDecodeParms->items[$id] !== null &&
-                        $this->_dictionary->FDecodeParms->items[$id]->value !== null) {
-                        foreach ($this->_dictionary->FDecodeParms->items[$id]->getKeys() as $paramKey) {
-                            $this->_originalDictionary['FDecodeParms'][$id][$paramKey] =
-                                  $this->_dictionary->FDecodeParms->items[$id]->items[$paramKey]->value;
-                        }
-                    }
-                }
-            }
-        } else {
-            $this->_originalDictionary['FFilter'][0]      = $this->_dictionary->FFilter->value;
-            $this->_originalDictionary['FDecodeParms'][0] = array();
-            if ($this->_dictionary->FDecodeParms !== null ) {
-                foreach ($this->_dictionary->FDecodeParms->getKeys() as $paramKey) {
-                    $this->_originalDictionary['FDecodeParms'][0][$paramKey] =
-                          $this->_dictionary->FDecodeParms->items[$paramKey]->value;
-                }
-            }
-        }
-    }
-
-    /**
-     * Decode stream
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    private function _decodeStream()
-    {
-        if ($this->_originalDictionary === null) {
-            $this->_storeOriginalDictionary();
-        }
-
-        /**
-         * All applied stream filters must be processed to decode stream.
-         * If we don't recognize any of applied filetrs an exception should be thrown here
-         */
-        if (isset($this->_originalDictionary['F'])) {
-            /** @todo Check, how external files can be processed. */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('External filters are not supported now.');
-        }
-
-        foreach ($this->_originalDictionary['Filter'] as $id => $filterName ) {
-            $valueRef = &$this->_value->value->getRef();
-            $this->_value->value->touch();
-            switch ($filterName) {
-                case 'ASCIIHexDecode':
-                    require_once 'Zend/Pdf/Filter/AsciiHex.php';
-                    $valueRef = Zend_Pdf_Filter_AsciiHex::decode($valueRef);
-                    break;
-
-                case 'ASCII85Decode':
-                    require_once 'Zend/Pdf/Filter/Ascii85.php';
-                    $valueRef = Zend_Pdf_Filter_Ascii85::decode($valueRef);
-                    break;
-
-                case 'FlateDecode':
-                    require_once 'Zend/Pdf/Filter/Compression/Flate.php';
-                    $valueRef = Zend_Pdf_Filter_Compression_Flate::decode($valueRef,
-                                                                          $this->_originalDictionary['DecodeParms'][$id]);
-                    break;
-
-                case 'LZWDecode':
-                    require_once 'Zend/Pdf/Filter/Compression/Lzw.php';
-                    $valueRef = Zend_Pdf_Filter_Compression_Lzw::decode($valueRef,
-                                                                        $this->_originalDictionary['DecodeParms'][$id]);
-                    break;
-
-                case 'RunLengthDecode':
-                    require_once 'Zend/Pdf/Filter/RunLength.php';
-                    $valueRef = Zend_Pdf_Filter_RunLength::decode($valueRef);
-                    break;
-
-                default:
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Unknown stream filter: \'' . $filterName . '\'.');
-            }
-        }
-
-        $this->_streamDecoded = true;
-    }
-
-    /**
-     * Encode stream
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    private function _encodeStream()
-    {
-        /**
-         * All applied stream filters must be processed to encode stream.
-         * If we don't recognize any of applied filetrs an exception should be thrown here
-         */
-        if (isset($this->_originalDictionary['F'])) {
-            /** @todo Check, how external files can be processed. */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('External filters are not supported now.');
-        }
-
-        $filters = array_reverse($this->_originalDictionary['Filter'], true);
-
-        foreach ($filters as $id => $filterName ) {
-            $valueRef = &$this->_value->value->getRef();
-            $this->_value->value->touch();
-            switch ($filterName) {
-                case 'ASCIIHexDecode':
-                    require_once 'Zend/Pdf/Filter/AsciiHex.php';
-                    $valueRef = Zend_Pdf_Filter_AsciiHex::encode($valueRef);
-                    break;
-
-                case 'ASCII85Decode':
-                    require_once 'Zend/Pdf/Filter/Ascii85.php';
-                    $valueRef = Zend_Pdf_Filter_Ascii85::encode($valueRef);
-                    break;
-
-                case 'FlateDecode':
-                    require_once 'Zend/Pdf/Filter/Compression/Flate.php';
-                    $valueRef = Zend_Pdf_Filter_Compression_Flate::encode($valueRef,
-                                                                          $this->_originalDictionary['DecodeParms'][$id]);
-                    break;
-
-                case 'LZWDecode':
-                    require_once 'Zend/Pdf/Filter/Compression/Lzw.php';
-                    $valueRef = Zend_Pdf_Filter_Compression_Lzw::encode($valueRef,
-                                                                        $this->_originalDictionary['DecodeParms'][$id]);
-                    break;
-
-                 case 'RunLengthDecode':
-                    require_once 'Zend/Pdf/Filter/RunLength.php';
-                    $valueRef = Zend_Pdf_Filter_RunLength::encode($valueRef);
-                    break;
-
-               default:
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Unknown stream filter: \'' . $filterName . '\'.');
-            }
-        }
-
-        $this->_streamDecoded = false;
-    }
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return mixed
-     * @throws Zend_Pdf_Exception
-     */
-    public function __get($property)
-    {
-        if ($property == 'dictionary') {
-            /**
-             * If stream is note decoded yet, then store original decoding options (do it only once).
-             */
-            if (( !$this->_streamDecoded ) && ($this->_originalDictionary === null)) {
-                $this->_storeOriginalDictionary();
-            }
-
-            return $this->_dictionary;
-        }
-
-        if ($property == 'value') {
-            if (!$this->_streamDecoded) {
-                $this->_decodeStream();
-            }
-
-            return $this->_value->value->getRef();
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Unknown stream object property requested.');
-    }
-
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($property, $value)
-    {
-        if ($property == 'value') {
-            $valueRef = &$this->_value->value->getRef();
-            $valueRef = $value;
-            $this->_value->value->touch();
-
-            $this->_streamDecoded = true;
-
-            return;
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Unknown stream object property: \'' . $property . '\'.');
-    }
-
-
-    /**
-     * Treat stream data as already encoded
-     */
-    public function skipFilters()
-    {
-        $this->_streamDecoded = false;
-    }
-
-
-    /**
-     * Call handler
-     *
-     * @param string $method
-     * @param array  $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (!$this->_streamDecoded) {
-            $this->_decodeStream();
-        }
-
-        switch (count($args)) {
-            case 0:
-                return $this->_value->$method();
-            case 1:
-                return $this->_value->$method($args[0]);
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Unsupported number of arguments');
-        }
-    }
-
-    /**
-     * Dump object to a string to save within PDF file
-     *
-     * $factory parameter defines operation context.
-     *
-     * @param Zend_Pdf_ElementFactory $factory
-     * @return string
-     */
-    public function dump(Zend_Pdf_ElementFactory $factory)
-    {
-        $shift = $factory->getEnumerationShift($this->_factory);
-
-        if ($this->_streamDecoded) {
-            $this->_storeOriginalDictionary();
-            $this->_encodeStream();
-        } else if ($this->_originalDictionary != null) {
-            $startDictionary = $this->_originalDictionary;
-            $this->_storeOriginalDictionary();
-            $newDictionary = $this->_originalDictionary;
-
-            if ($startDictionary !== $newDictionary) {
-                $this->_originalDictionary = $startDictionary;
-                $this->_decodeStream();
-
-                $this->_originalDictionary = $newDictionary;
-                $this->_encodeStream();
-            }
-        }
-
-        // Update stream length
-        $this->dictionary->Length->value = $this->_value->length();
-
-        return  $this->_objNum + $shift . " " . $this->_genNum . " obj \n"
-             .  $this->dictionary->toString($factory) . "\n"
-             .  $this->_value->toString($factory) . "\n"
-             . "endobj\n";
-    }
-
-    /**
-     * Clean up resources, used by object
-     */
-    public function cleanUp()
-    {
-        $this->_dictionary = null;
-        $this->_value      = null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Reference.php b/airtime_mvc/library/Zend/Pdf/Element/Reference.php
deleted file mode 100644
index ca79b8b3a..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Reference.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reference.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Null.php';
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-/**
- * PDF file 'reference' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Reference extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     * The reference to the object
-     *
-     * @var mixed
-     */
-    private $_ref;
-
-    /**
-     * Object number within PDF file
-     *
-     * @var integer
-     */
-    private $_objNum;
-
-    /**
-     * Generation number
-     *
-     * @var integer
-     */
-    private $_genNum;
-
-    /**
-     * Reference context
-     *
-     * @var Zend_Pdf_Element_Reference_Context
-     */
-    private $_context;
-
-
-    /**
-     * Reference to the factory.
-     *
-     * It's the same as referenced object factory, but we save it here to avoid
-     * unnecessary dereferencing, whech can produce cascade dereferencing and parsing.
-     * The same for duplication of getFactory() function. It can be processed by __call()
-     * method, but we catch it here.
-     *
-     * @var Zend_Pdf_ElementFactory
-     */
-    private $_factory;
-
-    /**
-     * Object constructor:
-     *
-     * @param integer $objNum
-     * @param integer $genNum
-     * @param Zend_Pdf_Element_Reference_Context $context
-     * @param Zend_Pdf_ElementFactory $factory
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($objNum, $genNum = 0, Zend_Pdf_Element_Reference_Context $context, Zend_Pdf_ElementFactory $factory)
-    {
-        if ( !(is_integer($objNum) && $objNum > 0) ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object number must be positive integer');
-        }
-        if ( !(is_integer($genNum) && $genNum >= 0) ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Generation number must be non-negative integer');
-        }
-
-        $this->_objNum  = $objNum;
-        $this->_genNum  = $genNum;
-        $this->_ref     = null;
-        $this->_context = $context;
-        $this->_factory = $factory;
-    }
-
-    /**
-     * Check, that object is generated by specified factory
-     *
-     * @return Zend_Pdf_ElementFactory
-     */
-    public function getFactory()
-    {
-        return $this->_factory;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        return $this->_ref->getType();
-    }
-
-
-    /**
-     * Return reference to the object
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        if ($factory === null) {
-            $shift = 0;
-        } else {
-            $shift = $factory->getEnumerationShift($this->_factory);
-        }
-
-        return $this->_objNum + $shift . ' ' . $this->_genNum . ' R';
-    }
-
-
-    /**
-     * Dereference.
-     * Take inderect object, take $value member of this object (must be Zend_Pdf_Element),
-     * take reference to the $value member of this object and assign it to
-     * $value member of current PDF Reference object
-     * $obj can be null
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    private function _dereference()
-    {
-        if (($obj = $this->_factory->fetchObject($this->_objNum . ' ' . $this->_genNum)) === null) {
-            $obj = $this->_context->getParser()->getObject(
-                           $this->_context->getRefTable()->getOffset($this->_objNum . ' ' . $this->_genNum . ' R'),
-                           $this->_context
-                                                          );
-        }
-
-        if ($obj === null ) {
-            $this->_ref = new Zend_Pdf_Element_Null();
-            return;
-        }
-
-        if ($obj->toString() != $this->_objNum . ' ' . $this->_genNum . ' R') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Incorrect reference to the object');
-        }
-
-        $this->_ref = $obj;
-    }
-
-    /**
-     * Mark object as modified, to include it into new PDF file segment.
-     */
-    public function touch()
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        $this->_ref->touch();
-    }
-
-    /**
-     * Return object, which can be used to identify object and its references identity
-     *
-     * @return Zend_Pdf_Element_Object
-     */
-    public function getObject()
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        return $this->_ref;
-    }
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        return $this->_ref->$property;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($property, $value)
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        $this->_ref->$property = $value;
-    }
-
-    /**
-     * Call handler
-     *
-     * @param string $method
-     * @param array  $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        return call_user_func_array(array($this->_ref, $method), $args);
-    }
-
-    /**
-     * Clean up resources
-     */
-    public function cleanUp()
-    {
-        $this->_ref = null;
-    }
-
-    /**
-     * Convert PDF element to PHP type.
-     *
-     * @return mixed
-     */
-    public function toPhp()
-    {
-        if ($this->_ref === null) {
-            $this->_dereference();
-        }
-
-        return $this->_ref->toPhp();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Reference/Context.php b/airtime_mvc/library/Zend/Pdf/Element/Reference/Context.php
deleted file mode 100644
index 2d3cc1d89..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Reference/Context.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Context.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF reference object context
- * Reference context is defined by PDF parser and PDF Refernce table
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Reference_Context
-{
-    /**
-     * PDF parser object.
-     *
-     * @var Zend_Pdf_StringParser
-     */
-    private $_stringParser;
-
-    /**
-     * Reference table
-     *
-     * @var Zend_Pdf_Element_Reference_Table
-     */
-    private $_refTable;
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_StringParser $parser
-     * @param Zend_Pdf_Element_Reference_Table $refTable
-     */
-    public function __construct(Zend_Pdf_StringParser $parser,
-                                Zend_Pdf_Element_Reference_Table $refTable)
-    {
-        $this->_stringParser = $parser;
-        $this->_refTable     = $refTable;
-    }
-
-
-    /**
-     * Context parser
-     *
-     * @return Zend_Pdf_StringParser
-     */
-    public function getParser()
-    {
-        return $this->_stringParser;
-    }
-
-
-    /**
-     * Context reference table
-     *
-     * @return Zend_Pdf_Element_Reference_Table
-     */
-    public function getRefTable()
-    {
-        return $this->_refTable;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Reference/Table.php b/airtime_mvc/library/Zend/Pdf/Element/Reference/Table.php
deleted file mode 100644
index d76f719e7..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Reference/Table.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF file reference table
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Reference_Table
-{
-    /**
-     * Parent reference table
-     *
-     * @var Zend_Pdf_Element_Reference_Table
-     */
-    private $_parent;
-
-    /**
-     * Free entries
-     * 'reference' => next free object number
-     *
-     * @var array
-     */
-    private $_free;
-
-    /**
-     * Generation numbers for free objects.
-     * Array: objNum => nextGeneration
-     *
-     * @var array
-     */
-    private $_generations;
-
-    /**
-     * In use entries
-     * 'reference' => offset
-     *
-     * @var array
-     */
-    private $_inuse;
-
-    /**
-     * Generation numbers for free objects.
-     * Array: objNum => objGeneration
-     *
-     * @var array
-     */
-    private $_usedObjects;
-
-
-
-    /**
-     * Object constructor
-     */
-    public function  __construct()
-    {
-        $this->_parent = null;
-        $this->_free   = array();  $this->_generations = array();
-        $this->_inuse  = array();  $this->_usedObjects = array();
-    }
-
-
-    /**
-     * Add reference to the reference table
-     *
-     * @param string $ref
-     * @param integer $offset
-     * @param boolean $inuse
-     */
-    public function addReference($ref, $offset, $inuse = true)
-    {
-        $refElements = explode(' ', $ref);
-        if (!is_numeric($refElements[0]) || !is_numeric($refElements[1]) || $refElements[2] != 'R') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Incorrect reference: '$ref'");
-        }
-        $objNum = (int)$refElements[0];
-        $genNum = (int)$refElements[1];
-
-        if ($inuse) {
-            $this->_inuse[$ref]          = $offset;
-            $this->_usedObjects[$objNum] = $objNum;
-        } else {
-            $this->_free[$ref]           = $offset;
-            $this->_generations[$objNum] = $genNum;
-        }
-    }
-
-
-    /**
-     * Set parent reference table
-     *
-     * @param Zend_Pdf_Element_Reference_Table $parent
-     */
-    public function setParent(self $parent)
-    {
-        $this->_parent = $parent;
-    }
-
-
-    /**
-     * Get object offset
-     *
-     * @param string $ref
-     * @return integer
-     */
-    public function getOffset($ref)
-    {
-        if (isset($this->_inuse[$ref])) {
-            return $this->_inuse[$ref];
-        }
-
-        if (isset($this->_free[$ref])) {
-            return null;
-        }
-
-        if (isset($this->_parent)) {
-            return $this->_parent->getOffset($ref);
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Get next object from a list of free objects.
-     *
-     * @param string $ref
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function getNextFree($ref)
-    {
-        if (isset($this->_inuse[$ref])) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object is not free');
-        }
-
-        if (isset($this->_free[$ref])) {
-            return $this->_free[$ref];
-        }
-
-        if (isset($this->_parent)) {
-            return $this->_parent->getNextFree($ref);
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Object not found.');
-    }
-
-
-    /**
-     * Get next generation number for free object
-     *
-     * @param integer $objNum
-     * @return unknown
-     */
-    public function getNewGeneration($objNum)
-    {
-        if (isset($this->_usedObjects[$objNum])) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object is not free');
-        }
-
-        if (isset($this->_generations[$objNum])) {
-            return $this->_generations[$objNum];
-        }
-
-        if (isset($this->_parent)) {
-            return $this->_parent->getNewGeneration($objNum);
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Object not found.');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/Stream.php b/airtime_mvc/library/Zend/Pdf/Element/Stream.php
deleted file mode 100644
index c5939ce15..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/Stream.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf.php';
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-/**
- * PDF file 'stream' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_Stream extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var Zend_Memory_Container
-     */
-    public $value;
-
-
-    /**
-     * Object constructor
-     *
-     * @param string $val
-     */
-    public function __construct($val)
-    {
-        $this->value = Zend_Pdf::getMemoryManager()->create($val);
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_STREAM;
-    }
-
-
-    /**
-     * Stream length.
-     * (Method is used to avoid string copying, which may occurs in some cases)
-     *
-     * @return integer
-     */
-    public function length()
-    {
-        return strlen($this->value->getRef());
-    }
-
-
-    /**
-     * Clear stream
-     *
-     */
-    public function clear()
-    {
-        $ref = &$this->value->getRef();
-        $ref = '';
-        $this->value->touch();
-    }
-
-
-    /**
-     * Append value to a stream
-     *
-     * @param mixed $val
-     */
-    public function append($val)
-    {
-        $ref = &$this->value->getRef();
-        $ref .= (string)$val;
-        $this->value->touch();
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return "stream\n" . $this->value->getRef() . "\nendstream";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/String.php b/airtime_mvc/library/Zend/Pdf/Element/String.php
deleted file mode 100644
index 3840fd4eb..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/String.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: String.php 21545 2010-03-18 09:12:27Z bate $
- */
-
-
-/** Zend_Pdf_Element */
-require_once 'Zend/Pdf/Element.php';
-
-/**
- * PDF file 'string' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_String extends Zend_Pdf_Element
-{
-    /**
-     * Object value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * Object constructor
-     *
-     * @param string $val
-     */
-    public function __construct($val)
-    {
-        $this->value   = (string)$val;
-    }
-
-
-    /**
-     * Return type of the element.
-     *
-     * @return integer
-     */
-    public function getType()
-    {
-        return Zend_Pdf_Element::TYPE_STRING;
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return '(' . self::escape((string)$this->value) . ')';
-    }
-
-
-    /**
-     * Escape string according to the PDF rules
-     *
-     * @param string $str
-     * @return string
-     */
-    public static function escape($str)
-    {
-        $outEntries = array();
-
-        foreach (str_split($str, 128) as $chunk) {
-            // Collect sequence of unescaped characters
-            $offset = strcspn($chunk, "\n\r\t\x08\x0C()\\");
-            $chunkOut = substr($chunk, 0, $offset);
-
-            while ($offset < strlen($chunk)) {
-                $nextCode = ord($chunk[$offset++]);
-                switch ($nextCode) {
-                    // "\n" - line feed (LF)
-                    case 10:
-                        $chunkOut .= '\\n';
-                        break;
-
-                    // "\r" - carriage return (CR)
-                    case 13:
-                        $chunkOut .= '\\r';
-                        break;
-
-                    // "\t" - horizontal tab (HT)
-                    case 9:
-                        $chunkOut .= '\\t';
-                        break;
-
-                    // "\b" - backspace (BS)
-                    case 8:
-                        $chunkOut .= '\\b';
-                        break;
-
-                    // "\f" - form feed (FF)
-                    case 12:
-                        $chunkOut .= '\\f';
-                        break;
-
-                    // '(' - left paranthesis
-                    case 40:
-                        $chunkOut .= '\\(';
-                        break;
-
-                    // ')' - right paranthesis
-                    case 41:
-                        $chunkOut .= '\\)';
-                        break;
-
-                    // '\' - backslash
-                    case 92:
-                        $chunkOut .= '\\\\';
-                        break;
-
-                    default:
-                        // This code is never executed extually
-                        //
-                        // Don't use non-ASCII characters escaping
-                        // if ($nextCode >= 32 && $nextCode <= 126 ) {
-                        //     // Visible ASCII symbol
-                        //     $chunkEntries[] = chr($nextCode);
-                        // } else {
-                        //     $chunkEntries[] = sprintf('\\%03o', $nextCode);
-                        // }
-
-                        break;
-                }
-
-                // Collect sequence of unescaped characters
-                $start = $offset;
-                $offset += strcspn($chunk, "\n\r\t\x08\x0C()\\", $offset);
-                $chunkOut .= substr($chunk, $start, $offset - $start);
-            }
-
-            $outEntries[] = $chunkOut;
-        }
-
-        return implode("\\\n", $outEntries);
-    }
-
-
-    /**
-     * Unescape string according to the PDF rules
-     *
-     * @param string $str
-     * @return string
-     */
-    public static function unescape($str)
-    {
-        $outEntries = array();
-
-        $offset = 0;
-        while ($offset < strlen($str)) {
-            // Searche for the next escaped character/sequence
-            $escapeCharOffset = strpos($str, '\\', $offset);
-            if ($escapeCharOffset === false  ||  $escapeCharOffset == strlen($str) - 1) {
-                // There are no escaped characters or '\' char has came at the end of string
-                $outEntries[] = substr($str, $offset);
-                break;
-            } else {
-                // Collect unescaped characters sequence
-                $outEntries[] = substr($str, $offset, $escapeCharOffset - $offset);
-                // Go to the escaped character
-                $offset = $escapeCharOffset + 1;
-
-                switch ($str[$offset]) {
-                    // '\\n' - line feed (LF)
-                    case 'n':
-                        $outEntries[] = "\n";
-                        break;
-
-                    // '\\r' - carriage return (CR)
-                    case 'r':
-                        $outEntries[] = "\r";
-                        break;
-
-                    // '\\t' - horizontal tab (HT)
-                    case 't':
-                        $outEntries[] = "\t";
-                        break;
-
-                    // '\\b' - backspace (BS)
-                    case 'b':
-                        $outEntries[] = "\x08";
-                        break;
-
-                    // '\\f' - form feed (FF)
-                    case 'f':
-                        $outEntries[] = "\x0C";
-                        break;
-
-                    // '\\(' - left paranthesis
-                    case '(':
-                        $outEntries[] = '(';
-                        break;
-
-                    // '\\)' - right paranthesis
-                    case ')':
-                        $outEntries[] = ')';
-                        break;
-
-                    // '\\\\' - backslash
-                    case '\\':
-                        $outEntries[] = '\\';
-                        break;
-
-                    // "\\\n" or "\\\n\r"
-                    case "\n":
-                        // skip new line symbol
-                        if ($str[$offset + 1] == "\r") {
-                            $offset++;
-                        }
-                        break;
-
-                    default:
-                        if (strpos('0123456789', $str[$offset]) !== false) {
-                            // Character in octal representation
-                            // '\\xxx'
-                            $nextCode = '0' . $str[$offset];
-
-                            if (strpos('0123456789', $str[$offset + 1]) !== false) {
-                                $nextCode .= $str[++$offset];
-
-                                if (strpos('0123456789', $str[$offset + 1]) !== false) {
-                                    $nextCode .= $str[++$offset];
-                                }
-                            }
-
-                            $outEntries[] = chr(octdec($nextCode));
-                        } else {
-                            $outEntries[] = $str[$offset];
-                        }
-                        break;
-                }
-
-                $offset++;
-            }
-        }
-
-        return implode($outEntries);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Element/String/Binary.php b/airtime_mvc/library/Zend/Pdf/Element/String/Binary.php
deleted file mode 100644
index d19e04cf8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Element/String/Binary.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Element_String */
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/**
- * PDF file 'binary string' element implementation
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Element_String_Binary extends Zend_Pdf_Element_String
-{
-    /**
-     * Object value
-     *
-     * @var string
-     */
-    public $value;
-
-
-    /**
-     * Escape string according to the PDF rules
-     *
-     * @param string $inStr
-     * @return string
-     */
-    public static function escape($inStr)
-    {
-        return strtoupper(bin2hex($inStr));
-    }
-
-
-    /**
-     * Unescape string according to the PDF rules
-     *
-     * @param string $inStr
-     * @return string
-     */
-    public static function unescape($inStr)
-    {
-        $chunks = array();
-        $offset = 0;
-        $length = 0;
-        while ($offset < strlen($inStr)) {
-            // Collect hexadecimal characters
-            $start = $offset;
-            $offset += strspn($inStr, "0123456789abcdefABCDEF", $offset);
-            $chunks[] = substr($inStr, $start, $offset - $start);
-            $length += strlen(end($chunks));
-
-            // Skip non-hexadecimal characters
-            $offset += strcspn($inStr, "0123456789abcdefABCDEF", $offset);
-        }
-        if ($length % 2 != 0) {
-            // We have odd number of digits.
-            // Final digit is assumed to be '0'
-            $chunks[] = '0';
-        }
-
-        return pack('H*' , implode($chunks));
-    }
-
-
-    /**
-     * Return object as string
-     *
-     * @param Zend_Pdf_Factory $factory
-     * @return string
-     */
-    public function toString($factory = null)
-    {
-        return '<' . self::escape((string)$this->value) . '>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/ElementFactory.php b/airtime_mvc/library/Zend/Pdf/ElementFactory.php
deleted file mode 100644
index 857867398..000000000
--- a/airtime_mvc/library/Zend/Pdf/ElementFactory.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ElementFactory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_ElementFactory_Interface */
-require_once 'Zend/Pdf/ElementFactory/Interface.php';
-
-/**
- * PDF element factory.
- * Responsibility is to log PDF changes
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_ElementFactory implements Zend_Pdf_ElementFactory_Interface
-{
-    /**
-     * List of the modified objects.
-     * Also contains new and removed objects
-     *
-     * Array: ojbectNumber => Zend_Pdf_Element_Object
-     *
-     * @var array
-     */
-    private $_modifiedObjects = array();
-
-    /**
-     * List of the removed objects
-     *
-     * Array: ojbectNumber => Zend_Pdf_Element_Object
-     *
-     * @var SplObjectStorage
-     */
-    private $_removedObjects;
-
-    /**
-     * List of registered objects.
-     * Used for resources clean up when factory is destroyed.
-     *
-     * Array of Zend_Pdf_Element objects
-     *
-     * @var array
-     */
-    private $_registeredObjects = array();
-
-    /**
-     * PDF object counter.
-     * Actually it's an object number for new PDF object
-     *
-     * @var integer
-     */
-    private $_objectCount;
-
-
-    /**
-     * List of the attached object factories.
-     * Array of Zend_Pdf_ElementFactory_Interface objects
-     *
-     * @var array
-     */
-    private $_attachedFactories = array();
-
-
-    /**
-     * Factory internal id
-     *
-     * @var integer
-     */
-    private $_factoryId;
-
-    /**
-     * Identity, used for factory id generation
-     *
-     * @var integer
-     */
-    private static $_identity = 0;
-
-
-    /**
-     * Internal cache to save calculated shifts
-     *
-     * @var array
-     */
-    private $_shiftCalculationCache = array();
-
-
-    /**
-     * Object constructor
-     *
-     * @param integer $objCount
-     */
-    public function __construct($objCount)
-    {
-        $this->_objectCount    = (int)$objCount;
-        $this->_factoryId      = self::$_identity++;
-        $this->_removedObjects = new SplObjectStorage();
-    }
-
-
-    /**
-     * Factory generator
-     *
-     * @param integer $objCount
-     * @return Zend_Pdf_ElementFactory_Interface
-     */
-    static public function createFactory($objCount)
-    {
-        require_once 'Zend/Pdf/ElementFactory/Proxy.php';
-        return new Zend_Pdf_ElementFactory_Proxy(new Zend_Pdf_ElementFactory($objCount));
-    }
-
-    /**
-     * Close factory and clean-up resources
-     *
-     * @internal
-     */
-    public function close()
-    {
-        $this->_modifiedObjects   = null;
-        $this->_removedObjects    = null;
-        $this->_attachedFactories = null;
-
-        foreach ($this->_registeredObjects as $obj) {
-            $obj->cleanUp();
-        }
-        $this->_registeredObjects = null;
-    }
-
-    /**
-     * Get source factory object
-     *
-     * @return Zend_Pdf_ElementFactory
-     */
-    public function resolve()
-    {
-        return $this;
-    }
-
-    /**
-     * Get factory ID
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->_factoryId;
-    }
-
-    /**
-     * Set object counter
-     *
-     * @param integer $objCount
-     */
-    public function setObjectCount($objCount)
-    {
-        $this->_objectCount = (int)$objCount;
-    }
-
-    /**
-     * Get object counter
-     *
-     * @return integer
-     */
-    public function getObjectCount()
-    {
-        $count = $this->_objectCount;
-
-        foreach ($this->_attachedFactories as $attached) {
-            $count += $attached->getObjectCount() - 1; // -1 as "0" object is a special case and shared between factories
-        }
-
-        return $count;
-    }
-
-
-    /**
-     * Attach factory to the current;
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     */
-    public function attach(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        if ( $factory === $this || isset($this->_attachedFactories[$factory->getId()])) {
-            /**
-             * Don't attach factory twice.
-             * We do not check recusively because of nature of attach operation
-             * (Pages are always attached to the Documents, Fonts are always attached
-             * to the pages even if pages already use Document level object factory and so on)
-             */
-            return;
-        }
-
-        $this->_attachedFactories[$factory->getId()] = $factory;
-    }
-
-
-    /**
-     * Calculate object enumeration shift.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     */
-    public function calculateShift(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        if ($factory === $this) {
-            return 0;
-        }
-
-        if (isset($this->_shiftCalculationCache[$factory->_factoryId])) {
-            return $this->_shiftCalculationCache[$factory->_factoryId];
-        }
-
-        $shift = $this->_objectCount - 1;
-
-        foreach ($this->_attachedFactories as $subFactory) {
-            $subFactoryShift = $subFactory->calculateShift($factory);
-
-            if ($subFactoryShift != -1) {
-                // context found
-                $this->_shiftCalculationCache[$factory->_factoryId] = $shift + $subFactoryShift;
-                return $shift + $subFactoryShift;
-            } else {
-                $shift += $subFactory->getObjectCount()-1;
-            }
-        }
-
-        $this->_shiftCalculationCache[$factory->_factoryId] = -1;
-        return -1;
-    }
-
-    /**
-     * Clean enumeration shift cache.
-     * Has to be used after PDF render operation to let followed updates be correct.
-     */
-    public function cleanEnumerationShiftCache()
-    {
-        $this->_shiftCalculationCache = array();
-
-        foreach ($this->_attachedFactories as $attached) {
-            $attached->cleanEnumerationShiftCache();
-        }
-    }
-
-    /**
-     * Retrive object enumeration shift.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function getEnumerationShift(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        if (($shift = $this->calculateShift($factory)) == -1) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong object context');
-        }
-
-        return $shift;
-    }
-
-    /**
-     * Mark object as modified in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function markAsModified(Zend_Pdf_Element_Object $obj)
-    {
-        if ($obj->getFactory() !== $this) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object is not generated by this factory');
-        }
-
-        $this->_modifiedObjects[$obj->getObjNum()] = $obj;
-    }
-
-
-    /**
-     * Remove object in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function remove(Zend_Pdf_Element_Object $obj)
-    {
-        if (!$obj->compareFactory($this)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Object is not generated by this factory');
-        }
-
-        $this->_modifiedObjects[$obj->getObjNum()] = $obj;
-        $this->_removedObjects->attach($obj);
-    }
-
-
-    /**
-     * Generate new Zend_Pdf_Element_Object
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param Zend_Pdf_Element $objectValue
-     * @return Zend_Pdf_Element_Object
-     */
-    public function newObject(Zend_Pdf_Element $objectValue)
-    {
-        require_once 'Zend/Pdf/Element/Object.php';
-        $obj = new Zend_Pdf_Element_Object($objectValue, $this->_objectCount++, 0, $this);
-        $this->_modifiedObjects[$obj->getObjNum()] = $obj;
-        return $obj;
-    }
-
-    /**
-     * Generate new Zend_Pdf_Element_Object_Stream
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param mixed $objectValue
-     * @return Zend_Pdf_Element_Object_Stream
-     */
-    public function newStreamObject($streamValue)
-    {
-        require_once 'Zend/Pdf/Element/Object/Stream.php';
-        $obj = new Zend_Pdf_Element_Object_Stream($streamValue, $this->_objectCount++, 0, $this);
-        $this->_modifiedObjects[$obj->getObjNum()] = $obj;
-        return $obj;
-    }
-
-
-    /**
-     * Enumerate modified objects.
-     * Returns array of Zend_Pdf_UpdateInfoContainer
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $rootFactory
-     * @return array
-     */
-    public function listModifiedObjects($rootFactory = null)
-    {
-        if ($rootFactory == null) {
-            $rootFactory = $this;
-            $shift = 0;
-        } else {
-            $shift = $rootFactory->getEnumerationShift($this);
-        }
-
-        ksort($this->_modifiedObjects);
-
-        $result = array();
-        require_once 'Zend/Pdf/UpdateInfoContainer.php';
-        foreach ($this->_modifiedObjects as $objNum => $obj) {
-            if ($this->_removedObjects->contains($obj)) {
-                            $result[$objNum+$shift] = new Zend_Pdf_UpdateInfoContainer($objNum + $shift,
-                                                                           $obj->getGenNum()+1,
-                                                                           true);
-            } else {
-                $result[$objNum+$shift] = new Zend_Pdf_UpdateInfoContainer($objNum + $shift,
-                                                                           $obj->getGenNum(),
-                                                                           false,
-                                                                           $obj->dump($rootFactory));
-            }
-        }
-
-        foreach ($this->_attachedFactories as $factory) {
-            $result += $factory->listModifiedObjects($rootFactory);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Register object in the factory
-     *
-     * It's used to clear "parent object" referencies when factory is closed and clean up resources
-     *
-     * @param string $refString
-     * @param Zend_Pdf_Element_Object $obj
-     */
-    public function registerObject(Zend_Pdf_Element_Object $obj, $refString)
-    {
-        $this->_registeredObjects[$refString] = $obj;
-    }
-
-    /**
-     * Fetch object specified by reference
-     *
-     * @param string $refString
-     * @return Zend_Pdf_Element_Object|null
-     */
-    public function fetchObject($refString)
-    {
-        if (!isset($this->_registeredObjects[$refString])) {
-            return null;
-        }
-        return $this->_registeredObjects[$refString];
-    }
-
-
-    /**
-     * Check if PDF file was modified
-     *
-     * @return boolean
-     */
-    public function isModified()
-    {
-        if (count($this->_modifiedObjects) != 0) {
-            return true;
-        }
-
-        foreach ($this->_attachedFactories as $subFactory) {
-            if ($subFactory->isModified()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/ElementFactory/Interface.php b/airtime_mvc/library/Zend/Pdf/ElementFactory/Interface.php
deleted file mode 100644
index 1e09213e8..000000000
--- a/airtime_mvc/library/Zend/Pdf/ElementFactory/Interface.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * PDF element factory interface.
- * Responsibility is to log PDF changes
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Pdf_ElementFactory_Interface
-{
-    /**
-     * Close factory and clean-up resources
-     *
-     * @internal
-     */
-    public function close();
-
-    /**
-     * Get source factory object
-     *
-     * @return Zend_Pdf_ElementFactory
-     */
-    public function resolve();
-
-    /**
-     * Get factory ID
-     *
-     * @return integer
-     */
-    public function getId();
-
-    /**
-     * Set object counter
-     *
-     * @param integer $objCount
-     */
-    public function setObjectCount($objCount);
-
-    /**
-     * Get object counter
-     *
-     * @return integer
-     */
-    public function getObjectCount();
-
-    /**
-     * Attach factory to the current;
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     */
-    public function attach(Zend_Pdf_ElementFactory_Interface $factory);
-
-    /**
-     * Calculate object enumeration shift.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     */
-    public function calculateShift(Zend_Pdf_ElementFactory_Interface $factory);
-
-    /**
-     * Clean enumeration shift cache.
-     * Has to be used after PDF render operation to let followed updates be correct.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     */
-    public function cleanEnumerationShiftCache();
-
-    /**
-     * Retrive object enumeration shift.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function getEnumerationShift(Zend_Pdf_ElementFactory_Interface $factory);
-
-    /**
-     * Mark object as modified in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function markAsModified(Zend_Pdf_Element_Object $obj);
-
-    /**
-     * Remove object in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function remove(Zend_Pdf_Element_Object $obj);
-
-    /**
-     * Generate new Zend_Pdf_Element_Object
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param Zend_Pdf_Element $objectValue
-     * @return Zend_Pdf_Element_Object
-     */
-    public function newObject(Zend_Pdf_Element $objectValue);
-
-    /**
-     * Generate new Zend_Pdf_Element_Object_Stream
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param mixed $objectValue
-     * @return Zend_Pdf_Element_Object_Stream
-     */
-    public function newStreamObject($streamValue);
-
-    /**
-     * Enumerate modified objects.
-     * Returns array of Zend_Pdf_UpdateInfoContainer
-     *
-     * @param Zend_Pdf_ElementFactory $rootFactory
-     * @return array
-     */
-    public function listModifiedObjects($rootFactory = null);
-
-    /**
-     * Check if PDF file was modified
-     *
-     * @return boolean
-     */
-    public function isModified();
-}
diff --git a/airtime_mvc/library/Zend/Pdf/ElementFactory/Proxy.php b/airtime_mvc/library/Zend/Pdf/ElementFactory/Proxy.php
deleted file mode 100644
index f75d85f73..000000000
--- a/airtime_mvc/library/Zend/Pdf/ElementFactory/Proxy.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Proxy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_ElementFactory_Interface */
-require_once 'Zend/Pdf/ElementFactory/Interface.php';
-
-/**
- * PDF element factory interface.
- * Responsibility is to log PDF changes
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_ElementFactory_Proxy implements Zend_Pdf_ElementFactory_Interface
-{
-    /**
-     * Factory object
-     *
-     * @var Zend_Pdf_ElementFactory_Interface
-     */
-    private $_factory;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     */
-    public function __construct(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        $this->_factory = $factory;
-    }
-
-    public function __destruct()
-    {
-        $this->_factory->close();
-        $this->_factory = null;
-    }
-
-    /**
-     * Close factory and clean-up resources
-     *
-     * @internal
-     */
-    public function close()
-    {
-        // Do nothing
-    }
-
-    /**
-     * Get source factory object
-     *
-     * @return Zend_Pdf_ElementFactory
-     */
-    public function resolve()
-    {
-        return $this->_factory->resolve();
-    }
-
-    /**
-     * Get factory ID
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->_factory->getId();
-    }
-
-    /**
-     * Set object counter
-     *
-     * @param integer $objCount
-     */
-    public function setObjectCount($objCount)
-    {
-        $this->_factory->setObjectCount($objCount);
-    }
-
-    /**
-     * Get object counter
-     *
-     * @return integer
-     */
-    public function getObjectCount()
-    {
-        return $this->_factory->getObjectCount();
-    }
-
-    /**
-     * Attach factory to the current;
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     */
-    public function attach(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        $this->_factory->attach($factory);
-    }
-
-    /**
-     * Calculate object enumeration shift.
-     *
-     * @internal
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     */
-    public function calculateShift(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        return $this->_factory->calculateShift($factory);
-    }
-
-    /**
-     * Clean enumeration shift cache.
-     * Has to be used after PDF render operation to let followed updates be correct.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     */
-    public function cleanEnumerationShiftCache()
-    {
-        return $this->_factory->cleanEnumerationShiftCache();
-    }
-
-    /**
-     * Retrive object enumeration shift.
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function getEnumerationShift(Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        return $this->_factory->getEnumerationShift($factory);
-    }
-
-    /**
-     * Mark object as modified in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function markAsModified(Zend_Pdf_Element_Object $obj)
-    {
-        $this->_factory->markAsModified($obj);
-    }
-
-    /**
-     * Remove object in context of current factory.
-     *
-     * @param Zend_Pdf_Element_Object $obj
-     * @throws Zend_Pdf_Exception
-     */
-    public function remove(Zend_Pdf_Element_Object $obj)
-    {
-        $this->_factory->remove($obj);
-    }
-
-    /**
-     * Generate new Zend_Pdf_Element_Object
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param Zend_Pdf_Element $objectValue
-     * @return Zend_Pdf_Element_Object
-     */
-    public function newObject(Zend_Pdf_Element $objectValue)
-    {
-        return $this->_factory->newObject($objectValue);
-    }
-
-    /**
-     * Generate new Zend_Pdf_Element_Object_Stream
-     *
-     * @todo Reusage of the freed object. It's not a support of new feature, but only improvement.
-     *
-     * @param mixed $objectValue
-     * @return Zend_Pdf_Element_Object_Stream
-     */
-    public function newStreamObject($streamValue)
-    {
-        return $this->_factory->newStreamObject($streamValue);
-    }
-
-    /**
-     * Enumerate modified objects.
-     * Returns array of Zend_Pdf_UpdateInfoContainer
-     *
-     * @param Zend_Pdf_ElementFactory $rootFactory
-     * @return array
-     */
-    public function listModifiedObjects($rootFactory = null)
-    {
-        return $this->_factory->listModifiedObjects($rootFactory);
-    }
-
-    /**
-     * Check if PDF file was modified
-     *
-     * @return boolean
-     */
-    public function isModified()
-    {
-        return $this->_factory->isModified();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Exception.php b/airtime_mvc/library/Zend/Pdf/Exception.php
deleted file mode 100644
index df04f1cd9..000000000
--- a/airtime_mvc/library/Zend/Pdf/Exception.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Core
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * Exception class for Zend_Pdf.
- *
- * If you expect a certain type of exception to be caught and handled by the
- * caller, create a constant for it here and include it in the object being
- * thrown. Example:
- *
- *   throw new Zend_Pdf_Exception('foo() is not yet implemented',
- *                                Zend_Pdf_Exception::NOT_IMPLEMENTED);
- *
- * This allows the caller to determine the specific type of exception that was
- * thrown without resorting to parsing the descriptive text.
- *
- * IMPORTANT: Do not rely on numeric values of the constants! They are grouped
- * sequentially below for organizational purposes only. The numbers may come to
- * mean something in the future, but they are subject to renumbering at any
- * time. ALWAYS use the symbolic constant names, which are guaranteed never to
- * change, in logical checks! You have been warned.
- *
- * @package    Zend_Pdf
- * @subpackage Core
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Exception extends Zend_Exception
-{
-  /**** Class Constants ****/
-
-
-  /* Generic Exceptions */
-
-    /**
-     * The feature or option is planned but has not yet been implemented. It
-     * should be available in a future revision of the framework.
-     */
-    const NOT_IMPLEMENTED = 0x0001;
-
-    /**
-     * The feature or option has been deprecated and will be removed in a future
-     * revision of the framework. The descriptive text accompanying this
-     * exception should explain how to use the replacement features or options.
-     */
-    const DEPRECATED = 0x0002;
-
-    /**
-     * Not enough paramaters were supplied to the method.
-     */
-    const TOO_FEW_PARAMETERS = 0x0003;
-
-    /**
-     * A parameter was of the wrong data type.
-     */
-    const BAD_PARAMETER_TYPE = 0x0004;
-
-    /**
-     * A parameter contained an unusable value.
-     */
-    const BAD_PARAMETER_VALUE = 0x0005;
-
-    /**
-     * A parameter value was not within the expected range.
-     */
-    const PARAMETER_VALUE_OUT_OF_RANGE = 0x0006;
-
-    /**
-     * The method that has multiple signatures could not understand the
-     * number and/or types of parameters.
-     */
-    const BAD_METHOD_SIGNATURE = 0x0007;
-
-    /**
-     * An array or string index was out of range.
-     */
-    const INDEX_OUT_OF_RANGE = 0x0008;
-
-
-
-  /* Filesystem I/O */
-
-    /**
-     * The file path was unusable or invalid.
-     */
-    const BAD_FILE_PATH = 0x0101;
-
-    /**
-     * The file is not readable by the current user.
-     */
-    const NOT_READABLE = 0x0102;
-
-    /**
-     * The file is not writeable by the current user.
-     */
-    const NOT_WRITEABLE = 0x0103;
-
-    /**
-     * The file resource has been closed unexpectedly.
-     */
-    const FILE_NOT_OPEN = 0x0104;
-
-    /**
-     * An error was encountered while attempting to open the file.
-     */
-    const CANT_OPEN_FILE = 0x0105;
-
-    /**
-     * An error was encountered while attempting to obtain the current file
-     * position.
-     */
-    const CANT_GET_FILE_POSITION = 0x0106;
-
-    /**
-     * An error was encountered while attempting to set a new file position.
-     */
-    const CANT_SET_FILE_POSITION = 0x0107;
-
-    /**
-     * An attempt was made to move the current file position before the start
-     * of the file.
-     */
-    const MOVE_BEFORE_START_OF_FILE = 0x0108;
-
-    /**
-     * An attempt was made to move the current file position beyond the end of
-     * the file.
-     */
-    const MOVE_BEYOND_END_OF_FILE = 0x0109;
-
-    /**
-     * An error was encountered while attempting to obtain the file size.
-     */
-    const CANT_GET_FILE_SIZE = 0x010a;
-
-    /**
-     * An error was encountered while attempting to read data from the file.
-     */
-    const ERROR_DURING_READ = 0x010b;
-
-    /**
-     * An error was encountered while attempting to write data to the file.
-     */
-    const ERROR_DURING_WRITE = 0x010c;
-
-    /**
-     * An incompatible page size was specified for a buffered read operation.
-     */
-    const INVALID_PAGE_SIZE = 0x010d;
-
-    /**
-     * There is insufficient data to fulfill the read request.
-     */
-    const INSUFFICIENT_DATA = 0x010e;
-
-
-
-  /* Zend_Pdf_FileParser */
-
-    /**
-     * The file parser data source object was invalid or improperly initialized.
-     */
-    const BAD_DATA_SOURCE = 0x0201;
-
-    /**
-     * An unknown byte order was specified.
-     */
-    const INVALID_BYTE_ORDER = 0x0202;
-
-    /**
-     * An invalid integer size was specified.
-     */
-    const INVALID_INTEGER_SIZE = 0x0203;
-
-    /**
-     * An invalid fixed-point number size was specified.
-     */
-    const BAD_FIXED_POINT_SIZE = 0x0204;
-
-    /**
-     * The string cannot be read.
-     */
-    const CANT_READ_STRING = 0x0205;
-
-    /**
-     * This file type must be parsed in a specific order and a parsing method
-     * was called out-of-turn.
-     */
-    const PARSED_OUT_OF_ORDER = 0x0206;
-
-
-
-  /* Zend_Pdf_FileParser_Font and Subclasses */
-
-    /**
-     * The font file type is incorrect.
-     */
-    const WRONG_FONT_TYPE = 0x0301;
-
-    /**
-     * The number of tables contained in the font is outside the expected range.
-     */
-    const BAD_TABLE_COUNT = 0x0302;
-
-    /**
-     * A required table was not present in the font.
-     */
-    const REQUIRED_TABLE_NOT_FOUND = 0x0303;
-
-    /**
-     * The parser does not understand this version of this table in the font.
-     */
-    const DONT_UNDERSTAND_TABLE_VERSION = 0x0303;
-
-    /**
-     * The magic number in the font file is incorrect.
-     */
-    const BAD_MAGIC_NUMBER = 0x0304;
-
-    /**
-     * Could not locate a usable character map for this font.
-     */
-    const CANT_FIND_GOOD_CMAP = 0x0305;
-
-
-
-  /* Zend_Pdf_Cmap and Subclasses */
-
-    /**
-     * The character map type is currently unsupported.
-     */
-    const CMAP_TYPE_UNSUPPORTED = 0x0401;
-
-    /**
-     * The type of the character map is not understood.
-     */
-    const CMAP_UNKNOWN_TYPE = 0x0402;
-
-    /**
-     * The character map table data is too small.
-     */
-    const CMAP_TABLE_DATA_TOO_SMALL = 0x0403;
-
-    /**
-     * The character map table data is for a different type of table.
-     */
-    const CMAP_WRONG_TABLE_TYPE = 0x0404;
-
-    /**
-     * The character map table data contains in incorrect length.
-     */
-    const CMAP_WRONG_TABLE_LENGTH = 0x0405;
-
-    /**
-     * This character map table is language-dependent. Character maps must be
-     * language-independent.
-     */
-    const CMAP_NOT_LANGUAGE_INDEPENDENT = 0x0406;
-
-    /**
-     * The final byte offset when reading the character map table data does not
-     * match the reported length of the table.
-     */
-    const CMAP_FINAL_OFFSET_NOT_LENGTH = 0x0407;
-
-    /**
-     * The character map subtable entry count does not match the expected value.
-     */
-    const CMAP_WRONG_ENTRY_COUNT = 0x0408;
-
-
-
-  /* Zend_Pdf_Resource_Font and Subclasses */
-
-    /**
-     * The specified glyph number is out of range for this font.
-     */
-    const GLYPH_OUT_OF_RANGE = 0x0501;
-
-    /**
-     * This font program has copyright bits set which prevent it from being
-     * embedded in the PDF file. You must specify the no-embed option to use
-     * this font.
-     */
-    const FONT_CANT_BE_EMBEDDED = 0x0502;
-
-
-
-  /* Zend_Pdf_Font */
-
-    /**
-     * The font name did not match any previously instantiated font and is not
-     * one of the standard 14 PDF fonts.
-     */
-    const BAD_FONT_NAME = 0x0601;
-
-    /**
-     * The factory method could not determine the type of the font file.
-     */
-    const CANT_DETERMINE_FONT_TYPE = 0x0602;
-
-
-  /* Text Layout System */
-
-    /**
-     * The specified attribute value for the text object cannot be used.
-     */
-    const BAD_ATTRIBUTE_VALUE = 0x0701;
-
-
-  /* Zend_Pdf_Image and Subclasses */
-
-    const CANT_DETERMINE_IMAGE_TYPE = 0x0801;
-    const WRONG_IMAGE_TYPE = 0x0802;
-    const UNSUPPORTED_IMAGE_ENCODING_OPTIONS = 0x0803;
-    const IMAGE_FILE_CORRUPT = 0x0804;
-
-
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser.php b/airtime_mvc/library/Zend/Pdf/FileParser.php
deleted file mode 100644
index 6936867e8..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FileParser.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract utility class for parsing binary files.
- *
- * Provides a library of methods to quickly navigate and extract various data
- * types (signed and unsigned integers, floating- and fixed-point numbers,
- * strings, etc.) from the file.
- *
- * File access is managed via a {@link Zend_Pdf_FileParserDataSource} object.
- * This allows the same parser code to work with many different data sources:
- * in-memory objects, filesystem files, etc.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_FileParser
-{
-  /**** Class Constants ****/
-
-    /**
-     * Little-endian byte order (0x04 0x03 0x02 0x01).
-     */
-    const BYTE_ORDER_LITTLE_ENDIAN = 0;
-
-    /**
-     * Big-endian byte order (0x01 0x02 0x03 0x04).
-     */
-    const BYTE_ORDER_BIG_ENDIAN    = 1;
-
-
-
-  /**** Instance Variables ****/
-
-
-    /**
-     * Flag indicating that the file has passed a cursory validation check.
-     * @var boolean
-     */
-    protected $_isScreened = false;
-
-    /**
-     * Flag indicating that the file has been sucessfully parsed.
-     * @var boolean
-     */
-    protected $_isParsed = false;
-
-    /**
-     * Object representing the data source to be parsed.
-     * @var Zend_Pdf_FileParserDataSource
-     */
-    protected $_dataSource = null;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Abstract Methods */
-
-    /**
-     * Performs a cursory check to verify that the binary file is in the expected
-     * format. Intended to quickly weed out obviously bogus files.
-     *
-     * Must set $this->_isScreened to true if successful.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function screen();
-
-    /**
-     * Reads and parses the complete binary file.
-     *
-     * Must set $this->_isParsed to true if successful.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function parse();
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor.
-     *
-     * Verifies that the data source has been properly initialized.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParserDataSource $dataSource)
-    {
-        if ($dataSource->getSize() == 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('The data source has not been properly initialized',
-                                         Zend_Pdf_Exception::BAD_DATA_SOURCE);
-        }
-        $this->_dataSource = $dataSource;
-    }
-
-    /**
-     * Object destructor.
-     *
-     * Discards the data source object.
-     */
-    public function __destruct()
-    {
-        $this->_dataSource = null;
-    }
-
-
-  /* Accessors */
-
-    /**
-     * Returns true if the file has passed a cursory validation check.
-     *
-     * @return boolean
-     */
-    public function isScreened()
-    {
-        return $this->_isScreened;
-    }
-
-    /**
-     * Returns true if the file has been successfully parsed.
-     *
-     * @return boolean
-     */
-    public function isParsed()
-    {
-        return $this->_isParsed;
-    }
-
-    /**
-     * Returns the data source object representing the file being parsed.
-     *
-     * @return Zend_Pdf_FileParserDataSource
-     */
-    public function getDataSource()
-    {
-        return $this->_dataSource;
-    }
-
-
-  /* Primitive Methods */
-
-    /**
-     * Convenience wrapper for the data source object's moveToOffset() method.
-     *
-     * @param integer $offset Destination byte offset.
-     * @throws Zend_Pdf_Exception
-     */
-    public function moveToOffset($offset)
-    {
-        $this->_dataSource->moveToOffset($offset);
-    }
-
-    public function getOffset() {
-       return $this->_dataSource->getOffset();
-    }
-
-    public function getSize() {
-       return $this->_dataSource->getSize();
-    }
-
-    /**
-     * Convenience wrapper for the data source object's readBytes() method.
-     *
-     * @param integer $byteCount Number of bytes to read.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readBytes($byteCount)
-    {
-        return $this->_dataSource->readBytes($byteCount);
-    }
-
-    /**
-     * Convenience wrapper for the data source object's skipBytes() method.
-     *
-     * @param integer $byteCount Number of bytes to skip.
-     * @throws Zend_Pdf_Exception
-     */
-    public function skipBytes($byteCount)
-    {
-        $this->_dataSource->skipBytes($byteCount);
-    }
-
-
-  /* Parser Methods */
-
-    /**
-     * Reads the signed integer value from the binary file at the current byte
-     * offset.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * @param integer $size Size of integer in bytes: 1-4
-     * @param integer $byteOrder (optional) Big- or little-endian byte order.
-     *   Use the BYTE_ORDER_ constants defined in {@link Zend_Pdf_FileParser}.
-     *   If omitted, uses big-endian.
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function readInt($size, $byteOrder = Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN)
-    {
-        if (($size < 1) || ($size > 4)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid signed integer size: $size",
-                                         Zend_Pdf_Exception::INVALID_INTEGER_SIZE);
-        }
-        $bytes = $this->_dataSource->readBytes($size);
-        /* unpack() will not work for this method because it always works in
-         * the host byte order for signed integers. It also does not allow for
-         * variable integer sizes.
-         */
-        if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN) {
-            $number = ord($bytes[0]);
-            if (($number & 0x80) == 0x80) {
-                /* This number is negative. Extract the positive equivalent.
-                 */
-                $number = (~ $number) & 0xff;
-                for ($i = 1; $i < $size; $i++) {
-                    $number = ($number << 8) | ((~ ord($bytes[$i])) & 0xff);
-                }
-                /* Now turn this back into a negative number by taking the
-                 * two's complement (we didn't add one above so won't
-                 * subtract it below). This works reliably on both 32- and
-                 * 64-bit systems.
-                 */
-                $number = ~$number;
-            } else {
-                for ($i = 1; $i < $size; $i++) {
-                    $number = ($number << 8) | ord($bytes[$i]);
-                }
-            }
-        } else if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_LITTLE_ENDIAN) {
-            $number = ord($bytes[$size - 1]);
-            if (($number & 0x80) == 0x80) {
-                /* Negative number. See discussion above.
-                 */
-                $number = 0;
-                for ($i = --$size; $i >= 0; $i--) {
-                    $number |= ((~ ord($bytes[$i])) & 0xff) << ($i * 8);
-                }
-                $number = ~$number;
-            } else {
-                $number = 0;
-                for ($i = --$size; $i >= 0; $i--) {
-                    $number |= ord($bytes[$i]) << ($i * 8);
-                }
-            }
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid byte order: $byteOrder",
-                                         Zend_Pdf_Exception::INVALID_BYTE_ORDER);
-        }
-        return $number;
-    }
-
-    /**
-     * Reads the unsigned integer value from the binary file at the current byte
-     * offset.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * NOTE: If you ask for a 4-byte unsigned integer on a 32-bit machine, the
-     * resulting value WILL BE SIGNED because PHP uses signed integers internally
-     * for everything. To guarantee portability, be sure to use bitwise operators
-     * operators on large unsigned integers!
-     *
-     * @param integer $size Size of integer in bytes: 1-4
-     * @param integer $byteOrder (optional) Big- or little-endian byte order.
-     *   Use the BYTE_ORDER_ constants defined in {@link Zend_Pdf_FileParser}.
-     *   If omitted, uses big-endian.
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function readUInt($size, $byteOrder = Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN)
-    {
-        if (($size < 1) || ($size > 4)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid unsigned integer size: $size",
-                                         Zend_Pdf_Exception::INVALID_INTEGER_SIZE);
-        }
-        $bytes = $this->_dataSource->readBytes($size);
-        /* unpack() is a bit heavyweight for this simple conversion. Just
-         * work the bytes directly.
-         */
-        if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN) {
-            $number = ord($bytes[0]);
-            for ($i = 1; $i < $size; $i++) {
-                $number = ($number << 8) | ord($bytes[$i]);
-            }
-        } else if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_LITTLE_ENDIAN) {
-            $number = 0;
-            for ($i = --$size; $i >= 0; $i--) {
-                $number |= ord($bytes[$i]) << ($i * 8);
-            }
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid byte order: $byteOrder",
-                                         Zend_Pdf_Exception::INVALID_BYTE_ORDER);
-        }
-        return $number;
-    }
-
-    /**
-     * Returns true if the specified bit is set in the integer bitfield.
-     *
-     * @param integer $bit Bit number to test (i.e. - 0-31)
-     * @param integer $bitField
-     * @return boolean
-     */
-    public function isBitSet($bit, $bitField)
-    {
-        $bitMask = 1 << $bit;
-        $isSet = (($bitField & $bitMask) == $bitMask);
-        return $isSet;
-    }
-
-    /**
-     * Reads the signed fixed-point number from the binary file at the current
-     * byte offset.
-     *
-     * Common fixed-point sizes are 2.14 and 16.16.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * @param integer $mantissaBits Number of bits in the mantissa
-     * @param integer $fractionBits Number of bits in the fraction
-     * @param integer $byteOrder (optional) Big- or little-endian byte order.
-     *   Use the BYTE_ORDER_ constants defined in {@link Zend_Pdf_FileParser}.
-     *   If omitted, uses big-endian.
-     * @return float
-     * @throws Zend_Pdf_Exception
-     */
-    public function readFixed($mantissaBits, $fractionBits,
-                              $byteOrder = Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN)
-    {
-        $bitsToRead = $mantissaBits + $fractionBits;
-        if (($bitsToRead % 8) !== 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Fixed-point numbers are whole bytes',
-                                         Zend_Pdf_Exception::BAD_FIXED_POINT_SIZE);
-        }
-        $number = $this->readInt(($bitsToRead >> 3), $byteOrder) / (1 << $fractionBits);
-        return $number;
-    }
-
-    /**
-     * Reads the Unicode UTF-16-encoded string from the binary file at the
-     * current byte offset.
-     *
-     * The byte order of the UTF-16 string must be specified. You must also
-     * supply the desired resulting character set.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * @todo Consider changing $byteCount to a character count. They are not
-     *   always equivalent (in the case of surrogates).
-     * @todo Make $byteOrder optional if there is a byte-order mark (BOM) in the
-     *   string being extracted.
-     *
-     * @param integer $byteCount Number of bytes (characters * 2) to return.
-     * @param integer $byteOrder (optional) Big- or little-endian byte order.
-     *   Use the BYTE_ORDER_ constants defined in {@link Zend_Pdf_FileParser}.
-     *   If omitted, uses big-endian.
-     * @param string $characterSet (optional) Desired resulting character set.
-     *   You may use any character set supported by {@link iconv()}. If omitted,
-     *   uses 'current locale'.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringUTF16($byteCount,
-                                    $byteOrder = Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN,
-                                    $characterSet = '')
-    {
-        if ($byteCount == 0) {
-            return '';
-        }
-        $bytes = $this->_dataSource->readBytes($byteCount);
-        if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN) {
-            if ($characterSet == 'UTF-16BE') {
-                return $bytes;
-            }
-            return iconv('UTF-16BE', $characterSet, $bytes);
-        } else if ($byteOrder == Zend_Pdf_FileParser::BYTE_ORDER_LITTLE_ENDIAN) {
-            if ($characterSet == 'UTF-16LE') {
-                return $bytes;
-            }
-            return iconv('UTF-16LE', $characterSet, $bytes);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid byte order: $byteOrder",
-                                         Zend_Pdf_Exception::INVALID_BYTE_ORDER);
-        }
-    }
-
-    /**
-     * Reads the Mac Roman-encoded string from the binary file at the current
-     * byte offset.
-     *
-     * You must supply the desired resulting character set.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * @param integer $byteCount Number of bytes (characters) to return.
-     * @param string $characterSet (optional) Desired resulting character set.
-     *   You may use any character set supported by {@link iconv()}. If omitted,
-     *   uses 'current locale'.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringMacRoman($byteCount, $characterSet = '')
-    {
-        if ($byteCount == 0) {
-            return '';
-        }
-        $bytes = $this->_dataSource->readBytes($byteCount);
-        if ($characterSet == 'MacRoman') {
-            return $bytes;
-        }
-        return iconv('MacRoman', $characterSet, $bytes);
-    }
-
-    /**
-     * Reads the Pascal string from the binary file at the current byte offset.
-     *
-     * The length of the Pascal string is determined by reading the length bytes
-     * which preceed the character data. You must supply the desired resulting
-     * character set.
-     *
-     * Advances the offset by the number of bytes read. Throws an exception if
-     * an error occurs.
-     *
-     * @param string $characterSet (optional) Desired resulting character set.
-     *   You may use any character set supported by {@link iconv()}. If omitted,
-     *   uses 'current locale'.
-     * @param integer $lengthBytes (optional) Number of bytes that make up the
-     *   length. Default is 1.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringPascal($characterSet = '', $lengthBytes = 1)
-    {
-        $byteCount = $this->readUInt($lengthBytes);
-        if ($byteCount == 0) {
-            return '';
-        }
-        $bytes = $this->_dataSource->readBytes($byteCount);
-        if ($characterSet == 'ASCII') {
-            return $bytes;
-        }
-        return iconv('ASCII', $characterSet, $bytes);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser/Font.php b/airtime_mvc/library/Zend/Pdf/FileParser/Font.php
deleted file mode 100644
index 56a728413..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser/Font.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Font.php';
-
-
-/** Zend_Pdf_FileParser */
-require_once 'Zend/Pdf/FileParser.php';
-
-/**
- * Abstract helper class for {@link Zend_Pdf_Font} that parses font files.
- *
- * Defines the public interface for concrete subclasses which are responsible
- * for parsing the raw binary data from the font file on disk. Also provides
- * a debug logging interface and a couple of shared utility methods.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_FileParser_Font extends Zend_Pdf_FileParser
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Array of parsed font properties. Used with {@link __get()} and
-     * {@link __set()}.
-     * @var array
-     */
-    private $_fontProperties = array();
-
-    /**
-     * Flag indicating whether or not debug logging is active.
-     * @var boolean
-     */
-    private $_debug = false;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor.
-     *
-     * Validates the data source and enables debug logging if so configured.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParserDataSource $dataSource)
-    {
-        parent::__construct($dataSource);
-        $this->fontType = Zend_Pdf_Font::TYPE_UNKNOWN;
-    }
-
-
-  /* Accessors */
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        if (isset($this->_fontProperties[$property])) {
-            return $this->_fontProperties[$property];
-        } else {
-            return null;
-        }
-    }
-
-    /* NOTE: The set handler is defined below in the internal methods group. */
-
-
-  /* Parser Methods */
-
-    /**
-     * Reads the Unicode UTF-16-encoded string from the binary file at the
-     * current offset location. Overridden to fix return character set at UTF-16BE.
-     *
-     * @todo Deal with to-dos in the parent method.
-     *
-     * @param integer $byteCount Number of bytes (characters * 2) to return.
-     * @param integer $byteOrder (optional) Big- or little-endian byte order.
-     *   Use the BYTE_ORDER_ constants defined in {@link Zend_Pdf_FileParser}. If
-     *   omitted, uses big-endian.
-     * @param string $characterSet (optional) --Ignored--
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringUTF16($byteCount,
-                                    $byteOrder = Zend_Pdf_FileParser::BYTE_ORDER_BIG_ENDIAN,
-                                    $characterSet = '')
-    {
-        return parent::readStringUTF16($byteCount, $byteOrder, 'UTF-16BE');
-    }
-
-    /**
-     * Reads the Mac Roman-encoded string from the binary file at the current
-     * offset location. Overridden to fix return character set at UTF-16BE.
-     *
-     * @param integer $byteCount Number of bytes (characters) to return.
-     * @param string $characterSet (optional) --Ignored--
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringMacRoman($byteCount, $characterSet = '')
-    {
-        return parent::readStringMacRoman($byteCount, 'UTF-16BE');
-    }
-
-    /**
-     * Reads the Pascal string from the binary file at the current offset
-     * location. Overridden to fix return character set at UTF-16BE.
-     *
-     * @param string $characterSet (optional) --Ignored--
-     * @param integer $lengthBytes (optional) Number of bytes that make up the
-     *   length. Default is 1.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readStringPascal($characterSet = '', $lengthBytes = 1)
-    {
-        return parent::readStringPascal('UTF-16BE');
-    }
-
-
-  /* Utility Methods */
-
-    /**
-     * Writes the entire font properties array to STDOUT. Used only for debugging.
-     */
-    public function writeDebug()
-    {
-        print_r($this->_fontProperties);
-    }
-
-
-
-  /**** Internal Methods ****/
-
-
-  /* Internal Accessors */
-
-    /**
-     * Set handler
-     *
-     * NOTE: This method is protected. Other classes may freely interrogate
-     * the font properties, but only this and its subclasses may set them.
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($property, $value)
-    {
-        if ($value === null) {
-            unset($this->_fontProperties[$property]);
-        } else {
-            $this->_fontProperties[$property] = $value;
-        }
-    }
-
-
-  /* Internal Utility Methods */
-
-    /**
-     * If debug logging is enabled, writes the log message.
-     *
-     * The log message is a sprintf() style string and any number of arguments
-     * may accompany it as additional parameters.
-     *
-     * @param string $message
-     * @param mixed (optional, multiple) Additional arguments
-     */
-    protected function _debugLog($message)
-    {
-        if (! $this->_debug) {
-            return;
-        }
-        if (func_num_args() > 1) {
-            $args = func_get_args();
-            $message = array_shift($args);
-            $message = vsprintf($message, $args);
-        }
-
-        require_once 'Zend/Log.php';
-        $logger = new Zend_Log();
-        $logger->log($message, Zend_Log::DEBUG);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType.php b/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType.php
deleted file mode 100644
index c08a8afc1..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_FileParser_Font */
-require_once 'Zend/Pdf/FileParser/Font.php';
-
-/**
- * Abstract base class for OpenType font file parsers.
- *
- * TrueType was originally developed by Apple and was adopted as the default
- * font format for the Microsoft Windows platform. OpenType is an extension of
- * TrueType, developed jointly by Microsoft and Adobe, which adds support for
- * PostScript font data.
- *
- * This abstract parser class forms the foundation for concrete subclasses which
- * extract either TrueType or PostScript font data from the file.
- *
- * All OpenType files use big-endian byte ordering.
- *
- * The full TrueType and OpenType specifications can be found at:
- * <ul>
- *  <li>{@link http://developer.apple.com/textfonts/TTRefMan/}
- *  <li>{@link http://www.microsoft.com/typography/OTSPEC/}
- *  <li>{@link http://partners.adobe.com/public/developer/opentype/index_spec.html}
- * </ul>
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Font
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Stores the scaler type (font type) for the font file. See
-     * {@link _readScalerType()}.
-     * @var integer
-     */
-    protected $_scalerType = 0;
-
-    /**
-     * Stores the byte offsets to the various information tables.
-     * @var array
-     */
-    protected $_tableDirectory = array();
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Semi-Concrete Class Implementation */
-
-    /**
-     * Verifies that the font file is in the expected format.
-     *
-     * NOTE: This method should be overridden in subclasses to check the
-     * specific format and set $this->_isScreened!
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function screen()
-    {
-        if ($this->_isScreened) {
-            return;
-        }
-        $this->_readScalerType();
-    }
-
-    /**
-     * Reads and parses the font data from the file on disk.
-     *
-     * NOTE: This method should be overridden in subclasses to add type-
-     * specific parsing and set $this->isParsed.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function parse()
-    {
-        if ($this->_isParsed) {
-            return;
-        }
-
-        /* Screen the font file first, if it hasn't been done yet.
-        */
-        $this->screen();
-
-        /* Start by reading the table directory.
-         */
-        $this->_parseTableDirectory();
-
-        /* Then parse all of the required tables.
-         */
-        $this->_parseHeadTable();
-        $this->_parseNameTable();
-        $this->_parsePostTable();
-        $this->_parseHheaTable();
-        $this->_parseMaxpTable();
-        $this->_parseOs2Table();
-        $this->_parseHmtxTable();
-        $this->_parseCmapTable();
-
-        /* If present, parse the optional tables.
-         */
-        /**
-         * @todo Add parser for kerning pairs.
-         * @todo Add parser for ligatures.
-         * @todo Add parser for other useful hinting tables.
-         */
-    }
-
-
-
-  /**** Internal Methods ****/
-
-
-  /* Parser Methods */
-
-    /**
-     * Parses the OpenType table directory.
-     *
-     * The table directory contains the identifier, checksum, byte offset, and
-     * length of each of the information tables housed in the font file.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseTableDirectory()
-    {
-        $this->moveToOffset(4);
-
-        $tableCount = $this->readUInt(2);
-        $this->_debugLog('%d tables', $tableCount);
-
-        /* Sanity check, in case we're not actually reading a OpenType file and
-         * the first four bytes coincidentally matched an OpenType signature in
-         * screen() above.
-         *
-         * There are at minimum 7 required tables: cmap, head, hhea, hmtx, maxp,
-         * name, and post. In the current OpenType standard, only 32 table types
-         * are defined, so use 50 as a practical limit.
-         */
-        if (($tableCount < 7) || ($tableCount > 50)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Table count not within expected range',
-                                         Zend_Pdf_Exception::BAD_TABLE_COUNT);
-        }
-
-        /* Skip the next 6 bytes, which contain values to aid a binary search.
-         */
-        $this->skipBytes(6);
-
-        /* The directory contains four values: the name of the table, checksum,
-         * offset to the table from the beginning of the font, and actual data
-         * length of the table.
-         */
-        for ($tableIndex = 0; $tableIndex < $tableCount; $tableIndex++) {
-            $tableName = $this->readBytes(4);
-
-            /* We ignore the checksum here for two reasons: First, the PDF viewer
-             * will do this later anyway; Second, calculating the checksum would
-             * require unsigned integers, which PHP does not currently provide.
-             * We may revisit this in the future.
-             */
-            $this->skipBytes(4);
-
-            $tableOffset = $this->readUInt(4);
-            $tableLength = $this->readUInt(4);
-            $this->_debugLog('%s offset: 0x%x; length: %d', $tableName, $tableOffset, $tableLength);
-
-            /* Sanity checks for offset and length values.
-             */
-            $fileSize = $this->_dataSource->getSize();
-            if (($tableOffset < 0) || ($tableOffset > $fileSize)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Table offset ($tableOffset) not within expected range",
-                                             Zend_Pdf_Exception::INDEX_OUT_OF_RANGE);
-            }
-            if (($tableLength < 0) || (($tableOffset + $tableLength) > $fileSize)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Table length ($tableLength) not within expected range",
-                                             Zend_Pdf_Exception::INDEX_OUT_OF_RANGE);
-            }
-
-            $this->_tableDirectory[$tableName]['offset'] = $tableOffset;
-            $this->_tableDirectory[$tableName]['length'] = $tableLength;
-        }
-    }
-
-
-    /**
-     * Parses the OpenType head (Font Header) table.
-     *
-     * The head table contains global information about the font such as the
-     * revision number and global metrics.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseHeadTable()
-    {
-        $this->_jumpToTable('head');
-
-        /* We can read any version 1 table.
-         */
-        $tableVersion = $this->_readTableVersion(1, 1);
-
-        /* Skip the font revision number and checksum adjustment.
-         */
-        $this->skipBytes(8);
-
-        $magicNumber = $this->readUInt(4);
-        if ($magicNumber != 0x5f0f3cf5) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong magic number. Expected: 0x5f0f3cf5; actual: '
-                                       . sprintf('%x', $magicNumber),
-                                         Zend_Pdf_Exception::BAD_MAGIC_NUMBER);
-        }
-
-        /* Most of the flags we ignore, but there are a few values that are
-         * useful for our layout routines.
-         */
-        $flags = $this->readUInt(2);
-        $this->baselineAtZero    = $this->isBitSet(0, $flags);
-        $this->useIntegerScaling = $this->isBitSet(3, $flags);
-
-        $this->unitsPerEm = $this->readUInt(2);
-        $this->_debugLog('Units per em: %d', $this->unitsPerEm);
-
-        /* Skip creation and modification date/time.
-         */
-        $this->skipBytes(16);
-
-        $this->xMin = $this->readInt(2);
-        $this->yMin = $this->readInt(2);
-        $this->xMax = $this->readInt(2);
-        $this->yMax = $this->readInt(2);
-        $this->_debugLog('Font bounding box: %d %d %d %d',
-                         $this->xMin, $this->yMin, $this->xMax, $this->yMax);
-
-        /* The style bits here must match the fsSelection bits in the OS/2
-         * table, if present.
-         */
-        $macStyleBits = $this->readUInt(2);
-        $this->isBold   = $this->isBitSet(0, $macStyleBits);
-        $this->isItalic = $this->isBitSet(1, $macStyleBits);
-
-        /* We don't need the remainder of data in this table: smallest readable
-         * size, font direction hint, indexToLocFormat, and glyphDataFormat.
-         */
-    }
-
-
-    /**
-     * Parses the OpenType name (Naming) table.
-     *
-     * The name table contains all of the identifying strings associated with
-     * the font such as its name, copyright, trademark, license, etc.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseNameTable()
-    {
-        $this->_jumpToTable('name');
-        $baseOffset = $this->_tableDirectory['name']['offset'];
-
-        /* The name table begins with a short header, followed by each of the
-         * fixed-length name records, followed by the variable-length strings.
-         */
-
-        /* We only understand version 0 tables.
-         */
-        $tableFormat = $this->readUInt(2);
-        if ($tableFormat != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unable to read format $tableFormat table",
-                                         Zend_Pdf_Exception::DONT_UNDERSTAND_TABLE_VERSION);
-        }
-        $this->_debugLog('Format %d table', $tableFormat);
-
-        $nameCount = $this->readUInt(2);
-        $this->_debugLog('%d name strings', $nameCount);
-
-        $storageOffset = $this->readUInt(2) + $baseOffset;
-        $this->_debugLog('Storage offset: 0x%x', $storageOffset);
-
-        /* Scan the name records for those we're interested in. We'll skip over
-         * encodings and languages we don't understand or support. Prefer the
-         * Microsoft Unicode encoding for a given name/language combination, but
-         * use Mac Roman if nothing else is available. We will extract the
-         * actual strings later.
-         */
-        $nameRecords = array();
-        for ($nameIndex = 0; $nameIndex < $nameCount; $nameIndex++) {
-
-            $platformID = $this->readUInt(2);
-            $encodingID = $this->readUInt(2);
-
-            if (! ( (($platformID == 3) && ($encodingID == 1)) ||    // Microsoft Unicode
-                    (($platformID == 1) && ($encodingID == 0))       // Mac Roman
-                   ) ) {
-                $this->skipBytes(8);    // Not a supported encoding. Move on.
-                continue;
-            }
-
-            $languageID = $this->readUInt(2);
-            $nameID     = $this->readUInt(2);
-            $nameLength = $this->readUInt(2);
-            $nameOffset = $this->readUInt(2);
-
-            $languageCode = $this->_languageCodeForPlatform($platformID, $languageID);
-            if ($languageCode === null) {
-                $this->_debugLog('Skipping languageID: 0x%x; platformID %d', $languageID, $platformID);
-                continue;    // Not a supported language. Move on.
-            }
-
-            $this->_debugLog('Adding nameID: %d; languageID: 0x%x; platformID: %d; offset: 0x%x (0x%x); length: %d',
-                             $nameID, $languageID, $platformID, $baseOffset + $nameOffset, $nameOffset, $nameLength);
-
-            /* Entries in the name table are sorted by platform ID. If an entry
-             * exists for both Mac Roman and Microsoft Unicode, the Unicode entry
-             * will prevail since it is processed last.
-             */
-            $nameRecords[$nameID][$languageCode] = array('platform' => $platformID,
-                                                         'offset'   => $nameOffset,
-                                                         'length'   => $nameLength );
-        }
-
-        /* Now go back and extract the interesting strings.
-         */
-        $fontNames = array();
-        foreach ($nameRecords as $name => $languages) {
-            foreach ($languages as $language => $attributes) {
-                $stringOffset = $storageOffset + $attributes['offset'];
-                $this->moveToOffset($stringOffset);
-                if ($attributes['platform'] == 3) {
-                    $string = $this->readStringUTF16($attributes['length']);
-                } else {
-                    $string = $this->readStringMacRoman($attributes['length']);
-                }
-                $fontNames[$name][$language] = $string;
-            }
-        }
-
-        $this->names = $fontNames;
-    }
-
-
-    /**
-     * Parses the OpenType post (PostScript Information) table.
-     *
-     * The post table contains additional information required for using the font
-     * on PostScript printers. It also contains the preferred location and
-     * thickness for an underline, which is used by our layout code.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parsePostTable()
-    {
-        $this->_jumpToTable('post');
-
-        /* We can read versions 1-4 tables.
-         */
-        $tableVersion = $this->_readTableVersion(1, 4);
-
-        $this->italicAngle = $this->readFixed(16, 16);
-
-        $this->underlinePosition = $this->readInt(2);
-        $this->underlineThickness = $this->readInt(2);
-
-        $fixedPitch = $this->readUInt(4);
-        $this->isMonospaced = ($fixedPitch !== 0);
-
-        /* Skip over PostScript virtual memory usage.
-         */
-        $this->skipBytes(16);
-
-        /* The format of the remainder of this table is dependent on the table
-         * version. However, since it contains glyph ordering information and
-         * PostScript names which we don't use, move on. (This may change at
-         * some point in the future though...)
-         */
-    }
-
-
-    /**
-     * Parses the OpenType hhea (Horizontal Header) table.
-     *
-     * The hhea table contains information used for horizontal layout. It also
-     * contains some vertical layout information for Apple systems. The vertical
-     * layout information for the PDF file is usually taken from the OS/2 table.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseHheaTable()
-    {
-        $this->_jumpToTable('hhea');
-
-        /* We can read any version 1 table.
-         */
-        $tableVersion = $this->_readTableVersion(1, 1);
-
-        /* The typographic ascent, descent, and line gap values are Apple-
-         * specific. Similar values exist in the OS/2 table. We'll use these
-         * values unless better values are found in OS/2.
-         */
-        $this->ascent = $this->readInt(2);
-        $this->descent = $this->readInt(2);
-        $this->lineGap = $this->readInt(2);
-
-        /* The descent value is supposed to be negative--it's the distance
-         * relative to the baseline. However, some fonts improperly store a
-         * positive value in this field. If a positive value is found, flip the
-         * sign and record a warning in the debug log that we did this.
-         */
-        if ($this->descent > 0) {
-            $this->_debugLog('Warning: Font should specify negative descent. Actual: %d; Using %d',
-                             $this->descent, -$this->descent);
-            $this->descent = -$this->descent;
-        }
-
-        /* Skip over advance width, left and right sidebearing, max x extent,
-         * caret slope rise, run, and offset, and the four reserved fields.
-         */
-        $this->skipBytes(22);
-
-        /* These values are needed to read the hmtx table.
-         */
-        $this->metricDataFormat = $this->readInt(2);
-        $this->numberHMetrics = $this->readUInt(2);
-        $this->_debugLog('hmtx data format: %d; number of metrics: %d',
-                         $this->metricDataFormat, $this->numberHMetrics);
-    }
-
-
-    /**
-     * Parses the OpenType hhea (Horizontal Header) table.
-     *
-     * The hhea table contains information used for horizontal layout. It also
-     * contains some vertical layout information for Apple systems. The vertical
-     * layout information for the PDF file is usually taken from the OS/2 table.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseMaxpTable()
-    {
-        $this->_jumpToTable('maxp');
-
-        /* We don't care about table version.
-         */
-        $this->_readTableVersion(0, 1);
-
-        /* The number of glyphs in the font.
-         */
-        $this->numGlyphs = $this->readUInt(2);
-        $this->_debugLog('number of glyphs: %d', $this->numGlyphs);
-
-        // Skip other maxp table entries (if presented with table version 1.0)...
-    }
-
-
-    /**
-     * Parses the OpenType OS/2 (OS/2 and Windows Metrics) table.
-     *
-     * The OS/2 table contains additional metrics data that is required to use
-     * the font on the OS/2 or Microsoft Windows platforms. It is not required
-     * for Macintosh fonts, so may not always be present. When available, we use
-     * this table to determine most of the vertical layout and stylistic
-     * information and for the font.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseOs2Table()
-    {
-        if (! $this->numberHMetrics) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("hhea table must be parsed prior to calling this method",
-                                         Zend_Pdf_Exception::PARSED_OUT_OF_ORDER);
-        }
-
-        try {
-            $this->_jumpToTable('OS/2');
-        } catch (Zend_Pdf_Exception $e) {
-            /* This table is not always present. If missing, use default values.
-             */
-            require_once 'Zend/Pdf/Exception.php';
-            if ($e->getCode() == Zend_Pdf_Exception::REQUIRED_TABLE_NOT_FOUND) {
-                $this->_debugLog('No OS/2 table found. Using default values');
-                $this->fontWeight = Zend_Pdf_Font::WEIGHT_NORMAL;
-                $this->fontWidth = Zend_Pdf_Font::WIDTH_NORMAL;
-                $this->isEmbeddable = true;
-                $this->isSubsettable = true;
-                $this->strikeThickness = $this->unitsPerEm * 0.05;
-                $this->strikePosition  = $this->unitsPerEm * 0.225;
-                $this->isSerifFont      = false;    // the style of the font is unknown
-                $this->isSansSerifFont  = false;
-                $this->isOrnamentalFont = false;
-                $this->isScriptFont     = false;
-                $this->isSymbolicFont   = false;
-                $this->isAdobeLatinSubset = false;
-                $this->vendorID = '';
-                $this->xHeight = 0;
-                $this->capitalHeight = 0;
-                return;
-            } else {
-                /* Something else went wrong. Throw this exception higher up the chain.
-                 */
-                throw $e;
-                throw new Zend_Pdf_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-
-        /* Version 0 tables are becoming rarer these days. They are only found
-         * in older fonts.
-         *
-         * Version 1 formally defines the Unicode character range bits and adds
-         * two new fields to the end of the table.
-         *
-         * Version 2 defines several additional flags to the embedding bits
-         * (fsType field) and five new fields to the end of the table.
-         *
-         * Versions 2 and 3 are structurally identical. There are only two
-         * significant differences between the two: First, in version 3, the
-         * average character width (xAvgCharWidth field) is calculated using all
-         * non-zero width glyphs in the font instead of just the Latin lower-
-         * case alphabetic characters; this doesn't affect us. Second, in
-         * version 3, the embedding bits (fsType field) have been made mutually
-         * exclusive; see additional discusson on this below.
-         *
-         * We can understand all four of these table versions.
-         */
-        $tableVersion = $this->readUInt(2);
-        if (($tableVersion < 0) || ($tableVersion > 3)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unable to read version $tableVersion table",
-                                         Zend_Pdf_Exception::DONT_UNDERSTAND_TABLE_VERSION);
-        }
-        $this->_debugLog('Version %d table', $tableVersion);
-
-        $this->averageCharWidth = $this->readInt(2);
-
-        /* Indicates the visual weight and aspect ratio of the characters. Used
-         * primarily to logically sort fonts in lists. Also used to help choose
-         * a more appropriate substitute font when necessary. See the WEIGHT_
-         * and WIDTH_ constants defined in Zend_Pdf_Font.
-         */
-        $this->fontWeight = $this->readUInt(2);
-        $this->fontWidth  = $this->readUInt(2);
-
-        /* Describes the font embedding licensing rights. We can only embed and
-         * subset a font when given explicit permission.
-         *
-         * NOTE: We always interpret these bits according to the rules defined
-         * in version 3 of this table, regardless of the actual version. This
-         * means we will perform our checks in order from the most-restrictive
-         * to the least.
-         */
-        $embeddingFlags = $this->readUInt(2);
-        $this->_debugLog('Embedding flags: %d', $embeddingFlags);
-        if ($this->isBitSet(9, $embeddingFlags)) {
-            /* Only bitmaps may be embedded. We don't have the ability to strip
-             * outlines from fonts yet, so this means no embed.
-             */
-            $this->isEmbeddable = false;
-        } else if ($this->isBitSet(1, $embeddingFlags)) {
-            /* Restricted license embedding. We currently don't have any way to
-             * enforce this, so interpret this as no embed. This may be revised
-             * in the future...
-             */
-            $this->isEmbeddable = false;
-        } else {
-            /* The remainder of the bit settings grant us permission to embed
-             * the font. There may be additional usage rights granted or denied
-             * but those only affect the PDF viewer application, not our code.
-             */
-            $this->isEmbeddable = true;
-        }
-        $this->_debugLog('Font ' . ($this->isEmbeddable ? 'may' : 'may not') . ' be embedded');
-        $isSubsettable = $this->isBitSet($embeddingFlags, 8);
-
-        /* Recommended size and offset for synthesized subscript characters.
-         */
-        $this->subscriptXSize = $this->readInt(2);
-        $this->subscriptYSize = $this->readInt(2);
-        $this->subscriptXOffset = $this->readInt(2);
-        $this->subscriptYOffset = $this->readInt(2);
-
-        /* Recommended size and offset for synthesized superscript characters.
-         */
-        $this->superscriptXSize = $this->readInt(2);
-        $this->superscriptYSize = $this->readInt(2);
-        $this->superscriptXOffset = $this->readInt(2);
-        $this->superscriptYOffset = $this->readInt(2);
-
-        /* Size and vertical offset for the strikethrough.
-         */
-        $this->strikeThickness = $this->readInt(2);
-        $this->strikePosition  = $this->readInt(2);
-
-        /* Describes the class of font: serif, sans serif, script. etc. These
-         * values are defined here:
-         *   http://www.microsoft.com/OpenType/OTSpec/ibmfc.htm
-         */
-        $familyClass = ($this->readUInt(2) >> 8);    // don't care about subclass
-        $this->_debugLog('Font family class: %d', $familyClass);
-        $this->isSerifFont      = ((($familyClass >= 1) && ($familyClass <= 5)) ||
-                                   ($familyClass == 7));
-        $this->isSansSerifFont  = ($familyClass == 8);
-        $this->isOrnamentalFont = ($familyClass == 9);
-        $this->isScriptFont     = ($familyClass == 10);
-        $this->isSymbolicFont   = ($familyClass == 12);
-
-        /* Skip over the PANOSE number. The interesting values for us overlap
-         * with the font family class defined above.
-         */
-        $this->skipBytes(10);
-
-        /* The Unicode range is made up of four 4-byte unsigned long integers
-         * which are used as bitfields covering a 128-bit range. Each bit
-         * represents a Unicode code block. If the bit is set, this font at
-         * least partially covers the characters in that block.
-         */
-        $unicodeRange1 = $this->readUInt(4);
-        $unicodeRange2 = $this->readUInt(4);
-        $unicodeRange3 = $this->readUInt(4);
-        $unicodeRange4 = $this->readUInt(4);
-        $this->_debugLog('Unicode ranges: 0x%x 0x%x 0x%x 0x%x',
-                        $unicodeRange1, $unicodeRange2, $unicodeRange3, $unicodeRange4);
-
-        /* The Unicode range is currently only used to decide if the character
-         * set covered by the font is a subset of the Adobe Latin set, meaning
-         * it only has the basic latin set. If it covers any other characters,
-         * even any of the extended latin characters, it is considered symbolic
-         * to PDF and must be described differently in the Font Descriptor.
-         */
-        /**
-         * @todo Font is recognized as Adobe Latin subset font if it only contains
-         * Basic Latin characters (only bit 0 of Unicode range bits is set).
-         * Actually, other Unicode subranges like General Punctuation (bit 31) also
-         * fall into Adobe Latin characters. So this code has to be modified.
-         */
-        $this->isAdobeLatinSubset = (($unicodeRange1 == 1) && ($unicodeRange2 == 0) &&
-                                      ($unicodeRange3 == 0) && ($unicodeRange4 == 0));
-        $this->_debugLog(($this->isAdobeLatinSubset ? 'Is' : 'Is not') . ' a subset of Adobe Latin');
-
-        $this->vendorID = $this->readBytes(4);
-
-        /* Skip the font style bits. We use the values found in the 'head' table.
-         * Also skip the first Unicode and last Unicode character indicies. Our
-         * cmap implementation does not need these values.
-         */
-        $this->skipBytes(6);
-
-        /* Typographic ascender, descender, and line gap. These values are
-         * preferred to those in the 'hhea' table.
-         */
-        $this->ascent = $this->readInt(2);
-        $this->descent = $this->readInt(2);
-        $this->lineGap = $this->readInt(2);
-
-        /* The descent value is supposed to be negative--it's the distance
-         * relative to the baseline. However, some fonts improperly store a
-         * positive value in this field. If a positive value is found, flip the
-         * sign and record a warning in the debug log that we did this.
-         */
-        if ($this->descent > 0) {
-            $this->_debugLog('Warning: Font should specify negative descent. Actual: %d; Using %d',
-                             $this->descent, -$this->descent);
-            $this->descent = -$this->descent;
-        }
-
-        /* Skip over Windows-specific ascent and descent.
-         */
-        $this->skipBytes(4);
-
-        /* Versions 0 and 1 tables do not contain the x or capital height
-         * fields. Record zero for unknown.
-         */
-        if ($tableVersion < 2) {
-            $this->xHeight = 0;
-            $this->capitalHeight = 0;
-        } else {
-
-            /* Skip over the Windows code page coverages. We are only concerned
-             * with Unicode coverage.
-             */
-            $this->skipBytes(8);
-
-            $this->xHeight = $this->readInt(2);
-            $this->capitalHeight = $this->readInt(2);
-
-            /* Ignore the remaining fields in this table. They are Windows-specific.
-             */
-        }
-        /**
-         * @todo Obtain the x and capital heights from the 'glyf' table if they
-         *   haven't been supplied here instead of storing zero.
-         */
-    }
-
-
-    /**
-     * Parses the OpenType hmtx (Horizontal Metrics) table.
-     *
-     * The hmtx table contains the horizontal metrics for every glyph contained
-     * within the font. These are the critical values for horizontal layout of
-     * text.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseHmtxTable()
-    {
-        $this->_jumpToTable('hmtx');
-
-        if (! $this->numberHMetrics) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("hhea table must be parsed prior to calling this method",
-                                         Zend_Pdf_Exception::PARSED_OUT_OF_ORDER);
-        }
-
-        /* We only understand version 0 tables.
-         */
-        if ($this->metricDataFormat != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unable to read format $this->metricDataFormat table.",
-                                         Zend_Pdf_Exception::DONT_UNDERSTAND_TABLE_VERSION);
-        }
-
-        /* The hmtx table has no header. For each glpyh in the font, it contains
-         * the glyph's advance width and its left side bearing. We don't use the
-         * left side bearing.
-         */
-        $glyphWidths = array();
-        for ($i = 0; $i < $this->numberHMetrics; $i++) {
-            $glyphWidths[$i] = $this->readUInt(2);
-            $this->skipBytes(2);
-        }
-        /* Populate last value for the rest of array
-         */
-        while (count($glyphWidths) < $this->numGlyphs) {
-            $glyphWidths[] = end($glyphWidths);
-        }
-        $this->glyphWidths = $glyphWidths;
-
-        /* There is an optional table of left side bearings which is sometimes
-         * used for monospaced fonts. We don't use the left side bearing, so
-         * we can safely ignore it.
-         */
-    }
-
-
-    /**
-     * Parses the OpenType cmap (Character to Glyph Mapping) table.
-     *
-     * The cmap table provides the maps from character codes to font glyphs.
-     * There are usually at least two character maps in a font: Microsoft Unicode
-     * and Macintosh Roman. For very complex fonts, there may also be mappings
-     * for the characters in the Unicode Surrogates Area, which are UCS-4
-     * characters.
-     *
-     * @todo Need to rework the selection logic for picking a subtable. We should
-     *   have an explicit list of preferences, followed by a list of those that
-     *   are tolerable. Most specifically, since everything above this layer deals
-     *   in Unicode, we need to be sure to only accept format 0 MacRoman tables.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _parseCmapTable()
-    {
-        $this->_jumpToTable('cmap');
-        $baseOffset = $this->_tableDirectory['cmap']['offset'];
-
-        /* We only understand version 0 tables.
-         */
-        $tableVersion = $this->readUInt(2);
-        if ($tableVersion != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unable to read version $tableVersion table",
-                                         Zend_Pdf_Exception::DONT_UNDERSTAND_TABLE_VERSION);
-        }
-        $this->_debugLog('Version %d table', $tableVersion);
-
-        $subtableCount = $this->readUInt(2);
-        $this->_debugLog('%d subtables', $subtableCount);
-
-        /* Like the name table, there may be many different encoding subtables
-         * present. Ideally, we are looking for an acceptable Unicode table.
-         */
-        $subtables = array();
-        for ($subtableIndex = 0; $subtableIndex < $subtableCount; $subtableIndex++) {
-
-            $platformID = $this->readUInt(2);
-            $encodingID = $this->readUInt(2);
-
-            if (! ( (($platformID == 0) && ($encodingID == 3)) ||    // Unicode 2.0 or later
-                    (($platformID == 0) && ($encodingID == 0)) ||    // Unicode
-                    (($platformID == 3) && ($encodingID == 1)) ||    // Microsoft Unicode
-                    (($platformID == 1) && ($encodingID == 0))       // Mac Roman
-                   ) ) {
-                $this->_debugLog('Unsupported encoding: platformID: %d; encodingID: %d; skipping',
-                                 $platformID, $encodingID);
-                $this->skipBytes(4);
-                continue;
-            }
-
-            $subtableOffset = $this->readUInt(4);
-            if ($subtableOffset < 0) {    // Sanity check for 4-byte unsigned on 32-bit platform
-                $this->_debugLog('Offset 0x%x out of range for platformID: %d; skipping',
-                                 $subtableOffset, $platformID);
-                continue;
-            }
-
-            $this->_debugLog('Found subtable; platformID: %d; encodingID: %d; offset: 0x%x (0x%x)',
-                             $platformID, $encodingID, $baseOffset + $subtableOffset, $subtableOffset);
-
-            $subtables[$platformID][$encodingID][] = $subtableOffset;
-        }
-
-        /* In preferred order, find a subtable to use.
-         */
-        $offsets = array();
-
-        /* Unicode 2.0 or later semantics
-         */
-        if (isset($subtables[0][3])) {
-            foreach ($subtables[0][3] as $offset) {
-                $offsets[] = $offset;
-            }
-        }
-
-        /* Unicode default semantics
-         */
-        if (isset($subtables[0][0])) {
-            foreach ($subtables[0][0] as $offset) {
-                $offsets[] = $offset;
-            }
-        }
-
-        /* Microsoft Unicode
-         */
-        if (isset($subtables[3][1])) {
-            foreach ($subtables[3][1] as $offset) {
-                $offsets[] = $offset;
-            }
-        }
-
-        /* Mac Roman.
-         */
-        if (isset($subtables[1][0])) {
-            foreach ($subtables[1][0] as $offset) {
-                $offsets[] = $offset;
-            }
-        }
-
-        $cmapType = -1;
-
-        foreach ($offsets as $offset) {
-            $cmapOffset = $baseOffset + $offset;
-            $this->moveToOffset($cmapOffset);
-            $format = $this->readUInt(2);
-            $language = -1;
-            switch ($format) {
-                case 0x0:
-                    $cmapLength = $this->readUInt(2);
-                    $language = $this->readUInt(2);
-                    if ($language != 0) {
-                        $this->_debugLog('Type 0 cmap tables must be language-independent;'
-                                         . ' language: %d; skipping', $language);
-                        continue;
-                    }
-                    break;
-
-                case 0x4:    // break intentionally omitted
-                case 0x6:
-                    $cmapLength = $this->readUInt(2);
-                    $language = $this->readUInt(2);
-                    if ($language != 0) {
-                        $this->_debugLog('Warning: cmap tables must be language-independent - this font'
-                                         . ' may not work properly; language: %d', $language);
-                    }
-                    break;
-
-                case 0x2:    // break intentionally omitted
-                case 0x8:    // break intentionally omitted
-                case 0xa:    // break intentionally omitted
-                case 0xc:
-                    $this->_debugLog('Format: 0x%x currently unsupported; skipping', $format);
-                    continue;
-                    //$this->skipBytes(2);
-                    //$cmapLength = $this->readUInt(4);
-                    //$language = $this->readUInt(4);
-                    //if ($language != 0) {
-                    //    $this->_debugLog('Warning: cmap tables must be language-independent - this font'
-                    //                     . ' may not work properly; language: %d', $language);
-                    //}
-                    //break;
-
-                default:
-                    $this->_debugLog('Unknown subtable format: 0x%x; skipping', $format);
-                    continue;
-            }
-            $cmapType = $format;
-            break;
-        }
-        if ($cmapType == -1) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Unable to find usable cmap table',
-                                         Zend_Pdf_Exception::CANT_FIND_GOOD_CMAP);
-        }
-
-        /* Now extract the subtable data and create a Zend_Pdf_FontCmap object.
-         */
-        $this->_debugLog('Using cmap type %d; offset: 0x%x; length: %d',
-                         $cmapType, $cmapOffset, $cmapLength);
-        $this->moveToOffset($cmapOffset);
-        $cmapData = $this->readBytes($cmapLength);
-
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->cmap = Zend_Pdf_Cmap::cmapWithTypeData($cmapType, $cmapData);
-    }
-
-
-    /**
-     * Reads the scaler type from the header of the OpenType font file and
-     * returns it as an unsigned long integer.
-     *
-     * The scaler type defines the type of font: OpenType font files may contain
-     * TrueType or PostScript outlines. Throws an exception if the scaler type
-     * is not recognized.
-     *
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _readScalerType()
-    {
-        if ($this->_scalerType != 0) {
-            return $this->_scalerType;
-        }
-
-        $this->moveToOffset(0);
-
-        $this->_scalerType = $this->readUInt(4);
-
-        switch ($this->_scalerType) {
-            case 0x00010000:    // version 1.0 - Windows TrueType signature
-                $this->_debugLog('Windows TrueType signature');
-                break;
-
-            case 0x74727565:    // 'true' - Macintosh TrueType signature
-                $this->_debugLog('Macintosh TrueType signature');
-                break;
-
-            case 0x4f54544f:    // 'OTTO' - the CFF signature
-                $this->_debugLog('PostScript CFF signature');
-                break;
-
-            case 0x74797031:    // 'typ1'
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Unsupported font type: PostScript in sfnt wrapper',
-                                             Zend_Pdf_Exception::WRONG_FONT_TYPE);
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Not an OpenType font file',
-                                             Zend_Pdf_Exception::WRONG_FONT_TYPE);
-        }
-        return $this->_scalerType;
-    }
-
-    /**
-     * Validates a given table's existence, then sets the file pointer to the
-     * start of that table.
-     *
-     * @param string $tableName
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _jumpToTable($tableName)
-    {
-        if (empty($this->_tableDirectory[$tableName])) {    // do not allow NULL or zero
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Required table '$tableName' not found!",
-                                         Zend_Pdf_Exception::REQUIRED_TABLE_NOT_FOUND);
-        }
-        $this->_debugLog("Parsing $tableName table...");
-        $this->moveToOffset($this->_tableDirectory[$tableName]['offset']);
-    }
-
-    /**
-     * Reads the fixed 16.16 table version number and checks for compatibility.
-     * If the version is incompatible, throws an exception. If it is compatible,
-     * returns the version number.
-     *
-     * @param float $minVersion Minimum compatible version number.
-     * @param float $maxVertion Maximum compatible version number.
-     * @return float Table version number.
-     * @throws Zend_Pdf_Exception
-     */
-    protected function _readTableVersion($minVersion, $maxVersion)
-    {
-        $tableVersion = $this->readFixed(16, 16);
-        if (($tableVersion < $minVersion) || ($tableVersion > $maxVersion)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unable to read version $tableVersion table",
-                                         Zend_Pdf_Exception::DONT_UNDERSTAND_TABLE_VERSION);
-        }
-        $this->_debugLog('Version %.2f table', $tableVersion);
-        return $tableVersion;
-    }
-
-    /**
-     * Utility method that returns ISO 639 two-letter language codes from the
-     * TrueType platform and language ID. Returns NULL for languages that are
-     * not supported.
-     *
-     * @param integer $platformID
-     * @param integer $encodingID
-     * @return string | null
-     */
-    protected function _languageCodeForPlatform($platformID, $languageID)
-    {
-        if ($platformID == 3) {    // Microsoft encoding.
-            /* The low-order bytes specify the language, the high-order bytes
-             * specify the dialect. We just care about the language. For the
-             * complete list, see:
-             *   http://www.microsoft.com/globaldev/reference/lcid-all.mspx
-             */
-            $languageID &= 0xff;
-            switch ($languageID) {
-                case 0x09:
-                    return 'en';
-                case 0x0c:
-                    return 'fr';
-                case 0x07:
-                    return 'de';
-                case 0x10:
-                    return 'it';
-                case 0x13:
-                    return 'nl';
-                case 0x1d:
-                    return 'sv';
-                case 0x0a:
-                    return 'es';
-                case 0x06:
-                    return 'da';
-                case 0x16:
-                    return 'pt';
-                case 0x14:
-                    return 'no';
-                case 0x0d:
-                    return 'he';
-                case 0x11:
-                    return 'ja';
-                case 0x01:
-                    return 'ar';
-                case 0x0b:
-                    return 'fi';
-                case 0x08:
-                    return 'el';
-
-                default:
-                    return null;
-            }
-
-        } else if ($platformID == 1) {    // Macintosh encoding.
-            switch ($languageID) {
-                case 0:
-                    return 'en';
-                case 1:
-                    return 'fr';
-                case 2:
-                    return 'de';
-                case 3:
-                    return 'it';
-                case 4:
-                    return 'nl';
-                case 5:
-                    return 'sv';
-                case 6:
-                    return 'es';
-                case 7:
-                    return 'da';
-                case 8:
-                    return 'pt';
-                case 9:
-                    return 'no';
-                case 10:
-                    return 'he';
-                case 11:
-                    return 'ja';
-                case 12:
-                    return 'ar';
-                case 13:
-                    return 'fi';
-                case 14:
-                    return 'el';
-
-                default:
-                    return null;
-            }
-
-        } else {    // Unknown encoding.
-            return null;
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php b/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php
deleted file mode 100644
index e14fd4583..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_FileParser_Font_OpenType */
-require_once 'Zend/Pdf/FileParser/Font/OpenType.php';
-
-/**
- * Parses an OpenType font file containing TrueType outlines.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_FileParser_Font_OpenType_TrueType extends Zend_Pdf_FileParser_Font_OpenType
-{
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Verifies that the font file actually contains TrueType outlines.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function screen()
-    {
-        if ($this->_isScreened) {
-            return;
-        }
-
-        parent::screen();
-
-        switch ($this->_readScalerType()) {
-            case 0x00010000:    // version 1.0 - Windows TrueType signature
-                break;
-
-            case 0x74727565:    // 'true' - Macintosh TrueType signature
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Not a TrueType font file',
-                                             Zend_Pdf_Exception::WRONG_FONT_TYPE);
-        }
-
-        $this->fontType = Zend_Pdf_Font::TYPE_TRUETYPE;
-        $this->_isScreened = true;
-    }
-
-    /**
-     * Reads and parses the TrueType font data from the file on disk.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function parse()
-    {
-        if ($this->_isParsed) {
-            return;
-        }
-
-        parent::parse();
-
-        /* There is nothing additional to parse for TrueType fonts at this time.
-         */
-
-        $this->_isParsed = true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser/Image.php b/airtime_mvc/library/Zend/Pdf/FileParser/Image.php
deleted file mode 100644
index c42208340..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser/Image.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-
-/** Zend_Pdf_Image */
-require_once 'Zend/Pdf/Image.php';
-
-
-/** Zend_Pdf_FileParser */
-require_once 'Zend/Pdf/FileParser.php';
-
-/**
- * FileParser for Zend_Pdf_Image subclasses.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_FileParser_Image extends Zend_Pdf_FileParser
-{
-    /**
-     * Image Type
-     *
-     * @var integer
-     */
-    protected $imageType;
-
-    /**
-     * Object constructor.
-     *
-     * Validates the data source and enables debug logging if so configured.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParserDataSource $dataSource)
-    {
-        parent::__construct($dataSource);
-        $this->imageType = Zend_Pdf_Image::TYPE_UNKNOWN;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParser/Image/Png.php b/airtime_mvc/library/Zend/Pdf/FileParser/Image/Png.php
deleted file mode 100644
index 41de792f1..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParser/Image/Png.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Png.php 20423 2010-01-19 14:37:20Z yoshida@zend.co.jp $
- */
-
-/** @see Zend_Pdf_FileParser_Image */
-require_once 'Zend/Pdf/FileParser/Image.php';
-
-
-/**
- * Abstract base class for Image file parsers.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_FileParser_Image_Png extends Zend_Pdf_FileParser_Image
-{
-     protected $_isPNG;
-     protected $_width;
-     protected $_height;
-     protected $_bits;
-     protected $_color;
-     protected $_compression;
-     protected $_preFilter;
-     protected $_interlacing;
-
-     protected $_imageData;
-     protected $_paletteData;
-     protected $_transparencyData;
-
-  /**** Public Interface ****/
-
-     public function getWidth() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_width;
-     }
-
-     public function getHeight() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_width;
-     }
-
-     public function getBitDepth() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_bits;
-     }
-
-     public function getColorSpace() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_color;
-     }
-
-     public function getCompressionStrategy() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_compression;
-     }
-
-     public function getPaethFilter() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_preFilter;
-     }
-
-     public function getInterlacingMode() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_interlacing;
-     }
-
-     public function getRawImageData() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_imageData;
-     }
-
-     public function getRawPaletteData() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_paletteData;
-     }
-
-     public function getRawTransparencyData() {
-          if(!$this->_isParsed) {
-               $this->parse();
-          }
-          return $this->_transparencyData;
-     }
-
-  /* Semi-Concrete Class Implementation */
-
-    /**
-     * Verifies that the image file is in the expected format.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function screen()
-    {
-         if ($this->_isScreened) {
-             return;
-         }
-         return $this->_checkSignature();
-    }
-
-    /**
-     * Reads and parses the image data from the file on disk.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function parse()
-    {
-        if ($this->_isParsed) {
-            return;
-        }
-
-        /* Screen the font file first, if it hasn't been done yet.
-        */
-        $this->screen();
-
-        $this->_parseIHDRChunk();
-        $this->_parseChunks();
-    }
-
-
-    protected function _parseSignature() {
-         $this->moveToOffset(1); //Skip the first byte (%)
-         if('PNG' != $this->readBytes(3)) {
-               $this->_isPNG = false;
-         } else {
-               $this->_isPNG = true;
-         }
-    }
-
-    protected function _checkSignature() {
-         if(!isset($this->_isPNG)) {
-              $this->_parseSignature();
-         }
-         return $this->_isPNG;
-    }
-
-    protected function _parseChunks() {
-         $this->moveToOffset(33); //Variable chunks start at the end of IHDR
-
-         //Start processing chunks. If there are no more bytes to read parsing is complete.
-         $size = $this->getSize();
-         while($size - $this->getOffset() >= 8) {
-              $chunkLength = $this->readUInt(4);
-              if($chunkLength < 0 || ($chunkLength + $this->getOffset() + 4) > $size) {
-                   require_once 'Zend/Pdf/Exception.php';
-                   throw new Zend_Pdf_Exception("PNG Corrupt: Invalid Chunk Size In File.");
-              }
-
-              $chunkType = $this->readBytes(4);
-              $offset = $this->getOffset();
-
-              //If we know how to process the chunk, do it here, else ignore the chunk and move on to the next
-              switch($chunkType) {
-                   case 'IDAT': // This chunk may appear more than once. It contains the actual image data.
-                       $this->_parseIDATChunk($offset, $chunkLength);
-                       break;
-
-                   case 'PLTE': // This chunk contains the image palette.
-                       $this->_parsePLTEChunk($offset, $chunkLength);
-                       break;
-
-                   case 'tRNS': // This chunk contains non-alpha channel transparency data
-                       $this->_parseTRNSChunk($offset, $chunkLength);
-                       break;
-
-                   case 'IEND':
-                       break 2; //End the loop too
-
-                   //@TODO Implement the rest of the PNG chunks. (There are many not implemented here)
-              }
-              if($offset + $chunkLength + 4 < $size) {
-                  $this->moveToOffset($offset + $chunkLength + 4); //Skip past the data finalizer. (Don't rely on the parse to leave the offsets correct)
-              }
-         }
-         if(empty($this->_imageData)) {
-              require_once 'Zend/Pdf/Exception.php';
-              throw new Zend_Pdf_Exception ( "This PNG is corrupt. All png must contain IDAT chunks." );
-         }
-    }
-
-    protected function _parseIHDRChunk() {
-         $this->moveToOffset(12); //IHDR must always start at offset 12 and run for 17 bytes
-         if(!$this->readBytes(4) == 'IHDR') {
-              require_once 'Zend/Pdf/Exception.php';
-              throw new Zend_Pdf_Exception( "This PNG is corrupt. The first chunk in a PNG file must be IHDR." );
-         }
-         $this->_width = $this->readUInt(4);
-         $this->_height = $this->readUInt(4);
-         $this->_bits = $this->readInt(1);
-         $this->_color = $this->readInt(1);
-         $this->_compression = $this->readInt(1);
-         $this->_preFilter = $this->readInt(1);
-         $this->_interlacing = $this->readInt(1);
-         if($this->_interlacing != Zend_Pdf_Image::PNG_INTERLACING_DISABLED) {
-              require_once 'Zend/Pdf/Exception.php';
-              throw new Zend_Pdf_Exception( "Only non-interlaced images are currently supported." );
-         }
-    }
-
-    protected function _parseIDATChunk($chunkOffset, $chunkLength) {
-         $this->moveToOffset($chunkOffset);
-         if(!isset($this->_imageData)) {
-              $this->_imageData = $this->readBytes($chunkLength);
-         } else {
-              $this->_imageData .= $this->readBytes($chunkLength);
-         }
-    }
-
-    protected function _parsePLTEChunk($chunkOffset, $chunkLength) {
-         $this->moveToOffset($chunkOffset);
-         $this->_paletteData = $this->readBytes($chunkLength);
-    }
-
-    protected function _parseTRNSChunk($chunkOffset, $chunkLength) {
-         $this->moveToOffset($chunkOffset);
-
-         //Processing of tRNS data varies dependending on the color depth
-
-         switch($this->_color) {
-             case Zend_Pdf_Image::PNG_CHANNEL_GRAY:
-                  $baseColor = $this->readInt(1);
-                  $this->_transparencyData = array($baseColor, $baseColor);
-                  break;
-
-             case Zend_Pdf_Image::PNG_CHANNEL_RGB:
-
-                  //@TODO Fix this hack.
-                  //This parser cheats and only uses the lsb's (and only works with < 16 bit depth images)
-
-                  /*
-                       From the standard:
-
-                       For color type 2 (truecolor), the tRNS chunk contains a single RGB color value, stored in the format:
-
-                       Red:   2 bytes, range 0 .. (2^bitdepth)-1
-                       Green: 2 bytes, range 0 .. (2^bitdepth)-1
-                       Blue:  2 bytes, range 0 .. (2^bitdepth)-1
-
-                       (If the image bit depth is less than 16, the least significant bits are used and the others are 0.)
-                       Pixels of the specified color value are to be treated as transparent (equivalent to alpha value 0);
-                       all other pixels are to be treated as fully opaque (alpha value 2bitdepth-1).
-
-                  */
-
-                  $red = $this->readInt(1);
-                  $this->skipBytes(1);
-                  $green = $this->readInt(1);
-                  $this->skipBytes(1);
-                  $blue = $this->readInt(1);
-
-                  $this->_transparencyData = array($red, $red, $green, $green, $blue, $blue);
-
-                  break;
-
-             case Zend_Pdf_Image::PNG_CHANNEL_INDEXED:
-
-                  //@TODO Fix this hack.
-                  //This parser cheats too. It only masks the first color in the palette.
-
-                  /*
-                       From the standard:
-
-                       For color type 3 (indexed color), the tRNS chunk contains a series of one-byte alpha values, corresponding to entries in the PLTE chunk:
-
-                          Alpha for palette index 0:  1 byte
-                          Alpha for palette index 1:  1 byte
-                          ...etc...
-
-                       Each entry indicates that pixels of the corresponding palette index must be treated as having the specified alpha value.
-                       Alpha values have the same interpretation as in an 8-bit full alpha channel: 0 is fully transparent, 255 is fully opaque,
-                       regardless of image bit depth. The tRNS chunk must not contain more alpha values than there are palette entries,
-                       but tRNS can contain fewer values than there are palette entries. In this case, the alpha value for all remaining palette
-                       entries is assumed to be 255. In the common case in which only palette index 0 need be made transparent, only a one-byte
-                       tRNS chunk is needed.
-
-                  */
-
-                  $tmpData = $this->readBytes($chunkLength);
-                  if(($trnsIdx = strpos($tmpData, chr(0))) !== false) {
-                       $this->_transparencyData = array($trnsIdx, $trnsIdx);
-                  }
-
-                  break;
-
-             case Zend_Pdf_Image::PNG_CHANNEL_GRAY_ALPHA:
-                  //Fall through to the next case
-             case Zend_Pdf_Image::PNG_CHANNEL_RGB_ALPHA:
-                  require_once 'Zend/Pdf/Exception.php';
-                  throw new Zend_Pdf_Exception( "tRNS chunk illegal for Alpha Channel Images" );
-                  break;
-         }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParserDataSource.php b/airtime_mvc/library/Zend/Pdf/FileParserDataSource.php
deleted file mode 100644
index cee217911..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParserDataSource.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FileParserDataSource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract helper class for {@link Zend_Pdf_FileParser} that provides the
- * data source for parsing.
- *
- * Concrete subclasses allow for parsing of in-memory, filesystem, and other
- * sources through a common API. These subclasses also take care of error
- * handling and other mundane tasks.
- *
- * Subclasses must implement at minimum {@link __construct()},
- * {@link __destruct()}, {@link readBytes()}, and {@link readAllBytes()}.
- * Subclasses should also override {@link moveToOffset()} and
- * {@link __toString()} as appropriate.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_FileParserDataSource
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Total size in bytes of the data source.
-     * @var integer
-     */
-    protected $_size = 0;
-
-    /**
-     * Byte offset of the current read position within the data source.
-     * @var integer
-     */
-    protected $_offset = 0;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Abstract Methods */
-
-    /**
-     * Object constructor. Opens the data source for parsing.
-     *
-     * Must set $this->_size to the total size in bytes of the data source.
-     *
-     * Upon return the data source can be interrogated using the primitive
-     * methods described here.
-     *
-     * If the data source cannot be opened for any reason (such as insufficient
-     * permissions, missing file, etc.), will throw an appropriate exception.
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function __construct();
-
-    /**
-     * Object destructor. Closes the data source.
-     *
-     * May also perform cleanup tasks such as deleting temporary files.
-     */
-    abstract public function __destruct();
-
-    /**
-     * Returns the specified number of raw bytes from the data source at the
-     * byte offset of the current read position.
-     *
-     * Must advance the read position by the number of bytes read by updating
-     * $this->_offset.
-     *
-     * Throws an exception if there is insufficient data to completely fulfill
-     * the request or if an error occurs.
-     *
-     * @param integer $byteCount Number of bytes to read.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function readBytes($byteCount);
-
-    /**
-     * Returns the entire contents of the data source as a string.
-     *
-     * This method may be called at any time and so must preserve the byte
-     * offset of the read position, both through $this->_offset and whatever
-     * other additional pointers (such as the seek position of a file pointer)
-     * that might be used.
-     *
-     * @return string
-     */
-    abstract public function readAllBytes();
-
-
-  /* Object Magic Methods */
-
-    /**
-     * Returns a description of the object for debugging purposes.
-     *
-     * Subclasses should override this method to provide a more specific
-     * description of the actual object being represented.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return get_class($this);
-    }
-
-
-  /* Accessors */
-
-    /**
-     * Returns the byte offset of the current read position within the data
-     * source.
-     *
-     * @return integer
-     */
-    public function getOffset()
-    {
-        return $this->_offset;
-    }
-
-    /**
-     * Returns the total size in bytes of the data source.
-     *
-     * @return integer
-     */
-    public function getSize()
-    {
-        return $this->_size;
-    }
-
-
-  /* Primitive Methods */
-
-    /**
-     * Moves the current read position to the specified byte offset.
-     *
-     * Throws an exception you attempt to move before the beginning or beyond
-     * the end of the data source.
-     *
-     * If a subclass needs to perform additional tasks (such as performing a
-     * fseek() on a filesystem source), it should do so after calling this
-     * parent method.
-     *
-     * @param integer $offset Destination byte offset.
-     * @throws Zend_Pdf_Exception
-     */
-    public function moveToOffset($offset)
-    {
-        if ($this->_offset == $offset) {
-            return;    // Not moving; do nothing.
-        }
-        if ($offset < 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Attempt to move before start of data source',
-                                         Zend_Pdf_Exception::MOVE_BEFORE_START_OF_FILE);
-        }
-        if ($offset >= $this->_size) {    // Offsets are zero-based.
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Attempt to move beyond end of data source',
-                                         Zend_Pdf_Exception::MOVE_BEYOND_END_OF_FILE);
-        }
-        $this->_offset = $offset;
-    }
-
-    /**
-     * Shifts the current read position within the data source by the specified
-     * number of bytes.
-     *
-     * You may move forward (positive numbers) or backward (negative numbers).
-     * Throws an exception you attempt to move before the beginning or beyond
-     * the end of the data source.
-     *
-     * @param integer $byteCount Number of bytes to skip.
-     * @throws Zend_Pdf_Exception
-     */
-    public function skipBytes($byteCount)
-    {
-        $this->moveToOffset($this->_offset + $byteCount);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParserDataSource/File.php b/airtime_mvc/library/Zend/Pdf/FileParserDataSource/File.php
deleted file mode 100644
index d555dd332..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParserDataSource/File.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_FileParserDataSource */
-require_once 'Zend/Pdf/FileParserDataSource.php';
-
-
-/**
- * Concrete subclass of {@link Zend_Pdf_FileParserDataSource} that provides an
- * interface to filesystem objects.
- *
- * Note that this class cannot be used for other sources that may be supported
- * by {@link fopen()} (through URL wrappers). It may be used for local
- * filesystem objects only.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_FileParserDataSource_File extends Zend_Pdf_FileParserDataSource
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Fully-qualified path to the file.
-     * @var string
-     */
-    protected $_filePath = '';
-
-    /**
-     * File resource handle .
-     * @var resource
-     */
-    protected $_fileResource = null;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Object constructor.
-     *
-     * Validates the path to the file, ensures that it is readable, then opens
-     * it for reading.
-     *
-     * Throws an exception if the file is missing or cannot be opened.
-     *
-     * @param string $filePath Fully-qualified path to the file.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($filePath)
-    {
-        if (! (is_file($filePath) || is_link($filePath))) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Invalid file path: $filePath",
-                                         Zend_Pdf_Exception::BAD_FILE_PATH);
-        }
-        if (! is_readable($filePath)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("File is not readable: $filePath",
-                                         Zend_Pdf_Exception::NOT_READABLE);
-        }
-        if (($this->_size = @filesize($filePath)) === false) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Error while obtaining file size: $filePath",
-                                         Zend_Pdf_Exception::CANT_GET_FILE_SIZE);
-        }
-        if (($this->_fileResource = @fopen($filePath, 'rb')) === false) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Cannot open file for reading: $filePath",
-                                         Zend_Pdf_Exception::CANT_OPEN_FILE);
-        }
-        $this->_filePath = $filePath;
-    }
-
-    /**
-     * Object destructor.
-     *
-     * Closes the file if it had been successfully opened.
-     */
-    public function __destruct()
-    {
-        if (is_resource($this->_fileResource)) {
-            @fclose($this->_fileResource);
-        }
-    }
-
-    /**
-     * Returns the specified number of raw bytes from the file at the byte
-     * offset of the current read position.
-     *
-     * Advances the read position by the number of bytes read.
-     *
-     * Throws an exception if an error was encountered while reading the file or
-     * if there is insufficient data to completely fulfill the request.
-     *
-     * @param integer $byteCount Number of bytes to read.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readBytes($byteCount)
-    {
-        $bytes = @fread($this->_fileResource, $byteCount);
-        if ($bytes === false) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Unexpected error while reading file',
-                                         Zend_Pdf_Exception::ERROR_DURING_READ);
-        }
-        if (strlen($bytes) != $byteCount) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Insufficient data to read $byteCount bytes",
-                                         Zend_Pdf_Exception::INSUFFICIENT_DATA);
-        }
-        $this->_offset += $byteCount;
-        return $bytes;
-    }
-
-    /**
-     * Returns the entire contents of the file as a string.
-     *
-     * Preserves the current file seek position.
-     *
-     * @return string
-     */
-    public function readAllBytes()
-    {
-        return file_get_contents($this->_filePath);
-    }
-
-
-  /* Object Magic Methods */
-
-    /**
-     * Returns the full filesystem path of the file.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_filePath;
-    }
-
-
-  /* Primitive Methods */
-
-    /**
-     * Seeks the file read position to the specified byte offset.
-     *
-     * Throws an exception if the file pointer cannot be moved or if it is
-     * moved beyond EOF (end of file).
-     *
-     * @param integer $offset Destination byte offset.
-     * @throws Zend_Pdf_Exception
-     */
-    public function moveToOffset($offset)
-    {
-        if ($this->_offset == $offset) {
-            return;    // Not moving; do nothing.
-        }
-        parent::moveToOffset($offset);
-        $result = @fseek($this->_fileResource, $offset, SEEK_SET);
-        if ($result !== 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Error while setting new file position',
-                                         Zend_Pdf_Exception::CANT_SET_FILE_POSITION);
-        }
-        if (feof($this->_fileResource)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Moved beyond the end of the file',
-                                         Zend_Pdf_Exception::MOVE_BEYOND_END_OF_FILE);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/FileParserDataSource/String.php b/airtime_mvc/library/Zend/Pdf/FileParserDataSource/String.php
deleted file mode 100644
index aead15b97..000000000
--- a/airtime_mvc/library/Zend/Pdf/FileParserDataSource/String.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_FileParserDataSource */
-require_once 'Zend/Pdf/FileParserDataSource.php';
-
-/**
- * Concrete subclass of {@link Zend_Pdf_FileParserDataSource} that provides an
- * interface to binary strings.
- *
- * @package    Zend_Pdf
- * @subpackage FileParser
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_FileParserDataSource_String extends Zend_Pdf_FileParserDataSource
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * The string to parse.
-     * @var string
-     */
-    protected $_string = '';
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Concrete Class Implementation */
-
-    /**
-     * Object constructor.
-     *
-     * Verifies that the string is not empty.
-     *
-     * @param string $string String to parse.
-     */
-    public function __construct($string)
-    {
-        if (empty($string)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('String is empty',
-                                         Zend_Pdf_Exception::PARAMETER_VALUE_OUT_OF_RANGE);
-        }
-        $this->_size = strlen($string);
-        $this->_string = $string;
-    }
-
-    /**
-     * Object destructor.
-     */
-    public function __destruct()
-    {
-        $this->_string = '';
-    }
-
-    /**
-     * Returns the specified number of raw bytes from the string at the byte
-     * offset of the current read position.
-     *
-     * Advances the read position by the number of bytes read.
-     *
-     * Throws an exception if there is insufficient data to completely fulfill
-     * the request.
-     *
-     * @param integer $byteCount Number of bytes to read.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function readBytes($byteCount)
-    {
-        if (($this->_offset + $byteCount) > $this->_size) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Insufficient data to read $byteCount bytes",
-                                         Zend_Pdf_Exception::INSUFFICIENT_DATA);
-        }
-        $bytes = substr($this->_string, $this->_offset, $byteCount);
-        $this->_offset += $byteCount;
-        return $bytes;
-    }
-
-    /**
-     * Returns the entire string.
-     *
-     * Preserves the current read position.
-     *
-     * @return string
-     */
-    public function readAllBytes()
-    {
-        return $this->_string;
-    }
-
-
-  /* Object Magic Methods */
-
-    /**
-     * Returns a string containing the parsed string's length.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return "String ($this->_size bytes)";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/Ascii85.php b/airtime_mvc/library/Zend/Pdf/Filter/Ascii85.php
deleted file mode 100644
index 2da2e7569..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/Ascii85.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ascii85.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Filter_Interface */
-require_once 'Zend/Pdf/Filter/Interface.php';
-
-/**
- * ASCII85 stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Filter_Ascii85 implements Zend_Pdf_Filter_Interface
-{
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null)
-    {
-        $output = '';
-        $dataLength = strlen($data);
-
-        for ($i = 0; $i < $dataLength; $i += 4) {
-            //convert the 4 characters into a 32-bit number
-            $chunk = substr($data, $i, 4);
-
-            if (strlen($chunk) < 4) {
-                //partial chunk
-                break;
-            }
-
-            $b = unpack("N", $chunk);
-            $b = $b[1];
-
-            //special char for all 4 bytes = 0
-            if ($b == 0) {
-                $output .= 'z';
-                continue;
-            }
-
-            //encode into 5 bytes
-            for ($j = 4; $j >= 0; $j--) {
-                $foo = (int) (($b / pow(85,$j)) + 33);
-                $b %= pow(85,$j);
-                $output .= chr($foo);
-            }
-        }
-
-        //encode partial chunk
-        if ($i < $dataLength) {
-            $n = $dataLength - $i;
-            $chunk = substr($data, -$n);
-
-            //0 pad the rest
-            for ($j = $n;$j < 4;$j++) {
-                $chunk .= chr(0);
-            }
-
-            $b = unpack("N", $chunk);
-            $b = $b[1];
-
-            //encode just $n + 1
-            for ($j = 4; $j >= (4 - $n); $j--) {
-                $foo = (int) (($b / pow(85,$j)) + 33);
-                $b %= pow(85,$j);
-                $output .= chr($foo);
-            }
-        }
-
-        //EOD
-        $output .= '~>';
-
-        //make sure lines are split
-        $output = chunk_split($output, 76, "\n");
-
-        //get rid of new line at the end
-        $output = substr($output, 0, -1);
-        return $output;
-    }
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null)
-    {
-        $output = '';
-
-        //get rid of the whitespaces
-        $whiteSpace = array("\x00", "\x09", "\x0A", "\x0C", "\x0D", "\x20");
-        $data = str_replace($whiteSpace, '', $data);
-
-        if (substr($data, -2) != '~>') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Invalid EOF marker');
-            return '';
-        }
-
-        $data = substr($data, 0, (strlen($data) - 2));
-        $dataLength = strlen($data);
-
-        for ($i = 0; $i < $dataLength; $i += 5) {
-            $b = 0;
-
-            if (substr($data, $i, 1) == "z") {
-                $i -= 4;
-                $output .= pack("N", 0);
-                next;
-            }
-
-            $c = substr($data, $i, 5);
-
-            if(strlen($c) < 5) {
-                //partial chunk
-                break;
-            }
-
-            $c = unpack('C5', $c);
-            $value = 0;
-
-            for ($j = 1; $j <= 5; $j++) {
-                $value += (($c[$j] - 33) * pow(85, (5 - $j)));
-            }
-
-            $output .= pack("N", $value);
-        }
-
-        //decode partial
-        if ($i < $dataLength) {
-            $value = 0;
-            $chunk = substr($data, $i);
-            $partialLength = strlen($chunk);
-
-            //pad the rest of the chunk with u's
-            //until the lenght of the chunk is 5
-            for ($j = 0; $j < (5 - $partialLength); $j++) {
-                $chunk .= 'u';
-            }
-
-            $c = unpack('C5', $chunk);
-
-            for ($j = 1; $j <= 5; $j++) {
-                $value += (($c[$j] - 33) * pow(85, (5 - $j)));
-            }
-
-            $foo = pack("N", $value);
-            $output .= substr($foo, 0, ($partialLength - 1));
-        }
-
-        return $output;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/AsciiHex.php b/airtime_mvc/library/Zend/Pdf/Filter/AsciiHex.php
deleted file mode 100644
index c3498139f..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/AsciiHex.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AsciiHex.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Filter_Interface */
-require_once 'Zend/Pdf/Filter/Interface.php';
-
-/**
- * AsciiHex stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Filter_AsciiHex implements Zend_Pdf_Filter_Interface
-{
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null)
-    {
-        return bin2hex($data) . '>';
-    }
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null)
-    {
-        $output  = '';
-        $oddCode = true;
-        $commentMode = false;
-
-        for ($count = 0; $count < strlen($data)  &&  $data[$count] != '>'; $count++) {
-            $charCode = ord($data[$count]);
-
-            if ($commentMode) {
-                if ($charCode == 0x0A  || $charCode == 0x0D ) {
-                    $commentMode = false;
-                }
-
-                continue;
-            }
-
-            switch ($charCode) {
-                //Skip white space
-                case 0x00: // null character
-                    // fall through to next case
-                case 0x09: // Tab
-                    // fall through to next case
-                case 0x0A: // Line feed
-                    // fall through to next case
-                case 0x0C: // Form Feed
-                    // fall through to next case
-                case 0x0D: // Carriage return
-                    // fall through to next case
-                case 0x20: // Space
-                    // Do nothing
-                    break;
-
-                case 0x25: // '%'
-                    // Switch to comment mode
-                    $commentMode = true;
-                    break;
-
-                default:
-                    if ($charCode >= 0x30 /*'0'*/ && $charCode <= 0x39 /*'9'*/) {
-                        $code = $charCode - 0x30;
-                    } else if ($charCode >= 0x41 /*'A'*/ && $charCode <= 0x46 /*'F'*/) {
-                        $code = $charCode - 0x37/*0x41 - 0x0A*/;
-                    } else if ($charCode >= 0x61 /*'a'*/ && $charCode <= 0x66 /*'f'*/) {
-                        $code = $charCode - 0x57/*0x61 - 0x0A*/;
-                    } else {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception('Wrong character in a encoded stream');
-                    }
-
-                    if ($oddCode) {
-                        // Odd pass. Store hex digit for next pass
-                        // Scope of $hexCodeHigh variable is whole function
-                        $hexCodeHigh = $code;
-                    } else {
-                        // Even pass.
-                        // Add decoded character to the output
-                        // ($hexCodeHigh is stored in previous pass)
-                        $output .= chr($hexCodeHigh*16 + $code);
-                    }
-                    $oddCode = !$oddCode;
-
-                    break;
-            }
-        }
-
-        /* Check that stream is terminated by End Of Data marker */
-        if ($data[$count] != '>') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Wrong encoded stream End Of Data marker.');
-        }
-
-        /* Last '0' character is omitted */
-        if (!$oddCode) {
-            $output .= chr($hexCodeHigh*16);
-        }
-
-        return $output;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/Compression.php b/airtime_mvc/library/Zend/Pdf/Filter/Compression.php
deleted file mode 100644
index 5a430f81c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/Compression.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Compression.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Filter_Interface */
-require_once 'Zend/Pdf/Filter/Interface.php';
-
-/**
- * ASCII85 stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Filter_Compression implements Zend_Pdf_Filter_Interface
-{
-    /**
-     * Paeth prediction function
-     *
-     * @param integer $a
-     * @param integer $b
-     * @param integer $c
-     * @return integer
-     */
-    private static function _paeth($a, $b, $c)
-    {
-        // $a - left, $b - above, $c - upper left
-        $p  = $a + $b - $c;       // initial estimate
-        $pa = abs($p - $a);       // distances to a, b, c
-        $pb = abs($p - $b);
-        $pc = abs($p - $c);
-
-        // return nearest of a,b,c,
-        // breaking ties in order a,b,c.
-        if ($pa <= $pb && $pa <= $pc) {
-            return $a;
-        } else if ($pb <= $pc) {
-            return $b;
-        } else {
-            return $c;
-        }
-    }
-
-
-    /**
-     * Get Predictor decode param value
-     *
-     * @param array $params
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    private static function _getPredictorValue(&$params)
-    {
-        if (isset($params['Predictor'])) {
-            $predictor = $params['Predictor'];
-
-            if ($predictor != 1   &&  $predictor != 2   &&
-                $predictor != 10  &&  $predictor != 11  &&   $predictor != 12  &&
-                $predictor != 13  &&  $predictor != 14  &&   $predictor != 15) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Invalid value of \'Predictor\' decode param - ' . $predictor . '.' );
-            }
-            return $predictor;
-        } else {
-            return 1;
-        }
-    }
-
-    /**
-     * Get Colors decode param value
-     *
-     * @param array $params
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    private static function _getColorsValue(&$params)
-    {
-        if (isset($params['Colors'])) {
-            $colors = $params['Colors'];
-
-            if ($colors != 1  &&  $colors != 2  &&  $colors != 3  &&  $colors != 4) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Invalid value of \'Color\' decode param - ' . $colors . '.' );
-            }
-            return $colors;
-        } else {
-            return 1;
-        }
-    }
-
-    /**
-     * Get BitsPerComponent decode param value
-     *
-     * @param array $params
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    private static function _getBitsPerComponentValue(&$params)
-    {
-        if (isset($params['BitsPerComponent'])) {
-            $bitsPerComponent = $params['BitsPerComponent'];
-
-            if ($bitsPerComponent != 1  &&  $bitsPerComponent != 2  &&
-                $bitsPerComponent != 4  &&  $bitsPerComponent != 8  &&
-                $bitsPerComponent != 16 ) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Invalid value of \'BitsPerComponent\' decode param - ' . $bitsPerComponent . '.' );
-            }
-            return $bitsPerComponent;
-        } else {
-            return 8;
-        }
-    }
-
-    /**
-     * Get Columns decode param value
-     *
-     * @param array $params
-     * @return integer
-     */
-    private static function _getColumnsValue(&$params)
-    {
-        if (isset($params['Columns'])) {
-            return $params['Columns'];
-        } else {
-            return 1;
-        }
-    }
-
-
-    /**
-     * Convert stream data according to the filter params set before encoding.
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    protected static function _applyEncodeParams($data, $params) {
-        $predictor        = self::_getPredictorValue($params);
-        $colors           = self::_getColorsValue($params);
-        $bitsPerComponent = self::_getBitsPerComponentValue($params);
-        $columns          = self::_getColumnsValue($params);
-
-        /** None of prediction */
-        if ($predictor == 1) {
-            return $data;
-        }
-
-        /** TIFF Predictor 2 */
-        if ($predictor == 2) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Not implemented yet' );
-        }
-
-        /** Optimal PNG prediction */
-        if ($predictor == 15) {
-            /** Use Paeth prediction as optimal */
-            $predictor = 14;
-        }
-
-        /** PNG prediction */
-        if ($predictor == 10 ||  /** None of prediction */
-            $predictor == 11 ||  /** Sub prediction     */
-            $predictor == 12 ||  /** Up prediction      */
-            $predictor == 13 ||  /** Average prediction */
-            $predictor == 14     /** Paeth prediction   */
-            ) {
-            $predictor -= 10;
-
-            if($bitsPerComponent == 16) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("PNG Prediction with bit depth greater than 8 not yet supported.");
-            }
-
-            $bitsPerSample  = $bitsPerComponent*$colors;
-            $bytesPerSample = (int)(($bitsPerSample + 7)/8);           // (int)ceil(...) emulation
-            $bytesPerRow    = (int)(($bitsPerSample*$columns + 7)/8);  // (int)ceil(...) emulation
-            $rows           = strlen($data)/$bytesPerRow;
-            $output         = '';
-            $offset         = 0;
-
-            if (!is_integer($rows)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Wrong data length.');
-            }
-
-            switch ($predictor) {
-                case 0: // None of prediction
-                    for ($count = 0; $count < $rows; $count++) {
-                        $output .= chr($predictor);
-                        $output .= substr($data, $offset, $bytesPerRow);
-                        $offset += $bytesPerRow;
-                    }
-                    break;
-
-                case 1: // Sub prediction
-                    for ($count = 0; $count < $rows; $count++) {
-                        $output .= chr($predictor);
-
-                        $lastSample = array_fill(0, $bytesPerSample, 0);
-                        for ($count2 = 0; $count2 < $bytesPerRow; $count2++) {
-                            $newByte = ord($data[$offset++]);
-                            // Note. chr() automatically cuts input to 8 bit
-                            $output .= chr($newByte - $lastSample[$count2 % $bytesPerSample]);
-                            $lastSample[$count2 % $bytesPerSample] = $newByte;
-                        }
-                    }
-                    break;
-
-                case 2: // Up prediction
-                    $lastRow = array_fill(0, $bytesPerRow, 0);
-                    for ($count = 0; $count < $rows; $count++) {
-                        $output .= chr($predictor);
-
-                        for ($count2 = 0; $count2 < $bytesPerRow; $count2++) {
-                            $newByte = ord($data[$offset++]);
-                            // Note. chr() automatically cuts input to 8 bit
-                            $output .= chr($newByte - $lastRow[$count2]);
-                            $lastRow[$count2] = $newByte;
-                        }
-                    }
-                    break;
-
-                case 3: // Average prediction
-                    $lastRow = array_fill(0, $bytesPerRow, 0);
-                    for ($count = 0; $count < $rows; $count++) {
-                        $output .= chr($predictor);
-
-                        $lastSample = array_fill(0, $bytesPerSample, 0);
-                        for ($count2 = 0; $count2 < $bytesPerRow; $count2++) {
-                            $newByte = ord($data[$offset++]);
-                            // Note. chr() automatically cuts input to 8 bit
-                            $output .= chr($newByte - floor(( $lastSample[$count2 % $bytesPerSample] + $lastRow[$count2])/2));
-                            $lastSample[$count2 % $bytesPerSample] = $lastRow[$count2] = $newByte;
-                        }
-                    }
-                    break;
-
-                case 4: // Paeth prediction
-                    $lastRow    = array_fill(0, $bytesPerRow, 0);
-                    $currentRow = array();
-                    for ($count = 0; $count < $rows; $count++) {
-                        $output .= chr($predictor);
-
-                        $lastSample = array_fill(0, $bytesPerSample, 0);
-                        for ($count2 = 0; $count2 < $bytesPerRow; $count2++) {
-                            $newByte = ord($data[$offset++]);
-                            // Note. chr() automatically cuts input to 8 bit
-                            $output .= chr($newByte - self::_paeth( $lastSample[$count2 % $bytesPerSample],
-                                                                    $lastRow[$count2],
-                                                                    ($count2 - $bytesPerSample  <  0)?
-                                                                         0 : $lastRow[$count2 - $bytesPerSample] ));
-                            $lastSample[$count2 % $bytesPerSample] = $currentRow[$count2] = $newByte;
-                        }
-                        $lastRow = $currentRow;
-                    }
-                    break;
-            }
-            return $output;
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Unknown prediction algorithm - ' . $predictor . '.' );
-    }
-
-    /**
-     * Convert stream data according to the filter params set after decoding.
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     */
-    protected static function _applyDecodeParams($data, $params) {
-        $predictor        = self::_getPredictorValue($params);
-        $colors           = self::_getColorsValue($params);
-        $bitsPerComponent = self::_getBitsPerComponentValue($params);
-        $columns          = self::_getColumnsValue($params);
-
-        /** None of prediction */
-        if ($predictor == 1) {
-            return $data;
-        }
-
-        /** TIFF Predictor 2 */
-        if ($predictor == 2) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Not implemented yet' );
-        }
-
-        /**
-         * PNG prediction
-         * Prediction code is duplicated on each row.
-         * Thus all cases can be brought to one
-         */
-        if ($predictor == 10 ||  /** None of prediction */
-            $predictor == 11 ||  /** Sub prediction     */
-            $predictor == 12 ||  /** Up prediction      */
-            $predictor == 13 ||  /** Average prediction */
-            $predictor == 14 ||  /** Paeth prediction   */
-            $predictor == 15     /** Optimal prediction */) {
-
-            $bitsPerSample  = $bitsPerComponent*$colors;
-            $bytesPerSample = ceil($bitsPerSample/8);
-            $bytesPerRow    = ceil($bitsPerSample*$columns/8);
-            $rows           = ceil(strlen($data)/($bytesPerRow + 1));
-            $output         = '';
-            $offset         = 0;
-
-            $lastRow = array_fill(0, $bytesPerRow, 0);
-            for ($count = 0; $count < $rows; $count++) {
-                $lastSample = array_fill(0, $bytesPerSample, 0);
-                switch (ord($data[$offset++])) {
-                    case 0: // None of prediction
-                        $output .= substr($data, $offset, $bytesPerRow);
-                        for ($count2 = 0; $count2 < $bytesPerRow  &&  $offset < strlen($data); $count2++) {
-                            $lastSample[$count2 % $bytesPerSample] = $lastRow[$count2] = ord($data[$offset++]);
-                        }
-                        break;
-
-                    case 1: // Sub prediction
-                        for ($count2 = 0; $count2 < $bytesPerRow  &&  $offset < strlen($data); $count2++) {
-                            $decodedByte = (ord($data[$offset++]) + $lastSample[$count2 % $bytesPerSample]) & 0xFF;
-                            $lastSample[$count2 % $bytesPerSample] = $lastRow[$count2] = $decodedByte;
-                            $output .= chr($decodedByte);
-                        }
-                        break;
-
-                    case 2: // Up prediction
-                        for ($count2 = 0; $count2 < $bytesPerRow  &&  $offset < strlen($data); $count2++) {
-                            $decodedByte = (ord($data[$offset++]) + $lastRow[$count2]) & 0xFF;
-                            $lastSample[$count2 % $bytesPerSample] = $lastRow[$count2] = $decodedByte;
-                            $output .= chr($decodedByte);
-                        }
-                        break;
-
-                    case 3: // Average prediction
-                        for ($count2 = 0; $count2 < $bytesPerRow  &&  $offset < strlen($data); $count2++) {
-                            $decodedByte = (ord($data[$offset++]) +
-                                            floor(( $lastSample[$count2 % $bytesPerSample] + $lastRow[$count2])/2)
-                                           ) & 0xFF;
-                            $lastSample[$count2 % $bytesPerSample] = $lastRow[$count2] = $decodedByte;
-                            $output .= chr($decodedByte);
-                        }
-                        break;
-
-                    case 4: // Paeth prediction
-                        $currentRow = array();
-                        for ($count2 = 0; $count2 < $bytesPerRow  &&  $offset < strlen($data); $count2++) {
-                            $decodedByte = (ord($data[$offset++]) +
-                                            self::_paeth($lastSample[$count2 % $bytesPerSample],
-                                                         $lastRow[$count2],
-                                                         ($count2 - $bytesPerSample  <  0)?
-                                                              0 : $lastRow[$count2 - $bytesPerSample])
-                                           ) & 0xFF;
-                            $lastSample[$count2 % $bytesPerSample] = $currentRow[$count2] = $decodedByte;
-                            $output .= chr($decodedByte);
-                        }
-                        $lastRow = $currentRow;
-                        break;
-
-                    default:
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception('Unknown prediction tag.');
-                }
-            }
-            return $output;
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Unknown prediction algorithm - ' . $predictor . '.' );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/Compression/Flate.php b/airtime_mvc/library/Zend/Pdf/Filter/Compression/Flate.php
deleted file mode 100644
index 5afa45791..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/Compression/Flate.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Flate.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Filter_Compression */
-require_once 'Zend/Pdf/Filter/Compression.php';
-
-/**
- * Flate stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Filter_Compression_Flate extends Zend_Pdf_Filter_Compression
-{
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null)
-    {
-        if ($params != null) {
-            $data = self::_applyEncodeParams($data, $params);
-        }
-
-        if (extension_loaded('zlib')) {
-            $trackErrors = ini_get( "track_errors");
-            ini_set('track_errors', '1');
-
-            if (($output = @gzcompress($data)) === false) {
-                ini_set('track_errors', $trackErrors);
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception($php_errormsg);
-            }
-
-            ini_set('track_errors', $trackErrors);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Not implemented yet. You have to use zlib extension.');
-        }
-
-        return $output;
-    }
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null)
-    {
-        global $php_errormsg;
-
-        if (extension_loaded('zlib')) {
-            $trackErrors = ini_get( "track_errors");
-            ini_set('track_errors', '1');
-
-            if (($output = @gzuncompress($data)) === false) {
-                ini_set('track_errors', $trackErrors);
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception($php_errormsg);
-            }
-
-            ini_set('track_errors', $trackErrors);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Not implemented yet');
-        }
-
-        if ($params !== null) {
-            return self::_applyDecodeParams($output, $params);
-        } else {
-            return $output;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/Compression/Lzw.php b/airtime_mvc/library/Zend/Pdf/Filter/Compression/Lzw.php
deleted file mode 100644
index 73c1e4c81..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/Compression/Lzw.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Lzw.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Filter_Compression */
-require_once 'Zend/Pdf/Filter/Compression.php';
-
-/**
- * LZW stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Filter_Compression_Lzw extends Zend_Pdf_Filter_Compression
-{
-    /**
-     * Get EarlyChange decode param value
-     *
-     * @param array $params
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    private static function _getEarlyChangeValue($params)
-    {
-        if (isset($params['EarlyChange'])) {
-            $earlyChange = $params['EarlyChange'];
-
-            if ($earlyChange != 0  &&  $earlyChange != 1) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Invalid value of \'EarlyChange\' decode param - ' . $earlyChange . '.' );
-            }
-            return $earlyChange;
-        } else {
-            return 1;
-        }
-    }
-
-
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null)
-    {
-        if ($params != null) {
-            $data = self::_applyEncodeParams($data, $params);
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Not implemented yet');
-    }
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Not implemented yet');
-
-        if ($params !== null) {
-            return self::_applyDecodeParams($data, $params);
-        } else {
-            return $data;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/Interface.php b/airtime_mvc/library/Zend/Pdf/Filter/Interface.php
deleted file mode 100644
index af5a4fe22..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/Interface.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * PDF stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Pdf_Filter_Interface
-{
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null);
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null);
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Filter/RunLength.php b/airtime_mvc/library/Zend/Pdf/Filter/RunLength.php
deleted file mode 100644
index 1c8465db9..000000000
--- a/airtime_mvc/library/Zend/Pdf/Filter/RunLength.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Pdf_Filter_Interface */
-require_once 'Zend/Pdf/Filter/Interface.php';
-
-/**
- * RunLength stream filter
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Filter_RunLength implements Zend_Pdf_Filter_Interface
-{
-    /**
-     * Encode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function encode($data, $params = null)
-    {
-        $output = '';
-
-        $chainStartOffset = 0;
-        $offset = 0;
-
-        while ($offset < strlen($data)) {
-            // Do not encode 2 char chains since they produce 2 char run sequence,
-            // but it takes more time to decode such output (because of processing additional run)
-            if (($repeatedCharChainLength = strspn($data, $data[$offset], $offset + 1, 127) + 1)  >  2) {
-                if ($chainStartOffset != $offset) {
-                    // Drop down previouse (non-repeatable chars) run
-                    $output .= chr($offset - $chainStartOffset - 1)
-                             . substr($data, $chainStartOffset, $offset - $chainStartOffset);
-                }
-
-                $output .= chr(257 - $repeatedCharChainLength) . $data[$offset];
-
-                $offset += $repeatedCharChainLength;
-                $chainStartOffset = $offset;
-            } else {
-                $offset++;
-
-                if ($offset - $chainStartOffset == 128) {
-                    // Maximum run length is reached
-                    // Drop down non-repeatable chars run
-                    $output .= "\x7F" . substr($data, $chainStartOffset, 128);
-
-                    $chainStartOffset = $offset;
-                }
-            }
-        }
-
-        if ($chainStartOffset != $offset) {
-            // Drop down non-repeatable chars run
-            $output .= chr($offset - $chainStartOffset - 1) . substr($data, $chainStartOffset, $offset - $chainStartOffset);
-        }
-
-        $output .= "\x80";
-
-        return $output;
-    }
-
-    /**
-     * Decode data
-     *
-     * @param string $data
-     * @param array $params
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public static function decode($data, $params = null)
-    {
-        $dataLength = strlen($data);
-        $output = '';
-        $offset = 0;
-
-        while($offset < $dataLength) {
-            $length = ord($data[$offset]);
-
-            $offset++;
-
-            if ($length == 128) {
-                // EOD byte
-                break;
-            } else if ($length < 128) {
-                $length++;
-
-                $output .= substr($data, $offset, $length);
-
-                $offset += $length;
-            } else if ($length > 128) {
-                $output .= str_repeat($data[$offset], 257 - $length);
-
-                $offset++;
-            }
-        }
-
-        return $output;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Font.php b/airtime_mvc/library/Zend/Pdf/Font.php
deleted file mode 100644
index 2a04e6fdd..000000000
--- a/airtime_mvc/library/Zend/Pdf/Font.php
+++ /dev/null
@@ -1,732 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Font.php 20211 2010-01-12 02:14:29Z yoshida@zend.co.jp $
- */
-
-
-/**
- * Abstract factory class which vends {@link Zend_Pdf_Resource_Font} objects.
- *
- * Font objects themselves are normally instantiated through the factory methods
- * {@link fontWithName()} or {@link fontWithPath()}.
- *
- * This class is also the home for font-related constants because the name of
- * the true base class ({@link Zend_Pdf_Resource_Font}) is not intuitive for the
- * end user.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Font
-{
-  /**** Class Constants ****/
-
-
-  /* Font Types */
-
-    /**
-     * Unknown font type.
-     */
-    const TYPE_UNKNOWN = 0;
-
-    /**
-     * One of the standard 14 PDF fonts.
-     */
-    const TYPE_STANDARD = 1;
-
-    /**
-     * A PostScript Type 1 font.
-     */
-    const TYPE_TYPE_1 = 2;
-
-    /**
-     * A TrueType font or an OpenType font containing TrueType outlines.
-     */
-    const TYPE_TRUETYPE = 3;
-
-    /**
-     * Type 0 composite font.
-     */
-    const TYPE_TYPE_0 = 4;
-
-    /**
-     * CID font containing a PostScript Type 1 font.
-     * These fonts are used only to construct Type 0 composite fonts and can't be used directly
-     */
-    const TYPE_CIDFONT_TYPE_0 = 5;
-
-    /**
-     * CID font containing a TrueType font or an OpenType font containing TrueType outlines.
-     * These fonts are used only to construct Type 0 composite fonts and can't be used directly
-     */
-    const TYPE_CIDFONT_TYPE_2 = 6;
-
-
-  /* Names of the Standard 14 PDF Fonts */
-
-    /**
-     * Name of the standard PDF font Courier.
-     */
-    const FONT_COURIER = 'Courier';
-
-    /**
-     * Name of the bold style of the standard PDF font Courier.
-     */
-    const FONT_COURIER_BOLD = 'Courier-Bold';
-
-    /**
-     * Name of the italic style of the standard PDF font Courier.
-     */
-    const FONT_COURIER_OBLIQUE = 'Courier-Oblique';
-
-    /**
-     * Convenience constant for a common misspelling of
-     * {@link FONT_COURIER_OBLIQUE}.
-     */
-    const FONT_COURIER_ITALIC = 'Courier-Oblique';
-
-    /**
-     * Name of the bold and italic style of the standard PDF font Courier.
-     */
-    const FONT_COURIER_BOLD_OBLIQUE = 'Courier-BoldOblique';
-
-    /**
-     * Convenience constant for a common misspelling of
-     * {@link FONT_COURIER_BOLD_OBLIQUE}.
-     */
-    const FONT_COURIER_BOLD_ITALIC = 'Courier-BoldOblique';
-
-    /**
-     * Name of the standard PDF font Helvetica.
-     */
-    const FONT_HELVETICA = 'Helvetica';
-
-    /**
-     * Name of the bold style of the standard PDF font Helvetica.
-     */
-    const FONT_HELVETICA_BOLD = 'Helvetica-Bold';
-
-    /**
-     * Name of the italic style of the standard PDF font Helvetica.
-     */
-    const FONT_HELVETICA_OBLIQUE = 'Helvetica-Oblique';
-
-    /**
-     * Convenience constant for a common misspelling of
-     * {@link FONT_HELVETICA_OBLIQUE}.
-     */
-    const FONT_HELVETICA_ITALIC = 'Helvetica-Oblique';
-
-    /**
-     * Name of the bold and italic style of the standard PDF font Helvetica.
-     */
-    const FONT_HELVETICA_BOLD_OBLIQUE = 'Helvetica-BoldOblique';
-
-    /**
-     * Convenience constant for a common misspelling of
-     * {@link FONT_HELVETICA_BOLD_OBLIQUE}.
-     */
-    const FONT_HELVETICA_BOLD_ITALIC = 'Helvetica-BoldOblique';
-
-    /**
-     * Name of the standard PDF font Symbol.
-     */
-    const FONT_SYMBOL = 'Symbol';
-
-    /**
-     * Name of the standard PDF font Times.
-     */
-    const FONT_TIMES_ROMAN = 'Times-Roman';
-
-    /**
-     * Convenience constant for a common misspelling of
-     * {@link FONT_TIMES_ROMAN}.
-     */
-    const FONT_TIMES = 'Times-Roman';
-
-    /**
-     * Name of the bold style of the standard PDF font Times.
-     */
-    const FONT_TIMES_BOLD = 'Times-Bold';
-
-    /**
-     * Name of the italic style of the standard PDF font Times.
-     */
-    const FONT_TIMES_ITALIC = 'Times-Italic';
-
-    /**
-     * Name of the bold and italic style of the standard PDF font Times.
-     */
-    const FONT_TIMES_BOLD_ITALIC = 'Times-BoldItalic';
-
-    /**
-     * Name of the standard PDF font Zapf Dingbats.
-     */
-    const FONT_ZAPFDINGBATS = 'ZapfDingbats';
-
-
-  /* Font Name String Types */
-
-    /**
-     * Full copyright notice for the font.
-     */
-    const NAME_COPYRIGHT =  0;
-
-    /**
-     * Font family name. Used to group similar styles of fonts together.
-     */
-    const NAME_FAMILY =  1;
-
-    /**
-     * Font style within the font family. Examples: Regular, Italic, Bold, etc.
-     */
-    const NAME_STYLE =  2;
-
-    /**
-     * Unique font identifier.
-     */
-    const NAME_ID =  3;
-
-    /**
-     * Full font name. Usually a combination of the {@link NAME_FAMILY} and
-     * {@link NAME_STYLE} strings.
-     */
-    const NAME_FULL =  4;
-
-    /**
-     * Version number of the font.
-     */
-    const NAME_VERSION =  5;
-
-    /**
-     * PostScript name for the font. This is the name used to identify fonts
-     * internally and within the PDF file.
-     */
-    const NAME_POSTSCRIPT =  6;
-
-    /**
-     * Font trademark notice. This is distinct from the {@link NAME_COPYRIGHT}.
-     */
-    const NAME_TRADEMARK =  7;
-
-    /**
-     * Name of the font manufacturer.
-     */
-    const NAME_MANUFACTURER =  8;
-
-    /**
-     * Name of the designer of the font.
-     */
-    const NAME_DESIGNER =  9;
-
-    /**
-     * Description of the font. May contain revision information, usage
-     * recommendations, features, etc.
-     */
-    const NAME_DESCRIPTION = 10;
-
-    /**
-     * URL of the font vendor. Some fonts may contain a unique serial number
-     * embedded in this URL, which is used for licensing.
-     */
-    const NAME_VENDOR_URL = 11;
-
-    /**
-     * URL of the font designer ({@link NAME_DESIGNER}).
-     */
-    const NAME_DESIGNER_URL = 12;
-
-    /**
-     * Plain language licensing terms for the font.
-     */
-    const NAME_LICENSE = 13;
-
-    /**
-     * URL of more detailed licensing information for the font.
-     */
-    const NAME_LICENSE_URL = 14;
-
-    /**
-     * Preferred font family. Used by some fonts to work around a Microsoft
-     * Windows limitation where only four fonts styles can share the same
-     * {@link NAME_FAMILY} value.
-     */
-    const NAME_PREFERRED_FAMILY = 16;
-
-    /**
-     * Preferred font style. A more descriptive string than {@link NAME_STYLE}.
-     */
-    const NAME_PREFERRED_STYLE = 17;
-
-    /**
-     * Suggested text to use as a representative sample of the font.
-     */
-    const NAME_SAMPLE_TEXT = 19;
-
-    /**
-     * PostScript CID findfont name.
-     */
-    const NAME_CID_NAME = 20;
-
-
-  /* Font Weights */
-
-    /**
-     * Thin font weight.
-     */
-    const WEIGHT_THIN = 100;
-
-    /**
-     * Extra-light (Ultra-light) font weight.
-     */
-    const WEIGHT_EXTRA_LIGHT = 200;
-
-    /**
-     * Light font weight.
-     */
-    const WEIGHT_LIGHT = 300;
-
-    /**
-     * Normal (Regular) font weight.
-     */
-    const WEIGHT_NORMAL = 400;
-
-    /**
-     * Medium font weight.
-     */
-    const WEIGHT_MEDIUM = 500;
-
-    /**
-     * Semi-bold (Demi-bold) font weight.
-     */
-    const WEIGHT_SEMI_BOLD = 600;
-
-    /**
-     * Bold font weight.
-     */
-    const WEIGHT_BOLD = 700;
-
-    /**
-     * Extra-bold (Ultra-bold) font weight.
-     */
-    const WEIGHT_EXTRA_BOLD = 800;
-
-    /**
-     * Black (Heavy) font weight.
-     */
-    const WEIGHT_BLACK = 900;
-
-
-  /* Font Widths */
-
-    /**
-     * Ultra-condensed font width. Typically 50% of normal.
-     */
-    const WIDTH_ULTRA_CONDENSED = 1;
-
-    /**
-     * Extra-condensed font width. Typically 62.5% of normal.
-     */
-    const WIDTH_EXTRA_CONDENSED = 2;
-
-    /**
-     * Condensed font width. Typically 75% of normal.
-     */
-    const WIDTH_CONDENSED = 3;
-
-    /**
-     * Semi-condensed font width. Typically 87.5% of normal.
-     */
-    const WIDTH_SEMI_CONDENSED = 4;
-
-    /**
-     * Normal (Medium) font width.
-     */
-    const WIDTH_NORMAL = 5;
-
-    /**
-     * Semi-expanded font width. Typically 112.5% of normal.
-     */
-    const WIDTH_SEMI_EXPANDED = 6;
-
-    /**
-     * Expanded font width. Typically 125% of normal.
-     */
-    const WIDTH_EXPANDED = 7;
-
-    /**
-     * Extra-expanded font width. Typically 150% of normal.
-     */
-    const WIDTH_EXTRA_EXPANDED = 8;
-
-    /**
-     * Ultra-expanded font width. Typically 200% of normal.
-     */
-    const WIDTH_ULTRA_EXPANDED = 9;
-
-
-  /* Font Embedding Options */
-
-    /**
-     * Do not embed the font in the PDF document.
-     */
-    const EMBED_DONT_EMBED = 0x01;
-
-    /**
-     * Embed, but do not subset the font in the PDF document.
-     */
-    const EMBED_DONT_SUBSET = 0x02;
-
-    /**
-     * Embed, but do not compress the font in the PDF document.
-     */
-    const EMBED_DONT_COMPRESS = 0x04;
-
-    /**
-     * Suppress the exception normally thrown if the font cannot be embedded
-     * due to its copyright bits being set.
-     */
-    const EMBED_SUPPRESS_EMBED_EXCEPTION = 0x08;
-
-
-
-  /**** Class Variables ****/
-
-
-    /**
-     * Array whose keys are the unique PostScript names of instantiated fonts.
-     * The values are the font objects themselves.
-     * @var array
-     */
-    private static $_fontNames = array();
-
-    /**
-     * Array whose keys are the md5 hash of the full paths on disk for parsed
-     * fonts. The values are the font objects themselves.
-     * @var array
-     */
-    private static $_fontFilePaths = array();
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Factory Methods */
-
-    /**
-     * Returns a {@link Zend_Pdf_Resource_Font} object by full name.
-     *
-     * This is the preferred method to obtain one of the standard 14 PDF fonts.
-     *
-     * The result of this method is cached, preventing unnecessary duplication
-     * of font objects. Repetitive calls for a font with the same name will
-     * return the same object.
-     *
-     * The $embeddingOptions parameter allows you to set certain flags related
-     * to font embedding. You may combine options by OR-ing them together. See
-     * the EMBED_ constants defined in {@link Zend_Pdf_Font} for the list of
-     * available options and their descriptions. Note that this value is only
-     * used when creating a font for the first time. If a font with the same
-     * name already exists, you will get that object and the options you specify
-     * here will be ignored. This is because fonts are only embedded within the
-     * PDF file once.
-     *
-     * If the font name supplied does not match the name of a previously
-     * instantiated object and it is not one of the 14 standard PDF fonts, an
-     * exception will be thrown.
-     *
-     * @param string $name Full PostScript name of font.
-     * @param integer $embeddingOptions (optional) Options for font embedding.
-     * @return Zend_Pdf_Resource_Font
-     * @throws Zend_Pdf_Exception
-     */
-    public static function fontWithName($name, $embeddingOptions = 0)
-        {
-        /* First check the cache. Don't duplicate font objects.
-         */
-        if (isset(Zend_Pdf_Font::$_fontNames[$name])) {
-            return Zend_Pdf_Font::$_fontNames[$name];
-        }
-
-        /**
-         * @todo It would be cool to be able to have a mapping of font names to
-         *   file paths in a configuration file for frequently used custom
-         *   fonts. This would allow a user to use custom fonts without having
-         *   to hard-code file paths all over the place. Table this idea until
-         *   {@link Zend_Config} is ready.
-         */
-
-        /* Not an existing font and no mapping in the config file. Check to see
-         * if this is one of the standard 14 PDF fonts.
-         */
-        switch ($name) {
-            case Zend_Pdf_Font::FONT_COURIER:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/Courier.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_Courier();
-                break;
-
-            case Zend_Pdf_Font::FONT_COURIER_BOLD:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_CourierBold();
-                break;
-
-            case Zend_Pdf_Font::FONT_COURIER_OBLIQUE:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_CourierOblique();
-                break;
-
-            case Zend_Pdf_Font::FONT_COURIER_BOLD_OBLIQUE:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_CourierBoldOblique();
-                break;
-
-            case Zend_Pdf_Font::FONT_HELVETICA:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_Helvetica();
-                break;
-
-            case Zend_Pdf_Font::FONT_HELVETICA_BOLD:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBold();
-                break;
-
-            case Zend_Pdf_Font::FONT_HELVETICA_OBLIQUE:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_HelveticaOblique();
-                break;
-
-            case Zend_Pdf_Font::FONT_HELVETICA_BOLD_OBLIQUE:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBoldOblique();
-                break;
-
-            case Zend_Pdf_Font::FONT_SYMBOL:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_Symbol();
-                break;
-
-            case Zend_Pdf_Font::FONT_TIMES_ROMAN:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_TimesRoman();
-                break;
-
-            case Zend_Pdf_Font::FONT_TIMES_BOLD:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_TimesBold();
-                break;
-
-            case Zend_Pdf_Font::FONT_TIMES_ITALIC:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_TimesItalic();
-                break;
-
-            case Zend_Pdf_Font::FONT_TIMES_BOLD_ITALIC:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_TimesBoldItalic();
-                break;
-
-            case Zend_Pdf_Font::FONT_ZAPFDINGBATS:
-                require_once 'Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Standard_ZapfDingbats();
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Unknown font name: $name",
-                                             Zend_Pdf_Exception::BAD_FONT_NAME);
-        }
-
-        /* Add this new font to the cache array and return it for use.
-         */
-        Zend_Pdf_Font::$_fontNames[$name] = $font;
-        return $font;
-    }
-
-    /**
-     * Returns a {@link Zend_Pdf_Resource_Font} object by file path.
-     *
-     * The result of this method is cached, preventing unnecessary duplication
-     * of font objects. Repetitive calls for the font with the same path will
-     * return the same object.
-     *
-     * The $embeddingOptions parameter allows you to set certain flags related
-     * to font embedding. You may combine options by OR-ing them together. See
-     * the EMBED_ constants defined in {@link Zend_Pdf_Font} for the list of
-     * available options and their descriptions. Note that this value is only
-     * used when creating a font for the first time. If a font with the same
-     * name already exists, you will get that object and the options you specify
-     * here will be ignored. This is because fonts are only embedded within the
-     * PDF file once.
-     *
-     * If the file path supplied does not match the path of a previously
-     * instantiated object or the font type cannot be determined, an exception
-     * will be thrown.
-     *
-     * @param string $filePath Full path to the font file.
-     * @param integer $embeddingOptions (optional) Options for font embedding.
-     * @return Zend_Pdf_Resource_Font
-     * @throws Zend_Pdf_Exception
-     */
-    public static function fontWithPath($filePath, $embeddingOptions = 0)
-    {
-        /* First check the cache. Don't duplicate font objects.
-         */
-        $filePathKey = md5($filePath);
-        if (isset(Zend_Pdf_Font::$_fontFilePaths[$filePathKey])) {
-            return Zend_Pdf_Font::$_fontFilePaths[$filePathKey];
-        }
-
-        /* Create a file parser data source object for this file. File path and
-         * access permission checks are handled here.
-         */
-        require_once 'Zend/Pdf/FileParserDataSource/File.php';
-        $dataSource = new Zend_Pdf_FileParserDataSource_File($filePath);
-
-        /* Attempt to determine the type of font. We can't always trust file
-         * extensions, but try that first since it's fastest.
-         */
-        $fileExtension = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
-
-        /* If it turns out that the file is named improperly and we guess the
-         * wrong type, we'll get null instead of a font object.
-         */
-        switch ($fileExtension) {
-            case 'ttf':
-                $font = Zend_Pdf_Font::_extractTrueTypeFont($dataSource, $embeddingOptions);
-                break;
-
-            default:
-                /* Unrecognized extension. Try to determine the type by actually
-                 * parsing it below.
-                 */
-                $font = null;
-                break;
-        }
-
-
-        if ($font === null) {
-            /* There was no match for the file extension or the extension was
-             * wrong. Attempt to detect the type of font by actually parsing it.
-             * We'll do the checks in order of most likely format to try to
-             * reduce the detection time.
-             */
-
-            // OpenType
-
-            // TrueType
-            if (($font === null) && ($fileExtension != 'ttf')) {
-                $font = Zend_Pdf_Font::_extractTrueTypeFont($dataSource, $embeddingOptions);
-            }
-
-            // Type 1 PostScript
-
-            // Mac OS X dfont
-
-            // others?
-        }
-
-
-        /* Done with the data source object.
-         */
-        $dataSource = null;
-
-        if ($font !== null) {
-            /* Parsing was successful. Add this font instance to the cache arrays
-             * and return it for use.
-             */
-            $fontName = $font->getFontName(Zend_Pdf_Font::NAME_POSTSCRIPT, '', '');
-            Zend_Pdf_Font::$_fontNames[$fontName] = $font;
-            $filePathKey = md5($filePath);
-            Zend_Pdf_Font::$_fontFilePaths[$filePathKey] = $font;
-            return $font;
-
-        } else {
-            /* The type of font could not be determined. Give up.
-             */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Cannot determine font type: $filePath",
-                                         Zend_Pdf_Exception::CANT_DETERMINE_FONT_TYPE);
-         }
-
-    }
-
-
-
-  /**** Internal Methods ****/
-
-
-  /* Font Extraction Methods */
-
-    /**
-     * Attempts to extract a TrueType font from the data source.
-     *
-     * If the font parser throws an exception that suggests the data source
-     * simply doesn't contain a TrueType font, catches it and returns null. If
-     * an exception is thrown that suggests the TrueType font is corrupt or
-     * otherwise unusable, throws that exception. If successful, returns the
-     * font object.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @param integer $embeddingOptions Options for font embedding.
-     * @return Zend_Pdf_Resource_Font_OpenType_TrueType May also return null if
-     *   the data source does not appear to contain a TrueType font.
-     * @throws Zend_Pdf_Exception
-     */
-    protected static function _extractTrueTypeFont($dataSource, $embeddingOptions)
-    {
-        try {
-            require_once 'Zend/Pdf/FileParser/Font/OpenType/TrueType.php';
-            $fontParser = new Zend_Pdf_FileParser_Font_OpenType_TrueType($dataSource);
-
-            $fontParser->parse();
-            if ($fontParser->isAdobeLatinSubset) {
-                require_once 'Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php';
-                $font = new Zend_Pdf_Resource_Font_Simple_Parsed_TrueType($fontParser, $embeddingOptions);
-            } else {
-                require_once 'Zend/Pdf/Resource/Font/CidFont/TrueType.php';
-                require_once 'Zend/Pdf/Resource/Font/Type0.php';
-                /* Use Composite Type 0 font which supports Unicode character mapping */
-                $cidFont = new Zend_Pdf_Resource_Font_CidFont_TrueType($fontParser, $embeddingOptions);
-                $font    = new Zend_Pdf_Resource_Font_Type0($cidFont);
-            }
-        } catch (Zend_Pdf_Exception $e) {
-            /* The following exception codes suggest that this isn't really a
-             * TrueType font. If we caught such an exception, simply return
-             * null. For all other cases, it probably is a TrueType font but has
-             * a problem; throw the exception again.
-             */
-            $fontParser = null;
-            require_once 'Zend/Pdf/Exception.php';
-            switch ($e->getCode()) {
-                case Zend_Pdf_Exception::WRONG_FONT_TYPE:    // break intentionally omitted
-                case Zend_Pdf_Exception::BAD_TABLE_COUNT:    // break intentionally omitted
-                case Zend_Pdf_Exception::BAD_MAGIC_NUMBER:
-                    return null;
-
-                default:
-                    throw new Zend_Pdf_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-        return $font;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Image.php b/airtime_mvc/library/Zend/Pdf/Image.php
deleted file mode 100644
index 96392d7e1..000000000
--- a/airtime_mvc/library/Zend/Pdf/Image.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Images
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract factory class which vends {@link Zend_Pdf_Resource_Image} objects.
- *
- * This class is also the home for image-related constants because the name of
- * the true base class ({@link Zend_Pdf_Resource_Image}) is not intuitive for the
- * end user.
- *
- * @package    Zend_Pdf
- * @subpackage Images
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Image
-{
-  /**** Class Constants ****/
-
-
-  /* Image Types */
-
-    const TYPE_UNKNOWN = 0;
-    const TYPE_JPEG = 1;
-    const TYPE_PNG = 2;
-    const TYPE_TIFF = 3;
-
-  /* TIFF Constants */
-
-    const TIFF_FIELD_TYPE_BYTE=1;
-    const TIFF_FIELD_TYPE_ASCII=2;
-    const TIFF_FIELD_TYPE_SHORT=3;
-    const TIFF_FIELD_TYPE_LONG=4;
-    const TIFF_FIELD_TYPE_RATIONAL=5;
-
-    const TIFF_TAG_IMAGE_WIDTH=256;
-    const TIFF_TAG_IMAGE_LENGTH=257; //Height
-    const TIFF_TAG_BITS_PER_SAMPLE=258;
-    const TIFF_TAG_COMPRESSION=259;
-    const TIFF_TAG_PHOTOMETRIC_INTERPRETATION=262;
-    const TIFF_TAG_STRIP_OFFSETS=273;
-    const TIFF_TAG_SAMPLES_PER_PIXEL=277;
-    const TIFF_TAG_STRIP_BYTE_COUNTS=279;
-
-    const TIFF_COMPRESSION_UNCOMPRESSED = 1;
-    const TIFF_COMPRESSION_CCITT1D = 2;
-    const TIFF_COMPRESSION_GROUP_3_FAX = 3;
-    const TIFF_COMPRESSION_GROUP_4_FAX  = 4;
-    const TIFF_COMPRESSION_LZW = 5;
-    const TIFF_COMPRESSION_JPEG = 6;
-    const TIFF_COMPRESSION_FLATE = 8;
-    const TIFF_COMPRESSION_FLATE_OBSOLETE_CODE = 32946;
-    const TIFF_COMPRESSION_PACKBITS = 32773;
-
-    const TIFF_PHOTOMETRIC_INTERPRETATION_WHITE_IS_ZERO=0;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_BLACK_IS_ZERO=1;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_RGB=2;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_RGB_INDEXED=3;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_CMYK=5;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_YCBCR=6;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_CIELAB=8;
-
-  /* PNG Constants */
-
-    const PNG_COMPRESSION_DEFAULT_STRATEGY = 0;
-    const PNG_COMPRESSION_FILTERED = 1;
-    const PNG_COMPRESSION_HUFFMAN_ONLY = 2;
-    const PNG_COMPRESSION_RLE = 3;
-
-    const PNG_FILTER_NONE = 0;
-    const PNG_FILTER_SUB = 1;
-    const PNG_FILTER_UP = 2;
-    const PNG_FILTER_AVERAGE = 3;
-    const PNG_FILTER_PAETH = 4;
-
-    const PNG_INTERLACING_DISABLED = 0;
-    const PNG_INTERLACING_ENABLED = 1;
-
-    const PNG_CHANNEL_GRAY = 0;
-    const PNG_CHANNEL_RGB = 2;
-    const PNG_CHANNEL_INDEXED = 3;
-    const PNG_CHANNEL_GRAY_ALPHA = 4;
-    const PNG_CHANNEL_RGB_ALPHA = 6;
-
-  /**** Public Interface ****/
-
-
-  /* Factory Methods */
-
-    /**
-     * Returns a {@link Zend_Pdf_Resource_Image} object by file path.
-     *
-     * @param string $filePath Full path to the image file.
-     * @return Zend_Pdf_Resource_Image
-     * @throws Zend_Pdf_Exception
-     */
-    public static function imageWithPath($filePath)
-    {
-        /**
-         * use old implementation
-         * @todo switch to new implementation
-         */
-        require_once 'Zend/Pdf/Resource/ImageFactory.php';
-        return Zend_Pdf_Resource_ImageFactory::factory($filePath);
-
-
-        /* Create a file parser data source object for this file. File path and
-         * access permission checks are handled here.
-         */
-        require_once 'Zend/Pdf/FileParserDataSource/File.php';
-        $dataSource = new Zend_Pdf_FileParserDataSource_File($filePath);
-
-        /* Attempt to determine the type of image. We can't always trust file
-         * extensions, but try that first since it's fastest.
-         */
-        $fileExtension = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
-
-        /* If it turns out that the file is named improperly and we guess the
-         * wrong type, we'll get null instead of an image object.
-         */
-        switch ($fileExtension) {
-            case 'tif':
-                //Fall through to next case;
-            case 'tiff':
-                $image = Zend_Pdf_Image::_extractTiffImage($dataSource);
-                break;
-            case 'png':
-                $image = Zend_Pdf_Image::_extractPngImage($dataSource);
-                break;
-            case 'jpg':
-                //Fall through to next case;
-            case 'jpe':
-                //Fall through to next case;
-            case 'jpeg':
-                $image = Zend_Pdf_Image::_extractJpegImage($dataSource);
-                break;
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Cannot create image resource. File extension not known or unsupported type.");
-                break;
-        }
-
-        /* Done with the data source object.
-         */
-        $dataSource = null;
-
-        if ($image !== null) {
-            return $image;
-
-        } else {
-            /* The type of image could not be determined. Give up.
-             */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Cannot determine image type: $filePath",
-                                         Zend_Pdf_Exception::CANT_DETERMINE_IMAGE_TYPE);
-         }
-    }
-
-
-
-    /**** Internal Methods ****/
-
-
-    /* Image Extraction Methods */
-
-    /**
-     * Attempts to extract a JPEG Image from the data source.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @return Zend_Pdf_Resource_Image_Jpeg May also return null if
-     *   the data source does not appear to contain valid image data.
-     * @throws Zend_Pdf_Exception
-     */
-    protected static function _extractJpegImage($dataSource)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Jpeg image fileparser is not implemented. Old styly implementation has to be used.');
-
-        require_once 'Zend/Pdf/FileParser/Image/Jpeg.php';
-        $imageParser = new Zend_Pdf_FileParser_Image_Jpeg($dataSource);
-        require_once 'Zend/Pdf/Resource/Image/Jpeg.php';
-        $image = new Zend_Pdf_Resource_Image_Jpeg($imageParser);
-        unset($imageParser);
-
-        return $image;
-    }
-
-    /**
-     * Attempts to extract a PNG Image from the data source.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @return Zend_Pdf_Resource_Image_Png May also return null if
-     *   the data source does not appear to contain valid image data.
-     */
-    protected static function _extractPngImage($dataSource)
-    {
-        require_once 'Zend/Pdf/FileParser/Image/Png.php';
-        $imageParser = new Zend_Pdf_FileParser_Image_Png($dataSource);
-        require_once 'Zend/Pdf/Resource/Image/Png.php';
-        $image = new Zend_Pdf_Resource_Image_Png($imageParser);
-        unset($imageParser);
-
-        return $image;
-    }
-
-    /**
-     * Attempts to extract a TIFF Image from the data source.
-     *
-     * @param Zend_Pdf_FileParserDataSource $dataSource
-     * @return Zend_Pdf_Resource_Image_Tiff May also return null if
-     *   the data source does not appear to contain valid image data.
-     * @throws Zend_Pdf_Exception
-     */
-    protected static function _extractTiffImage($dataSource)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Tiff image fileparser is not implemented. Old styly implementation has to be used.');
-
-        require_once 'Zend/Pdf/FileParser/Image/Tiff.php';
-        $imageParser = new Zend_Pdf_FileParser_Image_Tiff($dataSource);
-        require_once 'Zend/Pdf/Resource/Image/Tiff.php';
-        $image = new Zend_Pdf_Resource_Image_Tiff($imageParser);
-        unset($imageParser);
-
-        return $image;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/NameTree.php b/airtime_mvc/library/Zend/Pdf/NameTree.php
deleted file mode 100644
index 7da529d92..000000000
--- a/airtime_mvc/library/Zend/Pdf/NameTree.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NameTree.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-
-
-/**
- * PDF name tree representation class
- *
- * @todo implement lazy resource loading so resources will be really loaded at access time
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_NameTree implements ArrayAccess, Iterator, Countable
-{
-    /**
-     * Elements
-     * Array of name => object tree entries
-     *
-     * @var array
-     */
-    protected $_items = array();
-
-    /**
-     * Object constructor
-     *
-     * @param $rootDictionary root of name dictionary
-     */
-    public function __construct(Zend_Pdf_Element $rootDictionary)
-    {
-        if ($rootDictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Name tree root must be a dictionary.');
-        }
-
-        $intermediateNodes = array();
-        $leafNodes         = array();
-        if ($rootDictionary->Kids !== null) {
-            $intermediateNodes[] = $rootDictionary;
-        } else {
-            $leafNodes[] = $rootDictionary;
-        }
-
-        while (count($intermediateNodes) != 0) {
-            $newIntermediateNodes = array();
-            foreach ($intermediateNodes as $node) {
-                foreach ($node->Kids->items as $childNode) {
-                    if ($childNode->Kids !== null) {
-                        $newIntermediateNodes[] = $childNode;
-                    } else {
-                        $leafNodes[] = $childNode;
-                    }
-                }
-            }
-            $intermediateNodes = $newIntermediateNodes;
-        }
-
-        foreach ($leafNodes as $leafNode) {
-            $destinationsCount = count($leafNode->Names->items)/2;
-            for ($count = 0; $count < $destinationsCount; $count++) {
-                $this->_items[$leafNode->Names->items[$count*2]->value] = $leafNode->Names->items[$count*2 + 1];
-            }
-        }
-    }
-
-    public function current()
-    {
-        return current($this->_items);
-    }
-
-
-    public function next()
-    {
-        return next($this->_items);
-    }
-
-
-    public function key()
-    {
-        return key($this->_items);
-    }
-
-
-    public function valid() {
-        return current($this->_items)!==false;
-    }
-
-
-    public function rewind()
-    {
-        reset($this->_items);
-    }
-
-
-    public function offsetExists($offset)
-    {
-        return array_key_exists($offset, $this->_items);
-    }
-
-
-    public function offsetGet($offset)
-    {
-        return $this->_items[$offset];
-    }
-
-
-    public function offsetSet($offset, $value)
-    {
-        if ($offset === null) {
-            $this->_items[]        = $value;
-        } else {
-            $this->_items[$offset] = $value;
-        }
-    }
-
-
-    public function offsetUnset($offset)
-    {
-        unset($this->_items[$offset]);
-    }
-
-
-    public function clear()
-    {
-        $this->_items = array();
-    }
-
-    public function count()
-    {
-        return count($this->_items);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Outline.php b/airtime_mvc/library/Zend/Pdf/Outline.php
deleted file mode 100644
index 328a9a067..000000000
--- a/airtime_mvc/library/Zend/Pdf/Outline.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Outline.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract PDF outline representation class
- *
- * @todo Implement an ability to associate an outline item with a structure element (PDF 1.3 feature)
- *
- * @package    Zend_Pdf
- * @subpackage Outlines
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Outline implements RecursiveIterator, Countable
-{
-    /**
-     * True if outline is open.
-     *
-     * @var boolean
-     */
-    protected $_open = false;
-
-    /**
-     * Array of child outlines (array of Zend_Pdf_Outline objects)
-     *
-     * @var array
-     */
-    public $childOutlines = array();
-
-
-    /**
-     * Get outline title.
-     *
-     * @return string
-     */
-    abstract public function getTitle();
-
-    /**
-     * Set outline title
-     *
-     * @param string $title
-     * @return Zend_Pdf_Outline
-     */
-    abstract public function setTitle($title);
-
-    /**
-     * Returns true if outline item is open by default
-     *
-     * @return boolean
-     */
-    public function isOpen()
-    {
-        return $this->_open;
-    }
-
-    /**
-     * Sets 'isOpen' outline flag
-     *
-     * @param boolean $isOpen
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsOpen($isOpen)
-    {
-        $this->_open = $isOpen;
-        return $this;
-    }
-
-    /**
-     * Returns true if outline item is displayed in italic
-     *
-     * @return boolean
-     */
-    abstract public function isItalic();
-
-    /**
-     * Sets 'isItalic' outline flag
-     *
-     * @param boolean $isItalic
-     * @return Zend_Pdf_Outline
-     */
-    abstract public function setIsItalic($isItalic);
-
-    /**
-     * Returns true if outline item is displayed in bold
-     *
-     * @return boolean
-     */
-    abstract public function isBold();
-
-    /**
-     * Sets 'isBold' outline flag
-     *
-     * @param boolean $isBold
-     * @return Zend_Pdf_Outline
-     */
-    abstract public function setIsBold($isBold);
-
-
-    /**
-     * Get outline text color.
-     *
-     * @return Zend_Pdf_Color_Rgb
-     */
-    abstract public function getColor();
-
-    /**
-     * Set outline text color.
-     * (null means default color which is black)
-     *
-     * @param Zend_Pdf_Color_Rgb $color
-     * @return Zend_Pdf_Outline
-     */
-    abstract public function setColor(Zend_Pdf_Color_Rgb $color);
-
-    /**
-     * Get outline target.
-     *
-     * @return Zend_Pdf_Target
-     */
-    abstract public function getTarget();
-
-    /**
-     * Set outline target.
-     * Null means no target
-     *
-     * @param Zend_Pdf_Target|string $target
-     * @return Zend_Pdf_Outline
-     */
-    abstract public function setTarget($target = null);
-
-    /**
-     * Get outline options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return array('title'  => $this->_title,
-                     'open'   => $this->_open,
-                     'color'  => $this->_color,
-                     'italic' => $this->_italic,
-                     'bold'   => $this->_bold,
-                     'target' => $this->_target);
-    }
-
-    /**
-     * Set outline options
-     *
-     * @param array $options
-     * @return Zend_Pdf_Action
-     * @throws Zend_Pdf_Exception
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            switch ($key) {
-                case 'title':
-                    $this->setTitle($value);
-                    break;
-
-                case 'open':
-                    $this->setIsOpen($value);
-                    break;
-
-                case 'color':
-                    $this->setColor($value);
-                    break;
-                case 'italic':
-                    $this->setIsItalic($value);
-                    break;
-
-                case 'bold':
-                    $this->setIsBold($value);
-                    break;
-
-                case 'target':
-                    $this->setTarget($value);
-                    break;
-
-                default:
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception("Unknown option name - '$key'.");
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Create new Outline object
-     *
-     * It provides two forms of input parameters:
-     *
-     * 1. Zend_Pdf_Outline::create(string $title[, Zend_Pdf_Target $target])
-     * 2. Zend_Pdf_Outline::create(array $options)
-     *
-     * Second form allows to provide outline options as an array.
-     * The followed options are supported:
-     *   'title'  - string, outline title, required
-     *   'open'   - boolean, true if outline entry is open (default value is false)
-     *   'color'  - Zend_Pdf_Color_Rgb object, true if outline entry is open (default value is null - black)
-     *   'italic' - boolean, true if outline entry is displayed in italic (default value is false)
-     *   'bold'   - boolean, true if outline entry is displayed in bold (default value is false)
-     *   'target' - Zend_Pdf_Target object or string, outline item destination
-     *
-     * @return Zend_Pdf_Outline
-     * @throws Zend_Pdf_Exception
-     */
-    public static function create($param1, $param2 = null)
-    {
-        require_once 'Zend/Pdf/Outline/Created.php';
-        if (is_string($param1)) {
-            if ($param2 !== null  &&  !($param2 instanceof Zend_Pdf_Target  ||  is_string($param2))) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outline create method takes $title (string) and $target (Zend_Pdf_Target or string) or an array as an input');
-            }
-
-            return new Zend_Pdf_Outline_Created(array('title'  => $param1,
-                                                      'target' => $param2));
-        } else {
-            if (!is_array($param1)  ||  $param2 !== null) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outline create method takes $title (string) and $destination (Zend_Pdf_Destination) or an array as an input');
-            }
-
-            return new Zend_Pdf_Outline_Created($param1);
-        }
-    }
-
-    /**
-     * Returns number of the total number of open items at all levels of the outline.
-     *
-     * @internal
-     * @return integer
-     */
-    public function openOutlinesCount()
-    {
-        $count = 1; // Include this outline
-
-        if ($this->isOpen()) {
-            foreach ($this->childOutlines as $child) {
-                $count += $child->openOutlinesCount();
-            }
-        }
-
-        return $count;
-    }
-
-    /**
-     * Dump Outline and its child outlines into PDF structures
-     *
-     * Returns dictionary indirect object or reference
-     *
-     * @param Zend_Pdf_ElementFactory    $factory object factory for newly created indirect objects
-     * @param boolean $updateNavigation  Update navigation flag
-     * @param Zend_Pdf_Element $parent   Parent outline dictionary reference
-     * @param Zend_Pdf_Element $prev     Previous outline dictionary reference
-     * @param SplObjectStorage $processedOutlines  List of already processed outlines
-     * @return Zend_Pdf_Element
-     */
-    abstract public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory,
-                                                                           $updateNavigation,
-                                                          Zend_Pdf_Element $parent,
-                                                          Zend_Pdf_Element $prev = null,
-                                                          SplObjectStorage $processedOutlines = null);
-
-
-    ////////////////////////////////////////////////////////////////////////
-    //  RecursiveIterator interface methods
-    //////////////
-
-    /**
-     * Returns the child outline.
-     *
-     * @return Zend_Pdf_Outline
-     */
-    public function current()
-    {
-        return current($this->childOutlines);
-    }
-
-    /**
-     * Returns current iterator key
-     *
-     * @return integer
-     */
-    public function key()
-    {
-        return key($this->childOutlines);
-    }
-
-    /**
-     * Go to next child
-     */
-    public function next()
-    {
-        return next($this->childOutlines);
-    }
-
-    /**
-     * Rewind children
-     */
-    public function rewind()
-    {
-        return reset($this->childOutlines);
-    }
-
-    /**
-     * Check if current position is valid
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return current($this->childOutlines) !== false;
-    }
-
-    /**
-     * Returns the child outline.
-     *
-     * @return Zend_Pdf_Outline|null
-     */
-    public function getChildren()
-    {
-        return current($this->childOutlines);
-    }
-
-    /**
-     * Implements RecursiveIterator interface.
-     *
-     * @return bool  whether container has any pages
-     */
-    public function hasChildren()
-    {
-        return count($this->childOutlines) > 0;
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////
-    //  Countable interface methods
-    //////////////
-
-    /**
-     * count()
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->childOutlines);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Outline/Created.php b/airtime_mvc/library/Zend/Pdf/Outline/Created.php
deleted file mode 100644
index b7ae42dd2..000000000
--- a/airtime_mvc/library/Zend/Pdf/Outline/Created.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Created.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Outline */
-require_once 'Zend/Pdf/Outline.php';
-
-/**
- * PDF outline representation class
- *
- * @todo Implement an ability to associate an outline item with a structure element (PDF 1.3 feature)
- *
- * @package    Zend_Pdf
- * @subpackage Outlines
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Outline_Created extends Zend_Pdf_Outline
-{
-    /**
-     * Outline title.
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Color to be used for the outline entry’s text.
-
-     * It uses the DeviceRGB color space for color representation.
-     * Null means default value - black ([0.0 0.0 0.0] in RGB representation).
-     *
-     * @var Zend_Pdf_Color_Rgb
-     */
-    protected $_color = null;
-
-    /**
-     * True if outline item is displayed in italic.
-     * Default value is false.
-     *
-     * @var boolean
-     */
-    protected $_italic = false;
-
-    /**
-     * True if outline item is displayed in bold.
-     * Default value is false.
-     *
-     * @var boolean
-     */
-    protected $_bold = false;
-
-    /**
-     * Target destination or action.
-     * String means named destination
-     *
-     * Null means no target.
-     *
-     * @var Zend_Pdf_Destination|Zend_Pdf_Action
-     */
-    protected $_target = null;
-
-
-    /**
-     * Get outline title.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Set outline title
-     *
-     * @param string $title
-     * @return Zend_Pdf_Outline
-     */
-    public function setTitle($title)
-    {
-        $this->_title = $title;
-        return $this;
-    }
-
-    /**
-     * Returns true if outline item is displayed in italic
-     *
-     * @return boolean
-     */
-    public function isItalic()
-    {
-        return $this->_italic;
-    }
-
-    /**
-     * Sets 'isItalic' outline flag
-     *
-     * @param boolean $isItalic
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsItalic($isItalic)
-    {
-        $this->_italic = $isItalic;
-        return $this;
-    }
-
-    /**
-     * Returns true if outline item is displayed in bold
-     *
-     * @return boolean
-     */
-    public function isBold()
-    {
-        return $this->_bold;
-    }
-
-    /**
-     * Sets 'isBold' outline flag
-     *
-     * @param boolean $isBold
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsBold($isBold)
-    {
-        $this->_bold = $isBold;
-        return $this;
-    }
-
-
-    /**
-     * Get outline text color.
-     *
-     * @return Zend_Pdf_Color_Rgb
-     */
-    public function getColor()
-    {
-        return $this->_color;
-    }
-
-    /**
-     * Set outline text color.
-     * (null means default color which is black)
-     *
-     * @param Zend_Pdf_Color_Rgb $color
-     * @return Zend_Pdf_Outline
-     */
-    public function setColor(Zend_Pdf_Color_Rgb $color)
-    {
-        $this->_color = $color;
-        return $this;
-    }
-
-    /**
-     * Get outline target.
-     *
-     * @return Zend_Pdf_Target
-     */
-    public function getTarget()
-    {
-        return $this->_target;
-    }
-
-    /**
-     * Set outline target.
-     * Null means no target
-     *
-     * @param Zend_Pdf_Target|string $target
-     * @return Zend_Pdf_Outline
-     * @throws Zend_Pdf_Exception
-     */
-    public function setTarget($target = null)
-    {
-        if (is_string($target)) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            $target = new Zend_Pdf_Destination_Named($target);
-        }
-
-        if ($target === null  ||  $target instanceof Zend_Pdf_Target) {
-            $this->_target = $target;
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Outline target has to be Zend_Pdf_Destination or Zend_Pdf_Action object or string');
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * Object constructor
-     *
-     * @param array $options
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($options = array())
-    {
-        if (!isset($options['title'])) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Title parameter is required.');
-        }
-
-        $this->setOptions($options);
-    }
-
-    /**
-     * Dump Outline and its child outlines into PDF structures
-     *
-     * Returns dictionary indirect object or reference
-     *
-     * @internal
-     * @param Zend_Pdf_ElementFactory    $factory object factory for newly created indirect objects
-     * @param boolean $updateNavigation  Update navigation flag
-     * @param Zend_Pdf_Element $parent   Parent outline dictionary reference
-     * @param Zend_Pdf_Element $prev     Previous outline dictionary reference
-     * @param SplObjectStorage $processedOutlines  List of already processed outlines
-     * @return Zend_Pdf_Element
-     * @throws Zend_Pdf_Exception
-     */
-    public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory,
-                                                                  $updateNavigation,
-                                                 Zend_Pdf_Element $parent,
-                                                 Zend_Pdf_Element $prev = null,
-                                                 SplObjectStorage $processedOutlines = null)
-    {
-        if ($processedOutlines === null) {
-            $processedOutlines = new SplObjectStorage();
-        }
-        $processedOutlines->attach($this);
-
-        $outlineDictionary = $factory->newObject(new Zend_Pdf_Element_Dictionary());
-
-        $outlineDictionary->Title = new Zend_Pdf_Element_String($this->getTitle());
-
-        $target = $this->getTarget();
-        if ($target === null) {
-            // Do nothing
-        } else if ($target instanceof Zend_Pdf_Destination) {
-            $outlineDictionary->Dest = $target->getResource();
-        } else if ($target instanceof Zend_Pdf_Action) {
-            $outlineDictionary->A    = $target->getResource();
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Outline target has to be Zend_Pdf_Destination, Zend_Pdf_Action object or null');
-        }
-
-        $color = $this->getColor();
-        if ($color !== null) {
-            $components = $color->getComponents();
-            $colorComponentElements = array(new Zend_Pdf_Element_Numeric($components[0]),
-                                            new Zend_Pdf_Element_Numeric($components[1]),
-                                            new Zend_Pdf_Element_Numeric($components[2]));
-            $outlineDictionary->C = new Zend_Pdf_Element_Array($colorComponentElements);
-        }
-
-        if ($this->isItalic()  ||  $this->isBold()) {
-            $outlineDictionary->F = new Zend_Pdf_Element_Numeric(($this->isItalic()? 1 : 0)  |   // Bit 1 - Italic
-                                                                 ($this->isBold()?   2 : 0));    // Bit 2 - Bold
-        }
-
-
-        $outlineDictionary->Parent = $parent;
-        $outlineDictionary->Prev   = $prev;
-
-        $lastChild = null;
-        foreach ($this->childOutlines as $childOutline) {
-            if ($processedOutlines->contains($childOutline)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outlines cyclyc reference is detected.');
-            }
-
-            if ($lastChild === null) {
-                $lastChild = $childOutline->dumpOutline($factory, true, $outlineDictionary, null, $processedOutlines);
-                $outlineDictionary->First = $lastChild;
-            } else {
-                $childOutlineDictionary = $childOutline->dumpOutline($factory, true, $outlineDictionary, $lastChild, $processedOutlines);
-                $lastChild->Next = $childOutlineDictionary;
-                $lastChild       = $childOutlineDictionary;
-            }
-        }
-        $outlineDictionary->Last = $lastChild;
-
-        if (count($this->childOutlines) != 0) {
-            $outlineDictionary->Count = new Zend_Pdf_Element_Numeric(($this->isOpen()? 1 : -1)*count($this->childOutlines));
-        }
-
-        return $outlineDictionary;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Outline/Loaded.php b/airtime_mvc/library/Zend/Pdf/Outline/Loaded.php
deleted file mode 100644
index 5558756fe..000000000
--- a/airtime_mvc/library/Zend/Pdf/Outline/Loaded.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Loaded.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Outline */
-require_once 'Zend/Pdf/Outline.php';
-
-/**
- * Traceable PDF outline representation class
- *
- * Instances of this class trace object update uperations. That allows to avoid outlines PDF tree update
- * which should be performed at each document update otherwise.
- *
- * @package    Zend_Pdf
- * @subpackage Outlines
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Outline_Loaded extends Zend_Pdf_Outline
-{
-    /**
-     * Outline dictionary object
-     *
-     * @var Zend_Pdf_Element_Dictionary|Zend_Pdf_Element_Object|Zend_Pdf_Element_Reference
-     */
-    protected $_outlineDictionary;
-
-    /**
-     * original array of child outlines
-     *
-     * @var array
-     */
-    protected $_originalChildOutlines = array();
-
-    /**
-     * Get outline title.
-     *
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function getTitle()
-    {
-        if ($this->_outlineDictionary->Title === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Outline dictionary Title entry is required.');
-        }
-        return $this->_outlineDictionary->Title->value;
-    }
-
-    /**
-     * Set outline title
-     *
-     * @param string $title
-     * @return Zend_Pdf_Outline
-     */
-    public function setTitle($title)
-    {
-        $this->_outlineDictionary->Title->touch();
-        $this->_outlineDictionary->Title = new Zend_Pdf_Element_String($title);
-        return $this;
-    }
-
-    /**
-     * Sets 'isOpen' outline flag
-     *
-     * @param boolean $isOpen
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsOpen($isOpen)
-    {
-        parent::setIsOpen($isOpen);
-
-        if ($this->_outlineDictionary->Count === null) {
-            // Do Nothing.
-            return this;
-        }
-
-        $childrenCount = $this->_outlineDictionary->Count->value;
-        $isOpenCurrentState = ($childrenCount > 0);
-        if ($isOpen != $isOpenCurrentState) {
-            $this->_outlineDictionary->Count->touch();
-            $this->_outlineDictionary->Count->value = ($isOpen? 1 : -1)*abs($childrenCount);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns true if outline item is displayed in italic
-     *
-     * @return boolean
-     */
-    public function isItalic()
-    {
-        if ($this->_outlineDictionary->F === null) {
-            return false;
-        }
-        return $this->_outlineDictionary->F->value & 1;
-    }
-
-    /**
-     * Sets 'isItalic' outline flag
-     *
-     * @param boolean $isItalic
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsItalic($isItalic)
-    {
-        if ($this->_outlineDictionary->F === null) {
-            $this->_outlineDictionary->touch();
-            $this->_outlineDictionary->F = new Zend_Pdf_Element_Numeric($isItalic? 1 : 0);
-        } else {
-            $this->_outlineDictionary->F->touch();
-            if ($isItalic) {
-                $this->_outlineDictionary->F->value = $this->_outlineDictionary->F->value | 1;
-            } else {
-                $this->_outlineDictionary->F->value = $this->_outlineDictionary->F->value | ~1;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns true if outline item is displayed in bold
-     *
-     * @return boolean
-     */
-    public function isBold()
-    {
-        if ($this->_outlineDictionary->F === null) {
-            return false;
-        }
-        return $this->_outlineDictionary->F->value & 2;
-    }
-
-    /**
-     * Sets 'isBold' outline flag
-     *
-     * @param boolean $isBold
-     * @return Zend_Pdf_Outline
-     */
-    public function setIsBold($isBold)
-    {
-        if ($this->_outlineDictionary->F === null) {
-            $this->_outlineDictionary->touch();
-            $this->_outlineDictionary->F = new Zend_Pdf_Element_Numeric($isBold? 2 : 0);
-        } else {
-            $this->_outlineDictionary->F->touch();
-            if ($isBold) {
-                $this->_outlineDictionary->F->value = $this->_outlineDictionary->F->value | 2;
-            } else {
-                $this->_outlineDictionary->F->value = $this->_outlineDictionary->F->value | ~2;
-            }
-        }
-        return $this;
-    }
-
-
-    /**
-     * Get outline text color.
-     *
-     * @return Zend_Pdf_Color_Rgb
-     */
-    public function getColor()
-    {
-        if ($this->_outlineDictionary->C === null) {
-            return null;
-        }
-
-        $components = $this->_outlineDictionary->C->items;
-
-        require_once 'Zend/Pdf/Color/Rgb.php';
-        return new Zend_Pdf_Color_Rgb($components[0], $components[1], $components[2]);
-    }
-
-    /**
-     * Set outline text color.
-     * (null means default color which is black)
-     *
-     * @param Zend_Pdf_Color_Rgb $color
-     * @return Zend_Pdf_Outline
-     */
-    public function setColor(Zend_Pdf_Color_Rgb $color)
-    {
-        $this->_outlineDictionary->touch();
-
-        if ($color === null) {
-            $this->_outlineDictionary->C = null;
-        } else {
-            $components = $color->getComponents();
-            $colorComponentElements = array(new Zend_Pdf_Element_Numeric($components[0]),
-                                            new Zend_Pdf_Element_Numeric($components[1]),
-                                            new Zend_Pdf_Element_Numeric($components[2]));
-            $this->_outlineDictionary->C = new Zend_Pdf_Element_Array($colorComponentElements);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get outline target.
-     *
-     * @return Zend_Pdf_Target
-     * @throws Zend_Pdf_Exception
-     */
-    public function getTarget()
-    {
-        if ($this->_outlineDictionary->Dest !== null) {
-            if ($this->_outlineDictionary->A !== null) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outline dictionary may contain Dest or A entry, but not both.');
-            }
-
-            require_once 'Zend/Pdf/Destination.php';
-            return Zend_Pdf_Destination::load($this->_outlineDictionary->Dest);
-        } else if ($this->_outlineDictionary->A !== null) {
-            require_once 'Zend/Pdf/Action.php';
-            return Zend_Pdf_Action::load($this->_outlineDictionary->A);
-        }
-
-        return null;
-    }
-
-    /**
-     * Set outline target.
-     * Null means no target
-     *
-     * @param Zend_Pdf_Target|string $target
-     * @return Zend_Pdf_Outline
-     * @throws Zend_Pdf_Exception
-     */
-    public function setTarget($target = null)
-    {
-        $this->_outlineDictionary->touch();
-
-        if (is_string($target)) {
-            require_once 'Zend/Pdf/Destination/Named.php';
-            $target = Zend_Pdf_Destination_Named::create($target);
-        }
-
-        if ($target === null) {
-            $this->_outlineDictionary->Dest = null;
-            $this->_outlineDictionary->A    = null;
-        } else if ($target instanceof Zend_Pdf_Destination) {
-            $this->_outlineDictionary->Dest = $target->getResource();
-            $this->_outlineDictionary->A    = null;
-        } else if ($target instanceof Zend_Pdf_Action) {
-            $this->_outlineDictionary->Dest = null;
-            $this->_outlineDictionary->A    = $target->getResource();
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Outline target has to be Zend_Pdf_Destination or Zend_Pdf_Action object or string');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set outline options
-     *
-     * @param array $options
-     * @return Zend_Pdf_Actions_Traceable
-     * @throws Zend_Pdf_Exception
-     */
-    public function setOptions(array $options)
-    {
-        parent::setOptions($options);
-
-        return $this;
-    }
-
-
-
-    /**
-     * Create PDF outline object using specified dictionary
-     *
-     * @internal
-     * @param Zend_Pdf_Element $dictionary (It's actually Dictionary or Dictionary Object or Reference to a Dictionary Object)
-     * @param Zend_Pdf_Action  $parentAction
-     * @param SplObjectStorage $processedOutlines  List of already processed Outline dictionaries,
-     *                                             used to avoid cyclic references
-     * @return Zend_Pdf_Action
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_Element $dictionary, SplObjectStorage $processedDictionaries = null)
-    {
-        if ($dictionary->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('$dictionary mast be an indirect dictionary object.');
-        }
-
-        if ($processedDictionaries === null) {
-            $processedDictionaries = new SplObjectStorage();
-        }
-        $processedDictionaries->attach($dictionary);
-
-        $this->_outlineDictionary = $dictionary;
-
-        if ($dictionary->Count !== null) {
-            if ($dictionary->Count->getType() != Zend_Pdf_Element::TYPE_NUMERIC) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outline dictionary Count entry must be a numeric element.');
-            }
-
-            $childOutlinesCount = $dictionary->Count->value;
-            if ($childOutlinesCount > 0) {
-                $this->_open = true;
-            }
-            $childOutlinesCount = abs($childOutlinesCount);
-
-            $childDictionary = $dictionary->First;
-            for ($count = 0; $count < $childOutlinesCount; $count++) {
-                if ($childDictionary === null) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Outline childs load error.');
-                }
-
-                if (!$processedDictionaries->contains($childDictionary)) {
-                    $this->childOutlines[] = new Zend_Pdf_Outline_Loaded($childDictionary, $processedDictionaries);
-                }
-
-                $childDictionary = $childDictionary->Next;
-            }
-
-            if ($childDictionary !== null) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Outline childs load error.');
-            }
-
-            $this->_originalChildOutlines = $this->childOutlines;
-        }
-    }
-
-    /**
-     * Dump Outline and its child outlines into PDF structures
-     *
-     * Returns dictionary indirect object or reference
-     *
-     * @internal
-     * @param Zend_Pdf_ElementFactory    $factory object factory for newly created indirect objects
-     * @param boolean $updateNavigation  Update navigation flag
-     * @param Zend_Pdf_Element $parent   Parent outline dictionary reference
-     * @param Zend_Pdf_Element $prev     Previous outline dictionary reference
-     * @param SplObjectStorage $processedOutlines  List of already processed outlines
-     * @return Zend_Pdf_Element
-     * @throws Zend_Pdf_Exception
-     */
-    public function dumpOutline(Zend_Pdf_ElementFactory_Interface $factory,
-                                                                  $updateNavigation,
-                                                 Zend_Pdf_Element $parent,
-                                                 Zend_Pdf_Element $prev = null,
-                                                 SplObjectStorage $processedOutlines = null)
-    {
-        if ($processedOutlines === null) {
-            $processedOutlines = new SplObjectStorage();
-        }
-        $processedOutlines->attach($this);
-
-        if ($updateNavigation) {
-            $this->_outlineDictionary->touch();
-
-            $this->_outlineDictionary->Parent = $parent;
-            $this->_outlineDictionary->Prev   = $prev;
-            $this->_outlineDictionary->Next   = null;
-        }
-
-        $updateChildNavigation = false;
-        if (count($this->_originalChildOutlines) != count($this->childOutlines)) {
-            // If original and current children arrays have different size then children list was updated
-            $updateChildNavigation = true;
-        } else if ( !(array_keys($this->_originalChildOutlines) === array_keys($this->childOutlines)) ) {
-            // If original and current children arrays have different keys (with a glance to an order) then children list was updated
-            $updateChildNavigation = true;
-        } else {
-            foreach ($this->childOutlines as $key => $childOutline) {
-                if ($this->_originalChildOutlines[$key] !== $childOutline) {
-                    $updateChildNavigation = true;
-                    break;
-                }
-            }
-        }
-
-        $lastChild = null;
-        if ($updateChildNavigation) {
-            $this->_outlineDictionary->touch();
-            $this->_outlineDictionary->First = null;
-
-            foreach ($this->childOutlines as $childOutline) {
-                if ($processedOutlines->contains($childOutline)) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Outlines cyclyc reference is detected.');
-                }
-
-                if ($lastChild === null) {
-                    // First pass. Update Outlines dictionary First entry using corresponding value
-                    $lastChild = $childOutline->dumpOutline($factory, $updateChildNavigation, $this->_outlineDictionary, null, $processedOutlines);
-                    $this->_outlineDictionary->First = $lastChild;
-                } else {
-                    // Update previous outline dictionary Next entry (Prev is updated within dumpOutline() method)
-                    $childOutlineDictionary = $childOutline->dumpOutline($factory, $updateChildNavigation, $this->_outlineDictionary, $lastChild, $processedOutlines);
-                    $lastChild->Next = $childOutlineDictionary;
-                    $lastChild       = $childOutlineDictionary;
-                }
-            }
-
-            $this->_outlineDictionary->Last  = $lastChild;
-
-            if (count($this->childOutlines) != 0) {
-                $this->_outlineDictionary->Count = new Zend_Pdf_Element_Numeric(($this->isOpen()? 1 : -1)*count($this->childOutlines));
-            } else {
-                $this->_outlineDictionary->Count = null;
-            }
-        } else {
-            foreach ($this->childOutlines as $childOutline) {
-                if ($processedOutlines->contains($childOutline)) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception('Outlines cyclyc reference is detected.');
-                }
-                $lastChild = $childOutline->dumpOutline($factory, $updateChildNavigation, $this->_outlineDictionary, $lastChild, $processedOutlines);
-            }
-        }
-
-        return $this->_outlineDictionary;
-    }
-
-    public function dump($level = 0)
-    {
-        printf(":%3d:%s:%s:%s%s  :\n", count($this->childOutlines),$this->isItalic()? 'i':' ', $this->isBold()? 'b':' ', str_pad('', 4*$level), $this->getTitle());
-
-        if ($this->isOpen()  ||  true) {
-            foreach ($this->childOutlines as $child) {
-                $child->dump($level + 1);
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Page.php b/airtime_mvc/library/Zend/Pdf/Page.php
deleted file mode 100644
index a42146890..000000000
--- a/airtime_mvc/library/Zend/Pdf/Page.php
+++ /dev/null
@@ -1,1781 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Page.php 20470 2010-01-21 16:10:42Z alexander $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/String/Binary.php';
-require_once 'Zend/Pdf/Element/Boolean.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Null.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/**
- * PDF Page
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Page
-{
-  /**** Class Constants ****/
-
-
-  /* Page Sizes */
-
-    /**
-     * Size representing an A4 page in portrait (tall) orientation.
-     */
-    const SIZE_A4                = '595:842:';
-
-    /**
-     * Size representing an A4 page in landscape (wide) orientation.
-     */
-    const SIZE_A4_LANDSCAPE      = '842:595:';
-
-    /**
-     * Size representing a US Letter page in portrait (tall) orientation.
-     */
-    const SIZE_LETTER            = '612:792:';
-
-    /**
-     * Size representing a US Letter page in landscape (wide) orientation.
-     */
-    const SIZE_LETTER_LANDSCAPE  = '792:612:';
-
-
-  /* Shape Drawing */
-
-    /**
-     * Stroke the path only. Do not fill.
-     */
-    const SHAPE_DRAW_STROKE      = 0;
-
-    /**
-     * Fill the path only. Do not stroke.
-     */
-    const SHAPE_DRAW_FILL        = 1;
-
-    /**
-     * Fill and stroke the path.
-     */
-    const SHAPE_DRAW_FILL_AND_STROKE = 2;
-
-
-  /* Shape Filling Methods */
-
-    /**
-     * Fill the path using the non-zero winding rule.
-     */
-    const FILL_METHOD_NON_ZERO_WINDING = 0;
-
-    /**
-     * Fill the path using the even-odd rule.
-     */
-    const FILL_METHOD_EVEN_ODD        = 1;
-
-
-  /* Line Dash Types */
-
-    /**
-     * Solid line dash.
-     */
-    const LINE_DASHING_SOLID = 0;
-
-
-
-    /**
-     * Page dictionary (refers to an inderect Zend_Pdf_Element_Dictionary object).
-     *
-     * @var Zend_Pdf_Element_Reference|Zend_Pdf_Element_Object
-     */
-    protected $_pageDictionary;
-
-    /**
-     * PDF objects factory.
-     *
-     * @var Zend_Pdf_ElementFactory_Interface
-     */
-    protected $_objFactory = null;
-
-    /**
-     * Flag which signals, that page is created separately from any PDF document or
-     * attached to anyone.
-     *
-     * @var boolean
-     */
-    protected $_attached;
-
-    /**
-     * Stream of the drawing instructions.
-     *
-     * @var string
-     */
-    protected $_contents = '';
-
-    /**
-     * Current style
-     *
-     * @var Zend_Pdf_Style
-     */
-    protected $_style = null;
-
-    /**
-     * Counter for the "Save" operations
-     *
-     * @var integer
-     */
-    protected $_saveCount = 0;
-
-    /**
-     * Safe Graphics State semafore
-     *
-     * If it's false, than we can't be sure Graphics State is restored withing
-     * context of previous contents stream (ex. drawing coordinate system may be rotated).
-     * We should encompass existing content with save/restore GS operators
-     *
-     * @var boolean
-     */
-    protected $_safeGS;
-
-    /**
-     * Current font
-     *
-     * @var Zend_Pdf_Resource_Font
-     */
-    protected $_font = null;
-
-    /**
-     * Current font size
-     *
-     * @var float
-     */
-    protected $_fontSize;
-
-    /**
-     * Object constructor.
-     * Constructor signatures:
-     *
-     * 1. Load PDF page from a parsed PDF file.
-     *    Object factory is created by PDF parser.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(Zend_Pdf_Element_Dictionary       $pageDict,
-     *                   Zend_Pdf_ElementFactory_Interface $factory);
-     * ---------------------------------------------------------
-     *
-     * 2. Clone PDF page.
-     *    New page is created in the same context as source page. Object factory is shared.
-     *    Thus it will be attached to the document, but need to be placed into Zend_Pdf::$pages array
-     *    to be included into output.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(Zend_Pdf_Page $page);
-     * ---------------------------------------------------------
-     *
-     * 3. Create new page with a specified pagesize.
-     *    If $factory is null then it will be created and page must be attached to the document to be
-     *    included into output.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(string $pagesize, Zend_Pdf_ElementFactory_Interface $factory = null);
-     * ---------------------------------------------------------
-     *
-     * 4. Create new page with a specified pagesize (in default user space units).
-     *    If $factory is null then it will be created and page must be attached to the document to be
-     *    included into output.
-     * ---------------------------------------------------------
-     * new Zend_Pdf_Page(numeric $width, numeric $height, Zend_Pdf_ElementFactory_Interface $factory = null);
-     * ---------------------------------------------------------
-     *
-     *
-     * @param mixed $param1
-     * @param mixed $param2
-     * @param mixed $param3
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($param1, $param2 = null, $param3 = null)
-    {
-        if ($param1 instanceof Zend_Pdf_Element_Reference &&
-            $param1->getType() == Zend_Pdf_Element::TYPE_DICTIONARY &&
-            $param2 instanceof Zend_Pdf_ElementFactory_Interface &&
-            $param3 === null
-           ) {
-            $this->_pageDictionary = $param1;
-            $this->_objFactory     = $param2;
-            $this->_attached       = true;
-            $this->_safeGS         = false;
-
-            return;
-
-        } else if ($param1 instanceof Zend_Pdf_Page && $param2 === null && $param3 === null) {
-            // Clone existing page.
-            // Let already existing content and resources to be shared between pages
-            // We don't give existing content modification functionality, so we don't need "deep copy"
-            $this->_objFactory = $param1->_objFactory;
-            $this->_attached   = &$param1->_attached;
-            $this->_safeGS     = false;
-
-            $this->_pageDictionary = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-
-            foreach ($param1->_pageDictionary->getKeys() as $key) {
-                if ($key == 'Contents') {
-                    // Clone Contents property
-
-                    $this->_pageDictionary->Contents = new Zend_Pdf_Element_Array();
-
-                    if ($param1->_pageDictionary->Contents->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-                        // Prepare array of content streams and add existing stream
-                        $this->_pageDictionary->Contents->items[] = $param1->_pageDictionary->Contents;
-                    } else {
-                        // Clone array of the content streams
-                        foreach ($param1->_pageDictionary->Contents->items as $srcContentStream) {
-                            $this->_pageDictionary->Contents->items[] = $srcContentStream;
-                        }
-                    }
-                } else {
-                    $this->_pageDictionary->$key = $param1->_pageDictionary->$key;
-                }
-            }
-
-            return;
-        } else if (is_string($param1) &&
-                   ($param2 === null || $param2 instanceof Zend_Pdf_ElementFactory_Interface) &&
-                   $param3 === null) {
-            if ($param2 !== null) {
-                $this->_objFactory = $param2;
-            } else {
-                require_once 'Zend/Pdf/ElementFactory.php';
-                $this->_objFactory = Zend_Pdf_ElementFactory::createFactory(1);
-            }
-            $this->_attached   = false;
-            $this->_safeGS     = true; /** New page created. That's users App responsibility to track GS changes */
-
-            switch (strtolower($param1)) {
-                case 'a4':
-                    $param1 = Zend_Pdf_Page::SIZE_A4;
-                    break;
-                case 'a4-landscape':
-                    $param1 = Zend_Pdf_Page::SIZE_A4_LANDSCAPE;
-                    break;
-                case 'letter':
-                    $param1 = Zend_Pdf_Page::SIZE_LETTER;
-                    break;
-                case 'letter-landscape':
-                    $param1 = Zend_Pdf_Page::SIZE_LETTER_LANDSCAPE;
-                    break;
-                default:
-                    // should be in "x:y" or "x:y:" form
-            }
-
-            $pageDim = explode(':', $param1);
-            if(count($pageDim) == 2  ||  count($pageDim) == 3) {
-                $pageWidth  = $pageDim[0];
-                $pageHeight = $pageDim[1];
-            } else {
-                /**
-                 * @todo support of user defined pagesize notations, like:
-                 *       "210x297mm", "595x842", "8.5x11in", "612x792"
-                 */
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Wrong pagesize notation.');
-            }
-            /**
-             * @todo support of pagesize recalculation to "default user space units"
-             */
-
-        } else if (is_numeric($param1) && is_numeric($param2) &&
-                   ($param3 === null || $param3 instanceof Zend_Pdf_ElementFactory_Interface)) {
-            if ($param3 !== null) {
-                $this->_objFactory = $param3;
-            } else {
-                require_once 'Zend/Pdf/ElementFactory.php';
-                $this->_objFactory = Zend_Pdf_ElementFactory::createFactory(1);
-            }
-
-            $this->_attached = false;
-            $this->_safeGS   = true; /** New page created. That's users App responsibility to track GS changes */
-            $pageWidth  = $param1;
-            $pageHeight = $param2;
-
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Unrecognized method signature, wrong number of arguments or wrong argument types.');
-        }
-
-        $this->_pageDictionary = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary());
-        $this->_pageDictionary->Type         = new Zend_Pdf_Element_Name('Page');
-        require_once 'Zend/Pdf.php';
-        $this->_pageDictionary->LastModified = new Zend_Pdf_Element_String(Zend_Pdf::pdfDate());
-        $this->_pageDictionary->Resources    = new Zend_Pdf_Element_Dictionary();
-        $this->_pageDictionary->MediaBox     = new Zend_Pdf_Element_Array();
-        $this->_pageDictionary->MediaBox->items[] = new Zend_Pdf_Element_Numeric(0);
-        $this->_pageDictionary->MediaBox->items[] = new Zend_Pdf_Element_Numeric(0);
-        $this->_pageDictionary->MediaBox->items[] = new Zend_Pdf_Element_Numeric($pageWidth);
-        $this->_pageDictionary->MediaBox->items[] = new Zend_Pdf_Element_Numeric($pageHeight);
-        $this->_pageDictionary->Contents     = new Zend_Pdf_Element_Array();
-    }
-
-
-    /**
-     * Clone operator
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function __clone()
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Cloning Zend_Pdf_Page object using \'clone\' keyword is not supported. Use \'new Zend_Pdf_Page($srcPage)\' syntax');
-    }
-
-    /**
-     * Attach resource to the page
-     *
-     * @param string $type
-     * @param Zend_Pdf_Resource $resource
-     * @return string
-     */
-    protected function _attachResource($type, Zend_Pdf_Resource $resource)
-    {
-        // Check that Resources dictionary contains appropriate resource set
-        if ($this->_pageDictionary->Resources->$type === null) {
-            $this->_pageDictionary->Resources->touch();
-            $this->_pageDictionary->Resources->$type = new Zend_Pdf_Element_Dictionary();
-        } else {
-            $this->_pageDictionary->Resources->$type->touch();
-        }
-
-        // Check, that resource is already attached to resource set.
-        $resObject = $resource->getResource();
-        foreach ($this->_pageDictionary->Resources->$type->getKeys() as $ResID) {
-            if ($this->_pageDictionary->Resources->$type->$ResID === $resObject) {
-                return $ResID;
-            }
-        }
-
-        $idCounter = 1;
-        do {
-            $newResName = $type[0] . $idCounter++;
-        } while ($this->_pageDictionary->Resources->$type->$newResName !== null);
-
-        $this->_pageDictionary->Resources->$type->$newResName = $resObject;
-        $this->_objFactory->attach($resource->getFactory());
-
-        return $newResName;
-    }
-
-    /**
-     * Add procedureSet to the Page description
-     *
-     * @param string $procSetName
-     */
-    protected function _addProcSet($procSetName)
-    {
-        // Check that Resources dictionary contains ProcSet entry
-        if ($this->_pageDictionary->Resources->ProcSet === null) {
-            $this->_pageDictionary->Resources->touch();
-            $this->_pageDictionary->Resources->ProcSet = new Zend_Pdf_Element_Array();
-        } else {
-            $this->_pageDictionary->Resources->ProcSet->touch();
-        }
-
-        foreach ($this->_pageDictionary->Resources->ProcSet->items as $procSetEntry) {
-            if ($procSetEntry->value == $procSetName) {
-                // Procset is already included into a ProcSet array
-                return;
-            }
-        }
-
-        $this->_pageDictionary->Resources->ProcSet->items[] = new Zend_Pdf_Element_Name($procSetName);
-    }
-
-    /**
-     * Retrive PDF file reference to the page
-     *
-     * @internal
-     * @return Zend_Pdf_Element_Dictionary
-     */
-    public function getPageDictionary()
-    {
-        return $this->_pageDictionary;
-    }
-
-    /**
-     * Dump current drawing instructions into the content stream.
-     *
-     * @todo Don't forget to close all current graphics operations (like path drawing)
-     *
-     * @throws Zend_Pdf_Exception
-     */
-    public function flush()
-    {
-        if ($this->_saveCount != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Saved graphics state is not restored');
-        }
-
-        if ($this->_contents == '') {
-            return;
-        }
-
-        if ($this->_pageDictionary->Contents->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-            /**
-             * It's a stream object.
-             * Prepare Contents page attribute for update.
-             */
-            $this->_pageDictionary->touch();
-
-            $currentPageContents = $this->_pageDictionary->Contents;
-            $this->_pageDictionary->Contents = new Zend_Pdf_Element_Array();
-            $this->_pageDictionary->Contents->items[] = $currentPageContents;
-        } else {
-            $this->_pageDictionary->Contents->touch();
-        }
-
-        if ((!$this->_safeGS)  &&  (count($this->_pageDictionary->Contents->items) != 0)) {
-            /**
-             * Page already has some content which is not treated as safe.
-             *
-             * Add save/restore GS operators
-             */
-            $this->_addProcSet('PDF');
-
-            $newContentsArray = new Zend_Pdf_Element_Array();
-            $newContentsArray->items[] = $this->_objFactory->newStreamObject(" q\n");
-            foreach ($this->_pageDictionary->Contents->items as $contentStream) {
-                $newContentsArray->items[] = $contentStream;
-            }
-            $newContentsArray->items[] = $this->_objFactory->newStreamObject(" Q\n");
-
-            $this->_pageDictionary->touch();
-            $this->_pageDictionary->Contents = $newContentsArray;
-
-            $this->_safeGS = true;
-        }
-
-        $this->_pageDictionary->Contents->items[] =
-                $this->_objFactory->newStreamObject($this->_contents);
-
-        $this->_contents = '';
-    }
-
-    /**
-     * Prepare page to be rendered into PDF.
-     *
-     * @todo Don't forget to close all current graphics operations (like path drawing)
-     *
-     * @param Zend_Pdf_ElementFactory_Interface $objFactory
-     * @throws Zend_Pdf_Exception
-     */
-    public function render(Zend_Pdf_ElementFactory_Interface $objFactory)
-    {
-        $this->flush();
-
-        if ($objFactory === $this->_objFactory) {
-            // Page is already attached to the document.
-            return;
-        }
-
-        if ($this->_attached) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Page is attached to one documen, but rendered in context of another.');
-            /**
-             * @todo Page cloning must be implemented here instead of exception.
-             *       PDF objects (ex. fonts) can be shared between pages.
-             *       Thus all referenced objects, which can be modified, must be cloned recursively,
-             *       to avoid producing wrong object references in a context of source PDF.
-             */
-
-            //...
-        } else {
-            $objFactory->attach($this->_objFactory);
-        }
-    }
-
-
-
-    /**
-     * Set fill color.
-     *
-     * @param Zend_Pdf_Color $color
-     * @return Zend_Pdf_Page
-     */
-    public function setFillColor(Zend_Pdf_Color $color)
-    {
-        $this->_addProcSet('PDF');
-        $this->_contents .= $color->instructions(false);
-
-        return $this;
-    }
-
-    /**
-     * Set line color.
-     *
-     * @param Zend_Pdf_Color $color
-     * @return Zend_Pdf_Page
-     */
-    public function setLineColor(Zend_Pdf_Color $color)
-    {
-        $this->_addProcSet('PDF');
-        $this->_contents .= $color->instructions(true);
-
-        return $this;
-    }
-
-    /**
-     * Set line width.
-     *
-     * @param float $width
-     * @return Zend_Pdf_Page
-     */
-    public function setLineWidth($width)
-    {
-        $this->_addProcSet('PDF');
-        $widthObj = new Zend_Pdf_Element_Numeric($width);
-        $this->_contents .= $widthObj->toString() . " w\n";
-
-        return $this;
-    }
-
-    /**
-     * Set line dashing pattern
-     *
-     * Pattern is an array of floats: array(on_length, off_length, on_length, off_length, ...)
-     * Phase is shift from the beginning of line.
-     *
-     * @param array $pattern
-     * @param array $phase
-     * @return Zend_Pdf_Page
-     */
-    public function setLineDashingPattern($pattern, $phase = 0)
-    {
-        $this->_addProcSet('PDF');
-
-        if ($pattern === Zend_Pdf_Page::LINE_DASHING_SOLID) {
-            $pattern = array();
-            $phase   = 0;
-        }
-
-        $dashPattern  = new Zend_Pdf_Element_Array();
-        $phaseEleemnt = new Zend_Pdf_Element_Numeric($phase);
-
-        foreach ($pattern as $dashItem) {
-            $dashElement = new Zend_Pdf_Element_Numeric($dashItem);
-            $dashPattern->items[] = $dashElement;
-        }
-
-        $this->_contents .= $dashPattern->toString() . ' '
-                         . $phaseEleemnt->toString() . " d\n";
-
-        return $this;
-    }
-
-    /**
-     * Set current font.
-     *
-     * @param Zend_Pdf_Resource_Font $font
-     * @param float $fontSize
-     * @return Zend_Pdf_Page
-     */
-    public function setFont(Zend_Pdf_Resource_Font $font, $fontSize)
-    {
-        $this->_addProcSet('Text');
-        $fontName = $this->_attachResource('Font', $font);
-
-        $this->_font     = $font;
-        $this->_fontSize = $fontSize;
-
-        $fontNameObj = new Zend_Pdf_Element_Name($fontName);
-        $fontSizeObj = new Zend_Pdf_Element_Numeric($fontSize);
-        $this->_contents .= $fontNameObj->toString() . ' ' . $fontSizeObj->toString() . " Tf\n";
-
-        return $this;
-    }
-
-    /**
-     * Set the style to use for future drawing operations on this page
-     *
-     * @param Zend_Pdf_Style $style
-     * @return Zend_Pdf_Page
-     */
-    public function setStyle(Zend_Pdf_Style $style)
-    {
-        $this->_style = $style;
-
-        $this->_addProcSet('Text');
-        $this->_addProcSet('PDF');
-        if ($style->getFont() !== null) {
-            $this->setFont($style->getFont(), $style->getFontSize());
-        }
-        $this->_contents .= $style->instructions($this->_pageDictionary->Resources);
-
-        return $this;
-    }
-
-    /**
-     * Set the transparancy
-     *
-     * $alpha == 0  - transparent
-     * $alpha == 1  - opaque
-     *
-     * Transparency modes, supported by PDF:
-     * Normal (default), Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight,
-     * SoftLight, Difference, Exclusion
-     *
-     * @param float $alpha
-     * @param string $mode
-     * @throws Zend_Pdf_Exception
-     * @return Zend_Pdf_Page
-     */
-    public function setAlpha($alpha, $mode = 'Normal')
-    {
-        if (!in_array($mode, array('Normal', 'Multiply', 'Screen', 'Overlay', 'Darken', 'Lighten', 'ColorDodge',
-                                   'ColorBurn', 'HardLight', 'SoftLight', 'Difference', 'Exclusion'))) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Unsupported transparency mode.');
-        }
-        if (!is_numeric($alpha)  ||  $alpha < 0  ||  $alpha > 1) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Alpha value must be numeric between 0 (transparent) and 1 (opaque).');
-        }
-
-        $this->_addProcSet('Text');
-        $this->_addProcSet('PDF');
-
-        $resources = $this->_pageDictionary->Resources;
-
-        // Check if Resources dictionary contains ExtGState entry
-        if ($resources->ExtGState === null) {
-            $resources->touch();
-            $resources->ExtGState = new Zend_Pdf_Element_Dictionary();
-        } else {
-            $resources->ExtGState->touch();
-        }
-
-        $idCounter = 1;
-        do {
-            $gStateName = 'GS' . $idCounter++;
-        } while ($resources->ExtGState->$gStateName !== null);
-
-
-        $gStateDictionary = new Zend_Pdf_Element_Dictionary();
-        $gStateDictionary->Type = new Zend_Pdf_Element_Name('ExtGState');
-        $gStateDictionary->BM   = new Zend_Pdf_Element_Name($mode);
-        $gStateDictionary->CA   = new Zend_Pdf_Element_Numeric($alpha);
-        $gStateDictionary->ca   = new Zend_Pdf_Element_Numeric($alpha);
-
-        $resources->ExtGState->$gStateName = $this->_objFactory->newObject($gStateDictionary);
-
-        $gStateNameObj = new Zend_Pdf_Element_Name($gStateName);
-        $this->_contents .= $gStateNameObj->toString() . " gs\n";
-
-        return $this;
-    }
-
-
-    /**
-     * Get current font.
-     *
-     * @return Zend_Pdf_Resource_Font $font
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     * Extract resources attached to the page
-     *
-     * This method is not intended to be used in userland, but helps to optimize some document wide operations
-     *
-     * returns array of Zend_Pdf_Element_Dictionary objects
-     *
-     * @internal
-     * @return array
-     */
-    public function extractResources()
-    {
-        return $this->_pageDictionary->Resources;
-    }
-
-    /**
-     * Extract fonts attached to the page
-     *
-     * returns array of Zend_Pdf_Resource_Font_Extracted objects
-     *
-     * @return array
-     * @throws Zend_Pdf_Exception
-     */
-    public function extractFonts()
-    {
-        if ($this->_pageDictionary->Resources->Font === null) {
-            // Page doesn't have any font attached
-            // Return empty array
-            return array();
-        }
-
-        $fontResources = $this->_pageDictionary->Resources->Font;
-
-        $fontResourcesUnique = array();
-        foreach ($fontResources->getKeys() as $fontResourceName) {
-            $fontDictionary = $fontResources->$fontResourceName;
-
-            if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference  ||
-                   $fontDictionary instanceof Zend_Pdf_Element_Object) ) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.');
-            }
-
-            $fontResourcesUnique[spl_object_hash($fontDictionary->getObject())] = $fontDictionary;
-        }
-
-        $fonts = array();
-        require_once 'Zend/Pdf/Exception.php';
-        foreach ($fontResourcesUnique as $resourceId => $fontDictionary) {
-            try {
-                require_once 'Zend/Pdf/Resource/Font/Extracted.php';
-                // Try to extract font
-                $extractedFont = new Zend_Pdf_Resource_Font_Extracted($fontDictionary);
-
-                $fonts[$resourceId] = $extractedFont;
-            } catch (Zend_Pdf_Exception $e) {
-                if ($e->getMessage() != 'Unsupported font type.') {
-                    throw new Zend_Pdf_Exception($e->getMessage(), $e->getCode(), $e);
-                }
-            }
-        }
-
-        return $fonts;
-    }
-
-    /**
-     * Extract font attached to the page by specific font name
-     *
-     * $fontName should be specified in UTF-8 encoding
-     *
-     * @return Zend_Pdf_Resource_Font_Extracted|null
-     * @throws Zend_Pdf_Exception
-     */
-    public function extractFont($fontName)
-    {
-        if ($this->_pageDictionary->Resources->Font === null) {
-            // Page doesn't have any font attached
-            return null;
-        }
-
-        $fontResources = $this->_pageDictionary->Resources->Font;
-
-        $fontResourcesUnique = array();
-
-        require_once 'Zend/Pdf/Exception.php';
-        foreach ($fontResources->getKeys() as $fontResourceName) {
-            $fontDictionary = $fontResources->$fontResourceName;
-
-            if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference  ||
-                   $fontDictionary instanceof Zend_Pdf_Element_Object) ) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.');
-            }
-
-            $resourceId = spl_object_hash($fontDictionary->getObject());
-            if (isset($fontResourcesUnique[$resourceId])) {
-                continue;
-            } else {
-                // Mark resource as processed
-                $fontResourcesUnique[$resourceId] = 1;
-            }
-
-            if ($fontDictionary->BaseFont->value != $fontName) {
-                continue;
-            }
-
-            try {
-                // Try to extract font
-                require_once 'Zend/Pdf/Resource/Font/Extracted.php';
-                return new Zend_Pdf_Resource_Font_Extracted($fontDictionary);
-            } catch (Zend_Pdf_Exception $e) {
-                if ($e->getMessage() != 'Unsupported font type.') {
-                    throw new Zend_Pdf_Exception($e->getMessage(), $e->getCode(), $e);
-                }
-
-                // Continue searhing font with specified name
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get current font size
-     *
-     * @return float $fontSize
-     */
-    public function getFontSize()
-    {
-        return $this->_fontSize;
-    }
-
-    /**
-     * Return the style, applied to the page.
-     *
-     * @return Zend_Pdf_Style|null
-     */
-    public function getStyle()
-    {
-        return $this->_style;
-    }
-
-
-    /**
-     * Save the graphics state of this page.
-     * This takes a snapshot of the currently applied style, position, clipping area and
-     * any rotation/translation/scaling that has been applied.
-     *
-     * @todo check for the open paths
-     * @throws Zend_Pdf_Exception    - if a save is performed with an open path
-     * @return Zend_Pdf_Page
-     */
-    public function saveGS()
-    {
-        $this->_saveCount++;
-
-        $this->_addProcSet('PDF');
-        $this->_contents .= " q\n";
-
-        return $this;
-    }
-
-    /**
-     * Restore the graphics state that was saved with the last call to saveGS().
-     *
-     * @throws Zend_Pdf_Exception   - if there is no previously saved state
-     * @return Zend_Pdf_Page
-     */
-    public function restoreGS()
-    {
-        if ($this->_saveCount-- <= 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Restoring graphics state which is not saved');
-        }
-        $this->_contents .= " Q\n";
-
-        return $this;
-    }
-
-
-    /**
-     * Intersect current clipping area with a circle.
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $radius
-     * @param float $startAngle
-     * @param float $endAngle
-     * @return Zend_Pdf_Page
-     */
-    public function clipCircle($x, $y, $radius, $startAngle = null, $endAngle = null)
-    {
-        $this->clipEllipse($x - $radius, $y - $radius,
-                           $x + $radius, $y + $radius,
-                           $startAngle, $endAngle);
-
-        return $this;
-    }
-
-    /**
-     * Intersect current clipping area with a polygon.
-     *
-     * Method signatures:
-     * drawEllipse($x1, $y1, $x2, $y2);
-     * drawEllipse($x1, $y1, $x2, $y2, $startAngle, $endAngle);
-     *
-     * @todo process special cases with $x2-$x1 == 0 or $y2-$y1 == 0
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $startAngle
-     * @param float $endAngle
-     * @return Zend_Pdf_Page
-     */
-    public function clipEllipse($x1, $y1, $x2, $y2, $startAngle = null, $endAngle = null)
-    {
-        $this->_addProcSet('PDF');
-
-        if ($x2 < $x1) {
-            $temp = $x1;
-            $x1   = $x2;
-            $x2   = $temp;
-        }
-        if ($y2 < $y1) {
-            $temp = $y1;
-            $y1   = $y2;
-            $y2   = $temp;
-        }
-
-        $x = ($x1 + $x2)/2.;
-        $y = ($y1 + $y2)/2.;
-
-        $xC = new Zend_Pdf_Element_Numeric($x);
-        $yC = new Zend_Pdf_Element_Numeric($y);
-
-        if ($startAngle !== null) {
-            if ($startAngle != 0) { $startAngle = fmod($startAngle, M_PI*2); }
-            if ($endAngle   != 0) { $endAngle   = fmod($endAngle,   M_PI*2); }
-
-            if ($startAngle > $endAngle) {
-                $endAngle += M_PI*2;
-            }
-
-            $clipPath    = $xC->toString() . ' ' . $yC->toString() . " m\n";
-            $clipSectors = (int)ceil(($endAngle - $startAngle)/M_PI_4);
-            $clipRadius  = max($x2 - $x1, $y2 - $y1);
-
-            for($count = 0; $count <= $clipSectors; $count++) {
-                $pAngle = $startAngle + ($endAngle - $startAngle)*$count/(float)$clipSectors;
-
-                $pX = new Zend_Pdf_Element_Numeric($x + cos($pAngle)*$clipRadius);
-                $pY = new Zend_Pdf_Element_Numeric($y + sin($pAngle)*$clipRadius);
-                $clipPath .= $pX->toString() . ' ' . $pY->toString() . " l\n";
-            }
-
-            $this->_contents .= $clipPath . "h\nW\nn\n";
-        }
-
-        $xLeft  = new Zend_Pdf_Element_Numeric($x1);
-        $xRight = new Zend_Pdf_Element_Numeric($x2);
-        $yUp    = new Zend_Pdf_Element_Numeric($y2);
-        $yDown  = new Zend_Pdf_Element_Numeric($y1);
-
-        $xDelta  = 2*(M_SQRT2 - 1)*($x2 - $x1)/3.;
-        $yDelta  = 2*(M_SQRT2 - 1)*($y2 - $y1)/3.;
-        $xr = new Zend_Pdf_Element_Numeric($x + $xDelta);
-        $xl = new Zend_Pdf_Element_Numeric($x - $xDelta);
-        $yu = new Zend_Pdf_Element_Numeric($y + $yDelta);
-        $yd = new Zend_Pdf_Element_Numeric($y - $yDelta);
-
-        $this->_contents .= $xC->toString() . ' ' . $yUp->toString() . " m\n"
-                         .  $xr->toString() . ' ' . $yUp->toString() . ' '
-                         .    $xRight->toString() . ' ' . $yu->toString() . ' '
-                         .      $xRight->toString() . ' ' . $yC->toString() . " c\n"
-                         .  $xRight->toString() . ' ' . $yd->toString() . ' '
-                         .    $xr->toString() . ' ' . $yDown->toString() . ' '
-                         .      $xC->toString() . ' ' . $yDown->toString() . " c\n"
-                         .  $xl->toString() . ' ' . $yDown->toString() . ' '
-                         .    $xLeft->toString() . ' ' . $yd->toString() . ' '
-                         .      $xLeft->toString() . ' ' . $yC->toString() . " c\n"
-                         .  $xLeft->toString() . ' ' . $yu->toString() . ' '
-                         .    $xl->toString() . ' ' . $yUp->toString() . ' '
-                         .      $xC->toString() . ' ' . $yUp->toString() . " c\n"
-                         .  "h\nW\nn\n";
-
-        return $this;
-    }
-
-
-    /**
-     * Intersect current clipping area with a polygon.
-     *
-     * @param array $x  - array of float (the X co-ordinates of the vertices)
-     * @param array $y  - array of float (the Y co-ordinates of the vertices)
-     * @param integer $fillMethod
-     * @return Zend_Pdf_Page
-     */
-    public function clipPolygon($x, $y, $fillMethod = Zend_Pdf_Page::FILL_METHOD_NON_ZERO_WINDING)
-    {
-        $this->_addProcSet('PDF');
-
-        $firstPoint = true;
-        foreach ($x as $id => $xVal) {
-            $xObj = new Zend_Pdf_Element_Numeric($xVal);
-            $yObj = new Zend_Pdf_Element_Numeric($y[$id]);
-
-            if ($firstPoint) {
-                $path = $xObj->toString() . ' ' . $yObj->toString() . " m\n";
-                $firstPoint = false;
-            } else {
-                $path .= $xObj->toString() . ' ' . $yObj->toString() . " l\n";
-            }
-        }
-
-        $this->_contents .= $path;
-
-        if ($fillMethod == Zend_Pdf_Page::FILL_METHOD_NON_ZERO_WINDING) {
-            $this->_contents .= " h\n W\nn\n";
-        } else {
-            // Even-Odd fill method.
-            $this->_contents .= " h\n W*\nn\n";
-        }
-
-        return $this;
-    }
-
-    /**
-     * Intersect current clipping area with a rectangle.
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @return Zend_Pdf_Page
-     */
-    public function clipRectangle($x1, $y1, $x2, $y2)
-    {
-        $this->_addProcSet('PDF');
-
-        $x1Obj      = new Zend_Pdf_Element_Numeric($x1);
-        $y1Obj      = new Zend_Pdf_Element_Numeric($y1);
-        $widthObj   = new Zend_Pdf_Element_Numeric($x2 - $x1);
-        $height2Obj = new Zend_Pdf_Element_Numeric($y2 - $y1);
-
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                         .      $widthObj->toString() . ' ' . $height2Obj->toString() . " re\n"
-                         .  " W\nn\n";
-
-        return $this;
-    }
-
-    /**
-     * Draw a Zend_Pdf_ContentStream at the specified position on the page
-     *
-     * @param ZPdfContentStream $cs
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @return Zend_Pdf_Page
-     */
-    public function drawContentStream($cs, $x1, $y1, $x2, $y2)
-    {
-        /** @todo implementation */
-        return $this;
-    }
-
-    /**
-     * Draw a circle centered on x, y with a radius of radius.
-     *
-     * Method signatures:
-     * drawCircle($x, $y, $radius);
-     * drawCircle($x, $y, $radius, $fillType);
-     * drawCircle($x, $y, $radius, $startAngle, $endAngle);
-     * drawCircle($x, $y, $radius, $startAngle, $endAngle, $fillType);
-     *
-     *
-     * It's not a really circle, because PDF supports only cubic Bezier curves.
-     * But _very_ good approximation.
-     * It differs from a real circle on a maximum 0.00026 radiuses
-     * (at PI/8, 3*PI/8, 5*PI/8, 7*PI/8, 9*PI/8, 11*PI/8, 13*PI/8 and 15*PI/8 angles).
-     * At 0, PI/4, PI/2, 3*PI/4, PI, 5*PI/4, 3*PI/2 and 7*PI/4 it's exactly a tangent to a circle.
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $radius
-     * @param mixed $param4
-     * @param mixed $param5
-     * @param mixed $param6
-     * @return Zend_Pdf_Page
-     */
-    public function  drawCircle($x, $y, $radius, $param4 = null, $param5 = null, $param6 = null)
-    {
-        $this->drawEllipse($x - $radius, $y - $radius,
-                           $x + $radius, $y + $radius,
-                           $param4, $param5, $param6);
-
-        return $this;
-    }
-
-    /**
-     * Draw an ellipse inside the specified rectangle.
-     *
-     * Method signatures:
-     * drawEllipse($x1, $y1, $x2, $y2);
-     * drawEllipse($x1, $y1, $x2, $y2, $fillType);
-     * drawEllipse($x1, $y1, $x2, $y2, $startAngle, $endAngle);
-     * drawEllipse($x1, $y1, $x2, $y2, $startAngle, $endAngle, $fillType);
-     *
-     * @todo process special cases with $x2-$x1 == 0 or $y2-$y1 == 0
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param mixed $param5
-     * @param mixed $param6
-     * @param mixed $param7
-     * @return Zend_Pdf_Page
-     */
-    public function drawEllipse($x1, $y1, $x2, $y2, $param5 = null, $param6 = null, $param7 = null)
-    {
-        if ($param5 === null) {
-            // drawEllipse($x1, $y1, $x2, $y2);
-            $startAngle = null;
-            $fillType = Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE;
-        } else if ($param6 === null) {
-            // drawEllipse($x1, $y1, $x2, $y2, $fillType);
-            $startAngle = null;
-            $fillType = $param5;
-        } else {
-            // drawEllipse($x1, $y1, $x2, $y2, $startAngle, $endAngle);
-            // drawEllipse($x1, $y1, $x2, $y2, $startAngle, $endAngle, $fillType);
-            $startAngle = $param5;
-            $endAngle   = $param6;
-
-            if ($param7 === null) {
-                $fillType = Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE;
-            } else {
-                $fillType = $param7;
-            }
-        }
-
-        $this->_addProcSet('PDF');
-
-        if ($x2 < $x1) {
-            $temp = $x1;
-            $x1   = $x2;
-            $x2   = $temp;
-        }
-        if ($y2 < $y1) {
-            $temp = $y1;
-            $y1   = $y2;
-            $y2   = $temp;
-        }
-
-        $x = ($x1 + $x2)/2.;
-        $y = ($y1 + $y2)/2.;
-
-        $xC = new Zend_Pdf_Element_Numeric($x);
-        $yC = new Zend_Pdf_Element_Numeric($y);
-
-        if ($startAngle !== null) {
-            if ($startAngle != 0) { $startAngle = fmod($startAngle, M_PI*2); }
-            if ($endAngle   != 0) { $endAngle   = fmod($endAngle,   M_PI*2); }
-
-            if ($startAngle > $endAngle) {
-                $endAngle += M_PI*2;
-            }
-
-            $clipPath    = $xC->toString() . ' ' . $yC->toString() . " m\n";
-            $clipSectors = (int)ceil(($endAngle - $startAngle)/M_PI_4);
-            $clipRadius  = max($x2 - $x1, $y2 - $y1);
-
-            for($count = 0; $count <= $clipSectors; $count++) {
-                $pAngle = $startAngle + ($endAngle - $startAngle)*$count/(float)$clipSectors;
-
-                $pX = new Zend_Pdf_Element_Numeric($x + cos($pAngle)*$clipRadius);
-                $pY = new Zend_Pdf_Element_Numeric($y + sin($pAngle)*$clipRadius);
-                $clipPath .= $pX->toString() . ' ' . $pY->toString() . " l\n";
-            }
-
-            $this->_contents .= "q\n" . $clipPath . "h\nW\nn\n";
-        }
-
-        $xLeft  = new Zend_Pdf_Element_Numeric($x1);
-        $xRight = new Zend_Pdf_Element_Numeric($x2);
-        $yUp    = new Zend_Pdf_Element_Numeric($y2);
-        $yDown  = new Zend_Pdf_Element_Numeric($y1);
-
-        $xDelta  = 2*(M_SQRT2 - 1)*($x2 - $x1)/3.;
-        $yDelta  = 2*(M_SQRT2 - 1)*($y2 - $y1)/3.;
-        $xr = new Zend_Pdf_Element_Numeric($x + $xDelta);
-        $xl = new Zend_Pdf_Element_Numeric($x - $xDelta);
-        $yu = new Zend_Pdf_Element_Numeric($y + $yDelta);
-        $yd = new Zend_Pdf_Element_Numeric($y - $yDelta);
-
-        $this->_contents .= $xC->toString() . ' ' . $yUp->toString() . " m\n"
-                         .  $xr->toString() . ' ' . $yUp->toString() . ' '
-                         .    $xRight->toString() . ' ' . $yu->toString() . ' '
-                         .      $xRight->toString() . ' ' . $yC->toString() . " c\n"
-                         .  $xRight->toString() . ' ' . $yd->toString() . ' '
-                         .    $xr->toString() . ' ' . $yDown->toString() . ' '
-                         .      $xC->toString() . ' ' . $yDown->toString() . " c\n"
-                         .  $xl->toString() . ' ' . $yDown->toString() . ' '
-                         .    $xLeft->toString() . ' ' . $yd->toString() . ' '
-                         .      $xLeft->toString() . ' ' . $yC->toString() . " c\n"
-                         .  $xLeft->toString() . ' ' . $yu->toString() . ' '
-                         .    $xl->toString() . ' ' . $yUp->toString() . ' '
-                         .      $xC->toString() . ' ' . $yUp->toString() . " c\n";
-
-        switch ($fillType) {
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE:
-                $this->_contents .= " B*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL:
-                $this->_contents .= " f*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_STROKE:
-                $this->_contents .= " S\n";
-                break;
-        }
-
-        if ($startAngle !== null) {
-            $this->_contents .= "Q\n";
-        }
-
-        return $this;
-    }
-
-    /**
-     * Draw an image at the specified position on the page.
-     *
-     * @param Zend_Pdf_Image $image
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @return Zend_Pdf_Page
-     */
-    public function drawImage(Zend_Pdf_Resource_Image $image, $x1, $y1, $x2, $y2)
-    {
-        $this->_addProcSet('PDF');
-
-        $imageName    = $this->_attachResource('XObject', $image);
-        $imageNameObj = new Zend_Pdf_Element_Name($imageName);
-
-        $x1Obj     = new Zend_Pdf_Element_Numeric($x1);
-        $y1Obj     = new Zend_Pdf_Element_Numeric($y1);
-        $widthObj  = new Zend_Pdf_Element_Numeric($x2 - $x1);
-        $heightObj = new Zend_Pdf_Element_Numeric($y2 - $y1);
-
-        $this->_contents .= "q\n"
-                         .  '1 0 0 1 ' . $x1Obj->toString() . ' ' . $y1Obj->toString() . " cm\n"
-                         .  $widthObj->toString() . ' 0 0 ' . $heightObj->toString() . " 0 0 cm\n"
-                         .  $imageNameObj->toString() . " Do\n"
-                         .  "Q\n";
-
-        return $this;
-    }
-
-    /**
-     * Draw a LayoutBox at the specified position on the page.
-     *
-     * @param Zend_Pdf_Element_LayoutBox $box
-     * @param float $x
-     * @param float $y
-     * @return Zend_Pdf_Page
-     */
-    public function drawLayoutBox($box, $x, $y)
-    {
-        /** @todo implementation */
-        return $this;
-    }
-
-    /**
-     * Draw a line from x1,y1 to x2,y2.
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @return Zend_Pdf_Page
-     */
-    public function drawLine($x1, $y1, $x2, $y2)
-    {
-        $this->_addProcSet('PDF');
-
-        $x1Obj = new Zend_Pdf_Element_Numeric($x1);
-        $y1Obj = new Zend_Pdf_Element_Numeric($y1);
-        $x2Obj = new Zend_Pdf_Element_Numeric($x2);
-        $y2Obj = new Zend_Pdf_Element_Numeric($y2);
-
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " m\n"
-                         .  $x2Obj->toString() . ' ' . $y2Obj->toString() . " l\n S\n";
-
-        return $this;
-    }
-
-    /**
-     * Draw a polygon.
-     *
-     * If $fillType is Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE or
-     * Zend_Pdf_Page::SHAPE_DRAW_FILL, then polygon is automatically closed.
-     * See detailed description of these methods in a PDF documentation
-     * (section 4.4.2 Path painting Operators, Filling)
-     *
-     * @param array $x  - array of float (the X co-ordinates of the vertices)
-     * @param array $y  - array of float (the Y co-ordinates of the vertices)
-     * @param integer $fillType
-     * @param integer $fillMethod
-     * @return Zend_Pdf_Page
-     */
-    public function drawPolygon($x, $y,
-                                $fillType = Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE,
-                                $fillMethod = Zend_Pdf_Page::FILL_METHOD_NON_ZERO_WINDING)
-    {
-        $this->_addProcSet('PDF');
-
-        $firstPoint = true;
-        foreach ($x as $id => $xVal) {
-            $xObj = new Zend_Pdf_Element_Numeric($xVal);
-            $yObj = new Zend_Pdf_Element_Numeric($y[$id]);
-
-            if ($firstPoint) {
-                $path = $xObj->toString() . ' ' . $yObj->toString() . " m\n";
-                $firstPoint = false;
-            } else {
-                $path .= $xObj->toString() . ' ' . $yObj->toString() . " l\n";
-            }
-        }
-
-        $this->_contents .= $path;
-
-        switch ($fillType) {
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE:
-                if ($fillMethod == Zend_Pdf_Page::FILL_METHOD_NON_ZERO_WINDING) {
-                    $this->_contents .= " b\n";
-                } else {
-                    // Even-Odd fill method.
-                    $this->_contents .= " b*\n";
-                }
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL:
-                if ($fillMethod == Zend_Pdf_Page::FILL_METHOD_NON_ZERO_WINDING) {
-                    $this->_contents .= " h\n f\n";
-                } else {
-                    // Even-Odd fill method.
-                    $this->_contents .= " h\n f*\n";
-                }
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_STROKE:
-                $this->_contents .= " S\n";
-                break;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Draw a rectangle.
-     *
-     * Fill types:
-     * Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE - fill rectangle and stroke (default)
-     * Zend_Pdf_Page::SHAPE_DRAW_STROKE      - stroke rectangle
-     * Zend_Pdf_Page::SHAPE_DRAW_FILL        - fill rectangle
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param integer $fillType
-     * @return Zend_Pdf_Page
-     */
-    public function drawRectangle($x1, $y1, $x2, $y2, $fillType = Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE)
-    {
-        $this->_addProcSet('PDF');
-
-        $x1Obj      = new Zend_Pdf_Element_Numeric($x1);
-        $y1Obj      = new Zend_Pdf_Element_Numeric($y1);
-        $widthObj   = new Zend_Pdf_Element_Numeric($x2 - $x1);
-        $height2Obj = new Zend_Pdf_Element_Numeric($y2 - $y1);
-
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                             .  $widthObj->toString() . ' ' . $height2Obj->toString() . " re\n";
-
-        switch ($fillType) {
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE:
-                $this->_contents .= " B*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL:
-                $this->_contents .= " f*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_STROKE:
-                $this->_contents .= " S\n";
-                break;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Draw a rounded rectangle.
-     *
-     * Fill types:
-     * Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE - fill rectangle and stroke (default)
-     * Zend_Pdf_Page::SHAPE_DRAW_STROKE      - stroke rectangle
-     * Zend_Pdf_Page::SHAPE_DRAW_FILL        - fill rectangle
-     *
-     * radius is an integer representing radius of the four corners, or an array
-     * of four integers representing the radius starting at top left, going
-     * clockwise
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param integer|array $radius
-     * @param integer $fillType
-     * @return Zend_Pdf_Page
-     */
-    public function drawRoundedRectangle($x1, $y1, $x2, $y2, $radius, 
-                                         $fillType = Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE)
-    {
-
-        $this->_addProcSet('PDF');
-
-        if(!is_array($radius)) {
-            $radius = array($radius, $radius, $radius, $radius);
-        } else {
-            for ($i = 0; $i < 4; $i++) {
-                if(!isset($radius[$i])) {
-                    $radius[$i] = 0;
-                }
-            }
-        }
-
-        $topLeftX      = $x1;
-        $topLeftY      = $y2;
-        $topRightX     = $x2;
-        $topRightY     = $y2;
-        $bottomRightX  = $x2;
-        $bottomRightY  = $y1;
-        $bottomLeftX   = $x1;
-        $bottomLeftY   = $y1;
-        
-        //draw top side
-        $x1Obj = new Zend_Pdf_Element_Numeric($topLeftX + $radius[0]);
-        $y1Obj = new Zend_Pdf_Element_Numeric($topLeftY);
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " m\n";
-        $x1Obj = new Zend_Pdf_Element_Numeric($topRightX - $radius[1]);
-        $y1Obj = new Zend_Pdf_Element_Numeric($topRightY);
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " l\n";
-
-        //draw top right corner if needed
-        if ($radius[1] != 0) {        
-            $x1Obj = new Zend_Pdf_Element_Numeric($topRightX);
-            $y1Obj = new Zend_Pdf_Element_Numeric($topRightY);
-            $x2Obj = new Zend_Pdf_Element_Numeric($topRightX);
-            $y2Obj = new Zend_Pdf_Element_Numeric($topRightY);
-            $x3Obj = new Zend_Pdf_Element_Numeric($topRightX);
-            $y3Obj = new Zend_Pdf_Element_Numeric($topRightY - $radius[1]);
-            $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                              . $x2Obj->toString() . ' ' . $y2Obj->toString() . ' '
-                              . $x3Obj->toString() . ' ' . $y3Obj->toString() . ' '
-                              . " c\n";
-        }
-
-        //draw right side
-        $x1Obj = new Zend_Pdf_Element_Numeric($bottomRightX);
-        $y1Obj = new Zend_Pdf_Element_Numeric($bottomRightY + $radius[2]);
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " l\n";
-
-        //draw bottom right corner if needed
-        if ($radius[2] != 0) {        
-            $x1Obj = new Zend_Pdf_Element_Numeric($bottomRightX);
-            $y1Obj = new Zend_Pdf_Element_Numeric($bottomRightY);
-            $x2Obj = new Zend_Pdf_Element_Numeric($bottomRightX);
-            $y2Obj = new Zend_Pdf_Element_Numeric($bottomRightY);
-            $x3Obj = new Zend_Pdf_Element_Numeric($bottomRightX - $radius[2]);
-            $y3Obj = new Zend_Pdf_Element_Numeric($bottomRightY);
-            $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                              . $x2Obj->toString() . ' ' . $y2Obj->toString() . ' '
-                              . $x3Obj->toString() . ' ' . $y3Obj->toString() . ' '
-                              . " c\n";
-        }
-
-        //draw bottom side
-        $x1Obj = new Zend_Pdf_Element_Numeric($bottomLeftX + $radius[3]);
-        $y1Obj = new Zend_Pdf_Element_Numeric($bottomLeftY);
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " l\n";
-
-        //draw bottom left corner if needed
-        if ($radius[3] != 0) {        
-            $x1Obj = new Zend_Pdf_Element_Numeric($bottomLeftX);
-            $y1Obj = new Zend_Pdf_Element_Numeric($bottomLeftY);
-            $x2Obj = new Zend_Pdf_Element_Numeric($bottomLeftX);
-            $y2Obj = new Zend_Pdf_Element_Numeric($bottomLeftY);
-            $x3Obj = new Zend_Pdf_Element_Numeric($bottomLeftX);
-            $y3Obj = new Zend_Pdf_Element_Numeric($bottomLeftY + $radius[3]);
-            $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                              . $x2Obj->toString() . ' ' . $y2Obj->toString() . ' '
-                              . $x3Obj->toString() . ' ' . $y3Obj->toString() . ' '
-                              . " c\n";
-        }
-
-        //draw left side
-        $x1Obj = new Zend_Pdf_Element_Numeric($topLeftX);
-        $y1Obj = new Zend_Pdf_Element_Numeric($topLeftY - $radius[0]);
-        $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . " l\n";
-
-        //draw top left corner if needed
-        if ($radius[0] != 0) {        
-            $x1Obj = new Zend_Pdf_Element_Numeric($topLeftX);
-            $y1Obj = new Zend_Pdf_Element_Numeric($topLeftY);
-            $x2Obj = new Zend_Pdf_Element_Numeric($topLeftX);
-            $y2Obj = new Zend_Pdf_Element_Numeric($topLeftY);
-            $x3Obj = new Zend_Pdf_Element_Numeric($topLeftX + $radius[0]);
-            $y3Obj = new Zend_Pdf_Element_Numeric($topLeftY);
-            $this->_contents .= $x1Obj->toString() . ' ' . $y1Obj->toString() . ' '
-                              . $x2Obj->toString() . ' ' . $y2Obj->toString() . ' '
-                              . $x3Obj->toString() . ' ' . $y3Obj->toString() . ' '
-                              . " c\n";
-        }
-
-        switch ($fillType) {
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL_AND_STROKE:
-                $this->_contents .= " B*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_FILL:
-                $this->_contents .= " f*\n";
-                break;
-            case Zend_Pdf_Page::SHAPE_DRAW_STROKE:
-                $this->_contents .= " S\n";
-                break;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Draw a line of text at the specified position.
-     *
-     * @param string $text
-     * @param float $x
-     * @param float $y
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   Defaults to current locale.
-     * @throws Zend_Pdf_Exception
-     * @return Zend_Pdf_Page
-     */
-    public function drawText($text, $x, $y, $charEncoding = '')
-    {
-        if ($this->_font === null) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Font has not been set');
-        }
-
-        $this->_addProcSet('Text');
-
-        $textObj = new Zend_Pdf_Element_String($this->_font->encodeString($text, $charEncoding));
-        $xObj    = new Zend_Pdf_Element_Numeric($x);
-        $yObj    = new Zend_Pdf_Element_Numeric($y);
-
-        $this->_contents .= "BT\n"
-                         .  $xObj->toString() . ' ' . $yObj->toString() . " Td\n"
-                         .  $textObj->toString() . " Tj\n"
-                         .  "ET\n";
-
-        return $this;
-    }
-
-    /**
-     *
-     * @param Zend_Pdf_Annotation $annotation
-     * @return Zend_Pdf_Page
-     */
-    public function attachAnnotation(Zend_Pdf_Annotation $annotation)
-    {
-        $annotationDictionary = $annotation->getResource();
-        if (!$annotationDictionary instanceof Zend_Pdf_Element_Object  &&
-            !$annotationDictionary instanceof Zend_Pdf_Element_Reference) {
-            $annotationDictionary = $this->_objFactory->newObject($annotationDictionary);
-        }
-
-        if ($this->_pageDictionary->Annots === null) {
-            $this->_pageDictionary->touch();
-            $this->_pageDictionary->Annots = new Zend_Pdf_Element_Array();
-        } else {
-            $this->_pageDictionary->Annots->touch();
-        }
-
-        $this->_pageDictionary->Annots->items[] = $annotationDictionary;
-
-        $annotationDictionary->touch();
-        $annotationDictionary->P = $this->_pageDictionary;
-
-        return $this;
-    }
-
-    /**
-     * Return the height of this page in points.
-     *
-     * @return float
-     */
-    public function getHeight()
-    {
-        return $this->_pageDictionary->MediaBox->items[3]->value -
-               $this->_pageDictionary->MediaBox->items[1]->value;
-    }
-
-    /**
-     * Return the width of this page in points.
-     *
-     * @return float
-     */
-    public function getWidth()
-    {
-        return $this->_pageDictionary->MediaBox->items[2]->value -
-               $this->_pageDictionary->MediaBox->items[0]->value;
-    }
-
-     /**
-     * Close the path by drawing a straight line back to it's beginning.
-     *
-     * @throws Zend_Pdf_Exception    - if a path hasn't been started with pathMove()
-     * @return Zend_Pdf_Page
-     */
-    public function pathClose()
-    {
-        /** @todo implementation */
-        return $this;
-    }
-
-    /**
-     * Continue the open path in a straight line to the specified position.
-     *
-     * @param float $x  - the X co-ordinate to move to
-     * @param float $y  - the Y co-ordinate to move to
-     * @return Zend_Pdf_Page
-     */
-    public function pathLine($x, $y)
-    {
-        /** @todo implementation */
-        return $this;
-    }
-
-    /**
-     * Start a new path at the specified position. If a path has already been started,
-     * move the cursor without drawing a line.
-     *
-     * @param float $x  - the X co-ordinate to move to
-     * @param float $y  - the Y co-ordinate to move to
-     * @return Zend_Pdf_Page
-     */
-    public function pathMove($x, $y)
-    {
-        /** @todo implementation */
-        return $this;
-    }
-
-    /**
-     * Writes the raw data to the page's content stream.
-     *
-     * Be sure to consult the PDF reference to ensure your syntax is correct. No
-     * attempt is made to ensure the validity of the stream data.
-     *
-     * @param string $data
-     * @param string $procSet (optional) Name of ProcSet to add.
-     * @return Zend_Pdf_Page
-     */
-    public function rawWrite($data, $procSet = null)
-    {
-        if (! empty($procSet)) {
-            $this->_addProcSet($procSet);
-        }
-        $this->_contents .= $data;
-
-        return $this;
-    }
-
-    /**
-     * Rotate the page.
-     *
-     * @param float $x  - the X co-ordinate of rotation point
-     * @param float $y  - the Y co-ordinate of rotation point
-     * @param float $angle - rotation angle
-     * @return Zend_Pdf_Page
-     */
-    public function rotate($x, $y, $angle)
-    {
-        $cos  = new Zend_Pdf_Element_Numeric(cos($angle));
-        $sin  = new Zend_Pdf_Element_Numeric(sin($angle));
-        $mSin = new Zend_Pdf_Element_Numeric(-$sin->value);
-
-        $xObj = new Zend_Pdf_Element_Numeric($x);
-        $yObj = new Zend_Pdf_Element_Numeric($y);
-
-        $mXObj = new Zend_Pdf_Element_Numeric(-$x);
-        $mYObj = new Zend_Pdf_Element_Numeric(-$y);
-
-
-        $this->_addProcSet('PDF');
-        $this->_contents .= '1 0 0 1 ' . $xObj->toString() . ' ' . $yObj->toString() . " cm\n"
-                         .  $cos->toString() . ' ' . $sin->toString() . ' ' . $mSin->toString() . ' ' . $cos->toString() . " 0 0 cm\n"
-                         .  '1 0 0 1 ' . $mXObj->toString() . ' ' . $mYObj->toString() . " cm\n";
-
-        return $this;
-    }
-
-    /**
-     * Scale coordination system.
-     *
-     * @param float $xScale - X dimention scale factor
-     * @param float $yScale - Y dimention scale factor
-     * @return Zend_Pdf_Page
-     */
-    public function scale($xScale, $yScale)
-    {
-        $xScaleObj = new Zend_Pdf_Element_Numeric($xScale);
-        $yScaleObj = new Zend_Pdf_Element_Numeric($yScale);
-
-        $this->_addProcSet('PDF');
-        $this->_contents .= $xScaleObj->toString() . ' 0 0 ' . $yScaleObj->toString() . " 0 0 cm\n";
-
-        return $this;
-    }
-
-    /**
-     * Translate coordination system.
-     *
-     * @param float $xShift - X coordinate shift
-     * @param float $yShift - Y coordinate shift
-     * @return Zend_Pdf_Page
-     */
-    public function translate($xShift, $yShift)
-    {
-        $xShiftObj = new Zend_Pdf_Element_Numeric($xShift);
-        $yShiftObj = new Zend_Pdf_Element_Numeric($yShift);
-
-        $this->_addProcSet('PDF');
-        $this->_contents .= '1 0 0 1 ' . $xShiftObj->toString() . ' ' . $yShiftObj->toString() . " cm\n";
-
-        return $this;
-    }
-
-    /**
-     * Translate coordination system.
-     *
-     * @param float $x  - the X co-ordinate of axis skew point
-     * @param float $y  - the Y co-ordinate of axis skew point
-     * @param float $xAngle - X axis skew angle
-     * @param float $yAngle - Y axis skew angle
-     * @return Zend_Pdf_Page
-     */
-    public function skew($x, $y, $xAngle, $yAngle)
-    {
-        $tanXObj = new Zend_Pdf_Element_Numeric(tan($xAngle));
-        $tanYObj = new Zend_Pdf_Element_Numeric(-tan($yAngle));
-
-        $xObj = new Zend_Pdf_Element_Numeric($x);
-        $yObj = new Zend_Pdf_Element_Numeric($y);
-
-        $mXObj = new Zend_Pdf_Element_Numeric(-$x);
-        $mYObj = new Zend_Pdf_Element_Numeric(-$y);
-
-        $this->_addProcSet('PDF');
-        $this->_contents .= '1 0 0 1 ' . $xObj->toString() . ' ' . $yObj->toString() . " cm\n"
-                         .  '1 ' . $tanXObj->toString() . ' ' . $tanYObj->toString() . " 1 0 0 cm\n"
-                         .  '1 0 0 1 ' . $mXObj->toString() . ' ' . $mYObj->toString() . " cm\n";
-
-        return $this;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Parser.php b/airtime_mvc/library/Zend/Pdf/Parser.php
deleted file mode 100644
index 3dc344ea8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Parser.php
+++ /dev/null
@@ -1,464 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Parser.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_StringParser */
-require_once 'Zend/Pdf/StringParser.php';
-
-
-/**
- * PDF file parser
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Parser
-{
-    /**
-     * String parser
-     *
-     * @var Zend_Pdf_StringParser
-     */
-    private $_stringParser;
-
-    /**
-     * Last PDF file trailer
-     *
-     * @var Zend_Pdf_Trailer_Keeper
-     */
-    private $_trailer;
-
-    /**
-     * PDF version specified in the file header
-     *
-     * @var string
-     */
-    private $_pdfVersion;
-
-
-    /**
-     * Get length of source PDF
-     *
-     * @return integer
-     */
-    public function getPDFLength()
-    {
-        return strlen($this->_stringParser->data);
-    }
-
-    /**
-     * Get PDF String
-     *
-     * @return string
-     */
-    public function getPDFString()
-    {
-        return $this->_stringParser->data;
-    }
-
-    /**
-     * PDF version specified in the file header
-     *
-     * @return string
-     */
-    public function getPDFVersion()
-    {
-        return $this->_pdfVersion;
-    }
-
-    /**
-     * Load XReference table and referenced objects
-     *
-     * @param integer $offset
-     * @throws Zend_Pdf_Exception
-     * @return Zend_Pdf_Trailer_Keeper
-     */
-    private function _loadXRefTable($offset)
-    {
-        $this->_stringParser->offset = $offset;
-
-        require_once 'Zend/Pdf/Element/Reference/Table.php';
-        $refTable = new Zend_Pdf_Element_Reference_Table();
-        require_once 'Zend/Pdf/Element/Reference/Context.php';
-        $context  = new Zend_Pdf_Element_Reference_Context($this->_stringParser, $refTable);
-        $this->_stringParser->setContext($context);
-
-        $nextLexeme = $this->_stringParser->readLexeme();
-        if ($nextLexeme == 'xref') {
-            /**
-             * Common cross-reference table
-             */
-            $this->_stringParser->skipWhiteSpace();
-            while ( ($nextLexeme = $this->_stringParser->readLexeme()) != 'trailer' ) {
-                if (!ctype_digit($nextLexeme)) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Cross-reference table subheader values must contain only digits.', $this->_stringParser->offset-strlen($nextLexeme)));
-                }
-                $objNum = (int)$nextLexeme;
-
-                $refCount = $this->_stringParser->readLexeme();
-                if (!ctype_digit($refCount)) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Cross-reference table subheader values must contain only digits.', $this->_stringParser->offset-strlen($refCount)));
-                }
-
-                $this->_stringParser->skipWhiteSpace();
-                while ($refCount > 0) {
-                    $objectOffset = substr($this->_stringParser->data, $this->_stringParser->offset, 10);
-                    if (!ctype_digit($objectOffset)) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Offset must contain only digits.', $this->_stringParser->offset));
-                    }
-                    // Force $objectOffset to be treated as decimal instead of octal number
-                    for ($numStart = 0; $numStart < strlen($objectOffset)-1; $numStart++) {
-                        if ($objectOffset[$numStart] != '0') {
-                            break;
-                        }
-                    }
-                    $objectOffset = substr($objectOffset, $numStart);
-                    $this->_stringParser->offset += 10;
-
-                    if (strpos("\x00\t\n\f\r ", $this->_stringParser->data[$this->_stringParser->offset]) === false) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Value separator must be white space.', $this->_stringParser->offset));
-                    }
-                    $this->_stringParser->offset++;
-
-                    $genNumber = substr($this->_stringParser->data, $this->_stringParser->offset, 5);
-                    if (!ctype_digit($objectOffset)) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Offset must contain only digits.', $this->_stringParser->offset));
-                    }
-                    // Force $objectOffset to be treated as decimal instead of octal number
-                    for ($numStart = 0; $numStart < strlen($genNumber)-1; $numStart++) {
-                        if ($genNumber[$numStart] != '0') {
-                            break;
-                        }
-                    }
-                    $genNumber = substr($genNumber, $numStart);
-                    $this->_stringParser->offset += 5;
-
-                    if (strpos("\x00\t\n\f\r ", $this->_stringParser->data[$this->_stringParser->offset]) === false) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Value separator must be white space.', $this->_stringParser->offset));
-                    }
-                    $this->_stringParser->offset++;
-
-                    $inUseKey = $this->_stringParser->data[$this->_stringParser->offset];
-                    $this->_stringParser->offset++;
-
-                    switch ($inUseKey) {
-                        case 'f':
-                            // free entry
-                            unset( $this->_refTable[$objNum . ' ' . $genNumber . ' R'] );
-                            $refTable->addReference($objNum . ' ' . $genNumber . ' R',
-                                                    $objectOffset,
-                                                    false);
-                            break;
-
-                        case 'n':
-                            // in-use entry
-
-                            $refTable->addReference($objNum . ' ' . $genNumber . ' R',
-                                                    $objectOffset,
-                                                    true);
-                    }
-
-                    if ( !Zend_Pdf_StringParser::isWhiteSpace(ord( $this->_stringParser->data[$this->_stringParser->offset] )) ) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Value separator must be white space.', $this->_stringParser->offset));
-                    }
-                    $this->_stringParser->offset++;
-                    if ( !Zend_Pdf_StringParser::isWhiteSpace(ord( $this->_stringParser->data[$this->_stringParser->offset] )) ) {
-                        require_once 'Zend/Pdf/Exception.php';
-                        throw new Zend_Pdf_Exception(sprintf('PDF file cross-reference table syntax error. Offset - 0x%X. Value separator must be white space.', $this->_stringParser->offset));
-                    }
-                    $this->_stringParser->offset++;
-
-                    $refCount--;
-                    $objNum++;
-                }
-            }
-
-            $trailerDictOffset = $this->_stringParser->offset;
-            $trailerDict = $this->_stringParser->readElement();
-            if (!$trailerDict instanceof Zend_Pdf_Element_Dictionary) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X.  Dictionary expected after \'trailer\' keyword.', $trailerDictOffset));
-            }
-        } else {
-            $xrefStream = $this->_stringParser->getObject($offset, $context);
-
-            if (!$xrefStream instanceof Zend_Pdf_Element_Object_Stream) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X.  Cross-reference stream expected.', $offset));
-            }
-
-            $trailerDict = $xrefStream->dictionary;
-            if ($trailerDict->Type->value != 'XRef') {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X.  Cross-reference stream object must have /Type property assigned to /XRef.', $offset));
-            }
-            if ($trailerDict->W === null  || $trailerDict->W->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Cross reference stream dictionary doesn\'t have W entry or it\'s not an array.', $offset));
-            }
-
-            $entryField1Size = $trailerDict->W->items[0]->value;
-            $entryField2Size = $trailerDict->W->items[1]->value;
-            $entryField3Size = $trailerDict->W->items[2]->value;
-
-            if ($entryField2Size == 0 || $entryField3Size == 0) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Wrong W dictionary entry. Only type field of stream entries has default value and could be zero length.', $offset));
-            }
-
-            $xrefStreamData = $xrefStream->value;
-
-            if ($trailerDict->Index !== null) {
-                if ($trailerDict->Index->getType() != Zend_Pdf_Element::TYPE_ARRAY) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Cross reference stream dictionary Index entry must be an array.', $offset));
-                }
-                $sections = count($trailerDict->Index->items)/2;
-            } else {
-                $sections = 1;
-            }
-
-            $streamOffset = 0;
-
-            $size    = $entryField1Size + $entryField2Size + $entryField3Size;
-            $entries = strlen($xrefStreamData)/$size;
-
-            for ($count = 0; $count < $sections; $count++) {
-                if ($trailerDict->Index !== null) {
-                    $objNum  = $trailerDict->Index->items[$count*2    ]->value;
-                    $entries = $trailerDict->Index->items[$count*2 + 1]->value;
-                } else {
-                    $objNum  = 0;
-                    $entries = $trailerDict->Size->value;
-                }
-
-                for ($count2 = 0; $count2 < $entries; $count2++) {
-                    if ($entryField1Size == 0) {
-                        $type = 1;
-                    } else if ($entryField1Size == 1) { // Optimyze one-byte field case
-                        $type = ord($xrefStreamData[$streamOffset++]);
-                    } else {
-                        $type = Zend_Pdf_StringParser::parseIntFromStream($xrefStreamData, $streamOffset, $entryField1Size);
-                        $streamOffset += $entryField1Size;
-                    }
-
-                    if ($entryField2Size == 1) { // Optimyze one-byte field case
-                        $field2 = ord($xrefStreamData[$streamOffset++]);
-                    } else {
-                        $field2 = Zend_Pdf_StringParser::parseIntFromStream($xrefStreamData, $streamOffset, $entryField2Size);
-                        $streamOffset += $entryField2Size;
-                    }
-
-                    if ($entryField3Size == 1) { // Optimyze one-byte field case
-                        $field3 = ord($xrefStreamData[$streamOffset++]);
-                    } else {
-                        $field3 = Zend_Pdf_StringParser::parseIntFromStream($xrefStreamData, $streamOffset, $entryField3Size);
-                        $streamOffset += $entryField3Size;
-                    }
-
-                    switch ($type) {
-                        case 0:
-                            // Free object
-                            $refTable->addReference($objNum . ' ' . $field3 . ' R', $field2, false);
-                            // Debug output:
-                            // echo "Free object - $objNum $field3 R, next free - $field2\n";
-                            break;
-
-                        case 1:
-                            // In use object
-                            $refTable->addReference($objNum . ' ' . $field3 . ' R', $field2, true);
-                            // Debug output:
-                            // echo "In-use object - $objNum $field3 R, offset - $field2\n";
-                            break;
-
-                        case 2:
-                            // Object in an object stream
-                            // Debug output:
-                            // echo "Compressed object - $objNum 0 R, object stream - $field2 0 R, offset - $field3\n";
-                            break;
-                    }
-
-                    $objNum++;
-                }
-            }
-
-            // $streamOffset . ' ' . strlen($xrefStreamData) . "\n";
-            // "$entries\n";
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Cross-reference streams are not supported yet.');
-        }
-
-
-        require_once 'Zend/Pdf/Trailer/Keeper.php';
-        $trailerObj = new Zend_Pdf_Trailer_Keeper($trailerDict, $context);
-        if ($trailerDict->Prev instanceof Zend_Pdf_Element_Numeric ||
-            $trailerDict->Prev instanceof Zend_Pdf_Element_Reference ) {
-            $trailerObj->setPrev($this->_loadXRefTable($trailerDict->Prev->value));
-            $context->getRefTable()->setParent($trailerObj->getPrev()->getRefTable());
-        }
-
-        /**
-         * We set '/Prev' dictionary property to the current cross-reference section offset.
-         * It doesn't correspond to the actual data, but is true when trailer will be used
-         * as a trailer for next generated PDF section.
-         */
-        $trailerObj->Prev = new Zend_Pdf_Element_Numeric($offset);
-
-        return $trailerObj;
-    }
-
-
-    /**
-     * Get Trailer object
-     *
-     * @return Zend_Pdf_Trailer_Keeper
-     */
-    public function getTrailer()
-    {
-        return $this->_trailer;
-    }
-
-    /**
-     * Object constructor
-     *
-     * Note: PHP duplicates string, which is sent by value, only of it's updated.
-     * Thus we don't need to care about overhead
-     *
-     * @param mixed $source
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     * @param boolean $load
-     * @throws Zend_Exception
-     */
-    public function __construct($source, Zend_Pdf_ElementFactory_Interface $factory, $load)
-    {
-        if ($load) {
-            if (($pdfFile = @fopen($source, 'rb')) === false ) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception( "Can not open '$source' file for reading." );
-            }
-
-            $byteCount = filesize($source);
-
-            $data = fread($pdfFile, $byteCount);
-            $byteCount -= strlen($data);
-            while ( $byteCount > 0 && ($nextBlock = fread($pdfFile, $byteCount)) != false ) {
-                $data .= $nextBlock;
-                $byteCount -= strlen($nextBlock);
-            }
-            fclose($pdfFile);
-
-            $this->_stringParser = new Zend_Pdf_StringParser($data, $factory);
-        } else {
-            $this->_stringParser = new Zend_Pdf_StringParser($source, $factory);
-        }
-
-        $pdfVersionComment = $this->_stringParser->readComment();
-        if (substr($pdfVersionComment, 0, 5) != '%PDF-') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('File is not a PDF.');
-        }
-
-        $pdfVersion = substr($pdfVersionComment, 5);
-        if (version_compare($pdfVersion, '0.9',  '<')  ||
-            version_compare($pdfVersion, '1.61', '>=')
-           ) {
-            /**
-             * @todo
-             * To support PDF versions 1.5 (Acrobat 6) and PDF version 1.7 (Acrobat 7)
-             * Stream compression filter must be implemented (for compressed object streams).
-             * Cross reference streams must be implemented
-             */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('Unsupported PDF version. Zend_Pdf supports PDF 1.0-1.4. Current version - \'%f\'', $pdfVersion));
-        }
-        $this->_pdfVersion = $pdfVersion;
-
-        $this->_stringParser->offset = strrpos($this->_stringParser->data, '%%EOF');
-        if ($this->_stringParser->offset === false ||
-            strlen($this->_stringParser->data) - $this->_stringParser->offset > 7) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Pdf file syntax error. End-of-fle marker expected at the end of file.');
-        }
-
-        $this->_stringParser->offset--;
-        /**
-         * Go to end of cross-reference table offset
-         */
-        while (Zend_Pdf_StringParser::isWhiteSpace( ord($this->_stringParser->data[$this->_stringParser->offset]) )&&
-               ($this->_stringParser->offset > 0)) {
-            $this->_stringParser->offset--;
-        }
-        /**
-         * Go to the start of cross-reference table offset
-         */
-        while ( (!Zend_Pdf_StringParser::isWhiteSpace( ord($this->_stringParser->data[$this->_stringParser->offset]) ))&&
-               ($this->_stringParser->offset > 0)) {
-            $this->_stringParser->offset--;
-        }
-        /**
-         * Go to the end of 'startxref' keyword
-         */
-        while (Zend_Pdf_StringParser::isWhiteSpace( ord($this->_stringParser->data[$this->_stringParser->offset]) )&&
-               ($this->_stringParser->offset > 0)) {
-            $this->_stringParser->offset--;
-        }
-        /**
-         * Go to the white space (eol marker) before 'startxref' keyword
-         */
-        $this->_stringParser->offset -= 9;
-
-        $nextLexeme = $this->_stringParser->readLexeme();
-        if ($nextLexeme != 'startxref') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('Pdf file syntax error. \'startxref\' keyword expected. Offset - 0x%X.', $this->_stringParser->offset-strlen($nextLexeme)));
-        }
-
-        $startXref = $this->_stringParser->readLexeme();
-        if (!ctype_digit($startXref)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('Pdf file syntax error. Cross-reference table offset must contain only digits. Offset - 0x%X.', $this->_stringParser->offset-strlen($nextLexeme)));
-        }
-
-        $this->_trailer = $this->_loadXRefTable($startXref);
-        $factory->setObjectCount($this->_trailer->Size->value);
-    }
-
-
-    /**
-     * Object destructor
-     */
-    public function __destruct()
-    {
-        $this->_stringParser->cleanUp();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php b/airtime_mvc/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php
deleted file mode 100644
index 456c58f5f..000000000
--- a/airtime_mvc/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RecursivelyIteratableObjectsContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Iteratable objects container
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_RecursivelyIteratableObjectsContainer implements RecursiveIterator, Countable
-{
-    protected $_objects = array();
-
-    public function __construct(array $objects) { $this->_objects = $objects; }
-
-    public function current()      { return current($this->_objects);            }
-    public function key()          { return key($this->_objects);                }
-    public function next()         { return next($this->_objects);               }
-    public function rewind()       { return reset($this->_objects);              }
-    public function valid()        { return current($this->_objects) !== false;  }
-    public function getChildren()  { return current($this->_objects);            }
-    public function hasChildren()  { return count($this->_objects) > 0;          }
-
-    public function count() { return count($this->_objects); }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource.php b/airtime_mvc/library/Zend/Pdf/Resource.php
deleted file mode 100644
index 9df14317f..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF file Resource abstraction
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource
-{
-    /**
-     * Each Pdf resource (fonts, images, ...) interacts with a PDF itself.
-     * It creates appropriate PDF objects, structures and sometime embedded files.
-     * Resources are referenced in content streams by names, which are stored in
-     * a page resource dictionaries.
-     *
-     * Thus, resources must be attached to the PDF.
-     *
-     * Resource abstraction uses own PDF object factory to store all necessary information.
-     * At the render time internal object factory is appended to the global PDF file
-     * factory.
-     *
-     * Resource abstraction also cashes information about rendered PDF files and
-     * doesn't duplicate resource description each time then Resource is rendered
-     * (referenced).
-     *
-     * @var Zend_Pdf_ElementFactory_Interface
-     */
-    protected $_objectFactory;
-
-    /**
-     * Main resource object
-     *
-     * @var Zend_Pdf_Element_Object
-     */
-    protected $_resource;
-
-    /**
-     * Object constructor.
-     *
-     * If resource is not a Zend_Pdf_Element object, then stream object with specified value is
-     * generated.
-     *
-     * @param Zend_Pdf_Element|string $resource
-     */
-    public function __construct($resource)
-    {
-        require_once 'Zend/Pdf/ElementFactory.php';
-
-        $this->_objectFactory     = Zend_Pdf_ElementFactory::createFactory(1);
-        if ($resource instanceof Zend_Pdf_Element) {
-            $this->_resource      = $this->_objectFactory->newObject($resource);
-        } else {
-            $this->_resource      = $this->_objectFactory->newStreamObject($resource);
-        }
-    }
-
-    /**
-     * Get resource.
-     * Used to reference resource in an internal PDF data structures (resource dictionaries)
-     *
-     * @internal
-     * @return Zend_Pdf_Element_Object
-     */
-    public function getResource()
-    {
-        return $this->_resource;
-    }
-
-    /**
-     * Get factory.
-     *
-     * @internal
-     * @return Zend_Pdf_ElementFactory_Interface
-     */
-    public function getFactory()
-    {
-        return $this->_objectFactory;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font.php b/airtime_mvc/library/Zend/Pdf/Resource/Font.php
deleted file mode 100644
index 84b16e3ac..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font.php
+++ /dev/null
@@ -1,530 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Pdf_Resource */
-require_once 'Zend/Pdf/Resource.php';
-
-/**
- * Zend_Pdf_Font
- *
- * Zend_Pdf_Font class constants are used within Zend_Pdf_Resource_Font
- * and its subclusses.
- */
-require_once 'Zend/Pdf/Font.php';
-
-/**
- * Abstract class which manages PDF fonts.
- *
- * Defines the public interface and creates shared storage for concrete
- * subclasses which are responsible for generating the font's information
- * dictionaries, mapping characters to glyphs, and providing both overall font
- * and glyph-specific metric data.
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Font extends Zend_Pdf_Resource
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * The type of font. Use TYPE_ constants defined in {@link Zend_Pdf_Font}.
-     * @var integer
-     */
-    protected $_fontType = Zend_Pdf_Font::TYPE_UNKNOWN;
-
-    /**
-     * Array containing descriptive names for the font. See {@link fontName()}.
-     * @var array
-     */
-    protected $_fontNames = array();
-
-    /**
-     * Flag indicating whether or not this font is bold.
-     * @var boolean
-     */
-    protected $_isBold = false;
-
-    /**
-     * Flag indicating whether or not this font is italic.
-     * @var boolean
-     */
-    protected $_isItalic = false;
-
-    /**
-     * Flag indicating whether or not this font is monospaced.
-     * @var boolean
-     */
-    protected $_isMonospace = false;
-
-    /**
-     * The position below the text baseline of the underline (in glyph units).
-     * @var integer
-     */
-    protected $_underlinePosition = 0;
-
-    /**
-     * The thickness of the underline (in glyph units).
-     * @var integer
-     */
-    protected $_underlineThickness = 0;
-
-    /**
-     * The position above the text baseline of the strikethrough (in glyph units).
-     * @var integer
-     */
-    protected $_strikePosition = 0;
-
-    /**
-     * The thickness of the strikethrough (in glyph units).
-     * @var integer
-     */
-    protected $_strikeThickness = 0;
-
-    /**
-     * Number of glyph units per em. See {@link getUnitsPerEm()}.
-     * @var integer
-     */
-    protected $_unitsPerEm = 0;
-
-    /**
-     * Typographical ascent. See {@link getAscent()}.
-     * @var integer
-     */
-    protected $_ascent = 0;
-
-    /**
-     * Typographical descent. See {@link getDescent()}.
-     * @var integer
-     */
-    protected $_descent = 0;
-
-    /**
-     * Typographical line gap. See {@link getLineGap()}.
-     * @var integer
-     */
-    protected $_lineGap = 0;
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct(new Zend_Pdf_Element_Dictionary());
-        $this->_resource->Type = new Zend_Pdf_Element_Name('Font');
-    }
-
-
-  /* Object Magic Methods */
-
-    /**
-     * Returns the full name of the font in the encoding method of the current
-     * locale. Transliterates any characters that cannot be naturally
-     * represented in that character set.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getFontName(Zend_Pdf_Font::NAME_FULL, '', '//TRANSLIT');
-    }
-
-
-  /* Accessors */
-
-    /**
-     * Returns the type of font.
-     *
-     * @return integer One of the TYPE_ constants defined in
-     *   {@link Zend_Pdf_Font}.
-     */
-    public function getFontType()
-    {
-        return $this->_fontType;
-    }
-
-    /**
-     * Returns the specified descriptive name for the font.
-     *
-     * The font name type is usually one of the following:
-     * <ul>
-     *  <li>{@link Zend_Pdf_Font::NAME_FULL}
-     *  <li>{@link Zend_Pdf_Font::NAME_FAMILY}
-     *  <li>{@link Zend_Pdf_Font::NAME_PREFERRED_FAMILY}
-     *  <li>{@link Zend_Pdf_Font::NAME_STYLE}
-     *  <li>{@link Zend_Pdf_Font::NAME_PREFERRED_STYLE}
-     *  <li>{@link Zend_Pdf_Font::NAME_DESCRIPTION}
-     *  <li>{@link Zend_Pdf_Font::NAME_SAMPLE_TEXT}
-     *  <li>{@link Zend_Pdf_Font::NAME_ID}
-     *  <li>{@link Zend_Pdf_Font::NAME_VERSION}
-     *  <li>{@link Zend_Pdf_Font::NAME_POSTSCRIPT}
-     *  <li>{@link Zend_Pdf_Font::NAME_CID_NAME}
-     *  <li>{@link Zend_Pdf_Font::NAME_DESIGNER}
-     *  <li>{@link Zend_Pdf_Font::NAME_DESIGNER_URL}
-     *  <li>{@link Zend_Pdf_Font::NAME_MANUFACTURER}
-     *  <li>{@link Zend_Pdf_Font::NAME_VENDOR_URL}
-     *  <li>{@link Zend_Pdf_Font::NAME_COPYRIGHT}
-     *  <li>{@link Zend_Pdf_Font::NAME_TRADEMARK}
-     *  <li>{@link Zend_Pdf_Font::NAME_LICENSE}
-     *  <li>{@link Zend_Pdf_Font::NAME_LICENSE_URL}
-     * </ul>
-     *
-     * Note that not all names are available for all fonts. In addition, some
-     * fonts may contain additional names, whose indicies are in the range
-     * 256 to 32767 inclusive, which are used for certain font layout features.
-     *
-     * If the preferred language translation is not available, uses the first
-     * available translation for the name, which is usually English.
-     *
-     * If the requested name does not exist, returns null.
-     *
-     * All names are stored internally as Unicode strings, using UTF-16BE
-     * encoding. You may optionally supply a different resulting character set.
-     *
-     * @param integer $nameType Type of name requested.
-     * @param mixed $language Preferred language (string) or array of languages
-     *   in preferred order. Use the ISO 639 standard 2-letter language codes.
-     * @param string $characterSet (optional) Desired resulting character set.
-     *   You may use any character set supported by {@link iconv()};
-     * @return string
-     */
-    public function getFontName($nameType, $language, $characterSet = null)
-    {
-        if (! isset($this->_fontNames[$nameType])) {
-            return null;
-        }
-        $name = null;
-        if (is_array($language)) {
-            foreach ($language as $code) {
-                if (isset($this->_fontNames[$nameType][$code])) {
-                    $name = $this->_fontNames[$nameType][$code];
-                    break;
-                }
-            }
-        } else {
-            if (isset($this->_fontNames[$nameType][$language])) {
-                $name = $this->_fontNames[$nameType][$language];
-            }
-        }
-        /* If the preferred language could not be found, use whatever is first.
-         */
-        if ($name === null) {
-            $names = $this->_fontNames[$nameType];
-            $name  = reset($names);
-        }
-        /* Convert the character set if requested.
-         */
-        if (($characterSet !== null) && ($characterSet != 'UTF-16BE') && PHP_OS != 'AIX') { // AIX knows not this charset
-            $name = iconv('UTF-16BE', $characterSet, $name);
-        }
-        return $name;
-    }
-
-    /**
-     * Returns whole set of font names.
-     *
-     * @return array
-     */
-    public function getFontNames()
-    {
-        return $this->_fontNames;
-    }
-
-    /**
-     * Returns true if font is bold.
-     *
-     * @return boolean
-     */
-    public function isBold()
-    {
-        return $this->_isBold;
-    }
-
-    /**
-     * Returns true if font is italic.
-     *
-     * @return boolean
-     */
-    public function isItalic()
-    {
-        return $this->_isItalic;
-    }
-
-    /**
-     * Returns true if font is monospace.
-     *
-     * @return boolean
-     */
-    public function isMonospace()
-    {
-        return $this->_isMonospace;
-    }
-
-    /**
-     * Returns the suggested position below the text baseline of the underline
-     * in glyph units.
-     *
-     * This value is usually negative.
-     *
-     * @return integer
-     */
-    public function getUnderlinePosition()
-    {
-        return $this->_underlinePosition;
-    }
-
-    /**
-     * Returns the suggested line thickness of the underline in glyph units.
-     *
-     * @return integer
-     */
-    public function getUnderlineThickness()
-    {
-        return $this->_underlineThickness;
-    }
-
-    /**
-     * Returns the suggested position above the text baseline of the
-     * strikethrough in glyph units.
-     *
-     * @return integer
-     */
-    public function getStrikePosition()
-    {
-        return $this->_strikePosition;
-    }
-
-    /**
-     * Returns the suggested line thickness of the strikethrough in glyph units.
-     *
-     * @return integer
-     */
-    public function getStrikeThickness()
-    {
-        return $this->_strikeThickness;
-    }
-
-    /**
-     * Returns the number of glyph units per em.
-     *
-     * Used to convert glyph space to user space. Frequently used in conjunction
-     * with {@link widthsForGlyphs()} to calculate the with of a run of text.
-     *
-     * @return integer
-     */
-    public function getUnitsPerEm()
-    {
-        return $this->_unitsPerEm;
-    }
-
-    /**
-     * Returns the typographic ascent in font glyph units.
-     *
-     * The typographic ascent is the distance from the font's baseline to the
-     * top of the text frame. It is frequently used to locate the initial
-     * baseline for a paragraph of text inside a given rectangle.
-     *
-     * @return integer
-     */
-    public function getAscent()
-    {
-        return $this->_ascent;
-    }
-
-    /**
-     * Returns the typographic descent in font glyph units.
-     *
-     * The typographic descent is the distance below the font's baseline to the
-     * bottom of the text frame. It is always negative.
-     *
-     * @return integer
-     */
-    public function getDescent()
-    {
-        return $this->_descent;
-    }
-
-    /**
-     * Returns the typographic line gap in font glyph units.
-     *
-     * The typographic line gap is the distance between the bottom of the text
-     * frame of one line to the top of the text frame of the next. It is
-     * typically combined with the typographical ascent and descent to determine
-     * the font's total line height (or leading).
-     *
-     * @return integer
-     */
-    public function getLineGap()
-    {
-        return $this->_lineGap;
-    }
-
-    /**
-     * Returns the suggested line height (or leading) in font glyph units.
-     *
-     * This value is determined by adding together the values of the typographic
-     * ascent, descent, and line gap. This value yields the suggested line
-     * spacing as determined by the font developer.
-     *
-     * It should be noted that this is only a guideline; layout engines will
-     * frequently modify this value to achieve special effects such as double-
-     * spacing.
-     *
-     * @return integer
-     */
-    public function getLineHeight()
-    {
-        return $this->_ascent - $this->_descent + $this->_lineGap;
-    }
-
-
-  /* Information and Conversion Methods */
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    abstract public function glyphNumbersForCharacters($characterCodes);
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    abstract public function glyphNumberForCharacter($characterCode);
-
-    /**
-     * Returns a number between 0 and 1 inclusive that indicates the percentage
-     * of characters in the string which are covered by glyphs in this font.
-     *
-     * Since no one font will contain glyphs for the entire Unicode character
-     * range, this method can be used to help locate a suitable font when the
-     * actual contents of the string are not known.
-     *
-     * Note that some fonts lie about the characters they support. Additionally,
-     * fonts don't usually contain glyphs for control characters such as tabs
-     * and line breaks, so it is rare that you will get back a full 1.0 score.
-     * The resulting value should be considered informational only.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   If omitted, uses 'current locale'.
-     * @return float
-     */
-    abstract public function getCoveredPercentage($string, $charEncoding = '');
-
-    /**
-     * Returns the widths of the glyphs.
-     *
-     * The widths are expressed in the font's glyph space. You are responsible
-     * for converting to user space as necessary. See {@link unitsPerEm()}.
-     *
-     * See also {@link widthForGlyph()}.
-     *
-     * @param array $glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function widthsForGlyphs($glyphNumbers);
-
-    /**
-     * Returns the width of the glyph.
-     *
-     * Like {@link widthsForGlyphs()} but used for one glyph at a time.
-     *
-     * @param integer $glyphNumber
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    abstract public function widthForGlyph($glyphNumber);
-
-    /**
-     * Convert string to the font encoding.
-     *
-     * The method is used to prepare string for text drawing operators
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    abstract public function encodeString($string, $charEncoding);
-
-    /**
-     * Convert string from the font encoding.
-     *
-     * The method is used to convert strings retrieved from existing content streams
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-    abstract public function decodeString($string, $charEncoding);
-
-
-
-  /**** Internal Methods ****/
-
-
-    /**
-     * If the font's glyph space is not 1000 units per em, converts the value.
-     *
-     * @internal
-     * @param integer $value
-     * @return integer
-     */
-    public function toEmSpace($value)
-    {
-        if ($this->_unitsPerEm == 1000) {
-            return $value;
-        }
-        return ceil(($value / $this->_unitsPerEm) * 1000);    // always round up
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont.php
deleted file mode 100644
index a5001e9a7..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CidFont.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/** Zend_Pdf_Resource_Font */
-require_once 'Zend/Pdf/Resource/Font.php';
-
-/**
- * Adobe PDF CIDFont font object implementation
- *
- * A CIDFont program contains glyph descriptions that are accessed using a CID as
- * the character selector. There are two types of CIDFont. A Type 0 CIDFont contains
- * glyph descriptions based on Adobe’s Type 1 font format, whereas those in a
- * Type 2 CIDFont are based on the TrueType font format.
- *
- * A CIDFont dictionary is a PDF object that contains information about a CIDFont program.
- * Although its Type value is Font, a CIDFont is not actually a font. It does not have an Encoding
- * entry, it cannot be listed in the Font subdictionary of a resource dictionary, and it cannot be
- * used as the operand of the Tf operator. It is used only as a descendant of a Type 0 font.
- * The CMap in the Type 0 font is what defines the encoding that maps character codes to CIDs
- * in the CIDFont.
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Font_CidFont extends Zend_Pdf_Resource_Font
-{
-    /**
-     * Object representing the font's cmap (character to glyph map).
-     * @var Zend_Pdf_Cmap
-     */
-    protected $_cmap = null;
-
-    /**
-     * Array containing the widths of each character that have entries in used character map.
-     *
-     * @var array
-     */
-    protected $_charWidths = null;
-
-    /**
-     * Width for characters missed in the font
-     *
-     * @var integer
-     */
-    protected $_missingCharWidth = 0;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_FileParser_Font_OpenType $fontParser Font parser object
-     *   containing OpenType file.
-     * @param integer $embeddingOptions Options for font embedding.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParser_Font_OpenType $fontParser)
-    {
-        parent::__construct();
-
-        $fontParser->parse();
-
-
-        /* Object properties */
-
-        $this->_fontNames = $fontParser->names;
-
-        $this->_isBold       = $fontParser->isBold;
-        $this->_isItalic     = $fontParser->isItalic;
-        $this->_isMonospaced = $fontParser->isMonospaced;
-
-        $this->_underlinePosition  = $fontParser->underlinePosition;
-        $this->_underlineThickness = $fontParser->underlineThickness;
-        $this->_strikePosition     = $fontParser->strikePosition;
-        $this->_strikeThickness    = $fontParser->strikeThickness;
-
-        $this->_unitsPerEm = $fontParser->unitsPerEm;
-
-        $this->_ascent  = $fontParser->ascent;
-        $this->_descent = $fontParser->descent;
-        $this->_lineGap = $fontParser->lineGap;
-
-
-        $this->_cmap = $fontParser->cmap;
-
-
-        /* Resource dictionary */
-
-        $baseFont = $this->getFontName(Zend_Pdf_Font::NAME_POSTSCRIPT, 'en', 'UTF-8');
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name($baseFont);
-
-
-        /**
-         * Prepare widths array.
-         */
-        /* Constract characters widths array using font CMap and glyphs widths array */
-        $glyphWidths = $fontParser->glyphWidths;
-        $charGlyphs  = $this->_cmap->getCoveredCharactersGlyphs();
-        $charWidths  = array();
-        foreach ($charGlyphs as $charCode => $glyph) {
-            $charWidths[$charCode] = $glyphWidths[$glyph];
-        }
-        $this->_charWidths       = $charWidths;
-        $this->_missingCharWidth = $glyphWidths[0];
-
-        /* Width array optimization. Step1: extract default value */
-        $widthFrequencies = array_count_values($charWidths);
-        $defaultWidth          = null;
-        $defaultWidthFrequency = -1;
-        foreach ($widthFrequencies as $width => $frequency) {
-            if ($frequency > $defaultWidthFrequency) {
-                $defaultWidth          = $width;
-                $defaultWidthFrequency = $frequency;
-            }
-        }
-
-        // Store default value in the font dictionary
-        $this->_resource->DW = new Zend_Pdf_Element_Numeric($this->toEmSpace($defaultWidth));
-
-        // Remove characters which corresponds to default width from the widths array
-        $defWidthChars = array_keys($charWidths, $defaultWidth);
-        foreach ($defWidthChars as $charCode) {
-            unset($charWidths[$charCode]);
-        }
-
-        // Order cheracter widths aray by character codes
-        ksort($charWidths, SORT_NUMERIC);
-
-        /* Width array optimization. Step2: Compact character codes sequences */
-        $lastCharCode = -1;
-        $widthsSequences = array();
-        foreach ($charWidths as $charCode => $width) {
-            if ($lastCharCode == -1) {
-                $charCodesSequense = array();
-                $sequenceStartCode = $charCode;
-            } else if ($charCode != $lastCharCode + 1) {
-                // New chracters sequence detected
-                $widthsSequences[$sequenceStartCode] = $charCodesSequense;
-                $charCodesSequense = array();
-                $sequenceStartCode = $charCode;
-            }
-            $charCodesSequense[] = $width;
-            $lastCharCode = $charCode;
-        }
-        // Save last sequence, if widths array is not empty (it may happens for monospaced fonts)
-        if (count($charWidths) != 0) {
-            $widthsSequences[$sequenceStartCode] = $charCodesSequense;
-        }
-
-        $pdfCharsWidths = array();
-        foreach ($widthsSequences as $startCode => $widthsSequence) {
-            /* Width array optimization. Step3: Compact widths sequences */
-            $pdfWidths        = array();
-            $lastWidth        = -1;
-            $widthsInSequence = 0;
-            foreach ($widthsSequence as $width) {
-                if ($lastWidth != $width) {
-                    // New width is detected
-                    if ($widthsInSequence != 0) {
-                        // Previous width value was a part of the widths sequence. Save it as 'c_1st c_last w'.
-                        $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode);                         // First character code
-                        $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode + $widthsInSequence - 1); // Last character code
-                        $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($this->toEmSpace($lastWidth));       // Width
-
-                        // Reset widths sequence
-                        $startCode = $startCode + $widthsInSequence;
-                        $widthsInSequence = 0;
-                    }
-
-                    // Collect new width
-                    $pdfWidths[] = new Zend_Pdf_Element_Numeric($this->toEmSpace($width));
-
-                    $lastWidth = $width;
-                } else {
-                    // Width is equal to previous
-                    if (count($pdfWidths) != 0) {
-                        // We already have some widths collected
-                        // So, we've just detected new widths sequence
-
-                        // Remove last element from widths list, since it's a part of widths sequence
-                        array_pop($pdfWidths);
-
-                        // and write the rest if it's not empty
-                        if (count($pdfWidths) != 0) {
-                            // Save it as 'c_1st [w1 w2 ... wn]'.
-                            $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode); // First character code
-                            $pdfCharsWidths[] = new Zend_Pdf_Element_Array($pdfWidths);   // Widths array
-
-                            // Reset widths collection
-                            $startCode += count($pdfWidths);
-                            $pdfWidths = array();
-                        }
-
-                        $widthsInSequence = 2;
-                    } else {
-                        // Continue widths sequence
-                        $widthsInSequence++;
-                    }
-                }
-            }
-
-            // Check if we have widths collection or widths sequence to wite it down
-            if (count($pdfWidths) != 0) {
-                // We have some widths collected
-                // Save it as 'c_1st [w1 w2 ... wn]'.
-                $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode); // First character code
-                $pdfCharsWidths[] = new Zend_Pdf_Element_Array($pdfWidths);   // Widths array
-            } else if ($widthsInSequence != 0){
-                // We have widths sequence
-                // Save it as 'c_1st c_last w'.
-                $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode);                         // First character code
-                $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($startCode + $widthsInSequence - 1); // Last character code
-                $pdfCharsWidths[] = new Zend_Pdf_Element_Numeric($this->toEmSpace($lastWidth));       // Width
-            }
-        }
-
-        /* Create the Zend_Pdf_Element_Array object and add it to the font's
-         * object factory and resource dictionary.
-         */
-        $widthsArrayElement = new Zend_Pdf_Element_Array($pdfCharsWidths);
-        $widthsObject = $this->_objectFactory->newObject($widthsArrayElement);
-        $this->_resource->W = $widthsObject;
-
-
-        /* CIDSystemInfo dictionary */
-        $cidSystemInfo = new Zend_Pdf_Element_Dictionary();
-        $cidSystemInfo->Registry   = new Zend_Pdf_Element_String('Adobe');
-        $cidSystemInfo->Ordering   = new Zend_Pdf_Element_String('UCS');
-        $cidSystemInfo->Supplement = new Zend_Pdf_Element_Numeric(0);
-        $cidSystemInfoObject            = $this->_objectFactory->newObject($cidSystemInfo);
-        $this->_resource->CIDSystemInfo = $cidSystemInfoObject;
-    }
-
-
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-
-
-    /**
-     * Returns a number between 0 and 1 inclusive that indicates the percentage
-     * of characters in the string which are covered by glyphs in this font.
-     *
-     * Since no one font will contain glyphs for the entire Unicode character
-     * range, this method can be used to help locate a suitable font when the
-     * actual contents of the string are not known.
-     *
-     * Note that some fonts lie about the characters they support. Additionally,
-     * fonts don't usually contain glyphs for control characters such as tabs
-     * and line breaks, so it is rare that you will get back a full 1.0 score.
-     * The resulting value should be considered informational only.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   If omitted, uses 'current locale'.
-     * @return float
-     */
-    public function getCoveredPercentage($string, $charEncoding = '')
-    {
-        /* Convert the string to UTF-16BE encoding so we can match the string's
-         * character codes to those found in the cmap.
-         */
-        if ($charEncoding != 'UTF-16BE') {
-            $string = iconv($charEncoding, 'UTF-16BE', $string);
-        }
-
-        $charCount = iconv_strlen($string, 'UTF-16BE');
-        if ($charCount == 0) {
-            return 0;
-        }
-
-        /* Calculate the score by doing a lookup for each character.
-         */
-        $score = 0;
-        $maxIndex = strlen($string);
-        for ($i = 0; $i < $maxIndex; $i++) {
-            /**
-             * @todo Properly handle characters encoded as surrogate pairs.
-             */
-            $charCode = (ord($string[$i]) << 8) | ord($string[++$i]);
-            /* This could probably be optimized a bit with a binary search...
-             */
-            if (isset($this->_charWidths[$charCode])) {
-                $score++;
-            }
-        }
-        return $score / $charCount;
-    }
-
-    /**
-     * Returns the widths of the Chars.
-     *
-     * The widths are expressed in the font's glyph space. You are responsible
-     * for converting to user space as necessary. See {@link unitsPerEm()}.
-     *
-     * See also {@link widthForChar()}.
-     *
-     * @param array &$glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     */
-    public function widthsForChars($charCodes)
-    {
-        $widths = array();
-        foreach ($charCodes as $key => $charCode) {
-            if (!isset($this->_charWidths[$charCode])) {
-                $widths[$key] = $this->_missingCharWidth;
-            } else {
-                $widths[$key] = $this->_charWidths[$charCode];
-            }
-        }
-        return $widths;
-    }
-
-    /**
-     * Returns the width of the character.
-     *
-     * Like {@link widthsForChars()} but used for one char at a time.
-     *
-     * @param integer $charCode
-     * @return integer
-     */
-    public function widthForChar($charCode)
-    {
-        if (!isset($this->_charWidths[$charCode])) {
-            return $this->_missingCharWidth;
-        }
-        return $this->_charWidths[$charCode];
-    }
-
-    /**
-     * Returns the widths of the glyphs.
-     *
-     * @param array &$glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthsForGlyphs($glyphNumbers)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-
-    /**
-     * Returns the width of the glyph.
-     *
-     * Like {@link widthsForGlyphs()} but used for one glyph at a time.
-     *
-     * @param integer $glyphNumber
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthForGlyph($glyphNumber)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-
-    /**
-     * Convert string to the font encoding.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     *      */
-    public function encodeString($string, $charEncoding)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-
-    /**
-     * Convert string from the font encoding.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     * @throws Zend_Pdf_Exception
-     */
-    public function decodeString($string, $charEncoding)
-    {
-        /**
-         * CIDFont object is not actually a font. It does not have an Encoding entry,
-         * it cannot be listed in the Font subdictionary of a resource dictionary, and
-         * it cannot be used as the operand of the Tf operator.
-         *
-         * Throw an exception.
-         */
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('CIDFont PDF objects could not be used as the operand of the text drawing operators');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
deleted file mode 100644
index b6bf04a58..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-
-require_once 'Zend/Pdf/Element/Name.php';
-
-/** Zend_Pdf_Resource_Font_FontDescriptor */
-require_once 'Zend/Pdf/Resource/Font/FontDescriptor.php';
-
-
-/** Zend_Pdf_Resource_Font_CidFont */
-require_once 'Zend/Pdf/Resource/Font/CidFont.php';
-
-/**
- * Type 2 CIDFonts implementation
- *
- * For Type 2, the CIDFont program is actually a TrueType font program, which has
- * no native notion of CIDs. In a TrueType font program, glyph descriptions are
- * identified by glyph index values. Glyph indices are internal to the font and are not
- * defined consistently from one font to another. Instead, a TrueType font program
- * contains a 'cmap' table that provides mappings directly from character codes to
- * glyph indices for one or more predefined encodings.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_CidFont_TrueType extends Zend_Pdf_Resource_Font_CidFont
-{
-    /**
-     * Object constructor
-     *
-     * @todo Joing this class with Zend_Pdf_Resource_Font_Simple_Parsed_TrueType
-     *
-     * @param Zend_Pdf_FileParser_Font_OpenType_TrueType $fontParser Font parser
-     *   object containing parsed TrueType file.
-     * @param integer $embeddingOptions Options for font embedding.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParser_Font_OpenType_TrueType $fontParser, $embeddingOptions)
-    {
-        parent::__construct($fontParser, $embeddingOptions);
-
-        $this->_fontType = Zend_Pdf_Font::TYPE_CIDFONT_TYPE_2;
-
-        $this->_resource->Subtype  = new Zend_Pdf_Element_Name('CIDFontType2');
-
-        $fontDescriptor = Zend_Pdf_Resource_Font_FontDescriptor::factory($this, $fontParser, $embeddingOptions);
-        $this->_resource->FontDescriptor = $this->_objectFactory->newObject($fontDescriptor);
-
-        /* Prepare CIDToGIDMap */
-        // Initialize 128K string of null characters (65536 2 byte integers)
-        $cidToGidMapData = str_repeat("\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 8192);
-        // Fill the index
-        $charGlyphs = $this->_cmap->getCoveredCharactersGlyphs();
-        foreach ($charGlyphs as $charCode => $glyph) {
-            $cidToGidMapData[$charCode*2    ] = chr($glyph >> 8);
-            $cidToGidMapData[$charCode*2 + 1] = chr($glyph & 0xFF);
-        }
-        // Store CIDToGIDMap within compressed stream object
-        $cidToGidMap = $this->_objectFactory->newStreamObject($cidToGidMapData);
-        $cidToGidMap->dictionary->Filter = new Zend_Pdf_Element_Name('FlateDecode');
-        $this->_resource->CIDToGIDMap = $cidToGidMap;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Extracted.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Extracted.php
deleted file mode 100644
index f927eeac5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Extracted.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Extracted.php 20893 2010-02-03 22:59:25Z yoshida@zend.co.jp $
- */
-
-
-/** @see Zend_Pdf_Resource_Font */
-require_once 'Zend/Pdf/Resource/Font.php';
-
-/**
- * Extracted fonts implementation
- *
- * Thes class allows to extract fonts already mentioned within PDF document and use them
- * for text drawing.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Extracted extends Zend_Pdf_Resource_Font
-{
-    /**
-     * Messages
-     */
-    const TYPE_NOT_SUPPORTED = 'Unsupported font type.';
-    const ENCODING_NOT_SUPPORTED  = 'Font encoding is not supported';
-    const OPERATION_NOT_SUPPORTED = 'Operation is not supported for extracted fonts';
-
-    /**
-     * Extracted font encoding
-     *
-     * Only 'Identity-H' and 'WinAnsiEncoding' encodings are supported now
-     *
-     * @var string
-     */
-    protected $_encoding = null;
-
-    /**
-     * Object constructor
-     *
-     * $fontDictionary is a Zend_Pdf_Element_Reference or Zend_Pdf_Element_Object object
-     *
-     * @param mixed $fontDictionary
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($fontDictionary)
-    {
-        // Extract object factory and resource object from font dirctionary object
-        $this->_objectFactory = $fontDictionary->getFactory();
-        $this->_resource      = $fontDictionary;
-
-        if ($fontDictionary->Encoding !== null) {
-            $this->_encoding = $fontDictionary->Encoding->value;
-        }
-
-        switch ($fontDictionary->Subtype->value) {
-            case 'Type0':
-                // Composite type 0 font
-                if (count($fontDictionary->DescendantFonts->items) != 1) {
-                    // Multiple descendant fonts are not supported
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception(self::TYPE_NOT_SUPPORTED);
-                }
-
-                $fontDictionaryIterator = $fontDictionary->DescendantFonts->items->getIterator();
-                $fontDictionaryIterator->rewind();
-                $descendantFont = $fontDictionaryIterator->current();
-                $fontDescriptor = $descendantFont->FontDescriptor;
-                break;
-
-            case 'Type1':
-                if ($fontDictionary->FontDescriptor === null) {
-                    // That's one of the standard fonts
-                    $standardFont = Zend_Pdf_Font::fontWithName($fontDictionary->BaseFont->value);
-
-                    $this->_fontNames          = $standardFont->getFontNames();
-                    $this->_isBold             = $standardFont->isBold();
-                    $this->_isItalic           = $standardFont->isItalic();
-                    $this->_isMonospace        = $standardFont->isMonospace();
-                    $this->_underlinePosition  = $standardFont->getUnderlinePosition();
-                    $this->_underlineThickness = $standardFont->getUnderlineThickness();
-                    $this->_strikePosition     = $standardFont->getStrikePosition();
-                    $this->_strikeThickness    = $standardFont->getStrikeThickness();
-                    $this->_unitsPerEm         = $standardFont->getUnitsPerEm();
-                    $this->_ascent             = $standardFont->getAscent();
-                    $this->_descent            = $standardFont->getDescent();
-                    $this->_lineGap            = $standardFont->getLineGap();
-
-                    return;
-                }
-
-                $fontDescriptor = $fontDictionary->FontDescriptor;
-                break;
-
-            case 'TrueType':
-                $fontDescriptor = $fontDictionary->FontDescriptor;
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(self::TYPE_NOT_SUPPORTED);
-        }
-
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] = iconv('UTF-8', 'UTF-16BE', $fontDictionary->BaseFont->value);
-
-        $this->_isBold             = false; // this property is actually not used anywhere
-        $this->_isItalic           = ( ($fontDescriptor->Flags->value & (1 << 6)) != 0 ); // Bit-7 is set
-        $this->_isMonospace        = ( ($fontDescriptor->Flags->value & (1 << 0)) != 0 ); // Bit-1 is set
-        $this->_underlinePosition  = null; // Can't be extracted
-        $this->_underlineThickness = null; // Can't be extracted
-        $this->_strikePosition     = null; // Can't be extracted
-        $this->_strikeThickness    = null; // Can't be extracted
-        $this->_unitsPerEm         = null; // Can't be extracted
-        $this->_ascent             = $fontDescriptor->Ascent->value;
-        $this->_descent            = $fontDescriptor->Descent->value;
-        $this->_lineGap            = null; // Can't be extracted
-    }
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::OPERATION_NOT_SUPPORTED);
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::OPERATION_NOT_SUPPORTED);
-    }
-
-    /**
-     * Returns a number between 0 and 1 inclusive that indicates the percentage
-     * of characters in the string which are covered by glyphs in this font.
-     *
-     * Since no one font will contain glyphs for the entire Unicode character
-     * range, this method can be used to help locate a suitable font when the
-     * actual contents of the string are not known.
-     *
-     * Note that some fonts lie about the characters they support. Additionally,
-     * fonts don't usually contain glyphs for control characters such as tabs
-     * and line breaks, so it is rare that you will get back a full 1.0 score.
-     * The resulting value should be considered informational only.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   If omitted, uses 'current locale'.
-     * @return float
-     */
-    public function getCoveredPercentage($string, $charEncoding = '')
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::OPERATION_NOT_SUPPORTED);
-    }
-
-    /**
-     * Returns the widths of the glyphs.
-     *
-     * The widths are expressed in the font's glyph space. You are responsible
-     * for converting to user space as necessary. See {@link unitsPerEm()}.
-     *
-     * See also {@link widthForGlyph()}.
-     *
-     * @param array $glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthsForGlyphs($glyphNumbers)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::OPERATION_NOT_SUPPORTED);
-    }
-
-    /**
-     * Returns the width of the glyph.
-     *
-     * Like {@link widthsForGlyphs()} but used for one glyph at a time.
-     *
-     * @param integer $glyphNumber
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthForGlyph($glyphNumber)
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::OPERATION_NOT_SUPPORTED);
-    }
-
-    /**
-     * Convert string to the font encoding.
-     *
-     * The method is used to prepare string for text drawing operators
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    public function encodeString($string, $charEncoding)
-    {
-        if ($this->_encoding == 'Identity-H') {
-            return iconv($charEncoding, 'UTF-16BE', $string);
-        }
-
-        if ($this->_encoding == 'WinAnsiEncoding') {
-            return iconv($charEncoding, 'CP1252//IGNORE', $string);
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::ENCODING_NOT_SUPPORTED);
-    }
-
-    /**
-     * Convert string from the font encoding.
-     *
-     * The method is used to convert strings retrieved from existing content streams
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-    public function decodeString($string, $charEncoding)
-    {
-        if ($this->_encoding == 'Identity-H') {
-            return iconv('UTF-16BE', $charEncoding, $string);
-        }
-
-        if ($this->_encoding == 'WinAnsiEncoding') {
-            return iconv('CP1252', $charEncoding, $string);
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(self::ENCODING_NOT_SUPPORTED);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/FontDescriptor.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/FontDescriptor.php
deleted file mode 100644
index 8687d55e8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/FontDescriptor.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FontDescriptor.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-/** Zend_Pdf_Font */
-require_once 'Zend/Pdf/Font.php';
-
-
-/**
- * FontDescriptor implementation
- *
- * A font descriptor specifies metrics and other attributes of a simple font or a
- * CIDFont as a whole, as distinct from the metrics of individual glyphs. These font
- * metrics provide information that enables a viewer application to synthesize a
- * substitute font or select a similar font when the font program is unavailable. The
- * font descriptor may also be used to embed the font program in the PDF file.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_FontDescriptor
-{
-    /**
-     * Object constructor
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct()
-    {
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception('Zend_Pdf_Resource_Font_FontDescriptor is not intended to be instantiated');
-    }
-
-    /**
-     * Object constructor
-     *
-     * The $embeddingOptions parameter allows you to set certain flags related
-     * to font embedding. You may combine options by OR-ing them together. See
-     * the EMBED_ constants defined in {@link Zend_Pdf_Font} for the list of
-     * available options and their descriptions.
-     *
-     * Note that it is not requried that fonts be embedded within the PDF file
-     * to use them. If the recipient of the PDF has the font installed on their
-     * computer, they will see the correct fonts in the document. If they don't,
-     * the PDF viewer will substitute or synthesize a replacement.
-     *
-     *
-     * @param Zend_Pdf_Resource_Font $font Font
-     * @param Zend_Pdf_FileParser_Font_OpenType $fontParser Font parser object containing parsed TrueType file.
-     * @param integer $embeddingOptions Options for font embedding.
-     * @return Zend_Pdf_Element_Dictionary
-     * @throws Zend_Pdf_Exception
-     */
-    static public function factory(Zend_Pdf_Resource_Font $font, Zend_Pdf_FileParser_Font_OpenType $fontParser, $embeddingOptions)
-    {
-        /* The font descriptor object contains the rest of the font metrics and
-         * the information about the embedded font program (if applicible).
-         */
-        $fontDescriptor = new Zend_Pdf_Element_Dictionary();
-
-        $fontDescriptor->Type     = new Zend_Pdf_Element_Name('FontDescriptor');
-        $fontDescriptor->FontName = new Zend_Pdf_Element_Name($font->getResource()->BaseFont->value);
-
-        /* The font flags value is a bitfield that describes the stylistic
-         * attributes of the font. We will set as many of the bits as can be
-         * determined from the font parser.
-         */
-        $flags = 0;
-        if ($fontParser->isMonospaced) {    // bit 1: FixedPitch
-            $flags |= 1 << 0;
-        }
-        if ($fontParser->isSerifFont) {    // bit 2: Serif
-            $flags |= 1 << 1;
-        }
-        if (! $fontParser->isAdobeLatinSubset) {    // bit 3: Symbolic
-            $flags |= 1 << 2;
-        }
-        if ($fontParser->isScriptFont) {    // bit 4: Script
-            $flags |= 1 << 3;
-        }
-        if ($fontParser->isAdobeLatinSubset) {    // bit 6: Nonsymbolic
-            $flags |= 1 << 5;
-        }
-        if ($fontParser->isItalic) {    // bit 7: Italic
-            $flags |= 1 << 6;
-        }
-        // bits 17-19: AllCap, SmallCap, ForceBold; not available
-        $fontDescriptor->Flags = new Zend_Pdf_Element_Numeric($flags);
-
-        $fontBBox = array(new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->xMin)),
-                          new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->yMin)),
-                          new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->xMax)),
-                          new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->yMax)));
-        $fontDescriptor->FontBBox     = new Zend_Pdf_Element_Array($fontBBox);
-
-        $fontDescriptor->ItalicAngle  = new Zend_Pdf_Element_Numeric($fontParser->italicAngle);
-
-        $fontDescriptor->Ascent       = new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->ascent));
-        $fontDescriptor->Descent      = new Zend_Pdf_Element_Numeric($font->toEmSpace($fontParser->descent));
-
-        $fontDescriptor->CapHeight    = new Zend_Pdf_Element_Numeric($fontParser->capitalHeight);
-        /**
-         * The vertical stem width is not yet extracted from the OpenType font
-         * file. For now, record zero which is interpreted as 'unknown'.
-         * @todo Calculate value for StemV.
-         */
-        $fontDescriptor->StemV        = new Zend_Pdf_Element_Numeric(0);
-
-        $fontDescriptor->MissingWidth = new Zend_Pdf_Element_Numeric($fontParser->glyphWidths[0]);
-
-        /* Set up font embedding. This is where the actual font program itself
-         * is embedded within the PDF document.
-         *
-         * Note that it is not requried that fonts be embedded within the PDF
-         * document to use them. If the recipient of the PDF has the font
-         * installed on their computer, they will see the correct fonts in the
-         * document. If they don't, the PDF viewer will substitute or synthesize
-         * a replacement.
-         *
-         * There are several guidelines for font embedding:
-         *
-         * First, the developer might specifically request not to embed the font.
-         */
-        if (!($embeddingOptions & Zend_Pdf_Font::EMBED_DONT_EMBED)) {
-
-            /* Second, the font author may have set copyright bits that prohibit
-             * the font program from being embedded. Yes this is controversial,
-             * but it's the rules:
-             *   http://partners.adobe.com/public/developer/en/acrobat/sdk/FontPolicies.pdf
-             *
-             * To keep the developer in the loop, and to prevent surprising bug
-             * reports of "your PDF doesn't have the right fonts," throw an
-             * exception if the font cannot be embedded.
-             */
-            if (! $fontParser->isEmbeddable) {
-                /* This exception may be suppressed if the developer decides that
-                 * it's not a big deal that the font program can't be embedded.
-                 */
-                if (!($embeddingOptions & Zend_Pdf_Font::EMBED_SUPPRESS_EMBED_EXCEPTION)) {
-                    $message = 'This font cannot be embedded in the PDF document. If you would like to use '
-                             . 'it anyway, you must pass Zend_Pdf_Font::EMBED_SUPPRESS_EMBED_EXCEPTION '
-                             . 'in the $options parameter of the font constructor.';
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception($message, Zend_Pdf_Exception::FONT_CANT_BE_EMBEDDED);
-                }
-
-            } else {
-                /* Otherwise, the default behavior is to embed all custom fonts.
-                 */
-                /* This section will change soon to a stream object data
-                 * provider model so that we don't have to keep a copy of the
-                 * entire font in memory.
-                 *
-                 * We also cannot build font subsetting until the data provider
-                 * model is in place.
-                 */
-                $fontFile = $fontParser->getDataSource()->readAllBytes();
-                $fontFileObject = $font->getFactory()->newStreamObject($fontFile);
-                $fontFileObject->dictionary->Length1 = new Zend_Pdf_Element_Numeric(strlen($fontFile));
-                if (!($embeddingOptions & Zend_Pdf_Font::EMBED_DONT_COMPRESS)) {
-                    /* Compress the font file using Flate. This generally cuts file
-                     * sizes by about half!
-                     */
-                    $fontFileObject->dictionary->Filter = new Zend_Pdf_Element_Name('FlateDecode');
-                }
-                if ($fontParser instanceof Zend_Pdf_FileParser_Font_OpenType_Type1 /* not implemented now */) {
-                    $fontDescriptor->FontFile  = $fontFileObject;
-                } else if ($fontParser instanceof Zend_Pdf_FileParser_Font_OpenType_TrueType) {
-                    $fontDescriptor->FontFile2 = $fontFileObject;
-                } else {
-                    $fontDescriptor->FontFile3 = $fontFileObject;
-                }
-            }
-        }
-
-        return $fontDescriptor;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple.php
deleted file mode 100644
index f72b2bf64..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font */
-require_once 'Zend/Pdf/Resource/Font.php';
-
-/**
- * Adobe PDF Simple fonts implementation
- *
- * PDF simple fonts functionality is presented by Adobe Type 1
- * (including standard PDF Type1 built-in fonts) and TrueType fonts support.
- *
- * Both fonts have the following properties:
- * - Glyphs in the font are selected by single-byte character codes obtained from a
- *   string that is shown by the text-showing operators. Logically, these codes index
- *   into a table of 256 glyphs; the mapping from codes to glyphs is called the font’s
- *   encoding.
- *   PDF specification provides a possibility to specify any user defined encoding in addition
- *   to the standard built-in encodings: Standard-Encoding, MacRomanEncoding, WinAnsiEncoding,
- *   and PDFDocEncoding, but Zend_Pdf simple fonts implementation operates only with
- *   Windows ANSI encoding (except Symbol and ZapfDingbats built-in fonts).
- *
- * - Each glyph has a single set of metrics, including a horizontal displacement or
- *   width. That is, simple fonts support only horizontal writing mode.
- *
- *
- * The code in this class is common to both types. However, you will only deal
- * directly with subclasses.
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Font_Simple extends Zend_Pdf_Resource_Font
-{
-    /**
-     * Object representing the font's cmap (character to glyph map).
-     * @var Zend_Pdf_Cmap
-     */
-    protected $_cmap = null;
-
-    /**
-     * Array containing the widths of each of the glyphs contained in the font.
-     *
-     * Keys are integers starting from 0, which coresponds to Zend_Pdf_Cmap::MISSING_CHARACTER_GLYPH.
-     *
-     * Font character map may contain gaps for actually used glyphs, nevertheless glyphWidths array
-     * contains widths for all glyphs even they are unused.
-     *
-     * @var array
-     */
-    protected $_glyphWidths = null;
-
-    /**
-     * Width for glyphs missed in the font
-     *
-     * Note: Adobe PDF specfication (V1.4 - V1.6) doesn't define behavior for rendering
-     * characters missed in the standard PDF fonts (such us 0x7F (DEL) Windows ANSI code)
-     * Adobe Font Metrics files doesn't also define metrics for "missed glyph".
-     * We provide character width as "0" for this case, but actually it depends on PDF viewer
-     * implementation.
-     *
-     * @var integer
-     */
-    protected $_missingGlyphWidth = 0;
-
-
-    /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        /**
-         * @todo
-         * It's easy to add other encodings support now (Standard-Encoding, MacRomanEncoding,
-         * PDFDocEncoding, MacExpertEncoding, Symbol, and ZapfDingbats).
-         * Steps for the implementation:
-         * - completely describe all PDF single byte encodings in the documentation
-         * - implement non-WinAnsi encodings processing into encodeString()/decodeString() methods
-         *
-         * These encodings will be automatically supported for standard builtin PDF fonts as well
-         * as for external fonts.
-         */
-        $this->_resource->Encoding = new Zend_Pdf_Element_Name('WinAnsiEncoding');
-    }
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        return $this->_cmap->glyphNumbersForCharacters($characterCodes);
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * If a particular character doesn't exist in this font, the special 'missing
-     * character glyph' will be substituted.
-     *
-     * See also {@link glyphNumbersForCharacters()} which is optimized for bulk
-     * operations.
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        return $this->_cmap->glyphNumberForCharacter($characterCode);
-    }
-
-    /**
-     * Returns a number between 0 and 1 inclusive that indicates the percentage
-     * of characters in the string which are covered by glyphs in this font.
-     *
-     * Since no one font will contain glyphs for the entire Unicode character
-     * range, this method can be used to help locate a suitable font when the
-     * actual contents of the string are not known.
-     *
-     * Note that some fonts lie about the characters they support. Additionally,
-     * fonts don't usually contain glyphs for control characters such as tabs
-     * and line breaks, so it is rare that you will get back a full 1.0 score.
-     * The resulting value should be considered informational only.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   If omitted, uses 'current locale'.
-     * @return float
-     */
-    public function getCoveredPercentage($string, $charEncoding = '')
-    {
-        /* Convert the string to UTF-16BE encoding so we can match the string's
-         * character codes to those found in the cmap.
-         */
-        if ($charEncoding != 'UTF-16BE') {
-            if (PHP_OS != 'AIX') { // AIX doesnt know what UTF-16BE is
-                $string = iconv($charEncoding, 'UTF-16BE', $string);
-            }
-        }
-
-        $charCount = (PHP_OS != 'AIX') ? iconv_strlen($string, 'UTF-16BE') : strlen($string);
-        if ($charCount == 0) {
-            return 0;
-        }
-
-        /* Fetch the covered character code list from the font's cmap.
-         */
-        $coveredCharacters = $this->_cmap->getCoveredCharacters();
-
-        /* Calculate the score by doing a lookup for each character.
-         */
-        $score = 0;
-        $maxIndex = strlen($string);
-        for ($i = 0; $i < $maxIndex; $i++) {
-            /**
-             * @todo Properly handle characters encoded as surrogate pairs.
-             */
-            $charCode = (ord($string[$i]) << 8) | ord($string[++$i]);
-            /* This could probably be optimized a bit with a binary search...
-             */
-            if (in_array($charCode, $coveredCharacters)) {
-                $score++;
-            }
-        }
-        return $score / $charCount;
-    }
-
-    /**
-     * Returns the widths of the glyphs.
-     *
-     * The widths are expressed in the font's glyph space. You are responsible
-     * for converting to user space as necessary. See {@link unitsPerEm()}.
-     *
-     * See also {@link widthForGlyph()}.
-     *
-     * @param array &$glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     */
-    public function widthsForGlyphs($glyphNumbers)
-    {
-        $widths = array();
-        foreach ($glyphNumbers as $key => $glyphNumber) {
-            if (!isset($this->_glyphWidths[$glyphNumber])) {
-                $widths[$key] = $this->_missingGlyphWidth;
-            } else {
-                $widths[$key] = $this->_glyphWidths[$glyphNumber];
-            }
-        }
-        return $widths;
-    }
-
-    /**
-     * Returns the width of the glyph.
-     *
-     * Like {@link widthsForGlyphs()} but used for one glyph at a time.
-     *
-     * @param integer $glyphNumber
-     * @return integer
-     */
-    public function widthForGlyph($glyphNumber)
-    {
-        if (!isset($this->_glyphWidths[$glyphNumber])) {
-            return $this->_missingGlyphWidth;
-        }
-        return $this->_glyphWidths[$glyphNumber];
-    }
-
-    /**
-     * Convert string to the font encoding.
-     *
-     * The method is used to prepare string for text drawing operators
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    public function encodeString($string, $charEncoding)
-    {
-        if (PHP_OS == 'AIX') {
-            return $string; // returning here b/c AIX doesnt know what CP1252 is
-        }
-
-        return iconv($charEncoding, 'CP1252//IGNORE', $string);
-    }
-
-    /**
-     * Convert string from the font encoding.
-     *
-     * The method is used to convert strings retrieved from existing content streams
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-    public function decodeString($string, $charEncoding)
-    {
-        return iconv('CP1252', $charEncoding, $string);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed.php
deleted file mode 100644
index 8c6bcf2b9..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Parsed.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple */
-require_once 'Zend/Pdf/Resource/Font/Simple.php';
-
-/**
- * Parsed and (optionaly) embedded fonts implementation
- *
- * OpenType fonts can contain either TrueType or PostScript Type 1 outlines.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Font_Simple_Parsed extends Zend_Pdf_Resource_Font_Simple
-{
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_FileParser_Font_OpenType $fontParser Font parser object containing OpenType file.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParser_Font_OpenType $fontParser)
-    {
-        parent::__construct();
-
-
-        $fontParser->parse();
-
-        /* Object properties */
-
-        $this->_fontNames = $fontParser->names;
-
-        $this->_isBold       = $fontParser->isBold;
-        $this->_isItalic     = $fontParser->isItalic;
-        $this->_isMonospaced = $fontParser->isMonospaced;
-
-        $this->_underlinePosition  = $fontParser->underlinePosition;
-        $this->_underlineThickness = $fontParser->underlineThickness;
-        $this->_strikePosition     = $fontParser->strikePosition;
-        $this->_strikeThickness    = $fontParser->strikeThickness;
-
-        $this->_unitsPerEm = $fontParser->unitsPerEm;
-
-        $this->_ascent  = $fontParser->ascent;
-        $this->_descent = $fontParser->descent;
-        $this->_lineGap = $fontParser->lineGap;
-
-        $this->_glyphWidths       = $fontParser->glyphWidths;
-        $this->_missingGlyphWidth = $this->_glyphWidths[0];
-
-
-        $this->_cmap = $fontParser->cmap;
-
-
-        /* Resource dictionary */
-
-        $baseFont = $this->getFontName(Zend_Pdf_Font::NAME_POSTSCRIPT, 'en', 'UTF-8');
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name($baseFont);
-
-        $this->_resource->FirstChar = new Zend_Pdf_Element_Numeric(0);
-        $this->_resource->LastChar  = new Zend_Pdf_Element_Numeric(count($this->_glyphWidths) - 1);
-
-        /* Now convert the scalar glyph widths to Zend_Pdf_Element_Numeric objects.
-         */
-        $pdfWidths = array();
-        foreach ($this->_glyphWidths as $width) {
-            $pdfWidths[] = new Zend_Pdf_Element_Numeric($this->toEmSpace($width));
-        }
-        /* Create the Zend_Pdf_Element_Array object and add it to the font's
-         * object factory and resource dictionary.
-         */
-        $widthsArrayElement = new Zend_Pdf_Element_Array($pdfWidths);
-        $widthsObject = $this->_objectFactory->newObject($widthsArrayElement);
-        $this->_resource->Widths = $widthsObject;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
deleted file mode 100644
index 41b3e9968..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-/** Zend_Pdf_Resource_Font_FontDescriptor */
-require_once 'Zend/Pdf/Resource/Font/FontDescriptor.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Parsed */
-require_once 'Zend/Pdf/Resource/Font/Simple/Parsed.php';
-
-/**
- * TrueType fonts implementation
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Parsed_TrueType extends Zend_Pdf_Resource_Font_Simple_Parsed
-{
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_FileParser_Font_OpenType_TrueType $fontParser Font parser
-     *   object containing parsed TrueType file.
-     * @param integer $embeddingOptions Options for font embedding.
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct(Zend_Pdf_FileParser_Font_OpenType_TrueType $fontParser, $embeddingOptions)
-    {
-        parent::__construct($fontParser, $embeddingOptions);
-
-        $this->_fontType = Zend_Pdf_Font::TYPE_TRUETYPE;
-
-        $this->_resource->Subtype  = new Zend_Pdf_Element_Name('TrueType');
-
-        $fontDescriptor = Zend_Pdf_Resource_Font_FontDescriptor::factory($this, $fontParser, $embeddingOptions);
-        $this->_resource->FontDescriptor = $this->_objectFactory->newObject($fontDescriptor);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard.php
deleted file mode 100644
index 2779319dd..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Standard.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple */
-require_once 'Zend/Pdf/Resource/Font/Simple.php';
-
-/**
- * Abstract class definition for the standard 14 Type 1 PDF fonts.
- *
- * The standard 14 PDF fonts are guaranteed to be availble in any PDF viewer
- * implementation. As such, they do not require much data for the font's
- * resource dictionary. The majority of the data provided by subclasses is for
- * the benefit of our own layout code.
- *
- * The standard fonts and the corresponding subclasses that manage them:
- * <ul>
- *  <li>Courier - {@link Zend_Pdf_Resource_Font_Simple_Standard_Courier}
- *  <li>Courier-Bold - {@link Zend_Pdf_Resource_Font_Simple_Standard_CourierBold}
- *  <li>Courier-Oblique - {@link Zend_Pdf_Resource_Font_Simple_Standard_CourierOblique}
- *  <li>Courier-BoldOblique - {@link Zend_Pdf_Resource_Font_Simple_Standard_CourierBoldOblique}
- *  <li>Helvetica - {@link Zend_Pdf_Resource_Font_Simple_Standard_Helvetica}
- *  <li>Helvetica-Bold - {@link Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBold}
- *  <li>Helvetica-Oblique - {@link Zend_Pdf_Resource_Font_Simple_Standard_HelveticaOblique}
- *  <li>Helvetica-BoldOblique - {@link Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBoldOblique}
- *  <li>Symbol - {@link Zend_Pdf_Resource_Font_Simple_Standard_Symbol}
- *  <li>Times - {@link Zend_Pdf_Resource_Font_Simple_Standard_Times}
- *  <li>Times-Bold - {@link Zend_Pdf_Resource_Font_Simple_Standard_TimesBold}
- *  <li>Times-Italic - {@link Zend_Pdf_Resource_Font_Simple_Standard_TimesItalic}
- *  <li>Times-BoldItalic - {@link Zend_Pdf_Resource_Font_Simple_Standard_TimesBoldItalic}
- *  <li>ZapfDingbats - {@link Zend_Pdf_Resource_Font_Simple_Standard_ZapfDingbats}
- * </ul>
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Font_Simple_Standard extends Zend_Pdf_Resource_Font_Simple
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        $this->_fontType = Zend_Pdf_Font::TYPE_STANDARD;
-
-        parent::__construct();
-        $this->_resource->Subtype  = new Zend_Pdf_Element_Name('Type1');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
deleted file mode 100644
index d5dc99f92..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Courier.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Courier.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_Courier extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x39\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x30\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x31\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x32\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x20\x00"
-          . "\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x33\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72";
-
-        $this->_isBold = false;
-        $this->_isItalic = false;
-        $this->_isMonospaced = true;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 629;
-        $this->_descent = -157;
-        $this->_lineGap = 414;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0258,   0x02 => 0x0258,   0x03 => 0x0258,
-            0x04 => 0x0258,   0x05 => 0x0258,   0x06 => 0x0258,   0x07 => 0x0258,
-            0x08 => 0x0258,   0x09 => 0x0258,   0x0a => 0x0258,   0x0b => 0x0258,
-            0x0c => 0x0258,   0x0d => 0x0258,   0x0e => 0x0258,   0x0f => 0x0258,
-            0x10 => 0x0258,   0x11 => 0x0258,   0x12 => 0x0258,   0x13 => 0x0258,
-            0x14 => 0x0258,   0x15 => 0x0258,   0x16 => 0x0258,   0x17 => 0x0258,
-            0x18 => 0x0258,   0x19 => 0x0258,   0x1a => 0x0258,   0x1b => 0x0258,
-            0x1c => 0x0258,   0x1d => 0x0258,   0x1e => 0x0258,   0x1f => 0x0258,
-            0x20 => 0x0258,   0x21 => 0x0258,   0x22 => 0x0258,   0x23 => 0x0258,
-            0x24 => 0x0258,   0x25 => 0x0258,   0x26 => 0x0258,   0x27 => 0x0258,
-            0x28 => 0x0258,   0x29 => 0x0258,   0x2a => 0x0258,   0x2b => 0x0258,
-            0x2c => 0x0258,   0x2d => 0x0258,   0x2e => 0x0258,   0x2f => 0x0258,
-            0x30 => 0x0258,   0x31 => 0x0258,   0x32 => 0x0258,   0x33 => 0x0258,
-            0x34 => 0x0258,   0x35 => 0x0258,   0x36 => 0x0258,   0x37 => 0x0258,
-            0x38 => 0x0258,   0x39 => 0x0258,   0x3a => 0x0258,   0x3b => 0x0258,
-            0x3c => 0x0258,   0x3d => 0x0258,   0x3e => 0x0258,   0x3f => 0x0258,
-            0x40 => 0x0258,   0x41 => 0x0258,   0x42 => 0x0258,   0x43 => 0x0258,
-            0x44 => 0x0258,   0x45 => 0x0258,   0x46 => 0x0258,   0x47 => 0x0258,
-            0x48 => 0x0258,   0x49 => 0x0258,   0x4a => 0x0258,   0x4b => 0x0258,
-            0x4c => 0x0258,   0x4d => 0x0258,   0x4e => 0x0258,   0x4f => 0x0258,
-            0x50 => 0x0258,   0x51 => 0x0258,   0x52 => 0x0258,   0x53 => 0x0258,
-            0x54 => 0x0258,   0x55 => 0x0258,   0x56 => 0x0258,   0x57 => 0x0258,
-            0x58 => 0x0258,   0x59 => 0x0258,   0x5a => 0x0258,   0x5b => 0x0258,
-            0x5c => 0x0258,   0x5d => 0x0258,   0x5e => 0x0258,   0x5f => 0x0258,
-            0x60 => 0x0258,   0x61 => 0x0258,   0x62 => 0x0258,   0x63 => 0x0258,
-            0x64 => 0x0258,   0x65 => 0x0258,   0x66 => 0x0258,   0x67 => 0x0258,
-            0x68 => 0x0258,   0x69 => 0x0258,   0x6a => 0x0258,   0x6b => 0x0258,
-            0x6c => 0x0258,   0x6d => 0x0258,   0x6e => 0x0258,   0x6f => 0x0258,
-            0x70 => 0x0258,   0x71 => 0x0258,   0x72 => 0x0258,   0x73 => 0x0258,
-            0x74 => 0x0258,   0x75 => 0x0258,   0x76 => 0x0258,   0x77 => 0x0258,
-            0x78 => 0x0258,   0x79 => 0x0258,   0x7a => 0x0258,   0x7b => 0x0258,
-            0x7c => 0x0258,   0x7d => 0x0258,   0x7e => 0x0258,   0x7f => 0x0258,
-            0x80 => 0x0258,   0x81 => 0x0258,   0x82 => 0x0258,   0x83 => 0x0258,
-            0x84 => 0x0258,   0x85 => 0x0258,   0x86 => 0x0258,   0x87 => 0x0258,
-            0x88 => 0x0258,   0x89 => 0x0258,   0x8a => 0x0258,   0x8b => 0x0258,
-            0x8c => 0x0258,   0x8d => 0x0258,   0x8e => 0x0258,   0x8f => 0x0258,
-            0x90 => 0x0258,   0x91 => 0x0258,   0x92 => 0x0258,   0x93 => 0x0258,
-            0x94 => 0x0258,   0x95 => 0x0258,   0x96 => 0x0258,   0x97 => 0x0258,
-            0x98 => 0x0258,   0x99 => 0x0258,   0x9a => 0x0258,   0x9b => 0x0258,
-            0x9c => 0x0258,   0x9d => 0x0258,   0x9e => 0x0258,   0x9f => 0x0258,
-            0xa0 => 0x0258,   0xa1 => 0x0258,   0xa2 => 0x0258,   0xa3 => 0x0258,
-            0xa4 => 0x0258,   0xa5 => 0x0258,   0xa6 => 0x0258,   0xa7 => 0x0258,
-            0xa8 => 0x0258,   0xa9 => 0x0258,   0xaa => 0x0258,   0xab => 0x0258,
-            0xac => 0x0258,   0xad => 0x0258,   0xae => 0x0258,   0xaf => 0x0258,
-            0xb0 => 0x0258,   0xb1 => 0x0258,   0xb2 => 0x0258,   0xb3 => 0x0258,
-            0xb4 => 0x0258,   0xb5 => 0x0258,   0xb6 => 0x0258,   0xb7 => 0x0258,
-            0xb8 => 0x0258,   0xb9 => 0x0258,   0xba => 0x0258,   0xbb => 0x0258,
-            0xbc => 0x0258,   0xbd => 0x0258,   0xbe => 0x0258,   0xbf => 0x0258,
-            0xc0 => 0x0258,   0xc1 => 0x0258,   0xc2 => 0x0258,   0xc3 => 0x0258,
-            0xc4 => 0x0258,   0xc5 => 0x0258,   0xc6 => 0x0258,   0xc7 => 0x0258,
-            0xc8 => 0x0258,   0xc9 => 0x0258,   0xca => 0x0258,   0xcb => 0x0258,
-            0xcc => 0x0258,   0xcd => 0x0258,   0xce => 0x0258,   0xcf => 0x0258,
-            0xd0 => 0x0258,   0xd1 => 0x0258,   0xd2 => 0x0258,   0xd3 => 0x0258,
-            0xd4 => 0x0258,   0xd5 => 0x0258,   0xd6 => 0x0258,   0xd7 => 0x0258,
-            0xd8 => 0x0258,   0xd9 => 0x0258,   0xda => 0x0258,   0xdb => 0x0258,
-            0xdc => 0x0258,   0xdd => 0x0258,   0xde => 0x0258,   0xdf => 0x0258,
-            0xe0 => 0x0258,   0xe1 => 0x0258,   0xe2 => 0x0258,   0xe3 => 0x0258,
-            0xe4 => 0x0258,   0xe5 => 0x0258,   0xe6 => 0x0258,   0xe7 => 0x0258,
-            0xe8 => 0x0258,   0xe9 => 0x0258,   0xea => 0x0258,   0xeb => 0x0258,
-            0xec => 0x0258,   0xed => 0x0258,   0xee => 0x0258,   0xef => 0x0258,
-            0xf0 => 0x0258,   0xf1 => 0x0258,   0xf2 => 0x0258,   0xf3 => 0x0258,
-            0xf4 => 0x0258,   0xf5 => 0x0258,   0xf6 => 0x0258,   0xf7 => 0x0258,
-            0xf8 => 0x0258,   0xf9 => 0x0258,   0xfa => 0x0258,   0xfb => 0x0258,
-            0xfc => 0x0258,   0xfd => 0x0258,   0xfe => 0x0258,   0xff => 0x0258,
-          0x0100 => 0x0258, 0x0101 => 0x0258, 0x0102 => 0x0258, 0x0103 => 0x0258,
-          0x0104 => 0x0258, 0x0105 => 0x0258, 0x0106 => 0x0258, 0x0107 => 0x0258,
-          0x0108 => 0x0258, 0x0109 => 0x0258, 0x010a => 0x0258, 0x010b => 0x0258,
-          0x010c => 0x0258, 0x010d => 0x0258, 0x010e => 0x0258, 0x010f => 0x0258,
-          0x0110 => 0x0258, 0x0111 => 0x0258, 0x0112 => 0x0258, 0x0113 => 0x0258,
-          0x0114 => 0x0258, 0x0115 => 0x0258, 0x0116 => 0x0258, 0x0117 => 0x0258,
-          0x0118 => 0x0258, 0x0119 => 0x0258, 0x011a => 0x0258, 0x011b => 0x0258,
-          0x011c => 0x0258, 0x011d => 0x0258, 0x011e => 0x0258, 0x011f => 0x0258,
-          0x0120 => 0x0258, 0x0121 => 0x0258, 0x0122 => 0x0258, 0x0123 => 0x0258,
-          0x0124 => 0x0258, 0x0125 => 0x0258, 0x0126 => 0x0258, 0x0127 => 0x0258,
-          0x0128 => 0x0258, 0x0129 => 0x0258, 0x012a => 0x0258, 0x012b => 0x0258,
-          0x012c => 0x0258, 0x012d => 0x0258, 0x012e => 0x0258, 0x012f => 0x0258,
-          0x0130 => 0x0258, 0x0131 => 0x0258, 0x0132 => 0x0258, 0x0133 => 0x0258,
-          0x0134 => 0x0258, 0x0135 => 0x0258, 0x0136 => 0x0258, 0x0137 => 0x0258,
-          0x0138 => 0x0258, 0x0139 => 0x0258, 0x013a => 0x0258, 0x013b => 0x0258,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Courier');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
deleted file mode 100644
index 8025ae961..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CourierBold.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Courier-Bold.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_CourierBold extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x39\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x30\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x31\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x34\x00\x38";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x42\x00\x6f\x00\x6c\x00\x64\x00\x20\x00\x42\x00\x6f\x00\x6c\x00"
-          . "\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x33\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x42\x00\x6f\x00\x6c\x00\x64";
-
-        $this->_isBold = true;
-        $this->_isItalic = false;
-        $this->_isMonospaced = true;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 629;
-        $this->_descent = -157;
-        $this->_lineGap = 414;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0258,   0x02 => 0x0258,   0x03 => 0x0258,
-            0x04 => 0x0258,   0x05 => 0x0258,   0x06 => 0x0258,   0x07 => 0x0258,
-            0x08 => 0x0258,   0x09 => 0x0258,   0x0a => 0x0258,   0x0b => 0x0258,
-            0x0c => 0x0258,   0x0d => 0x0258,   0x0e => 0x0258,   0x0f => 0x0258,
-            0x10 => 0x0258,   0x11 => 0x0258,   0x12 => 0x0258,   0x13 => 0x0258,
-            0x14 => 0x0258,   0x15 => 0x0258,   0x16 => 0x0258,   0x17 => 0x0258,
-            0x18 => 0x0258,   0x19 => 0x0258,   0x1a => 0x0258,   0x1b => 0x0258,
-            0x1c => 0x0258,   0x1d => 0x0258,   0x1e => 0x0258,   0x1f => 0x0258,
-            0x20 => 0x0258,   0x21 => 0x0258,   0x22 => 0x0258,   0x23 => 0x0258,
-            0x24 => 0x0258,   0x25 => 0x0258,   0x26 => 0x0258,   0x27 => 0x0258,
-            0x28 => 0x0258,   0x29 => 0x0258,   0x2a => 0x0258,   0x2b => 0x0258,
-            0x2c => 0x0258,   0x2d => 0x0258,   0x2e => 0x0258,   0x2f => 0x0258,
-            0x30 => 0x0258,   0x31 => 0x0258,   0x32 => 0x0258,   0x33 => 0x0258,
-            0x34 => 0x0258,   0x35 => 0x0258,   0x36 => 0x0258,   0x37 => 0x0258,
-            0x38 => 0x0258,   0x39 => 0x0258,   0x3a => 0x0258,   0x3b => 0x0258,
-            0x3c => 0x0258,   0x3d => 0x0258,   0x3e => 0x0258,   0x3f => 0x0258,
-            0x40 => 0x0258,   0x41 => 0x0258,   0x42 => 0x0258,   0x43 => 0x0258,
-            0x44 => 0x0258,   0x45 => 0x0258,   0x46 => 0x0258,   0x47 => 0x0258,
-            0x48 => 0x0258,   0x49 => 0x0258,   0x4a => 0x0258,   0x4b => 0x0258,
-            0x4c => 0x0258,   0x4d => 0x0258,   0x4e => 0x0258,   0x4f => 0x0258,
-            0x50 => 0x0258,   0x51 => 0x0258,   0x52 => 0x0258,   0x53 => 0x0258,
-            0x54 => 0x0258,   0x55 => 0x0258,   0x56 => 0x0258,   0x57 => 0x0258,
-            0x58 => 0x0258,   0x59 => 0x0258,   0x5a => 0x0258,   0x5b => 0x0258,
-            0x5c => 0x0258,   0x5d => 0x0258,   0x5e => 0x0258,   0x5f => 0x0258,
-            0x60 => 0x0258,   0x61 => 0x0258,   0x62 => 0x0258,   0x63 => 0x0258,
-            0x64 => 0x0258,   0x65 => 0x0258,   0x66 => 0x0258,   0x67 => 0x0258,
-            0x68 => 0x0258,   0x69 => 0x0258,   0x6a => 0x0258,   0x6b => 0x0258,
-            0x6c => 0x0258,   0x6d => 0x0258,   0x6e => 0x0258,   0x6f => 0x0258,
-            0x70 => 0x0258,   0x71 => 0x0258,   0x72 => 0x0258,   0x73 => 0x0258,
-            0x74 => 0x0258,   0x75 => 0x0258,   0x76 => 0x0258,   0x77 => 0x0258,
-            0x78 => 0x0258,   0x79 => 0x0258,   0x7a => 0x0258,   0x7b => 0x0258,
-            0x7c => 0x0258,   0x7d => 0x0258,   0x7e => 0x0258,   0x7f => 0x0258,
-            0x80 => 0x0258,   0x81 => 0x0258,   0x82 => 0x0258,   0x83 => 0x0258,
-            0x84 => 0x0258,   0x85 => 0x0258,   0x86 => 0x0258,   0x87 => 0x0258,
-            0x88 => 0x0258,   0x89 => 0x0258,   0x8a => 0x0258,   0x8b => 0x0258,
-            0x8c => 0x0258,   0x8d => 0x0258,   0x8e => 0x0258,   0x8f => 0x0258,
-            0x90 => 0x0258,   0x91 => 0x0258,   0x92 => 0x0258,   0x93 => 0x0258,
-            0x94 => 0x0258,   0x95 => 0x0258,   0x96 => 0x0258,   0x97 => 0x0258,
-            0x98 => 0x0258,   0x99 => 0x0258,   0x9a => 0x0258,   0x9b => 0x0258,
-            0x9c => 0x0258,   0x9d => 0x0258,   0x9e => 0x0258,   0x9f => 0x0258,
-            0xa0 => 0x0258,   0xa1 => 0x0258,   0xa2 => 0x0258,   0xa3 => 0x0258,
-            0xa4 => 0x0258,   0xa5 => 0x0258,   0xa6 => 0x0258,   0xa7 => 0x0258,
-            0xa8 => 0x0258,   0xa9 => 0x0258,   0xaa => 0x0258,   0xab => 0x0258,
-            0xac => 0x0258,   0xad => 0x0258,   0xae => 0x0258,   0xaf => 0x0258,
-            0xb0 => 0x0258,   0xb1 => 0x0258,   0xb2 => 0x0258,   0xb3 => 0x0258,
-            0xb4 => 0x0258,   0xb5 => 0x0258,   0xb6 => 0x0258,   0xb7 => 0x0258,
-            0xb8 => 0x0258,   0xb9 => 0x0258,   0xba => 0x0258,   0xbb => 0x0258,
-            0xbc => 0x0258,   0xbd => 0x0258,   0xbe => 0x0258,   0xbf => 0x0258,
-            0xc0 => 0x0258,   0xc1 => 0x0258,   0xc2 => 0x0258,   0xc3 => 0x0258,
-            0xc4 => 0x0258,   0xc5 => 0x0258,   0xc6 => 0x0258,   0xc7 => 0x0258,
-            0xc8 => 0x0258,   0xc9 => 0x0258,   0xca => 0x0258,   0xcb => 0x0258,
-            0xcc => 0x0258,   0xcd => 0x0258,   0xce => 0x0258,   0xcf => 0x0258,
-            0xd0 => 0x0258,   0xd1 => 0x0258,   0xd2 => 0x0258,   0xd3 => 0x0258,
-            0xd4 => 0x0258,   0xd5 => 0x0258,   0xd6 => 0x0258,   0xd7 => 0x0258,
-            0xd8 => 0x0258,   0xd9 => 0x0258,   0xda => 0x0258,   0xdb => 0x0258,
-            0xdc => 0x0258,   0xdd => 0x0258,   0xde => 0x0258,   0xdf => 0x0258,
-            0xe0 => 0x0258,   0xe1 => 0x0258,   0xe2 => 0x0258,   0xe3 => 0x0258,
-            0xe4 => 0x0258,   0xe5 => 0x0258,   0xe6 => 0x0258,   0xe7 => 0x0258,
-            0xe8 => 0x0258,   0xe9 => 0x0258,   0xea => 0x0258,   0xeb => 0x0258,
-            0xec => 0x0258,   0xed => 0x0258,   0xee => 0x0258,   0xef => 0x0258,
-            0xf0 => 0x0258,   0xf1 => 0x0258,   0xf2 => 0x0258,   0xf3 => 0x0258,
-            0xf4 => 0x0258,   0xf5 => 0x0258,   0xf6 => 0x0258,   0xf7 => 0x0258,
-            0xf8 => 0x0258,   0xf9 => 0x0258,   0xfa => 0x0258,   0xfb => 0x0258,
-            0xfc => 0x0258,   0xfd => 0x0258,   0xfe => 0x0258,   0xff => 0x0258,
-          0x0100 => 0x0258, 0x0101 => 0x0258, 0x0102 => 0x0258, 0x0103 => 0x0258,
-          0x0104 => 0x0258, 0x0105 => 0x0258, 0x0106 => 0x0258, 0x0107 => 0x0258,
-          0x0108 => 0x0258, 0x0109 => 0x0258, 0x010a => 0x0258, 0x010b => 0x0258,
-          0x010c => 0x0258, 0x010d => 0x0258, 0x010e => 0x0258, 0x010f => 0x0258,
-          0x0110 => 0x0258, 0x0111 => 0x0258, 0x0112 => 0x0258, 0x0113 => 0x0258,
-          0x0114 => 0x0258, 0x0115 => 0x0258, 0x0116 => 0x0258, 0x0117 => 0x0258,
-          0x0118 => 0x0258, 0x0119 => 0x0258, 0x011a => 0x0258, 0x011b => 0x0258,
-          0x011c => 0x0258, 0x011d => 0x0258, 0x011e => 0x0258, 0x011f => 0x0258,
-          0x0120 => 0x0258, 0x0121 => 0x0258, 0x0122 => 0x0258, 0x0123 => 0x0258,
-          0x0124 => 0x0258, 0x0125 => 0x0258, 0x0126 => 0x0258, 0x0127 => 0x0258,
-          0x0128 => 0x0258, 0x0129 => 0x0258, 0x012a => 0x0258, 0x012b => 0x0258,
-          0x012c => 0x0258, 0x012d => 0x0258, 0x012e => 0x0258, 0x012f => 0x0258,
-          0x0130 => 0x0258, 0x0131 => 0x0258, 0x0132 => 0x0258, 0x0133 => 0x0258,
-          0x0134 => 0x0258, 0x0135 => 0x0258, 0x0136 => 0x0258, 0x0137 => 0x0258,
-          0x0138 => 0x0258, 0x0139 => 0x0258, 0x013a => 0x0258, 0x013b => 0x0258,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Courier-Bold');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
deleted file mode 100644
index b65ab1a85..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CourierBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Courier-BoldOblique.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_CourierBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x39\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x30\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x31\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x34\x00\x39";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x42\x00\x6f\x00\x6c\x00\x64\x00\x4f\x00\x62\x00\x6c\x00\x69\x00"
-          . "\x71\x00\x75\x00\x65\x00\x20\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x33\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x42\x00\x6f\x00\x6c\x00\x64\x00\x4f\x00\x62\x00\x6c\x00\x69\x00"
-          . "\x71\x00\x75\x00\x65";
-
-        $this->_isBold = true;
-        $this->_isItalic = true;
-        $this->_isMonospaced = true;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 629;
-        $this->_descent = -157;
-        $this->_lineGap = 414;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0258,   0x02 => 0x0258,   0x03 => 0x0258,
-            0x04 => 0x0258,   0x05 => 0x0258,   0x06 => 0x0258,   0x07 => 0x0258,
-            0x08 => 0x0258,   0x09 => 0x0258,   0x0a => 0x0258,   0x0b => 0x0258,
-            0x0c => 0x0258,   0x0d => 0x0258,   0x0e => 0x0258,   0x0f => 0x0258,
-            0x10 => 0x0258,   0x11 => 0x0258,   0x12 => 0x0258,   0x13 => 0x0258,
-            0x14 => 0x0258,   0x15 => 0x0258,   0x16 => 0x0258,   0x17 => 0x0258,
-            0x18 => 0x0258,   0x19 => 0x0258,   0x1a => 0x0258,   0x1b => 0x0258,
-            0x1c => 0x0258,   0x1d => 0x0258,   0x1e => 0x0258,   0x1f => 0x0258,
-            0x20 => 0x0258,   0x21 => 0x0258,   0x22 => 0x0258,   0x23 => 0x0258,
-            0x24 => 0x0258,   0x25 => 0x0258,   0x26 => 0x0258,   0x27 => 0x0258,
-            0x28 => 0x0258,   0x29 => 0x0258,   0x2a => 0x0258,   0x2b => 0x0258,
-            0x2c => 0x0258,   0x2d => 0x0258,   0x2e => 0x0258,   0x2f => 0x0258,
-            0x30 => 0x0258,   0x31 => 0x0258,   0x32 => 0x0258,   0x33 => 0x0258,
-            0x34 => 0x0258,   0x35 => 0x0258,   0x36 => 0x0258,   0x37 => 0x0258,
-            0x38 => 0x0258,   0x39 => 0x0258,   0x3a => 0x0258,   0x3b => 0x0258,
-            0x3c => 0x0258,   0x3d => 0x0258,   0x3e => 0x0258,   0x3f => 0x0258,
-            0x40 => 0x0258,   0x41 => 0x0258,   0x42 => 0x0258,   0x43 => 0x0258,
-            0x44 => 0x0258,   0x45 => 0x0258,   0x46 => 0x0258,   0x47 => 0x0258,
-            0x48 => 0x0258,   0x49 => 0x0258,   0x4a => 0x0258,   0x4b => 0x0258,
-            0x4c => 0x0258,   0x4d => 0x0258,   0x4e => 0x0258,   0x4f => 0x0258,
-            0x50 => 0x0258,   0x51 => 0x0258,   0x52 => 0x0258,   0x53 => 0x0258,
-            0x54 => 0x0258,   0x55 => 0x0258,   0x56 => 0x0258,   0x57 => 0x0258,
-            0x58 => 0x0258,   0x59 => 0x0258,   0x5a => 0x0258,   0x5b => 0x0258,
-            0x5c => 0x0258,   0x5d => 0x0258,   0x5e => 0x0258,   0x5f => 0x0258,
-            0x60 => 0x0258,   0x61 => 0x0258,   0x62 => 0x0258,   0x63 => 0x0258,
-            0x64 => 0x0258,   0x65 => 0x0258,   0x66 => 0x0258,   0x67 => 0x0258,
-            0x68 => 0x0258,   0x69 => 0x0258,   0x6a => 0x0258,   0x6b => 0x0258,
-            0x6c => 0x0258,   0x6d => 0x0258,   0x6e => 0x0258,   0x6f => 0x0258,
-            0x70 => 0x0258,   0x71 => 0x0258,   0x72 => 0x0258,   0x73 => 0x0258,
-            0x74 => 0x0258,   0x75 => 0x0258,   0x76 => 0x0258,   0x77 => 0x0258,
-            0x78 => 0x0258,   0x79 => 0x0258,   0x7a => 0x0258,   0x7b => 0x0258,
-            0x7c => 0x0258,   0x7d => 0x0258,   0x7e => 0x0258,   0x7f => 0x0258,
-            0x80 => 0x0258,   0x81 => 0x0258,   0x82 => 0x0258,   0x83 => 0x0258,
-            0x84 => 0x0258,   0x85 => 0x0258,   0x86 => 0x0258,   0x87 => 0x0258,
-            0x88 => 0x0258,   0x89 => 0x0258,   0x8a => 0x0258,   0x8b => 0x0258,
-            0x8c => 0x0258,   0x8d => 0x0258,   0x8e => 0x0258,   0x8f => 0x0258,
-            0x90 => 0x0258,   0x91 => 0x0258,   0x92 => 0x0258,   0x93 => 0x0258,
-            0x94 => 0x0258,   0x95 => 0x0258,   0x96 => 0x0258,   0x97 => 0x0258,
-            0x98 => 0x0258,   0x99 => 0x0258,   0x9a => 0x0258,   0x9b => 0x0258,
-            0x9c => 0x0258,   0x9d => 0x0258,   0x9e => 0x0258,   0x9f => 0x0258,
-            0xa0 => 0x0258,   0xa1 => 0x0258,   0xa2 => 0x0258,   0xa3 => 0x0258,
-            0xa4 => 0x0258,   0xa5 => 0x0258,   0xa6 => 0x0258,   0xa7 => 0x0258,
-            0xa8 => 0x0258,   0xa9 => 0x0258,   0xaa => 0x0258,   0xab => 0x0258,
-            0xac => 0x0258,   0xad => 0x0258,   0xae => 0x0258,   0xaf => 0x0258,
-            0xb0 => 0x0258,   0xb1 => 0x0258,   0xb2 => 0x0258,   0xb3 => 0x0258,
-            0xb4 => 0x0258,   0xb5 => 0x0258,   0xb6 => 0x0258,   0xb7 => 0x0258,
-            0xb8 => 0x0258,   0xb9 => 0x0258,   0xba => 0x0258,   0xbb => 0x0258,
-            0xbc => 0x0258,   0xbd => 0x0258,   0xbe => 0x0258,   0xbf => 0x0258,
-            0xc0 => 0x0258,   0xc1 => 0x0258,   0xc2 => 0x0258,   0xc3 => 0x0258,
-            0xc4 => 0x0258,   0xc5 => 0x0258,   0xc6 => 0x0258,   0xc7 => 0x0258,
-            0xc8 => 0x0258,   0xc9 => 0x0258,   0xca => 0x0258,   0xcb => 0x0258,
-            0xcc => 0x0258,   0xcd => 0x0258,   0xce => 0x0258,   0xcf => 0x0258,
-            0xd0 => 0x0258,   0xd1 => 0x0258,   0xd2 => 0x0258,   0xd3 => 0x0258,
-            0xd4 => 0x0258,   0xd5 => 0x0258,   0xd6 => 0x0258,   0xd7 => 0x0258,
-            0xd8 => 0x0258,   0xd9 => 0x0258,   0xda => 0x0258,   0xdb => 0x0258,
-            0xdc => 0x0258,   0xdd => 0x0258,   0xde => 0x0258,   0xdf => 0x0258,
-            0xe0 => 0x0258,   0xe1 => 0x0258,   0xe2 => 0x0258,   0xe3 => 0x0258,
-            0xe4 => 0x0258,   0xe5 => 0x0258,   0xe6 => 0x0258,   0xe7 => 0x0258,
-            0xe8 => 0x0258,   0xe9 => 0x0258,   0xea => 0x0258,   0xeb => 0x0258,
-            0xec => 0x0258,   0xed => 0x0258,   0xee => 0x0258,   0xef => 0x0258,
-            0xf0 => 0x0258,   0xf1 => 0x0258,   0xf2 => 0x0258,   0xf3 => 0x0258,
-            0xf4 => 0x0258,   0xf5 => 0x0258,   0xf6 => 0x0258,   0xf7 => 0x0258,
-            0xf8 => 0x0258,   0xf9 => 0x0258,   0xfa => 0x0258,   0xfb => 0x0258,
-            0xfc => 0x0258,   0xfd => 0x0258,   0xfe => 0x0258,   0xff => 0x0258,
-          0x0100 => 0x0258, 0x0101 => 0x0258, 0x0102 => 0x0258, 0x0103 => 0x0258,
-          0x0104 => 0x0258, 0x0105 => 0x0258, 0x0106 => 0x0258, 0x0107 => 0x0258,
-          0x0108 => 0x0258, 0x0109 => 0x0258, 0x010a => 0x0258, 0x010b => 0x0258,
-          0x010c => 0x0258, 0x010d => 0x0258, 0x010e => 0x0258, 0x010f => 0x0258,
-          0x0110 => 0x0258, 0x0111 => 0x0258, 0x0112 => 0x0258, 0x0113 => 0x0258,
-          0x0114 => 0x0258, 0x0115 => 0x0258, 0x0116 => 0x0258, 0x0117 => 0x0258,
-          0x0118 => 0x0258, 0x0119 => 0x0258, 0x011a => 0x0258, 0x011b => 0x0258,
-          0x011c => 0x0258, 0x011d => 0x0258, 0x011e => 0x0258, 0x011f => 0x0258,
-          0x0120 => 0x0258, 0x0121 => 0x0258, 0x0122 => 0x0258, 0x0123 => 0x0258,
-          0x0124 => 0x0258, 0x0125 => 0x0258, 0x0126 => 0x0258, 0x0127 => 0x0258,
-          0x0128 => 0x0258, 0x0129 => 0x0258, 0x012a => 0x0258, 0x012b => 0x0258,
-          0x012c => 0x0258, 0x012d => 0x0258, 0x012e => 0x0258, 0x012f => 0x0258,
-          0x0130 => 0x0258, 0x0131 => 0x0258, 0x0132 => 0x0258, 0x0133 => 0x0258,
-          0x0134 => 0x0258, 0x0135 => 0x0258, 0x0136 => 0x0258, 0x0137 => 0x0258,
-          0x0138 => 0x0258, 0x0139 => 0x0258, 0x013a => 0x0258, 0x013b => 0x0258,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Courier-BoldOblique');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
deleted file mode 100644
index 90e632c2c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CourierOblique.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Courier-Oblique.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_CourierOblique extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x39\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x30\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x31\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x32\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x31";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x4f\x00\x62\x00\x6c\x00\x69\x00\x71\x00\x75\x00\x65\x00\x20\x00"
-          . "\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x33\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x43\x00\x6f\x00\x75\x00\x72\x00\x69\x00\x65\x00\x72\x00\x2d\x00"
-          . "\x4f\x00\x62\x00\x6c\x00\x69\x00\x71\x00\x75\x00\x65";
-
-        $this->_isBold = false;
-        $this->_isItalic = true;
-        $this->_isMonospaced = true;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 629;
-        $this->_descent = -157;
-        $this->_lineGap = 414;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0258,   0x02 => 0x0258,   0x03 => 0x0258,
-            0x04 => 0x0258,   0x05 => 0x0258,   0x06 => 0x0258,   0x07 => 0x0258,
-            0x08 => 0x0258,   0x09 => 0x0258,   0x0a => 0x0258,   0x0b => 0x0258,
-            0x0c => 0x0258,   0x0d => 0x0258,   0x0e => 0x0258,   0x0f => 0x0258,
-            0x10 => 0x0258,   0x11 => 0x0258,   0x12 => 0x0258,   0x13 => 0x0258,
-            0x14 => 0x0258,   0x15 => 0x0258,   0x16 => 0x0258,   0x17 => 0x0258,
-            0x18 => 0x0258,   0x19 => 0x0258,   0x1a => 0x0258,   0x1b => 0x0258,
-            0x1c => 0x0258,   0x1d => 0x0258,   0x1e => 0x0258,   0x1f => 0x0258,
-            0x20 => 0x0258,   0x21 => 0x0258,   0x22 => 0x0258,   0x23 => 0x0258,
-            0x24 => 0x0258,   0x25 => 0x0258,   0x26 => 0x0258,   0x27 => 0x0258,
-            0x28 => 0x0258,   0x29 => 0x0258,   0x2a => 0x0258,   0x2b => 0x0258,
-            0x2c => 0x0258,   0x2d => 0x0258,   0x2e => 0x0258,   0x2f => 0x0258,
-            0x30 => 0x0258,   0x31 => 0x0258,   0x32 => 0x0258,   0x33 => 0x0258,
-            0x34 => 0x0258,   0x35 => 0x0258,   0x36 => 0x0258,   0x37 => 0x0258,
-            0x38 => 0x0258,   0x39 => 0x0258,   0x3a => 0x0258,   0x3b => 0x0258,
-            0x3c => 0x0258,   0x3d => 0x0258,   0x3e => 0x0258,   0x3f => 0x0258,
-            0x40 => 0x0258,   0x41 => 0x0258,   0x42 => 0x0258,   0x43 => 0x0258,
-            0x44 => 0x0258,   0x45 => 0x0258,   0x46 => 0x0258,   0x47 => 0x0258,
-            0x48 => 0x0258,   0x49 => 0x0258,   0x4a => 0x0258,   0x4b => 0x0258,
-            0x4c => 0x0258,   0x4d => 0x0258,   0x4e => 0x0258,   0x4f => 0x0258,
-            0x50 => 0x0258,   0x51 => 0x0258,   0x52 => 0x0258,   0x53 => 0x0258,
-            0x54 => 0x0258,   0x55 => 0x0258,   0x56 => 0x0258,   0x57 => 0x0258,
-            0x58 => 0x0258,   0x59 => 0x0258,   0x5a => 0x0258,   0x5b => 0x0258,
-            0x5c => 0x0258,   0x5d => 0x0258,   0x5e => 0x0258,   0x5f => 0x0258,
-            0x60 => 0x0258,   0x61 => 0x0258,   0x62 => 0x0258,   0x63 => 0x0258,
-            0x64 => 0x0258,   0x65 => 0x0258,   0x66 => 0x0258,   0x67 => 0x0258,
-            0x68 => 0x0258,   0x69 => 0x0258,   0x6a => 0x0258,   0x6b => 0x0258,
-            0x6c => 0x0258,   0x6d => 0x0258,   0x6e => 0x0258,   0x6f => 0x0258,
-            0x70 => 0x0258,   0x71 => 0x0258,   0x72 => 0x0258,   0x73 => 0x0258,
-            0x74 => 0x0258,   0x75 => 0x0258,   0x76 => 0x0258,   0x77 => 0x0258,
-            0x78 => 0x0258,   0x79 => 0x0258,   0x7a => 0x0258,   0x7b => 0x0258,
-            0x7c => 0x0258,   0x7d => 0x0258,   0x7e => 0x0258,   0x7f => 0x0258,
-            0x80 => 0x0258,   0x81 => 0x0258,   0x82 => 0x0258,   0x83 => 0x0258,
-            0x84 => 0x0258,   0x85 => 0x0258,   0x86 => 0x0258,   0x87 => 0x0258,
-            0x88 => 0x0258,   0x89 => 0x0258,   0x8a => 0x0258,   0x8b => 0x0258,
-            0x8c => 0x0258,   0x8d => 0x0258,   0x8e => 0x0258,   0x8f => 0x0258,
-            0x90 => 0x0258,   0x91 => 0x0258,   0x92 => 0x0258,   0x93 => 0x0258,
-            0x94 => 0x0258,   0x95 => 0x0258,   0x96 => 0x0258,   0x97 => 0x0258,
-            0x98 => 0x0258,   0x99 => 0x0258,   0x9a => 0x0258,   0x9b => 0x0258,
-            0x9c => 0x0258,   0x9d => 0x0258,   0x9e => 0x0258,   0x9f => 0x0258,
-            0xa0 => 0x0258,   0xa1 => 0x0258,   0xa2 => 0x0258,   0xa3 => 0x0258,
-            0xa4 => 0x0258,   0xa5 => 0x0258,   0xa6 => 0x0258,   0xa7 => 0x0258,
-            0xa8 => 0x0258,   0xa9 => 0x0258,   0xaa => 0x0258,   0xab => 0x0258,
-            0xac => 0x0258,   0xad => 0x0258,   0xae => 0x0258,   0xaf => 0x0258,
-            0xb0 => 0x0258,   0xb1 => 0x0258,   0xb2 => 0x0258,   0xb3 => 0x0258,
-            0xb4 => 0x0258,   0xb5 => 0x0258,   0xb6 => 0x0258,   0xb7 => 0x0258,
-            0xb8 => 0x0258,   0xb9 => 0x0258,   0xba => 0x0258,   0xbb => 0x0258,
-            0xbc => 0x0258,   0xbd => 0x0258,   0xbe => 0x0258,   0xbf => 0x0258,
-            0xc0 => 0x0258,   0xc1 => 0x0258,   0xc2 => 0x0258,   0xc3 => 0x0258,
-            0xc4 => 0x0258,   0xc5 => 0x0258,   0xc6 => 0x0258,   0xc7 => 0x0258,
-            0xc8 => 0x0258,   0xc9 => 0x0258,   0xca => 0x0258,   0xcb => 0x0258,
-            0xcc => 0x0258,   0xcd => 0x0258,   0xce => 0x0258,   0xcf => 0x0258,
-            0xd0 => 0x0258,   0xd1 => 0x0258,   0xd2 => 0x0258,   0xd3 => 0x0258,
-            0xd4 => 0x0258,   0xd5 => 0x0258,   0xd6 => 0x0258,   0xd7 => 0x0258,
-            0xd8 => 0x0258,   0xd9 => 0x0258,   0xda => 0x0258,   0xdb => 0x0258,
-            0xdc => 0x0258,   0xdd => 0x0258,   0xde => 0x0258,   0xdf => 0x0258,
-            0xe0 => 0x0258,   0xe1 => 0x0258,   0xe2 => 0x0258,   0xe3 => 0x0258,
-            0xe4 => 0x0258,   0xe5 => 0x0258,   0xe6 => 0x0258,   0xe7 => 0x0258,
-            0xe8 => 0x0258,   0xe9 => 0x0258,   0xea => 0x0258,   0xeb => 0x0258,
-            0xec => 0x0258,   0xed => 0x0258,   0xee => 0x0258,   0xef => 0x0258,
-            0xf0 => 0x0258,   0xf1 => 0x0258,   0xf2 => 0x0258,   0xf3 => 0x0258,
-            0xf4 => 0x0258,   0xf5 => 0x0258,   0xf6 => 0x0258,   0xf7 => 0x0258,
-            0xf8 => 0x0258,   0xf9 => 0x0258,   0xfa => 0x0258,   0xfb => 0x0258,
-            0xfc => 0x0258,   0xfd => 0x0258,   0xfe => 0x0258,   0xff => 0x0258,
-          0x0100 => 0x0258, 0x0101 => 0x0258, 0x0102 => 0x0258, 0x0103 => 0x0258,
-          0x0104 => 0x0258, 0x0105 => 0x0258, 0x0106 => 0x0258, 0x0107 => 0x0258,
-          0x0108 => 0x0258, 0x0109 => 0x0258, 0x010a => 0x0258, 0x010b => 0x0258,
-          0x010c => 0x0258, 0x010d => 0x0258, 0x010e => 0x0258, 0x010f => 0x0258,
-          0x0110 => 0x0258, 0x0111 => 0x0258, 0x0112 => 0x0258, 0x0113 => 0x0258,
-          0x0114 => 0x0258, 0x0115 => 0x0258, 0x0116 => 0x0258, 0x0117 => 0x0258,
-          0x0118 => 0x0258, 0x0119 => 0x0258, 0x011a => 0x0258, 0x011b => 0x0258,
-          0x011c => 0x0258, 0x011d => 0x0258, 0x011e => 0x0258, 0x011f => 0x0258,
-          0x0120 => 0x0258, 0x0121 => 0x0258, 0x0122 => 0x0258, 0x0123 => 0x0258,
-          0x0124 => 0x0258, 0x0125 => 0x0258, 0x0126 => 0x0258, 0x0127 => 0x0258,
-          0x0128 => 0x0258, 0x0129 => 0x0258, 0x012a => 0x0258, 0x012b => 0x0258,
-          0x012c => 0x0258, 0x012d => 0x0258, 0x012e => 0x0258, 0x012f => 0x0258,
-          0x0130 => 0x0258, 0x0131 => 0x0258, 0x0132 => 0x0258, 0x0133 => 0x0258,
-          0x0134 => 0x0258, 0x0135 => 0x0258, 0x0136 => 0x0258, 0x0137 => 0x0258,
-          0x0138 => 0x0258, 0x0139 => 0x0258, 0x013a => 0x0258, 0x013b => 0x0258,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Courier-Oblique');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
deleted file mode 100644
index cf081b0b5..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Helvetica.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Helvetica.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_Helvetica extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e\x00\x48\x00\x65\x00\x6c\x00\x76\x00"
-          . "\x65\x00\x74\x00\x69\x00\x63\x00\x61\x00\x20\x00\x69\x00\x73\x00"
-          . "\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00\x64\x00\x65\x00"
-          . "\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00\x66\x00\x20\x00"
-          . "\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00\x70\x00\x65\x00"
-          . "\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00\x41\x00\x47\x00"
-          . "\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00\x72\x00\x20\x00"
-          . "\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00\x62\x00\x73\x00"
-          . "\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00\x65\x00\x73\x00"
-          . "\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x34";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x20\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61";
-
-        $this->_isBold = false;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 718;
-        $this->_descent = -207;
-        $this->_lineGap = 275;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0116,   0x02 => 0x0116,   0x03 => 0x0163,
-            0x04 => 0x022c,   0x05 => 0x022c,   0x06 => 0x0379,   0x07 => 0x029b,
-            0x08 =>   0xde,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x0185,
-            0x0c => 0x0248,   0x0d => 0x0116,   0x0e => 0x014d,   0x0f => 0x0116,
-            0x10 => 0x0116,   0x11 => 0x022c,   0x12 => 0x022c,   0x13 => 0x022c,
-            0x14 => 0x022c,   0x15 => 0x022c,   0x16 => 0x022c,   0x17 => 0x022c,
-            0x18 => 0x022c,   0x19 => 0x022c,   0x1a => 0x022c,   0x1b => 0x0116,
-            0x1c => 0x0116,   0x1d => 0x0248,   0x1e => 0x0248,   0x1f => 0x0248,
-            0x20 => 0x022c,   0x21 => 0x03f7,   0x22 => 0x029b,   0x23 => 0x029b,
-            0x24 => 0x02d2,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x0263,
-            0x28 => 0x030a,   0x29 => 0x02d2,   0x2a => 0x0116,   0x2b => 0x01f4,
-            0x2c => 0x029b,   0x2d => 0x022c,   0x2e => 0x0341,   0x2f => 0x02d2,
-            0x30 => 0x030a,   0x31 => 0x029b,   0x32 => 0x030a,   0x33 => 0x02d2,
-            0x34 => 0x029b,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x029b,
-            0x38 => 0x03b0,   0x39 => 0x029b,   0x3a => 0x029b,   0x3b => 0x0263,
-            0x3c => 0x0116,   0x3d => 0x0116,   0x3e => 0x0116,   0x3f => 0x01d5,
-            0x40 => 0x022c,   0x41 =>   0xde,   0x42 => 0x022c,   0x43 => 0x022c,
-            0x44 => 0x01f4,   0x45 => 0x022c,   0x46 => 0x022c,   0x47 => 0x0116,
-            0x48 => 0x022c,   0x49 => 0x022c,   0x4a =>   0xde,   0x4b =>   0xde,
-            0x4c => 0x01f4,   0x4d =>   0xde,   0x4e => 0x0341,   0x4f => 0x022c,
-            0x50 => 0x022c,   0x51 => 0x022c,   0x52 => 0x022c,   0x53 => 0x014d,
-            0x54 => 0x01f4,   0x55 => 0x0116,   0x56 => 0x022c,   0x57 => 0x01f4,
-            0x58 => 0x02d2,   0x59 => 0x01f4,   0x5a => 0x01f4,   0x5b => 0x01f4,
-            0x5c => 0x014e,   0x5d => 0x0104,   0x5e => 0x014e,   0x5f => 0x0248,
-            0x60 => 0x014d,   0x61 => 0x022c,   0x62 => 0x022c,   0x63 =>   0xa7,
-            0x64 => 0x022c,   0x65 => 0x022c,   0x66 => 0x022c,   0x67 => 0x022c,
-            0x68 =>   0xbf,   0x69 => 0x014d,   0x6a => 0x022c,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x01f4,   0x6e => 0x01f4,   0x6f => 0x022c,
-            0x70 => 0x022c,   0x71 => 0x022c,   0x72 => 0x0116,   0x73 => 0x0219,
-            0x74 => 0x015e,   0x75 =>   0xde,   0x76 => 0x014d,   0x77 => 0x014d,
-            0x78 => 0x022c,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x0263,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03e8,   0x8b => 0x0172,
-            0x8c => 0x022c,   0x8d => 0x030a,   0x8e => 0x03e8,   0x8f => 0x016d,
-            0x90 => 0x0379,   0x91 => 0x0116,   0x92 =>   0xde,   0x93 => 0x0263,
-            0x94 => 0x03b0,   0x95 => 0x0263,   0x96 => 0x0116,   0x97 => 0x022c,
-            0x98 => 0x022c,   0x99 => 0x022c,   0x9a => 0x022c,   0x9b => 0x029b,
-            0x9c => 0x0248,   0x9d => 0x029b,   0x9e => 0x029b,   0x9f => 0x022c,
-            0xa0 => 0x02d2,   0xa1 => 0x01f4,   0xa2 => 0x01f4,   0xa3 => 0x022c,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x022c,   0xa7 => 0x02d2,
-            0xa8 => 0x022c,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02e1,   0xad => 0x029b,   0xae => 0x01f4,   0xaf => 0x022c,
-            0xb0 => 0x02d2,   0xb1 =>   0xde,   0xb2 => 0x022c,   0xb3 => 0x0263,
-            0xb4 => 0x02d2,   0xb5 => 0x022c,   0xb6 => 0x029b,   0xb7 => 0x01f4,
-            0xb8 => 0x01f4,   0xb9 => 0x0116,   0xba => 0x01d7,   0xbb => 0x02d2,
-            0xbc => 0x030a,   0xbd => 0x022c,   0xbe => 0x022c,   0xbf => 0x029b,
-            0xc0 => 0x014d,   0xc1 => 0x01f4,   0xc2 => 0x0263,   0xc3 => 0x029b,
-            0xc4 => 0x030a,   0xc5 => 0x02d2,   0xc6 => 0x029b,   0xc7 => 0x0283,
-            0xc8 => 0x02d2,   0xc9 => 0x022c,   0xca => 0x014d,   0xcb => 0x030a,
-            0xcc => 0x029b,   0xcd => 0x029b,   0xce => 0x0248,   0xcf => 0x022c,
-            0xd0 => 0x0263,   0xd1 => 0x01dc,   0xd2 => 0x01f4,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x022c,   0xd7 => 0x022c,
-            0xd8 => 0x01f4,   0xd9 => 0x022c,   0xda => 0x022c,   0xdb => 0x02d2,
-            0xdc => 0x0116,   0xdd => 0x0248,   0xde => 0x0104,   0xdf => 0x02e1,
-            0xe0 => 0x030a,   0xe1 => 0x0116,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x014d,   0xe5 => 0x022c,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x02d2,   0xeb =>   0xde,
-            0xec => 0x013d,   0xed => 0x022c,   0xee => 0x02d2,   0xef => 0x029b,
-            0xf0 => 0x029b,   0xf1 => 0x022c,   0xf2 => 0x01f4,   0xf3 =>   0xde,
-            0xf4 => 0x030a,   0xf5 => 0x022c,   0xf6 => 0x022c,   0xf7 => 0x01f4,
-            0xf8 => 0x0116,   0xf9 => 0x030a,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x022c,   0xfd => 0x014d,   0xfe => 0x030a,   0xff => 0x022c,
-          0x0100 => 0x0116, 0x0101 => 0x022c, 0x0102 => 0x029b, 0x0103 => 0x022c,
-          0x0104 => 0x0342, 0x0105 => 0x029b, 0x0106 => 0x012b, 0x0107 => 0x029b,
-          0x0108 => 0x022c, 0x0109 => 0x03e8, 0x010a => 0x022c, 0x010b => 0x0116,
-          0x010c => 0x0116, 0x010d => 0x022c, 0x010e => 0x0342, 0x010f => 0x0225,
-          0x0110 => 0x022c, 0x0111 => 0x022c, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x022c, 0x0115 => 0x022c, 0x0116 => 0x0342, 0x0117 => 0x029b,
-          0x0118 => 0x029b, 0x0119 => 0x030a, 0x011a => 0x0190, 0x011b => 0x022c,
-          0x011c => 0x02d2, 0x011d => 0x022c, 0x011e => 0x01c5, 0x011f => 0x02d2,
-          0x0120 => 0x014d, 0x0121 => 0x02d2, 0x0122 => 0x022c, 0x0123 => 0x02d2,
-          0x0124 => 0x022c, 0x0125 => 0x029b, 0x0126 => 0x029b, 0x0127 => 0x029b,
-          0x0128 => 0x030a, 0x0129 => 0x01f4, 0x012a => 0x029b, 0x012b => 0x0116,
-          0x012c => 0x01f4, 0x012d => 0x0248, 0x012e => 0x0116, 0x012f => 0x022c,
-          0x0130 => 0x0116, 0x0131 => 0x0248, 0x0132 => 0x022c, 0x0133 => 0x022c,
-          0x0134 => 0x0225, 0x0135 => 0x022c, 0x0136 => 0x022c, 0x0137 => 0x01f4,
-          0x0138 => 0x022c, 0x0139 => 0x014d, 0x013a => 0x0116, 0x013b => 0x022c,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Helvetica');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
deleted file mode 100644
index 843139ebc..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelveticaBold.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Helvetica-Bold.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBold extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e\x00\x48\x00\x65\x00\x6c\x00\x76\x00"
-          . "\x65\x00\x74\x00\x69\x00\x63\x00\x61\x00\x20\x00\x69\x00\x73\x00"
-          . "\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00\x64\x00\x65\x00"
-          . "\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00\x66\x00\x20\x00"
-          . "\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00\x70\x00\x65\x00"
-          . "\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00\x41\x00\x47\x00"
-          . "\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00\x72\x00\x20\x00"
-          . "\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00\x62\x00\x73\x00"
-          . "\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00\x65\x00\x73\x00"
-          . "\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x32";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x42\x00\x6f\x00\x6c\x00\x64\x00\x20\x00\x42\x00"
-          . "\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x42\x00\x6f\x00\x6c\x00\x64";
-
-        $this->_isBold = true;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 718;
-        $this->_descent = -207;
-        $this->_lineGap = 275;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0116,   0x02 => 0x014d,   0x03 => 0x01da,
-            0x04 => 0x022c,   0x05 => 0x022c,   0x06 => 0x0379,   0x07 => 0x02d2,
-            0x08 => 0x0116,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x0185,
-            0x0c => 0x0248,   0x0d => 0x0116,   0x0e => 0x014d,   0x0f => 0x0116,
-            0x10 => 0x0116,   0x11 => 0x022c,   0x12 => 0x022c,   0x13 => 0x022c,
-            0x14 => 0x022c,   0x15 => 0x022c,   0x16 => 0x022c,   0x17 => 0x022c,
-            0x18 => 0x022c,   0x19 => 0x022c,   0x1a => 0x022c,   0x1b => 0x014d,
-            0x1c => 0x014d,   0x1d => 0x0248,   0x1e => 0x0248,   0x1f => 0x0248,
-            0x20 => 0x0263,   0x21 => 0x03cf,   0x22 => 0x02d2,   0x23 => 0x02d2,
-            0x24 => 0x02d2,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x0263,
-            0x28 => 0x030a,   0x29 => 0x02d2,   0x2a => 0x0116,   0x2b => 0x022c,
-            0x2c => 0x02d2,   0x2d => 0x0263,   0x2e => 0x0341,   0x2f => 0x02d2,
-            0x30 => 0x030a,   0x31 => 0x029b,   0x32 => 0x030a,   0x33 => 0x02d2,
-            0x34 => 0x029b,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x029b,
-            0x38 => 0x03b0,   0x39 => 0x029b,   0x3a => 0x029b,   0x3b => 0x0263,
-            0x3c => 0x014d,   0x3d => 0x0116,   0x3e => 0x014d,   0x3f => 0x0248,
-            0x40 => 0x022c,   0x41 => 0x0116,   0x42 => 0x022c,   0x43 => 0x0263,
-            0x44 => 0x022c,   0x45 => 0x0263,   0x46 => 0x022c,   0x47 => 0x014d,
-            0x48 => 0x0263,   0x49 => 0x0263,   0x4a => 0x0116,   0x4b => 0x0116,
-            0x4c => 0x022c,   0x4d => 0x0116,   0x4e => 0x0379,   0x4f => 0x0263,
-            0x50 => 0x0263,   0x51 => 0x0263,   0x52 => 0x0263,   0x53 => 0x0185,
-            0x54 => 0x022c,   0x55 => 0x014d,   0x56 => 0x0263,   0x57 => 0x022c,
-            0x58 => 0x030a,   0x59 => 0x022c,   0x5a => 0x022c,   0x5b => 0x01f4,
-            0x5c => 0x0185,   0x5d => 0x0118,   0x5e => 0x0185,   0x5f => 0x0248,
-            0x60 => 0x014d,   0x61 => 0x022c,   0x62 => 0x022c,   0x63 =>   0xa7,
-            0x64 => 0x022c,   0x65 => 0x022c,   0x66 => 0x022c,   0x67 => 0x022c,
-            0x68 =>   0xee,   0x69 => 0x01f4,   0x6a => 0x022c,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x0263,   0x6e => 0x0263,   0x6f => 0x022c,
-            0x70 => 0x022c,   0x71 => 0x022c,   0x72 => 0x0116,   0x73 => 0x022c,
-            0x74 => 0x015e,   0x75 => 0x0116,   0x76 => 0x01f4,   0x77 => 0x01f4,
-            0x78 => 0x022c,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x0263,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03e8,   0x8b => 0x0172,
-            0x8c => 0x0263,   0x8d => 0x030a,   0x8e => 0x03e8,   0x8f => 0x016d,
-            0x90 => 0x0379,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x0263,
-            0x94 => 0x03b0,   0x95 => 0x0263,   0x96 => 0x0116,   0x97 => 0x022c,
-            0x98 => 0x022c,   0x99 => 0x0263,   0x9a => 0x022c,   0x9b => 0x029b,
-            0x9c => 0x0248,   0x9d => 0x029b,   0x9e => 0x02d2,   0x9f => 0x022c,
-            0xa0 => 0x02d2,   0xa1 => 0x022c,   0xa2 => 0x022c,   0xa3 => 0x022c,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x022c,   0xa7 => 0x02d2,
-            0xa8 => 0x0263,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02e1,   0xad => 0x029b,   0xae => 0x022c,   0xaf => 0x022c,
-            0xb0 => 0x02d2,   0xb1 => 0x0116,   0xb2 => 0x022c,   0xb3 => 0x0263,
-            0xb4 => 0x02d2,   0xb5 => 0x022c,   0xb6 => 0x029b,   0xb7 => 0x022c,
-            0xb8 => 0x022c,   0xb9 => 0x0116,   0xba => 0x01ee,   0xbb => 0x02d2,
-            0xbc => 0x030a,   0xbd => 0x0263,   0xbe => 0x022c,   0xbf => 0x02d2,
-            0xc0 => 0x0185,   0xc1 => 0x022c,   0xc2 => 0x0263,   0xc3 => 0x029b,
-            0xc4 => 0x030a,   0xc5 => 0x02d2,   0xc6 => 0x029b,   0xc7 => 0x02e7,
-            0xc8 => 0x02d2,   0xc9 => 0x0263,   0xca => 0x014d,   0xcb => 0x030a,
-            0xcc => 0x02d2,   0xcd => 0x02d2,   0xce => 0x0248,   0xcf => 0x0263,
-            0xd0 => 0x0263,   0xd1 => 0x01ee,   0xd2 => 0x022c,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x022c,   0xd7 => 0x022c,
-            0xd8 => 0x022c,   0xd9 => 0x0263,   0xda => 0x0263,   0xdb => 0x02d2,
-            0xdc => 0x0116,   0xdd => 0x0248,   0xde => 0x0118,   0xdf => 0x02e1,
-            0xe0 => 0x030a,   0xe1 => 0x0116,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x0185,   0xe5 => 0x0263,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x02d2,   0xeb => 0x0116,
-            0xec => 0x0185,   0xed => 0x022c,   0xee => 0x02d2,   0xef => 0x02d2,
-            0xf0 => 0x02d2,   0xf1 => 0x022c,   0xf2 => 0x01f4,   0xf3 => 0x0116,
-            0xf4 => 0x030a,   0xf5 => 0x0263,   0xf6 => 0x022c,   0xf7 => 0x022c,
-            0xf8 => 0x0116,   0xf9 => 0x030a,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x0263,   0xfd => 0x014d,   0xfe => 0x030a,   0xff => 0x0263,
-          0x0100 => 0x0116, 0x0101 => 0x0263, 0x0102 => 0x029b, 0x0103 => 0x0263,
-          0x0104 => 0x0342, 0x0105 => 0x029b, 0x0106 => 0x0190, 0x0107 => 0x02d2,
-          0x0108 => 0x0263, 0x0109 => 0x03e8, 0x010a => 0x022c, 0x010b => 0x0116,
-          0x010c => 0x0116, 0x010d => 0x0263, 0x010e => 0x0342, 0x010f => 0x0225,
-          0x0110 => 0x0263, 0x0111 => 0x0263, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x022c, 0x0115 => 0x0263, 0x0116 => 0x0342, 0x0117 => 0x029b,
-          0x0118 => 0x029b, 0x0119 => 0x030a, 0x011a => 0x0190, 0x011b => 0x0263,
-          0x011c => 0x02d2, 0x011d => 0x0263, 0x011e => 0x0225, 0x011f => 0x02d2,
-          0x0120 => 0x0185, 0x0121 => 0x02d2, 0x0122 => 0x0263, 0x0123 => 0x02d2,
-          0x0124 => 0x0263, 0x0125 => 0x02d2, 0x0126 => 0x02d2, 0x0127 => 0x02d2,
-          0x0128 => 0x030a, 0x0129 => 0x01f4, 0x012a => 0x029b, 0x012b => 0x0116,
-          0x012c => 0x022c, 0x012d => 0x0248, 0x012e => 0x0116, 0x012f => 0x0263,
-          0x0130 => 0x014d, 0x0131 => 0x0248, 0x0132 => 0x0263, 0x0133 => 0x0263,
-          0x0134 => 0x0225, 0x0135 => 0x0263, 0x0136 => 0x0263, 0x0137 => 0x01f4,
-          0x0138 => 0x0263, 0x0139 => 0x014d, 0x013a => 0x0116, 0x013b => 0x022c,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Helvetica-Bold');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
deleted file mode 100644
index e8fbd0f80..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelveticaBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Helvetica-BoldOblique.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e\x00\x48\x00\x65\x00\x6c\x00\x76\x00"
-          . "\x65\x00\x74\x00\x69\x00\x63\x00\x61\x00\x20\x00\x69\x00\x73\x00"
-          . "\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00\x64\x00\x65\x00"
-          . "\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00\x66\x00\x20\x00"
-          . "\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00\x70\x00\x65\x00"
-          . "\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00\x41\x00\x47\x00"
-          . "\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00\x72\x00\x20\x00"
-          . "\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00\x62\x00\x73\x00"
-          . "\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00\x65\x00\x73\x00"
-          . "\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x33";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x42\x00\x6f\x00\x6c\x00\x64\x00\x4f\x00\x62\x00"
-          . "\x6c\x00\x69\x00\x71\x00\x75\x00\x65\x00\x20\x00\x42\x00\x6f\x00"
-          . "\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x42\x00\x6f\x00\x6c\x00\x64\x00\x4f\x00\x62\x00"
-          . "\x6c\x00\x69\x00\x71\x00\x75\x00\x65";
-
-        $this->_isBold = true;
-        $this->_isItalic = true;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 718;
-        $this->_descent = -207;
-        $this->_lineGap = 275;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0116,   0x02 => 0x014d,   0x03 => 0x01da,
-            0x04 => 0x022c,   0x05 => 0x022c,   0x06 => 0x0379,   0x07 => 0x02d2,
-            0x08 => 0x0116,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x0185,
-            0x0c => 0x0248,   0x0d => 0x0116,   0x0e => 0x014d,   0x0f => 0x0116,
-            0x10 => 0x0116,   0x11 => 0x022c,   0x12 => 0x022c,   0x13 => 0x022c,
-            0x14 => 0x022c,   0x15 => 0x022c,   0x16 => 0x022c,   0x17 => 0x022c,
-            0x18 => 0x022c,   0x19 => 0x022c,   0x1a => 0x022c,   0x1b => 0x014d,
-            0x1c => 0x014d,   0x1d => 0x0248,   0x1e => 0x0248,   0x1f => 0x0248,
-            0x20 => 0x0263,   0x21 => 0x03cf,   0x22 => 0x02d2,   0x23 => 0x02d2,
-            0x24 => 0x02d2,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x0263,
-            0x28 => 0x030a,   0x29 => 0x02d2,   0x2a => 0x0116,   0x2b => 0x022c,
-            0x2c => 0x02d2,   0x2d => 0x0263,   0x2e => 0x0341,   0x2f => 0x02d2,
-            0x30 => 0x030a,   0x31 => 0x029b,   0x32 => 0x030a,   0x33 => 0x02d2,
-            0x34 => 0x029b,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x029b,
-            0x38 => 0x03b0,   0x39 => 0x029b,   0x3a => 0x029b,   0x3b => 0x0263,
-            0x3c => 0x014d,   0x3d => 0x0116,   0x3e => 0x014d,   0x3f => 0x0248,
-            0x40 => 0x022c,   0x41 => 0x0116,   0x42 => 0x022c,   0x43 => 0x0263,
-            0x44 => 0x022c,   0x45 => 0x0263,   0x46 => 0x022c,   0x47 => 0x014d,
-            0x48 => 0x0263,   0x49 => 0x0263,   0x4a => 0x0116,   0x4b => 0x0116,
-            0x4c => 0x022c,   0x4d => 0x0116,   0x4e => 0x0379,   0x4f => 0x0263,
-            0x50 => 0x0263,   0x51 => 0x0263,   0x52 => 0x0263,   0x53 => 0x0185,
-            0x54 => 0x022c,   0x55 => 0x014d,   0x56 => 0x0263,   0x57 => 0x022c,
-            0x58 => 0x030a,   0x59 => 0x022c,   0x5a => 0x022c,   0x5b => 0x01f4,
-            0x5c => 0x0185,   0x5d => 0x0118,   0x5e => 0x0185,   0x5f => 0x0248,
-            0x60 => 0x014d,   0x61 => 0x022c,   0x62 => 0x022c,   0x63 =>   0xa7,
-            0x64 => 0x022c,   0x65 => 0x022c,   0x66 => 0x022c,   0x67 => 0x022c,
-            0x68 =>   0xee,   0x69 => 0x01f4,   0x6a => 0x022c,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x0263,   0x6e => 0x0263,   0x6f => 0x022c,
-            0x70 => 0x022c,   0x71 => 0x022c,   0x72 => 0x0116,   0x73 => 0x022c,
-            0x74 => 0x015e,   0x75 => 0x0116,   0x76 => 0x01f4,   0x77 => 0x01f4,
-            0x78 => 0x022c,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x0263,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03e8,   0x8b => 0x0172,
-            0x8c => 0x0263,   0x8d => 0x030a,   0x8e => 0x03e8,   0x8f => 0x016d,
-            0x90 => 0x0379,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x0263,
-            0x94 => 0x03b0,   0x95 => 0x0263,   0x96 => 0x0116,   0x97 => 0x022c,
-            0x98 => 0x022c,   0x99 => 0x0263,   0x9a => 0x022c,   0x9b => 0x029b,
-            0x9c => 0x0248,   0x9d => 0x029b,   0x9e => 0x02d2,   0x9f => 0x022c,
-            0xa0 => 0x02d2,   0xa1 => 0x022c,   0xa2 => 0x022c,   0xa3 => 0x022c,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x022c,   0xa7 => 0x02d2,
-            0xa8 => 0x0263,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02e1,   0xad => 0x029b,   0xae => 0x022c,   0xaf => 0x022c,
-            0xb0 => 0x02d2,   0xb1 => 0x0116,   0xb2 => 0x022c,   0xb3 => 0x0263,
-            0xb4 => 0x02d2,   0xb5 => 0x022c,   0xb6 => 0x029b,   0xb7 => 0x022c,
-            0xb8 => 0x022c,   0xb9 => 0x0116,   0xba => 0x01ee,   0xbb => 0x02d2,
-            0xbc => 0x030a,   0xbd => 0x0263,   0xbe => 0x022c,   0xbf => 0x02d2,
-            0xc0 => 0x0185,   0xc1 => 0x022c,   0xc2 => 0x0263,   0xc3 => 0x029b,
-            0xc4 => 0x030a,   0xc5 => 0x02d2,   0xc6 => 0x029b,   0xc7 => 0x02e7,
-            0xc8 => 0x02d2,   0xc9 => 0x0263,   0xca => 0x014d,   0xcb => 0x030a,
-            0xcc => 0x02d2,   0xcd => 0x02d2,   0xce => 0x0248,   0xcf => 0x0263,
-            0xd0 => 0x0263,   0xd1 => 0x01ee,   0xd2 => 0x022c,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x022c,   0xd7 => 0x022c,
-            0xd8 => 0x022c,   0xd9 => 0x0263,   0xda => 0x0263,   0xdb => 0x02d2,
-            0xdc => 0x0116,   0xdd => 0x0248,   0xde => 0x0118,   0xdf => 0x02e1,
-            0xe0 => 0x030a,   0xe1 => 0x0116,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x0185,   0xe5 => 0x0263,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x02d2,   0xeb => 0x0116,
-            0xec => 0x0185,   0xed => 0x022c,   0xee => 0x02d2,   0xef => 0x02d2,
-            0xf0 => 0x02d2,   0xf1 => 0x022c,   0xf2 => 0x01f4,   0xf3 => 0x0116,
-            0xf4 => 0x030a,   0xf5 => 0x0263,   0xf6 => 0x022c,   0xf7 => 0x022c,
-            0xf8 => 0x0116,   0xf9 => 0x030a,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x0263,   0xfd => 0x014d,   0xfe => 0x030a,   0xff => 0x0263,
-          0x0100 => 0x0116, 0x0101 => 0x0263, 0x0102 => 0x029b, 0x0103 => 0x0263,
-          0x0104 => 0x0342, 0x0105 => 0x029b, 0x0106 => 0x0190, 0x0107 => 0x02d2,
-          0x0108 => 0x0263, 0x0109 => 0x03e8, 0x010a => 0x022c, 0x010b => 0x0116,
-          0x010c => 0x0116, 0x010d => 0x0263, 0x010e => 0x0342, 0x010f => 0x0225,
-          0x0110 => 0x0263, 0x0111 => 0x0263, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x022c, 0x0115 => 0x0263, 0x0116 => 0x0342, 0x0117 => 0x029b,
-          0x0118 => 0x029b, 0x0119 => 0x030a, 0x011a => 0x0190, 0x011b => 0x0263,
-          0x011c => 0x02d2, 0x011d => 0x0263, 0x011e => 0x0225, 0x011f => 0x02d2,
-          0x0120 => 0x0185, 0x0121 => 0x02d2, 0x0122 => 0x0263, 0x0123 => 0x02d2,
-          0x0124 => 0x0263, 0x0125 => 0x02d2, 0x0126 => 0x02d2, 0x0127 => 0x02d2,
-          0x0128 => 0x030a, 0x0129 => 0x01f4, 0x012a => 0x029b, 0x012b => 0x0116,
-          0x012c => 0x022c, 0x012d => 0x0248, 0x012e => 0x0116, 0x012f => 0x0263,
-          0x0130 => 0x014d, 0x0131 => 0x0248, 0x0132 => 0x0263, 0x0133 => 0x0263,
-          0x0134 => 0x0225, 0x0135 => 0x0263, 0x0136 => 0x0263, 0x0137 => 0x01f4,
-          0x0138 => 0x0263, 0x0139 => 0x014d, 0x013a => 0x0116, 0x013b => 0x022c,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Helvetica-BoldOblique');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
deleted file mode 100644
index 532c9b8e2..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelveticaOblique.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Helvetica-Oblique.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaOblique extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00"
-          . "\x41\x00\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00"
-          . "\x76\x00\x65\x00\x64\x00\x2e\x00\x48\x00\x65\x00\x6c\x00\x76\x00"
-          . "\x65\x00\x74\x00\x69\x00\x63\x00\x61\x00\x20\x00\x69\x00\x73\x00"
-          . "\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00\x64\x00\x65\x00"
-          . "\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00\x66\x00\x20\x00"
-          . "\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00\x70\x00\x65\x00"
-          . "\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00\x41\x00\x47\x00"
-          . "\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00\x72\x00\x20\x00"
-          . "\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00\x62\x00\x73\x00"
-          . "\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00\x65\x00\x73\x00"
-          . "\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x35\x00\x35";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x4f\x00\x62\x00\x6c\x00\x69\x00\x71\x00\x75\x00"
-          . "\x65\x00\x20\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x48\x00\x65\x00\x6c\x00\x76\x00\x65\x00\x74\x00\x69\x00\x63\x00"
-          . "\x61\x00\x2d\x00\x4f\x00\x62\x00\x6c\x00\x69\x00\x71\x00\x75\x00"
-          . "\x65";
-
-        $this->_isBold = false;
-        $this->_isItalic = true;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 718;
-        $this->_descent = -207;
-        $this->_lineGap = 275;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0116,   0x02 => 0x0116,   0x03 => 0x0163,
-            0x04 => 0x022c,   0x05 => 0x022c,   0x06 => 0x0379,   0x07 => 0x029b,
-            0x08 =>   0xde,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x0185,
-            0x0c => 0x0248,   0x0d => 0x0116,   0x0e => 0x014d,   0x0f => 0x0116,
-            0x10 => 0x0116,   0x11 => 0x022c,   0x12 => 0x022c,   0x13 => 0x022c,
-            0x14 => 0x022c,   0x15 => 0x022c,   0x16 => 0x022c,   0x17 => 0x022c,
-            0x18 => 0x022c,   0x19 => 0x022c,   0x1a => 0x022c,   0x1b => 0x0116,
-            0x1c => 0x0116,   0x1d => 0x0248,   0x1e => 0x0248,   0x1f => 0x0248,
-            0x20 => 0x022c,   0x21 => 0x03f7,   0x22 => 0x029b,   0x23 => 0x029b,
-            0x24 => 0x02d2,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x0263,
-            0x28 => 0x030a,   0x29 => 0x02d2,   0x2a => 0x0116,   0x2b => 0x01f4,
-            0x2c => 0x029b,   0x2d => 0x022c,   0x2e => 0x0341,   0x2f => 0x02d2,
-            0x30 => 0x030a,   0x31 => 0x029b,   0x32 => 0x030a,   0x33 => 0x02d2,
-            0x34 => 0x029b,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x029b,
-            0x38 => 0x03b0,   0x39 => 0x029b,   0x3a => 0x029b,   0x3b => 0x0263,
-            0x3c => 0x0116,   0x3d => 0x0116,   0x3e => 0x0116,   0x3f => 0x01d5,
-            0x40 => 0x022c,   0x41 =>   0xde,   0x42 => 0x022c,   0x43 => 0x022c,
-            0x44 => 0x01f4,   0x45 => 0x022c,   0x46 => 0x022c,   0x47 => 0x0116,
-            0x48 => 0x022c,   0x49 => 0x022c,   0x4a =>   0xde,   0x4b =>   0xde,
-            0x4c => 0x01f4,   0x4d =>   0xde,   0x4e => 0x0341,   0x4f => 0x022c,
-            0x50 => 0x022c,   0x51 => 0x022c,   0x52 => 0x022c,   0x53 => 0x014d,
-            0x54 => 0x01f4,   0x55 => 0x0116,   0x56 => 0x022c,   0x57 => 0x01f4,
-            0x58 => 0x02d2,   0x59 => 0x01f4,   0x5a => 0x01f4,   0x5b => 0x01f4,
-            0x5c => 0x014e,   0x5d => 0x0104,   0x5e => 0x014e,   0x5f => 0x0248,
-            0x60 => 0x014d,   0x61 => 0x022c,   0x62 => 0x022c,   0x63 =>   0xa7,
-            0x64 => 0x022c,   0x65 => 0x022c,   0x66 => 0x022c,   0x67 => 0x022c,
-            0x68 =>   0xbf,   0x69 => 0x014d,   0x6a => 0x022c,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x01f4,   0x6e => 0x01f4,   0x6f => 0x022c,
-            0x70 => 0x022c,   0x71 => 0x022c,   0x72 => 0x0116,   0x73 => 0x0219,
-            0x74 => 0x015e,   0x75 =>   0xde,   0x76 => 0x014d,   0x77 => 0x014d,
-            0x78 => 0x022c,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x0263,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03e8,   0x8b => 0x0172,
-            0x8c => 0x022c,   0x8d => 0x030a,   0x8e => 0x03e8,   0x8f => 0x016d,
-            0x90 => 0x0379,   0x91 => 0x0116,   0x92 =>   0xde,   0x93 => 0x0263,
-            0x94 => 0x03b0,   0x95 => 0x0263,   0x96 => 0x0116,   0x97 => 0x022c,
-            0x98 => 0x022c,   0x99 => 0x022c,   0x9a => 0x022c,   0x9b => 0x029b,
-            0x9c => 0x0248,   0x9d => 0x029b,   0x9e => 0x029b,   0x9f => 0x022c,
-            0xa0 => 0x02d2,   0xa1 => 0x01f4,   0xa2 => 0x01f4,   0xa3 => 0x022c,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x022c,   0xa7 => 0x02d2,
-            0xa8 => 0x022c,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02e1,   0xad => 0x029b,   0xae => 0x01f4,   0xaf => 0x022c,
-            0xb0 => 0x02d2,   0xb1 =>   0xde,   0xb2 => 0x022c,   0xb3 => 0x0263,
-            0xb4 => 0x02d2,   0xb5 => 0x022c,   0xb6 => 0x029b,   0xb7 => 0x01f4,
-            0xb8 => 0x01f4,   0xb9 => 0x0116,   0xba => 0x01d7,   0xbb => 0x02d2,
-            0xbc => 0x030a,   0xbd => 0x022c,   0xbe => 0x022c,   0xbf => 0x029b,
-            0xc0 => 0x014d,   0xc1 => 0x01f4,   0xc2 => 0x0263,   0xc3 => 0x029b,
-            0xc4 => 0x030a,   0xc5 => 0x02d2,   0xc6 => 0x029b,   0xc7 => 0x0283,
-            0xc8 => 0x02d2,   0xc9 => 0x022c,   0xca => 0x014d,   0xcb => 0x030a,
-            0xcc => 0x029b,   0xcd => 0x029b,   0xce => 0x0248,   0xcf => 0x022c,
-            0xd0 => 0x0263,   0xd1 => 0x01dc,   0xd2 => 0x01f4,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x022c,   0xd7 => 0x022c,
-            0xd8 => 0x01f4,   0xd9 => 0x022c,   0xda => 0x022c,   0xdb => 0x02d2,
-            0xdc => 0x0116,   0xdd => 0x0248,   0xde => 0x0104,   0xdf => 0x02e1,
-            0xe0 => 0x030a,   0xe1 => 0x0116,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x014d,   0xe5 => 0x022c,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x02d2,   0xeb =>   0xde,
-            0xec => 0x013d,   0xed => 0x022c,   0xee => 0x02d2,   0xef => 0x029b,
-            0xf0 => 0x029b,   0xf1 => 0x022c,   0xf2 => 0x01f4,   0xf3 =>   0xde,
-            0xf4 => 0x030a,   0xf5 => 0x022c,   0xf6 => 0x022c,   0xf7 => 0x01f4,
-            0xf8 => 0x0116,   0xf9 => 0x030a,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x022c,   0xfd => 0x014d,   0xfe => 0x030a,   0xff => 0x022c,
-          0x0100 => 0x0116, 0x0101 => 0x022c, 0x0102 => 0x029b, 0x0103 => 0x022c,
-          0x0104 => 0x0342, 0x0105 => 0x029b, 0x0106 => 0x012b, 0x0107 => 0x029b,
-          0x0108 => 0x022c, 0x0109 => 0x03e8, 0x010a => 0x022c, 0x010b => 0x0116,
-          0x010c => 0x0116, 0x010d => 0x022c, 0x010e => 0x0342, 0x010f => 0x0225,
-          0x0110 => 0x022c, 0x0111 => 0x022c, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x022c, 0x0115 => 0x022c, 0x0116 => 0x0342, 0x0117 => 0x029b,
-          0x0118 => 0x029b, 0x0119 => 0x030a, 0x011a => 0x0190, 0x011b => 0x022c,
-          0x011c => 0x02d2, 0x011d => 0x022c, 0x011e => 0x01c5, 0x011f => 0x02d2,
-          0x0120 => 0x014d, 0x0121 => 0x02d2, 0x0122 => 0x022c, 0x0123 => 0x02d2,
-          0x0124 => 0x022c, 0x0125 => 0x029b, 0x0126 => 0x029b, 0x0127 => 0x029b,
-          0x0128 => 0x030a, 0x0129 => 0x01f4, 0x012a => 0x029b, 0x012b => 0x0116,
-          0x012c => 0x01f4, 0x012d => 0x0248, 0x012e => 0x0116, 0x012f => 0x022c,
-          0x0130 => 0x0116, 0x0131 => 0x0248, 0x0132 => 0x022c, 0x0133 => 0x022c,
-          0x0134 => 0x0225, 0x0135 => 0x022c, 0x0136 => 0x022c, 0x0137 => 0x01f4,
-          0x0138 => 0x022c, 0x0139 => 0x014d, 0x013a => 0x0116, 0x013b => 0x022c,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Helvetica-Oblique');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
deleted file mode 100644
index 7e0ca8792..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Symbol.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Symbol.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_Symbol extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Array for conversion from local encoding to special font encoding.
-     * See {@link encodeString()}.
-     * @var array
-     */
-    protected $_toFontEncoding = array(
-            0x20 => "\x20",   0x21 => "\x21", 0x2200 => "\x22",   0x23 => "\x23",
-          0x2203 => "\x24",   0x25 => "\x25",   0x26 => "\x26", 0x220b => "\x27",
-            0x28 => "\x28",   0x29 => "\x29", 0x2217 => "\x2a",   0x2b => "\x2b",
-            0x2c => "\x2c", 0x2212 => "\x2d",   0x2e => "\x2e",   0x2f => "\x2f",
-            0x30 => "\x30",   0x31 => "\x31",   0x32 => "\x32",   0x33 => "\x33",
-            0x34 => "\x34",   0x35 => "\x35",   0x36 => "\x36",   0x37 => "\x37",
-            0x38 => "\x38",   0x39 => "\x39",   0x3a => "\x3a",   0x3b => "\x3b",
-            0x3c => "\x3c",   0x3d => "\x3d",   0x3e => "\x3e",   0x3f => "\x3f",
-          0x2245 => "\x40", 0x0391 => "\x41", 0x0392 => "\x42", 0x03a7 => "\x43",
-          0x2206 => "\x44", 0x0395 => "\x45", 0x03a6 => "\x46", 0x0393 => "\x47",
-          0x0397 => "\x48", 0x0399 => "\x49", 0x03d1 => "\x4a", 0x039a => "\x4b",
-          0x039b => "\x4c", 0x039c => "\x4d", 0x039d => "\x4e", 0x039f => "\x4f",
-          0x03a0 => "\x50", 0x0398 => "\x51", 0x03a1 => "\x52", 0x03a3 => "\x53",
-          0x03a4 => "\x54", 0x03a5 => "\x55", 0x03c2 => "\x56", 0x2126 => "\x57",
-          0x039e => "\x58", 0x03a8 => "\x59", 0x0396 => "\x5a",   0x5b => "\x5b",
-          0x2234 => "\x5c",   0x5d => "\x5d", 0x22a5 => "\x5e",   0x5f => "\x5f",
-          0xf8e5 => "\x60", 0x03b1 => "\x61", 0x03b2 => "\x62", 0x03c7 => "\x63",
-          0x03b4 => "\x64", 0x03b5 => "\x65", 0x03c6 => "\x66", 0x03b3 => "\x67",
-          0x03b7 => "\x68", 0x03b9 => "\x69", 0x03d5 => "\x6a", 0x03ba => "\x6b",
-          0x03bb => "\x6c",   0xb5 => "\x6d", 0x03bd => "\x6e", 0x03bf => "\x6f",
-          0x03c0 => "\x70", 0x03b8 => "\x71", 0x03c1 => "\x72", 0x03c3 => "\x73",
-          0x03c4 => "\x74", 0x03c5 => "\x75", 0x03d6 => "\x76", 0x03c9 => "\x77",
-          0x03be => "\x78", 0x03c8 => "\x79", 0x03b6 => "\x7a",   0x7b => "\x7b",
-            0x7c => "\x7c",   0x7d => "\x7d", 0x223c => "\x7e", 0x20ac => "\xa0",
-          0x03d2 => "\xa1", 0x2032 => "\xa2", 0x2264 => "\xa3", 0x2044 => "\xa4",
-          0x221e => "\xa5", 0x0192 => "\xa6", 0x2663 => "\xa7", 0x2666 => "\xa8",
-          0x2665 => "\xa9", 0x2660 => "\xaa", 0x2194 => "\xab", 0x2190 => "\xac",
-          0x2191 => "\xad", 0x2192 => "\xae", 0x2193 => "\xaf",   0xb0 => "\xb0",
-            0xb1 => "\xb1", 0x2033 => "\xb2", 0x2265 => "\xb3",   0xd7 => "\xb4",
-          0x221d => "\xb5", 0x2202 => "\xb6", 0x2022 => "\xb7",   0xf7 => "\xb8",
-          0x2260 => "\xb9", 0x2261 => "\xba", 0x2248 => "\xbb", 0x2026 => "\xbc",
-          0xf8e6 => "\xbd", 0xf8e7 => "\xbe", 0x21b5 => "\xbf", 0x2135 => "\xc0",
-          0x2111 => "\xc1", 0x211c => "\xc2", 0x2118 => "\xc3", 0x2297 => "\xc4",
-          0x2295 => "\xc5", 0x2205 => "\xc6", 0x2229 => "\xc7", 0x222a => "\xc8",
-          0x2283 => "\xc9", 0x2287 => "\xca", 0x2284 => "\xcb", 0x2282 => "\xcc",
-          0x2286 => "\xcd", 0x2208 => "\xce", 0x2209 => "\xcf", 0x2220 => "\xd0",
-          0x2207 => "\xd1", 0xf6da => "\xd2", 0xf6d9 => "\xd3", 0xf6db => "\xd4",
-          0x220f => "\xd5", 0x221a => "\xd6", 0x22c5 => "\xd7",   0xac => "\xd8",
-          0x2227 => "\xd9", 0x2228 => "\xda", 0x21d4 => "\xdb", 0x21d0 => "\xdc",
-          0x21d1 => "\xdd", 0x21d2 => "\xde", 0x21d3 => "\xdf", 0x25ca => "\xe0",
-          0x2329 => "\xe1", 0xf8e8 => "\xe2", 0xf8e9 => "\xe3", 0xf8ea => "\xe4",
-          0x2211 => "\xe5", 0xf8eb => "\xe6", 0xf8ec => "\xe7", 0xf8ed => "\xe8",
-          0xf8ee => "\xe9", 0xf8ef => "\xea", 0xf8f0 => "\xeb", 0xf8f1 => "\xec",
-          0xf8f2 => "\xed", 0xf8f3 => "\xee", 0xf8f4 => "\xef", 0x232a => "\xf1",
-          0x222b => "\xf2", 0x2320 => "\xf3", 0xf8f5 => "\xf4", 0x2321 => "\xf5",
-          0xf8f6 => "\xf6", 0xf8f7 => "\xf7", 0xf8f8 => "\xf8", 0xf8f9 => "\xf9",
-          0xf8fa => "\xfa", 0xf8fb => "\xfb", 0xf8fc => "\xfc", 0xf8fd => "\xfd",
-          0xf8fe => "\xfe");
-
-    /**
-     * Array for conversion from special font encoding to local encoding.
-     * See {@link decodeString()}.
-     * @var array
-     */
-    protected $_fromFontEncoding = array(
-            0x20 => "\x00\x20",   0x21 => "\x00\x21",   0x22 => "\x22\x00",
-            0x23 => "\x00\x23",   0x24 => "\x22\x03",   0x25 => "\x00\x25",
-            0x26 => "\x00\x26",   0x27 => "\x22\x0b",   0x28 => "\x00\x28",
-            0x29 => "\x00\x29",   0x2a => "\x22\x17",   0x2b => "\x00\x2b",
-            0x2c => "\x00\x2c",   0x2d => "\x22\x12",   0x2e => "\x00\x2e",
-            0x2f => "\x00\x2f",   0x30 => "\x00\x30",   0x31 => "\x00\x31",
-            0x32 => "\x00\x32",   0x33 => "\x00\x33",   0x34 => "\x00\x34",
-            0x35 => "\x00\x35",   0x36 => "\x00\x36",   0x37 => "\x00\x37",
-            0x38 => "\x00\x38",   0x39 => "\x00\x39",   0x3a => "\x00\x3a",
-            0x3b => "\x00\x3b",   0x3c => "\x00\x3c",   0x3d => "\x00\x3d",
-            0x3e => "\x00\x3e",   0x3f => "\x00\x3f",   0x40 => "\x22\x45",
-            0x41 => "\x03\x91",   0x42 => "\x03\x92",   0x43 => "\x03\xa7",
-            0x44 => "\x22\x06",   0x45 => "\x03\x95",   0x46 => "\x03\xa6",
-            0x47 => "\x03\x93",   0x48 => "\x03\x97",   0x49 => "\x03\x99",
-            0x4a => "\x03\xd1",   0x4b => "\x03\x9a",   0x4c => "\x03\x9b",
-            0x4d => "\x03\x9c",   0x4e => "\x03\x9d",   0x4f => "\x03\x9f",
-            0x50 => "\x03\xa0",   0x51 => "\x03\x98",   0x52 => "\x03\xa1",
-            0x53 => "\x03\xa3",   0x54 => "\x03\xa4",   0x55 => "\x03\xa5",
-            0x56 => "\x03\xc2",   0x57 => "\x21\x26",   0x58 => "\x03\x9e",
-            0x59 => "\x03\xa8",   0x5a => "\x03\x96",   0x5b => "\x00\x5b",
-            0x5c => "\x22\x34",   0x5d => "\x00\x5d",   0x5e => "\x22\xa5",
-            0x5f => "\x00\x5f",   0x60 => "\xf8\xe5",   0x61 => "\x03\xb1",
-            0x62 => "\x03\xb2",   0x63 => "\x03\xc7",   0x64 => "\x03\xb4",
-            0x65 => "\x03\xb5",   0x66 => "\x03\xc6",   0x67 => "\x03\xb3",
-            0x68 => "\x03\xb7",   0x69 => "\x03\xb9",   0x6a => "\x03\xd5",
-            0x6b => "\x03\xba",   0x6c => "\x03\xbb",   0x6d => "\x00\xb5",
-            0x6e => "\x03\xbd",   0x6f => "\x03\xbf",   0x70 => "\x03\xc0",
-            0x71 => "\x03\xb8",   0x72 => "\x03\xc1",   0x73 => "\x03\xc3",
-            0x74 => "\x03\xc4",   0x75 => "\x03\xc5",   0x76 => "\x03\xd6",
-            0x77 => "\x03\xc9",   0x78 => "\x03\xbe",   0x79 => "\x03\xc8",
-            0x7a => "\x03\xb6",   0x7b => "\x00\x7b",   0x7c => "\x00\x7c",
-            0x7d => "\x00\x7d",   0x7e => "\x22\x3c",   0xa0 => "\x20\xac",
-            0xa1 => "\x03\xd2",   0xa2 => "\x20\x32",   0xa3 => "\x22\x64",
-            0xa4 => "\x20\x44",   0xa5 => "\x22\x1e",   0xa6 => "\x01\x92",
-            0xa7 => "\x26\x63",   0xa8 => "\x26\x66",   0xa9 => "\x26\x65",
-            0xaa => "\x26\x60",   0xab => "\x21\x94",   0xac => "\x21\x90",
-            0xad => "\x21\x91",   0xae => "\x21\x92",   0xaf => "\x21\x93",
-            0xb0 => "\x00\xb0",   0xb1 => "\x00\xb1",   0xb2 => "\x20\x33",
-            0xb3 => "\x22\x65",   0xb4 => "\x00\xd7",   0xb5 => "\x22\x1d",
-            0xb6 => "\x22\x02",   0xb7 => "\x20\x22",   0xb8 => "\x00\xf7",
-            0xb9 => "\x22\x60",   0xba => "\x22\x61",   0xbb => "\x22\x48",
-            0xbc => "\x20\x26",   0xbd => "\xf8\xe6",   0xbe => "\xf8\xe7",
-            0xbf => "\x21\xb5",   0xc0 => "\x21\x35",   0xc1 => "\x21\x11",
-            0xc2 => "\x21\x1c",   0xc3 => "\x21\x18",   0xc4 => "\x22\x97",
-            0xc5 => "\x22\x95",   0xc6 => "\x22\x05",   0xc7 => "\x22\x29",
-            0xc8 => "\x22\x2a",   0xc9 => "\x22\x83",   0xca => "\x22\x87",
-            0xcb => "\x22\x84",   0xcc => "\x22\x82",   0xcd => "\x22\x86",
-            0xce => "\x22\x08",   0xcf => "\x22\x09",   0xd0 => "\x22\x20",
-            0xd1 => "\x22\x07",   0xd2 => "\xf6\xda",   0xd3 => "\xf6\xd9",
-            0xd4 => "\xf6\xdb",   0xd5 => "\x22\x0f",   0xd6 => "\x22\x1a",
-            0xd7 => "\x22\xc5",   0xd8 => "\x00\xac",   0xd9 => "\x22\x27",
-            0xda => "\x22\x28",   0xdb => "\x21\xd4",   0xdc => "\x21\xd0",
-            0xdd => "\x21\xd1",   0xde => "\x21\xd2",   0xdf => "\x21\xd3",
-            0xe0 => "\x25\xca",   0xe1 => "\x23\x29",   0xe2 => "\xf8\xe8",
-            0xe3 => "\xf8\xe9",   0xe4 => "\xf8\xea",   0xe5 => "\x22\x11",
-            0xe6 => "\xf8\xeb",   0xe7 => "\xf8\xec",   0xe8 => "\xf8\xed",
-            0xe9 => "\xf8\xee",   0xea => "\xf8\xef",   0xeb => "\xf8\xf0",
-            0xec => "\xf8\xf1",   0xed => "\xf8\xf2",   0xee => "\xf8\xf3",
-            0xef => "\xf8\xf4",   0xf1 => "\x23\x2a",   0xf2 => "\x22\x2b",
-            0xf3 => "\x23\x20",   0xf4 => "\xf8\xf5",   0xf5 => "\x23\x21",
-            0xf6 => "\xf8\xf6",   0xf7 => "\xf8\xf7",   0xf8 => "\xf8\xf8",
-            0xf9 => "\xf8\xf9",   0xfa => "\xf8\xfa",   0xfb => "\xf8\xfb",
-            0xfc => "\xf8\xfc",   0xfd => "\xf8\xfd",   0xfe => "\xf8\xfe",
-        );
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x41\x00"
-          . "\x6c\x00\x6c\x00\x20\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00"
-          . "\x73\x00\x20\x00\x72\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00"
-          . "\x65\x00\x64\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x53\x00\x79\x00\x6d\x00\x62\x00\x6f\x00\x6c";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x36\x00\x34";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x53\x00\x79\x00\x6d\x00\x62\x00\x6f\x00\x6c\x00\x20\x00\x4d\x00"
-          . "\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x31\x00\x2e\x00\x30\x00\x30\x00\x38";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x53\x00\x79\x00\x6d\x00\x62\x00\x6f\x00\x6c";
-
-        $this->_isBold = false;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 1000;
-        $this->_descent = 0;
-        $this->_lineGap = 200;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 =>   0xfa,   0x02 => 0x014d,   0x03 => 0x02c9,
-            0x04 => 0x01f4,   0x05 => 0x0225,   0x06 => 0x0341,   0x07 => 0x030a,
-            0x08 => 0x01b7,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x01f4,
-            0x0c => 0x0225,   0x0d =>   0xfa,   0x0e => 0x0225,   0x0f =>   0xfa,
-            0x10 => 0x0116,   0x11 => 0x01f4,   0x12 => 0x01f4,   0x13 => 0x01f4,
-            0x14 => 0x01f4,   0x15 => 0x01f4,   0x16 => 0x01f4,   0x17 => 0x01f4,
-            0x18 => 0x01f4,   0x19 => 0x01f4,   0x1a => 0x01f4,   0x1b => 0x0116,
-            0x1c => 0x0116,   0x1d => 0x0225,   0x1e => 0x0225,   0x1f => 0x0225,
-            0x20 => 0x01bc,   0x21 => 0x0225,   0x22 => 0x02d2,   0x23 => 0x029b,
-            0x24 => 0x02d2,   0x25 => 0x0264,   0x26 => 0x0263,   0x27 => 0x02fb,
-            0x28 => 0x025b,   0x29 => 0x02d2,   0x2a => 0x014d,   0x2b => 0x0277,
-            0x2c => 0x02d2,   0x2d => 0x02ae,   0x2e => 0x0379,   0x2f => 0x02d2,
-            0x30 => 0x02d2,   0x31 => 0x0300,   0x32 => 0x02e5,   0x33 => 0x022c,
-            0x34 => 0x0250,   0x35 => 0x0263,   0x36 => 0x02b2,   0x37 => 0x01b7,
-            0x38 => 0x0300,   0x39 => 0x0285,   0x3a => 0x031b,   0x3b => 0x0263,
-            0x3c => 0x014d,   0x3d => 0x035f,   0x3e => 0x014d,   0x3f => 0x0292,
-            0x40 => 0x01f4,   0x41 => 0x01f4,   0x42 => 0x0277,   0x43 => 0x0225,
-            0x44 => 0x0225,   0x45 => 0x01ee,   0x46 => 0x01b7,   0x47 => 0x0209,
-            0x48 => 0x019b,   0x49 => 0x025b,   0x4a => 0x0149,   0x4b => 0x025b,
-            0x4c => 0x0225,   0x4d => 0x0225,   0x4e => 0x0240,   0x4f => 0x0209,
-            0x50 => 0x0225,   0x51 => 0x0225,   0x52 => 0x0209,   0x53 => 0x0225,
-            0x54 => 0x025b,   0x55 => 0x01b7,   0x56 => 0x0240,   0x57 => 0x02c9,
-            0x58 => 0x02ae,   0x59 => 0x01ed,   0x5a => 0x02ae,   0x5b => 0x01ee,
-            0x5c => 0x01e0,   0x5d =>   0xc8,   0x5e => 0x01e0,   0x5f => 0x0225,
-            0x60 => 0x02ee,   0x61 => 0x026c,   0x62 =>   0xf7,   0x63 => 0x0225,
-            0x64 =>   0xa7,   0x65 => 0x02c9,   0x66 => 0x01f4,   0x67 => 0x02f1,
-            0x68 => 0x02f1,   0x69 => 0x02f1,   0x6a => 0x02f1,   0x6b => 0x0412,
-            0x6c => 0x03db,   0x6d => 0x025b,   0x6e => 0x03db,   0x6f => 0x025b,
-            0x70 => 0x0190,   0x71 => 0x0225,   0x72 => 0x019b,   0x73 => 0x0225,
-            0x74 => 0x0225,   0x75 => 0x02c9,   0x76 => 0x01ee,   0x77 => 0x01cc,
-            0x78 => 0x0225,   0x79 => 0x0225,   0x7a => 0x0225,   0x7b => 0x0225,
-            0x7c => 0x03e8,   0x7d => 0x025b,   0x7e => 0x03e8,   0x7f => 0x0292,
-            0x80 => 0x0337,   0x81 => 0x02ae,   0x82 => 0x031b,   0x83 => 0x03db,
-            0x84 => 0x0300,   0x85 => 0x0300,   0x86 => 0x0337,   0x87 => 0x0300,
-            0x88 => 0x0300,   0x89 => 0x02c9,   0x8a => 0x02c9,   0x8b => 0x02c9,
-            0x8c => 0x02c9,   0x8d => 0x02c9,   0x8e => 0x02c9,   0x8f => 0x02c9,
-            0x90 => 0x0300,   0x91 => 0x02c9,   0x92 => 0x0316,   0x93 => 0x0316,
-            0x94 => 0x037a,   0x95 => 0x0337,   0x96 => 0x0225,   0x97 =>   0xfa,
-            0x98 => 0x02c9,   0x99 => 0x025b,   0x9a => 0x025b,   0x9b => 0x0412,
-            0x9c => 0x03db,   0x9d => 0x025b,   0x9e => 0x03db,   0x9f => 0x025b,
-            0xa0 => 0x01ee,   0xa1 => 0x0149,   0xa2 => 0x0316,   0xa3 => 0x0316,
-            0xa4 => 0x0312,   0xa5 => 0x02c9,   0xa6 => 0x0180,   0xa7 => 0x0180,
-            0xa8 => 0x0180,   0xa9 => 0x0180,   0xaa => 0x0180,   0xab => 0x0180,
-            0xac => 0x01ee,   0xad => 0x01ee,   0xae => 0x01ee,   0xaf => 0x01ee,
-            0xb0 => 0x0149,   0xb1 => 0x0112,   0xb2 => 0x02ae,   0xb3 => 0x02ae,
-            0xb4 => 0x02ae,   0xb5 => 0x0180,   0xb6 => 0x0180,   0xb7 => 0x0180,
-            0xb8 => 0x0180,   0xb9 => 0x0180,   0xba => 0x0180,   0xbb => 0x01ee,
-            0xbc => 0x01ee,   0xbd => 0x01ee,   0xbe => 0x0316);
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02, 0x2200 =>   0x03,   0x23 =>   0x04,
-          0x2203 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x220b =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a, 0x2217 =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d, 0x2212 =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-          0x2245 =>   0x21, 0x0391 =>   0x22, 0x0392 =>   0x23, 0x03a7 =>   0x24,
-          0x2206 =>   0x25, 0x0395 =>   0x26, 0x03a6 =>   0x27, 0x0393 =>   0x28,
-          0x0397 =>   0x29, 0x0399 =>   0x2a, 0x03d1 =>   0x2b, 0x039a =>   0x2c,
-          0x039b =>   0x2d, 0x039c =>   0x2e, 0x039d =>   0x2f, 0x039f =>   0x30,
-          0x03a0 =>   0x31, 0x0398 =>   0x32, 0x03a1 =>   0x33, 0x03a3 =>   0x34,
-          0x03a4 =>   0x35, 0x03a5 =>   0x36, 0x03c2 =>   0x37, 0x2126 =>   0x38,
-          0x039e =>   0x39, 0x03a8 =>   0x3a, 0x0396 =>   0x3b,   0x5b =>   0x3c,
-          0x2234 =>   0x3d,   0x5d =>   0x3e, 0x22a5 =>   0x3f,   0x5f =>   0x40,
-          0xf8e5 =>   0x41, 0x03b1 =>   0x42, 0x03b2 =>   0x43, 0x03c7 =>   0x44,
-          0x03b4 =>   0x45, 0x03b5 =>   0x46, 0x03c6 =>   0x47, 0x03b3 =>   0x48,
-          0x03b7 =>   0x49, 0x03b9 =>   0x4a, 0x03d5 =>   0x4b, 0x03ba =>   0x4c,
-          0x03bb =>   0x4d,   0xb5 =>   0x4e, 0x03bd =>   0x4f, 0x03bf =>   0x50,
-          0x03c0 =>   0x51, 0x03b8 =>   0x52, 0x03c1 =>   0x53, 0x03c3 =>   0x54,
-          0x03c4 =>   0x55, 0x03c5 =>   0x56, 0x03d6 =>   0x57, 0x03c9 =>   0x58,
-          0x03be =>   0x59, 0x03c8 =>   0x5a, 0x03b6 =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e, 0x223c =>   0x5f, 0x20ac =>   0x60,
-          0x03d2 =>   0x61, 0x2032 =>   0x62, 0x2264 =>   0x63, 0x2044 =>   0x64,
-          0x221e =>   0x65, 0x0192 =>   0x66, 0x2663 =>   0x67, 0x2666 =>   0x68,
-          0x2665 =>   0x69, 0x2660 =>   0x6a, 0x2194 =>   0x6b, 0x2190 =>   0x6c,
-          0x2191 =>   0x6d, 0x2192 =>   0x6e, 0x2193 =>   0x6f,   0xb0 =>   0x70,
-            0xb1 =>   0x71, 0x2033 =>   0x72, 0x2265 =>   0x73,   0xd7 =>   0x74,
-          0x221d =>   0x75, 0x2202 =>   0x76, 0x2022 =>   0x77,   0xf7 =>   0x78,
-          0x2260 =>   0x79, 0x2261 =>   0x7a, 0x2248 =>   0x7b, 0x2026 =>   0x7c,
-          0xf8e6 =>   0x7d, 0xf8e7 =>   0x7e, 0x21b5 =>   0x7f, 0x2135 =>   0x80,
-          0x2111 =>   0x81, 0x211c =>   0x82, 0x2118 =>   0x83, 0x2297 =>   0x84,
-          0x2295 =>   0x85, 0x2205 =>   0x86, 0x2229 =>   0x87, 0x222a =>   0x88,
-          0x2283 =>   0x89, 0x2287 =>   0x8a, 0x2284 =>   0x8b, 0x2282 =>   0x8c,
-          0x2286 =>   0x8d, 0x2208 =>   0x8e, 0x2209 =>   0x8f, 0x2220 =>   0x90,
-          0x2207 =>   0x91, 0xf6da =>   0x92, 0xf6d9 =>   0x93, 0xf6db =>   0x94,
-          0x220f =>   0x95, 0x221a =>   0x96, 0x22c5 =>   0x97,   0xac =>   0x98,
-          0x2227 =>   0x99, 0x2228 =>   0x9a, 0x21d4 =>   0x9b, 0x21d0 =>   0x9c,
-          0x21d1 =>   0x9d, 0x21d2 =>   0x9e, 0x21d3 =>   0x9f, 0x25ca =>   0xa0,
-          0x2329 =>   0xa1, 0xf8e8 =>   0xa2, 0xf8e9 =>   0xa3, 0xf8ea =>   0xa4,
-          0x2211 =>   0xa5, 0xf8eb =>   0xa6, 0xf8ec =>   0xa7, 0xf8ed =>   0xa8,
-          0xf8ee =>   0xa9, 0xf8ef =>   0xaa, 0xf8f0 =>   0xab, 0xf8f1 =>   0xac,
-          0xf8f2 =>   0xad, 0xf8f3 =>   0xae, 0xf8f4 =>   0xaf, 0x232a =>   0xb0,
-          0x222b =>   0xb1, 0x2320 =>   0xb2, 0xf8f5 =>   0xb3, 0x2321 =>   0xb4,
-          0xf8f6 =>   0xb5, 0xf8f7 =>   0xb6, 0xf8f8 =>   0xb7, 0xf8f9 =>   0xb8,
-          0xf8fa =>   0xb9, 0xf8fb =>   0xba, 0xf8fc =>   0xbb, 0xf8fd =>   0xbc,
-          0xf8fe =>   0xbd, 0xf8ff =>   0xbe);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Symbol');
-
-        /* This font has a built-in custom character encoding method. Don't
-         * override with WinAnsi like the other built-in fonts or else it will
-         * not work as expected.
-         */
-        $this->_resource->Encoding = null;
-    }
-
-
-  /* Information and Conversion Methods */
-
-    /**
-     * Convert string encoding from local encoding to font encoding. Overridden
-     * to defeat the conversion behavior for this ornamental font.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    public function encodeString($string, $charEncoding)
-    {
-        /* This isn't the optimal time to perform this conversion, but it must
-         * live here until the remainder of the layout code is completed. This,
-         * and the $charEncoding parameter, will go away soon...
-         */
-        if ($charEncoding != 'UTF-16BE') {
-            $string = iconv($charEncoding, 'UTF-16BE', $string);
-        }
-        /**
-         * @todo Properly handle characters encoded as surrogate pairs.
-         */
-        $encodedString = '';
-        for ($i = 0; $i < strlen($string); $i++) {
-            $characterCode = (ord($string[$i++]) << 8) | ord($string[$i]);
-            if (isset($this->_toFontEncoding[$characterCode])) {
-                $encodedString .= $this->_toFontEncoding[$characterCode];
-            } else {
-                /* For now, mimic the behavior in Zend_Pdf_Font::encodeString()
-                 * where unknown characters are removed completely. This is not
-                 * perfect, but we should be consistent. In a future revision,
-                 * we will use the well-known substitution character 0x1a
-                 * (Control-Z).
-                 */
-            }
-        }
-        return $encodedString;
-    }
-
-    /**
-     * Convert string encoding from font encoding to local encoding. Overridden
-     * to defeat the conversion behavior for this ornamental font.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-    public function decodeString($string, $charEncoding)
-    {
-        $decodedString = '';
-        for ($i = 0; $i < strlen($string); $i++) {
-            $characterCode = ord($string[$i]);
-            if (isset($this->_fromFontEncoding[$characterCode])) {
-                $decodedString .= $this->_fromFontEncoding[$characterCode];
-            } else {
-                /* For now, mimic the behavior in Zend_Pdf_Font::encodeString()
-                 * where unknown characters are removed completely. This is not
-                 * perfect, but we should be consistent. In a future revision,
-                 * we will use the Unicode substitution character (U+FFFD).
-                 */
-            }
-        }
-        if ($charEncoding != 'UTF-16BE') {
-            $decodedString = iconv('UTF-16BE', $charEncoding, $decodedString);
-        }
-        return $decodedString;
-    }
-
-    /**
-     * Converts a Latin-encoded string that fakes the font's internal encoding
-     * to the proper Unicode characters, in UTF-16BE encoding.
-     *
-     * Used to maintain backwards compatibility with the 20 year-old legacy
-     * method of using this font, which is still employed by recent versions of
-     * some popular word processors.
-     *
-     * Note that using this method adds overhead due to the additional
-     * character conversion. Don't use this for new code; it is more efficient
-     * to use the appropriate Unicode characters directly.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source
-     *   string. Defaults to current locale.
-     * @return string
-     */
-    public function toUnicode($string, $charEncoding = '')
-    {
-        /* When using these faked strings, the closest match to the font's
-         * internal encoding is ISO-8859-1.
-         */
-        if ($charEncoding != 'ISO-8859-1') {
-            $string = iconv($charEncoding, 'ISO-8859-1', $string);
-        }
-        return $this->decodeString($string, 'UTF-16BE');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
deleted file mode 100644
index 8d0e399a7..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimesBold.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Times-Bold.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_TimesBold extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x20\x00"
-          . "\x69\x00\x73\x00\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00"
-          . "\x64\x00\x65\x00\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00"
-          . "\x66\x00\x20\x00\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00"
-          . "\x70\x00\x65\x00\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00"
-          . "\x41\x00\x47\x00\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00"
-          . "\x72\x00\x20\x00\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00"
-          . "\x62\x00\x73\x00\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00"
-          . "\x65\x00\x73\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x36\x00\x35";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x42\x00\x6f\x00"
-          . "\x6c\x00\x64\x00\x20\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x42\x00\x6f\x00"
-          . "\x6c\x00\x64";
-
-        $this->_isBold = true;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 683;
-        $this->_descent = -217;
-        $this->_lineGap = 300;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 =>   0xfa,   0x02 => 0x014d,   0x03 => 0x022b,
-            0x04 => 0x01f4,   0x05 => 0x01f4,   0x06 => 0x03e8,   0x07 => 0x0341,
-            0x08 => 0x014d,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x01f4,
-            0x0c => 0x023a,   0x0d =>   0xfa,   0x0e => 0x014d,   0x0f =>   0xfa,
-            0x10 => 0x0116,   0x11 => 0x01f4,   0x12 => 0x01f4,   0x13 => 0x01f4,
-            0x14 => 0x01f4,   0x15 => 0x01f4,   0x16 => 0x01f4,   0x17 => 0x01f4,
-            0x18 => 0x01f4,   0x19 => 0x01f4,   0x1a => 0x01f4,   0x1b => 0x014d,
-            0x1c => 0x014d,   0x1d => 0x023a,   0x1e => 0x023a,   0x1f => 0x023a,
-            0x20 => 0x01f4,   0x21 => 0x03a2,   0x22 => 0x02d2,   0x23 => 0x029b,
-            0x24 => 0x02d2,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x0263,
-            0x28 => 0x030a,   0x29 => 0x030a,   0x2a => 0x0185,   0x2b => 0x01f4,
-            0x2c => 0x030a,   0x2d => 0x029b,   0x2e => 0x03b0,   0x2f => 0x02d2,
-            0x30 => 0x030a,   0x31 => 0x0263,   0x32 => 0x030a,   0x33 => 0x02d2,
-            0x34 => 0x022c,   0x35 => 0x029b,   0x36 => 0x02d2,   0x37 => 0x02d2,
-            0x38 => 0x03e8,   0x39 => 0x02d2,   0x3a => 0x02d2,   0x3b => 0x029b,
-            0x3c => 0x014d,   0x3d => 0x0116,   0x3e => 0x014d,   0x3f => 0x0245,
-            0x40 => 0x01f4,   0x41 => 0x014d,   0x42 => 0x01f4,   0x43 => 0x022c,
-            0x44 => 0x01bc,   0x45 => 0x022c,   0x46 => 0x01bc,   0x47 => 0x014d,
-            0x48 => 0x01f4,   0x49 => 0x022c,   0x4a => 0x0116,   0x4b => 0x014d,
-            0x4c => 0x022c,   0x4d => 0x0116,   0x4e => 0x0341,   0x4f => 0x022c,
-            0x50 => 0x01f4,   0x51 => 0x022c,   0x52 => 0x022c,   0x53 => 0x01bc,
-            0x54 => 0x0185,   0x55 => 0x014d,   0x56 => 0x022c,   0x57 => 0x01f4,
-            0x58 => 0x02d2,   0x59 => 0x01f4,   0x5a => 0x01f4,   0x5b => 0x01bc,
-            0x5c => 0x018a,   0x5d =>   0xdc,   0x5e => 0x018a,   0x5f => 0x0208,
-            0x60 => 0x014d,   0x61 => 0x01f4,   0x62 => 0x01f4,   0x63 =>   0xa7,
-            0x64 => 0x01f4,   0x65 => 0x01f4,   0x66 => 0x01f4,   0x67 => 0x01f4,
-            0x68 => 0x0116,   0x69 => 0x01f4,   0x6a => 0x01f4,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x022c,   0x6e => 0x022c,   0x6f => 0x01f4,
-            0x70 => 0x01f4,   0x71 => 0x01f4,   0x72 =>   0xfa,   0x73 => 0x021c,
-            0x74 => 0x015e,   0x75 => 0x014d,   0x76 => 0x01f4,   0x77 => 0x01f4,
-            0x78 => 0x01f4,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x01f4,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03e8,   0x8b => 0x012c,
-            0x8c => 0x029b,   0x8d => 0x030a,   0x8e => 0x03e8,   0x8f => 0x014a,
-            0x90 => 0x02d2,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x01f4,
-            0x94 => 0x02d2,   0x95 => 0x022c,   0x96 => 0x0185,   0x97 => 0x01bc,
-            0x98 => 0x01f4,   0x99 => 0x022c,   0x9a => 0x01bc,   0x9b => 0x02d2,
-            0x9c => 0x023a,   0x9d => 0x02d2,   0x9e => 0x02d2,   0x9f => 0x01f4,
-            0xa0 => 0x02d2,   0xa1 => 0x01f4,   0xa2 => 0x0185,   0xa3 => 0x01bc,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x01f4,   0xa7 => 0x02d2,
-            0xa8 => 0x022c,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02eb,   0xad => 0x029b,   0xae => 0x01bc,   0xaf => 0x01f4,
-            0xb0 => 0x02d2,   0xb1 => 0x0116,   0xb2 => 0x01f4,   0xb3 => 0x029b,
-            0xb4 => 0x02d2,   0xb5 => 0x01f4,   0xb6 => 0x029b,   0xb7 => 0x0185,
-            0xb8 => 0x0185,   0xb9 => 0x0116,   0xba => 0x01ee,   0xbb => 0x02d2,
-            0xbc => 0x030a,   0xbd => 0x022c,   0xbe => 0x01f4,   0xbf => 0x02d2,
-            0xc0 => 0x01bc,   0xc1 => 0x01bc,   0xc2 => 0x029b,   0xc3 => 0x0263,
-            0xc4 => 0x030a,   0xc5 => 0x02d2,   0xc6 => 0x022c,   0xc7 => 0x02a0,
-            0xc8 => 0x02d2,   0xc9 => 0x022c,   0xca => 0x012c,   0xcb => 0x030a,
-            0xcc => 0x02d2,   0xcd => 0x02d2,   0xce => 0x023a,   0xcf => 0x022c,
-            0xd0 => 0x029b,   0xd1 => 0x01ee,   0xd2 => 0x01f4,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x01f4,   0xd7 => 0x01bc,
-            0xd8 => 0x01bc,   0xd9 => 0x022c,   0xda => 0x022c,   0xdb => 0x02d2,
-            0xdc => 0x0185,   0xdd => 0x023a,   0xde =>   0xdc,   0xdf => 0x02eb,
-            0xe0 => 0x030a,   0xe1 => 0x0185,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x01bc,   0xe5 => 0x01f4,   0xe6 => 0x029b,   0xe7 => 0x029b,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x02d2,   0xeb => 0x0116,
-            0xec => 0x01a0,   0xed => 0x01bc,   0xee => 0x02d2,   0xef => 0x02d2,
-            0xf0 => 0x02d2,   0xf1 => 0x01bc,   0xf2 => 0x01bc,   0xf3 => 0x0116,
-            0xf4 => 0x030a,   0xf5 => 0x01f4,   0xf6 => 0x01f4,   0xf7 => 0x0185,
-            0xf8 => 0x0116,   0xf9 => 0x030a,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x022c,   0xfd => 0x012c,   0xfe => 0x030a,   0xff => 0x022c,
-          0x0100 => 0x0116, 0x0101 => 0x01f4, 0x0102 => 0x029b, 0x0103 => 0x022c,
-          0x0104 => 0x02ee, 0x0105 => 0x022c, 0x0106 => 0x018a, 0x0107 => 0x030a,
-          0x0108 => 0x029b, 0x0109 => 0x03e8, 0x010a => 0x01bc, 0x010b => 0x0185,
-          0x010c => 0x0185, 0x010d => 0x029b, 0x010e => 0x02ee, 0x010f => 0x0225,
-          0x0110 => 0x01f4, 0x0111 => 0x022c, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x01bc, 0x0115 => 0x01f4, 0x0116 => 0x02ee, 0x0117 => 0x022c,
-          0x0118 => 0x022c, 0x0119 => 0x030a, 0x011a => 0x0190, 0x011b => 0x01f4,
-          0x011c => 0x02d2, 0x011d => 0x022c, 0x011e => 0x0225, 0x011f => 0x02d2,
-          0x0120 => 0x01bc, 0x0121 => 0x02d2, 0x0122 => 0x01f4, 0x0123 => 0x02d2,
-          0x0124 => 0x029b, 0x0125 => 0x02d2, 0x0126 => 0x02d2, 0x0127 => 0x02d2,
-          0x0128 => 0x030a, 0x0129 => 0x01bc, 0x012a => 0x029b, 0x012b => 0x0185,
-          0x012c => 0x022c, 0x012d => 0x023a, 0x012e => 0x0185, 0x012f => 0x022c,
-          0x0130 => 0x014d, 0x0131 => 0x023a, 0x0132 => 0x01f4, 0x0133 => 0x022c,
-          0x0134 => 0x0225, 0x0135 => 0x01f4, 0x0136 => 0x01f4, 0x0137 => 0x01bc,
-          0x0138 => 0x022c, 0x0139 => 0x012c, 0x013a => 0x0116, 0x013b => 0x01f4,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Times-Bold');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
deleted file mode 100644
index e8645746c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimesBoldItalic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Times-BoldItalic.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_TimesBoldItalic extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x20\x00"
-          . "\x69\x00\x73\x00\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00"
-          . "\x64\x00\x65\x00\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00"
-          . "\x66\x00\x20\x00\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00"
-          . "\x70\x00\x65\x00\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00"
-          . "\x41\x00\x47\x00\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00"
-          . "\x72\x00\x20\x00\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00"
-          . "\x62\x00\x73\x00\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00"
-          . "\x65\x00\x73\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x36\x00\x36";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x42\x00\x6f\x00"
-          . "\x6c\x00\x64\x00\x49\x00\x74\x00\x61\x00\x6c\x00\x69\x00\x63\x00"
-          . "\x20\x00\x42\x00\x6f\x00\x6c\x00\x64";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x42\x00\x6f\x00"
-          . "\x6c\x00\x64\x00\x49\x00\x74\x00\x61\x00\x6c\x00\x69\x00\x63";
-
-        $this->_isBold = true;
-        $this->_isItalic = true;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 683;
-        $this->_descent = -217;
-        $this->_lineGap = 300;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 =>   0xfa,   0x02 => 0x0185,   0x03 => 0x022b,
-            0x04 => 0x01f4,   0x05 => 0x01f4,   0x06 => 0x0341,   0x07 => 0x030a,
-            0x08 => 0x014d,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x01f4,
-            0x0c => 0x023a,   0x0d =>   0xfa,   0x0e => 0x014d,   0x0f =>   0xfa,
-            0x10 => 0x0116,   0x11 => 0x01f4,   0x12 => 0x01f4,   0x13 => 0x01f4,
-            0x14 => 0x01f4,   0x15 => 0x01f4,   0x16 => 0x01f4,   0x17 => 0x01f4,
-            0x18 => 0x01f4,   0x19 => 0x01f4,   0x1a => 0x01f4,   0x1b => 0x014d,
-            0x1c => 0x014d,   0x1d => 0x023a,   0x1e => 0x023a,   0x1f => 0x023a,
-            0x20 => 0x01f4,   0x21 => 0x0340,   0x22 => 0x029b,   0x23 => 0x029b,
-            0x24 => 0x029b,   0x25 => 0x02d2,   0x26 => 0x029b,   0x27 => 0x029b,
-            0x28 => 0x02d2,   0x29 => 0x030a,   0x2a => 0x0185,   0x2b => 0x01f4,
-            0x2c => 0x029b,   0x2d => 0x0263,   0x2e => 0x0379,   0x2f => 0x02d2,
-            0x30 => 0x02d2,   0x31 => 0x0263,   0x32 => 0x02d2,   0x33 => 0x029b,
-            0x34 => 0x022c,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x029b,
-            0x38 => 0x0379,   0x39 => 0x029b,   0x3a => 0x0263,   0x3b => 0x0263,
-            0x3c => 0x014d,   0x3d => 0x0116,   0x3e => 0x014d,   0x3f => 0x023a,
-            0x40 => 0x01f4,   0x41 => 0x014d,   0x42 => 0x01f4,   0x43 => 0x01f4,
-            0x44 => 0x01bc,   0x45 => 0x01f4,   0x46 => 0x01bc,   0x47 => 0x014d,
-            0x48 => 0x01f4,   0x49 => 0x022c,   0x4a => 0x0116,   0x4b => 0x0116,
-            0x4c => 0x01f4,   0x4d => 0x0116,   0x4e => 0x030a,   0x4f => 0x022c,
-            0x50 => 0x01f4,   0x51 => 0x01f4,   0x52 => 0x01f4,   0x53 => 0x0185,
-            0x54 => 0x0185,   0x55 => 0x0116,   0x56 => 0x022c,   0x57 => 0x01bc,
-            0x58 => 0x029b,   0x59 => 0x01f4,   0x5a => 0x01bc,   0x5b => 0x0185,
-            0x5c => 0x015c,   0x5d =>   0xdc,   0x5e => 0x015c,   0x5f => 0x023a,
-            0x60 => 0x0185,   0x61 => 0x01f4,   0x62 => 0x01f4,   0x63 =>   0xa7,
-            0x64 => 0x01f4,   0x65 => 0x01f4,   0x66 => 0x01f4,   0x67 => 0x01f4,
-            0x68 => 0x0116,   0x69 => 0x01f4,   0x6a => 0x01f4,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x022c,   0x6e => 0x022c,   0x6f => 0x01f4,
-            0x70 => 0x01f4,   0x71 => 0x01f4,   0x72 =>   0xfa,   0x73 => 0x01f4,
-            0x74 => 0x015e,   0x75 => 0x014d,   0x76 => 0x01f4,   0x77 => 0x01f4,
-            0x78 => 0x01f4,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x01f4,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x03b0,   0x8b => 0x010a,
-            0x8c => 0x0263,   0x8d => 0x02d2,   0x8e => 0x03b0,   0x8f => 0x012c,
-            0x90 => 0x02d2,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x01f4,
-            0x94 => 0x02d2,   0x95 => 0x01f4,   0x96 => 0x0185,   0x97 => 0x01bc,
-            0x98 => 0x01f4,   0x99 => 0x022c,   0x9a => 0x01bc,   0x9b => 0x0263,
-            0x9c => 0x023a,   0x9d => 0x0263,   0x9e => 0x029b,   0x9f => 0x01f4,
-            0xa0 => 0x02d2,   0xa1 => 0x01bc,   0xa2 => 0x0185,   0xa3 => 0x01bc,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x01f4,   0xa7 => 0x02d2,
-            0xa8 => 0x022c,   0xa9 => 0x029b,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02eb,   0xad => 0x029b,   0xae => 0x01bc,   0xaf => 0x01f4,
-            0xb0 => 0x02d2,   0xb1 => 0x0116,   0xb2 => 0x01f4,   0xb3 => 0x0263,
-            0xb4 => 0x029b,   0xb5 => 0x01f4,   0xb6 => 0x029b,   0xb7 => 0x0185,
-            0xb8 => 0x0185,   0xb9 => 0x0116,   0xba => 0x01ee,   0xbb => 0x029b,
-            0xbc => 0x02d2,   0xbd => 0x022c,   0xbe => 0x01f4,   0xbf => 0x029b,
-            0xc0 => 0x0185,   0xc1 => 0x01bc,   0xc2 => 0x0263,   0xc3 => 0x0263,
-            0xc4 => 0x02d2,   0xc5 => 0x029b,   0xc6 => 0x022c,   0xc7 => 0x0260,
-            0xc8 => 0x02d2,   0xc9 => 0x022c,   0xca => 0x012c,   0xcb => 0x02d2,
-            0xcc => 0x029b,   0xcd => 0x029b,   0xce => 0x023a,   0xcf => 0x022c,
-            0xd0 => 0x0263,   0xd1 => 0x01ee,   0xd2 => 0x01bc,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x029b,   0xd6 => 0x01f4,   0xd7 => 0x01bc,
-            0xd8 => 0x01bc,   0xd9 => 0x022c,   0xda => 0x022c,   0xdb => 0x02d2,
-            0xdc => 0x0185,   0xdd => 0x023a,   0xde =>   0xdc,   0xdf => 0x02eb,
-            0xe0 => 0x02d2,   0xe1 => 0x0185,   0xe2 => 0x0258,   0xe3 => 0x029b,
-            0xe4 => 0x0185,   0xe5 => 0x01f4,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x029b,   0xeb => 0x0116,
-            0xec => 0x016e,   0xed => 0x01bc,   0xee => 0x02d2,   0xef => 0x029b,
-            0xf0 => 0x029b,   0xf1 => 0x01bc,   0xf2 => 0x0185,   0xf3 => 0x0116,
-            0xf4 => 0x02d2,   0xf5 => 0x01f4,   0xf6 => 0x01f4,   0xf7 => 0x0185,
-            0xf8 => 0x0116,   0xf9 => 0x02d2,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x01f4,   0xfd => 0x012c,   0xfe => 0x02d2,   0xff => 0x0240,
-          0x0100 => 0x0116, 0x0101 => 0x01f4, 0x0102 => 0x029b, 0x0103 => 0x01f4,
-          0x0104 => 0x02ee, 0x0105 => 0x022c, 0x0106 => 0x017e, 0x0107 => 0x029b,
-          0x0108 => 0x0263, 0x0109 => 0x03e8, 0x010a => 0x01bc, 0x010b => 0x0185,
-          0x010c => 0x0185, 0x010d => 0x0263, 0x010e => 0x02ee, 0x010f => 0x0225,
-          0x0110 => 0x01f4, 0x0111 => 0x022c, 0x0112 => 0x02d2, 0x0113 => 0x029b,
-          0x0114 => 0x01bc, 0x0115 => 0x01f4, 0x0116 => 0x02ee, 0x0117 => 0x022c,
-          0x0118 => 0x022c, 0x0119 => 0x02d2, 0x011a => 0x0190, 0x011b => 0x01f4,
-          0x011c => 0x029b, 0x011d => 0x022c, 0x011e => 0x0225, 0x011f => 0x02d2,
-          0x0120 => 0x0185, 0x0121 => 0x02d2, 0x0122 => 0x01f4, 0x0123 => 0x029b,
-          0x0124 => 0x0263, 0x0125 => 0x029b, 0x0126 => 0x029b, 0x0127 => 0x029b,
-          0x0128 => 0x02d2, 0x0129 => 0x0185, 0x012a => 0x029b, 0x012b => 0x0185,
-          0x012c => 0x01f4, 0x012d => 0x025e, 0x012e => 0x0185, 0x012f => 0x022c,
-          0x0130 => 0x0116, 0x0131 => 0x025e, 0x0132 => 0x01f4, 0x0133 => 0x022c,
-          0x0134 => 0x0225, 0x0135 => 0x01f4, 0x0136 => 0x01f4, 0x0137 => 0x0185,
-          0x0138 => 0x022c, 0x0139 => 0x012c, 0x013a => 0x0116, 0x013b => 0x01f4,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Times-BoldItalic');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
deleted file mode 100644
index d6b4ce107..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimesItalic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Times-Italic.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_TimesItalic extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x20\x00"
-          . "\x69\x00\x73\x00\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00"
-          . "\x64\x00\x65\x00\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00"
-          . "\x66\x00\x20\x00\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00"
-          . "\x70\x00\x65\x00\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00"
-          . "\x41\x00\x47\x00\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00"
-          . "\x72\x00\x20\x00\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00"
-          . "\x62\x00\x73\x00\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00"
-          . "\x65\x00\x73\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x36\x00\x37";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x49\x00\x74\x00"
-          . "\x61\x00\x6c\x00\x69\x00\x63\x00\x20\x00\x4d\x00\x65\x00\x64\x00"
-          . "\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x49\x00\x74\x00"
-          . "\x61\x00\x6c\x00\x69\x00\x63";
-
-        $this->_isBold = false;
-        $this->_isItalic = true;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 683;
-        $this->_descent = -217;
-        $this->_lineGap = 300;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 =>   0xfa,   0x02 => 0x014d,   0x03 => 0x01a4,
-            0x04 => 0x01f4,   0x05 => 0x01f4,   0x06 => 0x0341,   0x07 => 0x030a,
-            0x08 => 0x014d,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x01f4,
-            0x0c => 0x02a3,   0x0d =>   0xfa,   0x0e => 0x014d,   0x0f =>   0xfa,
-            0x10 => 0x0116,   0x11 => 0x01f4,   0x12 => 0x01f4,   0x13 => 0x01f4,
-            0x14 => 0x01f4,   0x15 => 0x01f4,   0x16 => 0x01f4,   0x17 => 0x01f4,
-            0x18 => 0x01f4,   0x19 => 0x01f4,   0x1a => 0x01f4,   0x1b => 0x014d,
-            0x1c => 0x014d,   0x1d => 0x02a3,   0x1e => 0x02a3,   0x1f => 0x02a3,
-            0x20 => 0x01f4,   0x21 => 0x0398,   0x22 => 0x0263,   0x23 => 0x0263,
-            0x24 => 0x029b,   0x25 => 0x02d2,   0x26 => 0x0263,   0x27 => 0x0263,
-            0x28 => 0x02d2,   0x29 => 0x02d2,   0x2a => 0x014d,   0x2b => 0x01bc,
-            0x2c => 0x029b,   0x2d => 0x022c,   0x2e => 0x0341,   0x2f => 0x029b,
-            0x30 => 0x02d2,   0x31 => 0x0263,   0x32 => 0x02d2,   0x33 => 0x0263,
-            0x34 => 0x01f4,   0x35 => 0x022c,   0x36 => 0x02d2,   0x37 => 0x0263,
-            0x38 => 0x0341,   0x39 => 0x0263,   0x3a => 0x022c,   0x3b => 0x022c,
-            0x3c => 0x0185,   0x3d => 0x0116,   0x3e => 0x0185,   0x3f => 0x01a6,
-            0x40 => 0x01f4,   0x41 => 0x014d,   0x42 => 0x01f4,   0x43 => 0x01f4,
-            0x44 => 0x01bc,   0x45 => 0x01f4,   0x46 => 0x01bc,   0x47 => 0x0116,
-            0x48 => 0x01f4,   0x49 => 0x01f4,   0x4a => 0x0116,   0x4b => 0x0116,
-            0x4c => 0x01bc,   0x4d => 0x0116,   0x4e => 0x02d2,   0x4f => 0x01f4,
-            0x50 => 0x01f4,   0x51 => 0x01f4,   0x52 => 0x01f4,   0x53 => 0x0185,
-            0x54 => 0x0185,   0x55 => 0x0116,   0x56 => 0x01f4,   0x57 => 0x01bc,
-            0x58 => 0x029b,   0x59 => 0x01bc,   0x5a => 0x01bc,   0x5b => 0x0185,
-            0x5c => 0x0190,   0x5d => 0x0113,   0x5e => 0x0190,   0x5f => 0x021d,
-            0x60 => 0x0185,   0x61 => 0x01f4,   0x62 => 0x01f4,   0x63 =>   0xa7,
-            0x64 => 0x01f4,   0x65 => 0x01f4,   0x66 => 0x01f4,   0x67 => 0x01f4,
-            0x68 =>   0xd6,   0x69 => 0x022c,   0x6a => 0x01f4,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x01f4,   0x6e => 0x01f4,   0x6f => 0x01f4,
-            0x70 => 0x01f4,   0x71 => 0x01f4,   0x72 =>   0xfa,   0x73 => 0x020b,
-            0x74 => 0x015e,   0x75 => 0x014d,   0x76 => 0x022c,   0x77 => 0x022c,
-            0x78 => 0x01f4,   0x79 => 0x0379,   0x7a => 0x03e8,   0x7b => 0x01f4,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x0379,   0x8a => 0x0379,   0x8b => 0x0114,
-            0x8c => 0x022c,   0x8d => 0x02d2,   0x8e => 0x03b0,   0x8f => 0x0136,
-            0x90 => 0x029b,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x01f4,
-            0x94 => 0x029b,   0x95 => 0x01f4,   0x96 => 0x014d,   0x97 => 0x01bc,
-            0x98 => 0x01f4,   0x99 => 0x01f4,   0x9a => 0x01bc,   0x9b => 0x022c,
-            0x9c => 0x02a3,   0x9d => 0x022c,   0x9e => 0x0263,   0x9f => 0x01f4,
-            0xa0 => 0x02d2,   0xa1 => 0x01bc,   0xa2 => 0x0185,   0xa3 => 0x01bc,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x01f4,   0xa7 => 0x02d2,
-            0xa8 => 0x01f4,   0xa9 => 0x0263,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02f8,   0xad => 0x0263,   0xae => 0x01bc,   0xaf => 0x01f4,
-            0xb0 => 0x029b,   0xb1 => 0x0116,   0xb2 => 0x01f4,   0xb3 => 0x022c,
-            0xb4 => 0x029b,   0xb5 => 0x01f4,   0xb6 => 0x0263,   0xb7 => 0x0185,
-            0xb8 => 0x0185,   0xb9 => 0x0116,   0xba => 0x01d7,   0xbb => 0x0263,
-            0xbc => 0x02d2,   0xbd => 0x01f4,   0xbe => 0x01f4,   0xbf => 0x0263,
-            0xc0 => 0x0185,   0xc1 => 0x01bc,   0xc2 => 0x022c,   0xc3 => 0x0263,
-            0xc4 => 0x02d2,   0xc5 => 0x0263,   0xc6 => 0x01f4,   0xc7 => 0x0220,
-            0xc8 => 0x02d2,   0xc9 => 0x01f4,   0xca => 0x012c,   0xcb => 0x02d2,
-            0xcc => 0x0263,   0xcd => 0x0263,   0xce => 0x02a3,   0xcf => 0x01f4,
-            0xd0 => 0x022c,   0xd1 => 0x01dc,   0xd2 => 0x01bc,   0xd3 => 0x029b,
-            0xd4 => 0x0116,   0xd5 => 0x0263,   0xd6 => 0x01f4,   0xd7 => 0x01bc,
-            0xd8 => 0x01bc,   0xd9 => 0x01f4,   0xda => 0x01f4,   0xdb => 0x029b,
-            0xdc => 0x014d,   0xdd => 0x02a3,   0xde => 0x0113,   0xdf => 0x02f8,
-            0xe0 => 0x02d2,   0xe1 => 0x014d,   0xe2 => 0x0258,   0xe3 => 0x0263,
-            0xe4 => 0x0185,   0xe5 => 0x01f4,   0xe6 => 0x022c,   0xe7 => 0x022c,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x029b,   0xeb => 0x0116,
-            0xec => 0x012c,   0xed => 0x01bc,   0xee => 0x02d2,   0xef => 0x0263,
-            0xf0 => 0x0263,   0xf1 => 0x01bc,   0xf2 => 0x0185,   0xf3 => 0x0116,
-            0xf4 => 0x02d2,   0xf5 => 0x01f4,   0xf6 => 0x01f4,   0xf7 => 0x0185,
-            0xf8 => 0x0116,   0xf9 => 0x02d2,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x01f4,   0xfd => 0x012c,   0xfe => 0x02d2,   0xff => 0x01f4,
-          0x0100 => 0x0116, 0x0101 => 0x01f4, 0x0102 => 0x0263, 0x0103 => 0x01f4,
-          0x0104 => 0x02ee, 0x0105 => 0x01f4, 0x0106 => 0x012c, 0x0107 => 0x029b,
-          0x0108 => 0x022c, 0x0109 => 0x03d4, 0x010a => 0x01bc, 0x010b => 0x014d,
-          0x010c => 0x014d, 0x010d => 0x0263, 0x010e => 0x02ee, 0x010f => 0x0225,
-          0x0110 => 0x01f4, 0x0111 => 0x01f4, 0x0112 => 0x02d2, 0x0113 => 0x0263,
-          0x0114 => 0x01bc, 0x0115 => 0x01f4, 0x0116 => 0x02ee, 0x0117 => 0x01f4,
-          0x0118 => 0x01f4, 0x0119 => 0x02d2, 0x011a => 0x0190, 0x011b => 0x01f4,
-          0x011c => 0x029b, 0x011d => 0x01f4, 0x011e => 0x01c5, 0x011f => 0x02d2,
-          0x0120 => 0x0185, 0x0121 => 0x029b, 0x0122 => 0x01f4, 0x0123 => 0x0263,
-          0x0124 => 0x022c, 0x0125 => 0x0263, 0x0126 => 0x0263, 0x0127 => 0x0263,
-          0x0128 => 0x02d2, 0x0129 => 0x0185, 0x012a => 0x0263, 0x012b => 0x014d,
-          0x012c => 0x01bc, 0x012d => 0x02a3, 0x012e => 0x014d, 0x012f => 0x01f4,
-          0x0130 => 0x0116, 0x0131 => 0x02a3, 0x0132 => 0x01f4, 0x0133 => 0x01f4,
-          0x0134 => 0x0225, 0x0135 => 0x01f4, 0x0136 => 0x01f4, 0x0137 => 0x0185,
-          0x0138 => 0x01f4, 0x0139 => 0x012c, 0x013a => 0x0116, 0x013b => 0x01f4,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Times-Italic');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
deleted file mode 100644
index aa715fe1d..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TimesRoman.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font Times-Roman.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_TimesRoman extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x39\x00\x30\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x33\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x39\x00\x37\x00"
-          . "\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00\x20\x00\x53\x00"
-          . "\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00\x20\x00\x49\x00"
-          . "\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x20\x00\x41\x00\x6c\x00"
-          . "\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00\x73\x00"
-          . "\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00"
-          . "\x64\x00\x2e\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x20\x00"
-          . "\x69\x00\x73\x00\x20\x00\x61\x00\x20\x00\x74\x00\x72\x00\x61\x00"
-          . "\x64\x00\x65\x00\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00"
-          . "\x66\x00\x20\x00\x4c\x00\x69\x00\x6e\x00\x6f\x00\x74\x00\x79\x00"
-          . "\x70\x00\x65\x00\x2d\x00\x48\x00\x65\x00\x6c\x00\x6c\x00\x20\x00"
-          . "\x41\x00\x47\x00\x20\x00\x61\x00\x6e\x00\x64\x00\x2f\x00\x6f\x00"
-          . "\x72\x00\x20\x00\x69\x00\x74\x00\x73\x00\x20\x00\x73\x00\x75\x00"
-          . "\x62\x00\x73\x00\x69\x00\x64\x00\x69\x00\x61\x00\x72\x00\x69\x00"
-          . "\x65\x00\x73\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x52\x00\x6f\x00\x6d\x00\x61\x00\x6e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x36\x00\x38";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x52\x00\x6f\x00"
-          . "\x6d\x00\x61\x00\x6e\x00\x20\x00\x52\x00\x6f\x00\x6d\x00\x61\x00"
-          . "\x6e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x54\x00\x69\x00\x6d\x00\x65\x00\x73\x00\x2d\x00\x52\x00\x6f\x00"
-          . "\x6d\x00\x61\x00\x6e";
-
-        $this->_isBold = false;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 683;
-        $this->_descent = -217;
-        $this->_lineGap = 300;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 =>   0xfa,   0x02 => 0x014d,   0x03 => 0x0198,
-            0x04 => 0x01f4,   0x05 => 0x01f4,   0x06 => 0x0341,   0x07 => 0x030a,
-            0x08 => 0x014d,   0x09 => 0x014d,   0x0a => 0x014d,   0x0b => 0x01f4,
-            0x0c => 0x0234,   0x0d =>   0xfa,   0x0e => 0x014d,   0x0f =>   0xfa,
-            0x10 => 0x0116,   0x11 => 0x01f4,   0x12 => 0x01f4,   0x13 => 0x01f4,
-            0x14 => 0x01f4,   0x15 => 0x01f4,   0x16 => 0x01f4,   0x17 => 0x01f4,
-            0x18 => 0x01f4,   0x19 => 0x01f4,   0x1a => 0x01f4,   0x1b => 0x0116,
-            0x1c => 0x0116,   0x1d => 0x0234,   0x1e => 0x0234,   0x1f => 0x0234,
-            0x20 => 0x01bc,   0x21 => 0x0399,   0x22 => 0x02d2,   0x23 => 0x029b,
-            0x24 => 0x029b,   0x25 => 0x02d2,   0x26 => 0x0263,   0x27 => 0x022c,
-            0x28 => 0x02d2,   0x29 => 0x02d2,   0x2a => 0x014d,   0x2b => 0x0185,
-            0x2c => 0x02d2,   0x2d => 0x0263,   0x2e => 0x0379,   0x2f => 0x02d2,
-            0x30 => 0x02d2,   0x31 => 0x022c,   0x32 => 0x02d2,   0x33 => 0x029b,
-            0x34 => 0x022c,   0x35 => 0x0263,   0x36 => 0x02d2,   0x37 => 0x02d2,
-            0x38 => 0x03b0,   0x39 => 0x02d2,   0x3a => 0x02d2,   0x3b => 0x0263,
-            0x3c => 0x014d,   0x3d => 0x0116,   0x3e => 0x014d,   0x3f => 0x01d5,
-            0x40 => 0x01f4,   0x41 => 0x014d,   0x42 => 0x01bc,   0x43 => 0x01f4,
-            0x44 => 0x01bc,   0x45 => 0x01f4,   0x46 => 0x01bc,   0x47 => 0x014d,
-            0x48 => 0x01f4,   0x49 => 0x01f4,   0x4a => 0x0116,   0x4b => 0x0116,
-            0x4c => 0x01f4,   0x4d => 0x0116,   0x4e => 0x030a,   0x4f => 0x01f4,
-            0x50 => 0x01f4,   0x51 => 0x01f4,   0x52 => 0x01f4,   0x53 => 0x014d,
-            0x54 => 0x0185,   0x55 => 0x0116,   0x56 => 0x01f4,   0x57 => 0x01f4,
-            0x58 => 0x02d2,   0x59 => 0x01f4,   0x5a => 0x01f4,   0x5b => 0x01bc,
-            0x5c => 0x01e0,   0x5d =>   0xc8,   0x5e => 0x01e0,   0x5f => 0x021d,
-            0x60 => 0x014d,   0x61 => 0x01f4,   0x62 => 0x01f4,   0x63 =>   0xa7,
-            0x64 => 0x01f4,   0x65 => 0x01f4,   0x66 => 0x01f4,   0x67 => 0x01f4,
-            0x68 =>   0xb4,   0x69 => 0x01bc,   0x6a => 0x01f4,   0x6b => 0x014d,
-            0x6c => 0x014d,   0x6d => 0x022c,   0x6e => 0x022c,   0x6f => 0x01f4,
-            0x70 => 0x01f4,   0x71 => 0x01f4,   0x72 =>   0xfa,   0x73 => 0x01c5,
-            0x74 => 0x015e,   0x75 => 0x014d,   0x76 => 0x01bc,   0x77 => 0x01bc,
-            0x78 => 0x01f4,   0x79 => 0x03e8,   0x7a => 0x03e8,   0x7b => 0x01bc,
-            0x7c => 0x014d,   0x7d => 0x014d,   0x7e => 0x014d,   0x7f => 0x014d,
-            0x80 => 0x014d,   0x81 => 0x014d,   0x82 => 0x014d,   0x83 => 0x014d,
-            0x84 => 0x014d,   0x85 => 0x014d,   0x86 => 0x014d,   0x87 => 0x014d,
-            0x88 => 0x014d,   0x89 => 0x03e8,   0x8a => 0x0379,   0x8b => 0x0114,
-            0x8c => 0x0263,   0x8d => 0x02d2,   0x8e => 0x0379,   0x8f => 0x0136,
-            0x90 => 0x029b,   0x91 => 0x0116,   0x92 => 0x0116,   0x93 => 0x01f4,
-            0x94 => 0x02d2,   0x95 => 0x01f4,   0x96 => 0x014d,   0x97 => 0x01bc,
-            0x98 => 0x01bc,   0x99 => 0x01f4,   0x9a => 0x01bc,   0x9b => 0x02d2,
-            0x9c => 0x0234,   0x9d => 0x02d2,   0x9e => 0x02d2,   0x9f => 0x01bc,
-            0xa0 => 0x02d2,   0xa1 => 0x01f4,   0xa2 => 0x0185,   0xa3 => 0x01bc,
-            0xa4 => 0x02d2,   0xa5 => 0x02d2,   0xa6 => 0x01bc,   0xa7 => 0x02d2,
-            0xa8 => 0x01f4,   0xa9 => 0x0263,   0xaa => 0x02d2,   0xab =>   0xfa,
-            0xac => 0x02f8,   0xad => 0x0263,   0xae => 0x01bc,   0xaf => 0x01bc,
-            0xb0 => 0x02d2,   0xb1 => 0x0116,   0xb2 => 0x01bc,   0xb3 => 0x0263,
-            0xb4 => 0x029b,   0xb5 => 0x01bc,   0xb6 => 0x0263,   0xb7 => 0x0185,
-            0xb8 => 0x0185,   0xb9 => 0x0116,   0xba => 0x01d7,   0xbb => 0x029b,
-            0xbc => 0x02d2,   0xbd => 0x01f4,   0xbe => 0x01bc,   0xbf => 0x02d2,
-            0xc0 => 0x014d,   0xc1 => 0x01bc,   0xc2 => 0x0263,   0xc3 => 0x022c,
-            0xc4 => 0x02d2,   0xc5 => 0x029b,   0xc6 => 0x022c,   0xc7 => 0x024c,
-            0xc8 => 0x02d2,   0xc9 => 0x01f4,   0xca => 0x012c,   0xcb => 0x02d2,
-            0xcc => 0x02d2,   0xcd => 0x02d2,   0xce => 0x0234,   0xcf => 0x01f4,
-            0xd0 => 0x0263,   0xd1 => 0x01dc,   0xd2 => 0x01f4,   0xd3 => 0x02d2,
-            0xd4 => 0x0116,   0xd5 => 0x0263,   0xd6 => 0x01bc,   0xd7 => 0x01bc,
-            0xd8 => 0x01bc,   0xd9 => 0x01f4,   0xda => 0x01f4,   0xdb => 0x02d2,
-            0xdc => 0x014d,   0xdd => 0x0234,   0xde =>   0xc8,   0xdf => 0x02f8,
-            0xe0 => 0x02d2,   0xe1 => 0x014d,   0xe2 => 0x0258,   0xe3 => 0x0263,
-            0xe4 => 0x014d,   0xe5 => 0x01f4,   0xe6 => 0x0263,   0xe7 => 0x0263,
-            0xe8 => 0x0225,   0xe9 => 0x02d2,   0xea => 0x029b,   0xeb => 0x0116,
-            0xec => 0x0146,   0xed => 0x01bc,   0xee => 0x02d2,   0xef => 0x02d2,
-            0xf0 => 0x02d2,   0xf1 => 0x01bc,   0xf2 => 0x01bc,   0xf3 => 0x0116,
-            0xf4 => 0x02d2,   0xf5 => 0x01f4,   0xf6 => 0x01bc,   0xf7 => 0x0185,
-            0xf8 => 0x0116,   0xf9 => 0x02d2,   0xfa => 0x02d2,   0xfb => 0x0264,
-            0xfc => 0x01f4,   0xfd => 0x012c,   0xfe => 0x02d2,   0xff => 0x01f4,
-          0x0100 => 0x0116, 0x0101 => 0x01f4, 0x0102 => 0x0263, 0x0103 => 0x01f4,
-          0x0104 => 0x02ee, 0x0105 => 0x022c, 0x0106 => 0x0158, 0x0107 => 0x02d2,
-          0x0108 => 0x0263, 0x0109 => 0x03d4, 0x010a => 0x01bc, 0x010b => 0x014d,
-          0x010c => 0x014d, 0x010d => 0x0263, 0x010e => 0x02ee, 0x010f => 0x0225,
-          0x0110 => 0x01f4, 0x0111 => 0x01f4, 0x0112 => 0x02d2, 0x0113 => 0x0263,
-          0x0114 => 0x01bc, 0x0115 => 0x01f4, 0x0116 => 0x02ee, 0x0117 => 0x022c,
-          0x0118 => 0x022c, 0x0119 => 0x02d2, 0x011a => 0x0190, 0x011b => 0x01f4,
-          0x011c => 0x029b, 0x011d => 0x01f4, 0x011e => 0x01c5, 0x011f => 0x02d2,
-          0x0120 => 0x014d, 0x0121 => 0x02d2, 0x0122 => 0x01f4, 0x0123 => 0x029b,
-          0x0124 => 0x0263, 0x0125 => 0x02d2, 0x0126 => 0x02d2, 0x0127 => 0x02d2,
-          0x0128 => 0x02d2, 0x0129 => 0x01bc, 0x012a => 0x0263, 0x012b => 0x014d,
-          0x012c => 0x01f4, 0x012d => 0x0234, 0x012e => 0x014d, 0x012f => 0x01f4,
-          0x0130 => 0x0116, 0x0131 => 0x0234, 0x0132 => 0x01f4, 0x0133 => 0x01f4,
-          0x0134 => 0x0225, 0x0135 => 0x01f4, 0x0136 => 0x01f4, 0x0137 => 0x01bc,
-          0x0138 => 0x01f4, 0x0139 => 0x012c, 0x013a => 0x0116, 0x013b => 0x01f4,
-        );
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01,   0x21 =>   0x02,   0x22 =>   0x03,   0x23 =>   0x04,
-            0x24 =>   0x05,   0x25 =>   0x06,   0x26 =>   0x07, 0x2019 =>   0x08,
-            0x28 =>   0x09,   0x29 =>   0x0a,   0x2a =>   0x0b,   0x2b =>   0x0c,
-            0x2c =>   0x0d,   0x2d =>   0x0e,   0x2e =>   0x0f,   0x2f =>   0x10,
-            0x30 =>   0x11,   0x31 =>   0x12,   0x32 =>   0x13,   0x33 =>   0x14,
-            0x34 =>   0x15,   0x35 =>   0x16,   0x36 =>   0x17,   0x37 =>   0x18,
-            0x38 =>   0x19,   0x39 =>   0x1a,   0x3a =>   0x1b,   0x3b =>   0x1c,
-            0x3c =>   0x1d,   0x3d =>   0x1e,   0x3e =>   0x1f,   0x3f =>   0x20,
-            0x40 =>   0x21,   0x41 =>   0x22,   0x42 =>   0x23,   0x43 =>   0x24,
-            0x44 =>   0x25,   0x45 =>   0x26,   0x46 =>   0x27,   0x47 =>   0x28,
-            0x48 =>   0x29,   0x49 =>   0x2a,   0x4a =>   0x2b,   0x4b =>   0x2c,
-            0x4c =>   0x2d,   0x4d =>   0x2e,   0x4e =>   0x2f,   0x4f =>   0x30,
-            0x50 =>   0x31,   0x51 =>   0x32,   0x52 =>   0x33,   0x53 =>   0x34,
-            0x54 =>   0x35,   0x55 =>   0x36,   0x56 =>   0x37,   0x57 =>   0x38,
-            0x58 =>   0x39,   0x59 =>   0x3a,   0x5a =>   0x3b,   0x5b =>   0x3c,
-            0x5c =>   0x3d,   0x5d =>   0x3e,   0x5e =>   0x3f,   0x5f =>   0x40,
-          0x2018 =>   0x41,   0x61 =>   0x42,   0x62 =>   0x43,   0x63 =>   0x44,
-            0x64 =>   0x45,   0x65 =>   0x46,   0x66 =>   0x47,   0x67 =>   0x48,
-            0x68 =>   0x49,   0x69 =>   0x4a,   0x6a =>   0x4b,   0x6b =>   0x4c,
-            0x6c =>   0x4d,   0x6d =>   0x4e,   0x6e =>   0x4f,   0x6f =>   0x50,
-            0x70 =>   0x51,   0x71 =>   0x52,   0x72 =>   0x53,   0x73 =>   0x54,
-            0x74 =>   0x55,   0x75 =>   0x56,   0x76 =>   0x57,   0x77 =>   0x58,
-            0x78 =>   0x59,   0x79 =>   0x5a,   0x7a =>   0x5b,   0x7b =>   0x5c,
-            0x7c =>   0x5d,   0x7d =>   0x5e,   0x7e =>   0x5f,   0xa1 =>   0x60,
-            0xa2 =>   0x61,   0xa3 =>   0x62, 0x2044 =>   0x63,   0xa5 =>   0x64,
-          0x0192 =>   0x65,   0xa7 =>   0x66,   0xa4 =>   0x67,   0x27 =>   0x68,
-          0x201c =>   0x69,   0xab =>   0x6a, 0x2039 =>   0x6b, 0x203a =>   0x6c,
-          0xfb01 =>   0x6d, 0xfb02 =>   0x6e, 0x2013 =>   0x6f, 0x2020 =>   0x70,
-          0x2021 =>   0x71,   0xb7 =>   0x72,   0xb6 =>   0x73, 0x2022 =>   0x74,
-          0x201a =>   0x75, 0x201e =>   0x76, 0x201d =>   0x77,   0xbb =>   0x78,
-          0x2026 =>   0x79, 0x2030 =>   0x7a,   0xbf =>   0x7b,   0x60 =>   0x7c,
-            0xb4 =>   0x7d, 0x02c6 =>   0x7e, 0x02dc =>   0x7f,   0xaf =>   0x80,
-          0x02d8 =>   0x81, 0x02d9 =>   0x82,   0xa8 =>   0x83, 0x02da =>   0x84,
-            0xb8 =>   0x85, 0x02dd =>   0x86, 0x02db =>   0x87, 0x02c7 =>   0x88,
-          0x2014 =>   0x89,   0xc6 =>   0x8a,   0xaa =>   0x8b, 0x0141 =>   0x8c,
-            0xd8 =>   0x8d, 0x0152 =>   0x8e,   0xba =>   0x8f,   0xe6 =>   0x90,
-          0x0131 =>   0x91, 0x0142 =>   0x92,   0xf8 =>   0x93, 0x0153 =>   0x94,
-            0xdf =>   0x95,   0xcf =>   0x96,   0xe9 =>   0x97, 0x0103 =>   0x98,
-          0x0171 =>   0x99, 0x011b =>   0x9a, 0x0178 =>   0x9b,   0xf7 =>   0x9c,
-            0xdd =>   0x9d,   0xc2 =>   0x9e,   0xe1 =>   0x9f,   0xdb =>   0xa0,
-            0xfd =>   0xa1, 0x0219 =>   0xa2,   0xea =>   0xa3, 0x016e =>   0xa4,
-            0xdc =>   0xa5, 0x0105 =>   0xa6,   0xda =>   0xa7, 0x0173 =>   0xa8,
-            0xcb =>   0xa9, 0x0110 =>   0xaa, 0xf6c3 =>   0xab,   0xa9 =>   0xac,
-          0x0112 =>   0xad, 0x010d =>   0xae,   0xe5 =>   0xaf, 0x0145 =>   0xb0,
-          0x013a =>   0xb1,   0xe0 =>   0xb2, 0x0162 =>   0xb3, 0x0106 =>   0xb4,
-            0xe3 =>   0xb5, 0x0116 =>   0xb6, 0x0161 =>   0xb7, 0x015f =>   0xb8,
-            0xed =>   0xb9, 0x25ca =>   0xba, 0x0158 =>   0xbb, 0x0122 =>   0xbc,
-            0xfb =>   0xbd,   0xe2 =>   0xbe, 0x0100 =>   0xbf, 0x0159 =>   0xc0,
-            0xe7 =>   0xc1, 0x017b =>   0xc2,   0xde =>   0xc3, 0x014c =>   0xc4,
-          0x0154 =>   0xc5, 0x015a =>   0xc6, 0x010f =>   0xc7, 0x016a =>   0xc8,
-          0x016f =>   0xc9,   0xb3 =>   0xca,   0xd2 =>   0xcb,   0xc0 =>   0xcc,
-          0x0102 =>   0xcd,   0xd7 =>   0xce,   0xfa =>   0xcf, 0x0164 =>   0xd0,
-          0x2202 =>   0xd1,   0xff =>   0xd2, 0x0143 =>   0xd3,   0xee =>   0xd4,
-            0xca =>   0xd5,   0xe4 =>   0xd6,   0xeb =>   0xd7, 0x0107 =>   0xd8,
-          0x0144 =>   0xd9, 0x016b =>   0xda, 0x0147 =>   0xdb,   0xcd =>   0xdc,
-            0xb1 =>   0xdd,   0xa6 =>   0xde,   0xae =>   0xdf, 0x011e =>   0xe0,
-          0x0130 =>   0xe1, 0x2211 =>   0xe2,   0xc8 =>   0xe3, 0x0155 =>   0xe4,
-          0x014d =>   0xe5, 0x0179 =>   0xe6, 0x017d =>   0xe7, 0x2265 =>   0xe8,
-            0xd0 =>   0xe9,   0xc7 =>   0xea, 0x013c =>   0xeb, 0x0165 =>   0xec,
-          0x0119 =>   0xed, 0x0172 =>   0xee,   0xc1 =>   0xef,   0xc4 =>   0xf0,
-            0xe8 =>   0xf1, 0x017a =>   0xf2, 0x012f =>   0xf3,   0xd3 =>   0xf4,
-            0xf3 =>   0xf5, 0x0101 =>   0xf6, 0x015b =>   0xf7,   0xef =>   0xf8,
-            0xd4 =>   0xf9,   0xd9 =>   0xfa, 0x2206 =>   0xfb,   0xfe =>   0xfc,
-            0xb2 =>   0xfd,   0xd6 =>   0xfe,   0xb5 =>   0xff,   0xec => 0x0100,
-          0x0151 => 0x0101, 0x0118 => 0x0102, 0x0111 => 0x0103,   0xbe => 0x0104,
-          0x015e => 0x0105, 0x013e => 0x0106, 0x0136 => 0x0107, 0x0139 => 0x0108,
-          0x2122 => 0x0109, 0x0117 => 0x010a,   0xcc => 0x010b, 0x012a => 0x010c,
-          0x013d => 0x010d,   0xbd => 0x010e, 0x2264 => 0x010f,   0xf4 => 0x0110,
-            0xf1 => 0x0111, 0x0170 => 0x0112,   0xc9 => 0x0113, 0x0113 => 0x0114,
-          0x011f => 0x0115,   0xbc => 0x0116, 0x0160 => 0x0117, 0x0218 => 0x0118,
-          0x0150 => 0x0119,   0xb0 => 0x011a,   0xf2 => 0x011b, 0x010c => 0x011c,
-            0xf9 => 0x011d, 0x221a => 0x011e, 0x010e => 0x011f, 0x0157 => 0x0120,
-            0xd1 => 0x0121,   0xf5 => 0x0122, 0x0156 => 0x0123, 0x013b => 0x0124,
-            0xc3 => 0x0125, 0x0104 => 0x0126,   0xc5 => 0x0127,   0xd5 => 0x0128,
-          0x017c => 0x0129, 0x011a => 0x012a, 0x012e => 0x012b, 0x0137 => 0x012c,
-          0x2212 => 0x012d,   0xce => 0x012e, 0x0148 => 0x012f, 0x0163 => 0x0130,
-            0xac => 0x0131,   0xf6 => 0x0132,   0xfc => 0x0133, 0x2260 => 0x0134,
-          0x0123 => 0x0135,   0xf0 => 0x0136, 0x017e => 0x0137, 0x0146 => 0x0138,
-            0xb9 => 0x0139, 0x012b => 0x013a, 0x20ac => 0x013b);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('Times-Roman');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
deleted file mode 100644
index c13cb066c..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ZapfDingbats.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font_Simple_Standard */
-require_once 'Zend/Pdf/Resource/Font/Simple/Standard.php';
-
-/**
- * Implementation for the standard PDF font ZapfDingbats.
- *
- * This class was generated automatically using the font information and metric
- * data contained in the Adobe Font Metric (AFM) files, available here:
- * {@link http://partners.adobe.com/public/developer/en/pdf/Core14_AFMs.zip}
- *
- * The PHP script used to generate this class can be found in the /tools
- * directory of the framework distribution. If you need to make modifications to
- * this class, chances are the same modifications are needed for the rest of the
- * standard fonts. You should modify the script and regenerate the classes
- * instead of changing this class file by hand.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Simple_Standard_ZapfDingbats extends Zend_Pdf_Resource_Font_Simple_Standard
-{
-  /**** Instance Variables ****/
-
-
-    /**
-     * Array for conversion from local encoding to special font encoding.
-     * See {@link encodeString()}.
-     * @var array
-     */
-    protected $_toFontEncoding = array(
-            0x20 => "\x20", 0x2701 => "\x21", 0x2702 => "\x22", 0x2703 => "\x23",
-          0x2704 => "\x24", 0x260e => "\x25", 0x2706 => "\x26", 0x2707 => "\x27",
-          0x2708 => "\x28", 0x2709 => "\x29", 0x261b => "\x2a", 0x261e => "\x2b",
-          0x270c => "\x2c", 0x270d => "\x2d", 0x270e => "\x2e", 0x270f => "\x2f",
-          0x2710 => "\x30", 0x2711 => "\x31", 0x2712 => "\x32", 0x2713 => "\x33",
-          0x2714 => "\x34", 0x2715 => "\x35", 0x2716 => "\x36", 0x2717 => "\x37",
-          0x2718 => "\x38", 0x2719 => "\x39", 0x271a => "\x3a", 0x271b => "\x3b",
-          0x271c => "\x3c", 0x271d => "\x3d", 0x271e => "\x3e", 0x271f => "\x3f",
-          0x2720 => "\x40", 0x2721 => "\x41", 0x2722 => "\x42", 0x2723 => "\x43",
-          0x2724 => "\x44", 0x2725 => "\x45", 0x2726 => "\x46", 0x2727 => "\x47",
-          0x2605 => "\x48", 0x2729 => "\x49", 0x272a => "\x4a", 0x272b => "\x4b",
-          0x272c => "\x4c", 0x272d => "\x4d", 0x272e => "\x4e", 0x272f => "\x4f",
-          0x2730 => "\x50", 0x2731 => "\x51", 0x2732 => "\x52", 0x2733 => "\x53",
-          0x2734 => "\x54", 0x2735 => "\x55", 0x2736 => "\x56", 0x2737 => "\x57",
-          0x2738 => "\x58", 0x2739 => "\x59", 0x273a => "\x5a", 0x273b => "\x5b",
-          0x273c => "\x5c", 0x273d => "\x5d", 0x273e => "\x5e", 0x273f => "\x5f",
-          0x2740 => "\x60", 0x2741 => "\x61", 0x2742 => "\x62", 0x2743 => "\x63",
-          0x2744 => "\x64", 0x2745 => "\x65", 0x2746 => "\x66", 0x2747 => "\x67",
-          0x2748 => "\x68", 0x2749 => "\x69", 0x274a => "\x6a", 0x274b => "\x6b",
-          0x25cf => "\x6c", 0x274d => "\x6d", 0x25a0 => "\x6e", 0x274f => "\x6f",
-          0x2750 => "\x70", 0x2751 => "\x71", 0x2752 => "\x72", 0x25b2 => "\x73",
-          0x25bc => "\x74", 0x25c6 => "\x75", 0x2756 => "\x76", 0x25d7 => "\x77",
-          0x2758 => "\x78", 0x2759 => "\x79", 0x275a => "\x7a", 0x275b => "\x7b",
-          0x275c => "\x7c", 0x275d => "\x7d", 0x275e => "\x7e", 0x2768 => "\x80",
-          0x2769 => "\x81", 0x276a => "\x82", 0x276b => "\x83", 0x276c => "\x84",
-          0x276d => "\x85", 0x276e => "\x86", 0x276f => "\x87", 0x2770 => "\x88",
-          0x2771 => "\x89", 0x2772 => "\x8a", 0x2773 => "\x8b", 0x2774 => "\x8c",
-          0x2775 => "\x8d", 0x2761 => "\xa1", 0x2762 => "\xa2", 0x2763 => "\xa3",
-          0x2764 => "\xa4", 0x2765 => "\xa5", 0x2766 => "\xa6", 0x2767 => "\xa7",
-          0x2663 => "\xa8", 0x2666 => "\xa9", 0x2665 => "\xaa", 0x2660 => "\xab",
-          0x2460 => "\xac", 0x2461 => "\xad", 0x2462 => "\xae", 0x2463 => "\xaf",
-          0x2464 => "\xb0", 0x2465 => "\xb1", 0x2466 => "\xb2", 0x2467 => "\xb3",
-          0x2468 => "\xb4", 0x2469 => "\xb5", 0x2776 => "\xb6", 0x2777 => "\xb7",
-          0x2778 => "\xb8", 0x2779 => "\xb9", 0x277a => "\xba", 0x277b => "\xbb",
-          0x277c => "\xbc", 0x277d => "\xbd", 0x277e => "\xbe", 0x277f => "\xbf",
-          0x2780 => "\xc0", 0x2781 => "\xc1", 0x2782 => "\xc2", 0x2783 => "\xc3",
-          0x2784 => "\xc4", 0x2785 => "\xc5", 0x2786 => "\xc6", 0x2787 => "\xc7",
-          0x2788 => "\xc8", 0x2789 => "\xc9", 0x278a => "\xca", 0x278b => "\xcb",
-          0x278c => "\xcc", 0x278d => "\xcd", 0x278e => "\xce", 0x278f => "\xcf",
-          0x2790 => "\xd0", 0x2791 => "\xd1", 0x2792 => "\xd2", 0x2793 => "\xd3",
-          0x2794 => "\xd4", 0x2192 => "\xd5", 0x2194 => "\xd6", 0x2195 => "\xd7",
-          0x2798 => "\xd8", 0x2799 => "\xd9", 0x279a => "\xda", 0x279b => "\xdb",
-          0x279c => "\xdc", 0x279d => "\xdd", 0x279e => "\xde", 0x279f => "\xdf",
-          0x27a0 => "\xe0", 0x27a1 => "\xe1", 0x27a2 => "\xe2", 0x27a3 => "\xe3",
-          0x27a4 => "\xe4", 0x27a5 => "\xe5", 0x27a6 => "\xe6", 0x27a7 => "\xe7",
-          0x27a8 => "\xe8", 0x27a9 => "\xe9", 0x27aa => "\xea", 0x27ab => "\xeb",
-          0x27ac => "\xec", 0x27ad => "\xed", 0x27ae => "\xee", 0x27af => "\xef",
-          0x27b1 => "\xf1", 0x27b2 => "\xf2", 0x27b3 => "\xf3", 0x27b4 => "\xf4",
-          0x27b5 => "\xf5", 0x27b6 => "\xf6", 0x27b7 => "\xf7", 0x27b8 => "\xf8",
-          0x27b9 => "\xf9", 0x27ba => "\xfa", 0x27bb => "\xfb", 0x27bc => "\xfc",
-          0x27bd => "\xfd", 0x27be => "\xfe");
-
-    /**
-     * Array for conversion from special font encoding to local encoding.
-     * See {@link decodeString()}.
-     * @var array
-     */
-    protected $_fromFontEncoding = array(
-            0x20 => "\x00\x20",   0x21 => "\x27\x01",   0x22 => "\x27\x02",
-            0x23 => "\x27\x03",   0x24 => "\x27\x04",   0x25 => "\x26\x0e",
-            0x26 => "\x27\x06",   0x27 => "\x27\x07",   0x28 => "\x27\x08",
-            0x29 => "\x27\x09",   0x2a => "\x26\x1b",   0x2b => "\x26\x1e",
-            0x2c => "\x27\x0c",   0x2d => "\x27\x0d",   0x2e => "\x27\x0e",
-            0x2f => "\x27\x0f",   0x30 => "\x27\x10",   0x31 => "\x27\x11",
-            0x32 => "\x27\x12",   0x33 => "\x27\x13",   0x34 => "\x27\x14",
-            0x35 => "\x27\x15",   0x36 => "\x27\x16",   0x37 => "\x27\x17",
-            0x38 => "\x27\x18",   0x39 => "\x27\x19",   0x3a => "\x27\x1a",
-            0x3b => "\x27\x1b",   0x3c => "\x27\x1c",   0x3d => "\x27\x1d",
-            0x3e => "\x27\x1e",   0x3f => "\x27\x1f",   0x40 => "\x27\x20",
-            0x41 => "\x27\x21",   0x42 => "\x27\x22",   0x43 => "\x27\x23",
-            0x44 => "\x27\x24",   0x45 => "\x27\x25",   0x46 => "\x27\x26",
-            0x47 => "\x27\x27",   0x48 => "\x26\x05",   0x49 => "\x27\x29",
-            0x4a => "\x27\x2a",   0x4b => "\x27\x2b",   0x4c => "\x27\x2c",
-            0x4d => "\x27\x2d",   0x4e => "\x27\x2e",   0x4f => "\x27\x2f",
-            0x50 => "\x27\x30",   0x51 => "\x27\x31",   0x52 => "\x27\x32",
-            0x53 => "\x27\x33",   0x54 => "\x27\x34",   0x55 => "\x27\x35",
-            0x56 => "\x27\x36",   0x57 => "\x27\x37",   0x58 => "\x27\x38",
-            0x59 => "\x27\x39",   0x5a => "\x27\x3a",   0x5b => "\x27\x3b",
-            0x5c => "\x27\x3c",   0x5d => "\x27\x3d",   0x5e => "\x27\x3e",
-            0x5f => "\x27\x3f",   0x60 => "\x27\x40",   0x61 => "\x27\x41",
-            0x62 => "\x27\x42",   0x63 => "\x27\x43",   0x64 => "\x27\x44",
-            0x65 => "\x27\x45",   0x66 => "\x27\x46",   0x67 => "\x27\x47",
-            0x68 => "\x27\x48",   0x69 => "\x27\x49",   0x6a => "\x27\x4a",
-            0x6b => "\x27\x4b",   0x6c => "\x25\xcf",   0x6d => "\x27\x4d",
-            0x6e => "\x25\xa0",   0x6f => "\x27\x4f",   0x70 => "\x27\x50",
-            0x71 => "\x27\x51",   0x72 => "\x27\x52",   0x73 => "\x25\xb2",
-            0x74 => "\x25\xbc",   0x75 => "\x25\xc6",   0x76 => "\x27\x56",
-            0x77 => "\x25\xd7",   0x78 => "\x27\x58",   0x79 => "\x27\x59",
-            0x7a => "\x27\x5a",   0x7b => "\x27\x5b",   0x7c => "\x27\x5c",
-            0x7d => "\x27\x5d",   0x7e => "\x27\x5e",   0x80 => "\x27\x68",
-            0x81 => "\x27\x69",   0x82 => "\x27\x6a",   0x83 => "\x27\x6b",
-            0x84 => "\x27\x6c",   0x85 => "\x27\x6d",   0x86 => "\x27\x6e",
-            0x87 => "\x27\x6f",   0x88 => "\x27\x70",   0x89 => "\x27\x71",
-            0x8a => "\x27\x72",   0x8b => "\x27\x73",   0x8c => "\x27\x74",
-            0x8d => "\x27\x75",   0xa1 => "\x27\x61",   0xa2 => "\x27\x62",
-            0xa3 => "\x27\x63",   0xa4 => "\x27\x64",   0xa5 => "\x27\x65",
-            0xa6 => "\x27\x66",   0xa7 => "\x27\x67",   0xa8 => "\x26\x63",
-            0xa9 => "\x26\x66",   0xaa => "\x26\x65",   0xab => "\x26\x60",
-            0xac => "\x24\x60",   0xad => "\x24\x61",   0xae => "\x24\x62",
-            0xaf => "\x24\x63",   0xb0 => "\x24\x64",   0xb1 => "\x24\x65",
-            0xb2 => "\x24\x66",   0xb3 => "\x24\x67",   0xb4 => "\x24\x68",
-            0xb5 => "\x24\x69",   0xb6 => "\x27\x76",   0xb7 => "\x27\x77",
-            0xb8 => "\x27\x78",   0xb9 => "\x27\x79",   0xba => "\x27\x7a",
-            0xbb => "\x27\x7b",   0xbc => "\x27\x7c",   0xbd => "\x27\x7d",
-            0xbe => "\x27\x7e",   0xbf => "\x27\x7f",   0xc0 => "\x27\x80",
-            0xc1 => "\x27\x81",   0xc2 => "\x27\x82",   0xc3 => "\x27\x83",
-            0xc4 => "\x27\x84",   0xc5 => "\x27\x85",   0xc6 => "\x27\x86",
-            0xc7 => "\x27\x87",   0xc8 => "\x27\x88",   0xc9 => "\x27\x89",
-            0xca => "\x27\x8a",   0xcb => "\x27\x8b",   0xcc => "\x27\x8c",
-            0xcd => "\x27\x8d",   0xce => "\x27\x8e",   0xcf => "\x27\x8f",
-            0xd0 => "\x27\x90",   0xd1 => "\x27\x91",   0xd2 => "\x27\x92",
-            0xd3 => "\x27\x93",   0xd4 => "\x27\x94",   0xd5 => "\x21\x92",
-            0xd6 => "\x21\x94",   0xd7 => "\x21\x95",   0xd8 => "\x27\x98",
-            0xd9 => "\x27\x99",   0xda => "\x27\x9a",   0xdb => "\x27\x9b",
-            0xdc => "\x27\x9c",   0xdd => "\x27\x9d",   0xde => "\x27\x9e",
-            0xdf => "\x27\x9f",   0xe0 => "\x27\xa0",   0xe1 => "\x27\xa1",
-            0xe2 => "\x27\xa2",   0xe3 => "\x27\xa3",   0xe4 => "\x27\xa4",
-            0xe5 => "\x27\xa5",   0xe6 => "\x27\xa6",   0xe7 => "\x27\xa7",
-            0xe8 => "\x27\xa8",   0xe9 => "\x27\xa9",   0xea => "\x27\xaa",
-            0xeb => "\x27\xab",   0xec => "\x27\xac",   0xed => "\x27\xad",
-            0xee => "\x27\xae",   0xef => "\x27\xaf",   0xf1 => "\x27\xb1",
-            0xf2 => "\x27\xb2",   0xf3 => "\x27\xb3",   0xf4 => "\x27\xb4",
-            0xf5 => "\x27\xb5",   0xf6 => "\x27\xb6",   0xf7 => "\x27\xb7",
-            0xf8 => "\x27\xb8",   0xf9 => "\x27\xb9",   0xfa => "\x27\xba",
-            0xfb => "\x27\xbb",   0xfc => "\x27\xbc",   0xfd => "\x27\xbd",
-            0xfe => "\x27\xbe");
-
-
-
-  /**** Public Interface ****/
-
-
-  /* Object Lifecycle */
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-
-        /* Object properties */
-
-        /* The font names are stored internally as Unicode UTF-16BE-encoded
-         * strings. Since this information is static, save unnecessary trips
-         * through iconv() and just use pre-encoded hexidecimal strings.
-         */
-        $this->_fontNames[Zend_Pdf_Font::NAME_COPYRIGHT]['en'] =
-          "\x00\x43\x00\x6f\x00\x70\x00\x79\x00\x72\x00\x69\x00\x67\x00\x68\x00"
-          . "\x74\x00\x20\x00\x28\x00\x63\x00\x29\x00\x20\x00\x31\x00\x39\x00"
-          . "\x38\x00\x35\x00\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x37\x00"
-          . "\x2c\x00\x20\x00\x31\x00\x39\x00\x38\x00\x38\x00\x2c\x00\x20\x00"
-          . "\x31\x00\x39\x00\x38\x00\x39\x00\x2c\x00\x20\x00\x31\x00\x39\x00"
-          . "\x39\x00\x37\x00\x20\x00\x41\x00\x64\x00\x6f\x00\x62\x00\x65\x00"
-          . "\x20\x00\x53\x00\x79\x00\x73\x00\x74\x00\x65\x00\x6d\x00\x73\x00"
-          . "\x20\x00\x49\x00\x6e\x00\x63\x00\x6f\x00\x72\x00\x70\x00\x6f\x00"
-          . "\x72\x00\x61\x00\x74\x00\x65\x00\x64\x00\x2e\x00\x20\x00\x41\x00"
-          . "\x6c\x00\x6c\x00\x20\x00\x52\x00\x69\x00\x67\x00\x68\x00\x74\x00"
-          . "\x73\x00\x20\x00\x52\x00\x65\x00\x73\x00\x65\x00\x72\x00\x76\x00"
-          . "\x65\x00\x64\x00\x2e\x00\x49\x00\x54\x00\x43\x00\x20\x00\x5a\x00"
-          . "\x61\x00\x70\x00\x66\x00\x20\x00\x44\x00\x69\x00\x6e\x00\x67\x00"
-          . "\x62\x00\x61\x00\x74\x00\x73\x00\x20\x00\x69\x00\x73\x00\x20\x00"
-          . "\x61\x00\x20\x00\x72\x00\x65\x00\x67\x00\x69\x00\x73\x00\x74\x00"
-          . "\x65\x00\x72\x00\x65\x00\x64\x00\x20\x00\x74\x00\x72\x00\x61\x00"
-          . "\x64\x00\x65\x00\x6d\x00\x61\x00\x72\x00\x6b\x00\x20\x00\x6f\x00"
-          . "\x66\x00\x20\x00\x49\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x6e\x00"
-          . "\x61\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x6c\x00\x20\x00"
-          . "\x54\x00\x79\x00\x70\x00\x65\x00\x66\x00\x61\x00\x63\x00\x65\x00"
-          . "\x20\x00\x43\x00\x6f\x00\x72\x00\x70\x00\x6f\x00\x72\x00\x61\x00"
-          . "\x74\x00\x69\x00\x6f\x00\x6e\x00\x2e";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FAMILY]['en'] =
-          "\x00\x5a\x00\x61\x00\x70\x00\x66\x00\x44\x00\x69\x00\x6e\x00\x67\x00"
-          . "\x62\x00\x61\x00\x74\x00\x73";
-        $this->_fontNames[Zend_Pdf_Font::NAME_STYLE]['en'] =
-          "\x00\x4d\x00\x65\x00\x64\x00\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_ID]['en'] =
-          "\x00\x34\x00\x33\x00\x30\x00\x38\x00\x32";
-        $this->_fontNames[Zend_Pdf_Font::NAME_FULL]['en'] =
-          "\x00\x5a\x00\x61\x00\x70\x00\x66\x00\x44\x00\x69\x00\x6e\x00\x67\x00"
-          . "\x62\x00\x61\x00\x74\x00\x73\x00\x20\x00\x4d\x00\x65\x00\x64\x00"
-          . "\x69\x00\x75\x00\x6d";
-        $this->_fontNames[Zend_Pdf_Font::NAME_VERSION]['en'] =
-          "\x00\x30\x00\x30\x00\x32\x00\x2e\x00\x30\x00\x30\x00\x30";
-        $this->_fontNames[Zend_Pdf_Font::NAME_POSTSCRIPT]['en'] =
-          "\x00\x5a\x00\x61\x00\x70\x00\x66\x00\x44\x00\x69\x00\x6e\x00\x67\x00"
-          . "\x62\x00\x61\x00\x74\x00\x73";
-
-        $this->_isBold = false;
-        $this->_isItalic = false;
-        $this->_isMonospaced = false;
-
-        $this->_underlinePosition = -100;
-        $this->_underlineThickness = 50;
-        $this->_strikePosition = 225;
-        $this->_strikeThickness = 50;
-
-        $this->_unitsPerEm = 1000;
-
-        $this->_ascent  = 1000;
-        $this->_descent = 0;
-        $this->_lineGap = 200;
-
-        /* The glyph numbers assigned here are synthetic; they do not match the
-         * actual glyph numbers used by the font. This is not a big deal though
-         * since this data never makes it to the PDF file. It is only used
-         * internally for layout calculations.
-         */
-        $this->_glyphWidths = array(
-            0x00 => 0x01f4,   0x01 => 0x0116,   0x02 => 0x03ce,   0x03 => 0x03c1,
-            0x04 => 0x03ce,   0x05 => 0x03d4,   0x06 => 0x02cf,   0x07 => 0x0315,
-            0x08 => 0x0316,   0x09 => 0x0317,   0x0a => 0x02b2,   0x0b => 0x03c0,
-            0x0c => 0x03ab,   0x0d => 0x0225,   0x0e => 0x0357,   0x0f => 0x038f,
-            0x10 => 0x03a5,   0x11 => 0x038f,   0x12 => 0x03b1,   0x13 => 0x03ce,
-            0x14 => 0x02f3,   0x15 => 0x034e,   0x16 => 0x02fa,   0x17 => 0x02f9,
-            0x18 => 0x023b,   0x19 => 0x02a5,   0x1a => 0x02fb,   0x1b => 0x02f8,
-            0x1c => 0x02f7,   0x1d => 0x02f2,   0x1e => 0x01ee,   0x1f => 0x0228,
-            0x20 => 0x0219,   0x21 => 0x0241,   0x22 => 0x02b4,   0x23 => 0x0312,
-            0x24 => 0x0314,   0x25 => 0x0314,   0x26 => 0x0316,   0x27 => 0x0319,
-            0x28 => 0x031a,   0x29 => 0x0330,   0x2a => 0x0337,   0x2b => 0x0315,
-            0x2c => 0x0349,   0x2d => 0x0337,   0x2e => 0x0341,   0x2f => 0x0330,
-            0x30 => 0x033f,   0x31 => 0x039b,   0x32 => 0x02e8,   0x33 => 0x02d3,
-            0x34 => 0x02ed,   0x35 => 0x0316,   0x36 => 0x0318,   0x37 => 0x02b7,
-            0x38 => 0x0308,   0x39 => 0x0300,   0x3a => 0x0318,   0x3b => 0x02f7,
-            0x3c => 0x02c3,   0x3d => 0x02c4,   0x3e => 0x02aa,   0x3f => 0x02bd,
-            0x40 => 0x033a,   0x41 => 0x032f,   0x42 => 0x0315,   0x43 => 0x0315,
-            0x44 => 0x02c3,   0x45 => 0x02af,   0x46 => 0x02b8,   0x47 => 0x02b1,
-            0x48 => 0x0312,   0x49 => 0x0313,   0x4a => 0x02c9,   0x4b => 0x0317,
-            0x4c => 0x0311,   0x4d => 0x0317,   0x4e => 0x0369,   0x4f => 0x02f9,
-            0x50 => 0x02fa,   0x51 => 0x02fa,   0x52 => 0x02f7,   0x53 => 0x02f7,
-            0x54 => 0x037c,   0x55 => 0x037c,   0x56 => 0x0314,   0x57 => 0x0310,
-            0x58 => 0x01b6,   0x59 =>   0x8a,   0x5a => 0x0115,   0x5b => 0x019f,
-            0x5c => 0x0188,   0x5d => 0x0188,   0x5e => 0x029c,   0x5f => 0x029c,
-            0x60 => 0x0186,   0x61 => 0x0186,   0x62 => 0x013d,   0x63 => 0x013d,
-            0x64 => 0x0114,   0x65 => 0x0114,   0x66 => 0x01fd,   0x67 => 0x01fd,
-            0x68 => 0x019a,   0x69 => 0x019a,   0x6a =>   0xea,   0x6b =>   0xea,
-            0x6c => 0x014e,   0x6d => 0x014e,   0x6e => 0x02dc,   0x6f => 0x0220,
-            0x70 => 0x0220,   0x71 => 0x038e,   0x72 => 0x029b,   0x73 => 0x02f8,
-            0x74 => 0x02f8,   0x75 => 0x0308,   0x76 => 0x0253,   0x77 => 0x02b6,
-            0x78 => 0x0272,   0x79 => 0x0314,   0x7a => 0x0314,   0x7b => 0x0314,
-            0x7c => 0x0314,   0x7d => 0x0314,   0x7e => 0x0314,   0x7f => 0x0314,
-            0x80 => 0x0314,   0x81 => 0x0314,   0x82 => 0x0314,   0x83 => 0x0314,
-            0x84 => 0x0314,   0x85 => 0x0314,   0x86 => 0x0314,   0x87 => 0x0314,
-            0x88 => 0x0314,   0x89 => 0x0314,   0x8a => 0x0314,   0x8b => 0x0314,
-            0x8c => 0x0314,   0x8d => 0x0314,   0x8e => 0x0314,   0x8f => 0x0314,
-            0x90 => 0x0314,   0x91 => 0x0314,   0x92 => 0x0314,   0x93 => 0x0314,
-            0x94 => 0x0314,   0x95 => 0x0314,   0x96 => 0x0314,   0x97 => 0x0314,
-            0x98 => 0x0314,   0x99 => 0x0314,   0x9a => 0x0314,   0x9b => 0x0314,
-            0x9c => 0x0314,   0x9d => 0x0314,   0x9e => 0x0314,   0x9f => 0x0314,
-            0xa0 => 0x0314,   0xa1 => 0x037e,   0xa2 => 0x0346,   0xa3 => 0x03f8,
-            0xa4 => 0x01ca,   0xa5 => 0x02ec,   0xa6 => 0x039c,   0xa7 => 0x02ec,
-            0xa8 => 0x0396,   0xa9 => 0x039f,   0xaa => 0x03a0,   0xab => 0x03a0,
-            0xac => 0x0342,   0xad => 0x0369,   0xae => 0x033c,   0xaf => 0x039c,
-            0xb0 => 0x039c,   0xb1 => 0x0395,   0xb2 => 0x03a2,   0xb3 => 0x03a3,
-            0xb4 => 0x01cf,   0xb5 => 0x0373,   0xb6 => 0x0344,   0xb7 => 0x0344,
-            0xb8 => 0x0363,   0xb9 => 0x0363,   0xba => 0x02b8,   0xbb => 0x02b8,
-            0xbc => 0x036a,   0xbd => 0x036a,   0xbe => 0x02f8,   0xbf => 0x03b2,
-            0xc0 => 0x0303,   0xc1 => 0x0361,   0xc2 => 0x0303,   0xc3 => 0x0378,
-            0xc4 => 0x03c7,   0xc5 => 0x0378,   0xc6 => 0x033f,   0xc7 => 0x0369,
-            0xc8 => 0x039f,   0xc9 => 0x03ca,   0xca => 0x0396);
-
-        /* The cmap table is similarly synthesized.
-         */
-        $cmapData = array(
-            0x20 =>   0x01, 0x2701 =>   0x02, 0x2702 =>   0x03, 0x2703 =>   0x04,
-          0x2704 =>   0x05, 0x260e =>   0x06, 0x2706 =>   0x07, 0x2707 =>   0x08,
-          0x2708 =>   0x09, 0x2709 =>   0x0a, 0x261b =>   0x0b, 0x261e =>   0x0c,
-          0x270c =>   0x0d, 0x270d =>   0x0e, 0x270e =>   0x0f, 0x270f =>   0x10,
-          0x2710 =>   0x11, 0x2711 =>   0x12, 0x2712 =>   0x13, 0x2713 =>   0x14,
-          0x2714 =>   0x15, 0x2715 =>   0x16, 0x2716 =>   0x17, 0x2717 =>   0x18,
-          0x2718 =>   0x19, 0x2719 =>   0x1a, 0x271a =>   0x1b, 0x271b =>   0x1c,
-          0x271c =>   0x1d, 0x271d =>   0x1e, 0x271e =>   0x1f, 0x271f =>   0x20,
-          0x2720 =>   0x21, 0x2721 =>   0x22, 0x2722 =>   0x23, 0x2723 =>   0x24,
-          0x2724 =>   0x25, 0x2725 =>   0x26, 0x2726 =>   0x27, 0x2727 =>   0x28,
-          0x2605 =>   0x29, 0x2729 =>   0x2a, 0x272a =>   0x2b, 0x272b =>   0x2c,
-          0x272c =>   0x2d, 0x272d =>   0x2e, 0x272e =>   0x2f, 0x272f =>   0x30,
-          0x2730 =>   0x31, 0x2731 =>   0x32, 0x2732 =>   0x33, 0x2733 =>   0x34,
-          0x2734 =>   0x35, 0x2735 =>   0x36, 0x2736 =>   0x37, 0x2737 =>   0x38,
-          0x2738 =>   0x39, 0x2739 =>   0x3a, 0x273a =>   0x3b, 0x273b =>   0x3c,
-          0x273c =>   0x3d, 0x273d =>   0x3e, 0x273e =>   0x3f, 0x273f =>   0x40,
-          0x2740 =>   0x41, 0x2741 =>   0x42, 0x2742 =>   0x43, 0x2743 =>   0x44,
-          0x2744 =>   0x45, 0x2745 =>   0x46, 0x2746 =>   0x47, 0x2747 =>   0x48,
-          0x2748 =>   0x49, 0x2749 =>   0x4a, 0x274a =>   0x4b, 0x274b =>   0x4c,
-          0x25cf =>   0x4d, 0x274d =>   0x4e, 0x25a0 =>   0x4f, 0x274f =>   0x50,
-          0x2750 =>   0x51, 0x2751 =>   0x52, 0x2752 =>   0x53, 0x25b2 =>   0x54,
-          0x25bc =>   0x55, 0x25c6 =>   0x56, 0x2756 =>   0x57, 0x25d7 =>   0x58,
-          0x2758 =>   0x59, 0x2759 =>   0x5a, 0x275a =>   0x5b, 0x275b =>   0x5c,
-          0x275c =>   0x5d, 0x275d =>   0x5e, 0x275e =>   0x5f, 0x2768 =>   0x60,
-          0x2769 =>   0x61, 0x276a =>   0x62, 0x276b =>   0x63, 0x276c =>   0x64,
-          0x276d =>   0x65, 0x276e =>   0x66, 0x276f =>   0x67, 0x2770 =>   0x68,
-          0x2771 =>   0x69, 0x2772 =>   0x6a, 0x2773 =>   0x6b, 0x2774 =>   0x6c,
-          0x2775 =>   0x6d, 0x2761 =>   0x6e, 0x2762 =>   0x6f, 0x2763 =>   0x70,
-          0x2764 =>   0x71, 0x2765 =>   0x72, 0x2766 =>   0x73, 0x2767 =>   0x74,
-          0x2663 =>   0x75, 0x2666 =>   0x76, 0x2665 =>   0x77, 0x2660 =>   0x78,
-          0x2460 =>   0x79, 0x2461 =>   0x7a, 0x2462 =>   0x7b, 0x2463 =>   0x7c,
-          0x2464 =>   0x7d, 0x2465 =>   0x7e, 0x2466 =>   0x7f, 0x2467 =>   0x80,
-          0x2468 =>   0x81, 0x2469 =>   0x82, 0x2776 =>   0x83, 0x2777 =>   0x84,
-          0x2778 =>   0x85, 0x2779 =>   0x86, 0x277a =>   0x87, 0x277b =>   0x88,
-          0x277c =>   0x89, 0x277d =>   0x8a, 0x277e =>   0x8b, 0x277f =>   0x8c,
-          0x2780 =>   0x8d, 0x2781 =>   0x8e, 0x2782 =>   0x8f, 0x2783 =>   0x90,
-          0x2784 =>   0x91, 0x2785 =>   0x92, 0x2786 =>   0x93, 0x2787 =>   0x94,
-          0x2788 =>   0x95, 0x2789 =>   0x96, 0x278a =>   0x97, 0x278b =>   0x98,
-          0x278c =>   0x99, 0x278d =>   0x9a, 0x278e =>   0x9b, 0x278f =>   0x9c,
-          0x2790 =>   0x9d, 0x2791 =>   0x9e, 0x2792 =>   0x9f, 0x2793 =>   0xa0,
-          0x2794 =>   0xa1, 0x2192 =>   0xa2, 0x2194 =>   0xa3, 0x2195 =>   0xa4,
-          0x2798 =>   0xa5, 0x2799 =>   0xa6, 0x279a =>   0xa7, 0x279b =>   0xa8,
-          0x279c =>   0xa9, 0x279d =>   0xaa, 0x279e =>   0xab, 0x279f =>   0xac,
-          0x27a0 =>   0xad, 0x27a1 =>   0xae, 0x27a2 =>   0xaf, 0x27a3 =>   0xb0,
-          0x27a4 =>   0xb1, 0x27a5 =>   0xb2, 0x27a6 =>   0xb3, 0x27a7 =>   0xb4,
-          0x27a8 =>   0xb5, 0x27a9 =>   0xb6, 0x27aa =>   0xb7, 0x27ab =>   0xb8,
-          0x27ac =>   0xb9, 0x27ad =>   0xba, 0x27ae =>   0xbb, 0x27af =>   0xbc,
-          0x27b1 =>   0xbd, 0x27b2 =>   0xbe, 0x27b3 =>   0xbf, 0x27b4 =>   0xc0,
-          0x27b5 =>   0xc1, 0x27b6 =>   0xc2, 0x27b7 =>   0xc3, 0x27b8 =>   0xc4,
-          0x27b9 =>   0xc5, 0x27ba =>   0xc6, 0x27bb =>   0xc7, 0x27bc =>   0xc8,
-          0x27bd =>   0xc9, 0x27be =>   0xca);
-        require_once 'Zend/Pdf/Cmap.php';
-        $this->_cmap = Zend_Pdf_Cmap::cmapWithTypeData(
-            Zend_Pdf_Cmap::TYPE_BYTE_ENCODING_STATIC, $cmapData);
-
-
-        /* Resource dictionary */
-
-        /* The resource dictionary for the standard fonts is sparse because PDF
-         * viewers already have all of the metrics data. We only need to provide
-         * the font name and encoding method.
-         */
-        $this->_resource->BaseFont = new Zend_Pdf_Element_Name('ZapfDingbats');
-
-        /* This font has a built-in custom character encoding method. Don't
-         * override with WinAnsi like the other built-in fonts or else it will
-         * not work as expected.
-         */
-        $this->_resource->Encoding = null;
-    }
-
-
-  /* Information and Conversion Methods */
-
-    /**
-     * Convert string encoding from local encoding to font encoding. Overridden
-     * to defeat the conversion behavior for this ornamental font.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    public function encodeString($string, $charEncoding)
-    {
-        /* This isn't the optimal time to perform this conversion, but it must
-         * live here until the remainder of the layout code is completed. This,
-         * and the $charEncoding parameter, will go away soon...
-         */
-        if ($charEncoding != 'UTF-16BE') {
-            $string = iconv($charEncoding, 'UTF-16BE', $string);
-        }
-        /**
-         * @todo Properly handle characters encoded as surrogate pairs.
-         */
-        $encodedString = '';
-        for ($i = 0; $i < strlen($string); $i++) {
-            $characterCode = (ord($string[$i++]) << 8) | ord($string[$i]);
-            if (isset($this->_toFontEncoding[$characterCode])) {
-                $encodedString .= $this->_toFontEncoding[$characterCode];
-            } else {
-                /* For now, mimic the behavior in Zend_Pdf_Font::encodeString()
-                 * where unknown characters are removed completely. This is not
-                 * perfect, but we should be consistent. In a future revision,
-                 * we will use the well-known substitution character 0x1a
-                 * (Control-Z).
-                 */
-            }
-        }
-        return $encodedString;
-    }
-
-    /**
-     * Convert string encoding from font encoding to local encoding. Overridden
-     * to defeat the conversion behavior for this ornamental font.
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-    public function decodeString($string, $charEncoding)
-    {
-        $decodedString = '';
-        for ($i = 0; $i < strlen($string); $i++) {
-            $characterCode = ord($string[$i]);
-            if (isset($this->_fromFontEncoding[$characterCode])) {
-                $decodedString .= $this->_fromFontEncoding[$characterCode];
-            } else {
-                /* For now, mimic the behavior in Zend_Pdf_Font::encodeString()
-                 * where unknown characters are removed completely. This is not
-                 * perfect, but we should be consistent. In a future revision,
-                 * we will use the Unicode substitution character (U+FFFD).
-                 */
-            }
-        }
-        if ($charEncoding != 'UTF-16BE') {
-            $decodedString = iconv('UTF-16BE', $charEncoding, $decodedString);
-        }
-        return $decodedString;
-    }
-
-    /**
-     * Converts a Latin-encoded string that fakes the font's internal encoding
-     * to the proper Unicode characters, in UTF-16BE encoding.
-     *
-     * Used to maintain backwards compatibility with the 20 year-old legacy
-     * method of using this font, which is still employed by recent versions of
-     * some popular word processors.
-     *
-     * Note that using this method adds overhead due to the additional
-     * character conversion. Don't use this for new code; it is more efficient
-     * to use the appropriate Unicode characters directly.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source
-     *   string. Defaults to current locale.
-     * @return string
-     */
-    public function toUnicode($string, $charEncoding = '')
-    {
-        /* When using these faked strings, the closest match to the font's
-         * internal encoding is ISO-8859-1.
-         */
-        if ($charEncoding != 'ISO-8859-1') {
-            $string = iconv($charEncoding, 'ISO-8859-1', $string);
-        }
-        return $this->decodeString($string, 'UTF-16BE');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Font/Type0.php b/airtime_mvc/library/Zend/Pdf/Resource/Font/Type0.php
deleted file mode 100644
index 84571ca09..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Font/Type0.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Type0.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource_Font */
-require_once 'Zend/Pdf/Resource/Font.php';
-
-/**
- * Adobe PDF composite fonts implementation
- *
- * A composite font is one whose glyphs are obtained from other fonts or from fontlike
- * objects called CIDFonts ({@link Zend_Pdf_Resource_Font_CidFont}), organized hierarchically.
- * In PDF, a composite font is represented by a font dictionary whose Subtype value is Type0;
- * this is also called a Type 0 font (the Type 0 font at the top level of the hierarchy is the
- * root font).
- *
- * In PDF, a Type 0 font is a CID-keyed font.
- *
- * CID-keyed fonts provide effective method to operate with multi-byte character encodings.
- *
- * The CID-keyed font architecture specifies the external representation of certain font programs,
- * called CMap and CIDFont files, along with some conventions for combining and using those files.
- *
- * A CID-keyed font is the combination of a CMap with one or more CIDFonts, simple fonts,
- * or composite fonts containing glyph descriptions.
- *
- * The term 'CID-keyed font' reflects the fact that CID (character identifier) numbers
- * are used to index and access the glyph descriptions in the font.
- *
- *
- * Font objects should be normally be obtained from the factory methods
- * {@link Zend_Pdf_Font::fontWithName} and {@link Zend_Pdf_Font::fontWithPath}.
- *
- * @package    Zend_Pdf
- * @subpackage Fonts
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Font_Type0 extends Zend_Pdf_Resource_Font
-{
-    /**
-     * Descendant CIDFont
-     *
-     * @var Zend_Pdf_Resource_Font_CidFont
-     */
-    private $_descendantFont;
-
-
-    /**
-     * Generate ToUnicode character map data
-     *
-     * @return string
-     */
-    static private function getToUnicodeCMapData()
-    {
-        return '/CIDInit /ProcSet findresource begin '              . "\n"
-             . '12 dict begin '                                     . "\n"
-             . 'begincmap '                                         . "\n"
-             . '/CIDSystemInfo '                                    . "\n"
-             . '<</Registry (Adobe) '                               . "\n"
-             . '/Ordering (UCS) '                                   . "\n"
-             . '/Supplement 0'                                      . "\n"
-             . '>> def'                                             . "\n"
-             . '/CMapName /Adobe-Identity-UCS def '                 . "\n"
-             . '/CMapType 2 def '                                   . "\n"
-             . '1 begincodespacerange'                              . "\n"
-             . '<0000> <FFFF> '                                     . "\n"
-             . 'endcodespacerange '                                 . "\n"
-             . '1 beginbfrange '                                    . "\n"
-             . '<0000> <FFFF> <0000> '                              . "\n"
-             . 'endbfrange '                                        . "\n"
-             . 'endcmap '                                           . "\n"
-             . 'CMapName currentdict /CMap defineresource pop '     . "\n"
-             . 'end '
-             . 'end ';
-            }
-
-    /**
-     * Object constructor
-     *
-     */
-    public function __construct(Zend_Pdf_Resource_Font_CidFont $descendantFont)
-    {
-        parent::__construct();
-
-        $this->_objectFactory->attach($descendantFont->getFactory());
-
-        $this->_fontType       = Zend_Pdf_Font::TYPE_TYPE_0;
-        $this->_descendantFont = $descendantFont;
-
-
-        $this->_fontNames    = $descendantFont->getFontNames();
-
-        $this->_isBold       = $descendantFont->isBold();
-        $this->_isItalic     = $descendantFont->isItalic();
-        $this->_isMonospaced = $descendantFont->isMonospace();
-
-        $this->_underlinePosition  = $descendantFont->getUnderlinePosition();
-        $this->_underlineThickness = $descendantFont->getUnderlineThickness();
-        $this->_strikePosition     = $descendantFont->getStrikePosition();
-        $this->_strikeThickness    = $descendantFont->getStrikeThickness();
-
-        $this->_unitsPerEm = $descendantFont->getUnitsPerEm();
-
-        $this->_ascent  = $descendantFont->getAscent();
-        $this->_descent = $descendantFont->getDescent();
-        $this->_lineGap = $descendantFont->getLineGap();
-
-
-        $this->_resource->Subtype         = new Zend_Pdf_Element_Name('Type0');
-        $this->_resource->BaseFont        = new Zend_Pdf_Element_Name($descendantFont->getResource()->BaseFont->value);
-        $this->_resource->DescendantFonts = new Zend_Pdf_Element_Array(array( $descendantFont->getResource() ));
-        $this->_resource->Encoding        = new Zend_Pdf_Element_Name('Identity-H');
-
-        $toUnicode = $this->_objectFactory->newStreamObject(self::getToUnicodeCMapData());
-        $this->_resource->ToUnicode = $toUnicode;
-
-    }
-
-    /**
-     * Returns an array of glyph numbers corresponding to the Unicode characters.
-     *
-     * Zend_Pdf uses 'Identity-H' encoding for Type 0 fonts.
-     * So we don't need to perform any conversion
-     *
-     * See also {@link glyphNumberForCharacter()}.
-     *
-     * @param array $characterCodes Array of Unicode character codes (code points).
-     * @return array Array of glyph numbers.
-     */
-    public function glyphNumbersForCharacters($characterCodes)
-    {
-        return $characterCodes;
-    }
-
-    /**
-     * Returns the glyph number corresponding to the Unicode character.
-     *
-     * Zend_Pdf uses 'Identity-H' encoding for Type 0 fonts.
-     * So we don't need to perform any conversion
-     *
-     * @param integer $characterCode Unicode character code (code point).
-     * @return integer Glyph number.
-     */
-    public function glyphNumberForCharacter($characterCode)
-    {
-        return $characterCode;
-    }
-
-    /**
-     * Returns a number between 0 and 1 inclusive that indicates the percentage
-     * of characters in the string which are covered by glyphs in this font.
-     *
-     * Since no one font will contain glyphs for the entire Unicode character
-     * range, this method can be used to help locate a suitable font when the
-     * actual contents of the string are not known.
-     *
-     * Note that some fonts lie about the characters they support. Additionally,
-     * fonts don't usually contain glyphs for control characters such as tabs
-     * and line breaks, so it is rare that you will get back a full 1.0 score.
-     * The resulting value should be considered informational only.
-     *
-     * @param string $string
-     * @param string $charEncoding (optional) Character encoding of source text.
-     *   If omitted, uses 'current locale'.
-     * @return float
-     */
-    public function getCoveredPercentage($string, $charEncoding = '')
-    {
-        return $this->_descendantFont->getCoveredPercentage($string, $charEncoding);
-    }
-
-    /**
-     * Returns the widths of the glyphs.
-     *
-     * The widths are expressed in the font's glyph space. You are responsible
-     * for converting to user space as necessary. See {@link unitsPerEm()}.
-     *
-     * Throws an exception if the glyph number is out of range.
-     *
-     * See also {@link widthForGlyph()}.
-     *
-     * @param array &$glyphNumbers Array of glyph numbers.
-     * @return array Array of glyph widths (integers).
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthsForGlyphs($glyphNumbers)
-    {
-        return $this->_descendantFont->widthsForChars($glyphNumbers);
-    }
-
-    /**
-     * Returns the width of the glyph.
-     *
-     * Like {@link widthsForGlyphs()} but used for one glyph at a time.
-     *
-     * @param integer $glyphNumber
-     * @return integer
-     * @throws Zend_Pdf_Exception
-     */
-    public function widthForGlyph($glyphNumber)
-    {
-        return $this->_descendantFont->widthForChar($glyphNumber);
-    }
-
-    /**
-     * Convert string to the font encoding.
-     *
-     * The method is used to prepare string for text drawing operators
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of source text.
-     * @return string
-     */
-    public function encodeString($string, $charEncoding)
-    {
-        return iconv($charEncoding, 'UTF-16BE', $string);
-    }
-
-    /**
-     * Convert string from the font encoding.
-     *
-     * The method is used to convert strings retrieved from existing content streams
-     *
-     * @param string $string
-     * @param string $charEncoding Character encoding of resulting text.
-     * @return string
-     */
-        public function decodeString($string, $charEncoding)
-    {
-        return iconv('UTF-16BE', $charEncoding, $string);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Image.php b/airtime_mvc/library/Zend/Pdf/Resource/Image.php
deleted file mode 100644
index a220bb646..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Image.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-
-/** Zend_Pdf_Element_Name */
-require_once 'Zend/Pdf/Element/Name.php';
-
-
-/** Zend_Pdf_Resource */
-require_once 'Zend/Pdf/Resource.php';
-
-
-/**
- * Image abstraction.
- *
- * Class is named not in accordance to the name convention.
- * It's "end-user" class, but its ancestor is not.
- * Thus part of the common class name is removed.
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Resource_Image extends Zend_Pdf_Resource
-{
-    /**
-     * Object constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct('');
-
-        $this->_resource->dictionary->Type    = new Zend_Pdf_Element_Name('XObject');
-        $this->_resource->dictionary->Subtype = new Zend_Pdf_Element_Name('Image');
-    }
-    /**
-     * get the height in pixels of the image
-     *
-     * @return integer
-     */
-    abstract public function getPixelHeight();
-
-    /**
-     * get the width in pixels of the image
-     *
-     * @return integer
-     */
-    abstract public function getPixelWidth();
-
-    /**
-     * gets an associative array of information about an image
-     *
-     * @return array
-     */
-    abstract public function getProperties();
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Image/Jpeg.php b/airtime_mvc/library/Zend/Pdf/Resource/Image/Jpeg.php
deleted file mode 100644
index 76278086b..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Image/Jpeg.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Jpeg.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Resource_Image */
-require_once 'Zend/Pdf/Resource/Image.php';
-
-/**
- * JPEG image
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Image_Jpeg extends Zend_Pdf_Resource_Image
-{
-
-    protected $_width;
-    protected $_height;
-    protected $_imageProperties;
-
-    /**
-     * Object constructor
-     *
-     * @param string $imageFileName
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($imageFileName)
-    {
-        if (!function_exists('gd_info')) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Image extension is not installed.');
-        }
-
-        $gd_options = gd_info();
-        if ( (!isset($gd_options['JPG Support'])  || $gd_options['JPG Support']  != true)  &&
-             (!isset($gd_options['JPEG Support']) || $gd_options['JPEG Support'] != true)  ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('JPG support is not configured properly.');
-        }
-
-        if (($imageInfo = getimagesize($imageFileName)) === false) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Corrupted image or image doesn\'t exist.');
-        }
-        if ($imageInfo[2] != IMAGETYPE_JPEG && $imageInfo[2] != IMAGETYPE_JPEG2000) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('ImageType is not JPG');
-        }
-
-        parent::__construct();
-
-        switch ($imageInfo['channels']) {
-            case 3:
-                $colorSpace = 'DeviceRGB';
-                break;
-            case 4:
-                $colorSpace = 'DeviceCMYK';
-                break;
-            default:
-                $colorSpace = 'DeviceGray';
-                break;
-        }
-
-        $imageDictionary = $this->_resource->dictionary;
-        $imageDictionary->Width            = new Zend_Pdf_Element_Numeric($imageInfo[0]);
-        $imageDictionary->Height           = new Zend_Pdf_Element_Numeric($imageInfo[1]);
-        $imageDictionary->ColorSpace       = new Zend_Pdf_Element_Name($colorSpace);
-        $imageDictionary->BitsPerComponent = new Zend_Pdf_Element_Numeric($imageInfo['bits']);
-        if ($imageInfo[2] == IMAGETYPE_JPEG) {
-            $imageDictionary->Filter       = new Zend_Pdf_Element_Name('DCTDecode');
-        } else if ($imageInfo[2] == IMAGETYPE_JPEG2000){
-            $imageDictionary->Filter       = new Zend_Pdf_Element_Name('JPXDecode');
-        }
-
-        if (($imageFile = @fopen($imageFileName, 'rb')) === false ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Can not open '$imageFileName' file for reading." );
-        }
-        $byteCount = filesize($imageFileName);
-        $this->_resource->value = '';
-        while ( $byteCount > 0 && ($nextBlock = fread($imageFile, $byteCount)) != false ) {
-            $this->_resource->value .= $nextBlock;
-            $byteCount -= strlen($nextBlock);
-        }
-        fclose($imageFile);
-        $this->_resource->skipFilters();
-
-    $this->_width = $imageInfo[0];
-    $this->_height = $imageInfo[1];
-    $this->_imageProperties = array();
-    $this->_imageProperties['bitDepth'] = $imageInfo['bits'];
-    $this->_imageProperties['jpegImageType'] = $imageInfo[2];
-    $this->_imageProperties['jpegColorType'] = $imageInfo['channels'];
-    }
-
-    /**
-     * Image width
-     */
-    public function getPixelWidth() {
-        return $this->_width;
-    }
-
-    /**
-     * Image height
-     */
-    public function getPixelHeight() {
-        return $this->_height;
-    }
-
-    /**
-     * Image properties
-     */
-    public function getProperties() {
-        return $this->_imageProperties;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Image/Png.php b/airtime_mvc/library/Zend/Pdf/Resource/Image/Png.php
deleted file mode 100644
index d9ac6d9e9..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Image/Png.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Png.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/String/Binary.php';
-
-
-/** Zend_Pdf_Resource_Image */
-require_once 'Zend/Pdf/Resource/Image.php';
-
-/**
- * PNG image
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Image_Png extends Zend_Pdf_Resource_Image
-{
-    const PNG_COMPRESSION_DEFAULT_STRATEGY = 0;
-    const PNG_COMPRESSION_FILTERED = 1;
-    const PNG_COMPRESSION_HUFFMAN_ONLY = 2;
-    const PNG_COMPRESSION_RLE = 3;
-
-    const PNG_FILTER_NONE = 0;
-    const PNG_FILTER_SUB = 1;
-    const PNG_FILTER_UP = 2;
-    const PNG_FILTER_AVERAGE = 3;
-    const PNG_FILTER_PAETH = 4;
-
-    const PNG_INTERLACING_DISABLED = 0;
-    const PNG_INTERLACING_ENABLED = 1;
-
-    const PNG_CHANNEL_GRAY = 0;
-    const PNG_CHANNEL_RGB = 2;
-    const PNG_CHANNEL_INDEXED = 3;
-    const PNG_CHANNEL_GRAY_ALPHA = 4;
-    const PNG_CHANNEL_RGB_ALPHA = 6;
-
-    protected $_width;
-    protected $_height;
-    protected $_imageProperties;
-
-    /**
-     * Object constructor
-     *
-     * @param string $imageFileName
-     * @throws Zend_Pdf_Exception
-     * @todo Add compression conversions to support compression strategys other than PNG_COMPRESSION_DEFAULT_STRATEGY.
-     * @todo Add pre-compression filtering.
-     * @todo Add interlaced image handling.
-     * @todo Add support for 16-bit images. Requires PDF version bump to 1.5 at least.
-     * @todo Add processing for all PNG chunks defined in the spec. gAMA etc.
-     * @todo Fix tRNS chunk support for Indexed Images to a SMask.
-     */
-    public function __construct($imageFileName)
-    {
-        if (($imageFile = @fopen($imageFileName, 'rb')) === false ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Can not open '$imageFileName' file for reading." );
-        }
-
-        parent::__construct();
-
-        //Check if the file is a PNG
-        fseek($imageFile, 1, SEEK_CUR); //First signature byte (%)
-        if ('PNG' != fread($imageFile, 3)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception('Image is not a PNG');
-        }
-        fseek($imageFile, 12, SEEK_CUR); //Signature bytes (Includes the IHDR chunk) IHDR processed linerarly because it doesnt contain a variable chunk length
-        $wtmp = unpack('Ni',fread($imageFile, 4)); //Unpack a 4-Byte Long
-        $width = $wtmp['i'];
-        $htmp = unpack('Ni',fread($imageFile, 4));
-        $height = $htmp['i'];
-        $bits = ord(fread($imageFile, 1)); //Higher than 8 bit depths are only supported in later versions of PDF.
-        $color = ord(fread($imageFile, 1));
-
-        $compression = ord(fread($imageFile, 1));
-        $prefilter = ord(fread($imageFile,1));
-
-        if (($interlacing = ord(fread($imageFile,1))) != Zend_Pdf_Resource_Image_Png::PNG_INTERLACING_DISABLED) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Only non-interlaced images are currently supported." );
-        }
-
-        $this->_width = $width;
-        $this->_height = $height;
-        $this->_imageProperties = array();
-        $this->_imageProperties['bitDepth'] = $bits;
-        $this->_imageProperties['pngColorType'] = $color;
-        $this->_imageProperties['pngFilterType'] = $prefilter;
-        $this->_imageProperties['pngCompressionType'] = $compression;
-        $this->_imageProperties['pngInterlacingType'] = $interlacing;
-
-        fseek($imageFile, 4, SEEK_CUR); //4 Byte Ending Sequence
-        $imageData = '';
-
-        /*
-         * The following loop processes PNG chunks. 4 Byte Longs are packed first give the chunk length
-         * followed by the chunk signature, a four byte code. IDAT and IEND are manditory in any PNG.
-         */
-        while(($chunkLengthBytes = fread($imageFile, 4)) !== false) {
-            $chunkLengthtmp         = unpack('Ni', $chunkLengthBytes);
-            $chunkLength            = $chunkLengthtmp['i'];
-            $chunkType                      = fread($imageFile, 4);
-            switch($chunkType) {
-                case 'IDAT': //Image Data
-                    /*
-                     * Reads the actual image data from the PNG file. Since we know at this point that the compression
-                     * strategy is the default strategy, we also know that this data is Zip compressed. We will either copy
-                     * the data directly to the PDF and provide the correct FlateDecode predictor, or decompress the data
-                     * decode the filters and output the data as a raw pixel map.
-                     */
-                    $imageData .= fread($imageFile, $chunkLength);
-                    fseek($imageFile, 4, SEEK_CUR);
-                    break;
-
-                case 'PLTE': //Palette
-                    $paletteData = fread($imageFile, $chunkLength);
-                    fseek($imageFile, 4, SEEK_CUR);
-                    break;
-
-                case 'tRNS': //Basic (non-alpha channel) transparency.
-                    $trnsData = fread($imageFile, $chunkLength);
-                    switch ($color) {
-                        case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_GRAY:
-                            $baseColor = ord(substr($trnsData, 1, 1));
-                            $transparencyData = array(new Zend_Pdf_Element_Numeric($baseColor),
-                                                      new Zend_Pdf_Element_Numeric($baseColor));
-                            break;
-
-                        case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB:
-                            $red = ord(substr($trnsData,1,1));
-                            $green = ord(substr($trnsData,3,1));
-                            $blue = ord(substr($trnsData,5,1));
-                            $transparencyData = array(new Zend_Pdf_Element_Numeric($red),
-                                                      new Zend_Pdf_Element_Numeric($red),
-                                                      new Zend_Pdf_Element_Numeric($green),
-                                                      new Zend_Pdf_Element_Numeric($green),
-                                                      new Zend_Pdf_Element_Numeric($blue),
-                                                      new Zend_Pdf_Element_Numeric($blue));
-                            break;
-
-                        case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_INDEXED:
-                            //Find the first transparent color in the index, we will mask that. (This is a bit of a hack. This should be a SMask and mask all entries values).
-                            if(($trnsIdx = strpos($trnsData, chr(0))) !== false) {
-                                $transparencyData = array(new Zend_Pdf_Element_Numeric($trnsIdx),
-                                                          new Zend_Pdf_Element_Numeric($trnsIdx));
-                            }
-                            break;
-
-                        case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_GRAY_ALPHA:
-                            // Fall through to the next case
-
-                        case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB_ALPHA:
-                            require_once 'Zend/Pdf/Exception.php';
-                            throw new Zend_Pdf_Exception( "tRNS chunk illegal for Alpha Channel Images" );
-                            break;
-                    }
-                    fseek($imageFile, 4, SEEK_CUR); //4 Byte Ending Sequence
-                    break;
-
-                case 'IEND';
-                    break 2; //End the loop too
-
-                default:
-                    fseek($imageFile, $chunkLength + 4, SEEK_CUR); //Skip the section
-                    break;
-            }
-        }
-        fclose($imageFile);
-
-        $compressed = true;
-        $imageDataTmp = '';
-        $smaskData = '';
-        switch ($color) {
-            case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB:
-                $colorSpace = new Zend_Pdf_Element_Name('DeviceRGB');
-                break;
-
-            case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_GRAY:
-                $colorSpace = new Zend_Pdf_Element_Name('DeviceGray');
-                break;
-
-            case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_INDEXED:
-                if(empty($paletteData)) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception( "PNG Corruption: No palette data read for indexed type PNG." );
-                }
-                $colorSpace = new Zend_Pdf_Element_Array();
-                $colorSpace->items[] = new Zend_Pdf_Element_Name('Indexed');
-                $colorSpace->items[] = new Zend_Pdf_Element_Name('DeviceRGB');
-                $colorSpace->items[] = new Zend_Pdf_Element_Numeric((strlen($paletteData)/3-1));
-                $paletteObject = $this->_objectFactory->newObject(new Zend_Pdf_Element_String_Binary($paletteData));
-                $colorSpace->items[] = $paletteObject;
-                break;
-
-            case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_GRAY_ALPHA:
-                /*
-                 * To decode PNG's with alpha data we must create two images from one. One image will contain the Gray data
-                 * the other will contain the Gray transparency overlay data. The former will become the object data and the latter
-                 * will become the Shadow Mask (SMask).
-                 */
-                if($bits > 8) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception("Alpha PNGs with bit depth > 8 are not yet supported");
-                }
-
-                $colorSpace = new Zend_Pdf_Element_Name('DeviceGray');
-
-                require_once 'Zend/Pdf/ElementFactory.php';
-                $decodingObjFactory = Zend_Pdf_ElementFactory::createFactory(1);
-                $decodingStream = $decodingObjFactory->newStreamObject($imageData);
-                $decodingStream->dictionary->Filter      = new Zend_Pdf_Element_Name('FlateDecode');
-                $decodingStream->dictionary->DecodeParms = new Zend_Pdf_Element_Dictionary();
-                $decodingStream->dictionary->DecodeParms->Predictor        = new Zend_Pdf_Element_Numeric(15);
-                $decodingStream->dictionary->DecodeParms->Columns          = new Zend_Pdf_Element_Numeric($width);
-                $decodingStream->dictionary->DecodeParms->Colors           = new Zend_Pdf_Element_Numeric(2);   //GreyAlpha
-                $decodingStream->dictionary->DecodeParms->BitsPerComponent = new Zend_Pdf_Element_Numeric($bits);
-                $decodingStream->skipFilters();
-
-                $pngDataRawDecoded = $decodingStream->value;
-
-                //Iterate every pixel and copy out gray data and alpha channel (this will be slow)
-                for($pixel = 0, $pixelcount = ($width * $height); $pixel < $pixelcount; $pixel++) {
-                    $imageDataTmp .= $pngDataRawDecoded[($pixel*2)];
-                    $smaskData .= $pngDataRawDecoded[($pixel*2)+1];
-                }
-                $compressed = false;
-                $imageData  = $imageDataTmp; //Overwrite image data with the gray channel without alpha
-                break;
-
-            case Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB_ALPHA:
-                /*
-                 * To decode PNG's with alpha data we must create two images from one. One image will contain the RGB data
-                 * the other will contain the Gray transparency overlay data. The former will become the object data and the latter
-                 * will become the Shadow Mask (SMask).
-                 */
-                if($bits > 8) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception("Alpha PNGs with bit depth > 8 are not yet supported");
-                }
-
-                $colorSpace = new Zend_Pdf_Element_Name('DeviceRGB');
-
-                require_once 'Zend/Pdf/ElementFactory.php';
-                $decodingObjFactory = Zend_Pdf_ElementFactory::createFactory(1);
-                $decodingStream = $decodingObjFactory->newStreamObject($imageData);
-                $decodingStream->dictionary->Filter      = new Zend_Pdf_Element_Name('FlateDecode');
-                $decodingStream->dictionary->DecodeParms = new Zend_Pdf_Element_Dictionary();
-                $decodingStream->dictionary->DecodeParms->Predictor        = new Zend_Pdf_Element_Numeric(15);
-                $decodingStream->dictionary->DecodeParms->Columns          = new Zend_Pdf_Element_Numeric($width);
-                $decodingStream->dictionary->DecodeParms->Colors           = new Zend_Pdf_Element_Numeric(4);   //RGBA
-                $decodingStream->dictionary->DecodeParms->BitsPerComponent = new Zend_Pdf_Element_Numeric($bits);
-                $decodingStream->skipFilters();
-
-                $pngDataRawDecoded = $decodingStream->value;
-
-                //Iterate every pixel and copy out rgb data and alpha channel (this will be slow)
-                for($pixel = 0, $pixelcount = ($width * $height); $pixel < $pixelcount; $pixel++) {
-                    $imageDataTmp .= $pngDataRawDecoded[($pixel*4)+0] . $pngDataRawDecoded[($pixel*4)+1] . $pngDataRawDecoded[($pixel*4)+2];
-                    $smaskData .= $pngDataRawDecoded[($pixel*4)+3];
-                }
-
-                $compressed = false;
-                $imageData  = $imageDataTmp; //Overwrite image data with the RGB channel without alpha
-                break;
-
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception( "PNG Corruption: Invalid color space." );
-        }
-
-        if(empty($imageData)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Corrupt PNG Image. Mandatory IDAT chunk not found." );
-        }
-
-        $imageDictionary = $this->_resource->dictionary;
-        if(!empty($smaskData)) {
-            /*
-             * Includes the Alpha transparency data as a Gray Image, then assigns the image as the Shadow Mask for the main image data.
-             */
-            $smaskStream = $this->_objectFactory->newStreamObject($smaskData);
-            $smaskStream->dictionary->Type             = new Zend_Pdf_Element_Name('XObject');
-            $smaskStream->dictionary->Subtype          = new Zend_Pdf_Element_Name('Image');
-            $smaskStream->dictionary->Width            = new Zend_Pdf_Element_Numeric($width);
-            $smaskStream->dictionary->Height           = new Zend_Pdf_Element_Numeric($height);
-            $smaskStream->dictionary->ColorSpace       = new Zend_Pdf_Element_Name('DeviceGray');
-            $smaskStream->dictionary->BitsPerComponent = new Zend_Pdf_Element_Numeric($bits);
-            $imageDictionary->SMask = $smaskStream;
-
-            // Encode stream with FlateDecode filter
-            $smaskStreamDecodeParms = array();
-            $smaskStreamDecodeParms['Predictor']        = new Zend_Pdf_Element_Numeric(15);
-            $smaskStreamDecodeParms['Columns']          = new Zend_Pdf_Element_Numeric($width);
-            $smaskStreamDecodeParms['Colors']           = new Zend_Pdf_Element_Numeric(1);
-            $smaskStreamDecodeParms['BitsPerComponent'] = new Zend_Pdf_Element_Numeric(8);
-            $smaskStream->dictionary->DecodeParms  = new Zend_Pdf_Element_Dictionary($smaskStreamDecodeParms);
-            $smaskStream->dictionary->Filter       = new Zend_Pdf_Element_Name('FlateDecode');
-        }
-
-        if(!empty($transparencyData)) {
-            //This is experimental and not properly tested.
-            $imageDictionary->Mask = new Zend_Pdf_Element_Array($transparencyData);
-        }
-
-        $imageDictionary->Width            = new Zend_Pdf_Element_Numeric($width);
-        $imageDictionary->Height           = new Zend_Pdf_Element_Numeric($height);
-        $imageDictionary->ColorSpace       = $colorSpace;
-        $imageDictionary->BitsPerComponent = new Zend_Pdf_Element_Numeric($bits);
-        $imageDictionary->Filter       = new Zend_Pdf_Element_Name('FlateDecode');
-
-        $decodeParms = array();
-        $decodeParms['Predictor']        = new Zend_Pdf_Element_Numeric(15); // Optimal prediction
-        $decodeParms['Columns']          = new Zend_Pdf_Element_Numeric($width);
-        $decodeParms['Colors']           = new Zend_Pdf_Element_Numeric((($color==Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB || $color==Zend_Pdf_Resource_Image_Png::PNG_CHANNEL_RGB_ALPHA)?(3):(1)));
-        $decodeParms['BitsPerComponent'] = new Zend_Pdf_Element_Numeric($bits);
-        $imageDictionary->DecodeParms  = new Zend_Pdf_Element_Dictionary($decodeParms);
-
-        //Include only the image IDAT section data.
-        $this->_resource->value = $imageData;
-
-        //Skip double compression
-        if ($compressed) {
-            $this->_resource->skipFilters();
-        }
-    }
-
-    /**
-     * Image width
-     */
-    public function getPixelWidth() {
-    return $this->_width;
-    }
-
-    /**
-     * Image height
-     */
-    public function getPixelHeight() {
-        return $this->_height;
-    }
-
-    /**
-     * Image properties
-     */
-    public function getProperties() {
-        return $this->_imageProperties;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/Image/Tiff.php b/airtime_mvc/library/Zend/Pdf/Resource/Image/Tiff.php
deleted file mode 100644
index 4a41ac0d4..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/Image/Tiff.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tiff.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-
-
-/** Zend_Pdf_Resource_Image */
-require_once 'Zend/Pdf/Resource/Image.php';
-
-/**
- * TIFF image
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Resource_Image_Tiff extends Zend_Pdf_Resource_Image
-{
-    const TIFF_FIELD_TYPE_BYTE=1;
-    const TIFF_FIELD_TYPE_ASCII=2;
-    const TIFF_FIELD_TYPE_SHORT=3;
-    const TIFF_FIELD_TYPE_LONG=4;
-    const TIFF_FIELD_TYPE_RATIONAL=5;
-
-    const TIFF_TAG_IMAGE_WIDTH=256;
-    const TIFF_TAG_IMAGE_LENGTH=257; //Height
-    const TIFF_TAG_BITS_PER_SAMPLE=258;
-    const TIFF_TAG_COMPRESSION=259;
-    const TIFF_TAG_PHOTOMETRIC_INTERPRETATION=262;
-    const TIFF_TAG_STRIP_OFFSETS=273;
-    const TIFF_TAG_SAMPLES_PER_PIXEL=277;
-    const TIFF_TAG_STRIP_BYTE_COUNTS=279;
-
-    const TIFF_COMPRESSION_UNCOMPRESSED = 1;
-    const TIFF_COMPRESSION_CCITT1D = 2;
-    const TIFF_COMPRESSION_GROUP_3_FAX = 3;
-    const TIFF_COMPRESSION_GROUP_4_FAX  = 4;
-    const TIFF_COMPRESSION_LZW = 5;
-    const TIFF_COMPRESSION_JPEG = 6;
-    const TIFF_COMPRESSION_FLATE = 8;
-    const TIFF_COMPRESSION_FLATE_OBSOLETE_CODE = 32946;
-    const TIFF_COMPRESSION_PACKBITS = 32773;
-
-    const TIFF_PHOTOMETRIC_INTERPRETATION_WHITE_IS_ZERO=0;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_BLACK_IS_ZERO=1;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_RGB=2;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_RGB_INDEXED=3;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_CMYK=5;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_YCBCR=6;
-    const TIFF_PHOTOMETRIC_INTERPRETATION_CIELAB=8;
-
-    protected $_width;
-    protected $_height;
-    protected $_imageProperties;
-    protected $_endianType;
-    protected $_fileSize;
-    protected $_bitsPerSample;
-    protected $_compression;
-    protected $_filter;
-    protected $_colorCode;
-    protected $_whiteIsZero;
-    protected $_blackIsZero;
-    protected $_colorSpace;
-    protected $_imageDataOffset;
-    protected $_imageDataLength;
-
-    const TIFF_ENDIAN_BIG=0;
-    const TIFF_ENDIAN_LITTLE=1;
-
-    const UNPACK_TYPE_BYTE=0;
-    const UNPACK_TYPE_SHORT=1;
-    const UNPACK_TYPE_LONG=2;
-    const UNPACK_TYPE_RATIONAL=3;
-
-    /**
-     * Byte unpacking function
-     *
-     * Makes it possible to unpack bytes in one statement for enhanced logic readability.
-     *
-     * @param int $type
-     * @param string $bytes
-     * @throws Zend_Pdf_Exception
-     */
-    protected function unpackBytes($type, $bytes) {
-        if(!isset($this->_endianType)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("The unpackBytes function can only be used after the endianness of the file is known");
-        }
-        switch($type) {
-            case Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_BYTE:
-                $format = 'C';
-                $unpacked = unpack($format, $bytes);
-                return $unpacked[1];
-                break;
-            case Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT:
-                $format = ($this->_endianType == Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE)?'v':'n';
-                $unpacked = unpack($format, $bytes);
-                return $unpacked[1];
-                break;
-            case Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG:
-                $format = ($this->_endianType == Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE)?'V':'N';
-                $unpacked = unpack($format, $bytes);
-                return $unpacked[1];
-                break;
-            case Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_RATIONAL:
-                $format = ($this->_endianType == Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE)?'V2':'N2';
-                $unpacked = unpack($format, $bytes);
-                return ($unpacked[1]/$unpacked[2]);
-                break;
-        }
-    }
-
-    /**
-     * Object constructor
-     *
-     * @param string $imageFileName
-     * @throws Zend_Pdf_Exception
-     */
-    public function __construct($imageFileName)
-    {
-        if (($imageFile = @fopen($imageFileName, 'rb')) === false ) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Can not open '$imageFileName' file for reading." );
-        }
-
-        $byteOrderIndicator = fread($imageFile, 2);
-        if($byteOrderIndicator == 'II') {
-            $this->_endianType = Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE;
-        } else if($byteOrderIndicator == 'MM') {
-            $this->_endianType = Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_BIG;
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Not a tiff file or Tiff corrupt. No byte order indication found" );
-        }
-
-        $version = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, fread($imageFile, 2));
-
-        if($version != 42) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( "Not a tiff file or Tiff corrupt. Incorrect version number." );
-        }
-        $ifdOffset = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG, fread($imageFile, 4));
-
-        $fileStats = fstat($imageFile);
-        $this->_fileSize = $fileStats['size'];
-
-        /*
-         * Tiff files are stored as a series of Image File Directories (IFD) each direcctory
-         * has a specific number of entries each 12 bytes in length. At the end of the directories
-         * is four bytes pointing to the offset of the next IFD.
-         */
-
-        while($ifdOffset > 0) {
-            if(fseek($imageFile, $ifdOffset, SEEK_SET) == -1 || $ifdOffset+2 >= $this->_fileSize) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Could not seek to the image file directory as indexed by the file. Likely cause is TIFF corruption. Offset: ". $ifdOffset);
-            }
-
-            $numDirEntries = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, fread($imageFile, 2));
-
-            /*
-             * Since we now know how many entries are in this (IFD) we can extract the data.
-             * The format of a TIFF directory entry is:
-             *
-             * 2 bytes (short) tag code; See TIFF_TAG constants at the top for supported values. (There are many more in the spec)
-             * 2 bytes (short) field type
-             * 4 bytes (long) number of values, or value count.
-             * 4 bytes (mixed) data if the data will fit into 4 bytes or an offset if the data is too large.
-             */
-            for($dirEntryIdx = 1; $dirEntryIdx <= $numDirEntries; $dirEntryIdx++) {
-                $tag         = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, fread($imageFile, 2));
-                $fieldType   = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, fread($imageFile, 2));
-                $valueCount  = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG, fread($imageFile, 4));
-
-                switch($fieldType) {
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_BYTE:
-                        $fieldLength = $valueCount;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_ASCII:
-                        $fieldLength = $valueCount;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_SHORT:
-                        $fieldLength = $valueCount * 2;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_LONG:
-                        $fieldLength = $valueCount * 4;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_RATIONAL:
-                        $fieldLength = $valueCount * 8;
-                        break;
-                    default:
-                        $fieldLength = $valueCount;
-                }
-
-                $offsetBytes = fread($imageFile, 4);
-
-                if($fieldLength <= 4) {
-                    switch($fieldType) {
-                        case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_BYTE:
-                            $value = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_BYTE, $offsetBytes);
-                            break;
-                        case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_ASCII:
-                            //Fall through to next case
-                        case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_LONG:
-                            $value = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG, $offsetBytes);
-                            break;
-                        case Zend_Pdf_Resource_Image_Tiff::TIFF_FIELD_TYPE_SHORT:
-                            //Fall through to next case
-                        default:
-                            $value = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, $offsetBytes);
-                    }
-                } else {
-                    $refOffset = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG, $offsetBytes);
-                }
-                /*
-                 * Linear tag processing is probably not the best way to do this. I've processed the tags according to the
-                 * Tiff 6 specification and make some assumptions about when tags will be < 4 bytes and fit into $value and when
-                 * they will be > 4 bytes and require seek/extraction of the offset. Same goes for extracting arrays of data, like
-                 * the data offsets and length. This should be fixed in the future.
-                 */
-                switch($tag) {
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_IMAGE_WIDTH:
-                        $this->_width = $value;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_IMAGE_LENGTH:
-                        $this->_height = $value;
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_BITS_PER_SAMPLE:
-                        if($valueCount>1) {
-                            $fp = ftell($imageFile);
-                            fseek($imageFile, $refOffset, SEEK_SET);
-                            $this->_bitsPerSample = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_SHORT, fread($imageFile, 2));
-                            fseek($imageFile, $fp, SEEK_SET);
-                        } else {
-                            $this->_bitsPerSample = $value;
-                        }
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_COMPRESSION:
-                        $this->_compression = $value;
-                        switch($value) {
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_UNCOMPRESSED:
-                                $this->_filter = 'None';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_CCITT1D:
-                                //Fall through to next case
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_GROUP_3_FAX:
-                                //Fall through to next case
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_GROUP_4_FAX:
-                                $this->_filter = 'CCITTFaxDecode';
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception("CCITTFaxDecode Compression Mode Not Currently Supported");
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_LZW:
-                                $this->_filter = 'LZWDecode';
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception("LZWDecode Compression Mode Not Currently Supported");
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_JPEG:
-                                $this->_filter = 'DCTDecode'; //Should work, doesnt...
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception("JPEG Compression Mode Not Currently Supported");
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_FLATE:
-                                //fall through to next case
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_FLATE_OBSOLETE_CODE:
-                                $this->_filter = 'FlateDecode';
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception("ZIP/Flate Compression Mode Not Currently Supported");
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_COMPRESSION_PACKBITS:
-                                $this->_filter = 'RunLengthDecode';
-                                break;
-                        }
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_PHOTOMETRIC_INTERPRETATION:
-                        $this->_colorCode = $value;
-                        $this->_whiteIsZero = false;
-                        $this->_blackIsZero = false;
-                        switch($value) {
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_WHITE_IS_ZERO:
-                                $this->_whiteIsZero = true;
-                                $this->_colorSpace = 'DeviceGray';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_BLACK_IS_ZERO:
-                                $this->_blackIsZero = true;
-                                $this->_colorSpace = 'DeviceGray';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_YCBCR:
-                                //fall through to next case
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_RGB:
-                                $this->_colorSpace = 'DeviceRGB';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_RGB_INDEXED:
-                                $this->_colorSpace = 'Indexed';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_CMYK:
-                                $this->_colorSpace = 'DeviceCMYK';
-                                break;
-                            case Zend_Pdf_Resource_Image_Tiff::TIFF_PHOTOMETRIC_INTERPRETATION_CIELAB:
-                                $this->_colorSpace = 'Lab';
-                                break;
-                            default:
-                                require_once 'Zend/Pdf/Exception.php';
-                                throw new Zend_Pdf_Exception('TIFF: Unknown or Unsupported Color Type: '. $value);
-                        }
-                        break;
-                    case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_STRIP_OFFSETS:
-                        if($valueCount>1) {
-                            $format = ($this->_endianType == Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE)?'V*':'N*';
-                            $fp = ftell($imageFile);
-                            fseek($imageFile, $refOffset, SEEK_SET);
-                            $stripOffsetsBytes = fread($imageFile, $fieldLength);
-                            $this->_imageDataOffset = unpack($format, $stripOffsetsBytes);
-                            fseek($imageFile, $fp, SEEK_SET);
-                        } else {
-                            $this->_imageDataOffset = $value;
-                        }
-                        break;
-                   case Zend_Pdf_Resource_Image_Tiff::TIFF_TAG_STRIP_BYTE_COUNTS:
-                        if($valueCount>1) {
-                            $format = ($this->_endianType == Zend_Pdf_Resource_Image_Tiff::TIFF_ENDIAN_LITTLE)?'V*':'N*';
-                            $fp = ftell($imageFile);
-                            fseek($imageFile, $refOffset, SEEK_SET);
-                            $stripByteCountsBytes = fread($imageFile, $fieldLength);
-                            $this->_imageDataLength = unpack($format, $stripByteCountsBytes);
-                            fseek($imageFile, $fp, SEEK_SET);
-                        } else {
-                            $this->_imageDataLength = $value;
-                        }
-                        break;
-                    default:
-                        //For debugging. It should be harmless to ignore unknown tags, though there is some good info in them.
-                        //echo "Unknown tag detected: ". $tag . " value: ". $value;
-                }
-            }
-            $ifdOffset = $this->unpackBytes(Zend_Pdf_Resource_Image_Tiff::UNPACK_TYPE_LONG, fread($imageFile, 4));
-        }
-
-        if(!isset($this->_imageDataOffset) || !isset($this->_imageDataLength)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("TIFF: The image processed did not contain image data as expected.");
-        }
-
-        $imageDataBytes = '';
-        if(is_array($this->_imageDataOffset)) {
-            if(!is_array($this->_imageDataLength)) {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("TIFF: The image contained multiple data offsets but not multiple data lengths. Tiff may be corrupt.");
-            }
-            foreach($this->_imageDataOffset as $idx => $offset) {
-                fseek($imageFile, $this->_imageDataOffset[$idx], SEEK_SET);
-                $imageDataBytes .= fread($imageFile, $this->_imageDataLength[$idx]);
-            }
-        } else {
-            fseek($imageFile, $this->_imageDataOffset, SEEK_SET);
-            $imageDataBytes = fread($imageFile, $this->_imageDataLength);
-        }
-        if($imageDataBytes === '') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("TIFF: No data. Image Corruption");
-        }
-
-        fclose($imageFile);
-
-        parent::__construct();
-
-        $imageDictionary = $this->_resource->dictionary;
-        if(!isset($this->_width) || !isset($this->_width)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Problem reading tiff file. Tiff is probably corrupt.");
-        }
-
-        $this->_imageProperties = array();
-        $this->_imageProperties['bitDepth'] = $this->_bitsPerSample;
-        $this->_imageProperties['fileSize'] = $this->_fileSize;
-        $this->_imageProperties['TIFFendianType'] = $this->_endianType;
-        $this->_imageProperties['TIFFcompressionType'] = $this->_compression;
-        $this->_imageProperties['TIFFwhiteIsZero'] = $this->_whiteIsZero;
-        $this->_imageProperties['TIFFblackIsZero'] = $this->_blackIsZero;
-        $this->_imageProperties['TIFFcolorCode'] = $this->_colorCode;
-        $this->_imageProperties['TIFFimageDataOffset'] = $this->_imageDataOffset;
-        $this->_imageProperties['TIFFimageDataLength'] = $this->_imageDataLength;
-        $this->_imageProperties['PDFfilter'] = $this->_filter;
-        $this->_imageProperties['PDFcolorSpace'] = $this->_colorSpace;
-
-        $imageDictionary->Width            = new Zend_Pdf_Element_Numeric($this->_width);
-        if($this->_whiteIsZero === true) {
-            $imageDictionary->Decode       = new Zend_Pdf_Element_Array(array(new Zend_Pdf_Element_Numeric(1), new Zend_Pdf_Element_Numeric(0)));
-        }
-        $imageDictionary->Height           = new Zend_Pdf_Element_Numeric($this->_height);
-        $imageDictionary->ColorSpace       = new Zend_Pdf_Element_Name($this->_colorSpace);
-        $imageDictionary->BitsPerComponent = new Zend_Pdf_Element_Numeric($this->_bitsPerSample);
-        if(isset($this->_filter) && $this->_filter != 'None') {
-            $imageDictionary->Filter = new Zend_Pdf_Element_Name($this->_filter);
-        }
-
-        $this->_resource->value = $imageDataBytes;
-        $this->_resource->skipFilters();
-    }
-    /**
-     * Image width (defined in Zend_Pdf_Resource_Image_Interface)
-     */
-    public function getPixelWidth() {
-        return $this->_width;
-    }
-
-    /**
-     * Image height (defined in Zend_Pdf_Resource_Image_Interface)
-     */
-    public function getPixelHeight() {
-        return $this->_height;
-    }
-
-    /**
-     * Image properties (defined in Zend_Pdf_Resource_Image_Interface)
-     */
-    public function getProperties() {
-        return $this->_imageProperties;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Resource/ImageFactory.php b/airtime_mvc/library/Zend/Pdf/Resource/ImageFactory.php
deleted file mode 100644
index a321ac9a6..000000000
--- a/airtime_mvc/library/Zend/Pdf/Resource/ImageFactory.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ImageFactory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Pdf_ImageFactory
- *
- * Helps manage the diverse set of supported image file types.
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @todo       Use Zend_Mime not file extension for type determination.
- */
-class Zend_Pdf_Resource_ImageFactory
-{
-    public static function factory($filename) {
-        if(!is_file($filename)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Cannot create image resource. File not found.");
-        }
-        $extension = pathinfo($filename, PATHINFO_EXTENSION);
-        /*
-         * There are plans to use Zend_Mime and not file extension. In the mean time, if you need to
-         * use an alternate file extension just spin up the right processor directly.
-         */
-        switch (strtolower($extension)) {
-            case 'tif':
-                //Fall through to next case;
-            case 'tiff':
-                require_once 'Zend/Pdf/Resource/Image/Tiff.php';
-                return new Zend_Pdf_Resource_Image_Tiff($filename);
-                break;
-            case 'png':
-                require_once 'Zend/Pdf/Resource/Image/Png.php';
-                return new Zend_Pdf_Resource_Image_Png($filename);
-                break;
-            case 'jpg':
-                //Fall through to next case;
-            case 'jpe':
-                //Fall through to next case;
-            case 'jpeg':
-                require_once 'Zend/Pdf/Resource/Image/Jpeg.php';
-                return new Zend_Pdf_Resource_Image_Jpeg($filename);
-                break;
-            default:
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception("Cannot create image resource. File extension not known or unsupported type.");
-                break;
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/StringParser.php b/airtime_mvc/library/Zend/Pdf/StringParser.php
deleted file mode 100644
index 2a460ccf3..000000000
--- a/airtime_mvc/library/Zend/Pdf/StringParser.php
+++ /dev/null
@@ -1,724 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StringParser.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Internally used classes */
-require_once 'Zend/Pdf/Element/Array.php';
-require_once 'Zend/Pdf/Element/String/Binary.php';
-require_once 'Zend/Pdf/Element/Boolean.php';
-require_once 'Zend/Pdf/Element/Dictionary.php';
-require_once 'Zend/Pdf/Element/Name.php';
-require_once 'Zend/Pdf/Element/Null.php';
-require_once 'Zend/Pdf/Element/Numeric.php';
-require_once 'Zend/Pdf/Element/Object.php';
-require_once 'Zend/Pdf/Element/Object/Stream.php';
-require_once 'Zend/Pdf/Element/Reference.php';
-require_once 'Zend/Pdf/Element/String.php';
-
-
-/**
- * PDF string parser
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_StringParser
-{
-    /**
-     * Source PDF
-     *
-     * @var string
-     */
-    public $data = '';
-
-    /**
-     * Current position in a data
-     *
-     * @var integer
-     */
-    public $offset = 0;
-
-    /**
-     * Current reference context
-     *
-     * @var Zend_Pdf_Element_Reference_Context
-     */
-    private $_context = null;
-
-    /**
-     * Array of elements of the currently parsed object/trailer
-     *
-     * @var array
-     */
-    private $_elements = array();
-
-    /**
-     * PDF objects factory.
-     *
-     * @var Zend_Pdf_ElementFactory_Interface
-     */
-    private $_objFactory = null;
-
-
-    /**
-     * Clean up resources.
-     *
-     * Clear current state to remove cyclic object references
-     */
-    public function cleanUp()
-    {
-        $this->_context = null;
-        $this->_elements = array();
-        $this->_objFactory = null;
-    }
-
-    /**
-     * Character with code $chCode is white space
-     *
-     * @param integer $chCode
-     * @return boolean
-     */
-    public static function isWhiteSpace($chCode)
-    {
-        if ($chCode == 0x00 || // null character
-            $chCode == 0x09 || // Tab
-            $chCode == 0x0A || // Line feed
-            $chCode == 0x0C || // Form Feed
-            $chCode == 0x0D || // Carriage return
-            $chCode == 0x20    // Space
-           ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Character with code $chCode is a delimiter character
-     *
-     * @param integer $chCode
-     * @return boolean
-     */
-    public static function isDelimiter($chCode )
-    {
-        if ($chCode == 0x28 || // '('
-            $chCode == 0x29 || // ')'
-            $chCode == 0x3C || // '<'
-            $chCode == 0x3E || // '>'
-            $chCode == 0x5B || // '['
-            $chCode == 0x5D || // ']'
-            $chCode == 0x7B || // '{'
-            $chCode == 0x7D || // '}'
-            $chCode == 0x2F || // '/'
-            $chCode == 0x25    // '%'
-           ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * Skip white space
-     *
-     * @param boolean $skipComment
-     */
-    public function skipWhiteSpace($skipComment = true)
-    {
-        if ($skipComment) {
-            while (true) {
-                $this->offset += strspn($this->data, "\x00\t\n\f\r ", $this->offset);
-
-                if ($this->offset < strlen($this->data)  &&  $this->data[$this->offset] == '%') {
-                    // Skip comment
-                    $this->offset += strcspn($this->data, "\r\n", $this->offset);
-                } else {
-                    // Non white space character not equal to '%' is found
-                    return;
-                }
-            }
-        } else {
-            $this->offset += strspn($this->data, "\x00\t\n\f\r ", $this->offset);
-        }
-
-//        /** Original (non-optimized) implementation. */
-//
-//        while ($this->offset < strlen($this->data)) {
-//            if (strpos("\x00\t\n\f\r ", $this->data[$this->offset]) !== false) {
-//                $this->offset++;
-//            } else if (ord($this->data[$this->offset]) == 0x25 && $skipComment) { // '%'
-//                $this->skipComment();
-//            } else {
-//                return;
-//            }
-//        }
-    }
-
-
-    /**
-     * Skip comment
-     */
-    public function skipComment()
-    {
-        while ($this->offset < strlen($this->data))
-        {
-            if (ord($this->data[$this->offset]) != 0x0A || // Line feed
-                ord($this->data[$this->offset]) != 0x0d    // Carriage return
-               ) {
-                $this->offset++;
-            } else {
-                return;
-            }
-        }
-    }
-
-
-    /**
-     * Read comment line
-     *
-     * @return string
-     */
-    public function readComment()
-    {
-        $this->skipWhiteSpace(false);
-
-        /** Check if it's a comment line */
-        if ($this->data[$this->offset] != '%') {
-            return '';
-        }
-
-        for ($start = $this->offset;
-             $this->offset < strlen($this->data);
-             $this->offset++) {
-            if (ord($this->data[$this->offset]) == 0x0A || // Line feed
-                ord($this->data[$this->offset]) == 0x0d    // Carriage return
-               ) {
-                break;
-            }
-        }
-
-        return substr($this->data, $start, $this->offset-$start);
-    }
-
-
-    /**
-     * Returns next lexeme from a pdf stream
-     *
-     * @return string
-     */
-    public function readLexeme()
-    {
-        // $this->skipWhiteSpace();
-        while (true) {
-            $this->offset += strspn($this->data, "\x00\t\n\f\r ", $this->offset);
-
-            if ($this->offset < strlen($this->data)  &&  $this->data[$this->offset] == '%') {
-                $this->offset += strcspn($this->data, "\r\n", $this->offset);
-            } else {
-                break;
-            }
-        }
-
-        if ($this->offset >= strlen($this->data)) {
-            return '';
-        }
-
-        if ( /* self::isDelimiter( ord($this->data[$start]) ) */
-             strpos('()<>[]{}/%', $this->data[$this->offset]) !== false ) {
-
-            switch (substr($this->data, $this->offset, 2)) {
-                case '<<':
-                    $this->offset += 2;
-                    return '<<';
-                    break;
-
-                case '>>':
-                    $this->offset += 2;
-                    return '>>';
-                    break;
-
-                default:
-                    return $this->data[$this->offset++];
-                    break;
-            }
-        } else {
-            $start = $this->offset;
-            $this->offset += strcspn($this->data, "()<>[]{}/%\x00\t\n\f\r ", $this->offset);
-
-            return substr($this->data, $start, $this->offset - $start);
-        }
-    }
-
-
-    /**
-     * Read elemental object from a PDF stream
-     *
-     * @return Zend_Pdf_Element
-     * @throws Zend_Pdf_Exception
-     */
-    public function readElement($nextLexeme = null)
-    {
-        if ($nextLexeme === null) {
-            $nextLexeme = $this->readLexeme();
-        }
-
-        /**
-         * Note: readElement() method is a public method and could be invoked from other classes.
-         * If readElement() is used not by Zend_Pdf_StringParser::getObject() method, then we should not care
-         * about _elements member management.
-         */
-        switch ($nextLexeme) {
-            case '(':
-                return ($this->_elements[] = $this->_readString());
-
-            case '<':
-                return ($this->_elements[] = $this->_readBinaryString());
-
-            case '/':
-                return ($this->_elements[] = new Zend_Pdf_Element_Name(
-                                                    Zend_Pdf_Element_Name::unescape( $this->readLexeme() )
-                                                                      ));
-
-            case '[':
-                return ($this->_elements[] = $this->_readArray());
-
-            case '<<':
-                return ($this->_elements[] = $this->_readDictionary());
-
-            case ')':
-                // fall through to next case
-            case '>':
-                // fall through to next case
-            case ']':
-                // fall through to next case
-            case '>>':
-                // fall through to next case
-            case '{':
-                // fall through to next case
-            case '}':
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X.',
-                                                $this->offset));
-
-            default:
-                if (strcasecmp($nextLexeme, 'true') == 0) {
-                    return ($this->_elements[] = new Zend_Pdf_Element_Boolean(true));
-                } else if (strcasecmp($nextLexeme, 'false') == 0) {
-                    return ($this->_elements[] = new Zend_Pdf_Element_Boolean(false));
-                } else if (strcasecmp($nextLexeme, 'null') == 0) {
-                    return ($this->_elements[] = new Zend_Pdf_Element_Null());
-                }
-
-                $ref = $this->_readReference($nextLexeme);
-                if ($ref !== null) {
-                    return ($this->_elements[] = $ref);
-                }
-
-                return ($this->_elements[] = $this->_readNumeric($nextLexeme));
-        }
-    }
-
-
-    /**
-     * Read string PDF object
-     * Also reads trailing ')' from a pdf stream
-     *
-     * @return Zend_Pdf_Element_String
-     * @throws Zend_Pdf_Exception
-     */
-    private function _readString()
-    {
-        $start = $this->offset;
-        $openedBrackets = 1;
-
-        $this->offset += strcspn($this->data, '()\\', $this->offset);
-
-        while ($this->offset < strlen($this->data)) {
-            switch (ord( $this->data[$this->offset] )) {
-                case 0x28: // '(' - opened bracket in the string, needs balanced pair.
-                    $this->offset++;
-                    $openedBrackets++;
-                    break;
-
-                case 0x29: // ')' - pair to the opened bracket
-                    $this->offset++;
-                    $openedBrackets--;
-                    break;
-
-                case 0x5C: // '\\' - escape sequence, skip next char from a check
-                    $this->offset += 2;
-            }
-
-            if ($openedBrackets == 0) {
-                break; // end of string
-            }
-
-            $this->offset += strcspn($this->data, '()\\', $this->offset);
-        }
-        if ($openedBrackets != 0) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Unexpected end of file while string reading. Offset - 0x%X. \')\' expected.', $start));
-        }
-
-        return new Zend_Pdf_Element_String(Zend_Pdf_Element_String::unescape( substr($this->data,
-                                                                                     $start,
-                                                                                     $this->offset - $start - 1) ));
-    }
-
-
-    /**
-     * Read binary string PDF object
-     * Also reads trailing '>' from a pdf stream
-     *
-     * @return Zend_Pdf_Element_String_Binary
-     * @throws Zend_Pdf_Exception
-     */
-    private function _readBinaryString()
-    {
-        $start = $this->offset;
-
-        $this->offset += strspn($this->data, "\x00\t\n\f\r 0123456789abcdefABCDEF", $this->offset);
-
-        if ($this->offset >= strlen($this->data) - 1) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Unexpected end of file while reading binary string. Offset - 0x%X. \'>\' expected.', $start));
-        }
-
-        if ($this->data[$this->offset++] != '>') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Unexpected character while binary string reading. Offset - 0x%X.', $this->offset));
-        }
-
-        return new Zend_Pdf_Element_String_Binary(
-                       Zend_Pdf_Element_String_Binary::unescape( substr($this->data,
-                                                                        $start,
-                                                                        $this->offset - $start - 1) ));
-    }
-
-
-    /**
-     * Read array PDF object
-     * Also reads trailing ']' from a pdf stream
-     *
-     * @return Zend_Pdf_Element_Array
-     * @throws Zend_Pdf_Exception
-     */
-    private function _readArray()
-    {
-        $elements = array();
-
-        while ( strlen($nextLexeme = $this->readLexeme()) != 0 ) {
-            if ($nextLexeme != ']') {
-                $elements[] = $this->readElement($nextLexeme);
-            } else {
-                return new Zend_Pdf_Element_Array($elements);
-            }
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Unexpected end of file while array reading. Offset - 0x%X. \']\' expected.', $this->offset));
-    }
-
-
-    /**
-     * Read dictionary PDF object
-     * Also reads trailing '>>' from a pdf stream
-     *
-     * @return Zend_Pdf_Element_Dictionary
-     * @throws Zend_Pdf_Exception
-     */
-    private function _readDictionary()
-    {
-        $dictionary = new Zend_Pdf_Element_Dictionary();
-
-        while ( strlen($nextLexeme = $this->readLexeme()) != 0 ) {
-            if ($nextLexeme != '>>') {
-                $nameStart = $this->offset - strlen($nextLexeme);
-
-                $name  = $this->readElement($nextLexeme);
-                $value = $this->readElement();
-
-                if (!$name instanceof Zend_Pdf_Element_Name) {
-                    require_once 'Zend/Pdf/Exception.php';
-                    throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Name object expected while dictionary reading. Offset - 0x%X.', $nameStart));
-                }
-
-                $dictionary->add($name, $value);
-            } else {
-                return $dictionary;
-            }
-        }
-
-        require_once 'Zend/Pdf/Exception.php';
-        throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Unexpected end of file while dictionary reading. Offset - 0x%X. \'>>\' expected.', $this->offset));
-    }
-
-
-    /**
-     * Read reference PDF object
-     *
-     * @param string $nextLexeme
-     * @return Zend_Pdf_Element_Reference
-     */
-    private function _readReference($nextLexeme = null)
-    {
-        $start = $this->offset;
-
-        if ($nextLexeme === null) {
-            $objNum = $this->readLexeme();
-        } else {
-            $objNum = $nextLexeme;
-        }
-        if (!ctype_digit($objNum)) { // it's not a reference
-            $this->offset = $start;
-            return null;
-        }
-
-        $genNum = $this->readLexeme();
-        if (!ctype_digit($genNum)) { // it's not a reference
-            $this->offset = $start;
-            return null;
-        }
-
-        $rMark  = $this->readLexeme();
-        if ($rMark != 'R') { // it's not a reference
-            $this->offset = $start;
-            return null;
-        }
-
-        $ref = new Zend_Pdf_Element_Reference((int)$objNum, (int)$genNum, $this->_context, $this->_objFactory->resolve());
-
-        return $ref;
-    }
-
-
-    /**
-     * Read numeric PDF object
-     *
-     * @param string $nextLexeme
-     * @return Zend_Pdf_Element_Numeric
-     */
-    private function _readNumeric($nextLexeme = null)
-    {
-        if ($nextLexeme === null) {
-            $nextLexeme = $this->readLexeme();
-        }
-
-        return new Zend_Pdf_Element_Numeric($nextLexeme);
-    }
-
-
-    /**
-     * Read inderect object from a PDF stream
-     *
-     * @param integer $offset
-     * @param Zend_Pdf_Element_Reference_Context $context
-     * @return Zend_Pdf_Element_Object
-     */
-    public function getObject($offset, Zend_Pdf_Element_Reference_Context $context)
-    {
-        if ($offset === null ) {
-            return new Zend_Pdf_Element_Null();
-        }
-
-        // Save current offset to make getObject() reentrant
-        $offsetSave = $this->offset;
-
-        $this->offset    = $offset;
-        $this->_context  = $context;
-        $this->_elements = array();
-
-        $objNum = $this->readLexeme();
-        if (!ctype_digit($objNum)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Object number expected.', $this->offset - strlen($objNum)));
-        }
-
-        $genNum = $this->readLexeme();
-        if (!ctype_digit($genNum)) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Object generation number expected.', $this->offset - strlen($genNum)));
-        }
-
-        $objKeyword = $this->readLexeme();
-        if ($objKeyword != 'obj') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. \'obj\' keyword expected.', $this->offset - strlen($objKeyword)));
-        }
-
-        $objValue = $this->readElement();
-
-        $nextLexeme = $this->readLexeme();
-
-        if( $nextLexeme == 'endobj' ) {
-            /**
-             * Object is not generated by factory (thus it's not marked as modified object).
-             * But factory is assigned to the obect.
-             */
-            $obj = new Zend_Pdf_Element_Object($objValue, (int)$objNum, (int)$genNum, $this->_objFactory->resolve());
-
-            foreach ($this->_elements as $element) {
-                $element->setParentObject($obj);
-            }
-
-            // Restore offset value
-            $this->offset = $offsetSave;
-
-            return $obj;
-        }
-
-        /**
-         * It's a stream object
-         */
-        if ($nextLexeme != 'stream') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. \'endobj\' or \'stream\' keywords expected.', $this->offset - strlen($nextLexeme)));
-        }
-
-        if (!$objValue instanceof Zend_Pdf_Element_Dictionary) {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. Stream extent must be preceded by stream dictionary.', $this->offset - strlen($nextLexeme)));
-        }
-
-        /**
-         * References are automatically dereferenced at this moment.
-         */
-        $streamLength = $objValue->Length->value;
-
-        /**
-         * 'stream' keyword must be followed by either cr-lf sequence or lf character only.
-         * This restriction gives the possibility to recognize all cases exactly
-         */
-        if ($this->data[$this->offset] == "\r" &&
-            $this->data[$this->offset + 1] == "\n"    ) {
-            $this->offset += 2;
-        } else if ($this->data[$this->offset] == "\n"    ) {
-            $this->offset++;
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. \'stream\' must be followed by either cr-lf sequence or lf character only.', $this->offset - strlen($nextLexeme)));
-        }
-
-        $dataOffset = $this->offset;
-
-        $this->offset += $streamLength;
-
-        $nextLexeme = $this->readLexeme();
-        if ($nextLexeme != 'endstream') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. \'endstream\' keyword expected.', $this->offset - strlen($nextLexeme)));
-        }
-
-        $nextLexeme = $this->readLexeme();
-        if ($nextLexeme != 'endobj') {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception(sprintf('PDF file syntax error. Offset - 0x%X. \'endobj\' keyword expected.', $this->offset - strlen($nextLexeme)));
-        }
-
-        $obj = new Zend_Pdf_Element_Object_Stream(substr($this->data,
-                                                         $dataOffset,
-                                                         $streamLength),
-                                                  (int)$objNum,
-                                                  (int)$genNum,
-                                                  $this->_objFactory->resolve(),
-                                                  $objValue);
-
-        foreach ($this->_elements as $element) {
-            $element->setParentObject($obj);
-        }
-
-        // Restore offset value
-        $this->offset = $offsetSave;
-
-        return $obj;
-    }
-
-
-    /**
-     * Get length of source string
-     *
-     * @return integer
-     */
-    public function getLength()
-    {
-        return strlen($this->data);
-    }
-
-    /**
-     * Get source string
-     *
-     * @return string
-     */
-    public function getString()
-    {
-        return $this->data;
-    }
-
-
-    /**
-     * Parse integer value from a binary stream
-     *
-     * @param string $stream
-     * @param integer $offset
-     * @param integer $size
-     * @return integer
-     */
-    public static function parseIntFromStream($stream, $offset, $size)
-    {
-        $value = 0;
-        for ($count = 0; $count < $size; $count++) {
-            $value *= 256;
-            $value += ord($stream[$offset + $count]);
-        }
-
-        return $value;
-    }
-
-
-
-    /**
-     * Set current context
-     *
-     * @param Zend_Pdf_Element_Reference_Context $context
-     */
-    public function setContext(Zend_Pdf_Element_Reference_Context $context)
-    {
-        $this->_context = $context;
-    }
-
-    /**
-     * Object constructor
-     *
-     * Note: PHP duplicates string, which is sent by value, only of it's updated.
-     * Thus we don't need to care about overhead
-     *
-     * @param string $pdfString
-     * @param Zend_Pdf_ElementFactory_Interface $factory
-     */
-    public function __construct($source, Zend_Pdf_ElementFactory_Interface $factory)
-    {
-        $this->data         = $source;
-        $this->_objFactory  = $factory;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Style.php b/airtime_mvc/library/Zend/Pdf/Style.php
deleted file mode 100644
index 475c8b93b..000000000
--- a/airtime_mvc/library/Zend/Pdf/Style.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Style object.
- * Style object doesn't directly correspond to any PDF file object.
- * It's utility class, used as a container for style information.
- * It's used by Zend_Pdf_Page class in draw operations.
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Style
-{
-    /**
-     * Fill color.
-     * Used to fill geometric shapes or text.
-     *
-     * @var Zend_Pdf_Color|null
-     */
-    private $_fillColor = null;
-
-    /**
-     * Line color.
-     * Current color, used for lines and font outlines.
-     *
-     * @var Zend_Pdf_Color|null
-     */
-
-    private $_color;
-
-    /**
-     * Line width.
-     *
-     * @var Zend_Pdf_Element_Numeric
-     */
-    private $_lineWidth;
-
-    /**
-     * Array which describes line dashing pattern.
-     * It's array of numeric:
-     * array($on_length, $off_length, $on_length, $off_length, ...)
-     *
-     * @var array
-     */
-    private $_lineDashingPattern;
-
-    /**
-     * Line dashing phase
-     *
-     * @var float
-     */
-    private $_lineDashingPhase;
-
-    /**
-     * Current font
-     *
-     * @var Zend_Pdf_Resource_Font
-     */
-    private $_font;
-
-    /**
-     * Font size
-     *
-     * @var float
-     */
-    private $_fontSize;
-
-
-
-    /**
-     * Create style.
-     *
-     * @param Zend_Pdf_Style $anotherStyle
-     */
-    public function __construct($anotherStyle = null)
-    {
-        if ($anotherStyle !== null) {
-            $this->_fillColor          = $anotherStyle->_fillColor;
-            $this->_color              = $anotherStyle->_color;
-            $this->_lineWidth          = $anotherStyle->_lineWidth;
-            $this->_lineDashingPattern = $anotherStyle->_lineDashingPattern;
-            $this->_lineDashingPhase   = $anotherStyle->_lineDashingPhase;
-            $this->_font               = $anotherStyle->_font;
-            $this->_fontSize           = $anotherStyle->_fontSize;
-        }
-    }
-
-
-    /**
-     * Set fill color.
-     *
-     * @param Zend_Pdf_Color $color
-     */
-    public function setFillColor(Zend_Pdf_Color $color)
-    {
-        $this->_fillColor = $color;
-    }
-
-    /**
-     * Set line color.
-     *
-     * @param Zend_Pdf_Color $color
-     */
-    public function setLineColor(Zend_Pdf_Color $color)
-    {
-        $this->_color = $color;
-    }
-
-    /**
-     * Set line width.
-     *
-     * @param float $width
-     */
-    public function setLineWidth($width)
-    {
-        require_once 'Zend/Pdf/Element/Numeric.php';
-        $this->_lineWidth = new Zend_Pdf_Element_Numeric($width);
-    }
-
-
-    /**
-     * Set line dashing pattern
-     *
-     * @param array $pattern
-     * @param float $phase
-     */
-    public function setLineDashingPattern($pattern, $phase = 0)
-    {
-        require_once 'Zend/Pdf/Page.php';
-        if ($pattern === Zend_Pdf_Page::LINE_DASHING_SOLID) {
-            $pattern = array();
-            $phase   = 0;
-        }
-
-        require_once 'Zend/Pdf/Element/Numeric.php';
-        $this->_lineDashingPattern = $pattern;
-        $this->_lineDashingPhase   = new Zend_Pdf_Element_Numeric($phase);
-    }
-
-
-    /**
-     * Set current font.
-     *
-     * @param Zend_Pdf_Resource_Font $font
-     * @param float $fontSize
-     */
-    public function setFont(Zend_Pdf_Resource_Font $font, $fontSize)
-    {
-        $this->_font = $font;
-        $this->_fontSize = $fontSize;
-    }
-
-    /**
-     * Modify current font size
-     *
-     * @param float $fontSize
-     */
-    public function setFontSize($fontSize)
-    {
-        $this->_fontSize = $fontSize;
-    }
-
-    /**
-     * Get fill color.
-     *
-     * @return Zend_Pdf_Color|null
-     */
-    public function getFillColor()
-    {
-        return $this->_fillColor;
-    }
-
-    /**
-     * Get line color.
-     *
-     * @return Zend_Pdf_Color|null
-     */
-    public function getLineColor()
-    {
-        return $this->_color;
-    }
-
-    /**
-     * Get line width.
-     *
-     * @return float
-     */
-    public function getLineWidth()
-    {
-        return $this->_lineWidth->value;
-    }
-
-    /**
-     * Get line dashing pattern
-     *
-     * @return array
-     */
-    public function getLineDashingPattern()
-    {
-        return $this->_lineDashingPattern;
-    }
-
-
-    /**
-     * Get current font.
-     *
-     * @return Zend_Pdf_Resource_Font $font
-     */
-    public function getFont()
-    {
-        return $this->_font;
-    }
-
-    /**
-     * Get current font size
-     *
-     * @return float $fontSize
-     */
-    public function getFontSize()
-    {
-        return $this->_fontSize;
-    }
-
-    /**
-     * Get line dashing phase
-     *
-     * @return float
-     */
-    public function getLineDashingPhase()
-    {
-        return $this->_lineDashingPhase->value;
-    }
-
-
-    /**
-     * Dump style to a string, which can be directly inserted into content stream
-     *
-     * @return string
-     */
-    public function instructions()
-    {
-        $instructions = '';
-
-        if ($this->_fillColor !== null) {
-            $instructions .= $this->_fillColor->instructions(false);
-        }
-
-        if ($this->_color !== null) {
-            $instructions .= $this->_color->instructions(true);
-        }
-
-        if ($this->_lineWidth !== null) {
-            $instructions .= $this->_lineWidth->toString() . " w\n";
-        }
-
-        if ($this->_lineDashingPattern !== null) {
-            require_once 'Zend/Pdf/Element/Array.php';
-            $dashPattern = new Zend_Pdf_Element_Array();
-
-            require_once 'Zend/Pdf/Element/Numeric.php';
-            foreach ($this->_lineDashingPattern as $dashItem) {
-                $dashElement = new Zend_Pdf_Element_Numeric($dashItem);
-                $dashPattern->items[] = $dashElement;
-            }
-
-            $instructions .= $dashPattern->toString() . ' '
-                           . $this->_lineDashingPhase->toString() . " d\n";
-        }
-
-        return $instructions;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Pdf/Target.php b/airtime_mvc/library/Zend/Pdf/Target.php
deleted file mode 100644
index ee3e2c6b0..000000000
--- a/airtime_mvc/library/Zend/Pdf/Target.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Target.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF target (action or destination)
- *
- * @package    Zend_Pdf
- * @subpackage Actions
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Target
-{
-    /**
-     * Parse resource and return it as an Action or Explicit Destination
-     *
-     * $param Zend_Pdf_Element $resource
-     * @return Zend_Pdf_Destination|
-     * @throws Zend_Pdf_Exception
-     */
-    public static function load(Zend_Pdf_Element $resource) {
-        require_once 'Zend/Pdf/Element.php';
-        if ($resource->getType() == Zend_Pdf_Element::TYPE_DICTIONARY) {
-            if (($resource->Type === null  ||  $resource->Type->value =='Action')  &&  $resource->S !== null) {
-                // It's a well-formed action, load it
-                require_once 'Zend/Pdf/Action.php';
-                return Zend_Pdf_Action::load($resource);
-            } else if ($resource->D !== null) {
-                // It's a destination
-                $resource = $resource->D;
-            } else {
-                require_once 'Zend/Pdf/Exception.php';
-                throw new Zend_Pdf_Exception('Wrong resource type.');
-            }
-        }
-
-        if ($resource->getType() == Zend_Pdf_Element::TYPE_ARRAY  ||
-            $resource->getType() == Zend_Pdf_Element::TYPE_NAME   ||
-            $resource->getType() == Zend_Pdf_Element::TYPE_STRING) {
-            // Resource is an array, just treat it as an explicit destination array
-            require_once 'Zend/Pdf/Destination.php';
-            return Zend_Pdf_Destination::load($resource);
-        } else {
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception( 'Wrong resource type.' );
-        }
-    }
-
-    /**
-     * Get resource
-     *
-     * @internal
-     * @return Zend_Pdf_Element
-     */
-    abstract public function getResource();
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Trailer.php b/airtime_mvc/library/Zend/Pdf/Trailer.php
deleted file mode 100644
index f607b7139..000000000
--- a/airtime_mvc/library/Zend/Pdf/Trailer.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Trailer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * PDF file trailer
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Pdf_Trailer
-{
-    private static $_allowedKeys = array('Size', 'Prev', 'Root', 'Encrypt', 'Info', 'ID', 'Index', 'W', 'XRefStm', 'DocChecksum');
-
-    /**
-     * Trailer dictionary.
-     *
-     * @var Zend_Pdf_Element_Dictionary
-     */
-    private $_dict;
-
-    /**
-     * Check if key is correct
-     *
-     * @param string $key
-     * @throws Zend_Pdf_Exception
-     */
-    private function _checkDictKey($key)
-    {
-        if ( !in_array($key, self::$_allowedKeys) ) {
-            /** @todo Make warning (log entry) instead of an exception */
-            require_once 'Zend/Pdf/Exception.php';
-            throw new Zend_Pdf_Exception("Unknown trailer dictionary key: '$key'.");
-        }
-    }
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dict
-     */
-    public function __construct(Zend_Pdf_Element_Dictionary $dict)
-    {
-        $this->_dict   = $dict;
-
-        foreach ($this->_dict->getKeys() as $dictKey) {
-            $this->_checkDictKey($dictKey);
-        }
-    }
-
-    /**
-     * Get handler
-     *
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        return $this->_dict->$property;
-    }
-
-    /**
-     * Set handler
-     *
-     * @param string $property
-     * @param  mixed $value
-     */
-    public function __set($property, $value)
-    {
-        $this->_checkDictKey($property);
-        $this->_dict->$property = $value;
-    }
-
-    /**
-     * Return string trailer representation
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "trailer\n" . $this->_dict->toString() . "\n";
-    }
-
-
-    /**
-     * Get length of source PDF
-     *
-     * @return string
-     */
-    abstract public function getPDFLength();
-
-    /**
-     * Get PDF String
-     *
-     * @return string
-     */
-    abstract public function getPDFString();
-
-    /**
-     * Get header of free objects list
-     * Returns object number of last free object
-     *
-     * @return integer
-     */
-    abstract public function getLastFreeObject();
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Trailer/Generator.php b/airtime_mvc/library/Zend/Pdf/Trailer/Generator.php
deleted file mode 100644
index 5448abf12..000000000
--- a/airtime_mvc/library/Zend/Pdf/Trailer/Generator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Trailer */
-require_once 'Zend/Pdf/Trailer.php';
-
-/**
- * PDF file trailer generator (used for just created PDF)
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Trailer_Generator extends Zend_Pdf_Trailer
-{
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dict
-     */
-    public function __construct(Zend_Pdf_Element_Dictionary $dict)
-    {
-        parent::__construct($dict);
-    }
-
-    /**
-     * Get length of source PDF
-     *
-     * @return string
-     */
-    public function getPDFLength()
-    {
-        require_once 'Zend/Pdf.php';
-        return strlen(Zend_Pdf::PDF_HEADER);
-    }
-
-    /**
-     * Get PDF String
-     *
-     * @return string
-     */
-    public function getPDFString()
-    {
-        require_once 'Zend/Pdf.php';
-        return Zend_Pdf::PDF_HEADER;
-    }
-
-    /**
-     * Get header of free objects list
-     * Returns object number of last free object
-     *
-     * @return integer
-     */
-    public function getLastFreeObject()
-    {
-        return 0;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/Trailer/Keeper.php b/airtime_mvc/library/Zend/Pdf/Trailer/Keeper.php
deleted file mode 100644
index 73aa151d8..000000000
--- a/airtime_mvc/library/Zend/Pdf/Trailer/Keeper.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Keeper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Pdf_Trailer */
-require_once 'Zend/Pdf/Trailer.php';
-
-/**
- * PDF file trailer.
- * Stores and provides access to the trailer parced from a PDF file
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_Trailer_Keeper extends Zend_Pdf_Trailer
-{
-    /**
-     * Reference context
-     *
-     * @var Zend_Pdf_Element_Reference_Context
-     */
-    private $_context;
-
-    /**
-     * Previous trailer
-     *
-     * @var Zend_Pdf_Trailer
-     */
-    private $_prev;
-
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Pdf_Element_Dictionary $dict
-     * @param Zend_Pdf_Element_Reference_Context $context
-     * @param Zend_Pdf_Trailer $prev
-     */
-    public function __construct(Zend_Pdf_Element_Dictionary $dict,
-                                Zend_Pdf_Element_Reference_Context $context,
-                                Zend_Pdf_Trailer $prev = null)
-    {
-        parent::__construct($dict);
-
-        $this->_context = $context;
-        $this->_prev    = $prev;
-    }
-
-    /**
-     * Setter for $this->_prev
-     *
-     * @param Zend_Pdf_Trailer_Keeper $prev
-     */
-    public function setPrev(Zend_Pdf_Trailer_Keeper $prev)
-    {
-        $this->_prev = $prev;
-    }
-
-    /**
-     * Getter for $this->_prev
-     *
-     * @return Zend_Pdf_Trailer
-     */
-    public function getPrev()
-    {
-        return $this->_prev;
-    }
-
-    /**
-     * Get length of source PDF
-     *
-     * @return string
-     */
-    public function getPDFLength()
-    {
-        return $this->_context->getParser()->getLength();
-    }
-
-    /**
-     * Get PDF String
-     *
-     * @return string
-     */
-    public function getPDFString()
-    {
-        return $this->_context->getParser()->getString();
-    }
-
-    /**
-     * Get reference table, which corresponds to the trailer.
-     * Proxy to the $_context member methad call
-     *
-     * @return Zend_Pdf_Element_Reference_Context
-     */
-    public function getRefTable()
-    {
-        return $this->_context->getRefTable();
-    }
-
-    /**
-     * Get header of free objects list
-     * Returns object number of last free object
-     *
-     * @throws Zend_Pdf_Exception
-     * @return integer
-     */
-    public function getLastFreeObject()
-    {
-        try {
-            $this->_context->getRefTable()->getNextFree('0 65535 R');
-        } catch (Zend_Pdf_Exception $e) {
-            if ($e->getMessage() == 'Object not found.') {
-                /**
-                 * Here is work around for some wrong generated PDFs.
-                 * We have not found reference to the header of free object list,
-                 * thus we treat it as there are no free objects.
-                 */
-                return 0;
-            }
-
-            throw new Zend_Pdf_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Pdf/UpdateInfoContainer.php b/airtime_mvc/library/Zend/Pdf/UpdateInfoContainer.php
deleted file mode 100644
index 9df95bad3..000000000
--- a/airtime_mvc/library/Zend/Pdf/UpdateInfoContainer.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateInfoContainer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Container which collects updated object info.
- *
- * @package    Zend_Pdf
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Pdf_UpdateInfoContainer
-{
-    /**
-     * Object number
-     *
-     * @var integer
-     */
-    private $_objNum;
-
-    /**
-     * Generation number
-     *
-     * @var integer
-     */
-    private $_genNum;
-
-
-    /**
-     * Flag, which signals, that object is free
-     *
-     * @var boolean
-     */
-    private $_isFree;
-
-    /**
-     * String representation of the object
-     *
-     * @var Zend_Memory_Container|null
-     */
-    private $_dump = null;
-
-    /**
-     * Object constructor
-     *
-     * @param integer $objCount
-     */
-    public function __construct($objNum, $genNum, $isFree, $dump = null)
-    {
-        $this->_objNum = $objNum;
-        $this->_genNum = $genNum;
-        $this->_isFree = $isFree;
-
-        if ($dump !== null) {
-            if (strlen($dump) > 1024) {
-                require_once 'Zend/Pdf.php';
-                $this->_dump = Zend_Pdf::getMemoryManager()->create($dump);
-            } else {
-                $this->_dump = $dump;
-            }
-        }
-    }
-
-
-    /**
-     * Get object number
-     *
-     * @return integer
-     */
-    public function getObjNum()
-    {
-        return $this->_objNum;
-    }
-
-    /**
-     * Get generation number
-     *
-     * @return integer
-     */
-    public function getGenNum()
-    {
-        return $this->_genNum;
-    }
-
-    /**
-     * Check, that object is free
-     *
-     * @return boolean
-     */
-    public function isFree()
-    {
-        return $this->_isFree;
-    }
-
-    /**
-     * Get string representation of the object
-     *
-     * @return string
-     */
-    public function getObjectDump()
-    {
-        if ($this->_dump === null) {
-            return '';
-        }
-
-        if (is_string($this->_dump)) {
-            return $this->_dump;
-        }
-
-        return $this->_dump->getRef();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/ProgressBar.php b/airtime_mvc/library/Zend/ProgressBar.php
deleted file mode 100644
index c6607590c..000000000
--- a/airtime_mvc/library/Zend/ProgressBar.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProgressBar.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_ProgressBar offers an interface for multiple enviroments.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar
-{
-    /**
-     * Min value
-     *
-     * @var float
-     */
-    protected $_min;
-
-    /**
-     * Max value
-     *
-     * @var float
-     */
-    protected $_max;
-
-    /**
-     * Current value
-     *
-     * @var float
-     */
-    protected $_current;
-
-    /**
-     * Start time of the progressbar, required for ETA
-     *
-     * @var integer
-     */
-    protected $_startTime;
-
-    /**
-     * Current status text
-     *
-     * @var string
-     */
-    protected $_statusText = null;
-
-    /**
-     * Adapter for the output
-     *
-     * @var Zend_ProgressBar_Adapter
-     */
-    protected $_adapter;
-
-    /**
-     * Namespace for keeping the progressbar persistent
-     *
-     * @var string
-     */
-    protected $_persistenceNamespace = null;
-
-    /**
-     * Create a new progressbar backend.
-     *
-     * @param  Zend_ProgressBar_Adapter $adapter
-     * @param  float                    $min
-     * @param  float                    $max
-     * @param  string                   $persistenceNamespace
-     * @throws Zend_ProgressBar_Exception When $min is greater than $max
-     */
-    public function __construct(Zend_ProgressBar_Adapter $adapter, $min = 0, $max = 100, $persistenceNamespace = null)
-    {
-        // Check min/max values and set them
-        if ($min > $max) {
-            require_once 'Zend/ProgressBar/Exception.php';
-            throw new Zend_ProgressBar_Exception('$max must be greater than $min');
-        }
-
-        $this->_min     = (float) $min;
-        $this->_max     = (float) $max;
-        $this->_current = (float) $min;
-
-        // See if we have to open a session namespace
-        if ($persistenceNamespace !== null) {
-            require_once 'Zend/Session/Namespace.php';
-
-            $this->_persistenceNamespace = new Zend_Session_Namespace($persistenceNamespace);
-        }
-
-        // Set adapter
-        $this->_adapter = $adapter;
-
-        // Track the start time
-        $this->_startTime = time();
-
-        // See If a persistenceNamespace exists and handle accordingly
-        if ($this->_persistenceNamespace !== null) {
-            if (isset($this->_persistenceNamespace->isSet)) {
-                $this->_startTime  = $this->_persistenceNamespace->startTime;
-                $this->_current    = $this->_persistenceNamespace->current;
-                $this->_statusText = $this->_persistenceNamespace->statusText;
-            } else {
-                $this->_persistenceNamespace->isSet      = true;
-                $this->_persistenceNamespace->startTime  = $this->_startTime;
-                $this->_persistenceNamespace->current    = $this->_current;
-                $this->_persistenceNamespace->statusText = $this->_statusText;
-            }
-        } else {
-            $this->update();
-        }
-    }
-
-    /**
-     * Get the current adapter
-     *
-     * @return Zend_ProgressBar_Adapter
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Update the progressbar
-     *
-     * @param  float  $value
-     * @param  string $text
-     * @return void
-     */
-    public function update($value = null, $text = null)
-    {
-        // Update value if given
-        if ($value !== null) {
-            $this->_current = min($this->_max, max($this->_min, $value));
-        }
-
-        // Update text if given
-        if ($text !== null) {
-            $this->_statusText = $text;
-        }
-
-        // See if we have to update a namespace
-        if ($this->_persistenceNamespace !== null) {
-            $this->_persistenceNamespace->current    = $this->_current;
-            $this->_persistenceNamespace->statusText = $this->_statusText;
-        }
-
-        // Calculate percent
-        if ($this->_min === $this->_max) {
-            $percent = false;
-        } else {
-            $percent = (float) ($this->_current - $this->_min) / ($this->_max - $this->_min);
-        }
-
-        // Calculate ETA
-        $timeTaken = time() - $this->_startTime;
-
-        if ($percent === .0 || $percent === false) {
-            $timeRemaining = null;
-        } else {
-            $timeRemaining = round(((1 / $percent) * $timeTaken) - $timeTaken);
-        }
-
-        // Poll the adapter
-        $this->_adapter->notify($this->_current, $this->_max, $percent, $timeTaken, $timeRemaining, $this->_statusText);
-    }
-
-    /**
-     * Update the progressbar to the next value
-     *
-     * @param  string $text
-     * @return void
-     */
-    public function next($diff = 1, $text = null)
-    {
-        $this->update(max($this->_min, min($this->_max, $this->_current + $diff)), $text);
-    }
-
-    /**
-     * Call the adapters finish() behaviour
-     *
-     * @return void
-     */
-    public function finish()
-    {
-        if ($this->_persistenceNamespace !== null) {
-            unset($this->_persistenceNamespace->isSet);
-        }
-
-        $this->_adapter->finish();
-    }
-}
diff --git a/airtime_mvc/library/Zend/ProgressBar/Adapter.php b/airtime_mvc/library/Zend/ProgressBar/Adapter.php
deleted file mode 100644
index 7661a5a68..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Adapter.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class for Zend_ProgressBar_Adapters
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_ProgressBar_Adapter
-{
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Create a new adapter
-     *
-     * $options may be either be an array or a Zend_Config object which
-     * specifies adapter related options.
-     *
-     * @param null|array|Zend_Config $options
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } elseif ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-    }
-
-    /**
-     * Set options via a Zend_Config instance
-     *
-     * @param  Zend_Config $config
-     * @return Zend_ProgressBar_Adapter
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->setOptions($config->toArray());
-
-        return $this;
-    }
-
-    /**
-     * Set options via an array
-     *
-     * @param  array $options
-     * @return Zend_ProgressBar_Adapter
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Notify the adapter about an update
-     *
-     * @param  float   $current       Current progress value
-     * @param  float   $max           Max progress value
-     * @param  float   $percent       Current percent value
-     * @param  integer $timeTaken     Taken time in seconds
-     * @param  integer $timeRemaining Remaining time in seconds
-     * @param  string  $text          Status text
-     * @return void
-     */
-    abstract public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $text);
-
-    /**
-     * Called when the progress is explicitly finished
-     *
-     * @return void
-     */
-    abstract public function finish();
-}
diff --git a/airtime_mvc/library/Zend/ProgressBar/Adapter/Console.php b/airtime_mvc/library/Zend/ProgressBar/Adapter/Console.php
deleted file mode 100644
index c323a8b3c..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Adapter/Console.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Console.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_ProgressBar_Adapter
- */
-require_once 'Zend/ProgressBar/Adapter.php';
-
-/**
- * @see Zend_Text_MultiByte
- */
-require_once 'Zend/Text/MultiByte.php';
-
-/**
- * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
- * applications
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @uses      Zend_ProgressBar_Adapter_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter
-{
-    /**
-     * Percentage value of the progress
-     */
-    const ELEMENT_PERCENT = 'ELEMENT_PERCENT';
-
-    /**
-     * Visual value of the progress
-     */
-    const ELEMENT_BAR = 'ELEMENT_BAR';
-
-    /**
-     * ETA of the progress
-     */
-    const ELEMENT_ETA = 'ELEMENT_ETA';
-
-    /**
-     * Text part of the progress
-     */
-    const ELEMENT_TEXT = 'ELEMENT_TEXT';
-
-    /**
-     * Finish action: End of Line
-     */
-    const FINISH_ACTION_EOL = 'FINISH_ACTION_EOL';
-
-    /**
-     * Finish action: Clear Line
-     */
-    const FINISH_ACTION_CLEAR_LINE = 'FINISH_ACTION_CLEAR_LINE';
-
-    /**
-     * Finish action: None
-     */
-    const FINISH_ACTION_NONE = 'FINISH_ACTION_NONE';
-
-    /**
-     * Width of the progressbar
-     *
-     * @var integer
-     */
-    protected $_width = null;
-
-    /**
-     * Elements to display
-     *
-     * @var array
-     */
-    protected $_elements = array(self::ELEMENT_PERCENT,
-                                 self::ELEMENT_BAR,
-                                 self::ELEMENT_ETA);
-
-    /**
-     * Which action to do at finish call
-     *
-     * @var string
-     */
-    protected $_finishAction = self::FINISH_ACTION_EOL;
-
-    /**
-     * Width of the bar element
-     *
-     * @var integer
-     */
-    protected $_barWidth;
-
-    /**
-     * Left character(s) within the bar
-     *
-     * @var string
-     */
-    protected $_barLeftChar = '#';
-
-    /**
-     * Indicator character(s) within the bar
-     *
-     * @var string
-     */
-    protected $_barIndicatorChar = '';
-
-    /**
-     * Right character(s) within the bar
-     *
-     * @var string
-     */
-    protected $_barRightChar = '-';
-
-    /**
-     * Output-stream, when STDOUT is not defined (e.g. in CGI) or set manually
-     *
-     * @var resource
-     */
-    protected $_outputStream = null;
-
-    /**
-     * Width of the text element
-     *
-     * @var string
-     */
-    protected $_textWidth = 20;
-
-    /**
-     * Wether the output started yet or not
-     *
-     * @var boolean
-     */
-    protected $_outputStarted = false;
-
-    /**
-     * Charset of text element
-     *
-     * @var string
-     */
-    protected $_charset = 'utf-8';
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter
-     *
-     * @param null|array|Zend_Config $options
-     */
-    public function __construct($options = null)
-    {
-        // Call parent constructor with options
-        parent::__construct($options);
-
-        // Check if a width was set, else use auto width
-        if ($this->_width === null) {
-            $this->setWidth();
-        }
-    }
-
-    /**
-     * Close local stdout, when open
-     */
-    public function __destruct()
-    {
-        if ($this->_outputStream !== null) {
-            fclose($this->_outputStream);
-        }
-    }
-
-    /**
-     * Set a different output-stream
-     *
-     * @param  string $resource
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setOutputStream($resource)
-    {
-       $stream = @fopen($resource, 'w');
-
-       if ($stream === false) {
-            require_once 'Zend/ProgressBar/Adapter/Exception.php';
-            throw new Zend_ProgressBar_Adapter_Exception('Unable to open stream');
-       }
-
-       if ($this->_outputStream !== null) {
-           fclose($this->_outputStream);
-       }
-
-       $this->_outputStream = $stream;
-    }
-
-    /**
-     * Get the current output stream
-     *
-     * @return resource
-     */
-    public function getOutputStream()
-    {
-        if ($this->_outputStream === null) {
-            if (!defined('STDOUT')) {
-                $this->_outputStream = fopen('php://stdout', 'w');
-            } else {
-                return STDOUT;
-            }
-        }
-
-        return $this->_outputStream;
-    }
-
-    /**
-     * Set the width of the progressbar
-     *
-     * @param  integer $width
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setWidth($width = null)
-    {
-        if ($width === null || !is_integer($width)) {
-            if (substr(PHP_OS, 0, 3) === 'WIN') {
-                // We have to default to 79 on windows, because the windows
-                // terminal always has a fixed width of 80 characters and the
-                // cursor is counted to the line, else windows would line break
-                // after every update.
-                $this->_width = 79;
-            } else {
-                // Set the default width of 80
-                $this->_width = 80;
-
-                // Try to determine the width through stty
-                if (preg_match('#\d+ (\d+)#', @shell_exec('stty size'), $match) === 1) {
-                    $this->_width = (int) $match[1];
-                } else if (preg_match('#columns = (\d+);#', @shell_exec('stty'), $match) === 1) {
-                    $this->_width = (int) $match[1];
-                }
-            }
-        } else {
-            $this->_width = (int) $width;
-        }
-
-        $this->_calculateBarWidth();
-
-        return $this;
-    }
-
-    /**
-     * Set the elements to display with the progressbar
-     *
-     * @param  array $elements
-     * @throws Zend_ProgressBar_Adapter_Exception When an invalid element is foudn in the array
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setElements(array $elements)
-    {
-        $allowedElements = array(self::ELEMENT_PERCENT,
-                                 self::ELEMENT_BAR,
-                                 self::ELEMENT_ETA,
-                                 self::ELEMENT_TEXT);
-
-        if (count(array_diff($elements, $allowedElements)) > 0) {
-            require_once 'Zend/ProgressBar/Adapter/Exception.php';
-            throw new Zend_ProgressBar_Adapter_Exception('Invalid element found in $elements array');
-        }
-
-        $this->_elements = $elements;
-
-        $this->_calculateBarWidth();
-
-        return $this;
-    }
-
-    /**
-     * Set the left-hand character for the bar
-     *
-     * @param  string $char
-     * @throws Zend_ProgressBar_Adapter_Exception When character is empty
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setBarLeftChar($char)
-    {
-        if (empty($char)) {
-            require_once 'Zend/ProgressBar/Adapter/Exception.php';
-            throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty');
-        }
-
-        $this->_barLeftChar = (string) $char;
-
-        return $this;
-    }
-
-    /**
-     * Set the right-hand character for the bar
-     *
-     * @param  string $char
-     * @throws Zend_ProgressBar_Adapter_Exception When character is empty
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setBarRightChar($char)
-    {
-        if (empty($char)) {
-            require_once 'Zend/ProgressBar/Adapter/Exception.php';
-            throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty');
-        }
-
-        $this->_barRightChar = (string) $char;
-
-        return $this;
-    }
-
-    /**
-     * Set the indicator character for the bar
-     *
-     * @param  string $char
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setBarIndicatorChar($char)
-    {
-        $this->_barIndicatorChar = (string) $char;
-
-        return $this;
-    }
-
-    /**
-     * Set the width of the text element
-     *
-     * @param  integer $width
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setTextWidth($width)
-    {
-        $this->_textWidth = (int) $width;
-
-        $this->_calculateBarWidth();
-
-        return $this;
-    }
-
-    /**
-     * Set the charset of the text element
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset)
-    {
-        $this->_charset = $charset;
-    }
-
-    /**
-     * Set the finish action
-     *
-     * @param  string $action
-     * @throws Zend_ProgressBar_Adapter_Exception When an invalid action is specified
-     * @return Zend_ProgressBar_Adapter_Console
-     */
-    public function setFinishAction($action)
-    {
-        $allowedActions = array(self::FINISH_ACTION_CLEAR_LINE,
-                                self::FINISH_ACTION_EOL,
-                                self::FINISH_ACTION_NONE);
-
-        if (!in_array($action, $allowedActions)) {
-            require_once 'Zend/ProgressBar/Adapter/Exception.php';
-            throw new Zend_ProgressBar_Adapter_Exception('Invalid finish action specified');
-        }
-
-        $this->_finishAction = $action;
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @param  float   $current       Current progress value
-     * @param  float   $max           Max progress value
-     * @param  float   $percent       Current percent value
-     * @param  integer $timeTaken     Taken time in seconds
-     * @param  integer $timeRemaining Remaining time in seconds
-     * @param  string  $text          Status text
-     * @return void
-     */
-    public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $text)
-    {
-        // See if we must clear the line
-        if ($this->_outputStarted) {
-            $data = str_repeat("\x08", $this->_width);
-        } else {
-            $data = '';
-            $this->_outputStarted = true;
-        }
-
-        // Build all elements
-        $renderedElements = array();
-
-        foreach ($this->_elements as $element) {
-            switch ($element) {
-                case self::ELEMENT_BAR:
-                    $visualWidth = $this->_barWidth - 2;
-                    $bar         = '[';
-
-                    $indicatorWidth = strlen($this->_barIndicatorChar);
-
-                    $doneWidth = min($visualWidth - $indicatorWidth, round($visualWidth * $percent));
-                    if ($doneWidth > 0) {
-                        $bar .= substr(str_repeat($this->_barLeftChar, ceil($doneWidth / strlen($this->_barLeftChar))), 0, $doneWidth);
-                    }
-
-                    $bar .= $this->_barIndicatorChar;
-
-                    $leftWidth = $visualWidth - $doneWidth - $indicatorWidth;
-                    if ($leftWidth > 0) {
-                        $bar .= substr(str_repeat($this->_barRightChar, ceil($leftWidth / strlen($this->_barRightChar))), 0, $leftWidth);
-                    }
-
-                    $bar .= ']';
-
-                    $renderedElements[] = $bar;
-                    break;
-
-                case self::ELEMENT_PERCENT:
-                    $renderedElements[] = str_pad(round($percent * 100), 3, ' ', STR_PAD_LEFT) . '%';
-                    break;
-
-                case self::ELEMENT_ETA:
-                    // In the first 5 seconds we don't get accurate results,
-                    // this skipping technique is found in many progressbar
-                    // implementations.
-                    if ($timeTaken < 5) {
-                        $renderedElements[] = str_repeat(' ', 12);
-                        break;
-                    }
-
-                    if ($timeRemaining === null || $timeRemaining > 86400) {
-                        $etaFormatted = '??:??:??';
-                    } else {
-                        $hours   = floor($timeRemaining / 3600);
-                        $minutes = floor(($timeRemaining % 3600) / 60);
-                        $seconds = ($timeRemaining % 3600 % 60);
-
-                        $etaFormatted = sprintf('%02d:%02d:%02d', $hours, $minutes, $seconds);
-                    }
-
-                    $renderedElements[] = 'ETA ' . $etaFormatted;
-                    break;
-
-                case self::ELEMENT_TEXT:
-                    $renderedElements[] = Zend_Text_MultiByte::strPad(substr($text, 0, $this->_textWidth), $this->_textWidth, ' ', STR_PAD_RIGHT, $this->_charset);
-                    break;
-            }
-        }
-
-        $data .= implode(' ', $renderedElements);
-
-        // Output line data
-        $this->_outputData($data);
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @return void
-     */
-    public function finish()
-    {
-        switch ($this->_finishAction) {
-            case self::FINISH_ACTION_EOL:
-                $this->_outputData(PHP_EOL);
-                break;
-
-            case self::FINISH_ACTION_CLEAR_LINE:
-                if ($this->_outputStarted) {
-                    $data = str_repeat("\x08", $this->_width)
-                          . str_repeat(' ', $this->_width)
-                          . str_repeat("\x08", $this->_width);
-
-                    $this->_outputData($data);
-                }
-                break;
-
-            case self::FINISH_ACTION_NONE:
-                break;
-        }
-    }
-
-    /**
-     * Calculate the bar width when other elements changed
-     *
-     * @return void
-     */
-    protected function _calculateBarWidth()
-    {
-        if (in_array(self::ELEMENT_BAR, $this->_elements)) {
-            $barWidth = $this->_width;
-
-            if (in_array(self::ELEMENT_PERCENT, $this->_elements)) {
-                $barWidth -= 4;
-            }
-
-            if (in_array(self::ELEMENT_ETA, $this->_elements)) {
-                $barWidth -= 12;
-            }
-
-            if (in_array(self::ELEMENT_TEXT, $this->_elements)) {
-                $barWidth -= $this->_textWidth;
-            }
-
-            $this->_barWidth = $barWidth - (count($this->_elements) - 1);
-        }
-    }
-
-    /**
-     * Outputs given data to STDOUT.
-     *
-     * This split-off is required for unit-testing.
-     *
-     * @param  string $data
-     * @return void
-     */
-    protected function _outputData($data)
-    {
-        fwrite($this->getOutputStream(), $data);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/ProgressBar/Adapter/Exception.php b/airtime_mvc/library/Zend/ProgressBar/Adapter/Exception.php
deleted file mode 100644
index 6fa203286..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Adapter/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_ProgressBar_Exception
- */
-require_once 'Zend/ProgressBar/Exception.php';
-
-/**
- * Exception class for Zend_ProgressBar_Adapter
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @uses      Zend_ProgressBar_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar_Adapter_Exception extends Zend_ProgressBar_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPull.php b/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPull.php
deleted file mode 100644
index 54f76ae16..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPull.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: JsPull.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * @see Zend_ProgressBar_Adapter
- */
-require_once 'Zend/ProgressBar/Adapter.php';
-
-/**
- * Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
- * progressbar in a browser.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @uses      Zend_ProgressBar_Adapter_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar_Adapter_JsPull extends Zend_ProgressBar_Adapter
-{
-    /**
-     * Wether to exit after json data send or not
-     *
-     * @var boolean
-     */
-    protected $_exitAfterSend = true;
-
-    /**
-     * Set wether to exit after json data send or not
-     *
-     * @param  boolean $exitAfterSend
-     * @return Zend_ProgressBar_Adapter_JsPull
-     */
-    public function setExitAfterSend($exitAfterSend)
-    {
-        $this->_exitAfterSend = $exitAfterSend;
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @param  float   $current       Current progress value
-     * @param  float   $max           Max progress value
-     * @param  float   $percent       Current percent value
-     * @param  integer $timeTaken     Taken time in seconds
-     * @param  integer $timeRemaining Remaining time in seconds
-     * @param  string  $text          Status text
-     * @return void
-     */
-    public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $text)
-    {
-        $arguments = array(
-            'current'       => $current,
-            'max'           => $max,
-            'percent'       => ($percent * 100),
-            'timeTaken'     => $timeTaken,
-            'timeRemaining' => $timeRemaining,
-            'text'          => $text,
-            'finished'      => false
-        );
-
-        $data = Zend_Json::encode($arguments);
-
-        // Output the data
-        $this->_outputData($data);
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @return void
-     */
-    public function finish()
-    {
-        $data = Zend_Json::encode(array('finished' => true));
-
-        $this->_outputData($data);
-    }
-
-    /**
-     * Outputs given data the user agent.
-     *
-     * This split-off is required for unit-testing.
-     *
-     * @param  string $data
-     * @return void
-     */
-    protected function _outputData($data)
-    {
-        echo $data;
-
-        if ($this->_exitAfterSend) {
-            exit;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPush.php b/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPush.php
deleted file mode 100644
index 4f7becfa5..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Adapter/JsPush.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: JsPush.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * @see Zend_ProgressBar_Adapter
- */
-require_once 'Zend/ProgressBar/Adapter.php';
-
-/**
- * Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a
- * progressbar in a browser.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @uses      Zend_ProgressBar_Adapter_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar_Adapter_JsPush extends Zend_ProgressBar_Adapter
-{
-    /**
-     * Name of the JavaScript method to call on update
-     *
-     * @var string
-     */
-    protected $_updateMethodName = 'Zend_ProgressBar_Update';
-
-    /**
-     * Name of the JavaScript method to call on finish
-     *
-     * @var string
-     */
-    protected $_finishMethodName;
-
-    /**
-     * Set the update method name
-     *
-     * @param  string $methodName
-     * @return Zend_ProgressBar_Adapter_JsPush
-     */
-    public function setUpdateMethodName($methodName)
-    {
-        $this->_updateMethodName = $methodName;
-
-        return $this;
-    }
-
-    /**
-     * Set the finish method name
-     *
-     * @param  string $methodName
-     * @return Zend_ProgressBar_Adapter_JsPush
-     */
-    public function setFinishMethodName($methodName)
-    {
-        $this->_finishMethodName = $methodName;
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @param  float   $current       Current progress value
-     * @param  float   $max           Max progress value
-     * @param  float   $percent       Current percent value
-     * @param  integer $timeTaken     Taken time in seconds
-     * @param  integer $timeRemaining Remaining time in seconds
-     * @param  string  $text          Status text
-     * @return void
-     */
-    public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $text)
-    {
-        $arguments = array(
-            'current'       => $current,
-            'max'           => $max,
-            'percent'       => ($percent * 100),
-            'timeTaken'     => $timeTaken,
-            'timeRemaining' => $timeRemaining,
-            'text'          => $text
-        );
-
-        $data = '<script type="text/javascript">'
-              . 'parent.' . $this->_updateMethodName . '(' . Zend_Json::encode($arguments) . ');'
-              . '</script>';
-
-        // Output the data
-        $this->_outputData($data);
-    }
-
-    /**
-     * Defined by Zend_ProgressBar_Adapter_Interface
-     *
-     * @return void
-     */
-    public function finish()
-    {
-        if ($this->_finishMethodName === null) {
-            return;
-        }
-
-        $data = '<script type="text/javascript">'
-              . 'parent.' . $this->_finishMethodName . '();'
-              . '</script>';
-
-        $this->_outputData($data);
-    }
-
-    /**
-     * Outputs given data the user agent.
-     *
-     * This split-off is required for unit-testing.
-     *
-     * @param  string $data
-     * @return void
-     */
-    protected function _outputData($data)
-    {
-        // 1024 padding is required for Safari, while 256 padding is required
-        // for Internet Explorer. The <br /> is required so Safari actually
-        // executes the <script />
-        echo str_pad($data . '<br />', 1024, ' ', STR_PAD_RIGHT) . "\n";
-
-        flush();
-        ob_flush();
-    }
-}
diff --git a/airtime_mvc/library/Zend/ProgressBar/Exception.php b/airtime_mvc/library/Zend/ProgressBar/Exception.php
deleted file mode 100644
index 20add877f..000000000
--- a/airtime_mvc/library/Zend/ProgressBar/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_ProgressBar
- *
- * @category  Zend
- * @package   Zend_ProgressBar
- * @uses      Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_ProgressBar_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Queue.php b/airtime_mvc/library/Zend/Queue.php
deleted file mode 100644
index 473fd52bb..000000000
--- a/airtime_mvc/library/Zend/Queue.php
+++ /dev/null
@@ -1,569 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for connecting to queues performing common operations.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue implements Countable
-{
-    /**
-     * Use the TIMEOUT constant in the config of a Zend_Queue
-     */
-    const TIMEOUT = 'timeout';
-
-    /**
-     * Default visibility passed to count
-     */
-    const VISIBILITY_TIMEOUT = 30;
-
-    /**
-     * Use the NAME constant in the config of Zend_Queue
-     */
-    const NAME = 'name';
-
-    /**
-     * @var Zend_Queue_Adapter_AdapterInterface
-     */
-    protected $_adapter = null;
-
-    /**
-     * User-provided configuration
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Zend_Queue_Message class
-     *
-     * @var string
-     */
-    protected $_messageClass = 'Zend_Queue_Message';
-
-    /**
-     * Zend_Queue_Message_Iterator class
-     *
-     * @var string
-     */
-    protected $_messageSetClass = 'Zend_Queue_Message_Iterator';
-
-    /**
-     * @var Zend_Log
-     */
-    protected $_logger = null;
-
-    /**
-     * Constructor
-     *
-     * Can be called as
-     * $queue = new Zend_Queue($config);
-     * - or -
-     * $queue = new Zend_Queue('array', $config);
-     * - or -
-     * $queue = new Zend_Queue(null, $config); // Zend_Queue->createQueue();
-     *
-     * @param  string|Zend_Queue_Adapter|array|Zend_Config|null String or adapter instance, or options array or Zend_Config instance
-     * @param  Zend_Config|array $options Zend_Config or a configuration array
-     * @return void
-     */
-    public function __construct($spec, $options = array())
-    {
-        $adapter = null;
-        if ($spec instanceof Zend_Queue_Adapter_AdapterInterface) {
-            $adapter = $spec;
-        } elseif (is_string($spec)) {
-            $adapter = $spec;
-        } elseif ($spec instanceof Zend_Config) {
-            $options = $spec->toArray();
-        } elseif (is_array($spec)) {
-            $options = $spec;
-        }
-
-        // last minute error checking
-        if ((null === $adapter)
-            && (!is_array($options) && (!$options instanceof Zend_Config))
-        ) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('No valid params passed to constructor');
-        }
-
-        // Now continue as we would if we were a normal constructor
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (!is_array($options)) {
-            $options = array();
-        }
-
-        // Make sure we have some defaults to work with
-        if (!isset($options[self::TIMEOUT])) {
-            $options[self::TIMEOUT] = self::VISIBILITY_TIMEOUT;
-        }
-
-        // Make sure all defaults are appropriately set.
-        if (!array_key_exists('timeout', $options)) {
-            $options[self::TIMEOUT] = self::VISIBILITY_TIMEOUT;
-        }
-        if (array_key_exists('messageClass', $options)) {
-            $this->setMessageClass($options['messageClass']);
-        }
-        if (array_key_exists('messageSetClass', $options)) {
-            $this->setMessageSetClass($options['messageSetClass']);
-        }
-
-        $this->setOptions($options);
-
-        // if we were passed an adapter we either build the $adapter or use it
-        if (null !== $adapter) {
-            $this->setAdapter($adapter);
-        }
-    }
-
-    /**
-     * Set queue options
-     *
-     * @param  array $options
-     * @return Zend_Queue
-     */
-    public function setOptions(array $options)
-    {
-        $this->_options = array_merge($this->_options, $options);
-        return $this;
-    }
-
-    /**
-     * Set an individual configuration option
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Queue
-     */
-    public function setOption($name, $value)
-    {
-        $this->_options[(string) $name] = $value;
-        return $this;
-    }
-
-    /**
-     * Returns the configuration options for the queue
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Determine if a requested option has been defined
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasOption($name)
-    {
-        return array_key_exists($name, $this->_options);
-    }
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $name
-     * @return null|mixed Returns null if option does not exist; option value otherwise
-     */
-    public function getOption($name)
-    {
-        if ($this->hasOption($name)) {
-            return $this->_options[$name];
-        }
-        return null;
-    }
-
-    /**
-     * Set the adapter for this queue
-     *
-     * @param  string|Zend_Queue_Adapter_AdapterInterface $adapter
-     * @return Zend_Queue Provides a fluent interface
-     */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (null === ($adapterNamespace = $this->getOption('adapterNamespace'))) {
-                $adapterNamespace = 'Zend_Queue_Adapter';
-            }
-
-            $adapterName = str_replace(
-                ' ',
-                '_',
-                ucwords(
-                    str_replace(
-                        '_',
-                        ' ',
-                        strtolower($adapterNamespace . '_' . $adapter)
-                    )
-                )
-            );
-
-            if (!class_exists($adapterName)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($adapterName);
-            }
-
-            /*
-             * Create an instance of the adapter class.
-             * Pass the configuration to the adapter class constructor.
-             */
-            $adapter = new $adapterName($this->getOptions(), $this);
-        }
-
-        if (!$adapter instanceof Zend_Queue_Adapter_AdapterInterface) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Adapter class '" . get_class($adapterName) . "' does not implement Zend_Queue_Adapter_AdapterInterface");
-        }
-
-        $this->_adapter = $adapter;
-
-        $this->_adapter->setQueue($this);
-
-        if (null !== ($name = $this->getOption(self::NAME))) {
-            $this->_setName($name);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the adapter for this queue
-     *
-     * @return Zend_Queue_Adapter_AdapterInterface
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * @param  string $className
-     * @return Zend_Queue Provides a fluent interface
-     */
-    public function setMessageClass($className)
-    {
-        $this->_messageClass = (string) $className;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessageClass()
-    {
-        return $this->_messageClass;
-    }
-
-    /**
-     * @param  string $className
-     * @return Zend_Queue Provides a fluent interface
-     */
-    public function setMessageSetClass($className)
-    {
-        $this->_messageSetClass = (string) $className;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessageSetClass()
-    {
-        return $this->_messageSetClass;
-    }
-
-    /**
-     * Get the name of the queue
-     *
-     * Note: _setName() used to exist, but it caused confusion with createQueue
-     * Will evaluate later to see if we should add it back in.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->getOption(self::NAME);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * @param  string           $name    queue name
-     * @param  integer          $timeout default visibility timeout
-     * @return Zend_Queue|false
-     * @throws Zend_Queue_Exception
-     */
-    public function createQueue($name, $timeout = null)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$name is not a string');
-        }
-
-        if ((null !== $timeout) && !is_integer($timeout)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$timeout must be an integer');
-        }
-
-        // Default to standard timeout
-        if (null === $timeout) {
-            $timeout = $this->getOption(self::TIMEOUT);
-        }
-
-        // Some queues allow you to create on the fly, but cannot return
-        // a list of queues.  Stomp protocol for example.
-        if ($this->isSupported('create')) {
-            if ($this->getAdapter()->isExists($name)) {
-                return false;
-            }
-
-            if (!$this->getAdapter()->create($name, $timeout)) {
-                return false;
-            }
-        }
-
-        $options = array(
-            self::NAME  => $name,
-            'timeout'   => $timeout
-        );
-
-        return new self($this->getAdapter(), $options);
-    }
-
-    /**
-     * Delete the queue this object is working on.
-     *
-     * This queue is disabled, regardless of the outcome of the deletion
-     * of the queue, because the programmers intent is to disable this queue.
-     *
-     * @return boolean
-     */
-    public function deleteQueue()
-    {
-        if ($this->isSupported('delete')) {
-            $deleted = $this->getAdapter()->delete($this->getName());
-        }
-        else {
-            $deleted = true;
-        }
-
-        /**
-         * @see Zend_Queue_Adapter_Null
-         */
-        require_once('Zend/Queue/Adapter/Null.php');
-        $this->setAdapter(new Zend_Queue_Adapter_Null($this->getOptions()));
-
-        return $deleted;
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * Returns true if the adapter doesn't support message deletion.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        if ($this->getAdapter()->isSupported('deleteMessage')) {
-            return $this->getAdapter()->deleteMessage($message);
-        }
-        return true;
-    }
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  mixed $message message
-     * @return Zend_Queue_Message
-     * @throws Zend_Queue_Exception
-     */
-    public function send($message)
-    {
-        return $this->getAdapter()->send($message);
-    }
-
-    /**
-     * Returns the approximate number of messages in the queue
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        if ($this->getAdapter()->isSupported('count')) {
-            return $this->getAdapter()->count();
-        }
-        return 0;
-    }
-
-    /**
-     * Return the first element in the queue
-     *
-     * @param  integer $maxMessages
-     * @param  integer $timeout
-     * @return Zend_Queue_Message_Iterator
-     */
-    public function receive($maxMessages=null, $timeout=null)
-    {
-        if (($maxMessages !== null) && !is_integer($maxMessages)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$maxMessages must be an integer or null');
-        }
-
-        if (($timeout !== null) && !is_integer($timeout)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$timeout must be an integer or null');
-        }
-
-        // Default to returning only one message
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-
-        // Default to standard timeout
-        if ($timeout === null) {
-            $timeout = $this->getOption(self::TIMEOUT);
-        }
-
-        return $this->getAdapter()->receive($maxMessages, $timeout);
-    }
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return $this->getAdapter()->getCapabilities();
-    }
-
-    /**
-     * Indicates if a function is supported or not.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function isSupported($name)
-    {
-        $translation = array(
-            'deleteQueue' => 'delete',
-            'createQueue' => 'create'
-        );
-
-        if (isset($translation[$name])) {
-            $name = $translation[$name];
-        }
-
-        return $this->getAdapter()->isSupported($name);
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * @return array
-     * @throws Zend_Queue_Exception
-     */
-    public function getQueues()
-    {
-        if (!$this->isSupported('getQueues')) {
-            throw new Zend_Queue_Exception( __FUNCTION__ . '() is not supported by ' . get_class($this->getAdapter()));
-        }
-
-        return $this->getAdapter()->getQueues();
-    }
-
-    /**
-     * Set the name of the queue
-     *
-     * This is AN UNSUPPORTED FUNCTION
-     *
-     * @param  string           $name
-     * @return Zend_Queue|false Provides a fluent interface
-     */
-    protected function _setName($name)
-    {
-        if (!is_string($name)) {
-            /**
-             * @see Zend_Queue_Exception
-             */
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("$name is not a string");
-        }
-
-        if ($this->getAdapter()->isSupported('create')) {
-            if (!$this->getAdapter()->isExists($name)) {
-                $timeout = $this->getOption(self::TIMEOUT);
-
-                if (!$this->getAdapter()->create($name, $timeout)) {
-                    // Unable to create the new queue
-                    return false;
-                }
-            }
-        }
-
-        $this->setOption(self::NAME, $name);
-
-        return $this;
-    }
-
-    /**
-     * returns a listing of Zend_Queue details.
-     * useful for debugging
-     *
-     * @return array
-     */
-    public function debugInfo()
-    {
-        $info = array();
-        $info['self']                     = get_class($this);
-        $info['adapter']                  = get_class($this->getAdapter());
-        foreach ($this->getAdapter()->getCapabilities() as $feature => $supported) {
-            $info['adapter-' . $feature]  = ($supported) ? 'yes' : 'no';
-        }
-        $info['options']                  = $this->getOptions();
-        $info['options']['driverOptions'] = '[hidden]';
-        $info['currentQueue']             = $this->getName();
-        $info['messageClass']             = $this->getMessageClass();
-        $info['messageSetClass']          = $this->getMessageSetClass();
-
-        return $info;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Activemq.php b/airtime_mvc/library/Zend/Queue/Adapter/Activemq.php
deleted file mode 100644
index 78ff84fe6..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Activemq.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Activemq.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * @see Zend_Queue_Adapter_Stomp_Client
- */
-require_once 'Zend/Queue/Stomp/Client.php';
-
-/**
- * @see Zend_Queue_Adapter_Stomp_Frame
- */
-require_once 'Zend/Queue/Stomp/Frame.php';
-
-/**
- * Class for using Stomp to talk to an Stomp compliant server
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract
-{
-    const DEFAULT_SCHEME = 'tcp';
-    const DEFAULT_HOST   = '127.0.0.1';
-    const DEFAULT_PORT   = 61613;
-
-    /**
-     * @var Zend_Queue_Adapter_Stomp_client
-     */
-    private $_client = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $config An array having configuration data
-     * @param  Zend_Queue The Zend_Queue object that created this class
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        parent::__construct($options);
-
-        $options = &$this->_options['driverOptions'];
-        if (!array_key_exists('scheme', $options)) {
-            $options['scheme'] = self::DEFAULT_SCHEME;
-        }
-        if (!array_key_exists('host', $options)) {
-            $options['host'] = self::DEFAULT_HOST;
-        }
-        if (!array_key_exists('port', $options)) {
-            $options['port'] = self::DEFAULT_PORT;
-        }
-
-        if (array_key_exists('stompClient', $options)) {
-            $this->_client = $options['stompClient'];
-        } else {
-            $this->_client = new Zend_Queue_Stomp_Client($options['scheme'], $options['host'], $options['port']);
-        }
-
-        $connect = $this->_client->createFrame();
-
-        // Username and password are optional on some messaging servers
-        // such as Apache's ActiveMQ
-        $connect->setCommand('CONNECT');
-        if (isset($options['username'])) {
-            $connect->setHeader('login', $options['username']);
-            $connect->setHeader('passcode', $options['password']);
-        }
-
-        $response = $this->_client->send($connect)->receive();
-
-        if ((false !== $response)
-            && ($response->getCommand() != 'CONNECTED')
-        ) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Unable to authenticate to '".$options['scheme'].'://'.$options['host'].':'.$options['port']."'");
-        }
-    }
-
-    /**
-     * Close the socket explicitly when destructed
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        // Gracefully disconnect
-        $frame = $this->_client->createFrame();
-        $frame->setCommand('DISCONNECT');
-        $this->_client->send($frame);
-        unset($this->_client);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * @param  string  $name    queue name
-     * @param  integer $timeout default visibility timeout
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function create($name, $timeout=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this));
-    }
-
-    /**
-     * Delete a queue and all of its messages
-     *
-     * @param  string $name queue name
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function delete($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this));
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        $frame = $this->_client->createFrame();
-        $frame->setCommand('ACK');
-        $frame->setHeader('message-id', $message->handle);
-
-        $this->_client->send($frame);
-
-        return true;
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function getQueues()
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('getQueues() is not supported in this adapter');
-    }
-
-    /**
-     * Return the first element in the queue
-     *
-     * @param  integer    $maxMessages
-     * @param  integer    $timeout
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message_Iterator
-     */
-    public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null)
-    {
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-        if ($timeout === null) {
-            $timeout = self::RECEIVE_TIMEOUT_DEFAULT;
-        }
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        // read
-        $data = array();
-
-        // signal that we are reading
-        $frame = $this->_client->createFrame();
-        $frame->setCommand('SUBSCRIBE');
-        $frame->setHeader('destination', $queue->getName());
-        $frame->setHeader('ack','client');
-        $this->_client->send($frame);
-
-        if ($maxMessages > 0) {
-            if ($this->_client->canRead()) {
-                for ($i = 0; $i < $maxMessages; $i++) {
-                    $response = $this->_client->receive();
-
-                    switch ($response->getCommand()) {
-                        case 'MESSAGE':
-                            $datum = array(
-                                'message_id' => $response->getHeader('message-id'),
-                                'handle'     => $response->getHeader('message-id'),
-                                'body'       => $response->getBody(),
-                                'md5'        => md5($response->getBody())
-                            );
-                            $data[] = $datum;
-                            break;
-                        default:
-                            $block = print_r($response, true);
-                            require_once 'Zend/Queue/Exception.php';
-                            throw new Zend_Queue_Exception('Invalid response received: ' . $block);
-                    }
-                }
-            }
-        }
-
-        $options = array(
-            'queue'        => $queue,
-            'data'         => $data,
-            'messageClass' => $queue->getMessageClass()
-        );
-
-        $classname = $queue->getMessageSetClass();
-
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Push an element onto the end of the queue
-     *
-     * @param  string     $message message to send to the queue
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message
-     */
-    public function send($message, Zend_Queue $queue=null)
-    {
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        $frame = $this->_client->createFrame();
-        $frame->setCommand('SEND');
-        $frame->setHeader('destination', $queue->getName());
-        $frame->setHeader('content-length', strlen($message));
-        $frame->setBody((string) $message);
-        $this->_client->send($frame);
-
-        $data = array(
-            'message_id' => null,
-            'body'       => $message,
-            'md5'        => md5($message),
-            'handle'     => null
-        );
-
-        $options = array(
-            'queue' => $queue,
-            'data'  => $data
-        );
-
-        $classname = $queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Returns the length of the queue
-     *
-     * @param  Zend_Queue $queue
-     * @return integer
-     * @throws Zend_Queue_Exception (not supported)
-     */
-    public function count(Zend_Queue $queue=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('count() is not supported in this adapter');
-    }
-
-    /**
-     * Does a queue already exist?
-     *
-     * @param  string $name
-     * @return boolean
-     * @throws Zend_Queue_Exception (not supported)
-     */
-    public function isExists($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('isExists() is not supported in this adapter');
-    }
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'create'        => false,
-            'delete'        => false,
-            'send'          => true,
-            'receive'       => true,
-            'deleteMessage' => true,
-            'getQueues'     => false,
-            'count'         => false,
-            'isExists'      => false,
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/AdapterAbstract.php b/airtime_mvc/library/Zend/Queue/Adapter/AdapterAbstract.php
deleted file mode 100644
index 98f7463cf..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/AdapterAbstract.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue
- */
-require_once 'Zend/Queue.php';
-
-/**
- * @see Zend_Queue_Adapter_AdapterInterface
- */
-require_once 'Zend/Queue/Adapter/AdapterInterface.php';
-
-/**
- * Class for connecting to queues performing common operations.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Queue_Adapter_AdapterAbstract
-    implements Zend_Queue_Adapter_AdapterInterface
-{
-    /**
-     * Default timeout for createQueue() function
-     */
-    const CREATE_TIMEOUT_DEFAULT = 30;
-
-    /**
-     * Default timeout for recieve() function
-     */
-    const RECEIVE_TIMEOUT_DEFAULT = 30;
-
-    /**
-     * User-provided options
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Internal array of queues to save on lookups
-     *
-     * @var array
-     */
-    protected $_queues = array();
-
-    /**
-     * Contains the Zend_Queue that this object
-     *
-     * @var Zend_Queue_Adapter_Abstract
-     */
-    protected $_queue = null;
-
-    /**
-     * Constructor.
-     *
-     * $options is an array of key/value pairs or an instance of Zend_Config
-     * containing configuration options.  These options are common to most adapters:
-     *
-     * See the Zend_Queue Adapter Notes documentation for example configurations.
-     *
-     * Some options are used on a case-by-case basis by adapters:
-     *
-     * access_key     => (string) Amazon AWS Access Key
-     * secret_key     => (string) Amazon AWS Secret Key
-     * dbname         => (string) The name of the database to user
-     * username       => (string) Connect to the database as this username.
-     * password       => (string) Password associated with the username.
-     * host           => (string) What host to connect to, defaults to localhost
-     * port           => (string) The port of the database
-     *
-     * @param  array|Zend_Config $config An array having configuration data
-     * @param  Zend_Queue The Zend_Queue object that created this class
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        /*
-         * Verify that adapter parameters are in an array.
-         */
-        if (!is_array($options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Adapter options must be an array or Zend_Config object');
-        }
-
-        // set the queue
-        if ($queue !== null) {
-            $this->setQueue($queue);
-        }
-
-        $adapterOptions = array();
-        $driverOptions  = array();
-
-        // Normalize the options and merge with the defaults
-        if (array_key_exists('options', $options)) {
-            if (!is_array($options['options'])) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception("Configuration array 'options' must be an array");
-            }
-
-            // Can't use array_merge() because keys might be integers
-            foreach ($options['options'] as $key => $value) {
-                $adapterOptions[$key] = $value;
-            }
-        }
-        if (array_key_exists('driverOptions', $options)) {
-            // can't use array_merge() because keys might be integers
-            foreach ((array)$options['driverOptions'] as $key => $value) {
-                $driverOptions[$key] = $value;
-            }
-        }
-        $this->_options = array_merge($this->_options, $options);
-        $this->_options['options']       = $adapterOptions;
-        $this->_options['driverOptions'] = $driverOptions;
-    }
-
-    /********************************************************************
-    * Queue management functions
-     *********************************************************************/
-    /**
-     * get the Zend_Queue class that is attached to this object
-     *
-     * @return Zend_Queue|null
-     */
-    public function getQueue()
-    {
-        return $this->_queue;
-    }
-
-    /**
-     * set the Zend_Queue class for this object
-     *
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Adapter_AdapterInterface
-     */
-    public function setQueue(Zend_Queue $queue)
-    {
-        $this->_queue = $queue;
-        return $this;
-    }
-
-    /**
-     * Returns the configuration options in this adapter.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Indicates if a function is supported or not.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function isSupported($name)
-    {
-        $list = $this->getCapabilities();
-
-        return (isset($list[$name]) && $list[$name]);
-     }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/AdapterInterface.php b/airtime_mvc/library/Zend/Queue/Adapter/AdapterInterface.php
deleted file mode 100644
index e4053a3f5..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/AdapterInterface.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for common queue operations
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Queue_Adapter_AdapterInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  Zend_Queue $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null);
-
-    /**
-     * Retrieve queue instance
-     *
-     * @return Zend_Queue
-     */
-    public function getQueue();
-
-    /**
-     * Set queue instnace
-     *
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Adapter_AdapterInterface
-     */
-    public function setQueue(Zend_Queue $queue);
-
-    /**
-     * Does a queue already exist?
-     *
-     * Use isSupported('isExists') to determine if an adapter can test for
-     * queue existance.
-     *
-     * @param  string $name Queue name
-     * @return boolean
-     */
-    public function isExists($name);
-
-    /**
-     * Create a new queue
-     *
-     * Visibility timeout is how long a message is left in the queue
-     * "invisible" to other readers.  If the message is acknowleged (deleted)
-     * before the timeout, then the message is deleted.  However, if the
-     * timeout expires then the message will be made available to other queue
-     * readers.
-     *
-     * @param  string  $name Queue name
-     * @param  integer $timeout Default visibility timeout
-     * @return boolean
-     */
-    public function create($name, $timeout=null);
-
-    /**
-     * Delete a queue and all of its messages
-     *
-     * Return false if the queue is not found, true if the queue exists.
-     *
-     * @param  string $name Queue name
-     * @return boolean
-     */
-    public function delete($name);
-
-    /**
-     * Get an array of all available queues
-     *
-     * Not all adapters support getQueues(); use isSupported('getQueues')
-     * to determine if the adapter supports this feature.
-     *
-     * @return array
-     */
-    public function getQueues();
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  Zend_Queue|null $queue
-     * @return integer
-     */
-    public function count(Zend_Queue $queue = null);
-
-    /********************************************************************
-     * Messsage management functions
-     *********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  mixed $message Message to send to the active queue
-     * @param  Zend_Queue|null $queue
-     * @return Zend_Queue_Message
-     */
-    public function send($message, Zend_Queue $queue = null);
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  integer|null $maxMessages Maximum number of messages to return
-     * @param  integer|null $timeout Visibility timeout for these messages
-     * @param  Zend_Queue|null $queue
-     * @return Zend_Queue_Message_Iterator
-     */
-    public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue = null);
-
-    /**
-     * Delete a message from the queue
-     *
-     * Return true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     */
-    public function deleteMessage(Zend_Queue_Message $message);
-
-    /********************************************************************
-     * Supporting functions
-     *********************************************************************/
-
-    /**
-     * Returns the configuration options in this adapter.
-     *
-     * @return array
-     */
-    public function getOptions();
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @return array
-     */
-    public function getCapabilities();
-
-    /**
-     * Indicates if a function is supported or not.
-     *
-     * @param  string $name Function name
-     * @return boolean
-     */
-    public function isSupported($name);
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Array.php b/airtime_mvc/library/Zend/Queue/Adapter/Array.php
deleted file mode 100644
index 107a1becd..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Array.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * Class for using a standard PHP array as a queue
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract
-{
-    /**
-     * @var array
-     */
-    protected $_data = array();
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  Zend_Queue|null $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        parent::__construct($options, $queue);
-    }
-
-    /********************************************************************
-    * Queue management functions
-     *********************************************************************/
-
-    /**
-     * Does a queue already exist?
-     *
-     * Throws an exception if the adapter cannot determine if a queue exists.
-     * use isSupported('isExists') to determine if an adapter can test for
-     * queue existance.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function isExists($name)
-    {
-        return array_key_exists($name, $this->_data);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * Visibility timeout is how long a message is left in the queue "invisible"
-     * to other readers.  If the message is acknowleged (deleted) before the
-     * timeout, then the message is deleted.  However, if the timeout expires
-     * then the message will be made available to other queue readers.
-     *
-     * @param  string  $name    queue name
-     * @param  integer $timeout default visibility timeout
-     * @return boolean
-     */
-    public function create($name, $timeout=null)
-    {
-        if ($this->isExists($name)) {
-            return false;
-        }
-        if ($timeout === null) {
-            $timeout = self::CREATE_TIMEOUT_DEFAULT;
-        }
-        $this->_data[$name] = array();
-
-        return true;
-    }
-
-    /**
-     * Delete a queue and all of it's messages
-     *
-     * Returns false if the queue is not found, true if the queue exists
-     *
-     * @param  string  $name queue name
-     * @return boolean
-     */
-    public function delete($name)
-    {
-        $found = isset($this->_data[$name]);
-
-        if ($found) {
-            unset($this->_data[$name]);
-        }
-
-        return $found;
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * Not all adapters support getQueues(), use isSupported('getQueues')
-     * to determine if the adapter supports this feature.
-     *
-     * @return array
-     */
-    public function getQueues()
-    {
-        return array_keys($this->_data);
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  Zend_Queue $queue
-     * @return integer
-     * @throws Zend_Queue_Exception
-     */
-    public function count(Zend_Queue $queue=null)
-    {
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        if (!isset($this->_data[$queue->getName()])) {
-            /**
-             * @see Zend_Queue_Exception
-             */
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue does not exist');
-        }
-
-        return count($this->_data[$queue->getName()]);
-    }
-
-    /********************************************************************
-    * Messsage management functions
-     *********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  string     $message Message to send to the active queue
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message
-     * @throws Zend_Queue_Exception
-     */
-    public function send($message, Zend_Queue $queue=null)
-    {
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        if (!$this->isExists($queue->getName())) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName());
-        }
-
-        // create the message
-        $data = array(
-            'message_id' => md5(uniqid(rand(), true)),
-            'body'       => $message,
-            'md5'        => md5($message),
-            'handle'     => null,
-            'created'    => time(),
-            'queue_name' => $queue->getName(),
-        );
-
-        // add $data to the "queue"
-        $this->_data[$queue->getName()][] = $data;
-
-        $options = array(
-            'queue' => $queue,
-            'data'  => $data,
-        );
-
-        $classname = $queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  integer    $maxMessages  Maximum number of messages to return
-     * @param  integer    $timeout      Visibility timeout for these messages
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message_Iterator
-     */
-    public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue = null)
-    {
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-        if ($timeout === null) {
-            $timeout = self::RECEIVE_TIMEOUT_DEFAULT;
-        }
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        $data       = array();
-        if ($maxMessages > 0) {
-            $start_time = microtime(true);
-
-            $count = 0;
-            $temp = &$this->_data[$queue->getName()];
-            foreach ($temp as $key=>&$msg) {
-                // count check has to be first, as someone can ask for 0 messages
-                // ZF-7650
-                if ($count >= $maxMessages) {
-                    break;
-                }
-
-                if (($msg['handle'] === null)
-                    || ($msg['timeout'] + $timeout < $start_time)
-                ) {
-                    $msg['handle']  = md5(uniqid(rand(), true));
-                    $msg['timeout'] = microtime(true);
-                    $data[] = $msg;
-                    $count++;
-                }
-
-            }
-        }
-
-        $options = array(
-            'queue'        => $queue,
-            'data'         => $data,
-            'messageClass' => $queue->getMessageClass(),
-        );
-
-        $classname = $queue->getMessageSetClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        // load the queue
-        $queue = &$this->_data[$message->queue_name];
-
-        foreach ($queue as $key => &$msg) {
-            if ($msg['handle'] == $message->handle) {
-                unset($queue[$key]);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /********************************************************************
-     * Supporting functions
-     *********************************************************************/
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'create'        => true,
-            'delete'        => true,
-            'send'          => true,
-            'receive'       => true,
-            'deleteMessage' => true,
-            'getQueues'     => true,
-            'count'         => true,
-            'isExists'      => true,
-        );
-    }
-
-    /********************************************************************
-    * Functions that are not part of the Zend_Queue_Adapter_Abstract
-     *********************************************************************/
-
-    /**
-     * serialize
-     */
-    public function __sleep()
-    {
-        return array('_data');
-    }
-
-    /*
-     * These functions are debug helpers.
-     */
-
-    /**
-     * returns underlying _data array
-     * $queue->getAdapter()->getData();
-     *
-     * @return $this;
-     */
-    public function getData()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * sets the underlying _data array
-     * $queue->getAdapter()->setData($data);
-     *
-     * @param $data array
-     * @return $this;
-     */
-    public function setData($data)
-    {
-        $this->_data = $data;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db.php b/airtime_mvc/library/Zend/Queue/Adapter/Db.php
deleted file mode 100644
index 542c673e9..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * @see Zend_Db_Select
- */
-require_once 'Zend/Db/Select.php';
-
-/**
- * @see Zend_Db
- */
-require_once 'Zend/Db.php';
-
-/**
- * @see Zend_Queue_Adapter_Db_Queue
- */
-require_once 'Zend/Queue/Adapter/Db/Queue.php';
-
-/**
- * @see Zend_Queue_Adapter_Db_Message
- */
-require_once 'Zend/Queue/Adapter/Db/Message.php';
-
-/**
- * Class for using connecting to a Zend_Db-based queuing system
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract
-{
-    /**
-     * @var Zend_Queue_Adapter_Db_Queue
-     */
-    protected $_queueTable = null;
-
-    /**
-     * @var Zend_Queue_Adapter_Db_Message
-     */
-    protected $_messageTable = null;
-
-    /**
-     * @var Zend_Db_Table_Row_Abstract
-     */
-    protected $_messageRow = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  Zend_Queue|null $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        parent::__construct($options, $queue);
-
-        if (!isset($this->_options['options'][Zend_Db_Select::FOR_UPDATE])) {
-            // turn off auto update by default
-            $this->_options['options'][Zend_Db_Select::FOR_UPDATE] = false;
-        }
-
-        if (!is_bool($this->_options['options'][Zend_Db_Select::FOR_UPDATE])) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Options array item: Zend_Db_Select::FOR_UPDATE must be boolean');
-        }
-
-        if (isset($this->_options['dbAdapter'])
-            && $this->_options['dbAdapter'] instanceof Zend_Db_Adapter_Abstract) {
-            $db = $this->_options['dbAdapter'];
-        } else {
-            $db = $this->_initDbAdapter();
-        }
-
-        $this->_queueTable = new Zend_Queue_Adapter_Db_Queue(array(
-            'db' => $db,
-        ));
-
-        $this->_messageTable = new Zend_Queue_Adapter_Db_Message(array(
-            'db' => $db,
-        ));
-
-    }
-
-    /**
-     * Initialize Db adapter using 'driverOptions' section of the _options array
-     *
-     * Throws an exception if the adapter cannot connect to DB.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     * @throws Zend_Queue_Exception
-     */
-    protected function _initDbAdapter()
-    {
-        $options = &$this->_options['driverOptions'];
-        if (!array_key_exists('type', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Configuration array must have a key for 'type' for the database type to use");
-        }
-
-        if (!array_key_exists('host', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Configuration array must have a key for 'host' for the host to use");
-        }
-
-        if (!array_key_exists('username', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Configuration array must have a key for 'username' for the username to use");
-        }
-
-        if (!array_key_exists('password', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Configuration array must have a key for 'password' for the password to use");
-        }
-
-        if (!array_key_exists('dbname', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Configuration array must have a key for 'dbname' for the database to use");
-        }
-
-        $type = $options['type'];
-        unset($options['type']);
-
-        try {
-            $db = Zend_Db::factory($type, $options);
-        } catch (Zend_Db_Exception $e) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Error connecting to database: ' . $e->getMessage(), $e->getCode(), $e);
-        }
-
-        return $db;
-    }
-
-    /********************************************************************
-     * Queue management functions
-     *********************************************************************/
-
-    /**
-     * Does a queue already exist?
-     *
-     * Throws an exception if the adapter cannot determine if a queue exists.
-     * use isSupported('isExists') to determine if an adapter can test for
-     * queue existance.
-     *
-     * @param  string $name
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function isExists($name)
-    {
-        $id = 0;
-
-        try {
-            $id = $this->getQueueId($name);
-        } catch (Zend_Queue_Exception $e) {
-            return false;
-        }
-
-        return ($id > 0);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * Visibility timeout is how long a message is left in the queue "invisible"
-     * to other readers.  If the message is acknowleged (deleted) before the
-     * timeout, then the message is deleted.  However, if the timeout expires
-     * then the message will be made available to other queue readers.
-     *
-     * @param  string  $name    queue name
-     * @param  integer $timeout default visibility timeout
-     * @return boolean
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function create($name, $timeout = null)
-    {
-        if ($this->isExists($name)) {
-            return false;
-        }
-
-        $queue = $this->_queueTable->createRow();
-        $queue->queue_name = $name;
-        $queue->timeout    = ($timeout === null) ? self::CREATE_TIMEOUT_DEFAULT : (int)$timeout;
-
-        try {
-            if ($queue->save()) {
-                return true;
-            }
-        } catch (Exception $e) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        return false;
-    }
-
-    /**
-     * Delete a queue and all of it's messages
-     *
-     * Returns false if the queue is not found, true if the queue exists
-     *
-     * @param  string  $name queue name
-     * @return boolean
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function delete($name)
-    {
-        $id = $this->getQueueId($name); // get primary key
-
-        // if the queue does not exist then it must already be deleted.
-        $list = $this->_queueTable->find($id);
-        if (count($list) === 0) {
-            return false;
-        }
-        $queue = $list->current();
-
-        if ($queue instanceof Zend_Db_Table_Row_Abstract) {
-            try {
-                $queue->delete();
-            } catch (Exception $e) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-
-        if (array_key_exists($name, $this->_queues)) {
-            unset($this->_queues[$name]);
-        }
-
-        return true;
-    }
-
-    /*
-     * Get an array of all available queues
-     *
-     * Not all adapters support getQueues(), use isSupported('getQueues')
-     * to determine if the adapter supports this feature.
-     *
-     * @return array
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function getQueues()
-    {
-        $query = $this->_queueTable->select();
-        $query->from($this->_queueTable, array('queue_id', 'queue_name'));
-
-        $this->_queues = array();
-        foreach ($this->_queueTable->fetchAll($query) as $queue) {
-            $this->_queues[$queue->queue_name] = (int)$queue->queue_id;
-        }
-
-        $list = array_keys($this->_queues);
-
-        return $list;
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  Zend_Queue $queue
-     * @return integer
-     * @throws Zend_Queue_Exception
-     */
-    public function count(Zend_Queue $queue = null)
-    {
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        $info  = $this->_messageTable->info();
-        $db    = $this->_messageTable->getAdapter();
-        $query = $db->select();
-        $query->from($info['name'], array(new Zend_Db_Expr('COUNT(1)')))
-              ->where('queue_id=?', $this->getQueueId($queue->getName()));
-
-        // return count results
-        return (int) $db->fetchOne($query);
-    }
-
-    /********************************************************************
-    * Messsage management functions
-     *********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  string     $message Message to send to the active queue
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function send($message, Zend_Queue $queue = null)
-    {
-        if ($this->_messageRow === null) {
-            $this->_messageRow = $this->_messageTable->createRow();
-        }
-
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        if (is_scalar($message)) {
-            $message = (string) $message;
-        }
-        if (is_string($message)) {
-            $message = trim($message);
-        }
-
-        if (!$this->isExists($queue->getName())) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName());
-        }
-
-        $msg           = clone $this->_messageRow;
-        $msg->queue_id = $this->getQueueId($queue->getName());
-        $msg->created  = time();
-        $msg->body     = $message;
-        $msg->md5      = md5($message);
-        // $msg->timeout = ??? @TODO
-
-        try {
-            $msg->save();
-        } catch (Exception $e) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $options = array(
-            'queue' => $queue,
-            'data'  => $msg->toArray(),
-        );
-
-        $classname = $queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  integer    $maxMessages  Maximum number of messages to return
-     * @param  integer    $timeout      Visibility timeout for these messages
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message_Iterator
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue = null)
-    {
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-        if ($timeout === null) {
-            $timeout = self::RECEIVE_TIMEOUT_DEFAULT;
-        }
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        $msgs      = array();
-        $info      = $this->_messageTable->info();
-        $microtime = microtime(true); // cache microtime
-        $db        = $this->_messageTable->getAdapter();
-
-        // start transaction handling
-        try {
-            if ( $maxMessages > 0 ) { // ZF-7666 LIMIT 0 clause not included.
-                $db->beginTransaction();
-
-                $query = $db->select();
-                if ($this->_options['options'][Zend_Db_Select::FOR_UPDATE]) {
-                    // turn on forUpdate
-                    $query->forUpdate();
-                }
-                $query->from($info['name'], array('*'))
-                      ->where('queue_id=?', $this->getQueueId($queue->getName()))
-                      ->where('handle IS NULL OR timeout+' . (int)$timeout . ' < ' . (int)$microtime)
-                      ->limit($maxMessages);
-
-                foreach ($db->fetchAll($query) as $data) {
-                    // setup our changes to the message
-                    $data['handle'] = md5(uniqid(rand(), true));
-
-                    $update = array(
-                        'handle'  => $data['handle'],
-                        'timeout' => $microtime,
-                    );
-
-                    // update the database
-                    $where   = array();
-                    $where[] = $db->quoteInto('message_id=?', $data['message_id']);
-                    $where[] = 'handle IS NULL OR timeout+' . (int)$timeout . ' < ' . (int)$microtime;
-
-                    $count = $db->update($info['name'], $update, $where);
-
-                    // we check count to make sure no other thread has gotten
-                    // the rows after our select, but before our update.
-                    if ($count > 0) {
-                        $msgs[] = $data;
-                    }
-                }
-                $db->commit();
-            }
-        } catch (Exception $e) {
-            $db->rollBack();
-
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        $options = array(
-            'queue'        => $queue,
-            'data'         => $msgs,
-            'messageClass' => $queue->getMessageClass(),
-        );
-
-        $classname = $queue->getMessageSetClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     * @throws Zend_Queue_Exception - database error
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        $db    = $this->_messageTable->getAdapter();
-        $where = $db->quoteInto('handle=?', $message->handle);
-
-        if ($this->_messageTable->delete($where)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /********************************************************************
-     * Supporting functions
-     *********************************************************************/
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'create'        => true,
-            'delete'        => true,
-            'send'          => true,
-            'receive'       => true,
-            'deleteMessage' => true,
-            'getQueues'     => true,
-            'count'         => true,
-            'isExists'      => true,
-        );
-    }
-
-    /********************************************************************
-     * Functions that are not part of the Zend_Queue_Adapter_Abstract
-     *********************************************************************/
-    /**
-     * Get the queue ID
-     *
-     * Returns the queue's row identifier.
-     *
-     * @param  string       $name
-     * @return integer|null
-     * @throws Zend_Queue_Exception
-     */
-    protected function getQueueId($name)
-    {
-        if (array_key_exists($name, $this->_queues)) {
-            return $this->_queues[$name];
-        }
-
-        $query = $this->_queueTable->select();
-        $query->from($this->_queueTable, array('queue_id'))
-              ->where('queue_name=?', $name);
-
-        $queue = $this->_queueTable->fetchRow($query);
-
-        if ($queue === null) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue does not exist: ' . $name);
-        }
-
-        $this->_queues[$name] = (int)$queue->queue_id;
-
-        return $this->_queues[$name];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db/Message.php b/airtime_mvc/library/Zend/Queue/Adapter/Db/Message.php
deleted file mode 100644
index d50ea5d36..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db/Message.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once 'Zend/Db/Table/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Db_Message extends Zend_Db_Table_Abstract
-{
-    /**
-     * @var string
-     */
-    protected $_name = 'message';
-
-    /**
-     * @var string
-     */
-    protected $_primary = 'message_id';
-
-    /**
-     * @var mixed
-     */
-    protected $_sequence = true;
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db/Queue.php b/airtime_mvc/library/Zend/Queue/Adapter/Db/Queue.php
deleted file mode 100644
index 215e3f77d..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db/Queue.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once 'Zend/Db/Table/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Db_Queue extends Zend_Db_Table_Abstract
-{
-    /**
-     * @var string
-     */
-    protected $_name = 'queue';
-
-    /**
-     * @var string
-     */
-    protected $_primary = 'queue_id';
-
-    /**
-     * @var mixed
-     */
-    protected $_sequence = true;
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db/mysql.sql b/airtime_mvc/library/Zend/Queue/Adapter/Db/mysql.sql
deleted file mode 100644
index 2249971d7..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db/mysql.sql
+++ /dev/null
@@ -1,75 +0,0 @@
--- phpMyAdmin SQL Dump
--- version 2.11.6
--- http://www.phpmyadmin.net
---
--- Host: localhost:3306
--- Generation Time: Jun 19, 2008 at 08:09 PM
--- Server version: 5.0.51
--- PHP Version: 5.2.3
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-/*
-Sample grant for MySQL
-
-GRANT DELETE, INSERT, SELECT, UPDATE ON queue.* TO 'queue'@'127.0.0.1' IDENTIFIED BY '[CHANGE ME]';
-mysql -u queue -h 127.0.0.1 -p queue
-
-mysqlaccess queue queue --superuser=root -H 127.0.0.1
-
-
-*/
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: `queue`
---
-
--- --------------------------------------------------------
-
---
--- Table structure for table `message`
---
-
-DROP TABLE IF EXISTS `message`;
-CREATE TABLE IF NOT EXISTS `message` (
-  `message_id` bigint(20) unsigned NOT NULL auto_increment,
-  `queue_id` int(10) unsigned NOT NULL,
-  `handle` char(32) default NULL,
-  `body` varchar(8192) NOT NULL,
-  `md5` char(32) NOT NULL,
-  `timeout` decimal(14,4) unsigned default NULL,
-  `created` int(10) unsigned NOT NULL,
-  PRIMARY KEY  (`message_id`),
-  UNIQUE KEY `message_handle` (`handle`),
-  KEY `message_queueid` (`queue_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `queue`
---
-
-DROP TABLE IF EXISTS `queue`;
-CREATE TABLE IF NOT EXISTS `queue` (
-  `queue_id` int(10) unsigned NOT NULL auto_increment,
-  `queue_name` varchar(100) NOT NULL,
-  `timeout` smallint(5) unsigned NOT NULL default '30',
-  PRIMARY KEY  (`queue_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
---
--- Constraints for dumped tables
---
-
---
--- Constraints for table `message`
---
-ALTER TABLE `message`
-  ADD CONSTRAINT `message_ibfk_1` FOREIGN KEY (`queue_id`) REFERENCES `queue` (`queue_id`) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db/postgresql.sql b/airtime_mvc/library/Zend/Queue/Adapter/Db/postgresql.sql
deleted file mode 100644
index 333790f3a..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db/postgresql.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Sample grant for PostgreSQL
-
-CREATE ROLE queue LOGIN
-  PASSWORD '[CHANGE ME]'
-  NOSUPERUSER NOINHERIT NOCREATEDB NOCREATEROLE;
-
-*/
-
---
--- Table structure for table `queue`
---
-
-DROP TABLE IF EXISTS queue;
-
-CREATE TABLE queue
-(
-  queue_id serial NOT NULL,
-  queue_name character varying(100) NOT NULL,
-  timeout smallint NOT NULL DEFAULT 30,
-  CONSTRAINT queue_pk PRIMARY KEY (queue_id)
-)
-WITH (OIDS=FALSE);
-ALTER TABLE queue OWNER TO queue;
-
-
--- --------------------------------------------------------
---
--- Table structure for table `message`
---
-
-DROP TABLE IF EXISTS message;
-
-CREATE TABLE message
-(
-  message_id bigserial NOT NULL,
-  queue_id integer,
-  handle character(32),
-  body character varying(8192) NOT NULL,
-  md5 character(32) NOT NULL,
-  timeout real,
-  created integer,
-  CONSTRAINT message_pk PRIMARY KEY (message_id),
-  CONSTRAINT message_ibfk_1 FOREIGN KEY (queue_id)
-      REFERENCES queue (queue_id) MATCH SIMPLE
-      ON UPDATE CASCADE ON DELETE CASCADE
-)
-WITH (OIDS=FALSE);
-ALTER TABLE message OWNER TO queue;
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Db/queue_sqlite.sql b/airtime_mvc/library/Zend/Queue/Adapter/Db/queue_sqlite.sql
deleted file mode 100644
index 7d96ab012..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Db/queue_sqlite.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Sample grant for SQLite
-
-CREATE ROLE queue LOGIN
-  PASSWORD '[CHANGE ME]'
-  NOSUPERUSER NOINHERIT NOCREATEDB NOCREATEROLE;
-
-*/
-
---
--- Table structure for table `queue`
---
-
-CREATE TABLE queue
-(
-  queue_id INTEGER PRIMARY KEY AUTOINCREMENT,
-  queue_name VARCHAR(100) NOT NULL,
-  timeout INTEGER NOT NULL DEFAULT 30
-);
-
-
-
-
--- --------------------------------------------------------
---
--- Table structure for table `message`
---
-
-CREATE TABLE message
-(
-  message_id INTEGER PRIMARY KEY AUTOINCREMENT,
-  queue_id INTEGER PRIMARY KEY,
-  handle CHAR(32),
-  body VARCHAR(8192) NOT NULL,
-  md5 CHAR(32) NOT NULL,
-  timeout REAL,
-  created INTEGER,
-  FOREIGN KEY (queue_id) REFERENCES queue(queue_id)
-);
-
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Memcacheq.php b/airtime_mvc/library/Zend/Queue/Adapter/Memcacheq.php
deleted file mode 100644
index 88d6b4473..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Memcacheq.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Memcacheq.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * Class for using connecting to a Zend_Cache-based queuing system
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract
-{
-    const DEFAULT_HOST = '127.0.0.1';
-    const DEFAULT_PORT = 22201;
-    const EOL          = "\r\n";
-
-    /**
-     * @var Memcache
-     */
-    protected $_cache = null;
-
-    /**
-     * @var string
-     */
-    protected $_host = null;
-
-    /**
-     * @var integer
-     */
-    protected $_port = null;
-
-    /**
-     * @var resource
-     */
-    protected $_socket = null;
-
-    /********************************************************************
-    * Constructor / Destructor
-     *********************************************************************/
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  null|Zend_Queue $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        if (!extension_loaded('memcache')) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Memcache extension does not appear to be loaded');
-        }
-
-        parent::__construct($options, $queue);
-
-        $options = &$this->_options['driverOptions'];
-
-        if (!array_key_exists('host', $options)) {
-            $options['host'] = self::DEFAULT_HOST;
-        }
-        if (!array_key_exists('port', $options)) {
-            $options['port'] = self::DEFAULT_PORT;
-        }
-
-        $this->_cache = new Memcache();
-
-        $result = $this->_cache->connect($options['host'], $options['port']);
-
-        if ($result === false) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Could not connect to MemcacheQ');
-        }
-
-        $this->_host = $options['host'];
-        $this->_port = (int)$options['port'];
-    }
-
-    /**
-     * Destructor
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        if ($this->_cache instanceof Memcache) {
-            $this->_cache->close();
-        }
-        if (is_resource($this->_socket)) {
-            $cmd = 'quit' . self::EOL;
-            fwrite($this->_socket, $cmd);
-            fclose($this->_socket);
-        }
-    }
-
-    /********************************************************************
-     * Queue management functions
-     *********************************************************************/
-
-    /**
-     * Does a queue already exist?
-     *
-     * Throws an exception if the adapter cannot determine if a queue exists.
-     * use isSupported('isExists') to determine if an adapter can test for
-     * queue existance.
-     *
-     * @param  string $name
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function isExists($name)
-    {
-        if (empty($this->_queues)) {
-            $this->getQueues();
-        }
-
-        return in_array($name, $this->_queues);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * Visibility timeout is how long a message is left in the queue "invisible"
-     * to other readers.  If the message is acknowleged (deleted) before the
-     * timeout, then the message is deleted.  However, if the timeout expires
-     * then the message will be made available to other queue readers.
-     *
-     * @param  string  $name    queue name
-     * @param  integer $timeout default visibility timeout
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function create($name, $timeout=null)
-    {
-        if ($this->isExists($name)) {
-            return false;
-        }
-        if ($timeout === null) {
-            $timeout = self::CREATE_TIMEOUT_DEFAULT;
-        }
-
-        // MemcacheQ does not have a method to "create" a queue
-        // queues are created upon sending a packet.
-        // We cannot use the send() and receive() functions because those
-        // depend on the current name.
-        $result = $this->_cache->set($name, 'creating queue', 0, 15);
-        $result = $this->_cache->get($name);
-
-        $this->_queues[] = $name;
-
-        return true;
-    }
-
-    /**
-     * Delete a queue and all of it's messages
-     *
-     * Returns false if the queue is not found, true if the queue exists
-     *
-     * @param  string  $name queue name
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function delete($name)
-    {
-        $response = $this->_sendCommand('delete ' . $name, array('DELETED', 'NOT_FOUND'), true);
-
-        if (in_array('DELETED', $response)) {
-            $key = array_search($name, $this->_queues);
-
-            if ($key !== false) {
-                unset($this->_queues[$key]);
-            }
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * Not all adapters support getQueues(), use isSupported('getQueues')
-     * to determine if the adapter supports this feature.
-     *
-     * @return array
-     * @throws Zend_Queue_Exception
-     */
-    public function getQueues()
-    {
-        $this->_queues = array();
-
-        $response = $this->_sendCommand('stats queue', array('END'));
-
-        foreach ($response as $i => $line) {
-            $this->_queues[] = str_replace('STAT ', '', $line);
-        }
-
-        return $this->_queues;
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  Zend_Queue $queue
-     * @return integer
-     * @throws Zend_Queue_Exception (not supported)
-     */
-    public function count(Zend_Queue $queue=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('count() is not supported in this adapter');
-    }
-
-    /********************************************************************
-     * Messsage management functions
-     *********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  string     $message Message to send to the active queue
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message
-     * @throws Zend_Queue_Exception
-     */
-    public function send($message, Zend_Queue $queue=null)
-    {
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        if (!$this->isExists($queue->getName())) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName());
-        }
-
-        $message = (string) $message;
-        $data    = array(
-            'message_id' => md5(uniqid(rand(), true)),
-            'handle'     => null,
-            'body'       => $message,
-            'md5'        => md5($message),
-        );
-
-        $result = $this->_cache->set($queue->getName(), $message, 0, 0);
-        if ($result === false) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('failed to insert message into queue:' . $queue->getName());
-        }
-
-        $options = array(
-            'queue' => $queue,
-            'data'  => $data,
-        );
-
-        $classname = $queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  integer    $maxMessages  Maximum number of messages to return
-     * @param  integer    $timeout      Visibility timeout for these messages
-     * @param  Zend_Queue $queue
-     * @return Zend_Queue_Message_Iterator
-     * @throws Zend_Queue_Exception
-     */
-    public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null)
-    {
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-
-        if ($timeout === null) {
-            $timeout = self::RECEIVE_TIMEOUT_DEFAULT;
-        }
-        if ($queue === null) {
-            $queue = $this->_queue;
-        }
-
-        $msgs = array();
-        if ($maxMessages > 0 ) {
-            for ($i = 0; $i < $maxMessages; $i++) {
-                $data = array(
-                    'handle' => md5(uniqid(rand(), true)),
-                    'body'   => $this->_cache->get($queue->getName()),
-                );
-
-                $msgs[] = $data;
-            }
-        }
-
-        $options = array(
-            'queue'        => $queue,
-            'data'         => $msgs,
-            'messageClass' => $queue->getMessageClass(),
-        );
-
-        $classname = $queue->getMessageSetClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     * @throws Zend_Queue_Exception (unsupported)
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('deleteMessage() is not supported in  ' . get_class($this));
-    }
-
-    /********************************************************************
-     * Supporting functions
-     *********************************************************************/
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'create'        => true,
-            'delete'        => true,
-            'send'          => true,
-            'receive'       => true,
-            'deleteMessage' => false,
-            'getQueues'     => true,
-            'count'         => false,
-            'isExists'      => true,
-        );
-    }
-
-    /********************************************************************
-     * Functions that are not part of the Zend_Queue_Adapter_Abstract
-     *********************************************************************/
-
-    /**
-     * sends a command to MemcacheQ
-     *
-     * The memcache functions by php cannot handle all types of requests
-     * supported by MemcacheQ
-     * Non-standard requests are handled by this function.
-     *
-     * @param  string  $command - command to send to memcacheQ
-     * @param  array   $terminator - strings to indicate end of memcacheQ response
-     * @param  boolean $include_term - include terminator in response
-     * @return array
-     * @throws Zend_Queue_Exception if connection cannot be opened
-     */
-    protected function _sendCommand($command, array $terminator, $include_term=false)
-    {
-        if (!is_resource($this->_socket)) {
-            $this->_socket = fsockopen($this->_host, $this->_port, $errno, $errstr, 10);
-        }
-        if ($this->_socket === false) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Could not open a connection to $this->_host:$this->_port errno=$errno : $errstr");
-        }
-
-        $response = array();
-
-        $cmd = $command . self::EOL;
-        fwrite($this->_socket, $cmd);
-
-        $continue_reading = true;
-        while (!feof($this->_socket) && $continue_reading) {
-            $resp = trim(fgets($this->_socket, 1024));
-            if (in_array($resp, $terminator)) {
-                if ($include_term) {
-                    $response[] = $resp;
-                }
-                $continue_reading = false;
-            } else {
-                $response[] = $resp;
-            }
-        }
-
-        return $response;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/Null.php b/airtime_mvc/library/Zend/Queue/Adapter/Null.php
deleted file mode 100644
index eba1d0a49..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/Null.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * Class testing.  No supported functions.  Also used to disable a Zend_Queue.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract
-{
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  null|Zend_Queue $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        parent::__construct($options, $queue);
-    }
-
-    /********************************************************************
-     * Queue management functions
-     *********************************************************************/
-
-    /**
-     * Does a queue already exist?
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function isExists($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-
-    /**
-     * Create a new queue
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function create($name, $timeout=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /**
-     * Delete a queue and all of it's messages
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function delete($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function getQueues()
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function count(Zend_Queue $queue=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /********************************************************************
-     * Messsage management functions
-     *********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function send($message, Zend_Queue $queue=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * @throws Zend_Queue_Exception - not supported.
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this));
-    }
-
-    /********************************************************************
-     * Supporting functions
-     *********************************************************************/
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-        return array(
-            'create'        => false,
-            'delete'        => false,
-            'send'          => false,
-            'receive'       => false,
-            'deleteMessage' => false,
-            'getQueues'     => false,
-            'count'         => false,
-            'isExists'      => false,
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Adapter/PlatformJobQueue.php b/airtime_mvc/library/Zend/Queue/Adapter/PlatformJobQueue.php
deleted file mode 100644
index c3e69cd0e..000000000
--- a/airtime_mvc/library/Zend/Queue/Adapter/PlatformJobQueue.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlatformJobQueue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Adapter_AdapterAbstract
- */
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
-
-/**
- * Zend Platform JobQueue adapter
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbstract
-{
-    /**
-     * @var ZendApi_JobQueue
-     */
-    protected $_zendQueue;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $options
-     * @param  Zend_Queue|null $queue
-     * @return void
-     */
-    public function __construct($options, Zend_Queue $queue = null)
-    {
-        parent::__construct($options, $queue);
-
-        if (!extension_loaded("jobqueue_client")) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Platform Job Queue extension does not appear to be loaded');
-        }
-
-        if (! isset($this->_options['daemonOptions'])) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Job Queue host and password should be provided');
-        }
-
-        $options = $this->_options['daemonOptions'];
-
-        if (!array_key_exists('host', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Platform Job Queue host should be provided');
-        }
-        if (!array_key_exists('password', $options)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Platform Job Queue password should be provided');
-        }
-
-        $this->_zendQueue = new ZendApi_Queue($options['host']);
-
-        if (!$this->_zendQueue) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Platform Job Queue connection failed');
-        }
-        if (!$this->_zendQueue->login($options['password'])) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Job Queue login failed');
-        }
-
-        if ($this->_queue) {
-            $this->_queue->setMessageClass('Zend_Queue_Message_PlatformJob');
-        }
-    }
-
-    /********************************************************************
-     * Queue management functions
-     ********************************************************************/
-
-    /**
-     * Does a queue already exist?
-     *
-     * @param  string $name
-     * @return boolean
-     * @throws Zend_Queue_Exception (not supported)
-     */
-    public function isExists($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('isExists() is not supported in this adapter');
-    }
-
-    /**
-     * Create a new queue
-     *
-     * @param  string  $name    queue name
-     * @param  integer $timeout default visibility timeout
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function create($name, $timeout=null)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this));
-    }
-
-    /**
-     * Delete a queue and all of its messages
-     *
-     * @param  string $name queue name
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function delete($name)
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this));
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function getQueues()
-    {
-        require_once 'Zend/Queue/Exception.php';
-        throw new Zend_Queue_Exception('getQueues() is not supported in this adapter');
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  Zend_Queue|null $queue
-     * @return integer
-     */
-    public function count(Zend_Queue $queue = null)
-    {
-        if ($queue !== null) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue parameter is not supported');
-        }
-
-        return $this->_zendQueue->getNumOfJobsInQueue();
-    }
-
-    /********************************************************************
-     * Messsage management functions
-     ********************************************************************/
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  array | ZendAPI_job $message Message to send to the active queue
-     * @param  Zend_Queue $queue     Not supported
-     * @return Zend_Queue_Message
-     * @throws Zend_Queue_Exception
-     */
-    public function send($message, Zend_Queue $queue = null)
-    {
-        if ($queue !== null) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue parameter is not supported');
-        }
-
-        // This adapter can work only for this message type
-        $classname = $this->_queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-
-        if ($message instanceof ZendAPI_Job) {
-            $message = array('data' => $message);
-        }
-
-        $zendApiJob = new $classname($message);
-
-        // Unfortunately, the Platform JQ API is PHP4-style...
-        $platformJob = $zendApiJob->getJob();
-
-        $jobId = $this->_zendQueue->addJob($platformJob);
-
-        if (!$jobId) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Failed to add a job to queue: '
-                . $this->_zendQueue->getLastError());
-        }
-
-        $zendApiJob->setJobId($jobId);
-        return $zendApiJob;
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  integer    $maxMessages  Maximum number of messages to return
-     * @param  integer    $timeout      Ignored
-     * @param  Zend_Queue $queue        Not supported
-     * @throws Zend_Queue_Exception
-     * @return ArrayIterator
-     */
-    public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue = null)
-    {
-        if ($maxMessages === null) {
-            $maxMessages = 1;
-        }
-
-        if ($queue !== null) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Queue shouldn\'t be set');
-        }
-
-        $jobs = $this->_zendQueue->getJobsInQueue(null, $maxMessages, true);
-
-        $classname = $this->_queue->getMessageClass();
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-
-        $options = array(
-            'queue'        => $this->_queue,
-            'data'         => $jobs,
-            'messageClass' => $this->_queue->getMessageClass(),
-        );
-
-        $classname = $this->_queue->getMessageSetClass();
-
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-        return new $classname($options);
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  Zend_Queue_Message $message
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function deleteMessage(Zend_Queue_Message $message)
-    {
-        if (get_class($message) != $this->_queue->getMessageClass()) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception(
-                'Failed to remove job from the queue; only messages of type '
-                . 'Zend_Queue_Message_PlatformJob may be used'
-            );
-        }
-
-        return $this->_zendQueue->removeJob($message->getJobId());
-    }
-
-    public function isJobIdExist($id)
-    {
-         return (($this->_zendQueue->getJob($id))? true : false);
-    }
-
-    /********************************************************************
-     * Supporting functions
-     ********************************************************************/
-
-    /**
-     * Return a list of queue capabilities functions
-     *
-     * $array['function name'] = true or false
-     * true is supported, false is not supported.
-     *
-     * @param  string $name
-     * @return array
-     */
-    public function getCapabilities()
-    {
-         return array(
-            'create'                => false,
-            'delete'                => false,
-            'getQueues'             => false,
-            'isExists'              => false,
-            'count'                 => true,
-            'send'                  => true,
-            'receive'               => true,
-            'deleteMessage'         => true,
-        );
-    }
-
-    /********************************************************************
-     * Functions that are not part of the Zend_Queue_Adapter_AdapterAbstract
-     ********************************************************************/
-
-    /**
-     * Serialize
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_options');
-    }
-
-    /**
-     * Unserialize
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $options = $this->_options['daemonOptions'];
-
-        $this->_zendQueue = new ZendApi_Queue($options['host']);
-
-        if (!$this->_zendQueue) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Platform Job Queue connection failed');
-        }
-        if (!$this->_zendQueue->login($options['password'])) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Job Queue login failed');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Exception.php b/airtime_mvc/library/Zend/Queue/Exception.php
deleted file mode 100644
index efbeec8f8..000000000
--- a/airtime_mvc/library/Zend/Queue/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Queue
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Queue/Message.php b/airtime_mvc/library/Zend/Queue/Message.php
deleted file mode 100644
index cfe99b2e5..000000000
--- a/airtime_mvc/library/Zend/Queue/Message.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Class for managing queue messages
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Message
-{
-    /**
-     * The data for the queue message
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-     /**
-     * Connected is true if we have a reference to a live
-     * Zend_Queue_Adapter_Abstract object.
-     * This is false after the Message has been deserialized.
-     *
-     * @var boolean
-     */
-    protected $_connected = true;
-
-    /**
-     * Zend_Queue parent class or instance
-     *
-     * @var Zend_Queue
-     */
-    protected $_queue = null;
-
-    /**
-     * Name of the class of the Zend_Queue
-     *
-     * @var string
-     */
-    protected $_queueClass = null;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options
-     * @throws Zend_Queue_Exception
-     */
-    public function __construct(array $options = array())
-    {
-        if (isset($options['queue'])) {
-            if ($options['queue'] instanceof Zend_Queue) {
-                $this->_queue      = $options['queue'];
-                $this->_queueClass = get_class($this->_queue);
-            } else {
-                $result = gettype($options['queue']);
-                if ($result === 'object') {
-                    $result = get_class($options['queue']);
-                }
-
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception(
-                    '$options[\'queue\'] = '
-                    . $result
-                    . ': must be instanceof Zend_Queue'
-                );
-            }
-        }
-        if (isset($options['data'])) {
-            if (!is_array($options['data'])) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception('Data must be an array');
-            }
-            $this->_data = $options['data'];
-        }
-    }
-
-    /**
-     * Retrieve message field value
-     *
-     * @param  string $key The user-specified key name.
-     * @return string      The corresponding key value.
-     * @throws Zend_Queue_Exception if the $key is not a column in the message.
-     */
-    public function __get($key)
-    {
-        if (!array_key_exists($key, $this->_data)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message");
-        }
-        return $this->_data[$key];
-    }
-
-    /**
-     * Set message field value
-     *
-     * @param  string $key   The message key.
-     * @param  mixed  $value The value for the property.
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function __set($key, $value)
-    {
-        if (!array_key_exists($key, $this->_data)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message");
-        }
-        $this->_data[$key] = $value;
-    }
-
-    /**
-     * Test existence of message field
-     *
-     * @param  string  $key The column key.
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return array_key_exists($key, $this->_data);
-    }
-
-    /*
-     * Serialize
-     */
-
-    /**
-     * Store queue and data in serialized object
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_queueClass', '_data');
-    }
-
-    /**
-     * Setup to do on wakeup.
-     * A de-serialized Message should not be assumed to have access to a live
-     * queue connection, so set _connected = false.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_connected = false;
-    }
-
-     /**
-     * Returns the queue object, or null if this is disconnected message
-     *
-     * @return Zend_Queue|null
-     */
-    public function getQueue()
-    {
-        return $this->_queue;
-    }
-
-    /**
-     * Set the queue object, to re-establish a live connection
-     * to the queue for a Message that has been de-serialized.
-     *
-     * @param  Zend_Queue $queue
-     * @return boolean
-     */
-    public function setQueue(Zend_Queue $queue)
-    {
-        $queueClass        = get_class($queue);
-        $this->_queue      = $queue;
-        $this->_queueClass = $queueClass;
-        $this->_connected  = true;
-        return true;
-    }
-
-    /**
-     * Query the class name of the Queue object for which this
-     * Message was created.
-     *
-     * @return string
-     */
-    public function getQueueClass()
-    {
-        return $this->_queueClass;
-    }
-
-    /**
-     * Returns the column/value data as an array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->_data;
-    }
-
-    /**
-     * Sets all data in the row from an array.
-     *
-     * @param  array $data
-     * @return Zend_Queue_Message Provides a fluent interface
-     */
-    public function setFromArray(array $data)
-    {
-        foreach ($data as $columnName => $value) {
-            $this->$columnName = $value;
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Message/Iterator.php b/airtime_mvc/library/Zend/Queue/Message/Iterator.php
deleted file mode 100644
index 4c4279bce..000000000
--- a/airtime_mvc/library/Zend/Queue/Message/Iterator.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Message_Iterator implements Iterator, Countable
-{
-    /**
-     * The data for the queue message
-     *
-     * @var array
-     */
-    protected $_data = array();
-
-     /**
-     * Connected is true if we have a reference to a live
-     * Zend_Queue_Adapter_AdapterInterface object.
-     * This is false after the Message has been deserialized.
-     *
-     * @var boolean
-     */
-    protected $_connected = true;
-
-    /**
-     * Zend_Queue_Adapter_AdapterInterface parent class or instance
-     *
-     * @var Zend_Queue_Adapter_AdapterInterface
-     */
-    protected $_queue = null;
-
-    /**
-     * Name of the class of the Zend_Queue_Adapter_AdapterInterface object.
-     *
-     * @var string
-     */
-    protected $_queueClass = null;
-
-    /**
-     * Zend_Queue_Message class name
-     *
-     * @var string
-     */
-    protected $_messageClass = 'Zend_Queue_Message';
-
-     /**
-     * Iterator pointer.
-     *
-     * @var integer
-     */
-    protected $_pointer = 0;
-
-    /**
-     * Constructor
-     *
-     * @param  array $options ('queue', 'messageClass', 'data'=>array());
-     * @return void
-     */
-    public function __construct(array $options = array())
-    {
-        if (isset($options['queue'])) {
-            $this->_queue      = $options['queue'];
-            $this->_queueClass = get_class($this->_queue);
-            $this->_connected  = true;
-        } else {
-            $this->_connected = false;
-        }
-        if (isset($options['messageClass'])) {
-            $this->_messageClass = $options['messageClass'];
-        }
-
-        if (!is_array($options['data'])) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('array optionsuration must have $options[\'data\'] = array');
-        }
-
-        // load the message class
-        $classname = $this->_messageClass;
-        if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($classname);
-        }
-
-        // for each of the messages
-        foreach ($options['data'] as $data) {
-            // construct the message parameters
-            $message = array('data' => $data);
-
-            // If queue has not been set, then use the default.
-            if (empty($message['queue'])) {
-                $message['queue'] = $this->_queue;
-            }
-
-            // construct the message and add it to _data[];
-            $this->_data[] = new $classname($message);
-        }
-    }
-
-    /**
-     * Store queue and data in serialized object
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return array('_data', '_queueClass', '_messageClass', '_pointer');
-    }
-
-    /**
-     * Setup to do on wakeup.
-     * A de-serialized Message should not be assumed to have access to a live
-     * queue connection, so set _connected = false.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_connected = false;
-    }
-
-    /**
-     * Returns all data as an array.
-     *
-     * Used for debugging.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        // @todo This works only if we have iterated through
-        // the result set once to instantiate the messages.
-        foreach ($this->_data as $i => $message) {
-            $this->_data[$i] = $message->toArray();
-        }
-        return $this->_data;
-    }
-
-    /**
-     * Returns the queue object, or null if this is disconnected message set
-     *
-     * @return Zend_Queue|null
-     */
-    public function getQueue()
-    {
-        return $this->_queue;
-    }
-
-    /**
-     * Set the queue object, to re-establish a live connection
-     * to the queue for a Message that has been de-serialized.
-     *
-     * @param  Zend_Queue_Adapter_AdapterInterface $queue
-     * @return boolean
-     * @throws Zend_Queue_Exception
-     */
-    public function setQueue(Zend_Queue $queue)
-    {
-        $this->_queue     = $queue;
-        $this->_connected = false;
-
-        // @todo This works only if we have iterated through
-        // the result set once to instantiate the rows.
-        foreach ($this->_data as $i => $message) {
-            $this->_connected = $this->_connected || $message->setQueue($queue);
-        }
-
-        return $this->_connected;
-    }
-
-    /**
-     * Query the class name of the Queue object for which this
-     * Message was created.
-     *
-     * @return string
-     */
-    public function getQueueClass()
-    {
-        return $this->_queueClass;
-    }
-
-    /*
-     * Iterator implementation
-     */
-
-    /**
-     * Rewind the Iterator to the first element.
-     * Similar to the reset() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_pointer = 0;
-    }
-
-    /**
-     * Return the current element.
-     * Similar to the current() function for arrays in PHP
-     * Required by interface Iterator.
-     *
-     * @return Zend_Queue_Message current element from the collection
-     */
-    public function current()
-    {
-        return (($this->valid() === false)
-            ? null
-            : $this->_data[$this->_pointer]); // return the messages object
-    }
-
-    /**
-     * Return the identifying key of the current element.
-     * Similar to the key() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return integer
-     */
-    public function key()
-    {
-        return $this->_pointer;
-    }
-
-    /**
-     * Move forward to next element.
-     * Similar to the next() function for arrays in PHP.
-     * Required by interface Iterator.
-     *
-     * @return void
-     */
-    public function next()
-    {
-        ++$this->_pointer;
-    }
-
-    /**
-     * Check if there is a current element after calls to rewind() or next().
-     * Used to check if we've iterated to the end of the collection.
-     * Required by interface Iterator.
-     *
-     * @return bool False if there's nothing more to iterate over
-     */
-    public function valid()
-    {
-        return $this->_pointer < count($this);
-    }
-
-    /*
-     * Countable Implementation
-     */
-
-    /**
-     * Returns the number of elements in the collection.
-     *
-     * Implements Countable::count()
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return count($this->_data);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Message/PlatformJob.php b/airtime_mvc/library/Zend/Queue/Message/PlatformJob.php
deleted file mode 100644
index 971e861b9..000000000
--- a/airtime_mvc/library/Zend/Queue/Message/PlatformJob.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PlatformJob.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Message
- */
-require_once 'Zend/Queue/Message.php';
-
-/**
- * Class for managing Zend Platform JobQueue jobs via Zend_Queue
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Message
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Message_PlatformJob extends Zend_Queue_Message
-{
-    /**
-     * @var ZendApi_Job
-     */
-    protected $_job;
-
-    /**
-     * Job identifier
-     * @var string
-     */
-    protected $_id = null;
-
-    /**
-     * Constructor
-     *
-     * The constructor should be an array of options.
-     *
-     * If the option 'data' is provided, and is an instance of ZendApi_Job,
-     * that object will be used as the internal job; if that option is not a
-     * ZendApi_Job instance, an exception will be thrown.
-     *
-     * Alternately, you may specify the 'script' parameter, which should be a
-     * JobQueue script the job will request. A new ZendApi_Job object will then
-     * be created using that script and any options you provide.
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Queue_Exception
-     */
-    public function __construct(array $options = array())
-    {
-        if (isset($options['data'])) {
-            if (!($options['data'] instanceof ZendApi_Job)) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception('Data must be an instance of ZendApi_Job');
-            }
-            $this->_job = $options['data'];
-            parent::__construct($this->_job->getProperties());
-        } else {
-            parent::__construct($options);
-
-            if (!isset($options['script'])) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception('The script is mandatory data');
-            }
-
-            $this->_job = new ZendApi_Job($options['script']);
-            $this->_setJobProperties();
-        }
-    }
-
-    /**
-     * Set the job identifier
-     *
-     * Used within Zend_Queue only.
-     *
-     * @param  string $id
-     * @return Zend_Queue_Message_PlatformJob
-     */
-    public function setJobId($id)
-    {
-        $this->_id = $id;
-        return $this;
-    }
-
-    /**
-     * Retrieve the job identifier
-     *
-     * @return string
-     */
-    public function getJobId()
-    {
-        return (($this->_id) ?  $this->_id : $this->_job->getID());
-    }
-
-    /**
-     * Retrieve the internal ZendApi_Job instance
-     *
-     * @return ZendApi_Job
-     */
-    public function getJob()
-    {
-        return $this->_job;
-    }
-
-    /**
-     * Store queue and data in serialized object
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return serialize('_job', '_id', '_data');
-    }
-
-    /**
-     * Query the class name of the Queue object for which this
-     * Message was created.
-     *
-     * @return string
-     */
-    public function getQueueClass()
-    {
-        return 'Zend_Queue_Adapter_Platform_JQ';
-    }
-
-    /**
-     * Sets properties on the ZendApi_Job instance
-     *
-     * Any options in the {@link $_data} array will be checked. Those matching
-     * options in ZendApi_Job will be used to set those options in that
-     * instance.
-     *
-     * @return void
-     */
-    protected function _setJobProperties() {
-
-        if (isset($this->_data['script'])) {
-            $this->_job->setScript($this->_data['script']);
-        }
-
-        if (isset($this->_data['priority'])) {
-            $this->_job->setJobPriority($this->_data['priority']);
-        }
-
-        if (isset($this->_data['name'])) {
-            $this->_job->setJobName($this->_data['name']);
-        }
-
-        if (isset($this->_data['predecessor'])) {
-            $this->_job->setJobDependency($this->_data['predecessor']);
-        }
-
-        if (isset($this->_data['preserved'])) {
-            $this->_job->setPreserved($this->_data['preserved']);
-        }
-
-        if (isset($this->_data['user_variables'])) {
-            $this->_job->setUserVariables($this->_data['user_variables']);
-        }
-
-        if (!empty($this->_data['interval'])) {
-            $endTime = isset($this->_data['end_time']) ? $this->_data['end_time'] : null;
-            $this->_job->setRecurrenceData($this->_data['interval'], $endTime);
-        } elseif (isset($this->_data['interval']) && ($this->_data['interval'] === '')) {
-            $this->_job->setRecurrenceData(0,0);
-        }
-
-        if (isset($this->_data['scheduled_time'])) {
-            $this->_job->setScheduledTime($this->_data['scheduled_time']);
-        }
-
-        if (isset($this->_data['application_id'])) {
-            $this->_job->setApplicationID($this->_data['application_id']);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Stomp/Client.php b/airtime_mvc/library/Zend/Queue/Stomp/Client.php
deleted file mode 100644
index 347ebf0bc..000000000
--- a/airtime_mvc/library/Zend/Queue/Stomp/Client.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The Stomp client interacts with a Stomp server.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Stomp_Client
-{
-    /**
-     * Array of $client Zend_Queue_Stomp_Client_Interface
-     *
-     * @var array
-     */
-    protected $_connection;
-
-    /**
-     * Add a server to connections
-     *
-     * @param string scheme
-     * @param string host
-     * @param integer port
-     */
-    public function __construct(
-        $scheme = null, $host = null, $port = null,
-        $connectionClass = 'Zend_Queue_Stomp_Client_Connection',
-        $frameClass = 'Zend_Queue_Stomp_Frame'
-    ) {
-        if (($scheme !== null)
-            && ($host !== null)
-            && ($port !== null)
-        ) {
-            $this->addConnection($scheme, $host, $port, $connectionClass);
-            $this->getConnection()->setFrameClass($frameClass);
-        }
-    }
-
-    /**
-     * Shutdown
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        if ($this->getConnection()) {
-            $this->getConnection()->close(true);
-        }
-    }
-
-    /**
-     * Add a connection to this client.
-     *
-     * Attempts to add this class to the client.  Returns a boolean value
-     * indicating success of operation.
-     *
-     * You cannot add more than 1 connection to the client at this time.
-     *
-     * @param string  $scheme ['tcp', 'udp']
-     * @param string  host
-     * @param integer port
-     * @param string  class - create a connection with this class; class must support Zend_Queue_Stomp_Client_ConnectionInterface
-     * @return boolean
-     */
-    public function addConnection($scheme, $host, $port, $class = 'Zend_Queue_Stomp_Client_Connection')
-    {
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-
-        $connection = new $class();
-
-        if ($connection->open($scheme, $host, $port)) {
-            $this->setConnection($connection);
-            return true;
-        }
-
-        $connection->close();
-        return false;
-    }
-
-    /**
-     * Set client connection
-     *
-     * @param Zend_Queue_Stomp_Client_ConnectionInterface $connection
-     * @return void
-     */
-    public function setConnection(Zend_Queue_Stomp_Client_ConnectionInterface $connection)
-    {
-        $this->_connection = $connection;
-        return $this;
-    }
-
-    /**
-     * Get client connection
-     *
-     * @return Zend_Queue_Stomp_Client_ConnectionInterface|null
-     */
-    public function getConnection()
-    {
-        return $this->_connection;
-    }
-
-    /**
-     * Send a stomp frame
-     *
-     * Returns true if the frame was successfully sent.
-     *
-     * @param Zend_Queue_Stomp_FrameInterface $frame
-     * @return boolean
-     */
-    public function send(Zend_Queue_Stomp_FrameInterface $frame)
-    {
-        $this->getConnection()->write($frame);
-        return $this;
-    }
-
-    /**
-     * Receive a frame
-     *
-     * Returns a frame or false if none were to be read.
-     *
-     * @return Zend_Queue_Stomp_FrameInterface|boolean
-     */
-    public function receive()
-    {
-        return $this->getConnection()->read();
-    }
-
-    /**
-     * canRead()
-     *
-     * @return boolean
-     */
-    public function canRead()
-    {
-        return $this->getConnection()->canRead();
-    }
-
-    /**
-     * creates a frame class
-     *
-     * @return Zend_Queue_Stomp_FrameInterface
-     */
-    public function createFrame()
-    {
-        return $this->getConnection()->createFrame();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Stomp/Client/Connection.php b/airtime_mvc/library/Zend/Queue/Stomp/Client/Connection.php
deleted file mode 100644
index 21bb7819f..000000000
--- a/airtime_mvc/library/Zend/Queue/Stomp/Client/Connection.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Stomp_Client_ConnectionInterface
- */
-require_once 'Zend/Queue/Stomp/Client/ConnectionInterface.php';
-
-/**
- * The Stomp client interacts with a Stomp server.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Stomp_Client_Connection
-    implements Zend_Queue_Stomp_Client_ConnectionInterface
-{
-    const READ_TIMEOUT_DEFAULT_USEC = 0; // 0 microseconds
-    const READ_TIMEOUT_DEFAULT_SEC = 5; // 5 seconds
-
-    /**
-     * Connection options
-     * @var array
-     */
-    protected $_options;
-
-    /**
-     * tcp/udp socket
-     *
-     * @var resource
-     */
-    protected $_socket = false;
-
-    /**
-     * open() opens a socket to the Stomp server
-     *
-     * @param  array $options ('scheme', 'host', 'port')
-     * @param  string $scheme
-     * @param  string $host
-     * @param  int $port
-     * @param  array $options Accepts "timeout_sec" and "timeout_usec" keys
-     * @return true;
-     * @throws Zend_Queue_Exception
-     */
-    public function open($scheme, $host, $port, array $options = array())
-    {
-        $str = $scheme . '://' . $host;
-        $this->_socket = fsockopen($str, $port, $errno, $errstr);
-
-        if ($this->_socket === false) {
-            // aparently there is some reason that fsockopen will return false
-            // but it normally throws an error.
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception("Unable to connect to $str; error = $errstr ( errno = $errno )");
-        }
-
-        stream_set_blocking($this->_socket, 0); // non blocking
-
-        if (!isset($options['timeout_sec'])) {
-            $options['timeout_sec'] = self::READ_TIMEOUT_DEFAULT_SEC;
-        }
-        if (! isset($options['timeout_usec'])) {
-            $options['timeout_usec'] = self::READ_TIMEOUT_DEFAULT_USEC;
-        }
-
-        $this->_options = $options;
-
-        return true;
-    }
-
-    /**
-     * Close the socket explicitly when destructed
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-    }
-
-    /**
-     * Close connection
-     *
-     * @param  boolean $destructor
-     * @return void
-     */
-    public function close($destructor = false)
-    {
-        // Gracefully disconnect
-        if (!$destructor) {
-            $frame = $this->createFrame();
-            $frame->setCommand('DISCONNECT');
-            $this->write($frame);
-        }
-
-        // @todo: Should be fixed.
-        // When the socket is "closed", it will trigger the below error when php exits
-        // Fatal error: Exception thrown without a stack frame in Unknown on line 0
-
-        // Danlo: I suspect this is because this has already been claimed by the interpeter
-        // thus trying to shutdown this resources, which is already shutdown is a problem.
-        if (is_resource($this->_socket)) {
-            // fclose($this->_socket);
-        }
-
-        // $this->_socket = null;
-    }
-
-    /**
-     * Check whether we are connected to the server
-     *
-     * @return true
-     * @throws Zend_Queue_Exception
-     */
-    public function ping()
-    {
-        if (!is_resource($this->_socket)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Not connected to Stomp server');
-        }
-        return true;
-    }
-
-    /**
-     * Write a frame to the stomp server
-     *
-     * example: $response = $client->write($frame)->read();
-     *
-     * @param Zend_Queue_Stom_FrameInterface $frame
-     * @return $this
-     */
-    public function write(Zend_Queue_Stomp_FrameInterface $frame)
-    {
-        $this->ping();
-        $output = $frame->toFrame();
-
-        $bytes = fwrite($this->_socket, $output, strlen($output));
-        if ($bytes === false || $bytes == 0) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('No bytes written');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Tests the socket to see if there is data for us
-     *
-     * @return boolean
-     */
-    public function canRead()
-    {
-        $read   = array($this->_socket);
-        $write  = null;
-        $except = null;
-
-        return stream_select(
-            $read,
-            $write,
-            $except,
-            $this->_options['timeout_sec'],
-            $this->_options['timeout_usec']
-        ) == 1;
-        // see http://us.php.net/manual/en/function.stream-select.php
-    }
-
-    /**
-     * Reads in a frame from the socket or returns false.
-     *
-     * @return Zend_Queue_Stomp_FrameInterface|false
-     * @throws Zend_Queue_Exception
-     */
-    public function read()
-    {
-        $this->ping();
-
-        $response = '';
-        $prev     = '';
-
-        // while not end of file.
-        while (!feof($this->_socket)) {
-            // read in one character until "\0\n" is found
-            $data = fread($this->_socket, 1);
-
-            // check to make sure that the connection is not lost.
-            if ($data === false) {
-                require_once 'Zend/Queue/Exception.php';
-                throw new Zend_Queue_Exception('Connection lost');
-            }
-
-            // append last character read to $response
-            $response .= $data;
-
-            // is this \0 (prev) \n (data)? END_OF_FRAME
-            if (ord($data) == 10 && ord($prev) == 0) {
-                break;
-            }
-            $prev = $data;
-        }
-
-        if ($response === '') {
-            return false;
-        }
-
-        $frame = $this->createFrame();
-        $frame->fromFrame($response);
-        return $frame;
-    }
-
-    /**
-     * Set the frameClass to be used
-     *
-     * This must be a Zend_Queue_Stomp_FrameInterface.
-     *
-     * @param  string $classname - class is an instance of Zend_Queue_Stomp_FrameInterface
-     * @return $this;
-     */
-    public function setFrameClass($classname)
-    {
-        $this->_options['frameClass'] = $classname;
-        return $this;
-    }
-
-    /**
-     * Get the frameClass
-     *
-     * @return string
-     */
-    public function getFrameClass()
-    {
-        return isset($this->_options['frameClass'])
-            ? $this->_options['frameClass']
-            : 'Zend_Queue_Stomp_Frame';
-    }
-
-    /**
-     * Create an empty frame
-     *
-     * @return Zend_Queue_Stomp_FrameInterface
-     */
-    public function createFrame()
-    {
-        $class = $this->getFrameClass();
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-
-        $frame = new $class();
-
-        if (!$frame instanceof Zend_Queue_Stomp_FrameInterface) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('Invalid Frame class provided; must implement Zend_Queue_Stomp_FrameInterface');
-        }
-
-        return $frame;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Stomp/Client/ConnectionInterface.php b/airtime_mvc/library/Zend/Queue/Stomp/Client/ConnectionInterface.php
deleted file mode 100644
index 3c1a8dccf..000000000
--- a/airtime_mvc/library/Zend/Queue/Stomp/Client/ConnectionInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConnectionInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * The Stomp client interacts with a Stomp server.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Queue_Stomp_Client_ConnectionInterface
-{
-    /**
-     * @param  string  $scheme ['tcp', 'udp']
-     * @param  string  host
-     * @param  integer port
-     * @param  string  class - create a connection with this class; class must support Zend_Queue_Stomp_Client_Connection_Interface
-     * @return boolean
-     */
-    public function open($scheme, $host, $port);
-
-    /**
-     * @param  boolean $destructor
-     * @return void
-     */
-    public function close($destructor = false);
-
-    /**
-     * Check whether we are connected to the server
-     *
-     * @return true
-     * @throws Zend_Queue_Exception
-     */
-    public function ping();
-
-    /**
-     * write a frame to the stomp server
-     *
-     * example: $response = $client->write($frame)->read();
-     *
-     * @param  Zend_Queue_Stomp_FrameInterface $frame
-     * @return $this
-     */
-    public function write(Zend_Queue_Stomp_FrameInterface $frame);
-
-    /**
-     * tests the socket to see if there is data for us
-     */
-    public function canRead();
-
-    /**
-     * reads in a frame from the socket or returns false.
-     *
-     * @return Zend_Queue_Stomp_Frame|false
-     * @throws Zend_Queue_Exception
-     */
-    public function read();
-
-    /**
-     * Set the frame class to be used
-     *
-     * This must be a Zend_Queue_Stomp_FrameInterface.
-     *
-     * @param  string $class
-     * @return Zend_Queue_Stomp_Client_ConnectionInterface;
-     */
-    public function setFrameClass($class);
-
-    /**
-     * Get the frameClass
-     *
-     * @return string
-     */
-    public function getFrameClass();
-
-    /**
-     * create an empty frame
-     *
-     * @return Zend_Queue_Stomp_FrameInterface class
-     */
-    public function createFrame();
-}
diff --git a/airtime_mvc/library/Zend/Queue/Stomp/Frame.php b/airtime_mvc/library/Zend/Queue/Stomp/Frame.php
deleted file mode 100644
index 21b0d46af..000000000
--- a/airtime_mvc/library/Zend/Queue/Stomp/Frame.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Frame.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Queue_Stomp_FrameInterface
- */
-require_once 'Zend/Queue/Stomp/FrameInterface.php';
-
-/**
- * This class represents a Stomp Frame
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Queue_Stomp_Frame
-    implements Zend_Queue_Stomp_FrameInterface
-{
-    const END_OF_FRAME   = "\x00\n";
-    const CONTENT_LENGTH = 'content-length';
-    const EOL            = "\n";
-
-    /**
-     * Headers for the frame
-     *
-     * @var array
-     */
-    protected $_headers = array();
-
-    /**
-     * The command for the frame
-     *
-     * @var string
-     */
-    protected $_command = null;
-
-    /**
-     * The body of the frame
-     *
-     * @var string
-     */
-    protected $_body = null;
-
-    /**
-     * Do the content-length automatically?
-     */
-    protected $_autoContentLength = null;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->setHeaders(array());
-        $this->setBody(null);
-        $this->setCommand(null);
-        $this->setAutoContentLength(true);
-    }
-
-    /**
-     * get the status of the auto content length
-     *
-     * If AutoContentLength is true this code will automatically put the
-     * content-length header in, even if it is already set by the user.
-     *
-     * This is done to make the message sending more reliable.
-     *
-     * @return boolean
-     */
-    public function getAutoContentLength()
-    {
-        return $this->_autoContentLength;
-    }
-
-    /**
-     * setAutoContentLength()
-     *
-     * Set the value on or off.
-     *
-     * @param boolean $auto
-     * @return $this;
-     * @throws Zend_Queue_Exception
-     */
-    public function setAutoContentLength($auto)
-    {
-        if (!is_bool($auto)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$auto is not a boolean');
-        }
-
-        $this->_autoContentLength = $auto;
-        return $this;
-    }
-
-    /**
-     * Get the headers
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Set the headers
-     *
-     * Throws an exception if the array values are not strings.
-     *
-     * @param array $headers
-     * @return $this
-     * @throws Zend_Queue_Exception
-     */
-    public function setHeaders(array $headers)
-    {
-        foreach ($headers as $header => $value) {
-            $this->setHeader($header, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a value for a header
-     *
-     * @param  string $header
-     * @param  string $value
-     * @return Zend_Queue_Stomp_Frame
-     * @throws Zend_Queue_Exception
-     */
-    public function setHeader($header, $value) {
-        if (!is_string($header)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$header is not a string: ' . print_r($header, true));
-        }
-
-        if (!is_scalar($value)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$value is not a string: ' . print_r($value, true));
-        }
-
-        $this->_headers[$header] = $value;
-        return $this;
-    }
-
-
-    /**
-     * Returns a value for a header
-     *
-     * Returns false if the header does not exist.
-     *
-     * @param  string $header
-     * @return string|false
-     * @throws Zend_Queue_Exception
-     */
-    public function getHeader($header)
-    {
-        if (!is_string($header)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$header is not a string');
-        }
-
-        return isset($this->_headers[$header])
-            ? $this->_headers[$header]
-            : false;
-    }
-
-    /**
-     * Return the body for this frame
-     *
-     * Returns false if the body does not exist
-     *
-     * @return false|string
-     */
-    public function getBody()
-    {
-        return is_null($this->_body)
-            ? false
-            : $this->_body;
-    }
-
-    /**
-     * Set the body for this frame
-     *
-     * Set to null for no body.
-     *
-     * @param  string|null $body
-     * @return Zend_Queue_Stomp_Frame
-     * @throws Zend_Queue_Exception
-     */
-    public function setBody($body)
-    {
-        if (!is_string($body) && !is_null($body)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$body is not a string or null');
-        }
-
-        $this->_body = $body;
-        return $this;
-    }
-
-    /**
-     * Return the command for this frame
-     *
-     * Return false if the command does not exist
-     *
-     * @return string|false
-     */
-    public function getCommand()
-    {
-        return is_null($this->_command)
-            ? false
-            : $this->_command;
-    }
-
-    /**
-     * Set the body for this frame
-     *
-     * @param  string|null
-     * @return Zend_Queue_Stomp_Frame
-     * @throws Zend_Queue_Exception
-     */
-    public function setCommand($command)
-    {
-        if (!is_string($command) && !is_null($command)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$command is not a string or null');
-        }
-
-        $this->_command = $command;
-        return $this;
-    }
-
-    /**
-     * Takes the current parameters and returns a Stomp Frame
-     *
-     * @return string
-     * @throws Zend_Queue_Exception
-     */
-    public function toFrame()
-    {
-        if ($this->getCommand() === false) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('You must set the command');
-        }
-
-        $command = $this->getCommand();
-        $headers = $this->getHeaders();
-        $body    = $this->getBody();
-        $frame   = '';
-
-        // add a content-length to the SEND command.
-        // @see http://stomp.codehaus.org/Protocol
-        if ($this->getAutoContentLength()) {
-            $headers[self::CONTENT_LENGTH] = strlen($this->getBody());
-        }
-
-        // Command
-        $frame = $command . self::EOL;
-
-        // Headers
-        foreach ($headers as $key=>$value) {
-            $frame .= $key . ': ' . $value . self::EOL;
-        }
-
-        // Seperator
-        $frame .= self::EOL; // blank line required by protocol
-
-        // add the body if any
-        if ($body !== false) {
-            $frame .= $body;
-        }
-        $frame .= self::END_OF_FRAME;
-
-        return $frame;
-    }
-
-    /**
-     * @see toFrame()
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->toFrame();
-        } catch (Zend_Queue_Exception $e) {
-            $return = '';
-        }
-        return $return;
-    }
-
-    /**
-     * Accepts a frame and deconstructs the frame into its component parts
-     *
-     * @param  string $frame - a stomp frame
-     * @return $this
-     */
-    public function fromFrame($frame)
-    {
-        if (!is_string($frame)) {
-            require_once 'Zend/Queue/Exception.php';
-            throw new Zend_Queue_Exception('$frame is not a string');
-        }
-
-        $headers = array();
-        $body    = null;
-        $command = false;
-        $header  = '';
-
-        // separate the headers and the body
-        $match = self::EOL . self::EOL;
-        if (preg_match('/' . $match . '/', $frame)) {
-            list ($header, $body) = explode($match, $frame, 2);
-        } else {
-            $header = $frame;
-        }
-
-        // blow up headers
-        $headers = explode(self::EOL, $header);
-        unset($header);
-
-        // get the command (first line)
-        $this->setCommand(array_shift($headers));
-
-        // set each of the headers.
-        foreach ($headers as $header) {
-            if (strpos($header, ':') > 0) {
-                list($name, $value) = explode(':', $header, 2);
-                $this->setHeader($name, $value);
-            }
-        }
-
-        // crop the body if content-length is present
-        if ($this->getHeader(self::CONTENT_LENGTH) !== false ) {
-            $length = (int) $this->getHeader(self::CONTENT_LENGTH);
-            $body   = substr($body, 0, $length);
-        }
-
-        $this->setBody($body);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Queue/Stomp/FrameInterface.php b/airtime_mvc/library/Zend/Queue/Stomp/FrameInterface.php
deleted file mode 100644
index c653efb12..000000000
--- a/airtime_mvc/library/Zend/Queue/Stomp/FrameInterface.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FrameInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class represents a Stomp Frame Interface
- *
- * @category   Zend
- * @package    Zend_Queue
- * @subpackage Stomp
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Queue_Stomp_FrameInterface
-{
-    /**
-     * Get the status of the auto content length
-     *
-     * If AutoContentLength is true this code will automatically put the
-     * content-length header in, even if it is already set by the user.
-     *
-     * This is done to make the message sending more reliable.
-     *
-     * @return boolean
-     */
-    public function getAutoContentLength();
-
-    /**
-     * setAutoContentLength()
-     *
-     * Set the value on or off.
-     *
-     * @param boolean $auto
-     * @return $this;
-     * @throws Zend_Queue_Exception
-     */
-    public function setAutoContentLength($auto);
-
-    /**
-     * Get the headers
-     *
-     * @return array
-     */
-    public function getHeaders();
-
-    /**
-     * Set the headers
-     *
-     * Throws an exception if the array values are not strings.
-     *
-     * @param array $headers
-     * @return $this
-     * @throws Zend_Queue_Exception
-     */
-    public function setHeaders(array $headers);
-
-    /**
-     * Returns a value for a header
-     * returns false if the header does not exist
-     *
-     * @param string $header
-     * @return $string
-     * @throws Zend_Queue_Exception
-     */
-    public function getHeader($header);
-
-    /**
-     * Returns a value for a header
-     * returns false if the header does not exist
-     *
-     * @param string $header
-     * @param string $value
-     * @return $this
-     * @throws Zend_Queue_Exception
-     */
-    public function setHeader($header, $value);
-
-    /**
-     * Return the body for this frame
-     * returns false if the body does not exist
-     *
-     * @return $this
-     */
-    public function getBody();
-
-    /**
-     * Set the body for this frame
-     * returns false if the body does not exist
-     *
-     * Set to null for no body.
-     *
-     * @param string|null $body
-     * @return $this
-     * @throws Zend_Queue_Exception
-     */
-    public function setBody($body);
-
-    /**
-     * Return the command for this frame
-     * return false if the command does not exist
-     *
-     * @return $this
-     */
-    public function getCommand();
-
-    /**
-     * Set the body for this frame
-     * returns false if the body does not exist
-     *
-     * @return $this
-     * @throws Zend_Queue_Exception
-     */
-    public function setCommand($command);
-
-
-    /**
-     * Takes the current parameters and returns a Stomp Frame
-     *
-     * @throws Zend_Queue_Exception
-     * @return string
-     */
-    public function toFrame();
-
-    /**
-     * @see toFrame()
-     */
-    public function __toString();
-
-    /**
-     * Accepts a frame and deconstructs the frame into its' component parts
-     *
-     * @param string $frame - a stomp frame
-     * @return $this
-     */
-    public function fromFrame($frame);
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Class.php b/airtime_mvc/library/Zend/Reflection/Class.php
deleted file mode 100644
index 80329cdce..000000000
--- a/airtime_mvc/library/Zend/Reflection/Class.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Property
- */
-require_once 'Zend/Reflection/Property.php';
-
-/**
- * @see Zend_Reflection_Method
- */
-require_once 'Zend/Reflection/Method.php';
-
-/**
- * Zend_Reflection_Docblock
- */
-require_once 'Zend/Reflection/Docblock.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Class extends ReflectionClass
-{
-    /**
-     * Return the reflection file of the declaring file.
-     *
-     * @return Zend_Reflection_File
-     */
-    public function getDeclaringFile($reflectionClass = 'Zend_Reflection_File')
-    {
-        $instance = new $reflectionClass($this->getFileName());
-        if (!$instance instanceof Zend_Reflection_File) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_File');
-        }
-        return $instance;
-    }
-
-    /**
-     * Return the classes Docblock reflection object
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return Zend_Reflection_Docblock
-     * @throws Zend_Reflection_Exception for missing docblock or invalid reflection class
-     */
-    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
-    {
-        if ('' == $this->getDocComment()) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
-        }
-
-        $instance = new $reflectionClass($this);
-        if (!$instance instanceof Zend_Reflection_Docblock) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock');
-        }
-        return $instance;
-    }
-
-    /**
-     * Return the start line of the class
-     *
-     * @param bool $includeDocComment
-     * @return int
-     */
-    public function getStartLine($includeDocComment = false)
-    {
-        if ($includeDocComment) {
-            if ($this->getDocComment() != '') {
-                return $this->getDocblock()->getStartLine();
-            }
-        }
-
-        return parent::getStartLine();
-    }
-
-    /**
-     * Return the contents of the class
-     *
-     * @param bool $includeDocblock
-     * @return string
-     */
-    public function getContents($includeDocblock = true)
-    {
-        $filename  = $this->getFileName();
-        $filelines = file($filename);
-        $startnum  = $this->getStartLine($includeDocblock);
-        $endnum    = $this->getEndLine() - $this->getStartLine();
-
-        return implode('', array_splice($filelines, $startnum, $endnum, true));
-    }
-
-    /**
-     * Get all reflection objects of implemented interfaces
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array Array of Zend_Reflection_Class
-     */
-    public function getInterfaces($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflections  = parent::getInterfaces();
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-
-    /**
-     * Return method reflection by name
-     *
-     * @param  string $name
-     * @param  string $reflectionClass Reflection class to utilize
-     * @return Zend_Reflection_Method
-     */
-    public function getMethod($name, $reflectionClass = 'Zend_Reflection_Method')
-    {
-        $phpReflection  = parent::getMethod($name);
-        $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName());
-
-        if (!$zendReflection instanceof Zend_Reflection_Method) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method');
-        }
-
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get reflection objects of all methods
-     *
-     * @param  string $filter
-     * @param  string $reflectionClass Reflection class to use for methods
-     * @return array Array of Zend_Reflection_Method objects
-     */
-    public function getMethods($filter = -1, $reflectionClass = 'Zend_Reflection_Method')
-    {
-        $phpReflections  = parent::getMethods($filter);
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Method) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-
-    /**
-     * Get parent reflection class of reflected class
-     *
-     * @param  string $reflectionClass Name of Reflection class to use
-     * @return Zend_Reflection_Class
-     */
-    public function getParentClass($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflection = parent::getParentClass();
-        if ($phpReflection) {
-            $zendReflection = new $reflectionClass($phpReflection->getName());
-            if (!$zendReflection instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class');
-            }
-            unset($phpReflection);
-            return $zendReflection;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Return reflection property of this class by name
-     *
-     * @param  string $name
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return Zend_Reflection_Property
-     */
-    public function getProperty($name, $reflectionClass = 'Zend_Reflection_Property')
-    {
-        $phpReflection  = parent::getProperty($name);
-        $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName());
-        if (!$zendReflection instanceof Zend_Reflection_Property) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property');
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Return reflection properties of this class
-     *
-     * @param  int $filter
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array Array of Zend_Reflection_Property
-     */
-    public function getProperties($filter = -1, $reflectionClass = 'Zend_Reflection_Property')
-    {
-        $phpReflections = parent::getProperties($filter);
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Property) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Docblock.php b/airtime_mvc/library/Zend/Reflection/Docblock.php
deleted file mode 100644
index fbefdf2bb..000000000
--- a/airtime_mvc/library/Zend/Reflection/Docblock.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Docblock_Tag
- */
-require_once 'Zend/Reflection/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Docblock implements Reflector
-{
-    /**
-     * @var Reflector
-     */
-    protected $_reflector = null;
-
-    /**#@+
-     * @var int
-     */
-    protected $_startLine = null;
-    protected $_endLine   = null;
-    /**#@-*/
-
-    /**
-     * @var string
-     */
-    protected $_docComment = null;
-
-    /**
-     * @var string
-     */
-    protected $_cleanDocComment = null;
-
-    /**
-     * @var string
-     */
-    protected $_longDescription = null;
-
-    /**
-     * @var string
-     */
-    protected $_shortDescription = null;
-
-    /**
-     * @var array
-     */
-    protected $_tags = array();
-
-    /**
-     * Export reflection
-     *
-     * Reqired by the Reflector interface.
-     *
-     * @todo   What should this do?
-     * @return void
-     */
-    public static function export()
-    {
-
-    }
-
-    /**
-     * Serialize to string
-     *
-     * Required by the Reflector interface
-     *
-     * @todo   What should this return?
-     * @return string
-     */
-    public function __toString()
-    {
-        $str = "Docblock [ /* Docblock */ ] {".PHP_EOL.PHP_EOL;
-        $str .= "  - Tags [".count($this->_tags)."] {".PHP_EOL;
-
-        foreach($this->_tags AS $tag) {
-            $str .= "    ".$tag;
-        }
-
-        $str .= "  }".PHP_EOL;
-        $str .= "}".PHP_EOL;
-
-        return $str;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param Reflector|string $commentOrReflector
-     */
-    public function __construct($commentOrReflector)
-    {
-        if ($commentOrReflector instanceof Reflector) {
-            $this->_reflector = $commentOrReflector;
-            if (!method_exists($commentOrReflector, 'getDocComment')) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Reflector must contain method "getDocComment"');
-            }
-            $docComment = $commentOrReflector->getDocComment();
-
-            $lineCount = substr_count($docComment, "\n");
-
-            $this->_startLine = $this->_reflector->getStartLine() - $lineCount - 1;
-            $this->_endLine   = $this->_reflector->getStartLine() - 1;
-
-        } elseif (is_string($commentOrReflector)) {
-            $docComment = $commentOrReflector;
-        } else {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception(get_class($this) . ' must have a (string) DocComment or a Reflector in the constructor');
-        }
-
-        if ($docComment == '') {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('DocComment cannot be empty');
-        }
-
-        $this->_docComment = $docComment;
-        $this->_parse();
-    }
-
-    /**
-     * Retrieve contents of docblock
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        return $this->_cleanDocComment;
-    }
-
-    /**
-     * Get start line (position) of docblock
-     *
-     * @return int
-     */
-    public function getStartLine()
-    {
-        return $this->_startLine;
-    }
-
-    /**
-     * Get last line (position) of docblock
-     *
-     * @return int
-     */
-    public function getEndLine()
-    {
-        return $this->_endLine;
-    }
-
-    /**
-     * Get docblock short description
-     *
-     * @return string
-     */
-    public function getShortDescription()
-    {
-        return $this->_shortDescription;
-    }
-
-    /**
-     * Get docblock long description
-     *
-     * @return string
-     */
-    public function getLongDescription()
-    {
-        return $this->_longDescription;
-    }
-
-    /**
-     * Does the docblock contain the given annotation tag?
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function hasTag($name)
-    {
-        foreach ($this->_tags as $tag) {
-            if ($tag->getName() == $name) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Retrieve the given docblock tag
-     *
-     * @param  string $name
-     * @return Zend_Reflection_Docblock_Tag|false
-     */
-    public function getTag($name)
-    {
-        foreach ($this->_tags as $tag) {
-            if ($tag->getName() == $name) {
-                return $tag;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get all docblock annotation tags
-     *
-     * @param string $filter
-     * @return array Array of Zend_Reflection_Docblock_Tag
-     */
-    public function getTags($filter = null)
-    {
-        if ($filter === null || !is_string($filter)) {
-            return $this->_tags;
-        }
-
-        $returnTags = array();
-        foreach ($this->_tags as $tag) {
-            if ($tag->getName() == $filter) {
-                $returnTags[] = $tag;
-            }
-        }
-        return $returnTags;
-    }
-
-    /**
-     * Parse the docblock
-     *
-     * @return void
-     */
-    protected function _parse()
-    {
-        $docComment = $this->_docComment;
-
-        // First remove doc block line starters
-        $docComment = preg_replace('#[ \t]*(?:\/\*\*|\*\/|\*)?[ ]{0,1}(.*)?#', '$1', $docComment);
-        $docComment = ltrim($docComment, "\r\n"); // @todo should be changed to remove first and last empty line
-
-        $this->_cleanDocComment = $docComment;
-
-        // Next parse out the tags and descriptions
-        $parsedDocComment = $docComment;
-        $lineNumber = $firstBlandLineEncountered = 0;
-        while (($newlinePos = strpos($parsedDocComment, "\n")) !== false) {
-            $lineNumber++;
-            $line = substr($parsedDocComment, 0, $newlinePos);
-
-            $matches = array();
-
-            if ((strpos($line, '@') === 0) && (preg_match('#^(@\w+.*?)(\n)(?:@|\r?\n|$)#s', $parsedDocComment, $matches))) {
-                $this->_tags[] = Zend_Reflection_Docblock_Tag::factory($matches[1]);
-                $parsedDocComment = str_replace($matches[1] . $matches[2], '', $parsedDocComment);
-            } else {
-                if ($lineNumber < 3 && !$firstBlandLineEncountered) {
-                    $this->_shortDescription .= $line . "\n";
-                } else {
-                    $this->_longDescription .= $line . "\n";
-                }
-
-                if ($line == '') {
-                    $firstBlandLineEncountered = true;
-                }
-
-                $parsedDocComment = substr($parsedDocComment, $newlinePos + 1);
-            }
-
-        }
-
-        $this->_shortDescription = rtrim($this->_shortDescription);
-        $this->_longDescription  = rtrim($this->_longDescription);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Docblock/Tag.php b/airtime_mvc/library/Zend/Reflection/Docblock/Tag.php
deleted file mode 100644
index 236beb5f8..000000000
--- a/airtime_mvc/library/Zend/Reflection/Docblock/Tag.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Docblock_Tag implements Reflector
-{
-    /**
-     * @var array Array of Class names
-     */
-    protected static $_tagClasses = array(
-        'param'  => 'Zend_Reflection_Docblock_Tag_Param',
-        'return' => 'Zend_Reflection_Docblock_Tag_Return',
-        );
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var string
-     */
-    protected $_description = null;
-
-    /**
-     * Factory: Create the appropriate annotation tag object
-     *
-     * @param  string $tagDocblockLine
-     * @return Zend_Reflection_Docblock_Tag
-     */
-    public static function factory($tagDocblockLine)
-    {
-        $matches = array();
-
-        if (!preg_match('#^@(\w+)(\s|$)#', $tagDocblockLine, $matches)) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('No valid tag name found within provided docblock line.');
-        }
-
-        $tagName = $matches[1];
-        if (array_key_exists($tagName, self::$_tagClasses)) {
-            $tagClass = self::$_tagClasses[$tagName];
-            if (!class_exists($tagClass)) {
-                Zend_Loader::loadClass($tagClass);
-            }
-            return new $tagClass($tagDocblockLine);
-        }
-        return new self($tagDocblockLine);
-    }
-
-    /**
-     * Export reflection
-     *
-     * Required by Reflector
-     *
-     * @todo   What should this do?
-     * @return void
-     */
-    public static function export()
-    {
-    }
-
-    /**
-     * Serialize to string
-     *
-     * Required by Reflector
-     *
-     * @todo   What should this do?
-     * @return string
-     */
-    public function __toString()
-    {
-        $str = "Docblock Tag [ * @".$this->_name." ]".PHP_EOL;
-
-        return $str;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param  string $tagDocblockLine
-     * @return void
-     */
-    public function __construct($tagDocblockLine)
-    {
-        $matches = array();
-
-        // find the line
-        if (!preg_match('#^@(\w+)(?:\s+([^\s].*)|$)?#', $tagDocblockLine, $matches)) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Provided docblock line does not contain a valid tag');
-        }
-
-        $this->_name = $matches[1];
-        if (isset($matches[2]) && $matches[2]) {
-            $this->_description = $matches[2];
-        }
-    }
-
-    /**
-     * Get annotation tag name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get annotation tag description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Param.php b/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Param.php
deleted file mode 100644
index 7efdf2a3e..000000000
--- a/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Param.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Reflection_Docblock_Tag */
-require_once 'Zend/Reflection/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Docblock_Tag_Param extends Zend_Reflection_Docblock_Tag
-{
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * @var string
-     */
-    protected $_variableName = null;
-
-    /**
-     * Constructor
-     *
-     * @param string $tagDocblockLine
-     */
-    public function __construct($tagDocblockLine)
-    {
-        $matches = array();
-
-        if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag');
-        }
-
-        if ($matches[1] != 'param') {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @param tag');
-        }
-
-        $this->_name = 'param';
-        $this->_type = $matches[2];
-
-        if (isset($matches[3])) {
-            $this->_variableName = $matches[3];
-        }
-
-        if (isset($matches[4])) {
-            $this->_description = preg_replace('#\s+#', ' ', $matches[4]);
-        }
-    }
-
-    /**
-     * Get parameter variable type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Get parameter name
-     *
-     * @return string
-     */
-    public function getVariableName()
-    {
-        return $this->_variableName;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Return.php b/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Return.php
deleted file mode 100644
index 5fcf40af8..000000000
--- a/airtime_mvc/library/Zend/Reflection/Docblock/Tag/Return.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Reflection_Docblock_Tag */
-require_once 'Zend/Reflection/Docblock/Tag.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag
-{
-    /**
-     * @var string
-     */
-    protected $_type = null;
-
-    /**
-     * Constructor
-     *
-     * @param  string $tagDocblockLine
-     * @return void
-     */
-    public function __construct($tagDocblockLine)
-    {
-        if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag');
-        }
-
-        if ($matches[1] != 'return') {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @return tag');
-        }
-
-        $this->_name = 'return';
-        $this->_type = $matches[2];
-        if (isset($matches[3])) {
-            $this->_description = $matches[3];
-        }
-    }
-
-    /**
-     * Get return variable type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Exception.php b/airtime_mvc/library/Zend/Reflection/Exception.php
deleted file mode 100644
index d1ad8f02b..000000000
--- a/airtime_mvc/library/Zend/Reflection/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Exception extends Zend_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Extension.php b/airtime_mvc/library/Zend/Reflection/Extension.php
deleted file mode 100644
index 45adb7c8f..000000000
--- a/airtime_mvc/library/Zend/Reflection/Extension.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Class
- */
-require_once 'Zend/Reflection/Class.php';
-
-/**
- * @see Zend_Reflection_Function
- */
-require_once 'Zend/Reflection/Function.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Extension extends ReflectionExtension
-{
-    /**
-     * Get extension function reflection objects
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array Array of Zend_Reflection_Function objects
-     */
-    public function getFunctions($reflectionClass = 'Zend_Reflection_Function')
-    {
-        $phpReflections  = parent::getFunctions();
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Function) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-
-    /**
-     * Get extension class reflection objects
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array Array of Zend_Reflection_Class objects
-     */
-    public function getClasses($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflections  = parent::getClasses();
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/File.php b/airtime_mvc/library/Zend/Reflection/File.php
deleted file mode 100644
index dd2fef7f9..000000000
--- a/airtime_mvc/library/Zend/Reflection/File.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20903 2010-02-04 16:16:47Z matthew $
- */
-
-/**
- * @see Zend_Reflection_Class
- */
-require_once 'Zend/Reflection/Class.php';
-
-/**
- * @see Zend_Reflection_Function
- */
-require_once 'Zend/Reflection/Function.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_File implements Reflector
-{
-    /**
-     * @var string
-     */
-    protected $_filepath        = null;
-
-    /**
-     * @var string
-     */
-    protected $_docComment      = null;
-
-    /**
-     * @var int
-     */
-    protected $_startLine       = 1;
-
-    /**
-     * @var int
-     */
-    protected $_endLine         = null;
-
-    /**
-     * @var string[]
-     */
-    protected $_requiredFiles   = array();
-
-    /**
-     * @var Zend_Reflection_Class[]
-     */
-    protected $_classes         = array();
-
-    /**
-     * @var Zend_Reflection_Function[]
-     */
-    protected $_functions       = array();
-
-    /**
-     * @var string
-     */
-    protected $_contents        = null;
-
-    /**
-     * Constructor
-     *
-     * @param  string $file
-     * @return void
-     */
-    public function __construct($file)
-    {
-        $fileName = $file;
-
-        if (($fileRealpath = realpath($fileName)) === false) {
-            $fileRealpath = self::findRealpathInIncludePath($file);
-        }
-
-        if (!$fileRealpath || !in_array($fileRealpath, get_included_files())) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('File ' . $file . ' must be required before it can be reflected');
-        }
-
-        $this->_fileName = $fileRealpath;
-        $this->_contents = file_get_contents($this->_fileName);
-        $this->_reflect();
-    }
-
-    /**
-     * Find realpath of file based on include_path
-     *
-     * @param  string $fileName
-     * @return string
-     */
-    public static function findRealpathInIncludePath($fileName)
-    {
-        require_once 'Zend/Loader.php';
-        $includePaths = Zend_Loader::explodeIncludePath();
-        while (count($includePaths) > 0) {
-            $filePath = array_shift($includePaths) . DIRECTORY_SEPARATOR . $fileName;
-
-            if ( ($foundRealpath = realpath($filePath)) !== false) {
-                break;
-            }
-        }
-
-        return $foundRealpath;
-    }
-
-    /**
-     * Export
-     *
-     * Required by the Reflector interface.
-     *
-     * @todo   What should this do?
-     * @return null
-     */
-    public static function export()
-    {
-        return null;
-    }
-
-    /**
-     * Return the file name of the reflected file
-     *
-     * @return string
-     */
-    public function getFileName()
-    {
-        return $this->_fileName;
-    }
-
-    /**
-     * Get the start line - Always 1, staying consistent with the Reflection API
-     *
-     * @return int
-     */
-    public function getStartLine()
-    {
-        return $this->_startLine;
-    }
-
-    /**
-     * Get the end line / number of lines
-     *
-     * @return int
-     */
-    public function getEndLine()
-    {
-        return $this->_endLine;
-    }
-
-    /**
-     * Return the doc comment
-     *
-     * @return string
-     */
-    public function getDocComment()
-    {
-        return $this->_docComment;
-    }
-
-    /**
-     * Return the docblock
-     *
-     * @param  string $reflectionClass Reflection class to use
-     * @return Zend_Reflection_Docblock
-     */
-    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
-    {
-        $instance = new $reflectionClass($this);
-        if (!$instance instanceof Zend_Reflection_Docblock) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock');
-        }
-        return $instance;
-    }
-
-    /**
-     * Return the reflection classes of the classes found inside this file
-     *
-     * @param  string $reflectionClass Name of reflection class to use for instances
-     * @return array Array of Zend_Reflection_Class instances
-     */
-    public function getClasses($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $classes = array();
-        foreach ($this->_classes as $class) {
-            $instance = new $reflectionClass($class);
-            if (!$instance instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-            }
-            $classes[] = $instance;
-        }
-        return $classes;
-    }
-
-    /**
-     * Return the reflection functions of the functions found inside this file
-     *
-     * @param  string $reflectionClass Name of reflection class to use for instances
-     * @return array Array of Zend_Reflection_Functions
-     */
-    public function getFunctions($reflectionClass = 'Zend_Reflection_Function')
-    {
-        $functions = array();
-        foreach ($this->_functions as $function) {
-            $instance = new $reflectionClass($function);
-            if (!$instance instanceof Zend_Reflection_Function) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function');
-            }
-            $functions[] = $instance;
-        }
-        return $functions;
-    }
-
-    /**
-     * Retrieve the reflection class of a given class found in this file
-     *
-     * @param  null|string $name
-     * @param  string $reflectionClass Reflection class to use when creating reflection instance
-     * @return Zend_Reflection_Class
-     * @throws Zend_Reflection_Exception for invalid class name or invalid reflection class
-     */
-    public function getClass($name = null, $reflectionClass = 'Zend_Reflection_Class')
-    {
-        if ($name === null) {
-            reset($this->_classes);
-            $selected = current($this->_classes);
-            $instance = new $reflectionClass($selected);
-            if (!$instance instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class');
-            }
-            return $instance;
-        }
-
-        if (in_array($name, $this->_classes)) {
-            $instance = new $reflectionClass($name);
-            if (!$instance instanceof Zend_Reflection_Class) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class');
-            }
-            return $instance;
-        }
-
-        require_once 'Zend/Reflection/Exception.php';
-        throw new Zend_Reflection_Exception('Class by name ' . $name . ' not found.');
-    }
-
-    /**
-     * Return the full contents of file
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        return $this->_contents;
-    }
-
-    /**
-     * Serialize to string
-     *
-     * Required by the Reflector interface
-     *
-     * @todo   What should this serialization look like?
-     * @return string
-     */
-    public function __toString()
-    {
-        return '';
-    }
-
-    /**
-     * This method does the work of "reflecting" the file
-     *
-     * Uses PHP's tokenizer to perform file reflection.
-     *
-     * @return void
-     */
-    protected function _reflect()
-    {
-        $contents = $this->_contents;
-        $tokens   = token_get_all($contents);
-
-        $functionTrapped = false;
-        $classTrapped    = false;
-        $requireTrapped  = false;
-        $openBraces      = 0;
-
-        $this->_checkFileDocBlock($tokens);
-
-        foreach ($tokens as $token) {
-            /*
-             * Tokens are characters representing symbols or arrays
-             * representing strings. The keys/values in the arrays are
-             *
-             * - 0 => token id,
-             * - 1 => string,
-             * - 2 => line number
-             *
-             * Token ID's are explained here:
-             * http://www.php.net/manual/en/tokens.php.
-             */
-
-            if (is_array($token)) {
-                $type    = $token[0];
-                $value   = $token[1];
-                $lineNum = $token[2];
-            } else {
-                // It's a symbol
-                // Maintain the count of open braces
-                if ($token == '{') {
-                    $openBraces++;
-                } else if ($token == '}') {
-                    $openBraces--;
-                }
-
-                continue;
-            }
-
-            switch ($type) {
-                // Name of something
-                case T_STRING:
-                    if ($functionTrapped) {
-                        $this->_functions[] = $value;
-                        $functionTrapped = false;
-                    } elseif ($classTrapped) {
-                        $this->_classes[] = $value;
-                        $classTrapped = false;
-                    }
-                    continue;
-
-                // Required file names are T_CONSTANT_ENCAPSED_STRING
-                case T_CONSTANT_ENCAPSED_STRING:
-                    if ($requireTrapped) {
-                        $this->_requiredFiles[] = $value ."\n";
-                        $requireTrapped = false;
-                    }
-                    continue;
-
-                // Functions
-                case T_FUNCTION:
-                    if ($openBraces == 0) {
-                        $functionTrapped = true;
-                    }
-                    break;
-
-                // Classes
-                case T_CLASS:
-                case T_INTERFACE:
-                    $classTrapped = true;
-                    break;
-
-                // All types of requires
-                case T_REQUIRE:
-                case T_REQUIRE_ONCE:
-                case T_INCLUDE:
-                case T_INCLUDE_ONCE:
-                    $requireTrapped = true;
-                    break;
-
-                // Default case: do nothing
-                default:
-                    break;
-            }
-        }
-
-        $this->_endLine = count(explode("\n", $this->_contents));
-    }
-
-    /**
-     * Validate / check a file level docblock
-     *
-     * @param  array $tokens Array of tokenizer tokens
-     * @return void
-     */
-    protected function _checkFileDocBlock($tokens) {
-        foreach ($tokens as $token) {
-            $type    = $token[0];
-            $value   = $token[1];
-            $lineNum = $token[2];
-            if(($type == T_OPEN_TAG) || ($type == T_WHITESPACE)) {
-                continue;
-            } elseif ($type == T_DOC_COMMENT) {
-                $this->_docComment = $value;
-                $this->_startLine  = $lineNum + substr_count($value, "\n") + 1;
-                return;
-            } else {
-                // Only whitespace is allowed before file docblocks
-                return;
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Function.php b/airtime_mvc/library/Zend/Reflection/Function.php
deleted file mode 100644
index aab4e75c5..000000000
--- a/airtime_mvc/library/Zend/Reflection/Function.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Parameter
- */
-require_once 'Zend/Reflection/Parameter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Function extends ReflectionFunction
-{
-    /**
-     * Get function docblock
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return Zend_Reflection_Docblock
-     */
-    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
-    {
-        if ('' == ($comment = $this->getDocComment())) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
-        }
-        $instance = new $reflectionClass($comment);
-        if (!$instance instanceof Zend_Reflection_Docblock) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
-        }
-        return $instance;
-    }
-
-    /**
-     * Get start line (position) of function
-     *
-     * @param  bool $includeDocComment
-     * @return int
-     */
-    public function getStartLine($includeDocComment = false)
-    {
-        if ($includeDocComment) {
-            if ($this->getDocComment() != '') {
-                return $this->getDocblock()->getStartLine();
-            }
-        }
-
-        return parent::getStartLine();
-    }
-
-    /**
-     * Get contents of function
-     *
-     * @param  bool $includeDocblock
-     * @return string
-     */
-    public function getContents($includeDocblock = true)
-    {
-        return implode("\n",
-            array_splice(
-                file($this->getFileName()),
-                $this->getStartLine($includeDocblock),
-                ($this->getEndLine() - $this->getStartLine()),
-                true
-                )
-            );
-    }
-
-    /**
-     * Get function parameters
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array Array of Zend_Reflection_Parameter
-     */
-    public function getParameters($reflectionClass = 'Zend_Reflection_Parameter')
-    {
-        $phpReflections  = parent::getParameters();
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass($this->getName(), $phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Parameter) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-
-    /**
-     * Get return type tag
-     *
-     * @return Zend_Reflection_Docblock_Tag_Return
-     */
-    public function getReturn()
-    {
-        $docblock = $this->getDocblock();
-        if (!$docblock->hasTag('return')) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Function does not specify an @return annotation tag; cannot determine return type');
-        }
-        $tag    = $docblock->getTag('return');
-        $return = Zend_Reflection_Docblock_Tag::factory('@return ' . $tag->getDescription());
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Method.php b/airtime_mvc/library/Zend/Reflection/Method.php
deleted file mode 100644
index c95429f92..000000000
--- a/airtime_mvc/library/Zend/Reflection/Method.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Class
- */
-require_once 'Zend/Reflection/Class.php';
-
-/**
- * @see Zend_Reflection_Docblock
- */
-require_once 'Zend/Reflection/Docblock.php';
-
-/**
- * @see Zend_Reflection_Parameter
- */
-require_once 'Zend/Reflection/Parameter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Method extends ReflectionMethod
-{
-    /**
-     * Retrieve method docblock reflection
-     *
-     * @return Zend_Reflection_Docblock
-     * @throws Zend_Reflection_Exception
-     */
-    public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock')
-    {
-        if ('' == $this->getDocComment()) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock');
-        }
-
-        $instance = new $reflectionClass($this);
-        if (!$instance instanceof Zend_Reflection_Docblock) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
-        }
-        return $instance;
-    }
-
-    /**
-     * Get start line (position) of method
-     *
-     * @param  bool $includeDocComment
-     * @return int
-     */
-    public function getStartLine($includeDocComment = false)
-    {
-        if ($includeDocComment) {
-            if ($this->getDocComment() != '') {
-                return $this->getDocblock()->getStartLine();
-            }
-        }
-
-        return parent::getStartLine();
-    }
-
-    /**
-     * Get reflection of declaring class
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return Zend_Reflection_Class
-     */
-    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflection  = parent::getDeclaringClass();
-        $zendReflection = new $reflectionClass($phpReflection->getName());
-        if (!$zendReflection instanceof Zend_Reflection_Class) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get all method parameter reflection objects
-     *
-     * @param  string $reflectionClass Name of reflection class to use
-     * @return array of Zend_Reflection_Parameter objects
-     */
-    public function getParameters($reflectionClass = 'Zend_Reflection_Parameter')
-    {
-        $phpReflections  = parent::getParameters();
-        $zendReflections = array();
-        while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
-            $instance = new $reflectionClass(array($this->getDeclaringClass()->getName(), $this->getName()), $phpReflection->getName());
-            if (!$instance instanceof Zend_Reflection_Parameter) {
-                require_once 'Zend/Reflection/Exception.php';
-                throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter');
-            }
-            $zendReflections[] = $instance;
-            unset($phpReflection);
-        }
-        unset($phpReflections);
-        return $zendReflections;
-    }
-
-    /**
-     * Get method contents
-     *
-     * @param  bool $includeDocblock
-     * @return string
-     */
-    public function getContents($includeDocblock = true)
-    {
-        $fileContents = file($this->getFileName());
-        $startNum = $this->getStartLine($includeDocblock);
-        $endNum = ($this->getEndLine() - $this->getStartLine());
-
-        return implode("\n", array_splice($fileContents, $startNum, $endNum, true));
-    }
-
-    /**
-     * Get method body
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        $lines = array_slice(
-            file($this->getDeclaringClass()->getFileName(), FILE_IGNORE_NEW_LINES),
-            $this->getStartLine(),
-            ($this->getEndLine() - $this->getStartLine()),
-            true
-        );
-
-        $firstLine = array_shift($lines);
-
-        if (trim($firstLine) !== '{') {
-            array_unshift($lines, $firstLine);
-        }
-
-        $lastLine = array_pop($lines);
-
-        if (trim($lastLine) !== '}') {
-            array_push($lines, $lastLine);
-        }
-
-        // just in case we had code on the bracket lines
-        return rtrim(ltrim(implode("\n", $lines), '{'), '}');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Parameter.php b/airtime_mvc/library/Zend/Reflection/Parameter.php
deleted file mode 100644
index 042c3000d..000000000
--- a/airtime_mvc/library/Zend/Reflection/Parameter.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Parameter extends ReflectionParameter
-{
-    /**
-     * @var bool
-     */
-    protected $_isFromMethod = false;
-
-    /**
-     * Get declaring class reflection object
-     *
-     * @param  string $reflectionClass Reflection class to use
-     * @return Zend_Reflection_Class
-     */
-    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflection  = parent::getDeclaringClass();
-        $zendReflection = new $reflectionClass($phpReflection->getName());
-        if (!$zendReflection instanceof Zend_Reflection_Class) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get class reflection object
-     *
-     * @param  string $reflectionClass Reflection class to use
-     * @return Zend_Reflection_Class
-     */
-    public function getClass($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflection  = parent::getClass();
-        if($phpReflection == null) {
-            return null;
-        }
-
-        $zendReflection = new $reflectionClass($phpReflection->getName());
-        if (!$zendReflection instanceof Zend_Reflection_Class) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get declaring function reflection object
-     *
-     * @param  string $reflectionClass Reflection class to use
-     * @return Zend_Reflection_Function|Zend_Reflection_Method
-     */
-    public function getDeclaringFunction($reflectionClass = null)
-    {
-        $phpReflection = parent::getDeclaringFunction();
-        if ($phpReflection instanceof ReflectionMethod) {
-            $baseClass = 'Zend_Reflection_Method';
-            if (null === $reflectionClass) {
-                $reflectionClass = $baseClass;
-            }
-            $zendReflection = new $reflectionClass($this->getDeclaringClass()->getName(), $phpReflection->getName());
-        } else {
-            $baseClass = 'Zend_Reflection_Function';
-            if (null === $reflectionClass) {
-                $reflectionClass = $baseClass;
-            }
-            $zendReflection = new $reflectionClass($phpReflection->getName());
-        }
-        if (!$zendReflection instanceof $baseClass) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend ' . $baseClass);
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get parameter type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        if ($docblock = $this->getDeclaringFunction()->getDocblock()) {
-            $params = $docblock->getTags('param');
-
-            if (isset($params[$this->getPosition()])) {
-                return $params[$this->getPosition()]->getType();
-            }
-
-        }
-
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Reflection/Property.php b/airtime_mvc/library/Zend/Reflection/Property.php
deleted file mode 100644
index 38a774acb..000000000
--- a/airtime_mvc/library/Zend/Reflection/Property.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @todo       implement line numbers
- * @category   Zend
- * @package    Zend_Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Reflection_Property extends ReflectionProperty
-{
-    /**
-     * Get declaring class reflection object
-     *
-     * @return Zend_Reflection_Class
-     */
-    public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class')
-    {
-        $phpReflection  = parent::getDeclaringClass();
-        $zendReflection = new $reflectionClass($phpReflection->getName());
-        if (!$zendReflection instanceof Zend_Reflection_Class) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class');
-        }
-        unset($phpReflection);
-        return $zendReflection;
-    }
-
-    /**
-     * Get docblock comment
-     *
-     * @param  string $reflectionClass
-     * @return Zend_Reflection_Docblock|false False if no docblock defined
-     */
-    public function getDocComment($reflectionClass = 'Zend_Reflection_Docblock')
-    {
-        $docblock = parent::getDocComment();
-        if (!$docblock) {
-            return false;
-        }
-
-        $r = new $reflectionClass($docblock);
-        if (!$r instanceof Zend_Reflection_Docblock) {
-            require_once 'Zend/Reflection/Exception.php';
-            throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock');
-        }
-        return $r;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Registry.php b/airtime_mvc/library/Zend/Registry.php
deleted file mode 100644
index 6623da260..000000000
--- a/airtime_mvc/library/Zend/Registry.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Generic storage class helps to manage global data.
- *
- * @category   Zend
- * @package    Zend_Registry
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Registry extends ArrayObject
-{
-    /**
-     * Class name of the singleton registry object.
-     * @var string
-     */
-    private static $_registryClassName = 'Zend_Registry';
-
-    /**
-     * Registry object provides storage for shared objects.
-     * @var Zend_Registry
-     */
-    private static $_registry = null;
-
-    /**
-     * Retrieves the default registry instance.
-     *
-     * @return Zend_Registry
-     */
-    public static function getInstance()
-    {
-        if (self::$_registry === null) {
-            self::init();
-        }
-
-        return self::$_registry;
-    }
-
-    /**
-     * Set the default registry instance to a specified instance.
-     *
-     * @param Zend_Registry $registry An object instance of type Zend_Registry,
-     *   or a subclass.
-     * @return void
-     * @throws Zend_Exception if registry is already initialized.
-     */
-    public static function setInstance(Zend_Registry $registry)
-    {
-        if (self::$_registry !== null) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('Registry is already initialized');
-        }
-
-        self::setClassName(get_class($registry));
-        self::$_registry = $registry;
-    }
-
-    /**
-     * Initialize the default registry instance.
-     *
-     * @return void
-     */
-    protected static function init()
-    {
-        self::setInstance(new self::$_registryClassName());
-    }
-
-    /**
-     * Set the class name to use for the default registry instance.
-     * Does not affect the currently initialized instance, it only applies
-     * for the next time you instantiate.
-     *
-     * @param string $registryClassName
-     * @return void
-     * @throws Zend_Exception if the registry is initialized or if the
-     *   class name is not valid.
-     */
-    public static function setClassName($registryClassName = 'Zend_Registry')
-    {
-        if (self::$_registry !== null) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception('Registry is already initialized');
-        }
-
-        if (!is_string($registryClassName)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("Argument is not a class name");
-        }
-
-        /**
-         * @see Zend_Loader
-         */
-        if (!class_exists($registryClassName)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($registryClassName);
-        }
-
-        self::$_registryClassName = $registryClassName;
-    }
-
-    /**
-     * Unset the default registry instance.
-     * Primarily used in tearDown() in unit tests.
-     * @returns void
-     */
-    public static function _unsetInstance()
-    {
-        self::$_registry = null;
-    }
-
-    /**
-     * getter method, basically same as offsetGet().
-     *
-     * This method can be called from an object of type Zend_Registry, or it
-     * can be called statically.  In the latter case, it uses the default
-     * static instance stored in the class.
-     *
-     * @param string $index - get the value associated with $index
-     * @return mixed
-     * @throws Zend_Exception if no entry is registerd for $index.
-     */
-    public static function get($index)
-    {
-        $instance = self::getInstance();
-
-        if (!$instance->offsetExists($index)) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception("No entry is registered for key '$index'");
-        }
-
-        return $instance->offsetGet($index);
-    }
-
-    /**
-     * setter method, basically same as offsetSet().
-     *
-     * This method can be called from an object of type Zend_Registry, or it
-     * can be called statically.  In the latter case, it uses the default
-     * static instance stored in the class.
-     *
-     * @param string $index The location in the ArrayObject in which to store
-     *   the value.
-     * @param mixed $value The object to store in the ArrayObject.
-     * @return void
-     */
-    public static function set($index, $value)
-    {
-        $instance = self::getInstance();
-        $instance->offsetSet($index, $value);
-    }
-
-    /**
-     * Returns TRUE if the $index is a named value in the registry,
-     * or FALSE if $index was not found in the registry.
-     *
-     * @param  string $index
-     * @return boolean
-     */
-    public static function isRegistered($index)
-    {
-        if (self::$_registry === null) {
-            return false;
-        }
-        return self::$_registry->offsetExists($index);
-    }
-
-    /**
-     * Constructs a parent ArrayObject with default
-     * ARRAY_AS_PROPS to allow acces as an object
-     *
-     * @param array $array data array
-     * @param integer $flags ArrayObject flags
-     */
-    public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS)
-    {
-        parent::__construct($array, $flags);
-    }
-
-    /**
-     * @param string $index
-     * @returns mixed
-     *
-     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-     */
-    public function offsetExists($index)
-    {
-        return array_key_exists($index, $this);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Rest/Client.php b/airtime_mvc/library/Zend/Rest/Client.php
deleted file mode 100644
index 7f45287e6..000000000
--- a/airtime_mvc/library/Zend/Rest/Client.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Service_Abstract */
-require_once 'Zend/Service/Abstract.php';
-
-/** Zend_Rest_Client_Result */
-require_once 'Zend/Rest/Client/Result.php';
-
-/** Zend_Uri */
-require_once 'Zend/Uri.php';
-
-/**
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Client extends Zend_Service_Abstract
-{
-    /**
-     * Data for the query
-     * @var array
-     */
-    protected $_data = array();
-
-     /**
-     * Zend_Uri of this web service
-     * @var Zend_Uri_Http
-     */
-    protected $_uri = null;
-
-    /**
-     * Constructor
-     *
-     * @param string|Zend_Uri_Http $uri URI for the web service
-     * @return void
-     */
-    public function __construct($uri = null)
-    {
-        if (!empty($uri)) {
-            $this->setUri($uri);
-        }
-    }
-
-    /**
-     * Set the URI to use in the request
-     *
-     * @param string|Zend_Uri_Http $uri URI for the web service
-     * @return Zend_Rest_Client
-     */
-    public function setUri($uri)
-    {
-        if ($uri instanceof Zend_Uri_Http) {
-            $this->_uri = $uri;
-        } else {
-            $this->_uri = Zend_Uri::factory($uri);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve the current request URI object
-     *
-     * @return Zend_Uri_Http
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Call a remote REST web service URI and return the Zend_Http_Response object
-     *
-     * @param  string $path            The path to append to the URI
-     * @throws Zend_Rest_Client_Exception
-     * @return void
-     */
-    final private function _prepareRest($path)
-    {
-        // Get the URI object and configure it
-        if (!$this->_uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Rest/Client/Exception.php';
-            throw new Zend_Rest_Client_Exception('URI object must be set before performing call');
-        }
-
-        $uri = $this->_uri->getUri();
-
-        if ($path[0] != '/' && $uri[strlen($uri)-1] != '/') {
-            $path = '/' . $path;
-        }
-
-        $this->_uri->setPath($path);
-
-        /**
-         * Get the HTTP client and configure it for the endpoint URI.  Do this each time
-         * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses.
-         */
-        self::getHttpClient()->resetParameters()->setUri($this->_uri);
-    }
-
-    /**
-     * Performs an HTTP GET request to the $path.
-     *
-     * @param string $path
-     * @param array  $query Array of GET parameters
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    final public function restGet($path, array $query = null)
-    {
-        $this->_prepareRest($path);
-        $client = self::getHttpClient();
-        $client->setParameterGet($query);
-        return $client->request('GET');
-    }
-
-    /**
-     * Perform a POST or PUT
-     *
-     * Performs a POST or PUT request. Any data provided is set in the HTTP
-     * client. String data is pushed in as raw POST data; array or object data
-     * is pushed in as POST parameters.
-     *
-     * @param mixed $method
-     * @param mixed $data
-     * @return Zend_Http_Response
-     */
-    protected function _performPost($method, $data = null)
-    {
-        $client = self::getHttpClient();
-        if (is_string($data)) {
-            $client->setRawData($data);
-        } elseif (is_array($data) || is_object($data)) {
-            $client->setParameterPost((array) $data);
-        }
-        return $client->request($method);
-    }
-
-    /**
-     * Performs an HTTP POST request to $path.
-     *
-     * @param string $path
-     * @param mixed $data Raw data to send
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    final public function restPost($path, $data = null)
-    {
-        $this->_prepareRest($path);
-        return $this->_performPost('POST', $data);
-    }
-
-    /**
-     * Performs an HTTP PUT request to $path.
-     *
-     * @param string $path
-     * @param mixed $data Raw data to send in request
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    final public function restPut($path, $data = null)
-    {
-        $this->_prepareRest($path);
-        return $this->_performPost('PUT', $data);
-    }
-
-    /**
-     * Performs an HTTP DELETE request to $path.
-     *
-     * @param string $path
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    final public function restDelete($path)
-    {
-        $this->_prepareRest($path);
-        return self::getHttpClient()->request('DELETE');
-    }
-
-    /**
-     * Method call overload
-     *
-     * Allows calling REST actions as object methods; however, you must
-     * follow-up by chaining the request with a request to an HTTP request
-     * method (post, get, delete, put):
-     * <code>
-     * $response = $rest->sayHello('Foo', 'Manchu')->get();
-     * </code>
-     *
-     * Or use them together, but in sequential calls:
-     * <code>
-     * $rest->sayHello('Foo', 'Manchu');
-     * $response = $rest->get();
-     * </code>
-     *
-     * @param string $method Method name
-     * @param array $args Method args
-     * @return Zend_Rest_Client_Result|Zend_Rest_Client Zend_Rest_Client if using
-     * a remote method, Zend_Rest_Client_Result if using an HTTP request method
-     */
-    public function __call($method, $args)
-    {
-        $methods = array('post', 'get', 'delete', 'put');
-
-        if (in_array(strtolower($method), $methods)) {
-            if (!isset($args[0])) {
-                $args[0] = $this->_uri->getPath();
-            }
-            $this->_data['rest'] = 1;
-            $data = array_slice($args, 1) + $this->_data;
-            $response = $this->{'rest' . $method}($args[0], $data);
-            $this->_data = array();//Initializes for next Rest method.
-            return new Zend_Rest_Client_Result($response->getBody());
-        } else {
-            // More than one arg means it's definitely a Zend_Rest_Server
-            if (sizeof($args) == 1) {
-                // Uses first called function name as method name
-                if (!isset($this->_data['method'])) {
-                    $this->_data['method'] = $method;
-                    $this->_data['arg1']  = $args[0];
-                }
-                $this->_data[$method]  = $args[0];
-            } else {
-                $this->_data['method'] = $method;
-                if (sizeof($args) > 0) {
-                    foreach ($args as $key => $arg) {
-                        $key = 'arg' . $key;
-                        $this->_data[$key] = $arg;
-                    }
-                }
-            }
-            return $this;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Rest/Client/Exception.php b/airtime_mvc/library/Zend/Rest/Client/Exception.php
deleted file mode 100644
index 85757f5a5..000000000
--- a/airtime_mvc/library/Zend/Rest/Client/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Rest_Exception
- */
-require_once 'Zend/Rest/Exception.php';
-
-
-/**
- * Zend_Rest_Server_Exception
- *
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Client_Exception extends Zend_Rest_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Rest/Client/Result.php b/airtime_mvc/library/Zend/Rest/Client/Result.php
deleted file mode 100644
index 5c48412cd..000000000
--- a/airtime_mvc/library/Zend/Rest/Client/Result.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Client_Result implements IteratorAggregate {
-    /**
-     * @var SimpleXMLElement
-     */
-    protected $_sxml;
-
-    /**
-     * error information
-     * @var string
-     */
-    protected $_errstr;
-
-    /**
-     * Constructor
-     *
-     * @param string $data XML Result
-     * @return void
-     */
-    public function __construct($data)
-    {
-        set_error_handler(array($this, 'handleXmlErrors'));
-        $this->_sxml = simplexml_load_string($data);
-        restore_error_handler();
-        if($this->_sxml === false) {
-            if ($this->_errstr === null) {
-                $message = "An error occured while parsing the REST response with simplexml.";
-            } else {
-                $message = "REST Response Error: " . $this->_errstr;
-                $this->_errstr = null;
-            }
-            require_once "Zend/Rest/Client/Result/Exception.php";
-            throw new Zend_Rest_Client_Result_Exception($message);
-        }
-    }
-
-    /**
-     * Temporary error handler for parsing REST responses.
-     *
-     * @param int    $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param string $errline
-     * @param array  $errcontext
-     * @return true
-     */
-    public function handleXmlErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
-    {
-        $this->_errstr = $errstr;
-        return true;
-    }
-
-    /**
-     * Casts a SimpleXMLElement to its appropriate PHP value
-     *
-     * @param SimpleXMLElement $value
-     * @return mixed
-     */
-    public function toValue(SimpleXMLElement $value)
-    {
-        $node = dom_import_simplexml($value);
-        return $node->nodeValue;
-    }
-
-    /**
-     * Get Property Overload
-     *
-     * @param string $name
-     * @return null|SimpleXMLElement|array Null if not found, SimpleXMLElement if only one value found, array of Zend_Rest_Client_Result objects otherwise
-     */
-    public function __get($name)
-    {
-        if (isset($this->_sxml->{$name})) {
-            return $this->_sxml->{$name};
-        }
-
-        $result = $this->_sxml->xpath("//$name");
-        $count  = count($result);
-
-        if ($count == 0) {
-            return null;
-        } elseif ($count == 1) {
-            return $result[0];
-        } else {
-            return $result;
-        }
-    }
-
-    /**
-     * Cast properties to PHP values
-     *
-     * For arrays, loops through each element and casts to a value as well.
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (null !== ($value = $this->__get($method))) {
-            if (!is_array($value)) {
-                return $this->toValue($value);
-            } else {
-                $return = array();
-                foreach ($value as $element) {
-                    $return[] = $this->toValue($element);
-                }
-                return $return;
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Isset Overload
-     *
-     * @param string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        if (isset($this->_sxml->{$name})) {
-            return true;
-        }
-
-        $result = $this->_sxml->xpath("//$name");
-
-        if (sizeof($result) > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Implement IteratorAggregate::getIterator()
-     *
-     * @return SimpleXMLIterator
-     */
-    public function getIterator()
-    {
-        return $this->_sxml;
-    }
-
-    /**
-     * Get Request Status
-     *
-     * @return boolean
-     */
-    public function getStatus()
-    {
-        $status = $this->_sxml->xpath('//status/text()');
-
-        $status = strtolower($status[0]);
-
-        if (ctype_alpha($status) && $status == 'success') {
-            return true;
-        } elseif (ctype_alpha($status) && $status != 'success') {
-            return false;
-        } else {
-            return (bool) $status;
-        }
-    }
-
-    public function isError()
-    {
-        $status = $this->getStatus();
-        if ($status) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    public function isSuccess()
-    {
-        $status = $this->getStatus();
-        if ($status) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * toString overload
-     *
-     * Be sure to only call this when the result is a single value!
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!$this->getStatus()) {
-            $message = $this->_sxml->xpath('//message');
-            return (string) $message[0];
-        } else {
-            $result = $this->_sxml->xpath('//response');
-            if (sizeof($result) > 1) {
-                return (string) "An error occured.";
-            } else {
-                return (string) $result[0];
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Rest/Client/Result/Exception.php b/airtime_mvc/library/Zend/Rest/Client/Result/Exception.php
deleted file mode 100644
index d51a6e56d..000000000
--- a/airtime_mvc/library/Zend/Rest/Client/Result/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Rest_Client_Exception
- */
-require_once "Zend/Rest/Client/Exception.php";
-
-/**
- * Zend_Rest_Client_Result_Exception
- *
- * @package    Zend_Rest
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Client_Result_Exception extends Zend_Rest_Client_Exception{}
diff --git a/airtime_mvc/library/Zend/Rest/Controller.php b/airtime_mvc/library/Zend/Rest/Controller.php
deleted file mode 100644
index fe262e69a..000000000
--- a/airtime_mvc/library/Zend/Rest/Controller.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Controller.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Controller_Action */
-require_once 'Zend/Controller/Action.php';
-
-/**
- * An abstract class to guide implementation of action controllers for use with
- * Zend_Rest_Route.
- *
- * @category   Zend
- * @package Zend_Rest
- * @see Zend_Rest_Route
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Rest_Controller extends Zend_Controller_Action
-{
-    /**
-     * The index action handles index/list requests; it should respond with a
-     * list of the requested resources.
-     */
-    abstract public function indexAction();
-
-    /**
-     * The get action handles GET requests and receives an 'id' parameter; it
-     * should respond with the server resource state of the resource identified
-     * by the 'id' value.
-     */
-    abstract public function getAction();
-
-    /**
-     * The post action handles POST requests; it should accept and digest a
-     * POSTed resource representation and persist the resource state.
-     */
-    abstract public function postAction();
-
-    /**
-     * The put action handles PUT requests and receives an 'id' parameter; it
-     * should update the server resource state of the resource identified by
-     * the 'id' value.
-     */
-    abstract public function putAction();
-
-    /**
-     * The delete action handles DELETE requests and receives an 'id'
-     * parameter; it should update the server resource state of the resource
-     * identified by the 'id' value.
-     */
-    abstract public function deleteAction();
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Rest/Exception.php b/airtime_mvc/library/Zend/Rest/Exception.php
deleted file mode 100644
index c1680b0e8..000000000
--- a/airtime_mvc/library/Zend/Rest/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Rest/Route.php b/airtime_mvc/library/Zend/Rest/Route.php
deleted file mode 100644
index b7bcc4d2e..000000000
--- a/airtime_mvc/library/Zend/Rest/Route.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Route.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Controller_Router_Route_Interface
- */
-require_once 'Zend/Controller/Router/Route/Interface.php';
-
-/**
- * @see Zend_Controller_Router_Route_Module
- */
-require_once 'Zend/Controller/Router/Route/Module.php';
-
-/**
- * @see Zend_Controller_Dispatcher_Interface
- */
-require_once 'Zend/Controller/Dispatcher/Interface.php';
-
-/**
- * @see Zend_Controller_Request_Abstract
- */
-require_once 'Zend/Controller/Request/Abstract.php';
-
-/**
- * Rest Route
- *
- * Request-aware route for RESTful modular routing
- *
- * @category   Zend
- * @package    Zend_Rest
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Route extends Zend_Controller_Router_Route_Module
-{
-    /**
-     * Specific Modules to receive RESTful routes
-     * @var array
-     */
-    protected $_restfulModules = null;
-
-    /**
-     * Specific Modules=>Controllers to receive RESTful routes
-     * @var array
-     */
-    protected $_restfulControllers = null;
-
-    /**
-     * @var Zend_Controller_Front
-     */
-    protected $_front;
-
-    /**
-     * Constructor
-     *
-     * @param Zend_Controller_Front $front Front Controller object
-     * @param array $defaults Defaults for map variables with keys as variable names
-     * @param array $responders Modules or controllers to receive RESTful routes
-     */
-    public function __construct(Zend_Controller_Front $front,
-        array $defaults = array(),
-        array $responders = array()
-    ) {
-        $this->_defaults = $defaults;
-
-        if ($responders) {
-            $this->_parseResponders($responders);
-        }
-
-        $this->_front      = $front;
-        $this->_dispatcher = $front->getDispatcher();
-    }
-
-    /**
-     * Instantiates route based on passed Zend_Config structure
-     */
-    public static function getInstance(Zend_Config $config)
-    {
-        $frontController = Zend_Controller_Front::getInstance();
-        $defaultsArray = array();
-        $restfulConfigArray = array();
-        foreach ($config as $key => $values) {
-        	if ($key == 'type') {
-        		// do nothing
-        	} elseif ($key == 'defaults') {
-        		$defaultsArray = $values->toArray();
-        	} else {
-        		$restfulConfigArray[$key] = explode(',', $values);
-        	}
-        }
-        $instance = new self($frontController, $defaultsArray, $restfulConfigArray);
-        return $instance;
-    }
-
-    /**
-     * Matches a user submitted request. Assigns and returns an array of variables
-     * on a successful match.
-     *
-     * If a request object is registered, it uses its setModuleName(),
-     * setControllerName(), and setActionName() accessors to set those values.
-     * Always returns the values as an array.
-     *
-     * @param Zend_Controller_Request_Http $request Request used to match against this routing ruleset
-     * @return array An array of assigned values or a false on a mismatch
-     */
-    public function match($request, $partial = false)
-    {
-        if (!$request instanceof Zend_Controller_Request_Http) {
-            $request = $this->_front->getRequest();
-        }
-        $this->_request = $request;
-        $this->_setRequestKeys();
-
-        $path   = $request->getPathInfo();
-        $params = $request->getParams();
-        $values = array();
-        $path   = trim($path, self::URI_DELIMITER);
-
-        if ($path != '') {
-
-            $path = explode(self::URI_DELIMITER, $path);
-            // Determine Module
-            $moduleName = $this->_defaults[$this->_moduleKey];
-            $dispatcher = $this->_front->getDispatcher();
-            if ($dispatcher && $dispatcher->isValidModule($path[0])) {
-                $moduleName = $path[0];
-                if ($this->_checkRestfulModule($moduleName)) {
-                    $values[$this->_moduleKey] = array_shift($path);
-                    $this->_moduleValid = true;
-                }
-            }
-
-            // Determine Controller
-            $controllerName = $this->_defaults[$this->_controllerKey];
-            if (count($path) && !empty($path[0])) {
-                if ($this->_checkRestfulController($moduleName, $path[0])) {
-                    $controllerName = $path[0];
-                    $values[$this->_controllerKey] = array_shift($path);
-                    $values[$this->_actionKey] = 'get';
-                } else {
-                    // If Controller in URI is not found to be a RESTful
-                    // Controller, return false to fall back to other routes
-                    return false;
-                }
-            } elseif ($this->_checkRestfulController($moduleName, $controllerName)) {
-            	$values[$this->_controllerKey] = $controllerName;
-            	$values[$this->_actionKey] = 'get';
-            } else {
-            	return false;
-            }
-
-            //Store path count for method mapping
-            $pathElementCount = count($path);
-
-            // Check for "special get" URI's
-            $specialGetTarget = false;
-            if ($pathElementCount && array_search($path[0], array('index', 'new')) > -1) {
-                $specialGetTarget = array_shift($path);
-            } elseif ($pathElementCount && $path[$pathElementCount-1] == 'edit') {
-                $specialGetTarget = 'edit';
-                $params['id'] = $path[$pathElementCount-2];
-            } elseif ($pathElementCount == 1) {
-                $params['id'] = urldecode(array_shift($path));
-            } elseif ($pathElementCount == 0 && !isset($params['id'])) {
-                $specialGetTarget = 'index';
-            }
-
-            // Digest URI params
-            if ($numSegs = count($path)) {
-                for ($i = 0; $i < $numSegs; $i = $i + 2) {
-                    $key = urldecode($path[$i]);
-                    $val = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null;
-                    $params[$key] = $val;
-                }
-            }
-
-            // Determine Action
-            $requestMethod = strtolower($request->getMethod());
-            if ($requestMethod != 'get') {
-                if ($request->getParam('_method')) {
-                    $values[$this->_actionKey] = strtolower($request->getParam('_method'));
-                } elseif ( $request->getHeader('X-HTTP-Method-Override') ) {
-                    $values[$this->_actionKey] = strtolower($request->getHeader('X-HTTP-Method-Override'));
-                } else {
-                    $values[$this->_actionKey] = $requestMethod;
-                }
-
-                // Map PUT and POST to actual create/update actions
-                // based on parameter count (posting to resource or collection)
-                switch( $values[$this->_actionKey] ){
-                    case 'post':
-                        if ($pathElementCount > 0) {
-                            $values[$this->_actionKey] = 'put';
-                        } else {
-                            $values[$this->_actionKey] = 'post';
-                        }
-                        break;
-                    case 'put':
-                        $values[$this->_actionKey] = 'put';
-                        break;
-                }
-
-            } elseif ($specialGetTarget) {
-                $values[$this->_actionKey] = $specialGetTarget;
-            }
-
-        }
-        $this->_values = $values + $params;
-
-        $result = $this->_values + $this->_defaults;
-
-        if ($partial && $result)
-            $this->setMatchedPath($request->getPathInfo());
-
-        return $result;
-    }
-
-    /**
-     * Assembles user submitted parameters forming a URL path defined by this route
-     *
-     * @param array $data An array of variable and value pairs used as parameters
-     * @param bool $reset Weither to reset the current params
-     * @param bool $encode Weither to return urlencoded string
-     * @return string Route path with user submitted parameters
-     */
-    public function assemble($data = array(), $reset = false, $encode = true)
-    {
-        if (!$this->_keysSet) {
-            if (null === $this->_request) {
-                $this->_request = $this->_front->getRequest();
-            }
-            $this->_setRequestKeys();
-        }
-
-        $params = (!$reset) ? $this->_values : array();
-
-        foreach ($data as $key => $value) {
-            if ($value !== null) {
-                $params[$key] = $value;
-            } elseif (isset($params[$key])) {
-                unset($params[$key]);
-            }
-        }
-
-        $params += $this->_defaults;
-
-        $url = '';
-
-        if ($this->_moduleValid || array_key_exists($this->_moduleKey, $data)) {
-            if ($params[$this->_moduleKey] != $this->_defaults[$this->_moduleKey]) {
-                $module = $params[$this->_moduleKey];
-            }
-        }
-        unset($params[$this->_moduleKey]);
-
-        $controller = $params[$this->_controllerKey];
-        unset($params[$this->_controllerKey]);
-
-        unset($params[$this->_actionKey]);
-
-        if (isset($params['index']) && $params['index']) {
-            unset($params['index']);
-            $url .= '/index';
-            foreach ($params as $key => $value) {
-                if ($encode) $value = urlencode($value);
-                $url .= '/' . $key . '/' . $value;
-            }
-        } elseif (isset($params['id'])) {
-            $url .= '/' . $params['id'];
-        }
-
-        if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) {
-            $url = '/' . $controller . $url;
-        }
-
-        if (isset($module)) {
-            $url = '/' . $module . $url;
-        }
-
-        return ltrim($url, self::URI_DELIMITER);
-    }
-
-    /**
-     * Tells Rewrite Router which version this Route is
-     *
-     * @return int Route "version"
-     */
-    public function getVersion()
-    {
-        return 2;
-    }
-
-    /**
-     * Parses the responders array sent to constructor to know
-     * which modules and/or controllers are RESTful
-     *
-     * @param array $responders
-     */
-    protected function _parseResponders($responders)
-    {
-        $modulesOnly = true;
-        foreach ($responders as $responder) {
-            if(is_array($responder)) {
-                $modulesOnly = false;
-                break;
-            }
-        }
-        if ($modulesOnly) {
-            $this->_restfulModules = $responders;
-        } else {
-            $this->_restfulControllers = $responders;
-        }
-    }
-
-    /**
-     * Determine if a specified module supports RESTful routing
-     *
-     * @param string $moduleName
-     * @return bool
-     */
-    protected function _checkRestfulModule($moduleName)
-    {
-        if ($this->_allRestful()) {
-            return true;
-        }
-        if ($this->_fullRestfulModule($moduleName)) {
-            return true;
-        }
-        if ($this->_restfulControllers && array_key_exists($moduleName, $this->_restfulControllers)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Determine if a specified module + controller combination supports
-     * RESTful routing
-     *
-     * @param string $moduleName
-     * @param string $controllerName
-     * @return bool
-     */
-    protected function _checkRestfulController($moduleName, $controllerName)
-    {
-        if ($this->_allRestful()) {
-            return true;
-        }
-        if ($this->_fullRestfulModule($moduleName)) {
-            return true;
-        }
-        if ($this->_checkRestfulModule($moduleName)
-            && $this->_restfulControllers
-            && (false !== array_search($controllerName, $this->_restfulControllers[$moduleName]))
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Determines if RESTful routing applies to the entire app
-     *
-     * @return bool
-     */
-    protected function _allRestful()
-    {
-        return (!$this->_restfulModules && !$this->_restfulControllers);
-    }
-
-    /**
-     * Determines if RESTful routing applies to an entire module
-     *
-     * @param string $moduleName
-     * @return bool
-     */
-    protected function _fullRestfulModule($moduleName)
-    {
-        return (
-            $this->_restfulModules
-            && (false !==array_search($moduleName, $this->_restfulModules))
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Rest/Server.php b/airtime_mvc/library/Zend/Rest/Server.php
deleted file mode 100644
index 5862c0cd8..000000000
--- a/airtime_mvc/library/Zend/Rest/Server.php
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Server_Interface
- */
-require_once 'Zend/Server/Interface.php';
-
-/**
- * @see Zend_Server_Reflection
- */
-require_once 'Zend/Server/Reflection.php';
-
-/**
- * @see Zend_Server_Abstract
- */
-require_once 'Zend/Server/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Server implements Zend_Server_Interface
-{
-    /**
-     * Class Constructor Args
-     * @var array
-     */
-    protected $_args = array();
-
-    /**
-     * @var string Encoding
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * @var array An array of Zend_Server_Reflect_Method
-     */
-    protected $_functions = array();
-
-    /**
-     * @var array Array of headers to send
-     */
-    protected $_headers = array();
-
-    /**
-     * @var array PHP's Magic Methods, these are ignored
-     */
-    protected static $magicMethods = array(
-        '__construct',
-        '__destruct',
-        '__get',
-        '__set',
-        '__call',
-        '__sleep',
-        '__wakeup',
-        '__isset',
-        '__unset',
-        '__tostring',
-        '__clone',
-        '__set_state',
-    );
-
-    /**
-     * @var string Current Method
-     */
-    protected $_method;
-
-    /**
-     * @var Zend_Server_Reflection
-     */
-    protected $_reflection = null;
-
-    /**
-     * Whether or not {@link handle()} should send output or return the response.
-     * @var boolean Defaults to false
-     */
-    protected $_returnResponse = false;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        set_exception_handler(array($this, "fault"));
-        $this->_reflection = new Zend_Server_Reflection();
-    }
-
-    /**
-     * Set XML encoding
-     *
-     * @param  string $encoding
-     * @return Zend_Rest_Server
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = (string) $encoding;
-        return $this;
-    }
-
-    /**
-     * Get XML encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Lowercase a string
-     *
-     * Lowercase's a string by reference
-     *
-     * @param string $value
-     * @param string $key
-     * @return string Lower cased string
-     */
-    public static function lowerCase(&$value, &$key)
-    {
-        return $value = strtolower($value);
-    }
-
-    /**
-     * Whether or not to return a response
-     *
-     * If called without arguments, returns the value of the flag. If called
-     * with an argument, sets the flag.
-     *
-     * When 'return response' is true, {@link handle()} will not send output,
-     * but will instead return the response from the dispatched function/method.
-     *
-     * @param boolean $flag
-     * @return boolean|Zend_Rest_Server Returns Zend_Rest_Server when used to set the flag; returns boolean flag value otherwise.
-     */
-    public function returnResponse($flag = null)
-    {
-        if (null === $flag) {
-            return $this->_returnResponse;
-        }
-
-        $this->_returnResponse = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Implement Zend_Server_Interface::handle()
-     *
-     * @param  array $request
-     * @throws Zend_Rest_Server_Exception
-     * @return string|void
-     */
-    public function handle($request = false)
-    {
-        $this->_headers = array('Content-Type: text/xml');
-        if (!$request) {
-            $request = $_REQUEST;
-        }
-        if (isset($request['method'])) {
-            $this->_method = $request['method'];
-            if (isset($this->_functions[$this->_method])) {
-                if ($this->_functions[$this->_method] instanceof Zend_Server_Reflection_Function || $this->_functions[$this->_method] instanceof Zend_Server_Reflection_Method && $this->_functions[$this->_method]->isPublic()) {
-                    $request_keys = array_keys($request);
-                    array_walk($request_keys, array(__CLASS__, "lowerCase"));
-                    $request = array_combine($request_keys, $request);
-
-                    $func_args = $this->_functions[$this->_method]->getParameters();
-
-                    $calling_args = array();
-                    $missing_args = array();
-                    foreach ($func_args as $arg) {
-                        if (isset($request[strtolower($arg->getName())])) {
-                            $calling_args[] = $request[strtolower($arg->getName())];
-                        } elseif ($arg->isOptional()) {
-                            $calling_args[] = $arg->getDefaultValue();
-                        } else {
-                            $missing_args[] = $arg->getName();
-                        }
-                    }
-
-                    foreach ($request as $key => $value) {
-                        if (substr($key, 0, 3) == 'arg') {
-                            $key = str_replace('arg', '', $key);
-                            $calling_args[$key] = $value;
-                            if (($index = array_search($key, $missing_args)) !== false) {
-                                unset($missing_args[$index]);
-                            }
-                        }
-                    }
-
-                    // Sort arguments by key -- @see ZF-2279
-                    ksort($calling_args);
-
-                    $result = false;
-                    if (count($calling_args) < count($func_args)) {
-                        require_once 'Zend/Rest/Server/Exception.php';
-                        $result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Missing argument(s): ' . implode(', ', $missing_args) . '.'), 400);
-                    }
-
-                    if (!$result && $this->_functions[$this->_method] instanceof Zend_Server_Reflection_Method) {
-                        // Get class
-                        $class = $this->_functions[$this->_method]->getDeclaringClass()->getName();
-
-                        if ($this->_functions[$this->_method]->isStatic()) {
-                            // for some reason, invokeArgs() does not work the same as
-                            // invoke(), and expects the first argument to be an object.
-                            // So, using a callback if the method is static.
-                            $result = $this->_callStaticMethod($class, $calling_args);
-                        } else {
-                            // Object method
-                            $result = $this->_callObjectMethod($class, $calling_args);
-                        }
-                    } elseif (!$result) {
-                        try {
-                            $result = call_user_func_array($this->_functions[$this->_method]->getName(), $calling_args); //$this->_functions[$this->_method]->invokeArgs($calling_args);
-                        } catch (Exception $e) {
-                            $result = $this->fault($e);
-                        }
-                    }
-                } else {
-                    require_once "Zend/Rest/Server/Exception.php";
-                    $result = $this->fault(
-                        new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."),
-                        404
-                    );
-                }
-            } else {
-                require_once "Zend/Rest/Server/Exception.php";
-                $result = $this->fault(
-                    new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."),
-                    404
-                );
-            }
-        } else {
-            require_once "Zend/Rest/Server/Exception.php";
-            $result = $this->fault(
-                new Zend_Rest_Server_Exception("No Method Specified."),
-                404
-            );
-        }
-
-        if ($result instanceof SimpleXMLElement) {
-            $response = $result->asXML();
-        } elseif ($result instanceof DOMDocument) {
-            $response = $result->saveXML();
-        } elseif ($result instanceof DOMNode) {
-            $response = $result->ownerDocument->saveXML($result);
-        } elseif (is_array($result) || is_object($result)) {
-            $response = $this->_handleStruct($result);
-        } else {
-            $response = $this->_handleScalar($result);
-        }
-
-        if (!$this->returnResponse()) {
-            if (!headers_sent()) {
-                foreach ($this->_headers as $header) {
-                    header($header);
-                }
-            }
-
-            echo $response;
-            return;
-        }
-
-        return $response;
-     }
-
-    /**
-     * Implement Zend_Server_Interface::setClass()
-     *
-     * @param string $classname Class name
-     * @param string $namespace Class namespace (unused)
-     * @param array $argv An array of Constructor Arguments
-     */
-    public function setClass($classname, $namespace = '', $argv = array())
-    {
-        $this->_args = $argv;
-        foreach ($this->_reflection->reflectClass($classname, $argv)->getMethods() as $method) {
-            $this->_functions[$method->getName()] = $method;
-        }
-    }
-
-    /**
-     * Handle an array or object result
-     *
-     * @param array|object $struct Result Value
-     * @return string XML Response
-     */
-    protected function _handleStruct($struct)
-    {
-        $function = $this->_functions[$this->_method];
-        if ($function instanceof Zend_Server_Reflection_Method) {
-            $class = $function->getDeclaringClass()->getName();
-        } else {
-            $class = false;
-        }
-
-        $method = $function->getName();
-
-        $dom    = new DOMDocument('1.0', $this->getEncoding());
-        if ($class) {
-            $root   = $dom->createElement($class);
-            $method = $dom->createElement($method);
-            $root->appendChild($method);
-        } else {
-            $root   = $dom->createElement($method);
-            $method = $root;
-        }
-        $root->setAttribute('generator', 'zend');
-        $root->setAttribute('version', '1.0');
-        $dom->appendChild($root);
-
-        $this->_structValue($struct, $dom, $method);
-
-        $struct = (array) $struct;
-        if (!isset($struct['status'])) {
-            $status = $dom->createElement('status', 'success');
-            $method->appendChild($status);
-        }
-
-        return $dom->saveXML();
-    }
-
-    /**
-     * Recursively iterate through a struct
-     *
-     * Recursively iterates through an associative array or object's properties
-     * to build XML response.
-     *
-     * @param mixed $struct
-     * @param DOMDocument $dom
-     * @param DOMElement $parent
-     * @return void
-     */
-    protected function _structValue($struct, DOMDocument $dom, DOMElement $parent)
-    {
-        $struct = (array) $struct;
-
-        foreach ($struct as $key => $value) {
-            if ($value === false) {
-                $value = 0;
-            } elseif ($value === true) {
-                $value = 1;
-            }
-
-            if (ctype_digit((string) $key)) {
-                $key = 'key_' . $key;
-            }
-
-            if (is_array($value) || is_object($value)) {
-                $element = $dom->createElement($key);
-                $this->_structValue($value, $dom, $element);
-            } else {
-                $element = $dom->createElement($key);
-                $element->appendChild($dom->createTextNode($value));
-            }
-
-            $parent->appendChild($element);
-        }
-    }
-
-    /**
-     * Handle a single value
-     *
-     * @param string|int|boolean $value Result value
-     * @return string XML Response
-     */
-    protected function _handleScalar($value)
-    {
-        $function = $this->_functions[$this->_method];
-        if ($function instanceof Zend_Server_Reflection_Method) {
-            $class = $function->getDeclaringClass()->getName();
-        } else {
-            $class = false;
-        }
-
-        $method = $function->getName();
-
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        if ($class) {
-            $xml = $dom->createElement($class);
-            $methodNode = $dom->createElement($method);
-            $xml->appendChild($methodNode);
-        } else {
-            $xml = $dom->createElement($method);
-            $methodNode = $xml;
-        }
-        $xml->setAttribute('generator', 'zend');
-        $xml->setAttribute('version', '1.0');
-        $dom->appendChild($xml);
-
-        if ($value === false) {
-            $value = 0;
-        } elseif ($value === true) {
-            $value = 1;
-        }
-
-        if (isset($value)) {
-            $element = $dom->createElement('response');
-            $element->appendChild($dom->createTextNode($value));
-            $methodNode->appendChild($element);
-        } else {
-            $methodNode->appendChild($dom->createElement('response'));
-        }
-
-        $methodNode->appendChild($dom->createElement('status', 'success'));
-
-        return $dom->saveXML();
-    }
-
-    /**
-     * Implement Zend_Server_Interface::fault()
-     *
-     * Creates XML error response, returning DOMDocument with response.
-     *
-     * @param string|Exception $fault Message
-     * @param int $code Error Code
-     * @return DOMDocument
-     */
-    public function fault($exception = null, $code = null)
-    {
-        if (isset($this->_functions[$this->_method])) {
-            $function = $this->_functions[$this->_method];
-        } elseif (isset($this->_method)) {
-            $function = $this->_method;
-        } else {
-            $function = 'rest';
-        }
-
-        if ($function instanceof Zend_Server_Reflection_Method) {
-            $class = $function->getDeclaringClass()->getName();
-        } else {
-            $class = false;
-        }
-
-        if ($function instanceof Zend_Server_Reflection_Function_Abstract) {
-            $method = $function->getName();
-        } else {
-            $method = $function;
-        }
-
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        if ($class) {
-            $xml       = $dom->createElement($class);
-            $xmlMethod = $dom->createElement($method);
-            $xml->appendChild($xmlMethod);
-        } else {
-            $xml       = $dom->createElement($method);
-            $xmlMethod = $xml;
-        }
-        $xml->setAttribute('generator', 'zend');
-        $xml->setAttribute('version', '1.0');
-        $dom->appendChild($xml);
-
-        $xmlResponse = $dom->createElement('response');
-        $xmlMethod->appendChild($xmlResponse);
-
-        if ($exception instanceof Exception) {
-            $element = $dom->createElement('message');
-            $element->appendChild($dom->createTextNode($exception->getMessage()));
-            $xmlResponse->appendChild($element);
-            $code = $exception->getCode();
-        } elseif (($exception !== null) || 'rest' == $function) {
-            $xmlResponse->appendChild($dom->createElement('message', 'An unknown error occured. Please try again.'));
-        } else {
-            $xmlResponse->appendChild($dom->createElement('message', 'Call to ' . $method . ' failed.'));
-        }
-
-        $xmlMethod->appendChild($xmlResponse);
-        $xmlMethod->appendChild($dom->createElement('status', 'failed'));
-
-        // Headers to send
-        if ($code === null || (404 != $code)) {
-            $this->_headers[] = 'HTTP/1.0 400 Bad Request';
-        } else {
-            $this->_headers[] = 'HTTP/1.0 404 File Not Found';
-        }
-
-        return $dom;
-    }
-
-    /**
-     * Retrieve any HTTP extra headers set by the server
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Implement Zend_Server_Interface::addFunction()
-     *
-     * @param string $function Function Name
-     * @param string $namespace Function namespace (unused)
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        if (!is_array($function)) {
-            $function = (array) $function;
-        }
-
-        foreach ($function as $func) {
-            if (is_callable($func) && !in_array($func, self::$magicMethods)) {
-                $this->_functions[$func] = $this->_reflection->reflectFunction($func);
-            } else {
-                require_once 'Zend/Rest/Server/Exception.php';
-                throw new Zend_Rest_Server_Exception("Invalid Method Added to Service.");
-            }
-        }
-    }
-
-    /**
-     * Implement Zend_Server_Interface::getFunctions()
-     *
-     * @return array An array of Zend_Server_Reflection_Method's
-     */
-    public function getFunctions()
-    {
-        return $this->_functions;
-    }
-
-    /**
-     * Implement Zend_Server_Interface::loadFunctions()
-     *
-     * @todo Implement
-     * @param array $functions
-     */
-    public function loadFunctions($functions)
-    {
-    }
-
-    /**
-     * Implement Zend_Server_Interface::setPersistence()
-     *
-     * @todo Implement
-     * @param int $mode
-     */
-    public function setPersistence($mode)
-    {
-    }
-
-    /**
-     * Call a static class method and return the result
-     *
-     * @param  string $class
-     * @param  array $args
-     * @return mixed
-     */
-    protected function _callStaticMethod($class, array $args)
-    {
-        try {
-            $result = call_user_func_array(array($class, $this->_functions[$this->_method]->getName()), $args);
-        } catch (Exception $e) {
-            $result = $this->fault($e);
-        }
-        return $result;
-    }
-
-    /**
-     * Call an instance method of an object
-     *
-     * @param  string $class
-     * @param  array $args
-     * @return mixed
-     * @throws Zend_Rest_Server_Exception For invalid class name
-     */
-    protected function _callObjectMethod($class, array $args)
-    {
-        try {
-            if ($this->_functions[$this->_method]->getDeclaringClass()->getConstructor()) {
-                $object = $this->_functions[$this->_method]->getDeclaringClass()->newInstanceArgs($this->_args);
-            } else {
-                $object = $this->_functions[$this->_method]->getDeclaringClass()->newInstance();
-            }
-        } catch (Exception $e) {
-            require_once 'Zend/Rest/Server/Exception.php';
-            throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class .
-                                                 ' to invoke method ' . $this->_functions[$this->_method]->getName() .
-                                                 ' (' . $e->getMessage() . ') ',
-                                                 500, $e);
-        }
-
-        try {
-            $result = $this->_functions[$this->_method]->invokeArgs($object, $args);
-        } catch (Exception $e) {
-            $result = $this->fault($e);
-        }
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Rest/Server/Exception.php b/airtime_mvc/library/Zend/Rest/Server/Exception.php
deleted file mode 100644
index c5cc5f888..000000000
--- a/airtime_mvc/library/Zend/Rest/Server/Exception.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Rest
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Rest_Exception
- */
-require_once 'Zend/Rest/Exception.php';
-
-
-/**
- * Zend_Rest_Server_Exception
- *
- * @package    Zend_Rest
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Rest_Server_Exception extends Zend_Rest_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Exception.php b/airtime_mvc/library/Zend/Search/Exception.php
deleted file mode 100644
index 202ff480d..000000000
--- a/airtime_mvc/library/Zend/Search/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Framework base exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene.php b/airtime_mvc/library/Zend/Search/Lucene.php
deleted file mode 100644
index 15f87dc49..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene.php
+++ /dev/null
@@ -1,1577 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Lucene.php 21640 2010-03-24 18:28:32Z alexander $
- */
-
-
-/** User land classes and interfaces turned on by Zend/Search/Lucene.php file inclusion. */
-/** @todo Section should be removed with ZF 2.0 release as obsolete                      */
-
-/** Zend_Search_Lucene_Document_Html */
-require_once 'Zend/Search/Lucene/Document/Html.php';
-
-/** Zend_Search_Lucene_Document_Docx */
-require_once 'Zend/Search/Lucene/Document/Docx.php';
-
-/** Zend_Search_Lucene_Document_Pptx */
-require_once 'Zend/Search/Lucene/Document/Pptx.php';
-
-/** Zend_Search_Lucene_Document_Xlsx */
-require_once 'Zend/Search/Lucene/Document/Xlsx.php';
-
-/** Zend_Search_Lucene_Search_QueryParser */
-require_once 'Zend/Search/Lucene/Search/QueryParser.php';
-
-/** Zend_Search_Lucene_Search_QueryHit */
-require_once 'Zend/Search/Lucene/Search/QueryHit.php';
-
-/** Zend_Search_Lucene_Analysis_Analyzer */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-/** Zend_Search_Lucene_Search_Query_Term */
-require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-
-/** Zend_Search_Lucene_Search_Query_Phrase */
-require_once 'Zend/Search/Lucene/Search/Query/Phrase.php';
-
-/** Zend_Search_Lucene_Search_Query_MultiTerm */
-require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-
-/** Zend_Search_Lucene_Search_Query_Wildcard */
-require_once 'Zend/Search/Lucene/Search/Query/Wildcard.php';
-
-/** Zend_Search_Lucene_Search_Query_Range */
-require_once 'Zend/Search/Lucene/Search/Query/Range.php';
-
-/** Zend_Search_Lucene_Search_Query_Fuzzy */
-require_once 'Zend/Search/Lucene/Search/Query/Fuzzy.php';
-
-/** Zend_Search_Lucene_Search_Query_Boolean */
-require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-
-/** Zend_Search_Lucene_Search_Query_Empty */
-require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-
-/** Zend_Search_Lucene_Search_Query_Insignificant */
-require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-
-
-
-
-/** Internally used classes */
-
-/** Zend_Search_Lucene_Interface */
-require_once 'Zend/Search/Lucene/Interface.php';
-
-/** Zend_Search_Lucene_Index_SegmentInfo */
-require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
-
-/** Zend_Search_Lucene_LockManager */
-require_once 'Zend/Search/Lucene/LockManager.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene implements Zend_Search_Lucene_Interface
-{
-    /**
-     * Default field name for search
-     *
-     * Null means search through all fields
-     *
-     * @var string
-     */
-    private static $_defaultSearchField = null;
-
-    /**
-     * Result set limit
-     *
-     * 0 means no limit
-     *
-     * @var integer
-     */
-    private static $_resultSetLimit = 0;
-
-    /**
-     * Terms per query limit
-     *
-     * 0 means no limit
-     *
-     * @var integer
-     */
-    private static $_termsPerQueryLimit = 1024;
-
-    /**
-     * File system adapter.
-     *
-     * @var Zend_Search_Lucene_Storage_Directory
-     */
-    private $_directory = null;
-
-    /**
-     * File system adapter closing option
-     *
-     * @var boolean
-     */
-    private $_closeDirOnExit = true;
-
-    /**
-     * Writer for this index, not instantiated unless required.
-     *
-     * @var Zend_Search_Lucene_Index_Writer
-     */
-    private $_writer = null;
-
-    /**
-     * Array of Zend_Search_Lucene_Index_SegmentInfo objects for current version of index.
-     *
-     * @var array Zend_Search_Lucene_Index_SegmentInfo
-     */
-    private $_segmentInfos = array();
-
-    /**
-     * Number of documents in this index.
-     *
-     * @var integer
-     */
-    private $_docCount = 0;
-
-    /**
-     * Flag for index changes
-     *
-     * @var boolean
-     */
-    private $_hasChanges = false;
-
-
-    /**
-     * Signal, that index is already closed, changes are fixed and resources are cleaned up
-     *
-     * @var boolean
-     */
-    private $_closed = false;
-
-    /**
-     * Number of references to the index object
-     *
-     * @var integer
-     */
-    private $_refCount = 0;
-
-    /**
-     * Current segment generation
-     *
-     * @var integer
-     */
-    private $_generation;
-
-    const FORMAT_PRE_2_1 = 0;
-    const FORMAT_2_1     = 1;
-    const FORMAT_2_3     = 2;
-
-
-    /**
-     * Index format version
-     *
-     * @var integer
-     */
-    private $_formatVersion;
-
-    /**
-     * Create index
-     *
-     * @param mixed $directory
-     * @return Zend_Search_Lucene_Interface
-     */
-    public static function create($directory)
-    {
-        /** Zend_Search_Lucene_Proxy */
-        require_once 'Zend/Search/Lucene/Proxy.php';
-
-        return new Zend_Search_Lucene_Proxy(new Zend_Search_Lucene($directory, true));
-    }
-
-    /**
-     * Open index
-     *
-     * @param mixed $directory
-     * @return Zend_Search_Lucene_Interface
-     */
-    public static function open($directory)
-    {
-        /** Zend_Search_Lucene_Proxy */
-        require_once 'Zend/Search/Lucene/Proxy.php';
-
-        return new Zend_Search_Lucene_Proxy(new Zend_Search_Lucene($directory, false));
-    }
-
-    /** Generation retrieving counter */
-    const GENERATION_RETRIEVE_COUNT = 10;
-
-    /** Pause between generation retrieving attempts in milliseconds */
-    const GENERATION_RETRIEVE_PAUSE = 50;
-
-    /**
-     * Get current generation number
-     *
-     * Returns generation number
-     * 0 means pre-2.1 index format
-     * -1 means there are no segments files.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getActualGeneration(Zend_Search_Lucene_Storage_Directory $directory)
-    {
-        /**
-         * Zend_Search_Lucene uses segments.gen file to retrieve current generation number
-         *
-         * Apache Lucene index format documentation mentions this method only as a fallback method
-         *
-         * Nevertheless we use it according to the performance considerations
-         *
-         * @todo check if we can use some modification of Apache Lucene generation determination algorithm
-         *       without performance problems
-         */
-
-        require_once 'Zend/Search/Lucene/Exception.php';
-        try {
-            for ($count = 0; $count < self::GENERATION_RETRIEVE_COUNT; $count++) {
-                // Try to get generation file
-                $genFile = $directory->getFileObject('segments.gen', false);
-
-                $format = $genFile->readInt();
-                if ($format != (int)0xFFFFFFFE) {
-                    throw new Zend_Search_Lucene_Exception('Wrong segments.gen file format');
-                }
-
-                $gen1 = $genFile->readLong();
-                $gen2 = $genFile->readLong();
-
-                if ($gen1 == $gen2) {
-                    return $gen1;
-                }
-
-                usleep(self::GENERATION_RETRIEVE_PAUSE * 1000);
-            }
-
-            // All passes are failed
-            throw new Zend_Search_Lucene_Exception('Index is under processing now');
-        } catch (Zend_Search_Lucene_Exception $e) {
-            if (strpos($e->getMessage(), 'is not readable') !== false) {
-                try {
-                    // Try to open old style segments file
-                    $segmentsFile = $directory->getFileObject('segments', false);
-
-                    // It's pre-2.1 index
-                    return 0;
-                } catch (Zend_Search_Lucene_Exception $e) {
-                    if (strpos($e->getMessage(), 'is not readable') !== false) {
-                        return -1;
-                    } else {
-                        throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                    }
-                }
-            } else {
-                throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-
-        return -1;
-    }
-
-    /**
-     * Get generation number associated with this index instance
-     *
-     * The same generation number in pair with document number or query string
-     * guarantees to give the same result while index retrieving.
-     * So it may be used for search result caching.
-     *
-     * @return integer
-     */
-    public function getGeneration()
-    {
-        return $this->_generation;
-    }
-
-
-    /**
-     * Get segments file name
-     *
-     * @param integer $generation
-     * @return string
-     */
-    public static function getSegmentFileName($generation)
-    {
-        if ($generation == 0) {
-            return 'segments';
-        }
-
-        return 'segments_' . base_convert($generation, 10, 36);
-    }
-
-    /**
-     * Get index format version
-     *
-     * @return integer
-     */
-    public function getFormatVersion()
-    {
-        return $this->_formatVersion;
-    }
-
-    /**
-     * Set index format version.
-     * Index is converted to this format at the nearest upfdate time
-     *
-     * @param int $formatVersion
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function setFormatVersion($formatVersion)
-    {
-        if ($formatVersion != self::FORMAT_PRE_2_1  &&
-            $formatVersion != self::FORMAT_2_1  &&
-            $formatVersion != self::FORMAT_2_3) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Unsupported index format');
-        }
-
-        $this->_formatVersion = $formatVersion;
-    }
-
-    /**
-     * Read segments file for pre-2.1 Lucene index format
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _readPre21SegmentsFile()
-    {
-        $segmentsFile = $this->_directory->getFileObject('segments');
-
-        $format = $segmentsFile->readInt();
-
-        if ($format != (int)0xFFFFFFFF) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong segments file format');
-        }
-
-        // read version
-        $segmentsFile->readLong();
-
-        // read segment name counter
-        $segmentsFile->readInt();
-
-        $segments = $segmentsFile->readInt();
-
-        $this->_docCount = 0;
-
-        // read segmentInfos
-        for ($count = 0; $count < $segments; $count++) {
-            $segName = $segmentsFile->readString();
-            $segSize = $segmentsFile->readInt();
-            $this->_docCount += $segSize;
-
-            $this->_segmentInfos[$segName] =
-                                new Zend_Search_Lucene_Index_SegmentInfo($this->_directory,
-                                                                         $segName,
-                                                                         $segSize);
-        }
-
-        // Use 2.1 as a target version. Index will be reorganized at update time.
-        $this->_formatVersion = self::FORMAT_2_1;
-    }
-
-    /**
-     * Read segments file
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _readSegmentsFile()
-    {
-        $segmentsFile = $this->_directory->getFileObject(self::getSegmentFileName($this->_generation));
-
-        $format = $segmentsFile->readInt();
-
-        if ($format == (int)0xFFFFFFFC) {
-            $this->_formatVersion = self::FORMAT_2_3;
-        } else if ($format == (int)0xFFFFFFFD) {
-            $this->_formatVersion = self::FORMAT_2_1;
-        } else {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Unsupported segments file format');
-        }
-
-        // read version
-        $segmentsFile->readLong();
-
-        // read segment name counter
-        $segmentsFile->readInt();
-
-        $segments = $segmentsFile->readInt();
-
-        $this->_docCount = 0;
-
-        // read segmentInfos
-        for ($count = 0; $count < $segments; $count++) {
-            $segName = $segmentsFile->readString();
-            $segSize = $segmentsFile->readInt();
-
-            // 2.1+ specific properties
-            $delGen = $segmentsFile->readLong();
-
-            if ($this->_formatVersion == self::FORMAT_2_3) {
-                $docStoreOffset = $segmentsFile->readInt();
-
-                if ($docStoreOffset != (int)0xFFFFFFFF) {
-                    $docStoreSegment        = $segmentsFile->readString();
-                    $docStoreIsCompoundFile = $segmentsFile->readByte();
-
-                    $docStoreOptions = array('offset'     => $docStoreOffset,
-                                             'segment'    => $docStoreSegment,
-                                             'isCompound' => ($docStoreIsCompoundFile == 1));
-                } else {
-                    $docStoreOptions = null;
-                }
-            } else {
-                $docStoreOptions = null;
-            }
-
-            $hasSingleNormFile = $segmentsFile->readByte();
-            $numField          = $segmentsFile->readInt();
-
-            $normGens = array();
-            if ($numField != (int)0xFFFFFFFF) {
-                for ($count1 = 0; $count1 < $numField; $count1++) {
-                    $normGens[] = $segmentsFile->readLong();
-                }
-
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Separate norm files are not supported. Optimize index to use it with Zend_Search_Lucene.');
-            }
-
-            $isCompoundByte     = $segmentsFile->readByte();
-
-            if ($isCompoundByte == 0xFF) {
-                // The segment is not a compound file
-                $isCompound = false;
-            } else if ($isCompoundByte == 0x00) {
-                // The status is unknown
-                $isCompound = null;
-            } else if ($isCompoundByte == 0x01) {
-                // The segment is a compound file
-                $isCompound = true;
-            }
-
-            $this->_docCount += $segSize;
-
-            $this->_segmentInfos[$segName] =
-                                new Zend_Search_Lucene_Index_SegmentInfo($this->_directory,
-                                                                         $segName,
-                                                                         $segSize,
-                                                                         $delGen,
-                                                                         $docStoreOptions,
-                                                                         $hasSingleNormFile,
-                                                                         $isCompound);
-        }
-    }
-
-    /**
-     * Opens the index.
-     *
-     * IndexReader constructor needs Directory as a parameter. It should be
-     * a string with a path to the index folder or a Directory object.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory_Filesystem|string $directory
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($directory = null, $create = false)
-    {
-        if ($directory === null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Exception('No index directory specified');
-        }
-
-        if (is_string($directory)) {
-            require_once 'Zend/Search/Lucene/Storage/Directory/Filesystem.php';
-            $this->_directory      = new Zend_Search_Lucene_Storage_Directory_Filesystem($directory);
-            $this->_closeDirOnExit = true;
-        } else {
-            $this->_directory      = $directory;
-            $this->_closeDirOnExit = false;
-        }
-
-        $this->_segmentInfos = array();
-
-        // Mark index as "under processing" to prevent other processes from premature index cleaning
-        Zend_Search_Lucene_LockManager::obtainReadLock($this->_directory);
-
-        $this->_generation = self::getActualGeneration($this->_directory);
-
-        if ($create) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            try {
-                Zend_Search_Lucene_LockManager::obtainWriteLock($this->_directory);
-            } catch (Zend_Search_Lucene_Exception $e) {
-                Zend_Search_Lucene_LockManager::releaseReadLock($this->_directory);
-
-                if (strpos($e->getMessage(), 'Can\'t obtain exclusive index lock') === false) {
-                    throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                } else {
-                    throw new Zend_Search_Lucene_Exception('Can\'t create index. It\'s under processing now', 0, $e);
-                }
-            }
-
-            if ($this->_generation == -1) {
-                // Directory doesn't contain existing index, start from 1
-                $this->_generation = 1;
-                $nameCounter = 0;
-            } else {
-                // Directory contains existing index
-                $segmentsFile = $this->_directory->getFileObject(self::getSegmentFileName($this->_generation));
-                $segmentsFile->seek(12); // 12 = 4 (int, file format marker) + 8 (long, index version)
-
-                $nameCounter = $segmentsFile->readInt();
-                $this->_generation++;
-            }
-
-            require_once 'Zend/Search/Lucene/Index/Writer.php';
-            Zend_Search_Lucene_Index_Writer::createIndex($this->_directory, $this->_generation, $nameCounter);
-
-            Zend_Search_Lucene_LockManager::releaseWriteLock($this->_directory);
-        }
-
-        if ($this->_generation == -1) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Index doesn\'t exists in the specified directory.');
-        } else if ($this->_generation == 0) {
-            $this->_readPre21SegmentsFile();
-        } else {
-            $this->_readSegmentsFile();
-        }
-    }
-
-    /**
-     * Close current index and free resources
-     */
-    private function _close()
-    {
-        if ($this->_closed) {
-            // index is already closed and resources are cleaned up
-            return;
-        }
-
-        $this->commit();
-
-        // Release "under processing" flag
-        Zend_Search_Lucene_LockManager::releaseReadLock($this->_directory);
-
-        if ($this->_closeDirOnExit) {
-            $this->_directory->close();
-        }
-
-        $this->_directory    = null;
-        $this->_writer       = null;
-        $this->_segmentInfos = null;
-
-        $this->_closed = true;
-    }
-
-    /**
-     * Add reference to the index object
-     *
-     * @internal
-     */
-    public function addReference()
-    {
-        $this->_refCount++;
-    }
-
-    /**
-     * Remove reference from the index object
-     *
-     * When reference count becomes zero, index is closed and resources are cleaned up
-     *
-     * @internal
-     */
-    public function removeReference()
-    {
-        $this->_refCount--;
-
-        if ($this->_refCount == 0) {
-            $this->_close();
-        }
-    }
-
-    /**
-     * Object destructor
-     */
-    public function __destruct()
-    {
-        $this->_close();
-    }
-
-    /**
-     * Returns an instance of Zend_Search_Lucene_Index_Writer for the index
-     *
-     * @return Zend_Search_Lucene_Index_Writer
-     */
-    private function _getIndexWriter()
-    {
-        if ($this->_writer === null) {
-            require_once 'Zend/Search/Lucene/Index/Writer.php';
-            $this->_writer = new Zend_Search_Lucene_Index_Writer($this->_directory,
-                                                                 $this->_segmentInfos,
-                                                                 $this->_formatVersion);
-        }
-
-        return $this->_writer;
-    }
-
-
-    /**
-     * Returns the Zend_Search_Lucene_Storage_Directory instance for this index.
-     *
-     * @return Zend_Search_Lucene_Storage_Directory
-     */
-    public function getDirectory()
-    {
-        return $this->_directory;
-    }
-
-
-    /**
-     * Returns the total number of documents in this index (including deleted documents).
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_docCount;
-    }
-
-    /**
-     * Returns one greater than the largest possible document number.
-     * This may be used to, e.g., determine how big to allocate a structure which will have
-     * an element for every document number in an index.
-     *
-     * @return integer
-     */
-    public function maxDoc()
-    {
-        return $this->count();
-    }
-
-    /**
-     * Returns the total number of non-deleted documents in this index.
-     *
-     * @return integer
-     */
-    public function numDocs()
-    {
-        $numDocs = 0;
-
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $numDocs += $segmentInfo->numDocs();
-        }
-
-        return $numDocs;
-    }
-
-    /**
-     * Checks, that document is deleted
-     *
-     * @param integer $id
-     * @return boolean
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function isDeleted($id)
-    {
-        if ($id >= $this->_docCount) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-        }
-
-        $segmentStartId = 0;
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            if ($segmentStartId + $segmentInfo->count() > $id) {
-                break;
-            }
-
-            $segmentStartId += $segmentInfo->count();
-        }
-
-        return $segmentInfo->isDeleted($id - $segmentStartId);
-    }
-
-    /**
-     * Set default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * Default value is null
-     *
-     * @param string $fieldName
-     */
-    public static function setDefaultSearchField($fieldName)
-    {
-        self::$_defaultSearchField = $fieldName;
-    }
-
-    /**
-     * Get default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * @return string
-     */
-    public static function getDefaultSearchField()
-    {
-        return self::$_defaultSearchField;
-    }
-
-    /**
-     * Set result set limit.
-     *
-     * 0 (default) means no limit
-     *
-     * @param integer $limit
-     */
-    public static function setResultSetLimit($limit)
-    {
-        self::$_resultSetLimit = $limit;
-    }
-
-    /**
-     * Get result set limit.
-     *
-     * 0 means no limit
-     *
-     * @return integer
-     */
-    public static function getResultSetLimit()
-    {
-        return self::$_resultSetLimit;
-    }
-
-    /**
-     * Set terms per query limit.
-     *
-     * 0 means no limit
-     *
-     * @param integer $limit
-     */
-    public static function setTermsPerQueryLimit($limit)
-    {
-        self::$_termsPerQueryLimit = $limit;
-    }
-
-    /**
-     * Get result set limit.
-     *
-     * 0 (default) means no limit
-     *
-     * @return integer
-     */
-    public static function getTermsPerQueryLimit()
-    {
-        return self::$_termsPerQueryLimit;
-    }
-
-    /**
-     * Retrieve index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMaxBufferedDocs()
-    {
-        return $this->_getIndexWriter()->maxBufferedDocs;
-    }
-
-    /**
-     * Set index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @param integer $maxBufferedDocs
-     */
-    public function setMaxBufferedDocs($maxBufferedDocs)
-    {
-        $this->_getIndexWriter()->maxBufferedDocs = $maxBufferedDocs;
-    }
-
-    /**
-     * Retrieve index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @return integer
-     */
-    public function getMaxMergeDocs()
-    {
-        return $this->_getIndexWriter()->maxMergeDocs;
-    }
-
-    /**
-     * Set index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMaxMergeDocs($maxMergeDocs)
-    {
-        $this->_getIndexWriter()->maxMergeDocs = $maxMergeDocs;
-    }
-
-    /**
-     * Retrieve index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMergeFactor()
-    {
-        return $this->_getIndexWriter()->mergeFactor;
-    }
-
-    /**
-     * Set index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMergeFactor($mergeFactor)
-    {
-        $this->_getIndexWriter()->mergeFactor = $mergeFactor;
-    }
-
-    /**
-     * Performs a query against the index and returns an array
-     * of Zend_Search_Lucene_Search_QueryHit objects.
-     * Input is a string or Zend_Search_Lucene_Search_Query.
-     *
-     * @param Zend_Search_Lucene_Search_QueryParser|string $query
-     * @return array Zend_Search_Lucene_Search_QueryHit
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function find($query)
-    {
-        if (is_string($query)) {
-            require_once 'Zend/Search/Lucene/Search/QueryParser.php';
-
-            $query = Zend_Search_Lucene_Search_QueryParser::parse($query);
-        }
-
-        if (!$query instanceof Zend_Search_Lucene_Search_Query) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Query must be a string or Zend_Search_Lucene_Search_Query object');
-        }
-
-        $this->commit();
-
-        $hits   = array();
-        $scores = array();
-        $ids    = array();
-
-        $query = $query->rewrite($this)->optimize($this);
-
-        $query->execute($this);
-
-        $topScore = 0;
-
-        /** Zend_Search_Lucene_Search_QueryHit */
-        require_once 'Zend/Search/Lucene/Search/QueryHit.php';
-
-        foreach ($query->matchedDocs() as $id => $num) {
-            $docScore = $query->score($id, $this);
-            if( $docScore != 0 ) {
-                $hit = new Zend_Search_Lucene_Search_QueryHit($this);
-                $hit->id = $id;
-                $hit->score = $docScore;
-
-                $hits[]   = $hit;
-                $ids[]    = $id;
-                $scores[] = $docScore;
-
-                if ($docScore > $topScore) {
-                    $topScore = $docScore;
-                }
-            }
-
-            if (self::$_resultSetLimit != 0  &&  count($hits) >= self::$_resultSetLimit) {
-                break;
-            }
-        }
-
-        if (count($hits) == 0) {
-            // skip sorting, which may cause a error on empty index
-            return array();
-        }
-
-        if ($topScore > 1) {
-            foreach ($hits as $hit) {
-                $hit->score /= $topScore;
-            }
-        }
-
-        if (func_num_args() == 1) {
-            // sort by scores
-            array_multisort($scores, SORT_DESC, SORT_NUMERIC,
-                            $ids,    SORT_ASC,  SORT_NUMERIC,
-                            $hits);
-        } else {
-            // sort by given field names
-
-            $argList    = func_get_args();
-            $fieldNames = $this->getFieldNames();
-            $sortArgs   = array();
-
-            // PHP 5.3 now expects all arguments to array_multisort be passed by
-            // reference (if it's invoked through call_user_func_array());
-            // since constants can't be passed by reference, create some placeholder variables.
-            $sortReg    = SORT_REGULAR;
-            $sortAsc    = SORT_ASC;
-            $sortNum    = SORT_NUMERIC;
-
-            $sortFieldValues = array();
-
-            require_once 'Zend/Search/Lucene/Exception.php';
-            for ($count = 1; $count < count($argList); $count++) {
-                $fieldName = $argList[$count];
-
-                if (!is_string($fieldName)) {
-                    throw new Zend_Search_Lucene_Exception('Field name must be a string.');
-                }
-
-                if (strtolower($fieldName) == 'score') {
-                    $sortArgs[] = &$scores;
-                } else {
-                    if (!in_array($fieldName, $fieldNames)) {
-                        throw new Zend_Search_Lucene_Exception('Wrong field name.');
-                    }
-
-                    if (!isset($sortFieldValues[$fieldName])) {
-                        $valuesArray = array();
-                        foreach ($hits as $hit) {
-                            try {
-                                $value = $hit->getDocument()->getFieldValue($fieldName);
-                            } catch (Zend_Search_Lucene_Exception $e) {
-                                if (strpos($e->getMessage(), 'not found') === false) {
-                                    throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                                } else {
-                                    $value = null;
-                                }
-                            }
-
-                            $valuesArray[] = $value;
-                        }
-
-                        // Collect loaded values in $sortFieldValues
-                        // Required for PHP 5.3 which translates references into values when source
-                        // variable is destroyed
-                        $sortFieldValues[$fieldName] = $valuesArray;
-                    }
-
-                    $sortArgs[] = &$sortFieldValues[$fieldName];
-                }
-
-                if ($count + 1 < count($argList)  &&  is_integer($argList[$count+1])) {
-                    $count++;
-                    $sortArgs[] = &$argList[$count];
-
-                    if ($count + 1 < count($argList)  &&  is_integer($argList[$count+1])) {
-                        $count++;
-                        $sortArgs[] = &$argList[$count];
-                    } else {
-                        if ($argList[$count] == SORT_ASC  || $argList[$count] == SORT_DESC) {
-                            $sortArgs[] = &$sortReg;
-                        } else {
-                            $sortArgs[] = &$sortAsc;
-                        }
-                    }
-                } else {
-                    $sortArgs[] = &$sortAsc;
-                    $sortArgs[] = &$sortReg;
-                }
-            }
-
-            // Sort by id's if values are equal
-            $sortArgs[] = &$ids;
-            $sortArgs[] = &$sortAsc;
-            $sortArgs[] = &$sortNum;
-
-            // Array to be sorted
-            $sortArgs[] = &$hits;
-
-            // Do sort
-            call_user_func_array('array_multisort', $sortArgs);
-        }
-
-        return $hits;
-    }
-
-
-    /**
-     * Returns a list of all unique field names that exist in this index.
-     *
-     * @param boolean $indexed
-     * @return array
-     */
-    public function getFieldNames($indexed = false)
-    {
-        $result = array();
-        foreach( $this->_segmentInfos as $segmentInfo ) {
-            $result = array_merge($result, $segmentInfo->getFields($indexed));
-        }
-        return $result;
-    }
-
-
-    /**
-     * Returns a Zend_Search_Lucene_Document object for the document
-     * number $id in this index.
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @return Zend_Search_Lucene_Document
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function getDocument($id)
-    {
-        if ($id instanceof Zend_Search_Lucene_Search_QueryHit) {
-            /* @var $id Zend_Search_Lucene_Search_QueryHit */
-            $id = $id->id;
-        }
-
-        if ($id >= $this->_docCount) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-        }
-
-        $segmentStartId = 0;
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            if ($segmentStartId + $segmentInfo->count() > $id) {
-                break;
-            }
-
-            $segmentStartId += $segmentInfo->count();
-        }
-
-        $fdxFile = $segmentInfo->openCompoundFile('.fdx');
-        $fdxFile->seek(($id-$segmentStartId)*8, SEEK_CUR);
-        $fieldValuesPosition = $fdxFile->readLong();
-
-        $fdtFile = $segmentInfo->openCompoundFile('.fdt');
-        $fdtFile->seek($fieldValuesPosition, SEEK_CUR);
-        $fieldCount = $fdtFile->readVInt();
-
-        $doc = new Zend_Search_Lucene_Document();
-        for ($count = 0; $count < $fieldCount; $count++) {
-            $fieldNum = $fdtFile->readVInt();
-            $bits = $fdtFile->readByte();
-
-            $fieldInfo = $segmentInfo->getField($fieldNum);
-
-            if (!($bits & 2)) { // Text data
-                $field = new Zend_Search_Lucene_Field($fieldInfo->name,
-                                                      $fdtFile->readString(),
-                                                      'UTF-8',
-                                                      true,
-                                                      $fieldInfo->isIndexed,
-                                                      $bits & 1 );
-            } else {            // Binary data
-                $field = new Zend_Search_Lucene_Field($fieldInfo->name,
-                                                      $fdtFile->readBinary(),
-                                                      '',
-                                                      true,
-                                                      $fieldInfo->isIndexed,
-                                                      $bits & 1,
-                                                      true );
-            }
-
-            $doc->addField($field);
-        }
-
-        return $doc;
-    }
-
-
-    /**
-     * Returns true if index contain documents with specified term.
-     *
-     * Is used for query optimization.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return boolean
-     */
-    public function hasTerm(Zend_Search_Lucene_Index_Term $term)
-    {
-        foreach ($this->_segmentInfos as $segInfo) {
-            if ($segInfo->getTermInfo($term) !== null) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns IDs of all documents containing term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termDocs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        $subResults = array();
-        $segmentStartDocId = 0;
-
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $subResults[] = $segmentInfo->termDocs($term, $segmentStartDocId, $docsFilter);
-
-            $segmentStartDocId += $segmentInfo->count();
-        }
-
-        if (count($subResults) == 0) {
-            return array();
-        } else if (count($subResults) == 1) {
-            // Index is optimized (only one segment)
-            // Do not perform array reindexing
-            return reset($subResults);
-        } else {
-            $result = call_user_func_array('array_merge', $subResults);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns documents filter for all documents containing term.
-     *
-     * It performs the same operation as termDocs, but return result as
-     * Zend_Search_Lucene_Index_DocsFilter object
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_DocsFilter
-     */
-    public function termDocsFilter(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        $segmentStartDocId = 0;
-        $result = new Zend_Search_Lucene_Index_DocsFilter();
-
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $subResults[] = $segmentInfo->termDocs($term, $segmentStartDocId, $docsFilter);
-
-            $segmentStartDocId += $segmentInfo->count();
-        }
-
-        if (count($subResults) == 0) {
-            return array();
-        } else if (count($subResults) == 1) {
-            // Index is optimized (only one segment)
-            // Do not perform array reindexing
-            return reset($subResults);
-        } else {
-            $result = call_user_func_array('array_merge', $subResults);
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns an array of all term freqs.
-     * Result array structure: array(docId => freq, ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return integer
-     */
-    public function termFreqs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        $result = array();
-        $segmentStartDocId = 0;
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $result += $segmentInfo->termFreqs($term, $segmentStartDocId, $docsFilter);
-
-            $segmentStartDocId += $segmentInfo->count();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns an array of all term positions in the documents.
-     * Result array structure: array(docId => array(pos1, pos2, ...), ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termPositions(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        $result = array();
-        $segmentStartDocId = 0;
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $result += $segmentInfo->termPositions($term, $segmentStartDocId, $docsFilter);
-
-            $segmentStartDocId += $segmentInfo->count();
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Returns the number of documents in this index containing the $term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return integer
-     */
-    public function docFreq(Zend_Search_Lucene_Index_Term $term)
-    {
-        $result = 0;
-        foreach ($this->_segmentInfos as $segInfo) {
-            $termInfo = $segInfo->getTermInfo($term);
-            if ($termInfo !== null) {
-                $result += $termInfo->docFreq;
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Retrive similarity used by index reader
-     *
-     * @return Zend_Search_Lucene_Search_Similarity
-     */
-    public function getSimilarity()
-    {
-        /** Zend_Search_Lucene_Search_Similarity */
-        require_once 'Zend/Search/Lucene/Search/Similarity.php';
-
-        return Zend_Search_Lucene_Search_Similarity::getDefault();
-    }
-
-
-    /**
-     * Returns a normalization factor for "field, document" pair.
-     *
-     * @param integer $id
-     * @param string $fieldName
-     * @return float
-     */
-    public function norm($id, $fieldName)
-    {
-        if ($id >= $this->_docCount) {
-            return null;
-        }
-
-        $segmentStartId = 0;
-        foreach ($this->_segmentInfos as $segInfo) {
-            if ($segmentStartId + $segInfo->count() > $id) {
-                break;
-            }
-
-            $segmentStartId += $segInfo->count();
-        }
-
-        if ($segInfo->isDeleted($id - $segmentStartId)) {
-            return 0;
-        }
-
-        return $segInfo->norm($id - $segmentStartId, $fieldName);
-    }
-
-    /**
-     * Returns true if any documents have been deleted from this index.
-     *
-     * @return boolean
-     */
-    public function hasDeletions()
-    {
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            if ($segmentInfo->hasDeletions()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Deletes a document from the index.
-     * $id is an internal document id
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function delete($id)
-    {
-        if ($id instanceof Zend_Search_Lucene_Search_QueryHit) {
-            /* @var $id Zend_Search_Lucene_Search_QueryHit */
-            $id = $id->id;
-        }
-
-        if ($id >= $this->_docCount) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-        }
-
-        $segmentStartId = 0;
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            if ($segmentStartId + $segmentInfo->count() > $id) {
-                break;
-            }
-
-            $segmentStartId += $segmentInfo->count();
-        }
-        $segmentInfo->delete($id - $segmentStartId);
-
-        $this->_hasChanges = true;
-    }
-
-
-
-    /**
-     * Adds a document to this index.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document)
-    {
-        $this->_getIndexWriter()->addDocument($document);
-        $this->_docCount++;
-
-        $this->_hasChanges = true;
-    }
-
-
-    /**
-     * Update document counter
-     */
-    private function _updateDocCount()
-    {
-        $this->_docCount = 0;
-        foreach ($this->_segmentInfos as $segInfo) {
-            $this->_docCount += $segInfo->count();
-        }
-    }
-
-    /**
-     * Commit changes resulting from delete() or undeleteAll() operations.
-     *
-     * @todo undeleteAll processing.
-     */
-    public function commit()
-    {
-        if ($this->_hasChanges) {
-            $this->_getIndexWriter()->commit();
-
-            $this->_updateDocCount();
-
-            $this->_hasChanges = false;
-        }
-    }
-
-
-    /**
-     * Optimize index.
-     *
-     * Merges all segments into one
-     */
-    public function optimize()
-    {
-        // Commit changes if any changes have been made
-        $this->commit();
-
-        if (count($this->_segmentInfos) > 1 || $this->hasDeletions()) {
-            $this->_getIndexWriter()->optimize();
-            $this->_updateDocCount();
-        }
-    }
-
-
-    /**
-     * Returns an array of all terms in this index.
-     *
-     * @return array
-     */
-    public function terms()
-    {
-        $result = array();
-
-        /** Zend_Search_Lucene_Index_TermsPriorityQueue */
-        require_once 'Zend/Search/Lucene/Index/TermsPriorityQueue.php';
-
-        $segmentInfoQueue = new Zend_Search_Lucene_Index_TermsPriorityQueue();
-
-        foreach ($this->_segmentInfos as $segmentInfo) {
-            $segmentInfo->resetTermsStream();
-
-            // Skip "empty" segments
-            if ($segmentInfo->currentTerm() !== null) {
-                $segmentInfoQueue->put($segmentInfo);
-            }
-        }
-
-        while (($segmentInfo = $segmentInfoQueue->pop()) !== null) {
-            if ($segmentInfoQueue->top() === null ||
-                $segmentInfoQueue->top()->currentTerm()->key() !=
-                            $segmentInfo->currentTerm()->key()) {
-                // We got new term
-                $result[] = $segmentInfo->currentTerm();
-            }
-
-            if ($segmentInfo->nextTerm() !== null) {
-                // Put segment back into the priority queue
-                $segmentInfoQueue->put($segmentInfo);
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Terms stream priority queue object
-     *
-     * @var Zend_Search_Lucene_TermStreamsPriorityQueue
-     */
-    private $_termsStream = null;
-
-    /**
-     * Reset terms stream.
-     */
-    public function resetTermsStream()
-    {
-        if ($this->_termsStream === null) {
-            /** Zend_Search_Lucene_TermStreamsPriorityQueue */
-            require_once 'Zend/Search/Lucene/TermStreamsPriorityQueue.php';
-
-            $this->_termsStream = new Zend_Search_Lucene_TermStreamsPriorityQueue($this->_segmentInfos);
-        } else {
-            $this->_termsStream->resetTermsStream();
-        }
-    }
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix)
-    {
-        $this->_termsStream->skipTo($prefix);
-    }
-
-    /**
-     * Scans terms dictionary and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm()
-    {
-        return $this->_termsStream->nextTerm();
-    }
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm()
-    {
-        return $this->_termsStream->currentTerm();
-    }
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream()
-    {
-        $this->_termsStream->closeTermsStream();
-        $this->_termsStream = null;
-    }
-
-
-    /*************************************************************************
-    @todo UNIMPLEMENTED
-    *************************************************************************/
-    /**
-     * Undeletes all documents currently marked as deleted in this index.
-     *
-     * @todo Implementation
-     */
-    public function undeleteAll()
-    {}
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer.php
deleted file mode 100644
index 7ff81a88d..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Analyzer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** User land classes and interfaces turned on by Zend/Search/Analyzer.php file inclusion. */
-/** @todo Section should be removed with ZF 2.0 release as obsolete                      */
-if (!defined('ZEND_SEARCH_LUCENE_COMMON_ANALYZER_PROCESSED')) {
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8 */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Text */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php';
-
-    /** Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive */
-    require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php';
-}
-
-
-/**
- * An Analyzer is used to analyze text.
- * It thus represents a policy for extracting index terms from text.
- *
- * Note:
- * Lucene Java implementation is oriented to streams. It provides effective work
- * with a huge documents (more then 20Mb).
- * But engine itself is not oriented such documents.
- * Thus Zend_Search_Lucene analysis API works with data strings and sets (arrays).
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-abstract class Zend_Search_Lucene_Analysis_Analyzer
-{
-    /**
-     * The Analyzer implementation used by default.
-     *
-     * @var Zend_Search_Lucene_Analysis_Analyzer
-     */
-    private static $_defaultImpl;
-
-    /**
-     * Input string
-     *
-     * @var string
-     */
-    protected $_input = null;
-
-    /**
-     * Input string encoding
-     *
-     * @var string
-     */
-    protected $_encoding = '';
-
-    /**
-     * Tokenize text to a terms
-     * Returns array of Zend_Search_Lucene_Analysis_Token objects
-     *
-     * Tokens are returned in UTF-8 (internal Zend_Search_Lucene encoding)
-     *
-     * @param string $data
-     * @return array
-     */
-    public function tokenize($data, $encoding = '')
-    {
-        $this->setInput($data, $encoding);
-
-        $tokenList = array();
-        while (($nextToken = $this->nextToken()) !== null) {
-            $tokenList[] = $nextToken;
-        }
-
-        return $tokenList;
-    }
-
-
-    /**
-     * Tokenization stream API
-     * Set input
-     *
-     * @param string $data
-     */
-    public function setInput($data, $encoding = '')
-    {
-        $this->_input    = $data;
-        $this->_encoding = $encoding;
-        $this->reset();
-    }
-
-    /**
-     * Reset token stream
-     */
-    abstract public function reset();
-
-    /**
-     * Tokenization stream API
-     * Get next token
-     * Returns null at the end of stream
-     *
-     * Tokens are returned in UTF-8 (internal Zend_Search_Lucene encoding)
-     *
-     * @return Zend_Search_Lucene_Analysis_Token|null
-     */
-    abstract public function nextToken();
-
-
-
-
-    /**
-     * Set the default Analyzer implementation used by indexing code.
-     *
-     * @param Zend_Search_Lucene_Analysis_Analyzer $similarity
-     */
-    public static function setDefault(Zend_Search_Lucene_Analysis_Analyzer $analyzer)
-    {
-        self::$_defaultImpl = $analyzer;
-    }
-
-
-    /**
-     * Return the default Analyzer implementation used by indexing code.
-     *
-     * @return Zend_Search_Lucene_Analysis_Analyzer
-     */
-    public static function getDefault()
-    {
-        /** Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive */
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php';
-
-        if (!self::$_defaultImpl instanceof Zend_Search_Lucene_Analysis_Analyzer) {
-            self::$_defaultImpl = new Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive();
-        }
-
-        return self::$_defaultImpl;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php
deleted file mode 100644
index 1caa058ad..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Define constant used to provide correct file processing order    */
-/** @todo Section should be removed with ZF 2.0 release as obsolete  */
-define('ZEND_SEARCH_LUCENE_COMMON_ANALYZER_PROCESSED', true);
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-/** Zend_Search_Lucene_Analysis_Token */
-require_once 'Zend/Search/Lucene/Analysis/Token.php';
-
-/** Zend_Search_Lucene_Analysis_TokenFilter */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter.php';
-
-
-/**
- * Common implementation of the Zend_Search_Lucene_Analysis_Analyzer interface.
- * There are several standard standard subclasses provided by Zend_Search_Lucene/Analysis
- * subpackage: Zend_Search_Lucene_Analysis_Analyzer_Common_Text, ZSearchHTMLAnalyzer, ZSearchXMLAnalyzer.
- *
- * @todo ZSearchHTMLAnalyzer and ZSearchXMLAnalyzer implementation
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Analysis_Analyzer_Common extends Zend_Search_Lucene_Analysis_Analyzer
-{
-    /**
-     * The set of Token filters applied to the Token stream.
-     * Array of Zend_Search_Lucene_Analysis_TokenFilter objects.
-     *
-     * @var array
-     */
-    private $_filters = array();
-
-    /**
-     * Add Token filter to the Analyzer
-     *
-     * @param Zend_Search_Lucene_Analysis_TokenFilter $filter
-     */
-    public function addFilter(Zend_Search_Lucene_Analysis_TokenFilter $filter)
-    {
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Apply filters to the token. Can return null when the token was removed.
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $token
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    public function normalize(Zend_Search_Lucene_Analysis_Token $token)
-    {
-        foreach ($this->_filters as $filter) {
-            $token = $filter->normalize($token);
-
-            // resulting token can be null if the filter removes it
-            if ($token === null) {
-                return null;
-            }
-        }
-
-        return $token;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
deleted file mode 100644
index bb329b5ea..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Text extends Zend_Search_Lucene_Analysis_Analyzer_Common
-{
-    /**
-     * Current position in a stream
-     *
-     * @var integer
-     */
-    private $_position;
-
-    /**
-     * Reset token stream
-     */
-    public function reset()
-    {
-        $this->_position = 0;
-
-        if ($this->_input === null) {
-            return;
-        }
-
-        // convert input into ascii
-        if (PHP_OS != 'AIX') {
-            $this->_input = iconv($this->_encoding, 'ASCII//TRANSLIT', $this->_input);
-        }
-        $this->_encoding = 'ASCII';
-    }
-
-    /**
-     * Tokenization stream API
-     * Get next token
-     * Returns null at the end of stream
-     *
-     * @return Zend_Search_Lucene_Analysis_Token|null
-     */
-    public function nextToken()
-    {
-        if ($this->_input === null) {
-            return null;
-        }
-
-
-        do {
-            if (! preg_match('/[a-zA-Z]+/', $this->_input, $match, PREG_OFFSET_CAPTURE, $this->_position)) {
-                // It covers both cases a) there are no matches (preg_match(...) === 0)
-                // b) error occured (preg_match(...) === FALSE)
-                return null;
-            }
-
-            $str = $match[0][0];
-            $pos = $match[0][1];
-            $endpos = $pos + strlen($str);
-
-            $this->_position = $endpos;
-
-            $token = $this->normalize(new Zend_Search_Lucene_Analysis_Token($str, $pos, $endpos));
-        } while ($token === null); // try again if token is skipped
-
-        return $token;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
deleted file mode 100644
index 54280418e..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common_Text */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php';
-
-/** Zend_Search_Lucene_Analysis_TokenFilter_LowerCase */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive extends Zend_Search_Lucene_Analysis_Analyzer_Common_Text
-{
-    public function __construct()
-    {
-        $this->addFilter(new Zend_Search_Lucene_Analysis_TokenFilter_LowerCase());
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
deleted file mode 100644
index a619712e5..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TextNum.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum extends Zend_Search_Lucene_Analysis_Analyzer_Common
-{
-    /**
-     * Current position in a stream
-     *
-     * @var integer
-     */
-    private $_position;
-
-    /**
-     * Reset token stream
-     */
-    public function reset()
-    {
-        $this->_position = 0;
-
-        if ($this->_input === null) {
-            return;
-        }
-
-        // convert input into ascii
-        if (PHP_OS != 'AIX') {
-            $this->_input = iconv($this->_encoding, 'ASCII//TRANSLIT', $this->_input);
-        }
-        $this->_encoding = 'ASCII';
-    }
-
-    /**
-     * Tokenization stream API
-     * Get next token
-     * Returns null at the end of stream
-     *
-     * @return Zend_Search_Lucene_Analysis_Token|null
-     */
-    public function nextToken()
-    {
-        if ($this->_input === null) {
-            return null;
-        }
-
-        do {
-            if (! preg_match('/[a-zA-Z0-9]+/', $this->_input, $match, PREG_OFFSET_CAPTURE, $this->_position)) {
-                // It covers both cases a) there are no matches (preg_match(...) === 0)
-                // b) error occured (preg_match(...) === FALSE)
-                return null;
-            }
-
-            $str = $match[0][0];
-            $pos = $match[0][1];
-            $endpos = $pos + strlen($str);
-
-            $this->_position = $endpos;
-
-            $token = $this->normalize(new Zend_Search_Lucene_Analysis_Token($str, $pos, $endpos));
-        } while ($token === null); // try again if token is skipped
-
-        return $token;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
deleted file mode 100644
index 78021b4c5..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php';
-
-/** Zend_Search_Lucene_Analysis_TokenFilter_LowerCase */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive extends Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum
-{
-    public function __construct()
-    {
-        $this->addFilter(new Zend_Search_Lucene_Analysis_TokenFilter_LowerCase());
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
deleted file mode 100644
index 1dd3072f3..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Utf8.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8 extends Zend_Search_Lucene_Analysis_Analyzer_Common
-{
-    /**
-     * Current char position in an UTF-8 stream
-     *
-     * @var integer
-     */
-    private $_position;
-
-    /**
-     * Current binary position in an UTF-8 stream
-     *
-     * @var integer
-     */
-    private $_bytePosition;
-
-    /**
-     * Object constructor
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct()
-    {
-        if (@preg_match('/\pL/u', 'a') != 1) {
-            // PCRE unicode support is turned off
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Utf8 analyzer needs PCRE unicode support to be enabled.');
-        }
-    }
-
-    /**
-     * Reset token stream
-     */
-    public function reset()
-    {
-        $this->_position     = 0;
-        $this->_bytePosition = 0;
-
-        // convert input into UTF-8
-        if (strcasecmp($this->_encoding, 'utf8' ) != 0  &&
-            strcasecmp($this->_encoding, 'utf-8') != 0 ) {
-                $this->_input = iconv($this->_encoding, 'UTF-8', $this->_input);
-                $this->_encoding = 'UTF-8';
-        }
-    }
-
-    /**
-     * Tokenization stream API
-     * Get next token
-     * Returns null at the end of stream
-     *
-     * @return Zend_Search_Lucene_Analysis_Token|null
-     */
-    public function nextToken()
-    {
-        if ($this->_input === null) {
-            return null;
-        }
-
-        do {
-            if (! preg_match('/[\p{L}]+/u', $this->_input, $match, PREG_OFFSET_CAPTURE, $this->_bytePosition)) {
-                // It covers both cases a) there are no matches (preg_match(...) === 0)
-                // b) error occured (preg_match(...) === FALSE)
-                return null;
-            }
-
-            // matched string
-            $matchedWord = $match[0][0];
-
-            // binary position of the matched word in the input stream
-            $binStartPos = $match[0][1];
-
-            // character position of the matched word in the input stream
-            $startPos = $this->_position +
-                        iconv_strlen(substr($this->_input,
-                                            $this->_bytePosition,
-                                            $binStartPos - $this->_bytePosition),
-                                     'UTF-8');
-            // character postion of the end of matched word in the input stream
-            $endPos = $startPos + iconv_strlen($matchedWord, 'UTF-8');
-
-            $this->_bytePosition = $binStartPos + strlen($matchedWord);
-            $this->_position     = $endPos;
-
-            $token = $this->normalize(new Zend_Search_Lucene_Analysis_Token($matchedWord, $startPos, $endPos));
-        } while ($token === null); // try again if token is skipped
-
-        return $token;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
deleted file mode 100644
index 0ce2b18ec..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8 */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php';
-
-/** Zend_Search_Lucene_Analysis_TokenFilter_LowerCaseUtf8 */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive extends Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->addFilter(new Zend_Search_Lucene_Analysis_TokenFilter_LowerCaseUtf8());
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
deleted file mode 100644
index 2898af819..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Utf8Num.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num extends Zend_Search_Lucene_Analysis_Analyzer_Common
-{
-    /**
-     * Current char position in an UTF-8 stream
-     *
-     * @var integer
-     */
-    private $_position;
-
-    /**
-     * Current binary position in an UTF-8 stream
-     *
-     * @var integer
-     */
-    private $_bytePosition;
-
-    /**
-     * Object constructor
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct()
-    {
-        if (@preg_match('/\pL/u', 'a') != 1) {
-            // PCRE unicode support is turned off
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Utf8Num analyzer needs PCRE unicode support to be enabled.');
-        }
-    }
-
-    /**
-     * Reset token stream
-     */
-    public function reset()
-    {
-        $this->_position     = 0;
-        $this->_bytePosition = 0;
-
-        // convert input into UTF-8
-        if (strcasecmp($this->_encoding, 'utf8' ) != 0  &&
-            strcasecmp($this->_encoding, 'utf-8') != 0 ) {
-                $this->_input = iconv($this->_encoding, 'UTF-8', $this->_input);
-                $this->_encoding = 'UTF-8';
-        }
-    }
-
-    /**
-     * Tokenization stream API
-     * Get next token
-     * Returns null at the end of stream
-     *
-     * @return Zend_Search_Lucene_Analysis_Token|null
-     */
-    public function nextToken()
-    {
-        if ($this->_input === null) {
-            return null;
-        }
-
-        do {
-            if (! preg_match('/[\p{L}\p{N}]+/u', $this->_input, $match, PREG_OFFSET_CAPTURE, $this->_bytePosition)) {
-                // It covers both cases a) there are no matches (preg_match(...) === 0)
-                // b) error occured (preg_match(...) === FALSE)
-                return null;
-            }
-
-            // matched string
-            $matchedWord = $match[0][0];
-
-            // binary position of the matched word in the input stream
-            $binStartPos = $match[0][1];
-
-            // character position of the matched word in the input stream
-            $startPos = $this->_position +
-                        iconv_strlen(substr($this->_input,
-                                            $this->_bytePosition,
-                                            $binStartPos - $this->_bytePosition),
-                                     'UTF-8');
-            // character postion of the end of matched word in the input stream
-            $endPos = $startPos + iconv_strlen($matchedWord, 'UTF-8');
-
-            $this->_bytePosition = $binStartPos + strlen($matchedWord);
-            $this->_position     = $endPos;
-
-            $token = $this->normalize(new Zend_Search_Lucene_Analysis_Token($matchedWord, $startPos, $endPos));
-        } while ($token === null); // try again if token is skipped
-
-        return $token;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
deleted file mode 100644
index b67a44424..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php';
-
-/** Zend_Search_Lucene_Analysis_TokenFilter_LowerCaseUtf8 */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-class Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive extends Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->addFilter(new Zend_Search_Lucene_Analysis_TokenFilter_LowerCaseUtf8());
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Token.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/Token.php
deleted file mode 100644
index b31513595..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/Token.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Analysis_Token
-{
-    /**
-     * The text of the term.
-     *
-     * @var string
-     */
-    private $_termText;
-
-    /**
-     * Start in source text.
-     *
-     * @var integer
-     */
-    private $_startOffset;
-
-    /**
-     * End in source text
-     *
-     * @var integer
-     */
-    private $_endOffset;
-
-    /**
-     * The position of this token relative to the previous Token.
-     *
-     * The default value is one.
-     *
-     * Some common uses for this are:
-     * Set it to zero to put multiple terms in the same position.  This is
-     * useful if, e.g., a word has multiple stems.  Searches for phrases
-     * including either stem will match.  In this case, all but the first stem's
-     * increment should be set to zero: the increment of the first instance
-     * should be one.  Repeating a token with an increment of zero can also be
-     * used to boost the scores of matches on that token.
-     *
-     * Set it to values greater than one to inhibit exact phrase matches.
-     * If, for example, one does not want phrases to match across removed stop
-     * words, then one could build a stop word filter that removes stop words and
-     * also sets the increment to the number of stop words removed before each
-     * non-stop word.  Then exact phrase queries will only match when the terms
-     * occur with no intervening stop words.
-     *
-     * @var integer
-     */
-    private $_positionIncrement;
-
-
-    /**
-     * Object constructor
-     *
-     * @param string  $text
-     * @param integer $start
-     * @param integer $end
-     * @param string  $type
-     */
-    public function __construct($text, $start, $end)
-    {
-        $this->_termText    = $text;
-        $this->_startOffset = $start;
-        $this->_endOffset   = $end;
-
-        $this->_positionIncrement = 1;
-    }
-
-
-    /**
-     * positionIncrement setter
-     *
-     * @param integer $positionIncrement
-     */
-    public function setPositionIncrement($positionIncrement)
-    {
-        $this->_positionIncrement = $positionIncrement;
-    }
-
-    /**
-     * Returns the position increment of this Token.
-     *
-     * @return integer
-     */
-    public function getPositionIncrement()
-    {
-        return $this->_positionIncrement;
-    }
-
-    /**
-     * Returns the Token's term text.
-     *
-     * @return string
-     */
-    public function getTermText()
-    {
-        return $this->_termText;
-    }
-
-    /**
-     * Returns this Token's starting offset, the position of the first character
-     * corresponding to this token in the source text.
-     *
-     * Note:
-     * The difference between getEndOffset() and getStartOffset() may not be equal
-     * to strlen(Zend_Search_Lucene_Analysis_Token::getTermText()), as the term text may have been altered
-     * by a stemmer or some other filter.
-     *
-     * @return integer
-     */
-    public function getStartOffset()
-    {
-        return $this->_startOffset;
-    }
-
-    /**
-     * Returns this Token's ending offset, one greater than the position of the
-     * last character corresponding to this token in the source text.
-     *
-     * @return integer
-     */
-    public function getEndOffset()
-    {
-        return $this->_endOffset;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter.php
deleted file mode 100644
index 30bd81662..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TokenFilter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_Token */
-require_once 'Zend/Search/Lucene/Analysis/Token.php';
-
-
-/**
- * Token filter converts (normalizes) Token ore removes it from a token stream.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Analysis_TokenFilter
-{
-    /**
-     * Normalize Token or remove it (if null is returned)
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $srcToken
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    abstract public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken);
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
deleted file mode 100644
index ebe4246ce..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LowerCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_TokenFilter */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter.php';
-
-
-/**
- * Lower case Token filter.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_TokenFilter_LowerCase extends Zend_Search_Lucene_Analysis_TokenFilter
-{
-    /**
-     * Normalize Token or remove it (if null is returned)
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $srcToken
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken)
-    {
-        $newToken = new Zend_Search_Lucene_Analysis_Token(
-                                     strtolower( $srcToken->getTermText() ),
-                                     $srcToken->getStartOffset(),
-                                     $srcToken->getEndOffset());
-
-        $newToken->setPositionIncrement($srcToken->getPositionIncrement());
-
-        return $newToken;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
deleted file mode 100644
index 56aa0ebf9..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LowerCaseUtf8.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_TokenFilter */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter.php';
-
-
-/**
- * Lower case Token filter.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_TokenFilter_LowerCaseUtf8 extends Zend_Search_Lucene_Analysis_TokenFilter
-{
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        if (!function_exists('mb_strtolower')) {
-            // mbstring extension is disabled
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Utf8 compatible lower case filter needs mbstring extension to be enabled.');
-        }
-    }
-
-    /**
-     * Normalize Token or remove it (if null is returned)
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $srcToken
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken)
-    {
-        $newToken = new Zend_Search_Lucene_Analysis_Token(
-                                     mb_strtolower($srcToken->getTermText(), 'UTF-8'),
-                                     $srcToken->getStartOffset(),
-                                     $srcToken->getEndOffset());
-
-        $newToken->setPositionIncrement($srcToken->getPositionIncrement());
-
-        return $newToken;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
deleted file mode 100644
index 5a236ea3d..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ShortWords.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Analysis_TokenFilter */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter.php';
-
-
-/**
- * Token filter that removes short words. What is short word can be configured with constructor.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_TokenFilter_ShortWords extends Zend_Search_Lucene_Analysis_TokenFilter
-{
-    /**
-     * Minimum allowed term length
-     * @var integer
-     */
-    private $length;
-
-    /**
-     * Constructs new instance of this filter.
-     *
-     * @param integer $short  minimum allowed length of term which passes this filter (default 2)
-     */
-    public function __construct($length = 2) {
-        $this->length = $length;
-    }
-
-    /**
-     * Normalize Token or remove it (if null is returned)
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $srcToken
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken) {
-        if (strlen($srcToken->getTermText()) < $this->length) {
-            return null;
-        } else {
-            return $srcToken;
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php b/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
deleted file mode 100644
index 42d0047ca..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StopWords.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Analysis_TokenFilter */
-require_once 'Zend/Search/Lucene/Analysis/TokenFilter.php';
-
-/**
- * Token filter that removes stop words. These words must be provided as array (set), example:
- * $stopwords = array('the' => 1, 'an' => '1');
- *
- * We do recommend to provide all words in lowercase and concatenate this class after the lowercase filter.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Analysis
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Search_Lucene_Analysis_TokenFilter_StopWords extends Zend_Search_Lucene_Analysis_TokenFilter
-{
-    /**
-     * Stop Words
-     * @var array
-     */
-    private $_stopSet;
-
-    /**
-     * Constructs new instance of this filter.
-     *
-     * @param array $stopwords array (set) of words that will be filtered out
-     */
-    public function __construct($stopwords = array()) {
-        $this->_stopSet = array_flip($stopwords);
-    }
-
-    /**
-     * Normalize Token or remove it (if null is returned)
-     *
-     * @param Zend_Search_Lucene_Analysis_Token $srcToken
-     * @return Zend_Search_Lucene_Analysis_Token
-     */
-    public function normalize(Zend_Search_Lucene_Analysis_Token $srcToken) {
-        if (array_key_exists($srcToken->getTermText(), $this->_stopSet)) {
-            return null;
-        } else {
-            return $srcToken;
-        }
-    }
-
-    /**
-     * Fills stopwords set from a text file. Each line contains one stopword, lines with '#' in the first
-     * column are ignored (as comments).
-     *
-     * You can call this method one or more times. New stopwords are always added to current set.
-     *
-     * @param string $filepath full path for text file with stopwords
-     * @throws Zend_Search_Exception When the file doesn`t exists or is not readable.
-     */
-    public function loadFromFile($filepath = null) {
-        if (! $filepath || ! file_exists($filepath)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('You have to provide valid file path');
-        }
-        $fd = fopen($filepath, "r");
-        if (! $fd) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Cannot open file ' . $filepath);
-        }
-        while (!feof ($fd)) {
-            $buffer = trim(fgets($fd));
-            if (strlen($buffer) > 0 && $buffer[0] != '#') {
-                $this->_stopSet[$buffer] = 1;
-            }
-        }
-        if (!fclose($fd)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Cannot close file ' . $filepath);
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document.php b/airtime_mvc/library/Zend/Search/Lucene/Document.php
deleted file mode 100644
index f86970e6f..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Document.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Field */
-require_once 'Zend/Search/Lucene/Field.php';
-
-
-/**
- * A Document is a set of fields. Each field has a name and a textual value.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document
-{
-
-    /**
-     * Associative array Zend_Search_Lucene_Field objects where the keys to the
-     * array are the names of the fields.
-     *
-     * @var array
-     */
-    protected $_fields = array();
-
-    /**
-     * Field boost factor
-     * It's not stored directly in the index, but affects on normalization factor
-     *
-     * @var float
-     */
-    public $boost = 1.0;
-
-    /**
-     * Proxy method for getFieldValue(), provides more convenient access to
-     * the string value of a field.
-     *
-     * @param  $offset
-     * @return string
-     */
-    public function __get($offset)
-    {
-        return $this->getFieldValue($offset);
-    }
-
-
-    /**
-     * Add a field object to this document.
-     *
-     * @param Zend_Search_Lucene_Field $field
-     * @return Zend_Search_Lucene_Document
-     */
-    public function addField(Zend_Search_Lucene_Field $field)
-    {
-        $this->_fields[$field->name] = $field;
-
-        return $this;
-    }
-
-
-    /**
-     * Return an array with the names of the fields in this document.
-     *
-     * @return array
-     */
-    public function getFieldNames()
-    {
-        return array_keys($this->_fields);
-    }
-
-
-    /**
-     * Returns Zend_Search_Lucene_Field object for a named field in this document.
-     *
-     * @param string $fieldName
-     * @return Zend_Search_Lucene_Field
-     */
-    public function getField($fieldName)
-    {
-        if (!array_key_exists($fieldName, $this->_fields)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception("Field name \"$fieldName\" not found in document.");
-        }
-        return $this->_fields[$fieldName];
-    }
-
-
-    /**
-     * Returns the string value of a named field in this document.
-     *
-     * @see __get()
-     * @return string
-     */
-    public function getFieldValue($fieldName)
-    {
-        return $this->getField($fieldName)->value;
-    }
-
-    /**
-     * Returns the string value of a named field in UTF-8 encoding.
-     *
-     * @see __get()
-     * @return string
-     */
-    public function getFieldUtf8Value($fieldName)
-    {
-        return $this->getField($fieldName)->getUtf8Value();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/Docx.php b/airtime_mvc/library/Zend/Search/Lucene/Document/Docx.php
deleted file mode 100644
index b2863fae5..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/Docx.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Docx.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Document_OpenXml */
-require_once 'Zend/Search/Lucene/Document/OpenXml.php';
-
-/**
- * Docx document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenXml {
-    /**
-     * Xml Schema - WordprocessingML
-     *
-     * @var string
-     */
-    const SCHEMA_WORDPROCESSINGML = 'http://schemas.openxmlformats.org/wordprocessingml/2006/main';
-
-    /**
-     * Object constructor
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function __construct($fileName, $storeContent) {
-        if (!class_exists('ZipArchive', false)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
-        }
-
-        // Document data holders
-        $documentBody = array();
-        $coreProperties = array();
-
-        // Open OpenXML package
-        $package = new ZipArchive();
-        $package->open($fileName);
-
-        // Read relations and search for officeDocument
-        $relationsXml = $package->getFromName('_rels/.rels');
-        if ($relationsXml === false) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Invalid archive or corrupted .docx file.');
-        }
-        $relations = simplexml_load_string($relationsXml);
-        foreach($relations->Relationship as $rel) {
-            if ($rel ["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_OFFICEDOCUMENT) {
-                // Found office document! Read in contents...
-                $contents = simplexml_load_string($package->getFromName(
-                                                                $this->absoluteZipPath(dirname($rel['Target'])
-                                                              . '/'
-                                                              . basename($rel['Target']))
-                                                                       ));
-
-                $contents->registerXPathNamespace('w', Zend_Search_Lucene_Document_Docx::SCHEMA_WORDPROCESSINGML);
-                $paragraphs = $contents->xpath('//w:body/w:p');
-
-                foreach ($paragraphs as $paragraph) {
-                    $runs = $paragraph->xpath('.//w:r/*[name() = "w:t" or name() = "w:br"]');
-
-                    if ($runs === false) {
-                        // Paragraph doesn't contain any text or breaks
-                        continue;
-                    }
-
-                    foreach ($runs as $run) {
-                     if ($run->getName() == 'br') {
-                         // Break element
-                         $documentBody[] = ' ';
-                     } else {
-                         $documentBody[] = (string)$run;
-                     }
-                    }
-
-                    // Add space after each paragraph. So they are not bound together.
-                    $documentBody[] = ' ';
-                }
-
-                break;
-            }
-        }
-
-        // Read core properties
-        $coreProperties = $this->extractMetaData($package);
-
-        // Close file
-        $package->close();
-
-        // Store filename
-        $this->addField(Zend_Search_Lucene_Field::Text('filename', $fileName, 'UTF-8'));
-
-        // Store contents
-        if ($storeContent) {
-            $this->addField(Zend_Search_Lucene_Field::Text('body', implode('', $documentBody), 'UTF-8'));
-        } else {
-            $this->addField(Zend_Search_Lucene_Field::UnStored('body', implode('', $documentBody), 'UTF-8'));
-        }
-
-        // Store meta data properties
-        foreach ($coreProperties as $key => $value) {
-            $this->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
-        }
-
-        // Store title (if not present in meta data)
-        if (! isset($coreProperties['title'])) {
-            $this->addField(Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
-        }
-    }
-
-    /**
-     * Load Docx document from a file
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @return Zend_Search_Lucene_Document_Docx
-     * @throws Zend_Search_Lucene_Document_Exception
-     */
-    public static function loadDocxFile($fileName, $storeContent = false) {
-        if (!is_readable($fileName)) {
-            require_once 'Zend/Search/Lucene/Document/Exception.php';
-            throw new Zend_Search_Lucene_Document_Exception('Provided file \'' . $fileName . '\' is not readable.');
-        }
-
-        return new Zend_Search_Lucene_Document_Docx($fileName, $storeContent);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/Exception.php b/airtime_mvc/library/Zend/Search/Lucene/Document/Exception.php
deleted file mode 100644
index 808a2927a..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Framework base exception
- */
-require_once 'Zend/Search/Lucene/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document_Exception extends Zend_Search_Lucene_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/Html.php b/airtime_mvc/library/Zend/Search/Lucene/Document/Html.php
deleted file mode 100644
index 86c0db18c..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/Html.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Html.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Document */
-require_once 'Zend/Search/Lucene/Document.php';
-
-
-/**
- * HTML document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document_Html extends Zend_Search_Lucene_Document
-{
-    /**
-     * List of document links
-     *
-     * @var array
-     */
-    private $_links = array();
-
-    /**
-     * List of document header links
-     *
-     * @var array
-     */
-    private $_headerLinks = array();
-
-    /**
-     * Stored DOM representation
-     *
-     * @var DOMDocument
-     */
-    private $_doc;
-
-    /**
-     * Exclud nofollow links flag
-     *
-     * If true then links with rel='nofollow' attribute are not included into
-     * document links.
-     *
-     * @var boolean
-     */
-    private static $_excludeNoFollowLinks = false;
-
-    /**
-     * Object constructor
-     *
-     * @param string  $data         HTML string (may be HTML fragment, )
-     * @param boolean $isFile
-     * @param boolean $storeContent
-     * @param string  $defaultEncoding   HTML encoding, is used if it's not specified using Content-type HTTP-EQUIV meta tag.
-     */
-    private function __construct($data, $isFile, $storeContent, $defaultEncoding = '')
-    {
-        $this->_doc = new DOMDocument();
-        $this->_doc->substituteEntities = true;
-
-        if ($isFile) {
-            $htmlData = file_get_contents($data);
-        } else {
-            $htmlData = $data;
-        }
-        @$this->_doc->loadHTML($htmlData);
-
-        if ($this->_doc->encoding === null) {
-            // Document encoding is not recognized
-
-            /** @todo improve HTML vs HTML fragment recognition */
-            if (preg_match('/<html>/i', $htmlData, $matches, PREG_OFFSET_CAPTURE)) {
-                // It's an HTML document
-                // Add additional HEAD section and recognize document
-                $htmlTagOffset = $matches[0][1] + strlen($matches[0][0]);
-
-                @$this->_doc->loadHTML(iconv($defaultEncoding, 'UTF-8//IGNORE', substr($htmlData, 0, $htmlTagOffset))
-                                     . '<head><META HTTP-EQUIV="Content-type" CONTENT="text/html; charset=UTF-8"/></head>'
-                                     . iconv($defaultEncoding, 'UTF-8//IGNORE', substr($htmlData, $htmlTagOffset)));
-
-                // Remove additional HEAD section
-                $xpath = new DOMXPath($this->_doc);
-                $head  = $xpath->query('/html/head')->item(0);
-                $head->parentNode->removeChild($head);
-            } else {
-                // It's an HTML fragment
-                @$this->_doc->loadHTML('<html><head><META HTTP-EQUIV="Content-type" CONTENT="text/html; charset=UTF-8"/></head><body>'
-                                     . iconv($defaultEncoding, 'UTF-8//IGNORE', $htmlData)
-                                     . '</body></html>');
-            }
-
-        }
-        /** @todo Add correction of wrong HTML encoding recognition processing
-         * The case is:
-         * Content-type HTTP-EQUIV meta tag is presented, but ISO-8859-5 encoding is actually used,
-         * even $this->_doc->encoding demonstrates another recognized encoding
-         */
-
-        $xpath = new DOMXPath($this->_doc);
-
-        $docTitle = '';
-        $titleNodes = $xpath->query('/html/head/title');
-        foreach ($titleNodes as $titleNode) {
-            // title should always have only one entry, but we process all nodeset entries
-            $docTitle .= $titleNode->nodeValue . ' ';
-        }
-        $this->addField(Zend_Search_Lucene_Field::Text('title', $docTitle, 'UTF-8'));
-
-        $metaNodes = $xpath->query('/html/head/meta[@name]');
-        foreach ($metaNodes as $metaNode) {
-            $this->addField(Zend_Search_Lucene_Field::Text($metaNode->getAttribute('name'),
-                                                           $metaNode->getAttribute('content'),
-                                                           'UTF-8'));
-        }
-
-        $docBody = '';
-        $bodyNodes = $xpath->query('/html/body');
-        foreach ($bodyNodes as $bodyNode) {
-            // body should always have only one entry, but we process all nodeset entries
-            $this->_retrieveNodeText($bodyNode, $docBody);
-        }
-        if ($storeContent) {
-            $this->addField(Zend_Search_Lucene_Field::Text('body', $docBody, 'UTF-8'));
-        } else {
-            $this->addField(Zend_Search_Lucene_Field::UnStored('body', $docBody, 'UTF-8'));
-        }
-
-        $linkNodes = $this->_doc->getElementsByTagName('a');
-        foreach ($linkNodes as $linkNode) {
-            if (($href = $linkNode->getAttribute('href')) != '' &&
-                (!self::$_excludeNoFollowLinks  ||  strtolower($linkNode->getAttribute('rel')) != 'nofollow' )
-               ) {
-                $this->_links[] = $href;
-            }
-        }
-        $this->_links = array_unique($this->_links);
-
-        $linkNodes = $xpath->query('/html/head/link');
-        foreach ($linkNodes as $linkNode) {
-            if (($href = $linkNode->getAttribute('href')) != '') {
-                $this->_headerLinks[] = $href;
-            }
-        }
-        $this->_headerLinks = array_unique($this->_headerLinks);
-    }
-
-    /**
-     * Set exclude nofollow links flag
-     *
-     * @param boolean $newValue
-     */
-    public static function setExcludeNoFollowLinks($newValue)
-    {
-        self::$_excludeNoFollowLinks = $newValue;
-    }
-
-    /**
-     * Get exclude nofollow links flag
-     *
-     * @return boolean
-     */
-    public static function getExcludeNoFollowLinks()
-    {
-        return self::$_excludeNoFollowLinks;
-    }
-
-    /**
-     * Get node text
-     *
-     * We should exclude scripts, which may be not included into comment tags, CDATA sections,
-     *
-     * @param DOMNode $node
-     * @param string &$text
-     */
-    private function _retrieveNodeText(DOMNode $node, &$text)
-    {
-        if ($node->nodeType == XML_TEXT_NODE) {
-            $text .= $node->nodeValue ;
-            $text .= ' ';
-        } else if ($node->nodeType == XML_ELEMENT_NODE  &&  $node->nodeName != 'script') {
-            foreach ($node->childNodes as $childNode) {
-                $this->_retrieveNodeText($childNode, $text);
-            }
-        }
-    }
-
-    /**
-     * Get document HREF links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        return $this->_links;
-    }
-
-    /**
-     * Get document header links
-     *
-     * @return array
-     */
-    public function getHeaderLinks()
-    {
-        return $this->_headerLinks;
-    }
-
-    /**
-     * Load HTML document from a string
-     *
-     * @param string  $data
-     * @param boolean $storeContent
-     * @param string  $defaultEncoding   HTML encoding, is used if it's not specified using Content-type HTTP-EQUIV meta tag.
-     * @return Zend_Search_Lucene_Document_Html
-     */
-    public static function loadHTML($data, $storeContent = false, $defaultEncoding = '')
-    {
-        return new Zend_Search_Lucene_Document_Html($data, false, $storeContent, $defaultEncoding);
-    }
-
-    /**
-     * Load HTML document from a file
-     *
-     * @param string  $file
-     * @param boolean $storeContent
-     * @param string  $defaultEncoding   HTML encoding, is used if it's not specified using Content-type HTTP-EQUIV meta tag.
-     * @return Zend_Search_Lucene_Document_Html
-     */
-    public static function loadHTMLFile($file, $storeContent = false, $defaultEncoding = '')
-    {
-        return new Zend_Search_Lucene_Document_Html($file, true, $storeContent, $defaultEncoding);
-    }
-
-
-    /**
-     * Highlight text in text node
-     *
-     * @param DOMText $node
-     * @param array   $wordsToHighlight
-     * @param callback $callback   Callback method, used to transform (highlighting) text.
-     * @param array    $params     Array of additionall callback parameters (first non-optional parameter is a text to transform)
-     * @throws Zend_Search_Lucene_Exception
-     */
-    protected function _highlightTextNode(DOMText $node, $wordsToHighlight, $callback, $params)
-    {
-        /** Zend_Search_Lucene_Analysis_Analyzer */
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-        $analyzer = Zend_Search_Lucene_Analysis_Analyzer::getDefault();
-        $analyzer->setInput($node->nodeValue, 'UTF-8');
-
-        $matchedTokens = array();
-
-        while (($token = $analyzer->nextToken()) !== null) {
-            if (isset($wordsToHighlight[$token->getTermText()])) {
-                $matchedTokens[] = $token;
-            }
-        }
-
-        if (count($matchedTokens) == 0) {
-            return;
-        }
-
-        $matchedTokens = array_reverse($matchedTokens);
-
-        foreach ($matchedTokens as $token) {
-            // Cut text after matched token
-            $node->splitText($token->getEndOffset());
-
-            // Cut matched node
-            $matchedWordNode = $node->splitText($token->getStartOffset());
-
-            // Retrieve HTML string representation for highlihted word
-            $fullCallbackparamsList = $params;
-            array_unshift($fullCallbackparamsList, $matchedWordNode->nodeValue);
-            $highlightedWordNodeSetHtml = call_user_func_array($callback, $fullCallbackparamsList);
-
-            // Transform HTML string to a DOM representation and automatically transform retrieved string
-            // into valid XHTML (It's automatically done by loadHTML() method)
-            $highlightedWordNodeSetDomDocument = new DOMDocument('1.0', 'UTF-8');
-            $success = @$highlightedWordNodeSetDomDocument->
-                                loadHTML('<html><head><meta http-equiv="Content-type" content="text/html; charset=UTF-8"/></head><body>'
-                                       . $highlightedWordNodeSetHtml
-                                       . '</body></html>');
-            if (!$success) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception("Error occured while loading highlighted text fragment: '$highlightedNodeHtml'.");
-            }
-            $highlightedWordNodeSetXpath = new DOMXPath($highlightedWordNodeSetDomDocument);
-            $highlightedWordNodeSet      = $highlightedWordNodeSetXpath->query('/html/body')->item(0)->childNodes;
-
-            for ($count = 0; $count < $highlightedWordNodeSet->length; $count++) {
-                $nodeToImport = $highlightedWordNodeSet->item($count);
-                $node->parentNode->insertBefore($this->_doc->importNode($nodeToImport, true /* deep copy */),
-                                                $matchedWordNode);
-            }
-
-            $node->parentNode->removeChild($matchedWordNode);
-        }
-    }
-
-
-    /**
-     * highlight words in content of the specified node
-     *
-     * @param DOMNode $contextNode
-     * @param array $wordsToHighlight
-     * @param callback $callback   Callback method, used to transform (highlighting) text.
-     * @param array    $params     Array of additionall callback parameters (first non-optional parameter is a text to transform)
-     */
-    protected function _highlightNodeRecursive(DOMNode $contextNode, $wordsToHighlight, $callback, $params)
-    {
-        $textNodes = array();
-
-        if (!$contextNode->hasChildNodes()) {
-            return;
-        }
-
-        foreach ($contextNode->childNodes as $childNode) {
-            if ($childNode->nodeType == XML_TEXT_NODE) {
-                // process node later to leave childNodes structure untouched
-                $textNodes[] = $childNode;
-            } else {
-                // Process node if it's not a script node
-                if ($childNode->nodeName != 'script') {
-                    $this->_highlightNodeRecursive($childNode, $wordsToHighlight, $callback, $params);
-                }
-            }
-        }
-
-        foreach ($textNodes as $textNode) {
-            $this->_highlightTextNode($textNode, $wordsToHighlight, $callback, $params);
-        }
-    }
-
-    /**
-     * Standard callback method used to highlight words.
-     *
-     * @param  string  $stringToHighlight
-     * @return string
-     * @internal
-     */
-    public function applyColour($stringToHighlight, $colour)
-    {
-        return '<b style="color:black;background-color:' . $colour . '">' . $stringToHighlight . '</b>';
-    }
-
-    /**
-     * Highlight text with specified color
-     *
-     * @param string|array $words
-     * @param string $colour
-     * @return string
-     */
-    public function highlight($words, $colour = '#66ffff')
-    {
-        return $this->highlightExtended($words, array($this, 'applyColour'), array($colour));
-    }
-
-
-
-    /**
-     * Highlight text using specified View helper or callback function.
-     *
-     * @param string|array $words  Words to highlight. Words could be organized using the array or string.
-     * @param callback $callback   Callback method, used to transform (highlighting) text.
-     * @param array    $params     Array of additionall callback parameters passed through into it
-     *                             (first non-optional parameter is an HTML fragment for highlighting)
-     * @return string
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function highlightExtended($words, $callback, $params = array())
-    {
-        /** Zend_Search_Lucene_Analysis_Analyzer */
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-        if (!is_array($words)) {
-            $words = array($words);
-        }
-
-        $wordsToHighlightList = array();
-        $analyzer = Zend_Search_Lucene_Analysis_Analyzer::getDefault();
-        foreach ($words as $wordString) {
-            $wordsToHighlightList[] = $analyzer->tokenize($wordString);
-        }
-        $wordsToHighlight = call_user_func_array('array_merge', $wordsToHighlightList);
-
-        if (count($wordsToHighlight) == 0) {
-            return $this->_doc->saveHTML();
-        }
-
-        $wordsToHighlightFlipped = array();
-        foreach ($wordsToHighlight as $id => $token) {
-            $wordsToHighlightFlipped[$token->getTermText()] = $id;
-        }
-
-        if (!is_callable($callback)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('$viewHelper parameter mast be a View Helper name, View Helper object or callback.');
-        }
-
-        $xpath = new DOMXPath($this->_doc);
-
-        $matchedNodes = $xpath->query("/html/body");
-        foreach ($matchedNodes as $matchedNode) {
-            $this->_highlightNodeRecursive($matchedNode, $wordsToHighlightFlipped, $callback, $params);
-        }
-    }
-
-
-    /**
-     * Get HTML
-     *
-     * @return string
-     */
-    public function getHTML()
-    {
-        return $this->_doc->saveHTML();
-    }
-
-    /**
-     * Get HTML body
-     *
-     * @return string
-     */
-    public function getHtmlBody()
-    {
-        $xpath = new DOMXPath($this->_doc);
-        $bodyNodes = $xpath->query('/html/body')->item(0)->childNodes;
-
-        $outputFragments = array();
-        for ($count = 0; $count < $bodyNodes->length; $count++) {
-            $outputFragments[] = $this->_doc->saveXML($bodyNodes->item($count));
-        }
-
-        return implode($outputFragments);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/OpenXml.php b/airtime_mvc/library/Zend/Search/Lucene/Document/OpenXml.php
deleted file mode 100644
index d9d73acff..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/OpenXml.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OpenXml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Document */
-require_once 'Zend/Search/Lucene/Document.php';
-
-
-/**
- * OpenXML document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Document_OpenXml extends Zend_Search_Lucene_Document
-{
-    /**
-     * Xml Schema - Relationships
-     *
-     * @var string
-     */
-    const SCHEMA_RELATIONSHIP = 'http://schemas.openxmlformats.org/package/2006/relationships';
-
-    /**
-     * Xml Schema - Office document
-     *
-     * @var string
-     */
-    const SCHEMA_OFFICEDOCUMENT = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument';
-
-    /**
-     * Xml Schema - Core properties
-     *
-     * @var string
-     */
-    const SCHEMA_COREPROPERTIES = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties';
-
-    /**
-     * Xml Schema - Dublin Core
-     *
-     * @var string
-     */
-    const SCHEMA_DUBLINCORE = 'http://purl.org/dc/elements/1.1/';
-
-    /**
-     * Xml Schema - Dublin Core Terms
-     *
-     * @var string
-     */
-    const SCHEMA_DUBLINCORETERMS = 'http://purl.org/dc/terms/';
-
-    /**
-     * Extract metadata from document
-     *
-     * @param ZipArchive $package    ZipArchive OpenXML package
-     * @return array    Key-value pairs containing document meta data
-     */
-    protected function extractMetaData(ZipArchive $package)
-    {
-        // Data holders
-        $coreProperties = array();
-
-        // Read relations and search for core properties
-        $relations = simplexml_load_string($package->getFromName("_rels/.rels"));
-        foreach ($relations->Relationship as $rel) {
-            if ($rel["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_COREPROPERTIES) {
-                // Found core properties! Read in contents...
-                $contents = simplexml_load_string(
-                    $package->getFromName(dirname($rel["Target"]) . "/" . basename($rel["Target"]))
-                );
-
-                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_DUBLINCORE) as $child) {
-                    $coreProperties[$child->getName()] = (string)$child;
-                }
-                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_COREPROPERTIES) as $child) {
-                    $coreProperties[$child->getName()] = (string)$child;
-                }
-                foreach ($contents->children(Zend_Search_Lucene_Document_OpenXml::SCHEMA_DUBLINCORETERMS) as $child) {
-                    $coreProperties[$child->getName()] = (string)$child;
-                }
-            }
-        }
-
-        return $coreProperties;
-    }
-
-    /**
-     * Determine absolute zip path
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function absoluteZipPath($path) {
-        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);
-        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');
-        $absolutes = array();
-        foreach ($parts as $part) {
-            if ('.' == $part) continue;
-            if ('..' == $part) {
-                array_pop($absolutes);
-            } else {
-                $absolutes[] = $part;
-            }
-        }
-        return implode('/', $absolutes);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/Pptx.php b/airtime_mvc/library/Zend/Search/Lucene/Document/Pptx.php
deleted file mode 100644
index 0b634c80e..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/Pptx.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pptx.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Document_OpenXml */
-require_once 'Zend/Search/Lucene/Document/OpenXml.php';
-
-/**
- * Pptx document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document_Pptx extends Zend_Search_Lucene_Document_OpenXml
-{
-    /**
-     * Xml Schema - PresentationML
-     *
-     * @var string
-     */
-    const SCHEMA_PRESENTATIONML = 'http://schemas.openxmlformats.org/presentationml/2006/main';
-
-    /**
-     * Xml Schema - DrawingML
-     *
-     * @var string
-     */
-    const SCHEMA_DRAWINGML = 'http://schemas.openxmlformats.org/drawingml/2006/main';
-
-    /**
-     * Xml Schema - Slide relation
-     *
-     * @var string
-     */
-    const SCHEMA_SLIDERELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide';
-
-    /**
-     * Xml Schema - Slide notes relation
-     *
-     * @var string
-     */
-    const SCHEMA_SLIDENOTESRELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide';
-
-    /**
-     * Object constructor
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function __construct($fileName, $storeContent)
-    {
-        if (!class_exists('ZipArchive', false)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
-        }
-
-        // Document data holders
-        $slides = array();
-        $slideNotes = array();
-        $documentBody = array();
-        $coreProperties = array();
-
-        // Open OpenXML package
-        $package = new ZipArchive();
-        $package->open($fileName);
-
-        // Read relations and search for officeDocument
-        $relationsXml = $package->getFromName('_rels/.rels');
-        if ($relationsXml === false) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Invalid archive or corrupted .pptx file.');
-        }
-        $relations = simplexml_load_string($relationsXml);
-        foreach ($relations->Relationship as $rel) {
-            if ($rel["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_OFFICEDOCUMENT) {
-                // Found office document! Search for slides...
-                $slideRelations = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/_rels/" . basename($rel["Target"]) . ".rels")) );
-                foreach ($slideRelations->Relationship as $slideRel) {
-                    if ($slideRel["Type"] == Zend_Search_Lucene_Document_Pptx::SCHEMA_SLIDERELATION) {
-                        // Found slide!
-                        $slides[ str_replace( 'rId', '', (string)$slideRel["Id"] ) ] = simplexml_load_string(
-                            $package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . dirname($slideRel["Target"]) . "/" . basename($slideRel["Target"])) )
-                        );
-
-                        // Search for slide notes
-                        $slideNotesRelations = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . dirname($slideRel["Target"]) . "/_rels/" . basename($slideRel["Target"]) . ".rels")) );
-                        foreach ($slideNotesRelations->Relationship as $slideNoteRel) {
-                            if ($slideNoteRel["Type"] == Zend_Search_Lucene_Document_Pptx::SCHEMA_SLIDENOTESRELATION) {
-                                // Found slide notes!
-                                $slideNotes[ str_replace( 'rId', '', (string)$slideRel["Id"] ) ] = simplexml_load_string(
-                                    $package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . dirname($slideRel["Target"]) . "/" . dirname($slideNoteRel["Target"]) . "/" . basename($slideNoteRel["Target"])) )
-                                );
-
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                break;
-            }
-        }
-
-        // Sort slides
-        ksort($slides);
-        ksort($slideNotes);
-
-        // Extract contents from slides
-        foreach ($slides as $slideKey => $slide) {
-            // Register namespaces
-            $slide->registerXPathNamespace("p", Zend_Search_Lucene_Document_Pptx::SCHEMA_PRESENTATIONML);
-            $slide->registerXPathNamespace("a", Zend_Search_Lucene_Document_Pptx::SCHEMA_DRAWINGML);
-
-            // Fetch all text
-            $textElements = $slide->xpath('//a:t');
-            foreach ($textElements as $textElement) {
-                $documentBody[] = (string)$textElement;
-            }
-
-            // Extract contents from slide notes
-            if (isset($slideNotes[$slideKey])) {
-                // Fetch slide note
-                $slideNote = $slideNotes[$slideKey];
-
-                // Register namespaces
-                $slideNote->registerXPathNamespace("p", Zend_Search_Lucene_Document_Pptx::SCHEMA_PRESENTATIONML);
-                $slideNote->registerXPathNamespace("a", Zend_Search_Lucene_Document_Pptx::SCHEMA_DRAWINGML);
-
-                // Fetch all text
-                $textElements = $slideNote->xpath('//a:t');
-                foreach ($textElements as $textElement) {
-                    $documentBody[] = (string)$textElement;
-                }
-            }
-        }
-
-        // Read core properties
-        $coreProperties = $this->extractMetaData($package);
-
-        // Close file
-        $package->close();
-
-        // Store filename
-        $this->addField(Zend_Search_Lucene_Field::Text('filename', $fileName, 'UTF-8'));
-
-            // Store contents
-        if ($storeContent) {
-            $this->addField(Zend_Search_Lucene_Field::Text('body', implode(' ', $documentBody), 'UTF-8'));
-        } else {
-            $this->addField(Zend_Search_Lucene_Field::UnStored('body', implode(' ', $documentBody), 'UTF-8'));
-        }
-
-        // Store meta data properties
-        foreach ($coreProperties as $key => $value)
-        {
-            $this->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
-        }
-
-        // Store title (if not present in meta data)
-        if (!isset($coreProperties['title']))
-        {
-            $this->addField(Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
-        }
-    }
-
-    /**
-     * Load Pptx document from a file
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @return Zend_Search_Lucene_Document_Pptx
-     */
-    public static function loadPptxFile($fileName, $storeContent = false)
-    {
-        return new Zend_Search_Lucene_Document_Pptx($fileName, $storeContent);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Document/Xlsx.php b/airtime_mvc/library/Zend/Search/Lucene/Document/Xlsx.php
deleted file mode 100644
index afe7eb80e..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Document/Xlsx.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xlsx.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Document_OpenXml */
-require_once 'Zend/Search/Lucene/Document/OpenXml.php';
-
-/**
- * Xlsx document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenXml
-{
-    /**
-     * Xml Schema - SpreadsheetML
-     *
-     * @var string
-     */
-    const SCHEMA_SPREADSHEETML = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main';
-
-    /**
-     * Xml Schema - DrawingML
-     *
-     * @var string
-     */
-    const SCHEMA_DRAWINGML = 'http://schemas.openxmlformats.org/drawingml/2006/main';
-
-    /**
-     * Xml Schema - Shared Strings
-     *
-     * @var string
-     */
-    const SCHEMA_SHAREDSTRINGS = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings';
-
-    /**
-     * Xml Schema - Worksheet relation
-     *
-     * @var string
-     */
-    const SCHEMA_WORKSHEETRELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet';
-
-    /**
-     * Xml Schema - Slide notes relation
-     *
-     * @var string
-     */
-    const SCHEMA_SLIDENOTESRELATION = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide';
-
-    /**
-     * Object constructor
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function __construct($fileName, $storeContent)
-    {
-        if (!class_exists('ZipArchive', false)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
-        }
-
-        // Document data holders
-        $sharedStrings = array();
-        $worksheets = array();
-        $documentBody = array();
-        $coreProperties = array();
-
-        // Open OpenXML package
-        $package = new ZipArchive();
-        $package->open($fileName);
-
-        // Read relations and search for officeDocument
-        $relationsXml = $package->getFromName('_rels/.rels');
-        if ($relationsXml === false) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Invalid archive or corrupted .xlsx file.');
-        }
-        $relations = simplexml_load_string($relationsXml);
-        foreach ($relations->Relationship as $rel) {
-            if ($rel["Type"] == Zend_Search_Lucene_Document_OpenXml::SCHEMA_OFFICEDOCUMENT) {
-                // Found office document! Read relations for workbook...
-                $workbookRelations = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/_rels/" . basename($rel["Target"]) . ".rels")) );
-                $workbookRelations->registerXPathNamespace("rel", Zend_Search_Lucene_Document_OpenXml::SCHEMA_RELATIONSHIP);
-
-                // Read shared strings
-                $sharedStringsPath = $workbookRelations->xpath("rel:Relationship[@Type='" . Zend_Search_Lucene_Document_Xlsx::SCHEMA_SHAREDSTRINGS . "']");
-                $sharedStringsPath = (string)$sharedStringsPath[0]['Target'];
-                $xmlStrings = simplexml_load_string($package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . $sharedStringsPath)) );
-                if (isset($xmlStrings) && isset($xmlStrings->si)) {
-                    foreach ($xmlStrings->si as $val) {
-                        if (isset($val->t)) {
-                            $sharedStrings[] = (string)$val->t;
-                        } elseif (isset($val->r)) {
-                            $sharedStrings[] = $this->_parseRichText($val);
-                        }
-                    }
-                }
-
-                // Loop relations for workbook and extract worksheets...
-                foreach ($workbookRelations->Relationship as $workbookRelation) {
-                    if ($workbookRelation["Type"] == Zend_Search_Lucene_Document_Xlsx::SCHEMA_WORKSHEETRELATION) {
-                        $worksheets[ str_replace( 'rId', '', (string)$workbookRelation["Id"]) ] = simplexml_load_string(
-                            $package->getFromName( $this->absoluteZipPath(dirname($rel["Target"]) . "/" . dirname($workbookRelation["Target"]) . "/" . basename($workbookRelation["Target"])) )
-                        );
-                    }
-                }
-
-                break;
-            }
-        }
-
-        // Sort worksheets
-        ksort($worksheets);
-
-        // Extract contents from worksheets
-        foreach ($worksheets as $sheetKey => $worksheet) {
-            foreach ($worksheet->sheetData->row as $row) {
-                foreach ($row->c as $c) {
-                    // Determine data type
-                    $dataType = (string)$c["t"];
-                    switch ($dataType) {
-                        case "s":
-                            // Value is a shared string
-                            if ((string)$c->v != '') {
-                                $value = $sharedStrings[intval($c->v)];
-                            } else {
-                                $value = '';
-                            }
-
-                            break;
-
-                        case "b":
-                            // Value is boolean
-                            $value = (string)$c->v;
-                            if ($value == '0') {
-                                $value = false;
-                            } else if ($value == '1') {
-                                $value = true;
-                            } else {
-                                $value = (bool)$c->v;
-                            }
-
-                            break;
-
-                        case "inlineStr":
-                            // Value is rich text inline
-                            $value = $this->_parseRichText($c->is);
-
-                            break;
-
-                        case "e":
-                            // Value is an error message
-                            if ((string)$c->v != '') {
-                                $value = (string)$c->v;
-                            } else {
-                                $value = '';
-                            }
-
-                            break;
-
-                        default:
-                            // Value is a string
-                            $value = (string)$c->v;
-
-                            // Check for numeric values
-                            if (is_numeric($value) && $dataType != 's') {
-                                if ($value == (int)$value) $value = (int)$value;
-                                elseif ($value == (float)$value) $value = (float)$value;
-                                elseif ($value == (double)$value) $value = (double)$value;
-                            }
-                    }
-
-                    $documentBody[] = $value;
-                }
-            }
-        }
-
-        // Read core properties
-        $coreProperties = $this->extractMetaData($package);
-
-        // Close file
-        $package->close();
-
-        // Store filename
-        $this->addField(Zend_Search_Lucene_Field::Text('filename', $fileName, 'UTF-8'));
-
-        // Store contents
-        if ($storeContent) {
-            $this->addField(Zend_Search_Lucene_Field::Text('body', implode(' ', $documentBody), 'UTF-8'));
-        } else {
-            $this->addField(Zend_Search_Lucene_Field::UnStored('body', implode(' ', $documentBody), 'UTF-8'));
-        }
-
-        // Store meta data properties
-        foreach ($coreProperties as $key => $value)
-        {
-            $this->addField(Zend_Search_Lucene_Field::Text($key, $value, 'UTF-8'));
-        }
-
-        // Store title (if not present in meta data)
-        if (!isset($coreProperties['title']))
-        {
-            $this->addField(Zend_Search_Lucene_Field::Text('title', $fileName, 'UTF-8'));
-        }
-    }
-
-    /**
-     * Parse rich text XML
-     *
-     * @param SimpleXMLElement $is
-     * @return string
-     */
-    private function _parseRichText($is = null) {
-        $value = array();
-
-        if (isset($is->t)) {
-            $value[] = (string)$is->t;
-        } else {
-            foreach ($is->r as $run) {
-                $value[] = (string)$run->t;
-            }
-        }
-
-        return implode('', $value);
-    }
-
-    /**
-     * Load Xlsx document from a file
-     *
-     * @param string  $fileName
-     * @param boolean $storeContent
-     * @return Zend_Search_Lucene_Document_Xlsx
-     */
-    public static function loadXlsxFile($fileName, $storeContent = false)
-    {
-        return new Zend_Search_Lucene_Document_Xlsx($fileName, $storeContent);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Exception.php b/airtime_mvc/library/Zend/Search/Lucene/Exception.php
deleted file mode 100644
index 7d8fb6e49..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Framework base exception
- */
-require_once 'Zend/Search/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Exception extends Zend_Search_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/FSM.php b/airtime_mvc/library/Zend/Search/Lucene/FSM.php
deleted file mode 100644
index c2d663e92..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/FSM.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FSM.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_FSMAction */
-require_once 'Zend/Search/Lucene/FSMAction.php';
-
-/**
- * Abstract Finite State Machine
- *
- * Take a look on Wikipedia state machine description: http://en.wikipedia.org/wiki/Finite_state_machine
- *
- * Any type of Transducers (Moore machine or Mealy machine) also may be implemented by using this abstract FSM.
- * process() methods invokes a specified actions which may construct FSM output.
- * Actions may be also used to signal, that we have reached Accept State
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_FSM
-{
-    /**
-     * Machine States alphabet
-     *
-     * @var array
-     */
-    private $_states = array();
-
-    /**
-     * Current state
-     *
-     * @var integer|string
-     */
-    private $_currentState = null;
-
-    /**
-     * Input alphabet
-     *
-     * @var array
-     */
-    private $_inputAphabet = array();
-
-    /**
-     * State transition table
-     *
-     * [sourceState][input] => targetState
-     *
-     * @var array
-     */
-    private $_rules = array();
-
-    /**
-     * List of entry actions
-     * Each action executes when entering the state
-     *
-     * [state] => action
-     *
-     * @var array
-     */
-    private $_entryActions =  array();
-
-    /**
-     * List of exit actions
-     * Each action executes when exiting the state
-     *
-     * [state] => action
-     *
-     * @var array
-     */
-    private $_exitActions =  array();
-
-    /**
-     * List of input actions
-     * Each action executes when entering the state
-     *
-     * [state][input] => action
-     *
-     * @var array
-     */
-    private $_inputActions =  array();
-
-    /**
-     * List of input actions
-     * Each action executes when entering the state
-     *
-     * [state1][state2] => action
-     *
-     * @var array
-     */
-    private $_transitionActions =  array();
-
-    /**
-     * Finite State machine constructor
-     *
-     * $states is an array of integers or strings with a list of possible machine states
-     * constructor treats fist list element as a sturt state (assignes it to $_current state).
-     * It may be reassigned by setState() call.
-     * States list may be empty and can be extended later by addState() or addStates() calls.
-     *
-     * $inputAphabet is the same as $states, but represents input alphabet
-     * it also may be extended later by addInputSymbols() or addInputSymbol() calls.
-     *
-     * $rules parameter describes FSM transitions and has a structure:
-     * array( array(sourseState, input, targetState[, inputAction]),
-     *        array(sourseState, input, targetState[, inputAction]),
-     *        array(sourseState, input, targetState[, inputAction]),
-     *        ...
-     *      )
-     * Rules also can be added later by addRules() and addRule() calls.
-     *
-     * FSM actions are very flexible and may be defined by addEntryAction(), addExitAction(),
-     * addInputAction() and addTransitionAction() calls.
-     *
-     * @param array $states
-     * @param array $inputAphabet
-     * @param array $rules
-     */
-    public function __construct($states = array(), $inputAphabet = array(), $rules = array())
-    {
-        $this->addStates($states);
-        $this->addInputSymbols($inputAphabet);
-        $this->addRules($rules);
-    }
-
-    /**
-     * Add states to the state machine
-     *
-     * @param array $states
-     */
-    public function addStates($states)
-    {
-        foreach ($states as $state) {
-            $this->addState($state);
-        }
-    }
-
-    /**
-     * Add state to the state machine
-     *
-     * @param integer|string $state
-     */
-    public function addState($state)
-    {
-        $this->_states[$state] = $state;
-
-        if ($this->_currentState === null) {
-            $this->_currentState = $state;
-        }
-    }
-
-    /**
-     * Set FSM state.
-     * No any action is invoked
-     *
-     * @param integer|string $state
-     * @throws Zend_Search_Exception
-     */
-    public function setState($state)
-    {
-        if (!isset($this->_states[$state])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('State \'' . $state . '\' is not on of the possible FSM states.');
-        }
-
-        $this->_currentState = $state;
-    }
-
-    /**
-     * Get FSM state.
-     *
-     * @return integer|string $state|null
-     */
-    public function getState()
-    {
-        return $this->_currentState;
-    }
-
-    /**
-     * Add symbols to the input alphabet
-     *
-     * @param array $inputAphabet
-     */
-    public function addInputSymbols($inputAphabet)
-    {
-        foreach ($inputAphabet as $inputSymbol) {
-            $this->addInputSymbol($inputSymbol);
-        }
-    }
-
-    /**
-     * Add symbol to the input alphabet
-     *
-     * @param integer|string $inputSymbol
-     */
-    public function addInputSymbol($inputSymbol)
-    {
-        $this->_inputAphabet[$inputSymbol] = $inputSymbol;
-    }
-
-
-    /**
-     * Add transition rules
-     *
-     * array structure:
-     * array( array(sourseState, input, targetState[, inputAction]),
-     *        array(sourseState, input, targetState[, inputAction]),
-     *        array(sourseState, input, targetState[, inputAction]),
-     *        ...
-     *      )
-     *
-     * @param array $rules
-     */
-    public function addRules($rules)
-    {
-        foreach ($rules as $rule) {
-            $this->addrule($rule[0], $rule[1], $rule[2], isset($rule[3])?$rule[3]:null);
-        }
-    }
-
-    /**
-     * Add symbol to the input alphabet
-     *
-     * @param integer|string $sourceState
-     * @param integer|string $input
-     * @param integer|string $targetState
-     * @param Zend_Search_Lucene_FSMAction|null $inputAction
-     * @throws Zend_Search_Exception
-     */
-    public function addRule($sourceState, $input, $targetState, $inputAction = null)
-    {
-        if (!isset($this->_states[$sourceState])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined source state (' . $sourceState . ').');
-        }
-        if (!isset($this->_states[$targetState])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined target state (' . $targetState . ').');
-        }
-        if (!isset($this->_inputAphabet[$input])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined input symbol (' . $input . ').');
-        }
-
-        if (!isset($this->_rules[$sourceState])) {
-            $this->_rules[$sourceState] = array();
-        }
-        if (isset($this->_rules[$sourceState][$input])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Rule for {state,input} pair (' . $sourceState . ', '. $input . ') is already defined.');
-        }
-
-        $this->_rules[$sourceState][$input] = $targetState;
-
-
-        if ($inputAction !== null) {
-            $this->addInputAction($sourceState, $input, $inputAction);
-        }
-    }
-
-
-    /**
-     * Add state entry action.
-     * Several entry actions are allowed.
-     * Action execution order is defined by addEntryAction() calls
-     *
-     * @param integer|string $state
-     * @param Zend_Search_Lucene_FSMAction $action
-     */
-    public function addEntryAction($state, Zend_Search_Lucene_FSMAction $action)
-    {
-        if (!isset($this->_states[$state])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined state (' . $state. ').');
-        }
-
-        if (!isset($this->_entryActions[$state])) {
-            $this->_entryActions[$state] = array();
-        }
-
-        $this->_entryActions[$state][] = $action;
-    }
-
-    /**
-     * Add state exit action.
-     * Several exit actions are allowed.
-     * Action execution order is defined by addEntryAction() calls
-     *
-     * @param integer|string $state
-     * @param Zend_Search_Lucene_FSMAction $action
-     */
-    public function addExitAction($state, Zend_Search_Lucene_FSMAction $action)
-    {
-        if (!isset($this->_states[$state])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined state (' . $state. ').');
-        }
-
-        if (!isset($this->_exitActions[$state])) {
-            $this->_exitActions[$state] = array();
-        }
-
-        $this->_exitActions[$state][] = $action;
-    }
-
-    /**
-     * Add input action (defined by {state, input} pair).
-     * Several input actions are allowed.
-     * Action execution order is defined by addInputAction() calls
-     *
-     * @param integer|string $state
-     * @param integer|string $input
-     * @param Zend_Search_Lucene_FSMAction $action
-     */
-    public function addInputAction($state, $inputSymbol, Zend_Search_Lucene_FSMAction $action)
-    {
-        if (!isset($this->_states[$state])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined state (' . $state. ').');
-        }
-        if (!isset($this->_inputAphabet[$inputSymbol])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined input symbol (' . $inputSymbol. ').');
-        }
-
-        if (!isset($this->_inputActions[$state])) {
-            $this->_inputActions[$state] = array();
-        }
-        if (!isset($this->_inputActions[$state][$inputSymbol])) {
-            $this->_inputActions[$state][$inputSymbol] = array();
-        }
-
-        $this->_inputActions[$state][$inputSymbol][] = $action;
-    }
-
-    /**
-     * Add transition action (defined by {state, input} pair).
-     * Several transition actions are allowed.
-     * Action execution order is defined by addTransitionAction() calls
-     *
-     * @param integer|string $sourceState
-     * @param integer|string $targetState
-     * @param Zend_Search_Lucene_FSMAction $action
-     */
-    public function addTransitionAction($sourceState, $targetState, Zend_Search_Lucene_FSMAction $action)
-    {
-        if (!isset($this->_states[$sourceState])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined source state (' . $sourceState. ').');
-        }
-        if (!isset($this->_states[$targetState])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('Undefined source state (' . $targetState. ').');
-        }
-
-        if (!isset($this->_transitionActions[$sourceState])) {
-            $this->_transitionActions[$sourceState] = array();
-        }
-        if (!isset($this->_transitionActions[$sourceState][$targetState])) {
-            $this->_transitionActions[$sourceState][$targetState] = array();
-        }
-
-        $this->_transitionActions[$sourceState][$targetState][] = $action;
-    }
-
-
-    /**
-     * Process an input
-     *
-     * @param mixed $input
-     * @throws Zend_Search_Exception
-     */
-    public function process($input)
-    {
-        if (!isset($this->_rules[$this->_currentState])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('There is no any rule for current state (' . $this->_currentState . ').');
-        }
-        if (!isset($this->_rules[$this->_currentState][$input])) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('There is no any rule for {current state, input} pair (' . $this->_currentState . ', ' . $input . ').');
-        }
-
-        $sourceState = $this->_currentState;
-        $targetState = $this->_rules[$this->_currentState][$input];
-
-        if ($sourceState != $targetState  &&  isset($this->_exitActions[$sourceState])) {
-            foreach ($this->_exitActions[$sourceState] as $action) {
-                $action->doAction();
-            }
-        }
-        if (isset($this->_inputActions[$sourceState]) &&
-            isset($this->_inputActions[$sourceState][$input])) {
-            foreach ($this->_inputActions[$sourceState][$input] as $action) {
-                $action->doAction();
-            }
-        }
-
-
-        $this->_currentState = $targetState;
-
-        if (isset($this->_transitionActions[$sourceState]) &&
-            isset($this->_transitionActions[$sourceState][$targetState])) {
-            foreach ($this->_transitionActions[$sourceState][$targetState] as $action) {
-                $action->doAction();
-            }
-        }
-        if ($sourceState != $targetState  &&  isset($this->_entryActions[$targetState])) {
-            foreach ($this->_entryActions[$targetState] as $action) {
-                $action->doAction();
-            }
-        }
-    }
-
-    public function reset()
-    {
-        if (count($this->_states) == 0) {
-            require_once 'Zend/Search/Exception.php';
-            throw new Zend_Search_Exception('There is no any state defined for FSM.');
-        }
-
-        $this->_currentState = $this->_states[0];
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/FSMAction.php b/airtime_mvc/library/Zend/Search/Lucene/FSMAction.php
deleted file mode 100644
index 54fa2b38f..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/FSMAction.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FSMAction.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract Finite State Machine
- *
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_FSMAction
-{
-    /**
-     * Object reference
-     *
-     * @var object
-     */
-    private $_object;
-
-    /**
-     * Method name
-     *
-     * @var string
-     */
-    private $_method;
-
-    /**
-     * Object constructor
-     *
-     * @param object $object
-     * @param string $method
-     */
-    public function __construct($object, $method)
-    {
-        $this->_object = $object;
-        $this->_method = $method;
-    }
-
-    public function doAction()
-    {
-        $methodName = $this->_method;
-        $this->_object->$methodName();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Field.php b/airtime_mvc/library/Zend/Search/Lucene/Field.php
deleted file mode 100644
index 3e2679810..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Field.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Field.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * A field is a section of a Document.  Each field has two parts,
- * a name and a value. Values may be free text or they may be atomic
- * keywords, which are not further processed. Such keywords may
- * be used to represent dates, urls, etc.  Fields are optionally
- * stored in the index, so that they may be returned with hits
- * on the document.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Document
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Field
-{
-    /**
-     * Field name
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Field value
-     *
-     * @var boolean
-     */
-    public $value;
-
-    /**
-     * Field is to be stored in the index for return with search hits.
-     *
-     * @var boolean
-     */
-    public $isStored    = false;
-
-    /**
-     * Field is to be indexed, so that it may be searched on.
-     *
-     * @var boolean
-     */
-    public $isIndexed   = true;
-
-    /**
-     * Field should be tokenized as text prior to indexing.
-     *
-     * @var boolean
-     */
-    public $isTokenized = true;
-    /**
-     * Field is stored as binary.
-     *
-     * @var boolean
-     */
-    public $isBinary    = false;
-
-    /**
-     * Field are stored as a term vector
-     *
-     * @var boolean
-     */
-    public $storeTermVector = false;
-
-    /**
-     * Field boost factor
-     * It's not stored directly in the index, but affects on normalization factor
-     *
-     * @var float
-     */
-    public $boost = 1.0;
-
-    /**
-     * Field value encoding.
-     *
-     * @var string
-     */
-    public $encoding;
-
-    /**
-     * Object constructor
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @param boolean $isStored
-     * @param boolean $isIndexed
-     * @param boolean $isTokenized
-     * @param boolean $isBinary
-     */
-    public function __construct($name, $value, $encoding, $isStored, $isIndexed, $isTokenized, $isBinary = false)
-    {
-        $this->name  = $name;
-        $this->value = $value;
-
-        if (!$isBinary) {
-            $this->encoding    = $encoding;
-            $this->isTokenized = $isTokenized;
-        } else {
-            $this->encoding    = '';
-            $this->isTokenized = false;
-        }
-
-        $this->isStored  = $isStored;
-        $this->isIndexed = $isIndexed;
-        $this->isBinary  = $isBinary;
-
-        $this->storeTermVector = false;
-        $this->boost           = 1.0;
-    }
-
-
-    /**
-     * Constructs a String-valued Field that is not tokenized, but is indexed
-     * and stored.  Useful for non-text fields, e.g. date or url.
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Field
-     */
-    public static function keyword($name, $value, $encoding = '')
-    {
-        return new self($name, $value, $encoding, true, true, false);
-    }
-
-
-    /**
-     * Constructs a String-valued Field that is not tokenized nor indexed,
-     * but is stored in the index, for return with hits.
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Field
-     */
-    public static function unIndexed($name, $value, $encoding = '')
-    {
-        return new self($name, $value, $encoding, true, false, false);
-    }
-
-
-    /**
-     * Constructs a Binary String valued Field that is not tokenized nor indexed,
-     * but is stored in the index, for return with hits.
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Field
-     */
-    public static function binary($name, $value)
-    {
-        return new self($name, $value, '', true, false, false, true);
-    }
-
-    /**
-     * Constructs a String-valued Field that is tokenized and indexed,
-     * and is stored in the index, for return with hits.  Useful for short text
-     * fields, like "title" or "subject". Term vector will not be stored for this field.
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Field
-     */
-    public static function text($name, $value, $encoding = '')
-    {
-        return new self($name, $value, $encoding, true, true, true);
-    }
-
-
-    /**
-     * Constructs a String-valued Field that is tokenized and indexed,
-     * but that is not stored in the index.
-     *
-     * @param string $name
-     * @param string $value
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Field
-     */
-    public static function unStored($name, $value, $encoding = '')
-    {
-        return new self($name, $value, $encoding, false, true, true);
-    }
-
-    /**
-     * Get field value in UTF-8 encoding
-     *
-     * @return string
-     */
-    public function getUtf8Value()
-    {
-        if (strcasecmp($this->encoding, 'utf8' ) == 0  ||
-            strcasecmp($this->encoding, 'utf-8') == 0 ) {
-                return $this->value;
-        } else {
-
-            return (PHP_OS != 'AIX') ? iconv($this->encoding, 'UTF-8', $this->value) : iconv('ISO8859-1', 'UTF-8', $this->value);
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/DictionaryLoader.php b/airtime_mvc/library/Zend/Search/Lucene/Index/DictionaryLoader.php
deleted file mode 100644
index 2888179f5..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/DictionaryLoader.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DictionaryLoader.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Dictionary loader
- *
- * It's a dummy class which is created to encapsulate non-good structured code.
- * Manual "method inlining" is performed to increase dictionary index loading operation
- * which is major bottelneck for search performance.
- *
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_DictionaryLoader
-{
-    /**
-     * Dictionary index loader.
-     *
-     * It takes a string which is actually <segment_name>.tii index file data and
-     * returns two arrays - term and tremInfo lists.
-     *
-     * See Zend_Search_Lucene_Index_SegmintInfo class for details
-     *
-     * @param string $data
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function load($data)
-    {
-        $termDictionary = array();
-        $termInfos      = array();
-        $pos = 0;
-
-        // $tiVersion = $tiiFile->readInt();
-        $tiVersion = ord($data[0]) << 24 | ord($data[1]) << 16 | ord($data[2]) << 8  | ord($data[3]);
-        $pos += 4;
-        if ($tiVersion != (int)0xFFFFFFFE /* pre-2.1 format */ &&
-            $tiVersion != (int)0xFFFFFFFD /* 2.1+ format    */) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Wrong TermInfoIndexFile file format');
-        }
-
-        // $indexTermCount = $tiiFile->readLong();
-        if (PHP_INT_SIZE > 4) {
-            $indexTermCount = ord($data[$pos]) << 56  |
-                              ord($data[$pos+1]) << 48  |
-                              ord($data[$pos+2]) << 40  |
-                              ord($data[$pos+3]) << 32  |
-                              ord($data[$pos+4]) << 24  |
-                              ord($data[$pos+5]) << 16  |
-                              ord($data[$pos+6]) << 8   |
-                              ord($data[$pos+7]);
-        } else {
-            if ((ord($data[$pos])            != 0) ||
-                (ord($data[$pos+1])          != 0) ||
-                (ord($data[$pos+2])          != 0) ||
-                (ord($data[$pos+3])          != 0) ||
-                ((ord($data[$pos+4]) & 0x80) != 0)) {
-                    require_once 'Zend/Search/Lucene/Exception.php';
-                    throw new Zend_Search_Lucene_Exception('Largest supported segment size (for 32-bit mode) is 2Gb');
-                 }
-
-            $indexTermCount = ord($data[$pos+4]) << 24  |
-                              ord($data[$pos+5]) << 16  |
-                              ord($data[$pos+6]) << 8   |
-                              ord($data[$pos+7]);
-        }
-        $pos += 8;
-
-        //                  $tiiFile->readInt();  // IndexInterval
-        $pos += 4;
-
-        // $skipInterval   = $tiiFile->readInt();
-        $skipInterval = ord($data[$pos]) << 24 | ord($data[$pos+1]) << 16 | ord($data[$pos+2]) << 8  | ord($data[$pos+3]);
-        $pos += 4;
-        if ($indexTermCount < 1) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong number of terms in a term dictionary index');
-        }
-
-        if ($tiVersion == (int)0xFFFFFFFD /* 2.1+ format */) {
-            /* Skip MaxSkipLevels value */
-            $pos += 4;
-        }
-
-        $prevTerm     = '';
-        $freqPointer  =  0;
-        $proxPointer  =  0;
-        $indexPointer =  0;
-        for ($count = 0; $count < $indexTermCount; $count++) {
-            //$termPrefixLength = $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $termPrefixLength = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $termPrefixLength |= ($nbyte & 0x7F) << $shift;
-            }
-
-            // $termSuffix       = $tiiFile->readString();
-            $nbyte = ord($data[$pos++]);
-            $len = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $len |= ($nbyte & 0x7F) << $shift;
-            }
-            if ($len == 0) {
-                $termSuffix = '';
-            } else {
-                $termSuffix = substr($data, $pos, $len);
-                $pos += $len;
-                for ($count1 = 0; $count1 < $len; $count1++ ) {
-                    if (( ord($termSuffix[$count1]) & 0xC0 ) == 0xC0) {
-                        $addBytes = 1;
-                        if (ord($termSuffix[$count1]) & 0x20 ) {
-                            $addBytes++;
-
-                            // Never used for Java Lucene created index.
-                            // Java2 doesn't encode strings in four bytes
-                            if (ord($termSuffix[$count1]) & 0x10 ) {
-                                $addBytes++;
-                            }
-                        }
-                        $termSuffix .= substr($data, $pos, $addBytes);
-                        $pos += $addBytes;
-                        $len += $addBytes;
-
-                        // Check for null character. Java2 encodes null character
-                        // in two bytes.
-                        if (ord($termSuffix[$count1]) == 0xC0 &&
-                            ord($termSuffix[$count1+1]) == 0x80   ) {
-                            $termSuffix[$count1] = 0;
-                            $termSuffix = substr($termSuffix,0,$count1+1)
-                                        . substr($termSuffix,$count1+2);
-                        }
-                        $count1 += $addBytes;
-                    }
-                }
-            }
-
-            // $termValue        = Zend_Search_Lucene_Index_Term::getPrefix($prevTerm, $termPrefixLength) . $termSuffix;
-            $pb = 0; $pc = 0;
-            while ($pb < strlen($prevTerm)  &&  $pc < $termPrefixLength) {
-                $charBytes = 1;
-                if ((ord($prevTerm[$pb]) & 0xC0) == 0xC0) {
-                    $charBytes++;
-                    if (ord($prevTerm[$pb]) & 0x20 ) {
-                        $charBytes++;
-                        if (ord($prevTerm[$pb]) & 0x10 ) {
-                            $charBytes++;
-                        }
-                    }
-                }
-
-                if ($pb + $charBytes > strlen($data)) {
-                    // wrong character
-                    break;
-                }
-
-                $pc++;
-                $pb += $charBytes;
-            }
-            $termValue = substr($prevTerm, 0, $pb) . $termSuffix;
-
-            // $termFieldNum     = $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $termFieldNum = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $termFieldNum |= ($nbyte & 0x7F) << $shift;
-            }
-
-            // $docFreq          = $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $docFreq = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $docFreq |= ($nbyte & 0x7F) << $shift;
-            }
-
-            // $freqPointer     += $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $vint = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $vint |= ($nbyte & 0x7F) << $shift;
-            }
-            $freqPointer += $vint;
-
-            // $proxPointer     += $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $vint = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $vint |= ($nbyte & 0x7F) << $shift;
-            }
-            $proxPointer += $vint;
-
-            if( $docFreq >= $skipInterval ) {
-                // $skipDelta = $tiiFile->readVInt();
-                $nbyte = ord($data[$pos++]);
-                $vint = $nbyte & 0x7F;
-                for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                    $nbyte = ord($data[$pos++]);
-                    $vint |= ($nbyte & 0x7F) << $shift;
-                }
-                $skipDelta = $vint;
-            } else {
-                $skipDelta = 0;
-            }
-
-            // $indexPointer += $tiiFile->readVInt();
-            $nbyte = ord($data[$pos++]);
-            $vint = $nbyte & 0x7F;
-            for ($shift=7; ($nbyte & 0x80) != 0; $shift += 7) {
-                $nbyte = ord($data[$pos++]);
-                $vint |= ($nbyte & 0x7F) << $shift;
-            }
-            $indexPointer += $vint;
-
-
-            // $this->_termDictionary[] =  new Zend_Search_Lucene_Index_Term($termValue, $termFieldNum);
-            $termDictionary[] = array($termFieldNum, $termValue);
-
-            $termInfos[] =
-                 // new Zend_Search_Lucene_Index_TermInfo($docFreq, $freqPointer, $proxPointer, $skipDelta, $indexPointer);
-                 array($docFreq, $freqPointer, $proxPointer, $skipDelta, $indexPointer);
-
-            $prevTerm = $termValue;
-        }
-
-        // Check special index entry mark
-        if ($termDictionary[0][0] != (int)0xFFFFFFFF) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong TermInfoIndexFile file format');
-        }
-
-        if (PHP_INT_SIZE > 4) {
-            // Treat 64-bit 0xFFFFFFFF as -1
-            $termDictionary[0][0] = -1;
-        }
-
-        return array($termDictionary, $termInfos);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/DocsFilter.php b/airtime_mvc/library/Zend/Search/Lucene/Index/DocsFilter.php
deleted file mode 100644
index bd5262321..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/DocsFilter.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocsFilter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * A Zend_Search_Lucene_Index_DocsFilter is used to filter documents while searching.
- *
- * It may or _may_not_ be used for actual filtering, so it's just a hint that upper query limits
- * search result by specified list.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_DocsFilter
-{
-    /**
-     * Set of segment filters:
-     *  array( <segmentName> => array(<docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                ...                          ),
-     *         <segmentName> => array(<docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                ...                          ),
-     *         <segmentName> => array(<docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                <docId> => <undefined_value>,
-     *                                ...                          ),
-     *         ...
-     *       )
-     *
-     * @var array
-     */
-    public $segmentFilters = array();
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/FieldInfo.php b/airtime_mvc/library/Zend/Search/Lucene/Index/FieldInfo.php
deleted file mode 100644
index 47b2d2149..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/FieldInfo.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FieldInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_FieldInfo
-{
-    public $name;
-    public $isIndexed;
-    public $number;
-    public $storeTermVector;
-    public $normsOmitted;
-    public $payloadsStored;
-
-    public function __construct($name, $isIndexed, $number, $storeTermVector, $normsOmitted = false, $payloadsStored = false)
-    {
-        $this->name            = $name;
-        $this->isIndexed       = $isIndexed;
-        $this->number          = $number;
-        $this->storeTermVector = $storeTermVector;
-        $this->normsOmitted    = $normsOmitted;
-        $this->payloadsStored  = $payloadsStored;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentInfo.php b/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentInfo.php
deleted file mode 100644
index c6a065e61..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentInfo.php
+++ /dev/null
@@ -1,2130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SegmentInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Index_TermsStream_Interface */
-require_once 'Zend/Search/Lucene/Index/TermsStream/Interface.php';
-
-
-/** Zend_Search_Lucene_Search_Similarity */
-require_once 'Zend/Search/Lucene/Search/Similarity.php';
-
-/** Zend_Search_Lucene_Index_FieldInfo */
-require_once 'Zend/Search/Lucene/Index/FieldInfo.php';
-
-/** Zend_Search_Lucene_Index_Term */
-require_once 'Zend/Search/Lucene/Index/Term.php';
-
-/** Zend_Search_Lucene_Index_TermInfo */
-require_once 'Zend/Search/Lucene/Index/TermInfo.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_SegmentInfo implements Zend_Search_Lucene_Index_TermsStream_Interface
-{
-    /**
-     * "Full scan vs fetch" boundary.
-     *
-     * If filter selectivity is less than this value, then full scan is performed
-     * (since term entries fetching has some additional overhead).
-     */
-    const FULL_SCAN_VS_FETCH_BOUNDARY = 5;
-
-    /**
-     * Number of docs in a segment
-     *
-     * @var integer
-     */
-    private $_docCount;
-
-    /**
-     * Segment name
-     *
-     * @var string
-     */
-    private $_name;
-
-    /**
-     * Term Dictionary Index
-     *
-     * Array of arrays (Zend_Search_Lucene_Index_Term objects are represented as arrays because
-     * of performance considerations)
-     * [0] -> $termValue
-     * [1] -> $termFieldNum
-     *
-     * Corresponding Zend_Search_Lucene_Index_TermInfo object stored in the $_termDictionaryInfos
-     *
-     * @var array
-     */
-    private $_termDictionary;
-
-    /**
-     * Term Dictionary Index TermInfos
-     *
-     * Array of arrays (Zend_Search_Lucene_Index_TermInfo objects are represented as arrays because
-     * of performance considerations)
-     * [0] -> $docFreq
-     * [1] -> $freqPointer
-     * [2] -> $proxPointer
-     * [3] -> $skipOffset
-     * [4] -> $indexPointer
-     *
-     * @var array
-     */
-    private $_termDictionaryInfos;
-
-    /**
-     * Segment fields. Array of Zend_Search_Lucene_Index_FieldInfo objects for this segment
-     *
-     * @var array
-     */
-    private $_fields;
-
-    /**
-     * Field positions in a dictionary.
-     * (Term dictionary contains filelds ordered by names)
-     *
-     * @var array
-     */
-    private $_fieldsDicPositions;
-
-
-    /**
-     * Associative array where the key is the file name and the value is data offset
-     * in a compound segment file (.csf).
-     *
-     * @var array
-     */
-    private $_segFiles;
-
-    /**
-     * Associative array where the key is the file name and the value is file size (.csf).
-     *
-     * @var array
-     */
-    private $_segFileSizes;
-
-    /**
-     * Delete file generation number
-     *
-     * -2 means autodetect latest delete generation
-     * -1 means 'there is no delete file'
-     *  0 means pre-2.1 format delete file
-     *  X specifies used delete file
-     *
-     * @var integer
-     */
-    private $_delGen;
-
-    /**
-     * Segment has single norms file
-     *
-     * If true then one .nrm file is used for all fields
-     * Otherwise .fN files are used
-     *
-     * @var boolean
-     */
-    private $_hasSingleNormFile;
-
-    /**
-     * Use compound segment file (*.cfs) to collect all other segment files
-     * (excluding .del files)
-     *
-     * @var boolean
-     */
-    private $_isCompound;
-
-
-    /**
-     * File system adapter.
-     *
-     * @var Zend_Search_Lucene_Storage_Directory_Filesystem
-     */
-    private $_directory;
-
-    /**
-     * Normalization factors.
-     * An array fieldName => normVector
-     * normVector is a binary string.
-     * Each byte corresponds to an indexed document in a segment and
-     * encodes normalization factor (float value, encoded by
-     * Zend_Search_Lucene_Search_Similarity::encodeNorm())
-     *
-     * @var array
-     */
-    private $_norms = array();
-
-    /**
-     * List of deleted documents.
-     * bitset if bitset extension is loaded or array otherwise.
-     *
-     * @var mixed
-     */
-    private $_deleted = null;
-
-    /**
-     * $this->_deleted update flag
-     *
-     * @var boolean
-     */
-    private $_deletedDirty = false;
-
-    /**
-     * True if segment uses shared doc store
-     *
-     * @var boolean
-     */
-    private $_usesSharedDocStore;
-
-    /*
-     * Shared doc store options.
-     * It's an assotiative array with the following items:
-     * - 'offset'     => $docStoreOffset           The starting document in the shared doc store files where this segment's documents begin
-     * - 'segment'    => $docStoreSegment          The name of the segment that has the shared doc store files.
-     * - 'isCompound' => $docStoreIsCompoundFile   True, if compound file format is used for the shared doc store files (.cfx file).
-     */
-    private $_sharedDocStoreOptions;
-
-
-    /**
-     * Zend_Search_Lucene_Index_SegmentInfo constructor
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param string     $name
-     * @param integer    $docCount
-     * @param integer    $delGen
-     * @param array|null $docStoreOptions
-     * @param boolean    $hasSingleNormFile
-     * @param boolean    $isCompound
-     */
-    public function __construct(Zend_Search_Lucene_Storage_Directory $directory, $name, $docCount, $delGen = 0, $docStoreOptions = null, $hasSingleNormFile = false, $isCompound = null)
-    {
-        $this->_directory = $directory;
-        $this->_name      = $name;
-        $this->_docCount  = $docCount;
-
-        if ($docStoreOptions !== null) {
-            $this->_usesSharedDocStore    = true;
-            $this->_sharedDocStoreOptions = $docStoreOptions;
-
-            if ($docStoreOptions['isCompound']) {
-                $cfxFile       = $this->_directory->getFileObject($docStoreOptions['segment'] . '.cfx');
-                $cfxFilesCount = $cfxFile->readVInt();
-
-                $cfxFiles     = array();
-                $cfxFileSizes = array();
-
-                for ($count = 0; $count < $cfxFilesCount; $count++) {
-                    $dataOffset = $cfxFile->readLong();
-                    if ($count != 0) {
-                        $cfxFileSizes[$fileName] = $dataOffset - end($cfxFiles);
-                    }
-                    $fileName            = $cfxFile->readString();
-                    $cfxFiles[$fileName] = $dataOffset;
-                }
-                if ($count != 0) {
-                    $cfxFileSizes[$fileName] = $this->_directory->fileLength($docStoreOptions['segment'] . '.cfx') - $dataOffset;
-                }
-
-                $this->_sharedDocStoreOptions['files']     = $cfxFiles;
-                $this->_sharedDocStoreOptions['fileSizes'] = $cfxFileSizes;
-            }
-        }
-
-        $this->_hasSingleNormFile = $hasSingleNormFile;
-        $this->_delGen            = $delGen;
-        $this->_termDictionary    = null;
-
-
-        if ($isCompound !== null) {
-            $this->_isCompound    = $isCompound;
-        } else {
-            // It's a pre-2.1 segment or isCompound is set to 'unknown'
-            // Detect if segment uses compound file
-            require_once 'Zend/Search/Lucene/Exception.php';
-            try {
-                // Try to open compound file
-                $this->_directory->getFileObject($name . '.cfs');
-
-                // Compound file is found
-                $this->_isCompound = true;
-            } catch (Zend_Search_Lucene_Exception $e) {
-                if (strpos($e->getMessage(), 'is not readable') !== false) {
-                    // Compound file is not found or is not readable
-                    $this->_isCompound = false;
-                } else {
-                    throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                }
-            }
-        }
-
-        $this->_segFiles = array();
-        if ($this->_isCompound) {
-            $cfsFile = $this->_directory->getFileObject($name . '.cfs');
-            $segFilesCount = $cfsFile->readVInt();
-
-            for ($count = 0; $count < $segFilesCount; $count++) {
-                $dataOffset = $cfsFile->readLong();
-                if ($count != 0) {
-                    $this->_segFileSizes[$fileName] = $dataOffset - end($this->_segFiles);
-                }
-                $fileName = $cfsFile->readString();
-                $this->_segFiles[$fileName] = $dataOffset;
-            }
-            if ($count != 0) {
-                $this->_segFileSizes[$fileName] = $this->_directory->fileLength($name . '.cfs') - $dataOffset;
-            }
-        }
-
-        $fnmFile = $this->openCompoundFile('.fnm');
-        $fieldsCount = $fnmFile->readVInt();
-        $fieldNames = array();
-        $fieldNums  = array();
-        $this->_fields = array();
-
-        for ($count=0; $count < $fieldsCount; $count++) {
-            $fieldName = $fnmFile->readString();
-            $fieldBits = $fnmFile->readByte();
-            $this->_fields[$count] = new Zend_Search_Lucene_Index_FieldInfo($fieldName,
-                                                                            $fieldBits & 0x01 /* field is indexed */,
-                                                                            $count,
-                                                                            $fieldBits & 0x02 /* termvectors are stored */,
-                                                                            $fieldBits & 0x10 /* norms are omitted */,
-                                                                            $fieldBits & 0x20 /* payloads are stored */);
-            if ($fieldBits & 0x10) {
-                // norms are omitted for the indexed field
-                $this->_norms[$count] = str_repeat(chr(Zend_Search_Lucene_Search_Similarity::encodeNorm(1.0)), $docCount);
-            }
-
-            $fieldNums[$count]  = $count;
-            $fieldNames[$count] = $fieldName;
-        }
-        array_multisort($fieldNames, SORT_ASC, SORT_REGULAR, $fieldNums);
-        $this->_fieldsDicPositions = array_flip($fieldNums);
-
-        if ($this->_delGen == -2) {
-            // SegmentInfo constructor is invoked from index writer
-            // Autodetect current delete file generation number
-            $this->_delGen = $this->_detectLatestDelGen();
-        }
-
-        // Load deletions
-        $this->_deleted = $this->_loadDelFile();
-    }
-
-    /**
-     * Load detetions file
-     *
-     * Returns bitset or an array depending on bitset extension availability
-     *
-     * @return mixed
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _loadDelFile()
-    {
-        if ($this->_delGen == -1) {
-            // There is no delete file for this segment
-            return null;
-        } else if ($this->_delGen == 0) {
-            // It's a segment with pre-2.1 format delete file
-            // Try to load deletions file
-            return $this->_loadPre21DelFile();
-        } else {
-            // It's 2.1+ format deleteions file
-            return $this->_load21DelFile();
-        }
-    }
-
-    /**
-     * Load pre-2.1 detetions file
-     *
-     * Returns bitset or an array depending on bitset extension availability
-     *
-     * @return mixed
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _loadPre21DelFile()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        try {
-            // '.del' files always stored in a separate file
-            // Segment compound is not used
-            $delFile = $this->_directory->getFileObject($this->_name . '.del');
-
-            $byteCount = $delFile->readInt();
-            $byteCount = ceil($byteCount/8);
-            $bitCount  = $delFile->readInt();
-
-            if ($bitCount == 0) {
-                $delBytes = '';
-            } else {
-                $delBytes = $delFile->readBytes($byteCount);
-            }
-
-            if (extension_loaded('bitset')) {
-                return $delBytes;
-            } else {
-                $deletions = array();
-                for ($count = 0; $count < $byteCount; $count++) {
-                    $byte = ord($delBytes[$count]);
-                    for ($bit = 0; $bit < 8; $bit++) {
-                        if ($byte & (1<<$bit)) {
-                            $deletions[$count*8 + $bit] = 1;
-                        }
-                    }
-                }
-
-                return $deletions;
-            }
-        } catch(Zend_Search_Lucene_Exception $e) {
-            if (strpos($e->getMessage(), 'is not readable') === false) {
-                throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-            // There is no deletion file
-            $this->_delGen = -1;
-
-            return null;
-        }
-    }
-
-    /**
-     * Load 2.1+ format detetions file
-     *
-     * Returns bitset or an array depending on bitset extension availability
-     *
-     * @return mixed
-     */
-    private function _load21DelFile()
-    {
-        $delFile = $this->_directory->getFileObject($this->_name . '_' . base_convert($this->_delGen, 10, 36) . '.del');
-
-        $format = $delFile->readInt();
-
-        if ($format == (int)0xFFFFFFFF) {
-            if (extension_loaded('bitset')) {
-                $deletions = bitset_empty();
-            } else {
-                $deletions = array();
-            }
-
-            $byteCount = $delFile->readInt();
-            $bitCount  = $delFile->readInt();
-
-            $delFileSize = $this->_directory->fileLength($this->_name . '_' . base_convert($this->_delGen, 10, 36) . '.del');
-            $byteNum = 0;
-
-            do {
-                $dgap = $delFile->readVInt();
-                $nonZeroByte = $delFile->readByte();
-
-                $byteNum += $dgap;
-
-
-                if (extension_loaded('bitset')) {
-                    for ($bit = 0; $bit < 8; $bit++) {
-                        if ($nonZeroByte & (1<<$bit)) {
-                            bitset_incl($deletions, $byteNum*8 + $bit);
-                        }
-                    }
-                    return $deletions;
-                } else {
-                    for ($bit = 0; $bit < 8; $bit++) {
-                        if ($nonZeroByte & (1<<$bit)) {
-                            $deletions[$byteNum*8 + $bit] = 1;
-                        }
-                    }
-                    return (count($deletions) > 0) ? $deletions : null;
-                }
-
-            } while ($delFile->tell() < $delFileSize);
-        } else {
-            // $format is actually byte count
-            $byteCount = ceil($format/8);
-            $bitCount  = $delFile->readInt();
-
-            if ($bitCount == 0) {
-                $delBytes = '';
-            } else {
-                $delBytes = $delFile->readBytes($byteCount);
-            }
-
-            if (extension_loaded('bitset')) {
-                return $delBytes;
-            } else {
-                $deletions = array();
-                for ($count = 0; $count < $byteCount; $count++) {
-                    $byte = ord($delBytes[$count]);
-                    for ($bit = 0; $bit < 8; $bit++) {
-                        if ($byte & (1<<$bit)) {
-                            $deletions[$count*8 + $bit] = 1;
-                        }
-                    }
-                }
-
-                return (count($deletions) > 0) ? $deletions : null;
-            }
-        }
-    }
-
-    /**
-     * Opens index file stoted within compound index file
-     *
-     * @param string $extension
-     * @param boolean $shareHandler
-     * @throws Zend_Search_Lucene_Exception
-     * @return Zend_Search_Lucene_Storage_File
-     */
-    public function openCompoundFile($extension, $shareHandler = true)
-    {
-        if (($extension == '.fdx'  || $extension == '.fdt')  &&  $this->_usesSharedDocStore) {
-            $fdxFName = $this->_sharedDocStoreOptions['segment'] . '.fdx';
-            $fdtFName = $this->_sharedDocStoreOptions['segment'] . '.fdt';
-
-            if (!$this->_sharedDocStoreOptions['isCompound']) {
-                $fdxFile = $this->_directory->getFileObject($fdxFName, $shareHandler);
-                $fdxFile->seek($this->_sharedDocStoreOptions['offset']*8, SEEK_CUR);
-
-                if ($extension == '.fdx') {
-                    // '.fdx' file is requested
-                    return $fdxFile;
-                } else {
-                    // '.fdt' file is requested
-                    $fdtStartOffset = $fdxFile->readLong();
-
-                    $fdtFile = $this->_directory->getFileObject($fdtFName, $shareHandler);
-                    $fdtFile->seek($fdtStartOffset, SEEK_CUR);
-
-                    return $fdtFile;
-                }
-            }
-
-            if( !isset($this->_sharedDocStoreOptions['files'][$fdxFName]) ) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Shared doc storage segment compound file doesn\'t contain '
-                                       . $fdxFName . ' file.' );
-            }
-            if( !isset($this->_sharedDocStoreOptions['files'][$fdtFName]) ) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Shared doc storage segment compound file doesn\'t contain '
-                                       . $fdtFName . ' file.' );
-            }
-
-            // Open shared docstore segment file
-            $cfxFile = $this->_directory->getFileObject($this->_sharedDocStoreOptions['segment'] . '.cfx', $shareHandler);
-            // Seek to the start of '.fdx' file within compound file
-            $cfxFile->seek($this->_sharedDocStoreOptions['files'][$fdxFName]);
-            // Seek to the start of current segment documents section
-            $cfxFile->seek($this->_sharedDocStoreOptions['offset']*8, SEEK_CUR);
-
-            if ($extension == '.fdx') {
-                // '.fdx' file is requested
-                return $cfxFile;
-            } else {
-                // '.fdt' file is requested
-                $fdtStartOffset = $cfxFile->readLong();
-
-                // Seek to the start of '.fdt' file within compound file
-                $cfxFile->seek($this->_sharedDocStoreOptions['files'][$fdtFName]);
-                // Seek to the start of current segment documents section
-                $cfxFile->seek($fdtStartOffset, SEEK_CUR);
-
-                return $fdtFile;
-            }
-        }
-
-        $filename = $this->_name . $extension;
-
-        if (!$this->_isCompound) {
-            return $this->_directory->getFileObject($filename, $shareHandler);
-        }
-
-        if( !isset($this->_segFiles[$filename]) ) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Segment compound file doesn\'t contain '
-                                       . $filename . ' file.' );
-        }
-
-        $file = $this->_directory->getFileObject($this->_name . '.cfs', $shareHandler);
-        $file->seek($this->_segFiles[$filename]);
-        return $file;
-    }
-
-    /**
-     * Get compound file length
-     *
-     * @param string $extension
-     * @return integer
-     */
-    public function compoundFileLength($extension)
-    {
-        if (($extension == '.fdx'  || $extension == '.fdt')  &&  $this->_usesSharedDocStore) {
-            $filename = $this->_sharedDocStoreOptions['segment'] . $extension;
-
-            if (!$this->_sharedDocStoreOptions['isCompound']) {
-                return $this->_directory->fileLength($filename);
-            }
-
-            if( !isset($this->_sharedDocStoreOptions['fileSizes'][$filename]) ) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Shared doc store compound file doesn\'t contain '
-                                           . $filename . ' file.' );
-            }
-
-            return $this->_sharedDocStoreOptions['fileSizes'][$filename];
-        }
-
-
-        $filename = $this->_name . $extension;
-
-        // Try to get common file first
-        if ($this->_directory->fileExists($filename)) {
-            return $this->_directory->fileLength($filename);
-        }
-
-        if( !isset($this->_segFileSizes[$filename]) ) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Index compound file doesn\'t contain '
-                                       . $filename . ' file.' );
-        }
-
-        return $this->_segFileSizes[$filename];
-    }
-
-    /**
-     * Returns field index or -1 if field is not found
-     *
-     * @param string $fieldName
-     * @return integer
-     */
-    public function getFieldNum($fieldName)
-    {
-        foreach( $this->_fields as $field ) {
-            if( $field->name == $fieldName ) {
-                return $field->number;
-            }
-        }
-
-        return -1;
-    }
-
-    /**
-     * Returns field info for specified field
-     *
-     * @param integer $fieldNum
-     * @return Zend_Search_Lucene_Index_FieldInfo
-     */
-    public function getField($fieldNum)
-    {
-        return $this->_fields[$fieldNum];
-    }
-
-    /**
-     * Returns array of fields.
-     * if $indexed parameter is true, then returns only indexed fields.
-     *
-     * @param boolean $indexed
-     * @return array
-     */
-    public function getFields($indexed = false)
-    {
-        $result = array();
-        foreach( $this->_fields as $field ) {
-            if( (!$indexed) || $field->isIndexed ) {
-                $result[ $field->name ] = $field->name;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Returns array of FieldInfo objects.
-     *
-     * @return array
-     */
-    public function getFieldInfos()
-    {
-        return $this->_fields;
-    }
-
-    /**
-     * Returns actual deletions file generation number.
-     *
-     * @return integer
-     */
-    public function getDelGen()
-    {
-        return $this->_delGen;
-    }
-
-    /**
-     * Returns the total number of documents in this segment (including deleted documents).
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_docCount;
-    }
-
-    /**
-     * Returns number of deleted documents.
-     *
-     * @return integer
-     */
-    private function _deletedCount()
-    {
-        if ($this->_deleted === null) {
-            return 0;
-        }
-
-        if (extension_loaded('bitset')) {
-            return count(bitset_to_array($this->_deleted));
-        } else {
-            return count($this->_deleted);
-        }
-    }
-
-    /**
-     * Returns the total number of non-deleted documents in this segment.
-     *
-     * @return integer
-     */
-    public function numDocs()
-    {
-        if ($this->hasDeletions()) {
-            return $this->_docCount - $this->_deletedCount();
-        } else {
-            return $this->_docCount;
-        }
-    }
-
-    /**
-     * Get field position in a fields dictionary
-     *
-     * @param integer $fieldNum
-     * @return integer
-     */
-    private function _getFieldPosition($fieldNum) {
-        // Treat values which are not in a translation table as a 'direct value'
-        return isset($this->_fieldsDicPositions[$fieldNum]) ?
-                           $this->_fieldsDicPositions[$fieldNum] : $fieldNum;
-    }
-
-    /**
-     * Return segment name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-
-    /**
-     * TermInfo cache
-     *
-     * Size is 1024.
-     * Numbers are used instead of class constants because of performance considerations
-     *
-     * @var array
-     */
-    private $_termInfoCache = array();
-
-    private function _cleanUpTermInfoCache()
-    {
-        // Clean 256 term infos
-        foreach ($this->_termInfoCache as $key => $termInfo) {
-            unset($this->_termInfoCache[$key]);
-
-            // leave 768 last used term infos
-            if (count($this->_termInfoCache) == 768) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Load terms dictionary index
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _loadDictionaryIndex()
-    {
-        // Check, if index is already serialized
-        if ($this->_directory->fileExists($this->_name . '.sti')) {
-            // Load serialized dictionary index data
-            $stiFile = $this->_directory->getFileObject($this->_name . '.sti');
-            $stiFileData = $stiFile->readBytes($this->_directory->fileLength($this->_name . '.sti'));
-
-            // Load dictionary index data
-            if (($unserializedData = @unserialize($stiFileData)) !== false) {
-                list($this->_termDictionary, $this->_termDictionaryInfos) = $unserializedData;
-                return;
-            }
-        }
-
-        // Load data from .tii file and generate .sti file
-
-        // Prefetch dictionary index data
-        $tiiFile = $this->openCompoundFile('.tii');
-        $tiiFileData = $tiiFile->readBytes($this->compoundFileLength('.tii'));
-
-        /** Zend_Search_Lucene_Index_DictionaryLoader */
-        require_once 'Zend/Search/Lucene/Index/DictionaryLoader.php';
-
-        // Load dictionary index data
-        list($this->_termDictionary, $this->_termDictionaryInfos) =
-                    Zend_Search_Lucene_Index_DictionaryLoader::load($tiiFileData);
-
-        $stiFileData = serialize(array($this->_termDictionary, $this->_termDictionaryInfos));
-        $stiFile = $this->_directory->createFile($this->_name . '.sti');
-        $stiFile->writeBytes($stiFileData);
-    }
-
-    /**
-     * Scans terms dictionary and returns term info
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return Zend_Search_Lucene_Index_TermInfo
-     */
-    public function getTermInfo(Zend_Search_Lucene_Index_Term $term)
-    {
-        $termKey = $term->key();
-        if (isset($this->_termInfoCache[$termKey])) {
-            $termInfo = $this->_termInfoCache[$termKey];
-
-            // Move termInfo to the end of cache
-            unset($this->_termInfoCache[$termKey]);
-            $this->_termInfoCache[$termKey] = $termInfo;
-
-            return $termInfo;
-        }
-
-
-        if ($this->_termDictionary === null) {
-            $this->_loadDictionaryIndex();
-        }
-
-        $searchField = $this->getFieldNum($term->field);
-
-        if ($searchField == -1) {
-            return null;
-        }
-        $searchDicField = $this->_getFieldPosition($searchField);
-
-        // search for appropriate value in dictionary
-        $lowIndex = 0;
-        $highIndex = count($this->_termDictionary)-1;
-        while ($highIndex >= $lowIndex) {
-            // $mid = ($highIndex - $lowIndex)/2;
-            $mid = ($highIndex + $lowIndex) >> 1;
-            $midTerm = $this->_termDictionary[$mid];
-
-            $fieldNum = $this->_getFieldPosition($midTerm[0] /* field */);
-            $delta = $searchDicField - $fieldNum;
-            if ($delta == 0) {
-                $delta = strcmp($term->text, $midTerm[1] /* text */);
-            }
-
-            if ($delta < 0) {
-                $highIndex = $mid-1;
-            } elseif ($delta > 0) {
-                $lowIndex  = $mid+1;
-            } else {
-                // return $this->_termDictionaryInfos[$mid]; // We got it!
-                $a = $this->_termDictionaryInfos[$mid];
-                $termInfo = new Zend_Search_Lucene_Index_TermInfo($a[0], $a[1], $a[2], $a[3], $a[4]);
-
-                // Put loaded termInfo into cache
-                $this->_termInfoCache[$termKey] = $termInfo;
-
-                return $termInfo;
-            }
-        }
-
-        if ($highIndex == -1) {
-            // Term is out of the dictionary range
-            return null;
-        }
-
-        $prevPosition = $highIndex;
-        $prevTerm = $this->_termDictionary[$prevPosition];
-        $prevTermInfo = $this->_termDictionaryInfos[$prevPosition];
-
-        $tisFile = $this->openCompoundFile('.tis');
-        $tiVersion = $tisFile->readInt();
-        if ($tiVersion != (int)0xFFFFFFFE /* pre-2.1 format */  &&
-            $tiVersion != (int)0xFFFFFFFD /* 2.1+ format    */) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong TermInfoFile file format');
-        }
-
-        $termCount     = $tisFile->readLong();
-        $indexInterval = $tisFile->readInt();
-        $skipInterval  = $tisFile->readInt();
-        if ($tiVersion == (int)0xFFFFFFFD /* 2.1+ format */) {
-            $maxSkipLevels = $tisFile->readInt();
-        }
-
-        $tisFile->seek($prevTermInfo[4] /* indexPointer */ - (($tiVersion == (int)0xFFFFFFFD)? 24 : 20) /* header size*/, SEEK_CUR);
-
-        $termValue    = $prevTerm[1] /* text */;
-        $termFieldNum = $prevTerm[0] /* field */;
-        $freqPointer = $prevTermInfo[1] /* freqPointer */;
-        $proxPointer = $prevTermInfo[2] /* proxPointer */;
-        for ($count = $prevPosition*$indexInterval + 1;
-             $count <= $termCount &&
-             ( $this->_getFieldPosition($termFieldNum) < $searchDicField ||
-              ($this->_getFieldPosition($termFieldNum) == $searchDicField &&
-               strcmp($termValue, $term->text) < 0) );
-             $count++) {
-            $termPrefixLength = $tisFile->readVInt();
-            $termSuffix       = $tisFile->readString();
-            $termFieldNum     = $tisFile->readVInt();
-            $termValue        = Zend_Search_Lucene_Index_Term::getPrefix($termValue, $termPrefixLength) . $termSuffix;
-
-            $docFreq      = $tisFile->readVInt();
-            $freqPointer += $tisFile->readVInt();
-            $proxPointer += $tisFile->readVInt();
-            if( $docFreq >= $skipInterval ) {
-                $skipOffset = $tisFile->readVInt();
-            } else {
-                $skipOffset = 0;
-            }
-        }
-
-        if ($termFieldNum == $searchField && $termValue == $term->text) {
-            $termInfo = new Zend_Search_Lucene_Index_TermInfo($docFreq, $freqPointer, $proxPointer, $skipOffset);
-        } else {
-            $termInfo = null;
-        }
-
-        // Put loaded termInfo into cache
-        $this->_termInfoCache[$termKey] = $termInfo;
-
-        if (count($this->_termInfoCache) == 1024) {
-            $this->_cleanUpTermInfoCache();
-        }
-
-        return $termInfo;
-    }
-
-    /**
-     * Returns IDs of all the documents containing term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param integer $shift
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termDocs(Zend_Search_Lucene_Index_Term $term, $shift = 0, $docsFilter = null)
-    {
-        $termInfo = $this->getTermInfo($term);
-
-        if (!$termInfo instanceof Zend_Search_Lucene_Index_TermInfo) {
-            if ($docsFilter !== null  &&  $docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                $docsFilter->segmentFilters[$this->_name] = array();
-            }
-            return array();
-        }
-
-        $frqFile = $this->openCompoundFile('.frq');
-        $frqFile->seek($termInfo->freqPointer,SEEK_CUR);
-        $docId  = 0;
-        $result = array();
-
-        if ($docsFilter !== null) {
-            if (!$docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Documents filter must be an instance of Zend_Search_Lucene_Index_DocsFilter or null.');
-            }
-
-            if (isset($docsFilter->segmentFilters[$this->_name])) {
-                // Filter already has some data for the current segment
-
-                // Make short name for the filter (which doesn't need additional dereferencing)
-                $filter = &$docsFilter->segmentFilters[$this->_name];
-
-                // Check if filter is not empty
-                if (count($filter) == 0) {
-                    return array();
-                }
-
-                if ($this->_docCount/count($filter) < self::FULL_SCAN_VS_FETCH_BOUNDARY) {
-                    // Perform fetching
-// ---------------------------------------------------------------
-                    $updatedFilterData = array();
-
-                    for( $count=0; $count < $termInfo->docFreq; $count++ ) {
-                        $docDelta = $frqFile->readVInt();
-                        if( $docDelta % 2 == 1 ) {
-                            $docId += ($docDelta-1)/2;
-                        } else {
-                            $docId += $docDelta/2;
-                            // read freq
-                            $frqFile->readVInt();
-                        }
-
-                        if (isset($filter[$docId])) {
-                           $result[] = $shift + $docId;
-                           $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                        }
-                    }
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-// ---------------------------------------------------------------
-                } else {
-                    // Perform full scan
-                    $updatedFilterData = array();
-
-                    for( $count=0; $count < $termInfo->docFreq; $count++ ) {
-                        $docDelta = $frqFile->readVInt();
-                        if( $docDelta % 2 == 1 ) {
-                            $docId += ($docDelta-1)/2;
-                        } else {
-                            $docId += $docDelta/2;
-                            // read freq
-                            $frqFile->readVInt();
-                        }
-
-                        if (isset($filter[$docId])) {
-                           $result[] = $shift + $docId;
-                           $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                        }
-                    }
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-                }
-            } else {
-                // Filter is present, but doesn't has data for the current segment yet
-                $filterData = array();
-                for( $count=0; $count < $termInfo->docFreq; $count++ ) {
-                    $docDelta = $frqFile->readVInt();
-                    if( $docDelta % 2 == 1 ) {
-                        $docId += ($docDelta-1)/2;
-                    } else {
-                        $docId += $docDelta/2;
-                        // read freq
-                        $frqFile->readVInt();
-                    }
-
-                    $result[] = $shift + $docId;
-                    $filterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                }
-                $docsFilter->segmentFilters[$this->_name] = $filterData;
-            }
-        } else {
-            for( $count=0; $count < $termInfo->docFreq; $count++ ) {
-                $docDelta = $frqFile->readVInt();
-                if( $docDelta % 2 == 1 ) {
-                    $docId += ($docDelta-1)/2;
-                } else {
-                    $docId += $docDelta/2;
-                    // read freq
-                    $frqFile->readVInt();
-                }
-
-                $result[] = $shift + $docId;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns term freqs array.
-     * Result array structure: array(docId => freq, ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param integer $shift
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_TermInfo
-     */
-    public function termFreqs(Zend_Search_Lucene_Index_Term $term, $shift = 0, $docsFilter = null)
-    {
-        $termInfo = $this->getTermInfo($term);
-
-        if (!$termInfo instanceof Zend_Search_Lucene_Index_TermInfo) {
-            if ($docsFilter !== null  &&  $docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                $docsFilter->segmentFilters[$this->_name] = array();
-            }
-            return array();
-        }
-
-        $frqFile = $this->openCompoundFile('.frq');
-        $frqFile->seek($termInfo->freqPointer,SEEK_CUR);
-        $result = array();
-        $docId = 0;
-
-        $result = array();
-
-        if ($docsFilter !== null) {
-            if (!$docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Documents filter must be an instance of Zend_Search_Lucene_Index_DocsFilter or null.');
-            }
-
-            if (isset($docsFilter->segmentFilters[$this->_name])) {
-                // Filter already has some data for the current segment
-
-                // Make short name for the filter (which doesn't need additional dereferencing)
-                $filter = &$docsFilter->segmentFilters[$this->_name];
-
-                // Check if filter is not empty
-                if (count($filter) == 0) {
-                    return array();
-                }
-
-
-                if ($this->_docCount/count($filter) < self::FULL_SCAN_VS_FETCH_BOUNDARY) {
-                    // Perform fetching
-// ---------------------------------------------------------------
-                    $updatedFilterData = array();
-
-                    for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                        $docDelta = $frqFile->readVInt();
-                        if ($docDelta % 2 == 1) {
-                            $docId += ($docDelta-1)/2;
-                            if (isset($filter[$docId])) {
-                                $result[$shift + $docId] = 1;
-                                $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                            }
-                        } else {
-                            $docId += $docDelta/2;
-                            if (isset($filter[$docId])) {
-                                $result[$shift + $docId] = $frqFile->readVInt();
-                                $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                            }
-                        }
-                    }
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-// ---------------------------------------------------------------
-                } else {
-                    // Perform full scan
-                    $updatedFilterData = array();
-
-                    for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                        $docDelta = $frqFile->readVInt();
-                        if ($docDelta % 2 == 1) {
-                            $docId += ($docDelta-1)/2;
-                            if (isset($filter[$docId])) {
-                                $result[$shift + $docId] = 1;
-                                $updatedFilterData[$docId] = 1; // 1 is just some constant value, so we don't need additional var dereference here
-                            }
-                        } else {
-                            $docId += $docDelta/2;
-                            if (isset($filter[$docId])) {
-                                $result[$shift + $docId] = $frqFile->readVInt();
-                                $updatedFilterData[$docId] = 1; // 1 is just some constant value, so we don't need additional var dereference here
-                            }
-                        }
-                    }
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-                }
-            } else {
-                // Filter doesn't has data for current segment
-                $filterData = array();
-
-                for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                    $docDelta = $frqFile->readVInt();
-                    if ($docDelta % 2 == 1) {
-                        $docId += ($docDelta-1)/2;
-                        $result[$shift + $docId] = 1;
-                        $filterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                    } else {
-                        $docId += $docDelta/2;
-                        $result[$shift + $docId] = $frqFile->readVInt();
-                        $filterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                    }
-                }
-
-                $docsFilter->segmentFilters[$this->_name] = $filterData;
-            }
-        } else {
-            for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                $docDelta = $frqFile->readVInt();
-                if ($docDelta % 2 == 1) {
-                    $docId += ($docDelta-1)/2;
-                    $result[$shift + $docId] = 1;
-                } else {
-                    $docId += $docDelta/2;
-                    $result[$shift + $docId] = $frqFile->readVInt();
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns term positions array.
-     * Result array structure: array(docId => array(pos1, pos2, ...), ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param integer $shift
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_TermInfo
-     */
-    public function termPositions(Zend_Search_Lucene_Index_Term $term, $shift = 0, $docsFilter = null)
-    {
-        $termInfo = $this->getTermInfo($term);
-
-        if (!$termInfo instanceof Zend_Search_Lucene_Index_TermInfo) {
-            if ($docsFilter !== null  &&  $docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                $docsFilter->segmentFilters[$this->_name] = array();
-            }
-            return array();
-        }
-
-        $frqFile = $this->openCompoundFile('.frq');
-        $frqFile->seek($termInfo->freqPointer,SEEK_CUR);
-
-        $docId = 0;
-        $freqs = array();
-
-
-        if ($docsFilter !== null) {
-            if (!$docsFilter instanceof Zend_Search_Lucene_Index_DocsFilter) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Documents filter must be an instance of Zend_Search_Lucene_Index_DocsFilter or null.');
-            }
-
-            if (isset($docsFilter->segmentFilters[$this->_name])) {
-                // Filter already has some data for the current segment
-
-                // Make short name for the filter (which doesn't need additional dereferencing)
-                $filter = &$docsFilter->segmentFilters[$this->_name];
-
-                // Check if filter is not empty
-                if (count($filter) == 0) {
-                    return array();
-                }
-
-                if ($this->_docCount/count($filter) < self::FULL_SCAN_VS_FETCH_BOUNDARY) {
-                    // Perform fetching
-// ---------------------------------------------------------------
-                    for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                        $docDelta = $frqFile->readVInt();
-                        if ($docDelta % 2 == 1) {
-                            $docId += ($docDelta-1)/2;
-                            $freqs[$docId] = 1;
-                        } else {
-                            $docId += $docDelta/2;
-                            $freqs[$docId] = $frqFile->readVInt();
-                        }
-                    }
-
-                    $updatedFilterData = array();
-                    $result = array();
-                    $prxFile = $this->openCompoundFile('.prx');
-                    $prxFile->seek($termInfo->proxPointer, SEEK_CUR);
-                    foreach ($freqs as $docId => $freq) {
-                        $termPosition = 0;
-                        $positions = array();
-
-                        // we have to read .prx file to get right position for next doc
-                        // even filter doesn't match current document
-                        for ($count = 0; $count < $freq; $count++ ) {
-                            $termPosition += $prxFile->readVInt();
-                            $positions[] = $termPosition;
-                        }
-
-                        // Include into updated filter and into result only if doc is matched by filter
-                        if (isset($filter[$docId])) {
-                            $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                            $result[$shift + $docId] = $positions;
-                        }
-                    }
-
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-// ---------------------------------------------------------------
-                } else {
-                    // Perform full scan
-                    for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                        $docDelta = $frqFile->readVInt();
-                        if ($docDelta % 2 == 1) {
-                            $docId += ($docDelta-1)/2;
-                            $freqs[$docId] = 1;
-                        } else {
-                            $docId += $docDelta/2;
-                            $freqs[$docId] = $frqFile->readVInt();
-                        }
-                    }
-
-                    $updatedFilterData = array();
-                    $result = array();
-                    $prxFile = $this->openCompoundFile('.prx');
-                    $prxFile->seek($termInfo->proxPointer, SEEK_CUR);
-                    foreach ($freqs as $docId => $freq) {
-                        $termPosition = 0;
-                        $positions = array();
-
-                        // we have to read .prx file to get right position for next doc
-                        // even filter doesn't match current document
-                        for ($count = 0; $count < $freq; $count++ ) {
-                            $termPosition += $prxFile->readVInt();
-                            $positions[] = $termPosition;
-                        }
-
-                        // Include into updated filter and into result only if doc is matched by filter
-                        if (isset($filter[$docId])) {
-                            $updatedFilterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-                            $result[$shift + $docId] = $positions;
-                        }
-                    }
-
-                    $docsFilter->segmentFilters[$this->_name] = $updatedFilterData;
-                }
-            } else {
-                // Filter doesn't has data for current segment
-                for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                    $docDelta = $frqFile->readVInt();
-                    if ($docDelta % 2 == 1) {
-                        $docId += ($docDelta-1)/2;
-                        $freqs[$docId] = 1;
-                    } else {
-                        $docId += $docDelta/2;
-                        $freqs[$docId] = $frqFile->readVInt();
-                    }
-                }
-
-                $filterData = array();
-                $result = array();
-                $prxFile = $this->openCompoundFile('.prx');
-                $prxFile->seek($termInfo->proxPointer, SEEK_CUR);
-                foreach ($freqs as $docId => $freq) {
-                    $filterData[$docId] = 1; // 1 is just a some constant value, so we don't need additional var dereference here
-
-                    $termPosition = 0;
-                    $positions = array();
-
-                    for ($count = 0; $count < $freq; $count++ ) {
-                        $termPosition += $prxFile->readVInt();
-                        $positions[] = $termPosition;
-                    }
-
-                    $result[$shift + $docId] = $positions;
-                }
-
-                $docsFilter->segmentFilters[$this->_name] = $filterData;
-            }
-        } else {
-            for ($count = 0; $count < $termInfo->docFreq; $count++) {
-                $docDelta = $frqFile->readVInt();
-                if ($docDelta % 2 == 1) {
-                    $docId += ($docDelta-1)/2;
-                    $freqs[$docId] = 1;
-                } else {
-                    $docId += $docDelta/2;
-                    $freqs[$docId] = $frqFile->readVInt();
-                }
-            }
-
-            $result = array();
-            $prxFile = $this->openCompoundFile('.prx');
-            $prxFile->seek($termInfo->proxPointer, SEEK_CUR);
-            foreach ($freqs as $docId => $freq) {
-                $termPosition = 0;
-                $positions = array();
-
-                for ($count = 0; $count < $freq; $count++ ) {
-                    $termPosition += $prxFile->readVInt();
-                    $positions[] = $termPosition;
-                }
-
-                $result[$shift + $docId] = $positions;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Load normalizatin factors from an index file
-     *
-     * @param integer $fieldNum
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _loadNorm($fieldNum)
-    {
-        if ($this->_hasSingleNormFile) {
-            $normfFile = $this->openCompoundFile('.nrm');
-
-            $header              = $normfFile->readBytes(3);
-            $headerFormatVersion = $normfFile->readByte();
-
-            if ($header != 'NRM'  ||  $headerFormatVersion != (int)0xFF) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new  Zend_Search_Lucene_Exception('Wrong norms file format.');
-            }
-
-            foreach ($this->_fields as $fNum => $fieldInfo) {
-                if ($fieldInfo->isIndexed) {
-                    $this->_norms[$fNum] = $normfFile->readBytes($this->_docCount);
-                }
-            }
-        } else {
-            $fFile = $this->openCompoundFile('.f' . $fieldNum);
-            $this->_norms[$fieldNum] = $fFile->readBytes($this->_docCount);
-        }
-    }
-
-    /**
-     * Returns normalization factor for specified documents
-     *
-     * @param integer $id
-     * @param string $fieldName
-     * @return float
-     */
-    public function norm($id, $fieldName)
-    {
-        $fieldNum = $this->getFieldNum($fieldName);
-
-        if ( !($this->_fields[$fieldNum]->isIndexed) ) {
-            return null;
-        }
-
-        if (!isset($this->_norms[$fieldNum])) {
-            $this->_loadNorm($fieldNum);
-        }
-
-        return Zend_Search_Lucene_Search_Similarity::decodeNorm( ord($this->_norms[$fieldNum][$id]) );
-    }
-
-    /**
-     * Returns norm vector, encoded in a byte string
-     *
-     * @param string $fieldName
-     * @return string
-     */
-    public function normVector($fieldName)
-    {
-        $fieldNum = $this->getFieldNum($fieldName);
-
-        if ($fieldNum == -1  ||  !($this->_fields[$fieldNum]->isIndexed)) {
-            $similarity = Zend_Search_Lucene_Search_Similarity::getDefault();
-
-            return str_repeat(chr($similarity->encodeNorm( $similarity->lengthNorm($fieldName, 0) )),
-                              $this->_docCount);
-        }
-
-        if (!isset($this->_norms[$fieldNum])) {
-            $this->_loadNorm($fieldNum);
-        }
-
-        return $this->_norms[$fieldNum];
-    }
-
-
-    /**
-     * Returns true if any documents have been deleted from this index segment.
-     *
-     * @return boolean
-     */
-    public function hasDeletions()
-    {
-        return $this->_deleted !== null;
-    }
-
-
-    /**
-     * Returns true if segment has single norms file.
-     *
-     * @return boolean
-     */
-    public function hasSingleNormFile()
-    {
-        return $this->_hasSingleNormFile ? true : false;
-    }
-
-    /**
-     * Returns true if segment is stored using compound segment file.
-     *
-     * @return boolean
-     */
-    public function isCompound()
-    {
-        return $this->_isCompound;
-    }
-
-    /**
-     * Deletes a document from the index segment.
-     * $id is an internal document id
-     *
-     * @param integer
-     */
-    public function delete($id)
-    {
-        $this->_deletedDirty = true;
-
-        if (extension_loaded('bitset')) {
-            if ($this->_deleted === null) {
-                $this->_deleted = bitset_empty($id);
-            }
-            bitset_incl($this->_deleted, $id);
-        } else {
-            if ($this->_deleted === null) {
-                $this->_deleted = array();
-            }
-
-            $this->_deleted[$id] = 1;
-        }
-    }
-
-    /**
-     * Checks, that document is deleted
-     *
-     * @param integer
-     * @return boolean
-     */
-    public function isDeleted($id)
-    {
-        if ($this->_deleted === null) {
-            return false;
-        }
-
-        if (extension_loaded('bitset')) {
-            return bitset_in($this->_deleted, $id);
-        } else {
-            return isset($this->_deleted[$id]);
-        }
-    }
-
-    /**
-     * Detect latest delete generation
-     *
-     * Is actualy used from writeChanges() method or from the constructor if it's invoked from
-     * Index writer. In both cases index write lock is already obtained, so we shouldn't care
-     * about it
-     *
-     * @return integer
-     */
-    private function _detectLatestDelGen()
-    {
-        $delFileList = array();
-        foreach ($this->_directory->fileList() as $file) {
-            if ($file == $this->_name . '.del') {
-                // Matches <segment_name>.del file name
-                $delFileList[] = 0;
-            } else if (preg_match('/^' . $this->_name . '_([a-zA-Z0-9]+)\.del$/i', $file, $matches)) {
-                // Matches <segment_name>_NNN.del file names
-                $delFileList[] = (int)base_convert($matches[1], 36, 10);
-            }
-        }
-
-        if (count($delFileList) == 0) {
-            // There is no deletions file for current segment in the directory
-            // Set deletions file generation number to 1
-            return -1;
-        } else {
-            // There are some deletions files for current segment in the directory
-            // Set deletions file generation number to the highest nuber
-            return max($delFileList);
-        }
-    }
-
-    /**
-     * Write changes if it's necessary.
-     *
-     * This method must be invoked only from the Writer _updateSegments() method,
-     * so index Write lock has to be already obtained.
-     *
-     * @internal
-     * @throws Zend_Search_Lucene_Exceptions
-     */
-    public function writeChanges()
-    {
-        // Get new generation number
-        $latestDelGen = $this->_detectLatestDelGen();
-
-        if (!$this->_deletedDirty) {
-            // There was no deletions by current process
-
-            if ($latestDelGen == $this->_delGen) {
-                // Delete file hasn't been updated by any concurrent process
-                return;
-            } else if ($latestDelGen > $this->_delGen) {
-                // Delete file has been updated by some concurrent process
-                // Reload deletions file
-                $this->_delGen  = $latestDelGen;
-                $this->_deleted = $this->_loadDelFile();
-
-                return;
-            } else {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Delete file processing workflow is corrupted for the segment \'' . $this->_name . '\'.');
-            }
-        }
-
-        if ($latestDelGen > $this->_delGen) {
-            // Merge current deletions with latest deletions file
-            $this->_delGen = $latestDelGen;
-
-            $latestDelete = $this->_loadDelFile();
-
-            if (extension_loaded('bitset')) {
-                $this->_deleted = bitset_union($this->_deleted, $latestDelete);
-            } else {
-                $this->_deleted += $latestDelete;
-            }
-        }
-
-        if (extension_loaded('bitset')) {
-            $delBytes = $this->_deleted;
-            $bitCount = count(bitset_to_array($delBytes));
-        } else {
-            $byteCount = floor($this->_docCount/8)+1;
-            $delBytes = str_repeat(chr(0), $byteCount);
-            for ($count = 0; $count < $byteCount; $count++) {
-                $byte = 0;
-                for ($bit = 0; $bit < 8; $bit++) {
-                    if (isset($this->_deleted[$count*8 + $bit])) {
-                        $byte |= (1<<$bit);
-                    }
-                }
-                $delBytes[$count] = chr($byte);
-            }
-            $bitCount = count($this->_deleted);
-        }
-
-        if ($this->_delGen == -1) {
-            // Set delete file generation number to 1
-            $this->_delGen = 1;
-        } else {
-            // Increase delete file generation number by 1
-            $this->_delGen++;
-        }
-
-        $delFile = $this->_directory->createFile($this->_name . '_' . base_convert($this->_delGen, 10, 36) . '.del');
-        $delFile->writeInt($this->_docCount);
-        $delFile->writeInt($bitCount);
-        $delFile->writeBytes($delBytes);
-
-        $this->_deletedDirty = false;
-    }
-
-
-    /**
-     * Term Dictionary File object for stream like terms reading
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_tisFile = null;
-
-    /**
-     * Actual offset of the .tis file data
-     *
-     * @var integer
-     */
-    private $_tisFileOffset;
-
-    /**
-     * Frequencies File object for stream like terms reading
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_frqFile = null;
-
-    /**
-     * Actual offset of the .frq file data
-     *
-     * @var integer
-     */
-    private $_frqFileOffset;
-
-    /**
-     * Positions File object for stream like terms reading
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_prxFile = null;
-
-    /**
-     * Actual offset of the .prx file in the compound file
-     *
-     * @var integer
-     */
-    private $_prxFileOffset;
-
-
-    /**
-     * Actual number of terms in term stream
-     *
-     * @var integer
-     */
-    private $_termCount = 0;
-
-    /**
-     * Overall number of terms in term stream
-     *
-     * @var integer
-     */
-    private $_termNum = 0;
-
-    /**
-     * Segment index interval
-     *
-     * @var integer
-     */
-    private $_indexInterval;
-
-    /**
-     * Segment skip interval
-     *
-     * @var integer
-     */
-    private $_skipInterval;
-
-    /**
-     * Last TermInfo in a terms stream
-     *
-     * @var Zend_Search_Lucene_Index_TermInfo
-     */
-    private $_lastTermInfo = null;
-
-    /**
-     * Last Term in a terms stream
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_lastTerm = null;
-
-    /**
-     * Map of the document IDs
-     * Used to get new docID after removing deleted documents.
-     * It's not very effective from memory usage point of view,
-     * but much more faster, then other methods
-     *
-     * @var array|null
-     */
-    private $_docMap = null;
-
-    /**
-     * An array of all term positions in the documents.
-     * Array structure: array( docId => array( pos1, pos2, ...), ...)
-     *
-     * Is set to null if term positions loading has to be skipped
-     *
-     * @var array|null
-     */
-    private $_lastTermPositions;
-
-
-    /**
-     * Terms scan mode
-     *
-     * Values:
-     *
-     * self::SM_TERMS_ONLY - terms are scanned, no additional info is retrieved
-     * self::SM_FULL_INFO  - terms are scanned, frequency and position info is retrieved
-     * self::SM_MERGE_INFO - terms are scanned, frequency and position info is retrieved
-     *                       document numbers are compacted (shifted if segment has deleted documents)
-     *
-     * @var integer
-     */
-    private $_termsScanMode;
-
-    /** Scan modes */
-    const SM_TERMS_ONLY = 0;    // terms are scanned, no additional info is retrieved
-    const SM_FULL_INFO  = 1;    // terms are scanned, frequency and position info is retrieved
-    const SM_MERGE_INFO = 2;    // terms are scanned, frequency and position info is retrieved
-                                // document numbers are compacted (shifted if segment contains deleted documents)
-
-    /**
-     * Reset terms stream
-     *
-     * $startId - id for the fist document
-     * $compact - remove deleted documents
-     *
-     * Returns start document id for the next segment
-     *
-     * @param integer $startId
-     * @param integer $mode
-     * @throws Zend_Search_Lucene_Exception
-     * @return integer
-     */
-    public function resetTermsStream(/** $startId = 0, $mode = self::SM_TERMS_ONLY */)
-    {
-        /**
-         * SegmentInfo->resetTermsStream() method actually takes two optional parameters:
-         *   $startId (default value is 0)
-         *   $mode (default value is self::SM_TERMS_ONLY)
-         */
-        $argList = func_get_args();
-        if (count($argList) > 2) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong number of arguments');
-        } else if (count($argList) == 2) {
-            $startId = $argList[0];
-            $mode    = $argList[1];
-        } else if (count($argList) == 1) {
-            $startId = $argList[0];
-            $mode    = self::SM_TERMS_ONLY;
-        } else {
-            $startId = 0;
-            $mode    = self::SM_TERMS_ONLY;
-        }
-
-        if ($this->_tisFile !== null) {
-            $this->_tisFile = null;
-        }
-
-        $this->_tisFile = $this->openCompoundFile('.tis', false);
-        $this->_tisFileOffset = $this->_tisFile->tell();
-
-        $tiVersion = $this->_tisFile->readInt();
-        if ($tiVersion != (int)0xFFFFFFFE /* pre-2.1 format */  &&
-            $tiVersion != (int)0xFFFFFFFD /* 2.1+ format    */) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong TermInfoFile file format');
-        }
-
-        $this->_termCount     =
-              $this->_termNum = $this->_tisFile->readLong(); // Read terms count
-        $this->_indexInterval = $this->_tisFile->readInt();  // Read Index interval
-        $this->_skipInterval  = $this->_tisFile->readInt();  // Read skip interval
-        if ($tiVersion == (int)0xFFFFFFFD /* 2.1+ format */) {
-            $maxSkipLevels = $this->_tisFile->readInt();
-        }
-
-        if ($this->_frqFile !== null) {
-            $this->_frqFile = null;
-        }
-        if ($this->_prxFile !== null) {
-            $this->_prxFile = null;
-        }
-        $this->_docMap = array();
-
-        $this->_lastTerm          = new Zend_Search_Lucene_Index_Term('', -1);
-        $this->_lastTermInfo      = new Zend_Search_Lucene_Index_TermInfo(0, 0, 0, 0);
-        $this->_lastTermPositions = null;
-
-        $this->_termsScanMode = $mode;
-
-        switch ($mode) {
-            case self::SM_TERMS_ONLY:
-                // Do nothing
-                break;
-
-            case self::SM_FULL_INFO:
-                // break intentionally omitted
-            case self::SM_MERGE_INFO:
-                $this->_frqFile = $this->openCompoundFile('.frq', false);
-                $this->_frqFileOffset = $this->_frqFile->tell();
-
-                $this->_prxFile = $this->openCompoundFile('.prx', false);
-                $this->_prxFileOffset = $this->_prxFile->tell();
-
-                for ($count = 0; $count < $this->_docCount; $count++) {
-                    if (!$this->isDeleted($count)) {
-                        $this->_docMap[$count] = $startId + (($mode == self::SM_MERGE_INFO) ? count($this->_docMap) : $count);
-                    }
-                }
-                break;
-
-            default:
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Wrong terms scaning mode specified.');
-                break;
-        }
-
-        // Calculate next segment start id (since $this->_docMap structure may be cleaned by $this->nextTerm() call)
-        $nextSegmentStartId = $startId + (($mode == self::SM_MERGE_INFO) ? count($this->_docMap) : $this->_docCount);
-        $this->nextTerm();
-
-        return $nextSegmentStartId;
-    }
-
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix)
-    {
-        if ($this->_termDictionary === null) {
-            $this->_loadDictionaryIndex();
-        }
-
-        $searchField = $this->getFieldNum($prefix->field);
-
-        if ($searchField == -1) {
-            /**
-             * Field is not presented in this segment
-             * Go to the end of dictionary
-             */
-            $this->_tisFile = null;
-            $this->_frqFile = null;
-            $this->_prxFile = null;
-
-            $this->_lastTerm          = null;
-            $this->_lastTermInfo      = null;
-            $this->_lastTermPositions = null;
-
-            return;
-        }
-        $searchDicField = $this->_getFieldPosition($searchField);
-
-        // search for appropriate value in dictionary
-        $lowIndex = 0;
-        $highIndex = count($this->_termDictionary)-1;
-        while ($highIndex >= $lowIndex) {
-            // $mid = ($highIndex - $lowIndex)/2;
-            $mid = ($highIndex + $lowIndex) >> 1;
-            $midTerm = $this->_termDictionary[$mid];
-
-            $fieldNum = $this->_getFieldPosition($midTerm[0] /* field */);
-            $delta = $searchDicField - $fieldNum;
-            if ($delta == 0) {
-                $delta = strcmp($prefix->text, $midTerm[1] /* text */);
-            }
-
-            if ($delta < 0) {
-                $highIndex = $mid-1;
-            } elseif ($delta > 0) {
-                $lowIndex  = $mid+1;
-            } else {
-                // We have reached term we are looking for
-                break;
-            }
-        }
-
-        if ($highIndex == -1) {
-            // Term is out of the dictionary range
-            $this->_tisFile = null;
-            $this->_frqFile = null;
-            $this->_prxFile = null;
-
-            $this->_lastTerm          = null;
-            $this->_lastTermInfo      = null;
-            $this->_lastTermPositions = null;
-
-            return;
-        }
-
-        $prevPosition = $highIndex;
-        $prevTerm = $this->_termDictionary[$prevPosition];
-        $prevTermInfo = $this->_termDictionaryInfos[$prevPosition];
-
-        if ($this->_tisFile === null) {
-            // The end of terms stream is reached and terms dictionary file is closed
-            // Perform mini-reset operation
-            $this->_tisFile = $this->openCompoundFile('.tis', false);
-
-            if ($this->_termsScanMode == self::SM_FULL_INFO  ||  $this->_termsScanMode == self::SM_MERGE_INFO) {
-                $this->_frqFile = $this->openCompoundFile('.frq', false);
-                $this->_prxFile = $this->openCompoundFile('.prx', false);
-            }
-        }
-        $this->_tisFile->seek($this->_tisFileOffset + $prevTermInfo[4], SEEK_SET);
-
-        $this->_lastTerm     = new Zend_Search_Lucene_Index_Term($prevTerm[1] /* text */,
-                                                                 ($prevTerm[0] == -1) ? '' : $this->_fields[$prevTerm[0] /* field */]->name);
-        $this->_lastTermInfo = new Zend_Search_Lucene_Index_TermInfo($prevTermInfo[0] /* docFreq */,
-                                                                     $prevTermInfo[1] /* freqPointer */,
-                                                                     $prevTermInfo[2] /* proxPointer */,
-                                                                     $prevTermInfo[3] /* skipOffset */);
-        $this->_termCount  =  $this->_termNum - $prevPosition*$this->_indexInterval;
-
-        if ($highIndex == 0) {
-            // skip start entry
-            $this->nextTerm();
-        } else if ($prefix->field == $this->_lastTerm->field  &&  $prefix->text  == $this->_lastTerm->text) {
-            // We got exact match in the dictionary index
-
-            if ($this->_termsScanMode == self::SM_FULL_INFO  ||  $this->_termsScanMode == self::SM_MERGE_INFO) {
-                $this->_lastTermPositions = array();
-
-                $this->_frqFile->seek($this->_lastTermInfo->freqPointer + $this->_frqFileOffset, SEEK_SET);
-                $freqs = array();   $docId = 0;
-                for( $count = 0; $count < $this->_lastTermInfo->docFreq; $count++ ) {
-                    $docDelta = $this->_frqFile->readVInt();
-                    if( $docDelta % 2 == 1 ) {
-                        $docId += ($docDelta-1)/2;
-                        $freqs[ $docId ] = 1;
-                    } else {
-                        $docId += $docDelta/2;
-                        $freqs[ $docId ] = $this->_frqFile->readVInt();
-                    }
-                }
-
-                $this->_prxFile->seek($this->_lastTermInfo->proxPointer + $this->_prxFileOffset, SEEK_SET);
-                foreach ($freqs as $docId => $freq) {
-                    $termPosition = 0;  $positions = array();
-
-                    for ($count = 0; $count < $freq; $count++ ) {
-                        $termPosition += $this->_prxFile->readVInt();
-                        $positions[] = $termPosition;
-                    }
-
-                    if (isset($this->_docMap[$docId])) {
-                        $this->_lastTermPositions[$this->_docMap[$docId]] = $positions;
-                    }
-                }
-            }
-
-            return;
-        }
-
-        // Search term matching specified prefix
-        while ($this->_lastTerm !== null) {
-            if ( strcmp($this->_lastTerm->field, $prefix->field) > 0  ||
-                 ($prefix->field == $this->_lastTerm->field  &&  strcmp($this->_lastTerm->text, $prefix->text) >= 0) ) {
-                    // Current term matches or greate than the pattern
-                    return;
-            }
-
-            $this->nextTerm();
-        }
-    }
-
-
-    /**
-     * Scans terms dictionary and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm()
-    {
-        if ($this->_tisFile === null  ||  $this->_termCount == 0) {
-            $this->_lastTerm          = null;
-            $this->_lastTermInfo      = null;
-            $this->_lastTermPositions = null;
-            $this->_docMap            = null;
-
-            // may be necessary for "empty" segment
-            $this->_tisFile = null;
-            $this->_frqFile = null;
-            $this->_prxFile = null;
-
-            return null;
-        }
-
-        $termPrefixLength = $this->_tisFile->readVInt();
-        $termSuffix       = $this->_tisFile->readString();
-        $termFieldNum     = $this->_tisFile->readVInt();
-        $termValue        = Zend_Search_Lucene_Index_Term::getPrefix($this->_lastTerm->text, $termPrefixLength) . $termSuffix;
-
-        $this->_lastTerm = new Zend_Search_Lucene_Index_Term($termValue, $this->_fields[$termFieldNum]->name);
-
-        $docFreq     = $this->_tisFile->readVInt();
-        $freqPointer = $this->_lastTermInfo->freqPointer + $this->_tisFile->readVInt();
-        $proxPointer = $this->_lastTermInfo->proxPointer + $this->_tisFile->readVInt();
-        if ($docFreq >= $this->_skipInterval) {
-            $skipOffset = $this->_tisFile->readVInt();
-        } else {
-            $skipOffset = 0;
-        }
-
-        $this->_lastTermInfo = new Zend_Search_Lucene_Index_TermInfo($docFreq, $freqPointer, $proxPointer, $skipOffset);
-
-
-        if ($this->_termsScanMode == self::SM_FULL_INFO  ||  $this->_termsScanMode == self::SM_MERGE_INFO) {
-            $this->_lastTermPositions = array();
-
-            $this->_frqFile->seek($this->_lastTermInfo->freqPointer + $this->_frqFileOffset, SEEK_SET);
-            $freqs = array();   $docId = 0;
-            for( $count = 0; $count < $this->_lastTermInfo->docFreq; $count++ ) {
-                $docDelta = $this->_frqFile->readVInt();
-                if( $docDelta % 2 == 1 ) {
-                    $docId += ($docDelta-1)/2;
-                    $freqs[ $docId ] = 1;
-                } else {
-                    $docId += $docDelta/2;
-                    $freqs[ $docId ] = $this->_frqFile->readVInt();
-                }
-            }
-
-            $this->_prxFile->seek($this->_lastTermInfo->proxPointer + $this->_prxFileOffset, SEEK_SET);
-            foreach ($freqs as $docId => $freq) {
-                $termPosition = 0;  $positions = array();
-
-                for ($count = 0; $count < $freq; $count++ ) {
-                    $termPosition += $this->_prxFile->readVInt();
-                    $positions[] = $termPosition;
-                }
-
-                if (isset($this->_docMap[$docId])) {
-                    $this->_lastTermPositions[$this->_docMap[$docId]] = $positions;
-                }
-            }
-        }
-
-        $this->_termCount--;
-        if ($this->_termCount == 0) {
-            $this->_tisFile = null;
-            $this->_frqFile = null;
-            $this->_prxFile = null;
-        }
-
-        return $this->_lastTerm;
-    }
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream()
-    {
-        $this->_tisFile = null;
-        $this->_frqFile = null;
-        $this->_prxFile = null;
-
-        $this->_lastTerm          = null;
-        $this->_lastTermInfo      = null;
-        $this->_lastTermPositions = null;
-
-        $this->_docMap            = null;
-    }
-
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm()
-    {
-        return $this->_lastTerm;
-    }
-
-
-    /**
-     * Returns an array of all term positions in the documents.
-     * Return array structure: array( docId => array( pos1, pos2, ...), ...)
-     *
-     * @return array
-     */
-    public function currentTermPositions()
-    {
-        return $this->_lastTermPositions;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentMerger.php b/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentMerger.php
deleted file mode 100644
index 0c958344b..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentMerger.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SegmentMerger.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Index_SegmentInfo */
-require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_SegmentMerger
-{
-    /**
-     * Target segment writer
-     *
-     * @var Zend_Search_Lucene_Index_SegmentWriter_StreamWriter
-     */
-    private $_writer;
-
-    /**
-     * Number of docs in a new segment
-     *
-     * @var integer
-     */
-    private $_docCount;
-
-    /**
-     * A set of segments to be merged
-     *
-     * @var array Zend_Search_Lucene_Index_SegmentInfo
-     */
-    private $_segmentInfos = array();
-
-    /**
-     * Flag to signal, that merge is already done
-     *
-     * @var boolean
-     */
-    private $_mergeDone = false;
-
-    /**
-     * Field map
-     * [<segment_name>][<field_number>] => <target_field_number>
-     *
-     * @var array
-     */
-    private $_fieldsMap = array();
-
-
-
-    /**
-     * Object constructor.
-     *
-     * Creates new segment merger with $directory as target to merge segments into
-     * and $name as a name of new segment
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param string $name
-     */
-    public function __construct($directory, $name)
-    {
-        /** Zend_Search_Lucene_Index_SegmentWriter_StreamWriter */
-        require_once 'Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php';
-        $this->_writer = new Zend_Search_Lucene_Index_SegmentWriter_StreamWriter($directory, $name);
-    }
-
-
-    /**
-     * Add segmnet to a collection of segments to be merged
-     *
-     * @param Zend_Search_Lucene_Index_SegmentInfo $segment
-     */
-    public function addSource(Zend_Search_Lucene_Index_SegmentInfo $segmentInfo)
-    {
-        $this->_segmentInfos[$segmentInfo->getName()] = $segmentInfo;
-    }
-
-
-    /**
-     * Do merge.
-     *
-     * Returns number of documents in newly created segment
-     *
-     * @return Zend_Search_Lucene_Index_SegmentInfo
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function merge()
-    {
-        if ($this->_mergeDone) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Merge is already done.');
-        }
-
-        if (count($this->_segmentInfos) < 1) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Wrong number of segments to be merged ('
-                                                 . count($this->_segmentInfos)
-                                                 . ').');
-        }
-
-        $this->_mergeFields();
-        $this->_mergeNorms();
-        $this->_mergeStoredFields();
-        $this->_mergeTerms();
-
-        $this->_mergeDone = true;
-
-        return $this->_writer->close();
-    }
-
-
-    /**
-     * Merge fields information
-     */
-    private function _mergeFields()
-    {
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            foreach ($segmentInfo->getFieldInfos() as $fieldInfo) {
-                $this->_fieldsMap[$segName][$fieldInfo->number] = $this->_writer->addFieldInfo($fieldInfo);
-            }
-        }
-    }
-
-    /**
-     * Merge field's normalization factors
-     */
-    private function _mergeNorms()
-    {
-        foreach ($this->_writer->getFieldInfos() as $fieldInfo) {
-            if ($fieldInfo->isIndexed) {
-                foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-                    if ($segmentInfo->hasDeletions()) {
-                        $srcNorm = $segmentInfo->normVector($fieldInfo->name);
-                        $norm    = '';
-                        $docs    = $segmentInfo->count();
-                        for ($count = 0; $count < $docs; $count++) {
-                            if (!$segmentInfo->isDeleted($count)) {
-                                $norm .= $srcNorm[$count];
-                            }
-                        }
-                        $this->_writer->addNorm($fieldInfo->name, $norm);
-                    } else {
-                        $this->_writer->addNorm($fieldInfo->name, $segmentInfo->normVector($fieldInfo->name));
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Merge fields information
-     */
-    private function _mergeStoredFields()
-    {
-        $this->_docCount = 0;
-
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            $fdtFile = $segmentInfo->openCompoundFile('.fdt');
-
-            for ($count = 0; $count < $segmentInfo->count(); $count++) {
-                $fieldCount = $fdtFile->readVInt();
-                $storedFields = array();
-
-                for ($count2 = 0; $count2 < $fieldCount; $count2++) {
-                    $fieldNum = $fdtFile->readVInt();
-                    $bits = $fdtFile->readByte();
-                    $fieldInfo = $segmentInfo->getField($fieldNum);
-
-                    if (!($bits & 2)) { // Text data
-                        $storedFields[] =
-                                 new Zend_Search_Lucene_Field($fieldInfo->name,
-                                                              $fdtFile->readString(),
-                                                              'UTF-8',
-                                                              true,
-                                                              $fieldInfo->isIndexed,
-                                                              $bits & 1 );
-                    } else {            // Binary data
-                        $storedFields[] =
-                                 new Zend_Search_Lucene_Field($fieldInfo->name,
-                                                              $fdtFile->readBinary(),
-                                                              '',
-                                                              true,
-                                                              $fieldInfo->isIndexed,
-                                                              $bits & 1,
-                                                              true);
-                    }
-                }
-
-                if (!$segmentInfo->isDeleted($count)) {
-                    $this->_docCount++;
-                    $this->_writer->addStoredFields($storedFields);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Merge fields information
-     */
-    private function _mergeTerms()
-    {
-        /** Zend_Search_Lucene_Index_TermsPriorityQueue */
-        require_once 'Zend/Search/Lucene/Index/TermsPriorityQueue.php';
-
-        $segmentInfoQueue = new Zend_Search_Lucene_Index_TermsPriorityQueue();
-
-        $segmentStartId = 0;
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            $segmentStartId = $segmentInfo->resetTermsStream($segmentStartId, Zend_Search_Lucene_Index_SegmentInfo::SM_MERGE_INFO);
-
-            // Skip "empty" segments
-            if ($segmentInfo->currentTerm() !== null) {
-                $segmentInfoQueue->put($segmentInfo);
-            }
-        }
-
-        $this->_writer->initializeDictionaryFiles();
-
-        $termDocs = array();
-        while (($segmentInfo = $segmentInfoQueue->pop()) !== null) {
-            // Merge positions array
-            $termDocs += $segmentInfo->currentTermPositions();
-
-            if ($segmentInfoQueue->top() === null ||
-                $segmentInfoQueue->top()->currentTerm()->key() !=
-                            $segmentInfo->currentTerm()->key()) {
-                // We got new term
-                ksort($termDocs, SORT_NUMERIC);
-
-                // Add term if it's contained in any document
-                if (count($termDocs) > 0) {
-                    $this->_writer->addTerm($segmentInfo->currentTerm(), $termDocs);
-                }
-                $termDocs = array();
-            }
-
-            $segmentInfo->nextTerm();
-            // check, if segment dictionary is finished
-            if ($segmentInfo->currentTerm() !== null) {
-                // Put segment back into the priority queue
-                $segmentInfoQueue->put($segmentInfo);
-            }
-        }
-
-        $this->_writer->closeDictionaryFiles();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter.php b/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter.php
deleted file mode 100644
index 49268980b..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter.php
+++ /dev/null
@@ -1,634 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SegmentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Index_FieldInfo */
-require_once 'Zend/Search/Lucene/Index/FieldInfo.php';
-
-/** Zend_Search_Lucene_Index_Term */
-require_once 'Zend/Search/Lucene/Index/Term.php';
-
-/** Zend_Search_Lucene_Index_TermInfo */
-require_once 'Zend/Search/Lucene/Index/TermInfo.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Index_SegmentWriter
-{
-    /**
-     * Expert: The fraction of terms in the "dictionary" which should be stored
-     * in RAM.  Smaller values use more memory, but make searching slightly
-     * faster, while larger values use less memory and make searching slightly
-     * slower.  Searching is typically not dominated by dictionary lookup, so
-     * tweaking this is rarely useful.
-     *
-     * @var integer
-     */
-    public static $indexInterval = 128;
-
-    /**
-     * Expert: The fraction of TermDocs entries stored in skip tables.
-     * Larger values result in smaller indexes, greater acceleration, but fewer
-     * accelerable cases, while smaller values result in bigger indexes,
-     * less acceleration and more
-     * accelerable cases. More detailed experiments would be useful here.
-     *
-     * 0x7FFFFFFF indicates that we don't use skip data
-     *
-     * Note: not used in current implementation
-     *
-     * @var integer
-     */
-    public static $skipInterval = 0x7FFFFFFF;
-
-    /**
-     * Expert: The maximum number of skip levels. Smaller values result in
-     * slightly smaller indexes, but slower skipping in big posting lists.
-     *
-     * 0 indicates that we don't use skip data
-     *
-     * Note: not used in current implementation
-     *
-     * @var integer
-     */
-    public static $maxSkipLevels = 0;
-
-    /**
-     * Number of docs in a segment
-     *
-     * @var integer
-     */
-    protected $_docCount = 0;
-
-    /**
-     * Segment name
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * File system adapter.
-     *
-     * @var Zend_Search_Lucene_Storage_Directory
-     */
-    protected $_directory;
-
-    /**
-     * List of the index files.
-     * Used for automatic compound file generation
-     *
-     * @var unknown_type
-     */
-    protected $_files = array();
-
-    /**
-     * Segment fields. Array of Zend_Search_Lucene_Index_FieldInfo objects for this segment
-     *
-     * @var array
-     */
-    protected $_fields = array();
-
-    /**
-     * Normalization factors.
-     * An array fieldName => normVector
-     * normVector is a binary string.
-     * Each byte corresponds to an indexed document in a segment and
-     * encodes normalization factor (float value, encoded by
-     * Zend_Search_Lucene_Search_Similarity::encodeNorm())
-     *
-     * @var array
-     */
-    protected $_norms = array();
-
-
-    /**
-     * '.fdx'  file - Stored Fields, the field index.
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    protected $_fdxFile = null;
-
-    /**
-     * '.fdt'  file - Stored Fields, the field data.
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    protected $_fdtFile = null;
-
-
-    /**
-     * Object constructor.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param string $name
-     */
-    public function __construct(Zend_Search_Lucene_Storage_Directory $directory, $name)
-    {
-        $this->_directory = $directory;
-        $this->_name      = $name;
-    }
-
-
-    /**
-     * Add field to the segment
-     *
-     * Returns actual field number
-     *
-     * @param Zend_Search_Lucene_Field $field
-     * @return integer
-     */
-    public function addField(Zend_Search_Lucene_Field $field)
-    {
-        if (!isset($this->_fields[$field->name])) {
-            $fieldNumber = count($this->_fields);
-            $this->_fields[$field->name] =
-                                new Zend_Search_Lucene_Index_FieldInfo($field->name,
-                                                                       $field->isIndexed,
-                                                                       $fieldNumber,
-                                                                       $field->storeTermVector);
-
-            return $fieldNumber;
-        } else {
-            $this->_fields[$field->name]->isIndexed       |= $field->isIndexed;
-            $this->_fields[$field->name]->storeTermVector |= $field->storeTermVector;
-
-            return $this->_fields[$field->name]->number;
-        }
-    }
-
-    /**
-     * Add fieldInfo to the segment
-     *
-     * Returns actual field number
-     *
-     * @param Zend_Search_Lucene_Index_FieldInfo $fieldInfo
-     * @return integer
-     */
-    public function addFieldInfo(Zend_Search_Lucene_Index_FieldInfo $fieldInfo)
-    {
-        if (!isset($this->_fields[$fieldInfo->name])) {
-            $fieldNumber = count($this->_fields);
-            $this->_fields[$fieldInfo->name] =
-                                new Zend_Search_Lucene_Index_FieldInfo($fieldInfo->name,
-                                                                       $fieldInfo->isIndexed,
-                                                                       $fieldNumber,
-                                                                       $fieldInfo->storeTermVector);
-
-            return $fieldNumber;
-        } else {
-            $this->_fields[$fieldInfo->name]->isIndexed       |= $fieldInfo->isIndexed;
-            $this->_fields[$fieldInfo->name]->storeTermVector |= $fieldInfo->storeTermVector;
-
-            return $this->_fields[$fieldInfo->name]->number;
-        }
-    }
-
-    /**
-     * Returns array of FieldInfo objects.
-     *
-     * @return array
-     */
-    public function getFieldInfos()
-    {
-        return $this->_fields;
-    }
-
-    /**
-     * Add stored fields information
-     *
-     * @param array $storedFields array of Zend_Search_Lucene_Field objects
-     */
-    public function addStoredFields($storedFields)
-    {
-        if (!isset($this->_fdxFile)) {
-            $this->_fdxFile = $this->_directory->createFile($this->_name . '.fdx');
-            $this->_fdtFile = $this->_directory->createFile($this->_name . '.fdt');
-
-            $this->_files[] = $this->_name . '.fdx';
-            $this->_files[] = $this->_name . '.fdt';
-        }
-
-        $this->_fdxFile->writeLong($this->_fdtFile->tell());
-        $this->_fdtFile->writeVInt(count($storedFields));
-        foreach ($storedFields as $field) {
-            $this->_fdtFile->writeVInt($this->_fields[$field->name]->number);
-            $fieldBits = ($field->isTokenized ? 0x01 : 0x00) |
-                         ($field->isBinary ?    0x02 : 0x00) |
-                         0x00; /* 0x04 - third bit, compressed (ZLIB) */
-            $this->_fdtFile->writeByte($fieldBits);
-            if ($field->isBinary) {
-                $this->_fdtFile->writeVInt(strlen($field->value));
-                $this->_fdtFile->writeBytes($field->value);
-            } else {
-                $this->_fdtFile->writeString($field->getUtf8Value());
-            }
-        }
-
-        $this->_docCount++;
-    }
-
-    /**
-     * Returns the total number of documents in this segment.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_docCount;
-    }
-
-    /**
-     * Return segment name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Dump Field Info (.fnm) segment file
-     */
-    protected function _dumpFNM()
-    {
-        $fnmFile = $this->_directory->createFile($this->_name . '.fnm');
-        $fnmFile->writeVInt(count($this->_fields));
-
-        $nrmFile = $this->_directory->createFile($this->_name . '.nrm');
-        // Write header
-        $nrmFile->writeBytes('NRM');
-        // Write format specifier
-        $nrmFile->writeByte((int)0xFF);
-
-        foreach ($this->_fields as $field) {
-            $fnmFile->writeString($field->name);
-            $fnmFile->writeByte(($field->isIndexed       ? 0x01 : 0x00) |
-                                ($field->storeTermVector ? 0x02 : 0x00)
-// not supported yet            0x04 /* term positions are stored with the term vectors */ |
-// not supported yet            0x08 /* term offsets are stored with the term vectors */   |
-                               );
-
-            if ($field->isIndexed) {
-                // pre-2.1 index mode (not used now)
-                // $normFileName = $this->_name . '.f' . $field->number;
-                // $fFile = $this->_directory->createFile($normFileName);
-                // $fFile->writeBytes($this->_norms[$field->name]);
-                // $this->_files[] = $normFileName;
-
-                $nrmFile->writeBytes($this->_norms[$field->name]);
-            }
-        }
-
-        $this->_files[] = $this->_name . '.fnm';
-        $this->_files[] = $this->_name . '.nrm';
-    }
-
-
-
-    /**
-     * Term Dictionary file
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_tisFile = null;
-
-    /**
-     * Term Dictionary index file
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_tiiFile = null;
-
-    /**
-     * Frequencies file
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_frqFile = null;
-
-    /**
-     * Positions file
-     *
-     * @var Zend_Search_Lucene_Storage_File
-     */
-    private $_prxFile = null;
-
-    /**
-     * Number of written terms
-     *
-     * @var integer
-     */
-    private $_termCount;
-
-
-    /**
-     * Last saved term
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_prevTerm;
-
-    /**
-     * Last saved term info
-     *
-     * @var Zend_Search_Lucene_Index_TermInfo
-     */
-    private $_prevTermInfo;
-
-    /**
-     * Last saved index term
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_prevIndexTerm;
-
-    /**
-     * Last saved index term info
-     *
-     * @var Zend_Search_Lucene_Index_TermInfo
-     */
-    private $_prevIndexTermInfo;
-
-    /**
-     * Last term dictionary file position
-     *
-     * @var integer
-     */
-    private $_lastIndexPosition;
-
-    /**
-     * Create dicrionary, frequency and positions files and write necessary headers
-     */
-    public function initializeDictionaryFiles()
-    {
-        $this->_tisFile = $this->_directory->createFile($this->_name . '.tis');
-        $this->_tisFile->writeInt((int)0xFFFFFFFD);
-        $this->_tisFile->writeLong(0 /* dummy data for terms count */);
-        $this->_tisFile->writeInt(self::$indexInterval);
-        $this->_tisFile->writeInt(self::$skipInterval);
-        $this->_tisFile->writeInt(self::$maxSkipLevels);
-
-        $this->_tiiFile = $this->_directory->createFile($this->_name . '.tii');
-        $this->_tiiFile->writeInt((int)0xFFFFFFFD);
-        $this->_tiiFile->writeLong(0 /* dummy data for terms count */);
-        $this->_tiiFile->writeInt(self::$indexInterval);
-        $this->_tiiFile->writeInt(self::$skipInterval);
-        $this->_tiiFile->writeInt(self::$maxSkipLevels);
-
-        /** Dump dictionary header */
-        $this->_tiiFile->writeVInt(0);                    // preffix length
-        $this->_tiiFile->writeString('');                 // suffix
-        $this->_tiiFile->writeInt((int)0xFFFFFFFF);       // field number
-        $this->_tiiFile->writeByte((int)0x0F);
-        $this->_tiiFile->writeVInt(0);                    // DocFreq
-        $this->_tiiFile->writeVInt(0);                    // FreqDelta
-        $this->_tiiFile->writeVInt(0);                    // ProxDelta
-        $this->_tiiFile->writeVInt(24);                   // IndexDelta
-
-        $this->_frqFile = $this->_directory->createFile($this->_name . '.frq');
-        $this->_prxFile = $this->_directory->createFile($this->_name . '.prx');
-
-        $this->_files[] = $this->_name . '.tis';
-        $this->_files[] = $this->_name . '.tii';
-        $this->_files[] = $this->_name . '.frq';
-        $this->_files[] = $this->_name . '.prx';
-
-        $this->_prevTerm          = null;
-        $this->_prevTermInfo      = null;
-        $this->_prevIndexTerm     = null;
-        $this->_prevIndexTermInfo = null;
-        $this->_lastIndexPosition = 24;
-        $this->_termCount         = 0;
-
-    }
-
-    /**
-     * Add term
-     *
-     * Term positions is an array( docId => array(pos1, pos2, pos3, ...), ... )
-     *
-     * @param Zend_Search_Lucene_Index_Term $termEntry
-     * @param array $termDocs
-     */
-    public function addTerm($termEntry, $termDocs)
-    {
-        $freqPointer = $this->_frqFile->tell();
-        $proxPointer = $this->_prxFile->tell();
-
-        $prevDoc = 0;
-        foreach ($termDocs as $docId => $termPositions) {
-            $docDelta = ($docId - $prevDoc)*2;
-            $prevDoc = $docId;
-            if (count($termPositions) > 1) {
-                $this->_frqFile->writeVInt($docDelta);
-                $this->_frqFile->writeVInt(count($termPositions));
-            } else {
-                $this->_frqFile->writeVInt($docDelta + 1);
-            }
-
-            $prevPosition = 0;
-            foreach ($termPositions as $position) {
-                $this->_prxFile->writeVInt($position - $prevPosition);
-                $prevPosition = $position;
-            }
-        }
-
-        if (count($termDocs) >= self::$skipInterval) {
-            /**
-             * @todo Write Skip Data to a freq file.
-             * It's not used now, but make index more optimal
-             */
-            $skipOffset = $this->_frqFile->tell() - $freqPointer;
-        } else {
-            $skipOffset = 0;
-        }
-
-        $term = new Zend_Search_Lucene_Index_Term($termEntry->text,
-                                                  $this->_fields[$termEntry->field]->number);
-        $termInfo = new Zend_Search_Lucene_Index_TermInfo(count($termDocs),
-                                                          $freqPointer, $proxPointer, $skipOffset);
-
-        $this->_dumpTermDictEntry($this->_tisFile, $this->_prevTerm, $term, $this->_prevTermInfo, $termInfo);
-
-        if (($this->_termCount + 1) % self::$indexInterval == 0) {
-            $this->_dumpTermDictEntry($this->_tiiFile, $this->_prevIndexTerm, $term, $this->_prevIndexTermInfo, $termInfo);
-
-            $indexPosition = $this->_tisFile->tell();
-            $this->_tiiFile->writeVInt($indexPosition - $this->_lastIndexPosition);
-            $this->_lastIndexPosition = $indexPosition;
-
-        }
-        $this->_termCount++;
-    }
-
-    /**
-     * Close dictionary
-     */
-    public function closeDictionaryFiles()
-    {
-        $this->_tisFile->seek(4);
-        $this->_tisFile->writeLong($this->_termCount);
-
-        $this->_tiiFile->seek(4);
-        // + 1 is used to count an additional special index entry (empty term at the start of the list)
-        $this->_tiiFile->writeLong(($this->_termCount - $this->_termCount % self::$indexInterval)/self::$indexInterval + 1);
-    }
-
-
-    /**
-     * Dump Term Dictionary segment file entry.
-     * Used to write entry to .tis or .tii files
-     *
-     * @param Zend_Search_Lucene_Storage_File $dicFile
-     * @param Zend_Search_Lucene_Index_Term $prevTerm
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_TermInfo $prevTermInfo
-     * @param Zend_Search_Lucene_Index_TermInfo $termInfo
-     */
-    protected function _dumpTermDictEntry(Zend_Search_Lucene_Storage_File $dicFile,
-                                        &$prevTerm,     Zend_Search_Lucene_Index_Term     $term,
-                                        &$prevTermInfo, Zend_Search_Lucene_Index_TermInfo $termInfo)
-    {
-        if (isset($prevTerm) && $prevTerm->field == $term->field) {
-            $matchedBytes = 0;
-            $maxBytes = min(strlen($prevTerm->text), strlen($term->text));
-            while ($matchedBytes < $maxBytes  &&
-                   $prevTerm->text[$matchedBytes] == $term->text[$matchedBytes]) {
-                $matchedBytes++;
-            }
-
-            // Calculate actual matched UTF-8 pattern
-            $prefixBytes = 0;
-            $prefixChars = 0;
-            while ($prefixBytes < $matchedBytes) {
-                $charBytes = 1;
-                if ((ord($term->text[$prefixBytes]) & 0xC0) == 0xC0) {
-                    $charBytes++;
-                    if (ord($term->text[$prefixBytes]) & 0x20 ) {
-                        $charBytes++;
-                        if (ord($term->text[$prefixBytes]) & 0x10 ) {
-                            $charBytes++;
-                        }
-                    }
-                }
-
-                if ($prefixBytes + $charBytes > $matchedBytes) {
-                    // char crosses matched bytes boundary
-                    // skip char
-                    break;
-                }
-
-                $prefixChars++;
-                $prefixBytes += $charBytes;
-            }
-
-            // Write preffix length
-            $dicFile->writeVInt($prefixChars);
-            // Write suffix
-            $dicFile->writeString(substr($term->text, $prefixBytes));
-        } else {
-            // Write preffix length
-            $dicFile->writeVInt(0);
-            // Write suffix
-            $dicFile->writeString($term->text);
-        }
-        // Write field number
-        $dicFile->writeVInt($term->field);
-        // DocFreq (the count of documents which contain the term)
-        $dicFile->writeVInt($termInfo->docFreq);
-
-        $prevTerm = $term;
-
-        if (!isset($prevTermInfo)) {
-            // Write FreqDelta
-            $dicFile->writeVInt($termInfo->freqPointer);
-            // Write ProxDelta
-            $dicFile->writeVInt($termInfo->proxPointer);
-        } else {
-            // Write FreqDelta
-            $dicFile->writeVInt($termInfo->freqPointer - $prevTermInfo->freqPointer);
-            // Write ProxDelta
-            $dicFile->writeVInt($termInfo->proxPointer - $prevTermInfo->proxPointer);
-        }
-        // Write SkipOffset - it's not 0 when $termInfo->docFreq > self::$skipInterval
-        if ($termInfo->skipOffset != 0) {
-            $dicFile->writeVInt($termInfo->skipOffset);
-        }
-
-        $prevTermInfo = $termInfo;
-    }
-
-
-    /**
-     * Generate compound index file
-     */
-    protected function _generateCFS()
-    {
-        $cfsFile = $this->_directory->createFile($this->_name . '.cfs');
-        $cfsFile->writeVInt(count($this->_files));
-
-        $dataOffsetPointers = array();
-        foreach ($this->_files as $fileName) {
-            $dataOffsetPointers[$fileName] = $cfsFile->tell();
-            $cfsFile->writeLong(0); // write dummy data
-            $cfsFile->writeString($fileName);
-        }
-
-        foreach ($this->_files as $fileName) {
-            // Get actual data offset
-            $dataOffset = $cfsFile->tell();
-            // Seek to the data offset pointer
-            $cfsFile->seek($dataOffsetPointers[$fileName]);
-            // Write actual data offset value
-            $cfsFile->writeLong($dataOffset);
-            // Seek back to the end of file
-            $cfsFile->seek($dataOffset);
-
-            $dataFile = $this->_directory->getFileObject($fileName);
-
-            $byteCount = $this->_directory->fileLength($fileName);
-            while ($byteCount > 0) {
-                $data = $dataFile->readBytes(min($byteCount, 131072 /*128Kb*/));
-                $byteCount -= strlen($data);
-                $cfsFile->writeBytes($data);
-            }
-
-            $this->_directory->deleteFile($fileName);
-        }
-    }
-
-
-    /**
-     * Close segment, write it to disk and return segment info
-     *
-     * @return Zend_Search_Lucene_Index_SegmentInfo
-     */
-    abstract public function close();
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php b/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
deleted file mode 100644
index 1090f7055..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocumentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Index_SegmentWriter */
-require_once 'Zend/Search/Lucene/Index/SegmentWriter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter extends Zend_Search_Lucene_Index_SegmentWriter
-{
-    /**
-     * Term Dictionary
-     * Array of the Zend_Search_Lucene_Index_Term objects
-     * Corresponding Zend_Search_Lucene_Index_TermInfo object stored in the $_termDictionaryInfos
-     *
-     * @var array
-     */
-    protected $_termDictionary;
-
-    /**
-     * Documents, which contain the term
-     *
-     * @var array
-     */
-    protected $_termDocs;
-
-    /**
-     * Object constructor.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param string $name
-     */
-    public function __construct(Zend_Search_Lucene_Storage_Directory $directory, $name)
-    {
-        parent::__construct($directory, $name);
-
-        $this->_termDocs       = array();
-        $this->_termDictionary = array();
-    }
-
-
-    /**
-     * Adds a document to this segment.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document)
-    {
-        /** Zend_Search_Lucene_Search_Similarity */
-        require_once 'Zend/Search/Lucene/Search/Similarity.php';
-
-        $storedFields = array();
-        $docNorms     = array();
-        $similarity   = Zend_Search_Lucene_Search_Similarity::getDefault();
-
-        foreach ($document->getFieldNames() as $fieldName) {
-            $field = $document->getField($fieldName);
-
-            if ($field->storeTermVector) {
-                /**
-                 * @todo term vector storing support
-                 */
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Store term vector functionality is not supported yet.');
-            }
-
-            if ($field->isIndexed) {
-                if ($field->isTokenized) {
-                    /** Zend_Search_Lucene_Analysis_Analyzer */
-                    require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-                    $analyzer = Zend_Search_Lucene_Analysis_Analyzer::getDefault();
-                    $analyzer->setInput($field->value, $field->encoding);
-
-                    $position     = 0;
-                    $tokenCounter = 0;
-                    while (($token = $analyzer->nextToken()) !== null) {
-                        $tokenCounter++;
-
-                        $term = new Zend_Search_Lucene_Index_Term($token->getTermText(), $field->name);
-                        $termKey = $term->key();
-
-                        if (!isset($this->_termDictionary[$termKey])) {
-                            // New term
-                            $this->_termDictionary[$termKey] = $term;
-                            $this->_termDocs[$termKey] = array();
-                            $this->_termDocs[$termKey][$this->_docCount] = array();
-                        } else if (!isset($this->_termDocs[$termKey][$this->_docCount])) {
-                            // Existing term, but new term entry
-                            $this->_termDocs[$termKey][$this->_docCount] = array();
-                        }
-                        $position += $token->getPositionIncrement();
-                        $this->_termDocs[$termKey][$this->_docCount][] = $position;
-                    }
-
-                    if ($tokenCounter == 0) {
-                        // Field contains empty value. Treat it as non-indexed and non-tokenized
-                        $field = clone($field);
-                        $field->isIndexed = $field->isTokenized = false;
-                    } else {
-                        $docNorms[$field->name] = chr($similarity->encodeNorm( $similarity->lengthNorm($field->name,
-                                                                                                       $tokenCounter)*
-                                                                               $document->boost*
-                                                                               $field->boost ));
-                    }
-                } else if (($fieldUtf8Value = $field->getUtf8Value()) == '') {
-                    // Field contains empty value. Treat it as non-indexed and non-tokenized
-                    $field = clone($field);
-                    $field->isIndexed = $field->isTokenized = false;
-                } else {
-                    $term = new Zend_Search_Lucene_Index_Term($fieldUtf8Value, $field->name);
-                    $termKey = $term->key();
-
-                    if (!isset($this->_termDictionary[$termKey])) {
-                        // New term
-                        $this->_termDictionary[$termKey] = $term;
-                        $this->_termDocs[$termKey] = array();
-                        $this->_termDocs[$termKey][$this->_docCount] = array();
-                    } else if (!isset($this->_termDocs[$termKey][$this->_docCount])) {
-                        // Existing term, but new term entry
-                        $this->_termDocs[$termKey][$this->_docCount] = array();
-                    }
-                    $this->_termDocs[$termKey][$this->_docCount][] = 0; // position
-
-                    $docNorms[$field->name] = chr($similarity->encodeNorm( $similarity->lengthNorm($field->name, 1)*
-                                                                           $document->boost*
-                                                                           $field->boost ));
-                }
-            }
-
-            if ($field->isStored) {
-                $storedFields[] = $field;
-            }
-
-            $this->addField($field);
-        }
-
-        foreach ($this->_fields as $fieldName => $field) {
-            if (!$field->isIndexed) {
-                continue;
-            }
-
-            if (!isset($this->_norms[$fieldName])) {
-                $this->_norms[$fieldName] = str_repeat(chr($similarity->encodeNorm( $similarity->lengthNorm($fieldName, 0) )),
-                                                       $this->_docCount);
-            }
-
-            if (isset($docNorms[$fieldName])){
-                $this->_norms[$fieldName] .= $docNorms[$fieldName];
-            } else {
-                $this->_norms[$fieldName] .= chr($similarity->encodeNorm( $similarity->lengthNorm($fieldName, 0) ));
-            }
-        }
-
-        $this->addStoredFields($storedFields);
-    }
-
-
-    /**
-     * Dump Term Dictionary (.tis) and Term Dictionary Index (.tii) segment files
-     */
-    protected function _dumpDictionary()
-    {
-        ksort($this->_termDictionary, SORT_STRING);
-
-        $this->initializeDictionaryFiles();
-
-        foreach ($this->_termDictionary as $termId => $term) {
-            $this->addTerm($term, $this->_termDocs[$termId]);
-        }
-
-        $this->closeDictionaryFiles();
-    }
-
-
-    /**
-     * Close segment, write it to disk and return segment info
-     *
-     * @return Zend_Search_Lucene_Index_SegmentInfo
-     */
-    public function close()
-    {
-        if ($this->_docCount == 0) {
-            return null;
-        }
-
-        $this->_dumpFNM();
-        $this->_dumpDictionary();
-
-        $this->_generateCFS();
-
-        /** Zend_Search_Lucene_Index_SegmentInfo */
-        require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
-
-        return new Zend_Search_Lucene_Index_SegmentInfo($this->_directory,
-                                                        $this->_name,
-                                                        $this->_docCount,
-                                                        -1,
-                                                        null,
-                                                        true,
-                                                        true);
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php b/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
deleted file mode 100644
index 70bcb2cfe..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StreamWriter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Index_SegmentWriter */
-require_once 'Zend/Search/Lucene/Index/SegmentWriter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_SegmentWriter_StreamWriter extends Zend_Search_Lucene_Index_SegmentWriter
-{
-    /**
-     * Object constructor.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param string $name
-     */
-    public function __construct(Zend_Search_Lucene_Storage_Directory $directory, $name)
-    {
-        parent::__construct($directory, $name);
-    }
-
-
-    /**
-     * Create stored fields files and open them for write
-     */
-    public function createStoredFieldsFiles()
-    {
-        $this->_fdxFile = $this->_directory->createFile($this->_name . '.fdx');
-        $this->_fdtFile = $this->_directory->createFile($this->_name . '.fdt');
-
-        $this->_files[] = $this->_name . '.fdx';
-        $this->_files[] = $this->_name . '.fdt';
-    }
-
-    public function addNorm($fieldName, $normVector)
-    {
-        if (isset($this->_norms[$fieldName])) {
-            $this->_norms[$fieldName] .= $normVector;
-        } else {
-            $this->_norms[$fieldName] = $normVector;
-        }
-    }
-
-    /**
-     * Close segment, write it to disk and return segment info
-     *
-     * @return Zend_Search_Lucene_Index_SegmentInfo
-     */
-    public function close()
-    {
-        if ($this->_docCount == 0) {
-            return null;
-        }
-
-        $this->_dumpFNM();
-        $this->_generateCFS();
-
-        /** Zend_Search_Lucene_Index_SegmentInfo */
-        require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
-
-        return new Zend_Search_Lucene_Index_SegmentInfo($this->_directory,
-                                                        $this->_name,
-                                                        $this->_docCount,
-                                                        -1,
-                                                        null,
-                                                        true,
-                                                        true);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/Term.php b/airtime_mvc/library/Zend/Search/Lucene/Index/Term.php
deleted file mode 100644
index 333e4a5f1..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/Term.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * A Term represents a word from text.  This is the unit of search.  It is
- * composed of two elements, the text of the word, as a string, and the name of
- * the field that the text occured in, an interned string.
- *
- * Note that terms may represent more than words from text fields, but also
- * things like dates, email addresses, urls, etc.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_Term
-{
-    /**
-     * Field name or field number (depending from context)
-     *
-     * @var mixed
-     */
-    public $field;
-
-    /**
-     * Term value
-     *
-     * @var string
-     */
-    public $text;
-
-
-    /**
-     * Object constructor
-     */
-    public function __construct($text, $field = null)
-    {
-        $this->field = ($field === null)?  Zend_Search_Lucene::getDefaultSearchField() : $field;
-        $this->text  = $text;
-    }
-
-
-    /**
-     * Returns term key
-     *
-     * @return string
-     */
-    public function key()
-    {
-        return $this->field . chr(0) . $this->text;
-    }
-
-    /**
-     * Get term prefix
-     *
-     * @param string $str
-     * @param integer $length
-     * @return string
-     */
-    public static function getPrefix($str, $length)
-    {
-        $prefixBytes = 0;
-        $prefixChars = 0;
-        while ($prefixBytes < strlen($str)  &&  $prefixChars < $length) {
-            $charBytes = 1;
-            if ((ord($str[$prefixBytes]) & 0xC0) == 0xC0) {
-                $charBytes++;
-                if (ord($str[$prefixBytes]) & 0x20 ) {
-                    $charBytes++;
-                    if (ord($str[$prefixBytes]) & 0x10 ) {
-                        $charBytes++;
-                    }
-                }
-            }
-
-            if ($prefixBytes + $charBytes > strlen($str)) {
-                // wrong character
-                break;
-            }
-
-            $prefixChars++;
-            $prefixBytes += $charBytes;
-        }
-
-        return substr($str, 0, $prefixBytes);
-    }
-
-    /**
-     * Get UTF-8 string length
-     *
-     * @param string $str
-     * @return string
-     */
-    public static function getLength($str)
-    {
-        $bytes = 0;
-        $chars = 0;
-        while ($bytes < strlen($str)) {
-            $charBytes = 1;
-            if ((ord($str[$bytes]) & 0xC0) == 0xC0) {
-                $charBytes++;
-                if (ord($str[$bytes]) & 0x20 ) {
-                    $charBytes++;
-                    if (ord($str[$bytes]) & 0x10 ) {
-                        $charBytes++;
-                    }
-                }
-            }
-
-            if ($bytes + $charBytes > strlen($str)) {
-                // wrong character
-                break;
-            }
-
-            $chars++;
-            $bytes += $charBytes;
-        }
-
-        return $chars;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/TermInfo.php b/airtime_mvc/library/Zend/Search/Lucene/Index/TermInfo.php
deleted file mode 100644
index 679211430..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/TermInfo.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TermInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * A Zend_Search_Lucene_Index_TermInfo represents a record of information stored for a term.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_TermInfo
-{
-    /**
-     * The number of documents which contain the term.
-     *
-     * @var integer
-     */
-    public $docFreq;
-
-    /**
-     * Data offset in a Frequencies file.
-     *
-     * @var integer
-     */
-    public $freqPointer;
-
-    /**
-     * Data offset in a Positions file.
-     *
-     * @var integer
-     */
-    public $proxPointer;
-
-    /**
-     * ScipData offset in a Frequencies file.
-     *
-     * @var integer
-     */
-    public $skipOffset;
-
-    /**
-     * Term offset of the _next_ term in a TermDictionary file.
-     * Used only for Term Index
-     *
-     * @var integer
-     */
-    public $indexPointer;
-
-    public function __construct($docFreq, $freqPointer, $proxPointer, $skipOffset, $indexPointer = null)
-    {
-        $this->docFreq      = $docFreq;
-        $this->freqPointer  = $freqPointer;
-        $this->proxPointer  = $proxPointer;
-        $this->skipOffset   = $skipOffset;
-        $this->indexPointer = $indexPointer;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php b/airtime_mvc/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
deleted file mode 100644
index 1547faef6..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TermsPriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_PriorityQueue */
-require_once 'Zend/Search/Lucene/PriorityQueue.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_TermsPriorityQueue extends Zend_Search_Lucene_PriorityQueue
-{
-    /**
-     * Compare elements
-     *
-     * Returns true, if $termsStream1 is "less" than $termsStream2; else otherwise
-     *
-     * @param mixed $termsStream1
-     * @param mixed $termsStream2
-     * @return boolean
-     */
-    protected function _less($termsStream1, $termsStream2)
-    {
-        return strcmp($termsStream1->currentTerm()->key(), $termsStream2->currentTerm()->key()) < 0;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/TermsStream/Interface.php b/airtime_mvc/library/Zend/Search/Lucene/Index/TermsStream/Interface.php
deleted file mode 100644
index b8a706424..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/TermsStream/Interface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Search_Lucene_Index_TermsStream_Interface
-{
-    /**
-     * Reset terms stream.
-     */
-    public function resetTermsStream();
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix);
-
-    /**
-     * Scans terms dictionary and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm();
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm();
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream();
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Index/Writer.php b/airtime_mvc/library/Zend/Search/Lucene/Index/Writer.php
deleted file mode 100644
index a6e2aea78..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Index/Writer.php
+++ /dev/null
@@ -1,841 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_LockManager */
-require_once 'Zend/Search/Lucene/LockManager.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Index_Writer
-{
-    /**
-     * @todo Implement Analyzer substitution
-     * @todo Implement Zend_Search_Lucene_Storage_DirectoryRAM and Zend_Search_Lucene_Storage_FileRAM to use it for
-     *       temporary index files
-     * @todo Directory lock processing
-     */
-
-    /**
-     * Number of documents required before the buffered in-memory
-     * documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @var integer
-     */
-    public $maxBufferedDocs = 10;
-
-    /**
-     * Largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @var integer
-     */
-    public $maxMergeDocs = PHP_INT_MAX;
-
-    /**
-     * Determines how often segment indices are merged by addDocument().
-     *
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     *
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     *
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @var integer
-     */
-    public $mergeFactor = 10;
-
-    /**
-     * File system adapter.
-     *
-     * @var Zend_Search_Lucene_Storage_Directory
-     */
-    private $_directory = null;
-
-
-    /**
-     * Changes counter.
-     *
-     * @var integer
-     */
-    private $_versionUpdate = 0;
-
-    /**
-     * List of the segments, created by index writer
-     * Array of Zend_Search_Lucene_Index_SegmentInfo objects
-     *
-     * @var array
-     */
-    private $_newSegments = array();
-
-    /**
-     * List of segments to be deleted on commit
-     *
-     * @var array
-     */
-    private $_segmentsToDelete = array();
-
-    /**
-     * Current segment to add documents
-     *
-     * @var Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter
-     */
-    private $_currentSegment = null;
-
-    /**
-     * Array of Zend_Search_Lucene_Index_SegmentInfo objects for this index.
-     *
-     * It's a reference to the corresponding Zend_Search_Lucene::$_segmentInfos array
-     *
-     * @var array Zend_Search_Lucene_Index_SegmentInfo
-     */
-    private $_segmentInfos;
-
-    /**
-     * Index target format version
-     *
-     * @var integer
-     */
-    private $_targetFormatVersion;
-
-    /**
-     * List of indexfiles extensions
-     *
-     * @var array
-     */
-    private static $_indexExtensions = array('.cfs' => '.cfs',
-                                             '.cfx' => '.cfx',
-                                             '.fnm' => '.fnm',
-                                             '.fdx' => '.fdx',
-                                             '.fdt' => '.fdt',
-                                             '.tis' => '.tis',
-                                             '.tii' => '.tii',
-                                             '.frq' => '.frq',
-                                             '.prx' => '.prx',
-                                             '.tvx' => '.tvx',
-                                             '.tvd' => '.tvd',
-                                             '.tvf' => '.tvf',
-                                             '.del' => '.del',
-                                             '.sti' => '.sti' );
-
-
-    /**
-     * Create empty index
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param integer $generation
-     * @param integer $nameCount
-     */
-    public static function createIndex(Zend_Search_Lucene_Storage_Directory $directory, $generation, $nameCount)
-    {
-        if ($generation == 0) {
-            // Create index in pre-2.1 mode
-            foreach ($directory->fileList() as $file) {
-                if ($file == 'deletable' ||
-                    $file == 'segments'  ||
-                    isset(self::$_indexExtensions[ substr($file, strlen($file)-4)]) ||
-                    preg_match('/\.f\d+$/i', $file) /* matches <segment_name>.f<decimal_nmber> file names */) {
-                        $directory->deleteFile($file);
-                    }
-            }
-
-            $segmentsFile = $directory->createFile('segments');
-            $segmentsFile->writeInt((int)0xFFFFFFFF);
-
-            // write version (initialized by current time)
-            $segmentsFile->writeLong(round(microtime(true)));
-
-            // write name counter
-            $segmentsFile->writeInt($nameCount);
-            // write segment counter
-            $segmentsFile->writeInt(0);
-
-            $deletableFile = $directory->createFile('deletable');
-            // write counter
-            $deletableFile->writeInt(0);
-        } else {
-            $genFile = $directory->createFile('segments.gen');
-
-            $genFile->writeInt((int)0xFFFFFFFE);
-            // Write generation two times
-            $genFile->writeLong($generation);
-            $genFile->writeLong($generation);
-
-            $segmentsFile = $directory->createFile(Zend_Search_Lucene::getSegmentFileName($generation));
-            $segmentsFile->writeInt((int)0xFFFFFFFD);
-
-            // write version (initialized by current time)
-            $segmentsFile->writeLong(round(microtime(true)));
-
-            // write name counter
-            $segmentsFile->writeInt($nameCount);
-            // write segment counter
-            $segmentsFile->writeInt(0);
-        }
-    }
-
-    /**
-     * Open the index for writing
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @param array $segmentInfos
-     * @param integer $targetFormatVersion
-     * @param Zend_Search_Lucene_Storage_File $cleanUpLock
-     */
-    public function __construct(Zend_Search_Lucene_Storage_Directory $directory, &$segmentInfos, $targetFormatVersion)
-    {
-        $this->_directory           = $directory;
-        $this->_segmentInfos        = &$segmentInfos;
-        $this->_targetFormatVersion = $targetFormatVersion;
-    }
-
-    /**
-     * Adds a document to this index.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document)
-    {
-        /** Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter */
-        require_once 'Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php';
-
-        if ($this->_currentSegment === null) {
-            $this->_currentSegment =
-                new Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter($this->_directory, $this->_newSegmentName());
-        }
-        $this->_currentSegment->addDocument($document);
-
-        if ($this->_currentSegment->count() >= $this->maxBufferedDocs) {
-            $this->commit();
-        }
-
-        $this->_maybeMergeSegments();
-
-        $this->_versionUpdate++;
-    }
-
-
-    /**
-     * Check if we have anything to merge
-     *
-     * @return boolean
-     */
-    private function _hasAnythingToMerge()
-    {
-        $segmentSizes = array();
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            $segmentSizes[$segName] = $segmentInfo->count();
-        }
-
-        $mergePool   = array();
-        $poolSize    = 0;
-        $sizeToMerge = $this->maxBufferedDocs;
-        asort($segmentSizes, SORT_NUMERIC);
-        foreach ($segmentSizes as $segName => $size) {
-            // Check, if segment comes into a new merging block
-            while ($size >= $sizeToMerge) {
-                // Merge previous block if it's large enough
-                if ($poolSize >= $sizeToMerge) {
-                    return true;
-                }
-                $mergePool   = array();
-                $poolSize    = 0;
-
-                $sizeToMerge *= $this->mergeFactor;
-
-                if ($sizeToMerge > $this->maxMergeDocs) {
-                    return false;
-                }
-            }
-
-            $mergePool[] = $this->_segmentInfos[$segName];
-            $poolSize += $size;
-        }
-
-        if ($poolSize >= $sizeToMerge) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Merge segments if necessary
-     */
-    private function _maybeMergeSegments()
-    {
-        if (Zend_Search_Lucene_LockManager::obtainOptimizationLock($this->_directory) === false) {
-            return;
-        }
-
-        if (!$this->_hasAnythingToMerge()) {
-            Zend_Search_Lucene_LockManager::releaseOptimizationLock($this->_directory);
-            return;
-        }
-
-        // Update segments list to be sure all segments are not merged yet by another process
-        //
-        // Segment merging functionality is concentrated in this class and surrounded
-        // by optimization lock obtaining/releasing.
-        // _updateSegments() refreshes segments list from the latest index generation.
-        // So only new segments can be added to the index while we are merging some already existing
-        // segments.
-        // Newly added segments will be also included into the index by the _updateSegments() call
-        // either by another process or by the current process with the commit() call at the end of _mergeSegments() method.
-        // That's guaranteed by the serialisation of _updateSegments() execution using exclusive locks.
-        $this->_updateSegments();
-
-        // Perform standard auto-optimization procedure
-        $segmentSizes = array();
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            $segmentSizes[$segName] = $segmentInfo->count();
-        }
-
-        $mergePool   = array();
-        $poolSize    = 0;
-        $sizeToMerge = $this->maxBufferedDocs;
-        asort($segmentSizes, SORT_NUMERIC);
-        foreach ($segmentSizes as $segName => $size) {
-            // Check, if segment comes into a new merging block
-            while ($size >= $sizeToMerge) {
-                // Merge previous block if it's large enough
-                if ($poolSize >= $sizeToMerge) {
-                    $this->_mergeSegments($mergePool);
-                }
-                $mergePool   = array();
-                $poolSize    = 0;
-
-                $sizeToMerge *= $this->mergeFactor;
-
-                if ($sizeToMerge > $this->maxMergeDocs) {
-                    Zend_Search_Lucene_LockManager::releaseOptimizationLock($this->_directory);
-                    return;
-                }
-            }
-
-            $mergePool[] = $this->_segmentInfos[$segName];
-            $poolSize += $size;
-        }
-
-        if ($poolSize >= $sizeToMerge) {
-            $this->_mergeSegments($mergePool);
-        }
-
-        Zend_Search_Lucene_LockManager::releaseOptimizationLock($this->_directory);
-    }
-
-    /**
-     * Merge specified segments
-     *
-     * $segments is an array of SegmentInfo objects
-     *
-     * @param array $segments
-     */
-    private function _mergeSegments($segments)
-    {
-        $newName = $this->_newSegmentName();
-
-        /** Zend_Search_Lucene_Index_SegmentMerger */
-        require_once 'Zend/Search/Lucene/Index/SegmentMerger.php';
-        $merger = new Zend_Search_Lucene_Index_SegmentMerger($this->_directory,
-                                                             $newName);
-        foreach ($segments as $segmentInfo) {
-            $merger->addSource($segmentInfo);
-            $this->_segmentsToDelete[$segmentInfo->getName()] = $segmentInfo->getName();
-        }
-
-        $newSegment = $merger->merge();
-        if ($newSegment !== null) {
-            $this->_newSegments[$newSegment->getName()] = $newSegment;
-        }
-
-        $this->commit();
-    }
-
-    /**
-     * Update segments file by adding current segment to a list
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private function _updateSegments()
-    {
-        // Get an exclusive index lock
-        Zend_Search_Lucene_LockManager::obtainWriteLock($this->_directory);
-
-        // Write down changes for the segments
-        foreach ($this->_segmentInfos as $segInfo) {
-            $segInfo->writeChanges();
-        }
-
-
-        $generation = Zend_Search_Lucene::getActualGeneration($this->_directory);
-        $segmentsFile   = $this->_directory->getFileObject(Zend_Search_Lucene::getSegmentFileName($generation), false);
-        $newSegmentFile = $this->_directory->createFile(Zend_Search_Lucene::getSegmentFileName(++$generation), false);
-
-        try {
-            $genFile = $this->_directory->getFileObject('segments.gen', false);
-        } catch (Zend_Search_Lucene_Exception $e) {
-            if (strpos($e->getMessage(), 'is not readable') !== false) {
-                $genFile = $this->_directory->createFile('segments.gen');
-            } else {
-                throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-
-        $genFile->writeInt((int)0xFFFFFFFE);
-        // Write generation (first copy)
-        $genFile->writeLong($generation);
-
-        try {
-            // Write format marker
-            if ($this->_targetFormatVersion == Zend_Search_Lucene::FORMAT_2_1) {
-                $newSegmentFile->writeInt((int)0xFFFFFFFD);
-            } else if ($this->_targetFormatVersion == Zend_Search_Lucene::FORMAT_2_3) {
-                $newSegmentFile->writeInt((int)0xFFFFFFFC);
-            }
-
-            // Read src file format identifier
-            $format = $segmentsFile->readInt();
-            if ($format == (int)0xFFFFFFFF) {
-                $srcFormat = Zend_Search_Lucene::FORMAT_PRE_2_1;
-            } else if ($format == (int)0xFFFFFFFD) {
-                $srcFormat = Zend_Search_Lucene::FORMAT_2_1;
-            } else if ($format == (int)0xFFFFFFFC) {
-                $srcFormat = Zend_Search_Lucene::FORMAT_2_3;
-            } else {
-                throw new Zend_Search_Lucene_Exception('Unsupported segments file format');
-            }
-
-            $version = $segmentsFile->readLong() + $this->_versionUpdate;
-            $this->_versionUpdate = 0;
-            $newSegmentFile->writeLong($version);
-
-            // Write segment name counter
-            $newSegmentFile->writeInt($segmentsFile->readInt());
-
-            // Get number of segments offset
-            $numOfSegmentsOffset = $newSegmentFile->tell();
-            // Write dummy data (segment counter)
-            $newSegmentFile->writeInt(0);
-
-            // Read number of segemnts
-            $segmentsCount = $segmentsFile->readInt();
-
-            $segments = array();
-            for ($count = 0; $count < $segmentsCount; $count++) {
-                $segName = $segmentsFile->readString();
-                $segSize = $segmentsFile->readInt();
-
-                if ($srcFormat == Zend_Search_Lucene::FORMAT_PRE_2_1) {
-                    // pre-2.1 index format
-                    $delGen            = 0;
-                    $hasSingleNormFile = false;
-                    $numField          = (int)0xFFFFFFFF;
-                    $isCompoundByte    = 0;
-                    $docStoreOptions   = null;
-                } else {
-                    $delGen = $segmentsFile->readLong();
-
-                    if ($srcFormat == Zend_Search_Lucene::FORMAT_2_3) {
-                        $docStoreOffset = $segmentsFile->readInt();
-
-                        if ($docStoreOffset != (int)0xFFFFFFFF) {
-                            $docStoreSegment        = $segmentsFile->readString();
-                            $docStoreIsCompoundFile = $segmentsFile->readByte();
-
-                            $docStoreOptions = array('offset'     => $docStoreOffset,
-                                                     'segment'    => $docStoreSegment,
-                                                     'isCompound' => ($docStoreIsCompoundFile == 1));
-                        } else {
-                            $docStoreOptions = null;
-                        }
-                    } else {
-                        $docStoreOptions = null;
-                    }
-
-                    $hasSingleNormFile = $segmentsFile->readByte();
-                    $numField          = $segmentsFile->readInt();
-
-                    $normGens = array();
-                    if ($numField != (int)0xFFFFFFFF) {
-                        for ($count1 = 0; $count1 < $numField; $count1++) {
-                            $normGens[] = $segmentsFile->readLong();
-                        }
-                    }
-                    $isCompoundByte    = $segmentsFile->readByte();
-                }
-
-                if (!in_array($segName, $this->_segmentsToDelete)) {
-                    // Load segment if necessary
-                    if (!isset($this->_segmentInfos[$segName])) {
-                        if ($isCompoundByte == 0xFF) {
-                            // The segment is not a compound file
-                            $isCompound = false;
-                        } else if ($isCompoundByte == 0x00) {
-                            // The status is unknown
-                            $isCompound = null;
-                        } else if ($isCompoundByte == 0x01) {
-                            // The segment is a compound file
-                            $isCompound = true;
-                        }
-
-                        /** Zend_Search_Lucene_Index_SegmentInfo */
-                        require_once 'Zend/Search/Lucene/Index/SegmentInfo.php';
-                        $this->_segmentInfos[$segName] =
-                                    new Zend_Search_Lucene_Index_SegmentInfo($this->_directory,
-                                                                             $segName,
-                                                                             $segSize,
-                                                                             $delGen,
-                                                                             $docStoreOptions,
-                                                                             $hasSingleNormFile,
-                                                                             $isCompound);
-                    } else {
-                        // Retrieve actual deletions file generation number
-                        $delGen = $this->_segmentInfos[$segName]->getDelGen();
-                    }
-
-                    $newSegmentFile->writeString($segName);
-                    $newSegmentFile->writeInt($segSize);
-                    $newSegmentFile->writeLong($delGen);
-                    if ($this->_targetFormatVersion == Zend_Search_Lucene::FORMAT_2_3) {
-                        if ($docStoreOptions !== null) {
-                            $newSegmentFile->writeInt($docStoreOffset);
-                            $newSegmentFile->writeString($docStoreSegment);
-                            $newSegmentFile->writeByte($docStoreIsCompoundFile);
-                        } else {
-                            // Set DocStoreOffset to -1
-                            $newSegmentFile->writeInt((int)0xFFFFFFFF);
-                        }
-                    } else if ($docStoreOptions !== null) {
-                        // Release index write lock
-                        Zend_Search_Lucene_LockManager::releaseWriteLock($this->_directory);
-
-                        throw new Zend_Search_Lucene_Exception('Index conversion to lower format version is not supported.');
-                    }
-
-                    $newSegmentFile->writeByte($hasSingleNormFile);
-                    $newSegmentFile->writeInt($numField);
-                    if ($numField != (int)0xFFFFFFFF) {
-                        foreach ($normGens as $normGen) {
-                            $newSegmentFile->writeLong($normGen);
-                        }
-                    }
-                    $newSegmentFile->writeByte($isCompoundByte);
-
-                    $segments[$segName] = $segSize;
-                }
-            }
-            $segmentsFile->close();
-
-            $segmentsCount = count($segments) + count($this->_newSegments);
-
-            foreach ($this->_newSegments as $segName => $segmentInfo) {
-                $newSegmentFile->writeString($segName);
-                $newSegmentFile->writeInt($segmentInfo->count());
-
-                // delete file generation: -1 (there is no delete file yet)
-                $newSegmentFile->writeInt((int)0xFFFFFFFF);$newSegmentFile->writeInt((int)0xFFFFFFFF);
-                if ($this->_targetFormatVersion == Zend_Search_Lucene::FORMAT_2_3) {
-                    // docStoreOffset: -1 (segment doesn't use shared doc store)
-                    $newSegmentFile->writeInt((int)0xFFFFFFFF);
-                }
-                // HasSingleNormFile
-                $newSegmentFile->writeByte($segmentInfo->hasSingleNormFile());
-                // NumField
-                $newSegmentFile->writeInt((int)0xFFFFFFFF);
-                // IsCompoundFile
-                $newSegmentFile->writeByte($segmentInfo->isCompound() ? 1 : -1);
-
-                $segments[$segmentInfo->getName()] = $segmentInfo->count();
-                $this->_segmentInfos[$segName] = $segmentInfo;
-            }
-            $this->_newSegments = array();
-
-            $newSegmentFile->seek($numOfSegmentsOffset);
-            $newSegmentFile->writeInt($segmentsCount);  // Update segments count
-            $newSegmentFile->close();
-        } catch (Exception $e) {
-            /** Restore previous index generation */
-            $generation--;
-            $genFile->seek(4, SEEK_SET);
-            // Write generation number twice
-            $genFile->writeLong($generation); $genFile->writeLong($generation);
-
-            // Release index write lock
-            Zend_Search_Lucene_LockManager::releaseWriteLock($this->_directory);
-
-            // Throw the exception
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-        }
-
-        // Write generation (second copy)
-        $genFile->writeLong($generation);
-
-
-        // Check if another update or read process is not running now
-        // If yes, skip clean-up procedure
-        if (Zend_Search_Lucene_LockManager::escalateReadLock($this->_directory)) {
-            /**
-             * Clean-up directory
-             */
-            $filesToDelete = array();
-            $filesTypes    = array();
-            $filesNumbers  = array();
-
-            // list of .del files of currently used segments
-            // each segment can have several generations of .del files
-            // only last should not be deleted
-            $delFiles = array();
-
-            foreach ($this->_directory->fileList() as $file) {
-                if ($file == 'deletable') {
-                    // 'deletable' file
-                    $filesToDelete[] = $file;
-                    $filesTypes[]    = 0; // delete this file first, since it's not used starting from Lucene v2.1
-                    $filesNumbers[]  = 0;
-                } else if ($file == 'segments') {
-                    // 'segments' file
-                    $filesToDelete[] = $file;
-                    $filesTypes[]    = 1; // second file to be deleted "zero" version of segments file (Lucene pre-2.1)
-                    $filesNumbers[]  = 0;
-                } else if (preg_match('/^segments_[a-zA-Z0-9]+$/i', $file)) {
-                    // 'segments_xxx' file
-                    // Check if it's not a just created generation file
-                    if ($file != Zend_Search_Lucene::getSegmentFileName($generation)) {
-                        $filesToDelete[] = $file;
-                        $filesTypes[]    = 2; // first group of files for deletions
-                        $filesNumbers[]  = (int)base_convert(substr($file, 9), 36, 10); // ordered by segment generation numbers
-                    }
-                } else if (preg_match('/(^_([a-zA-Z0-9]+))\.f\d+$/i', $file, $matches)) {
-                    // one of per segment files ('<segment_name>.f<decimal_number>')
-                    // Check if it's not one of the segments in the current segments set
-                    if (!isset($segments[$matches[1]])) {
-                        $filesToDelete[] = $file;
-                        $filesTypes[]    = 3; // second group of files for deletions
-                        $filesNumbers[]  = (int)base_convert($matches[2], 36, 10); // order by segment number
-                    }
-                } else if (preg_match('/(^_([a-zA-Z0-9]+))(_([a-zA-Z0-9]+))\.del$/i', $file, $matches)) {
-                    // one of per segment files ('<segment_name>_<del_generation>.del' where <segment_name> is '_<segment_number>')
-                    // Check if it's not one of the segments in the current segments set
-                    if (!isset($segments[$matches[1]])) {
-                        $filesToDelete[] = $file;
-                        $filesTypes[]    = 3; // second group of files for deletions
-                        $filesNumbers[]  = (int)base_convert($matches[2], 36, 10); // order by segment number
-                    } else {
-                        $segmentNumber = (int)base_convert($matches[2], 36, 10);
-                        $delGeneration = (int)base_convert($matches[4], 36, 10);
-                        if (!isset($delFiles[$segmentNumber])) {
-                            $delFiles[$segmentNumber] = array();
-                        }
-                        $delFiles[$segmentNumber][$delGeneration] = $file;
-                    }
-                } else if (isset(self::$_indexExtensions[substr($file, strlen($file)-4)])) {
-                    // one of per segment files ('<segment_name>.<ext>')
-                    $segmentName = substr($file, 0, strlen($file) - 4);
-                    // Check if it's not one of the segments in the current segments set
-                    if (!isset($segments[$segmentName])  &&
-                        ($this->_currentSegment === null  ||  $this->_currentSegment->getName() != $segmentName)) {
-                        $filesToDelete[] = $file;
-                        $filesTypes[]    = 3; // second group of files for deletions
-                        $filesNumbers[]  = (int)base_convert(substr($file, 1 /* skip '_' */, strlen($file)-5), 36, 10); // order by segment number
-                    }
-                }
-            }
-
-            $maxGenNumber = 0;
-            // process .del files of currently used segments
-            foreach ($delFiles as $segmentNumber => $segmentDelFiles) {
-                ksort($delFiles[$segmentNumber], SORT_NUMERIC);
-                array_pop($delFiles[$segmentNumber]); // remove last delete file generation from candidates for deleting
-
-                end($delFiles[$segmentNumber]);
-                $lastGenNumber = key($delFiles[$segmentNumber]);
-                if ($lastGenNumber > $maxGenNumber) {
-                    $maxGenNumber = $lastGenNumber;
-                }
-            }
-            foreach ($delFiles as $segmentNumber => $segmentDelFiles) {
-                foreach ($segmentDelFiles as $delGeneration => $file) {
-                        $filesToDelete[] = $file;
-                        $filesTypes[]    = 4; // third group of files for deletions
-                        $filesNumbers[]  = $segmentNumber*$maxGenNumber + $delGeneration; // order by <segment_number>,<del_generation> pair
-                }
-            }
-
-            // Reorder files for deleting
-            array_multisort($filesTypes,    SORT_ASC, SORT_NUMERIC,
-                            $filesNumbers,  SORT_ASC, SORT_NUMERIC,
-                            $filesToDelete, SORT_ASC, SORT_STRING);
-
-            foreach ($filesToDelete as $file) {
-                try {
-                    /** Skip shared docstore segments deleting */
-                    /** @todo Process '.cfx' files to check if them are already unused */
-                    if (substr($file, strlen($file)-4) != '.cfx') {
-                        $this->_directory->deleteFile($file);
-                    }
-                } catch (Zend_Search_Lucene_Exception $e) {
-                    if (strpos($e->getMessage(), 'Can\'t delete file') === false) {
-                        // That's not "file is under processing or already deleted" exception
-                        // Pass it through
-                        throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                    }
-                }
-            }
-
-            // Return read lock into the previous state
-            Zend_Search_Lucene_LockManager::deEscalateReadLock($this->_directory);
-        } else {
-            // Only release resources if another index reader is running now
-            foreach ($this->_segmentsToDelete as $segName) {
-                foreach (self::$_indexExtensions as $ext) {
-                    $this->_directory->purgeFile($segName . $ext);
-                }
-            }
-        }
-
-        // Clean-up _segmentsToDelete container
-        $this->_segmentsToDelete = array();
-
-
-        // Release index write lock
-        Zend_Search_Lucene_LockManager::releaseWriteLock($this->_directory);
-
-        // Remove unused segments from segments list
-        foreach ($this->_segmentInfos as $segName => $segmentInfo) {
-            if (!isset($segments[$segName])) {
-                unset($this->_segmentInfos[$segName]);
-            }
-        }
-    }
-
-    /**
-     * Commit current changes
-     */
-    public function commit()
-    {
-        if ($this->_currentSegment !== null) {
-            $newSegment = $this->_currentSegment->close();
-            if ($newSegment !== null) {
-                $this->_newSegments[$newSegment->getName()] = $newSegment;
-            }
-            $this->_currentSegment = null;
-        }
-
-        $this->_updateSegments();
-    }
-
-
-    /**
-     * Merges the provided indexes into this index.
-     *
-     * @param array $readers
-     * @return void
-     */
-    public function addIndexes($readers)
-    {
-        /**
-         * @todo implementation
-         */
-    }
-
-    /**
-     * Merges all segments together into new one
-     *
-     * Returns true on success and false if another optimization or auto-optimization process
-     * is running now
-     *
-     * @return boolean
-     */
-    public function optimize()
-    {
-        if (Zend_Search_Lucene_LockManager::obtainOptimizationLock($this->_directory) === false) {
-            return false;
-        }
-
-        // Update segments list to be sure all segments are not merged yet by another process
-        //
-        // Segment merging functionality is concentrated in this class and surrounded
-        // by optimization lock obtaining/releasing.
-        // _updateSegments() refreshes segments list from the latest index generation.
-        // So only new segments can be added to the index while we are merging some already existing
-        // segments.
-        // Newly added segments will be also included into the index by the _updateSegments() call
-        // either by another process or by the current process with the commit() call at the end of _mergeSegments() method.
-        // That's guaranteed by the serialisation of _updateSegments() execution using exclusive locks.
-        $this->_updateSegments();
-
-        $this->_mergeSegments($this->_segmentInfos);
-
-        Zend_Search_Lucene_LockManager::releaseOptimizationLock($this->_directory);
-
-        return true;
-    }
-
-    /**
-     * Get name for new segment
-     *
-     * @return string
-     */
-    private function _newSegmentName()
-    {
-        Zend_Search_Lucene_LockManager::obtainWriteLock($this->_directory);
-
-        $generation = Zend_Search_Lucene::getActualGeneration($this->_directory);
-        $segmentsFile = $this->_directory->getFileObject(Zend_Search_Lucene::getSegmentFileName($generation), false);
-
-        $segmentsFile->seek(12); // 12 = 4 (int, file format marker) + 8 (long, index version)
-        $segmentNameCounter = $segmentsFile->readInt();
-
-        $segmentsFile->seek(12); // 12 = 4 (int, file format marker) + 8 (long, index version)
-        $segmentsFile->writeInt($segmentNameCounter + 1);
-
-        // Flash output to guarantee that wrong value will not be loaded between unlock and
-        // return (which calls $segmentsFile destructor)
-        $segmentsFile->flush();
-
-        Zend_Search_Lucene_LockManager::releaseWriteLock($this->_directory);
-
-        return '_' . base_convert($segmentNameCounter, 10, 36);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Interface.php b/airtime_mvc/library/Zend/Search/Lucene/Interface.php
deleted file mode 100644
index 900750dc2..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Interface.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Index_TermsStream_Interface */
-require_once 'Zend/Search/Lucene/Index/TermsStream/Interface.php';
-
-
-/** Classes used within Zend_Search_Lucene_Interface API */
-
-/** Zend_Search_Lucene_Document */
-require_once 'Zend/Search/Lucene/Document.php';
-
-/** Zend_Search_Lucene_Index_Term */
-require_once 'Zend/Search/Lucene/Index/Term.php';
-
-/** Zend_Search_Lucene_Index_DocsFilter */
-require_once 'Zend/Search/Lucene/Index/DocsFilter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Search_Lucene_Interface extends Zend_Search_Lucene_Index_TermsStream_Interface
-{
-    /**
-     * Get current generation number
-     *
-     * Returns generation number
-     * 0 means pre-2.1 index format
-     * -1 means there are no segments files.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getActualGeneration(Zend_Search_Lucene_Storage_Directory $directory);
-
-    /**
-     * Get segments file name
-     *
-     * @param integer $generation
-     * @return string
-     */
-    public static function getSegmentFileName($generation);
-
-    /**
-     * Get index format version
-     *
-     * @return integer
-     */
-    public function getFormatVersion();
-
-    /**
-     * Set index format version.
-     * Index is converted to this format at the nearest upfdate time
-     *
-     * @param int $formatVersion
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function setFormatVersion($formatVersion);
-
-    /**
-     * Returns the Zend_Search_Lucene_Storage_Directory instance for this index.
-     *
-     * @return Zend_Search_Lucene_Storage_Directory
-     */
-    public function getDirectory();
-
-    /**
-     * Returns the total number of documents in this index (including deleted documents).
-     *
-     * @return integer
-     */
-    public function count();
-
-    /**
-     * Returns one greater than the largest possible document number.
-     * This may be used to, e.g., determine how big to allocate a structure which will have
-     * an element for every document number in an index.
-     *
-     * @return integer
-     */
-    public function maxDoc();
-
-    /**
-     * Returns the total number of non-deleted documents in this index.
-     *
-     * @return integer
-     */
-    public function numDocs();
-
-    /**
-     * Checks, that document is deleted
-     *
-     * @param integer $id
-     * @return boolean
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function isDeleted($id);
-
-    /**
-     * Set default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * Default value is null
-     *
-     * @param string $fieldName
-     */
-    public static function setDefaultSearchField($fieldName);
-
-    /**
-     * Get default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * @return string
-     */
-    public static function getDefaultSearchField();
-
-    /**
-     * Set result set limit.
-     *
-     * 0 (default) means no limit
-     *
-     * @param integer $limit
-     */
-    public static function setResultSetLimit($limit);
-
-    /**
-     * Set result set limit.
-     *
-     * 0 means no limit
-     *
-     * @return integer
-     */
-    public static function getResultSetLimit();
-
-    /**
-     * Retrieve index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMaxBufferedDocs();
-
-    /**
-     * Set index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @param integer $maxBufferedDocs
-     */
-    public function setMaxBufferedDocs($maxBufferedDocs);
-
-    /**
-     * Retrieve index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @return integer
-     */
-    public function getMaxMergeDocs();
-
-    /**
-     * Set index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMaxMergeDocs($maxMergeDocs);
-
-    /**
-     * Retrieve index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMergeFactor();
-
-    /**
-     * Set index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMergeFactor($mergeFactor);
-
-    /**
-     * Performs a query against the index and returns an array
-     * of Zend_Search_Lucene_Search_QueryHit objects.
-     * Input is a string or Zend_Search_Lucene_Search_Query.
-     *
-     * @param mixed $query
-     * @return array Zend_Search_Lucene_Search_QueryHit
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function find($query);
-
-    /**
-     * Returns a list of all unique field names that exist in this index.
-     *
-     * @param boolean $indexed
-     * @return array
-     */
-    public function getFieldNames($indexed = false);
-
-    /**
-     * Returns a Zend_Search_Lucene_Document object for the document
-     * number $id in this index.
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @return Zend_Search_Lucene_Document
-     */
-    public function getDocument($id);
-
-    /**
-     * Returns true if index contain documents with specified term.
-     *
-     * Is used for query optimization.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return boolean
-     */
-    public function hasTerm(Zend_Search_Lucene_Index_Term $term);
-
-    /**
-     * Returns IDs of all the documents containing term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termDocs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null);
-
-    /**
-     * Returns documents filter for all documents containing term.
-     *
-     * It performs the same operation as termDocs, but return result as
-     * Zend_Search_Lucene_Index_DocsFilter object
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_DocsFilter
-     */
-    public function termDocsFilter(Zend_Search_Lucene_Index_Term $term, $docsFilter = null);
-
-    /**
-     * Returns an array of all term freqs.
-     * Return array structure: array( docId => freq, ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return integer
-     */
-    public function termFreqs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null);
-
-    /**
-     * Returns an array of all term positions in the documents.
-     * Return array structure: array( docId => array( pos1, pos2, ...), ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termPositions(Zend_Search_Lucene_Index_Term $term, $docsFilter = null);
-
-    /**
-     * Returns the number of documents in this index containing the $term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return integer
-     */
-    public function docFreq(Zend_Search_Lucene_Index_Term $term);
-
-    /**
-     * Retrive similarity used by index reader
-     *
-     * @return Zend_Search_Lucene_Search_Similarity
-     */
-    public function getSimilarity();
-
-    /**
-     * Returns a normalization factor for "field, document" pair.
-     *
-     * @param integer $id
-     * @param string $fieldName
-     * @return float
-     */
-    public function norm($id, $fieldName);
-
-    /**
-     * Returns true if any documents have been deleted from this index.
-     *
-     * @return boolean
-     */
-    public function hasDeletions();
-
-    /**
-     * Deletes a document from the index.
-     * $id is an internal document id
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function delete($id);
-
-    /**
-     * Adds a document to this index.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document);
-
-    /**
-     * Commit changes resulting from delete() or undeleteAll() operations.
-     */
-    public function commit();
-
-    /**
-     * Optimize index.
-     *
-     * Merges all segments into one
-     */
-    public function optimize();
-
-    /**
-     * Returns an array of all terms in this index.
-     *
-     * @return array
-     */
-    public function terms();
-
-    /**
-     * Undeletes all documents currently marked as deleted in this index.
-     */
-    public function undeleteAll();
-
-
-    /**
-     * Add reference to the index object
-     *
-     * @internal
-     */
-    public function addReference();
-
-    /**
-     * Remove reference from the index object
-     *
-     * When reference count becomes zero, index is closed and resources are cleaned up
-     *
-     * @internal
-     */
-    public function removeReference();
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/LockManager.php b/airtime_mvc/library/Zend/Search/Lucene/LockManager.php
deleted file mode 100644
index 3e0dd20bd..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/LockManager.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LockManager.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Storage_Directory */
-require_once 'Zend/Search/Lucene/Storage/Directory.php';
-
-/** Zend_Search_Lucene_Storage_File */
-require_once 'Zend/Search/Lucene/Storage/File.php';
-
-/**
- * This is an utility class which provides index locks processing functionality
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_LockManager
-{
-    /**
-     * consts for name of file to show lock status
-     */
-    const WRITE_LOCK_FILE                = 'write.lock.file';
-    const READ_LOCK_FILE                 = 'read.lock.file';
-    const READ_LOCK_PROCESSING_LOCK_FILE = 'read-lock-processing.lock.file';
-    const OPTIMIZATION_LOCK_FILE         = 'optimization.lock.file';
-
-    /**
-     * Obtain exclusive write lock on the index
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     * @return Zend_Search_Lucene_Storage_File
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function obtainWriteLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->createFile(self::WRITE_LOCK_FILE);
-        if (!$lock->lock(LOCK_EX)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Can\'t obtain exclusive index lock');
-        }
-        return $lock;
-    }
-
-    /**
-     * Release exclusive write lock
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     */
-    public static function releaseWriteLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->getFileObject(self::WRITE_LOCK_FILE);
-        $lock->unlock();
-    }
-
-    /**
-     * Obtain the exclusive "read escalation/de-escalation" lock
-     *
-     * Required to protect the escalate/de-escalate read lock process
-     * on GFS (and potentially other) mounted filesystems.
-     *
-     * Why we need this:
-     *  While GFS supports cluster-wide locking via flock(), it's
-     *  implementation isn't quite what it should be.  The locking
-     *  semantics that work consistently on a local filesystem tend to
-     *  fail on GFS mounted filesystems.  This appears to be a design defect
-     *  in the implementation of GFS.  How this manifests itself is that
-     *  conditional promotion of a shared lock to exclusive will always
-     *  fail, lock release requests are honored but not immediately
-     *  processed (causing erratic failures of subsequent conditional
-     *  requests) and the releasing of the exclusive lock before the
-     *  shared lock is set when a lock is demoted (which can open a window
-     *  of opportunity for another process to gain an exclusive lock when
-     *  it shoudln't be allowed to).
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     * @return Zend_Search_Lucene_Storage_File
-     * @throws Zend_Search_Lucene_Exception
-     */
-    private static function _startReadLockProcessing(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->createFile(self::READ_LOCK_PROCESSING_LOCK_FILE);
-        if (!$lock->lock(LOCK_EX)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Can\'t obtain exclusive lock for the read lock processing file');
-        }
-        return $lock;
-    }
-
-    /**
-     * Release the exclusive "read escalation/de-escalation" lock
-     *
-     * Required to protect the escalate/de-escalate read lock process
-     * on GFS (and potentially other) mounted filesystems.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     */
-    private static function _stopReadLockProcessing(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->getFileObject(self::READ_LOCK_PROCESSING_LOCK_FILE);
-        $lock->unlock();
-    }
-
-
-    /**
-     * Obtain shared read lock on the index
-     *
-     * It doesn't block other read or update processes, but prevent index from the premature cleaning-up
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $defaultLockDirectory
-     * @return Zend_Search_Lucene_Storage_File
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function obtainReadLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->createFile(self::READ_LOCK_FILE);
-        if (!$lock->lock(LOCK_SH)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Can\'t obtain shared reading index lock');
-        }
-        return $lock;
-    }
-
-    /**
-     * Release shared read lock
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     */
-    public static function releaseReadLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->getFileObject(self::READ_LOCK_FILE);
-        $lock->unlock();
-    }
-
-    /**
-     * Escalate Read lock to exclusive level
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     * @return boolean
-     */
-    public static function escalateReadLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        self::_startReadLockProcessing($lockDirectory);
-
-        $lock = $lockDirectory->getFileObject(self::READ_LOCK_FILE);
-
-        // First, release the shared lock for the benefit of GFS since
-        // it will fail the conditional request to promote the lock to
-        // "exclusive" while the shared lock is held (even when we are
-        // the only holder).
-        $lock->unlock();
-
-        // GFS is really poor.  While the above "unlock" returns, GFS
-        // doesn't clean up it's tables right away (which will potentially
-        // cause the conditional locking for the "exclusive" lock to fail.
-        // We will retry the conditional lock request several times on a
-        // failure to get past this.  The performance hit is negligible
-        // in the grand scheme of things and only will occur with GFS
-        // filesystems or if another local process has the shared lock
-        // on local filesystems.
-        for ($retries = 0; $retries < 10; $retries++) {
-            if ($lock->lock(LOCK_EX, true)) {
-                // Exclusive lock is obtained!
-                self::_stopReadLockProcessing($lockDirectory);
-                return true;
-            }
-
-            // wait 1 microsecond
-            usleep(1);
-        }
-
-        // Restore lock state
-        $lock->lock(LOCK_SH);
-
-        self::_stopReadLockProcessing($lockDirectory);
-        return false;
-    }
-
-    /**
-     * De-escalate Read lock to shared level
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     */
-    public static function deEscalateReadLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->getFileObject(self::READ_LOCK_FILE);
-        $lock->lock(LOCK_SH);
-    }
-
-    /**
-     * Obtain exclusive optimization lock on the index
-     *
-     * Returns lock object on success and false otherwise (doesn't block execution)
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     * @return mixed
-     */
-    public static function obtainOptimizationLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->createFile(self::OPTIMIZATION_LOCK_FILE);
-        if (!$lock->lock(LOCK_EX, true)) {
-            return false;
-        }
-        return $lock;
-    }
-
-    /**
-     * Release exclusive optimization lock
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $lockDirectory
-     */
-    public static function releaseOptimizationLock(Zend_Search_Lucene_Storage_Directory $lockDirectory)
-    {
-        $lock = $lockDirectory->getFileObject(self::OPTIMIZATION_LOCK_FILE);
-        $lock->unlock();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/MultiSearcher.php b/airtime_mvc/library/Zend/Search/Lucene/MultiSearcher.php
deleted file mode 100644
index 82903396b..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/MultiSearcher.php
+++ /dev/null
@@ -1,973 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MultiSearcher.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Interface */
-require_once 'Zend/Search/Lucene/Interface.php';
-
-/**
- * Multisearcher allows to search through several independent indexes.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_Interface
-{
-    /**
-     * List of indices for searching.
-     * Array of Zend_Search_Lucene_Interface objects
-     *
-     * @var array
-     */
-    protected $_indices;
-
-    /**
-     * Object constructor.
-     *
-     * @param array $indices   Arrays of indices for search
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($indices = array())
-    {
-        $this->_indices = $indices;
-
-        foreach ($this->_indices as $index) {
-            if (!$index instanceof Zend_Search_Lucene_Interface) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('sub-index objects have to implement Zend_Search_Lucene_Interface.');
-            }
-        }
-    }
-
-    /**
-     * Add index for searching.
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     */
-    public function addIndex(Zend_Search_Lucene_Interface $index)
-    {
-        $this->_indices[] = $index;
-    }
-
-
-    /**
-     * Get current generation number
-     *
-     * Returns generation number
-     * 0 means pre-2.1 index format
-     * -1 means there are no segments files.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getActualGeneration(Zend_Search_Lucene_Storage_Directory $directory)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception("Generation number can't be retrieved for multi-searcher");
-    }
-
-    /**
-     * Get segments file name
-     *
-     * @param integer $generation
-     * @return string
-     */
-    public static function getSegmentFileName($generation)
-    {
-        return Zend_Search_Lucene::getSegmentFileName($generation);
-    }
-
-    /**
-     * Get index format version
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getFormatVersion()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception("Format version can't be retrieved for multi-searcher");
-    }
-
-    /**
-     * Set index format version.
-     * Index is converted to this format at the nearest upfdate time
-     *
-     * @param int $formatVersion
-     */
-    public function setFormatVersion($formatVersion)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setFormatVersion($formatVersion);
-        }
-    }
-
-    /**
-     * Returns the Zend_Search_Lucene_Storage_Directory instance for this index.
-     *
-     * @return Zend_Search_Lucene_Storage_Directory
-     */
-    public function getDirectory()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception("Index directory can't be retrieved for multi-searcher");
-    }
-
-    /**
-     * Returns the total number of documents in this index (including deleted documents).
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        $count = 0;
-
-        foreach ($this->_indices as $index) {
-            $count += $this->_indices->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Returns one greater than the largest possible document number.
-     * This may be used to, e.g., determine how big to allocate a structure which will have
-     * an element for every document number in an index.
-     *
-     * @return integer
-     */
-    public function maxDoc()
-    {
-        return $this->count();
-    }
-
-    /**
-     * Returns the total number of non-deleted documents in this index.
-     *
-     * @return integer
-     */
-    public function numDocs()
-    {
-        $docs = 0;
-
-        foreach ($this->_indices as $index) {
-            $docs += $this->_indices->numDocs();
-        }
-
-        return $docs;
-    }
-
-    /**
-     * Checks, that document is deleted
-     *
-     * @param integer $id
-     * @return boolean
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function isDeleted($id)
-    {
-        foreach ($this->_indices as $index) {
-            $indexCount = $index->count();
-
-            if ($indexCount > $id) {
-                return $index->isDeleted($id);
-            }
-
-            $id -= $indexCount;
-        }
-
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-    }
-
-    /**
-     * Set default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * Default value is null
-     *
-     * @param string $fieldName
-     */
-    public static function setDefaultSearchField($fieldName)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setDefaultSearchField($fieldName);
-        }
-    }
-
-
-    /**
-     * Get default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * @return string
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getDefaultSearchField()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $defaultSearchField = reset($this->_indices)->getDefaultSearchField();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getDefaultSearchField() !== $defaultSearchField) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different default search field.');
-            }
-        }
-
-        return $defaultSearchField;
-    }
-
-    /**
-     * Set result set limit.
-     *
-     * 0 (default) means no limit
-     *
-     * @param integer $limit
-     */
-    public static function setResultSetLimit($limit)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setResultSetLimit($limit);
-        }
-    }
-
-    /**
-     * Set result set limit.
-     *
-     * 0 means no limit
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getResultSetLimit()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $defaultResultSetLimit = reset($this->_indices)->getResultSetLimit();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getResultSetLimit() !== $defaultResultSetLimit) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different default search field.');
-            }
-        }
-
-        return $defaultResultSetLimit;
-    }
-
-    /**
-     * Retrieve index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getMaxBufferedDocs()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $maxBufferedDocs = reset($this->_indices)->getMaxBufferedDocs();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getMaxBufferedDocs() !== $maxBufferedDocs) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different default search field.');
-            }
-        }
-
-        return $maxBufferedDocs;
-    }
-
-    /**
-     * Set index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @param integer $maxBufferedDocs
-     */
-    public function setMaxBufferedDocs($maxBufferedDocs)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setMaxBufferedDocs($maxBufferedDocs);
-        }
-    }
-
-    /**
-     * Retrieve index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getMaxMergeDocs()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $maxMergeDocs = reset($this->_indices)->getMaxMergeDocs();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getMaxMergeDocs() !== $maxMergeDocs) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different default search field.');
-            }
-        }
-
-        return $maxMergeDocs;
-    }
-
-    /**
-     * Set index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMaxMergeDocs($maxMergeDocs)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setMaxMergeDocs($maxMergeDocs);
-        }
-    }
-
-    /**
-     * Retrieve index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getMergeFactor()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $mergeFactor = reset($this->_indices)->getMergeFactor();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getMergeFactor() !== $mergeFactor) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different default search field.');
-            }
-        }
-
-        return $mergeFactor;
-    }
-
-    /**
-     * Set index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMergeFactor($mergeFactor)
-    {
-        foreach ($this->_indices as $index) {
-            $index->setMaxMergeDocs($mergeFactor);
-        }
-    }
-
-    /**
-     * Performs a query against the index and returns an array
-     * of Zend_Search_Lucene_Search_QueryHit objects.
-     * Input is a string or Zend_Search_Lucene_Search_Query.
-     *
-     * @param mixed $query
-     * @return array Zend_Search_Lucene_Search_QueryHit
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function find($query)
-    {
-        if (count($this->_indices) == 0) {
-            return array();
-        }
-
-        $hitsList = array();
-
-        $indexShift = 0;
-        foreach ($this->_indices as $index) {
-            $hits = $index->find($query);
-
-            if ($indexShift != 0) {
-                foreach ($hits as $hit) {
-                    $hit->id += $indexShift;
-                }
-            }
-
-            $indexShift += $index->count();
-            $hitsList[] = $hits;
-        }
-
-        /** @todo Implement advanced sorting */
-
-        return call_user_func_array('array_merge', $hitsList);
-    }
-
-    /**
-     * Returns a list of all unique field names that exist in this index.
-     *
-     * @param boolean $indexed
-     * @return array
-     */
-    public function getFieldNames($indexed = false)
-    {
-        $fieldNamesList = array();
-
-        foreach ($this->_indices as $index) {
-            $fieldNamesList[] = $index->getFieldNames($indexed);
-        }
-
-        return array_unique(call_user_func_array('array_merge', $fieldNamesList));
-    }
-
-    /**
-     * Returns a Zend_Search_Lucene_Document object for the document
-     * number $id in this index.
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @return Zend_Search_Lucene_Document
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function getDocument($id)
-    {
-        if ($id instanceof Zend_Search_Lucene_Search_QueryHit) {
-            /* @var $id Zend_Search_Lucene_Search_QueryHit */
-            $id = $id->id;
-        }
-
-        foreach ($this->_indices as $index) {
-            $indexCount = $index->count();
-
-            if ($indexCount > $id) {
-                return $index->getDocument($id);
-            }
-
-            $id -= $indexCount;
-        }
-
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-    }
-
-    /**
-     * Returns true if index contain documents with specified term.
-     *
-     * Is used for query optimization.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return boolean
-     */
-    public function hasTerm(Zend_Search_Lucene_Index_Term $term)
-    {
-        foreach ($this->_indices as $index) {
-            if ($index->hasTerm($term)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns IDs of all the documents containing term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function termDocs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        if ($docsFilter != null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document filters could not used with multi-searcher');
-        }
-
-        $docsList = array();
-
-        $indexShift = 0;
-        foreach ($this->_indices as $index) {
-            $docs = $index->termDocs($term);
-
-            if ($indexShift != 0) {
-                foreach ($docs as $id => $docId) {
-                    $docs[$id] += $indexShift;
-                }
-            }
-
-            $indexShift += $index->count();
-            $docsList[] = $docs;
-        }
-
-        return call_user_func_array('array_merge', $docsList);
-    }
-
-    /**
-     * Returns documents filter for all documents containing term.
-     *
-     * It performs the same operation as termDocs, but return result as
-     * Zend_Search_Lucene_Index_DocsFilter object
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_DocsFilter
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function termDocsFilter(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Document filters could not used with multi-searcher');
-    }
-
-    /**
-     * Returns an array of all term freqs.
-     * Return array structure: array( docId => freq, ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function termFreqs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        if ($docsFilter != null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document filters could not used with multi-searcher');
-        }
-
-        $freqsList = array();
-
-        $indexShift = 0;
-        foreach ($this->_indices as $index) {
-            $freqs = $index->termFreqs($term);
-
-            if ($indexShift != 0) {
-                $freqsShifted = array();
-
-                foreach ($freqs as $docId => $freq) {
-                    $freqsShifted[$docId + $indexShift] = $freq;
-                }
-                $freqs = $freqsShifted;
-            }
-
-            $indexShift += $index->count();
-            $freqsList[] = $freqs;
-        }
-
-        return call_user_func_array('array_merge', $freqsList);
-    }
-
-    /**
-     * Returns an array of all term positions in the documents.
-     * Return array structure: array( docId => array( pos1, pos2, ...), ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function termPositions(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        if ($docsFilter != null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Document filters could not used with multi-searcher');
-        }
-
-        $termPositionsList = array();
-
-        $indexShift = 0;
-        foreach ($this->_indices as $index) {
-            $termPositions = $index->termPositions($term);
-
-            if ($indexShift != 0) {
-                $termPositionsShifted = array();
-
-                foreach ($termPositions as $docId => $positions) {
-                    $termPositions[$docId + $indexShift] = $positions;
-                }
-                $termPositions = $termPositionsShifted;
-            }
-
-            $indexShift += $index->count();
-            $termPositionsList[] = $termPositions;
-        }
-
-        return call_user_func_array('array_merge', $termPositions);
-    }
-
-    /**
-     * Returns the number of documents in this index containing the $term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return integer
-     */
-    public function docFreq(Zend_Search_Lucene_Index_Term $term)
-    {
-        $docFreq = 0;
-
-        foreach ($this->_indices as $index) {
-            $docFreq += $index->docFreq($term);
-        }
-
-        return $docFreq;
-    }
-
-    /**
-     * Retrive similarity used by index reader
-     *
-     * @return Zend_Search_Lucene_Search_Similarity
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getSimilarity()
-    {
-        if (count($this->_indices) == 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Indices list is empty');
-        }
-
-        $similarity = reset($this->_indices)->getSimilarity();
-
-        foreach ($this->_indices as $index) {
-            if ($index->getSimilarity() !== $similarity) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Indices have different similarity.');
-            }
-        }
-
-        return $similarity;
-    }
-
-    /**
-     * Returns a normalization factor for "field, document" pair.
-     *
-     * @param integer $id
-     * @param string $fieldName
-     * @return float
-     */
-    public function norm($id, $fieldName)
-    {
-        foreach ($this->_indices as $index) {
-            $indexCount = $index->count();
-
-            if ($indexCount > $id) {
-                return $index->norm($id, $fieldName);
-            }
-
-            $id -= $indexCount;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns true if any documents have been deleted from this index.
-     *
-     * @return boolean
-     */
-    public function hasDeletions()
-    {
-        foreach ($this->_indices as $index) {
-            if ($index->hasDeletions()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Deletes a document from the index.
-     * $id is an internal document id
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function delete($id)
-    {
-        foreach ($this->_indices as $index) {
-            $indexCount = $index->count();
-
-            if ($indexCount > $id) {
-                $index->delete($id);
-                return;
-            }
-
-            $id -= $indexCount;
-        }
-
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Document id is out of the range.');
-    }
-
-
-    /**
-     * Callback used to choose target index for new documents
-     *
-     * Function/method signature:
-     *    Zend_Search_Lucene_Interface  callbackFunction(Zend_Search_Lucene_Document $document, array $indices);
-     *
-     * null means "default documents distributing algorithm"
-     *
-     * @var callback
-     */
-    protected $_documentDistributorCallBack = null;
-
-    /**
-     * Set callback for choosing target index.
-     *
-     * @param callback $callback
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function setDocumentDistributorCallback($callback)
-    {
-        if ($callback !== null  &&  !is_callable($callback)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('$callback parameter must be a valid callback.');
-        }
-
-        $this->_documentDistributorCallBack = $callback;
-    }
-
-    /**
-     * Get callback for choosing target index.
-     *
-     * @return callback
-     */
-    public function getDocumentDistributorCallback()
-    {
-        return $this->_documentDistributorCallBack;
-    }
-
-    /**
-     * Adds a document to this index.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document)
-    {
-        if ($this->_documentDistributorCallBack !== null) {
-            $index = call_user_func($this->_documentDistributorCallBack, $document, $this->_indices);
-        } else {
-            $index = $this->_indices[array_rand($this->_indices)];
-        }
-
-        $index->addDocument($document);
-    }
-
-    /**
-     * Commit changes resulting from delete() or undeleteAll() operations.
-     */
-    public function commit()
-    {
-        foreach ($this->_indices as $index) {
-            $index->commit();
-        }
-    }
-
-    /**
-     * Optimize index.
-     *
-     * Merges all segments into one
-     */
-    public function optimize()
-    {
-        foreach ($this->_indices as $index) {
-            $index->optimise();
-        }
-    }
-
-    /**
-     * Returns an array of all terms in this index.
-     *
-     * @return array
-     */
-    public function terms()
-    {
-        $termsList = array();
-
-        foreach ($this->_indices as $index) {
-            $termsList[] = $index->terms();
-        }
-
-        return array_unique(call_user_func_array('array_merge', $termsList));
-    }
-
-
-    /**
-     * Terms stream priority queue object
-     *
-     * @var Zend_Search_Lucene_TermStreamsPriorityQueue
-     */
-    private $_termsStream = null;
-
-    /**
-     * Reset terms stream.
-     */
-    public function resetTermsStream()
-    {
-        if ($this->_termsStream === null) {
-            /** Zend_Search_Lucene_TermStreamsPriorityQueue */
-            require_once 'Zend/Search/Lucene/TermStreamsPriorityQueue.php';
-
-            $this->_termsStream = new Zend_Search_Lucene_TermStreamsPriorityQueue($this->_indices);
-        } else {
-            $this->_termsStream->resetTermsStream();
-        }
-    }
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix)
-    {
-        $this->_termsStream->skipTo($prefix);
-    }
-
-    /**
-     * Scans terms dictionary and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm()
-    {
-        return $this->_termsStream->nextTerm();
-    }
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm()
-    {
-        return $this->_termsStream->currentTerm();
-    }
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream()
-    {
-        $this->_termsStream->closeTermsStream();
-        $this->_termsStream = null;
-    }
-
-
-    /**
-     * Undeletes all documents currently marked as deleted in this index.
-     */
-    public function undeleteAll()
-    {
-        foreach ($this->_indices as $index) {
-            $index->undeleteAll();
-        }
-    }
-
-
-    /**
-     * Add reference to the index object
-     *
-     * @internal
-     */
-    public function addReference()
-    {
-        // Do nothing, since it's never referenced by indices
-    }
-
-    /**
-     * Remove reference from the index object
-     *
-     * When reference count becomes zero, index is closed and resources are cleaned up
-     *
-     * @internal
-     */
-    public function removeReference()
-    {
-        // Do nothing, since it's never referenced by indices
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/PriorityQueue.php b/airtime_mvc/library/Zend/Search/Lucene/PriorityQueue.php
deleted file mode 100644
index a34913635..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/PriorityQueue.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract Priority Queue
- *
- * It implements a priority queue.
- * Please go to "Data Structures and Algorithms",
- * Aho, Hopcroft, and Ullman, Addison-Wesley, 1983 (corrected 1987 edition),
- * for implementation details.
- *
- * It provides O(log(N)) time of put/pop operations, where N is a size of queue
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_PriorityQueue
-{
-    /**
-     * Queue heap
-     *
-     * Heap contains balanced partial ordered binary tree represented in array
-     * [0] - top of the tree
-     * [1] - first child of [0]
-     * [2] - second child of [0]
-     * ...
-     * [2*n + 1] - first child of [n]
-     * [2*n + 2] - second child of [n]
-     *
-     * @var array
-     */
-    private $_heap = array();
-
-
-    /**
-     * Add element to the queue
-     *
-     * O(log(N)) time
-     *
-     * @param mixed $element
-     */
-    public function put($element)
-    {
-        $nodeId   = count($this->_heap);
-        $parentId = ($nodeId-1) >> 1;   // floor( ($nodeId-1)/2 )
-
-        while ($nodeId != 0  &&  $this->_less($element, $this->_heap[$parentId])) {
-            // Move parent node down
-            $this->_heap[$nodeId] = $this->_heap[$parentId];
-
-            // Move pointer to the next level of tree
-            $nodeId   = $parentId;
-            $parentId = ($nodeId-1) >> 1;   // floor( ($nodeId-1)/2 )
-        }
-
-        // Put new node into the tree
-        $this->_heap[$nodeId] = $element;
-    }
-
-
-    /**
-     * Return least element of the queue
-     *
-     * Constant time
-     *
-     * @return mixed
-     */
-    public function top()
-    {
-        if (count($this->_heap) == 0) {
-            return null;
-        }
-
-        return $this->_heap[0];
-    }
-
-
-    /**
-     * Removes and return least element of the queue
-     *
-     * O(log(N)) time
-     *
-     * @return mixed
-     */
-    public function pop()
-    {
-        if (count($this->_heap) == 0) {
-            return null;
-        }
-
-        $top = $this->_heap[0];
-        $lastId = count($this->_heap) - 1;
-
-        /**
-         * Find appropriate position for last node
-         */
-        $nodeId  = 0;     // Start from a top
-        $childId = 1;     // First child
-
-        // Choose smaller child
-        if ($lastId > 2  &&  $this->_less($this->_heap[2], $this->_heap[1])) {
-            $childId = 2;
-        }
-
-        while ($childId < $lastId  &&
-               $this->_less($this->_heap[$childId], $this->_heap[$lastId])
-          ) {
-            // Move child node up
-            $this->_heap[$nodeId] = $this->_heap[$childId];
-
-            $nodeId  = $childId;               // Go down
-            $childId = ($nodeId << 1) + 1;     // First child
-
-            // Choose smaller child
-            if (($childId+1) < $lastId  &&
-                $this->_less($this->_heap[$childId+1], $this->_heap[$childId])
-               ) {
-                $childId++;
-            }
-        }
-
-        // Move last element to the new position
-        $this->_heap[$nodeId] = $this->_heap[$lastId];
-        unset($this->_heap[$lastId]);
-
-        return $top;
-    }
-
-
-    /**
-     * Clear queue
-     */
-    public function clear()
-    {
-        $this->_heap = array();
-    }
-
-
-    /**
-     * Compare elements
-     *
-     * Returns true, if $el1 is less than $el2; else otherwise
-     *
-     * @param mixed $el1
-     * @param mixed $el2
-     * @return boolean
-     */
-    abstract protected function _less($el1, $el2);
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Proxy.php b/airtime_mvc/library/Zend/Search/Lucene/Proxy.php
deleted file mode 100644
index 0fb2c4f62..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Proxy.php
+++ /dev/null
@@ -1,612 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Proxy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Interface */
-require_once 'Zend/Search/Lucene/Interface.php';
-
-
-/**
- * Proxy class intended to be used in userland.
- *
- * It tracks, when index object goes out of scope and forces ndex closing
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface
-{
-    /**
-     * Index object
-     *
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $_index;
-
-    /**
-     * Object constructor
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     */
-    public function __construct(Zend_Search_Lucene_Interface $index)
-    {
-        $this->_index = $index;
-        $this->_index->addReference();
-    }
-
-    /**
-     * Object destructor
-     */
-    public function __destruct()
-    {
-        if ($this->_index !== null) {
-            // This code is invoked if Zend_Search_Lucene_Interface object constructor throws an exception
-            $this->_index->removeReference();
-        }
-        $this->_index = null;
-    }
-
-    /**
-     * Get current generation number
-     *
-     * Returns generation number
-     * 0 means pre-2.1 index format
-     * -1 means there are no segments files.
-     *
-     * @param Zend_Search_Lucene_Storage_Directory $directory
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public static function getActualGeneration(Zend_Search_Lucene_Storage_Directory $directory)
-    {
-        Zend_Search_Lucene::getActualGeneration($directory);
-    }
-
-    /**
-     * Get segments file name
-     *
-     * @param integer $generation
-     * @return string
-     */
-    public static function getSegmentFileName($generation)
-    {
-        Zend_Search_Lucene::getSegmentFileName($generation);
-    }
-
-    /**
-     * Get index format version
-     *
-     * @return integer
-     */
-    public function getFormatVersion()
-    {
-        return $this->_index->getFormatVersion();
-    }
-
-    /**
-     * Set index format version.
-     * Index is converted to this format at the nearest upfdate time
-     *
-     * @param int $formatVersion
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function setFormatVersion($formatVersion)
-    {
-        $this->_index->setFormatVersion($formatVersion);
-    }
-
-    /**
-     * Returns the Zend_Search_Lucene_Storage_Directory instance for this index.
-     *
-     * @return Zend_Search_Lucene_Storage_Directory
-     */
-    public function getDirectory()
-    {
-        return $this->_index->getDirectory();
-    }
-
-    /**
-     * Returns the total number of documents in this index (including deleted documents).
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->_index->count();
-    }
-
-    /**
-     * Returns one greater than the largest possible document number.
-     * This may be used to, e.g., determine how big to allocate a structure which will have
-     * an element for every document number in an index.
-     *
-     * @return integer
-     */
-    public function maxDoc()
-    {
-        return $this->_index->maxDoc();
-    }
-
-    /**
-     * Returns the total number of non-deleted documents in this index.
-     *
-     * @return integer
-     */
-    public function numDocs()
-    {
-        return $this->_index->numDocs();
-    }
-
-    /**
-     * Checks, that document is deleted
-     *
-     * @param integer $id
-     * @return boolean
-     * @throws Zend_Search_Lucene_Exception    Exception is thrown if $id is out of the range
-     */
-    public function isDeleted($id)
-    {
-        return $this->_index->isDeleted($id);
-    }
-
-    /**
-     * Set default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * Default value is null
-     *
-     * @param string $fieldName
-     */
-    public static function setDefaultSearchField($fieldName)
-    {
-        Zend_Search_Lucene::setDefaultSearchField($fieldName);
-    }
-
-    /**
-     * Get default search field.
-     *
-     * Null means, that search is performed through all fields by default
-     *
-     * @return string
-     */
-    public static function getDefaultSearchField()
-    {
-        return Zend_Search_Lucene::getDefaultSearchField();
-    }
-
-    /**
-     * Set result set limit.
-     *
-     * 0 (default) means no limit
-     *
-     * @param integer $limit
-     */
-    public static function setResultSetLimit($limit)
-    {
-        Zend_Search_Lucene::setResultSetLimit($limit);
-    }
-
-    /**
-     * Set result set limit.
-     *
-     * 0 means no limit
-     *
-     * @return integer
-     */
-    public static function getResultSetLimit()
-    {
-        return Zend_Search_Lucene::getResultSetLimit();
-    }
-
-    /**
-     * Retrieve index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMaxBufferedDocs()
-    {
-        return $this->_index->getMaxBufferedDocs();
-    }
-
-    /**
-     * Set index maxBufferedDocs option
-     *
-     * maxBufferedDocs is a minimal number of documents required before
-     * the buffered in-memory documents are written into a new Segment
-     *
-     * Default value is 10
-     *
-     * @param integer $maxBufferedDocs
-     */
-    public function setMaxBufferedDocs($maxBufferedDocs)
-    {
-        $this->_index->setMaxBufferedDocs($maxBufferedDocs);
-    }
-
-
-    /**
-     * Retrieve index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @return integer
-     */
-    public function getMaxMergeDocs()
-    {
-        return $this->_index->getMaxMergeDocs();
-    }
-
-    /**
-     * Set index maxMergeDocs option
-     *
-     * maxMergeDocs is a largest number of documents ever merged by addDocument().
-     * Small values (e.g., less than 10,000) are best for interactive indexing,
-     * as this limits the length of pauses while indexing to a few seconds.
-     * Larger values are best for batched indexing and speedier searches.
-     *
-     * Default value is PHP_INT_MAX
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMaxMergeDocs($maxMergeDocs)
-    {
-        $this->_index->setMaxMergeDocs($maxMergeDocs);
-    }
-
-
-    /**
-     * Retrieve index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @return integer
-     */
-    public function getMergeFactor()
-    {
-        return $this->_index->getMergeFactor();
-    }
-
-    /**
-     * Set index mergeFactor option
-     *
-     * mergeFactor determines how often segment indices are merged by addDocument().
-     * With smaller values, less RAM is used while indexing,
-     * and searches on unoptimized indices are faster,
-     * but indexing speed is slower.
-     * With larger values, more RAM is used during indexing,
-     * and while searches on unoptimized indices are slower,
-     * indexing is faster.
-     * Thus larger values (> 10) are best for batch index creation,
-     * and smaller values (< 10) for indices that are interactively maintained.
-     *
-     * Default value is 10
-     *
-     * @param integer $maxMergeDocs
-     */
-    public function setMergeFactor($mergeFactor)
-    {
-        $this->_index->setMergeFactor($mergeFactor);
-    }
-
-    /**
-     * Performs a query against the index and returns an array
-     * of Zend_Search_Lucene_Search_QueryHit objects.
-     * Input is a string or Zend_Search_Lucene_Search_Query.
-     *
-     * @param mixed $query
-     * @return array Zend_Search_Lucene_Search_QueryHit
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function find($query)
-    {
-        // actual parameter list
-        $parameters = func_get_args();
-
-        // invoke $this->_index->find() method with specified parameters
-        return call_user_func_array(array(&$this->_index, 'find'), $parameters);
-    }
-
-    /**
-     * Returns a list of all unique field names that exist in this index.
-     *
-     * @param boolean $indexed
-     * @return array
-     */
-    public function getFieldNames($indexed = false)
-    {
-        return $this->_index->getFieldNames($indexed);
-    }
-
-    /**
-     * Returns a Zend_Search_Lucene_Document object for the document
-     * number $id in this index.
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @return Zend_Search_Lucene_Document
-     */
-    public function getDocument($id)
-    {
-        return $this->_index->getDocument($id);
-    }
-
-    /**
-     * Returns true if index contain documents with specified term.
-     *
-     * Is used for query optimization.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return boolean
-     */
-    public function hasTerm(Zend_Search_Lucene_Index_Term $term)
-    {
-        return $this->_index->hasTerm($term);
-    }
-
-    /**
-     * Returns IDs of all the documents containing term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termDocs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        return $this->_index->termDocs($term, $docsFilter);
-    }
-
-    /**
-     * Returns documents filter for all documents containing term.
-     *
-     * It performs the same operation as termDocs, but return result as
-     * Zend_Search_Lucene_Index_DocsFilter object
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return Zend_Search_Lucene_Index_DocsFilter
-     */
-    public function termDocsFilter(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        return $this->_index->termDocsFilter($term, $docsFilter);
-    }
-
-    /**
-     * Returns an array of all term freqs.
-     * Return array structure: array( docId => freq, ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return integer
-     */
-    public function termFreqs(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        return $this->_index->termFreqs($term, $docsFilter);
-    }
-
-    /**
-     * Returns an array of all term positions in the documents.
-     * Return array structure: array( docId => array( pos1, pos2, ...), ...)
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @return array
-     */
-    public function termPositions(Zend_Search_Lucene_Index_Term $term, $docsFilter = null)
-    {
-        return $this->_index->termPositions($term, $docsFilter);
-    }
-
-    /**
-     * Returns the number of documents in this index containing the $term.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @return integer
-     */
-    public function docFreq(Zend_Search_Lucene_Index_Term $term)
-    {
-        return $this->_index->docFreq($term);
-    }
-
-    /**
-     * Retrive similarity used by index reader
-     *
-     * @return Zend_Search_Lucene_Search_Similarity
-     */
-    public function getSimilarity()
-    {
-        return $this->_index->getSimilarity();
-    }
-
-    /**
-     * Returns a normalization factor for "field, document" pair.
-     *
-     * @param integer $id
-     * @param string $fieldName
-     * @return float
-     */
-    public function norm($id, $fieldName)
-    {
-        return $this->_index->norm($id, $fieldName);
-    }
-
-    /**
-     * Returns true if any documents have been deleted from this index.
-     *
-     * @return boolean
-     */
-    public function hasDeletions()
-    {
-        return $this->_index->hasDeletions();
-    }
-
-    /**
-     * Deletes a document from the index.
-     * $id is an internal document id
-     *
-     * @param integer|Zend_Search_Lucene_Search_QueryHit $id
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function delete($id)
-    {
-        return $this->_index->delete($id);
-    }
-
-    /**
-     * Adds a document to this index.
-     *
-     * @param Zend_Search_Lucene_Document $document
-     */
-    public function addDocument(Zend_Search_Lucene_Document $document)
-    {
-        $this->_index->addDocument($document);
-    }
-
-    /**
-     * Commit changes resulting from delete() or undeleteAll() operations.
-     */
-    public function commit()
-    {
-        $this->_index->commit();
-    }
-
-    /**
-     * Optimize index.
-     *
-     * Merges all segments into one
-     */
-    public function optimize()
-    {
-        $this->_index->optimize();
-    }
-
-    /**
-     * Returns an array of all terms in this index.
-     *
-     * @return array
-     */
-    public function terms()
-    {
-        return $this->_index->terms();
-    }
-
-
-    /**
-     * Reset terms stream.
-     */
-    public function resetTermsStream()
-    {
-        $this->_index->resetTermsStream();
-    }
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix)
-    {
-        return $this->_index->skipTo($prefix);
-    }
-
-    /**
-     * Scans terms dictionary and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm()
-    {
-        return $this->_index->nextTerm();
-    }
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm()
-    {
-        return $this->_index->currentTerm();
-    }
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream()
-    {
-        $this->_index->closeTermsStream();
-    }
-
-
-    /**
-     * Undeletes all documents currently marked as deleted in this index.
-     */
-    public function undeleteAll()
-    {
-        return $this->_index->undeleteAll();
-    }
-
-    /**
-     * Add reference to the index object
-     *
-     * @internal
-     */
-    public function addReference()
-    {
-        return $this->_index->addReference();
-    }
-
-    /**
-     * Remove reference from the index object
-     *
-     * When reference count becomes zero, index is closed and resources are cleaned up
-     *
-     * @internal
-     */
-    public function removeReference()
-    {
-        return $this->_index->removeReference();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php b/airtime_mvc/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
deleted file mode 100644
index 313880bd3..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BooleanExpressionRecognizer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_FSM */
-require_once 'Zend/Search/Lucene/FSM.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_BooleanExpressionRecognizer extends Zend_Search_Lucene_FSM
-{
-    /** State Machine states */
-    const ST_START           = 0;
-    const ST_LITERAL         = 1;
-    const ST_NOT_OPERATOR    = 2;
-    const ST_AND_OPERATOR    = 3;
-    const ST_OR_OPERATOR     = 4;
-
-    /** Input symbols */
-    const IN_LITERAL         = 0;
-    const IN_NOT_OPERATOR    = 1;
-    const IN_AND_OPERATOR    = 2;
-    const IN_OR_OPERATOR     = 3;
-
-
-    /**
-     * NOT operator signal
-     *
-     * @var boolean
-     */
-    private $_negativeLiteral = false;
-
-    /**
-     * Current literal
-     *
-     * @var mixed
-     */
-    private $_literal;
-
-
-    /**
-     * Set of boolean query conjunctions
-     *
-     * Each conjunction is an array of conjunction elements
-     * Each conjunction element is presented with two-elements array:
-     * array(<literal>, <is_negative>)
-     *
-     * So, it has a structure:
-     * array( array( array(<literal>, <is_negative>), // first literal of first conjuction
-     *               array(<literal>, <is_negative>), // second literal of first conjuction
-     *               ...
-     *               array(<literal>, <is_negative>)
-     *             ), // end of first conjuction
-     *        array( array(<literal>, <is_negative>), // first literal of second conjuction
-     *               array(<literal>, <is_negative>), // second literal of second conjuction
-     *               ...
-     *               array(<literal>, <is_negative>)
-     *             ), // end of second conjuction
-     *        ...
-     *      ) // end of structure
-     *
-     * @var array
-     */
-    private $_conjunctions = array();
-
-    /**
-     * Current conjuction
-     *
-     * @var array
-     */
-    private $_currentConjunction = array();
-
-
-    /**
-     * Object constructor
-     */
-    public function __construct()
-    {
-        parent::__construct( array(self::ST_START,
-                                   self::ST_LITERAL,
-                                   self::ST_NOT_OPERATOR,
-                                   self::ST_AND_OPERATOR,
-                                   self::ST_OR_OPERATOR),
-                             array(self::IN_LITERAL,
-                                   self::IN_NOT_OPERATOR,
-                                   self::IN_AND_OPERATOR,
-                                   self::IN_OR_OPERATOR));
-
-        $emptyOperatorAction    = new Zend_Search_Lucene_FSMAction($this, 'emptyOperatorAction');
-        $emptyNotOperatorAction = new Zend_Search_Lucene_FSMAction($this, 'emptyNotOperatorAction');
-
-        $this->addRules(array( array(self::ST_START,        self::IN_LITERAL,        self::ST_LITERAL),
-                               array(self::ST_START,        self::IN_NOT_OPERATOR,   self::ST_NOT_OPERATOR),
-
-                               array(self::ST_LITERAL,      self::IN_AND_OPERATOR,   self::ST_AND_OPERATOR),
-                               array(self::ST_LITERAL,      self::IN_OR_OPERATOR,    self::ST_OR_OPERATOR),
-                               array(self::ST_LITERAL,      self::IN_LITERAL,        self::ST_LITERAL,      $emptyOperatorAction),
-                               array(self::ST_LITERAL,      self::IN_NOT_OPERATOR,   self::ST_NOT_OPERATOR, $emptyNotOperatorAction),
-
-                               array(self::ST_NOT_OPERATOR, self::IN_LITERAL,        self::ST_LITERAL),
-
-                               array(self::ST_AND_OPERATOR, self::IN_LITERAL,        self::ST_LITERAL),
-                               array(self::ST_AND_OPERATOR, self::IN_NOT_OPERATOR,   self::ST_NOT_OPERATOR),
-
-                               array(self::ST_OR_OPERATOR,  self::IN_LITERAL,        self::ST_LITERAL),
-                               array(self::ST_OR_OPERATOR,  self::IN_NOT_OPERATOR,   self::ST_NOT_OPERATOR),
-                             ));
-
-        $notOperatorAction     = new Zend_Search_Lucene_FSMAction($this, 'notOperatorAction');
-        $orOperatorAction      = new Zend_Search_Lucene_FSMAction($this, 'orOperatorAction');
-        $literalAction         = new Zend_Search_Lucene_FSMAction($this, 'literalAction');
-
-
-        $this->addEntryAction(self::ST_NOT_OPERATOR, $notOperatorAction);
-        $this->addEntryAction(self::ST_OR_OPERATOR,  $orOperatorAction);
-        $this->addEntryAction(self::ST_LITERAL,      $literalAction);
-    }
-
-
-    /**
-     * Process next operator.
-     *
-     * Operators are defined by class constants: IN_AND_OPERATOR, IN_OR_OPERATOR and IN_NOT_OPERATOR
-     *
-     * @param integer $operator
-     */
-    public function processOperator($operator)
-    {
-        $this->process($operator);
-    }
-
-    /**
-     * Process expression literal.
-     *
-     * @param integer $operator
-     */
-    public function processLiteral($literal)
-    {
-        $this->_literal = $literal;
-
-        $this->process(self::IN_LITERAL);
-    }
-
-    /**
-     * Finish an expression and return result
-     *
-     * Result is a set of boolean query conjunctions
-     *
-     * Each conjunction is an array of conjunction elements
-     * Each conjunction element is presented with two-elements array:
-     * array(<literal>, <is_negative>)
-     *
-     * So, it has a structure:
-     * array( array( array(<literal>, <is_negative>), // first literal of first conjuction
-     *               array(<literal>, <is_negative>), // second literal of first conjuction
-     *               ...
-     *               array(<literal>, <is_negative>)
-     *             ), // end of first conjuction
-     *        array( array(<literal>, <is_negative>), // first literal of second conjuction
-     *               array(<literal>, <is_negative>), // second literal of second conjuction
-     *               ...
-     *               array(<literal>, <is_negative>)
-     *             ), // end of second conjuction
-     *        ...
-     *      ) // end of structure
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function finishExpression()
-    {
-        if ($this->getState() != self::ST_LITERAL) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Literal expected.');
-        }
-
-        $this->_conjunctions[] = $this->_currentConjunction;
-
-        return $this->_conjunctions;
-    }
-
-
-
-    /*********************************************************************
-     * Actions implementation
-     *********************************************************************/
-
-    /**
-     * default (omitted) operator processing
-     */
-    public function emptyOperatorAction()
-    {
-        /** Zend_Search_Lucene_Search_QueryParser */
-        require_once 'Zend/Search/Lucene/Search/QueryParser.php';
-
-        if (Zend_Search_Lucene_Search_QueryParser::getDefaultOperator() == Zend_Search_Lucene_Search_QueryParser::B_AND) {
-            // Do nothing
-        } else {
-            $this->orOperatorAction();
-        }
-
-        // Process literal
-        $this->literalAction();
-    }
-
-    /**
-     * default (omitted) + NOT operator processing
-     */
-    public function emptyNotOperatorAction()
-    {
-        /** Zend_Search_Lucene_Search_QueryParser */
-        require_once 'Zend/Search/Lucene/Search/QueryParser.php';
-
-        if (Zend_Search_Lucene_Search_QueryParser::getDefaultOperator() == Zend_Search_Lucene_Search_QueryParser::B_AND) {
-            // Do nothing
-        } else {
-            $this->orOperatorAction();
-        }
-
-        // Process NOT operator
-        $this->notOperatorAction();
-    }
-
-
-    /**
-     * NOT operator processing
-     */
-    public function notOperatorAction()
-    {
-        $this->_negativeLiteral = true;
-    }
-
-    /**
-     * OR operator processing
-     * Close current conjunction
-     */
-    public function orOperatorAction()
-    {
-        $this->_conjunctions[]     = $this->_currentConjunction;
-        $this->_currentConjunction = array();
-    }
-
-    /**
-     * Literal processing
-     */
-    public function literalAction()
-    {
-        // Add literal to the current conjunction
-        $this->_currentConjunction[] = array($this->_literal, !$this->_negativeLiteral);
-
-        // Switch off negative signal
-        $this->_negativeLiteral = false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Default.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Default.php
deleted file mode 100644
index 0c3e900dd..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Default.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Search_Lucene_Search_Highlighter_Interface */
-require_once 'Zend/Search/Lucene/Search/Highlighter/Interface.php';
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Highlighter_Default implements Zend_Search_Lucene_Search_Highlighter_Interface
-{
-    /**
-     * List of colors for text highlighting
-     *
-     * @var array
-     */
-    protected $_highlightColors = array('#66ffff', '#ff66ff', '#ffff66',
-                                        '#ff8888', '#88ff88', '#8888ff',
-                                        '#88dddd', '#dd88dd', '#dddd88',
-                                        '#aaddff', '#aaffdd', '#ddaaff',
-                                        '#ddffaa', '#ffaadd', '#ffddaa');
-
-    /**
-     * Index of current color for highlighting
-     *
-     * Index is increased at each highlight() call, so terms matching different queries are highlighted using different colors.
-     *
-     * @var integer
-     */
-    protected $_currentColorIndex = 0;
-
-    /**
-     * HTML document for highlighting
-     *
-     * @var Zend_Search_Lucene_Document_Html
-     */
-    protected $_doc;
-
-    /**
-     * Set document for highlighting.
-     *
-     * @param Zend_Search_Lucene_Document_Html $document
-     */
-    public function setDocument(Zend_Search_Lucene_Document_Html $document)
-    {
-        $this->_doc = $document;
-    }
-
-    /**
-     * Get document for highlighting.
-     *
-     * @return Zend_Search_Lucene_Document_Html $document
-     */
-    public function getDocument()
-    {
-        return $this->_doc;
-    }
-
-    /**
-     * Highlight specified words
-     *
-     * @param string|array $words  Words to highlight. They could be organized using the array or string.
-     */
-    public function highlight($words)
-    {
-        $color = $this->_highlightColors[$this->_currentColorIndex];
-        $this->_currentColorIndex = ($this->_currentColorIndex + 1) % count($this->_highlightColors);
-
-        $this->_doc->highlight($words, $color);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Interface.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Interface.php
deleted file mode 100644
index f12e2d3f1..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Highlighter/Interface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Search_Lucene_Search_Highlighter_Interface
-{
-    /**
-     * Set document for highlighting.
-     *
-     * @param Zend_Search_Lucene_Document_Html $document
-     */
-    public function setDocument(Zend_Search_Lucene_Document_Html $document);
-
-    /**
-     * Get document for highlighting.
-     *
-     * @return Zend_Search_Lucene_Document_Html $document
-     */
-    public function getDocument();
-
-    /**
-     * Highlight specified words (method is invoked once per subquery)
-     *
-     * @param string|array $words  Words to highlight. They could be organized using the array or string.
-     */
-    public function highlight($words);
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query.php
deleted file mode 100644
index 38ca56b28..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Search_Query
-{
-    /**
-     * query boost factor
-     *
-     * @var float
-     */
-    private $_boost = 1;
-
-    /**
-     * Query weight
-     *
-     * @var Zend_Search_Lucene_Search_Weight
-     */
-    protected $_weight = null;
-
-    /**
-     * Current highlight color
-     *
-     * @var integer
-     */
-    private $_currentColorIndex = 0;
-
-    /**
-     * Gets the boost for this clause.  Documents matching
-     * this clause will (in addition to the normal weightings) have their score
-     * multiplied by boost.   The boost is 1.0 by default.
-     *
-     * @return float
-     */
-    public function getBoost()
-    {
-        return $this->_boost;
-    }
-
-    /**
-     * Sets the boost for this query clause to $boost.
-     *
-     * @param float $boost
-     */
-    public function setBoost($boost)
-    {
-        $this->_boost = $boost;
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    abstract public function score($docId, Zend_Search_Lucene_Interface $reader);
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    abstract public function matchedDocs();
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * Query specific implementation
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    abstract public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null);
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    abstract public function createWeight(Zend_Search_Lucene_Interface $reader);
-
-    /**
-     * Constructs an initializes a Weight for a _top-level_query_.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     */
-    protected function _initWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        // Check, that it's a top-level query and query weight is not initialized yet.
-        if ($this->_weight !== null) {
-            return $this->_weight;
-        }
-
-        $this->createWeight($reader);
-        $sum = $this->_weight->sumOfSquaredWeights();
-        $queryNorm = $reader->getSimilarity()->queryNorm($sum);
-        $this->_weight->normalize($queryNorm);
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    abstract public function rewrite(Zend_Search_Lucene_Interface $index);
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    abstract public function optimize(Zend_Search_Lucene_Interface $index);
-
-    /**
-     * Reset query, so it can be reused within other queries or
-     * with other indeces
-     */
-    public function reset()
-    {
-        $this->_weight = null;
-    }
-
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    abstract public function __toString();
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    abstract public function getQueryTerms();
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    abstract protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter);
-
-    /**
-     * Highlight matches in $inputHTML
-     *
-     * @param string $inputHTML
-     * @param string  $defaultEncoding   HTML encoding, is used if it's not specified using Content-type HTTP-EQUIV meta tag.
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface|null $highlighter
-     * @return string
-     */
-    public function highlightMatches($inputHTML, $defaultEncoding = '', $highlighter = null)
-    {
-        if ($highlighter === null) {
-            require_once 'Zend/Search/Lucene/Search/Highlighter/Default.php';
-            $highlighter = new Zend_Search_Lucene_Search_Highlighter_Default();
-        }
-
-        /** Zend_Search_Lucene_Document_Html */
-        require_once 'Zend/Search/Lucene/Document/Html.php';
-
-        $doc = Zend_Search_Lucene_Document_Html::loadHTML($inputHTML, false, $defaultEncoding);
-        $highlighter->setDocument($doc);
-
-        $this->_highlightMatches($highlighter);
-
-        return $doc->getHTML();
-    }
-
-    /**
-     * Highlight matches in $inputHtmlFragment and return it (without HTML header and body tag)
-     *
-     * @param string $inputHtmlFragment
-     * @param string  $encoding   Input HTML string encoding
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface|null $highlighter
-     * @return string
-     */
-    public function htmlFragmentHighlightMatches($inputHtmlFragment, $encoding = 'UTF-8', $highlighter = null)
-    {
-        if ($highlighter === null) {
-            require_once 'Zend/Search/Lucene/Search/Highlighter/Default.php';
-            $highlighter = new Zend_Search_Lucene_Search_Highlighter_Default();
-        }
-
-        $inputHTML = '<html><head><META HTTP-EQUIV="Content-type" CONTENT="text/html; charset=UTF-8"/></head><body>'
-                   . iconv($encoding, 'UTF-8//IGNORE', $inputHtmlFragment) . '</body></html>';
-
-        /** Zend_Search_Lucene_Document_Html */
-        require_once 'Zend/Search/Lucene/Document/Html.php';
-
-        $doc = Zend_Search_Lucene_Document_Html::loadHTML($inputHTML);
-        $highlighter->setDocument($doc);
-
-        $this->_highlightMatches($highlighter);
-
-        return $doc->getHtmlBody();
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Boolean.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Boolean.php
deleted file mode 100644
index 5c5caf0f2..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Boolean.php
+++ /dev/null
@@ -1,815 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Boolean extends Zend_Search_Lucene_Search_Query
-{
-
-    /**
-     * Subqueries
-     * Array of Zend_Search_Lucene_Search_Query
-     *
-     * @var array
-     */
-    private $_subqueries = array();
-
-    /**
-     * Subqueries signs.
-     * If true then subquery is required.
-     * If false then subquery is prohibited.
-     * If null then subquery is neither prohibited, nor required
-     *
-     * If array is null then all subqueries are required
-     *
-     * @var array
-     */
-    private $_signs = array();
-
-    /**
-     * Result vector.
-     *
-     * @var array
-     */
-    private $_resVector = null;
-
-    /**
-     * A score factor based on the fraction of all query subqueries
-     * that a document contains.
-     * float for conjunction queries
-     * array of float for non conjunction queries
-     *
-     * @var mixed
-     */
-    private $_coord = null;
-
-
-    /**
-     * Class constructor.  Create a new Boolean query object.
-     *
-     * if $signs array is omitted then all subqueries are required
-     * it differs from addSubquery() behavior, but should never be used
-     *
-     * @param array $subqueries    Array of Zend_Search_Search_Query objects
-     * @param array $signs    Array of signs.  Sign is boolean|null.
-     * @return void
-     */
-    public function __construct($subqueries = null, $signs = null)
-    {
-        if (is_array($subqueries)) {
-            $this->_subqueries = $subqueries;
-
-            $this->_signs = null;
-            // Check if all subqueries are required
-            if (is_array($signs)) {
-                foreach ($signs as $sign ) {
-                    if ($sign !== true) {
-                        $this->_signs = $signs;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Add a $subquery (Zend_Search_Lucene_Search_Query) to this query.
-     *
-     * The sign is specified as:
-     *     TRUE  - subquery is required
-     *     FALSE - subquery is prohibited
-     *     NULL  - subquery is neither prohibited, nor required
-     *
-     * @param  Zend_Search_Lucene_Search_Query $subquery
-     * @param  boolean|null $sign
-     * @return void
-     */
-    public function addSubquery(Zend_Search_Lucene_Search_Query $subquery, $sign=null) {
-        if ($sign !== true || $this->_signs !== null) {       // Skip, if all subqueries are required
-            if ($this->_signs === null) {                     // Check, If all previous subqueries are required
-                $this->_signs = array();
-                foreach ($this->_subqueries as $prevSubquery) {
-                    $this->_signs[] = true;
-                }
-            }
-            $this->_signs[] = $sign;
-        }
-
-        $this->_subqueries[] = $subquery;
-    }
-
-    /**
-     * Re-write queries into primitive queries
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        $query = new Zend_Search_Lucene_Search_Query_Boolean();
-        $query->setBoost($this->getBoost());
-
-        foreach ($this->_subqueries as $subqueryId => $subquery) {
-            $query->addSubquery($subquery->rewrite($index),
-                                ($this->_signs === null)?  true : $this->_signs[$subqueryId]);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        $subqueries = array();
-        $signs      = array();
-
-        // Optimize all subqueries
-        foreach ($this->_subqueries as $id => $subquery) {
-            $subqueries[] = $subquery->optimize($index);
-            $signs[]      = ($this->_signs === null)? true : $this->_signs[$id];
-        }
-
-        // Remove insignificant subqueries
-        foreach ($subqueries as $id => $subquery) {
-            if ($subquery instanceof Zend_Search_Lucene_Search_Query_Insignificant) {
-                // Insignificant subquery has to be removed anyway
-                unset($subqueries[$id]);
-                unset($signs[$id]);
-            }
-        }
-        if (count($subqueries) == 0) {
-            // Boolean query doesn't has non-insignificant subqueries
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-        // Check if all non-insignificant subqueries are prohibited
-        $allProhibited = true;
-        foreach ($signs as $sign) {
-            if ($sign !== false) {
-                $allProhibited = false;
-                break;
-            }
-        }
-        if ($allProhibited) {
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-
-
-        // Check for empty subqueries
-        foreach ($subqueries as $id => $subquery) {
-            if ($subquery instanceof Zend_Search_Lucene_Search_Query_Empty) {
-                if ($signs[$id] === true) {
-                    // Matching is required, but is actually empty
-                    require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-                    return new Zend_Search_Lucene_Search_Query_Empty();
-                } else {
-                    // Matching is optional or prohibited, but is empty
-                    // Remove it from subqueries and signs list
-                    unset($subqueries[$id]);
-                    unset($signs[$id]);
-                }
-            }
-        }
-
-        // Check, if reduced subqueries list is empty
-        if (count($subqueries) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-        // Check if all non-empty subqueries are prohibited
-        $allProhibited = true;
-        foreach ($signs as $sign) {
-            if ($sign !== false) {
-                $allProhibited = false;
-                break;
-            }
-        }
-        if ($allProhibited) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-
-        // Check, if reduced subqueries list has only one entry
-        if (count($subqueries) == 1) {
-            // It's a query with only one required or optional clause
-            // (it's already checked, that it's not a prohibited clause)
-
-            if ($this->getBoost() == 1) {
-                return reset($subqueries);
-            }
-
-            $optimizedQuery = clone reset($subqueries);
-            $optimizedQuery->setBoost($optimizedQuery->getBoost()*$this->getBoost());
-
-            return $optimizedQuery;
-        }
-
-
-        // Prepare first candidate for optimized query
-        $optimizedQuery = new Zend_Search_Lucene_Search_Query_Boolean($subqueries, $signs);
-        $optimizedQuery->setBoost($this->getBoost());
-
-
-        $terms        = array();
-        $tsigns       = array();
-        $boostFactors = array();
-
-        // Try to decompose term and multi-term subqueries
-        foreach ($subqueries as $id => $subquery) {
-            if ($subquery instanceof Zend_Search_Lucene_Search_Query_Term) {
-                $terms[]        = $subquery->getTerm();
-                $tsigns[]       = $signs[$id];
-                $boostFactors[] = $subquery->getBoost();
-
-                // remove subquery from a subqueries list
-                unset($subqueries[$id]);
-                unset($signs[$id]);
-           } else if ($subquery instanceof Zend_Search_Lucene_Search_Query_MultiTerm) {
-                $subTerms = $subquery->getTerms();
-                $subSigns = $subquery->getSigns();
-
-                if ($signs[$id] === true) {
-                    // It's a required multi-term subquery.
-                    // Something like '... +(+term1 -term2 term3 ...) ...'
-
-                    // Multi-term required subquery can be decomposed only if it contains
-                    // required terms and doesn't contain prohibited terms:
-                    // ... +(+term1 term2 ...) ... => ... +term1 term2 ...
-                    //
-                    // Check this
-                    $hasRequired   = false;
-                    $hasProhibited = false;
-                    if ($subSigns === null) {
-                        // All subterms are required
-                        $hasRequired = true;
-                    } else {
-                        foreach ($subSigns as $sign) {
-                            if ($sign === true) {
-                                $hasRequired   = true;
-                            } else if ($sign === false) {
-                                $hasProhibited = true;
-                                break;
-                            }
-                        }
-                    }
-                    // Continue if subquery has prohibited terms or doesn't have required terms
-                    if ($hasProhibited  ||  !$hasRequired) {
-                        continue;
-                    }
-
-                    foreach ($subTerms as $termId => $term) {
-                        $terms[]        = $term;
-                        $tsigns[]       = ($subSigns === null)? true : $subSigns[$termId];
-                        $boostFactors[] = $subquery->getBoost();
-                    }
-
-                    // remove subquery from a subqueries list
-                    unset($subqueries[$id]);
-                    unset($signs[$id]);
-
-                } else { // $signs[$id] === null  ||  $signs[$id] === false
-                    // It's an optional or prohibited multi-term subquery.
-                    // Something like '... (+term1 -term2 term3 ...) ...'
-                    // or
-                    // something like '... -(+term1 -term2 term3 ...) ...'
-
-                    // Multi-term optional and required subqueries can be decomposed
-                    // only if all terms are optional.
-                    //
-                    // Check if all terms are optional.
-                    $onlyOptional = true;
-                    if ($subSigns === null) {
-                        // All subterms are required
-                        $onlyOptional = false;
-                    } else {
-                        foreach ($subSigns as $sign) {
-                            if ($sign !== null) {
-                                $onlyOptional = false;
-                                break;
-                            }
-                        }
-                    }
-
-                    // Continue if non-optional terms are presented in this multi-term subquery
-                    if (!$onlyOptional) {
-                        continue;
-                    }
-
-                    foreach ($subTerms as $termId => $term) {
-                        $terms[]  = $term;
-                        $tsigns[] = ($signs[$id] === null)? null  /* optional */ :
-                                                            false /* prohibited */;
-                        $boostFactors[] = $subquery->getBoost();
-                    }
-
-                    // remove subquery from a subqueries list
-                    unset($subqueries[$id]);
-                    unset($signs[$id]);
-                }
-            }
-        }
-
-
-        // Check, if there are no decomposed subqueries
-        if (count($terms) == 0 ) {
-            // return prepared candidate
-            return $optimizedQuery;
-        }
-
-
-        // Check, if all subqueries have been decomposed and all terms has the same boost factor
-        if (count($subqueries) == 0  &&  count(array_unique($boostFactors)) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $optimizedQuery = new Zend_Search_Lucene_Search_Query_MultiTerm($terms, $tsigns);
-            $optimizedQuery->setBoost(reset($boostFactors)*$this->getBoost());
-
-            return $optimizedQuery;
-        }
-
-
-        // This boolean query can't be transformed to Term/MultiTerm query and still contains
-        // several subqueries
-
-        // Separate prohibited terms
-        $prohibitedTerms        = array();
-        foreach ($terms as $id => $term) {
-            if ($tsigns[$id] === false) {
-                $prohibitedTerms[]        = $term;
-
-                unset($terms[$id]);
-                unset($tsigns[$id]);
-                unset($boostFactors[$id]);
-            }
-        }
-
-        if (count($terms) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $clause = new Zend_Search_Lucene_Search_Query_Term(reset($terms));
-            $clause->setBoost(reset($boostFactors));
-
-            $subqueries[] = $clause;
-            $signs[]      = reset($tsigns);
-
-            // Clear terms list
-            $terms = array();
-        } else if (count($terms) > 1  &&  count(array_unique($boostFactors)) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $clause = new Zend_Search_Lucene_Search_Query_MultiTerm($terms, $tsigns);
-            $clause->setBoost(reset($boostFactors));
-
-            $subqueries[] = $clause;
-            // Clause sign is 'required' if clause contains required terms. 'Optional' otherwise.
-            $signs[]      = (in_array(true, $tsigns))? true : null;
-
-            // Clear terms list
-            $terms = array();
-        }
-
-        if (count($prohibitedTerms) == 1) {
-            // (boost factors are not significant for prohibited clauses)
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $subqueries[] = new Zend_Search_Lucene_Search_Query_Term(reset($prohibitedTerms));
-            $signs[]      = false;
-
-            // Clear prohibited terms list
-            $prohibitedTerms = array();
-        } else if (count($prohibitedTerms) > 1) {
-            // prepare signs array
-            $prohibitedSigns = array();
-            foreach ($prohibitedTerms as $id => $term) {
-                // all prohibited term are grouped as optional into multi-term query
-                $prohibitedSigns[$id] = null;
-            }
-
-            // (boost factors are not significant for prohibited clauses)
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $subqueries[] = new Zend_Search_Lucene_Search_Query_MultiTerm($prohibitedTerms, $prohibitedSigns);
-            // Clause sign is 'prohibited'
-            $signs[]      = false;
-
-            // Clear terms list
-            $prohibitedTerms = array();
-        }
-
-        /** @todo Group terms with the same boost factors together */
-
-        // Check, that all terms are processed
-        // Replace candidate for optimized query
-        if (count($terms) == 0  &&  count($prohibitedTerms) == 0) {
-            $optimizedQuery = new Zend_Search_Lucene_Search_Query_Boolean($subqueries, $signs);
-            $optimizedQuery->setBoost($this->getBoost());
-        }
-
-        return $optimizedQuery;
-    }
-
-    /**
-     * Returns subqueries
-     *
-     * @return array
-     */
-    public function getSubqueries()
-    {
-        return $this->_subqueries;
-    }
-
-
-    /**
-     * Return subqueries signs
-     *
-     * @return array
-     */
-    public function getSigns()
-    {
-        return $this->_signs;
-    }
-
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/Boolean.php';
-        $this->_weight = new Zend_Search_Lucene_Search_Weight_Boolean($this, $reader);
-        return $this->_weight;
-    }
-
-
-    /**
-     * Calculate result vector for Conjunction query
-     * (like '<subquery1> AND <subquery2> AND <subquery3>')
-     */
-    private function _calculateConjunctionResult()
-    {
-        $this->_resVector = null;
-
-        if (count($this->_subqueries) == 0) {
-            $this->_resVector = array();
-        }
-
-        $resVectors      = array();
-        $resVectorsSizes = array();
-        $resVectorsIds   = array(); // is used to prevent arrays comparison
-        foreach ($this->_subqueries as $subqueryId => $subquery) {
-            $resVectors[]      = $subquery->matchedDocs();
-            $resVectorsSizes[] = count(end($resVectors));
-            $resVectorsIds[]   = $subqueryId;
-        }
-        // sort resvectors in order of subquery cardinality increasing
-        array_multisort($resVectorsSizes, SORT_ASC, SORT_NUMERIC,
-                        $resVectorsIds,   SORT_ASC, SORT_NUMERIC,
-                        $resVectors);
-
-        foreach ($resVectors as $nextResVector) {
-            if($this->_resVector === null) {
-                $this->_resVector = $nextResVector;
-            } else {
-                //$this->_resVector = array_intersect_key($this->_resVector, $nextResVector);
-
-                /**
-                 * This code is used as workaround for array_intersect_key() slowness problem.
-                 */
-                $updatedVector = array();
-                foreach ($this->_resVector as $id => $value) {
-                    if (isset($nextResVector[$id])) {
-                        $updatedVector[$id] = $value;
-                    }
-                }
-                $this->_resVector = $updatedVector;
-            }
-
-            if (count($this->_resVector) == 0) {
-                // Empty result set, we don't need to check other terms
-                break;
-            }
-        }
-
-        // ksort($this->_resVector, SORT_NUMERIC);
-        // Used algorithm doesn't change elements order
-    }
-
-
-    /**
-     * Calculate result vector for non Conjunction query
-     * (like '<subquery1> AND <subquery2> AND NOT <subquery3> OR <subquery4>')
-     */
-    private function _calculateNonConjunctionResult()
-    {
-        $requiredVectors      = array();
-        $requiredVectorsSizes = array();
-        $requiredVectorsIds   = array(); // is used to prevent arrays comparison
-
-        $optional = array();
-
-        foreach ($this->_subqueries as $subqueryId => $subquery) {
-            if ($this->_signs[$subqueryId] === true) {
-                // required
-                $requiredVectors[]      = $subquery->matchedDocs();
-                $requiredVectorsSizes[] = count(end($requiredVectors));
-                $requiredVectorsIds[]   = $subqueryId;
-            } elseif ($this->_signs[$subqueryId] === false) {
-                // prohibited
-                // Do nothing. matchedDocs() may include non-matching id's
-                // Calculating prohibited vector may take significant time, but do not affect the result
-                // Skipped.
-            } else {
-                // neither required, nor prohibited
-                // array union
-                $optional += $subquery->matchedDocs();
-            }
-        }
-
-        // sort resvectors in order of subquery cardinality increasing
-        array_multisort($requiredVectorsSizes, SORT_ASC, SORT_NUMERIC,
-                        $requiredVectorsIds,   SORT_ASC, SORT_NUMERIC,
-                        $requiredVectors);
-
-        $required = null;
-        foreach ($requiredVectors as $nextResVector) {
-            if($required === null) {
-                $required = $nextResVector;
-            } else {
-                //$required = array_intersect_key($required, $nextResVector);
-
-                /**
-                 * This code is used as workaround for array_intersect_key() slowness problem.
-                 */
-                $updatedVector = array();
-                foreach ($required as $id => $value) {
-                    if (isset($nextResVector[$id])) {
-                        $updatedVector[$id] = $value;
-                    }
-                }
-                $required = $updatedVector;
-            }
-
-            if (count($required) == 0) {
-                // Empty result set, we don't need to check other terms
-                break;
-            }
-        }
-
-
-        if ($required !== null) {
-            $this->_resVector = &$required;
-        } else {
-            $this->_resVector = &$optional;
-        }
-
-        ksort($this->_resVector, SORT_NUMERIC);
-    }
-
-
-    /**
-     * Score calculator for conjunction queries (all subqueries are required)
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function _conjunctionScore($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if ($this->_coord === null) {
-            $this->_coord = $reader->getSimilarity()->coord(count($this->_subqueries),
-                                                            count($this->_subqueries) );
-        }
-
-        $score = 0;
-
-        foreach ($this->_subqueries as $subquery) {
-            $subscore = $subquery->score($docId, $reader);
-
-            if ($subscore == 0) {
-                return 0;
-            }
-
-            $score += $subquery->score($docId, $reader) * $this->_coord;
-        }
-
-        return $score * $this->_coord * $this->getBoost();
-    }
-
-
-    /**
-     * Score calculator for non conjunction queries (not all subqueries are required)
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function _nonConjunctionScore($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if ($this->_coord === null) {
-            $this->_coord = array();
-
-            $maxCoord = 0;
-            foreach ($this->_signs as $sign) {
-                if ($sign !== false /* not prohibited */) {
-                    $maxCoord++;
-                }
-            }
-
-            for ($count = 0; $count <= $maxCoord; $count++) {
-                $this->_coord[$count] = $reader->getSimilarity()->coord($count, $maxCoord);
-            }
-        }
-
-        $score = 0;
-        $matchedSubqueries = 0;
-        foreach ($this->_subqueries as $subqueryId => $subquery) {
-            $subscore = $subquery->score($docId, $reader);
-
-            // Prohibited
-            if ($this->_signs[$subqueryId] === false && $subscore != 0) {
-                return 0;
-            }
-
-            // is required, but doen't match
-            if ($this->_signs[$subqueryId] === true &&  $subscore == 0) {
-                return 0;
-            }
-
-            if ($subscore != 0) {
-                $matchedSubqueries++;
-                $score += $subscore;
-            }
-        }
-
-        return $score * $this->_coord[$matchedSubqueries] * $this->getBoost();
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        // Initialize weight if it's not done yet
-        $this->_initWeight($reader);
-
-        if ($docsFilter === null) {
-            // Create local documents filter if it's not provided by upper query
-            require_once 'Zend/Search/Lucene/Index/DocsFilter.php';
-            $docsFilter = new Zend_Search_Lucene_Index_DocsFilter();
-        }
-
-        foreach ($this->_subqueries as $subqueryId => $subquery) {
-            if ($this->_signs == null  ||  $this->_signs[$subqueryId] === true) {
-                // Subquery is required
-                $subquery->execute($reader, $docsFilter);
-            } else {
-                $subquery->execute($reader);
-            }
-        }
-
-        if ($this->_signs === null) {
-            $this->_calculateConjunctionResult();
-        } else {
-            $this->_calculateNonConjunctionResult();
-        }
-    }
-
-
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return $this->_resVector;
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if (isset($this->_resVector[$docId])) {
-            if ($this->_signs === null) {
-                return $this->_conjunctionScore($docId, $reader);
-            } else {
-                return $this->_nonConjunctionScore($docId, $reader);
-            }
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        $terms = array();
-
-        foreach ($this->_subqueries as $id => $subquery) {
-            if ($this->_signs === null  ||  $this->_signs[$id] !== false) {
-                $terms = array_merge($terms, $subquery->getQueryTerms());
-            }
-        }
-
-        return $terms;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        foreach ($this->_subqueries as $id => $subquery) {
-            if ($this->_signs === null  ||  $this->_signs[$id] !== false) {
-                $subquery->_highlightMatches($highlighter);
-            }
-        }
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-
-        $query = '';
-
-        foreach ($this->_subqueries as $id => $subquery) {
-            if ($id != 0) {
-                $query .= ' ';
-            }
-
-            if ($this->_signs === null || $this->_signs[$id] === true) {
-                $query .= '+';
-            } else if ($this->_signs[$id] === false) {
-                $query .= '-';
-            }
-
-            $query .= '(' . $subquery->__toString() . ')';
-        }
-
-        if ($this->getBoost() != 1) {
-            $query = '(' . $query . ')^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Empty.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Empty.php
deleted file mode 100644
index 3f24299ca..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Empty.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Empty extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        return $this;
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        // "Empty" query is a primitive query and don't need to be optimized
-        return $this;
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/Empty.php';
-        return new Zend_Search_Lucene_Search_Weight_Empty();
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        // Do nothing
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return array();
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        return 0;
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        return array();
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        // Do nothing
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '<EmptyQuery>';
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Fuzzy.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
deleted file mode 100644
index 59658338a..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Fuzzy.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Fuzzy extends Zend_Search_Lucene_Search_Query
-{
-    /** Default minimum similarity */
-    const DEFAULT_MIN_SIMILARITY = 0.5;
-
-    /**
-     * Maximum number of matched terms.
-     * Apache Lucene defines this limitation as boolean query maximum number of clauses:
-     * org.apache.lucene.search.BooleanQuery.getMaxClauseCount()
-     */
-    const MAX_CLAUSE_COUNT = 1024;
-
-    /**
-     * Array of precalculated max distances
-     *
-     * keys are integers representing a word size
-     */
-    private $_maxDistances = array();
-
-    /**
-     * Base searching term.
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_term;
-
-    /**
-     * A value between 0 and 1 to set the required similarity
-     *  between the query term and the matching terms. For example, for a
-     *  _minimumSimilarity of 0.5 a term of the same length
-     *  as the query term is considered similar to the query term if the edit distance
-     *  between both terms is less than length(term)*0.5
-     *
-     * @var float
-     */
-    private $_minimumSimilarity;
-
-    /**
-     * The length of common (non-fuzzy) prefix
-     *
-     * @var integer
-     */
-    private $_prefixLength;
-
-    /**
-     * Matched terms.
-     *
-     * Matched terms list.
-     * It's filled during the search (rewrite operation) and may be used for search result
-     * post-processing
-     *
-     * Array of Zend_Search_Lucene_Index_Term objects
-     *
-     * @var array
-     */
-    private $_matches = null;
-
-    /**
-     * Matched terms scores
-     *
-     * @var array
-     */
-    private $_scores = null;
-
-    /**
-     * Array of the term keys.
-     * Used to sort terms in alphabetical order if terms have the same socres
-     *
-     * @var array
-     */
-    private $_termKeys = null;
-
-    /**
-     * Default non-fuzzy prefix length
-     *
-     * @var integer
-     */
-    private static $_defaultPrefixLength = 3;
-
-    /**
-     * Zend_Search_Lucene_Search_Query_Wildcard constructor.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param float   $minimumSimilarity
-     * @param integer $prefixLength
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct(Zend_Search_Lucene_Index_Term $term, $minimumSimilarity = self::DEFAULT_MIN_SIMILARITY, $prefixLength = null)
-    {
-        if ($minimumSimilarity < 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('minimumSimilarity cannot be less than 0');
-        }
-        if ($minimumSimilarity >= 1) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('minimumSimilarity cannot be greater than or equal to 1');
-        }
-        if ($prefixLength < 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('prefixLength cannot be less than 0');
-        }
-
-        $this->_term              = $term;
-        $this->_minimumSimilarity = $minimumSimilarity;
-        $this->_prefixLength      = ($prefixLength !== null)? $prefixLength : self::$_defaultPrefixLength;
-    }
-
-    /**
-     * Get default non-fuzzy prefix length
-     *
-     * @return integer
-     */
-    public static function getDefaultPrefixLength()
-    {
-        return self::$_defaultPrefixLength;
-    }
-
-    /**
-     * Set default non-fuzzy prefix length
-     *
-     * @param integer $defaultPrefixLength
-     */
-    public static function setDefaultPrefixLength($defaultPrefixLength)
-    {
-        self::$_defaultPrefixLength = $defaultPrefixLength;
-    }
-
-    /**
-     * Calculate maximum distance for specified word length
-     *
-     * @param integer $prefixLength
-     * @param integer $termLength
-     * @param integer $length
-     * @return integer
-     */
-    private function _calculateMaxDistance($prefixLength, $termLength, $length)
-    {
-        $this->_maxDistances[$length] = (int) ((1 - $this->_minimumSimilarity)*(min($termLength, $length) + $prefixLength));
-        return $this->_maxDistances[$length];
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        $this->_matches  = array();
-        $this->_scores   = array();
-        $this->_termKeys = array();
-
-        if ($this->_term->field === null) {
-            // Search through all fields
-            $fields = $index->getFieldNames(true /* indexed fields list */);
-        } else {
-            $fields = array($this->_term->field);
-        }
-
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        $prefix           = Zend_Search_Lucene_Index_Term::getPrefix($this->_term->text, $this->_prefixLength);
-        $prefixByteLength = strlen($prefix);
-        $prefixUtf8Length = Zend_Search_Lucene_Index_Term::getLength($prefix);
-
-        $termLength       = Zend_Search_Lucene_Index_Term::getLength($this->_term->text);
-
-        $termRest         = substr($this->_term->text, $prefixByteLength);
-        // we calculate length of the rest in bytes since levenshtein() is not UTF-8 compatible
-        $termRestLength   = strlen($termRest);
-
-        $scaleFactor = 1/(1 - $this->_minimumSimilarity);
-
-        require_once 'Zend/Search/Lucene.php';
-        $maxTerms = Zend_Search_Lucene::getTermsPerQueryLimit();
-        foreach ($fields as $field) {
-            $index->resetTermsStream();
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            if ($prefix != '') {
-                $index->skipTo(new Zend_Search_Lucene_Index_Term($prefix, $field));
-
-                while ($index->currentTerm() !== null          &&
-                       $index->currentTerm()->field == $field  &&
-                       substr($index->currentTerm()->text, 0, $prefixByteLength) == $prefix) {
-                    // Calculate similarity
-                    $target = substr($index->currentTerm()->text, $prefixByteLength);
-
-                    $maxDistance = isset($this->_maxDistances[strlen($target)])?
-                                       $this->_maxDistances[strlen($target)] :
-                                       $this->_calculateMaxDistance($prefixUtf8Length, $termRestLength, strlen($target));
-
-                    if ($termRestLength == 0) {
-                        // we don't have anything to compare.  That means if we just add
-                        // the letters for current term we get the new word
-                        $similarity = (($prefixUtf8Length == 0)? 0 : 1 - strlen($target)/$prefixUtf8Length);
-                    } else if (strlen($target) == 0) {
-                        $similarity = (($prefixUtf8Length == 0)? 0 : 1 - $termRestLength/$prefixUtf8Length);
-                    } else if ($maxDistance < abs($termRestLength - strlen($target))){
-                        //just adding the characters of term to target or vice-versa results in too many edits
-                        //for example "pre" length is 3 and "prefixes" length is 8.  We can see that
-                        //given this optimal circumstance, the edit distance cannot be less than 5.
-                        //which is 8-3 or more precisesly abs(3-8).
-                        //if our maximum edit distance is 4, then we can discard this word
-                        //without looking at it.
-                        $similarity = 0;
-                    } else {
-                        $similarity = 1 - levenshtein($termRest, $target)/($prefixUtf8Length + min($termRestLength, strlen($target)));
-                    }
-
-                    if ($similarity > $this->_minimumSimilarity) {
-                        $this->_matches[]  = $index->currentTerm();
-                        $this->_termKeys[] = $index->currentTerm()->key();
-                        $this->_scores[]   = ($similarity - $this->_minimumSimilarity)*$scaleFactor;
-
-                        if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                            require_once 'Zend/Search/Lucene/Exception.php';
-                            throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                        }
-                    }
-
-                    $index->nextTerm();
-                }
-            } else {
-                $index->skipTo(new Zend_Search_Lucene_Index_Term('', $field));
-
-                while ($index->currentTerm() !== null  &&  $index->currentTerm()->field == $field) {
-                    // Calculate similarity
-                    $target = $index->currentTerm()->text;
-
-                    $maxDistance = isset($this->_maxDistances[strlen($target)])?
-                                       $this->_maxDistances[strlen($target)] :
-                                       $this->_calculateMaxDistance(0, $termRestLength, strlen($target));
-
-                    if ($maxDistance < abs($termRestLength - strlen($target))){
-                        //just adding the characters of term to target or vice-versa results in too many edits
-                        //for example "pre" length is 3 and "prefixes" length is 8.  We can see that
-                        //given this optimal circumstance, the edit distance cannot be less than 5.
-                        //which is 8-3 or more precisesly abs(3-8).
-                        //if our maximum edit distance is 4, then we can discard this word
-                        //without looking at it.
-                        $similarity = 0;
-                    } else {
-                        $similarity = 1 - levenshtein($termRest, $target)/min($termRestLength, strlen($target));
-                    }
-
-                    if ($similarity > $this->_minimumSimilarity) {
-                        $this->_matches[]  = $index->currentTerm();
-                        $this->_termKeys[] = $index->currentTerm()->key();
-                        $this->_scores[]   = ($similarity - $this->_minimumSimilarity)*$scaleFactor;
-
-                        if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                            require_once 'Zend/Search/Lucene/Exception.php';
-                            throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                        }
-                    }
-
-                    $index->nextTerm();
-                }
-            }
-
-            $index->closeTermsStream();
-        }
-
-        if (count($this->_matches) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        } else if (count($this->_matches) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            return new Zend_Search_Lucene_Search_Query_Term(reset($this->_matches));
-        } else {
-            require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-            $rewrittenQuery = new Zend_Search_Lucene_Search_Query_Boolean();
-
-            array_multisort($this->_scores,   SORT_DESC, SORT_NUMERIC,
-                            $this->_termKeys, SORT_ASC,  SORT_STRING,
-                            $this->_matches);
-
-            $termCount = 0;
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            foreach ($this->_matches as $id => $matchedTerm) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Term($matchedTerm);
-                $subquery->setBoost($this->_scores[$id]);
-
-                $rewrittenQuery->addSubquery($subquery);
-
-                $termCount++;
-                if ($termCount >= self::MAX_CLAUSE_COUNT) {
-                    break;
-                }
-            }
-
-            return $rewrittenQuery;
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Fuzzy query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getQueryTerms()
-    {
-        if ($this->_matches === null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Search or rewrite operations have to be performed before.');
-        }
-
-        return $this->_matches;
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Fuzzy query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Fuzzy query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function matchedDocs()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Fuzzy query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Fuzzy query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $words = array();
-
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        $prefix           = Zend_Search_Lucene_Index_Term::getPrefix($this->_term->text, $this->_prefixLength);
-        $prefixByteLength = strlen($prefix);
-        $prefixUtf8Length = Zend_Search_Lucene_Index_Term::getLength($prefix);
-
-        $termLength       = Zend_Search_Lucene_Index_Term::getLength($this->_term->text);
-
-        $termRest         = substr($this->_term->text, $prefixByteLength);
-        // we calculate length of the rest in bytes since levenshtein() is not UTF-8 compatible
-        $termRestLength   = strlen($termRest);
-
-        $scaleFactor = 1/(1 - $this->_minimumSimilarity);
-
-        $docBody = $highlighter->getDocument()->getFieldUtf8Value('body');
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($docBody, 'UTF-8');
-        foreach ($tokens as $token) {
-            $termText = $token->getTermText();
-
-            if (substr($termText, 0, $prefixByteLength) == $prefix) {
-                // Calculate similarity
-                $target = substr($termText, $prefixByteLength);
-
-                $maxDistance = isset($this->_maxDistances[strlen($target)])?
-                                   $this->_maxDistances[strlen($target)] :
-                                   $this->_calculateMaxDistance($prefixUtf8Length, $termRestLength, strlen($target));
-
-                if ($termRestLength == 0) {
-                    // we don't have anything to compare.  That means if we just add
-                    // the letters for current term we get the new word
-                    $similarity = (($prefixUtf8Length == 0)? 0 : 1 - strlen($target)/$prefixUtf8Length);
-                } else if (strlen($target) == 0) {
-                    $similarity = (($prefixUtf8Length == 0)? 0 : 1 - $termRestLength/$prefixUtf8Length);
-                } else if ($maxDistance < abs($termRestLength - strlen($target))){
-                    //just adding the characters of term to target or vice-versa results in too many edits
-                    //for example "pre" length is 3 and "prefixes" length is 8.  We can see that
-                    //given this optimal circumstance, the edit distance cannot be less than 5.
-                    //which is 8-3 or more precisesly abs(3-8).
-                    //if our maximum edit distance is 4, then we can discard this word
-                    //without looking at it.
-                    $similarity = 0;
-                } else {
-                    $similarity = 1 - levenshtein($termRest, $target)/($prefixUtf8Length + min($termRestLength, strlen($target)));
-                }
-
-                if ($similarity > $this->_minimumSimilarity) {
-                    $words[] = $termText;
-                }
-            }
-        }
-
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        return (($this->_term->field === null)? '' : $this->_term->field . ':')
-             . $this->_term->text . '~'
-             . (($this->_minimumSimilarity != self::DEFAULT_MIN_SIMILARITY)? round($this->_minimumSimilarity, 4) : '')
-             . (($this->getBoost() != 1)? '^' . round($this->getBoost(), 4) : '');
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Insignificant.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Insignificant.php
deleted file mode 100644
index 3f7153ec8..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Insignificant.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Insignificant.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * The insignificant query returns empty result, but doesn't limit result set as a part of other queries
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Insignificant extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        return $this;
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        return $this;
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/Empty.php';
-        return new Zend_Search_Lucene_Search_Weight_Empty();
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        // Do nothing
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return array();
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        return 0;
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        return array();
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        // Do nothing
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '<InsignificantQuery>';
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/MultiTerm.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
deleted file mode 100644
index d5d9cb562..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/MultiTerm.php
+++ /dev/null
@@ -1,668 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_MultiTerm extends Zend_Search_Lucene_Search_Query
-{
-
-    /**
-     * Terms to find.
-     * Array of Zend_Search_Lucene_Index_Term
-     *
-     * @var array
-     */
-    private $_terms = array();
-
-    /**
-     * Term signs.
-     * If true then term is required.
-     * If false then term is prohibited.
-     * If null then term is neither prohibited, nor required
-     *
-     * If array is null then all terms are required
-     *
-     * @var array
-     */
-    private $_signs;
-
-    /**
-     * Result vector.
-     *
-     * @var array
-     */
-    private $_resVector = null;
-
-    /**
-     * Terms positions vectors.
-     * Array of Arrays:
-     * term1Id => (docId => freq, ...)
-     * term2Id => (docId => freq, ...)
-     *
-     * @var array
-     */
-    private $_termsFreqs = array();
-
-
-    /**
-     * A score factor based on the fraction of all query terms
-     * that a document contains.
-     * float for conjunction queries
-     * array of float for non conjunction queries
-     *
-     * @var mixed
-     */
-    private $_coord = null;
-
-
-    /**
-     * Terms weights
-     * array of Zend_Search_Lucene_Search_Weight
-     *
-     * @var array
-     */
-    private $_weights = array();
-
-
-    /**
-     * Class constructor.  Create a new multi-term query object.
-     *
-     * if $signs array is omitted then all terms are required
-     * it differs from addTerm() behavior, but should never be used
-     *
-     * @param array $terms    Array of Zend_Search_Lucene_Index_Term objects
-     * @param array $signs    Array of signs.  Sign is boolean|null.
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($terms = null, $signs = null)
-    {
-        if (is_array($terms)) {
-            require_once 'Zend/Search/Lucene.php';
-            if (count($terms) > Zend_Search_Lucene::getTermsPerQueryLimit()) {
-                throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-            }
-
-            $this->_terms = $terms;
-
-            $this->_signs = null;
-            // Check if all terms are required
-            if (is_array($signs)) {
-                foreach ($signs as $sign ) {
-                    if ($sign !== true) {
-                        $this->_signs = $signs;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Add a $term (Zend_Search_Lucene_Index_Term) to this query.
-     *
-     * The sign is specified as:
-     *     TRUE  - term is required
-     *     FALSE - term is prohibited
-     *     NULL  - term is neither prohibited, nor required
-     *
-     * @param  Zend_Search_Lucene_Index_Term $term
-     * @param  boolean|null $sign
-     * @return void
-     */
-    public function addTerm(Zend_Search_Lucene_Index_Term $term, $sign = null) {
-        if ($sign !== true || $this->_signs !== null) {       // Skip, if all terms are required
-            if ($this->_signs === null) {                     // Check, If all previous terms are required
-                $this->_signs = array();
-                foreach ($this->_terms as $prevTerm) {
-                    $this->_signs[] = true;
-                }
-            }
-            $this->_signs[] = $sign;
-        }
-
-        $this->_terms[] = $term;
-    }
-
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        if (count($this->_terms) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-        // Check, that all fields are qualified
-        $allQualified = true;
-        foreach ($this->_terms as $term) {
-            if ($term->field === null) {
-                $allQualified = false;
-                break;
-            }
-        }
-
-        if ($allQualified) {
-            return $this;
-        } else {
-            /** transform multiterm query to boolean and apply rewrite() method to subqueries. */
-            require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-            $query = new Zend_Search_Lucene_Search_Query_Boolean();
-            $query->setBoost($this->getBoost());
-
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            foreach ($this->_terms as $termId => $term) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Term($term);
-
-                $query->addSubquery($subquery->rewrite($index),
-                                    ($this->_signs === null)?  true : $this->_signs[$termId]);
-            }
-
-            return $query;
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        $terms = $this->_terms;
-        $signs = $this->_signs;
-
-        foreach ($terms as $id => $term) {
-            if (!$index->hasTerm($term)) {
-                if ($signs === null  ||  $signs[$id] === true) {
-                    // Term is required
-                    require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-                    return new Zend_Search_Lucene_Search_Query_Empty();
-                } else {
-                    // Term is optional or prohibited
-                    // Remove it from terms and signs list
-                    unset($terms[$id]);
-                    unset($signs[$id]);
-                }
-            }
-        }
-
-        // Check if all presented terms are prohibited
-        $allProhibited = true;
-        if ($signs === null) {
-            $allProhibited = false;
-        } else {
-            foreach ($signs as $sign) {
-                if ($sign !== false) {
-                    $allProhibited = false;
-                    break;
-                }
-            }
-        }
-        if ($allProhibited) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-        /**
-         * @todo make an optimization for repeated terms
-         * (they may have different signs)
-         */
-
-        if (count($terms) == 1) {
-            // It's already checked, that it's not a prohibited term
-
-            // It's one term query with one required or optional element
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $optimizedQuery = new Zend_Search_Lucene_Search_Query_Term(reset($terms));
-            $optimizedQuery->setBoost($this->getBoost());
-
-            return $optimizedQuery;
-        }
-
-        if (count($terms) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-        $optimizedQuery = new Zend_Search_Lucene_Search_Query_MultiTerm($terms, $signs);
-        $optimizedQuery->setBoost($this->getBoost());
-        return $optimizedQuery;
-    }
-
-
-    /**
-     * Returns query term
-     *
-     * @return array
-     */
-    public function getTerms()
-    {
-        return $this->_terms;
-    }
-
-
-    /**
-     * Return terms signs
-     *
-     * @return array
-     */
-    public function getSigns()
-    {
-        return $this->_signs;
-    }
-
-
-    /**
-     * Set weight for specified term
-     *
-     * @param integer $num
-     * @param Zend_Search_Lucene_Search_Weight_Term $weight
-     */
-    public function setWeight($num, $weight)
-    {
-        $this->_weights[$num] = $weight;
-    }
-
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/MultiTerm.php';
-        $this->_weight = new Zend_Search_Lucene_Search_Weight_MultiTerm($this, $reader);
-        return $this->_weight;
-    }
-
-
-    /**
-     * Calculate result vector for Conjunction query
-     * (like '+something +another')
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     */
-    private function _calculateConjunctionResult(Zend_Search_Lucene_Interface $reader)
-    {
-        $this->_resVector = null;
-
-        if (count($this->_terms) == 0) {
-            $this->_resVector = array();
-        }
-
-        // Order terms by selectivity
-        $docFreqs = array();
-        $ids      = array();
-        foreach ($this->_terms as $id => $term) {
-            $docFreqs[] = $reader->docFreq($term);
-            $ids[]      = $id; // Used to keep original order for terms with the same selectivity and omit terms comparison
-        }
-        array_multisort($docFreqs, SORT_ASC, SORT_NUMERIC,
-                        $ids,      SORT_ASC, SORT_NUMERIC,
-                        $this->_terms);
-
-        require_once 'Zend/Search/Lucene/Index/DocsFilter.php';
-        $docsFilter = new Zend_Search_Lucene_Index_DocsFilter();
-        foreach ($this->_terms as $termId => $term) {
-            $termDocs = $reader->termDocs($term, $docsFilter);
-        }
-        // Treat last retrieved docs vector as a result set
-        // (filter collects data for other terms)
-        $this->_resVector = array_flip($termDocs);
-
-        foreach ($this->_terms as $termId => $term) {
-            $this->_termsFreqs[$termId] = $reader->termFreqs($term, $docsFilter);
-        }
-
-        // ksort($this->_resVector, SORT_NUMERIC);
-        // Docs are returned ordered. Used algorithms doesn't change elements order.
-    }
-
-
-    /**
-     * Calculate result vector for non Conjunction query
-     * (like '+something -another')
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     */
-    private function _calculateNonConjunctionResult(Zend_Search_Lucene_Interface $reader)
-    {
-        $requiredVectors      = array();
-        $requiredVectorsSizes = array();
-        $requiredVectorsIds   = array(); // is used to prevent arrays comparison
-
-        $optional   = array();
-        $prohibited = array();
-
-        foreach ($this->_terms as $termId => $term) {
-            $termDocs = array_flip($reader->termDocs($term));
-
-            if ($this->_signs[$termId] === true) {
-                // required
-                $requiredVectors[]      = $termDocs;
-                $requiredVectorsSizes[] = count($termDocs);
-                $requiredVectorsIds[]   = $termId;
-            } elseif ($this->_signs[$termId] === false) {
-                // prohibited
-                // array union
-                $prohibited += $termDocs;
-            } else {
-                // neither required, nor prohibited
-                // array union
-                $optional += $termDocs;
-            }
-
-            $this->_termsFreqs[$termId] = $reader->termFreqs($term);
-        }
-
-        // sort resvectors in order of subquery cardinality increasing
-        array_multisort($requiredVectorsSizes, SORT_ASC, SORT_NUMERIC,
-                        $requiredVectorsIds,   SORT_ASC, SORT_NUMERIC,
-                        $requiredVectors);
-
-        $required = null;
-        foreach ($requiredVectors as $nextResVector) {
-            if($required === null) {
-                $required = $nextResVector;
-            } else {
-                //$required = array_intersect_key($required, $nextResVector);
-
-                /**
-                 * This code is used as workaround for array_intersect_key() slowness problem.
-                 */
-                $updatedVector = array();
-                foreach ($required as $id => $value) {
-                    if (isset($nextResVector[$id])) {
-                        $updatedVector[$id] = $value;
-                    }
-                }
-                $required = $updatedVector;
-            }
-
-            if (count($required) == 0) {
-                // Empty result set, we don't need to check other terms
-                break;
-            }
-        }
-
-        if ($required !== null) {
-            $this->_resVector = $required;
-        } else {
-            $this->_resVector = $optional;
-        }
-
-        if (count($prohibited) != 0) {
-            // $this->_resVector = array_diff_key($this->_resVector, $prohibited);
-
-            /**
-             * This code is used as workaround for array_diff_key() slowness problem.
-             */
-            if (count($this->_resVector) < count($prohibited)) {
-                $updatedVector = $this->_resVector;
-                foreach ($this->_resVector as $id => $value) {
-                    if (isset($prohibited[$id])) {
-                        unset($updatedVector[$id]);
-                    }
-                }
-                $this->_resVector = $updatedVector;
-            } else {
-                $updatedVector = $this->_resVector;
-                foreach ($prohibited as $id => $value) {
-                    unset($updatedVector[$id]);
-                }
-                $this->_resVector = $updatedVector;
-            }
-        }
-
-        ksort($this->_resVector, SORT_NUMERIC);
-    }
-
-
-    /**
-     * Score calculator for conjunction queries (all terms are required)
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function _conjunctionScore($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if ($this->_coord === null) {
-            $this->_coord = $reader->getSimilarity()->coord(count($this->_terms),
-                                                            count($this->_terms) );
-        }
-
-        $score = 0.0;
-
-        foreach ($this->_terms as $termId => $term) {
-            /**
-             * We don't need to check that term freq is not 0
-             * Score calculation is performed only for matched docs
-             */
-            $score += $reader->getSimilarity()->tf($this->_termsFreqs[$termId][$docId]) *
-                      $this->_weights[$termId]->getValue() *
-                      $reader->norm($docId, $term->field);
-        }
-
-        return $score * $this->_coord * $this->getBoost();
-    }
-
-
-    /**
-     * Score calculator for non conjunction queries (not all terms are required)
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function _nonConjunctionScore($docId, $reader)
-    {
-        if ($this->_coord === null) {
-            $this->_coord = array();
-
-            $maxCoord = 0;
-            foreach ($this->_signs as $sign) {
-                if ($sign !== false /* not prohibited */) {
-                    $maxCoord++;
-                }
-            }
-
-            for ($count = 0; $count <= $maxCoord; $count++) {
-                $this->_coord[$count] = $reader->getSimilarity()->coord($count, $maxCoord);
-            }
-        }
-
-        $score = 0.0;
-        $matchedTerms = 0;
-        foreach ($this->_terms as $termId=>$term) {
-            // Check if term is
-            if ($this->_signs[$termId] !== false &&        // not prohibited
-                isset($this->_termsFreqs[$termId][$docId]) // matched
-               ) {
-                $matchedTerms++;
-
-                /**
-                 * We don't need to check that term freq is not 0
-                 * Score calculation is performed only for matched docs
-                 */
-                $score +=
-                      $reader->getSimilarity()->tf($this->_termsFreqs[$termId][$docId]) *
-                      $this->_weights[$termId]->getValue() *
-                      $reader->norm($docId, $term->field);
-            }
-        }
-
-        return $score * $this->_coord[$matchedTerms] * $this->getBoost();
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        if ($this->_signs === null) {
-            $this->_calculateConjunctionResult($reader);
-        } else {
-            $this->_calculateNonConjunctionResult($reader);
-        }
-
-        // Initialize weight if it's not done yet
-        $this->_initWeight($reader);
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return $this->_resVector;
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if (isset($this->_resVector[$docId])) {
-            if ($this->_signs === null) {
-                return $this->_conjunctionScore($docId, $reader);
-            } else {
-                return $this->_nonConjunctionScore($docId, $reader);
-            }
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        if ($this->_signs === null) {
-            return $this->_terms;
-        }
-
-        $terms = array();
-
-        foreach ($this->_signs as $id => $sign) {
-            if ($sign !== false) {
-                $terms[] = $this->_terms[$id];
-            }
-        }
-
-        return $terms;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $words = array();
-
-        if ($this->_signs === null) {
-            foreach ($this->_terms as $term) {
-                $words[] = $term->text;
-            }
-        } else {
-            foreach ($this->_signs as $id => $sign) {
-                if ($sign !== false) {
-                    $words[] = $this->_terms[$id]->text;
-                }
-            }
-        }
-
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-
-        $query = '';
-
-        foreach ($this->_terms as $id => $term) {
-            if ($id != 0) {
-                $query .= ' ';
-            }
-
-            if ($this->_signs === null || $this->_signs[$id] === true) {
-                $query .= '+';
-            } else if ($this->_signs[$id] === false) {
-                $query .= '-';
-            }
-
-            if ($term->field !== null) {
-                $query .= $term->field . ':';
-            }
-            $query .= $term->text;
-        }
-
-        if ($this->getBoost() != 1) {
-            $query = '(' . $query . ')^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Phrase.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Phrase.php
deleted file mode 100644
index 1b2d6a7ad..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Phrase.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * A Query that matches documents containing a particular sequence of terms.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Phrase extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Terms to find.
-     * Array of Zend_Search_Lucene_Index_Term objects.
-     *
-     * @var array
-     */
-    private $_terms;
-
-    /**
-     * Term positions (relative positions of terms within the phrase).
-     * Array of integers
-     *
-     * @var array
-     */
-    private $_offsets;
-
-    /**
-     * Sets the number of other words permitted between words in query phrase.
-     * If zero, then this is an exact phrase search.  For larger values this works
-     * like a WITHIN or NEAR operator.
-     *
-     * The slop is in fact an edit-distance, where the units correspond to
-     * moves of terms in the query phrase out of position.  For example, to switch
-     * the order of two words requires two moves (the first move places the words
-     * atop one another), so to permit re-orderings of phrases, the slop must be
-     * at least two.
-     * More exact matches are scored higher than sloppier matches, thus search
-     * results are sorted by exactness.
-     *
-     * The slop is zero by default, requiring exact matches.
-     *
-     * @var integer
-     */
-    private $_slop;
-
-    /**
-     * Result vector.
-     *
-     * @var array
-     */
-    private $_resVector = null;
-
-    /**
-     * Terms positions vectors.
-     * Array of Arrays:
-     * term1Id => (docId => array( pos1, pos2, ... ), ...)
-     * term2Id => (docId => array( pos1, pos2, ... ), ...)
-     *
-     * @var array
-     */
-    private $_termsPositions = array();
-
-    /**
-     * Class constructor.  Create a new prase query.
-     *
-     * @param string $field    Field to search.
-     * @param array  $terms    Terms to search Array of strings.
-     * @param array  $offsets  Relative term positions. Array of integers.
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($terms = null, $offsets = null, $field = null)
-    {
-        $this->_slop = 0;
-
-        if (is_array($terms)) {
-            $this->_terms = array();
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            foreach ($terms as $termId => $termText) {
-                $this->_terms[$termId] = ($field !== null)? new Zend_Search_Lucene_Index_Term($termText, $field):
-                                                            new Zend_Search_Lucene_Index_Term($termText);
-            }
-        } else if ($terms === null) {
-            $this->_terms = array();
-        } else {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('terms argument must be array of strings or null');
-        }
-
-        if (is_array($offsets)) {
-            if (count($this->_terms) != count($offsets)) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('terms and offsets arguments must have the same size.');
-            }
-            $this->_offsets = $offsets;
-        } else if ($offsets === null) {
-            $this->_offsets = array();
-            foreach ($this->_terms as $termId => $term) {
-                $position = count($this->_offsets);
-                $this->_offsets[$termId] = $position;
-            }
-        } else {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('offsets argument must be array of strings or null');
-        }
-    }
-
-    /**
-     * Set slop
-     *
-     * @param integer $slop
-     */
-    public function setSlop($slop)
-    {
-        $this->_slop = $slop;
-    }
-
-
-    /**
-     * Get slop
-     *
-     * @return integer
-     */
-    public function getSlop()
-    {
-        return $this->_slop;
-    }
-
-
-    /**
-     * Adds a term to the end of the query phrase.
-     * The relative position of the term is specified explicitly or the one immediately
-     * after the last term added.
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param integer $position
-     */
-    public function addTerm(Zend_Search_Lucene_Index_Term $term, $position = null) {
-        if ((count($this->_terms) != 0)&&(end($this->_terms)->field != $term->field)) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('All phrase terms must be in the same field: ' .
-                                                   $term->field . ':' . $term->text);
-        }
-
-        $this->_terms[] = $term;
-        if ($position !== null) {
-            $this->_offsets[] = $position;
-        } else if (count($this->_offsets) != 0) {
-            $this->_offsets[] = end($this->_offsets) + 1;
-        } else {
-            $this->_offsets[] = 0;
-        }
-    }
-
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        if (count($this->_terms) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        } else if ($this->_terms[0]->field !== null) {
-            return $this;
-        } else {
-            require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-            $query = new Zend_Search_Lucene_Search_Query_Boolean();
-            $query->setBoost($this->getBoost());
-
-            foreach ($index->getFieldNames(true) as $fieldName) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Phrase();
-                $subquery->setSlop($this->getSlop());
-
-                require_once 'Zend/Search/Lucene/Index/Term.php';
-                foreach ($this->_terms as $termId => $term) {
-                    $qualifiedTerm = new Zend_Search_Lucene_Index_Term($term->text, $fieldName);
-
-                    $subquery->addTerm($qualifiedTerm, $this->_offsets[$termId]);
-                }
-
-                $query->addSubquery($subquery);
-            }
-
-            return $query;
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        // Check, that index contains all phrase terms
-        foreach ($this->_terms as $term) {
-            if (!$index->hasTerm($term)) {
-                require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-                return new Zend_Search_Lucene_Search_Query_Empty();
-            }
-        }
-
-        if (count($this->_terms) == 1) {
-            // It's one term query
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $optimizedQuery = new Zend_Search_Lucene_Search_Query_Term(reset($this->_terms));
-            $optimizedQuery->setBoost($this->getBoost());
-
-            return $optimizedQuery;
-        }
-
-        if (count($this->_terms) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-
-        return $this;
-    }
-
-    /**
-     * Returns query term
-     *
-     * @return array
-     */
-    public function getTerms()
-    {
-        return $this->_terms;
-    }
-
-
-    /**
-     * Set weight for specified term
-     *
-     * @param integer $num
-     * @param Zend_Search_Lucene_Search_Weight_Term $weight
-     */
-    public function setWeight($num, $weight)
-    {
-        $this->_weights[$num] = $weight;
-    }
-
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/Phrase.php';
-        $this->_weight = new Zend_Search_Lucene_Search_Weight_Phrase($this, $reader);
-        return $this->_weight;
-    }
-
-
-    /**
-     * Score calculator for exact phrase queries (terms sequence is fixed)
-     *
-     * @param integer $docId
-     * @return float
-     */
-    public function _exactPhraseFreq($docId)
-    {
-        $freq = 0;
-
-        // Term Id with lowest cardinality
-        $lowCardTermId = null;
-
-        // Calculate $lowCardTermId
-        foreach ($this->_terms as $termId => $term) {
-            if ($lowCardTermId === null ||
-                count($this->_termsPositions[$termId][$docId]) <
-                count($this->_termsPositions[$lowCardTermId][$docId]) ) {
-                    $lowCardTermId = $termId;
-                }
-        }
-
-        // Walk through positions of the term with lowest cardinality
-        foreach ($this->_termsPositions[$lowCardTermId][$docId] as $lowCardPos) {
-            // We expect phrase to be found
-            $freq++;
-
-            // Walk through other terms
-            foreach ($this->_terms as $termId => $term) {
-                if ($termId != $lowCardTermId) {
-                    $expectedPosition = $lowCardPos +
-                                            ($this->_offsets[$termId] -
-                                             $this->_offsets[$lowCardTermId]);
-
-                    if (!in_array($expectedPosition, $this->_termsPositions[$termId][$docId])) {
-                        $freq--;  // Phrase wasn't found.
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $freq;
-    }
-
-    /**
-     * Score calculator for sloppy phrase queries (terms sequence is fixed)
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function _sloppyPhraseFreq($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        $freq = 0;
-
-        $phraseQueue = array();
-        $phraseQueue[0] = array(); // empty phrase
-        $lastTerm = null;
-
-        // Walk through the terms to create phrases.
-        foreach ($this->_terms as $termId => $term) {
-            $queueSize = count($phraseQueue);
-            $firstPass = true;
-
-            // Walk through the term positions.
-            // Each term position produces a set of phrases.
-            foreach ($this->_termsPositions[$termId][$docId] as $termPosition ) {
-                if ($firstPass) {
-                    for ($count = 0; $count < $queueSize; $count++) {
-                        $phraseQueue[$count][$termId] = $termPosition;
-                    }
-                } else {
-                    for ($count = 0; $count < $queueSize; $count++) {
-                        if ($lastTerm !== null &&
-                            abs( $termPosition - $phraseQueue[$count][$lastTerm] -
-                                 ($this->_offsets[$termId] - $this->_offsets[$lastTerm])) > $this->_slop) {
-                            continue;
-                        }
-
-                        $newPhraseId = count($phraseQueue);
-                        $phraseQueue[$newPhraseId]          = $phraseQueue[$count];
-                        $phraseQueue[$newPhraseId][$termId] = $termPosition;
-                    }
-
-                }
-
-                $firstPass = false;
-            }
-            $lastTerm = $termId;
-        }
-
-
-        foreach ($phraseQueue as $phrasePos) {
-            $minDistance = null;
-
-            for ($shift = -$this->_slop; $shift <= $this->_slop; $shift++) {
-                $distance = 0;
-                $start = reset($phrasePos) - reset($this->_offsets) + $shift;
-
-                foreach ($this->_terms as $termId => $term) {
-                    $distance += abs($phrasePos[$termId] - $this->_offsets[$termId] - $start);
-
-                    if($distance > $this->_slop) {
-                        break;
-                    }
-                }
-
-                if ($minDistance === null || $distance < $minDistance) {
-                    $minDistance = $distance;
-                }
-            }
-
-            if ($minDistance <= $this->_slop) {
-                $freq += $reader->getSimilarity()->sloppyFreq($minDistance);
-            }
-        }
-
-        return $freq;
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        $this->_resVector = null;
-
-        if (count($this->_terms) == 0) {
-            $this->_resVector = array();
-        }
-
-        $resVectors      = array();
-        $resVectorsSizes = array();
-        $resVectorsIds   = array(); // is used to prevent arrays comparison
-        foreach ($this->_terms as $termId => $term) {
-            $resVectors[]      = array_flip($reader->termDocs($term));
-            $resVectorsSizes[] = count(end($resVectors));
-            $resVectorsIds[]   = $termId;
-
-            $this->_termsPositions[$termId] = $reader->termPositions($term);
-        }
-        // sort resvectors in order of subquery cardinality increasing
-        array_multisort($resVectorsSizes, SORT_ASC, SORT_NUMERIC,
-                        $resVectorsIds,   SORT_ASC, SORT_NUMERIC,
-                        $resVectors);
-
-        foreach ($resVectors as $nextResVector) {
-            if($this->_resVector === null) {
-                $this->_resVector = $nextResVector;
-            } else {
-                //$this->_resVector = array_intersect_key($this->_resVector, $nextResVector);
-
-                /**
-                 * This code is used as workaround for array_intersect_key() slowness problem.
-                 */
-                $updatedVector = array();
-                foreach ($this->_resVector as $id => $value) {
-                    if (isset($nextResVector[$id])) {
-                        $updatedVector[$id] = $value;
-                    }
-                }
-                $this->_resVector = $updatedVector;
-            }
-
-            if (count($this->_resVector) == 0) {
-                // Empty result set, we don't need to check other terms
-                break;
-            }
-        }
-
-        // ksort($this->_resVector, SORT_NUMERIC);
-        // Docs are returned ordered. Used algorithm doesn't change elements order.
-
-        // Initialize weight if it's not done yet
-        $this->_initWeight($reader);
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return $this->_resVector;
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if (isset($this->_resVector[$docId])) {
-            if ($this->_slop == 0) {
-                $freq = $this->_exactPhraseFreq($docId);
-            } else {
-                $freq = $this->_sloppyPhraseFreq($docId, $reader);
-            }
-
-            if ($freq != 0) {
-                $tf = $reader->getSimilarity()->tf($freq);
-                $weight = $this->_weight->getValue();
-                $norm = $reader->norm($docId, reset($this->_terms)->field);
-
-                return $tf * $weight * $norm * $this->getBoost();
-            }
-
-            // Included in result, but culculated freq is zero
-            return 0;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        return $this->_terms;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $words = array();
-        foreach ($this->_terms as $term) {
-            $words[] = $term->text;
-        }
-
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if (isset($this->_terms[0]) && $this->_terms[0]->field !== null) {
-            $query = $this->_terms[0]->field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= '"';
-
-        foreach ($this->_terms as $id => $term) {
-            if ($id != 0) {
-                $query .= ' ';
-            }
-            $query .= $term->text;
-        }
-
-        $query .= '"';
-
-        if ($this->_slop != 0) {
-            $query .= '~' . $this->_slop;
-        }
-
-        if ($this->getBoost() != 1) {
-            $query .= '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing.php
deleted file mode 100644
index e5f6fce62..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Preprocessing.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * It's an internal abstract class intended to finalize ase a query processing after query parsing.
- * This type of query is not actually involved into query execution.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @internal
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Search_Query_Preprocessing extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Matched terms.
-     *
-     * Matched terms list.
-     * It's filled during rewrite operation and may be used for search result highlighting
-     *
-     * Array of Zend_Search_Lucene_Index_Term objects
-     *
-     * @var array
-     */
-    protected $_matches = null;
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('This query is not intended to be executed.');
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('This query is not intended to be executed.');
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('This query is not intended to be executed.');
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('This query is not intended to be executed.');
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('This query is not intended to be executed.');
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Rewrite operation has to be done before retrieving query terms.');
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
deleted file mode 100644
index 16230d55a..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query_Processing */
-require_once 'Zend/Search/Lucene/Search/Query/Preprocessing.php';
-
-
-/**
- * It's an internal abstract class intended to finalize ase a query processing after query parsing.
- * This type of query is not actually involved into query execution.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @internal
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy extends Zend_Search_Lucene_Search_Query_Preprocessing
-{
-    /**
-     * word (query parser lexeme) to find.
-     *
-     * @var string
-     */
-    private $_word;
-
-    /**
-     * Word encoding (field name is always provided using UTF-8 encoding since it may be retrieved from index).
-     *
-     * @var string
-     */
-    private $_encoding;
-
-
-    /**
-     * Field name.
-     *
-     * @var string
-     */
-    private $_field;
-
-    /**
-     * A value between 0 and 1 to set the required similarity
-     *  between the query term and the matching terms. For example, for a
-     *  _minimumSimilarity of 0.5 a term of the same length
-     *  as the query term is considered similar to the query term if the edit distance
-     *  between both terms is less than length(term)*0.5
-     *
-     * @var float
-     */
-    private $_minimumSimilarity;
-
-    /**
-     * Class constructor.  Create a new preprocessing object for prase query.
-     *
-     * @param string $word       Non-tokenized word (query parser lexeme) to search.
-     * @param string $encoding   Word encoding.
-     * @param string $fieldName  Field name.
-     * @param float  $minimumSimilarity minimum similarity
-     */
-    public function __construct($word, $encoding, $fieldName, $minimumSimilarity)
-    {
-        $this->_word     = $word;
-        $this->_encoding = $encoding;
-        $this->_field    = $fieldName;
-        $this->_minimumSimilarity = $minimumSimilarity;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        if ($this->_field === null) {
-            require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-            $query = new Zend_Search_Lucene_Search_Query_Boolean();
-
-            $hasInsignificantSubqueries = false;
-
-            require_once 'Zend/Search/Lucene.php';
-            if (Zend_Search_Lucene::getDefaultSearchField() === null) {
-                $searchFields = $index->getFieldNames(true);
-            } else {
-                $searchFields = array(Zend_Search_Lucene::getDefaultSearchField());
-            }
-
-            require_once 'Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php';
-            foreach ($searchFields as $fieldName) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy($this->_word,
-                                                                                    $this->_encoding,
-                                                                                    $fieldName,
-                                                                                    $this->_minimumSimilarity);
-
-                $rewrittenSubquery = $subquery->rewrite($index);
-
-                if ( !($rewrittenSubquery instanceof Zend_Search_Lucene_Search_Query_Insignificant  ||
-                       $rewrittenSubquery instanceof Zend_Search_Lucene_Search_Query_Empty) ) {
-                    $query->addSubquery($rewrittenSubquery);
-                }
-
-                if ($rewrittenSubquery instanceof Zend_Search_Lucene_Search_Query_Insignificant) {
-                    $hasInsignificantSubqueries = true;
-                }
-            }
-
-            $subqueries = $query->getSubqueries();
-
-            if (count($subqueries) == 0) {
-                $this->_matches = array();
-                if ($hasInsignificantSubqueries) {
-                    require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-                    return new Zend_Search_Lucene_Search_Query_Insignificant();
-                } else {
-                    require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-                    return new Zend_Search_Lucene_Search_Query_Empty();
-                }
-            }
-
-            if (count($subqueries) == 1) {
-                $query = reset($subqueries);
-            }
-
-            $query->setBoost($this->getBoost());
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-        // -------------------------------------
-        // Recognize exact term matching (it corresponds to Keyword fields stored in the index)
-        // encoding is not used since we expect binary matching
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        $term = new Zend_Search_Lucene_Index_Term($this->_word, $this->_field);
-        if ($index->hasTerm($term)) {
-            require_once 'Zend/Search/Lucene/Search/Query/Fuzzy.php';
-            $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term, $this->_minimumSimilarity);
-            $query->setBoost($this->getBoost());
-
-            // Get rewritten query. Important! It also fills terms matching container.
-            $rewrittenQuery = $query->rewrite($index);
-            $this->_matches = $query->getQueryTerms();
-
-            return $rewrittenQuery;
-        }
-
-
-        // -------------------------------------
-        // Recognize wildcard queries
-
-        /** @todo check for PCRE unicode support may be performed through Zend_Environment in some future */
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            $subPatterns = preg_split('/[*?]/u', iconv($this->_encoding, 'UTF-8', $this->_word));
-        } else {
-            $subPatterns = preg_split('/[*?]/', $this->_word);
-        }
-        if (count($subPatterns) > 1) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Fuzzy search doesn\'t support wildcards (except within Keyword fields).');
-        }
-
-
-        // -------------------------------------
-        // Recognize one-term multi-term and "insignificant" queries
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_word, $this->_encoding);
-
-        if (count($tokens) == 0) {
-            $this->_matches = array();
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-
-        if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($tokens[0]->getTermText(), $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Fuzzy.php';
-            $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term, $this->_minimumSimilarity);
-            $query->setBoost($this->getBoost());
-
-            // Get rewritten query. Important! It also fills terms matching container.
-            $rewrittenQuery = $query->rewrite($index);
-            $this->_matches = $query->getQueryTerms();
-
-            return $rewrittenQuery;
-        }
-
-        // Word is tokenized into several tokens
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        throw new Zend_Search_Lucene_Search_QueryParserException('Fuzzy search is supported only for non-multiple word terms');
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        /** Skip fields detection. We don't need it, since we expect all fields presented in the HTML body and don't differentiate them */
-
-        /** Skip exact term matching recognition, keyword fields highlighting is not supported */
-
-        // -------------------------------------
-        // Recognize wildcard queries
-
-        /** @todo check for PCRE unicode support may be performed through Zend_Environment in some future */
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            $subPatterns = preg_split('/[*?]/u', iconv($this->_encoding, 'UTF-8', $this->_word));
-        } else {
-            $subPatterns = preg_split('/[*?]/', $this->_word);
-        }
-        if (count($subPatterns) > 1) {
-            // Do nothing
-            return;
-        }
-
-
-        // -------------------------------------
-        // Recognize one-term multi-term and "insignificant" queries
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_word, $this->_encoding);
-        if (count($tokens) == 0) {
-            // Do nothing
-            return;
-        }
-        if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($tokens[0]->getTermText(), $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Fuzzy.php';
-            $query = new Zend_Search_Lucene_Search_Query_Fuzzy($term, $this->_minimumSimilarity);
-
-            $query->_highlightMatches($highlighter);
-            return;
-        }
-
-        // Word is tokenized into several tokens
-        // But fuzzy search is supported only for non-multiple word terms
-        // Do nothing
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if ($this->_field !== null) {
-            $query = $this->_field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= $this->_word;
-
-        if ($this->getBoost() != 1) {
-            $query .= '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
deleted file mode 100644
index 2c0856d14..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query_Processing */
-require_once 'Zend/Search/Lucene/Search/Query/Preprocessing.php';
-
-/**
- * It's an internal abstract class intended to finalize ase a query processing after query parsing.
- * This type of query is not actually involved into query execution.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @internal
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Preprocessing_Phrase extends Zend_Search_Lucene_Search_Query_Preprocessing
-{
-    /**
-     * Phrase to find.
-     *
-     * @var string
-     */
-    private $_phrase;
-
-    /**
-     * Phrase encoding (field name is always provided using UTF-8 encoding since it may be retrieved from index).
-     *
-     * @var string
-     */
-    private $_phraseEncoding;
-
-
-    /**
-     * Field name.
-     *
-     * @var string
-     */
-    private $_field;
-
-    /**
-     * Sets the number of other words permitted between words in query phrase.
-     * If zero, then this is an exact phrase search.  For larger values this works
-     * like a WITHIN or NEAR operator.
-     *
-     * The slop is in fact an edit-distance, where the units correspond to
-     * moves of terms in the query phrase out of position.  For example, to switch
-     * the order of two words requires two moves (the first move places the words
-     * atop one another), so to permit re-orderings of phrases, the slop must be
-     * at least two.
-     * More exact matches are scored higher than sloppier matches, thus search
-     * results are sorted by exactness.
-     *
-     * The slop is zero by default, requiring exact matches.
-     *
-     * @var integer
-     */
-    private $_slop;
-
-    /**
-     * Class constructor.  Create a new preprocessing object for prase query.
-     *
-     * @param string $phrase          Phrase to search.
-     * @param string $phraseEncoding  Phrase encoding.
-     * @param string $fieldName       Field name.
-     */
-    public function __construct($phrase, $phraseEncoding, $fieldName)
-    {
-        $this->_phrase         = $phrase;
-        $this->_phraseEncoding = $phraseEncoding;
-        $this->_field          = $fieldName;
-    }
-
-    /**
-     * Set slop
-     *
-     * @param integer $slop
-     */
-    public function setSlop($slop)
-    {
-        $this->_slop = $slop;
-    }
-
-
-    /**
-     * Get slop
-     *
-     * @return integer
-     */
-    public function getSlop()
-    {
-        return $this->_slop;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-// Allow to use wildcards within phrases
-// They are either removed by text analyzer or used as a part of keyword for keyword fields
-//
-//        if (strpos($this->_phrase, '?') !== false || strpos($this->_phrase, '*') !== false) {
-//            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-//            throw new Zend_Search_Lucene_Search_QueryParserException('Wildcards are only allowed in a single terms.');
-//        }
-
-        // Split query into subqueries if field name is not specified
-        if ($this->_field === null) {
-            require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-            $query = new Zend_Search_Lucene_Search_Query_Boolean();
-            $query->setBoost($this->getBoost());
-
-            require_once 'Zend/Search/Lucene.php';
-            if (Zend_Search_Lucene::getDefaultSearchField() === null) {
-                $searchFields = $index->getFieldNames(true);
-            } else {
-                $searchFields = array(Zend_Search_Lucene::getDefaultSearchField());
-            }
-
-            foreach ($searchFields as $fieldName) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Preprocessing_Phrase($this->_phrase,
-                                                                                     $this->_phraseEncoding,
-                                                                                     $fieldName);
-                $subquery->setSlop($this->getSlop());
-
-                $query->addSubquery($subquery->rewrite($index));
-            }
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-        // Recognize exact term matching (it corresponds to Keyword fields stored in the index)
-        // encoding is not used since we expect binary matching
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        $term = new Zend_Search_Lucene_Index_Term($this->_phrase, $this->_field);
-        if ($index->hasTerm($term)) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $query = new Zend_Search_Lucene_Search_Query_Term($term);
-            $query->setBoost($this->getBoost());
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-
-        // tokenize phrase using current analyzer and process it as a phrase query
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_phrase, $this->_phraseEncoding);
-
-        if (count($tokens) == 0) {
-            $this->_matches = array();
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-
-        if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($tokens[0]->getTermText(), $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $query = new Zend_Search_Lucene_Search_Query_Term($term);
-            $query->setBoost($this->getBoost());
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-        //It's non-trivial phrase query
-        $position = -1;
-        require_once 'Zend/Search/Lucene/Search/Query/Phrase.php';
-        $query = new Zend_Search_Lucene_Search_Query_Phrase();
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        foreach ($tokens as $token) {
-            $position += $token->getPositionIncrement();
-            $term = new Zend_Search_Lucene_Index_Term($token->getTermText(), $this->_field);
-            $query->addTerm($term, $position);
-            $query->setSlop($this->getSlop());
-        }
-        $this->_matches = $query->getQueryTerms();
-        return $query;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        /** Skip fields detection. We don't need it, since we expect all fields presented in the HTML body and don't differentiate them */
-
-        /** Skip exact term matching recognition, keyword fields highlighting is not supported */
-
-        /** Skip wildcard queries recognition. Supported wildcards are removed by text analyzer */
-
-
-        // tokenize phrase using current analyzer and process it as a phrase query
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_phrase, $this->_phraseEncoding);
-
-        if (count($tokens) == 0) {
-            // Do nothing
-            return;
-        }
-
-        if (count($tokens) == 1) {
-            $highlighter->highlight($tokens[0]->getTermText());
-            return;
-        }
-
-        //It's non-trivial phrase query
-        $words = array();
-        foreach ($tokens as $token) {
-            $words[] = $token->getTermText();
-        }
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if ($this->_field !== null) {
-            $query = $this->_field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= '"' . $this->_phrase . '"';
-
-        if ($this->_slop != 0) {
-            $query .= '~' . $this->_slop;
-        }
-
-        if ($this->getBoost() != 1) {
-            $query .= '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
deleted file mode 100644
index 933b89044..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query_Processing */
-require_once 'Zend/Search/Lucene/Search/Query/Preprocessing.php';
-
-
-/**
- * It's an internal abstract class intended to finalize ase a query processing after query parsing.
- * This type of query is not actually involved into query execution.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @internal
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Preprocessing_Term extends Zend_Search_Lucene_Search_Query_Preprocessing
-{
-    /**
-     * word (query parser lexeme) to find.
-     *
-     * @var string
-     */
-    private $_word;
-
-    /**
-     * Word encoding (field name is always provided using UTF-8 encoding since it may be retrieved from index).
-     *
-     * @var string
-     */
-    private $_encoding;
-
-
-    /**
-     * Field name.
-     *
-     * @var string
-     */
-    private $_field;
-
-    /**
-     * Class constructor.  Create a new preprocessing object for prase query.
-     *
-     * @param string $word       Non-tokenized word (query parser lexeme) to search.
-     * @param string $encoding   Word encoding.
-     * @param string $fieldName  Field name.
-     */
-    public function __construct($word, $encoding, $fieldName)
-    {
-        $this->_word     = $word;
-        $this->_encoding = $encoding;
-        $this->_field    = $fieldName;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        if ($this->_field === null) {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $query = new Zend_Search_Lucene_Search_Query_MultiTerm();
-            $query->setBoost($this->getBoost());
-
-            $hasInsignificantSubqueries = false;
-
-            require_once 'Zend/Search/Lucene.php';
-            if (Zend_Search_Lucene::getDefaultSearchField() === null) {
-                $searchFields = $index->getFieldNames(true);
-            } else {
-                $searchFields = array(Zend_Search_Lucene::getDefaultSearchField());
-            }
-
-            require_once 'Zend/Search/Lucene/Search/Query/Preprocessing/Term.php';
-            foreach ($searchFields as $fieldName) {
-                $subquery = new Zend_Search_Lucene_Search_Query_Preprocessing_Term($this->_word,
-                                                                                   $this->_encoding,
-                                                                                   $fieldName);
-                $rewrittenSubquery = $subquery->rewrite($index);
-                foreach ($rewrittenSubquery->getQueryTerms() as $term) {
-                    $query->addTerm($term);
-                }
-
-                if ($rewrittenSubquery instanceof Zend_Search_Lucene_Search_Query_Insignificant) {
-                    $hasInsignificantSubqueries = true;
-                }
-            }
-
-            if (count($query->getTerms()) == 0) {
-                $this->_matches = array();
-                if ($hasInsignificantSubqueries) {
-                    require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-                    return new Zend_Search_Lucene_Search_Query_Insignificant();
-                } else {
-                    require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-                    return new Zend_Search_Lucene_Search_Query_Empty();
-                }
-            }
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-        // -------------------------------------
-        // Recognize exact term matching (it corresponds to Keyword fields stored in the index)
-        // encoding is not used since we expect binary matching
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        $term = new Zend_Search_Lucene_Index_Term($this->_word, $this->_field);
-        if ($index->hasTerm($term)) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $query = new Zend_Search_Lucene_Search_Query_Term($term);
-            $query->setBoost($this->getBoost());
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-
-        // -------------------------------------
-        // Recognize wildcard queries
-
-        /** @todo check for PCRE unicode support may be performed through Zend_Environment in some future */
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            $word = iconv($this->_encoding, 'UTF-8', $this->_word);
-            $wildcardsPattern = '/[*?]/u';
-            $subPatternsEncoding = 'UTF-8';
-        } else {
-            $word = $this->_word;
-            $wildcardsPattern = '/[*?]/';
-            $subPatternsEncoding = $this->_encoding;
-        }
-
-        $subPatterns = preg_split($wildcardsPattern, $word, -1, PREG_SPLIT_OFFSET_CAPTURE);
-
-        if (count($subPatterns) > 1) {
-            // Wildcard query is recognized
-
-            $pattern = '';
-
-            require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-            foreach ($subPatterns as $id => $subPattern) {
-                // Append corresponding wildcard character to the pattern before each sub-pattern (except first)
-                if ($id != 0) {
-                    $pattern .= $word[ $subPattern[1] - 1 ];
-                }
-
-                // Check if each subputtern is a single word in terms of current analyzer
-                $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($subPattern[0], $subPatternsEncoding);
-                if (count($tokens) > 1) {
-                    require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-                    throw new Zend_Search_Lucene_Search_QueryParserException('Wildcard search is supported only for non-multiple word terms');
-                }
-                foreach ($tokens as $token) {
-                    $pattern .= $token->getTermText();
-                }
-            }
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($pattern, $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Wildcard.php';
-            $query = new Zend_Search_Lucene_Search_Query_Wildcard($term);
-            $query->setBoost($this->getBoost());
-
-            // Get rewritten query. Important! It also fills terms matching container.
-            $rewrittenQuery = $query->rewrite($index);
-            $this->_matches = $query->getQueryTerms();
-
-            return $rewrittenQuery;
-        }
-
-
-        // -------------------------------------
-        // Recognize one-term multi-term and "insignificant" queries
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_word, $this->_encoding);
-
-        if (count($tokens) == 0) {
-            $this->_matches = array();
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-
-        if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($tokens[0]->getTermText(), $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            $query = new Zend_Search_Lucene_Search_Query_Term($term);
-            $query->setBoost($this->getBoost());
-
-            $this->_matches = $query->getQueryTerms();
-            return $query;
-        }
-
-        //It's not insignificant or one term query
-        require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-        $query = new Zend_Search_Lucene_Search_Query_MultiTerm();
-
-        /**
-         * @todo Process $token->getPositionIncrement() to support stemming, synonyms and other
-         * analizer design features
-         */
-        require_once 'Zend/Search/Lucene/Index/Term.php';
-        foreach ($tokens as $token) {
-            $term = new Zend_Search_Lucene_Index_Term($token->getTermText(), $this->_field);
-            $query->addTerm($term, true); // all subterms are required
-        }
-
-        $query->setBoost($this->getBoost());
-
-        $this->_matches = $query->getQueryTerms();
-        return $query;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        /** Skip fields detection. We don't need it, since we expect all fields presented in the HTML body and don't differentiate them */
-
-        /** Skip exact term matching recognition, keyword fields highlighting is not supported */
-
-        // -------------------------------------
-        // Recognize wildcard queries
-        /** @todo check for PCRE unicode support may be performed through Zend_Environment in some future */
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            $word = iconv($this->_encoding, 'UTF-8', $this->_word);
-            $wildcardsPattern = '/[*?]/u';
-            $subPatternsEncoding = 'UTF-8';
-        } else {
-            $word = $this->_word;
-            $wildcardsPattern = '/[*?]/';
-            $subPatternsEncoding = $this->_encoding;
-        }
-        $subPatterns = preg_split($wildcardsPattern, $word, -1, PREG_SPLIT_OFFSET_CAPTURE);
-        if (count($subPatterns) > 1) {
-            // Wildcard query is recognized
-
-            $pattern = '';
-
-            require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-            foreach ($subPatterns as $id => $subPattern) {
-                // Append corresponding wildcard character to the pattern before each sub-pattern (except first)
-                if ($id != 0) {
-                    $pattern .= $word[ $subPattern[1] - 1 ];
-                }
-
-                // Check if each subputtern is a single word in terms of current analyzer
-                $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($subPattern[0], $subPatternsEncoding);
-                if (count($tokens) > 1) {
-                    // Do nothing (nothing is highlighted)
-                    return;
-                }
-                foreach ($tokens as $token) {
-                    $pattern .= $token->getTermText();
-                }
-            }
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $term  = new Zend_Search_Lucene_Index_Term($pattern, $this->_field);
-            require_once 'Zend/Search/Lucene/Search/Query/Wildcard.php';
-            $query = new Zend_Search_Lucene_Search_Query_Wildcard($term);
-
-            $query->_highlightMatches($highlighter);
-            return;
-        }
-
-
-        // -------------------------------------
-        // Recognize one-term multi-term and "insignificant" queries
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_word, $this->_encoding);
-
-        if (count($tokens) == 0) {
-            // Do nothing
-            return;
-        }
-
-        if (count($tokens) == 1) {
-            $highlighter->highlight($tokens[0]->getTermText());
-            return;
-        }
-
-        //It's not insignificant or one term query
-        $words = array();
-        foreach ($tokens as $token) {
-            $words[] = $token->getTermText();
-        }
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if ($this->_field !== null) {
-            $query = $this->_field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= $this->_word;
-
-        if ($this->getBoost() != 1) {
-            $query .= '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Range.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Range.php
deleted file mode 100644
index 55bee57af..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Range.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Range.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Range extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Lower term.
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_lowerTerm;
-
-    /**
-     * Upper term.
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_upperTerm;
-
-
-    /**
-     * Search field
-     *
-     * @var string
-     */
-    private $_field;
-
-    /**
-     * Inclusive
-     *
-     * @var boolean
-     */
-    private $_inclusive;
-
-    /**
-     * Matched terms.
-     *
-     * Matched terms list.
-     * It's filled during the search (rewrite operation) and may be used for search result
-     * post-processing
-     *
-     * Array of Zend_Search_Lucene_Index_Term objects
-     *
-     * @var array
-     */
-    private $_matches = null;
-
-
-    /**
-     * Zend_Search_Lucene_Search_Query_Range constructor.
-     *
-     * @param Zend_Search_Lucene_Index_Term|null $lowerTerm
-     * @param Zend_Search_Lucene_Index_Term|null $upperTerm
-     * @param boolean $inclusive
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($lowerTerm, $upperTerm, $inclusive)
-    {
-        if ($lowerTerm === null  &&  $upperTerm === null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('At least one term must be non-null');
-        }
-        if ($lowerTerm !== null  &&  $upperTerm !== null  &&  $lowerTerm->field != $upperTerm->field) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Both terms must be for the same field');
-        }
-
-        $this->_field     = ($lowerTerm !== null)? $lowerTerm->field : $upperTerm->field;
-        $this->_lowerTerm = $lowerTerm;
-        $this->_upperTerm = $upperTerm;
-        $this->_inclusive = $inclusive;
-    }
-
-    /**
-     * Get query field name
-     *
-     * @return string|null
-     */
-    public function getField()
-    {
-        return $this->_field;
-    }
-
-    /**
-     * Get lower term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function getLowerTerm()
-    {
-        return $this->_lowerTerm;
-    }
-
-    /**
-     * Get upper term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function getUpperTerm()
-    {
-        return $this->_upperTerm;
-    }
-
-    /**
-     * Get upper term
-     *
-     * @return boolean
-     */
-    public function isInclusive()
-    {
-        return $this->_inclusive;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        $this->_matches = array();
-
-        if ($this->_field === null) {
-            // Search through all fields
-            $fields = $index->getFieldNames(true /* indexed fields list */);
-        } else {
-            $fields = array($this->_field);
-        }
-
-        require_once 'Zend/Search/Lucene.php';
-        $maxTerms = Zend_Search_Lucene::getTermsPerQueryLimit();
-        foreach ($fields as $field) {
-            $index->resetTermsStream();
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            if ($this->_lowerTerm !== null) {
-                $lowerTerm = new Zend_Search_Lucene_Index_Term($this->_lowerTerm->text, $field);
-
-                $index->skipTo($lowerTerm);
-
-                if (!$this->_inclusive  &&
-                    $index->currentTerm() == $lowerTerm) {
-                    // Skip lower term
-                    $index->nextTerm();
-                }
-            } else {
-                $index->skipTo(new Zend_Search_Lucene_Index_Term('', $field));
-            }
-
-
-            if ($this->_upperTerm !== null) {
-                // Walk up to the upper term
-                $upperTerm = new Zend_Search_Lucene_Index_Term($this->_upperTerm->text, $field);
-
-                while ($index->currentTerm() !== null          &&
-                       $index->currentTerm()->field == $field  &&
-                       $index->currentTerm()->text  <  $upperTerm->text) {
-                    $this->_matches[] = $index->currentTerm();
-
-                    if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                        require_once 'Zend/Search/Lucene/Exception.php';
-                        throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                    }
-
-                    $index->nextTerm();
-                }
-
-                if ($this->_inclusive  &&  $index->currentTerm() == $upperTerm) {
-                    // Include upper term into result
-                    $this->_matches[] = $upperTerm;
-                }
-            } else {
-                // Walk up to the end of field data
-                while ($index->currentTerm() !== null  &&  $index->currentTerm()->field == $field) {
-                    $this->_matches[] = $index->currentTerm();
-
-                    if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                        require_once 'Zend/Search/Lucene/Exception.php';
-                        throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                    }
-
-                    $index->nextTerm();
-                }
-            }
-
-            $index->closeTermsStream();
-        }
-
-        if (count($this->_matches) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        } else if (count($this->_matches) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            return new Zend_Search_Lucene_Search_Query_Term(reset($this->_matches));
-        } else {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $rewrittenQuery = new Zend_Search_Lucene_Search_Query_MultiTerm();
-
-            foreach ($this->_matches as $matchedTerm) {
-                $rewrittenQuery->addTerm($matchedTerm);
-            }
-
-            return $rewrittenQuery;
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Range query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getQueryTerms()
-    {
-        if ($this->_matches === null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Search or rewrite operations have to be performed before.');
-        }
-
-        return $this->_matches;
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Range query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Range query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function matchedDocs()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Range query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Range query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $words = array();
-
-        $docBody = $highlighter->getDocument()->getFieldUtf8Value('body');
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($docBody, 'UTF-8');
-
-        $lowerTermText = ($this->_lowerTerm !== null)? $this->_lowerTerm->text : null;
-        $upperTermText = ($this->_upperTerm !== null)? $this->_upperTerm->text : null;
-
-        if ($this->_inclusive) {
-            foreach ($tokens as $token) {
-                $termText = $token->getTermText();
-                if (($lowerTermText == null  ||  $lowerTermText <= $termText)  &&
-                    ($upperTermText == null  ||  $termText <= $upperTermText)) {
-                    $words[] = $termText;
-                }
-            }
-        } else {
-            foreach ($tokens as $token) {
-                $termText = $token->getTermText();
-                if (($lowerTermText == null  ||  $lowerTermText < $termText)  &&
-                    ($upperTermText == null  ||  $termText < $upperTermText)) {
-                    $words[] = $termText;
-                }
-            }
-        }
-
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        return (($this->_field === null)? '' : $this->_field . ':')
-             . (($this->_inclusive)? '[' : '{')
-             . (($this->_lowerTerm !== null)?  $this->_lowerTerm->text : 'null')
-             . ' TO '
-             . (($this->_upperTerm !== null)?  $this->_upperTerm->text : 'null')
-             . (($this->_inclusive)? ']' : '}')
-             . (($this->getBoost() != 1)? '^' . round($this->getBoost(), 4) : '');
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Term.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Term.php
deleted file mode 100644
index 18a074f76..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Term.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Term extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Term to find.
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_term;
-
-    /**
-     * Documents vector.
-     *
-     * @var array
-     */
-    private $_docVector = null;
-
-    /**
-     * Term freqs vector.
-     * array(docId => freq, ...)
-     *
-     * @var array
-     */
-    private $_termFreqs;
-
-
-    /**
-     * Zend_Search_Lucene_Search_Query_Term constructor
-     *
-     * @param Zend_Search_Lucene_Index_Term $term
-     * @param boolean $sign
-     */
-    public function __construct(Zend_Search_Lucene_Index_Term $term)
-    {
-        $this->_term = $term;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        if ($this->_term->field != null) {
-            return $this;
-        } else {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $query = new Zend_Search_Lucene_Search_Query_MultiTerm();
-            $query->setBoost($this->getBoost());
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            foreach ($index->getFieldNames(true) as $fieldName) {
-                $term = new Zend_Search_Lucene_Index_Term($this->_term->text, $fieldName);
-
-                $query->addTerm($term);
-            }
-
-            return $query->rewrite($index);
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        // Check, that index contains specified term
-        if (!$index->hasTerm($this->_term)) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        }
-
-        return $this;
-    }
-
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Search/Weight/Term.php';
-        $this->_weight = new Zend_Search_Lucene_Search_Weight_Term($this->_term, $this, $reader);
-        return $this->_weight;
-    }
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        $this->_docVector = array_flip($reader->termDocs($this->_term, $docsFilter));
-        $this->_termFreqs = $reader->termFreqs($this->_term, $docsFilter);
-
-        // Initialize weight if it's not done yet
-        $this->_initWeight($reader);
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     */
-    public function matchedDocs()
-    {
-        return $this->_docVector;
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        if (isset($this->_docVector[$docId])) {
-            return $reader->getSimilarity()->tf($this->_termFreqs[$docId]) *
-                   $this->_weight->getValue() *
-                   $reader->norm($docId, $this->_term->field) *
-                   $this->getBoost();
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     */
-    public function getQueryTerms()
-    {
-        return array($this->_term);
-    }
-
-    /**
-     * Return query term
-     *
-     * @return Zend_Search_Lucene_Index_Term
-     */
-    public function getTerm()
-    {
-        return $this->_term;
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $highlighter->highlight($this->_term->text);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if ($this->_term->field !== null) {
-            $query = $this->_term->field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= $this->_term->text;
-
-        if ($this->getBoost() != 1) {
-            $query = $query . '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Wildcard.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Wildcard.php
deleted file mode 100644
index f3fe4cdc2..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Query/Wildcard.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Wildcard.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Query */
-require_once 'Zend/Search/Lucene/Search/Query.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Query_Wildcard extends Zend_Search_Lucene_Search_Query
-{
-    /**
-     * Search pattern.
-     *
-     * Field has to be fully specified or has to be null
-     * Text may contain '*' or '?' symbols
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_pattern;
-
-    /**
-     * Matched terms.
-     *
-     * Matched terms list.
-     * It's filled during the search (rewrite operation) and may be used for search result
-     * post-processing
-     *
-     * Array of Zend_Search_Lucene_Index_Term objects
-     *
-     * @var array
-     */
-    private $_matches = null;
-
-    /**
-     * Minimum term prefix length (number of minimum non-wildcard characters)
-     *
-     * @var integer
-     */
-    private static $_minPrefixLength = 3;
-
-    /**
-     * Zend_Search_Lucene_Search_Query_Wildcard constructor.
-     *
-     * @param Zend_Search_Lucene_Index_Term $pattern
-     */
-    public function __construct(Zend_Search_Lucene_Index_Term $pattern)
-    {
-        $this->_pattern = $pattern;
-    }
-
-    /**
-     * Get minimum prefix length
-     *
-     * @return integer
-     */
-    public static function getMinPrefixLength()
-    {
-        return self::$_minPrefixLength;
-    }
-
-    /**
-     * Set minimum prefix length
-     *
-     * @param integer $minPrefixLength
-     */
-    public static function setMinPrefixLength($minPrefixLength)
-    {
-        self::$_minPrefixLength = $minPrefixLength;
-    }
-
-    /**
-     * Get terms prefix
-     *
-     * @param string $word
-     * @return string
-     */
-    private static function _getPrefix($word)
-    {
-        $questionMarkPosition = strpos($word, '?');
-        $astrericPosition     = strpos($word, '*');
-
-        if ($questionMarkPosition !== false) {
-            if ($astrericPosition !== false) {
-                return substr($word, 0, min($questionMarkPosition, $astrericPosition));
-            }
-
-            return substr($word, 0, $questionMarkPosition);
-        } else if ($astrericPosition !== false) {
-            return substr($word, 0, $astrericPosition);
-        }
-
-        return $word;
-    }
-
-    /**
-     * Re-write query into primitive queries in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function rewrite(Zend_Search_Lucene_Interface $index)
-    {
-        $this->_matches = array();
-
-        if ($this->_pattern->field === null) {
-            // Search through all fields
-            $fields = $index->getFieldNames(true /* indexed fields list */);
-        } else {
-            $fields = array($this->_pattern->field);
-        }
-
-        $prefix          = self::_getPrefix($this->_pattern->text);
-        $prefixLength    = strlen($prefix);
-        $matchExpression = '/^' . str_replace(array('\\?', '\\*'), array('.', '.*') , preg_quote($this->_pattern->text, '/')) . '$/';
-
-        if ($prefixLength < self::$_minPrefixLength) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('At least ' . self::$_minPrefixLength . ' non-wildcard characters are required at the beginning of pattern.');
-        }
-
-        /** @todo check for PCRE unicode support may be performed through Zend_Environment in some future */
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            // PCRE unicode support is turned on
-            // add Unicode modifier to the match expression
-            $matchExpression .= 'u';
-        }
-
-        $maxTerms = Zend_Search_Lucene::getTermsPerQueryLimit();
-        foreach ($fields as $field) {
-            $index->resetTermsStream();
-
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            if ($prefix != '') {
-                $index->skipTo(new Zend_Search_Lucene_Index_Term($prefix, $field));
-
-                while ($index->currentTerm() !== null          &&
-                       $index->currentTerm()->field == $field  &&
-                       substr($index->currentTerm()->text, 0, $prefixLength) == $prefix) {
-                    if (preg_match($matchExpression, $index->currentTerm()->text) === 1) {
-                        $this->_matches[] = $index->currentTerm();
-
-                        if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                            require_once 'Zend/Search/Lucene/Exception.php';
-                            throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                        }
-                    }
-
-                    $index->nextTerm();
-                }
-            } else {
-                $index->skipTo(new Zend_Search_Lucene_Index_Term('', $field));
-
-                while ($index->currentTerm() !== null  &&  $index->currentTerm()->field == $field) {
-                    if (preg_match($matchExpression, $index->currentTerm()->text) === 1) {
-                        $this->_matches[] = $index->currentTerm();
-
-                        if ($maxTerms != 0  &&  count($this->_matches) > $maxTerms) {
-                            require_once 'Zend/Search/Lucene/Exception.php';
-                            throw new Zend_Search_Lucene_Exception('Terms per query limit is reached.');
-                        }
-                    }
-
-                    $index->nextTerm();
-                }
-            }
-
-            $index->closeTermsStream();
-        }
-
-        if (count($this->_matches) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Empty.php';
-            return new Zend_Search_Lucene_Search_Query_Empty();
-        } else if (count($this->_matches) == 1) {
-            require_once 'Zend/Search/Lucene/Search/Query/Term.php';
-            return new Zend_Search_Lucene_Search_Query_Term(reset($this->_matches));
-        } else {
-            require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-            $rewrittenQuery = new Zend_Search_Lucene_Search_Query_MultiTerm();
-
-            foreach ($this->_matches as $matchedTerm) {
-                $rewrittenQuery->addTerm($matchedTerm);
-            }
-
-            return $rewrittenQuery;
-        }
-    }
-
-    /**
-     * Optimize query in the context of specified index
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function optimize(Zend_Search_Lucene_Interface $index)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Wildcard query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-
-    /**
-     * Returns query pattern
-     *
-     * @return Zend_Search_Lucene_Index_Term
-     */
-    public function getPattern()
-    {
-        return $this->_pattern;
-    }
-
-
-    /**
-     * Return query terms
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function getQueryTerms()
-    {
-        if ($this->_matches === null) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Search has to be performed first to get matched terms');
-        }
-
-        return $this->_matches;
-    }
-
-    /**
-     * Constructs an appropriate Weight implementation for this query.
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return Zend_Search_Lucene_Search_Weight
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function createWeight(Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Wildcard query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-
-    /**
-     * Execute query in context of index reader
-     * It also initializes necessary internal structures
-     *
-     * @param Zend_Search_Lucene_Interface $reader
-     * @param Zend_Search_Lucene_Index_DocsFilter|null $docsFilter
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function execute(Zend_Search_Lucene_Interface $reader, $docsFilter = null)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Wildcard query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Get document ids likely matching the query
-     *
-     * It's an array with document ids as keys (performance considerations)
-     *
-     * @return array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function matchedDocs()
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Wildcard query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Score specified document
-     *
-     * @param integer $docId
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function score($docId, Zend_Search_Lucene_Interface $reader)
-    {
-        require_once 'Zend/Search/Lucene/Exception.php';
-        throw new Zend_Search_Lucene_Exception('Wildcard query should not be directly used for search. Use $query->rewrite($index)');
-    }
-
-    /**
-     * Query specific matches highlighting
-     *
-     * @param Zend_Search_Lucene_Search_Highlighter_Interface $highlighter  Highlighter object (also contains doc for highlighting)
-     */
-    protected function _highlightMatches(Zend_Search_Lucene_Search_Highlighter_Interface $highlighter)
-    {
-        $words = array();
-
-        $matchExpression = '/^' . str_replace(array('\\?', '\\*'), array('.', '.*') , preg_quote($this->_pattern->text, '/')) . '$/';
-        if (@preg_match('/\pL/u', 'a') == 1) {
-            // PCRE unicode support is turned on
-            // add Unicode modifier to the match expression
-            $matchExpression .= 'u';
-        }
-
-        $docBody = $highlighter->getDocument()->getFieldUtf8Value('body');
-        require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($docBody, 'UTF-8');
-        foreach ($tokens as $token) {
-            if (preg_match($matchExpression, $token->getTermText()) === 1) {
-                $words[] = $token->getTermText();
-            }
-        }
-
-        $highlighter->highlight($words);
-    }
-
-    /**
-     * Print a query
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        // It's used only for query visualisation, so we don't care about characters escaping
-        if ($this->_pattern->field !== null) {
-            $query = $this->_pattern->field . ':';
-        } else {
-            $query = '';
-        }
-
-        $query .= $this->_pattern->text;
-
-        if ($this->getBoost() != 1) {
-            $query = $query . '^' . round($this->getBoost(), 4);
-        }
-
-        return $query;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry.php
deleted file mode 100644
index 41c03aeb7..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryEntry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Search_QueryEntry
-{
-    /**
-     * Query entry boost factor
-     *
-     * @var float
-     */
-    protected $_boost = 1.0;
-
-
-    /**
-     * Process modifier ('~')
-     *
-     * @param mixed $parameter
-     */
-    abstract public function processFuzzyProximityModifier($parameter = null);
-
-
-    /**
-     * Transform entry to a subquery
-     *
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    abstract public function getQuery($encoding);
-
-    /**
-     * Boost query entry
-     *
-     * @param float $boostFactor
-     */
-    public function boost($boostFactor)
-    {
-        $this->_boost *= $boostFactor;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
deleted file mode 100644
index 923b6a51d..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Search_QueryEntry */
-require_once 'Zend/Search/Lucene/Search/QueryEntry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryEntry_Phrase extends Zend_Search_Lucene_Search_QueryEntry
-{
-    /**
-     * Phrase value
-     *
-     * @var string
-     */
-    private $_phrase;
-
-    /**
-     * Field
-     *
-     * @var string|null
-     */
-    private $_field;
-
-
-    /**
-     * Proximity phrase query
-     *
-     * @var boolean
-     */
-    private $_proximityQuery = false;
-
-    /**
-     * Words distance, used for proximiti queries
-     *
-     * @var integer
-     */
-    private $_wordsDistance = 0;
-
-
-    /**
-     * Object constractor
-     *
-     * @param string $phrase
-     * @param string $field
-     */
-    public function __construct($phrase, $field)
-    {
-        $this->_phrase = $phrase;
-        $this->_field  = $field;
-    }
-
-    /**
-     * Process modifier ('~')
-     *
-     * @param mixed $parameter
-     */
-    public function processFuzzyProximityModifier($parameter = null)
-    {
-        $this->_proximityQuery = true;
-
-        if ($parameter !== null) {
-            $this->_wordsDistance = $parameter;
-        }
-    }
-
-    /**
-     * Transform entry to a subquery
-     *
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function getQuery($encoding)
-    {
-        /** Zend_Search_Lucene_Search_Query_Preprocessing_Phrase */
-        require_once 'Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php';
-        $query = new Zend_Search_Lucene_Search_Query_Preprocessing_Phrase($this->_phrase,
-                                                                          $encoding,
-                                                                          ($this->_field !== null)?
-                                                                              iconv($encoding, 'UTF-8', $this->_field) :
-                                                                              null);
-
-        if ($this->_proximityQuery) {
-            $query->setSlop($this->_wordsDistance);
-        }
-
-        $query->setBoost($this->_boost);
-
-        return $query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
deleted file mode 100644
index 9f70ad32b..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Subquery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Search_QueryEntry */
-require_once 'Zend/Search/Lucene/Search/QueryEntry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryEntry_Subquery extends Zend_Search_Lucene_Search_QueryEntry
-{
-    /**
-     * Query
-     *
-     * @var Zend_Search_Lucene_Search_Query
-     */
-    private $_query;
-
-    /**
-     * Object constractor
-     *
-     * @param Zend_Search_Lucene_Search_Query $query
-     */
-    public function __construct(Zend_Search_Lucene_Search_Query $query)
-    {
-        $this->_query = $query;
-    }
-
-    /**
-     * Process modifier ('~')
-     *
-     * @param mixed $parameter
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function processFuzzyProximityModifier($parameter = null)
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        throw new Zend_Search_Lucene_Search_QueryParserException('\'~\' sign must follow term or phrase');
-    }
-
-
-    /**
-     * Transform entry to a subquery
-     *
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function getQuery($encoding)
-    {
-        $this->_query->setBoost($this->_boost);
-
-        return $this->_query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Term.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
deleted file mode 100644
index 0997b8eea..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryEntry/Term.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Search_QueryEntry */
-require_once 'Zend/Search/Lucene/Search/QueryEntry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryEntry_Term extends Zend_Search_Lucene_Search_QueryEntry
-{
-    /**
-     * Term value
-     *
-     * @var string
-     */
-    private $_term;
-
-    /**
-     * Field
-     *
-     * @var string|null
-     */
-    private $_field;
-
-
-    /**
-     * Fuzzy search query
-     *
-     * @var boolean
-     */
-    private $_fuzzyQuery = false;
-
-    /**
-     * Similarity
-     *
-     * @var float
-     */
-    private $_similarity = 1.;
-
-
-    /**
-     * Object constractor
-     *
-     * @param string $term
-     * @param string $field
-     */
-    public function __construct($term, $field)
-    {
-        $this->_term  = $term;
-        $this->_field = $field;
-    }
-
-    /**
-     * Process modifier ('~')
-     *
-     * @param mixed $parameter
-     */
-    public function processFuzzyProximityModifier($parameter = null)
-    {
-        $this->_fuzzyQuery = true;
-
-        if ($parameter !== null) {
-            $this->_similarity = $parameter;
-        } else {
-            /** Zend_Search_Lucene_Search_Query_Fuzzy */
-            require_once 'Zend/Search/Lucene/Search/Query/Fuzzy.php';
-            $this->_similarity = Zend_Search_Lucene_Search_Query_Fuzzy::DEFAULT_MIN_SIMILARITY;
-        }
-    }
-
-    /**
-     * Transform entry to a subquery
-     *
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function getQuery($encoding)
-    {
-        if ($this->_fuzzyQuery) {
-            /** Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy */
-            require_once 'Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php';
-            $query = new Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy($this->_term,
-                                                                             $encoding,
-                                                                             ($this->_field !== null)?
-                                                                                  iconv($encoding, 'UTF-8', $this->_field) :
-                                                                                  null,
-                                                                             $this->_similarity
-                                                                             );
-            $query->setBoost($this->_boost);
-            return $query;
-        }
-
-
-        /** Zend_Search_Lucene_Search_Query_Preprocessing_Term */
-        require_once 'Zend/Search/Lucene/Search/Query/Preprocessing/Term.php';
-        $query = new Zend_Search_Lucene_Search_Query_Preprocessing_Term($this->_term,
-                                                                        $encoding,
-                                                                        ($this->_field !== null)?
-                                                                              iconv($encoding, 'UTF-8', $this->_field) :
-                                                                              null
-                                                                        );
-        $query->setBoost($this->_boost);
-        return $query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryHit.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryHit.php
deleted file mode 100644
index 4aad093d3..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryHit.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryHit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryHit
-{
-    /**
-     * Object handle of the index
-     * @var Zend_Search_Lucene_Interface
-     */
-    protected $_index = null;
-
-    /**
-     * Object handle of the document associated with this hit
-     * @var Zend_Search_Lucene_Document
-     */
-    protected $_document = null;
-
-    /**
-     * Number of the document in the index
-     * @var integer
-     */
-    public $id;
-
-    /**
-     * Score of the hit
-     * @var float
-     */
-    public $score;
-
-
-    /**
-     * Constructor - pass object handle of Zend_Search_Lucene_Interface index that produced
-     * the hit so the document can be retrieved easily from the hit.
-     *
-     * @param Zend_Search_Lucene_Interface $index
-     */
-
-    public function __construct(Zend_Search_Lucene_Interface $index)
-    {
-        require_once 'Zend/Search/Lucene/Proxy.php';
-        $this->_index = new Zend_Search_Lucene_Proxy($index);
-    }
-
-
-    /**
-     * Convenience function for getting fields from the document
-     * associated with this hit.
-     *
-     * @param string $offset
-     * @return string
-     */
-    public function __get($offset)
-    {
-        return $this->getDocument()->getFieldValue($offset);
-    }
-
-
-    /**
-     * Return the document object for this hit
-     *
-     * @return Zend_Search_Lucene_Document
-     */
-    public function getDocument()
-    {
-        if (!$this->_document instanceof Zend_Search_Lucene_Document) {
-            $this->_document = $this->_index->getDocument($this->id);
-        }
-
-        return $this->_document;
-    }
-
-
-    /**
-     * Return the index object for this hit
-     *
-     * @return Zend_Search_Lucene_Interface
-     */
-    public function getIndex()
-    {
-        return $this->_index;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryLexer.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryLexer.php
deleted file mode 100644
index ce1876dda..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryLexer.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryLexer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_FSM */
-require_once 'Zend/Search/Lucene/FSM.php';
-
-/** Zend_Search_Lucene_Search_QueryParser */
-require_once 'Zend/Search/Lucene/Search/QueryToken.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryLexer extends Zend_Search_Lucene_FSM
-{
-    /** State Machine states */
-    const ST_WHITE_SPACE     = 0;
-    const ST_SYNT_LEXEME     = 1;
-    const ST_LEXEME          = 2;
-    const ST_QUOTED_LEXEME   = 3;
-    const ST_ESCAPED_CHAR    = 4;
-    const ST_ESCAPED_QCHAR   = 5;
-    const ST_LEXEME_MODIFIER = 6;
-    const ST_NUMBER          = 7;
-    const ST_MANTISSA        = 8;
-    const ST_ERROR           = 9;
-
-    /** Input symbols */
-    const IN_WHITE_SPACE     = 0;
-    const IN_SYNT_CHAR       = 1;
-    const IN_LEXEME_MODIFIER = 2;
-    const IN_ESCAPE_CHAR     = 3;
-    const IN_QUOTE           = 4;
-    const IN_DECIMAL_POINT   = 5;
-    const IN_ASCII_DIGIT     = 6;
-    const IN_CHAR            = 7;
-    const IN_MUTABLE_CHAR    = 8;
-
-    const QUERY_WHITE_SPACE_CHARS      = " \n\r\t";
-    const QUERY_SYNT_CHARS             = ':()[]{}!|&';
-    const QUERY_MUTABLE_CHARS          = '+-';
-    const QUERY_DOUBLECHARLEXEME_CHARS = '|&';
-    const QUERY_LEXEMEMODIFIER_CHARS   = '~^';
-    const QUERY_ASCIIDIGITS_CHARS      = '0123456789';
-
-    /**
-     * List of recognized lexemes
-     *
-     * @var array
-     */
-    private $_lexemes;
-
-    /**
-     * Query string (array of single- or non single-byte characters)
-     *
-     * @var array
-     */
-    private $_queryString;
-
-    /**
-     * Current position within a query string
-     * Used to create appropriate error messages
-     *
-     * @var integer
-     */
-    private $_queryStringPosition;
-
-    /**
-     * Recognized part of current lexeme
-     *
-     * @var string
-     */
-    private $_currentLexeme;
-
-    public function __construct()
-    {
-        parent::__construct( array(self::ST_WHITE_SPACE,
-                                   self::ST_SYNT_LEXEME,
-                                   self::ST_LEXEME,
-                                   self::ST_QUOTED_LEXEME,
-                                   self::ST_ESCAPED_CHAR,
-                                   self::ST_ESCAPED_QCHAR,
-                                   self::ST_LEXEME_MODIFIER,
-                                   self::ST_NUMBER,
-                                   self::ST_MANTISSA,
-                                   self::ST_ERROR),
-                             array(self::IN_WHITE_SPACE,
-                                   self::IN_SYNT_CHAR,
-                                   self::IN_MUTABLE_CHAR,
-                                   self::IN_LEXEME_MODIFIER,
-                                   self::IN_ESCAPE_CHAR,
-                                   self::IN_QUOTE,
-                                   self::IN_DECIMAL_POINT,
-                                   self::IN_ASCII_DIGIT,
-                                   self::IN_CHAR));
-
-
-        $lexemeModifierErrorAction    = new Zend_Search_Lucene_FSMAction($this, 'lexModifierErrException');
-        $quoteWithinLexemeErrorAction = new Zend_Search_Lucene_FSMAction($this, 'quoteWithinLexemeErrException');
-        $wrongNumberErrorAction       = new Zend_Search_Lucene_FSMAction($this, 'wrongNumberErrException');
-
-
-
-        $this->addRules(array( array(self::ST_WHITE_SPACE,   self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_WHITE_SPACE,   self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_WHITE_SPACE,   self::IN_MUTABLE_CHAR,    self::ST_SYNT_LEXEME),
-                               array(self::ST_WHITE_SPACE,   self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-                               array(self::ST_WHITE_SPACE,   self::IN_ESCAPE_CHAR,     self::ST_ESCAPED_CHAR),
-                               array(self::ST_WHITE_SPACE,   self::IN_QUOTE,           self::ST_QUOTED_LEXEME),
-                               array(self::ST_WHITE_SPACE,   self::IN_DECIMAL_POINT,   self::ST_LEXEME),
-                               array(self::ST_WHITE_SPACE,   self::IN_ASCII_DIGIT,     self::ST_LEXEME),
-                               array(self::ST_WHITE_SPACE,   self::IN_CHAR,            self::ST_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_SYNT_LEXEME,   self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_SYNT_LEXEME,   self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_SYNT_LEXEME,   self::IN_MUTABLE_CHAR,    self::ST_SYNT_LEXEME),
-                               array(self::ST_SYNT_LEXEME,   self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-                               array(self::ST_SYNT_LEXEME,   self::IN_ESCAPE_CHAR,     self::ST_ESCAPED_CHAR),
-                               array(self::ST_SYNT_LEXEME,   self::IN_QUOTE,           self::ST_QUOTED_LEXEME),
-                               array(self::ST_SYNT_LEXEME,   self::IN_DECIMAL_POINT,   self::ST_LEXEME),
-                               array(self::ST_SYNT_LEXEME,   self::IN_ASCII_DIGIT,     self::ST_LEXEME),
-                               array(self::ST_SYNT_LEXEME,   self::IN_CHAR,            self::ST_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_LEXEME,        self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_LEXEME,        self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_LEXEME,        self::IN_MUTABLE_CHAR,    self::ST_LEXEME),
-                               array(self::ST_LEXEME,        self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-                               array(self::ST_LEXEME,        self::IN_ESCAPE_CHAR,     self::ST_ESCAPED_CHAR),
-
-                               // IN_QUOTE     not allowed
-                               array(self::ST_LEXEME,        self::IN_QUOTE,           self::ST_ERROR, $quoteWithinLexemeErrorAction),
-
-                               array(self::ST_LEXEME,        self::IN_DECIMAL_POINT,   self::ST_LEXEME),
-                               array(self::ST_LEXEME,        self::IN_ASCII_DIGIT,     self::ST_LEXEME),
-                               array(self::ST_LEXEME,        self::IN_CHAR,            self::ST_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_QUOTED_LEXEME, self::IN_WHITE_SPACE,     self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_SYNT_CHAR,       self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_MUTABLE_CHAR,    self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_LEXEME_MODIFIER, self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_ESCAPE_CHAR,     self::ST_ESCAPED_QCHAR),
-                               array(self::ST_QUOTED_LEXEME, self::IN_QUOTE,           self::ST_WHITE_SPACE),
-                               array(self::ST_QUOTED_LEXEME, self::IN_DECIMAL_POINT,   self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_ASCII_DIGIT,     self::ST_QUOTED_LEXEME),
-                               array(self::ST_QUOTED_LEXEME, self::IN_CHAR,            self::ST_QUOTED_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_ESCAPED_CHAR,  self::IN_WHITE_SPACE,     self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_SYNT_CHAR,       self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_MUTABLE_CHAR,    self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_LEXEME_MODIFIER, self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_ESCAPE_CHAR,     self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_QUOTE,           self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_DECIMAL_POINT,   self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_ASCII_DIGIT,     self::ST_LEXEME),
-                               array(self::ST_ESCAPED_CHAR,  self::IN_CHAR,            self::ST_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_ESCAPED_QCHAR, self::IN_WHITE_SPACE,     self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_SYNT_CHAR,       self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_MUTABLE_CHAR,    self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_LEXEME_MODIFIER, self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_ESCAPE_CHAR,     self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_QUOTE,           self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_DECIMAL_POINT,   self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_ASCII_DIGIT,     self::ST_QUOTED_LEXEME),
-                               array(self::ST_ESCAPED_QCHAR, self::IN_CHAR,            self::ST_QUOTED_LEXEME)
-                             ));
-        $this->addRules(array( array(self::ST_LEXEME_MODIFIER, self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_LEXEME_MODIFIER, self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_LEXEME_MODIFIER, self::IN_MUTABLE_CHAR,    self::ST_SYNT_LEXEME),
-                               array(self::ST_LEXEME_MODIFIER, self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-
-                               // IN_ESCAPE_CHAR       not allowed
-                               array(self::ST_LEXEME_MODIFIER, self::IN_ESCAPE_CHAR,     self::ST_ERROR, $lexemeModifierErrorAction),
-
-                               // IN_QUOTE             not allowed
-                               array(self::ST_LEXEME_MODIFIER, self::IN_QUOTE,           self::ST_ERROR, $lexemeModifierErrorAction),
-
-
-                               array(self::ST_LEXEME_MODIFIER, self::IN_DECIMAL_POINT,   self::ST_MANTISSA),
-                               array(self::ST_LEXEME_MODIFIER, self::IN_ASCII_DIGIT,     self::ST_NUMBER),
-
-                               // IN_CHAR              not allowed
-                               array(self::ST_LEXEME_MODIFIER, self::IN_CHAR,            self::ST_ERROR, $lexemeModifierErrorAction),
-                             ));
-        $this->addRules(array( array(self::ST_NUMBER, self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_NUMBER, self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_NUMBER, self::IN_MUTABLE_CHAR,    self::ST_SYNT_LEXEME),
-                               array(self::ST_NUMBER, self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-
-                               // IN_ESCAPE_CHAR       not allowed
-                               array(self::ST_NUMBER, self::IN_ESCAPE_CHAR,     self::ST_ERROR, $wrongNumberErrorAction),
-
-                               // IN_QUOTE             not allowed
-                               array(self::ST_NUMBER, self::IN_QUOTE,           self::ST_ERROR, $wrongNumberErrorAction),
-
-                               array(self::ST_NUMBER, self::IN_DECIMAL_POINT,   self::ST_MANTISSA),
-                               array(self::ST_NUMBER, self::IN_ASCII_DIGIT,     self::ST_NUMBER),
-
-                               // IN_CHAR              not allowed
-                               array(self::ST_NUMBER, self::IN_CHAR,            self::ST_ERROR, $wrongNumberErrorAction),
-                             ));
-        $this->addRules(array( array(self::ST_MANTISSA, self::IN_WHITE_SPACE,     self::ST_WHITE_SPACE),
-                               array(self::ST_MANTISSA, self::IN_SYNT_CHAR,       self::ST_SYNT_LEXEME),
-                               array(self::ST_MANTISSA, self::IN_MUTABLE_CHAR,    self::ST_SYNT_LEXEME),
-                               array(self::ST_MANTISSA, self::IN_LEXEME_MODIFIER, self::ST_LEXEME_MODIFIER),
-
-                               // IN_ESCAPE_CHAR       not allowed
-                               array(self::ST_MANTISSA, self::IN_ESCAPE_CHAR,     self::ST_ERROR, $wrongNumberErrorAction),
-
-                               // IN_QUOTE             not allowed
-                               array(self::ST_MANTISSA, self::IN_QUOTE,           self::ST_ERROR, $wrongNumberErrorAction),
-
-                               // IN_DECIMAL_POINT     not allowed
-                               array(self::ST_MANTISSA, self::IN_DECIMAL_POINT,   self::ST_ERROR, $wrongNumberErrorAction),
-
-                               array(self::ST_MANTISSA, self::IN_ASCII_DIGIT,     self::ST_MANTISSA),
-
-                               // IN_CHAR              not allowed
-                               array(self::ST_MANTISSA, self::IN_CHAR,            self::ST_ERROR, $wrongNumberErrorAction),
-                             ));
-
-
-        /** Actions */
-        $syntaxLexemeAction    = new Zend_Search_Lucene_FSMAction($this, 'addQuerySyntaxLexeme');
-        $lexemeModifierAction  = new Zend_Search_Lucene_FSMAction($this, 'addLexemeModifier');
-        $addLexemeAction       = new Zend_Search_Lucene_FSMAction($this, 'addLexeme');
-        $addQuotedLexemeAction = new Zend_Search_Lucene_FSMAction($this, 'addQuotedLexeme');
-        $addNumberLexemeAction = new Zend_Search_Lucene_FSMAction($this, 'addNumberLexeme');
-        $addLexemeCharAction   = new Zend_Search_Lucene_FSMAction($this, 'addLexemeChar');
-
-
-        /** Syntax lexeme */
-        $this->addEntryAction(self::ST_SYNT_LEXEME,  $syntaxLexemeAction);
-        // Two lexemes in succession
-        $this->addTransitionAction(self::ST_SYNT_LEXEME, self::ST_SYNT_LEXEME, $syntaxLexemeAction);
-
-
-        /** Lexeme */
-        $this->addEntryAction(self::ST_LEXEME,                       $addLexemeCharAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_LEXEME, $addLexemeCharAction);
-        // ST_ESCAPED_CHAR => ST_LEXEME transition is covered by ST_LEXEME entry action
-
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_WHITE_SPACE,     $addLexemeAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_SYNT_LEXEME,     $addLexemeAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_QUOTED_LEXEME,   $addLexemeAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_LEXEME_MODIFIER, $addLexemeAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_NUMBER,          $addLexemeAction);
-        $this->addTransitionAction(self::ST_LEXEME, self::ST_MANTISSA,        $addLexemeAction);
-
-
-        /** Quoted lexeme */
-        // We don't need entry action (skeep quote)
-        $this->addTransitionAction(self::ST_QUOTED_LEXEME, self::ST_QUOTED_LEXEME, $addLexemeCharAction);
-        $this->addTransitionAction(self::ST_ESCAPED_QCHAR, self::ST_QUOTED_LEXEME, $addLexemeCharAction);
-        // Closing quote changes state to the ST_WHITE_SPACE   other states are not used
-        $this->addTransitionAction(self::ST_QUOTED_LEXEME, self::ST_WHITE_SPACE,   $addQuotedLexemeAction);
-
-
-        /** Lexeme modifier */
-        $this->addEntryAction(self::ST_LEXEME_MODIFIER, $lexemeModifierAction);
-
-
-        /** Number */
-        $this->addEntryAction(self::ST_NUMBER,                           $addLexemeCharAction);
-        $this->addEntryAction(self::ST_MANTISSA,                         $addLexemeCharAction);
-        $this->addTransitionAction(self::ST_NUMBER,   self::ST_NUMBER,   $addLexemeCharAction);
-        // ST_NUMBER => ST_MANTISSA transition is covered by ST_MANTISSA entry action
-        $this->addTransitionAction(self::ST_MANTISSA, self::ST_MANTISSA, $addLexemeCharAction);
-
-        $this->addTransitionAction(self::ST_NUMBER,   self::ST_WHITE_SPACE,     $addNumberLexemeAction);
-        $this->addTransitionAction(self::ST_NUMBER,   self::ST_SYNT_LEXEME,     $addNumberLexemeAction);
-        $this->addTransitionAction(self::ST_NUMBER,   self::ST_LEXEME_MODIFIER, $addNumberLexemeAction);
-        $this->addTransitionAction(self::ST_MANTISSA, self::ST_WHITE_SPACE,     $addNumberLexemeAction);
-        $this->addTransitionAction(self::ST_MANTISSA, self::ST_SYNT_LEXEME,     $addNumberLexemeAction);
-        $this->addTransitionAction(self::ST_MANTISSA, self::ST_LEXEME_MODIFIER, $addNumberLexemeAction);
-    }
-
-
-
-
-    /**
-     * Translate input char to an input symbol of state machine
-     *
-     * @param string $char
-     * @return integer
-     */
-    private function _translateInput($char)
-    {
-        if        (strpos(self::QUERY_WHITE_SPACE_CHARS,    $char) !== false) { return self::IN_WHITE_SPACE;
-        } else if (strpos(self::QUERY_SYNT_CHARS,           $char) !== false) { return self::IN_SYNT_CHAR;
-        } else if (strpos(self::QUERY_MUTABLE_CHARS,        $char) !== false) { return self::IN_MUTABLE_CHAR;
-        } else if (strpos(self::QUERY_LEXEMEMODIFIER_CHARS, $char) !== false) { return self::IN_LEXEME_MODIFIER;
-        } else if (strpos(self::QUERY_ASCIIDIGITS_CHARS,    $char) !== false) { return self::IN_ASCII_DIGIT;
-        } else if ($char === '"' )                                            { return self::IN_QUOTE;
-        } else if ($char === '.' )                                            { return self::IN_DECIMAL_POINT;
-        } else if ($char === '\\')                                            { return self::IN_ESCAPE_CHAR;
-        } else                                                                { return self::IN_CHAR;
-        }
-    }
-
-
-    /**
-     * This method is used to tokenize query string into lexemes
-     *
-     * @param string $inputString
-     * @param string $encoding
-     * @return array
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function tokenize($inputString, $encoding)
-    {
-        $this->reset();
-
-        $this->_lexemes     = array();
-        $this->_queryString = array();
-
-        if (PHP_OS == 'AIX' && $encoding == '') {
-            $encoding = 'ISO8859-1';
-        }
-        $strLength = iconv_strlen($inputString, $encoding);
-
-        // Workaround for iconv_substr bug
-        $inputString .= ' ';
-
-        for ($count = 0; $count < $strLength; $count++) {
-            $this->_queryString[$count] = iconv_substr($inputString, $count, 1, $encoding);
-        }
-
-        for ($this->_queryStringPosition = 0;
-             $this->_queryStringPosition < count($this->_queryString);
-             $this->_queryStringPosition++) {
-            $this->process($this->_translateInput($this->_queryString[$this->_queryStringPosition]));
-        }
-
-        $this->process(self::IN_WHITE_SPACE);
-
-        if ($this->getState() != self::ST_WHITE_SPACE) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Unexpected end of query');
-        }
-
-        $this->_queryString = null;
-
-        return $this->_lexemes;
-    }
-
-
-
-    /*********************************************************************
-     * Actions implementation
-     *
-     * Actions affect on recognized lexemes list
-     *********************************************************************/
-
-    /**
-     * Add query syntax lexeme
-     *
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function addQuerySyntaxLexeme()
-    {
-        $lexeme = $this->_queryString[$this->_queryStringPosition];
-
-        // Process two char lexemes
-        if (strpos(self::QUERY_DOUBLECHARLEXEME_CHARS, $lexeme) !== false) {
-            // increase current position in a query string
-            $this->_queryStringPosition++;
-
-            // check,
-            if ($this->_queryStringPosition == count($this->_queryString)  ||
-                $this->_queryString[$this->_queryStringPosition] != $lexeme) {
-                    require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-                    throw new Zend_Search_Lucene_Search_QueryParserException('Two chars lexeme expected. ' . $this->_positionMsg());
-                }
-
-            // duplicate character
-            $lexeme .= $lexeme;
-        }
-
-        $token = new Zend_Search_Lucene_Search_QueryToken(
-                                Zend_Search_Lucene_Search_QueryToken::TC_SYNTAX_ELEMENT,
-                                $lexeme,
-                                $this->_queryStringPosition);
-
-        // Skip this lexeme if it's a field indicator ':' and treat previous as 'field' instead of 'word'
-        if ($token->type == Zend_Search_Lucene_Search_QueryToken::TT_FIELD_INDICATOR) {
-            $token = array_pop($this->_lexemes);
-            if ($token === null  ||  $token->type != Zend_Search_Lucene_Search_QueryToken::TT_WORD) {
-                require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-                throw new Zend_Search_Lucene_Search_QueryParserException('Field mark \':\' must follow field name. ' . $this->_positionMsg());
-            }
-
-            $token->type = Zend_Search_Lucene_Search_QueryToken::TT_FIELD;
-        }
-
-        $this->_lexemes[] = $token;
-    }
-
-    /**
-     * Add lexeme modifier
-     */
-    public function addLexemeModifier()
-    {
-        $this->_lexemes[] = new Zend_Search_Lucene_Search_QueryToken(
-                                    Zend_Search_Lucene_Search_QueryToken::TC_SYNTAX_ELEMENT,
-                                    $this->_queryString[$this->_queryStringPosition],
-                                    $this->_queryStringPosition);
-    }
-
-
-    /**
-     * Add lexeme
-     */
-    public function addLexeme()
-    {
-        $this->_lexemes[] = new Zend_Search_Lucene_Search_QueryToken(
-                                    Zend_Search_Lucene_Search_QueryToken::TC_WORD,
-                                    $this->_currentLexeme,
-                                    $this->_queryStringPosition - 1);
-
-        $this->_currentLexeme = '';
-    }
-
-    /**
-     * Add quoted lexeme
-     */
-    public function addQuotedLexeme()
-    {
-        $this->_lexemes[] = new Zend_Search_Lucene_Search_QueryToken(
-                                    Zend_Search_Lucene_Search_QueryToken::TC_PHRASE,
-                                    $this->_currentLexeme,
-                                    $this->_queryStringPosition);
-
-        $this->_currentLexeme = '';
-    }
-
-    /**
-     * Add number lexeme
-     */
-    public function addNumberLexeme()
-    {
-        $this->_lexemes[] = new Zend_Search_Lucene_Search_QueryToken(
-                                    Zend_Search_Lucene_Search_QueryToken::TC_NUMBER,
-                                    $this->_currentLexeme,
-                                    $this->_queryStringPosition - 1);
-        $this->_currentLexeme = '';
-    }
-
-    /**
-     * Extend lexeme by one char
-     */
-    public function addLexemeChar()
-    {
-        $this->_currentLexeme .= $this->_queryString[$this->_queryStringPosition];
-    }
-
-
-    /**
-     * Position message
-     *
-     * @return string
-     */
-    private function _positionMsg()
-    {
-        return 'Position is ' . $this->_queryStringPosition . '.';
-    }
-
-
-    /*********************************************************************
-     * Syntax errors actions
-     *********************************************************************/
-    public function lexModifierErrException()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        throw new Zend_Search_Lucene_Search_QueryParserException('Lexeme modifier character can be followed only by number, white space or query syntax element. ' . $this->_positionMsg());
-    }
-    public function quoteWithinLexemeErrException()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        throw new Zend_Search_Lucene_Search_QueryParserException('Quote within lexeme must be escaped by \'\\\' char. ' . $this->_positionMsg());
-    }
-    public function wrongNumberErrException()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        throw new Zend_Search_Lucene_Search_QueryParserException('Wrong number syntax.' . $this->_positionMsg());
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParser.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParser.php
deleted file mode 100644
index 58b8e7bdc..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParser.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryParser.php 21638 2010-03-24 17:56:46Z alexander $
- */
-
-
-/** Internally used classes */
-
-/** Zend_Search_Lucene_Analysis_Analyzer */
-require_once 'Zend/Search/Lucene/Analysis/Analyzer.php';
-
-/** Zend_Search_Lucene_Search_QueryToken */
-require_once 'Zend/Search/Lucene/Search/QueryToken.php';
-
-
-
-/** Zend_Search_Lucene_FSM */
-require_once 'Zend/Search/Lucene/FSM.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryParser extends Zend_Search_Lucene_FSM
-{
-    /**
-     * Parser instance
-     *
-     * @var Zend_Search_Lucene_Search_QueryParser
-     */
-    private static $_instance = null;
-
-
-    /**
-     * Query lexer
-     *
-     * @var Zend_Search_Lucene_Search_QueryLexer
-     */
-    private $_lexer;
-
-    /**
-     * Tokens list
-     * Array of Zend_Search_Lucene_Search_QueryToken objects
-     *
-     * @var array
-     */
-    private $_tokens;
-
-    /**
-     * Current token
-     *
-     * @var integer|string
-     */
-    private $_currentToken;
-
-    /**
-     * Last token
-     *
-     * It can be processed within FSM states, but this addirional state simplifies FSM
-     *
-     * @var Zend_Search_Lucene_Search_QueryToken
-     */
-    private $_lastToken = null;
-
-    /**
-     * Range query first term
-     *
-     * @var string
-     */
-    private $_rqFirstTerm = null;
-
-    /**
-     * Current query parser context
-     *
-     * @var Zend_Search_Lucene_Search_QueryParserContext
-     */
-    private $_context;
-
-    /**
-     * Context stack
-     *
-     * @var array
-     */
-    private $_contextStack;
-
-    /**
-     * Query string encoding
-     *
-     * @var string
-     */
-    private $_encoding;
-
-    /**
-     * Query string default encoding
-     *
-     * @var string
-     */
-    private $_defaultEncoding = '';
-
-    /**
-     * Defines query parsing mode.
-     *
-     * If this option is turned on, then query parser suppress query parser exceptions
-     * and constructs multi-term query using all words from a query.
-     *
-     * That helps to avoid exceptions caused by queries, which don't conform to query language,
-     * but limits possibilities to check, that query entered by user has some inconsistencies.
-     *
-     *
-     * Default is true.
-     *
-     * Use {@link Zend_Search_Lucene::suppressQueryParsingExceptions()},
-     * {@link Zend_Search_Lucene::dontSuppressQueryParsingExceptions()} and
-     * {@link Zend_Search_Lucene::checkQueryParsingExceptionsSuppressMode()} to operate
-     * with this setting.
-     *
-     * @var boolean
-     */
-    private $_suppressQueryParsingExceptions = true;
-
-    /**
-     * Boolean operators constants
-     */
-    const B_OR  = 0;
-    const B_AND = 1;
-
-    /**
-     * Default boolean queries operator
-     *
-     * @var integer
-     */
-    private $_defaultOperator = self::B_OR;
-
-
-    /** Query parser State Machine states */
-    const ST_COMMON_QUERY_ELEMENT       = 0;   // Terms, phrases, operators
-    const ST_CLOSEDINT_RQ_START         = 1;   // Range query start (closed interval) - '['
-    const ST_CLOSEDINT_RQ_FIRST_TERM    = 2;   // First term in '[term1 to term2]' construction
-    const ST_CLOSEDINT_RQ_TO_TERM       = 3;   // 'TO' lexeme in '[term1 to term2]' construction
-    const ST_CLOSEDINT_RQ_LAST_TERM     = 4;   // Second term in '[term1 to term2]' construction
-    const ST_CLOSEDINT_RQ_END           = 5;   // Range query end (closed interval) - ']'
-    const ST_OPENEDINT_RQ_START         = 6;   // Range query start (opened interval) - '{'
-    const ST_OPENEDINT_RQ_FIRST_TERM    = 7;   // First term in '{term1 to term2}' construction
-    const ST_OPENEDINT_RQ_TO_TERM       = 8;   // 'TO' lexeme in '{term1 to term2}' construction
-    const ST_OPENEDINT_RQ_LAST_TERM     = 9;   // Second term in '{term1 to term2}' construction
-    const ST_OPENEDINT_RQ_END           = 10;  // Range query end (opened interval) - '}'
-
-    /**
-     * Parser constructor
-     */
-    public function __construct()
-    {
-        parent::__construct(array(self::ST_COMMON_QUERY_ELEMENT,
-                                  self::ST_CLOSEDINT_RQ_START,
-                                  self::ST_CLOSEDINT_RQ_FIRST_TERM,
-                                  self::ST_CLOSEDINT_RQ_TO_TERM,
-                                  self::ST_CLOSEDINT_RQ_LAST_TERM,
-                                  self::ST_CLOSEDINT_RQ_END,
-                                  self::ST_OPENEDINT_RQ_START,
-                                  self::ST_OPENEDINT_RQ_FIRST_TERM,
-                                  self::ST_OPENEDINT_RQ_TO_TERM,
-                                  self::ST_OPENEDINT_RQ_LAST_TERM,
-                                  self::ST_OPENEDINT_RQ_END
-                                 ),
-                            Zend_Search_Lucene_Search_QueryToken::getTypes());
-
-        $this->addRules(
-             array(array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_WORD,             self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_PHRASE,           self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_FIELD,            self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_REQUIRED,         self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_PROHIBITED,       self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_FUZZY_PROX_MARK,  self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_BOOSTING_MARK,    self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_RANGE_INCL_START, self::ST_CLOSEDINT_RQ_START),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_RANGE_EXCL_START, self::ST_OPENEDINT_RQ_START),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_SUBQUERY_START,   self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_SUBQUERY_END,     self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_AND_LEXEME,       self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_OR_LEXEME,        self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_NOT_LEXEME,       self::ST_COMMON_QUERY_ELEMENT),
-                   array(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_NUMBER,           self::ST_COMMON_QUERY_ELEMENT)
-                  ));
-        $this->addRules(
-             array(array(self::ST_CLOSEDINT_RQ_START,      Zend_Search_Lucene_Search_QueryToken::TT_WORD,           self::ST_CLOSEDINT_RQ_FIRST_TERM),
-                   array(self::ST_CLOSEDINT_RQ_FIRST_TERM, Zend_Search_Lucene_Search_QueryToken::TT_TO_LEXEME,      self::ST_CLOSEDINT_RQ_TO_TERM),
-                   array(self::ST_CLOSEDINT_RQ_TO_TERM,    Zend_Search_Lucene_Search_QueryToken::TT_WORD,           self::ST_CLOSEDINT_RQ_LAST_TERM),
-                   array(self::ST_CLOSEDINT_RQ_LAST_TERM,  Zend_Search_Lucene_Search_QueryToken::TT_RANGE_INCL_END, self::ST_COMMON_QUERY_ELEMENT)
-                  ));
-        $this->addRules(
-             array(array(self::ST_OPENEDINT_RQ_START,      Zend_Search_Lucene_Search_QueryToken::TT_WORD,           self::ST_OPENEDINT_RQ_FIRST_TERM),
-                   array(self::ST_OPENEDINT_RQ_FIRST_TERM, Zend_Search_Lucene_Search_QueryToken::TT_TO_LEXEME,      self::ST_OPENEDINT_RQ_TO_TERM),
-                   array(self::ST_OPENEDINT_RQ_TO_TERM,    Zend_Search_Lucene_Search_QueryToken::TT_WORD,           self::ST_OPENEDINT_RQ_LAST_TERM),
-                   array(self::ST_OPENEDINT_RQ_LAST_TERM,  Zend_Search_Lucene_Search_QueryToken::TT_RANGE_EXCL_END, self::ST_COMMON_QUERY_ELEMENT)
-                  ));
-
-
-
-        $addTermEntryAction             = new Zend_Search_Lucene_FSMAction($this, 'addTermEntry');
-        $addPhraseEntryAction           = new Zend_Search_Lucene_FSMAction($this, 'addPhraseEntry');
-        $setFieldAction                 = new Zend_Search_Lucene_FSMAction($this, 'setField');
-        $setSignAction                  = new Zend_Search_Lucene_FSMAction($this, 'setSign');
-        $setFuzzyProxAction             = new Zend_Search_Lucene_FSMAction($this, 'processFuzzyProximityModifier');
-        $processModifierParameterAction = new Zend_Search_Lucene_FSMAction($this, 'processModifierParameter');
-        $subqueryStartAction            = new Zend_Search_Lucene_FSMAction($this, 'subqueryStart');
-        $subqueryEndAction              = new Zend_Search_Lucene_FSMAction($this, 'subqueryEnd');
-        $logicalOperatorAction          = new Zend_Search_Lucene_FSMAction($this, 'logicalOperator');
-        $openedRQFirstTermAction        = new Zend_Search_Lucene_FSMAction($this, 'openedRQFirstTerm');
-        $openedRQLastTermAction         = new Zend_Search_Lucene_FSMAction($this, 'openedRQLastTerm');
-        $closedRQFirstTermAction        = new Zend_Search_Lucene_FSMAction($this, 'closedRQFirstTerm');
-        $closedRQLastTermAction         = new Zend_Search_Lucene_FSMAction($this, 'closedRQLastTerm');
-
-
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_WORD,            $addTermEntryAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_PHRASE,          $addPhraseEntryAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_FIELD,           $setFieldAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_REQUIRED,        $setSignAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_PROHIBITED,      $setSignAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_FUZZY_PROX_MARK, $setFuzzyProxAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_NUMBER,          $processModifierParameterAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_SUBQUERY_START,  $subqueryStartAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_SUBQUERY_END,    $subqueryEndAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_AND_LEXEME,      $logicalOperatorAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_OR_LEXEME,       $logicalOperatorAction);
-        $this->addInputAction(self::ST_COMMON_QUERY_ELEMENT, Zend_Search_Lucene_Search_QueryToken::TT_NOT_LEXEME,      $logicalOperatorAction);
-
-        $this->addEntryAction(self::ST_OPENEDINT_RQ_FIRST_TERM, $openedRQFirstTermAction);
-        $this->addEntryAction(self::ST_OPENEDINT_RQ_LAST_TERM,  $openedRQLastTermAction);
-        $this->addEntryAction(self::ST_CLOSEDINT_RQ_FIRST_TERM, $closedRQFirstTermAction);
-        $this->addEntryAction(self::ST_CLOSEDINT_RQ_LAST_TERM,  $closedRQLastTermAction);
-
-
-        require_once 'Zend/Search/Lucene/Search/QueryLexer.php';
-        $this->_lexer = new Zend_Search_Lucene_Search_QueryLexer();
-    }
-
-    /**
-     * Get query parser instance
-     *
-     * @return Zend_Search_Lucene_Search_QueryParser
-     */
-    private static function _getInstance()
-    {
-        if (self::$_instance === null) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Set query string default encoding
-     *
-     * @param string $encoding
-     */
-    public static function setDefaultEncoding($encoding)
-    {
-        self::_getInstance()->_defaultEncoding = $encoding;
-    }
-
-    /**
-     * Get query string default encoding
-     *
-     * @return string
-     */
-    public static function getDefaultEncoding()
-    {
-       return self::_getInstance()->_defaultEncoding;
-    }
-
-    /**
-     * Set default boolean operator
-     *
-     * @param integer $operator
-     */
-    public static function setDefaultOperator($operator)
-    {
-        self::_getInstance()->_defaultOperator = $operator;
-    }
-
-    /**
-     * Get default boolean operator
-     *
-     * @return integer
-     */
-    public static function getDefaultOperator()
-    {
-        return self::_getInstance()->_defaultOperator;
-    }
-
-    /**
-     * Turn on 'suppress query parser exceptions' mode.
-     */
-    public static function suppressQueryParsingExceptions()
-    {
-        self::_getInstance()->_suppressQueryParsingExceptions = true;
-    }
-    /**
-     * Turn off 'suppress query parser exceptions' mode.
-     */
-    public static function dontSuppressQueryParsingExceptions()
-    {
-        self::_getInstance()->_suppressQueryParsingExceptions = false;
-    }
-    /**
-     * Check 'suppress query parser exceptions' mode.
-     * @return boolean
-     */
-    public static function queryParsingExceptionsSuppressed()
-    {
-        return self::_getInstance()->_suppressQueryParsingExceptions;
-    }
-
-
-    /**
-     * Escape keyword to force it to be parsed as one term
-     *
-     * @param string $keyword
-     * @return string
-     */
-    public static function escape($keyword)
-    {
-        return '\\' . implode('\\', str_split($keyword));
-    }
-
-    /**
-     * Parses a query string
-     *
-     * @param string $strQuery
-     * @param string $encoding
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public static function parse($strQuery, $encoding = null)
-    {
-        self::_getInstance();
-
-        // Reset FSM if previous parse operation didn't return it into a correct state
-        self::$_instance->reset();
-
-        require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-        try {
-            require_once 'Zend/Search/Lucene/Search/QueryParserContext.php';
-
-            self::$_instance->_encoding     = ($encoding !== null) ? $encoding : self::$_instance->_defaultEncoding;
-            self::$_instance->_lastToken    = null;
-            self::$_instance->_context      = new Zend_Search_Lucene_Search_QueryParserContext(self::$_instance->_encoding);
-            self::$_instance->_contextStack = array();
-            self::$_instance->_tokens       = self::$_instance->_lexer->tokenize($strQuery, self::$_instance->_encoding);
-
-            // Empty query
-            if (count(self::$_instance->_tokens) == 0) {
-                require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-                return new Zend_Search_Lucene_Search_Query_Insignificant();
-            }
-
-
-            foreach (self::$_instance->_tokens as $token) {
-                try {
-                    self::$_instance->_currentToken = $token;
-                    self::$_instance->process($token->type);
-
-                    self::$_instance->_lastToken = $token;
-                } catch (Exception $e) {
-                    if (strpos($e->getMessage(), 'There is no any rule for') !== false) {
-                        throw new Zend_Search_Lucene_Search_QueryParserException( 'Syntax error at char position ' . $token->position . '.', 0, $e);
-                    }
-
-                    require_once 'Zend/Search/Lucene/Exception.php';
-                    throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-                }
-            }
-
-            if (count(self::$_instance->_contextStack) != 0) {
-                throw new Zend_Search_Lucene_Search_QueryParserException('Syntax Error: mismatched parentheses, every opening must have closing.' );
-            }
-
-            return self::$_instance->_context->getQuery();
-        } catch (Zend_Search_Lucene_Search_QueryParserException $e) {
-            if (self::$_instance->_suppressQueryParsingExceptions) {
-                $queryTokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($strQuery, self::$_instance->_encoding);
-
-                require_once 'Zend/Search/Lucene/Search/Query/MultiTerm.php';
-                $query = new Zend_Search_Lucene_Search_Query_MultiTerm();
-                $termsSign = (self::$_instance->_defaultOperator == self::B_AND) ? true /* required term */ :
-                                                                                   null /* optional term */;
-
-                require_once 'Zend/Search/Lucene/Index/Term.php';
-                foreach ($queryTokens as $token) {
-                    $query->addTerm(new Zend_Search_Lucene_Index_Term($token->getTermText()), $termsSign);
-                }
-
-
-                return $query;
-            } else {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception($e->getMessage(), $e->getCode(), $e);
-            }
-        }
-    }
-
-    /*********************************************************************
-     * Actions implementation
-     *
-     * Actions affect on recognized lexemes list
-     *********************************************************************/
-
-    /**
-     * Add term to a query
-     */
-    public function addTermEntry()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryEntry/Term.php';
-        $entry = new Zend_Search_Lucene_Search_QueryEntry_Term($this->_currentToken->text, $this->_context->getField());
-        $this->_context->addEntry($entry);
-    }
-
-    /**
-     * Add phrase to a query
-     */
-    public function addPhraseEntry()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryEntry/Phrase.php';
-        $entry = new Zend_Search_Lucene_Search_QueryEntry_Phrase($this->_currentToken->text, $this->_context->getField());
-        $this->_context->addEntry($entry);
-    }
-
-    /**
-     * Set entry field
-     */
-    public function setField()
-    {
-        $this->_context->setNextEntryField($this->_currentToken->text);
-    }
-
-    /**
-     * Set entry sign
-     */
-    public function setSign()
-    {
-        $this->_context->setNextEntrySign($this->_currentToken->type);
-    }
-
-
-    /**
-     * Process fuzzy search/proximity modifier - '~'
-     */
-    public function processFuzzyProximityModifier()
-    {
-        $this->_context->processFuzzyProximityModifier();
-    }
-
-    /**
-     * Process modifier parameter
-     *
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function processModifierParameter()
-    {
-        if ($this->_lastToken === null) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Lexeme modifier parameter must follow lexeme modifier. Char position 0.' );
-        }
-
-        switch ($this->_lastToken->type) {
-            case Zend_Search_Lucene_Search_QueryToken::TT_FUZZY_PROX_MARK:
-                $this->_context->processFuzzyProximityModifier($this->_currentToken->text);
-                break;
-
-            case Zend_Search_Lucene_Search_QueryToken::TT_BOOSTING_MARK:
-                $this->_context->boost($this->_currentToken->text);
-                break;
-
-            default:
-                // It's not a user input exception
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Lexeme modifier parameter must follow lexeme modifier. Char position 0.' );
-        }
-    }
-
-
-    /**
-     * Start subquery
-     */
-    public function subqueryStart()
-    {
-        require_once 'Zend/Search/Lucene/Search/QueryParserContext.php';
-
-        $this->_contextStack[] = $this->_context;
-        $this->_context        = new Zend_Search_Lucene_Search_QueryParserContext($this->_encoding, $this->_context->getField());
-    }
-
-    /**
-     * End subquery
-     */
-    public function subqueryEnd()
-    {
-        if (count($this->_contextStack) == 0) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Syntax Error: mismatched parentheses, every opening must have closing. Char position ' . $this->_currentToken->position . '.' );
-        }
-
-        $query          = $this->_context->getQuery();
-        $this->_context = array_pop($this->_contextStack);
-
-        require_once 'Zend/Search/Lucene/Search/QueryEntry/Subquery.php';
-        $this->_context->addEntry(new Zend_Search_Lucene_Search_QueryEntry_Subquery($query));
-    }
-
-    /**
-     * Process logical operator
-     */
-    public function logicalOperator()
-    {
-        $this->_context->addLogicalOperator($this->_currentToken->type);
-    }
-
-    /**
-     * Process first range query term (opened interval)
-     */
-    public function openedRQFirstTerm()
-    {
-        $this->_rqFirstTerm = $this->_currentToken->text;
-    }
-
-    /**
-     * Process last range query term (opened interval)
-     *
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function openedRQLastTerm()
-    {
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_rqFirstTerm, $this->_encoding);
-        if (count($tokens) > 1) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Range query boundary terms must be non-multiple word terms');
-        } else if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $from = new Zend_Search_Lucene_Index_Term(reset($tokens)->getTermText(), $this->_context->getField());
-        } else {
-            $from = null;
-        }
-
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_currentToken->text, $this->_encoding);
-        if (count($tokens) > 1) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Range query boundary terms must be non-multiple word terms');
-        } else if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $to = new Zend_Search_Lucene_Index_Term(reset($tokens)->getTermText(), $this->_context->getField());
-        } else {
-            $to = null;
-        }
-
-        if ($from === null  &&  $to === null) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('At least one range query boundary term must be non-empty term');
-        }
-
-        require_once 'Zend/Search/Lucene/Search/Query/Range.php';
-        $rangeQuery = new Zend_Search_Lucene_Search_Query_Range($from, $to, false);
-        require_once 'Zend/Search/Lucene/Search/QueryEntry/Subquery.php';
-        $entry      = new Zend_Search_Lucene_Search_QueryEntry_Subquery($rangeQuery);
-        $this->_context->addEntry($entry);
-    }
-
-    /**
-     * Process first range query term (closed interval)
-     */
-    public function closedRQFirstTerm()
-    {
-        $this->_rqFirstTerm = $this->_currentToken->text;
-    }
-
-    /**
-     * Process last range query term (closed interval)
-     *
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function closedRQLastTerm()
-    {
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_rqFirstTerm, $this->_encoding);
-        if (count($tokens) > 1) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Range query boundary terms must be non-multiple word terms');
-        } else if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $from = new Zend_Search_Lucene_Index_Term(reset($tokens)->getTermText(), $this->_context->getField());
-        } else {
-            $from = null;
-        }
-
-        $tokens = Zend_Search_Lucene_Analysis_Analyzer::getDefault()->tokenize($this->_currentToken->text, $this->_encoding);
-        if (count($tokens) > 1) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Range query boundary terms must be non-multiple word terms');
-        } else if (count($tokens) == 1) {
-            require_once 'Zend/Search/Lucene/Index/Term.php';
-            $to = new Zend_Search_Lucene_Index_Term(reset($tokens)->getTermText(), $this->_context->getField());
-        } else {
-            $to = null;
-        }
-
-        if ($from === null  &&  $to === null) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('At least one range query boundary term must be non-empty term');
-        }
-
-        require_once 'Zend/Search/Lucene/Search/Query/Range.php';
-        $rangeQuery = new Zend_Search_Lucene_Search_Query_Range($from, $to, true);
-        require_once 'Zend/Search/Lucene/Search/QueryEntry/Subquery.php';
-        $entry      = new Zend_Search_Lucene_Search_QueryEntry_Subquery($rangeQuery);
-        $this->_context->addEntry($entry);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserContext.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserContext.php
deleted file mode 100644
index 95b33f321..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserContext.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryParserContext.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Search_QueryToken */
-require_once 'Zend/Search/Lucene/Search/QueryToken.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryParserContext
-{
-    /**
-     * Default field for the context.
-     *
-     * null means, that term should be searched through all fields
-     * Zend_Search_Lucene_Search_Query::rewriteQuery($index) transletes such queries to several
-     *
-     * @var string|null
-     */
-    private $_defaultField;
-
-    /**
-     * Field specified for next entry
-     *
-     * @var string
-     */
-    private $_nextEntryField = null;
-
-    /**
-     * True means, that term is required.
-     * False means, that term is prohibited.
-     * null means, that term is neither prohibited, nor required
-     *
-     * @var boolean
-     */
-    private $_nextEntrySign = null;
-
-
-    /**
-     * Entries grouping mode
-     */
-    const GM_SIGNS   = 0;  // Signs mode: '+term1 term2 -term3 +(subquery1) -(subquery2)'
-    const GM_BOOLEAN = 1;  // Boolean operators mode: 'term1 and term2  or  (subquery1) and not (subquery2)'
-
-    /**
-     * Grouping mode
-     *
-     * @var integer
-     */
-    private $_mode = null;
-
-    /**
-     * Entries signs.
-     * Used in GM_SIGNS grouping mode
-     *
-     * @var arrays
-     */
-    private $_signs = array();
-
-    /**
-     * Query entries
-     * Each entry is a Zend_Search_Lucene_Search_QueryEntry object or
-     * boolean operator (Zend_Search_Lucene_Search_QueryToken class constant)
-     *
-     * @var array
-     */
-    private $_entries = array();
-
-    /**
-     * Query string encoding
-     *
-     * @var string
-     */
-    private $_encoding;
-
-
-    /**
-     * Context object constructor
-     *
-     * @param string $encoding
-     * @param string|null $defaultField
-     */
-    public function __construct($encoding, $defaultField = null)
-    {
-        $this->_encoding     = $encoding;
-        $this->_defaultField = $defaultField;
-    }
-
-
-    /**
-     * Get context default field
-     *
-     * @return string|null
-     */
-    public function getField()
-    {
-        return ($this->_nextEntryField !== null)  ?  $this->_nextEntryField : $this->_defaultField;
-    }
-
-    /**
-     * Set field for next entry
-     *
-     * @param string $field
-     */
-    public function setNextEntryField($field)
-    {
-        $this->_nextEntryField = $field;
-    }
-
-
-    /**
-     * Set sign for next entry
-     *
-     * @param integer $sign
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function setNextEntrySign($sign)
-    {
-        if ($this->_mode === self::GM_BOOLEAN) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('It\'s not allowed to mix boolean and signs styles in the same subquery.');
-        }
-
-        $this->_mode = self::GM_SIGNS;
-
-        if ($sign == Zend_Search_Lucene_Search_QueryToken::TT_REQUIRED) {
-            $this->_nextEntrySign = true;
-        } else if ($sign == Zend_Search_Lucene_Search_QueryToken::TT_PROHIBITED) {
-            $this->_nextEntrySign = false;
-        } else {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Unrecognized sign type.');
-        }
-    }
-
-
-    /**
-     * Add entry to a query
-     *
-     * @param Zend_Search_Lucene_Search_QueryEntry $entry
-     */
-    public function addEntry(Zend_Search_Lucene_Search_QueryEntry $entry)
-    {
-        if ($this->_mode !== self::GM_BOOLEAN) {
-            $this->_signs[] = $this->_nextEntrySign;
-        }
-
-        $this->_entries[] = $entry;
-
-        $this->_nextEntryField = null;
-        $this->_nextEntrySign  = null;
-    }
-
-
-    /**
-     * Process fuzzy search or proximity search modifier
-     *
-     * @throws Zend_Search_Lucene_Search_QueryParserException
-     */
-    public function processFuzzyProximityModifier($parameter = null)
-    {
-        // Check, that modifier has came just after word or phrase
-        if ($this->_nextEntryField !== null  ||  $this->_nextEntrySign !== null) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('\'~\' modifier must follow word or phrase.');
-        }
-
-        $lastEntry = array_pop($this->_entries);
-
-        if (!$lastEntry instanceof Zend_Search_Lucene_Search_QueryEntry) {
-            // there are no entries or last entry is boolean operator
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('\'~\' modifier must follow word or phrase.');
-        }
-
-        $lastEntry->processFuzzyProximityModifier($parameter);
-
-        $this->_entries[] = $lastEntry;
-    }
-
-    /**
-     * Set boost factor to the entry
-     *
-     * @param float $boostFactor
-     */
-    public function boost($boostFactor)
-    {
-        // Check, that modifier has came just after word or phrase
-        if ($this->_nextEntryField !== null  ||  $this->_nextEntrySign !== null) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('\'^\' modifier must follow word, phrase or subquery.');
-        }
-
-        $lastEntry = array_pop($this->_entries);
-
-        if (!$lastEntry instanceof Zend_Search_Lucene_Search_QueryEntry) {
-            // there are no entries or last entry is boolean operator
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('\'^\' modifier must follow word, phrase or subquery.');
-        }
-
-        $lastEntry->boost($boostFactor);
-
-        $this->_entries[] = $lastEntry;
-    }
-
-    /**
-     * Process logical operator
-     *
-     * @param integer $operator
-     */
-    public function addLogicalOperator($operator)
-    {
-        if ($this->_mode === self::GM_SIGNS) {
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('It\'s not allowed to mix boolean and signs styles in the same subquery.');
-        }
-
-        $this->_mode = self::GM_BOOLEAN;
-
-        $this->_entries[] = $operator;
-    }
-
-
-    /**
-     * Generate 'signs style' query from the context
-     * '+term1 term2 -term3 +(<subquery1>) ...'
-     *
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function _signStyleExpressionQuery()
-    {
-        require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-        $query = new Zend_Search_Lucene_Search_Query_Boolean();
-
-        require_once 'Zend/Search/Lucene/Search/QueryParser.php';
-        if (Zend_Search_Lucene_Search_QueryParser::getDefaultOperator() == Zend_Search_Lucene_Search_QueryParser::B_AND) {
-            $defaultSign = true; // required
-        } else {
-            // Zend_Search_Lucene_Search_QueryParser::B_OR
-            $defaultSign = null; // optional
-        }
-
-        foreach ($this->_entries as $entryId => $entry) {
-            $sign = ($this->_signs[$entryId] !== null) ?  $this->_signs[$entryId] : $defaultSign;
-            $query->addSubquery($entry->getQuery($this->_encoding), $sign);
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Generate 'boolean style' query from the context
-     * 'term1 and term2   or   term3 and (<subquery1>) and not (<subquery2>)'
-     *
-     * @return Zend_Search_Lucene_Search_Query
-     * @throws Zend_Search_Lucene
-     */
-    private function _booleanExpressionQuery()
-    {
-        /**
-         * We treat each level of an expression as a boolean expression in
-         * a Disjunctive Normal Form
-         *
-         * AND operator has higher precedence than OR
-         *
-         * Thus logical query is a disjunction of one or more conjunctions of
-         * one or more query entries
-         */
-
-        require_once 'Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php';
-        $expressionRecognizer = new Zend_Search_Lucene_Search_BooleanExpressionRecognizer();
-
-        require_once 'Zend/Search/Lucene/Exception.php';
-        try {
-            foreach ($this->_entries as $entry) {
-                if ($entry instanceof Zend_Search_Lucene_Search_QueryEntry) {
-                    $expressionRecognizer->processLiteral($entry);
-                } else {
-                    switch ($entry) {
-                        case Zend_Search_Lucene_Search_QueryToken::TT_AND_LEXEME:
-                            $expressionRecognizer->processOperator(Zend_Search_Lucene_Search_BooleanExpressionRecognizer::IN_AND_OPERATOR);
-                            break;
-
-                        case Zend_Search_Lucene_Search_QueryToken::TT_OR_LEXEME:
-                            $expressionRecognizer->processOperator(Zend_Search_Lucene_Search_BooleanExpressionRecognizer::IN_OR_OPERATOR);
-                            break;
-
-                        case Zend_Search_Lucene_Search_QueryToken::TT_NOT_LEXEME:
-                            $expressionRecognizer->processOperator(Zend_Search_Lucene_Search_BooleanExpressionRecognizer::IN_NOT_OPERATOR);
-                            break;
-
-                        default:
-                            throw new Zend_Search_Lucene('Boolean expression error. Unknown operator type.');
-                    }
-                }
-            }
-
-            $conjuctions = $expressionRecognizer->finishExpression();
-        } catch (Zend_Search_Exception $e) {
-            // throw new Zend_Search_Lucene_Search_QueryParserException('Boolean expression error. Error message: \'' .
-            //                                                          $e->getMessage() . '\'.' );
-            // It's query syntax error message and it should be user friendly. So FSM message is omitted
-            require_once 'Zend/Search/Lucene/Search/QueryParserException.php';
-            throw new Zend_Search_Lucene_Search_QueryParserException('Boolean expression error.', 0, $e);
-        }
-
-        // Remove 'only negative' conjunctions
-        foreach ($conjuctions as $conjuctionId => $conjuction) {
-            $nonNegativeEntryFound = false;
-
-            foreach ($conjuction as $conjuctionEntry) {
-                if ($conjuctionEntry[1]) {
-                    $nonNegativeEntryFound = true;
-                    break;
-                }
-            }
-
-            if (!$nonNegativeEntryFound) {
-                unset($conjuctions[$conjuctionId]);
-            }
-        }
-
-
-        $subqueries = array();
-        foreach ($conjuctions as  $conjuction) {
-            // Check, if it's a one term conjuction
-            if (count($conjuction) == 1) {
-                $subqueries[] = $conjuction[0][0]->getQuery($this->_encoding);
-            } else {
-                require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-                $subquery = new Zend_Search_Lucene_Search_Query_Boolean();
-
-                foreach ($conjuction as $conjuctionEntry) {
-                    $subquery->addSubquery($conjuctionEntry[0]->getQuery($this->_encoding), $conjuctionEntry[1]);
-                }
-
-                $subqueries[] = $subquery;
-            }
-        }
-
-        if (count($subqueries) == 0) {
-            require_once 'Zend/Search/Lucene/Search/Query/Insignificant.php';
-            return new Zend_Search_Lucene_Search_Query_Insignificant();
-        }
-
-        if (count($subqueries) == 1) {
-            return $subqueries[0];
-        }
-
-
-        require_once 'Zend/Search/Lucene/Search/Query/Boolean.php';
-        $query = new Zend_Search_Lucene_Search_Query_Boolean();
-
-        foreach ($subqueries as $subquery) {
-            // Non-requirered entry/subquery
-            $query->addSubquery($subquery);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Generate query from current context
-     *
-     * @return Zend_Search_Lucene_Search_Query
-     */
-    public function getQuery()
-    {
-        if ($this->_mode === self::GM_BOOLEAN) {
-            return $this->_booleanExpressionQuery();
-        } else {
-            return $this->_signStyleExpressionQuery();
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserException.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserException.php
deleted file mode 100644
index 06166c0fe..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryParserException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryParserException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Search_Lucene base exception
- */
-require_once 'Zend/Search/Lucene/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- *
- * Special exception type, which may be used to intercept wrong user input
- */
-class Zend_Search_Lucene_Search_QueryParserException extends Zend_Search_Lucene_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryToken.php b/airtime_mvc/library/Zend/Search/Lucene/Search/QueryToken.php
deleted file mode 100644
index c0bf6dafa..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/QueryToken.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryToken.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_QueryToken
-{
-    /**
-     * Token types.
-     */
-    const TT_WORD                 = 0;  // Word
-    const TT_PHRASE               = 1;  // Phrase (one or several quoted words)
-    const TT_FIELD                = 2;  // Field name in 'field:word', field:<phrase> or field:(<subquery>) pairs
-    const TT_FIELD_INDICATOR      = 3;  // ':'
-    const TT_REQUIRED             = 4;  // '+'
-    const TT_PROHIBITED           = 5;  // '-'
-    const TT_FUZZY_PROX_MARK      = 6;  // '~'
-    const TT_BOOSTING_MARK        = 7;  // '^'
-    const TT_RANGE_INCL_START     = 8;  // '['
-    const TT_RANGE_INCL_END       = 9;  // ']'
-    const TT_RANGE_EXCL_START     = 10; // '{'
-    const TT_RANGE_EXCL_END       = 11; // '}'
-    const TT_SUBQUERY_START       = 12; // '('
-    const TT_SUBQUERY_END         = 13; // ')'
-    const TT_AND_LEXEME           = 14; // 'AND' or 'and'
-    const TT_OR_LEXEME            = 15; // 'OR'  or 'or'
-    const TT_NOT_LEXEME           = 16; // 'NOT' or 'not'
-    const TT_TO_LEXEME            = 17; // 'TO'  or 'to'
-    const TT_NUMBER               = 18; // Number, like: 10, 0.8, .64, ....
-
-
-    /**
-     * Returns all possible lexeme types.
-     * It's used for syntax analyzer state machine initialization
-     *
-     * @return array
-     */
-    public static function getTypes()
-    {
-        return array(   self::TT_WORD,
-                        self::TT_PHRASE,
-                        self::TT_FIELD,
-                        self::TT_FIELD_INDICATOR,
-                        self::TT_REQUIRED,
-                        self::TT_PROHIBITED,
-                        self::TT_FUZZY_PROX_MARK,
-                        self::TT_BOOSTING_MARK,
-                        self::TT_RANGE_INCL_START,
-                        self::TT_RANGE_INCL_END,
-                        self::TT_RANGE_EXCL_START,
-                        self::TT_RANGE_EXCL_END,
-                        self::TT_SUBQUERY_START,
-                        self::TT_SUBQUERY_END,
-                        self::TT_AND_LEXEME,
-                        self::TT_OR_LEXEME,
-                        self::TT_NOT_LEXEME,
-                        self::TT_TO_LEXEME,
-                        self::TT_NUMBER
-                     );
-    }
-
-
-    /**
-     * TokenCategories
-     */
-    const TC_WORD           = 0;   // Word
-    const TC_PHRASE         = 1;   // Phrase (one or several quoted words)
-    const TC_NUMBER         = 2;   // Nubers, which are used with syntax elements. Ex. roam~0.8
-    const TC_SYNTAX_ELEMENT = 3;   // +  -  ( )  [ ]  { }  !  ||  && ~ ^
-
-
-    /**
-     * Token type.
-     *
-     * @var integer
-     */
-    public $type;
-
-    /**
-     * Token text.
-     *
-     * @var integer
-     */
-    public $text;
-
-    /**
-     * Token position within query.
-     *
-     * @var integer
-     */
-    public $position;
-
-
-    /**
-     * IndexReader constructor needs token type and token text as a parameters.
-     *
-     * @param integer $tokenCategory
-     * @param string  $tokText
-     * @param integer $position
-     */
-    public function __construct($tokenCategory, $tokenText, $position)
-    {
-        $this->text     = $tokenText;
-        $this->position = $position + 1; // Start from 1
-
-        switch ($tokenCategory) {
-            case self::TC_WORD:
-                if (  strtolower($tokenText) == 'and') {
-                    $this->type = self::TT_AND_LEXEME;
-                } else if (strtolower($tokenText) == 'or') {
-                    $this->type = self::TT_OR_LEXEME;
-                } else if (strtolower($tokenText) == 'not') {
-                    $this->type = self::TT_NOT_LEXEME;
-                } else if (strtolower($tokenText) == 'to') {
-                    $this->type = self::TT_TO_LEXEME;
-                } else {
-                    $this->type = self::TT_WORD;
-                }
-                break;
-
-            case self::TC_PHRASE:
-                $this->type = self::TT_PHRASE;
-                break;
-
-            case self::TC_NUMBER:
-                $this->type = self::TT_NUMBER;
-                break;
-
-            case self::TC_SYNTAX_ELEMENT:
-                switch ($tokenText) {
-                    case ':':
-                        $this->type = self::TT_FIELD_INDICATOR;
-                        break;
-
-                    case '+':
-                        $this->type = self::TT_REQUIRED;
-                        break;
-
-                    case '-':
-                        $this->type = self::TT_PROHIBITED;
-                        break;
-
-                    case '~':
-                        $this->type = self::TT_FUZZY_PROX_MARK;
-                        break;
-
-                    case '^':
-                        $this->type = self::TT_BOOSTING_MARK;
-                        break;
-
-                    case '[':
-                        $this->type = self::TT_RANGE_INCL_START;
-                        break;
-
-                    case ']':
-                        $this->type = self::TT_RANGE_INCL_END;
-                        break;
-
-                    case '{':
-                        $this->type = self::TT_RANGE_EXCL_START;
-                        break;
-
-                    case '}':
-                        $this->type = self::TT_RANGE_EXCL_END;
-                        break;
-
-                    case '(':
-                        $this->type = self::TT_SUBQUERY_START;
-                        break;
-
-                    case ')':
-                        $this->type = self::TT_SUBQUERY_END;
-                        break;
-
-                    case '!':
-                        $this->type = self::TT_NOT_LEXEME;
-                        break;
-
-                    case '&&':
-                        $this->type = self::TT_AND_LEXEME;
-                        break;
-
-                    case '||':
-                        $this->type = self::TT_OR_LEXEME;
-                        break;
-
-                    default:
-                        require_once 'Zend/Search/Lucene/Exception.php';
-                        throw new Zend_Search_Lucene_Exception('Unrecognized query syntax lexeme: \'' . $tokenText . '\'');
-                }
-                break;
-
-            case self::TC_NUMBER:
-                $this->type = self::TT_NUMBER;
-
-            default:
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Unrecognized lexeme type: \'' . $tokenCategory . '\'');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity.php
deleted file mode 100644
index 4036a3856..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity.php
+++ /dev/null
@@ -1,551 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Similarity.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Search_Similarity
-{
-    /**
-     * The Similarity implementation used by default.
-     *
-     * @var Zend_Search_Lucene_Search_Similarity
-     */
-    private static $_defaultImpl;
-
-    /**
-     * Cache of decoded bytes.
-     * Array of floats
-     *
-     * @var array
-     */
-    private static $_normTable = array( 0   => 0.0,
-                                        1   => 5.820766E-10,
-                                        2   => 6.9849193E-10,
-                                        3   => 8.1490725E-10,
-                                        4   => 9.313226E-10,
-                                        5   => 1.1641532E-9,
-                                        6   => 1.3969839E-9,
-                                        7   => 1.6298145E-9,
-                                        8   => 1.8626451E-9,
-                                        9   => 2.3283064E-9,
-                                        10  => 2.7939677E-9,
-                                        11  => 3.259629E-9,
-                                        12  => 3.7252903E-9,
-                                        13  => 4.656613E-9,
-                                        14  => 5.5879354E-9,
-                                        15  => 6.519258E-9,
-                                        16  => 7.4505806E-9,
-                                        17  => 9.313226E-9,
-                                        18  => 1.1175871E-8,
-                                        19  => 1.3038516E-8,
-                                        20  => 1.4901161E-8,
-                                        21  => 1.8626451E-8,
-                                        22  => 2.2351742E-8,
-                                        23  => 2.6077032E-8,
-                                        24  => 2.9802322E-8,
-                                        25  => 3.7252903E-8,
-                                        26  => 4.4703484E-8,
-                                        27  => 5.2154064E-8,
-                                        28  => 5.9604645E-8,
-                                        29  => 7.4505806E-8,
-                                        30  => 8.940697E-8,
-                                        31  => 1.0430813E-7,
-                                        32  => 1.1920929E-7,
-                                        33  => 1.4901161E-7,
-                                        34  => 1.7881393E-7,
-                                        35  => 2.0861626E-7,
-                                        36  => 2.3841858E-7,
-                                        37  => 2.9802322E-7,
-                                        38  => 3.5762787E-7,
-                                        39  => 4.172325E-7,
-                                        40  => 4.7683716E-7,
-                                        41  => 5.9604645E-7,
-                                        42  => 7.1525574E-7,
-                                        43  => 8.34465E-7,
-                                        44  => 9.536743E-7,
-                                        45  => 1.1920929E-6,
-                                        46  => 1.4305115E-6,
-                                        47  => 1.66893E-6,
-                                        48  => 1.9073486E-6,
-                                        49  => 2.3841858E-6,
-                                        50  => 2.861023E-6,
-                                        51  => 3.33786E-6,
-                                        52  => 3.8146973E-6,
-                                        53  => 4.7683716E-6,
-                                        54  => 5.722046E-6,
-                                        55  => 6.67572E-6,
-                                        56  => 7.6293945E-6,
-                                        57  => 9.536743E-6,
-                                        58  => 1.1444092E-5,
-                                        59  => 1.335144E-5,
-                                        60  => 1.5258789E-5,
-                                        61  => 1.9073486E-5,
-                                        62  => 2.2888184E-5,
-                                        63  => 2.670288E-5,
-                                        64  => 3.0517578E-5,
-                                        65  => 3.8146973E-5,
-                                        66  => 4.5776367E-5,
-                                        67  => 5.340576E-5,
-                                        68  => 6.1035156E-5,
-                                        69  => 7.6293945E-5,
-                                        70  => 9.1552734E-5,
-                                        71  => 1.0681152E-4,
-                                        72  => 1.2207031E-4,
-                                        73  => 1.5258789E-4,
-                                        74  => 1.8310547E-4,
-                                        75  => 2.1362305E-4,
-                                        76  => 2.4414062E-4,
-                                        77  => 3.0517578E-4,
-                                        78  => 3.6621094E-4,
-                                        79  => 4.272461E-4,
-                                        80  => 4.8828125E-4,
-                                        81  => 6.1035156E-4,
-                                        82  => 7.324219E-4,
-                                        83  => 8.544922E-4,
-                                        84  => 9.765625E-4,
-                                        85  => 0.0012207031,
-                                        86  => 0.0014648438,
-                                        87  => 0.0017089844,
-                                        88  => 0.001953125,
-                                        89  => 0.0024414062,
-                                        90  => 0.0029296875,
-                                        91  => 0.0034179688,
-                                        92  => 0.00390625,
-                                        93  => 0.0048828125,
-                                        94  => 0.005859375,
-                                        95  => 0.0068359375,
-                                        96  => 0.0078125,
-                                        97  => 0.009765625,
-                                        98  => 0.01171875,
-                                        99  => 0.013671875,
-                                        100 => 0.015625,
-                                        101 => 0.01953125,
-                                        102 => 0.0234375,
-                                        103 => 0.02734375,
-                                        104 => 0.03125,
-                                        105 => 0.0390625,
-                                        106 => 0.046875,
-                                        107 => 0.0546875,
-                                        108 => 0.0625,
-                                        109 => 0.078125,
-                                        110 => 0.09375,
-                                        111 => 0.109375,
-                                        112 => 0.125,
-                                        113 => 0.15625,
-                                        114 => 0.1875,
-                                        115 => 0.21875,
-                                        116 => 0.25,
-                                        117 => 0.3125,
-                                        118 => 0.375,
-                                        119 => 0.4375,
-                                        120 => 0.5,
-                                        121 => 0.625,
-                                        122 => 0.75,
-                                        123 => 0.875,
-                                        124 => 1.0,
-                                        125 => 1.25,
-                                        126 => 1.5,
-                                        127 => 1.75,
-                                        128 => 2.0,
-                                        129 => 2.5,
-                                        130 => 3.0,
-                                        131 => 3.5,
-                                        132 => 4.0,
-                                        133 => 5.0,
-                                        134 => 6.0,
-                                        135 => 7.0,
-                                        136 => 8.0,
-                                        137 => 10.0,
-                                        138 => 12.0,
-                                        139 => 14.0,
-                                        140 => 16.0,
-                                        141 => 20.0,
-                                        142 => 24.0,
-                                        143 => 28.0,
-                                        144 => 32.0,
-                                        145 => 40.0,
-                                        146 => 48.0,
-                                        147 => 56.0,
-                                        148 => 64.0,
-                                        149 => 80.0,
-                                        150 => 96.0,
-                                        151 => 112.0,
-                                        152 => 128.0,
-                                        153 => 160.0,
-                                        154 => 192.0,
-                                        155 => 224.0,
-                                        156 => 256.0,
-                                        157 => 320.0,
-                                        158 => 384.0,
-                                        159 => 448.0,
-                                        160 => 512.0,
-                                        161 => 640.0,
-                                        162 => 768.0,
-                                        163 => 896.0,
-                                        164 => 1024.0,
-                                        165 => 1280.0,
-                                        166 => 1536.0,
-                                        167 => 1792.0,
-                                        168 => 2048.0,
-                                        169 => 2560.0,
-                                        170 => 3072.0,
-                                        171 => 3584.0,
-                                        172 => 4096.0,
-                                        173 => 5120.0,
-                                        174 => 6144.0,
-                                        175 => 7168.0,
-                                        176 => 8192.0,
-                                        177 => 10240.0,
-                                        178 => 12288.0,
-                                        179 => 14336.0,
-                                        180 => 16384.0,
-                                        181 => 20480.0,
-                                        182 => 24576.0,
-                                        183 => 28672.0,
-                                        184 => 32768.0,
-                                        185 => 40960.0,
-                                        186 => 49152.0,
-                                        187 => 57344.0,
-                                        188 => 65536.0,
-                                        189 => 81920.0,
-                                        190 => 98304.0,
-                                        191 => 114688.0,
-                                        192 => 131072.0,
-                                        193 => 163840.0,
-                                        194 => 196608.0,
-                                        195 => 229376.0,
-                                        196 => 262144.0,
-                                        197 => 327680.0,
-                                        198 => 393216.0,
-                                        199 => 458752.0,
-                                        200 => 524288.0,
-                                        201 => 655360.0,
-                                        202 => 786432.0,
-                                        203 => 917504.0,
-                                        204 => 1048576.0,
-                                        205 => 1310720.0,
-                                        206 => 1572864.0,
-                                        207 => 1835008.0,
-                                        208 => 2097152.0,
-                                        209 => 2621440.0,
-                                        210 => 3145728.0,
-                                        211 => 3670016.0,
-                                        212 => 4194304.0,
-                                        213 => 5242880.0,
-                                        214 => 6291456.0,
-                                        215 => 7340032.0,
-                                        216 => 8388608.0,
-                                        217 => 1.048576E7,
-                                        218 => 1.2582912E7,
-                                        219 => 1.4680064E7,
-                                        220 => 1.6777216E7,
-                                        221 => 2.097152E7,
-                                        222 => 2.5165824E7,
-                                        223 => 2.9360128E7,
-                                        224 => 3.3554432E7,
-                                        225 => 4.194304E7,
-                                        226 => 5.0331648E7,
-                                        227 => 5.8720256E7,
-                                        228 => 6.7108864E7,
-                                        229 => 8.388608E7,
-                                        230 => 1.00663296E8,
-                                        231 => 1.17440512E8,
-                                        232 => 1.34217728E8,
-                                        233 => 1.6777216E8,
-                                        234 => 2.01326592E8,
-                                        235 => 2.34881024E8,
-                                        236 => 2.68435456E8,
-                                        237 => 3.3554432E8,
-                                        238 => 4.02653184E8,
-                                        239 => 4.69762048E8,
-                                        240 => 5.3687091E8,
-                                        241 => 6.7108864E8,
-                                        242 => 8.0530637E8,
-                                        243 => 9.395241E8,
-                                        244 => 1.07374182E9,
-                                        245 => 1.34217728E9,
-                                        246 => 1.61061274E9,
-                                        247 => 1.87904819E9,
-                                        248 => 2.14748365E9,
-                                        249 => 2.68435456E9,
-                                        250 => 3.22122547E9,
-                                        251 => 3.75809638E9,
-                                        252 => 4.2949673E9,
-                                        253 => 5.3687091E9,
-                                        254 => 6.4424509E9,
-                                        255 => 7.5161928E9 );
-
-
-    /**
-     * Set the default Similarity implementation used by indexing and search
-     * code.
-     *
-     * @param Zend_Search_Lucene_Search_Similarity $similarity
-     */
-    public static function setDefault(Zend_Search_Lucene_Search_Similarity $similarity)
-    {
-        self::$_defaultImpl = $similarity;
-    }
-
-
-    /**
-     * Return the default Similarity implementation used by indexing and search
-     * code.
-     *
-     * @return Zend_Search_Lucene_Search_Similarity
-     */
-    public static function getDefault()
-    {
-        if (!self::$_defaultImpl instanceof Zend_Search_Lucene_Search_Similarity) {
-            require_once 'Zend/Search/Lucene/Search/Similarity/Default.php';
-            self::$_defaultImpl = new Zend_Search_Lucene_Search_Similarity_Default();
-        }
-
-        return self::$_defaultImpl;
-    }
-
-
-    /**
-     * Computes the normalization value for a field given the total number of
-     * terms contained in a field.  These values, together with field boosts, are
-     * stored in an index and multipled into scores for hits on each field by the
-     * search code.
-     *
-     * Matches in longer fields are less precise, so implemenations of this
-     * method usually return smaller values when 'numTokens' is large,
-     * and larger values when 'numTokens' is small.
-     *
-     * That these values are computed under
-     * IndexWriter::addDocument(Document) and stored then using
-     * encodeNorm(float).  Thus they have limited precision, and documents
-     * must be re-indexed if this method is altered.
-     *
-     * fieldName - name of field
-     * numTokens - the total number of tokens contained in fields named
-     *             'fieldName' of 'doc'.
-     * Returns a normalization factor for hits on this field of this document
-     *
-     * @param string $fieldName
-     * @param integer $numTokens
-     * @return float
-     */
-    abstract public function lengthNorm($fieldName, $numTokens);
-
-    /**
-     * Computes the normalization value for a query given the sum of the squared
-     * weights of each of the query terms.  This value is then multipled into the
-     * weight of each query term.
-     *
-     * This does not affect ranking, but rather just attempts to make scores
-     * from different queries comparable.
-     *
-     * sumOfSquaredWeights - the sum of the squares of query term weights
-     * Returns a normalization factor for query weights
-     *
-     * @param float $sumOfSquaredWeights
-     * @return float
-     */
-    abstract public function queryNorm($sumOfSquaredWeights);
-
-
-    /**
-     *  Decodes a normalization factor stored in an index.
-     *
-     * @param integer $byte
-     * @return float
-     */
-    public static function decodeNorm($byte)
-    {
-        return self::$_normTable[$byte & 0xFF];
-    }
-
-
-    /**
-     * Encodes a normalization factor for storage in an index.
-     *
-     * The encoding uses a five-bit exponent and three-bit mantissa, thus
-     * representing values from around 7x10^9 to 2x10^-9 with about one
-     * significant decimal digit of accuracy.  Zero is also represented.
-     * Negative numbers are rounded up to zero.  Values too large to represent
-     * are rounded down to the largest representable value.  Positive values too
-     * small to represent are rounded up to the smallest positive representable
-     * value.
-     *
-     * @param float $f
-     * @return integer
-     */
-    static function encodeNorm($f)
-    {
-      return self::_floatToByte($f);
-    }
-
-    /**
-     * Float to byte conversion
-     *
-     * @param integer $b
-     * @return float
-     */
-    private static function _floatToByte($f)
-    {
-        // round negatives up to zero
-        if ($f <= 0.0) {
-            return 0;
-        }
-
-        // search for appropriate value
-        $lowIndex = 0;
-        $highIndex = 255;
-        while ($highIndex >= $lowIndex) {
-            // $mid = ($highIndex - $lowIndex)/2;
-            $mid = ($highIndex + $lowIndex) >> 1;
-            $delta = $f - self::$_normTable[$mid];
-
-            if ($delta < 0) {
-                $highIndex = $mid-1;
-            } elseif ($delta > 0) {
-                $lowIndex  = $mid+1;
-            } else {
-                return $mid; // We got it!
-            }
-        }
-
-        // round to closest value
-        if ($highIndex != 255 &&
-            $f - self::$_normTable[$highIndex] > self::$_normTable[$highIndex+1] - $f ) {
-            return $highIndex + 1;
-        } else {
-            return $highIndex;
-        }
-    }
-
-
-    /**
-     * Computes a score factor based on a term or phrase's frequency in a
-     * document.  This value is multiplied by the idf(Term, Searcher)
-     * factor for each term in the query and these products are then summed to
-     * form the initial score for a document.
-     *
-     * Terms and phrases repeated in a document indicate the topic of the
-     * document, so implementations of this method usually return larger values
-     * when 'freq' is large, and smaller values when 'freq'
-     * is small.
-     *
-     * freq - the frequency of a term within a document
-     * Returns a score factor based on a term's within-document frequency
-     *
-     * @param float $freq
-     * @return float
-     */
-    abstract public function tf($freq);
-
-    /**
-     * Computes the amount of a sloppy phrase match, based on an edit distance.
-     * This value is summed for each sloppy phrase match in a document to form
-     * the frequency that is passed to tf(float).
-     *
-     * A phrase match with a small edit distance to a document passage more
-     * closely matches the document, so implementations of this method usually
-     * return larger values when the edit distance is small and smaller values
-     * when it is large.
-     *
-     * distance - the edit distance of this sloppy phrase match
-     * Returns the frequency increment for this match
-     *
-     * @param integer $distance
-     * @return float
-     */
-    abstract public function sloppyFreq($distance);
-
-
-    /**
-     * Computes a score factor for a simple term or a phrase.
-     *
-     * The default implementation is:
-     *   return idfFreq(searcher.docFreq(term), searcher.maxDoc());
-     *
-     * input - the term in question or array of terms
-     * reader - reader the document collection being searched
-     * Returns a score factor for the term
-     *
-     * @param mixed $input
-     * @param Zend_Search_Lucene_Interface $reader
-     * @return a score factor for the term
-     */
-    public function idf($input, Zend_Search_Lucene_Interface $reader)
-    {
-        if (!is_array($input)) {
-            return $this->idfFreq($reader->docFreq($input), $reader->count());
-        } else {
-            $idf = 0.0;
-            foreach ($input as $term) {
-                $idf += $this->idfFreq($reader->docFreq($term), $reader->count());
-            }
-            return $idf;
-        }
-    }
-
-    /**
-     * Computes a score factor based on a term's document frequency (the number
-     * of documents which contain the term).  This value is multiplied by the
-     * tf(int) factor for each term in the query and these products are
-     * then summed to form the initial score for a document.
-     *
-     * Terms that occur in fewer documents are better indicators of topic, so
-     * implemenations of this method usually return larger values for rare terms,
-     * and smaller values for common terms.
-     *
-     * docFreq - the number of documents which contain the term
-     * numDocs - the total number of documents in the collection
-     * Returns a score factor based on the term's document frequency
-     *
-     * @param integer $docFreq
-     * @param integer $numDocs
-     * @return float
-     */
-    abstract public function idfFreq($docFreq, $numDocs);
-
-    /**
-     * Computes a score factor based on the fraction of all query terms that a
-     * document contains.  This value is multiplied into scores.
-     *
-     * The presence of a large portion of the query terms indicates a better
-     * match with the query, so implemenations of this method usually return
-     * larger values when the ratio between these parameters is large and smaller
-     * values when the ratio between them is small.
-     *
-     * overlap - the number of query terms matched in the document
-     * maxOverlap - the total number of terms in the query
-     * Returns a score factor based on term overlap with the query
-     *
-     * @param integer $overlap
-     * @param integer $maxOverlap
-     * @return float
-     */
-    abstract public function coord($overlap, $maxOverlap);
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity/Default.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity/Default.php
deleted file mode 100644
index 1e86053aa..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Similarity/Default.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Similarity */
-require_once 'Zend/Search/Lucene/Search/Similarity.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Similarity_Default extends Zend_Search_Lucene_Search_Similarity
-{
-
-    /**
-     * Implemented as '1/sqrt(numTerms)'.
-     *
-     * @param string $fieldName
-     * @param integer $numTerms
-     * @return float
-     */
-    public function lengthNorm($fieldName, $numTerms)
-    {
-        if ($numTerms == 0) {
-            return 1E10;
-        }
-
-        return 1.0/sqrt($numTerms);
-    }
-
-    /**
-     * Implemented as '1/sqrt(sumOfSquaredWeights)'.
-     *
-     * @param float $sumOfSquaredWeights
-     * @return float
-     */
-    public function queryNorm($sumOfSquaredWeights)
-    {
-        return 1.0/sqrt($sumOfSquaredWeights);
-    }
-
-    /**
-     * Implemented as 'sqrt(freq)'.
-     *
-     * @param float $freq
-     * @return float
-     */
-    public function tf($freq)
-    {
-        return sqrt($freq);
-    }
-
-    /**
-     * Implemented as '1/(distance + 1)'.
-     *
-     * @param integer $distance
-     * @return float
-     */
-    public function sloppyFreq($distance)
-    {
-        return 1.0/($distance + 1);
-    }
-
-    /**
-     * Implemented as 'log(numDocs/(docFreq+1)) + 1'.
-     *
-     * @param integer $docFreq
-     * @param integer $numDocs
-     * @return float
-     */
-    public function idfFreq($docFreq, $numDocs)
-    {
-        return log($numDocs/(float)($docFreq+1)) + 1.0;
-    }
-
-    /**
-     * Implemented as 'overlap/maxOverlap'.
-     *
-     * @param integer $overlap
-     * @param integer $maxOverlap
-     * @return float
-     */
-    public function coord($overlap, $maxOverlap)
-    {
-        return $overlap/(float)$maxOverlap;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight.php
deleted file mode 100644
index bcaf76624..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Calculate query weights and build query scorers.
- *
- * A Weight is constructed by a query Query->createWeight().
- * The sumOfSquaredWeights() method is then called on the top-level
- * query to compute the query normalization factor Similarity->queryNorm(float).
- * This factor is then passed to normalize(float).  At this point the weighting
- * is complete.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * Normalization factor.
-     * This value is stored only for query expanation purpose and not used in any other place
-     *
-     * @var float
-     */
-    protected $_queryNorm;
-
-    /**
-     * Weight value
-     *
-     * Weight value may be initialized in sumOfSquaredWeights() or normalize()
-     * because they both are invoked either in Query::_initWeight (for top-level query) or
-     * in corresponding methods of parent query's weights
-     *
-     * @var float
-     */
-    protected $_value;
-
-
-    /**
-     * The weight for this query.
-     *
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    abstract public function sumOfSquaredWeights();
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param $norm
-     */
-    abstract public function normalize($norm);
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Boolean.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Boolean.php
deleted file mode 100644
index fbbae127e..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Boolean.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Weight */
-require_once 'Zend/Search/Lucene/Search/Weight.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Weight_Boolean extends Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * IndexReader.
-     *
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $_reader;
-
-    /**
-     * The query that this concerns.
-     *
-     * @var Zend_Search_Lucene_Search_Query
-     */
-    private $_query;
-
-    /**
-     * Queries weights
-     * Array of Zend_Search_Lucene_Search_Weight
-     *
-     * @var array
-     */
-    private $_weights;
-
-
-    /**
-     * Zend_Search_Lucene_Search_Weight_Boolean constructor
-     * query - the query that this concerns.
-     * reader - index reader
-     *
-     * @param Zend_Search_Lucene_Search_Query $query
-     * @param Zend_Search_Lucene_Interface    $reader
-     */
-    public function __construct(Zend_Search_Lucene_Search_Query $query,
-                                Zend_Search_Lucene_Interface    $reader)
-    {
-        $this->_query   = $query;
-        $this->_reader  = $reader;
-        $this->_weights = array();
-
-        $signs = $query->getSigns();
-
-        foreach ($query->getSubqueries() as $num => $subquery) {
-            if ($signs === null || $signs[$num] === null || $signs[$num]) {
-                $this->_weights[$num] = $subquery->createWeight($reader);
-            }
-        }
-    }
-
-
-    /**
-     * The weight for this query
-     * Standard Weight::$_value is not used for boolean queries
-     *
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->_query->getBoost();
-    }
-
-
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    public function sumOfSquaredWeights()
-    {
-        $sum = 0;
-        foreach ($this->_weights as $weight) {
-            // sum sub weights
-            $sum += $weight->sumOfSquaredWeights();
-        }
-
-        // boost each sub-weight
-        $sum *= $this->_query->getBoost() * $this->_query->getBoost();
-
-        // check for empty query (like '-something -another')
-        if ($sum == 0) {
-            $sum = 1.0;
-        }
-        return $sum;
-    }
-
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param float $queryNorm
-     */
-    public function normalize($queryNorm)
-    {
-        // incorporate boost
-        $queryNorm *= $this->_query->getBoost();
-
-        foreach ($this->_weights as $weight) {
-            $weight->normalize($queryNorm);
-        }
-    }
-}
-
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Empty.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Empty.php
deleted file mode 100644
index 0378a1bbc..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Empty.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Weight */
-require_once 'Zend/Search/Lucene/Search/Weight.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Weight_Empty extends Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    public function sumOfSquaredWeights()
-    {
-        return 1;
-    }
-
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param float $queryNorm
-     */
-    public function normalize($queryNorm)
-    {
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
deleted file mode 100644
index 7cddcbb33..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Weight */
-require_once 'Zend/Search/Lucene/Search/Weight.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Weight_MultiTerm extends Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * IndexReader.
-     *
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $_reader;
-
-    /**
-     * The query that this concerns.
-     *
-     * @var Zend_Search_Lucene_Search_Query
-     */
-    private $_query;
-
-    /**
-     * Query terms weights
-     * Array of Zend_Search_Lucene_Search_Weight_Term
-     *
-     * @var array
-     */
-    private $_weights;
-
-
-    /**
-     * Zend_Search_Lucene_Search_Weight_MultiTerm constructor
-     * query - the query that this concerns.
-     * reader - index reader
-     *
-     * @param Zend_Search_Lucene_Search_Query $query
-     * @param Zend_Search_Lucene_Interface    $reader
-     */
-    public function __construct(Zend_Search_Lucene_Search_Query $query,
-                                Zend_Search_Lucene_Interface    $reader)
-    {
-        $this->_query   = $query;
-        $this->_reader  = $reader;
-        $this->_weights = array();
-
-        $signs = $query->getSigns();
-
-        foreach ($query->getTerms() as $id => $term) {
-            if ($signs === null || $signs[$id] === null || $signs[$id]) {
-                require_once 'Zend/Search/Lucene/Search/Weight/Term.php';
-                $this->_weights[$id] = new Zend_Search_Lucene_Search_Weight_Term($term, $query, $reader);
-                $query->setWeight($id, $this->_weights[$id]);
-            }
-        }
-    }
-
-
-    /**
-     * The weight for this query
-     * Standard Weight::$_value is not used for boolean queries
-     *
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->_query->getBoost();
-    }
-
-
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    public function sumOfSquaredWeights()
-    {
-        $sum = 0;
-        foreach ($this->_weights as $weight) {
-            // sum sub weights
-            $sum += $weight->sumOfSquaredWeights();
-        }
-
-        // boost each sub-weight
-        $sum *= $this->_query->getBoost() * $this->_query->getBoost();
-
-        // check for empty query (like '-something -another')
-        if ($sum == 0) {
-            $sum = 1.0;
-        }
-        return $sum;
-    }
-
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param float $queryNorm
-     */
-    public function normalize($queryNorm)
-    {
-        // incorporate boost
-        $queryNorm *= $this->_query->getBoost();
-
-        foreach ($this->_weights as $weight) {
-            $weight->normalize($queryNorm);
-        }
-    }
-}
-
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Phrase.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Phrase.php
deleted file mode 100644
index 0aa1aca84..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Phrase.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Search_Lucene_Search_Weight
- */
-require_once 'Zend/Search/Lucene/Search/Weight.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Weight_Phrase extends Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * IndexReader.
-     *
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $_reader;
-
-    /**
-     * The query that this concerns.
-     *
-     * @var Zend_Search_Lucene_Search_Query_Phrase
-     */
-    private $_query;
-
-    /**
-     * Score factor
-     *
-     * @var float
-     */
-    private $_idf;
-
-    /**
-     * Zend_Search_Lucene_Search_Weight_Phrase constructor
-     *
-     * @param Zend_Search_Lucene_Search_Query_Phrase $query
-     * @param Zend_Search_Lucene_Interface           $reader
-     */
-    public function __construct(Zend_Search_Lucene_Search_Query_Phrase $query,
-                                Zend_Search_Lucene_Interface           $reader)
-    {
-        $this->_query  = $query;
-        $this->_reader = $reader;
-    }
-
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    public function sumOfSquaredWeights()
-    {
-        // compute idf
-        $this->_idf = $this->_reader->getSimilarity()->idf($this->_query->getTerms(), $this->_reader);
-
-        // compute query weight
-        $this->_queryWeight = $this->_idf * $this->_query->getBoost();
-
-        // square it
-        return $this->_queryWeight * $this->_queryWeight;
-    }
-
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param float $queryNorm
-     */
-    public function normalize($queryNorm)
-    {
-        $this->_queryNorm = $queryNorm;
-
-        // normalize query weight
-        $this->_queryWeight *= $queryNorm;
-
-        // idf for documents
-        $this->_value = $this->_queryWeight * $this->_idf;
-    }
-}
-
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Term.php b/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Term.php
deleted file mode 100644
index 33b0017f5..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Search/Weight/Term.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Search_Weight */
-require_once 'Zend/Search/Lucene/Search/Weight.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Search
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Search_Weight_Term extends Zend_Search_Lucene_Search_Weight
-{
-    /**
-     * IndexReader.
-     *
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $_reader;
-
-    /**
-     * Term
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    private $_term;
-
-    /**
-     * The query that this concerns.
-     *
-     * @var Zend_Search_Lucene_Search_Query
-     */
-    private $_query;
-
-    /**
-     * Score factor
-     *
-     * @var float
-     */
-    private $_idf;
-
-    /**
-     * Query weight
-     *
-     * @var float
-     */
-    private $_queryWeight;
-
-
-    /**
-     * Zend_Search_Lucene_Search_Weight_Term constructor
-     * reader - index reader
-     *
-     * @param Zend_Search_Lucene_Index_Term   $term
-     * @param Zend_Search_Lucene_Search_Query $query
-     * @param Zend_Search_Lucene_Interface    $reader
-     */
-    public function __construct(Zend_Search_Lucene_Index_Term   $term,
-                                Zend_Search_Lucene_Search_Query $query,
-                                Zend_Search_Lucene_Interface    $reader)
-    {
-        $this->_term   = $term;
-        $this->_query  = $query;
-        $this->_reader = $reader;
-    }
-
-
-    /**
-     * The sum of squared weights of contained query clauses.
-     *
-     * @return float
-     */
-    public function sumOfSquaredWeights()
-    {
-        // compute idf
-        $this->_idf = $this->_reader->getSimilarity()->idf($this->_term, $this->_reader);
-
-        // compute query weight
-        $this->_queryWeight = $this->_idf * $this->_query->getBoost();
-
-        // square it
-        return $this->_queryWeight * $this->_queryWeight;
-    }
-
-
-    /**
-     * Assigns the query normalization factor to this.
-     *
-     * @param float $queryNorm
-     */
-    public function normalize($queryNorm)
-    {
-        $this->_queryNorm = $queryNorm;
-
-        // normalize query weight
-        $this->_queryWeight *= $queryNorm;
-
-        // idf for documents
-        $this->_value = $this->_queryWeight * $this->_idf;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory.php b/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory.php
deleted file mode 100644
index c83c253a4..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Storage_Directory
-{
-
-    /**
-     * Closes the store.
-     *
-     * @return void
-     */
-    abstract public function close();
-
-    /**
-     * Returns an array of strings, one for each file in the directory.
-     *
-     * @return array
-     */
-    abstract public function fileList();
-
-    /**
-     * Creates a new, empty file in the directory with the given $filename.
-     *
-     * @param string $filename
-     * @return Zend_Search_Lucene_Storage_File
-     */
-    abstract public function createFile($filename);
-
-
-    /**
-     * Removes an existing $filename in the directory.
-     *
-     * @param string $filename
-     * @return void
-     */
-    abstract public function deleteFile($filename);
-
-    /**
-     * Purge file if it's cached by directory object
-     *
-     * Method is used to prevent 'too many open files' error
-     *
-     * @param string $filename
-     * @return void
-     */
-    abstract public function purgeFile($filename);
-
-    /**
-     * Returns true if a file with the given $filename exists.
-     *
-     * @param string $filename
-     * @return boolean
-     */
-    abstract public function fileExists($filename);
-
-
-    /**
-     * Returns the length of a $filename in the directory.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    abstract public function fileLength($filename);
-
-
-    /**
-     * Returns the UNIX timestamp $filename was last modified.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    abstract public function fileModified($filename);
-
-
-    /**
-     * Renames an existing file in the directory.
-     *
-     * @param string $from
-     * @param string $to
-     * @return void
-     */
-    abstract public function renameFile($from, $to);
-
-
-    /**
-     * Sets the modified time of $filename to now.
-     *
-     * @param string $filename
-     * @return void
-     */
-    abstract public function touchFile($filename);
-
-
-    /**
-     * Returns a Zend_Search_Lucene_Storage_File object for a given $filename in the directory.
-     *
-     * If $shareHandler option is true, then file handler can be shared between File Object
-     * requests. It speed-ups performance, but makes problems with file position.
-     * Shared handler are good for short atomic requests.
-     * Non-shared handlers are useful for stream file reading (especial for compound files).
-     *
-     * @param string $filename
-     * @param boolean $shareHandler
-     * @return Zend_Search_Lucene_Storage_File
-     */
-    abstract public function getFileObject($filename, $shareHandler = true);
-
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php b/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
deleted file mode 100644
index 5b1ecc180..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Filesystem.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_Search_Lucene_Storage_Directory */
-require_once 'Zend/Search/Lucene/Storage/Directory.php';
-
-
-/**
- * FileSystem implementation of Directory abstraction.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Storage_Directory_Filesystem extends Zend_Search_Lucene_Storage_Directory
-{
-    /**
-     * Filesystem path to the directory
-     *
-     * @var string
-     */
-    protected $_dirPath = null;
-
-    /**
-     * Cache for Zend_Search_Lucene_Storage_File_Filesystem objects
-     * Array: filename => Zend_Search_Lucene_Storage_File object
-     *
-     * @var array
-     * @throws Zend_Search_Lucene_Exception
-     */
-    protected $_fileHandlers;
-
-    /**
-     * Default file permissions
-     *
-     * @var integer
-     */
-    protected static $_defaultFilePermissions = 0666;
-
-
-    /**
-     * Get default file permissions
-     *
-     * @return integer
-     */
-    public static function getDefaultFilePermissions()
-    {
-        return self::$_defaultFilePermissions;
-    }
-
-    /**
-     * Set default file permissions
-     *
-     * @param integer $mode
-     */
-    public static function setDefaultFilePermissions($mode)
-    {
-        self::$_defaultFilePermissions = $mode;
-    }
-
-
-    /**
-     * Utility function to recursive directory creation
-     *
-     * @param string $dir
-     * @param integer $mode
-     * @param boolean $recursive
-     * @return boolean
-     */
-
-    public static function mkdirs($dir, $mode = 0777, $recursive = true)
-    {
-        if (($dir === null) || $dir === '') {
-            return false;
-        }
-        if (is_dir($dir) || $dir === '/') {
-            return true;
-        }
-        if (self::mkdirs(dirname($dir), $mode, $recursive)) {
-            return mkdir($dir, $mode);
-        }
-        return false;
-    }
-
-
-    /**
-     * Object constructor
-     * Checks if $path is a directory or tries to create it.
-     *
-     * @param string $path
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function __construct($path)
-    {
-        if (!is_dir($path)) {
-            if (file_exists($path)) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Path exists, but it\'s not a directory');
-            } else {
-                if (!self::mkdirs($path)) {
-                    require_once 'Zend/Search/Lucene/Exception.php';
-                    throw new Zend_Search_Lucene_Exception("Can't create directory '$path'.");
-                }
-            }
-        }
-        $this->_dirPath = $path;
-        $this->_fileHandlers = array();
-    }
-
-
-    /**
-     * Closes the store.
-     *
-     * @return void
-     */
-    public function close()
-    {
-        foreach ($this->_fileHandlers as $fileObject) {
-            $fileObject->close();
-        }
-
-        $this->_fileHandlers = array();
-    }
-
-
-    /**
-     * Returns an array of strings, one for each file in the directory.
-     *
-     * @return array
-     */
-    public function fileList()
-    {
-        $result = array();
-
-        $dirContent = opendir( $this->_dirPath );
-        while (($file = readdir($dirContent)) !== false) {
-            if (($file == '..')||($file == '.'))   continue;
-
-            if( !is_dir($this->_dirPath . '/' . $file) ) {
-                $result[] = $file;
-            }
-        }
-        closedir($dirContent);
-
-        return $result;
-    }
-
-    /**
-     * Creates a new, empty file in the directory with the given $filename.
-     *
-     * @param string $filename
-     * @return Zend_Search_Lucene_Storage_File
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function createFile($filename)
-    {
-        if (isset($this->_fileHandlers[$filename])) {
-            $this->_fileHandlers[$filename]->close();
-        }
-        unset($this->_fileHandlers[$filename]);
-        require_once 'Zend/Search/Lucene/Storage/File/Filesystem.php';
-        $this->_fileHandlers[$filename] = new Zend_Search_Lucene_Storage_File_Filesystem($this->_dirPath . '/' . $filename, 'w+b');
-
-        // Set file permissions, but don't care about any possible failures, since file may be already
-        // created by anther user which has to care about right permissions
-        @chmod($this->_dirPath . '/' . $filename, self::$_defaultFilePermissions);
-
-        return $this->_fileHandlers[$filename];
-    }
-
-
-    /**
-     * Removes an existing $filename in the directory.
-     *
-     * @param string $filename
-     * @return void
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function deleteFile($filename)
-    {
-        if (isset($this->_fileHandlers[$filename])) {
-            $this->_fileHandlers[$filename]->close();
-        }
-        unset($this->_fileHandlers[$filename]);
-
-        global $php_errormsg;
-        $trackErrors = ini_get('track_errors'); ini_set('track_errors', '1');
-        if (!@unlink($this->_dirPath . '/' . $filename)) {
-            ini_set('track_errors', $trackErrors);
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Can\'t delete file: ' . $php_errormsg);
-        }
-        ini_set('track_errors', $trackErrors);
-    }
-
-    /**
-     * Purge file if it's cached by directory object
-     *
-     * Method is used to prevent 'too many open files' error
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function purgeFile($filename)
-    {
-        if (isset($this->_fileHandlers[$filename])) {
-            $this->_fileHandlers[$filename]->close();
-        }
-        unset($this->_fileHandlers[$filename]);
-    }
-
-
-    /**
-     * Returns true if a file with the given $filename exists.
-     *
-     * @param string $filename
-     * @return boolean
-     */
-    public function fileExists($filename)
-    {
-        return isset($this->_fileHandlers[$filename]) ||
-               file_exists($this->_dirPath . '/' . $filename);
-    }
-
-
-    /**
-     * Returns the length of a $filename in the directory.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    public function fileLength($filename)
-    {
-        if (isset( $this->_fileHandlers[$filename] )) {
-            return $this->_fileHandlers[$filename]->size();
-        }
-        return filesize($this->_dirPath .'/'. $filename);
-    }
-
-
-    /**
-     * Returns the UNIX timestamp $filename was last modified.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    public function fileModified($filename)
-    {
-        return filemtime($this->_dirPath .'/'. $filename);
-    }
-
-
-    /**
-     * Renames an existing file in the directory.
-     *
-     * @param string $from
-     * @param string $to
-     * @return void
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function renameFile($from, $to)
-    {
-        global $php_errormsg;
-
-        if (isset($this->_fileHandlers[$from])) {
-            $this->_fileHandlers[$from]->close();
-        }
-        unset($this->_fileHandlers[$from]);
-
-        if (isset($this->_fileHandlers[$to])) {
-            $this->_fileHandlers[$to]->close();
-        }
-        unset($this->_fileHandlers[$to]);
-
-        if (file_exists($this->_dirPath . '/' . $to)) {
-            if (!unlink($this->_dirPath . '/' . $to)) {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Delete operation failed');
-            }
-        }
-
-        $trackErrors = ini_get('track_errors');
-        ini_set('track_errors', '1');
-
-        $success = @rename($this->_dirPath . '/' . $from, $this->_dirPath . '/' . $to);
-        if (!$success) {
-            ini_set('track_errors', $trackErrors);
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception($php_errormsg);
-        }
-
-        ini_set('track_errors', $trackErrors);
-
-        return $success;
-    }
-
-
-    /**
-     * Sets the modified time of $filename to now.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function touchFile($filename)
-    {
-        return touch($this->_dirPath .'/'. $filename);
-    }
-
-
-    /**
-     * Returns a Zend_Search_Lucene_Storage_File object for a given $filename in the directory.
-     *
-     * If $shareHandler option is true, then file handler can be shared between File Object
-     * requests. It speed-ups performance, but makes problems with file position.
-     * Shared handler are good for short atomic requests.
-     * Non-shared handlers are useful for stream file reading (especial for compound files).
-     *
-     * @param string $filename
-     * @param boolean $shareHandler
-     * @return Zend_Search_Lucene_Storage_File
-     */
-    public function getFileObject($filename, $shareHandler = true)
-    {
-        $fullFilename = $this->_dirPath . '/' . $filename;
-
-        require_once 'Zend/Search/Lucene/Storage/File/Filesystem.php';
-        if (!$shareHandler) {
-            return new Zend_Search_Lucene_Storage_File_Filesystem($fullFilename);
-        }
-
-        if (isset( $this->_fileHandlers[$filename] )) {
-            $this->_fileHandlers[$filename]->seek(0);
-            return $this->_fileHandlers[$filename];
-        }
-
-        $this->_fileHandlers[$filename] = new Zend_Search_Lucene_Storage_File_Filesystem($fullFilename);
-        return $this->_fileHandlers[$filename];
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Storage/File.php b/airtime_mvc/library/Zend/Search/Lucene/Storage/File.php
deleted file mode 100644
index 72c227531..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Storage/File.php
+++ /dev/null
@@ -1,473 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Search_Lucene_Storage_File
-{
-    /**
-     * Reads $length number of bytes at the current position in the
-     * file and advances the file pointer.
-     *
-     * @param integer $length
-     * @return string
-     */
-    abstract protected function _fread($length=1);
-
-
-    /**
-     * Sets the file position indicator and advances the file pointer.
-     * The new position, measured in bytes from the beginning of the file,
-     * is obtained by adding offset to the position specified by whence,
-     * whose values are defined as follows:
-     * SEEK_SET - Set position equal to offset bytes.
-     * SEEK_CUR - Set position to current location plus offset.
-     * SEEK_END - Set position to end-of-file plus offset. (To move to
-     * a position before the end-of-file, you need to pass a negative value
-     * in offset.)
-     * Upon success, returns 0; otherwise, returns -1
-     *
-     * @param integer $offset
-     * @param integer $whence
-     * @return integer
-     */
-    abstract public function seek($offset, $whence=SEEK_SET);
-
-    /**
-     * Get file position.
-     *
-     * @return integer
-     */
-    abstract public function tell();
-
-    /**
-     * Flush output.
-     *
-     * Returns true on success or false on failure.
-     *
-     * @return boolean
-     */
-    abstract public function flush();
-
-    /**
-     * Writes $length number of bytes (all, if $length===null) to the end
-     * of the file.
-     *
-     * @param string $data
-     * @param integer $length
-     */
-    abstract protected function _fwrite($data, $length=null);
-
-    /**
-     * Lock file
-     *
-     * Lock type may be a LOCK_SH (shared lock) or a LOCK_EX (exclusive lock)
-     *
-     * @param integer $lockType
-     * @return boolean
-     */
-    abstract public function lock($lockType, $nonBlockinLock = false);
-
-    /**
-     * Unlock file
-     */
-    abstract public function unlock();
-
-    /**
-     * Reads a byte from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readByte()
-    {
-        return ord($this->_fread(1));
-    }
-
-    /**
-     * Writes a byte to the end of the file.
-     *
-     * @param integer $byte
-     */
-    public function writeByte($byte)
-    {
-        return $this->_fwrite(chr($byte), 1);
-    }
-
-    /**
-     * Read num bytes from the current position in the file
-     * and advances the file pointer.
-     *
-     * @param integer $num
-     * @return string
-     */
-    public function readBytes($num)
-    {
-        return $this->_fread($num);
-    }
-
-    /**
-     * Writes num bytes of data (all, if $num===null) to the end
-     * of the string.
-     *
-     * @param string $data
-     * @param integer $num
-     */
-    public function writeBytes($data, $num=null)
-    {
-        $this->_fwrite($data, $num);
-    }
-
-
-    /**
-     * Reads an integer from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readInt()
-    {
-        $str = $this->_fread(4);
-
-        return  ord($str[0]) << 24 |
-                ord($str[1]) << 16 |
-                ord($str[2]) << 8  |
-                ord($str[3]);
-    }
-
-
-    /**
-     * Writes an integer to the end of file.
-     *
-     * @param integer $value
-     */
-    public function writeInt($value)
-    {
-        settype($value, 'integer');
-        $this->_fwrite( chr($value>>24 & 0xFF) .
-                        chr($value>>16 & 0xFF) .
-                        chr($value>>8  & 0xFF) .
-                        chr($value     & 0xFF),   4  );
-    }
-
-
-    /**
-     * Returns a long integer from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer|float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function readLong()
-    {
-        /**
-         * Check, that we work in 64-bit mode.
-         * fseek() uses long for offset. Thus, largest index segment file size in 32bit mode is 2Gb
-         */
-        if (PHP_INT_SIZE > 4) {
-            $str = $this->_fread(8);
-
-            return  ord($str[0]) << 56  |
-                    ord($str[1]) << 48  |
-                    ord($str[2]) << 40  |
-                    ord($str[3]) << 32  |
-                    ord($str[4]) << 24  |
-                    ord($str[5]) << 16  |
-                    ord($str[6]) << 8   |
-                    ord($str[7]);
-        } else {
-            return $this->readLong32Bit();
-        }
-    }
-
-    /**
-     * Writes long integer to the end of file
-     *
-     * @param integer $value
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeLong($value)
-    {
-        /**
-         * Check, that we work in 64-bit mode.
-         * fseek() and ftell() use long for offset. Thus, largest index segment file size in 32bit mode is 2Gb
-         */
-        if (PHP_INT_SIZE > 4) {
-            settype($value, 'integer');
-            $this->_fwrite( chr($value>>56 & 0xFF) .
-                            chr($value>>48 & 0xFF) .
-                            chr($value>>40 & 0xFF) .
-                            chr($value>>32 & 0xFF) .
-                            chr($value>>24 & 0xFF) .
-                            chr($value>>16 & 0xFF) .
-                            chr($value>>8  & 0xFF) .
-                            chr($value     & 0xFF),   8  );
-        } else {
-            $this->writeLong32Bit($value);
-        }
-    }
-
-
-    /**
-     * Returns a long integer from the current position in the file,
-     * advances the file pointer and return it as float (for 32-bit platforms).
-     *
-     * @return integer|float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function readLong32Bit()
-    {
-        $wordHigh = $this->readInt();
-        $wordLow  = $this->readInt();
-
-        if ($wordHigh & (int)0x80000000) {
-            // It's a negative value since the highest bit is set
-            if ($wordHigh == (int)0xFFFFFFFF  &&  ($wordLow & (int)0x80000000)) {
-                return $wordLow;
-            } else {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Long integers lower than -2147483648 (0x80000000) are not supported on 32-bit platforms.');
-            }
-
-        }
-
-        if ($wordLow < 0) {
-            // Value is large than 0x7FFF FFFF. Represent low word as float.
-            $wordLow &= 0x7FFFFFFF;
-            $wordLow += (float)0x80000000;
-        }
-
-        if ($wordHigh == 0) {
-            // Return value as integer if possible
-            return $wordLow;
-        }
-
-        return $wordHigh*(float)0x100000000/* 0x00000001 00000000 */ + $wordLow;
-    }
-
-
-    /**
-     * Writes long integer to the end of file (32-bit platforms implementation)
-     *
-     * @param integer|float $value
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeLong32Bit($value)
-    {
-        if ($value < (int)0x80000000) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Long integers lower than -2147483648 (0x80000000) are not supported on 32-bit platforms.');
-        }
-
-        if ($value < 0) {
-            $wordHigh = (int)0xFFFFFFFF;
-            $wordLow  = (int)$value;
-        } else {
-            $wordHigh = (int)($value/(float)0x100000000/* 0x00000001 00000000 */);
-            $wordLow  = $value - $wordHigh*(float)0x100000000/* 0x00000001 00000000 */;
-
-            if ($wordLow > 0x7FFFFFFF) {
-                // Highest bit of low word is set. Translate it to the corresponding negative integer value
-                $wordLow -= 0x80000000;
-                $wordLow |= 0x80000000;
-            }
-        }
-
-        $this->writeInt($wordHigh);
-        $this->writeInt($wordLow);
-    }
-
-
-    /**
-     * Returns a variable-length integer from the current
-     * position in the file and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readVInt()
-    {
-        $nextByte = ord($this->_fread(1));
-        $val = $nextByte & 0x7F;
-
-        for ($shift=7; ($nextByte & 0x80) != 0; $shift += 7) {
-            $nextByte = ord($this->_fread(1));
-            $val |= ($nextByte & 0x7F) << $shift;
-        }
-        return $val;
-    }
-
-    /**
-     * Writes a variable-length integer to the end of file.
-     *
-     * @param integer $value
-     */
-    public function writeVInt($value)
-    {
-        settype($value, 'integer');
-        while ($value > 0x7F) {
-            $this->_fwrite(chr( ($value & 0x7F)|0x80 ));
-            $value >>= 7;
-        }
-        $this->_fwrite(chr($value));
-    }
-
-
-    /**
-     * Reads a string from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return string
-     */
-    public function readString()
-    {
-        $strlen = $this->readVInt();
-        if ($strlen == 0) {
-            return '';
-        } else {
-            /**
-             * This implementation supports only Basic Multilingual Plane
-             * (BMP) characters (from 0x0000 to 0xFFFF) and doesn't support
-             * "supplementary characters" (characters whose code points are
-             * greater than 0xFFFF)
-             * Java 2 represents these characters as a pair of char (16-bit)
-             * values, the first from the high-surrogates range (0xD800-0xDBFF),
-             * the second from the low-surrogates range (0xDC00-0xDFFF). Then
-             * they are encoded as usual UTF-8 characters in six bytes.
-             * Standard UTF-8 representation uses four bytes for supplementary
-             * characters.
-             */
-
-            $str_val = $this->_fread($strlen);
-
-            for ($count = 0; $count < $strlen; $count++ ) {
-                if (( ord($str_val[$count]) & 0xC0 ) == 0xC0) {
-                    $addBytes = 1;
-                    if (ord($str_val[$count]) & 0x20 ) {
-                        $addBytes++;
-
-                        // Never used. Java2 doesn't encode strings in four bytes
-                        if (ord($str_val[$count]) & 0x10 ) {
-                            $addBytes++;
-                        }
-                    }
-                    $str_val .= $this->_fread($addBytes);
-                    $strlen += $addBytes;
-
-                    // Check for null character. Java2 encodes null character
-                    // in two bytes.
-                    if (ord($str_val[$count])   == 0xC0 &&
-                        ord($str_val[$count+1]) == 0x80   ) {
-                        $str_val[$count] = 0;
-                        $str_val = substr($str_val,0,$count+1)
-                                 . substr($str_val,$count+2);
-                    }
-                    $count += $addBytes;
-                }
-            }
-
-            return $str_val;
-        }
-    }
-
-    /**
-     * Writes a string to the end of file.
-     *
-     * @param string $str
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeString($str)
-    {
-        /**
-         * This implementation supports only Basic Multilingual Plane
-         * (BMP) characters (from 0x0000 to 0xFFFF) and doesn't support
-         * "supplementary characters" (characters whose code points are
-         * greater than 0xFFFF)
-         * Java 2 represents these characters as a pair of char (16-bit)
-         * values, the first from the high-surrogates range (0xD800-0xDBFF),
-         * the second from the low-surrogates range (0xDC00-0xDFFF). Then
-         * they are encoded as usual UTF-8 characters in six bytes.
-         * Standard UTF-8 representation uses four bytes for supplementary
-         * characters.
-         */
-
-        // convert input to a string before iterating string characters
-        settype($str, 'string');
-
-        $chars = $strlen = strlen($str);
-        $containNullChars = false;
-
-        for ($count = 0; $count < $strlen; $count++ ) {
-            /**
-             * String is already in Java 2 representation.
-             * We should only calculate actual string length and replace
-             * \x00 by \xC0\x80
-             */
-            if ((ord($str[$count]) & 0xC0) == 0xC0) {
-                $addBytes = 1;
-                if (ord($str[$count]) & 0x20 ) {
-                    $addBytes++;
-
-                    // Never used. Java2 doesn't encode strings in four bytes
-                    // and we dont't support non-BMP characters
-                    if (ord($str[$count]) & 0x10 ) {
-                        $addBytes++;
-                    }
-                }
-                $chars -= $addBytes;
-
-                if (ord($str[$count]) == 0 ) {
-                    $containNullChars = true;
-                }
-                $count += $addBytes;
-            }
-        }
-
-        if ($chars < 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Invalid UTF-8 string');
-        }
-
-        $this->writeVInt($chars);
-        if ($containNullChars) {
-            $this->_fwrite(str_replace($str, "\x00", "\xC0\x80"));
-        } else {
-            $this->_fwrite($str);
-        }
-    }
-
-
-    /**
-     * Reads binary data from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return string
-     */
-    public function readBinary()
-    {
-        return $this->_fread($this->readVInt());
-    }
-}
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Filesystem.php b/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Filesystem.php
deleted file mode 100644
index 16c986216..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Filesystem.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Filesystem.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Storage_File */
-require_once 'Zend/Search/Lucene/Storage/File.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Storage_File_Filesystem extends Zend_Search_Lucene_Storage_File
-{
-    /**
-     * Resource of the open file
-     *
-     * @var resource
-     */
-    protected $_fileHandle;
-
-
-    /**
-     * Class constructor.  Open the file.
-     *
-     * @param string $filename
-     * @param string $mode
-     */
-    public function __construct($filename, $mode='r+b')
-    {
-        global $php_errormsg;
-
-        if (strpos($mode, 'w') === false  &&  !is_readable($filename)) {
-            // opening for reading non-readable file
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('File \'' . $filename . '\' is not readable.');
-        }
-
-        $trackErrors = ini_get('track_errors');
-        ini_set('track_errors', '1');
-
-        $this->_fileHandle = @fopen($filename, $mode);
-
-        if ($this->_fileHandle === false) {
-            ini_set('track_errors', $trackErrors);
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception($php_errormsg);
-        }
-
-        ini_set('track_errors', $trackErrors);
-    }
-
-    /**
-     * Sets the file position indicator and advances the file pointer.
-     * The new position, measured in bytes from the beginning of the file,
-     * is obtained by adding offset to the position specified by whence,
-     * whose values are defined as follows:
-     * SEEK_SET - Set position equal to offset bytes.
-     * SEEK_CUR - Set position to current location plus offset.
-     * SEEK_END - Set position to end-of-file plus offset. (To move to
-     * a position before the end-of-file, you need to pass a negative value
-     * in offset.)
-     * SEEK_CUR is the only supported offset type for compound files
-     *
-     * Upon success, returns 0; otherwise, returns -1
-     *
-     * @param integer $offset
-     * @param integer $whence
-     * @return integer
-     */
-    public function seek($offset, $whence=SEEK_SET)
-    {
-        return fseek($this->_fileHandle, $offset, $whence);
-    }
-
-
-    /**
-     * Get file position.
-     *
-     * @return integer
-     */
-    public function tell()
-    {
-        return ftell($this->_fileHandle);
-    }
-
-    /**
-     * Flush output.
-     *
-     * Returns true on success or false on failure.
-     *
-     * @return boolean
-     */
-    public function flush()
-    {
-        return fflush($this->_fileHandle);
-    }
-
-    /**
-     * Close File object
-     */
-    public function close()
-    {
-        if ($this->_fileHandle !== null ) {
-            @fclose($this->_fileHandle);
-            $this->_fileHandle = null;
-        }
-    }
-
-    /**
-     * Get the size of the already opened file
-     *
-     * @return integer
-     */
-    public function size()
-    {
-        $position = ftell($this->_fileHandle);
-        fseek($this->_fileHandle, 0, SEEK_END);
-        $size = ftell($this->_fileHandle);
-        fseek($this->_fileHandle,$position);
-
-        return $size;
-    }
-
-    /**
-     * Read a $length bytes from the file and advance the file pointer.
-     *
-     * @param integer $length
-     * @return string
-     */
-    protected function _fread($length=1)
-    {
-        if ($length == 0) {
-            return '';
-        }
-
-        if ($length < 1024) {
-            return fread($this->_fileHandle, $length);
-        }
-
-        $data = '';
-        while ( $length > 0 && ($nextBlock = fread($this->_fileHandle, $length)) != false ) {
-            $data .= $nextBlock;
-            $length -= strlen($nextBlock);
-        }
-        return $data;
-    }
-
-
-    /**
-     * Writes $length number of bytes (all, if $length===null) to the end
-     * of the file.
-     *
-     * @param string $data
-     * @param integer $length
-     */
-    protected function _fwrite($data, $length=null)
-    {
-        if ($length === null ) {
-            fwrite($this->_fileHandle, $data);
-        } else {
-            fwrite($this->_fileHandle, $data, $length);
-        }
-    }
-
-    /**
-     * Lock file
-     *
-     * Lock type may be a LOCK_SH (shared lock) or a LOCK_EX (exclusive lock)
-     *
-     * @param integer $lockType
-     * @param boolean $nonBlockingLock
-     * @return boolean
-     */
-    public function lock($lockType, $nonBlockingLock = false)
-    {
-        if ($nonBlockingLock) {
-            return flock($this->_fileHandle, $lockType | LOCK_NB);
-        } else {
-            return flock($this->_fileHandle, $lockType);
-        }
-    }
-
-    /**
-     * Unlock file
-     *
-     * Returns true on success
-     *
-     * @return boolean
-     */
-    public function unlock()
-    {
-        if ($this->_fileHandle !== null ) {
-            return flock($this->_fileHandle, LOCK_UN);
-        } else {
-            return true;
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Memory.php b/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Memory.php
deleted file mode 100644
index 3f3f1eea6..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/Storage/File/Memory.php
+++ /dev/null
@@ -1,601 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Memory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Storage_File */
-require_once 'Zend/Search/Lucene/Storage/File.php';
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_Storage_File_Memory extends Zend_Search_Lucene_Storage_File
-{
-    /**
-     * FileData
-     *
-     * @var string
-     */
-    private $_data;
-
-    /**
-     * File Position
-     *
-     * @var integer
-     */
-    private $_position = 0;
-
-
-    /**
-     * Object constractor
-     *
-     * @param string $data
-     */
-    public function __construct($data)
-    {
-        $this->_data = $data;
-    }
-
-    /**
-     * Reads $length number of bytes at the current position in the
-     * file and advances the file pointer.
-     *
-     * @param integer $length
-     * @return string
-     */
-    protected function _fread($length = 1)
-    {
-        $returnValue = substr($this->_data, $this->_position, $length);
-        $this->_position += $length;
-        return $returnValue;
-    }
-
-
-    /**
-     * Sets the file position indicator and advances the file pointer.
-     * The new position, measured in bytes from the beginning of the file,
-     * is obtained by adding offset to the position specified by whence,
-     * whose values are defined as follows:
-     * SEEK_SET - Set position equal to offset bytes.
-     * SEEK_CUR - Set position to current location plus offset.
-     * SEEK_END - Set position to end-of-file plus offset. (To move to
-     * a position before the end-of-file, you need to pass a negative value
-     * in offset.)
-     * Upon success, returns 0; otherwise, returns -1
-     *
-     * @param integer $offset
-     * @param integer $whence
-     * @return integer
-     */
-    public function seek($offset, $whence=SEEK_SET)
-    {
-        switch ($whence) {
-            case SEEK_SET:
-                $this->_position = $offset;
-                break;
-
-            case SEEK_CUR:
-                $this->_position += $offset;
-                break;
-
-            case SEEK_END:
-                $this->_position = strlen($this->_data);
-                $this->_position += $offset;
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    /**
-     * Get file position.
-     *
-     * @return integer
-     */
-    public function tell()
-    {
-        return $this->_position;
-    }
-
-    /**
-     * Flush output.
-     *
-     * Returns true on success or false on failure.
-     *
-     * @return boolean
-     */
-    public function flush()
-    {
-        // Do nothing
-
-        return true;
-    }
-
-    /**
-     * Writes $length number of bytes (all, if $length===null) to the end
-     * of the file.
-     *
-     * @param string $data
-     * @param integer $length
-     */
-    protected function _fwrite($data, $length=null)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        if ($length !== null) {
-            $this->_data .= substr($data, 0, $length);
-        } else {
-            $this->_data .= $data;
-        }
-
-        $this->_position = strlen($this->_data);
-    }
-
-    /**
-     * Lock file
-     *
-     * Lock type may be a LOCK_SH (shared lock) or a LOCK_EX (exclusive lock)
-     *
-     * @param integer $lockType
-     * @return boolean
-     */
-    public function lock($lockType, $nonBlockinLock = false)
-    {
-        // Memory files can't be shared
-        // do nothing
-
-        return true;
-    }
-
-    /**
-     * Unlock file
-     */
-    public function unlock()
-    {
-        // Memory files can't be shared
-        // do nothing
-    }
-
-    /**
-     * Reads a byte from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readByte()
-    {
-        return ord($this->_data[$this->_position++]);
-    }
-
-    /**
-     * Writes a byte to the end of the file.
-     *
-     * @param integer $byte
-     */
-    public function writeByte($byte)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        $this->_data .= chr($byte);
-        $this->_position = strlen($this->_data);
-
-        return 1;
-    }
-
-    /**
-     * Read num bytes from the current position in the file
-     * and advances the file pointer.
-     *
-     * @param integer $num
-     * @return string
-     */
-    public function readBytes($num)
-    {
-        $returnValue = substr($this->_data, $this->_position, $num);
-        $this->_position += $num;
-
-        return $returnValue;
-    }
-
-    /**
-     * Writes num bytes of data (all, if $num===null) to the end
-     * of the string.
-     *
-     * @param string $data
-     * @param integer $num
-     */
-    public function writeBytes($data, $num=null)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        if ($num !== null) {
-            $this->_data .= substr($data, 0, $num);
-        } else {
-            $this->_data .= $data;
-        }
-
-        $this->_position = strlen($this->_data);
-    }
-
-
-    /**
-     * Reads an integer from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readInt()
-    {
-        $str = substr($this->_data, $this->_position, 4);
-        $this->_position += 4;
-
-        return  ord($str[0]) << 24 |
-                ord($str[1]) << 16 |
-                ord($str[2]) << 8  |
-                ord($str[3]);
-    }
-
-
-    /**
-     * Writes an integer to the end of file.
-     *
-     * @param integer $value
-     */
-    public function writeInt($value)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        settype($value, 'integer');
-        $this->_data .= chr($value>>24 & 0xFF) .
-                        chr($value>>16 & 0xFF) .
-                        chr($value>>8  & 0xFF) .
-                        chr($value     & 0xFF);
-
-        $this->_position = strlen($this->_data);
-    }
-
-
-    /**
-     * Returns a long integer from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return integer
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function readLong()
-    {
-        /**
-         * Check, that we work in 64-bit mode.
-         * fseek() uses long for offset. Thus, largest index segment file size in 32bit mode is 2Gb
-         */
-        if (PHP_INT_SIZE > 4) {
-            $str = substr($this->_data, $this->_position, 8);
-            $this->_position += 8;
-
-            return  ord($str[0]) << 56  |
-                    ord($str[1]) << 48  |
-                    ord($str[2]) << 40  |
-                    ord($str[3]) << 32  |
-                    ord($str[4]) << 24  |
-                    ord($str[5]) << 16  |
-                    ord($str[6]) << 8   |
-                    ord($str[7]);
-        } else {
-            return $this->readLong32Bit();
-        }
-    }
-
-    /**
-     * Writes long integer to the end of file
-     *
-     * @param integer $value
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeLong($value)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        /**
-         * Check, that we work in 64-bit mode.
-         * fseek() and ftell() use long for offset. Thus, largest index segment file size in 32bit mode is 2Gb
-         */
-        if (PHP_INT_SIZE > 4) {
-            settype($value, 'integer');
-            $this->_data .= chr($value>>56 & 0xFF) .
-                            chr($value>>48 & 0xFF) .
-                            chr($value>>40 & 0xFF) .
-                            chr($value>>32 & 0xFF) .
-                            chr($value>>24 & 0xFF) .
-                            chr($value>>16 & 0xFF) .
-                            chr($value>>8  & 0xFF) .
-                            chr($value     & 0xFF);
-        } else {
-            $this->writeLong32Bit($value);
-        }
-
-        $this->_position = strlen($this->_data);
-    }
-
-
-    /**
-     * Returns a long integer from the current position in the file,
-     * advances the file pointer and return it as float (for 32-bit platforms).
-     *
-     * @return integer|float
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function readLong32Bit()
-    {
-        $wordHigh = $this->readInt();
-        $wordLow  = $this->readInt();
-
-        if ($wordHigh & (int)0x80000000) {
-            // It's a negative value since the highest bit is set
-            if ($wordHigh == (int)0xFFFFFFFF  &&  ($wordLow & (int)0x80000000)) {
-                return $wordLow;
-            } else {
-                require_once 'Zend/Search/Lucene/Exception.php';
-                throw new Zend_Search_Lucene_Exception('Long integers lower than -2147483648 (0x80000000) are not supported on 32-bit platforms.');
-            }
-
-        }
-
-        if ($wordLow < 0) {
-            // Value is large than 0x7FFF FFFF. Represent low word as float.
-            $wordLow &= 0x7FFFFFFF;
-            $wordLow += (float)0x80000000;
-        }
-
-        if ($wordHigh == 0) {
-            // Return value as integer if possible
-            return $wordLow;
-        }
-
-        return $wordHigh*(float)0x100000000/* 0x00000001 00000000 */ + $wordLow;
-    }
-
-
-    /**
-     * Writes long integer to the end of file (32-bit platforms implementation)
-     *
-     * @param integer|float $value
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeLong32Bit($value)
-    {
-        if ($value < (int)0x80000000) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Long integers lower than -2147483648 (0x80000000) are not supported on 32-bit platforms.');
-        }
-
-        if ($value < 0) {
-            $wordHigh = (int)0xFFFFFFFF;
-            $wordLow  = (int)$value;
-        } else {
-            $wordHigh = (int)($value/(float)0x100000000/* 0x00000001 00000000 */);
-            $wordLow  = $value - $wordHigh*(float)0x100000000/* 0x00000001 00000000 */;
-
-            if ($wordLow > 0x7FFFFFFF) {
-                // Highest bit of low word is set. Translate it to the corresponding negative integer value
-                $wordLow -= 0x80000000;
-                $wordLow |= 0x80000000;
-            }
-        }
-
-        $this->writeInt($wordHigh);
-        $this->writeInt($wordLow);
-    }
-
-    /**
-     * Returns a variable-length integer from the current
-     * position in the file and advances the file pointer.
-     *
-     * @return integer
-     */
-    public function readVInt()
-    {
-        $nextByte = ord($this->_data[$this->_position++]);
-        $val = $nextByte & 0x7F;
-
-        for ($shift=7; ($nextByte & 0x80) != 0; $shift += 7) {
-            $nextByte = ord($this->_data[$this->_position++]);
-            $val |= ($nextByte & 0x7F) << $shift;
-        }
-        return $val;
-    }
-
-    /**
-     * Writes a variable-length integer to the end of file.
-     *
-     * @param integer $value
-     */
-    public function writeVInt($value)
-    {
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        settype($value, 'integer');
-        while ($value > 0x7F) {
-            $this->_data .= chr( ($value & 0x7F)|0x80 );
-            $value >>= 7;
-        }
-        $this->_data .= chr($value);
-
-        $this->_position = strlen($this->_data);
-    }
-
-
-    /**
-     * Reads a string from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return string
-     */
-    public function readString()
-    {
-        $strlen = $this->readVInt();
-        if ($strlen == 0) {
-            return '';
-        } else {
-            /**
-             * This implementation supports only Basic Multilingual Plane
-             * (BMP) characters (from 0x0000 to 0xFFFF) and doesn't support
-             * "supplementary characters" (characters whose code points are
-             * greater than 0xFFFF)
-             * Java 2 represents these characters as a pair of char (16-bit)
-             * values, the first from the high-surrogates range (0xD800-0xDBFF),
-             * the second from the low-surrogates range (0xDC00-0xDFFF). Then
-             * they are encoded as usual UTF-8 characters in six bytes.
-             * Standard UTF-8 representation uses four bytes for supplementary
-             * characters.
-             */
-
-            $str_val = substr($this->_data, $this->_position, $strlen);
-            $this->_position += $strlen;
-
-            for ($count = 0; $count < $strlen; $count++ ) {
-                if (( ord($str_val[$count]) & 0xC0 ) == 0xC0) {
-                    $addBytes = 1;
-                    if (ord($str_val[$count]) & 0x20 ) {
-                        $addBytes++;
-
-                        // Never used. Java2 doesn't encode strings in four bytes
-                        if (ord($str_val[$count]) & 0x10 ) {
-                            $addBytes++;
-                        }
-                    }
-                    $str_val .= substr($this->_data, $this->_position, $addBytes);
-                    $this->_position += $addBytes;
-                    $strlen          += $addBytes;
-
-                    // Check for null character. Java2 encodes null character
-                    // in two bytes.
-                    if (ord($str_val[$count])   == 0xC0 &&
-                        ord($str_val[$count+1]) == 0x80   ) {
-                        $str_val[$count] = 0;
-                        $str_val = substr($str_val,0,$count+1)
-                                 . substr($str_val,$count+2);
-                    }
-                    $count += $addBytes;
-                }
-            }
-
-            return $str_val;
-        }
-    }
-
-    /**
-     * Writes a string to the end of file.
-     *
-     * @param string $str
-     * @throws Zend_Search_Lucene_Exception
-     */
-    public function writeString($str)
-    {
-        /**
-         * This implementation supports only Basic Multilingual Plane
-         * (BMP) characters (from 0x0000 to 0xFFFF) and doesn't support
-         * "supplementary characters" (characters whose code points are
-         * greater than 0xFFFF)
-         * Java 2 represents these characters as a pair of char (16-bit)
-         * values, the first from the high-surrogates range (0xD800-0xDBFF),
-         * the second from the low-surrogates range (0xDC00-0xDFFF). Then
-         * they are encoded as usual UTF-8 characters in six bytes.
-         * Standard UTF-8 representation uses four bytes for supplementary
-         * characters.
-         */
-
-        // We do not need to check if file position points to the end of "file".
-        // Only append operation is supported now
-
-        // convert input to a string before iterating string characters
-        settype($str, 'string');
-
-        $chars = $strlen = strlen($str);
-        $containNullChars = false;
-
-        for ($count = 0; $count < $strlen; $count++ ) {
-            /**
-             * String is already in Java 2 representation.
-             * We should only calculate actual string length and replace
-             * \x00 by \xC0\x80
-             */
-            if ((ord($str[$count]) & 0xC0) == 0xC0) {
-                $addBytes = 1;
-                if (ord($str[$count]) & 0x20 ) {
-                    $addBytes++;
-
-                    // Never used. Java2 doesn't encode strings in four bytes
-                    // and we dont't support non-BMP characters
-                    if (ord($str[$count]) & 0x10 ) {
-                        $addBytes++;
-                    }
-                }
-                $chars -= $addBytes;
-
-                if (ord($str[$count]) == 0 ) {
-                    $containNullChars = true;
-                }
-                $count += $addBytes;
-            }
-        }
-
-        if ($chars < 0) {
-            require_once 'Zend/Search/Lucene/Exception.php';
-            throw new Zend_Search_Lucene_Exception('Invalid UTF-8 string');
-        }
-
-        $this->writeVInt($chars);
-        if ($containNullChars) {
-            $this->_data .= str_replace($str, "\x00", "\xC0\x80");
-
-        } else {
-            $this->_data .= $str;
-        }
-
-        $this->_position = strlen($this->_data);
-    }
-
-
-    /**
-     * Reads binary data from the current position in the file
-     * and advances the file pointer.
-     *
-     * @return string
-     */
-    public function readBinary()
-    {
-        $length = $this->readVInt();
-        $returnValue = substr($this->_data, $this->_position, $length);
-        $this->_position += $length;
-        return $returnValue;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php b/airtime_mvc/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
deleted file mode 100644
index 9cc29d210..000000000
--- a/airtime_mvc/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TermStreamsPriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Search_Lucene_Index_TermsStream_Interface */
-require_once 'Zend/Search/Lucene/Index/TermsStream/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Search_Lucene
- * @subpackage Index
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Search_Lucene_TermStreamsPriorityQueue implements Zend_Search_Lucene_Index_TermsStream_Interface
-{
-    /**
-     * Array of term streams (Zend_Search_Lucene_Index_TermsStream_Interface objects)
-     *
-     * @var array
-     */
-    protected $_termStreams;
-
-    /**
-     * Terms stream queue
-     *
-     * @var Zend_Search_Lucene_Index_TermsPriorityQueue
-     */
-    protected $_termsStreamQueue = null;
-
-    /**
-     * Last Term in a terms stream
-     *
-     * @var Zend_Search_Lucene_Index_Term
-     */
-    protected $_lastTerm = null;
-
-
-    /**
-     * Object constructor
-     *
-     * @param array $termStreams  array of term streams (Zend_Search_Lucene_Index_TermsStream_Interface objects)
-     */
-    public function __construct(array $termStreams)
-    {
-        $this->_termStreams = $termStreams;
-
-        $this->resetTermsStream();
-    }
-
-    /**
-     * Reset terms stream.
-     */
-    public function resetTermsStream()
-    {
-        /** Zend_Search_Lucene_Index_TermsPriorityQueue */
-        require_once 'Zend/Search/Lucene/Index/TermsPriorityQueue.php';
-
-        $this->_termsStreamQueue = new Zend_Search_Lucene_Index_TermsPriorityQueue();
-
-        foreach ($this->_termStreams as $termStream) {
-            $termStream->resetTermsStream();
-
-            // Skip "empty" containers
-            if ($termStream->currentTerm() !== null) {
-                $this->_termsStreamQueue->put($termStream);
-            }
-        }
-
-        $this->nextTerm();
-    }
-
-    /**
-     * Skip terms stream up to specified term preffix.
-     *
-     * Prefix contains fully specified field info and portion of searched term
-     *
-     * @param Zend_Search_Lucene_Index_Term $prefix
-     */
-    public function skipTo(Zend_Search_Lucene_Index_Term $prefix)
-    {
-        $termStreams = array();
-
-        while (($termStream = $this->_termsStreamQueue->pop()) !== null) {
-            $termStreams[] = $termStream;
-        }
-
-        foreach ($termStreams as $termStream) {
-            $termStream->skipTo($prefix);
-
-            if ($termStream->currentTerm() !== null) {
-                $this->_termsStreamQueue->put($termStream);
-            }
-        }
-
-        $this->nextTerm();
-    }
-
-    /**
-     * Scans term streams and returns next term
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function nextTerm()
-    {
-        while (($termStream = $this->_termsStreamQueue->pop()) !== null) {
-            if ($this->_termsStreamQueue->top() === null ||
-                $this->_termsStreamQueue->top()->currentTerm()->key() !=
-                            $termStream->currentTerm()->key()) {
-                // We got new term
-                $this->_lastTerm = $termStream->currentTerm();
-
-                if ($termStream->nextTerm() !== null) {
-                    // Put segment back into the priority queue
-                    $this->_termsStreamQueue->put($termStream);
-                }
-
-                return $this->_lastTerm;
-            }
-
-            if ($termStream->nextTerm() !== null) {
-                // Put segment back into the priority queue
-                $this->_termsStreamQueue->put($termStream);
-            }
-        }
-
-        // End of stream
-        $this->_lastTerm = null;
-
-        return null;
-    }
-
-    /**
-     * Returns term in current position
-     *
-     * @return Zend_Search_Lucene_Index_Term|null
-     */
-    public function currentTerm()
-    {
-        return $this->_lastTerm;
-    }
-
-    /**
-     * Close terms stream
-     *
-     * Should be used for resources clean up if stream is not read up to the end
-     */
-    public function closeTermsStream()
-    {
-        while (($termStream = $this->_termsStreamQueue->pop()) !== null) {
-            $termStream->closeTermsStream();
-        }
-
-        $this->_termsStreamQueue = null;
-        $this->_lastTerm         = null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer.php b/airtime_mvc/library/Zend/Serializer.php
deleted file mode 100644
index 93bffcf9a..000000000
--- a/airtime_mvc/library/Zend/Serializer.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Serializer.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Loader_PluginLoader */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer
-{
-    /**
-     * Plugin loader to load adapter.
-     *
-     * @var null|Zend_Loader_PluginLoader
-     */
-    private static $_adapterLoader = null;
-
-    /**
-     * The default adapter.
-     *
-     * @var string|Zend_Serializer_AdapterInterface
-     */
-    protected static $_defaultAdapter = 'PhpSerialize';
-
-    /**
-     * Create a serializer adapter instance.
-     *
-     * @param string|Zend_Serializer_Adapter_AdapterInterface $adapterName Name of the adapter class
-     * @param array |Zend_Config $opts Serializer options
-     * @return Zend_Serializer_Adapter_AdapterInterface
-     */
-    public static function factory($adapterName, $opts = array()) 
-    {
-        if ($adapterName instanceof Zend_Serializer_Adapter_AdapterInterface) {
-            return $adapterName; // $adapterName is already an adapter object
-        }
-
-        $adapterLoader = self::getAdapterLoader();
-        try {
-            $adapterClass = $adapterLoader->load($adapterName);
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Can\'t load serializer adapter "'.$adapterName.'"', 0, $e);
-        }
-
-        // ZF-8842:
-        // check that the loaded class implements Zend_Serializer_Adapter_AdapterInterface without execute code
-        if (!in_array('Zend_Serializer_Adapter_AdapterInterface', class_implements($adapterClass))) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('The serializer adapter class "'.$adapterClass.'" must implement Zend_Serializer_Adapter_AdapterInterface');
-        }
-
-        return new $adapterClass($opts);
-    }
-
-    /**
-     * Get the adapter plugin loader.
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function getAdapterLoader() 
-    {
-        if (self::$_adapterLoader === null) {
-            self::$_adapterLoader = self::_getDefaultAdapterLoader();
-        }
-        return self::$_adapterLoader;
-    }
-
-    /**
-     * Change the adapter plugin load.
-     *
-     * @param  Zend_Loader_PluginLoader $pluginLoader
-     * @return void
-     */
-    public static function setAdapterLoader(Zend_Loader_PluginLoader $pluginLoader) 
-    {
-        self::$_adapterLoader = $pluginLoader;
-    }
-    
-    /**
-     * Resets the internal adapter plugin loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public static function resetAdapterLoader()
-    {
-        self::$_adapterLoader = self::_getDefaultAdapterLoader();
-        return self::$_adapterLoader;
-    }
-    
-    /**
-     * Returns a default adapter plugin loader
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    protected static function _getDefaultAdapterLoader()
-    {
-        $loader = new Zend_Loader_PluginLoader();
-        $loader->addPrefixPath('Zend_Serializer_Adapter', dirname(__FILE__).'/Serializer/Adapter');
-        return $loader;
-    }
-
-    /**
-     * Change the default adapter.
-     *
-     * @param string|Zend_Serializer_Adapter_AdapterInterface $adapter
-     * @param array|Zend_Config $options
-     */
-    public static function setDefaultAdapter($adapter, $options = array()) 
-    {
-        self::$_defaultAdapter = self::factory($adapter, $options);
-    }
-
-    /**
-     * Get the default adapter.
-     *
-     * @return Zend_Serializer_Adapter_AdapterInterface
-     */
-    public static function getDefaultAdapter() 
-    {
-        if (!self::$_defaultAdapter instanceof Zend_Serializer_Adapter_AdapterInterface) {
-            self::setDefaultAdapter(self::$_defaultAdapter);
-        }
-        return self::$_defaultAdapter;
-    }
-
-    /**
-     * Generates a storable representation of a value using the default adapter.
-     *
-     * @param mixed $value
-     * @param array $options
-     * @return string
-     * @throws Zend_Serializer_Exception
-     */
-    public static function serialize($value, array $options = array()) 
-    {
-        if (isset($options['adapter'])) {
-            $adapter = self::factory($options['adapter']);
-            unset($options['adapter']);
-        } else {
-            $adapter = self::getDefaultAdapter();
-        }
-
-        return $adapter->serialize($value, $options);
-    }
-
-    /**
-     * Creates a PHP value from a stored representation using the default adapter.
-     *
-     * @param string $serialized
-     * @param array $options
-     * @return mixed
-     * @throws Zend_Serializer_Exception
-     */
-    public static function unserialize($serialized, array $options = array()) 
-    {
-        if (isset($options['adapter'])) {
-            $adapter = self::factory($options['adapter']);
-            unset($options['adapter']);
-        } else {
-            $adapter = self::getDefaultAdapter();
-        }
-
-        return $adapter->unserialize($serialized, $options);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/AdapterAbstract.php b/airtime_mvc/library/Zend/Serializer/Adapter/AdapterAbstract.php
deleted file mode 100644
index 535b9e7d2..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/AdapterAbstract.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterAbstract.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterInterface */
-require_once 'Zend/Serializer/Adapter/AdapterInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Serializer_Adapter_AdapterAbstract implements Zend_Serializer_Adapter_AdapterInterface
-{
-    /**
-     * Serializer options
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * Constructor
-     *
-     * @param array|Zend_Config $opts Serializer options
-     */
-    public function __construct($opts = array()) 
-    {
-        $this->setOptions($opts);
-    }
-
-    /**
-     * Set serializer options
-     *
-     * @param  array|Zend_Config $opts Serializer options
-     * @return Zend_Serializer_Adapter_AdapterAbstract
-     */
-    public function setOptions($opts) 
-    {
-        if ($opts instanceof Zend_Config) {
-            $opts = $opts->toArray();
-        } else {
-            $opts = (array) $opts;
-        }
-
-        foreach ($opts as $k => $v) {
-            $this->setOption($k, $v);
-        }
-        return $this;
-    }
-
-    /**
-     * Set a serializer option
-     *
-     * @param  string $name Option name
-     * @param  mixed $value Option value
-     * @return Zend_Serializer_Adapter_AdapterAbstract
-     */
-    public function setOption($name, $value) 
-    {
-        $this->_options[(string) $name] = $value;
-        return $this;
-    }
-
-    /**
-     * Get serializer options
-     *
-     * @return array
-     */
-    public function getOptions() 
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Get a serializer option
-     *
-     * @param  string $name
-     * @return mixed
-     * @throws Zend_Serializer_Exception
-     */
-    public function getOption($name) 
-    {
-        $name = (string) $name;
-        if (!array_key_exists($name, $this->_options)) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Unknown option name "'.$name.'"');
-        }
-
-        return $this->_options[$name];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/AdapterInterface.php b/airtime_mvc/library/Zend/Serializer/Adapter/AdapterInterface.php
deleted file mode 100644
index 19d1d85b8..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/AdapterInterface.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterInterface.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Serializer_Adapter_AdapterInterface 
-{
-    /**
-     * Constructor
-     *
-     * @param  array|Zend_Config $opts Serializer options
-     * @return void
-     */
-    public function __construct($opts = array());
-
-    /**
-     * Set serializer options
-     *
-     * @param  array|Zend_Config $opts Serializer options
-     * @return Zend_Serializer_Adapter_AdapterInterface
-     */
-    public function setOptions($opts);
-
-    /**
-     * Set a serializer option
-     *
-     * @param  string $name Option name
-     * @param  mixed $value Option value
-     * @return Zend_Serializer_Adapter_AdapterInterface
-     */
-    public function setOption($name, $value);
-
-    /**
-     * Get serializer options
-     *
-     * @return array
-     */
-    public function getOptions();
-
-    /**
-     * Get a serializer option
-     *
-     * @param  string $name
-     * @return mixed
-     * @throws Zend_Serializer_Exception
-     */
-    public function getOption($name);
-
-    /**
-     * Generates a storable representation of a value.
-     *
-     * @param  mixed $value Data to serialize
-     * @param  array $options Serialize options
-     * @return string
-     * @throws Zend_Serializer_Exception
-     */
-    public function serialize($value, array $options = array());
-
-    /**
-     * Creates a PHP value from a stored representation.
-     *
-     * @param  string $serialized Serialized string
-     * @param  array $options Unserialize options
-     * @return mixed
-     * @throws Zend_Serializer_Exception
-     */
-    public function unserialize($serialized, array $options = array());
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/Amf0.php b/airtime_mvc/library/Zend/Serializer/Adapter/Amf0.php
deleted file mode 100644
index c2370b5ed..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/Amf0.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Amf0.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/** @see Zend_Amf_Parse_OutputStream */
-require_once 'Zend/Amf/Parse/OutputStream.php';
-
-/** @see Zend_Amf_Parse_Amf0_Serializer */
-require_once 'Zend/Amf/Parse/Amf0/Serializer.php';
-
-/** @see Zend_Amf_Parse_InputStream */
-require_once 'Zend/Amf/Parse/InputStream.php';
-
-/** @see Zend_Amf_Parse_Amf0_Deserializer */
-require_once 'Zend/Amf/Parse/Amf0/Deserializer.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_Amf0 extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * Serialize a PHP value to AMF0 format
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception
-     */
-    public function serialize($value, array $opts = array())
-    {
-        try  {
-            $stream     = new Zend_Amf_Parse_OutputStream();
-            $serializer = new Zend_Amf_Parse_Amf0_Serializer($stream);
-            $serializer->writeTypeMarker($value);
-            return $stream->getStream();
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e);
-        }
-    }
-
-    /**
-     * Unserialize an AMF0 value to PHP
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return void
-     * @throws Zend_Serializer_Exception
-     */
-    public function unserialize($value, array $opts = array())
-    {
-        try {
-            $stream       = new Zend_Amf_Parse_InputStream($value);
-            $deserializer = new Zend_Amf_Parse_Amf0_Deserializer($stream);
-            return $deserializer->readTypeMarker();
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e);
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/Amf3.php b/airtime_mvc/library/Zend/Serializer/Adapter/Amf3.php
deleted file mode 100644
index f62a0f0ea..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/Amf3.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Amf3.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/** @see Zend_Amf_Parse_OutputStream */
-require_once 'Zend/Amf/Parse/OutputStream.php';
-
-/** @see Zend_Amf_Parse_Amf3_Serializer */
-require_once 'Zend/Amf/Parse/Amf3/Serializer.php';
-
-/** @see Zend_Amf_Parse_InputStream */
-require_once 'Zend/Amf/Parse/InputStream.php';
-
-/** @see Zend_Amf_Parse_Amf3_Deserializer */
-require_once 'Zend/Amf/Parse/Amf3/Deserializer.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_Amf3 extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * Serialize a PHP value to AMF3 format
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception
-     */
-    public function serialize($value, array $opts = array())
-    {
-        try  {
-            $stream     = new Zend_Amf_Parse_OutputStream();
-            $serializer = new Zend_Amf_Parse_Amf3_Serializer($stream);
-            $serializer->writeTypeMarker($value);
-            return $stream->getStream();
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e);
-        }
-    }
-
-    /**
-     * Deserialize an AMF3 value to PHP
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception
-     */
-    public function unserialize($value, array $opts = array())
-    {
-        try {
-            $stream       = new Zend_Amf_Parse_InputStream($value);
-            $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($stream);
-            return $deserializer->readTypeMarker();
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/Igbinary.php b/airtime_mvc/library/Zend/Serializer/Adapter/Igbinary.php
deleted file mode 100644
index 5f9587ea8..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/Igbinary.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Igbinary.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_Igbinary extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * @var string Serialized null value
-     */
-    private static $_serializedNull = null;
-
-    /**
-     * Constructor
-     * 
-     * @param  array|Zend_Config $opts 
-     * @return void
-     * @throws Zend_Serializer_Exception If igbinary extension is not present
-     */
-    public function __construct($opts = array()) 
-    {
-        if (!extension_loaded('igbinary')) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('PHP extension "igbinary" is required for this adapter');
-        }
-
-        parent::__construct($opts);
-
-        if (self::$_serializedNull === null) {
-            self::$_serializedNull = igbinary_serialize(null);
-        }
-    }
-
-    /**
-     * Serialize PHP value to igbinary
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception on igbinary error
-     */
-    public function serialize($value, array $opts = array())
-    {
-        $ret = igbinary_serialize($value);
-        if ($ret === false) {
-            $lastErr = error_get_last();
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($lastErr['message']);
-        }
-        return $ret;
-    }
-
-    /**
-     * Deserialize igbinary string to PHP value
-     * 
-     * @param  string|binary $serialized 
-     * @param  array $opts 
-     * @return mixed
-     * @throws Zend_Serializer_Exception on igbinary error
-     */
-    public function unserialize($serialized, array $opts = array())
-    {
-        $ret = igbinary_unserialize($serialized);
-        if ($ret === null && $serialized !== self::$_serializedNull) {
-            $lastErr = error_get_last();
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($lastErr['message']);
-        }
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/Json.php b/airtime_mvc/library/Zend/Serializer/Adapter/Json.php
deleted file mode 100644
index a2a2efc2b..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/Json.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Json.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/** @see Zend_Json */
-require_once 'Zend/Json.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * @var array Default options
-     */
-    protected $_options = array(
-        'cycleCheck'           => false,
-        'enableJsonExprFinder' => false,
-        'objectDecodeType'     => Zend_Json::TYPE_ARRAY,
-    );
-
-    /**
-     * Serialize PHP value to JSON
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception on JSON encoding exception
-     */
-    public function serialize($value, array $opts = array())
-    {
-        $opts = $opts + $this->_options;
-
-        try  {
-            return Zend_Json::encode($value, $opts['cycleCheck'], $opts);
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Serialization failed', 0, $e);
-        }
-    }
-
-    /**
-     * Deserialize JSON to PHP value
-     * 
-     * @param  string $json 
-     * @param  array $opts 
-     * @return mixed
-     */
-    public function unserialize($json, array $opts = array())
-    {
-        $opts = $opts + $this->_options;
-
-        try {
-            $ret = Zend_Json::decode($json, $opts['objectDecodeType']);
-        } catch (Exception $e) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e);
-        }
-
-        // json_decode returns null for invalid JSON
-        if ($ret === null && $json !== 'null') {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Invalid json data');
-        }
-
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/PhpCode.php b/airtime_mvc/library/Zend/Serializer/Adapter/PhpCode.php
deleted file mode 100644
index d041cf196..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/PhpCode.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhpCode.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_PhpCode extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * Serialize PHP using var_export
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     */
-    public function serialize($value, array $opts = array())
-    {
-        return var_export($value, true);
-    }
-
-    /**
-     * Deserialize PHP string
-     *
-     * Warning: this uses eval(), and should likely be avoided.
-     * 
-     * @param  string $code 
-     * @param  array $opts 
-     * @return mixed
-     * @throws Zend_Serializer_Exception on eval error
-     */
-    public function unserialize($code, array $opts = array())
-    {
-        $eval = @eval('$ret=' . $code . ';');
-        if ($eval === false) {
-                $lastErr = error_get_last();
-                require_once 'Zend/Serializer/Exception.php';
-                throw new Zend_Serializer_Exception('eval failed: ' . $lastErr['message']);
-        }
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/PhpSerialize.php b/airtime_mvc/library/Zend/Serializer/Adapter/PhpSerialize.php
deleted file mode 100644
index e5a761df7..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/PhpSerialize.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PhpSerialize.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     *  @var null|string Serialized boolean false value
-     */
-    private static $_serializedFalse = null;
-
-    /**
-     * Constructor
-     * 
-     * @param  array|Zend_Config $opts 
-     * @return void
-     */
-    public function __construct($opts = array()) 
-    {
-        parent::__construct($opts);
-
-        if (self::$_serializedFalse === null) {
-            self::$_serializedFalse = serialize(false);
-        }
-    }
-
-    /**
-     * Serialize using serialize()
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception On serialize error
-     */
-    public function serialize($value, array $opts = array())
-    {
-        $ret = serialize($value);
-        if ($ret === false) {
-            $lastErr = error_get_last();
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($lastErr['message']);
-        }
-        return $ret;
-    }
-
-    /**
-     * Unserialize
-     * 
-     * @todo   Allow integration with unserialize_callback_func
-     * @param  string $serialized 
-     * @param  array $opts 
-     * @return mixed
-     * @throws Zend_Serializer_Exception on unserialize error
-     */
-    public function unserialize($serialized, array $opts = array())
-    {
-        // TODO: @see php.ini directive "unserialize_callback_func"
-        $ret = @unserialize($serialized);
-        if ($ret === false && $serialized !== self::$_serializedFalse) {
-            $lastErr = error_get_last();
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($lastErr['message']);
-        }
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/PythonPickle.php b/airtime_mvc/library/Zend/Serializer/Adapter/PythonPickle.php
deleted file mode 100644
index ed576d996..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/PythonPickle.php
+++ /dev/null
@@ -1,1494 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PythonPickle.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/**
- * @link       http://www.python.org
- * @see        Phython3.1/Lib/pickle.py
- * @see        Phython3.1/Modules/_pickle.c
- * @link       http://pickle-js.googlecode.com
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /* Pickle opcodes. See pickletools.py for extensive docs.  The listing
-       here is in kind-of alphabetical order of 1-character pickle code.
-       pickletools groups them by purpose. */
-    const OP_MARK            = '(';     // push special markobject on stack
-    const OP_STOP            = '.';     // every pickle ends with STOP
-    const OP_POP             = '0';     // discard topmost stack item
-    const OP_POP_MARK        = '1';     // discard stack top through topmost markobject
-    const OP_DUP             = '2';     // duplicate top stack item
-    const OP_FLOAT           = 'F';     // push float object; decimal string argument
-    const OP_INT             = 'I';     // push integer or bool; decimal string argument
-    const OP_BININT          = 'J';     // push four-byte signed int
-    const OP_BININT1         = 'K';     // push 1-byte unsigned int
-    const OP_LONG            = 'L';     // push long; decimal string argument
-    const OP_BININT2         = 'M';     // push 2-byte unsigned int
-    const OP_NONE            = 'N';     // push None
-    const OP_PERSID          = 'P';     // push persistent object; id is taken from string arg
-    const OP_BINPERSID       = 'Q';     //  "       "         "  ;  "  "   "     "  stack
-    const OP_REDUCE          = 'R';     // apply callable to argtuple, both on stack
-    const OP_STRING          = 'S';     // push string; NL-terminated string argument
-    const OP_BINSTRING       = 'T';     // push string; counted binary string argument
-    const OP_SHORT_BINSTRING = 'U';     //  "     "   ;    "      "       "      " < 256 bytes
-    const OP_UNICODE         = 'V';     // push Unicode string; raw-unicode-escaped'd argument
-    const OP_BINUNICODE      = 'X';     //   "     "       "  ; counted UTF-8 string argument
-    const OP_APPEND          = 'a';     // append stack top to list below it
-    const OP_BUILD           = 'b';     // call __setstate__ or __dict__.update()
-    const OP_GLOBAL          = 'c';     // push self.find_class(modname, name); 2 string args
-    const OP_DICT            = 'd';     // build a dict from stack items
-    const OP_EMPTY_DICT      = '}';     // push empty dict
-    const OP_APPENDS         = 'e';     // extend list on stack by topmost stack slice
-    const OP_GET             = 'g';     // push item from memo on stack; index is string arg
-    const OP_BINGET          = 'h';     //   "    "    "    "   "   "  ;   "    " 1-byte arg
-    const OP_INST            = 'i';     // build & push class instance
-    const OP_LONG_BINGET     = 'j';     // push item from memo on stack; index is 4-byte arg
-    const OP_LIST            = 'l';     // build list from topmost stack items
-    const OP_EMPTY_LIST      = ']';     // push empty list
-    const OP_OBJ             = 'o';     // build & push class instance
-    const OP_PUT             = 'p';     // store stack top in memo; index is string arg
-    const OP_BINPUT          = 'q';     //   "     "    "   "   " ;   "    " 1-byte arg
-    const OP_LONG_BINPUT     = 'r';     //   "     "    "   "   " ;   "    " 4-byte arg
-    const OP_SETITEM         = 's';     // add key+value pair to dict
-    const OP_TUPLE           = 't';     // build tuple from topmost stack items
-    const OP_EMPTY_TUPLE     = ')';     // push empty tuple
-    const OP_SETITEMS        = 'u';     // modify dict by adding topmost key+value pairs
-    const OP_BINFLOAT        = 'G';     // push float; arg is 8-byte float encoding
-
-    /* Protocol 2 */
-    const OP_PROTO           = "\x80";  // identify pickle protocol
-    const OP_NEWOBJ          = "\x81";  // build object by applying cls.__new__ to argtuple
-    const OP_EXT1            = "\x82";  // push object from extension registry; 1-byte index
-    const OP_EXT2            = "\x83";  // ditto, but 2-byte index
-    const OP_EXT4            = "\x84";  // ditto, but 4-byte index
-    const OP_TUPLE1          = "\x85";  // build 1-tuple from stack top
-    const OP_TUPLE2          = "\x86";  // build 2-tuple from two topmost stack items
-    const OP_TUPLE3          = "\x87";  // build 3-tuple from three topmost stack items
-    const OP_NEWTRUE         = "\x88";  // push True
-    const OP_NEWFALSE        = "\x89";  // push False
-    const OP_LONG1           = "\x8a";  // push long from < 256 bytes
-    const OP_LONG4           = "\x8b";  // push really big long
-
-    /* Protocol 3 (Python 3.x) */
-    const OP_BINBYTES        = 'B';     // push bytes; counted binary string argument
-    const OP_SHORT_BINBYTES  = 'C';     //  "     "   ;    "      "       "      " < 256 bytes
-
-    /**
-     * @var bool Whether or not this is a PHP 6 binary
-     */
-    protected static $_isPhp6 = null;
-
-    /**
-     * @var bool Whether or not the system is little-endian
-     */
-    protected static $_isLittleEndian = null;
-
-    /**
-     * @var array Strings representing quotes
-     */
-    protected static $_quoteString = array(
-        '\\' => '\\\\',
-        "\x00" => '\\x00', "\x01" => '\\x01', "\x02" => '\\x02', "\x03" => '\\x03',
-        "\x04" => '\\x04', "\x05" => '\\x05', "\x06" => '\\x06', "\x07" => '\\x07',
-        "\x08" => '\\x08', "\x09" => '\\t',   "\x0a" => '\\n',   "\x0b" => '\\x0b',
-        "\x0c" => '\\x0c', "\x0d" => '\\r',   "\x0e" => '\\x0e', "\x0f" => '\\x0f',
-        "\x10" => '\\x10', "\x11" => '\\x11', "\x12" => '\\x12', "\x13" => '\\x13',
-        "\x14" => '\\x14', "\x15" => '\\x15', "\x16" => '\\x16', "\x17" => '\\x17',
-        "\x18" => '\\x18', "\x19" => '\\x19', "\x1a" => '\\x1a', "\x1b" => '\\x1b',
-        "\x1c" => '\\x1c', "\x1d" => '\\x1d', "\x1e" => '\\x1e', "\x1f" => '\\x1f',
-        "\xff" => '\\xff'
-    );
-
-    /**
-     * @var array Default options
-     */
-    protected $_options = array(
-        'protocol'           => 0,
-    );
-
-    // process vars
-    protected $_protocol           = 0;
-    protected $_binary             = false;
-    protected $_memo               = array();
-    protected $_pickle             = '';
-    protected $_pickleLen          = 0;
-    protected $_pos                = 0;
-    protected $_stack              = array();
-    protected $_marker             = null;
-
-    /**
-     * Constructor
-     *
-     * @link Zend_Serializer_Adapter_AdapterAbstract::__construct()
-     */
-    public function __construct($opts=array())
-    {
-        parent::__construct($opts);
-
-        // init
-        if (self::$_isLittleEndian === null) {
-            self::$_isLittleEndian = (pack('l', 1) === "\x01\x00\x00\x00");
-        }
-        if (self::$_isPhp6 === null) {
-            self::$_isPhp6 = !version_compare(PHP_VERSION, '6.0.0', '<');
-        }
-
-        $this->_marker = new stdClass();
-    }
-
-    /**
-     * Set an option
-     *
-     * @link   Zend_Serializer_Adapter_AdapterAbstract::setOption()
-     * @param  string $name
-     * @param  mixed $value
-     * @return Zend_Serializer_Adapter_PythonPickle
-     */
-    public function setOption($name, $value)
-    {
-        switch ($name) {
-            case 'protocol':
-                $value = $this->_checkProtocolNumber($value);
-                break;
-        }
-
-        return parent::setOption($name, $value);
-    }
-
-    /**
-     * Check and normalize pickle protocol number
-     *
-     * @param  int $number
-     * @return int
-     * @throws Zend_Serializer_Exception
-     */
-    protected function _checkProtocolNumber($number)
-    {
-        $int = (int) $number;
-        if ($int < 0 || $int > 3) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Invalid or unknown protocol version "'.$number.'"');
-        }
-        return $int;
-    }
-
-    /* serialize */
-
-    /**
-     * Serialize PHP to PythonPickle format
-     *
-     * @param  mixed $value
-     * @param  array $opts
-     * @return string
-     */
-    public function serialize($value, array $opts = array())
-    {
-        $opts = $opts + $this->_options;
-
-        $this->_protocol = $this->_checkProtocolNumber($opts['protocol']);
-        $this->_binary   = $this->_protocol != 0;
-
-        // clear process vars before serializing
-        $this->_memo   = array();
-        $this->_pickle = '';
-
-        // write
-        if ($this->_protocol >= 2) {
-            $this->_writeProto($this->_protocol);
-        }
-        $this->_write($value);
-        $this->_writeStop();
-
-        // clear process vars after serializing
-        $this->_memo = array();
-        $pickle = $this->_pickle;
-        $this->_pickle = '';
-
-        return $pickle;
-    }
-
-    /**
-     * Write a value
-     *
-     * @param  mixed $value
-     * @return void
-     * @throws Zend_Serializer_Exception on invalid or unrecognized value type
-     */
-    protected function _write($value)
-    {
-        if ($value === null) {
-            $this->_writeNull();
-        } elseif ($value === true) {
-            $this->_writeTrue();
-        } elseif ($value === false) {
-            $this->_writeFalse();
-        } elseif (is_int($value)) {
-            $this->_writeInt($value);
-        } elseif (is_float($value)) {
-            $this->_writeFloat($value);
-        } elseif (is_string($value)) {
-            // TODO: write unicode / binary
-            $this->_writeString($value);
-        } elseif (is_array($value)) {
-            if ($this->_isArrayAssoc($value)) {
-                $this->_writeArrayDict($value);
-            } else {
-                $this->_writeArrayList($value);
-            }
-        } elseif (is_object($value)) {
-            $this->_writeObject($value);
-        } else {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception(
-                'PHP-Type "'.gettype($value).'" isn\'t serializable with '.get_class($this)
-            );
-        }
-    }
-
-    /**
-     * Write pickle protocol
-     *
-     * @param  int $protocol
-     * @return void
-     */
-    protected function _writeProto($protocol)
-    {
-        $this->_pickle .= self::OP_PROTO . $protocol;
-    }
-
-    /**
-     * Write a get
-     *
-     * @param  int $id Id of memo
-     * @return void
-     */
-    protected function _writeGet($id)
-    {
-        if ($this->_binary) {
-            if ($id <= 0xff) {
-                // BINGET + chr(i)
-                $this->_pickle .= self::OP_BINGET . chr($id);
-            } else {
-                // LONG_BINGET + pack("<i", i)
-                $idBin = pack('l', $id);
-                if (self::$_isLittleEndian === false) {
-                    $idBin = strrev($bin);
-                }
-                $this->_pickle .= self::OP_LONG_BINGET . $idBin;
-            }
-        } else {
-            $this->_pickle .= self::OP_GET . $id . "\r\n";
-        }
-    }
-
-    /**
-     * Write a put
-     *
-     * @param  int $id Id of memo
-     * @return void
-     */
-    protected function _writePut($id)
-    {
-        if ($this->_binary) {
-            if ($id <= 0xff) {
-                // BINPUT + chr(i)
-                $this->_pickle .= self::OP_BINPUT . chr($id);
-            } else {
-                // LONG_BINPUT + pack("<i", i)
-                $idBin = pack('l', $id);
-                if (self::$_isLittleEndian === false) {
-                    $idBin = strrev($bin);
-                }
-                $this->_pickle .= self::OP_LONG_BINPUT . $idBin;
-            }
-        } else {
-            $this->_pickle .= self::OP_PUT . $id . "\r\n";
-        }
-    }
-
-    /**
-     * Write a null as None
-     *
-     * @return void
-     */
-    protected function _writeNull()
-    {
-        $this->_pickle .= self::OP_NONE;
-    }
-
-    /**
-     * Write a boolean true
-     *
-     * @return void
-     */
-    protected function _writeTrue()
-    {
-        if ($this->_protocol >= 2) {
-            $this->_pickle .= self::OP_NEWTRUE;
-        } else {
-            $this->_pickle .= self::OP_INT . "01\r\n";
-        }
-    }
-
-    /**
-     * Write a boolean false
-     *
-     * @return void
-     */
-    protected function _writeFalse()
-    {
-        if ($this->_protocol >= 2) {
-            $this->_pickle .= self::OP_NEWFALSE;
-        } else {
-            $this->_pickle .= self::OP_INT . "00\r\n";
-        }
-    }
-
-    /**
-     * Write an integer value
-     *
-     * @param  int $value
-     * @return void
-     */
-    protected function _writeInt($value)
-    {
-        if ($this->_binary) {
-            if ($value >= 0) {
-                if ($value <= 0xff) {
-                    // self.write(BININT1 + chr(obj))
-                    $this->_pickle .= self::OP_BININT1 . chr($value);
-                } elseif ($value <= 0xffff) {
-                    // self.write("%c%c%c" % (BININT2, obj&0xff, obj>>8))
-                    $this->_pickle .= self::OP_BININT2 . pack('v', $value);
-                }
-                return;
-            }
-
-            // Next check for 4-byte signed ints:
-            $highBits = $value >> 31;  // note that Python shift sign-extends
-            if ($highBits == 0 || $highBits == -1) {
-                // All high bits are copies of bit 2**31, so the value
-                // fits in a 4-byte signed int.
-                // self.write(BININT + pack("<i", obj))
-                $bin = pack('l', $value);
-                if (self::$_isLittleEndian === false) {
-                    $bin = strrev($bin);
-                }
-                $this->_pickle .= self::OP_BININT . $bin;
-                return;
-            }
-        }
-
-        $this->_pickle .= self::OP_INT . $value . "\r\n";
-    }
-
-    /**
-     * Write a float value
-     *
-     * @param  float $value
-     * @return void
-     */
-    protected function _writeFloat($value)
-    {
-        if ($this->_binary) {
-            // self.write(BINFLOAT + pack('>d', obj))
-            $bin = pack('d', $value);
-            if (self::$_isLittleEndian === true) {
-                $bin = strrev($bin);
-            }
-            $this->_pickle .= self::OP_BINFLOAT . $bin;
-        } else {
-            $this->_pickle .= self::OP_FLOAT . $value . "\r\n";
-        }
-    }
-
-    /**
-     * Write a string value
-     *
-     * @param  string $value
-     * @return void
-     */
-    protected function _writeString($value)
-    {
-        if ( ($id=$this->_searchMomo($value)) !== false ) {
-            $this->_writeGet($id);
-            return;
-        }
-
-        if ($this->_binary) {
-            $n = strlen($value);
-            if ($n <= 0xff) {
-                // self.write(SHORT_BINSTRING + chr(n) + obj)
-                $this->_pickle .= self::OP_SHORT_BINSTRING . chr($n) . $value;
-            } else {
-                // self.write(BINSTRING + pack("<i", n) + obj)
-                $binLen = pack('l', $n);
-                if (self::$_isLittleEndian === false) {
-                    $binLen = strrev($binLen);
-                }
-                $this->_pickle .= self::OP_BINSTRING . $binLen . $value;
-            }
-        } else {
-            $this->_pickle .= self::OP_STRING . $this->_quoteString($value) . "\r\n";
-        }
-
-        $this->_momorize($value);
-    }
-
-    /**
-     * Write an associative array value as dictionary
-     *
-     * @param  array $value
-     * @return void
-     */
-    protected function _writeArrayDict(array $value)
-    {
-        if (($id=$this->_searchMomo($value)) !== false) {
-            $this->_writeGet($id);;
-            return;
-        }
-
-        $this->_pickle .= self::OP_MARK . self::OP_DICT;
-        $this->_momorize($value);
-
-        foreach ($value as $k => $v) {
-            $this->_pickle .= $this->_write($k)
-                            . $this->_write($v)
-                            . self::OP_SETITEM;
-        }
-    }
-
-    /**
-     * Write a simple array value as list
-     *
-     * @param  array $value
-     * @return void
-     */
-    protected function _writeArrayList(array $value)
-    {
-        if (($id = $this->_searchMomo($value)) !== false) {
-            $this->_writeGet($id);
-            return;
-        }
-
-        $this->_pickle .= self::OP_MARK . self::OP_LIST;
-        $this->_momorize($value);
-
-        foreach ($value as $k => $v) {
-            $this->_pickle .= $this->_write($v) . self::OP_APPEND;
-        }
-    }
-
-    /**
-     * Write an object as an dictionary
-     *
-     * @param  object $value
-     * @return void
-     */
-    protected function _writeObject($value)
-    {
-        // can't serialize php objects to python objects yet
-        $this->_writeArrayDict(get_object_vars($value));
-    }
-
-    /**
-     * Write stop
-     *
-     * @return void
-     */
-    protected function _writeStop()
-    {
-        $this->_pickle .= self::OP_STOP;
-    }
-
-    /* serialize helper */
-
-    /**
-     * Add a value to the memo and write the id
-     *
-     * @param mixed $value
-     * @return void
-     */
-    protected function _momorize($value)
-    {
-        $id = count($this->_memo);
-        $this->_memo[$id] = $value;
-        $this->_writePut($id);
-    }
-
-    /**
-     * Search a value in the meno and return  the id
-     *
-     * @param  mixed $value
-     * @return int|false The id or false
-     */
-    protected function _searchMomo($value)
-    {
-        return array_search($value, $this->_memo, true);
-    }
-
-    /**
-     * Is an array associative?
-     *
-     * @param  array $value
-     * @return boolean
-     */
-    protected function _isArrayAssoc(array $value)
-    {
-        return array_diff_key($value, array_keys(array_keys($value)));
-    }
-
-    /**
-     * Quote/Escape a string
-     *
-     * @param  string $str
-     * @return string quoted string
-     */
-    protected function _quoteString($str)
-    {
-        $quoteArr = self::$_quoteString;
-
-        if (($cntSingleQuote = substr_count($str, "'"))
-            && ($cntDoubleQuote = substr_count($str, '"'))
-            && ($cntSingleQuote < $cntDoubleQuote)
-        ) {
-            $quoteArr['"'] = '\\"';
-            $enclosure     = '"';
-        } else {
-            $quoteArr["'"] = "\\'";
-            $enclosure     = "'";
-        }
-
-        return $enclosure . strtr($str, $quoteArr) . $enclosure;
-    }
-
-    /* unserialize */
-
-    /**
-     * Unserialize from Python Pickle format to PHP
-     *
-     * @param  string $pickle
-     * @param  array $opts
-     * @return mixed
-     * @throws Zend_Serializer_Exception on invalid Pickle string
-     */
-    public function unserialize($pickle, array $opts = array())
-    {
-        // init process vars
-        $this->_pos       = 0;
-        $this->_pickle    = $pickle;
-        $this->_pickleLen = strlen($this->_pickle);
-        $this->_memo      = array();
-        $this->_stack     = array();
-
-        // read pickle string
-        while (($op=$this->_read(1)) !== self::OP_STOP) {
-            $this->_load($op);
-        }
-
-        if (!count($this->_stack)) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('No data found');
-        }
-
-        $ret = array_pop($this->_stack);
-
-        // clear process vars
-        $this->_pos       = 0;
-        $this->_pickle    = '';
-        $this->_pickleLen = 0;
-        $this->_memo      = array();
-        $this->_stack     = array();
-
-        return $ret;
-    }
-
-    /**
-     * Load a pickle opcode
-     *
-     * @param  string $op
-     * @return void
-     * @throws Zend_Serializer_Exception on invalid opcode
-     */
-    protected function _load($op)
-    {
-        switch ($op) {
-            case self::OP_PUT:
-                $this->_loadPut();
-                break;
-            case self::OP_BINPUT:
-                $this->_loadBinPut();
-                break;
-            case self::OP_LONG_BINPUT:
-                $this->_loadLongBinPut();
-                break;
-            case self::OP_GET:
-                $this->_loadGet();
-                break;
-            case self::OP_BINGET:
-                $this->_loadBinGet();
-                break;
-            case self::OP_LONG_BINGET:
-                $this->_loadLongBinGet();
-                break;
-            case self::OP_NONE:
-                $this->_loadNone();
-                break;
-            case self::OP_NEWTRUE:
-                $this->_loadNewTrue();
-                break;
-            case self::OP_NEWFALSE:
-                $this->_loadNewFalse();
-                break;
-            case self::OP_INT:
-                $this->_loadInt();
-                break;
-            case self::OP_BININT:
-                $this->_loadBinInt();
-                break;
-            case self::OP_BININT1:
-                $this->_loadBinInt1();
-                break;
-            case self::OP_BININT2:
-                $this->_loadBinInt2();
-                break;
-            case self::OP_LONG:
-                $this->_loadLong();
-                break;
-            case self::OP_LONG1:
-                $this->_loadLong1();
-                break;
-            case self::OP_LONG4:
-                $this->_loadLong4();
-                break;
-            case self::OP_FLOAT:
-                $this->_loadFloat();
-                break;
-            case self::OP_BINFLOAT:
-                $this->_loadBinFloat();
-                break;
-            case self::OP_STRING:
-                $this->_loadString();
-                break;
-            case self::OP_BINSTRING:
-                $this->_loadBinString();
-                break;
-            case self::OP_SHORT_BINSTRING:
-                $this->_loadShortBinString();
-                break;
-            case self::OP_BINBYTES:
-                $this->_loadBinBytes();
-                break;
-            case self::OP_SHORT_BINBYTES:
-                $this->_loadShortBinBytes();
-                break;
-            case self::OP_UNICODE:
-                $this->_loadUnicode();
-                break;
-            case self::OP_BINUNICODE:
-                $this->_loadBinUnicode();
-                break;
-            case self::OP_MARK:
-                $this->_loadMark();
-                break;
-            case self::OP_LIST:
-                $this->_loadList();
-                break;
-            case self::OP_EMPTY_LIST:
-                $this->_loadEmptyList();
-                break;
-            case self::OP_APPEND:
-                $this->_loadAppend();
-                break;
-            case self::OP_APPENDS:
-                $this->_loadAppends();
-                break;
-            case self::OP_DICT:
-                $this->_loadDict();
-                break;
-            case self::OP_EMPTY_DICT:
-                $this->_loadEmptyDict();
-                break;
-            case self::OP_SETITEM:
-                $this->_loadSetItem();
-                break;
-            case self::OP_SETITEMS:
-                $this->_loadSetItems();
-                break;
-            case self::OP_TUPLE:
-                $this->_loadTuple();
-                break;
-            case self::OP_TUPLE1:
-                $this->_loadTuple1();
-                break;
-            case self::OP_TUPLE2:
-                $this->_loadTuple2();
-                break;
-            case self::OP_TUPLE3:
-                $this->_loadTuple3();
-                break;
-            case self::OP_PROTO:
-                $this->_loadProto();
-                break;
-            default:
-                require_once 'Zend/Serializer/Exception.php';
-                throw new Zend_Serializer_Exception('Invalid or unknown opcode "'.$op.'"');
-        }
-    }
-
-    /**
-     * Load a PUT opcode
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing stack
-     */
-    protected function _loadPut()
-    {
-        $id = (int)$this->_readline();
-
-        $lastStack = count($this->_stack)-1;
-        if (!isset($this->_stack[$lastStack])) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('No stack exist');
-        }
-        $this->_memo[$id] = & $this->_stack[$lastStack];
-    }
-
-    /**
-     * Load a binary PUT
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing stack
-     */
-    protected function _loadBinPut()
-    {
-        $id = ord($this->_read(1));
-
-        $lastStack = count($this->_stack)-1;
-        if (!isset($this->_stack[$lastStack])) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('No stack exist');
-        }
-        $this->_memo[$id] = & $this->_stack[$lastStack];
-    }
-
-    /**
-     * Load a long binary PUT
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing stack
-     */
-    protected function _loadLongBinPut()
-    {
-        $bin = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $bin = strrev($bin);
-        }
-        list(, $id) = unpack('l', $bin);
-
-        $lastStack = count($this->_stack)-1;
-        if (!isset($this->_stack[$lastStack])) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('No stack exist');
-        }
-        $this->_memo[$id] = & $this->_stack[$lastStack];
-    }
-
-    /**
-     * Load a GET operation
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing GET identifier
-     */
-    protected function _loadGet()
-    {
-        $id = (int)$this->_readline();
-
-        if (!array_key_exists($id, $this->_memo)) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo');
-        }
-        $this->_stack[] = & $this->_memo[$id];
-    }
-
-    /**
-     * Load a binary GET operation
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing GET identifier
-     */
-    protected function _loadBinGet()
-    {
-        $id = ord($this->_read(1));
-
-        if (!array_key_exists($id, $this->_memo)) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo');
-        }
-        $this->_stack[] = & $this->_memo[$id];
-    }
-
-    /**
-     * Load a long binary GET operation
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception on missing GET identifier
-     */
-    protected function _loadLongBinGet()
-    {
-        $bin = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $bin = strrev($bin);
-        }
-        list(, $id) = unpack('l', $bin);
-
-        if (!array_key_exists($id, $this->_memo)) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo');
-        }
-        $this->_stack[] = & $this->_memo[$id];
-    }
-
-    /**
-     * Load a NONE operator
-     *
-     * @return void
-     */
-    protected function _loadNone()
-    {
-        $this->_stack[] = null;
-    }
-
-    /**
-     * Load a boolean TRUE operator
-     *
-     * @return void
-     */
-    protected function _loadNewTrue()
-    {
-        $this->_stack[] = true;
-    }
-
-    /**
-     * Load a boolean FALSE operator
-     *
-     * @return void
-     */
-    protected function _loadNewFalse()
-    {
-        $this->_stack[] = false;
-    }
-
-    /**
-     * Load an integer operator
-     *
-     * @return void
-     */
-    protected function _loadInt()
-    {
-        $line = $this->_readline();
-        if ($line === '01') {
-            $this->_stack[] = true;
-        } elseif ($line === '00') {
-            $this->_stack[] = false;
-        } else {
-            $this->_stack[] = (int)$line;
-        }
-    }
-
-    /**
-     * Load a binary integer operator
-     *
-     * @return void
-     */
-    protected function _loadBinInt()
-    {
-        $bin = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $bin = strrev($bin);
-        }
-        list(, $int)    = unpack('l', $bin);
-        $this->_stack[] = $int;
-    }
-
-    /**
-     * Load the first byte of a binary integer
-     *
-     * @return void
-     */
-    protected function _loadBinInt1()
-    {
-        $this->_stack[] = ord($this->_read(1));
-    }
-
-    /**
-     * Load the second byte of a binary integer
-     *
-     * @return void
-     */
-    protected function _loadBinInt2()
-    {
-        $bin = $this->_read(2);
-        list(, $int)    = unpack('v', $bin);
-        $this->_stack[] = $int;
-    }
-
-    /**
-     * Load a long (float) operator
-     *
-     * @return void
-     */
-    protected function _loadLong()
-    {
-        $data = rtrim($this->_readline(), 'L');
-        if ($data === '') {
-            $this->_stack[] = 0;
-        } else {
-            $this->_stack[] = $data;
-        }
-    }
-
-    /**
-     * Load a one byte long integer
-     *
-     * @return void
-     */
-    protected function _loadLong1()
-    {
-        $n    = ord($this->_read(1));
-        $data = $this->_read($n);
-        $this->_stack[] = $this->_decodeBinLong($data);
-    }
-
-    /**
-     * Load a 4 byte long integer
-     *
-     * @return void
-     */
-    protected function _loadLong4()
-    {
-        $nBin = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $nBin = strrev($$nBin);
-        }
-        list(, $n) = unpack('l', $nBin);
-        $data = $this->_read($n);
-
-        $this->_stack[] = $this->_decodeBinLong($data);
-    }
-
-    /**
-     * Load a float value
-     *
-     * @return void
-     */
-    protected function _loadFloat()
-    {
-        $float = (float)$this->_readline();
-        $this->_stack[] = $float;
-    }
-
-    /**
-     * Load a binary float value
-     *
-     * @return void
-     */
-    protected function _loadBinFloat()
-    {
-        $bin = $this->_read(8);
-        if (self::$_isLittleEndian === true) {
-            $bin = strrev($bin);
-        }
-        list(, $float)  = unpack('d', $bin);
-        $this->_stack[] = $float;
-    }
-
-    /**
-     * Load a string
-     *
-     * @return void
-     */
-    protected function _loadString()
-    {
-        $this->_stack[] = $this->_unquoteString((string)$this->_readline());
-    }
-
-    /**
-     * Load a binary string
-     *
-     * @return void
-     */
-    protected function _loadBinString()
-    {
-        $bin = $this->_read(4);
-        if (!self::$_isLittleEndian) {
-            $bin = strrev($bin);
-        }
-        list(, $len)    = unpack('l', $bin);
-        $this->_stack[] = (string)$this->_read($len);
-    }
-
-    /**
-     * Load a short binary string
-     *
-     * @return void
-     */
-    protected function _loadShortBinString()
-    {
-        $len            = ord($this->_read(1));
-        $this->_stack[] = (string)$this->_read($len);
-    }
-
-    /**
-     * Load arbitrary binary bytes
-     *
-     * @return void
-     */
-    protected function _loadBinBytes()
-    {
-        // read byte length
-        $nBin = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $nBin = strrev($$nBin);
-        }
-        list(, $n)      = unpack('l', $nBin);
-        $this->_stack[] = $this->_read($n);
-    }
-
-    /**
-     * Load a single binary byte
-     *
-     * @return void
-     */
-    protected function _loadShortBinBytes()
-    {
-        $n              = ord($this->_read(1));
-        $this->_stack[] = $this->_read($n);
-    }
-
-    /**
-     * Load a unicode string
-     *
-     * @return void
-     */
-    protected function _loadUnicode()
-    {
-        $data    = $this->_readline();
-        $pattern = '/\\\\u([a-fA-F0-9]{4})/u'; // \uXXXX
-        $data    = preg_replace_callback($pattern, array($this, '_convertMatchingUnicodeSequence2Utf8'), $data);
-
-        if (self::$_isPhp6) {
-            $data = unicode_decode($data, 'UTF-8');
-        }
-
-        $this->_stack[] = $data;
-    }
-
-    /**
-     * Convert a unicode sequence to UTF-8
-     *
-     * @param  array $match
-     * @return string
-     */
-    protected function _convertMatchingUnicodeSequence2Utf8(array $match)
-    {
-        return $this->_hex2Utf8($match[1]);
-    }
-
-    /**
-     * Convert a hex string to a UTF-8 string
-     *
-     * @param  string $sequence
-     * @return string
-     * @throws Zend_Serializer_Exception on unmatched unicode sequence
-     */
-    protected function _hex2Utf8($hex)
-    {
-        $uniCode = hexdec($hex);
-
-        if ($uniCode < 0x80) { // 1Byte
-            $utf8Char = chr($uniCode);
-
-        } elseif ($uniCode < 0x800) { // 2Byte
-            $utf8Char = chr(0xC0 | $uniCode >> 6)
-                      . chr(0x80 | $uniCode & 0x3F);
-
-        } elseif ($uniCode < 0x10000) { // 3Byte
-            $utf8Char = chr(0xE0 | $uniCode >> 12)
-                      . chr(0x80 | $uniCode >> 6 & 0x3F)
-                      . chr(0x80 | $uniCode & 0x3F);
-
-        } elseif ($uniCode < 0x110000) { // 4Byte
-            $utf8Char  = chr(0xF0 | $uniCode >> 18)
-                       . chr(0x80 | $uniCode >> 12 & 0x3F)
-                       . chr(0x80 | $uniCode >> 6 & 0x3F)
-                       . chr(0x80 | $uniCode & 0x3F);
-        } else {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('Unsupported unicode character found "' . dechex($uniCode) . '"');
-        }
-
-        return $utf8Char;
-    }
-
-    /**
-     * Load binary unicode sequence
-     *
-     * @return void
-     */
-    protected function _loadBinUnicode()
-    {
-        // read byte length
-        $n = $this->_read(4);
-        if (self::$_isLittleEndian === false) {
-            $n = strrev($n);
-        }
-        list(, $n) = unpack('l', $n);
-        $data      = $this->_read($n);
-
-        if (self::$_isPhp6) {
-            $data = unicode_decode($data, 'UTF-8');
-        }
-
-        $this->_stack[] = $data;
-    }
-
-    /**
-     * Load a marker sequence
-     *
-     * @return void
-     */
-    protected function _loadMark()
-    {
-        $this->_stack[] = $this->_marker;
-    }
-
-    /**
-     * Load an array (list)
-     *
-     * @return void
-     */
-    protected function _loadList()
-    {
-        $k = $this->_lastMarker();
-        $this->_stack[$k] = array();
-
-        // remove all elements after marker
-        $max = count($this->_stack);
-        for ($i = $k+1, $max; $i < $max; $i++) {
-            unset($this->_stack[$i]);
-        }
-    }
-
-    /**
-     * Load an append (to list) sequence
-     *
-     * @return void
-     */
-    protected function _loadAppend()
-    {
-        $value  =  array_pop($this->_stack);
-        $list   =& $this->_stack[count($this->_stack)-1];
-        $list[] =  $value;
-    }
-
-    /**
-     * Load an empty list sequence
-     *
-     * @return void
-     */
-    protected function _loadEmptyList()
-    {
-        $this->_stack[] = array();
-    }
-
-    /**
-     * Load multiple append (to list) sequences at once
-     *
-     * @return void
-     */
-    protected function _loadAppends()
-    {
-        $k    =  $this->_lastMarker();
-        $list =& $this->_stack[$k - 1];
-        $max  =  count($this->_stack);
-        for ($i = $k + 1; $i < $max; $i++) {
-            $list[] = $this->_stack[$i];
-            unset($this->_stack[$i]);
-        }
-        unset($this->_stack[$k]);
-    }
-
-    /**
-     * Load an associative array (Python dictionary)
-     *
-     * @return void
-     */
-    protected function _loadDict()
-    {
-        $k = $this->_lastMarker();
-        $this->_stack[$k] = array();
-
-        // remove all elements after marker
-        $max = count($this->_stack);
-        for($i = $k + 1; $i < $max; $i++) {
-            unset($this->_stack[$i]);
-        }
-    }
-
-    /**
-     * Load an item from a set
-     *
-     * @return void
-     */
-    protected function _loadSetItem()
-    {
-        $value =  array_pop($this->_stack);
-        $key   =  array_pop($this->_stack);
-        $dict  =& $this->_stack[count($this->_stack) - 1];
-        $dict[$key] = $value;
-    }
-
-    /**
-     * Load an empty dictionary
-     *
-     * @return void
-     */
-    protected function _loadEmptyDict()
-    {
-        $this->_stack[] = array();
-    }
-
-    /**
-     * Load set items
-     *
-     * @return void
-     */
-    protected function _loadSetItems()
-    {
-        $k    =  $this->_lastMarker();
-        $dict =& $this->_stack[$k - 1];
-        $max  =  count($this->_stack);
-        for ($i = $k + 1; $i < $max; $i += 2) {
-            $key        = $this->_stack[$i];
-            $value      = $this->_stack[$i + 1];
-            $dict[$key] = $value;
-            unset($this->_stack[$i], $this->_stack[$i+1]);
-        }
-        unset($this->_stack[$k]);
-    }
-
-    /**
-     * Load a tuple
-     *
-     * @return void
-     */
-    protected function _loadTuple()
-    {
-        $k                =  $this->_lastMarker();
-        $this->_stack[$k] =  array();
-        $tuple            =& $this->_stack[$k];
-        $max              =  count($this->_stack);
-        for($i = $k + 1; $i < $max; $i++) {
-            $tuple[] = $this->_stack[$i];
-            unset($this->_stack[$i]);
-        }
-    }
-
-    /**
-     * Load single item tuple
-     *
-     * @return void
-     */
-    protected function _loadTuple1()
-    {
-        $value1 = array_pop($this->_stack);
-        $this->_stack[] = array($value1);
-    }
-
-    /**
-     * Load two item tuple
-     *
-     * @return void
-     */
-    protected function _loadTuple2()
-    {
-        $value2 = array_pop($this->_stack);
-        $value1 = array_pop($this->_stack);
-        $this->_stack[] = array($value1, $value2);
-    }
-
-    /**
-     * Load three item tuple
-     *
-     * @return void
-     */
-    protected function _loadTuple3() {
-        $value3 = array_pop($this->_stack);
-        $value2 = array_pop($this->_stack);
-        $value1 = array_pop($this->_stack);
-        $this->_stack[] = array($value1, $value2, $value3);
-    }
-
-    /**
-     * Load a proto value
-     *
-     * @return void
-     * @throws Zend_Serializer_Exception if Pickle version does not support this feature
-     */
-    protected function _loadProto()
-    {
-        $proto = ord($this->_read(1));
-        if ($proto < 2 || $proto > 3) {
-            require_once 'Zend/Serializer/Excception.php';
-            throw new Zend_Serializer_Exception('Invalid protocol version detected');
-        }
-        $this->_protocol = $proto;
-    }
-
-    /* unserialize helper */
-
-    /**
-     * Read a segment of the pickle
-     *
-     * @param  mixed $len
-     * @return string
-     * @throws Zend_Serializer_Exception if position matches end of data
-     */
-    protected function _read($len)
-    {
-        if (($this->_pos + $len) > $this->_pickleLen) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('End of data');
-        }
-
-        $this->_pos+= $len;
-        return substr($this->_pickle, ($this->_pos - $len), $len);
-    }
-
-    /**
-     * Read a line of the pickle at once
-     *
-     * @return string
-     * @throws Zend_Serializer_Exception if no EOL character found
-     */
-    protected function _readline()
-    {
-        $eolLen = 2;
-        $eolPos = strpos($this->_pickle, "\r\n", $this->_pos);
-        if ($eolPos === false) {
-            $eolPos = strpos($this->_pickle, "\n", $this->_pos);
-            $eolLen = 1;
-        }
-
-        if ($eolPos === false) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('No new line found');
-        }
-        $ret        = substr($this->_pickle, $this->_pos, $eolPos-$this->_pos);
-        $this->_pos = $eolPos + $eolLen;
-
-        return $ret;
-    }
-
-    /**
-     * Unquote/Unescape a quoted string
-     *
-     * @param  string $str quoted string
-     * @return string unquoted string
-     */
-    protected function _unquoteString($str)
-    {
-        $quoteArr = array_flip(self::$_quoteString);
-
-        if ($str[0] == '"') {
-            $quoteArr['\\"'] = '"';
-        } else {
-            $quoteArr["\\'"] = "'";
-        }
-
-        return strtr(substr(trim($str), 1, -1), $quoteArr);
-    }
-
-    /**
-     * Return last marker position in stack
-     *
-     * @return int
-     */
-    protected function _lastMarker()
-    {
-        for ($k = count($this->_stack)-1; $k >= 0; $k -= 1) {
-            if ($this->_stack[$k] === $this->_marker) {
-                break;
-            }
-        }
-        return $k;
-    }
-
-    /**
-     * Decode a binary long sequence
-     *
-     * @param  string $data
-     * @return int|float|string
-     */
-    protected function _decodeBinLong($data)
-    {
-        $nbytes = strlen($data);
-
-        if ($nbytes == 0) {
-            return 0;
-        }
-
-        $long = 0;
-
-        if ($nbytes > 7) {
-            if (!extension_loaded('bcmath')) {
-                return INF;
-            }
-
-            for ($i=0; $i<$nbytes; $i++) {
-                $long = bcadd($long, bcmul(ord($data[$i]), bcpow(256, $i, 0)));
-            }
-            if (0x80 <= ord($data[$nbytes-1])) {
-                $long = bcsub($long, bcpow(2, $nbytes * 8));
-            }
-
-        } else {
-            for ($i=0; $i<$nbytes; $i++) {
-                $long+= ord($data[$i]) * pow(256, $i);
-            }
-            if (0x80 <= ord($data[$nbytes-1])) {
-                $long-= pow(2, $nbytes * 8);
-                // $long-= 1 << ($nbytes * 8);
-            }
-        }
-
-        return $long;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Adapter/Wddx.php b/airtime_mvc/library/Zend/Serializer/Adapter/Wddx.php
deleted file mode 100644
index bd60dc4b1..000000000
--- a/airtime_mvc/library/Zend/Serializer/Adapter/Wddx.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Wddx.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Serializer_Adapter_AdapterAbstract */
-require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
-
-/**
- * @link       http://www.infoloom.com/gcaconfs/WEB/chicago98/simeonov.HTM
- * @link       http://en.wikipedia.org/wiki/WDDX
- * @category   Zend
- * @package    Zend_Serializer
- * @subpackage Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstract
-{
-    /**
-     * @var array Default options
-     */
-    protected $_options = array(
-        'comment' => null,
-    );
-
-    /**
-     * Constructor
-     * 
-     * @param  array $opts 
-     * @return void
-     * @throws Zend_Serializer_Exception if wddx extension not found
-     */
-    public function __construct($opts = array())
-    {
-        if (!extension_loaded('wddx')) {
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception('PHP extension "wddx" is required for this adapter');
-        }
-
-        parent::__construct($opts);
-    }
-
-    /**
-     * Serialize PHP to WDDX
-     * 
-     * @param  mixed $value 
-     * @param  array $opts 
-     * @return string
-     * @throws Zend_Serializer_Exception on wddx error
-     */
-    public function serialize($value, array $opts = array())
-    {
-        $opts = $opts + $this->_options;
-
-        if (isset($opts['comment']) && $opts['comment']) {
-            $wddx = wddx_serialize_value($value, (string)$opts['comment']);
-        } else {
-            $wddx = wddx_serialize_value($value);
-        }
-
-        if ($wddx === false) {
-            $lastErr = error_get_last();
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($lastErr['message']);
-        }
-        return $wddx;
-    }
-
-    /**
-     * Unserialize from WDDX to PHP
-     * 
-     * @param  string $wddx 
-     * @param  array $opts 
-     * @return mixed
-     * @throws Zend_Serializer_Exception on wddx error
-     */
-    public function unserialize($wddx, array $opts = array())
-    {
-        $ret = wddx_deserialize($wddx);
-
-        if ($ret === null) {
-            // check if the returned NULL is valid
-            // or based on an invalid wddx string
-            try {
-                $simpleXml = new SimpleXMLElement($wddx);
-                if (isset($simpleXml->data[0]->null[0])) {
-                    return null; // valid null
-                }
-                $errMsg = 'Can\'t unserialize wddx string';
-            } catch (Exception $e) {
-                $errMsg = $e->getMessage();
-            }
-
-            require_once 'Zend/Serializer/Exception.php';
-            throw new Zend_Serializer_Exception($errMsg);
-        }
-
-        return $ret;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Serializer/Exception.php b/airtime_mvc/library/Zend/Serializer/Exception.php
deleted file mode 100644
index eb00929f0..000000000
--- a/airtime_mvc/library/Zend/Serializer/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20575 2010-01-24 17:48:27Z mabe $
- */
-
-/** @see Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Serializer
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Serializer_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Server/Abstract.php b/airtime_mvc/library/Zend/Server/Abstract.php
deleted file mode 100644
index 161372f5b..000000000
--- a/airtime_mvc/library/Zend/Server/Abstract.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Server_Interface */
-require_once 'Zend/Server/Interface.php';
-
-/**
- * Zend_Server_Definition
- */
-require_once 'Zend/Server/Definition.php';
-
-/**
- * Zend_Server_Method_Definition
- */
-require_once 'Zend/Server/Method/Definition.php';
-
-/**
- * Zend_Server_Method_Callback
- */
-require_once 'Zend/Server/Method/Callback.php';
-
-/**
- * Zend_Server_Method_Prototype
- */
-require_once 'Zend/Server/Method/Prototype.php';
-
-/**
- * Zend_Server_Method_Parameter
- */
-require_once 'Zend/Server/Method/Parameter.php';
-
-/**
- * Zend_Server_Abstract
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-abstract class Zend_Server_Abstract implements Zend_Server_Interface
-{
-    /**
-     * @deprecated
-     * @var array List of PHP magic methods (lowercased)
-     */
-    protected static $magic_methods = array(
-        '__call',
-        '__clone',
-        '__construct',
-        '__destruct',
-        '__get',
-        '__isset',
-        '__set',
-        '__set_state',
-        '__sleep',
-        '__tostring',
-        '__unset',
-        '__wakeup',
-    );
-
-    /**
-     * @var bool Flag; whether or not overwriting existing methods is allowed
-     */
-    protected $_overwriteExistingMethods = false;
-
-    /**
-     * @var Zend_Server_Definition
-     */
-    protected $_table;
-
-    /**
-     * Constructor
-     *
-     * Setup server description
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->_table = new Zend_Server_Definition();
-        $this->_table->setOverwriteExistingMethods($this->_overwriteExistingMethods);
-    }
-
-    /**
-     * Returns a list of registered methods
-     *
-     * Returns an array of method definitions.
-     *
-     * @return Zend_Server_Definition
-     */
-    public function getFunctions()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Lowercase a string
-     *
-     * Lowercase's a string by reference
-     *
-     * @deprecated
-     * @param  string $string value
-     * @param  string $key
-     * @return string Lower cased string
-     */
-    public static function lowerCase(&$value, &$key)
-    {
-        trigger_error(__CLASS__ . '::' . __METHOD__ . '() is deprecated and will be removed in a future version', E_USER_NOTICE);
-        return $value = strtolower($value);
-    }
-
-    /**
-     * Build callback for method signature
-     *
-     * @param  Zend_Server_Reflection_Function_Abstract $reflection
-     * @return Zend_Server_Method_Callback
-     */
-    protected function _buildCallback(Zend_Server_Reflection_Function_Abstract $reflection)
-    {
-        $callback = new Zend_Server_Method_Callback();
-        if ($reflection instanceof Zend_Server_Reflection_Method) {
-            $callback->setType($reflection->isStatic() ? 'static' : 'instance')
-                     ->setClass($reflection->getDeclaringClass()->getName())
-                     ->setMethod($reflection->getName());
-        } elseif ($reflection instanceof Zend_Server_Reflection_Function) {
-            $callback->setType('function')
-                     ->setFunction($reflection->getName());
-        }
-        return $callback;
-    }
-
-    /**
-     * Build a method signature
-     *
-     * @param  Zend_Server_Reflection_Function_Abstract $reflection
-     * @param  null|string|object $class
-     * @return Zend_Server_Method_Definition
-     * @throws Zend_Server_Exception on duplicate entry
-     */
-    protected function _buildSignature(Zend_Server_Reflection_Function_Abstract $reflection, $class = null)
-    {
-        $ns         = $reflection->getNamespace();
-        $name       = $reflection->getName();
-        $method     = empty($ns) ? $name : $ns . '.' . $name;
-
-        if (!$this->_overwriteExistingMethods && $this->_table->hasMethod($method)) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Duplicate method registered: ' . $method);
-        }
-
-        $definition = new Zend_Server_Method_Definition();
-        $definition->setName($method)
-                   ->setCallback($this->_buildCallback($reflection))
-                   ->setMethodHelp($reflection->getDescription())
-                   ->setInvokeArguments($reflection->getInvokeArguments());
-
-        foreach ($reflection->getPrototypes() as $proto) {
-            $prototype = new Zend_Server_Method_Prototype();
-            $prototype->setReturnType($this->_fixType($proto->getReturnType()));
-            foreach ($proto->getParameters() as $parameter) {
-                $param = new Zend_Server_Method_Parameter(array(
-                    'type'     => $this->_fixType($parameter->getType()),
-                    'name'     => $parameter->getName(),
-                    'optional' => $parameter->isOptional(),
-                ));
-                if ($parameter->isDefaultValueAvailable()) {
-                    $param->setDefaultValue($parameter->getDefaultValue());
-                }
-                $prototype->addParameter($param);
-            }
-            $definition->addPrototype($prototype);
-        }
-        if (is_object($class)) {
-            $definition->setObject($class);
-        }
-        $this->_table->addMethod($definition);
-        return $definition;
-    }
-
-    /**
-     * Dispatch method
-     *
-     * @param  Zend_Server_Method_Definition $invocable
-     * @param  array $params
-     * @return mixed
-     */
-    protected function _dispatch(Zend_Server_Method_Definition $invocable, array $params)
-    {
-        $callback = $invocable->getCallback();
-        $type     = $callback->getType();
-
-        if ('function' == $type) {
-            $function = $callback->getFunction();
-            return call_user_func_array($function, $params);
-        }
-
-        $class  = $callback->getClass();
-        $method = $callback->getMethod();
-
-        if ('static' == $type) {
-            return call_user_func_array(array($class, $method), $params);
-        }
-
-        $object = $invocable->getObject();
-        if (!is_object($object)) {
-            $invokeArgs = $invocable->getInvokeArguments();
-            if (!empty($invokeArgs)) {
-                $reflection = new ReflectionClass($class);
-                $object     = $reflection->newInstanceArgs($invokeArgs);
-            } else {
-                $object = new $class;
-            }
-        }
-        return call_user_func_array(array($object, $method), $params);
-    }
-
-    /**
-     * Map PHP type to protocol type
-     *
-     * @param  string $type
-     * @return string
-     */
-    abstract protected function _fixType($type);
-}
diff --git a/airtime_mvc/library/Zend/Server/Cache.php b/airtime_mvc/library/Zend/Server/Cache.php
deleted file mode 100644
index aa8863be5..000000000
--- a/airtime_mvc/library/Zend/Server/Cache.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Server_Cache: cache server definitions
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Cache
-{
-    /**
-     * @var array Methods to skip when caching server
-     */
-    protected static $_skipMethods = array();
-
-    /**
-     * Cache a file containing the dispatch list.
-     *
-     * Serializes the server definition stores the information
-     * in $filename.
-     *
-     * Returns false on any error (typically, inability to write to file), true
-     * on success.
-     *
-     * @param  string $filename
-     * @param  Zend_Server_Interface $server
-     * @return bool
-     */
-    public static function save($filename, Zend_Server_Interface $server)
-    {
-        if (!is_string($filename)
-            || (!file_exists($filename) && !is_writable(dirname($filename))))
-        {
-            return false;
-        }
-
-        $methods = $server->getFunctions();
-
-        if ($methods instanceof Zend_Server_Definition) {
-            $definition = new Zend_Server_Definition();
-            foreach ($methods as $method) {
-                if (in_array($method->getName(), self::$_skipMethods)) {
-                    continue;
-                }
-                $definition->addMethod($method);
-            }
-            $methods = $definition;
-        }
-
-        if (0 === @file_put_contents($filename, serialize($methods))) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Load server definition from a file
-     *
-     * Unserializes a stored server definition from $filename. Returns false if
-     * it fails in any way, true on success.
-     *
-     * Useful to prevent needing to build the server definition on each
-     * request. Sample usage:
-     *
-     * <code>
-     * if (!Zend_Server_Cache::get($filename, $server)) {
-     *     require_once 'Some/Service/Class.php';
-     *     require_once 'Another/Service/Class.php';
-     *
-     *     // Attach Some_Service_Class with namespace 'some'
-     *     $server->attach('Some_Service_Class', 'some');
-     *
-     *     // Attach Another_Service_Class with namespace 'another'
-     *     $server->attach('Another_Service_Class', 'another');
-     *
-     *     Zend_Server_Cache::save($filename, $server);
-     * }
-     *
-     * $response = $server->handle();
-     * echo $response;
-     * </code>
-     *
-     * @param  string $filename
-     * @param  Zend_Server_Interface $server
-     * @return bool
-     */
-    public static function get($filename, Zend_Server_Interface $server)
-    {
-        if (!is_string($filename)
-            || !file_exists($filename)
-            || !is_readable($filename))
-        {
-            return false;
-        }
-
-
-        if (false === ($dispatch = @file_get_contents($filename))) {
-            return false;
-        }
-
-        if (false === ($dispatchArray = @unserialize($dispatch))) {
-            return false;
-        }
-
-        $server->loadFunctions($dispatchArray);
-
-        return true;
-    }
-
-    /**
-     * Remove a cache file
-     *
-     * @param  string $filename
-     * @return boolean
-     */
-    public static function delete($filename)
-    {
-        if (is_string($filename) && file_exists($filename)) {
-            unlink($filename);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Definition.php b/airtime_mvc/library/Zend/Server/Definition.php
deleted file mode 100644
index d29da7d2d..000000000
--- a/airtime_mvc/library/Zend/Server/Definition.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Server methods metadata
- *
- * @todo       Implement iterator
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Definition implements Countable, Iterator
-{
-    /**
-     * @var array Array of Zend_Server_Method_Definition objects
-     */
-    protected $_methods = array();
-
-    /**
-     * @var bool Whether or not overwriting existing methods is allowed
-     */
-    protected $_overwriteExistingMethods = false;
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $methods
-     * @return void
-     */
-    public function __construct($methods = null)
-    {
-        if (is_array($methods)) {
-            $this->setMethods($methods);
-        }
-    }
-
-    /**
-     * Set flag indicating whether or not overwriting existing methods is allowed
-     *
-     * @param mixed $flag
-     * @return void
-     */
-    public function setOverwriteExistingMethods($flag)
-    {
-        $this->_overwriteExistingMethods = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Add method to definition
-     *
-     * @param  array|Zend_Server_Method_Definition $method
-     * @param  null|string $name
-     * @return Zend_Server_Definition
-     * @throws Zend_Server_Exception if duplicate or invalid method provided
-     */
-    public function addMethod($method, $name = null)
-    {
-        if (is_array($method)) {
-            require_once 'Zend/Server/Method/Definition.php';
-            $method = new Zend_Server_Method_Definition($method);
-        } elseif (!$method instanceof Zend_Server_Method_Definition) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Invalid method provided');
-        }
-
-        if (is_numeric($name)) {
-            $name = null;
-        }
-        if (null !== $name) {
-            $method->setName($name);
-        } else {
-            $name = $method->getName();
-        }
-        if (null === $name) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('No method name provided');
-        }
-
-        if (!$this->_overwriteExistingMethods && array_key_exists($name, $this->_methods)) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception(sprintf('Method by name of "%s" already exists', $name));
-        }
-        $this->_methods[$name] = $method;
-        return $this;
-    }
-
-    /**
-     * Add multiple methods
-     *
-     * @param  array $methods Array of Zend_Server_Method_Definition objects or arrays
-     * @return Zend_Server_Definition
-     */
-    public function addMethods(array $methods)
-    {
-        foreach ($methods as $key => $method) {
-            $this->addMethod($method, $key);
-        }
-        return $this;
-    }
-
-    /**
-     * Set all methods at once (overwrite)
-     *
-     * @param  array $methods Array of Zend_Server_Method_Definition objects or arrays
-     * @return Zend_Server_Definition
-     */
-    public function setMethods(array $methods)
-    {
-        $this->clearMethods();
-        $this->addMethods($methods);
-        return $this;
-    }
-
-    /**
-     * Does the definition have the given method?
-     *
-     * @param  string $method
-     * @return bool
-     */
-    public function hasMethod($method)
-    {
-        return array_key_exists($method, $this->_methods);
-    }
-
-    /**
-     * Get a given method definition
-     *
-     * @param  string $method
-     * @return null|Zend_Server_Method_Definition
-     */
-    public function getMethod($method)
-    {
-        if ($this->hasMethod($method)) {
-            return $this->_methods[$method];
-        }
-        return false;
-    }
-
-    /**
-     * Get all method definitions
-     *
-     * @return array Array of Zend_Server_Method_Definition objects
-     */
-    public function getMethods()
-    {
-        return $this->_methods;
-    }
-
-    /**
-     * Remove a method definition
-     *
-     * @param  string $method
-     * @return Zend_Server_Definition
-     */
-    public function removeMethod($method)
-    {
-        if ($this->hasMethod($method)) {
-            unset($this->_methods[$method]);
-        }
-        return $this;
-    }
-
-    /**
-     * Clear all method definitions
-     *
-     * @return Zend_Server_Definition
-     */
-    public function clearMethods()
-    {
-        $this->_methods = array();
-        return $this;
-    }
-
-    /**
-     * Cast definition to an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $methods = array();
-        foreach ($this->getMethods() as $key => $method) {
-            $methods[$key] = $method->toArray();
-        }
-        return $methods;
-    }
-
-    /**
-     * Countable: count of methods
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_methods);
-    }
-
-    /**
-     * Iterator: current item
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        return current($this->_methods);
-    }
-
-    /**
-     * Iterator: current item key
-     *
-     * @return int|string
-     */
-    public function key()
-    {
-        return key($this->_methods);
-    }
-
-    /**
-     * Iterator: advance to next method
-     *
-     * @return void
-     */
-    public function next()
-    {
-        return next($this->_methods);
-    }
-
-    /**
-     * Iterator: return to first method
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        return reset($this->_methods);
-    }
-
-    /**
-     * Iterator: is the current index valid?
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return (bool) $this->current();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Exception.php b/airtime_mvc/library/Zend/Server/Exception.php
deleted file mode 100644
index af148e7e0..000000000
--- a/airtime_mvc/library/Zend/Server/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Zend_Server_Reflection exceptions
- *
- * @package Zend_Server
- * @subpackage Reflection
- * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Server/Interface.php b/airtime_mvc/library/Zend/Server/Interface.php
deleted file mode 100644
index f40caa5d2..000000000
--- a/airtime_mvc/library/Zend/Server/Interface.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Interface
- *
- * @category Zend
- * @package  Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-interface Zend_Server_Interface
-{
-    /**
-     * Attach a function as a server method
-     *
-     * Namespacing is primarily for xmlrpc, but may be used with other
-     * implementations to prevent naming collisions.
-     *
-     * @param string $function
-     * @param string $namespace
-     * @param null|array Optional array of arguments to pass to callbacks at
-     * dispatch.
-     * @return void
-     */
-    public function addFunction($function, $namespace = '');
-
-    /**
-     * Attach a class to a server
-     *
-     * The individual implementations should probably allow passing a variable
-     * number of arguments in, so that developers may define custom runtime
-     * arguments to pass to server methods.
-     *
-     * Namespacing is primarily for xmlrpc, but could be used for other
-     * implementations as well.
-     *
-     * @param mixed $class Class name or object instance to examine and attach
-     * to the server.
-     * @param string $namespace Optional namespace with which to prepend method
-     * names in the dispatch table.
-     * methods in the class will be valid callbacks.
-     * @param null|array Optional array of arguments to pass to callbacks at
-     * dispatch.
-     * @return void
-     */
-    public function setClass($class, $namespace = '', $argv = null);
-
-    /**
-     * Generate a server fault
-     *
-     * @param mixed $fault
-     * @param int $code
-     * @return mixed
-     */
-    public function fault($fault = null, $code = 404);
-
-    /**
-     * Handle a request
-     *
-     * Requests may be passed in, or the server may automagically determine the
-     * request based on defaults. Dispatches server request to appropriate
-     * method and returns a response
-     *
-     * @param mixed $request
-     * @return mixed
-     */
-    public function handle($request = false);
-
-    /**
-     * Return a server definition array
-     *
-     * Returns a server definition array as created using
-     * {@link * Zend_Server_Reflection}. Can be used for server introspection,
-     * documentation, or persistence.
-     *
-     * @access public
-     * @return array
-     */
-    public function getFunctions();
-
-    /**
-     * Load server definition
-     *
-     * Used for persistence; loads a construct as returned by {@link getFunctions()}.
-     *
-     * @param array $array
-     * @return void
-     */
-    public function loadFunctions($definition);
-
-    /**
-     * Set server persistence
-     *
-     * @todo Determine how to implement this
-     * @param int $mode
-     * @return void
-     */
-    public function setPersistence($mode);
-}
diff --git a/airtime_mvc/library/Zend/Server/Method/Callback.php b/airtime_mvc/library/Zend/Server/Method/Callback.php
deleted file mode 100644
index 65b8b14ef..000000000
--- a/airtime_mvc/library/Zend/Server/Method/Callback.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Method callback metadata
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Method_Callback
-{
-    /**
-     * @var string Class name for class method callback
-     */
-    protected $_class;
-
-    /**
-     * @var string Function name for function callback
-     */
-    protected $_function;
-
-    /**
-     * @var string Method name for class method callback
-     */
-    protected $_method;
-
-    /**
-     * @var string Callback type
-     */
-    protected $_type;
-
-    /**
-     * @var array Valid callback types
-     */
-    protected $_types = array('function', 'static', 'instance');
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ((null !== $options) && is_array($options))  {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set object state from array of options
-     *
-     * @param  array $options
-     * @return Zend_Server_Method_Callback
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set callback class
-     *
-     * @param  string $class
-     * @return Zend_Server_Method_Callback
-     */
-    public function setClass($class)
-    {
-        if (is_object($class)) {
-            $class = get_class($class);
-        }
-        $this->_class = $class;
-        return $this;
-    }
-
-    /**
-     * Get callback class
-     *
-     * @return string|null
-     */
-    public function getClass()
-    {
-        return $this->_class;
-    }
-
-    /**
-     * Set callback function
-     *
-     * @param  string $function
-     * @return Zend_Server_Method_Callback
-     */
-    public function setFunction($function)
-    {
-        $this->_function = (string) $function;
-        $this->setType('function');
-        return $this;
-    }
-
-    /**
-     * Get callback function
-     *
-     * @return null|string
-     */
-    public function getFunction()
-    {
-        return $this->_function;
-    }
-
-    /**
-     * Set callback class method
-     *
-     * @param  string $method
-     * @return Zend_Server_Method_Callback
-     */
-    public function setMethod($method)
-    {
-        $this->_method = $method;
-        return $this;
-    }
-
-    /**
-     * Get callback class  method
-     *
-     * @return null|string
-     */
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-
-    /**
-     * Set callback type
-     *
-     * @param  string $type
-     * @return Zend_Server_Method_Callback
-     * @throws Zend_Server_Exception
-     */
-    public function setType($type)
-    {
-        if (!in_array($type, $this->_types)) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Invalid method callback type  passed to ' . __CLASS__ . '::' . __METHOD__);
-        }
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Get callback type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Cast callback to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $type = $this->getType();
-        $array = array(
-            'type' => $type,
-        );
-        if ('function' == $type) {
-            $array['function'] = $this->getFunction();
-        } else {
-            $array['class']  = $this->getClass();
-            $array['method'] = $this->getMethod();
-        }
-        return $array;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Method/Definition.php b/airtime_mvc/library/Zend/Server/Method/Definition.php
deleted file mode 100644
index a0d53188e..000000000
--- a/airtime_mvc/library/Zend/Server/Method/Definition.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Method definition metadata
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Method_Definition
-{
-    /**
-     * @var Zend_Server_Method_Callback
-     */
-    protected $_callback;
-
-    /**
-     * @var array
-     */
-    protected $_invokeArguments = array();
-
-    /**
-     * @var string
-     */
-    protected $_methodHelp = '';
-
-    /**
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * @var null|object
-     */
-    protected $_object;
-
-    /**
-     * @var array Array of Zend_Server_Method_Prototype objects
-     */
-    protected $_prototypes = array();
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ((null !== $options) && is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set object state from options
-     *
-     * @param  array $options
-     * @return Zend_Server_Method_Definition
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set method name
-     *
-     * @param  string $name
-     * @return Zend_Server_Method_Definition
-     */
-    public function setName($name)
-    {
-        $this->_name = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Get method name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set method callback
-     *
-     * @param  array|Zend_Server_Method_Callback $callback
-     * @return Zend_Server_Method_Definition
-     */
-    public function setCallback($callback)
-    {
-        if (is_array($callback)) {
-            require_once 'Zend/Server/Method/Callback.php';
-            $callback = new Zend_Server_Method_Callback($callback);
-        } elseif (!$callback instanceof Zend_Server_Method_Callback) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Invalid method callback provided');
-        }
-        $this->_callback = $callback;
-        return $this;
-    }
-
-    /**
-     * Get method callback
-     *
-     * @return Zend_Server_Method_Callback
-     */
-    public function getCallback()
-    {
-        return $this->_callback;
-    }
-
-    /**
-     * Add prototype to method definition
-     *
-     * @param  array|Zend_Server_Method_Prototype $prototype
-     * @return Zend_Server_Method_Definition
-     */
-    public function addPrototype($prototype)
-    {
-        if (is_array($prototype)) {
-            require_once 'Zend/Server/Method/Prototype.php';
-            $prototype = new Zend_Server_Method_Prototype($prototype);
-        } elseif (!$prototype instanceof Zend_Server_Method_Prototype) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Invalid method prototype provided');
-        }
-        $this->_prototypes[] = $prototype;
-        return $this;
-    }
-
-    /**
-     * Add multiple prototypes at once
-     *
-     * @param  array $prototypes Array of Zend_Server_Method_Prototype objects or arrays
-     * @return Zend_Server_Method_Definition
-     */
-    public function addPrototypes(array $prototypes)
-    {
-        foreach ($prototypes as $prototype) {
-            $this->addPrototype($prototype);
-        }
-        return $this;
-    }
-
-    /**
-     * Set all prototypes at once (overwrites)
-     *
-     * @param  array $prototypes Array of Zend_Server_Method_Prototype objects or arrays
-     * @return Zend_Server_Method_Definition
-     */
-    public function setPrototypes(array $prototypes)
-    {
-        $this->_prototypes = array();
-        $this->addPrototypes($prototypes);
-        return $this;
-    }
-
-    /**
-     * Get all prototypes
-     *
-     * @return array $prototypes Array of Zend_Server_Method_Prototype objects or arrays
-     */
-    public function getPrototypes()
-    {
-        return $this->_prototypes;
-    }
-
-    /**
-     * Set method help
-     *
-     * @param  string $methodHelp
-     * @return Zend_Server_Method_Definition
-     */
-    public function setMethodHelp($methodHelp)
-    {
-        $this->_methodHelp = (string) $methodHelp;
-        return $this;
-    }
-
-    /**
-     * Get method help
-     *
-     * @return string
-     */
-    public function getMethodHelp()
-    {
-        return $this->_methodHelp;
-    }
-
-    /**
-     * Set object to use with method calls
-     *
-     * @param  object $object
-     * @return Zend_Server_Method_Definition
-     */
-    public function setObject($object)
-    {
-        if (!is_object($object) && (null !== $object)) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Invalid object passed to ' . __CLASS__ . '::' . __METHOD__);
-        }
-        $this->_object = $object;
-        return $this;
-    }
-
-    /**
-     * Get object to use with method calls
-     *
-     * @return null|object
-     */
-    public function getObject()
-    {
-        return $this->_object;
-    }
-
-    /**
-     * Set invoke arguments
-     *
-     * @param  array $invokeArguments
-     * @return Zend_Server_Method_Definition
-     */
-    public function setInvokeArguments(array $invokeArguments)
-    {
-        $this->_invokeArguments = $invokeArguments;
-        return $this;
-    }
-
-    /**
-     * Retrieve invoke arguments
-     *
-     * @return array
-     */
-    public function getInvokeArguments()
-    {
-        return $this->_invokeArguments;
-    }
-
-    /**
-     * Serialize to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $prototypes = $this->getPrototypes();
-        $signatures = array();
-        foreach ($prototypes as $prototype) {
-            $signatures[] = $prototype->toArray();
-        }
-
-        return array(
-            'name'            => $this->getName(),
-            'callback'        => $this->getCallback()->toArray(),
-            'prototypes'      => $signatures,
-            'methodHelp'      => $this->getMethodHelp(),
-            'invokeArguments' => $this->getInvokeArguments(),
-            'object'          => $this->getObject(),
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Method/Parameter.php b/airtime_mvc/library/Zend/Server/Method/Parameter.php
deleted file mode 100644
index 6163b0bc0..000000000
--- a/airtime_mvc/library/Zend/Server/Method/Parameter.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Method parameter metadata
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Method_Parameter
-{
-    /**
-     * @var mixed Default parameter value
-     */
-    protected $_defaultValue;
-
-    /**
-     * @var string Parameter description
-     */
-    protected $_description = '';
-
-    /**
-     * @var string Parameter variable name
-     */
-    protected $_name;
-
-    /**
-     * @var bool Is parameter optional?
-     */
-    protected $_optional = false;
-
-    /**
-     * @var string Parameter type
-     */
-    protected $_type = 'mixed';
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set object state from array of options
-     *
-     * @param  array $options
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set default value
-     *
-     * @param  mixed $defaultValue
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setDefaultValue($defaultValue)
-    {
-        $this->_defaultValue = $defaultValue;
-        return $this;
-    }
-
-    /**
-     * Retrieve default value
-     *
-     * @return mixed
-     */
-    public function getDefaultValue()
-    {
-        return $this->_defaultValue;
-    }
-
-    /**
-     * Set description
-     *
-     * @param  string $description
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setDescription($description)
-    {
-        $this->_description = (string) $description;
-        return $this;
-    }
-
-    /**
-     * Retrieve description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set name
-     *
-     * @param  string $name
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setName($name)
-    {
-        $this->_name = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Set optional flag
-     *
-     * @param  bool $flag
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setOptional($flag)
-    {
-        $this->_optional = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is the parameter optional?
-     *
-     * @return bool
-     */
-    public function isOptional()
-    {
-        return $this->_optional;
-    }
-
-    /**
-     * Set parameter type
-     *
-     * @param  string $type
-     * @return Zend_Server_Method_Parameter
-     */
-    public function setType($type)
-    {
-        $this->_type = (string) $type;
-        return $this;
-    }
-
-    /**
-     * Retrieve parameter type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Cast to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return array(
-            'type'         => $this->getType(),
-            'name'         => $this->getName(),
-            'optional'     => $this->isOptional(),
-            'defaultValue' => $this->getDefaultValue(),
-            'description'  => $this->getDescription(),
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Method/Prototype.php b/airtime_mvc/library/Zend/Server/Method/Prototype.php
deleted file mode 100644
index 352ae69e6..000000000
--- a/airtime_mvc/library/Zend/Server/Method/Prototype.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Method prototype metadata
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Method
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Method_Prototype
-{
-    /**
-     * @var string Return type
-     */
-    protected $_returnType = 'void';
-
-    /**
-     * @var array Map parameter names to parameter index
-     */
-    protected $_parameterNameMap = array();
-
-    /**
-     * @var array Method parameters
-     */
-    protected $_parameters = array();
-
-    /**
-     * Constructor
-     *
-     * @param  null|array $options
-     * @return void
-     */
-    public function __construct($options = null)
-    {
-        if ((null !== $options) && is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set return value
-     *
-     * @param  string $returnType
-     * @return Zend_Server_Method_Prototype
-     */
-    public function setReturnType($returnType)
-    {
-        $this->_returnType = $returnType;
-        return $this;
-    }
-
-    /**
-     * Retrieve return type
-     *
-     * @return string
-     */
-    public function getReturnType()
-    {
-        return $this->_returnType;
-    }
-
-    /**
-     * Add a parameter
-     *
-     * @param  string $parameter
-     * @return Zend_Server_Method_Prototype
-     */
-    public function addParameter($parameter)
-    {
-        if ($parameter instanceof Zend_Server_Method_Parameter) {
-            $this->_parameters[] = $parameter;
-            if (null !== ($name = $parameter->getName())) {
-                $this->_parameterNameMap[$name] = count($this->_parameters) - 1;
-            }
-        } else {
-            require_once 'Zend/Server/Method/Parameter.php';
-            $parameter = new Zend_Server_Method_Parameter(array(
-                'type' => (string) $parameter,
-            ));
-            $this->_parameters[] = $parameter;
-        }
-        return $this;
-    }
-
-    /**
-     * Add parameters
-     *
-     * @param  array $parameter
-     * @return Zend_Server_Method_Prototype
-     */
-    public function addParameters(array $parameters)
-    {
-        foreach ($parameters as $parameter) {
-            $this->addParameter($parameter);
-        }
-        return $this;
-    }
-
-    /**
-     * Set parameters
-     *
-     * @param  array $parameters
-     * @return Zend_Server_Method_Prototype
-     */
-    public function setParameters(array $parameters)
-    {
-        $this->_parameters       = array();
-        $this->_parameterNameMap = array();
-        $this->addParameters($parameters);
-        return $this;
-    }
-
-    /**
-     * Retrieve parameters as list of types
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        $types = array();
-        foreach ($this->_parameters as $parameter) {
-            $types[] = $parameter->getType();
-        }
-        return $types;
-    }
-
-    /**
-     * Get parameter objects
-     *
-     * @return array
-     */
-    public function getParameterObjects()
-    {
-        return $this->_parameters;
-    }
-
-    /**
-     * Retrieve a single parameter by name or index
-     *
-     * @param  string|int $index
-     * @return null|Zend_Server_Method_Parameter
-     */
-    public function getParameter($index)
-    {
-        if (!is_string($index) && !is_numeric($index)) {
-            return null;
-        }
-        if (array_key_exists($index, $this->_parameterNameMap)) {
-            $index = $this->_parameterNameMap[$index];
-        }
-        if (array_key_exists($index, $this->_parameters)) {
-            return $this->_parameters[$index];
-        }
-        return null;
-    }
-
-    /**
-     * Set object state from array
-     *
-     * @param  array $options
-     * @return Zend_Server_Method_Prototype
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Serialize to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return array(
-            'returnType' => $this->getReturnType(),
-            'parameters' => $this->getParameters(),
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection.php b/airtime_mvc/library/Zend/Server/Reflection.php
deleted file mode 100644
index edb5acf6a..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_Function
- */
-require_once 'Zend/Server/Reflection/Function.php';
-
-/**
- * Zend_Server_Reflection_Class
- */
-require_once 'Zend/Server/Reflection/Class.php';
-
-/**
- * Reflection for determining method signatures to use with server classes
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Reflection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection
-{
-    /**
-     * Perform class reflection to create dispatch signatures
-     *
-     * Creates a {@link Zend_Server_Reflection_Class} object for the class or
-     * object provided.
-     *
-     * If extra arguments should be passed to dispatchable methods, these may
-     * be provided as an array to $argv.
-     *
-     * @param string|object $class Class name or object
-     * @param null|array $argv Optional arguments to be used during the method call
-     * @param string $namespace Optional namespace with which to prefix the
-     * method name (used for the signature key). Primarily to avoid collisions,
-     * also for XmlRpc namespacing
-     * @return Zend_Server_Reflection_Class
-     * @throws Zend_Server_Reflection_Exception
-     */
-    public static function reflectClass($class, $argv = false, $namespace = '')
-    {
-        if (is_object($class)) {
-            $reflection = new ReflectionObject($class);
-        } elseif (class_exists($class)) {
-            $reflection = new ReflectionClass($class);
-        } else {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid class or object passed to attachClass()');
-        }
-
-        if ($argv && !is_array($argv)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass');
-        }
-
-        return new Zend_Server_Reflection_Class($reflection, $namespace, $argv);
-    }
-
-    /**
-     * Perform function reflection to create dispatch signatures
-     *
-     * Creates dispatch prototypes for a function. It returns a
-     * {@link Zend_Server_Reflection_Function} object.
-     *
-     * If extra arguments should be passed to the dispatchable function, these
-     * may be provided as an array to $argv.
-     *
-     * @param string $function Function name
-     * @param null|array $argv Optional arguments to be used during the method call
-     * @param string $namespace Optional namespace with which to prefix the
-     * function name (used for the signature key). Primarily to avoid
-     * collisions, also for XmlRpc namespacing
-     * @return Zend_Server_Reflection_Function
-     * @throws Zend_Server_Reflection_Exception
-     */
-    public static function reflectFunction($function, $argv = false, $namespace = '')
-    {
-        if (!is_string($function) || !function_exists($function)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid function "' . $function . '" passed to reflectFunction');
-        }
-
-
-        if ($argv && !is_array($argv)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass');
-        }
-
-        return new Zend_Server_Reflection_Function(new ReflectionFunction($function), $namespace, $argv);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Class.php b/airtime_mvc/library/Zend/Server/Reflection/Class.php
deleted file mode 100644
index 41f7f268b..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Class.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_Method
- */
-require_once 'Zend/Server/Reflection/Method.php';
-
-/**
- * Class/Object reflection
- *
- * Proxies calls to a ReflectionClass object, and decorates getMethods() by
- * creating its own list of {@link Zend_Server_Reflection_Method}s.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Class
-{
-    /**
-     * Optional configuration parameters; accessible via {@link __get} and
-     * {@link __set()}
-     * @var array
-     */
-    protected $_config = array();
-
-    /**
-     * Array of {@link Zend_Server_Reflection_Method}s
-     * @var array
-     */
-    protected $_methods = array();
-
-    /**
-     * Namespace
-     * @var string
-     */
-    protected $_namespace = null;
-
-    /**
-     * ReflectionClass object
-     * @var ReflectionClass
-     */
-    protected $_reflection;
-
-    /**
-     * Constructor
-     *
-     * Create array of dispatchable methods, each a
-     * {@link Zend_Server_Reflection_Method}. Sets reflection object property.
-     *
-     * @param ReflectionClass $reflection
-     * @param string $namespace
-     * @param mixed $argv
-     * @return void
-     */
-    public function __construct(ReflectionClass $reflection, $namespace = null, $argv = false)
-    {
-        $this->_reflection = $reflection;
-        $this->setNamespace($namespace);
-
-        foreach ($reflection->getMethods() as $method) {
-            // Don't aggregate magic methods
-            if ('__' == substr($method->getName(), 0, 2)) {
-                continue;
-            }
-
-            if ($method->isPublic()) {
-                // Get signatures and description
-                $this->_methods[] = new Zend_Server_Reflection_Method($this, $method, $this->getNamespace(), $argv);
-            }
-        }
-    }
-
-    /**
-     * Proxy reflection calls
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (method_exists($this->_reflection, $method)) {
-            return call_user_func_array(array($this->_reflection, $method), $args);
-        }
-
-        require_once 'Zend/Server/Reflection/Exception.php';
-        throw new Zend_Server_Reflection_Exception('Invalid reflection method');
-    }
-
-    /**
-     * Retrieve configuration parameters
-     *
-     * Values are retrieved by key from {@link $_config}. Returns null if no
-     * value found.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if (isset($this->_config[$key])) {
-            return $this->_config[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Set configuration parameters
-     *
-     * Values are stored by $key in {@link $_config}.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this->_config[$key] = $value;
-    }
-
-    /**
-     * Return array of dispatchable {@link Zend_Server_Reflection_Method}s.
-     *
-     * @access public
-     * @return array
-     */
-    public function getMethods()
-    {
-        return $this->_methods;
-    }
-
-    /**
-     * Get namespace for this class
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_namespace;
-    }
-
-    /**
-     * Set namespace for this class
-     *
-     * @param string $namespace
-     * @return void
-     */
-    public function setNamespace($namespace)
-    {
-        if (empty($namespace)) {
-            $this->_namespace = '';
-            return;
-        }
-
-        if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid namespace');
-        }
-
-        $this->_namespace = $namespace;
-    }
-
-    /**
-     * Wakeup from serialization
-     *
-     * Reflection needs explicit instantiation to work correctly. Re-instantiate
-     * reflection object on wakeup.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_reflection = new ReflectionClass($this->getName());
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Exception.php b/airtime_mvc/library/Zend/Server/Reflection/Exception.php
deleted file mode 100644
index 1b938cd5d..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Server_Exception
- */
-require_once 'Zend/Server/Exception.php';
-
-/**
- * Zend_Server_Reflection exceptions
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Exception extends Zend_Server_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Function.php b/airtime_mvc/library/Zend/Server/Reflection/Function.php
deleted file mode 100644
index 2464ce6cd..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Function.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_Function_Abstract
- */
-require_once 'Zend/Server/Reflection/Function/Abstract.php';
-
-/**
- * Function Reflection
- *
- * @uses       Zend_Server_Reflection_Function_Abstract
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Function extends Zend_Server_Reflection_Function_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Function/Abstract.php b/airtime_mvc/library/Zend/Server/Reflection/Function/Abstract.php
deleted file mode 100644
index d28365c8a..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Function/Abstract.php
+++ /dev/null
@@ -1,502 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_Node
- */
-require_once 'Zend/Server/Reflection/Node.php';
-
-/**
- * Zend_Server_Reflection_Parameter
- */
-require_once 'Zend/Server/Reflection/Parameter.php';
-
-/**
- * Zend_Server_Reflection_Prototype
- */
-require_once 'Zend/Server/Reflection/Prototype.php';
-
-/**
- * Function/Method Reflection
- *
- * Decorates a ReflectionFunction. Allows setting and retrieving an alternate
- * 'service' name (i.e., the name to be used when calling via a service),
- * setting and retrieving the description (originally set using the docblock
- * contents), retrieving the callback and callback type, retrieving additional
- * method invocation arguments, and retrieving the
- * method {@link Zend_Server_Reflection_Prototype prototypes}.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Abstract.php 20637 2010-01-25 22:33:22Z matthew $
- */
-abstract class Zend_Server_Reflection_Function_Abstract
-{
-    /**
-     * @var ReflectionFunction
-     */
-    protected $_reflection;
-
-    /**
-     * Additional arguments to pass to method on invocation
-     * @var array
-     */
-    protected $_argv = array();
-
-    /**
-     * Used to store extra configuration for the method (typically done by the
-     * server class, e.g., to indicate whether or not to instantiate a class).
-     * Associative array; access is as properties via {@link __get()} and
-     * {@link __set()}
-     * @var array
-     */
-    protected $_config = array();
-
-    /**
-     * Declaring class (needed for when serialization occurs)
-     * @var string
-     */
-    protected $_class;
-
-    /**
-     * Function/method description
-     * @var string
-     */
-    protected $_description = '';
-
-    /**
-     * Namespace with which to prefix function/method name
-     * @var string
-     */
-    protected $_namespace;
-
-    /**
-     * Prototypes
-     * @var array
-     */
-    protected $_prototypes = array();
-
-    private $_return;
-    private $_returnDesc;
-    private $_paramDesc;
-    private $_sigParams;
-    private $_sigParamsDepth;
-
-    /**
-     * Constructor
-     *
-     * @param ReflectionFunction $r
-     */
-    public function __construct(Reflector $r, $namespace = null, $argv = array())
-    {
-        // In PHP 5.1.x, ReflectionMethod extends ReflectionFunction. In 5.2.x,
-        // both extend ReflectionFunctionAbstract. So, we can't do normal type
-        // hinting in the prototype, but instead need to do some explicit
-        // testing here.
-        if ((!$r instanceof ReflectionFunction)
-            && (!$r instanceof ReflectionMethod)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid reflection class');
-        }
-        $this->_reflection = $r;
-
-        // Determine namespace
-        if (null !== $namespace){
-            $this->setNamespace($namespace);
-        }
-
-        // Determine arguments
-        if (is_array($argv)) {
-            $this->_argv = $argv;
-        }
-
-        // If method call, need to store some info on the class
-        if ($r instanceof ReflectionMethod) {
-            $this->_class = $r->getDeclaringClass()->getName();
-        }
-
-        // Perform some introspection
-        $this->_reflect();
-    }
-
-    /**
-     * Create signature node tree
-     *
-     * Recursive method to build the signature node tree. Increments through
-     * each array in {@link $_sigParams}, adding every value of the next level
-     * to the current value (unless the current value is null).
-     *
-     * @param Zend_Server_Reflection_Node $parent
-     * @param int $level
-     * @return void
-     */
-    protected function _addTree(Zend_Server_Reflection_Node $parent, $level = 0)
-    {
-        if ($level >= $this->_sigParamsDepth) {
-            return;
-        }
-
-        foreach ($this->_sigParams[$level] as $value) {
-            $node = new Zend_Server_Reflection_Node($value, $parent);
-            if ((null !== $value) && ($this->_sigParamsDepth > $level + 1)) {
-                $this->_addTree($node, $level + 1);
-            }
-        }
-    }
-
-    /**
-     * Build the signature tree
-     *
-     * Builds a signature tree starting at the return values and descending
-     * through each method argument. Returns an array of
-     * {@link Zend_Server_Reflection_Node}s.
-     *
-     * @return array
-     */
-    protected function _buildTree()
-    {
-        $returnTree = array();
-        foreach ((array) $this->_return as $value) {
-            $node = new Zend_Server_Reflection_Node($value);
-            $this->_addTree($node);
-            $returnTree[] = $node;
-        }
-
-        return $returnTree;
-    }
-
-    /**
-     * Build method signatures
-     *
-     * Builds method signatures using the array of return types and the array of
-     * parameters types
-     *
-     * @param array $return Array of return types
-     * @param string $returnDesc Return value description
-     * @param array $params Array of arguments (each an array of types)
-     * @param array $paramDesc Array of parameter descriptions
-     * @return array
-     */
-    protected function _buildSignatures($return, $returnDesc, $paramTypes, $paramDesc)
-    {
-        $this->_return         = $return;
-        $this->_returnDesc     = $returnDesc;
-        $this->_paramDesc      = $paramDesc;
-        $this->_sigParams      = $paramTypes;
-        $this->_sigParamsDepth = count($paramTypes);
-        $signatureTrees        = $this->_buildTree();
-        $signatures            = array();
-
-        $endPoints = array();
-        foreach ($signatureTrees as $root) {
-            $tmp = $root->getEndPoints();
-            if (empty($tmp)) {
-                $endPoints = array_merge($endPoints, array($root));
-            } else {
-                $endPoints = array_merge($endPoints, $tmp);
-            }
-        }
-
-        foreach ($endPoints as $node) {
-            if (!$node instanceof Zend_Server_Reflection_Node) {
-                continue;
-            }
-
-            $signature = array();
-            do {
-                array_unshift($signature, $node->getValue());
-                $node = $node->getParent();
-            } while ($node instanceof Zend_Server_Reflection_Node);
-
-            $signatures[] = $signature;
-        }
-
-        // Build prototypes
-        $params = $this->_reflection->getParameters();
-        foreach ($signatures as $signature) {
-            $return = new Zend_Server_Reflection_ReturnValue(array_shift($signature), $this->_returnDesc);
-            $tmp    = array();
-            foreach ($signature as $key => $type) {
-                $param = new Zend_Server_Reflection_Parameter($params[$key], $type, (isset($this->_paramDesc[$key]) ? $this->_paramDesc[$key] : null));
-                $param->setPosition($key);
-                $tmp[] = $param;
-            }
-
-            $this->_prototypes[] = new Zend_Server_Reflection_Prototype($return, $tmp);
-        }
-    }
-
-    /**
-     * Use code reflection to create method signatures
-     *
-     * Determines the method help/description text from the function DocBlock
-     * comment. Determines method signatures using a combination of
-     * ReflectionFunction and parsing of DocBlock @param and @return values.
-     *
-     * @param ReflectionFunction $function
-     * @return array
-     */
-    protected function _reflect()
-    {
-        $function           = $this->_reflection;
-        $helpText           = '';
-        $signatures         = array();
-        $returnDesc         = '';
-        $paramCount         = $function->getNumberOfParameters();
-        $paramCountRequired = $function->getNumberOfRequiredParameters();
-        $parameters         = $function->getParameters();
-        $docBlock           = $function->getDocComment();
-
-        if (!empty($docBlock)) {
-            // Get help text
-            if (preg_match(':/\*\*\s*\r?\n\s*\*\s(.*?)\r?\n\s*\*(\s@|/):s', $docBlock, $matches))
-            {
-                $helpText = $matches[1];
-                $helpText = preg_replace('/(^\s*\*\s)/m', '', $helpText);
-                $helpText = preg_replace('/\r?\n\s*\*\s*(\r?\n)*/s', "\n", $helpText);
-                $helpText = trim($helpText);
-            }
-
-            // Get return type(s) and description
-            $return     = 'void';
-            if (preg_match('/@return\s+(\S+)/', $docBlock, $matches)) {
-                $return = explode('|', $matches[1]);
-                if (preg_match('/@return\s+\S+\s+(.*?)(@|\*\/)/s', $docBlock, $matches))
-                {
-                    $value = $matches[1];
-                    $value = preg_replace('/\s?\*\s/m', '', $value);
-                    $value = preg_replace('/\s{2,}/', ' ', $value);
-                    $returnDesc = trim($value);
-                }
-            }
-
-            // Get param types and description
-            if (preg_match_all('/@param\s+([^\s]+)/m', $docBlock, $matches)) {
-                $paramTypesTmp = $matches[1];
-                if (preg_match_all('/@param\s+\S+\s+(\$\S+)\s+(.*?)(@|\*\/)/s', $docBlock, $matches))
-                {
-                    $paramDesc = $matches[2];
-                    foreach ($paramDesc as $key => $value) {
-                        $value = preg_replace('/\s?\*\s/m', '', $value);
-                        $value = preg_replace('/\s{2,}/', ' ', $value);
-                        $paramDesc[$key] = trim($value);
-                    }
-                }
-            }
-        } else {
-            $helpText = $function->getName();
-            $return   = 'void';
-        }
-
-        // Set method description
-        $this->setDescription($helpText);
-
-        // Get all param types as arrays
-        if (!isset($paramTypesTmp) && (0 < $paramCount)) {
-            $paramTypesTmp = array_fill(0, $paramCount, 'mixed');
-        } elseif (!isset($paramTypesTmp)) {
-            $paramTypesTmp = array();
-        } elseif (count($paramTypesTmp) < $paramCount) {
-            $start = $paramCount - count($paramTypesTmp);
-            for ($i = $start; $i < $paramCount; ++$i) {
-                $paramTypesTmp[$i] = 'mixed';
-            }
-        }
-
-        // Get all param descriptions as arrays
-        if (!isset($paramDesc) && (0 < $paramCount)) {
-            $paramDesc = array_fill(0, $paramCount, '');
-        } elseif (!isset($paramDesc)) {
-            $paramDesc = array();
-        } elseif (count($paramDesc) < $paramCount) {
-            $start = $paramCount - count($paramDesc);
-            for ($i = $start; $i < $paramCount; ++$i) {
-                $paramDesc[$i] = '';
-            }
-        }
-
-        if (count($paramTypesTmp) != $paramCount) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception(
-               'Variable number of arguments is not supported for services (except optional parameters). '
-             . 'Number of function arguments must correspond to actual number of arguments described in a docblock.');
-        }
-
-        $paramTypes = array();
-        foreach ($paramTypesTmp as $i => $param) {
-            $tmp = explode('|', $param);
-            if ($parameters[$i]->isOptional()) {
-                array_unshift($tmp, null);
-            }
-            $paramTypes[] = $tmp;
-        }
-
-        $this->_buildSignatures($return, $returnDesc, $paramTypes, $paramDesc);
-    }
-
-
-    /**
-     * Proxy reflection calls
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (method_exists($this->_reflection, $method)) {
-            return call_user_func_array(array($this->_reflection, $method), $args);
-        }
-
-        require_once 'Zend/Server/Reflection/Exception.php';
-        throw new Zend_Server_Reflection_Exception('Invalid reflection method ("' .$method. '")');
-    }
-
-    /**
-     * Retrieve configuration parameters
-     *
-     * Values are retrieved by key from {@link $_config}. Returns null if no
-     * value found.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        if (isset($this->_config[$key])) {
-            return $this->_config[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Set configuration parameters
-     *
-     * Values are stored by $key in {@link $_config}.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $this->_config[$key] = $value;
-    }
-
-    /**
-     * Set method's namespace
-     *
-     * @param string $namespace
-     * @return void
-     */
-    public function setNamespace($namespace)
-    {
-        if (empty($namespace)) {
-            $this->_namespace = '';
-            return;
-        }
-
-        if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid namespace');
-        }
-
-        $this->_namespace = $namespace;
-    }
-
-    /**
-     * Return method's namespace
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_namespace;
-    }
-
-    /**
-     * Set the description
-     *
-     * @param string $string
-     * @return void
-     */
-    public function setDescription($string)
-    {
-        if (!is_string($string)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid description');
-        }
-
-        $this->_description = $string;
-    }
-
-    /**
-     * Retrieve the description
-     *
-     * @return void
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Retrieve all prototypes as array of
-     * {@link Zend_Server_Reflection_Prototype Zend_Server_Reflection_Prototypes}
-     *
-     * @return array
-     */
-    public function getPrototypes()
-    {
-        return $this->_prototypes;
-    }
-
-    /**
-     * Retrieve additional invocation arguments
-     *
-     * @return array
-     */
-    public function getInvokeArguments()
-    {
-        return $this->_argv;
-    }
-
-    /**
-     * Wakeup from serialization
-     *
-     * Reflection needs explicit instantiation to work correctly. Re-instantiate
-     * reflection object on wakeup.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        if ($this->_reflection instanceof ReflectionMethod) {
-            $class = new ReflectionClass($this->_class);
-            $this->_reflection = new ReflectionMethod($class->newInstance(), $this->getName());
-        } else {
-            $this->_reflection = new ReflectionFunction($this->getName());
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Method.php b/airtime_mvc/library/Zend/Server/Reflection/Method.php
deleted file mode 100644
index 500159d43..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Method.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_Function_Abstract
- */
-require_once 'Zend/Server/Reflection/Function/Abstract.php';
-
-/**
- * Method Reflection
- *
- * @uses       Zend_Server_Reflection_Function_Abstract
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Method extends Zend_Server_Reflection_Function_Abstract
-{
-    /**
-     * Parent class name
-     * @var string
-     */
-    protected $_class;
-
-    /**
-     * Parent class reflection
-     * @var Zend_Server_Reflection_Class
-     */
-    protected $_classReflection;
-
-    /**
-     * Constructor
-     *
-     * @param Zend_Server_Reflection_Class $class
-     * @param ReflectionMethod $r
-     * @param string $namespace
-     * @param array $argv
-     * @return void
-     */
-    public function __construct(Zend_Server_Reflection_Class $class, ReflectionMethod $r, $namespace = null, $argv = array())
-    {
-        $this->_classReflection = $class;
-        $this->_reflection      = $r;
-
-        $classNamespace = $class->getNamespace();
-
-        // Determine namespace
-        if (!empty($namespace)) {
-            $this->setNamespace($namespace);
-        } elseif (!empty($classNamespace)) {
-            $this->setNamespace($classNamespace);
-        }
-
-        // Determine arguments
-        if (is_array($argv)) {
-            $this->_argv = $argv;
-        }
-
-        // If method call, need to store some info on the class
-        $this->_class = $class->getName();
-
-        // Perform some introspection
-        $this->_reflect();
-    }
-
-    /**
-     * Return the reflection for the class that defines this method
-     *
-     * @return Zend_Server_Reflection_Class
-     */
-    public function getDeclaringClass()
-    {
-        return $this->_classReflection;
-    }
-
-    /**
-     * Wakeup from serialization
-     *
-     * Reflection needs explicit instantiation to work correctly. Re-instantiate
-     * reflection object on wakeup.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $this->_classReflection = new Zend_Server_Reflection_Class(new ReflectionClass($this->_class), $this->getNamespace(), $this->getInvokeArguments());
-        $this->_reflection = new ReflectionMethod($this->_classReflection->getName(), $this->getName());
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Node.php b/airtime_mvc/library/Zend/Server/Reflection/Node.php
deleted file mode 100644
index 6c902053a..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Node.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Node Tree class for Zend_Server reflection operations
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @version $Id: Node.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Server_Reflection_Node
-{
-    /**
-     * Node value
-     * @var mixed
-     */
-    protected $_value = null;
-
-    /**
-     * Array of child nodes (if any)
-     * @var array
-     */
-    protected $_children = array();
-
-    /**
-     * Parent node (if any)
-     * @var Zend_Server_Reflection_Node
-     */
-    protected $_parent = null;
-
-    /**
-     * Constructor
-     *
-     * @param mixed $value
-     * @param Zend_Server_Reflection_Node $parent Optional
-     * @return Zend_Server_Reflection_Node
-     */
-    public function __construct($value, Zend_Server_Reflection_Node $parent = null)
-    {
-        $this->_value = $value;
-        if (null !== $parent) {
-            $this->setParent($parent, true);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set parent node
-     *
-     * @param Zend_Server_Reflection_Node $node
-     * @param boolean $new Whether or not the child node is newly created
-     * and should always be attached
-     * @return void
-     */
-    public function setParent(Zend_Server_Reflection_Node $node, $new = false)
-    {
-        $this->_parent = $node;
-
-        if ($new) {
-            $node->attachChild($this);
-            return;
-        }
-    }
-
-    /**
-     * Create and attach a new child node
-     *
-     * @param mixed $value
-     * @access public
-     * @return Zend_Server_Reflection_Node New child node
-     */
-    public function createChild($value)
-    {
-        $child = new self($value, $this);
-
-        return $child;
-    }
-
-    /**
-     * Attach a child node
-     *
-     * @param Zend_Server_Reflection_Node $node
-     * @return void
-     */
-    public function attachChild(Zend_Server_Reflection_Node $node)
-    {
-        $this->_children[] = $node;
-
-        if ($node->getParent() !== $this) {
-            $node->setParent($this);
-        }
-    }
-
-    /**
-     * Return an array of all child nodes
-     *
-     * @return array
-     */
-    public function getChildren()
-    {
-        return $this->_children;
-    }
-
-    /**
-     * Does this node have children?
-     *
-     * @return boolean
-     */
-    public function hasChildren()
-    {
-        return count($this->_children) > 0;
-    }
-
-    /**
-     * Return the parent node
-     *
-     * @return null|Zend_Server_Reflection_Node
-     */
-    public function getParent()
-    {
-        return $this->_parent;
-    }
-
-    /**
-     * Return the node's current value
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * Set the node value
-     *
-     * @param mixed $value
-     * @return void
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-    }
-
-    /**
-     * Retrieve the bottommost nodes of this node's tree
-     *
-     * Retrieves the bottommost nodes of the tree by recursively calling
-     * getEndPoints() on all children. If a child is null, it returns the parent
-     * as an end point.
-     *
-     * @return array
-     */
-    public function getEndPoints()
-    {
-        $endPoints = array();
-        if (!$this->hasChildren()) {
-            return $endPoints;
-        }
-
-        foreach ($this->_children as $child) {
-            $value = $child->getValue();
-
-            if (null === $value) {
-                $endPoints[] = $this;
-            } elseif ((null !== $value)
-                && $child->hasChildren())
-            {
-                $childEndPoints = $child->getEndPoints();
-                if (!empty($childEndPoints)) {
-                    $endPoints = array_merge($endPoints, $childEndPoints);
-                }
-            } elseif ((null !== $value) && !$child->hasChildren()) {
-                $endPoints[] = $child;
-            }
-        }
-
-        return $endPoints;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Parameter.php b/airtime_mvc/library/Zend/Server/Reflection/Parameter.php
deleted file mode 100644
index 77a5021f4..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Parameter.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Parameter Reflection
- *
- * Decorates a ReflectionParameter to allow setting the parameter type
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Parameter
-{
-    /**
-     * @var ReflectionParameter
-     */
-    protected $_reflection;
-
-    /**
-     * Parameter position
-     * @var int
-     */
-    protected $_position;
-
-    /**
-     * Parameter type
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Parameter description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Constructor
-     *
-     * @param ReflectionParameter $r
-     * @param string $type Parameter type
-     * @param string $description Parameter description
-     */
-    public function __construct(ReflectionParameter $r, $type = 'mixed', $description = '')
-    {
-        $this->_reflection = $r;
-        $this->setType($type);
-        $this->setDescription($description);
-    }
-
-    /**
-     * Proxy reflection calls
-     *
-     * @param string $method
-     * @param array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        if (method_exists($this->_reflection, $method)) {
-            return call_user_func_array(array($this->_reflection, $method), $args);
-        }
-
-        require_once 'Zend/Server/Reflection/Exception.php';
-        throw new Zend_Server_Reflection_Exception('Invalid reflection method');
-    }
-
-    /**
-     * Retrieve parameter type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set parameter type
-     *
-     * @param string|null $type
-     * @return void
-     */
-    public function setType($type)
-    {
-        if (!is_string($type) && (null !== $type)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid parameter type');
-        }
-
-        $this->_type = $type;
-    }
-
-    /**
-     * Retrieve parameter description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set parameter description
-     *
-     * @param string|null $description
-     * @return void
-     */
-    public function setDescription($description)
-    {
-        if (!is_string($description) && (null !== $description)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid parameter description');
-        }
-
-        $this->_description = $description;
-    }
-
-    /**
-     * Set parameter position
-     *
-     * @param int $index
-     * @return void
-     */
-    public function setPosition($index)
-    {
-        $this->_position = (int) $index;
-    }
-
-    /**
-     * Return parameter position
-     *
-     * @return int
-     */
-    public function getPosition()
-    {
-        return $this->_position;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/Prototype.php b/airtime_mvc/library/Zend/Server/Reflection/Prototype.php
deleted file mode 100644
index 084264be5..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/Prototype.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Server_Reflection_ReturnValue
- */
-require_once 'Zend/Server/Reflection/ReturnValue.php';
-
-/**
- * Zend_Server_Reflection_Parameter
- */
-require_once 'Zend/Server/Reflection/Parameter.php';
-
-/**
- * Method/Function prototypes
- *
- * Contains accessors for the return value and all method arguments.
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_Prototype
-{
-    /**
-     * Constructor
-     *
-     * @param Zend_Server_Reflection_ReturnValue $return
-     * @param array $params
-     * @return void
-     */
-    public function __construct(Zend_Server_Reflection_ReturnValue $return, $params = null)
-    {
-        $this->_return = $return;
-
-        if (!is_array($params) && (null !== $params)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid parameters');
-        }
-
-        if (is_array($params)) {
-            foreach ($params as $param) {
-                if (!$param instanceof Zend_Server_Reflection_Parameter) {
-                    require_once 'Zend/Server/Reflection/Exception.php';
-                    throw new Zend_Server_Reflection_Exception('One or more params are invalid');
-                }
-            }
-        }
-
-        $this->_params = $params;
-    }
-
-    /**
-     * Retrieve return type
-     *
-     * @return string
-     */
-    public function getReturnType()
-    {
-        return $this->_return->getType();
-    }
-
-    /**
-     * Retrieve the return value object
-     *
-     * @access public
-     * @return Zend_Server_Reflection_ReturnValue
-     */
-    public function getReturnValue()
-    {
-        return $this->_return;
-    }
-
-    /**
-     * Retrieve method parameters
-     *
-     * @return array Array of {@link Zend_Server_Reflection_Parameter}s
-     */
-    public function getParameters()
-    {
-        return $this->_params;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Server/Reflection/ReturnValue.php b/airtime_mvc/library/Zend/Server/Reflection/ReturnValue.php
deleted file mode 100644
index 5c93d3723..000000000
--- a/airtime_mvc/library/Zend/Server/Reflection/ReturnValue.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Return value reflection
- *
- * Stores the return value type and description
- *
- * @category   Zend
- * @package    Zend_Server
- * @subpackage Reflection
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: ReturnValue.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Server_Reflection_ReturnValue
-{
-    /**
-     * Return value type
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Return value description
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Constructor
-     *
-     * @param string $type Return value type
-     * @param string $description Return value type
-     */
-    public function __construct($type = 'mixed', $description = '')
-    {
-        $this->setType($type);
-        $this->setDescription($description);
-    }
-
-    /**
-     * Retrieve parameter type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set parameter type
-     *
-     * @param string|null $type
-     * @return void
-     */
-    public function setType($type)
-    {
-        if (!is_string($type) && (null !== $type)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid parameter type');
-        }
-
-        $this->_type = $type;
-    }
-
-    /**
-     * Retrieve parameter description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Set parameter description
-     *
-     * @param string|null $description
-     * @return void
-     */
-    public function setDescription($description)
-    {
-        if (!is_string($description) && (null !== $description)) {
-            require_once 'Zend/Server/Reflection/Exception.php';
-            throw new Zend_Server_Reflection_Exception('Invalid parameter description');
-        }
-
-        $this->_description = $description;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Abstract.php b/airtime_mvc/library/Zend/Service/Abstract.php
deleted file mode 100644
index 403e85814..000000000
--- a/airtime_mvc/library/Zend/Service/Abstract.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_Abstract
-{
-    /**
-     * HTTP Client used to query all web services
-     *
-     * @var Zend_Http_Client
-     */
-    protected static $_httpClient = null;
-
-
-    /**
-     * Sets the HTTP client object to use for retrieving the feeds.  If none
-     * is set, the default Zend_Http_Client will be used.
-     *
-     * @param Zend_Http_Client $httpClient
-     */
-    final public static function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        self::$_httpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object.
-     *
-     * @return Zend_Http_Client
-     */
-    final public static function getHttpClient()
-    {
-        if (!self::$_httpClient instanceof Zend_Http_Client) {
-            self::$_httpClient = new Zend_Http_Client();
-        }
-
-        return self::$_httpClient;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/Akismet.php b/airtime_mvc/library/Zend/Service/Akismet.php
deleted file mode 100644
index c85cafa95..000000000
--- a/airtime_mvc/library/Zend/Service/Akismet.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Akismet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Version
- */
-require_once 'Zend/Version.php';
-
-/**
- * @see Zend_Service_Abstract
- */
-require_once 'Zend/Service/Abstract.php';
-
-
-/**
- * Akismet REST service implementation
- *
- * @uses       Zend_Service_Abstract
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Akismet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Akismet extends Zend_Service_Abstract
-{
-    /**
-     * Akismet API key
-     * @var string
-     */
-    protected $_apiKey;
-
-    /**
-     * Blog URL
-     * @var string
-     */
-    protected $_blogUrl;
-
-    /**
-     * Charset used for encoding
-     * @var string
-     */
-    protected $_charset = 'UTF-8';
-
-    /**
-     * TCP/IP port to use in requests
-     * @var int
-     */
-    protected $_port = 80;
-
-    /**
-     * User Agent string to send in requests
-     * @var string
-     */
-    protected $_userAgent;
-
-    /**
-     * Constructor
-     *
-     * @param string $apiKey Akismet API key
-     * @param string $blog Blog URL
-     * @return void
-     */
-    public function __construct($apiKey, $blog)
-    {
-        $this->setBlogUrl($blog)
-             ->setApiKey($apiKey)
-             ->setUserAgent('Zend Framework/' . Zend_Version::VERSION . ' | Akismet/1.11');
-    }
-
-    /**
-     * Retrieve blog URL
-     *
-     * @return string
-     */
-    public function getBlogUrl()
-    {
-        return $this->_blogUrl;
-    }
-
-    /**
-     * Set blog URL
-     *
-     * @param string $blogUrl
-     * @return Zend_Service_Akismet
-     * @throws Zend_Service_Exception if invalid URL provided
-     */
-    public function setBlogUrl($blogUrl)
-    {
-        require_once 'Zend/Uri.php';
-        if (!Zend_Uri::check($blogUrl)) {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Invalid url provided for blog');
-        }
-
-        $this->_blogUrl = $blogUrl;
-        return $this;
-    }
-
-    /**
-     * Retrieve API key
-     *
-     * @return string
-     */
-    public function getApiKey()
-    {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Set API key
-     *
-     * @param string $apiKey
-     * @return Zend_Service_Akismet
-     */
-    public function setApiKey($apiKey)
-    {
-        $this->_apiKey = $apiKey;
-        return $this;
-    }
-
-    /**
-     * Retrieve charset
-     *
-     * @return string
-     */
-    public function getCharset()
-    {
-        return $this->_charset;
-    }
-
-    /**
-     * Set charset
-     *
-     * @param string $charset
-     * @return Zend_Service_Akismet
-     */
-    public function setCharset($charset)
-    {
-        $this->_charset = $charset;
-        return $this;
-    }
-
-    /**
-     * Retrieve TCP/IP port
-     *
-     * @return int
-     */
-    public function getPort()
-    {
-        return $this->_port;
-    }
-
-    /**
-     * Set TCP/IP port
-     *
-     * @param int $port
-     * @return Zend_Service_Akismet
-     * @throws Zend_Service_Exception if non-integer value provided
-     */
-    public function setPort($port)
-    {
-        if (!is_int($port)) {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Invalid port');
-        }
-
-        $this->_port = $port;
-        return $this;
-    }
-
-    /**
-     * Retrieve User Agent string
-     *
-     * @return string
-     */
-    public function getUserAgent()
-    {
-        return $this->_userAgent;
-    }
-
-    /**
-     * Set User Agent
-     *
-     * Should be of form "Some user agent/version | Akismet/version"
-     *
-     * @param string $userAgent
-     * @return Zend_Service_Akismet
-     * @throws Zend_Service_Exception with invalid user agent string
-     */
-    public function setUserAgent($userAgent)
-    {
-        if (!is_string($userAgent)
-            || !preg_match(":^[^\n/]*/[^ ]* \| Akismet/[0-9\.]*$:i", $userAgent))
-        {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Invalid User Agent string; must be of format "Application name/version | Akismet/version"');
-        }
-
-        $this->_userAgent = $userAgent;
-        return $this;
-    }
-
-    /**
-     * Post a request
-     *
-     * @param string $host
-     * @param string $path
-     * @param array  $params
-     * @return mixed
-     */
-    protected function _post($host, $path, array $params)
-    {
-        $uri    = 'http://' . $host . ':' . $this->getPort() . $path;
-        $client = self::getHttpClient();
-        $client->setUri($uri);
-        $client->setConfig(array(
-            'useragent'    => $this->getUserAgent(),
-        ));
-
-        $client->setHeaders(array(
-            'Host'         => $host,
-            'Content-Type' => 'application/x-www-form-urlencoded; charset=' . $this->getCharset()
-        ));
-        $client->setParameterPost($params);
-
-        $client->setMethod(Zend_Http_Client::POST);
-        return $client->request();
-    }
-
-    /**
-     * Verify an API key
-     *
-     * @param string $key Optional; API key to verify
-     * @param string $blog Optional; blog URL against which to verify key
-     * @return boolean
-     */
-    public function verifyKey($key = null, $blog = null)
-    {
-        if (null === $key) {
-            $key = $this->getApiKey();
-        }
-
-        if (null === $blog) {
-            $blog = $this->getBlogUrl();
-        }
-
-        $response = $this->_post('rest.akismet.com', '/1.1/verify-key', array(
-            'key'  => $key,
-            'blog' => $blog
-        ));
-
-        return ('valid' == $response->getBody());
-    }
-
-    /**
-     * Perform an API call
-     *
-     * @param string $path
-     * @param array $params
-     * @return Zend_Http_Response
-     * @throws Zend_Service_Exception if missing user_ip or user_agent fields
-     */
-    protected function _makeApiCall($path, $params)
-    {
-        if (empty($params['user_ip']) || empty($params['user_agent'])) {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Missing required Akismet fields (user_ip and user_agent are required)');
-        }
-
-        if (!isset($params['blog'])) {
-            $params['blog'] = $this->getBlogUrl();
-        }
-
-        return $this->_post($this->getApiKey() . '.rest.akismet.com', $path, $params);
-    }
-
-    /**
-     * Check a comment for spam
-     *
-     * Checks a comment to see if it is spam. $params should be an associative
-     * array with one or more of the following keys (unless noted, all keys are
-     * optional):
-     * - blog: URL of the blog. If not provided, uses value returned by {@link getBlogUrl()}
-     * - user_ip (required): IP address of comment submitter
-     * - user_agent (required): User Agent used by comment submitter
-     * - referrer: contents of HTTP_REFERER header
-     * - permalink: location of the entry to which the comment was submitted
-     * - comment_type: typically, one of 'blank', 'comment', 'trackback', or 'pingback', but may be any value
-     * - comment_author: name submitted with the content
-     * - comment_author_email: email submitted with the content
-     * - comment_author_url: URL submitted with the content
-     * - comment_content: actual content
-     *
-     * Additionally, Akismet suggests returning the key/value pairs in the
-     * $_SERVER array, and these may be included in the $params.
-     *
-     * This method implements the Akismet comment-check REST method.
-     *
-     * @param array $params
-     * @return boolean
-     * @throws Zend_Service_Exception with invalid API key
-     */
-    public function isSpam($params)
-    {
-        $response = $this->_makeApiCall('/1.1/comment-check', $params);
-
-        $return = trim($response->getBody());
-
-        if ('invalid' == $return) {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Invalid API key');
-        }
-
-        if ('true' == $return) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Submit spam
-     *
-     * Takes the same arguments as {@link isSpam()}.
-     *
-     * Submits known spam content to Akismet to help train it.
-     *
-     * This method implements Akismet's submit-spam REST method.
-     *
-     * @param array $params
-     * @return void
-     * @throws Zend_Service_Exception with invalid API key
-     */
-    public function submitSpam($params)
-    {
-        $response = $this->_makeApiCall('/1.1/submit-spam', $params);
-        $value    = trim($response->getBody());
-        if ('invalid' == $value) {
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Invalid API key');
-        }
-    }
-
-    /**
-     * Submit ham
-     *
-     * Takes the same arguments as {@link isSpam()}.
-     *
-     * Submits a comment that has been falsely categorized as spam by Akismet
-     * as a false positive, telling Akismet's filters not to filter such
-     * comments as spam in the future.
-     *
-     * Unlike {@link submitSpam()} and {@link isSpam()}, a valid API key is
-     * never necessary; as a result, this method never throws an exception
-     * (unless an exception happens with the HTTP client layer).
-     *
-     * this method implements Akismet's submit-ham REST method.
-     *
-     * @param array $params
-     * @return void
-     */
-    public function submitHam($params)
-    {
-        $response = $this->_makeApiCall('/1.1/submit-ham', $params);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon.php b/airtime_mvc/library/Zend/Service/Amazon.php
deleted file mode 100644
index dea84d1b4..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Amazon.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Rest_Client
- */
-require_once 'Zend/Rest/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon
-{
-    /**
-     * Amazon Web Services Access Key ID
-     *
-     * @var string
-     */
-    public $appId;
-
-    /**
-     * @var string
-     */
-    protected $_secretKey = null;
-
-    /**
-     * @var string
-     */
-    protected $_baseUri = null;
-
-    /**
-     * List of Amazon Web Service base URLs, indexed by country code
-     *
-     * @var array
-     */
-    protected $_baseUriList = array('US' => 'http://webservices.amazon.com',
-                                    'UK' => 'http://webservices.amazon.co.uk',
-                                    'DE' => 'http://webservices.amazon.de',
-                                    'JP' => 'http://webservices.amazon.co.jp',
-                                    'FR' => 'http://webservices.amazon.fr',
-                                    'CA' => 'http://webservices.amazon.ca');
-
-    /**
-     * Reference to REST client object
-     *
-     * @var Zend_Rest_Client
-     */
-    protected $_rest = null;
-
-
-    /**
-     * Constructs a new Amazon Web Services Client
-     *
-     * @param  string $appId       Developer's Amazon appid
-     * @param  string $countryCode Country code for Amazon service; may be US, UK, DE, JP, FR, CA
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Amazon
-     */
-    public function __construct($appId, $countryCode = 'US', $secretKey = null)
-    {
-        $this->appId = (string) $appId;
-        $this->_secretKey = $secretKey;
-
-        $countryCode = (string) $countryCode;
-        if (!isset($this->_baseUriList[$countryCode])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Unknown country code: $countryCode");
-        }
-
-        $this->_baseUri = $this->_baseUriList[$countryCode];
-    }
-
-
-    /**
-     * Search for Items
-     *
-     * @param  array $options Options to use for the Search Query
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Amazon_ResultSet
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemSearchOperation
-     */
-    public function itemSearch(array $options)
-    {
-        $client = $this->getRestClient();
-        $client->setUri($this->_baseUri);
-
-        $defaultOptions = array('ResponseGroup' => 'Small');
-        $options = $this->_prepareOptions('ItemSearch', $options, $defaultOptions);
-        $client->getHttpClient()->resetParameters();
-        $response = $client->restGet('/onca/xml', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Amazon_ResultSet
-         */
-        require_once 'Zend/Service/Amazon/ResultSet.php';
-        return new Zend_Service_Amazon_ResultSet($dom);
-    }
-
-
-    /**
-     * Look up item(s) by ASIN
-     *
-     * @param  string $asin    Amazon ASIN ID
-     * @param  array  $options Query Options
-     * @see http://www.amazon.com/gp/aws/sdk/main.html/102-9041115-9057709?s=AWSEcommerceService&v=2005-10-05&p=ApiReference/ItemLookupOperation
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet
-     */
-    public function itemLookup($asin, array $options = array())
-    {
-        $client = $this->getRestClient();
-        $client->setUri($this->_baseUri);
-        $client->getHttpClient()->resetParameters();
-
-        $defaultOptions = array('ResponseGroup' => 'Small');
-        $options['ItemId'] = (string) $asin;
-        $options = $this->_prepareOptions('ItemLookup', $options, $defaultOptions);
-        $response = $client->restGet('/onca/xml', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception(
-                'An error occurred sending request. Status code: ' . $response->getStatus()
-            );
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        $items = $xpath->query('//az:Items/az:Item');
-
-        if ($items->length == 1) {
-            /**
-             * @see Zend_Service_Amazon_Item
-             */
-            require_once 'Zend/Service/Amazon/Item.php';
-            return new Zend_Service_Amazon_Item($items->item(0));
-        }
-
-        /**
-         * @see Zend_Service_Amazon_ResultSet
-         */
-        require_once 'Zend/Service/Amazon/ResultSet.php';
-        return new Zend_Service_Amazon_ResultSet($dom);
-    }
-
-
-    /**
-     * Returns a reference to the REST client
-     *
-     * @return Zend_Rest_Client
-     */
-    public function getRestClient()
-    {
-        if($this->_rest === null) {
-            $this->_rest = new Zend_Rest_Client();
-        }
-        return $this->_rest;
-    }
-
-    /**
-     * Set REST client
-     *
-     * @param Zend_Rest_Client
-     * @return Zend_Service_Amazon
-     */
-    public function setRestClient(Zend_Rest_Client $client)
-    {
-        $this->_rest = $client;
-        return $this;
-    }
-
-
-    /**
-     * Prepare options for request
-     *
-     * @param  string $query          Action to perform
-     * @param  array  $options        User supplied options
-     * @param  array  $defaultOptions Default options
-     * @return array
-     */
-    protected function _prepareOptions($query, array $options, array $defaultOptions)
-    {
-        $options['AWSAccessKeyId'] = $this->appId;
-        $options['Service']        = 'AWSECommerceService';
-        $options['Operation']      = (string) $query;
-        $options['Version']        = '2005-10-05';
-
-        // de-canonicalize out sort key
-        if (isset($options['ResponseGroup'])) {
-            $responseGroup = explode(',', $options['ResponseGroup']);
-
-            if (!in_array('Request', $responseGroup)) {
-                $responseGroup[] = 'Request';
-                $options['ResponseGroup'] = implode(',', $responseGroup);
-            }
-        }
-
-        $options = array_merge($defaultOptions, $options);
-
-        if($this->_secretKey !== null) {
-            $options['Timestamp'] = gmdate("Y-m-d\TH:i:s\Z");;
-            ksort($options);
-            $options['Signature'] = self::computeSignature($this->_baseUri, $this->_secretKey, $options);
-        }
-
-        return $options;
-    }
-
-    /**
-     * Compute Signature for Authentication with Amazon Product Advertising Webservices
-     *
-     * @param  string $baseUri
-     * @param  string $secretKey
-     * @param  array $options
-     * @return string
-     */
-    static public function computeSignature($baseUri, $secretKey, array $options)
-    {
-        require_once "Zend/Crypt/Hmac.php";
-
-        $signature = self::buildRawSignature($baseUri, $options);
-        return base64_encode(
-            Zend_Crypt_Hmac::compute($secretKey, 'sha256', $signature, Zend_Crypt_Hmac::BINARY)
-        );
-    }
-
-    /**
-     * Build the Raw Signature Text
-     *
-     * @param  string $baseUri
-     * @param  array $options
-     * @return string
-     */
-    static public function buildRawSignature($baseUri, $options)
-    {
-        ksort($options);
-        $params = array();
-        foreach($options AS $k => $v) {
-            $params[] = $k."=".rawurlencode($v);
-        }
-
-        return sprintf("GET\n%s\n/onca/xml\n%s",
-            str_replace('http://', '', $baseUri),
-            implode("&", $params)
-        );
-    }
-
-
-    /**
-     * Check result for errors
-     *
-     * @param  DOMDocument $dom
-     * @throws Zend_Service_Exception
-     * @return void
-     */
-    protected static function _checkErrors(DOMDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-
-        if ($xpath->query('//az:Error')->length >= 1) {
-            $code = $xpath->query('//az:Error/az:Code/text()')->item(0)->data;
-            $message = $xpath->query('//az:Error/az:Message/text()')->item(0)->data;
-
-            switch($code) {
-                case 'AWS.ECommerceService.NoExactMatches':
-                    break;
-                default:
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception("$message ($code)");
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Abstract.php b/airtime_mvc/library/Zend/Service/Amazon/Abstract.php
deleted file mode 100644
index 8ad5e046f..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Abstract.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Abstract
- */
-require_once 'Zend/Service/Abstract.php';
-
-/**
- * Abstract Amazon class that handles the credentials for any of the Web Services that
- * Amazon offers
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract
-{
-    /**
-     * @var string Amazon Access Key
-     */
-    protected static $_defaultAccessKey = null;
-
-    /**
-     * @var string Amazon Secret Key
-     */
-    protected static $_defaultSecretKey = null;
-
-    /**
-     * @var string Amazon Secret Key
-     */
-    protected $_secretKey;
-
-    /**
-     * @var string Amazon Access Key
-     */
-    protected $_accessKey;
-
-
-    /**
-     * Set the keys to use when accessing SQS.
-     *
-     * @param  string $access_key       Set the default Access Key
-     * @param  string $secret_key       Set the default Secret Key
-     * @return void
-     */
-    public static function setKeys($accessKey, $secretKey)
-    {
-        self::$_defaultAccessKey = $accessKey;
-        self::$_defaultSecretKey = $secretKey;
-    }
-
-    /**
-     * Create Amazon client.
-     *
-     * @param  string $access_key       Override the default Access Key
-     * @param  string $secret_key       Override the default Secret Key
-     * @return void
-     */
-    public function __construct($accessKey=null, $secretKey=null)
-    {
-        if(!$accessKey) {
-            $accessKey = self::$_defaultAccessKey;
-        }
-        if(!$secretKey) {
-            $secretKey = self::$_defaultSecretKey;
-        }
-
-        if(!$accessKey || !$secretKey) {
-            require_once 'Zend/Service/Amazon/Exception.php';
-            throw new Zend_Service_Amazon_Exception("AWS keys were not supplied");
-        }
-        $this->_accessKey = $accessKey;
-        $this->_secretKey = $secretKey;
-    }
-
-
-
-    /**
-     * Method to fetch the Access Key
-     *
-     * @return string
-     */
-    protected function _getAccessKey()
-    {
-        return $this->_accessKey;
-    }
-
-    /**
-     * Method to fetch the Secret AWS Key
-     *
-     * @return string
-     */
-    protected function _getSecretKey()
-    {
-        return $this->_secretKey;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Accessories.php b/airtime_mvc/library/Zend/Service/Amazon/Accessories.php
deleted file mode 100644
index 8e1eb2cda..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Accessories.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Accessories.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Accessories
-{
-    /**
-     * @var string
-     */
-    public $ASIN;
-
-    /**
-     * @var string
-     */
-    public $Title;
-
-    /**
-     * Assigns values to properties relevant to Accessories
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        foreach (array('ASIN', 'Title') as $el) {
-            $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/CustomerReview.php b/airtime_mvc/library/Zend/Service/Amazon/CustomerReview.php
deleted file mode 100644
index 02331b31c..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/CustomerReview.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CustomerReview.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_CustomerReview
-{
-    /**
-     * @var string
-     */
-    public $Rating;
-
-    /**
-     * @var string
-     */
-    public $HelpfulVotes;
-
-    /**
-     * @var string
-     */
-    public $CustomerId;
-
-    /**
-     * @var string
-     */
-    public $TotalVotes;
-
-    /**
-     * @var string
-     */
-    public $Date;
-
-    /**
-     * @var string
-     */
-    public $Summary;
-
-    /**
-     * @var string
-     */
-    public $Content;
-
-    /**
-     * Assigns values to properties relevant to CustomerReview
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        foreach (array('Rating', 'HelpfulVotes', 'CustomerId', 'TotalVotes', 'Date', 'Summary', 'Content') as $el) {
-            $result = $xpath->query("./az:$el/text()", $dom);
-            if ($result->length == 1) {
-                $this->$el = (string) $result->item(0)->data;
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2.php
deleted file mode 100644
index 7650403c9..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ec2.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Amazon Ec2 Interface to allow easy creation of the Ec2 Components
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2
-{
-    /**
-     * Factory method to fetch what you want to work with.
-     *
-     * @param string $section           Create the method that you want to work with
-     * @param string $key               Override the default aws key
-     * @param string $secret_key        Override the default aws secretkey
-     * @throws Zend_Service_Amazon_Ec2_Exception
-     * @return object
-     */
-    public static function factory($section, $key = null, $secret_key = null)
-    {
-        switch(strtolower($section)) {
-            case 'keypair':
-                $class = 'Zend_Service_Amazon_Ec2_Keypair';
-                break;
-            case 'eip':
-                // break left out
-            case 'elasticip':
-                $class = 'Zend_Service_Amazon_Ec2_Elasticip';
-                break;
-            case 'ebs':
-                $class = 'Zend_Service_Amazon_Ec2_Ebs';
-                break;
-            case 'availabilityzones':
-                // break left out
-            case 'zones':
-                $class = 'Zend_Service_Amazon_Ec2_Availabilityzones';
-                break;
-            case 'ami':
-                // break left out
-            case 'image':
-                $class = 'Zend_Service_Amazon_Ec2_Image';
-                break;
-            case 'instance':
-                $class = 'Zend_Service_Amazon_Ec2_Instance';
-                break;
-            case 'security':
-                // break left out
-            case 'securitygroups':
-                $class = 'Zend_Service_Amazon_Ec2_Securitygroups';
-                break;
-            default:
-                throw new Zend_Service_Amazon_Ec2_Exception('Invalid Section: ' . $section);
-                break;
-        }
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-        return new $class($key, $secret_key);
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Abstract.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Abstract.php
deleted file mode 100644
index 1a06047ae..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Abstract.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Abstract
- */
-require_once 'Zend/Service/Amazon/Abstract.php';
-
-/**
- * @see Zend_Service_Amazon_Ec2_Response
- */
-require_once 'Zend/Service/Amazon/Ec2/Response.php';
-
-/**
- * @see Zend_Service_Amazon_Ec2_Exception
- */
-require_once 'Zend/Service/Amazon/Ec2/Exception.php';
-
-/**
- * Provides the basic functionality to send a request to the Amazon Ec2 Query API
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abstract
-{
-    /**
-     * The HTTP query server
-     */
-    protected $_ec2Endpoint = 'ec2.amazonaws.com';
-
-    /**
-     * The API version to use
-     */
-    protected $_ec2ApiVersion = '2009-04-04';
-
-    /**
-     * Signature Version
-     */
-    protected $_ec2SignatureVersion = '2';
-
-    /**
-     * Signature Encoding Method
-     */
-    protected $_ec2SignatureMethod = 'HmacSHA256';
-
-    /**
-     * Period after which HTTP request will timeout in seconds
-     */
-    protected $_httpTimeout = 10;
-
-    /**
-     * @var string Amazon Region
-     */
-    protected static $_defaultRegion = null;
-
-    /**
-     * @var string Amazon Region
-     */
-    protected $_region;
-
-    /**
-     * An array that contains all the valid Amazon Ec2 Regions.
-     *
-     * @var array
-     */
-    protected static $_validEc2Regions = array('eu-west-1', 'us-east-1');
-
-    /**
-     * Create Amazon client.
-     *
-     * @param  string $access_key       Override the default Access Key
-     * @param  string $secret_key       Override the default Secret Key
-     * @param  string $region           Sets the AWS Region
-     * @return void
-     */
-    public function __construct($accessKey=null, $secretKey=null, $region=null)
-    {
-        if(!$region) {
-            $region = self::$_defaultRegion;
-        } else {
-            // make rue the region is valid
-            if(!empty($region) && !in_array(strtolower($region), self::$_validEc2Regions, true)) {
-                require_once 'Zend/Service/Amazon/Exception.php';
-                throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region');
-            }
-        }
-
-        $this->_region = $region;
-
-        parent::__construct($accessKey, $secretKey);
-    }
-
-    /**
-     * Set which region you are working in.  It will append the
-     * end point automaticly
-     *
-     * @param string $region
-     */
-    public static function setRegion($region)
-    {
-        if(in_array(strtolower($region), self::$_validEc2Regions, true)) {
-            self::$_defaultRegion = $region;
-        } else {
-            require_once 'Zend/Service/Amazon/Exception.php';
-            throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region');
-        }
-    }
-
-    /**
-     * Method to fetch the AWS Region
-     *
-     * @return string
-     */
-    protected function _getRegion()
-    {
-        return (!empty($this->_region)) ? $this->_region . '.' : '';
-    }
-
-    /**
-     * Sends a HTTP request to the queue service using Zend_Http_Client
-     *
-     * @param array $params         List of parameters to send with the request
-     * @return Zend_Service_Amazon_Ec2_Response
-     * @throws Zend_Service_Amazon_Ec2_Exception
-     */
-    protected function sendRequest(array $params = array())
-    {
-        $url = 'https://' . $this->_getRegion() . $this->_ec2Endpoint . '/';
-
-        $params = $this->addRequiredParameters($params);
-
-        try {
-            /* @var $request Zend_Http_Client */
-            $request = self::getHttpClient();
-            $request->resetParameters();
-
-            $request->setConfig(array(
-                'timeout' => $this->_httpTimeout
-            ));
-
-            $request->setUri($url);
-            $request->setMethod(Zend_Http_Client::POST);
-            $request->setParameterPost($params);
-
-            $httpResponse = $request->request();
-
-
-        } catch (Zend_Http_Client_Exception $zhce) {
-            $message = 'Error in request to AWS service: ' . $zhce->getMessage();
-            throw new Zend_Service_Amazon_Ec2_Exception($message, $zhce->getCode(), $zhce);
-        }
-        $response = new Zend_Service_Amazon_Ec2_Response($httpResponse);
-        $this->checkForErrors($response);
-
-        return $response;
-    }
-
-    /**
-     * Adds required authentication and version parameters to an array of
-     * parameters
-     *
-     * The required parameters are:
-     * - AWSAccessKey
-     * - SignatureVersion
-     * - Timestamp
-     * - Version and
-     * - Signature
-     *
-     * If a required parameter is already set in the <tt>$parameters</tt> array,
-     * it is overwritten.
-     *
-     * @param array $parameters the array to which to add the required
-     *                          parameters.
-     *
-     * @return array
-     */
-    protected function addRequiredParameters(array $parameters)
-    {
-        $parameters['AWSAccessKeyId']   = $this->_getAccessKey();
-        $parameters['SignatureVersion'] = $this->_ec2SignatureVersion;
-        $parameters['Timestamp']        = gmdate('Y-m-d\TH:i:s\Z');
-        $parameters['Version']          = $this->_ec2ApiVersion;
-        $parameters['SignatureMethod']  = $this->_ec2SignatureMethod;
-        $parameters['Signature']        = $this->signParameters($parameters);
-
-        return $parameters;
-    }
-
-    /**
-     * Computes the RFC 2104-compliant HMAC signature for request parameters
-     *
-     * This implements the Amazon Web Services signature, as per the following
-     * specification:
-     *
-     * 1. Sort all request parameters (including <tt>SignatureVersion</tt> and
-     *    excluding <tt>Signature</tt>, the value of which is being created),
-     *    ignoring case.
-     *
-     * 2. Iterate over the sorted list and append the parameter name (in its
-     *    original case) and then its value. Do not URL-encode the parameter
-     *    values before constructing this string. Do not use any separator
-     *    characters when appending strings.
-     *
-     * @param array  $parameters the parameters for which to get the signature.
-     * @param string $secretKey  the secret key to use to sign the parameters.
-     *
-     * @return string the signed data.
-     */
-    protected function signParameters(array $paramaters)
-    {
-        $data = "POST\n";
-        $data .= $this->_getRegion() . $this->_ec2Endpoint . "\n";
-        $data .= "/\n";
-
-        uksort($paramaters, 'strcmp');
-        unset($paramaters['Signature']);
-
-        $arrData = array();
-        foreach($paramaters as $key => $value) {
-            $arrData[] = $key . '=' . str_replace("%7E", "~", rawurlencode($value));
-        }
-
-        $data .= implode('&', $arrData);
-
-        require_once 'Zend/Crypt/Hmac.php';
-        $hmac = Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'SHA256', $data, Zend_Crypt_Hmac::BINARY);
-
-        return base64_encode($hmac);
-    }
-
-    /**
-     * Checks for errors responses from Amazon
-     *
-     * @param Zend_Service_Amazon_Ec2_Response $response the response object to
-     *                                                   check.
-     *
-     * @return void
-     *
-     * @throws Zend_Service_Amazon_Ec2_Exception if one or more errors are
-     *         returned from Amazon.
-     */
-    private function checkForErrors(Zend_Service_Amazon_Ec2_Response $response)
-    {
-        $xpath = new DOMXPath($response->getDocument());
-        $list  = $xpath->query('//Error');
-        if ($list->length > 0) {
-            $node    = $list->item(0);
-            $code    = $xpath->evaluate('string(Code/text())', $node);
-            $message = $xpath->evaluate('string(Message/text())', $node);
-            throw new Zend_Service_Amazon_Ec2_Exception($message, 0, $code);
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Availabilityzones.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Availabilityzones.php
deleted file mode 100644
index 1cba26ac6..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Availabilityzones.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Availabilityzones.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to query which Availibity Zones your account has access to.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Describes availability zones that are currently available to the account
-     * and their states.
-     *
-     * @param string|array $zoneName            Name of an availability zone.
-     * @return array                            An array that contains all the return items.  Keys: zoneName and zoneState.
-     */
-    public function describe($zoneName = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeAvailabilityZones';
-
-        if(is_array($zoneName) && !empty($zoneName)) {
-            foreach($zoneName as $k=>$name) {
-                $params['ZoneName.' . ($k+1)] = $name;
-            }
-        } elseif($zoneName) {
-            $params['ZoneName.1'] = $zoneName;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes  = $xpath->query('//ec2:item');
-
-        $return = array();
-        foreach ($nodes as $k => $node) {
-            $item = array();
-            $item['zoneName']   = $xpath->evaluate('string(ec2:zoneName/text())', $node);
-            $item['zoneState']  = $xpath->evaluate('string(ec2:zoneState/text())', $node);
-
-            $return[] = $item;
-            unset($item);
-        }
-
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/CloudWatch.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/CloudWatch.php
deleted file mode 100644
index a261c1738..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/CloudWatch.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CloudWatch.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface that allows yout to run, terminate, reboot and describe Amazon
- * Ec2 Instances.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * The HTTP query server
-     */
-    protected $_ec2Endpoint = 'monitoring.amazonaws.com';
-
-    /**
-     * The API version to use
-     */
-    protected $_ec2ApiVersion = '2009-05-15';
-
-    /**
-     * XML Namespace for the CloudWatch Stuff
-     */
-    protected $_xmlNamespace = 'http://monitoring.amazonaws.com/doc/2009-05-15/';
-
-    /**
-     * The following metrics are available from each EC2 instance.
-     *
-     * CPUUtilization: The percentage of allocated EC2 compute units that are
-     *  currently in use on the instance. This metric identifies the processing
-     *  power required to run an application upon a selected instance.
-     *
-     * NetworkIn: The number of bytes received on all network interfaces by
-     *  the instance. This metric identifies the volume of incoming network
-     *  traffic to an application on a single instance.
-     *
-     * NetworkOut: The number of bytes sent out on all network interfaces
-     *  by the instance. This metric identifies the volume of outgoing network
-     *  traffic to an application on a single instance.
-     *
-     * DiskWriteOps: Completed write operations to all hard disks available to
-     *  the instance. This metric identifies the rate at which an application
-     *  writes to a hard disk. This can be used to determine the speed in which
-     *  an application saves data to a hard disk.
-     *
-     * DiskReadBytes: Bytes read from all disks available to the instance. This
-     *  metric is used to determine the volume of the data the application reads
-     *  from the hard disk of the instance. This can be used to determine the
-     *  speed of the application for the customer.
-     *
-     * DiskReadOps: Completed read operations from all disks available to the
-     *  instances. This metric identifies the rate at which an application reads
-     *  a disk. This can be used to determine the speed in which an application
-     *  reads data from a hard disk.
-     *
-     * DiskWriteBytes: Bytes written to all disks available to the instance. This
-     *  metric is used to determine the volume of the data the application writes
-     *  onto the hard disk of the instance. This can be used to determine the speed
-     *  of the application for the customer.
-     *
-     * Latency: Time taken between a request and the corresponding response as seen
-     *  by the load balancer.
-     *
-     * RequestCount: The number of requests processed by the LoadBalancer.
-     *
-     * HealthyHostCount: The number of healthy instances. Both Load Balancing dimensions,
-     *  LoadBalancerName and AvailabilityZone, should be specified when retreiving
-     *  HealthyHostCount.
-     *
-     * UnHealthyHostCount: The number of unhealthy instances. Both Load Balancing dimensions,
-     *  LoadBalancerName and AvailabilityZone, should be specified when retreiving
-     *  UnHealthyHostCount.
-     *
-     * Amazon CloudWatch data for a new EC2 instance becomes available typically
-     * within one minute of the end of the first aggregation period for the new
-     * instance. You can use the currently available dimensions for EC2 instances
-     * along with these metrics in order to refine the slice of data you want returned,
-     * such as metric CPUUtilization and dimension ImageId to get all CPUUtilization
-     * data for instances using the specified AMI.
-     *
-     * @var array
-     */
-    protected $_validMetrics = array('CPUUtilization', 'NetworkIn', 'NetworkOut',
-                                    'DiskWriteOps', 'DiskReadBytes', 'DiskReadOps',
-                                    'DiskWriteBytes', 'Latency', 'RequestCount',
-                                    'HealthyHostCount', 'UnHealthyHostCount');
-
-    /**
-     * Amazon CloudWatch not only aggregates the raw data coming in, it also computes
-     * several statistics on the data. The following table lists the statistics that you can request:
-     *
-     * Minimum: The lowest value observed during the specified period. This can be used to
-     *  determine low volumes of activity for your application.
-     *
-     * Maximum: The highest value observed during the specified period. You can use this to
-     *  determine high volumes of activity for your application.
-     *
-     * Sum: The sum of all values received (if appropriate, for example a rate would not be
-     *  summed, but a number of items would be). This statistic is useful for determining
-     *  the total volume of a metric.
-     *
-     * Average: The Average of all values received during the specified period. By comparing
-     *  this statistic with the minimum and maximum statistics, you can determine the full
-     *  scope of a metric and how close the average use is to the minimum and the maximum.
-     *  This will allow you to increase or decrease your resources as needed.
-     *
-     * Samples: The count (number) of measures used. This statistic is always returned to
-     *  show the user the size of the dataset collected. This will allow the user to properly
-     *  weight the data.
-     *
-     * Statistics are computed within a period you specify, such as all CPUUtilization within a
-     * five minute period. At a minimum, all data is aggregated into one minute intervals. This
-     * is the minimum resolution of the data. It is this data that can be aggregated into larger
-     * periods of time that you request.
-     *
-     * Aggregate data is generally available from the service within one minute from the end of the
-     * aggregation period. Delays in data propagation might cause late or partially late data in
-     * some cases. If your data is delayed, you should check the service’s Health Dashboard for
-     * any current operational issues with either Amazon CloudWatch or the services collecting
-     * the data, such as EC2 or Elastic Load Balancing.
-     *
-     * @var array
-     */
-    protected $_validStatistics = array('Average', 'Maximum', 'Minimum', 'Samples', 'Sum');
-
-    /**
-     * Valid Dimention Keys for getMetricStatistics
-     *
-     * ImageId: This dimension filters the data you request for all instances running
-     *  this EC2 Amazon Machine Image (AMI).
-     *
-     * AvailabilityZone: This dimension filters the data you request for all instances
-     *  running in that EC2 Availability Zone.
-     *
-     * AutoScalingGroupName: This dimension filters the data you request for all instances
-     *  in a specified capacity group. An AutoScalingGroup is a collection of instances
-     *  defined by customers of the Auto Scaling service. This dimension is only available
-     *  for EC2 metrics when the instances are in such an AutoScalingGroup.
-     *
-     * InstanceId: This dimension filters the data you request for only the identified
-     *  instance. This allows a user to pinpoint an exact instance from which to monitor data.
-     *
-     * InstanceType: This dimension filters the data you request for all instances running
-     *  with this specified instance type. This allows a user to catagorize his data by the
-     *  type of instance running. For example, a user might compare data from an m1.small instance
-     *  and an m1.large instance to determine which has the better business value for his application.
-     *
-     * LoadBalancerName: This dimension filters the data you request for the specified LoadBalancer
-     *  name. A LoadBalancer is represented by a DNS name and provides the single destination to
-     *  which all requests intended for your application should be directed. This metric allows
-     *  you to examine data from all instances connected to a single LoadBalancer.
-     *
-     * @var array
-     */
-    protected $_validDimensionsKeys = array('ImageId', 'AvailabilityZone', 'AutoScalingGroupName',
-                                            'InstanceId', 'InstanceType', 'LoadBalancerName');
-
-    /**
-     * Returns data for one or more statistics of given a metric
-     *
-     * Note:
-     * The maximum number of datapoints that the Amazon CloudWatch service will
-     * return in a single GetMetricStatistics request is 1,440. If a request is
-     * made that would generate more datapoints than this amount, Amazon CloudWatch
-     * will return an error. You can alter your request by narrowing the time range
-     * (StartTime, EndTime) or increasing the Period in your single request. You may
-     * also get all of the data at the granularity you originally asked for by making
-     * multiple requests with adjacent time ranges.
-     *
-     * @param array $options            The options you want to get statistics for:
-     *                                  ** Required **
-     *                                  MeasureName: The measure name that corresponds to
-     *                                      the measure for the gathered metric. Valid EC2 Values are
-     *                                      CPUUtilization, NetworkIn, NetworkOut, DiskWriteOps
-     *                                      DiskReadBytes, DiskReadOps, DiskWriteBytes. Valid Elastic
-     *                                      Load Balancing Metrics are Latency, RequestCount, HealthyHostCount
-     *                                      UnHealthyHostCount
-     *                                  Statistics: The statistics to be returned for the given metric. Valid
-     *                                      values are Average, Maximum, Minimum, Samples, Sum.  You can specify
-     *                                      this as a string or as an array of values.  If you don't specify one
-     *                                      it will default to Average instead of failing out.  If you specify an incorrect
-     *                                      option it will just skip it.
-     *                                  ** Optional **
-     *                                  Dimensions: Amazon CloudWatch allows you to specify one Dimension to further filter
-     *                                      metric data on. If you don't specify a dimension, the service returns the aggregate
-     *                                      of all the measures with the given measure name and time range.
-     *                                  Unit: The standard unit of Measurement for a given Measure. Valid Values: Seconds,
-     *                                      Percent, Bytes, Bits, Count, Bytes/Second, Bits/Second, Count/Second, and None
-     *                                      Constraints: When using count/second as the unit, you should use Sum as the statistic
-     *                                      instead of Average. Otherwise, the sample returns as equal to the number of requests
-     *                                      instead of the number of 60-second intervals. This will cause the Average to
-     *                                      always equals one when the unit is count/second.
-     *                                  StartTime: The timestamp of the first datapoint to return, inclusive. For example,
-     *                                      2008-02-26T19:00:00+00:00. We round your value down to the nearest minute.
-     *                                      You can set your start time for more than two weeks in the past. However,
-     *                                      you will only get data for the past two weeks. (in ISO 8601 format)
-     *                                      Constraints: Must be before EndTime
-     *                                  EndTime: The timestamp to use for determining the last datapoint to return. This is
-     *                                      the last datapoint to fetch, exclusive. For example, 2008-02-26T20:00:00+00:00.
-     *                                      (in ISO 8601 format)
-     */
-    public function getMetricStatistics(array $options)
-    {
-        $_usedStatistics = array();
-
-        $params = array();
-        $params['Action'] = 'GetMetricStatistics';
-
-        if (!isset($options['Period'])) {
-            $options['Period'] = 60;
-        }
-        if (!isset($options['Namespace'])) {
-            $options['Namespace'] = 'AWS/EC2';
-        }
-
-        if (!isset($options['MeasureName']) || !in_array($options['MeasureName'], $this->_validMetrics, true)) {
-            throw new Zend_Service_Amazon_Ec2_Exception('Invalid Metric Type: ' . $options['MeasureName']);
-        }
-
-        if(!isset($options['Statistics'])) {
-            $options['Statistics'][] = 'Average';
-        } elseif(!is_array($options['Statistics'])) {
-            $options['Statistics'][] = $options['Statistics'];
-        }
-
-        foreach($options['Statistics'] as $k=>$s) {
-            if(!in_array($s, $this->_validStatistics, true)) continue;
-            $options['Statistics.member.' . ($k+1)] = $s;
-            $_usedStatistics[] = $s;
-        }
-        unset($options['Statistics']);
-
-        if(isset($options['StartTime'])) {
-            if(!is_numeric($options['StartTime'])) $options['StartTime'] = strtotime($options['StartTime']);
-            $options['StartTime'] = gmdate('c', $options['StartTime']);
-        } else {
-            $options['StartTime'] = gmdate('c', strtotime('-1 hour'));
-        }
-
-        if(isset($options['EndTime'])) {
-            if(!is_numeric($options['EndTime'])) $options['EndTime'] = strtotime($options['EndTime']);
-            $options['EndTime'] = gmdate('c', $options['EndTime']);
-        } else {
-            $options['EndTime'] = gmdate('c');
-        }
-
-        if(isset($options['Dimensions'])) {
-            $x = 1;
-            foreach($options['Dimensions'] as $dimKey=>$dimVal) {
-                if(!in_array($dimKey, $this->_validDimensionsKeys, true)) continue;
-                $options['Dimensions.member.' . $x . '.Name'] = $dimKey;
-                $options['Dimensions.member.' . $x . '.Value'] = $dimVal;
-                $x++;
-            }
-            
-            unset($options['Dimensions']);
-        }
-
-        $params = array_merge($params, $options);
-
-        $response = $this->sendRequest($params);
-        $response->setNamespace($this->_xmlNamespace);
-
-        $xpath = $response->getXPath();
-        $nodes = $xpath->query('//ec2:GetMetricStatisticsResult/ec2:Datapoints/ec2:member');
-
-        $return = array();
-        $return['label'] = $xpath->evaluate('string(//ec2:GetMetricStatisticsResult/ec2:Label/text())');
-        foreach ( $nodes as $node ) {
-            $item = array();
-
-            $item['Timestamp'] = $xpath->evaluate('string(ec2:Timestamp/text())', $node);
-            $item['Unit'] = $xpath->evaluate('string(ec2:Unit/text())', $node);
-            $item['Samples'] = $xpath->evaluate('string(ec2:Samples/text())', $node);
-            foreach($_usedStatistics as $us) {
-                $item[$us] = $xpath->evaluate('string(ec2:' . $us . '/text())', $node);
-            }
-
-            $return['datapoints'][] = $item;
-            unset($item, $node);
-        }
-
-        return $return;
-
-    }
-
-    /**
-     * Return the Metrics that are aviable for your current monitored instances
-     *
-     * @param string $nextToken     The NextToken parameter is an optional parameter
-     *                                 that allows you to retrieve the next set of results
-     *                                 for your ListMetrics query.
-     * @return array
-     */
-    public function listMetrics($nextToken = null)
-    {
-        $params = array();
-        $params['Action'] = 'ListMetrics';
-        if (!empty($nextToken)) {
-            $params['NextToken'] = $nextToken;
-        }
-
-        $response = $this->sendRequest($params);
-        $response->setNamespace($this->_xmlNamespace);
-
-        $xpath = $response->getXPath();
-        $nodes = $xpath->query('//ec2:ListMetricsResult/ec2:Metrics/ec2:member');
-
-        $return = array();
-        foreach ( $nodes as $node ) {
-            $item = array();
-
-            $item['MeasureName'] = $xpath->evaluate('string(ec2:MeasureName/text())', $node);
-            $item['Namespace'] = $xpath->evaluate('string(ec2:Namespace/text())', $node);
-            $item['Deminsions']['name'] = $xpath->evaluate('string(ec2:Dimensions/ec2:member/ec2:Name/text())', $node);
-            $item['Deminsions']['value'] = $xpath->evaluate('string(ec2:Dimensions/ec2:member/ec2:Value/text())', $node);
-
-            if (empty($item['Deminsions']['name'])) {
-                $item['Deminsions'] = array();
-            }
-
-            $return[] = $item;
-            unset($item, $node);
-        }
-
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Ebs.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Ebs.php
deleted file mode 100644
index 25041924b..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Ebs.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ebs.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to create, describe, attach, detach and delete Elastic Block
- * Storage Volumes and Snaphsots.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.
-     *
-     * You must specify an availability zone when creating a volume. The volume and
-     * any instance to which it attaches must be in the same availability zone.
-     *
-     * @param string $size                  The size of the volume, in GiB.
-     * @param string $availabilityZone      The availability zone in which to create the new volume.
-     * @return array
-     */
-    public function createNewVolume($size, $availabilityZone)
-    {
-        $params = array();
-        $params['Action'] = 'CreateVolume';
-        $params['AvailabilityZone'] = $availabilityZone;
-        $params['Size'] = $size;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['volumeId']             = $xpath->evaluate('string(//ec2:volumeId/text())');
-        $return['size']                 = $xpath->evaluate('string(//ec2:size/text())');
-        $return['status']               = $xpath->evaluate('string(//ec2:status/text())');
-        $return['createTime']           = $xpath->evaluate('string(//ec2:createTime/text())');
-        $return['availabilityZone']     = $xpath->evaluate('string(//ec2:availabilityZone/text())');
-
-        return $return;
-    }
-
-    /**
-     * Creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.
-     *
-     * You must specify an availability zone when creating a volume. The volume and
-     * any instance to which it attaches must be in the same availability zone.
-     *
-     * @param string $snapshotId            The snapshot from which to create the new volume.
-     * @param string $availabilityZone      The availability zone in which to create the new volume.
-     * @return array
-     */
-    public function createVolumeFromSnapshot($snapshotId, $availabilityZone)
-    {
-        $params = array();
-        $params['Action'] = 'CreateVolume';
-        $params['AvailabilityZone'] = $availabilityZone;
-        $params['SnapshotId'] = $snapshotId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['volumeId']             = $xpath->evaluate('string(//ec2:volumeId/text())');
-        $return['size']                 = $xpath->evaluate('string(//ec2:size/text())');
-        $return['status']               = $xpath->evaluate('string(//ec2:status/text())');
-        $return['createTime']           = $xpath->evaluate('string(//ec2:createTime/text())');
-        $return['availabilityZone']     = $xpath->evaluate('string(//ec2:availabilityZone/text())');
-        $return['snapshotId']           = $xpath->evaluate('string(//ec2:snapshotId/text())');
-
-        return $return;
-    }
-
-    /**
-     * Lists one or more Amazon EBS volumes that you own, If you do not
-     * specify any volumes, Amazon EBS returns all volumes that you own.
-     *
-     * @param string|array $volumeId        The ID or array of ID's of the volume(s) to list
-     * @return array
-     */
-    public function describeVolume($volumeId = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeVolumes';
-
-        if(is_array($volumeId) && !empty($volumeId)) {
-            foreach($volumeId as $k=>$name) {
-                $params['VolumeId.' . ($k+1)] = $name;
-            }
-        } elseif($volumeId) {
-            $params['VolumeId.1'] = $volumeId;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes = $xpath->query('//ec2:volumeSet/ec2:item', $response->getDocument());
-
-        $return = array();
-        foreach ($nodes as $node) {
-            $item = array();
-
-            $item['volumeId']   = $xpath->evaluate('string(ec2:volumeId/text())', $node);
-            $item['size']       = $xpath->evaluate('string(ec2:size/text())', $node);
-            $item['status']     = $xpath->evaluate('string(ec2:status/text())', $node);
-            $item['createTime'] = $xpath->evaluate('string(ec2:createTime/text())', $node);
-
-            $attachmentSet = $xpath->query('ec2:attachmentSet/ec2:item', $node);
-            if($attachmentSet->length == 1) {
-                $_as = $attachmentSet->item(0);
-                $as = array();
-                $as['volumeId'] = $xpath->evaluate('string(ec2:volumeId/text())', $_as);
-                $as['instanceId'] = $xpath->evaluate('string(ec2:instanceId/text())', $_as);
-                $as['device'] = $xpath->evaluate('string(ec2:device/text())', $_as);
-                $as['status'] = $xpath->evaluate('string(ec2:status/text())', $_as);
-                $as['attachTime'] = $xpath->evaluate('string(ec2:attachTime/text())', $_as);
-                $item['attachmentSet'] = $as;
-            }
-
-            $return[] = $item;
-            unset($item, $node);
-        }
-
-        return $return;
-    }
-
-    public function describeAttachedVolumes($instanceId)
-    {
-        $volumes = $this->describeVolume();
-
-        $return = array();
-        foreach($volumes as $vol) {
-            if(isset($vol['attachmentSet']) && $vol['attachmentSet']['instanceId'] == $instanceId) {
-                $return[] = $vol;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Attaches an Amazon EBS volume to an instance
-     *
-     * @param string $volumeId              The ID of the Amazon EBS volume
-     * @param string $instanceId            The ID of the instance to which the volume attaches
-     * @param string $device                Specifies how the device is exposed to the instance (e.g., /dev/sdh).
-     * @return array
-     */
-    public function attachVolume($volumeId, $instanceId, $device)
-    {
-        $params = array();
-        $params['Action']       = 'AttachVolume';
-        $params['VolumeId']     = $volumeId;
-        $params['InstanceId']   = $instanceId;
-        $params['Device']       = $device;
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['volumeId']     = $xpath->evaluate('string(//ec2:volumeId/text())');
-        $return['instanceId']   = $xpath->evaluate('string(//ec2:instanceId/text())');
-        $return['device']       = $xpath->evaluate('string(//ec2:device/text())');
-        $return['status']       = $xpath->evaluate('string(//ec2:status/text())');
-        $return['attachTime']   = $xpath->evaluate('string(//ec2:attachTime/text())');
-
-        return $return;
-    }
-
-    /**
-     * Detaches an Amazon EBS volume from an instance
-     *
-     * @param string $volumeId              The ID of the Amazon EBS volume
-     * @param string $instanceId            The ID of the instance from which the volume will detach
-     * @param string $device                The device name
-     * @param boolean $force                Forces detachment if the previous detachment attempt did not occur cleanly
-     *                                      (logging into an instance, unmounting the volume, and detaching normally).
-     *                                      This option can lead to data loss or a corrupted file system. Use this option
-     *                                      only as a last resort to detach an instance from a failed instance. The
-     *                                      instance will not have an opportunity to flush file system caches nor
-     *                                      file system meta data.
-     * @return array
-     */
-    public function detachVolume($volumeId, $instanceId = null, $device = null, $force = false)
-    {
-        $params = array();
-        $params['Action']       = 'DetachVolume';
-        $params['VolumeId']     = $volumeId;
-        $params['InstanceId']   = strval($instanceId);
-        $params['Device']       = strval($device);
-        $params['Force']        = strval($force);
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['volumeId']     = $xpath->evaluate('string(//ec2:volumeId/text())');
-        $return['instanceId']   = $xpath->evaluate('string(//ec2:instanceId/text())');
-        $return['device']       = $xpath->evaluate('string(//ec2:device/text())');
-        $return['status']       = $xpath->evaluate('string(//ec2:status/text())');
-        $return['attachTime']   = $xpath->evaluate('string(//ec2:attachTime/text())');
-
-        return $return;
-    }
-
-    /**
-     * Deletes an Amazon EBS volume
-     *
-     * @param string $volumeId              The ID of the volume to delete
-     * @return boolean
-     */
-    public function deleteVolume($volumeId)
-    {
-        $params = array();
-        $params['Action']       = 'DeleteVolume';
-        $params['volumeId']     = $volumeId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups,
-     * to launch instances from identical snapshots, and to save data before shutting down an instance
-     *
-     * @param string $volumeId              The ID of the Amazon EBS volume to snapshot
-     * @return array
-     */
-    public function createSnapshot($volumeId)
-    {
-        $params = array();
-        $params['Action']       = 'CreateSnapshot';
-        $params['VolumeId']     = $volumeId;
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['snapshotId']   = $xpath->evaluate('string(//ec2:snapshotId/text())');
-        $return['volumeId']     = $xpath->evaluate('string(//ec2:volumeId/text())');
-        $return['status']       = $xpath->evaluate('string(//ec2:status/text())');
-        $return['startTime']    = $xpath->evaluate('string(//ec2:startTime/text())');
-        $return['progress']     = $xpath->evaluate('string(//ec2:progress/text())');
-
-        return $return;
-    }
-
-    /**
-     * Describes the status of Amazon EBS snapshots
-     *
-     * @param string|array $snapshotId      The ID or arry of ID's of the Amazon EBS snapshot
-     * @return array
-     */
-    public function describeSnapshot($snapshotId = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeSnapshots';
-
-        if(is_array($snapshotId) && !empty($snapshotId)) {
-            foreach($snapshotId as $k=>$name) {
-                $params['SnapshotId.' . ($k+1)] = $name;
-            }
-        } elseif($snapshotId) {
-            $params['SnapshotId.1'] = $snapshotId;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes = $xpath->query('//ec2:snapshotSet/ec2:item', $response->getDocument());
-
-        $return = array();
-        foreach ($nodes as $node) {
-            $item = array();
-
-            $item['snapshotId'] = $xpath->evaluate('string(ec2:snapshotId/text())', $node);
-            $item['volumeId']   = $xpath->evaluate('string(ec2:volumeId/text())', $node);
-            $item['status']     = $xpath->evaluate('string(ec2:status/text())', $node);
-            $item['startTime']  = $xpath->evaluate('string(ec2:startTime/text())', $node);
-            $item['progress']   = $xpath->evaluate('string(ec2:progress/text())', $node);
-
-            $return[] = $item;
-            unset($item, $node);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Deletes a snapshot of an Amazon EBS  volume that is stored in Amazon S3
-     *
-     * @param string $snapshotId            The ID of the Amazon EBS snapshot to delete
-     * @return boolean
-     */
-    public function deleteSnapshot($snapshotId)
-    {
-        $params = array();
-        $params['Action']       = 'DeleteSnapshot';
-        $params['SnapshotId']   = $snapshotId;
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Elasticip.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Elasticip.php
deleted file mode 100644
index a105bde81..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Elasticip.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Elasticip.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to allocate, associate, describe and release Elastic IP address
- * from your account.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Acquires an elastic IP address for use with your account
-     *
-     * @return string                           Returns the newly Allocated IP Address
-     */
-    public function allocate()
-    {
-        $params = array();
-        $params['Action'] = 'AllocateAddress';
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $ip = $xpath->evaluate('string(//ec2:publicIp/text())');
-
-        return $ip;
-    }
-
-    /**
-     * Lists elastic IP addresses assigned to your account.
-     *
-     * @param string|array $publicIp            Elastic IP or list of addresses to describe.
-     * @return array
-     */
-    public function describe($publicIp = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeAddresses';
-
-        if(is_array($publicIp) && !empty($publicIp)) {
-            foreach($publicIp as $k=>$name) {
-                $params['PublicIp.' . ($k+1)] = $name;
-            }
-        } elseif($publicIp) {
-            $params['PublicIp.1'] = $publicIp;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes  = $xpath->query('//ec2:item');
-
-        $return = array();
-        foreach ($nodes as $k => $node) {
-            $item = array();
-            $item['publicIp']  = $xpath->evaluate('string(ec2:publicIp/text())', $node);
-            $item['instanceId']   = $xpath->evaluate('string(ec2:instanceId/text())', $node);
-
-            $return[] = $item;
-            unset($item);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Releases an elastic IP address that is associated with your account
-     *
-     * @param string $publicIp                  IP address that you are releasing from your account.
-     * @return boolean
-     */
-    public function release($publicIp)
-    {
-        $params = array();
-        $params['Action'] = 'ReleaseAddress';
-        $params['PublicIp'] = $publicIp;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Associates an elastic IP address with an instance
-     *
-     * @param string $instanceId                The instance to which the IP address is assigned
-     * @param string $publicIp                  IP address that you are assigning to the instance.
-     * @return boolean
-     */
-    public function associate($instanceId, $publicIp)
-    {
-        $params = array();
-        $params['Action'] = 'AssociateAddress';
-        $params['PublicIp'] = $publicIp;
-        $params['InstanceId'] = $instanceId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Disassociates the specified elastic IP address from the instance to which it is assigned.
-     * This is an idempotent operation. If you enter it more than once, Amazon EC2 does not return an error.
-     *
-     * @param string $publicIp                  IP address that you are disassociating from the instance.
-     * @return boolean
-     */
-    public function disassocate($publicIp)
-    {
-        $params = array();
-        $params['Action'] = 'DisssociateAddress';
-        $params['PublicIp'] = $publicIp;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Exception.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Exception.php
deleted file mode 100644
index c43a4874e..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Exception.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Exception
- */
-require_once 'Zend/Service/Amazon/Exception.php';
-
-/**
- * The Custom Exception class that allows you to have access to the AWS Error Code.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Exception extends Zend_Service_Amazon_Exception
-{
-    private $awsErrorCode = '';
-
-    public function __construct($message, $code = 0, $awsErrorCode = '')
-    {
-        parent::__construct($message, $code);
-        $this->awsErrorCode = $awsErrorCode;
-    }
-
-    public function getErrorCode()
-    {
-        return $this->awsErrorCode;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Image.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Image.php
deleted file mode 100644
index d74d57cd0..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Image.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to register, describe and deregister Amamzon Machine Instances (AMI)
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Registers an AMI with Amazon EC2. Images must be registered before
-     * they can be launched.
-     *
-     * Each AMI is associated with an unique ID which is provided by the Amazon
-     * EC2 service through the RegisterImage operation. During registration, Amazon
-     * EC2 retrieves the specified image manifest from Amazon S3 and verifies that
-     * the image is owned by the user registering the image.
-     *
-     * The image manifest is retrieved once and stored within the Amazon EC2.
-     * Any modifications to an image in Amazon S3 invalidates this registration.
-     * If you make changes to an image, deregister the previous image and register
-     * the new image. For more information, see DeregisterImage.
-     *
-     * @param string $imageLocation         Full path to your AMI manifest in Amazon S3 storage.
-     * @return string                       The ami fro the newly registred image;
-     */
-    public function register($imageLocation)
-    {
-        $params                 = array();
-        $params['Action']       = 'RegisterImage';
-        $params['ImageLocation']= $imageLocation;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $amiId = $xpath->evaluate('string(//ec2:imageId/text())');
-
-        return $amiId;
-    }
-
-    /**
-     * Returns information about AMIs, AKIs, and ARIs available to the user.
-     * Information returned includes image type, product codes, architecture,
-     * and kernel and RAM disk IDs. Images available to the user include public
-     * images available for any user to launch, private images owned by the user
-     * making the request, and private images owned by other users for which the
-     * user has explicit launch permissions.
-     *
-     * Launch permissions fall into three categories:
-     *      public: The owner of the AMI granted launch permissions for the AMI
-     *              to the all group. All users have launch permissions for these AMIs.
-     *      explicit: The owner of the AMI granted launch permissions to a specific user.
-     *      implicit: A user has implicit launch permissions for all AMIs he or she owns.
-     *
-     * The list of AMIs returned can be modified by specifying AMI IDs, AMI owners,
-     * or users with launch permissions. If no options are specified, Amazon EC2 returns
-     * all AMIs for which the user has launch permissions.
-     *
-     * If you specify one or more AMI IDs, only AMIs that have the specified IDs are returned.
-     * If you specify an invalid AMI ID, a fault is returned. If you specify an AMI ID for which
-     * you do not have access, it will not be included in the returned results.
-     *
-     * If you specify one or more AMI owners, only AMIs from the specified owners and for
-     * which you have access are returned. The results can include the account IDs of the
-     * specified owners, amazon for AMIs owned by Amazon or self for AMIs that you own.
-     *
-     * If you specify a list of executable users, only users that have launch permissions
-     * for the AMIs are returned. You can specify account IDs (if you own the AMI(s)), self
-     * for AMIs for which you own or have explicit permissions, or all for public AMIs.
-     *
-     * @param string|array $imageId             A list of image descriptions
-     * @param string|array $owner               Owners of AMIs to describe.
-     * @param string|array $executableBy        AMIs for which specified users have access.
-     * @return array
-     */
-    public function describe($imageId = null, $owner = null, $executableBy = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeImages';
-
-        if(is_array($imageId) && !empty($imageId)) {
-            foreach($imageId as $k=>$name) {
-                $params['ImageId.' . ($k+1)] = $name;
-            }
-        } elseif($imageId) {
-            $params['ImageId.1'] = $imageId;
-        }
-
-        if(is_array($owner) && !empty($owner)) {
-            foreach($owner as $k=>$name) {
-                $params['Owner.' . ($k+1)] = $name;
-            }
-        } elseif($owner) {
-            $params['Owner.1'] = $owner;
-        }
-
-        if(is_array($executableBy) && !empty($executableBy)) {
-            foreach($executableBy as $k=>$name) {
-                $params['ExecutableBy.' . ($k+1)] = $name;
-            }
-        } elseif($executableBy) {
-            $params['ExecutableBy.1'] = $executableBy;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes = $xpath->query('//ec2:imagesSet/ec2:item');
-
-        $return = array();
-        foreach ($nodes as $node) {
-            $item = array();
-
-            $item['imageId']        = $xpath->evaluate('string(ec2:imageId/text())', $node);
-            $item['imageLocation']  = $xpath->evaluate('string(ec2:imageLocation/text())', $node);
-            $item['imageState']     = $xpath->evaluate('string(ec2:imageState/text())', $node);
-            $item['imageOwnerId']   = $xpath->evaluate('string(ec2:imageOwnerId/text())', $node);
-            $item['isPublic']       = $xpath->evaluate('string(ec2:isPublic/text())', $node);
-            $item['architecture']   = $xpath->evaluate('string(ec2:architecture/text())', $node);
-            $item['imageType']      = $xpath->evaluate('string(ec2:imageType/text())', $node);
-            $item['kernelId']       = $xpath->evaluate('string(ec2:kernelId/text())', $node);
-            $item['ramdiskId']      = $xpath->evaluate('string(ec2:ramdiskId/text())', $node);
-            $item['platform']       = $xpath->evaluate('string(ec2:platform/text())', $node);
-
-            $return[] = $item;
-            unset($item, $node);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Deregisters an AMI. Once deregistered, instances of the AMI can no longer be launched.
-     *
-     * @param string $imageId                   Unique ID of a machine image, returned by a call
-     *                                          to RegisterImage or DescribeImages.
-     * @return boolean
-     */
-    public function deregister($imageId)
-    {
-        $params                 = array();
-        $params['Action']       = 'DeregisterImage';
-        $params['ImageId']      = $imageId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Modifies an attribute of an AMI.
-     *
-     * Valid Attributes:
-     *       launchPermission:  Controls who has permission to launch the AMI. Launch permissions
-     *                          can be granted to specific users by adding userIds.
-     *                          To make the AMI public, add the all group.
-     *       productCodes:      Associates a product code with AMIs. This allows developers to
-     *                          charge users for using AMIs. The user must be signed up for the
-     *                          product before they can launch the AMI. This is a write once attribute;
-     *                          after it is set, it cannot be changed or removed.
-     *
-     * @param string $imageId                   AMI ID to modify.
-     * @param string $attribute                 Specifies the attribute to modify. See the preceding
-     *                                          attributes table for supported attributes.
-     * @param string $operationType             Specifies the operation to perform on the attribute.
-     *                                          See the preceding attributes table for supported operations for attributes.
-     *                                          Valid Values: add | remove
-     *                                          Required for launchPermssion Attribute
-     *
-     * @param string|array $userId              User IDs to add to or remove from the launchPermission attribute.
-     *                                          Required for launchPermssion Attribute
-     * @param string|array $userGroup           User groups to add to or remove from the launchPermission attribute.
-     *                                          Currently, the all group is available, which will make it a public AMI.
-     *                                          Required for launchPermssion Attribute
-     * @param string $productCode               Attaches a product code to the AMI. Currently only one product code
-     *                                          can be associated with an AMI. Once set, the product code cannot be changed or reset.
-     *                                          Required for productCodes Attribute
-     * @return boolean
-     */
-    public function modifyAttribute($imageId, $attribute, $operationType = 'add', $userId = null, $userGroup = null, $productCode = null)
-    {
-        $params = array();
-        $params['Action'] = 'ModifyImageAttribute';
-        $parmas['ImageId'] = $imageId;
-        $params['Attribute'] = $attribute;
-
-        switch($attribute) {
-            case 'launchPermission':
-                // break left out
-            case 'launchpermission':
-                $params['Attribute'] = 'launchPermission';
-                $params['OperationType'] = $operationType;
-
-                if(is_array($userId) && !empty($userId)) {
-                    foreach($userId as $k=>$name) {
-                        $params['UserId.' . ($k+1)] = $name;
-                    }
-                } elseif($userId) {
-                    $params['UserId.1'] = $userId;
-                }
-
-                if(is_array($userGroup) && !empty($userGroup)) {
-                    foreach($userGroup as $k=>$name) {
-                        $params['UserGroup.' . ($k+1)] = $name;
-                    }
-                } elseif($userGroup) {
-                    $params['UserGroup.1'] = $userGroup;
-                }
-
-                break;
-            case 'productCodes':
-                // break left out
-            case 'productcodes':
-                $params['Attribute'] = 'productCodes';
-                $params['ProductCode.1'] = $productCode;
-                break;
-            default:
-                require_once 'Zend/Service/Amazon/Ec2/Exception.php';
-                throw new Zend_Service_Amazon_Ec2_Exception('Invalid Attribute Passed In.  Valid Image Attributes are launchPermission and productCode.');
-                break;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Returns information about an attribute of an AMI. Only one attribute can be specified per call.
-     *
-     * @param string $imageId                   ID of the AMI for which an attribute will be described.
-     * @param string $attribute                 Specifies the attribute to describe.  Valid Attributes are
-     *                                          launchPermission, productCodes
-     */
-    public function describeAttribute($imageId, $attribute)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeImageAttribute';
-        $params['ImageId'] = $imageId;
-        $params['Attribute'] = $attribute;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['imageId'] = $xpath->evaluate('string(//ec2:imageId/text())');
-
-        // check for launchPermission
-        if($attribute == 'launchPermission') {
-            $lPnodes = $xpath->query('//ec2:launchPermission/ec2:item');
-
-            if($lPnodes->length > 0) {
-                $return['launchPermission'] = array();
-                foreach($lPnodes as $node) {
-                    $return['launchPermission'][] = $xpath->evaluate('string(ec2:userId/text())', $node);
-                }
-            }
-        }
-
-        // check for product codes
-        if($attribute == 'productCodes') {
-            $pCnodes = $xpath->query('//ec2:productCodes/ec2:item');
-            if($pCnodes->length > 0) {
-                $return['productCodes'] = array();
-                foreach($pCnodes as $node) {
-                    $return['productCodes'][] = $xpath->evaluate('string(ec2:productCode/text())', $node);
-                }
-            }
-        }
-
-        return $return;
-
-    }
-
-    /**
-     * Resets an attribute of an AMI to its default value.  The productCodes attribute cannot be reset
-     *
-     * @param string $imageId                   ID of the AMI for which an attribute will be reset.
-     * @param String $attribute                 Specifies the attribute to reset. Currently, only launchPermission is supported.
-     *                                          In the case of launchPermission, all public and explicit launch permissions for
-     *                                          the AMI are revoked.
-     * @return boolean
-     */
-    public function resetAttribute($imageId, $attribute)
-    {
-        $params = array();
-        $params['Action'] = 'ResetImageAttribute';
-        $params['ImageId'] = $imageId;
-        $params['Attribute'] = $attribute;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance.php
deleted file mode 100644
index d86f51930..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance.php
+++ /dev/null
@@ -1,529 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Instance.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface that allows yout to run, terminate, reboot and describe Amazon
- * Ec2 Instances.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Constant for Small Instance TYpe
-     */
-    const SMALL = 'm1.small';
-
-    /**
-     * Constant for Large Instance TYpe
-     */
-    const LARGE = 'm1.large';
-
-    /**
-     * Constant for X-Large Instance TYpe
-     */
-    const XLARGE = 'm1.xlarge';
-
-    /**
-     * Constant for High CPU Medium Instance TYpe
-     */
-    const HCPU_MEDIUM = 'c1.medium';
-
-    /**
-     * Constant for High CPU X-Large Instance TYpe
-     */
-    const HCPU_XLARGE = 'c1.xlarge';
-
-
-    /**
-     * Launches a specified number of Instances.
-     *
-     * If Amazon EC2 cannot launch the minimum number AMIs you request, no
-     * instances launch. If there is insufficient capacity to launch the
-     * maximum number of AMIs you request, Amazon EC2 launches as many
-     * as possible to satisfy the requested maximum values.
-     *
-     * Every instance is launched in a security group. If you do not specify
-     * a security group at launch, the instances start in your default security group.
-     * For more information on creating security groups, see CreateSecurityGroup.
-     *
-     * An optional instance type can be specified. For information
-     * about instance types, see Instance Types.
-     *
-     * You can provide an optional key pair ID for each image in the launch request
-     * (for more information, see CreateKeyPair). All instances that are created
-     * from images that use this key pair will have access to the associated public
-     * key at boot. You can use this key to provide secure access to an instance of an
-     * image on a per-instance basis. Amazon EC2 public images use this feature to
-     * provide secure access without passwords.
-     *
-     * Launching public images without a key pair ID will leave them inaccessible.
-     *
-     * @param array $options                        An array that contins the options to start an instance.
-     *                                              Required Values:
-     *                                                imageId string        ID of the AMI with which to launch instances.
-     *                                              Optional Values:
-     *                                                minCount integer      Minimum number of instances to launch.
-     *                                                maxCount integer      Maximum number of instances to launch.
-     *                                                keyName string        Name of the key pair with which to launch instances.
-     *                                                securityGruop string|array Names of the security groups with which to associate the instances.
-     *                                                userData string       The user data available to the launched instances. This should not be Base64 encoded.
-     *                                                instanceType constant Specifies the instance type.
-     *                                                placement string      Specifies the availability zone in which to launch the instance(s). By default, Amazon EC2 selects an availability zone for you.
-     *                                                kernelId string       The ID of the kernel with which to launch the instance.
-     *                                                ramdiskId string      The ID of the RAM disk with which to launch the instance.
-     *                                                blockDeviceVirtualName string     Specifies the virtual name to map to the corresponding device name. For example: instancestore0
-     *                                                blockDeviceName string            Specifies the device to which you are mapping a virtual name. For example: sdb
-     *                                                monitor boolean               Turn on CloudWatch Monitoring for an instance.
-     * @return array
-     */
-    public function run(array $options)
-    {
-        $_defaultOptions = array(
-            'minCount'  => 1,
-            'maxCount'  => 1,
-            'instanceType' => Zend_Service_Amazon_Ec2_Instance::SMALL
-        );
-
-        // set / override the defualt optoins if they are not passed into the array;
-        $options = array_merge($_defaultOptions, $options);
-
-        if(!isset($options['imageId'])) {
-            require_once 'Zend/Service/Amazon/Ec2/Exception.php';
-            throw new Zend_Service_Amazon_Ec2_Exception('No Image Id Provided');
-        }
-
-
-        $params = array();
-        $params['Action'] = 'RunInstances';
-        $params['ImageId'] = $options['imageId'];
-        $params['MinCount'] = $options['minCount'];
-        $params['MaxCount'] = $options['maxCount'];
-
-        if(isset($options['keyName'])) {
-            $params['KeyName'] = $options['keyName'];
-        }
-
-        if(is_array($options['securityGroup']) && !empty($options['securityGroup'])) {
-            foreach($options['securityGroup'] as $k=>$name) {
-                $params['SecurityGroup.' . ($k+1)] = $name;
-            }
-        } elseif(isset($options['securityGroup'])) {
-            $params['SecurityGroup.1'] = $options['securityGroup'];
-        }
-
-        if(isset($options['userData'])) {
-            $params['UserData'] = base64_encode($options['userData']);
-        }
-
-        if(isset($options['instanceType'])) {
-            $params['InstanceType'] = $options['instanceType'];
-        }
-
-        if(isset($options['placement'])) {
-            $params['Placement.AvailabilityZone'] = $options['placement'];
-        }
-
-        if(isset($options['kernelId'])) {
-            $params['KernelId'] = $options['kernelId'];
-        }
-
-        if(isset($options['ramdiskId'])) {
-            $params['RamdiskId'] = $options['ramdiskId'];
-        }
-
-        if(isset($options['blockDeviceVirtualName']) && isset($options['blockDeviceName'])) {
-            $params['BlockDeviceMapping.n.VirtualName'] = $options['blockDeviceVirtualName'];
-            $params['BlockDeviceMapping.n.DeviceName'] = $options['blockDeviceName'];
-        }
-
-        if(isset($options['monitor']) && $options['monitor'] === true) {
-            $params['Monitoring.Enabled'] = true;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-
-        $return['reservationId'] = $xpath->evaluate('string(//ec2:reservationId/text())');
-        $return['ownerId'] = $xpath->evaluate('string(//ec2:ownerId/text())');
-
-        $gs = $xpath->query('//ec2:groupSet/ec2:item');
-        foreach($gs as $gs_node) {
-            $return['groupSet'][] = $xpath->evaluate('string(ec2:groupId/text())', $gs_node);
-            unset($gs_node);
-        }
-        unset($gs);
-
-        $is = $xpath->query('//ec2:instancesSet/ec2:item');
-        foreach($is as $is_node) {
-            $item = array();
-
-            $item['instanceId'] = $xpath->evaluate('string(ec2:instanceId/text())', $is_node);
-            $item['imageId'] = $xpath->evaluate('string(ec2:imageId/text())', $is_node);
-            $item['instanceState']['code'] = $xpath->evaluate('string(ec2:instanceState/ec2:code/text())', $is_node);
-            $item['instanceState']['name'] = $xpath->evaluate('string(ec2:instanceState/ec2:name/text())', $is_node);
-            $item['privateDnsName'] = $xpath->evaluate('string(ec2:privateDnsName/text())', $is_node);
-            $item['dnsName'] = $xpath->evaluate('string(ec2:dnsName/text())', $is_node);
-            $item['keyName'] = $xpath->evaluate('string(ec2:keyName/text())', $is_node);
-            $item['instanceType'] = $xpath->evaluate('string(ec2:instanceType/text())', $is_node);
-            $item['amiLaunchIndex'] = $xpath->evaluate('string(ec2:amiLaunchIndex/text())', $is_node);
-            $item['launchTime'] = $xpath->evaluate('string(ec2:launchTime/text())', $is_node);
-            $item['availabilityZone'] = $xpath->evaluate('string(ec2:placement/ec2:availabilityZone/text())', $is_node);
-
-            $return['instances'][] = $item;
-            unset($item);
-            unset($is_node);
-        }
-        unset($is);
-
-        return $return;
-
-    }
-
-    /**
-     * Returns information about instances that you own.
-     *
-     * If you specify one or more instance IDs, Amazon EC2 returns information
-     * for those instances. If you do not specify instance IDs, Amazon EC2
-     * returns information for all relevant instances. If you specify an invalid
-     * instance ID, a fault is returned. If you specify an instance that you do
-     * not own, it will not be included in the returned results.
-     *
-     * Recently terminated instances might appear in the returned results.
-     * This interval is usually less than one hour.
-     *
-     * @param string|array $instaceId       Set of instances IDs of which to get the status.
-     * @param boolean                       Ture to ignore Terminated Instances.
-     * @return array
-     */
-    public function describe($instanceId = null, $ignoreTerminated = false)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['InstanceId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['InstanceId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $nodes = $xpath->query('//ec2:reservationSet/ec2:item');
-
-        $return = array();
-        $return['instances'] = array();
-
-        foreach($nodes as $node) {
-            if($xpath->evaluate('string(ec2:instancesSet/ec2:item/ec2:instanceState/ec2:code/text())', $node) == 48 && $ignoreTerminated) continue;
-            $item = array();
-
-            $item['reservationId'] = $xpath->evaluate('string(ec2:reservationId/text())', $node);
-            $item['ownerId'] = $xpath->evaluate('string(ec2:ownerId/text())', $node);
-
-            $gs = $xpath->query('ec2:groupSet/ec2:item', $node);
-            foreach($gs as $gs_node) {
-                $item['groupSet'][] = $xpath->evaluate('string(ec2:groupId/text())', $gs_node);
-                unset($gs_node);
-            }
-            unset($gs);
-
-            $is = $xpath->query('ec2:instancesSet/ec2:item', $node);
-
-            foreach($is as $is_node) {
-
-                $item['instanceId'] = $xpath->evaluate('string(ec2:instanceId/text())', $is_node);
-                $item['imageId'] = $xpath->evaluate('string(ec2:imageId/text())', $is_node);
-                $item['instanceState']['code'] = $xpath->evaluate('string(ec2:instanceState/ec2:code/text())', $is_node);
-                $item['instanceState']['name'] = $xpath->evaluate('string(ec2:instanceState/ec2:name/text())', $is_node);
-                $item['privateDnsName'] = $xpath->evaluate('string(ec2:privateDnsName/text())', $is_node);
-                $item['dnsName'] = $xpath->evaluate('string(ec2:dnsName/text())', $is_node);
-                $item['keyName'] = $xpath->evaluate('string(ec2:keyName/text())', $is_node);
-                $item['productCode'] = $xpath->evaluate('string(ec2:productCodesSet/ec2:item/ec2:productCode/text())', $is_node);
-                $item['instanceType'] = $xpath->evaluate('string(ec2:instanceType/text())', $is_node);
-                $item['launchTime'] = $xpath->evaluate('string(ec2:launchTime/text())', $is_node);
-                $item['availabilityZone'] = $xpath->evaluate('string(ec2:placement/ec2:availabilityZone/text())', $is_node);
-                $item['kernelId'] = $xpath->evaluate('string(ec2:kernelId/text())', $is_node);
-                $item['ramediskId'] = $xpath->evaluate('string(ec2:ramediskId/text())', $is_node);
-                $item['amiLaunchIndex'] = $xpath->evaluate('string(ec2:amiLaunchIndex/text())', $is_node);
-                $item['monitoringState'] = $xpath->evaluate('string(ec2:monitoring/ec2:state/text())', $is_node);
-
-                unset($is_node);
-            }
-            $return['instances'][] = $item;
-            unset($item);
-            unset($is);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns information about instances that you own that were started from
-     * a specific imageId
-     *
-     * Recently terminated instances might appear in the returned results.
-     * This interval is usually less than one hour.
-     *
-     * @param string $imageId               The imageId used to start the Instance.
-     * @param boolean                       Ture to ignore Terminated Instances.
-     * @return array
-     */
-    public function describeByImageId($imageId, $ignoreTerminated = false)
-    {
-        $arrInstances = $this->describe(null, $ignoreTerminated);
-
-        $return = array();
-
-        foreach($arrInstances['instances'] as $instance) {
-            if($instance['imageId'] !== $imageId) continue;
-            $return[] = $instance;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Shuts down one or more instances. This operation is idempotent; if you terminate
-     * an instance more than once, each call will succeed.
-     *
-     * Terminated instances will remain visible after termination (approximately one hour).
-     *
-     * @param string|array $instanceId      One or more instance IDs returned.
-     * @return array
-     */
-    public function terminate($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'TerminateInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['InstanceId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['InstanceId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $nodes = $xpath->query('//ec2:instancesSet/ec2:item');
-
-        $return = array();
-        foreach($nodes as $node) {
-            $item = array();
-
-            $item['instanceId'] = $xpath->evaluate('string(ec2:instanceId/text())', $node);
-            $item['shutdownState']['code'] = $xpath->evaluate('string(ec2:shutdownState/ec2:code/text())', $node);
-            $item['shutdownState']['name'] = $xpath->evaluate('string(ec2:shutdownState/ec2:name/text())', $node);
-            $item['previousState']['code'] = $xpath->evaluate('string(ec2:previousState/ec2:code/text())', $node);
-            $item['previousState']['name'] = $xpath->evaluate('string(ec2:previousState/ec2:name/text())', $node);
-
-            $return[] = $item;
-            unset($item);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Requests a reboot of one or more instances.
-     *
-     * This operation is asynchronous; it only queues a request to reboot the specified instance(s). The operation
-     * will succeed if the instances are valid and belong to the user. Requests to reboot terminated instances are ignored.
-     *
-     * @param string|array $instanceId  One or more instance IDs.
-     * @return boolean
-     */
-    public function reboot($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'RebootInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['InstanceId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['InstanceId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($return === "true");
-    }
-
-    /**
-     * Retrieves console output for the specified instance.
-     *
-     * Instance console output is buffered and posted shortly after instance boot, reboot, and termination.
-     * Amazon EC2 preserves the most recent 64 KB output which will be available for at least one hour after the most recent post.
-     *
-     * @param string $instanceId       An instance ID
-     * @return array
-     */
-    public function consoleOutput($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'GetConsoleOutput';
-        $params['InstanceId'] = $instanceId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-
-        $return['instanceId'] = $xpath->evaluate('string(//ec2:instanceId/text())');
-        $return['timestamp'] = $xpath->evaluate('string(//ec2:timestamp/text())');
-        $return['output'] = base64_decode($xpath->evaluate('string(//ec2:output/text())'));
-
-        return $return;
-    }
-
-    /**
-     * Returns true if the specified product code is attached to the specified instance.
-     * The operation returns false if the product code is not attached to the instance.
-     *
-     * The confirmProduct operation can only be executed by the owner of the AMI.
-     * This feature is useful when an AMI owner is providing support and wants to
-     * verify whether a user's instance is eligible.
-     *
-     * @param string $productCode           The product code to confirm.
-     * @param string $instanceId            The instance for which to confirm the product code.
-     * @return array|boolean                An array if the product code is attached to the instance, false if it is not.
-     */
-    public function confirmProduct($productCode, $instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'ConfirmProductInstance';
-        $params['ProductCode'] = $productCode;
-        $params['InstanceId'] = $instanceId;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $result = $xpath->evaluate('string(//ec2:result/text())');
-
-        if($result === "true") {
-            $return['result'] = true;
-            $return['ownerId'] = $xpath->evaluate('string(//ec2:ownerId/text())');
-
-            return $return;
-        }
-
-        return false;
-    }
-
-    /**
-    * Turn on Amazon CloudWatch Monitoring for an instance or a list of instances
-    *
-    * @param array|string $instanceId           The instance or list of instances you want to enable monitoring for
-    * @return array
-    */
-    public function monitor($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'MonitorInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['InstanceId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['InstanceId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-
-        $items = $xpath->query('//ec2:instancesSet/ec2:item');
-
-        $arrReturn = array();
-        foreach($items as $item) {
-            $i = array();
-            $i['instanceid'] = $xpath->evaluate('string(//ec2:instanceId/text())', $item);
-            $i['monitorstate'] = $xpath->evaluate('string(//ec2:monitoring/ec2:state/text())');
-            $arrReturn[] = $i;
-            unset($i);
-        }
-
-        return $arrReturn;
-    }
-    /**
-    * Turn off Amazon CloudWatch Monitoring for an instance or a list of instances
-    *
-    * @param array|string $instanceId           The instance or list of instances you want to disable monitoring for
-    * @return array
-    */
-    public function unmonitor($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'UnmonitorInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['InstanceId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['InstanceId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-
-        $items = $xpath->query('//ec2:instancesSet/ec2:item');
-
-        $arrReturn = array();
-        foreach($items as $item) {
-            $i = array();
-            $i['instanceid'] = $xpath->evaluate('string(//ec2:instanceId/text())', $item);
-            $i['monitorstate'] = $xpath->evaluate('string(//ec2:monitoring/ec2:state/text())');
-            $arrReturn[] = $i;
-            unset($i);
-        }
-
-        return $arrReturn;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php
deleted file mode 100644
index e42a5fe0e..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Reserved.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * Allows you to interface with the reserved instances on Amazon Ec2
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Describes Reserved Instances that you purchased.
-     *
-     * @param string|array $instanceId        IDs of the Reserved Instance to describe.
-     * @return array
-     */
-    public function describeInstances($instanceId)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeReservedInstances';
-
-        if(is_array($instanceId) && !empty($instanceId)) {
-            foreach($instanceId as $k=>$name) {
-                $params['ReservedInstancesId.' . ($k+1)] = $name;
-            }
-        } elseif($instanceId) {
-            $params['ReservedInstancesId.1'] = $instanceId;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $items = $xpath->query('//ec2:reservedInstancesSet/ec2:item');
-
-        $return = array();
-        foreach($items as $item) {
-            $i = array();
-            $i['reservedInstancesId'] = $xpath->evaluate('string(ec2:reservedInstancesId/text())', $item);
-            $i['instanceType'] = $xpath->evaluate('string(ec2:instanceType/text())', $item);
-            $i['availabilityZone'] = $xpath->evaluate('string(ec2:availabilityZone/text())', $item);
-            $i['duration'] = $xpath->evaluate('string(ec2:duration/text())', $item);
-            $i['fixedPrice'] = $xpath->evaluate('string(ec2:fixedPrice/text())', $item);
-            $i['usagePrice'] = $xpath->evaluate('string(ec2:usagePrice/text())', $item);
-            $i['productDescription'] = $xpath->evaluate('string(ec2:productDescription/text())', $item);
-            $i['instanceCount'] = $xpath->evaluate('string(ec2:instanceCount/text())', $item);
-            $i['state'] = $xpath->evaluate('string(ec2:state/text())', $item);
-
-            $return[] = $i;
-            unset($i);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Describes Reserved Instance offerings that are available for purchase.
-     * With Amazon EC2 Reserved Instances, you purchase the right to launch Amazon
-     * EC2 instances for a period of time (without getting insufficient capacity
-     * errors) and pay a lower usage rate for the actual time used.
-     *
-     * @return array
-     */
-    public function describeOfferings()
-    {
-        $params = array();
-        $params['Action'] = 'DescribeReservedInstancesOfferings';
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $items = $xpath->query('//ec2:reservedInstancesOfferingsSet/ec2:item');
-
-        $return = array();
-        foreach($items as $item) {
-            $i = array();
-            $i['reservedInstancesOfferingId'] = $xpath->evaluate('string(ec2:reservedInstancesOfferingId/text())', $item);
-            $i['instanceType'] = $xpath->evaluate('string(ec2:instanceType/text())', $item);
-            $i['availabilityZone'] = $xpath->evaluate('string(ec2:availabilityZone/text())', $item);
-            $i['duration'] = $xpath->evaluate('string(ec2:duration/text())', $item);
-            $i['fixedPrice'] = $xpath->evaluate('string(ec2:fixedPrice/text())', $item);
-            $i['usagePrice'] = $xpath->evaluate('string(ec2:usagePrice/text())', $item);
-            $i['productDescription'] = $xpath->evaluate('string(ec2:productDescription/text())', $item);
-
-            $return[] = $i;
-            unset($i);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Purchases a Reserved Instance for use with your account. With Amazon EC2
-     * Reserved Instances, you purchase the right to launch Amazon EC2 instances
-     * for a period of time (without getting insufficient capacity errors) and
-     * pay a lower usage rate for the actual time used.
-     *
-     * @param string $offeringId            The offering ID of the Reserved Instance to purchase
-     * @param integer $intanceCount         The number of Reserved Instances to purchase.
-     * @return string                       The ID of the purchased Reserved Instances.
-     */
-    public function purchaseOffering($offeringId, $intanceCount = 1)
-    {
-        $params = array();
-        $params['Action'] = 'PurchaseReservedInstancesOffering';
-        $params['OfferingId.1'] = $offeringId;
-        $params['instanceCount.1'] = intval($intanceCount);
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $reservedInstancesId = $xpath->evaluate('string(//ec2:reservedInstancesId/text())');
-
-        return $reservedInstancesId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Windows.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Windows.php
deleted file mode 100644
index d28d69c6a..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Instance/Windows.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Windows.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * @see Zend_Crypt_Hmac
- */
-require_once 'Zend/Crypt/Hmac.php';
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * An Amazon EC2 interface that allows yout to run, terminate, reboot and describe Amazon
- * Ec2 Instances.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Bundles an Amazon EC2 instance running Windows
-     *
-     * @param string $instanceId        The instance you want to bundle
-     * @param string $s3Bucket          Where you want the ami to live on S3
-     * @param string $s3Prefix          The prefix you want to assign to the AMI on S3
-     * @param integer $uploadExpiration The expiration of the upload policy.  Amazon recommends 12 hours or longer.
-     *                                  This is based in nubmer of minutes. Default is 1440 minutes (24 hours)
-     * @return array                    containing the information on the new bundle operation
-     */
-    public function bundle($instanceId, $s3Bucket, $s3Prefix, $uploadExpiration = 1440)
-    {
-        $params = array();
-        $params['Action'] = 'BundleInstance';
-        $params['InstanceId'] = $instanceId;
-        $params['Storage.S3.AWSAccessKeyId'] = $this->_getAccessKey();
-        $params['Storage.S3.Bucket'] = $s3Bucket;
-        $params['Storage.S3.Prefix'] = $s3Prefix;
-        $uploadPolicy = $this->_getS3UploadPolicy($s3Bucket, $s3Prefix, $uploadExpiration);
-        $params['Storage.S3.UploadPolicy'] = $uploadPolicy;
-        $params['Storage.S3.UploadPolicySignature'] = $this->_signS3UploadPolicy($uploadPolicy);
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['instanceId'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:instanceId/text())');
-        $return['bundleId'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:bundleId/text())');
-        $return['state'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:state/text())');
-        $return['startTime'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:startTime/text())');
-        $return['updateTime'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:updateTime/text())');
-        $return['progress'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:progress/text())');
-        $return['storage']['s3']['bucket'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:storage/ec2:S3/ec2:bucket/text())');
-        $return['storage']['s3']['prefix'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:storage/ec2:S3/ec2:prefix/text())');
-
-        return $return;
-    }
-
-    /**
-     * Cancels an Amazon EC2 bundling operation
-     *
-     * @param string $bundleId          The ID of the bundle task to cancel
-     * @return array                    Information on the bundle task
-     */
-    public function cancelBundle($bundleId)
-    {
-        $params = array();
-        $params['Action'] = 'CancelBundleTask';
-        $params['BundleId'] = $bundleId;
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['instanceId'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:instanceId/text())');
-        $return['bundleId'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:bundleId/text())');
-        $return['state'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:state/text())');
-        $return['startTime'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:startTime/text())');
-        $return['updateTime'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:updateTime/text())');
-        $return['progress'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:progress/text())');
-        $return['storage']['s3']['bucket'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:storage/ec2:S3/ec2:bucket/text())');
-        $return['storage']['s3']['prefix'] = $xpath->evaluate('string(//ec2:bundleInstanceTask/ec2:storage/ec2:S3/ec2:prefix/text())');
-
-        return $return;
-    }
-
-    /**
-     * Describes current bundling tasks
-     *
-     * @param string|array $bundleId            A single or a list of bundle tasks that you want
-     *                                          to find information for.
-     * @return array                            Information for the task that you requested
-     */
-    public function describeBundle($bundleId = '')
-    {
-        $params = array();
-        $params['Action'] = 'DescribeBundleTasks';
-
-        if(is_array($bundleId) && !empty($bundleId)) {
-            foreach($bundleId as $k=>$name) {
-                $params['bundleId.' . ($k+1)] = $name;
-            }
-        } elseif(!empty($bundleId)) {
-            $params['bundleId.1'] = $bundleId;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-
-        $items = $xpath->evaluate('//ec2:bundleInstanceTasksSet/ec2:item');
-        $return = array();
-
-        foreach($items as $item) {
-            $i = array();
-            $i['instanceId'] = $xpath->evaluate('string(ec2:instanceId/text())', $item);
-            $i['bundleId'] = $xpath->evaluate('string(ec2:bundleId/text())', $item);
-            $i['state'] = $xpath->evaluate('string(ec2:state/text())', $item);
-            $i['startTime'] = $xpath->evaluate('string(ec2:startTime/text())', $item);
-            $i['updateTime'] = $xpath->evaluate('string(ec2:updateTime/text())', $item);
-            $i['progress'] = $xpath->evaluate('string(ec2:progress/text())', $item);
-            $i['storage']['s3']['bucket'] = $xpath->evaluate('string(ec2:storage/ec2:S3/ec2:bucket/text())', $item);
-            $i['storage']['s3']['prefix'] = $xpath->evaluate('string(ec2:storage/ec2:S3/ec2:prefix/text())', $item);
-
-            $return[] = $i;
-            unset($i);
-        }
-
-
-        return $return;
-    }
-
-    /**
-     * Generates the S3 Upload Policy Information
-     *
-     * @param string $bucketName        Which bucket you want the ami to live in on S3
-     * @param string $prefix            The prefix you want to assign to the AMI on S3
-     * @param integer $expireInMinutes  The expiration of the upload policy.  Amazon recommends 12 hours or longer.
-     *                                  This is based in nubmer of minutes. Default is 1440 minutes (24 hours)
-     * @return string                   Base64 encoded string that is the upload policy
-     */
-    protected function _getS3UploadPolicy($bucketName, $prefix, $expireInMinutes = 1440)
-    {
-        $arrParams = array();
-        $arrParams['expiration'] = gmdate("Y-m-d\TH:i:s.\\0\\0\\0\\Z", (time() + ($expireInMinutes * 60)));
-        $arrParams['conditions'][] = array('bucket' => $bucketName);
-        $arrParams['conditions'][] = array('acl' => 'ec2-bundle-read');
-        $arrParams['conditions'][] = array('starts-with', '$key', $prefix);
-
-        return base64_encode(Zend_Json::encode($arrParams));
-    }
-
-    /**
-     * Signed S3 Upload Policy
-     *
-     * @param string $policy            Base64 Encoded string that is the upload policy
-     * @return string                   SHA1 encoded S3 Upload Policy
-     */
-    protected function _signS3UploadPolicy($policy)
-    {
-        $hmac = Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'SHA1', $policy, Zend_Crypt_Hmac::BINARY);
-        return $hmac;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Keypair.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Keypair.php
deleted file mode 100644
index 26dcbb6c0..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Keypair.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Keypair.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to create, delete and describe Ec2 KeyPairs.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Creates a new 2048 bit RSA key pair and returns a unique ID that can
-     * be used to reference this key pair when launching new instances.
-     *
-     * @param string $keyName           A unique name for the key pair.
-     * @throws Zend_Service_Amazon_Ec2_Exception
-     * @return array
-     */
-    public function create($keyName)
-    {
-        $params = array();
-
-        $params['Action'] = 'CreateKeyPair';
-
-        if(!$keyName) {
-            require_once 'Zend/Service/Amazon/Ec2/Exception.php';
-            throw new Zend_Service_Amazon_Ec2_Exception('Invalid Key Name');
-        }
-
-        $params['KeyName'] = $keyName;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-        $return['keyName']          = $xpath->evaluate('string(//ec2:keyName/text())');
-        $return['keyFingerprint']   = $xpath->evaluate('string(//ec2:keyFingerprint/text())');
-        $return['keyMaterial']      = $xpath->evaluate('string(//ec2:keyMaterial/text())');
-
-        return $return;
-    }
-
-    /**
-     * Returns information about key pairs available to you. If you specify
-     * key pairs, information about those key pairs is returned. Otherwise,
-     * information for all registered key pairs is returned.
-     *
-     * @param string|rarray $keyName    Key pair IDs to describe.
-     * @return array
-     */
-    public function describe($keyName = null)
-    {
-        $params = array();
-
-        $params['Action'] = 'DescribeKeyPairs';
-        if(is_array($keyName) && !empty($keyName)) {
-            foreach($keyName as $k=>$name) {
-                $params['KeyName.' . ($k+1)] = $name;
-            }
-        } elseif($keyName) {
-            $params['KeyName.1'] = $keyName;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $nodes  = $xpath->query('//ec2:keySet/ec2:item');
-
-        $return = array();
-        foreach ($nodes as $k => $node) {
-            $item = array();
-            $item['keyName']          = $xpath->evaluate('string(ec2:keyName/text())', $node);
-            $item['keyFingerprint']   = $xpath->evaluate('string(ec2:keyFingerprint/text())', $node);
-
-            $return[] = $item;
-            unset($item);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Deletes a key pair
-     *
-     * @param string $keyName           Name of the key pair to delete.
-     * @throws Zend_Service_Amazon_Ec2_Exception
-     * @return boolean                  Return true or false from the deletion.
-     */
-    public function delete($keyName)
-    {
-        $params = array();
-
-        $params['Action'] = 'DeleteKeyPair';
-
-        if(!$keyName) {
-            require_once 'Zend/Service/Amazon/Ec2/Exception.php';
-            throw new Zend_Service_Amazon_Ec2_Exception('Invalid Key Name');
-        }
-
-        $params['KeyName'] = $keyName;
-
-        $response = $this->sendRequest($params);
-
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($success === "true");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Region.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Region.php
deleted file mode 100644
index 3a254279e..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Region.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Region.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to query which Regions your account has access to.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_Abstract
-{
-
-    /**
-     * Describes availability zones that are currently available to the account
-     * and their states.
-     *
-     * @param string|array $region              Name of an region.
-     * @return array                            An array that contains all the return items.  Keys: regionName and regionUrl.
-     */
-    public function describe($region = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeRegions';
-
-        if(is_array($region) && !empty($region)) {
-            foreach($region as $k=>$name) {
-                $params['Region.' . ($k+1)] = $name;
-            }
-        } elseif($region) {
-            $params['Region.1'] = $region;
-        }
-
-        $response = $this->sendRequest($params);
-
-        $xpath  = $response->getXPath();
-        $nodes  = $xpath->query('//ec2:item');
-
-        $return = array();
-        foreach ($nodes as $k => $node) {
-            $item = array();
-            $item['regionName']   = $xpath->evaluate('string(ec2:regionName/text())', $node);
-            $item['regionUrl']  = $xpath->evaluate('string(ec2:regionUrl/text())', $node);
-
-            $return[] = $item;
-            unset($item);
-        }
-
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Response.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Response.php
deleted file mode 100644
index 65f01cc2d..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Response.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Response {
-    /**
-     * XML namespace used for EC2 responses.
-     */
-    protected $_xmlNamespace = 'http://ec2.amazonaws.com/doc/2009-04-04/';
-
-    /**
-     * The original HTTP response
-     *
-     * This contains the response body and headers.
-     *
-     * @var Zend_Http_Response
-     */
-    private $_httpResponse = null;
-
-    /**
-     * The response document object
-     *
-     * @var DOMDocument
-     */
-    private $_document = null;
-
-    /**
-     * The response XPath
-     *
-     * @var DOMXPath
-     */
-    private $_xpath = null;
-
-    /**
-     * Last error code
-     *
-     * @var integer
-     */
-    private $_errorCode = 0;
-
-    /**
-     * Last error message
-     *
-     * @var string
-     */
-    private $_errorMessage = '';
-
-    /**
-     * Creates a new high-level EC2 response object
-     *
-     * @param Zend_Http_Response $httpResponse the HTTP response.
-     */
-    public function __construct(Zend_Http_Response $httpResponse)
-    {
-        $this->_httpResponse = $httpResponse;
-    }
-
-    /**
-     * Gets the XPath object for this response
-     *
-     * @return DOMXPath the XPath object for response.
-     */
-    public function getXPath()
-    {
-        if ($this->_xpath === null) {
-            $document = $this->getDocument();
-            if ($document === false) {
-                $this->_xpath = false;
-            } else {
-                $this->_xpath = new DOMXPath($document);
-                $this->_xpath->registerNamespace('ec2',
-                    $this->getNamespace());
-            }
-        }
-
-        return $this->_xpath;
-    }
-
-    /**
-     * Gets the document object for this response
-     *
-     * @return DOMDocument the DOM Document for this response.
-     */
-    public function getDocument()
-    {
-        try {
-            $body = $this->_httpResponse->getBody();
-        } catch (Zend_Http_Exception $e) {
-            $body = false;
-        }
-
-        if ($this->_document === null) {
-            if ($body !== false) {
-                // turn off libxml error handling
-                $errors = libxml_use_internal_errors();
-
-                $this->_document = new DOMDocument();
-                if (!$this->_document->loadXML($body)) {
-                    $this->_document = false;
-                }
-
-                // reset libxml error handling
-                libxml_clear_errors();
-                libxml_use_internal_errors($errors);
-            } else {
-                $this->_document = false;
-            }
-        }
-
-        return $this->_document;
-    }
-
-    /**
-     * Return the current set XML Namespace.
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_xmlNamespace;
-    }
-
-    /**
-     * Set a new XML Namespace
-     *
-     * @param string $namespace
-     */
-    public function setNamespace($namespace)
-    {
-        $this->_xmlNamespace = $namespace;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Securitygroups.php b/airtime_mvc/library/Zend/Service/Amazon/Ec2/Securitygroups.php
deleted file mode 100644
index 0764a5819..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Ec2/Securitygroups.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Securitygroups.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Ec2_Abstract
- */
-require_once 'Zend/Service/Amazon/Ec2/Abstract.php';
-
-/**
- * An Amazon EC2 interface to create, delete, describe, grand and revoke sercurity permissions.
- *
- * @category   Zend
- * @package    Zend_Service_Amazon
- * @subpackage Ec2
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abstract
-{
-    /**
-     * Creates a new security group.
-     *
-     * Every instance is launched in a security group. If no security group is specified
-     * during launch, the instances are launched in the default security group. Instances
-     * within the same security group have unrestricted network access to each other.
-     * Instances will reject network access attempts from other instances in a different
-     * security group. As the owner of instances you can grant or revoke specific permissions
-     * using the {@link authorizeIp}, {@link authorizeGroup}, {@link revokeGroup} and
-     * {$link revokeIp} operations.
-     *
-     * @param string $name          Name of the new security group.
-     * @param string $description   Description of the new security group.
-     * @return boolean
-     */
-    public function create($name, $description)
-    {
-        $params = array();
-        $params['Action'] = 'CreateSecurityGroup';
-        $params['GroupName'] = $name;
-        $params['GroupDescription'] = $description;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($success === "true");
-    }
-
-    /**
-     * Returns information about security groups that you own.
-     *
-     * If you specify security group names, information about those security group is returned.
-     * Otherwise, information for all security group is returned. If you specify a group
-     * that does not exist, a fault is returned.
-     *
-     * @param string|array $name    List of security groups to describe
-     * @return array
-     */
-    public function describe($name = null)
-    {
-        $params = array();
-        $params['Action'] = 'DescribeSecurityGroups';
-        if(is_array($name) && !empty($name)) {
-            foreach($name as $k=>$name) {
-                $params['GroupName.' . ($k+1)] = $name;
-            }
-        } elseif($name) {
-            $params['GroupName.1'] = $name;
-        }
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-
-        $return = array();
-
-        $nodes = $xpath->query('//ec2:securityGroupInfo/ec2:item');
-
-        foreach($nodes as $node) {
-            $item = array();
-
-            $item['ownerId'] = $xpath->evaluate('string(ec2:ownerId/text())', $node);
-            $item['groupName'] = $xpath->evaluate('string(ec2:groupName/text())', $node);
-            $item['groupDescription'] = $xpath->evaluate('string(ec2:groupDescription/text())', $node);
-
-            $ip_nodes = $xpath->query('ec2:ipPermissions/ec2:item', $node);
-
-            foreach($ip_nodes as $ip_node) {
-                $sItem = array();
-
-                $sItem['ipProtocol'] = $xpath->evaluate('string(ec2:ipProtocol/text())', $ip_node);
-                $sItem['fromPort'] = $xpath->evaluate('string(ec2:fromPort/text())', $ip_node);
-                $sItem['toPort'] = $xpath->evaluate('string(ec2:toPort/text())', $ip_node);
-
-                $ips = $xpath->query('ec2:ipRanges/ec2:item', $ip_node);
-
-                $sItem['ipRanges'] = array();
-                foreach($ips as $ip) {
-                    $sItem['ipRanges'][] = $xpath->evaluate('string(ec2:cidrIp/text())', $ip);
-                }
-
-                if(count($sItem['ipRanges']) == 1) {
-                    $sItem['ipRanges'] = $sItem['ipRanges'][0];
-                }
-
-                $item['ipPermissions'][] = $sItem;
-                unset($ip_node, $sItem);
-            }
-
-            $return[] = $item;
-
-            unset($item, $node);
-        }
-
-
-        return $return;
-    }
-
-    /**
-     * Deletes a security group.
-     *
-     * If you attempt to delete a security group that contains instances, a fault is returned.
-     * If you attempt to delete a security group that is referenced by another security group,
-     * a fault is returned. For example, if security group B has a rule that allows access
-     * from security group A, security group A cannot be deleted until the allow rule is removed.
-     *
-     * @param string $name          Name of the security group to delete.
-     * @return boolean
-     */
-    public function delete($name)
-    {
-        $params = array();
-        $params['Action'] = 'DeleteSecurityGroup';
-        $params['GroupName'] = $name;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($success === "true");
-    }
-
-    /**
-     * Adds permissions to a security group
-     *
-     * Permissions are specified by the IP protocol (TCP, UDP or ICMP), the source of the request
-     * (by IP range or an Amazon EC2 user-group pair), the source and destination port ranges
-     * (for TCP and UDP), and the ICMP codes and types (for ICMP). When authorizing ICMP, -1
-     * can be used as a wildcard in the type and code fields.
-     *
-     * Permission changes are propagated to instances within the security group as quickly as
-     * possible. However, depending on the number of instances, a small delay might occur.
-     *
-     *
-     * @param string $name                  Name of the group to modify.
-     * @param string $ipProtocol            IP protocol to authorize access to when operating on a CIDR IP.
-     * @param integer $fromPort             Bottom of port range to authorize access to when operating on a CIDR IP.
-     *                                      This contains the ICMP type if ICMP is being authorized.
-     * @param integer $toPort               Top of port range to authorize access to when operating on a CIDR IP.
-     *                                      This contains the ICMP code if ICMP is being authorized.
-     * @param string $cidrIp                CIDR IP range to authorize access to when operating on a CIDR IP.
-     * @return boolean
-     */
-    public function authorizeIp($name, $ipProtocol, $fromPort, $toPort, $cidrIp)
-    {
-        $params = array();
-        $params['Action'] = 'AuthorizeSecurityGroupIngress';
-        $params['GroupName'] = $name;
-        $params['IpProtocol'] = $ipProtocol;
-        $params['FromPort'] = $fromPort;
-        $params['ToPort'] = $toPort;
-        $params['CidrIp'] = $cidrIp;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($success === "true");
-
-    }
-
-    /**
-     * Adds permissions to a security group
-     *
-     * When authorizing a user/group pair permission, GroupName, SourceSecurityGroupName and
-     * SourceSecurityGroupOwnerId must be specified.
-     *
-     * Permission changes are propagated to instances within the security group as quickly as
-     * possible. However, depending on the number of instances, a small delay might occur.
-     *
-     * @param string $name                  Name of the group to modify.
-     * @param string $groupName             Name of security group to authorize access to when operating on a user/group pair.
-     * @param string $ownerId               Owner of security group to authorize access to when operating on a user/group pair.
-     * @return boolean
-     */
-    public function authorizeGroup($name, $groupName, $ownerId)
-    {
-        $params = array();
-        $params['Action'] = 'AuthorizeSecurityGroupIngress';
-        $params['GroupName'] = $name;
-        $params['SourceSecurityGroupName'] = $groupName;
-        $params['SourceSecurityGroupOwnerId'] = $ownerId;
-
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-
-        return ($success === "true");
-    }
-
-    /**
-     * Revokes permissions from a security group. The permissions used to revoke must be specified
-     * using the same values used to grant the permissions.
-     *
-     * Permissions are specified by the IP protocol (TCP, UDP or ICMP), the source of the request
-     * (by IP range or an Amazon EC2 user-group pair), the source and destination port ranges
-     * (for TCP and UDP), and the ICMP codes and types (for ICMP). When authorizing ICMP, -1
-     * can be used as a wildcard in the type and code fields.
-     *
-     * Permission changes are propagated to instances within the security group as quickly as
-     * possible. However, depending on the number of instances, a small delay might occur.
-     *
-     *
-     * @param string $name                  Name of the group to modify.
-     * @param string $ipProtocol            IP protocol to revoke access to when operating on a CIDR IP.
-     * @param integer $fromPort             Bottom of port range to revoke access to when operating on a CIDR IP.
-     *                                      This contains the ICMP type if ICMP is being revoked.
-     * @param integer $toPort               Top of port range to revoked access to when operating on a CIDR IP.
-     *                                      This contains the ICMP code if ICMP is being revoked.
-     * @param string $cidrIp                CIDR IP range to revoke access to when operating on a CIDR IP.
-     * @return boolean
-     */
-    public function revokeIp($name, $ipProtocol, $fromPort, $toPort, $cidrIp)
-    {
-        $params = array();
-        $params['Action'] = 'RevokeSecurityGroupIngress';
-        $params['GroupName'] = $name;
-        $params['IpProtocol'] = $ipProtocol;
-        $params['FromPort'] = $fromPort;
-        $params['ToPort'] = $toPort;
-        $params['CidrIp'] = $cidrIp;
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-        return ($success === "true");
-    }
-
-    /**
-     * Revokes permissions from a security group. The permissions used to revoke must be specified
-     * using the same values used to grant the permissions.
-     *
-     * Permission changes are propagated to instances within the security group as quickly as
-     * possible. However, depending on the number of instances, a small delay might occur.
-     *
-     * When revoking a user/group pair permission, GroupName, SourceSecurityGroupName and
-     * SourceSecurityGroupOwnerId must be specified.
-     *
-     * @param string $name                  Name of the group to modify.
-     * @param string $groupName             Name of security group to revoke access to when operating on a user/group pair.
-     * @param string $ownerId               Owner of security group to revoke access to when operating on a user/group pair.
-     * @return boolean
-     */
-    public function revokeGroup($name, $groupName, $ownerId)
-    {
-        $params = array();
-        $params['Action'] = 'RevokeSecurityGroupIngress';
-        $params['GroupName'] = $name;
-        $params['SourceSecurityGroupName'] = $groupName;
-        $params['SourceSecurityGroupOwnerId'] = $ownerId;
-
-
-        $response = $this->sendRequest($params);
-        $xpath = $response->getXPath();
-        $success  = $xpath->evaluate('string(//ec2:return/text())');
-
-
-        return ($success === "true");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/EditorialReview.php b/airtime_mvc/library/Zend/Service/Amazon/EditorialReview.php
deleted file mode 100644
index 2eedc9042..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/EditorialReview.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EditorialReview.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_EditorialReview
-{
-    /**
-     * @var string
-     */
-    public $Source;
-
-    /**
-     * @var string
-     */
-    public $Content;
-
-    /**
-     * Assigns values to properties relevant to EditorialReview
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        foreach (array('Source', 'Content') as $el) {
-            $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Exception.php b/airtime_mvc/library/Zend/Service/Amazon/Exception.php
deleted file mode 100644
index e580279d6..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Image.php b/airtime_mvc/library/Zend/Service/Amazon/Image.php
deleted file mode 100644
index c03b308c9..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Image.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Image
-{
-    /**
-     * Image URL
-     *
-     * @var Zend_Uri
-     */
-    public $Url;
-
-    /**
-     * Image height in pixels
-     *
-     * @var int
-     */
-    public $Height;
-
-    /**
-     * Image width in pixels
-     *
-     * @var int
-     */
-    public $Width;
-
-    /**
-     * Assigns values to properties relevant to Image
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        $this->Url = Zend_Uri::factory($xpath->query('./az:URL/text()', $dom)->item(0)->data);
-        $this->Height = (int) $xpath->query('./az:Height/text()', $dom)->item(0)->data;
-        $this->Width = (int) $xpath->query('./az:Width/text()', $dom)->item(0)->data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Item.php b/airtime_mvc/library/Zend/Service/Amazon/Item.php
deleted file mode 100644
index 066d4de7b..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Item.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Item
-{
-    /**
-     * @var string
-     */
-    public $ASIN;
-
-    /**
-     * @var string
-     */
-    public $DetailPageURL;
-
-    /**
-     * @var int
-     */
-    public $SalesRank;
-
-    /**
-     * @var int
-     */
-    public $TotalReviews;
-
-    /**
-     * @var int
-     */
-    public $AverageRating;
-
-    /**
-     * @var string
-     */
-    public $SmallImage;
-
-    /**
-     * @var string
-     */
-    public $MediumImage;
-
-    /**
-     * @var string
-     */
-    public $LargeImage;
-
-    /**
-     * @var string
-     */
-    public $Subjects;
-
-    /**
-     * @var Zend_Service_Amazon_OfferSet
-     */
-    public $Offers;
-
-    /**
-     * @var Zend_Service_Amazon_CustomerReview[]
-     */
-    public $CustomerReviews = array();
-
-    /**
-     * @var Zend_Service_Amazon_SimilarProducts[]
-     */
-    public $SimilarProducts = array();
-
-    /**
-     * @var Zend_Service_Amazon_Accessories[]
-     */
-    public $Accessories = array();
-
-    /**
-     * @var array
-     */
-    public $Tracks = array();
-
-    /**
-     * @var Zend_Service_Amazon_ListmaniaLists[]
-     */
-    public $ListmaniaLists = array();
-
-    protected $_dom;
-
-
-    /**
-     * Parse the given <Item> element
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data;
-
-        $result = $xpath->query('./az:DetailPageURL/text()', $dom);
-        if ($result->length == 1) {
-            $this->DetailPageURL = $result->item(0)->data;
-        }
-
-        if ($xpath->query('./az:ItemAttributes/az:ListPrice', $dom)->length >= 1) {
-            $this->CurrencyCode = (string) $xpath->query('./az:ItemAttributes/az:ListPrice/az:CurrencyCode/text()', $dom)->item(0)->data;
-            $this->Amount = (int) $xpath->query('./az:ItemAttributes/az:ListPrice/az:Amount/text()', $dom)->item(0)->data;
-            $this->FormattedPrice = (string) $xpath->query('./az:ItemAttributes/az:ListPrice/az:FormattedPrice/text()', $dom)->item(0)->data;
-        }
-
-        $result = $xpath->query('./az:ItemAttributes/az:*/text()', $dom);
-        if ($result->length >= 1) {
-            foreach ($result as $v) {
-                if (isset($this->{$v->parentNode->tagName})) {
-                    if (is_array($this->{$v->parentNode->tagName})) {
-                        array_push($this->{$v->parentNode->tagName}, (string) $v->data);
-                    } else {
-                        $this->{$v->parentNode->tagName} = array($this->{$v->parentNode->tagName}, (string) $v->data);
-                    }
-                } else {
-                    $this->{$v->parentNode->tagName} = (string) $v->data;
-                }
-            }
-        }
-
-        foreach (array('SmallImage', 'MediumImage', 'LargeImage') as $im) {
-            $result = $xpath->query("./az:ImageSets/az:ImageSet[position() = 1]/az:$im", $dom);
-            if ($result->length == 1) {
-                /**
-                 * @see Zend_Service_Amazon_Image
-                 */
-                require_once 'Zend/Service/Amazon/Image.php';
-                $this->$im = new Zend_Service_Amazon_Image($result->item(0));
-            }
-        }
-
-        $result = $xpath->query('./az:SalesRank/text()', $dom);
-        if ($result->length == 1) {
-            $this->SalesRank = (int) $result->item(0)->data;
-        }
-
-        $result = $xpath->query('./az:CustomerReviews/az:Review', $dom);
-        if ($result->length >= 1) {
-            /**
-             * @see Zend_Service_Amazon_CustomerReview
-             */
-            require_once 'Zend/Service/Amazon/CustomerReview.php';
-            foreach ($result as $review) {
-                $this->CustomerReviews[] = new Zend_Service_Amazon_CustomerReview($review);
-            }
-            $this->AverageRating = (float) $xpath->query('./az:CustomerReviews/az:AverageRating/text()', $dom)->item(0)->data;
-            $this->TotalReviews = (int) $xpath->query('./az:CustomerReviews/az:TotalReviews/text()', $dom)->item(0)->data;
-        }
-
-        $result = $xpath->query('./az:EditorialReviews/az:*', $dom);
-        if ($result->length >= 1) {
-            /**
-             * @see Zend_Service_Amazon_EditorialReview
-             */
-            require_once 'Zend/Service/Amazon/EditorialReview.php';
-            foreach ($result as $r) {
-                $this->EditorialReviews[] = new Zend_Service_Amazon_EditorialReview($r);
-            }
-        }
-
-        $result = $xpath->query('./az:SimilarProducts/az:*', $dom);
-        if ($result->length >= 1) {
-            /**
-             * @see Zend_Service_Amazon_SimilarProduct
-             */
-            require_once 'Zend/Service/Amazon/SimilarProduct.php';
-            foreach ($result as $r) {
-                $this->SimilarProducts[] = new Zend_Service_Amazon_SimilarProduct($r);
-            }
-        }
-
-        $result = $xpath->query('./az:ListmaniaLists/*', $dom);
-        if ($result->length >= 1) {
-            /**
-             * @see Zend_Service_Amazon_ListmaniaList
-             */
-            require_once 'Zend/Service/Amazon/ListmaniaList.php';
-            foreach ($result as $r) {
-                $this->ListmaniaLists[] = new Zend_Service_Amazon_ListmaniaList($r);
-            }
-        }
-
-        $result = $xpath->query('./az:Tracks/az:Disc', $dom);
-        if ($result->length > 1) {
-            foreach ($result as $disk) {
-                foreach ($xpath->query('./*/text()', $disk) as $t) {
-                    // TODO: For consistency in a bugfix all tracks are appended to one single array
-                    // Erroreous line: $this->Tracks[$disk->getAttribute('number')] = (string) $t->data;
-                    $this->Tracks[] = (string) $t->data;
-                }
-            }
-        } else if ($result->length == 1) {
-            foreach ($xpath->query('./*/text()', $result->item(0)) as $t) {
-                $this->Tracks[] = (string) $t->data;
-            }
-        }
-
-        $result = $xpath->query('./az:Offers', $dom);
-        $resultSummary = $xpath->query('./az:OfferSummary', $dom);
-        if ($result->length > 1 || $resultSummary->length == 1) {
-            /**
-             * @see Zend_Service_Amazon_OfferSet
-             */
-            require_once 'Zend/Service/Amazon/OfferSet.php';
-            $this->Offers = new Zend_Service_Amazon_OfferSet($dom);
-        }
-
-        $result = $xpath->query('./az:Accessories/*', $dom);
-        if ($result->length > 1) {
-            /**
-             * @see Zend_Service_Amazon_Accessories
-             */
-            require_once 'Zend/Service/Amazon/Accessories.php';
-            foreach ($result as $r) {
-                $this->Accessories[] = new Zend_Service_Amazon_Accessories($r);
-            }
-        }
-
-        $this->_dom = $dom;
-    }
-
-
-    /**
-     * Returns the item's original XML
-     *
-     * @return string
-     */
-    public function asXml()
-    {
-        return $this->_dom->ownerDocument->saveXML($this->_dom);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/ListmaniaList.php b/airtime_mvc/library/Zend/Service/Amazon/ListmaniaList.php
deleted file mode 100644
index d13f02733..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/ListmaniaList.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ListmaniaList.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_ListmaniaList
-{
-    /**
-     * @var string
-     */
-    public $ListId;
-
-    /**
-     * @var string
-     */
-    public $ListName;
-
-    /**
-     * Assigns values to properties relevant to ListmaniaList
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        foreach (array('ListId', 'ListName') as $el) {
-            $this->$el = (string) $xpath->query("./az:$el/text()", $dom)->item(0)->data;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Offer.php b/airtime_mvc/library/Zend/Service/Amazon/Offer.php
deleted file mode 100644
index f6f111d8f..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Offer.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Offer.php 21155 2010-02-23 17:11:12Z matthew $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Offer
-{
-    /**
-     * @var string
-     */
-    public $MerchantId;
-
-    /**
-     * @var string
-     */
-    public $MerchantName;
-
-    /**
-     * @var string
-     */
-    public $GlancePage;
-
-    /**
-     * @var string
-     */
-    public $Condition;
-
-    /**
-     * @var string
-     */
-    public $OfferListingId;
-
-    /**
-     * @var string
-     */
-    public $Price;
-
-    /**
-     * @var string
-     */
-    public $CurrencyCode;
-
-    /**
-     * @var string
-     */
-    public $Availability;
-
-    /**
-     * @var boolean
-     */
-    public $IsEligibleForSuperSaverShipping = false;
-
-    /**
-     * Parse the given Offer element
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        $this->MerchantId = (string) $xpath->query('./az:Merchant/az:MerchantId/text()', $dom)->item(0)->data;
-        $name = $xpath->query('./az:Merchant/az:Name/text()', $dom);
-        if ($name->length == 1) {
-          $this->MerchantName = (string) $name->item(0)->data;
-        }
-        $this->GlancePage = (string) $xpath->query('./az:Merchant/az:GlancePage/text()', $dom)->item(0)->data;
-        $this->Condition = (string) $xpath->query('./az:OfferAttributes/az:Condition/text()', $dom)->item(0)->data;
-        $this->OfferListingId = (string) $xpath->query('./az:OfferListing/az:OfferListingId/text()', $dom)->item(0)->data;
-        $Price = $xpath->query('./az:OfferListing/az:Price/az:Amount', $dom);
-        if ($Price->length == 1) {
-            $this->Price = (int) $xpath->query('./az:OfferListing/az:Price/az:Amount/text()', $dom)->item(0)->data;
-            $this->CurrencyCode = (string) $xpath->query('./az:OfferListing/az:Price/az:CurrencyCode/text()', $dom)->item(0)->data;
-        }
-        $availability = $xpath->query('./az:OfferListing/az:Availability/text()', $dom)->item(0);
-        if($availability instanceof DOMText) {
-            $this->Availability = (string) $availability->data;
-        }
-        $result = $xpath->query('./az:OfferListing/az:IsEligibleForSuperSaverShipping/text()', $dom);
-        if ($result->length >= 1) {
-            $this->IsEligibleForSuperSaverShipping = (bool) $result->item(0)->data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/Amazon/OfferSet.php b/airtime_mvc/library/Zend/Service/Amazon/OfferSet.php
deleted file mode 100644
index de3654bf2..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/OfferSet.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OfferSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_OfferSet
-{
-    /**
-     * @var string
-     */
-    public $LowestNewPrice;
-
-    /**
-     * @var string
-     */
-    public $LowestNewPriceCurrency;
-
-    /**
-     * @var string
-     */
-    public $LowestUsedPrice;
-
-    /**
-     * @var string
-     */
-    public $LowestUsedPriceCurrency;
-
-    /**
-     * @var int
-     */
-    public $TotalNew;
-
-    /**
-     * @var int
-     */
-    public $TotalUsed;
-
-    /**
-     * @var int
-     */
-    public $TotalCollectible;
-
-    /**
-     * @var int
-     */
-    public $TotalRefurbished;
-
-    /**
-     * @var Zend_Service_Amazon_Offer[]
-     */
-    public $Offers;
-
-    /**
-     * Parse the given Offer Set Element
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-
-        $offer = $xpath->query('./az:OfferSummary', $dom);
-        if ($offer->length == 1) {
-            $lowestNewPrice = $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:Amount', $dom);
-            if ($lowestNewPrice->length == 1) {
-                $this->LowestNewPrice = (int) $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:Amount/text()', $dom)->item(0)->data;
-                $this->LowestNewPriceCurrency = (string) $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:CurrencyCode/text()', $dom)->item(0)->data;
-            }
-            $lowestUsedPrice = $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:Amount', $dom);
-            if ($lowestUsedPrice->length == 1) {
-                $this->LowestUsedPrice = (int) $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:Amount/text()', $dom)->item(0)->data;
-                $this->LowestUsedPriceCurrency = (string) $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:CurrencyCode/text()', $dom)->item(0)->data;
-            }
-            $this->TotalNew = (int) $xpath->query('./az:OfferSummary/az:TotalNew/text()', $dom)->item(0)->data;
-            $this->TotalUsed = (int) $xpath->query('./az:OfferSummary/az:TotalUsed/text()', $dom)->item(0)->data;
-            $this->TotalCollectible = (int) $xpath->query('./az:OfferSummary/az:TotalCollectible/text()', $dom)->item(0)->data;
-            $this->TotalRefurbished = (int) $xpath->query('./az:OfferSummary/az:TotalRefurbished/text()', $dom)->item(0)->data;
-        }
-        $offers = $xpath->query('./az:Offers/az:Offer', $dom);
-        if ($offers->length >= 1) {
-            /**
-             * @see Zend_Service_Amazon_Offer
-             */
-            require_once 'Zend/Service/Amazon/Offer.php';
-            foreach ($offers as $offer) {
-                $this->Offers[] = new Zend_Service_Amazon_Offer($offer);
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Query.php b/airtime_mvc/library/Zend/Service/Amazon/Query.php
deleted file mode 100644
index d97c3be78..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Query.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Amazon
- */
-require_once 'Zend/Service/Amazon.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Query extends Zend_Service_Amazon
-{
-    /**
-     * Search parameters
-     *
-     * @var array
-     */
-    protected $_search = array();
-
-    /**
-     * Search index
-     *
-     * @var string
-     */
-    protected $_searchIndex = null;
-
-    /**
-     * Prepares query parameters
-     *
-     * @param  string $method
-     * @param  array  $args
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Amazon_Query Provides a fluent interface
-     */
-    public function __call($method, $args)
-    {
-        if (strtolower($method) === 'asin') {
-            $this->_searchIndex = 'asin';
-            $this->_search['ItemId'] = $args[0];
-            return $this;
-        }
-
-        if (strtolower($method) === 'category') {
-            $this->_searchIndex = $args[0];
-            $this->_search['SearchIndex'] = $args[0];
-        } else if (isset($this->_search['SearchIndex']) || $this->_searchIndex !== null || $this->_searchIndex === 'asin') {
-            $this->_search[$method] = $args[0];
-        } else {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('You must set a category before setting the search parameters');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Search using the prepared query
-     *
-     * @return Zend_Service_Amazon_Item|Zend_Service_Amazon_ResultSet
-     */
-    public function search()
-    {
-        if ($this->_searchIndex === 'asin') {
-            return $this->itemLookup($this->_search['ItemId'], $this->_search);
-        }
-        return $this->itemSearch($this->_search);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/ResultSet.php b/airtime_mvc/library/Zend/Service/Amazon/ResultSet.php
deleted file mode 100644
index 9aac14e54..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/ResultSet.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Amazon_Item
- */
-require_once 'Zend/Service/Amazon/Item.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_ResultSet implements SeekableIterator
-{
-    /**
-     * A DOMNodeList of <Item> elements
-     *
-     * @var DOMNodeList
-     */
-    protected $_results = null;
-
-    /**
-     * Amazon Web Service Return Document
-     *
-     * @var DOMDocument
-     */
-    protected $_dom;
-
-    /**
-     * XPath Object for $this->_dom
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath;
-
-    /**
-     * Current index for SeekableIterator
-     *
-     * @var int
-     */
-    protected $_currentIndex = 0;
-
-    /**
-     * Create an instance of Zend_Service_Amazon_ResultSet and create the necessary data objects
-     *
-     * @param  DOMDocument $dom
-     * @return void
-     */
-    public function __construct(DOMDocument $dom)
-    {
-        $this->_dom = $dom;
-        $this->_xpath = new DOMXPath($dom);
-        $this->_xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        $this->_results = $this->_xpath->query('//az:Item');
-    }
-
-    /**
-     * Total Number of results returned
-     *
-     * @return int Total number of results returned
-     */
-    public function totalResults()
-    {
-        $result = $this->_xpath->query('//az:TotalResults/text()');
-        return (int) $result->item(0)->data;
-    }
-
-    /**
-     * Total Number of pages returned
-     *
-     * @return int Total number of pages returned
-     */
-    public function totalPages()
-    {
-        $result = $this->_xpath->query('//az:TotalPages/text()');
-        return (int) $result->item(0)->data;
-    }
-
-    /**
-     * Implement SeekableIterator::current()
-     *
-     * @return Zend_Service_Amazon_Item
-     */
-    public function current()
-    {
-        return new Zend_Service_Amazon_Item($this->_results->item($this->_currentIndex));
-    }
-
-    /**
-     * Implement SeekableIterator::key()
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_currentIndex;
-    }
-
-    /**
-     * Implement SeekableIterator::next()
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_currentIndex += 1;
-    }
-
-    /**
-     * Implement SeekableIterator::rewind()
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_currentIndex = 0;
-    }
-
-    /**
-     * Implement SeekableIterator::seek()
-     *
-     * @param  int $index
-     * @throws OutOfBoundsException
-     * @return void
-     */
-    public function seek($index)
-    {
-        $indexInt = (int) $index;
-        if ($indexInt >= 0 && (null === $this->_results || $indexInt < $this->_results->length)) {
-            $this->_currentIndex = $indexInt;
-        } else {
-            throw new OutOfBoundsException("Illegal index '$index'");
-        }
-    }
-
-    /**
-     * Implement SeekableIterator::valid()
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return null !== $this->_results && $this->_currentIndex < $this->_results->length;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/S3.php b/airtime_mvc/library/Zend/Service/Amazon/S3.php
deleted file mode 100644
index c1e422084..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/S3.php
+++ /dev/null
@@ -1,900 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: S3.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_Abstract
- */
-require_once 'Zend/Service/Amazon/Abstract.php';
-
-/**
- * @see Zend_Crypt_Hmac
- */
-require_once 'Zend/Crypt/Hmac.php';
-
-/**
- * Amazon S3 PHP connection class
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
- */
-class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
-{
-    /**
-     * Store for stream wrapper clients
-     *
-     * @var array
-     */
-    protected static $_wrapperClients = array();
-
-    /**
-     * Endpoint for the service
-     *
-     * @var Zend_Uri_Http
-     */
-    protected $_endpoint;
-
-    const S3_ENDPOINT = 's3.amazonaws.com';
-
-    const S3_ACL_PRIVATE = 'private';
-    const S3_ACL_PUBLIC_READ = 'public-read';
-    const S3_ACL_PUBLIC_WRITE = 'public-read-write';
-    const S3_ACL_AUTH_READ = 'authenticated-read';
-
-    const S3_REQUESTPAY_HEADER = 'x-amz-request-payer';
-    const S3_ACL_HEADER = 'x-amz-acl';
-    const S3_CONTENT_TYPE_HEADER = 'Content-Type';
-
-    /**
-     * Set S3 endpoint to use
-     *
-     * @param string|Zend_Uri_Http $endpoint
-     * @return Zend_Service_Amazon_S3
-     */
-    public function setEndpoint($endpoint)
-    {
-        if (!($endpoint instanceof Zend_Uri_Http)) {
-            $endpoint = Zend_Uri::factory($endpoint);
-        }
-        if (!$endpoint->valid()) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception('Invalid endpoint supplied');
-        }
-        $this->_endpoint = $endpoint;
-        return $this;
-    }
-
-    /**
-     * Get current S3 endpoint
-     *
-     * @return Zend_Uri_Http
-     */
-    public function getEndpoint()
-    {
-        return $this->_endpoint;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param string $accessKey
-     * @param string $secretKey
-     * @param string $region
-     */
-    public function __construct($accessKey=null, $secretKey=null, $region=null)
-    {
-        parent::__construct($accessKey, $secretKey, $region);
-
-        $this->setEndpoint('http://'.self::S3_ENDPOINT);
-    }
-
-    /**
-     * Verify if the bucket name is valid
-     *
-     * @param string $bucket
-     * @return boolean
-     */
-    public function _validBucketName($bucket)
-    {
-        $len = strlen($bucket);
-        if ($len < 3 || $len > 255) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Bucket name \"$bucket\" must be between 3 and 255 characters long");
-        }
-
-        if (preg_match('/[^a-z0-9\._-]/', $bucket)) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Bucket name \"$bucket\" contains invalid characters");
-        }
-
-        if (preg_match('/(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/', $bucket)) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Bucket name \"$bucket\" cannot be an IP address");
-        }
-        return true;
-    }
-
-    /**
-     * Add a new bucket
-     *
-     * @param  string $bucket
-     * @return boolean
-     */
-    public function createBucket($bucket, $location = null)
-    {
-        $this->_validBucketName($bucket);
-
-        if($location) {
-            $data = '<CreateBucketConfiguration><LocationConstraint>'.$location.'</LocationConstraint></CreateBucketConfiguration>';
-        }
-        else {
-            $data = null;
-        }
-        $response = $this->_makeRequest('PUT', $bucket, null, array(), $data);
-
-        return ($response->getStatus() == 200);
-    }
-
-    /**
-     * Checks if a given bucket name is available
-     *
-     * @param  string $bucket
-     * @return boolean
-     */
-    public function isBucketAvailable($bucket)
-    {
-        $response = $this->_makeRequest('HEAD', $bucket, array('max-keys'=>0));
-
-        return ($response->getStatus() != 404);
-    }
-
-    /**
-     * Checks if a given object exists
-     *
-     * @param  string $object
-     * @return boolean
-     */
-    public function isObjectAvailable($object)
-    {
-        $response = $this->_makeRequest('HEAD', $object);
-
-        return ($response->getStatus() == 200);
-    }
-
-    /**
-     * Remove a given bucket. All objects in the bucket must be removed prior
-     * to removing the bucket.
-     *
-     * @param  string $bucket
-     * @return boolean
-     */
-    public function removeBucket($bucket)
-    {
-        $response = $this->_makeRequest('DELETE', $bucket);
-
-        // Look for a 204 No Content response
-        return ($response->getStatus() == 204);
-    }
-
-    /**
-     * Get metadata information for a given object
-     *
-     * @param  string $object
-     * @return array|false
-     */
-    public function getInfo($object)
-    {
-        $info = array();
-
-        $object = $this->_fixupObjectName($object);
-        $response = $this->_makeRequest('HEAD', $object);
-
-        if ($response->getStatus() == 200) {
-            $info['type'] = $response->getHeader('Content-type');
-            $info['size'] = $response->getHeader('Content-length');
-            $info['mtime'] = strtotime($response->getHeader('Last-modified'));
-            $info['etag'] = $response->getHeader('ETag');
-        }
-        else {
-            return false;
-        }
-
-        return $info;
-    }
-
-    /**
-     * List the S3 buckets
-     *
-     * @return array|false
-     */
-    public function getBuckets()
-    {
-        $response = $this->_makeRequest('GET');
-
-        if ($response->getStatus() != 200) {
-            return false;
-        }
-
-        $xml = new SimpleXMLElement($response->getBody());
-
-        $buckets = array();
-        foreach ($xml->Buckets->Bucket as $bucket) {
-            $buckets[] = (string)$bucket->Name;
-        }
-
-        return $buckets;
-    }
-
-    /**
-     * Remove all objects in the bucket.
-     *
-     * @param string $bucket
-     * @return boolean
-     */
-    public function cleanBucket($bucket)
-    {
-        $objects = $this->getObjectsByBucket($bucket);
-        if (!$objects) {
-            return false;
-        }
-
-        foreach ($objects as $object) {
-            $this->removeObject("$bucket/$object");
-        }
-        return true;
-    }
-
-    /**
-     * List the objects in a bucket.
-     *
-     * Provides the list of object keys that are contained in the bucket.  Valid params include the following.
-     * prefix - Limits the response to keys which begin with the indicated prefix. You can use prefixes to separate a bucket into different sets of keys in a way similar to how a file system uses folders.
-     * marker - Indicates where in the bucket to begin listing. The list will only include keys that occur lexicographically after marker. This is convenient for pagination: To get the next page of results use the last key of the current page as the marker.
-     * max-keys - The maximum number of keys you'd like to see in the response body. The server might return fewer than this many keys, but will not return more.
-     * delimiter - Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response.
-     *
-     * @param  string $bucket
-     * @param array $params S3 GET Bucket Paramater
-     * @return array|false
-     */
-    public function getObjectsByBucket($bucket, $params = array())
-    {
-        $response = $this->_makeRequest('GET', $bucket, $params);
-
-        if ($response->getStatus() != 200) {
-            return false;
-        }
-
-        $xml = new SimpleXMLElement($response->getBody());
-
-        $objects = array();
-        if (isset($xml->Contents)) {
-            foreach ($xml->Contents as $contents) {
-                foreach ($contents->Key as $object) {
-                    $objects[] = (string)$object;
-                }
-            }
-        }
-
-        return $objects;
-    }
-
-    /**
-     * Make sure the object name is valid
-     *
-     * @param  string $object
-     * @return string
-     */
-    protected function _fixupObjectName($object)
-    {
-        $nameparts = explode('/', $object);
-
-        $this->_validBucketName($nameparts[0]);
-
-        $firstpart = array_shift($nameparts);
-        if (count($nameparts) == 0) {
-            return $firstpart;
-        }
-
-        return $firstpart.'/'.join('/', array_map('rawurlencode', $nameparts));
-    }
-
-    /**
-     * Get an object
-     *
-     * @param  string $object
-     * @param  bool   $paidobject This is "requestor pays" object
-     * @return string|false
-     */
-    public function getObject($object, $paidobject=false)
-    {
-        $object = $this->_fixupObjectName($object);
-        if ($paidobject) {
-            $response = $this->_makeRequest('GET', $object, null, array(self::S3_REQUESTPAY_HEADER => 'requester'));
-        }
-        else {
-            $response = $this->_makeRequest('GET', $object);
-        }
-
-        if ($response->getStatus() != 200) {
-            return false;
-        }
-
-        return $response->getBody();
-    }
-
-    /**
-     * Get an object using streaming
-     *
-     * Can use either provided filename for storage or create a temp file if none provided.
-     *
-     * @param  string $object Object path
-     * @param  string $streamfile File to write the stream to
-     * @param  bool   $paidobject This is "requestor pays" object
-     * @return Zend_Http_Response_Stream|false
-     */
-    public function getObjectStream($object, $streamfile = null, $paidobject=false)
-    {
-        $object = $this->_fixupObjectName($object);
-        self::getHttpClient()->setStream($streamfile?$streamfile:true);
-        if ($paidobject) {
-            $response = $this->_makeRequest('GET', $object, null, array(self::S3_REQUESTPAY_HEADER => 'requester'));
-        }
-        else {
-            $response = $this->_makeRequest('GET', $object);
-        }
-        self::getHttpClient()->setStream(null);
-
-        if ($response->getStatus() != 200 || !($response instanceof Zend_Http_Response_Stream)) {
-            return false;
-        }
-
-        return $response;
-    }
-
-    /**
-     * Upload an object by a PHP string
-     *
-     * @param  string $object Object name
-     * @param  string|resource $data   Object data (can be string or stream)
-     * @param  array  $meta   Metadata
-     * @return boolean
-     */
-    public function putObject($object, $data, $meta=null)
-    {
-        $object = $this->_fixupObjectName($object);
-        $headers = (is_array($meta)) ? $meta : array();
-
-        if(!is_resource($data)) {
-            $headers['Content-MD5'] = base64_encode(md5($data, true));
-        }
-        $headers['Expect'] = '100-continue';
-
-        if (!isset($headers[self::S3_CONTENT_TYPE_HEADER])) {
-            $headers[self::S3_CONTENT_TYPE_HEADER] = self::getMimeType($object);
-        }
-
-        $response = $this->_makeRequest('PUT', $object, null, $headers, $data);
-
-        // Check the MD5 Etag returned by S3 against and MD5 of the buffer
-        if ($response->getStatus() == 200) {
-            // It is escaped by double quotes for some reason
-            $etag = str_replace('"', '', $response->getHeader('Etag'));
-
-            if (is_resource($data) || $etag == md5($data)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Put file to S3 as object
-     *
-     * @param string $path   File name
-     * @param string $object Object name
-     * @param array  $meta   Metadata
-     * @return boolean
-     */
-    public function putFile($path, $object, $meta=null)
-    {
-        $data = @file_get_contents($path);
-        if ($data === false) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Cannot read file $path");
-        }
-
-        if (!is_array($meta)) {
-            $meta = array();
-        }
-
-        if (!isset($meta[self::S3_CONTENT_TYPE_HEADER])) {
-           $meta[self::S3_CONTENT_TYPE_HEADER] = self::getMimeType($path);
-        }
-
-        return $this->putObject($object, $data, $meta);
-    }
-
-    /**
-     * Put file to S3 as object, using streaming
-     *
-     * @param string $path   File name
-     * @param string $object Object name
-     * @param array  $meta   Metadata
-     * @return boolean
-     */
-    public function putFileStream($path, $object, $meta=null)
-    {
-        $data = @fopen($path, "rb");
-        if ($data === false) {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Cannot open file $path");
-        }
-
-        if (!is_array($meta)) {
-            $meta = array();
-        }
-
-        if (!isset($meta[self::S3_CONTENT_TYPE_HEADER])) {
-           $meta[self::S3_CONTENT_TYPE_HEADER] = self::getMimeType($path);
-        }
-
-        if(!isset($meta['Content-MD5'])) {
-            $headers['Content-MD5'] = base64_encode(md5_file($path, true));
-        }
-
-        return $this->putObject($object, $data, $meta);
-    }
-
-    /**
-     * Remove a given object
-     *
-     * @param  string $object
-     * @return boolean
-     */
-    public function removeObject($object)
-    {
-        $object = $this->_fixupObjectName($object);
-        $response = $this->_makeRequest('DELETE', $object);
-
-        // Look for a 204 No Content response
-        return ($response->getStatus() == 204);
-    }
-
-    /**
-     * Make a request to Amazon S3
-     *
-     * @param  string $method	Request method
-     * @param  string $path		Path to requested object
-     * @param  array  $params	Request parameters
-     * @param  array  $headers	HTTP headers
-     * @param  string|resource $data		Request data
-     * @return Zend_Http_Response
-     */
-    public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null)
-    {
-        $retry_count = 0;
-
-        if (!is_array($headers)) {
-            $headers = array($headers);
-        }
-
-        $headers['Date'] = gmdate(DATE_RFC1123, time());
-
-        if(is_resource($data) && $method != 'PUT') {
-            /**
-             * @see Zend_Service_Amazon_S3_Exception
-             */
-            require_once 'Zend/Service/Amazon/S3/Exception.php';
-            throw new Zend_Service_Amazon_S3_Exception("Only PUT request supports stream data");
-        }
-
-        // build the end point out
-        $parts = explode('/', $path, 2);
-        $endpoint = clone($this->_endpoint);
-        if ($parts[0]) {
-            // prepend bucket name to the hostname
-            $endpoint->setHost($parts[0].'.'.$endpoint->getHost());
-        }
-        if (!empty($parts[1])) {
-            $endpoint->setPath('/'.$parts[1]);
-        }
-        else {
-            $endpoint->setPath('/');
-            if ($parts[0]) {
-                $path = $parts[0].'/';
-            }
-        }
-
-        self::addSignature($method, $path, $headers);
-
-        $client = self::getHttpClient();
-
-        $client->resetParameters();
-        $client->setUri($endpoint);
-        $client->setAuth(false);
-        // Work around buglet in HTTP client - it doesn't clean headers
-        // Remove when ZHC is fixed
-        $client->setHeaders(array('Content-MD5' => null,
-                                  'Expect'      => null,
-                                  'Range'       => null,
-                                  'x-amz-acl'   => null));
-
-        $client->setHeaders($headers);
-
-        if (is_array($params)) {
-            foreach ($params as $name=>$value) {
-                $client->setParameterGet($name, $value);
-            }
-         }
-
-         if (($method == 'PUT') && ($data !== null)) {
-             if (!isset($headers['Content-type'])) {
-                 $headers['Content-type'] = self::getMimeType($path);
-             }
-             $client->setRawData($data, $headers['Content-type']);
-         }
-         do {
-            $retry = false;
-
-            $response = $client->request($method);
-            $response_code = $response->getStatus();
-
-            // Some 5xx errors are expected, so retry automatically
-            if ($response_code >= 500 && $response_code < 600 && $retry_count <= 5) {
-                $retry = true;
-                $retry_count++;
-                sleep($retry_count / 4 * $retry_count);
-            }
-            else if ($response_code == 307) {
-                // Need to redirect, new S3 endpoint given
-                // This should never happen as Zend_Http_Client will redirect automatically
-            }
-            else if ($response_code == 100) {
-                // echo 'OK to Continue';
-            }
-        } while ($retry);
-
-        return $response;
-    }
-
-    /**
-     * Add the S3 Authorization signature to the request headers
-     *
-     * @param  string $method
-     * @param  string $path
-     * @param  array &$headers
-     * @return string
-     */
-    protected function addSignature($method, $path, &$headers)
-    {
-        if (!is_array($headers)) {
-            $headers = array($headers);
-        }
-
-        $type = $md5 = $date = '';
-
-        // Search for the Content-type, Content-MD5 and Date headers
-        foreach ($headers as $key=>$val) {
-            if (strcasecmp($key, 'content-type') == 0) {
-                $type = $val;
-            }
-            else if (strcasecmp($key, 'content-md5') == 0) {
-                $md5 = $val;
-            }
-            else if (strcasecmp($key, 'date') == 0) {
-                $date = $val;
-            }
-        }
-
-        // If we have an x-amz-date header, use that instead of the normal Date
-        if (isset($headers['x-amz-date']) && isset($date)) {
-            $date = '';
-        }
-
-        $sig_str = "$method\n$md5\n$type\n$date\n";
-        // For x-amz- headers, combine like keys, lowercase them, sort them
-        // alphabetically and remove excess spaces around values
-        $amz_headers = array();
-        foreach ($headers as $key=>$val) {
-            $key = strtolower($key);
-            if (substr($key, 0, 6) == 'x-amz-') {
-                if (is_array($val)) {
-                    $amz_headers[$key] = $val;
-                }
-                else {
-                    $amz_headers[$key][] = preg_replace('/\s+/', ' ', $val);
-                }
-            }
-        }
-        if (!empty($amz_headers)) {
-            ksort($amz_headers);
-            foreach ($amz_headers as $key=>$val) {
-                $sig_str .= $key.':'.implode(',', $val)."\n";
-            }
-        }
-
-        $sig_str .= '/'.parse_url($path, PHP_URL_PATH);
-        if (strpos($path, '?location') !== false) {
-            $sig_str .= '?location';
-        }
-        else if (strpos($path, '?acl') !== false) {
-            $sig_str .= '?acl';
-        }
-        else if (strpos($path, '?torrent') !== false) {
-            $sig_str .= '?torrent';
-        }
-
-        $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY));
-        $headers['Authorization'] = 'AWS '.$this->_getAccessKey().':'.$signature;
-
-        return $sig_str;
-    }
-
-    /**
-     * Attempt to get the content-type of a file based on the extension
-     *
-     * @param  string $path
-     * @return string
-     */
-    public static function getMimeType($path)
-    {
-        $ext = substr(strrchr($path, '.'), 1);
-
-        if(!$ext) {
-            // shortcut
-            return 'binary/octet-stream';
-        }
-
-        switch (strtolower($ext)) {
-            case 'xls':
-                $content_type = 'application/excel';
-                break;
-            case 'hqx':
-                $content_type = 'application/macbinhex40';
-                break;
-            case 'doc':
-            case 'dot':
-            case 'wrd':
-                $content_type = 'application/msword';
-                break;
-            case 'pdf':
-                $content_type = 'application/pdf';
-                break;
-            case 'pgp':
-                $content_type = 'application/pgp';
-                break;
-            case 'ps':
-            case 'eps':
-            case 'ai':
-                $content_type = 'application/postscript';
-                break;
-            case 'ppt':
-                $content_type = 'application/powerpoint';
-                break;
-            case 'rtf':
-                $content_type = 'application/rtf';
-                break;
-            case 'tgz':
-            case 'gtar':
-                $content_type = 'application/x-gtar';
-                break;
-            case 'gz':
-                $content_type = 'application/x-gzip';
-                break;
-            case 'php':
-            case 'php3':
-            case 'php4':
-                $content_type = 'application/x-httpd-php';
-                break;
-            case 'js':
-                $content_type = 'application/x-javascript';
-                break;
-            case 'ppd':
-            case 'psd':
-                $content_type = 'application/x-photoshop';
-                break;
-            case 'swf':
-            case 'swc':
-            case 'rf':
-                $content_type = 'application/x-shockwave-flash';
-                break;
-            case 'tar':
-                $content_type = 'application/x-tar';
-                break;
-            case 'zip':
-                $content_type = 'application/zip';
-                break;
-            case 'mid':
-            case 'midi':
-            case 'kar':
-                $content_type = 'audio/midi';
-                break;
-            case 'mp2':
-            case 'mp3':
-            case 'mpga':
-                $content_type = 'audio/mpeg';
-                break;
-            case 'ra':
-                $content_type = 'audio/x-realaudio';
-                break;
-            case 'wav':
-                $content_type = 'audio/wav';
-                break;
-            case 'bmp':
-                $content_type = 'image/bitmap';
-                break;
-            case 'gif':
-                $content_type = 'image/gif';
-                break;
-            case 'iff':
-                $content_type = 'image/iff';
-                break;
-            case 'jb2':
-                $content_type = 'image/jb2';
-                break;
-            case 'jpg':
-            case 'jpe':
-            case 'jpeg':
-                $content_type = 'image/jpeg';
-                break;
-            case 'jpx':
-                $content_type = 'image/jpx';
-                break;
-            case 'png':
-                $content_type = 'image/png';
-                break;
-            case 'tif':
-            case 'tiff':
-                $content_type = 'image/tiff';
-                break;
-            case 'wbmp':
-                $content_type = 'image/vnd.wap.wbmp';
-                break;
-            case 'xbm':
-                $content_type = 'image/xbm';
-                break;
-            case 'css':
-                $content_type = 'text/css';
-                break;
-            case 'txt':
-                $content_type = 'text/plain';
-                break;
-            case 'htm':
-            case 'html':
-                $content_type = 'text/html';
-                break;
-            case 'xml':
-                $content_type = 'text/xml';
-                break;
-            case 'xsl':
-                $content_type = 'text/xsl';
-                break;
-            case 'mpg':
-            case 'mpe':
-            case 'mpeg':
-                $content_type = 'video/mpeg';
-                break;
-            case 'qt':
-            case 'mov':
-                $content_type = 'video/quicktime';
-                break;
-            case 'avi':
-                $content_type = 'video/x-ms-video';
-                break;
-            case 'eml':
-                $content_type = 'message/rfc822';
-                break;
-            default:
-                $content_type = 'binary/octet-stream';
-                break;
-        }
-
-        return $content_type;
-    }
-
-    /**
-     * Register this object as stream wrapper client
-     *
-     * @param  string $name
-     * @return Zend_Service_Amazon_S3
-     */
-    public function registerAsClient($name)
-    {
-        self::$_wrapperClients[$name] = $this;
-        return $this;
-    }
-
-    /**
-     * Unregister this object as stream wrapper client
-     *
-     * @param  string $name
-     * @return Zend_Service_Amazon_S3
-     */
-    public function unregisterAsClient($name)
-    {
-        unset(self::$_wrapperClients[$name]);
-        return $this;
-    }
-
-    /**
-     * Get wrapper client for stream type
-     *
-     * @param  string $name
-     * @return Zend_Service_Amazon_S3
-     */
-    public static function getWrapperClient($name)
-    {
-        return self::$_wrapperClients[$name];
-    }
-
-    /**
-     * Register this object as stream wrapper
-     *
-     * @param  string $name
-     * @return Zend_Service_Amazon_S3
-     */
-    public function registerStreamWrapper($name='s3')
-    {
-        /**
-         * @see Zend_Service_Amazon_S3_Stream
-         */
-        require_once 'Zend/Service/Amazon/S3/Stream.php';
-
-        stream_register_wrapper($name, 'Zend_Service_Amazon_S3_Stream');
-        $this->registerAsClient($name);
-    }
-
-    /**
-     * Unregister this object as stream wrapper
-     *
-     * @param  string $name
-     * @return Zend_Service_Amazon_S3
-     */
-    public function unregisterStreamWrapper($name='s3')
-    {
-        stream_wrapper_unregister($name);
-        $this->unregisterAsClient($name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/S3/Exception.php b/airtime_mvc/library/Zend/Service/Amazon/S3/Exception.php
deleted file mode 100644
index 93ebb901e..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/S3/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Service_Amazon_Exception
- */
-require_once 'Zend/Service/Amazon/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_S3_Exception extends Zend_Service_Amazon_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/S3/Stream.php b/airtime_mvc/library/Zend/Service/Amazon/S3/Stream.php
deleted file mode 100644
index 128575e49..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/S3/Stream.php
+++ /dev/null
@@ -1,497 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Amazon_S3
- */
-require_once 'Zend/Service/Amazon/S3.php';
-
-/**
- * Amazon S3 PHP stream wrapper
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_S3
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_S3_Stream
-{
-    /**
-     * @var boolean Write the buffer on fflush()?
-     */
-    private $_writeBuffer = false;
-
-    /**
-     * @var integer Current read/write position
-     */
-    private $_position = 0;
-
-    /**
-     * @var integer Total size of the object as returned by S3 (Content-length)
-     */
-    private $_objectSize = 0;
-
-    /**
-     * @var string File name to interact with
-     */
-    private $_objectName = null;
-
-    /**
-     * @var string Current read/write buffer
-     */
-    private $_objectBuffer = null;
-
-    /**
-     * @var array Available buckets
-     */
-    private $_bucketList = array();
-
-    /**
-     * @var Zend_Service_Amazon_S3
-     */
-    private $_s3 = null;
-
-    /**
-     * Retrieve client for this stream type
-     *
-     * @param  string $path
-     * @return Zend_Service_Amazon_S3
-     */
-    protected function _getS3Client($path)
-    {
-        if ($this->_s3 === null) {
-            $url = explode(':', $path);
-
-            if (!$url) {
-                /**
-                 * @see Zend_Service_Amazon_S3_Exception
-                 */
-                require_once 'Zend/Service/Amazon/S3/Exception.php';
-                throw new Zend_Service_Amazon_S3_Exception("Unable to parse URL $path");
-            }
-
-            $this->_s3 = Zend_Service_Amazon_S3::getWrapperClient($url[0]);
-            if (!$this->_s3) {
-                /**
-                 * @see Zend_Service_Amazon_S3_Exception
-                 */
-                require_once 'Zend/Service/Amazon/S3/Exception.php';
-                throw new Zend_Service_Amazon_S3_Exception("Unknown client for wrapper {$url[0]}");
-            }
-        }
-
-        return $this->_s3;
-    }
-
-    /**
-     * Extract object name from URL
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function _getNamePart($path)
-    {
-        $url = parse_url($path);
-        if ($url['host']) {
-            return !empty($url['path']) ? $url['host'].$url['path'] : $url['host'];
-        }
-
-        return '';
-    }
-    /**
-     * Open the stream
-     *
-     * @param  string  $path
-     * @param  string  $mode
-     * @param  integer $options
-     * @param  string  $opened_path
-     * @return boolean
-     */
-    public function stream_open($path, $mode, $options, $opened_path)
-    {
-        $name = $this->_getNamePart($path);
-        // If we open the file for writing, just return true. Create the object
-        // on fflush call
-        if (strpbrk($mode, 'wax')) {
-            $this->_objectName = $name;
-            $this->_objectBuffer = null;
-            $this->_objectSize = 0;
-            $this->_position = 0;
-            $this->_writeBuffer = true;
-            $this->_getS3Client($path);
-            return true;
-        }
-        else {
-            // Otherwise, just see if the file exists or not
-            $info = $this->_getS3Client($path)->getInfo($name);
-            if ($info) {
-                $this->_objectName = $name;
-                $this->_objectBuffer = null;
-                $this->_objectSize = $info['size'];
-                $this->_position = 0;
-                $this->_writeBuffer = false;
-                $this->_getS3Client($path);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Close the stream
-     *
-     * @return void
-     */
-    public function stream_close()
-    {
-        $this->_objectName = null;
-        $this->_objectBuffer = null;
-        $this->_objectSize = 0;
-        $this->_position = 0;
-        $this->_writeBuffer = false;
-        unset($this->_s3);
-    }
-
-    /**
-     * Read from the stream
-     *
-     * @param  integer $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if (!$this->_objectName) {
-            return false;
-        }
-
-        $range_start = $this->_position;
-        $range_end = $this->_position+$count;
-
-        // Only fetch more data from S3 if we haven't fetched any data yet (postion=0)
-        // OR, the range end position is greater than the size of the current object
-        // buffer AND if the range end position is less than or equal to the object's
-        // size returned by S3
-        if (($this->_position == 0) || (($range_end > strlen($this->_objectBuffer)) && ($range_end <= $this->_objectSize))) {
-
-            $headers = array(
-                'Range' => "$range_start-$range_end"
-            );
-
-            $response = $this->_s3->_makeRequest('GET', $this->_objectName, null, $headers);
-
-            if ($response->getStatus() == 200) {
-                $this->_objectBuffer .= $response->getBody();
-            }
-        }
-
-        $data = substr($this->_objectBuffer, $this->_position, $count);
-        $this->_position += strlen($data);
-        return $data;
-    }
-
-    /**
-     * Write to the stream
-     *
-     * @param  string $data
-     * @return integer
-     */
-    public function stream_write($data)
-    {
-        if (!$this->_objectName) {
-            return 0;
-        }
-        $len = strlen($data);
-        $this->_objectBuffer .= $data;
-        $this->_objectSize += $len;
-        // TODO: handle current position for writing!
-        return $len;
-    }
-
-    /**
-     * End of the stream?
-     *
-     * @return boolean
-     */
-    public function stream_eof()
-    {
-        if (!$this->_objectName) {
-            return true;
-        }
-
-        return ($this->_position >= $this->_objectSize);
-    }
-
-    /**
-     * What is the current read/write position of the stream
-     *
-     * @return integer
-     */
-    public function stream_tell()
-    {
-        return $this->_position;
-    }
-
-    /**
-     * Update the read/write position of the stream
-     *
-     * @param  integer $offset
-     * @param  integer $whence
-     * @return boolean
-     */
-    public function stream_seek($offset, $whence)
-    {
-        if (!$this->_objectName) {
-            return false;
-        }
-
-        switch ($whence) {
-            case SEEK_CUR:
-                // Set position to current location plus $offset
-                $new_pos = $this->_position + $offset;
-                break;
-            case SEEK_END:
-                // Set position to end-of-file plus $offset
-                $new_pos = $this->_objectSize + $offset;
-                break;
-            case SEEK_SET:
-            default:
-                // Set position equal to $offset
-                $new_pos = $offset;
-                break;
-        }
-        $ret = ($new_pos >= 0 && $new_pos <= $this->_objectSize);
-        if ($ret) {
-            $this->_position = $new_pos;
-        }
-        return $ret;
-    }
-
-    /**
-     * Flush current cached stream data to storage
-     *
-     * @return boolean
-     */
-    public function stream_flush()
-    {
-        // If the stream wasn't opened for writing, just return false
-        if (!$this->_writeBuffer) {
-            return false;
-        }
-
-        $ret = $this->_s3->putObject($this->_objectName, $this->_objectBuffer);
-
-        $this->_objectBuffer = null;
-
-        return $ret;
-    }
-
-    /**
-     * Returns data array of stream variables
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if (!$this->_objectName) {
-            return false;
-        }
-
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0777;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-    if(($slash = strchr($this->_objectName, '/')) === false || $slash == strlen($this->_objectName)-1) {
-        /* bucket */
-        $stat['mode'] |= 040000;
-    } else {
-        $stat['mode'] |= 0100000;
-    }
-           $info = $this->_s3->getInfo($this->_objectName);
-        if (!empty($info)) {
-            $stat['size']  = $info['size'];
-            $stat['atime'] = time();
-            $stat['mtime'] = $info['mtime'];
-        }
-
-        return $stat;
-    }
-
-    /**
-     * Attempt to delete the item
-     *
-     * @param  string $path
-     * @return boolean
-     */
-    public function unlink($path)
-    {
-        return $this->_getS3Client($path)->removeObject($this->_getNamePart($path));
-    }
-
-    /**
-     * Attempt to rename the item
-     *
-     * @param  string  $path_from
-     * @param  string  $path_to
-     * @return boolean False
-     */
-    public function rename($path_from, $path_to)
-    {
-        // TODO: Renaming isn't supported, always return false
-        return false;
-    }
-
-    /**
-     * Create a new directory
-     *
-     * @param  string  $path
-     * @param  integer $mode
-     * @param  integer $options
-     * @return boolean
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        return $this->_getS3Client($path)->createBucket(parse_url($path, PHP_URL_HOST));
-    }
-
-    /**
-     * Remove a directory
-     *
-     * @param  string  $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function rmdir($path, $options)
-    {
-        return $this->_getS3Client($path)->removeBucket(parse_url($path, PHP_URL_HOST));
-    }
-
-    /**
-     * Attempt to open a directory
-     *
-     * @param  string $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function dir_opendir($path, $options)
-    {
-
-        if (preg_match('@^([a-z0-9+.]|-)+://$@', $path)) {
-            $this->_bucketList = $this->_getS3Client($path)->getBuckets();
-        }
-        else {
-            $host = parse_url($path, PHP_URL_HOST);
-            $this->_bucketList = $this->_getS3Client($path)->getObjectsByBucket($host);
-        }
-
-        return ($this->_bucketList !== false);
-    }
-
-    /**
-     * Return array of URL variables
-     *
-     * @param  string $path
-     * @param  integer $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0777;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-    $name = $this->_getNamePart($path);
-    if(($slash = strchr($name, '/')) === false || $slash == strlen($name)-1) {
-        /* bucket */
-        $stat['mode'] |= 040000;
-    } else {
-        $stat['mode'] |= 0100000;
-    }
-           $info = $this->_getS3Client($path)->getInfo($name);
-
-        if (!empty($info)) {
-            $stat['size']  = $info['size'];
-            $stat['atime'] = time();
-            $stat['mtime'] = $info['mtime'];
-        }
-
-        return $stat;
-    }
-
-    /**
-     * Return the next filename in the directory
-     *
-     * @return string
-     */
-    public function dir_readdir()
-    {
-        $object = current($this->_bucketList);
-        if ($object !== false) {
-            next($this->_bucketList);
-        }
-        return $object;
-    }
-
-    /**
-     * Reset the directory pointer
-     *
-     * @return boolean True
-     */
-    public function dir_rewinddir()
-    {
-        reset($this->_bucketList);
-        return true;
-    }
-
-    /**
-     * Close a directory
-     *
-     * @return boolean True
-     */
-    public function dir_closedir()
-    {
-        $this->_bucketList = array();
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/SimilarProduct.php b/airtime_mvc/library/Zend/Service/Amazon/SimilarProduct.php
deleted file mode 100644
index 9f42c0a92..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/SimilarProduct.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimilarProduct.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_SimilarProduct
-{
-    /**
-     * @var string
-     */
-    public $ASIN;
-
-    /**
-     * @var string
-     */
-    public $Title;
-
-    /**
-     * Assigns values to properties relevant to SimilarProduct
-     *
-     * @param  DOMElement $dom
-     * @return void
-     */
-    public function __construct(DOMElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
-        foreach (array('ASIN', 'Title') as $el) {
-            $text = $xpath->query("./az:$el/text()", $dom)->item(0);
-            if($text instanceof DOMText) {
-                $this->$el = (string)$text->data;
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Sqs.php b/airtime_mvc/library/Zend/Service/Amazon/Sqs.php
deleted file mode 100644
index 4f01d4384..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Sqs.php
+++ /dev/null
@@ -1,444 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sqs.php 21323 2010-03-04 18:27:32Z stas $
- */
-
-/**
- * @see Zend_Service_Amazon_Abstract
- */
-require_once 'Zend/Service/Amazon/Abstract.php';
-
-/**
- * @see Zend_Crypt_Hmac
- */
-require_once 'Zend/Crypt/Hmac.php';
-
-/**
- * Class for connecting to the Amazon Simple Queue Service (SQS)
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://aws.amazon.com/sqs/ Amazon Simple Queue Service
- */
-class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract
-{
-    /**
-     * Default timeout for createQueue() function
-     */
-    const CREATE_TIMEOUT_DEFAULT = 30;
-
-    /**
-     * HTTP end point for the Amazon SQS service
-     */
-    protected $_sqsEndpoint = 'queue.amazonaws.com';
-
-    /**
-     * The API version to use
-     */
-    protected $_sqsApiVersion = '2009-02-01';
-
-    /**
-     * Signature Version
-     */
-    protected $_sqsSignatureVersion = '2';
-
-    /**
-     * Signature Encoding Method
-     */
-    protected $_sqsSignatureMethod = 'HmacSHA256';
-
-    /**
-     * Constructor
-     *
-     * @param string $accessKey
-     * @param string $secretKey
-     * @param string $region
-     */
-    public function __construct($accessKey = null, $secretKey = null, $region = null)
-    {
-        parent::__construct($accessKey, $secretKey, $region);
-    }
-
-    /**
-     * Create a new queue
-     *
-     * Visibility timeout is how long a message is left in the queue "invisible"
-     * to other readers.  If the message is acknowleged (deleted) before the
-     * timeout, then the message is deleted.  However, if the timeout expires
-     * then the message will be made available to other queue readers.
-     *
-     * @param  string  $queue_name queue name
-     * @param  integer $timeout    default visibility timeout
-     * @return string|boolean
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function create($queue_name, $timeout = null)
-    {
-        $params = array();
-        $params['QueueName'] = $queue_name;
-        $timeout = ($timeout === null) ? self::CREATE_TIMEOUT_DEFAULT : (int)$timeout;
-        $params['DefaultVisibilityTimeout'] = $timeout;
-
-        $retry_count = 0;
-
-        do {
-            $retry  = false;
-            $result = $this->_makeRequest(null, 'CreateQueue', $params);
-
-            if ($result->CreateQueueResult->QueueUrl === null) {
-                if ($result->Error->Code == 'AWS.SimpleQueueService.QueueNameExists') {
-                    return false;
-                } elseif ($result->Error->Code == 'AWS.SimpleQueueService.QueueDeletedRecently') {
-                    // Must sleep for 60 seconds, then try re-creating the queue
-                    sleep(60);
-                    $retry = true;
-                    $retry_count++;
-                } else {
-                    require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-                    throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-                }
-            } else {
-                return (string) $result->CreateQueueResult->QueueUrl;
-            }
-
-        } while ($retry);
-
-        return false;
-    }
-
-    /**
-     * Delete a queue and all of it's messages
-     *
-     * Returns false if the queue is not found, true if the queue exists
-     *
-     * @param  string  $queue_url queue URL
-     * @return boolean
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function delete($queue_url)
-    {
-        $result = $this->_makeRequest($queue_url, 'DeleteQueue');
-
-        if ($result->Error->Code !== null) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-        }
-
-        return true;
-    }
-
-    /**
-     * Get an array of all available queues
-     *
-     * @return array
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function getQueues()
-    {
-        $result = $this->_makeRequest(null, 'ListQueues');
-
-        if ($result->ListQueuesResult->QueueUrl === null) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-        }
-
-        $queues = array();
-        foreach ($result->ListQueuesResult->QueueUrl as $queue_url) {
-            $queues[] = (string)$queue_url;
-        }
-
-        return $queues;
-    }
-
-    /**
-     * Return the approximate number of messages in the queue
-     *
-     * @param  string  $queue_url Queue URL
-     * @return integer
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function count($queue_url)
-    {
-        return (int)$this->getAttribute($queue_url, 'ApproximateNumberOfMessages');
-    }
-
-    /**
-     * Send a message to the queue
-     *
-     * @param  string $queue_url Queue URL
-     * @param  string $message   Message to send to the queue
-     * @return string            Message ID
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function send($queue_url, $message)
-    {
-        $params = array();
-        $params['MessageBody'] = urlencode($message);
-
-        $checksum = md5($params['MessageBody']);
-
-        $result = $this->_makeRequest($queue_url, 'SendMessage', $params);
-
-        if ($result->SendMessageResult->MessageId === null) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-        } else if ((string) $result->SendMessageResult->MD5OfMessageBody != $checksum) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception('MD5 of body does not match message sent');
-        }
-
-        return (string) $result->SendMessageResult->MessageId;
-    }
-
-    /**
-     * Get messages in the queue
-     *
-     * @param  string  $queue_url    Queue name
-     * @param  integer $max_messages Maximum number of messages to return
-     * @param  integer $timeout      Visibility timeout for these messages
-     * @return array
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function receive($queue_url, $max_messages = null, $timeout = null)
-    {
-        $params = array();
-
-        // If not set, the visibility timeout on the queue is used
-        if ($timeout !== null) {
-            $params['VisibilityTimeout'] = (int)$timeout;
-        }
-
-        // SQS will default to only returning one message
-        if ($max_messages !== null) {
-            $params['MaxNumberOfMessages'] = (int)$max_messages;
-        }
-
-        $result = $this->_makeRequest($queue_url, 'ReceiveMessage', $params);
-
-        if ($result->ReceiveMessageResult->Message === null) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-        }
-
-        $data = array();
-        foreach ($result->ReceiveMessageResult->Message as $message) {
-            $data[] = array(
-                'message_id' => (string)$message->MessageId,
-                'handle'     => (string)$message->ReceiptHandle,
-                'md5'        => (string)$message->MD5OfBody,
-                'body'       => urldecode((string)$message->Body),
-            );
-        }
-
-        return $data;
-    }
-
-    /**
-     * Delete a message from the queue
-     *
-     * Returns true if the message is deleted, false if the deletion is
-     * unsuccessful.
-     *
-     * @param  string $queue_url  Queue URL
-     * @param  string $handle     Message handle as returned by SQS
-     * @return boolean
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function deleteMessage($queue_url, $handle)
-    {
-        $params = array();
-        $params['ReceiptHandle'] = (string)$handle;
-
-        $result = $this->_makeRequest($queue_url, 'DeleteMessage', $params);
-
-        if ($result->Error->Code !== null) {
-            return false;
-        }
-
-        // Will always return true unless ReceiptHandle is malformed
-        return true;
-    }
-
-    /**
-     * Get the attributes for the queue
-     *
-     * @param  string $queue_url  Queue URL
-     * @param  string $attribute
-     * @return string
-     * @throws Zend_Service_Amazon_Sqs_Exception
-     */
-    public function getAttribute($queue_url, $attribute = 'All')
-    {
-        $params = array();
-        $params['AttributeName'] = $attribute;
-
-        $result = $this->_makeRequest($queue_url, 'GetQueueAttributes', $params);
-
-        if ($result->GetQueueAttributesResult->Attribute === null) {
-            require_once 'Zend/Service/Amazon/Sqs/Exception.php';
-            throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code);
-        }
-        
-        if(count($result->GetQueueAttributesResult->Attribute) > 1) {
-            $attr_result = array();
-            foreach($result->GetQueueAttributesResult->Attribute as $attribute) {
-                $attr_result[(string)$attribute->Name] = (string)$attribute->Value;
-            }
-            return $attr_result;
-        } else {
-            return (string) $result->GetQueueAttributesResult->Attribute->Value;
-        }
-    }
-
-    /**
-     * Make a request to Amazon SQS
-     *
-     * @param  string           $queue  Queue Name
-     * @param  string           $action SQS action
-     * @param  array            $params
-     * @return SimpleXMLElement
-     */
-    private function _makeRequest($queue_url, $action, $params = array())
-    {
-        $params['Action'] = $action;
-        $params = $this->addRequiredParameters($queue_url, $params);
-
-        if ($queue_url === null) {
-            $queue_url = '/';
-        }
-
-        $client = self::getHttpClient();
-
-        switch ($action) {
-            case 'ListQueues':
-            case 'CreateQueue':
-                $client->setUri('http://'.$this->_sqsEndpoint);
-                break;
-            default:
-                $client->setUri($queue_url);
-                break;
-        }
-
-        $retry_count = 0;
-
-        do {
-            $retry = false;
-
-            $client->resetParameters();
-            $client->setParameterGet($params);
-
-            $response = $client->request('GET');
-
-            $response_code = $response->getStatus();
-
-            // Some 5xx errors are expected, so retry automatically
-            if ($response_code >= 500 && $response_code < 600 && $retry_count <= 5) {
-                $retry = true;
-                $retry_count++;
-                sleep($retry_count / 4 * $retry_count);
-            }
-        } while ($retry);
-
-        unset($client);
-
-        return new SimpleXMLElement($response->getBody());
-    }
-
-    /**
-     * Adds required authentication and version parameters to an array of
-     * parameters
-     *
-     * The required parameters are:
-     * - AWSAccessKey
-     * - SignatureVersion
-     * - Timestamp
-     * - Version and
-     * - Signature
-     *
-     * If a required parameter is already set in the <tt>$parameters</tt> array,
-     * it is overwritten.
-     *
-     * @param  string $queue_url  Queue URL
-     * @param  array  $parameters the array to which to add the required
-     *                            parameters.
-     * @return array
-     */
-    protected function addRequiredParameters($queue_url, array $parameters)
-    {
-        $parameters['AWSAccessKeyId']   = $this->_getAccessKey();
-        $parameters['SignatureVersion'] = $this->_sqsSignatureVersion;
-        $parameters['Timestamp']        = gmdate('Y-m-d\TH:i:s\Z', time()+10);
-        $parameters['Version']          = $this->_sqsApiVersion;
-        $parameters['SignatureMethod']  = $this->_sqsSignatureMethod;
-        $parameters['Signature']        = $this->_signParameters($queue_url, $parameters);
-
-        return $parameters;
-    }
-
-    /**
-     * Computes the RFC 2104-compliant HMAC signature for request parameters
-     *
-     * This implements the Amazon Web Services signature, as per the following
-     * specification:
-     *
-     * 1. Sort all request parameters (including <tt>SignatureVersion</tt> and
-     *    excluding <tt>Signature</tt>, the value of which is being created),
-     *    ignoring case.
-     *
-     * 2. Iterate over the sorted list and append the parameter name (in its
-     *    original case) and then its value. Do not URL-encode the parameter
-     *    values before constructing this string. Do not use any separator
-     *    characters when appending strings.
-     *
-     * @param  string $queue_url  Queue URL
-     * @param  array  $parameters the parameters for which to get the signature.
-     *
-     * @return string the signed data.
-     */
-    protected function _signParameters($queue_url, array $paramaters)
-    {
-        $data = "GET\n";
-        $data .= $this->_sqsEndpoint . "\n";
-        if ($queue_url !== null) {
-            $data .= parse_url($queue_url, PHP_URL_PATH);
-        }
-        else {
-            $data .= '/';
-        }
-        $data .= "\n";
-
-        uksort($paramaters, 'strcmp');
-        unset($paramaters['Signature']);
-
-        $arrData = array();
-        foreach($paramaters as $key => $value) {
-            $arrData[] = $key . '=' . str_replace('%7E', '~', urlencode($value));
-        }
-
-        $data .= implode('&', $arrData);
-
-        $hmac = Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'SHA256', $data, Zend_Crypt_Hmac::BINARY);
-
-        return base64_encode($hmac);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Amazon/Sqs/Exception.php b/airtime_mvc/library/Zend/Service/Amazon/Sqs/Exception.php
deleted file mode 100644
index e15a14537..000000000
--- a/airtime_mvc/library/Zend/Service/Amazon/Sqs/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Service_Amazon/Exception
- */
-require_once 'Zend/Service/Amazon/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Amazon_Sqs
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Amazon_Sqs_Exception extends Zend_Service_Amazon_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/Audioscrobbler.php b/airtime_mvc/library/Zend/Service/Audioscrobbler.php
deleted file mode 100644
index 7e2ffa476..000000000
--- a/airtime_mvc/library/Zend/Service/Audioscrobbler.php
+++ /dev/null
@@ -1,681 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Audioscrobbler.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Audioscrobbler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Audioscrobbler
-{
-    /**
-     * Zend_Http_Client Object
-     *
-     * @var     Zend_Http_Client
-     * @access  protected
-     */
-    protected $_client;
-
-    /**
-     * Array that contains parameters being used by the webservice
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_params;
-
-    /**
-     * Holds error information (e.g., for handling simplexml_load_string() warnings)
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_error = null;
-
-
-    /**
-     * Sets up character encoding, instantiates the HTTP client, and assigns the web service version.
-     */
-    public function __construct()
-    {
-        $this->set('version', '1.0');
-
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-    }
-
-    /**
-     * Set Http Client
-     *
-     * @param Zend_Http_Client $client
-     */
-    public function setHttpClient(Zend_Http_Client $client)
-    {
-        $this->_client = $client;
-    }
-
-    /**
-     * Get current http client.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        if($this->_client == null) {
-            $this->lazyLoadHttpClient();
-        }
-        return $this->_client;
-    }
-
-    /**
-     * Lazy load Http Client if none is instantiated yet.
-     *
-     * @return void
-     */
-    protected function lazyLoadHttpClient()
-    {
-        $this->_client = new Zend_Http_Client();
-    }
-
-    /**
-     * Returns a field value, or false if the named field does not exist
-     *
-     * @param  string $field
-     * @return string|false
-     */
-    public function get($field)
-    {
-        if (array_key_exists($field, $this->_params)) {
-            return $this->_params[$field];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Generic set action for a field in the parameters being used
-     *
-     * @param  string $field name of field to set
-     * @param  string $value value to assign to the named field
-     * @return Zend_Service_Audioscrobbler Provides a fluent interface
-     */
-    public function set($field, $value)
-    {
-        $this->_params[$field] = urlencode($value);
-
-        return $this;
-    }
-
-    /**
-     * Protected method that queries REST service and returns SimpleXML response set
-     *
-     * @param  string $service name of Audioscrobbler service file we're accessing
-     * @param  string $params  parameters that we send to the service if needded
-     * @throws Zend_Http_Client_Exception
-     * @throws Zend_Service_Exception
-     * @return SimpleXMLElement result set
-     * @access protected
-     */
-    protected function _getInfo($service, $params = null)
-    {
-        $service = (string) $service;
-        $params  = (string) $params;
-
-        if ($params === '') {
-            $this->getHttpClient()->setUri("http://ws.audioscrobbler.com{$service}");
-        } else {
-            $this->getHttpClient()->setUri("http://ws.audioscrobbler.com{$service}?{$params}");
-        }
-
-        $response     = $this->getHttpClient()->request();
-        $responseBody = $response->getBody();
-
-        if (preg_match('/No such path/', $responseBody)) {
-            /**
-             * @see Zend_Http_Client_Exception
-             */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('Could not find: ' . $this->_client->getUri());
-        } elseif (preg_match('/No user exists with this name/', $responseBody)) {
-            /**
-             * @see Zend_Http_Client_Exception
-             */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('No user exists with this name');
-        } elseif (!$response->isSuccessful()) {
-            /**
-             * @see Zend_Http_Client_Exception
-             */
-            require_once 'Zend/Http/Client/Exception.php';
-            throw new Zend_Http_Client_Exception('The web service ' . $this->_client->getUri() . ' returned the following status code: ' . $response->getStatus());
-        }
-
-        set_error_handler(array($this, '_errorHandler'));
-
-        if (!$simpleXmlElementResponse = simplexml_load_string($responseBody)) {
-            restore_error_handler();
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            $exception = new Zend_Service_Exception('Response failed to load with SimpleXML');
-            $exception->error    = $this->_error;
-            $exception->response = $responseBody;
-            throw $exception;
-        }
-
-        restore_error_handler();
-
-        return $simpleXmlElementResponse;
-    }
-
-    /**
-    * Utility function to get Audioscrobbler profile information (eg: Name, Gender)
-     *
-    * @return array containing information
-    */
-    public function userGetProfileInformation()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/profile.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function get this user's 50 most played artists
-     *
-     * @return array containing info
-    */
-    public function userGetTopArtists()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/topartists.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function to get this user's 50 most played albums
-     *
-     * @return SimpleXMLElement object containing result set
-    */
-    public function userGetTopAlbums()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/topalbums.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function to get this user's 50 most played tracks
-     * @return SimpleXML object containing resut set
-    */
-    public function userGetTopTracks()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/toptracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function to get this user's 50 most used tags
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetTopTags()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/tags.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns the user's top tags used most used on a specific artist
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetTopTagsForArtist()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/artisttags.xml";
-        $params = "artist={$this->get('artist')}";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Utility function that returns this user's top tags for an album
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetTopTagsForAlbum()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/albumtags.xml";
-        $params = "artist={$this->get('artist')}&album={$this->get('album')}";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Utility function that returns this user's top tags for a track
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetTopTagsForTrack()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/tracktags.xml";
-        $params = "artist={$this->get('artist')}&track={$this->get('track')}";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Utility function that retrieves this user's list of friends
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetFriends()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/friends.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of people with similar listening preferences to this user
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetNeighbours()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/neighbours.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of the 10 most recent tracks played by this user
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetRecentTracks()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/recenttracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of the 10 tracks most recently banned by this user
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetRecentBannedTracks()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/recentbannedtracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of the 10 tracks most recently loved by this user
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetRecentLovedTracks()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/recentlovedtracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of dates of available weekly charts for a this user
-     *
-     * Should actually be named userGetWeeklyChartDateList() but we have to follow audioscrobbler's naming
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetWeeklyChartList()
-    {
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/weeklychartlist.xml";
-        return $this->_getInfo($service);
-    }
-
-
-    /**
-     * Utility function that returns weekly album chart data for this user
-     *
-     * @param integer $from optional UNIX timestamp for start of date range
-     * @param integer $to optional UNIX timestamp for end of date range
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetWeeklyAlbumChart($from = NULL, $to = NULL)
-    {
-        $params = "";
-
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&to={$to}";
-        }
-
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/weeklyalbumchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Utility function that returns weekly artist chart data for this user
-     *
-     * @param integer $from optional UNIX timestamp for start of date range
-     * @param integer $to optional UNIX timestamp for end of date range
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetWeeklyArtistChart($from = NULL, $to = NULL)
-    {
-        $params = "";
-
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&to={$to}";
-        }
-
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/weeklyartistchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Utility function that returns weekly track chart data for this user
-     *
-     * @param integer $from optional UNIX timestamp for start of date range
-     * @param integer $to optional UNIX timestamp for end of date range
-     * @return SimpleXMLElement object containing result set
-     */
-    public function userGetWeeklyTrackChart($from = NULL, $to = NULL)
-    {
-        $params = "";
-
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&to={$to}";
-        }
-
-        $service = "/{$this->get('version')}/user/{$this->get('user')}/weeklytrackchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-
-    /**
-     * Utility function that returns a list of artists similiar to this artist
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function artistGetRelatedArtists()
-    {
-        $service = "/{$this->get('version')}/artist/{$this->get('artist')}/similar.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of this artist's top listeners
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function artistGetTopFans()
-    {
-        $service = "/{$this->get('version')}/artist/{$this->get('artist')}/fans.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of this artist's top-rated tracks
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function artistGetTopTracks()
-    {
-        $service = "/{$this->get('version')}/artist/{$this->get('artist')}/toptracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of this artist's top-rated albums
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function artistGetTopAlbums()
-    {
-        $service = "/{$this->get('version')}/artist/{$this->get('artist')}/topalbums.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Utility function that returns a list of this artist's top-rated tags
-     *
-     * @return SimpleXMLElement object containing result set
-     */
-    public function artistGetTopTags()
-    {
-        $service = "/{$this->get('version')}/artist/{$this->get('artist')}/toptags.xml";
-        return $this->_getInfo($service);
-    }
-
-
-    /**
-     * Get information about an album
-     *
-     * @return SimpleXMLElement
-     */
-    public function albumGetInfo()
-    {
-        $service = "/{$this->get('version')}/album/{$this->get('artist')}/{$this->get('album')}/info.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get top fans of the current track.
-     *
-     * @return SimpleXMLElement
-     */
-    public function trackGetTopFans()
-    {
-        $service = "/{$this->get('version')}/track/{$this->get('artist')}/{$this->get('track')}/fans.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get top tags of the current track.
-     *
-     * @return SimpleXMLElement
-     */
-    public function trackGetTopTags()
-    {
-        $service = "/{$this->get('version')}/track/{$this->get('artist')}/{$this->get('track')}/toptags.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get Top Tags.
-     *
-     * @return SimpleXMLElement
-     */
-    public function tagGetTopTags()
-    {
-        $service = "/{$this->get('version')}/tag/toptags.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get top albums by current tag.
-     *
-     * @return SimpleXMLElement
-     */
-    public function tagGetTopAlbums()
-    {
-        $service = "/{$this->get('version')}/tag/{$this->get('tag')}/topalbums.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get top artists by current tag.
-     *
-     * @return SimpleXMLElement
-     */
-    public function tagGetTopArtists()
-    {
-        $service = "/{$this->get('version')}/tag/{$this->get('tag')}/topartists.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get Top Tracks by currently set tag.
-     *
-     * @return SimpleXMLElement
-     */
-    public function tagGetTopTracks()
-    {
-        $service = "/{$this->get('version')}/tag/{$this->get('tag')}/toptracks.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Get weekly chart list by current set group.
-     *
-     * @see set()
-     * @return SimpleXMLElement
-     */
-    public function groupGetWeeklyChartList()
-    {
-        $service = "/{$this->get('version')}/group/{$this->get('group')}/weeklychartlist.xml";
-        return $this->_getInfo($service);
-    }
-
-    /**
-     * Retrieve weekly Artist Charts
-     *
-     * @param  int $from
-     * @param  int $to
-     * @return SimpleXMLElement
-     */
-    public function groupGetWeeklyArtistChartList($from = NULL, $to = NULL)
-    {
-
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&$to={$to}";
-        } else {
-            $params = "";
-        }
-
-        $service = "/{$this->get('version')}/group/{$this->get('group')}/weeklyartistchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Retrieve Weekly Track Charts
-     *
-     * @param  int $from
-     * @param  int $to
-     * @return SimpleXMLElement
-     */
-    public function groupGetWeeklyTrackChartList($from = NULL, $to = NULL)
-    {
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&to={$to}";
-        } else {
-            $params = "";
-        }
-
-        $service = "/{$this->get('version')}/group/{$this->get('group')}/weeklytrackchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Retrieve Weekly album charts.
-     *
-     * @param int $from
-     * @param int $to
-     * @return SimpleXMLElement
-     */
-    public function groupGetWeeklyAlbumChartList($from = NULL, $to = NULL)
-    {
-        if ($from != NULL && $to != NULL) {
-            $from = (int)$from;
-            $to = (int)$to;
-            $params = "from={$from}&to={$to}";
-        } else {
-            $params = "";
-        }
-
-        $service = "/{$this->get('version')}/group/{$this->get('group')}/weeklyalbumchart.xml";
-        return $this->_getInfo($service, $params);
-    }
-
-    /**
-     * Saves the provided error information to this instance
-     *
-     * @param  integer $errno
-     * @param  string  $errstr
-     * @param  string  $errfile
-     * @param  integer $errline
-     * @param  array   $errcontext
-     * @return void
-     */
-    protected function _errorHandler($errno, $errstr, $errfile, $errline, array $errcontext)
-    {
-        $this->_error = array(
-            'errno'      => $errno,
-            'errstr'     => $errstr,
-            'errfile'    => $errfile,
-            'errline'    => $errline,
-            'errcontext' => $errcontext
-            );
-    }
-
-    /**
-     * Call Intercept for set($name, $field)
-     *
-     * @param  string $method
-     * @param  array  $args
-     * @return Zend_Service_Audioscrobbler
-     */
-    public function __call($method, $args)
-    {
-        if(substr($method, 0, 3) !== "set") {
-            require_once "Zend/Service/Exception.php";
-            throw new Zend_Service_Exception(
-                "Method ".$method." does not exist in class Zend_Service_Audioscrobbler."
-            );
-        }
-        $field = strtolower(substr($method, 3));
-
-        if(!is_array($args) || count($args) != 1) {
-            require_once "Zend/Service/Exception.php";
-            throw new Zend_Service_Exception(
-                "A value is required for setting a parameter field."
-            );
-        }
-        $this->set($field, $args[0]);
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Delicious.php b/airtime_mvc/library/Zend/Service/Delicious.php
deleted file mode 100644
index 71a966032..000000000
--- a/airtime_mvc/library/Zend/Service/Delicious.php
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Delicious.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Rest_Client
- */
-require_once 'Zend/Rest/Client.php';
-
-/**
- * @see Zend_Json_Decoder
- */
-require_once 'Zend/Json/Decoder.php';
-
-/**
- * @see Zend_Service_Delicious_SimplePost
- */
-require_once 'Zend/Service/Delicious/SimplePost.php';
-
-/**
- * @see Zend_Service_Delicious_Post
- */
-require_once 'Zend/Service/Delicious/Post.php';
-
-/**
- * @see Zend_Service_Delicious_PostList
- */
-require_once 'Zend/Service/Delicious/PostList.php';
-
-
-/**
- * Zend_Service_Delicious is a concrete implementation of the del.icio.us web service
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Delicious
-{
-    const API_URI = 'https://api.del.icio.us';
-
-    const PATH_UPDATE        = '/v1/posts/update';
-    const PATH_TAGS          = '/v1/tags/get';
-    const PATH_TAG_RENAME    = '/v1/tags/rename';
-    const PATH_BUNDLES       = '/v1/tags/bundles/all';
-    const PATH_BUNDLE_DELETE = '/v1/tags/bundles/delete';
-    const PATH_BUNDLE_ADD    = '/v1/tags/bundles/set';
-    const PATH_DATES         = '/v1/posts/dates';
-    const PATH_POST_DELETE   = '/v1/posts/delete';
-    const PATH_POSTS_GET     = '/v1/posts/get';
-    const PATH_POSTS_ALL     = '/v1/posts/all';
-    const PATH_POSTS_ADD     = '/v1/posts/add';
-    const PATH_POSTS_RECENT  = '/v1/posts/recent';
-
-    const JSON_URI     = 'http://del.icio.us';
-    const JSON_POSTS   = '/feeds/json/%s/%s';
-    const JSON_TAGS    = '/feeds/json/tags/%s';
-    const JSON_NETWORK = '/feeds/json/network/%s';
-    const JSON_FANS    = '/feeds/json/fans/%s';
-    const JSON_URL     = '/feeds/json/url/data';
-
-    /**
-     * Zend_Service_Rest instance
-     *
-     * @var Zend_Service_Rest
-     */
-    protected $_rest;
-
-    /**
-     * Username
-     *
-     * @var string
-     */
-    protected $_authUname;
-
-    /**
-     * Password
-     *
-     * @var string
-     */
-    protected $_authPass;
-
-    /**
-     * Microtime of last request
-     *
-     * @var float
-     */
-    protected static $_lastRequestTime = 0;
-
-    /**
-     * Constructs a new del.icio.us Web Services Client
-     *
-     * @param  string $uname Client username
-     * @param  string $pass  Client password
-     * @return void
-     */
-    public function __construct($uname = null, $pass = null)
-    {
-        $this->_rest = new Zend_Rest_Client();
-        $this->_rest->getHttpClient()->setConfig(array('ssltransport' => 'ssl'));
-        $this->setAuth($uname, $pass);
-    }
-
-    /**
-     * Set client username and password
-     *
-     * @param  string $uname Client user name
-     * @param  string $pass  Client password
-     * @return Zend_Service_Delicious Provides a fluent interface
-     */
-    public function setAuth($uname, $pass)
-    {
-        $this->_authUname = $uname;
-        $this->_authPass  = $pass;
-
-        return $this;
-    }
-
-    /**
-     * Get time of the last update
-     *
-     * @throws Zend_Service_Delicious_Exception
-     * @return Zend_Date
-     */
-    public function getLastUpdate()
-    {
-        $response = $this->makeRequest(self::PATH_UPDATE);
-
-        $rootNode = $response->documentElement;
-        if ($rootNode && $rootNode->nodeName == 'update') {
-            /**
-             * @todo replace strtotime() with Zend_Date equivalent
-             */
-            return new Zend_Date(strtotime($rootNode->getAttribute('time')));
-        } else {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception('del.icio.us web service has returned something odd!');
-        }
-    }
-
-    /**
-     * Get all tags, returning an array with tags as keys and number of corresponding posts as values
-     *
-     * @return array list of tags
-     */
-    public function getTags()
-    {
-        $response = $this->makeRequest(self::PATH_TAGS);
-
-        return self::_xmlResponseToArray($response, 'tags', 'tag', 'tag', 'count');
-    }
-
-    /**
-     * Rename a tag
-     *
-     * @param  string $old Old tag name
-     * @param  string $new New tag name
-     * @return Zend_Service_Delicious Provides a fluent interface
-     */
-    public function renameTag($old, $new)
-    {
-        $response = $this->makeRequest(self::PATH_TAG_RENAME, array('old' => $old, 'new' => $new));
-
-        self::_evalXmlResult($response);
-
-        return $this;
-    }
-
-    /**
-     * Get all bundles, returning an array with bundles as keys and array of tags as values
-     *
-     * @return array list of bundles
-     */
-    public function getBundles()
-    {
-        $response = $this->makeRequest(self::PATH_BUNDLES);
-
-        $bundles = self::_xmlResponseToArray($response, 'bundles', 'bundle', 'name', 'tags');
-        foreach ($bundles as &$tags) {
-            $tags = explode(' ', $tags);
-        }
-        return $bundles;
-    }
-
-    /**
-     * Adds a new bundle
-     *
-     * @param  string $bundle Name of new bundle
-     * @param  array  $tags   Array of tags
-     * @return Zend_Service_Delicious Provides a fluent interface
-     */
-    public function addBundle($bundle, array $tags)
-    {
-        $tags = implode(' ', (array) $tags);
-        $response = $this->makeRequest(self::PATH_BUNDLE_ADD, array('bundle' => $bundle, 'tags' => $tags));
-
-        self::_evalXmlResult($response);
-
-        return $this;
-    }
-
-    /**
-     * Delete a bundle
-     *
-     * @param  string $bundle Name of bundle to be deleted
-     * @return Zend_Service_Delicious Provides a fluent interface
-     */
-    public function deleteBundle($bundle)
-    {
-        $response = $this->makeRequest(self::PATH_BUNDLE_DELETE, array('bundle' => $bundle));
-
-        self::_evalXmlResult($response);
-
-        return $this;
-    }
-
-    /**
-     * Delete a post
-     *
-     * @param  string $url URL of post to be deleted
-     * @return Zend_Service_Delicious Provides a fluent interface
-     */
-    public function deletePost($url)
-    {
-        $response = $this->makeRequest(self::PATH_POST_DELETE, array('url' => $url));
-
-        self::_evalXmlResult($response);
-
-        return $this;
-    }
-
-    /**
-     * Get number of posts by date
-     *
-     * Returns array where keys are dates and values are numbers of posts
-     *
-     * @param  string $tag Optional filtering by tag
-     * @return array list of dates
-     */
-    public function getDates($tag = null)
-    {
-        $parms = array();
-        if ($tag) {
-            $parms['tag'] = $tag;
-        }
-
-        $response = $this->makeRequest(self::PATH_DATES, $parms);
-
-        return self::_xmlResponseToArray($response, 'dates', 'date', 'date', 'count');
-    }
-
-    /**
-     * Get posts matching the arguments
-     *
-     * If no date or url is given, most recent date will be used
-     *
-     * @param  string    $tag Optional filtering by tag
-     * @param  Zend_Date $dt  Optional filtering by date
-     * @param  string    $url Optional filtering by url
-     * @throws Zend_Service_Delicious_Exception
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function getPosts($tag = null, Zend_Date $dt = null, $url = null)
-    {
-        $parms = array();
-        if ($tag) {
-            $parms['tag'] = $tag;
-        }
-        if ($url) {
-            $parms['url'] = $url;
-        }
-        if ($dt) {
-            $parms['dt'] = $dt->get('Y-m-d\TH:i:s\Z');
-        }
-
-        $response = $this->makeRequest(self::PATH_POSTS_GET, $parms);
-
-        return $this->_parseXmlPostList($response);
-    }
-
-    /**
-     * Get all posts
-     *
-     * @param  string $tag Optional filtering by tag
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function getAllPosts($tag = null)
-    {
-        $parms = array();
-        if ($tag) {
-            $parms['tag'] = $tag;
-        }
-
-        $response = $this->makeRequest(self::PATH_POSTS_ALL, $parms);
-
-        return $this->_parseXmlPostList($response);
-    }
-
-    /**
-     * Get recent posts
-     *
-     * @param  string $tag   Optional filtering by tag
-     * @param  string $count Maximum number of posts to be returned (default 15)
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function getRecentPosts($tag = null, $count = 15)
-    {
-        $parms = array();
-        if ($tag) {
-            $parms['tag'] = $tag;
-        }
-        if ($count) {
-            $parms['count'] = $count;
-        }
-
-        $response = $this->makeRequest(self::PATH_POSTS_RECENT, $parms);
-
-        return $this->_parseXmlPostList($response);
-    }
-
-    /**
-     * Create new post
-     *
-     * @return Zend_Service_Delicious_Post
-     */
-    public function createNewPost($title, $url)
-    {
-        return new Zend_Service_Delicious_Post($this, array('title' => $title, 'url' => $url));
-    }
-
-    /**
-     * Get posts of a user
-     *
-     * @param  string $user  Owner of the posts
-     * @param  int    $count Number of posts (default 15, max. 100)
-     * @param  string $tag   Optional filtering by tag
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function getUserPosts($user, $count = null, $tag = null)
-    {
-        $parms = array();
-        if ($count) {
-            $parms['count'] = $count;
-        }
-
-        $path = sprintf(self::JSON_POSTS, $user, $tag);
-        $res = $this->makeRequest($path, $parms, 'json');
-
-        return new Zend_Service_Delicious_PostList($this, $res);
-    }
-
-    /**
-     * Get tags of a user
-     *
-     * Returned array has tags as keys and number of posts as values
-     *
-     * @param  string $user    Owner of the posts
-     * @param  int    $atleast Include only tags for which there are at least ### number of posts
-     * @param  int    $count   Number of tags to get (default all)
-     * @param  string $sort    Order of returned tags ('alpha' || 'count')
-     * @return array
-     */
-    public function getUserTags($user, $atleast = null, $count = null, $sort = 'alpha')
-    {
-        $parms = array();
-        if ($atleast) {
-            $parms['atleast'] = $atleast;
-        }
-        if ($count) {
-            $parms['count'] = $count;
-        }
-        if ($sort) {
-            $parms['sort'] = $sort;
-        }
-
-        $path = sprintf(self::JSON_TAGS, $user);
-
-        return $this->makeRequest($path, $parms, 'json');
-    }
-
-    /**
-     * Get network of a user
-     *
-     * @param  string $user Owner of the network
-     * @return array
-     */
-    public function getUserNetwork($user)
-    {
-        $path = sprintf(self::JSON_NETWORK, $user);
-        return $this->makeRequest($path, array(), 'json');
-    }
-
-    /**
-     * Get fans of a user
-     *
-     * @param  string $user Owner of the fans
-     * @return array
-     */
-    public function getUserFans($user)
-    {
-        $path = sprintf(self::JSON_FANS, $user);
-        return $this->makeRequest($path, array(), 'json');
-    }
-
-    /**
-     * Get details on a particular bookmarked URL
-     *
-     * Returned array contains four elements:
-     *  - hash - md5 hash of URL
-     *  - top_tags - array of tags and their respective usage counts
-     *  - url - URL for which details were returned
-     *  - total_posts - number of users that have bookmarked URL
-     *
-     * If URL hasen't been bookmarked null is returned.
-     *
-     * @param  string $url URL for which to get details
-     * @return array
-     */
-    public function getUrlDetails($url)
-    {
-        $parms = array('hash' => md5($url));
-
-        $res = $this->makeRequest(self::JSON_URL, $parms, 'json');
-
-        if(isset($res[0])) {
-            return $res[0];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Handles all GET requests to a web service
-     *
-     * @param   string $path  Path
-     * @param   array  $parms Array of GET parameters
-     * @param   string $type  Type of a request ("xml"|"json")
-     * @return  mixed  decoded response from web service
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    public function makeRequest($path, array $parms = array(), $type = 'xml')
-    {
-        // if previous request was made less then 1 sec ago
-        // wait until we can make a new request
-        $timeDiff = microtime(true) - self::$_lastRequestTime;
-        if ($timeDiff < 1) {
-            usleep((1 - $timeDiff) * 1000000);
-        }
-
-        $this->_rest->getHttpClient()->setAuth($this->_authUname, $this->_authPass);
-
-        switch ($type) {
-            case 'xml':
-                $this->_rest->setUri(self::API_URI);
-                break;
-            case 'json':
-                $parms['raw'] = true;
-                $this->_rest->setUri(self::JSON_URI);
-                break;
-            default:
-                /**
-                 * @see Zend_Service_Delicious_Exception
-                 */
-                require_once 'Zend/Service/Delicious/Exception.php';
-                throw new Zend_Service_Delicious_Exception('Unknown request type');
-        }
-
-        self::$_lastRequestTime = microtime(true);
-        $response = $this->_rest->restGet($path, $parms);
-
-        if (!$response->isSuccessful()) {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception("Http client reported an error: '{$response->getMessage()}'");
-        }
-
-        $responseBody = $response->getBody();
-
-        switch ($type) {
-            case 'xml':
-                $dom = new DOMDocument() ;
-
-                if (!@$dom->loadXML($responseBody)) {
-                    /**
-                     * @see Zend_Service_Delicious_Exception
-                     */
-                    require_once 'Zend/Service/Delicious/Exception.php';
-                    throw new Zend_Service_Delicious_Exception('XML Error');
-                }
-
-                return $dom;
-            case 'json':
-                return Zend_Json_Decoder::decode($responseBody);
-        }
-    }
-
-    /**
-     * Transform XML string to array
-     *
-     * @param   DOMDocument $response
-     * @param   string      $root     Name of root tag
-     * @param   string      $child    Name of children tags
-     * @param   string      $attKey   Attribute of child tag to be used as a key
-     * @param   string      $attValue Attribute of child tag to be used as a value
-     * @return  array
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    private static function _xmlResponseToArray(DOMDocument $response, $root, $child, $attKey, $attValue)
-    {
-        $rootNode = $response->documentElement;
-        $arrOut = array();
-
-        if ($rootNode->nodeName == $root) {
-            $childNodes = $rootNode->childNodes;
-
-            for ($i = 0; $i < $childNodes->length; $i++) {
-                $currentNode = $childNodes->item($i);
-                if ($currentNode->nodeName == $child) {
-                    $arrOut[$currentNode->getAttribute($attKey)] = $currentNode->getAttribute($attValue);
-                }
-            }
-        } else {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception('del.icio.us web service has returned something odd!');
-        }
-
-        return $arrOut;
-    }
-
-    /**
-     * Constructs Zend_Service_Delicious_PostList from XML response
-     *
-     * @param   DOMDocument $response
-     * @return  Zend_Service_Delicious_PostList
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    private function _parseXmlPostList(DOMDocument $response)
-    {
-        $rootNode = $response->documentElement;
-
-        if ($rootNode->nodeName == 'posts') {
-            return new Zend_Service_Delicious_PostList($this, $rootNode->childNodes);
-        } else {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception('del.icio.us web service has returned something odd!');
-        }
-    }
-
-    /**
-     * Evaluates XML response
-     *
-     * @param   DOMDocument $response
-     * @return  void
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    private static function _evalXmlResult(DOMDocument $response)
-    {
-        $rootNode = $response->documentElement;
-
-        if ($rootNode && $rootNode->nodeName == 'result') {
-
-            if ($rootNode->hasAttribute('code')) {
-                $strResponse = $rootNode->getAttribute('code');
-            } else {
-                $strResponse = $rootNode->nodeValue;
-            }
-
-            if ($strResponse != 'done' && $strResponse != 'ok') {
-                /**
-                 * @see Zend_Service_Delicious_Exception
-                 */
-                require_once 'Zend/Service/Delicious/Exception.php';
-                throw new Zend_Service_Delicious_Exception("del.icio.us web service: '{$strResponse}'");
-            }
-        } else {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception('del.icio.us web service has returned something odd!');
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Delicious/Exception.php b/airtime_mvc/library/Zend/Service/Delicious/Exception.php
deleted file mode 100644
index faee184f4..000000000
--- a/airtime_mvc/library/Zend/Service/Delicious/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Delicious_Exception extends Zend_Service_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/Delicious/Post.php b/airtime_mvc/library/Zend/Service/Delicious/Post.php
deleted file mode 100644
index 879e62a2f..000000000
--- a/airtime_mvc/library/Zend/Service/Delicious/Post.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Post.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Service_Delicious_SimplePost
- */
-require_once 'Zend/Service/Delicious/SimplePost.php';
-
-
-/**
- * Zend_Service_Delicious_Post represents a post of a user that can be edited
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Delicious_Post extends Zend_Service_Delicious_SimplePost
-{
-    /**
-     * Service that has downloaded the post
-     *
-     * @var Zend_Service_Delicious
-     */
-    protected $_service;
-
-    /**
-     * @var int Number of people that have the same post
-     */
-    protected $_others;
-
-    /**
-     * @var Zend_Date Post date
-     */
-    protected $_date;
-
-    /**
-     * @var bool Post share
-     */
-    protected $_shared = true;
-
-    /**
-     * @var string Post hash
-     */
-    protected $_hash;
-
-    /**
-     * Constructs a new del.icio.us post
-     *
-     * @param  Zend_Service_Delicious $service Service that has downloaded the post
-     * @param  DOMElement|array       $values  Post content
-     * @throws Zend_Service_Delicious_Exception
-     * @return void
-     */
-    public function __construct(Zend_Service_Delicious $service, $values)
-    {
-        $this->_service = $service;
-
-        if ($values instanceof DOMElement) {
-            $values = self::_parsePostNode($values);
-        }
-
-        if (!is_array($values) || !isset($values['url']) || !isset($values['title'])) {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception("Second argument must be array with at least 2 keys ('url' and"
-                                                     . " 'title')");
-        }
-
-        if (isset($values['date']) && ! $values['date'] instanceof Zend_Date) {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception("Date has to be an instance of Zend_Date");
-        }
-
-        foreach (array('url', 'title', 'notes', 'others', 'tags', 'date', 'shared', 'hash') as $key) {
-            if (isset($values[$key])) {
-                $this->{"_$key"}  = $values[$key];
-            }
-        }
-    }
-
-    /**
-     * Setter for title
-     *
-     * @param  string $newTitle
-     * @return Zend_Service_Delicious_Post
-     */
-    public function setTitle($newTitle)
-    {
-        $this->_title = (string) $newTitle;
-
-        return $this;
-    }
-
-    /**
-     * Setter for notes
-     *
-     * @param  string $newNotes
-     * @return Zend_Service_Delicious_Post
-     */
-    public function setNotes($newNotes)
-    {
-        $this->_notes = (string) $newNotes;
-
-        return $this;
-    }
-
-    /**
-     * Setter for tags
-     *
-     * @param  array $tags
-     * @return Zend_Service_Delicious_Post
-     */
-    public function setTags(array $tags)
-    {
-        $this->_tags = $tags;
-
-        return $this;
-    }
-
-    /**
-     * Add a tag
-     *
-     * @param  string $tag
-     * @return Zend_Service_Delicious_Post
-     */
-    public function addTag($tag)
-    {
-        $this->_tags[] = (string) $tag;
-
-        return $this;
-    }
-
-    /**
-     * Remove a tag
-     *
-     * @param  string $tag
-     * @return Zend_Service_Delicious_Post
-     */
-    public function removeTag($tag)
-    {
-        $this->_tags = array_diff($this->_tags, array((string) $tag));
-
-        return $this;
-    }
-
-    /**
-     * Getter for date
-     *
-     * @return Zend_Date
-     */
-    public function getDate()
-    {
-        return $this->_date;
-    }
-
-    /**
-     * Getter for others
-     *
-     * This property is only populated when posts are retrieved
-     * with getPosts() method. The getAllPosts() and getRecentPosts()
-     * methods will not populate this property.
-     *
-     * @return int
-     */
-    public function getOthers()
-    {
-        return $this->_others;
-    }
-
-    /**
-     * Getter for hash
-     *
-     * @return string
-     */
-    public function getHash()
-    {
-        return $this->_hash;
-    }
-
-    /**
-     * Getter for shared
-     *
-     * @return bool
-     */
-    public function getShared()
-    {
-        return $this->_shared;
-    }
-
-    /**
-     * Setter for shared
-     *
-     * @param  bool $isShared
-     * @return Zend_Service_Delicious_Post
-     */
-    public function setShared($isShared)
-    {
-        $this->_shared = (bool) $isShared;
-
-        return $this;
-    }
-
-    /**
-     * Deletes post
-     *
-     * @return Zend_Service_Delicious
-     */
-    public function delete()
-    {
-        return $this->_service->deletePost($this->_url);
-    }
-
-    /**
-     * Saves post
-     *
-     * @return DOMDocument
-     */
-    public function save()
-    {
-        $parms = array(
-            'url'        => $this->_url,
-            'description'=> $this->_title,
-            'extended'   => $this->_notes,
-            'shared'     => ($this->_shared ? 'yes' : 'no'),
-            'tags'       => implode(' ', (array) $this->_tags),
-            'replace'    => 'yes'
-        );
-        /*
-        if ($this->_date instanceof Zend_Date) {
-            $parms['dt'] = $this->_date->get('Y-m-d\TH:i:s\Z');
-        }
-        */
-
-        return $this->_service->makeRequest(Zend_Service_Delicious::PATH_POSTS_ADD, $parms);
-    }
-
-    /**
-     * Extracts content from the DOM element of a post
-     *
-     * @param  DOMElement $node
-     * @return array
-     */
-    protected static function _parsePostNode(DOMElement $node)
-    {
-        return array(
-            'url'    => $node->getAttribute('href'),
-            'title'  => $node->getAttribute('description'),
-            'notes'  => $node->getAttribute('extended'),
-            'others' => (int) $node->getAttribute('others'),
-            'tags'   => explode(' ', $node->getAttribute('tag')),
-            /**
-             * @todo replace strtotime() with Zend_Date equivalent
-             */
-            'date'   => new Zend_Date(strtotime($node->getAttribute('time'))),
-            'shared' => ($node->getAttribute('shared') == 'no' ? false : true),
-            'hash'   => $node->getAttribute('hash')
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Delicious/PostList.php b/airtime_mvc/library/Zend/Service/Delicious/PostList.php
deleted file mode 100644
index 623123104..000000000
--- a/airtime_mvc/library/Zend/Service/Delicious/PostList.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PostList.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * List of posts retrived from the del.icio.us web service
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Delicious_PostList implements Countable, Iterator, ArrayAccess
-{
-    /**
-     * @var array Array of Zend_Service_Delicious_Post
-     */
-    protected $_posts = array();
-
-    /**
-     * @var Zend_Service_Delicious Service that has downloaded the post list
-     */
-    protected $_service;
-
-    /**
-     * @var int Iterator key
-     */
-    protected $_iteratorKey = 0;
-
-    /**
-     * @param  Zend_Service_Delicious $service Service that has downloaded the post
-     * @param  DOMNodeList|array      $posts
-     * @return void
-     */
-    public function __construct(Zend_Service_Delicious $service, $posts = null)
-    {
-        $this->_service = $service;
-        if ($posts instanceof DOMNodeList) {
-            $this->_constructFromNodeList($posts);
-        } else if (is_array($posts)) {
-            $this->_constructFromArray($posts);
-        }
-    }
-
-    /**
-     * Transforms DOMNodeList to array of posts
-     *
-     * @param  DOMNodeList $nodeList
-     * @return void
-     */
-    private function _constructFromNodeList(DOMNodeList $nodeList)
-    {
-        for ($i = 0; $i < $nodeList->length; $i++) {
-            $curentNode = $nodeList->item($i);
-            if($curentNode->nodeName == 'post') {
-                $this->_addPost(new Zend_Service_Delicious_Post($this->_service, $curentNode));
-            }
-        }
-    }
-
-    /**
-     * Transforms the Array to array of posts
-     *
-     * @param  array $postList
-     * @return void
-     */
-    private function _constructFromArray(array $postList)
-    {
-        foreach ($postList as $f_post) {
-            $this->_addPost(new Zend_Service_Delicious_SimplePost($f_post));
-        }
-    }
-
-    /**
-     * Add a post
-     *
-     * @param  Zend_Service_Delicious_SimplePost $post
-     * @return Zend_Service_Delicious_PostList
-     */
-    protected function _addPost(Zend_Service_Delicious_SimplePost $post)
-    {
-        $this->_posts[] = $post;
-
-        return $this;
-    }
-
-    /**
-     * Filter list by list of tags
-     *
-     * @param  array $tags
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function withTags(array $tags)
-    {
-        $postList = new self($this->_service);
-
-        foreach ($this->_posts as $post) {
-            if (count(array_diff($tags, $post->getTags())) == 0) {
-                $postList->_addPost($post);
-            }
-        }
-
-        return $postList;
-    }
-
-    /**
-     * Filter list by tag
-     *
-     * @param  string $tag
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function withTag($tag)
-    {
-        return $this->withTags(func_get_args());
-    }
-
-    /**
-     * Filter list by urls matching a regular expression
-     *
-     * @param  string $regexp
-     * @return Zend_Service_Delicious_PostList
-     */
-    public function withUrl($regexp)
-    {
-        $postList = new self($this->_service);
-
-        foreach ($this->_posts as $post) {
-            if (preg_match($regexp, $post->getUrl())) {
-                $postList->_addPost($post);
-            }
-        }
-
-        return $postList;
-    }
-
-    /**
-     * Return number of posts
-     *
-     * Implement Countable::count()
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_posts);
-    }
-
-    /**
-     * Return the current element
-     *
-     * Implement Iterator::current()
-     *
-     * @return Zend_Service_Delicious_SimplePost
-     */
-    public function current()
-    {
-        return $this->_posts[$this->_iteratorKey];
-    }
-
-    /**
-     * Return the key of the current element
-     *
-     * Implement Iterator::key()
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_iteratorKey;
-    }
-
-    /**
-     * Move forward to next element
-     *
-     * Implement Iterator::next()
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_iteratorKey += 1;
-    }
-
-    /**
-     * Rewind the Iterator to the first element
-     *
-     * Implement Iterator::rewind()
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_iteratorKey = 0;
-    }
-
-    /**
-     * Check if there is a current element after calls to rewind() or next()
-     *
-     * Implement Iterator::valid()
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        $numItems = $this->count();
-
-        if ($numItems > 0 && $this->_iteratorKey < $numItems) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Whether the offset exists
-     *
-     * Implement ArrayAccess::offsetExists()
-     *
-     * @param   int     $offset
-     * @return  bool
-     */
-    public function offsetExists($offset)
-    {
-        return ($offset < $this->count());
-    }
-
-    /**
-     * Return value at given offset
-     *
-     * Implement ArrayAccess::offsetGet()
-     *
-     * @param   int     $offset
-     * @throws  OutOfBoundsException
-     * @return  Zend_Service_Delicious_SimplePost
-     */
-    public function offsetGet($offset)
-    {
-        if ($this->offsetExists($offset)) {
-            return $this->_posts[$offset];
-        } else {
-            throw new OutOfBoundsException('Illegal index');
-        }
-    }
-
-    /**
-     * Throws exception because all values are read-only
-     *
-     * Implement ArrayAccess::offsetSet()
-     *
-     * @param   int     $offset
-     * @param   string  $value
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    public function offsetSet($offset, $value)
-    {
-        /**
-         * @see Zend_Service_Delicious_Exception
-         */
-        require_once 'Zend/Service/Delicious/Exception.php';
-        throw new Zend_Service_Delicious_Exception('You are trying to set read-only property');
-    }
-
-    /**
-     * Throws exception because all values are read-only
-     *
-     * Implement ArrayAccess::offsetUnset()
-     *
-     * @param   int     $offset
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    public function offsetUnset($offset)
-    {
-        /**
-         * @see Zend_Service_Delicious_Exception
-         */
-        require_once 'Zend/Service/Delicious/Exception.php';
-        throw new Zend_Service_Delicious_Exception('You are trying to unset read-only property');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Delicious/SimplePost.php b/airtime_mvc/library/Zend/Service/Delicious/SimplePost.php
deleted file mode 100644
index 2cdc65d8c..000000000
--- a/airtime_mvc/library/Zend/Service/Delicious/SimplePost.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimplePost.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Represents a publicly available post
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Delicious
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Delicious_SimplePost
-{
-    /**
-     * @var string Post url
-     */
-    protected $_url;
-
-    /**
-     * @var string Post title
-     */
-    protected $_title;
-
-    /**
-     * @var string Post notes
-     */
-    protected $_notes;
-
-    /**
-     * @var array Post tags
-     */
-    protected $_tags = array();
-
-    /**
-     * Constructor
-     *
-     * @param   array $post Post data
-     * @return  void
-     * @throws  Zend_Service_Delicious_Exception
-     */
-    public function __construct(array $post)
-    {
-        if (!isset($post['u']) || !isset($post['d'])) {
-            /**
-             * @see Zend_Service_Delicious_Exception
-             */
-            require_once 'Zend/Service/Delicious/Exception.php';
-            throw new Zend_Service_Delicious_Exception('Title and URL not set.');
-        }
-
-        $this->_url   = $post['u'];
-        $this->_title = $post['d'];
-
-        if (isset($post['t'])) {
-            $this->_tags = $post['t'];
-        }
-        if (isset($post['n'])) {
-            $this->_notes = $post['n'];
-        }
-    }
-
-    /**
-     * Getter for URL
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Getter for title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Getter for notes
-     *
-     * @return string
-     */
-    public function getNotes()
-    {
-        return $this->_notes;
-    }
-
-    /**
-     * Getter for tags
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService.php
deleted file mode 100644
index b4d76d5c3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BaseUserService.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_BaseUserService_AccountBalance
- */
-require_once 'Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance
- */
-require_once 'Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_BaseUserService extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-admin/services/ODGBaseUserService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/ODGBaseUserService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'getQuotaInformationResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse',
-        'changeQuotaPoolResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse',
-        'getAccountBalanceResponse' =>
-            'Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse',
-        'AccountBalance' =>
-            'Zend_Service_DeveloperGarden_BaseUserService_AccountBalance',
-    );
-
-    /**
-     * array with all QuotaModuleIds
-     *
-     * @var array
-     */
-    protected $_moduleIds = array(
-        'SmsProduction'            => 'SmsProduction',
-        'SmsSandbox'               => 'SmsSandbox',
-        'VoiceCallProduction'      => 'VoiceButlerProduction',
-        'VoiceCallSandbox'         => 'VoiceButlerSandbox',
-        'ConferenceCallProduction' => 'CCSProduction',
-        'ConferenceCallSandbox'    => 'CCSSandbox',
-        'LocalSearchProduction'    => 'localsearchProduction',
-        'LocalSearchSandbox'       => 'localsearchSandbox',
-        'IPLocationProduction'     => 'IPLocationProduction',
-        'IPLocationSandbox'        => 'IPLocationSandbox'
-    );
-
-    /**
-     * returns an array with all possible ModuleIDs
-     *
-     * @return array
-     */
-    public function getModuleIds()
-    {
-        return $this->_moduleIds;
-    }
-
-    /**
-     * checks the moduleId and throws exception if not valid
-     *
-     * @param string $moduleId
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    protected function _checkModuleId($moduleId)
-    {
-        if (!in_array($moduleId, $this->_moduleIds)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('moduleId not valid');
-        }
-    }
-
-    /**
-     * returns the correct module string
-     *
-     * @param string $module
-     * @param integer $environment
-     * @return string
-     */
-    protected function _buildModuleString($module, $environment)
-    {
-        $moduleString = $module;
-        switch($environment) {
-            case self::ENV_PRODUCTION :
-                $moduleString .= 'Production';
-                break;
-            case self::ENV_SANDBOX :
-                $moduleString .= 'Sandbox';
-                break;
-            default:
-                require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-                throw new Zend_Service_DeveloperGarden_Client_Exception(
-                    'Not a valid environment supplied.'
-                );
-        }
-
-        if (!in_array($moduleString, $this->_moduleIds)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Not a valid module name supplied.'
-            );
-        }
-
-        return $moduleString;
-    }
-
-    /**
-     * returns the request object with the specific moduleId
-     *
-     * @param string $moduleId
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    protected function _getRequestModule($moduleId)
-    {
-        return new Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation(
-            $moduleId
-        );
-    }
-
-    /**
-     * returns the request object with the specific moduleId and new quotaMax value
-     *
-     * @param string $moduleId
-     * @param integer $quotaMax
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    protected function _getChangeRequestModule($moduleId, $quotaMax)
-    {
-        return new Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool(
-            $moduleId,
-            $quotaMax
-        );
-    }
-
-    /**
-     * returns the Quota Information for SMS Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getSmsQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('Sms', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for VoiceCall Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getVoiceCallQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('VoiceButler', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for SMS ConferenceCall
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getConfernceCallQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('CCS', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for LocaleSearch Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getLocalSearchQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('localsearch', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the Quota Information for IPLocation Service
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getIPLocationQuotaInformation($environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('IPLocation', $environment);
-        $request  = $this->_getRequestModule($moduleId);
-        return $this->getQuotaInformation($request);
-    }
-
-    /**
-     * returns the quota information
-     *
-     * @param Zend_Service_DeveloperGarden_Request_BaseUserService $request
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-     */
-    public function getQuotaInformation(
-        Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation $request
-    ) {
-        $this->_checkModuleId($request->getModuleId());
-        return $this->getSoapClient()
-                    ->getQuotaInformation($request)
-                    ->parse();
-    }
-
-    /**
-     * sets new user quota for the sms service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeSmsQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('Sms', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the voice call service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeVoiceCallQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('VoiceButler', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the IPLocation service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeIPLocationQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('IPLocation', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the Conference Call service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeConferenceCallQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('CCS', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * sets new user quota for the Local Search service
-     *
-     * @param integer $quotaMax
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeLocalSearchQuotaPool($quotaMax = 0, $environment = self::ENV_PRODUCTION)
-    {
-        self::checkEnvironment($environment);
-        $moduleId = $this->_buildModuleString('localsearch', $environment);
-        $request  = $this->_getChangeRequestModule($moduleId, $quotaMax);
-        return $this->changeQuotaPool($request);
-    }
-
-    /**
-     * set new quota values for the defined module
-     *
-     * @param Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool $request
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-     */
-    public function changeQuotaPool(
-        Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool $request
-    ) {
-        $this->_checkModuleId($request->getModuleId());
-        return $this->getSoapClient()
-                    ->changeQuotaPool($request)
-                    ->parse();
-    }
-
-    /**
-     * get the result for a list of accounts
-     *
-     * @param array $accounts
-     * @return Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
-     */
-    public function getAccountBalance(array $accounts = array())
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance(
-            $accounts
-        );
-        return $this->getSoapClient()
-                    ->getAccountBalance($request)
-                    ->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
deleted file mode 100644
index bbc5f4140..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_BaseUserService_AccountBalance
-{
-    /**
-     * @var integer
-     */
-    public $Account = null;
-
-    /**
-     * @var integer $Credits
-     */
-    public $Credits = null;
-
-    /**
-     * returns the account id
-     *
-     * @return integer
-     */
-    public function getAccount()
-    {
-        return $this->Account;
-    }
-
-    /**
-     * returns the credits
-     *
-     * @return integer
-     */
-    public function getCredits()
-    {
-        return $this->Credits;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
deleted file mode 100644
index 9f4adaafa..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ClientAbstract.php 20419 2010-01-19 13:20:12Z bate $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_Soap
- */
-require_once 'Zend/Service/DeveloperGarden/Client/Soap.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Credential
- */
-require_once 'Zend/Service/DeveloperGarden/Credential.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_SecurityTokenServer
- */
-require_once 'Zend/Service/DeveloperGarden/SecurityTokenServer.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * constants for using with the odg api
-     */
-    const ENV_PRODUCTION = 1; // Production Environment
-    const ENV_SANDBOX    = 2; // Sandbox Environment, limited access to the api
-    const ENV_MOCK       = 3; // Api calls are without any functionality
-
-    const PARTICIPANT_MUTE_OFF = 0; // removes mute from participant in a conference
-    const PARTICIPANT_MUTE_ON  = 1; // mute participant in a conference
-    const PARTICIPANT_RECALL   = 2; // recalls the participant in a conference
-
-    /**
-     * array of all possible env types
-     *
-     * @var int
-     */
-    static protected $_consts = null;
-
-    /**
-     * Available options
-     *
-     * @var array available options
-     */
-    protected $_options = array();
-
-    /**
-     * The service id to generate the auth service token
-     *
-     * @var string
-     */
-    protected $_serviceAuthId = 'https://odg.t-online.de';
-
-    /**
-     * Variable that holds the Zend_Service_DeveloperGarden env value
-     *
-     * @var int
-     */
-    protected $_serviceEnvironment = Zend_Service_DeveloperGarden_Client_ClientAbstract::ENV_PRODUCTION;
-
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = null;
-
-    /**
-     * the local wsdlFile
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = null;
-
-    /**
-     * should we use the local wsdl file?
-     *
-     * @var boolean
-     */
-    protected $_useLocalWsdl = true;
-
-    /**
-     * class with credentials
-     *
-     * @var Zend_Service_DeveloperGarden_Credential
-     */
-    protected $_credential = null;
-
-    /**
-     * The internal Soap Client
-     *
-     * @var Zend_Soap_Client
-     */
-    protected $_soapClient = null;
-
-    /**
-     * array with options for classmapping
-     *
-     * @var array
-     */
-    protected $_classMap = array();
-
-    /**
-     * constructor
-     *
-     * @param array $options Associative array of options
-     */
-    public function __construct(array $options = array())
-    {
-        $this->_credential = new Zend_Service_DeveloperGarden_Credential();
-
-        while (list($name, $value) = each($options)) {
-            switch (ucfirst($name)) {
-                case 'Username' :
-                    $this->_credential->setUsername($value);
-                    break;
-                case 'Password' :
-                    $this->_credential->setPassword($value);
-                    break;
-                case 'Realm' :
-                    $this->_credential->setRealm($value);
-                    break;
-                case 'Environment' :
-                    $this->setEnvironment($value);
-            }
-        }
-
-        if (empty($this->_wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFile not set for this service.');
-        }
-
-        if (!empty($this->_wsdlFileLocal)) {
-            $this->_wsdlFileLocal = realpath(dirname(__FILE__) . '/../' . $this->_wsdlFileLocal);
-        }
-
-        if (empty($this->_wsdlFileLocal) || $this->_wsdlFileLocal === false) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFileLocal not set for this service.');
-        }
-    }
-
-    /**
-     * Set an option
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setOption($name, $value)
-    {
-        if (!is_string($name)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Incorrect option name: ' . $name);
-        }
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            $this->_options[$name] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * get an option value from the internal options object
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getOption($name)
-    {
-        $name = strtolower($name);
-        if (array_key_exists($name, $this->_options)) {
-            return $this->_options[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * returns the internal soap client
-     * if not allready exists we create an instance of
-     * Zend_Soap_Client
-     *
-     * @final
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    final public function getSoapClient()
-    {
-        if ($this->_soapClient === null) {
-            /**
-             * init the soapClient
-             */
-            $this->_soapClient = new Zend_Service_DeveloperGarden_Client_Soap(
-                $this->getWsdl(),
-                $this->getClientOptions()
-            );
-            $this->_soapClient->setCredential($this->_credential);
-            $tokenService = new Zend_Service_DeveloperGarden_SecurityTokenServer(
-                array(
-                    'username'    => $this->_credential->getUsername(),
-                    'password'    => $this->_credential->getPassword(),
-                    'environment' => $this->getEnvironment(),
-                    'realm'       => $this->_credential->getRealm(),
-                )
-            );
-            $this->_soapClient->setTokenService($tokenService);
-        }
-
-        return $this->_soapClient;
-    }
-
-    /**
-     * sets new environment
-     *
-     * @param int $environment
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setEnvironment($environment)
-    {
-        self::checkEnvironment($environment);
-        $this->_serviceEnvironment = $environment;
-        return $this;
-    }
-
-    /**
-     * returns the current configured environemnt
-     *
-     * @return int
-     */
-    public function getEnvironment()
-    {
-        return $this->_serviceEnvironment;
-    }
-
-    /**
-     * returns the wsdl file path, a uri or the local path
-     *
-     * @return string
-     */
-    public function getWsdl()
-    {
-        if ($this->_useLocalWsdl) {
-            $retVal = $this->_wsdlFileLocal;
-        } else {
-            $retVal = $this->_wsdlFile;
-        }
-
-        return $retVal;
-    }
-
-    /**
-     * switch to the local wsdl file usage
-     *
-     * @param boolen $use
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setUseLocalWsdl($use = true)
-    {
-        $this->_useLocalWsdl = (boolean) $use;
-        return $this;
-    }
-
-    /**
-     * sets a new wsdl file
-     *
-     * @param string $wsdlFile
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setWsdl($wsdlFile = null)
-    {
-        if (empty($wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFile not set for this service.');
-        }
-        $this->_wsdlFile = $wsdlFile;
-        return $this;
-    }
-
-    /**
-     * sets a new local wsdl file
-     *
-     * @param string $wsdlFile
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setLocalWsdl($wsdlFile = null)
-    {
-        if (empty($wsdlFile)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('_wsdlFileLocal not set for this service.');
-        }
-        $this->_wsdlFileLocal = $wsdlFile;
-        return $this;
-    }
-
-    /**
-     * returns an array with configured options for this client
-     *
-     * @return array
-     */
-    public function getClientOptions()
-    {
-        $options = array(
-            'soap_version' => SOAP_1_1,
-        );
-        if (!empty($this->_classMap)) {
-            $options['classmap'] = $this->_classMap;
-        }
-        $wsdlCache = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getWsdlCache();
-        if (!is_null($wsdlCache)) {
-            $options['cache_wsdl'] = $wsdlCache;
-        }
-        return $options;
-    }
-
-    /**
-     * returns the internal credential object
-     *
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function getCredential()
-    {
-        return $this->_credential;
-    }
-
-    /**
-     * helper method to create const arrays
-     * @return null
-     */
-    static protected function _buildConstArray()
-    {
-        $r = new ReflectionClass(__CLASS__);
-        foreach ($r->getConstants() as $k => $v) {
-            $s = explode('_', $k, 2);
-            if (!isset(self::$_consts[$s[0]])) {
-                self::$_consts[$s[0]] = array();
-            }
-            self::$_consts[$s[0]][$v] = $k;
-        }
-    }
-
-    /**
-     * returns an array of all available environments
-     *
-     * @return array
-     */
-    static public function getParticipantActions()
-    {
-        if (empty(self::$_consts)) {
-            self::_buildConstArray();
-        }
-        return self::$_consts['PARTICIPANT'];
-    }
-
-    /**
-     * checks if the given action is valid
-     * otherwise it @throws Zend_Service_DeveloperGarden_Exception
-     *
-     * @param int $action
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    static public function checkParticipantAction($action)
-    {
-        if (!array_key_exists($action, self::getParticipantActions())) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Wrong Participant Action ' . $action . ' supplied.'
-            );
-        }
-    }
-
-    /**
-     * returns an array of all available environments
-     *
-     * @return array
-     */
-    static public function getEnvironments()
-    {
-        if (empty(self::$_consts)) {
-            self::_buildConstArray();
-        }
-        return self::$_consts['ENV'];
-    }
-
-    /**
-     * checks if the given environemnt is valid
-     * otherwise it @throws Zend_Service_DeveloperGarden_Client_Exception
-     *
-     * @param int $environment
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return void
-     */
-    static public function checkEnvironment($environment)
-    {
-        if (!array_key_exists($environment, self::getEnvironments())) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception(
-                'Wrong environment ' . $environment . ' supplied.'
-            );
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Exception.php
deleted file mode 100644
index 999266dee..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Client_Exception extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Soap.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Soap.php
deleted file mode 100644
index 85b4ae374..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Client/Soap.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Soap.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Client
- */
-require_once 'Zend/Soap/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Client_Soap extends Zend_Soap_Client
-{
-    /**
-     * class with credential interface
-     *
-     * @var Zend_Service_DeveloperGarden_Credential
-     */
-    private $_credential = null;
-
-    /**
-     * WSSE Security Ext Namespace
-     *
-     * @var string
-     */
-    const WSSE_NAMESPACE_SECEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
-
-    /**
-     * WSSE Saml Namespace
-     *
-     * @var string
-     */
-    const WSSE_NAMESPACE_SAML = 'urn:oasis:names:tc:SAML:2.0:assertion';
-
-    /**
-     * Security Element
-     *
-     * @var string
-     */
-    const WSSE_SECURITY_ELEMENT = 'Security';
-
-    /**
-     * UsernameToken Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_USERNAMETOKEN = 'UsernameToken';
-
-    /**
-     * Usernae Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_USERNAME = 'Username';
-
-    /**
-     * Password Element
-     *
-     * @var string
-     */
-    const WSSE_ELEMENT_PASSWORD = 'Password';
-
-    /**
-     * Password Element WSSE Type
-     *
-     */
-    const WSSE_ELEMENT_PASSWORD_TYPE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
-
-    /**
-     * is this client used by the token service
-     *
-     * @var Zend_Service_DeveloperGarden_SecurityTokenServer
-     */
-    protected $_tokenService = null;
-
-    /**
-     * Perform a SOAP call but first check for adding STS Token or fetch one
-     *
-     * @param string $name
-     * @param array  $arguments
-     * @return mixed
-     */
-    public function __call($name, $arguments)
-    {
-        /**
-         * add WSSE Security header
-         */
-        if (!is_null($this->_tokenService)) {
-            // if login method we addWsseLoginHeader
-            if (in_array('login', $arguments)) {
-                $this->addWsseLoginHeader();
-            } elseif ($name == 'getTokens') {
-                $this->addWsseTokenHeader($this->_tokenService->getLoginToken());
-            } else {
-                $this->addWsseSecurityTokenHeader($this->_tokenService->getTokens());
-            }
-        }
-        return parent::__call($name, $arguments);
-    }
-
-    /**
-     * sets the internal handling for handle token service
-     *
-     * @param Zend_Service_DeveloperGarden_SecurityTokenServer $isTokenService
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function setTokenService(Zend_Service_DeveloperGarden_SecurityTokenServer $tokenService)
-    {
-        $this->_tokenService = $tokenService;
-        return $this;
-    }
-
-    /**
-     * returns the currently configured tokenService object
-     *
-     * @return Zend_Service_DeveloperGarden_SecurityTokenServer
-     */
-    public function getTokenService()
-    {
-        return $this->_tokenService;
-    }
-
-    /**
-     * Sets new credential callback object
-     *
-     * @param Zend_Service_DeveloperGarden_Credential $credential
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function setCredential(Zend_Service_DeveloperGarden_Credential $credential)
-    {
-        $this->_credential = $credential;
-        return $this;
-    }
-
-    /**
-     * returns the internal credential callback object
-     *
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function getCredential()
-    {
-        return $this->_credential;
-    }
-
-    /**
-     * creates the login header and add
-     *
-     * @return SoapHeader
-     */
-    public function getWsseLoginHeader()
-    {
-        $dom = new DOMDocument();
-
-        /**
-         * Security Element
-         */
-        $securityElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            'wsse:' . self::WSSE_SECURITY_ELEMENT
-        );
-        $securityElement->setAttribute('mustUnderstand', true);
-
-        /**
-         * Username Token Element
-         */
-        $usernameTokenElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_USERNAMETOKEN
-        );
-
-        /**
-         * Username Element
-         */
-        $usernameElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_USERNAME,
-            $this->_credential->getUsername(true)
-        );
-
-        /**
-         * Password Element
-         */
-        $passwordElement = $dom->createElementNS(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_ELEMENT_PASSWORD,
-            $this->_credential->getPassword()
-        );
-        $passwordElement->setAttribute('Type', self::WSSE_ELEMENT_PASSWORD_TYPE);
-
-        $usernameTokenElement->appendChild($usernameElement);
-        $usernameTokenElement->appendChild($passwordElement);
-
-        $securityElement->appendChild($usernameTokenElement);
-        $dom->appendChild($securityElement);
-
-        $authSoapVar = new SoapVar(
-            $dom->saveXML($securityElement),
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * creates the token auth header for direct calls
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return SoapHeader
-     */
-    public function getWsseTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-    ) {
-        $format = '<wsse:%s xmlns:wsse="%s" SOAP-ENV:mustUnderstand="1">%s</wsse:%s>';
-        $securityHeader = sprintf(
-            $format,
-            self::WSSE_SECURITY_ELEMENT,
-            self::WSSE_NAMESPACE_SECEXT,
-            $token->getTokenData(),
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapVar = new SoapVar(
-            $securityHeader,
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * creates the security token auth header for direct calls
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return SoapHeader
-     */
-    public function getWsseSecurityTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse $token
-    ) {
-        $format = '<wsse:%s xmlns:wsse="%s" SOAP-ENV:mustUnderstand="1">%s</wsse:%s>';
-        $securityHeader = sprintf(
-            $format,
-            self::WSSE_SECURITY_ELEMENT,
-            self::WSSE_NAMESPACE_SECEXT,
-            $token->getTokenData(),
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapVar = new SoapVar(
-            $securityHeader,
-            XSD_ANYXML,
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT
-        );
-
-        $authSoapHeader = new SoapHeader(
-            self::WSSE_NAMESPACE_SECEXT,
-            self::WSSE_SECURITY_ELEMENT,
-            $authSoapVar,
-            true
-        );
-
-        return $authSoapHeader;
-    }
-
-    /**
-     * adds the login specific header to the client
-     *
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseLoginHeader()
-    {
-        return $this->addSoapInputHeader($this->getWsseLoginHeader());
-    }
-
-    /**
-     * adds the earlier fetched token to the header
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-    ) {
-        return $this->addSoapInputHeader($this->getWsseTokenHeader($token));
-    }
-
-    /**
-     * adds the earlier fetched token to the header
-     *
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse $token
-     * @return Zend_Service_DeveloperGarden_Client_Soap
-     */
-    public function addWsseSecurityTokenHeader(
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse $token
-    ) {
-        return $this->addSoapInputHeader($this->getWsseSecurityTokenHeader($token));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall.php
deleted file mode 100644
index 515447569..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall.php
+++ /dev/null
@@ -1,872 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConferenceCall.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_Participant
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/Participant.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
- */
-require_once 'Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-ccs/services/ccsPort?wsdl';
-
-    /**
-     * the local WSDL file
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/ccsPort.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        //Struct
-        'ConferenceDetailStruct'  => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail',
-        'ConferenceAccStruct'     => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount',
-        'ScheduleStruct'          => 'Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule',
-        'ParticipantStruct'       => 'Zend_Service_DeveloperGarden_ConferenceCall_Participant',
-        'ParticipantDetailStruct' => 'Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail',
-        'ParticipantStatusStruct' => 'Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus',
-
-        //Responses
-        'CCSResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType',
-
-        //Conference
-        'createConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse',
-        'createConferenceResponseType'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType',
-        'removeConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse',
-        'commitConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse',
-        'updateConferenceResponse'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse',
-        'getConferenceStatusResponse'      => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse',
-        'getConferenceStatusResponseType'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType',
-        'getRunningConferenceResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse',
-        'getRunningConferenceResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType',
-        'getConferenceListResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse',
-        'getConferenceListResponseType'    => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType',
-
-        //Participant
-        'newParticipantResponse'           => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse',
-        'newParticipantResponseType'       => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType',
-        'removeParticipantResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse',
-        'updateParticipantResponse'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse',
-        'getParticipantStatusResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse',
-        'getParticipantStatusResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType',
-
-        //Templates
-        'createConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse',
-        'createConferenceTemplateResponseType'         => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType',
-        'getConferenceTemplateResponse'                => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse',
-        'getConferenceTemplateResponseType'            => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType',
-        'updateConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse',
-        'removeConferenceTemplateResponse'             => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse',
-        'getConferenceTemplateListResponse'            => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse',
-        'getConferenceTemplateListResponseType'        => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType',
-        'addConferenceTemplateParticipantResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse',
-        'addConferenceTemplateParticipantResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType',
-        'getConferenceTemplateParticipantResponse'     => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse',
-        'getConferenceTemplateParticipantResponseType' => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType',
-        'updateConferenceTemplateParticipantResponse'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse',
-        'removeConferenceTemplateParticipantResponse'  => 'Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse',
-    );
-
-    /**
-     * creates a new conference, ownerId should be between 3 and 39
-     * chars
-     *
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-     */
-    public function createConference($ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest(
-            $this->getEnvironment(),
-            $ownerId,
-            $conferenceDetails,
-            $conferenceSchedule,
-            $account
-        );
-
-        $result = $this->getSoapClient()->createConference(array(
-            'createConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * commits the given conference
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
-     */
-    public function commitConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->commitConference(array(
-            'commitConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates a conference with the given parameter
-     *
-     * @param string $conferenceId
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param string $account
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConference(
-        $conferenceId,
-        $ownerId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $ownerId,
-            $conferenceDetails,
-            $conferenceSchedule,
-            $account
-        );
-
-        $result = $this->getSoapClient()->updateConference(array(
-            'updateConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * get conference status details
-     *
-     * @param string $conferenceId
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-     */
-    public function getConferenceStatus($conferenceId, $what = 0)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $what
-        );
-
-        $result = $this->getSoapClient()->getConferenceStatus(array(
-            'getConferenceStatusRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns the conferenceId of the running conference instance for a planned
-     * recurring conference or the current conferenceId
-     *
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-     */
-    public function getRunningConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->getRunningConference(array(
-            'getRunningConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * remove a conference
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConference($conferenceId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest(
-            $this->getEnvironment(),
-            $conferenceId
-        );
-
-        $result = $this->getSoapClient()->removeConference(array(
-            'removeConferenceRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns a list of conferences
-     *
-     * @param integer $what
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-     */
-    public function getConferenceList($what = 0, $ownerId = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest(
-            $this->getEnvironment(),
-            $what,
-            $ownerId
-        );
-
-        $result = $this->getSoapClient()->getConferenceList(array(
-            'getConferenceListRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * adds a new participant to the given conference
-     *
-     * @param string $conferenceId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-     */
-    public function newParticipant(
-        $conferenceId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->newParticipant(array(
-            'newParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * fetches the participant details for the given conferenceId
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-     */
-    public function getParticipantStatus($conferenceId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->getParticipantStatus(array(
-            'getParticipantStatusRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * removes the given participant from the conference
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeParticipant($conferenceId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->removeParticipant(array(
-            'removeParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates the participant in the given conference
-     *
-     * @param string $conferenceId
-     * @param string $participantId
-     * @param integer $action
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateParticipant(
-        $conferenceId,
-        $participantId,
-        $action = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest(
-            $this->getEnvironment(),
-            $conferenceId,
-            $participantId,
-            $action,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->updateParticipant(array(
-            'updateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * creates a new conference template
-     *
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param array $participants
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-     */
-    public function createConferenceTemplate(
-        $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        array $participants = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $ownerId,
-            $conferenceDetails,
-            $participants
-        );
-
-        $result = $this->getSoapClient()->createConferenceTemplate(array(
-            'createConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * get a specific template
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-     */
-    public function getConferenceTemplate($templateId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplate(array(
-            'getConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates a conference template
-     *
-     * @param string $templateId
-     * @param string $initiatorId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConferenceTemplate(
-        $templateId,
-        $initiatorId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $initiatorId,
-            $conferenceDetails
-        );
-
-        $result = $this->getSoapClient()->updateConferenceTemplate(array(
-            'updateConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * remove a conference template
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConferenceTemplate($templateId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest(
-            $this->getEnvironment(),
-            $templateId
-        );
-
-        $result = $this->getSoapClient()->removeConferenceTemplate(array(
-            'removeConferenceTemplateRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * lists all available conference templates for the given owner
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-     */
-    public function getConferenceTemplateList($ownerId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest(
-            $this->getEnvironment(),
-            $ownerId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplateList(array(
-            'getConferenceTemplateListRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * adds a new participants to the template
-     *
-     * @param string $templateId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-     */
-    public function addConferenceTemplateParticipant(
-        $templateId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->addConferenceTemplateParticipant(array(
-            'addConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * returns a praticipant for the given templateId
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-     */
-    public function getConferenceTemplateParticipant($templateId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->getConferenceTemplateParticipant(array(
-            'getConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * updates the participants details
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function updateConferenceTemplateParticipant(
-        $templateId,
-        $participantId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId,
-            $participant
-        );
-
-        $result = $this->getSoapClient()->updateConferenceTemplateParticipant(array(
-            'updateConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * removes a praticipant from the given templateId
-     *
-     * @param string $templateId
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public function removeConferenceTemplateParticipant($templateId, $participantId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest(
-            $this->getEnvironment(),
-            $templateId,
-            $participantId
-        );
-
-        $result = $this->getSoapClient()->removeConferenceTemplateParticipant(array(
-            'removeConferenceTemplateParticipantRequest' => $request
-        ));
-
-        return $result->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
deleted file mode 100644
index 89b26790c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConferenceAccount.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
-{
-    /**
-     * type of billing
-     *
-     * @var string
-     */
-    public $billingtype = null;
-
-    /**
-     * account id
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * @return integer
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillingType()
-    {
-        return $this->billingtype;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
deleted file mode 100644
index 823274f89..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConferenceDetail.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-{
-    /**
-     * name of this conference
-     *
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * description of this conference
-     *
-     * @var string
-     */
-    public $description = null;
-
-    /**
-     * duration in seconds of this conference
-     *
-     * @var integer
-     */
-    public $duration = null;
-
-    /**
-     * create object
-     *
-     * @param string $name
-     * @param string $description
-     * @param integer $duration
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function __construct($name, $description, $duration)
-    {
-        $this->setName($name);
-        $this->setDescription($description);
-        $this->setDuration($duration);
-    }
-
-    /**
-     * sets new duration for this conference in seconds
-     *
-     * @param integer $duration
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setDuration($duration)
-    {
-        $this->duration = $duration;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDuration()
-    {
-        return $this->duration;
-    }
-
-    /**
-     * set the description of this conference
-     *
-     * @param $description the $description to set
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setDescription($description)
-    {
-        $this->description = $description;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * sets the name of this conference
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
deleted file mode 100644
index a2c1b1854..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConferenceSchedule.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-{
-    /**
-     * @var integer
-     */
-    public $minute = null;
-
-    /**
-     * @var integer
-     */
-    public $hour = null;
-
-    /**
-     * @var integer
-     */
-    public $dayOfMonth = null;
-
-    /**
-     * @var integer
-     */
-    public $month = null;
-
-    /**
-     * @var integer
-     */
-    public $year = null;
-
-    /**
-     * @var integer
-     */
-    public $recurring = 0;
-
-    /**
-     * @var integer
-     */
-    public $notify = 0;
-
-    /**
-     * possible recurring values
-     *
-     * @var array
-     */
-    private $_recurringValues = array(
-        0 => 'no recurring',
-        1 => 'hourly',
-        2 => 'daily',
-        3 => 'weekly',
-        4 => 'monthly',
-    );
-
-    /**
-     * constructor for schedule object, all times are in UTC
-     *
-     * @param integer $minute
-     * @param integer $hour
-     * @param integer $dayOfMonth
-     * @param integer $month
-     * @param integer $year
-     * @param integer $recurring
-     * @param integer $notify
-     */
-    public function __construct($minute, $hour, $dayOfMonth, $month, $year, $recurring = 0, $notify = 0)
-    {
-        $this->setMinute($minute)
-             ->setHour($hour)
-             ->setDayOfMonth($dayOfMonth)
-             ->setMonth($month)
-             ->setYear($year)
-             ->setRecurring($recurring)
-             ->setNotify($notify);
-    }
-
-    /**
-     * returns the value of $minute
-     *
-     * @return integer
-     */
-    public function getMinute()
-    {
-        return $this->minute;
-    }
-
-    /**
-     * sets $minute
-     *
-     * @param integer $minute
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setMinute($minute)
-    {
-        $this->minute = $minute;
-        return $this;
-    }
-
-    /**
-     * returns the value of $hour
-     *
-     * @return integer
-     */
-    public function getHour()
-    {
-        return $this->hour;
-    }
-
-    /**
-     * sets $hour
-     *
-     * @param integer $hour
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setHour($hour)
-    {
-        $this->hour = $hour;
-        return $this;
-    }
-
-    /**
-     * returns the value of $dayOfMonth
-     *
-     * @return integer
-     */
-    public function getDayOfMonth()
-    {
-        return $this->dayOfMonth;
-    }
-
-    /**
-     * sets $dayOfMonth
-     *
-     * @param integer $dayOfMonth
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setDayOfMonth($dayOfMonth)
-    {
-        $this->dayOfMonth = $dayOfMonth;
-        return $this;
-    }
-
-    /**
-     * returns the value of $month
-     *
-     * @return integer
-     */
-    public function getMonth()
-    {
-        return $this->month;
-    }
-
-    /**
-     * sets $month
-     *
-     * @param integer $month
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setMonth($month)
-    {
-        $this->month = $month;
-        return $this;
-    }
-
-    /**
-     * returns the value of $year
-     *
-     * @return integer
-     */
-    public function getYear()
-    {
-        return $this->year;
-    }
-
-    /**
-     * sets $year
-     *
-     * @param integer $year
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setYear($year)
-    {
-        $this->year = $year;
-        return $this;
-    }
-
-    /**
-     * returns the value of $recurring
-     *
-     * @return integer
-     */
-    public function getRecurring()
-    {
-        return $this->recurring;
-    }
-
-    /**
-     * sets $recurring
-     *
-     * @param integer $recurring
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setRecurring($recurring)
-    {
-        if (!array_key_exists($recurring, $this->_recurringValues)) {
-            require_once 'Zend/Service/DeveloperGarden/ConferenceCall/Exception.php';
-            throw new Zend_Service_DeveloperGarden_ConferenceCall_Exception(
-                'Unknown ConferenceCall recurring mode.'
-            );
-        }
-        $this->recurring = $recurring;
-        return $this;
-    }
-
-    /**
-     * returns the value of $notify
-     *
-     * @return integer
-     */
-    public function getNotify()
-    {
-        return $this->notify;
-    }
-
-    /**
-     * sets $notify
-     *
-     * @param integer $notify
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function setNotify($notify)
-    {
-        $this->notify = $notify;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
deleted file mode 100644
index 2278a915a..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_Exception extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
deleted file mode 100644
index 57221a1b1..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Participant.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_Participant
-{
-    /**
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $detail = null;
-
-    /**
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * @var array
-     */
-    public $status = null;
-
-    /**
-     * participant details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * participant id
-     *
-     * @return string
-     */
-    public function getParticipantId()
-    {
-        return $this->participantId;
-    }
-
-    /**
-     * get the status
-     * returns an
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     *
-     * @return array
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
deleted file mode 100644
index f5b1f1dfb..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ParticipantDetail.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-/**
- * @see Zend_Validate_EmailAddress
- */
-require_once 'Zend/Validate/EmailAddress.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-{
-    /**
-     * @var string
-     */
-    public $firstName = null;
-
-    /**
-     * @var string
-     */
-    public $lastName = null;
-
-    /**
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * @var string
-     */
-    public $email = null;
-
-    /**
-     * @var integer
-     */
-    public $flags = null;
-
-    /**
-     * constructor for participant object
-     *
-     * @param string $firstName
-     * @param string $lastName
-     * @param string $number
-     * @param string $email
-     * @param integer $isInitiator
-     */
-    public function __construct($firstName, $lastName, $number, $email, $isInitiator = false)
-    {
-        $this->setFirstName($firstName)
-             ->setLastName($lastName)
-             ->setNumber($number)
-             ->setEmail($email)
-             ->setFlags((int) $isInitiator);
-    }
-
-    /**
-     * returns the value of $firstName
-     *
-     * @return string
-     */
-    public function getFirstName()
-    {
-        return $this->firstName;
-    }
-
-    /**
-     * sets $firstName
-     *
-     * @param string $firstName
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setFirstName($firstName)
-    {
-        $this->firstName = $firstName;
-        return $this;
-    }
-
-    /**
-     * returns the value of $lastName
-     *
-     * @return string
-     */
-    public function getLastName()
-    {
-        return $this->lastName;
-    }
-
-    /**
-     * sets $lastName
-     *
-     * @param string $lastName
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setLastName($lastName)
-    {
-        $this->lastName = $lastName;
-        return $this;
-    }
-
-    /**
-     * returns the value of $number
-     *
-     * @return string
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * sets $number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-
-    /**
-     * returns the value of $email
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->email;
-    }
-
-    /**
-     * sets $email
-     *
-     * @param string email
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setEmail($email)
-    {
-        $validator = new Zend_Validate_EmailAddress();
-
-        if (!$validator->isValid($email)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('Not a valid e-mail address.');
-        }
-        $this->email = $email;
-        return $this;
-    }
-
-    /**
-     * returns the value of $flags
-     *
-     * @return integer
-     */
-    public function getFlags()
-    {
-        return $this->flags;
-    }
-
-    /**
-     * sets $flags (ie, initiator flag)
-     *
-     * @param integer $flags
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function setFlags($flags)
-    {
-        $this->flags = $flags;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
deleted file mode 100644
index 3e7c3abe2..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ParticipantStatus.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-{
-    /**
-     * @var string
-     */
-    public $name = null;
-
-    /**
-     * @var string
-     */
-    public $value = null;
-
-    /**
-     * constructor for participant status object
-     *
-     * @param string $vame
-     * @param string $value
-     */
-    public function __construct($name, $value = null)
-    {
-        $this->setName($name)
-             ->setValue($value);
-    }
-
-    /**
-     * returns the value of $name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * sets $name
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * returns the value of $value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * sets $value
-     *
-     * @param string $value
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     */
-    public function setValue($value = null)
-    {
-        $this->value = $value;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Credential.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Credential.php
deleted file mode 100644
index 9b378fcb2..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Credential.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Credential.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Credential
-{
-    /**
-     * Service Auth Username
-     *
-     * @var string
-     */
-    protected $_username = null;
-
-    /**
-     * Service Password
-     *
-     * @var string
-     */
-    protected $_password = null;
-
-    /**
-     * Service Realm - default t-online.de
-     *
-     * @var string
-     */
-    protected $_realm = 't-online.de';
-
-    /**
-     * constructor to init the internal data
-     *
-     * @param string $username
-     * @param string $password
-     * @param string $realm
-     * @return Zend_Service_DeveloperGarden_Credential
-     */
-    public function __construct($username = null, $password = null, $realm = null)
-    {
-        if (!empty($username)) {
-            $this->setUsername($username);
-        }
-        if (!empty($password)) {
-            $this->setPassword($password);
-        }
-        if (!empty($realm)) {
-            $this->setRealm($realm);
-        }
-    }
-
-    /**
-     * split the password into an array
-     *
-     * @param string $password
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setPassword($password = null)
-    {
-        if (empty($password)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty password not permitted.');
-        }
-
-        if (!is_string($password)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Password must be a string.');
-        }
-
-        $this->_password = $password;
-        return $this;
-    }
-
-    /**
-     * returns the current configured password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * set the new login
-     *
-     * @param string $username
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setUsername($username = null)
-    {
-        if (empty($username)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty username not permitted.');
-        }
-
-        if (!is_string($username)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Username must be a string.');
-        }
-
-        $this->_username = $username;
-        return $this;
-    }
-
-    /**
-     * returns the username
-     *
-     * if $withRealm == true we combine username and realm like
-     * username@realm
-     *
-     * @param $boolean withRealm
-     * @return string|null
-     */
-    public function getUsername($withRealm = false)
-    {
-        $retValue = $this->_username;
-        if ($withRealm) {
-            $retValue = sprintf(
-                '%s@%s',
-                $this->_username,
-                $this->_realm
-            );
-        }
-        return $retValue;
-    }
-
-    /**
-     * set the new realm
-     *
-     * @param string $realm
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @return Zend_Service_DeveloperGarden_Client_ClientAbstract
-     */
-    public function setRealm($realm = null)
-    {
-        if (empty($realm)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Empty realm not permitted.');
-        }
-
-        if (!is_string($realm)) {
-            require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Client_Exception('Realm must be a string.');
-        }
-
-        $this->_realm = $realm;
-        return $this;
-    }
-
-    /**
-     * returns the realm
-     *
-     * @return string|null
-     */
-    public function getRealm()
-    {
-        return $this->_realm;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Exception.php
deleted file mode 100644
index f51a4d336..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Exception extends Zend_Service_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation.php
deleted file mode 100644
index 0ffc9bfbb..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IpLocation.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_IpLocation_CityType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_IpLocation 
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-iplocation/services/IPLocation?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/IPLocation.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'LocateIPResponseType'  => 'Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType',
-        'IPAddressLocationType' => 'Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType',
-        'RegionType'            => 'Zend_Service_DeveloperGarden_Response_IpLocation_RegionType',
-        'GeoCoordinatesType'    => 'Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType',
-        'CityType'              => 'Zend_Service_DeveloperGarden_Response_IpLocation_CityType',
-    );
-
-    /**
-     * locate the given Ip address or array of addresses
-     *
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|string $ip
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
-     */
-    public function locateIP($ip)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest(
-            $this->getEnvironment(),
-            $ip
-        );
-
-        $result = $this->getSoapClient()->locateIP($request);
-
-        $response = new Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse($result);
-        return $response->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
deleted file mode 100644
index edbeb8b85..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IpAddress.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_IpLocation_IpAddress
-{
-    /**
-     * the ip version
-     * ip v4 = 4
-     * ip v6 = 6
-     *
-     * @var integer
-     */
-    private $_version = 4;
-
-    /**
-     * currently supported versions
-     *
-     * @var array
-     */
-    private $_versionSupported = array(
-        4,
-        //6, not supported yet
-    );
-
-    private $_address = null;
-
-    /**
-     * create ipaddress object
-     *
-     * @param string $ip
-     * @param integer $version
-     *
-     * @return Zend_Service_Developergarde_IpLocation_IpAddress
-     */
-    public function __construct($ip, $version = 4)
-    {
-        $this->setIp($ip)
-             ->setVersion($version);
-    }
-
-    /**
-     * sets new ip address
-     *
-     * @param string $ip
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_IpLocation_IpAddress
-     */
-    public function setIp($ip)
-    {
-        $validator = new Zend_Validate_Ip();
-
-        if (!$validator->isValid($ip)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception($message['notIpAddress']);
-        }
-        $this->_address = $ip;
-        return $this;
-    }
-
-    /**
-     * returns the current address
-     *
-     * @return string
-     */
-    public function getIp()
-    {
-        return $this->_address;
-    }
-
-    /**
-     * sets new ip version
-     *
-     * @param integer $version
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_IpLocation_IpAddress
-     */
-    public function setVersion($version)
-    {
-        if (!in_array($version, $this->_versionSupported)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception('Ip Version ' . (int)$version . ' is not supported.');
-        }
-
-        $this->_version = $version;
-        return $this;
-    }
-
-    /**
-     * returns the ip version
-     *
-     * @return integer
-     */
-    public function getVersion()
-    {
-        return $this->_version;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch.php
deleted file mode 100644
index c5f876093..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalSearch.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest
- */
-require_once 'Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
- */
-require_once 'Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_LocalSearch
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-localsearch/services/localsearch?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/localsearch.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'LocalSearchResponseType' => 'Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType'
-    );
-
-    /**
-     * localSearch with the given parameters
-     *
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public function localSearch(
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters,
-        $account = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest(
-            $this->getEnvironment(),
-            $searchParameters,
-            $account
-        );
-
-        $result = $this->getSoapClient()->localSearch($request);
-
-        $response = new Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse($result);
-        return $response->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
deleted file mode 100644
index 6937a614c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_LocalSearch_Exception extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
deleted file mode 100644
index 5941011b7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SearchParameters.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-{
-    /**
-     * possible search parameters, incl. default values
-     *
-     * @var array
-     */
-    private $_parameters = array(
-        'what'             => null,
-        'dymwhat'          => null,
-        'dymrelated'       => null,
-        'hits'             => null,
-        'collapse'         => null,
-        'where'            => null,
-        'dywhere'          => null,
-        'radius'           => null,
-        'lx'               => null,
-        'ly'               => null,
-        'rx'               => null,
-        'ry'               => null,
-        'transformgeocode' => null,
-        'sort'             => null,
-        'spatial'          => null,
-        'sepcomm'          => null,
-        'filter'           => null, // can be ONLINER or OFFLINER
-        'openingtime'      => null, // can be now or HH::MM
-        'kategorie'        => null, // @see http://www.suchen.de/kategorie-katalog
-        'site'             => null,
-        'typ'              => null,
-        'name'             => null,
-        'page'             => null,
-        'city'             => null,
-        'plz'              => null,
-        'strasse'          => null,
-        'bundesland'       => null,
-    );
-
-    /**
-     * possible collapse values
-     *
-     * @var array
-     */
-    private $_possibleCollapseValues = array(
-        true,
-        false,
-        'ADDRESS_COMPANY',
-        'DOMAIN'
-    );
-
-    /**
-     * sets a new search word
-     * alias for setWhat
-     *
-     * @param string $searchValue
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSearchValue($searchValue)
-    {
-        return $this->setWhat($searchValue);
-    }
-
-    /**
-     * sets a new search word
-     *
-     * @param string $searchValue
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setWhat($searchValue)
-    {
-        $this->_parameters['what'] = $searchValue;
-        return $this;
-    }
-
-    /**
-     * enable the did you mean what feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanWhat()
-    {
-        $this->_parameters['dymwhat'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the did you mean what feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanWhat()
-    {
-        $this->_parameters['dymwhat'] = 'false';
-        return $this;
-    }
-
-    /**
-     * enable the did you mean where feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanWhere()
-    {
-        $this->_parameters['dymwhere'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the did you mean where feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanWhere()
-    {
-        $this->_parameters['dymwhere'] = 'false';
-        return $this;
-    }
-
-    /**
-     * enable did you mean related, if true Kihno will be corrected to Kino
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableDidYouMeanRelated()
-    {
-        $this->_parameters['dymrelated'] = 'true';
-        return $this;
-    }
-
-    /**
-     * diable did you mean related, if false Kihno will not be corrected to Kino
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableDidYouMeanRelated()
-    {
-        $this->_parameters['dymrelated'] = 'true';
-        return $this;
-    }
-
-    /**
-     * set the max result hits for this search
-     *
-     * @param integer $hits
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setHits($hits = 10)
-    {
-        require_once 'Zend/Validate/Between.php';
-        $validator = new Zend_Validate_Between(0, 1000);
-        if (!$validator->isValid($hits)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['hits'] = $hits;
-        return $this;
-    }
-
-    /**
-     * If true, addresses will be collapsed for a single domain, common values
-     * are:
-     * ADDRESS_COMPANY – to collapse by address
-     * DOMAIN – to collapse by domain (same like collapse=true)
-     * false
-     *
-     * @param mixed $value
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setCollapse($value)
-    {
-        if (!in_array($value, $this->_possibleCollapseValues, true)) {
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception('Not a valid value provided.');
-        }
-        $this->_parameters['collapse'] = $value;
-        return $this;
-    }
-
-    /**
-     * set a specific search location
-     * examples:
-     * +47°54’53.10�, 11° 10’ 56.76�
-     * 47°54’53.10;11°10’56.76�
-     * 47.914750,11.182533
-     * +47.914750 ; +11.1824
-     * Darmstadt
-     * Berlin
-     *
-     * @param string $where
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setWhere($where)
-    {
-        require_once 'Zend/Validate/NotEmpty.php';
-
-        $validator = new Zend_Validate_NotEmpty();
-        if (!$validator->isValid($where)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['where'] = $where;
-        return $this;
-    }
-
-    /**
-     * returns the defined search location (ie city, country)
-     *
-     * @return string
-     */
-    public function getWhere()
-    {
-        return $this->_parameters['where'];
-    }
-
-    /**
-     * enable the spatial search feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enableSpatial()
-    {
-        $this->_parameters['spatial'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the spatial search feature
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableSpatial()
-    {
-        $this->_parameters['spatial'] = 'false';
-        return $this;
-    }
-
-    /**
-     * sets spatial and the given radius for a circle search
-     *
-     * @param integer $radius
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setRadius($radius)
-    {
-        require_once 'Zend/Validate/Int.php';
-
-        $validator = new Zend_Validate_Int();
-        if (!$validator->isValid($radius)) {
-            $message = $validator->getMessages();
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
-        }
-        $this->_parameters['radius'] = $radius;
-        $this->_parameters['transformgeocode'] = 'false';
-
-        return $this;
-    }
-
-    /**
-     * sets the values for a rectangle search
-     * lx = longitude left top
-     * ly = latitude left top
-     * rx = longitude right bottom
-     * ry = latitude right bottom
-     *
-     * @param $lx
-     * @param $ly
-     * @param $rx
-     * @param $ry
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setRectangle($lx, $ly, $rx, $ry)
-    {
-        $this->_parameters['lx'] = $lx;
-        $this->_parameters['ly'] = $ly;
-        $this->_parameters['rx'] = $rx;
-        $this->_parameters['ry'] = $ry;
-
-        return $this;
-    }
-
-    /**
-     * if set, the service returns the zipcode for the result
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setTransformGeoCode()
-    {
-        $this->_parameters['transformgeocode'] = 'true';
-        $this->_parameters['radius']           = null;
-
-        return $this;
-    }
-
-    /**
-     * sets the sort value
-     * possible values are: 'relevance' and 'distance' (only with spatial enabled)
-     *
-     * @param string $sort
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSort($sort)
-    {
-        if (!in_array($sort, array('relevance', 'distance'))) {
-            require_once 'Zend/Service/DeveloperGarden/LocalSearch/Exception.php';
-            throw new Zend_Service_DeveloperGarden_LocalSearch_Exception('Not a valid sort value provided.');
-        }
-
-        $this->_parameters['sort'] = $sort;
-        return $this;
-    }
-
-    /**
-     * enable the separation of phone numbers
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function enablePhoneSeparation()
-    {
-        $this->_parameters['sepcomm'] = 'true';
-        return $this;
-    }
-
-    /**
-     * disable the separation of phone numbers
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disablePhoneSeparation()
-    {
-        $this->_parameters['sepcomm'] = 'true';
-        return $this;
-    }
-
-    /**
-     * if this filter is set, only results with a website are returned
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setFilterOnliner()
-    {
-        $this->_parameters['filter'] = 'ONLINER';
-        return $this;
-    }
-
-    /**
-     * if this filter is set, only results without a website are returned
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setFilterOffliner()
-    {
-        $this->_parameters['filter'] = 'OFFLINER';
-        return $this;
-    }
-
-
-    /**
-     * removes the filter value
-     *
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function disableFilter()
-    {
-        $this->_parameters['filter'] = null;
-        return $this;
-    }
-
-    /**
-     * set a filter to get just results who are open at the given time
-     * possible values:
-     * now = open right now
-     * HH:MM = at the given time (ie 20:00)
-     *
-     * @param string $time
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setOpeningTime($time = null)
-    {
-        $this->_parameters['openingtime'] = $time;
-        return $this;
-    }
-
-    /**
-     * sets a category filter
-     *
-     * @see http://www.suchen.de/kategorie-katalog
-     * @param $category
-     * @return unknown_type
-     */
-    public function setCategory($category = null)
-    {
-        $this->_parameters['kategorie'] = $category;
-        return $this;
-    }
-
-    /**
-     * sets the site filter
-     * ie: www.developergarden.com
-     *
-     * @param string $site
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setSite($site)
-    {
-        $this->_parameters['site'] = $site;
-        return $this;
-    }
-
-    /**
-     * sets a filter to the given document type
-     * ie: pdf, html
-     *
-     * @param string $type
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setDocumentType($type)
-    {
-        $this->_parameters['typ'] = $type;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the company name
-     * ie: Deutsche Telekom
-     *
-     * @param string $name
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setName($name)
-    {
-        $this->_parameters['name'] = $name;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the zip code
-     *
-     * @param string $zip
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setZipCode($zip)
-    {
-        $this->_parameters['plz'] = $zip;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the street
-     *
-     * @param string $street
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setStreet($street)
-    {
-        $this->_parameters['strasse'] = $street;
-        return $this;
-    }
-
-    /**
-     * sets a filter for the county
-     *
-     * @param string $county
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function setCounty($county)
-    {
-        $this->_parameters['bundesland'] = $county;
-        return $this;
-    }
-
-    /**
-     * sets a raw parameter with the value
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return unknown_type
-     */
-    public function setRawParameter($key, $value)
-    {
-        $this->_parameters[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * returns the parameters as an array
-     *
-     * @return array
-     */
-    public function getSearchParameters()
-    {
-        $retVal = array();
-        foreach ($this->_parameters as $key => $value) {
-            if (is_null($value)) {
-                continue;
-            }
-            $param = array(
-                'parameter' => $key,
-                'value' => $value
-            );
-            $retVal[] = $param;
-        }
-        return $retVal;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
deleted file mode 100644
index a620a7628..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ChangeQuotaPool.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_ChangeQuotaPool
-{
-    /**
-     * string module id
-     *
-     * @var string
-     */
-    public $moduleId = null;
-
-    /**
-     * integer >= 0 to set new user quota
-     *
-     * @var integer
-     */
-    public $quotaMax = 0;
-
-    /**
-     * constructor give them the module id
-     *
-     * @param string $moduleId
-     * @param integer $quotaMax
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function __construct($moduleId = null, $quotaMax = 0)
-    {
-        $this->setModuleId($moduleId)
-             ->setQuotaMax($quotaMax);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $moduleId
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function setModuleId($moduleId = null)
-    {
-        $this->moduleId = $moduleId;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getModuleId()
-    {
-        return $this->moduleId;
-    }
-
-    /**
-     * sets new QuotaMax value
-     *
-     * @param integer $quotaMax
-     * @return Zend_Service_Developergarde_Request_ChangeQuotaPool
-     */
-    public function setQuotaMax($quotaMax = 0)
-    {
-        $this->quotaMax = $quotaMax;
-        return $this;
-    }
-
-    /**
-     * returns the quotaMax value
-     *
-     * @return integer
-     */
-    public function getQuotaMax()
-    {
-        return $this->quotaMax;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
deleted file mode 100644
index 2c98cafb7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetAccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_GetAccountBalance
-{
-    /**
-     * array of accounts
-     *
-     * @var array
-     */
-    public $Account = array();
-
-    /**
-     * constructor give them the account ids or an empty array
-     *
-     * @param array $Account
-     * @return Zend_Service_DeveloperGarden_Request_GetAccountBalance
-     */
-    public function __construct(array $Account = array())
-    {
-        $this->setAccount($Account);
-    }
-
-    /**
-     * sets a new Account array
-     *
-     * @param array $Account
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function setAccount(array $Account = array())
-    {
-        $this->Account = $Account;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getAccount()
-    {
-        return $this->Account;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
deleted file mode 100644
index 4f5bbb884..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetQuotaInformation.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_BaseUserService_GetQuotaInformation
-{
-    /**
-     * string module id
-     *
-     * @var string
-     */
-    public $moduleId = null;
-
-    /**
-     * constructor give them the module id
-     *
-     * @param string $moduleId
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function __construct($moduleId = null)
-    {
-        $this->setModuleId($moduleId);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $moduleId
-     * @return Zend_Service_DeveloperGarden_Request_BaseUserService
-     */
-    public function setModuleId($moduleId = null)
-    {
-        $this->moduleId = $moduleId;
-        return $this;
-    }
-
-    /**
-     * returns the moduleId
-     *
-     * @return string
-     */
-    public function getModuleId()
-    {
-        return $this->moduleId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 5b27c5335..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AddConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $templateId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_AddConferenceTemplateParticipantRequest
-     */
-    public function setParticipant(Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
deleted file mode 100644
index af63ddac5..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommitConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CommitConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
deleted file mode 100644
index 05960ad51..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * account to be used for this conference
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * object with schedule for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     */
-    public function __construct($environment, $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setSchedule($conferenceSchedule)
-             ->setAccount($account);
-    }
-
-    /**
-     * sets $schedule
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setSchedule(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule = null
-    ) {
-        $this->schedule = $schedule;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setDetail(Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail)
-    {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-
-    /**
-     * sets $account
-     *
-     * @param $account
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
deleted file mode 100644
index 8edf02757..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * array with Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail elements
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param array $conferenceParticipants
-     */
-    public function __construct($environment, $ownerId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails,
-        array $conferenceParticipants = null
-    ) {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setParticipants($conferenceParticipants);
-    }
-
-    /**
-     * sets $participants
-     *
-     * @param array $participants
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setParticipants(array $participants = null)
-    {
-        $this->participants = $participants;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setDetail(Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail)
-    {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceTemplateRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
deleted file mode 100644
index 2e3978be2..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * @var integer
-     */
-    public $what = null;
-
-    /**
-     * possible what values
-     *
-     * @var array
-     */
-    private $_whatValues = array(
-        0 => 'all conferences',
-        1 => 'just ad-hoc conferences',
-        2 => 'just planned conferences',
-        3 => 'just failed conferences',
-    );
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param integer $what
-     * @param string $ownerId
-     */
-    public function __construct($environment, $what = 0, $ownerId = null)
-    {
-        parent::__construct($environment);
-        $this->setWhat($what)
-             ->setOwnerId($ownerId);
-    }
-
-    /**
-     * sets $what
-     *
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-     */
-    public function setWhat($what)
-    {
-        if (!array_key_exists($what, $this->_whatValues)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('What value not allowed.');
-        }
-        $this->what = $what;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
deleted file mode 100644
index fc2afce64..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * what
-     *
-     * @var integer
-     */
-    public $what = null;
-
-    /**
-     * possible what values
-     *
-     * @var array
-     */
-    private $_whatValues = array(
-        0 => 'all conferences',
-        1 => 'just detail, acc and startTime',
-        2 => 'just participants',
-        3 => 'just schedule',
-    );
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param integer $what
-     */
-    public function __construct($environment, $conferenceId, $what)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setWhat($what);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets $what
-     *
-     * @param integer $what
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceStatusRequest
-     */
-    public function setWhat($what)
-    {
-        if (!array_key_exists($what, $this->_whatValues)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('What value not allowed.');
-        }
-        $this->what = $what;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
deleted file mode 100644
index aa4582eb3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $ownerId
-     */
-    public function __construct($environment, $ownerId = null)
-    {
-        parent::__construct($environment);
-        $this->setOwnerId($ownerId);
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest
-     */
-    public function setOwnerId($ownerId)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 1e1c3f59c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     */
-    public function __construct($environment, $templateId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
deleted file mode 100644
index 3e458245b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     */
-    public function __construct($environment, $templateId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
deleted file mode 100644
index d442617b9..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetParticipantStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     */
-    public function __construct($environment, $conferenceId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetParticipantStatusRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
deleted file mode 100644
index 80e5b917b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetRunningConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetRunningConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
deleted file mode 100644
index 0784d10db..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * conference participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $conferenceId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_NewParticipantRequest
-     */
-    public function setParticipant(Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant)
-    {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
deleted file mode 100644
index 778a145df..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     */
-    public function __construct($environment, $conferenceId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 63d385896..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     */
-    public function __construct($environment, $templateId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
deleted file mode 100644
index def78588e..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     */
-    public function __construct($environment, $templateId)
-    {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
deleted file mode 100644
index 9483c2c62..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     */
-    public function __construct($environment, $conferenceId, $participantId)
-    {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_RemoveParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
deleted file mode 100644
index 3a9484292..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * account to be used for this conference
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * unique owner id
-     *
-     * @var string
-     */
-    public $ownerId = null;
-
-    /**
-     * object with details for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * object with schedule for this conference
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $ownerId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule
-     * @param integer $account
-     */
-    public function __construct($environment, $conferenceId, $ownerId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $conferenceSchedule = null,
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setOwnerId($ownerId)
-             ->setDetail($conferenceDetails)
-             ->setSchedule($conferenceSchedule)
-             ->setAccount($account);
-    }
-
-    /**
-     * sets $conferenceId
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId= $conferenceId;
-        return $this;
-    }
-
-    /**
-     * sets $schedule
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setSchedule(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule $schedule = null
-    ) {
-        $this->schedule = $schedule;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setDetail(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail = null
-    ) {
-        $this->detail = $detail;
-        return $this;
-    }
-
-    /**
-     * sets $ownerId
-     *
-     * @param string $ownerId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setOwnerId($ownerId = null)
-    {
-        $this->ownerId = $ownerId;
-        return $this;
-    }
-
-    /**
-     * sets $account
-     *
-     * @param $account
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
deleted file mode 100644
index 92ad31936..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * the participant details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $participantId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $templateId, $participantId,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setParticipantId($participantId)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateParticipantRequest
-     */
-    public function setParticipant(
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-    ) {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
deleted file mode 100644
index 382c78b01..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the template id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * the initiator id
-     *
-     * @var string
-     */
-    public $initiatorId = null;
-
-    /**
-     * the details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $templateId
-     * @param string $initiatorId
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails
-     */
-    public function __construct($environment, $templateId, $initiatorId = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $conferenceDetails = null
-    ) {
-        parent::__construct($environment);
-        $this->setTemplateId($templateId)
-             ->setInitiatorId($initiatorId)
-             ->setDetail($conferenceDetails);
-    }
-
-    /**
-     * set the template id
-     *
-     * @param string $templateId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setTemplateId($templateId)
-    {
-        $this->templateId = $templateId;
-        return $this;
-    }
-
-    /**
-     * set the initiator id
-     *
-     * @param string $initiatorId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setInitiatorId($initiatorId)
-    {
-        $this->initiatorId = $initiatorId;
-        return $this;
-    }
-
-    /**
-     * sets $detail
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateConferenceTemplateRequest
-     */
-    public function setDetail(
-        Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail $detail = null
-    ) {
-        $this->detail = $detail;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
deleted file mode 100644
index 5195425f6..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the conference id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * the participant id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * conference participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public $participant = null;
-
-    /**
-     * possible action
-     *
-     * @var integer
-     */
-    public $action = null;
-
-    /**
-     * constructor
-     *
-     * @param integer $environment
-     * @param string $conferenceId
-     * @param string $participantId
-     * @param integer $action
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     */
-    public function __construct($environment, $conferenceId, $participantId,
-        $action = null,
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        parent::__construct($environment);
-        $this->setConferenceId($conferenceId)
-             ->setParticipantId($participantId)
-             ->setAction($action)
-             ->setParticipant($participant);
-    }
-
-    /**
-     * set the conference id
-     *
-     * @param string $conferenceId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setConferenceId($conferenceId)
-    {
-        $this->conferenceId = $conferenceId;
-        return $this;
-    }
-
-    /**
-     * set the participant id
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setParticipantId($participantId)
-    {
-        $this->participantId = $participantId;
-        return $this;
-    }
-
-    /**
-     * sets new action
-     *
-     * @param integer $action
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setAction($action = null)
-    {
-        if ($action !== null) {
-            Zend_Service_DeveloperGarden_ConferenceCall::checkParticipantAction($action);
-        }
-        $this->action = $action;
-        return $this;
-    }
-
-    /**
-     * sets new participant
-     *
-     * @param Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant
-     * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_UpdateParticipantRequest
-     */
-    public function setParticipant(
-        Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail $participant = null
-    ) {
-        $this->participant = $participant;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/Exception.php
deleted file mode 100644
index 3bb401a13..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_DeveloperGarden_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_Exception
-    extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
deleted file mode 100644
index 5c053fd7c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocateIPRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_IpLocation_IpAddress
- */
-require_once 'Zend/Service/DeveloperGarden/IpLocation/IpAddress.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the ip addresses to lookup for
-     *
-     * @var Zend_Service_DeveloperGarden_Request_IpLocation_IpAddress
-     */
-    public $address = null;
-
-    /**
-     * the account
-     *
-     * @var string
-     */
-    public $account = null;
-
-    /**
-     * constructor give them the environment
-     *
-     * @param integer $environment
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|array $ip
-     *
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $ip = null)
-    {
-        parent::__construct($environment);
-
-        if ($ip !== null) {
-            $this->setIp($ip);
-        }
-    }
-
-    /**
-     * sets new ip or array of ips
-     *
-     * @param Zend_Service_DeveloperGarden_IpLocation_IpAddress|array $ip
-     *
-     * @return Zend_Service_DeveloperGarden_Request_IpLocation_LocateIPRequest
-     */
-    public function setIp($ip)
-    {
-        if ($ip instanceof Zend_Service_DeveloperGarden_IpLocation_IpAddress) {
-            $this->address[] = array(
-                'ipType'    => $ip->getVersion(),
-                'ipAddress' => $ip->getIp(),
-            );
-            return $this;
-        }
-
-        if (is_array($ip)) {
-            foreach ($ip as $ipObject) {
-                if (!$ipObject instanceof Zend_Service_DeveloperGarden_IpLocation_IpAddress
-                    && !is_string($ipObject)
-                ) {
-                    require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-                    throw new Zend_Service_DeveloperGarden_Request_Exception(
-                        'Not a valid Ip Address object found.'
-                    );
-                }
-                $this->setIp($ipObject);
-            }
-            return $this;
-        }
-
-        if (!is_string($ip)) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('Not a valid Ip Address object found.');
-        }
-
-        return $this->setIp(new Zend_Service_DeveloperGarden_IpLocation_IpAddress($ip));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
deleted file mode 100644
index fe9ed1d0e..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalSearchRequest.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * array of search parameters
-     *
-     * @var array
-     */
-    public $searchParameters = null;
-
-    /**
-     * original object
-     *
-     * @var Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    private $_searchParameters = null;
-
-    /**
-     * account id
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, 
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, 
-        $account = null
-    ) {
-        parent::__construct($environment);
-        $this->setSearchParameters($searchParameters)
-             ->setAccount($account);
-    }
-
-    /**
-     * @param integer $account
-     */
-    public function setAccount($account = null)
-    {
-        $this->account = $account;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * @param Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-     */
-    public function setSearchParameters(
-        Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters
-    ) {
-        $this->searchParameters  = $searchParameters->getSearchParameters();
-        $this->_searchParameters = $searchParameters;
-        return $this;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters
-     */
-    public function getSearchParameters()
-    {
-        return $this->_searchParameters;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php
deleted file mode 100644
index 21eed4638..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RequestAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * environment value
-     *
-     * @var integer
-     */
-    public $environment = null;
-
-    /**
-     * constructor give them the environment
-     *
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment)
-    {
-        $this->setEnvironment($environment);
-    }
-
-    /**
-     * sets a new moduleId
-     *
-     * @param integer $environment
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function setEnvironment($environment)
-    {
-        $this->environment = $environment;
-        return $this;
-    }
-
-    /**
-     * the current configured environment value
-     *
-     * @return integer
-     */
-    public function getEnvironment()
-    {
-        return $this->environment;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
deleted file mode 100644
index 7feedb178..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendFlashSMS.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-{
-    /**
-     * this is the sms type
-     * 2 = FlashSMS
-     *
-     * @var integer
-     */
-    protected $_smsType = 2;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
deleted file mode 100644
index 61fea7222..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendSMS.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-{
-    /**
-     * this is the sms type
-     * 1 = normal SMS
-     *
-     * @var integer
-     */
-    protected $_smsType = 1;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php
deleted file mode 100644
index 0f16bfbb1..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendSmsAbstract.php 20419 2010-01-19 13:20:12Z bate $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the number or numbers to receive this sms
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * the message of this sms
-     *
-     * @var string
-     */
-    public $message = null;
-
-    /**
-     * name of the sender
-     *
-     * @var string
-     */
-    public $originator = null;
-
-    /**
-     * account
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * array of special chars that are used for counting
-     * message length
-     *
-     * @var array
-     */
-    private $_specialChars = array(
-        '|', 
-        '^', 
-        '{', 
-        '}', 
-        '[', 
-        ']', 
-        '~', 
-        '\\', 
-        "\n",
-        // '€', removed because its counted in utf8 correctly
-    );
-
-    /**
-     * what SMS type is it
-     *
-     * 1 = SMS
-     * 2 = FlashSMS
-     *
-     * @var integer
-     */
-    protected $_smsType = 1;
-
-    /**
-     * the counter for increasing message count
-     * if more than this 160 chars we send a 2nd or counting
-     * sms message
-     *
-     * @var integer
-     */
-    protected $_smsLength = 153;
-
-    /**
-     * maximum length of an sms message
-     *
-     * @var integer
-     */
-    protected $_maxLength = 765;
-
-    /**
-     * the maximum numbers to send an sms
-     *
-     * @var integer
-     */
-    protected $_maxNumbers = 10;
-
-    /**
-     * returns the assigned numbers
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number(s)
-     *
-     * @param string $number
-     * @throws Zend_Service_DeveloperGarden_Request_Exception
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        if ($this->getNumberCount() > $this->_maxNumbers) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('The message is too long.');
-        }
-        return $this;
-    }
-
-    /**
-     * returns the current message
-     *
-     * @return string $message
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * sets a new message
-     *
-     * @param string $message
-     * @throws Zend_Service_DeveloperGarden_Request_Exception
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setMessage($message)
-    {
-        $this->message = $message;
-        if ($this->getMessageLength() > $this->_maxLength) {
-            require_once 'Zend/Service/DeveloperGarden/Request/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Request_Exception('The message is too long.');
-        }
-        return $this;
-    }
-
-    /**
-     * returns the originator
-     *
-     * @return the $originator
-     */
-    public function getOriginator()
-    {
-        return $this->originator;
-    }
-
-    /**
-     * the originator name
-     *
-     * @param string $originator
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setOriginator($originator)
-    {
-        $this->originator = $originator;
-        return $this;
-    }
-
-    /**
-     * the account
-     * @return integer $account
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * sets a new accounts
-     *
-     * @param $account the $account to set
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-     */
-    public function setAccount($account)
-    {
-        $this->account = $account;
-        return $this;
-    }
-
-    /**
-     * returns the calculated message length
-     *
-     * @return integer
-     */
-    public function getMessageLength()
-    {
-        $message = $this->getMessage();
-        $length  = strlen($message);
-
-        foreach ($this->_specialChars as $char) {
-            $c = (substr_count($message, $char) * 2) - 1;
-            if ($c > 0) {
-                $length += $c;
-            }
-        }
-
-        return $length;
-    }
-
-    /**
-     * returns the count of sms messages that would be send
-     *
-     * @return integer
-     */
-    public function getMessageCount()
-    {
-        $smsLength = $this->getMessageLength();
-        $retValue = 1;
-        if ($smsLength > 160) {
-            $retValue = ceil($smsLength / $this->_smsLength);
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the count of numbers in this sms
-     *
-     * @return integer
-     */
-    public function getNumberCount()
-    {
-        $number   = $this->getNumber();
-        $retValue = 0;
-        if (!empty($number)) {
-            $retValue = count(explode(',', $number));
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the sms type
-     * currently we have
-     * 1 = Sms
-     * 2 = FlashSms
-     *
-     * @return integer
-     */
-    public function getSmsType()
-    {
-        return $this->_smsType;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
deleted file mode 100644
index 78a0fb41a..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetValidatedNumbers.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
deleted file mode 100644
index 5123d70cc..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Invalidate.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the number
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * create the class for validation a sms keyword
-     *
-     * @param integer $environment
-     * @param string $keyword
-     * @param string $number
-     */
-    public function __construct($environment, $number = null)
-    {
-        parent::__construct($environment);
-        $this->setNumber($number);
-    }
-
-    /**
-     * returns the number
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
deleted file mode 100644
index ba78dd6ad..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendValidationKeyword.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword
-    extends Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
deleted file mode 100644
index 85017e331..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Validate.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-    /**
-     * the keyword to be used for validation
-     *
-     * @var string
-     */
-    public $keyword = null;
-
-    /**
-     * the number
-     *
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * returns the keyword
-     *
-     * @return string $keyword
-     */
-    public function getKeyword ()
-    {
-        return $this->keyword;
-    }
-
-    /**
-     * create the class for validation a sms keyword
-     *
-     * @param integer $environment
-     * @param string $keyword
-     * @param string $number
-     */
-    public function __construct($environment, $keyword = null, $number = null)
-    {
-        parent::__construct($environment);
-        $this->setKeyword($keyword)
-             ->setNumber($number);
-    }
-
-    /**
-     * set a new keyword
-     *
-     * @param string $keyword
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setKeyword($keyword)
-    {
-        $this->keyword = $keyword;
-        return $this;
-    }
-
-    /**
-     * returns the number
-     *
-     * @return string $number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * set a new number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
-     */
-    public function setNumber($number)
-    {
-        $this->number = $number;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
deleted file mode 100644
index 58cfd9b40..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CallStatus.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * extend the keep alive for this call
-     *
-     * @var integer
-     */
-    public $keepAlive = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param string $sessionId
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $sessionId, $keepAlive = null)
-    {
-        parent::__construct($environment);
-        $this->setSessionId($sessionId)
-             ->setKeepAlive($keepAlive);
-    }
-
-    /**
-     * @return string
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * sets new sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getKeepAlive()
-    {
-        return $this->keepAlive;
-    }
-
-    /**
-     * sets new keepAlive flag
-     *
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
-     */
-    public function setKeepAlive($keepAlive)
-    {
-        $this->keepAlive = $keepAlive;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
deleted file mode 100644
index cf01a6afe..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewCall.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * the first number to be called
-     *
-     * @var string
-     */
-    public $aNumber = null;
-
-    /**
-     * the second number to be called
-     *
-     * @var string
-     */
-    public $bNumber = null;
-
-    /**
-     * Calling Line Identity Restriction (CLIR) disabled for $aNumber
-     *
-     * @var boolean
-     */
-    public $privacyA = null;
-
-    /**
-     * Calling Line Identity Restriction (CLIR) disabled for $bNumber
-     *
-     * @var boolean
-     */
-    public $privacyB = null;
-
-    /**
-     * time in seconds to wait for $aNumber
-     *
-     * @var integer
-     */
-    public $expiration = null;
-
-    /**
-     * max duration for this call in seconds
-     *
-     * @var integer
-     */
-    public $maxDuration = null;
-
-    /**
-     * param not used right now
-     *
-     * @var string
-     */
-    public $greeter = null;
-
-    /**
-     * Account Id which will be pay for this call
-     *
-     * @var integer
-     */
-    public $account = null;
-
-    /**
-     * @return string
-     */
-    public function getANumber()
-    {
-        return $this->aNumber;
-    }
-
-    /**
-     * @param string $aNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setANumber($aNumber)
-    {
-        $this->aNumber = $aNumber;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBNumber()
-    {
-        return $this->bNumber;
-    }
-
-    /**
-     * @param string $bNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setBNumber($bNumber)
-    {
-        $this->bNumber = $bNumber;
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getPrivacyA()
-    {
-        return $this->privacyA;
-    }
-
-    /**
-     * @param boolean $privacyA
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setPrivacyA($privacyA)
-    {
-        $this->privacyA = $privacyA;
-        return $this;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getPrivacyB()
-    {
-        return $this->privacyB;
-    }
-
-    /**
-     * @param boolean $privacyB
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setPrivacyB($privacyB)
-    {
-        $this->privacyB = $privacyB;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getExpiration()
-    {
-        return $this->expiration;
-    }
-
-    /**
-     * @param integer $expiration
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setExpiration($expiration)
-    {
-        $this->expiration = $expiration;
-        return $this;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getMaxDuration()
-    {
-        return $this->maxDuration;
-    }
-
-    /**
-     * @param integer $maxDuration
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setMaxDuration($maxDuration)
-    {
-        $this->maxDuration = $maxDuration;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getGreeter()
-    {
-        return $this->greeter;
-    }
-
-    /**
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setGreeter($greeter)
-    {
-        $this->greeter = $greeter;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
-
-    /**
-     * @param integer $account
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    public function setAccount($account)
-    {
-        $this->account = $account;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
deleted file mode 100644
index 6b5937764..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewCallSequenced.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_NewCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-{
-    /**
-     * array of second numbers to be called sequenced
-     *
-     * @var array
-     */
-    public $bNumber = null;
-
-    /**
-     * max wait value to wait for new number to be called
-     *
-     * @var integer
-     */
-    public $maxWait = null;
-
-    /**
-     * @return array
-     */
-    public function getBNumber()
-    {
-        return $this->bNumber;
-    }
-
-    /**
-     * @param array $bNumber
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
-     */
-    /*public function setBNumber(array $bNumber)
-    {
-        $this->bNumber = $bNumber;
-        return $this;
-    }*/
-
-    /**
-     * returns the max wait value
-     *
-     * @return integer
-     */
-    public function getMaxWait()
-    {
-        return $this->maxWait;
-    }
-
-    /**
-     * sets new max wait value for next number call
-     *
-     * @param integer $maxWait
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
-     */
-    public function setMaxWait($maxWait)
-    {
-        $this->maxWait = $maxWait;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
deleted file mode 100644
index af6539f99..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TearDownCall.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
-    extends Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * the session id
-     *
-     * @var string
-     */
-    public $sessionId = null;
-
-    /**
-     * constructor give them the environment and the sessionId
-     *
-     * @param integer $environment
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_RequestAbstract
-     */
-    public function __construct($environment, $sessionId)
-    {
-        parent::__construct($environment);
-        $this->setSessionId($sessionId);
-    }
-
-    /**
-     * @return string
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * sets new sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php
deleted file mode 100644
index a8bf92094..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_RequestAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Request/RequestAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Request_VoiceButler_VoiceButlerAbstract
-    extends Zend_Service_DeveloperGarden_Request_RequestAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseType.php
deleted file mode 100644
index 51c3a01cc..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseType.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BaseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseType
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the status code
-     *
-     * @var string
-     */
-    public $statusCode = null;
-
-    /**
-     * the status message
-     *
-     * @var string
-     */
-    public $statusMessage = null;
-
-    /**
-     * parse the result
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getStatusMessage(),
-                $this->getStatusCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getStatusMessage()
-    {
-        return $this->statusMessage;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->statusCode === null
-             || $this->statusCode == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ($this->statusCode !== null
-             && $this->statusCode != '0000');
-    }
-
-    /**
-     * returns the error code (statusCode)
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        if (empty($this->errorCode)) {
-            return $this->statusCode;
-        } else {
-            return $this->errorCode;
-        }
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        if (empty($this->errorMessage)) {
-            return $this->statusMessage;
-        } else {
-            return $this->errorMessage;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
deleted file mode 100644
index cd48587a1..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ChangeQuotaPoolResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_ChangeQuotaPoolResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
deleted file mode 100644
index b24d38911..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetAccountBalanceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_GetAccountBalanceResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
deleted file mode 100644
index 99828c35b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetQuotaInformationResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_BaseUserService_GetQuotaInformationResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * System defined limit of quota points per day
-     *
-     * @var integer
-     */
-    public $maxQuota = null;
-
-    /**
-     * User specific limit of quota points per day
-     * cant be more than $maxQuota
-     *
-     * @var integer
-     */
-    public $maxUserQuota = null;
-
-    /**
-     * Used quota points for the current day
-     *
-     * @var integer
-     */
-    public $quotaLevel = null;
-
-    /**
-     * returns the quotaLevel
-     *
-     * @return integer
-     */
-    public function getQuotaLevel()
-    {
-        return $this->quotaLevel;
-    }
-
-    /**
-     * returns the maxUserQuota
-     *
-     * @return integer
-     */
-    public function getMaxUserQuota()
-    {
-        return $this->maxUserQuota;
-    }
-
-    /**
-     * return the maxQuota
-     *
-     * @return integer
-     */
-    public function getMaxQuota()
-    {
-        return $this->maxQuota;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 76fe22aae..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AddConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-     */
-    public $addConferenceTemplateParticipantResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
deleted file mode 100644
index 11918cc1a..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AddConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_AddConferenceTemplateParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the participant Id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * return the participant id
-     *
-     * @return string
-     */
-    public function getParticipantId()
-    {
-        return $this->participantId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
deleted file mode 100644
index dcbb5b05b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CCSResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
deleted file mode 100644
index 79c414bf3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CommitConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CommitConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php
deleted file mode 100644
index 3aa1e0432..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConferenceCallAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * returns the response object or null
-     *
-     * @return mixed
-     */
-    public function getResponse()
-    {
-        $r = new ReflectionClass($this);
-        foreach ($r->getProperties() as $p) {
-            $name = $p->getName();
-            if (strpos($name, 'Response') !== false) {
-                return $p->getValue($this);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return mixed
-     */
-    public function parse()
-    {
-        $retVal = $this->getResponse();
-        if ($retVal === null) {
-            $this->statusCode    = 9999;
-            $this->statusMessage = 'Internal response property not found.';
-        } else {
-            $this->statusCode    = $retVal->getStatusCode();
-            $this->statusMessage = $retVal->getStatusMessage();
-        }
-        parent::parse();
-        return $retVal;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
deleted file mode 100644
index 4ef075743..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-     */
-    public $createConferenceResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
deleted file mode 100644
index 9603c4e54..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the conference Id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * return the conference id
-     *
-     * @return string
-     */
-    public function getConferenceId()
-    {
-        return $this->conferenceId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
deleted file mode 100644
index f057bfb4e..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-     */
-    public $createConferenceTemplateResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
deleted file mode 100644
index fddbb214d..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreateConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_CreateConferenceTemplateResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the template Id
-     *
-     * @var string
-     */
-    public $templateId = null;
-
-    /**
-     * return the template id
-     *
-     * @return string
-     */
-    public function getTemplateId()
-    {
-        return $this->templateId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
deleted file mode 100644
index 605a89708..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-     */
-    public $getConferenceListResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
deleted file mode 100644
index d1cfa4973..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceListResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array with conferences ids
-     *
-     * @var array
-     */
-    public $conferenceIds = array();
-
-    /**
-     * array with conference ids
-     *
-     * @return array
-     */
-    public function getConferenceIds()
-    {
-        return (array) $this->conferenceIds;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
deleted file mode 100644
index 8ae45426e..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-     */
-    public $getConferenceStatusResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
deleted file mode 100644
index d0f758873..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceStatusResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * conference starttime
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public $schedule = null;
-
-    /**
-     * the starttime as longint
-     *
-     * @var integer
-     */
-    public $startTime = null;
-
-    /**
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * the account object
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
-     */
-    public $acc = null;
-
-    /**
-     * returns the details object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * returns the starttime
-     *
-     * @return integer
-     */
-    public function getStartTime()
-    {
-        return $this->startTime;
-    }
-
-    /**
-     * returns the schedule object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceSchedule
-     */
-    public function getSchedule()
-    {
-        return $this->schedule;
-    }
-
-    /**
-     * returns array with all participants
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     *
-     * @return array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipants()
-    {
-        if ($this->participants instanceof Zend_Service_DeveloperGarden_ConferenceCall_Participant) {
-            $this->participants = array(
-                $this->participants
-            );
-        }
-        return $this->participants;
-    }
-
-    /**
-     * returns the participant object if found in the response
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipantById($participantId)
-    {
-        $participants = $this->getParticipants();
-        if ($participants !== null) {
-            foreach ($participants as $participant) {
-                if (strcmp($participant->getParticipantId(), $participantId) == 0) {
-                    return $participant;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * returns the conference account details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceAccount
-     */
-    public function getAccount()
-    {
-        return $this->acc;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
deleted file mode 100644
index db99364c7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-     */
-    public $getConferenceTemplateListResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
deleted file mode 100644
index 591e22940..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateListResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array with template ids
-     *
-     * @var array
-     */
-    public $templateIds = array();
-
-    /**
-     * array with template ids
-     *
-     * @return array
-     */
-    public function getTemplateIds()
-    {
-        return (array)$this->templateIds;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 4d9967efb..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-     */
-    public $getConferenceTemplateParticipantResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
deleted file mode 100644
index bbd51a550..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the participant
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     */
-    public $participant = null;
-
-    /**
-     * returns the participant details
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipant()
-    {
-        return $this->participant;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
deleted file mode 100644
index c45464576..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-     */
-    public $getConferenceTemplateResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
deleted file mode 100644
index 7de877ec0..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetConferenceTemplateResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * details
-     *
-     * @var Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public $detail = null;
-
-    /**
-     * array of Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     *
-     * @var array
-     */
-    public $participants = null;
-
-    /**
-     * returns the details object
-     *
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail
-     */
-    public function getDetail()
-    {
-        return $this->detail;
-    }
-
-    /**
-     * returns array with all participants
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     *
-     * @return array of Zend_Service_DeveloperGarden_ConferenceCall_ParticipantDetail
-     */
-    public function getParticipants()
-    {
-        if ($this->participants instanceof Zend_Service_DeveloperGarden_ConferenceCall_Participant) {
-            $this->participants = array(
-                $this->participants
-            );
-        }
-        return $this->participants;
-    }
-
-    /**
-     * returns the participant object if found in the response
-     *
-     * @param string $participantId
-     * @return Zend_Service_DeveloperGarden_ConferenceCall_Participant
-     */
-    public function getParticipantById($participantId)
-    {
-        $participants = $this->getParticipants();
-        if ($participants !== null) {
-            foreach ($participants as $participant) {
-                if (strcmp($participant->getParticipantId(), $participantId) == 0) {
-                    return $participant;
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
deleted file mode 100644
index 8da467866..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetParticipantStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-     */
-    public $getParticipantStatusResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
deleted file mode 100644
index 87518a4b4..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetParticipantStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetParticipantStatusResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * @var array
-     */
-    public $status = null;
-
-    /**
-     * returns the status array
-     * a array of
-     * Zend_Service_DeveloperGarden_ConferenceCall_ParticipantStatus
-     *
-     * @return array
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
deleted file mode 100644
index c303254aa..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetRunningConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-     */
-    public $getRunningConferenceResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
deleted file mode 100644
index bd87182e3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetRunningConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_GetRunningConferenceResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the conference Id
-     *
-     * @var string
-     */
-    public $conferenceId = null;
-
-    /**
-     * return the conference id
-     *
-     * @return string
-     */
-    public function getConferenceId()
-    {
-        return $this->conferenceId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
deleted file mode 100644
index 0318893ab..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-     */
-    public $newParticipantResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
deleted file mode 100644
index 31a7b97d7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_NewParticipantResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * the participant Id
-     *
-     * @var string
-     */
-    public $participantId = null;
-
-    /**
-     * return the participant id
-     *
-     * @return string
-     */
-    public function getParticipantId()
-    {
-        return $this->participantId;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
deleted file mode 100644
index 6919324c9..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 2edb205cb..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
deleted file mode 100644
index d10243805..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
deleted file mode 100644
index 4eed3dbcf..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RemoveParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_RemoveParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
deleted file mode 100644
index 42c36ea05..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
deleted file mode 100644
index 767ff174a..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
deleted file mode 100644
index 5ae02c727..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateConferenceTemplateResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
deleted file mode 100644
index 95f188e89..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpdateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_ConferenceCall_UpdateParticipantResponse
-    extends Zend_Service_DeveloperGarden_Response_ConferenceCall_ConferenceCallAbstract
-{
-    /**
-     * response data
-     *
-     * @codingStandardsIgnoreFile
-     * @var Zend_Service_DeveloperGarden_Response_ConferenceCall_CCSResponseType
-     */
-    public $CCSResponse = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/Exception.php
deleted file mode 100644
index 5489a025c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_DeveloperGarden_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_Exception
-    extends Zend_Service_DeveloperGarden_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
deleted file mode 100644
index f61b475c2..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CityType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * @var string
-     */
-    public $countryCode = null;
-
-    /**
-     * @var string
-     */
-    public $cityCode = null;
-
-    /**
-     * @var string
-     */
-    public $cityName = null;
-
-    /**
-     * @return string
-     */
-    public function getCountryCode()
-    {
-        return $this->countryCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCityCode()
-    {
-        return $this->cityCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCityName()
-    {
-        return $this->cityName;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
deleted file mode 100644
index fce3c1e15..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GeoCoordinatesType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     *
-     * @var float
-     */
-    public $geoLatitude = null;
-
-    /**
-     *
-     * @var float
-     */
-    public $geoLongitude = null;
-
-    /**
-     * @return float
-     */
-    public function getLatitude()
-    {
-        return $this->geoLatitude;
-    }
-
-    /**
-     * @return float
-     */
-    public function getLongitude()
-    {
-        return $this->geoLongitude;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
deleted file mode 100644
index f38a5d5db..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IPAddressLocationType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-     */
-    public $isInRegion = null;
-
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-     */
-    public $isInGeo = null;
-
-    /**
-     * @var Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-     */
-    public $isInCity = null;
-
-    /**
-     * @var integer
-     */
-    public $ipType = null;
-
-    /**
-     * @var string
-     */
-    public $ipAddress = null;
-
-    /**
-     * @var integer
-     */
-    public $radius = 0;
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-     */
-    public function getRegion()
-    {
-        return $this->isInRegion;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType
-     */
-    public function getGeoCoordinates()
-    {
-        return $this->isInGeo;
-    }
-
-    /**
-     * @return Zend_Service_DeveloperGarden_Response_IpLocation_CityType
-     */
-    public function getCity()
-    {
-        return $this->isInCity;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getIpType()
-    {
-        return $this->ipType;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIpAddress()
-    {
-        return $this->ipAddress;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getRadius()
-    {
-        return $this->radius;
-    }
-
-    /**
-     * implement parsing
-     *
-     */
-    public function parse()
-    {
-        parent::parse();
-        if ($this->isInCity === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php';
-            $this->isInCity = new Zend_Service_DeveloperGarden_Response_IpLocation_CityType();
-        }
-
-        if ($this->isInRegion === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php';
-            $this->isInRegion = new Zend_Service_DeveloperGarden_Response_IpLocation_RegionType();
-        }
-
-        if ($this->isInGeo === null) {
-            require_once 'Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php';
-            $this->isInGeo = new Zend_Service_DeveloperGarden_Response_IpLocation_GeoCoordinatesType();
-        }
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
deleted file mode 100644
index 711b4948a..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocateIPResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * internal data object array of
-     * elements
-     *
-     * @var array
-     */
-    public $ipAddressLocation = array();
-
-    /**
-     * constructor
-     *
-     * @param Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType $response
-     */
-    public function __construct(
-        Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType $response
-    ) {
-        if ($response->ipAddressLocation instanceof Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType) {
-            if (is_array($response->ipAddressLocation)) {
-                foreach ($response->ipAddressLocation as $location) {
-                    $this->ipAddressLocation[] = $location;
-                }
-
-            } else {
-                $this->ipAddressLocation[] = $response->ipAddressLocation;
-            }
-        } elseif (is_array($response->ipAddressLocation)) {
-            $this->ipAddressLocation = $response->ipAddressLocation;
-        }
-
-        $this->errorCode     = $response->getErrorCode();
-        $this->errorMessage  = $response->getErrorMessage();
-        $this->statusCode    = $response->getStatusCode();
-        $this->statusMessage = $response->getStatusMessage();
-    }
-
-    /**
-     * implement own parsing mechanism to fix broken wsdl implementation
-     */
-    public function parse()
-    {
-        parent::parse();
-        if (is_array($this->ipAddressLocation)) {
-            foreach ($this->ipAddressLocation as $address) {
-                $address->parse();
-            }
-        } elseif ($this->ipAddressLocation instanceof Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType) {
-            $this->ipAddressLocation->parse();
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIpAddressLocation()
-    {
-        return $this->ipAddressLocation;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
deleted file mode 100644
index 29d417644..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocateIPResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_LocateIPResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * internal data object array of
-     * elements
-     *
-     * @var array|Zend_Service_DeveloperGarden_Response_IpLocation_IPAddressLocationType
-     */
-    public $ipAddressLocation = array();
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
deleted file mode 100644
index f17d098ee..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RegionType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_IpLocation_RegionType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * country code
-     * @var string
-     */
-    public $countryCode = null;
-
-    /**
-     * region code
-     * @var string
-     */
-    public $regionCode = null;
-
-    /**
-     * region Name
-     * @var string
-     */
-    public $regionName = null;
-
-    /**
-     * @return string
-     */
-    public function getCountryCode()
-    {
-        return $this->countryCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegionCode()
-    {
-        return $this->regionCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRegionName()
-    {
-        return $this->regionName;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
deleted file mode 100644
index 1e34bbb9c..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalSearchResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     *
-     * @var Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public $searchResult = null;
-
-    /**
-     * constructor
-     *
-     * @param Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType $response
-     * @todo implement special result methods
-     */
-    public function __construct(
-        Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType $response
-    ) {
-        $this->errorCode     = $response->getErrorCode();
-        $this->errorMessage  = $response->getErrorMessage();
-        $this->statusCode    = $response->getStatusCode();
-        $this->statusMessage = $response->getStatusMessage();
-        $this->searchResult  = $response;
-    }
-
-    /**
-     * returns the raw search result
-     *
-     * @return Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-     */
-    public function getSearchResult()
-    {
-        return $this->searchResult;
-    }
-
-    /**
-     * overwrite hasError to not handle 0103 error (empty result)
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $result = parent::hasError();
-        if (!$result && $this->statusCode == '0103') {
-            $result = false;
-        }
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
deleted file mode 100644
index 35822d667..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalSearchResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_LocalSearch_LocalSearchResponseType
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * contains the result object
-     * @var mixed
-     */
-    public $searchResult = null;
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php
deleted file mode 100644
index 54ba8eb63..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResponseAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * errorCode
-     *
-     * @var string
-     */
-    public $errorCode = null;
-
-    /**
-     * errorMessage
-     *
-     * @var string
-     */
-    public $errorMessage = null;
-
-    /**
-     * parse the token data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        return $this->errorCode;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        return $this->errorMessage;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->errorCode === null
-             || $this->errorCode == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ($this->errorCode !== null
-                && $this->errorCode != '0000');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
deleted file mode 100644
index c02e26bb0..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * Zend_Service_Response_Exception
- */
-require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Exception
-    extends Zend_Service_DeveloperGarden_Response_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
deleted file mode 100644
index 9a3204dd6..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetTokensResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-    implements Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
-{
-    /**
-     * the security token
-     * @var Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-     */
-    public $securityToken = null;
-
-    /**
-     * returns the security token
-     *
-     * @return string
-     */
-    public function getTokenData()
-    {
-        return $this->getSecurityToken();
-    }
-
-    /**
-     * returns the security token
-     *
-     * @return string
-     */
-    public function getSecurityToken()
-    {
-        if (!$this->securityToken instanceof Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse) {
-            require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Exception(
-                'No valid securityToken found.'
-            );
-        }
-        return $this->securityToken->getTokenData();
-    }
-
-    /**
-     * returns true if the stored token data is valid
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        /**
-         * @todo implement the true token validation check
-         */
-        if (isset($this->securityToken)
-            && !empty($this->securityToken->tokenData)
-        ) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
deleted file mode 100644
index 36808998e..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
-{
-    /**
-     * returns true if the stored token data is valid
-     *
-     * @return boolean
-     */
-    public function isValid();
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
deleted file mode 100644
index 884d0efaf..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SecurityTokenResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-    implements Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface
-{
-    /**
-     * the token format, should be saml20
-     *
-     * @var string
-     */
-    public $tokenFormat = null;
-
-    /**
-     * the token encoding, should be text/xml
-     *
-     * @var string
-     */
-    public $tokenEncoding = null;
-
-    /**
-     * the tokenData should be a valid Assertion value
-     *
-     * @var unknown_type
-     */
-    public $tokenData = null;
-
-    /**
-     * returns the tokenData
-     *
-     * @return string
-     */
-    public function getTokenData()
-    {
-        if (empty($this->tokenData)) {
-            require_once 'Zend/Services/DeveloperGarden/Response/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_Exception('No valid tokenData found.');
-        }
-
-        return $this->tokenData;
-    }
-
-    /**
-     * returns the token format value
-     *
-     * @return string
-     */
-    public function getTokenFormat()
-    {
-        return $this->tokenFormat;
-    }
-
-    /**
-     * returns the token encoding
-     *
-     * @return string
-     */
-    public function getTokenEncoding()
-    {
-        return $this->tokenEncoding;
-    }
-
-    /**
-     * returns true if the stored token data is valid
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        /**
-         * @todo implement the true token validation check
-         */
-        if (!empty($this->securityTokenData)) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
deleted file mode 100644
index e38444a17..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendFlashSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse
-    extends Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
deleted file mode 100644
index 000237306..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse
-    extends Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php
deleted file mode 100644
index e10002be7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendSmsAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the return from the sms request
-     *
-     * @var stdClass
-     */
-    public $return = null;
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            require_once 'Zend/Service/DeveloperGarden/Response/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->status;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->description;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->return === null
-                || $this->return->status == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $retValue = false;
-        if ($this->return instanceof stdClass
-            && $this->return->status != '0000'
-        ) {
-            $retValue = true;
-        }
-        return $retValue;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
deleted file mode 100644
index 56f2aa71b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetValidatedNumbersResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-    /**
-     * array of validated numbers
-     *
-     * @var array of Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
-     */
-    public $validatedNumbers = null;
-
-    /**
-     * returns the internal array of validated numbers
-     *
-     * @return array of Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
-     */
-    public function getNumbers()
-    {
-        return (array) $this->validatedNumbers;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
deleted file mode 100644
index f6939b9b8..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InvalidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
deleted file mode 100644
index 78a2a1fac..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendValidationKeywordResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
deleted file mode 100644
index 5a36f36ef..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ValidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_BaseType
- */
-require_once 'Zend/Service/DeveloperGarden/Response/BaseType.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
-    extends Zend_Service_DeveloperGarden_Response_BaseType
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
deleted file mode 100644
index 015697565..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ValidatedNumber.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
-{
-    /**
-     * the number
-     * @var string
-     */
-    public $number = null;
-
-    /**
-     * is valid until this date
-     * @var string
-     */
-    public $validUntil = null;
-
-    /**
-     * returns the number
-     *
-     * @return number
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * returns the valid until date
-     *
-     * @return string
-     */
-    public function getValidUntil()
-    {
-        return $this->validUntil;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
deleted file mode 100644
index 8fbda0a05..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CallStatus2Response.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-{
-    /**
-     * returns the phone number of the second participant, who was called.
-     *
-     * @return string
-     */
-    public function getBe164()
-    {
-        return $this->getBNumber();
-    }
-
-    /**
-     * returns the phone number of the second participant, who was called.
-     *
-     * @return string
-     */
-    public function getBNumber()
-    {
-        if (isset($this->return->be164)) {
-            return $this->return->be164;
-        }
-        return null;
-    }
-
-    /**
-     * Index of the phone number of the second participant (B), who was called. The value 0 means
-     * the first B party phone number which was called, 1 means the second B party phone number
-     * which was called etc.
-     *
-     * @return integer
-     */
-    public function getBNumberIndex()
-    {
-        return $this->getBIndex();
-    }
-
-    /**
-     * Index of the phone number of the second participant (B), who was called. The value 0 means
-     * the first B party phone number which was called, 1 means the second B party phone number
-     * which was called etc.
-     *
-     * @return integer
-     */
-    public function getBIndex()
-    {
-        if (isset($this->return->bindex)) {
-            return $this->return->bindex;
-        }
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
deleted file mode 100644
index e809cf8c7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CallStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * returns the session id
-     * @return string
-     */
-    public function getSessionId()
-    {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
-        }
-        return null;
-    }
-
-    /**
-     * returns the connection time for participant a
-     *
-     * @return integer
-     */
-    public function getConnectionTimeA()
-    {
-        if (isset($this->return->connectiontimea)) {
-            return $this->return->connectiontimea;
-        }
-        return null;
-    }
-
-    /**
-     * returns the connection time for participant b
-     *
-     * @return integer
-     */
-    public function getConnectionTimeB()
-    {
-        if (isset($this->return->connectiontimeb)) {
-            return $this->return->connectiontimeb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the description time for participant a
-     *
-     * @return string
-     */
-    public function getDescriptionA()
-    {
-        if (isset($this->return->descriptiona)) {
-            return $this->return->descriptiona;
-        }
-        return null;
-    }
-
-    /**
-     * returns the description time for participant b
-     *
-     * @return string
-     */
-    public function getDescriptionB()
-    {
-        if (isset($this->return->descriptionb)) {
-            return $this->return->descriptionb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the reason time for participant a
-     *
-     * @return integer
-     */
-    public function getReasonA()
-    {
-        if (isset($this->return->reasona)) {
-            return $this->return->reasona;
-        }
-        return null;
-    }
-
-    /**
-     * returns the reason time for participant b
-     *
-     * @return integer
-     */
-    public function getReasonB()
-    {
-        if (isset($this->return->reasonb)) {
-            return $this->return->reasonb;
-        }
-        return null;
-    }
-
-    /**
-     * returns the state time for participant a
-     *
-     * @return string
-     */
-    public function getStateA()
-    {
-        if (isset($this->return->statea)) {
-            return $this->return->statea;
-        }
-        return null;
-    }
-
-    /**
-     * returns the state time for participant b
-     *
-     * @return string
-     */
-    public function getStateB()
-    {
-        if (isset($this->return->stateb)) {
-            return $this->return->stateb;
-        }
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
deleted file mode 100644
index 549d11f00..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * returns the session id
-     * @return string
-     */
-    public function getSessionId()
-    {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
-        }
-        return null;
-    }
-
-    /**
-     * prints the session on casting to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getSessionId();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
deleted file mode 100644
index c72c42d11..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewCallSequencedResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
deleted file mode 100644
index c012f9d35..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TearDownCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
-    extends Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-{
-    /**
-     * returns the session id
-     * @return string
-     */
-    public function getSessionId()
-    {
-        if (isset($this->return->sessionId)) {
-            return $this->return->sessionId;
-        }
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php
deleted file mode 100644
index 7601531d6..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_ResponseAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Response/ResponseAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_DeveloperGarden_Response_VoiceButler_VoiceButlerAbstract
-    extends Zend_Service_DeveloperGarden_Response_ResponseAbstract
-{
-    /**
-     * the return from the sms request
-     *
-     * @var stdClass
-     */
-    public $return = null;
-
-    /**
-     * returns the return object
-     *
-     * @return stdClass
-     */
-    public function getReturn()
-    {
-        return $this->return;
-    }
-
-    /**
-     * parse the response data and throws exceptions
-     *
-     * @throws Zend_Service_DeveloperGarden_Response_Exception
-     * @return Zend_Service_DeveloperGarden_Response_ResponseAbstract
-     */
-    public function parse()
-    {
-        if ($this->hasError()) {
-            throw new Zend_Service_DeveloperGarden_Response_Exception(
-                $this->getErrorMessage(),
-                $this->getErrorCode()
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the error code
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->status;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns the error message
-     *
-     * @return string
-     */
-    public function getErrorMessage()
-    {
-        $retValue = null;
-        if ($this->return instanceof stdClass) {
-            $retValue = $this->return->err_msg;
-        }
-        return $retValue;
-    }
-
-    /**
-     * returns true if the errorCode is not null and not 0000
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return ($this->return === null
-                || $this->return->status == '0000');
-    }
-
-    /**
-     * returns true if we have a error situation
-     *
-     * @return boolean
-     */
-    public function hasError()
-    {
-        $retValue = false;
-        if ($this->return instanceof stdClass
-            && $this->return->status != '0000'
-        ) {
-            $retValue = true;
-        }
-        return $retValue;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
deleted file mode 100644
index 517942655..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SecurityTokenServer.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_SecurityTokenServer_Cache
- */
-require_once 'Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SecurityTokenServer
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://sts.idm.telekom.com/TokenService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/TokenService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'SecurityTokenResponse' => 'Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse',
-        'getTokensResponse'     => 'Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse'
-    );
-
-    /**
-     * does the login and return the specific response
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_SecurityTokenResponse
-     */
-    public function getLoginToken()
-    {
-        $token = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getTokenFromCache(
-            'securityToken'
-        );
-
-        if ($token === null
-            || !$token->isValid()
-        ) {
-            $token = $this->getSoapClient()->login('login');
-            Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::setTokenToCache(
-                'securityToken',
-                $token
-            );
-        }
-
-        return $token;
-    }
-
-    /**
-     * returns the fetched token from token server
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_GetTokensResponse
-     */
-    public function getTokens()
-    {
-        $token = Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::getTokenFromCache(
-            'getTokens'
-        );
-
-        if ($token === null
-            || !$token->isValid()
-        ) {
-            $token = $this->getSoapClient()->getTokens(array(
-                'serviceId' => $this->_serviceAuthId
-            ));
-            Zend_Service_DeveloperGarden_SecurityTokenServer_Cache::setTokenToCache(
-                'getTokens',
-                $token
-            );
-        }
-        return $token;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
deleted file mode 100644
index 4f5ea8015..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SecurityTokenServer_Cache
-{
-    /**
-     * array with stored tokens
-     *
-     * @var array
-     */
-    protected static $_storedToken = array(
-        'securityToken' => null,
-        'getTokens' => null
-    );
-
-    /**
-     * Internal cache for token values
-     *
-     * @var Zend_Cache_Core
-     * @access private
-     */
-    private static $_cache = null;
-
-    /**
-     * PHP SOAP wsdl cache constant
-     *
-     * @var integer
-     */
-    private static $_wsdlCache = null;
-
-// @codeCoverageIgnoreStart
-    /**
-     * Constructor overriding - make sure that a developer cannot instantiate
-     */
-    protected function __construct()
-    {
-    }
-// @codeCoverageIgnoreEnd
-
-    /**
-     * returns stored token from cache or null
-     *
-     * @param string $tokenId
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @return Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface|null
-     */
-    public static function getTokenFromCache($tokenId)
-    {
-        if (!array_key_exists($tokenId, self::$_storedToken)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception(
-                'tokenID ' . $tokenId . ' unknown.'
-            );
-        }
-
-        if (self::hasCache() && self::$_storedToken[$tokenId] === null) {
-            $cache = self::getCache();
-            $token = $cache->load(md5($tokenId));
-            if ($token !== false) {
-                self::$_storedToken[$tokenId] = $token;
-            }
-        }
-
-        return self::$_storedToken[$tokenId];
-    }
-
-    /**
-     * set new value for the given tokenId
-     *
-     * @param string $tokenId
-     * @throws Zend_Service_DeveloperGarden_Exception
-     * @param Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface $tokenValue
-     * @return void
-     */
-    public static function setTokenToCache($tokenId,
-        Zend_Service_DeveloperGarden_Response_SecurityTokenServer_Interface $tokenValue
-    ) {
-        if (!array_key_exists($tokenId, self::$_storedToken)) {
-            require_once 'Zend/Service/DeveloperGarden/Exception.php';
-            throw new Zend_Service_DeveloperGarden_Exception(
-                'tokenID ' . $tokenId . ' unknown.'
-            );
-        }
-
-        if (self::hasCache()) {
-            $cache = self::getCache();
-            $cache->save($tokenValue, md5($tokenId));
-        }
-
-        self::$_storedToken[$tokenId] = $tokenValue;
-    }
-
-    /**
-     * reset the internal cache structure
-     *
-     * @return void
-     */
-    public static function resetTokenCache()
-    {
-        foreach (self::$_storedToken as $key => $value) {
-            $value = null;
-            self::$_storedToken[$key] = $value;
-        }
-    }
-
-    /**
-     * Returns the cache
-     *
-     * @return Zend_Cache_Core
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Set a cache for token
-     *
-     * @param Zend_Cache_Core $cache A cache frontend
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        return (self::$_cache !== null);
-    }
-
-    /**
-     * Removes any cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        $cache = self::getCache();
-        if (method_exists($cache, 'clean')) {
-            $cache->clean();
-        }
-        self::$_wsdlCache = null;
-    }
-
-    /**
-     * Returns the wsdl cache
-     *
-     * @return integer
-     */
-    public static function getWsdlCache()
-    {
-        return self::$_wsdlCache;
-    }
-
-    /**
-     * Set a cache for wsdl file
-     *
-     * @param integer $cache
-     * @return void
-     */
-    public static function setWsdlCache($cache = null)
-    {
-        self::$_wsdlCache = $cache;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/SendSms.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/SendSms.php
deleted file mode 100644
index 65e84a476..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/SendSms.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SendSms.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SendSms
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-sms/services/SmsService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/SmsService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'sendSMSResponse'      => 'Zend_Service_DeveloperGarden_Response_SendSms_SendSMSResponse',
-        'sendFlashSMSResponse' => 'Zend_Service_DeveloperGarden_Response_SendSms_SendFlashSMSResponse'
-    );
-
-    /**
-     * this function creates the raw sms object that can be used to send an sms
-     * or as flash sms
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSMS
-     */
-    public function createSms($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SendSms_SendSMS($this->getEnvironment());
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-        return $request;
-    }
-
-    /**
-     * this function creates the raw sms object that can be used to send an sms
-     * or as flash sms
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS
-     */
-    public function createFlashSms($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SendSms_SendFlashSMS($this->getEnvironment());
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-        return $request;
-    }
-
-    /**
-     * sends an sms with the given parameters
-     *
-     * @param Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract $sms
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SendSms_SendSmsAbstract
-     */
-    public function send(Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract $sms)
-    {
-        $client = $this->getSoapClient();
-        $request = array(
-            'request' => $sms
-        );
-        switch ($sms->getSmsType()) {
-            // Sms
-            case 1 :
-                $response = $client->sendSms($request);
-                break;
-            // flashSms
-            case 2 :
-                $response = $client->sendFlashSms($request);
-                break;
-            default : {
-                require_once 'Zend/Service/DeveloperGarden/Client/Exception.php';
-                throw new Zend_Service_DeveloperGarden_Client_Exception('Unknown SMS Type');
-            }
-        }
-
-        return $response->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/SmsValidation.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/SmsValidation.php
deleted file mode 100644
index 98e5aacd7..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/SmsValidation.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SmsValidation.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_Validate
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate
- */
-require_once 'Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_SmsValidation extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-// @codeCoverageIgnoreStart
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-sms-validation/services/SmsValidationUserService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/SmsValidationUserService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'getValidatedNumbersResponse'   => 'Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse',
-        'ValidatedNumber'               => 'Zend_Service_DeveloperGarden_Response_SmsValidation_ValidatedNumber',
-        'sendValidationKeywordResponse' => 'Zend_Service_DeveloperGarden_Response_SmsValidation_SendValidationKeywordResponse',
-        'validateResponse'              => 'Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse',
-        'invalidateResponse'            => 'Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse',
-    );
-
-    /**
-     * validate the given number with the keyword
-     *
-     * @param string $keyword
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_ValidateResponse
-     */
-    public function validate($keyword = null, $number = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_Validate(
-            $this->getEnvironment(),
-            $keyword,
-            $number
-        );
-
-        return $this->getSoapClient()
-                    ->validate($request)
-                    ->parse();
-    }
-
-    /**
-     * invalidate the given number
-     *
-     * @param string $number
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_InvalidateResponse
-     */
-    public function inValidate($number = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_Invalidate(
-            $this->getEnvironment(),
-            $number
-        );
-
-        return $this->getSoapClient()
-                    ->invalidate($request)
-                    ->parse();
-    }
-
-    /**
-     * this function sends the validation sms to the given number,
-     * if message is provided it should have to placeholder:
-     * #key# = the validation key
-     * #validUntil# = the valid until date
-     *
-     * @param string $number
-     * @param string $message
-     * @param string $originator
-     * @param integer $account
-     *
-     * @return Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeywordResponse
-     */
-    public function sendValidationKeyword($number = null, $message = null, $originator = null, $account = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_SendValidationKeyword(
-            $this->getEnvironment()
-        );
-        $request->setNumber($number)
-                ->setMessage($message)
-                ->setOriginator($originator)
-                ->setAccount($account);
-
-        return $this->getSoapClient()
-                    ->sendValidationKeyword($request)
-                    ->parse();
-    }
-
-    /**
-     * returns a list of validated numbers
-     *
-     * @return Zend_Service_DeveloperGarden_Response_SmsValidation_GetValidatedNumbersResponse
-     */
-    public function getValidatedNumbers()
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_SmsValidation_GetValidatedNumbers(
-            $this->getEnvironment()
-        );
-        return $this->getSoapClient()
-                    ->getValidatedNumbers($request)
-                    ->parse();
-    }
-// @codeCoverageIgnoreEnd
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/VoiceCall.php b/airtime_mvc/library/Zend/Service/DeveloperGarden/VoiceCall.php
deleted file mode 100644
index a21876766..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/VoiceCall.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VoiceCall.php 20166 2010-01-09 19:00:17Z bkarwin $
- */
-
-/**
- * @see Zend_Service_DeveloperGarden_Client_ClientAbstract
- */
-require_once 'Zend/Service/DeveloperGarden/Client/ClientAbstract.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus
- */
-require_once 'Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php';
-
-/**
- * @see Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response
- */
-require_once 'Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage DeveloperGarden
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @author     Marco Kaiser
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_DeveloperGarden_VoiceCall
-    extends Zend_Service_DeveloperGarden_Client_ClientAbstract
-{
-    /**
-     * wsdl file
-     *
-     * @var string
-     */
-    protected $_wsdlFile = 'https://gateway.developer.telekom.com/p3gw-mod-odg-voicebutler/services/VoiceButlerService?wsdl';
-
-    /**
-     * wsdl file local
-     *
-     * @var string
-     */
-    protected $_wsdlFileLocal = 'Wsdl/VoiceButlerService.wsdl';
-
-    /**
-     * Response, Request Classmapping
-     *
-     * @var array
-     *
-     */
-    protected $_classMap = array(
-        'newCallResponse'          => 'Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse',
-        'newCallSequencedResponse' => 'Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse',
-        'tearDownCallResponse'     => 'Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse',
-        'callStatusResponse'       => 'Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse',
-        'callStatus2Response'      => 'Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatus2Response'
-    );
-
-    /**
-     * init a new call with the given params
-     *
-     * @param string $aNumber
-     * @param string $bNumber
-     * @param integer $expiration
-     * @param integer $maxDuration
-     * @param integer $account
-     * @param boolean $privacyA
-     * @param boolean $privacyB
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallResponse
-     */
-    public function newCall($aNumber, $bNumber, $expiration, $maxDuration,
-        $account = null, $privacyA = null, $privacyB = null, $greeter = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_NewCall(
-                $this->getEnvironment()
-        );
-        $request->setANumber($aNumber)
-                ->setBNumber($bNumber)
-                ->setPrivacyA($privacyA)
-                ->setPrivacyB($privacyB)
-                ->setExpiration($expiration)
-                ->setMaxDuration($maxDuration)
-                ->setGreeter($greeter)
-                ->setAccount($account);
-        $result = $this->getSoapClient()->newCall(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-
-    /**
-     * init a new call with the given params but specially here,
-     * you can define a set of numbers to be called if the first number
-     * isnt reachable (ie: bNumber = +4930-111111,+4930-222222,+4930-333333)
-     *
-     * @throws Zend_Service_DeveloperGarden_Client_Exception
-     * @param string $aNumber
-     * @param array $bNumber
-     * @param integer $expiration
-     * @param integer $maxDuration
-     * @param integer $maxWait
-     * @param integer $account
-     * @param boolean $privacyA
-     * @param boolean $privacyB
-     * @param string $greeter
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_NewCallSequencedResponse
-     */
-    public function newCallSequenced($aNumber, $bNumber, $expiration, $maxDuration,
-        $maxWait, $account = null, $privacyA = null, $privacyB = null, $greeter = null
-    ) {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_NewCallSequenced(
-                $this->getEnvironment()
-        );
-        $request->setANumber($aNumber)
-                ->setBNumber($bNumber)
-                ->setPrivacyA($privacyA)
-                ->setPrivacyB($privacyB)
-                ->setExpiration($expiration)
-                ->setMaxDuration($maxDuration)
-                ->setMaxWait($maxWait)
-                ->setGreeter($greeter)
-                ->setAccount($account);
-        $result = $this->getSoapClient()->newCallSequenced(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * This tear down the call with the given sessionId
-     *
-     * @param string $sessionId
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_TearDownCallResponse
-     */
-    public function tearDownCall($sessionId)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_TearDownCall(
-            $this->getEnvironment(),
-            $sessionId
-        );
-        $result = $this->getSoapClient()->tearDownCall(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-
-    /**
-     * checks the callStatus and updates the keepAlive if provided
-     *
-     * @param string $sessionId
-     * @param integer $keepAlive
-     * @return Zend_Service_DeveloperGarden_Response_VoiceButler_CallStatusResponse
-     */
-    public function callStatus($sessionId, $keepAlive = null)
-    {
-        $request = new Zend_Service_DeveloperGarden_Request_VoiceButler_CallStatus(
-            $this->getEnvironment(),
-            $sessionId,
-            $keepAlive
-        );
-
-        $result = $this->getSoapClient()->callStatus2(array(
-            'request' => $request
-        ));
-
-        return $result->parse();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl
deleted file mode 100644
index 00ae436d3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:schema="http://iplocation.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://iplocation.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="iplocation" targetNamespace="http://iplocation.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-IP Location </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://iplocation.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://iplocation.developer.telekom.com/schema/" schemaLocation="IPLocation.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="locateIPRequest">
-		<wsdl:part name="parameters" element="schema:LocateIPRequest"/>
-	</wsdl:message>
-	<wsdl:message name="locateIPResponse">
-		<wsdl:part name="parameters" element="schema:LocateIPResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="IPLocationPortType">
-		<wsdl:operation name="locateIP">
-			<wsdl:input message="tns:locateIPRequest"/>
-			<wsdl:output message="tns:locateIPResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="IPLocationHttpBinding" type="tns:IPLocationPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="locateIP">
-			<soap:operation soapAction="http://iplocation.developer.telekom.com/locateIP"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="IPLocation">
-		<wsdl:port name="IPLocation" binding="tns:IPLocationHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-iplocation/services/IPLocation"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd
deleted file mode 100644
index 26284b3e8..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/IPLocation.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://iplocation.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://iplocation.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="IPType">
-		<xsd:restriction base="xsd:integer">
-			<xsd:enumeration value="4"/>
-			<xsd:enumeration value="6"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="IPAddressType">
-		<xsd:sequence>
-			<xsd:element name="ipType" type="tns:IPType" nillable="false"/>
-			<xsd:element name="ipAddress" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="CityType">
-		<xsd:sequence>
-			<xsd:element name="countryCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="cityCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="city" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="RegionType">
-		<xsd:sequence>
-			<xsd:element name="countryCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="regionCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="regionName" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="GeoCoordinatesType">
-		<xsd:sequence>
-			<xsd:element name="geoLatitude" type="xsd:decimal" nillable="false"/>
-			<xsd:element name="geoLongitude" type="xsd:decimal" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="IPAddressLocationType">
-		<xsd:sequence>
-			<xsd:element name="isInRegion" type="tns:RegionType" nillable="true" minOccurs="0"/>
-			<xsd:element name="isInGeo" type="tns:GeoCoordinatesType" nillable="true" minOccurs="0"/>
-			<xsd:element name="isInCity" type="tns:CityType" nillable="true" minOccurs="0"/>
-			<xsd:element name="ipType" type="tns:IPType" nillable="false"/>
-			<xsd:element name="ipAddress" type="xsd:string" nillable="false"/>
-			<xsd:element name="radius" type="xsd:integer" nillable="false"/>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocateIPRequestType">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-			<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0"/>
-			<xsd:element name="address" type="tns:IPAddressType" nillable="false" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocateIPResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-			<xsd:element name="ipAddressLocation" type="tns:IPAddressLocationType" nillable="false" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="LocateIPRequest" type="tns:LocateIPRequestType"/>
-	<xsd:element name="LocateIPResponse" type="tns:LocateIPResponseType"/>
-</xsd:schema>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl
deleted file mode 100644
index e630ea3d3..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:tns="http://odg.tonline.de/ODGBaseUserService/" 
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ODGBaseUserService"
-	targetNamespace="http://odg.tonline.de/ODGBaseUserService/">
-	<wsdl:types>
-		<xsd:schema
-			targetNamespace="http://odg.tonline.de/ODGBaseUserService/"
-			elementFormDefault="unqualified"
-			attributeFormDefault="unqualified">
-			<xsd:include schemaLocation="ODGBaseUserService.xsd" />			
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="changeQuotaPool">
-		<wsdl:part name="request" element="tns:changeQuotaPool"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="changeQuotaPoolResponse">
-		<wsdl:part name="response" 
-			element="tns:changeQuotaPoolResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getQuotaInformation">
-		<wsdl:part name="request" element="tns:getQuotaInformation"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getQuotaInformationResponse">
-		<wsdl:part name="response" 
-			element="tns:getQuotaInformationResponse">
-		</wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getAccountBalance">
-		<wsdl:part name="request" element="tns:getAccountBalance"></wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getAccountBalanceResponse">
-		<wsdl:part name="response" element="tns:getAccountBalanceResponse"></wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="ODGBaseUserService">
-		<wsdl:operation name="changeQuotaPool">
-			<wsdl:input message="tns:changeQuotaPool"></wsdl:input>
-			<wsdl:output message="tns:changeQuotaPoolResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getQuotaInformation">
-			<wsdl:input message="tns:getQuotaInformation"></wsdl:input>
-			<wsdl:output message="tns:getQuotaInformationResponse"></wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getAccountBalance">
-			<wsdl:input message="tns:getAccountBalance"></wsdl:input>
-			<wsdl:output message="tns:getAccountBalanceResponse"></wsdl:output>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="ODGBaseUserServiceSOAP" 
-		type="tns:ODGBaseUserService">
-
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="changeQuotaPool">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/changeQuotaPool" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getQuotaInformation">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/getQuotaInformation" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getAccountBalance">
-
-			<soap:operation
-				soapAction="http://odg.tonline.de/ODGBaseUserService/getAccountBalance" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="ODGBaseUserService">
-		<wsdl:port name="ODGBaseUserService"
-			binding="tns:ODGBaseUserServiceSOAP">
-			<soap:address
-				location="https://gateway.developer.telekom.com/p3gw-mod-odg-admin/services/ODGBaseUserService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd
deleted file mode 100644
index e263b2199..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema 
-	xmlns="http://odg.tonline.de/ODGBaseUserService/"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	xmlns:tns="http://odg.tonline.de/ODGBaseUserService/"
-	targetNamespace="http://odg.tonline.de/ODGBaseUserService/"
-	elementFormDefault="unqualified" 
-	attributeFormDefault="unqualified" version="1.1">
-	
-	
-	
-	
-	
-	<xsd:complexType name="AccountBalance">
-		<xsd:sequence>
-			<xsd:element name="Account" type="xsd:string"></xsd:element>
-			<xsd:element name="Credits" type="xsd:int"></xsd:element>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="getAccountBalance">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="Account" type="xsd:string" maxOccurs="unbounded" minOccurs="0"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getAccountBalanceResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="Account" type="tns:AccountBalance" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-				<xsd:element name="errorCode" type="xsd:string" />
-                <xsd:element name="errorMessage" type="xsd:string" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="changeQuotaPool">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="moduleId" type="xsd:string"></xsd:element>
-				<xsd:element name="quotaMax" type="xsd:nonNegativeInteger" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="changeQuotaPoolResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="errorCode" type="xsd:string"></xsd:element>
-				<xsd:element name="errorMessage" type="xsd:string"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getQuotaInformation">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="moduleId" type="xsd:string"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="getQuotaInformationResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="errorCode" type="xsd:string" />
-				<xsd:element name="errorMessage" type="xsd:string" />
-				<xsd:element name="maxQuota" type="xsd:int" />
-				<xsd:element name="maxUserQuota" type="xsd:int"	nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="quotaLevel" type="xsd:int" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-</xsd:schema>
-
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl
deleted file mode 100644
index f6d57290b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsService.wsdl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sms.odg.tonline.de" xmlns:intf="http://webservice.sms.odg.tonline.de" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.sms.odg.tonline.de">
-	<wsdl:types>
-		<schema targetNamespace="http://webservice.sms.odg.tonline.de" xmlns="http://www.w3.org/2001/XMLSchema">
-			<complexType name="SmsRequest">
-				<sequence>
-					<element name="environment" type="xsd:int"/>
-				</sequence>
-			</complexType>
-			<complexType name="sendSMSRequestBase">
-				<complexContent>
-					<extension base="impl:SmsRequest">
-						<sequence>
-							<element name="number" type="xsd:string"/>
-							<element name="message" type="xsd:string"/>
-							<element name="originator" type="xsd:string"/>
-							<element maxOccurs="1" minOccurs="0" name="account" type="xsd:string"/>
-						</sequence>
-					</extension>
-				</complexContent>
-			</complexType>
-			<complexType name="sendSMSRequest">
-				<complexContent>
-					<extension base="impl:sendSMSRequestBase">
-						<sequence/>
-					</extension>
-				</complexContent>
-			</complexType>
-			<element name="sendSMS">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="request" type="impl:sendSMSRequest"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="SmsResult">
-				<sequence>
-					<element maxOccurs="1" minOccurs="0" name="description" nillable="true" type="xsd:string"/>
-					<element name="status" type="xsd:string"/>
-				</sequence>
-			</complexType>
-			<element name="sendSMSResponse">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="return" nillable="true" type="impl:SmsResult"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="sendFlashSMSRequest">
-				<complexContent>
-					<extension base="impl:sendSMSRequestBase">
-						<sequence/>
-					</extension>
-				</complexContent>
-			</complexType>
-			<element name="sendFlashSMS">
-				<complexType>
-					<sequence>
-						<element name="request" type="impl:sendFlashSMSRequest"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="sendFlashSMSResponse">
-				<complexType>
-					<sequence>
-						<element name="return" nillable="true" type="impl:SmsResult"/>
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="sendSMSRequest">
-		<wsdl:part name="sendSMS" element="impl:sendSMS"/>
-	</wsdl:message>
-	<wsdl:message name="sendFlashSMSRequest">
-		<wsdl:part name="sendFlashSMS" element="impl:sendFlashSMS"/>
-	</wsdl:message>
-	<wsdl:message name="sendFlashSMSResponse">
-		<wsdl:part name="sendFlashSMSResponse" element="impl:sendFlashSMSResponse"/>
-	</wsdl:message>
-	<wsdl:message name="sendSMSResponse">
-		<wsdl:part name="sendSMSResponse" element="impl:sendSMSResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="SmsServicePortType">
-		<wsdl:operation name="sendSMS" parameterOrder="sendSMS">
-			<wsdl:input name="sendSMSRequest" message="impl:sendSMSRequest"/>
-			<wsdl:output name="sendSMSResponse" message="impl:sendSMSResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="sendFlashSMS" parameterOrder="sendFlashSMS">
-			<wsdl:input name="sendFlashSMSRequest" message="impl:sendFlashSMSRequest"/>
-			<wsdl:output name="sendFlashSMSResponse" message="impl:sendFlashSMSResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SmsServiceSoapBinding" type="impl:SmsServicePortType">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="sendSMS">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendSMS"/>
-			<wsdl:input name="sendSMSRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendSMSResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="sendFlashSMS">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendFlashSMS"/>
-			<wsdl:input name="sendFlashSMSRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendFlashSMSResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SmsService">
-		<wsdl:port name="SmsService" binding="impl:SmsServiceSoapBinding">
-			<wsdlsoap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-sms/services/SmsService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl
deleted file mode 100644
index 18c2c7cda..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/SmsValidationUserService.wsdl
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.sms.odg.tonline.de" xmlns:intf="http://webservice.sms.odg.tonline.de" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.sms.odg.tonline.de">
-	<wsdl:types>
-		<schema targetNamespace="http://webservice.sms.odg.tonline.de" xmlns="http://www.w3.org/2001/XMLSchema">
-			<element name="sendValidationKeywordRequest">
-				<complexType>
-					<sequence>
-						<element maxOccurs="1" minOccurs="0" name="message" type="xsd:string"/>
-						<element name="number" type="xsd:string"/>
-						<element maxOccurs="1" minOccurs="0" name="originator" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-						<element maxOccurs="1" minOccurs="0" name="account" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="sendValidationKeywordResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="validateRequest">
-				<complexType>
-					<sequence>
-						<element name="keyword" type="xsd:string"/>
-						<element name="number" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="validateResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="invalidateRequest">
-				<complexType>
-					<sequence>
-						<element name="number" type="xsd:string"/>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="invalidateResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<element name="getValidatedNumbersRequest">
-				<complexType>
-					<sequence>
-						<element name="environment" type="xsd:string"/>
-					</sequence>
-				</complexType>
-			</element>
-			<complexType name="ValidatedNumber">
-				<sequence>
-					<element name="number" type="xsd:string"/>
-					<element maxOccurs="1" minOccurs="0" name="validUntil" type="xsd:dateTime"/>
-				</sequence>
-			</complexType>
-			<element name="getValidatedNumbersResponse">
-				<complexType>
-					<sequence>
-						<element name="statusCode" type="xsd:string"/>
-						<element name="statusMessage" type="xsd:string"/>
-						<element maxOccurs="unbounded" minOccurs="0" name="validatedNumbers" type="impl:ValidatedNumber"/>
-					</sequence>
-				</complexType>
-			</element>
-		</schema>
-	</wsdl:types>
-	<wsdl:message name="sendValidationKeywordRequest">
-		<wsdl:part name="sendValidationKeywordRequest" element="impl:sendValidationKeywordRequest"/>
-	</wsdl:message>
-	<wsdl:message name="getValidatedNumbersResponse">
-		<wsdl:part name="getValidatedNumbersResponse" element="impl:getValidatedNumbersResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getValidatedNumbersRequest">
-		<wsdl:part name="getValidatedNumbersRequest" element="impl:getValidatedNumbersRequest"/>
-	</wsdl:message>
-	<wsdl:message name="invalidateRequest">
-		<wsdl:part name="invalidateRequest" element="impl:invalidateRequest"/>
-	</wsdl:message>
-	<wsdl:message name="validateRequest">
-		<wsdl:part name="validateRequest" element="impl:validateRequest"/>
-	</wsdl:message>
-	<wsdl:message name="sendValidationKeywordResponse">
-		<wsdl:part name="sendValidationKeywordResponse" element="impl:sendValidationKeywordResponse"/>
-	</wsdl:message>
-	<wsdl:message name="validateResponse">
-		<wsdl:part name="validateResponse" element="impl:validateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="invalidateResponse">
-		<wsdl:part name="invalidateResponse" element="impl:invalidateResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="SmsValidationUserServicePortType">
-		<wsdl:operation name="sendValidationKeyword" parameterOrder="sendValidationKeywordRequest">
-			<wsdl:input name="sendValidationKeywordRequest" message="impl:sendValidationKeywordRequest"/>
-			<wsdl:output name="sendValidationKeywordResponse" message="impl:sendValidationKeywordResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="validate" parameterOrder="validateRequest">
-			<wsdl:input name="validateRequest" message="impl:validateRequest"/>
-			<wsdl:output name="validateResponse" message="impl:validateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="invalidate" parameterOrder="invalidateRequest">
-			<wsdl:input name="invalidateRequest" message="impl:invalidateRequest"/>
-			<wsdl:output name="invalidateResponse" message="impl:invalidateResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getValidatedNumbers" parameterOrder="getValidatedNumbersRequest">
-			<wsdl:input name="getValidatedNumbersRequest" message="impl:getValidatedNumbersRequest"/>
-			<wsdl:output name="getValidatedNumbersResponse" message="impl:getValidatedNumbersResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SmsValidationUserServiceSoapBinding" type="impl:SmsValidationUserServicePortType">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsdl:operation name="sendValidationKeyword">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/sendValidationKeyword"/>
-			<wsdl:input name="sendValidationKeywordRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="sendValidationKeywordResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="validate">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/validate"/>
-			<wsdl:input name="validateRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="validateResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="invalidate">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/invalidate"/>
-			<wsdl:input name="invalidateRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="invalidateResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getValidatedNumbers">
-			<wsdlsoap:operation soapAction="http://webservice.sms.odg.tonline.de/getValidatedNumbers"/>
-			<wsdl:input name="getValidatedNumbersRequest">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output name="getValidatedNumbersResponse">
-				<wsdlsoap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SmsValidationUserService">
-		<wsdl:port name="SmsValidationUserService" binding="impl:SmsValidationUserServiceSoapBinding">
-			<wsdlsoap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-sms-validation/services/SmsValidationUserService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<!--WSDL created by Apache Axis version: 1.4
-Built on Apr 22, 2006 (06:55:48 PDT)-->
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl
deleted file mode 100644
index 04d03ee45..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/TokenService.wsdl
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:schema="http://sts.idm.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://sts.idm.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="sts" targetNamespace="http://sts.idm.telekom.com/wsdl/">
-	<wsdl:types>
-		<xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://sts.idm.telekom.com/schema/" version="0.1" xmlns:tns="http://sts.idm.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			<xsd:complexType name="FaultResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="1" minOccurs="1" name="code" nillable="false" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="1" name="msg" nillable="false" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="0" name="lockedUntil" nillable="true" type="xsd:dateTime"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:simpleType name="SecurityTokenFormatId">
-				<xsd:annotation>
-					<xsd:documentation>
-
-					Telekom specific format id, e.g. there will be multiple
-					different token formats derived from SAML 2.0 Assertions
-				     </xsd:documentation>
-				</xsd:annotation>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="saml20"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:simpleType name="SecurityTokenEncodingId">
-				<xsd:annotation>
-					<xsd:documentation>
-
-					Telekom specific encoding id - there can be different
-					encoding formats for the same token format, e.g. SAML
-					Assertions can be encoded as plain XML or in
-					base64-encoding
-				     </xsd:documentation>
-				</xsd:annotation>
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="text/xml"/>
-					<xsd:enumeration value="text/base64"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:complexType name="SecurityTokenResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="1" minOccurs="1" name="tokenFormat" type="tns:SecurityTokenFormatId">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							format of the token carried by the response,
-							determines syntax and processing rules for token
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="0" name="tokenEncoding" type="tns:SecurityTokenEncodingId">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							encoding of the token carried by the response,
-							determines syntax and processing rules for token
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="1" name="tokenData" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							contains the string representation of the
-							security token - no further token format identifier
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="login">
-				<xsd:sequence/>
-			</xsd:complexType>
-			<xsd:complexType name="getTokens">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensResponse">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="securityToken" type="tns:SecurityTokenResponse">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensForSession">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element maxOccurs="1" minOccurs="1" name="ssid" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation>
-
-							valid SAM Session Id
-						       </xsd:documentation>
-						</xsd:annotation>
-					</xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:simpleType name="IDType">
-				<xsd:restriction base="xsd:string">
-					<xsd:enumeration value="guid"/>
-					<xsd:enumeration value="anid"/>
-					<xsd:enumeration value="alia"/>
-				</xsd:restriction>
-			</xsd:simpleType>
-			<xsd:complexType name="getTokensForUserId">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element name="uid" type="xsd:string"/>
-					<xsd:element name="idx" type="tns:IDType"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="authn" type="xsd:string"/>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:complexType name="getTokensForUserIdAndProfile">
-				<xsd:sequence>
-					<xsd:element maxOccurs="unbounded" minOccurs="1" name="serviceId" type="xsd:string">
-
-				     </xsd:element>
-					<xsd:element name="uid" type="xsd:string"/>
-					<xsd:element name="idx" type="tns:IDType"/>
-					<xsd:element maxOccurs="unbounded" minOccurs="0" name="authn" type="xsd:string"/>
-					<xsd:element maxOccurs="1" minOccurs="1" name="profileId" type="xsd:string">
-
-				     </xsd:element>
-				</xsd:sequence>
-			</xsd:complexType>
-			<xsd:element name="FaultResponse" type="tns:FaultResponse"/>
-			<xsd:element name="login" type="tns:login"/>
-			<xsd:element name="loginResponse" type="tns:SecurityTokenResponse"/>
-			<xsd:element name="getTokens" type="tns:getTokens"/>
-			<xsd:element name="getTokensResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForSessionResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForUserIdResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForUserIdAndProfileResponse" type="tns:getTokensResponse"/>
-			<xsd:element name="getTokensForSession" type="tns:getTokensForSession"/>
-			<xsd:element name="getTokensForUserId" type="tns:getTokensForUserId"/>
-			<xsd:element name="getTokensForUserIdAndProfile" type="tns:getTokensForUserIdAndProfile"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="FaultResponse">
-		<wsdl:part name="fault" element="schema:FaultResponse"/>
-	</wsdl:message>
-	<wsdl:message name="loginRequest">
-		<wsdl:part name="parameters" element="schema:login"/>
-	</wsdl:message>
-	<wsdl:message name="loginResponse">
-		<wsdl:part name="parameters" element="schema:loginResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getTokensRequest">
-		<wsdl:part name="parameters" element="schema:getTokens"/>
-	</wsdl:message>
-	<wsdl:message name="getTokensResponse">
-		<wsdl:part name="getTokensResponse" element="schema:getTokensResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForSessionRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForSession">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForSessionResponse">
-		<wsdl:part name="getTokensForSessionResponse" element="schema:getTokensForSessionResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForUserId">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdResponse">
-		<wsdl:part name="getTokensForUserIdResponse" element="schema:getTokensForUserIdResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdAndProfileRequest">
-		<wsdl:part name="parameters" element="schema:getTokensForUserIdAndProfile">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:message name="getTokensForUserIdAndProfileResponse">
-		<wsdl:part name="getTokensForUserIdAndProfileResponse" element="schema:getTokensForUserIdAndProfileResponse">
-
-      </wsdl:part>
-	</wsdl:message>
-	<wsdl:portType name="SecurityTokenServiceWS">
-		<wsdl:operation name="login">
-			<wsdl:input message="tns:loginRequest"/>
-			<wsdl:output message="tns:loginResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokens">
-			<wsdl:input message="tns:getTokensRequest"/>
-			<wsdl:output message="tns:getTokensResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForSession">
-			<wsdl:input message="tns:getTokensForSessionRequest"/>
-			<wsdl:output message="tns:getTokensForSessionResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserId">
-			<wsdl:input message="tns:getTokensForUserIdRequest"/>
-			<wsdl:output message="tns:getTokensForUserIdResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserIdAndProfile">
-			<wsdl:input message="tns:getTokensForUserIdAndProfileRequest">
-
-         </wsdl:input>
-			<wsdl:output message="tns:getTokensForUserIdAndProfileResponse"/>
-			<wsdl:fault name="fault" message="tns:FaultResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="SecurityTokenServiceSOAPBinding" type="tns:SecurityTokenServiceWS">
-		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="login">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/login"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#UsernameTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokens">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokens"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForSession">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForSession"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserId">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForUserId"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-		<wsdl:operation name="getTokensForUserIdAndProfile">
-			<soap:operation soapAction="http://sts.idm.telekom.com/wsdl/getTokensForUserIdAndProfile"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#SAMLTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-			<wsdl:fault name="fault">
-				<soap:fault name="fault" use="literal"/>
-			</wsdl:fault>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="SecurityTokenService">
-		<wsdl:port name="TokenService" binding="tns:SecurityTokenServiceSOAPBinding">
-			<soap:address location="https://sts.idm.telekom.com/TokenService"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsaws:UsingAddressing xmlns:wsaws="http://www.w3.org/2006/05/addressing/wsdl"/>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="UsernameTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssUsernameToken11/>
-							</wsp:Policy>
-						</sp:UsernameToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="SAMLTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl
deleted file mode 100644
index aad614e31..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><wsdl:definitions
-	targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-	xmlns:tns="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-	xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsd"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-	<wsdl:documentation>VoiceButlerService</wsdl:documentation>
-	<wsdl:types> 
-		<xsd:schema 
-			targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-			elementFormDefault="unqualified"
-			attributeFormDefault="unqualified">
-			<xsd:include schemaLocation="VoiceButlerService.xsd" />
-			
-		</xsd:schema>
-	</wsdl:types>
-
-	<wsdl:message name="callStatusRequest">
-		<wsdl:part name="parameters" element="tns:callStatus" />
-	</wsdl:message>
-	<wsdl:message name="callStatusResponse">
-		<wsdl:part name="parameters" element="tns:callStatusResponse" />
-	</wsdl:message>
-    <wsdl:message name="callStatus2Request">
-      <wsdl:part name="parameters" element="tns:callStatus2" />
-    </wsdl:message>
-    <wsdl:message name="callStatus2Response">
-      <wsdl:part name="parameters" element="tns:callStatus2Response" />
-    </wsdl:message>
-	<wsdl:message name="tearDownCallRequest">
-		<wsdl:part name="parameters" element="tns:tearDownCall" />
-	</wsdl:message>
-	<wsdl:message name="tearDownCallResponse">
-		<wsdl:part name="parameters" element="tns:tearDownCallResponse" />
-	</wsdl:message>
-	<wsdl:message name="newCallRequest">
-		<wsdl:part name="parameters" element="tns:newCall" />
-	</wsdl:message>
- 	<wsdl:message name="newCallResponse">
-		<wsdl:part name="parameters" element="tns:newCallResponse" />
-	</wsdl:message>
-
-	<wsdl:message name="newCallSequencedRequest">
-		<wsdl:part name="parameters" element="tns:newCallSequenced"/>
-	</wsdl:message>
-	<wsdl:message name="newCallSequencedResponse">
-		<wsdl:part name="parameters" element="tns:newCallSequencedResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="VoiceButlerServicePortType">
-		<wsdl:operation name="callStatus">
-			<wsdl:input message="tns:callStatusRequest"
-				wsaw:Action="urn:callStatus" />
-			<wsdl:output message="tns:callStatusResponse"
-				wsaw:Action="urn:callStatusResponse" />
-		</wsdl:operation>
-        <wsdl:operation name="callStatus2">
-          <wsdl:input message="tns:callStatus2Request"
-            wsaw:Action="urn:callStatus2" />
-          <wsdl:output message="tns:callStatus2Response"
-            wsaw:Action="urn:callStatus2Response" />
-        </wsdl:operation>
-		<wsdl:operation name="tearDownCall">
-			<wsdl:input message="tns:tearDownCallRequest"
-				wsaw:Action="urn:tearDownCall" />
-			<wsdl:output message="tns:tearDownCallResponse"
-				wsaw:Action="urn:tearDownCallResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="newCall">
-			<wsdl:input message="tns:newCallRequest"
-				wsaw:Action="urn:newCall" />
-			<wsdl:output message="tns:newCallResponse"
-				wsaw:Action="urn:newCallResponse" />
-		</wsdl:operation>
-		<wsdl:operation name="newCallSequenced">
-		<wsdl:input message="tns:newCallSequencedRequest"
-        wsaw:Action="urn:newCallSequence" />
-      <wsdl:output message="tns:newCallSequencedResponse"
-        wsaw:Action="urn:newCallSequenceResponse" />
-		</wsdl:operation>
-	</wsdl:portType>
- 
-	<wsdl:binding name="VoiceButlerServiceHttpBinding"
-		type="tns:VoiceButlerServicePortType">
-
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="callStatus">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/callStatus" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-      <wsdl:operation name="callStatus2">
-  
-        <soap:operation
-          soapAction="http://webservice.voicebutler.odg.tonline.de/callStatus2" />
-        <wsdl:input>
-  
-          <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-  
-          <soap:body use="literal" />
-        </wsdl:output>
-      </wsdl:operation>
-		<wsdl:operation name="tearDownCall">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/tearDownCall" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newCall">
-
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/newCall" />
-			<wsdl:input>
-
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newCallSequenced">
-			<soap:operation
-				soapAction="http://webservice.voicebutler.odg.tonline.de/newCallSequence" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="VoiceButlerService">
-
-		<wsdl:port name="VoiceButlerService"
-			binding="tns:VoiceButlerServiceHttpBinding">
-
-			<soap:address
-				location="https://gateway.developer.telekom.com/p3gw-mod-odg-voicebutler/services/VoiceButlerService" />
-		</wsdl:port>
-	</wsdl:service>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd
deleted file mode 100644
index e14ba5a48..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<xsd:schema xmlns="http://webservice.voicebutler.odg.tonline.de"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://webservice.voicebutler.odg.tonline.de"
-	elementFormDefault="unqualified" attributeFormDefault="unqualified"
-	version="1.1">
-
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1" />
-			<xsd:maxInclusive value="3" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="NumberType">
-		<xsd:restriction base="xsd:string">
-			<xsd:minLength value="7" />
-			<xsd:maxLength value="24" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="SessionIDType">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="[0-9A-Z]{8}\-[0-9A-Z]{16}\-[0-9A-Z]{8}" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="KeepAliveType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-			<xsd:maxInclusive value="1" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="MaxDurationType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="ExpirationType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="0" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:element name="callStatus">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerCallStatusRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-  <xsd:element name="callStatus2">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element minOccurs="0" name="request" nillable="false"
-          type="VoiceButlerCallStatusRequest" />
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-	<xsd:complexType name="VoiceButlerCallStatusRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1" name="keepAlive"
-						nillable="false" type="KeepAliveType" />
-					<xsd:element minOccurs="1" maxOccurs="1" name="sessionId"
-						nillable="false" type="SessionIDType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:element name="newCall">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerNewCallRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="VoiceButlerNewCallRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerNewCallRequestBase">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="bNumber" nillable="false" type="NumberType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-	<!-- newCall { -->
-	<xsd:element name="newCallSequenced">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerNewCallSequencedRequest" />
-
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="newCallSequencedResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="return" type="VoiceButlerResult"></xsd:element>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<!-- newCall } -->
-
-	<xsd:element name="tearDownCall">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="request" nillable="false"
-					type="VoiceButlerTeardownCallRequest" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="VoiceButlerTeardownCallRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence minOccurs="1" maxOccurs="1">
-					<xsd:element name="sessionId" type="SessionIDType" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="callStatusResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="return" nillable="false"
-					type="VoiceButlerCallStatusResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:complexType name="VoiceButlerCallStatusResult">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerResult">
-				<xsd:sequence minOccurs="0" maxOccurs="1">
-					<xsd:element minOccurs="0" name="connectiontimea" type="xsd:int" />
-					<xsd:element minOccurs="0" name="connectiontimeb" type="xsd:int" />
-					<xsd:element minOccurs="0" name="descriptiona"
-						nillable="true" type="xsd:string" />
-					<xsd:element minOccurs="0" name="descriptionb"
-						nillable="true" type="xsd:string" />
-					<xsd:element minOccurs="0" name="reasona" type="xsd:int" />
-					<xsd:element minOccurs="0" name="reasonb" type="xsd:int" />
-					<xsd:element minOccurs="0" name="statea" type="xsd:string" />
-					<xsd:element minOccurs="0" name="stateb" type="xsd:string" />
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-    <xsd:element name="callStatus2Response">
-      <xsd:complexType>
-        <xsd:sequence>
-          <xsd:element minOccurs="0" name="return" nillable="false"
-            type="VoiceButlerCallStatus2Result" />
-        </xsd:sequence>
-      </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="VoiceButlerCallStatus2Result">
-      <xsd:complexContent>
-        <xsd:extension base="VoiceButlerResult">
-          <xsd:sequence minOccurs="0" maxOccurs="1">
-            <xsd:element minOccurs="0" name="connectiontimea" type="xsd:int" />
-            <xsd:element minOccurs="0" name="connectiontimeb" type="xsd:int" />
-            <xsd:element minOccurs="0" name="descriptiona"
-              nillable="true" type="xsd:string" />
-            <xsd:element minOccurs="0" name="descriptionb"
-              nillable="true" type="xsd:string" />
-            <xsd:element minOccurs="0" name="reasona" type="xsd:int" />
-            <xsd:element minOccurs="0" name="reasonb" type="xsd:int" />
-            <xsd:element minOccurs="0" name="statea" type="xsd:string" />
-            <xsd:element minOccurs="0" name="stateb" type="xsd:string" />
-            
-            <xsd:element minOccurs="0" name="be164" type="xsd:string" 
-              nillable="true"/>
-            <xsd:element minOccurs="0" name="bindex" type="xsd:int" 
-              nillable="true"/>
-          </xsd:sequence>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-	<xsd:element name="newCallResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="0" name="return" nillable="false"
-					type="VoiceButlerResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="tearDownCallResponse">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element minOccurs="1" name="return" nillable="false"
-					type="VoiceButlerResult" />
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:complexType name="VoiceButlerRequest">
-		<xsd:sequence>
-			<xsd:element minOccurs="1" maxOccurs="1" name="environment"
-				nillable="false" type="EnvironmentType" />
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="VoiceButlerResult">
-		<xsd:sequence>
-			<xsd:element minOccurs="0" name="err_msg" nillable="true"
-				type="xsd:string" />
-			<xsd:element minOccurs="0" name="sessionId" nillable="true"
-				type="xsd:string" />
-			<xsd:element minOccurs="1" name="status" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="VoiceButlerNewCallSequencedRequest">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerNewCallRequestBase">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="unbounded"
-						name="bNumber" nillable="false" type="NumberType" />
-					<xsd:element name="maxWait" type="xsd:int" maxOccurs="1" minOccurs="1"></xsd:element>
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="VoiceButlerNewCallRequestBase">
-		<xsd:complexContent>
-			<xsd:extension base="VoiceButlerRequest">
-				<xsd:sequence>
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="aNumber" nillable="false" type="NumberType" />
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="expiration" nillable="false" type="ExpirationType" />
-					<xsd:element minOccurs="1" maxOccurs="1"
-						name="maxDuration" nillable="false" type="MaxDurationType" />
-					<xsd:element name="account" type="xsd:string"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-					<xsd:element name="privacyA" type="xsd:boolean"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-                    <xsd:element name="privacyB" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-                    <xsd:element name="greeter" type="xsd:string"
-						maxOccurs="1" minOccurs="0">
-					</xsd:element>
-
-				</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-</xsd:schema>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl
deleted file mode 100644
index 07d9ed942..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.wsdl
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" xmlns:schema="http://ccs.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://ccs.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ccs" targetNamespace="http://ccs.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-CCS </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://ccs.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://ccs.developer.telekom.com/schema/" schemaLocation="ccsPort.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="createConferenceIn">
-		<wsdl:part name="parameters" element="schema:createConference"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceOut">
-		<wsdl:part name="parameters" element="schema:createConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="commitConferenceIn">
-		<wsdl:part name="parameters" element="schema:commitConference"/>
-	</wsdl:message>
-	<wsdl:message name="commitConferenceOut">
-		<wsdl:part name="parameters" element="schema:commitConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceStatusIn">
-		<wsdl:part name="parameters" element="schema:getConferenceStatus"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceStatusOut">
-		<wsdl:part name="parameters" element="schema:getConferenceStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getRunningConferenceIn">
-		<wsdl:part name="parameters" element="schema:getRunningConference"/>
-	</wsdl:message>
-	<wsdl:message name="getRunningConferenceOut">
-		<wsdl:part name="parameters" element="schema:getRunningConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceIn">
-		<wsdl:part name="parameters" element="schema:removeConference"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceListIn">
-		<wsdl:part name="parameters" element="schema:getConferenceList"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceListOut">
-		<wsdl:part name="parameters" element="schema:getConferenceListResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceIn">
-		<wsdl:part name="parameters" element="schema:updateConference"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceResponse"/>
-	</wsdl:message>
-	<wsdl:message name="newParticipantIn">
-		<wsdl:part name="parameters" element="schema:newParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="newParticipantOut">
-		<wsdl:part name="parameters" element="schema:newParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeParticipantIn">
-		<wsdl:part name="parameters" element="schema:removeParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="removeParticipantOut">
-		<wsdl:part name="parameters" element="schema:removeParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateParticipantIn">
-		<wsdl:part name="parameters" element="schema:updateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="updateParticipantOut">
-		<wsdl:part name="parameters" element="schema:updateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getParticipantStatusIn">
-		<wsdl:part name="parameters" element="schema:getParticipantStatus"/>
-	</wsdl:message>
-	<wsdl:message name="getParticipantStatusOut">
-		<wsdl:part name="parameters" element="schema:getParticipantStatusResponse"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:createConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="createConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:createConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateIn">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplate"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateListIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateList"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateListOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateListResponse"/>
-	</wsdl:message>
-	<wsdl:message name="addConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:addConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="addConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:addConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="getConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:getConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="updateConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:updateConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateParticipantIn">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateParticipant"/>
-	</wsdl:message>
-	<wsdl:message name="removeConferenceTemplateParticipantOut">
-		<wsdl:part name="parameters" element="schema:removeConferenceTemplateParticipantResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="ccsPortType">
-		<wsdl:operation name="createConference">
-			<wsdl:input message="tns:createConferenceIn"/>
-			<wsdl:output message="tns:createConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="commitConference">
-			<wsdl:input message="tns:commitConferenceIn"/>
-			<wsdl:output message="tns:commitConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConference">
-			<wsdl:input message="tns:updateConferenceIn"/>
-			<wsdl:output message="tns:updateConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceStatus">
-			<wsdl:input message="tns:getConferenceStatusIn"/>
-			<wsdl:output message="tns:getConferenceStatusOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getRunningConference">
-			<wsdl:input message="tns:getRunningConferenceIn"/>
-			<wsdl:output message="tns:getRunningConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getParticipantStatus">
-			<wsdl:input message="tns:getParticipantStatusIn"/>
-			<wsdl:output message="tns:getParticipantStatusOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="newParticipant">
-			<wsdl:input message="tns:newParticipantIn"/>
-			<wsdl:output message="tns:newParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeParticipant">
-			<wsdl:input message="tns:removeParticipantIn"/>
-			<wsdl:output message="tns:removeParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateParticipant">
-			<wsdl:input message="tns:updateParticipantIn"/>
-			<wsdl:output message="tns:updateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConference">
-			<wsdl:input message="tns:removeConferenceIn"/>
-			<wsdl:output message="tns:removeConferenceOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceList">
-			<wsdl:input message="tns:getConferenceListIn"/>
-			<wsdl:output message="tns:getConferenceListOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="createConferenceTemplate">
-			<wsdl:input message="tns:createConferenceTemplateIn"/>
-			<wsdl:output message="tns:createConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplate">
-			<wsdl:input message="tns:getConferenceTemplateIn"/>
-			<wsdl:output message="tns:getConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplate">
-			<wsdl:input message="tns:updateConferenceTemplateIn"/>
-			<wsdl:output message="tns:updateConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplate">
-			<wsdl:input message="tns:removeConferenceTemplateIn"/>
-			<wsdl:output message="tns:removeConferenceTemplateOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateList">
-			<wsdl:input message="tns:getConferenceTemplateListIn"/>
-			<wsdl:output message="tns:getConferenceTemplateListOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="addConferenceTemplateParticipant">
-			<wsdl:input message="tns:addConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:addConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateParticipant">
-			<wsdl:input message="tns:getConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:getConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplateParticipant">
-			<wsdl:input message="tns:updateConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:updateConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplateParticipant">
-			<wsdl:input message="tns:removeConferenceTemplateParticipantIn"/>
-			<wsdl:output message="tns:removeConferenceTemplateParticipantOut"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="ccsHttpBinding" type="tns:ccsPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="createConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/createConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="commitConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/commitConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceStatus">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceStatus"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getRunningConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getRunningConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getParticipantStatus">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getParticipantStatus"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="newParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/newParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConference">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConference"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceList">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceList"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="createConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/createConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplate">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConferenceTemplate"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateList">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplateList"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="addConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/addConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="getConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/getConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="updateConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/updateConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-		<wsdl:operation name="removeConferenceTemplateParticipant">
-			<soap:operation soapAction="http://ccs.developer.telekom.com/removeConferenceTemplateParticipant"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="ccs">
-		<wsdl:port name="ccsPort" binding="tns:ccsHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-ccs/services/ccsPort"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd
deleted file mode 100644
index 149ba6910..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd
+++ /dev/null
@@ -1,736 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://ccs.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://ccs.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-
-
-	<!-- CCS header -->
-
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:complexType name="CCSRequestType" abstract="true">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="CCSResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<!-- Participant Structures -->
-
-	<xsd:complexType name="ParticipantStatusStruct">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string"/>
-			<xsd:element name="value" type="xsd:string"/>
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ParticipantDetailStruct">
-		<xsd:sequence>
-			<xsd:element name="firstName" type="xsd:string"/>
-			<xsd:element name="lastName" type="xsd:string"/>
-			<xsd:element name="number" type="xsd:string"/>
-			<xsd:element name="email" type="xsd:string"/>
-			<xsd:element name="flags" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ParticipantStruct">
-		<xsd:sequence>
-			<xsd:element name="participantId" type="xsd:string"/>
-			<xsd:element name="detail" type="tns:ParticipantDetailStruct"/>
-			<xsd:element name="status" type="tns:ParticipantStatusStruct" minOccurs="0" maxOccurs="unbounded" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<!-- Conference Structures -->
-
-	<xsd:complexType name="ConferenceDetailStruct">
-		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string"/>
-			<xsd:element name="description" type="xsd:string" />
-			<xsd:element name="duration" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="ConferenceAccStruct">
-		<xsd:sequence>
-			<xsd:element name="billingtype" type="xsd:string" />
-			<xsd:element name="account" type="xsd:string" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="ScheduleStruct">
-		<xsd:sequence>
-			<xsd:element name="minute" type="xsd:int"/>
-			<xsd:element name="hour" type="xsd:int" />
-			<xsd:element name="dayOfMonth" type="xsd:int" />
-			<xsd:element name="month" type="xsd:int" />
-			<xsd:element name="year" type="xsd:int" />
-			<xsd:element name="recurring" type="xsd:int" />
-			<xsd:element name="notify" type="xsd:int" />
-		</xsd:sequence>
-	</xsd:complexType>
-
-
-	<!-- Request and Response Types -->
-	<xsd:complexType name="createConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="ownerId" type="xsd:string"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct"/>
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="createConferenceResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"  minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="commitConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceStatusRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="what" type="xsd:int" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceStatusResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="acc" type="tns:ConferenceAccStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="startTime" type="xsd:long" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="participants" type="tns:ParticipantStruct" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getRunningConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getRunningConferenceResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="removeConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceListRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="what" type="xsd:int" />
-				<xsd:element name="ownerId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceListResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="conferenceIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="updateConferenceRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0" maxOccurs="1" />
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="initiatorId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-				<xsd:element name="schedule" type="tns:ScheduleStruct" minOccurs="0" maxOccurs="1" nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="newParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="newParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participantId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="removeParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="updateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-				<xsd:element name="action" type="xsd:int"  minOccurs="0" maxOccurs="1"  nillable="true" />
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="1"  nillable="true"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getParticipantStatusRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="conferenceId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getParticipantStatusResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="status" type="tns:ParticipantStatusStruct" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-	<xsd:complexType name="createConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="ownerId" type="xsd:string"/>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct"/>
-				<xsd:element name="participants" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="unbounded" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="createConferenceTemplateResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-
-	<xsd:complexType name="getConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-				<xsd:element name="participants" type="tns:ParticipantStruct" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-
-
-	<xsd:complexType name="updateConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="initiatorId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-				<xsd:element name="detail" type="tns:ConferenceDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="removeConferenceTemplateRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateListRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="ownerId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateListResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="templateIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="addConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="addConferenceTemplateParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participantId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-
-	<xsd:complexType name="getConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="getConferenceTemplateParticipantResponseType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSResponseType">
-			<xsd:sequence>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct" minOccurs="0" maxOccurs="1" nillable="true" />
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="updateConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-				<xsd:element name="participant" type="tns:ParticipantDetailStruct"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:complexType name="removeConferenceTemplateParticipantRequestType">
-		<xsd:complexContent mixed="false">
-			<xsd:extension base="tns:CCSRequestType">
-			<xsd:sequence>
-				<xsd:element name="templateId" type="xsd:string"/>
-				<xsd:element name="participantId" type="xsd:string"/>
-			</xsd:sequence>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-  <xsd:element name="createConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceRequest" type="tns:createConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceResponse" type="tns:createConferenceResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="commitConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="commitConferenceRequest" type="tns:commitConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="commitConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceStatus">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceStatusRequest" type="tns:getConferenceStatusRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceStatusResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceStatusResponse" type="tns:getConferenceStatusResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getRunningConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getRunningConferenceRequest" type="tns:getRunningConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getRunningConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getRunningConferenceResponse" type="tns:getRunningConferenceResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceRequest" type="tns:removeConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceList">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceListRequest" type="tns:getConferenceListRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceListResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceListResponse" type="tns:getConferenceListResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConference">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceRequest" type="tns:updateConferenceRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="newParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="newParticipantRequest" type="tns:newParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="newParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="newParticipantResponse" type="tns:newParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeParticipantRequest" type="tns:removeParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateParticipantRequest" type="tns:updateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getParticipantStatus">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getParticipantStatusRequest" type="tns:getParticipantStatusRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getParticipantStatusResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getParticipantStatusResponse" type="tns:getParticipantStatusResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceTemplateRequest" type="tns:createConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="createConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="createConferenceTemplateResponse" type="tns:createConferenceTemplateResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateRequest" type="tns:getConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateResponse" type="tns:getConferenceTemplateResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceTemplateRequest" type="tns:updateConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplate">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceTemplateRequest" type="tns:removeConferenceTemplateRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateList">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateListRequest" type="tns:getConferenceTemplateListRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateListResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateListResponse" type="tns:getConferenceTemplateListResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="addConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="addConferenceTemplateParticipantRequest" type="tns:addConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="addConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="addConferenceTemplateParticipantResponse" type="tns:addConferenceTemplateParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateParticipantRequest" type="tns:getConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="getConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="getConferenceTemplateParticipantResponse" type="tns:getConferenceTemplateParticipantResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="updateConferenceTemplateParticipantRequest" type="tns:updateConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="updateConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateParticipant">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="removeConferenceTemplateParticipantRequest" type="tns:removeConferenceTemplateParticipantRequestType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="removeConferenceTemplateParticipantResponse">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CCSResponse" type="tns:CCSResponseType"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl
deleted file mode 100644
index 5258bfc7b..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.wsdl
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" xmlns:schema="http://localsearch.developer.telekom.com/schema/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" xmlns:tns="http://localsearch.developer.telekom.com/wsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="localsearch" targetNamespace="http://localsearch.developer.telekom.com/wsdl/">
-	<wsdl:documentation>
-Local Search </wsdl:documentation>
-	<wsdl:types>
-		<xsd:schema targetNamespace="http://localsearch.developer.telekom.com/wsdl/">
-			<xsd:import namespace="http://localsearch.developer.telekom.com/schema/" schemaLocation="localsearch.xsd"/>
-		</xsd:schema>
-	</wsdl:types>
-	<wsdl:message name="localSearchRequest">
-		<wsdl:part name="parameters" element="schema:LocalSearchRequest"/>
-	</wsdl:message>
-	<wsdl:message name="localSearchResponse">
-		<wsdl:part name="parameters" element="schema:LocalSearchResponse"/>
-	</wsdl:message>
-	<wsdl:portType name="localsearchPortType">
-		<wsdl:operation name="localSearch">
-			<wsdl:input message="tns:localSearchRequest"/>
-			<wsdl:output message="tns:localSearchResponse"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="localsearchHttpBinding" type="tns:localsearchPortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<wsp:PolicyReference URI="#TransportBindingPolicy"/>
-		<wsdl:operation name="localSearch">
-			<soap:operation soapAction="http://localsearch.developer.telekom.com/localSearch"/>
-			<wsdl:input>
-				<wsp:PolicyReference URI="#STSTokenPolicy"/>
-				<soap:body use="literal"/>
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal"/>
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="localsearch">
-		<wsdl:port name="localsearch" binding="tns:localsearchHttpBinding">
-			<soap:address location="https://gateway.developer.telekom.com/p3gw-mod-odg-localsearch/services/localsearch"/>
-		</wsdl:port>
-	</wsdl:service>
-	<wsp:Policy wsu:Id="TransportBindingPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:TransportBinding>
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-								<sp:HttpsToken RequireClientCertificate="false"/>
-							</wsp:Policy>
-						</sp:TransportToken>
-						<sp:Layout>
-							<wsp:Policy>
-								<sp:Strict/>
-							</wsp:Policy>
-						</sp:Layout>
-						<sp:IncludeTimestamp/>
-						<sp:AlgorithmSuite>
-							<wsp:Policy>
-								<sp:Basic256/>
-							</wsp:Policy>
-						</sp:AlgorithmSuite>
-					</wsp:Policy>
-				</sp:TransportBinding>
-				<sp:Wss11/>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="STSTokenPolicy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:SupportingTokens>
-					<wsp:Policy>
-						<sp:SamlToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<wsp:Policy>
-								<sp:WssSamlV20Token11/>
-							</wsp:Policy>
-						</sp:SamlToken>
-					</wsp:Policy>
-				</sp:SupportingTokens>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-</wsdl:definitions>
diff --git a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd b/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd
deleted file mode 100644
index 51684be49..000000000
--- a/airtime_mvc/library/Zend/Service/DeveloperGarden/Wsdl/localsearch.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:tns="http://localsearch.developer.telekom.com/schema/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://localsearch.developer.telekom.com/schema/" elementFormDefault="qualified" attributeFormDefault="qualified" version="1.0">
-	<xsd:simpleType name="EnvironmentType">
-		<xsd:restriction base="xsd:int">
-			<xsd:minInclusive value="1"/>
-			<xsd:maxInclusive value="3"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="ParameterType">
-		<xsd:sequence>
-			<xsd:element name="parameter" type="xsd:string" nillable="false"/>
-			<xsd:element name="value" type="xsd:string" nillable="false"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocalSearchRequestType">
-		<xsd:sequence>
-			<xsd:element name="environment" type="tns:EnvironmentType"  nillable="false" />
-			<xsd:element name="account" type="xsd:string"  nillable="true" minOccurs="0"/>
-			<xsd:element name="searchParameters" type="tns:ParameterType" nillable="false" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:complexType name="LocalSearchResponseType">
-		<xsd:sequence>
-			<xsd:element name="statusCode" type="xsd:string" nillable="false"/>
-			<xsd:element name="statusMessage" type="xsd:string" nillable="true" minOccurs="0"/>
-			<xsd:element name="searchResult" type="xsd:anyType" nillable="true" minOccurs="0"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="LocalSearchRequest" type="tns:LocalSearchRequestType"/>
-	<xsd:element name="LocalSearchResponse" type="tns:LocalSearchResponseType"/>
-</xsd:schema>
diff --git a/airtime_mvc/library/Zend/Service/Exception.php b/airtime_mvc/library/Zend/Service/Exception.php
deleted file mode 100644
index fe8b771fa..000000000
--- a/airtime_mvc/library/Zend/Service/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Service/Flickr.php b/airtime_mvc/library/Zend/Service/Flickr.php
deleted file mode 100644
index e6252bccc..000000000
--- a/airtime_mvc/library/Zend/Service/Flickr.php
+++ /dev/null
@@ -1,627 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Flickr.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Flickr
-{
-    /**
-     * Base URI for the REST client
-     */
-    const URI_BASE = 'http://www.flickr.com';
-
-    /**
-     * Your Flickr API key
-     *
-     * @var string
-     */
-    public $apiKey;
-
-    /**
-     * Reference to REST client object
-     *
-     * @var Zend_Rest_Client
-     */
-    protected $_restClient = null;
-
-
-    /**
-     * Performs object initializations
-     *
-     *  # Sets up character encoding
-     *  # Saves the API key
-     *
-     * @param  string $apiKey Your Flickr API key
-     * @return void
-     */
-    public function __construct($apiKey)
-    {
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
-        $this->apiKey = (string) $apiKey;
-    }
-
-
-    /**
-     * Find Flickr photos by tag.
-     *
-     * Query options include:
-     *
-     *  # per_page:        how many results to return per query
-     *  # page:            the starting page offset.  first result will be (page - 1) * per_page + 1
-     *  # tag_mode:        Either 'any' for an OR combination of tags,
-     *                     or 'all' for an AND combination. Default is 'any'.
-     *  # min_upload_date: Minimum upload date to search on.  Date should be a unix timestamp.
-     *  # max_upload_date: Maximum upload date to search on.  Date should be a unix timestamp.
-     *  # min_taken_date:  Minimum upload date to search on.  Date should be a MySQL datetime.
-     *  # max_taken_date:  Maximum upload date to search on.  Date should be a MySQL datetime.
-     *
-     * @param  string|array $query   A single tag or an array of tags.
-     * @param  array        $options Additional parameters to refine your query.
-     * @return Zend_Service_Flickr_ResultSet
-     * @throws Zend_Service_Exception
-     */
-    public function tagSearch($query, array $options = array())
-    {
-        static $method = 'flickr.photos.search';
-        static $defaultOptions = array('per_page' => 10,
-                                       'page'     => 1,
-                                       'tag_mode' => 'or',
-                                       'extras'   => 'license, date_upload, date_taken, owner_name, icon_server');
-
-        $options['tags'] = is_array($query) ? implode(',', $query) : $query;
-
-        $options = $this->_prepareOptions($method, $options, $defaultOptions);
-
-        $this->_validateTagSearch($options);
-
-        // now search for photos
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Flickr_ResultSet
-         */
-        require_once 'Zend/Service/Flickr/ResultSet.php';
-        return new Zend_Service_Flickr_ResultSet($dom, $this);
-    }
-
-
-    /**
-     * Finds photos by a user's username or email.
-     *
-     * Additional query options include:
-     *
-     *  # per_page:        how many results to return per query
-     *  # page:            the starting page offset.  first result will be (page - 1) * per_page + 1
-     *  # min_upload_date: Minimum upload date to search on.  Date should be a unix timestamp.
-     *  # max_upload_date: Maximum upload date to search on.  Date should be a unix timestamp.
-     *  # min_taken_date:  Minimum upload date to search on.  Date should be a MySQL datetime.
-     *  # max_taken_date:  Maximum upload date to search on.  Date should be a MySQL datetime.
-     *
-     * @param  string $query   username or email
-     * @param  array  $options Additional parameters to refine your query.
-     * @return Zend_Service_Flickr_ResultSet
-     * @throws Zend_Service_Exception
-     */
-    public function userSearch($query, array $options = null)
-    {
-        static $method = 'flickr.people.getPublicPhotos';
-        static $defaultOptions = array('per_page' => 10,
-                                       'page'     => 1,
-                                       'extras'   => 'license, date_upload, date_taken, owner_name, icon_server');
-
-
-        // can't access by username, must get ID first
-        if (strchr($query, '@')) {
-            // optimistically hope this is an email
-            $options['user_id'] = $this->getIdByEmail($query);
-        } else {
-            // we can safely ignore this exception here
-            $options['user_id'] = $this->getIdByUsername($query);
-        }
-
-        $options = $this->_prepareOptions($method, $options, $defaultOptions);
-        $this->_validateUserSearch($options);
-
-        // now search for photos
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Flickr_ResultSet
-         */
-        require_once 'Zend/Service/Flickr/ResultSet.php';
-        return new Zend_Service_Flickr_ResultSet($dom, $this);
-    }
-
-    /**
-     * Finds photos in a group's pool.
-     *
-     * @param  string $query   group id
-     * @param  array  $options Additional parameters to refine your query.
-     * @return Zend_Service_Flickr_ResultSet
-     * @throws Zend_Service_Exception
-     */
-    public function groupPoolGetPhotos($query, array $options = array())
-    {
-        static $method = 'flickr.groups.pools.getPhotos';
-        static $defaultOptions = array('per_page' => 10,
-                                       'page'     => 1,
-                                       'extras'   => 'license, date_upload, date_taken, owner_name, icon_server');
-
-        if (empty($query) || !is_string($query)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('You must supply a group id');
-        }
-
-        $options['group_id'] = $query;
-
-        $options = $this->_prepareOptions($method, $options, $defaultOptions);
-
-        $this->_validateGroupPoolGetPhotos($options);
-
-        // now search for photos
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        if ($response->isError()) {
-            /**
-            * @see Zend_Service_Exception
-            */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-        * @see Zend_Service_Flickr_ResultSet
-        */
-        require_once 'Zend/Service/Flickr/ResultSet.php';
-        return new Zend_Service_Flickr_ResultSet($dom, $this);
-    }
-
-
-
-    /**
-     * Utility function to find Flickr User IDs for usernames.
-     *
-     * (You can only find a user's photo with their NSID.)
-     *
-     * @param  string $username the username
-     * @return string the NSID (userid)
-     * @throws Zend_Service_Exception
-     */
-    public function getIdByUsername($username)
-    {
-        static $method = 'flickr.people.findByUsername';
-
-        $options = array('api_key' => $this->apiKey, 'method' => $method, 'username' => (string) $username);
-
-        if (empty($username)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('You must supply a username');
-        }
-
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-        $xpath = new DOMXPath($dom);
-        return (string) $xpath->query('//user')->item(0)->getAttribute('id');
-    }
-
-
-    /**
-     * Utility function to find Flickr User IDs for emails.
-     *
-     * (You can only find a user's photo with their NSID.)
-     *
-     * @param  string $email the email
-     * @return string the NSID (userid)
-     * @throws Zend_Service_Exception
-     */
-    public function getIdByEmail($email)
-    {
-        static $method = 'flickr.people.findByEmail';
-
-        if (empty($email)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('You must supply an e-mail address');
-        }
-
-        $options = array('api_key' => $this->apiKey, 'method' => $method, 'find_email' => (string) $email);
-
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
-                                           . $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-        $xpath = new DOMXPath($dom);
-        return (string) $xpath->query('//user')->item(0)->getAttribute('id');
-    }
-
-
-    /**
-     * Returns Flickr photo details by for the given photo ID
-     *
-     * @param  string $id the NSID
-     * @return array of Zend_Service_Flickr_Image, details for the specified image
-     * @throws Zend_Service_Exception
-     */
-    public function getImageDetails($id)
-    {
-        static $method = 'flickr.photos.getSizes';
-
-        if (empty($id)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('You must supply a photo ID');
-        }
-
-        $options = array('api_key' => $this->apiKey, 'method' => $method, 'photo_id' => $id);
-
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet('/services/rest/', $options);
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        $xpath = new DOMXPath($dom);
-        self::_checkErrors($dom);
-        $retval = array();
-        /**
-         * @see Zend_Service_Flickr_Image
-         */
-        require_once 'Zend/Service/Flickr/Image.php';
-        foreach ($xpath->query('//size') as $size) {
-            $label = (string) $size->getAttribute('label');
-            $retval[$label] = new Zend_Service_Flickr_Image($size);
-        }
-
-        return $retval;
-    }
-
-
-    /**
-     * Returns a reference to the REST client, instantiating it if necessary
-     *
-     * @return Zend_Rest_Client
-     */
-    public function getRestClient()
-    {
-        if (null === $this->_restClient) {
-            /**
-             * @see Zend_Rest_Client
-             */
-            require_once 'Zend/Rest/Client.php';
-            $this->_restClient = new Zend_Rest_Client(self::URI_BASE);
-        }
-
-        return $this->_restClient;
-    }
-
-
-    /**
-     * Validate User Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateUserSearch(array $options)
-    {
-        $validOptions = array('api_key', 'method', 'user_id', 'per_page', 'page', 'extras', 'min_upload_date',
-                              'min_taken_date', 'max_upload_date', 'max_taken_date');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 500, true);
-        if (!$between->isValid($options['per_page'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
-        }
-
-        /**
-         * @see Zend_Validate_Int
-         */
-        require_once 'Zend/Validate/Int.php';
-        $int = new Zend_Validate_Int();
-        if (!$int->isValid($options['page'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
-        }
-
-        // validate extras, which are delivered in csv format
-        if ($options['extras']) {
-            $extras = explode(',', $options['extras']);
-            $validExtras = array('license', 'date_upload', 'date_taken', 'owner_name', 'icon_server');
-            foreach($extras as $extra) {
-                /**
-                 * @todo The following does not do anything [yet], so it is commented out.
-                 */
-                //in_array(trim($extra), $validExtras);
-            }
-        }
-    }
-
-
-    /**
-     * Validate Tag Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateTagSearch(array $options)
-    {
-        $validOptions = array('method', 'api_key', 'user_id', 'tags', 'tag_mode', 'text', 'min_upload_date',
-                              'max_upload_date', 'min_taken_date', 'max_taken_date', 'license', 'sort',
-                              'privacy_filter', 'bbox', 'accuracy', 'machine_tags', 'machine_tag_mode', 'group_id',
-                              'extras', 'per_page', 'page');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 500, true);
-        if (!$between->isValid($options['per_page'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
-        }
-
-        /**
-         * @see Zend_Validate_Int
-         */
-        require_once 'Zend/Validate/Int.php';
-        $int = new Zend_Validate_Int();
-        if (!$int->isValid($options['page'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
-        }
-
-        // validate extras, which are delivered in csv format
-        if ($options['extras']) {
-            $extras = explode(',', $options['extras']);
-            $validExtras = array('license', 'date_upload', 'date_taken', 'owner_name', 'icon_server');
-            foreach($extras as $extra) {
-                /**
-                 * @todo The following does not do anything [yet], so it is commented out.
-                 */
-                //in_array(trim($extra), $validExtras);
-            }
-        }
-
-    }
-
-
-    /**
-    * Validate Group Search Options
-    *
-    * @param  array $options
-    * @throws Zend_Service_Exception
-    * @return void
-    */
-    protected function _validateGroupPoolGetPhotos(array $options)
-    {
-        $validOptions = array('api_key', 'tags', 'method', 'group_id', 'per_page', 'page', 'extras', 'user_id');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-        * @see Zend_Validate_Between
-        */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 500, true);
-        if (!$between->isValid($options['per_page'])) {
-            /**
-            * @see Zend_Service_Exception
-            */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
-        }
-
-        /**
-        * @see Zend_Validate_Int
-        */
-        require_once 'Zend/Validate/Int.php';
-        $int = new Zend_Validate_Int();
-
-        if (!$int->isValid($options['page'])) {
-            /**
-            * @see Zend_Service_Exception
-            */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
-        }
-
-        // validate extras, which are delivered in csv format
-        if (isset($options['extras'])) {
-            $extras = explode(',', $options['extras']);
-            $validExtras = array('license', 'date_upload', 'date_taken', 'owner_name', 'icon_server');
-            foreach($extras as $extra) {
-                /**
-                * @todo The following does not do anything [yet], so it is commented out.
-                */
-                //in_array(trim($extra), $validExtras);
-            }
-        }
-    }
-
-
-    /**
-     * Throws an exception if and only if the response status indicates a failure
-     *
-     * @param  DOMDocument $dom
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected static function _checkErrors(DOMDocument $dom)
-    {
-        if ($dom->documentElement->getAttribute('stat') === 'fail') {
-            $xpath = new DOMXPath($dom);
-            $err = $xpath->query('//err')->item(0);
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Search failed due to error: ' . $err->getAttribute('msg')
-                                           . ' (error #' . $err->getAttribute('code') . ')');
-        }
-    }
-
-
-    /**
-     * Prepare options for the request
-     *
-     * @param  string $method         Flickr Method to call
-     * @param  array  $options        User Options
-     * @param  array  $defaultOptions Default Options
-     * @return array Merged array of user and default/required options
-     */
-    protected function _prepareOptions($method, array $options, array $defaultOptions)
-    {
-        $options['method']  = (string) $method;
-        $options['api_key'] = $this->apiKey;
-
-        return array_merge($defaultOptions, $options);
-    }
-
-
-    /**
-     * Throws an exception if and only if any user options are invalid
-     *
-     * @param  array $options      User options
-     * @param  array $validOptions Valid options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _compareOptions(array $options, array $validOptions)
-    {
-        $difference = array_diff(array_keys($options), $validOptions);
-        if ($difference) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('The following parameters are invalid: ' . implode(',', $difference));
-        }
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/Flickr/Image.php b/airtime_mvc/library/Zend/Service/Flickr/Image.php
deleted file mode 100644
index 90cb4f539..000000000
--- a/airtime_mvc/library/Zend/Service/Flickr/Image.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Flickr_Image
-{
-    /**
-     * The URI of the image
-     *
-     * @var string
-     */
-    public $uri;
-
-    /**
-     * The URI for linking to the photo on Flickr
-     *
-     * @var string
-     */
-    public $clickUri;
-
-    /**
-     * The height of the image in pixels
-     *
-     * @var string
-     */
-    public $height;
-
-    /**
-     * The width of the image in pixels
-     *
-     * @var string
-     */
-    public $width;
-
-    /**
-     * Parse given Flickr Image element
-     *
-     * @param  DOMElement $image
-     * @return void
-     */
-    public function __construct(DOMElement $image)
-    {
-        $this->uri      = (string) $image->getAttribute('source');
-        $this->clickUri = (string) $image->getAttribute('url');
-        $this->height   = (int) $image->getAttribute('height');
-        $this->width    = (int) $image->getAttribute('width');
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/Flickr/Result.php b/airtime_mvc/library/Zend/Service/Flickr/Result.php
deleted file mode 100644
index 49a849b23..000000000
--- a/airtime_mvc/library/Zend/Service/Flickr/Result.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Flickr_Result
-{
-    /**
-     * The photo's Flickr ID.
-     *
-     * @var string
-     */
-    public $id;
-
-    /**
-     * The photo owner's NSID.
-     *
-     * @var string
-     */
-    public $owner;
-
-    /**
-     * A key used in URI construction.
-     *
-     * @var string
-     */
-    public $secret;
-
-    /**
-     * The servername to use for URI construction.
-     *
-     * @var string
-     */
-    public $server;
-
-    /**
-     * The photo's title.
-     *
-     * @var string
-     */
-    public $title;
-
-    /**
-     * Whether the photo is public.
-     *
-     * @var string
-     */
-    public $ispublic;
-
-    /**
-     * Whether the photo is visible to you because you are a friend of the owner.
-     *
-     * @var string
-     */
-    public $isfriend;
-
-    /**
-     * Whether the photo is visible to you because you are family of the owner.
-     *
-     * @var string
-     */
-    public $isfamily;
-
-    /**
-     * The license the photo is available under.
-     *
-     * @var string
-     */
-    public $license;
-
-    /**
-     * The date the photo was uploaded.
-     *
-     * @var string
-     */
-    public $dateupload;
-
-    /**
-     * The date the photo was taken.
-     *
-     * @var string
-     */
-    public $datetaken;
-
-    /**
-     * The screenname of the owner.
-     *
-     * @var string
-     */
-    public $ownername;
-
-    /**
-     * The server used in assembling icon URLs.
-     *
-     * @var string
-     */
-    public $iconserver;
-
-    /**
-     * A 75x75 pixel square thumbnail of the image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Square;
-
-    /**
-     * A 100 pixel thumbnail of the image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Thumbnail;
-
-    /**
-     * A 240 pixel version of the image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Small;
-
-    /**
-     * A 500 pixel version of the image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Medium;
-
-    /**
-     * A 640 pixel version of the image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Large;
-
-    /**
-     * The original image.
-     *
-     * @var Zend_Service_Flickr_Image
-     */
-    public $Original;
-
-    /**
-     * Original Zend_Service_Flickr object.
-     *
-     * @var Zend_Service_Flickr
-     */
-    protected $_flickr;
-
-    /**
-     * Parse the Flickr Result
-     *
-     * @param  DOMElement          $image
-     * @param  Zend_Service_Flickr $flickr Original Zend_Service_Flickr object with which the request was made
-     * @return void
-     */
-    public function __construct(DOMElement $image, Zend_Service_Flickr $flickr)
-    {
-        $xpath = new DOMXPath($image->ownerDocument);
-
-        foreach ($xpath->query('./@*', $image) as $property) {
-            $this->{$property->name} = (string) $property->value;
-        }
-
-        $this->_flickr = $flickr;
-
-        foreach ($this->_flickr->getImageDetails($this->id) as $k => $v) {
-            $this->$k = $v;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Flickr/ResultSet.php b/airtime_mvc/library/Zend/Service/Flickr/ResultSet.php
deleted file mode 100644
index 856f0ba59..000000000
--- a/airtime_mvc/library/Zend/Service/Flickr/ResultSet.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Flickr_Result
- */
-require_once 'Zend/Service/Flickr/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Flickr
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Flickr_ResultSet implements SeekableIterator
-{
-    /**
-     * Total number of available results
-     *
-     * @var int
-     */
-    public $totalResultsAvailable;
-
-    /**
-     * Number of results in this result set
-     *
-     * @var int
-     */
-    public $totalResultsReturned;
-
-    /**
-     * The offset of this result set in the total set of available results
-     *
-     * @var int
-     */
-    public $firstResultPosition;
-
-    /**
-     * Results storage
-     *
-     * @var DOMNodeList
-     */
-    protected $_results = null;
-
-    /**
-     * Reference to Zend_Service_Flickr object with which the request was made
-     *
-     * @var Zend_Service_Flickr
-     */
-    private $_flickr;
-
-    /**
-     * Current index for the Iterator
-     *
-     * @var int
-     */
-    private $_currentIndex = 0;
-
-    /**
-     * Parse the Flickr Result Set
-     *
-     * @param  DOMDocument         $dom
-     * @param  Zend_Service_Flickr $flickr
-     * @return void
-     */
-    public function __construct(DOMDocument $dom, Zend_Service_Flickr $flickr)
-    {
-        $this->_flickr = $flickr;
-
-        $xpath = new DOMXPath($dom);
-
-        $photos = $xpath->query('//photos')->item(0);
-
-        $page    = $photos->getAttribute('page');
-        $pages   = $photos->getAttribute('pages');
-        $perPage = $photos->getAttribute('perpage');
-        $total   = $photos->getAttribute('total');
-
-        $this->totalResultsReturned  = ($page == $pages || $pages == 0) ? ($total - ($page - 1) * $perPage) : (int) $perPage;
-        $this->firstResultPosition   = ($page - 1) * $perPage + 1;
-        $this->totalResultsAvailable = (int) $total;
-
-        if ($total > 0) {
-            $this->_results = $xpath->query('//photo');
-        }
-    }
-
-    /**
-     * Total Number of results returned
-     *
-     * @return int Total number of results returned
-     */
-    public function totalResults()
-    {
-        return $this->totalResultsReturned;
-    }
-
-    /**
-     * Implements SeekableIterator::current()
-     *
-     * @return Zend_Service_Flickr_Result
-     */
-    public function current()
-    {
-        return new Zend_Service_Flickr_Result($this->_results->item($this->_currentIndex), $this->_flickr);
-    }
-
-    /**
-     * Implements SeekableIterator::key()
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_currentIndex;
-    }
-
-    /**
-     * Implements SeekableIterator::next()
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_currentIndex += 1;
-    }
-
-    /**
-     * Implements SeekableIterator::rewind()
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_currentIndex = 0;
-    }
-
-    /**
-     * Implements SeekableIterator::seek()
-     *
-     * @param  int $index
-     * @throws OutOfBoundsException
-     * @return void
-     */
-    public function seek($index)
-    {
-        $indexInt = (int) $index;
-        if ($indexInt >= 0 && (null === $this->_results || $indexInt < $this->_results->length)) {
-            $this->_currentIndex = $indexInt;
-        } else {
-            throw new OutOfBoundsException("Illegal index '$index'");
-        }
-    }
-
-    /**
-     * Implements SeekableIterator::valid()
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return null !== $this->_results && $this->_currentIndex < $this->_results->length;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Service/LiveDocx.php b/airtime_mvc/library/Zend/Service/LiveDocx.php
deleted file mode 100644
index 02521327e..000000000
--- a/airtime_mvc/library/Zend/Service/LiveDocx.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @since      LiveDocx 1.0
- */
-class Zend_Service_LiveDocx
-{
-    /**
-     * LiveDocx service version
-     * @since LiveDocx 1.0
-     */
-    const VERSION = '1.2';
-
-    /**
-     * SOAP client used to connect to LiveDocx service
-     * @var   Zend_Soap_Client
-     * @since LiveDocx 1.0
-     */
-    protected $_soapClient;
-        
-    /**
-     * WSDL of LiveDocx web service
-     * @var   string
-     * @since LiveDocx 1.0
-     */
-    protected $_wsdl;
-        
-    /**
-     * Array of credentials (username and password) to log into backend server
-     * @var   array
-     * @since LiveDocx 1.2
-     */
-    protected $_credentials;
-    
-    /**
-     * Set to true, when session is logged into backend server
-     * @var   boolean
-     * @since LiveDocx 1.2
-     */
-    protected $_loggedIn;
-    
-    /**
-     * Constructor
-     *
-     * Optionally, pass an array of options (or Zend_Config object).
-     * 
-     * If an option with the key 'soapClient' is provided, that value will be 
-     * used to set the internal SOAP client used to connect to the LiveDocx
-     * service.
-     * 
-     * Use 'soapClient' in the case that you have a dedicated or (locally
-     * installed) licensed LiveDocx server. For example:
-     *
-     * {code}
-     * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(
-     *     array (
-     *         'username'   => 'myUsername',
-     *         'password'   => 'myPassword',
-     *         'soapClient' => new Zend_Soap_Client('https://api.example.com/path/mailmerge.asmx?WSDL')
-     *     )
-     * );
-     * {code}
-     * 
-     * Replace the URI of the WSDL in the constructor of Zend_Soap_Client with
-     * that of your dedicated or licensed LiveDocx server.
-     *
-     * If you are using the public LiveDocx server, simply pass 'username' and
-     * 'password'. For example:
-     *
-     * {code}
-     * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(
-     *     array (
-     *         'username' => 'myUsername',
-     *         'password' => 'myPassword'
-     *     )
-     * );
-     * {code}
-     * 
-     * If you prefer to not pass the username and password through the
-     * constructor, you can also call the following methods:
-     * 
-     * {code}
-     * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
-     * 
-     * $phpLiveDocx->setUsername('myUsername')
-     *             ->setPassword('myPassword');
-     * {/code}
-     * 
-     * Or, if you want to specify your own SoapClient:
-     * 
-     * {code}
-     * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge();
-     * 
-     * $phpLiveDocx->setUsername('myUsername')
-     *             ->setPassword('myPassword');
-     * 
-     * $phpLiveDocx->setSoapClient(
-     *     new Zend_Soap_Client('https://api.example.com/path/mailmerge.asmx?WSDL')
-     * );
-     * {/code} 
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */    
-    public function __construct($options = null)
-    {
-        $this->_credentials = array();
-        $this->_loggedIn = false;
-        
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-    
-    /**
-     * Set options
-     * One or more of username, password, soapClient
-     * 
-     * @param  $options
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.2
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        
-        return $this;
-    }
-        
-    /**
-     * Clean up and log out of LiveDocx service
-     *
-     * @return boolean
-     * @since  LiveDocx 1.0
-     */
-    public function __destruct()
-    {
-        return $this->logOut();
-    }
-    
-    /**
-     * Init Soap client - connect to SOAP service
-     *
-     * @param  string $endpoint
-     * @throws Zend_Service_LiveDocx_Exception
-     * @return void
-     * @since  LiveDocx 1.2
-     */
-    protected function _initSoapClient($endpoint)
-    {
-        try {
-            require_once 'Zend/Soap/Client.php';
-            $this->_soapClient = new Zend_Soap_Client();
-            $this->_soapClient->setWsdl($endpoint);                
-        } catch (Zend_Soap_Client_Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception('Cannot connect to LiveDocx service at ' . $endpoint, 0, $e);
-        }            
-    }
-    
-    /**
-     * Get SOAP client
-     *
-     * @return Zend_Soap_Client
-     * @since  LiveDocx 1.2
-     */
-    public function getSoapClient()
-    {
-        return $this->_soapClient;
-    }
-    
-    /**
-     * Set SOAP client
-     *
-     * @param  Zend_Soap_Client $soapClient
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.2
-     */
-    public function setSoapClient(Zend_Soap_Client $soapClient)
-    {
-        $this->_soapClient = $soapClient;
-        return $this;
-    }
-
-    /**
-     * Log in to LiveDocx service
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @throws Zend_Service_LiveDocx_Exception
-     * @return boolean
-     * @since  LiveDocx 1.2
-     */
-    public function logIn()
-    {
-        if (!$this->isLoggedIn()) {
-            if (null === $this->getUsername()) {
-                require_once 'Zend/Service/LiveDocx/Exception.php';
-                throw new Zend_Service_LiveDocx_Exception(
-                    'Username has not been set. To set username specify the options array in the constructor or call setUsername($username) after instantiation'
-                );
-            }
-            
-            if (null === $this->getPassword()) {
-                require_once 'Zend/Service/LiveDocx/Exception.php';
-                throw new Zend_Service_LiveDocx_Exception(
-                    'Password has not been set. To set password specify the options array in the constructor or call setPassword($password) after instantiation'
-                );
-            }
-            
-            if (null === $this->getSoapClient()) {
-                $this->_initSoapClient($this->_wsdl);
-            }            
-            
-            try {
-                $this->getSoapClient()->LogIn(array(
-                    'username' => $this->getUsername(),
-                    'password' => $this->getPassword(),
-                ));
-                $this->_loggedIn = true;
-            } catch (Exception $e) {
-                require_once 'Zend/Service/LiveDocx/Exception.php';
-                throw new Zend_Service_LiveDocx_Exception(
-                    'Cannot login into LiveDocx service - username and/or password are invalid', 0, $e
-                );
-            }            
-        }
-        
-        return $this->_loggedIn;
-    }
-
-    /**
-     * Log out of the LiveDocx service
-     *
-     * @throws Zend_Service_LiveDocx_Exception
-     * @return boolean
-     * @since  LiveDocx 1.2
-     */
-    public function logOut()
-    {
-        if ($this->isLoggedIn()) {
-            try {
-                $this->getSoapClient()->LogOut();
-                $this->_loggedIn = false;
-            } catch (Exception $e) {
-                require_once 'Zend/Service/LiveDocx/Exception.php';
-                throw new Zend_Service_LiveDocx_Exception(
-                    'Cannot log out of LiveDocx service', 0, $e
-                );
-            }            
-        }
-        
-        return $this->_loggedIn;
-    }
-    
-    /**
-     * Return true, if session is currently logged into the backend server
-     * 
-     * @return boolean
-     * @since  LiveDocx 1.2
-     */
-    public function isLoggedIn()
-    {
-        return $this->_loggedIn;
-    }
-    
-    /**
-     * Set username
-     * 
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.0
-     */
-    public function setUsername($username)
-    {
-        $this->_credentials['username'] = $username;
-        return $this;
-    }
-    
-    /**
-     * Set password
-     * 
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.0
-     */    
-    public function setPassword($password)
-    {
-        $this->_credentials['password'] = $password;
-        return $this;
-    }
-
-    /**
-     * Set WSDL of LiveDocx web service
-     * 
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.0
-     */      
-    public function setWsdl($wsdl) 
-    {
-        $this->_wsdl = $wsdl;
-        return $this;
-    }
-      
-    /**
-     * Return current username
-     * 
-     * @return string|null
-     * @since  LiveDocx 1.0
-     */
-    public function getUsername()
-    {
-        if (isset($this->_credentials['username'])) {
-            return $this->_credentials['username'];
-        }
-        
-        return null;
-    }
-    
-    /**
-     * Return current password
-     * 
-     * @return string|null
-     * @since  LiveDocx 1.0
-     */    
-    public function getPassword()
-    {
-        if (isset($this->_credentials['password'])) {
-            return $this->_credentials['password'];
-        }
-        
-        return null; 
-    }
-    
-    /**
-     * Return WSDL of LiveDocx web service
-     * 
-     * @return Zend_Service_LiveDocx
-     * @since  LiveDocx 1.0
-     */      
-    public function getWsdl() 
-    {
-        return $this->_wsdl;
-    }    
-
-    /**
-     * Return the document format (extension) of a filename
-     *
-     * @param  string $filename
-     * @return string
-     * @since  LiveDocx 1.0
-     */
-    public function getFormat($filename)
-    {
-        return strtolower(substr(strrchr($filename, '.'), 1));
-    }
-    
-    /**
-     * Return the current API version
-     *
-     * @return string
-     * @since  LiveDocx 1.0
-     */
-    public function getVersion()
-    {
-        return self::VERSION;
-    }
-    
-    /**
-     * Compare the current API version with another version
-     *
-     * @param  string $version (STRING NOT FLOAT)
-     * @return int -1 (version is less than API version), 0 (versions are equal), or 1 (version is greater than API version)
-     * @since  LiveDocx 1.0
-     */
-    public function compareVersion($version)
-    {
-        return version_compare($version, $this->getVersion());
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/LiveDocx/Exception.php b/airtime_mvc/library/Zend/Service/LiveDocx/Exception.php
deleted file mode 100644
index a410e56bc..000000000
--- a/airtime_mvc/library/Zend/Service/LiveDocx/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @since      LiveDocx 1.0
- */
-class Zend_Service_LiveDocx_Exception extends Zend_Service_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/LiveDocx/MailMerge.php b/airtime_mvc/library/Zend/Service/LiveDocx/MailMerge.php
deleted file mode 100644
index 487730ef4..000000000
--- a/airtime_mvc/library/Zend/Service/LiveDocx/MailMerge.php
+++ /dev/null
@@ -1,978 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/** Zend_Date **/
-require_once 'Zend/Date.php';
-
-/** Zend_Service_LiveDocx **/
-require_once 'Zend/Service/LiveDocx.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage LiveDocx
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @since      LiveDocx 1.0 
- */
-class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx
-{
-    /**
-     * URI of LiveDocx.MailMerge WSDL
-     * @since LiveDocx 1.0 
-     */
-    const WSDL = 'https://api.livedocx.com/1.2/mailmerge.asmx?WSDL';
-
-    /**
-     * Field values
-     *
-     * @var   array
-     * @since LiveDocx 1.0
-     */
-    protected $_fieldValues;
-
-    /**
-     * Block field values
-     *
-     * @var   array
-     * @since LiveDocx 1.0
-     */
-    protected $_blockFieldValues;
-
-    /**
-     * Constructor (LiveDocx.MailMerge SOAP Service)
-     *
-     * @return void
-     * @return throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function __construct($options = null)
-    {
-        $this->_wsdl             = self::WSDL;
-        $this->_fieldValues      = array();
-        $this->_blockFieldValues = array();
-        
-        parent::__construct($options);
-    }
-
-    /**
-     * Set the filename of a LOCAL template
-     * (i.e. a template stored locally on YOUR server)
-     *
-     * @param  string $filename
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function setLocalTemplate($filename)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->SetLocalTemplate(array(
-                'template' => base64_encode(file_get_contents($filename)),
-                'format'   => self::getFormat($filename),
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set local template', 0, $e
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the filename of a REMOTE template
-     * (i.e. a template stored remotely on the LIVEDOCX server)
-     *
-     * @param  string $filename
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function setRemoteTemplate($filename)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->SetRemoteTemplate(array(
-                'filename' => $filename,
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set remote template', 0, $e
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set an associative or multi-associative array of keys and values pairs
-     *
-     * @param  array $values
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function setFieldValues($values)
-    {
-        $this->logIn();
-        
-        foreach ($values as $value) {
-            if (is_array($value)) {
-                $method = 'multiAssocArrayToArrayOfArrayOfString';
-            } else {
-                $method = 'assocArrayToArrayOfArrayOfString';
-            }
-            break;
-        }
-        
-        try {
-            $this->getSoapClient()->SetFieldValues(array(
-                'fieldValues' => self::$method($values),
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set field values', 0, $e
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set an array of key and value or array of values
-     *
-     * @param string $field
-     * @param array|string $value
-     *
-     * @throws Zend_Service_LiveDocx_Exception
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @since  LiveDocx 1.0
-     */
-    public function setFieldValue($field, $value)
-    {
-        $this->_fieldValues[$field] = $value;
-        
-        return $this;
-    }
-
-    /**
-     * Set block field values
-     *
-     * @param string $blockName
-     * @param array $blockFieldValues
-     *
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function setBlockFieldValues($blockName, $blockFieldValues)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->SetBlockFieldValues(array(
-                'blockName'        => $blockName,
-                'blockFieldValues' => self::multiAssocArrayToArrayOfArrayOfString($blockFieldValues)
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set block field values', 0, $e
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Assign values to template fields
-     *
-     * @param array|string $field
-     * @param array|string $value
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function assign($field, $value = null)
-    {
-        try {
-            if (is_array($field) && (null === $value)) {
-                foreach ($field as $fieldName => $fieldValue) {
-                    $this->setFieldValue($fieldName, $fieldValue);
-                }
-            } elseif (is_array($value)) {
-                $this->setBlockFieldValues($field, $value);
-            } else {
-                $this->setFieldValue($field, $value);
-            }
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot assign data to template', 0, $e
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a password to open to document
-     * 
-     * This method can only be used for PDF documents
-     * 
-     * @param  string  $password
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.2 Premium
-     */
-    public function setDocumentPassword($password)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->SetDocumentPassword(array(
-                'password' => $password
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set document password. This method can be used on PDF files only.', 0, $e
-            );
-        }
-        
-        return $this;        
-    }
-    
-    /**
-     * Set a master password for document and determine which security features
-     * are accessible without using the master password.
-     * 
-     * As default, nothing is allowed. To allow a security setting,
-     * explicatively set it using one of he DOCUMENT_ACCESS_PERMISSION_* class
-     * constants. 
-     * 
-     * {code}
-     * $phpLiveDocx->setDocumentAccessPermissions(
-     *     array (
-     *         Zend_Service_LiveDocx_MailMerge::DOCUMENT_ACCESS_PERMISSION_ALLOW_PRINTING_HIGH_LEVEL,
-     *         Zend_Service_LiveDocx_MailMerge::DOCUMENT_ACCESS_PERMISSION_ALLOW_EXTRACT_CONTENTS
-     *     ),
-     *     'myDocumentAccessPassword'
-     * );
-     * {code}
-     * 
-     * This method can only be used for PDF documents
-     * 
-     * @param  array  $permissions 
-     * @param  string $password
-     * @return Zend_Service_LiveDocx_MailMerge
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.2 Premium
-     */
-    public function setDocumentAccessPermissions($permissions, $password)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->SetDocumentAccessPermissions(array(
-                'permissions' => $permissions,
-                'password'    => $password
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot set document access permissions', 0, $e
-            );
-        }
-        
-        return $this;        
-    }    
-    
-    /**
-     * Merge assigned data with template to generate document
-     *
-     * @throws Zend_Service_LiveDocx_Excpetion
-     * @return void
-     * @since  LiveDocx 1.0
-     */
-    public function createDocument()
-    {
-        $this->logIn();
-        
-        if (count($this->_fieldValues) > 0) {
-            $this->setFieldValues($this->_fieldValues);
-        }
-
-        $this->_fieldValues      = array();
-        $this->_blockFieldValues = array();
-
-        try {
-            $this->getSoapClient()->CreateDocument();
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot create document', 0, $e
-            );
-        }
-    }
-
-    /**
-     * Retrieve document in specified format
-     *
-     * @param string $format
-     *
-     * @throws Zend_Service_LiveDocx_Exception
-     * @return binary
-     * @since  LiveDocx 1.0
-     */
-    public function retrieveDocument($format)
-    {
-        $this->logIn();
-        
-        $format = strtolower($format);
-        
-        try {
-            $result = $this->getSoapClient()->RetrieveDocument(array(
-                'format' => $format,
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot retrieve document - call setLocalTemplate() or setRemoteTemplate() first', 0, $e
-            );
-        }
-
-        return base64_decode($result->RetrieveDocumentResult);
-    }
-
-    /**
-     * Return WMF (aka Windows metafile) data for specified page range of created document
-     * Return array contains WMF data (binary) - array key is page number
-     *
-     * @param  integer $fromPage
-     * @param  integer $toPage
-     * @return array
-     * @since  LiveDocx 1.2
-     */
-    public function getMetafiles($fromPage, $toPage)
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetMetafiles(array(
-            'fromPage' => (integer) $fromPage,
-            'toPage'   => (integer) $toPage,
-        ));
-
-        if (isset($result->GetMetafilesResult->string)) {
-            $pageCounter = (integer) $fromPage;
-            if (is_array($result->GetMetafilesResult->string)) {
-                foreach ($result->GetMetafilesResult->string as $string) {
-                    $ret[$pageCounter] = base64_decode($string);
-                    $pageCounter++;
-                }
-            } else {
-               $ret[$pageCounter] = base64_decode($result->GetMetafilesResult->string);
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return WMF (aka Windows metafile) data for pages of created document
-     * Return array contains WMF data (binary) - array key is page number
-     *
-     * @return array
-     * @since  LiveDocx 1.2
-     */
-    public function getAllMetafiles()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetAllMetafiles();
-
-        if (isset($result->GetAllMetafilesResult->string)) {
-            $pageCounter = 1;
-            if (is_array($result->GetAllMetafilesResult->string)) {
-                foreach ($result->GetAllMetafilesResult->string as $string) {
-                    $ret[$pageCounter] = base64_decode($string);
-                    $pageCounter++;
-                }
-            } else {
-               $ret[$pageCounter] = base64_decode($result->GetAllMetafilesResult->string);
-            }
-        }
-
-        return $ret;
-    }    
-    
-    /**
-     * Return graphical bitmap data for specified page range of created document
-     * Return array contains bitmap data (binary) - array key is page number
-     *
-     * @param  integer $fromPage
-     * @param  integer $toPage
-     * @param  integer $zoomFactor
-     * @param  string  $format
-     * @return array
-     * @since  LiveDocx 1.2
-     */    
-    public function getBitmaps($fromPage, $toPage, $zoomFactor, $format)
-    {
-        $this->logIn();
-        
-        $ret = array();
-        
-        $result = $this->getSoapClient()->GetBitmaps(array(
-            'fromPage'   => (integer) $fromPage,
-            'toPage'     => (integer) $toPage,
-            'zoomFactor' => (integer) $zoomFactor,
-            'format'     => (string)  $format,
-        ));
-
-        if (isset($result->GetBitmapsResult->string)) {
-            $pageCounter = (integer) $fromPage;
-            if (is_array($result->GetBitmapsResult->string)) {
-                foreach ($result->GetBitmapsResult->string as $string) {
-                    $ret[$pageCounter] = base64_decode($string);
-                    $pageCounter++;
-                }
-            } else {
-               $ret[$pageCounter] = base64_decode($result->GetBitmapsResult->string);
-            }
-        }
-
-        return $ret;        
-    }
-    
-    /**
-     * Return graphical bitmap data for all pages of created document
-     * Return array contains bitmap data (binary) - array key is page number
-     *
-     * @param  integer $zoomFactor
-     * @param  string  $format
-     * @return array
-     * @since  LiveDocx 1.2
-     */    
-    public function getAllBitmaps($zoomFactor, $format)
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetAllBitmaps(array(
-            'zoomFactor' => (integer) $zoomFactor,
-            'format'     => (string)  $format,
-        ));
-
-        if (isset($result->GetAllBitmapsResult->string)) {
-            $pageCounter = 1;
-            if (is_array($result->GetAllBitmapsResult->string)) {
-                foreach ($result->GetAllBitmapsResult->string as $string) {
-                    $ret[$pageCounter] = base64_decode($string);
-                    $pageCounter++;
-                }
-            } else {
-               $ret[$pageCounter] = base64_decode($result->GetAllBitmapsResult->string);
-            }
-        }
-
-        return $ret;        
-    }    
-
-    /**
-     * Return all the fields in the template
-     *
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public function getFieldNames()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetFieldNames();
-
-        if (isset($result->GetFieldNamesResult->string)) {
-            if (is_array($result->GetFieldNamesResult->string)) {
-                $ret = $result->GetFieldNamesResult->string;
-            } else {
-                $ret[] = $result->GetFieldNamesResult->string;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return all the block fields in the template
-     *
-     * @param  string $blockName
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public function getBlockFieldNames($blockName)
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetBlockFieldNames(array(
-            'blockName' => $blockName
-        ));
-
-        if (isset($result->GetBlockFieldNamesResult->string)) {
-            if (is_array($result->GetBlockFieldNamesResult->string)) {
-                $ret = $result->GetBlockFieldNamesResult->string;
-            } else {
-                $ret[] = $result->GetBlockFieldNamesResult->string;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return all the block fields in the template
-     *
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public function getBlockNames()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetBlockNames();
-
-        if (isset($result->GetBlockNamesResult->string)) {
-            if (is_array($result->GetBlockNamesResult->string)) {
-                $ret = $result->GetBlockNamesResult->string;
-            } else {
-                $ret[] = $result->GetBlockNamesResult->string;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Upload a template file to LiveDocx service
-     *
-     * @param  string $filename
-     * @return void
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function uploadTemplate($filename)
-    {
-        $this->logIn();
-        
-        try {
-            $this->getSoapClient()->UploadTemplate(array(
-                'template' => base64_encode(file_get_contents($filename)),
-                'filename' => basename($filename),
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot upload template', 0, $e
-            );
-        }
-    }
-
-    /**
-     * Download template file from LiveDocx service
-     *
-     * @param  string $filename
-     * @return binary
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function downloadTemplate($filename)
-    {
-        $this->logIn();
-        
-        try {
-            $result = $this->getSoapClient()->DownloadTemplate(array(
-                'filename' => basename($filename),
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot download template', 0, $e
-            );
-        }
-
-        return base64_decode($result->DownloadTemplateResult);
-    }
-
-    /**
-     * Delete a template file from LiveDocx service
-     *
-     * @param  string $filename
-     * @return void
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function deleteTemplate($filename)
-    {
-        $this->logIn();
-        
-        $this->getSoapClient()->DeleteTemplate(array(
-            'filename' => basename($filename),
-        ));
-    }
-
-    /**
-     * List all templates stored on LiveDocx service
-     *
-     * @return array
-     * @since  LiveDocx 1.0 
-     */
-    public function listTemplates()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->ListTemplates();
-
-        if (isset($result->ListTemplatesResult)) {
-            $ret = $this->_backendListArrayToMultiAssocArray($result->ListTemplatesResult);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Check whether a template file is available on LiveDocx service
-     *
-     * @param  string $filename
-     * @return boolean
-     * @since  LiveDocx 1.0
-     */
-    public function templateExists($filename)
-    {
-        $this->logIn();
-        
-        $result = $this->getSoapClient()->TemplateExists(array(
-            'filename' => basename($filename),
-        ));
-
-        return (boolean) $result->TemplateExistsResult;
-    }
-
-    /**
-     * Share a document - i.e. the document is available to all over the Internet
-     *
-     * @return string
-     * @since  LiveDocx 1.0
-     */
-    public function shareDocument()
-    {
-        $this->logIn();
-        
-        $ret    = null;
-        $result = $this->getSoapClient()->ShareDocument();
-
-        if (isset($result->ShareDocumentResult)) {
-            $ret = (string) $result->ShareDocumentResult;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * List all shared documents stored on LiveDocx service
-     *
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public function listSharedDocuments()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->ListSharedDocuments();
-
-        if (isset($result->ListSharedDocumentsResult)) {
-            $ret = $this->_backendListArrayToMultiAssocArray(
-                $result->ListSharedDocumentsResult
-            );
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Delete a shared document from LiveDocx service
-     *
-     * @param  string $filename
-     * @return void
-     * @since  LiveDocx 1.0
-     */
-    public function deleteSharedDocument($filename)
-    {
-        $this->logIn();
-        
-        $this->getSoapClient()->DeleteSharedDocument(array(
-            'filename' => basename($filename),
-        ));
-    }
-
-    /*
-     * Download a shared document from LiveDocx service
-     *
-     * @param  string $filename
-     * @return binary
-     * @throws Zend_Service_LiveDocx_Exception
-     * @since  LiveDocx 1.0
-     */
-    public function downloadSharedDocument($filename)
-    {
-        $this->logIn();
-        
-        try {
-            $result = $this->getSoapClient()->DownloadSharedDocument(array(
-                'filename' => basename($filename),
-            ));
-        } catch (Exception $e) {
-            require_once 'Zend/Service/LiveDocx/Exception.php';
-            throw new Zend_Service_LiveDocx_Exception(
-                'Cannot download shared document', 0, $e
-            );
-        }
-
-        return base64_decode($result->DownloadSharedDocumentResult);
-    }
-
-    /**
-     * Check whether a shared document is available on LiveDocx service
-     *
-     * @param  string $filename
-     * @return boolean
-     * @since  LiveDocx 1.0
-     */
-    public function sharedDocumentExists($filename)
-    {
-        $this->logIn();
-        
-        $ret             = false;
-        $sharedDocuments = $this->listSharedDocuments();
-        foreach ($sharedDocuments as $shareDocument) {
-            if (isset($shareDocument['filename']) 
-                && (basename($filename) === $shareDocument['filename'])
-            ) {
-                $ret = true;
-                break;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return supported template formats (lowercase)
-     *
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public function getTemplateFormats()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetTemplateFormats();
-
-        if (isset($result->GetTemplateFormatsResult->string)) {
-            $ret = $result->GetTemplateFormatsResult->string;
-            $ret = array_map('strtolower', $ret);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Return supported document formats (lowercase)
-     *
-     * @return array
-     * @since  LiveDocx 1.1
-     */
-    public function getDocumentFormats()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetDocumentFormats();
-
-        if (isset($result->GetDocumentFormatsResult->string)) {
-            $ret = $result->GetDocumentFormatsResult->string;
-            $ret = array_map('strtolower', $ret);
-        }
-
-        return $ret;
-    }
-    
-    /*
-     * Return supported image formats (lowercase)
-     *
-     * @return array
-     * @since  LiveDocx 1.2
-     */
-    public function getImageFormats()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetImageFormats();
-
-        if (isset($result->GetImageFormatsResult->string)) {
-            $ret = $result->GetImageFormatsResult->string;
-            $ret = array_map('strtolower', $ret);
-        }
-
-        return $ret;
-    }
-        
-    /**
-     * Return the names of all fonts that are installed on backend server
-     *
-     * @return array
-     * @since  LiveDocx 1.2
-     */
-    public function getFontNames()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetFontNames();
-
-        if (isset($result->GetFontNamesResult->string)) {
-            $ret = $result->GetFontNamesResult->string;
-        }
-
-        return $ret;
-    }    
-    
-    /**
-     * Return supported document access options
-     *
-     * @return array
-     * @since  LiveDocx 1.2 Premium
-     */
-    public function getDocumentAccessOptions()
-    {
-        $this->logIn();
-        
-        $ret    = array();
-        $result = $this->getSoapClient()->GetDocumentAccessOptions();
-
-        if (isset($result->GetDocumentAccessOptionsResult->string)) {
-            $ret = $result->GetDocumentAccessOptionsResult->string;
-        }
-
-        return $ret;
-    }    
-
-    /**
-     * Convert LiveDocx service return value from list methods to consistent PHP array
-     *
-     * @param  array $list
-     * @return array
-     * @since  LiveDocx 1.0 
-     */
-    protected function _backendListArrayToMultiAssocArray($list)
-    {
-        $this->logIn();
-        
-        $ret = array();
-        if (isset($list->ArrayOfString)) {
-           foreach ($list->ArrayOfString as $a) {
-               if (is_array($a)) {      // 1 template only
-                   $o = new stdClass();
-                   $o->string = $a;
-               } else {                 // 2 or more templates
-                   $o = $a;
-               }
-               unset($a);
-
-               if (isset($o->string)) {
-                   $date1 = new Zend_Date($o->string[3], Zend_Date::RFC_1123);
-                   $date2 = new Zend_Date($o->string[1], Zend_Date::RFC_1123);
-
-                   $ret[] = array (
-                        'filename'   => $o->string[0],
-                        'fileSize'   => (integer) $o->string[2],
-                        'createTime' => (integer) $date1->get(Zend_Date::TIMESTAMP),
-                        'modifyTime' => (integer) $date2->get(Zend_Date::TIMESTAMP),
-                   );
-               }
-           }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Convert assoc array to required SOAP type
-     *
-     * @param array $assoc
-     *
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public static function assocArrayToArrayOfArrayOfString($assoc)
-    {
-        $arrayKeys   = array_keys($assoc);
-        $arrayValues = array_values($assoc);
-        
-        return array($arrayKeys, $arrayValues);
-    }
-
-    /**
-     * Convert multi assoc array to required SOAP type
-     *
-     * @param  array $multi
-     * @return array
-     * @since  LiveDocx 1.0
-     */
-    public static function multiAssocArrayToArrayOfArrayOfString($multi)
-    {
-        $arrayKeys   = array_keys($multi[0]);
-        $arrayValues = array();
-
-        foreach ($multi as $v) {
-            $arrayValues[] = array_values($v);
-        }
-
-        $arrayKeys = array($arrayKeys);
-
-        return array_merge($arrayKeys, $arrayValues);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/Nirvanix.php b/airtime_mvc/library/Zend/Service/Nirvanix.php
deleted file mode 100644
index 010bf76a9..000000000
--- a/airtime_mvc/library/Zend/Service/Nirvanix.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Nirvanix.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * This class allows Nirvanix authentication credentials to be specified
- * in one place and provides a factory for returning convenience wrappers
- * around the Nirvanix web service namespaces.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix
-{
-    /**
-     * Options to pass to namespace proxies
-     * @param array
-     */
-    protected $_options;
-
-    /**
-     * Class constructor.  Authenticates with Nirvanix to receive a
-     * sessionToken, which is then passed to each future request.
-     *
-     * @param  array  $authParams  Authentication POST parameters.  This
-     *                             should have keys "username", "password",
-     *                             and "appKey".
-     * @param  array  $options     Options to pass to namespace proxies
-     */
-    public function __construct($authParams, $options = array())
-    {
-        // merge options with default options
-        $defaultOptions = array('defaults'   => array(),
-                                'httpClient' => new Zend_Http_Client(),
-                                'host'       => 'http://services.nirvanix.com');
-        $this->_options = array_merge($defaultOptions, $options);
-
-        // login and save sessionToken to default POST params
-        $resp = $this->getService('Authentication')->login($authParams);
-        $this->_options['defaults']['sessionToken'] = (string)$resp->SessionToken;
-    }
-
-    /**
-     * Nirvanix divides its service into namespaces, with each namespace
-     * providing different functionality.  This is a factory method that
-     * returns a preconfigured Zend_Service_Nirvanix_Namespace_Base proxy.
-     *
-     * @param  string  $namespace  Name of the namespace
-     * @return Zend_Service_Nirvanix_Namespace_Base
-     */
-    public function getService($namespace, $options = array())
-    {
-        switch ($namespace) {
-            case 'IMFS':
-                $class = 'Zend_Service_Nirvanix_Namespace_Imfs';
-                break;
-            default:
-                $class = 'Zend_Service_Nirvanix_Namespace_Base';
-        }
-
-        $options['namespace'] = ucfirst($namespace);
-        $options = array_merge($this->_options, $options);
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($class);
-        }
-        return new $class($options);
-    }
-
-    /**
-     * Get the configured options.
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Nirvanix/Exception.php b/airtime_mvc/library/Zend/Service/Nirvanix/Exception.php
deleted file mode 100644
index db08707a4..000000000
--- a/airtime_mvc/library/Zend/Service/Nirvanix/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Base.php b/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Base.php
deleted file mode 100644
index 20d742140..000000000
--- a/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Base.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Service_Nirvanix_Response
- */
-require_once 'Zend/Service/Nirvanix/Response.php';
-
-/**
- * The Nirvanix web services are split into namespaces.  This is a proxy class
- * representing one namespace.  It allows calls to the namespace to be made by
- * PHP object calls rather than by having to construct HTTP client requests.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * HTTP client instance that will be used to make calls to
-     * the Nirvanix web services.
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient;
-
-    /**
-     * Host to use for calls to this Nirvanix namespace.  It is possible
-     * that the user will wish to use different hosts for different namespaces.
-     * @var string
-     */
-    protected $_host = 'http://services.nirvanix.com';
-
-    /**
-     * Name of this namespace as used in the URL.
-     * @var string
-     */
-    protected $_namespace = '';
-
-    /**
-     * Defaults for POST parameters.  When a request to the service is to be
-     * made, the POST parameters are merged into these.  This is a convenience
-     * feature so parameters that are repeatedly required like sessionToken
-     * do not need to be supplied again and again by the user.
-     *
-     * @param array
-     */
-    protected $_defaults = array();
-
-    /**
-     * Class constructor.
-     *
-     * @param  $options  array  Options and dependency injection
-     */
-    public function __construct($options = array())
-    {
-        if (isset($options['baseUrl'])) {
-            $this->_host = $options['baseUrl'];
-        }
-
-        if (isset($options['namespace'])) {
-            $this->_namespace = $options['namespace'];
-        }
-
-        if (isset($options['defaults'])) {
-            $this->_defaults = $options['defaults'];
-        }
-
-        if (! isset($options['httpClient'])) {
-            $options['httpClient'] = new Zend_Http_Client();
-        }
-        $this->_httpClient = $options['httpClient'];
-    }
-
-    /**
-     * When a method call is made against this proxy, convert it to
-     * an HTTP request to make against the Nirvanix REST service.
-     *
-     * $imfs->DeleteFiles(array('filePath' => 'foo'));
-     *
-     * Assuming this object was proxying the IMFS namespace, the
-     * method call above would call the DeleteFiles command.  The
-     * POST parameters would be filePath, merged with the
-     * $this->_defaults (containing the sessionToken).
-     *
-     * @param  string  $methodName  Name of the command to call
-     *                              on this namespace.
-     * @param  array   $args        Only the first is used and it must be
-     *                              an array.  It contains the POST params.
-     *
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function __call($methodName, $args)
-    {
-        $uri = $this->_makeUri($methodName);
-        $this->_httpClient->setUri($uri);
-
-        if (!isset($args[0]) || !is_array($args[0])) {
-            $args[0] = array();
-        }
-
-        $params = array_merge($this->_defaults, $args[0]);
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setParameterPost($params);
-
-        $httpResponse = $this->_httpClient->request(Zend_Http_Client::POST);
-        return $this->_wrapResponse($httpResponse);
-    }
-
-    /**
-     * Return the HTTP client used for this namespace.  This is useful
-     * for inspecting the last request or directly interacting with the
-     * HTTP client.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_httpClient;
-    }
-
-    /**
-     * Make a complete URI from an RPC method name.  All Nirvanix REST
-     * service URIs use the same format.
-     *
-     * @param  string  $methodName  RPC method name
-     * @return string
-     */
-    protected function _makeUri($methodName)
-    {
-        $methodName = ucfirst($methodName);
-        return "{$this->_host}/ws/{$this->_namespace}/{$methodName}.ashx";
-    }
-
-    /**
-     * All Nirvanix REST service calls return an XML payload.  This method
-     * makes a Zend_Service_Nirvanix_Response from that XML payload.
-     *
-     * @param  Zend_Http_Response  $httpResponse  Raw response from Nirvanix
-     * @return Zend_Service_Nirvanix_Response     Wrapped response
-     */
-    protected function _wrapResponse($httpResponse)
-    {
-        return new Zend_Service_Nirvanix_Response($httpResponse->getBody());
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Imfs.php b/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Imfs.php
deleted file mode 100644
index a0cbc8ef7..000000000
--- a/airtime_mvc/library/Zend/Service/Nirvanix/Namespace/Imfs.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Imfs.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Nirvanix_Namespace_Base
- */
-require_once 'Zend/Service/Nirvanix/Namespace/Base.php';
-
-/**
- * Namespace proxy with additional convenience methods for the IMFS namespace.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base
-{
-    /**
-     * Convenience function to get the contents of a file on
-     * the Nirvanix IMFS.  Analog to PHP's file_get_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $expiration  Number of seconds that Nirvanix
-     *                              make the file available for download.
-     * @return string               Contents of file
-     */
-    public function getContents($filePath, $expiration = 3600)
-    {
-        // get url to download the file
-        $params = array('filePath'   => $filePath,
-                        'expiration' => $expiration);
-        $resp = $this->getOptimalUrls($params);
-        $url = (string)$resp->Download->DownloadURL;
-
-        // download the file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri($url);
-        $resp = $this->_httpClient->request(Zend_Http_Client::GET);
-
-        return $resp->getBody();
-    }
-
-    /**
-     * Convenience function to put the contents of a string into
-     * the Nirvanix IMFS.  Analog to PHP's file_put_contents().
-     *
-     * @param  string  $filePath    Remote path and filename
-     * @param  integer $data        Data to store in the file
-     * @param  string  $mimeType    Mime type of data
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function putContents($filePath, $data, $mimeType = null)
-    {
-        // get storage node for upload
-        $params = array('sizeBytes' => strlen($data));
-        $resp = $this->getStorageNode($params);
-        $host        = (string)$resp->GetStorageNode->UploadHost;
-        $uploadToken = (string)$resp->GetStorageNode->UploadToken;
-
-        // http upload data into remote file
-        $this->_httpClient->resetParameters();
-        $this->_httpClient->setUri("http://{$host}/Upload.ashx");
-        $this->_httpClient->setParameterPost('uploadToken', $uploadToken);
-        $this->_httpClient->setParameterPost('destFolderPath', str_replace('\\', '/',dirname($filePath)));
-        $this->_httpClient->setFileUpload(basename($filePath), 'uploadFile', $data, $mimeType);
-        $response = $this->_httpClient->request(Zend_Http_Client::POST);
-
-        return new Zend_Service_Nirvanix_Response($response->getBody());
-    }
-
-    /**
-     * Convenience function to remove a file from the Nirvanix IMFS.
-     * Analog to PHP's unlink().
-     *
-     * @param  string  $filePath  Remove path and filename
-     * @return Zend_Service_Nirvanix_Response
-     */
-    public function unlink($filePath)
-    {
-        $params = array('filePath' => $filePath);
-        return $this->deleteFiles($params);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Nirvanix/Response.php b/airtime_mvc/library/Zend/Service/Nirvanix/Response.php
deleted file mode 100644
index f4030a7ea..000000000
--- a/airtime_mvc/library/Zend/Service/Nirvanix/Response.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class decorates a SimpleXMLElement parsed from a Nirvanix web service
- * response.  It is primarily exists to provide a convenience feature that
- * throws an exception when <ResponseCode> contains an error.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Nirvanix
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Nirvanix_Response
-{
-    /**
-     * SimpleXMLElement parsed from Nirvanix web service response.
-     *
-     * @var SimpleXMLElement
-     */
-    protected $_sxml;
-
-    /**
-     * Class constructor.  Parse the XML response from a Nirvanix method
-     * call into a decorated SimpleXMLElement element.
-     *
-     * @param string $xml  XML response string from Nirvanix
-     * @throws Zend_Service_Nirvanix_Exception
-     */
-    public function __construct($xml)
-    {
-        $this->_sxml = @simplexml_load_string($xml);
-
-        if (! $this->_sxml instanceof SimpleXMLElement) {
-            $this->_throwException("XML could not be parsed from response: $xml");
-        }
-
-        $name = $this->_sxml->getName();
-        if ($name != 'Response') {
-            $this->_throwException("Expected XML element Response, got $name");
-        }
-
-        $code = (int)$this->_sxml->ResponseCode;
-        if ($code != 0) {
-            $msg = (string)$this->_sxml->ErrorMessage;
-            $this->_throwException($msg, $code);
-        }
-    }
-
-    /**
-     * Return the SimpleXMLElement representing this response
-     * for direct access.
-     *
-     * @return SimpleXMLElement
-     */
-    public function getSxml()
-    {
-        return $this->_sxml;
-    }
-
-    /**
-     * Delegate undefined properties to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Undefined property name
-     * @return mixed
-     */
-    public function __get($offset)
-    {
-        return $this->_sxml->$offset;
-    }
-
-    /**
-     * Delegate undefined methods to the decorated SimpleXMLElement.
-     *
-     * @param  string  $offset  Underfined method name
-     * @param  array   $args    Method arguments
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->_sxml, $method), $args);
-    }
-
-    /**
-     * Throw an exception.  This method exists to only contain the
-     * lazy-require() of the exception class.
-     *
-     * @param  string   $message  Error message
-     * @param  integer  $code     Error code
-     * @throws Zend_Service_Nirvanix_Exception
-     * @return void
-     */
-    protected function _throwException($message, $code = null)
-    {
-        /**
-         * @see Zend_Service_Nirvanix_Exception
-         */
-        require_once 'Zend/Service/Nirvanix/Exception.php';
-
-        throw new Zend_Service_Nirvanix_Exception($message, $code);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/ReCaptcha.php b/airtime_mvc/library/Zend/Service/ReCaptcha.php
deleted file mode 100644
index 610ccbe55..000000000
--- a/airtime_mvc/library/Zend/Service/ReCaptcha.php
+++ /dev/null
@@ -1,506 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Service_Abstract */
-require_once 'Zend/Service/Abstract.php';
-
-/** @see Zend_Json */
-require_once 'Zend/Json.php';
-
-/** @see Zend_Service_ReCaptcha_Response */
-require_once 'Zend/Service/ReCaptcha/Response.php';
-
-/**
- * Zend_Service_ReCaptcha
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Service_ReCaptcha extends Zend_Service_Abstract
-{
-    /**
-     * URI to the regular API
-     *
-     * @var string
-     */
-    const API_SERVER = 'http://api.recaptcha.net';
-
-    /**
-     * URI to the secure API
-     *
-     * @var string
-     */
-    const API_SECURE_SERVER = 'https://api-secure.recaptcha.net';
-
-    /**
-     * URI to the verify server
-     *
-     * @var string
-     */
-    const VERIFY_SERVER = 'http://api-verify.recaptcha.net/verify';
-
-    /**
-     * Public key used when displaying the captcha
-     *
-     * @var string
-     */
-    protected $_publicKey = null;
-
-    /**
-     * Private key used when verifying user input
-     *
-     * @var string
-     */
-    protected $_privateKey = null;
-
-    /**
-     * Ip address used when verifying user input
-     *
-     * @var string
-     */
-    protected $_ip = null;
-
-    /**
-     * Parameters for the object
-     *
-     * @var array
-     */
-    protected $_params = array(
-        'ssl' => false, /* Use SSL or not when generating the recaptcha */
-        'error' => null, /* The error message to display in the recaptcha */
-        'xhtml' => false /* Enable XHTML output (this will not be XHTML Strict
-                            compliant since the IFRAME is necessary when
-                            Javascript is disabled) */
-    );
-
-    /**
-     * Options for tailoring reCaptcha
-     *
-     * See the different options on http://recaptcha.net/apidocs/captcha/client.html
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'theme' => 'red',
-        'lang' => 'en',
-    );
-
-    /**
-     * Response from the verify server
-     *
-     * @var Zend_Service_ReCaptcha_Response
-     */
-    protected $_response = null;
-
-    /**
-     * Class constructor
-     *
-     * @param string $publicKey
-     * @param string $privateKey
-     * @param array $params
-     * @param array $options
-     * @param string $ip
-     * @param array|Zend_Config $params
-     */
-    public function __construct($publicKey = null, $privateKey = null,
-                                $params = null, $options = null, $ip = null)
-    {
-        if ($publicKey !== null) {
-            $this->setPublicKey($publicKey);
-        }
-
-        if ($privateKey !== null) {
-            $this->setPrivateKey($privateKey);
-        }
-
-        if ($ip !== null) {
-            $this->setIp($ip);
-        } else if (isset($_SERVER['REMOTE_ADDR'])) {
-            $this->setIp($_SERVER['REMOTE_ADDR']);
-        }
-
-        if ($params !== null) {
-            $this->setParams($params);
-        }
-
-        if ($options !== null) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Serialize as string
-     *
-     * When the instance is used as a string it will display the recaptcha.
-     * Since we can't throw exceptions within this method we will trigger
-     * a user warning instead.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->getHtml();
-        } catch (Exception $e) {
-            $return = '';
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Set the ip property
-     *
-     * @param string $ip
-     * @return Zend_Service_ReCaptcha
-     */
-    public function setIp($ip)
-    {
-        $this->_ip = $ip;
-
-        return $this;
-    }
-
-    /**
-     * Get the ip property
-     *
-     * @return string
-     */
-    public function getIp()
-    {
-        return $this->_ip;
-    }
-
-    /**
-     * Set a single parameter
-     *
-     * @param string $key
-     * @param string $value
-     * @return Zend_Service_ReCaptcha
-     */
-    public function setParam($key, $value)
-    {
-        $this->_params[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Set parameters
-     *
-     * @param array|Zend_Config $params
-     * @return Zend_Service_ReCaptcha
-     * @throws Zend_Service_ReCaptcha_Exception
-     */
-    public function setParams($params)
-    {
-        if ($params instanceof Zend_Config) {
-            $params = $params->toArray();
-        }
-
-        if (is_array($params)) {
-            foreach ($params as $k => $v) {
-                $this->setParam($k, $v);
-            }
-        } else {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception(
-                'Expected array or Zend_Config object'
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the parameter array
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Get a single parameter
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function getParam($key)
-    {
-        return $this->_params[$key];
-    }
-
-    /**
-     * Set a single option
-     *
-     * @param string $key
-     * @param string $value
-     * @return Zend_Service_ReCaptcha
-     */
-    public function setOption($key, $value)
-    {
-        $this->_options[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Set options
-     *
-     * @param array|Zend_Config $options
-     * @return Zend_Service_ReCaptcha
-     * @throws Zend_Service_ReCaptcha_Exception
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->setOption($k, $v);
-            }
-        } else {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception(
-                'Expected array or Zend_Config object'
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the options array
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Get a single option
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function getOption($key)
-    {
-        return $this->_options[$key];
-    }
-
-    /**
-     * Get the public key
-     *
-     * @return string
-     */
-    public function getPublicKey()
-    {
-        return $this->_publicKey;
-    }
-
-    /**
-     * Set the public key
-     *
-     * @param string $publicKey
-     * @return Zend_Service_ReCaptcha
-     */
-    public function setPublicKey($publicKey)
-    {
-        $this->_publicKey = $publicKey;
-
-        return $this;
-    }
-
-    /**
-     * Get the private key
-     *
-     * @return string
-     */
-    public function getPrivateKey()
-    {
-        return $this->_privateKey;
-    }
-
-    /**
-     * Set the private key
-     *
-     * @param string $privateKey
-     * @return Zend_Service_ReCaptcha
-     */
-    public function setPrivateKey($privateKey)
-    {
-        $this->_privateKey = $privateKey;
-
-        return $this;
-    }
-
-    /**
-     * Get the HTML code for the captcha
-     *
-     * This method uses the public key to fetch a recaptcha form.
-     *
-     * @return string
-     * @throws Zend_Service_ReCaptcha_Exception
-     */
-    public function getHtml()
-    {
-        if ($this->_publicKey === null) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception('Missing public key');
-        }
-
-        $host = self::API_SERVER;
-
-        if ((bool) $this->_params['ssl'] === true) {
-            $host = self::API_SECURE_SERVER;
-        }
-
-        $htmlBreak = '<br>';
-        $htmlInputClosing = '>';
-
-        if ((bool) $this->_params['xhtml'] === true) {
-            $htmlBreak = '<br />';
-            $htmlInputClosing = '/>';
-        }
-
-        $errorPart = '';
-
-        if (!empty($this->_params['error'])) {
-            $errorPart = '&error=' . urlencode($this->_params['error']);
-        }
-
-        $reCaptchaOptions = '';
-
-        if (!empty($this->_options)) {
-            $encoded = Zend_Json::encode($this->_options);
-            $reCaptchaOptions = <<<SCRIPT
-<script type="text/javascript">
-    var RecaptchaOptions = {$encoded};
-</script>
-SCRIPT;
-        }
-
-        $return = $reCaptchaOptions;
-        $return .= <<<HTML
-<script type="text/javascript"
-   src="{$host}/challenge?k={$this->_publicKey}{$errorPart}">
-</script>
-HTML;
-        $return .= <<<HTML
-<noscript>
-   <iframe src="{$host}/noscript?k={$this->_publicKey}{$errorPart}"
-       height="300" width="500" frameborder="0"></iframe>{$htmlBreak}
-   <textarea name="recaptcha_challenge_field" rows="3" cols="40">
-   </textarea>
-   <input type="hidden" name="recaptcha_response_field"
-       value="manual_challenge"{$htmlInputClosing}
-</noscript>
-HTML;
-
-        return $return;
-    }
-
-    /**
-     * Post a solution to the verify server
-     *
-     * @param string $challengeField
-     * @param string $responseField
-     * @return Zend_Http_Response
-     * @throws Zend_Service_ReCaptcha_Exception
-     */
-    protected function _post($challengeField, $responseField)
-    {
-        if ($this->_privateKey === null) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception('Missing private key');
-        }
-
-        if ($this->_ip === null) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception('Missing ip address');
-        }
-
-        if (empty($challengeField)) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-            throw new Zend_Service_ReCaptcha_Exception('Missing challenge field');
-        }
-
-        if (empty($responseField)) {
-            /** @see Zend_Service_ReCaptcha_Exception */
-            require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_Exception('Missing response field');
-        }
-
-        /* Fetch an instance of the http client */
-        $httpClient = self::getHttpClient();
-
-        $postParams = array('privatekey' => $this->_privateKey,
-                            'remoteip'   => $this->_ip,
-                            'challenge'  => $challengeField,
-                            'response'   => $responseField);
-
-        /* Make the POST and return the response */
-        return $httpClient->setUri(self::VERIFY_SERVER)
-                          ->setParameterPost($postParams)
-                          ->request(Zend_Http_Client::POST);
-    }
-
-    /**
-     * Verify the user input
-     *
-     * This method calls up the post method and returns a
-     * Zend_Service_ReCaptcha_Response object.
-     *
-     * @param string $challengeField
-     * @param string $responseField
-     * @return Zend_Service_ReCaptcha_Response
-     */
-    public function verify($challengeField, $responseField)
-    {
-        $response = $this->_post($challengeField, $responseField);
-
-        return new Zend_Service_ReCaptcha_Response(null, null, $response);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/ReCaptcha/Exception.php b/airtime_mvc/library/Zend/Service/ReCaptcha/Exception.php
deleted file mode 100644
index e5a4ab3ed..000000000
--- a/airtime_mvc/library/Zend/Service/ReCaptcha/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Service_Exception */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * Zend_Service_ReCaptcha_Exception
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Service_ReCaptcha_Exception extends Zend_Service_Exception
-{}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide.php b/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide.php
deleted file mode 100644
index c3c075f72..000000000
--- a/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Service_ReCaptcha */
-require_once 'Zend/Service/ReCaptcha.php';
-
-/**
- * Zend_Service_ReCaptcha_MailHide
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MailHide.php 20108 2010-01-06 22:05:31Z matthew $
- */
-class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha
-{
-    /**#@+
-     * Encryption constants
-     */
-    const ENCRYPTION_MODE = MCRYPT_MODE_CBC;
-    const ENCRYPTION_CIPHER = MCRYPT_RIJNDAEL_128;
-    const ENCRYPTION_BLOCK_SIZE = 16;
-    const ENCRYPTION_IV = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-    /**#@-*/
-
-    /**
-     * Url to the mailhide server
-     *
-     * @var string
-     */
-    const MAILHIDE_SERVER = 'http://mailhide.recaptcha.net/d';
-
-    /**
-     * The email address to protect
-     *
-     * @var string
-     */
-    protected $_email = null;
-
-    /**
-     * @var Zend_Validate_Interface
-     */
-    protected $_emailValidator;
-
-    /**
-     * Binary representation of the private key
-     *
-     * @var string
-     */
-    protected $_privateKeyPacked = null;
-
-    /**
-     * The local part of the email
-     *
-     * @var string
-     */
-    protected $_emailLocalPart = null;
-
-    /**
-     * The domain part of the email
-     *
-     * @var string
-     */
-    protected $_emailDomainPart = null;
-
-    /**
-     * Local constructor
-     *
-     * @param string $publicKey
-     * @param string $privateKey
-     * @param string $email
-     * @param array|Zend_Config $options
-     */
-    public function __construct($publicKey = null, $privateKey = null, $email = null, $options = null)
-    {
-        /* Require the mcrypt extension to be loaded */
-        $this->_requireMcrypt();
-
-        /* If options is a Zend_Config object we want to convert it to an array so we can merge it with the default options */
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        /* Merge if needed */
-        if (is_array($options)) {
-            $options = array_merge($this->getDefaultOptions(), $options);
-        } else {
-            $options = $this->getDefaultOptions();
-        }
-
-        parent::__construct($publicKey, $privateKey, null, $options);
-
-        if ($email !== null) {
-            $this->setEmail($email);
-        }
-    }
-
-
-    /**
-     * Get emailValidator
-     *
-     * @return Zend_Validate_Interface
-     */
-    public function getEmailValidator()
-    {
-        if (null === $this->_emailValidator) {
-            require_once 'Zend/Validate/EmailAddress.php';
-            $this->setEmailValidator(new Zend_Validate_EmailAddress());
-        }
-        return $this->_emailValidator;
-    }
-
-    /**
-     * Set email validator
-     *
-     * @param  Zend_Validate_Interface $validator
-     * @return Zend_Service_ReCaptcha_MailHide
-     */
-    public function setEmailValidator(Zend_Validate_Interface $validator)
-    {
-        $this->_emailValidator = $validator;
-        return $this;
-    }
-
-
-    /**
-     * See if the mcrypt extension is available
-     *
-     * @throws Zend_Service_ReCaptcha_MailHide_Exception
-     */
-    protected function _requireMcrypt()
-    {
-        if (!extension_loaded('mcrypt')) {
-            /** @see Zend_Service_ReCaptcha_MailHide_Exception */
-            require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php';
-
-            throw new Zend_Service_ReCaptcha_MailHide_Exception('Use of the Zend_Service_ReCaptcha_MailHide component requires the mcrypt extension to be enabled in PHP');
-        }
-    }
-
-    /**
-     * Serialize as string
-     *
-     * When the instance is used as a string it will display the email address. Since we can't
-     * throw exceptions within this method we will trigger a user warning instead.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $return = $this->getHtml();
-        } catch (Exception $e) {
-            $return = '';
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Get the default set of parameters
-     *
-     * @return array
-     */
-    public function getDefaultOptions()
-    {
-        return array(
-            'encoding'       => 'UTF-8',
-            'linkTitle'      => 'Reveal this e-mail address',
-            'linkHiddenText' => '...',
-            'popupWidth'     => 500,
-            'popupHeight'    => 300,
-        );
-    }
-
-    /**
-     * Override the setPrivateKey method
-     *
-     * Override the parent method to store a binary representation of the private key as well.
-     *
-     * @param string $privateKey
-     * @return Zend_Service_ReCaptcha_MailHide
-     */
-    public function setPrivateKey($privateKey)
-    {
-        parent::setPrivateKey($privateKey);
-
-        /* Pack the private key into a binary string */
-        $this->_privateKeyPacked = pack('H*', $this->_privateKey);
-
-        return $this;
-    }
-
-    /**
-     * Set the email property
-     *
-     * This method will set the email property along with the local and domain parts
-     *
-     * @param string $email
-     * @return Zend_Service_ReCaptcha_MailHide
-     */
-    public function setEmail($email)
-    {
-        $this->_email = $email;
-
-        $validator = $this->getEmailValidator();
-        if (!$validator->isValid($email)) {
-            require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php';
-            throw new Zend_Service_ReCaptcha_MailHide_Exception('Invalid email address provided');
-        }
-
-        $emailParts = explode('@', $email, 2);
-
-        /* Decide on how much of the local part we want to reveal */
-        if (strlen($emailParts[0]) <= 4) {
-            $emailParts[0] = substr($emailParts[0], 0, 1);
-        } else if (strlen($emailParts[0]) <= 6) {
-            $emailParts[0] = substr($emailParts[0], 0, 3);
-        } else {
-            $emailParts[0] = substr($emailParts[0], 0, 4);
-        }
-
-        $this->_emailLocalPart = $emailParts[0];
-        $this->_emailDomainPart = $emailParts[1];
-
-        return $this;
-    }
-
-    /**
-     * Get the email property
-     *
-     * @return string
-     */
-    public function getEmail()
-    {
-        return $this->_email;
-    }
-
-    /**
-     * Get the local part of the email address
-     *
-     * @return string
-     */
-    public function getEmailLocalPart()
-    {
-        return $this->_emailLocalPart;
-    }
-
-    /**
-     * Get the domain part of the email address
-     *
-     * @return string
-     */
-    public function getEmailDomainPart()
-    {
-        return $this->_emailDomainPart;
-    }
-
-    /**
-     * Get the HTML code needed for the mail hide
-     *
-     * @param string $email
-     * @return string
-     * @throws Zend_Service_ReCaptcha_MailHide_Exception
-     */
-    public function getHtml($email = null)
-    {
-        if ($email !== null) {
-            $this->setEmail($email);
-        } elseif (null === ($email = $this->getEmail())) {
-            /** @see Zend_Service_ReCaptcha_MailHide_Exception */
-            require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php';
-            throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing email address');
-        }
-
-        if ($this->_publicKey === null) {
-            /** @see Zend_Service_ReCaptcha_MailHide_Exception */
-            require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php';
-            throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing public key');
-        }
-
-        if ($this->_privateKey === null) {
-            /** @see Zend_Service_ReCaptcha_MailHide_Exception */
-            require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php';
-            throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing private key');
-        }
-
-        /* Generate the url */
-        $url = $this->_getUrl();
-
-        $enc = $this->getOption('encoding');
-
-        /* Genrate the HTML used to represent the email address */
-        $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) 
-            . '<a href="' 
-                . htmlentities($url, ENT_COMPAT, $enc) 
-                . '" onclick="window.open(\'' 
-                    . htmlentities($url, ENT_COMPAT, $enc) 
-                    . '\', \'\', \'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width='
-                    . $this->_options['popupWidth'] 
-                    . ',height=' 
-                    . $this->_options['popupHeight'] 
-                . '\'); return false;" title="' 
-                . $this->_options['linkTitle'] 
-                . '">' . $this->_options['linkHiddenText'] . '</a>@' 
-                . htmlentities($this->getEmailDomainPart(), ENT_COMPAT, $enc);
-
-        return $html;
-    }
-
-    /**
-     * Get the url used on the "hidden" part of the email address
-     *
-     * @return string
-     */
-    protected function _getUrl()
-    {
-        /* Figure out how much we need to pad the email */
-        $numPad = self::ENCRYPTION_BLOCK_SIZE - (strlen($this->_email) % self::ENCRYPTION_BLOCK_SIZE);
-
-        /* Pad the email */
-        $emailPadded = str_pad($this->_email, strlen($this->_email) + $numPad, chr($numPad));
-
-        /* Encrypt the email */
-        $emailEncrypted = mcrypt_encrypt(self::ENCRYPTION_CIPHER, $this->_privateKeyPacked, $emailPadded, self::ENCRYPTION_MODE, self::ENCRYPTION_IV);
-
-        /* Return the url */
-        return self::MAILHIDE_SERVER . '?k=' . $this->_publicKey . '&c=' . strtr(base64_encode($emailEncrypted), '+/', '-_');
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide/Exception.php b/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide/Exception.php
deleted file mode 100644
index 54fda93b8..000000000
--- a/airtime_mvc/library/Zend/Service/ReCaptcha/MailHide/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_Service_ReCaptcha_Exception */
-require_once 'Zend/Service/ReCaptcha/Exception.php';
-
-/**
- * Zend_Service_ReCaptcha_MailHide_Exception
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception
-{}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/ReCaptcha/Response.php b/airtime_mvc/library/Zend/Service/ReCaptcha/Response.php
deleted file mode 100644
index 95a2c0472..000000000
--- a/airtime_mvc/library/Zend/Service/ReCaptcha/Response.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Service_ReCaptcha_Response
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage ReCaptcha
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Service_ReCaptcha_Response
-{
-    /**
-     * Status
-     *
-     * true if the response is valid or false otherwise
-     *
-     * @var boolean
-     */
-    protected $_status = null;
-
-    /**
-     * Error code
-     *
-     * The error code if the status is false. The different error codes can be found in the
-     * recaptcha API docs.
-     *
-     * @var string
-     */
-    protected $_errorCode = null;
-
-    /**
-     * Class constructor used to construct a response
-     *
-     * @param string $status
-     * @param string $errorCode
-     * @param Zend_Http_Response $httpResponse If this is set the content will override $status and $errorCode
-     */
-    public function __construct($status = null, $errorCode = null, Zend_Http_Response $httpResponse = null)
-    {
-        if ($status !== null) {
-            $this->setStatus($status);
-        }
-
-        if ($errorCode !== null) {
-            $this->setErrorCode($errorCode);
-        }
-
-        if ($httpResponse !== null) {
-            $this->setFromHttpResponse($httpResponse);
-        }
-    }
-
-    /**
-     * Set the status
-     *
-     * @param string $status
-     * @return Zend_Service_ReCaptcha_Response
-     */
-    public function setStatus($status)
-    {
-        if ($status === 'true') {
-            $this->_status = true;
-        } else {
-            $this->_status = false;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the status
-     *
-     * @return boolean
-     */
-    public function getStatus()
-    {
-        return $this->_status;
-    }
-
-    /**
-     * Alias for getStatus()
-     *
-     * @return boolean
-     */
-    public function isValid()
-    {
-        return $this->getStatus();
-    }
-
-    /**
-     * Set the error code
-     *
-     * @param string $errorCode
-     * @return Zend_Service_ReCaptcha_Response
-     */
-    public function setErrorCode($errorCode)
-    {
-        $this->_errorCode = $errorCode;
-
-        return $this;
-    }
-
-    /**
-     * Get the error code
-     *
-     * @return string
-     */
-    public function getErrorCode()
-    {
-        return $this->_errorCode;
-    }
-
-    /**
-     * Populate this instance based on a Zend_Http_Response object
-     *
-     * @param Zend_Http_Response $response
-     * @return Zend_Service_ReCaptcha_Response
-     */
-    public function setFromHttpResponse(Zend_Http_Response $response)
-    {
-        $body = $response->getBody();
-
-        $parts = explode("\n", $body, 2);
-
-        if (count($parts) !== 2) {
-            $status = 'false';
-            $errorCode = '';
-        } else {
-            list($status, $errorCode) = $parts;
-        }
-
-        $this->setStatus($status);
-        $this->setErrorCode($errorCode);
-
-        return $this;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/Simpy.php b/airtime_mvc/library/Zend/Service/Simpy.php
deleted file mode 100644
index f580be74e..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Simpy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @link       http://www.simpy.com/doc/api/rest/
- */
-class Zend_Service_Simpy
-{
-    /**
-     * Base URI to which API methods and parameters will be appended
-     *
-     * @var string
-     */
-    protected $_baseUri = 'http://simpy.com/simpy/api/rest/';
-
-    /**
-     * HTTP client for use in making web service calls
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_http;
-
-    /**
-     * Constructs a new Simpy (free) REST API Client
-     *
-     * @param  string $username Username for the Simpy user account
-     * @param  string $password Password for the Simpy user account
-     * @return void
-     */
-    public function __construct($username, $password)
-    {
-        $this->_http = new Zend_Http_Client;
-        $this->_http->setAuth($username, $password);
-    }
-
-    /**
-     * Returns the HTTP client currently in use by this class for REST API
-     * calls, intended mainly for testing.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_http;
-    }
-
-    /**
-     * Sends a request to the REST API service and does initial processing
-     * on the response.
-     *
-     * @param  string $op    Name of the operation for the request
-     * @param  array  $query Query data for the request (optional)
-     * @throws Zend_Service_Exception
-     * @return DOMDocument Parsed XML response
-     */
-    protected function _makeRequest($op, $query = null)
-    {
-        if ($query != null) {
-            $query = array_diff($query, array_filter($query, 'is_null'));
-            $query = '?' . http_build_query($query);
-        }
-
-        $this->_http->setUri($this->_baseUri . $op . '.do' . $query);
-        $response = $this->_http->request('GET');
-
-        if ($response->isSuccessful()) {
-            $doc = new DOMDocument();
-            $doc->loadXML($response->getBody());
-            $xpath = new DOMXPath($doc);
-            $list = $xpath->query('/status/code');
-
-            if ($list->length > 0) {
-                $code = $list->item(0)->nodeValue;
-
-                if ($code != 0) {
-                    $list = $xpath->query('/status/message');
-                    $message = $list->item(0)->nodeValue;
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception($message, $code);
-                }
-            }
-
-            return $doc;
-        }
-
-        /**
-         * @see Zend_Service_Exception
-         */
-        require_once 'Zend/Service/Exception.php';
-        throw new Zend_Service_Exception($response->getMessage(), $response->getStatus());
-    }
-
-    /**
-     * Returns a list of all tags and their counts, ordered by count in
-     * decreasing order
-     *
-     * @param  int $limit Limits the number of tags returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetTags
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Simpy_TagSet
-     */
-    public function getTags($limit = null)
-    {
-        $query = array(
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetTags', $query);
-
-        /**
-         * @see Zend_Service_Simpy_TagSet
-         */
-        require_once 'Zend/Service/Simpy/TagSet.php';
-        return new Zend_Service_Simpy_TagSet($doc);
-    }
-
-    /**
-     * Removes a tag.
-     *
-     * @param  string $tag Tag to be removed
-     * @link   http://www.simpy.com/doc/api/rest/RemoveTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function removeTag($tag)
-    {
-        $query = array(
-            'tag' => $tag
-        );
-
-        $this->_makeRequest('RemoveTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Renames a tag.
-     *
-     * @param  string $fromTag Tag to be renamed
-     * @param  string $toTag   New tag name
-     * @link   http://www.simpy.com/doc/api/rest/RenameTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function renameTag($fromTag, $toTag)
-    {
-        $query = array(
-            'fromTag' => $fromTag,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('RenameTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Merges two tags into a new tag.
-     *
-     * @param  string $fromTag1 First tag to merge.
-     * @param  string $fromTag2 Second tag to merge.
-     * @param  string $toTag    Tag to merge the two tags into.
-     * @link   http://www.simpy.com/doc/api/rest/MergeTags
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function mergeTags($fromTag1, $fromTag2, $toTag)
-    {
-        $query = array(
-            'fromTag1' => $fromTag1,
-            'fromTag2' => $fromTag2,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('MergeTags', $query);
-
-        return $this;
-    }
-
-    /**
-     * Splits a single tag into two separate tags.
-     *
-     * @param  string $tag    Tag to split
-     * @param  string $toTag1 First tag to split into
-     * @param  string $toTag2 Second tag to split into
-     * @link   http://www.simpy.com/doc/api/rest/SplitTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function splitTag($tag, $toTag1, $toTag2)
-    {
-        $query = array(
-            'tag' => $tag,
-            'toTag1' => $toTag1,
-            'toTag2' => $toTag2
-        );
-
-        $this->_makeRequest('SplitTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Performs a query on existing links and returns the results or returns all
-     * links if no particular query is specified (which should be used sparingly
-     * to prevent overloading Simpy servers)
-     *
-     * @param  Zend_Service_Simpy_LinkQuery $q Query object to use (optional)
-     * @return Zend_Service_Simpy_LinkSet
-     */
-    public function getLinks(Zend_Service_Simpy_LinkQuery $q = null)
-    {
-        if ($q != null) {
-            $query = array(
-                'q'          => $q->getQueryString(),
-                'limit'      => $q->getLimit(),
-                'date'       => $q->getDate(),
-                'afterDate'  => $q->getAfterDate(),
-                'beforeDate' => $q->getBeforeDate()
-            );
-
-            $doc = $this->_makeRequest('GetLinks', $query);
-        } else {
-            $doc = $this->_makeRequest('GetLinks');
-        }
-
-        /**
-         * @see Zend_Service_Simpy_LinkSet
-         */
-        require_once 'Zend/Service/Simpy/LinkSet.php';
-        return new Zend_Service_Simpy_LinkSet($doc);
-    }
-
-    /**
-     * Saves a given link.
-     *
-     * @param  string $title       Title of the page to save
-     * @param  string $href        URL of the page to save
-     * @param  int    $accessType  ACCESSTYPE_PUBLIC or ACCESSTYPE_PRIVATE
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $urlNickname Alternative custom title (optional)
-     * @param  string $note        Free text note (optional)
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PUBLIC
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PRIVATE
-     * @link   http://www.simpy.com/doc/api/rest/SaveLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveLink($title, $href, $accessType, $tags = null, $urlNickname = null, $note = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'href'        => $href,
-            'accessType'  => $accessType,
-            'tags'        => $tags,
-            'urlNickname' => $urlNickname,
-            'note'        => $note
-        );
-
-        $this->_makeRequest('SaveLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given link.
-     *
-     * @param  string $href URL of the bookmark to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteLink($href)
-    {
-        $query = array(
-            'href' => $href
-        );
-
-        $this->_makeRequest('DeleteLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Return a list of watchlists and their meta-data, including the number
-     * of new links added to each watchlist since last login.
-     *
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlists
-     * @return Zend_Service_Simpy_WatchlistSet
-     */
-    public function getWatchlists()
-    {
-        $doc = $this->_makeRequest('GetWatchlists');
-
-        /**
-         * @see Zend_Service_Simpy_WatchlistSet
-         */
-        require_once 'Zend/Service/Simpy/WatchlistSet.php';
-        return new Zend_Service_Simpy_WatchlistSet($doc);
-    }
-
-    /**
-     * Returns the meta-data for a given watchlist.
-     *
-     * @param  int $watchlistId ID of the watchlist to retrieve
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlist
-     * @return Zend_Service_Simpy_Watchlist
-     */
-    public function getWatchlist($watchlistId)
-    {
-        $query = array(
-            'watchlistId' => $watchlistId
-        );
-
-        $doc = $this->_makeRequest('GetWatchlist', $query);
-
-        /**
-         * @see Zend_Service_Simpy_Watchlist
-         */
-        require_once 'Zend/Service/Simpy/Watchlist.php';
-        return new Zend_Service_Simpy_Watchlist($doc->documentElement);
-    }
-
-    /**
-     * Returns all notes in reverse chronological order by add date or by
-     * rank.
-     *
-     * @param  string $q     Query string formatted using Simpy search syntax
-     *                       and search fields (optional)
-     * @param  int    $limit Limits the number notes returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetNotes
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchSyntax
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchFieldsLinks
-     * @return Zend_Service_Simpy_NoteSet
-     */
-    public function getNotes($q = null, $limit = null)
-    {
-        $query = array(
-            'q'     => $q,
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetNotes', $query);
-
-        /**
-         * @see Zend_Service_Simpy_NoteSet
-         */
-        require_once 'Zend/Service/Simpy/NoteSet.php';
-        return new Zend_Service_Simpy_NoteSet($doc);
-    }
-
-    /**
-     * Saves a note.
-     *
-     * @param  string $title       Title of the note
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $description Free-text note (optional)
-     * @param  int    $noteId      Unique identifier for an existing note to
-     *                             update (optional)
-     * @link   http://www.simpy.com/doc/api/rest/SaveNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveNote($title, $tags = null, $description = null, $noteId = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'tags'        => $tags,
-            'description' => $description,
-            'noteId'      => $noteId
-        );
-
-        $this->_makeRequest('SaveNote', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given note.
-     *
-     * @param  int $noteId ID of the note to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteNote($noteId)
-    {
-        $query = array(
-            'noteId' => $noteId
-        );
-
-        $this->_makeRequest('DeleteNote', $query);
-
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/Link.php b/airtime_mvc/library/Zend/Service/Simpy/Link.php
deleted file mode 100644
index 48825a3b1..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/Link.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Link
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = '0';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = '1';
-
-    /**
-     * Access type assigned to the link
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * URL of the link
-     *
-     * @var string
-     */
-    protected $_url;
-
-    /**
-     * Date of the last modification made to the link
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the link was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title assigned to the link
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Nickname assigned to the link
-     *
-     * @var string
-     */
-    protected $_nickname;
-
-    /**
-     * Tags assigned to the link
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Note assigned to the link
-     *
-     * @var string
-     */
-    protected $_note;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_url = $xpath->evaluate('/link/url')->item(0)->nodeValue;
-        $this->_modDate = $xpath->evaluate('/link/modDate')->item(0)->nodeValue;
-        $this->_addDate = $xpath->evaluate('/link/addDate')->item(0)->nodeValue;
-        $this->_title = $xpath->evaluate('/link/title')->item(0)->nodeValue;
-        $this->_nickname = $xpath->evaluate('/link/nickname')->item(0)->nodeValue;
-        $this->_note = $xpath->evaluate('/link/note')->item(0)->nodeValue;
-
-        $list = $xpath->query('/link/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the link
-     *
-     * @see ACCESSTYPE_PRIVATE
-     * @see ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the URL of the link
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the date of the last modification made to the link
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the link was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the link
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the nickname assigned to the link
-     *
-     * @return string
-     */
-    public function getNickname()
-    {
-        return $this->_nickname;
-    }
-
-    /**
-     * Returns the tags assigned to the link
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the note assigned to the link
-     *
-     * @return string
-     */
-    public function getNote()
-    {
-        return $this->_note;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/LinkQuery.php b/airtime_mvc/library/Zend/Service/Simpy/LinkQuery.php
deleted file mode 100644
index 9d308179e..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/LinkQuery.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LinkQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkQuery
-{
-    /**
-     * Query string for the query
-     *
-     * @var string
-     */
-    protected $_query = null;
-
-    /**
-     * Maximum number of search results to return
-     *
-     * @var int
-     */
-    protected $_limit = null;
-
-    /**
-     * Date on which search results must have been added
-     *
-     * @var string
-     */
-    protected $_date = null;
-
-    /**
-     * Date after which search results must have been added
-     *
-     * @var string
-     */
-    protected $_afterDate = null;
-
-    /**
-     * Date before which search results must have been added
-     *
-     * @var string
-     */
-    protected $_beforeDate = null;
-
-    /**
-     * Sets the query string for the query
-     *
-     * @param  string $query Query string in valid Simpy syntax
-     * @see    http://www.simpy.com/faq#searchSyntax
-     * @see    http://www.simpy.com/faq#searchFieldsLinks
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setQueryString($query)
-    {
-        $this->_query = $query;
-
-        return $this;
-    }
-
-    /**
-     * Returns the query string set for this query
-     *
-     * @return string
-     */
-    public function getQueryString()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the maximum number of search results to return
-     *
-     * @param  int $limit
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setLimit($limit)
-    {
-        $this->_limit = intval($limit);
-
-        if ($this->_limit == 0) {
-            $this->_limit = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the maximum number of search results to return
-     *
-     * @return int
-     */
-    public function getLimit()
-    {
-        return $this->_limit;
-    }
-
-    /**
-     * Sets the date on which search results must have been added, which will
-     * override any existing values set using setAfterDate() and setBeforeDate()
-     *
-     * @param  string $date
-     * @see    setAfterDate()
-     * @see    setBeforeDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setDate($date)
-    {
-        $this->_date = $date;
-        $this->_afterDate = null;
-        $this->_beforeDate = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date on which search results must have been added
-     *
-     * @return string
-     */
-    public function getDate()
-    {
-        return $this->_date;
-    }
-
-    /**
-     * Sets the date after which search results must have been added, which will
-     * override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setAfterDate($date)
-    {
-        $this->_afterDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date after which search results must have been added
-     *
-     * @return string
-     */
-    public function getAfterDate()
-    {
-        return $this->_afterDate;
-    }
-
-    /**
-     * Sets the date before which search results must have been added, which
-     * will override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setBeforeDate($date)
-    {
-        $this->_beforeDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date before which search results must have been added
-     *
-     * @return string
-     */
-    public function getBeforeDate()
-    {
-        return $this->_beforeDate;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/LinkSet.php b/airtime_mvc/library/Zend/Service/Simpy/LinkSet.php
deleted file mode 100644
index 87a45df57..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/LinkSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LinkSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_Link
- */
-require_once 'Zend/Service/Simpy/Link.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkSet implements IteratorAggregate
-{
-    /**
-     * List of links
-     *
-     * @var array of Zend_Service_Simpy_Link objects
-     */
-    protected $_links;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetLinks operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//links/link');
-        $this->_links = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_links[$x] = new Zend_Service_Simpy_Link($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the link set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_links);
-    }
-
-    /**
-     * Returns the number of links in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_links);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/Note.php b/airtime_mvc/library/Zend/Service/Simpy/Note.php
deleted file mode 100644
index 210468e4c..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/Note.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Note.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Note
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = 'private';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = 'public';
-
-    /**
-     * Access type assigned to the note
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * ID of the note
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * URI of the note
-     *
-     * @var string
-     */
-    protected $_uri;
-
-    /**
-     * Date of the last modification made to the note
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the note was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title of to the note
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Tags assigned to the note
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Description of the note
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_uri = $xpath->evaluate('/note/uri')->item(0)->nodeValue;
-        $this->_id = substr($this->_uri, strrpos($this->_uri, '=') + 1);
-        $this->_modDate = trim($xpath->evaluate('/note/modDate')->item(0)->nodeValue);
-        $this->_addDate = trim($xpath->evaluate('/note/addDate')->item(0)->nodeValue);
-        $this->_title = $xpath->evaluate('/note/title')->item(0)->nodeValue;
-        $this->_description = $xpath->evaluate('/note/description')->item(0)->nodeValue;
-
-        $list = $xpath->query('/note/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the note
-     *
-     * @see    ACCESSTYPE_PRIVATE
-     * @see    ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the ID of the note
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the URI of the note
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Returns the date of the last modification made to the note
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the note was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the note
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the tags assigned to the note
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the description assigned to the note
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/NoteSet.php b/airtime_mvc/library/Zend/Service/Simpy/NoteSet.php
deleted file mode 100644
index 8364133e0..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/NoteSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NoteSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_Note
- */
-require_once 'Zend/Service/Simpy/Note.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_NoteSet implements IteratorAggregate
-{
-    /**
-     * List of notes
-     *
-     * @var array of Zend_Service_Simpy_Note objects
-     */
-    protected $_notes;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetNotes operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//notes/note');
-        $this->_notes = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_notes[$x] = new Zend_Service_Simpy_Note($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the note set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_notes);
-    }
-
-    /**
-     * Returns the number of notes in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_notes);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/Tag.php b/airtime_mvc/library/Zend/Service/Simpy/Tag.php
deleted file mode 100644
index 58895cdd8..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/Tag.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Tag
-{
-    /**
-     * Name of the tag
-     *
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Number of links with the tag
-     *
-     * @var int
-     */
-    protected $_count;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <tag> node from a parsed response from
-     *                       a GetTags operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_tag = $map->getNamedItem('name')->nodeValue;
-        $this->_count = $map->getNamedItem('count')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the tag
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * Returns the number of links with the tag
-     *
-     * @return int
-     */
-    public function getCount()
-    {
-        return $this->_count;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/TagSet.php b/airtime_mvc/library/Zend/Service/Simpy/TagSet.php
deleted file mode 100644
index 4d3cd59d6..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/TagSet.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_Tag
- */
-require_once 'Zend/Service/Simpy/Tag.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_TagSet implements IteratorAggregate
-{
-    /**
-     * List of tags
-     *
-     * @var array of Zend_Service_Simpy_Tag objects
-     */
-    protected $_tags;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetTags operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = new Zend_Service_Simpy_Tag($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the tag set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_tags);
-    }
-
-    /**
-     * Returns the number of tags in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_tags);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/Watchlist.php b/airtime_mvc/library/Zend/Service/Simpy/Watchlist.php
deleted file mode 100644
index 2abad9710..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/Watchlist.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Watchlist.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilterSet
- */
-require_once 'Zend/Service/Simpy/WatchlistFilterSet.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Watchlist
-{
-    /**
-     * Identifier for the watchlist
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * Name of the watchlist
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Description of the watchlist
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Timestamp for when the watchlist was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Number of new links in the watchlist
-     *
-     * @var int
-     */
-    protected $_newLinks;
-
-    /**
-     * List of usernames for users included in the watchlist
-     *
-     * @var array
-     */
-    protected $_users;
-
-    /**
-     * List of filters included in the watchlist
-     *
-     * @var Zend_Service_Simpy_WatchlistFilterSet
-     */
-    protected $_filters;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <watchlist> node from a parsed
-     *                       response from a GetWatchlists or GetWatchlist
-     *                       operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-
-        $this->_id = $map->getNamedItem('id')->nodeValue;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_description = $map->getNamedItem('description')->nodeValue;
-        $this->_addDate = $map->getNamedItem('addDate')->nodeValue;
-        $this->_newLinks = $map->getNamedItem('newLinks')->nodeValue;
-
-        $this->_users = array();
-        $this->_filters = new Zend_Service_Simpy_WatchlistFilterSet();
-
-        $childNode = $node->firstChild;
-        while ($childNode !== null) {
-            if ($childNode->nodeName == 'user') {
-                $this->_users[] = $childNode->attributes->getNamedItem('username')->nodeValue;
-            } elseif ($childNode->nodeName == 'filter') {
-                $filter = new Zend_Service_Simpy_WatchlistFilter($childNode);
-                $this->_filters->add($filter);
-            }
-            $childNode = $childNode->nextSibling;
-        }
-    }
-
-    /**
-     * Returns the identifier for the watchlist
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the name of the watchlist
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the description of the watchlist
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Returns a timestamp for when the watchlist was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the number of new links in the watchlist
-     *
-     * @return int
-     */
-    public function getNewLinks()
-    {
-        return $this->_newLinks;
-    }
-
-    /**
-     * Returns a list of usernames for users included in the watchlist
-     *
-     * @return array
-     */
-    public function getUsers()
-    {
-        return $this->_users;
-    }
-
-    /**
-     * Returns a list of filters included in the watchlist
-     *
-     * @return Zend_Service_Simpy_WatchlistFilterSet
-     */
-    public function getFilters()
-    {
-        return $this->_filters;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilter.php b/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilter.php
deleted file mode 100644
index 14a198158..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilter.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WatchlistFilter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilter
-{
-    /**
-     * Name of the filter
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Query for the filter
-     *
-     * @var string
-     */
-    protected $_query;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <filter> node from a parsed response from
-     *                       a GetWatchlists or GetWatchlist operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_query = $map->getNamedItem('query')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the filter
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the query for the filter
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilterSet.php b/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilterSet.php
deleted file mode 100644
index 391d15a13..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/WatchlistFilterSet.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WatchlistFilterSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilter
- */
-require_once 'Zend/Service/Simpy/WatchlistFilter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate
-{
-    /**
-     * List of filters in the set
-     *
-     * @var array of Zend_Service_Simpy_WatchlistFilter objects
-     */
-    protected $_filters = array();
-
-    /**
-     * Adds a filter to the set
-     *
-     * @param  Zend_Service_Simpy_WatchlistFilter $filter Filter to be added
-     * @return void
-     */
-    public function add(Zend_Service_Simpy_WatchlistFilter $filter)
-    {
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Returns an iterator for the watchlist filter set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_filters);
-    }
-
-    /**
-     * Returns the number of filters in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_filters);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Simpy/WatchlistSet.php b/airtime_mvc/library/Zend/Service/Simpy/WatchlistSet.php
deleted file mode 100644
index bfcdd9a13..000000000
--- a/airtime_mvc/library/Zend/Service/Simpy/WatchlistSet.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WatchlistSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Simpy_Watchlist
- */
-require_once 'Zend/Service/Simpy/Watchlist.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate
-{
-    /**
-     * List of watchlists
-     *
-     * @var array of Zend_Service_Simpy_Watchlist objects
-     */
-    protected $_watchlists = array();
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetWatchlists operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//watchlists/watchlist');
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_watchlists[$x] = new Zend_Service_Simpy_Watchlist($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the watchlist set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_watchlists);
-    }
-
-    /**
-     * Returns the number of watchlists in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_watchlists);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/SlideShare.php b/airtime_mvc/library/Zend/Service/SlideShare.php
deleted file mode 100644
index 424816afd..000000000
--- a/airtime_mvc/library/Zend/Service/SlideShare.php
+++ /dev/null
@@ -1,619 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SlideShare.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * Zend_Cache
- */
-require_once 'Zend/Cache.php';
-
-/**
- * Zend_Service_SlideShare_SlideShow
- */
-require_once 'Zend/Service/SlideShare/SlideShow.php';
-
-/**
- * The Zend_Service_SlideShare component is used to interface with the
- * slideshare.net web server to retrieve slide shows hosted on the web site for
- * display or other processing.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @throws     Zend_Service_SlideShare_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_SlideShare
-{
-
-    /**
-     * Web service result code mapping
-     */
-    const SERVICE_ERROR_BAD_APIKEY       = 1;
-    const SERVICE_ERROR_BAD_AUTH         = 2;
-    const SERVICE_ERROR_MISSING_TITLE    = 3;
-    const SERVICE_ERROR_MISSING_FILE     = 4;
-    const SERVICE_ERROR_EMPTY_TITLE      = 5;
-    const SERVICE_ERROR_NOT_SOURCEOBJ    = 6;
-    const SERVICE_ERROR_INVALID_EXT      = 7;
-    const SERVICE_ERROR_FILE_TOO_BIG     = 8;
-    const SERVICE_ERROR_SHOW_NOT_FOUND   = 9;
-    const SERVICE_ERROR_USER_NOT_FOUND   = 10;
-    const SERVICE_ERROR_GROUP_NOT_FOUND  = 11;
-    const SERVICE_ERROR_MISSING_TAG      = 12;
-    const SERVICE_ERROR_DAILY_LIMIT      = 99;
-    const SERVICE_ERROR_ACCOUNT_BLOCKED  = 100;
-
-    /**
-     * Slide share Web service communication URIs
-     */
-    const SERVICE_UPLOAD_URI                  = 'http://www.slideshare.net/api/1/upload_slideshow';
-    const SERVICE_GET_SHOW_URI                = 'http://www.slideshare.net/api/1/get_slideshow';
-    const SERVICE_GET_SHOW_BY_USER_URI        = 'http://www.slideshare.net/api/1/get_slideshow_by_user';
-    const SERVICE_GET_SHOW_BY_TAG_URI         = 'http://www.slideshare.net/api/1/get_slideshow_by_tag';
-    const SERVICE_GET_SHOW_BY_GROUP_URI       = 'http://www.slideshare.net/api/1/get_slideshows_from_group';
-
-    /**
-     * The MIME type of Slideshow files
-     *
-     */
-    const POWERPOINT_MIME_TYPE    = "application/vnd.ms-powerpoint";
-
-    /**
-     * The API key to use in requests
-     *
-     * @var string The API key
-     */
-    protected $_apiKey;
-
-    /**
-     * The shared secret to use in requests
-     *
-     * @var string the Shared secret
-     */
-    protected $_sharedSecret;
-
-    /**
-     * The username to use in requests
-     *
-     * @var string the username
-     */
-    protected $_username;
-
-    /**
-     * The password to use in requests
-     *
-     * @var string the password
-     */
-    protected $_password;
-
-    /**
-     * The HTTP Client object to use to perform requests
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_httpclient;
-
-    /**
-     * The Cache object to use to perform caching
-     *
-     * @var Zend_Cache_Core
-     */
-    protected $_cacheobject;
-
-    /**
-     * Sets the Zend_Http_Client object to use in requests. If not provided a default will
-     * be used.
-     *
-     * @param Zend_Http_Client $client The HTTP client instance to use
-     * @return Zend_Service_SlideShare
-     */
-    public function setHttpClient(Zend_Http_Client $client)
-    {
-        $this->_httpclient = $client;
-        return $this;
-    }
-
-    /**
-     * Returns the instance of the Zend_Http_Client which will be used. Creates an instance
-     * of Zend_Http_Client if no previous client was set.
-     *
-     * @return Zend_Http_Client The HTTP client which will be used
-     */
-    public function getHttpClient()
-    {
-
-        if(!($this->_httpclient instanceof Zend_Http_Client)) {
-            $client = new Zend_Http_Client();
-            $client->setConfig(array('maxredirects' => 2,
-                                     'timeout' => 5));
-
-            $this->setHttpClient($client);
-        }
-
-        $this->_httpclient->resetParameters();
-        return $this->_httpclient;
-    }
-
-    /**
-     * Sets the Zend_Cache object to use to cache the results of API queries
-     *
-     * @param Zend_Cache_Core $cacheobject The Zend_Cache object used
-     * @return Zend_Service_SlideShare
-     */
-    public function setCacheObject(Zend_Cache_Core $cacheobject)
-    {
-        $this->_cacheobject = $cacheobject;
-        return $this;
-    }
-
-    /**
-     * Gets the Zend_Cache object which will be used to cache API queries. If no cache object
-     * was previously set the the default will be used (Filesystem caching in /tmp with a life
-     * time of 43200 seconds)
-     *
-     * @return Zend_Cache_Core The object used in caching
-     */
-    public function getCacheObject()
-    {
-
-        if(!($this->_cacheobject instanceof Zend_Cache_Core)) {
-            $cache = Zend_Cache::factory('Core', 'File', array('lifetime' => 43200,
-                                                               'automatic_serialization' => true),
-                                                         array('cache_dir' => '/tmp'));
-
-            $this->setCacheObject($cache);
-        }
-
-        return $this->_cacheobject;
-    }
-
-    /**
-     * Returns the user name used for API calls
-     *
-     * @return string The username
-     */
-    public function getUserName()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Sets the user name to use for API calls
-     *
-     * @param string $un The username to use
-     * @return Zend_Service_SlideShare
-     */
-    public function setUserName($un)
-    {
-        $this->_username = $un;
-        return $this;
-    }
-
-    /**
-     * Gets the password to use in API calls
-     *
-     * @return string the password to use in API calls
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Sets the password to use in API calls
-     *
-     * @param string $pw The password to use
-     * @return Zend_Service_SlideShare
-     */
-    public function setPassword($pw)
-    {
-        $this->_password = (string)$pw;
-        return $this;
-    }
-
-    /**
-     * Gets the API key to be used in making API calls
-     *
-     * @return string the API Key
-     */
-    public function getApiKey()
-    {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Sets the API key to be used in making API calls
-     *
-     * @param string $key The API key to use
-     * @return Zend_Service_SlideShare
-     */
-    public function setApiKey($key)
-    {
-        $this->_apiKey = (string)$key;
-        return $this;
-    }
-
-    /**
-     * Gets the shared secret used in making API calls
-     *
-     * @return string the Shared secret
-     */
-    public function getSharedSecret()
-    {
-        return $this->_sharedSecret;
-    }
-
-    /**
-     * Sets the shared secret used in making API calls
-     *
-     * @param string $secret the shared secret
-     * @return Zend_Service_SlideShare
-     */
-    public function setSharedSecret($secret)
-    {
-        $this->_sharedSecret = (string)$secret;
-        return $this;
-    }
-
-    /**
-     * The Constructor
-     *
-     * @param string $apikey The API key
-     * @param string $sharedSecret The shared secret
-     * @param string $username The username
-     * @param string $password The password
-     */
-    public function __construct($apikey, $sharedSecret, $username = null, $password = null)
-    {
-        $this->setApiKey($apikey)
-             ->setSharedSecret($sharedSecret)
-             ->setUserName($username)
-             ->setPassword($password);
-
-        $this->_httpclient = new Zend_Http_Client();
-    }
-
-    /**
-     * Uploads the specified Slide show the the server
-     *
-     * @param Zend_Service_SlideShare_SlideShow $ss The slide show object representing the slide show to upload
-     * @param boolean $make_src_public Determines if the the slide show's source file is public or not upon upload
-     * @return Zend_Service_SlideShare_SlideShow The passed Slide show object, with the new assigned ID provided
-     */
-    public function uploadSlideShow(Zend_Service_SlideShare_SlideShow $ss, $make_src_public = true)
-    {
-
-        $timestamp = time();
-
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        'username' => $this->getUserName(),
-                        'password' => $this->getPassword(),
-                        'slideshow_title' => $ss->getTitle());
-
-        $description = $ss->getDescription();
-        $tags = $ss->getTags();
-
-        $filename = $ss->getFilename();
-
-        if(!file_exists($filename) || !is_readable($filename)) {
-            require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Specified Slideshow for upload not found or unreadable");
-        }
-
-        if(!empty($description)) {
-            $params['slideshow_description'] = $description;
-        } else {
-            $params['slideshow_description'] = "";
-        }
-
-        if(!empty($tags)) {
-            $tmp = array();
-            foreach($tags as $tag) {
-                $tmp[] = "\"$tag\"";
-            }
-            $params['slideshow_tags'] = implode(' ', $tmp);
-        } else {
-            $params['slideshow_tags'] = "";
-        }
-
-
-        $client = $this->getHttpClient();
-        $client->setUri(self::SERVICE_UPLOAD_URI);
-        $client->setParameterPost($params);
-        $client->setFileUpload($filename, "slideshow_srcfile");
-
-        require_once 'Zend/Http/Client/Exception.php';
-        try {
-            $response = $client->request('POST');
-        } catch(Zend_Http_Client_Exception $e) {
-            require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
-        }
-
-        $sxe = simplexml_load_string($response->getBody());
-
-        if($sxe->getName() == "SlideShareServiceError") {
-            $message = (string)$sxe->Message[0];
-            list($code, $error_str) = explode(':', $message);
-            require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
-        }
-
-        if(!$sxe->getName() == "SlideShowUploaded") {
-            require_once 'Zend/Service/SlideShare/Exception.php';
-            throw new Zend_Service_SlideShare_Exception("Unknown XML Respons Received");
-        }
-
-        $ss->setId((int)(string)$sxe->SlideShowID);
-
-        return $ss;
-    }
-
-    /**
-     * Retrieves a slide show's information based on slide show ID
-     *
-     * @param int $ss_id The slide show ID
-     * @return Zend_Service_SlideShare_SlideShow the Slideshow object
-     */
-    public function getSlideShow($ss_id)
-    {
-        $timestamp = time();
-
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        'slideshow_id' => $ss_id);
-
-        $cache = $this->getCacheObject();
-
-        $cache_key = md5("__zendslideshare_cache_$ss_id");
-
-        if(!$retval = $cache->load($cache_key)) {
-            $client = $this->getHttpClient();
-
-            $client->setUri(self::SERVICE_GET_SHOW_URI);
-            $client->setParameterPost($params);
-
-            require_once 'Zend/Http/Client/Exception.php';
-            try {
-                $response = $client->request('POST');
-            } catch(Zend_Http_Client_Exception $e) {
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
-            }
-
-            $sxe = simplexml_load_string($response->getBody());
-
-            if($sxe->getName() == "SlideShareServiceError") {
-                $message = (string)$sxe->Message[0];
-                list($code, $error_str) = explode(':', $message);
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
-            }
-
-            if(!$sxe->getName() == 'Slideshows') {
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception('Unknown XML Repsonse Received');
-            }
-
-            $retval = $this->_slideShowNodeToObject(clone $sxe->Slideshow[0]);
-
-            $cache->save($retval, $cache_key);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Retrieves an array of slide shows for a given username
-     *
-     * @param string $username The username to retrieve slide shows from
-     * @param int $offset The offset of the list to start retrieving from
-     * @param int $limit The maximum number of slide shows to retrieve
-     * @return array An array of Zend_Service_SlideShare_SlideShow objects
-     */
-    public function getSlideShowsByUsername($username, $offset = null, $limit = null)
-    {
-        return $this->_getSlideShowsByType('username_for', $username, $offset, $limit);
-    }
-
-    /**
-     * Retrieves an array of slide shows based on tag
-     *
-     * @param string $tag The tag to retrieve slide shows with
-     * @param int $offset The offset of the list to start retrieving from
-     * @param int $limit The maximum number of slide shows to retrieve
-     * @return array An array of Zend_Service_SlideShare_SlideShow objects
-     */
-    public function getSlideShowsByTag($tag, $offset = null, $limit = null)
-    {
-
-        if(is_array($tag)) {
-            $tmp = array();
-            foreach($tag as $t) {
-                $tmp[] = "\"$t\"";
-            }
-
-            $tag = implode(" ", $tmp);
-        }
-
-        return $this->_getSlideShowsByType('tag', $tag, $offset, $limit);
-    }
-
-    /**
-     * Retrieves an array of slide shows based on group name
-     *
-     * @param string $group The group name to retrieve slide shows for
-     * @param int $offset The offset of the list to start retrieving from
-     * @param int $limit The maximum number of slide shows to retrieve
-     * @return array An array of Zend_Service_SlideShare_SlideShow objects
-     */
-    public function getSlideShowsByGroup($group, $offset = null, $limit = null)
-    {
-        return $this->_getSlideShowsByType('group_name', $group, $offset, $limit);
-    }
-
-    /**
-     * Retrieves Zend_Service_SlideShare_SlideShow object arrays based on the type of
-     * list desired
-     *
-     * @param string $key The type of slide show object to retrieve
-     * @param string $value The specific search query for the slide show type to look up
-     * @param int $offset The offset of the list to start retrieving from
-     * @param int $limit The maximum number of slide shows to retrieve
-     * @return array An array of Zend_Service_SlideShare_SlideShow objects
-     */
-    protected function _getSlideShowsByType($key, $value, $offset = null, $limit = null)
-    {
-
-        $key = strtolower($key);
-
-        switch($key) {
-            case 'username_for':
-                $responseTag = 'User';
-                $queryUri = self::SERVICE_GET_SHOW_BY_USER_URI;
-                break;
-            case 'group_name':
-                $responseTag = 'Group';
-                $queryUri = self::SERVICE_GET_SHOW_BY_GROUP_URI;
-                break;
-            case 'tag':
-                $responseTag = 'Tag';
-                $queryUri = self::SERVICE_GET_SHOW_BY_TAG_URI;
-                break;
-            default:
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Invalid SlideShare Query");
-        }
-
-        $timestamp = time();
-
-        $params = array('api_key' => $this->getApiKey(),
-                        'ts' => $timestamp,
-                        'hash' => sha1($this->getSharedSecret().$timestamp),
-                        $key => $value);
-
-        if($offset !== null) {
-            $params['offset'] = (int)$offset;
-        }
-
-        if($limit !== null) {
-            $params['limit'] = (int)$limit;
-        }
-
-        $cache = $this->getCacheObject();
-
-        $cache_key = md5($key.$value.$offset.$limit);
-
-        if(!$retval = $cache->load($cache_key)) {
-
-            $client = $this->getHttpClient();
-
-            $client->setUri($queryUri);
-            $client->setParameterPost($params);
-
-            require_once 'Zend/Http/Client/Exception.php';
-            try {
-                $response = $client->request('POST');
-            } catch(Zend_Http_Client_Exception $e) {
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e);
-            }
-
-            $sxe = simplexml_load_string($response->getBody());
-
-            if($sxe->getName() == "SlideShareServiceError") {
-                $message = (string)$sxe->Message[0];
-                list($code, $error_str) = explode(':', $message);
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception(trim($error_str), $code);
-            }
-
-            if(!$sxe->getName() == $responseTag) {
-                require_once 'Zend/Service/SlideShare/Exception.php';
-                throw new Zend_Service_SlideShare_Exception('Unknown or Invalid XML Repsonse Received');
-            }
-
-            $retval = array();
-
-            foreach($sxe->children() as $node) {
-                if($node->getName() == 'Slideshow') {
-                    $retval[] = $this->_slideShowNodeToObject($node);
-                }
-            }
-
-            $cache->save($retval, $cache_key);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Converts a SimpleXMLElement object representing a response from the service
-     * into a Zend_Service_SlideShare_SlideShow object
-     *
-     * @param SimpleXMLElement $node The input XML from the slideshare.net service
-     * @return Zend_Service_SlideShare_SlideShow The resulting object
-     */
-    protected function _slideShowNodeToObject(SimpleXMLElement $node)
-    {
-
-        if($node->getName() == 'Slideshow') {
-
-            $ss = new Zend_Service_SlideShare_SlideShow();
-
-            $ss->setId((string)$node->ID);
-            $ss->setDescription((string)$node->Description);
-            $ss->setEmbedCode((string)$node->EmbedCode);
-            $ss->setNumViews((string)$node->Views);
-            $ss->setPermaLink((string)$node->Permalink);
-            $ss->setStatus((string)$node->Status);
-            $ss->setStatusDescription((string)$node->StatusDescription);
-
-            foreach(explode(",", (string)$node->Tags) as $tag) {
-
-                if(!in_array($tag, $ss->getTags())) {
-                    $ss->addTag($tag);
-                }
-            }
-
-            $ss->setThumbnailUrl((string)$node->Thumbnail);
-            $ss->setTitle((string)$node->Title);
-            $ss->setLocation((string)$node->Location);
-            $ss->setTranscript((string)$node->Transcript);
-
-            return $ss;
-
-        }
-
-        require_once 'Zend/Service/SlideShare/Exception.php';
-        throw new Zend_Service_SlideShare_Exception("Was not provided the expected XML Node for processing");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/SlideShare/Exception.php b/airtime_mvc/library/Zend/Service/SlideShare/Exception.php
deleted file mode 100644
index ab47eba95..000000000
--- a/airtime_mvc/library/Zend/Service/SlideShare/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_SlideShare_Exception extends Zend_Service_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/SlideShare/SlideShow.php b/airtime_mvc/library/Zend/Service/SlideShare/SlideShow.php
deleted file mode 100644
index e2164e675..000000000
--- a/airtime_mvc/library/Zend/Service/SlideShare/SlideShow.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SlideShow.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * The Zend_Service_SlideShare_SlideShow class represents a slide show on the
- * slideshare.net servers.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage SlideShare
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_SlideShare_SlideShow
-{
-
-    /**
-     * Status constant mapping for web service
-     *
-     */
-    const STATUS_QUEUED = 0;
-    const STATUS_PROCESSING = 1;
-    const STATUS_READY = 2;
-    const STATUS_FAILED = 3;
-
-    /**
-     * The HTML code to embed the slide show in a web page
-     *
-     * @var string the HTML to embed the slide show
-     */
-    protected $_embedCode;
-
-    /**
-     * The URI for the thumbnail representation of the slide show
-     *
-     * @var string The URI of a thumbnail image
-     */
-    protected $_thumbnailUrl;
-
-    /**
-     * The title of the slide show
-     *
-     * @var string The slide show title
-     */
-    protected $_title;
-
-    /**
-     * The Description of the slide show
-     *
-     * @var string The slide show description
-     */
-    protected $_description;
-
-    /**
-     * The status of the silde show on the server
-     *
-     * @var int The Slide show status code
-     */
-    protected $_status;
-
-    /**
-     * The Description of the slide show status code
-     *
-     * @var string The status description
-     */
-    protected $_statusDescription;
-
-    /**
-     * The Permanent link for the slide show
-     *
-     * @var string the Permalink for the slide show
-     */
-    protected $_permalink;
-
-    /**
-     * The number of views this slide show has received
-     *
-     * @var int the number of views
-     */
-    protected $_numViews;
-
-    /**
-     * The ID of the slide show on the server
-     *
-     * @var int the Slide show ID number on the server
-     */
-    protected $_slideShowId;
-
-    /**
-     * A slide show filename on the local filesystem (when uploading)
-     *
-     * @var string the local filesystem path & file of the slide show to upload
-     */
-    protected $_slideShowFilename;
-
-    /**
-     * An array of tags associated with the slide show
-     *
-     * @var array An array of tags associated with the slide show
-     */
-    protected $_tags = array();
-
-    /**
-     * The location of the slide show
-     *
-     * @var string the Location
-     */
-    protected $_location;
-
-    /**
-     * The transcript associated with the slide show
-     *
-     * @var string the Transscript
-     */
-    protected $_transcript;
-
-
-    /**
-     * Retrieves the location of the slide show
-     *
-     * @return string the Location
-     */
-    public function getLocation()
-    {
-        return $this->_location;
-    }
-
-    /**
-     * Sets the location of the slide show
-     *
-     * @param string $loc The location to use
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setLocation($loc)
-    {
-        $this->_location = (string)$loc;
-        return $this;
-    }
-
-    /**
-     * Gets the transcript for this slide show
-     *
-     * @return string the Transcript
-     */
-    public function getTranscript()
-    {
-        return $this->_transcript;
-    }
-
-    /**
-     * Sets the transcript for this slide show
-     *
-     * @param string $t The transcript
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setTranscript($t)
-    {
-        $this->_transcript = (string)$t;
-        return $this;
-    }
-
-    /**
-     * Adds a tag to the slide show
-     *
-     * @param string $tag The tag to add
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function addTag($tag)
-    {
-        $this->_tags[] = (string)$tag;
-        return $this;
-    }
-
-    /**
-     * Sets the tags for the slide show
-     *
-     * @param array $tags An array of tags to set
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setTags(Array $tags)
-    {
-        $this->_tags = $tags;
-        return $this;
-    }
-
-    /**
-     * Gets all of the tags associated with the slide show
-     *
-     * @return array An array of tags for the slide show
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Sets the filename on the local filesystem of the slide show
-     * (for uploading a new slide show)
-     *
-     * @param string $file The full path & filename to the slide show
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setFilename($file)
-    {
-        $this->_slideShowFilename = (string)$file;
-        return $this;
-    }
-
-    /**
-     * Retrieves the filename on the local filesystem of the slide show
-     * which will be uploaded
-     *
-     * @return string The full path & filename to the slide show
-     */
-    public function getFilename()
-    {
-        return $this->_slideShowFilename;
-    }
-
-    /**
-     * Sets the ID for the slide show
-     *
-     * @param int $id The slide show ID
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setId($id)
-    {
-        $this->_slideShowId = (string)$id;
-        return $this;
-    }
-
-    /**
-     * Gets the ID for the slide show
-     *
-     * @return int The slide show ID
-     */
-    public function getId()
-    {
-        return $this->_slideShowId;
-    }
-
-    /**
-     * Sets the HTML embed code for the slide show
-     *
-     * @param string $code The HTML embed code
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setEmbedCode($code)
-    {
-        $this->_embedCode = (string)$code;
-        return $this;
-    }
-
-    /**
-     * Retrieves the HTML embed code for the slide show
-     *
-     * @return string the HTML embed code
-     */
-    public function getEmbedCode()
-    {
-        return $this->_embedCode;
-    }
-
-    /**
-     * Sets the Thumbnail URI for the slide show
-     *
-     * @param string $url The URI for the thumbnail image
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setThumbnailUrl($url)
-    {
-        $this->_thumbnailUrl = (string) $url;
-        return $this;
-    }
-
-    /**
-     * Retrieves the Thumbnail URi for the slide show
-     *
-     * @return string The URI for the thumbnail image
-     */
-    public function getThumbnailUrl()
-    {
-        return $this->_thumbnailUrl;
-    }
-
-    /**
-     * Sets the title for the Slide show
-     *
-     * @param string $title The slide show title
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setTitle($title)
-    {
-        $this->_title = (string)$title;
-        return $this;
-    }
-
-    /**
-     * Retrieves the Slide show title
-     *
-     * @return string the Slide show title
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Sets the description for the Slide show
-     *
-     * @param strign $desc The description of the slide show
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setDescription($desc)
-    {
-        $this->_description = (string)$desc;
-        return $this;
-    }
-
-    /**
-     * Gets the description of the slide show
-     *
-     * @return string The slide show description
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Sets the numeric status of the slide show on the server
-     *
-     * @param int $status The numeric status on the server
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setStatus($status)
-    {
-        $this->_status = (int)$status;
-        return $this;
-    }
-
-    /**
-     * Gets the numeric status of the slide show on the server
-     *
-     * @return int A Zend_Service_SlideShare_SlideShow Status constant
-     */
-    public function getStatus()
-    {
-        return $this->_status;
-    }
-
-    /**
-     * Sets the textual description of the status of the slide show on the server
-     *
-     * @param string $desc The textual description of the status of the slide show
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setStatusDescription($desc)
-    {
-        $this->_statusDescription = (string)$desc;
-        return $this;
-    }
-
-    /**
-     * Gets the textual description of the status of the slide show on the server
-     *
-     * @return string the textual description of the service
-     */
-    public function getStatusDescription()
-    {
-        return $this->_statusDescription;
-    }
-
-    /**
-     * Sets the permanent link of the slide show
-     *
-     * @param string $url The permanent URL for the slide show
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setPermaLink($url)
-    {
-        $this->_permalink = (string)$url;
-        return $this;
-    }
-
-    /**
-     * Gets the permanent link of the slide show
-     *
-     * @return string the permanent URL for the slide show
-     */
-    public function getPermaLink()
-    {
-        return $this->_permalink;
-    }
-
-    /**
-     * Sets the number of views the slide show has received
-     *
-     * @param int $views The number of views
-     * @return Zend_Service_SlideShare_SlideShow
-     */
-    public function setNumViews($views)
-    {
-        $this->_numViews = (int)$views;
-        return $this;
-    }
-
-    /**
-     * Gets the number of views the slide show has received
-     *
-     * @return int The number of views
-     */
-    public function getNumViews()
-    {
-        return $this->_numViews;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron.php b/airtime_mvc/library/Zend/Service/StrikeIron.php
deleted file mode 100644
index e9fb850f0..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StrikeIron.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * This class allows StrikeIron authentication credentials to be specified
- * in one place and provides a factory for returning instances of different
- * StrikeIron service classes.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron
-{
-    /**
-     * Options to pass to Zend_Service_StrikeIron_Base constructor
-     * @param array
-     */
-    protected $_options;
-
-    /**
-     * Class constructor
-     *
-     * @param array  $options  Options to pass to Zend_Service_StrikeIron_Base constructor
-     */
-    public function __construct($options = array())
-    {
-        $this->_options = $options;
-    }
-
-    /**
-     * Factory method to return a preconfigured Zend_Service_StrikeIron_*
-     * instance.
-     *
-     * @param  null|string  $options  Service options
-     * @return object       Zend_Service_StrikeIron_* instance
-     * @throws Zend_Service_StrikeIron_Exception
-     */
-    public function getService($options = array())
-    {
-        $class = isset($options['class']) ? $options['class'] : 'Base';
-        unset($options['class']);
-
-        if (strpos($class, '_') === false) {
-            $class = "Zend_Service_StrikeIron_{$class}";
-        }
-
-        try {
-            if (!class_exists($class)) {
-                require_once 'Zend/Loader.php';
-                @Zend_Loader::loadClass($class);
-            }
-            if (!class_exists($class, false)) {
-                throw new Exception('Class file not found');
-            }
-        } catch (Exception $e) {
-            $msg = "Service '$class' could not be loaded: " . $e->getMessage();
-            /**
-             * @see Zend_Service_StrikeIron_Exception
-             */
-            require_once 'Zend/Service/StrikeIron/Exception.php';
-            throw new Zend_Service_StrikeIron_Exception($msg, $e->getCode(), $e);
-        }
-
-        // instantiate and return the service
-        $service = new $class(array_merge($this->_options, $options));
-        return $service;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/Base.php b/airtime_mvc/library/Zend/Service/StrikeIron/Base.php
deleted file mode 100644
index 455feeb11..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/Base.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_StrikeIron_Decorator
- */
-require_once 'Zend/Service/StrikeIron/Decorator.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_Base
-{
-    /**
-     * Configuration options
-     * @param array
-     */
-    protected $_options = array('username' => null,
-                                'password' => null,
-                                'client'   => null,
-                                'options'  => null,
-                                'headers'  => null,
-                                'wsdl'     => null);
-
-    /**
-     * Output headers returned by the last call to SOAPClient->__soapCall()
-     * @param array
-     */
-    protected $_outputHeaders = array();
-
-    /**
-     * Class constructor
-     *
-     * @param  array  $options  Key/value pair options
-     * @throws Zend_Service_StrikeIron_Exception
-     */
-    public function __construct($options = array())
-    {
-        if (!extension_loaded('soap')) {
-            /**
-             * @see Zend_Service_StrikeIron_Exception
-             */
-            require_once 'Zend/Service/StrikeIron/Exception.php';
-            throw new Zend_Service_StrikeIron_Exception('SOAP extension is not enabled');
-        }
-
-        $this->_options  = array_merge($this->_options, $options);
-
-        $this->_initSoapHeaders();
-        $this->_initSoapClient();
-    }
-
-    /**
-     * Proxy method calls to the SOAPClient instance, transforming method
-     * calls and responses for convenience.
-     *
-     * @param  string  $method  Method name
-     * @param  array   $params  Parameters for method
-     * @return mixed            Result
-     * @throws Zend_Service_StrikeIron_Exception
-     */
-    public function __call($method, $params)
-    {
-        // prepare method name and parameters for soap call
-        list($method, $params) = $this->_transformCall($method, $params);
-        $params = isset($params[0]) ? array($params[0]) : array();
-
-        // make soap call, capturing the result and output headers
-        try {
-            $result = $this->_options['client']->__soapCall($method,
-                                                            $params,
-                                                            $this->_options['options'],
-                                                            $this->_options['headers'],
-                                                            $this->_outputHeaders);
-        } catch (Exception $e) {
-            $message = get_class($e) . ': ' . $e->getMessage();
-            /**
-             * @see Zend_Service_StrikeIron_Exception
-             */
-            require_once 'Zend/Service/StrikeIron/Exception.php';
-            throw new Zend_Service_StrikeIron_Exception($message, $e->getCode(), $e);
-        }
-
-        // transform/decorate the result and return it
-        $result = $this->_transformResult($result, $method, $params);
-        return $result;
-    }
-
-    /**
-     * Initialize the SOAPClient instance
-     *
-     * @return void
-     */
-    protected function _initSoapClient()
-    {
-        if (! isset($this->_options['options'])) {
-            $this->_options['options'] = array();
-        }
-
-        if (! isset($this->_options['client'])) {
-            $this->_options['client'] = new SoapClient($this->_options['wsdl'],
-                                                       $this->_options['options']);
-        }
-    }
-
-    /**
-     * Initialize the headers to pass to SOAPClient->__soapCall()
-     *
-     * @return void
-     * @throws Zend_Service_StrikeIron_Exception
-     */
-    protected function _initSoapHeaders()
-    {
-        // validate headers and check if LicenseInfo was given
-        $foundLicenseInfo = false;
-        if (isset($this->_options['headers'])) {
-            if (! is_array($this->_options['headers'])) {
-                $this->_options['headers'] = array($this->_options['headers']);
-            }
-
-            foreach ($this->_options['headers'] as $header) {
-                if (! $header instanceof SoapHeader) {
-                    /**
-                     * @see Zend_Service_StrikeIron_Exception
-                     */
-                    require_once 'Zend/Service/StrikeIron/Exception.php';
-                    throw new Zend_Service_StrikeIron_Exception('Header must be instance of SoapHeader');
-                } else if ($header->name == 'LicenseInfo') {
-                    $foundLicenseInfo = true;
-                    break;
-                }
-            }
-        } else {
-            $this->_options['headers'] = array();
-        }
-
-        // add default LicenseInfo header if a custom one was not supplied
-        if (! $foundLicenseInfo) {
-            $this->_options['headers'][] = new SoapHeader('http://ws.strikeiron.com',
-                            'LicenseInfo',
-                            array('RegisteredUser' => array('UserID'   => $this->_options['username'],
-                                                            'Password' => $this->_options['password'])));
-        }
-    }
-
-    /**
-     * Transform a method name or method parameters before sending them
-     * to the remote service.  This can be useful for inflection or other
-     * transforms to give the method call a more PHP-like interface.
-     *
-     * @see    __call()
-     * @param  string  $method  Method name called from PHP
-     * @param  mixed   $param   Parameters passed from PHP
-     * @return array            [$method, $params] for SOAPClient->__soapCall()
-     */
-    protected function _transformCall($method, $params)
-    {
-        return array(ucfirst($method), $params);
-    }
-
-    /**
-     * Transform the result returned from a method before returning
-     * it to the PHP caller.  This can be useful for transforming
-     * the SOAPClient returned result to be more PHP-like.
-     *
-     * The $method name and $params passed to the method are provided to
-     * allow decisions to be made about how to transform the result based
-     * on what was originally called.
-     *
-     * @see    __call()
-     * @param  $result  Raw result returned from SOAPClient_>__soapCall()
-     * @param  $method  Method name that was passed to SOAPClient->__soapCall()
-     * @param  $params  Method parameters that were passed to SOAPClient->__soapCall()
-     * @return mixed    Transformed result
-     */
-    protected function _transformResult($result, $method, $params)
-    {
-        $resultObjectName = "{$method}Result";
-        if (isset($result->$resultObjectName)) {
-            $result = $result->$resultObjectName;
-        }
-        if (is_object($result)) {
-            $result = new Zend_Service_StrikeIron_Decorator($result, $resultObjectName);
-        }
-        return $result;
-    }
-
-    /**
-     * Get the WSDL URL for this service.
-     *
-     * @return string
-     */
-    public function getWsdl()
-    {
-        return $this->_options['wsdl'];
-    }
-
-    /**
-     * Get the SOAP Client instance for this service.
-     */
-    public function getSoapClient()
-    {
-        return $this->_options['client'];
-    }
-
-    /**
-     * Get the StrikeIron output headers returned with the last method response.
-     *
-     * @return array
-     */
-    public function getLastOutputHeaders()
-    {
-        return $this->_outputHeaders;
-    }
-
-    /**
-     * Get the StrikeIron subscription information for this service.
-     * If any service method was recently called, the subscription info
-     * should have been returned in the SOAP headers so it is cached
-     * and returned from the cache.  Otherwise, the getRemainingHits()
-     * method is called as a dummy to get the subscription info headers.
-     *
-     * @param  boolean  $now          Force a call to getRemainingHits instead of cache?
-     * @param  string   $queryMethod  Method that will cause SubscriptionInfo header to be sent
-     * @return Zend_Service_StrikeIron_Decorator  Decorated subscription info
-     * @throws Zend_Service_StrikeIron_Exception
-     */
-    public function getSubscriptionInfo($now = false, $queryMethod = 'GetRemainingHits')
-    {
-        if ($now || empty($this->_outputHeaders['SubscriptionInfo'])) {
-            $this->$queryMethod();
-        }
-
-        // capture subscription info if returned in output headers
-        if (isset($this->_outputHeaders['SubscriptionInfo'])) {
-            $info = (object)$this->_outputHeaders['SubscriptionInfo'];
-            $subscriptionInfo = new Zend_Service_StrikeIron_Decorator($info, 'SubscriptionInfo');
-        } else {
-            $msg = 'No SubscriptionInfo header found in last output headers';
-            /**
-             * @see Zend_Service_StrikeIron_Exception
-             */
-            require_once 'Zend/Service/StrikeIron/Exception.php';
-            throw new Zend_Service_StrikeIron_Exception($msg);
-        }
-
-        return $subscriptionInfo;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/Decorator.php b/airtime_mvc/library/Zend/Service/StrikeIron/Decorator.php
deleted file mode 100644
index f74fb7cbc..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/Decorator.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Decorator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Decorates a StrikeIron response object returned by the SOAP extension
- * to provide more a PHP-like interface.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_Decorator
-{
-    /**
-     * Name of the decorated object
-     * @var null|string
-     */
-    protected $_name = null;
-
-    /**
-     * Object to decorate
-     * @var object
-     */
-    protected $_object = null;
-
-    /**
-     * Class constructor
-     *
-     * @param object       $object  Object to decorate
-     * @param null|string  $name    Name of the object
-     */
-    public function __construct($object, $name = null)
-    {
-        $this->_object = $object;
-        $this->_name   = $name;
-    }
-
-    /**
-     * Proxy property access to the decorated object, inflecting
-     * the property name and decorating any child objects returned.
-     * If the property is not found in the decorated object, return
-     * NULL as a convenience feature to avoid notices.
-     *
-     * @param  string $property  Property name to retrieve
-     * @return mixed             Value of property or NULL
-     */
-    public function __get($property)
-    {
-        $result = null;
-
-        if (! isset($this->_object->$property)) {
-            $property = $this->_inflect($property);
-        }
-
-        if (isset($this->_object->$property)) {
-            $result = $this->_object->$property;
-            $result = $this->_decorate($result);
-        }
-        return $result;
-    }
-
-    /**
-     * Proxy method calls to the decorated object.  This will only
-     * be used when the SOAPClient returns a custom PHP object via
-     * its classmap option so no inflection is done.
-     *
-     * @param string  $method  Name of method called
-     * @param array   $args    Arguments for method
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->_object, $method), $args);
-    }
-
-    /**
-     * Inflect a property name from PHP-style to the result object's
-     * style.  The default implementation here only inflects the case
-     * of the first letter, e.g. from "fooBar" to "FooBar".
-     *
-     * @param  string $property  Property name to inflect
-     * @return string            Inflected property name
-     */
-    protected function _inflect($property)
-    {
-        return ucfirst($property);
-    }
-
-    /**
-     * Decorate a value returned by the result object.  The default
-     * implementation here only decorates child objects.
-     *
-     * @param  mixed  $result  Value to decorate
-     * @return mixed           Decorated result
-     */
-    protected function _decorate($result)
-    {
-        if (is_object($result)) {
-            $result = new self($result);
-        }
-        return $result;
-    }
-
-    /**
-     * Return the object being decorated
-     *
-     * @return object
-     */
-    public function getDecoratedObject()
-    {
-        return $this->_object;
-    }
-
-    /**
-     * Return the name of the object being decorated
-     *
-     * @return null|string
-     */
-    public function getDecoratedObjectName()
-    {
-        return $this->_name;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/Exception.php b/airtime_mvc/library/Zend/Service/StrikeIron/Exception.php
deleted file mode 100644
index 76b6e8306..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/airtime_mvc/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
deleted file mode 100644
index 705fa8206..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SalesUseTaxBasic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Service_StrikeIron_Base */
-require_once 'Zend/Service/StrikeIron/Base.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_SalesUseTaxBasic extends Zend_Service_StrikeIron_Base
-{
-    /**
-     * Configuration options
-     * @param array
-     */
-    protected $_options = array('username' => null,
-                                'password' => null,
-                                'client'   => null,
-                                'options'  => null,
-                                'headers'  => null,
-                                'wsdl'     => 'http://ws.strikeiron.com/zf1.StrikeIron/taxdatabasic4?WSDL');
-}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/USAddressVerification.php b/airtime_mvc/library/Zend/Service/StrikeIron/USAddressVerification.php
deleted file mode 100644
index 4778f8384..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/USAddressVerification.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: USAddressVerification.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Service_StrikeIron_Base */
-require_once 'Zend/Service/StrikeIron/Base.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_USAddressVerification extends Zend_Service_StrikeIron_Base
-{
-    /**
-     * Configuration options
-     * @param array
-     */
-    protected $_options = array('username' => null,
-                                'password' => null,
-                                'client'   => null,
-                                'options'  => null,
-                                'headers'  => null,
-                                'wsdl'     => 'http://ws.strikeiron.com/zf1.StrikeIron/USAddressVerification4_0?WSDL');
-}
diff --git a/airtime_mvc/library/Zend/Service/StrikeIron/ZipCodeInfo.php b/airtime_mvc/library/Zend/Service/StrikeIron/ZipCodeInfo.php
deleted file mode 100644
index 7e7035267..000000000
--- a/airtime_mvc/library/Zend/Service/StrikeIron/ZipCodeInfo.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ZipCodeInfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Service_StrikeIron_Base */
-require_once 'Zend/Service/StrikeIron/Base.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage StrikeIron
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_StrikeIron_ZipCodeInfo extends Zend_Service_StrikeIron_Base
-{
-    /**
-     * Configuration options
-     * @param array
-     */
-    protected $_options = array('username' => null,
-                                'password' => null,
-                                'client'   => null,
-                                'options'  => null,
-                                'headers'  => null,
-                                'wsdl'     => 'http://sdpws.strikeiron.com/zf1.StrikeIron/sdpZIPCodeInfo?WSDL');
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati.php b/airtime_mvc/library/Zend/Service/Technorati.php
deleted file mode 100644
index d92e80278..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati.php
+++ /dev/null
@@ -1,1028 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Technorati.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Service_Technorati provides an easy, intuitive and object-oriented interface
- * for using the Technorati API.
- *
- * It provides access to all available Technorati API queries
- * and returns the original XML response as a friendly PHP object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati
-{
-    /** Base Technorati API URI */
-    const API_URI_BASE = 'http://api.technorati.com';
-
-    /** Query paths */
-    const API_PATH_COSMOS           = '/cosmos';
-    const API_PATH_SEARCH           = '/search';
-    const API_PATH_TAG              = '/tag';
-    const API_PATH_DAILYCOUNTS      = '/dailycounts';
-    const API_PATH_TOPTAGS          = '/toptags';
-    const API_PATH_BLOGINFO         = '/bloginfo';
-    const API_PATH_BLOGPOSTTAGS     = '/blogposttags';
-    const API_PATH_GETINFO          = '/getinfo';
-    const API_PATH_KEYINFO          = '/keyinfo';
-
-    /** Prevent magic numbers */
-    const PARAM_LIMIT_MIN_VALUE = 1;
-    const PARAM_LIMIT_MAX_VALUE = 100;
-    const PARAM_DAYS_MIN_VALUE  = 1;
-    const PARAM_DAYS_MAX_VALUE  = 180;
-    const PARAM_START_MIN_VALUE = 1;
-
-
-    /**
-     * Technorati API key
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_apiKey;
-
-    /**
-     * Zend_Rest_Client instance
-     *
-     * @var     Zend_Rest_Client
-     * @access  protected
-     */
-    protected $_restClient;
-
-
-    /**
-     * Constructs a new Zend_Service_Technorati instance
-     * and setup character encoding.
-     *
-     * @param  string $apiKey  Your Technorati API key
-     */
-    public function __construct($apiKey)
-    {
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
-        $this->_apiKey = $apiKey;
-    }
-
-
-    /**
-     * Cosmos query lets you see what blogs are linking to a given URL.
-     *
-     * On the Technorati site, you can enter a URL in the searchbox and
-     * it will return a list of blogs linking to it.
-     * The API version allows more features and gives you a way
-     * to use the cosmos on your own site.
-     *
-     * Query options include:
-     *
-     * 'type'       => (link|weblog)
-     *      optional - A value of link returns the freshest links referencing your target URL.
-     *      A value of weblog returns the last set of unique weblogs referencing your target URL.
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'current'    => (true|false)
-     *      optional - the default setting of true
-     *      Technorati returns links that are currently on a weblog's homepage.
-     *      Set this parameter to false if you would like to receive all links
-     *      to the given URL regardless of their current placement on the source blog.
-     *      Internally the value is converted in (yes|no).
-     * 'claim'      => (true|false)
-     *      optional - the default setting of FALSE returns no user information
-     *      about each weblog included in the result set when available.
-     *      Set this parameter to FALSE to include Technorati member data
-     *      in the result set when a weblog in your result set
-     *      has been successfully claimed by a member of Technorati.
-     *      Internally the value is converted in (int).
-     * 'highlight'  => (true|false)
-     *      optional - the default setting of TRUE
-     *      highlights the citation of the given URL within the weblog excerpt.
-     *      Set this parameter to FALSE to apply no special markup to the blog excerpt.
-     *      Internally the value is converted in (int).
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_CosmosResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/cosmos.html Technorati API: Cosmos Query reference
-     */
-    public function cosmos($url, $options = null)
-    {
-        static $defaultOptions = array( 'type'      => 'link',
-                                        'start'     => 1,
-                                        'limit'     => 20,
-                                        'current'   => 'yes',
-                                        'format'    => 'xml',
-                                        'claim'     => 0,
-                                        'highlight' => 1,
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateCosmos($options);
-        $response = $this->_makeRequest(self::API_PATH_COSMOS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_CosmosResultSet
-         */
-        require_once 'Zend/Service/Technorati/CosmosResultSet.php';
-        return new Zend_Service_Technorati_CosmosResultSet($dom, $options);
-    }
-
-    /**
-     * Search lets you see what blogs contain a given search string.
-     *
-     * Query options include:
-     *
-     * 'language'   => (string)
-     *      optional - a ISO 639-1 two character language code
-     *      to retrieve results specific to that language.
-     *      This feature is currently beta and may not work for all languages.
-     * 'authority'  => (n|a1|a4|a7)
-     *      optional - filter results to those from blogs with at least
-     *      the Technorati Authority specified.
-     *      Technorati calculates a blog's authority by how many people link to it.
-     *      Filtering by authority is a good way to refine your search results.
-     *      There are four settings:
-     *      - n  => Any authority: All results.
-     *      - a1 => A little authority: Results from blogs with at least one link.
-     *      - a4 => Some authority: Results from blogs with a handful of links.
-     *      - a7 => A lot of authority: Results from blogs with hundreds of links.
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'claim'      => (true|false)
-     *      optional - the default setting of FALSE returns no user information
-     *      about each weblog included in the result set when available.
-     *      Set this parameter to FALSE to include Technorati member data
-     *      in the result set when a weblog in your result set
-     *      has been successfully claimed by a member of Technorati.
-     *      Internally the value is converted in (int).
-     *
-     * @param   string $query   the words you are searching for.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_SearchResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/search.html Technorati API: Search Query reference
-     */
-    public function search($query, $options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml',
-                                        'claim'     => 0);
-
-        $options['query'] = $query;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateSearch($options);
-        $response = $this->_makeRequest(self::API_PATH_SEARCH, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_SearchResultSet
-         */
-        require_once 'Zend/Service/Technorati/SearchResultSet.php';
-        return new Zend_Service_Technorati_SearchResultSet($dom, $options);
-    }
-
-    /**
-     * Tag lets you see what posts are associated with a given tag.
-     *
-     * Query options include:
-     *
-     * 'limit'          => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'          => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     * 'excerptsize'    => (int)
-     *      optional - number of word characters to include in the post excerpts.
-     *      By default 100 word characters are returned.
-     * 'topexcerptsize' => (int)
-     *      optional - number of word characters to include in the first post excerpt.
-     *      By default 150 word characters are returned.
-     *
-     * @param   string $tag     the tag term you are searching posts for.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     *  @link    http://technorati.com/developers/api/tag.html Technorati API: Tag Query reference
-     */
-    public function tag($tag, $options = null)
-    {
-        static $defaultOptions = array( 'start'          => 1,
-                                        'limit'          => 20,
-                                        'format'         => 'xml',
-                                        'excerptsize'    => 100,
-                                        'topexcerptsize' => 150);
-
-        $options['tag'] = $tag;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateTag($options);
-        $response = $this->_makeRequest(self::API_PATH_TAG, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagResultSet.php';
-        return new Zend_Service_Technorati_TagResultSet($dom, $options);
-    }
-
-    /**
-     * TopTags provides daily counts of posts containing the queried keyword.
-     *
-     * Query options include:
-     *
-     * 'days'       => (int)
-     *      optional - Used to specify the number of days in the past
-     *      to request daily count data for.
-     *      Can be any integer between 1 and 180, default is 180
-     *
-     * @param   string $q       the keyword query
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_DailyCountsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/dailycounts.html Technorati API: DailyCounts Query reference
-     */
-    public function dailyCounts($query, $options = null)
-    {
-        static $defaultOptions = array( 'days'      => 180,
-                                        'format'    => 'xml'
-                                        );
-
-        $options['q'] = $query;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateDailyCounts($options);
-        $response = $this->_makeRequest(self::API_PATH_DAILYCOUNTS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_DailyCountsResultSet
-         */
-        require_once 'Zend/Service/Technorati/DailyCountsResultSet.php';
-        return new Zend_Service_Technorati_DailyCountsResultSet($dom);
-    }
-
-    /**
-     * TopTags provides information on top tags indexed by Technorati.
-     *
-     * Query options include:
-     *
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     *
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/toptags.html Technorati API: TopTags Query reference
-     */
-    public function topTags($options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml'
-                                        );
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateTopTags($options);
-        $response = $this->_makeRequest(self::API_PATH_TOPTAGS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagsResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagsResultSet.php';
-        return new Zend_Service_Technorati_TagsResultSet($dom);
-    }
-
-    /**
-     * BlogInfo provides information on what blog, if any, is associated with a given URL.
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     *                          The URL must be recognized by Technorati as a blog.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_BlogInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/bloginfo.html Technorati API: BlogInfo Query reference
-     */
-    public function blogInfo($url, $options = null)
-    {
-        static $defaultOptions = array( 'format'    => 'xml'
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateBlogInfo($options);
-        $response = $this->_makeRequest(self::API_PATH_BLOGINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_BlogInfoResult
-         */
-        require_once 'Zend/Service/Technorati/BlogInfoResult.php';
-        return new Zend_Service_Technorati_BlogInfoResult($dom);
-    }
-
-    /**
-     * BlogPostTags provides information on the top tags used by a specific blog.
-     *
-     * Query options include:
-     *
-     * 'limit'      => (int)
-     *      optional - adjust the size of your result from the default value of 20
-     *      to between 1 and 100 results.
-     * 'start'      => (int)
-     *      optional - adjust the range of your result set.
-     *      Set this number to larger than zero and you will receive
-     *      the portion of Technorati's total result set ranging from start to start+limit.
-     *      The default start value is 1.
-     *      Note. This property is not documented.
-     *
-     * @param   string $url     the URL you are searching for. Prefixes http:// and www. are optional.
-     *                          The URL must be recognized by Technorati as a blog.
-     * @param   array $options  additional parameters to refine your query
-     * @return  Zend_Service_Technorati_TagsResultSet
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/blogposttags.html Technorati API: BlogPostTags Query reference
-     */
-    public function blogPostTags($url, $options = null)
-    {
-        static $defaultOptions = array( 'start'     => 1,
-                                        'limit'     => 20,
-                                        'format'    => 'xml'
-                                        );
-
-        $options['url'] = $url;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateBlogPostTags($options);
-        $response = $this->_makeRequest(self::API_PATH_BLOGPOSTTAGS, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_TagsResultSet
-         */
-        require_once 'Zend/Service/Technorati/TagsResultSet.php';
-        return new Zend_Service_Technorati_TagsResultSet($dom);
-    }
-
-    /**
-     * GetInfo query tells you things that Technorati knows about a member.
-     *
-     * The returned info is broken up into two sections:
-     * The first part describes some information that the user wants
-     * to allow people to know about him- or herself.
-     * The second part of the document is a listing of the weblogs
-     * that the user has successfully claimed and the information
-     * that Technorati knows about these weblogs.
-     *
-     * @param   string $username    the Technorati user name you are searching for
-     * @param   array $options      additional parameters to refine your query
-     * @return  Zend_Service_Technorati_GetInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/getinfo.html Technorati API: GetInfo reference
-     */
-    public function getInfo($username, $options = null)
-    {
-        static $defaultOptions = array('format' => 'xml');
-
-        $options['username'] = $username;
-
-        $options = $this->_prepareOptions($options, $defaultOptions);
-        $this->_validateGetInfo($options);
-        $response = $this->_makeRequest(self::API_PATH_GETINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_GetInfoResult
-         */
-        require_once 'Zend/Service/Technorati/GetInfoResult.php';
-        return new Zend_Service_Technorati_GetInfoResult($dom);
-    }
-
-    /**
-     * KeyInfo query provides information on daily usage of an API key.
-     * Key Info Queries do not count against a key's daily query limit.
-     *
-     * A day is defined as 00:00-23:59 Pacific time.
-     *
-     * @return  Zend_Service_Technorati_KeyInfoResult
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://developers.technorati.com/wiki/KeyInfo Technorati API: Key Info reference
-     */
-    public function keyInfo()
-    {
-        static $defaultOptions = array();
-
-        $options = $this->_prepareOptions(array(), $defaultOptions);
-        // you don't need to validate this request
-        // because key is the only mandatory element
-        // and it's already set in #_prepareOptions
-        $response = $this->_makeRequest(self::API_PATH_KEYINFO, $options);
-        $dom = $this->_convertResponseAndCheckContent($response);
-
-        /**
-         * @see Zend_Service_Technorati_KeyInfoResult
-         */
-        require_once 'Zend/Service/Technorati/KeyInfoResult.php';
-        return new Zend_Service_Technorati_KeyInfoResult($dom, $this->_apiKey);
-    }
-
-
-    /**
-     * Returns Technorati API key.
-     *
-     * @return string   Technorati API key
-     */
-    public function getApiKey()
-    {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Returns a reference to the REST client object in use.
-     *
-     * If the reference hasn't being inizialized yet,
-     * then a new Zend_Rest_Client instance is created.
-     *
-     * @return Zend_Rest_Client
-     */
-    public function getRestClient()
-    {
-        if ($this->_restClient === null) {
-            /**
-             * @see Zend_Rest_Client
-             */
-            require_once 'Zend/Rest/Client.php';
-            $this->_restClient = new Zend_Rest_Client(self::API_URI_BASE);
-        }
-
-        return $this->_restClient;
-    }
-
-    /**
-     * Sets Technorati API key.
-     *
-     * Be aware that this function doesn't validate the key.
-     * The key is validated as soon as the first API request is sent.
-     * If the key is invalid, the API request method will throw
-     * a Zend_Service_Technorati_Exception exception with Invalid Key message.
-     *
-     * @param   string $key     Technorati API Key
-     * @return  void
-     * @link    http://technorati.com/developers/apikey.html How to get your Technorati API Key
-     */
-    public function setApiKey($key)
-    {
-        $this->_apiKey = $key;
-        return $this;
-    }
-
-
-    /**
-     * Validates Cosmos query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateCosmos(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'type', 'limit', 'start', 'current', 'claim', 'highlight', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-        // Validate type (optional)
-        $this->_validateInArrayOption('type', $options, array('link', 'weblog'));
-        // Validate claim (optional)
-        $this->_validateOptionClaim($options);
-        // Validate highlight (optional)
-        $this->_validateIntegerOption('highlight', $options);
-        // Validate current (optional)
-        if (isset($options['current'])) {
-            $tmp = (int) $options['current'];
-            $options['current'] = $tmp ? 'yes' : 'no';
-        }
-
-    }
-
-    /**
-     * Validates Search query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateSearch(array $options)
-    {
-        static $validOptions = array('key', 'query',
-            'language', 'authority', 'limit', 'start', 'claim', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate query (required)
-        $this->_validateMandatoryOption('query', $options);
-        // Validate authority (optional)
-        $this->_validateInArrayOption('authority', $options, array('n', 'a1', 'a4', 'a7'));
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate claim (optional)
-        $this->_validateOptionClaim($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates Tag query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateTag(array $options)
-    {
-        static $validOptions = array('key', 'tag',
-            'limit', 'start', 'excerptsize', 'topexcerptsize', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate query (required)
-        $this->_validateMandatoryOption('tag', $options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate excerptsize (optional)
-        $this->_validateIntegerOption('excerptsize', $options);
-        // Validate excerptsize (optional)
-        $this->_validateIntegerOption('topexcerptsize', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-
-    /**
-     * Validates DailyCounts query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateDailyCounts(array $options)
-    {
-        static $validOptions = array('key', 'q',
-            'days', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate q (required)
-        $this->_validateMandatoryOption('q', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-        // Validate days (optional)
-        if (isset($options['days'])) {
-            $options['days'] = (int) $options['days'];
-            if ($options['days'] < self::PARAM_DAYS_MIN_VALUE ||
-                $options['days'] > self::PARAM_DAYS_MAX_VALUE) {
-                /**
-                 * @see Zend_Service_Technorati_Exception
-                 */
-                require_once 'Zend/Service/Technorati/Exception.php';
-                throw new Zend_Service_Technorati_Exception(
-                            "Invalid value '" . $options['days'] . "' for 'days' option");
-            }
-        }
-    }
-
-    /**
-     * Validates GetInfo query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateGetInfo(array $options)
-    {
-        static $validOptions = array('key', 'username',
-            'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate username (required)
-        $this->_validateMandatoryOption('username', $options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates TopTags query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateTopTags(array $options)
-    {
-        static $validOptions = array('key',
-            'limit', 'start', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates BlogInfo query options.
-     *
-     * @param   array   $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateBlogInfo(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Validates TopTags query options.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateBlogPostTags(array $options)
-    {
-        static $validOptions = array('key', 'url',
-            'limit', 'start', 'format');
-
-        // Validate keys in the $options array
-        $this->_compareOptions($options, $validOptions);
-        // Validate url (required)
-        $this->_validateOptionUrl($options);
-        // Validate limit (optional)
-        $this->_validateOptionLimit($options);
-        // Validate start (optional)
-        $this->_validateOptionStart($options);
-        // Validate format (optional)
-        $this->_validateOptionFormat($options);
-    }
-
-    /**
-     * Checks whether an option is in a given array.
-     *
-     * @param   string $name    option name
-     * @param   array $options
-     * @param   array $array    array of valid options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateInArrayOption($name, $options, array $array)
-    {
-        if (isset($options[$name]) && !in_array($options[$name], $array)) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '{$options[$name]}' for '$name' option");
-        }
-    }
-
-    /**
-     * Checks whether mandatory $name option exists and it's valid.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _validateMandatoryOption($name, $options)
-    {
-        if (!isset($options[$name]) || !trim($options[$name])) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Empty value for '$name' option");
-        }
-    }
-
-    /**
-     * Checks whether $name option is a valid integer and casts it.
-     *
-     * @param   array $options
-     * @return  void
-     * @access  protected
-     */
-    protected function _validateIntegerOption($name, $options)
-    {
-        if (isset($options[$name])) {
-            $options[$name] = (int) $options[$name];
-        }
-    }
-
-    /**
-     * Makes and HTTP GET request to given $path with $options.
-     * HTTP Response is first validated, then returned.
-     *
-     * @param   string $path
-     * @param   array $options
-     * @return  Zend_Http_Response
-     * @throws  Zend_Service_Technorati_Exception on failure
-     * @access  protected
-     */
-    protected function _makeRequest($path, $options = array())
-    {
-        $restClient = $this->getRestClient();
-        $restClient->getHttpClient()->resetParameters();
-        $response = $restClient->restGet($path, $options);
-        self::_checkResponse($response);
-        return $response;
-    }
-
-    /**
-     * Checks whether 'claim' option value is valid.
-     *
-     * @param   array $options
-     * @return  void
-     * @access  protected
-     */
-    protected function _validateOptionClaim(array $options)
-    {
-        $this->_validateIntegerOption('claim', $options);
-    }
-
-    /**
-     * Checks whether 'format' option value is valid.
-     * Be aware that Zend_Service_Technorati supports only XML as format value.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'format' value != XML
-     * @access  protected
-     */
-    protected function _validateOptionFormat(array $options)
-    {
-        if (isset($options['format']) && $options['format'] != 'xml') {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['format'] . "' for 'format' option. " .
-                        "Zend_Service_Technorati supports only 'xml'");
-        }
-    }
-
-    /**
-     * Checks whether 'limit' option value is valid.
-     * Value must be an integer greater than PARAM_LIMIT_MIN_VALUE
-     * and lower than PARAM_LIMIT_MAX_VALUE.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'limit' value is invalid
-     * @access  protected
-     */
-    protected function _validateOptionLimit(array $options)
-    {
-        if (!isset($options['limit'])) return;
-
-        $options['limit'] = (int) $options['limit'];
-        if ($options['limit'] < self::PARAM_LIMIT_MIN_VALUE ||
-            $options['limit'] > self::PARAM_LIMIT_MAX_VALUE) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['limit'] . "' for 'limit' option");
-        }
-    }
-
-    /**
-     * Checks whether 'start' option value is valid.
-     * Value must be an integer greater than 0.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'start' value is invalid
-     * @access  protected
-     */
-    protected function _validateOptionStart(array $options)
-    {
-        if (!isset($options['start'])) return;
-
-        $options['start'] = (int) $options['start'];
-        if ($options['start'] < self::PARAM_START_MIN_VALUE) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "Invalid value '" . $options['start'] . "' for 'start' option");
-        }
-    }
-
-    /**
-     * Checks whether 'url' option value exists and is valid.
-     * 'url' must be a valid HTTP(s) URL.
-     *
-     * @param   array $options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if 'url' value is invalid
-     * @access  protected
-     * @todo    support for Zend_Uri_Http
-     */
-    protected function _validateOptionUrl(array $options)
-    {
-        $this->_validateMandatoryOption('url', $options);
-    }
-
-    /**
-     * Checks XML response content for errors.
-     *
-     * @param   DomDocument $dom    the XML response as a DOM document
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @link    http://technorati.com/developers/api/error.html Technorati API: Error response
-     * @access  protected
-     */
-    protected static function _checkErrors(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-
-        $result = $xpath->query("/tapi/document/result/error");
-        if ($result->length >= 1) {
-            $error = $result->item(0)->nodeValue;
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception($error);
-        }
-    }
-
-    /**
-     * Converts $response body to a DOM object and checks it.
-     *
-     * @param   Zend_Http_Response $response
-     * @return  DOMDocument
-     * @throws  Zend_Service_Technorati_Exception if response content contains an error message
-     * @access  protected
-     */
-    protected function _convertResponseAndCheckContent(Zend_Http_Response $response)
-    {
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-        self::_checkErrors($dom);
-        return $dom;
-    }
-
-    /**
-     * Checks ReST response for errors.
-     *
-     * @param   Zend_Http_Response $response    the ReST response
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected static function _checkResponse(Zend_Http_Response $response)
-    {
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(sprintf(
-                        'Invalid response status code (HTTP/%s %s %s)',
-                        $response->getVersion(), $response->getStatus(), $response->getMessage()));
-        }
-    }
-
-    /**
-     * Checks whether user given options are valid.
-     *
-     * @param   array $options        user options
-     * @param   array $validOptions   valid options
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception
-     * @access  protected
-     */
-    protected function _compareOptions(array $options, array $validOptions)
-    {
-        $difference = array_diff(array_keys($options), $validOptions);
-        if ($difference) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                        "The following parameters are invalid: '" .
-                        implode("', '", $difference) . "'");
-        }
-    }
-
-    /**
-     * Prepares options for the request
-     *
-     * @param   array $options        user options
-     * @param   array $defaultOptions default options
-     * @return  array Merged array of user and default/required options.
-     * @access  protected
-     */
-    protected function _prepareOptions($options, array $defaultOptions)
-    {
-        $options = (array) $options; // force cast to convert null to array()
-        $options['key'] = $this->_apiKey;
-        $options = array_merge($defaultOptions, $options);
-        return $options;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/Author.php b/airtime_mvc/library/Zend/Service/Technorati/Author.php
deleted file mode 100644
index 46f2dcddb..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/Author.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a weblog Author object. It usually belongs to a Technorati account.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Author
-{
-    /**
-     * Author first name
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_firstName;
-
-    /**
-     * Author last name
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_lastName;
-
-    /**
-     * Technorati account username
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_username;
-
-    /**
-     * Technorati account description
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_description;
-
-    /**
-     * Technorati account biography
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_bio;
-
-    /**
-     * Technorati account thumbnail picture URL, if any
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_thumbnailPicture;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-
-        $result = $xpath->query('./firstname/text()', $dom);
-        if ($result->length == 1) $this->setFirstName($result->item(0)->data);
-
-        $result = $xpath->query('./lastname/text()', $dom);
-        if ($result->length == 1) $this->setLastName($result->item(0)->data);
-
-        $result = $xpath->query('./username/text()', $dom);
-        if ($result->length == 1) $this->setUsername($result->item(0)->data);
-
-        $result = $xpath->query('./description/text()', $dom);
-        if ($result->length == 1) $this->setDescription($result->item(0)->data);
-
-        $result = $xpath->query('./bio/text()', $dom);
-        if ($result->length == 1) $this->setBio($result->item(0)->data);
-
-        $result = $xpath->query('./thumbnailpicture/text()', $dom);
-        if ($result->length == 1) $this->setThumbnailPicture($result->item(0)->data);
-    }
-
-
-    /**
-     * Returns Author first name.
-     *
-     * @return  string  Author first name
-     */
-    public function getFirstName() {
-        return $this->_firstName;
-    }
-
-    /**
-     * Returns Author last name.
-     *
-     * @return  string  Author last name
-     */
-    public function getLastName() {
-        return $this->_lastName;
-    }
-
-    /**
-     * Returns Technorati account username.
-     *
-     * @return  string  Technorati account username
-     */
-    public function getUsername() {
-        return $this->_username;
-    }
-
-    /**
-     * Returns Technorati account description.
-     *
-     * @return  string  Technorati account description
-     */
-    public function getDescription() {
-        return $this->_description;
-    }
-
-    /**
-     * Returns Technorati account biography.
-     *
-     * @return  string  Technorati account biography
-     */
-    public function getBio() {
-        return $this->_bio;
-    }
-
-    /**
-     * Returns Technorati account thumbnail picture.
-     *
-     * @return  null|Zend_Uri_Http  Technorati account thumbnail picture
-     */
-    public function getThumbnailPicture() {
-        return $this->_thumbnailPicture;
-    }
-
-
-    /**
-     * Sets author first name.
-     *
-     * @param   string $input   first Name input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setFirstName($input) {
-        $this->_firstName = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets author last name.
-     *
-     * @param   string $input   last Name input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setLastName($input) {
-        $this->_lastName = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account username.
-     *
-     * @param   string $input   username input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setUsername($input) {
-        $this->_username = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account biography.
-     *
-     * @param   string $input   biography input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setBio($input) {
-        $this->_bio = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account description.
-     *
-     * @param   string $input   description input value
-     * @return  Zend_Service_Technorati_Author  $this instance
-     */
-    public function setDescription($input) {
-        $this->_description = (string) $input;
-        return $this;
-    }
-
-    /**
-     * Sets Technorati account thumbnail picture.
-     *
-     * @param   string|Zend_Uri_Http $input thumbnail picture URI
-     * @return  Zend_Service_Technorati_Author  $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setThumbnailPicture($input) {
-        $this->_thumbnailPicture = Zend_Service_Technorati_Utils::normalizeUriHttp($input);
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/BlogInfoResult.php b/airtime_mvc/library/Zend/Service/Technorati/BlogInfoResult.php
deleted file mode 100644
index 4b56d5789..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/BlogInfoResult.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlogInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a single Technorati BlogInfo query result object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_BlogInfoResult
-{
-    /**
-     * Technorati weblog url, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * Technorati weblog, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * Number of unique blogs linking this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-        /**
-         * @see Zend_Service_Technorati_Weblog
-         */
-        require_once 'Zend/Service/Technorati/Weblog.php';
-
-        $result = $xpath->query('//result/weblog');
-        if ($result->length == 1) {
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        } else {
-            // follow the same behavior of blogPostTags
-            // and raise an Exception if the URL is not a valid weblog
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                "Your URL is not a recognized Technorati weblog");
-        }
-
-        $result = $xpath->query('//result/url/text()');
-        if ($result->length == 1) {
-            try {
-                // fetched URL often doens't include schema
-                // and this issue causes the following line to fail
-                $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-            } catch(Zend_Service_Technorati_Exception $e) {
-                if ($this->getWeblog() instanceof Zend_Service_Technorati_Weblog) {
-                    $this->_url = $this->getWeblog()->getUrl();
-                }
-            }
-        }
-
-        $result = $xpath->query('//result/inboundblogs/text()');
-        if ($result->length == 1) $this->_inboundBlogs = (int) $result->item(0)->data;
-
-        $result = $xpath->query('//result/inboundlinks/text()');
-        if ($result->length == 1) $this->_inboundLinks = (int) $result->item(0)->data;
-
-    }
-
-
-    /**
-     * Returns the weblog URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the weblog.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return (int) $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return (int) $this->_inboundLinks;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/CosmosResult.php b/airtime_mvc/library/Zend/Service/Technorati/CosmosResult.php
deleted file mode 100644
index b8fd681d7..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/CosmosResult.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CosmosResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Cosmos query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_CosmosResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object that links queried URL.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The nearest permalink tracked for queried URL.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_nearestPermalink;
-
-    /**
-     * The excerpt of the blog/page linking queried URL.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The the datetime the link was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_linkCreated;
-
-    /**
-     * The URL of the specific link target page
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_linkUrl;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_nearestPermalink' => 'nearestpermalink',
-                                '_excerpt'          => 'excerpt',
-                                '_linkCreated'      => 'linkcreated',
-                                '_linkUrl'          => 'linkurl');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_nearestPermalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_nearestPermalink);
-        $this->_linkUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_linkUrl);
-        $this->_linkCreated = Zend_Service_Technorati_Utils::normalizeDate($this->_linkCreated);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the nearest permalink tracked for queried URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getNearestPermalink() {
-        return $this->_nearestPermalink;
-    }
-
-    /**
-     * Returns the excerpt of the blog/page linking queried URL.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the link was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getLinkCreated() {
-        return $this->_linkCreated;
-    }
-
-    /**
-     * If queried URL is a valid blog,
-     * returns the URL of the specific link target page.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getLinkUrl() {
-        return $this->_linkUrl;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/CosmosResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/CosmosResultSet.php
deleted file mode 100644
index 9276d078e..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/CosmosResultSet.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CosmosResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Cosmos query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Technorati weblog url, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * Technorati weblog, if queried URL is a valid weblog.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * Number of unique blogs linking this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/inboundlinks/text()');
-        if ($result->length == 1) $this->_inboundLinks = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/inboundblogs/text()');
-        if ($result->length == 1) $this->_inboundBlogs = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/weblog');
-        if ($result->length == 1) {
-            /**
-             * @see Zend_Service_Technorati_Weblog
-             */
-            require_once 'Zend/Service/Technorati/Weblog.php';
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        }
-
-        $result = $this->_xpath->query('/tapi/document/result/url/text()');
-        if ($result->length == 1) {
-            try {
-                // fetched URL often doens't include schema
-                // and this issue causes the following line to fail
-                $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-            } catch(Zend_Service_Technorati_Exception $e) {
-                if ($this->getWeblog() instanceof Zend_Service_Technorati_Weblog) {
-                    $this->_url = $this->getWeblog()->getUrl();
-                }
-            }
-        }
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-
-        // total number of results depends on query type
-        // for now check only getInboundLinks() and getInboundBlogs() value
-        if ((int) $this->getInboundLinks() > 0) {
-            $this->_totalResultsAvailable = $this->getInboundLinks();
-        } elseif ((int) $this->getInboundBlogs() > 0) {
-            $this->_totalResultsAvailable = $this->getInboundBlogs();
-        } else {
-            $this->_totalResultsAvailable = 0;
-        }
-    }
-
-
-    /**
-     * Returns the weblog URL.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the weblog.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return $this->_inboundLinks;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_CosmosResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_CosmosResult
-         */
-        require_once 'Zend/Service/Technorati/CosmosResult.php';
-        return new Zend_Service_Technorati_CosmosResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResult.php b/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResult.php
deleted file mode 100644
index 5bbe3ef7c..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResult.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DailyCountsResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati DailyCounts query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_DailyCountsResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Date of count.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_date;
-
-    /**
-     * Number of posts containing query on given date.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_count;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_date'   => 'date',
-                                '_count'  => 'count');
-        parent::__construct($dom);
-
-        // filter fields
-        $this->_date  = new Zend_Date(strtotime($this->_date));
-        $this->_count = (int) $this->_count;
-    }
-
-    /**
-     * Returns the date of count.
-     *
-     * @return  Zend_Date
-     */
-    public function getDate() {
-        return $this->_date;
-    }
-
-    /**
-     * Returns the number of posts containing query on given date.
-     *
-     * @return  int
-     */
-    public function getCount() {
-        return $this->_count;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResultSet.php
deleted file mode 100644
index 8b7df8392..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/DailyCountsResultSet.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DailyCountsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a Technorati Tag query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Technorati search URL for given query.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_searchUrl;
-
-    /**
-     * Number of days for which counts provided.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_days;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        // default locale prevent Zend_Date to fail
-        // when script is executed via shell
-        // Zend_Locale::setDefault('en');
-
-        $result = $this->_xpath->query('/tapi/document/result/days/text()');
-        if ($result->length == 1) $this->_days = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/searchurl/text()');
-        if ($result->length == 1) {
-            $this->_searchUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data);
-        }
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/items/item)");
-        $this->_totalResultsAvailable = (int) $this->getDays();
-    }
-
-
-    /**
-     * Returns the search URL for given query.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getSearchUrl() {
-        return $this->_searchUrl;
-    }
-
-    /**
-     * Returns the number of days for which counts provided.
-     *
-     * @return  int
-     */
-    public function getDays() {
-        return $this->_days;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_DailyCountsResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_DailyCountsResult
-         */
-        require_once 'Zend/Service/Technorati/DailyCountsResult.php';
-        return new Zend_Service_Technorati_DailyCountsResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/Exception.php b/airtime_mvc/library/Zend/Service/Technorati/Exception.php
deleted file mode 100644
index 12d684ef2..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Exception extends Zend_Service_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/GetInfoResult.php b/airtime_mvc/library/Zend/Service/Technorati/GetInfoResult.php
deleted file mode 100644
index fa6c50e8f..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/GetInfoResult.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GetInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Represents a single Technorati GetInfo query result object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_GetInfoResult
-{
-    /**
-     * Technorati author
-     *
-     * @var     Zend_Service_Technorati_Author
-     * @access  protected
-     */
-    protected $_author;
-
-    /**
-     * A list of weblogs claimed by this author
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_weblogs = array();
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-
-        /**
-         * @see Zend_Service_Technorati_Author
-         */
-        require_once 'Zend/Service/Technorati/Author.php';
-
-        $result = $xpath->query('//result');
-        if ($result->length == 1) {
-            $this->_author = new Zend_Service_Technorati_Author($result->item(0));
-        }
-
-        /**
-         * @see Zend_Service_Technorati_Weblog
-         */
-        require_once 'Zend/Service/Technorati/Weblog.php';
-
-        $result = $xpath->query('//item/weblog');
-        if ($result->length >= 1) {
-            foreach ($result as $weblog) {
-                $this->_weblogs[] = new Zend_Service_Technorati_Weblog($weblog);
-            }
-        }
-    }
-
-
-    /**
-     * Returns the author associated with queried username.
-     *
-     * @return  Zend_Service_Technorati_Author
-     */
-    public function getAuthor() {
-        return $this->_author;
-    }
-
-    /**
-     * Returns the collection of weblogs authored by queried username.
-     *
-     * @return  array of Zend_Service_Technorati_Weblog
-     */
-    public function getWeblogs() {
-        return $this->_weblogs;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/KeyInfoResult.php b/airtime_mvc/library/Zend/Service/Technorati/KeyInfoResult.php
deleted file mode 100644
index 039de6005..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/KeyInfoResult.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: KeyInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Represents a single Technorati KeyInfo query result object.
- * It provides information about your Technorati API Key daily usage.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_KeyInfoResult
-{
-    /**
-     * Technorati API key
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_apiKey;
-
-    /**
-     * Number of queries used today
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_apiQueries;
-
-    /**
-     * Total number of available queries per day
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_maxQueries;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     * Parses given Key element from $dom and sets API key string.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     * @param   string $apiKey  the API Key string
-     */
-    public function __construct(DomDocument $dom, $apiKey = null)
-    {
-        // $this->_dom   = $dom;
-        // $this->_xpath = new DOMXPath($dom);
-        $xpath = new DOMXPath($dom);
-
-        $this->_apiQueries   = (int) $xpath->query('/tapi/document/result/apiqueries/text()')->item(0)->data;
-        $this->_maxQueries   = (int) $xpath->query('/tapi/document/result/maxqueries/text()')->item(0)->data;
-        $this->setApiKey($apiKey);
-    }
-
-
-    /**
-     * Returns API Key string.
-     *
-     * @return  string  API Key string
-     */
-    public function getApiKey() {
-        return $this->_apiKey;
-    }
-
-    /**
-     * Returns the number of queries sent today.
-     *
-     * @return  int     number of queries sent today
-     */
-    public function getApiQueries() {
-        return $this->_apiQueries;
-    }
-
-    /**
-     * Returns Key's daily query limit.
-     *
-     * @return  int     maximum number of available queries per day
-     */
-    public function getMaxQueries() {
-        return $this->_maxQueries;
-    }
-
-
-    /**
-     * Sets API Key string.
-     *
-     * @param   string $apiKey  the API Key
-     * @return  Zend_Service_Technorati_KeyInfoResult $this instance
-     */
-    public function setApiKey($apiKey) {
-        $this->_apiKey = $apiKey;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/Result.php b/airtime_mvc/library/Zend/Service/Technorati/Result.php
deleted file mode 100644
index c77ca4a1e..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/Result.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Represents a single Technorati Search query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @abstract
- */
-abstract class Zend_Service_Technorati_Result
-{
-    /**
-     * An associative array of 'fieldName' => 'xmlfieldtag'
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_fields;
-
-    /**
-     * The ReST fragment for this result object
-     *
-     * @var     DomElement
-     * @access  protected
-     */
-    protected $_dom;
-
-    /**
-     * Object for $this->_dom
-     *
-     * @var     DOMXpath
-     * @access  protected
-     */
-    protected $_xpath;
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     * Properties are automatically fetched from XML
-     * according to array of $_fields to be read.
-     *
-     * @param   DomElement $result  the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_xpath = new DOMXPath($dom->ownerDocument);
-        $this->_dom = $dom;
-
-        // default fields for all search results
-        $fields = array();
-
-        // merge with child's object fields
-        $this->_fields = array_merge($this->_fields, $fields);
-
-        // add results to appropriate fields
-        foreach($this->_fields as $phpName => $xmlName) {
-            $query = "./$xmlName/text()";
-            $node = $this->_xpath->query($query, $this->_dom);
-            if ($node->length == 1) {
-                $this->{$phpName} = (string) $node->item(0)->data;
-            }
-        }
-    }
-
-    /**
-     * Parses weblog node and sets weblog object.
-     *
-     * @return  void
-     */
-    protected function _parseWeblog()
-    {
-        // weblog object field
-        $result = $this->_xpath->query('./weblog', $this->_dom);
-        if ($result->length == 1) {
-            /**
-             * @see Zend_Service_Technorati_Weblog
-             */
-            require_once 'Zend/Service/Technorati/Weblog.php';
-            $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0));
-        } else {
-            $this->_weblog = null;
-        }
-    }
-
-    /**
-     * Returns the document fragment for this object as XML string.
-     *
-     * @return string   the document fragment for this object
-     *                  converted into XML format
-     */
-    public function getXml()
-    {
-        return $this->_dom->ownerDocument->saveXML($this->_dom);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/ResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/ResultSet.php
deleted file mode 100644
index 38571f981..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/ResultSet.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * This is the most essential result set.
- * The scope of this class is to be extended by a query-specific child result set class,
- * and it should never be used to initialize a standalone object.
- *
- * Each of the specific result sets represents a collection of query-specific
- * Zend_Service_Technorati_Result objects.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @abstract
- */
-abstract class Zend_Service_Technorati_ResultSet implements SeekableIterator
-{
-    /**
-     * The total number of results available
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_totalResultsAvailable;
-
-    /**
-     * The number of results in this result set
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_totalResultsReturned;
-
-    /**
-     * The offset in the total result set of this search set
-     *
-     * @var     int
-     */
-    //TODO public $firstResultPosition;
-
-
-    /**
-     * A DomNodeList of results
-     *
-     * @var     DomNodeList
-     * @access  protected
-     */
-    protected $_results;
-
-    /**
-     * Technorati API response document
-     *
-     * @var     DomDocument
-     * @access  protected
-     */
-    protected $_dom;
-
-    /**
-     * Object for $this->_dom
-     *
-     * @var     DOMXpath
-     * @access  protected
-     */
-    protected $_xpath;
-
-    /**
-     * XML string representation for $this->_dom
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_xml;
-
-    /**
-     * Current Item
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_currentIndex = 0;
-
-
-    /**
-     * Parses the search response and retrieves the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        $this->_init($dom, $options);
-
-        // Technorati loves to make developer's life really hard
-        // I must read query options in order to normalize a single way
-        // to display start and limit.
-        // The value is printed out in XML using many different tag names,
-        // too hard to get it from XML
-
-        // Additionally, the following tags should be always available
-        // according to API documentation but... this is not the truth!
-        // - querytime
-        // - limit
-        // - start (sometimes rankingstart)
-
-        // query tag is only available for some requests, the same for url.
-        // For now ignore them.
-
-        //$start = isset($options['start']) ? $options['start'] : 1;
-        //$limit = isset($options['limit']) ? $options['limit'] : 20;
-        //$this->_firstResultPosition = $start;
-    }
-
-    /**
-     * Initializes this object from a DomDocument response.
-     *
-     * Because __construct and __wakeup shares some common executions,
-     * it's useful to group them in a single initialization method.
-     * This method is called once each time a new instance is created
-     * or a serialized object is unserialized.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     * @param   array $options   query options as associative array
-     *      * @return  void
-     */
-    protected function _init(DomDocument $dom, $options = array())
-    {
-        $this->_dom     = $dom;
-        $this->_xpath   = new DOMXPath($dom);
-
-        $this->_results = $this->_xpath->query("//item");
-    }
-
-    /**
-     * Number of results returned.
-     *
-     * @return  int     total number of results returned
-     */
-    public function totalResults()
-    {
-        return (int) $this->_totalResultsReturned;
-    }
-
-
-    /**
-     * Number of available results.
-     *
-     * @return  int     total number of available results
-     */
-    public function totalResultsAvailable()
-    {
-        return (int) $this->_totalResultsAvailable;
-    }
-
-    /**
-     * Implements SeekableIterator::current().
-     *
-     * @return  void
-     * @throws  Zend_Service_Exception
-     * @abstract
-     */
-    // abstract public function current();
-
-    /**
-     * Implements SeekableIterator::key().
-     *
-     * @return  int
-     */
-    public function key()
-    {
-        return $this->_currentIndex;
-    }
-
-    /**
-     * Implements SeekableIterator::next().
-     *
-     * @return  void
-     */
-    public function next()
-    {
-        $this->_currentIndex += 1;
-    }
-
-    /**
-     * Implements SeekableIterator::rewind().
-     *
-     * @return  bool
-     */
-    public function rewind()
-    {
-        $this->_currentIndex = 0;
-        return true;
-    }
-
-    /**
-     * Implement SeekableIterator::seek().
-     *
-     * @param   int $index
-     * @return  void
-     * @throws  OutOfBoundsException
-     */
-    public function seek($index)
-    {
-        $indexInt = (int) $index;
-        if ($indexInt >= 0 && $indexInt < $this->_results->length) {
-            $this->_currentIndex = $indexInt;
-        } else {
-            throw new OutOfBoundsException("Illegal index '$index'");
-        }
-    }
-
-    /**
-     * Implement SeekableIterator::valid().
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return null !== $this->_results && $this->_currentIndex < $this->_results->length;
-    }
-
-    /**
-     * Returns the response document as XML string.
-     *
-     * @return string   the response document converted into XML format
-     */
-    public function getXml()
-    {
-        return $this->_dom->saveXML();
-    }
-
-    /**
-     * Overwrites standard __sleep method to make this object serializable.
-     *
-     * DomDocument and DOMXpath objects cannot be serialized.
-     * This method converts them back to an XML string.
-     *
-     * @return void
-     */
-    public function __sleep() {
-        $this->_xml     = $this->getXml();
-        $vars = array_keys(get_object_vars($this));
-        return array_diff($vars, array('_dom', '_xpath'));
-    }
-
-    /**
-     * Overwrites standard __wakeup method to make this object unserializable.
-     *
-     * Restores object status before serialization.
-     * Converts XML string into a DomDocument object and creates a valid
-     * DOMXpath instance for given DocDocument.
-     *
-     * @return void
-     */
-    public function __wakeup() {
-        $dom = new DOMDocument();
-        $dom->loadXml($this->_xml);
-        $this->_init($dom);
-        $this->_xml = null; // reset XML content
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/SearchResult.php b/airtime_mvc/library/Zend/Service/Technorati/SearchResult.php
deleted file mode 100644
index d98aadc62..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/SearchResult.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SearchResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Search query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object corresponding to queried keyword.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The title of the entry.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_title;
-
-    /**
-     * The blurb from entry with search term highlighted.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The datetime the entry was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_created;
-
-    /**
-     * The permalink of the blog entry.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_permalink;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_permalink'    => 'permalink',
-                                '_excerpt'      => 'excerpt',
-                                '_created'      => 'created',
-                                '_title'        => 'title');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_permalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_permalink);
-        $this->_created = Zend_Service_Technorati_Utils::normalizeDate($this->_created);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the title of the entry.
-     *
-     * @return  string
-     */
-    public function getTitle() {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the blurb from entry with search term highlighted.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the entry was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getCreated() {
-        return $this->_created;
-    }
-
-    /**
-     * Returns the permalink of the blog entry.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getPermalink() {
-        return $this->_permalink;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/SearchResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/SearchResultSet.php
deleted file mode 100644
index c4cfa46a2..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/SearchResultSet.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SearchResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Search query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Number of query results.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_queryCount;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/querycount/text()');
-        if ($result->length == 1) $this->_queryCount = (int) $result->item(0)->data;
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        $this->_totalResultsAvailable = (int) $this->_queryCount;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_SearchResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_SearchResult
-         */
-        require_once 'Zend/Service/Technorati/SearchResult.php';
-        return new Zend_Service_Technorati_SearchResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/TagResult.php b/airtime_mvc/library/Zend/Service/Technorati/TagResult.php
deleted file mode 100644
index e1f203170..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/TagResult.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati Tag query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_TagResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Technorati weblog object corresponding to queried keyword.
-     *
-     * @var     Zend_Service_Technorati_Weblog
-     * @access  protected
-     */
-    protected $_weblog;
-
-    /**
-     * The title of the entry.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_title;
-
-    /**
-     * The blurb from entry with search term highlighted.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_excerpt;
-
-    /**
-     * The datetime the entry was created.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_created;
-
-    /**
-     * The datetime the entry was updated.
-     * Called 'postupdate' in original XML response,
-     * it has been renamed to provide more coherence.
-     *
-     * @var     Zend_Date
-     * @access  protected
-     */
-    protected $_updated;
-
-    /**
-     * The permalink of the blog entry.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_permalink;
-
-
-    /**
-     * Constructs a new object object from DOM Element.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_permalink'    => 'permalink',
-                                '_excerpt'      => 'excerpt',
-                                '_created'      => 'created',
-                                '_updated'      => 'postupdate',
-                                '_title'        => 'title');
-        parent::__construct($dom);
-
-        // weblog object field
-        $this->_parseWeblog();
-
-        // filter fields
-        $this->_permalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_permalink);
-        $this->_created = Zend_Service_Technorati_Utils::normalizeDate($this->_created);
-        $this->_updated = Zend_Service_Technorati_Utils::normalizeDate($this->_updated);
-    }
-
-    /**
-     * Returns the weblog object that links queried URL.
-     *
-     * @return  Zend_Service_Technorati_Weblog
-     */
-    public function getWeblog() {
-        return $this->_weblog;
-    }
-
-    /**
-     * Returns the title of the entry.
-     *
-     * @return  string
-     */
-    public function getTitle() {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the blurb from entry with search term highlighted.
-     *
-     * @return  string
-     */
-    public function getExcerpt() {
-        return $this->_excerpt;
-    }
-
-    /**
-     * Returns the datetime the entry was created.
-     *
-     * @return  Zend_Date
-     */
-    public function getCreated() {
-        return $this->_created;
-    }
-
-    /**
-     * Returns the datetime the entry was updated.
-     *
-     * @return  Zend_Date
-     */
-    public function getUpdated() {
-        return $this->_updated;
-    }
-
-    /**
-     * Returns the permalink of the blog entry.
-     *
-     * @return  Zend_Uri_Http
-     */
-    public function getPermalink() {
-        return $this->_permalink;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/TagResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/TagResultSet.php
deleted file mode 100644
index 99809eabf..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/TagResultSet.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati Tag query result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Number of posts that match the tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_postsMatched;
-
-    /**
-     * Number of blogs that match the tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_blogsMatched;
-
-    /**
-     * Parses the search response and retrieve the results for iteration.
-     *
-     * @param   DomDocument $dom    the ReST fragment for this object
-     * @param   array $options      query options as associative array
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $result = $this->_xpath->query('/tapi/document/result/postsmatched/text()');
-        if ($result->length == 1) $this->_postsMatched = (int) $result->item(0)->data;
-
-        $result = $this->_xpath->query('/tapi/document/result/blogsmatched/text()');
-        if ($result->length == 1) $this->_blogsMatched = (int) $result->item(0)->data;
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        /** @todo Validate the following assertion */
-        $this->_totalResultsAvailable = (int) $this->getPostsMatched();
-    }
-
-
-    /**
-     * Returns the number of posts that match the tag.
-     *
-     * @return  int
-     */
-    public function getPostsMatched() {
-        return $this->_postsMatched;
-    }
-
-    /**
-     * Returns the number of blogs that match the tag.
-     *
-     * @return  int
-     */
-    public function getBlogsMatched() {
-        return $this->_blogsMatched;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_TagResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_TagResult
-         */
-        require_once 'Zend/Service/Technorati/TagResult.php';
-        return new Zend_Service_Technorati_TagResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/TagsResult.php b/airtime_mvc/library/Zend/Service/Technorati/TagsResult.php
deleted file mode 100644
index 5b1afc6a3..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/TagsResult.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagsResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Result
- */
-require_once 'Zend/Service/Technorati/Result.php';
-
-
-/**
- * Represents a single Technorati TopTags or BlogPostTags query result object.
- * It is never returned as a standalone object,
- * but it always belongs to a valid Zend_Service_Technorati_TagsResultSet object.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result
-{
-    /**
-     * Name of the tag.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_tag;
-
-    /**
-     * Number of posts containing this tag.
-     *
-     * @var     int
-     * @access  protected
-     */
-    protected $_posts;
-
-
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $this->_fields = array( '_tag'   => 'tag',
-                                '_posts' => 'posts');
-        parent::__construct($dom);
-
-        // filter fields
-        $this->_tag   = (string) $this->_tag;
-        $this->_posts = (int) $this->_posts;
-    }
-
-    /**
-     * Returns the tag name.
-     *
-     * @return  string
-     */
-    public function getTag() {
-        return $this->_tag;
-    }
-
-    /**
-     * Returns the number of posts.
-     *
-     * @return  int
-     */
-    public function getPosts() {
-        return $this->_posts;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/TagsResultSet.php b/airtime_mvc/library/Zend/Service/Technorati/TagsResultSet.php
deleted file mode 100644
index 1bdba3c21..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/TagsResultSet.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TagsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_ResultSet
- */
-require_once 'Zend/Service/Technorati/ResultSet.php';
-
-
-/**
- * Represents a Technorati TopTags or BlogPostTags queries result set.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_TagsResultSet extends Zend_Service_Technorati_ResultSet
-{
-    /**
-     * Constructs a new object object from DOM Document.
-     *
-     * @param   DomDocument $dom the ReST fragment for this object
-     */
-    public function __construct(DomDocument $dom, $options = array())
-    {
-        parent::__construct($dom, $options);
-
-        $this->_totalResultsReturned  = (int) $this->_xpath->evaluate("count(/tapi/document/item)");
-        $this->_totalResultsAvailable = (int) $this->_totalResultsReturned;
-    }
-
-    /**
-     * Implements Zend_Service_Technorati_ResultSet::current().
-     *
-     * @return Zend_Service_Technorati_TagsResult current result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Technorati_TagsResult
-         */
-        require_once 'Zend/Service/Technorati/TagsResult.php';
-        return new Zend_Service_Technorati_TagsResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/Utils.php b/airtime_mvc/library/Zend/Service/Technorati/Utils.php
deleted file mode 100644
index 9b628bcae..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/Utils.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Utils.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Collection of utilities for various Zend_Service_Technorati classes.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Utils
-{
-    /**
-     * Parses, validates and returns a valid Zend_Uri object
-     * from given $input.
-     *
-     * @param   string|Zend_Uri_Http $input
-     * @return  null|Zend_Uri_Http
-     * @throws  Zend_Service_Technorati_Exception
-     * @static
-     */
-    public static function normalizeUriHttp($input)
-    {
-        // allow null as value
-        if ($input === null) {
-            return null;
-        }
-
-        /**
-         * @see Zend_Uri
-         */
-        require_once 'Zend/Uri.php';
-        if ($input instanceof Zend_Uri_Http) {
-            $uri = $input;
-        } else {
-            try {
-                $uri = Zend_Uri::factory((string) $input);
-            }
-            // wrap exception under Zend_Service_Technorati_Exception object
-            catch (Exception $e) {
-                /**
-                 * @see Zend_Service_Technorati_Exception
-                 */
-                require_once 'Zend/Service/Technorati/Exception.php';
-                throw new Zend_Service_Technorati_Exception($e->getMessage(), 0, $e);
-            }
-        }
-
-        // allow inly Zend_Uri_Http objects or child classes
-        if (!($uri instanceof Zend_Uri_Http)) {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception(
-                "Invalid URL $uri, only HTTP(S) protocols can be used");
-        }
-
-        return $uri;
-    }
-    /**
-     * Parses, validates and returns a valid Zend_Date object
-     * from given $input.
-     *
-     * $input can be either a string, an integer or a Zend_Date object.
-     * If $input is string or int, it will be provided to Zend_Date as it is.
-     * If $input is a Zend_Date object, the object instance will be returned.
-     *
-     * @param   mixed|Zend_Date $input
-     * @return  null|Zend_Date
-     * @throws  Zend_Service_Technorati_Exception
-     * @static
-     */
-    public static function normalizeDate($input)
-    {
-        /**
-         * @see Zend_Date
-         */
-        require_once 'Zend/Date.php';
-        /**
-         * @see Zend_Locale
-         */
-        require_once 'Zend/Locale.php';
-
-        // allow null as value and return valid Zend_Date objects
-        if (($input === null) || ($input instanceof Zend_Date)) {
-            return $input;
-        }
-
-        // due to a BC break as of ZF 1.5 it's not safe to use Zend_Date::isDate() here
-        // see ZF-2524, ZF-2334
-        if (@strtotime($input) !== FALSE) {
-            return new Zend_Date($input);
-        } else {
-            /**
-             * @see Zend_Service_Technorati_Exception
-             */
-            require_once 'Zend/Service/Technorati/Exception.php';
-            throw new Zend_Service_Technorati_Exception("'$input' is not a valid Date/Time");
-        }
-    }
-
-    /**
-     * @todo public static function xpathQueryAndSet() {}
-     */
-
-    /**
-     * @todo public static function xpathQueryAndSetIf() {}
-     */
-
-    /**
-     * @todo public static function xpathQueryAndSetUnless() {}
-     */
-}
diff --git a/airtime_mvc/library/Zend/Service/Technorati/Weblog.php b/airtime_mvc/library/Zend/Service/Technorati/Weblog.php
deleted file mode 100644
index 4fa9df0f4..000000000
--- a/airtime_mvc/library/Zend/Service/Technorati/Weblog.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Weblog.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Technorati_Author
- */
-require_once 'Zend/Service/Technorati/Author.php';
-
-/**
- * @see Zend_Service_Technorati_Utils
- */
-require_once 'Zend/Service/Technorati/Utils.php';
-
-
-/**
- * Represents a Weblog object successful recognized by Technorati.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Technorati
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Technorati_Weblog
-{
-    /**
-     * Blog name as written in the feed.
-     *
-     * @var     string
-     * @access  protected
-     */
-    protected $_name;
-
-    /**
-     * Base blog URL.
-     *
-     * @var     Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_url;
-
-    /**
-     * RSS feed URL, if any.
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_rssUrl;
-
-    /**
-     * Atom feed URL, if any.
-     *
-     * @var     null|Zend_Uri_Http
-     * @access  protected
-     */
-    protected $_atomUrl;
-
-    /**
-     * Number of unique blogs linking this blog.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundBlogs;
-
-    /**
-     * Number of incoming links to this blog.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_inboundLinks;
-
-    /**
-     * Last blog update UNIX timestamp.
-     *
-     * @var     null|Zend_Date
-     * @access  protected
-     */
-    protected $_lastUpdate;
-
-    /**
-     * Technorati rank value for this weblog.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     integer
-     * @access  protected
-     */
-    protected $_rank;
-
-    /**
-     * Blog latitude coordinate.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     float
-     * @access  protected
-     */
-    protected $_lat;
-
-    /**
-     * Blog longitude coordinate.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     float
-     * @access  protected
-     */
-    protected $_lon;
-
-    /**
-     * Whether the author who claimed this weblog has a photo.
-     *
-     * Note. This property has no official documentation.
-     *
-     * @var     bool
-     * @access  protected
-     * @see     Zend_Service_Technorati_Author::$thumbnailPicture
-     */
-    protected $_hasPhoto = false;
-
-    /**
-     * An array of Zend_Service_Technorati_Author who claimed this blog
-     *
-     * @var     array
-     * @access  protected
-     */
-    protected $_authors = array();
-
-
-    /**
-     * Constructs a new object from DOM Element.
-     *
-     * @param  DomElement $dom the ReST fragment for this object
-     */
-    public function __construct(DomElement $dom)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-
-        $result = $xpath->query('./name/text()', $dom);
-        if ($result->length == 1) $this->setName($result->item(0)->data);
-
-        $result = $xpath->query('./url/text()', $dom);
-        if ($result->length == 1) $this->setUrl($result->item(0)->data);
-
-        $result = $xpath->query('./inboundblogs/text()', $dom);
-        if ($result->length == 1) $this->setInboundBlogs($result->item(0)->data);
-
-        $result = $xpath->query('./inboundlinks/text()', $dom);
-        if ($result->length == 1) $this->setInboundLinks($result->item(0)->data);
-
-        $result = $xpath->query('./lastupdate/text()', $dom);
-        if ($result->length == 1) $this->setLastUpdate($result->item(0)->data);
-
-        /* The following elements need more attention */
-
-        $result = $xpath->query('./rssurl/text()', $dom);
-        if ($result->length == 1) $this->setRssUrl($result->item(0)->data);
-
-        $result = $xpath->query('./atomurl/text()', $dom);
-        if ($result->length == 1) $this->setAtomUrl($result->item(0)->data);
-
-        $result = $xpath->query('./author', $dom);
-        if ($result->length >= 1) {
-            foreach ($result as $author) {
-                $this->_authors[] = new Zend_Service_Technorati_Author($author);
-            }
-        }
-
-        /**
-         * The following are optional elements
-         *
-         * I can't find any official documentation about the following properties
-         * however they are included in response DTD and/or test responses.
-         */
-
-        $result = $xpath->query('./rank/text()', $dom);
-        if ($result->length == 1) $this->setRank($result->item(0)->data);
-
-        $result = $xpath->query('./lat/text()', $dom);
-        if ($result->length == 1) $this->setLat($result->item(0)->data);
-
-        $result = $xpath->query('./lon/text()', $dom);
-        if ($result->length == 1) $this->setLon($result->item(0)->data);
-
-        $result = $xpath->query('./hasphoto/text()', $dom);
-        if ($result->length == 1) $this->setHasPhoto($result->item(0)->data);
-    }
-
-
-    /**
-     * Returns weblog name.
-     *
-     * @return  string  Weblog name
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns weblog URL.
-     *
-     * @return  null|Zend_Uri_Http object representing weblog base URL
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Returns number of unique blogs linking this blog.
-     *
-     * @return  integer the number of inbound blogs
-     */
-    public function getInboundBlogs()
-    {
-        return $this->_inboundBlogs;
-    }
-
-    /**
-     * Returns number of incoming links to this blog.
-     *
-     * @return  integer the number of inbound links
-     */
-    public function getInboundLinks()
-    {
-        return $this->_inboundLinks;
-    }
-
-    /**
-     * Returns weblog Rss URL.
-     *
-     * @return  null|Zend_Uri_Http object representing the URL
-     *          of the RSS feed for given blog
-     */
-    public function getRssUrl()
-    {
-        return $this->_rssUrl;
-    }
-
-    /**
-     * Returns weblog Atom URL.
-     *
-     * @return  null|Zend_Uri_Http object representing the URL
-     *          of the Atom feed for given blog
-     */
-    public function getAtomUrl()
-    {
-        return $this->_atomUrl;
-    }
-
-    /**
-     * Returns UNIX timestamp of the last weblog update.
-     *
-     * @return  integer UNIX timestamp of the last weblog update
-     */
-    public function getLastUpdate()
-    {
-        return $this->_lastUpdate;
-    }
-
-    /**
-     * Returns weblog rank value.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  integer weblog rank value
-     */
-    public function getRank()
-    {
-        return $this->_rank;
-    }
-
-    /**
-     * Returns weblog latitude coordinate.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  float   weblog latitude coordinate
-     */
-    public function getLat() {
-        return $this->_lat;
-    }
-
-    /**
-     * Returns weblog longitude coordinate.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  float   weblog longitude coordinate
-     */
-    public function getLon()
-    {
-        return $this->_lon;
-    }
-
-    /**
-     * Returns whether the author who claimed this weblog has a photo.
-     *
-     * Note. This property is not documented.
-     *
-     * @return  bool    TRUE if the author who claimed this weblog has a photo,
-     *                  FALSE otherwise.
-     */
-    public function hasPhoto()
-    {
-        return (bool) $this->_hasPhoto;
-    }
-
-    /**
-     * Returns the array of weblog authors.
-     *
-     * @return  array of Zend_Service_Technorati_Author authors
-     */
-    public function getAuthors()
-    {
-        return (array) $this->_authors;
-    }
-
-
-    /**
-     * Sets weblog name.
-     *
-     * @param   string $name
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setName($name)
-    {
-        $this->_name = (string) $name;
-        return $this;
-    }
-
-    /**
-     * Sets weblog URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  void
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setUrl($url)
-    {
-        $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets number of inbound blogs.
-     *
-     * @param   integer $number
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setInboundBlogs($number)
-    {
-        $this->_inboundBlogs = (int) $number;
-        return $this;
-    }
-
-    /**
-     * Sets number of Iinbound links.
-     *
-     * @param   integer $number
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setInboundLinks($number)
-    {
-        $this->_inboundLinks = (int) $number;
-        return $this;
-    }
-
-    /**
-     * Sets weblog Rss URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setRssUrl($url)
-    {
-        $this->_rssUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Atom URL.
-     *
-     * @param   string|Zend_Uri_Http $url
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception if $input is an invalid URI
-     *          (via Zend_Service_Technorati_Utils::normalizeUriHttp)
-     */
-    public function setAtomUrl($url)
-    {
-        $this->_atomUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Last Update timestamp.
-     *
-     * $datetime can be any value supported by
-     * Zend_Service_Technorati_Utils::normalizeDate().
-     *
-     * @param   mixed $datetime A string representing the last update date time
-     *                          in a valid date time format
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     * @throws  Zend_Service_Technorati_Exception
-     */
-    public function setLastUpdate($datetime)
-    {
-        $this->_lastUpdate = Zend_Service_Technorati_Utils::normalizeDate($datetime);
-        return $this;
-    }
-
-    /**
-     * Sets weblog Rank.
-     *
-     * @param   integer $rank
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setRank($rank)
-    {
-        $this->_rank = (int) $rank;
-        return $this;
-    }
-
-    /**
-     * Sets weblog latitude coordinate.
-     *
-     * @param   float $coordinate
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setLat($coordinate)
-    {
-        $this->_lat = (float) $coordinate;
-        return $this;
-    }
-
-    /**
-     * Sets weblog longitude coordinate.
-     *
-     * @param   float $coordinate
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setLon($coordinate)
-    {
-        $this->_lon = (float) $coordinate;
-        return $this;
-    }
-
-    /**
-     * Sets hasPhoto property.
-     *
-     * @param   bool $hasPhoto
-     * @return  Zend_Service_Technorati_Weblog $this instance
-     */
-    public function setHasPhoto($hasPhoto)
-    {
-        $this->_hasPhoto = (bool) $hasPhoto;
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Twitter.php b/airtime_mvc/library/Zend/Service/Twitter.php
deleted file mode 100644
index b3454496c..000000000
--- a/airtime_mvc/library/Zend/Service/Twitter.php
+++ /dev/null
@@ -1,979 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Twitter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-/**
- * @see Zend_Rest_Client
- */
-require_once 'Zend/Rest/Client.php';
-/**
- * @see Zend_Rest_Client_Result
- */
-require_once 'Zend/Rest/Client/Result.php';
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Twitter extends Zend_Rest_Client
-{
-
-    /**
-     * 246 is the current limit for a status message, 140 characters are displayed
-     * initially, with the remainder linked from the web UI or client. The limit is
-     * applied to a html encoded UTF-8 string (i.e. entities are counted in the limit
-     * which may appear unusual but is a security measure).
-     *
-     * This should be reviewed in the future...
-     */
-    const STATUS_MAX_CHARACTERS = 246;
-
-    /**
-     * Whether or not authorization has been initialized for the current user.
-     * @var bool
-     */
-    protected $_authInitialized = false;
-    /**
-     * @var Zend_Http_CookieJar
-     */
-    protected $_cookieJar;
-    /**
-     * Date format for 'since' strings
-     * @var string
-     */
-    protected $_dateFormat = 'D, d M Y H:i:s T';
-    /**
-     * Username
-     * @var string
-     */
-    protected $_username;
-    /**
-     * Password
-     * @var string
-     */
-    protected $_password;
-    /**
-     * Current method type (for method proxying)
-     * @var string
-     */
-    protected $_methodType;
-    /**
-     * Types of API methods
-     * @var array
-     */
-    protected $_methodTypes = array('status', 'user', 'directMessage', 'friendship', 'account', 'favorite', 'block');
-
-    /**
-     * Local HTTP Client cloned from statically set client
-     * @var Zend_Http_Client
-     */
-    protected $_localHttpClient = null;
-
-    /**
-     * Constructor
-     *
-     * @param  string $username
-     * @param  string $password
-     * @return void
-     */
-    public function __construct($username = null, $password = null)
-    {
-        $this->setLocalHttpClient(clone self::getHttpClient());
-        if (is_array($username) && is_null($password)) {
-            if (isset($username['username']) && isset($username['password'])) {
-                $this->setUsername($username['username']);
-                $this->setPassword($username['password']);
-            } elseif (isset($username[0]) && isset($username[1])) {
-                $this->setUsername($username[0]);
-                $this->setPassword($username[1]);
-            }
-        } else if (!is_null($username)) {
-            $this->setUsername($username);
-            $this->setPassword($password);
-        }
-        $this->setUri('http://twitter.com');
-        $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8');
-    }
-
-    /**
-     * Set local HTTP client as distinct from the static HTTP client
-     * as inherited from Zend_Rest_Client.
-     *
-     * @param Zend_Http_Client $client
-     * @return self
-     */
-    public function setLocalHttpClient(Zend_Http_Client $client)
-    {
-        $this->_localHttpClient = $client;
-        return $this;
-    }
-
-    public function getLocalHttpClient()
-    {
-        return $this->_localHttpClient;
-    }
-
-    /**
-     * Retrieve username
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->_username;
-    }
-
-    /**
-     * Set username
-     *
-     * @param  string $value
-     * @return Zend_Service_Twitter
-     */
-    public function setUsername($value)
-    {
-        $this->_username = $value;
-        $this->_authInitialized = false;
-        return $this;
-    }
-
-    /**
-     * Retrieve password
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Set password
-     *
-     * @param  string $value
-     * @return Zend_Service_Twitter
-     */
-    public function setPassword($value)
-    {
-        $this->_password = $value;
-        $this->_authInitialized = false;
-        return $this;
-    }
-
-    /**
-     * Proxy service methods
-     *
-     * @param  string $type
-     * @return Zend_Service_Twitter
-     * @throws Zend_Service_Twitter_Exception if method is not in method types list
-     */
-    public function __get($type)
-    {
-        if (!in_array($type, $this->_methodTypes)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Invalid method type "' . $type . '"');
-        }
-        $this->_methodType = $type;
-        return $this;
-    }
-
-    /**
-     * Method overloading
-     *
-     * @param  string $method
-     * @param  array $params
-     * @return mixed
-     * @throws Zend_Service_Twitter_Exception if unable to find method
-     */
-    public function __call($method, $params)
-    {
-        if (empty($this->_methodType)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Invalid method "' . $method . '"');
-        }
-        $test = $this->_methodType . ucfirst($method);
-        if (!method_exists($this, $test)) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Invalid method "' . $test . '"');
-        }
-
-        return call_user_func_array(array($this, $test), $params);
-    }
-
-    /**
-     * Initialize HTTP authentication
-     *
-     * @return void
-     */
-    protected function _init()
-    {
-        $client = $this->_localHttpClient;
-        $client->resetParameters();
-        if (null == $this->_cookieJar) {
-            $client->setCookieJar();
-            $this->_cookieJar = $client->getCookieJar();
-        } else {
-            $client->setCookieJar($this->_cookieJar);
-        }
-        if (!$this->_authInitialized && $this->getUsername() !== null) {
-            $client->setAuth($this->getUsername(), $this->getPassword());
-            $this->_authInitialized = true;
-        }
-    }
-
-    /**
-     * Set date header
-     *
-     * @param  int|string $value
-     * @deprecated Not supported by Twitter since April 08, 2009
-     * @return void
-     */
-    protected function _setDate($value)
-    {
-        if (is_int($value)) {
-            $date = date($this->_dateFormat, $value);
-        } else {
-            $date = date($this->_dateFormat, strtotime($value));
-        }
-        $this->_localHttpClient->setHeaders('If-Modified-Since', $date);
-    }
-
-    /**
-     * Public Timeline status
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusPublicTimeline()
-    {
-        $this->_init();
-        $path = '/statuses/public_timeline.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Friend Timeline Status
-     *
-     * $params may include one or more of the following keys
-     * - id: ID of a friend whose timeline you wish to receive
-     * - count: how many statuses to return
-     * - since_id: return results only after the specific tweet
-     * - page: return page X of results
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return void
-     */
-    public function statusFriendsTimeline(array $params = array())
-    {
-        $this->_init();
-        $path = '/statuses/friends_timeline';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'count':
-                    $count = (int) $value;
-                    if (0 >= $count) {
-                        $count = 1;
-                    } elseif (200 < $count) {
-                        $count = 200;
-                    }
-                    $_params['count'] = (int) $count;
-                    break;
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * User Timeline status
-     *
-     * $params may include one or more of the following keys
-     * - id: ID of a friend whose timeline you wish to receive
-     * - since_id: return results only after the tweet id specified
-     * - page: return page X of results
-     * - count: how many statuses to return
-     * - max_id: returns only statuses with an ID less than or equal to the specified ID
-     * - user_id: specfies the ID of the user for whom to return the user_timeline
-     * - screen_name: specfies the screen name of the user for whom to return the user_timeline
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusUserTimeline(array $params = array())
-    {
-        $this->_init();
-        $path = '/statuses/user_timeline';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $value;
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                case 'count':
-                    $count = (int) $value;
-                    if (0 >= $count) {
-                        $count = 1;
-                    } elseif (200 < $count) {
-                        $count = 200;
-                    }
-                    $_params['count'] = $count;
-                    break;
-                case 'user_id':
-                    $_params['user_id'] = $this->_validInteger($value);
-                    break;
-                case 'screen_name':
-                    $_params['screen_name'] = $this->_validateScreenName($value);
-                    break;
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'max_id':
-                    $_params['max_id'] = $this->_validInteger($value);
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Show a single status
-     *
-     * @param  int $id Id of status to show
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusShow($id)
-    {
-        $this->_init();
-        $path = '/statuses/show/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Update user's current status
-     *
-     * @param  string $status
-     * @param  int $in_reply_to_status_id
-     * @return Zend_Rest_Client_Result
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @throws Zend_Service_Twitter_Exception if message is too short or too long
-     */
-    public function statusUpdate($status, $inReplyToStatusId = null)
-    {
-        $this->_init();
-        $path = '/statuses/update.xml';
-        $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8');
-        if ($len > self::STATUS_MAX_CHARACTERS) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Status must be no more than ' . self::STATUS_MAX_CHARACTERS . ' characters in length');
-        } elseif (0 == $len) {
-            include_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Status must contain at least one character');
-        }
-        $data = array('status' => $status);
-        if (is_numeric($inReplyToStatusId) && !empty($inReplyToStatusId)) {
-            $data['in_reply_to_status_id'] = $inReplyToStatusId;
-        }
-        //$this->status = $status;
-        $response = $this->_post($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Get status replies
-     *
-     * $params may include one or more of the following keys
-     * - since_id: return results only after the specified tweet id
-     * - page: return page X of results
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusReplies(array $params = array())
-    {
-        $this->_init();
-        $path = '/statuses/replies.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Destroy a status message
-     *
-     * @param  int $id ID of status to destroy
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function statusDestroy($id)
-    {
-        $this->_init();
-        $path = '/statuses/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * User friends
-     *
-     * @param  int|string $id Id or username of user for whom to fetch friends
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userFriends(array $params = array())
-    {
-        $this->_init();
-        $path = '/statuses/friends';
-        $_params = array();
-
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $value;
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * User Followers
-     *
-     * @param  bool $lite If true, prevents inline inclusion of current status for followers; defaults to false
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userFollowers($lite = false)
-    {
-        $this->_init();
-        $path = '/statuses/followers.xml';
-        if ($lite) {
-            $this->lite = 'true';
-        }
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Get featured users
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userFeatured()
-    {
-        $this->_init();
-        $path = '/statuses/featured.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Show extended information on a user
-     *
-     * @param  int|string $id User ID or name
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function userShow($id)
-    {
-        $this->_init();
-        $path = '/users/show/' . $id . '.xml';
-        $response = $this->_get($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Retrieve direct messages for the current user
-     *
-     * $params may include one or more of the following keys
-     * - since_id: return statuses only greater than the one specified
-     * - page: return page X of results
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function directMessageMessages(array $params = array())
-    {
-        $this->_init();
-        $path = '/direct_messages.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Retrieve list of direct messages sent by current user
-     *
-     * $params may include one or more of the following keys
-     * - since_id: return statuses only greater than the one specified
-     * - page: return page X of results
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function directMessageSent(array $params = array())
-    {
-        $this->_init();
-        $path = '/direct_messages/sent.xml';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'since_id':
-                    $_params['since_id'] = $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Send a direct message to a user
-     *
-     * @param  int|string $user User to whom to send message
-     * @param  string $text Message to send to user
-     * @return Zend_Rest_Client_Result
-     * @throws Zend_Service_Twitter_Exception if message is too short or too long
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     */
-    public function directMessageNew($user, $text)
-    {
-        $this->_init();
-        $path = '/direct_messages/new.xml';
-        $len = iconv_strlen($text, 'UTF-8');
-        if (0 == $len) {
-            throw new Zend_Service_Twitter_Exception('Direct message must contain at least one character');
-        } elseif (140 < $len) {
-            throw new Zend_Service_Twitter_Exception('Direct message must contain no more than 140 characters');
-        }
-        $data = array('user' => $user, 'text' => $text);
-        $response = $this->_post($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Destroy a direct message
-     *
-     * @param  int $id ID of message to destroy
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function directMessageDestroy($id)
-    {
-        $this->_init();
-        $path = '/direct_messages/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Create friendship
-     *
-     * @param  int|string $id User ID or name of new friend
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function friendshipCreate($id)
-    {
-        $this->_init();
-        $path = '/friendships/create/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Destroy friendship
-     *
-     * @param  int|string $id User ID or name of friend to remove
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function friendshipDestroy($id)
-    {
-        $this->_init();
-        $path = '/friendships/destroy/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Friendship exists
-     *
-     * @param int|string $id User ID or name of friend to see if they are your friend
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_result
-     */
-    public function friendshipExists($id)
-    {
-        $this->_init();
-        $path = '/friendships/exists.xml';
-        $data = array('user_a' => $this->getUsername(), 'user_b' => $id);
-        $response = $this->_get($path, $data);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Verify Account Credentials
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     *
-     * @return Zend_Rest_Client_Result
-     */
-    public function accountVerifyCredentials()
-    {
-        $this->_init();
-        $response = $this->_get('/account/verify_credentials.xml');
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * End current session
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return true
-     */
-    public function accountEndSession()
-    {
-        $this->_init();
-        $this->_get('/account/end_session');
-        return true;
-    }
-
-    /**
-     * Returns the number of api requests you have left per hour.
-     *
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function accountRateLimitStatus()
-    {
-        $this->_init();
-        $response = $this->_get('/account/rate_limit_status.xml');
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Fetch favorites
-     *
-     * $params may contain one or more of the following:
-     * - 'id': Id of a user for whom to fetch favorites
-     * - 'page': Retrieve a different page of resuls
-     *
-     * @param  array $params
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function favoriteFavorites(array $params = array())
-    {
-        $this->_init();
-        $path = '/favorites';
-        $_params = array();
-        foreach ($params as $key => $value) {
-            switch (strtolower($key)) {
-                case 'id':
-                    $path .= '/' . $this->_validInteger($value);
-                    break;
-                case 'page':
-                    $_params['page'] = (int) $value;
-                    break;
-                default:
-                    break;
-            }
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, $_params);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Mark a status as a favorite
-     *
-     * @param  int $id Status ID you want to mark as a favorite
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function favoriteCreate($id)
-    {
-        $this->_init();
-        $path = '/favorites/create/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Remove a favorite
-     *
-     * @param  int $id Status ID you want to de-list as a favorite
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return Zend_Rest_Client_Result
-     */
-    public function favoriteDestroy($id)
-    {
-        $this->_init();
-        $path = '/favorites/destroy/' . $this->_validInteger($id) . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Blocks the user specified in the ID parameter as the authenticating user.
-     * Destroys a friendship to the blocked user if it exists.
-     *
-     * @param integer|string $id       The ID or screen name of a user to block.
-     * @return Zend_Rest_Client_Result
-     */
-    public function blockCreate($id)
-    {
-        $this->_init();
-        $path = '/blocks/create/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Un-blocks the user specified in the ID parameter for the authenticating user
-     *
-     * @param integer|string $id       The ID or screen_name of the user to un-block.
-     * @return Zend_Rest_Client_Result
-     */
-    public function blockDestroy($id)
-    {
-        $this->_init();
-        $path = '/blocks/destroy/' . $id . '.xml';
-        $response = $this->_post($path);
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Returns if the authenticating user is blocking a target user.
-     *
-     * @param string|integer $id    The ID or screen_name of the potentially blocked user.
-     * @param boolean $returnResult Instead of returning a boolean return the rest response from twitter
-     * @return Boolean|Zend_Rest_Client_Result
-     */
-    public function blockExists($id, $returnResult = false)
-    {
-        $this->_init();
-        $path = '/blocks/exists/' . $id . '.xml';
-        $response = $this->_get($path);
-
-        $cr = new Zend_Rest_Client_Result($response->getBody());
-
-        if ($returnResult === true)
-            return $cr;
-
-        if (!empty($cr->request)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns an array of user objects that the authenticating user is blocking
-     *
-     * @param integer $page         Optional. Specifies the page number of the results beginning at 1. A single page contains 20 ids.
-     * @param boolean $returnUserIds  Optional. Returns only the userid's instead of the whole user object
-     * @return Zend_Rest_Client_Result
-     */
-    public function blockBlocking($page = 1, $returnUserIds = false)
-    {
-        $this->_init();
-        $path = '/blocks/blocking';
-        if ($returnUserIds === true) {
-            $path .= '/ids';
-        }
-        $path .= '.xml';
-        $response = $this->_get($path, array('page' => $page));
-        return new Zend_Rest_Client_Result($response->getBody());
-    }
-
-    /**
-     * Protected function to validate that the integer is valid or return a 0
-     * @param $int
-     * @throws Zend_Http_Client_Exception if HTTP request fails or times out
-     * @return integer
-     */
-    protected function _validInteger($int)
-    {
-        if (preg_match("/(\d+)/", $int)) {
-            return $int;
-        }
-        return 0;
-    }
-
-    /**
-     * Validate a screen name using Twitter rules
-     *
-     * @param string $name
-     * @throws Zend_Service_Twitter_Exception
-     * @return string
-     */
-    protected function _validateScreenName($name)
-    {
-        if (!preg_match('/^[a-zA-Z0-9_]{0,20}$/', $name)) {
-            require_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Screen name, "' . $name . '" should only contain alphanumeric characters and' . ' underscores, and not exceed 15 characters.');
-        }
-        return $name;
-    }
-
-    /**
-     * Call a remote REST web service URI and return the Zend_Http_Response object
-     *
-     * @param  string $path            The path to append to the URI
-     * @throws Zend_Rest_Client_Exception
-     * @return void
-     */
-    protected function _prepare($path)
-    {
-        // Get the URI object and configure it
-        if (!$this->_uri instanceof Zend_Uri_Http) {
-            require_once 'Zend/Rest/Client/Exception.php';
-            throw new Zend_Rest_Client_Exception('URI object must be set before performing call');
-        }
-
-        $uri = $this->_uri->getUri();
-
-        if ($path[0] != '/' && $uri[strlen($uri) - 1] != '/') {
-            $path = '/' . $path;
-        }
-
-        $this->_uri->setPath($path);
-
-        /**
-         * Get the HTTP client and configure it for the endpoint URI.  Do this each time
-         * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses.
-         */
-        $this->_localHttpClient->resetParameters()->setUri($this->_uri);
-    }
-
-    /**
-     * Performs an HTTP GET request to the $path.
-     *
-     * @param string $path
-     * @param array  $query Array of GET parameters
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    protected function _get($path, array $query = null)
-    {
-        $this->_prepare($path);
-        $this->_localHttpClient->setParameterGet($query);
-        return $this->_localHttpClient->request('GET');
-    }
-
-    /**
-     * Performs an HTTP POST request to $path.
-     *
-     * @param string $path
-     * @param mixed $data Raw data to send
-     * @throws Zend_Http_Client_Exception
-     * @return Zend_Http_Response
-     */
-    protected function _post($path, $data = null)
-    {
-        $this->_prepare($path);
-        return $this->_performPost('POST', $data);
-    }
-
-    /**
-     * Perform a POST or PUT
-     *
-     * Performs a POST or PUT request. Any data provided is set in the HTTP
-     * client. String data is pushed in as raw POST data; array or object data
-     * is pushed in as POST parameters.
-     *
-     * @param mixed $method
-     * @param mixed $data
-     * @return Zend_Http_Response
-     */
-    protected function _performPost($method, $data = null)
-    {
-        $client = $this->_localHttpClient;
-        if (is_string($data)) {
-            $client->setRawData($data);
-        } elseif (is_array($data) || is_object($data)) {
-            $client->setParameterPost((array) $data);
-        }
-        return $client->request($method);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Service/Twitter/Exception.php b/airtime_mvc/library/Zend/Service/Twitter/Exception.php
deleted file mode 100644
index 9d43eaf6b..000000000
--- a/airtime_mvc/library/Zend/Service/Twitter/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Twitter_Exception extends Zend_Service_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Service/Twitter/Search.php b/airtime_mvc/library/Zend/Service/Twitter/Search.php
deleted file mode 100644
index 7be868c8d..000000000
--- a/airtime_mvc/library/Zend/Service/Twitter/Search.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Search.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Rest/Client.php';
-
-/**
- * @see Zend_Json
- */
-require_once 'Zend/Json.php';
-
-/**
- * @see Zend_Feed
- */
-require_once 'Zend/Feed.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Twitter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Service_Twitter_Search extends Zend_Rest_Client
-{
-    /**
-     * Return Type
-     * @var String
-     */
-    protected $_responseType = 'json';
-
-    /**
-     * Response Format Types
-     * @var array
-     */
-    protected $_responseTypes = array(
-        'atom',
-        'json'
-    );
-
-    /**
-     * Uri Compoent
-     *
-     * @var Zend_Uri_Http
-     */
-    protected $_uri;
-
-    /**
-     * Constructor
-     *
-     * @param  string $returnType
-     * @return void
-     */
-    public function __construct($responseType = 'json')
-    {
-        $this->setResponseType($responseType);
-        $this->setUri("http://search.twitter.com");
-
-        $this->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8');
-    }
-
-    /**
-     * set responseType
-     *
-     * @param string $responseType
-     * @throws Zend_Service_Twitter_Exception
-     * @return Zend_Service_Twitter_Search
-     */
-    public function setResponseType($responseType = 'json')
-    {
-        if(!in_array($responseType, $this->_responseTypes, TRUE)) {
-            require_once 'Zend/Service/Twitter/Exception.php';
-            throw new Zend_Service_Twitter_Exception('Invalid Response Type');
-        }
-        $this->_responseType = $responseType;
-        return $this;
-    }
-
-    /**
-     * Retrieve responseType
-     *
-     * @return string
-     */
-    public function getResponseType()
-    {
-        return $this->_responseType;
-    }
-
-    /**
-     * Get the current twitter trends.  Currnetly only supports json as the return.
-     *
-     * @throws Zend_Http_Client_Exception
-     * @return array
-     */
-    public function trends()
-    {
-        $response     = $this->restGet('/trends.json');
-
-        return Zend_Json::decode($response->getBody());
-    }
-
-    /**
-     * Performs a Twitter search query.
-     *
-     * @throws Zend_Http_Client_Exception
-     */
-    public function search($query, array $params = array())
-    {
-
-        $_query = array();
-
-        $_query['q'] = $query;
-
-        foreach($params as $key=>$param) {
-            switch($key) {
-                case 'geocode':
-                case 'lang':
-                case 'since_id':
-                    $_query[$key] = $param;
-                    break;
-                case 'rpp':
-                    $_query[$key] = (intval($param) > 100) ? 100 : intval($param);
-                    break;
-                case 'page':
-                    $_query[$key] = intval($param);
-                    break;
-                case 'show_user':
-                    $_query[$key] = 'true';
-            }
-        }
-
-        $response = $this->restGet('/search.' . $this->_responseType, $_query);
-
-        switch($this->_responseType) {
-            case 'json':
-                return Zend_Json::decode($response->getBody());
-                break;
-            case 'atom':
-                return Zend_Feed::importString($response->getBody());
-                break;
-        }
-
-        return ;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
deleted file mode 100644
index a69b580f9..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SharedKeyCredentials.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-	/**
-	 * Development storage account and key
-	 */
-	const DEVSTORE_ACCOUNT       = "devstoreaccount1";
-	const DEVSTORE_KEY           = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
-	
-	/**
-	 * HTTP header prefixes
-	 */
-	const PREFIX_PROPERTIES      = "x-ms-prop-";
-	const PREFIX_METADATA        = "x-ms-meta-";
-	const PREFIX_STORAGE_HEADER  = "x-ms-";
-	
-	/**
-	 * Permissions
-	 */
-	const PERMISSION_READ        = "r";
-	const PERMISSION_WRITE       = "w";
-	const PERMISSION_DELETE      = "d";
-	const PERMISSION_LIST        = "l";
-
-	/**
-	 * Account name for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountName = '';
-	
-	/**
-	 * Account key for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountKey = '';
-	
-	/**
-	 * Use path-style URI's
-	 *
-	 * @var boolean
-	 */
-	protected $_usePathStyleUri = false;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 *
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 */
-	public function __construct(
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey  = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false
-	) {
-		$this->_accountName = $accountName;
-		$this->_accountKey = base64_decode($accountKey);
-		$this->_usePathStyleUri = $usePathStyleUri;
-	}
-	
-	/**
-	 * Set account name for Windows Azure
-	 *
-	 * @param  string $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setAccountName($value = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT)
-	{
-		$this->_accountName = $value;
-		return $this;
-	}
-	
-	/**
-	 * Set account key for Windows Azure
-	 *
-	 * @param  string $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setAccountkey($value = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY)
-	{
-		$this->_accountKey = base64_decode($value);
-		return $this;
-	}
-	
-	/**
-	 * Set use path-style URI's
-	 *
-	 * @param  boolean $value
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function setUsePathStyleUri($value = false)
-	{
-		$this->_usePathStyleUri = $value;
-		return $this;
-	}
-	
-	/**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	abstract public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	);
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	abstract public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	);
-	
-	
-	/**
-	 * Prepare query string for signing
-	 * 
-	 * @param  string $value Original query string
-	 * @return string        Query string for signing
-	 */
-	protected function _prepareQueryStringForSigning($value)
-	{
-	    // Check for 'comp='
-	    if (strpos($value, 'comp=') === false) {
-	        // If not found, no query string needed
-	        return '';
-	    } else {
-	        // If found, make sure it is the only parameter being used      
-    		if (strlen($value) > 0 && strpos($value, '?') === 0) {
-    			$value = substr($value, 1);
-    		}
-    		
-    		// Split parts
-    		$queryParts = explode('&', $value);
-    		foreach ($queryParts as $queryPart) {
-    		    if (strpos($queryPart, 'comp=') !== false) {
-    		        return '?' . $queryPart;
-    		    }
-    		}
-
-    		// Should never happen...
-			return '';
-	    }
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
deleted file mode 100644
index c1d3f40bc..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php
+++ /dev/null
@@ -1,305 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SharedKeyCredentials.php 24305 2009-07-23 06:30:04Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-     * Permission set
-     * 
-     * @var array
-     */
-    protected $_permissionSet = array();
-    
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
-	 *
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param array $permissionSet Permission set
-	 */
-	public function __construct(
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey  = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false, $permissionSet = array()
-	) {
-	    parent::__construct($accountName, $accountKey, $usePathStyleUri);
-	    $this->_permissionSet = $permissionSet;
-	}
-	
-	/**
-	 * Get permission set
-	 * 
-	 * @return array
-	 */
-    public function getPermissionSet()
-	{
-	    return $this->_permissionSet;   
-	}
-	
-	/**
-	 * Set permisison set
-	 * 
-	 * Warning: fine-grained permissions should be added prior to coarse-grained permissions.
-	 * For example: first add blob permissions, end with container-wide permissions.
-	 * 
-	 * Warning: the signed access signature URL must match the account name of the
-	 * Zend_Service_WindowsAzure_Credentials_Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance
-	 * 
-	 * @param  array $value Permission set
-	 * @return void
-	 */
-    public function setPermissionSet($value = array())
-	{
-		foreach ($value as $url) {
-			if (strpos($url, $this->_accountName) === false) {
-				throw new Zend_Service_WindowsAzure_Exception('The permission set can only contain URLs for the account name specified in the Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance.');
-			}
-		}
-	    $this->_permissionSet = $value;
-	}
-    
-    /**
-     * Create signature
-     * 
-     * @param string $path 		   Path for the request
-     * @param string $resource     Signed resource - container (c) - blob (b)
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier   Signed identifier
-     * @return string 
-     */
-    public function createSignature(
-    	$path = '/',
-    	$resource = 'b',
-    	$permissions = 'r',
-    	$start = '',
-    	$expiry = '',
-    	$identifier = ''
-    ) {
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-			
-		// Add trailing slash to $path
-		if (substr($path, 0, 1) !== '/') {
-		    $path = '/' . $path;
-		}
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		/*if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}*/
-		$canonicalizedResource .= $path;
-		    
-		// Create string to sign   
-		$stringToSign   = array();
-		$stringToSign[] = $permissions;
-    	$stringToSign[] = $start;
-    	$stringToSign[] = $expiry;
-    	$stringToSign[] = $canonicalizedResource;
-    	$stringToSign[] = $identifier;
-
-    	$stringToSign = implode("\n", $stringToSign);
-    	$signature    = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-	
-    	return $signature;
-    }
-
-    /**
-     * Create signed query string
-     * 
-     * @param string $path 		   Path for the request
-     * @param string $queryString  Query string for the request
-     * @param string $resource     Signed resource - container (c) - blob (b)
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier   Signed identifier
-     * @return string 
-     */
-    public function createSignedQueryString(
-    	$path = '/',
-    	$queryString = '',
-    	$resource = 'b',
-    	$permissions = 'r',
-    	$start = '',
-    	$expiry = '',
-    	$identifier = ''
-    ) {
-        // Parts
-        $parts = array();
-        if ($start !== '') {
-            $parts[] = 'st=' . urlencode($start);
-        }
-        $parts[] = 'se=' . urlencode($expiry);
-        $parts[] = 'sr=' . $resource;
-        $parts[] = 'sp=' . $permissions;
-        if ($identifier !== '') {
-            $parts[] = 'si=' . urlencode($identifier);
-        }
-        $parts[] = 'sig=' . urlencode($this->createSignature($path, $resource, $permissions, $start, $expiry, $identifier));
-
-        // Assemble parts and query string
-        if ($queryString != '') {
-            $queryString .= '&';
-	    }
-        $queryString .= implode('&', $parts);
-
-        return $queryString;
-    }
-    
-    /**
-	 * Permission matches request?
-	 *
-	 * @param string $permissionUrl Permission URL
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-    public function permissionMatchesRequest(
-    	$permissionUrl = '',
-    	$requestUrl = '',
-    	$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-    	$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-    ) {
-        // Build requirements
-        $requiredResourceType = $resourceType;
-        if ($requiredResourceType == Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB) {
-            $requiredResourceType .= Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER;
-        }
-
-        // Parse permission url
-	    $parsedPermissionUrl = parse_url($permissionUrl);
-	    
-	    // Parse permission properties
-	    $permissionParts = explode('&', $parsedPermissionUrl['query']);
-	    
-	    // Parse request url
-	    $parsedRequestUrl = parse_url($requestUrl);
-	    
-	    // Check if permission matches request
-	    $matches = true;
-	    foreach ($permissionParts as $part) {
-	        list($property, $value) = explode('=', $part, 2);
-	        
-	        if ($property == 'sr') {
-	            $matches = $matches && (strpbrk($value, $requiredResourceType) !== false);
-	        }
-	        
-	    	if ($property == 'sp') {
-	            $matches = $matches && (strpbrk($value, $requiredPermission) !== false);
-	        }
-	    }
-	    
-	    // Ok, but... does the resource match?
-	    $matches = $matches && (strpos($parsedRequestUrl['path'], $parsedPermissionUrl['path']) !== false);
-	    
-        // Return
-	    return $matches;
-    }    
-    
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    // Look for a matching permission
-	    foreach ($this->getPermissionSet() as $permittedUrl) {
-	        if ($this->permissionMatchesRequest($permittedUrl, $requestUrl, $resourceType, $requiredPermission)) {
-	            // This matches, append signature data
-	            $parsedPermittedUrl = parse_url($permittedUrl);
-
-	            if (strpos($requestUrl, '?') === false) {
-	                $requestUrl .= '?';
-	            } else {
-	                $requestUrl .= '&';
-	            }
-	            
-	            $requestUrl .= $parsedPermittedUrl['query'];
-
-	            // Return url
-	            return $requestUrl;
-	        }
-	    }
-	    
-	    // Return url, will be unsigned...
-	    return $requestUrl;
-	}
-    
-	/**
-	 * Sign request with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $headers;
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
deleted file mode 100644
index 3e99b80f8..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SharedKey.php 35999 2009-12-21 07:56:42Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedKey
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $requestUrl;
-	}
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-		// http://github.com/sriramk/winazurestorage/blob/214010a2f8931bac9c96dfeb337d56fe084ca63b/winazurestorage.py
-
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-
-		// Determine query
-		$queryString = $this->_prepareQueryStringForSigning($queryString);
-	
-		// Canonicalized headers
-		$canonicalizedHeaders = array();
-		
-		// Request date
-		$requestDate = '';
-		if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) {
-		    $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'];
-		} else {
-		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-		    $canonicalizedHeaders[] = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date:' . $requestDate;
-		}
-		
-		// Build canonicalized headers
-		if (!is_null($headers)) {
-			foreach ($headers as $header => $value) {
-				if (is_bool($value)) {
-					$value = $value === true ? 'True' : 'False';
-				}
-
-				$headers[$header] = $value;
-				if (substr($header, 0, strlen(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER)) == Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER) {
-				    $canonicalizedHeaders[] = strtolower($header) . ':' . $value;
-				}
-			}
-		}
-		sort($canonicalizedHeaders);
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}
-		$canonicalizedResource .= $path;
-		if ($queryString !== '') {
-		    $canonicalizedResource .= $queryString;
-		}
-
-		// Create string to sign   
-		$stringToSign   = array();
-		$stringToSign[] = strtoupper($httpVerb); 	// VERB
-    	$stringToSign[] = "";						// Content-MD5
-    	$stringToSign[] = "";						// Content-Type
-    	$stringToSign[] = "";
-        // Date already in $canonicalizedHeaders
-    	// $stringToSign[] = self::PREFIX_STORAGE_HEADER . 'date:' . $requestDate; // Date
-    	
-    	if (!$forTableStorage && count($canonicalizedHeaders) > 0) {
-    		$stringToSign[] = implode("\n", $canonicalizedHeaders); // Canonicalized headers
-    	}
-    		
-    	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
-    	$stringToSign   = implode("\n", $stringToSign);
-    	$signString     = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-
-    	// Sign request
-    	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
-    	$headers['Authorization'] = 'SharedKey ' . $this->_accountName . ':' . $signString;
-    	
-    	// Return headers
-    	return $headers;
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
deleted file mode 100644
index cc9f944af..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SharedKeyCredentials.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */ 
-class Zend_Service_WindowsAzure_Credentials_SharedKeyLite
-    extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-{
-    /**
-	 * Sign request URL with credentials
-	 *
-	 * @param string $requestUrl Request URL
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return string Signed request URL
-	 */
-	public function signRequestUrl(
-		$requestUrl = '',
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    return $requestUrl;
-	}
-	
-	/**
-	 * Sign request headers with credentials
-	 *
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param string $path Path for the request
-	 * @param string $queryString Query string for the request
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return array Array of headers
-	 */
-	public function signRequestHeaders(
-		$httpVerb = Zend_Http_Client::GET,
-		$path = '/',
-		$queryString = '',
-		$headers = null,
-		$forTableStorage = false,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-		// Determine path
-		if ($this->_usePathStyleUri) {
-			$path = substr($path, strpos($path, '/'));
-		}
-
-		// Determine query
-		$queryString = $this->_prepareQueryStringForSigning($queryString);
-
-		// Build canonicalized resource string
-		$canonicalizedResource  = '/' . $this->_accountName;
-		if ($this->_usePathStyleUri) {
-			$canonicalizedResource .= '/' . $this->_accountName;
-		}
-		$canonicalizedResource .= $path;
-		if ($queryString !== '') {
-		    $canonicalizedResource .= $queryString;
-		}
-
-		// Request date
-		$requestDate = '';
-		if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) {
-		    $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'];
-		} else {
-		    $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-		}
-
-		// Create string to sign   
-		$stringToSign   = array();
-    	$stringToSign[] = $requestDate; // Date
-    	$stringToSign[] = $canonicalizedResource;		 			// Canonicalized resource
-    	$stringToSign   = implode("\n", $stringToSign);
-    	$signString     = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true));
-
-    	// Sign request
-    	$headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate;
-    	$headers['Authorization'] = 'SharedKeyLite ' . $this->_accountName . ':' . $signString;
-    	
-    	// Return headers
-    	return $headers;
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Exception.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Exception.php
deleted file mode 100644
index 1f3ac24c6..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Exception
- * @version    $Id: Exception.php 28585 2009-09-07 12:12:56Z unknown $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_Exception
- */
-require_once 'Zend/Service/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Exception extends Zend_Service_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php b/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php
deleted file mode 100644
index 386350857..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Exception
- * @version    $Id: Exception.php 28585 2009-09-07 12:12:56Z unknown $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_Exception extends Zend_Service_WindowsAzure_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
deleted file mode 100644
index 0b24bda7d..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id: NoRetry.php 35709 2009-12-14 14:14:14Z unknown $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public function execute($function, $parameters = array())
-    {
-        $returnValue = null;
-        
-        try
-        {
-            $returnValue = call_user_func_array($function, $parameters);
-            return $returnValue;
-        }
-        catch (Exception $ex)
-        {
-            throw $ex;
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
deleted file mode 100644
index 85fe62e14..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id: RetryN.php 35709 2009-12-14 14:14:14Z unknown $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_Exception
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_RetryPolicy_RetryN extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Number of retries
-     * 
-     * @var int
-     */
-    protected $_retryCount = 1;
-    
-    /**
-     * Interval between retries (in milliseconds)
-     * 
-     * @var int
-     */
-    protected $_retryInterval = 0;
-    
-    /**
-     * Constructor
-     * 
-     * @param int $count                    Number of retries
-     * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
-     */
-    public function __construct($count = 1, $intervalBetweenRetries = 0)
-    {
-        $this->_retryCount = $count;
-        $this->_retryInterval = $intervalBetweenRetries;
-    }
-    
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public function execute($function, $parameters = array())
-    {
-        $returnValue = null;
-        
-        for ($retriesLeft = $this->_retryCount; $retriesLeft >= 0; --$retriesLeft) {
-            try {
-                $returnValue = call_user_func_array($function, $parameters);
-                return $returnValue;
-            } catch (Exception $ex) {
-                if ($retriesLeft == 1) {
-                    throw new Zend_Service_WindowsAzure_RetryPolicy_Exception("Exceeded retry count of " . $this->_retryCount . ". " . $ex->getMessage());
-                }
-                    
-                usleep($this->_retryInterval * 1000);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php b/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
deleted file mode 100644
index bbc095459..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @version    $Id: RetryPolicy.php 28585 2009-09-07 12:12:56Z unknown $
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_NoRetry
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryN
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryN.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage RetryPolicy
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-{
-    /**
-     * Execute function under retry policy
-     * 
-     * @param string|array $function       Function to execute
-     * @param array        $parameters     Parameters for function call
-     * @return mixed
-     */
-    public abstract function execute($function, $parameters = array());
-    
-    /**
-     * Create a Zend_Service_WindowsAzure_RetryPolicy_NoRetry instance
-     * 
-     * @return Zend_Service_WindowsAzure_RetryPolicy_NoRetry
-     */
-    public static function noRetry()
-    {
-        return new Zend_Service_WindowsAzure_RetryPolicy_NoRetry();
-    }
-    
-    /**
-     * Create a Zend_Service_WindowsAzure_RetryPolicy_RetryN instance
-     * 
-     * @param int $count                    Number of retries
-     * @param int $intervalBetweenRetries   Interval between retries (in milliseconds)
-     * @return Zend_Service_WindowsAzure_RetryPolicy_RetryN
-     */
-    public static function retryN($count = 1, $intervalBetweenRetries = 0)
-    {
-        return new Zend_Service_WindowsAzure_RetryPolicy_RetryN($count, $intervalBetweenRetries);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/SessionHandler.php b/airtime_mvc/library/Zend/Service/WindowsAzure/SessionHandler.php
deleted file mode 100644
index cd19f6c33..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/SessionHandler.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 21617 2009-06-12 10:46:31Z unknown $
- */
-
-/** Zend_Service_WindowsAzure_Storage_Table */
-require_once 'Zend/Service/WindowsAzure/Storage/Table.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_SessionHandler
-{
-    /**
-     * Table storage
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Table
-     */
-    protected $_tableStorage;
-    
-    /**
-     * Session table name
-     * 
-     * @var string
-     */
-    protected $_sessionTable;
-    
-    /**
-     * Session table partition
-     * 
-     * @var string
-     */
-    protected $_sessionTablePartition;
-	
-    /**
-     * Creates a new Zend_Service_WindowsAzure_SessionHandler instance
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_Table $tableStorage Table storage
-     * @param string $sessionTable Session table name
-     * @param string $sessionTablePartition Session table partition
-     */
-    public function __construct(Zend_Service_WindowsAzure_Storage_Table $tableStorage, $sessionTable = 'phpsessions', $sessionTablePartition = 'sessions')
-	{
-	    // Set properties
-		$this->_tableStorage = $tableStorage;
-		$this->_sessionTable = $sessionTable;
-		$this->_sessionTablePartition = $sessionTablePartition;
-	}
-	
-	/**
-	 * Registers the current session handler as PHP's session handler
-	 * 
-	 * @return boolean
-	 */
-	public function register()
-	{
-        return session_set_save_handler(array($this, 'open'),
-                                        array($this, 'close'),
-                                        array($this, 'read'),
-                                        array($this, 'write'),
-                                        array($this, 'destroy'),
-                                        array($this, 'gc')
-        );
-	}
-	
-    /**
-     * Open the session store
-     * 
-     * @return bool
-     */
-    public function open()
-    {
-    	// Make sure table exists
-    	$tableExists = $this->_tableStorage->tableExists($this->_sessionTable);
-    	if (!$tableExists) {
-		    $this->_tableStorage->createTable($this->_sessionTable);
-		}
-		
-		// Ok!
-		return true;
-    }
-
-    /**
-     * Close the session store
-     * 
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-    
-    /**
-     * Read a specific session
-     * 
-     * @param int $id Session Id
-     * @return string
-     */
-    public function read($id)
-    {
-        try
-        {
-            $sessionRecord = $this->_tableStorage->retrieveEntityById(
-                $this->_sessionTable,
-                $this->_sessionTablePartition,
-                $id
-            );
-            return base64_decode($sessionRecord->serializedData);
-        }
-        catch (Zend_Service_WindowsAzure_Exception $ex)
-        {
-            return '';
-        }
-    }
-    
-    /**
-     * Write a specific session
-     * 
-     * @param int $id Session Id
-     * @param string $serializedData Serialized PHP object
-     */
-    public function write($id, $serializedData)
-    {
-        $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionTablePartition, $id);
-        $sessionRecord->sessionExpires = time();
-        $sessionRecord->serializedData = base64_encode($serializedData);
-        
-        $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32');
-
-        try
-        {
-            $this->_tableStorage->updateEntity($this->_sessionTable, $sessionRecord);
-        }
-        catch (Zend_Service_WindowsAzure_Exception $unknownRecord)
-        {
-            $this->_tableStorage->insertEntity($this->_sessionTable, $sessionRecord);
-        }
-    }
-    
-    /**
-     * Destroy a specific session
-     * 
-     * @param int $id Session Id
-     * @return boolean
-     */
-    public function destroy($id)
-    {
-        try
-        {
-            $sessionRecord = $this->_tableStorage->retrieveEntityById(
-                $this->_sessionTable,
-                $this->_sessionTablePartition,
-                $id
-            );
-            $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord);
-            
-            return true;
-        }
-        catch (Zend_Service_WindowsAzure_Exception $ex)
-        {
-            return false;
-        }
-    }
-    
-    /**
-     * Garbage collector
-     * 
-     * @param int $lifeTime Session maximal lifetime
-     * @see session.gc_divisor  100
-     * @see session.gc_maxlifetime 1440
-     * @see session.gc_probability 1
-     * @usage Execution rate 1/100 (session.gc_probability/session.gc_divisor)
-     * @return boolean
-     */
-    public function gc($lifeTime)
-    {
-        try
-        {
-            $result = $this->_tableStorage->retrieveEntities($this->_sessionTable, 'PartitionKey eq \'' . $this->_sessionTablePartition . '\' and sessionExpires lt ' . (time() - $lifeTime));
-            foreach ($result as $sessionRecord)
-            {
-                $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord);
-            }
-            return true;
-        }
-        catch (Zend_Service_WindowsAzure_exception $ex)
-        {
-            return false;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage.php
deleted file mode 100644
index 44730d4e9..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage.php
+++ /dev/null
@@ -1,504 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 36457 2010-01-04 07:36:33Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * Development storage URLS
-	 */
-	const URL_DEV_BLOB      = "127.0.0.1:10000";
-	const URL_DEV_QUEUE     = "127.0.0.1:10001";
-	const URL_DEV_TABLE     = "127.0.0.1:10002";
-	
-	/**
-	 * Live storage URLS
-	 */
-	const URL_CLOUD_BLOB    = "blob.core.windows.net";
-	const URL_CLOUD_QUEUE   = "queue.core.windows.net";
-	const URL_CLOUD_TABLE   = "table.core.windows.net";
-	
-	/**
-	 * Resource types
-	 */
-	const RESOURCE_UNKNOWN     = "unknown";
-	const RESOURCE_CONTAINER   = "c";
-	const RESOURCE_BLOB        = "b";
-	const RESOURCE_TABLE       = "t";
-	const RESOURCE_ENTITY      = "e";
-	const RESOURCE_QUEUE       = "q";
-	
-	/**
-	 * Current API version
-	 * 
-	 * @var string
-	 */
-	protected $_apiVersion = '2009-04-14';
-	
-	/**
-	 * Storage host name
-	 *
-	 * @var string
-	 */
-	protected $_host = '';
-	
-	/**
-	 * Account name for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountName = '';
-	
-	/**
-	 * Account key for Windows Azure
-	 *
-	 * @var string
-	 */
-	protected $_accountKey = '';
-	
-	/**
-	 * Use path-style URI's
-	 *
-	 * @var boolean
-	 */
-	protected $_usePathStyleUri = false;
-	
-	/**
-	 * Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 *
-	 * @var Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	protected $_credentials = null;
-	
-	/**
-	 * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance
-	 * 
-	 * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
-	 */
-	protected $_retryPolicy = null;
-	
-	/**
-	 * Zend_Http_Client channel used for communication with REST services
-	 * 
-	 * @var Zend_Http_Client
-	 */
-	protected $_httpClientChannel = null;
-	
-	/**
-	 * Use proxy?
-	 * 
-	 * @var boolean
-	 */
-	protected $_useProxy = false;
-	
-	/**
-	 * Proxy url
-	 * 
-	 * @var string
-	 */
-	protected $_proxyUrl = '';
-	
-	/**
-	 * Proxy port
-	 * 
-	 * @var int
-	 */
-	protected $_proxyPort = 80;
-	
-	/**
-	 * Proxy credentials
-	 * 
-	 * @var string
-	 */
-	protected $_proxyCredentials = '';
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct(
-		$host = self::URL_DEV_BLOB,
-		$accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT,
-		$accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY,
-		$usePathStyleUri = false,
-		Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null
-	) {
-		$this->_host = $host;
-		$this->_accountName = $accountName;
-		$this->_accountKey = $accountKey;
-		$this->_usePathStyleUri = $usePathStyleUri;
-		
-		// Using local storage?
-		if (!$this->_usePathStyleUri
-			&& ($this->_host == self::URL_DEV_BLOB
-				|| $this->_host == self::URL_DEV_QUEUE
-				|| $this->_host == self::URL_DEV_TABLE)
-		) {
-			// Local storage
-			$this->_usePathStyleUri = true;
-		}
-		
-		if (is_null($this->_credentials)) {
-		    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKey(
-		    	$this->_accountName, $this->_accountKey, $this->_usePathStyleUri);
-		}
-		
-		$this->_retryPolicy = $retryPolicy;
-		if (is_null($this->_retryPolicy)) {
-		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
-		}
-		
-		// Setup default Zend_Http_Client channel
-		$this->_httpClientChannel = new Zend_Http_Client(
-			null,
-			array(
-				'adapter' => 'Zend_Http_Client_Adapter_Proxy',
-				'curloptions' => array(
-					CURLOPT_FOLLOWLOCATION => true,
-					CURLOPT_TIMEOUT => 120,
-				)
-			)
-		);
-	}
-	
-	/**
-	 * Set the HTTP client channel to use
-	 * 
-	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
-	 */
-	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy')
-	{
-		$this->_httpClientChannel->setAdapter($adapterInstance);
-	}
-	
-	/**
-	 * Set retry policy to use when making requests
-	 *
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		$this->_retryPolicy = $retryPolicy;
-		if (is_null($this->_retryPolicy)) {
-		    $this->_retryPolicy = Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract::noRetry();
-		}
-	}
-	
-	/**
-	 * Set proxy
-	 * 
-	 * @param boolean $useProxy         Use proxy?
-	 * @param string  $proxyUrl         Proxy URL
-	 * @param int     $proxyPort        Proxy port
-	 * @param string  $proxyCredentials Proxy credentials
-	 */
-	public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $proxyCredentials = '')
-	{
-	    $this->_useProxy         = $useProxy;
-	    $this->_proxyUrl         = $proxyUrl;
-	    $this->_proxyPort        = $proxyPort;
-	    $this->_proxyCredentials = $proxyCredentials;
-	    
-	    if ($this->_useProxy) {
-	    	$credentials = explode(':', $this->_proxyCredentials);
-	    	
-	    	$this->_httpClientChannel->setConfig(array(
-				'proxy_host' => $this->_proxyUrl,
-	    		'proxy_port' => $this->_proxyPort,
-	    		'proxy_user' => $credentials[0],
-	    		'proxy_pass' => $credentials[1],
-	    	));
-	    } else {
-			$this->_httpClientChannel->setConfig(array(
-				'proxy_host' => '',
-	    		'proxy_port' => 8080,
-	    		'proxy_user' => '',
-	    		'proxy_pass' => '',
-	    	));
-	    }
-	}
-	
-	/**
-	 * Returns the Windows Azure account name
-	 * 
-	 * @return string
-	 */
-	public function getAccountName()
-	{
-		return $this->_accountName;
-	}
-	
-	/**
-	 * Get base URL for creating requests
-	 *
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		if ($this->_usePathStyleUri) {
-			return 'http://' . $this->_host . '/' . $this->_accountName;
-		} else {
-			return 'http://' . $this->_accountName . '.' . $this->_host;
-		}
-	}
-	
-	/**
-	 * Set Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
-	 * @param Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance to use for request signing.
-	 */
-	public function setCredentials(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials)
-	{
-	    $this->_credentials = $credentials;
-	    $this->_credentials->setAccountName($this->_accountName);
-	    $this->_credentials->setAccountkey($this->_accountKey);
-	    $this->_credentials->setUsePathStyleUri($this->_usePathStyleUri);
-	}
-	
-	/**
-	 * Get Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance
-	 * 
-	 * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
-	 */
-	public function getCredentials()
-	{
-	    return $this->_credentials;
-	}
-	
-	/**
-	 * Perform request using Zend_Http_Client channel
-	 *
-	 * @param string $path Path
-	 * @param string $queryString Query string
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param mixed $rawData Optional RAW HTTP data to be sent over the wire
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return Zend_Http_Response
-	 */
-	protected function _performRequest(
-		$path = '/',
-		$queryString = '',
-		$httpVerb = Zend_Http_Client::GET,
-		$headers = array(),
-		$forTableStorage = false,
-		$rawData = null,
-		$resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN,
-		$requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ
-	) {
-	    // Clean path
-		if (strpos($path, '/') !== 0) {
-			$path = '/' . $path;
-		}
-			
-		// Clean headers
-		if (is_null($headers)) {
-		    $headers = array();
-		}
-		
-		// Ensure cUrl will also work correctly:
-		//  - disable Content-Type if required
-		//  - disable Expect: 100 Continue
-		if (!isset($headers["Content-Type"])) {
-			$headers["Content-Type"] = '';
-		}
-		$headers["Expect"]= '';
-
-		// Add version header
-		$headers['x-ms-version'] = $this->_apiVersion;
-		    
-		// URL encoding
-		$path           = self::urlencode($path);
-		$queryString    = self::urlencode($queryString);
-
-		// Generate URL and sign request
-		$requestUrl     = $this->_credentials
-						  ->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission);
-		$requestHeaders = $this->_credentials
-						  ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission);
-
-		// Prepare request
-		$this->_httpClientChannel->resetParameters(true);
-		$this->_httpClientChannel->setUri($requestUrl);
-		$this->_httpClientChannel->setHeaders($requestHeaders);
-		$this->_httpClientChannel->setRawData($rawData);
-		
-		// Execute request
-		$response = $this->_retryPolicy->execute(
-		    array($this->_httpClientChannel, 'request'),
-		    array($httpVerb)
-		);
-		
-		return $response;
-	}
-	
-	/** 
-	 * Parse result from Zend_Http_Response
-	 *
-	 * @param Zend_Http_Response $response Response from HTTP call
-	 * @return object
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	protected function _parseResponse(Zend_Http_Response $response = null)
-	{
-		if (is_null($response)) {
-			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
-		}
-		
-        $xml = @simplexml_load_string($response->getBody());
-        
-        if ($xml !== false) {
-            // Fetch all namespaces 
-            $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); 
-            
-            // Register all namespace prefixes
-            foreach ($namespaces as $prefix => $ns) { 
-                if ($prefix != '') {
-                    $xml->registerXPathNamespace($prefix, $ns);
-                } 
-            } 
-        }
-        
-        return $xml;
-	}
-	
-	/**
-	 * Generate metadata headers
-	 * 
-	 * @param array $metadata
-	 * @return HTTP headers containing metadata
-	 */
-	protected function _generateMetadataHeaders($metadata = array())
-	{
-		// Validate
-		if (!is_array($metadata)) {
-			return array();
-		}
-		
-		// Return headers
-		$headers = array();
-		foreach ($metadata as $key => $value) {
-			if (strpos($value, "\r") !== false || strpos($value, "\n") !== false) {
-				throw new Zend_Service_WindowsAzure_Exception('Metadata cannot contain newline characters.');
-			}
-		    $headers["x-ms-meta-" . strtolower($key)] = $value;
-		}
-		return $headers;
-	}
-	
-	/**
-	 * Parse metadata errors
-	 * 
-	 * @param array $headers HTTP headers containing metadata
-	 * @return array
-	 */
-	protected function _parseMetadataHeaders($headers = array())
-	{
-		// Validate
-		if (!is_array($headers)) {
-			return array();
-		}
-		
-		// Return metadata
-		$metadata = array();
-		foreach ($headers as $key => $value) {
-		    if (substr(strtolower($key), 0, 10) == "x-ms-meta-") {
-		        $metadata[str_replace("x-ms-meta-", '', strtolower($key))] = $value;
-		    }
-		}
-		return $metadata;
-	}
-	
-	/**
-	 * Generate ISO 8601 compliant date string in UTC time zone
-	 * 
-	 * @param int $timestamp
-	 * @return string
-	 */
-	public function isoDate($timestamp = null) 
-	{        
-	    $tz = @date_default_timezone_get();
-	    @date_default_timezone_set('UTC');
-	    
-	    if (is_null($timestamp)) {
-	        $timestamp = time();
-	    }
-	        
-	    $returnValue = str_replace('+00:00', '.0000000Z', @date('c', $timestamp));
-	    @date_default_timezone_set($tz);
-	    return $returnValue;
-	}
-	
-	/**
-	 * URL encode function
-	 * 
-	 * @param  string $value Value to encode
-	 * @return string        Encoded value
-	 */
-	public static function urlencode($value)
-	{
-	    return str_replace(' ', '%20', $value);
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Batch.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Batch.php
deleted file mode 100644
index 409aa679f..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Batch.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 21617 2009-06-12 10:46:31Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Batch
-{	
-    /**
-     * Storage client the batch is defined on
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-     */
-    protected $_storageClient = null;
-    
-    /**
-     * For table storage?
-     * 
-     * @var boolean
-     */
-    protected $_forTableStorage = false;
-    
-    /**
-     * Base URL
-     * 
-     * @var string
-     */
-    protected $_baseUrl;
-    
-    /**
-     * Pending operations
-     * 
-     * @var unknown_type
-     */
-    protected $_operations = array();
-    
-    /**
-     * Does the batch contain a single select?
-     * 
-     * @var boolean
-     */
-    protected $_isSingleSelect = false;
-    
-    /**
-     * Creates a new Zend_Service_WindowsAzure_Storage_Batch
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient Storage client the batch is defined on
-     */
-    public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient = null, $baseUrl = '')
-    {
-        $this->_storageClient = $storageClient;
-        $this->_baseUrl       = $baseUrl;
-        $this->_beginBatch();
-    }
-    
-	/**
-	 * Get base URL for creating requests
-	 *
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		return $this->_baseUrl;
-	}
-    
-    /**
-     * Starts a new batch operation set
-     * 
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    protected function _beginBatch()
-    {
-        $this->_storageClient->setCurrentBatch($this);
-    }
-    
-    /**
-     * Cleanup current batch
-     */
-    protected function _clean()
-    {
-        unset($this->_operations);
-        $this->_storageClient->setCurrentBatch(null);
-        $this->_storageClient = null;
-        unset($this);
-    }
-
-	/**
-	 * Enlist operation in current batch
-	 *
-	 * @param string $path Path
-	 * @param string $queryString Query string
-	 * @param string $httpVerb HTTP verb the request will use
-	 * @param array $headers x-ms headers to add
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param mixed $rawData Optional RAW HTTP data to be sent over the wire
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend_Http_Client::GET, $headers = array(), $forTableStorage = false, $rawData = null)
-	{
-	    // Set _forTableStorage
-	    if ($forTableStorage) {
-	        $this->_forTableStorage = true;
-	    }
-	    
-	    // Set _isSingleSelect
-	    if ($httpVerb == Zend_Http_Client::GET) {
-	        if (count($this->_operations) > 0) {
-	            throw new Zend_Service_WindowsAzure_Exception("Select operations can only be performed in an empty batch transaction.");
-	        }
-	        $this->_isSingleSelect = true;
-	    }
-	    
-	    // Clean path
-		if (strpos($path, '/') !== 0) {
-			$path = '/' . $path;
-		}
-			
-		// Clean headers
-		if (is_null($headers)) {
-		    $headers = array();
-		}
-		    
-		// URL encoding
-		$path           = Zend_Service_WindowsAzure_Storage::urlencode($path);
-		$queryString    = Zend_Service_WindowsAzure_Storage::urlencode($queryString);
-
-		// Generate URL
-		$requestUrl     = $this->getBaseUrl() . $path . $queryString;
-		
-		// Generate $rawData
-		if (is_null($rawData)) {
-		    $rawData = '';
-		}
-		    
-		// Add headers
-		if ($httpVerb != Zend_Http_Client::GET) {
-    		$headers['Content-ID'] = count($this->_operations) + 1;
-    		if ($httpVerb != Zend_Http_Client::DELETE) {
-    		    $headers['Content-Type'] = 'application/atom+xml;type=entry';
-    		}
-    		$headers['Content-Length'] = strlen($rawData);
-		}
-		    
-		// Generate $operation
-		$operation = '';
-		$operation .= $httpVerb . ' ' . $requestUrl . ' HTTP/1.1' . "\n";
-		foreach ($headers as $key => $value)
-		{
-		    $operation .= $key . ': ' . $value . "\n";
-		}
-		$operation .= "\n";
-		
-		// Add data
-		$operation .= $rawData;
-
-		// Store operation
-		$this->_operations[] = $operation;	        
-	}
-    
-    /**
-     * Commit current batch
-     * 
-     * @return Zend_Http_Response
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function commit()
-    {
-        // Perform batch
-        $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect);
-        
-        // Dispose
-        $this->_clean();
-        
-        // Parse response
-        $errors = null;
-        preg_match_all('/<message (.*)>(.*)<\/message>/', $response->getBody(), $errors);
-        
-        // Error?
-        if (count($errors[2]) > 0) {
-            throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]);
-        }
-        
-        // Return
-        return $response;
-    }
-    
-    /**
-     * Rollback current batch
-     */
-    public function rollback()
-    {
-        // Dispose
-        $this->_clean();
-    }
-    
-    /**
-     * Get operation count
-     * 
-     * @return integer
-     */
-    public function getOperationCount()
-    {
-        return count($this->_operations);
-    }
-    
-    /**
-     * Is single select?
-     * 
-     * @return boolean
-     */
-    public function isSingleSelect()
-    {
-        return $this->_isSingleSelect;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
deleted file mode 100644
index 61f175955..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 21617 2009-06-12 10:46:31Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_Batch
- */
-require_once 'Zend/Service/WindowsAzure/Storage/Batch.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-    extends Zend_Service_WindowsAzure_Storage
-{	
-    /**
-     * Current batch
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Batch
-     */
-    protected $_currentBatch = null;
-    
-    /**
-     * Set current batch
-     * 
-     * @param Zend_Service_WindowsAzure_Storage_Batch $batch Current batch
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch = null)
-    {
-        if (!is_null($batch) && $this->isInBatch()) {
-            throw new Zend_Service_WindowsAzure_Exception('Only one batch can be active at a time.');
-        }
-        $this->_currentBatch = $batch;
-    }
-    
-    /**
-     * Get current batch
-     * 
-     * @return Zend_Service_WindowsAzure_Storage_Batch
-     */
-    public function getCurrentBatch()
-    {
-        return $this->_currentBatch;
-    }
-    
-    /**
-     * Is there a current batch?
-     * 
-     * @return boolean
-     */
-    public function isInBatch()
-    {
-        return !is_null($this->_currentBatch);
-    }
-    
-    /**
-     * Starts a new batch operation set
-     * 
-     * @return Zend_Service_WindowsAzure_Storage_Batch
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function startBatch()
-    {
-        return new Zend_Service_WindowsAzure_Storage_Batch($this, $this->getBaseUrl());
-    }
-	
-	/**
-	 * Perform batch using Zend_Http_Client channel, combining all batch operations into one request
-	 *
-	 * @param array $operations Operations in batch
-	 * @param boolean $forTableStorage Is the request for table storage?
-	 * @param boolean $isSingleSelect Is the request a single select statement?
-	 * @param string $resourceType Resource type
-	 * @param string $requiredPermission Required permission
-	 * @return Zend_Http_Response
-	 */
-	public function performBatch($operations = array(), $forTableStorage = false, $isSingleSelect = false, $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ)
-	{
-	    // Generate boundaries
-	    $batchBoundary = 'batch_' . md5(time() . microtime());
-	    $changesetBoundary = 'changeset_' . md5(time() . microtime());
-	    
-	    // Set headers
-	    $headers = array();
-	    
-		// Add version header
-		$headers['x-ms-version'] = $this->_apiVersion;
-		
-		// Add content-type header
-		$headers['Content-Type'] = 'multipart/mixed; boundary=' . $batchBoundary;
-
-		// Set path and query string
-		$path           = '/$batch';
-		$queryString    = '';
-		
-		// Set verb
-		$httpVerb = Zend_Http_Client::POST;
-		
-		// Generate raw data
-    	$rawData = '';
-    		
-		// Single select?
-		if ($isSingleSelect) {
-		    $operation = $operations[0];
-		    $rawData .= '--' . $batchBoundary . "\n";
-            $rawData .= 'Content-Type: application/http' . "\n";
-            $rawData .= 'Content-Transfer-Encoding: binary' . "\n\n";
-            $rawData .= $operation; 
-            $rawData .= '--' . $batchBoundary . '--';
-		} else {
-    		$rawData .= '--' . $batchBoundary . "\n";
-    		$rawData .= 'Content-Type: multipart/mixed; boundary=' . $changesetBoundary . "\n\n";
-    		
-        		// Add operations
-        		foreach ($operations as $operation)
-        		{
-                    $rawData .= '--' . $changesetBoundary . "\n";
-                	$rawData .= 'Content-Type: application/http' . "\n";
-                	$rawData .= 'Content-Transfer-Encoding: binary' . "\n\n";
-                	$rawData .= $operation;
-        		}
-        		$rawData .= '--' . $changesetBoundary . '--' . "\n";
-    		    		    
-    		$rawData .= '--' . $batchBoundary . '--';
-		}
-
-		// Generate URL and sign request
-		$requestUrl     = $this->_credentials->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission);
-		$requestHeaders = $this->_credentials->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission);
-
-		// Prepare request
-		$this->_httpClientChannel->resetParameters(true);
-		$this->_httpClientChannel->setUri($requestUrl);
-		$this->_httpClientChannel->setHeaders($requestHeaders);
-		$this->_httpClientChannel->setRawData($rawData);
-		
-		// Execute request
-		$response = $this->_retryPolicy->execute(
-		    array($this->_httpClientChannel, 'request'),
-		    array($httpVerb)
-		);
-
-		return $response;
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob.php
deleted file mode 100644
index 0b95f1058..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob.php
+++ /dev/null
@@ -1,1401 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id: Blob.php 36457 2010-01-04 07:36:33Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BlobContainer
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BlobContainer.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BlobInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BlobInstance.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_SignedIdentifier
- */
-require_once 'Zend/Service/WindowsAzure/Storage/SignedIdentifier.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * ACL - Private access
-	 */
-	const ACL_PRIVATE = false;
-	
-	/**
-	 * ACL - Public access
-	 */
-	const ACL_PUBLIC = true;
-	
-	/**
-	 * Maximal blob size (in bytes)
-	 */
-	const MAX_BLOB_SIZE = 67108864;
-
-	/**
-	 * Maximal blob transfer size (in bytes)
-	 */
-	const MAX_BLOB_TRANSFER_SIZE = 4194304;
-	
-    /**
-     * Stream wrapper clients
-     *
-     * @var array
-     */
-    protected static $_wrapperClients = array();
-    
-    /**
-     * SharedAccessSignature credentials
-     * 
-     * @var Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
-     */
-    private $_sharedAccessSignatureCredentials = null;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Blob instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_BLOB, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-		
-		// API version
-		$this->_apiVersion = '2009-07-17';
-		
-		// SharedAccessSignature credentials
-		$this->_sharedAccessSignatureCredentials = new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature($accountName, $accountKey, $usePathStyleUri);
-	}
-	
-	/**
-	 * Check if a blob exists
-	 * 
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @return boolean
-	 */
-	public function blobExists($containerName = '', $blobName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		
-		// List blobs
-        $blobs = $this->listBlobs($containerName, $blobName, '', 1);
-        foreach ($blobs as $blob) {
-            if ($blob->Name == $blobName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Check if a container exists
-	 * 
-	 * @param string $containerName Container name
-	 * @return boolean
-	 */
-	public function containerExists($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-		// List containers
-        $containers = $this->listContainers($containerName, 1);
-        foreach ($containers as $container) {
-            if ($container->Name == $containerName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Create container
-	 *
-	 * @param string $containerName Container name
-	 * @param array  $metadata      Key/value pairs of meta data
-	 * @return object Container properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createContainer($containerName = '', $metadata = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if (!is_array($metadata)) {
-			throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.');
-		}
-			
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);			
-		if ($response->isSuccessful()) {
-		    return new Zend_Service_WindowsAzure_Storage_BlobContainer(
-		        $containerName,
-		        $response->getHeader('Etag'),
-		        $response->getHeader('Last-modified'),
-		        $metadata
-		    );
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container ACL
-	 *
-	 * @param string $containerName Container name
-	 * @param bool   $signedIdentifiers Display only public/private or display signed identifiers?
-	 * @return bool Acl, to be compared with Zend_Service_WindowsAzure_Storage_Blob::ACL_*
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainerAcl($containerName = '', $signedIdentifiers = false)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    if ($signedIdentifiers == false)  {
-		        // Only public/private
-			    return $response->getHeader('x-ms-prop-publicaccess') == 'True';
-		    } else {
-       		    // Parse result
-    		    $result = $this->_parseResponse($response);
-    		    if (!$result) {
-    		        return array();
-    		    }
-    
-    		    $entries = null;
-    		    if ($result->SignedIdentifier) {
-        		    if (count($result->SignedIdentifier) > 1) {
-        		        $entries = $result->SignedIdentifier;
-        		    } else {
-        		        $entries = array($result->SignedIdentifier);
-        		    }
-    		    }
-    		    
-    		    // Return value
-    		    $returnValue = array();
-    		    foreach ($entries as $entry) {
-    		        $returnValue[] = new Zend_Service_WindowsAzure_Storage_SignedIdentifier(
-    		            $entry->Id,
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Start ? $entry->AccessPolicy->Start : '' : '',
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Expiry ? $entry->AccessPolicy->Expiry : '' : '',
-    		            $entry->AccessPolicy ? $entry->AccessPolicy->Permission ? $entry->AccessPolicy->Permission : '' : ''
-    		        );
-    		    }
-    		    
-    		    // Return
-    		    return $returnValue;
-		    }			   
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Set container ACL
-	 *
-	 * @param string $containerName Container name
-	 * @param bool $acl Zend_Service_WindowsAzure_Storage_Blob::ACL_*
-	 * @param array $signedIdentifiers Signed identifiers
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setContainerAcl($containerName = '', $acl = self::ACL_PRIVATE, $signedIdentifiers = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-		// Policies
-		$policies = null;
-		if (is_array($signedIdentifiers) && count($signedIdentifiers) > 0) {
-		    $policies  = '';
-		    $policies .= '<?xml version="1.0" encoding="utf-8"?>' . "\r\n";
-		    $policies .= '<SignedIdentifiers>' . "\r\n";
-		    foreach ($signedIdentifiers as $signedIdentifier) {
-		        $policies .= '  <SignedIdentifier>' . "\r\n";
-		        $policies .= '    <Id>' . $signedIdentifier->Id . '</Id>' . "\r\n";
-		        $policies .= '    <AccessPolicy>' . "\r\n";
-		        if ($signedIdentifier->Start != '')
-		            $policies .= '      <Start>' . $signedIdentifier->Start . '</Start>' . "\r\n";
-		        if ($signedIdentifier->Expiry != '')
-		            $policies .= '      <Expiry>' . $signedIdentifier->Expiry . '</Expiry>' . "\r\n";
-		        if ($signedIdentifier->Permissions != '')
-		            $policies .= '      <Permission>' . $signedIdentifier->Permissions . '</Permission>' . "\r\n";
-		        $policies .= '    </AccessPolicy>' . "\r\n";
-		        $policies .= '  </SignedIdentifier>' . "\r\n";
-		    }
-		    $policies .= '</SignedIdentifiers>' . "\r\n";
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::PUT, array('x-ms-prop-publicaccess' => $acl), false, $policies, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container
-	 * 
-	 * @param string $containerName  Container name
-	 * @return Zend_Service_WindowsAzure_Storage_BlobContainer
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainer($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		    
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);	
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return container
-		    return new Zend_Service_WindowsAzure_Storage_BlobContainer(
-		        $containerName,
-		        $response->getHeader('Etag'),
-		        $response->getHeader('Last-modified'),
-		        $metadata
-		    );
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container metadata
-	 * 
-	 * @param string $containerName  Container name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getContainerMetadata($containerName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		
-	    return $this->getContainer($containerName)->Metadata;
-	}
-	
-	/**
-	 * Set container metadata
-	 * 
-	 * Calling the Set Container Metadata operation overwrites all existing metadata that is associated with the container. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $containerName      Container name
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setContainerMetadata($containerName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if (!is_array($metadata)) {
-			throw new Zend_Service_WindowsAzure_Exception('Meta data should be an array of key and value pairs.');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container&comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete container
-	 *
-	 * @param string $containerName      Container name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteContainer($containerName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List containers
-	 *
-	 * @param string $prefix     Optional. Filters the results to return only containers whose name begins with the specified prefix.
-	 * @param int    $maxResults Optional. Specifies the maximum number of containers to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listContainers($prefix = null, $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-	    // Build query string
-	    $queryString = '?comp=list';
-	    if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-	    }
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-	        
-		// Perform request
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST);	
-		if ($response->isSuccessful()) {
-			$xmlContainers = $this->_parseResponse($response)->Containers->Container;
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-
-			$containers = array();
-			if (!is_null($xmlContainers)) {
-				for ($i = 0; $i < count($xmlContainers); $i++) {
-					$containers[] = new Zend_Service_WindowsAzure_Storage_BlobContainer(
-						(string)$xmlContainers[$i]->Name,
-						(string)$xmlContainers[$i]->Etag,
-						(string)$xmlContainers[$i]->LastModified
-					);
-				}
-			}
-			$currentResultCount = $currentResultCount + count($containers);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $containers = array_merge($containers, $this->listContainers($prefix, $maxResults, $xmlMarker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($containers) > $maxResults) {
-			    $containers = array_slice($containers, 0, $maxResults);
-			}
-			    
-			return $containers;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param string $localFileName      Local file name to be uploaded
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-		if (!file_exists($localFileName)) {
-			throw new Zend_Service_WindowsAzure_Exception('Local file not found.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Check file size
-		if (filesize($localFileName) >= self::MAX_BLOB_SIZE) {
-			return $this->putLargeBlob($containerName, $blobName, $localFileName, $metadata);
-		}
-
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// File contents
-		$fileContents = file_get_contents($localFileName);
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);	
-		if ($response->isSuccessful()) {
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$containerName,
-				$blobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $containerName . '/' . $blobName,
-				strlen($fileContents),
-				'',
-				'',
-				'',
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put large blob (> 64 MB)
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName Blob name
-	 * @param string $localFileName Local file name to be uploaded
-	 * @param array  $metadata      Key/value pairs of meta data
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putLargeBlob($containerName = '', $blobName = '', $localFileName = '', $metadata = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-		if (!file_exists($localFileName)) {
-			throw new Zend_Service_WindowsAzure_Exception('Local file not found.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Check file size
-		if (filesize($localFileName) < self::MAX_BLOB_SIZE) {
-			return $this->putBlob($containerName, $blobName, $localFileName, $metadata);
-		}
-			
-		// Determine number of parts
-		$numberOfParts = ceil( filesize($localFileName) / self::MAX_BLOB_TRANSFER_SIZE );
-		
-		// Generate block id's
-		$blockIdentifiers = array();
-		for ($i = 0; $i < $numberOfParts; $i++) {
-			$blockIdentifiers[] = $this->_generateBlockId($i);
-		}
-		
-		// Open file
-		$fp = fopen($localFileName, 'r');
-		if ($fp === false) {
-			throw new Zend_Service_WindowsAzure_Exception('Could not open local file.');
-		}
-			
-		// Upload parts
-		for ($i = 0; $i < $numberOfParts; $i++) {
-			// Seek position in file
-			fseek($fp, $i * self::MAX_BLOB_TRANSFER_SIZE);
-			
-			// Read contents
-			$fileContents = fread($fp, self::MAX_BLOB_TRANSFER_SIZE);
-			
-			// Put block
-			$this->putBlock($containerName, $blobName, $blockIdentifiers[$i], $fileContents);
-			
-			// Dispose file contents
-			$fileContents = null;
-			unset($fileContents);
-		}
-		
-		// Close file
-		fclose($fp);
-		
-		// Put block list
-		$this->putBlockList($containerName, $blobName, $blockIdentifiers, $metadata);
-		
-		// Return information of the blob
-		return $this->getBlobInstance($containerName, $blobName);
-	}			
-			
-	/**
-	 * Put large blob block
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @param string $identifier    Block ID
-	 * @param array  $contents      Contents of the block
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlock($containerName = '', $blobName = '', $identifier = '', $contents = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($identifier === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Block identifier is not specified.');
-		}
-		if (strlen($contents) > self::MAX_BLOB_TRANSFER_SIZE) {
-			throw new Zend_Service_WindowsAzure_Exception('Block size is too big.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-    	// Upload
-		$response = $this->_performRequest($resourceName, '?comp=block&blockid=' . base64_encode($identifier), Zend_Http_Client::PUT, null, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put block list
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array $blockList           Array of block identifiers
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putBlockList($containerName = '', $blobName = '', $blockList = array(), $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if (count($blockList) == 0) {
-			throw new Zend_Service_WindowsAzure_Exception('Block list does not contain any elements.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		
-		// Generate block list
-		$blocks = '';
-		foreach ($blockList as $block) {
-			$blocks .= '  <Latest>' . base64_encode($block) . '</Latest>' . "\n";
-		}
-		
-		// Generate block list request
-		$fileContents = utf8_encode(implode("\n", array(
-			'<?xml version="1.0" encoding="utf-8"?>',
-			'<BlockList>',
-			$blocks,
-			'</BlockList>'
-		)));
-		
-	    // Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '?comp=blocklist', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get block list
-	 *
-	 * @param string $containerName Container name
-	 * @param string $blobName      Blob name
-	 * @param integer $type         Type of block list to retrieve. 0 = all, 1 = committed, 2 = uncommitted
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlockList($containerName = '', $blobName = '', $type = 0)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($type < 0 || $type > 2) {
-			throw new Zend_Service_WindowsAzure_Exception('Invalid type of block list to retrieve.');
-		}
-			
-		// Set $blockListType
-		$blockListType = 'all';
-		if ($type == 1) {
-		    $blockListType = 'committed';
-		}
-		if ($type == 2) {
-		    $blockListType = 'uncommitted';
-		}
-		    
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-			
-		// Perform request
-		$response = $this->_performRequest($resourceName, '?comp=blocklist&blocklisttype=' . $blockListType, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    // Parse response
-		    $blockList = $this->_parseResponse($response);
-		    
-		    // Create return value
-		    $returnValue = array();
-		    if ($blockList->CommittedBlocks) {
-			    foreach ($blockList->CommittedBlocks->Block as $block) {
-			        $returnValue['CommittedBlocks'][] = (object)array(
-			            'Name' => (string)$block->Name,
-			            'Size' => (string)$block->Size
-			        );
-			    }
-		    }
-		    if ($blockList->UncommittedBlocks)  {
-			    foreach ($blockList->UncommittedBlocks->Block as $block) {
-			        $returnValue['UncommittedBlocks'][] = (object)array(
-			            'Name' => (string)$block->Name,
-			            'Size' => (string)$block->Size
-			        );
-			    }
-		    }
-		    
-		    return $returnValue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-			
-	/**
-	 * Copy blob
-	 *
-	 * @param string $sourceContainerName       Source container name
-	 * @param string $sourceBlobName            Source blob name
-	 * @param string $destinationContainerName  Destination container name
-	 * @param string $destinationBlobName       Destination blob name
-	 * @param array  $metadata                  Key/value pairs of meta data
-	 * @param array  $additionalHeaders         Additional headers. See http://msdn.microsoft.com/en-us/library/dd894037.aspx for more information.
-	 * @return object Partial blob properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function copyBlob($sourceContainerName = '', $sourceBlobName = '', $destinationContainerName = '', $destinationBlobName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($sourceContainerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Source container name is not specified.');
-		}
-		if (!self::isValidContainerName($sourceContainerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Source container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($sourceBlobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Source blob name is not specified.');
-		}
-		if ($destinationContainerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Destination container name is not specified.');
-		}
-		if (!self::isValidContainerName($destinationContainerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Destination container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($destinationBlobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Destination blob name is not specified.');
-		}
-		if ($sourceContainerName === '$root' && strpos($sourceBlobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		if ($destinationContainerName === '$root' && strpos($destinationBlobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource names
-		$sourceResourceName = self::createResourceName($sourceContainerName, $sourceBlobName);
-		$destinationResourceName = self::createResourceName($destinationContainerName, $destinationBlobName);
-		
-		// Set source blob
-		$headers["x-ms-copy-source"] = '/' . $this->_accountName . '/' . $sourceResourceName;
-
-		// Perform request
-		$response = $this->_performRequest($destinationResourceName, '', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if ($response->isSuccessful()) {
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$destinationContainerName,
-				$destinationBlobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $destinationContainerName . '/' . $destinationBlobName,
-				0,
-				'',
-				'',
-				'',
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param string $localFileName      Local file name to store downloaded blob
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlob($containerName = '', $blobName = '', $localFileName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($localFileName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Local file name is not specified.');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::GET, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-			file_put_contents($localFileName, $response->getBody());
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get container
-	 * 
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @return Zend_Service_WindowsAzure_Storage_BlobInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlobInstance($containerName = '', $blobName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-	        
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-        // Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		    
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::HEAD, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ);
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return blob
-			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
-				$containerName,
-				$blobName,
-				$response->getHeader('Etag'),
-				$response->getHeader('Last-modified'),
-				$this->getBaseUrl() . '/' . $containerName . '/' . $blobName,
-				$response->getHeader('Content-Length'),
-				$response->getHeader('Content-Type'),
-				$response->getHeader('Content-Encoding'),
-				$response->getHeader('Content-Language'),
-				false,
-		        $metadata
-			);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get blob metadata
-	 * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName Blob name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getBlobMetadata($containerName = '', $blobName = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		
-	    return $this->getBlobInstance($containerName, $blobName)->Metadata;
-	}
-	
-	/**
-	 * Set blob metadata
-	 * 
-	 * Calling the Set Blob Metadata operation overwrites all existing metadata that is associated with the blob. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $metadata           Key/value pairs of meta data
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setBlobMetadata($containerName = '', $blobName = '', $metadata = array(), $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Additional headers?
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Perform request
-		$response = $this->_performRequest($containerName . '/' . $blobName, '?comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete blob
-	 *
-	 * @param string $containerName      Container name
-	 * @param string $blobName           Blob name
-	 * @param array  $additionalHeaders  Additional headers. See http://msdn.microsoft.com/en-us/library/dd179371.aspx for more information.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteBlob($containerName = '', $blobName = '', $additionalHeaders = array())
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-		if ($blobName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Blob name is not specified.');
-		}
-		if ($containerName === '$root' && strpos($blobName, '/') !== false) {
-		    throw new Zend_Service_WindowsAzure_Exception('Blobs stored in the root container can not have a name containing a forward slash (/).');
-		}
-			
-		// Additional headers?
-		$headers = array();
-		foreach ($additionalHeaders as $key => $value) {
-		    $headers[$key] = $value;
-		}
-		
-		// Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-		
-		// Perform request
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_WRITE);
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List blobs
-	 *
-	 * @param string $containerName Container name
-	 * @param string $prefix     Optional. Filters the results to return only blobs whose name begins with the specified prefix.
-	 * @param string $delimiter  Optional. Delimiter, i.e. '/', for specifying folder hierarchy
-	 * @param int    $maxResults Optional. Specifies the maximum number of blobs to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listBlobs($containerName = '', $prefix = '', $delimiter = '', $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-			
-	    // Build query string
-	    $queryString = '?restype=container&comp=list';
-        if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-        }
-		if ($delimiter !== '') {
-			$queryString .= '&delimiter=' . $delimiter;
-		}
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-
-	    // Perform request
-		$response = $this->_performRequest($containerName, $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST);
-		if ($response->isSuccessful()) {
-		    // Return value
-		    $blobs = array();
-		    
-			// Blobs
-			$xmlBlobs = $this->_parseResponse($response)->Blobs->Blob;
-			if (!is_null($xmlBlobs)) {
-				for ($i = 0; $i < count($xmlBlobs); $i++) {
-					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
-						$containerName,
-						(string)$xmlBlobs[$i]->Name,
-						(string)$xmlBlobs[$i]->Etag,
-						(string)$xmlBlobs[$i]->LastModified,
-						(string)$xmlBlobs[$i]->Url,
-						(string)$xmlBlobs[$i]->Size,
-						(string)$xmlBlobs[$i]->ContentType,
-						(string)$xmlBlobs[$i]->ContentEncoding,
-						(string)$xmlBlobs[$i]->ContentLanguage,
-						false
-					);
-				}
-			}
-			
-			// Blob prefixes (folders)
-			$xmlBlobs = $this->_parseResponse($response)->Blobs->BlobPrefix;
-			
-			if (!is_null($xmlBlobs)) {
-				for ($i = 0; $i < count($xmlBlobs); $i++) {
-					$blobs[] = new Zend_Service_WindowsAzure_Storage_BlobInstance(
-						$containerName,
-						(string)$xmlBlobs[$i]->Name,
-						'',
-						'',
-						'',
-						0,
-						'',
-						'',
-						'',
-						true
-					);
-				}
-			}
-			
-			// More blobs?
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-			$currentResultCount = $currentResultCount + count($blobs);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $blobs = array_merge($blobs, $this->listBlobs($containerName, $prefix, $delimiter, $maxResults, $marker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($blobs) > $maxResults) {
-			    $blobs = array_slice($blobs, 0, $maxResults);
-			}
-			
-			return $blobs;
-		} else {        
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Generate shared access URL
-	 * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName       Blob name
-     * @param string $resource       Signed resource - container (c) - blob (b)
-     * @param string $permissions    Signed permissions - read (r), write (w), delete (d) and list (l)
-     * @param string $start          The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry         The time at which the Shared Access Signature becomes invalid.
-     * @param string $identifier     Signed identifier
-	 * @return string
-	 */
-	public function generateSharedAccessUrl($containerName = '', $blobName = '', $resource = 'b', $permissions = 'r', $start = '', $expiry = '', $identifier = '')
-	{
-		if ($containerName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Container name is not specified.');
-		}
-		if (!self::isValidContainerName($containerName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Container name does not adhere to container naming conventions. See http://msdn.microsoft.com/en-us/library/dd135715.aspx for more information.');
-		}
-
-        // Resource name
-		$resourceName = self::createResourceName($containerName , $blobName);
-
-		// Generate URL
-		return $this->getBaseUrl() . '/' . $resourceName . '?' .
-		    $this->_sharedAccessSignatureCredentials->createSignedQueryString(
-		        $resourceName,
-		        '',
-		        $resource,
-		        $permissions,
-		        $start,
-		        $expiry,
-		        $identifier);
-	}
-	
-    /**
-     * Register this object as stream wrapper client
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function registerAsClient($name)
-    {
-        self::$_wrapperClients[$name] = $this;
-        return $this;
-    }
-
-    /**
-     * Unregister this object as stream wrapper client
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function unregisterAsClient($name)
-    {
-        unset(self::$_wrapperClients[$name]);
-        return $this;
-    }
-
-    /**
-     * Get wrapper client for stream type
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public static function getWrapperClient($name)
-    {
-        return self::$_wrapperClients[$name];
-    }
-
-    /**
-     * Register this object as stream wrapper
-     *
-     * @param  string $name Protocol name
-     */
-    public function registerStreamWrapper($name = 'azure')
-    {
-        /**
-         * @see Zend_Service_WindowsAzure_Storage_Blob_Stream
-         */
-        require_once 'Zend/Service/WindowsAzure/Storage/Blob/Stream.php';
-
-        stream_register_wrapper($name, 'Zend_Service_WindowsAzure_Storage_Blob_Stream');
-        $this->registerAsClient($name);
-    }
-
-    /**
-     * Unregister this object as stream wrapper
-     *
-     * @param  string $name Protocol name
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    public function unregisterStreamWrapper($name = 'azure')
-    {
-        stream_wrapper_unregister($name);
-        $this->unregisterAsClient($name);
-    }
-    
-    /**
-     * Create resource name
-     * 
-	 * @param string $containerName  Container name
-	 * @param string $blobName Blob name
-     * @return string
-     */
-    public static function createResourceName($containerName = '', $blobName = '')
-    {
-		// Resource name
-		$resourceName = $containerName . '/' . $blobName;
-		if ($containerName === '' || $containerName === '$root') {
-		    $resourceName = $blobName;
-		}
-		if ($blobName === '') {
-		    $resourceName = $containerName;
-		}
-		    
-		return $resourceName;
-    }
-	
-	/**
-	 * Is valid container name?
-	 *
-	 * @param string $containerName Container name
-	 * @return boolean
-	 */
-    public static function isValidContainerName($containerName = '')
-    {
-        if ($containerName == '$root') {
-            return true;
-        }
-            
-        if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $containerName) === 0) {
-            return false;
-        }
-    
-        if (strpos($containerName, '--') !== false) {
-            return false;
-        }
-    
-        if (strtolower($containerName) != $containerName) {
-            return false;
-        }
-    
-        if (strlen($containerName) < 3 || strlen($containerName) > 63) {
-            return false;
-        }
-            
-        if (substr($containerName, -1) == '-') {
-            return false;
-        }
-    
-        return true;
-    }
-    
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->Message) {
-		    return (string)$response->Message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-	
-	/**
-	 * Generate block id
-	 * 
-	 * @param int $part Block number
-	 * @return string Windows Azure Blob Storage block number
-	 */
-	protected function _generateBlockId($part = 0)
-	{
-		$returnValue = $part;
-		while (strlen($returnValue) < 64) {
-			$returnValue = '0' . $returnValue;
-		}
-		
-		return $returnValue;
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
deleted file mode 100644
index 9e51e131a..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php
+++ /dev/null
@@ -1,565 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure_Storage
- * @subpackage Blob
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id: Blob.php 24511 2009-07-28 09:17:56Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_Blob
- */
-require_once 'Zend/Service/WindowsAzure/Storage/Blob.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure_Storage
- * @subpackage Blob
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Blob_Stream
-{
-    /**
-     * Current file name
-     * 
-     * @var string
-     */
-    private $_fileName = null;
-    
-    /**
-     * Temporary file name
-     * 
-     * @var string
-     */
-    private $_temporaryFileName = null;
-    
-    /**
-     * Temporary file handle
-     * 
-     * @var resource
-     */
-    private $_temporaryFileHandle = null;
-    
-    /**
-     * Blob storage client
-     * 
-     * @var Zend_Service_WindowsAzure_Storage_Blob
-     */
-    private $_storageClient = null;
-    
-    /**
-     * Write mode?
-     * 
-     * @var boolean
-     */
-    private $_writeMode = false;
-    
-    /**
-     * List of blobs
-     * 
-     * @var array
-     */
-    private $_blobs = null;
-    
-    /**
-     * Retrieve storage client for this stream type
-     * 
-     * @param string $path
-     * @return Zend_Service_WindowsAzure_Storage_Blob
-     */
-    protected function _getStorageClient($path = '')
-    {
-        if (is_null($this->_storageClient)) {
-            $url = explode(':', $path);
-            if (!$url) {
-                throw new Zend_Service_WindowsAzure_Exception('Could not parse path "' . $path . '".');
-            }
-
-            $this->_storageClient = Zend_Service_WindowsAzure_Storage_Blob::getWrapperClient($url[0]);
-            if (!$this->_storageClient) {
-                throw new Zend_Service_WindowsAzure_Exception('No storage client registered for stream type "' . $url[0] . '://".');
-            }
-        }
-        
-        return $this->_storageClient;
-    }
-    
-    /**
-     * Extract container name
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function _getContainerName($path)
-    {
-        $url = parse_url($path);
-        if ($url['host']) {
-            return $url['host'];
-        }
-
-        return '';
-    }
-    
-    /**
-     * Extract file name
-     *
-     * @param string $path
-     * @return string
-     */
-    protected function _getFileName($path)
-    {
-        $url = parse_url($path);
-        if ($url['host']) {
-            $fileName = isset($url['path']) ? $url['path'] : $url['host'];
-    	    if (strpos($fileName, '/') === 0) {
-    	        $fileName = substr($fileName, 1);
-    	    }
-            return $fileName;
-        }
-
-        return '';
-    }
-       
-    /**
-     * Open the stream
-     *
-     * @param  string  $path
-     * @param  string  $mode
-     * @param  integer $options
-     * @param  string  $opened_path
-     * @return boolean
-     */
-    public function stream_open($path, $mode, $options, $opened_path)
-    {
-        $this->_fileName = $path;
-        $this->_temporaryFileName = tempnam(sys_get_temp_dir(), 'azure');
-        
-        // Check the file can be opened
-        $fh = @fopen($this->_temporaryFileName, $mode);
-        if ($fh === false) {
-            return false;
-        }
-        fclose($fh);
-        
-        // Write mode?
-        if (strpbrk($mode, 'wax+')) {
-            $this->_writeMode = true;
-    	} else {
-            $this->_writeMode = false;
-        }
-        
-        // If read/append, fetch the file
-        if (!$this->_writeMode || strpbrk($mode, 'ra+')) {
-            $this->_getStorageClient($this->_fileName)->getBlob(
-                $this->_getContainerName($this->_fileName),
-                $this->_getFileName($this->_fileName),
-                $this->_temporaryFileName
-            );
-        }
-        
-        // Open temporary file handle
-        $this->_temporaryFileHandle = fopen($this->_temporaryFileName, $mode);
-        
-        // Ok!
-        return true;
-    }
-
-    /**
-     * Close the stream
-     *
-     * @return void
-     */
-    public function stream_close()
-    {
-        @fclose($this->_temporaryFileHandle);
-        
-        // Upload the file?
-        if ($this->_writeMode) {
-            // Make sure the container exists
-            $containerExists = $this->_getStorageClient($this->_fileName)->containerExists(
-                $this->_getContainerName($this->_fileName)
-            );
-            if (!$containerExists) {
-                $this->_getStorageClient($this->_fileName)->createContainer(
-                    $this->_getContainerName($this->_fileName)
-                );
-            }
-            
-            // Upload the file
-            try {
-                $this->_getStorageClient($this->_fileName)->putBlob(
-                    $this->_getContainerName($this->_fileName),
-                    $this->_getFileName($this->_fileName),
-                    $this->_temporaryFileName
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                @unlink($this->_temporaryFileName);
-                unset($this->_storageClient);
-                
-                throw $ex;
-            }
-        }
-        
-        @unlink($this->_temporaryFileName);
-        unset($this->_storageClient);
-    }
-
-    /**
-     * Read from the stream
-     *
-     * @param  integer $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-
-        return fread($this->_temporaryFileHandle, $count);
-    }
-
-    /**
-     * Write to the stream
-     *
-     * @param  string $data
-     * @return integer
-     */
-    public function stream_write($data)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return 0;
-        }
-        
-        $len = strlen($data);
-        fwrite($this->_temporaryFileHandle, $data, $len);
-        return $len;
-    }
-
-    /**
-     * End of the stream?
-     *
-     * @return boolean
-     */
-    public function stream_eof()
-    {
-        if (!$this->_temporaryFileHandle) {
-            return true;
-        }
-
-        return feof($this->_temporaryFileHandle);
-    }
-
-    /**
-     * What is the current read/write position of the stream?
-     *
-     * @return integer
-     */
-    public function stream_tell()
-    {
-        return ftell($this->_temporaryFileHandle);
-    }
-
-    /**
-     * Update the read/write position of the stream
-     *
-     * @param  integer $offset
-     * @param  integer $whence
-     * @return boolean
-     */
-    public function stream_seek($offset, $whence)
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-        
-        return (fseek($this->_temporaryFileHandle, $offset, $whence) === 0);
-    }
-
-    /**
-     * Flush current cached stream data to storage
-     *
-     * @return boolean
-     */
-    public function stream_flush()
-    {
-        $result = fflush($this->_temporaryFileHandle);
-        
-         // Upload the file?
-        if ($this->_writeMode) {
-            // Make sure the container exists
-            $containerExists = $this->_getStorageClient($this->_fileName)->containerExists(
-                $this->_getContainerName($this->_fileName)
-            );
-            if (!$containerExists) {
-                $this->_getStorageClient($this->_fileName)->createContainer(
-                    $this->_getContainerName($this->_fileName)
-                );
-            }
-            
-            // Upload the file
-            try {
-                $this->_getStorageClient($this->_fileName)->putBlob(
-                    $this->_getContainerName($this->_fileName),
-                    $this->_getFileName($this->_fileName),
-                    $this->_temporaryFileName
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                @unlink($this->_temporaryFileName);
-                unset($this->_storageClient);
-                
-                throw $ex;
-            }
-        }
-        
-        return $result;
-    }
-
-    /**
-     * Returns data array of stream variables
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if (!$this->_temporaryFileHandle) {
-            return false;
-        }
-
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-        $info = null;
-        try {
-            $info = $this->_getStorageClient($this->_fileName)->getBlobInstance(
-                        $this->_getContainerName($this->_fileName),
-                        $this->_getFileName($this->_fileName)
-                    );
-        } catch (Zend_Service_WindowsAzure_Exception $ex) {
-            // Unexisting file...
-        }
-        if (!is_null($info)) {
-            $stat['size']  = $info->Size;
-            $stat['atime'] = time();
-        }     
-        
-        return $stat;
-    }
-
-    /**
-     * Attempt to delete the item
-     *
-     * @param  string $path
-     * @return boolean
-     */
-    public function unlink($path)
-    {
-        $this->_getStorageClient($path)->deleteBlob(
-            $this->_getContainerName($path),
-            $this->_getFileName($path)
-        );
-    }
-
-    /**
-     * Attempt to rename the item
-     *
-     * @param  string  $path_from
-     * @param  string  $path_to
-     * @return boolean False
-     */
-    public function rename($path_from, $path_to)
-    {
-        if ($this->_getContainerName($path_from) != $this->_getContainerName($path_to)) {
-            throw new Zend_Service_WindowsAzure_Exception('Container name can not be changed.');
-        }
-        
-        if ($this->_getFileName($path_from) == $this->_getContainerName($path_to)) {
-            return true;
-        }
-            
-        $this->_getStorageClient($path_from)->copyBlob(
-            $this->_getContainerName($path_from),
-            $this->_getFileName($path_from),
-            $this->_getContainerName($path_to),
-            $this->_getFileName($path_to)
-        );
-        $this->_getStorageClient($path_from)->deleteBlob(
-            $this->_getContainerName($path_from),
-            $this->_getFileName($path_from)
-        );
-        return true;
-    }
-    
-    /**
-     * Return array of URL variables
-     *
-     * @param  string $path
-     * @param  integer $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $stat = array();
-        $stat['dev'] = 0;
-        $stat['ino'] = 0;
-        $stat['mode'] = 0;
-        $stat['nlink'] = 0;
-        $stat['uid'] = 0;
-        $stat['gid'] = 0;
-        $stat['rdev'] = 0;
-        $stat['size'] = 0;
-        $stat['atime'] = 0;
-        $stat['mtime'] = 0;
-        $stat['ctime'] = 0;
-        $stat['blksize'] = 0;
-        $stat['blocks'] = 0;
-
-        $info = null;
-        try {
-            $info = $this->_getStorageClient($path)->getBlobInstance(
-                        $this->_getContainerName($path),
-                        $this->_getFileName($path)
-                    );
-        } catch (Zend_Service_WindowsAzure_Exception $ex) {
-            // Unexisting file...
-        }
-        if (!is_null($info)) {
-            $stat['size']  = $info->Size;
-            $stat['atime'] = time();
-        } 
-
-        return $stat;
-    }
-
-    /**
-     * Create a new directory
-     *
-     * @param  string  $path
-     * @param  integer $mode
-     * @param  integer $options
-     * @return boolean
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        if ($this->_getContainerName($path) == $this->_getFileName($path)) {
-            // Create container
-            try {
-                $this->_getStorageClient($path)->createContainer(
-                    $this->_getContainerName($path)
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                return false;
-            }
-        } else {
-            throw new Zend_Service_WindowsAzure_Exception('mkdir() with multiple levels is not supported on Windows Azure Blob Storage.');
-        }
-    }
-
-    /**
-     * Remove a directory
-     *
-     * @param  string  $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function rmdir($path, $options)
-    {
-        if ($this->_getContainerName($path) == $this->_getFileName($path)) {
-            // Delete container
-            try {
-                $this->_getStorageClient($path)->deleteContainer(
-                    $this->_getContainerName($path)
-                );
-            } catch (Zend_Service_WindowsAzure_Exception $ex) {
-                return false;
-            }
-        } else {
-            throw new Zend_Service_WindowsAzure_Exception('rmdir() with multiple levels is not supported on Windows Azure Blob Storage.');
-        }
-    }
-
-    /**
-     * Attempt to open a directory
-     *
-     * @param  string $path
-     * @param  integer $options
-     * @return boolean
-     */
-    public function dir_opendir($path, $options)
-    {
-        $this->_blobs = $this->_getStorageClient($path)->listBlobs(
-            $this->_getContainerName($path)
-        );
-        return is_array($this->_blobs);
-    }
-
-    /**
-     * Return the next filename in the directory
-     *
-     * @return string
-     */
-    public function dir_readdir()
-    {
-        $object = current($this->_blobs);
-        if ($object !== false) {
-            next($this->_blobs);
-            return $object->Name;
-        }
-        return false;
-    }
-
-    /**
-     * Reset the directory pointer
-     *
-     * @return boolean True
-     */
-    public function dir_rewinddir()
-    {
-        reset($this->_blobs);
-        return true;
-    }
-
-    /**
-     * Close a directory
-     *
-     * @return boolean True
-     */
-    public function dir_closedir()
-    {
-        $this->_blobs = null;
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
deleted file mode 100644
index 0c67bc2f7..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobContainer.php 28585 2009-09-07 12:12:56Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Name          Name of the container
- * @property string $Etag          Etag of the container
- * @property string $LastModified  Last modified date of the container
- * @property array  $Metadata      Key/value pairs of meta data
- */
-class Zend_Service_WindowsAzure_Storage_BlobContainer
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $name          Name
-     * @param string $etag          Etag
-     * @param string $lastModified  Last modified date
-     * @param array  $metadata      Key/value pairs of meta data
-     */
-    public function __construct($name, $etag, $lastModified, $metadata = array()) 
-    {
-        $this->_data = array(
-            'name'         => $name,
-            'etag'         => $etag,
-            'lastmodified' => $lastModified,
-            'metadata'     => $metadata
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
deleted file mode 100644
index e57debc10..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobInstance.php 28585 2009-09-07 12:12:56Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Container       Container name
- * @property string  $Name            Name
- * @property string  $Etag            Etag
- * @property string  $LastModified    Last modified date
- * @property string  $Url             Url
- * @property int     $Size            Size
- * @property string  $ContentType     Content Type
- * @property string  $ContentEncoding Content Encoding
- * @property string  $ContentLanguage Content Language
- * @property boolean $IsPrefix        Is Prefix?
- * @property array   $Metadata        Key/value pairs of meta data
- */
-class Zend_Service_WindowsAzure_Storage_BlobInstance
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $containerName   Container name
-     * @param string  $name            Name
-     * @param string  $etag            Etag
-     * @param string  $lastModified    Last modified date
-     * @param string  $url             Url
-     * @param int     $size            Size
-     * @param string  $contentType     Content Type
-     * @param string  $contentEncoding Content Encoding
-     * @param string  $contentLanguage Content Language
-     * @param boolean $isPrefix        Is Prefix?
-     * @param array   $metadata        Key/value pairs of meta data
-     */
-    public function __construct($containerName, $name, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $isPrefix = false, $metadata = array()) 
-    {	        
-        $this->_data = array(
-            'container'        => $containerName,
-            'name'             => $name,
-            'etag'             => $etag,
-            'lastmodified'     => $lastModified,
-            'url'              => $url,
-            'size'             => $size,
-            'contenttype'      => $contentType,
-            'contentencoding'  => $contentEncoding,
-            'contentlanguage'  => $contentLanguage,
-            'isprefix'         => $isPrefix,
-            'metadata'         => $metadata
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
deleted file mode 100644
index d7445dcec..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobInstance.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_WindowsAzure_Storage_TableEntity
-{   
-    /**
-     * Dynamic properties
-     * 
-     * @var array
-     */
-    protected $_dynamicProperties = array();
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {      
-        $this->setAzureProperty($name, $value, null);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        return $this->getAzureProperty($name);
-    }
-    
-    /**
-     * Set an Azure property
-     * 
-     * @param string $name Property name
-     * @param mixed $value Property value
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function setAzureProperty($name, $value = '', $type = null)
-    {
-        if (strtolower($name) == 'partitionkey') {
-            $this->setPartitionKey($value);
-        } else if (strtolower($name) == 'rowkey') {
-            $this->setRowKey($value);
-        } else if (strtolower($name) == 'etag') {
-            $this->setEtag($value);
-        } else {
-            if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-                // Determine type?
-                if (is_null($type)) {
-                    $type = 'Edm.String';
-                    if (is_int($value)) {
-                        $type = 'Edm.Int32';
-                    } else if (is_float($value)) {
-                        $type = 'Edm.Double';
-                    } else if (is_bool($value)) {
-                        $type = 'Edm.Boolean';
-                    }
-                }
-                
-                // Set dynamic property
-                $this->_dynamicProperties[strtolower($name)] = (object)array(
-                        'Name'  => $name,
-                    	'Type'  => $type,
-                    	'Value' => $value,
-                    );
-            }
-    
-            $this->_dynamicProperties[strtolower($name)]->Value = $value;
-        }
-        return $this;
-    }
-    
-    /**
-     * Set an Azure property type
-     * 
-     * @param string $name Property name
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function setAzurePropertyType($name, $type = 'Edm.String')
-    {
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
-        } else {
-            $this->_dynamicProperties[strtolower($name)]->Type = $type;   
-        }
-        return $this;
-    }
-    
-    /**
-     * Get an Azure property
-     * 
-     * @param string $name Property name
-     * @param mixed $value Property value
-     * @param string $type Property type (Edm.xxxx)
-     * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity
-     */
-    public function getAzureProperty($name)
-    {
-        if (strtolower($name) == 'partitionkey') {
-            return $this->getPartitionKey();
-        }
-        if (strtolower($name) == 'rowkey') {
-            return $this->getRowKey();
-        }
-        if (strtolower($name) == 'etag') {
-            return $this->getEtag();
-        }
-
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name);            
-        }
-
-        return $this->_dynamicProperties[strtolower($name)]->Value;
-    }
-    
-    /**
-     * Get an Azure property type
-     * 
-     * @param string $name Property name
-     * @return string Property type (Edm.xxxx)
-     */
-    public function getAzurePropertyType($name)
-    {
-        if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) {
-            $this->setAzureProperty($name, '', $type);            
-        }
-        
-        return $this->_dynamicProperties[strtolower($name)]->Type;
-    }
-    
-    /**
-     * Get Azure values
-     * 
-     * @return array
-     */
-    public function getAzureValues()
-    {
-        return array_merge(array_values($this->_dynamicProperties), parent::getAzureValues());
-    }
-    
-    /**
-     * Set Azure values
-     * 
-     * @param array $values
-     * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setAzureValues($values = array(), $throwOnError = false)
-    {
-        // Set parent values
-        parent::setAzureValues($values, false);
-        
-        // Set current values
-        foreach ($values as $key => $value) 
-        {
-            $this->$key = $value;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Queue.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Queue.php
deleted file mode 100644
index 7e9875edc..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Queue.php
+++ /dev/null
@@ -1,547 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://todo     name_todo
- * @version    $Id: Blob.php 24241 2009-07-22 09:43:13Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * Zend_Service_WindowsAzure_Storage_QueueInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/QueueInstance.php';
-
-/**
- * Zend_Service_WindowsAzure_Storage_QueueMessage
- */
-require_once 'Zend/Service/WindowsAzure/Storage/QueueMessage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_Storage
-{
-	/**
-	 * Maximal message size (in bytes)
-	 */
-	const MAX_MESSAGE_SIZE = 8388608;
-	
-	/**
-	 * Maximal message ttl (in seconds)
-	 */
-	const MAX_MESSAGE_TTL = 604800;
-	
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Queue instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_QUEUE, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-		
-		// API version
-		$this->_apiVersion = '2009-04-14';
-	}
-	
-	/**
-	 * Check if a queue exists
-	 * 
-	 * @param string $queueName Queue name
-	 * @return boolean
-	 */
-	public function queueExists($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// List queues
-        $queues = $this->listQueues($queueName, 1);
-        foreach ($queues as $queue) {
-            if ($queue->Name == $queueName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * Create queue
-	 *
-	 * @param string $queueName Queue name
-	 * @param array  $metadata  Key/value pairs of meta data
-	 * @return object Queue properties
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createQueue($queueName = '', $metadata = array())
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Perform request
-		$response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers);			
-		if ($response->isSuccessful()) {
-		    return new Zend_Service_WindowsAzure_Storage_QueueInstance(
-		        $queueName,
-		        $metadata
-		    );
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get queue
-	 * 
-	 * @param string $queueName  Queue name
-	 * @return Zend_Service_WindowsAzure_Storage_QueueInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getQueue($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		    
-		// Perform request
-		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-		    // Parse metadata
-		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
-
-		    // Return queue
-		    $queue = new Zend_Service_WindowsAzure_Storage_QueueInstance(
-		        $queueName,
-		        $metadata
-		    );
-		    $queue->ApproximateMessageCount = intval($response->getHeader('x-ms-approximate-message-count'));
-		    return $queue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Get queue metadata
-	 * 
-	 * @param string $queueName  Queue name
-	 * @return array Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getQueueMetadata($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-	    return $this->getQueue($queueName)->Metadata;
-	}
-	
-	/**
-	 * Set queue metadata
-	 * 
-	 * Calling the Set Queue Metadata operation overwrites all existing metadata that is associated with the queue. It's not possible to modify an individual name/value pair.
-	 *
-	 * @param string $queueName  Queue name
-	 * @param array  $metadata       Key/value pairs of meta data
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function setQueueMetadata($queueName = '', $metadata = array())
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if (count($metadata) == 0) {
-		    return;
-		}
-		    
-		// Create metadata headers
-		$headers = array();
-		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); 
-		
-		// Perform request
-		$response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::PUT, $headers);
-
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete queue
-	 *
-	 * @param string $queueName Queue name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteQueue($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-			
-		// Perform request
-		$response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE);
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * List queues
-	 *
-	 * @param string $prefix     Optional. Filters the results to return only queues whose name begins with the specified prefix.
-	 * @param int    $maxResults Optional. Specifies the maximum number of queues to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000)
-	 * @param string $marker     Optional string value that identifies the portion of the list to be returned with the next list operation.
-	 * @param int    $currentResultCount Current result count (internal use)
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listQueues($prefix = null, $maxResults = null, $marker = null, $currentResultCount = 0)
-	{
-	    // Build query string
-	    $queryString = '?comp=list';
-	    if (!is_null($prefix)) {
-	        $queryString .= '&prefix=' . $prefix;
-	    }
-	    if (!is_null($maxResults)) {
-	        $queryString .= '&maxresults=' . $maxResults;
-	    }
-	    if (!is_null($marker)) {
-	        $queryString .= '&marker=' . $marker;
-	    }
-	        
-		// Perform request
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-			$xmlQueues = $this->_parseResponse($response)->Queues->Queue;
-			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
-
-			$queues = array();
-			if (!is_null($xmlQueues)) {
-				for ($i = 0; $i < count($xmlQueues); $i++) {
-					$queues[] = new Zend_Service_WindowsAzure_Storage_QueueInstance(
-						(string)$xmlQueues[$i]->QueueName
-					);
-				}
-			}
-			$currentResultCount = $currentResultCount + count($queues);
-			if (!is_null($maxResults) && $currentResultCount < $maxResults) {
-    			if (!is_null($xmlMarker) && $xmlMarker != '') {
-    			    $queues = array_merge($queues, $this->listQueues($prefix, $maxResults, $xmlMarker, $currentResultCount));
-    			}
-			}
-			if (!is_null($maxResults) && count($queues) > $maxResults) {
-			    $queues = array_slice($queues, 0, $maxResults);
-			}
-			    
-			return $queues;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Put message into queue
-	 *
-	 * @param string $queueName  Queue name
-	 * @param string $message    Message
-	 * @param int    $ttl        Message Time-To-Live (in seconds). Defaults to 7 days if the parameter is omitted.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function putMessage($queueName = '', $message = '', $ttl = null)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if (strlen($message) > self::MAX_MESSAGE_SIZE) {
-		    throw new Zend_Service_WindowsAzure_Exception('Message is too big. Message content should be < 8KB.');
-		}
-		if ($message == '') {
-		    throw new Zend_Service_WindowsAzure_Exception('Message is not specified.');
-		}
-		if (!is_null($ttl) && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.');
-		}
-		    
-	    // Build query string
-	    $queryString = '';
-	    if (!is_null($ttl)) {
-	        $queryString .= '?messagettl=' . $ttl;
-	    }
-	        
-	    // Build body
-	    $rawData = '';
-	    $rawData .= '<QueueMessage>';
-	    $rawData .= '    <MessageText>' . base64_encode($message) . '</MessageText>';
-	    $rawData .= '</QueueMessage>';
-	        
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::POST, array(), false, $rawData);
-
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception('Error putting message into queue.');
-		}
-	}
-	
-	/**
-	 * Get queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @param string $numOfMessages     Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. By default, a single message is retrieved from the queue with this operation.
-	 * @param int    $visibilityTimeout Optional. An integer value that specifies the message's visibility timeout in seconds. The maximum value is 2 hours. The default message visibility timeout is 30 seconds.
-	 * @param string $peek              Peek only?
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTimeout = null, $peek = false)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if ($numOfMessages < 1 || $numOfMessages > 32 || intval($numOfMessages) != $numOfMessages) {
-		    throw new Zend_Service_WindowsAzure_Exception('Invalid number of messages to retrieve.');
-		}
-		if (!is_null($visibilityTimeout) && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.');
-		}
-		    
-	    // Build query string
-	    $query = array();
-    	if ($peek) {
-    	    $query[] = 'peekonly=true';
-    	}
-    	if ($numOfMessages > 1) {
-	        $query[] = 'numofmessages=' . $numOfMessages;
-    	}
-    	if (!$peek && !is_null($visibilityTimeout)) {
-	        $query[] = 'visibilitytimeout=' . $visibilityTimeout;
-    	}   
-    	$queryString = '?' . implode('&', $query);
-	        
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::GET);	
-		if ($response->isSuccessful()) {
-		    // Parse results
-			$result = $this->_parseResponse($response);
-		    if (!$result) {
-		        return array();
-		    }
-
-		    $xmlMessages = null;
-		    if (count($result->QueueMessage) > 1) {
-    		    $xmlMessages = $result->QueueMessage;
-    		} else {
-    		    $xmlMessages = array($result->QueueMessage);
-    		}
-
-			$messages = array();
-			for ($i = 0; $i < count($xmlMessages); $i++) {
-				$messages[] = new Zend_Service_WindowsAzure_Storage_QueueMessage(
-					(string)$xmlMessages[$i]->MessageId,
-					(string)$xmlMessages[$i]->InsertionTime,
-					(string)$xmlMessages[$i]->ExpirationTime,
-					($peek ? '' : (string)$xmlMessages[$i]->PopReceipt),
-					($peek ? '' : (string)$xmlMessages[$i]->TimeNextVisible),
-					base64_decode((string)$xmlMessages[$i]->MessageText)
-			    );
-			}
-			    
-			return $messages;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Peek queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @param string $numOfMessages     Optional. A nonzero integer value that specifies the number of messages to retrieve from the queue, up to a maximum of 32. By default, a single message is retrieved from the queue with this operation.
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function peekMessages($queueName = '', $numOfMessages = 1)
-	{
-	    return $this->getMessages($queueName, $numOfMessages, null, true);
-	}
-	
-	/**
-	 * Clear queue messages
-	 *
-	 * @param string $queueName         Queue name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function clearMessages($queueName = '')
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE);	
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.');
-		}
-	}
-	
-	/**
-	 * Delete queue message
-	 *
-	 * @param string $queueName         					Queue name
-	 * @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted!
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message)
-	{
-		if ($queueName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.');
-		}
-		if (!self::isValidQueueName($queueName)) {
-		    throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.');
-		}
-		if ($message->PopReceipt == '') {
-		    throw new Zend_Service_WindowsAzure_Exception('A message retrieved using "peekMessages" can NOT be deleted! Use "getMessages" instead.');
-		}
-
-		// Perform request
-		$response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . $message->PopReceipt, Zend_Http_Client::DELETE);	
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Is valid queue name?
-	 *
-	 * @param string $queueName Queue name
-	 * @return boolean
-	 */
-    public static function isValidQueueName($queueName = '')
-    {
-        if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $queueName) === 0) {
-            return false;
-        }
-    
-        if (strpos($queueName, '--') !== false) {
-            return false;
-        }
-    
-        if (strtolower($queueName) != $queueName) {
-            return false;
-        }
-    
-        if (strlen($queueName) < 3 || strlen($queueName) > 63) {
-            return false;
-        }
-            
-        if (substr($queueName, -1) == '-') {
-            return false;
-        }
-    
-        return true;
-    }
-    
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->Message) {
-		    return (string)$response->Message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
deleted file mode 100644
index 72ae0ef3b..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobContainer.php 17553 2009-05-15 10:40:55Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Name                     Name of the queue
- * @property array   $Metadata                 Key/value pairs of meta data
- * @property integer $ApproximateMessageCount  The approximate number of messages in the queue
- */
-class Zend_Service_WindowsAzure_Storage_QueueInstance
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $name          Name
-     * @param array  $metadata      Key/value pairs of meta data
-     */
-    public function __construct($name, $metadata = array()) 
-    {
-        $this->_data = array(
-            'name'         => $name,
-            'metadata'     => $metadata,
-            'approximatemessagecount' => 0
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
deleted file mode 100644
index 30b41a194..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobContainer.php 17553 2009-05-15 10:40:55Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- *   
- * @property string $MessageId         Message ID
- * @property string $InsertionTime     Insertion time
- * @property string $ExpirationTime    Expiration time
- * @property string $PopReceipt  	   Receipt verification for deleting the message from queue.
- * @property string $TimeNextVisible   Next time the message is visible in the queue
- * @property string $MessageText       Message text
- */
-class Zend_Service_WindowsAzure_Storage_QueueMessage
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $messageId         Message ID
-     * @param string $insertionTime     Insertion time
-     * @param string $expirationTime    Expiration time
-     * @param string $popReceipt  	    Receipt verification for deleting the message from queue.
-     * @param string $timeNextVisible   Next time the message is visible in the queue
-     * @param string $messageText       Message text
-     */
-    public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $messageText) 
-    {
-        $this->_data = array(
-            'messageid'       => $messageId,
-            'insertiontime'   => $insertionTime,
-            'expirationtime'  => $expirationTime,
-            'popreceipt'      => $popReceipt,
-            'timenextvisible' => $timeNextVisible,
-            'messagetext'     => $messageText
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
deleted file mode 100644
index bfa907028..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobContainer.php 24352 2009-07-24 06:44:32Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string $Id           Id for the signed identifier
- * @property string $Start        The time at which the Shared Access Signature becomes valid.
- * @property string $Expiry       The time at which the Shared Access Signature becomes invalid.
- * @property string $Permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
- */
-class Zend_Service_WindowsAzure_Storage_SignedIdentifier
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string $id           Id for the signed identifier
-     * @param string $start        The time at which the Shared Access Signature becomes valid.
-     * @param string $expiry       The time at which the Shared Access Signature becomes invalid.
-     * @param string $permissions  Signed permissions - read (r), write (w), delete (d) and list (l)
-     */
-    public function __construct($id = '', $start = '', $expiry = '', $permissions = '') 
-    {
-        $this->_data = array(
-            'id'           => $id,
-            'start'        => $start,
-            'expiry'       => $expiry,
-            'permissions'  => $permissions
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Table.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Table.php
deleted file mode 100644
index d885614f2..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/Table.php
+++ /dev/null
@@ -1,816 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Blob.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_CredentialsAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKey
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKey.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Credentials_SharedKeyLite
- */
-require_once 'Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php';
-
-/**
- * @see Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract
- */
-require_once 'Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php';
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @see Zend_Http_Response
- */
-require_once 'Zend/Http/Response.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage
- */
-require_once 'Zend/Service/WindowsAzure/Storage.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
- */
-require_once 'Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableInstance
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableInstance.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntity.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_DynamicTableEntity
- */
-require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Storage_TableEntityQuery
- */
-require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php';
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_Table
-    extends Zend_Service_WindowsAzure_Storage_BatchStorageAbstract
-{
-	/**
-	 * Creates a new Zend_Service_WindowsAzure_Storage_Table instance
-	 *
-	 * @param string $host Storage host name
-	 * @param string $accountName Account name for Windows Azure
-	 * @param string $accountKey Account key for Windows Azure
-	 * @param boolean $usePathStyleUri Use path-style URI's
-	 * @param Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy Retry policy to use when making requests
-	 */
-	public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_TABLE, $accountName = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_ACCOUNT, $accountKey = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::DEVSTORE_KEY, $usePathStyleUri = false, Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract $retryPolicy = null)
-	{
-		parent::__construct($host, $accountName, $accountKey, $usePathStyleUri, $retryPolicy);
-
-	    // Always use SharedKeyLite authentication
-	    $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKeyLite($accountName, $accountKey, $this->_usePathStyleUri);
-	    
-	    // API version
-		$this->_apiVersion = '2009-04-14';
-	}
-	
-	/**
-	 * Check if a table exists
-	 * 
-	 * @param string $tableName Table name
-	 * @return boolean
-	 */
-	public function tableExists($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-			
-		// List tables
-        $tables = $this->listTables($tableName);
-        foreach ($tables as $table) {
-            if ($table->Name == $tableName) {
-                return true;
-            }
-        }
-        
-        return false;
-	}
-	
-	/**
-	 * List tables
-	 *
-	 * @param  string $nextTableName Next table name, used for listing tables when total amount of tables is > 1000.
-	 * @return array
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function listTables($nextTableName = '')
-	{
-	    // Build query string
-	    $queryString = '';
-	    if ($nextTableName != '') {
-	        $queryString = '?NextTableName=' . $nextTableName;
-	    }
-	    
-		// Perform request
-		$response = $this->_performRequest('Tables', $queryString, Zend_Http_Client::GET, null, true);
-		if ($response->isSuccessful()) {	    
-		    // Parse result
-		    $result = $this->_parseResponse($response);	
-		    
-		    if (!$result || !$result->entry) {
-		        return array();
-		    }
-	        
-		    $entries = null;
-		    if (count($result->entry) > 1) {
-		        $entries = $result->entry;
-		    } else {
-		        $entries = array($result->entry);
-		    }
-
-		    // Create return value
-		    $returnValue = array();		    
-		    foreach ($entries as $entry) {
-		        $tableName = $entry->xpath('.//m:properties/d:TableName');
-		        $tableName = (string)$tableName[0];
-		        
-		        $returnValue[] = new Zend_Service_WindowsAzure_Storage_TableInstance(
-		            (string)$entry->id,
-		            $tableName,
-		            (string)$entry->link['href'],
-		            (string)$entry->updated
-		        );
-		    }
-		    
-			// More tables?
-		    if (!is_null($response->getHeader('x-ms-continuation-NextTableName'))) {
-		        $returnValue = array_merge($returnValue, $this->listTables($response->getHeader('x-ms-continuation-NextTableName')));
-		    }
-
-		    return $returnValue;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Create table
-	 *
-	 * @param string $tableName Table name
-	 * @return Zend_Service_WindowsAzure_Storage_TableInstance
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function createTable($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-			
-		// Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry
-                        	xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
-                        	xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
-                        	xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              <d:TableName>{tpl:TableName}</d:TableName>
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-            'BaseUrl' => $this->getBaseUrl(),
-            'TableName' => htmlspecialchars($tableName),
-        	'Updated' => $this->isoDate(),
-            'AccountName' => $this->_accountName
-        ));
-        
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-        $headers['DataServiceVersion'] = '1.0;NetFx';
-        $headers['MaxDataServiceVersion'] = '1.0;NetFx';        
-
-		// Perform request
-		$response = $this->_performRequest('Tables', '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		if ($response->isSuccessful()) {
-		    // Parse response
-		    $entry = $this->_parseResponse($response);
-		    
-		    $tableName = $entry->xpath('.//m:properties/d:TableName');
-		    $tableName = (string)$tableName[0];
-		        
-		    return new Zend_Service_WindowsAzure_Storage_TableInstance(
-		        (string)$entry->id,
-		        $tableName,
-		        (string)$entry->link['href'],
-		        (string)$entry->updated
-		    );
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete table
-	 *
-	 * @param string $tableName Table name
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteTable($tableName = '')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-
-		// Perform request
-		$response = $this->_performRequest('Tables(\'' . $tableName . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		if (!$response->isSuccessful()) {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Insert entity into table
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to insert
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-		// Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              {tpl:Properties}
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-        	'Updated'    => $this->isoDate(),
-            'Properties' => $this->_generateAzureRepresentation($entity)
-        ));
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName, '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName, '', Zend_Http_Client::POST, $headers, true, $requestBody);
-		}
-		if ($response->isSuccessful()) {
-		    // Parse result
-		    $result = $this->_parseResponse($response);
-		    
-		    $timestamp = $result->xpath('//m:properties/d:Timestamp');
-		    $timestamp = (string)$timestamp[0];
-
-		    $etag      = $result->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-		    $etag      = (string)$etag['etag'];
-		    
-		    // Update properties
-		    $entity->setTimestamp($timestamp);
-		    $entity->setEtag($etag);
-
-		    return $entity;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Delete entity from table
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to delete
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-        // Add header information
-        $headers = array();
-        if (!$this->isInBatch()) {
-        	// http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/9e255447-4dc7-458a-99d3-bdc04bdc5474/
-            $headers['Content-Type']   = 'application/atom+xml';
-        }
-        $headers['Content-Length'] = 0;
-        if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', Zend_Http_Client::DELETE, $headers, true, null);
-		}
-		if (!$response->isSuccessful()) {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Retrieve entity from table, by id
-	 * 
-	 * @param string $tableName    Table name
-	 * @param string $partitionKey Partition key
-	 * @param string $rowKey       Row key
-	 * @param string $entityClass  Entity class name* 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function retrieveEntityById($tableName = '', $partitionKey = '', $rowKey = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity')
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if ($partitionKey === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Partition key is not specified.');
-		}
-		if ($rowKey === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Row key is not specified.');
-		}
-		if ($entityClass === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.');
-		}
-
-			
-		// Check for combined size of partition key and row key
-		// http://msdn.microsoft.com/en-us/library/dd179421.aspx
-		if (strlen($partitionKey . $rowKey) >= 256) {
-		    // Start a batch if possible
-		    if ($this->isInBatch()) {
-		        throw new Zend_Service_WindowsAzure_Exception('Entity cannot be retrieved. A transaction is required to retrieve the entity, but another transaction is already active.');
-		    }
-		        
-		    $this->startBatch();
-		}
-		
-		// Fetch entities from Azure
-        $result = $this->retrieveEntities(
-            $this->select()
-                 ->from($tableName)
-                 ->wherePartitionKey($partitionKey)
-                 ->whereRowKey($rowKey),
-            '',
-            $entityClass
-        );
-        
-        // Return
-        if (count($result) == 1) {
-            return $result[0];
-        }
-        
-        return null;
-	}
-	
-	/**
-	 * Create a new Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 * 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function select()
-	{
-	    return new Zend_Service_WindowsAzure_Storage_TableEntityQuery();
-	}
-	
-	/**
-	 * Retrieve entities from table
-	 * 
-	 * @param string $tableName|Zend_Service_WindowsAzure_Storage_TableEntityQuery    Table name -or- Zend_Service_WindowsAzure_Storage_TableEntityQuery instance
-	 * @param string $filter                                                Filter condition (not applied when $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance)
-	 * @param string $entityClass                                           Entity class name
-	 * @param string $nextPartitionKey                                      Next partition key, used for listing entities when total amount of entities is > 1000.
-	 * @param string $nextRowKey                                            Next row key, used for listing entities when total amount of entities is > 1000.
-	 * @return array Array of Zend_Service_WindowsAzure_Storage_TableEntity
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function retrieveEntities($tableName = '', $filter = '', $entityClass = 'Zend_Service_WindowsAzure_Storage_DynamicTableEntity', $nextPartitionKey = null, $nextRowKey = null)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if ($entityClass === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Entity class is not specified.');
-		}
-
-		// Convenience...
-		if (class_exists($filter)) {
-		    $entityClass = $filter;
-		    $filter = '';
-		}
-			
-		// Query string
-		$queryString = '';
-
-		// Determine query
-		if (is_string($tableName)) {
-		    // Option 1: $tableName is a string
-		    
-		    // Append parentheses
-		    $tableName .= '()';
-		    
-    	    // Build query
-    	    $query = array();
-    	    
-    		// Filter?
-    		if ($filter !== '') {
-    		    $query[] = '$filter=' . rawurlencode($filter);
-    		}
-    		    
-    	    // Build queryString
-    	    if (count($query) > 0)  {
-    	        $queryString = '?' . implode('&', $query);
-    	    }
-		} else if (get_class($tableName) == 'Zend_Service_WindowsAzure_Storage_TableEntityQuery') {
-		    // Option 2: $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance
-
-		    // Build queryString
-		    $queryString = $tableName->assembleQueryString(true);
-
-		    // Change $tableName
-		    $tableName = $tableName->assembleFrom(true);
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception('Invalid argument: $tableName');
-		}
-		
-		// Add continuation querystring parameters?
-		if (!is_null($nextPartitionKey) && !is_null($nextRowKey)) {
-		    if ($queryString !== '') {
-		        $queryString .= '&';
-		    }
-		        
-		    $queryString .= '&NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey);
-		}
-
-		// Perform request
-	    $response = null;
-	    if ($this->isInBatch() && $this->getCurrentBatch()->getOperationCount() == 0) {
-		    $this->getCurrentBatch()->enlistOperation($tableName, $queryString, Zend_Http_Client::GET, array(), true, null);
-		    $response = $this->getCurrentBatch()->commit();
-		    
-		    // Get inner response (multipart)
-		    $innerResponse = $response->getBody();
-		    $innerResponse = substr($innerResponse, strpos($innerResponse, 'HTTP/1.1 200 OK'));
-		    $innerResponse = substr($innerResponse, 0, strpos($innerResponse, '--batchresponse'));
-		    $response = Zend_Http_Response::fromString($innerResponse);
-		} else {
-		    $response = $this->_performRequest($tableName, $queryString, Zend_Http_Client::GET, array(), true, null);
-		}
-		
-		if ($response->isSuccessful()) {
-		    // Parse result
-		    $result = $this->_parseResponse($response);
-		    if (!$result) {
-		        return array();
-		    }
-
-		    $entries = null;
-		    if ($result->entry) {
-    		    if (count($result->entry) > 1) {
-    		        $entries = $result->entry;
-    		    } else {
-    		        $entries = array($result->entry);
-    		    }
-		    } else {
-		        // This one is tricky... If we have properties defined, we have an entity.
-		        $properties = $result->xpath('//m:properties');
-		        if ($properties) {
-		            $entries = array($result);
-		        } else {
-		            return array();
-		        }
-		    }
-
-		    // Create return value
-		    $returnValue = array();		    
-		    foreach ($entries as $entry) {
-    		    // Parse properties
-    		    $properties = $entry->xpath('.//m:properties');
-    		    $properties = $properties[0]->children('http://schemas.microsoft.com/ado/2007/08/dataservices');
-    		    
-    		    // Create entity
-    		    $entity = new $entityClass('', '');
-    		    $entity->setAzureValues((array)$properties, true);
-    		    
-    		    // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are OK
-    		    if ($entity instanceof Zend_Service_WindowsAzure_Storage_DynamicTableEntity) {
-    		        foreach ($properties as $key => $value) {  
-    		            $attributes = $value->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-    		            $type = (string)$attributes['type'];
-    		            if ($type !== '') {
-    		                $entity->setAzurePropertyType($key, $type);
-    		            }
-    		        }
-    		    }
-    
-    		    // Update etag
-    		    $etag      = $entry->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-    		    $etag      = (string)$etag['etag'];
-    		    $entity->setEtag($etag);
-    		    
-    		    // Add to result
-    		    $returnValue[] = $entity;
-		    }
-
-			// More entities?
-		    if (!is_null($response->getHeader('x-ms-continuation-NextPartitionKey')) && !is_null($response->getHeader('x-ms-continuation-NextRowKey'))) {
-		        if (strpos($queryString, '$top') === false) {
-		            $returnValue = array_merge($returnValue, $this->retrieveEntities($tableName, $filter, $entityClass, $response->getHeader('x-ms-continuation-NextPartitionKey'), $response->getHeader('x-ms-continuation-NextRowKey')));
-		        }
-		    }
-		    
-		    // Return
-		    return $returnValue;
-		} else {
-		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Update entity by replacing it
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function updateEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-	    return $this->_changeEntity(Zend_Http_Client::PUT, $tableName, $entity, $verifyEtag);
-	}
-	
-	/**
-	 * Update entity by adding or updating properties
-	 * 
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @param array                               $properties  Properties to merge. All properties will be used when omitted.
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false, $properties = array())
-	{
-		$mergeEntity = null;
-		if (is_array($properties) && count($properties) > 0) {
-			// Build a new object
-			$mergeEntity = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($entity->getPartitionKey(), $entity->getRowKey());
-			
-			// Keep only values mentioned in $properties
-			$azureValues = $entity->getAzureValues();
-			foreach ($azureValues as $key => $value) {
-				if (in_array($value->Name, $properties)) {
-					$mergeEntity->setAzureProperty($value->Name, $value->Value, $value->Type);
-				}
-			}
-		} else {
-			$mergeEntity = $entity;
-		}
-		
-	    return $this->_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag);
-	}
-	
-	/**
-	 * Get error message from Zend_Http_Response
-	 * 
-	 * @param Zend_Http_Response $response Repsonse
-	 * @param string $alternativeError Alternative error message
-	 * @return string
-	 */
-	protected function _getErrorMessage(Zend_Http_Response $response, $alternativeError = 'Unknown error.')
-	{
-		$response = $this->_parseResponse($response);
-		if ($response && $response->message) {
-		    return (string)$response->message;
-		} else {
-		    return $alternativeError;
-		}
-	}
-	
-	/**
-	 * Update entity / merge entity
-	 * 
-	 * @param string                              $httpVerb    HTTP verb to use (PUT = update, MERGE = merge)
-	 * @param string                              $tableName   Table name
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity      Entity to update
-	 * @param boolean                             $verifyEtag  Verify etag of the entity (used for concurrency)
-	 * @throws Zend_Service_WindowsAzure_Exception
-	 */
-	protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = '', Zend_Service_WindowsAzure_Storage_TableEntity $entity = null, $verifyEtag = false)
-	{
-		if ($tableName === '') {
-			throw new Zend_Service_WindowsAzure_Exception('Table name is not specified.');
-		}
-		if (is_null($entity)) {
-			throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.');
-		}
-		                     
-        // Add header information
-        $headers = array();
-        $headers['Content-Type']   = 'application/atom+xml';
-        $headers['Content-Length'] = 0;
-        if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-
-	    // Generate request body
-		$requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-                        <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
-                          <title />
-                          <updated>{tpl:Updated}</updated>
-                          <author>
-                            <name />
-                          </author>
-                          <id />
-                          <content type="application/xml">
-                            <m:properties>
-                              {tpl:Properties}
-                            </m:properties>
-                          </content>
-                        </entry>';
-		
-        $requestBody = $this->_fillTemplate($requestBody, array(
-        	'Updated'    => $this->isoDate(),
-            'Properties' => $this->_generateAzureRepresentation($entity)
-        ));
-
-        // Add header information
-        $headers = array();
-        $headers['Content-Type'] = 'application/atom+xml';
-	    if (!$verifyEtag) {
-            $headers['If-Match']       = '*';
-        } else {
-            $headers['If-Match']       = $entity->getEtag();
-        }
-        
-		// Perform request
-		$response = null;
-	    if ($this->isInBatch()) {
-		    $this->getCurrentBatch()->enlistOperation($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody);
-		    return null;
-		} else {
-		    $response = $this->_performRequest($tableName . '(PartitionKey=\'' . $entity->getPartitionKey() . '\', RowKey=\'' . $entity->getRowKey() . '\')', '', $httpVerb, $headers, true, $requestBody);
-		}
-		if ($response->isSuccessful()) {
-		    // Update properties
-			$entity->setEtag($response->getHeader('Etag'));
-			$entity->setTimestamp($response->getHeader('Last-modified'));
-
-		    return $entity;
-		} else {
-			throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
-		}
-	}
-	
-	/**
-	 * Generate RFC 1123 compliant date string
-	 * 
-	 * @return string
-	 */
-	protected function _rfcDate()
-	{
-	    return gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123
-	}
-	
-	/**
-	 * Fill text template with variables from key/value array
-	 * 
-	 * @param string $templateText Template text
-	 * @param array $variables Array containing key/value pairs
-	 * @return string
-	 */
-	protected function _fillTemplate($templateText, $variables = array())
-	{
-	    foreach ($variables as $key => $value) {
-	        $templateText = str_replace('{tpl:' . $key . '}', $value, $templateText);
-	    }
-	    return $templateText;
-	}
-	
-	/**
-	 * Generate Azure representation from entity (creates atompub markup from properties)
-	 * 
-	 * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity
-	 * @return string
-	 */
-	protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storage_TableEntity $entity = null)
-	{
-		// Generate Azure representation from entity
-		$azureRepresentation = array();
-		$azureValues         = $entity->getAzureValues();
-		foreach ($azureValues as $azureValue) {
-		    $value = array();
-		    $value[] = '<d:' . $azureValue->Name;
-		    if ($azureValue->Type != '') {
-		        $value[] = ' m:type="' . $azureValue->Type . '"';
-		    }
-		    if (is_null($azureValue->Value)) {
-		        $value[] = ' m:null="true"'; 
-		    }
-		    $value[] = '>';
-		    
-		    if (!is_null($azureValue->Value)) {
-		        if (strtolower($azureValue->Type) == 'edm.boolean') {
-		            $value[] = ($azureValue->Value == true ? '1' : '0');
-		        } else {
-		            $value[] = htmlspecialchars($azureValue->Value);
-		        }
-		    }
-		    
-		    $value[] = '</d:' . $azureValue->Name . '>';
-		    $azureRepresentation[] = implode('', $value);
-		}
-
-		return implode('', $azureRepresentation);
-	}
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntity.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
deleted file mode 100644
index 97dcad893..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntity.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobInstance.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_TableEntity
-{
-    /**
-     * Partition key
-     * 
-     * @var string
-     */
-    protected $_partitionKey;
-    
-    /**
-     * Row key
-     * 
-     * @var string
-     */
-    protected $_rowKey;
-    
-    /**
-     * Timestamp
-     * 
-     * @var string
-     */
-    protected $_timestamp = '1900-01-01T00:00:00';
-    
-    /**
-     * Etag
-     * 
-     * @var string
-     */
-    protected $_etag = '';
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $partitionKey    Partition key
-     * @param string  $rowKey          Row key
-     */
-    public function __construct($partitionKey = '', $rowKey = '') 
-    {	        
-        $this->_partitionKey = $partitionKey;
-        $this->_rowKey       = $rowKey;
-    }
-    
-    /**
-     * Get partition key
-     * 
-     * @azure PartitionKey
-     * @return string
-     */
-    public function getPartitionKey()
-    {
-        return $this->_partitionKey;
-    }
-    
-    /**
-     * Set partition key
-     * 
-     * @azure PartitionKey
-     * @param string $value
-     */
-    public function setPartitionKey($value)
-    {
-        $this->_partitionKey = $value;
-    }
-    
-    /**
-     * Get row key
-     * 
-     * @azure RowKey
-     * @return string
-     */
-    public function getRowKey()
-    {
-        return $this->_rowKey;
-    }
-    
-    /**
-     * Set row key
-     * 
-     * @azure RowKey
-     * @param string $value
-     */
-    public function setRowKey($value)
-    {
-        $this->_rowKey = $value;
-    }
-    
-    /**
-     * Get timestamp
-     * 
-     * @azure Timestamp Edm.DateTime
-     * @return string
-     */
-    public function getTimestamp()
-    {
-        return $this->_timestamp;
-    }
-    
-    /**
-     * Set timestamp
-     * 
-     * @azure Timestamp Edm.DateTime
-     * @param string $value
-     */
-    public function setTimestamp($value = '1900-01-01T00:00:00')
-    {
-        $this->_timestamp = $value;
-    }
-    
-    /**
-     * Get etag
-     * 
-     * @return string
-     */
-    public function getEtag()
-    {
-        return $this->_etag;
-    }
-    
-    /**
-     * Set etag
-     * 
-     * @param string $value
-     */
-    public function setEtag($value = '')
-    {
-        $this->_etag = $value;
-    }
-    
-    /**
-     * Get Azure values
-     * 
-     * @return array
-     */
-    public function getAzureValues()
-    {
-        // Get accessors
-        $accessors = self::getAzureAccessors(get_class($this));
-        
-        // Loop accessors and retrieve values
-        $returnValue = array();
-        foreach ($accessors as $accessor) {
-            if ($accessor->EntityType == 'ReflectionProperty') {
-                $property = $accessor->EntityAccessor;
-                $returnValue[] = (object)array(
-                    'Name'  => $accessor->AzurePropertyName,
-                	'Type'  => $accessor->AzurePropertyType,
-                	'Value' => $this->$property,
-                );
-            } else if ($accessor->EntityType == 'ReflectionMethod' && substr(strtolower($accessor->EntityAccessor), 0, 3) == 'get') {
-                $method = $accessor->EntityAccessor;
-                $returnValue[] = (object)array(
-                    'Name'  => $accessor->AzurePropertyName,
-                	'Type'  => $accessor->AzurePropertyType,
-                	'Value' => $this->$method(),
-                );
-            }
-        }
-        
-        // Return
-        return $returnValue;
-    }
-    
-    /**
-     * Set Azure values
-     * 
-     * @param array $values
-     * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values?
-     * @throws Zend_Service_WindowsAzure_Exception
-     */
-    public function setAzureValues($values = array(), $throwOnError = false)
-    {
-        // Get accessors
-        $accessors = self::getAzureAccessors(get_class($this));
-        
-        // Loop accessors and set values
-        $returnValue = array();
-        foreach ($accessors as $accessor) {
-            if (isset($values[$accessor->AzurePropertyName])) {
-                // Cast to correct type
-                if ($accessor->AzurePropertyType != '') {
-                    switch (strtolower($accessor->AzurePropertyType)) {
-        	            case 'edm.int32':
-        	            case 'edm.int64':
-        	                $values[$accessor->AzurePropertyName] = intval($values[$accessor->AzurePropertyName]); break;
-        	            case 'edm.boolean':
-        	                if ($values[$accessor->AzurePropertyName] == 'true' || $values[$accessor->AzurePropertyName] == '1')
-        	                    $values[$accessor->AzurePropertyName] = true;
-        	                else
-        	                    $values[$accessor->AzurePropertyName] = false;
-        	                break;
-        	            case 'edm.double':
-        	                $values[$accessor->AzurePropertyName] = floatval($values[$accessor->AzurePropertyName]); break;
-        	        }
-                }
-                
-                // Assign value
-                if ($accessor->EntityType == 'ReflectionProperty') {
-                    $property = $accessor->EntityAccessor;
-                    $this->$property = $values[$accessor->AzurePropertyName];
-                } else if ($accessor->EntityType == 'ReflectionMethod' && substr(strtolower($accessor->EntityAccessor), 0, 3) == 'set') {
-                    $method = $accessor->EntityAccessor;
-                    $this->$method($values[$accessor->AzurePropertyName]);
-                }
-            } else if ($throwOnError) {
-                throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array");    
-            }
-        }
-        
-        // Return
-        return $returnValue;
-    }
-    
-    /**
-     * Get Azure accessors from class
-     * 
-     * @param string $className Class to get accessors for
-     * @return array
-     */
-    public static function getAzureAccessors($className = '')
-    {
-        // List of accessors
-        $azureAccessors = array();
-        
-        // Get all types
-        $type = new ReflectionClass($className);
-        
-        // Loop all properties
-        $properties = $type->getProperties();
-        foreach ($properties as $property) {
-            $accessor = self::getAzureAccessor($property);
-            if (!is_null($accessor)) {
-                $azureAccessors[] = $accessor;
-            }
-        }
-        
-        // Loop all methods
-        $methods = $type->getMethods();
-        foreach ($methods as $method) {
-            $accessor = self::getAzureAccessor($method);
-            if (!is_null($accessor)) {
-                $azureAccessors[] = $accessor;
-            }
-        }
-        
-        // Return
-        return $azureAccessors;
-    }
-    
-    /**
-     * Get Azure accessor from reflection member
-     * 
-     * @param ReflectionProperty|ReflectionMethod $member
-     * @return object
-     */
-    public static function getAzureAccessor($member)
-    {
-        // Get comment
-        $docComment = $member->getDocComment();
-        
-        // Check for Azure comment
-        if (strpos($docComment, '@azure') === false)
-        {
-            return null;
-        }
-            
-        // Search for @azure contents
-        $azureComment = '';
-        $commentLines = explode("\n", $docComment);
-        foreach ($commentLines as $commentLine) {
-            if (strpos($commentLine, '@azure') !== false) {
-                $azureComment = trim(substr($commentLine, strpos($commentLine, '@azure') + 6));
-                while (strpos($azureComment, '  ') !== false) {
-                    $azureComment = str_replace('  ', ' ', $azureComment);
-                }
-                break;
-            }
-        }
-        
-        // Fetch @azure properties
-        $azureProperties = explode(' ', $azureComment);
-        return (object)array(
-            'EntityAccessor'    => $member->getName(),
-            'EntityType'        => get_class($member),
-            'AzurePropertyName' => $azureProperties[0],
-        	'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : ''
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
deleted file mode 100644
index db6a1c858..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Blob.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_WindowsAzure_Storage_TableEntityQuery
-{
-    /**
-     * From
-     * 
-     * @var string
-     */
-	protected $_from  = '';
-	
-	/**
-	 * Where
-	 * 
-	 * @var array
-	 */
-	protected $_where = array();
-	
-	/**
-	 * Order by
-	 * 
-	 * @var array
-	 */
-	protected $_orderBy = array();
-	
-	/**
-	 * Top
-	 * 
-	 * @var int
-	 */
-	protected $_top = null;
-	
-	/**
-	 * Partition key
-	 * 
-	 * @var string
-	 */
-	protected $_partitionKey = null;
-
-	/**
-	 * Row key
-	 * 
-	 * @var string
-	 */
-	protected $_rowKey = null;
-	
-	/**
-	 * Select clause
-	 * 
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function select()
-	{
-		return $this;
-	}
-	
-	/**
-	 * From clause
-	 * 
-	 * @param string $name Table name to select entities from
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function from($name)
-	{
-		$this->_from = $name;
-		return $this;
-	}
-	
-	/**
-	 * Specify partition key
-	 * 
-	 * @param string $value Partition key to query for
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function wherePartitionKey($value = null)
-	{
-	    $this->_partitionKey = $value;
-	    return $this;
-	}
-	
-	/**
-	 * Specify row key
-	 * 
-	 * @param string $value Row key to query for
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function whereRowKey($value = null)
-	{
-	    $this->_rowKey = $value;
-	    return $this;
-	}
-	
-	/**
-	 * Add where clause
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @param string       $cond        Condition for the clause (and/or/not)
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function where($condition, $value = null, $cond = '')
-	{
-	    $condition = $this->_replaceOperators($condition);
-	    
-	    if (!is_null($value)) {
-	        $condition = $this->_quoteInto($condition, $value);
-	    }
-	    
-		if (count($this->_where) == 0) {
-			$cond = '';
-		} else if ($cond !== '') {
-			$cond = ' ' . strtolower(trim($cond)) . ' ';
-		}
-		
-		$this->_where[] = $cond . $condition;
-		return $this;
-	}
-
-	/**
-	 * Add where clause with AND condition
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function andWhere($condition, $value = null)
-	{
-		return $this->where($condition, $value, 'and');
-	}
-	
-	/**
-	 * Add where clause with OR condition
-	 * 
-	 * @param string       $condition   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value       Value(s) to insert in question mark (?) parameters.
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function orWhere($condition, $value = null)
-	{
-		return $this->where($condition, $value, 'or');
-	}
-	
-	/**
-	 * OrderBy clause
-	 * 
-	 * @param string $column    Column to sort by
-	 * @param string $direction Direction to sort (asc/desc)
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-	public function orderBy($column, $direction = 'asc')
-	{
-		$this->_orderBy[] = $column . ' ' . $direction;
-		return $this;
-	}
-    
-	/**
-	 * Top clause
-	 * 
-	 * @param int $top  Top to fetch
-	 * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery
-	 */
-    public function top($top = null)
-    {
-        $this->_top  = (int)$top;
-        return $this;
-    }
-	
-    /**
-     * Assembles the query string
-     * 
-     * @param boolean $urlEncode Apply URL encoding to the query string
-     * @return string
-     */
-	public function assembleQueryString($urlEncode = false)
-	{
-		$query = array();
-		if (count($this->_where) != 0) {
-		    $filter = implode('', $this->_where);
-			$query[] = '$filter=' . ($urlEncode ? urlencode($filter) : $filter);
-		}
-		
-		if (count($this->_orderBy) != 0) {
-		    $orderBy = implode(',', $this->_orderBy);
-			$query[] = '$orderby=' . ($urlEncode ? urlencode($orderBy) : $orderBy);
-		}
-		
-		if (!is_null($this->_top)) {
-			$query[] = '$top=' . $this->_top;
-		}
-		
-		if (count($query) != 0) {
-			return '?' . implode('&', $query);
-		}
-		
-		return '';
-	}
-	
-	/**
-	 * Assemble from
-	 * 
-	 * @param boolean $includeParentheses Include parentheses? ()
-	 * @return string
-	 */
-	public function assembleFrom($includeParentheses = true)
-	{
-	    $identifier = '';
-	    if ($includeParentheses) {
-	        $identifier .= '(';
-	        
-	        if (!is_null($this->_partitionKey)) {
-	            $identifier .= 'PartitionKey=\'' . $this->_partitionKey . '\'';
-	        }
-	            
-	        if (!is_null($this->_partitionKey) && !is_null($this->_rowKey)) {
-	            $identifier .= ', ';
-	        }
-	            
-	        if (!is_null($this->_rowKey)) {
-	            $identifier .= 'RowKey=\'' . $this->_rowKey . '\'';
-	        }
-	            
-	        $identifier .= ')';
-	    }
-		return $this->_from . $identifier;
-	}
-	
-	/**
-	 * Assemble full query
-	 * 
-	 * @return string
-	 */
-	public function assembleQuery()
-	{
-		$assembledQuery = $this->assembleFrom();
-		
-		$queryString = $this->assembleQueryString();
-		if ($queryString !== '') {
-			$assembledQuery .= $queryString;
-		}
-		
-		return $assembledQuery;
-	}
-	
-	/**
-	 * Quotes a variable into a condition
-	 * 
-	 * @param string       $text   Condition, can contain question mark(s) (?) for parameter insertion.
-	 * @param string|array $value  Value(s) to insert in question mark (?) parameters.
-	 * @return string
-	 */
-	protected function _quoteInto($text, $value = null)
-	{
-		if (!is_array($value)) {
-	        $text = str_replace('?', '\'' . addslashes($value) . '\'', $text);
-	    } else {
-	        $i = 0;
-	        while(strpos($text, '?') !== false) {
-	            if (is_numeric($value[$i])) {
-	                $text = substr_replace($text, $value[$i++], strpos($text, '?'), 1);
-	            } else {
-	                $text = substr_replace($text, '\'' . addslashes($value[$i++]) . '\'', strpos($text, '?'), 1);
-	            }
-	        }
-	    }
-	    return $text;
-	}
-	
-	/**
-	 * Replace operators
-	 * 
-	 * @param string $text
-	 * @return string
-	 */
-	protected function _replaceOperators($text)
-	{
-	    $text = str_replace('==', 'eq',  $text);
-	    $text = str_replace('>',  'gt',  $text);
-	    $text = str_replace('<',  'lt',  $text);
-	    $text = str_replace('>=', 'ge',  $text);
-	    $text = str_replace('<=', 'le',  $text);
-	    $text = str_replace('!=', 'ne',  $text);
-	    
-	    $text = str_replace('&&', 'and', $text);
-	    $text = str_replace('||', 'or',  $text);
-	    $text = str_replace('!',  'not', $text);
-	    
-	    return $text;
-	}
-	
-	/**
-	 * __toString overload
-	 * 
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return $this->assembleQuery();
-	}
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableInstance.php b/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
deleted file mode 100644
index 95b613c79..000000000
--- a/airtime_mvc/library/Zend/Service/WindowsAzure/Storage/TableInstance.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BlobInstance.php 14561 2009-05-07 08:05:12Z unknown $
- */
-
-/**
- * @see Zend_Service_WindowsAzure_Exception
- */
-require_once 'Zend/Service/WindowsAzure/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service_WindowsAzure
- * @subpackage Storage
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * 
- * @property string  $Id              Id
- * @property string  $Name            Name
- * @property string  $Href            Href
- * @property string  $Updated         Updated
- */
-class Zend_Service_WindowsAzure_Storage_TableInstance
-{
-    /**
-     * Data
-     * 
-     * @var array
-     */
-    protected $_data = null;
-    
-    /**
-     * Constructor
-     * 
-     * @param string  $id              Id
-     * @param string  $name            Name
-     * @param string  $href            Href
-     * @param string  $updated         Updated
-     */
-    public function __construct($id, $name, $href, $updated) 
-    {	        
-        $this->_data = array(
-            'id'               => $id,
-            'name'             => $name,
-            'href'             => $href,
-            'updated'          => $updated
-        );
-    }
-    
-    /**
-     * Magic overload for setting properties
-     * 
-     * @param string $name     Name of the property
-     * @param string $value    Value to set
-     */
-    public function __set($name, $value) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            $this->_data[strtolower($name)] = $value;
-            return;
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-
-    /**
-     * Magic overload for getting properties
-     * 
-     * @param string $name     Name of the property
-     */
-    public function __get($name) {
-        if (array_key_exists(strtolower($name), $this->_data)) {
-            return $this->_data[strtolower($name)];
-        }
-
-        throw new Exception("Unknown property: " . $name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo.php b/airtime_mvc/library/Zend/Service/Yahoo.php
deleted file mode 100644
index e725fa499..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo.php
+++ /dev/null
@@ -1,956 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Yahoo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo
-{
-    /**
-     * Yahoo Developer Application ID
-     *
-     * @var string
-     */
-    public $appId;
-
-    /**
-     * Reference to the REST client
-     *
-     * @var Zend_Rest_Client
-     */
-    protected $_rest;
-
-
-    /**
-     * Sets the application ID and instantiates the REST client
-     *
-     * @param  string $appId specified the developer's appid
-     * @return void
-     */
-    public function __construct($appId)
-    {
-        $this->appId = (string) $appId;
-        /**
-         * @see Zend_Rest_Client
-         */
-        require_once 'Zend/Rest/Client.php';
-        $this->_rest = new Zend_Rest_Client('http://search.yahooapis.com');
-    }
-
-
-    /**
-     * Retrieve Inlink Data from siteexplorer.yahoo.com.  A basic query
-     * consists simply of a URL.  Additional options that can be
-     * specified consist of:
-     * 'results'      => int  How many results to return, max is 100
-     * 'start'        => int  The start offset for search results
-     * 'entire_site'  => bool  Data for the whole site or a single page
-     * 'omit_inlinks' => (none|domain|subdomain)  Filter inlinks from these sources
-     *
-     * @param  string $query    the query being run
-     * @param  array  $options  any optional parameters
-     * @return Zend_Service_Yahoo_ResultSet  The return set
-     * @throws Zend_Service_Exception
-     */
-    public function inlinkDataSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('results'     => '50',
-                                       'start'    => 1);
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-        $this->_validateInlinkDataSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/SiteExplorerService/V1/inlinkData', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Yahoo_InlinkDataResultSet
-         */
-        require_once 'Zend/Service/Yahoo/InlinkDataResultSet.php';
-        return new Zend_Service_Yahoo_InlinkDataResultSet($dom);
-    }
-
-
-    /**
-     * Perform a search of images.  The most basic query consists simply
-     * of a plain text search, but you can also specify the type of
-     * image, the format, color, etc.
-     *
-     * The specific options are:
-     * 'type'       => (all|any|phrase)  How to parse the query terms
-     * 'results'    => int  How many results to return, max is 50
-     * 'start'      => int  The start offset for search results
-     * 'format'     => (any|bmp|gif|jpeg|png)  The type of images to search for
-     * 'coloration' => (any|color|bw)  The coloration of images to search for
-     * 'adult_ok'   => bool  Flag to allow 'adult' images.
-     *
-     * @param  string $query   the query to be run
-     * @param  array  $options an optional array of query options
-     * @return Zend_Service_Yahoo_ImageResultSet the search results
-     * @throws Zend_Service_Exception
-     */
-    public function imageSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('type'       => 'all',
-                                       'results'    => 10,
-                                       'start'      => 1,
-                                       'format'     => 'any',
-                                       'coloration' => 'any');
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-
-        $this->_validateImageSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/ImageSearchService/V1/imageSearch', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_YahooImageResultSet
-         */
-        require_once 'Zend/Service/Yahoo/ImageResultSet.php';
-        return new Zend_Service_Yahoo_ImageResultSet($dom);
-    }
-
-
-    /**
-     * Perform a search on local.yahoo.com.  The basic search
-     * consists of a query and some fragment of location information;
-     * for example zipcode, latitude/longitude, or street address.
-     *
-     * Query options include:
-     * 'results'    => int  How many results to return, max is 50
-     * 'start'      => int  The start offset for search results
-     * 'sort'       => (relevance|title|distance|rating) How to order your results
-     *
-     * 'radius'     => float  The radius (in miles) in which to search
-     *
-     * 'longitude'  => float  The longitude of the location to search around
-     * 'latitude'   => float  The latitude of the location to search around
-     *
-     * 'zip'        => string The zipcode to search around
-     *
-     * 'street'     => string  The street address to search around
-     * 'city'       => string  The city for address search
-     * 'state'      => string  The state for address search
-     * 'location'   => string  An adhoc location string to search around
-     *
-     * @param  string $query    The query string you want to run
-     * @param  array  $options  The search options, including location
-     * @return Zend_Service_Yahoo_LocalResultSet The results
-     * @throws Zend_Service_Exception
-     */
-    public function localSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('results' => 10,
-                                       'start'   => 1,
-                                       'sort'    => 'distance',
-                                       'radius'  => 5);
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-
-        $this->_validateLocalSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://local.yahooapis.com');
-        $response = $this->_rest->restGet('/LocalSearchService/V1/localSearch', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Yahoo_LocalResultSet
-         */
-        require_once 'Zend/Service/Yahoo/LocalResultSet.php';
-        return new Zend_Service_Yahoo_LocalResultSet($dom);
-    }
-
-
-    /**
-     * Execute a search on news.yahoo.com. This method minimally takes a
-     * text query to search on.
-     *
-     * Query options coonsist of:
-     *
-     * 'results'    => int  How many results to return, max is 50
-     * 'start'      => int  The start offset for search results
-     * 'sort'       => (rank|date)  How to order your results
-     * 'language'   => lang  The target document language to match
-     * 'type'       => (all|any|phrase)  How the query should be parsed
-     * 'site'       => string  A site to which your search should be restricted
-     *
-     * @param  string $query    The query to run
-     * @param  array  $options  The array of optional parameters
-     * @return Zend_Service_Yahoo_NewsResultSet  The query return set
-     * @throws Zend_Service_Exception
-     */
-    public function newsSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('type'     => 'all',
-                                       'start'    => 1,
-                                       'sort'     => 'rank');
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-
-        $this->_validateNewsSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/NewsSearchService/V1/newsSearch', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Yahoo_NewsResultSet
-         */
-        require_once 'Zend/Service/Yahoo/NewsResultSet.php';
-        return new Zend_Service_Yahoo_NewsResultSet($dom);
-    }
-
-
-    /**
-     * Retrieve Page Data from siteexplorer.yahoo.com.  A basic query
-     * consists simply of a URL.  Additional options that can be
-     * specified consist of:
-     * 'results'      => int  How many results to return, max is 100
-     * 'start'        => int  The start offset for search results
-     * 'domain_only'  => bool  Data for just the given domain or all sub-domains also
-     *
-     * @param  string $query    the query being run
-     * @param  array  $options  any optional parameters
-     * @return Zend_Service_Yahoo_ResultSet  The return set
-     * @throws Zend_Service_Exception
-     */
-    public function pageDataSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('results'     => '50',
-                                       'start'    => 1);
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-        $this->_validatePageDataSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/SiteExplorerService/V1/pageData', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Yahoo_PageDataResultSet
-         */
-        require_once 'Zend/Service/Yahoo/PageDataResultSet.php';
-        return new Zend_Service_Yahoo_PageDataResultSet($dom);
-    }
-
-
-    /**
-     * Perform a search of videos.  The most basic query consists simply
-     * of a plain text search, but you can also specify the format of
-     * video.
-     *
-     * The specific options are:
-     * 'type'       => (all|any|phrase)  How to parse the query terms
-     * 'results'    => int  How many results to return, max is 50
-     * 'start'      => int  The start offset for search results
-     * 'format'     => (any|avi|flash|mpeg|msmedia|quicktime|realmedia)  The type of videos to search for
-     * 'adult_ok'   => bool  Flag to allow 'adult' videos.
-     *
-     * @param  string $query   the query to be run
-     * @param  array  $options an optional array of query options
-     * @return Zend_Service_Yahoo_VideoResultSet the search results
-     * @throws Zend_Service_Exception
-     */
-    public function videoSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('type'       => 'all',
-                                       'results'    => 10,
-                                       'start'      => 1,
-                                       'format'     => 'any');
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-
-        $this->_validateVideoSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/VideoSearchService/V1/videoSearch', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_YahooVideoResultSet
-         */
-        require_once 'Zend/Service/Yahoo/VideoResultSet.php';
-        return new Zend_Service_Yahoo_VideoResultSet($dom);
-    }
-
-
-    /**
-     * Perform a web content search on search.yahoo.com.  A basic query
-     * consists simply of a text query.  Additional options that can be
-     * specified consist of:
-     * 'results'    => int  How many results to return, max is 50
-     * 'start'      => int  The start offset for search results
-     * 'language'   => lang  The target document language to match
-     * 'type'       => (all|any|phrase)  How the query should be parsed
-     * 'site'       => string  A site to which your search should be restricted
-     * 'format'     => (any|html|msword|pdf|ppt|rss|txt|xls)
-     * 'adult_ok'   => bool  permit 'adult' content in the search results
-     * 'similar_ok' => bool  permit similar results in the result set
-     * 'country'    => string  The country code for the content searched
-     * 'license'    => (any|cc_any|cc_commercial|cc_modifiable)  The license of content being searched
-     * 'region'     => The regional search engine on which the service performs the search. default us.
-     *
-     * @param  string $query    the query being run
-     * @param  array  $options  any optional parameters
-     * @return Zend_Service_Yahoo_WebResultSet  The return set
-     * @throws Zend_Service_Exception
-     */
-    public function webSearch($query, array $options = array())
-    {
-        static $defaultOptions = array('type'     => 'all',
-                                       'start'    => 1,
-                                       'results'  => 10,
-                                       'format'   => 'any');
-
-        $options = $this->_prepareOptions($query, $options, $defaultOptions);
-        $this->_validateWebSearch($options);
-
-        $this->_rest->getHttpClient()->resetParameters();
-        $this->_rest->setUri('http://search.yahooapis.com');
-        $response = $this->_rest->restGet('/WebSearchService/V1/webSearch', $options);
-
-        if ($response->isError()) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: ' .
-                                             $response->getStatus());
-        }
-
-        $dom = new DOMDocument();
-        $dom->loadXML($response->getBody());
-
-        self::_checkErrors($dom);
-
-        /**
-         * @see Zend_Service_Yahoo_WebResultSet
-         */
-        require_once 'Zend/Service/Yahoo/WebResultSet.php';
-        return new Zend_Service_Yahoo_WebResultSet($dom);
-    }
-
-
-    /**
-     * Returns a reference to the REST client
-     *
-     * @return Zend_Rest_Client
-     */
-    public function getRestClient()
-    {
-        return $this->_rest;
-    }
-
-
-    /**
-     * Validate Inlink Data Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateInlinkDataSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'results', 'start', 'entire_site', 'omit_inlinks');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 100, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(100)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['omit_inlinks'])) {
-            $this->_validateInArray('omit_inlinks', $options['omit_inlinks'], array('none', 'domain', 'subdomain'));
-        }
-    }
-
-
-    /**
-     * Validate Image Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateImageSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'type', 'results', 'start', 'format', 'coloration', 'adult_ok');
-
-        $this->_compareOptions($options, $validOptions);
-
-        if (isset($options['type'])) {
-            switch($options['type']) {
-                case 'all':
-                case 'any':
-                case 'phrase':
-                    break;
-                default:
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception("Invalid value for option 'type': '{$options['type']}'");
-            }
-        }
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 50, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(50)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['format'])) {
-            switch ($options['format']) {
-                case 'any':
-                case 'bmp':
-                case 'gif':
-                case 'jpeg':
-                case 'png':
-                    break;
-                default:
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception("Invalid value for option 'format': {$options['format']}");
-            }
-        }
-
-        if (isset($options['coloration'])) {
-            switch ($options['coloration']) {
-                case 'any':
-                case 'color':
-                case 'bw':
-                    break;
-                default:
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception("Invalid value for option 'coloration': "
-                                                   . "{$options['coloration']}");
-            }
-        }
-    }
-
-
-    /**
-     * Validate Local Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateLocalSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'results', 'start', 'sort', 'radius', 'street',
-                              'city', 'state', 'zip', 'location', 'latitude', 'longitude');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 20, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(20)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['longitude']) && !$between->setMin(-90)->setMax(90)->isValid($options['longitude'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'longitude': {$options['longitude']}");
-        }
-
-        if (isset($options['latitude']) && !$between->setMin(-180)->setMax(180)->isValid($options['latitude'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'latitude': {$options['latitude']}");
-        }
-
-        if (isset($options['zip']) && !preg_match('/(^\d{5}$)|(^\d{5}-\d{4}$)/', $options['zip'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'zip': {$options['zip']}");
-        }
-
-        $hasLocation = false;
-        $locationFields = array('street', 'city', 'state', 'zip', 'location');
-        foreach ($locationFields as $field) {
-            if (isset($options[$field]) && $options[$field] != '') {
-                $hasLocation = true;
-                break;
-            }
-        }
-
-        if (!$hasLocation && (!isset($options['latitude']) || !isset($options['longitude']))) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('Location data are required but missing');
-        }
-
-        if (!in_array($options['sort'], array('relevance', 'title', 'distance', 'rating'))) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'sort': {$options['sort']}");
-        }
-    }
-
-
-    /**
-     * Validate News Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateNewsSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'results', 'start', 'sort', 'language', 'type', 'site');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 50, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(50)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['language'])) {
-            $this->_validateLanguage($options['language']);
-        }
-
-        $this->_validateInArray('sort', $options['sort'], array('rank', 'date'));
-        $this->_validateInArray('type', $options['type'], array('all', 'any', 'phrase'));
-    }
-
-
-    /**
-     * Validate Page Data Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validatePageDataSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'results', 'start', 'domain_only');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 100, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(100)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-    }
-
-
-    /**
-     * Validate Video Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateVideoSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'type', 'results', 'start', 'format', 'adult_ok');
-
-        $this->_compareOptions($options, $validOptions);
-
-        if (isset($options['type'])) {
-            $this->_validateInArray('type', $options['type'], array('all', 'any', 'phrase'));
-        }
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 50, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(50)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['format'])) {
-            $this->_validateInArray('format', $options['format'], array('any', 'avi', 'flash', 'mpeg', 'msmedia', 'quicktime', 'realmedia'));
-        }
-    }
-
-
-    /**
-     * Validate Web Search Options
-     *
-     * @param  array $options
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateWebSearch(array $options)
-    {
-        $validOptions = array('appid', 'query', 'results', 'start', 'language', 'type', 'format', 'adult_ok',
-                              'similar_ok', 'country', 'site', 'subscription', 'license', 'region');
-
-        $this->_compareOptions($options, $validOptions);
-
-        /**
-         * @see Zend_Validate_Between
-         */
-        require_once 'Zend/Validate/Between.php';
-        $between = new Zend_Validate_Between(1, 100, true);
-
-        if (isset($options['results']) && !$between->setMin(1)->setMax(100)->isValid($options['results'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'results': {$options['results']}");
-        }
-
-        if (isset($options['start']) && !$between->setMin(1)->setMax(1000)->isValid($options['start'])) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option 'start': {$options['start']}");
-        }
-
-        if (isset($options['language'])) {
-            $this->_validateLanguage($options['language']);
-        }
-
-        $this->_validateInArray('type', $options['type'], array('all', 'any', 'phrase'));
-        $this->_validateInArray('format', $options['format'], array('any', 'html', 'msword', 'pdf', 'ppt', 'rss',
-                                                                    'txt', 'xls'));
-        if (isset($options['license'])) {
-            $this->_validateInArray('license', $options['license'], array('any', 'cc_any', 'cc_commercial',
-                                                                      'cc_modifiable'));
-        }
-
-        if (isset($options['region'])){
-            $this->_validateInArray('region', $options['region'], array('ar', 'au', 'at', 'br', 'ca', 'ct', 'dk', 'fi',
-                                                                          'fr', 'de', 'in', 'id', 'it', 'my', 'mx',
-                                                                          'nl', 'no', 'ph', 'ru', 'sg', 'es', 'se',
-                                                                          'ch', 'th', 'uk', 'us'));
-        }
-    }
-
-
-    /**
-     * Prepare options for sending to Yahoo!
-     *
-     * @param  string $query          Search Query
-     * @param  array  $options        User specified options
-     * @param  array  $defaultOptions Required/Default options
-     * @return array
-     */
-    protected function _prepareOptions($query, array $options, array $defaultOptions = array())
-    {
-        $options['appid'] = $this->appId;
-        $options['query'] = (string) $query;
-
-        return array_merge($defaultOptions, $options);
-    }
-
-
-    /**
-     * Throws an exception if the chosen language is not supported
-     *
-     * @param  string $lang Language code
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateLanguage($lang)
-    {
-        $languages = array('ar', 'bg', 'ca', 'szh', 'tzh', 'hr', 'cs', 'da', 'nl', 'en', 'et', 'fi', 'fr', 'de', 'el',
-            'he', 'hu', 'is', 'id', 'it', 'ja', 'ko', 'lv', 'lt', 'no', 'fa', 'pl', 'pt', 'ro', 'ru', 'sk', 'sr', 'sl',
-            'es', 'sv', 'th', 'tr'
-            );
-        if (!in_array($lang, $languages)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("The selected language '$lang' is not supported");
-        }
-    }
-
-
-    /**
-     * Utility function to check for a difference between two arrays.
-     *
-     * @param  array $options      User specified options
-     * @param  array $validOptions Valid options
-     * @return void
-     * @throws Zend_Service_Exception if difference is found (e.g., unsupported query option)
-     */
-    protected function _compareOptions(array $options, array $validOptions)
-    {
-        $difference = array_diff(array_keys($options), $validOptions);
-        if ($difference) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception('The following parameters are invalid: ' . join(', ', $difference));
-        }
-    }
-
-
-    /**
-     * Check that a named value is in the given array
-     *
-     * @param  string $name  Name associated with the value
-     * @param  mixed  $value Value
-     * @param  array  $array Array in which to check for the value
-     * @return void
-     * @throws Zend_Service_Exception
-     */
-    protected function _validateInArray($name, $value, array $array)
-    {
-        if (!in_array($value, $array)) {
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception("Invalid value for option '$name': $value");
-        }
-    }
-
-
-    /**
-     * Check if response is an error
-     *
-     * @param  DOMDocument $dom DOM Object representing the result XML
-     * @return void
-     * @throws Zend_Service_Exception Thrown when the result from Yahoo! is an error
-     */
-    protected static function _checkErrors(DOMDocument $dom)
-    {
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('yapi', 'urn:yahoo:api');
-
-        if ($xpath->query('//yapi:Error')->length >= 1) {
-            $message = $xpath->query('//yapi:Error/yapi:Message/text()')->item(0)->data;
-            /**
-             * @see Zend_Service_Exception
-             */
-            require_once 'Zend/Service/Exception.php';
-            throw new Zend_Service_Exception($message);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/Image.php b/airtime_mvc/library/Zend/Service/Yahoo/Image.php
deleted file mode 100644
index cf24123fd..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/Image.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_Image
-{
-    /**
-     * Image URL
-     *
-     * @var string
-     */
-    public $Url;
-
-    /**
-     * Image height in pixels
-     *
-     * @var int
-     */
-    public $Height;
-
-    /**
-     * Image width in pixels
-     *
-     * @var int
-     */
-    public $Width;
-
-
-    /**
-     * Initializes the image
-     *
-     * @param  DOMNode $dom
-     * @param  string  $namespace
-     * @return void
-     */
-    public function __construct(DOMNode $dom, $namespace)
-    {
-        $xpath = new DOMXPath($dom->ownerDocument);
-        $xpath->registerNamespace('yh', $namespace);
-        $this->Url = Zend_Uri::factory($xpath->query('./yh:Url/text()', $dom)->item(0)->data);
-        $this->Height = (int) $xpath->query('./yh:Height/text()', $dom)->item(0)->data;
-        $this->Width = (int) $xpath->query('./yh:Width/text()', $dom)->item(0)->data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/ImageResult.php b/airtime_mvc/library/Zend/Service/Yahoo/ImageResult.php
deleted file mode 100644
index 6d87ee068..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/ImageResult.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ImageResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_ImageResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Summary info for the image
-     *
-     * @var string
-     */
-    public $Summary;
-
-    /**
-     * The URL of the webpage hosting the image
-     *
-     * @var string
-     */
-    public $RefererUrl;
-
-    /**
-     * The size of the files in bytes
-     *
-     * @var string
-     */
-    public $FileSize;
-
-    /**
-     * The type of file (bmp, gif, jpeg, etc.)
-     *
-     * @var string
-     */
-    public $FileFormat;
-
-    /**
-     * The height of the image in pixels
-     *
-     * @var string
-     */
-    public $Height;
-
-    /**
-     * The width of the image in pixels
-     *
-     * @var string
-     */
-    public $Width;
-
-    /**
-     * The thubmnail image for the article, if it exists
-     *
-     * @var Zend_Service_Yahoo_Image
-     */
-    public $Thumbnail;
-
-    /**
-     * Image result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srchmi';
-
-
-    /**
-     * Initializes the image result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array('Summary', 'RefererUrl', 'FileSize', 'FileFormat', 'Height', 'Width', 'Thumbnail');
-
-        parent::__construct($result);
-
-        $this->_setThumbnail();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/ImageResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/ImageResultSet.php
deleted file mode 100644
index e94d09933..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/ImageResultSet.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ImageResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_ImageResult
- */
-require_once 'Zend/Service/Yahoo/ImageResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_ImageResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * Image result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srchmi';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_ImageResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_ImageResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResult.php b/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResult.php
deleted file mode 100644
index cba728628..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResult.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InlinkDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_InlinkDataResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Web result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Initializes the web result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array();
-        parent::__construct($result);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResultSet.php
deleted file mode 100644
index ecfc19290..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/InlinkDataResultSet.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InlinkDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_WebResult
- */
-require_once 'Zend/Service/Yahoo/InlinkDataResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_InlinkDataResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * Web result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_InlinkDataResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_InlinkDataResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/LocalResult.php b/airtime_mvc/library/Zend/Service/Yahoo/LocalResult.php
deleted file mode 100644
index 61e8eb750..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/LocalResult.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_LocalResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Street address of the result
-     *
-     * @var string
-     */
-    public $Address;
-
-    /**
-     * City in which the result resides
-     *
-     * @var string
-     */
-    public $City;
-
-    /**
-     * State in which the result resides
-     *
-     * @var string
-     */
-    public $State;
-
-    /**
-     * Phone number for the result
-     *
-     * @var string
-     */
-    public $Phone;
-
-    /**
-     * User-submitted rating for the result
-     *
-     * @var string
-     */
-    public $Rating;
-
-    /**
-     * The distance to the result from your specified location
-     *
-     * @var string
-     */
-    public $Distance;
-
-    /**
-     * A URL of a map for the result
-     *
-     * @var string
-     */
-    public $MapUrl;
-
-    /**
-     * The URL for the business website, if known
-     *
-     * @var string
-     */
-    public $BusinessUrl;
-
-    /**
-     * The URL for linking to the business website, if known
-     *
-     * @var string
-     */
-    public $BusinessClickUrl;
-
-    /**
-     * Local result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:lcl';
-
-
-    /**
-     * Initializes the local result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array('Address','City', 'City', 'State', 'Phone', 'Rating', 'Distance', 'MapUrl',
-                               'BusinessUrl', 'BusinessClickUrl');
-
-        parent::__construct($result);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/LocalResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/LocalResultSet.php
deleted file mode 100644
index 7833e7ef2..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/LocalResultSet.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_LocalResult
- */
-require_once 'Zend/Service/Yahoo/LocalResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_LocalResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * The URL of a webpage containing a map graphic with all returned results plotted on it.
-     *
-     * @var string
-     */
-    public $resultSetMapURL;
-
-    /**
-     * Local result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:lcl';
-
-
-    /**
-     * Initializes the local result set
-     *
-     * @param  DOMDocument $dom
-     * @return void
-     */
-    public function __construct(DOMDocument $dom)
-    {
-        parent::__construct($dom);
-
-        $this->resultSetMapURL = $this->_xpath->query('//yh:ResultSetMapUrl/text()')->item(0)->data;
-    }
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_LocalResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_LocalResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/NewsResult.php b/airtime_mvc/library/Zend/Service/Yahoo/NewsResult.php
deleted file mode 100644
index 38319a1a3..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/NewsResult.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewsResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_NewsResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Sumamry text associated with the result article
-     *
-     * @var string
-     */
-    public $Summary;
-
-    /**
-     * The company who distributed the article
-     *
-     * @var string
-     */
-    public $NewsSource;
-
-    /**
-     * The URL for the company who distributed the article
-     *
-     * @var string
-     */
-    public $NewsSourceUrl;
-
-    /**
-     * The language the article is in
-     *
-     * @var string
-     */
-    public $Language;
-
-    /**
-     * The date the article was published (in unix timestamp format)
-     *
-     * @var string
-     */
-    public $PublishDate;
-
-    /**
-     * The date the article was modified (in unix timestamp format)
-     *
-     * @var string
-     */
-    public $ModificationDate;
-
-    /**
-     * The thubmnail image for the article, if it exists
-     *
-     * @var Zend_Service_Yahoo_Image
-     */
-    public $Thumbnail;
-
-    /**
-     * News result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:yn';
-
-
-    /**
-     * Initializes the news result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array('Summary', 'NewsSource', 'NewsSourceUrl', 'Language', 'PublishDate',
-                               'ModificationDate', 'Thumbnail');
-
-        parent::__construct($result);
-
-        $this->_setThumbnail();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/NewsResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/NewsResultSet.php
deleted file mode 100644
index 2c5c50812..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/NewsResultSet.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NewsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_NewsResult
- */
-require_once 'Zend/Service/Yahoo/NewsResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_NewsResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * News result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:yn';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_NewsResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_NewsResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/PageDataResult.php b/airtime_mvc/library/Zend/Service/Yahoo/PageDataResult.php
deleted file mode 100644
index e2019a2fc..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/PageDataResult.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PageDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_PageDataResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Web result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Initializes the web result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array();
-        parent::__construct($result);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/PageDataResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/PageDataResultSet.php
deleted file mode 100644
index 952158fe9..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/PageDataResultSet.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PageDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_WebResult
- */
-require_once 'Zend/Service/Yahoo/PageDataResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_PageDataResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * Web result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_WebResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_PageDataResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/Result.php b/airtime_mvc/library/Zend/Service/Yahoo/Result.php
deleted file mode 100644
index bac33f64c..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/Result.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_Result
-{
-    /**
-     * The title of the search entry
-     *
-     * @var string
-     */
-    public $Title;
-
-    /**
-     * The URL of the found object
-     *
-     * @var string
-     */
-    public $Url;
-
-    /**
-     * The URL for linking to the found object
-     *
-     * @var string
-     */
-    public $ClickUrl;
-
-    /**
-     * Result fields
-     *
-     * @var array
-     */
-    protected $_fields;
-
-    /**
-     * REST response fragment for the result
-     *
-     * @var DOMElement
-     */
-    protected $_result;
-
-    /**
-     * Object for XPath queries
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath;
-
-
-    /**
-     * Initializes the result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        // default fields for all search results:
-        $fields = array('Title', 'Url', 'ClickUrl');
-
-        // merge w/ child's fields
-        $this->_fields = array_merge($this->_fields, $fields);
-
-        $this->_xpath = new DOMXPath($result->ownerDocument);
-        $this->_xpath->registerNamespace('yh', $this->_namespace);
-
-        // add search results to appropriate fields
-
-        foreach ($this->_fields as $f) {
-            $query = "./yh:$f/text()";
-            $node = $this->_xpath->query($query, $result);
-            if ($node->length == 1) {
-                $this->{$f} = $node->item(0)->data;
-            }
-        }
-
-        $this->_result = $result;
-    }
-
-
-    /**
-     * Sets the Thumbnail property
-     *
-     * @return void
-     */
-    protected function _setThumbnail()
-    {
-        $node = $this->_xpath->query('./yh:Thumbnail', $this->_result);
-        if ($node->length == 1) {
-            /**
-             * @see Zend_Service_Yahoo_Image
-             */
-            require_once 'Zend/Service/Yahoo/Image.php';
-            $this->Thumbnail = new Zend_Service_Yahoo_Image($node->item(0), $this->_namespace);
-        } else {
-            $this->Thumbnail = null;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/ResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/ResultSet.php
deleted file mode 100644
index 5794cddce..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/ResultSet.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_ResultSet implements SeekableIterator
-{
-    /**
-     * Total number of results available
-     *
-     * @var int
-     */
-    public $totalResultsAvailable;
-
-    /**
-     * The number of results in this result set
-     *
-     * @var int
-     */
-    public $totalResultsReturned;
-
-    /**
-     * The offset in the total result set of this search set
-     *
-     * @var int
-     */
-    public $firstResultPosition;
-
-    /**
-     * A DOMNodeList of results
-     *
-     * @var DOMNodeList
-     */
-    protected $_results;
-
-    /**
-     * Yahoo Web Service Return Document
-     *
-     * @var DOMDocument
-     */
-    protected $_dom;
-
-    /**
-     * Xpath Object for $this->_dom
-     *
-     * @var DOMXPath
-     */
-    protected $_xpath;
-
-    /**
-     * Current Index for SeekableIterator
-     *
-     * @var int
-     */
-    protected $_currentIndex = 0;
-
-
-    /**
-     * Parse the search response and retrieve the results for iteration
-     *
-     * @param  DOMDocument $dom the REST fragment for this object
-     * @return void
-     */
-    public function __construct(DOMDocument $dom)
-    {
-        $this->totalResultsAvailable = (int) $dom->documentElement->getAttribute('totalResultsAvailable');
-        $this->totalResultsReturned = (int) $dom->documentElement->getAttribute('totalResultsReturned');
-        $this->firstResultPosition = (int) $dom->documentElement->getAttribute('firstResultPosition');
-
-        $this->_dom = $dom;
-        $this->_xpath = new DOMXPath($dom);
-
-        $this->_xpath->registerNamespace('yh', $this->_namespace);
-
-        $this->_results = $this->_xpath->query('//yh:Result');
-    }
-
-
-    /**
-     * Total Number of results returned
-     *
-     * @return int Total number of results returned
-     */
-    public function totalResults()
-    {
-        return $this->totalResultsReturned;
-    }
-
-
-    /**
-     * Implement SeekableIterator::current()
-     *
-     * Must be implemented by child classes
-     *
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Yahoo_Result
-     */
-    public function current()
-    {
-        /**
-         * @see Zend_Service_Exception
-         */
-        require_once 'Zend/Service/Exception.php';
-        throw new Zend_Service_Exception('Zend_Service_Yahoo_ResultSet::current() must be implemented by child '
-                                       . 'classes');
-    }
-
-
-    /**
-     * Implement SeekableIterator::key()
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->_currentIndex;
-    }
-
-
-    /**
-     * Implement SeekableIterator::next()
-     *
-     * @return void
-     */
-    public function next()
-    {
-        $this->_currentIndex += 1;
-    }
-
-
-    /**
-     * Implement SeekableIterator::rewind()
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->_currentIndex = 0;
-    }
-
-
-    /**
-     * Implement SeekableIterator::seek()
-     *
-     * @param  int $index
-     * @return void
-     * @throws OutOfBoundsException
-     */
-    public function seek($index)
-    {
-        $indexInt = (int) $index;
-        if ($indexInt >= 0 && $indexInt < $this->_results->length) {
-            $this->_currentIndex = $indexInt;
-        } else {
-            throw new OutOfBoundsException("Illegal index '$index'");
-        }
-    }
-
-
-    /**
-     * Implement SeekableIterator::valid()
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return $this->_currentIndex < $this->_results->length;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/VideoResult.php b/airtime_mvc/library/Zend/Service/Yahoo/VideoResult.php
deleted file mode 100644
index 103436607..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/VideoResult.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * Summary info for the video
-     *
-     * @var string
-     */
-    public $Summary;
-
-    /**
-     * The URL of the webpage hosting the video
-     *
-     * @var string
-     */
-    public $RefererUrl;
-
-    /**
-     * The size of the files in bytes
-     *
-     * @var string
-     */
-    public $FileSize;
-
-    /**
-     * The type of file (bmp, gif, jpeg, etc.)
-     *
-     * @var string
-     */
-    public $FileFormat;
-
-    /**
-     * The height of the video in pixels
-     *
-     * @var string
-     */
-    public $Height;
-
-    /**
-     * The width of the video in pixels
-     *
-     * @var string
-     */
-    public $Width;
-
-    /**
-     * The duration of the video in seconds
-     *
-     * @var string
-     */
-    public $Duration;
-
-    /**
-     * The number of audio channels in the video
-     *
-     * @var string
-     */
-    public $Channels;
-
-    /**
-     * Whether the video is streamed or not
-     *
-     * @var boolean
-     */
-    public $Streaming;
-
-    /**
-     * The thubmnail video for the article, if it exists
-     *
-     * @var Zend_Service_Yahoo_Video
-     */
-    public $Thumbnail;
-
-    /**
-     * Video result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srchmv';
-
-
-    /**
-     * Initializes the video result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array('Summary', 'RefererUrl', 'FileSize', 'FileFormat', 'Height', 'Width', 'Duration', 'Channels', 'Streaming', 'Thumbnail');
-
-        parent::__construct($result);
-
-        $this->_setThumbnail();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/VideoResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/VideoResultSet.php
deleted file mode 100644
index 8fbc0f135..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/VideoResultSet.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: VideoResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_VideoResult
- */
-require_once 'Zend/Service/Yahoo/VideoResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_VideoResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * Video result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srchmv';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_VideoResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_VideoResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/WebResult.php b/airtime_mvc/library/Zend/Service/Yahoo/WebResult.php
deleted file mode 100644
index 2743ec548..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/WebResult.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WebResult.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_Result
- */
-require_once 'Zend/Service/Yahoo/Result.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result
-{
-    /**
-     * A summary of the result
-     *
-     * @var string
-     */
-    public $Summary;
-
-    /**
-     * The file type of the result (text, html, pdf, etc.)
-     *
-     * @var string
-     */
-    public $MimeType;
-
-    /**
-     * The modification time of the result (as a unix timestamp)
-     *
-     * @var string
-     */
-    public $ModificationDate;
-
-    /**
-     * The URL for the Yahoo cache of this page, if it exists
-     *
-     * @var string
-     */
-    public $CacheUrl;
-
-    /**
-     * The size of the cache entry
-     *
-     * @var int
-     */
-    public $CacheSize;
-
-    /**
-     * Web result namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Initializes the web result
-     *
-     * @param  DOMElement $result
-     * @return void
-     */
-    public function __construct(DOMElement $result)
-    {
-        $this->_fields = array('Summary', 'MimeType', 'ModificationDate');
-        parent::__construct($result);
-
-        $this->_xpath = new DOMXPath($result->ownerDocument);
-        $this->_xpath->registerNamespace('yh', $this->_namespace);
-
-        // check if the cache section exists
-        $cacheUrl = $this->_xpath->query('./yh:Cache/yh:Url/text()', $result)->item(0);
-        if ($cacheUrl instanceof DOMNode)
-        {
-            $this->CacheUrl = $cacheUrl->data;
-        }
-        $cacheSize = $this->_xpath->query('./yh:Cache/yh:Size/text()', $result)->item(0);
-        if ($cacheSize instanceof DOMNode)
-        {
-            $this->CacheSize = (int) $cacheSize->data;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Service/Yahoo/WebResultSet.php b/airtime_mvc/library/Zend/Service/Yahoo/WebResultSet.php
deleted file mode 100644
index ba54ebf83..000000000
--- a/airtime_mvc/library/Zend/Service/Yahoo/WebResultSet.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: WebResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * @see Zend_Service_Yahoo_ResultSet
- */
-require_once 'Zend/Service/Yahoo/ResultSet.php';
-
-
-/**
- * @see Zend_Service_Yahoo_WebResult
- */
-require_once 'Zend/Service/Yahoo/WebResult.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Yahoo
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Yahoo_WebResultSet extends Zend_Service_Yahoo_ResultSet
-{
-    /**
-     * Web result set namespace
-     *
-     * @var string
-     */
-    protected $_namespace = 'urn:yahoo:srch';
-
-
-    /**
-     * Overrides Zend_Service_Yahoo_ResultSet::current()
-     *
-     * @return Zend_Service_Yahoo_WebResult
-     */
-    public function current()
-    {
-        return new Zend_Service_Yahoo_WebResult($this->_results->item($this->_currentIndex));
-    }
-}
diff --git a/airtime_mvc/library/Zend/Session.php b/airtime_mvc/library/Zend/Session.php
deleted file mode 100644
index 17116fbd4..000000000
--- a/airtime_mvc/library/Zend/Session.php
+++ /dev/null
@@ -1,880 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-
-/**
- * @see Zend_Session_Abstract
- */
-require_once 'Zend/Session/Abstract.php';
-
-/**
- * @see Zend_Session_Namespace
- */
-require_once 'Zend/Session/Namespace.php';
-
-/**
- * @see Zend_Session_SaveHandler_Interface
- */
-require_once 'Zend/Session/SaveHandler/Interface.php';
-
-
-/**
- * Zend_Session
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session extends Zend_Session_Abstract
-{
-    /**
-     * Whether or not Zend_Session is being used with unit tests
-     *
-     * @internal
-     * @var bool
-     */
-    public static $_unitTestEnabled = false;
-
-    /**
-     * $_throwStartupException
-     *
-     * @var bool|bitset This could also be a combiniation of error codes to catch
-     */
-    protected static $_throwStartupExceptions = true;
-
-    /**
-     * Check whether or not the session was started
-     *
-     * @var bool
-     */
-    private static $_sessionStarted = false;
-
-    /**
-     * Whether or not the session id has been regenerated this request.
-     *
-     * Id regeneration state
-     * <0 - regenerate requested when session is started
-     * 0  - do nothing
-     * >0 - already called session_regenerate_id()
-     *
-     * @var int
-     */
-    private static $_regenerateIdState = 0;
-
-    /**
-     * Private list of php's ini values for ext/session
-     * null values will default to the php.ini value, otherwise
-     * the value below will overwrite the default ini value, unless
-     * the user has set an option explicity with setOptions()
-     *
-     * @var array
-     */
-    private static $_defaultOptions = array(
-        'save_path'                 => null,
-        'name'                      => null, /* this should be set to a unique value for each application */
-        'save_handler'              => null,
-        //'auto_start'                => null, /* intentionally excluded (see manual) */
-        'gc_probability'            => null,
-        'gc_divisor'                => null,
-        'gc_maxlifetime'            => null,
-        'serialize_handler'         => null,
-        'cookie_lifetime'           => null,
-        'cookie_path'               => null,
-        'cookie_domain'             => null,
-        'cookie_secure'             => null,
-        'cookie_httponly'           => null,
-        'use_cookies'               => null,
-        'use_only_cookies'          => 'on',
-        'referer_check'             => null,
-        'entropy_file'              => null,
-        'entropy_length'            => null,
-        'cache_limiter'             => null,
-        'cache_expire'              => null,
-        'use_trans_sid'             => null,
-        'bug_compat_42'             => null,
-        'bug_compat_warn'           => null,
-        'hash_function'             => null,
-        'hash_bits_per_character'   => null
-    );
-
-    /**
-     * List of options pertaining to Zend_Session that can be set by developers
-     * using Zend_Session::setOptions(). This list intentionally duplicates
-     * the individual declaration of static "class" variables by the same names.
-     *
-     * @var array
-     */
-    private static $_localOptions = array(
-        'strict'                => '_strict',
-        'remember_me_seconds'   => '_rememberMeSeconds',
-        'throw_startup_exceptions' => '_throwStartupExceptions'
-    );
-
-    /**
-     * Whether or not write close has been performed.
-     *
-     * @var bool
-     */
-    private static $_writeClosed = false;
-
-    /**
-     * Whether or not session id cookie has been deleted
-     *
-     * @var bool
-     */
-    private static $_sessionCookieDeleted = false;
-
-    /**
-     * Whether or not session has been destroyed via session_destroy()
-     *
-     * @var bool
-     */
-    private static $_destroyed = false;
-
-    /**
-     * Whether or not session must be initiated before usage
-     *
-     * @var bool
-     */
-    private static $_strict = false;
-
-    /**
-     * Default number of seconds the session will be remembered for when asked to be remembered
-     *
-     * @var int
-     */
-    private static $_rememberMeSeconds = 1209600; // 2 weeks
-
-    /**
-     * Whether the default options listed in Zend_Session::$_localOptions have been set
-     *
-     * @var bool
-     */
-    private static $_defaultOptionsSet = false;
-
-    /**
-     * A reference to the set session save handler
-     *
-     * @var Zend_Session_SaveHandler_Interface
-     */
-    private static $_saveHandler = null;
-
-
-    /**
-     * Constructor overriding - make sure that a developer cannot instantiate
-     */
-    protected function __construct()
-    {
-    }
-
-
-    /**
-     * setOptions - set both the class specified
-     *
-     * @param  array $userOptions - pass-by-keyword style array of <option name, option value> pairs
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public static function setOptions(array $userOptions = array())
-    {
-        // set default options on first run only (before applying user settings)
-        if (!self::$_defaultOptionsSet) {
-            foreach (self::$_defaultOptions as $defaultOptionName => $defaultOptionValue) {
-                if (isset(self::$_defaultOptions[$defaultOptionName])) {
-                    ini_set("session.$defaultOptionName", $defaultOptionValue);
-                }
-            }
-
-            self::$_defaultOptionsSet = true;
-        }
-
-        // set the options the user has requested to set
-        foreach ($userOptions as $userOptionName => $userOptionValue) {
-
-            $userOptionName = strtolower($userOptionName);
-
-            // set the ini based values
-            if (array_key_exists($userOptionName, self::$_defaultOptions)) {
-                ini_set("session.$userOptionName", $userOptionValue);
-            }
-            elseif (isset(self::$_localOptions[$userOptionName])) {
-                self::${self::$_localOptions[$userOptionName]} = $userOptionValue;
-            }
-            else {
-                /** @see Zend_Session_Exception */
-                require_once 'Zend/Session/Exception.php';
-                throw new Zend_Session_Exception("Unknown option: $userOptionName = $userOptionValue");
-            }
-        }
-    }
-
-    /**
-     * getOptions()
-     *
-     * @param string $optionName OPTIONAL
-     * @return array|string
-     */
-    public static function getOptions($optionName = null)
-    {
-        $options = array();
-        foreach (ini_get_all('session') as $sysOptionName => $sysOptionValues) {
-            $options[substr($sysOptionName, 8)] = $sysOptionValues['local_value'];
-        }
-        foreach (self::$_localOptions as $localOptionName => $localOptionMemberName) {
-            $options[$localOptionName] = self::${$localOptionMemberName};
-        }
-
-        if ($optionName) {
-            if (array_key_exists($optionName, $options)) {
-                return $options[$optionName];
-            }
-            return null;
-        }
-
-        return $options;
-    }
-
-    /**
-     * setSaveHandler() - Session Save Handler assignment
-     *
-     * @param Zend_Session_SaveHandler_Interface $interface
-     * @return void
-     */
-    public static function setSaveHandler(Zend_Session_SaveHandler_Interface $saveHandler)
-    {
-        self::$_saveHandler = $saveHandler;
-
-        if (self::$_unitTestEnabled) {
-            return;
-        }
-
-        session_set_save_handler(
-            array(&$saveHandler, 'open'),
-            array(&$saveHandler, 'close'),
-            array(&$saveHandler, 'read'),
-            array(&$saveHandler, 'write'),
-            array(&$saveHandler, 'destroy'),
-            array(&$saveHandler, 'gc')
-            );
-    }
-
-
-    /**
-     * getSaveHandler() - Get the session Save Handler
-     *
-     * @return Zend_Session_SaveHandler_Interface
-     */
-    public static function getSaveHandler()
-    {
-        return self::$_saveHandler;
-    }
-
-
-    /**
-     * regenerateId() - Regenerate the session id.  Best practice is to call this after
-     * session is started.  If called prior to session starting, session id will be regenerated
-     * at start time.
-     *
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public static function regenerateId()
-    {
-        if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("You must call " . __CLASS__ . '::' . __FUNCTION__ .
-                "() before any output has been sent to the browser; output started in {$filename}/{$linenum}");
-        }
-
-        if (self::$_sessionStarted && self::$_regenerateIdState <= 0) {
-            if (!self::$_unitTestEnabled) {
-                session_regenerate_id(true);
-            }
-            self::$_regenerateIdState = 1;
-        } else {
-            /**
-             * @todo If we can detect that this requester had no session previously,
-             *       then why regenerate the id before the session has started?
-             *       Feedback wanted for:
-             //
-            if (isset($_COOKIE[session_name()]) || (!use only cookies && isset($_REQUEST[session_name()]))) {
-                self::$_regenerateIdState = 1;
-            } else {
-                self::$_regenerateIdState = -1;
-            }
-            //*/
-            self::$_regenerateIdState = -1;
-        }
-    }
-
-
-    /**
-     * rememberMe() - Write a persistent cookie that expires after a number of seconds in the future. If no number of
-     * seconds is specified, then this defaults to self::$_rememberMeSeconds.  Due to clock errors on end users' systems,
-     * large values are recommended to avoid undesirable expiration of session cookies.
-     *
-     * @param $seconds integer - OPTIONAL specifies TTL for cookie in seconds from present time
-     * @return void
-     */
-    public static function rememberMe($seconds = null)
-    {
-        $seconds = (int) $seconds;
-        $seconds = ($seconds > 0) ? $seconds : self::$_rememberMeSeconds;
-
-        self::rememberUntil($seconds);
-    }
-
-
-    /**
-     * forgetMe() - Write a volatile session cookie, removing any persistent cookie that may have existed. The session
-     * would end upon, for example, termination of a web browser program.
-     *
-     * @return void
-     */
-    public static function forgetMe()
-    {
-        self::rememberUntil(0);
-    }
-
-
-    /**
-     * rememberUntil() - This method does the work of changing the state of the session cookie and making
-     * sure that it gets resent to the browser via regenerateId()
-     *
-     * @param int $seconds
-     * @return void
-     */
-    public static function rememberUntil($seconds = 0)
-    {
-        if (self::$_unitTestEnabled) {
-            self::regenerateId();
-            return;
-        }
-
-        $cookieParams = session_get_cookie_params();
-
-        session_set_cookie_params(
-            $seconds,
-            $cookieParams['path'],
-            $cookieParams['domain'],
-            $cookieParams['secure']
-            );
-
-        // normally "rememberMe()" represents a security context change, so should use new session id
-        self::regenerateId();
-    }
-
-
-    /**
-     * sessionExists() - whether or not a session exists for the current request
-     *
-     * @return bool
-     */
-    public static function sessionExists()
-    {
-        if (ini_get('session.use_cookies') == '1' && isset($_COOKIE[session_name()])) {
-            return true;
-        } elseif (!empty($_REQUEST[session_name()])) {
-            return true;
-        } elseif (self::$_unitTestEnabled) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Whether or not session has been destroyed via session_destroy()
-     *
-     * @return bool
-     */
-    public static function isDestroyed()
-    {
-        return self::$_destroyed;
-    }
-
-
-    /**
-     * start() - Start the session.
-     *
-     * @param bool|array $options  OPTIONAL Either user supplied options, or flag indicating if start initiated automatically
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public static function start($options = false)
-    {
-        if (self::$_sessionStarted && self::$_destroyed) {
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('The session was explicitly destroyed during this request, attempting to re-start is not allowed.');
-        }
-
-        if (self::$_sessionStarted) {
-            return; // already started
-        }
-
-        // make sure our default options (at the least) have been set
-        if (!self::$_defaultOptionsSet) {
-            self::setOptions(is_array($options) ? $options : array());
-        }
-
-        // In strict mode, do not allow auto-starting Zend_Session, such as via "new Zend_Session_Namespace()"
-        if (self::$_strict && $options === true) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('You must explicitly start the session with Zend_Session::start() when session options are set to strict.');
-        }
-
-        $filename = $linenum = null;
-        if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("Session must be started before any output has been sent to the browser;"
-               . " output started in {$filename}/{$linenum}");
-        }
-
-        // See http://www.php.net/manual/en/ref.session.php for explanation
-        if (!self::$_unitTestEnabled && defined('SID')) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('session has already been started by session.auto-start or session_start()');
-        }
-
-        /**
-         * Hack to throw exceptions on start instead of php errors
-         * @see http://framework.zend.com/issues/browse/ZF-1325
-         */
-
-        $errorLevel = (is_int(self::$_throwStartupExceptions)) ? self::$_throwStartupExceptions : E_ALL;
-
-        /** @see Zend_Session_Exception */
-        if (!self::$_unitTestEnabled) {
-
-            if (self::$_throwStartupExceptions) {
-                require_once 'Zend/Session/Exception.php';
-                set_error_handler(array('Zend_Session_Exception', 'handleSessionStartError'), $errorLevel);
-            }
-
-            $startedCleanly = session_start();
-
-            if (self::$_throwStartupExceptions) {
-                restore_error_handler();
-            }
-
-            if (!$startedCleanly || Zend_Session_Exception::$sessionStartError != null) {
-                if (self::$_throwStartupExceptions) {
-                    set_error_handler(array('Zend_Session_Exception', 'handleSilentWriteClose'), $errorLevel);
-                }
-                session_write_close();
-                if (self::$_throwStartupExceptions) {
-                    restore_error_handler();
-                    throw new Zend_Session_Exception(__CLASS__ . '::' . __FUNCTION__ . '() - ' . Zend_Session_Exception::$sessionStartError);
-                }
-            }
-        }
-
-        parent::$_readable = true;
-        parent::$_writable = true;
-        self::$_sessionStarted = true;
-        if (self::$_regenerateIdState === -1) {
-            self::regenerateId();
-        }
-
-        // run validators if they exist
-        if (isset($_SESSION['__ZF']['VALID'])) {
-            self::_processValidators();
-        }
-
-        self::_processStartupMetadataGlobal();
-    }
-
-
-    /**
-     * _processGlobalMetadata() - this method initizes the sessions GLOBAL
-     * metadata, mostly global data expiration calculations.
-     *
-     * @return void
-     */
-    private static function _processStartupMetadataGlobal()
-    {
-        // process global metadata
-        if (isset($_SESSION['__ZF'])) {
-
-            // expire globally expired values
-            foreach ($_SESSION['__ZF'] as $namespace => $namespace_metadata) {
-
-                // Expire Namespace by Time (ENT)
-                if (isset($namespace_metadata['ENT']) && ($namespace_metadata['ENT'] > 0) && (time() > $namespace_metadata['ENT']) ) {
-                    unset($_SESSION[$namespace]);
-                    unset($_SESSION['__ZF'][$namespace]);
-                }
-
-                // Expire Namespace by Global Hop (ENGH)
-                if (isset($namespace_metadata['ENGH']) && $namespace_metadata['ENGH'] >= 1) {
-                    $_SESSION['__ZF'][$namespace]['ENGH']--;
-
-                    if ($_SESSION['__ZF'][$namespace]['ENGH'] === 0) {
-                        if (isset($_SESSION[$namespace])) {
-                            parent::$_expiringData[$namespace] = $_SESSION[$namespace];
-                            unset($_SESSION[$namespace]);
-                        }
-                        unset($_SESSION['__ZF'][$namespace]);
-                    }
-                }
-
-                // Expire Namespace Variables by Time (ENVT)
-                if (isset($namespace_metadata['ENVT'])) {
-                    foreach ($namespace_metadata['ENVT'] as $variable => $time) {
-                        if (time() > $time) {
-                            unset($_SESSION[$namespace][$variable]);
-                            unset($_SESSION['__ZF'][$namespace]['ENVT'][$variable]);
-                        }
-                    }
-                    if (empty($_SESSION['__ZF'][$namespace]['ENVT'])) {
-                        unset($_SESSION['__ZF'][$namespace]['ENVT']);
-                    }
-                }
-
-                // Expire Namespace Variables by Global Hop (ENVGH)
-                if (isset($namespace_metadata['ENVGH'])) {
-                    foreach ($namespace_metadata['ENVGH'] as $variable => $hops) {
-                        $_SESSION['__ZF'][$namespace]['ENVGH'][$variable]--;
-
-                        if ($_SESSION['__ZF'][$namespace]['ENVGH'][$variable] === 0) {
-                            if (isset($_SESSION[$namespace][$variable])) {
-                                parent::$_expiringData[$namespace][$variable] = $_SESSION[$namespace][$variable];
-                                unset($_SESSION[$namespace][$variable]);
-                            }
-                            unset($_SESSION['__ZF'][$namespace]['ENVGH'][$variable]);
-                        }
-                    }
-		    if(empty($_SESSION['__ZF'][$namespace]['ENVGH'])) {
-			unset($_SESSION['__ZF'][$namespace]['ENVGH']);	
-                    }
-                }
-            }
-
-            if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) {
-                unset($_SESSION['__ZF'][$namespace]);
-            }
-        }
-
-        if (isset($_SESSION['__ZF']) && empty($_SESSION['__ZF'])) {
-            unset($_SESSION['__ZF']);
-        }
-    }
-
-
-    /**
-     * isStarted() - convenience method to determine if the session is already started.
-     *
-     * @return bool
-     */
-    public static function isStarted()
-    {
-        return self::$_sessionStarted;
-    }
-
-
-    /**
-     * isRegenerated() - convenience method to determine if session_regenerate_id()
-     * has been called during this request by Zend_Session.
-     *
-     * @return bool
-     */
-    public static function isRegenerated()
-    {
-        return ( (self::$_regenerateIdState > 0) ? true : false );
-    }
-
-
-    /**
-     * getId() - get the current session id
-     *
-     * @return string
-     */
-    public static function getId()
-    {
-        return session_id();
-    }
-
-
-    /**
-     * setId() - set an id to a user specified id
-     *
-     * @throws Zend_Session_Exception
-     * @param string $id
-     * @return void
-     */
-    public static function setId($id)
-    {
-        if (!self::$_unitTestEnabled && defined('SID')) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('The session has already been started.  The session id must be set first.');
-        }
-
-        if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("You must call ".__CLASS__.'::'.__FUNCTION__.
-                "() before any output has been sent to the browser; output started in {$filename}/{$linenum}");
-        }
-
-        if (!is_string($id) || $id === '') {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('You must provide a non-empty string as a session identifier.');
-        }
-
-        session_id($id);
-    }
-
-
-    /**
-     * registerValidator() - register a validator that will attempt to validate this session for
-     * every future request
-     *
-     * @param Zend_Session_Validator_Interface $validator
-     * @return void
-     */
-    public static function registerValidator(Zend_Session_Validator_Interface $validator)
-    {
-        $validator->setup();
-    }
-
-
-    /**
-     * stop() - Disable write access.  Optionally disable read (not implemented).
-     *
-     * @return void
-     */
-    public static function stop()
-    {
-        parent::$_writable = false;
-    }
-
-
-    /**
-     * writeClose() - Shutdown the sesssion, close writing and detach $_SESSION from the back-end storage mechanism.
-     * This will complete the internal data transformation on this request.
-     *
-     * @param bool $readonly - OPTIONAL remove write access (i.e. throw error if Zend_Session's attempt writes)
-     * @return void
-     */
-    public static function writeClose($readonly = true)
-    {
-        if (self::$_unitTestEnabled) {
-            return;
-        }
-
-        if (self::$_writeClosed) {
-            return;
-        }
-
-        if ($readonly) {
-            parent::$_writable = false;
-        }
-
-        session_write_close();
-        self::$_writeClosed = true;
-    }
-
-
-    /**
-     * destroy() - This is used to destroy session data, and optionally, the session cookie itself
-     *
-     * @param bool $remove_cookie - OPTIONAL remove session id cookie, defaults to true (remove cookie)
-     * @param bool $readonly - OPTIONAL remove write access (i.e. throw error if Zend_Session's attempt writes)
-     * @return void
-     */
-    public static function destroy($remove_cookie = true, $readonly = true)
-    {
-        if (self::$_unitTestEnabled) {
-            return;
-        }
-
-        if (self::$_destroyed) {
-            return;
-        }
-
-        if ($readonly) {
-            parent::$_writable = false;
-        }
-
-        session_destroy();
-        self::$_destroyed = true;
-
-        if ($remove_cookie) {
-            self::expireSessionCookie();
-        }
-    }
-
-
-    /**
-     * expireSessionCookie() - Sends an expired session id cookie, causing the client to delete the session cookie
-     *
-     * @return void
-     */
-    public static function expireSessionCookie()
-    {
-        if (self::$_unitTestEnabled) {
-            return;
-        }
-
-        if (self::$_sessionCookieDeleted) {
-            return;
-        }
-
-        self::$_sessionCookieDeleted = true;
-
-        if (isset($_COOKIE[session_name()])) {
-            $cookie_params = session_get_cookie_params();
-
-            setcookie(
-                session_name(),
-                false,
-                315554400, // strtotime('1980-01-01'),
-                $cookie_params['path'],
-                $cookie_params['domain'],
-                $cookie_params['secure']
-                );
-        }
-    }
-
-
-    /**
-     * _processValidator() - internal function that is called in the existence of VALID metadata
-     *
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    private static function _processValidators()
-    {
-        foreach ($_SESSION['__ZF']['VALID'] as $validator_name => $valid_data) {
-            if (!class_exists($validator_name)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($validator_name);
-            }
-            $validator = new $validator_name;
-            if ($validator->validate() === false) {
-                /** @see Zend_Session_Exception */
-                require_once 'Zend/Session/Exception.php';
-                throw new Zend_Session_Exception("This session is not valid according to {$validator_name}.");
-            }
-        }
-    }
-
-
-    /**
-     * namespaceIsset() - check to see if a namespace is set
-     *
-     * @param string $namespace
-     * @return bool
-     */
-    public static function namespaceIsset($namespace)
-    {
-        return parent::_namespaceIsset($namespace);
-    }
-
-
-    /**
-     * namespaceUnset() - unset a namespace or a variable within a namespace
-     *
-     * @param string $namespace
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public static function namespaceUnset($namespace)
-    {
-        parent::_namespaceUnset($namespace);
-        Zend_Session_Namespace::resetSingleInstance($namespace);
-    }
-
-
-    /**
-     * namespaceGet() - get all variables in a namespace
-     * Deprecated: Use getIterator() in Zend_Session_Namespace.
-     *
-     * @param string $namespace
-     * @return array
-     */
-    public static function namespaceGet($namespace)
-    {
-        return parent::_namespaceGetAll($namespace);
-    }
-
-
-    /**
-     * getIterator() - return an iteratable object for use in foreach and the like,
-     * this completes the IteratorAggregate interface
-     *
-     * @throws Zend_Session_Exception
-     * @return ArrayObject
-     */
-    public static function getIterator()
-    {
-        if (parent::$_readable === false) {
-            /** @see Zend_Session_Exception */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(parent::_THROW_NOT_READABLE_MSG);
-        }
-
-        $spaces  = array();
-        if (isset($_SESSION)) {
-            $spaces = array_keys($_SESSION);
-            foreach($spaces as $key => $space) {
-                if (!strncmp($space, '__', 2) || !is_array($_SESSION[$space])) {
-                    unset($spaces[$key]);
-                }
-            }
-        }
-
-        return new ArrayObject(array_merge($spaces, array_keys(parent::$_expiringData)));
-    }
-
-
-    /**
-     * isWritable() - returns a boolean indicating if namespaces can write (use setters)
-     *
-     * @return bool
-     */
-    public static function isWritable()
-    {
-        return parent::$_writable;
-    }
-
-
-    /**
-     * isReadable() - returns a boolean indicating if namespaces can write (use setters)
-     *
-     * @return bool
-     */
-    public static function isReadable()
-    {
-        return parent::$_readable;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Session/Abstract.php b/airtime_mvc/library/Zend/Session/Abstract.php
deleted file mode 100644
index 5603d146c..000000000
--- a/airtime_mvc/library/Zend/Session/Abstract.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-
-/**
- * Zend_Session_Abstract
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Session_Abstract
-{
-    /**
-     * Whether or not session permits writing (modification of $_SESSION[])
-     *
-     * @var bool
-     */
-    protected static $_writable = false;
-
-    /**
-     * Whether or not session permits reading (reading data in $_SESSION[])
-     *
-     * @var bool
-     */
-    protected static $_readable = false;
-
-    /**
-     * Since expiring data is handled at startup to avoid __destruct difficulties,
-     * the data that will be expiring at end of this request is held here
-     *
-     * @var array
-     */
-    protected static $_expiringData = array();
-
-
-    /**
-     * Error message thrown when an action requires modification,
-     * but current Zend_Session has been marked as read-only.
-     */
-    const _THROW_NOT_WRITABLE_MSG = 'Zend_Session is currently marked as read-only.';
-
-
-    /**
-     * Error message thrown when an action requires reading session data,
-     * but current Zend_Session is not marked as readable.
-     */
-    const _THROW_NOT_READABLE_MSG = 'Zend_Session is not marked as readable.';
-
-
-    /**
-     * namespaceIsset() - check to see if a namespace or a variable within a namespace is set
-     *
-     * @param  string $namespace
-     * @param  string $name
-     * @return bool
-     */
-    protected static function _namespaceIsset($namespace, $name = null)
-    {
-        if (self::$_readable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG);
-        }
-
-        if ($name === null) {
-            return ( isset($_SESSION[$namespace]) || isset(self::$_expiringData[$namespace]) );
-        } else {
-            return ( isset($_SESSION[$namespace][$name]) || isset(self::$_expiringData[$namespace][$name]) );
-        }
-    }
-
-
-    /**
-     * namespaceUnset() - unset a namespace or a variable within a namespace
-     *
-     * @param  string $namespace
-     * @param  string $name
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    protected static function _namespaceUnset($namespace, $name = null)
-    {
-        if (self::$_writable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(self::_THROW_NOT_WRITABLE_MSG);
-        }
-
-        $name = (string) $name;
-
-        // check to see if the api wanted to remove a var from a namespace or a namespace
-        if ($name === '') {
-            unset($_SESSION[$namespace]);
-            unset(self::$_expiringData[$namespace]);
-        } else {
-            unset($_SESSION[$namespace][$name]);
-            unset(self::$_expiringData[$namespace]);
-        }
-
-        // if we remove the last value, remove namespace.
-        if (empty($_SESSION[$namespace])) {
-            unset($_SESSION[$namespace]);
-        }
-    }
-
-
-    /**
-     * namespaceGet() - Get $name variable from $namespace, returning by reference.
-     *
-     * @param  string $namespace
-     * @param  string $name
-     * @return mixed
-     */
-    protected static function & _namespaceGet($namespace, $name = null)
-    {
-        if (self::$_readable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG);
-        }
-
-        if ($name === null) {
-            if (isset($_SESSION[$namespace])) { // check session first for data requested
-                return $_SESSION[$namespace];
-            } elseif (isset(self::$_expiringData[$namespace])) { // check expiring data for data reqeusted
-                return self::$_expiringData[$namespace];
-            } else {
-                return $_SESSION[$namespace]; // satisfy return by reference
-            }
-        } else {
-            if (isset($_SESSION[$namespace][$name])) { // check session first
-                return $_SESSION[$namespace][$name];
-            } elseif (isset(self::$_expiringData[$namespace][$name])) { // check expiring data
-                return self::$_expiringData[$namespace][$name];
-            } else {
-                return $_SESSION[$namespace][$name]; // satisfy return by reference
-            }
-        }
-    }
-
-
-    /**
-     * namespaceGetAll() - Get an array containing $namespace, including expiring data.
-     *
-     * @param string $namespace
-     * @param string $name
-     * @return mixed
-     */
-    protected static function _namespaceGetAll($namespace)
-    {
-        $currentData  = (isset($_SESSION[$namespace]) && is_array($_SESSION[$namespace])) ?
-            $_SESSION[$namespace] : array();
-        $expiringData = (isset(self::$_expiringData[$namespace]) && is_array(self::$_expiringData[$namespace])) ?
-            self::$_expiringData[$namespace] : array();
-        return array_merge($currentData, $expiringData);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Session/Exception.php b/airtime_mvc/library/Zend/Session/Exception.php
deleted file mode 100644
index 04c34f729..000000000
--- a/airtime_mvc/library/Zend/Session/Exception.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * Zend_Session_Exception
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session_Exception extends Zend_Exception
-{
-    /**
-     * sessionStartError
-     *
-     * @see http://framework.zend.com/issues/browse/ZF-1325
-     * @var string PHP Error Message
-     */
-    static public $sessionStartError = null;
-
-    /**
-     * handleSessionStartError() - interface for set_error_handler()
-     *
-     * @see    http://framework.zend.com/issues/browse/ZF-1325
-     * @param  int    $errno
-     * @param  string $errstr
-     * @return void
-     */
-    static public function handleSessionStartError($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        self::$sessionStartError = $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext;
-    }
-
-    /**
-     * handleSilentWriteClose() - interface for set_error_handler()
-     *
-     * @see    http://framework.zend.com/issues/browse/ZF-1325
-     * @param  int    $errno
-     * @param  string $errstr
-     * @return void
-     */
-    static public function handleSilentWriteClose($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-        self::$sessionStartError .= PHP_EOL . $errfile . '(Line:' . $errline . '): Error #' . $errno . ' ' . $errstr . ' ' . $errcontext;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Session/Namespace.php b/airtime_mvc/library/Zend/Session/Namespace.php
deleted file mode 100644
index b3d759477..000000000
--- a/airtime_mvc/library/Zend/Session/Namespace.php
+++ /dev/null
@@ -1,529 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Namespace.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-
-/**
- * @see Zend_Session
- */
-require_once 'Zend/Session.php';
-
-
-/**
- * @see Zend_Session_Abstract
- */
-require_once 'Zend/Session/Abstract.php';
-
-
-/**
- * Zend_Session_Namespace
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAggregate
-{
-
-    /**
-     * used as option to constructor to prevent additional instances to the same namespace
-     */
-    const SINGLE_INSTANCE = true;
-
-    /**
-     * Namespace - which namespace this instance of zend-session is saving-to/getting-from
-     *
-     * @var string
-     */
-    protected $_namespace = "Default";
-
-    /**
-     * Namespace locking mechanism
-     *
-     * @var array
-     */
-    protected static $_namespaceLocks = array();
-
-    /**
-     * Single instance namespace array to ensure data security.
-     *
-     * @var array
-     */
-    protected static $_singleInstances = array();
-
-    /**
-     * resetSingleInstance()
-     *
-     * @param string $namespaceName
-     * @return null
-     */
-    public static function resetSingleInstance($namespaceName = null)
-    {
-        if ($namespaceName != null) {
-            if (array_key_exists($namespaceName, self::$_singleInstances)) {
-                unset(self::$_singleInstances[$namespaceName]);
-            }
-            return;
-        }
-
-        self::$_singleInstances = array();
-        return;
-    }
-
-    /**
-     * __construct() - Returns an instance object bound to a particular, isolated section
-     * of the session, identified by $namespace name (defaulting to 'Default').
-     * The optional argument $singleInstance will prevent construction of additional
-     * instance objects acting as accessors to this $namespace.
-     *
-     * @param string $namespace       - programmatic name of the requested namespace
-     * @param bool $singleInstance    - prevent creation of additional accessor instance objects for this namespace
-     * @return void
-     */
-    public function __construct($namespace = 'Default', $singleInstance = false)
-    {
-        if ($namespace === '') {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Session namespace must be a non-empty string.');
-        }
-
-        if ($namespace[0] == "_") {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Session namespace must not start with an underscore.');
-        }
-
-        if (preg_match('#(^[0-9])#i', $namespace[0])) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Session namespace must not start with a number.');
-        }
-
-        if (isset(self::$_singleInstances[$namespace])) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("A session namespace object already exists for this namespace ('$namespace'), and no additional accessors (session namespace objects) for this namespace are permitted.");
-        }
-
-        if ($singleInstance === true) {
-            self::$_singleInstances[$namespace] = true;
-        }
-
-        $this->_namespace = $namespace;
-
-        // Process metadata specific only to this namespace.
-        Zend_Session::start(true); // attempt auto-start (throws exception if strict option set)
-
-        if (self::$_readable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG);
-        }
-
-        if (!isset($_SESSION['__ZF'])) {
-            return; // no further processing needed
-        }
-
-        // do not allow write access to namespaces, after stop() or writeClose()
-        if (parent::$_writable === true) {
-            if (isset($_SESSION['__ZF'][$namespace])) {
-
-                // Expire Namespace by Namespace Hop (ENNH)
-                if (isset($_SESSION['__ZF'][$namespace]['ENNH'])) {
-                    $_SESSION['__ZF'][$namespace]['ENNH']--;
-
-                    if ($_SESSION['__ZF'][$namespace]['ENNH'] === 0) {
-                        if (isset($_SESSION[$namespace])) {
-                            self::$_expiringData[$namespace] = $_SESSION[$namespace];
-                            unset($_SESSION[$namespace]);
-                        }
-                        unset($_SESSION['__ZF'][$namespace]);
-                    }
-                }
-
-                // Expire Namespace Variables by Namespace Hop (ENVNH)
-                if (isset($_SESSION['__ZF'][$namespace]['ENVNH'])) {
-                    foreach ($_SESSION['__ZF'][$namespace]['ENVNH'] as $variable => $hops) {
-                        $_SESSION['__ZF'][$namespace]['ENVNH'][$variable]--;
-
-                        if ($_SESSION['__ZF'][$namespace]['ENVNH'][$variable] === 0) {
-                            if (isset($_SESSION[$namespace][$variable])) {
-                                self::$_expiringData[$namespace][$variable] = $_SESSION[$namespace][$variable];
-                                unset($_SESSION[$namespace][$variable]);
-                            }
-                            unset($_SESSION['__ZF'][$namespace]['ENVNH'][$variable]);
-                        }
-                    }
-                    if(empty($_SESSION['__ZF'][$namespace]['ENVNH'])) {
-                        unset($_SESSION['__ZF'][$namespace]['ENVNH']);
-                    }
-                }
-            }
-
-            if (empty($_SESSION['__ZF'][$namespace])) {
-                unset($_SESSION['__ZF'][$namespace]);
-            }
-
-            if (empty($_SESSION['__ZF'])) {
-                unset($_SESSION['__ZF']);
-            }
-        }
-    }
-
-
-    /**
-     * getIterator() - return an iteratable object for use in foreach and the like,
-     * this completes the IteratorAggregate interface
-     *
-     * @return ArrayObject - iteratable container of the namespace contents
-     */
-    public function getIterator()
-    {
-        return new ArrayObject(parent::_namespaceGetAll($this->_namespace));
-    }
-
-
-    /**
-     * lock() - mark a session/namespace as readonly
-     *
-     * @return void
-     */
-    public function lock()
-    {
-        self::$_namespaceLocks[$this->_namespace] = true;
-    }
-
-
-    /**
-     * unlock() - unmark a session/namespace to enable read & write
-     *
-     * @return void
-     */
-    public function unlock()
-    {
-        unset(self::$_namespaceLocks[$this->_namespace]);
-    }
-
-
-    /**
-     * unlockAll() - unmark all session/namespaces to enable read & write
-     *
-     * @return void
-     */
-    public static function unlockAll()
-    {
-        self::$_namespaceLocks = array();
-    }
-
-
-    /**
-     * isLocked() - return lock status, true if, and only if, read-only
-     *
-     * @return bool
-     */
-    public function isLocked()
-    {
-        return isset(self::$_namespaceLocks[$this->_namespace]);
-    }
-
-
-    /**
-     * unsetAll() - unset all variables in this namespace
-     *
-     * @return true
-     */
-    public function unsetAll()
-    {
-        return parent::_namespaceUnset($this->_namespace);
-    }
-
-
-    /**
-     * __get() - method to get a variable in this object's current namespace
-     *
-     * @param string $name - programmatic name of a key, in a <key,value> pair in the current namespace
-     * @return mixed
-     */
-    public function & __get($name)
-    {
-        if ($name === '') {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("The '$name' key must be a non-empty string");
-        }
-
-        return parent::_namespaceGet($this->_namespace, $name);
-    }
-
-
-    /**
-     * __set() - method to set a variable/value in this object's namespace
-     *
-     * @param string $name - programmatic name of a key, in a <key,value> pair in the current namespace
-     * @param mixed $value - value in the <key,value> pair to assign to the $name key
-     * @throws Zend_Session_Exception
-     * @return true
-     */
-    public function __set($name, $value)
-    {
-        if (isset(self::$_namespaceLocks[$this->_namespace])) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('This session/namespace has been marked as read-only.');
-        }
-
-        if ($name === '') {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("The '$name' key must be a non-empty string");
-        }
-
-        if (parent::$_writable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG);
-        }
-
-        $name = (string) $name;
-
-        $_SESSION[$this->_namespace][$name] = $value;
-    }
-
-
-    /**
-     * apply() - enables applying user-selected function, such as array_merge() to the namespace
-     * Parameters following the $callback argument are passed to the callback function.
-     * Caveat: ignores members expiring now.
-     *
-     * Example:
-     *   $namespace->apply('array_merge', array('tree' => 'apple', 'fruit' => 'peach'), array('flower' => 'rose'));
-     *   $namespace->apply('count');
-     *
-     * @param string|array $callback - callback function
-     */
-    public function apply($callback)
-    {
-        $arg_list = func_get_args();
-        $arg_list[0] = $_SESSION[$this->_namespace];
-        return call_user_func_array($callback, $arg_list);
-    }
-
-
-    /**
-     * applySet() - enables applying user-selected function, and sets entire namespace to the result
-     * Result of $callback must be an array.
-     * Parameters following the $callback argument are passed to the callback function.
-     * Caveat: ignores members expiring now.
-     *
-     * Example:
-     *   $namespace->applySet('array_merge', array('tree' => 'apple', 'fruit' => 'peach'), array('flower' => 'rose'));
-     *
-     * @param string|array $callback - callback function
-     */
-    public function applySet($callback)
-    {
-        $arg_list = func_get_args();
-        $arg_list[0] = $_SESSION[$this->_namespace];
-        $result = call_user_func_array($callback, $arg_list);
-        if (!is_array($result)) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Result must be an array. Got: ' . gettype($result));
-        }
-        $_SESSION[$this->_namespace] = $result;
-        return $result;
-    }
-
-
-    /**
-     * __isset() - determine if a variable in this object's namespace is set
-     *
-     * @param string $name - programmatic name of a key, in a <key,value> pair in the current namespace
-     * @return bool
-     */
-    public function __isset($name)
-    {
-        if ($name === '') {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("The '$name' key must be a non-empty string");
-        }
-
-        return parent::_namespaceIsset($this->_namespace, $name);
-    }
-
-
-    /**
-     * __unset() - unset a variable in this object's namespace.
-     *
-     * @param string $name - programmatic name of a key, in a <key,value> pair in the current namespace
-     * @return true
-     */
-    public function __unset($name)
-    {
-        if ($name === '') {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception("The '$name' key must be a non-empty string");
-        }
-
-        return parent::_namespaceUnset($this->_namespace, $name);
-    }
-
-
-    /**
-     * setExpirationSeconds() - expire the namespace, or specific variables after a specified
-     * number of seconds
-     *
-     * @param int $seconds     - expires in this many seconds
-     * @param mixed $variables - OPTIONAL list of variables to expire (defaults to all)
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public function setExpirationSeconds($seconds, $variables = null)
-    {
-        if (parent::$_writable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG);
-        }
-
-        if ($seconds <= 0) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Seconds must be positive.');
-        }
-
-        if ($variables === null) {
-
-            // apply expiration to entire namespace
-            $_SESSION['__ZF'][$this->_namespace]['ENT'] = time() + $seconds;
-
-        } else {
-
-            if (is_string($variables)) {
-                $variables = array($variables);
-            }
-
-            foreach ($variables as $variable) {
-                if (!empty($variable)) {
-                    $_SESSION['__ZF'][$this->_namespace]['ENVT'][$variable] = time() + $seconds;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * setExpirationHops() - expire the namespace, or specific variables after a specified
-     * number of page hops
-     *
-     * @param int $hops        - how many "hops" (number of subsequent requests) before expiring
-     * @param mixed $variables - OPTIONAL list of variables to expire (defaults to all)
-     * @param boolean $hopCountOnUsageOnly - OPTIONAL if set, only count a hop/request if this namespace is used
-     * @throws Zend_Session_Exception
-     * @return void
-     */
-    public function setExpirationHops($hops, $variables = null, $hopCountOnUsageOnly = false)
-    {
-        if (parent::$_writable === false) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG);
-        }
-
-        if ($hops <= 0) {
-            /**
-             * @see Zend_Session_Exception
-             */
-            require_once 'Zend/Session/Exception.php';
-            throw new Zend_Session_Exception('Hops must be positive number.');
-        }
-
-        if ($variables === null) {
-
-            // apply expiration to entire namespace
-            if ($hopCountOnUsageOnly === false) {
-                $_SESSION['__ZF'][$this->_namespace]['ENGH'] = $hops;
-            } else {
-                $_SESSION['__ZF'][$this->_namespace]['ENNH'] = $hops;
-            }
-
-        } else {
-
-            if (is_string($variables)) {
-                $variables = array($variables);
-            }
-
-            foreach ($variables as $variable) {
-                if (!empty($variable)) {
-                    if ($hopCountOnUsageOnly === false) {
-                        $_SESSION['__ZF'][$this->_namespace]['ENVGH'][$variable] = $hops;
-                    } else {
-                        $_SESSION['__ZF'][$this->_namespace]['ENVNH'][$variable] = $hops;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the namespace name
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->_namespace;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Session/SaveHandler/DbTable.php b/airtime_mvc/library/Zend/Session/SaveHandler/DbTable.php
deleted file mode 100644
index df75a28aa..000000000
--- a/airtime_mvc/library/Zend/Session/SaveHandler/DbTable.php
+++ /dev/null
@@ -1,591 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-webat this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Session
- */
-require_once 'Zend/Session.php';
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once 'Zend/Db/Table/Abstract.php';
-
-/**
- * @see Zend_Db_Table_Row_Abstract
- */
-require_once 'Zend/Db/Table/Row/Abstract.php';
-
-/**
- * @see Zend_Config
- */
-require_once 'Zend/Config.php';
-
-/**
- * Zend_Session_SaveHandler_DbTable
- *
- * @category   Zend
- * @package    Zend_Session
- * @subpackage SaveHandler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session_SaveHandler_DbTable
-    extends Zend_Db_Table_Abstract
-    implements Zend_Session_SaveHandler_Interface
-{
-    const PRIMARY_ASSIGNMENT                   = 'primaryAssignment';
-    const PRIMARY_ASSIGNMENT_SESSION_SAVE_PATH = 'sessionSavePath';
-    const PRIMARY_ASSIGNMENT_SESSION_NAME      = 'sessionName';
-    const PRIMARY_ASSIGNMENT_SESSION_ID        = 'sessionId';
-
-    const MODIFIED_COLUMN   = 'modifiedColumn';
-    const LIFETIME_COLUMN   = 'lifetimeColumn';
-    const DATA_COLUMN       = 'dataColumn';
-
-    const LIFETIME          = 'lifetime';
-    const OVERRIDE_LIFETIME = 'overrideLifetime';
-
-    const PRIMARY_TYPE_NUM         = 'PRIMARY_TYPE_NUM';
-    const PRIMARY_TYPE_PRIMARYNUM  = 'PRIMARY_TYPE_PRIMARYNUM';
-    const PRIMARY_TYPE_ASSOC       = 'PRIMARY_TYPE_ASSOC';
-    const PRIMARY_TYPE_WHERECLAUSE = 'PRIMARY_TYPE_WHERECLAUSE';
-
-    /**
-     * Session table primary key value assignment
-     *
-     * @var array
-     */
-    protected $_primaryAssignment = null;
-
-    /**
-     * Session table last modification time column
-     *
-     * @var string
-     */
-    protected $_modifiedColumn = null;
-
-    /**
-     * Session table lifetime column
-     *
-     * @var string
-     */
-    protected $_lifetimeColumn = null;
-
-    /**
-     * Session table data column
-     *
-     * @var string
-     */
-    protected $_dataColumn = null;
-
-    /**
-     * Session lifetime
-     *
-     * @var int
-     */
-    protected $_lifetime = false;
-
-    /**
-     * Whether or not the lifetime of an existing session should be overridden
-     *
-     * @var boolean
-     */
-    protected $_overrideLifetime = false;
-
-    /**
-     * Session save path
-     *
-     * @var string
-     */
-    protected $_sessionSavePath;
-
-    /**
-     * Session name
-     *
-     * @var string
-     */
-    protected $_sessionName;
-
-    /**
-     * Constructor
-     *
-     * $config is an instance of Zend_Config or an array of key/value pairs containing configuration options for
-     * Zend_Session_SaveHandler_DbTable and Zend_Db_Table_Abstract. These are the configuration options for
-     * Zend_Session_SaveHandler_DbTable:
-     *
-     * primaryAssignment => (string|array) Session table primary key value assignment
-     *      (optional; default: 1 => sessionId) You have to assign a value to each primary key of your session table.
-     *      The value of this configuration option is either a string if you have only one primary key or an array if
-     *      you have multiple primary keys. The array consists of numeric keys starting at 1 and string values. There
-     *      are some values which will be replaced by session information:
-     *
-     *      sessionId       => The id of the current session
-     *      sessionName     => The name of the current session
-     *      sessionSavePath => The save path of the current session
-     *
-     *      NOTE: One of your assignments MUST contain 'sessionId' as value!
-     *
-     * modifiedColumn    => (string) Session table last modification time column
-     *
-     * lifetimeColumn    => (string) Session table lifetime column
-     *
-     * dataColumn        => (string) Session table data column
-     *
-     * lifetime          => (integer) Session lifetime (optional; default: ini_get('session.gc_maxlifetime'))
-     *
-     * overrideLifetime  => (boolean) Whether or not the lifetime of an existing session should be overridden
-     *      (optional; default: false)
-     *
-     * @param  Zend_Config|array $config      User-provided configuration
-     * @return void
-     * @throws Zend_Session_SaveHandler_Exception
-     */
-    public function __construct($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        } else if (!is_array($config)) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                '$config must be an instance of Zend_Config or array of key/value pairs containing '
-              . 'configuration options for Zend_Session_SaveHandler_DbTable and Zend_Db_Table_Abstract.');
-        }
-
-        foreach ($config as $key => $value) {
-            do {
-                switch ($key) {
-                    case self::PRIMARY_ASSIGNMENT:
-                        $this->_primaryAssignment = $value;
-                        break;
-                    case self::MODIFIED_COLUMN:
-                        $this->_modifiedColumn = (string) $value;
-                        break;
-                    case self::LIFETIME_COLUMN:
-                        $this->_lifetimeColumn = (string) $value;
-                        break;
-                    case self::DATA_COLUMN:
-                        $this->_dataColumn = (string) $value;
-                        break;
-                    case self::LIFETIME:
-                        $this->setLifetime($value);
-                        break;
-                    case self::OVERRIDE_LIFETIME:
-                        $this->setOverrideLifetime($value);
-                        break;
-                    default:
-                        // unrecognized options passed to parent::__construct()
-                        break 2;
-                }
-                unset($config[$key]);
-            } while (false);
-        }
-
-        parent::__construct($config);
-    }
-
-    /**
-     * Destructor
-     *
-     * @return void
-     */
-    public function __destruct()
-    {
-        Zend_Session::writeClose();
-    }
-
-    /**
-     * Set session lifetime and optional whether or not the lifetime of an existing session should be overridden
-     *
-     * $lifetime === false resets lifetime to session.gc_maxlifetime
-     *
-     * @param int $lifetime
-     * @param boolean $overrideLifetime (optional)
-     * @return Zend_Session_SaveHandler_DbTable
-     */
-    public function setLifetime($lifetime, $overrideLifetime = null)
-    {
-        if ($lifetime < 0) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-            throw new Zend_Session_SaveHandler_Exception();
-        } else if (empty($lifetime)) {
-            $this->_lifetime = (int) ini_get('session.gc_maxlifetime');
-        } else {
-            $this->_lifetime = (int) $lifetime;
-        }
-
-        if ($overrideLifetime != null) {
-            $this->setOverrideLifetime($overrideLifetime);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve session lifetime
-     *
-     * @return int
-     */
-    public function getLifetime()
-    {
-        return $this->_lifetime;
-    }
-
-    /**
-     * Set whether or not the lifetime of an existing session should be overridden
-     *
-     * @param boolean $overrideLifetime
-     * @return Zend_Session_SaveHandler_DbTable
-     */
-    public function setOverrideLifetime($overrideLifetime)
-    {
-        $this->_overrideLifetime = (boolean) $overrideLifetime;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve whether or not the lifetime of an existing session should be overridden
-     *
-     * @return boolean
-     */
-    public function getOverrideLifetime()
-    {
-        return $this->_overrideLifetime;
-    }
-
-    /**
-     * Open Session
-     *
-     * @param string $save_path
-     * @param string $name
-     * @return boolean
-     */
-    public function open($save_path, $name)
-    {
-        $this->_sessionSavePath = $save_path;
-        $this->_sessionName     = $name;
-
-        return true;
-    }
-
-    /**
-     * Close session
-     *
-     * @return boolean
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * Read session data
-     *
-     * @param string $id
-     * @return string
-     */
-    public function read($id)
-    {
-        $return = '';
-
-        $rows = call_user_func_array(array(&$this, 'find'), $this->_getPrimary($id));
-
-        if (count($rows)) {
-            if ($this->_getExpirationTime($row = $rows->current()) > time()) {
-                $return = $row->{$this->_dataColumn};
-            } else {
-                $this->destroy($id);
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Write session data
-     *
-     * @param string $id
-     * @param string $data
-     * @return boolean
-     */
-    public function write($id, $data)
-    {
-        $return = false;
-
-        $data = array($this->_modifiedColumn => time(),
-                      $this->_dataColumn     => (string) $data);
-
-        $rows = call_user_func_array(array(&$this, 'find'), $this->_getPrimary($id));
-
-        if (count($rows)) {
-            $data[$this->_lifetimeColumn] = $this->_getLifetime($rows->current());
-
-            if ($this->update($data, $this->_getPrimary($id, self::PRIMARY_TYPE_WHERECLAUSE))) {
-                $return = true;
-            }
-        } else {
-            $data[$this->_lifetimeColumn] = $this->_lifetime;
-
-            if ($this->insert(array_merge($this->_getPrimary($id, self::PRIMARY_TYPE_ASSOC), $data))) {
-                $return = true;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Destroy session
-     *
-     * @param string $id
-     * @return boolean
-     */
-    public function destroy($id)
-    {
-        $return = false;
-
-        if ($this->delete($this->_getPrimary($id, self::PRIMARY_TYPE_WHERECLAUSE))) {
-            $return = true;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Garbage Collection
-     *
-     * @param int $maxlifetime
-     * @return true
-     */
-    public function gc($maxlifetime)
-    {
-        $this->delete($this->getAdapter()->quoteIdentifier($this->_modifiedColumn) . ' + '
-                    . $this->getAdapter()->quoteIdentifier($this->_lifetimeColumn) . ' < '
-                    . $this->getAdapter()->quote(time()));
-
-        return true;
-    }
-
-    /**
-     * Calls other protected methods for individual setup tasks and requirement checks
-     *
-     * @return void
-     */
-    protected function _setup()
-    {
-        parent::_setup();
-
-        $this->_setupPrimaryAssignment();
-        $this->setLifetime($this->_lifetime);
-
-        $this->_checkRequiredColumns();
-    }
-
-    /**
-     * Initialize table and schema names
-     *
-     * @return void
-     * @throws Zend_Session_SaveHandler_Exception
-     */
-    protected function _setupTableName()
-    {
-        if (empty($this->_name) && basename(($this->_name = session_save_path())) != $this->_name) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception('session.save_path is a path and not a table name.');
-        }
-
-        if (strpos($this->_name, '.')) {
-            list($this->_schema, $this->_name) = explode('.', $this->_name);
-        }
-    }
-
-    /**
-     * Initialize session table primary key value assignment
-     *
-     * @return void
-     * @throws Zend_Session_SaveHandler_Exception
-     */
-    protected function _setupPrimaryAssignment()
-    {
-        if ($this->_primaryAssignment === null) {
-            $this->_primaryAssignment = array(1 => self::PRIMARY_ASSIGNMENT_SESSION_ID);
-        } else if (!is_array($this->_primaryAssignment)) {
-            $this->_primaryAssignment = array(1 => (string) $this->_primaryAssignment);
-        } else if (isset($this->_primaryAssignment[0])) {
-            array_unshift($this->_primaryAssignment, null);
-
-            unset($this->_primaryAssignment[0]);
-        }
-
-        if (count($this->_primaryAssignment) !== count($this->_primary)) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment "
-              . "for each session table primary key.");
-        } else if (!in_array(self::PRIMARY_ASSIGNMENT_SESSION_ID, $this->_primaryAssignment)) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment "
-              . "for the session id ('" . self::PRIMARY_ASSIGNMENT_SESSION_ID . "').");
-        }
-    }
-
-    /**
-     * Check for required session table columns
-     *
-     * @return void
-     * @throws Zend_Session_SaveHandler_Exception
-     */
-    protected function _checkRequiredColumns()
-    {
-        if ($this->_modifiedColumn === null) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                "Configuration must define '" . self::MODIFIED_COLUMN . "' which names the "
-              . "session table last modification time column.");
-        } else if ($this->_lifetimeColumn === null) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                "Configuration must define '" . self::LIFETIME_COLUMN . "' which names the "
-              . "session table lifetime column.");
-        } else if ($this->_dataColumn === null) {
-            /**
-             * @see Zend_Session_SaveHandler_Exception
-             */
-            require_once 'Zend/Session/SaveHandler/Exception.php';
-
-            throw new Zend_Session_SaveHandler_Exception(
-                "Configuration must define '" . self::DATA_COLUMN . "' which names the "
-              . "session table data column.");
-        }
-    }
-
-    /**
-     * Retrieve session table primary key values
-     *
-     * @param string $id
-     * @param string $type (optional; default: self::PRIMARY_TYPE_NUM)
-     * @return array
-     */
-    protected function _getPrimary($id, $type = null)
-    {
-        $this->_setupPrimaryKey();
-
-        if ($type === null) {
-            $type = self::PRIMARY_TYPE_NUM;
-        }
-
-        $primaryArray = array();
-
-        foreach ($this->_primary as $index => $primary) {
-            switch ($this->_primaryAssignment[$index]) {
-                case self::PRIMARY_ASSIGNMENT_SESSION_SAVE_PATH:
-                    $value = $this->_sessionSavePath;
-                    break;
-                case self::PRIMARY_ASSIGNMENT_SESSION_NAME:
-                    $value = $this->_sessionName;
-                    break;
-                case self::PRIMARY_ASSIGNMENT_SESSION_ID:
-                    $value = (string) $id;
-                    break;
-                default:
-                    $value = (string) $this->_primaryAssignment[$index];
-                    break;
-            }
-
-            switch ((string) $type) {
-                case self::PRIMARY_TYPE_PRIMARYNUM:
-                    $primaryArray[$index] = $value;
-                    break;
-                case self::PRIMARY_TYPE_ASSOC:
-                    $primaryArray[$primary] = $value;
-                    break;
-                case self::PRIMARY_TYPE_WHERECLAUSE:
-                    $primaryArray[] = $this->getAdapter()->quoteIdentifier($primary) . ' = '
-                                    . $this->getAdapter()->quote($value);
-                    break;
-                case self::PRIMARY_TYPE_NUM:
-                default:
-                    $primaryArray[] = $value;
-                    break;
-            }
-        }
-
-        return $primaryArray;
-    }
-
-    /**
-     * Retrieve session lifetime considering Zend_Session_SaveHandler_DbTable::OVERRIDE_LIFETIME
-     *
-     * @param Zend_Db_Table_Row_Abstract $row
-     * @return int
-     */
-    protected function _getLifetime(Zend_Db_Table_Row_Abstract $row)
-    {
-        $return = $this->_lifetime;
-
-        if (!$this->_overrideLifetime) {
-            $return = (int) $row->{$this->_lifetimeColumn};
-        }
-
-        return $return;
-    }
-
-    /**
-     * Retrieve session expiration time
-     *
-     * @param Zend_Db_Table_Row_Abstract $row
-     * @return int
-     */
-    protected function _getExpirationTime(Zend_Db_Table_Row_Abstract $row)
-    {
-        return (int) $row->{$this->_modifiedColumn} + $this->_getLifetime($row);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Session/SaveHandler/Exception.php b/airtime_mvc/library/Zend/Session/SaveHandler/Exception.php
deleted file mode 100644
index 5f72d30f7..000000000
--- a/airtime_mvc/library/Zend/Session/SaveHandler/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Session_Exception
- */
-require_once 'Zend/Session/Exception.php';
-
-/**
- * Zend_Session_SaveHandler_Exception
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session_SaveHandler_Exception extends Zend_Session_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Session/SaveHandler/Interface.php b/airtime_mvc/library/Zend/Session/SaveHandler/Interface.php
deleted file mode 100644
index 6e426974a..000000000
--- a/airtime_mvc/library/Zend/Session/SaveHandler/Interface.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-/**
- * Zend_Session_SaveHandler_Interface
- *
- * @category   Zend
- * @package    Zend_Session
- * @subpackage SaveHandler
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @see        http://php.net/session_set_save_handler
- */
-interface Zend_Session_SaveHandler_Interface
-{
-
-    /**
-     * Open Session - retrieve resources
-     *
-     * @param string $save_path
-     * @param string $name
-     */
-    public function open($save_path, $name);
-
-    /**
-     * Close Session - free resources
-     *
-     */
-    public function close();
-
-    /**
-     * Read session data
-     *
-     * @param string $id
-     */
-    public function read($id);
-
-    /**
-     * Write Session - commit data to resource
-     *
-     * @param string $id
-     * @param mixed $data
-     */
-    public function write($id, $data);
-
-    /**
-     * Destroy Session - remove data from resource for
-     * given session id
-     *
-     * @param string $id
-     */
-    public function destroy($id);
-
-    /**
-     * Garbage Collection - remove old session data older
-     * than $maxlifetime (in seconds)
-     *
-     * @param int $maxlifetime
-     */
-    public function gc($maxlifetime);
-
-}
diff --git a/airtime_mvc/library/Zend/Session/Validator/Abstract.php b/airtime_mvc/library/Zend/Session/Validator/Abstract.php
deleted file mode 100644
index c5050d5d3..000000000
--- a/airtime_mvc/library/Zend/Session/Validator/Abstract.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-/**
- * @see Zend_Session_Validator_Interface
- */
-require_once 'Zend/Session/Validator/Interface.php';
-
-/**
- * Zend_Session_Validator_Abstract
- *
- * @category   Zend
- * @package    Zend_Session
- * @subpackage Validator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Session_Validator_Abstract implements Zend_Session_Validator_Interface
-{
-
-    /**
-     * SetValidData() - This method should be used to store the environment variables that
-     * will be needed in order to validate the session later in the validate() method.
-     * These values are stored in the session in the __ZF namespace, in an array named VALID
-     *
-     * @param  mixed $data
-     * @return void
-     */
-    protected function setValidData($data)
-    {
-        $validatorName = get_class($this);
-
-        $_SESSION['__ZF']['VALID'][$validatorName] = $data;
-    }
-
-
-    /**
-     * GetValidData() - This method should be used to retrieve the environment variables that
-     * will be needed to 'validate' a session.
-     *
-     * @return mixed
-     */
-    protected function getValidData()
-    {
-        $validatorName = get_class($this);
-
-        return $_SESSION['__ZF']['VALID'][$validatorName];
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Session/Validator/HttpUserAgent.php b/airtime_mvc/library/Zend/Session/Validator/HttpUserAgent.php
deleted file mode 100644
index 86f171bff..000000000
--- a/airtime_mvc/library/Zend/Session/Validator/HttpUserAgent.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpUserAgent.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-/**
- * @see Zend_Session_Validator_Abstract
- */
-require_once 'Zend/Session/Validator/Abstract.php';
-
-/**
- * Zend_Session_Validator_HttpUserAgent
- *
- * @category   Zend
- * @package    Zend_Session
- * @subpackage Validator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Session_Validator_HttpUserAgent extends Zend_Session_Validator_Abstract
-{
-
-    /**
-     * Setup() - this method will get the current user agent and store it in the session
-     * as 'valid data'
-     *
-     * @return void
-     */
-    public function setup()
-    {
-        $this->setValidData( (isset($_SERVER['HTTP_USER_AGENT'])
-            ? $_SERVER['HTTP_USER_AGENT'] : null) );
-    }
-
-    /**
-     * Validate() - this method will determine if the current user agent matches the
-     * user agent we stored when we initialized this variable.
-     *
-     * @return bool
-     */
-    public function validate()
-    {
-        $currentBrowser = (isset($_SERVER['HTTP_USER_AGENT'])
-            ? $_SERVER['HTTP_USER_AGENT'] : null);
-
-        return $currentBrowser === $this->getValidData();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Session/Validator/Interface.php b/airtime_mvc/library/Zend/Session/Validator/Interface.php
deleted file mode 100644
index eab9d186c..000000000
--- a/airtime_mvc/library/Zend/Session/Validator/Interface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Session
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @since      Preview Release 0.2
- */
-
-/**
- * Zend_Session_Validator_Interface
- *
- * @category   Zend
- * @package    Zend_Session
- * @subpackage Validator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Session_Validator_Interface
-{
-
-    /**
-     * Setup() - this method will store the environment variables
-     * necessary to be able to validate against in future requests.
-     *
-     * @return void
-     */
-    public function setup();
-
-    /**
-     * Validate() - this method will be called at the beginning of
-     * every session to determine if the current environment matches
-     * that which was store in the setup() procedure.
-     *
-     * @return boolean
-     */
-    public function validate();
-
-}
diff --git a/airtime_mvc/library/Zend/Soap/AutoDiscover.php b/airtime_mvc/library/Zend/Soap/AutoDiscover.php
deleted file mode 100644
index c6b09583b..000000000
--- a/airtime_mvc/library/Zend/Soap/AutoDiscover.php
+++ /dev/null
@@ -1,548 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AutoDiscover.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Server_Interface
- */
-require_once 'Zend/Server/Interface.php';
-/**
- * @see Zend_Soap_Wsdl
- */
-require_once 'Zend/Soap/Wsdl.php';
-/**
- * @see Zend_Server_Reflection
- */
-require_once 'Zend/Server/Reflection.php';
-/**
- * @see Zend_Server_Abstract
- */
-require_once 'Zend/Server/Abstract.php';
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * Zend_Soap_AutoDiscover
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage AutoDiscover
- */
-class Zend_Soap_AutoDiscover implements Zend_Server_Interface
-{
-    /**
-     * @var Zend_Soap_Wsdl
-     */
-    protected $_wsdl = null;
-
-    /**
-     * @var Zend_Server_Reflection
-     */
-    protected $_reflection = null;
-
-    /**
-     * @var array
-     */
-    protected $_functions = array();
-
-    /**
-     * @var boolean
-     */
-    protected $_strategy;
-
-    /**
-     * Url where the WSDL file will be available at.
-     *
-     * @var WSDL Uri
-     */
-    protected $_uri;
-
-    /**
-     * soap:body operation style options
-     *
-     * @var array
-     */
-    protected $_operationBodyStyle = array('use' => 'encoded', 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/");
-
-    /**
-     * soap:operation style
-     *
-     * @var array
-     */
-    protected $_bindingStyle = array('style' => 'rpc', 'transport' => 'http://schemas.xmlsoap.org/soap/http');
-
-    /**
-     * Constructor
-     *
-     * @param boolean|string|Zend_Soap_Wsdl_Strategy_Interface $strategy
-     * @param string|Zend_Uri $uri
-     */
-    public function __construct($strategy = true, $uri=null)
-    {
-        $this->_reflection = new Zend_Server_Reflection();
-        $this->setComplexTypeStrategy($strategy);
-
-        if($uri !== null) {
-            $this->setUri($uri);
-        }
-    }
-
-    /**
-     * Set the location at which the WSDL file will be availabe.
-     *
-     * @see Zend_Soap_Exception
-     * @throws Zend_Soap_AutoDiscover_Exception
-     * @param  Zend_Uri|string $uri
-     * @return Zend_Soap_AutoDiscover
-     */
-    public function setUri($uri)
-    {
-        if(!is_string($uri) && !($uri instanceof Zend_Uri)) {
-            require_once "Zend/Soap/AutoDiscover/Exception.php";
-            throw new Zend_Soap_AutoDiscover_Exception("No uri given to Zend_Soap_AutoDiscover::setUri as string or Zend_Uri instance.");
-        }
-        $this->_uri = $uri;
-
-        // change uri in WSDL file also if existant
-        if($this->_wsdl instanceof Zend_Soap_Wsdl) {
-            $this->_wsdl->setUri($uri);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the current Uri that the SOAP WSDL Service will be located at.
-     *
-     * @return Zend_Uri
-     */
-    public function getUri()
-    {
-        if($this->_uri !== null) {
-            $uri = $this->_uri;
-        } else {
-            $schema     = $this->getSchema();
-            $host       = $this->getHostName();
-            $scriptName = $this->getRequestUriWithoutParameters();
-            $uri = Zend_Uri::factory($schema . '://' . $host . $scriptName);
-            $this->setUri($uri);
-        }
-        return $uri;
-    }
-
-    /**
-     * Set options for all the binding operations soap:body elements.
-     *
-     * By default the options are set to 'use' => 'encoded' and
-     * 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/".
-     *
-     * @see    Zend_Soap_AutoDiscover_Exception
-     * @param  array $operationStyle
-     * @return Zend_Soap_AutoDiscover
-     */
-    public function setOperationBodyStyle(array $operationStyle=array())
-    {
-        if(!isset($operationStyle['use'])) {
-            require_once "Zend/Soap/AutoDiscover/Exception.php";
-            throw new Zend_Soap_AutoDiscover_Exception("Key 'use' is required in Operation soap:body style.");
-        }
-        $this->_operationBodyStyle = $operationStyle;
-        return $this;
-    }
-
-    /**
-     * Set Binding soap:binding style.
-     *
-     * By default 'style' is 'rpc' and 'transport' is 'http://schemas.xmlsoap.org/soap/http'.
-     *
-     * @param  array $bindingStyle
-     * @return Zend_Soap_AutoDiscover
-     */
-    public function setBindingStyle(array $bindingStyle=array())
-    {
-        if(isset($bindingStyle['style'])) {
-            $this->_bindingStyle['style'] = $bindingStyle['style'];
-        }
-        if(isset($bindingStyle['transport'])) {
-            $this->_bindingStyle['transport'] = $bindingStyle['transport'];
-        }
-        return $this;
-    }
-
-    /**
-     * Detect and returns the current HTTP/HTTPS Schema
-     *
-     * @return string
-     */
-    protected function getSchema()
-    {
-        $schema = "http";
-        if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
-            $schema = 'https';
-        }
-        return $schema;
-    }
-
-    /**
-     * Detect and return the current hostname
-     *
-     * @return string
-     */
-    protected function getHostName()
-    {
-        if(isset($_SERVER['HTTP_HOST'])) {
-            $host = $_SERVER['HTTP_HOST'];
-        } else {
-            $host = $_SERVER['SERVER_NAME'];
-        }
-        return $host;
-    }
-
-    /**
-     * Detect and return the current script name without parameters
-     *
-     * @return string
-     */
-    protected function getRequestUriWithoutParameters()
-    {
-        if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
-            $requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
-        } elseif (isset($_SERVER['REQUEST_URI'])) {
-            $requestUri = $_SERVER['REQUEST_URI'];
-        } elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
-            $requestUri = $_SERVER['ORIG_PATH_INFO'];
-        } else {
-            $requestUri = $_SERVER['SCRIPT_NAME'];
-        }
-        if( ($pos = strpos($requestUri, "?")) !== false) {
-            $requestUri = substr($requestUri, 0, $pos);
-        }
-
-        return $requestUri;
-    }
-
-    /**
-     * Set the strategy that handles functions and classes that are added AFTER this call.
-     *
-     * @param  boolean|string|Zend_Soap_Wsdl_Strategy_Interface $strategy
-     * @return Zend_Soap_AutoDiscover
-     */
-    public function setComplexTypeStrategy($strategy)
-    {
-        $this->_strategy = $strategy;
-        if($this->_wsdl instanceof  Zend_Soap_Wsdl) {
-            $this->_wsdl->setComplexTypeStrategy($strategy);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the Class the SOAP server will use
-     *
-     * @param string $class Class Name
-     * @param string $namespace Class Namspace - Not Used
-     * @param array $argv Arguments to instantiate the class - Not Used
-     */
-    public function setClass($class, $namespace = '', $argv = null)
-    {
-        $uri = $this->getUri();
-
-        $wsdl = new Zend_Soap_Wsdl($class, $uri, $this->_strategy);
-
-        // The wsdl:types element must precede all other elements (WS-I Basic Profile 1.1 R2023)
-        $wsdl->addSchemaTypeSection();
-
-        $port = $wsdl->addPortType($class . 'Port');
-        $binding = $wsdl->addBinding($class . 'Binding', 'tns:' .$class. 'Port');
-
-        $wsdl->addSoapBinding($binding, $this->_bindingStyle['style'], $this->_bindingStyle['transport']);
-        $wsdl->addService($class . 'Service', $class . 'Port', 'tns:' . $class . 'Binding', $uri);
-        foreach ($this->_reflection->reflectClass($class)->getMethods() as $method) {
-            $this->_addFunctionToWsdl($method, $wsdl, $port, $binding);
-        }
-        $this->_wsdl = $wsdl;
-    }
-
-    /**
-     * Add a Single or Multiple Functions to the WSDL
-     *
-     * @param string $function Function Name
-     * @param string $namespace Function namespace - Not Used
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        static $port;
-        static $operation;
-        static $binding;
-
-        if (!is_array($function)) {
-            $function = (array) $function;
-        }
-
-        $uri = $this->getUri();
-
-        if (!($this->_wsdl instanceof Zend_Soap_Wsdl)) {
-            $parts = explode('.', basename($_SERVER['SCRIPT_NAME']));
-            $name = $parts[0];
-            $wsdl = new Zend_Soap_Wsdl($name, $uri, $this->_strategy);
-
-            // The wsdl:types element must precede all other elements (WS-I Basic Profile 1.1 R2023)
-            $wsdl->addSchemaTypeSection();
-
-            $port = $wsdl->addPortType($name . 'Port');
-            $binding = $wsdl->addBinding($name . 'Binding', 'tns:' .$name. 'Port');
-
-            $wsdl->addSoapBinding($binding, $this->_bindingStyle['style'], $this->_bindingStyle['transport']);
-            $wsdl->addService($name . 'Service', $name . 'Port', 'tns:' . $name . 'Binding', $uri);
-        } else {
-            $wsdl = $this->_wsdl;
-        }
-
-        foreach ($function as $func) {
-            $method = $this->_reflection->reflectFunction($func);
-            $this->_addFunctionToWsdl($method, $wsdl, $port, $binding);
-        }
-        $this->_wsdl = $wsdl;
-    }
-
-    /**
-     * Add a function to the WSDL document.
-     *
-     * @param $function Zend_Server_Reflection_Function_Abstract function to add
-     * @param $wsdl Zend_Soap_Wsdl WSDL document
-     * @param $port object wsdl:portType
-     * @param $binding object wsdl:binding
-     * @return void
-     */
-    protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
-    {
-        $uri = $this->getUri();
-
-        // We only support one prototype: the one with the maximum number of arguments
-        $prototype = null;
-        $maxNumArgumentsOfPrototype = -1;
-        foreach ($function->getPrototypes() as $tmpPrototype) {
-            $numParams = count($tmpPrototype->getParameters());
-            if ($numParams > $maxNumArgumentsOfPrototype) {
-                $maxNumArgumentsOfPrototype = $numParams;
-                $prototype = $tmpPrototype;
-            }
-        }
-        if ($prototype === null) {
-            require_once "Zend/Soap/AutoDiscover/Exception.php";
-            throw new Zend_Soap_AutoDiscover_Exception("No prototypes could be found for the '" . $function->getName() . "' function");
-        }
-
-        // Add the input message (parameters)
-        $args = array();
-        if ($this->_bindingStyle['style'] == 'document') {
-            // Document style: wrap all parameters in a sequence element
-            $sequence = array();
-            foreach ($prototype->getParameters() as $param) {
-                $sequenceElement = array(
-                    'name' => $param->getName(),
-                    'type' => $wsdl->getType($param->getType())
-                );
-                if ($param->isOptional()) {
-                    $sequenceElement['nillable'] = 'true';
-                }
-                $sequence[] = $sequenceElement;
-            }
-            $element = array(
-                'name' => $function->getName(),
-                'sequence' => $sequence
-            );
-            // Add the wrapper element part, which must be named 'parameters'
-            $args['parameters'] = array('element' => $wsdl->addElement($element));
-        } else {
-            // RPC style: add each parameter as a typed part
-            foreach ($prototype->getParameters() as $param) {
-                $args[$param->getName()] = array('type' => $wsdl->getType($param->getType()));
-            }
-        }
-        $wsdl->addMessage($function->getName() . 'In', $args);
-
-        $isOneWayMessage = false;
-        if($prototype->getReturnType() == "void") {
-            $isOneWayMessage = true;
-        }
-
-        if($isOneWayMessage == false) {
-            // Add the output message (return value)
-            $args = array();
-            if ($this->_bindingStyle['style'] == 'document') {
-                // Document style: wrap the return value in a sequence element
-                $sequence = array();
-                if ($prototype->getReturnType() != "void") {
-                    $sequence[] = array(
-                        'name' => $function->getName() . 'Result',
-                        'type' => $wsdl->getType($prototype->getReturnType())
-                    );
-                }
-                $element = array(
-                    'name' => $function->getName() . 'Response',
-                    'sequence' => $sequence
-                );
-                // Add the wrapper element part, which must be named 'parameters'
-                $args['parameters'] = array('element' => $wsdl->addElement($element));
-            } else if ($prototype->getReturnType() != "void") {
-                // RPC style: add the return value as a typed part
-                $args['return'] = array('type' => $wsdl->getType($prototype->getReturnType()));
-            }
-            $wsdl->addMessage($function->getName() . 'Out', $args);
-        }
-
-        // Add the portType operation
-        if($isOneWayMessage == false) {
-            $portOperation = $wsdl->addPortOperation($port, $function->getName(), 'tns:' . $function->getName() . 'In', 'tns:' . $function->getName() . 'Out');
-        } else {
-            $portOperation = $wsdl->addPortOperation($port, $function->getName(), 'tns:' . $function->getName() . 'In', false);
-        }
-        $desc = $function->getDescription();
-        if (strlen($desc) > 0) {
-            $wsdl->addDocumentation($portOperation, $desc);
-        }
-
-        // When using the RPC style, make sure the operation style includes a 'namespace' attribute (WS-I Basic Profile 1.1 R2717)
-        if ($this->_bindingStyle['style'] == 'rpc' && !isset($this->_operationBodyStyle['namespace'])) {
-            $this->_operationBodyStyle['namespace'] = ''.$uri;
-        }
-
-        // Add the binding operation
-        $operation = $wsdl->addBindingOperation($binding, $function->getName(),  $this->_operationBodyStyle, $this->_operationBodyStyle);
-        $wsdl->addSoapOperation($operation, $uri . '#' .$function->getName());
-
-        // Add the function name to the list
-        $this->_functions[] = $function->getName();
-    }
-
-    /**
-     * Action to take when an error occurs
-     *
-     * @param string $fault
-     * @param string|int $code
-     */
-    public function fault($fault = null, $code = null)
-    {
-        require_once "Zend/Soap/AutoDiscover/Exception.php";
-        throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover.");
-    }
-
-    /**
-     * Handle the Request
-     *
-     * @param string $request A non-standard request - Not Used
-     */
-    public function handle($request = false)
-    {
-        if (!headers_sent()) {
-            header('Content-Type: text/xml');
-        }
-        $this->_wsdl->dump();
-    }
-
-    /**
-     * Proxy to WSDL dump function
-     *
-     * @param string $filename
-     */
-    public function dump($filename)
-    {
-        if($this->_wsdl !== null) {
-            return $this->_wsdl->dump($filename);
-        } else {
-            /**
-             * @see Zend_Soap_AutoDiscover_Exception
-             */
-            require_once "Zend/Soap/AutoDiscover/Exception.php";
-            throw new Zend_Soap_AutoDiscover_Exception("Cannot dump autodiscovered contents, WSDL file has not been generated yet.");
-        }
-    }
-
-    /**
-     * Proxy to WSDL toXml() function
-     */
-    public function toXml()
-    {
-        if($this->_wsdl !== null) {
-            return $this->_wsdl->toXml();
-        } else {
-            /**
-             * @see Zend_Soap_AutoDiscover_Exception
-             */
-            require_once "Zend/Soap/AutoDiscover/Exception.php";
-            throw new Zend_Soap_AutoDiscover_Exception("Cannot return autodiscovered contents, WSDL file has not been generated yet.");
-        }
-    }
-
-    /**
-     * Return an array of functions in the WSDL
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return $this->_functions;
-    }
-
-    /**
-     * Load Functions
-     *
-     * @param unknown_type $definition
-     */
-    public function loadFunctions($definition)
-    {
-        require_once "Zend/Soap/AutoDiscover/Exception.php";
-        throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover.");
-    }
-
-    /**
-     * Set Persistance
-     *
-     * @param int $mode
-     */
-    public function setPersistence($mode)
-    {
-        require_once "Zend/Soap/AutoDiscover/Exception.php";
-        throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover.");
-    }
-
-    /**
-     * Returns an XSD Type for the given PHP type
-     *
-     * @param string $type PHP Type to get the XSD type for
-     * @return string
-     */
-    public function getType($type)
-    {
-        if (!($this->_wsdl instanceof Zend_Soap_Wsdl)) {
-            /** @todo Exception throwing may be more correct */
-
-            // WSDL is not defined yet, so we can't recognize type in context of current service
-            return '';
-        } else {
-            return $this->_wsdl->getType($type);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/AutoDiscover/Exception.php b/airtime_mvc/library/Zend/Soap/AutoDiscover/Exception.php
deleted file mode 100644
index 50a6161f8..000000000
--- a/airtime_mvc/library/Zend/Soap/AutoDiscover/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage AutoDiscover
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once "Zend/Exception.php";
-
-/**
- * @package    Zend_Soap
- * @subpackage AutoDiscover
- */
-class Zend_Soap_AutoDiscover_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Soap/Client.php b/airtime_mvc/library/Zend/Soap/Client.php
deleted file mode 100644
index 4f102b857..000000000
--- a/airtime_mvc/library/Zend/Soap/Client.php
+++ /dev/null
@@ -1,1196 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Server
- */
-require_once 'Zend/Soap/Server.php';
-
-/**
- * @see Zend_Soap_Client_Local
- */
-require_once 'Zend/Soap/Client/Local.php';
-
-/**
- * @see Zend_Soap_Client_Common
- */
-require_once 'Zend/Soap/Client/Common.php';
-
-/**
- * Zend_Soap_Client
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Client
-{
-    /**
-     * Encoding
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Array of SOAP type => PHP class pairings for handling return/incoming values
-     * @var array
-     */
-    protected $_classmap = null;
-
-    /**
-     * Registered fault exceptions
-     * @var array
-     */
-    protected $_faultExceptions = array();
-
-    /**
-     * SOAP version to use; SOAP_1_2 by default, to allow processing of headers
-     * @var int
-     */
-    protected $_soapVersion = SOAP_1_2;
-
-    /** Set of other SoapClient options */
-    protected $_uri                 = null;
-    protected $_location            = null;
-    protected $_style               = null;
-    protected $_use                 = null;
-    protected $_login               = null;
-    protected $_password            = null;
-    protected $_proxy_host          = null;
-    protected $_proxy_port          = null;
-    protected $_proxy_login         = null;
-    protected $_proxy_password      = null;
-    protected $_local_cert          = null;
-    protected $_passphrase          = null;
-    protected $_compression         = null;
-    protected $_connection_timeout  = null;
-    protected $_stream_context      = null;
-    protected $_features            = null;
-    protected $_cache_wsdl          = null;
-    protected $_user_agent          = null;
-
-    /**
-     * WSDL used to access server
-     * It also defines Zend_Soap_Client working mode (WSDL vs non-WSDL)
-     *
-     * @var string
-     */
-    protected $_wsdl = null;
-
-    /**
-     * SoapClient object
-     *
-     * @var SoapClient
-     */
-    protected $_soapClient;
-
-    /**
-     * Last invoked method
-     *
-     * @var string
-     */
-    protected $_lastMethod = '';
-
-    /**
-     * SOAP request headers.
-     *
-     * Array of SoapHeader objects
-     *
-     * @var array
-     */
-    protected $_soapInputHeaders = array();
-
-    /**
-     * Permanent SOAP request headers (shared between requests).
-     *
-     * Array of SoapHeader objects
-     *
-     * @var array
-     */
-    protected $_permanentSoapInputHeaders = array();
-
-    /**
-     * Output SOAP headers.
-     *
-     * Array of SoapHeader objects
-     *
-     * @var array
-     */
-    protected $_soapOutputHeaders = array();
-
-    /**
-     * Constructor
-     *
-     * @param string $wsdl
-     * @param array $options
-     */
-    public function __construct($wsdl = null, $options = null)
-    {
-        if (!extension_loaded('soap')) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('SOAP extension is not loaded.');
-        }
-
-        if ($wsdl !== null) {
-            $this->setWsdl($wsdl);
-        }
-        if ($options !== null) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set wsdl
-     *
-     * @param string $wsdl
-     * @return Zend_Soap_Client
-     */
-    public function setWsdl($wsdl)
-    {
-        $this->_wsdl = $wsdl;
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get wsdl
-     *
-     * @return string
-     */
-    public function getWsdl()
-    {
-        return $this->_wsdl;
-    }
-
-    /**
-     * Set Options
-     *
-     * Allows setting options as an associative array of option => value pairs.
-     *
-     * @param  array|Zend_Config $options
-     * @return Zend_Soap_Client
-     * @throws Zend_SoapClient_Exception
-     */
-    public function setOptions($options)
-    {
-        if($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        foreach ($options as $key => $value) {
-            switch ($key) {
-                case 'classmap':
-                case 'classMap':
-                    $this->setClassmap($value);
-                    break;
-                case 'encoding':
-                    $this->setEncoding($value);
-                    break;
-                case 'soapVersion':
-                case 'soap_version':
-                    $this->setSoapVersion($value);
-                    break;
-                case 'wsdl':
-                    $this->setWsdl($value);
-                    break;
-                case 'uri':
-                    $this->setUri($value);
-                    break;
-                case 'location':
-                    $this->setLocation($value);
-                    break;
-                case 'style':
-                    $this->setStyle($value);
-                    break;
-                case 'use':
-                    $this->setEncodingMethod($value);
-                    break;
-                case 'login':
-                    $this->setHttpLogin($value);
-                    break;
-                case 'password':
-                    $this->setHttpPassword($value);
-                    break;
-                case 'proxy_host':
-                    $this->setProxyHost($value);
-                    break;
-                case 'proxy_port':
-                    $this->setProxyPort($value);
-                    break;
-                case 'proxy_login':
-                    $this->setProxyLogin($value);
-                    break;
-                case 'proxy_password':
-                    $this->setProxyPassword($value);
-                    break;
-                case 'local_cert':
-                    $this->setHttpsCertificate($value);
-                    break;
-                case 'passphrase':
-                    $this->setHttpsCertPassphrase($value);
-                    break;
-                case 'compression':
-                    $this->setCompressionOptions($value);
-                    break;
-                case 'stream_context':
-                    $this->setStreamContext($value);
-                    break;
-                case 'features':
-                    $this->setSoapFeatures($value);
-                    break;
-                case 'cache_wsdl':
-                    $this->setWsdlCache($value);
-                    break;
-                case 'useragent':
-                case 'userAgent':
-                case 'user_agent':
-                    $this->setUserAgent($value);
-                    break;
-
-                // Not used now
-                // case 'connection_timeout':
-                //     $this->_connection_timeout = $value;
-                //    break;
-
-                default:
-                    require_once 'Zend/Soap/Client/Exception.php';
-                    throw new Zend_Soap_Client_Exception('Unknown SOAP client option');
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return array of options suitable for using with SoapClient constructor
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        $options = array();
-
-        $options['classmap']       = $this->getClassmap();
-        $options['encoding']       = $this->getEncoding();
-        $options['soap_version']   = $this->getSoapVersion();
-        $options['wsdl']           = $this->getWsdl();
-        $options['uri']            = $this->getUri();
-        $options['location']       = $this->getLocation();
-        $options['style']          = $this->getStyle();
-        $options['use']            = $this->getEncodingMethod();
-        $options['login']          = $this->getHttpLogin();
-        $options['password']       = $this->getHttpPassword();
-        $options['proxy_host']     = $this->getProxyHost();
-        $options['proxy_port']     = $this->getProxyPort();
-        $options['proxy_login']    = $this->getProxyLogin();
-        $options['proxy_password'] = $this->getProxyPassword();
-        $options['local_cert']     = $this->getHttpsCertificate();
-        $options['passphrase']     = $this->getHttpsCertPassphrase();
-        $options['compression']    = $this->getCompressionOptions();
-        //$options['connection_timeout'] = $this->_connection_timeout;
-        $options['stream_context'] = $this->getStreamContext();
-        $options['cache_wsdl']     = $this->getWsdlCache();
-        $options['features']       = $this->getSoapFeatures();
-        $options['user_agent']     = $this->getUserAgent();
-
-        foreach ($options as $key => $value) {
-            /*
-             * ugly hack as I don't know if checking for '=== null'
-             * breaks some other option
-             */
-            if ($key == 'user_agent') {
-                if ($value === null) {
-                    unset($options[$key]);
-                }
-            } else {
-                if ($value == null) {
-                    unset($options[$key]);
-                }
-            }
-        }
-
-        return $options;
-    }
-
-    /**
-     * Set SOAP version
-     *
-     * @param  int $version One of the SOAP_1_1 or SOAP_1_2 constants
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid soap version argument
-     */
-    public function setSoapVersion($version)
-    {
-        if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.');
-        }
-        $this->_soapVersion = $version;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get SOAP version
-     *
-     * @return int
-     */
-    public function getSoapVersion()
-    {
-        return $this->_soapVersion;
-    }
-
-    /**
-     * Set classmap
-     *
-     * @param  array $classmap
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception for any invalid class in the class map
-     */
-    public function setClassmap(array $classmap)
-    {
-        foreach ($classmap as $type => $class) {
-            if (!class_exists($class)) {
-                require_once 'Zend/Soap/Client/Exception.php';
-                throw new Zend_Soap_Client_Exception('Invalid class in class map');
-            }
-        }
-
-        $this->_classmap = $classmap;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve classmap
-     *
-     * @return mixed
-     */
-    public function getClassmap()
-    {
-        return $this->_classmap;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $encoding
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid encoding argument
-     */
-    public function setEncoding($encoding)
-    {
-        if (!is_string($encoding)) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid encoding specified');
-        }
-
-        $this->_encoding = $encoding;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Check for valid URN
-     *
-     * @param  string $urn
-     * @return true
-     * @throws Zend_Soap_Client_Exception on invalid URN
-     */
-    public function validateUrn($urn)
-    {
-        $scheme = parse_url($urn, PHP_URL_SCHEME);
-        if ($scheme === false || $scheme === null) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid URN');
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Set URI
-     *
-     * URI in Web Service the target namespace
-     *
-     * @param  string $uri
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid uri argument
-     */
-    public function setUri($uri)
-    {
-        $this->validateUrn($uri);
-        $this->_uri = $uri;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve URI
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Set Location
-     *
-     * URI in Web Service the target namespace
-     *
-     * @param  string $location
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid uri argument
-     */
-    public function setLocation($location)
-    {
-        $this->validateUrn($location);
-        $this->_location = $location;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve URI
-     *
-     * @return string
-     */
-    public function getLocation()
-    {
-        return $this->_location;
-    }
-
-    /**
-     * Set request style
-     *
-     * @param  int $style One of the SOAP_RPC or SOAP_DOCUMENT constants
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid style argument
-     */
-    public function setStyle($style)
-    {
-        if (!in_array($style, array(SOAP_RPC, SOAP_DOCUMENT))) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.');
-        }
-
-        $this->_style = $style;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get request style
-     *
-     * @return int
-     */
-    public function getStyle()
-    {
-        return $this->_style;
-    }
-
-    /**
-     * Set message encoding method
-     *
-     * @param  int $use One of the SOAP_ENCODED or SOAP_LITERAL constants
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid message encoding method argument
-     */
-    public function setEncodingMethod($use)
-    {
-        if (!in_array($use, array(SOAP_ENCODED, SOAP_LITERAL))) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.');
-        }
-
-        $this->_use = $use;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get message encoding method
-     *
-     * @return int
-     */
-    public function getEncodingMethod()
-    {
-        return $this->_use;
-    }
-
-    /**
-     * Set HTTP login
-     *
-     * @param  string $login
-     * @return Zend_Soap_Client
-     */
-    public function setHttpLogin($login)
-    {
-        $this->_login = $login;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve HTTP Login
-     *
-     * @return string
-     */
-    public function getHttpLogin()
-    {
-        return $this->_login;
-    }
-
-    /**
-     * Set HTTP password
-     *
-     * @param  string $password
-     * @return Zend_Soap_Client
-     */
-    public function setHttpPassword($password)
-    {
-        $this->_password = $password;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve HTTP Password
-     *
-     * @return string
-     */
-    public function getHttpPassword()
-    {
-        return $this->_password;
-    }
-
-    /**
-     * Set proxy host
-     *
-     * @param  string $proxyHost
-     * @return Zend_Soap_Client
-     */
-    public function setProxyHost($proxyHost)
-    {
-        $this->_proxy_host = $proxyHost;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve proxy host
-     *
-     * @return string
-     */
-    public function getProxyHost()
-    {
-        return $this->_proxy_host;
-    }
-
-    /**
-     * Set proxy port
-     *
-     * @param  int $proxyPort
-     * @return Zend_Soap_Client
-     */
-    public function setProxyPort($proxyPort)
-    {
-        $this->_proxy_port = (int)$proxyPort;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve proxy port
-     *
-     * @return int
-     */
-    public function getProxyPort()
-    {
-        return $this->_proxy_port;
-    }
-
-    /**
-     * Set proxy login
-     *
-     * @param  string $proxyLogin
-     * @return Zend_Soap_Client
-     */
-    public function setProxyLogin($proxyLogin)
-    {
-        $this->_proxy_login = $proxyLogin;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve proxy login
-     *
-     * @return string
-     */
-    public function getProxyLogin()
-    {
-        return $this->_proxy_login;
-    }
-
-    /**
-     * Set proxy password
-     *
-     * @param  string $proxyLogin
-     * @return Zend_Soap_Client
-     */
-    public function setProxyPassword($proxyPassword)
-    {
-        $this->_proxy_password = $proxyPassword;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Set HTTPS client certificate path
-     *
-     * @param  string $localCert local certificate path
-     * @return Zend_Soap_Client
-     * @throws Zend_Soap_Client_Exception with invalid local certificate path argument
-     */
-    public function setHttpsCertificate($localCert)
-    {
-        if (!is_readable($localCert)) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('Invalid HTTPS client certificate path.');
-        }
-
-        $this->_local_cert = $localCert;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get HTTPS client certificate path
-     *
-     * @return string
-     */
-    public function getHttpsCertificate()
-    {
-        return $this->_local_cert;
-    }
-
-    /**
-     * Set HTTPS client certificate passphrase
-     *
-     * @param  string $passphrase
-     * @return Zend_Soap_Client
-     */
-    public function setHttpsCertPassphrase($passphrase)
-    {
-        $this->_passphrase = $passphrase;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get HTTPS client certificate passphrase
-     *
-     * @return string
-     */
-    public function getHttpsCertPassphrase()
-    {
-        return $this->_passphrase;
-    }
-
-    /**
-     * Set compression options
-     *
-     * @param  int $compressionOptions
-     * @return Zend_Soap_Client
-     */
-    public function setCompressionOptions($compressionOptions)
-    {
-        $this->_compression = $compressionOptions;
-
-        $this->_soapClient = null;
-
-        return $this;
-    }
-
-    /**
-     * Get Compression options
-     *
-     * @return int
-     */
-    public function getCompressionOptions()
-    {
-        return $this->_compression;
-    }
-
-    /**
-     * Retrieve proxy password
-     *
-     * @return string
-     */
-    public function getProxyPassword()
-    {
-        return $this->_proxy_password;
-    }
-
-    /**
-     * Set Stream Context
-     *
-     * @return Zend_Soap_Client
-     */
-    public function setStreamContext($context)
-    {
-        if(!is_resource($context) || get_resource_type($context) !== "stream-context") {
-            /**
-             * @see Zend_Soap_Client_Exception
-             */
-            require_once "Zend/Soap/Client/Exception.php";
-            throw new Zend_Soap_Client_Exception(
-                "Invalid stream context resource given."
-            );
-        }
-
-        $this->_stream_context = $context;
-        return $this;
-    }
-
-    /**
-     * Get Stream Context
-     *
-     * @return resource
-     */
-    public function getStreamContext()
-    {
-        return $this->_stream_context;
-    }
-
-    /**
-     * Set the SOAP Feature options.
-     *
-     * @param  string|int $feature
-     * @return Zend_Soap_Client
-     */
-    public function setSoapFeatures($feature)
-    {
-        $this->_features = $feature;
-
-        $this->_soapClient = null;
-        return $this;
-    }
-
-    /**
-     * Return current SOAP Features options
-     *
-     * @return int
-     */
-    public function getSoapFeatures()
-    {
-        return $this->_features;
-    }
-
-    /**
-     * Set the SOAP Wsdl Caching Options
-     *
-     * @param string|int|boolean $caching
-     * @return Zend_Soap_Client
-     */
-    public function setWsdlCache($options)
-    {
-        $this->_cache_wsdl = $options;
-        return $this;
-    }
-
-    /**
-     * Get current SOAP Wsdl Caching option
-     */
-    public function getWsdlCache()
-    {
-        return $this->_cache_wsdl;
-    }
-
-    /**
-     * Set the string to use in User-Agent header
-     *
-     * @param  string|null $userAgent
-     * @return Zend_Soap_Client
-     */
-    public function setUserAgent($userAgent)
-    {
-        if ($userAgent === null) {
-            $this->_user_agent = null;
-        } else {
-            $this->_user_agent = (string)$userAgent;
-        }
-        return $this;
-    }
-
-    /**
-     * Get current string to use in User-Agent header
-     *
-     * @return string|null
-     */
-    public function getUserAgent()
-    {
-        return $this->_user_agent;
-    }
-
-    /**
-     * Retrieve request XML
-     *
-     * @return string
-     */
-    public function getLastRequest()
-    {
-        if ($this->_soapClient !== null) {
-            return $this->_soapClient->__getLastRequest();
-        }
-
-        return '';
-    }
-
-    /**
-     * Get response XML
-     *
-     * @return string
-     */
-    public function getLastResponse()
-    {
-        if ($this->_soapClient !== null) {
-            return $this->_soapClient->__getLastResponse();
-        }
-
-        return '';
-    }
-
-    /**
-     * Retrieve request headers
-     *
-     * @return string
-     */
-    public function getLastRequestHeaders()
-    {
-        if ($this->_soapClient !== null) {
-            return $this->_soapClient->__getLastRequestHeaders();
-        }
-
-        return '';
-    }
-
-    /**
-     * Retrieve response headers (as string)
-     *
-     * @return string
-     */
-    public function getLastResponseHeaders()
-    {
-        if ($this->_soapClient !== null) {
-            return $this->_soapClient->__getLastResponseHeaders();
-        }
-
-        return '';
-    }
-
-    /**
-     * Retrieve last invoked method
-     *
-     * @return string
-     */
-    public function getLastMethod()
-    {
-        return $this->_lastMethod;
-    }
-
-    /**
-     * Do request proxy method.
-     *
-     * May be overridden in subclasses
-     *
-     * @internal
-     * @param Zend_Soap_Client_Common $client
-     * @param string $request
-     * @param string $location
-     * @param string $action
-     * @param int    $version
-     * @param int    $one_way
-     * @return mixed
-     */
-    public function _doRequest(Zend_Soap_Client_Common $client, $request, $location, $action, $version, $one_way = null)
-    {
-        // Perform request as is
-        if ($one_way == null) {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
-        } else {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version, $one_way);
-        }
-    }
-
-    /**
-     * Initialize SOAP Client object
-     *
-     * @throws Zend_Soap_Client_Exception
-     */
-    protected function _initSoapClientObject()
-    {
-        $wsdl = $this->getWsdl();
-        $options = array_merge($this->getOptions(), array('trace' => true));
-
-        if ($wsdl == null) {
-            if (!isset($options['location'])) {
-                require_once 'Zend/Soap/Client/Exception.php';
-                throw new Zend_Soap_Client_Exception('\'location\' parameter is required in non-WSDL mode.');
-            }
-            if (!isset($options['uri'])) {
-                require_once 'Zend/Soap/Client/Exception.php';
-                throw new Zend_Soap_Client_Exception('\'uri\' parameter is required in non-WSDL mode.');
-            }
-        } else {
-            if (isset($options['use'])) {
-                require_once 'Zend/Soap/Client/Exception.php';
-                throw new Zend_Soap_Client_Exception('\'use\' parameter only works in non-WSDL mode.');
-            }
-            if (isset($options['style'])) {
-                require_once 'Zend/Soap/Client/Exception.php';
-                throw new Zend_Soap_Client_Exception('\'style\' parameter only works in non-WSDL mode.');
-            }
-        }
-        unset($options['wsdl']);
-
-        $this->_soapClient = new Zend_Soap_Client_Common(array($this, '_doRequest'), $wsdl, $options);
-    }
-
-
-    /**
-     * Perform arguments pre-processing
-     *
-     * My be overridden in descendant classes
-     *
-     * @param array $arguments
-     */
-    protected function _preProcessArguments($arguments)
-    {
-        // Do nothing
-        return $arguments;
-    }
-
-    /**
-     * Perform result pre-processing
-     *
-     * My be overridden in descendant classes
-     *
-     * @param array $arguments
-     */
-    protected function _preProcessResult($result)
-    {
-        // Do nothing
-        return $result;
-    }
-
-    /**
-     * Add SOAP input header
-     *
-     * @param SoapHeader $header
-     * @param boolean $permanent
-     * @return Zend_Soap_Client
-     */
-    public function addSoapInputHeader(SoapHeader $header, $permanent = false)
-    {
-        if ($permanent) {
-            $this->_permanentSoapInputHeaders[] = $header;
-        } else {
-            $this->_soapInputHeaders[] = $header;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Reset SOAP input headers
-     *
-     * @return Zend_Soap_Client
-     */
-    public function resetSoapInputHeaders()
-    {
-        $this->_permanentSoapInputHeaders = array();
-        $this->_soapInputHeaders = array();
-
-        return $this;
-    }
-
-    /**
-     * Get last SOAP output headers
-     *
-     * @return array
-     */
-    public function getLastSoapOutputHeaderObjects()
-    {
-        return $this->_soapOutputHeaders;
-    }
-
-    /**
-     * Perform a SOAP call
-     *
-     * @param string $name
-     * @param array  $arguments
-     * @return mixed
-     */
-    public function __call($name, $arguments)
-    {
-        $soapClient = $this->getSoapClient();
-
-        $this->_lastMethod = $name;
-
-        $soapHeaders = array_merge($this->_permanentSoapInputHeaders, $this->_soapInputHeaders);
-        $result = $soapClient->__soapCall($name,
-                                                 $this->_preProcessArguments($arguments),
-                                                 null, /* Options are already set to the SOAP client object */
-                                                 (count($soapHeaders) > 0)? $soapHeaders : null,
-                                                 $this->_soapOutputHeaders);
-
-        // Reset non-permanent input headers
-        $this->_soapInputHeaders = array();
-
-        return $this->_preProcessResult($result);
-    }
-
-
-    /**
-     * Return a list of available functions
-     *
-     * @return array
-     * @throws Zend_Soap_Client_Exception
-     */
-    public function getFunctions()
-    {
-        if ($this->getWsdl() == null) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('\'getFunctions\' method is available only in WSDL mode.');
-        }
-
-        $soapClient = $this->getSoapClient();
-        return $soapClient->__getFunctions();
-    }
-
-
-    /**
-     * Get used types.
-     *
-     * @return array
-     */
-
-    /**
-     * Return a list of SOAP types
-     *
-     * @return array
-     * @throws Zend_Soap_Client_Exception
-     */
-    public function getTypes()
-    {
-        if ($this->getWsdl() == null) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('\'getTypes\' method is available only in WSDL mode.');
-        }
-
-        $soapClient = $this->getSoapClient();
-
-        return $soapClient->__getTypes();
-    }
-
-    /**
-     * @param SoapClient $soapClient
-     * @return Zend_Soap_Client
-     */
-    public function setSoapClient(SoapClient $soapClient)
-    {
-        $this->_soapClient = $soapClient;
-        return $this;
-    }
-
-    /**
-     * @return SoapClient
-     */
-    public function getSoapClient()
-    {
-        if ($this->_soapClient == null) {
-            $this->_initSoapClientObject();
-        }
-        return $this->_soapClient;
-    }
-
-    /**
-     * @param string $name
-     * @param string $value
-     * @return Zend_Soap_Client
-     */
-    public function setCookie($cookieName, $cookieValue=null)
-    {
-        $soapClient = $this->getSoapClient();
-        $soapClient->__setCookie($cookieName, $cookieValue);
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Client/Common.php b/airtime_mvc/library/Zend/Soap/Client/Common.php
deleted file mode 100644
index 0319c08dd..000000000
--- a/airtime_mvc/library/Zend/Soap/Client/Common.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-if (extension_loaded('soap')) {
-
-/**
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- */
-class Zend_Soap_Client_Common extends SoapClient
-{
-    /**
-     * doRequest() pre-processing method
-     *
-     * @var callback
-     */
-    protected $_doRequestCallback;
-
-    /**
-     * Common Soap Client constructor
-     *
-     * @param callback $doRequestMethod
-     * @param string $wsdl
-     * @param array $options
-     */
-    function __construct($doRequestCallback, $wsdl, $options)
-    {
-        $this->_doRequestCallback = $doRequestCallback;
-
-        parent::__construct($wsdl, $options);
-    }
-
-    /**
-     * Performs SOAP request over HTTP.
-     * Overridden to implement different transport layers, perform additional XML processing or other purpose.
-     *
-     * @param string $request
-     * @param string $location
-     * @param string $action
-     * @param int    $version
-     * @param int    $one_way
-     * @return mixed
-     */
-    function __doRequest($request, $location, $action, $version, $one_way = null)
-    {
-        if ($one_way === null) {
-            return call_user_func($this->_doRequestCallback, $this, $request, $location, $action, $version);
-        } else {
-            return call_user_func($this->_doRequestCallback, $this, $request, $location, $action, $version, $one_way);
-        }
-    }
-
-}
-
-} // end if (extension_loaded('soap')
diff --git a/airtime_mvc/library/Zend/Soap/Client/DotNet.php b/airtime_mvc/library/Zend/Soap/Client/DotNet.php
deleted file mode 100644
index b509332ac..000000000
--- a/airtime_mvc/library/Zend/Soap/Client/DotNet.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DotNet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Soap_Client */
-require_once 'Zend/Soap/Client.php';
-
-if (extension_loaded('soap')) {
-
-/**
- * Zend_Soap_Client_Local
- *
- * Class is intended to be used with .Net Web Services.
- *
- * Important! Class is at experimental stage now.
- * Please leave your notes, compatiblity issues reports or
- * suggestions in fw-webservices@lists.zend.com or fw-general@lists.com
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- */
-class Zend_Soap_Client_DotNet extends Zend_Soap_Client
-{
-    /**
-     * Constructor
-     *
-     * @param string $wsdl
-     * @param array $options
-     */
-    public function __construct($wsdl = null, $options = null)
-    {
-        // Use SOAP 1.1 as default
-        $this->setSoapVersion(SOAP_1_1);
-
-        parent::__construct($wsdl, $options);
-    }
-
-
-    /**
-     * Perform arguments pre-processing
-     *
-     * My be overridden in descendant classes
-     *
-     * @param array $arguments
-     * @throws Zend_Soap_Client_Exception
-     */
-    protected function _preProcessArguments($arguments)
-    {
-        if (count($arguments) > 1  ||
-            (count($arguments) == 1  &&  !is_array(reset($arguments)))
-           ) {
-            require_once 'Zend/Soap/Client/Exception.php';
-            throw new Zend_Soap_Client_Exception('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).');
-        }
-
-        // Do nothing
-        return $arguments;
-    }
-
-    /**
-     * Perform result pre-processing
-     *
-     * My be overridden in descendant classes
-     *
-     * @param array $arguments
-     */
-    protected function _preProcessResult($result)
-    {
-        $resultProperty = $this->getLastMethod() . 'Result';
-
-        return $result->$resultProperty;
-    }
-
-}
-
-} // end if (extension_loaded('soap')
diff --git a/airtime_mvc/library/Zend/Soap/Client/Exception.php b/airtime_mvc/library/Zend/Soap/Client/Exception.php
deleted file mode 100644
index 16175031d..000000000
--- a/airtime_mvc/library/Zend/Soap/Client/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Soap_Client_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Soap/Client/Local.php b/airtime_mvc/library/Zend/Soap/Client/Local.php
deleted file mode 100644
index 71e3dc9a3..000000000
--- a/airtime_mvc/library/Zend/Soap/Client/Local.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Local.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Soap_Server */
-require_once 'Zend/Soap/Server.php';
-
-/** Zend_Soap_Client */
-require_once 'Zend/Soap/Client.php';
-
-if (extension_loaded('soap')) {
-
-/**
- * Zend_Soap_Client_Local
- *
- * Class is intended to be used as local SOAP client which works
- * with a provided Server object.
- *
- * Could be used for development or testing purposes.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Client
- */
-class Zend_Soap_Client_Local extends Zend_Soap_Client
-{
-    /**
-     * Server object
-     *
-     * @var Zend_Soap_Server
-     */
-    protected $_server;
-
-    /**
-     * Local client constructor
-     *
-     * @param Zend_Soap_Server $server
-     * @param string $wsdl
-     * @param array $options
-     */
-    function __construct(Zend_Soap_Server $server, $wsdl, $options = null)
-    {
-        $this->_server = $server;
-
-        // Use Server specified SOAP version as default
-        $this->setSoapVersion($server->getSoapVersion());
-
-        parent::__construct($wsdl, $options);
-    }
-
-    /**
-     * Actual "do request" method.
-     *
-     * @internal
-     * @param Zend_Soap_Client_Common $client
-     * @param string $request
-     * @param string $location
-     * @param string $action
-     * @param int    $version
-     * @param int    $one_way
-     * @return mixed
-     */
-    public function _doRequest(Zend_Soap_Client_Common $client, $request, $location, $action, $version, $one_way = null)
-    {
-        // Perform request as is
-        ob_start();
-        $this->_server->handle($request);
-        $response = ob_get_contents();
-        ob_end_clean();
-
-        return $response;
-    }
-}
-
-} // end if (extension_loaded('soap')
diff --git a/airtime_mvc/library/Zend/Soap/Server.php b/airtime_mvc/library/Zend/Soap/Server.php
deleted file mode 100644
index 62f01776d..000000000
--- a/airtime_mvc/library/Zend/Soap/Server.php
+++ /dev/null
@@ -1,959 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Server_Interface
- */
-require_once 'Zend/Server/Interface.php';
-
-/**
- * Zend_Soap_Server
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Server
- * @uses       Zend_Server_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Soap_Server implements Zend_Server_Interface
-{
-    /**
-     * Actor URI
-     * @var string URI
-     */
-    protected $_actor;
-
-    /**
-     * Class registered with this server
-     * @var string
-     */
-    protected $_class;
-
-    /**
-     * Arguments to pass to {@link $_class} constructor
-     * @var array
-     */
-    protected $_classArgs = array();
-
-    /**
-     * Object registered with this server
-     */
-    protected $_object;
-
-    /**
-     * Array of SOAP type => PHP class pairings for handling return/incoming values
-     * @var array
-     */
-    protected $_classmap;
-
-    /**
-     * Encoding
-     * @var string
-     */
-    protected $_encoding;
-
-    /**
-     * SOAP Server Features
-     *
-     * @var int
-     */
-    protected $_features;
-
-    /**
-     * WSDL Caching Options of SOAP Server
-     *
-     * @var mixed
-     */
-    protected $_wsdlCache;
-
-
-    /**
-     * Registered fault exceptions
-     * @var array
-     */
-    protected $_faultExceptions = array();
-
-    /**
-     * Functions registered with this server; may be either an array or the SOAP_FUNCTIONS_ALL
-     * constant
-     * @var array|int
-     */
-    protected $_functions = array();
-
-    /**
-     * Persistence mode; should be one of the SOAP persistence constants
-     * @var int
-     */
-    protected $_persistence;
-
-    /**
-     * Request XML
-     * @var string
-     */
-    protected $_request;
-
-    /**
-     * Response XML
-     * @var string
-     */
-    protected $_response;
-
-    /**
-     * Flag: whether or not {@link handle()} should return a response instead
-     * of automatically emitting it.
-     * @var boolean
-     */
-    protected $_returnResponse = false;
-
-    /**
-     * SOAP version to use; SOAP_1_2 by default, to allow processing of headers
-     * @var int
-     */
-    protected $_soapVersion = SOAP_1_2;
-
-    /**
-     * URI or path to WSDL
-     * @var string
-     */
-    protected $_wsdl;
-
-    /**
-     * URI namespace for SOAP server
-     * @var string URI
-     */
-    protected $_uri;
-
-    /**
-     * Constructor
-     *
-     * Sets display_errors INI setting to off (prevent client errors due to bad
-     * XML in response). Registers {@link handlePhpErrors()} as error handler
-     * for E_USER_ERROR.
-     *
-     * If $wsdl is provided, it is passed on to {@link setWsdl()}; if any
-     * options are specified, they are passed on to {@link setOptions()}.
-     *
-     * @param string $wsdl
-     * @param array $options
-     * @return void
-     */
-    public function __construct($wsdl = null, array $options = null)
-    {
-        if (!extension_loaded('soap')) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('SOAP extension is not loaded.');
-        }
-
-        if (null !== $wsdl) {
-            $this->setWsdl($wsdl);
-        }
-
-        if (null !== $options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set Options
-     *
-     * Allows setting options as an associative array of option => value pairs.
-     *
-     * @param  array|Zend_Config $options
-     * @return Zend_Soap_Server
-     */
-    public function setOptions($options)
-    {
-        if($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        foreach ($options as $key => $value) {
-            switch ($key) {
-                case 'actor':
-                    $this->setActor($value);
-                    break;
-                case 'classmap':
-                case 'classMap':
-                    $this->setClassmap($value);
-                    break;
-                case 'encoding':
-                    $this->setEncoding($value);
-                    break;
-                case 'soapVersion':
-                case 'soap_version':
-                    $this->setSoapVersion($value);
-                    break;
-                case 'uri':
-                    $this->setUri($value);
-                    break;
-                case 'wsdl':
-                    $this->setWsdl($value);
-                    break;
-                case 'featues':
-                    $this->setSoapFeatures($value);
-                    break;
-                case 'cache_wsdl':
-                    $this->setWsdlCache($value);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return array of options suitable for using with SoapServer constructor
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        $options = array();
-        if (null !== $this->_actor) {
-            $options['actor'] = $this->_actor;
-        }
-
-        if (null !== $this->_classmap) {
-            $options['classmap'] = $this->_classmap;
-        }
-
-        if (null !== $this->_encoding) {
-            $options['encoding'] = $this->_encoding;
-        }
-
-        if (null !== $this->_soapVersion) {
-            $options['soap_version'] = $this->_soapVersion;
-        }
-
-        if (null !== $this->_uri) {
-            $options['uri'] = $this->_uri;
-        }
-
-        if(null !== $this->_features) {
-            $options['features'] = $this->_features;
-        }
-
-        if(null !== $this->_wsdlCache) {
-            $options['cache_wsdl'] = $this->_wsdlCache;
-        }
-
-        return $options;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $encoding
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception with invalid encoding argument
-     */
-    public function setEncoding($encoding)
-    {
-        if (!is_string($encoding)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid encoding specified');
-        }
-
-        $this->_encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set SOAP version
-     *
-     * @param  int $version One of the SOAP_1_1 or SOAP_1_2 constants
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception with invalid soap version argument
-     */
-    public function setSoapVersion($version)
-    {
-        if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid soap version specified');
-        }
-
-        $this->_soapVersion = $version;
-        return $this;
-    }
-
-    /**
-     * Get SOAP version
-     *
-     * @return int
-     */
-    public function getSoapVersion()
-    {
-        return $this->_soapVersion;
-    }
-
-    /**
-     * Check for valid URN
-     *
-     * @param  string $urn
-     * @return true
-     * @throws Zend_Soap_Server_Exception on invalid URN
-     */
-    public function validateUrn($urn)
-    {
-        $scheme = parse_url($urn, PHP_URL_SCHEME);
-        if ($scheme === false || $scheme === null) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid URN');
-        }
-
-        return true;
-    }
-
-    /**
-     * Set actor
-     *
-     * Actor is the actor URI for the server.
-     *
-     * @param  string $actor
-     * @return Zend_Soap_Server
-     */
-    public function setActor($actor)
-    {
-        $this->validateUrn($actor);
-        $this->_actor = $actor;
-        return $this;
-    }
-
-    /**
-     * Retrieve actor
-     *
-     * @return string
-     */
-    public function getActor()
-    {
-        return $this->_actor;
-    }
-
-    /**
-     * Set URI
-     *
-     * URI in SoapServer is actually the target namespace, not a URI; $uri must begin with 'urn:'.
-     *
-     * @param  string $uri
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception with invalid uri argument
-     */
-    public function setUri($uri)
-    {
-        $this->validateUrn($uri);
-        $this->_uri = $uri;
-        return $this;
-    }
-
-    /**
-     * Retrieve URI
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Set classmap
-     *
-     * @param  array $classmap
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception for any invalid class in the class map
-     */
-    public function setClassmap($classmap)
-    {
-        if (!is_array($classmap)) {
-            /**
-             * @see Zend_Soap_Server_Exception
-             */
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Classmap must be an array');
-        }
-        foreach ($classmap as $type => $class) {
-            if (!class_exists($class)) {
-                /**
-                 * @see Zend_Soap_Server_Exception
-                 */
-                require_once 'Zend/Soap/Server/Exception.php';
-                throw new Zend_Soap_Server_Exception('Invalid class in class map');
-            }
-        }
-
-        $this->_classmap = $classmap;
-        return $this;
-    }
-
-    /**
-     * Retrieve classmap
-     *
-     * @return mixed
-     */
-    public function getClassmap()
-    {
-        return $this->_classmap;
-    }
-
-    /**
-     * Set wsdl
-     *
-     * @param string $wsdl  URI or path to a WSDL
-     * @return Zend_Soap_Server
-     */
-    public function setWsdl($wsdl)
-    {
-        $this->_wsdl = $wsdl;
-        return $this;
-    }
-
-    /**
-     * Retrieve wsdl
-     *
-     * @return string
-     */
-    public function getWsdl()
-    {
-        return $this->_wsdl;
-    }
-
-    /**
-     * Set the SOAP Feature options.
-     *
-     * @param  string|int $feature
-     * @return Zend_Soap_Server
-     */
-    public function setSoapFeatures($feature)
-    {
-        $this->_features = $feature;
-        return $this;
-    }
-
-    /**
-     * Return current SOAP Features options
-     *
-     * @return int
-     */
-    public function getSoapFeatures()
-    {
-        return $this->_features;
-    }
-
-    /**
-     * Set the SOAP Wsdl Caching Options
-     *
-     * @param string|int|boolean $caching
-     * @return Zend_Soap_Server
-     */
-    public function setWsdlCache($options)
-    {
-        $this->_wsdlCache = $options;
-        return $this;
-    }
-
-    /**
-     * Get current SOAP Wsdl Caching option
-     */
-    public function getWsdlCache()
-    {
-        return $this->_wsdlCache;
-    }
-
-    /**
-     * Attach a function as a server method
-     *
-     * @param array|string $function Function name, array of function names to attach,
-     * or SOAP_FUNCTIONS_ALL to attach all functions
-     * @param  string $namespace Ignored
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception on invalid functions
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        // Bail early if set to SOAP_FUNCTIONS_ALL
-        if ($this->_functions == SOAP_FUNCTIONS_ALL) {
-            return $this;
-        }
-
-        if (is_array($function)) {
-            foreach ($function as $func) {
-                if (is_string($func) && function_exists($func)) {
-                    $this->_functions[] = $func;
-                } else {
-                    require_once 'Zend/Soap/Server/Exception.php';
-                    throw new Zend_Soap_Server_Exception('One or more invalid functions specified in array');
-                }
-            }
-            $this->_functions = array_merge($this->_functions, $function);
-        } elseif (is_string($function) && function_exists($function)) {
-            $this->_functions[] = $function;
-        } elseif ($function == SOAP_FUNCTIONS_ALL) {
-            $this->_functions = SOAP_FUNCTIONS_ALL;
-        } else {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid function specified');
-        }
-
-        if (is_array($this->_functions)) {
-            $this->_functions = array_unique($this->_functions);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Attach a class to a server
-     *
-     * Accepts a class name to use when handling requests. Any additional
-     * arguments will be passed to that class' constructor when instantiated.
-     *
-     * See {@link setObject()} to set preconfigured object instances as request handlers.
-     *
-     * @param string $class Class Name which executes SOAP Requests at endpoint.
-     * @return Zend_Soap_Server
-     * @throws Zend_Soap_Server_Exception if called more than once, or if class
-     * does not exist
-     */
-    public function setClass($class, $namespace = '', $argv = null)
-    {
-        if (isset($this->_class)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('A class has already been registered with this soap server instance');
-        }
-
-        if (!is_string($class)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid class argument (' . gettype($class) . ')');
-        }
-
-        if (!class_exists($class)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Class "' . $class . '" does not exist');
-        }
-
-        $this->_class = $class;
-        if (1 < func_num_args()) {
-            $argv = func_get_args();
-            array_shift($argv);
-            $this->_classArgs = $argv;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Attach an object to a server
-     *
-     * Accepts an instanciated object to use when handling requests.
-     *
-     * @param object $object
-     * @return Zend_Soap_Server
-     */
-    public function setObject($object)
-    {
-        if(!is_object($object)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid object argument ('.gettype($object).')');
-        }
-
-        if(isset($this->_object)) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('An object has already been registered with this soap server instance');
-        }
-
-        $this->_object = $object;
-
-        return $this;
-    }
-
-    /**
-     * Return a server definition array
-     *
-     * Returns a list of all functions registered with {@link addFunction()},
-     * merged with all public methods of the class set with {@link setClass()}
-     * (if any).
-     *
-     * @access public
-     * @return array
-     */
-    public function getFunctions()
-    {
-        $functions = array();
-        if (null !== $this->_class) {
-            $functions = get_class_methods($this->_class);
-        } elseif (null !== $this->_object) {
-            $functions = get_class_methods($this->_object);
-        }
-
-        return array_merge((array) $this->_functions, $functions);
-    }
-
-    /**
-     * Unimplemented: Load server definition
-     *
-     * @param array $array
-     * @return void
-     * @throws Zend_Soap_Server_Exception Unimplemented
-     */
-    public function loadFunctions($definition)
-    {
-        require_once 'Zend/Soap/Server/Exception.php';
-        throw new Zend_Soap_Server_Exception('Unimplemented');
-    }
-
-    /**
-     * Set server persistence
-     *
-     * @param int $mode
-     * @return Zend_Soap_Server
-     */
-    public function setPersistence($mode)
-    {
-        if (!in_array($mode, array(SOAP_PERSISTENCE_SESSION, SOAP_PERSISTENCE_REQUEST))) {
-            require_once 'Zend/Soap/Server/Exception.php';
-            throw new Zend_Soap_Server_Exception('Invalid persistence mode specified');
-        }
-
-        $this->_persistence = $mode;
-        return $this;
-    }
-
-    /**
-     * Get server persistence
-     *
-     * @return Zend_Soap_Server
-     */
-    public function getPersistence()
-    {
-        return $this->_persistence;
-    }
-
-    /**
-     * Set request
-     *
-     * $request may be any of:
-     * - DOMDocument; if so, then cast to XML
-     * - DOMNode; if so, then grab owner document and cast to XML
-     * - SimpleXMLElement; if so, then cast to XML
-     * - stdClass; if so, calls __toString() and verifies XML
-     * - string; if so, verifies XML
-     *
-     * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request
-     * @return Zend_Soap_Server
-     */
-    protected function _setRequest($request)
-    {
-        if ($request instanceof DOMDocument) {
-            $xml = $request->saveXML();
-        } elseif ($request instanceof DOMNode) {
-            $xml = $request->ownerDocument->saveXML();
-        } elseif ($request instanceof SimpleXMLElement) {
-            $xml = $request->asXML();
-        } elseif (is_object($request) || is_string($request)) {
-            if (is_object($request)) {
-                $xml = $request->__toString();
-            } else {
-                $xml = $request;
-            }
-
-            $dom = new DOMDocument();
-            if(strlen($xml) == 0 || !$dom->loadXML($xml)) {
-                require_once 'Zend/Soap/Server/Exception.php';
-                throw new Zend_Soap_Server_Exception('Invalid XML');
-            }
-        }
-        $this->_request = $xml;
-        return $this;
-    }
-
-    /**
-     * Retrieve request XML
-     *
-     * @return string
-     */
-    public function getLastRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set return response flag
-     *
-     * If true, {@link handle()} will return the response instead of
-     * automatically sending it back to the requesting client.
-     *
-     * The response is always available via {@link getResponse()}.
-     *
-     * @param boolean $flag
-     * @return Zend_Soap_Server
-     */
-    public function setReturnResponse($flag)
-    {
-        $this->_returnResponse = ($flag) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Retrieve return response flag
-     *
-     * @return boolean
-     */
-    public function getReturnResponse()
-    {
-        return $this->_returnResponse;
-    }
-
-    /**
-     * Get response XML
-     *
-     * @return string
-     */
-    public function getLastResponse()
-    {
-        return $this->_response;
-    }
-
-    /**
-     * Get SoapServer object
-     *
-     * Uses {@link $_wsdl} and return value of {@link getOptions()} to instantiate
-     * SoapServer object, and then registers any functions or class with it, as
-     * well as peristence.
-     *
-     * @return SoapServer
-     */
-    protected function _getSoap()
-    {
-        $options = $this->getOptions();
-        $server  = new SoapServer($this->_wsdl, $options);
-
-        if (!empty($this->_functions)) {
-            $server->addFunction($this->_functions);
-        }
-
-        if (!empty($this->_class)) {
-            $args = $this->_classArgs;
-            array_unshift($args, $this->_class);
-            call_user_func_array(array($server, 'setClass'), $args);
-        }
-
-        if (!empty($this->_object)) {
-            $server->setObject($this->_object);
-        }
-
-        if (null !== $this->_persistence) {
-            $server->setPersistence($this->_persistence);
-        }
-
-        return $server;
-    }
-
-    /**
-     * Handle a request
-     *
-     * Instantiates SoapServer object with options set in object, and
-     * dispatches its handle() method.
-     *
-     * $request may be any of:
-     * - DOMDocument; if so, then cast to XML
-     * - DOMNode; if so, then grab owner document and cast to XML
-     * - SimpleXMLElement; if so, then cast to XML
-     * - stdClass; if so, calls __toString() and verifies XML
-     * - string; if so, verifies XML
-     *
-     * If no request is passed, pulls request using php:://input (for
-     * cross-platform compatability purposes).
-     *
-     * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request Optional request
-     * @return void|string
-     */
-    public function handle($request = null)
-    {
-        if (null === $request) {
-            $request = file_get_contents('php://input');
-        }
-
-        // Set Zend_Soap_Server error handler
-        $displayErrorsOriginalState = $this->_initializeSoapErrorContext();
-
-        $setRequestException = null;
-        /**
-         * @see Zend_Soap_Server_Exception
-         */
-        require_once 'Zend/Soap/Server/Exception.php';
-        try {
-            $this->_setRequest($request);
-        } catch (Zend_Soap_Server_Exception $e) {
-            $setRequestException = $e;
-        }
-
-        $soap = $this->_getSoap();
-
-        ob_start();
-        if($setRequestException instanceof Exception) {
-            // Send SOAP fault message if we've catched exception
-            $soap->fault("Sender", $setRequestException->getMessage());
-        } else {
-            try {
-                $soap->handle($request);
-            } catch (Exception $e) {
-                $fault = $this->fault($e);
-                $soap->fault($fault->faultcode, $fault->faultstring);
-            }
-        }
-        $this->_response = ob_get_clean();
-
-        // Restore original error handler
-        restore_error_handler();
-        ini_set('display_errors', $displayErrorsOriginalState);
-
-        if (!$this->_returnResponse) {
-            echo $this->_response;
-            return;
-        }
-
-        return $this->_response;
-    }
-
-    /**
-     * Method initalizes the error context that the SOAPServer enviroment will run in.
-     *
-     * @return boolean display_errors original value
-     */
-    protected function _initializeSoapErrorContext()
-    {
-        $displayErrorsOriginalState = ini_get('display_errors');
-        ini_set('display_errors', false);
-        set_error_handler(array($this, 'handlePhpErrors'), E_USER_ERROR);
-        return $displayErrorsOriginalState;
-    }
-
-    /**
-     * Register a valid fault exception
-     *
-     * @param  string|array $class Exception class or array of exception classes
-     * @return Zend_Soap_Server
-     */
-    public function registerFaultException($class)
-    {
-        $this->_faultExceptions = array_merge($this->_faultExceptions, (array) $class);
-        return $this;
-    }
-
-    /**
-     * Deregister a fault exception from the fault exception stack
-     *
-     * @param  string $class
-     * @return boolean
-     */
-    public function deregisterFaultException($class)
-    {
-        if (in_array($class, $this->_faultExceptions, true)) {
-            $index = array_search($class, $this->_faultExceptions);
-            unset($this->_faultExceptions[$index]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Return fault exceptions list
-     *
-     * @return array
-     */
-    public function getFaultExceptions()
-    {
-        return $this->_faultExceptions;
-    }
-
-    /**
-     * Generate a server fault
-     *
-     * Note that the arguments are reverse to those of SoapFault.
-     *
-     * If an exception is passed as the first argument, its message and code
-     * will be used to create the fault object if it has been registered via
-     * {@Link registerFaultException()}.
-     *
-     * @link   http://www.w3.org/TR/soap12-part1/#faultcodes
-     * @param  string|Exception $fault
-     * @param  string $code SOAP Fault Codes
-     * @return SoapFault
-     */
-    public function fault($fault = null, $code = "Receiver")
-    {
-        if ($fault instanceof Exception) {
-            $class = get_class($fault);
-            if (in_array($class, $this->_faultExceptions)) {
-                $message = $fault->getMessage();
-                $eCode   = $fault->getCode();
-                $code    = empty($eCode) ? $code : $eCode;
-            } else {
-                $message = 'Unknown error';
-            }
-        } elseif(is_string($fault)) {
-            $message = $fault;
-        } else {
-            $message = 'Unknown error';
-        }
-
-        $allowedFaultModes = array(
-            'VersionMismatch', 'MustUnderstand', 'DataEncodingUnknown',
-            'Sender', 'Receiver', 'Server'
-        );
-        if(!in_array($code, $allowedFaultModes)) {
-            $code = "Receiver";
-        }
-
-        return new SoapFault($code, $message);
-    }
-
-    /**
-     * Throw PHP errors as SoapFaults
-     *
-     * @param int $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param int $errline
-     * @param array $errcontext
-     * @return void
-     * @throws SoapFault
-     */
-    public function handlePhpErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
-    {
-        throw $this->fault($errstr, "Receiver");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Server/Exception.php b/airtime_mvc/library/Zend/Soap/Server/Exception.php
deleted file mode 100644
index 34c1d2078..000000000
--- a/airtime_mvc/library/Zend/Soap/Server/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Soap_Server_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl.php b/airtime_mvc/library/Zend/Soap/Wsdl.php
deleted file mode 100644
index dc3117305..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl.php
+++ /dev/null
@@ -1,666 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Wsdl.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Interface
- */
-require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Abstract
- */
-require_once "Zend/Soap/Wsdl/Strategy/Abstract.php";
-
-/**
- * Zend_Soap_Wsdl
- *
- * @category   Zend
- * @package    Zend_Soap
- */
-class Zend_Soap_Wsdl
-{
-    /**
-     * @var object DomDocument Instance
-     */
-    private $_dom;
-
-    /**
-     * @var object WSDL Root XML_Tree_Node
-     */
-    private $_wsdl;
-
-    /**
-     * @var string URI where the WSDL will be available
-     */
-    private $_uri;
-
-    /**
-     * @var DOMElement
-     */
-    private $_schema = null;
-
-    /**
-     * Types defined on schema
-     *
-     * @var array
-     */
-    private $_includedTypes = array();
-
-    /**
-     * Strategy for detection of complex types
-     */
-    protected $_strategy = null;
-
-
-    /**
-     * Constructor
-     *
-     * @param string  $name Name of the Web Service being Described
-     * @param string  $uri URI where the WSDL will be available
-     * @param boolean|string|Zend_Soap_Wsdl_Strategy_Interface $strategy
-     */
-    public function __construct($name, $uri, $strategy = true)
-    {
-        if ($uri instanceof Zend_Uri_Http) {
-            $uri = $uri->getUri();
-        }
-        $this->_uri = $uri;
-
-        /**
-         * @todo change DomDocument object creation from cparsing to construxting using API
-         * It also should authomatically escape $name and $uri values if necessary
-         */
-        $wsdl = "<?xml version='1.0' ?>
-                <definitions name='$name' targetNamespace='$uri'
-                    xmlns='http://schemas.xmlsoap.org/wsdl/'
-                    xmlns:tns='$uri'
-                    xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
-                    xmlns:xsd='http://www.w3.org/2001/XMLSchema'
-                    xmlns:soap-enc='http://schemas.xmlsoap.org/soap/encoding/'
-                    xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'></definitions>";
-        $this->_dom = new DOMDocument();
-        if (!$this->_dom->loadXML($wsdl)) {
-            require_once 'Zend/Server/Exception.php';
-            throw new Zend_Server_Exception('Unable to create DomDocument');
-        } else {
-            $this->_wsdl = $this->_dom->documentElement;
-        }
-
-        $this->setComplexTypeStrategy($strategy);
-    }
-
-    /**
-     * Set a new uri for this WSDL
-     *
-     * @param  string|Zend_Uri_Http $uri
-     * @return Zend_Server_Wsdl
-     */
-    public function setUri($uri)
-    {
-        if ($uri instanceof Zend_Uri_Http) {
-            $uri = $uri->getUri();
-        }
-        $oldUri = $this->_uri;
-        $this->_uri = $uri;
-
-        if($this->_dom !== null) {
-            // @todo: This is the worst hack ever, but its needed due to design and non BC issues of WSDL generation
-            $xml = $this->_dom->saveXML();
-            $xml = str_replace($oldUri, $uri, $xml);
-            $this->_dom = new DOMDocument();
-            $this->_dom->loadXML($xml);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a strategy for complex type detection and handling
-     *
-     * @todo Boolean is for backwards compability with extractComplexType object var. Remove it in later versions.
-     * @param boolean|string|Zend_Soap_Wsdl_Strategy_Interface $strategy
-     * @return Zend_Soap_Wsdl
-     */
-    public function setComplexTypeStrategy($strategy)
-    {
-        if($strategy === true) {
-            require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php";
-            $strategy = new Zend_Soap_Wsdl_Strategy_DefaultComplexType();
-        } else if($strategy === false) {
-            require_once "Zend/Soap/Wsdl/Strategy/AnyType.php";
-            $strategy = new Zend_Soap_Wsdl_Strategy_AnyType();
-        } else if(is_string($strategy)) {
-            if(class_exists($strategy)) {
-                $strategy = new $strategy();
-            } else {
-                require_once "Zend/Soap/Wsdl/Exception.php";
-                throw new Zend_Soap_Wsdl_Exception(
-                    sprintf("Strategy with name '%s does not exist.", $strategy
-                ));
-            }
-        }
-
-        if(!($strategy instanceof Zend_Soap_Wsdl_Strategy_Interface)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception("Set a strategy that is not of type 'Zend_Soap_Wsdl_Strategy_Interface'");
-        }
-        $this->_strategy = $strategy;
-        return $this;
-    }
-
-    /**
-     * Get the current complex type strategy
-     *
-     * @return Zend_Soap_Wsdl_Strategy_Interface
-     */
-    public function getComplexTypeStrategy()
-    {
-        return $this->_strategy;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_messages message} element to the WSDL
-     *
-     * @param string $name Name for the {@link http://www.w3.org/TR/wsdl#_messages message}
-     * @param array $parts An array of {@link http://www.w3.org/TR/wsdl#_message parts}
-     *                     The array is constructed like: 'name of part' => 'part xml schema data type'
-     *                     or 'name of part' => array('type' => 'part xml schema type')
-     *                     or 'name of part' => array('element' => 'part xml element name')
-     * @return object The new message's XML_Tree_Node for use in {@link function addDocumentation}
-     */
-    public function addMessage($name, $parts)
-    {
-        $message = $this->_dom->createElement('message');
-
-        $message->setAttribute('name', $name);
-
-        if (sizeof($parts) > 0) {
-            foreach ($parts as $name => $type) {
-                $part = $this->_dom->createElement('part');
-                $part->setAttribute('name', $name);
-                if (is_array($type)) {
-                    foreach ($type as $key => $value) {
-                        $part->setAttribute($key, $value);
-                    }
-                } else {
-                    $part->setAttribute('type', $type);
-                }
-                $message->appendChild($part);
-            }
-        }
-
-        $this->_wsdl->appendChild($message);
-
-        return $message;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_porttypes portType} element to the WSDL
-     *
-     * @param string $name portType element's name
-     * @return object The new portType's XML_Tree_Node for use in {@link function addPortOperation} and {@link function addDocumentation}
-     */
-    public function addPortType($name)
-    {
-        $portType = $this->_dom->createElement('portType');
-        $portType->setAttribute('name', $name);
-        $this->_wsdl->appendChild($portType);
-
-        return $portType;
-    }
-
-    /**
-     * Add an {@link http://www.w3.org/TR/wsdl#_request-response operation} element to a portType element
-     *
-     * @param object $portType a portType XML_Tree_Node, from {@link function addPortType}
-     * @param string $name Operation name
-     * @param string $input Input Message
-     * @param string $output Output Message
-     * @param string $fault Fault Message
-     * @return object The new operation's XML_Tree_Node for use in {@link function addDocumentation}
-     */
-    public function addPortOperation($portType, $name, $input = false, $output = false, $fault = false)
-    {
-        $operation = $this->_dom->createElement('operation');
-        $operation->setAttribute('name', $name);
-
-        if (is_string($input) && (strlen(trim($input)) >= 1)) {
-            $node = $this->_dom->createElement('input');
-            $node->setAttribute('message', $input);
-            $operation->appendChild($node);
-        }
-        if (is_string($output) && (strlen(trim($output)) >= 1)) {
-            $node= $this->_dom->createElement('output');
-            $node->setAttribute('message', $output);
-            $operation->appendChild($node);
-        }
-        if (is_string($fault) && (strlen(trim($fault)) >= 1)) {
-            $node = $this->_dom->createElement('fault');
-            $node->setAttribute('message', $fault);
-            $operation->appendChild($node);
-        }
-
-        $portType->appendChild($operation);
-
-        return $operation;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_bindings binding} element to WSDL
-     *
-     * @param string $name Name of the Binding
-     * @param string $type name of the portType to bind
-     * @return object The new binding's XML_Tree_Node for use with {@link function addBindingOperation} and {@link function addDocumentation}
-     */
-    public function addBinding($name, $portType)
-    {
-        $binding = $this->_dom->createElement('binding');
-        $binding->setAttribute('name', $name);
-        $binding->setAttribute('type', $portType);
-
-        $this->_wsdl->appendChild($binding);
-
-        return $binding;
-    }
-
-    /**
-     * Add an operation to a binding element
-     *
-     * @param object $binding A binding XML_Tree_Node returned by {@link function addBinding}
-     * @param array $input An array of attributes for the input element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
-     * @param array $output An array of attributes for the output element, allowed keys are: 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
-     * @param array $fault An array of attributes for the fault element, allowed keys are: 'name', 'use', 'namespace', 'encodingStyle'. {@link http://www.w3.org/TR/wsdl#_soap:body More Information}
-     * @return object The new Operation's XML_Tree_Node for use with {@link function addSoapOperation} and {@link function addDocumentation}
-     */
-    public function addBindingOperation($binding, $name, $input = false, $output = false, $fault = false)
-    {
-        $operation = $this->_dom->createElement('operation');
-        $operation->setAttribute('name', $name);
-
-        if (is_array($input)) {
-            $node = $this->_dom->createElement('input');
-            $soap_node = $this->_dom->createElement('soap:body');
-            foreach ($input as $name => $value) {
-                $soap_node->setAttribute($name, $value);
-            }
-            $node->appendChild($soap_node);
-            $operation->appendChild($node);
-        }
-
-        if (is_array($output)) {
-            $node = $this->_dom->createElement('output');
-            $soap_node = $this->_dom->createElement('soap:body');
-            foreach ($output as $name => $value) {
-                $soap_node->setAttribute($name, $value);
-            }
-            $node->appendChild($soap_node);
-            $operation->appendChild($node);
-        }
-
-        if (is_array($fault)) {
-            $node = $this->_dom->createElement('fault');
-            if (isset($fault['name'])) {
-                $node->setAttribute('name', $fault['name']);
-            }
-            $soap_node = $this->_dom->createElement('soap:body');
-            foreach ($output as $name => $value) {
-                $soap_node->setAttribute($name, $value);
-            }
-            $node->appendChild($soap_node);
-            $operation->appendChild($node);
-        }
-
-        $binding->appendChild($operation);
-
-        return $operation;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_soap:binding SOAP binding} element to a Binding element
-     *
-     * @param object $binding A binding XML_Tree_Node returned by {@link function addBinding}
-     * @param string $style binding style, possible values are "rpc" (the default) and "document"
-     * @param string $transport Transport method (defaults to HTTP)
-     * @return boolean
-     */
-    public function addSoapBinding($binding, $style = 'document', $transport = 'http://schemas.xmlsoap.org/soap/http')
-    {
-        $soap_binding = $this->_dom->createElement('soap:binding');
-        $soap_binding->setAttribute('style', $style);
-        $soap_binding->setAttribute('transport', $transport);
-
-        $binding->appendChild($soap_binding);
-
-        return $soap_binding;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_soap:operation SOAP operation} to an operation element
-     *
-     * @param object $operation An operation XML_Tree_Node returned by {@link function addBindingOperation}
-     * @param string $soap_action SOAP Action
-     * @return boolean
-     */
-    public function addSoapOperation($binding, $soap_action)
-    {
-        if ($soap_action instanceof Zend_Uri_Http) {
-            $soap_action = $soap_action->getUri();
-        }
-        $soap_operation = $this->_dom->createElement('soap:operation');
-        $soap_operation->setAttribute('soapAction', $soap_action);
-
-        $binding->insertBefore($soap_operation, $binding->firstChild);
-
-        return $soap_operation;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_services service} element to the WSDL
-     *
-     * @param string $name Service Name
-     * @param string $port_name Name of the port for the service
-     * @param string $binding Binding for the port
-     * @param string $location SOAP Address for the service
-     * @return object The new service's XML_Tree_Node for use with {@link function addDocumentation}
-     */
-    public function addService($name, $port_name, $binding, $location)
-    {
-        if ($location instanceof Zend_Uri_Http) {
-            $location = $location->getUri();
-        }
-        $service = $this->_dom->createElement('service');
-        $service->setAttribute('name', $name);
-
-        $port = $this->_dom->createElement('port');
-        $port->setAttribute('name', $port_name);
-        $port->setAttribute('binding', $binding);
-
-        $soap_address = $this->_dom->createElement('soap:address');
-        $soap_address->setAttribute('location', $location);
-
-        $port->appendChild($soap_address);
-        $service->appendChild($port);
-
-        $this->_wsdl->appendChild($service);
-
-        return $service;
-    }
-
-    /**
-     * Add a documentation element to any element in the WSDL.
-     *
-     * Note that the WSDL {@link http://www.w3.org/TR/wsdl#_documentation specification} uses 'document',
-     * but the WSDL {@link http://schemas.xmlsoap.org/wsdl/ schema} uses 'documentation' instead.
-     * The {@link http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html#WSDL_documentation_Element WS-I Basic Profile 1.1} recommends using 'documentation'.
-     *
-     * @param object $input_node An XML_Tree_Node returned by another method to add the documentation to
-     * @param string $documentation Human readable documentation for the node
-     * @return DOMElement The documentation element
-     */
-    public function addDocumentation($input_node, $documentation)
-    {
-        if ($input_node === $this) {
-            $node = $this->_dom->documentElement;
-        } else {
-            $node = $input_node;
-        }
-
-        $doc = $this->_dom->createElement('documentation');
-        $doc_cdata = $this->_dom->createTextNode($documentation);
-        $doc->appendChild($doc_cdata);
-
-        if($node->hasChildNodes()) {
-            $node->insertBefore($doc, $node->firstChild);
-        } else {
-            $node->appendChild($doc);
-        }
-
-        return $doc;
-    }
-
-    /**
-     * Add WSDL Types element
-     *
-     * @param object $types A DomDocument|DomNode|DomElement|DomDocumentFragment with all the XML Schema types defined in it
-     */
-    public function addTypes($types)
-    {
-        if ($types instanceof DomDocument) {
-            $dom = $this->_dom->importNode($types->documentElement);
-            $this->_wsdl->appendChild($types->documentElement);
-        } elseif ($types instanceof DomNode || $types instanceof DomElement || $types instanceof DomDocumentFragment ) {
-            $dom = $this->_dom->importNode($types);
-            $this->_wsdl->appendChild($dom);
-        }
-    }
-
-    /**
-     * Add a complex type name that is part of this WSDL and can be used in signatures.
-     *
-     * @param string $type
-     * @return Zend_Soap_Wsdl
-     */
-    public function addType($type)
-    {
-        if(!in_array($type, $this->_includedTypes)) {
-            $this->_includedTypes[] = $type;
-        }
-        return $this;
-    }
-
-    /**
-     * Return an array of all currently included complex types
-     *
-     * @return array
-     */
-    public function getTypes()
-    {
-        return $this->_includedTypes;
-    }
-
-    /**
-     * Return the Schema node of the WSDL
-     *
-     * @return DOMElement
-     */
-    public function getSchema()
-    {
-        if($this->_schema == null) {
-            $this->addSchemaTypeSection();
-        }
-
-        return $this->_schema;
-    }
-
-    /**
-     * Return the WSDL as XML
-     *
-     * @return string WSDL as XML
-     */
-    public function toXML()
-    {
-           return $this->_dom->saveXML();
-    }
-
-    /**
-     * Return DOM Document
-     *
-     * @return object DomDocum ent
-     */
-    public function toDomDocument()
-    {
-        return $this->_dom;
-    }
-
-    /**
-     * Echo the WSDL as XML
-     *
-     * @return boolean
-     */
-    public function dump($filename = false)
-    {
-        if (!$filename) {
-            echo $this->toXML();
-            return true;
-        } else {
-            return file_put_contents($filename, $this->toXML());
-        }
-    }
-
-    /**
-     * Returns an XSD Type for the given PHP type
-     *
-     * @param string $type PHP Type to get the XSD type for
-     * @return string
-     */
-    public function getType($type)
-    {
-        switch (strtolower($type)) {
-            case 'string':
-            case 'str':
-                return 'xsd:string';
-                break;
-            case 'int':
-            case 'integer':
-                return 'xsd:int';
-                break;
-            case 'float':
-            case 'double':
-                return 'xsd:float';
-                break;
-            case 'boolean':
-            case 'bool':
-                return 'xsd:boolean';
-                break;
-            case 'array':
-                return 'soap-enc:Array';
-                break;
-            case 'object':
-                return 'xsd:struct';
-                break;
-            case 'mixed':
-                return 'xsd:anyType';
-                break;
-            case 'void':
-                return '';
-            default:
-                // delegate retrieval of complex type to current strategy
-                return $this->addComplexType($type);
-            }
-    }
-
-    /**
-     * This function makes sure a complex types section and schema additions are set.
-     *
-     * @return Zend_Soap_Wsdl
-     */
-    public function addSchemaTypeSection()
-    {
-        if ($this->_schema === null) {
-            $this->_schema = $this->_dom->createElement('xsd:schema');
-            $this->_schema->setAttribute('targetNamespace', $this->_uri);
-            $types = $this->_dom->createElement('types');
-            $types->appendChild($this->_schema);
-            $this->_wsdl->appendChild($types);
-        }
-        return $this;
-    }
-
-    /**
-     * Add a {@link http://www.w3.org/TR/wsdl#_types types} data type definition
-     *
-     * @param string $type Name of the class to be specified
-     * @return string XSD Type for the given PHP type
-     */
-    public function addComplexType($type)
-    {
-        if (in_array($type, $this->getTypes())) {
-            return "tns:$type";
-        }
-        $this->addSchemaTypeSection();
-
-        $strategy = $this->getComplexTypeStrategy();
-        $strategy->setContext($this);
-        // delegates the detection of a complex type to the current strategy
-        return $strategy->addComplexType($type);
-    }
-
-    /**
-     * Parse an xsd:element represented as an array into a DOMElement.
-     *
-     * @param array $element an xsd:element represented as an array
-     * @return DOMElement parsed element
-     */
-    private function _parseElement($element)
-    {
-        if (!is_array($element)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception("The 'element' parameter needs to be an associative array.");
-        }
-
-        $elementXml = $this->_dom->createElement('xsd:element');
-        foreach ($element as $key => $value) {
-            if (in_array($key, array('sequence', 'all', 'choice'))) {
-                if (is_array($value)) {
-                    $complexType = $this->_dom->createElement('xsd:complexType');
-                    if (count($value) > 0) {
-                        $container = $this->_dom->createElement('xsd:' . $key);
-                        foreach ($value as $subelement) {
-                            $subelementXml = $this->_parseElement($subelement);
-                            $container->appendChild($subelementXml);
-                        }
-                        $complexType->appendChild($container);
-                    }
-                    $elementXml->appendChild($complexType);
-                }
-            } else {
-                $elementXml->setAttribute($key, $value);
-            }
-        }
-        return $elementXml;
-    }
-
-    /**
-     * Add an xsd:element represented as an array to the schema.
-     *
-     * Array keys represent attribute names and values their respective value.
-     * The 'sequence', 'all' and 'choice' keys must have an array of elements as their value,
-     * to add them to a nested complexType.
-     *
-     * Example: array( 'name' => 'MyElement',
-     *                 'sequence' => array( array('name' => 'myString', 'type' => 'string'),
-     *                                      array('name' => 'myInteger', 'type' => 'int') ) );
-     * Resulting XML: <xsd:element name="MyElement"><xsd:complexType><xsd:sequence>
-     *                  <xsd:element name="myString" type="string"/>
-     *                  <xsd:element name="myInteger" type="int"/>
-     *                </xsd:sequence></xsd:complexType></xsd:element>
-     *
-     * @param array $element an xsd:element represented as an array
-     * @return string xsd:element for the given element array
-     */
-    public function addElement($element)
-    {
-        $schema = $this->getSchema();
-        $elementXml = $this->_parseElement($element);
-        $schema->appendChild($elementXml);
-        return 'tns:' . $element['name'];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Exception.php b/airtime_mvc/library/Zend/Soap/Wsdl/Exception.php
deleted file mode 100644
index 8b9377274..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once "Zend/Exception.php";
-
-/**
- * Zend_Soap_Wsdl_Exception
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Exception extends Zend_Exception { }
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Abstract.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Abstract.php
deleted file mode 100644
index 2a1533036..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Abstract.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Interface
- */
-require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
-
-/**
- * Abstract class for Zend_Soap_Wsdl_Strategy.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Soap_Wsdl_Strategy_Abstract implements Zend_Soap_Wsdl_Strategy_Interface
-{
-    /**
-     * Context object
-     *
-     * @var Zend_Soap_Wsdl
-     */
-    protected $_context;
-
-    /**
-     * Set the Zend_Soap_Wsdl Context object this strategy resides in.
-     *
-     * @param Zend_Soap_Wsdl $context
-     * @return void
-     */
-    public function setContext(Zend_Soap_Wsdl $context)
-    {
-        $this->_context = $context;
-    }
-
-    /**
-     * Return the current Zend_Soap_Wsdl context object
-     *
-     * @return Zend_Soap_Wsdl
-     */
-    public function getContext()
-    {
-        return $this->_context;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/AnyType.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/AnyType.php
deleted file mode 100644
index c9524e61f..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/AnyType.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AnyType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Interface
- */
-require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
-
-/**
- * Zend_Soap_Wsdl_Strategy_AnyType
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interface
-{
-    /**
-     * Not needed in this strategy.
-     *
-     * @param Zend_Soap_Wsdl $context
-     */
-    public function setContext(Zend_Soap_Wsdl $context)
-    {
-
-    }
-
-    /**
-     * Returns xsd:anyType regardless of the input.
-     *
-     * @param string $type
-     * @return string
-     */
-    public function addComplexType($type)
-    {
-        return 'xsd:anyType';
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
deleted file mode 100644
index db1e3b040..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ArrayOfTypeComplex.php 20784 2010-01-31 08:22:51Z yoshida@zend.co.jp $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType
- */
-require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php";
-
-/**
- * Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy_DefaultComplexType
-{
-    protected $_inProcess = array();
-
-    /**
-     * Add an ArrayOfType based on the xsd:complexType syntax if type[] is detected in return value doc comment.
-     *
-     * @param string $type
-     * @return string tns:xsd-type
-     */
-    public function addComplexType($type)
-    {
-        if(in_array($type, $this->_inProcess)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception("Infinite recursion, cannot nest '".$type."' into itself.");
-        }
-        $this->_inProcess[$type] = $type;
-
-        $nestingLevel = $this->_getNestedCount($type);
-
-        if($nestingLevel > 1) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception(
-                "ArrayOfTypeComplex cannot return nested ArrayOfObject deeper than ".
-                "one level. Use array object properties to return deep nested data.
-            ");
-        }
-
-        $singularType = $this->_getSingularPhpType($type);
-
-        if(!class_exists($singularType)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception(sprintf(
-                "Cannot add a complex type %s that is not an object or where ".
-                "class could not be found in 'DefaultComplexType' strategy.", $type
-            ));
-        }
-
-        if($nestingLevel == 1) {
-            // The following blocks define the Array of Object structure
-            $xsdComplexTypeName = $this->_addArrayOfComplexType($singularType, $type);
-        } else {
-            $xsdComplexTypeName = $singularType;
-        }
-
-        // The array for the objects has been created, now build the object definition:
-        if(!in_array($singularType, $this->getContext()->getTypes())) {
-            parent::addComplexType($singularType);
-        }
-
-        unset($this->_inProcess[$type]);
-        return "tns:".$xsdComplexTypeName;
-    }
-
-    protected function _addArrayOfComplexType($singularType, $type)
-    {
-        $dom = $this->getContext()->toDomDocument();
-
-        $xsdComplexTypeName = $this->_getXsdComplexTypeName($singularType);
-
-        if(!in_array($xsdComplexTypeName, $this->getContext()->getTypes())) {
-            $complexType = $dom->createElement('xsd:complexType');
-            $complexType->setAttribute('name', $xsdComplexTypeName);
-
-            $complexContent = $dom->createElement("xsd:complexContent");
-            $complexType->appendChild($complexContent);
-
-            $xsdRestriction = $dom->createElement("xsd:restriction");
-            $xsdRestriction->setAttribute('base', 'soap-enc:Array');
-            $complexContent->appendChild($xsdRestriction);
-
-            $xsdAttribute = $dom->createElement("xsd:attribute");
-            $xsdAttribute->setAttribute("ref", "soap-enc:arrayType");
-            $xsdAttribute->setAttribute("wsdl:arrayType", sprintf("tns:%s[]", $singularType));
-            $xsdRestriction->appendChild($xsdAttribute);
-
-            $this->getContext()->getSchema()->appendChild($complexType);
-            $this->getContext()->addType($xsdComplexTypeName);
-        }
-
-        return $xsdComplexTypeName;
-    }
-
-    protected function _getXsdComplexTypeName($type)
-    {
-        return sprintf('ArrayOf%s', $type);
-    }
-
-    /**
-     * From a nested definition with type[], get the singular PHP Type
-     *
-     * @param  string $type
-     * @return string
-     */
-    protected function _getSingularPhpType($type)
-    {
-        return str_replace("[]", "", $type);
-    }
-
-    /**
-     * Return the array nesting level based on the type name
-     *
-     * @param  string $type
-     * @return integer
-     */
-    protected function _getNestedCount($type)
-    {
-        return substr_count($type, "[]");
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
deleted file mode 100644
index 0858ee1d8..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ArrayOfTypeSequence.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType
- */
-require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php";
-
-/**
- * Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence extends Zend_Soap_Wsdl_Strategy_DefaultComplexType
-{
-    /**
-     * Add an unbounded ArrayOfType based on the xsd:sequence syntax if type[] is detected in return value doc comment.
-     *
-     * @param string $type
-     * @return string tns:xsd-type
-     */
-    public function addComplexType($type)
-    {
-        $nestedCounter = $this->_getNestedCount($type);
-
-        if($nestedCounter > 0) {
-            $singularType = $this->_getSingularType($type);
-
-            for($i = 1; $i <= $nestedCounter; $i++) {
-                $complexTypeName = substr($this->_getTypeNameBasedOnNestingLevel($singularType, $i), 4);
-                $childTypeName = $this->_getTypeNameBasedOnNestingLevel($singularType, $i-1);
-
-                $this->_addElementFromWsdlAndChildTypes($complexTypeName, $childTypeName);
-            }
-            // adding the PHP type which is resolved to a nested XSD type. therefore add only once.
-            $this->getContext()->addType($complexTypeName);
-
-            return "tns:$complexTypeName";
-        } else if (!in_array($type, $this->getContext()->getTypes())) {
-            // New singular complex type
-            return parent::addComplexType($type);
-        } else {
-            // Existing complex type
-            return $this->getContext()->getType($type);
-        }
-    }
-
-    /**
-     * Return the ArrayOf or simple type name based on the singular xsdtype and the nesting level
-     *
-     * @param  string $singularType
-     * @param  int    $level
-     * @return string
-     */
-    protected function _getTypeNameBasedOnNestingLevel($singularType, $level)
-    {
-        if($level == 0) {
-            // This is not an Array anymore, return the xsd simple type
-            return $singularType;
-        } else {
-            $prefix = str_repeat("ArrayOf", $level);
-            $xsdType = $this->_getStrippedXsdType($singularType);
-            $arrayType = $prefix.$xsdType;
-            return "tns:$arrayType";
-        }
-    }
-
-    /**
-     * Strip the xsd: from a singularType and Format it nice for ArrayOf<Type> naming
-     *
-     * @param  string $singularType
-     * @return string
-     */
-    protected function _getStrippedXsdType($singularType)
-    {
-        return ucfirst(substr(strtolower($singularType), 4));
-    }
-
-    /**
-     * From a nested defintion with type[], get the singular xsd:type
-     *
-     * @throws Zend_Soap_Wsdl_Exception When no xsd:simpletype can be detected.
-     * @param  string $type
-     * @return string
-     */
-    protected function _getSingularType($type)
-    {
-        $singulartype = $this->getContext()->getType(str_replace("[]", "", $type));
-        return $singulartype;
-    }
-
-    /**
-     * Return the array nesting level based on the type name
-     *
-     * @param  string $type
-     * @return integer
-     */
-    protected function _getNestedCount($type)
-    {
-        return substr_count($type, "[]");
-    }
-
-    /**
-     * Append the complex type definition to the WSDL via the context access
-     *
-     * @param  string $arrayType
-     * @param  string $childTypeName
-     * @return void
-     */
-    protected function _addElementFromWsdlAndChildTypes($arrayType, $childTypeName)
-    {
-        if (!in_array($arrayType, $this->getContext()->getTypes())) {
-            $dom = $this->getContext()->toDomDocument();
-
-            $complexType = $dom->createElement('xsd:complexType');
-            $complexType->setAttribute('name', $arrayType);
-
-            $sequence = $dom->createElement('xsd:sequence');
-
-            $element = $dom->createElement('xsd:element');
-            $element->setAttribute('name',      'item');
-            $element->setAttribute('type',      $childTypeName);
-            $element->setAttribute('minOccurs', 0);
-            $element->setAttribute('maxOccurs', 'unbounded');
-            $sequence->appendChild($element);
-
-            $complexType->appendChild($sequence);
-
-            $this->getContext()->getSchema()->appendChild($complexType);
-            $this->getContext()->addType($arrayType);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Composite.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Composite.php
deleted file mode 100644
index 6037dfa7d..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Composite.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Composite.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Interface
- */
-require_once "Zend/Soap/Wsdl/Strategy/Interface.php";
-
-/**
- * Zend_Soap_Wsdl_Strategy_Composite
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Interface
-{
-    /**
-     * Typemap of Complex Type => Strategy pairs.
-     *
-     * @var array
-     */
-    protected $_typeMap = array();
-
-    /**
-     * Default Strategy of this composite
-     *
-     * @var string|Zend_Soap_Wsdl_Strategy_Interface
-     */
-    protected $_defaultStrategy;
-
-    /**
-     * Context WSDL file that this composite serves
-     *
-     * @var Zend_Soap_Wsdl|null
-     */
-    protected $_context;
-
-    /**
-     * Construct Composite WSDL Strategy.
-     *
-     * @throws Zend_Soap_Wsdl_Exception
-     * @param array $typeMap
-     * @param string|Zend_Soap_Wsdl_Strategy_Interface $defaultStrategy
-     */
-    public function __construct(array $typeMap=array(), $defaultStrategy="Zend_Soap_Wsdl_Strategy_DefaultComplexType")
-    {
-        foreach($typeMap AS $type => $strategy) {
-            $this->connectTypeToStrategy($type, $strategy);
-        }
-        $this->_defaultStrategy = $defaultStrategy;
-    }
-
-    /**
-     * Connect a complex type to a given strategy.
-     *
-     * @throws Zend_Soap_Wsdl_Exception
-     * @param  string $type
-     * @param  string|Zend_Soap_Wsdl_Strategy_Interface $strategy
-     * @return Zend_Soap_Wsdl_Strategy_Composite
-     */
-    public function connectTypeToStrategy($type, $strategy)
-    {
-        if(!is_string($type)) {
-            /**
-             * @see Zend_Soap_Wsdl_Exception
-             */
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception("Invalid type given to Composite Type Map.");
-        }
-        $this->_typeMap[$type] = $strategy;
-        return $this;
-    }
-
-    /**
-     * Return default strategy of this composite
-     *
-     * @throws Zend_Soap_Wsdl_Exception
-     * @param  string $type
-     * @return Zend_Soap_Wsdl_Strategy_Interface
-     */
-    public function getDefaultStrategy()
-    {
-        $strategy = $this->_defaultStrategy;
-        if(is_string($strategy) && class_exists($strategy)) {
-            $strategy = new $strategy;
-        }
-        if( !($strategy instanceof Zend_Soap_Wsdl_Strategy_Interface) ) {
-            /**
-             * @see Zend_Soap_Wsdl_Exception
-             */
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception(
-                "Default Strategy for Complex Types is not a valid strategy object."
-            );
-        }
-        $this->_defaultStrategy = $strategy;
-        return $strategy;
-    }
-
-    /**
-     * Return specific strategy or the default strategy of this type.
-     *
-     * @throws Zend_Soap_Wsdl_Exception
-     * @param  string $type
-     * @return Zend_Soap_Wsdl_Strategy_Interface
-     */
-    public function getStrategyOfType($type)
-    {
-        if(isset($this->_typeMap[$type])) {
-            $strategy = $this->_typeMap[$type];
-
-            if(is_string($strategy) && class_exists($strategy)) {
-                $strategy = new $strategy();
-            }
-
-            if( !($strategy instanceof Zend_Soap_Wsdl_Strategy_Interface) ) {
-                /**
-                 * @see Zend_Soap_Wsdl_Exception
-                 */
-                require_once "Zend/Soap/Wsdl/Exception.php";
-                throw new Zend_Soap_Wsdl_Exception(
-                    "Strategy for Complex Type '".$type."' is not a valid strategy object."
-                );
-            }
-            $this->_typeMap[$type] = $strategy;
-        } else {
-            $strategy = $this->getDefaultStrategy();
-        }
-        return $strategy;
-    }
-
-    /**
-     * Method accepts the current WSDL context file.
-     *
-     * @param Zend_Soap_Wsdl $context
-     */
-    public function setContext(Zend_Soap_Wsdl $context)
-    {
-        $this->_context = $context;
-        return $this;
-    }
-
-    /**
-     * Create a complex type based on a strategy
-     *
-     * @throws Zend_Soap_Wsdl_Exception
-     * @param  string $type
-     * @return string XSD type
-     */
-    public function addComplexType($type)
-    {
-        if(!($this->_context instanceof Zend_Soap_Wsdl) ) {
-            /**
-             * @see Zend_Soap_Wsdl_Exception
-             */
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception(
-                "Cannot add complex type '".$type."', no context is set for this composite strategy."
-            );
-        }
-
-        $strategy = $this->getStrategyOfType($type);
-        $strategy->setContext($this->_context);
-        return $strategy->addComplexType($type);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
deleted file mode 100644
index fc04b3946..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DefaultComplexType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Soap_Wsdl_Strategy_Abstract
- */
-require_once "Zend/Soap/Wsdl/Strategy/Abstract.php";
-
-/**
- * Zend_Soap_Wsdl_Strategy_DefaultComplexType
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy_Abstract
-{
-    /**
-     * Add a complex type by recursivly using all the class properties fetched via Reflection.
-     *
-     * @param  string $type Name of the class to be specified
-     * @return string XSD Type for the given PHP type
-     */
-    public function addComplexType($type)
-    {
-        if(!class_exists($type)) {
-            require_once "Zend/Soap/Wsdl/Exception.php";
-            throw new Zend_Soap_Wsdl_Exception(sprintf(
-                "Cannot add a complex type %s that is not an object or where ".
-                "class could not be found in 'DefaultComplexType' strategy.", $type
-            ));
-        }
-
-        $dom = $this->getContext()->toDomDocument();
-        $class = new ReflectionClass($type);
-
-        $complexType = $dom->createElement('xsd:complexType');
-        $complexType->setAttribute('name', $type);
-
-        $all = $dom->createElement('xsd:all');
-
-        foreach ($class->getProperties() as $property) {
-            if ($property->isPublic() && preg_match_all('/@var\s+([^\s]+)/m', $property->getDocComment(), $matches)) {
-
-                /**
-                 * @todo check if 'xsd:element' must be used here (it may not be compatible with using 'complexType'
-                 * node for describing other classes used as attribute types for current class
-                 */
-                $element = $dom->createElement('xsd:element');
-                $element->setAttribute('name', $property->getName());
-                $element->setAttribute('type', $this->getContext()->getType(trim($matches[1][0])));
-                $all->appendChild($element);
-            }
-        }
-
-        $complexType->appendChild($all);
-        $this->getContext()->getSchema()->appendChild($complexType);
-        $this->getContext()->addType($type);
-
-        return "tns:$type";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Interface.php b/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Interface.php
deleted file mode 100644
index d53d4f62e..000000000
--- a/airtime_mvc/library/Zend/Soap/Wsdl/Strategy/Interface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for Zend_Soap_Wsdl_Strategy.
- *
- * @category   Zend
- * @package    Zend_Soap
- * @subpackage Wsdl
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Soap_Wsdl_Strategy_Interface
-{
-    /**
-     * Method accepts the current WSDL context file.
-     *
-     * @param <type> $context
-     */
-    public function setContext(Zend_Soap_Wsdl $context);
-
-    /**
-     * Create a complex type based on a strategy
-     *
-     * @param  string $type
-     * @return string XSD type
-     */
-    public function addComplexType($type);
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tag/Cloud.php b/airtime_mvc/library/Zend/Tag/Cloud.php
deleted file mode 100644
index 0bae3c2e2..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tag_Item
- */
-require_once 'Zend/Tag/Item.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Cloud
-{
-    /**
-     * Decorator for the cloud
-     *
-     * @var Zend_Tag_Cloud_Decorator_Cloud
-     */
-    protected $_cloudDecorator = null;
-
-    /**
-     * Decorator for the tags
-     *
-     * @var Zend_Tag_Cloud_Decorator_Tag
-     */
-    protected $_tagDecorator = null;
-
-    /**
-     * List of all tags
-     *
-     * @var Zend_Tag_ItemList
-     */
-    protected $_tags = null;
-
-    /**
-     * Plugin loader for decorators
-     *
-     * @var Zend_Loader_PluginLoader
-     */
-    protected $_pluginLoader = null;
-
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Create a new tag cloud with options
-     *
-     * @param mixed $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set options from Zend_Config
-     *
-     * @param  Zend_Config $config
-     * @return Zend_Tag_Cloud
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        $this->setOptions($config->toArray());
-
-        return $this;
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for Zend_Tag_Cloud
-     * @return Zend_Tag_Cloud
-     */
-    public function setOptions(array $options)
-    {
-        if (isset($options['prefixPath'])) {
-            $this->addPrefixPaths($options['prefixPath']);
-            unset($options['prefixPath']);
-        }
-
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the tags for the tag cloud.
-     *
-     * $tags should be an array containing single tags as array. Each tag
-     * array should at least contain the keys 'title' and 'weight'. Optionally
-     * you may supply the key 'url', to which the tag links to. Any additional
-     * parameter in the array is silently ignored and can be used by custom
-     * decorators.
-     *
-     * @param  array $tags
-     * @return Zend_Tag_Cloud
-     */
-    public function setTags(array $tags)
-    {
-        // Validate and cleanup the tags
-        $itemList = $this->getItemList();
-
-        foreach ($tags as $tag) {
-            if ($tag instanceof Zend_Tag_Taggable) {
-                $itemList[] = $tag;
-            } else if (is_array($tag)) {
-                $itemList[] = new Zend_Tag_Item($tag);
-            } else {
-                require_once 'Zend/Tag/Cloud/Exception.php';
-                throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array');
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Append a single tag to the cloud
-     *
-     * @param  Zend_Tag_Taggable|array $tag
-     * @return Zend_Tag_Cloud
-     */
-    public function appendTag($tag)
-    {
-        $tags = $this->getItemList();
-        if ($tag instanceof Zend_Tag_Taggable) {
-            $tags[] = $tag;
-        } else if (is_array($tag)) {
-            $tags[] = new Zend_Tag_Item($tag);
-        } else {
-            require_once 'Zend/Tag/Cloud/Exception.php';
-            throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the item list
-     *
-     * @param  Zend_Tag_ItemList $itemList
-     * @return Zend_Tag_Cloud
-     */
-    public function setItemList(Zend_Tag_ItemList $itemList)
-    {
-        $this->_tags = $itemList;
-        return $this;
-    }
-
-    /**
-     * Retrieve the item list
-     *
-     * If item list is undefined, creates one.
-     *
-     * @return Zend_Tag_ItemList
-     */
-    public function getItemList()
-    {
-        if (null === $this->_tags) {
-            require_once 'Zend/Tag/ItemList.php';
-            $this->setItemList(new Zend_Tag_ItemList());
-        }
-        return $this->_tags;
-    }
-
-    /**
-     * Set the decorator for the cloud
-     *
-     * @param  mixed $decorator
-     * @return Zend_Tag_Cloud
-     */
-    public function setCloudDecorator($decorator)
-    {
-        $options = null;
-
-        if (is_array($decorator)) {
-            if (isset($decorator['options'])) {
-                $options = $decorator['options'];
-            }
-
-            if (isset($decorator['decorator'])) {
-                $decorator = $decorator['decorator'];
-            }
-        }
-
-        if (is_string($decorator)) {
-            $classname = $this->getPluginLoader()->load($decorator);
-            $decorator = new $classname($options);
-        }
-
-        if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Cloud)) {
-            require_once 'Zend/Tag/Cloud/Exception.php';
-            throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Cloud');
-        }
-
-        $this->_cloudDecorator = $decorator;
-
-        return $this;
-    }
-
-    /**
-     * Get the decorator for the cloud
-     *
-     * @return Zend_Tag_Cloud_Decorator_Cloud
-     */
-    public function getCloudDecorator()
-    {
-        if (null === $this->_cloudDecorator) {
-            $this->setCloudDecorator('htmlCloud');
-        }
-        return $this->_cloudDecorator;
-    }
-
-    /**
-     * Set the decorator for the tags
-     *
-     * @param  mixed $decorator
-     * @return Zend_Tag_Cloud
-     */
-    public function setTagDecorator($decorator)
-    {
-        $options = null;
-
-        if (is_array($decorator)) {
-            if (isset($decorator['options'])) {
-                $options = $decorator['options'];
-            }
-
-            if (isset($decorator['decorator'])) {
-                $decorator = $decorator['decorator'];
-            }
-        }
-
-        if (is_string($decorator)) {
-            $classname = $this->getPluginLoader()->load($decorator);
-            $decorator = new $classname($options);
-        }
-
-        if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Tag)) {
-            require_once 'Zend/Tag/Cloud/Exception.php';
-            throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Tag');
-        }
-
-        $this->_tagDecorator = $decorator;
-
-        return $this;
-    }
-
-    /**
-     * Get the decorator for the tags
-     *
-     * @return Zend_Tag_Cloud_Decorator_Tag
-     */
-    public function getTagDecorator()
-    {
-        if (null === $this->_tagDecorator) {
-            $this->setTagDecorator('htmlTag');
-        }
-        return $this->_tagDecorator;
-    }
-
-    /**
-     * Set plugin loaders for use with decorators
-     *
-     * @param  Zend_Loader_PluginLoader_Interface $loader
-     * @return Zend_Tag_Cloud
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader)
-    {
-        $this->_pluginLoader = $loader;
-        return $this;
-    }
-
-    /**
-     * Get the plugin loader for decorators
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader()
-    {
-        if ($this->_pluginLoader === null) {
-            $prefix     = 'Zend_Tag_Cloud_Decorator_';
-            $pathPrefix = 'Zend/Tag/Cloud/Decorator/';
-
-            require_once 'Zend/Loader/PluginLoader.php';
-            $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix));
-        }
-
-        return $this->_pluginLoader;
-    }
-
-    /**
-     * Add many prefix paths at once
-     *
-     * @param  array $paths
-     * @return Zend_Tag_Cloud
-     */
-    public function addPrefixPaths(array $paths)
-    {
-        if (isset($paths['prefix']) && isset($paths['path'])) {
-            return $this->addPrefixPath($paths['prefix'], $paths['path']);
-        }
-
-        foreach ($paths as $path) {
-            if (!isset($path['prefix']) || !isset($path['path'])) {
-                continue;
-            }
-
-            $this->addPrefixPath($path['prefix'], $path['path']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add prefix path for plugin loader
-     *
-     * @param  string $prefix
-     * @param  string $path
-     * @return Zend_Tag_Cloud
-     */
-    public function addPrefixPath($prefix, $path)
-    {
-        $loader = $this->getPluginLoader();
-        $loader->addPrefixPath($prefix, $path);
-
-        return $this;
-    }
-
-    /**
-     * Render the tag cloud
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $tags = $this->getItemList();
-
-        if (count($tags) === 0) {
-            return '';
-        }
-
-        $tagsResult  = $this->getTagDecorator()->render($tags);
-        $cloudResult = $this->getCloudDecorator()->render($tagsResult);
-
-        return $cloudResult;
-    }
-
-    /**
-     * Render the tag cloud
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $result = $this->render();
-            return $result;
-        } catch (Exception $e) {
-            $message = "Exception caught by tag cloud: " . $e->getMessage()
-                     . "\nStack Trace:\n" . $e->getTraceAsString();
-            trigger_error($message, E_USER_WARNING);
-            return '';
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Cloud.php b/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Cloud.php
deleted file mode 100644
index 1ba44139a..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Cloud.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class for cloud decorators
- *
- * @category  Zend
- * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tag_Cloud_Decorator_Cloud
-{
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Create a new cloud decorator with options
-     *
-     * @param mixed $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for the decorator
-     * @return Zend_Tag_Cloud
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Render a list of formatted tags
-     *
-     * @param  array $tags
-     * @return string
-     */
-    abstract public function render(array $tags);
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Exception.php b/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Exception.php
deleted file mode 100644
index 861a9d57b..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Tag_Cloud_Exception
- */
-require_once 'Zend/Tag/Cloud/Exception.php';
-
-/**
- * Exception class for Zend_Tag_Cloud_Decorator
- *
- * @category  Zend
- * @package   Zend_Tag
- * @uses      Zend_Tag_Cloud_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Cloud_Decorator_Exception extends Zend_Tag_Cloud_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
deleted file mode 100644
index 551cdd7af..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlCloud.php 20104 2010-01-06 21:26:01Z matthew $
- */
-
-/**
- * @see Zend_Tag_Cloud_Decorator_Cloud
- */
-require_once 'Zend/Tag/Cloud/Decorator/Cloud.php';
-
-/**
- * Simple HTML decorator for clouds
- *
- * @category  Zend
- * @package   Zend_Tag
- * @uses      Zend_Tag_Cloud_Decorator_Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Cloud_Decorator_HtmlCloud extends Zend_Tag_Cloud_Decorator_Cloud
-{
-    /**
-     * @var string Encoding to use
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * List of HTML tags
-     *
-     * @var array
-     */
-    protected $_htmlTags = array(
-        'ul' => array('class' => 'Zend_Tag_Cloud')
-    );
-
-    /**
-     * Separator for the single tags
-     *
-     * @var string
-     */
-    protected $_separator = ' ';
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param string
-     * @return Zend_Tag_Cloud_Decorator_HtmlCloud
-     */
-    public function setEncoding($value)
-    {
-        $this->_encoding = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Set the HTML tags surrounding all tags
-     *
-     * @param  array $htmlTags
-     * @return Zend_Tag_Cloud_Decorator_HtmlCloud
-     */
-    public function setHtmlTags(array $htmlTags)
-    {
-        $this->_htmlTags = $htmlTags;
-        return $this;
-    }
-
-    /**
-     * Retrieve HTML tag map
-     *
-     * @return array
-     */
-    public function getHtmlTags()
-    {
-        return $this->_htmlTags;
-    }
-
-    /**
-     * Set the separator between the single tags
-     *
-     * @param  string
-     * @return Zend_Tag_Cloud_Decorator_HtmlCloud
-     */
-    public function setSeparator($separator)
-    {
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * Get tag separator
-     *
-     * @return string
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Defined by Zend_Tag_Cloud_Decorator_Cloud
-     *
-     * @param  array $tags
-     * @return string
-     */
-    public function render(array $tags)
-    {
-        $cloudHtml = implode($this->getSeparator(), $tags);
-
-        $enc = $this->getEncoding();
-        foreach ($this->getHtmlTags() as $key => $data) {
-            if (is_array($data)) {
-                $htmlTag    = $key;
-                $attributes = '';
-
-                foreach ($data as $param => $value) {
-                    $attributes .= ' ' . $param . '="' . htmlspecialchars($value, ENT_COMPAT, $enc) . '"';
-                }
-            } else {
-                $htmlTag    = $data;
-                $attributes = '';
-            }
-
-            $cloudHtml = sprintf('<%1$s%3$s>%2$s</%1$s>', $htmlTag, $cloudHtml, $attributes);
-        }
-
-        return $cloudHtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
deleted file mode 100644
index 0713635f9..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlTag.php 20104 2010-01-06 21:26:01Z matthew $
- */
-
-/**
- * @see Zend_Tag_Cloud_Decorator_Tag
- */
-require_once 'Zend/Tag/Cloud/Decorator/Tag.php';
-
-/**
- * Simple HTML decorator for tags
- *
- * @category  Zend
- * @package   Zend_Tag
- * @uses      Zend_Tag_Cloud_Decorator_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag
-{
-    /**
-     * List of tags which get assigned to the inner element instead of
-     * font-sizes.
-     *
-     * @var array
-     */
-    protected $_classList = null;
-
-    /**
-     * @var string Encoding to utilize
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Unit for the fontsize
-     *
-     * @var string
-     */
-    protected $_fontSizeUnit = 'px';
-
-    /**
-     * Allowed fontsize units
-     *
-     * @var array
-     */
-    protected $_alloweFontSizeUnits = array('em', 'ex', 'px', 'in', 'cm', 'mm', 'pt', 'pc', '%');
-
-    /**
-     * List of HTML tags
-     *
-     * @var array
-     */
-    protected $_htmlTags = array(
-        'li'
-    );
-
-    /**
-     * Maximum fontsize
-     *
-     * @var integer
-     */
-    protected $_maxFontSize = 20;
-
-    /**
-     * Minimum fontsize
-     *
-     * @var integer
-     */
-    protected $_minFontSize = 10;
-
-    /**
-     * Set a list of classes to use instead of fontsizes
-     *
-     * @param  array $classList
-     * @throws Zend_Tag_Cloud_Decorator_Exception When the classlist is empty
-     * @throws Zend_Tag_Cloud_Decorator_Exception When the classlist contains an invalid classname
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setClassList(array $classList = null)
-    {
-        if (is_array($classList)) {
-            if (count($classList) === 0) {
-                require_once 'Zend/Tag/Cloud/Decorator/Exception.php';
-                throw new Zend_Tag_Cloud_Decorator_Exception('Classlist is empty');
-            }
-
-            foreach ($classList as $class) {
-                if (!is_string($class)) {
-                    require_once 'Zend/Tag/Cloud/Decorator/Exception.php';
-                    throw new Zend_Tag_Cloud_Decorator_Exception('Classlist contains an invalid classname');
-                }
-            }
-        }
-
-        $this->_classList = $classList;
-        return $this;
-    }
-
-    /**
-     * Get class list
-     *
-     * @return array
-     */
-    public function getClassList()
-    {
-        return $this->_classList;
-    }
-
-    /**
-     * Get encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-         return $this->_encoding;
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param  string $value
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setEncoding($value)
-    {
-        $this->_encoding = (string) $value;
-        return $this;
-    }
-
-    /**
-     * Set the font size unit
-     *
-     * Possible values are: em, ex, px, in, cm, mm, pt, pc and %
-     *
-     * @param  string $fontSizeUnit
-     * @throws Zend_Tag_Cloud_Decorator_Exception When an invalid fontsize unit is specified
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setFontSizeUnit($fontSizeUnit)
-    {
-        if (!in_array($fontSizeUnit, $this->_alloweFontSizeUnits)) {
-            require_once 'Zend/Tag/Cloud/Decorator/Exception.php';
-            throw new Zend_Tag_Cloud_Decorator_Exception('Invalid fontsize unit specified');
-        }
-
-        $this->_fontSizeUnit = (string) $fontSizeUnit;
-        $this->setClassList(null);
-        return $this;
-    }
-
-    /**
-     * Retrieve font size unit
-     *
-     * @return string
-     */
-    public function getFontSizeUnit()
-    {
-        return $this->_fontSizeUnit;
-    }
-     /**
-     * Set the HTML tags surrounding the <a> element
-     *
-     * @param  array $htmlTags
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setHtmlTags(array $htmlTags)
-    {
-        $this->_htmlTags = $htmlTags;
-        return $this;
-    }
-
-    /**
-     * Get HTML tags map
-     *
-     * @return array
-     */
-    public function getHtmlTags()
-    {
-        return $this->_htmlTags;
-    }
-
-    /**
-     * Set maximum font size
-     *
-     * @param  integer $maxFontSize
-     * @throws Zend_Tag_Cloud_Decorator_Exception When fontsize is not numeric
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setMaxFontSize($maxFontSize)
-    {
-        if (!is_numeric($maxFontSize)) {
-            require_once 'Zend/Tag/Cloud/Decorator/Exception.php';
-            throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric');
-        }
-
-        $this->_maxFontSize = (int) $maxFontSize;
-        $this->setClassList(null);
-        return $this;
-    }
-
-    /**
-     * Retrieve maximum font size
-     *
-     * @return int
-     */
-    public function getMaxFontSize()
-    {
-        return $this->_maxFontSize;
-    }
-
-    /**
-     * Set minimum font size
-     *
-     * @param  int $minFontSize
-     * @throws Zend_Tag_Cloud_Decorator_Exception When fontsize is not numeric
-     * @return Zend_Tag_Cloud_Decorator_HtmlTag
-     */
-    public function setMinFontSize($minFontSize)
-    {
-        if (!is_numeric($minFontSize)) {
-            require_once 'Zend/Tag/Cloud/Decorator/Exception.php';
-            throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric');
-        }
-
-        $this->_minFontSize = (int) $minFontSize;
-        $this->setClassList(null);
-        return $this;
-    }
-
-    /**
-     * Retrieve minimum font size
-     *
-     * @return int
-     */
-    public function getMinFontSize()
-    {
-        return $this->_minFontSize;
-    }
-
-    /**
-     * Defined by Zend_Tag_Cloud_Decorator_Tag
-     *
-     * @param  Zend_Tag_ItemList $tags
-     * @return array
-     */
-    public function render(Zend_Tag_ItemList $tags)
-    {
-        if (null === ($weightValues = $this->getClassList())) {
-            $weightValues = range($this->getMinFontSize(), $this->getMaxFontSize());
-        }
-
-        $tags->spreadWeightValues($weightValues);
-
-        $result = array();
-
-        $enc = $this->getEncoding();
-        foreach ($tags as $tag) {
-            if (null === ($classList = $this->getClassList())) {
-                $attribute = sprintf('style="font-size: %d%s;"', $tag->getParam('weightValue'), $this->getFontSizeUnit());
-            } else {
-                $attribute = sprintf('class="%s"', htmlspecialchars($tag->getParam('weightValue'), ENT_COMPAT, $enc));
-            }
-
-            $tagHtml = sprintf('<a href="%s" %s>%s</a>', htmlSpecialChars($tag->getParam('url'), ENT_COMPAT, $enc), $attribute, $tag->getTitle());
-
-            foreach ($this->getHtmlTags() as $key => $data) {
-                if (is_array($data)) {
-                    $htmlTag    = $key;
-                    $attributes = '';
-
-                    foreach ($data as $param => $value) {
-                        $attributes .= ' ' . $param . '="' . htmlspecialchars($value, ENT_COMPAT, $enc) . '"';
-                    }
-                } else {
-                    $htmlTag    = $data;
-                    $attributes = '';
-                }
-
-                $tagHtml = sprintf('<%1$s%3$s>%2$s</%1$s>', $htmlTag, $tagHtml, $attributes);
-            }
-
-            $result[] = $tagHtml;
-        }
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Tag.php b/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Tag.php
deleted file mode 100644
index fa2b8e1b1..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Decorator/Tag.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Cloud
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class for tag decorators
- *
- * @category  Zend
- * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tag_Cloud_Decorator_Tag
-{
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Create a new cloud decorator with options
-     *
-     * @param mixed $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for the decorator
-     * @return Zend_Tag_Cloud
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Render a list of tags
-     *
-     * @param  Zend_Tag_ItemList $tags
-     * @return array
-     */
-    abstract public function render(Zend_Tag_ItemList $tags);
-}
diff --git a/airtime_mvc/library/Zend/Tag/Cloud/Exception.php b/airtime_mvc/library/Zend/Tag/Cloud/Exception.php
deleted file mode 100644
index b87da63e1..000000000
--- a/airtime_mvc/library/Zend/Tag/Cloud/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Tag_Exception
- */
-require_once 'Zend/Tag/Exception.php';
-
-/**
- * Exception class for Zend_Tag_Cloud
- *
- * @category  Zend
- * @package   Zend_Tag
- * @uses      Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Cloud_Exception extends Zend_Tag_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Tag/Exception.php b/airtime_mvc/library/Zend/Tag/Exception.php
deleted file mode 100644
index ba1825833..000000000
--- a/airtime_mvc/library/Zend/Tag/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Tag
- *
- * @category  Zend
- * @package   Zend_Tag
- * @uses      Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Tag/Item.php b/airtime_mvc/library/Zend/Tag/Item.php
deleted file mode 100644
index 1eec149f8..000000000
--- a/airtime_mvc/library/Zend/Tag/Item.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Item
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tag_Taggable
- */
-require_once 'Zend/Tag/Taggable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @uses       Zend_Tag_Taggable
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_Item implements Zend_Tag_Taggable
-{
-    /**
-     * Title of the tag
-     *
-     * @var string
-     */
-    protected $_title = null;
-
-    /**
-     * Weight of the tag
-     *
-     * @var float
-     */
-    protected $_weight = null;
-
-    /**
-     * Custom parameters
-     *
-     * @var string
-     */
-    protected $_params = array();
-
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'param'
-    );
-
-    /**
-     * Create a new tag according to the options
-     *
-     * @param  array|Zend_Config $options
-     * @throws Zend_Tag_Exception When invalid options are provided
-     * @throws Zend_Tag_Exception When title was not set
-     * @throws Zend_Tag_Exception When weight was not set
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (!is_array($options)) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Invalid options provided to constructor');
-        }
-
-        $this->setOptions($options);
-
-        if ($this->_title === null) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Title was not set');
-        }
-
-        if ($this->_weight === null) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Weight was not set');
-        }
-    }
-
-    /**
-     * Set options of the tag
-     *
-     * @param  array $options
-     * @return Zend_Tag_Item
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . $key;
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Tag_Taggable
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Set the title
-     *
-     * @param  string $title
-     * @throws Zend_Tag_Exception When title is no string
-     * @return Zend_Tag_Item
-     */
-    public function setTitle($title)
-    {
-        if (!is_string($title)) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Title must be a string');
-        }
-
-        $this->_title = (string) $title;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Tag_Taggable
-     *
-     * @return float
-     */
-    public function getWeight()
-    {
-        return $this->_weight;
-    }
-
-    /**
-     * Set the weight
-     *
-     * @param  float $weight
-     * @throws Zend_Tag_Exception When weight is not numeric
-     * @return Zend_Tag_Item
-     */
-    public function setWeight($weight)
-    {
-        if (!is_numeric($weight)) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Weight must be numeric');
-        }
-
-        $this->_weight = (float) $weight;
-        return $this;
-    }
-
-    /**
-     * Set multiple params at once
-     *
-     * @param  array $params
-     * @return Zend_Tag_Item
-     */
-    public function setParams(array $params)
-    {
-        foreach ($params as $name => $value) {
-            $this->setParam($name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Tag_Taggable
-     *
-     * @param  string $name
-     * @param  mixed  $value
-     * @return Zend_Tag_Item
-     */
-    public function setParam($name, $value)
-    {
-        $this->_params[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Tag_Taggable
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getParam($name)
-    {
-        if (isset($this->_params[$name])) {
-            return $this->_params[$name];
-        }
-        return null;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tag/ItemList.php b/airtime_mvc/library/Zend/Tag/ItemList.php
deleted file mode 100644
index 0cd50345c..000000000
--- a/airtime_mvc/library/Zend/Tag/ItemList.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage ItemList
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ItemList.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tag_Taggable
- */
-require_once 'Zend/Tag/Taggable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tag_ItemList implements Countable, SeekableIterator, ArrayAccess
-{
-    /**
-     * Items in this list
-     *
-     * @var array
-     */
-    protected $_items = array();
-
-    /**
-     * Count all items
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return count($this->_items);
-    }
-
-    /**
-     * Spread values in the items relative to their weight
-     *
-     * @param  array $values
-     * @throws Zend_Tag_Exception When value list is empty
-     * @return void
-     */
-    public function spreadWeightValues(array $values)
-    {
-        // Don't allow an empty value list
-        if (count($values) === 0) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Value list may not be empty');
-        }
-
-        // Re-index the array
-        $values = array_values($values);
-
-        // If just a single value is supplied simply assign it to to all tags
-        if (count($values) === 1) {
-            foreach ($this->_items as $item) {
-                $item->setParam('weightValue', $values[0]);
-            }
-        } else {
-            // Calculate min- and max-weight
-            $minWeight = null;
-            $maxWeight = null;
-
-            foreach ($this->_items as $item) {
-                if ($minWeight === null && $maxWeight === null) {
-                    $minWeight = $item->getWeight();
-                    $maxWeight = $item->getWeight();
-                } else {
-                    $minWeight = min($minWeight, $item->getWeight());
-                    $maxWeight = max($maxWeight, $item->getWeight());
-                }
-            }
-
-            // Calculate the thresholds
-            $steps      = count($values);
-            $delta      = ($maxWeight - $minWeight) / ($steps - 1);
-            $thresholds = array();
-
-            for ($i = 0; $i < $steps; $i++) {
-                $thresholds[$i] = floor(100 * log(($minWeight + $i * $delta) + 2));
-            }
-
-            // Then assign the weight values
-            foreach ($this->_items as $item) {
-                $threshold = floor(100 * log($item->getWeight() + 2));
-
-                for ($i = 0; $i < $steps; $i++) {
-                    if ($threshold <= $thresholds[$i]) {
-                        $item->setParam('weightValue', $values[$i]);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Seek to an absolute positio
-     *
-     * @param  integer $index
-     * @throws OutOfBoundsException When the seek position is invalid
-     * @return void
-     */
-    public function seek($index)
-    {
-        $this->rewind();
-        $position = 0;
-
-        while ($position < $index && $this->valid()) {
-            $this->next();
-            $position++;
-        }
-
-        if (!$this->valid()) {
-            throw new OutOfBoundsException('Invalid seek position');
-        }
-    }
-
-    /**
-     * Return the current element
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        return current($this->_items);
-    }
-
-    /**
-     * Move forward to next element
-     *
-     * @return mixed
-     */
-    public function next()
-    {
-        return next($this->_items);
-    }
-
-    /**
-     * Return the key of the current element
-     *
-     * @return mixed
-     */
-    public function key()
-    {
-        return key($this->_items);
-    }
-
-    /**
-     * Check if there is a current element after calls to rewind() or next()
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return ($this->current() !== false);
-    }
-
-    /**
-     * Rewind the Iterator to the first element
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        reset($this->_items);
-    }
-
-    /**
-     * Check if an offset exists
-     *
-     * @param  mixed $offset
-     * @return boolean
-     */
-    public function offsetExists($offset) {
-        return array_key_exists($offset, $this->_items);
-    }
-
-    /**
-     * Get the value of an offset
-     *
-     * @param  mixed $offset
-     * @return Zend_Tag_Taggable
-     */
-    public function offsetGet($offset) {
-        return $this->_items[$offset];
-    }
-
-    /**
-     * Append a new item
-     *
-     * @param  mixed          $offset
-     * @param  Zend_Tag_Taggable $item
-     * @throws OutOfBoundsException When item does not implement Zend_Tag_Taggable
-     * @return void
-     */
-    public function offsetSet($offset, $item) {
-        // We need to make that check here, as the method signature must be
-        // compatible with ArrayAccess::offsetSet()
-        if (!($item instanceof Zend_Tag_Taggable)) {
-            require_once 'Zend/Tag/Exception.php';
-            throw new Zend_Tag_Exception('Item must implement Zend_Tag_Taggable');
-        }
-
-        if ($offset === null) {
-            $this->_items[] = $item;
-        } else {
-            $this->_items[$offset] = $item;
-        }
-    }
-
-    /**
-     * Unset an item
-     *
-     * @param  mixed $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-        unset($this->_items[$offset]);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tag/Taggable.php b/airtime_mvc/library/Zend/Tag/Taggable.php
deleted file mode 100644
index 1247f190e..000000000
--- a/airtime_mvc/library/Zend/Tag/Taggable.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage Item
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Taggable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tag_Taggable
-{
-    /**
-     * Get the title of the tag
-     *
-     * @return string
-     */
-    public function getTitle();
-
-    /**
-     * Get the weight of the tag
-     *
-     * @return float
-     */
-    public function getWeight();
-
-    /**
-     * Set a parameter
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function setParam($name, $value);
-
-    /**
-     * Get a parameter
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getParam($name);
-}
diff --git a/airtime_mvc/library/Zend/Test/DbAdapter.php b/airtime_mvc/library/Zend/Test/DbAdapter.php
deleted file mode 100644
index 37d13f91b..000000000
--- a/airtime_mvc/library/Zend/Test/DbAdapter.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbAdapter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once "Zend/Db/Adapter/Abstract.php";
-
-/**
- * @see Zend_Test_DbStatement
- */
-require_once "Zend/Test/DbStatement.php";
-
-/**
- * @see Zend_Db_Profiler
- */
-require_once 'Zend/Db/Profiler.php';
-
-/**
- * Testing Database Adapter which acts as a stack for SQL Results
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_DbAdapter extends Zend_Db_Adapter_Abstract
-{
-    /**
-     * @var array
-     */
-    protected $_statementStack = array();
-
-    /**
-     * @var boolean
-     */
-    protected $_connected = false;
-
-    /**
-     * @var array
-     */
-    protected $_listTables = array();
-
-    /**
-     * @var array
-     */
-    protected $_lastInsertIdStack = array();
-
-    /**
-     * @var array
-     */
-    protected $_describeTables = array();
-
-    /**
-     * @var string
-     */ 
-    protected $_quoteIdentifierSymbol = '';
-
-    /**
-     * Empty constructor to make it parameterless.
-     */
-    public function __construct()
-    {
-        $profiler = new Zend_Db_Profiler();
-        $profiler->setEnabled(true);
-        $this->setProfiler($profiler);
-    }
-
-    /**
-     * Append a new Statement to the SQL Result Stack.
-     *
-     * @param  Zend_Test_DbStatement $stmt
-     * @return Zend_Test_DbAdapter
-     */
-    public function appendStatementToStack(Zend_Test_DbStatement $stmt)
-    {
-        array_push($this->_statementStack, $stmt);
-        return $this;
-    }
-
-    /**
-     * Append a new Insert Id to the {@see lastInsertId}.
-     *
-     * @param  int|string $id
-     * @return Zend_Test_DbAdapter
-     */
-    public function appendLastInsertIdToStack($id)
-    {
-        array_push($this->_lastInsertIdStack, $id);
-        return $this;
-    }
-
-    /**
-     * @var string
-     */ 
-    public function setQuoteIdentifierSymbol($symbol)
-    {
-        $this->_quoteIdentifierSymbol = $symbol;
-    }
-
-    /**
-     * Returns the symbol the adapter uses for delimited identifiers.
-     *
-     * @return string
-     */
-    public function getQuoteIdentifierSymbol()
-    {
-        return $this->_quoteIdentifierSymbol;
-    }
-
-    /**
-     * Set the result from {@see listTables()}.
-     *
-     * @param array $listTables
-     */
-    public function setListTables(array $listTables)
-    {
-        $this->_listTables = $listTables;
-    }
-
-    /**
-     * Returns a list of the tables in the database.
-     *
-     * @return array
-     */
-    public function listTables()
-    {
-       return $this->_listTables;
-    }
-
-    /**
-     *
-     * @param  string $table
-     * @param  array $tableInfo
-     * @return Zend_Test_DbAdapter
-     */
-    public function setDescribeTable($table, $tableInfo)
-    {
-        $this->_describeTables[$table] = $tableInfo;
-        return $this;
-    }
-
-    /**
-     * Returns the column descriptions for a table.
-     *
-     * The return value is an associative array keyed by the column name,
-     * as returned by the RDBMS.
-     *
-     * The value of each array element is an associative array
-     * with the following keys:
-     *
-     * SCHEMA_NAME => string; name of database or schema
-     * TABLE_NAME  => string;
-     * COLUMN_NAME => string; column name
-     * COLUMN_POSITION => number; ordinal position of column in table
-     * DATA_TYPE   => string; SQL datatype name of column
-     * DEFAULT     => string; default expression of column, null if none
-     * NULLABLE    => boolean; true if column can have nulls
-     * LENGTH      => number; length of CHAR/VARCHAR
-     * SCALE       => number; scale of NUMERIC/DECIMAL
-     * PRECISION   => number; precision of NUMERIC/DECIMAL
-     * UNSIGNED    => boolean; unsigned property of an integer type
-     * PRIMARY     => boolean; true if column is part of the primary key
-     * PRIMARY_POSITION => integer; position of column in primary key
-     *
-     * @param string $tableName
-     * @param string $schemaName OPTIONAL
-     * @return array
-     */
-    public function describeTable($tableName, $schemaName = null)
-    {
-        if(isset($this->_describeTables[$tableName])) {
-            return $this->_describeTables[$tableName];
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Creates a connection to the database.
-     *
-     * @return void
-     */
-    protected function _connect()
-    {
-        $this->_connected = true;
-    }
-
-    /**
-     * Test if a connection is active
-     *
-     * @return boolean
-     */
-    public function isConnected()
-    {
-        return $this->_connected;
-    }
-
-    /**
-     * Force the connection to close.
-     *
-     * @return void
-     */
-    public function closeConnection()
-    {
-        $this->_connected = false;
-    }
-
-    /**
-     * Prepare a statement and return a PDOStatement-like object.
-     *
-     * @param string|Zend_Db_Select $sql SQL query
-     * @return Zend_Db_Statment|PDOStatement
-     */
-    public function prepare($sql)
-    {
-        $queryId = $this->getProfiler()->queryStart($sql);
-
-        if(count($this->_statementStack)) {
-            $stmt = array_pop($this->_statementStack);
-        } else {
-            $stmt = new Zend_Test_DbStatement();
-        }
-
-        if($this->getProfiler()->getEnabled() == true) {
-            $qp = $this->getProfiler()->getQueryProfile($queryId);
-            $stmt->setQueryProfile($qp);
-        }
-
-        return $stmt;
-    }
-
-    /**
-     * Gets the last ID generated automatically by an IDENTITY/AUTOINCREMENT column.
-     *
-     * As a convention, on RDBMS brands that support sequences
-     * (e.g. Oracle, PostgreSQL, DB2), this method forms the name of a sequence
-     * from the arguments and returns the last id generated by that sequence.
-     * On RDBMS brands that support IDENTITY/AUTOINCREMENT columns, this method
-     * returns the last value generated for such a column, and the table name
-     * argument is disregarded.
-     *
-     * @param string $tableName   OPTIONAL Name of table.
-     * @param string $primaryKey  OPTIONAL Name of primary key column.
-     * @return string
-     */
-    public function lastInsertId($tableName = null, $primaryKey = null)
-    {
-        if(count($this->_lastInsertIdStack)) {
-            return array_pop($this->_lastInsertIdStack);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Begin a transaction.
-     */
-    protected function _beginTransaction()
-    {
-        return;
-    }
-
-    /**
-     * Commit a transaction.
-     */
-    protected function _commit()
-    {
-        return;
-    }
-
-    /**
-     * Roll-back a transaction.
-     */
-    protected function _rollBack()
-    {
-
-    }
-
-    /**
-     * Set the fetch mode.
-     *
-     * @param integer $mode
-     * @return void
-     * @throws Zend_Db_Adapter_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        return;
-    }
-
-    /**
-     * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     *
-     * @param mixed $sql
-     * @param integer $count
-     * @param integer $offset
-     * @return string
-     */
-    public function limit($sql, $count, $offset = 0)
-    {
-        return sprintf('%s LIMIT %d,%d', $sql, $offset, $count);
-    }
-
-    /**
-     * Check if the adapter supports real SQL parameters.
-     *
-     * @param string $type 'positional' or 'named'
-     * @return bool
-     */
-    public function supportsParameters($type)
-    {
-        return true;
-    }
-
-    /**
-     * Retrieve server version in PHP style
-     *
-     * @return string
-     */
-    function getServerVersion()
-    {
-        return "1.0.0";
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/DbStatement.php b/airtime_mvc/library/Zend/Test/DbStatement.php
deleted file mode 100644
index d09876b55..000000000
--- a/airtime_mvc/library/Zend/Test/DbStatement.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbStatement.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Statement_Interface
- */
-require_once "Zend/Db/Statement/Interface.php";
-
-/**
- * Testing Database Statement that acts as a stack to SQL resultsets.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_DbStatement implements Zend_Db_Statement_Interface
-{
-    /**
-     * @var array
-     */
-    protected $_fetchStack = array();
-
-    /**
-     * @var int
-     */
-    protected $_columnCount = 0;
-
-    /**
-     * @var int
-     */
-    protected $_rowCount = 0;
-
-    /**
-     * @var Zend_Db_Profiler_Query
-     */
-    protected $_queryProfile = null;
-
-    /**
-     * Create a Select statement which returns the given array of rows.
-     *
-     * @param array $rows
-     * @return Zend_Test_DbStatement
-     */
-    static public function createSelectStatement(array $rows=array())
-    {
-        $stmt = new Zend_Test_DbStatement();
-        foreach($rows AS $row) {
-            $stmt->append($row);
-        }
-        return $stmt;
-    }
-
-    /**
-     * Create an Insert Statement
-     *
-     * @param  int $affectedRows
-     * @return Zend_Test_DbStatement
-     */
-    static public function createInsertStatement($affectedRows=0)
-    {
-        return self::_createRowCountStatement($affectedRows);
-    }
-
-    /**
-     * Create an Delete Statement
-     *
-     * @param  int $affectedRows
-     * @return Zend_Test_DbStatement
-     */
-    static public function createDeleteStatement($affectedRows=0)
-    {
-        return self::_createRowCountStatement($affectedRows);
-    }
-
-    /**
-     * Create an Update Statement
-     *
-     * @param  int $affectedRows
-     * @return Zend_Test_DbStatement
-     */
-    static public function createUpdateStatement($affectedRows=0)
-    {
-        return self::_createRowCountStatement($affectedRows);
-    }
-
-    /**
-     * Create a Row Count Statement
-     *
-     * @param  int $affectedRows
-     * @return Zend_Test_DbStatement
-     */
-    static protected function _createRowCountStatement($affectedRows)
-    {
-        $stmt = new Zend_Test_DbStatement();
-        $stmt->setRowCount($affectedRows);
-        return $stmt;
-    }
-
-    /**
-     * @param Zend_Db_Profiler_Query $qp
-     */
-    public function setQueryProfile(Zend_Db_Profiler_Query $qp)
-    {
-        $this->_queryProfile = $qp;
-    }
-
-    /**
-     * @param int $rowCount
-     */
-    public function setRowCount($rowCount)
-    {
-        $this->_rowCount = $rowCount;
-    }
-
-    /**
-     * Append a new row to the fetch stack.
-     *
-     * @param array $row
-     */
-    public function append($row)
-    {
-        $this->_columnCount = count($row);
-        $this->_fetchStack[] = $row;
-    }
-
-    /**
-     * Bind a column of the statement result set to a PHP variable.
-     *
-     * @param string $column Name the column in the result set, either by
-     *                       position or by name.
-     * @param mixed  $param  Reference to the PHP variable containing the value.
-     * @param mixed  $type   OPTIONAL
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindColumn($column, &$param, $type = null)
-    {
-        return true;
-    }
-
-    /**
-     * Binds a parameter to the specified variable name.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $variable  Reference to PHP variable containing the value.
-     * @param mixed $type      OPTIONAL Datatype of SQL parameter.
-     * @param mixed $length    OPTIONAL Length of SQL parameter.
-     * @param mixed $options   OPTIONAL Other options.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindParam($parameter, &$variable, $type = null, $length = null, $options = null)
-    {
-        if($this->_queryProfile !== null) {
-            $this->_queryProfile->bindParam($parameter, $variable);
-        }
-        return true;
-    }
-
-    /**
-     * Binds a value to a parameter.
-     *
-     * @param mixed $parameter Name the parameter, either integer or string.
-     * @param mixed $value     Scalar value to bind to the parameter.
-     * @param mixed $type      OPTIONAL Datatype of the parameter.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function bindValue($parameter, $value, $type = null)
-    {
-        return true;
-    }
-
-    /**
-     * Closes the cursor, allowing the statement to be executed again.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function closeCursor()
-    {
-        return true;
-    }
-
-    /**
-     * Returns the number of columns in the result set.
-     * Returns null if the statement has no result set metadata.
-     *
-     * @return int The number of columns.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function columnCount()
-    {
-        return $this->_columnCount;
-    }
-
-    /**
-     * Retrieves the error code, if any, associated with the last operation on
-     * the statement handle.
-     *
-     * @return string error code.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorCode()
-    {
-        return false;
-    }
-
-    /**
-     * Retrieves an array of error information, if any, associated with the
-     * last operation on the statement handle.
-     *
-     * @return array
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function errorInfo()
-    {
-        return false;
-    }
-
-    /**
-     * Executes a prepared statement.
-     *
-     * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function execute(array $params = array())
-    {
-        if($this->_queryProfile !== null) {
-            $this->_queryProfile->bindParams($params);
-            $this->_queryProfile->end();
-        }
-        return true;
-    }
-
-    /**
-     * Fetches a row from the result set.
-     *
-     * @param int $style  OPTIONAL Fetch mode for this fetch operation.
-     * @param int $cursor OPTIONAL Absolute, relative, or other.
-     * @param int $offset OPTIONAL Number for absolute or relative cursors.
-     * @return mixed Array, object, or scalar depending on fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetch($style = null, $cursor = null, $offset = null)
-    {
-        if(count($this->_fetchStack)) {
-            $row = array_shift($this->_fetchStack);
-            return $row;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns an array containing all of the result set rows.
-     *
-     * @param int $style OPTIONAL Fetch mode.
-     * @param int $col   OPTIONAL Column number, if fetch mode is by column.
-     * @return array Collection of rows, each in a format by the fetch mode.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchAll($style = null, $col = null)
-    {
-        $rows = $this->_fetchStack;
-        $this->_fetchStack = array();
-
-        return $rows;
-    }
-
-    /**
-     * Returns a single column from the next row of a result set.
-     *
-     * @param int $col OPTIONAL Position of the column to fetch.
-     * @return string
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchColumn($col = 0)
-    {
-        $row = $this->fetch();
-
-        if($row == false) {
-            return false;
-        } else {
-            if(count($row) < $col) {
-                require_once "Zend/Db/Statement/Exception.php";
-                throw new Zend_Db_Statement_Exception(
-                    "Column Position '".$col."' is out of bounds."
-                );
-            }
-
-            $keys = array_keys($row);
-            return $row[$keys[$col]];
-        }
-    }
-
-    /**
-     * Fetches the next row and returns it as an object.
-     *
-     * @param string $class  OPTIONAL Name of the class to create.
-     * @param array  $config OPTIONAL Constructor arguments for the class.
-     * @return mixed One object instance of the specified class.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function fetchObject($class = 'stdClass', array $config = array())
-    {
-        if(!class_exists($class)) {
-            throw new Zend_Db_Statement_Exception("Class '".$class."' does not exist!");
-        }
-
-        $object = new $class();
-        $row = $this->fetch();
-        foreach($row AS $k => $v) {
-            $object->$k = $v;
-        }
-
-        return $object;
-    }
-
-    /**
-     * Retrieve a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @return mixed      Attribute value.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function getAttribute($key)
-    {
-        return false;
-    }
-
-    /**
-     * Retrieves the next rowset (result set) for a SQL statement that has
-     * multiple result sets.  An example is a stored procedure that returns
-     * the results of multiple queries.
-     *
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function nextRowset()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the number of rows affected by the execution of the
-     * last INSERT, DELETE, or UPDATE statement executed by this
-     * statement object.
-     *
-     * @return int     The number of rows affected.
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function rowCount()
-    {
-        return $this->_rowCount;
-    }
-
-    /**
-     * Set a statement attribute.
-     *
-     * @param string $key Attribute name.
-     * @param mixed  $val Attribute value.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setAttribute($key, $val)
-    {
-        return true;
-    }
-
-    /**
-     * Set the default fetch mode for this statement.
-     *
-     * @param int   $mode The fetch mode.
-     * @return bool
-     * @throws Zend_Db_Statement_Exception
-     */
-    public function setFetchMode($mode)
-    {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/DomQuery.php b/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
deleted file mode 100644
index 93995e288..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/DomQuery.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DomQuery.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
-/** @see Zend_Dom_Query */
-require_once 'Zend/Dom/Query.php';
-
-/**
- * Zend_Dom_Query-based PHPUnit Constraint
- *
- * @uses       PHPUnit_Framework_Constraint
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint
-{
-    /**#@+
-     * Assertion type constants
-     */
-    const ASSERT_QUERY            = 'assertQuery';
-    const ASSERT_CONTENT_CONTAINS = 'assertQueryContentContains';
-    const ASSERT_CONTENT_REGEX    = 'assertQueryContentRegex';
-    const ASSERT_CONTENT_COUNT    = 'assertQueryCount';
-    const ASSERT_CONTENT_COUNT_MIN= 'assertQueryCountMin';
-    const ASSERT_CONTENT_COUNT_MAX= 'assertQueryCountMax';
-    /**#@-*/
-
-    /**
-     * Current assertion type
-     * @var string
-     */
-    protected $_assertType        = null;
-
-    /**
-     * Available assertion types
-     * @var array
-     */
-    protected $_assertTypes       = array(
-        self::ASSERT_QUERY,
-        self::ASSERT_CONTENT_CONTAINS,
-        self::ASSERT_CONTENT_REGEX,
-        self::ASSERT_CONTENT_COUNT,
-        self::ASSERT_CONTENT_COUNT_MIN,
-        self::ASSERT_CONTENT_COUNT_MAX,
-    );
-
-    /**
-     * Content being matched
-     * @var string
-     */
-    protected $_content           = null;
-
-    /**
-     * Whether or not assertion is negated
-     * @var bool
-     */
-    protected $_negate            = false;
-
-    /**
-     * CSS selector or XPath path to select against
-     * @var string
-     */
-    protected $_path              = null;
-
-    /**
-     * Whether or not to use XPath when querying
-     * @var bool
-     */
-    protected $_useXpath          = false;
-
-    /**
-     * Constructor; setup constraint state
-     *
-     * @param  string $path CSS selector path
-     * @return void
-     */
-    public function __construct($path)
-    {
-        $this->_path = $path;
-    }
-
-    /**
-     * Indicate negative match
-     *
-     * @param  bool $flag
-     * @return void
-     */
-    public function setNegate($flag = true)
-    {
-        $this->_negate = $flag;
-    }
-
-    /**
-     * Whether or not path is a straight XPath expression
-     *
-     * @param  bool $flag
-     * @return Zend_Test_PHPUnit_Constraint_DomQuery
-     */
-    public function setUseXpath($flag = true)
-    {
-        $this->_useXpath = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Evaluate an object to see if it fits the constraints
-     *
-     * @param  string $other String to examine
-     * @param  null|string Assertion type
-     * @return bool
-     */
-    public function evaluate($other, $assertType = null)
-    {
-        if (strstr($assertType, 'Not')) {
-            $this->setNegate(true);
-            $assertType = str_replace('Not', '', $assertType);
-        }
-
-        if (strstr($assertType, 'Xpath')) {
-            $this->setUseXpath(true);
-            $assertType = str_replace('Xpath', 'Query', $assertType);
-        }
-
-        if (!in_array($assertType, $this->_assertTypes)) {
-            require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-            throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__));
-        }
-
-        $this->_assertType = $assertType;
-
-        $method   = $this->_useXpath ? 'queryXpath' : 'query';
-        $domQuery = new Zend_Dom_Query($other);
-        $result   = $domQuery->$method($this->_path);
-        $argv     = func_get_args();
-        $argc     = func_num_args();
-
-        switch ($assertType) {
-            case self::ASSERT_CONTENT_CONTAINS:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match');
-                }
-                $this->_content = $content = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notMatchContent($result, $content)
-                    : $this->_matchContent($result, $content);
-            case self::ASSERT_CONTENT_REGEX:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match');
-                }
-                $this->_content = $content = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notRegexContent($result, $content)
-                    : $this->_regexContent($result, $content);
-            case self::ASSERT_CONTENT_COUNT:
-            case self::ASSERT_CONTENT_COUNT_MIN:
-            case self::ASSERT_CONTENT_COUNT_MAX:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare');
-                }
-                $this->_content = $content = $argv[2];
-                return $this->_countContent($result, $content, $assertType);
-            case self::ASSERT_QUERY:
-            default:
-                if ($this->_negate) {
-                    return (0 == count($result));
-                } else {
-                    return (0 != count($result));
-                }
-        }
-    }
-
-    /**
-     * Report Failure
-     *
-     * @see    PHPUnit_Framework_Constraint for implementation details
-     * @param  mixed $other CSS selector path
-     * @param  string $description
-     * @param  bool $not
-     * @return void
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function fail($other, $description, $not = false)
-    {
-        require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-        switch ($this->_assertType) {
-            case self::ASSERT_CONTENT_CONTAINS:
-                $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content "%s"';
-                }
-                $failure = sprintf($failure, $other, $this->_content);
-                break;
-            case self::ASSERT_CONTENT_REGEX:
-                $failure = 'Failed asserting node denoted by %s CONTAINS content MATCHING "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content MATCHING "%s"';
-                }
-                $failure = sprintf($failure, $other, $this->_content);
-                break;
-            case self::ASSERT_CONTENT_COUNT:
-                $failure = 'Failed asserting node DENOTED BY %s OCCURS EXACTLY %d times';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting node DENOTED BY %s DOES NOT OCCUR EXACTLY %d times';
-                }
-                $failure = sprintf($failure, $other, $this->_content);
-                break;
-            case self::ASSERT_CONTENT_COUNT_MIN:
-                $failure = 'Failed asserting node DENOTED BY %s OCCURS AT LEAST %d times';
-                $failure = sprintf($failure, $other, $this->_content);
-                break;
-            case self::ASSERT_CONTENT_COUNT_MAX:
-                $failure = 'Failed asserting node DENOTED BY %s OCCURS AT MOST %d times';
-                $failure = sprintf($failure, $other, $this->_content);
-                break;
-            case self::ASSERT_QUERY:
-            default:
-                $failure = 'Failed asserting node DENOTED BY %s EXISTS';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting node DENOTED BY %s DOES NOT EXIST';
-                }
-                $failure = sprintf($failure, $other);
-                break;
-        }
-
-        if (!empty($description)) {
-            $failure = $description . "\n" . $failure;
-        }
-
-        throw new Zend_Test_PHPUnit_Constraint_Exception($failure);
-    }
-
-    /**
-     * Complete implementation
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return '';
-    }
-
-    /**
-     * Check to see if content is matched in selected nodes
-     *
-     * @param  Zend_Dom_Query_Result $result
-     * @param  string $match Content to match
-     * @return bool
-     */
-    protected function _matchContent($result, $match)
-    {
-        if (0 == count($result)) {
-            return false;
-        }
-
-        foreach ($result as $node) {
-            $content = $this->_getNodeContent($node);
-            if (strstr($content, $match)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check to see if content is NOT matched in selected nodes
-     *
-     * @param  Zend_Dom_Query_Result $result
-     * @param  string $match
-     * @return bool
-     */
-    protected function _notMatchContent($result, $match)
-    {
-        if (0 == count($result)) {
-            return true;
-        }
-
-        foreach ($result as $node) {
-            $content = $this->_getNodeContent($node);
-            if (strstr($content, $match)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Check to see if content is matched by regex in selected nodes
-     *
-     * @param  Zend_Dom_Query_Result $result
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _regexContent($result, $pattern)
-    {
-        if (0 == count($result)) {
-            return false;
-        }
-
-        foreach ($result as $node) {
-            $content = $this->_getNodeContent($node);
-            if (preg_match($pattern, $content)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check to see if content is NOT matched by regex in selected nodes
-     *
-     * @param  Zend_Dom_Query_Result $result
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _notRegexContent($result, $pattern)
-    {
-        if (0 == count($result)) {
-            return true;
-        }
-
-        foreach ($result as $node) {
-            $content = $this->_getNodeContent($node);
-            if (preg_match($pattern, $content)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine if content count matches criteria
-     *
-     * @param  Zend_Dom_Query_Result $result
-     * @param  int $test Value against which to test
-     * @param  string $type assertion type
-     * @return boolean
-     */
-    protected function _countContent($result, $test, $type)
-    {
-        $count = count($result);
-
-        switch ($type) {
-            case self::ASSERT_CONTENT_COUNT:
-                return ($this->_negate)
-                    ? ($test != $count)
-                    : ($test == $count);
-            case self::ASSERT_CONTENT_COUNT_MIN:
-                return ($count >= $test);
-            case self::ASSERT_CONTENT_COUNT_MAX:
-                return ($count <= $test);
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Get node content, minus node markup tags
-     *
-     * @param  DOMNode $node
-     * @return string
-     */
-    protected function _getNodeContent(DOMNode $node)
-    {
-        if ($node instanceof DOMAttr) {
-            return $node->value;
-        } else {
-            $doc     = $node->ownerDocument;
-            $content = $doc->saveXML($node);
-            $tag     = $node->nodeName;
-            $regex   = '|</?' . $tag . '[^>]*>|';
-            return preg_replace($regex, '', $content);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Exception.php b/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Exception.php
deleted file mode 100644
index 467f3be29..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see PHPUnit_Framework_ExpectationFailedException */
-require_once 'PHPUnit/Framework/ExpectationFailedException.php';
-
-/**
- * Zend_Test_PHPUnit_Constraint_Exception
- *
- * @uses       PHPUnit_Framework_ExpectationFailedException
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Constraint_Exception extends PHPUnit_Framework_ExpectationFailedException
-{
-}
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Redirect.php b/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Redirect.php
deleted file mode 100644
index 3a764175e..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/Redirect.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Redirect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
-/**
- * Redirection constraints
- *
- * @uses       PHPUnit_Framework_Constraint
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint
-{
-    /**#@+
-     * Assertion type constants
-     */
-    const ASSERT_REDIRECT       = 'assertRedirect';
-    const ASSERT_REDIRECT_TO    = 'assertRedirectTo';
-    const ASSERT_REDIRECT_REGEX = 'assertRedirectRegex';
-    /**#@-*/
-
-    /**
-     * Current assertion type
-     * @var string
-     */
-    protected $_assertType      = null;
-
-    /**
-     * Available assertion types
-     * @var array
-     */
-    protected $_assertTypes     = array(
-        self::ASSERT_REDIRECT,
-        self::ASSERT_REDIRECT_TO,
-        self::ASSERT_REDIRECT_REGEX,
-    );
-
-    /**
-     * Pattern to match against
-     * @var string
-     */
-    protected $_match             = null;
-
-    /**
-     * Whether or not assertion is negated
-     * @var bool
-     */
-    protected $_negate            = false;
-
-    /**
-     * Constructor; setup constraint state
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Indicate negative match
-     *
-     * @param  bool $flag
-     * @return void
-     */
-    public function setNegate($flag = true)
-    {
-        $this->_negate = $flag;
-    }
-
-    /**
-     * Evaluate an object to see if it fits the constraints
-     *
-     * @param  string $other String to examine
-     * @param  null|string Assertion type
-     * @return bool
-     */
-    public function evaluate($other, $assertType = null)
-    {
-        if (!$other instanceof Zend_Controller_Response_Abstract) {
-            require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-            throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object');
-        }
-
-        if (strstr($assertType, 'Not')) {
-            $this->setNegate(true);
-            $assertType = str_replace('Not', '', $assertType);
-        }
-
-        if (!in_array($assertType, $this->_assertTypes)) {
-            require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-            throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__));
-        }
-
-        $this->_assertType = $assertType;
-
-        $response = $other;
-        $argv     = func_get_args();
-        $argc     = func_num_args();
-
-        switch ($assertType) {
-            case self::ASSERT_REDIRECT_TO:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match');
-                }
-                $this->_match = $match = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notMatch($response, $match)
-                    : $this->_match($response, $match);
-            case self::ASSERT_REDIRECT_REGEX:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect');
-                }
-                $this->_match = $match = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notRegex($response, $match)
-                    : $this->_regex($response, $match);
-            case self::ASSERT_REDIRECT:
-            default:
-                return ($this->_negate) ? !$response->isRedirect() : $response->isRedirect();
-        }
-    }
-
-    /**
-     * Report Failure
-     *
-     * @see    PHPUnit_Framework_Constraint for implementation details
-     * @param  mixed $other
-     * @param  string $description Additional message to display
-     * @param  bool $not
-     * @return void
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function fail($other, $description, $not = false)
-    {
-        require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-        switch ($this->_assertType) {
-            case self::ASSERT_REDIRECT_TO:
-                $failure = 'Failed asserting response redirects to "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response DOES NOT redirect to "%s"';
-                }
-                $failure = sprintf($failure, $this->_match);
-                break;
-            case self::ASSERT_REDIRECT_REGEX:
-                $failure = 'Failed asserting response redirects to URL MATCHING "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response DOES NOT redirect to URL MATCHING "%s"';
-                }
-                $failure = sprintf($failure, $this->_match);
-                break;
-            case self::ASSERT_REDIRECT:
-            default:
-                $failure = 'Failed asserting response is a redirect';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response is NOT a redirect';
-                }
-                break;
-        }
-
-        if (!empty($description)) {
-            $failure = $description . "\n" . $failure;
-        }
-
-        throw new Zend_Test_PHPUnit_Constraint_Exception($failure);
-    }
-
-    /**
-     * Complete implementation
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return '';
-    }
-
-    /**
-     * Check to see if content is matched in selected nodes
-     *
-     * @param  Zend_Controller_Response_HttpTestCase $response
-     * @param  string $match Content to match
-     * @return bool
-     */
-    protected function _match($response, $match)
-    {
-        if (!$response->isRedirect()) {
-            return false;
-        }
-
-        $headers  = $response->sendHeaders();
-        $redirect = $headers['location'];
-        $redirect = str_replace('Location: ', '', $redirect);
-
-        return ($redirect == $match);
-    }
-
-    /**
-     * Check to see if content is NOT matched in selected nodes
-     *
-     * @param  Zend_Controller_Response_HttpTestCase $response
-     * @param  string $match
-     * @return bool
-     */
-    protected function _notMatch($response, $match)
-    {
-        if (!$response->isRedirect()) {
-            return true;
-        }
-
-        $headers  = $response->sendHeaders();
-        $redirect = $headers['location'];
-        $redirect = str_replace('Location: ', '', $redirect);
-
-        return ($redirect != $match);
-    }
-
-    /**
-     * Check to see if content is matched by regex in selected nodes
-     *
-     * @param  Zend_Controller_Response_HttpTestCase $response
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _regex($response, $pattern)
-    {
-        if (!$response->isRedirect()) {
-            return false;
-        }
-
-        $headers  = $response->sendHeaders();
-        $redirect = $headers['location'];
-        $redirect = str_replace('Location: ', '', $redirect);
-
-        return preg_match($pattern, $redirect);
-    }
-
-    /**
-     * Check to see if content is NOT matched by regex in selected nodes
-     *
-     * @param  Zend_Controller_Response_HttpTestCase $response
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _notRegex($response, $pattern)
-    {
-        if (!$response->isRedirect()) {
-            return true;
-        }
-
-        $headers  = $response->sendHeaders();
-        $redirect = $headers['location'];
-        $redirect = str_replace('Location: ', '', $redirect);
-
-        return !preg_match($pattern, $redirect);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php b/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
deleted file mode 100644
index f11cf1a39..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ResponseHeader.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see PHPUnit_Framework_Constraint */
-require_once 'PHPUnit/Framework/Constraint.php';
-
-/**
- * Response header PHPUnit Constraint
- *
- * @uses       PHPUnit_Framework_Constraint
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint
-{
-    /**#@+
-     * Assertion type constants
-     */
-    const ASSERT_RESPONSE_CODE   = 'assertResponseCode';
-    const ASSERT_HEADER          = 'assertHeader';
-    const ASSERT_HEADER_CONTAINS = 'assertHeaderContains';
-    const ASSERT_HEADER_REGEX    = 'assertHeaderRegex';
-    /**#@-*/
-
-    /**
-     * Current assertion type
-     * @var string
-     */
-    protected $_assertType      = null;
-
-    /**
-     * Available assertion types
-     * @var array
-     */
-    protected $_assertTypes     = array(
-        self::ASSERT_RESPONSE_CODE,
-        self::ASSERT_HEADER,
-        self::ASSERT_HEADER_CONTAINS,
-        self::ASSERT_HEADER_REGEX,
-    );
-
-    /**
-     * @var int Response code
-     */
-    protected $_code              = 200;
-
-    /**
-     * @var string Header
-     */
-    protected $_header            = null;
-
-    /**
-     * @var string pattern against which to compare header content
-     */
-    protected $_match             = null;
-
-    /**
-     * Whether or not assertion is negated
-     * @var bool
-     */
-    protected $_negate            = false;
-
-    /**
-     * Constructor; setup constraint state
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Indicate negative match
-     *
-     * @param  bool $flag
-     * @return void
-     */
-    public function setNegate($flag = true)
-    {
-        $this->_negate = $flag;
-    }
-
-    /**
-     * Evaluate an object to see if it fits the constraints
-     *
-     * @param  Zend_Controller_Response_Abstract $other String to examine
-     * @param  null|string Assertion type
-     * @return bool
-     */
-    public function evaluate($other, $assertType = null)
-    {
-        if (!$other instanceof Zend_Controller_Response_Abstract) {
-            require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-            throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object');
-        }
-
-        if (strstr($assertType, 'Not')) {
-            $this->setNegate(true);
-            $assertType = str_replace('Not', '', $assertType);
-        }
-
-        if (!in_array($assertType, $this->_assertTypes)) {
-            require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-            throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__));
-        }
-
-        $this->_assertType = $assertType;
-
-        $response = $other;
-        $argv     = func_get_args();
-        $argc     = func_num_args();
-
-        switch ($assertType) {
-            case self::ASSERT_RESPONSE_CODE:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match');
-                }
-                $this->_code = $code = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notCode($response, $code)
-                    : $this->_code($response, $code);
-            case self::ASSERT_HEADER:
-                if (3 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match');
-                }
-                $this->_header = $header = $argv[2];
-                return ($this->_negate)
-                    ? $this->_notHeader($response, $header)
-                    : $this->_header($response, $header);
-            case self::ASSERT_HEADER_CONTAINS:
-                if (4 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__);
-                }
-                $this->_header = $header = $argv[2];
-                $this->_match  = $match  = $argv[3];
-                return ($this->_negate)
-                    ? $this->_notHeaderContains($response, $header, $match)
-                    : $this->_headerContains($response, $header, $match);
-            case self::ASSERT_HEADER_REGEX:
-                if (4 > $argc) {
-                    require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                    throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__);
-                }
-                $this->_header = $header = $argv[2];
-                $this->_match  = $match  = $argv[3];
-                return ($this->_negate)
-                    ? $this->_notHeaderRegex($response, $header, $match)
-                    : $this->_headerRegex($response, $header, $match);
-            default:
-                require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-                throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . __FUNCTION__);
-        }
-    }
-
-    /**
-     * Report Failure
-     *
-     * @see    PHPUnit_Framework_Constraint for implementation details
-     * @param  mixed $other
-     * @param  string $description Additional message to display
-     * @param  bool $not
-     * @return void
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function fail($other, $description, $not = false)
-    {
-        require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
-        switch ($this->_assertType) {
-            case self::ASSERT_RESPONSE_CODE:
-                $failure = 'Failed asserting response code "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response code IS NOT "%s"';
-                }
-                $failure = sprintf($failure, $this->_code);
-                break;
-            case self::ASSERT_HEADER:
-                $failure = 'Failed asserting response header "%s" found';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response response header "%s" WAS NOT found';
-                }
-                $failure = sprintf($failure, $this->_header);
-                break;
-            case self::ASSERT_HEADER_CONTAINS:
-                $failure = 'Failed asserting response header "%s" exists and contains "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response header "%s" DOES NOT CONTAIN "%s"';
-                }
-                $failure = sprintf($failure, $this->_header, $this->_match);
-                break;
-            case self::ASSERT_HEADER_REGEX:
-                $failure = 'Failed asserting response header "%s" exists and matches regex "%s"';
-                if ($this->_negate) {
-                    $failure = 'Failed asserting response header "%s" DOES NOT MATCH regex "%s"';
-                }
-                $failure = sprintf($failure, $this->_header, $this->_match);
-                break;
-            default:
-                throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . __FUNCTION__);
-        }
-
-        if (!empty($description)) {
-            $failure = $description . "\n" . $failure;
-        }
-
-        throw new Zend_Test_PHPUnit_Constraint_Exception($failure);
-    }
-
-    /**
-     * Complete implementation
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return '';
-    }
-
-    /**
-     * Compare response code for positive match
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  int $code
-     * @return bool
-     */
-    protected function _code(Zend_Controller_Response_Abstract $response, $code)
-    {
-        $test = $this->_getCode($response);
-        return ($test == $code);
-    }
-
-    /**
-     * Compare response code for negative match
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  int $code
-     * @return bool
-     */
-    protected function _notCode(Zend_Controller_Response_Abstract $response, $code)
-    {
-        $test = $this->_getCode($response);
-        return ($test != $code);
-    }
-
-    /**
-     * Retrieve response code
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @return int
-     */
-    protected function _getCode(Zend_Controller_Response_Abstract $response)
-    {
-        $test = $response->getHttpResponseCode();
-        if (null === $test) {
-            $test = 200;
-        }
-        return $test;
-    }
-
-    /**
-     * Positive check for response header presence
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @return bool
-     */
-    protected function _header(Zend_Controller_Response_Abstract $response, $header)
-    {
-        return (null !== $this->_getHeader($response, $header));
-    }
-
-    /**
-     * Negative check for response header presence
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @return bool
-     */
-    protected function _notHeader(Zend_Controller_Response_Abstract $response, $header)
-    {
-        return (null === $this->_getHeader($response, $header));
-    }
-
-    /**
-     * Retrieve response header
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @return string|null
-     */
-    protected function _getHeader(Zend_Controller_Response_Abstract $response, $header)
-    {
-        $headers = $response->sendHeaders();
-        $header  = strtolower($header);
-        if (array_key_exists($header, $headers)) {
-            return $headers[$header];
-        }
-        return null;
-    }
-
-    /**
-     * Positive check for header contents matching pattern
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @param  string $match
-     * @return bool
-     */
-    protected function _headerContains(Zend_Controller_Response_Abstract $response, $header, $match)
-    {
-        if (null === ($fullHeader = $this->_getHeader($response, $header))) {
-            return false;
-        }
-
-        $contents = str_replace($header . ': ', '', $fullHeader);
-
-        return (strstr($contents, $match));
-    }
-
-    /**
-     * Negative check for header contents matching pattern
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @param  string $match
-     * @return bool
-     */
-    protected function _notHeaderContains(Zend_Controller_Response_Abstract $response, $header, $match)
-    {
-        if (null === ($fullHeader = $this->_getHeader($response, $header))) {
-            return true;
-        }
-
-        $contents = str_replace($header . ': ', '', $fullHeader);
-
-        return (!strstr($contents, $match));
-    }
-
-    /**
-     * Positive check for header contents matching regex
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _headerRegex(Zend_Controller_Response_Abstract $response, $header, $pattern)
-    {
-        if (null === ($fullHeader = $this->_getHeader($response, $header))) {
-            return false;
-        }
-
-        $contents = str_replace($header . ': ', '', $fullHeader);
-
-        return preg_match($pattern, $contents);
-    }
-
-    /**
-     * Negative check for header contents matching regex
-     *
-     * @param  Zend_Controller_Response_Abstract $response
-     * @param  string $header
-     * @param  string $pattern
-     * @return bool
-     */
-    protected function _notHeaderRegex(Zend_Controller_Response_Abstract $response, $header, $pattern)
-    {
-        if (null === ($fullHeader = $this->_getHeader($response, $header))) {
-            return true;
-        }
-
-        $contents = str_replace($header . ': ', '', $fullHeader);
-
-        return !preg_match($pattern, $contents);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/ControllerTestCase.php b/airtime_mvc/library/Zend/Test/PHPUnit/ControllerTestCase.php
deleted file mode 100644
index 92ebf3efa..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/ControllerTestCase.php
+++ /dev/null
@@ -1,1155 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ControllerTestCase.php 20484 2010-01-21 18:13:31Z matthew $
- */
-
-/** @see PHPUnit_Framework_TestCase */
-require_once 'PHPUnit/Framework/TestCase.php';
-
-/** @see PHPUnit_Runner_Version */
-require_once 'PHPUnit/Runner/Version.php';
-
-/** @see Zend_Controller_Front */
-require_once 'Zend/Controller/Front.php';
-
-/** @see Zend_Controller_Action_HelperBroker */
-require_once 'Zend/Controller/Action/HelperBroker.php';
-
-/** @see Zend_Layout */
-require_once 'Zend/Layout.php';
-
-/** @see Zend_Session */
-require_once 'Zend/Session.php';
-
-/** @see Zend_Registry */
-require_once 'Zend/Registry.php';
-
-/**
- * Functional testing scaffold for MVC applications
- *
- * @uses       PHPUnit_Framework_TestCase
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var mixed Bootstrap file path or callback
-     */
-    public $bootstrap;
-
-    /**
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
-     * @var Zend_Dom_Query
-     */
-    protected $_query;
-
-    /**
-     * @var Zend_Controller_Request_Abstract
-     */
-    protected $_request;
-
-    /**
-     * @var Zend_Controller_Response_Abstract
-     */
-    protected $_response;
-
-    /**
-     * Overloading: prevent overloading to special properties
-     *
-     * @param  string $name
-     * @param  mixed $value
-     * @return void
-     */
-    public function __set($name, $value)
-    {
-        if (in_array($name, array('request', 'response', 'frontController'))) {
-            require_once 'Zend/Exception.php';
-            throw new Zend_Exception(sprintf('Setting %s object manually is not allowed', $name));
-        }
-        $this->$name = $value;
-    }
-
-    /**
-     * Overloading for common properties
-     *
-     * Provides overloading for request, response, and frontController objects.
-     *
-     * @param mixed $name
-     * @return void
-     */
-    public function __get($name)
-    {
-        switch ($name) {
-            case 'request':
-                return $this->getRequest();
-            case 'response':
-                return $this->getResponse();
-            case 'frontController':
-                return $this->getFrontController();
-        }
-
-        return null;
-    }
-
-    /**
-     * Set up MVC app
-     *
-     * Calls {@link bootstrap()} by default
-     *
-     * @return void
-     */
-    protected function setUp()
-    {
-        $this->bootstrap();
-    }
-
-    /**
-     * Bootstrap the front controller
-     *
-     * Resets the front controller, and then bootstraps it.
-     *
-     * If {@link $bootstrap} is a callback, executes it; if it is a file, it include's
-     * it. When done, sets the test case request and response objects into the
-     * front controller.
-     *
-     * @return void
-     */
-    final public function bootstrap()
-    {
-        $this->reset();
-        if (null !== $this->bootstrap) {
-            if ($this->bootstrap instanceof Zend_Application) {
-                $this->bootstrap->bootstrap();
-                $this->_frontController = $this->bootstrap->getBootstrap()->getResource('frontcontroller');
-            } elseif (is_callable($this->bootstrap)) {
-                call_user_func($this->bootstrap);
-            } elseif (is_string($this->bootstrap)) {
-                require_once 'Zend/Loader.php';
-                if (Zend_Loader::isReadable($this->bootstrap)) {
-                    include $this->bootstrap;
-                }
-            }
-        }
-        $this->frontController
-             ->setRequest($this->getRequest())
-             ->setResponse($this->getResponse());
-    }
-
-    /**
-     * Dispatch the MVC
-     *
-     * If a URL is provided, sets it as the request URI in the request object.
-     * Then sets test case request and response objects in front controller,
-     * disables throwing exceptions, and disables returning the response.
-     * Finally, dispatches the front controller.
-     *
-     * @param  string|null $url
-     * @return void
-     */
-    public function dispatch($url = null)
-    {
-        // redirector should not exit
-        $redirector = Zend_Controller_Action_HelperBroker::getStaticHelper('redirector');
-        $redirector->setExit(false);
-
-        // json helper should not exit
-        $json = Zend_Controller_Action_HelperBroker::getStaticHelper('json');
-        $json->suppressExit = true;
-
-        $request    = $this->getRequest();
-        if (null !== $url) {
-            $request->setRequestUri($url);
-        }
-        $request->setPathInfo(null);
-
-        $controller = $this->getFrontController();
-        $this->frontController
-             ->setRequest($request)
-             ->setResponse($this->getResponse())
-             ->throwExceptions(false)
-             ->returnResponse(false);
-
-        if ($this->bootstrap instanceof Zend_Application) {
-            $this->bootstrap->run();
-        } else {
-            $this->frontController->dispatch();
-        }
-    }
-
-    /**
-     * Reset MVC state
-     *
-     * Creates new request/response objects, resets the front controller
-     * instance, and resets the action helper broker.
-     *
-     * @todo   Need to update Zend_Layout to add a resetInstance() method
-     * @return void
-     */
-    public function reset()
-    {
-        $_SESSION = array();
-        $_GET     = array();
-        $_POST    = array();
-        $_COOKIE  = array();
-        $this->resetRequest();
-        $this->resetResponse();
-        Zend_Layout::resetMvcInstance();
-        Zend_Controller_Action_HelperBroker::resetHelpers();
-        $this->frontController->resetInstance();
-        Zend_Session::$_unitTestEnabled = true;
-    }
-
-    /**
-     * Rest all view placeholders
-     *
-     * @return void
-     */
-    protected function _resetPlaceholders()
-    {
-        $registry = Zend_Registry::getInstance();
-        $remove   = array();
-        foreach ($registry as $key => $value) {
-            if (strstr($key, '_View_')) {
-                $remove[] = $key;
-            }
-        }
-
-        foreach ($remove as $key) {
-            unset($registry[$key]);
-        }
-    }
-
-    /**
-     * Reset the request object
-     *
-     * Useful for test cases that need to test multiple trips to the server.
-     *
-     * @return Zend_Test_PHPUnit_ControllerTestCase
-     */
-    public function resetRequest()
-    {
-        if ($this->_request instanceof Zend_Controller_Request_HttpTestCase) {
-            $this->_request->clearQuery()
-                           ->clearPost();
-        }
-        $this->_request = null;
-        return $this;
-    }
-
-    /**
-     * Reset the response object
-     *
-     * Useful for test cases that need to test multiple trips to the server.
-     *
-     * @return Zend_Test_PHPUnit_ControllerTestCase
-     */
-    public function resetResponse()
-    {
-        $this->_response = null;
-        $this->_resetPlaceholders();
-        return $this;
-    }
-
-    /**
-     * Assert against DOM selection
-     *
-     * @param  string $path CSS selector path
-     * @param  string $message
-     * @return void
-     */
-    public function assertQuery($path, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection
-     *
-     * @param  string $path CSS selector path
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotQuery($path, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; node should contain content
-     *
-     * @param  string $path CSS selector path
-     * @param  string $match content that should be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertQueryContentContains($path, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $match)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; node should NOT contain content
-     *
-     * @param  string $path CSS selector path
-     * @param  string $match content that should NOT be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotQueryContentContains($path, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $match)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; node should match content
-     *
-     * @param  string $path CSS selector path
-     * @param  string $pattern Pattern that should be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertQueryContentRegex($path, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; node should NOT match content
-     *
-     * @param  string $path CSS selector path
-     * @param  string $pattern pattern that should NOT be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotQueryContentRegex($path, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; should contain exact number of nodes
-     *
-     * @param  string $path CSS selector path
-     * @param  string $count Number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertQueryCount($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; should NOT contain exact number of nodes
-     *
-     * @param  string $path CSS selector path
-     * @param  string $count Number of nodes that should NOT match
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotQueryCount($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; should contain at least this number of nodes
-     *
-     * @param  string $path CSS selector path
-     * @param  string $count Minimum number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertQueryCountMin($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against DOM selection; should contain no more than this number of nodes
-     *
-     * @param  string $path CSS selector path
-     * @param  string $count Maximum number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertQueryCountMax($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection
-     *
-     * @param  string $path XPath path
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpath($path, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection
-     *
-     * @param  string $path XPath path
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotXpath($path, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; node should contain content
-     *
-     * @param  string $path XPath path
-     * @param  string $match content that should be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpathContentContains($path, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $match)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; node should NOT contain content
-     *
-     * @param  string $path XPath path
-     * @param  string $match content that should NOT be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotXpathContentContains($path, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $match)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; node should match content
-     *
-     * @param  string $path XPath path
-     * @param  string $pattern Pattern that should be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpathContentRegex($path, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; node should NOT match content
-     *
-     * @param  string $path XPath path
-     * @param  string $pattern pattern that should NOT be contained in matched nodes
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotXpathContentRegex($path, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; should contain exact number of nodes
-     *
-     * @param  string $path XPath path
-     * @param  string $count Number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpathCount($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; should NOT contain exact number of nodes
-     *
-     * @param  string $path XPath path
-     * @param  string $count Number of nodes that should NOT match
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotXpathCount($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; should contain at least this number of nodes
-     *
-     * @param  string $path XPath path
-     * @param  string $count Minimum number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpathCountMin($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert against XPath selection; should contain no more than this number of nodes
-     *
-     * @param  string $path XPath path
-     * @param  string $count Maximum number of nodes that should match
-     * @param  string $message
-     * @return void
-     */
-    public function assertXpathCountMax($path, $count, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path);
-        $content    = $this->response->outputBody();
-        if (!$constraint->evaluate($content, __FUNCTION__, $count)) {
-            $constraint->fail($path, $message);
-        }
-    }
-
-    /**
-     * Assert that response is a redirect
-     *
-     * @param  string $message
-     * @return void
-     */
-    public function assertRedirect($message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that response is NOT a redirect
-     *
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotRedirect($message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that response redirects to given URL
-     *
-     * @param  string $url
-     * @param  string $message
-     * @return void
-     */
-    public function assertRedirectTo($url, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $url)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that response does not redirect to given URL
-     *
-     * @param  string $url
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotRedirectTo($url, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $url)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that redirect location matches pattern
-     *
-     * @param  string $pattern
-     * @param  string $message
-     * @return void
-     */
-    public function assertRedirectRegex($pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that redirect location does not match pattern
-     *
-     * @param  string $pattern
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotRedirectRegex($pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_Redirect();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response code
-     *
-     * @param  int $code
-     * @param  string $message
-     * @return void
-     */
-    public function assertResponseCode($code, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $code)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response code
-     *
-     * @param  int $code
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotResponseCode($code, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $constraint->setNegate(true);
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $code)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header exists
-     *
-     * @param  string $header
-     * @param  string $message
-     * @return void
-     */
-    public function assertHeader($header, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header does not exist
-     *
-     * @param  string $header
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotHeader($header, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $constraint->setNegate(true);
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header exists and contains the given string
-     *
-     * @param  string $header
-     * @param  string $match
-     * @param  string $message
-     * @return void
-     */
-    public function assertHeaderContains($header, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header, $match)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header does not exist and/or does not contain the given string
-     *
-     * @param  string $header
-     * @param  string $match
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotHeaderContains($header, $match, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $constraint->setNegate(true);
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header, $match)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header exists and matches the given pattern
-     *
-     * @param  string $header
-     * @param  string $pattern
-     * @param  string $message
-     * @return void
-     */
-    public function assertHeaderRegex($header, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header, $pattern)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert response header does not exist and/or does not match the given regex
-     *
-     * @param  string $header
-     * @param  string $pattern
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotHeaderRegex($header, $pattern, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php';
-        $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader();
-        $constraint->setNegate(true);
-        $response   = $this->response;
-        if (!$constraint->evaluate($response, __FUNCTION__, $header, $pattern)) {
-            $constraint->fail($response, $message);
-        }
-    }
-
-    /**
-     * Assert that the last handled request used the given module
-     *
-     * @param  string $module
-     * @param  string $message
-     * @return void
-     */
-    public function assertModule($module, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($module != $this->request->getModuleName()) {
-            $msg = sprintf('Failed asserting last module used <"%s"> was "%s"',
-                $this->request->getModuleName(),
-                $module
-            );
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the last handled request did NOT use the given module
-     *
-     * @param  string $module
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotModule($module, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($module == $this->request->getModuleName()) {
-            $msg = sprintf('Failed asserting last module used was NOT "%s"', $module);
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the last handled request used the given controller
-     *
-     * @param  string $controller
-     * @param  string $message
-     * @return void
-     */
-    public function assertController($controller, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($controller != $this->request->getControllerName()) {
-            $msg = sprintf('Failed asserting last controller used <"%s"> was "%s"',
-                $this->request->getControllerName(),
-                $controller
-            );
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the last handled request did NOT use the given controller
-     *
-     * @param  string $controller
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotController($controller, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($controller == $this->request->getControllerName()) {
-            $msg = sprintf('Failed asserting last controller used <"%s"> was NOT "%s"',
-                $this->request->getControllerName(),
-                $controller
-            );
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the last handled request used the given action
-     *
-     * @param  string $action
-     * @param  string $message
-     * @return void
-     */
-    public function assertAction($action, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($action != $this->request->getActionName()) {
-            $msg = sprintf('Failed asserting last action used <"%s"> was "%s"', $this->request->getActionName(), $action);
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the last handled request did NOT use the given action
-     *
-     * @param  string $action
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotAction($action, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        if ($action == $this->request->getActionName()) {
-            $msg = sprintf('Failed asserting last action used <"%s"> was NOT "%s"', $this->request->getActionName(), $action);
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the specified route was used
-     *
-     * @param  string $route
-     * @param  string $message
-     * @return void
-     */
-    public function assertRoute($route, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        $router = $this->frontController->getRouter();
-        if ($route != $router->getCurrentRouteName()) {
-            $msg = sprintf('Failed asserting matched route was "%s", actual route is %s',
-                $route,
-                $router->getCurrentRouteName()
-            );
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Assert that the route matched is NOT as specified
-     *
-     * @param  string $route
-     * @param  string $message
-     * @return void
-     */
-    public function assertNotRoute($route, $message = '')
-    {
-        $this->_incrementAssertionCount();
-        $router = $this->frontController->getRouter();
-        if ($route == $router->getCurrentRouteName()) {
-            $msg = sprintf('Failed asserting route matched was NOT "%s"', $route);
-            if (!empty($message)) {
-                $msg = $message . "\n" . $msg;
-            }
-            $this->fail($msg);
-        }
-    }
-
-    /**
-     * Retrieve front controller instance
-     *
-     * @return Zend_Controller_Front
-     */
-    public function getFrontController()
-    {
-        if (null === $this->_frontController) {
-            $this->_frontController = Zend_Controller_Front::getInstance();
-        }
-        return $this->_frontController;
-    }
-
-    /**
-     * Retrieve test case request object
-     *
-     * @return Zend_Controller_Request_Abstract
-     */
-    public function getRequest()
-    {
-        if (null === $this->_request) {
-            require_once 'Zend/Controller/Request/HttpTestCase.php';
-            $this->_request = new Zend_Controller_Request_HttpTestCase;
-        }
-        return $this->_request;
-    }
-
-    /**
-     * Retrieve test case response object
-     *
-     * @return Zend_Controller_Response_Abstract
-     */
-    public function getResponse()
-    {
-        if (null === $this->_response) {
-            require_once 'Zend/Controller/Response/HttpTestCase.php';
-            $this->_response = new Zend_Controller_Response_HttpTestCase;
-        }
-        return $this->_response;
-    }
-
-    /**
-     * Retrieve DOM query object
-     *
-     * @return Zend_Dom_Query
-     */
-    public function getQuery()
-    {
-        if (null === $this->_query) {
-            require_once 'Zend/Dom/Query.php';
-            $this->_query = new Zend_Dom_Query;
-        }
-        return $this->_query;
-    }
-
-    /**
-     * Increment assertion count
-     *
-     * @return void
-     */
-    protected function _incrementAssertionCount()
-    {
-        $stack = debug_backtrace();
-        foreach (debug_backtrace() as $step) {
-            if (isset($step['object'])
-                && $step['object'] instanceof PHPUnit_Framework_TestCase
-            ) {
-                if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', 'lt')) {
-                    break;
-                } elseif (version_compare(PHPUnit_Runner_Version::id(), '3.3.3', 'lt')) {
-                    $step['object']->incrementAssertionCounter();
-                } else {
-                    $step['object']->addToAssertionCount(1);
-                }
-                break;
-            }
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/DatabaseTestCase.php b/airtime_mvc/library/Zend/Test/PHPUnit/DatabaseTestCase.php
deleted file mode 100644
index f6f9d4161..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/DatabaseTestCase.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DatabaseTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_TestCase
- */
-require_once "PHPUnit/Extensions/Database/TestCase.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Operation_Truncate
- */
-require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Operation_Insert
- */
-require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_DbTable
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_DbRowset
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php";
-
-/**
- * Generic Testcase for Zend Framework related DbUnit Testing with PHPUnit
- *
- * @uses       PHPUnit_Extensions_Database_TestCase
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Test_PHPUnit_DatabaseTestCase extends PHPUnit_Extensions_Database_TestCase
-{
-    /**
-     * Creates a new Zend Database Connection using the given Adapter and database schema name.
-     *
-     * @param  Zend_Db_Adapter_Abstract $connection
-     * @param  string $schema
-     * @return Zend_Test_PHPUnit_Db_Connection
-     */
-    protected function createZendDbConnection(Zend_Db_Adapter_Abstract $connection, $schema)
-    {
-        return new Zend_Test_PHPUnit_Db_Connection($connection, $schema);
-    }
-
-    /**
-     * Convenience function to get access to the database connection.
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    protected function getAdapter()
-    {
-        return $this->getConnection()->getConnection();
-    }
-
-    /**
-     * Returns the database operation executed in test setup.
-     *
-     * @return PHPUnit_Extensions_Database_Operation_DatabaseOperation
-     */
-    protected function getSetUpOperation()
-    {
-        return new PHPUnit_Extensions_Database_Operation_Composite(array(
-            new Zend_Test_PHPUnit_Db_Operation_Truncate(),
-            new Zend_Test_PHPUnit_Db_Operation_Insert(),
-        ));
-    }
-
-    /**
-     * Returns the database operation executed in test cleanup.
-     *
-     * @return PHPUnit_Extensions_Database_Operation_DatabaseOperation
-     */
-    protected function getTearDownOperation()
-    {
-        return PHPUnit_Extensions_Database_Operation_Factory::NONE();
-    }
-
-    /**
-     * Create a dataset based on multiple Zend_Db_Table instances
-     *
-     * @param  array $tables
-     * @return Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet
-     */
-    protected function createDbTableDataSet(array $tables=array())
-    {
-        $dataSet = new Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet();
-        foreach($tables AS $table) {
-            $dataSet->addTable($table);
-        }
-        return $dataSet;
-    }
-
-    /**
-     * Create a table based on one Zend_Db_Table instance
-     *
-     * @param Zend_Db_Table_Abstract $table
-     * @param string $where
-     * @param string $order
-     * @param string $count
-     * @param string $offset
-     * @return Zend_Test_PHPUnit_Db_DataSet_DbTable
-     */
-    protected function createDbTable(Zend_Db_Table_Abstract $table, $where=null, $order=null, $count=null, $offset=null)
-    {
-        return new Zend_Test_PHPUnit_Db_DataSet_DbTable($table, $where, $order, $count, $offset);
-    }
-
-    /**
-     * Create a data table based on a Zend_Db_Table_Rowset instance
-     *
-     * @param  Zend_Db_Table_Rowset_Abstract $rowset
-     * @param  string
-     * @return Zend_Test_PHPUnit_Db_DataSet_DbRowset
-     */
-    protected function createDbRowset(Zend_Db_Table_Rowset_Abstract $rowset, $tableName = null)
-    {
-        return new Zend_Test_PHPUnit_Db_DataSet_DbRowset($rowset, $tableName);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Connection.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Connection.php
deleted file mode 100644
index df1b1aaf4..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Connection.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/DefaultDatabaseConnection.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Metadata_Generic
- */
-require_once "Zend/Test/PHPUnit/Db/Metadata/Generic.php";
-
-/**
- * Generic Abstraction of Zend_Db Connections in the PHPUnit Database Extension context.
- *
- * @uses       Zend_Db_Adapter_Abstract
- * @uses       PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Connection extends PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
-{
-    /**
-     * Zend_Db_Adapter_Abstract
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_connection;
-
-    /**
-     * Database Schema
-     *
-     * @var string $db
-     */
-    protected $_schema;
-
-    /**
-     * Metadata
-     *
-     * @param PHPUnit_Extensions_Database_DB_IMetaData $db
-     */
-    protected $_metaData;
-
-    /**
-     * Construct Connection based on Zend_Db_Adapter_Abstract
-     *
-     * @param Zend_Db_Adapter_Abstract $db
-     * @param string $schema
-     */
-    public function __construct(Zend_Db_Adapter_Abstract $db, $schema)
-    {
-        $this->_connection = $db;
-        $this->_schema = $schema;
-    }
-
-    /**
-     * Close this connection.
-     *
-     * @return void
-     */
-    public function close()
-    {
-        $this->_connection->closeConnection();
-    }
-
-    /**
-     * Creates a table with the result of the specified SQL statement.
-     *
-     * @param string $resultName
-     * @param string $sql
-     * @return PHPUnit_Extensions_Database_DataSet_ITable
-     */
-    public function createQueryTable($resultName, $sql)
-    {
-        return new Zend_Test_PHPUnit_Db_DataSet_QueryTable($resultName, $sql, $this);
-    }
-
-    /**
-     * Returns a Zend_Db Connection
-     *
-     * @return Zend_Db_Adapter_Abstract
-     */
-    public function getConnection()
-    {
-        return $this->_connection;
-    }
-
-    /**
-     * Returns a database metadata object that can be used to retrieve table
-     * meta data from the database.
-     *
-     * @return PHPUnit_Extensions_Database_DB_IMetaData
-     */
-    public function getMetaData()
-    {
-        if($this->_metaData === null) {
-            $this->_metaData = new Zend_Test_PHPUnit_Db_Metadata_Generic($this->getConnection(), $this->getSchema());
-        }
-        return $this->_metaData;
-    }
-
-    /**
-     * Returns the schema for the connection.
-     *
-     * @return string
-     */
-    public function getSchema()
-    {
-        return $this->_schema;
-    }
-
-    /**
-     * Returns the command used to truncate a table.
-     *
-     * @return string
-     */
-    public function getTruncateCommand()
-    {
-        return "DELETE";
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
deleted file mode 100644
index f0a655907..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbRowset.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Table_Rowset_Abstract
- */
-require_once "Zend/Db/Table/Rowset/Abstract.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_AbstractTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/AbstractTable.php";
-
-/**
- * Use a Zend_Db Rowset as a datatable for assertions with other PHPUnit Database extension tables.
- *
- * @uses       PHPUnit_Extensions_Database_DataSet_AbstractTable
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_DataSet_DbRowset extends PHPUnit_Extensions_Database_DataSet_AbstractTable
-{
-    /**
-     * Construct Table object from a Zend_Db_Table_Rowset
-     *
-     * @param Zend_Db_Table_Rowset_Abstract $rowset
-     * @param string $tableName
-     */
-    public function __construct(Zend_Db_Table_Rowset_Abstract $rowset, $tableName = null)
-    {
-        if($tableName == null) {
-            $table = $rowset->getTable();
-            if($table !== null) {
-                $tableName = $table->info('name');
-            } else {
-                require_once "Zend/Test/PHPUnit/Db/Exception.php";
-                throw new Zend_Test_PHPUnit_Db_Exception(
-                    'No table name was given to Rowset Table and table name cannot be infered from the table, '.
-                    'because the rowset is disconnected from database.'
-                );
-            }
-        }
-
-        $this->data = $rowset->toArray();
-
-        $columns = array();
-        if(isset($this->data[0]) > 0) {
-            $columns = array_keys($this->data[0]);
-        } else if($rowset->getTable() != null) {
-            $columns = $rowset->getTable()->info('cols');
-        }
-
-        $this->tableName = $tableName;
-        $this->tableMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($this->tableName, $columns);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
deleted file mode 100644
index 9cfd8234f..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_QueryTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryTable.php";
-
-/**
- * @see Zend_Db_Table_Abstract
- */
-require_once "Zend/Db/Table/Abstract.php";
-
-/**
- * Use a Zend_Db_Table for assertions with other PHPUnit Database Extension table types.
- *
- * @uses       PHPUnit_Extensions_Database_DataSet_QueryTable
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_DataSet_DbTable extends PHPUnit_Extensions_Database_DataSet_QueryTable
-{
-    /**
-     * Zend_Db_Table object
-     *
-     * @var Zend_Db_Table_Abstract
-     */
-    protected $_table = null;
-
-    /**
-     * @var array
-     */
-    protected $_columns = array();
-
-    /**
-     * @var string
-     */
-    protected $_where = null;
-
-    /**
-     * @var string
-     */
-    protected $_orderBy = null;
-
-    /**
-     * @var string
-     */
-    protected $_count = null;
-
-    /**
-     * @var int
-     */
-    protected $_offset = null;
-
-    /**
-     * Construct Dataset Table from Zend_Db_Table object
-     *
-     * @param Zend_Db_Table_Abstract        $table
-     * @param string|Zend_Db_Select|null    $where
-     * @param string|null                   $order
-     * @param int                           $count
-     * @param int                           $offset
-     */
-    public function __construct(Zend_Db_Table_Abstract $table, $where=null, $order=null, $count=null, $offset=null)
-    {
-        $this->tableName = $table->info('name');
-        $this->_columns = $table->info('cols');
-
-        $this->_table = $table;
-        $this->_where = $where;
-        $this->_order = $order;
-        $this->_count = $count;
-        $this->_offset = $offset;
-    }
-
-    /**
-     * Lazy load data via table fetchAll() method.
-     *
-     * @return void
-     */
-    protected function loadData()
-    {
-        if ($this->data === null) {
-            $this->data = $this->_table->fetchAll(
-                $this->_where, $this->_order, $this->_count, $this->_offset
-            );
-            if($this->data instanceof Zend_Db_Table_Rowset_Abstract) {
-                $this->data = $this->data->toArray();
-            }
-        }
-    }
-
-    /**
-     * Create Table Metadata object
-     */
-    protected function createTableMetaData()
-    {
-        if ($this->tableMetaData === NULL) {
-            $this->loadData();
-            $this->tableMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData($this->tableName, $this->_columns);
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
deleted file mode 100644
index 45ebf4944..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTableDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php";
-
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_DbTable
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php";
-
-/**
- * Aggregate several Zend_Db_Table instances into a dataset.
- *
- * @uses       Zend_Db_Table
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet extends PHPUnit_Extensions_Database_DataSet_AbstractDataSet
-{
-    /**
-     * @var array
-     */
-    protected $tables = array();
-
-    /**
-     * Add a Table dataset representation by specifiying an arbitrary select query.
-     *
-     * By default a select * will be done on the given tablename.
-     *
-     * @param Zend_Db_Table_Abstract $table
-     * @param string|Zend_Db_Select $query
-     * @param string $where
-     * @param string $order
-     * @param string $count
-     * @param string $offset
-     */
-    public function addTable(Zend_Db_Table_Abstract $table, $where = null, $order = null, $count = null, $offset = null)
-    {
-        $tableName = $table->info('name');
-        $this->tables[$tableName] = new Zend_Test_PHPUnit_Db_DataSet_DbTable($table, $where, $order, $count, $offset);
-    }
-
-    /**
-     * Creates an iterator over the tables in the data set. If $reverse is
-     * true a reverse iterator will be returned.
-     *
-     * @param bool $reverse
-     * @return PHPUnit_Extensions_Database_DB_TableIterator
-     */
-    protected function createIterator($reverse = FALSE)
-    {
-        return new PHPUnit_Extensions_Database_DataSet_DefaultTableIterator($this->tables, $reverse);
-    }
-
-    /**
-     * Returns a table object for the given table.
-     *
-     * @param string $tableName
-     * @return PHPUnit_Extensions_Database_DB_Table
-     */
-    public function getTable($tableName)
-    {
-        if (!isset($this->tables[$tableName])) {
-            throw new InvalidArgumentException("$tableName is not a table in the current database.");
-        }
-
-        return $this->tables[$tableName];
-    }
-
-    /**
-     * Returns a list of table names for the database
-     *
-     * @return Array
-     */
-    public function getTableNames()
-    {
-        return array_keys($this->tables);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
deleted file mode 100644
index 1a55d2450..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_QueryDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable
- */
-require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php";
-
-/**
- * @see Zend_Db_Select
- */
-require_once "Zend/Db/Select.php";
-
-/**
- * Uses several query strings or Zend_Db_Select objects to form a dataset of tables for assertion with other datasets.
- *
- * @uses       PHPUnit_Extensions_Database_DataSet_QueryDataSet
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Database_DataSet_QueryDataSet
-{
-    /**
-     * Creates a new dataset using the given database connection.
-     *
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection
-     */
-    public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection)
-    {
-        if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryDataSet only works with Zend_Test_PHPUnit_Db_Connection connections-");
-        }
-        $this->databaseConnection = $databaseConnection;
-    }
-
-    /**
-     * Add a Table dataset representation by specifiying an arbitrary select query.
-     *
-     * By default a select * will be done on the given tablename.
-     *
-     * @param string                $tableName
-     * @param string|Zend_Db_Select $query
-     */
-    public function addTable($tableName, $query = NULL)
-    {
-        if ($query === NULL) {
-            $query = $this->databaseConnection->getConnection()->select();
-            $query->from($tableName, Zend_Db_Select::SQL_WILDCARD);
-        }
-
-        if($query instanceof Zend_Db_Select) {
-            $query = $query->__toString();
-        }
-
-        $this->tables[$tableName] = new Zend_Test_PHPUnit_Db_DataSet_QueryTable($tableName, $query, $this->databaseConnection);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
deleted file mode 100644
index bd6eda368..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: QueryTable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_QueryTable
- */
-require_once "PHPUnit/Extensions/Database/DataSet/QueryTable.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * Represent a PHPUnit Database Extension table with Queries using a Zend_Db adapter for assertion against other tables.
- *
- * @uses       PHPUnit_Extensions_Database_DataSet_QueryTable
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Database_DataSet_QueryTable
-{
-    /**
-     * Creates a new database query table object.
-     *
-     * @param string $table_name
-     * @param string $query
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection
-     */
-    public function __construct($tableName, $query, PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection)
-    {
-        if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryTable only works with Zend_Test_PHPUnit_Db_Connection connections-");
-        }
-        parent::__construct($tableName, $query, $databaseConnection);
-    }
-
-    /**
-     * Load data from the database.
-     *
-     * @return void
-     */
-    protected function loadData()
-    {
-        if($this->data === null) {
-            $stmt = $this->databaseConnection->getConnection()->query($this->query);
-            $this->data = $stmt->fetchAll(Zend_Db::FETCH_ASSOC);
-        }
-    }
-
-    /**
-     * Create Table Metadata
-     */
-    protected function createTableMetaData()
-    {
-        if ($this->tableMetaData === NULL)
-        {
-            $this->loadData();
-            $keys = array();
-            if(count($this->data) > 0) {
-                $keys = array_keys($this->data[0]);
-            }
-            $this->tableMetaData = new PHPUnit_Extensions_Database_DataSet_DefaultTableMetaData(
-                $this->tableName, $keys
-            );
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Exception.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Exception.php
deleted file mode 100644
index e5b1a9ba0..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once "Zend/Exception.php";
-
-/**
- * Exception for Zend_Test_PHPUnit_Database package
- *
- * @uses       Zend_Exception
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
deleted file mode 100644
index 9f0355e2e..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Generic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Db_Adapter_Abstract
- */
-require_once "Zend/Db/Adapter/Abstract.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IMetaData
- */
-require_once "PHPUnit/Extensions/Database/DB/IMetaData.php";
-
-/**
- * Generic Metadata accessor for the Zend_Db adapters
- *
- * @uses       PHPUnit_Extensions_Database_DB_IMetaData
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Metadata_Generic implements PHPUnit_Extensions_Database_DB_IMetaData
-{
-    /**
-     * Zend_Db Connection
-     *
-     * @var Zend_Db_Adapter_Abstract
-     */
-    protected $_connection;
-
-    /**
-     * Schemaname
-     *
-     * @var string
-     */
-    protected $_schema;
-
-    /**
-     * Cached Table metadata
-     *
-     * @var array
-     */
-    protected $_tableMetadata = array();
-
-    /**
-     * Creates a new database meta data object using the given pdo connection
-     * and schema name.
-     *
-     * @param PDO $pdo
-     * @param string $schema
-     */
-    public final function __construct(Zend_Db_Adapter_Abstract $db, $schema)
-    {
-        $this->_connection = $db;
-        $this->_schema     = $schema;
-    }
-
-    /**
-     * List Tables
-     *
-     * @return array
-     */
-    public function getTableNames()
-    {
-        return $this->_connection->listTables();
-    }
-
-    /**
-     * Get Table information
-     *
-     * @param  string $tableName
-     * @return array
-     */
-    protected function getTableDescription($tableName)
-    {
-        if(!isset($this->_tableMetadata[$tableName])) {
-            $this->_tableMetadata[$tableName] = $this->_connection->describeTable($tableName);
-        }
-        return $this->_tableMetadata[$tableName];
-    }
-
-    /**
-     * Returns an array containing the names of all the columns in the
-     * $tableName table,
-     *
-     * @param string $tableName
-     * @return array
-     */
-    public function getTableColumns($tableName)
-    {
-        $tableMeta = $this->getTableDescription($tableName);
-        $columns = array_keys($tableMeta);
-        return $columns;
-    }
-
-    /**
-     * Returns an array containing the names of all the primary key columns in
-     * the $tableName table.
-     *
-     * @param string $tableName
-     * @return array
-     */
-    public function getTablePrimaryKeys($tableName)
-    {
-        $tableMeta = $this->getTableDescription($tableName);
-
-        $primaryColumnNames = array();
-        foreach($tableMeta AS $column) {
-            if($column['PRIMARY'] == true) {
-                $primaryColumnNames[] = $column['COLUMN_NAME'];
-            }
-        }
-        return $primaryColumnNames;
-    }
-
-    /**
-     * Returns the name of the default schema.
-     *
-     * @return string
-     */
-    public function getSchema()
-    {
-        return $this->_schema;
-    }
-
-    /**
-     * Returns a quoted schema object. (table name, column name, etc)
-     *
-     * @param string $object
-     * @return string
-     */
-    public function quoteSchemaObject($object)
-    {
-        return $this->_connection->quoteIdentifier($object);
-    }
-
-    /**
-     * Returns true if the rdbms allows cascading
-     *
-     * @return bool
-     */
-    public function allowsCascading()
-    {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
deleted file mode 100644
index a01115ee1..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DeleteAll.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Connection
- */
-require_once "Zend/Test/PHPUnit/Db/Connection.php";
-
-/**
- * Delete All Operation that can be executed on set up or tear down of a database tester.
- *
- * @uses       PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation
-{
-    /**
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection
-     * @param PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet
-     */
-    public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet)
-    {
-        if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!");
-        }
-
-        foreach ($dataSet as $table) {
-            try {
-                $tableName = $table->getTableMetaData()->getTableName();
-                $connection->getConnection()->delete($tableName);
-            } catch (Exception $e) {
-                require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-                throw new PHPUnit_Extensions_Database_Operation_Exception('DELETEALL', 'DELETE FROM '.$tableName.'', array(), $table, $e->getMessage());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Insert.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
deleted file mode 100644
index 3c26621e7..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Insert.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Insert.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Connection
- */
-require_once "Zend/Test/PHPUnit/Db/Connection.php";
-
-/**
- * Operation for Inserting on setup or teardown of a database tester.
- *
- * @uses       PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation
-{
-    /**
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection
-     * @param PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet
-     */
-    public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet)
-    {
-        if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!");
-        }
-
-        $databaseDataSet = $connection->createDataSet();
-
-        $dsIterator = $dataSet->getIterator();
-
-        foreach($dsIterator as $table) {
-            $tableName = $table->getTableMetaData()->getTableName();
-
-            $db = $connection->getConnection();
-            for($i = 0; $i < $table->getRowCount(); $i++) {
-                $values = $this->buildInsertValues($table, $i);
-                try {
-                    $db->insert($tableName, $values);
-                } catch (Exception $e) {
-                    throw new PHPUnit_Extensions_Database_Operation_Exception("INSERT", "INSERT INTO ".$tableName." [..]", $values, $table, $e->getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     *
-     * @param PHPUnit_Extensions_Database_DataSet_ITable $table
-     * @param int $rowNum
-     * @return array
-     */
-    protected function buildInsertValues(PHPUnit_Extensions_Database_DataSet_ITable $table, $rowNum)
-    {
-        $values = array();
-        foreach($table->getTableMetaData()->getColumns() as $columnName) {
-            $values[$columnName] = $table->getValue($rowNum, $columnName);
-        }
-        return $values;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
deleted file mode 100644
index 456cfe901..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Truncate.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- */
-require_once "PHPUnit/Extensions/Database/Operation/IDatabaseOperation.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Exception
- */
-require_once "PHPUnit/Extensions/Database/Operation/Exception.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Connection
- */
-require_once "Zend/Test/PHPUnit/Db/Connection.php";
-
-/**
- * Operation for Truncating on setup or teardown of a database tester.
- *
- * @uses       PHPUnit_Extensions_Database_Operation_IDatabaseOperation
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation
-{
-    /**
-     *
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection
-     * @param PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet
-     * @return void
-     */
-    public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet)
-    {
-        if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!");
-        }
-
-        foreach ($dataSet->getReverseIterator() AS $table) {
-            try {
-                $tableName = $table->getTableMetaData()->getTableName();
-                $this->_truncate($connection->getConnection(), $tableName);
-            } catch (Exception $e) {
-                throw new PHPUnit_Extensions_Database_Operation_Exception('TRUNCATE', 'TRUNCATE '.$tableName.'', array(), $table, $e->getMessage());
-            }
-        }
-    }
-
-    /**
-     * Truncate a given table.
-     *
-     * @param Zend_Db_Adapter_Abstract $db
-     * @param string $tableName
-     * @return void
-     */
-    protected function _truncate(Zend_Db_Adapter_Abstract $db, $tableName)
-    {
-        $tableName = $db->quoteIdentifier($tableName);
-        if($db instanceof Zend_Db_Adapter_Pdo_Sqlite) {
-            $db->query('DELETE FROM '.$tableName);
-        } else if($db instanceof Zend_Db_Adapter_Db2) {
-            /*if(strstr(PHP_OS, "WIN")) {
-                $file = tempnam(sys_get_temp_dir(), "zendtestdbibm_");
-                file_put_contents($file, "");
-                $db->query('IMPORT FROM '.$file.' OF DEL REPLACE INTO '.$tableName);
-                unlink($file);
-            } else {
-                $db->query('IMPORT FROM /dev/null OF DEL REPLACE INTO '.$tableName);
-            }*/
-            require_once "Zend/Exception.php";
-            throw Zend_Exception("IBM Db2 TRUNCATE not supported.");
-        } else if($this->_isMssqlOrOracle($db)) {
-            $db->query('TRUNCATE TABLE '.$tableName);
-        } else if($db instanceof Zend_Db_Adapter_Pdo_Pgsql) {
-            $db->query('TRUNCATE '.$tableName.' CASCADE');
-        } else {
-            $db->query('TRUNCATE '.$tableName);
-        }
-    }
-
-    /**
-     * Detect if an adapter is for Mssql or Oracle Databases.
-     *
-     * @param  Zend_Db_Adapter_Abstract $db
-     * @return bool
-     */
-    private function _isMssqlOrOracle($db)
-    {
-        return (
-            $db instanceof Zend_Db_Adapter_Pdo_Mssql ||
-            $db instanceof Zend_Db_Adapter_Sqlsrv ||
-            $db instanceof Zend_Db_Adapter_Pdo_Oci ||
-            $db instanceof Zend_Db_Adapter_Oracle
-        );
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Test/PHPUnit/Db/SimpleTester.php b/airtime_mvc/library/Zend/Test/PHPUnit/Db/SimpleTester.php
deleted file mode 100644
index 32a2aeb14..000000000
--- a/airtime_mvc/library/Zend/Test/PHPUnit/Db/SimpleTester.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SimpleTester.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see PHPUnit_Extensions_Database_DefaultTester
- */
-require_once "PHPUnit/Extensions/Database/DefaultTester.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DB_IDatabaseConnection
- */
-require_once "PHPUnit/Extensions/Database/DB/IDatabaseConnection.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Operation_Truncate
- */
-require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php";
-
-/**
- * @see Zend_Test_PHPUnit_Db_Operation_Insert
- */
-require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php";
-
-/**
- * @see PHPUnit_Extensions_Database_Operation_Factory
- */
-require_once "PHPUnit/Extensions/Database/Operation/Factory.php";
-
-/**
- * @see PHPUnit_Extensions_Database_DataSet_IDataSet
- */
-require_once "PHPUnit/Extensions/Database/DataSet/IDataSet.php";
-
-/**
- * Simple Tester for Database Tests when the Abstract Test Case cannot be used.
- *
- * @uses       PHPUnit_Extensions_Database_DefaultTester
- * @category   Zend
- * @package    Zend_Test
- * @subpackage PHPUnit
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_DefaultTester
-{
-    /**
-     * Creates a new default database tester using the given connection.
-     *
-     * @param PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection
-     */
-    public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection)
-    {
-        if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) {
-            require_once "Zend/Test/PHPUnit/Db/Exception.php";
-            throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!");
-        }
-
-        $this->connection = $connection;
-        $this->setUpOperation = new PHPUnit_Extensions_Database_Operation_Composite(array(
-            new Zend_Test_PHPUnit_Db_Operation_Truncate(),
-            new Zend_Test_PHPUnit_Db_Operation_Insert(),
-        ));
-        $this->tearDownOperation = PHPUnit_Extensions_Database_Operation_Factory::NONE();
-    }
-
-    /**
-     * Set Up the database using the given Dataset and the SetUp strategy "Truncate, then Insert"
-     *
-     * @param PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet
-     */
-    public function setUpDatabase(PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet)
-    {
-        $this->setDataSet($dataSet);
-        $this->onSetUp();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Text/Exception.php b/airtime_mvc/library/Zend/Text/Exception.php
deleted file mode 100644
index 78ad9632b..000000000
--- a/airtime_mvc/library/Zend/Text/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_Text
- *
- * @category  Zend
- * @package   Zend_Text
- * @uses      Zend_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Text/Figlet.php b/airtime_mvc/library/Zend/Text/Figlet.php
deleted file mode 100644
index 092c13b7e..000000000
--- a/airtime_mvc/library/Zend/Text/Figlet.php
+++ /dev/null
@@ -1,1232 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Figlet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Text_Figlet is a PHP implementation of FIGlet
- *
- * @category  Zend
- * @package   Zend_Text_Figlet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Figlet
-{
-    /**
-     * Smush2 layout modes
-     */
-    const SM_EQUAL     = 0x01;
-    const SM_LOWLINE   = 0x02;
-    const SM_HIERARCHY = 0x04;
-    const SM_PAIR      = 0x08;
-    const SM_BIGX      = 0x10;
-    const SM_HARDBLANK = 0x20;
-    const SM_KERN      = 0x40;
-    const SM_SMUSH     = 0x80;
-
-    /**
-     * Smush mode override modes
-     */
-    const SMO_NO    = 0;
-    const SMO_YES   = 1;
-    const SMO_FORCE = 2;
-
-    /**
-     * Justifications
-     */
-    const JUSTIFICATION_LEFT   = 0;
-    const JUSTIFICATION_CENTER = 1;
-    const JUSTIFICATION_RIGHT  = 2;
-
-    /**
-     * Write directions
-     */
-    const DIRECTION_LEFT_TO_RIGHT = 0;
-    const DIRECTION_RIGHT_TO_LEFT = 1;
-
-    /**
-     * Magic fontfile number
-     */
-    const FONTFILE_MAGIC_NUMBER = 'flf2';
-
-    /**
-     * Array containing all characters of the current font
-     *
-     * @var array
-     */
-    protected $_charList = array();
-
-    /**
-     * Indicates if a font was loaded yet
-     *
-     * @var boolean
-     */
-    protected $_fontLoaded = false;
-
-    /**
-     * Latin-1 codes for German letters, respectively:
-     *
-     * LATIN CAPITAL LETTER A WITH DIAERESIS = A-umlaut
-     * LATIN CAPITAL LETTER O WITH DIAERESIS = O-umlaut
-     * LATIN CAPITAL LETTER U WITH DIAERESIS = U-umlaut
-     * LATIN SMALL LETTER A WITH DIAERESIS = a-umlaut
-     * LATIN SMALL LETTER O WITH DIAERESIS = o-umlaut
-     * LATIN SMALL LETTER U WITH DIAERESIS = u-umlaut
-     * LATIN SMALL LETTER SHARP S = ess-zed
-     *
-     * @var array
-     */
-    protected $_germanChars = array(196, 214, 220, 228, 246, 252, 223);
-
-    /**
-     * Output width, defaults to 80.
-     *
-     * @var integer
-     */
-    protected $_outputWidth = 80;
-
-    /**
-     * Hard blank character
-     *
-     * @var string
-     */
-    protected $_hardBlank;
-
-    /**
-     * Height of the characters
-     *
-     * @var integer
-     */
-    protected $_charHeight;
-
-    /**
-     * Max length of any character
-     *
-     * @var integer
-     */
-    protected $_maxLength;
-
-    /**
-     * Smush mode
-     *
-     * @var integer
-     */
-    protected $_smushMode = 0;
-
-    /**
-     * Smush defined by the font
-     *
-     * @var integer
-     */
-    protected $_fontSmush = 0;
-
-    /**
-     * Smush defined by the user
-     *
-     * @var integer
-     */
-    protected $_userSmush = 0;
-
-    /**
-     * Wether to handle paragraphs || not
-     *
-     * @var boolean
-     */
-    protected $_handleParagraphs = false;
-
-    /**
-     * Justification for the text, according to $_outputWidth
-     *
-     * For using font default, this parameter should be null, else one of
-     * the values of Zend_Text_Figlet::JUSTIFICATION_*
-     *
-     * @var integer
-     */
-    protected $_justification = null;
-
-    /**
-     * Direction of text-writing, namely right to left
-     *
-     * For using font default, this parameter should be null, else one of
-     * the values of Zend_Text_Figlet::DIRECTION_*
-     *
-     * @var integer
-     */
-    protected $_rightToLeft = null;
-
-    /**
-     * Override font file smush layout
-     *
-     * @var integer
-     */
-    protected $_smushOverride = 0;
-
-    /**
-     * Options of the current font
-     *
-     * @var array
-     */
-    protected $_fontOptions = array();
-
-    /**
-     * Previous character width
-     *
-     * @var integer
-     */
-    protected $_previousCharWidth = 0;
-
-    /**
-     * Current character width
-     *
-     * @var integer
-     */
-    protected $_currentCharWidth = 0;
-
-    /**
-     * Current outline length
-     *
-     * @var integer
-     */
-    protected $_outlineLength = 0;
-
-    /**
-     * Maxmimum outline length
-     *
-     * @var integer
-     */
-    protected $_outlineLengthLimit = 0;
-
-    /**
-     * In character line
-     *
-     * @var string
-     */
-    protected $_inCharLine;
-
-    /**
-     * In character line length
-     *
-     * @var integer
-     */
-    protected $_inCharLineLength = 0;
-
-    /**
-     * Maximum in character line length
-     *
-     * @var integer
-     */
-    protected $_inCharLineLengthLimit = 0;
-
-    /**
-     * Current char
-     *
-     * @var array
-     */
-    protected $_currentChar = null;
-
-    /**
-     * Current output line
-     *
-     * @var array
-     */
-    protected $_outputLine;
-
-    /**
-     * Current output
-     *
-     * @var string
-     */
-    protected $_output;
-
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-    );
-
-    /**
-     * Instantiate the FIGlet with a specific font. If no font is given, the
-     * standard font is used. You can also supply multiple options via
-     * the $options variable, which can either be an array or an instance of
-     * Zend_Config.
-     *
-     * @param array|Zend_Config $options Options for the output
-     */
-    public function __construct($options = null)
-    {
-        // Set options
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } else if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        // If no font was defined, load default font
-        if (!$this->_fontLoaded) {
-            $this->_loadFont(dirname(__FILE__) . '/Figlet/zend-framework.flf');
-        }
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for Zend_Text_Figlet
-     * @return Zend_Text_Figlet
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set options from config object
-     *
-     * @param  Zend_Config $config Configuration for Zend_Text_Figlet
-     * @return Zend_Text_Figlet
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set a font to use
-     *
-     * @param  string $font Path to the font
-     * @return Zend_Text_Figlet
-     */
-    public function setFont($font)
-    {
-        $this->_loadFont($font);
-        return $this;
-    }
-
-    /**
-     * Set handling of paragraphs
-     *
-     * @param  boolean $handleParagraphs Wether to handle paragraphs or not
-     * @return Zend_Text_Figlet
-     */
-    public function setHandleParagraphs($handleParagraphs)
-    {
-        $this->_handleParagraphs = (bool) $handleParagraphs;
-        return $this;
-    }
-
-    /**
-     * Set the justification. 0 stands for left aligned, 1 for centered and 2
-     * for right aligned.
-     *
-     * @param  integer $justification Justification of the output text
-     * @return Zend_Text_Figlet
-     */
-    public function setJustification($justification)
-    {
-        $this->_justification = min(3, max(0, (int) $justification));
-        return $this;
-    }
-
-    /**
-     * Set the output width
-     *
-     * @param  integer $outputWidth Output with which should be used for word
-     *                              wrapping and justification
-     * @return Zend_Text_Figlet
-     */
-    public function setOutputWidth($outputWidth)
-    {
-        $this->_outputWidth = max(1, (int) $outputWidth);
-        return $this;
-    }
-
-    /**
-     * Set right to left mode. For writing from left to right, use
-     * Zend_Text_Figlet::DIRECTION_LEFT_TO_RIGHT. For writing from right to left,
-     * use Zend_Text_Figlet::DIRECTION_RIGHT_TO_LEFT.
-     *
-     * @param  integer $rightToLeft Right-to-left mode
-     * @return Zend_Text_Figlet
-     */
-    public function setRightToLeft($rightToLeft)
-    {
-        $this->_rightToLeft = min(1, max(0, (int) $rightToLeft));
-        return $this;
-    }
-
-    /**
-     * Set the smush mode.
-     *
-     * Use one of the constants of Zend_Text_Figlet::SM_*, you may combine them.
-     *
-     * @param  integer $smushMode Smush mode to use for generating text
-     * @return Zend_Text_Figlet
-     */
-    public function setSmushMode($smushMode)
-    {
-        $smushMode = (int) $smushMode;
-
-        if ($smushMode < -1) {
-            $this->_smushOverride = self::SMO_NO;
-        } else {
-            if ($smushMode === 0) {
-                $this->_userSmush = self::SM_KERN;
-            } else if ($smushMode === -1) {
-                $this->_userSmush = 0;
-            } else {
-                $this->_userSmush = (($smushMode & 63) | self::SM_SMUSH);
-            }
-
-            $this->_smushOverride = self::SMO_YES;
-        }
-
-        $this->_setUsedSmush();
-
-        return $this;
-    }
-
-    /**
-     * Render a FIGlet text
-     *
-     * @param  string $text     Text to convert to a figlet text
-     * @param  string $encoding Encoding of the input string
-     * @throws InvalidArgumentException When $text is not a string
-     * @throws Zend_Text_Figlet_Exception    When $text it not properly encoded
-     * @return string
-     */
-    public function render($text, $encoding = 'UTF-8')
-    {
-        if (!is_string($text)) {
-            throw new InvalidArgumentException('$text must be a string');
-        }
-
-        if ($encoding !== 'UTF-8') {
-            $text = iconv($encoding, 'UTF-8', $text);
-        }
-
-        $this->_output     = '';
-        $this->_outputLine = array();
-
-        $this->_clearLine();
-
-        $this->_outlineLengthLimit    = ($this->_outputWidth - 1);
-        $this->_inCharLineLengthLimit = ($this->_outputWidth * 4 + 100);
-
-        $wordBreakMode  = 0;
-        $lastCharWasEol = false;
-        $textLength     = @iconv_strlen($text, 'UTF-8');
-
-        if ($textLength === false) {
-            require_once 'Zend/Text/Figlet/Exception.php';
-            throw new Zend_Text_Figlet_Exception('$text is not encoded with ' . $encoding);
-        }
-
-        for ($charNum = 0; $charNum < $textLength; $charNum++) {
-            // Handle paragraphs
-            $char = iconv_substr($text, $charNum, 1, 'UTF-8');
-
-            if ($char === "\n" && $this->_handleParagraphs && !$lastCharWasEol) {
-                $nextChar = iconv_substr($text, ($charNum + 1), 1, 'UTF-8');
-                if (!$nextChar) {
-                    $nextChar = null;
-                }
-
-                $char = (ctype_space($nextChar)) ? "\n" : ' ';
-            }
-
-            $lastCharWasEol = (ctype_space($char) && $char !== "\t" && $char !== ' ');
-
-            if (ctype_space($char)) {
-                $char = ($char === "\t" || $char === ' ') ? ' ': "\n";
-            }
-
-            // Skip unprintable characters
-            $ordChar = $this->_uniOrd($char);
-            if (($ordChar > 0 && $ordChar < 32 && $char !== "\n") || $ordChar === 127) {
-                continue;
-            }
-
-            // Build the character
-            // Note: The following code is complex and thoroughly tested.
-            // Be careful when modifying!
-            do {
-                $charNotAdded = false;
-
-                if ($wordBreakMode === -1) {
-                    if ($char === ' ') {
-                        break;
-                    } else if ($char === "\n") {
-                        $wordBreakMode = 0;
-                        break;
-                    }
-
-                    $wordBreakMode = 0;
-                }
-
-                if ($char === "\n") {
-                    $this->_appendLine();
-                    $wordBreakMode = false;
-                } else if ($this->_addChar($char)) {
-                    if ($char !== ' ') {
-                        $wordBreakMode = ($wordBreakMode >= 2) ? 3: 1;
-                    } else {
-                        $wordBreakMode = ($wordBreakMode > 0) ? 2: 0;
-                    }
-                } else if ($this->_outlineLength === 0) {
-                    for ($i = 0; $i < $this->_charHeight; $i++) {
-                        if ($this->_rightToLeft === 1 && $this->_outputWidth > 1) {
-                            $offset = (strlen($this->_currentChar[$i]) - $this->_outlineLengthLimit);
-                            $this->_putString(substr($this->_currentChar[$i], $offset));
-                        } else {
-                            $this->_putString($this->_currentChar[$i]);
-                        }
-                    }
-
-                    $wordBreakMode = -1;
-                } else if ($char === ' ') {
-                    if ($wordBreakMode === 2) {
-                        $this->_splitLine();
-                    } else {
-                        $this->_appendLine();
-                    }
-
-                    $wordBreakMode = -1;
-                } else {
-                    if ($wordBreakMode >= 2) {
-                        $this->_splitLine();
-                    } else {
-                        $this->_appendLine();
-                    }
-
-                    $wordBreakMode = ($wordBreakMode === 3) ? 1 : 0;
-                    $charNotAdded  = true;
-                }
-            } while ($charNotAdded);
-        }
-
-        if ($this->_outlineLength !== 0) {
-            $this->_appendLine();
-        }
-
-        return $this->_output;
-    }
-
-    /**
-     * Puts the given string, substituting blanks for hardblanks. If outputWidth
-     * is 1, puts the entire string; otherwise puts at most outputWidth - 1
-     * characters. Puts a newline at the end of the string. The string is left-
-     * justified, centered or right-justified (taking outputWidth as the screen
-     * width) if justification is 0, 1 or 2 respectively.
-     *
-     * @param  string $string The string to add to the output
-     * @return void
-     */
-    protected function _putString($string)
-    {
-        $length = strlen($string);
-
-        if ($this->_outputWidth > 1) {
-            if ($length > ($this->_outputWidth - 1)) {
-                $length = ($this->_outputWidth - 1);
-            }
-
-            if ($this->_justification > 0) {
-                for ($i = 1;
-                     ((3 - $this->_justification) * $i + $length + $this->_justification - 2) < $this->_outputWidth;
-                     $i++) {
-                    $this->_output .= ' ';
-                }
-            }
-        }
-
-        $this->_output .= str_replace($this->_hardBlank, ' ', $string) . "\n";
-    }
-
-    /**
-     * Appends the current line to the output
-     *
-     * @return void
-     */
-    protected function _appendLine()
-    {
-        for ($i = 0; $i < $this->_charHeight; $i++) {
-            $this->_putString($this->_outputLine[$i]);
-        }
-
-        $this->_clearLine();
-    }
-
-    /**
-     * Splits inCharLine at the last word break (bunch of consecutive blanks).
-     * Makes a new line out of the first part and appends it using appendLine().
-     * Makes a new line out of the second part and returns.
-     *
-     * @return void
-     */
-    protected function _splitLine()
-    {
-        $gotSpace = false;
-        for ($i = ($this->_inCharLineLength - 1); $i >= 0; $i--) {
-            if (!$gotSpace && $this->_inCharLine[$i] === ' ') {
-                $gotSpace  = true;
-                $lastSpace = $i;
-            }
-
-            if ($gotSpace && $this->_inCharLine[$i] !== ' ') {
-                break;
-            }
-        }
-
-        $firstLength = ($i + 1);
-        $lastLength  = ($this->_inCharLineLength - $lastSpace - 1);
-
-        $firstPart = '';
-        for ($i = 0; $i < $firstLength; $i++) {
-            $firstPart[$i] = $this->_inCharLine[$i];
-        }
-
-        $lastPart = '';
-        for ($i = 0; $i < $lastLength; $i++) {
-            $lastPart[$i] = $this->_inCharLine[($lastSpace + 1 + $i)];
-        }
-
-        $this->_clearLine();
-
-        for ($i = 0; $i < $firstLength; $i++) {
-            $this->_addChar($firstPart[$i]);
-        }
-
-        $this->_appendLine();
-
-        for ($i = 0; $i < $lastLength; $i++) {
-            $this->_addChar($lastPart[$i]);
-        }
-    }
-
-    /**
-     * Clears the current line
-     *
-     * @return void
-     */
-    protected function _clearLine()
-    {
-        for ($i = 0; $i < $this->_charHeight; $i++) {
-            $this->_outputLine[$i] = '';
-        }
-
-        $this->_outlineLength    = 0;
-        $this->_inCharLineLength = 0;
-    }
-
-    /**
-     * Attempts to add the given character onto the end of the current line.
-     * Returns true if this can be done, false otherwise.
-     *
-     * @param  string $char Character which to add to the output
-     * @return boolean
-     */
-    protected function _addChar($char)
-    {
-        $this->_getLetter($char);
-
-        if ($this->_currentChar === null) {
-            return true;
-        }
-
-        $smushAmount = $this->_smushAmount();
-
-        if (($this->_outlineLength + $this->_currentCharWidth - $smushAmount) > $this->_outlineLengthLimit
-            || ($this->_inCharLineLength + 1) > $this->_inCharLineLengthLimit) {
-            return false;
-        }
-
-        $tempLine = '';
-        for ($row = 0; $row < $this->_charHeight; $row++) {
-            if ($this->_rightToLeft === 1) {
-                $tempLine = $this->_currentChar[$row];
-
-                for ($k = 0; $k < $smushAmount; $k++) {
-                    $position            = ($this->_currentCharWidth - $smushAmount + $k);
-                    $tempLine[$position] = $this->_smushem($tempLine[$position], $this->_outputLine[$row][$k]);
-                }
-
-                $this->_outputLine[$row] = $tempLine . substr($this->_outputLine[$row], $smushAmount);
-            } else {
-                for ($k = 0; $k < $smushAmount; $k++) {
-                    if (($this->_outlineLength - $smushAmount + $k) < 0) {
-                        continue;
-                    }
-
-                    $position = ($this->_outlineLength - $smushAmount + $k);
-                    if (isset($this->_outputLine[$row][$position])) {
-                        $leftChar = $this->_outputLine[$row][$position];
-                    } else {
-                        $leftChar = null;
-                    }
-
-                    $this->_outputLine[$row][$position] = $this->_smushem($leftChar, $this->_currentChar[$row][$k]);
-                }
-
-                $this->_outputLine[$row] .= substr($this->_currentChar[$row], $smushAmount);
-            }
-        }
-
-        $this->_outlineLength                          = strlen($this->_outputLine[0]);
-        $this->_inCharLine[$this->_inCharLineLength++] = $char;
-
-        return true;
-    }
-
-    /**
-     * Gets the requested character and sets current and previous char width.
-     *
-     * @param  string $char The character from which to get the letter of
-     * @return void
-     */
-    protected function _getLetter($char)
-    {
-        if (array_key_exists($this->_uniOrd($char), $this->_charList)) {
-            $this->_currentChar       = $this->_charList[$this->_uniOrd($char)];
-            $this->_previousCharWidth = $this->_currentCharWidth;
-            $this->_currentCharWidth  = strlen($this->_currentChar[0]);
-        } else {
-            $this->_currentChar = null;
-        }
-    }
-
-    /**
-     * Returns the maximum amount that the current character can be smushed into
-     * the current line.
-     *
-     * @return integer
-     */
-    protected function _smushAmount()
-    {
-        if (($this->_smushMode & (self::SM_SMUSH | self::SM_KERN)) === 0) {
-            return 0;
-        }
-
-        $maxSmush = $this->_currentCharWidth;
-        $amount   = $maxSmush;
-
-        for ($row = 0; $row < $this->_charHeight; $row++) {
-            if ($this->_rightToLeft === 1) {
-                $charbd = strlen($this->_currentChar[$row]);
-                while (true) {
-                    if (!isset($this->_currentChar[$row][$charbd])) {
-                        $leftChar = null;
-                    } else {
-                        $leftChar = $this->_currentChar[$row][$charbd];
-                    }
-
-                    if ($charbd > 0 && ($leftChar === null || $leftChar == ' ')) {
-                        $charbd--;
-                    } else {
-                        break;
-                    }
-                }
-
-                $linebd = 0;
-                while (true) {
-                    if (!isset($this->_outputLine[$row][$linebd])) {
-                        $rightChar = null;
-                    } else {
-                        $rightChar = $this->_outputLine[$row][$linebd];
-                    }
-
-                    if ($rightChar === ' ') {
-                        $linebd++;
-                    } else {
-                        break;
-                    }
-                }
-
-                $amount = ($linebd + $this->_currentCharWidth - 1 - $charbd);
-            } else {
-                $linebd = strlen($this->_outputLine[$row]);
-                while (true) {
-                    if (!isset($this->_outputLine[$row][$linebd])) {
-                        $leftChar = null;
-                    } else {
-                        $leftChar = $this->_outputLine[$row][$linebd];
-                    }
-
-                    if ($linebd > 0 && ($leftChar === null || $leftChar == ' ')) {
-                        $linebd--;
-                    } else {
-                        break;
-                    }
-                }
-
-                $charbd = 0;
-                while (true) {
-                    if (!isset($this->_currentChar[$row][$charbd])) {
-                        $rightChar = null;
-                    } else {
-                        $rightChar = $this->_currentChar[$row][$charbd];
-                    }
-
-                    if ($rightChar === ' ') {
-                        $charbd++;
-                    } else {
-                        break;
-                    }
-                }
-
-                $amount = ($charbd + $this->_outlineLength - 1 - $linebd);
-            }
-
-            if (empty($leftChar) || $leftChar === ' ') {
-                $amount++;
-            } else if (!empty($rightChar)) {
-                if ($this->_smushem($leftChar, $rightChar) !== null) {
-                    $amount++;
-                }
-            }
-
-            $maxSmush = min($amount, $maxSmush);
-        }
-
-        return $maxSmush;
-    }
-
-    /**
-     * Given two characters, attempts to smush them into one, according to the
-     * current smushmode. Returns smushed character or false if no smushing can
-     * be done.
-     *
-     * Smushmode values are sum of following (all values smush blanks):
-     *
-     *  1: Smush equal chars (not hardblanks)
-     *  2: Smush '_' with any char in hierarchy below
-     *  4: hierarchy: "|", "/\", "[]", "{}", "()", "<>"
-     *     Each class in hier. can be replaced by later class.
-     *  8: [ + ] -> |, { + } -> |, ( + ) -> |
-     * 16: / + \ -> X, > + < -> X (only in that order)
-     * 32: hardblank + hardblank -> hardblank
-     *
-     * @param  string $leftChar  Left character to smush
-     * @param  string $rightChar Right character to smush
-     * @return string
-     */
-    protected function _smushem($leftChar, $rightChar)
-    {
-        if ($leftChar === ' ') {
-            return $rightChar;
-        }
-
-        if ($rightChar === ' ') {
-            return $leftChar;
-        }
-
-        if ($this->_previousCharWidth < 2 || $this->_currentCharWidth < 2) {
-            // Disallows overlapping if the previous character or the current
-            // character has a width of one or zero.
-            return null;
-        }
-
-        if (($this->_smushMode & self::SM_SMUSH) === 0) {
-            // Kerning
-            return null;
-        }
-
-        if (($this->_smushMode & 63) === 0) {
-            // This is smushing by universal overlapping
-            if ($leftChar === ' ') {
-                return $rightChar;
-            } else if ($rightChar === ' ') {
-                return $leftChar;
-            } else if ($leftChar === $this->_hardBlank) {
-                return $rightChar;
-            } else if ($rightChar === $this->_hardBlank) {
-                return $rightChar;
-            } else if ($this->_rightToLeft === 1) {
-                return $leftChar;
-            } else {
-                // Occurs in the absence of above exceptions
-                return $rightChar;
-            }
-        }
-
-        if (($this->_smushMode & self::SM_HARDBLANK) > 0) {
-            if ($leftChar === $this->_hardBlank && $rightChar === $this->_hardBlank) {
-                return $leftChar;
-            }
-        }
-
-        if ($leftChar === $this->_hardBlank && $rightChar === $this->_hardBlank) {
-            return null;
-        }
-
-        if (($this->_smushMode & self::SM_EQUAL) > 0) {
-            if ($leftChar === $rightChar) {
-                return $leftChar;
-            }
-        }
-
-        if (($this->_smushMode & self::SM_LOWLINE) > 0) {
-            if ($leftChar === '_' && strchr('|/\\[]{}()<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if ($rightChar === '_' && strchr('|/\\[]{}()<>', $leftChar) !== false) {
-                return $leftChar;
-            }
-        }
-
-        if (($this->_smushMode & self::SM_HIERARCHY) > 0) {
-            if ($leftChar === '|' && strchr('/\\[]{}()<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if ($rightChar === '|' && strchr('/\\[]{}()<>', $leftChar) !== false) {
-                return $leftChar;
-            } else if (strchr('/\\', $leftChar) && strchr('[]{}()<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if (strchr('/\\', $rightChar) && strchr('[]{}()<>', $leftChar) !== false) {
-                return $leftChar;
-            } else if (strchr('[]', $leftChar) && strchr('{}()<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if (strchr('[]', $rightChar) && strchr('{}()<>', $leftChar) !== false) {
-                return $leftChar;
-            } else if (strchr('{}', $leftChar) && strchr('()<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if (strchr('{}', $rightChar) && strchr('()<>', $leftChar) !== false) {
-                return $leftChar;
-            } else if (strchr('()', $leftChar) && strchr('<>', $rightChar) !== false) {
-                return $rightChar;
-            } else if (strchr('()', $rightChar) && strchr('<>', $leftChar) !== false) {
-                return $leftChar;
-            }
-        }
-
-        if (($this->_smushMode & self::SM_PAIR) > 0) {
-            if ($leftChar === '[' && $rightChar === ']') {
-                return '|';
-            } else if ($rightChar === '[' && $leftChar === ']') {
-                return '|';
-            } else if ($leftChar === '{' && $rightChar === '}') {
-                return '|';
-            } else if ($rightChar === '{' && $leftChar === '}') {
-                return '|';
-            } else if ($leftChar === '(' && $rightChar === ')') {
-                return '|';
-            } else if ($rightChar === '(' && $leftChar === ')') {
-                return '|';
-            }
-        }
-
-        if (($this->_smushMode & self::SM_BIGX) > 0) {
-            if ($leftChar === '/' && $rightChar === '\\') {
-                return '|';
-            } else if ($rightChar === '/' && $leftChar === '\\') {
-                return 'Y';
-            } else if ($leftChar === '>' && $rightChar === '<') {
-                return 'X';
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Load the specified font
-     *
-     * @param  string $fontFile Font file to load
-     * @throws Zend_Text_Figlet_Exception When font file was not found
-     * @throws Zend_Text_Figlet_Exception When GZIP library is required but not found
-     * @throws Zend_Text_Figlet_Exception When font file is not readable
-     * @return void
-     */
-    protected function _loadFont($fontFile)
-    {
-        // Check if the font file exists
-        if (!file_exists($fontFile)) {
-            require_once 'Zend/Text/Figlet/Exception.php';
-            throw new Zend_Text_Figlet_Exception($fontFile . ': Font file not found');
-        }
-
-        // Check if gzip support is required
-        if (substr($fontFile, -3) === '.gz') {
-            if (!function_exists('gzcompress')) {
-                require_once 'Zend/Text/Figlet/Exception.php';
-                throw new Zend_Text_Figlet_Exception('GZIP library is required for '
-                                                     . 'gzip compressed font files');
-            }
-
-            $fontFile   = 'compress.zlib://' . $fontFile;
-            $compressed = true;
-        } else {
-            $compressed = false;
-        }
-
-        // Try to open the file
-        $fp = fopen($fontFile, 'rb');
-        if ($fp === false) {
-            require_once 'Zend/Text/Figlet/Exception.php';
-            throw new Zend_Text_Figlet_Exception($fontFile . ': Could not open file');
-        }
-
-        // If the file is not compressed, lock the stream
-        if (!$compressed) {
-            flock($fp, LOCK_SH);
-        }
-
-        // Get magic
-        $magic = $this->_readMagic($fp);
-
-        // Get the header
-        $numsRead = sscanf(fgets($fp, 1000),
-                           '%*c%c %d %*d %d %d %d %d %d',
-                           $this->_hardBlank,
-                           $this->_charHeight,
-                           $this->_maxLength,
-                           $smush,
-                           $cmtLines,
-                           $rightToLeft,
-                           $this->_fontSmush);
-
-        if ($magic !== self::FONTFILE_MAGIC_NUMBER || $numsRead < 5) {
-            require_once 'Zend/Text/Figlet/Exception.php';
-            throw new Zend_Text_Figlet_Exception($fontFile . ': Not a FIGlet 2 font file');
-        }
-
-        // Set default right to left
-        if ($numsRead < 6) {
-            $rightToLeft = 0;
-        }
-
-        // If no smush2, decode smush into smush2
-        if ($numsRead < 7) {
-            if ($smush === 2) {
-                $this->_fontSmush = self::SM_KERN;
-            } else if ($smush < 0) {
-                $this->_fontSmush = 0;
-            } else {
-                $this->_fontSmush = (($smush & 31) | self::SM_SMUSH);
-            }
-        }
-
-        // Correct char height && maxlength
-        $this->_charHeight = max(1, $this->_charHeight);
-        $this->_maxLength  = max(1, $this->_maxLength);
-
-        // Give ourselves some extra room
-        $this->_maxLength += 100;
-
-        // See if we have to override smush settings
-        $this->_setUsedSmush();
-
-        // Get left to right value
-        if ($this->_rightToLeft === null) {
-            $this->_rightToLeft = $rightToLeft;
-        }
-
-        // Get justification value
-        if ($this->_justification === null) {
-            $this->_justification = (2 * $this->_rightToLeft);
-        }
-
-        // Skip all comment lines
-        for ($line = 1; $line <= $cmtLines; $line++) {
-            $this->_skipToEol($fp);
-        }
-
-        // Fetch all ASCII characters
-        for ($asciiCode = 32; $asciiCode < 127; $asciiCode++) {
-            $this->_charList[$asciiCode] = $this->_loadChar($fp);
-        }
-
-        // Fetch all german characters
-        foreach ($this->_germanChars as $uniCode) {
-            $char = $this->_loadChar($fp);
-
-            if ($char === false) {
-                fclose($fp);
-                return;
-            }
-
-            if (trim(implode('', $char)) !== '') {
-                $this->_charList[$uniCode] = $char;
-            }
-        }
-
-        // At the end fetch all extended characters
-        while (!feof($fp)) {
-            // Get the Unicode
-            list($uniCode) = explode(' ', fgets($fp, 2048));
-
-            if (empty($uniCode)) {
-                continue;
-            }
-
-            // Convert it if required
-            if (substr($uniCode, 0, 2) === '0x') {
-                $uniCode = hexdec(substr($uniCode, 2));
-            } else if (substr($uniCode, 0, 1) === '0' and
-                       $uniCode !== '0' or
-                       substr($uniCode, 0, 2) === '-0') {
-                $uniCode = octdec($uniCode);
-            } else {
-                $uniCode = (int) $uniCode;
-            }
-
-            // Now fetch the character
-            $char = $this->_loadChar($fp);
-
-            if ($char === false) {
-                fclose($fp);
-                return;
-            }
-
-            $this->_charList[$uniCode] = $char;
-        }
-
-        fclose($fp);
-
-        $this->_fontLoaded = true;
-    }
-
-    /**
-     * Set the used smush mode, according to smush override, user smsush and
-     * font smush.
-     *
-     * @return void
-     */
-    protected function _setUsedSmush()
-    {
-        if ($this->_smushOverride === self::SMO_NO) {
-            $this->_smushMode = $this->_fontSmush;
-        } else if ($this->_smushOverride === self::SMO_YES) {
-            $this->_smushMode = $this->_userSmush;
-        } else if ($this->_smushOverride === self::SMO_FORCE) {
-            $this->_smushMode = ($this->_fontSmush | $this->_userSmush);
-        }
-    }
-
-    /**
-     * Reads a four-character magic string from a stream
-     *
-     * @param  resource $fp File pointer to the font file
-     * @return string
-     */
-    protected function _readMagic($fp)
-    {
-        $magic = '';
-
-        for ($i = 0; $i < 4; $i++) {
-            $magic .= fgetc($fp);
-        }
-
-        return $magic;
-    }
-
-    /**
-     * Skip a stream to the end of line
-     *
-     * @param  resource $fp File pointer to the font file
-     * @return void
-     */
-    protected function _skipToEol($fp)
-    {
-        $dummy = fgetc($fp);
-        while ($dummy !== false && !feof($fp)) {
-            if ($dummy === "\n") {
-                return;
-            }
-
-            if ($dummy === "\r") {
-                $dummy = fgetc($fp);
-
-                if (!feof($fp) && $dummy !== "\n") {
-                    fseek($fp, -1, SEEK_SET);
-                }
-
-                return;
-            }
-
-            $dummy = fgetc($fp);
-        }
-    }
-
-    /**
-     * Load a single character from the font file
-     *
-     * @param  resource $fp File pointer to the font file
-     * @return array
-     */
-    protected function _loadChar($fp)
-    {
-        $char = array();
-
-        for ($i = 0; $i < $this->_charHeight; $i++) {
-            if (feof($fp)) {
-                return false;
-            }
-
-            $line = rtrim(fgets($fp, 2048), "\r\n");
-
-            if (preg_match('#(.)\\1?$#', $line, $result) === 1) {
-                $line = str_replace($result[1], '', $line);
-            }
-
-            $char[] = $line;
-        }
-
-        return $char;
-    }
-
-    /**
-     * Unicode compatible ord() method
-     *
-     * @param  string $c The char to get the value from
-     * @return integer
-     */
-    protected function _uniOrd($c)
-    {
-        $h = ord($c[0]);
-
-        if ($h <= 0x7F) {
-            $ord = $h;
-        } else if ($h < 0xC2) {
-            $ord = 0;
-        } else if ($h <= 0xDF) {
-            $ord = (($h & 0x1F) << 6 | (ord($c[1]) & 0x3F));
-        } else if ($h <= 0xEF) {
-            $ord = (($h & 0x0F) << 12 | (ord($c[1]) & 0x3F) << 6 | (ord($c[2]) & 0x3F));
-        } else if ($h <= 0xF4) {
-            $ord = (($h & 0x0F) << 18 | (ord($c[1]) & 0x3F) << 12 |
-                   (ord($c[2]) & 0x3F) << 6 | (ord($c[3]) & 0x3F));
-        } else {
-            $ord = 0;
-        }
-
-        return $ord;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Figlet/Exception.php b/airtime_mvc/library/Zend/Text/Figlet/Exception.php
deleted file mode 100644
index 8834c546e..000000000
--- a/airtime_mvc/library/Zend/Text/Figlet/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Figlet
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Text_Exception
- */
-require_once 'Zend/Text/Exception.php';
-
-/**
- * Exception class for Zend_Figlet
- *
- * @category  Zend
- * @package   Zend_Text_Figlet
- * @uses      Zend_Text_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Figlet_Exception extends Zend_Text_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Text/Figlet/zend-framework.flf b/airtime_mvc/library/Zend/Text/Figlet/zend-framework.flf
deleted file mode 100644
index fef6be574..000000000
--- a/airtime_mvc/library/Zend/Text/Figlet/zend-framework.flf
+++ /dev/null
@@ -1,753 +0,0 @@
-flf2a$ 7 6 10 51 22 0 7987
-Author : Wil Sinclair
-Date   : 2008/6/26 20:34:25
-Version: 1.0
-
--------------------------------------------------------------------------------
- 
- Zend Framework
-
- LICENSE
-
- This source file is subject to the new BSD license that is bundled
- with this package in the file LICENSE.txt.
- It is also available through the world-wide-web at this URL:
- http://framework.zend.com/license/new-bsd
- If you did not receive a copy of the license and are unable to
- obtain it through the world-wide-web, please send an email
- to license@zend.com so we can send you a copy immediately.
- 
- Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-
--------------------------------------------------------------------------------
-
-$ #
-$ #
-$ #
-$ #
-$ #
-$ #
-$ ##
-   __   #
-  /  \\ #
-  |  || #
-  |$ || #
-   \//  #
-   []|  #
-        ##
-   __  __ #
-  / /// //#
- /_///_// #
- `-` `-`  #
-          #
-          #
-          ##
-##
- #
- #
- #
- #
- #
- ##
-    _     #
-   | ||_  #
-  / ___// #
-  \___ \\ #
-  /  $ // #
- /_   //  #
- `-|_||   ##
-%#
- #
- #
- #
- #
- #
- ##
-&#
- #
- #
- #
- #
- #
- ##
-'#
- #
- #
- #
- #
- #
- ##
-(#
- #
- #
- #
- #
- #
- ##
-)#
- #
- #
- #
- #
- #
- ##
-*#
- #
- #
- #
- #
- #
- ##
-          #
-    _     #
-  _| ||   #
- |_ $ _|| #
- `-|_|-`  #
-    -     #
-          ##
-,#
- #
- #
- #
- #
- #
- ##
-          #
-          #
- ,------,,#
-'======'' #
-          #
-          #
-          ##
-.#
- #
- #
- #
- #
- #
- ##
-/#
- #
- #
- #
- #
- #
- ##
-   ___    #
-  / _ \\  #
- | |$| || #
- | |_| || #
-  \___//  #
-  `---`   #
-          ##
-   __     #
-  /  ||   #
-   | ||   #
-  _| ||_  #
- |__$__|| #
- `-----`  #
-          ##
- _____    #
- \___ \\  #
- / ___//  #
- | $  \\  #
- |_____\\ #
- `------` #
-          ##
-  _____   #
- |___  \\ #
-  __$\ // #
-  __$/ \\ #
- |_____// #
- `-----`  #
-          ##
-    __    #
-   /  ||  #
-  / /|||_ #
- /__ $ _||#
-    |_||  #
-    `-`   #
-          ##
-   _____  #
-  / ___// #
- /___ \\  #
-  / $ //  #
- /___//   #
-`----`    #
-          ##
-    __   #
-   / //  #
-  / //   #
- / __ \\ #
- \____// #
-  `---`  #
-         ##
-  ______  #
- |___  // #
-    / //  #
-   | ||   #
-   |_||   #
-   `-`    # 
-          ##
-  ____   #
- /    \\ #
- \ -- // #
- / -- \\ #
- \____// #
- `----`  #
-         ##
-  ____    #
- / __ \\  #
- \__   || #
-    / //  #
-   /_//   #
-   `-`    #
-          ##
-       #
-       #
-   []| #
-       #
-   []| #
-       #
-       ##
-       #
-   _   #
-  [_]| #
-   _   #
-  | ]] #
-  |//  #
-  '    ##
-<#
- #
- #
- #
- #
- #
- ##
-          #
-  ______  #
- /_____// #
- /_____// #
- `-----`  #
-          #
-          ##
->#
- #
- #
- #
- #
- #
- ##
-?#
- #
- #
- #
- #
- #
- ##
-@#
- #
- #
- #
- #
- #
- ##
-   ___    #
-  / _ \\  #
- / //\ \\ #
-|  ___  ||#
-|_||  |_||#
-`-`   `-` #
-          ##
- ______   #
-|      \\ #
-|  --$  // #
-|  --  \\ #
-|______// #
-`------`  #
-          ##
-  _____   #
- / ____|| #
-/ //---`' #
-\ \\___   #
- \_____|| #
-  `----`  #
-          ##
- _____    #
-|  __ \\  #
-| |$ \ || #
-| |__/ || #
-|_____//  #
- -----`   #
-          ##
-  _____   #
- |  ___|| #
- | ||__   #
- | ||__   #
- |_____|| #
- `-----`  #
-          ##
-  ______  #
- /_____// #
- `____ `  #
- /___//   #
- `__ `    #
- /_//     #
- `-`      ##
-  _____   #
- /  ___|| #
-| //$__   #
-| \\_\ || #
- \____//  #
-  `---`   #
-          ##
- __   _   #
-| || | || #
-| '--' || #
-| .--. || #
-|_|| |_|| #
-`-`  `-`  #
-          ##
-  ______  #
- /_   _// #
-  -| ||-  #
-  _| ||_  #
- /_____// #
- `-----`  #
-          ##
-  ______  #
- /_   _// #
-   | ||   #
-  _| ||   #
- /__//    #
- `--`     #
-          ##
-  _  __  #
- | |/ // #
- | ' //  #
- | . \\  #
- |_|\_\\ #
- `-` --` #
-         ##
-  __     #
- | ||    #
- | ||    #
- | ||__  #
- |____// #
- `----`  #
-         ##
- _    _   #
-| \  / || #
-|  \/  || #
-| .  . || #
-|_|\/|_|| #
-`-`  `-`  #
-          ##
-  _  _   #
- | \| || #
- |  ' || #
- | .  || #
- |_|\_|| #
- `-` -`  #
-         ##
-   ___    #
-  / _ \\  #
- | /$\ || #
- | \_/ || #
-  \___//  #
-  `---`   #
-          ##
-  ____    #
- |  _ \\  #
- | |_| || #
- | .__//  #
- |_|--`   #
- `-`      #
-          ##
-  ___    #
- / _ \\  #
-| /$\ || #
-| \_/ || #
- \___ \\ #
- `---`   #
-         ##
-  ____    #
- |  _ \\  #
- | |_| || #
- | .  //  #
- |_|\_\\  #
- `-` --`  #
-          ##
-   _____  #
-  / ___// #
-  \___ \\ #
-  /  $ // #
- /____//  #
-`-----`   #
-          ##
-  ______  #
- /_   _// #
- `-| |,-  #
-   | ||   #
-   |_||   #
-   `-`'   #
-          ##
- _    _   #
-| || | || #
-| || | || #
-| \\_/ || #
- \____//  #
-  `---`   #
-          ##
-__    __  #
-\ \\ / // #
- \ \/ //  #
-  \  //   #
-   \//    #
-    `     #
-          ##
- _    _   #
-| |  | || #
-| |/\| || #
-|  /\  || #
-|_// \_|| #
-`-`   `-` #
-          ##
- __   __  #
- \ \\/ // #
-  \ $ //  #
-  / . \\  #
- /_//\_\\ #
- `-`  --` #
-          ##
- __   __  #
- \ \\/ // #
-  \ ` //  #
-   | ||   #
-   |_||   #
-   `-`'   #
-          ##
- ______   #
-|____ //  #
-   / //   #
-  / //    #
- / //__   #
-/______|| #
-`------`  ##
-[#
- #
- #
- #
- #
- #
- ##
-\#
- #
- #
- #
- #
- #
- ##
-]#
- #
- #
- #
- #
- #
- ##
-^#
- #
- #
- #
- #
- #
- ##
-_#
- #
- #
- #
- #
- #
- ##
-`#
- #
- #
- #
- #
- #
- ##
-   ___    #
-  / _ \\  #
- / //\ \\ #
-|  ___  ||#
-|_||  |_||#
-`-`   `-` #
-          ##
- ______   #
-|      \\ #
-|  --$ // #
-|  --  \\ #
-|______// #
-`------`  #
-          ##
-  _____   #
- / ____|| #
-/ //---`' #
-\ \\___   #
- \_____|| #
-  `----`  #
-          ##
- _____    #
-|  __ \\  #
-| |$ \ || #
-| |__/ || #
-|_____//  #
- -----`   #
-          ##
-  _____   #
- |  ___|| #
- | ||__   #
- | ||__   #
- |_____|| #
- `-----`  #
-          ##
-  ______  #
- /_____// #
- `____ `  #
- /___//   #
- `__ `    #
- /_//     #
- `-`      ##
-  _____   #
- /  ___|| #
-| //$__   #
-| \\_\ || #
- \____//  #
-  `---`   #
-          ##
- __   _   #
-| || | || #
-| '--' || #
-| .--. || #
-|_|| |_|| #
-`-`  `-`  #
-          ##
-  ______  #
- /_   _// #
-  -| ||-  #
-  _| ||_  #
- /_____// #
- `-----`  #
-          ##
-  ______  #
- /_   _// #
-   | ||   #
-  _| ||   #
- /__//    #
- `--`     #
-          ##
-  _  __  #
- | |/ // #
- | ' //  #
- | . \\  #
- |_|\_\\ #
- `-` --` #
-         ##
-  __     #
- | ||    #
- | ||    #
- | ||__  #
- |____// #
- `----`  #
-         ##
- _    _   #
-| \  / || #
-|  \/  || #
-| .  . || #
-|_|\/|_|| #
-`-`  `-`  #
-          ##
-  _  _   #
- | \| || #
- |  ' || #
- | .  || #
- |_|\_|| #
- `-` -`  #
-         ##
-   ___    #
-  / _ \\  #
- | /$\ || #
- | \_/ || #
-  \___//  #
-  `---`   #
-          ##
-          #
-  ____    #
- |    \\  #
- | [] ||  #
- |  __//  #
- |_|`-`   #
- `-`      ##
-          #
-    ___   #
-   /   || #
-  | [] || #
-   \__ || #
-    -|_|| #
-     `-`  ##
-  ____    #
- |  _ \\  #
- | |_| || #
- | .  //  #
- |_|\_\\  #
- `-` --`  #
-          ##
-   _____  #
-  / ___// #
-  \___ \\ #
-  /  $ // #
- /____//  #
-`-----`   #
-          ##
-  ______  #
- /_   _// #
- `-| |,-  #
-   | ||   #
-   |_||   #
-   `-`'   #
-          ##
- _    _   #
-| || | || #
-| || | || #
-| \\_/ || #
- \____//  #
-  `---`   #
-          ##
-__    __  #
-\ \\ / // #
- \ \/ //  #
-  \  //   #
-   \//    #
-    `     #
-          ##
- _    _   #
-| |  | || #
-| |/\| || #
-|  /\  || #
-|_// \_|| #
-`-`   `-` #
-          ##
- __   __  #
- \ \\/ // #
-  \ $ //  #
-  / . \\  #
- /_//\_\\ #
- `-`  --` #
-          ##
- __   __  #
- \ \\/ // #
-  \ ` //  #
-   | ||   #
-   |_||   #
-   `-`'   #
-          ##
-  _____   #
- |__  //  #
-   / //   #
-  / //__  #
- /_____|| #
- `-----`  #
-          ##
-{#
- #
- #
- #
- #
- #
- ##
-|#
- #
- #
- #
- #
- #
- ##
-}#
- #
- #
- #
- #
- #
- ##
-~#
- #
- #
- #
- #
- #
- ##
-  []|_[]| #
-  / _ \\  #
- / //\ \\ #
-| $___$ ||#
-|_||$ |_||#
-`-`   `-` #
-          ##
-  []|_[]| #
-  / _ \\  #
- | /$\ || #
- | \_/ || #
-  \___//  #
-   ---`   #
-          ##
- []| []|  #
-| ||$| || #
-| ||$| || #
-| \\_/ || #
- \____//  #
-  `---`   #
-          ##
-  []|_[]| #
-  / _ \\  #
- / //\ \\ #
-| $___$ ||#
-|_||$ |_||#
-`-`   `-` #
-          ##
-  []|_[]| #
-  / _ \\  #
- | /$\ || #
- | \_/ || #
-  \___//  #
-   ---`   #
-          ##
- []| []|  #
-| ||$| || #
-| ||$| || #
-| \\_/ || #
- \____//  #
-  `---`   #
-          ##
-  ,--.    #
- | _$ \\  #
- |    //  #
- | |\ \\  #
- |$ ___\\ #
- |_|----` #
-  -       ##
-162  CENT SIGN
-   _    #
-  | ||  #
- / __// #
-| (__`  #
- \   \\ #
-  |_|`  #
-  `-`  ##
-215  MULTIPLICATION SIGN
-      #  
-      #
- \\// #
-  \\  #
- //\\ #
-      #
-      ##
diff --git a/airtime_mvc/library/Zend/Text/MultiByte.php b/airtime_mvc/library/Zend/Text/MultiByte.php
deleted file mode 100644
index c3cd04e11..000000000
--- a/airtime_mvc/library/Zend/Text/MultiByte.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: MultiByte.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Text_MultiByte contains multibyte safe string methods
- *
- * @category  Zend
- * @package   Zend_Text
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_MultiByte
-{
-    /**
-     * Word wrap
-     *
-     * @param  string  $string
-     * @param  integer $width
-     * @param  string  $break
-     * @param  boolean $cut
-     * @param  string  $charset
-     * @return string
-     */
-    public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'UTF-8')
-    {
-        $result = array();
-
-        while (($stringLength = iconv_strlen($string, $charset)) > 0) {
-            $subString = iconv_substr($string, 0, $width, $charset);
-
-            if ($subString === $string) {
-                $cutLength = null;
-            } else {
-                $nextChar = iconv_substr($string, $width, 1, $charset);
-
-                if ($nextChar === ' ' || $nextChar === $break) {
-                    $afterNextChar = iconv_substr($string, $width + 1, 1, $charset);
-
-                    if ($afterNextChar === false) {
-                        $subString .= $nextChar;
-                    }
-
-                    $cutLength = iconv_strlen($subString, $charset) + 1;
-                } else {
-                    $spacePos = iconv_strrpos($subString, ' ', $charset);
-
-                    if ($spacePos !== false) {
-                        $subString = iconv_substr($subString, 0, $spacePos, $charset);
-                        $cutLength = $spacePos + 1;
-                    } else if ($cut === false) {
-                        $spacePos = iconv_strpos($string, ' ', 0, $charset);
-
-                        if ($spacePos !== false) {
-                            $subString = iconv_substr($string, 0, $spacePos, $charset);
-                            $cutLength = $spacePos + 1;
-                        } else {
-                            $subString = $string;
-                            $cutLength = null;
-                        }
-                    } else {
-                        $breakPos = iconv_strpos($subString, $break, 0, $charset);
-
-                        if ($breakPos !== false) {
-                            $subString = iconv_substr($subString, 0, $breakPos, $charset);
-                            $cutLength = $breakPos + 1;
-                        } else {
-                            $subString = iconv_substr($subString, 0, $width, $charset);
-                            $cutLength = $width;
-                        }
-                    }
-                }
-            }
-
-            $result[] = $subString;
-
-            if ($cutLength !== null) {
-                $string = iconv_substr($string, $cutLength, ($stringLength - $cutLength), $charset);
-            } else {
-                break;
-            }
-        }
-
-        return implode($break, $result);
-    }
-
-    /**
-     * String padding
-     *
-     * @param  string  $input
-     * @param  integer $padLength
-     * @param  string  $padString
-     * @param  integer $padType
-     * @param  string  $charset
-     * @return string
-     */
-    public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'UTF-8')
-    {
-        $return          = '';
-        $lengthOfPadding = $padLength - iconv_strlen($input, $charset);
-        $padStringLength = iconv_strlen($padString, $charset);
-
-        if ($padStringLength === 0 || $lengthOfPadding === 0) {
-            $return = $input;
-        } else {
-            $repeatCount = floor($lengthOfPadding / $padStringLength);
-
-            if ($padType === STR_PAD_BOTH) {
-                $lastStringLeft  = '';
-                $lastStringRight = '';
-                $repeatCountLeft = $repeatCountRight = ($repeatCount - $repeatCount % 2) / 2;
-
-                $lastStringLength       = $lengthOfPadding - 2 * $repeatCountLeft * $padStringLength;
-                $lastStringLeftLength   = $lastStringRightLength = floor($lastStringLength / 2);
-                $lastStringRightLength += $lastStringLength % 2;
-
-                $lastStringLeft  = iconv_substr($padString, 0, $lastStringLeftLength, $charset);
-                $lastStringRight = iconv_substr($padString, 0, $lastStringRightLength, $charset);
-
-                $return = str_repeat($padString, $repeatCountLeft) . $lastStringLeft
-                        . $input
-                        . str_repeat($padString, $repeatCountRight) . $lastStringRight;
-            } else {
-                $lastString = iconv_substr($padString, 0, $lengthOfPadding % $padStringLength, $charset);
-
-                if ($padType === STR_PAD_LEFT) {
-                    $return = str_repeat($padString, $repeatCount) . $lastString . $input;
-                } else {
-                    $return = $input . str_repeat($padString, $repeatCount) . $lastString;
-                }
-            }
-        }
-
-        return $return;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Table.php b/airtime_mvc/library/Zend/Text/Table.php
deleted file mode 100644
index a6f62fa95..000000000
--- a/airtime_mvc/library/Zend/Text/Table.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Text_Table enables developers to create tables out of characters
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table
-{
-    /**
-     * Auto seperator settings
-     */
-    const AUTO_SEPARATE_NONE   = 0x0;
-    const AUTO_SEPARATE_HEADER = 0x1;
-    const AUTO_SEPARATE_FOOTER = 0x2;
-    const AUTO_SEPARATE_ALL    = 0x4;
-
-    /**
-     * Decorator used for the table borders
-     *
-     * @var Zend_Text_Table_Decorator_Interface
-     */
-    protected $_decorator = null;
-
-    /**
-     * List of all column widths
-     *
-     * @var array
-     */
-    protected $_columnWidths = null;
-
-    /**
-     * Rows of the table
-     *
-     * @var array
-     */
-    protected $_rows = array();
-
-    /**
-     * Auto separation mode
-     *
-     * @var integer
-     */
-    protected $_autoSeparate = self::AUTO_SEPARATE_ALL;
-
-    /**
-     * Padding for columns
-     *
-     * @var integer
-     */
-    protected $_padding = 0;
-
-    /**
-     * Default column aligns for rows created by appendRow(array $data)
-     *
-     * @var array
-     */
-    protected $_defaultColumnAligns = array();
-
-    /**
-     * Plugin loader for decorators
-     *
-     * @var string
-     */
-    protected $_pluginLoader = null;
-
-    /**
-     * Charset which is used for input by default
-     *
-     * @var string
-     */
-    protected static $_inputCharset = 'utf-8';
-
-    /**
-     * Charset which is used internally
-     *
-     * @var string
-     */
-    protected static $_outputCharset = 'utf-8';
-
-    /**
-     * Option keys to skip when calling setOptions()
-     *
-     * @var array
-     */
-    protected $_skipOptions = array(
-        'options',
-        'config',
-        'defaultColumnAlign',
-    );
-
-    /**
-     * Create a basic table object
-     *
-     * @param  array             $columnsWidths List of all column widths
-     * @param  Zend_Config|array $options       Configuration options
-     * @throws Zend_Text_Table_Exception When no columns widths were set
-     */
-    public function __construct($options = null)
-    {
-        // Set options
-        if (is_array($options)) {
-            $this->setOptions($options);
-        } else if ($options instanceof Zend_Config) {
-            $this->setConfig($options);
-        }
-
-        // Check if column widths were set
-        // @todo When column widths were not set, assume auto-sizing
-        if ($this->_columnWidths === null) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('You must define the column widths');
-        }
-
-        // If no decorator was given, use default unicode decorator
-        if ($this->_decorator === null) {
-            if (self::getOutputCharset() === 'utf-8') {
-                $this->setDecorator('unicode');
-            } else {
-                $this->setDecorator('ascii');
-            }
-        }
-    }
-
-    /**
-     * Set options from array
-     *
-     * @param  array $options Configuration for Zend_Text_Table
-     * @return Zend_Text_Table
-     */
-    public function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            if (in_array(strtolower($key), $this->_skipOptions)) {
-                continue;
-            }
-
-            $method = 'set' . ucfirst($key);
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set options from config object
-     *
-     * @param  Zend_Config $config Configuration for Zend_Text_Table
-     * @return Zend_Text_Table
-     */
-    public function setConfig(Zend_Config $config)
-    {
-        return $this->setOptions($config->toArray());
-    }
-
-    /**
-     * Set column widths
-     *
-     * @param  array $columnWidths Widths of all columns
-     * @throws Zend_Text_Table_Exception When no columns were supplied
-     * @throws Zend_Text_Table_Exception When a column has an invalid width
-     * @return Zend_Text_Table
-     */
-    public function setColumnWidths(array $columnWidths)
-    {
-        if (count($columnWidths) === 0) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('You must supply at least one column');
-        }
-
-        foreach ($columnWidths as $columnNum => $columnWidth) {
-            if (is_int($columnWidth) === false or $columnWidth < 1) {
-                require_once 'Zend/Text/Table/Exception.php';
-                throw new Zend_Text_Table_Exception('Column ' . $columnNum . ' has an invalid'
-                                                    . ' column width');
-            }
-        }
-
-        $this->_columnWidths = $columnWidths;
-
-        return $this;
-    }
-
-    /**
-     * Set auto separation mode
-     *
-     * @param  integer $autoSeparate Auto separation mode
-     * @return Zend_Text_Table
-     */
-    public function setAutoSeparate($autoSeparate)
-    {
-        $this->_autoSeparate = (int) $autoSeparate;
-        return $this;
-    }
-
-    /**
-     * Set decorator
-     *
-     * @param  Zend_Text_Table_Decorator_Interface|string $decorator Decorator to use
-     * @return Zend_Text_Table
-     */
-    public function setDecorator($decorator)
-    {
-        if ($decorator instanceof Zend_Text_Table_Decorator_Interface) {
-            $this->_decorator = $decorator;
-        } else {
-            $classname        = $this->getPluginLoader()->load($decorator);
-            $this->_decorator = new $classname;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the column padding
-     *
-     * @param  integer $padding The padding for the columns
-     * @return Zend_Text_Table
-     */
-    public function setPadding($padding)
-    {
-        $this->_padding = max(0, (int) $padding);
-        return $this;
-    }
-
-    /**
-     * Get the plugin loader for decorators
-     *
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader()
-    {
-        if ($this->_pluginLoader === null) {
-            $prefix     = 'Zend_Text_Table_Decorator_';
-            $pathPrefix = 'Zend/Text/Table/Decorator/';
-
-            require_once 'Zend/Loader/PluginLoader.php';
-            $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix));
-        }
-
-        return $this->_pluginLoader;
-    }
-
-    /**
-     * Set default column align for rows created by appendRow(array $data)
-     *
-     * @param  integer $columnNum
-     * @param  string  $align
-     * @return Zend_Text_Table
-     */
-    public function setDefaultColumnAlign($columnNum, $align)
-    {
-        $this->_defaultColumnAligns[$columnNum] = $align;
-
-        return $this;
-    }
-
-    /**
-     * Set the input charset for column contents
-     *
-     * @param string $charset
-     */
-    public static function setInputCharset($charset)
-    {
-        self::$_inputCharset = strtolower($charset);
-    }
-
-    /**
-     * Get the input charset for column contents
-     *
-     * @param string $charset
-     */
-    public static function getInputCharset()
-    {
-        return self::$_inputCharset;
-    }
-
-    /**
-     * Set the output charset for column contents
-     *
-     * @param string $charset
-     */
-    public static function setOutputCharset($charset)
-    {
-        self::$_outputCharset = strtolower($charset);
-    }
-
-    /**
-     * Get the output charset for column contents
-     *
-     * @param string $charset
-     */
-    public static function getOutputCharset()
-    {
-        return self::$_outputCharset;
-    }
-
-    /**
-     * Append a row to the table
-     *
-     * @param  array|Zend_Text_Table_Row $row The row to append to the table
-     * @throws Zend_Text_Table_Exception When $row is neither an array nor Zend_Zext_Table_Row
-     * @throws Zend_Text_Table_Exception When a row contains too many columns
-     * @return Zend_Text_Table
-     */
-    public function appendRow($row)
-    {
-        if (!is_array($row) && !($row instanceof Zend_Text_Table_Row)) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('$row must be an array or instance of Zend_Text_Table_Row');
-        }
-
-        if (is_array($row)) {
-            if (count($row) > count($this->_columnWidths)) {
-                require_once 'Zend/Text/Table/Exception.php';
-                throw new Zend_Text_Table_Exception('Row contains too many columns');
-            }
-
-            require_once 'Zend/Text/Table/Row.php';
-
-            $data   = $row;
-            $row    = new Zend_Text_Table_Row();
-            $colNum = 0;
-            foreach ($data as $columnData) {
-                if (isset($this->_defaultColumnAligns[$colNum])) {
-                    $align = $this->_defaultColumnAligns[$colNum];
-                } else {
-                    $align = null;
-                }
-
-                $row->appendColumn(new Zend_Text_Table_Column($columnData, $align));
-                $colNum++;
-            }
-        }
-
-        $this->_rows[] = $row;
-
-        return $this;
-    }
-
-    /**
-     * Render the table
-     *
-     * @throws Zend_Text_Table_Exception When no rows were added to the table
-     * @return string
-     */
-    public function render()
-    {
-        // There should be at least one row
-        if (count($this->_rows) === 0) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('No rows were added to the table yet');
-        }
-
-        // Initiate the result variable
-        $result = '';
-
-        // Count total columns
-        $totalNumColumns = count($this->_columnWidths);
-
-        // Now render all rows, starting from the first one
-        $numRows = count($this->_rows);
-        foreach ($this->_rows as $rowNum => $row) {
-            // Get all column widths
-            if (isset($columnWidths) === true) {
-                $lastColumnWidths = $columnWidths;
-            }
-
-            $renderedRow  = $row->render($this->_columnWidths, $this->_decorator, $this->_padding);
-            $columnWidths = $row->getColumnWidths();
-            $numColumns   = count($columnWidths);
-
-            // Check what we have to draw
-            if ($rowNum === 0) {
-                // If this is the first row, draw the table top
-                $result .= $this->_decorator->getTopLeft();
-
-                foreach ($columnWidths as $columnNum => $columnWidth) {
-                    $result .= str_repeat($this->_decorator->getHorizontal(),
-                                          $columnWidth);
-
-                    if (($columnNum + 1) === $numColumns) {
-                        $result .= $this->_decorator->getTopRight();
-                    } else {
-                        $result .= $this->_decorator->getHorizontalDown();
-                    }
-                }
-
-                $result .= "\n";
-            } else {
-                // Else check if we have to draw the row separator
-                if ($this->_autoSeparate & self::AUTO_SEPARATE_ALL) {
-                    $drawSeparator = true;
-                } else if ($rowNum === 1 && $this->_autoSeparate & self::AUTO_SEPARATE_HEADER) {
-                    $drawSeparator = true;
-                } else if ($rowNum === ($numRows - 1) && $this->_autoSeparate & self::AUTO_SEPARATE_FOOTER) {
-                    $drawSeparator = true;
-                } else {
-                    $drawSeparator = false;
-                }
-
-                if ($drawSeparator) {
-                    $result .= $this->_decorator->getVerticalRight();
-
-                    $currentUpperColumn = 0;
-                    $currentLowerColumn = 0;
-                    $currentUpperWidth  = 0;
-                    $currentLowerWidth  = 0;
-
-                    // Loop through all column widths
-                    foreach ($this->_columnWidths as $columnNum => $columnWidth) {
-                        // Add the horizontal line
-                        $result .= str_repeat($this->_decorator->getHorizontal(),
-                                              $columnWidth);
-
-                        // If this is the last line, break out
-                        if (($columnNum + 1) === $totalNumColumns) {
-                            break;
-                        }
-
-                        // Else check, which connector style has to be used
-                        $connector          = 0x0;
-                        $currentUpperWidth += $columnWidth;
-                        $currentLowerWidth += $columnWidth;
-
-                        if ($lastColumnWidths[$currentUpperColumn] === $currentUpperWidth) {
-                            $connector          |= 0x1;
-                            $currentUpperColumn += 1;
-                            $currentUpperWidth   = 0;
-                        } else {
-                            $currentUpperWidth += 1;
-                        }
-
-                        if ($columnWidths[$currentLowerColumn] === $currentLowerWidth) {
-                            $connector          |= 0x2;
-                            $currentLowerColumn += 1;
-                            $currentLowerWidth   = 0;
-                        } else {
-                            $currentLowerWidth += 1;
-                        }
-
-                        switch ($connector) {
-                            case 0x0:
-                                $result .= $this->_decorator->getHorizontal();
-                                break;
-
-                            case 0x1:
-                                $result .= $this->_decorator->getHorizontalUp();
-                                break;
-
-                            case 0x2:
-                                $result .= $this->_decorator->getHorizontalDown();
-                                break;
-
-                            case 0x3:
-                                $result .= $this->_decorator->getCross();
-                                break;
-
-                            default:
-                                // This can never happen, but the CS tells I have to have it ...
-                                break;
-                        }
-                    }
-
-                    $result .= $this->_decorator->getVerticalLeft() . "\n";
-                }
-            }
-
-            // Add the rendered row to the result
-            $result .= $renderedRow;
-
-            // If this is the last row, draw the table bottom
-            if (($rowNum + 1) === $numRows) {
-                $result .= $this->_decorator->getBottomLeft();
-
-                foreach ($columnWidths as $columnNum => $columnWidth) {
-                    $result .= str_repeat($this->_decorator->getHorizontal(),
-                                          $columnWidth);
-
-                    if (($columnNum + 1) === $numColumns) {
-                        $result .= $this->_decorator->getBottomRight();
-                    } else {
-                        $result .= $this->_decorator->getHorizontalUp();
-                    }
-                }
-
-                $result .= "\n";
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Magic method which returns the rendered table
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            return $this->render();
-        } catch (Exception $e) {
-            trigger_error($e->getMessage(), E_USER_ERROR);
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Column.php b/airtime_mvc/library/Zend/Text/Table/Column.php
deleted file mode 100644
index 385c085de..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Column.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Column.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Text_Table
- */
-require_once 'Zend/Text/Table.php';
-
-/**
- * @see Zend_Text_MultiByte
- */
-require_once 'Zend/Text/MultiByte.php';
-
-/**
- * Column class for Zend_Text_Table_Row
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table_Column
-{
-    /**
-     * Aligns for columns
-     */
-    const ALIGN_LEFT   = 'left';
-    const ALIGN_CENTER = 'center';
-    const ALIGN_RIGHT  = 'right';
-
-    /**
-     * Content of the column
-     *
-     * @var string
-     */
-    protected $_content = '';
-
-    /**
-     * Align of the column
-     *
-     * @var string
-     */
-    protected $_align = self::ALIGN_LEFT;
-
-    /**
-     * Colspan of the column
-     *
-     * @var integer
-     */
-    protected $_colSpan = 1;
-
-    /**
-     * Allowed align parameters
-     *
-     * @var array
-     */
-    protected $_allowedAligns = array(self::ALIGN_LEFT, self::ALIGN_CENTER, self::ALIGN_RIGHT);
-
-    /**
-     * Create a column for a Zend_Text_Table_Row object.
-     *
-     * @param string  $content  The content of the column
-     * @param string  $align    The align of the content
-     * @param integer $colSpan  The colspan of the column
-     * @param string  $charset  The encoding of the content
-     */
-    public function __construct($content = null, $align = null, $colSpan = null, $charset = null)
-    {
-        if ($content !== null) {
-            $this->setContent($content, $charset);
-        }
-
-        if ($align !== null) {
-            $this->setAlign($align);
-        }
-
-        if ($colSpan !== null) {
-            $this->setColSpan($colSpan);
-        }
-    }
-
-    /**
-     * Set the content.
-     *
-     * If $charset is not defined, it is assumed that $content is encoded in
-     * the charset defined via Zend_Text_Table::setInputCharset() (defaults
-     * to utf-8).
-     *
-     * @param  string $content  Content of the column
-     * @param  string $charset  The charset of the content
-     * @throws Zend_Text_Table_Exception When $content is not a string
-     * @return Zend_Text_Table_Column
-     */
-    public function setContent($content, $charset = null)
-    {
-        if (is_string($content) === false) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('$content must be a string');
-        }
-
-        if ($charset === null) {
-            $inputCharset = Zend_Text_Table::getInputCharset();
-        } else {
-            $inputCharset = strtolower($charset);
-        }
-
-        $outputCharset = Zend_Text_Table::getOutputCharset();
-
-        if ($inputCharset !== $outputCharset) {
-            if (PHP_OS !== 'AIX') {
-                // AIX does not understand these character sets
-                $content = iconv($inputCharset, $outputCharset, $content);
-            }
-
-        }
-
-        $this->_content = $content;
-
-        return $this;
-    }
-
-    /**
-     * Set the align
-     *
-     * @param  string $align Align of the column
-     * @throws Zend_Text_Table_Exception When supplied align is invalid
-     * @return Zend_Text_Table_Column
-     */
-    public function setAlign($align)
-    {
-        if (in_array($align, $this->_allowedAligns) === false) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('Invalid align supplied');
-        }
-
-        $this->_align = $align;
-
-        return $this;
-    }
-
-    /**
-     * Set the colspan
-     *
-     * @param  int $colSpan
-     * @throws Zend_Text_Table_Exception When $colSpan is smaller than 1
-     * @return Zend_Text_Table_Column
-     */
-    public function setColSpan($colSpan)
-    {
-        if (is_int($colSpan) === false or $colSpan < 1) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('$colSpan must be an integer and greater than 0');
-        }
-
-        $this->_colSpan = $colSpan;
-
-        return $this;
-    }
-
-    /**
-     * Get the colspan
-     *
-     * @return integer
-     */
-    public function getColSpan()
-    {
-        return $this->_colSpan;
-    }
-
-    /**
-     * Render the column width the given column width
-     *
-     * @param  integer $columnWidth The width of the column
-     * @param  integer $padding     The padding for the column
-     * @throws Zend_Text_Table_Exception When $columnWidth is lower than 1
-     * @throws Zend_Text_Table_Exception When padding is greater than columnWidth
-     * @return string
-     */
-    public function render($columnWidth, $padding = 0)
-    {
-        if (is_int($columnWidth) === false or $columnWidth < 1) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('$columnWidth must be an integer and greater than 0');
-        }
-
-        $columnWidth -= ($padding * 2);
-
-        if ($columnWidth < 1) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('Padding (' . $padding . ') is greater than column width');
-        }
-
-        switch ($this->_align) {
-            case self::ALIGN_LEFT:
-                $padMode = STR_PAD_RIGHT;
-                break;
-
-            case self::ALIGN_CENTER:
-                $padMode = STR_PAD_BOTH;
-                break;
-
-            case self::ALIGN_RIGHT:
-                $padMode = STR_PAD_LEFT;
-                break;
-
-            default:
-                // This can never happen, but the CS tells I have to have it ...
-                break;
-        }
-
-        $outputCharset = Zend_Text_Table::getOutputCharset();
-        $lines         = explode("\n", Zend_Text_MultiByte::wordWrap($this->_content, $columnWidth, "\n", true, $outputCharset));
-        $paddedLines   = array();
-
-        foreach ($lines AS $line) {
-            $paddedLines[] = str_repeat(' ', $padding)
-                           . Zend_Text_MultiByte::strPad($line, $columnWidth, ' ', $padMode, $outputCharset)
-                           . str_repeat(' ', $padding);
-        }
-
-        $result = implode("\n", $paddedLines);
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Decorator/Ascii.php b/airtime_mvc/library/Zend/Text/Table/Decorator/Ascii.php
deleted file mode 100644
index be836a745..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Decorator/Ascii.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Ascii.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Text_Table_Decorator_Interface
- */
-require_once 'Zend/Text/Table/Decorator/Interface.php';
-
-/**
- * ASCII Decorator for Zend_Text_Table
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @uses      Zend_Text_Table_Decorator_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table_Decorator_Ascii implements Zend_Text_Table_Decorator_Interface
-{
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getTopLeft()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getTopRight()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getBottomLeft()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getBottomRight()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVertical()
-    {
-        return '|';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontal()
-    {
-        return '-';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getCross()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVerticalRight()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVerticalLeft()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontalDown()
-    {
-        return '+';
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontalUp()
-    {
-        return '+';
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Decorator/Interface.php b/airtime_mvc/library/Zend/Text/Table/Decorator/Interface.php
deleted file mode 100644
index d9a060886..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Decorator/Interface.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for Zend_Text_Table decorators
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Text_Table_Decorator_Interface
-{
-    /**
-     * Get a single character for the top left corner
-     *
-     * @return string
-     */
-    public function getTopLeft();
-
-    /**
-     * Get a single character for the top right corner
-     *
-     * @return string
-     */
-    public function getTopRight();
-
-    /**
-     * Get a single character for the bottom left corner
-     *
-     * @return string
-     */
-    public function getBottomLeft();
-
-    /**
-     * Get a single character for the bottom right corner
-     *
-     * @return string
-     */
-    public function getBottomRight();
-
-    /**
-     * Get a single character for a vertical line
-     *
-     * @return string
-     */
-    public function getVertical();
-
-    /**
-     * Get a single character for a horizontal line
-     *
-     * @return string
-     */
-    public function getHorizontal();
-
-    /**
-     * Get a single character for a crossing line
-     *
-     * @return string
-     */
-    public function getCross();
-
-    /**
-     * Get a single character for a vertical divider right
-     *
-     * @return string
-     */
-    public function getVerticalRight();
-
-    /**
-     * Get a single character for a vertical divider left
-     *
-     * @return string
-     */
-    public function getVerticalLeft();
-
-    /**
-     * Get a single character for a horizontal divider down
-     *
-     * @return string
-     */
-    public function getHorizontalDown();
-
-    /**
-     * Get a single character for a horizontal divider up
-     *
-     * @return string
-     */
-    public function getHorizontalUp();
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Decorator/Unicode.php b/airtime_mvc/library/Zend/Text/Table/Decorator/Unicode.php
deleted file mode 100644
index cfcbb2d0e..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Decorator/Unicode.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Unicode.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Text_Table_Decorator_Interface
- */
-require_once 'Zend/Text/Table/Decorator/Interface.php';
-
-/**
- * Unicode Decorator for Zend_Text_Table
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @uses      Zend_Text_Table_Decorator_Interface
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table_Decorator_Unicode implements Zend_Text_Table_Decorator_Interface
-{
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getTopLeft()
-    {
-        return $this->_uniChar(0x250C);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getTopRight()
-    {
-        return $this->_uniChar(0x2510);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getBottomLeft()
-    {
-        return $this->_uniChar(0x2514);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getBottomRight()
-    {
-        return $this->_uniChar(0x2518);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVertical()
-    {
-        return $this->_uniChar(0x2502);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontal()
-    {
-        return $this->_uniChar(0x2500);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getCross()
-    {
-        return $this->_uniChar(0x253C);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVerticalRight()
-    {
-        return $this->_uniChar(0x251C);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getVerticalLeft()
-    {
-        return $this->_uniChar(0x2524);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontalDown()
-    {
-        return $this->_uniChar(0x252C);
-    }
-
-    /**
-     * Defined by Zend_Text_Table_Decorator_Interface
-     *
-     * @return string
-     */
-    public function getHorizontalUp()
-    {
-        return $this->_uniChar(0x2534);
-    }
-
-    /**
-     * Convert am unicode character code to a character
-     *
-     * @param  integer $code
-     * @return string|false
-     */
-    protected function _uniChar($code)
-    {
-        if ($code <= 0x7F) {
-            $char = chr($code);
-        } else if ($code <= 0x7FF) {
-            $char = chr(0xC0 | $code >> 6)
-                  . chr(0x80 | $code & 0x3F);
-        } else if ($code <= 0xFFFF) {
-            $char =  chr(0xE0 | $code >> 12)
-                  . chr(0x80 | $code >> 6 & 0x3F)
-                  . chr(0x80 | $code & 0x3F);
-        } else if ($code <= 0x10FFFF) {
-            $char =  chr(0xF0 | $code >> 18)
-                  . chr(0x80 | $code >> 12 & 0x3F)
-                  . chr(0x80 | $code >> 6 & 0x3F)
-                  . chr(0x80 | $code & 0x3F);
-        } else {
-            return false;
-        }
-
-        return $char;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Exception.php b/airtime_mvc/library/Zend/Text/Table/Exception.php
deleted file mode 100644
index 7eb647ea3..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Exception.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Text_Exception
- */
-require_once 'Zend/Text/Exception.php';
-
-/**
- * Exception class for Zend_Text_Table
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @uses      Zend_Text_Exception
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table_Exception extends Zend_Text_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Text/Table/Row.php b/airtime_mvc/library/Zend/Text/Table/Row.php
deleted file mode 100644
index 08392ec6c..000000000
--- a/airtime_mvc/library/Zend/Text/Table/Row.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Row class for Zend_Text_Table
- *
- * @category  Zend
- * @package   Zend_Text_Table
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Text_Table_Row
-{
-    /**
-     * List of all columns
-     *
-     * @var array
-     */
-    protected $_columns = array();
-
-    /**
-     * Temporary stored column widths
-     *
-     * @var array
-     */
-    protected $_columnWidths = null;
-
-    /**
-     * Create a new column and append it to the row
-     *
-     * @param  string $content
-     * @param  array  $options
-     * @return Zend_Text_Table_Row
-     */
-    public function createColumn($content, array $options = null)
-    {
-        $align    = null;
-        $colSpan  = null;
-        $encoding = null;
-
-        if ($options !== null) {
-            extract($options, EXTR_IF_EXISTS);
-        }
-
-        require_once 'Zend/Text/Table/Column.php';
-
-        $column = new Zend_Text_Table_Column($content, $align, $colSpan, $encoding);
-
-        $this->appendColumn($column);
-
-        return $this;
-    }
-
-    /**
-     * Append a column to the row
-     *
-     * @param  Zend_Text_Table_Column $column The column to append to the row
-     * @return Zend_Text_Table_Row
-     */
-    public function appendColumn(Zend_Text_Table_Column $column)
-    {
-        $this->_columns[] = $column;
-
-        return $this;
-    }
-
-    /**
-     * Get a column by it's index
-     *
-     * Returns null, when the index is out of range
-     *
-     * @param  integer $index
-     * @return Zend_Text_Table_Column|null
-     */
-    public function getColumn($index)
-    {
-        if (!isset($this->_columns[$index])) {
-            return null;
-        }
-
-        return $this->_columns[$index];
-    }
-
-    /**
-     * Get all columns of the row
-     *
-     * @return array
-     */
-    public function getColumns()
-    {
-        return $this->_columns;
-    }
-
-    /**
-     * Get the widths of all columns, which were rendered last
-     *
-     * @throws Zend_Text_Table_Exception When no columns were rendered yet
-     * @return integer
-     */
-    public function getColumnWidths()
-    {
-        if ($this->_columnWidths === null) {
-            require_once 'Zend/Text/Table/Exception.php';
-            throw new Zend_Text_Table_Exception('No columns were rendered yet');
-        }
-
-        return $this->_columnWidths;
-    }
-
-    /**
-     * Render the row
-     *
-     * @param  array                               $columnWidths Width of all columns
-     * @param  Zend_Text_Table_Decorator_Interface $decorator    Decorator for the row borders
-     * @param  integer                             $padding      Padding for the columns
-     * @throws Zend_Text_Table_Exception When there are too many columns
-     * @return string
-     */
-    public function render(array $columnWidths,
-                           Zend_Text_Table_Decorator_Interface $decorator,
-                           $padding = 0)
-    {
-        // Prepare an array to store all column widths
-        $this->_columnWidths = array();
-
-        // If there is no single column, create a column which spans over the
-        // entire row
-        if (count($this->_columns) === 0) {
-            require_once 'Zend/Text/Table/Column.php';
-            $this->appendColumn(new Zend_Text_Table_Column(null, null, count($columnWidths)));
-        }
-
-        // First we have to render all columns, to get the maximum height
-        $renderedColumns = array();
-        $maxHeight       = 0;
-        $colNum          = 0;
-        foreach ($this->_columns as $column) {
-            // Get the colspan of the column
-            $colSpan = $column->getColSpan();
-
-            // Verify if there are enough column widths defined
-            if (($colNum + $colSpan) > count($columnWidths)) {
-                require_once 'Zend/Text/Table/Exception.php';
-                throw new Zend_Text_Table_Exception('Too many columns');
-            }
-
-            // Calculate the column width
-            $columnWidth = ($colSpan - 1 + array_sum(array_slice($columnWidths,
-                                                                 $colNum,
-                                                                 $colSpan)));
-
-            // Render the column and split it's lines into an array
-            $result = explode("\n", $column->render($columnWidth, $padding));
-
-            // Store the width of the rendered column
-            $this->_columnWidths[] = $columnWidth;
-
-            // Store the rendered column and calculate the new max height
-            $renderedColumns[] = $result;
-            $maxHeight         = max($maxHeight, count($result));
-
-            // Set up the internal column number
-            $colNum += $colSpan;
-        }
-
-        // If the row doesnt contain enough columns to fill the entire row, fill
-        // it with an empty column
-        if ($colNum < count($columnWidths)) {
-            $remainingWidth = (count($columnWidths) - $colNum - 1) +
-                               array_sum(array_slice($columnWidths,
-                                                     $colNum));
-            $renderedColumns[] = array(str_repeat(' ', $remainingWidth));
-
-            $this->_columnWidths[] = $remainingWidth;
-        }
-
-        // Add each single column line to the result
-        $result = '';
-        for ($line = 0; $line < $maxHeight; $line++) {
-            $result .= $decorator->getVertical();
-
-            foreach ($renderedColumns as $renderedColumn) {
-                if (isset($renderedColumn[$line]) === true) {
-                    $result .= $renderedColumn[$line];
-                } else {
-                    $result .= str_repeat(' ', strlen($renderedColumn[0]));
-                }
-
-                $result .= $decorator->getVertical();
-            }
-
-            $result .= "\n";
-        }
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/TimeSync.php b/airtime_mvc/library/Zend/TimeSync.php
deleted file mode 100644
index 9774d3a1f..000000000
--- a/airtime_mvc/library/Zend/TimeSync.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: TimeSync.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_Date
- */
-require_once 'Zend/Date.php';
-
-/**
- * @category   Zend
- * @package    Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_TimeSync implements IteratorAggregate
-{
-    /**
-     * Set the default timeserver protocol to "Ntp". This will be called
-     * when no protocol is specified
-     */
-    const DEFAULT_PROTOCOL = 'Ntp';
-
-    /**
-     * Contains array of timeserver objects
-     *
-     * @var array
-     */
-    protected $_timeservers = array();
-
-    /**
-     * Holds a reference to the timeserver that is currently being used
-     *
-     * @var object
-     */
-    protected $_current;
-
-    /**
-     * Allowed timeserver schemes
-     *
-     * @var array
-     */
-    protected $_allowedSchemes = array(
-        'Ntp',
-        'Sntp'
-    );
-
-    /**
-     * Configuration array, set using the constructor or using
-     * ::setOptions() or ::setOption()
-     *
-     * @var array
-     */
-    public static $options = array(
-        'timeout' => 1
-    );
-
-    /**
-     * Zend_TimeSync constructor
-     *
-     * @param  string|array $target - OPTIONAL single timeserver, or an array of timeservers.
-     * @param  string       $alias  - OPTIONAL an alias for this timeserver
-     * @return  object
-     */
-    public function __construct($target = null, $alias = null)
-    {
-        if ($target !== null) {
-            $this->addServer($target, $alias);
-        }
-    }
-
-    /**
-     * getIterator() - return an iteratable object for use in foreach and the like,
-     * this completes the IteratorAggregate interface
-     *
-     * @return ArrayObject
-     */
-    public function getIterator()
-    {
-        return new ArrayObject($this->_timeservers);
-    }
-
-    /**
-     * Add a timeserver or multiple timeservers
-     *
-     * Server should be a single string representation of a timeserver,
-     * or a structured array listing multiple timeservers.
-     *
-     * If you provide an array of timeservers in the $target variable,
-     * $alias will be ignored. you can enter these as the array key
-     * in the provided array, which should be structured as follows:
-     *
-     * <code>
-     * $example = array(
-     *   'server_a' => 'ntp://127.0.0.1',
-     *   'server_b' => 'ntp://127.0.0.1:123',
-     *   'server_c' => 'ntp://[2000:364:234::2.5]',
-     *   'server_d' => 'ntp://[2000:364:234::2.5]:123'
-     * );
-     * </code>
-     *
-     * If no port number has been suplied, the default matching port
-     * number will be used.
-     *
-     * Supported protocols are:
-     * - ntp
-     * - sntp
-     *
-     * @param  string|array $target - Single timeserver, or an array of timeservers.
-     * @param  string       $alias  - OPTIONAL an alias for this timeserver
-     * @throws Zend_TimeSync_Exception
-     */
-    public function addServer($target, $alias = null)
-    {
-        if (is_array($target)) {
-            foreach ($target as $key => $server) {
-                $this->_addServer($server, $key);
-            }
-        } else {
-            $this->_addServer($target, $alias);
-        }
-    }
-
-    /**
-     * Sets the value for the given options
-     *
-     * This will replace any currently defined options.
-     *
-     * @param   array $options - An array of options to be set
-     */
-    public static function setOptions(array $options)
-    {
-        foreach ($options as $key => $value) {
-            Zend_TimeSync::$options[$key] = $value;
-        }
-    }
-
-    /**
-     * Marks a nameserver as current
-     *
-     * @param   string|integer $alias - The alias from the timeserver to set as current
-     * @throws  Zend_TimeSync_Exception
-     */
-    public function setServer($alias)
-    {
-        if (isset($this->_timeservers[$alias]) === true) {
-            $this->_current = $this->_timeservers[$alias];
-        } else {
-            require_once 'Zend/TimeSync/Exception.php';
-            throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver");
-        }
-    }
-
-    /**
-     * Returns the value to the option
-     *
-     * @param   string $key - The option's identifier
-     * @return  mixed
-     * @throws  Zend_TimeSync_Exception
-     */
-    public static function getOptions($key = null)
-    {
-        if ($key == null) {
-            return Zend_TimeSync::$options;
-        }
-
-        if (isset(Zend_TimeSync::$options[$key]) === true) {
-            return Zend_TimeSync::$options[$key];
-        } else {
-            require_once 'Zend/TimeSync/Exception.php';
-            throw new Zend_TimeSync_Exception("'$key' does not point to valid option");
-        }
-    }
-
-    /**
-     * Return a specified timeserver by alias
-     * If no alias is given it will return the current timeserver
-     *
-     * @param   string|integer $alias - The alias from the timeserver to return
-     * @return  object
-     * @throws  Zend_TimeSync_Exception
-     */
-    public function getServer($alias = null)
-    {
-        if ($alias === null) {
-            if (isset($this->_current) && $this->_current !== false) {
-                return $this->_current;
-            } else {
-                require_once 'Zend/TimeSync/Exception.php';
-                throw new Zend_TimeSync_Exception('there is no timeserver set');
-            }
-        }
-        if (isset($this->_timeservers[$alias]) === true) {
-            return $this->_timeservers[$alias];
-        } else {
-            require_once 'Zend/TimeSync/Exception.php';
-            throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver");
-        }
-    }
-
-    /**
-     * Returns information sent/returned from the current timeserver
-     *
-     * @return  array
-     */
-    public function getInfo()
-    {
-        return $this->getServer()->getInfo();
-    }
-
-    /**
-     * Query the timeserver list using the fallback mechanism
-     *
-     * If there are multiple servers listed, this method will act as a
-     * facade and will try to return the date from the first server that
-     * returns a valid result.
-     *
-     * @param   $locale - OPTIONAL locale
-     * @return  object
-     * @throws  Zend_TimeSync_Exception
-     */
-    public function getDate($locale = null)
-    {
-        require_once 'Zend/TimeSync/Exception.php';
-        foreach ($this->_timeservers as $alias => $server) {
-            $this->_current = $server;
-            try {
-                return $server->getDate($locale);
-            } catch (Zend_TimeSync_Exception $e) {
-                if (!isset($masterException)) {
-                    $masterException = new Zend_TimeSync_Exception('all timeservers are bogus');
-                }
-                $masterException->addException($e);
-            }
-        }
-
-        throw $masterException;
-    }
-
-    /**
-     * Adds a timeserver object to the timeserver list
-     *
-     * @param  string|array $target   - Single timeserver, or an array of timeservers.
-     * @param  string       $alias    - An alias for this timeserver
-     */
-    protected function _addServer($target, $alias)
-    {
-        if ($pos = strpos($target, '://')) {
-            $protocol = substr($target, 0, $pos);
-            $adress = substr($target, $pos + 3);
-        } else {
-            $adress = $target;
-            $protocol = self::DEFAULT_PROTOCOL;
-        }
-
-        if ($pos = strrpos($adress, ':')) {
-            $posbr = strpos($adress, ']');
-            if ($posbr and ($pos > $posbr)) {
-                $port = substr($adress, $pos + 1);
-                $adress = substr($adress, 0, $pos);
-            } else if (!$posbr and $pos) {
-                $port = substr($adress, $pos + 1);
-                $adress = substr($adress, 0, $pos);
-            } else {
-                $port = null;
-            }
-        } else {
-            $port = null;
-        }
-
-        $protocol = ucfirst(strtolower($protocol));
-        if (!in_array($protocol, $this->_allowedSchemes)) {
-            require_once 'Zend/TimeSync/Exception.php';
-            throw new Zend_TimeSync_Exception("'$protocol' is not a supported protocol");
-        }
-
-        $className = 'Zend_TimeSync_' . $protocol;
-        if (!class_exists($className)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($className);
-        }
-        $timeServerObj = new $className($adress, $port);
-
-        $this->_timeservers[$alias] = $timeServerObj;
-    }
-}
diff --git a/airtime_mvc/library/Zend/TimeSync/Exception.php b/airtime_mvc/library/Zend/TimeSync/Exception.php
deleted file mode 100644
index 9685a2900..000000000
--- a/airtime_mvc/library/Zend/TimeSync/Exception.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exception class for Zend_TimeSync
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_TimeSync_Exception extends Zend_Exception
-{
-    /**
-     * Contains array of exceptions thrown in queried server
-     *
-     * @var array
-     */
-    protected $_exceptions;
-
-    /**
-     * Adds an exception to the exception list
-     *
-     * @param  Zend_TimeSync_Exception $exception New exteption to throw
-     * @return void
-     */
-    public function addException(Zend_TimeSync_Exception $exception)
-    {
-        $this->_exceptions[] = $exception;
-    }
-
-    /**
-     * Returns an array of exceptions that were thrown
-     *
-     * @return array
-     */
-    public function get()
-    {
-        return $this->_exceptions;
-    }
-}
diff --git a/airtime_mvc/library/Zend/TimeSync/Ntp.php b/airtime_mvc/library/Zend/TimeSync/Ntp.php
deleted file mode 100644
index 5d49753ca..000000000
--- a/airtime_mvc/library/Zend/TimeSync/Ntp.php
+++ /dev/null
@@ -1,431 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Ntp.php 21481 2010-03-13 22:09:50Z thomas $
- */
-
-/**
- * Zend_TimeSync_Protocol
- */
-require_once 'Zend/TimeSync/Protocol.php';
-
-/**
- * NTP Protocol handling class
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_TimeSync_Ntp extends Zend_TimeSync_Protocol
-{
-    /**
-     * NTP port number (123) assigned by the Internet Assigned Numbers Authority
-     *
-     * @var integer
-     */
-    protected $_port = 123;
-
-    /**
-     * NTP class constructor, sets the timeserver and port number
-     *
-     * @param string  $timeserver Adress of the timeserver to connect to
-     * @param integer $port       (Optional) Port for this timeserver
-     */
-    public function __construct($timeserver, $port = 123)
-    {
-        $this->_timeserver = 'udp://' . $timeserver;
-        if ($port !== null) {
-            $this->_port = $port;
-        }
-    }
-
-    /**
-     * Prepare local timestamp for transmission in our request packet
-     *
-     * NTP timestamps are represented as a 64-bit fixed-point number, in
-     * seconds relative to 0000 UT on 1 January 1900.  The integer part is
-     * in the first 32 bits and the fraction part in the last 32 bits
-     *
-     * @return string
-     */
-    protected function _prepare()
-    {
-        $frac   = microtime();
-        $fracba = ($frac & 0xff000000) >> 24;
-        $fracbb = ($frac & 0x00ff0000) >> 16;
-        $fracbc = ($frac & 0x0000ff00) >> 8;
-        $fracbd = ($frac & 0x000000ff);
-
-        $sec   = (time() + 2208988800);
-        $secba = ($sec & 0xff000000) >> 24;
-        $secbb = ($sec & 0x00ff0000) >> 16;
-        $secbc = ($sec & 0x0000ff00) >> 8;
-        $secbd = ($sec & 0x000000ff);
-
-        // Flags
-        $nul       = chr(0x00);
-        $nulbyte   = $nul . $nul . $nul . $nul;
-        $ntppacket = chr(0xd9) . $nul . chr(0x0a) . chr(0xfa);
-
-        /*
-         * Root delay
-         *
-         * Indicates the total roundtrip delay to the primary reference
-         * source at the root of the synchronization subnet, in seconds
-         */
-        $ntppacket .= $nul . $nul . chr(0x1c) . chr(0x9b);
-
-        /*
-         * Clock Dispersion
-         *
-         * Indicates the maximum error relative to the primary reference source at the
-         * root of the synchronization subnet, in seconds
-         */
-        $ntppacket .= $nul . chr(0x08) . chr(0xd7) . chr(0xff);
-
-        /*
-         * ReferenceClockID
-         *
-         * Identifying the particular reference clock
-         */
-        $ntppacket .= $nulbyte;
-
-        /*
-         * The local time, in timestamp format, at the peer when its latest NTP message
-         * was sent. Contanis an integer and a fractional part
-         */
-        $ntppacket .= chr($secba)  . chr($secbb)  . chr($secbc)  . chr($secbd);
-        $ntppacket .= chr($fracba) . chr($fracbb) . chr($fracbc) . chr($fracbd);
-
-        /*
-         * The local time, in timestamp format, at the peer. Contains an integer
-         * and a fractional part.
-         */
-        $ntppacket .= $nulbyte;
-        $ntppacket .= $nulbyte;
-
-        /*
-         * This is the local time, in timestamp format, when the latest NTP message from
-         * the peer arrived. Contanis an integer and a fractional part.
-         */
-        $ntppacket .= $nulbyte;
-        $ntppacket .= $nulbyte;
-
-        /*
-         * The local time, in timestamp format, at which the
-         * NTP message departed the sender. Contanis an integer
-         * and a fractional part.
-         */
-        $ntppacket .= chr($secba)  . chr($secbb)  . chr($secbc)  . chr($secbd);
-        $ntppacket .= chr($fracba) . chr($fracbb) . chr($fracbc) . chr($fracbd);
-
-        return $ntppacket;
-    }
-
-    /**
-     * Calculates a 32bit integer
-     *
-     * @param string $input
-     * @return integer
-     */
-    protected function _getInteger($input)
-    {
-        $f1  = str_pad(ord($input[0]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[1]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[2]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[3]), 2, '0', STR_PAD_LEFT);
-        return (int) $f1;
-    }
-
-    /**
-     * Calculates a 32bit signed fixed point number
-     *
-     * @param string $input
-     * @return float
-     */
-    protected function _getFloat($input)
-    {
-        $f1  = str_pad(ord($input[0]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[1]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[2]), 2, '0', STR_PAD_LEFT);
-        $f1 .= str_pad(ord($input[3]), 2, '0', STR_PAD_LEFT);
-        $f2  = $f1 >> 17;
-        $f3  = ($f1 & 0x0001FFFF);
-        $f1  = $f2 . '.' . $f3;
-        return (float) $f1;
-    }
-
-    /**
-     * Calculates a 64bit timestamp
-     *
-     * @param string $input
-     * @return float
-     */
-    protected function _getTimestamp($input)
-    {
-        $f1  = (ord($input[0]) * pow(256, 3));
-        $f1 += (ord($input[1]) * pow(256, 2));
-        $f1 += (ord($input[2]) * pow(256, 1));
-        $f1 += (ord($input[3]));
-        $f1 -= 2208988800;
-
-        $f2  = (ord($input[4]) * pow(256, 3));
-        $f2 += (ord($input[5]) * pow(256, 2));
-        $f2 += (ord($input[6]) * pow(256, 1));
-        $f2 += (ord($input[7]));
-
-        return (float) ($f1 . "." . $f2);
-    }
-
-    /**
-     * Reads the data returned from the timeserver
-     *
-     * This will return an array with binary data listing:
-     *
-     * @return array
-     * @throws Zend_TimeSync_Exception When timeserver can not be connected
-     */
-    protected function _read()
-    {
-        $flags = ord(fread($this->_socket, 1));
-        $info  = stream_get_meta_data($this->_socket);
-
-        if ($info['timed_out'] === true) {
-            fclose($this->_socket);
-            throw new Zend_TimeSync_Exception('could not connect to ' .
-                "'$this->_timeserver' on port '$this->_port', reason: 'server timed out'");
-        }
-
-        $result = array(
-            'flags'          => $flags,
-            'stratum'        => ord(fread($this->_socket, 1)),
-            'poll'           => ord(fread($this->_socket, 1)),
-            'precision'      => ord(fread($this->_socket, 1)),
-            'rootdelay'      => $this->_getFloat(fread($this->_socket, 4)),
-            'rootdispersion' => $this->_getFloat(fread($this->_socket, 4)),
-            'referenceid'    => fread($this->_socket, 4),
-            'referencestamp' => $this->_getTimestamp(fread($this->_socket, 8)),
-            'originatestamp' => $this->_getTimestamp(fread($this->_socket, 8)),
-            'receivestamp'   => $this->_getTimestamp(fread($this->_socket, 8)),
-            'transmitstamp'  => $this->_getTimestamp(fread($this->_socket, 8)),
-            'clientreceived' => microtime(true)
-        );
-
-        $this->_disconnect();
-        return $result;
-    }
-
-    /**
-     * Sends the NTP packet to the server
-     *
-     * @param  string $data Data to send to the timeserver
-     * @return void
-     */
-    protected function _write($data)
-    {
-        $this->_connect();
-
-        fwrite($this->_socket, $data);
-        stream_set_timeout($this->_socket, Zend_TimeSync::$options['timeout']);
-    }
-
-    /**
-     * Extracts the binary data returned from the timeserver
-     *
-     * @param  string|array $binary Data returned from the timeserver
-     * @return integer Difference in seconds
-     */
-    protected function _extract($binary)
-    {
-        /*
-         * Leap Indicator bit 1100 0000
-         *
-         * Code warning of impending leap-second to be inserted at the end of
-         * the last day of the current month.
-         */
-        $leap = ($binary['flags'] & 0xc0) >> 6;
-        switch($leap) {
-            case 0:
-                $this->_info['leap'] = '0 - no warning';
-                break;
-
-            case 1:
-                $this->_info['leap'] = '1 - last minute has 61 seconds';
-                break;
-
-            case 2:
-                $this->_info['leap'] = '2 - last minute has 59 seconds';
-                break;
-
-            default:
-                $this->_info['leap'] = '3 - not syncronised';
-                break;
-        }
-
-        /*
-         * Version Number bit 0011 1000
-         *
-         * This should be 3 (RFC 1305)
-         */
-        $this->_info['version'] = ($binary['flags'] & 0x38) >> 3;
-
-        /*
-         * Mode bit 0000 0111
-         *
-         * Except in broadcast mode, an NTP association is formed when two peers
-         * exchange messages and one or both of them create and maintain an
-         * instantiation of the protocol machine, called an association.
-         */
-        $mode = ($binary['flags'] & 0x07);
-        switch($mode) {
-            case 1:
-                $this->_info['mode'] = 'symetric active';
-                break;
-
-            case 2:
-                $this->_info['mode'] = 'symetric passive';
-                break;
-
-            case 3:
-                $this->_info['mode'] = 'client';
-                break;
-
-            case 4:
-                $this->_info['mode'] = 'server';
-                break;
-
-            case 5:
-                $this->_info['mode'] = 'broadcast';
-                break;
-
-            default:
-                $this->_info['mode'] = 'reserved';
-                break;
-        }
-
-        $ntpserviceid = 'Unknown Stratum ' . $binary['stratum'] . ' Service';
-
-        /*
-         * Reference Clock Identifier
-         *
-         * Identifies the particular reference clock.
-         */
-        $refid = strtoupper($binary['referenceid']);
-        switch($binary['stratum']) {
-            case 0:
-                if (substr($refid, 0, 3) === 'DCN') {
-                    $ntpserviceid = 'DCN routing protocol';
-                } else if (substr($refid, 0, 4) === 'NIST') {
-                    $ntpserviceid = 'NIST public modem';
-                } else if (substr($refid, 0, 3) === 'TSP') {
-                    $ntpserviceid = 'TSP time protocol';
-                } else if (substr($refid, 0, 3) === 'DTS') {
-                    $ntpserviceid = 'Digital Time Service';
-                }
-                break;
-
-            case 1:
-                if (substr($refid, 0, 4) === 'ATOM') {
-                    $ntpserviceid = 'Atomic Clock (calibrated)';
-                } else if (substr($refid, 0, 3) === 'VLF') {
-                    $ntpserviceid = 'VLF radio';
-                } else if ($refid === 'CALLSIGN') {
-                    $ntpserviceid = 'Generic radio';
-                } else if (substr($refid, 0, 4) === 'LORC') {
-                    $ntpserviceid = 'LORAN-C radionavigation';
-                } else if (substr($refid, 0, 4) === 'GOES') {
-                    $ntpserviceid = 'GOES UHF environment satellite';
-                } else if (substr($refid, 0, 3) === 'GPS') {
-                    $ntpserviceid = 'GPS UHF satellite positioning';
-                }
-                break;
-
-            default:
-                $ntpserviceid  = ord(substr($binary['referenceid'], 0, 1));
-                $ntpserviceid .= '.';
-                $ntpserviceid .= ord(substr($binary['referenceid'], 1, 1));
-                $ntpserviceid .= '.';
-                $ntpserviceid .= ord(substr($binary['referenceid'], 2, 1));
-                $ntpserviceid .= '.';
-                $ntpserviceid .= ord(substr($binary['referenceid'], 3, 1));
-                break;
-        }
-
-        $this->_info['ntpid'] = $ntpserviceid;
-
-        /*
-         * Stratum
-         *
-         * Indicates the stratum level of the local clock
-         */
-        switch($binary['stratum']) {
-            case 0:
-                $this->_info['stratum'] = 'undefined';
-                break;
-
-            case 1:
-                $this->_info['stratum'] = 'primary reference';
-                break;
-
-            default:
-                $this->_info['stratum'] = 'secondary reference';
-                break;
-        }
-
-        /*
-         * Indicates the total roundtrip delay to the primary reference source at the
-         * root of the synchronization subnet, in seconds.
-         *
-         * Both positive and negative values, depending on clock precision and skew, are
-         * possible.
-         */
-        $this->_info['rootdelay'] = $binary['rootdelay'];
-
-        /*
-         * Indicates the maximum error relative to the primary reference source at the
-         * root of the synchronization subnet, in seconds.
-         *
-         * Only positive values greater than zero are possible.
-         */
-        $this->_info['rootdispersion'] = $binary['rootdispersion'];
-
-        /*
-         * The roundtrip delay of the peer clock relative to the local clock
-         * over the network path between them, in seconds.
-         *
-         * Note that this variable can take on both positive and negative values,
-         * depending on clock precision and skew-error accumulation.
-         */
-        $this->_info['roundtrip']  = $binary['receivestamp'];
-        $this->_info['roundtrip'] -= $binary['originatestamp'];
-        $this->_info['roundtrip'] -= $binary['transmitstamp'];
-        $this->_info['roundtrip'] += $binary['clientreceived'];
-        $this->_info['roundtrip'] /= 2;
-
-        // The offset of the peer clock relative to the local clock, in seconds.
-        $this->_info['offset']  = $binary['receivestamp'];
-        $this->_info['offset'] -= $binary['originatestamp'];
-        $this->_info['offset'] += $binary['transmitstamp'];
-        $this->_info['offset'] -= $binary['clientreceived'];
-        $this->_info['offset'] /= 2;
-        $time = (time() - $this->_info['offset']);
-
-        return $time;
-    }
-}
diff --git a/airtime_mvc/library/Zend/TimeSync/Protocol.php b/airtime_mvc/library/Zend/TimeSync/Protocol.php
deleted file mode 100644
index fe19c5cfc..000000000
--- a/airtime_mvc/library/Zend/TimeSync/Protocol.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Protocol.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class definition for all timeserver protocols
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_TimeSync_Protocol
-{
-    /**
-     * Holds the current socket connection
-     *
-     * @var array
-     */
-    protected $_socket;
-
-    /**
-     * Exceptions that might have occured
-     *
-     * @var array
-     */
-    protected $_exceptions;
-
-    /**
-     * Hostname for timeserver
-     *
-     * @var string
-     */
-    protected $_timeserver;
-
-    /**
-     * Holds information passed/returned from timeserver
-     *
-     * @var array
-     */
-    protected $_info = array();
-
-    /**
-     * Abstract method that prepares the data to send to the timeserver
-     *
-     * @return mixed
-     */
-    abstract protected function _prepare();
-
-    /**
-     * Abstract method that reads the data returned from the timeserver
-     *
-     * @return mixed
-     */
-    abstract protected function _read();
-
-    /**
-     * Abstract method that writes data to to the timeserver
-     *
-     * @param  string $data Data to write
-     * @return void
-     */
-    abstract protected function _write($data);
-
-    /**
-     * Abstract method that extracts the binary data returned from the timeserver
-     *
-     * @param  string|array $data Data returned from the timeserver
-     * @return integer
-     */
-    abstract protected function _extract($data);
-
-    /**
-     * Connect to the specified timeserver.
-     *
-     * @return void
-     * @throws Zend_TimeSync_Exception When the connection failed
-     */
-    protected function _connect()
-    {
-        $socket = @fsockopen($this->_timeserver, $this->_port, $errno, $errstr,
-                             Zend_TimeSync::$options['timeout']);
-        if ($socket === false) {
-            throw new Zend_TimeSync_Exception('could not connect to ' .
-                "'$this->_timeserver' on port '$this->_port', reason: '$errstr'");
-        }
-
-        $this->_socket = $socket;
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @return void
-     */
-    protected function _disconnect()
-    {
-        @fclose($this->_socket);
-        $this->_socket = null;
-    }
-
-    /**
-     * Return information sent/returned from the timeserver
-     *
-     * @return  array
-     */
-    public function getInfo()
-    {
-        if (empty($this->_info) === true) {
-            $this->_write($this->_prepare());
-            $timestamp = $this->_extract($this->_read());
-        }
-
-        return $this->_info;
-    }
-
-    /**
-     * Query this timeserver without using the fallback mechanism
-     *
-     * @param  string|Zend_Locale $locale (Optional) Locale
-     * @return Zend_Date
-     */
-    public function getDate($locale = null)
-    {
-        $this->_write($this->_prepare());
-        $timestamp = $this->_extract($this->_read());
-
-        $date = new Zend_Date($this, null, $locale);
-        return $date;
-    }
-}
diff --git a/airtime_mvc/library/Zend/TimeSync/Sntp.php b/airtime_mvc/library/Zend/TimeSync/Sntp.php
deleted file mode 100644
index fd55279d2..000000000
--- a/airtime_mvc/library/Zend/TimeSync/Sntp.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Sntp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_TimeSync_Protocol
- */
-require_once 'Zend/TimeSync/Protocol.php';
-
-/**
- * SNTP Protocol handling class
- *
- * @category  Zend
- * @package   Zend_TimeSync
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_TimeSync_Sntp extends Zend_TimeSync_Protocol
-{
-    /**
-     * Port number for this timeserver
-     *
-     * @var integer
-     */
-    protected $_port = 37;
-
-    /**
-     * Socket delay
-     *
-     * @var integer
-     */
-    private $_delay;
-
-    /**
-     * Class constructor, sets the timeserver and port number
-     *
-     * @param string  $timeserver Timeserver to connect to
-     * @param integer $port       Port of the timeserver when it differs from the default port
-     */
-    public function __construct($timeserver, $port)
-    {
-        $this->_timeserver = 'udp://' . $timeserver;
-        if ($port !== null) {
-            $this->_port = $port;
-        }
-    }
-
-    /**
-     * Prepares the data that will be send to the timeserver
-     *
-     * @return array
-     */
-    protected function _prepare()
-    {
-        return "\n";
-    }
-
-    /**
-     * Reads the data returned from the timeserver
-     *
-     * @return string
-     */
-    protected function _read()
-    {
-        $result       = fread($this->_socket, 49);
-        $this->_delay = (($this->_delay - time()) / 2);
-
-        return $result;
-    }
-
-    /**
-     * Writes data to to the timeserver
-     *
-     * @param  string $data Data to write to the timeserver
-     * @return void
-     */
-    protected function _write($data)
-    {
-        $this->_connect();
-        $this->_delay = time();
-        fputs($this->_socket, $data);
-    }
-
-    /**
-     * Extracts the data returned from the timeserver
-     *
-     * @param  string $result Data to extract
-     * @return integer
-     */
-    protected function _extract($result)
-    {
-        $dec   = hexdec('7fffffff');
-        $time  = abs(($dec - hexdec(bin2hex($result))) - $dec);
-        $time -= 2208988800;
-        // Socket delay
-        $time -= $this->_delay;
-
-        $this->_info['offset'] = $this->_delay;
-
-        return $time;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Action/Base.php b/airtime_mvc/library/Zend/Tool/Framework/Action/Base.php
deleted file mode 100644
index 4b5009acd..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Action/Base.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Action_Interface
- */
-require_once 'Zend/Tool/Framework/Action/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Action_Base implements Zend_Tool_Framework_Action_Interface
-{
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * constructor -
-     *
-     * @param unknown_type $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options !== null) {
-            if (is_string($options)) {
-                $this->setName($options);
-            }
-            // implement $options here in the future if this is needed
-        }
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_Tool_Framework_Action_Base
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->_name == null) {
-            $this->_name = $this->_parseName();
-        }
-        return $this->_name;
-    }
-
-    /**
-     * _parseName - internal method to determine the name of an action when one is not explicity provided.
-     *
-     * @param Zend_Tool_Framework_Action_Interface $action
-     * @return string
-     */
-    protected function _parseName()
-    {
-        $className = get_class($this);
-        $actionName = substr($className, strrpos($className, '_')+1);
-        return $actionName;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Action/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Action/Exception.php
deleted file mode 100644
index 36419feb1..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Action/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Exception
- */
-require_once 'Zend/Tool/Framework/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Action_Exception extends Zend_Tool_Framework_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Action/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Action/Interface.php
deleted file mode 100644
index 86898e568..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Action/Interface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Action_Interface
-{
-    public function getName();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Action/Repository.php b/airtime_mvc/library/Zend/Tool/Framework/Action/Repository.php
deleted file mode 100644
index ddcd36a9b..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Action/Repository.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Action_Repository
-    implements Zend_Tool_Framework_Registry_EnabledInterface, IteratorAggregate, Countable
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var array
-     */
-    protected $_actions = array();
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-    }
-
-    /**
-     * addAction()
-     *
-     * @param Zend_Tool_Framework_Action_Interface $action
-     * @return Zend_Tool_Framework_Action_Repository
-     */
-    public function addAction(Zend_Tool_Framework_Action_Interface $action, $overrideExistingAction = false)
-    {
-        $actionName = $action->getName();
-
-        if ($actionName == '' || $actionName == 'Base') {
-            require_once 'Zend/Tool/Framework/Action/Exception.php';
-            throw new Zend_Tool_Framework_Action_Exception('An action name for the provided action could not be determined.');
-        }
-
-        if (!$overrideExistingAction && array_key_exists(strtolower($actionName), $this->_actions)) {
-            require_once 'Zend/Tool/Framework/Action/Exception.php';
-            throw new Zend_Tool_Framework_Action_Exception('An action by the name ' . $actionName
-                . ' is already registered and $overrideExistingAction is set to false.');
-        }
-
-        $this->_actions[strtolower($actionName)] = $action;
-        return $this;
-    }
-
-    /**
-     * process() - this is called when the client is done constructing (after init())
-     *
-     * @return unknown
-     */
-    public function process()
-    {
-        return null;
-    }
-
-    /**
-     * getActions() - get all actions in the repository
-     *
-     * @return array
-     */
-    public function getActions()
-    {
-        return $this->_actions;
-    }
-
-    /**
-     * getAction() - get an action by a specific name
-     *
-     * @param string $actionName
-     * @return Zend_Tool_Framework_Action_Interface
-     */
-    public function getAction($actionName)
-    {
-        if (!array_key_exists(strtolower($actionName), $this->_actions)) {
-            return null;
-        }
-
-        return $this->_actions[strtolower($actionName)];
-    }
-
-    /**
-     * count() required by the Countable interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_actions);
-    }
-
-    /**
-     * getIterator() - get all actions, this supports the IteratorAggregate interface
-     *
-     * @return array
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_actions);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Abstract.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Abstract.php
deleted file mode 100644
index b937866e7..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Abstract.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Loader_Autoloader
- */
-require_once 'Zend/Loader/Autoloader.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry
-     */
-    protected $_registry = null;
-
-    /**
-     * @var callback|null
-     */
-    protected $_interactiveCallback = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isInitialized = false;
-
-    /**
-     * @var Zend_Log
-     */
-    protected $_debugLogger = null;
-
-    public function __construct($options = array())
-    {
-        // require autoloader 
-        Zend_Loader_Autoloader::getInstance();
-
-        // this might look goofy, but this is setting up the
-        // registry for dependency injection into the client
-        $registry = new Zend_Tool_Framework_Registry();
-        $registry->setClient($this);
-
-        // NOTE: at this moment, $this->_registry should contain the registry object
-        
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $setMethodName = 'set' . $optionName;
-            if (method_exists($this, $setMethodName)) {
-                $this->{$setMethodName}($optionValue);
-            }
-        }
-    }
-
-    /**
-     * getName() - Return the client name which can be used to
-     * query the manifest if need be.
-     *
-     * @return string The client name
-     */
-    abstract public function getName();
-
-    /**
-     * initialized() - This will initialize the client for use
-     *
-     */
-    public function initialize()
-    {
-        // if its already initialized, no need to initialize again
-        if ($this->_isInitialized) {
-            return;
-        }
-
-        // run any preInit
-        $this->_preInit();
-
-        $manifest = $this->_registry->getManifestRepository();
-        $manifest->addManifest(new Zend_Tool_Framework_Client_Manifest());
-        
-        // setup the debug log
-        if (!$this->_debugLogger instanceof Zend_Log) {
-            require_once 'Zend/Log.php';
-            require_once 'Zend/Log/Writer/Null.php';
-            $this->_debugLogger = new Zend_Log(new Zend_Log_Writer_Null());
-        }
-
-        // let the loader load, then the repositories process whats been loaded
-        $this->_registry->getLoader()->load();
-
-        // process the action repository
-        $this->_registry->getActionRepository()->process();
-
-        // process the provider repository
-        $this->_registry->getProviderRepository()->process();
-
-        // process the manifest repository
-        $this->_registry->getManifestRepository()->process();
-
-        if ($this instanceof Zend_Tool_Framework_Client_Interactive_InputInterface) {
-            require_once 'Zend/Tool/Framework/Client/Interactive/InputHandler.php';
-        }
-
-        if ($this instanceof Zend_Tool_Framework_Client_Interactive_OutputInterface) {
-            $this->_registry->getResponse()->setContentCallback(array($this, 'handleInteractiveOutput'));
-        }
-
-    }
-
-
-    /**
-     * This method should be implemented by the client implementation to
-     * construct and set custom inflectors, request and response objects.
-     */
-    protected function _preInit()
-    {
-    }
-
-    /**
-     * This method *must* be implemented by the client implementation to
-     * parse out and setup the request objects action, provider and parameter
-     * information.
-     */
-    abstract protected function _preDispatch();
-
-    /**
-     * This method should be implemented by the client implementation to
-     * take the output of the response object and return it (in an client
-     * specific way) back to the Tooling Client.
-     */
-    protected function _postDispatch()
-    {
-    }
-
-    /**
-     * setRegistry() - Required by the Zend_Tool_Framework_Registry_EnabledInterface
-     * interface which ensures proper registry dependency resolution
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Client_Abstract
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-    
-    /**
-     * getRegistry();
-     * 
-     * @return Zend_Tool_Framework_Registry_Interface
-     */
-    public function getRegistry()
-    {
-    	return $this->_registry;
-    }
-
-    /**
-     * hasInteractiveInput() - Convienence method for determining if this
-     * client can handle interactive input, and thus be able to run the
-     * promptInteractiveInput
-     *
-     * @return bool
-     */
-    public function hasInteractiveInput()
-    {
-        return ($this instanceof Zend_Tool_Framework_Client_Interactive_InputInterface);
-    }
-
-    public function promptInteractiveInput($inputRequest)
-    {
-        if (!$this->hasInteractiveInput()) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('promptInteractive() cannot be called on a non-interactive client.');
-        }
-
-        $inputHandler = new Zend_Tool_Framework_Client_Interactive_InputHandler();
-        $inputHandler->setClient($this);
-        $inputHandler->setInputRequest($inputRequest);
-        return $inputHandler->handle();
-
-    }
-
-    /**
-     * This method should be called in order to "handle" a Tooling Client
-     * request that has come to the client that has been implemented.
-     */
-    public function dispatch()
-    {
-        $this->initialize();
-
-        try {
-
-            $this->_preDispatch();
-
-            if ($this->_registry->getRequest()->isDispatchable()) {
-
-                if ($this->_registry->getRequest()->getActionName() == null) {
-                    require_once 'Zend/Tool/Framework/Client/Exception.php';
-                    throw new Zend_Tool_Framework_Client_Exception('Client failed to setup the action name.');
-                }
-
-                if ($this->_registry->getRequest()->getProviderName() == null) {
-                    require_once 'Zend/Tool/Framework/Client/Exception.php';
-                    throw new Zend_Tool_Framework_Client_Exception('Client failed to setup the provider name.');
-                }
-
-                $this->_handleDispatch();
-
-            }
-
-        } catch (Exception $exception) {
-            $this->_registry->getResponse()->setException($exception);
-        }
-
-        $this->_postDispatch();
-    }
-
-    public function convertToClientNaming($string)
-    {
-        return $string;
-    }
-
-    public function convertFromClientNaming($string)
-    {
-        return $string;
-    }
-
-    protected function _handleDispatch()
-    {
-        // get the provider repository
-        $providerRepository = $this->_registry->getProviderRepository();
-
-        $request = $this->_registry->getRequest();
-
-        // get the dispatchable provider signature
-        $providerSignature = $providerRepository->getProviderSignature($request->getProviderName());
-
-        // get the actual provider
-        $provider = $providerSignature->getProvider();
-
-        // ensure that we can pretend if this is a pretend request
-        if ($request->isPretend() && (!$provider instanceof Zend_Tool_Framework_Provider_Pretendable)) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('Dispatcher error - provider does not support pretend');
-        }
-
-        // get the action name
-        $actionName = $this->_registry->getRequest()->getActionName();
-        $specialtyName = $this->_registry->getRequest()->getSpecialtyName();
-
-        if (!$actionableMethod = $providerSignature->getActionableMethodByActionName($actionName, $specialtyName)) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('Dispatcher error - actionable method not found');
-        }
-
-        // get the actual method and param information
-        $methodName       = $actionableMethod['methodName'];
-        $methodParameters = $actionableMethod['parameterInfo'];
-
-        // get the provider params
-        $requestParameters = $this->_registry->getRequest()->getProviderParameters();
-
-        // @todo This seems hackish, determine if there is a better way
-        $callParameters = array();
-        foreach ($methodParameters as $methodParameterName => $methodParameterValue) {
-            if (!array_key_exists($methodParameterName, $requestParameters) && $methodParameterValue['optional'] == false) {
-                if ($this instanceof Zend_Tool_Framework_Client_Interactive_InputInterface) {
-                    $promptSting = $this->getMissingParameterPromptString($provider, $actionableMethod['action'], $methodParameterValue['name']);
-                    $parameterPromptValue = $this->promptInteractiveInput($promptSting)->getContent();
-                    if ($parameterPromptValue == null) {
-                        require_once 'Zend/Tool/Framework/Client/Exception.php';
-                        throw new Zend_Tool_Framework_Client_Exception('Value supplied for required parameter "' . $methodParameterValue['name'] . '" is empty');
-                    }
-                    $callParameters[] = $parameterPromptValue;
-                } else {
-                    require_once 'Zend/Tool/Framework/Client/Exception.php';
-                    throw new Zend_Tool_Framework_Client_Exception('A required parameter "' . $methodParameterValue['name'] . '" was not supplied.');
-                }
-            } else {
-                $callParameters[] = (array_key_exists($methodParameterName, $requestParameters)) ? $requestParameters[$methodParameterName] : $methodParameterValue['default'];
-            }
-        }
-
-        $this->_handleDispatchExecution($provider, $methodName, $callParameters);
-    }
-    
-    protected function _handleDispatchExecution($class, $methodName, $callParameters)
-    {
-        if (method_exists($class, $methodName)) {
-            call_user_func_array(array($class, $methodName), $callParameters);
-        } elseif (method_exists($class, $methodName . 'Action')) {
-            call_user_func_array(array($class, $methodName . 'Action'), $callParameters);
-        } else {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('Not a supported method.');
-        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Config.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Config.php
deleted file mode 100644
index 52477e148..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Config.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Config
-{
-
-    protected $_configFilepath = null;
-
-    /**
-     * @var Zend_Config
-     */
-    protected $_config = null;
-
-    /**
-     * @param array $options
-     */
-    public function __config($options = array())
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * @param array $options
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $setMethodName = 'set' . $optionName;
-            if (method_exists($this, $setMethodName)) {
-                $this->{$setMethodName}($optionValue);
-            }
-        }
-    }
-
-    /**
-     * @param  string $configFilepath
-     * @return Zend_Tool_Framework_Client_Config
-     */
-    public function setConfigFilepath($configFilepath)
-    {
-        if (!file_exists($configFilepath)) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('Provided path to config ' . $configFilepath . ' does not exist');
-        }
-
-        $this->_configFilepath = $configFilepath;
-        $this->loadConfig($configFilepath);
-        
-        return $this;
-    }
-
-    /**
-     * Load the configuration from the given path.
-     * 
-     * @param string $configFilepath
-     */
-    protected function loadConfig($configFilepath)
-    {
-        $suffix = substr($configFilepath, -4);
-
-        switch ($suffix) {
-            case '.ini':
-                require_once 'Zend/Config/Ini.php';
-                $this->_config = new Zend_Config_Ini($configFilepath, null, array('allowModifications' => true));
-                break;
-            case '.xml':
-                require_once 'Zend/Config/Xml.php';
-                $this->_config = new Zend_Config_Xml($configFilepath, null, array('allowModifications' => true));
-                break;
-            case '.php':
-                require_once 'Zend/Config.php';
-                $this->_config = new Zend_Config(include $configFilepath, true);
-                break;
-            default:
-                require_once 'Zend/Tool/Framework/Client/Exception.php';
-                throw new Zend_Tool_Framework_Client_Exception('Unknown config file type '
-                    . $suffix . ' at location ' . $configFilepath
-                    );
-        }
-    }
-
-    /**
-     * Return the filepath of the configuration.
-     * 
-     * @return string
-     */
-    public function getConfigFilepath()
-    {
-        return $this->_configFilepath;
-    }
-
-    /**
-     * Get a configuration value.
-     * 
-     * @param string $name
-     * @param string $defaultValue
-     * @return mixed
-     */
-    public function get($name, $defaultValue=null)
-    {
-        return $this->getConfigInstance()->get($name, $defaultValue);
-    }
-
-    /**
-     * Get a configuration value
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        return $this->getConfigInstance()->{$name};
-    }
-
-    /**
-     * Check if a configuration value isset.
-     *
-     * @param  string $name
-     * @return boolean
-     */
-    public function __isset($name)
-    {
-        if($this->exists() == false) {
-            return false;
-        }
-        return isset($this->getConfigInstance()->{$name});
-    }
-
-    /**
-     * @param string $name
-     */
-    public function __unset($name)
-    {
-        unset($this->getConfigInstance()->$name);
-    }
-
-    /**
-     * @param string $name
-     * @param mixed $value
-     */
-    public function __set($name, $value)
-    {
-        return $this->getConfigInstance()->$name = $value;
-    }
-
-    /**
-     * Check if the User profile has a configuration.
-     *
-     * @return bool
-     */
-    public function exists()
-    {
-        return ($this->_config!==null);
-    }
-
-    /**
-     * @throws Zend_Tool_Framework_Client_Exception
-     * @return Zend_Config
-     */
-    public function getConfigInstance()
-    {
-        if(!$this->exists()) {
-            require_once "Zend/Tool/Framework/Client/Exception.php";
-            throw new Zend_Tool_Framework_Client_Exception("Client has no persistent configuration.");
-        }
-
-        return $this->_config;
-    }
-
-    /**
-     * Save changes to the configuration into persistence.
-     *
-     * @return bool
-     */
-    public function save()
-    {
-        if($this->exists()) {
-            $writer = $this->getConfigWriter();
-            $writer->write($this->getConfigFilepath(), $this->getConfigInstance(), true);
-            $this->loadConfig($this->getConfigFilepath());
-
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the config writer that corresponds to the current config file type.
-     *
-     * @return Zend_Config_Writer_FileAbstract
-     */
-    protected function getConfigWriter()
-    {
-        $suffix = substr($this->getConfigFilepath(), -4);
-        switch($suffix) {
-            case '.ini':
-                require_once "Zend/Config/Writer/Ini.php";
-                $writer = new Zend_Config_Writer_Ini();
-                $writer->setRenderWithoutSections();
-                break;
-            case '.xml':
-                require_once "Zend/Config/Writer/Xml.php";
-                $writer = new Zend_Config_Writer_Xml();
-                break;
-            case '.php':
-                require_once "Zend/Config/Writer/Array.php";
-                $writer = new Zend_Config_Writer_Array();
-                break;
-            default:
-                require_once 'Zend/Tool/Framework/Client/Exception.php';
-                throw new Zend_Tool_Framework_Client_Exception('Unknown config file type '
-                    . $suffix . ' at location ' . $this->getConfigFilepath()
-                    );
-        }
-        return $writer;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console.php
deleted file mode 100644
index 070f4955c..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Console.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Client_Abstract
- */
-require_once 'Zend/Tool/Framework/Client/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Client_Interactive_InputInterface
- */
-require_once 'Zend/Tool/Framework/Client/Interactive/InputInterface.php';
-
-/**
- * @see Zend_Tool_Framework_Client_Interactive_OutputInterface
- */
-require_once 'Zend/Tool/Framework/Client/Interactive/OutputInterface.php';
-
-/**
- * Zend_Tool_Framework_Client_Console - the CLI Client implementation for Zend_Tool_Framework
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console
-    extends Zend_Tool_Framework_Client_Abstract
-    implements Zend_Tool_Framework_Client_Interactive_InputInterface,
-               Zend_Tool_Framework_Client_Interactive_OutputInterface
-{
-
-    /**
-     * @var array
-     */
-    protected $_configOptions = null;
-
-    /**
-     * @var array
-     */
-    protected $_storageOptions = null;
-
-    /**
-     * @var Zend_Filter_Word_CamelCaseToDash
-     */
-    protected $_filterToClientNaming = null;
-
-    /**
-     * @var Zend_Filter_Word_DashToCamelCase
-     */
-    protected $_filterFromClientNaming = null;
-
-    /**
-     * @var array
-     */
-    protected $_classesToLoad = array();
-    
-    /**
-     * main() - This is typically called from zf.php. This method is a
-     * self contained main() function.
-     *
-     */
-    public static function main($options = array())
-    {
-        $cliClient = new self($options);
-        $cliClient->dispatch();
-    }
-
-    /**
-     * getName() - return the name of the client, in this case 'console'
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'console';
-    }
-    
-    /**
-     * setConfigOptions()
-     * 
-     * @param $configOptions
-     */
-    public function setConfigOptions($configOptions)
-    {
-        $this->_configOptions = $configOptions;
-        return $this;
-    }
-
-    /**
-     * setStorageOptions()
-     * 
-     * @param $storageOptions
-     */
-    public function setStorageOptions($storageOptions)
-    {
-        $this->_storageOptions = $storageOptions;
-        return $this;
-    }
-    
-    public function setClassesToLoad($classesToLoad)
-    {
-    	$this->_classesToLoad = $classesToLoad;
-    	return $this;
-    }
-
-    /**
-     * _init() - Tasks processed before the constructor, generally setting up objects to use
-     *
-     */
-    protected function _preInit()
-    {
-        $config = $this->_registry->getConfig();
-
-        if ($this->_configOptions != null) {
-            $config->setOptions($this->_configOptions);
-        }
-
-        $storage = $this->_registry->getStorage();
-
-        if ($this->_storageOptions != null && isset($this->_storageOptions['directory'])) {
-            $storage->setAdapter(
-                new Zend_Tool_Framework_Client_Storage_Directory($this->_storageOptions['directory'])
-                );
-        }
-
-        // which classes are essential to initializing Zend_Tool_Framework_Client_Console
-        $classesToLoad = array(
-            'Zend_Tool_Framework_Client_Console_Manifest',    
-            'Zend_Tool_Framework_System_Manifest'
-            );
-            
-        if ($this->_classesToLoad) {
-        	if (is_string($this->_classesToLoad)) {
-        		$classesToLoad[] = $this->_classesToLoad;
-        	} elseif (is_array($this->_classesToLoad)) {
-        		$classesToLoad = array_merge($classesToLoad, $this->_classesToLoad);
-        	}
-        }
-        
-        // add classes to the basic loader from the config file basicloader.classes.1 ..
-        if (isset($config->basicloader) && isset($config->basicloader->classes)) {
-            foreach ($config->basicloader->classes as $classKey => $className) {
-                array_push($classesToLoad, $className);
-            }
-        }
-
-        $this->_registry->setLoader(
-            new Zend_Tool_Framework_Loader_BasicLoader(array('classesToLoad' => $classesToLoad))
-            );
-
-        return;
-    }
-
-    /**
-     * _preDispatch() - Tasks handed after initialization but before dispatching
-     *
-     */
-    protected function _preDispatch()
-    {
-        $response = $this->_registry->getResponse();
-
-        $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_AlignCenter());
-        $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_Indention());
-        $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_Blockize());
-
-        if (function_exists('posix_isatty')) {
-            $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer());
-        }
-        
-        $response->addContentDecorator(new Zend_Tool_Framework_Client_Response_ContentDecorator_Separator())
-            ->setDefaultDecoratorOptions(array('separator' => true));
-
-        $optParser = new Zend_Tool_Framework_Client_Console_ArgumentParser();
-        $optParser->setArguments($_SERVER['argv'])
-            ->setRegistry($this->_registry)
-            ->parse();
-
-        return;
-    }
-
-    /**
-     * _postDispatch() - Tasks handled after dispatching
-     *
-     */
-    protected function _postDispatch()
-    {
-        $request = $this->_registry->getRequest();
-        $response = $this->_registry->getResponse();
-
-        if ($response->isException()) {
-            $helpSystem = new Zend_Tool_Framework_Client_Console_HelpSystem();
-            $helpSystem->setRegistry($this->_registry)
-                ->respondWithErrorMessage($response->getException()->getMessage(), $response->getException())
-                ->respondWithSpecialtyAndParamHelp(
-                    $request->getProviderName(),
-                    $request->getActionName()
-                    );
-        }
-
-        echo PHP_EOL;
-        return;
-    }
-
-    /**
-     * handleInteractiveInputRequest() is required by the Interactive InputInterface
-     *
-     *
-     * @param Zend_Tool_Framework_Client_Interactive_InputRequest $inputRequest
-     * @return string
-     */
-    public function handleInteractiveInputRequest(Zend_Tool_Framework_Client_Interactive_InputRequest $inputRequest)
-    {
-        fwrite(STDOUT, $inputRequest->getContent() . PHP_EOL . 'zf> ');
-        $inputContent = fgets(STDIN);
-        return rtrim($inputContent); // remove the return from the end of the string
-    }
-
-    /**
-     * handleInteractiveOutput() is required by the Interactive OutputInterface
-     *
-     * This allows us to display output immediately from providers, rather
-     * than displaying it after the provider is done.
-     *
-     * @param string $output
-     */
-    public function handleInteractiveOutput($output)
-    {
-        echo $output;
-    }
-
-    /**
-     * getMissingParameterPromptString()
-     *
-     * @param Zend_Tool_Framework_Provider_Interface $provider
-     * @param Zend_Tool_Framework_Action_Interface $actionInterface
-     * @param string $missingParameterName
-     * @return string
-     */
-    public function getMissingParameterPromptString(Zend_Tool_Framework_Provider_Interface $provider, Zend_Tool_Framework_Action_Interface $actionInterface, $missingParameterName)
-    {
-        return 'Please provide a value for $' . $missingParameterName;
-    }
-
-
-    /**
-     * convertToClientNaming()
-     *
-     * Convert words to client specific naming, in this case is lower, dash separated
-     *
-     * Filters are lazy-loaded.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function convertToClientNaming($string)
-    {
-        if (!$this->_filterToClientNaming) {
-            $filter = new Zend_Filter();
-            $filter->addFilter(new Zend_Filter_Word_CamelCaseToDash());
-            $filter->addFilter(new Zend_Filter_StringToLower());
-
-            $this->_filterToClientNaming = $filter;
-        }
-
-        return $this->_filterToClientNaming->filter($string);
-    }
-
-    /**
-     * convertFromClientNaming()
-     *
-     * Convert words from client specific naming to code naming - camelcased
-     *
-     * Filters are lazy-loaded.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function convertFromClientNaming($string)
-    {
-        if (!$this->_filterFromClientNaming) {
-            $this->_filterFromClientNaming = new Zend_Filter_Word_DashToCamelCase();
-        }
-
-        return $this->_filterFromClientNaming->filter($string);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php
deleted file mode 100644
index ff9378fa3..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php
+++ /dev/null
@@ -1,532 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ArgumentParser.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Console_GetOpt
- */
-require_once 'Zend/Console/Getopt.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Request
-     */
-    protected $_request = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Response
-     */
-    protected $_response = null;
-
-    /**#@+
-     * @var array
-     */
-    protected $_argumentsOriginal = null;
-    protected $_argumentsWorking  = null;
-    /**#@-*/
-
-    /**
-     * @var bool
-     */
-    protected $_help = false;
-    protected $_helpKnownAction = false;
-    protected $_helpKnownProvider = false;
-    protected $_helpKnownSpecialty = false;
-
-
-    /**
-     * setArguments
-     *
-     * @param array $arguments
-     * @return Zend_Tool_Framework_Client_Console_ArgumentParser
-     */
-    public function setArguments(Array $arguments)
-    {
-        $this->_argumentsOriginal = $this->_argumentsWorking = $arguments;
-        return $this;
-    }
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Client_Console_ArgumentParser
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        // get the client registry
-        $this->_registry = $registry;
-
-        // set manifest repository, request, response for easy access
-        $this->_manifestRepository = $this->_registry->getManifestRepository();
-        $this->_request  = $this->_registry->getRequest();
-        $this->_response = $this->_registry->getResponse();
-        return $this;
-    }
-
-    /**
-     * Parse() - This method does the work of parsing the arguments into the enpooint request,
-     * this will also (during help operations) fill the response in with information as needed
-     *
-     * @return null
-     */
-    public function parse()
-    {
-
-        if ($this->_request == null || $this->_response == null) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('The client registry must have both a request and response registered.');
-        }
-
-        // setup the help options
-        $helpResponseOptions = array();
-
-        // check to see if the first cli arg is the script name
-        if ($this->_argumentsWorking[0] == $_SERVER['SCRIPT_NAME' ]) {
-            array_shift($this->_argumentsWorking);
-        }
-
-        // process global options
-        try {
-            $this->_parseGlobalPart();
-        } catch (Zend_Tool_Framework_Client_Exception $exception) {
-            $this->_createHelpResponse(array('error' => $exception->getMessage()));
-            return;
-        }
-
-        // ensure there are arguments left
-        if (count($this->_argumentsWorking) == 0) {
-            $this->_request->setDispatchable(false); // at this point request is not dispatchable
-
-            // check to see if this was a help request
-            if ($this->_help) {
-                $this->_createHelpResponse();
-            } else {
-                $this->_createHelpResponse(array('error' => 'An action and provider is required.'));
-            }
-            return;
-        }
-
-        // process the action part of the command line
-        try {
-            $this->_parseActionPart();
-        } catch (Zend_Tool_Framework_Client_Exception $exception) {
-            $this->_request->setDispatchable(false);
-            $this->_createHelpResponse(array('error' => $exception->getMessage()));
-            return;
-        }
-
-        if ($this->_helpKnownAction) {
-            $helpResponseOptions = array_merge(
-                $helpResponseOptions,
-                array('actionName' => $this->_request->getActionName())
-                );
-        }
-
-        /* @TODO Action Parameter Requirements */
-
-        // make sure there are more "words" on the command line
-        if (count($this->_argumentsWorking) == 0) {
-            $this->_request->setDispatchable(false); // at this point request is not dispatchable
-
-            // check to see if this is a help request
-            if ($this->_help) {
-                $this->_createHelpResponse($helpResponseOptions);
-            } else {
-                $this->_createHelpResponse(array_merge($helpResponseOptions, array('error' => 'A provider is required.')));
-            }
-            return;
-        }
-
-
-        // process the provider part of the command line
-        try {
-            $this->_parseProviderPart();
-        } catch (Zend_Tool_Framework_Client_Exception $exception) {
-            $this->_request->setDispatchable(false);
-            $this->_createHelpResponse(array('error' => $exception->getMessage()));
-            return;
-        }
-
-        if ($this->_helpKnownProvider) {
-            $helpResponseOptions = array_merge(
-                $helpResponseOptions,
-                array('providerName' => $this->_request->getProviderName())
-                );
-        }
-
-        if ($this->_helpKnownSpecialty) {
-            $helpResponseOptions = array_merge(
-                $helpResponseOptions,
-                array('specialtyName' => $this->_request->getSpecialtyName())
-                );
-        }
-
-        // if there are arguments on the command line, lets process them as provider options
-        if (count($this->_argumentsWorking) != 0) {
-            $this->_parseProviderOptionsPart();
-        }
-
-        // if there is still arguments lingering around, we can assume something is wrong
-        if (count($this->_argumentsWorking) != 0) {
-            $this->_request->setDispatchable(false); // at this point request is not dispatchable
-            if ($this->_help) {
-                $this->_createHelpResponse($helpResponseOptions);
-            } else {
-                $this->_createHelpResponse(array_merge(
-                    $helpResponseOptions,
-                    array('error' => 'Unknown arguments left on the command line: ' . implode(' ', $this->_argumentsWorking))
-                    ));
-            }
-            return;
-        }
-
-        // everything was processed and this is a request for help information
-        if ($this->_help) {
-            $this->_request->setDispatchable(false); // at this point request is not dispatchable
-            $this->_createHelpResponse($helpResponseOptions);
-        }
-
-        return;
-    }
-
-    /**
-     * Internal routine for parsing global options from the command line
-     *
-     * @return null
-     */
-    protected function _parseGlobalPart()
-    {
-        $getoptOptions = array();
-        $getoptOptions['help|h']    = 'HELP';
-        $getoptOptions['verbose|v'] = 'VERBOSE';
-        $getoptOptions['pretend|p'] = 'PRETEND';
-        $getoptOptions['debug|d']   = 'DEBUG';
-        $getoptParser = new Zend_Console_Getopt($getoptOptions, $this->_argumentsWorking, array('parseAll' => false));
-
-        // @todo catch any exceptions here
-        $getoptParser->parse();
-
-        foreach ($getoptParser->getOptions() as $option) {
-            if ($option == 'pretend') {
-                $this->_request->setPretend(true);
-            } elseif ($option == 'debug') {
-                $this->_request->setDebug(true);
-            } elseif ($option == 'verbose') {
-                $this->_request->setVerbose(true);
-            } else {
-                $property = '_'.$option;
-                $this->{$property} = true;
-            }
-        }
-
-        $this->_argumentsWorking = $getoptParser->getRemainingArgs();
-
-        return;
-    }
-
-    /**
-     * Internal routine for parsing the action name from the arguments
-     *
-     * @return null
-     */
-    protected function _parseActionPart()
-    {
-        // the next "word" should be the action name
-        $consoleActionName = array_shift($this->_argumentsWorking);
-
-        if ($consoleActionName == '?') {
-            $this->_help = true;
-            return;
-        }
-
-        $actionSearchCriteria = array(
-            'type'       => 'Tool',
-            'name'       => 'actionName',
-            'value'      => $consoleActionName,
-            'clientName' => 'console'
-            );
-        
-        // is the action name valid?
-        $actionMetadata = $this->_manifestRepository->getMetadata($actionSearchCriteria);
-
-        // check for normalized names as well (all lower, no separators)
-        if (!$actionMetadata) {
-            $actionSearchCriteria['name']  = 'normalizedActionName';
-            $actionSearchCriteria['value'] = strtolower(str_replace(array('-', '_'), '', $consoleActionName));
-            $actionSearchCriteria['clientName'] = 'all';
-            $actionMetadata = $this->_manifestRepository->getMetadata($actionSearchCriteria);
-        }
-        
-        // if no action, handle error
-        if (!$actionMetadata) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('Action \'' . $consoleActionName . '\' is not a valid action.');
-        }
-
-        // prepare action request name
-        $this->_helpKnownAction = true;
-        $this->_request->setActionName($actionMetadata->getActionName());
-        return;
-    }
-
-    /**
-     * Internal routine for parsing the provider part of the command line arguments
-     *
-     * @return null
-     */
-    protected function _parseProviderPart()
-    {
-        // get the cli "word" as the provider name from command line
-        $consoleProviderFull = array_shift($this->_argumentsWorking);
-        $consoleSpecialtyName = '_global';
-
-        // if there is notation for specialties? If so, break them up
-        if (strstr($consoleProviderFull, '.')) {
-            list($consoleProviderName, $consoleSpecialtyName) = explode('.', $consoleProviderFull);
-        } else {
-            $consoleProviderName = $consoleProviderFull;
-        }
-
-        if ($consoleProviderName == '?') {
-            $this->_help = true;
-            return;
-        }
-
-        $providerSearchCriteria = array(
-            'type'       => 'Tool',
-            'name'       => 'providerName',
-            'value'      => $consoleProviderName,
-            'clientName' => 'console'
-            );
-        
-        // get the cli provider names from the manifest
-        $providerMetadata = $this->_manifestRepository->getMetadata($providerSearchCriteria);
-
-        // check for normalized names as well (all lower, no separators)
-        if (!$providerMetadata) {
-            $providerSearchCriteria['name']  = 'normalizedProviderName';
-            $providerSearchCriteria['value'] = strtolower(str_replace(array('-', '_'), '', $consoleProviderName));
-            $providerSearchCriteria['clientName'] = 'all';
-            $providerMetadata = $this->_manifestRepository->getMetadata($providerSearchCriteria);
-        }
-            
-        if (!$providerMetadata) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception(
-                'Provider \'' . $consoleProviderFull . '\' is not a valid provider.'
-                );
-        }
-
-        $this->_helpKnownProvider = true;
-        $this->_request->setProviderName($providerMetadata->getProviderName());
-
-        if ($consoleSpecialtyName == '?') {
-            $this->_help = true;
-            return;
-        }
-
-        $providerSpecialtySearchCriteria = array(
-            'type'         => 'Tool',
-            'name'         => 'specialtyName',
-            'value'        => $consoleSpecialtyName,
-            'providerName' => $providerMetadata->getProviderName(),
-            'clientName'   => 'console'
-            );
-        
-        $providerSpecialtyMetadata = $this->_manifestRepository->getMetadata($providerSpecialtySearchCriteria);
-
-        if (!$providerSpecialtyMetadata) {
-            $providerSpecialtySearchCriteria['name'] = 'normalizedSpecialtyName';
-            $providerSpecialtySearchCriteria['value'] = strtolower(str_replace(array('-', '_'), '', $consoleSpecialtyName));
-            $providerSpecialtySearchCriteria['clientName'] = 'all';
-            $providerSpecialtyMetadata = $this->_manifestRepository->getMetadata($providerSpecialtySearchCriteria);
-        }
-        
-        if (!$providerSpecialtyMetadata) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception(
-                'Provider \'' . $consoleSpecialtyName . '\' is not a valid specialty.'
-                );
-        }
-
-        $this->_helpKnownSpecialty = true;
-        $this->_request->setSpecialtyName($providerSpecialtyMetadata->getSpecialtyName());
-        return;
-    }
-
-    /**
-     * Internal routine for parsing the provider options from the command line
-     *
-     * @return null
-     */
-    protected function _parseProviderOptionsPart()
-    {
-        if (current($this->_argumentsWorking) == '?') {
-            $this->_help = true;
-            return;
-        }
-
-        $searchParams = array(
-            'type'          => 'Tool',
-            'providerName'  => $this->_request->getProviderName(),
-            'actionName'    => $this->_request->getActionName(),
-            'specialtyName' => $this->_request->getSpecialtyName(),
-            'clientName'    => 'console'
-            );
-
-        $actionableMethodLongParamsMetadata = $this->_manifestRepository->getMetadata(
-            array_merge($searchParams, array('name' => 'actionableMethodLongParams'))
-            );
-
-        $actionableMethodShortParamsMetadata = $this->_manifestRepository->getMetadata(
-            array_merge($searchParams, array('name' => 'actionableMethodShortParams'))
-            );
-
-        $paramNameShortValues = $actionableMethodShortParamsMetadata->getValue();
-
-        $getoptOptions = array();
-        $wordArguments = array();
-        $longParamCanonicalNames = array();
-
-        $actionableMethodLongParamsMetadataReference = $actionableMethodLongParamsMetadata->getReference();
-        foreach ($actionableMethodLongParamsMetadata->getValue() as $parameterNameLong => $consoleParameterNameLong) {
-            $optionConfig = $consoleParameterNameLong . '|';
-
-            $parameterInfo = $actionableMethodLongParamsMetadataReference['parameterInfo'][$parameterNameLong];
-
-            // process ParameterInfo into array for command line option matching
-            if ($parameterInfo['type'] == 'string' || $parameterInfo['type'] == 'bool') {
-                $optionConfig .= $paramNameShortValues[$parameterNameLong]
-                               . (($parameterInfo['optional']) ? '-' : '=') . 's';
-            } elseif (in_array($parameterInfo['type'], array('int', 'integer', 'float'))) {
-                $optionConfig .= $paramNameShortValues[$parameterNameLong]
-                               . (($parameterInfo['optional']) ? '-' : '=') . 'i';
-            } else {
-                $optionConfig .= $paramNameShortValues[$parameterNameLong] . '-s';
-            }
-
-            $getoptOptions[$optionConfig] = ($parameterInfo['description'] != '') ? $parameterInfo['description'] : 'No description available.';
-
-
-            // process ParameterInfo into array for command line WORD (argument) matching
-            $wordArguments[$parameterInfo['position']]['parameterName'] = $parameterInfo['name'];
-            $wordArguments[$parameterInfo['position']]['optional']      = $parameterInfo['optional'];
-            $wordArguments[$parameterInfo['position']]['type']          = $parameterInfo['type'];
-
-            // keep a translation of console to canonical names
-            $longParamCanonicalNames[$consoleParameterNameLong] = $parameterNameLong;
-        }
-
-
-        if (!$getoptOptions) {
-            // no options to parse here, return
-            return;
-        }
-
-        // if non-option arguments exist, attempt to process them before processing options
-        $wordStack = array();
-        while (($wordOnTop = array_shift($this->_argumentsWorking))) {
-            if (substr($wordOnTop, 0, 1) != '-') {
-                array_push($wordStack, $wordOnTop);
-            } else {
-                // put word back on stack and move on
-                array_unshift($this->_argumentsWorking, $wordOnTop);
-                break;
-            }
-
-            if (count($wordStack) == count($wordArguments)) {
-                // when we get at most the number of arguments we are expecting
-                // then break out.
-                break;
-            }
-
-        }
-
-        if ($wordStack && $wordArguments) {
-            for ($wordIndex = 1; $wordIndex <= count($wordArguments); $wordIndex++) {
-                if (!array_key_exists($wordIndex-1, $wordStack) || !array_key_exists($wordIndex, $wordArguments)) {
-                    break;
-                }
-                $this->_request->setProviderParameter($wordArguments[$wordIndex]['parameterName'], $wordStack[$wordIndex-1]);
-                unset($wordStack[$wordIndex-1]);
-            }
-        }
-
-        $getoptParser = new Zend_Console_Getopt($getoptOptions, $this->_argumentsWorking, array('parseAll' => false));
-        $getoptParser->parse();
-        foreach ($getoptParser->getOptions() as $option) {
-            $value = $getoptParser->getOption($option);
-            $providerParamOption = $longParamCanonicalNames[$option];
-            $this->_request->setProviderParameter($providerParamOption, $value);
-        }
-
-        $this->_argumentsWorking = $getoptParser->getRemainingArgs();
-
-        return;
-    }
-
-    /**
-     * _createHelpResponse
-     *
-     * @param unknown_type $options
-     */
-    protected function _createHelpResponse($options = array())
-    {
-        require_once 'Zend/Tool/Framework/Client/Console/HelpSystem.php';
-        $helpSystem = new Zend_Tool_Framework_Client_Console_HelpSystem();
-        $helpSystem->setRegistry($this->_registry);
-
-        if (isset($options['error'])) {
-            $helpSystem->respondWithErrorMessage($options['error']);
-        }
-
-        if (isset($options['actionName']) && isset($options['providerName'])) {
-            $helpSystem->respondWithSpecialtyAndParamHelp($options['providerName'], $options['actionName']);
-        } elseif (isset($options['actionName'])) {
-            $helpSystem->respondWithActionHelp($options['actionName']);
-        } elseif (isset($options['providerName'])) {
-            $helpSystem->respondWithProviderHelp($options['providerName']);
-        } else {
-            $helpSystem->respondWithGeneralHelp();
-        }
-
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/HelpSystem.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/HelpSystem.php
deleted file mode 100644
index 88f7fc4e6..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/HelpSystem.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelpSystem.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console_HelpSystem
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Response
-     */
-    protected $_response = null;
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        $this->_response = $registry->getResponse();
-        return $this;
-    }
-
-    /**
-     * respondWithErrorMessage()
-     *
-     * @param string $errorMessage
-     * @param Exception $exception
-     */
-    public function respondWithErrorMessage($errorMessage, Exception $exception = null)
-    {
-        // break apart the message into wrapped chunks
-        $errorMessages = explode(PHP_EOL, wordwrap($errorMessage, 70, PHP_EOL, false));
-
-        $text = 'An Error Has Occurred';
-        $this->_response->appendContent($text, array('color' => array('hiWhite', 'bgRed'), 'aligncenter' => true));
-        $this->_response->appendContent($errorMessage, array('indention' => 1, 'blockize' => 72, 'color' => array('white', 'bgRed')));
-
-        if ($exception && $this->_registry->getRequest()->isDebug()) {
-            $this->_response->appendContent($exception->getTraceAsString());
-        }
-
-        $this->_response->appendContent(null, array('separator' => true));
-        return $this;
-    }
-
-    /**
-     * respondWithGeneralHelp()
-     *
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    public function respondWithGeneralHelp()
-    {
-        $this->_respondWithHeader();
-
-        $noSeparator = array('separator' => false);
-
-        $this->_response->appendContent('Usage:', array('color' => 'green'))
-            ->appendContent('    ', $noSeparator)
-            ->appendContent('zf', array_merge(array('color' => 'cyan'), $noSeparator))
-            ->appendContent(' [--global-opts]', $noSeparator)
-            ->appendContent(' action-name', array_merge(array('color' => 'cyan'), $noSeparator))
-            ->appendContent(' [--action-opts]', $noSeparator)
-            ->appendContent(' provider-name', array_merge(array('color' => 'cyan'), $noSeparator))
-            ->appendContent(' [--provider-opts]', $noSeparator)
-            ->appendContent(' [provider parameters ...]')
-            ->appendContent('    Note: You may use "?" in any place of the above usage string to ask for more specific help information.', array('color'=>'yellow'))
-            ->appendContent('    Example: "zf ? version" will list all available actions for the version provider.', array('color'=>'yellow', 'separator' => 2))
-            ->appendContent('Providers and their actions:', array('color' => 'green'));
-
-        $this->_respondWithSystemInformation();
-        return $this;
-    }
-
-    /**
-     * respondWithActionHelp()
-     *
-     * @param string $actionName
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    public function respondWithActionHelp($actionName)
-    {
-        $this->_respondWithHeader();
-        $this->_response->appendContent('Providers that support the action "' . $actionName . '"', array('color' => 'green'));
-        $this->_respondWithSystemInformation(null, $actionName);
-        return $this;
-    }
-
-    /**
-     * respondWithSpecialtyAndParamHelp()
-     *
-     * @param string $providerName
-     * @param string $actionName
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    public function respondWithSpecialtyAndParamHelp($providerName, $actionName)
-    {
-        $this->_respondWithHeader();
-        $this->_response->appendContent(
-            'Details for action "' . $actionName . '" and provider "' . $providerName . '"',
-            array('color' => 'green')
-            );
-        $this->_respondWithSystemInformation($providerName, $actionName, true);
-        return $this;
-    }
-
-    /**
-     * respondWithProviderHelp()
-     *
-     * @param string $providerName
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    public function respondWithProviderHelp($providerName)
-    {
-        $this->_respondWithHeader();
-        $this->_response->appendContent('Actions supported by provider "' . $providerName . '"', array('color' => 'green'));
-        $this->_respondWithSystemInformation($providerName);
-        return $this;
-    }
-
-    /**
-     * _respondWithHeader()
-     *
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    protected function _respondWithHeader()
-    {
-        /**
-         * @see Zend_Version
-         */
-        require_once 'Zend/Version.php';
-        $this->_response->appendContent('Zend Framework', array('color' => array('hiWhite'), 'separator' => false));
-        $this->_response->appendContent(' Command Line Console Tool v' . Zend_Version::VERSION . '');
-        return $this;
-    }
-
-    /**
-     * _respondWithSystemInformation()
-     *
-     * @param string $providerNameFilter
-     * @param string $actionNameFilter
-     * @param bool $includeAllSpecialties
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    protected function _respondWithSystemInformation($providerNameFilter = null, $actionNameFilter = null, $includeAllSpecialties = false)
-    {
-        $manifest = $this->_registry->getManifestRepository();
-
-        $providerMetadatasSearch = array(
-            'type'       => 'Tool',
-            'name'       => 'providerName',
-            'clientName' => 'console'
-            );
-
-        if (is_string($providerNameFilter)) {
-            $providerMetadatasSearch = array_merge($providerMetadatasSearch, array('providerName' => $providerNameFilter));
-        }
-
-        $actionMetadatasSearch = array(
-            'type'       => 'Tool',
-            'name'       => 'actionName',
-            'clientName' => 'console'
-            );
-
-        if (is_string($actionNameFilter)) {
-            $actionMetadatasSearch = array_merge($actionMetadatasSearch, array('actionName' => $actionNameFilter));
-        }
-
-        // get the metadata's for the things to display
-        $displayProviderMetadatas = $manifest->getMetadatas($providerMetadatasSearch);
-        $displayActionMetadatas = $manifest->getMetadatas($actionMetadatasSearch);
-
-        // create index of actionNames
-        for ($i = 0; $i < count($displayActionMetadatas); $i++) {
-            $displayActionNames[] = $displayActionMetadatas[$i]->getActionName();
-        }
-
-        foreach ($displayProviderMetadatas as $providerMetadata) {
-
-            $providerNameDisplayed = false;
-
-            $providerName = $providerMetadata->getProviderName();
-            $providerSignature = $providerMetadata->getReference();
-
-            foreach ($providerSignature->getActions() as $actionInfo) {
-
-                $actionName = $actionInfo->getName();
-
-                // check to see if this action name is valid
-                if (($foundActionIndex = array_search($actionName, $displayActionNames)) === false) {
-                    continue;
-                } else {
-                    $actionMetadata = $displayActionMetadatas[$foundActionIndex];
-                }
-
-                $specialtyMetadata = $manifest->getMetadata(array(
-                    'type'          => 'Tool',
-                    'name'          => 'specialtyName',
-                    'providerName'  => $providerName,
-                    'specialtyName' => '_Global',
-                    'clientName'    => 'console'
-                    ));
-
-                // lets do the main _Global action first
-                $actionableGlobalLongParamMetadata = $manifest->getMetadata(array(
-                    'type'          => 'Tool',
-                    'name'          => 'actionableMethodLongParams',
-                    'providerName'  => $providerName,
-                    'specialtyName' => '_Global',
-                    'actionName'    => $actionName,
-                    'clientName'    => 'console'
-                    ));
-
-                $actionableGlobalMetadatas = $manifest->getMetadatas(array(
-                    'type'          => 'Tool',
-                    'name'          => 'actionableMethodLongParams',
-                    'providerName'  => $providerName,
-                    'actionName'    => $actionName,
-                    'clientName'    => 'console'
-                    ));
-
-                if ($actionableGlobalLongParamMetadata) {
-
-                    if (!$providerNameDisplayed) {
-                        $this->_respondWithProviderName($providerMetadata);
-                        $providerNameDisplayed = true;
-                    }
-
-                    $this->_respondWithCommand($providerMetadata, $actionMetadata, $specialtyMetadata, $actionableGlobalLongParamMetadata);
-
-                    $actionIsGlobal = true;
-                } else {
-                    $actionIsGlobal = false;
-                }
-
-                // check for providers without a _Global action
-                $isSingleSpecialProviderAction = false;
-                if (!$actionIsGlobal && count($actionableGlobalMetadatas) == 1) {
-                    $isSingleSpecialProviderAction = true;
-                    $this->_respondWithProviderName($providerMetadata);
-                    $providerNameDisplayed = true;
-                }
-                
-                if ($includeAllSpecialties || $isSingleSpecialProviderAction) {
-
-                    foreach ($providerSignature->getSpecialties() as $specialtyName) {
-
-                        if ($specialtyName == '_Global') {
-                            continue;
-                        }
-
-                        $specialtyMetadata = $manifest->getMetadata(array(
-                            'type'          => 'Tool',
-                            'name'          => 'specialtyName',
-                            'providerName'  => $providerMetadata->getProviderName(),
-                            'specialtyName' => $specialtyName,
-                            'clientName'    => 'console'
-                            ));
-
-                        $actionableSpecialtyLongMetadata = $manifest->getMetadata(array(
-                            'type'          => 'Tool',
-                            'name'          => 'actionableMethodLongParams',
-                            'providerName'  => $providerMetadata->getProviderName(),
-                            'specialtyName' => $specialtyName,
-                            'actionName'    => $actionName,
-                            'clientName'    => 'console'
-                            ));
-
-                        if($actionableSpecialtyLongMetadata) {
-                            $this->_respondWithCommand($providerMetadata, $actionMetadata, $specialtyMetadata, $actionableSpecialtyLongMetadata);
-                        }
-
-                    }
-                }
-                
-                // reset the special flag for single provider action with specialty
-                $isSingleSpecialProviderAction = false;
-
-                if (!$includeAllSpecialties && count($actionableGlobalMetadatas) > 1) {
-                    $this->_response->appendContent('    Note: There are specialties, use ', array('color' => 'yellow', 'separator' => false));
-                    $this->_response->appendContent(
-                        'zf ' . $actionMetadata->getValue() . ' ' . $providerMetadata->getValue() . '.?',
-                        array('color' => 'cyan', 'separator' => false)
-                        );
-                    $this->_response->appendContent(' to get specific help on them.', array('color' => 'yellow'));
-                }
-
-            }
-
-            if ($providerNameDisplayed) {
-                $this->_response->appendContent(null, array('separator' => true));
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * _respondWithProviderName()
-     *
-     * @param Zend_Tool_Framework_Metadata_Tool $providerMetadata
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    protected function _respondWithProviderName(Zend_Tool_Framework_Metadata_Tool $providerMetadata)
-    {
-        $this->_response->appendContent('  ' . $providerMetadata->getProviderName());
-        return $this;
-    }
-
-    /**
-     * _respondWithCommand()
-     *
-     * @param Zend_Tool_Framework_Metadata_Tool $providerMetadata
-     * @param Zend_Tool_Framework_Metadata_Tool $actionMetadata
-     * @param Zend_Tool_Framework_Metadata_Tool $specialtyMetadata
-     * @param Zend_Tool_Framework_Metadata_Tool $parameterLongMetadata
-     * @return Zend_Tool_Framework_Client_Console_HelpSystem
-     */
-    protected function _respondWithCommand(
-        Zend_Tool_Framework_Metadata_Tool $providerMetadata,
-        Zend_Tool_Framework_Metadata_Tool $actionMetadata,
-        Zend_Tool_Framework_Metadata_Tool $specialtyMetadata,
-        Zend_Tool_Framework_Metadata_Tool $parameterLongMetadata)//,
-        //Zend_Tool_Framework_Metadata_Tool $parameterShortMetadata)
-    {
-        $this->_response->appendContent(
-            '    zf ' . $actionMetadata->getValue() . ' ' . $providerMetadata->getValue(),
-            array('color' => 'cyan', 'separator' => false)
-            );
-
-        if ($specialtyMetadata->getSpecialtyName() != '_Global') {
-            $this->_response->appendContent('.' . $specialtyMetadata->getValue(), array('color' => 'cyan', 'separator' => false));
-        }
-
-        foreach ($parameterLongMetadata->getValue() as $paramName => $consoleParamName) {
-            $methodInfo = $parameterLongMetadata->getReference();
-            $paramString = ' ' . $consoleParamName;
-            if ( ($defaultValue = $methodInfo['parameterInfo'][$paramName]['default']) != null) {
-                $paramString .= '[=' . $defaultValue . ']';
-            }
-            $this->_response->appendContent($paramString . '', array('separator' => false));
-        }
-
-       $this->_response->appendContent(null, array('separator' => true));
-       return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/Manifest.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/Manifest.php
deleted file mode 100644
index 9b1b5ec68..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/Manifest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Manifest_MetadataManifestable
- */
-require_once 'Zend/Tool/Framework/Manifest/MetadataManifestable.php';
-
-/**
- * @see Zend_Filter
- */
-require_once 'Zend/Filter.php';
-
-/**
- * @see Zend_Filter_Word_CamelCaseToDash
- */
-require_once 'Zend/Filter/Word/CamelCaseToDash.php';
-
-/**
- * @see Zend_Filter_StringToLower
- */
-require_once 'Zend/Filter/StringToLower.php';
-
-/**
- * @see Zend_Tool_Framework_Metadata_Tool
- */
-require_once 'Zend/Tool/Framework/Metadata/Tool.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * Zend_Tool_Framework_Client_ConsoleClient_Manifest
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console_Manifest
-    implements Zend_Tool_Framework_Registry_EnabledInterface,
-               Zend_Tool_Framework_Manifest_MetadataManifestable
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * setRegistry() - Required for the Zend_Tool_Framework_Registry_EnabledInterface interface
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Client_Console_Manifest
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * getMetadata() is required by the Manifest Interface.
-     *
-     * These are the following metadatas that will be setup:
-     *
-     * actionName
-     *   - metadata for actions
-     *   - value will be a dashed name for the action named in 'actionName'
-     * providerName
-     *   - metadata for providers
-     *   - value will be a dashed-name for the provider named in 'providerName'
-     * providerSpecialtyNames
-     *   - metadata for providers
-     * actionableMethodLongParameters
-     *   - metadata for providers
-     * actionableMethodShortParameters
-     *   - metadata for providers
-     *
-     * @return array Array of Metadatas
-     */
-    public function getMetadata()
-    {
-        $metadatas = array();
-
-        // setup the camelCase to dashed filter to use since cli expects dashed named
-        $ccToDashedFilter = new Zend_Filter();
-        $ccToDashedFilter
-            ->addFilter(new Zend_Filter_Word_CamelCaseToDash())
-            ->addFilter(new Zend_Filter_StringToLower());
-
-        // get the registry to get the action and provider repository
-        $actionRepository   = $this->_registry->getActionRepository();
-        $providerRepository = $this->_registry->getProviderRepository();
-
-        // loop through all actions and create a metadata for each
-        foreach ($actionRepository->getActions() as $action) {
-            // each action metadata will be called
-            $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                'name'            => 'actionName',
-                'value'           => $ccToDashedFilter->filter($action->getName()),
-                'reference'       => $action,
-                'actionName'      => $action->getName(),
-                'clientName'      => 'console',
-                'clientReference' => $this->_registry->getClient()
-                ));
-        }
-
-        foreach ($providerRepository->getProviderSignatures() as $providerSignature) {
-
-            // create the metadata for the provider's cliProviderName
-            $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                'name'            => 'providerName',
-                'value'           => $ccToDashedFilter->filter($providerSignature->getName()),
-                'reference'       => $providerSignature,
-                'clientName'      => 'console',
-                'providerName'    => $providerSignature->getName(),
-                'clientReference' => $this->_registry->getClient()
-                ));
-
-            // create the metadatas for the per provider specialites in providerSpecaltyNames
-            foreach ($providerSignature->getSpecialties() as $specialty) {
-
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'specialtyName',
-                    'value'           =>  $ccToDashedFilter->filter($specialty),
-                    'reference'       => $providerSignature,
-                    'clientName'      => 'console',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $specialty,
-                    'clientReference' => $this->_registry->getClient()
-                    ));
-
-            }
-
-            // $actionableMethod is keyed by the methodName (but not used)
-            foreach ($providerSignature->getActionableMethods() as $actionableMethodData) {
-
-                $methodLongParams  = array();
-                $methodShortParams = array();
-
-                // $actionableMethodData get both the long and short names
-                foreach ($actionableMethodData['parameterInfo'] as $parameterInfoData) {
-
-                    // filter to dashed
-                    $methodLongParams[$parameterInfoData['name']] = $ccToDashedFilter->filter($parameterInfoData['name']);
-
-                    // simply lower the character, (its only 1 char after all)
-                    $methodShortParams[$parameterInfoData['name']] = strtolower($parameterInfoData['name'][0]);
-
-                }
-
-                // create metadata for the long name cliActionableMethodLongParameters
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'actionableMethodLongParams',
-                    'value'           => $methodLongParams,
-                    'clientName'      => 'console',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $actionableMethodData['specialty'],
-                    'actionName'      => $actionableMethodData['actionName'],
-                    'reference'       => &$actionableMethodData,
-                    'clientReference' => $this->_registry->getClient()
-                    ));
-
-                // create metadata for the short name cliActionableMethodShortParameters
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'actionableMethodShortParams',
-                    'value'           => $methodShortParams,
-                    'clientName'      => 'console',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $actionableMethodData['specialty'],
-                    'actionName'      => $actionableMethodData['actionName'],
-                    'reference'       => &$actionableMethodData,
-                    'clientReference' => $this->_registry->getClient()
-                    ));
-
-            }
-
-        }
-
-        return $metadatas;
-    }
-
-    public function getIndex()
-    {
-        return 10000;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
deleted file mode 100644
index 54c646bd9..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php";
-
-/**
- * Try to align a given text central on the screen.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AlignCenter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Tool_Framework_Client_Console_ResponseDecorator_AlignCenter
-    implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-    public function getName()
-    {
-        return "aligncenter";
-    }
-
-    /**
-     * @param string $content
-     * @param integer $lineLength
-     */
-    public function decorate($content, $lineLength)
-    {
-        if(!is_numeric($lineLength)) {
-            $lineLength = 72;
-        }
-        if(strlen($content) < $lineLength) {
-            $append = false;
-            $len = strlen($content);
-            for($i = $len; $i < $lineLength; $i++) {
-                if($append == true) {
-                    $content = $content." ";
-                    $append = false;
-                } else {
-                    $content = " ".$content;
-                    $append = true;
-                }
-            }
-        }
-        return $content;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php
deleted file mode 100644
index a6c701b30..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php";
-
-/**
- * Take a text and block it into several lines of a fixed length.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Blockize.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Tool_Framework_Client_Console_ResponseDecorator_Blockize
-    implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-    public function getName()
-    {
-        return 'blockize';
-    }
-
-    /**
-     *
-     * @param  string $content
-     * @param  int $lineLength
-     * @return string
-     */
-    public function decorate($content, $lineLength)
-    {
-        if(intval(strval($lineLength)) != $lineLength) {
-            $lineLength = 72;
-        }
-
-        // break apart the message into wrapped chunks
-        $lines = explode(PHP_EOL, wordwrap($content, $lineLength, PHP_EOL, false));
-        $content = array();
-        foreach($lines AS $line) {
-            if(strlen(trim($line)) == 0) {
-                continue;
-            }
-
-            if(strlen($line) < $lineLength) {
-                $line .= str_repeat(" ", $lineLength-strlen($line));
-            }
-            $content[] = $line;
-        }
-        return implode(PHP_EOL, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php
deleted file mode 100644
index 07e046ca0..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Colorizer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer
-    implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-
-    protected $_colorOptions = array(
-        // blacks
-        'black'     => '30m',
-        'hiBlack'   => '1;30m',
-        'bgBlack'   => '40m',
-        // reds
-        'red'       => '31m',
-        'hiRed'     => '1;31m',
-        'bgRed'     => '41m',
-        // greens
-        'green'     => '32m',
-        'hiGreen'   => '1;32m',
-        'bgGreen'   => '42m',
-        // yellows
-        'yellow'    => '33m',
-        'hiYellow'  => '1;33m',
-        'bgYellow'  => '43m',
-        // blues
-        'blue'      => '34m',
-        'hiBlue'    => '1;34m',
-        'bgBlue'    => '44m',
-        // magentas
-        'magenta'   => '35m',
-        'hiMagenta' => '1;35m',
-        'bgMagenta' => '45m',
-        // cyans
-        'cyan'      => '36m',
-        'hiCyan'    => '1;36m',
-        'bgCyan'    => '46m',
-        // whites
-        'white'     => '37m',
-        'hiWhite'   => '1;37m',
-        'bgWhite'   => '47m'
-        );
-
-    public function getName()
-    {
-        return 'color';
-    }
-
-    public function decorate($content, $color)
-    {
-        if (is_string($color)) {
-            $color = array($color);
-        }
-
-        $newContent = '';
-
-        foreach ($color as $c) {
-            if (array_key_exists($c, $this->_colorOptions)) {
-                $newContent .= "\033[" . $this->_colorOptions[$c];
-            }
-        }
-
-        $newContent .= $content . "\033[m";
-
-        return $newContent;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php
deleted file mode 100644
index 544d05326..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Indention.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php";
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Console_ResponseDecorator_Indention
-    implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-    public function getName()
-    {
-        return 'indention';
-    }
-
-    /**
-     * @param string $content
-     * @param integer $indention
-     */
-    public function decorate($content, $indention)
-    {
-        if(strval(intval($indention)) != $indention) {
-            return $content;
-        }
-
-        $newContent = "";
-        $lines = preg_split('((\r\n|\r|\n)+)', $content);
-        $lineIndention = str_repeat(' ', $indention);
-        foreach($lines AS $line) {
-            $newContent .= $lineIndention.$line.PHP_EOL;
-        }
-        return rtrim($newContent);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Exception.php
deleted file mode 100644
index c04efd4c4..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Exception
- */
-require_once 'Zend/Tool/Framework/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Exception extends Zend_Tool_Framework_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php
deleted file mode 100644
index 33afaf4f8..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputHandler.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Interactive_InputHandler
-{
-
-    /**
-     * @var Zend_Tool_Framework_Client_Interactive_InputInterface
-     */
-    protected $_client = null;
-
-    protected $_inputRequest = null;
-
-    public function setClient(Zend_Tool_Framework_Client_Interactive_InputInterface $client)
-    {
-        $this->_client = $client;
-        return $this;
-    }
-
-    public function setInputRequest($inputRequest)
-    {
-        if (is_string($inputRequest)) {
-            require_once 'Zend/Tool/Framework/Client/Interactive/InputRequest.php';
-            $inputRequest = new Zend_Tool_Framework_Client_Interactive_InputRequest($inputRequest);
-        } elseif (!$inputRequest instanceof Zend_Tool_Framework_Client_Interactive_InputRequest) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('promptInteractive() requires either a string or an instance of Zend_Tool_Framework_Client_Interactive_InputRequest.');
-        }
-
-        $this->_inputRequest = $inputRequest;
-        return $this;
-    }
-
-    public function handle()
-    {
-        $inputResponse = $this->_client->handleInteractiveInputRequest($this->_inputRequest);
-
-        if (is_string($inputResponse)) {
-            require_once 'Zend/Tool/Framework/Client/Interactive/InputResponse.php';
-            $inputResponse = new Zend_Tool_Framework_Client_Interactive_InputResponse($inputResponse);
-        } elseif (!$inputResponse instanceof Zend_Tool_Framework_Client_Interactive_InputResponse) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('The registered $_interactiveCallback for the client must either return a string or an instance of Zend_Tool_Framework_Client_Interactive_InputResponse.');
-        }
-
-        return $inputResponse;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php
deleted file mode 100644
index 555493c12..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Client_Interactive_InputInterface
-{
-
-    /**
-     * Handle Interactive Input Request
-     *
-     * @param Zend_Tool_Framework_Client_Interactive_InputRequest $inputRequest
-     * @return Zend_Tool_Framework_Client_Interactive_InputResponse|string
-     */
-    public function handleInteractiveInputRequest(Zend_Tool_Framework_Client_Interactive_InputRequest $inputRequest);
-
-    public function getMissingParameterPromptString(Zend_Tool_Framework_Provider_Interface $provider, Zend_Tool_Framework_Action_Interface $actionInterface, $missingParameterName);
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php
deleted file mode 100644
index ded06736f..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputRequest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Interactive_InputRequest
-{
-    protected $_content = null;
-
-    public function __construct($content = null)
-    {
-        if ($content) {
-            $this->setContent($content);
-        }
-    }
-
-    public function setContent($content)
-    {
-        $this->_content = $content;
-        return $this;
-    }
-
-    public function getContent()
-    {
-        return $this->_content;
-    }
-
-    public function __toString()
-    {
-        return $this->_content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php
deleted file mode 100644
index 62a4740f8..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InputResponse.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Interactive_InputResponse
-{
-
-    protected $_content = null;
-
-    public function __construct($content = null)
-    {
-        if ($content) {
-            $this->setContent($content);
-        }
-    }
-
-    public function setContent($content)
-    {
-        $this->_content = $content;
-        return $this;
-    }
-
-    public function getContent()
-    {
-        return $this->_content;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php
deleted file mode 100644
index 644b78a2f..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: OutputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Client_Interactive_OutputInterface
-{
-
-    public function handleInteractiveOutput($string);
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Manifest.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Manifest.php
deleted file mode 100644
index 7cacf0ac1..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Manifest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manifest.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Framework_Manifest_MetadataManifestable
- */
-require_once 'Zend/Tool/Framework/Manifest/MetadataManifestable.php';
-
-/**
- * @see Zend_Filter
- */
-require_once 'Zend/Filter.php';
-
-/**
- * @see Zend_Filter_Word_CamelCaseToDash
- */
-require_once 'Zend/Filter/Word/CamelCaseToDash.php';
-
-/**
- * @see Zend_Filter_StringToLower
- */
-require_once 'Zend/Filter/StringToLower.php';
-
-/**
- * @see Zend_Tool_Framework_Metadata_Tool
- */
-require_once 'Zend/Tool/Framework/Metadata/Tool.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * Zend_Tool_Framework_Client_ConsoleClient_Manifest
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Manifest
-    implements Zend_Tool_Framework_Registry_EnabledInterface,
-               Zend_Tool_Framework_Manifest_MetadataManifestable
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * setRegistry() - Required for the Zend_Tool_Framework_Registry_EnabledInterface interface
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Client_Console_Manifest
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * getMetadata() is required by the Manifest Interface.
-     *
-     * These are the following metadatas that will be setup:
-     *
-     * normalizedActionName
-     *   - metadata for actions
-     *   - value will be a dashed name for the action named in 'actionName'
-     * normalizedProviderName
-     *   - metadata for providers
-     *   - value will be a dashed-name for the provider named in 'providerName'
-     * normalizedProviderSpecialtyNames
-     *   - metadata for providers
-     * normalizedActionableMethodLongParameters
-     *   - metadata for providers
-     * normalizedActionableMethodShortParameters
-     *   - metadata for providers
-     *
-     * @return array Array of Metadatas
-     */
-    public function getMetadata()
-    {
-        $metadatas = array();
-
-        // setup the camelCase to dashed filter to use since cli expects dashed named
-        $lowerFilter = new Zend_Filter();
-        $lowerFilter->addFilter(new Zend_Filter_StringToLower());
-
-        // get the registry to get the action and provider repository
-        $actionRepository   = $this->_registry->getActionRepository();
-        $providerRepository = $this->_registry->getProviderRepository();
-
-        // loop through all actions and create a metadata for each
-        foreach ($actionRepository->getActions() as $action) {
-            // each action metadata will be called
-            $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                'name'            => 'normalizedActionName',
-                'value'           => $lowerFilter->filter($action->getName()),
-                'reference'       => $action,
-                'actionName'      => $action->getName(),
-                'clientName'      => 'all'
-                ));
-        }
-
-        foreach ($providerRepository->getProviderSignatures() as $providerSignature) {
-
-            // create the metadata for the provider's cliProviderName
-            $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                'name'            => 'normalizedProviderName',
-                'value'           => $lowerFilter->filter($providerSignature->getName()),
-                'reference'       => $providerSignature,
-                'clientName'      => 'all',
-                'providerName'    => $providerSignature->getName()
-                ));
-
-            // create the metadatas for the per provider specialites in providerSpecaltyNames
-            foreach ($providerSignature->getSpecialties() as $specialty) {
-
-                if ($specialty == '_Global') {
-                    continue;
-                }
-                
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'normalizedSpecialtyName',
-                    'value'           => $lowerFilter->filter($specialty),
-                    'reference'       => $providerSignature,
-                    'clientName'      => 'all',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $specialty
-                    ));
-
-            }
-
-            // $actionableMethod is keyed by the methodName (but not used)
-            foreach ($providerSignature->getActionableMethods() as $actionableMethodData) {
-
-                $methodLongParams  = array();
-                $methodShortParams = array();
-
-                // $actionableMethodData get both the long and short names
-                foreach ($actionableMethodData['parameterInfo'] as $parameterInfoData) {
-
-                    // filter to dashed
-                    $methodLongParams[$parameterInfoData['name']] = $lowerFilter->filter($parameterInfoData['name']);
-
-                    // simply lower the character, (its only 1 char after all)
-                    $methodShortParams[$parameterInfoData['name']] = strtolower($parameterInfoData['name'][0]);
-
-                }
-
-                // create metadata for the long name cliActionableMethodLongParameters
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'normalizedActionableMethodLongParams',
-                    'value'           => $methodLongParams,
-                    'clientName'      => 'console',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $actionableMethodData['specialty'],
-                    'actionName'      => $actionableMethodData['actionName'],
-                    'reference'       => &$actionableMethodData
-                    ));
-
-                // create metadata for the short name cliActionableMethodShortParameters
-                $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array(
-                    'name'            => 'normalizedActionableMethodShortParams',
-                    'value'           => $methodShortParams,
-                    'clientName'      => 'console',
-                    'providerName'    => $providerSignature->getName(),
-                    'specialtyName'   => $actionableMethodData['specialty'],
-                    'actionName'      => $actionableMethodData['actionName'],
-                    'reference'       => &$actionableMethodData
-                    ));
-
-            }
-
-        }
-
-        return $metadatas;
-    }
-
-    public function getIndex()
-    {
-        return 100000;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Request.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Request.php
deleted file mode 100644
index 7fda55bd5..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Request.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Request
-{
-
-    /**
-     * @var string
-     */
-    protected $_providerName = null;
-
-    /**
-     * @var string
-     */
-    protected $_specialtyName = null;
-
-    /**
-     * @var string
-     */
-    protected $_actionName = null;
-
-    /**
-     * @var array
-     */
-    protected $_actionParameters = array();
-
-    /**
-     * @var array
-     */
-    protected $_providerParameters = array();
-
-    /**
-     * @var bool
-     */
-    protected $_isPretend = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isDebug = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isVerbose = false;
-
-    /**
-     * @var bool
-     */
-    protected $_isDispatchable = true;
-
-    /**
-     * setProviderName()
-     *
-     * @param string $providerName
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setProviderName($providerName)
-    {
-        $this->_providerName = $providerName;
-        return $this;
-    }
-
-    /**
-     * getProviderName()
-     *
-     * @return string
-     */
-    public function getProviderName()
-    {
-        return $this->_providerName;
-    }
-
-    /**
-     * setSpecialtyName()
-     *
-     * @param string $specialtyName
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setSpecialtyName($specialtyName)
-    {
-        $this->_specialtyName = $specialtyName;
-        return $this;
-    }
-
-    /**
-     * getSpecialtyName()
-     *
-     * @return string
-     */
-    public function getSpecialtyName()
-    {
-        return $this->_specialtyName;
-    }
-
-    /**
-     * setActionName()
-     *
-     * @param string $actionName
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setActionName($actionName)
-    {
-        $this->_actionName = $actionName;
-        return $this;
-    }
-
-    /**
-     * getActionName()
-     *
-     * @return string
-     */
-    public function getActionName()
-    {
-        return $this->_actionName;
-    }
-
-    /**
-     * setActionParameter()
-     *
-     * @param string $parameterName
-     * @param string $parameterValue
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setActionParameter($parameterName, $parameterValue)
-    {
-        $this->_actionParameters[$parameterName] = $parameterValue;
-        return $this;
-    }
-
-    /**
-     * getActionParameters()
-     *
-     * @return array
-     */
-    public function getActionParameters()
-    {
-        return $this->_actionParameters;
-    }
-
-    /**
-     * getActionParameter()
-     *
-     * @param string $parameterName
-     * @return string
-     */
-    public function getActionParameter($parameterName)
-    {
-        return (isset($this->_actionParameters[$parameterName])) ? $this->_actionParameters[$parameterName] : null;
-    }
-
-    /**
-     * setProviderParameter()
-     *
-     * @param string $parameterName
-     * @param string $parameterValue
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setProviderParameter($parameterName, $parameterValue)
-    {
-        $this->_providerParameters[$parameterName] = $parameterValue;
-        return $this;
-    }
-
-    /**
-     * getProviderParameters()
-     *
-     * @return array
-     */
-    public function getProviderParameters()
-    {
-        return $this->_providerParameters;
-    }
-
-    /**
-     * getProviderParameter()
-     *
-     * @param string $parameterName
-     * @return string
-     */
-    public function getProviderParameter($parameterName)
-    {
-        return (isset($this->_providerParameters[$parameterName])) ? $this->_providerParameters[$parameterName] : null;
-    }
-
-    /**
-     * setPretend()
-     *
-     * @param bool $pretend
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setPretend($pretend)
-    {
-        $this->_isPretend = (bool) $pretend;
-        return $this;
-    }
-
-    /**
-     * isPretend() - Whether or not this is a pretend request
-     *
-     * @return bool
-     */
-    public function isPretend()
-    {
-        return $this->_isPretend;
-    }
-
-    /**
-     * setDebug()
-     *
-     * @param bool $pretend
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setDebug($debug)
-    {
-        $this->_isDebug = (bool) $debug;
-        return $this;
-    }
-
-    /**
-     * isDebug() - Whether or not this is a debug enabled request
-     *
-     * @return bool
-     */
-    public function isDebug()
-    {
-        return $this->_isDebug;
-    }
-
-    /**
-     * setVerbose()
-     *
-     * @param bool $verbose
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setVerbose($verbose)
-    {
-        $this->_isVerbose = (bool) $verbose;
-        return $this;
-    }
-
-    /**
-     * isVerbose() - Whether or not this is a verbose enabled request
-     *
-     * @return bool
-     */
-    public function isVerbose()
-    {
-        return $this->_isVerbose;
-    }
-
-    /**
-     * setDispatchable()
-     *
-     * @param bool $dispatchable
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function setDispatchable($dispatchable)
-    {
-        $this->_isDispatchable = (bool) $dispatchable;
-        return $this;
-    }
-
-    /**
-     * isDispatchable() Is this request Dispatchable?
-     *
-     * @return bool
-     */
-    public function isDispatchable()
-    {
-        return $this->_isDispatchable;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Response.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Response.php
deleted file mode 100644
index ec7094499..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Response.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Response
-{
-    /**
-     * @var callback|null
-     */
-    protected $_callback = null;
-
-    /**
-     * @var array
-     */
-    protected $_content = array();
-
-    /**
-     * @var Zend_Tool_Framework_Exception
-     */
-    protected $_exception = null;
-
-    /**
-     * @var array
-     */
-    protected $_decorators = array();
-
-    /**
-     * @var array
-     */
-    protected $_defaultDecoratorOptions = array();
-
-    /**
-     * setContentCallback()
-     *
-     * @param callback $callback
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function setContentCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('The callback provided is not callable');
-        }
-        $this->_callback = $callback;
-        return $this;
-    }
-
-    /**
-     * setContent()
-     *
-     * @param string $content
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function setContent($content, Array $decoratorOptions = array())
-    {
-        $this->_applyDecorators($content, $decoratorOptions);
-
-        $this->_content = array();
-        $this->appendContent($content);
-        return $this;
-    }
-
-    /**
-     * appendCallback
-     *
-     * @param string $content
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function appendContent($content, Array $decoratorOptions = array())
-    {
-        $content = $this->_applyDecorators($content, $decoratorOptions);
-
-        if ($this->_callback !== null) {
-            call_user_func($this->_callback, $content);
-        }
-
-        $this->_content[] = $content;
-
-        return $this;
-    }
-
-    /**
-     * setDefaultDecoratorOptions()
-     *
-     * @param array $decoratorOptions
-     * @param bool $mergeIntoExisting
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function setDefaultDecoratorOptions(Array $decoratorOptions, $mergeIntoExisting = false)
-    {
-        if ($mergeIntoExisting == false) {
-            $this->_defaultDecoratorOptions = array();
-        }
-
-        $this->_defaultDecoratorOptions = array_merge($this->_defaultDecoratorOptions, $decoratorOptions);
-        return $this;
-    }
-
-    /**
-     * getContent()
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return implode('', $this->_content);
-    }
-
-    /**
-     * isException()
-     *
-     * @return bool
-     */
-    public function isException()
-    {
-        return isset($this->_exception);
-    }
-
-    /**
-     * setException()
-     *
-     * @param Exception $exception
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function setException(Exception $exception)
-    {
-        $this->_exception = $exception;
-        return $this;
-    }
-
-    /**
-     * getException()
-     *
-     * @return Exception
-     */
-    public function getException()
-    {
-        return $this->_exception;
-    }
-
-    /**
-     * Add Content Decorator
-     *
-     * @param Zend_Tool_Framework_Client_Response_ContentDecorator_Interface $contentDecorator
-     * @return unknown
-     */
-    public function addContentDecorator(Zend_Tool_Framework_Client_Response_ContentDecorator_Interface $contentDecorator)
-    {
-        $decoratorName = strtolower($contentDecorator->getName());
-        $this->_decorators[$decoratorName] = $contentDecorator;
-        return $this;
-    }
-
-    /**
-     * getContentDecorators()
-     *
-     * @return array
-     */
-    public function getContentDecorators()
-    {
-        return $this->_decorators;
-    }
-
-    /**
-     * __toString() to cast to a string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) implode('', $this->_content);
-    }
-
-    /**
-     * _applyDecorators() apply a group of decorators
-     *
-     * @param string $content
-     * @param array $decoratorOptions
-     * @return string
-     */
-    protected function _applyDecorators($content, Array $decoratorOptions)
-    {
-        $options = array_merge($this->_defaultDecoratorOptions, $decoratorOptions);
-
-        $options = array_change_key_case($options, CASE_LOWER);
-
-        if ($options) {
-            foreach ($this->_decorators as $decoratorName => $decorator) {
-                if (array_key_exists($decoratorName, $options)) {
-                    $content = $decorator->decorate($content, $options[$decoratorName]);
-                }
-            }
-        }
-
-        return $content;
-
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php
deleted file mode 100644
index 3c604e5dc..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-
-    public function getName();
-
-    public function decorate($content, $decoratorValue);
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php
deleted file mode 100644
index d64f2cfd1..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Separator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
- */
-require_once 'Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Response_ContentDecorator_Separator
-    implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface
-{
-
-    /**
-     * @var string
-     */
-    protected $_separator = PHP_EOL;
-
-    /**
-     * getName() - name of the decorator
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'separator';
-    }
-
-    /**
-     * setSeparator()
-     *
-     * @param string $separator
-     * @return Zend_Tool_Framework_Client_Response_ContentDecorator_Separator
-     */
-    public function setSeparator($separator)
-    {
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * getSeparator()
-     *
-     * @return string
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    public function decorate($content, $decoratorValue)
-    {
-        $run = 1;
-        if (is_bool($decoratorValue) && $decoratorValue === false) {
-            return $content;
-        }
-
-        if (is_int($decoratorValue)) {
-            $run = $decoratorValue;
-        }
-
-        for ($i = 0; $i < $run; $i++) {
-            $content .= $this->_separator;
-        }
-
-        return $content;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Storage.php
deleted file mode 100644
index 6b0c8182c..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Client_Storage_AdapterInterface
- */
-require_once 'Zend/Tool/Framework/Client/Storage/AdapterInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Storage
-{
-
-    /**
-     * @var Zend_Tool_Framework_Client_Storage_AdapterInterface
-     */
-    protected $_adapter = null;
-
-    public function __construct($options = array())
-    {
-        if (isset($options['adapter'])) {
-            $this->setAdapter($options['adapter']);
-        }
-    }
-
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            $storageAdapterClass = 'Zend_Tool_Framework_Client_Storage_' . ucfirst($adapter);
-            Zend_Loader::loadClass($storageAdapterClass);
-            $adapter = new $storageAdapterClass();
-        }
-        $this->_adapter = $adapter;
-    }
-
-    public function isEnabled()
-    {
-        return ($this->_adapter instanceof Zend_Tool_Framework_Client_Storage_AdapterInterface);
-    }
-
-    public function put($name, $value)
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-
-        $this->_adapter->put($name, $value);
-
-        return $this;
-    }
-
-    public function get($name, $defaultValue = false)
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-
-        if ($this->_adapter->has($name)) {
-            return $this->_adapter->get($name);
-        } else {
-            return $defaultValue;
-        }
-
-    }
-
-    public function has($name)
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-
-        return $this->_adapter->has($name);
-    }
-
-    public function remove($name)
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-
-        $this->_adapter->remove($name);
-
-        return $this;
-    }
-
-    public function getStreamUri($name)
-    {
-        if (!$this->_adapter) {
-            return false;
-        }
-
-        return $this->_adapter->getStreamUri($name);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php
deleted file mode 100644
index bc2b9c170..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Client_Storage_AdapterInterface
-{
-
-    public function put($name, $value);
-
-    public function get($name);
-
-    public function has($name);
-
-    public function remove($name);
-
-    public function getStreamUri($name);
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/Directory.php b/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/Directory.php
deleted file mode 100644
index 88822658d..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Client/Storage/Directory.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Client_Storage_AdapterInterface
- */
-require_once 'Zend/Tool/Framework/Client/Storage/AdapterInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Client_Storage_Directory
-    implements Zend_Tool_Framework_Client_Storage_AdapterInterface
-{
-
-    protected $_directoryPath = null;
-
-    public function __construct($directoryPath)
-    {
-        if (!file_exists($directoryPath)) {
-            throw new Zend_Tool_Framework_Client_Exception(__CLASS__ . ': the supplied directory does not exist');
-        }
-        $this->_directoryPath = $directoryPath;
-    }
-
-    public function put($name, $value)
-    {
-        return file_put_contents($this->_directoryPath . DIRECTORY_SEPARATOR . $name, $value);
-    }
-
-    public function get($name)
-    {
-        return file_get_contents($this->_directoryPath . DIRECTORY_SEPARATOR . $name);
-    }
-
-    public function has($name)
-    {
-        return file_exists($this->_directoryPath . DIRECTORY_SEPARATOR . $name);
-    }
-
-    public function remove($name)
-    {
-        return unlink($this->_directoryPath . DIRECTORY_SEPARATOR . $name);
-    }
-
-    public function getStreamUri($name)
-    {
-        return $this->_directoryPath . DIRECTORY_SEPARATOR . $name;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Exception.php
deleted file mode 100644
index 53f39992b..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Exception.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Exception extends Zend_Exception
-{
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Loader/Abstract.php b/airtime_mvc/library/Zend/Tool/Framework/Loader/Abstract.php
deleted file mode 100644
index d1647a258..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Loader/Abstract.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-require_once 'Zend/Tool/Framework/Loader/Interface.php';
-require_once 'Zend/Tool/Framework/Manifest/Interface.php';
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Framework_Loader_Abstract 
-    implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface
-{
-    /**
-     * @var Zend_Tool_Framework_Repository_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var array
-     */
-    private $_retrievedFiles = array();
-
-    /**
-     * @var array
-     */
-    private $_loadedClasses  = array();
-
-    /**
-     * _getFiles
-     *
-     * @return array Array Of Files
-     */
-    abstract protected function _getFiles();
-
-    /**
-     * setRegistry() - required by the enabled interface to get an instance of
-     * the registry
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Loader_Abstract
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * load() - called by the client initialize routine to load files
-     *
-     */
-    public function load()
-    {
-        $this->_retrievedFiles = $this->getRetrievedFiles();
-        $this->_loadedClasses  = array();
-
-        $manifestRepository = $this->_registry->getManifestRepository();
-        $providerRepository = $this->_registry->getProviderRepository();
-
-        $loadedClasses = array();
-
-        // loop through files and find the classes declared by loading the file
-        foreach ($this->_retrievedFiles as $file) {
-            if(is_dir($file)) {
-                continue;
-            }
-
-            $classesLoadedBefore = get_declared_classes();
-            $oldLevel = error_reporting(E_ALL | ~E_STRICT); // remove strict so that other packages wont throw warnings
-            // should we lint the files here? i think so
-            include_once $file;
-            error_reporting($oldLevel); // restore old error level
-            $classesLoadedAfter = get_declared_classes();
-            $loadedClasses = array_merge($loadedClasses, array_diff($classesLoadedAfter, $classesLoadedBefore));
-        }
-
-        // loop through the loaded classes and ensure that
-        foreach ($loadedClasses as $loadedClass) {
-
-            // reflect class to see if its something we want to load
-            $reflectionClass = new ReflectionClass($loadedClass);
-            if ($reflectionClass->implementsInterface('Zend_Tool_Framework_Manifest_Interface')
-                && !$reflectionClass->isAbstract())
-            {
-                $manifestRepository->addManifest($reflectionClass->newInstance());
-                $this->_loadedClasses[] = $loadedClass;
-            }
-
-            if ($reflectionClass->implementsInterface('Zend_Tool_Framework_Provider_Interface')
-                && !$reflectionClass->isAbstract()
-                && !$providerRepository->hasProvider($reflectionClass->getName(), false))
-            {
-                $providerRepository->addProvider($reflectionClass->newInstance());
-                $this->_loadedClasses[] = $loadedClass;
-            }
-
-        }
-
-        return $this->_loadedClasses;
-    }
-
-    /**
-     * getRetrievedFiles()
-     *
-     * @return array Array of Files Retrieved
-     */
-    public function getRetrievedFiles()
-    {
-        if ($this->_retrievedFiles == null) {
-            $this->_retrievedFiles = $this->_getFiles();
-        }
-
-        return $this->_retrievedFiles;
-    }
-
-    /**
-     * getLoadedClasses()
-     *
-     * @return array Array of Loaded Classes
-     */
-    public function getLoadedClasses()
-    {
-        return $this->_loadedClasses;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Loader/BasicLoader.php b/airtime_mvc/library/Zend/Tool/Framework/Loader/BasicLoader.php
deleted file mode 100644
index 60f8aa376..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Loader/BasicLoader.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IncludePathLoader.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Framework_Loader_Abstract
- */
-require_once 'Zend/Tool/Framework/Loader/Interface.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-require_once 'Zend/Tool/Framework/Manifest/Interface.php';
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Loader_BasicLoader 
-    implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface
-{
-    /**
-     * @var Zend_Tool_Framework_Repository_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var array
-     */
-    protected $_classesToLoad = array();
-    
-    public function __construct($options = array())
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-    
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $setMethod = 'set' . $optionName;
-            if (method_exists($this, $setMethod)) {
-                $this->{$setMethod}($optionValue);
-            }
-        }
-    }
-    
-    /**
-     * setRegistry() - required by the enabled interface to get an instance of
-     * the registry
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Loader_Abstract
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * @param  array $classesToLoad
-     * @return Zend_Tool_Framework_Loader_Abstract
-     */
-    public function setClassesToLoad(array $classesToLoad)
-    {
-        $this->_classesToLoad = $classesToLoad;
-        return $this;
-    }
-    
-    public function load()
-    {
-        $manifestRegistry = $this->_registry->getManifestRepository();
-        $providerRegistry = $this->_registry->getProviderRepository();
-        
-        $loadedClasses = array();
-        
-        // loop through the loaded classes and ensure that
-        foreach ($this->_classesToLoad as $class) {
-            
-            if (!class_exists($class)) {
-                Zend_Loader::loadClass($class);
-            }
-
-            // reflect class to see if its something we want to load
-            $reflectionClass = new ReflectionClass($class);
-            if ($this->_isManifestImplementation($reflectionClass)) {
-                $manifestRegistry->addManifest($reflectionClass->newInstance());
-                $loadedClasses[] = $class;
-            }
-
-            if ($this->_isProviderImplementation($reflectionClass)) {
-                $providerRegistry->addProvider($reflectionClass->newInstance());
-                $loadedClasses[] = $class;
-            }
-
-        }
-
-        return $loadedClasses;
-    }
-
-    /**
-     * @param  ReflectionClass $reflectionClass
-     * @return bool
-     */
-    private function _isManifestImplementation($reflectionClass)
-    {
-        return (
-            $reflectionClass->implementsInterface('Zend_Tool_Framework_Manifest_Interface')
-                && !$reflectionClass->isAbstract()
-        );
-    }
-
-    /**
-     * @param  ReflectionClass $reflectionClass
-     * @return bool
-     */
-    private function _isProviderImplementation($reflectionClass)
-    {
-        $providerRegistry = $this->_registry->getProviderRepository();
-
-        return (
-            $reflectionClass->implementsInterface('Zend_Tool_Framework_Provider_Interface')
-                && !$reflectionClass->isAbstract()
-                && !$providerRegistry->hasProvider($reflectionClass->getName(), false)
-        );
-    }
-    
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader.php b/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader.php
deleted file mode 100644
index 97c1a9ad2..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IncludePathLoader.php 20903 2010-02-04 16:16:47Z matthew $
- */
-
-/**
- * @see Zend_Tool_Framework_Loader_Abstract
- */
-require_once 'Zend/Tool/Framework/Loader/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator
- */
-require_once 'Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Loader_IncludePathLoader extends Zend_Tool_Framework_Loader_Abstract
-{
-
-    /**
-     * _getFiles()
-     *
-     * @return array Array of files to load
-     */
-    protected function _getFiles()
-    {
-        require_once 'Zend/Loader.php';
-        $paths = Zend_Loader::explodeIncludePath();
-
-        // used for checking similarly named files
-        $relativeItems   = array();
-        $files           = array();
-        $isZendTraversed = false;
-
-        foreach ($paths as $path) {
-
-            // default patterns to use
-            $filterDenyDirectoryPattern = '.*(/|\\\\).svn';
-            $filterAcceptFilePattern    = '.*(?:Manifest|Provider)\.php$';
-
-            if (!file_exists($path) || $path[0] == '.') {
-                continue;
-            }
-
-            $realIncludePath = realpath($path);
-
-            // ensure that we only traverse a single version of Zend Framework on all include paths
-            if (file_exists($realIncludePath . '/Zend/Tool/Framework/Loader/IncludePathLoader.php')) {
-                if ($isZendTraversed === false) {
-                    $isZendTraversed = true;
-                } else {
-                    // use the deny directory pattern that includes the path to 'Zend', it will not be accepted
-                    $filterDenyDirectoryPattern = '.*((/|\\\\).svn|' . preg_quote($realIncludePath . DIRECTORY_SEPARATOR) . 'Zend)';
-                }
-            }
-
-            // create recursive directory iterator
-            $rdi = new RecursiveDirectoryIterator($path);
-
-            // pass in the RecursiveDirectoryIterator & the patterns
-            $filter = new Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator(
-                $rdi,
-                $filterDenyDirectoryPattern,
-                $filterAcceptFilePattern
-                );
-
-            // build the rii with the filter
-            $iterator = new RecursiveIteratorIterator($filter);
-
-            // iterate over the accepted items
-            foreach ($iterator as $item) {
-                $file = (string)$item;
-                if($this->_fileIsBlacklisted($file)) {
-                    continue;
-                }
-
-                // ensure that the same named file from separate include_paths is not loaded
-                $relativeItem = preg_replace('#^' . preg_quote($realIncludePath . DIRECTORY_SEPARATOR, '#') . '#', '', $item->getRealPath());
-
-                // no links allowed here for now
-                if ($item->isLink()) {
-                    continue;
-                }
-
-                // no items that are relavitely the same are allowed
-                if (in_array($relativeItem, $relativeItems)) {
-                    continue;
-                }
-
-                $relativeItems[] = $relativeItem;
-                $files[] = $item->getRealPath();
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     *
-     * @param  string $file
-     * @return bool
-     */
-    protected function _fileIsBlacklisted($file)
-    {
-        $blacklist = array(
-            "PHPUnit".DIRECTORY_SEPARATOR."Framework",
-            "Zend".DIRECTORY_SEPARATOR."OpenId".DIRECTORY_SEPARATOR."Provider"
-        );
-
-        foreach($blacklist AS $blacklitedPattern) {
-            if(strpos($file, $blacklitedPattern) !== false) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php b/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php
deleted file mode 100644
index 4873a0557..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RecursiveFilterIterator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator extends RecursiveFilterIterator
-{
-
-    protected $_denyDirectoryPattern = null;
-    protected $_acceptFilePattern    = null;
-
-    /**
-     * constructor
-     *
-     * @param RecursiveIterator $iterator
-     * @param string $denyDirectoryPattern
-     * @param string $acceptFilePattern
-     */
-    public function __construct(RecursiveIterator $iterator, $denyDirectoryPattern = null, $acceptFilePattern = null)
-    {
-        $this->_denyDirectoryPattern = $denyDirectoryPattern;
-        $this->_acceptFilePattern    = $acceptFilePattern;
-        parent::__construct($iterator);
-    }
-
-    /**
-     * accept() - Which iterable items to accept or deny, required by FilterInterface
-     *
-     * @return unknown
-     */
-    public function accept()
-    {
-        $currentNode = $this->current();
-        $currentNodeRealPath = $currentNode->getRealPath();
-
-        // if the current node is a directory AND doesn't match the denyDirectory pattern, accept
-        if ($currentNode->isDir()
-            && !preg_match('#' . $this->_denyDirectoryPattern . '#', $currentNodeRealPath)) {
-            return true;
-        }
-
-        // if the file matches the accept file pattern, accept
-        $acceptable = (preg_match('#' . $this->_acceptFilePattern . '#', $currentNodeRealPath)) ? true : false;
-        return $acceptable;
-    }
-
-    /**
-     * getChildren() - overridden from RecursiveFilterIterator to allow the persistence of
-     * the $_denyDirectoryPattern and the $_acceptFilePattern when sub iterators of this filter
-     * are needed to be created.
-     *
-     * @return Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator
-     */
-    public function getChildren()
-    {
-        if (empty($this->ref)) {
-            $this->ref = new ReflectionClass($this);
-        }
-
-        return $this->ref->newInstance(
-            $this->getInnerIterator()->getChildren(),
-            $this->_denyDirectoryPattern,
-            $this->_acceptFilePattern
-            );
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Loader/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Loader/Interface.php
deleted file mode 100644
index 9c62d9631..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Loader/Interface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * Basic Interface for factilities that load Zend_Tool providers or manifests.
- *
- * @category   Zend
- * @package    Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Loader_Interface
-{
-    /**
-     * Load Providers and Manifests
-     *
-     * Returns an array of all loaded class names.
-     *
-     * @return array
-     */
-    public function load();
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/ActionManifestable.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/ActionManifestable.php
deleted file mode 100644
index a80b7d178..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/ActionManifestable.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActionManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Manifest_Interface
- */
-require_once 'Zend/Tool/Framework/Manifest/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Manifest_ActionManifestable extends Zend_Tool_Framework_Manifest_Interface
-{
-
-    /**
-     * getActions()
-     *
-     * Should either return a single action, or an array
-     * of actions
-     *
-     * @return array|Zend_Tool_Framework_Action_Interface
-     */
-    public function getActions();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/Exception.php
deleted file mode 100644
index 4e7863c7b..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Exception
- */
-require_once 'Zend/Tool/Framework/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Manifest_Exception extends Zend_Tool_Framework_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Indexable.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/Indexable.php
deleted file mode 100644
index 430b0901a..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Indexable.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Indexable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Manifest_Indexable extends Zend_Tool_Framework_Manifest_Interface
-{
-
-    /**
-     * getActions()
-     *
-     * Should either return a single action, or an array
-     * of actions
-     *
-     * @return array|Zend_Tool_Framework_Action_Interface
-     */
-    public function getIndex();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/Interface.php
deleted file mode 100644
index 7f0ce98d8..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Interface.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Manifest_Interface
-{
-
-    /**
-     * The following methods are completely optional, and any combination of them
-     * can be used as part of a manifest.  The manifest repository will process
-     * the return values of these actions as specfied in the following method docblocks.
-     *
-     * Since these actions are
-     *
-     */
-
-    /**
-     * getMetadata()
-     *
-     * Should either return a single metadata object or an array
-     * of metadata objects
-     *
-     * @return array|Zend_Tool_Framework_Manifest_Metadata
-     **
-
-    public function getMetadata();
-
-     **/
-
-
-
-    /**
-     * getActions()
-     *
-     * Should either return a single action, or an array
-     * of actions
-     *
-     * @return array|Zend_Tool_Framework_Action_Interface
-     **
-
-    public function getActions();
-
-     **/
-
-
-
-    /**
-     * getProviders()
-     *
-     * Should either return a single provider or an array
-     * of providers
-     *
-     **
-
-    public function getProviders();
-
-     **/
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php
deleted file mode 100644
index df2882eaf..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: MetadataManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Manifest_Interface.php
- */
-require_once 'Zend/Tool/Framework/Manifest/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Manifest_MetadataManifestable extends Zend_Tool_Framework_Manifest_Interface
-{
-
-    /**
-     * getMetadata()
-     *
-     * Should either return a single metadata object or an array
-     * of metadata objects
-     *
-     * @return array|Zend_Tool_Framework_Manifest_Metadata
-     */
-    public function getMetadata();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php
deleted file mode 100644
index 0294cd6b6..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProviderManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Manifest_Interface.php
- */
-require_once 'Zend/Tool/Framework/Manifest/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Manifest_ProviderManifestable extends Zend_Tool_Framework_Manifest_Interface
-{
-
-    /**
-     * getProviders()
-     *
-     * Should either return a single provider or an array
-     * of providers
-     *
-     * @return array|string|Zend_Tool_Framework_Provider_Interface
-     */
-    public function getProviders();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Repository.php b/airtime_mvc/library/Zend/Tool/Framework/Manifest/Repository.php
deleted file mode 100644
index 20f88063c..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Manifest/Repository.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Manifest_Repository
-    implements Zend_Tool_Framework_Registry_EnabledInterface, IteratorAggregate, Countable
-{
-
-    /**
-     * @var Zend_Tool_Framework_Provider_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * @var array
-     */
-    protected $_manifests = array();
-
-    /**
-     * @var array Array of Zend_Tool_Framework_Metadata_Interface
-     */
-    protected $_metadatas = array();
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return unknown
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * addManifest() - Add a manifest for later processing
-     *
-     * @param Zend_Tool_Framework_Manifest_Interface $manifest
-     * @return Zend_Tool_Framework_Manifest_Repository
-     */
-    public function addManifest(Zend_Tool_Framework_Manifest_Interface $manifest)
-    {
-        // we need to get an index number so that manifests with
-        // higher indexes have priority over others
-        $index = count($this->_manifests);
-
-        if ($manifest instanceof Zend_Tool_Framework_Registry_EnabledInterface) {
-            $manifest->setRegistry($this->_registry);
-        }
-
-        // if the manifest supplies a getIndex() method, use it
-        if ($manifest instanceof Zend_Tool_Framework_Manifest_Indexable) {
-            $index = $manifest->getIndex();
-        }
-
-        // get the required objects from the framework registry
-        $actionRepository   = $this->_registry->getActionRepository();
-        $providerRepository = $this->_registry->getProviderRepository();
-
-        // load providers if interface supports that method
-        if ($manifest instanceof Zend_Tool_Framework_Manifest_ProviderManifestable) {
-            $providers = $manifest->getProviders();
-            if (!is_array($providers)) {
-                $providers = array($providers);
-            }
-
-            foreach ($providers as $provider) {
-
-                // if provider is a string, try and load it as an object
-                if (is_string($provider)) {
-                    $provider = new $provider();
-                }
-                
-                if (!$provider instanceof Zend_Tool_Framework_Provider_Interface) {
-                    require_once 'Zend/Tool/Framework/Manifest/Exception.php';
-                    throw new Zend_Tool_Framework_Manifest_Exception(
-                        'A provider provided by the ' . get_class($manifest)
-                        . ' does not implement Zend_Tool_Framework_Provider_Interface'
-                        );
-                }
-                if (!$providerRepository->hasProvider($provider, false)) {
-                    $providerRepository->addProvider($provider);
-                }
-            }
-
-        }
-
-        // load actions if interface supports that method
-        if ($manifest instanceof Zend_Tool_Framework_Manifest_ActionManifestable) {
-            $actions = $manifest->getActions();
-            if (!is_array($actions)) {
-                $actions = array($actions);
-            }
-
-            foreach ($actions as $action) {
-                if (is_string($action)) {
-                    $action = new Zend_Tool_Framework_Action_Base($action);
-                }
-                $actionRepository->addAction($action);
-            }
-        }
-
-        // should we detect collisions here? does it even matter?
-        $this->_manifests[$index] = $manifest;
-        ksort($this->_manifests);
-
-        return $this;
-    }
-
-    /**
-     * getManifests()
-     *
-     * @return Zend_Tool_Framework_Manifest_Interface[]
-     */
-    public function getManifests()
-    {
-        return $this->_manifests;
-    }
-
-    /**
-     * addMetadata() - add a metadata peice by peice
-     *
-     * @param Zend_Tool_Framework_Manifest_Metadata $metadata
-     * @return Zend_Tool_Framework_Manifest_Repository
-     */
-    public function addMetadata(Zend_Tool_Framework_Metadata_Interface $metadata)
-    {
-        $this->_metadatas[] = $metadata;
-        return $this;
-    }
-
-    /**
-     * process() - Process is expected to be called at the end of client construction time.
-     * By this time, the loader has run and loaded any found manifests into the repository
-     * for loading
-     *
-     * @return Zend_Tool_Framework_Manifest_Repository
-     */
-    public function process()
-    {
-
-        foreach ($this->_manifests as $manifest) {
-            if ($manifest instanceof Zend_Tool_Framework_Manifest_MetadataManifestable) {
-                $metadatas = $manifest->getMetadata();
-                if (!is_array($metadatas)) {
-                    $metadatas = array($metadatas);
-                }
-
-                foreach ($metadatas as $metadata) {
-                    if (is_array($metadata)) {
-                        if (!class_exists('Zend_Tool_Framework_Metadata_Dynamic')) {
-                            require_once 'Zend/Tool/Framework/Metadata/Dynamic.php';
-                        }
-                        $metadata = new Zend_Tool_Framework_Metadata_Dynamic($metadata);
-                    }
-                    
-                    if (!$metadata instanceof Zend_Tool_Framework_Metadata_Interface) {
-                        require_once 'Zend/Tool/Framework/Manifest/Exception.php';
-                        throw new Zend_Tool_Framework_Manifest_Exception(
-                            'A Zend_Tool_Framework_Metadata_Interface object was not found in manifest ' . get_class($manifest)
-                            );
-                    }
-
-                    $this->addMetadata($metadata);
-                }
-
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * getMetadatas() - This is the main search function for the repository.
-     *
-     * example: This will retrieve all metadata that matches the following criteria
-     *      $manifestRepo->getMetadatas(array(
-     *          'providerName' => 'Version',
-     *          'actionName' => 'show'
-     *          ));
-     *
-     * @param array $searchProperties
-     * @param bool $includeNonExistentProperties
-     * @return Zend_Tool_Framework_Manifest_Metadata[]
-     */
-    public function getMetadatas(Array $searchProperties = array(), $includeNonExistentProperties = true)
-    {
-
-        $returnMetadatas = array();
-
-        // loop through the metadatas so that we can search each individual one
-        foreach ($this->_metadatas as $metadata) {
-
-            // each value will be retrieved from the metadata, each metadata should
-            // implement a getter method to retrieve the value
-            foreach ($searchProperties as $searchPropertyName => $searchPropertyValue) {
-                if (method_exists($metadata, 'get' . $searchPropertyName)) {
-                    if ($metadata->{'get' . $searchPropertyName}() != $searchPropertyValue) {
-                        // if the metadata supports a specific property but the value does not
-                        // match, move on
-                        continue 2;
-                    }
-                } elseif (!$includeNonExistentProperties) {
-                    // if the option $includeNonExitentProperties is false, then move on as
-                    // we dont want to include this metadata if non existent
-                    // search properties are not inside the target (current) metadata
-                    continue 2;
-                }
-            }
-
-            // all searching has been accounted for, if we reach this point, then the metadata
-            // is good and we can return it
-            $returnMetadatas[] = $metadata;
-
-        }
-
-        return $returnMetadatas;
-    }
-
-    /**
-     * getMetadata() - This will proxy to getMetadatas(), but will only return a single metadata.  This method
-     * should be used in situations where the search criteria is known to only find a single metadata object
-     *
-     * @param array $searchProperties
-     * @param bool $includeNonExistentProperties
-     * @return Zend_Tool_Framework_Manifest_Metadata
-     */
-    public function getMetadata(Array $searchProperties = array(), $includeNonExistentProperties = true)
-    {
-        $metadatas = $this->getMetadatas($searchProperties, $includeNonExistentProperties);
-        return array_shift($metadatas);
-    }
-
-    /**
-     * __toString() - cast to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $metadatasByType = array();
-
-        foreach ($this->_metadatas as $metadata) {
-            if (!array_key_exists($metadata->getType(), $metadatasByType)) {
-                $metadatasByType[$metadata->getType()] = array();
-            }
-            $metadatasByType[$metadata->getType()][] = $metadata;
-        }
-
-        $string = '';
-        foreach ($metadatasByType as $type => $metadatas) {
-            $string .= $type . PHP_EOL;
-            foreach ($metadatas as $metadata) {
-                $metadataString = '    ' . $metadata->__toString() . PHP_EOL;
-                //$metadataString = str_replace(PHP_EOL, PHP_EOL . '    ', $metadataString);
-                $string .= $metadataString;
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * count() - required by the Countable Interface
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_metadatas);
-    }
-
-    /**
-     * getIterator() - required by the IteratorAggregate interface
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_metadatas);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Attributable.php b/airtime_mvc/library/Zend/Tool/Framework/Metadata/Attributable.php
deleted file mode 100644
index 7ce0011eb..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Attributable.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Metadata_Attributable
-{
-    public function getAttributes();
-}
-
-
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Basic.php b/airtime_mvc/library/Zend/Tool/Framework/Metadata/Basic.php
deleted file mode 100644
index 984a23971..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Basic.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Basic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Metadata_Interface
- */
-require_once 'Zend/Tool/Framework/Metadata/Interface.php';
-
-/**
- * @see Zend_Tool_Framework_Metadata_Attributable
- */
-require_once 'Zend/Tool/Framework/Metadata/Attributable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Metadata_Basic 
-    implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable
-{
-
-    /**#@+
-     * Search constants
-     */
-    const ATTRIBUTES_ALL        = 'attributesAll';
-    const ATTRIBUTES_NO_PARENT  = 'attributesParent';
-    /**#@-*/
-
-    /**#@+
-     * @var string
-     */
-    protected $_type        = 'Basic';
-    protected $_name        = null;
-    protected $_value       = null;
-    /**#@-*/
-
-    /**
-     * @var mixed
-     */
-    protected $_reference   = null;
-
-    /**
-     * Constructor - allows for the setting of options
-     *
-     * @param array $options
-     */
-    public function __construct(Array $options = array())
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * setOptions() - standard issue implementation, this will set any
-     * options that are supported via a set method.
-     *
-     * @param array $options
-     * @return Zend_Tool_Framework_Metadata_Basic
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            $setMethod = 'set' . $optionName;
-            if (method_exists($this, $setMethod)) {
-                $this->{$setMethod}($optionValue);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * getType()
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * setType()
-     *
-     * @param string $type
-     * @return Zend_Tool_Framework_Metadata_Basic
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * setName()
-     *
-     * @param string $name
-     * @return Zend_Tool_Framework_Metadata_Basic
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-
-    /**
-     * getValue()
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    /**
-     * setValue()
-     *
-     * @param unknown_type $Value
-     * @return Zend_Tool_Framework_Metadata_Basic
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-
-    /**
-     * setReference()
-     *
-     * @param mixed $reference
-     * @return Zend_Tool_Framework_Metadata_Basic
-     */
-    public function setReference($reference)
-    {
-        $this->_reference = $reference;
-        return $this;
-    }
-
-    /**
-     * getReference()
-     *
-     * @return mixed
-     */
-    public function getReference()
-    {
-        return $this->_reference;
-    }
-
-    /**
-     * getAttributes() - this will retrieve any attributes of this object that exist as properties
-     * This is most useful for printing metadata.
-     *
-     * @param const $type
-     * @return array
-     */
-    public function getAttributes($type = self::ATTRIBUTES_ALL, $stringRepresentationOfNonScalars = false)
-    {
-        $thisReflection = new ReflectionObject($this);
-
-        $metadataPairValues = array();
-
-        foreach (get_object_vars($this) as $varName => $varValue) {
-            if ($type == self::ATTRIBUTES_NO_PARENT && ($thisReflection->getProperty($varName)->getDeclaringClass()->getName() == 'Zend_Tool_Framework_Metadata_Basic')) {
-                continue;
-            }
-
-            if ($stringRepresentationOfNonScalars) {
-
-                if (is_object($varValue)) {
-                    $varValue = '(object)';
-                }
-
-                if (is_null($varValue)) {
-                    $varValue = '(null)';
-                }
-
-            }
-
-            $metadataPairValues[ltrim($varName, '_')] = $varValue;
-        }
-
-        return $metadataPairValues;
-    }
-
-    /**
-     * __toString() - string representation of this object
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return 'Type: ' . $this->_type . ', Name: ' . $this->_name . ', Value: ' . (is_array($this->_value) ? http_build_query($this->_value) : (string) $this->_value);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Dynamic.php b/airtime_mvc/library/Zend/Tool/Framework/Metadata/Dynamic.php
deleted file mode 100644
index f5a33f376..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Dynamic.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Metadata_Interface
- */
-require_once 'Zend/Tool/Framework/Metadata/Interface.php';
-
-/**
- * @see Zend_Tool_Framework_Metadata_Attributable
- */
-require_once 'Zend/Tool/Framework/Metadata/Attributable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Metadata_Dynamic 
-    implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable
-{
-
-    /**
-     * @var string
-     */
-    protected $_type = 'Dynamic';
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var string
-     */
-    protected $_value = null;
-
-    /**
-     * @var array
-     */
-    protected $_dynamicAttributes = array();
-
-    public function __construct($options = array())
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-    
-    public function setOptions(Array $options = array())
-    {
-        foreach ($options as $optName => $optValue) {
-            $methodName = 'set' . $optName;
-            $this->{$methodName}($optValue);
-        }
-    }
-    
-    /**
-     * setType()
-     * 
-     * @param $type
-     * @return Zend_Tool_Framework_Metadata_Dynamic
-     */
-    public function setType($type)
-    {
-        $this->_type = $type;
-        return $this;
-    }
-    
-    /**
-     * getType()
-     *
-     * The type of metadata this describes
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * setName()
-     * 
-     * @param $name
-     * @return Zend_Tool_Framework_Metadata_Dynamic
-     */
-    public function setName($name)
-    {
-        $this->_name = $name;
-        return $this;
-    }
-    
-    /**
-     * getName()
-     *
-     * Metadata name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * setValue()
-     * 
-     * @param $value
-     * @return Zend_Tool_Framework_Metadata_Dynamic
-     */
-    public function setValue($value)
-    {
-        $this->_value = $value;
-        return $this;
-    }
-    
-    /**
-     * getValue()
-     *
-     * Metadata Value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-
-    public function getAttributes()
-    {
-        return $this->_dynamicAttributes;
-    }
-
-    /**
-     * __isset()
-     *
-     * Check if an attrbute is set
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __isset($name)
-    {
-        return isset($this->_dynamicAttributes[$name]);
-    }
-
-    /**
-     * __unset()
-     *
-     * @param string $name
-     * @return null
-     */
-    public function __unset($name)
-    {
-        unset($this->_dynamicAttributes[$name]);
-        return;
-    }
-
-    /**
-     * __get() - Get a property via property call $metadata->foo
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (method_exists($this, 'get' . $name)) {
-            return $this->{'get' . $name}();
-        } elseif (array_key_exists($name, $this->_dynamicAttributes)) {
-            return $this->_dynamicAttributes[$name];
-        } else {
-            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-            throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this metadata.');
-        }
-    }
-
-    /**
-     * __set() - Set a property via the magic set $metadata->foo = 'foo'
-     *
-     * @param string $name
-     * @param mixed $value
-     */
-    public function __set($name, $value)
-    {
-        if (method_exists($this, 'set' . $name)) {
-            $this->{'set' . $name}($value);
-            return $this;
-        } else {
-            $this->_dynamicAttributes[$name] = $value;
-            return $this;
-        }
-//        {
-//            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-//            throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.');
-//        }
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Metadata/Interface.php
deleted file mode 100644
index 1aa2498fe..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Interface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Metadata_Interface
-{
-
-    /**
-     * getType()
-     *
-     * The type of metadata this describes
-     *
-     */
-    public function getType();
-
-    /**
-     * getName()
-     *
-     */
-    public function getName();
-
-    /**
-     * getValue()
-     *
-     */
-    public function getValue();
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Tool.php b/airtime_mvc/library/Zend/Tool/Framework/Metadata/Tool.php
deleted file mode 100644
index 17325dae0..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Metadata/Tool.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Tool.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Metadata_Basic
- */
-require_once 'Zend/Tool/Framework/Metadata/Basic.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Metadata_Tool extends Zend_Tool_Framework_Metadata_Basic
-{
-
-    /**
-     * @var string
-     */
-    protected $_type = 'Tool';
-
-    /**#@+
-     * @var string
-     */
-    protected $_clientName    = null;
-    protected $_actionName    = null;
-    protected $_providerName  = null;
-    protected $_specialtyName = null;
-    /**#@-*/
-
-    /**#@+
-     * @var string
-     */
-    protected $_clientReference = null;
-    protected $_actionReference = null;
-    protected $_providerReference = null;
-    /**#@-*/
-
-    public function setClientName($clientName)
-    {
-        $this->_clientName = $clientName;
-        return $this;
-    }
-
-    public function getClientName()
-    {
-        return $this->_clientName;
-    }
-
-    /**
-     * setActionName()
-     *
-     * @param string $actionName
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setActionName($actionName)
-    {
-        $this->_actionName = $actionName;
-        return $this;
-    }
-
-    /**
-     * getActionName()
-     *
-     * @return string
-     */
-    public function getActionName()
-    {
-        return $this->_actionName;
-    }
-
-    /**
-     * setProviderName()
-     *
-     * @param string $providerName
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setProviderName($providerName)
-    {
-        $this->_providerName = $providerName;
-        return $this;
-    }
-
-    /**
-     * getProviderName()
-     *
-     * @return string
-     */
-    public function getProviderName()
-    {
-        return $this->_providerName;
-    }
-
-    /**
-     * setSpecialtyName()
-     *
-     * @param string $specialtyName
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setSpecialtyName($specialtyName)
-    {
-        $this->_specialtyName = $specialtyName;
-        return $this;
-    }
-
-    /**
-     * getSpecialtyName()
-     *
-     * @return string
-     */
-    public function getSpecialtyName()
-    {
-        return $this->_specialtyName;
-    }
-
-    /**
-     * setClientReference()
-     *
-     * @param Zend_Tool_Framework_Client_Abstract $client
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setClientReference(Zend_Tool_Framework_Client_Abstract $client)
-    {
-        $this->_clientReference = $client;
-        return $this;
-    }
-
-    /**
-     * getClientReference()
-     *
-     * @return Zend_Tool_Framework_Client_Abstract
-     */
-    public function getClientReference()
-    {
-        return $this->_clientReference;
-    }
-
-    /**
-     * setActionReference()
-     *
-     * @param Zend_Tool_Framework_Action_Interface $action
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setActionReference(Zend_Tool_Framework_Action_Interface $action)
-    {
-        $this->_actionReference = $action;
-        return $this;
-    }
-
-    /**
-     * getActionReference()
-     *
-     * @return Zend_Tool_Framework_Action_Interface
-     */
-    public function getActionReference()
-    {
-        return $this->_actionReference;
-    }
-
-    /**
-     * setProviderReference()
-     *
-     * @param Zend_Tool_Framework_Provider_Interface $provider
-     * @return Zend_Tool_Framework_Metadata_Tool
-     */
-    public function setProviderReference(Zend_Tool_Framework_Provider_Interface $provider)
-    {
-        $this->_providerReference = $provider;
-        return $this;
-    }
-
-    /**
-     * getProviderReference()
-     *
-     * @return Zend_Tool_Framework_Provider_Interface
-     */
-    public function getProviderReference()
-    {
-        return $this->_providerReference;
-    }
-
-    /**
-     * __toString() cast to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $string = parent::__toString();
-        $string .= ' (ProviderName: ' . $this->_providerName
-             . ', ActionName: '     . $this->_actionName
-             . ', SpecialtyName: '  . $this->_specialtyName
-             . ')';
-
-        return $string;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Abstract.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Abstract.php
deleted file mode 100644
index d9c081638..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Abstract.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Provider_Interface
- */
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-
-/**
- * This is a convenience class.
- *
- * At current it will return the request and response from the client registry
- * as they are the more common things that will be needed by providers
- *
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Framework_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Interface, Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    /**
-     * setRegistry() - required by Zend_Tool_Framework_Registry_EnabledInterface
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Provider_Abstract
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/DocblockManifestable.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/DocblockManifestable.php
deleted file mode 100644
index 308c7de98..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/DocblockManifestable.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DocblockManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Provider_DocblockManifestInterface
-{
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Exception.php
deleted file mode 100644
index 3ec4184b8..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Exception
- */
-require_once 'Zend/Tool/Framework/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Provider_Exception extends Zend_Tool_Framework_Exception
-{
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Interactable.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Interactable.php
deleted file mode 100644
index 0c4335d37..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Interactable.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interactable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Provider_Interactable
-{
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Interface.php
deleted file mode 100644
index c9d1c0539..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Interface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Provider_Interface
-{
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Pretendable.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Pretendable.php
deleted file mode 100644
index 22947a73d..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Pretendable.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Pretendable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Provider_Pretendable
-{
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Repository.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Repository.php
deleted file mode 100644
index 34ef9dfb0..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Repository.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Provider_Signature
- */
-require_once 'Zend/Tool/Framework/Provider/Signature.php';
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Provider_Repository
-    implements Zend_Tool_Framework_Registry_EnabledInterface, IteratorAggregate, Countable
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry
-     */
-    protected $_registry = null;
-
-    /**
-     * @var bool
-     */
-    protected $_processOnAdd = false;
-
-    /**
-     * @var Zend_Tool_Framework_Provider_Interface[]
-     */
-    protected $_unprocessedProviders = array();
-
-    /**
-     * @var Zend_Tool_Framework_Provider_Signature[]
-     */
-    protected $_providerSignatures = array();
-
-    /**
-     * @var array Array of Zend_Tool_Framework_Provider_Inteface
-     */
-    protected $_providers = array();
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return unknown
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * Set the ProcessOnAdd flag
-     *
-     * @param unknown_type $processOnAdd
-     * @return unknown
-     */
-    public function setProcessOnAdd($processOnAdd = true)
-    {
-        $this->_processOnAdd = (bool) $processOnAdd;
-        return $this;
-    }
-
-    /**
-     * Add a provider to the repository for processing
-     *
-     * @param Zend_Tool_Framework_Provider_Interface $provider
-     * @return Zend_Tool_Framework_Provider_Repository
-     */
-    public function addProvider(Zend_Tool_Framework_Provider_Interface $provider, $overwriteExistingProvider = false)
-    {
-        if ($provider instanceof Zend_Tool_Framework_Registry_EnabledInterface) {
-            $provider->setRegistry($this->_registry);
-        }
-
-        if (method_exists($provider, 'getName')) {
-            $providerName = $provider->getName();
-        } else {
-            $providerName = $this->_parseName($provider);
-        }
-
-        // if a provider by the given name already exist, and its not set as overwritable, throw exception
-        if (!$overwriteExistingProvider &&
-            (array_key_exists($providerName, $this->_unprocessedProviders)
-                || array_key_exists($providerName, $this->_providers)))
-        {
-            require_once 'Zend/Tool/Framework/Provider/Exception.php';
-            throw new Zend_Tool_Framework_Provider_Exception('A provider by the name ' . $providerName
-                . ' is already registered and $overrideExistingProvider is set to false.');
-        }
-
-        $this->_unprocessedProviders[$providerName] = $provider;
-
-        // if process has already been called, process immediately.
-        if ($this->_processOnAdd) {
-            $this->process();
-        }
-
-        return $this;
-    }
-
-    public function hasProvider($providerOrClassName, $processedOnly = true)
-    {
-        if ($providerOrClassName instanceof Zend_Tool_Framework_Provider_Interface) {
-            $targetProviderClassName = get_class($providerOrClassName);
-        } else {
-            $targetProviderClassName = (string) $providerOrClassName;
-        }
-
-        if (!$processedOnly) {
-            foreach ($this->_unprocessedProviders as $unprocessedProvider) {
-                if (get_class($unprocessedProvider) == $targetProviderClassName) {
-                    return true;
-                }
-            }
-        }
-
-        foreach ($this->_providers as $processedProvider) {
-            if (get_class($processedProvider) == $targetProviderClassName) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Process all of the unprocessed providers
-     *
-     */
-    public function process()
-    {
-
-        // process all providers in the unprocessedProviders array
-        foreach ($this->_unprocessedProviders as $providerName => $provider) {
-
-            // create a signature for the provided provider
-            $providerSignature = new Zend_Tool_Framework_Provider_Signature($provider);
-
-            if ($providerSignature instanceof Zend_Tool_Framework_Registry_EnabledInterface) {
-                $providerSignature->setRegistry($this->_registry);
-            }
-
-            $providerSignature->process();
-
-            // ensure the name is lowercased for easier searching
-            $providerName = strtolower($providerName);
-
-            // add to the appropraite place
-            $this->_providerSignatures[$providerName] = $providerSignature;
-            $this->_providers[$providerName]          = $providerSignature->getProvider();
-
-            // remove from unprocessed array
-            unset($this->_unprocessedProviders[$providerName]);
-        }
-
-    }
-
-    /**
-     * getProviders() Get all the providers in the repository
-     *
-     * @return array
-     */
-    public function getProviders()
-    {
-        return $this->_providers;
-    }
-
-    /**
-     * getProviderSignatures() Get all the provider signatures
-     *
-     * @return array
-     */
-    public function getProviderSignatures()
-    {
-        return $this->_providerSignatures;
-    }
-
-    /**
-     * getProvider()
-     *
-     * @param string $providerName
-     * @return Zend_Tool_Framework_Provider_Interface
-     */
-    public function getProvider($providerName)
-    {
-        return $this->_providers[strtolower($providerName)];
-    }
-
-    /**
-     * getProviderSignature()
-     *
-     * @param string $providerName
-     * @return Zend_Tool_Framework_Provider_Signature
-     */
-    public function getProviderSignature($providerName)
-    {
-        return $this->_providerSignatures[strtolower($providerName)];
-    }
-
-    /**
-     * count() - return the number of providers
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_providers);
-    }
-
-    /**
-     * getIterator() - Required by the IteratorAggregate Interface
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->getProviders());
-    }
-
-    /**
-     * _parseName - internal method to determine the name of an action when one is not explicity provided.
-     *
-     * @param Zend_Tool_Framework_Action_Interface $action
-     * @return string
-     */
-    protected function _parseName(Zend_Tool_Framework_Provider_Interface $provider)
-    {
-        $className = get_class($provider);
-        $providerName = substr($className, strrpos($className, '_')+1);
-        if (substr($providerName, -8) == 'Provider') {
-            $providerName = substr($providerName, 0, strlen($providerName)-8);
-        }
-        return $providerName;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Provider/Signature.php b/airtime_mvc/library/Zend/Tool/Framework/Provider/Signature.php
deleted file mode 100644
index 08a50b161..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Provider/Signature.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Signature.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Reflection_Class
- */
-require_once 'Zend/Reflection/Class.php';
-
-/**
- * @see Zend_Tool_Framework_Registry
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @see Zend_Tool_Framework_Action_Base
- */
-require_once 'Zend/Tool/Framework/Action/Base.php';
-
-/**
- * The purpose of Zend_Tool_Framework_Provider_Signature is to derive
- * callable signatures from the provided provider.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Provider_Signature implements Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry
-     */
-    protected $_registry = null;
-
-    /**
-     * @var Zend_Tool_Framework_Provider_Interface
-     */
-    protected $_provider = null;
-
-    /**
-     * @var string
-     */
-    protected $_name = null;
-
-    /**
-     * @var array
-     */
-    protected $_specialties = array();
-
-    /**
-     * @var array
-     */
-    protected $_actionableMethods = array();
-
-    /**
-     * @var unknown_type
-     */
-    protected $_actions = array();
-
-    /**
-     * @var Zend_Reflection_Class
-     */
-    protected $_providerReflection = null;
-
-    /**
-     * @var bool
-     */
-    protected $_isProcessed = false;
-
-    /**
-     * Constructor
-     *
-     * @param Zend_Tool_Framework_Provider_Interface $provider
-     */
-    public function __construct(Zend_Tool_Framework_Provider_Interface $provider)
-    {
-        $this->_provider = $provider;
-        $this->_providerReflection = new Zend_Reflection_Class($provider);
-    }
-
-    /**
-     * setRegistry()
-     *
-     * @param Zend_Tool_Framework_Registry_Interface $registry
-     * @return Zend_Tool_Framework_Provider_Signature
-     */
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    public function process()
-    {
-        if ($this->_isProcessed) {
-            return;
-        }
-
-        $this->_process();
-    }
-
-    /**
-     * getName() of the provider
-     *
-     * @return unknown
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Get the provider for this signature
-     *
-     * @return Zend_Tool_Framework_Provider_Interface
-     */
-    public function getProvider()
-    {
-        return $this->_provider;
-    }
-
-    /**
-     * getProviderReflection()
-     *
-     * @return Zend_Reflection_Class
-     */
-    public function getProviderReflection()
-    {
-        return $this->_providerReflection;
-    }
-
-    /**
-     * getSpecialities()
-     *
-     * @return array
-     */
-    public function getSpecialties()
-    {
-        return $this->_specialties;
-    }
-
-    /**
-     * getActions()
-     *
-     * @return array Array of Actions
-     */
-    public function getActions()
-    {
-        return $this->_actions;
-    }
-
-    /**
-     * getActionableMethods()
-     *
-     * @return array
-     */
-    public function getActionableMethods()
-    {
-        return $this->_actionableMethods;
-    }
-
-    /**
-     * getActionableMethod() - Get an actionable method by name, this will return an array of
-     * useful information about what can be exectued on this provider
-     *
-     * @param string $methodName
-     * @return array
-     */
-    public function getActionableMethod($methodName)
-    {
-        if (isset($this->_actionableMethods[$methodName])) {
-            return $this->_actionableMethods[$methodName];
-        }
-
-        return false;
-    }
-
-    /**
-     * getActionableMethodByActionName() - Get an actionable method by its action name, this
-     * will return an array of useful information about what can be exectued on this provider
-     *
-     * @param string $actionName
-     * @return array
-     */
-    public function getActionableMethodByActionName($actionName, $specialtyName = '_Global')
-    {
-        foreach ($this->_actionableMethods as $actionableMethod) {
-            if ($actionName == $actionableMethod['actionName']
-                && $specialtyName == $actionableMethod['specialty']) {
-                return $actionableMethod;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * _process() is called at construction time and is what will build the signature information
-     * for determining what is actionable
-     *
-     */
-    protected function _process()
-    {
-        $this->_isProcessed = true;
-        $this->_processName();
-        $this->_processSpecialties();
-        $this->_processActionableMethods();
-    }
-
-    /**
-     * _processName();
-     *
-     */
-    protected function _processName()
-    {
-        if (method_exists($this->_provider, 'getName')) {
-            $this->_name = $this->_provider->getName();
-        }
-
-        if ($this->_name == null) {
-            $className = get_class($this->_provider);
-            $name = substr($className, strrpos($className, '_')+1);
-            $name = preg_replace('#(Provider|Manifest)$#', '', $name);
-            $this->_name = $name;
-        }
-    }
-
-    /**
-     * _processSpecialties() - Break out the specialty names for this provider
-     *
-     */
-    protected function _processSpecialties()
-    {
-        $specialties = array();
-
-        if ($this->_providerReflection->hasMethod('getSpecialties')) {
-            $specialties = $this->_provider->getSpecialties();
-            if (!is_array($specialties)) {
-                require_once 'Zend/Tool/Framework/Provider/Exception.php';
-                throw new Zend_Tool_Framework_Provider_Exception(
-                    'Provider ' . get_class($this->_provider) . ' must return an array for method getSpecialties().'
-                    );
-            }
-        } else {
-            $defaultProperties = $this->_providerReflection->getDefaultProperties();
-            $specialties = (isset($defaultProperties['_specialties'])) ? $defaultProperties['_specialties'] : array();
-            if (!is_array($specialties)) {
-                require_once 'Zend/Tool/Framework/Provider/Exception.php';
-                throw new Zend_Tool_Framework_Provider_Exception(
-                    'Provider ' . get_class($this->_provider) . '\'s property $_specialties must be an array.'
-                    );
-            }
-        }
-
-        $this->_specialties = array_merge(array('_Global'), $specialties);
-
-    }
-
-    /**
-     * _processActionableMethods() - process all methods that can be called on this provider.
-     *
-     */
-    protected function _processActionableMethods()
-    {
-
-        $specialtyRegex = '#(.*)(' . implode('|', $this->_specialties) . ')$#i';
-
-
-        $methods = $this->_providerReflection->getMethods();
-
-        $actionableMethods = array();
-        foreach ($methods as $method) {
-
-            $methodName = $method->getName();
-
-            /**
-             * the following will determine what methods are actually actionable
-             * public, non-static, non-underscore prefixed, classes that dont
-             * contain the name "
-             */
-            if (!$method->getDeclaringClass()->isInstantiable()
-                || !$method->isPublic()
-                || $methodName[0] == '_'
-                || $method->isStatic()
-                || in_array($methodName, array('getContextClasses', 'getName')) // other protected public methods will nee to go here
-                ) {
-                continue;
-            }
-
-            /**
-             * check to see if the method was a required method by a Zend_Tool_* interface
-             */
-            foreach ($method->getDeclaringClass()->getInterfaces() as $methodDeclaringClassInterface) {
-                if (strpos($methodDeclaringClassInterface->getName(), 'Zend_Tool_') === 0
-                    && $methodDeclaringClassInterface->hasMethod($methodName)) {
-                    continue 2;
-                }
-            }
-
-            $actionableName = ucfirst($methodName);
-
-            if (substr($actionableName, -6) == 'Action') {
-                $actionableName = substr($actionableName, 0, -6);
-            }
-
-            $actionableMethods[$methodName]['methodName'] = $methodName;
-
-            $matches = null;
-            if (preg_match($specialtyRegex, $actionableName, $matches)) {
-                $actionableMethods[$methodName]['actionName'] = $matches[1];
-                $actionableMethods[$methodName]['specialty'] = $matches[2];
-            } else {
-                $actionableMethods[$methodName]['actionName'] = $actionableName;
-                $actionableMethods[$methodName]['specialty'] = '_Global';
-            }
-
-            // get the action, and create non-existent actions when they dont exist (the true part below)
-            $action = $this->_registry->getActionRepository()->getAction($actionableMethods[$methodName]['actionName']);
-            if ($action == null) {
-                $action = new Zend_Tool_Framework_Action_Base($actionableMethods[$methodName]['actionName']);
-                $this->_registry->getActionRepository()->addAction($action);
-            }
-            $actionableMethods[$methodName]['action'] = $action;
-
-            if (!in_array($actionableMethods[$methodName]['action'], $this->_actions)) {
-                $this->_actions[] = $actionableMethods[$methodName]['action'];
-            }
-
-            $parameterInfo = array();
-            $position = 1;
-            foreach ($method->getParameters() as $parameter) {
-                $currentParam = $parameter->getName();
-                $parameterInfo[$currentParam]['position']    = $position++;
-                $parameterInfo[$currentParam]['optional']    = $parameter->isOptional();
-                $parameterInfo[$currentParam]['default']     = ($parameter->isOptional()) ? $parameter->getDefaultValue() : null;
-                $parameterInfo[$currentParam]['name']        = $currentParam;
-                $parameterInfo[$currentParam]['type']        = 'string';
-                $parameterInfo[$currentParam]['description'] = null;
-            }
-
-            $matches = null;
-            if (($docComment = $method->getDocComment()) != '' &&
-                (preg_match_all('/@param\s+(\w+)+\s+(\$\S+)\s+(.*?)(?=(?:\*\s*@)|(?:\*\/))/s', $docComment, $matches)))
-            {
-                for ($i=0; $i <= count($matches[0])-1; $i++) {
-                    $currentParam = ltrim($matches[2][$i], '$');
-
-                    if ($currentParam != '' && isset($parameterInfo[$currentParam])) {
-
-                        $parameterInfo[$currentParam]['type'] = $matches[1][$i];
-
-                        $descriptionSource = $matches[3][$i];
-
-                        if ($descriptionSource != '') {
-                            $parameterInfo[$currentParam]['description'] = trim($descriptionSource);
-                        }
-
-                    }
-
-                }
-
-            }
-
-            $actionableMethods[$methodName]['parameterInfo'] = $parameterInfo;
-
-        }
-
-        $this->_actionableMethods = $actionableMethods;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Registry.php b/airtime_mvc/library/Zend/Tool/Framework/Registry.php
deleted file mode 100644
index 9a07e33b9..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Registry.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Registry_Interface
- */
-require_once 'Zend/Tool/Framework/Registry/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Interface
-{
-    /**
-     * @var Zend_Tool_Framework_Loader_Abstract
-     */
-    protected $_loader = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Abstract
-     */
-    protected $_client = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Config
-     */
-    protected $_config = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Storage
-     */
-    protected $_storage = null;
-
-    /**
-     * @var Zend_Tool_Framework_Action_Repository
-     */
-    protected $_actionRepository = null;
-
-    /**
-     * @var Zend_Tool_Framework_Provider_Repository
-     */
-    protected $_providerRepository = null;
-
-    /**
-     * @var Zend_Tool_Framework_Manifest_Repository
-     */
-    protected $_manifestRepository = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Request
-     */
-    protected $_request = null;
-
-    /**
-     * @var Zend_Tool_Framework_Client_Response
-     */
-    protected $_response = null;
-
-    /**
-     * reset() - Reset all internal properties
-     *
-     */
-    public function reset()
-    {
-        unset($this->_client);
-        unset($this->_loader);
-        unset($this->_actionRepository);
-        unset($this->_providerRepository);
-        unset($this->_request);
-        unset($this->_response);
-    }
-
-//    public function __construct()
-//    {
-//        // no instantiation from outside
-//    }
-
-    /**
-     * Enter description here...
-     *
-     * @param Zend_Tool_Framework_Client_Abstract $client
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setClient(Zend_Tool_Framework_Client_Abstract $client)
-    {
-        $this->_client = $client;
-        if ($this->isObjectRegistryEnablable($this->_client)) {
-            $this->enableRegistryOnObject($this->_client);
-        }
-        return $this;
-    }
-
-    /**
-     * getClient() return the client in the registry
-     *
-     * @return Zend_Tool_Framework_Client_Abstract
-     */
-    public function getClient()
-    {
-        return $this->_client;
-    }
-
-    /**
-     * setConfig()
-     *
-     * @param Zend_Tool_Framework_Client_Config $config
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setConfig(Zend_Tool_Framework_Client_Config $config)
-    {
-        $this->_config = $config;
-        return $this;
-    }
-
-    /**
-     * getConfig()
-     *
-     * @return Zend_Tool_Framework_Client_Config
-     */
-    public function getConfig()
-    {
-        if ($this->_config === null) {
-            require_once 'Zend/Tool/Framework/Client/Config.php';
-            $this->setConfig(new Zend_Tool_Framework_Client_Config());
-        }
-
-        return $this->_config;
-    }
-
-    /**
-     * setStorage()
-     *
-     * @param Zend_Tool_Framework_Client_Storage $storage
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setStorage(Zend_Tool_Framework_Client_Storage $storage)
-    {
-        $this->_storage = $storage;
-        return $this;
-    }
-
-    /**
-     * getConfig()
-     *
-     * @return Zend_Tool_Framework_Client_Storage
-     */
-    public function getStorage()
-    {
-        if ($this->_storage === null) {
-            require_once 'Zend/Tool/Framework/Client/Storage.php';
-            $this->setStorage(new Zend_Tool_Framework_Client_Storage());
-        }
-
-        return $this->_storage;
-    }
-
-    /**
-     * setLoader()
-     *
-     * @param Zend_Tool_Framework_Loader_Interface $loader
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setLoader(Zend_Tool_Framework_Loader_Interface $loader)
-    {
-        $this->_loader = $loader;
-        if ($this->isObjectRegistryEnablable($this->_loader)) {
-            $this->enableRegistryOnObject($this->_loader);
-        }
-        return $this;
-    }
-
-    /**
-     * getLoader()
-     *
-     * @return Zend_Tool_Framework_Loader_Abstract
-     */
-    public function getLoader()
-    {
-        if ($this->_loader === null) {
-            require_once 'Zend/Tool/Framework/Loader/IncludePathLoader.php';
-            $this->setLoader(new Zend_Tool_Framework_Loader_IncludePathLoader());
-        }
-
-        return $this->_loader;
-    }
-
-    /**
-     * setActionRepository()
-     *
-     * @param Zend_Tool_Framework_Action_Repository $actionRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setActionRepository(Zend_Tool_Framework_Action_Repository $actionRepository)
-    {
-        $this->_actionRepository = $actionRepository;
-        if ($this->isObjectRegistryEnablable($this->_actionRepository)) {
-            $this->enableRegistryOnObject($this->_actionRepository);
-        }
-        return $this;
-    }
-
-    /**
-     * getActionRepository()
-     *
-     * @return Zend_Tool_Framework_Action_Repository
-     */
-    public function getActionRepository()
-    {
-        if ($this->_actionRepository == null) {
-            require_once 'Zend/Tool/Framework/Action/Repository.php';
-            $this->setActionRepository(new Zend_Tool_Framework_Action_Repository());
-        }
-
-        return $this->_actionRepository;
-    }
-
-    /**
-     * setProviderRepository()
-     *
-     * @param Zend_Tool_Framework_Provider_Repository $providerRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setProviderRepository(Zend_Tool_Framework_Provider_Repository $providerRepository)
-    {
-        $this->_providerRepository = $providerRepository;
-        if ($this->isObjectRegistryEnablable($this->_providerRepository)) {
-            $this->enableRegistryOnObject($this->_providerRepository);
-        }
-        return $this;
-    }
-
-    /**
-     * getProviderRepository()
-     *
-     * @return Zend_Tool_Framework_Provider_Repository
-     */
-    public function getProviderRepository()
-    {
-        if ($this->_providerRepository == null) {
-            require_once 'Zend/Tool/Framework/Provider/Repository.php';
-            $this->setProviderRepository(new Zend_Tool_Framework_Provider_Repository());
-        }
-
-        return $this->_providerRepository;
-    }
-
-    /**
-     * setManifestRepository()
-     *
-     * @param Zend_Tool_Framework_Manifest_Repository $manifestRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setManifestRepository(Zend_Tool_Framework_Manifest_Repository $manifestRepository)
-    {
-        $this->_manifestRepository = $manifestRepository;
-        if ($this->isObjectRegistryEnablable($this->_manifestRepository)) {
-            $this->enableRegistryOnObject($this->_manifestRepository);
-        }
-        return $this;
-    }
-
-    /**
-     * getManifestRepository()
-     *
-     * @return Zend_Tool_Framework_Manifest_Repository
-     */
-    public function getManifestRepository()
-    {
-        if ($this->_manifestRepository == null) {
-            require_once 'Zend/Tool/Framework/Manifest/Repository.php';
-            $this->setManifestRepository(new Zend_Tool_Framework_Manifest_Repository());
-        }
-
-        return $this->_manifestRepository;
-    }
-
-    /**
-     * setRequest()
-     *
-     * @param Zend_Tool_Framework_Client_Request $request
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setRequest(Zend_Tool_Framework_Client_Request $request)
-    {
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * getRequest()
-     *
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function getRequest()
-    {
-        if ($this->_request == null) {
-            require_once 'Zend/Tool/Framework/Client/Request.php';
-            $this->setRequest(new Zend_Tool_Framework_Client_Request());
-        }
-
-        return $this->_request;
-    }
-
-    /**
-     * setResponse()
-     *
-     * @param Zend_Tool_Framework_Client_Response $response
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setResponse(Zend_Tool_Framework_Client_Response $response)
-    {
-        $this->_response = $response;
-        return $this;
-    }
-
-    /**
-     * getResponse()
-     *
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function getResponse()
-    {
-        if ($this->_response == null) {
-            require_once 'Zend/Tool/Framework/Client/Response.php';
-            $this->setResponse(new Zend_Tool_Framework_Client_Response());
-        }
-
-        return $this->_response;
-    }
-
-    /**
-     * __get() - Get a property via property call $registry->foo
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        if (method_exists($this, 'get' . $name)) {
-            return $this->{'get' . $name}();
-        } else {
-            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-            throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.');
-        }
-    }
-
-    /**
-     * __set() - Set a property via the magic set $registry->foo = 'foo'
-     *
-     * @param string $name
-     * @param mixed $value
-     */
-    public function __set($name, $value)
-    {
-        if (method_exists($this, 'set' . $name)) {
-            $this->{'set' . $name}($value);
-            return;
-        } else {
-            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-            throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.');
-        }
-    }
-
-    /**
-     * isObjectRegistryEnablable() - Check whether an object is registry enablable
-     *
-     * @param object $object
-     * @return bool
-     */
-    public function isObjectRegistryEnablable($object)
-    {
-        if (!is_object($object)) {
-            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-            throw new Zend_Tool_Framework_Registry_Exception('isObjectRegistryEnablable() expects an object.');
-        }
-
-        return ($object instanceof Zend_Tool_Framework_Registry_EnabledInterface);
-    }
-
-    /**
-     * enableRegistryOnObject() - make an object registry enabled
-     *
-     * @param object $object
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function enableRegistryOnObject($object)
-    {
-        if (!$this->isObjectRegistryEnablable($object)) {
-            require_once 'Zend/Tool/Framework/Registry/Exception.php';
-            throw new Zend_Tool_Framework_Registry_Exception('Object provided is not registry enablable, check first with Zend_Tool_Framework_Registry::isObjectRegistryEnablable()');
-        }
-
-        $object->setRegistry($this);
-        return $this;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Registry/EnabledInterface.php b/airtime_mvc/library/Zend/Tool/Framework/Registry/EnabledInterface.php
deleted file mode 100644
index de9484f14..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Registry/EnabledInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EnabledInterface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This is a convenience class.
- *
- * At current it will return the request and response from the client registry
- * as they are the more common things that will be needed by providers
- *
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry);
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Registry/Exception.php b/airtime_mvc/library/Zend/Tool/Framework/Registry/Exception.php
deleted file mode 100644
index 6a93465e7..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Registry/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Framework/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_Registry_Exception extends Zend_Tool_Framework_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/Registry/Interface.php b/airtime_mvc/library/Zend/Tool/Framework/Registry/Interface.php
deleted file mode 100644
index 8e9289a42..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/Registry/Interface.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Framework_Registry_Interface
-{
-
-
-    /**
-     * setClient()
-     *
-     * @param Zend_Tool_Framework_Client_Abstract $client
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setClient(Zend_Tool_Framework_Client_Abstract $client);
-
-    /**
-     * getClient() return the client in the registry
-     *
-     * @return Zend_Tool_Framework_Client_Abstract
-     */
-    public function getClient();
-
-    /**
-     * setLoader()
-     *
-     * @param Zend_Tool_Framework_Loader_Abstract $loader
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setLoader(Zend_Tool_Framework_Loader_Interface $loader);
-
-    /**
-     * getLoader()
-     *
-     * @return Zend_Tool_Framework_Loader_Abstract
-     */
-    public function getLoader();
-
-    /**
-     * setActionRepository()
-     *
-     * @param Zend_Tool_Framework_Action_Repository $actionRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setActionRepository(Zend_Tool_Framework_Action_Repository $actionRepository);
-
-    /**
-     * getActionRepository()
-     *
-     * @return Zend_Tool_Framework_Action_Repository
-     */
-    public function getActionRepository();
-
-    /**
-     * setProviderRepository()
-     *
-     * @param Zend_Tool_Framework_Provider_Repository $providerRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setProviderRepository(Zend_Tool_Framework_Provider_Repository $providerRepository);
-
-    /**
-     * getProviderRepository()
-     *
-     * @return Zend_Tool_Framework_Provider_Repository
-     */
-    public function getProviderRepository();
-
-    /**
-     * setManifestRepository()
-     *
-     * @param Zend_Tool_Framework_Manifest_Repository $manifestRepository
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setManifestRepository(Zend_Tool_Framework_Manifest_Repository $manifestRepository);
-
-    /**
-     * getManifestRepository()
-     *
-     * @return Zend_Tool_Framework_Manifest_Repository
-     */
-    public function getManifestRepository();
-
-    /**
-     * setRequest()
-     *
-     * @param Zend_Tool_Framework_Client_Request $request
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setRequest(Zend_Tool_Framework_Client_Request $request);
-
-    /**
-     * getRequest()
-     *
-     * @return Zend_Tool_Framework_Client_Request
-     */
-    public function getRequest();
-
-    /**
-     * setResponse()
-     *
-     * @param Zend_Tool_Framework_Client_Response $response
-     * @return Zend_Tool_Framework_Registry
-     */
-    public function setResponse(Zend_Tool_Framework_Client_Response $response);
-
-    /**
-     * getResponse()
-     *
-     * @return Zend_Tool_Framework_Client_Response
-     */
-    public function getResponse();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Action/Create.php b/airtime_mvc/library/Zend/Tool/Framework/System/Action/Create.php
deleted file mode 100644
index 94aad1959..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Action/Create.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Create.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Action_Base
- */
-require_once 'Zend/Tool/Framework/Action/Base.php';
-
-
-/**
- * This is a convenience class.
- *
- * At current it will return the request and response from the client registry
- * as they are the more common things that will be needed by providers
- *
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Action_Create extends Zend_Tool_Framework_Action_Base
-{
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Action/Delete.php b/airtime_mvc/library/Zend/Tool/Framework/System/Action/Delete.php
deleted file mode 100644
index cf689c877..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Action/Delete.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Delete.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Action_Base
- */
-require_once 'Zend/Tool/Framework/Action/Base.php';
-
-
-/**
- * This is a convenience class.
- *
- * At current it will return the request and response from the client registry
- * as they are the more common things that will be needed by providers
- *
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Action_Delete extends Zend_Tool_Framework_Action_Base
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Manifest.php b/airtime_mvc/library/Zend/Tool/Framework/System/Manifest.php
deleted file mode 100644
index af2e122cf..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Manifest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php';
-require_once 'Zend/Tool/Framework/Manifest/ActionManifestable.php';
-require_once 'Zend/Tool/Framework/System/Provider/Version.php';
-require_once 'Zend/Tool/Framework/System/Provider/Config.php';
-require_once 'Zend/Tool/Framework/System/Provider/Phpinfo.php';
-require_once 'Zend/Tool/Framework/System/Provider/Manifest.php';
-require_once 'Zend/Tool/Framework/System/Action/Create.php';
-require_once 'Zend/Tool/Framework/System/Action/Delete.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Manifest
-    implements Zend_Tool_Framework_Manifest_ProviderManifestable, Zend_Tool_Framework_Manifest_ActionManifestable
-{
-
-    public function getProviders()
-    {
-        $providers = array(
-            new Zend_Tool_Framework_System_Provider_Version(),
-            new Zend_Tool_Framework_System_Provider_Config(),
-            new Zend_Tool_Framework_System_Provider_Phpinfo(),
-            new Zend_Tool_Framework_System_Provider_Manifest()
-            );
-
-        return $providers;
-    }
-
-    public function getActions()
-    {
-        $actions = array(
-            new Zend_Tool_Framework_System_Action_Create(),
-            new Zend_Tool_Framework_System_Action_Delete()
-            );
-
-        return $actions;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Config.php b/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Config.php
deleted file mode 100644
index 68df9be4d..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Config.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * @see Zend_Tool_Framework_Provider_Abstract
- */
-require_once "Zend/Tool/Framework/Provider/Abstract.php";
-
-/**
- * @see Zend_Config
- */
-require_once "Zend/Config.php";
-
-/**
- * @see Zend_Config_Writer_Ini
- */
-require_once "Zend/Config/Writer/Ini.php";
-
-/**
- * @see Zend_Loader
- */
-require_once "Zend/Loader.php";
-
-/**
- * Configuration Provider
- *
- * @category   Zend
- * @package    Zend_Tool
- * @package    Framework
- * @uses       Zend_Tool_Framework_Provider_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Provider_Abstract
-{
-    /**
-     * @var array
-     */
-    protected $_levelCompleted = array();
-
-    /**
-     * array of specialties handled by this provider
-     * 
-     * @var array
-     */
-    protected $_specialties = array('Manifest', 'Provider');
-    
-    /**
-     * @param string $type
-     */
-    public function create()
-    {
-        /* @var $userConfig Zend_Tool_Framework_Client_Config */
-        $userConfig = $this->_registry->getConfig();
-
-        $resp = $this->_registry->getResponse();
-        if ($userConfig->exists()) {
-            require_once "Zend/Tool/Framework/Exception.php";
-            throw new Zend_Tool_Framework_Exception(
-                "A configuration already exists, cannot create a new one.");
-        }
-
-        $homeDirectory = $this->_detectHomeDirectory();
-
-        $writer = new Zend_Config_Writer_Ini();
-        $writer->setRenderWithoutSections();
-        $filename = $homeDirectory."/.zf.ini";
-
-        $config = array(
-            'php' => array(
-                'includepath' => get_include_path(),
-            ),
-        );
-        $writer->write($filename, new Zend_Config($config));
-
-        $resp = $this->_registry->getResponse();
-        $resp->appendContent("Successfully written Zend Tool config.");
-        $resp->appendContent("It is located at: ".$filename);
-    }
-
-    /**
-     * @return string
-     */
-    protected function _detectHomeDirectory()
-    {
-        $envVars = array("ZF_HOME", "HOME", "HOMEPATH");
-        foreach($envVars AS $env) {
-            $homeDirectory = getenv($env);
-            if ($homeDirectory != false && file_exists($homeDirectory)) {
-                return $homeDirectory;
-            }
-        }
-        require_once "Zend/Tool/Framework/Exception.php";
-        throw new Zend_Tool_Framework_Exception("Cannot detect user home directory, set ZF_HOME enviroment variable.");
-    }
-
-    /**
-     * Show Zend Tool User Configuration
-     *
-     * @return void
-     */
-    public function show()
-    {
-        $userConfig = $this->_loadUserConfigIfExists();
-        $configArray = $userConfig->getConfigInstance()->toArray();
-
-        $resp = $this->_registry->getResponse();
-
-        $i = 0;
-        $tree = "";
-        foreach($configArray AS $k => $v) {
-            $i++;
-            $tree .= $this->_printTree($k, $v, 1, count($configArray)==$i);
-        }
-        $resp->appendContent("User Configuration: ".$userConfig->getConfigFilepath(), array("color" => "green"));
-        $resp->appendContent($tree, array("indention" => 2));
-    }
-
-    /**
-     *
-     * @param string $key
-     * @param string $value
-     * @param int $level
-     * @return string
-     */
-    protected function _printTree($key, $value, $level=1, $isLast=false)
-    {
-        $this->_levelCompleted[$level] = false;
-
-        $prefix = "";
-        for ($i = 1; $i < $level; $i++) {
-            if ($this->_levelCompleted[$i] == true) {
-                $prefix .= "    ";
-            } else {
-                $prefix .= "|   ";
-            }
-        }
-        if ($isLast) {
-            $pointer = "`-- ";
-        } else {
-            $pointer = "|-- ";
-        }
-
-        $tree = "";
-        if (is_array($value)) {
-            $tree .= $prefix.$pointer.$key.PHP_EOL;
-
-            if ($isLast == true) {
-                $this->_levelCompleted[$level] = true;
-            }
-
-            $i = 0;
-            foreach ($value as $k => $v) {
-                $i++;
-                $tree .= $this->_printTree($k, $v, $level+1, (count($value)==$i));
-            }
-        } else {
-            $tree .= $prefix.$pointer.$key.": ".trim($value).PHP_EOL;
-        }
-
-        return $tree;
-    }
-
-    /**
-     * @param string $className
-     */
-    public function enableProvider($className)
-    {
-        Zend_Loader::loadClass($className);
-        $reflClass = new ReflectionClass($className);
-        if (!in_array("Zend_Tool_Framework_Provider_Interface", $reflClass->getInterfaceNames())) {
-            require_once "Zend/Tool/Framework/Exception.php";
-            throw new Zend_Tool_Framework_Exception("Given class is not a provider");
-        }
-        $this->_doEnable($className);
-    }
-
-    protected function _doEnable($className)
-    {
-
-        $userConfig = $this->_loadUserConfigIfExists();
-
-        if (!isset($userConfig->basicloader)) {
-            $userConfig->basicloader = array();
-        }
-        if (!isset($userConfig->basicloader->classes)) {
-            $userConfig->basicloader->classes = array();
-        }
-
-        $providerClasses = $userConfig->basicloader->classes->toArray();
-        if (!in_array($className, $providerClasses)) {
-            if (count($providerClasses)) {
-                $pos = max(array_keys($providerClasses))+1;
-            } else {
-                $pos = 0;
-            }
-            $userConfig->basicloader->classes->$pos = $className;
-
-            if ($userConfig->save()) {
-                $this->_registry->getResponse()->appendContent(
-                    "Provider/Manifest '".$className."' was enabled for usage with Zend Tool.",
-                    array("color" => "green", "aligncenter" => true)
-                );
-            } else {
-                require_once "Zend/Tool/Framework/Exception.php";
-                throw new Zend_Tool_Framework_Exception(
-                    "Could not write user configuration to persistence."
-                );
-            }
-        } else {
-            require_once "Zend/Tool/Framework/Exception.php";
-            throw new Zend_Tool_Framework_Exception(
-                "Provider/Manifest '".$className."' is already enabled."
-            );
-        }
-    }
-
-    /**
-     * @param string $className
-     */
-    public function enableManifest($className)
-    {
-        Zend_Loader::loadClass($className);
-        $reflClass = new ReflectionClass($className);
-        if (!in_array("Zend_Tool_Framework_Manifest_Interface", $reflClass->getInterfaceNames())) {
-            require_once "Zend/Tool/Framework/Exception.php";
-            throw new Zend_Tool_Framework_Exception("Given class is not a manifest.");
-        }
-        $this->_doEnable($className);
-    }
-
-    /**
-     * @param string $className
-     */
-    public function disableManifest($className)
-    {
-        $this->disableProvider($className);
-    }
-
-    /**
-     * @param string $className
-     */
-    public function disableProvider($className)
-    {
-        $userConfig = $this->_loadUserConfigIfExists();
-
-        if (!isset($userConfig->basicloader)) {
-            $userConfig->basicloader = array();
-        }
-        if (!isset($userConfig->basicloader->classes)) {
-            $userConfig->basicloader->classes = array();
-        }
-
-        $providerClasses = $userConfig->basicloader->classes->toArray();
-        if (($key = array_search($className, $providerClasses)) !== false) {
-            unset($userConfig->basicloader->classes->$key);
-
-            if ($userConfig->save()) {
-                $this->_registry->getResponse()->appendContent(
-                    "Provider/Manifest '".$className."' was disabled.",
-                    array("color" => "green", "aligncenter" => true)
-                );
-            } else {
-                require_once "Zend/Tool/Framework/Exception.php";
-                throw new Zend_Tool_Framework_Exception(
-                    "Could not write user configuration to persistence."
-                );
-            }
-        } else {
-            require_once "Zend/Tool/Framework/Exception.php";
-            throw new Zend_Tool_Framework_Exception(
-                "Provider/Manifest '".$className."' is not enabled."
-            );
-        }
-    }
-
-    /**
-     * @return Zend_Tool_Framework_Client_Config
-     */
-    protected function _loadUserConfigIfExists()
-    {
-        /* @var $userConfig Zend_Tool_Framework_Client_Config */
-        $userConfig = $this->_registry->getConfig();
-
-        $resp = $this->_registry->getResponse();
-        if (!$userConfig->exists()) {
-            $resp->appendContent("User has no config file.", array("aligncenter" => true, "color" => array('hiWhite', 'bgRed')));
-        }
-
-        return $userConfig;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Manifest.php b/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Manifest.php
deleted file mode 100644
index 28fb88d43..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Manifest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Framework_Registry_EnabledInterface
- */
-require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Interface
- */
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Provider_Manifest
-    implements Zend_Tool_Framework_Provider_Interface, Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-    }
-
-    public function getName()
-    {
-        return 'Manifest';
-    }
-
-    public function show()
-    {
-
-        $manifestRepository = $this->_registry->getManifestRepository();
-        $response           = $this->_registry->getResponse();
-
-        $metadataTree = array();
-
-        $longestAttrNameLen = 50;
-
-        foreach ($manifestRepository as $metadata) {
-
-            $metadataType  = $metadata->getType();
-            $metadataName  = $metadata->getName();
-            $metadataAttrs = $metadata->getAttributes('attributesParent');
-
-            if (!$metadataAttrs) {
-                $metadataAttrs = '(None)';
-            } else {
-                $metadataAttrs = urldecode(http_build_query($metadataAttrs, null, ', '));
-            }
-
-            if (!array_key_exists($metadataType, $metadataTree)) {
-                $metadataTree[$metadataType] = array();
-            }
-
-            if (!array_key_exists($metadataName, $metadataTree[$metadataType])) {
-                $metadataTree[$metadataType][$metadataName] = array();
-            }
-
-            if (!array_key_exists($metadataAttrs, $metadataTree[$metadataType][$metadataName])) {
-                $metadataTree[$metadataType][$metadataName][$metadataAttrs] = array();
-            }
-
-            $longestAttrNameLen = (strlen($metadataAttrs) > $longestAttrNameLen) ? strlen($metadataAttrs) : $longestAttrNameLen;
-
-            $metadataValue = $metadata->getValue();
-            if (is_array($metadataValue) && count($metadataValue) > 0) {
-                $metadataValue = urldecode(http_build_query($metadataValue, null, ', '));
-            } elseif (is_array($metadataValue)) {
-                $metadataValue = '(empty array)';
-            }
-
-            $metadataTree[$metadataType][$metadataName][$metadataAttrs][] = $metadataValue;
-        }
-
-        foreach ($metadataTree as $metadataType => $metadatasByName) {
-            $response->appendContent($metadataType);
-            foreach ($metadatasByName as $metadataName => $metadatasByAttributes) {
-                $response->appendContent("   " . $metadataName);
-                foreach ($metadatasByAttributes as $metadataAttributeName => $metadataValues) {
-                    foreach ($metadataValues as $metadataValue) {
-                        $string = sprintf("      %-{$longestAttrNameLen}.{$longestAttrNameLen}s : ", $metadataAttributeName)
-                            . $metadataValue;
-                        $response->appendContent($string);
-                    }
-                }
-            }
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Phpinfo.php b/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Phpinfo.php
deleted file mode 100644
index 93b295ab9..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Phpinfo.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phpinfo.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Provider_Phpinfo implements Zend_Tool_Framework_Provider_Interface
-{
-
-    public function showAction()
-    {
-        phpinfo();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Version.php b/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Version.php
deleted file mode 100644
index 5c3bfad00..000000000
--- a/airtime_mvc/library/Zend/Tool/Framework/System/Provider/Version.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Version.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Framework/Registry.php';
-require_once 'Zend/Tool/Framework/Provider/Interface.php';
-require_once 'Zend/Version.php';
-
-/**
- * Version Provider
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Framework_System_Provider_Version
-    implements Zend_Tool_Framework_Provider_Interface, Zend_Tool_Framework_Registry_EnabledInterface
-{
-
-    /**
-     * @var Zend_Tool_Framework_Registry_Interface
-     */
-    protected $_registry = null;
-
-    const MODE_MAJOR = 'major';
-    const MODE_MINOR = 'minor';
-    const MODE_MINI  = 'mini';
-
-    protected $_specialties = array('MajorPart', 'MinorPart', 'MiniPart');
-
-    public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * Show Action
-     *
-     * @param string $mode The mode switch can be one of: major, minor, or mini (default)
-     * @param bool $nameincluded
-     */
-    public function show($mode = self::MODE_MINI, $nameIncluded = true)
-    {
-
-        $versionInfo = $this->_splitVersion();
-
-        switch($mode) {
-            case self::MODE_MINOR:
-                unset($versionInfo['mini']);
-                break;
-            case self::MODE_MAJOR:
-                unset($versionInfo['mini'], $versionInfo['minor']);
-                break;
-        }
-
-        $output = implode('.', $versionInfo);
-
-        if ($nameIncluded) {
-            $output = 'Zend Framework Version: ' . $output;
-        }
-
-        $this->_registry->response->appendContent($output);
-    }
-
-    public function showMajorPart($nameIncluded = true)
-    {
-        $versionNumbers = $this->_splitVersion();
-        $output = (($nameIncluded == true) ? 'ZF Major Version: ' : null) . $versionNumbers['major'];
-        $this->_registry->response->appendContent($output);
-    }
-
-    public function showMinorPart($nameIncluded = true)
-    {
-        $versionNumbers = $this->_splitVersion();
-        $output = (($nameIncluded == true) ? 'ZF Minor Version: ' : null) . $versionNumbers['minor'];
-        $this->_registry->response->appendContent($output);
-    }
-
-    public function showMiniPart($nameIncluded = true)
-    {
-        $versionNumbers = $this->_splitVersion();
-        $output = (($nameIncluded == true) ? 'ZF Mini Version: ' : null)  . $versionNumbers['mini'];
-        $this->_registry->response->appendContent($output);
-    }
-
-    protected function _splitVersion()
-    {
-        list($major, $minor, $mini) = explode('.', Zend_Version::VERSION);
-        return array('major' => $major, 'minor' => $minor, 'mini' => $mini);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine.php b/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine.php
deleted file mode 100644
index cfd2c26b9..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Engine.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Content_Engine_CodeGenerator
- */
-require_once 'Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php';
-
-/**
- * @see Zend_Tool_Project_Context_Content_Engine_Phtml
- */
-require_once 'Zend/Tool/Project/Context/Content/Engine/Phtml.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Content_Engine
-{
-    /**
-     * @var Zend_Tool_Framework_Client_Storage
-     */
-    protected $_storage = null;
-
-    /**
-     * @var string
-     */
-    protected $_keyInStorage = 'project/content';
-
-    /**
-     * @var array
-     */
-    protected $_engines = array();
-
-    /**
-     * __construct()
-     *
-     * @param Zend_Tool_Framework_Client_Storage $storage
-     */
-    public function __construct(Zend_Tool_Framework_Client_Storage $storage)
-    {
-        $this->_storage = $storage;
-        $this->_engines = array(
-            new Zend_Tool_Project_Context_Content_Engine_CodeGenerator($storage, $this->_keyInStorage),
-            new Zend_Tool_Project_Context_Content_Engine_Phtml($storage, $this->_keyInStorage),
-            );
-    }
-
-    /**
-     * getContent()
-     *
-     * @param Zend_Tool_Project_Context_Interface $context
-     * @param string $methodName
-     * @param mixed $parameters
-     * @return string
-     */
-    public function getContent(Zend_Tool_Project_Context_Interface $context, $methodName, $parameters)
-    {
-        $content = null;
-
-        foreach ($this->_engines as $engine) {
-            if ($engine->hasContent($context, $methodName, $parameters)) {
-                $content = $engine->getContent($context, $methodName, $parameters);
-
-                if ($content != null) {
-                    break;
-                }
-
-            }
-
-        }
-
-        if ($content == null) {
-            return false;
-        }
-
-        return $content;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php b/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
deleted file mode 100644
index 96e9eedc8..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CodeGenerator.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Content_Engine_CodeGenerator
-{
-    /**
-     * @var Zend_Tool_Framework_Client_Storage
-     */
-    protected $_storage = null;
-
-    /**
-     * @var string
-     */
-    protected $_contentPrefix = null;
-
-    /**
-     * __construct()
-     *
-     * @param Zend_Tool_Framework_Client_Storage $storage
-     * @param string $contentPrefix
-     */
-    public function __construct(Zend_Tool_Framework_Client_Storage $storage, $contentPrefix)
-    {
-        $this->_storage       = $storage;
-        $this->_contentPrefix = $contentPrefix;
-    }
-
-    /**
-     * hasContent()
-     *
-     * @param Zend_Tool_Project_Context_Interface $context
-     * @param string $method
-     * @return string
-     */
-    public function hasContent(Zend_Tool_Project_Context_Interface $context, $method)
-    {
-        return $this->_storage->has($this->_contentPrefix . '/' . $context->getName() . '/' . $method . '.php');
-    }
-
-    /**
-     * getContent()
-     *
-     * @param Zend_Tool_Project_Context_Interface $context
-     * @param string $method
-     * @param mixed $parameters
-     * @return string
-     */
-    public function getContent(Zend_Tool_Project_Context_Interface $context, $method, $parameters)
-    {
-        $streamUri = $this->_storage->getStreamUri($this->_contentPrefix . '/' . $context->getName() . '/' . $method . '.php');
-
-        if (method_exists($context, 'getCodeGenerator')) {
-            $codeGenerator = $context->getCodeGenerator();
-        } else {
-            $codeGenerator = new Zend_CodeGenerator_Php_File();
-        }
-
-        $codeGenerator = include $streamUri;
-
-        if (!$codeGenerator instanceof Zend_CodeGenerator_Abstract) {
-            throw new Zend_Tool_Project_Exception('Custom file at ' . $streamUri . ' did not return the $codeGenerator object.');
-        }
-
-        return $codeGenerator->generate();
-    }
-
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php b/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php
deleted file mode 100644
index 75ee9bc76..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Phtml.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Content_Engine_Phtml
-{
-
-    /**
-     * @var Zend_Tool_Framework_Client_Storage
-     */
-    protected $_storage = null;
-
-    /**
-     * @var string
-     */
-    protected $_contentPrefix = null;
-
-    /**
-     * __construct()
-     *
-     * @param Zend_Tool_Framework_Client_Storage $storage
-     * @param string $contentPrefix
-     */
-    public function __construct(Zend_Tool_Framework_Client_Storage $storage, $contentPrefix)
-    {
-        $this->_storage = $storage;
-        $this->_contentPrefix = $contentPrefix;
-    }
-
-    /**
-     * hasContext()
-     *
-     * @param Zend_Tool_Project_Context_Interface  $context
-     * @param string $method
-     * @return string
-     */
-    public function hasContent(Zend_Tool_Project_Context_Interface $context, $method)
-    {
-        return $this->_storage->has($this->_contentPrefix . '/' . $context . '/' . $method . '.phtml');
-    }
-
-    /**
-     * getContent()
-     *
-     * @param Zend_Tool_Project_Context_Interface $context
-     * @param string $method
-     * @param mixed $parameters
-     */
-    public function getContent(Zend_Tool_Project_Context_Interface $context, $method, $parameters)
-    {
-        $streamUri = $this->_storage->getStreamUri($this->_contentPrefix . '/' . $context->getName() . '/' . $method . '.phtml');
-
-        ob_start();
-        include $streamUri;
-        $content = ob_get_clean();
-
-        return $content;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Exception.php b/airtime_mvc/library/Zend/Tool/Project/Context/Exception.php
deleted file mode 100644
index 177a1eed4..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Project/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Exception extends Zend_Tool_Project_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Abstract.php b/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Abstract.php
deleted file mode 100644
index aa280a745..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Abstract.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Interface
- */
-require_once 'Zend/Tool/Project/Context/Interface.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Project_Context_Filesystem_Abstract implements Zend_Tool_Project_Context_Interface
-{
-
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_resource = null;
-
-    /**
-     * @var string
-     */
-    protected $_baseDirectory = null;
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = null;
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_Abstract
-     */
-    public function init()
-    {
-        $parentBaseDirectory = $this->_resource->getParentResource()->getContext()->getPath();
-        $this->_baseDirectory = $parentBaseDirectory;
-        return $this;
-    }
-
-    /**
-     * setResource()
-     *
-     * @param Zend_Tool_Project_Profile_Resource $resource
-     * @return Zend_Tool_Project_Context_Filesystem_Abstract
-     */
-    public function setResource(Zend_Tool_Project_Profile_Resource $resource)
-    {
-        $this->_resource = $resource;
-        return $this;
-    }
-
-    /**
-     * setBaseDirectory()
-     *
-     * @param string $baseDirectory
-     * @return Zend_Tool_Project_Context_Filesystem_Abstract
-     */
-    public function setBaseDirectory($baseDirectory)
-    {
-        $this->_baseDirectory = rtrim(str_replace('\\', '/', $baseDirectory), '/');
-        return $this;
-    }
-
-    /**
-     * getBaseDirectory()
-     *
-     * @return string
-     */
-    public function getBaseDirectory()
-    {
-        return $this->_baseDirectory;
-    }
-
-    /**
-     * setFilesystemName()
-     *
-     * @param string $filesystemName
-     * @return Zend_Tool_Project_Context_Filesystem_Abstract
-     */
-    public function setFilesystemName($filesystemName)
-    {
-        $this->_filesystemName = $filesystemName;
-        return $this;
-    }
-
-    /**
-     * getFilesystemName()
-     *
-     * @return string
-     */
-    public function getFilesystemName()
-    {
-        return $this->_filesystemName;
-    }
-
-    /**
-     * getPath()
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        $path = $this->_baseDirectory;
-        if ($this->_filesystemName) {
-            $path .= '/' . $this->_filesystemName;
-        }
-        return $path;
-    }
-
-    /**
-     * exists()
-     *
-     * @return bool
-     */
-    public function exists()
-    {
-        return file_exists($this->getPath());
-    }
-
-    /**
-     * create()
-     *
-     * Create this resource/context
-     *
-     */
-    abstract public function create();
-
-    /**
-     * delete()
-     *
-     * Delete this resouce/context
-     *
-     */
-    abstract public function delete();
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Directory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Directory.php
deleted file mode 100644
index 3137566e7..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/Directory.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Abstract
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Abstract.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Filesystem_Directory extends Zend_Tool_Project_Context_Filesystem_Abstract
-{
-
-    /**
-     * getName()
-     * 
-     * @return string
-     */
-    public function getName()
-    {
-        return 'directory';
-    }
-    
-    /**
-     * create()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_Directory;
-     */
-    public function create()
-    {
-        // check to ensure the parent exists, if not, call it and create it
-        if (($parentResource = $this->_resource->getParentResource()) instanceof Zend_Tool_Project_Profile_Resource) {
-            if ((($parentContext = $parentResource->getContext()) instanceof Zend_Tool_Project_Context_Filesystem_Abstract)
-                && (!$parentContext->exists())) {
-                $parentResource->create();
-            }
-        }
-
-        if (!file_exists($this->getPath())) {
-            mkdir($this->getPath());
-        }
-
-        return $this;
-    }
-
-    /**
-     * delete()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_Directory
-     */
-    public function delete()
-    {
-        $this->_resource->setDeleted(true);
-        rmdir($this->getPath());
-
-        return $this;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/File.php b/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/File.php
deleted file mode 100644
index 7006bee0b..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Filesystem/File.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: File.php 20971 2010-02-07 18:22:38Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Abstract
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Abstract.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Filesystem_File extends Zend_Tool_Project_Context_Filesystem_Abstract
-{
-
-    protected $_fileOnlyContext = null;
-    
-    protected $_filesystemName = null;
-    
-    protected $_content = null;
-    
-    /**
-     * getName()
-     * 
-     * @return string
-     */
-    public function getName()
-    {
-        return 'file';
-    }
-    
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_File
-     */
-    public function init()
-    {
-        if ($this->_resource->hasAttribute('filesystemName')) {
-            $this->_filesystemName = $this->_resource->getAttribute('filesystemName');
-        }
-        
-        // check to see if this file is 
-        if ($this->getName() == 'file') {
-            $this->_initFileOnlyContext();
-        }
-        
-        // @potential-todo check to ensure that this 'file' resource has no children
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        $returnAttrs = array();
-        if ($this->_filesystemName !== null) {
-            $returnAttrs['filesystemName'] = $this->_filesystemName;
-        }
-        return $returnAttrs;
-    }
-    
-    /**
-     * setResource()
-     *
-     * @param unknown_type $resource
-     */
-    public function setResource(Zend_Tool_Project_Profile_Resource $resource)
-    {
-        $this->_resource = $resource;
-        $this->_resource->setAppendable(false);
-        return $this;
-    }
-    
-    /**
-     * getResource()
-     * 
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function getResource()
-    {
-        return $this->_resource;
-    }
-
-    /**
-     * create()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_File
-     */
-    public function create()
-    {
-        // check to ensure the parent exists, if not, call it and create it
-        if (($parentResource = $this->_resource->getParentResource()) instanceof Zend_Tool_Project_Profile_Resource) {
-            if ((($parentContext = $parentResource->getContext()) instanceof Zend_Tool_Project_Context_Filesystem_Abstract)
-                && (!$parentContext->exists())) {
-                $parentResource->create();
-            }
-        }
-
-
-        if (file_exists($this->getPath())) {
-            // @todo propt user to determine if its ok to overwrite file
-        }
-
-        file_put_contents($this->getPath(), $this->getContents());
-        return $this;
-    }
-
-    /**
-     * delete()
-     *
-     * @return Zend_Tool_Project_Context_Filesystem_File
-     */
-    public function delete()
-    {
-        unlink($this->getPath());
-        $this->_resource->setDeleted(true);
-        return $this;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return null
-     */
-    public function getContents()
-    {
-        return $this->_content;
-    }
-
-    protected function _initFileOnlyContext()
-    {
-        if ($this->_resource->hasAttribute('defaultContentCallback')) {
-            $contentFunc = $this->_resource->getAttribute('defaultContentCallback');
-            if (is_callable($contentFunc)) {
-                $this->_content = call_user_func_array($contentFunc, array($this));
-            }
-        }
-        if ($this->_filesystemName == null) {
-            $this->_filesystemName = 'file.txt';
-        }
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Interface.php b/airtime_mvc/library/Zend/Tool/Project/Context/Interface.php
deleted file mode 100644
index 13363fecb..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Interface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for contexts
- *
- * setResource() is an optional method that if the context supports
- * will be set with the resource at construction time
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Project_Context_Interface
-{
-
-    public function getName();
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Repository.php b/airtime_mvc/library/Zend/Tool/Project/Context/Repository.php
deleted file mode 100644
index 721d38866..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Repository.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-require_once 'Zend/Tool/Project/Context/System/Interface.php';
-require_once 'Zend/Tool/Project/Context/System/TopLevelRestrictable.php';
-require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Repository implements Countable
-{
-
-    protected static $_instance = null;
-    protected static $_isInitialized = false;
-
-    protected $_shortContextNames = array();
-    protected $_contexts          = array();
-
-    /**
-     * Enter description here...
-     *
-     * @return Zend_Tool_Project_Context_Repository
-     */
-    public static function getInstance()
-    {
-        if (self::$_instance == null) {
-            self::$_instance = new self();
-        }
-
-        return self::$_instance;
-    }
-
-    public static function resetInstance()
-    {
-        self::$_instance = null;
-        self::$_isInitialized = false;
-    }
-
-    protected function __construct()
-    {
-        if (self::$_isInitialized == false) {
-            $this->addContextClass('Zend_Tool_Project_Context_System_ProjectDirectory')
-                 ->addContextClass('Zend_Tool_Project_Context_System_ProjectProfileFile')
-                 ->addContextClass('Zend_Tool_Project_Context_System_ProjectProvidersDirectory');
-            self::$_isInitialized = true;
-        }
-    }
-
-    public function addContextsFromDirectory($directory, $prefix)
-    {
-        $prefix = trim($prefix, '_') . '_';
-        foreach (new DirectoryIterator($directory) as $directoryItem) {
-            if ($directoryItem->isDot() || (substr($directoryItem->getFilename(), -4) !== '.php')) {
-                continue;
-            }
-            $class = $prefix . substr($directoryItem->getFilename(), 0, -4);
-            $this->addContextClass($class);
-        }
-    }
-
-
-    public function addContextClass($contextClass)
-    {
-        if (!class_exists($contextClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($contextClass);
-        }
-        $reflectionContextClass = new ReflectionClass($contextClass);
-        if ($reflectionContextClass->isInstantiable()) {
-            $context = new $contextClass();
-            return $this->addContext($context);
-        }
-        return $this;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param Zend_Tool_Project_Context_Interface $context
-     * @return Zend_Tool_Project_Context_Repository
-     */
-    public function addContext(Zend_Tool_Project_Context_Interface $context)
-    {
-        $isSystem       = ($context instanceof Zend_Tool_Project_Context_System_Interface);
-        $isTopLevel     = ($context instanceof Zend_Tool_Project_Context_System_TopLevelRestrictable);
-        $isOverwritable = !($context instanceof Zend_Tool_Project_Context_System_NotOverwritable);
-
-        $index = (count($this->_contexts)) ? max(array_keys($this->_contexts)) + 1 : 1;
-
-        $normalName = $this->_normalizeName($context->getName());
-
-        if (isset($this->_shortContextNames[$normalName]) && ($this->_contexts[$this->_shortContextNames[$normalName]]['isOverwritable'] === false) ) {
-            require_once 'Zend/Tool/Project/Context/Exception.php';
-            throw new Zend_Tool_Project_Context_Exception('Context ' . $context->getName() . ' is not overwriteable.');
-        }
-
-        $this->_shortContextNames[$normalName] = $index;
-        $this->_contexts[$index] = array(
-            'isTopLevel'     => $isTopLevel,
-            'isSystem'       => $isSystem,
-            'isOverwritable' => $isOverwritable,
-            'normalName'     => $normalName,
-            'context'        => $context
-            );
-
-        return $this;
-    }
-
-    public function getContext($name)
-    {
-        if (!$this->hasContext($name)) {
-            require_once 'Zend/Tool/Project/Context/Exception.php';
-            throw new Zend_Tool_Project_Context_Exception('Context by name ' . $name . ' does not exist in the registry.');
-        }
-
-        $name = $this->_normalizeName($name);
-        return clone $this->_contexts[$this->_shortContextNames[$name]]['context'];
-    }
-
-    public function hasContext($name)
-    {
-        $name = $this->_normalizeName($name);
-        return (isset($this->_shortContextNames[$name]) ? true : false);
-    }
-
-    public function isSystemContext($name)
-    {
-        if (!$this->hasContext($name)) {
-            return false;
-        }
-
-        $name = $this->_normalizeName($name);
-        $index = $this->_shortContextNames[$name];
-        return $this->_contexts[$index]['isSystemContext'];
-    }
-
-    public function isTopLevelContext($name)
-    {
-        if (!$this->hasContext($name)) {
-            return false;
-        }
-        $name = $this->_normalizeName($name);
-        $index = $this->_shortContextNames[$name];
-        return $this->_contexts[$index]['isTopLevel'];
-    }
-
-    public function isOverwritableContext($name)
-    {
-        if (!$this->hasContext($name)) {
-            return false;
-        }
-        $name = $this->_normalizeName($name);
-        $index = $this->_shortContextNames[$name];
-        return $this->_contexts[$index]['isOverwritable'];
-    }
-
-    public function count()
-    {
-        return count($this->_contexts);
-    }
-
-    protected function _normalizeName($name)
-    {
-        return strtolower($name);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/Interface.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/Interface.php
deleted file mode 100644
index 1395e9b70..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/Interface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Project_Context_System_Interface
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/NotOverwritable.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/NotOverwritable.php
deleted file mode 100644
index 0387e2e46..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/NotOverwritable.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NotOverwritable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Project_Context_System_NotOverwritable
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectDirectory.php
deleted file mode 100644
index 42d072459..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectDirectory.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProjectDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_Interface
- */
-require_once 'Zend/Tool/Project/Context/System/Interface.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_TopLevelRestrictable
- */
-require_once 'Zend/Tool/Project/Context/System/TopLevelRestrictable.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_NotOverwritable
- */
-require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_System_ProjectDirectory
-    extends Zend_Tool_Project_Context_Filesystem_Directory
-    implements Zend_Tool_Project_Context_System_Interface,
-               Zend_Tool_Project_Context_System_NotOverwritable,
-               Zend_Tool_Project_Context_System_TopLevelRestrictable
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = null;
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ProjectDirectory';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_System_ProjectDirectory
-     */
-    public function init()
-    {
-        // get base path from attributes (would be in path attribute)
-        $projectDirectory = $this->_resource->getAttribute('path');
-
-        // if not, get from profile
-        if ($projectDirectory == null) {
-            $projectDirectory = $this->_resource->getProfile()->getAttribute('projectDirectory');
-        }
-
-        // if not, exception.
-        if ($projectDirectory == null) {
-            require_once 'Zend/Tool/Project/Exception.php';
-            throw new Zend_Tool_Project_Exception('projectDirectory cannot find the directory for this project.');
-        }
-
-        $this->_baseDirectory = rtrim($projectDirectory, '\\/');
-        return $this;
-    }
-
-    /**
-     * create()
-     *
-     * @return Zend_Tool_Project_Context_System_ProjectDirectory
-     */
-    public function create()
-    {
-        if (file_exists($this->getPath())) {
-            /*
-            foreach (new DirectoryIterator($this->getPath()) as $item) {
-                if (!$item->isDot()) {
-                    if ($registry->getClient()->isInteractive()) {
-                        // @todo prompt for override
-                    } else {
-                        require_once 'Zend/Tool/Project/Context/Exception.php';
-                        throw new Zend_Tool_Project_Context_Exception('This directory is not empty, project creation aborted.');
-                    }
-                    break;
-                }
-            }
-            */
-        }
-
-        parent::create();
-        return $this;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php
deleted file mode 100644
index a2efa8cf4..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProjectProfileFile.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_Interface
- */
-require_once 'Zend/Tool/Project/Context/System/Interface.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_NotOverwritable
- */
-require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php';
-
-/**
- * @see Zend_Tool_Project_Profile_FileParser_Xml
- */
-require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_System_ProjectProfileFile
-    extends Zend_Tool_Project_Context_Filesystem_File
-    implements Zend_Tool_Project_Context_System_Interface,
-               Zend_Tool_Project_Context_System_NotOverwritable
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = '.zfproject.xml';
-
-    /**
-     * @var Zend_Tool_Project_Profile
-     */
-    protected $_profile = null;
-    
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ProjectProfileFile';
-    }
-    
-    /**
-     * setProfile()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @return Zend_Tool_Project_Context_System_ProjectProfileFile
-     */
-    public function setProfile($profile)
-    {
-        $this->_profile = $profile;
-        return $this;
-    }
-
-    /**
-     * save()
-     *
-     * Proxy to create
-     *
-     * @return Zend_Tool_Project_Context_System_ProjectProfileFile
-     */
-    public function save()
-    {
-        parent::create();
-        return $this;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $parser = new Zend_Tool_Project_Profile_FileParser_Xml();
-        $profile = $this->_resource->getProfile();
-        $xml = $parser->serialize($profile);
-        return $xml;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
deleted file mode 100644
index cf8dd2e11..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProjectProvidersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_Interface
- */
-require_once 'Zend/Tool/Project/Context/System/Interface.php';
-
-/**
- * @see Zend_Tool_Project_Context_System_NotOverwritable
- */
-require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_System_ProjectProvidersDirectory
-    extends Zend_Tool_Project_Context_Filesystem_Directory
-    implements Zend_Tool_Project_Context_System_Interface,
-               Zend_Tool_Project_Context_System_NotOverwritable
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'providers';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ProjectProvidersDirectory';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_System_ProjectProvidersDirectory
-     */
-    public function init()
-    {
-        parent::init();
-
-        if (file_exists($this->getPath())) {
-
-            foreach (new DirectoryIterator($this->getPath()) as $item) {
-                if ($item->isFile()) {
-                    $loadableFiles[] = $item->getPathname();
-                }
-            }
-
-            if ($loadableFiles) {
-
-                // @todo process and add the files to the system for usage.
-
-            }
-        }
-
-        return $this;
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php b/airtime_mvc/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php
deleted file mode 100644
index 041444b2e..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TopLevelRestrictable.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Project_Context_System_TopLevelRestrictable
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php
deleted file mode 100644
index 54dea4aca..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BootstrapFile.php 19643 2009-12-14 14:57:07Z ralph $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Project_Context_Zf_AbstractClassFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-    
-    /**
-     * getFullClassName()
-     * 
-     * @param $localClassName
-     * @param $classContextName
-     */
-    public function getFullClassName($localClassName, $classContextName = null)
-    {
-
-        // find the ApplicationDirectory OR ModuleDirectory
-        $currentResource = $this->_resource;
-        do {
-            $resourceName = $currentResource->getName();
-            if ($resourceName == 'ApplicationDirectory' || $resourceName == 'ModuleDirectory') {
-                $containingResource = $currentResource;
-                break;
-            }
-        } while ($currentResource instanceof Zend_Tool_Project_Profile_Resource
-            && $currentResource = $currentResource->getParentResource());
-        
-        $fullClassName = '';
-
-        // go find the proper prefix
-        if (isset($containingResource)) {
-            if ($containingResource->getName() == 'ApplicationDirectory') {
-                $prefix = $containingResource->getAttribute('classNamePrefix');
-                $fullClassName = $prefix;
-            } elseif ($containingResource->getName() == 'ModuleDirectory') {
-                $prefix = $containingResource->getAttribute('moduleName') . '_';
-                $fullClassName = $prefix;    
-            }
-        }
-
-        if ($classContextName) {
-            $fullClassName .= rtrim($classContextName, '_') . '_';
-        }
-        $fullClassName .= $localClassName;
-
-        return $fullClassName;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ActionMethod.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ActionMethod.php
deleted file mode 100644
index 35b19d0c9..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ActionMethod.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ActionMethod.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Interface
- */
-require_once 'Zend/Tool/Project/Context/Interface.php';
-
-/**
- * @see Zend_Reflection_File
- */
-require_once 'Zend/Reflection/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Context_Interface
-{
-
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_resource = null;
-
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_controllerResource = null;
-
-    /**
-     * @var string
-     */
-    protected $_controllerPath = '';
-
-    /**
-     * @var string
-     */
-    protected $_actionName = null;
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ActionMethod
-     */
-    public function init()
-    {
-        $this->_actionName = $this->_resource->getAttribute('actionName');
-
-        $this->_resource->setAppendable(false);
-        $this->_controllerResource = $this->_resource->getParentResource();
-        if (!$this->_controllerResource->getContext() instanceof Zend_Tool_Project_Context_Zf_ControllerFile) {
-            require_once 'Zend/Tool/Project/Context/Exception.php';
-            throw new Zend_Tool_Project_Context_Exception('ActionMethod must be a sub resource of a ControllerFile');
-        }
-        // make the ControllerFile node appendable so we can tack on the actionMethod.
-        $this->_resource->getParentResource()->setAppendable(true);
-
-        $this->_controllerPath = $this->_controllerResource->getContext()->getPath();
-
-        /*
-         * This code block is now commented, its doing to much for init()
-         *
-        if ($this->_controllerPath != '' && self::hasActionMethod($this->_controllerPath, $this->_actionName)) {
-            require_once 'Zend/Tool/Project/Context/Exception.php';
-            throw new Zend_Tool_Project_Context_Exception('An action named ' . $this->_actionName . 'Action already exists in this controller');
-        }
-        */
-
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'actionName' => $this->getActionName()
-            );
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ActionMethod';
-    }
-
-    /**
-     * setResource()
-     *
-     * @param Zend_Tool_Project_Profile_Resource $resource
-     * @return Zend_Tool_Project_Context_Zf_ActionMethod
-     */
-    public function setResource(Zend_Tool_Project_Profile_Resource $resource)
-    {
-        $this->_resource = $resource;
-        return $this;
-    }
-
-    /**
-     * setActionName()
-     *
-     * @param string $actionName
-     * @return Zend_Tool_Project_Context_Zf_ActionMethod
-     */
-    public function setActionName($actionName)
-    {
-        $this->_actionName = $actionName;
-        return $this;
-    }
-
-    /**
-     * getActionName()
-     *
-     * @return string
-     */
-    public function getActionName()
-    {
-        return $this->_actionName;
-    }
-
-    /**
-     * create()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ActionMethod
-     */
-    public function create()
-    {
-        if (self::createActionMethod($this->_controllerPath, $this->_actionName) === false) {
-            require_once 'Zend/Tool/Project/Context/Exception.php';
-            throw new Zend_Tool_Project_Context_Exception(
-                'Could not create action within controller ' . $this->_controllerPath
-                . ' with action name ' . $this->_actionName
-                );
-        }
-        return $this;
-    }
-
-    /**
-     * delete()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ActionMethod
-     */
-    public function delete()
-    {
-        // @todo do this
-        return $this;
-    }
-
-    /**
-     * createAcionMethod()
-     *
-     * @param string $controllerPath
-     * @param string $actionName
-     * @param string $body
-     * @return true
-     */
-    public static function createActionMethod($controllerPath, $actionName, $body = '        // action body')
-    {
-        if (!file_exists($controllerPath)) {
-            return false;
-        }
-
-        $controllerCodeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($controllerPath, true, true);
-        $controllerCodeGenFile->getClass()->setMethod(array(
-            'name' => $actionName . 'Action',
-            'body' => $body
-            ));
-
-        file_put_contents($controllerPath, $controllerCodeGenFile->generate());
-        return true;
-    }
-
-    /**
-     * hasActionMethod()
-     *
-     * @param string $controllerPath
-     * @param string $actionName
-     * @return bool
-     */
-    public static function hasActionMethod($controllerPath, $actionName)
-    {
-        if (!file_exists($controllerPath)) {
-            return false;
-        }
-
-        $controllerCodeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($controllerPath, true, true);
-        return $controllerCodeGenFile->getClass()->hasMethod($actionName . 'Action');
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php
deleted file mode 100644
index 751967576..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ApisDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ApisDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'apis';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ApisDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php
deleted file mode 100644
index f46406103..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ApplicationConfigFile.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ApplicationConfigFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'application.ini';
-
-    /**
-     * @var string
-     */
-    protected $_content = null;
-    
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ApplicationConfigFile';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ApplicationConfigFile
-     */
-    public function init()
-    {
-        $this->_type = $this->_resource->getAttribute('type');
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array('type' => $this->_type);
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        if ($this->_content === null) {
-            if (file_exists($this->getPath())) {
-                $this->_content = file_get_contents($this->getPath());
-            } else {
-                $this->_content = $this->_getDefaultContents();
-            }
-            
-        }
-        
-        return $this->_content;
-    }
-
-    public function getAsZendConfig($section = 'production')
-    {
-        return new Zend_Config_Ini($this->getPath(), $section);
-    }
-    
-    /**
-     * addStringItem()
-     * 
-     * @param string $key 
-     * @param string $value
-     * @param string $section
-     * @param bool   $quoteValue
-     * @return Zend_Tool_Project_Context_Zf_ApplicationConfigFile
-     */
-    public function addStringItem($key, $value, $section = 'production', $quoteValue = true)
-    {
-        // null quote value means to auto-detect
-        if ($quoteValue === null) {
-            $quoteValue = preg_match('#[\"\']#', $value) ? false : true;
-        }
-        
-        if ($quoteValue == true) {
-            $value = '"' . $value . '"';
-        }
-        
-        $contentLines = preg_split('#[\n\r]#', $this->getContents());
-        
-        $newLines = array();
-        $insideSection = false;
-        
-        foreach ($contentLines as $contentLineIndex => $contentLine) {
-            
-            if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) {
-                $insideSection = true;
-            }
-            
-            if ($insideSection) {
-                // if its blank, or a section heading
-                if ((trim($contentLine) == null) || (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[')) {
-                    $newLines[] = $key . ' = ' . $value;
-                    $insideSection = null;
-                }
-            }
-            
-            $newLines[] = $contentLine;
-        }
-
-        $this->_content = implode("\n", $newLines);
-        return $this;
-    }
-    
-    /**
-     * 
-     * @param array $item
-     * @param string $section
-     * @param bool $quoteValue
-     * @return Zend_Tool_Project_Context_Zf_ApplicationConfigFile
-     */
-    public function addItem($item, $section = 'production', $quoteValue = true)
-    {
-        $stringItems = array();
-        $stringValues = array();
-        $configKeyNames = array();
-        
-        $rii = new RecursiveIteratorIterator(
-            new RecursiveArrayIterator($item),
-            RecursiveIteratorIterator::SELF_FIRST
-            );
-        
-        $lastDepth = 0;
-        
-        // loop through array structure recursively to create proper keys
-        foreach ($rii as $name => $value) {
-            $lastDepth = $rii->getDepth();
-            
-            if (is_array($value)) {
-                array_push($configKeyNames, $name);
-            } else {
-                $stringItems[] = implode('.', $configKeyNames) . '.' . $name;
-                $stringValues[] = $value;
-            }
-        }
-        
-        foreach ($stringItems as $stringItemIndex => $stringItem) {
-            $this->addStringItem($stringItem, $stringValues[$stringItemIndex], $section, $quoteValue);
-        }
-        
-        return $this;
-    }
-    
-    public function removeStringItem($key, $section = 'production')
-    {
-        $contentLines = file($this->getPath());
-        
-        $newLines = array();
-        $insideSection = false;
-        
-        foreach ($contentLines as $contentLineIndex => $contentLine) {
-            
-            if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) {
-                $insideSection = true;
-            }
-            
-            if ($insideSection) {
-                // if its blank, or a section heading
-                if ((trim($contentLine) == null) || ($contentLines[$contentLineIndex + 1][0] == '[')) {
-                    $insideSection = null;
-                }
-            }
-            
-            if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) { 
-                $newLines[] = $contentLine;
-            }
-        }
-
-        $this->_content = implode('', $newLines);
-    }
-    
-    public function removeItem($item, $section = 'production')
-    {
-        $stringItems = array();
-        $stringValues = array();
-        $configKeyNames = array();
-        
-        $rii = new RecursiveIteratorIterator(
-            new RecursiveArrayIterator($item),
-            RecursiveIteratorIterator::SELF_FIRST
-            );
-        
-        $lastDepth = 0;
-        
-        // loop through array structure recursively to create proper keys
-        foreach ($rii as $name => $value) {
-            $lastDepth = $rii->getDepth();
-            
-            if (is_array($value)) {
-                array_push($configKeyNames, $name);
-            } else {
-                $stringItems[] = implode('.', $configKeyNames) . '.' . $name;
-                $stringValues[] = $value;
-            }
-        }
-        
-        foreach ($stringItems as $stringItemIndex => $stringItem) {
-            $this->removeStringItem($stringItem, $section);
-        }
-        
-        return $this;
-    }
-    
-    protected function _getDefaultContents()
-    {
-
-        $contents =<<<EOS
-[production]
-phpSettings.display_startup_errors = 0
-phpSettings.display_errors = 0
-includePaths.library = APPLICATION_PATH "/../library"
-bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
-bootstrap.class = "Bootstrap"
-appnamespace = "Application"
-resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
-resources.frontController.params.displayExceptions = 0
-
-[staging : production]
-
-[testing : production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-
-[development : production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-resources.frontController.params.displayExceptions = 1
-
-EOS;
-
-        return $contents;
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php
deleted file mode 100644
index 9d5c38241..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ApplicationDirectory.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    protected $_filesystemName = 'application';
-
-    protected $_classNamePrefix = 'Application_';
-    
-    public function init()
-    {
-        if ($this->_resource->hasAttribute('classNamePrefix')) {
-            $this->_classNamePrefix = $this->_resource->getAttribute('classNamePrefix');
-        }
-        parent::init();
-    }
-    
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'classNamePrefix' => $this->getClassNamePrefix()
-            );
-    }
-    
-    public function getName()
-    {
-        return 'ApplicationDirectory';
-    }
-    
-    public function setClassNamePrefix($classNamePrefix)
-    {
-        $this->_classNamePrefix = $classNamePrefix;
-    }
-    
-    public function getClassNamePrefix()
-    {
-        return $this->_classNamePrefix;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php
deleted file mode 100644
index 61a53e25e..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: BootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_BootstrapFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'Bootstrap.php';
-
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_applicationConfigFile = null;
-    
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_applicationDirectory = null;
-    
-    /**
-     * @var Zend_Application
-     */
-    protected $_applicationInstance = null;
-
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'BootstrapFile';
-    }
-
-    public function init()
-    {
-        parent::init();
-
-        $this->_applicationConfigFile = $this->_resource->getProfile()->search('ApplicationConfigFile');
-        $this->_applicationDirectory = $this->_resource->getProfile()->search('ApplicationDirectory');
-
-        if (($this->_applicationConfigFile === false) || ($this->_applicationDirectory === false)) {
-            throw new Exception('To use the BootstrapFile context, your project requires the use of both the "ApplicationConfigFile" and "ApplicationDirectory" contexts.');
-        }
-
-
-    }
-
-    /**
-     * getContents()
-     *
-     * @return array
-     */
-    public function getContents()
-    {
-
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => 'Bootstrap',
-                    'extendedClass' => 'Zend_Application_Bootstrap_Bootstrap',
-                    )),
-                )
-            ));
-
-        return $codeGenFile->generate();
-    }
-    
-    public function getApplicationInstance()
-    {
-        if ($this->_applicationInstance == null) {
-            if ($this->_applicationConfigFile->getContext()->exists()) {
-                define('APPLICATION_PATH', $this->_applicationDirectory->getPath());
-                $applicationOptions = array();
-                $applicationOptions['config'] = $this->_applicationConfigFile->getPath();
-    
-                $this->_applicationInstance = new Zend_Application(
-                    'development',
-                    $applicationOptions
-                    );
-            }
-        }
-        
-        return $this->_applicationInstance;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php
deleted file mode 100644
index 5a713e38a..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CacheDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_CacheDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'cache';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'CacheDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigFile.php
deleted file mode 100644
index d6981f000..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigFile.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ConfigFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'bootstrap.php';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ConfigFile';
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        return '';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php
deleted file mode 100644
index 314447ecb..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ConfigsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ConfigsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'configs';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ConfigsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllerFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllerFile.php
deleted file mode 100644
index f6b02a499..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllerFile.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ControllerFile.php 20247 2010-01-12 21:38:15Z dasprid $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_controllerName = 'index';
-
-    /**
-     * @var string
-     */
-    protected $_moduleName = null;
-    
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'controllerName';
-
-    /**
-     * init()
-     *
-     */
-    public function init()
-    {
-        $this->_controllerName = $this->_resource->getAttribute('controllerName');
-        $this->_moduleName = $this->_resource->getAttribute('moduleName');
-        $this->_filesystemName = ucfirst($this->_controllerName) . 'Controller.php';
-        parent::init();
-    }
-
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'controllerName' => $this->getControllerName()
-            );
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ControllerFile';
-    }
-
-    /**
-     * getControllerName()
-     *
-     * @return string
-     */
-    public function getControllerName()
-    {
-        return $this->_controllerName;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $className = ($this->_moduleName) ? ucfirst($this->_moduleName) . '_' : '';
-        $className .= ucfirst($this->_controllerName) . 'Controller';
-        
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'fileName' => $this->getPath(),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    'extendedClass' => 'Zend_Controller_Action',
-                    'methods' => array(
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'init',
-                            'body' => '/* Initialize action controller here */',
-                        	))
-                    	)
-                	))
-            	)
-        	));
-
-
-        if ($className == 'ErrorController') {
-
-            $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-                'fileName' => $this->getPath(),
-                'classes' => array(
-                    new Zend_CodeGenerator_Php_Class(array(
-                        'name' => $className,
-                        'extendedClass' => 'Zend_Controller_Action',
-                        'methods' => array(
-                            new Zend_CodeGenerator_Php_Method(array(
-                                'name' => 'errorAction',
-                                'body' => <<<EOS
-\$errors = \$this->_getParam('error_handler');
-
-switch (\$errors->type) {
-    case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE:
-    case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
-    case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
-
-        // 404 error -- controller or action not found
-        \$this->getResponse()->setHttpResponseCode(404);
-        \$this->view->message = 'Page not found';
-        break;
-    default:
-        // application error
-        \$this->getResponse()->setHttpResponseCode(500);
-        \$this->view->message = 'Application error';
-        break;
-}
-
-// Log exception, if logger available
-if (\$log = \$this->getLog()) {
-    \$log->crit(\$this->view->message, \$errors->exception);
-}
-
-// conditionally display exceptions
-if (\$this->getInvokeArg('displayExceptions') == true) {
-    \$this->view->exception = \$errors->exception;
-}
-
-\$this->view->request   = \$errors->request;
-EOS
-                                )),
-                            new Zend_CodeGenerator_Php_Method(array(
-                                'name' => 'getLog',
-                                'body' => <<<EOS
-\$bootstrap = \$this->getInvokeArg('bootstrap');
-if (!\$bootstrap->hasPluginResource('Log')) {
-    return false;
-}
-\$log = \$bootstrap->getResource('Log');
-return \$log;
-EOS
-                                )),
-                            )
-                        ))
-                    )
-                ));
-
-        }
-
-        // store the generator into the registry so that the addAction command can use the same object later
-        Zend_CodeGenerator_Php_File::registerFileCodeGenerator($codeGenFile); // REQUIRES filename to be set
-        return $codeGenFile->generate();
-    }
-
-    /**
-     * addAction()
-     *
-     * @param string $actionName
-     */
-    public function addAction($actionName)
-    {
-        $classCodeGen = $this->getCodeGenerator();
-        $classCodeGen->setMethod(array('name' => $actionName . 'Action', 'body' => '        // action body here'));
-        file_put_contents($this->getPath(), $classCodeGen->generate());
-    }
-
-    /**
-     * getCodeGenerator()
-     *
-     * @return Zend_CodeGenerator_Php_Class
-     */
-    public function getCodeGenerator()
-    {
-        $codeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($this->getPath());
-        $codeGenFileClasses = $codeGenFile->getClasses();
-        $class = array_shift($codeGenFileClasses);
-        return $class;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php
deleted file mode 100644
index 49d1a647f..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ControllersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ControllersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'controllers';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ControllersDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DataDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DataDirectory.php
deleted file mode 100644
index 4b08a2332..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DataDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_DataDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'data';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'DataDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php
deleted file mode 100644
index dbc1f1dc8..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTableDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_DbTableDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'DbTable';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'DbTableDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableFile.php
deleted file mode 100644
index f341d3eb1..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DbTableFile.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DbTableFile.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_DbTableFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile
-{
-
-    protected $_dbTableName = null;
-    
-    protected $_actualTableName = null;
-    
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'DbTableFile';
-    }
-
-    /**
-     * init()
-     *
-     */
-    public function init()
-    {
-        $this->_dbTableName = $this->_resource->getAttribute('dbTableName');
-        $this->_actualTableName = $this->_resource->getAttribute('actualTableName');
-        $this->_filesystemName = ucfirst($this->_dbTableName) . '.php';
-        parent::init();
-    }
-    
-    public function getPersistentAttributes()
-    {
-        return array('dbTableName' => $this->_dbTableName);
-    }
-
-    public function getContents()
-    {
-        $className = $this->getFullClassName($this->_dbTableName, 'Model_DbTable');
-        
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'fileName' => $this->getPath(),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    'extendedClass' => 'Zend_Db_Table_Abstract',
-                    'properties' => array(
-                        new Zend_CodeGenerator_Php_Property(array(
-                            'name' => '_name',
-                            'visibility' => Zend_CodeGenerator_Php_Property::VISIBILITY_PROTECTED,
-                            'defaultValue' => $this->_actualTableName
-                            ))
-                        ),
-                
-                    ))
-                )
-            ));
-        return $codeGenFile->generate();
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php
deleted file mode 100644
index 128d37408..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_DocsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'docs';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'DocsDirectory';
-    }
-    
-    public function create(){
-        parent::create();
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormFile.php
deleted file mode 100644
index 6b99f1be3..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormFile.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_FormFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile
-{
-
-    /**
-     * @var string
-     */
-    protected $_formName = 'Base';
-    
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'formName';
-    
-    /**
-     * init()
-     *
-     */
-    public function init()
-    {
-        $this->_formName = $this->_resource->getAttribute('formName');
-        $this->_filesystemName = ucfirst($this->_formName) . '.php';
-        parent::init();
-    }
-
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'formName' => $this->getFormName()
-            );
-    }
-    
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'FormFile';
-    }
-
-    public function getFormName()
-    {
-        return $this->_formName;
-    }
-    
-    public function getContents()
-    {
-        
-        $className = $this->getFullClassName($this->_formName, 'Form');
-        
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'fileName' => $this->getPath(),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    'extendedClass' => 'Zend_Form',
-                    'methods' => array(
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'init',
-                            'body' => '/* Form Elements & Other Definitions Here ... */',
-                            ))
-                        )
-                
-                    ))
-                )
-            ));
-        return $codeGenFile->generate();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php
deleted file mode 100644
index be9ffaebd..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_FormsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'forms';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'FormsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
deleted file mode 100644
index 0f861258e..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtaccessFile.php 20969 2010-02-07 18:20:02Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_HtaccessFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = '.htaccess';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'HtaccessFile';
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $output = <<<EOS
-
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} -s [OR]
-RewriteCond %{REQUEST_FILENAME} -l [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^.*$ - [NC,L]
-RewriteRule ^.*$ index.php [NC,L]
-
-EOS;
-        return $output;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php
deleted file mode 100644
index d35dada25..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewScriptFile.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LayoutScriptFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'layout.phtml';
-
-    /**
-     * @var string
-     */
-    protected $_layoutName = null;
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LayoutScriptFile';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ViewScriptFile
-     */
-    public function init()
-    {
-        if ($layoutName = $this->_resource->getAttribute('layoutName')) {
-            $this->_layoutName = $layoutName;
-        } else {
-            throw new Exception('Either a forActionName or scriptName is required.');
-        }
-
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return unknown
-     */
-    public function getPersistentAttributes()
-    {
-        $attributes = array();
-
-        if ($this->_layoutName) {
-            $attributes['layoutName'] = $this->_layoutName;
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $contents = <<<EOS
-<?php echo \$this->layout()->content; ?>
-EOS;
-
-        return $contents;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php
deleted file mode 100644
index c29e78c7a..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewScriptsDirectory.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LayoutScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'scripts';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LayoutScriptsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
deleted file mode 100644
index 359db5485..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LayoutsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LayoutsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'layouts';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LayoutsDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
deleted file mode 100644
index c15943456..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'library';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LibraryDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php
deleted file mode 100644
index 24a450907..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LocalesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LocalesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'locales';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LocalesDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php
deleted file mode 100644
index 63388bda7..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LogsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_LogsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'logs';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'LogsDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelFile.php
deleted file mode 100644
index 4026c0469..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelFile.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ModelFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ModelFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile
-{
-
-    /**
-     * @var string
-     */
-    protected $_modelName = 'Base';
-    
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'modelName';
-    
-    /**
-     * init()
-     *
-     */
-    public function init()
-    {
-        $this->_modelName = $this->_resource->getAttribute('modelName');
-        $this->_filesystemName = ucfirst($this->_modelName) . '.php';
-        parent::init();
-    }
-
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'modelName' => $this->getModelName()
-            );
-    }
-    
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ModelFile';
-    }
-
-    public function getModelName()
-    {
-        return $this->_modelName;
-    }
-    
-    public function getContents()
-    {
-        
-        $className = $this->getFullClassName($this->_modelName, 'Model');
-        
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'fileName' => $this->getPath(),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    ))
-                )
-            ));
-        return $codeGenFile->generate();
-    }
-    
-    
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php
deleted file mode 100644
index 45b589860..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ModelsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ModelsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'models';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ModelsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php
deleted file mode 100644
index 544965dd3..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ModuleDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ModuleDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_moduleName = null;
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'moduleDirectory';
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ControllerFile
-     */
-    public function init()
-    {
-        $this->_filesystemName = $this->_moduleName = $this->_resource->getAttribute('moduleName');
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ModuleDirectory';
-    }
-
-    /**
-     * getPersistentAttributes
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'moduleName' => $this->getModuleName()
-            );
-    }
-
-    /**
-     * getModuleName()
-     *
-     * @return string
-     */
-    public function getModuleName()
-    {
-        return $this->_moduleName;
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php
deleted file mode 100644
index 9dc1ce70c..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ModulesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ModulesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'modules';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'modulesDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php
deleted file mode 100644
index ddf425699..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProjectProviderFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * @see Zend_CodeGenerator_Php_File
- */
-require_once 'Zend/CodeGenerator/Php/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ProjectProviderFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_projectProviderName = null;
-
-    /**
-     * @var array
-     */
-    protected $_actionNames = array();
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ProjectProviderFile
-     */
-    public function init()
-    {
-
-        $this->_projectProviderName = $this->_resource->getAttribute('projectProviderName');
-        $this->_actionNames = $this->_resource->getAttribute('actionNames');
-        $this->_filesystemName = ucfirst($this->_projectProviderName) . 'Provider.php';
-
-        if (strpos($this->_actionNames, ',')) {
-            $this->_actionNames = explode(',', $this->_actionNames);
-        } else {
-            $this->_actionNames = ($this->_actionNames) ? array($this->_actionNames) : array();
-        }
-
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'projectProviderName' => $this->getProjectProviderName(),
-            'actionNames' => implode(',', $this->_actionNames)
-            );
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ProjectProviderFile';
-    }
-
-    /**
-     * getProjectProviderName()
-     *
-     * @return string
-     */
-    public function getProjectProviderName()
-    {
-        return $this->_projectProviderName;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-
-        $filter = new Zend_Filter_Word_DashToCamelCase();
-
-        $className = $filter->filter($this->_projectProviderName) . 'Provider';
-
-        $class = new Zend_CodeGenerator_Php_Class(array(
-            'name' => $className,
-            'extendedClass' => 'Zend_Tool_Project_Provider_Abstract'
-            ));
-
-        $methods = array();
-        foreach ($this->_actionNames as $actionName) {
-            $methods[] = new Zend_CodeGenerator_Php_Method(array(
-                'name' => $actionName,
-                'body' => '        /** @todo Implementation */'
-                ));
-        }
-
-        if ($methods) {
-            $class->setMethods($methods);
-        }
-
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'requiredFiles' => array(
-                'Zend/Tool/Project/Provider/Abstract.php',
-                'Zend/Tool/Project/Provider/Exception.php'
-                ),
-            'classes' => array($class)
-            ));
-
-        return $codeGenFile->generate();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php
deleted file mode 100644
index 9d7d66876..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PublicDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_PublicDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'public';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'PublicDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php
deleted file mode 100644
index 140048e6f..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PublicImagesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_PublicImagesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'images';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'PublicImagesDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php
deleted file mode 100644
index 2cd11a1fe..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PublicIndexFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_PublicIndexFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'index.php';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'PublicIndexFile';
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $codeGenerator = new Zend_CodeGenerator_Php_File(array(
-            'body' => <<<EOS
-// Define path to application directory
-defined('APPLICATION_PATH')
-    || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application'));
-
-// Define application environment
-defined('APPLICATION_ENV')
-    || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
-
-// Ensure library/ is on include_path
-set_include_path(implode(PATH_SEPARATOR, array(
-    realpath(APPLICATION_PATH . '/../library'),
-    get_include_path(),
-)));
-
-/** Zend_Application */
-require_once 'Zend/Application.php';
-
-// Create application, bootstrap, and run
-\$application = new Zend_Application(
-    APPLICATION_ENV,
-    APPLICATION_PATH . '/configs/application.ini'
-);
-\$application->bootstrap()
-            ->run();
-EOS
-            ));
-        return $codeGenerator->generate();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php
deleted file mode 100644
index a9425257f..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PublicScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_PublicScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'js';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'PublicScriptsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php
deleted file mode 100644
index 76b806b40..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PublicStylesheetsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_PublicStylesheetsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'styles';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'PublicStylesheetsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
deleted file mode 100644
index 48c37e995..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SearchIndexesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_SearchIndexesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'search-indexes';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'SearchIndexesDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php
deleted file mode 100644
index b5857c472..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SessionsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_SessionsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'sessions';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'SessionsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php
deleted file mode 100644
index ad931de23..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TemporaryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TemporaryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'temp';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TemporaryDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php
deleted file mode 100644
index 604cec912..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestApplicationBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestApplicationBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'bootstrap.php';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestApplicationBootstrapFile';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
deleted file mode 100644
index 10cea6ca7..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestApplicationControllerDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'controllers';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestApplicationControllerDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
deleted file mode 100644
index abe6ad967..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestApplicationControllerFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestApplicationControllerFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_forControllerName = '';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestApplicationControllerFile';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_TestApplicationControllerFile
-     */
-    public function init()
-    {
-        $this->_forControllerName = $this->_resource->getAttribute('forControllerName');
-        $this->_filesystemName = ucfirst($this->_forControllerName) . 'ControllerTest.php';
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-
-        $filter = new Zend_Filter_Word_DashToCamelCase();
-
-        $className = $filter->filter($this->_forControllerName) . 'ControllerTest';
-
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'requiredFiles' => array(
-                'PHPUnit/Framework/TestCase.php'
-                ),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    'extendedClass' => 'PHPUnit_Framework_TestCase',
-                    'methods' => array(
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'setUp',
-                            'body' => '        /* Setup Routine */'
-                            )),
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'tearDown',
-                            'body' => '        /* Tear Down Routine */'
-                            ))
-                        )
-                    ))
-                )
-            ));
-
-        return $codeGenFile->generate();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php
deleted file mode 100644
index 071d65490..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestApplicationDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'application';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestApplicationDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php
deleted file mode 100644
index 38cc524a9..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestLibraryBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestLibraryBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'bootstrap.php';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestLibraryBootstrapFile';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php
deleted file mode 100644
index 2fea10416..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestLibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'library';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestLibraryDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
deleted file mode 100644
index 2d143a951..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestLibraryFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestLibraryFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_forClassName = '';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestLibraryFile';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_TestLibraryFile
-     */
-    public function init()
-    {
-        $this->_forClassName = $this->_resource->getAttribute('forClassName');
-        $this->_filesystemName = ucfirst(ltrim(strrchr($this->_forClassName, '_'), '_')) . 'Test.php';
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-
-        $filter = new Zend_Filter_Word_DashToCamelCase();
-
-        $className = $filter->filter($this->_forClassName) . 'Test';
-
-        $codeGenFile = new Zend_CodeGenerator_Php_File(array(
-            'requiredFiles' => array(
-                'PHPUnit/Framework/TestCase.php'
-                ),
-            'classes' => array(
-                new Zend_CodeGenerator_Php_Class(array(
-                    'name' => $className,
-                    'extendedClass' => 'PHPUnit_Framework_TestCase',
-                    'methods' => array(
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'setUp',
-                            'body' => '        /* Setup Routine */'
-                            )),
-                        new Zend_CodeGenerator_Php_Method(array(
-                            'name' => 'tearDown',
-                            'body' => '        /* Tear Down Routine */'
-                            ))
-                        )
-                    ))
-                )
-            ));
-
-        return $codeGenFile->generate();
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php
deleted file mode 100644
index 8e4df978d..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestLibraryNamespaceDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestLibraryNamespaceDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_namespaceName  = '';
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'library';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestLibraryNamespaceDirectory';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_TestLibraryNamespaceDirectory
-     */
-    public function init()
-    {
-        $this->_namespaceName  = $this->_resource->getAttribute('namespaceName');
-        $this->_filesystemName = $this->_namespaceName;
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        $attributes = array();
-        $attributes['namespaceName'] = $this->_namespaceName;
-
-        return $attributes;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
deleted file mode 100644
index 9f6bc8ae7..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestPHPUnitConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestPHPUnitConfigFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'phpunit.xml';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestPHPUnitConfigFile';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php
deleted file mode 100644
index 006ba9d22..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TestsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_TestsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'tests';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'TestsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php
deleted file mode 100644
index 135975ae0..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UploadsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_UploadsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'uploads';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'UploadsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php
deleted file mode 100644
index ad5f210b9..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewControllerScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewControllerScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'controllerName';
-
-    /**
-     * @var name
-     */
-    protected $_forControllerName = null;
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ViewControllerScriptsDirectory
-     */
-    public function init()
-    {
-        $this->_forControllerName = $this->_resource->getAttribute('forControllerName');
-        $this->_filesystemName = $this->_convertControllerNameToFilesystemName($this->_forControllerName);
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        return array(
-            'forControllerName' => $this->_forControllerName
-            );
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewControllerScriptsDirectory';
-    }
-    
-    protected function _convertControllerNameToFilesystemName($controllerName)
-    {
-        $filter = new Zend_Filter();
-        $filter->addFilter(new Zend_Filter_Word_CamelCaseToDash())
-            ->addFilter(new Zend_Filter_StringToLower());
-        return $filter->filter($controllerName);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
deleted file mode 100644
index 7e3ad7b30..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewFiltersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewFiltersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'filters';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewFiltersDirectory';
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php
deleted file mode 100644
index 802e67cab..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewHelpersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewHelpersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'helpers';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewHelpersDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
deleted file mode 100644
index 31c050873..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewScriptFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_File
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/File.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewScriptFile extends Zend_Tool_Project_Context_Filesystem_File
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'view.phtml';
-
-    /**
-     * @var string
-     */
-    protected $_forActionName = null;
-
-    /**
-     * @var string
-     */
-    protected $_scriptName = null;
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewScriptFile';
-    }
-
-    /**
-     * init()
-     *
-     * @return Zend_Tool_Project_Context_Zf_ViewScriptFile
-     */
-    public function init()
-    {
-        if ($forActionName = $this->_resource->getAttribute('forActionName')) {
-            $this->_forActionName = $forActionName;
-            $this->_filesystemName = $this->_convertActionNameToFilesystemName($forActionName) . '.phtml';
-        } elseif ($scriptName = $this->_resource->getAttribute('scriptName')) {
-            $this->_scriptName = $scriptName;
-            $this->_filesystemName = $scriptName . '.phtml';
-        } else {
-            throw new Exception('Either a forActionName or scriptName is required.');
-        }
-
-        parent::init();
-        return $this;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return unknown
-     */
-    public function getPersistentAttributes()
-    {
-        $attributes = array();
-
-        if ($this->_forActionName) {
-            $attributes['forActionName'] = $this->_forActionName;
-        }
-
-        if ($this->_scriptName) {
-            $attributes['scriptName'] = $this->_scriptName;
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * getContents()
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $contents = '';
-
-        if ($this->_filesystemName == 'error.phtml') {  // should also check that the above directory is forController=error
-            $contents .= <<<EOS
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Zend Framework Default Application</title>
-</head>
-<body>
-  <h1>An error occurred</h1>
-  <h2><?php echo \$this->message ?></h2>
-
-  <?php if (isset(\$this->exception)): ?>
-
-  <h3>Exception information:</h3>
-  <p>
-      <b>Message:</b> <?php echo \$this->exception->getMessage() ?>
-  </p>
-
-  <h3>Stack trace:</h3>
-  <pre><?php echo \$this->exception->getTraceAsString() ?>
-  </pre>
-
-  <h3>Request Parameters:</h3>
-  <pre><?php echo var_export(\$this->request->getParams(), true) ?>
-  </pre>
-  <?php endif ?>
-
-</body>
-</html>
-
-EOS;
-        } elseif ($this->_forActionName == 'index' && $this->_resource->getParentResource()->getAttribute('forControllerName') == 'Index') {
-
-            $contents =<<<EOS
-<style>
-    a:link,
-    a:visited
-    {
-        color: #0398CA;
-    }
-
-    span#zf-name
-    {
-        color: #91BE3F;
-    }
-
-    div#welcome
-    {
-        color: #FFFFFF;
-        background-image: url(http://framework.zend.com/images/bkg_header.jpg);
-        width:  600px;
-        height: 400px;
-        border: 2px solid #444444;
-        overflow: hidden;
-        text-align: center;
-    }
-
-    div#more-information
-    {
-        background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif);
-        height: 100%;
-    }
-</style>
-<div id="welcome">
-    <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1>
-
-    <h3>This is your project's main page</h3>
-
-    <div id="more-information">
-        <p><img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /></p>
-        <p>
-            Helpful Links: <br />
-            <a href="http://framework.zend.com/">Zend Framework Website</a> |
-            <a href="http://framework.zend.com/manual/en/">Zend Framework Manual</a>
-        </p>
-    </div>
-</div>
-EOS;
-
-        } else {
-            $contents = '<br /><br /><center>View script for controller <b>' . $this->_resource->getParentResource()->getAttribute('forControllerName') . '</b>'
-                . ' and script/action name <b>' . $this->_forActionName . '</b></center>';
-        }
-        return $contents;
-    }
-
-    protected function _convertActionNameToFilesystemName($actionName)
-    {
-        $filter = new Zend_Filter();
-        $filter->addFilter(new Zend_Filter_Word_CamelCaseToDash())
-            ->addFilter(new Zend_Filter_StringToLower());
-        return $filter->filter($actionName);
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php
deleted file mode 100644
index 008fa8639..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'scripts';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewScriptsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php
deleted file mode 100644
index 508240e73..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ViewsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ViewsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'views';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ViewsDirectory';
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php b/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php
deleted file mode 100644
index 56664201c..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ZfStandardLibraryDirectory.php 20903 2010-02-04 16:16:47Z matthew $
- */
-
-/**
- * @see Zend_Tool_Project_Context_Filesystem_Directory
- */
-require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Context_Zf_ZfStandardLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory
-{
-
-    /**
-     * @var string
-     */
-    protected $_filesystemName = 'Zend';
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ZfStandardLibraryDirectory';
-    }
-
-    /**
-     * create()
-     *
-     */
-    public function create()
-    {
-        parent::create();
-        $zfPath = $this->_getZfPath();
-        if ($zfPath != false) {
-            $zfIterator = new RecursiveDirectoryIterator($zfPath);
-            foreach ($rii = new RecursiveIteratorIterator($zfIterator, RecursiveIteratorIterator::SELF_FIRST) as $file) {
-                $relativePath = preg_replace('#^'.preg_quote(realpath($zfPath), '#').'#', '', realpath($file->getPath())) . DIRECTORY_SEPARATOR . $file->getFilename();
-                if (strpos($relativePath, DIRECTORY_SEPARATOR . '.') !== false) {
-                    continue;
-                }
-
-                if ($file->isDir()) {
-                    mkdir($this->getBaseDirectory() . DIRECTORY_SEPARATOR . $this->getFilesystemName() . $relativePath);
-                } else {
-                    copy($file->getPathname(), $this->getBaseDirectory() . DIRECTORY_SEPARATOR . $this->getFilesystemName() . $relativePath);
-                }
-
-            }
-        }
-    }
-
-    /**
-     * _getZfPath()
-     *
-     * @return string|false
-     */
-    protected function _getZfPath()
-    {
-        require_once 'Zend/Loader.php';
-        foreach (Zend_Loader::explodeIncludePath() as $includePath) {
-            if (!file_exists($includePath) || $includePath[0] == '.') {
-                continue;
-            }
-
-            if (realpath($checkedPath = rtrim($includePath, '\\/') . '/Zend/Loader.php') !== false && file_exists($checkedPath)) {
-                return dirname($checkedPath);
-            }
-        }
-
-        return false;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Exception.php b/airtime_mvc/library/Zend/Tool/Project/Exception.php
deleted file mode 100644
index fff2a6429..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Exception extends Zend_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile.php b/airtime_mvc/library/Zend/Tool/Project/Profile.php
deleted file mode 100644
index 099b913fc..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Profile.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Profile_FileParser_Xml
- */
-require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php';
-
-/**
- * @see Zend_Tool_Project_Profile_Resource_Container
- */
-require_once 'Zend/Tool/Project/Profile/Resource/Container.php';
-
-/**
- * This class is the front most class for utilizing Zend_Tool_Project
- *
- * A profile is a hierarchical set of resources that keep track of
- * items within a specific project.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Container
-{
-
-    /**
-     * @var bool
-     */
-    protected static $_traverseEnabled = false;
-    
-    /**
-     * Constructor, standard usage would allow the setting of options
-     *
-     * @param array $options
-     * @return bool
-     */
-    public function __construct($options = null)
-    {
-        if ($options) {
-            $this->setOptions($options);
-        }
-
-        $this->_topResources = new Zend_Tool_Project_Profile_Resource_Container();
-    }
-
-    /**
-     * Process options and either set a profile property or
-     * set a profile 'attribute'
-     *
-     * @param array $options
-     */
-    public function setOptions(Array $options)
-    {
-        $this->setAttributes($options);
-    }
-
-    /**
-     * getIterator() - reqruied by the RecursiveIterator interface
-     *
-     * @return RecursiveIteratorIterator
-     */
-    public function getIterator()
-    {
-        require_once 'Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php';
-
-        return new RecursiveIteratorIterator(
-            new Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter($this),
-            RecursiveIteratorIterator::SELF_FIRST
-            );
-    }
-
-    /**
-     * loadFromData() - Load a profile from data provided by the
-     * 'profilData' attribute
-     *
-     */
-    public function loadFromData()
-    {
-        if (!isset($this->_attributes['profileData'])) {
-            require_once 'Zend/Tool/Project/Exception.php';
-            throw new Zend_Tool_Project_Exception('loadFromData() must have "profileData" set.');
-        }
-
-        $profileFileParser = new Zend_Tool_Project_Profile_FileParser_Xml();
-        $profileFileParser->unserialize($this->_attributes['profileData'], $this);
-
-        $this->rewind();
-    }
-
-    /**
-     * isLoadableFromFile() - can a profile be loaded from a file
-     *
-     * wether or not a profile can be loaded from the
-     * file in attribute 'projectProfileFile', or from a file named
-     * '.zfproject.xml' inside a directory in key 'projectDirectory'
-     *
-     * @return bool
-     */
-    public function isLoadableFromFile()
-    {
-        if (!isset($this->_attributes['projectProfileFile']) && !isset($this->_attributes['projectDirectory'])) {
-            return false;
-        }
-
-        if (isset($this->_attributes['projectProfileFile'])) {
-            $projectProfileFilePath = $this->_attributes['projectProfileFile'];
-            if (!file_exists($projectProfileFilePath)) {
-                return false;
-            }
-        } else {
-            $projectProfileFilePath = rtrim($this->_attributes['projectDirectory'], '/\\') . '/.zfproject.xml';
-            if (!file_exists($projectProfileFilePath)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * loadFromFile() - Load data from file
-     *
-     * this attempts to load a project profile file from a variety of locations depending
-     * on what information the user provided vie $options or attributes, specifically the
-     * 'projectDirectory' or 'projectProfileFile'
-     *
-     */
-    public function loadFromFile()
-    {
-        // if no data is supplied, need either a projectProfileFile or a projectDirectory
-        if (!isset($this->_attributes['projectProfileFile']) && !isset($this->_attributes['projectDirectory'])) {
-            require_once 'Zend/Tool/Project/Exception.php';
-            throw new Zend_Tool_Project_Exception('loadFromFile() must have at least "projectProfileFile" or "projectDirectory" set.');
-        }
-
-        if (isset($this->_attributes['projectProfileFile'])) {
-            $projectProfileFilePath = $this->_attributes['projectProfileFile'];
-            if (!file_exists($projectProfileFilePath)) {
-                require_once 'Zend/Tool/Project/Exception.php';
-                throw new Zend_Tool_Project_Exception('"projectProfileFile" was supplied but file was not found at location ' . $projectProfileFilePath);
-            }
-            $this->_attributes['projectDirectory'] = dirname($projectProfileFilePath);
-        } else {
-            $projectProfileFilePath = rtrim($this->_attributes['projectDirectory'], '/\\') . '/.zfproject.xml';
-            if (!file_exists($projectProfileFilePath)) {
-                require_once 'Zend/Tool/Project/Exception.php';
-                throw new Zend_Tool_Project_Exception('"projectDirectory" was supplied but no profile file file was not found at location ' . $projectProfileFilePath);
-            }
-            $this->_attributes['projectProfileFile'] = $projectProfileFilePath;
-        }
-
-        $profileData = file_get_contents($projectProfileFilePath);
-
-        $profileFileParser = new Zend_Tool_Project_Profile_FileParser_Xml();
-        $profileFileParser->unserialize($profileData, $this);
-
-        $this->rewind();
-    }
-
-    /**
-     * storeToFile() - store the current profile to file
-     *
-     * This will store the profile in memory to a place on disk determined by the attributes
-     * available, specifically if the key 'projectProfileFile' is available
-     *
-     */
-    public function storeToFile()
-    {
-        $file = null;
-
-        if (isset($this->_attributes['projectProfileFile'])) {
-            $file = $this->_attributes['projectProfileFile'];
-        }
-
-        if ($file == null) {
-            require_once 'Zend/Tool/Project/Exception.php';
-            throw new Zend_Tool_Project_Exception('storeToFile() must have a "projectProfileFile" attribute set.');
-        }
-
-        $parser = new Zend_Tool_Project_Profile_FileParser_Xml();
-        $xml = $parser->serialize($this);
-        file_put_contents($file, $xml);
-    }
-
-    /**
-     * storeToData() - create a string representation of the profile in memory
-     *
-     * @return string
-     */
-    public function storeToData()
-    {
-        $parser = new Zend_Tool_Project_Profile_FileParser_Xml();
-        $xml = $parser->serialize($this);
-        return $xml;
-    }
-
-    /**
-     * __toString() - cast this profile to string to be able to view it.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $string = '';
-        foreach ($this as $resource) {
-            $string .= $resource->getName() . PHP_EOL;
-            $rii = new RecursiveIteratorIterator($resource, RecursiveIteratorIterator::SELF_FIRST);
-            foreach ($rii as $item) {
-                $string .= str_repeat('  ', $rii->getDepth()+1) . $item->getName()
-                        . ((count($attributes = $item->getAttributes()) > 0) ? ' [' . http_build_query($attributes) . ']' : '')
-                        . PHP_EOL;
-            }
-        }
-        return $string;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Exception.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Exception.php
deleted file mode 100644
index 0878ac268..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Exception
- */
-require_once 'Zend/Tool/Project/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Exception extends Zend_Tool_Project_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Interface.php b/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Interface.php
deleted file mode 100644
index 4021c36f4..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Interface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Tool_Project_Profile_FileParser_Interface
-{
-
-    /**
-     * serialize()
-     *
-     * This method should take a profile and return a string
-     * representation of it.
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @return string
-     */
-    public function serialize(Zend_Tool_Project_Profile $profile);
-
-    /**
-     * unserialize()
-     *
-     * This method should be able to take string data an create a
-     * struture in the provided $profile
-     *
-     * @param string $data
-     * @param Zend_Tool_Project_Profile $profile
-     */
-    public function unserialize($data, Zend_Tool_Project_Profile $profile);
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Xml.php b/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Xml.php
deleted file mode 100644
index 5c26879cf..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/FileParser/Xml.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Xml.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-require_once 'Zend/Tool/Project/Profile/FileParser/Interface.php';
-require_once 'Zend/Tool/Project/Context/Repository.php';
-require_once 'Zend/Tool/Project/Profile.php';
-require_once 'Zend/Tool/Project/Profile/Resource.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_FileParser_Xml implements Zend_Tool_Project_Profile_FileParser_Interface
-{
-
-    /**
-     * @var Zend_Tool_Project_Profile
-     */
-    protected $_profile = null;
-
-    /**
-     * @var Zend_Tool_Project_Context_Repository
-     */
-    protected $_contextRepository = null;
-
-    /**
-     * __construct()
-     *
-     */
-    public function __construct()
-    {
-        $this->_contextRepository = Zend_Tool_Project_Context_Repository::getInstance();
-    }
-
-    /**
-     * serialize()
-     *
-     * create an xml string from the provided profile
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @return string
-     */
-    public function serialize(Zend_Tool_Project_Profile $profile)
-    {
-
-        $profile = clone $profile;
-
-        $this->_profile = $profile;
-        $xmlElement = new SimpleXMLElement('<projectProfile />');
-
-        if ($profile->hasAttribute('type')) {
-            $xmlElement->addAttribute('type', $profile->getAttribute('type'));
-        }
-        
-        if ($profile->hasAttribute('version')) {
-            $xmlElement->addAttribute('version', $profile->getAttribute('version'));
-        }
-        
-        self::_serializeRecurser($profile, $xmlElement);
-
-        $doc = new DOMDocument('1.0');
-        $doc->formatOutput = true;
-        $domnode = dom_import_simplexml($xmlElement);
-        $domnode = $doc->importNode($domnode, true);
-        $domnode = $doc->appendChild($domnode);
-
-        return $doc->saveXML();
-    }
-
-    /**
-     * unserialize()
-     *
-     * Create a structure in the object $profile from the structure specficied
-     * in the xml string provided
-     *
-     * @param string xml data
-     * @param Zend_Tool_Project_Profile The profile to use as the top node
-     * @return Zend_Tool_Project_Profile
-     */
-    public function unserialize($data, Zend_Tool_Project_Profile $profile)
-    {
-        if ($data == null) {
-            throw new Exception('contents not available to unserialize.');
-        }
-
-        $this->_profile = $profile;
-
-        $xmlDataIterator = new SimpleXMLIterator($data);
-
-        if ($xmlDataIterator->getName() != 'projectProfile') {
-            throw new Exception('Profiles must start with a projectProfile node');
-        }
-        
-        if (isset($xmlDataIterator['type'])) {
-            $this->_profile->setAttribute('type', (string) $xmlDataIterator['type']);
-        }
-        
-        if (isset($xmlDataIterator['version'])) {
-            $this->_profile->setAttribute('version', (string) $xmlDataIterator['version']);
-        }
-        
-        // start un-serialization of the xml doc
-        $this->_unserializeRecurser($xmlDataIterator);
-
-        // contexts should be initialized after the unwinding of the profile structure
-        $this->_lazyLoadContexts();
-
-        return $this->_profile;
-
-    }
-
-    /**
-     * _serializeRecurser()
-     *
-     * This method will be used to traverse the depths of the structure
-     * when *serializing* an xml structure into a string
-     *
-     * @param array $resources
-     * @param SimpleXmlElement $xmlNode
-     */
-    protected function _serializeRecurser($resources, SimpleXmlElement $xmlNode)
-    {
-        // @todo find a better way to handle concurrency.. if no clone, _position in node gets messed up
-        //if ($resources instanceof Zend_Tool_Project_Profile_Resource) {
-        //    $resources = clone $resources;
-        //}
-
-        foreach ($resources as $resource) {
-
-            if ($resource->isDeleted()) {
-                continue;
-            }
-
-            $resourceName = $resource->getContext()->getName();
-            $resourceName[0] = strtolower($resourceName[0]);
-
-            $newNode = $xmlNode->addChild($resourceName);
-
-            //$reflectionClass = new ReflectionClass($resource->getContext());
-
-            if ($resource->isEnabled() == false) {
-                $newNode->addAttribute('enabled', 'false');
-            }
-
-            foreach ($resource->getPersistentAttributes() as $paramName => $paramValue) {
-                $newNode->addAttribute($paramName, $paramValue);
-            }
-
-            if ($resource->hasChildren()) {
-                self::_serializeRecurser($resource, $newNode);
-            }
-
-        }
-
-    }
-
-
-    /**
-     * _unserializeRecurser()
-     *
-     * This method will be used to traverse the depths of the structure
-     * as needed to *unserialize* the profile from an xmlIterator
-     *
-     * @param SimpleXMLIterator $xmlIterator
-     * @param Zend_Tool_Project_Profile_Resource $resource
-     */
-    protected function _unserializeRecurser(SimpleXMLIterator $xmlIterator, Zend_Tool_Project_Profile_Resource $resource = null)
-    {
-
-        foreach ($xmlIterator as $resourceName => $resourceData) {
-
-            $contextName = $resourceName;
-            $subResource = new Zend_Tool_Project_Profile_Resource($contextName);
-            $subResource->setProfile($this->_profile);
-
-            if ($resourceAttributes = $resourceData->attributes()) {
-                $attributes = array();
-                foreach ($resourceAttributes as $attrName => $attrValue) {
-                    $attributes[$attrName] = (string) $attrValue;
-                }
-                $subResource->setAttributes($attributes);
-            }
-
-            if ($resource) {
-                $resource->append($subResource, false);
-            } else {
-                $this->_profile->append($subResource);
-            }
-
-            if ($this->_contextRepository->isOverwritableContext($contextName) == false) {
-                $subResource->initializeContext();
-            }
-
-            if ($xmlIterator->hasChildren()) {
-                self::_unserializeRecurser($xmlIterator->getChildren(), $subResource);
-            }
-        }
-    }
-
-    /**
-     * _lazyLoadContexts()
-     *
-     * This method will call initializeContext on the resources in a profile
-     * @todo determine if this method belongs inside the profile
-     *
-     */
-    protected function _lazyLoadContexts()
-    {
-
-        foreach ($this->_profile as $topResource) {
-            $rii = new RecursiveIteratorIterator($topResource, RecursiveIteratorIterator::SELF_FIRST);
-            foreach ($rii as $resource) {
-                $resource->initializeContext();
-            }
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php
deleted file mode 100644
index 9c94c9a9d..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ContextFilter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is an iterator that will iterate only over enabled resources
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Iterator_ContextFilter extends RecursiveFilterIterator
-{
-
-    /**
-     * @var array
-     */
-    protected $_acceptTypes = array();
-
-    /**
-     * @var array
-     */
-    protected $_denyTypes   = array();
-
-    /**
-     * @var array
-     */
-    protected $_acceptNames = array();
-
-    /**
-     * @var array
-     */
-    protected $_denyNames   = array();
-
-    /**
-     * @var array
-     */
-    protected $_rawOptions = array();
-
-    /**
-     * __construct()
-     *
-     * @param RecursiveIterator $iterator
-     * @param array $options
-     */
-    public function __construct(RecursiveIterator $iterator, $options = array())
-    {
-        parent::__construct($iterator);
-        $this->_rawOptions = $options;
-        if ($options) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * setOptions()
-     *
-     * @param array $options
-     */
-    public function setOptions(Array $options)
-    {
-        foreach ($options as $optionName => $optionValue) {
-            if (substr($optionName, -1, 1) != 's') {
-                $optionName .= 's';
-            }
-            if (method_exists($this, 'set' . $optionName)) {
-                $this->{'set' . $optionName}($optionValue);
-            }
-        }
-    }
-
-    /**
-     * setAcceptTypes()
-     *
-     * @param array|string $acceptTypes
-     * @return Zend_Tool_Project_Profile_Iterator_ContextFilter
-     */
-    public function setAcceptTypes($acceptTypes)
-    {
-        if (!is_array($acceptTypes)) {
-            $acceptTypes = array($acceptTypes);
-        }
-
-        $this->_acceptTypes = $acceptTypes;
-        return $this;
-    }
-
-    /**
-     * setDenyTypes()
-     *
-     * @param array|string $denyTypes
-     * @return Zend_Tool_Project_Profile_Iterator_ContextFilter
-     */
-    public function setDenyTypes($denyTypes)
-    {
-        if (!is_array($denyTypes)) {
-            $denyTypes = array($denyTypes);
-        }
-
-        $this->_denyTypes = $denyTypes;
-        return $this;
-    }
-
-    /**
-     * setAcceptNames()
-     *
-     * @param array|string $acceptNames
-     * @return Zend_Tool_Project_Profile_Iterator_ContextFilter
-     */
-    public function setAcceptNames($acceptNames)
-    {
-        if (!is_array($acceptNames)) {
-            $acceptNames = array($acceptNames);
-        }
-
-        foreach ($acceptNames as $n => $v) {
-            $acceptNames[$n] = strtolower($v);
-        }
-        
-        $this->_acceptNames = $acceptNames;
-        return $this;
-    }
-
-    /**
-     * setDenyNames()
-     *
-     * @param array|string $denyNames
-     * @return Zend_Tool_Project_Profile_Iterator_ContextFilter
-     */
-    public function setDenyNames($denyNames)
-    {
-        if (!is_array($denyNames)) {
-            $denyNames = array($denyNames);
-        }
-
-        foreach ($denyNames as $n => $v) {
-            $denyNames[$n] = strtolower($v);
-        }
-        
-        $this->_denyNames = $denyNames;
-        return $this;
-    }
-
-    /**
-     * accept() is required by teh RecursiveFilterIterator
-     *
-     * @return bool
-     */
-    public function accept()
-    {
-        $currentItem = $this->current();
-
-        if (in_array(strtolower($currentItem->getName()), $this->_acceptNames)) {
-            return true;
-        } elseif (in_array(strtolower($currentItem->getName()), $this->_denyNames)) {
-            return false;
-        }
-
-        foreach ($this->_acceptTypes as $acceptType) {
-            if ($currentItem->getContent() instanceof $acceptType) {
-                return true;
-            }
-        }
-
-        foreach ($this->_denyTypes as $denyType) {
-            if ($currentItem->getContext() instanceof $denyType) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * getChildren()
-     *
-     * This is here due to a bug/design issue in PHP
-     * @link
-     *
-     * @return unknown
-     */
-    function getChildren()
-    {
-
-        if (empty($this->ref)) {
-            $this->ref = new ReflectionClass($this);
-        }
-
-        return $this->ref->newInstance($this->getInnerIterator()->getChildren(), $this->_rawOptions);
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
deleted file mode 100644
index dee203720..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EnabledResourceFilter.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is an iterator that will iterate only over enabled resources
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter extends RecursiveFilterIterator
-{
-
-    /**
-     * accept() is required by teh RecursiveFilterIterator
-     *
-     * @return bool
-     */
-    public function accept()
-    {
-        return $this->current()->isEnabled();
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Resource.php
deleted file mode 100644
index 7aa969db2..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Profile_Resource_Container
- */
-require_once 'Zend/Tool/Project/Profile/Resource/Container.php';
-
-/**
- * @see Zend_Tool_Project_Context_Repository
- */
-require_once 'Zend/Tool/Project/Context/Repository.php';
-
-/**
- * This class is an iterator that will iterate only over enabled resources
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Resource extends Zend_Tool_Project_Profile_Resource_Container
-{
-
-    /**
-     * @var Zend_Tool_Project_Profile
-     */
-    protected $_profile = null;
-
-    /**
-     * @var Zend_Tool_Project_Profile_Resource
-     */
-    protected $_parentResource = null;
-
-    /**#@+
-     * @var bool
-     */
-    protected $_deleted = false;
-    protected $_enabled = true;
-    /**#@-*/
-
-    /**
-     * @var Zend_Tool_Project_Context|string
-     */
-    protected $_context = null;
-
-    /**
-     * @var array
-     */
-    protected $_attributes = array();
-
-    /**
-     * @var bool
-     */
-    protected $_isContextInitialized = false;
-
-    /**
-     * __construct()
-     *
-     * @param string|Zend_Tool_Project_Context_Interface $context
-     */
-    public function __construct($context)
-    {
-        $this->setContext($context);
-    }
-
-    /**
-     * setContext()
-     *
-     * @param string|Zend_Tool_Project_Context_Interface $context
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function setContext($context)
-    {
-        $this->_context = $context;
-        return $this;
-    }
-
-    /**
-     * getContext()
-     *
-     * @return Zend_Tool_Project_Context_Interface
-     */
-    public function getContext()
-    {
-        return $this->_context;
-    }
-
-    /**
-     * getName() - Get the resource name
-     *
-     * Name is derived from the context name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        if (is_string($this->_context)) {
-            return $this->_context;
-        } elseif ($this->_context instanceof Zend_Tool_Project_Context_Interface) {
-            return $this->_context->getName();
-        } else {
-            throw new Zend_Tool_Project_Exception('Invalid context in resource');
-        }
-    }
-
-    /**
-     * setProfile()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function setProfile(Zend_Tool_Project_Profile $profile)
-    {
-        $this->_profile = $profile;
-        return $this;
-    }
-
-    /**
-     * getProfile
-     *
-     * @return Zend_Tool_Project_Profile
-     */
-    public function getProfile()
-    {
-        return $this->_profile;
-    }
-
-    /**
-     * getPersistentAttributes()
-     *
-     * @return array
-     */
-    public function getPersistentAttributes()
-    {
-        if (method_exists($this->_context, 'getPersistentAttributes')) {
-            return $this->_context->getPersistentAttributes();
-        }
-
-        return array();
-    }
-
-    /**
-     * setEnabled()
-     *
-     * @param bool $enabled
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function setEnabled($enabled = true)
-    {
-        // convert fuzzy types to bool
-        $this->_enabled = (!in_array($enabled, array('false', 'disabled', 0, -1, false), true)) ? true : false;
-        return $this;
-    }
-
-    /**
-     * isEnabled()
-     *
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->_enabled;
-    }
-
-    /**
-     * setDeleted()
-     *
-     * @param bool $deleted
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function setDeleted($deleted = true)
-    {
-        $this->_deleted = (bool) $deleted;
-        return $this;
-    }
-
-    /**
-     * isDeleted()
-     *
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function isDeleted()
-    {
-        return $this->_deleted;
-    }
-
-    /**
-     * initializeContext()
-     *
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function initializeContext()
-    {
-        if ($this->_isContextInitialized) {
-            return;
-        }
-        if (is_string($this->_context)) {
-            $this->_context = Zend_Tool_Project_Context_Repository::getInstance()->getContext($this->_context);
-        }
-
-        if (method_exists($this->_context, 'setResource')) {
-            $this->_context->setResource($this);
-        }
-
-        if (method_exists($this->_context, 'init')) {
-            $this->_context->init();
-        }
-
-        $this->_isContextInitialized = true;
-        return $this;
-    }
-
-    /**
-     * __toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_context->getName();
-    }
-
-    /**
-     * __call()
-     *
-     * @param string $method
-     * @param array $arguments
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function __call($method, $arguments)
-    {
-        if (method_exists($this->_context, $method)) {
-            if (!$this->isEnabled()) {
-                $this->setEnabled(true);
-            }
-            return call_user_func_array(array($this->_context, $method), $arguments);
-        } else {
-            throw new Zend_Tool_Project_Profile_Exception('cannot call ' . $method);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/Container.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/Container.php
deleted file mode 100644
index bf5106b4e..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/Container.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Container.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Profile_Resource_SearchConstraints
- */
-require_once 'Zend/Tool/Project/Profile/Resource/SearchConstraints.php';
-
-/**
- * This class is an iterator that will iterate only over enabled resources
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, Countable
-{
-
-    /**
-     * @var array
-     */
-    protected $_subResources = array();
-
-    /**
-     * @var int
-     */
-    protected $_position = 0;
-
-    /**
-     * @var bool
-     */
-    protected $_appendable = true;
-    
-    /**
-     * @var array
-     */
-    protected $_attributes = array();
-
-    /**
-     * Finder method to be able to find resources by context name
-     * and attributes.  Example usage:
-     *
-     * <code>
-     *
-     * </code>
-     *
-     * @param Zend_Tool_Project_Profile_Resource_SearchConstraints|string|array $searchParameters
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function search($matchSearchConstraints, $nonMatchSearchConstraints = null)
-    {
-        if (!$matchSearchConstraints instanceof Zend_Tool_Project_Profile_Resource_SearchConstraints) {
-            $matchSearchConstraints = new Zend_Tool_Project_Profile_Resource_SearchConstraints($matchSearchConstraints);
-        }
-
-        $this->rewind();
-
-        /**
-         * @todo This should be re-written with better support for a filter iterator, its the way to go
-         */
-
-        if ($nonMatchSearchConstraints) {
-            $filterIterator = new Zend_Tool_Project_Profile_Iterator_ContextFilter($this, array('denyNames' => $nonMatchSearchConstraints));
-            $riIterator = new RecursiveIteratorIterator($filterIterator, RecursiveIteratorIterator::SELF_FIRST);
-        } else {
-            $riIterator = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::SELF_FIRST);
-        }
-
-        $foundResource     = false;
-        $currentConstraint = $matchSearchConstraints->getConstraint();
-        $foundDepth        = 0;
-
-        foreach ($riIterator as $currentResource) {
-
-            // if current depth is less than found depth, end
-            if ($riIterator->getDepth() < $foundDepth) {
-                break;
-            }
-
-            if (strtolower($currentResource->getName()) == strtolower($currentConstraint->name)) {
-
-                $paramsMatch = true;
-
-                // @todo check to ensure params match (perhaps)
-                if (count($currentConstraint->params) > 0) {
-                    $currentResourceAttributes = $currentResource->getAttributes();
-                    if (!is_array($currentConstraint->params)) {
-                        require_once 'Zend/Tool/Project/Profile/Exception.php';
-                        throw new Zend_Tool_Project_Profile_Exception('Search parameter specifics must be in the form of an array for key "'
-                            . $currentConstraint->name .'"');
-                    }
-                    foreach ($currentConstraint->params as $paramName => $paramValue) {
-                        if (!isset($currentResourceAttributes[$paramName]) || $currentResourceAttributes[$paramName] != $paramValue) {
-                            $paramsMatch = false;
-                            break;
-                        }
-                    }
-                }
-
-                if ($paramsMatch) {
-                    $foundDepth = $riIterator->getDepth();
-
-                    if (($currentConstraint = $matchSearchConstraints->getConstraint()) == null) {
-                        $foundResource = $currentResource;
-                        break;
-                    }
-                }
-
-            }
-
-        }
-
-        return $foundResource;
-    }
-
-    /**
-     * createResourceAt()
-     *
-     * @param array|Zend_Tool_Project_Profile_Resource_SearchConstraints $appendResourceOrSearchConstraints
-     * @param string $context
-     * @param array $attributes
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function createResourceAt($appendResourceOrSearchConstraints, $context, Array $attributes = array())
-    {
-        if (!$appendResourceOrSearchConstraints instanceof Zend_Tool_Project_Profile_Resource_Container) {
-            if (($parentResource = $this->search($appendResourceOrSearchConstraints)) == false) {
-                require_once 'Zend/Tool/Project/Profile/Exception.php';
-                throw new Zend_Tool_Project_Profile_Exception('No node was found to append to.');
-            }
-        } else {
-            $parentResource = $appendResourceOrSearchConstraints;
-        }
-
-        return $parentResource->createResource($context, $attributes);
-    }
-
-    /**
-     * createResource()
-     *
-     * Method to create a resource with a given context with specific attributes
-     *
-     * @param string $context
-     * @param array $attributes
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function createResource($context, Array $attributes = array())
-    {
-        if (is_string($context)) {
-            $contextRegistry = Zend_Tool_Project_Context_Repository::getInstance();
-            if ($contextRegistry->hasContext($context)) {
-                $context = $contextRegistry->getContext($context);
-            } else {
-                require_once 'Zend/Tool/Project/Profile/Exception.php';
-                throw new Zend_Tool_Project_Profile_Exception('Context by name ' . $context . ' was not found in the context registry.');
-            }
-        } elseif (!$context instanceof Zend_Tool_Project_Context_Interface) {
-            require_once 'Zend/Tool/Project/Profile/Exception.php';
-            throw new Zend_Tool_Project_Profile_Exception('Context must be of type string or Zend_Tool_Project_Context_Interface.');
-        }
-
-        $newResource = new Zend_Tool_Project_Profile_Resource($context);
-
-        if ($attributes) {
-            $newResource->setAttributes($attributes);
-        }
-
-        /**
-         * Interesting logic here:
-         *
-         * First set the parentResource (this will also be done inside append).  This will allow
-         * the initialization routine to change the appendability of the parent resource.  This
-         * is important to allow specific resources to be appendable by very specific sub-resources.
-         */
-        $newResource->setParentResource($this);
-        $newResource->initializeContext();
-        $this->append($newResource);
-
-        return $newResource;
-    }
-
-    /**
-     * setAttributes()
-     *
-     * persist the attributes if the resource will accept them
-     *
-     * @param array $attributes
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function setAttributes(Array $attributes)
-    {
-        foreach ($attributes as $attrName => $attrValue) {
-            $setMethod = 'set' . $attrName;
-            if (method_exists($this, $setMethod)) {
-                $this->{$setMethod}($attrValue);
-            } else {
-                $this->setAttribute($attrName, $attrValue);
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * getAttributes()
-     *
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->_attributes;
-    }
-
-    /**
-     * setAttribute()
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->_attributes[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * getAttribute()
-     *
-     * @param string $name
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function getAttribute($name)
-    {
-        return (array_key_exists($name, $this->_attributes)) ? $this->_attributes[$name] : null;
-    }
-    
-    /**
-     * hasAttribute()
-     * 
-     * @param string $name
-     * @return bool
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->_attributes);
-    }
-
-    /**
-     * setAppendable()
-     *
-     * @param bool $appendable
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function setAppendable($appendable)
-    {
-        $this->_appendable = (bool) $appendable;
-        return $this;
-    }
-
-    /**
-     * isAppendable()
-     *
-     * @return bool
-     */
-    public function isAppendable()
-    {
-        return $this->_appendable;
-    }
-
-    /**
-     * setParentResource()
-     *
-     * @param Zend_Tool_Project_Profile_Resource_Container $parentResource
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function setParentResource(Zend_Tool_Project_Profile_Resource_Container $parentResource)
-    {
-        $this->_parentResource = $parentResource;
-        return $this;
-    }
-
-    /**
-     * getParentResource()
-     *
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function getParentResource()
-    {
-        return $this->_parentResource;
-    }
-
-    /**
-     * append()
-     *
-     * @param Zend_Tool_Project_Profile_Resource_Container $resource
-     * @return Zend_Tool_Project_Profile_Resource_Container
-     */
-    public function append(Zend_Tool_Project_Profile_Resource_Container $resource)
-    {
-        if (!$this->isAppendable()) {
-            throw new Exception('Resource by name ' . (string) $this . ' is not appendable');
-        }
-        array_push($this->_subResources, $resource);
-        $resource->setParentResource($this);
-
-        return $this;
-    }
-
-    /**
-     * current() - required by RecursiveIterator
-     *
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public function current()
-    {
-        return current($this->_subResources);
-    }
-
-    /**
-     * key() - required by RecursiveIterator
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return key($this->_subResources);
-    }
-
-    /**
-     * next() - required by RecursiveIterator
-     *
-     * @return bool
-     */
-    public function next()
-    {
-        return next($this->_subResources);
-    }
-
-    /**
-     * rewind() - required by RecursiveIterator
-     *
-     * @return bool
-     */
-    public function rewind()
-    {
-        return reset($this->_subResources);
-    }
-
-    /**
-     * valid() - - required by RecursiveIterator
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return (bool) $this->current();
-    }
-
-    /**
-     * hasChildren()
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return (count($this->_subResources > 0)) ? true : false;
-    }
-
-    /**
-     * getChildren()
-     *
-     * @return array
-     */
-    public function getChildren()
-    {
-        return $this->current();
-    }
-
-    /**
-     * count()
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_subResources);
-    }
-
-    /**
-     * __clone()
-     *
-     */
-    public function __clone()
-    {
-        $this->rewind();
-        foreach ($this->_subResources as $index => $resource) {
-            $this->_subResources[$index] = clone $resource;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php b/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
deleted file mode 100644
index f087d5df6..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: SearchConstraints.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * This class is an iterator that will iterate only over enabled resources
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Profile_Resource_SearchConstraints
-{
-
-    /**
-     * @var array
-     */
-    protected $_constraints = array();
-
-    /**
-     * __construct()
-     *
-     * @param array|string $options
-     */
-    public function __construct($options = null)
-    {
-        if (is_string($options)) {
-            $this->addConstraint($options);
-        } elseif (is_array($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * setOptions()
-     *
-     * @param array $option
-     * @return Zend_Tool_Project_Profile_Resource_SearchConstraints
-     */
-    public function setOptions(Array $option)
-    {
-        foreach ($option as $optionName => $optionValue) {
-            if (is_int($optionName)) {
-                $this->addConstraint($optionValue);
-            } elseif (is_string($optionName)) {
-                $this->addConstraint(array('name' => $optionName, 'params' => $optionValue));
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * addConstraint()
-     *
-     * @param string|array $constraint
-     * @return Zend_Tool_Project_Profile_Resource_SearchConstraints
-     */
-    public function addConstraint($constraint)
-    {
-        if (is_string($constraint)) {
-            $name   = $constraint;
-            $params = array();
-        } elseif (is_array($constraint)) {
-            $name   = $constraint['name'];
-            $params = $constraint['params'];
-        }
-
-        $constraint = $this->_makeConstraint($name, $params);
-
-        array_push($this->_constraints, $constraint);
-        return $this;
-    }
-
-    /**
-     * getConstraint()
-     *
-     * @return ArrayObject
-     */
-    public function getConstraint()
-    {
-        return array_shift($this->_constraints);
-    }
-
-    /**
-     * _makeConstraint
-     *
-     * @param string $name
-     * @param mixed $params
-     * @return ArrayObject
-     */
-    protected function _makeConstraint($name, $params)
-    {
-        $value = array('name' => $name, 'params' => $params);
-        return new ArrayObject($value, ArrayObject::ARRAY_AS_PROPS);
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Abstract.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Abstract.php
deleted file mode 100644
index e8edd2441..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Abstract.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Profile
- */
-require_once 'Zend/Tool/Project/Profile.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Abstract
- */
-require_once 'Zend/Tool/Framework/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Project_Context_Repository
- */
-require_once 'Zend/Tool/Project/Context/Repository.php';
-
-/**
- * @see Zend_Tool_Project_Profile_FileParser_Xml
- */
-require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php';
-
-/**
- * @see Zend_Tool_Framework_Registry
- */
-require_once 'Zend/Tool/Framework/Registry.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Tool_Project_Provider_Abstract extends Zend_Tool_Framework_Provider_Abstract
-{
-
-    const NO_PROFILE_THROW_EXCEPTION = true;
-    const NO_PROFILE_RETURN_FALSE    = false;
-
-    /**
-     * @var bool
-     */
-    protected static $_isInitialized = false;
-
-    protected $_projectPath = null;
-
-    /**
-     * @var Zend_Tool_Project_Profile
-     */
-    protected $_loadedProfile = null;
-
-    /**
-     * constructor
-     *
-     * YOU SHOULD NOT OVERRIDE THIS, unless you know what you are doing
-     *
-     */
-    public function __construct()
-    {
-        // initialize the ZF Contexts (only once per php request)
-        if (!self::$_isInitialized) {
-            $contextRegistry = Zend_Tool_Project_Context_Repository::getInstance();
-            $contextRegistry->addContextsFromDirectory(
-                dirname(dirname(__FILE__)) . '/Context/Zf/', 'Zend_Tool_Project_Context_Zf_'
-            );
-            $contextRegistry->addContextsFromDirectory(
-                dirname(dirname(__FILE__)) . '/Context/Filesystem/', 'Zend_Tool_Project_Context_Filesystem_'
-            );
-            self::$_isInitialized = true;
-        }
-
-        // load up the extending providers required context classes
-        if ($contextClasses = $this->getContextClasses()) {
-            $this->_loadContextClassesIntoRegistry($contextClasses);
-        }
-
-    }
-
-    public function getContextClasses()
-    {
-        return array();
-    }
-
-    /**
-     * _getProject is designed to find if there is project file in the context of where
-     * the client has been called from..   The search order is as follows..
-     *    - traversing downwards from (PWD) - current working directory
-     *    - if an enpoint variable has been registered in teh client registry - key=workingDirectory
-     *    - if an ENV variable with the key ZFPROJECT_PATH is found
-     *
-     * @param $loadProfileFlag bool Whether or not to throw an exception when no profile is found
-     * @param $projectDirectory string The project directory to use to search
-     * @param $searchParentDirectories bool Whether or not to search upper level direcotries
-     * @return Zend_Tool_Project_Profile
-     */
-    protected function _loadProfile($loadProfileFlag = self::NO_PROFILE_THROW_EXCEPTION, $projectDirectory = null, $searchParentDirectories = true)
-    {
-        // use the cwd if no directory was provided
-        if ($projectDirectory == null) {
-            $projectDirectory = getcwd();
-        } elseif (realpath($projectDirectory) == false) {
-            throw new Zend_Tool_Project_Provider_Exception('The $projectDirectory supplied does not exist.');
-        }
-
-        $profile = new Zend_Tool_Project_Profile();
-
-        $parentDirectoriesArray = explode(DIRECTORY_SEPARATOR, ltrim($projectDirectory, DIRECTORY_SEPARATOR));
-        while ($parentDirectoriesArray) {
-            $projectDirectoryAssembled = implode(DIRECTORY_SEPARATOR, $parentDirectoriesArray);
-
-            if (DIRECTORY_SEPARATOR !== "\\") {
-                $projectDirectoryAssembled = DIRECTORY_SEPARATOR . $projectDirectoryAssembled;
-            }
-
-            $profile->setAttribute('projectDirectory', $projectDirectoryAssembled);
-            if ($profile->isLoadableFromFile()) {
-                chdir($projectDirectoryAssembled);
-
-                $profile->loadFromFile();
-                $this->_loadedProfile = $profile;
-                break;
-            }
-
-            // break after first run if we are not to check upper directories
-            if ($searchParentDirectories == false) {
-                break;
-            }
-
-            array_pop($parentDirectoriesArray);
-        }
-
-        if ($this->_loadedProfile == null) {
-            if ($loadProfileFlag == self::NO_PROFILE_THROW_EXCEPTION) {
-                throw new Zend_Tool_Project_Provider_Exception('A project profile was not found.');
-            } elseif ($loadProfileFlag == self::NO_PROFILE_RETURN_FALSE) {
-                return false;
-            }
-        }
-
-        return $profile;
-    }
-
-    /**
-     * Load the project profile from the current working directory, if not throw exception
-     *
-     * @return Zend_Tool_Project_Profile
-     */
-    protected function _loadProfileRequired()
-    {
-        $profile = $this->_loadProfile();
-        if ($profile === false) {
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('A project profile was not found in the current working directory.');
-        }
-        return $profile;
-    }
-
-    /**
-     * Return the currently loaded profile
-     *
-     * @return Zend_Tool_Project_Profile
-     */
-    protected function _getProfile($loadProfileFlag = self::NO_PROFILE_THROW_EXCEPTION)
-    {
-        if (!$this->_loadedProfile) {
-            if (($this->_loadProfile($loadProfileFlag) === false) && ($loadProfileFlag === self::NO_PROFILE_RETURN_FALSE)) {
-                return false;
-            }
-        }
-
-        return $this->_loadedProfile;
-    }
-
-    /**
-     * _storeProfile()
-     *
-     * This method will store the profile into its proper location
-     *
-     */
-    protected function _storeProfile()
-    {
-        $projectProfileFile = $this->_loadedProfile->search('ProjectProfileFile');
-
-        $name = $projectProfileFile->getContext()->getPath();
-
-        $this->_registry->getResponse()->appendContent('Updating project profile \'' . $name . '\'');
-
-        $projectProfileFile->getContext()->save();
-    }
-
-    protected function _getContentForContext(Zend_Tool_Project_Context_Interface $context, $methodName, $parameters)
-    {
-        $storage = $this->_registry->getStorage();
-        if (!$storage->isEnabled()) {
-            return false;
-        }
-
-        if (!class_exists('Zend_Tool_Project_Context_Content_Engine')) {
-            require_once 'Zend/Tool/Project/Context/Content/Engine.php';
-        }
-
-        $engine = new Zend_Tool_Project_Context_Content_Engine($storage);
-        return $engine->getContent($context, $methodName, $parameters);
-    }
-
-    /**
-     * _loadContextClassesIntoRegistry() - This is called by the constructor
-     * so that child providers can provide a list of contexts to load into the
-     * context repository
-     *
-     * @param array $contextClasses
-     */
-    private function _loadContextClassesIntoRegistry($contextClasses)
-    {
-        $registry = Zend_Tool_Project_Context_Repository::getInstance();
-
-        foreach ($contextClasses as $contextClass) {
-            $registry->addContextClass($contextClass);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Action.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Action.php
deleted file mode 100644
index 4e802d3d4..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Action.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Action.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Pretendable
- */
-require_once 'Zend/Tool/Framework/Provider/Pretendable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Action
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Pretendable
-{
-
-    /**
-     * createResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $actionName
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createResource(Zend_Tool_Project_Profile $profile, $actionName, $controllerName, $moduleName = null)
-    {
-
-        if (!is_string($actionName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Action::createResource() expects \"actionName\" is the name of a action resource to create.');
-        }
-
-        if (!is_string($controllerName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Action::createResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        $controllerFile = self::_getControllerFileResource($profile, $controllerName, $moduleName);
-
-        $actionMethod = $controllerFile->createResource('ActionMethod', array('actionName' => $actionName));
-
-        return $actionMethod;
-    }
-
-    /**
-     * hasResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $actionName
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function hasResource(Zend_Tool_Project_Profile $profile, $actionName, $controllerName, $moduleName = null)
-    {
-        if (!is_string($actionName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Action::createResource() expects \"actionName\" is the name of a action resource to create.');
-        }
-
-        if (!is_string($controllerName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Action::createResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        $controllerFile = self::_getControllerFileResource($profile, $controllerName, $moduleName);
-
-        if ($controllerFile == null) {
-            throw new Zend_Tool_Project_Provider_Exception('Controller ' . $controllerName . ' was not found.');
-        }
-       
-        return (($controllerFile->search(array('actionMethod' => array('actionName' => $actionName)))) instanceof Zend_Tool_Project_Profile_Resource);
-    }
-
-    /**
-     * _getControllerFileResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    protected static function _getControllerFileResource(Zend_Tool_Project_Profile $profile, $controllerName, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'controllersDirectory';
-        $profileSearchParams['controllerFile'] = array('controllerName' => $controllerName);
-
-        return $profile->search($profileSearchParams);
-    }
-
-    /**
-     * create()
-     *
-     * @param string $name           Action name for controller, in camelCase format.
-     * @param string $controllerName Controller name action should be applied to.
-     * @param bool $viewIncluded     Whether the view should the view be included.
-     * @param string $module         Module name action should be applied to.
-     */
-    public function create($name, $controllerName = 'Index', $viewIncluded = true, $module = null)
-    {
-
-        $this->_loadProfile();
-
-        // Check that there is not a dash or underscore, return if doesnt match regex
-        if (preg_match('#[_-]#', $name)) {
-            throw new Zend_Tool_Project_Provider_Exception('Action names should be camel cased.');
-        }
-        
-        $originalName = $name;
-        $originalControllerName = $controllerName;
-        
-        // ensure it is camelCase (lower first letter)
-        $name = strtolower(substr($name, 0, 1)) . substr($name, 1);
-        
-        // ensure controller is MixedCase
-        $controllerName = ucfirst($controllerName);
-        
-        if (self::hasResource($this->_loadedProfile, $name, $controllerName, $module)) {
-            throw new Zend_Tool_Project_Provider_Exception('This controller (' . $controllerName . ') already has an action named (' . $name . ')');
-        }
-        
-        $actionMethod = self::createResource($this->_loadedProfile, $name, $controllerName, $module);
-
-        // get request/response object
-        $request = $this->_registry->getRequest();
-        $response = $this->_registry->getResponse();
-        
-        // alert the user about inline converted names
-        $tense = (($request->isPretend()) ? 'would be' : 'is');
-        
-        if ($name !== $originalName) {
-            $response->appendContent(
-                'Note: The canonical action name that ' . $tense
-                    . ' used with other providers is "' . $name . '";'
-                    . ' not "' . $originalName . '" as supplied',
-                array('color' => array('yellow'))
-                );
-        }
-        
-        if ($controllerName !== $originalControllerName) {
-            $response->appendContent(
-                'Note: The canonical controller name that ' . $tense
-                    . ' used with other providers is "' . $controllerName . '";'
-                    . ' not "' . $originalControllerName . '" as supplied',
-                array('color' => array('yellow'))
-                );
-        }
-        
-        unset($tense);
-        
-        if ($request->isPretend()) {
-            $response->appendContent(
-                'Would create an action named ' . $name .
-                ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath()
-                );
-        } else {
-            $response->appendContent(
-                'Creating an action named ' . $name .
-                ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath()
-                );
-            $actionMethod->create();
-            $this->_storeProfile();
-        }
-
-        if ($viewIncluded) {
-            $viewResource = Zend_Tool_Project_Provider_View::createResource($this->_loadedProfile, $name, $controllerName, $module);
-
-            if ($this->_registry->getRequest()->isPretend()) {
-                $response->appendContent(
-                    'Would create a view script for the ' . $name . ' action method at ' . $viewResource->getContext()->getPath()
-                    );
-            } else {
-                $response->appendContent(
-                    'Creating a view script for the ' . $name . ' action method at ' . $viewResource->getContext()->getPath()
-                    );
-                $viewResource->create();
-                $this->_storeProfile();
-            }
-
-        }
-
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Application.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Application.php
deleted file mode 100644
index 807e8a0f6..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Application.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Model.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Application 
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Pretendable
-{
-    
-    protected $_specialties = array('ClassNamePrefix');
-    
-    /**
-     * 
-     * @param $classNamePrefix Prefix of classes
-     * @param $force
-     */
-    public function changeClassNamePrefix($classNamePrefix /* , $force = false */)
-    {
-        $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-        
-        $originalClassNamePrefix = $classNamePrefix;
-        
-        if (substr($classNamePrefix, -1) != '_') {
-            $classNamePrefix .= '_';
-        }
-        
-        $configFileResource = $profile->search('ApplicationConfigFile');
-        $zc = $configFileResource->getAsZendConfig('production');
-        if ($zc->appnamespace == $classNamePrefix) {
-            throw new Zend_Tool_Project_Exception('The requested name ' . $classNamePrefix . ' is already the prefix.');
-        }
-
-        // remove the old
-        $configFileResource->removeStringItem('appnamespace', 'production');
-        $configFileResource->create();
-        
-        // add the new
-        $configFileResource->addStringItem('appnamespace', $classNamePrefix, 'production', true);
-        $configFileResource->create();
-        
-        // update the project profile
-        $applicationDirectory = $profile->search('ApplicationDirectory');
-        $applicationDirectory->setClassNamePrefix($classNamePrefix);
-
-        $response = $this->_registry->getResponse();
-        
-        if ($originalClassNamePrefix !== $classNamePrefix) {
-            $response->appendContent(
-                'Note: the name provided "' . $originalClassNamePrefix . '" was'
-                    . ' altered to "' . $classNamePrefix . '" for correctness.',
-                array('color' => 'yellow')
-                );
-        } 
-        
-        // note to the user
-        $response->appendContent('Note: All existing models will need to be altered to this new namespace by hand', array('color' => 'yellow'));
-        $response->appendContent('application.ini updated with new appnamespace ' . $classNamePrefix);
-        
-        // store profile
-        $this->_storeProfile();
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Controller.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Controller.php
deleted file mode 100644
index 57134461a..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Controller.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Controller.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Controller
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Pretendable
-{
-
-    /**
-     * createResource will create the controllerFile resource at the appropriate location in the
-     * profile.  NOTE: it is your job to execute the create() method on the resource, as well as
-     * store the profile when done.
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createResource(Zend_Tool_Project_Profile $profile, $controllerName, $moduleName = null)
-    {
-        if (!is_string($controllerName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Controller::createResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        if (!($controllersDirectory = self::_getControllersDirectoryResource($profile, $moduleName))) {
-            if ($moduleName) {
-                $exceptionMessage = 'A controller directory for module "' . $moduleName . '" was not found.';
-            } else {
-                $exceptionMessage = 'A controller directory was not found.';
-            }
-            throw new Zend_Tool_Project_Provider_Exception($exceptionMessage);
-        }
-
-        $newController = $controllersDirectory->createResource(
-            'controllerFile', 
-            array('controllerName' => $controllerName, 'moduleName' => $moduleName)
-            );
-
-        return $newController;
-    }
-
-    /**
-     * hasResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function hasResource(Zend_Tool_Project_Profile $profile, $controllerName, $moduleName = null)
-    {
-        if (!is_string($controllerName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Controller::createResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        $controllersDirectory = self::_getControllersDirectoryResource($profile, $moduleName);
-        return (($controllersDirectory->search(array('controllerFile' => array('controllerName' => $controllerName)))) instanceof Zend_Tool_Project_Profile_Resource);
-    }
-
-    /**
-     * _getControllersDirectoryResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    protected static function _getControllersDirectoryResource(Zend_Tool_Project_Profile $profile, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'controllersDirectory';
-
-        return $profile->search($profileSearchParams);
-    }
-
-    /**
-     * Create a new controller
-     *
-     * @param string $name The name of the controller to create, in camelCase.
-     * @param bool $indexActionIncluded Whether or not to create the index action.
-     */
-    public function create($name, $indexActionIncluded = true, $module = null)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-
-        // determine if testing is enabled in the project
-        require_once 'Zend/Tool/Project/Provider/Test.php';
-        $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
-
-        if (self::hasResource($this->_loadedProfile, $name, $module)) {
-            throw new Zend_Tool_Project_Provider_Exception('This project already has a controller named ' . $name);
-        }
-
-        // Check that there is not a dash or underscore, return if doesnt match regex
-        if (preg_match('#[_-]#', $name)) {
-            throw new Zend_Tool_Project_Provider_Exception('Controller names should be camel cased.');
-        }
-        
-        $originalName = $name;
-        $name = ucfirst($name);
-        
-        // get request & response
-        $request = $this->_registry->getRequest();
-        $response = $this->_registry->getResponse();
-        
-        try {
-            $controllerResource = self::createResource($this->_loadedProfile, $name, $module);
-            if ($indexActionIncluded) {
-                $indexActionResource = Zend_Tool_Project_Provider_Action::createResource($this->_loadedProfile, 'index', $name, $module);
-                $indexActionViewResource = Zend_Tool_Project_Provider_View::createResource($this->_loadedProfile, 'index', $name, $module);
-            }
-            if ($testingEnabled) {
-                $testControllerResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module);
-            }
-
-        } catch (Exception $e) {
-            $response->setException($e);
-            return;
-        }
-
-        // determime if we need to note to the user about the name
-        if (($name !== $originalName)) {
-            $tense = (($request->isPretend()) ? 'would be' : 'is');
-            $response->appendContent(
-                'Note: The canonical controller name that ' . $tense
-                    . ' used with other providers is "' . $name . '";'
-                    . ' not "' . $originalName . '" as supplied',
-                array('color' => array('yellow'))
-                );
-            unset($tense);
-        }
-        
-        // do the creation
-        if ($request->isPretend()) {
-            
-            $response->appendContent('Would create a controller at '  . $controllerResource->getContext()->getPath());
-
-            if (isset($indexActionResource)) {
-                $response->appendContent('Would create an index action method in controller ' . $name);
-                $response->appendContent('Would create a view script for the index action method at ' . $indexActionViewResource->getContext()->getPath());
-            }
-            
-            if ($testControllerResource) {
-                $response->appendContent('Would create a controller test file at ' . $testControllerResource->getContext()->getPath());
-            }
-
-        } else {
-
-            $response->appendContent('Creating a controller at ' . $controllerResource->getContext()->getPath());
-            $controllerResource->create();
-
-            if (isset($indexActionResource)) {
-                $response->appendContent('Creating an index action method in controller ' . $name);
-                $indexActionResource->create();
-                $response->appendContent('Creating a view script for the index action method at ' . $indexActionViewResource->getContext()->getPath());
-                $indexActionViewResource->create();
-            }
-
-            if ($testControllerResource) {
-                $response->appendContent('Creating a controller test file at ' . $testControllerResource->getContext()->getPath());
-                $testControllerResource->create();
-            }
-
-            $this->_storeProfile();
-        }
-
-    }
-
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/DbAdapter.php b/airtime_mvc/library/Zend/Tool/Project/Provider/DbAdapter.php
deleted file mode 100644
index 8c98049ed..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/DbAdapter.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Interactable
- */
-require_once 'Zend/Tool/Framework/Provider/Interactable.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_DbAdapter
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Interactable, Zend_Tool_Framework_Provider_Pretendable
-{
-    
-    protected $_appConfigFilePath = null;
-    
-    protected $_config = null;
-    
-    protected $_sectionName = 'production';
-    
-    public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sectionName = 'production')
-    {
-        $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-        
-        $appConfigFileResource = $profile->search('applicationConfigFile');
-                
-        if ($appConfigFileResource == false) {
-            throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.');
-        }
-        
-        $this->_appConfigFilePath = $appConfigFileResource->getPath();
-        
-        $this->_config = new Zend_Config_Ini($this->_appConfigFilePath, null, array('skipExtends' => true, 'allowModifications' => true));
-        
-        if ($sectionName != 'production') {
-            $this->_sectionName = $sectionName;
-        }
-        
-        if (!isset($this->_config->{$this->_sectionName})) {
-            throw new Zend_Tool_Project_Exception('The config does not have a ' . $this->_sectionName . ' section.');
-        }
-        
-        if (isset($this->_config->{$this->_sectionName}->resources->db)) {
-            throw new Zend_Tool_Project_Exception('The config already has a db resource configured in section ' . $this->_sectionName . '.');
-        }
-        
-        if ($dsn) {
-            $this->_configureViaDSN($dsn);
-        //} elseif ($interactivelyPrompt) {
-        //    $this->_promptForConfig();
-        } else {
-            $this->_registry->getResponse()->appendContent('Nothing to do!');
-        }
-        
-        
-    }
-    
-    protected function _configureViaDSN($dsn)
-    {
-        $dsnVars = array();
-        
-        if (strpos($dsn, '=') === false) {
-            throw new Zend_Tool_Project_Provider_Exception('At least one name value pair is expected, typcially '
-                . 'in the format of "adapter=Mysqli&username=uname&password=mypass&dbname=mydb"' 
-                );
-        }
-        
-        parse_str($dsn, $dsnVars);
-
-        // parse_str suffers when magic_quotes is enabled
-        if (get_magic_quotes_gpc()) {
-            array_walk_recursive($dsnVars, array($this, '_cleanMagicQuotesInValues'));
-        }
-        
-        $dbConfigValues = array('resources' => array('db' => null));
-        
-        if (isset($dsnVars['adapter'])) {
-            $dbConfigValues['resources']['db']['adapter'] = $dsnVars['adapter'];
-            unset($dsnVars['adapter']);
-        }
-        
-        $dbConfigValues['resources']['db']['params'] = $dsnVars;
-        
-        $isPretend = $this->_registry->getRequest()->isPretend();
-
-        // get the config resource
-        $applicationConfig = $this->_loadedProfile->search('ApplicationConfigFile');
-        $applicationConfig->addItem($dbConfigValues, $this->_sectionName, null);
-        
-        $response = $this->_registry->getResponse();
-        
-        if ($isPretend) {
-            $response->appendContent('A db configuration for the ' . $this->_sectionName
-                . ' section would be written to the application config file with the following contents: '
-                );
-            $response->appendContent($applicationConfig->getContents());
-        } else {
-            $applicationConfig->create();
-            $response->appendContent('A db configuration for the ' . $this->_sectionName
-                . ' section has been written to the application config file.'
-                );
-        }
-    }
-    
-    protected function _cleanMagicQuotesInValues(&$value, $key)
-    {
-        $value = stripslashes($value);
-    }
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/DbTable.php b/airtime_mvc/library/Zend/Tool/Project/Provider/DbTable.php
deleted file mode 100644
index e8ecdcf42..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/DbTable.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_DbTable 
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Pretendable
-{
-    
-    protected $_specialties = array('FromDatabase');
-    
-    /**
-     * @var Zend_Filter
-     */
-    protected $_nameFilter = null;
-    
-    public static function createResource(Zend_Tool_Project_Profile $profile, $dbTableName, $actualTableName, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'modelsDirectory';
-        
-        $modelsDirectory = $profile->search($profileSearchParams);
-        
-        if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource)) {
-            throw new Zend_Tool_Project_Provider_Exception(
-                'A models directory was not found' .
-                (($moduleName) ? ' for module ' . $moduleName . '.' : '.')
-                );
-        }
-        
-        if (!($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) {
-            $dbTableDirectory = $modelsDirectory->createResource('DbTableDirectory');
-        }
-        
-        $dbTableFile = $dbTableDirectory->createResource('DbTableFile', array('dbTableName' => $dbTableName, 'actualTableName' => $actualTableName));
-        
-        return $dbTableFile;
-    }
-    
-    public static function hasResource(Zend_Tool_Project_Profile $profile, $dbTableName, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'modelsDirectory';
-        
-        $modelsDirectory = $profile->search($profileSearchParams);
-        
-        if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource)
-            || !($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) {
-            return false;
-        }
-        
-        $dbTableFile = $dbTableDirectory->search(array('DbTableFile' => array('dbTableName' => $dbTableName)));
-        
-        return ($dbTableFile instanceof Zend_Tool_Project_Profile_Resource) ? true : false;
-    }
-      
-    
-    public function create($name, $actualTableName, $module = null, $forceOverwrite = false)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-
-        // Check that there is not a dash or underscore, return if doesnt match regex
-        if (preg_match('#[_-]#', $name)) {
-            throw new Zend_Tool_Project_Provider_Exception('DbTable names should be camel cased.');
-        }
-        
-        $originalName = $name;
-        $name = ucfirst($name);
-        
-        if ($actualTableName == '') {
-            throw new Zend_Tool_Project_Provider_Exception('You must provide both the DbTable name as well as the actual db table\'s name.');
-        }
-        
-        if (self::hasResource($this->_loadedProfile, $name, $module)) {
-            throw new Zend_Tool_Project_Provider_Exception('This project already has a DbTable named ' . $name);
-        }
-
-        // get request/response object
-        $request = $this->_registry->getRequest();
-        $response = $this->_registry->getResponse();
-        
-        // alert the user about inline converted names
-        $tense = (($request->isPretend()) ? 'would be' : 'is');
-        
-        if ($name !== $originalName) {
-            $response->appendContent(
-                'Note: The canonical model name that ' . $tense
-                    . ' used with other providers is "' . $name . '";'
-                    . ' not "' . $originalName . '" as supplied',
-                array('color' => array('yellow'))
-                );
-        }
-        
-        try {
-            $tableResource = self::createResource($this->_loadedProfile, $name, $actualTableName, $module);
-        } catch (Exception $e) {
-            $response = $this->_registry->getResponse();
-            $response->setException($e);
-            return;
-        }
-
-        // do the creation
-        if ($request->isPretend()) {
-            $response->appendContent('Would create a DbTable at '  . $tableResource->getContext()->getPath());
-        } else {
-            $response->appendContent('Creating a DbTable at ' . $tableResource->getContext()->getPath());
-            $tableResource->create();
-            $this->_storeProfile();
-        }
-    }
-    
-    public function createFromDatabase($module = null, $forceOverwrite = false)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-        
-        $bootstrapResource = $this->_loadedProfile->search('BootstrapFile');
-        
-        /* @var $zendApp Zend_Application */
-        $zendApp = $bootstrapResource->getApplicationInstance();
-        
-        try {
-            $zendApp->bootstrap('db');
-        } catch (Zend_Application_Exception $e) {
-            throw new Zend_Tool_Project_Provider_Exception('Db resource not available, you might need to configure a DbAdapter.');
-            return;
-        }
-        
-        /* @var $db Zend_Db_Adapter_Abstract */
-        $db = $zendApp->getBootstrap()->getResource('db');
-        
-        $tableResources = array();
-        foreach ($db->listTables() as $actualTableName) {
-            
-            $dbTableName = $this->_convertTableNameToClassName($actualTableName);
-            
-            if (!$forceOverwrite && self::hasResource($this->_loadedProfile, $dbTableName, $module)) {
-                throw new Zend_Tool_Project_Provider_Exception(
-                    'This DbTable resource already exists, if you wish to overwrite it, '
-                    . 'pass the "forceOverwrite" flag to this provider.'
-                    );
-            }
-            
-            $tableResources[] = self::createResource(
-                $this->_loadedProfile,
-                $dbTableName,
-                $actualTableName,
-                $module
-                );
-        }
-        
-        if (count($tableResources) == 0) {
-            $this->_registry->getResponse()->appendContent('There are no tables in the selected database to write.');
-        }
-        
-        // do the creation
-        if ($this->_registry->getRequest()->isPretend()) {
-
-            foreach ($tableResources as $tableResource) {
-                $this->_registry->getResponse()->appendContent('Would create a DbTable at '  . $tableResource->getContext()->getPath());
-            }
-
-        } else {
-
-            foreach ($tableResources as $tableResource) {
-                $this->_registry->getResponse()->appendContent('Creating a DbTable at ' . $tableResource->getContext()->getPath());
-                $tableResource->create();
-            }
-
-            $this->_storeProfile();
-        }
-        
-        
-    }
-    
-    protected function _convertTableNameToClassName($tableName)
-    {
-        if ($this->_nameFilter == null) {
-            $this->_nameFilter = new Zend_Filter();
-            $this->_nameFilter
-                ->addFilter(new Zend_Filter_Word_UnderscoreToCamelCase());
-        }
-        
-        return $this->_nameFilter->filter($tableName);
-    }
-    
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Exception.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Exception.php
deleted file mode 100644
index c0578eff0..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Exception
- */
-require_once 'Zend/Tool/Project/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Exception extends Zend_Tool_Project_Exception
-{
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Form.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Form.php
deleted file mode 100644
index f9f6edba0..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Form.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Form extends Zend_Tool_Project_Provider_Abstract
-{
-
-    public static function createResource(Zend_Tool_Project_Profile $profile, $formName, $moduleName = null)
-    {
-        if (!is_string($formName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Form::createResource() expects \"formName\" is the name of a form resource to create.');
-        }
-
-        if (!($formsDirectory = self::_getFormsDirectoryResource($profile, $moduleName))) {
-            if ($moduleName) {
-                $exceptionMessage = 'A form directory for module "' . $moduleName . '" was not found.';
-            } else {
-                $exceptionMessage = 'A form directory was not found.';
-            }
-            throw new Zend_Tool_Project_Provider_Exception($exceptionMessage);
-        }
-
-        $newForm = $formsDirectory->createResource(
-            'formFile', 
-            array('formName' => $formName, 'moduleName' => $moduleName)
-            );
-
-        return $newForm;
-    }
-
-    /**
-     * hasResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $formName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function hasResource(Zend_Tool_Project_Profile $profile, $formName, $moduleName = null)
-    {
-        if (!is_string($formName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Form::createResource() expects \"formName\" is the name of a form resource to check for existence.');
-        }
-
-        $formsDirectory = self::_getFormsDirectoryResource($profile, $moduleName);
-        return (($formsDirectory->search(array('formFile' => array('formName' => $formName)))) instanceof Zend_Tool_Project_Profile_Resource);
-    }
-    
-    /**
-     * _getFormsDirectoryResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    protected static function _getFormsDirectoryResource(Zend_Tool_Project_Profile $profile, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'formsDirectory';
-
-        return $profile->search($profileSearchParams);
-    }
-    
-    /**
-     * Create a new form
-     *
-     * @param string $name
-     * @param string $module
-     */
-    public function create($name, $module = null)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-
-        // determine if testing is enabled in the project
-        $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
-
-        if (self::hasResource($this->_loadedProfile, $name, $module)) {
-            throw new Zend_Tool_Project_Provider_Exception('This project already has a form named ' . $name);
-        }
-
-        // Check that there is not a dash or underscore, return if doesnt match regex
-        if (preg_match('#[_-]#', $name)) {
-            throw new Zend_Tool_Project_Provider_Exception('Form names should be camel cased.');
-        }
-        
-        $name = ucwords($name);
-        
-        try {
-            $formResource = self::createResource($this->_loadedProfile, $name, $module);
-
-            if ($testingEnabled) {
-                $testFormResource = null;
-                // $testFormResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module);
-            }
-
-        } catch (Exception $e) {
-            $response = $this->_registry->getResponse();
-            $response->setException($e);
-            return;
-        }
-
-        // do the creation
-        if ($this->_registry->getRequest()->isPretend()) {
-
-            $this->_registry->getResponse()->appendContent('Would create a form at '  . $formResource->getContext()->getPath());
-
-            if ($testFormResource) {
-                $this->_registry->getResponse()->appendContent('Would create a form test file at ' . $testFormResource->getContext()->getPath());
-            }
-
-        } else {
-
-            $this->_registry->getResponse()->appendContent('Creating a form at ' . $formResource->getContext()->getPath());
-            $formResource->create();
-
-            if ($testFormResource) {
-                $this->_registry->getResponse()->appendContent('Creating a form test file at ' . $testFormResource->getContext()->getPath());
-                $testFormResource->create();
-            }
-
-            $this->_storeProfile();
-        }
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Layout.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Layout.php
deleted file mode 100644
index 590f97542..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Layout.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 18386 2009-09-23 20:44:43Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Layout extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable
-{
-    
-    public static function createResource(Zend_Tool_Project_Profile $profile, $layoutName = 'layout')
-    {
-        $applicationDirectory = $profile->search('applicationDirectory');
-        $layoutDirectory = $applicationDirectory->search('layoutsDirectory');
-        
-        if ($layoutDirectory == false) {
-            $layoutDirectory = $applicationDirectory->createResource('layoutsDirectory');
-        }
-        
-        $layoutScriptsDirectory = $layoutDirectory->search('layoutScriptsDirectory');
-        
-        if ($layoutScriptsDirectory == false) {
-            $layoutScriptsDirectory = $layoutDirectory->createResource('layoutScriptsDirectory');
-        }
-        
-        $layoutScriptFile = $layoutScriptsDirectory->search('layoutScriptFile', array('layoutName' => 'layout'));
-
-        if ($layoutScriptFile == false) {
-            $layoutScriptFile = $layoutScriptsDirectory->createResource('layoutScriptFile', array('layoutName' => 'layout'));
-        }
-        
-        return $layoutScriptFile;
-    }
-    
-    public function enable()
-    {
-        $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-        
-        $applicationConfigResource = $profile->search('ApplicationConfigFile');
-
-        if (!$applicationConfigResource) {
-            throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.');
-        }
-        
-        $zc = $applicationConfigResource->getAsZendConfig();
-        
-        if (isset($zc->resources) && isset($zf->resources->layout)) {
-            $this->_registry->getResponse()->appendContent('A layout resource already exists in this project\'s application configuration file.');
-            return;
-        }
-        
-        $layoutPath = 'APPLICATION_PATH "/layouts/scripts/"';
-        
-        if ($this->_registry->getRequest()->isPretend()) {
-            $this->_registry->getResponse()->appendContent('Would add "resources.layout.layoutPath" key to the application config file.');
-        } else {
-            $applicationConfigResource->addStringItem('resources.layout.layoutPath', $layoutPath, 'production', false);
-            $applicationConfigResource->create(); 
-            
-            $layoutScriptFile = self::createResource($profile);
-            
-            $layoutScriptFile->create();
-            
-            $this->_registry->getResponse()->appendContent(
-                'Layouts have been enabled, and a default layout created at ' 
-                . $layoutScriptFile->getPath()
-                );
-                
-            $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.');
-        }
-        
-       
-        
-    }
-    
-    public function disable()
-    {
-        // @todo
-    }
-    
-    
-    
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Manifest.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Manifest.php
deleted file mode 100644
index 2cde9e3cb..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Manifest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Manifest implements
-    Zend_Tool_Framework_Manifest_ProviderManifestable
-{
-
-    /**
-     * getProviders()
-     *
-     * @return array Array of Providers
-     */
-    public function getProviders()
-    {
-        // the order here will represent what the output will look like when iterating a manifest
-        
-        return array(
-            // top level project & profile providers
-            'Zend_Tool_Project_Provider_Profile',
-            'Zend_Tool_Project_Provider_Project',
-        
-            // app layer provider
-            'Zend_Tool_Project_Provider_Application',
-        
-            // MVC layer providers
-            'Zend_Tool_Project_Provider_Model',
-            'Zend_Tool_Project_Provider_View',
-            'Zend_Tool_Project_Provider_Controller',
-            'Zend_Tool_Project_Provider_Action',
-            
-            // hMVC provider
-            'Zend_Tool_Project_Provider_Module',
-        
-            // application problem providers
-            'Zend_Tool_Project_Provider_Form',
-            'Zend_Tool_Project_Provider_Layout',
-            'Zend_Tool_Project_Provider_DbAdapter',
-            'Zend_Tool_Project_Provider_DbTable',
-            
-            // provider within project provider
-            'Zend_Tool_Project_Provider_ProjectProvider',
-            
-        );
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Model.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Model.php
deleted file mode 100644
index 8b2d4070f..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Model.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Model.php 20967 2010-02-07 18:17:49Z ralph $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Model extends Zend_Tool_Project_Provider_Abstract
-{
-
-    public static function createResource(Zend_Tool_Project_Profile $profile, $modelName, $moduleName = null)
-    {
-        if (!is_string($modelName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Model::createResource() expects \"modelName\" is the name of a model resource to create.');
-        }
-
-        if (!($modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName))) {
-            if ($moduleName) {
-                $exceptionMessage = 'A model directory for module "' . $moduleName . '" was not found.';
-            } else {
-                $exceptionMessage = 'A model directory was not found.';
-            }
-            throw new Zend_Tool_Project_Provider_Exception($exceptionMessage);
-        }
-
-        $newModel = $modelsDirectory->createResource(
-            'modelFile', 
-            array('modelName' => $modelName, 'moduleName' => $moduleName)
-            );
-
-        return $newModel;
-    }
-
-    /**
-     * hasResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $modelName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function hasResource(Zend_Tool_Project_Profile $profile, $modelName, $moduleName = null)
-    {
-        if (!is_string($modelName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Model::createResource() expects \"modelName\" is the name of a model resource to check for existence.');
-        }
-
-        $modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName);
-        return (($modelsDirectory->search(array('modelFile' => array('modelName' => $modelName)))) instanceof Zend_Tool_Project_Profile_Resource);
-    }
-    
-    /**
-     * _getModelsDirectoryResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    protected static function _getModelsDirectoryResource(Zend_Tool_Project_Profile $profile, $moduleName = null)
-    {
-        $profileSearchParams = array();
-
-        if ($moduleName != null && is_string($moduleName)) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-        }
-
-        $profileSearchParams[] = 'modelsDirectory';
-
-        return $profile->search($profileSearchParams);
-    }
-    
-    /**
-     * Create a new model
-     *
-     * @param string $name
-     * @param string $module
-     */
-    public function create($name, $module = null)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-
-        $originalName = $name;
-        
-        $name = ucwords($name);
-        
-        // determine if testing is enabled in the project
-        $testingEnabled = false; //Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile);
-        $testModelResource = null;
-
-        // Check that there is not a dash or underscore, return if doesnt match regex
-        if (preg_match('#[_-]#', $name)) {
-            throw new Zend_Tool_Project_Provider_Exception('Model names should be camel cased.');
-        }
-        
-        if (self::hasResource($this->_loadedProfile, $name, $module)) {
-            throw new Zend_Tool_Project_Provider_Exception('This project already has a model named ' . $name);
-        }
-        
-        // get request/response object
-        $request = $this->_registry->getRequest();
-        $response = $this->_registry->getResponse();
-        
-        // alert the user about inline converted names
-        $tense = (($request->isPretend()) ? 'would be' : 'is');
-        
-        if ($name !== $originalName) {
-            $response->appendContent(
-                'Note: The canonical model name that ' . $tense
-                    . ' used with other providers is "' . $name . '";'
-                    . ' not "' . $originalName . '" as supplied',
-                array('color' => array('yellow'))
-                );
-        }
-        
-        try {
-            $modelResource = self::createResource($this->_loadedProfile, $name, $module);
-
-            if ($testingEnabled) {
-                // $testModelResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module);
-            }
-
-        } catch (Exception $e) {
-            $response->setException($e);
-            return;
-        }
-
-        // do the creation
-        if ($request->isPretend()) {
-
-            $response->appendContent('Would create a model at '  . $modelResource->getContext()->getPath());
-
-            if ($testModelResource) {
-                $response->appendContent('Would create a model test file at ' . $testModelResource->getContext()->getPath());
-            }
-
-        } else {
-
-            $response->appendContent('Creating a model at ' . $modelResource->getContext()->getPath());
-            $modelResource->create();
-
-            if ($testModelResource) {
-                $response->appendContent('Creating a model test file at ' . $testModelResource->getContext()->getPath());
-                $testModelResource->create();
-            }
-
-            $this->_storeProfile();
-        }
-
-    }
-
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Module.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Module.php
deleted file mode 100644
index e60e62ae1..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Module.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Module.php 20993 2010-02-08 18:41:22Z matthew $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Framework_Provider_Pretendable
- */
-require_once 'Zend/Tool/Framework/Provider/Pretendable.php';
-
-/**
- * @see Zend_Tool_Project_Profile_Iterator_ContextFilter
- */
-require_once 'Zend/Tool/Project/Profile/Iterator/ContextFilter.php';
-
-/**
- * @see Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter
- */
-require_once 'Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Module
-    extends Zend_Tool_Project_Provider_Abstract
-    implements Zend_Tool_Framework_Provider_Pretendable
-{
-
-    public static function createResources(Zend_Tool_Project_Profile $profile, $moduleName, Zend_Tool_Project_Profile_Resource $targetModuleResource = null)
-    {
-
-        // find the appliction directory, it will serve as our module skeleton
-        if ($targetModuleResource == null) {
-            $targetModuleResource = $profile->search('applicationDirectory');
-            $targetModuleEnabledResources = array(
-                'ControllersDirectory', 'ModelsDirectory', 'ViewsDirectory',
-                'ViewScriptsDirectory', 'ViewHelpersDirectory', 'ViewFiltersDirectory'
-                );
-        }
-
-        // find the actual modules directory we will use to house our module
-        $modulesDirectory = $profile->search('modulesDirectory');
-
-        // if there is a module directory already, except
-        if ($modulesDirectory->search(array('moduleDirectory' => array('moduleName' => $moduleName)))) {
-            throw new Zend_Tool_Project_Provider_Exception('A module named "' . $moduleName . '" already exists.');
-        }
-
-        // create the module directory
-        $moduleDirectory = $modulesDirectory->createResource('moduleDirectory', array('moduleName' => $moduleName));
-
-        // create a context filter so that we can pull out only what we need from the module skeleton
-        $moduleContextFilterIterator = new Zend_Tool_Project_Profile_Iterator_ContextFilter(
-            $targetModuleResource,
-            array(
-                'denyNames' => array('ModulesDirectory', 'ViewControllerScriptsDirectory'),
-                'denyType'  => 'Zend_Tool_Project_Context_Filesystem_File'
-                )
-            );
-
-        // the iterator for the module skeleton
-        $targetIterator = new RecursiveIteratorIterator($moduleContextFilterIterator, RecursiveIteratorIterator::SELF_FIRST);
-
-        // initialize some loop state information
-        $currentDepth = 0;
-        $parentResources = array();
-        $currentResource = $moduleDirectory;
-
-        // loop through the target module skeleton
-        foreach ($targetIterator as $targetSubResource) {
-
-            $depthDifference = $targetIterator->getDepth() - $currentDepth;
-            $currentDepth = $targetIterator->getDepth();
-
-            if ($depthDifference === 1) {
-                // if we went down into a child, make note
-                array_push($parentResources, $currentResource);
-                // this will have always been set previously by another loop
-                $currentResource = $currentChildResource;
-            } elseif ($depthDifference < 0) {
-                // if we went up to a parent, make note
-                $i = $depthDifference;
-                do {
-                    // if we went out more than 1 parent, get to the correct parent
-                    $currentResource = array_pop($parentResources);
-                } while ($i-- > 0);
-            }
-
-            // get parameters for the newly created module resource
-            $params = $targetSubResource->getAttributes();
-            $currentChildResource = $currentResource->createResource($targetSubResource->getName(), $params);
-
-            // based of the provided list (Currently up top), enable specific resources
-            if (isset($targetModuleEnabledResources)) {
-                $currentChildResource->setEnabled(in_array($targetSubResource->getName(), $targetModuleEnabledResources));
-            } else {
-                $currentChildResource->setEnabled($targetSubResource->isEnabled());
-            }
-
-        }
-
-        return $moduleDirectory;
-    }
-
-    /**
-     * create()
-     *
-     * @param string $name
-     */
-    public function create($name) //, $moduleProfile = null)
-    {
-        $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION);
-
-        $resources = self::createResources($this->_loadedProfile, $name);
-
-        $response = $this->_registry->getResponse();
-
-        if ($this->_registry->getRequest()->isPretend()) {
-            $response->appendContent('I would create the following module and artifacts:');
-            foreach (new RecursiveIteratorIterator($resources, RecursiveIteratorIterator::SELF_FIRST) as $resource) {
-                if (is_callable(array($resource->getContext(), 'getPath'))) {
-                    $response->appendContent($resource->getContext()->getPath());
-                }
-            }
-        } else {
-            $response->appendContent('Creating the following module and artifacts:');
-            $enabledFilter = new Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter($resources);
-            foreach (new RecursiveIteratorIterator($enabledFilter, RecursiveIteratorIterator::SELF_FIRST) as $resource) {
-                $response->appendContent($resource->getContext()->getPath());
-                $resource->create();
-            }
-            
-            if (strtolower($name) == 'default') {
-                $response->appendContent('Added a key for the default module to the application.ini file');
-                $appConfigFile = $this->_loadedProfile->search('ApplicationConfigFile');
-                $appConfigFile->addStringItem('resources.frontController.params.prefixDefaultModule', '1', 'production');
-                $appConfigFile->create();
-            }
-
-            // store changes to the profile
-            $this->_storeProfile();
-        }
-
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Profile.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Profile.php
deleted file mode 100644
index f62735812..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Profile.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Profile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Profile extends Zend_Tool_Project_Provider_Abstract
-{
-
-    /**
-     * show()
-     *
-     */
-    public function show()
-    {
-        $this->_loadProfile();
-
-        $profileIterator = $this->_loadedProfile->getIterator();
-
-        foreach ($profileIterator as $profileItem) {
-            $this->_registry->getResponse()->appendContent(
-                str_repeat('    ', $profileIterator->getDepth()) . $profileItem
-            );
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Project.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Project.php
deleted file mode 100644
index cfae9a9b5..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Project.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Project.php 20970 2010-02-07 18:21:26Z ralph $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Project
-    extends Zend_Tool_Project_Provider_Abstract
-    //implements Zend_Tool_Framework_Provider_DocblockManifestInterface
-{
-
-    protected $_specialties = array('Info');
-
-    /**
-     * create()
-     *
-     * @param string $path
-     * @param string $nameOfProfile shortName=n
-     * @param string $fileOfProfile shortName=f
-     */
-    public function create($path, $nameOfProfile = null, $fileOfProfile = null)
-    {
-        if ($path == null) {
-            $path = getcwd();
-        } else {
-            $path = trim($path);
-            if (!file_exists($path)) {
-                $created = mkdir($path);
-                if (!$created) {
-                    require_once 'Zend/Tool/Framework/Client/Exception.php';
-                    throw new Zend_Tool_Framework_Client_Exception('Could not create requested project directory \'' . $path . '\'');
-                }
-            }
-            $path = str_replace('\\', '/', realpath($path));
-        }
-
-        $profile = $this->_loadProfile(self::NO_PROFILE_RETURN_FALSE, $path);
-
-        if ($profile !== false) {
-            require_once 'Zend/Tool/Framework/Client/Exception.php';
-            throw new Zend_Tool_Framework_Client_Exception('A project already exists here');
-        }
-
-        $profileData = null;
-
-        if ($fileOfProfile != null && file_exists($fileOfProfile)) {
-            $profileData = file_get_contents($fileOfProfile);
-        }
-
-        $storage = $this->_registry->getStorage();
-        if ($profileData == '' && $nameOfProfile != null && $storage->isEnabled()) {
-            $profileData = $storage->get('project/profiles/' . $nameOfProfile . '.xml');
-        }
-
-        if ($profileData == '') {
-            $profileData = $this->_getDefaultProfile();
-        }
-
-        $newProfile = new Zend_Tool_Project_Profile(array(
-            'projectDirectory' => $path,
-            'profileData' => $profileData
-            ));
-
-        $newProfile->loadFromData();
-
-        $response = $this->_registry->getResponse();
-        
-        $response->appendContent('Creating project at ' . $path);
-        $response->appendContent('Note: ', array('separator' => false, 'color' => 'yellow'));
-        $response->appendContent(
-            'This command created a web project, '
-            . 'for more information setting up your VHOST, please see docs/README');
-
-        foreach ($newProfile->getIterator() as $resource) {
-            $resource->create();
-        }
-    }
-
-    public function show()
-    {
-        $this->_registry->getResponse()->appendContent('You probably meant to run "show project.info".', array('color' => 'yellow'));
-    }
-
-    public function showInfo()
-    {
-        $profile = $this->_loadProfile(self::NO_PROFILE_RETURN_FALSE);
-        if (!$profile) {
-            $this->_registry->getResponse()->appendContent('No project found.');
-        } else {
-            $this->_registry->getResponse()->appendContent('Working with project located at: ' . $profile->getAttribute('projectDirectory'));
-        }
-    }
-
-    protected function _getDefaultProfile()
-    {
-        $data = <<<EOS
-<?xml version="1.0" encoding="UTF-8"?>
-<projectProfile type="default" version="1.10">
-    <projectDirectory>
-        <projectProfileFile />
-        <applicationDirectory>
-            <apisDirectory enabled="false" />
-            <configsDirectory>
-                <applicationConfigFile type="ini" />
-            </configsDirectory>
-            <controllersDirectory>
-                <controllerFile controllerName="Index">
-                    <actionMethod actionName="index" />
-                </controllerFile>
-                <controllerFile controllerName="Error" />
-            </controllersDirectory>
-            <formsDirectory enabled="false" />
-            <layoutsDirectory enabled="false" />
-            <modelsDirectory />
-            <modulesDirectory enabled="false" />
-            <viewsDirectory>
-                <viewScriptsDirectory>
-                    <viewControllerScriptsDirectory forControllerName="Index">
-                        <viewScriptFile forActionName="index" />
-                    </viewControllerScriptsDirectory>
-                    <viewControllerScriptsDirectory forControllerName="Error">
-                        <viewScriptFile forActionName="error" />
-                    </viewControllerScriptsDirectory>
-                </viewScriptsDirectory>
-                <viewHelpersDirectory />
-                <viewFiltersDirectory enabled="false" />
-            </viewsDirectory>
-            <bootstrapFile />
-        </applicationDirectory>
-        <dataDirectory enabled="false">
-            <cacheDirectory enabled="false" />
-            <searchIndexesDirectory enabled="false" />
-            <localesDirectory enabled="false" />
-            <logsDirectory enabled="false" />
-            <sessionsDirectory enabled="false" />
-            <uploadsDirectory enabled="false" />
-        </dataDirectory>
-        <docsDirectory>
-            <file filesystemName="README.txt" defaultContentCallback="Zend_Tool_Project_Provider_Project::getDefaultReadmeContents"/>
-        </docsDirectory>
-        <libraryDirectory>
-            <zfStandardLibraryDirectory enabled="false" />
-        </libraryDirectory>
-        <publicDirectory>
-            <publicStylesheetsDirectory enabled="false" />
-            <publicScriptsDirectory enabled="false" />
-            <publicImagesDirectory enabled="false" />
-            <publicIndexFile />
-            <htaccessFile />
-        </publicDirectory>
-        <projectProvidersDirectory enabled="false" />
-        <temporaryDirectory enabled="false" />
-        <testsDirectory>
-            <testPHPUnitConfigFile />
-            <testApplicationDirectory>
-                <testApplicationBootstrapFile />
-            </testApplicationDirectory>
-            <testLibraryDirectory>
-                <testLibraryBootstrapFile />
-            </testLibraryDirectory>
-        </testsDirectory>
-    </projectDirectory>
-</projectProfile>
-EOS;
-        return $data;
-    }
-    
-    public static function getDefaultReadmeContents($caller = null)
-    {
-        $projectDirResource = $caller->getResource()->getProfile()->search('projectDirectory');
-        if ($projectDirResource) {
-            $name = ltrim(strrchr($projectDirResource->getPath(), DIRECTORY_SEPARATOR), DIRECTORY_SEPARATOR);
-            $path = $projectDirResource->getPath() . '/public';
-        } else {
-            $path = '/path/to/public';
-        }
-        
-        return <<< EOS
-README
-======
-
-This directory should be used to place project specfic documentation including
-but not limited to project notes, generated API/phpdoc documentation, or 
-manual files generated or hand written.  Ideally, this directory would remain
-in your development environment only and should not be deployed with your
-application to it's final production location.
-
-
-Setting Up Your VHOST
-=====================
-
-The following is a sample VHOST you might want to consider for your project.
-
-<VirtualHost *:80>
-   DocumentRoot "$path"
-   ServerName $name.local
-
-   # This should be omitted in the production environment
-   SetEnv APPLICATION_ENV development
-    
-   <Directory "$path">
-       Options Indexes MultiViews FollowSymLinks
-       AllowOverride All
-       Order allow,deny
-       Allow from all
-   </Directory>
-    
-</VirtualHost>
-
-EOS;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/ProjectProvider.php b/airtime_mvc/library/Zend/Tool/Project/Provider/ProjectProvider.php
deleted file mode 100644
index c21ce7826..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/ProjectProvider.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ProjectProvider.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Tool_Project_Provider_Abstract */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_ProjectProvider extends Zend_Tool_Project_Provider_Abstract
-{
-
-    /**
-     * createResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $projectProviderName
-     * @param string $actionNames
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createResource(Zend_Tool_Project_Profile $profile, $projectProviderName, $actionNames = null)
-    {
-
-        if (!is_string($projectProviderName)) {
-            /**
-             * @see Zend_Tool_Project_Provider_Exception
-             */
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Controller::createResource() expects \"projectProviderName\" is the name of a project provider resource to create.');
-        }
-
-        $profileSearchParams = array();
-        $profileSearchParams[] = 'projectProvidersDirectory';
-
-        $projectProvider = $profile->createResourceAt($profileSearchParams, 'projectProviderFile', array('projectProviderName' => $projectProviderName, 'actionNames' => $actionNames));
-
-        return $projectProvider;
-    }
-
-    /**
-     * getName()
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'ProjectProvider';
-    }
-
-    /**
-     * Create stub for Zend_Tool Project Provider
-     *
-     * @var string       $name            class name for new Zend_Tool Project Provider
-     * @var array|string $actions         list of provider methods
-     * @throws Zend_Tool_Project_Provider_Exception
-     */
-    public function create($name, $actions = null)
-    {
-        $profile = $this->_loadProfileRequired();
-
-        $projectProvider = self::createResource($profile, $name, $actions);
-
-        if ($this->_registry->getRequest()->isPretend()) {
-            $this->_registry->getResponse()->appendContent('Would create a project provider named ' . $name
-                . ' in location ' . $projectProvider->getPath()
-                );
-        } else {
-            $this->_registry->getResponse()->appendContent('Creating a project provider named ' . $name
-                . ' in location ' . $projectProvider->getPath()
-                );
-            $projectProvider->create();
-            $this->_storeProfile();
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/Test.php b/airtime_mvc/library/Zend/Tool/Project/Provider/Test.php
deleted file mode 100644
index 0a77ecb45..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/Test.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @see Zend_Tool_Project_Provider_Exception
- */
-require_once 'Zend/Tool/Project/Provider/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_Test extends Zend_Tool_Project_Provider_Abstract
-{
-
-    protected $_specialties = array('Application', 'Library');
-
-    /**
-     * isTestingEnabled()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @return bool
-     */
-    public static function isTestingEnabled(Zend_Tool_Project_Profile $profile)
-    {
-        $profileSearchParams = array('testsDirectory');
-        $testsDirectory = $profile->search($profileSearchParams);
-
-        return $testsDirectory->isEnabled();
-    }
-
-    /**
-     * createApplicationResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $controllerName
-     * @param string $actionName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createApplicationResource(Zend_Tool_Project_Profile $profile, $controllerName, $actionName, $moduleName = null)
-    {
-        if (!is_string($controllerName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createApplicationResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        if (!is_string($actionName)) {
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createApplicationResource() expects \"actionName\" is the name of a controller resource to create.');
-        }
-
-        $testsDirectoryResource = $profile->search('testsDirectory');
-
-        if (($testAppDirectoryResource = $testsDirectoryResource->search('testApplicationDirectory')) === false) {
-            $testAppDirectoryResource = $testsDirectoryResource->createResource('testApplicationDirectory');
-        }
-
-        if ($moduleName) {
-            //@todo $moduleName
-            $moduleName = '';
-        }
-
-        if (($testAppControllerDirectoryResource = $testAppDirectoryResource->search('testApplicationControllerDirectory')) === false) {
-            $testAppControllerDirectoryResource = $testAppDirectoryResource->createResource('testApplicationControllerDirectory');
-        }
-
-        $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName));
-
-        return $testAppControllerFileResource;
-    }
-
-    /**
-     * createLibraryResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $libraryClassName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createLibraryResource(Zend_Tool_Project_Profile $profile, $libraryClassName)
-    {
-        $testLibraryDirectoryResource = $profile->search(array('TestsDirectory', 'TestLibraryDirectory'));
-
-
-        $fsParts = explode('_', $libraryClassName);
-
-        $currentDirectoryResource = $testLibraryDirectoryResource;
-
-        while ($nameOrNamespacePart = array_shift($fsParts)) {
-
-            if (count($fsParts) > 0) {
-
-                if (($libraryDirectoryResource = $currentDirectoryResource->search(array('TestLibraryNamespaceDirectory' => array('namespaceName' => $nameOrNamespacePart)))) === false) {
-                    $currentDirectoryResource = $currentDirectoryResource->createResource('TestLibraryNamespaceDirectory', array('namespaceName' => $nameOrNamespacePart));
-                } else {
-                    $currentDirectoryResource = $libraryDirectoryResource;
-                }
-
-
-            } else {
-
-                if (($libraryFileResource = $currentDirectoryResource->search(array('TestLibraryFile' => array('forClassName' => $libraryClassName)))) === false) {
-                    $libraryFileResource = $currentDirectoryResource->createResource('TestLibraryFile', array('forClassName' => $libraryClassName));
-                }
-
-            }
-
-        }
-
-        return $libraryFileResource;
-    }
-
-    public function enable()
-    {
-
-    }
-
-    public function disable()
-    {
-
-    }
-
-    /**
-     * create()
-     *
-     * @param unknown_type $libraryClassName
-     */
-    public function create($libraryClassName)
-    {
-        $profile = $this->_loadProfile();
-
-        if (!self::isTestingEnabled($profile)) {
-            $this->_registry->getResponse()->appendContent('Testing is not enabled for this project.');
-        }
-
-        $testLibraryResource = self::createLibraryResource($profile, $libraryClassName);
-
-        $response = $this->_registry->getResponse();
-
-        if ($this->_registry->getRequest()->isPretend()) {
-            $response->appendContent('Would create a library stub in location ' . $testLibraryResource->getContext()->getPath());
-        } else {
-            $response->appendContent('Creating a library stub in location ' . $testLibraryResource->getContext()->getPath());
-            $testLibraryResource->create();
-            $this->_storeProfile();
-        }
-
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Tool/Project/Provider/View.php b/airtime_mvc/library/Zend/Tool/Project/Provider/View.php
deleted file mode 100644
index 3e955926c..000000000
--- a/airtime_mvc/library/Zend/Tool/Project/Provider/View.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Tool
- * @subpackage Framework
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Tool_Project_Provider_Abstract
- */
-require_once 'Zend/Tool/Project/Provider/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Tool
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstract
-{
-
-    /**
-     * createResource()
-     *
-     * @param Zend_Tool_Project_Profile $profile
-     * @param string $actionName
-     * @param string $controllerName
-     * @param string $moduleName
-     * @return Zend_Tool_Project_Profile_Resource
-     */
-    public static function createResource(Zend_Tool_Project_Profile $profile, $actionName, $controllerName, $moduleName = null)
-    {
-        if (!is_string($actionName)) {
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"actionName\" is the name of a controller resource to create.');
-        }
-
-        if (!is_string($controllerName)) {
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"controllerName\" is the name of a controller resource to create.');
-        }
-
-        $profileSearchParams = array();
-
-        if ($moduleName) {
-            $profileSearchParams = array('modulesDirectory', 'moduleDirectory' => array('moduleName' => $moduleName));
-            $noModuleSearch = null;
-        } else {
-            $noModuleSearch = array('modulesDirectory');
-        }
-
-        $profileSearchParams[] = 'viewsDirectory';
-        $profileSearchParams[] = 'viewScriptsDirectory';
-
-        if (($viewScriptsDirectory = $profile->search($profileSearchParams, $noModuleSearch)) === false) {
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('This project does not have a viewScriptsDirectory resource.');
-        }
-
-        $profileSearchParams['viewControllerScriptsDirectory'] = array('forControllerName' => $controllerName);
-
-        // @todo check if below is failing b/c of above search params
-        if (($viewControllerScriptsDirectory = $viewScriptsDirectory->search($profileSearchParams)) === false) {
-            $viewControllerScriptsDirectory = $viewScriptsDirectory->createResource('viewControllerScriptsDirectory', array('forControllerName' => $controllerName));
-        }
-
-        $newViewScriptFile = $viewControllerScriptsDirectory->createResource('ViewScriptFile', array('forActionName' => $actionName));
-
-        return $newViewScriptFile;
-    }
-
-    /**
-     * create()
-     *
-     * @param string $controllerName
-     * @param string $actionNameOrSimpleName
-     */
-    public function create($controllerName, $actionNameOrSimpleName)
-    {
-
-        if ($controllerName == '' || $actionNameOrSimpleName == '') {
-            require_once 'Zend/Tool/Project/Provider/Exception.php';
-            throw new Zend_Tool_Project_Provider_Exception('ControllerName and/or ActionName are empty.');
-        }
-
-        $profile = $this->_loadProfile();
-
-        $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName);
-
-        if ($this->_registry->getRequest()->isPretend()) {
-            $this->_registry->getResponse(
-                'Would create a view script in location ' . $view->getContext()->getPath()
-                );
-        } else {
-            $this->_registry->getResponse(
-                'Creating a view script in location ' . $view->getContext()->getPath()
-                );
-            $view->create();
-            $this->_storeProfile();
-        }
-
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate.php b/airtime_mvc/library/Zend/Translate.php
deleted file mode 100644
index a9866ce31..000000000
--- a/airtime_mvc/library/Zend/Translate.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Translate.php 21662 2010-03-27 20:23:42Z thomas $
- */
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate {
-    /**
-     * Adapter names constants
-     */
-    const AN_ARRAY   = 'Array';
-    const AN_CSV     = 'Csv';
-    const AN_GETTEXT = 'Gettext';
-    const AN_INI     = 'Ini';
-    const AN_QT      = 'Qt';
-    const AN_TBX     = 'Tbx';
-    const AN_TMX     = 'Tmx';
-    const AN_XLIFF   = 'Xliff';
-    const AN_XMLTM   = 'XmlTm';
-
-    const LOCALE_DIRECTORY = 'directory';
-    const LOCALE_FILENAME  = 'filename';
-
-    /**
-     * Adapter
-     *
-     * @var Zend_Translate_Adapter
-     */
-    private $_adapter;
-    private static $_cache = null;
-
-    /**
-     * Generates the standard translation object
-     *
-     * @param  array|Zend_Config $options Options to use
-     * @throws Zend_Translate_Exception
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args               = func_get_args();
-            $options            = array();
-            $options['adapter'] = array_shift($args);
-            if (!empty($args)) {
-                $options['content'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $opt     = array_shift($args);
-                $options = array_merge($opt, $options);
-            }
-        } else if (!is_array($options)) {
-            $options = array('adapter' => $options);
-        }
-
-        $this->setAdapter($options);
-    }
-
-    /**
-     * Sets a new adapter
-     *
-     * @param  array|Zend_Config $options Options to use
-     * @throws Zend_Translate_Exception
-     */
-    public function setAdapter($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args               = func_get_args();
-            $options            = array();
-            $options['adapter'] = array_shift($args);
-            if (!empty($args)) {
-                $options['content'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $opt     = array_shift($args);
-                $options = array_merge($opt, $options);
-            }
-        } else if (!is_array($options)) {
-            $options = array('adapter' => $options);
-        }
-
-        if (Zend_Loader::isReadable('Zend/Translate/Adapter/' . ucfirst($options['adapter']). '.php')) {
-            $options['adapter'] = 'Zend_Translate_Adapter_' . ucfirst($options['adapter']);
-        }
-
-        if (!class_exists($options['adapter'])) {
-            Zend_Loader::loadClass($options['adapter']);
-        }
-
-        if (self::$_cache !== null) {
-            call_user_func(array($options['adapter'], 'setCache'), self::$_cache);
-        }
-
-        $adapter = $options['adapter'];
-        unset($options['adapter']);
-        $this->_adapter = new $adapter($options);
-        if (!$this->_adapter instanceof Zend_Translate_Adapter) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("Adapter " . $adapter . " does not extend Zend_Translate_Adapter");
-        }
-    }
-
-    /**
-     * Returns the adapters name and it's options
-     *
-     * @return Zend_Translate_Adapter
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Sets a cache for all instances of Zend_Translate
-     *
-     * @param  Zend_Cache_Core $cache Cache to store to
-     * @return void
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        if (self::$_cache !== null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        self::$_cache->clean();
-    }
-
-    /**
-     * Calls all methods from the adapter
-     */
-    public function __call($method, array $options)
-    {
-        if (method_exists($this->_adapter, $method)) {
-            return call_user_func_array(array($this->_adapter, $method), $options);
-        }
-        require_once 'Zend/Translate/Exception.php';
-        throw new Zend_Translate_Exception("Unknown method '" . $method . "' called!");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter.php b/airtime_mvc/library/Zend/Translate/Adapter.php
deleted file mode 100644
index 177237ee0..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter.php
+++ /dev/null
@@ -1,868 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @subpackage Zend_Translate_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Adapter.php 21662 2010-03-27 20:23:42Z thomas $
- */
-
-/**
- * @see Zend_Locale
- */
-require_once 'Zend/Locale.php';
-
-/**
- * @see Zend_Translate_Plural
- */
-require_once 'Zend/Translate/Plural.php';
-
-/**
- * Basic adapter class for each translation source adapter
- *
- * @category   Zend
- * @package    Zend_Translate
- * @subpackage Zend_Translate_Adapter
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Translate_Adapter {
-    /**
-     * Shows if locale detection is in automatic level
-     * @var boolean
-     */
-    private $_automatic = true;
-
-    /**
-     * Internal cache for all adapters
-     * @var Zend_Cache_Core
-     */
-    protected static $_cache     = null;
-
-    /**
-     * Scans for the locale within the name of the directory
-     * @constant integer
-     */
-    const LOCALE_DIRECTORY = 'directory';
-
-    /**
-     * Scans for the locale within the name of the file
-     * @constant integer
-     */
-    const LOCALE_FILENAME  = 'filename';
-
-    /**
-     * Array with all options, each adapter can have own additional options
-     *   'clear'           => when true, clears already loaded translations when adding new files
-     *   'content'         => content to translate or file or directory with content
-     *   'disableNotices'  => when true, omits notices from being displayed
-     *   'ignore'          => a prefix for files and directories which are not being added
-     *   'locale'          => the actual set locale to use
-     *   'log'             => a instance of Zend_Log where logs are written to
-     *   'logMessage'      => message to be logged
-     *   'logUntranslated' => when true, untranslated messages are not logged
-     *   'reload'          => reloads the cache by reading the content again
-     *   'scan'            => searches for translation files using the LOCALE constants
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'clear'           => false,
-        'content'         => null,
-        'disableNotices'  => false,
-        'ignore'          => '.',
-        'locale'          => 'auto',
-        'log'             => null,
-        'logMessage'      => "Untranslated message within '%locale%': %message%",
-        'logUntranslated' => false,
-        'reload'          => false,
-        'scan'            => null
-    );
-
-    /**
-     * Translation table
-     * @var array
-     */
-    protected $_translate = array();
-
-    /**
-     * Generates the adapter
-     *
-     * @param  array|Zend_Config $options Translation options for this adapter
-     * @throws Zend_Translate_Exception
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args               = func_get_args();
-            $options            = array();
-            $options['content'] = array_shift($args);
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $opt     = array_shift($args);
-                $options = array_merge($opt, $options);
-            }
-        } else if (!is_array($options)) {
-            $options = array('content' => $options);
-        }
-
-        if (isset(self::$_cache)) {
-            $id = 'Zend_Translate_' . $this->toString() . '_Options';
-            $result = self::$_cache->load($id);
-            if ($result) {
-                $this->_options = $result;
-            }
-        }
-
-        if (empty($options['locale']) || ($options['locale'] === "auto")) {
-            $this->_automatic = true;
-        } else {
-            $this->_automatic = false;
-        }
-
-        $locale = null;
-        if (!empty($options['locale'])) {
-            $locale = $options['locale'];
-            unset($options['locale']);
-        }
-
-        $this->setOptions($options);
-        $options['locale'] = $locale;
-
-        if (!empty($options['content'])) {
-            $this->addTranslation($options);
-        }
-
-        if ($this->getLocale() !== (string) $options['locale']) {
-            $this->setLocale($options['locale']);
-        }
-    }
-
-    /**
-     * Add translations
-     *
-     * This may be a new language or additional content for an existing language
-     * If the key 'clear' is true, then translations for the specified
-     * language will be replaced and added otherwise
-     *
-     * @param  array|Zend_Config $options Options and translations to be added
-     * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
-     */
-    public function addTranslation($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args = func_get_args();
-            $options            = array();
-            $options['content'] = array_shift($args);
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $opt     = array_shift($args);
-                $options = array_merge($opt, $options);
-            }
-        } else if (!is_array($options)) {
-            $options = array('content' => $options);
-        }
-
-        $originate = null;
-        if (!empty($options['locale'])) {
-            $originate = (string) $options['locale'];
-        }
-
-        if ((array_key_exists('log', $options)) && !($options['log'] instanceof Zend_Log)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log');
-        }
-
-        try {
-            if (!($options['content'] instanceof Zend_Translate) && !($options['content'] instanceof Zend_Translate_Adapter)) {
-                $options['locale'] = Zend_Locale::findLocale($options['locale']);
-            }
-        } catch (Zend_Locale_Exception $e) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e);
-        }
-
-        $options  = $options + $this->_options;
-        if (is_string($options['content']) and is_dir($options['content'])) {
-            $options['content'] = realpath($options['content']);
-            $prev = '';
-            foreach (new RecursiveIteratorIterator(
-                     new RecursiveDirectoryIterator($options['content'], RecursiveDirectoryIterator::KEY_AS_PATHNAME),
-                     RecursiveIteratorIterator::SELF_FIRST) as $directory => $info) {
-                $file = $info->getFilename();
-                if (is_array($options['ignore'])) {
-                    foreach ($options['ignore'] as $key => $ignore) {
-                        if (strpos($key, 'regex') !== false) {
-                            if (preg_match($ignore, $directory)) {
-                                // ignore files matching the given regex from option 'ignore' and all files below
-                                continue 2;
-                            }
-                        } else if (strpos($directory, DIRECTORY_SEPARATOR . $ignore) !== false) {
-                            // ignore files matching first characters from option 'ignore' and all files below
-                            continue 2;
-                        }
-                    }
-                } else {
-                    if (strpos($directory, DIRECTORY_SEPARATOR . $options['ignore']) !== false) {
-                        // ignore files matching first characters from option 'ignore' and all files below
-                        continue;
-                    }
-                }
-
-                if ($info->isDir()) {
-                    // pathname as locale
-                    if (($options['scan'] === self::LOCALE_DIRECTORY) and (Zend_Locale::isLocale($file, true, false))) {
-                        $options['locale'] = $file;
-                        $prev              = (string) $options['locale'];
-                    }
-                } else if ($info->isFile()) {
-                    // filename as locale
-                    if ($options['scan'] === self::LOCALE_FILENAME) {
-                        $filename = explode('.', $file);
-                        array_pop($filename);
-                        $filename = implode('.', $filename);
-                        if (Zend_Locale::isLocale((string) $filename, true, false)) {
-                            $options['locale'] = (string) $filename;
-                        } else {
-                            $parts  = explode('.', $file);
-                            $parts2 = array();
-                            foreach($parts as $token) {
-                                $parts2 += explode('_', $token);
-                            }
-                            $parts  = array_merge($parts, $parts2);
-                            $parts2 = array();
-                            foreach($parts as $token) {
-                                $parts2 += explode('-', $token);
-                            }
-                            $parts = array_merge($parts, $parts2);
-                            $parts = array_unique($parts);
-                            $prev  = '';
-                            foreach($parts as $token) {
-                                if (Zend_Locale::isLocale($token, true, false)) {
-                                    if (strlen($prev) <= strlen($token)) {
-                                        $options['locale'] = $token;
-                                        $prev              = $token;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    try {
-                        $options['content'] = $info->getPathname();
-                        $this->_addTranslationData($options);
-                    } catch (Zend_Translate_Exception $e) {
-                        // ignore failed sources while scanning
-                    }
-                }
-            }
-        } else {
-            $this->_addTranslationData($options);
-        }
-
-        if ((isset($this->_translate[$originate]) === true) and (count($this->_translate[$originate]) > 0)) {
-            $this->setLocale($originate);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets new adapter options
-     *
-     * @param  array $options Adapter options
-     * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
-     */
-    public function setOptions(array $options = array())
-    {
-        $change = false;
-        $locale = null;
-        foreach ($options as $key => $option) {
-            if ($key == 'locale') {
-                $locale = $option;
-            } else if ((isset($this->_options[$key]) and ($this->_options[$key] != $option)) or
-                    !isset($this->_options[$key])) {
-                if (($key == 'log') && !($option instanceof Zend_Log)) {
-                    require_once 'Zend/Translate/Exception.php';
-                    throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log');
-                }
-
-                $this->_options[$key] = $option;
-                $change = true;
-            }
-        }
-
-        if ($locale !== null) {
-            $this->setLocale($locale);
-        }
-
-        if (isset(self::$_cache) and ($change == true)) {
-            $id = 'Zend_Translate_' . $this->toString() . '_Options';
-            self::$_cache->save($this->_options, $id, array('Zend_Translate'));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the adapters name and it's options
-     *
-     * @param  string|null $optionKey String returns this option
-     *                                null returns all options
-     * @return integer|string|array|null
-     */
-    public function getOptions($optionKey = null)
-    {
-        if ($optionKey === null) {
-            return $this->_options;
-        }
-
-        if (isset($this->_options[$optionKey]) === true) {
-            return $this->_options[$optionKey];
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets locale
-     *
-     * @return Zend_Locale|string|null
-     */
-    public function getLocale()
-    {
-        return $this->_options['locale'];
-    }
-
-    /**
-     * Sets locale
-     *
-     * @param  string|Zend_Locale $locale Locale to set
-     * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
-     */
-    public function setLocale($locale)
-    {
-        if (($locale === "auto") or ($locale === null)) {
-            $this->_automatic = true;
-        } else {
-            $this->_automatic = false;
-        }
-
-        try {
-            $locale = Zend_Locale::findLocale($locale);
-        } catch (Zend_Locale_Exception $e) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("The given Language ({$locale}) does not exist", 0, $e);
-        }
-
-        if (!isset($this->_translate[$locale])) {
-            $temp = explode('_', $locale);
-            if (!isset($this->_translate[$temp[0]]) and !isset($this->_translate[$locale])) {
-                if (!$this->_options['disableNotices']) {
-                    if ($this->_options['log']) {
-                        $this->_options['log']->notice("The language '{$locale}' has to be added before it can be used.");
-                    } else {
-                        trigger_error("The language '{$locale}' has to be added before it can be used.", E_USER_NOTICE);
-                    }
-                }
-            }
-
-            $locale = $temp[0];
-        }
-
-        if (empty($this->_translate[$locale])) {
-            if (!$this->_options['disableNotices']) {
-                if ($this->_options['log']) {
-                    $this->_options['log']->notice("No translation for the language '{$locale}' available.");
-                } else {
-                    trigger_error("No translation for the language '{$locale}' available.", E_USER_NOTICE);
-                }
-            }
-        }
-
-        if ($this->_options['locale'] != $locale) {
-            $this->_options['locale'] = $locale;
-
-            if (isset(self::$_cache)) {
-                $id = 'Zend_Translate_' . $this->toString() . '_Options';
-                self::$_cache->save($this->_options, $id, array('Zend_Translate'));
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the available languages from this adapter
-     *
-     * @return array
-     */
-    public function getList()
-    {
-        $list = array_keys($this->_translate);
-        $result = null;
-        foreach($list as $value) {
-            if (!empty($this->_translate[$value])) {
-                $result[$value] = $value;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Returns all available message ids from this adapter
-     * If no locale is given, the actual language will be used
-     *
-     * @param  string|Zend_Locale $locale (optional) Language to return the message ids from
-     * @return array
-     */
-    public function getMessageIds($locale = null)
-    {
-        if (empty($locale) or !$this->isAvailable($locale)) {
-            $locale = $this->_options['locale'];
-        }
-
-        return array_keys($this->_translate[(string) $locale]);
-    }
-
-    /**
-     * Returns all available translations from this adapter
-     * If no locale is given, the actual language will be used
-     * If 'all' is given the complete translation dictionary will be returned
-     *
-     * @param  string|Zend_Locale $locale (optional) Language to return the messages from
-     * @return array
-     */
-    public function getMessages($locale = null)
-    {
-        if ($locale === 'all') {
-            return $this->_translate;
-        }
-
-        if ((empty($locale) === true) or ($this->isAvailable($locale) === false)) {
-            $locale = $this->_options['locale'];
-        }
-
-        return $this->_translate[(string) $locale];
-    }
-
-    /**
-     * Is the wished language available ?
-     *
-     * @see    Zend_Locale
-     * @param  string|Zend_Locale $locale Language to search for, identical with locale identifier,
-     *                                    @see Zend_Locale for more information
-     * @return boolean
-     */
-    public function isAvailable($locale)
-    {
-        $return = isset($this->_translate[(string) $locale]);
-        return $return;
-    }
-
-    /**
-     * Load translation data
-     *
-     * @param  mixed              $data
-     * @param  string|Zend_Locale $locale
-     * @param  array              $options (optional)
-     * @return array
-     */
-    abstract protected function _loadTranslationData($data, $locale, array $options = array());
-
-    /**
-     * Internal function for adding translation data
-     *
-     * This may be a new language or additional data for an existing language
-     * If the options 'clear' is true, then the translation data for the specified
-     * language is replaced and added otherwise
-     *
-     * @see    Zend_Locale
-     * @param  array|Zend_Config $content Translation data to add
-     * @throws Zend_Translate_Exception
-     * @return Zend_Translate_Adapter Provides fluent interface
-     */
-    private function _addTranslationData($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args = func_get_args();
-            $options['content'] = array_shift($args);
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $options += array_shift($args);
-            }
-        }
-
-        if (($options['content'] instanceof Zend_Translate) || ($options['content'] instanceof Zend_Translate_Adapter)) {
-            $options['usetranslateadapter'] = true;
-            if (!empty($options['locale'])) {
-                $options['content'] = $options['content']->getMessages($options['locale']);
-            } else {
-                $locales = $options['content']->getList();
-                foreach ($locales as $locale) {
-                    $options['locale']  = $locale;
-                    $options['content'] = $options['content']->getMessages($locale);
-                    $this->_addTranslationData($options);
-                }
-
-                return $this;
-            }
-        }
-
-        try {
-            $options['locale'] = Zend_Locale::findLocale($options['locale']);
-        } catch (Zend_Locale_Exception $e) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e);
-        }
-
-        if ($options['clear'] || !isset($this->_translate[$options['locale']])) {
-            $this->_translate[$options['locale']] = array();
-        }
-
-        $read = true;
-        if (isset(self::$_cache)) {
-            $id = 'Zend_Translate_' . md5(serialize($options['content'])) . '_' . $this->toString();
-            $temp = self::$_cache->load($id);
-            if ($temp) {
-                $read = false;
-            }
-        }
-
-        if ($options['reload']) {
-            $read = true;
-        }
-
-        if ($read) {
-            if (!empty($options['usetranslateadapter'])) {
-                $temp = array($options['locale'] => $options['content']);
-            } else {
-                $temp = $this->_loadTranslationData($options['content'], $options['locale'], $options);
-            }
-        }
-
-        if (empty($temp)) {
-            $temp = array();
-        }
-
-        $keys = array_keys($temp);
-        foreach($keys as $key) {
-            if (!isset($this->_translate[$key])) {
-                $this->_translate[$key] = array();
-            }
-
-            if (array_key_exists($key, $temp) && is_array($temp[$key])) {
-                $this->_translate[$key] = $temp[$key] + $this->_translate[$key];
-            }
-        }
-
-        if ($this->_automatic === true) {
-            $find = new Zend_Locale($options['locale']);
-            $browser = $find->getEnvironment() + $find->getBrowser();
-            arsort($browser);
-            foreach($browser as $language => $quality) {
-                if (isset($this->_translate[$language])) {
-                    $this->_options['locale'] = $language;
-                    break;
-                }
-            }
-        }
-
-        if (($read) and (isset(self::$_cache))) {
-            $id = 'Zend_Translate_' . md5(serialize($options['content'])) . '_' . $this->toString();
-            self::$_cache->save($temp, $id, array('Zend_Translate'));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Translates the given string
-     * returns the translation
-     *
-     * @see Zend_Locale
-     * @param  string|array       $messageId Translation string, or Array for plural translations
-     * @param  string|Zend_Locale $locale    (optional) Locale/Language to use, identical with
-     *                                       locale identifier, @see Zend_Locale for more information
-     * @return string
-     */
-    public function translate($messageId, $locale = null)
-    {
-        if ($locale === null) {
-            $locale = $this->_options['locale'];
-        }
-
-        $plural = null;
-        if (is_array($messageId)) {
-            if (count($messageId) > 2) {
-                $number = array_pop($messageId);
-                if (!is_numeric($number)) {
-                    $plocale = $number;
-                    $number  = array_pop($messageId);
-                } else {
-                    $plocale = 'en';
-                }
-
-                $plural    = $messageId;
-                $messageId = $messageId[0];
-            } else {
-                $messageId = $messageId[0];
-            }
-        }
-
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, false, false)) {
-                // language does not exist, return original string
-                $this->_log($messageId, $locale);
-                if ($plural === null) {
-                    return $messageId;
-                }
-
-                $rule = Zend_Translate_Plural::getPlural($number, $plocale);
-                if (!isset($plural[$rule])) {
-                    $rule = 0;
-                }
-
-                return $plural[$rule];
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        $locale = (string) $locale;
-        if ((is_string($messageId) || is_int($messageId)) && isset($this->_translate[$locale][$messageId])) {
-            // return original translation
-            if ($plural === null) {
-                return $this->_translate[$locale][$messageId];
-            }
-
-            $rule = Zend_Translate_Plural::getPlural($number, $locale);
-            if (isset($this->_translate[$locale][$plural[0]][$rule])) {
-                return $this->_translate[$locale][$plural[0]][$rule];
-            }
-        } else if (strlen($locale) != 2) {
-            // faster than creating a new locale and separate the leading part
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-
-            if ((is_string($messageId) || is_int($messageId)) && isset($this->_translate[$locale][$messageId])) {
-                // return regionless translation (en_US -> en)
-                if ($plural === null) {
-                    return $this->_translate[$locale][$messageId];
-                }
-
-                $rule = Zend_Translate_Plural::getPlural($number, $locale);
-                if (isset($this->_translate[$locale][$plural[0]][$rule])) {
-                    return $this->_translate[$locale][$plural[0]][$rule];
-                }
-            }
-        }
-
-        $this->_log($messageId, $locale);
-        if ($plural === null) {
-            return $messageId;
-        }
-
-        $rule = Zend_Translate_Plural::getPlural($number, $plocale);
-        if (!isset($plural[$rule])) {
-            $rule = 0;
-        }
-
-        return $plural[$rule];
-    }
-
-    /**
-     * Translates the given string using plural notations
-     * Returns the translated string
-     *
-     * @see Zend_Locale
-     * @param  string             $singular Singular translation string
-     * @param  string             $plural   Plural translation string
-     * @param  integer            $number   Number for detecting the correct plural
-     * @param  string|Zend_Locale $locale   (Optional) Locale/Language to use, identical with
-     *                                      locale identifier, @see Zend_Locale for more information
-     * @return string
-     */
-    public function plural($singular, $plural, $number, $locale = null)
-    {
-        return $this->translate(array($singular, $plural, $number), $locale);
-    }
-
-    /**
-     * Logs a message when the log option is set
-     *
-     * @param string $message Message to log
-     * @param String $locale  Locale to log
-     */
-    protected function _log($message, $locale) {
-        if ($this->_options['logUntranslated']) {
-            $message = str_replace('%message%', $message, $this->_options['logMessage']);
-            $message = str_replace('%locale%', $locale, $message);
-            if ($this->_options['log']) {
-                $this->_options['log']->notice($message);
-            } else {
-                trigger_error($message, E_USER_NOTICE);
-            }
-        }
-    }
-
-    /**
-     * Translates the given string
-     * returns the translation
-     *
-     * @param  string             $messageId Translation string
-     * @param  string|Zend_Locale $locale    (optional) Locale/Language to use, identical with locale
-     *                                       identifier, @see Zend_Locale for more information
-     * @return string
-     */
-    public function _($messageId, $locale = null)
-    {
-        return $this->translate($messageId, $locale);
-    }
-
-    /**
-     * Checks if a string is translated within the source or not
-     * returns boolean
-     *
-     * @param  string             $messageId Translation string
-     * @param  boolean            $original  (optional) Allow translation only for original language
-     *                                       when true, a translation for 'en_US' would give false when it can
-     *                                       be translated with 'en' only
-     * @param  string|Zend_Locale $locale    (optional) Locale/Language to use, identical with locale identifier,
-     *                                       see Zend_Locale for more information
-     * @return boolean
-     */
-    public function isTranslated($messageId, $original = false, $locale = null)
-    {
-        if (($original !== false) and ($original !== true)) {
-            $locale   = $original;
-            $original = false;
-        }
-
-        if ($locale === null) {
-            $locale = $this->_options['locale'];
-        }
-
-        if (!Zend_Locale::isLocale($locale, true, false)) {
-            if (!Zend_Locale::isLocale($locale, false, false)) {
-                // language does not exist, return original string
-                return false;
-            }
-
-            $locale = new Zend_Locale($locale);
-        }
-
-        $locale = (string) $locale;
-        if ((is_string($messageId) || is_int($messageId)) && isset($this->_translate[$locale][$messageId])) {
-            // return original translation
-            return true;
-        } else if ((strlen($locale) != 2) and ($original === false)) {
-            // faster than creating a new locale and separate the leading part
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-
-            if ((is_string($messageId) || is_int($messageId)) && isset($this->_translate[$locale][$messageId])) {
-                // return regionless translation (en_US -> en)
-                return true;
-            }
-        }
-
-        // No translation found, return original
-        return false;
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Sets a cache for all Zend_Translate_Adapters
-     *
-     * @param Zend_Cache_Core $cache Cache to store to
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        if (self::$_cache !== null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        require_once 'Zend/Cache.php';
-        self::$_cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, array('Zend_Translate'));
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    abstract public function toString();
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Array.php b/airtime_mvc/library/Zend/Translate/Adapter/Array.php
deleted file mode 100644
index 068ec8e71..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Array.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Array extends Zend_Translate_Adapter
-{
-    private $_data = array();
-
-    /**
-     * Load translation data
-     *
-     * @param  string|array  $data
-     * @param  string        $locale  Locale/Language to add data for, identical with locale identifier,
-     *                                see Zend_Locale for more information
-     * @param  array         $options OPTIONAL Options to use
-     * @return array
-     */
-    protected function _loadTranslationData($data, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!is_array($data)) {
-            if (file_exists($data)) {
-                ob_start();
-                $data = include($data);
-                ob_end_clean();
-            }
-        }
-        if (!is_array($data)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("Error including array or file '".$data."'");
-        }
-
-        if (!isset($this->_data[$locale])) {
-            $this->_data[$locale] = array();
-        }
-
-        $this->_data[$locale] = $data + $this->_data[$locale];
-        return $this->_data;
-    }
-
-    /**
-     * returns the adapters name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Array";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Csv.php b/airtime_mvc/library/Zend/Translate/Adapter/Csv.php
deleted file mode 100644
index da707d6a5..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Csv.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Csv.php 21662 2010-03-27 20:23:42Z thomas $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Csv extends Zend_Translate_Adapter
-{
-    private $_data    = array();
-
-    /**
-     * Generates the adapter
-     *
-     * @param  array|Zend_Config $options Translation content
-     */
-    public function __construct($options = array())
-    {
-        $this->_options['delimiter'] = ";";
-        $this->_options['length']    = 0;
-        $this->_options['enclosure'] = '"';
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $args               = func_get_args();
-            $options            = array();
-            $options['content'] = array_shift($args);
-
-            if (!empty($args)) {
-                $options['locale'] = array_shift($args);
-            }
-
-            if (!empty($args)) {
-                $opt     = array_shift($args);
-                $options = array_merge($opt, $options);
-            }
-        } else if (!is_array($options)) {
-            $options = array('content' => $options);
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * Load translation data
-     *
-     * @param  string|array  $filename  Filename and full path to the translation source
-     * @param  string        $locale    Locale/Language to add data for, identical with locale identifier,
-     *                                  see Zend_Locale for more information
-     * @param  array         $option    OPTIONAL Options to use
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        $options     = $options + $this->_options;
-        $this->_file = @fopen($filename, 'rb');
-        if (!$this->_file) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.');
-        }
-
-        while(($data = fgetcsv($this->_file, $options['length'], $options['delimiter'], $options['enclosure'])) !== false) {
-            if (substr($data[0], 0, 1) === '#') {
-                continue;
-            }
-
-            if (!isset($data[1])) {
-                continue;
-            }
-
-            if (count($data) == 2) {
-                $this->_data[$locale][$data[0]] = $data[1];
-            } else {
-                $singular = array_shift($data);
-                $this->_data[$locale][$singular] = $data;
-            }
-        }
-
-        return $this->_data;
-    }
-
-    /**
-     * returns the adapters name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Csv";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Gettext.php b/airtime_mvc/library/Zend/Translate/Adapter/Gettext.php
deleted file mode 100644
index aba9288a7..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Gettext.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Gettext.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_bigEndian   = false;
-    private $_file        = false;
-    private $_adapterInfo = array();
-    private $_data        = array();
-
-    /**
-     * Read values from the MO file
-     *
-     * @param  string  $bytes
-     */
-    private function _readMOData($bytes)
-    {
-        if ($this->_bigEndian === false) {
-            return unpack('V' . $bytes, fread($this->_file, 4 * $bytes));
-        } else {
-            return unpack('N' . $bytes, fread($this->_file, 4 * $bytes));
-        }
-    }
-
-    /**
-     * Load translation data (MO file reader)
-     *
-     * @param  string  $filename  MO file to add, full path must be given for access
-     * @param  string  $locale    New Locale/Language to set, identical with locale identifier,
-     *                            see Zend_Locale for more information
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data      = array();
-        $this->_bigEndian = false;
-        $this->_file      = @fopen($filename, 'rb');
-        if (!$this->_file) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.');
-        }
-        if (@filesize($filename) < 10) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file');
-        }
-
-        // get Endian
-        $input = $this->_readMOData(1);
-        if (strtolower(substr(dechex($input[1]), -8)) == "950412de") {
-            $this->_bigEndian = false;
-        } else if (strtolower(substr(dechex($input[1]), -8)) == "de120495") {
-            $this->_bigEndian = true;
-        } else {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file');
-        }
-        // read revision - not supported for now
-        $input = $this->_readMOData(1);
-
-        // number of bytes
-        $input = $this->_readMOData(1);
-        $total = $input[1];
-
-        // number of original strings
-        $input = $this->_readMOData(1);
-        $OOffset = $input[1];
-
-        // number of translation strings
-        $input = $this->_readMOData(1);
-        $TOffset = $input[1];
-
-        // fill the original table
-        fseek($this->_file, $OOffset);
-        $origtemp = $this->_readMOData(2 * $total);
-        fseek($this->_file, $TOffset);
-        $transtemp = $this->_readMOData(2 * $total);
-
-        for($count = 0; $count < $total; ++$count) {
-            if ($origtemp[$count * 2 + 1] != 0) {
-                fseek($this->_file, $origtemp[$count * 2 + 2]);
-                $original = @fread($this->_file, $origtemp[$count * 2 + 1]);
-                $original = explode(chr(00), $original);
-            } else {
-                $original[0] = '';
-            }
-
-            if ($transtemp[$count * 2 + 1] != 0) {
-                fseek($this->_file, $transtemp[$count * 2 + 2]);
-                $translate = fread($this->_file, $transtemp[$count * 2 + 1]);
-                $translate = explode(chr(00), $translate);
-                if ((count($original) > 1) && (count($translate) > 1)) {
-                    $this->_data[$locale][$original[0]] = $translate;
-                    array_shift($original);
-                    foreach ($original as $orig) {
-                        $this->_data[$locale][$orig] = '';
-                    }
-                } else {
-                    $this->_data[$locale][$original[0]] = $translate[0];
-                }
-            }
-        }
-
-        $this->_data[$locale][''] = trim($this->_data[$locale]['']);
-        if (empty($this->_data[$locale][''])) {
-            $this->_adapterInfo[$filename] = 'No adapter information available';
-        } else {
-            $this->_adapterInfo[$filename] = $this->_data[$locale][''];
-        }
-
-        unset($this->_data[$locale]['']);
-        return $this->_data;
-    }
-
-    /**
-     * Returns the adapter informations
-     *
-     * @return array Each loaded adapter information as array value
-     */
-    public function getAdapterInfo()
-    {
-        return $this->_adapterInfo;
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Gettext";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Ini.php b/airtime_mvc/library/Zend/Translate/Adapter/Ini.php
deleted file mode 100644
index 965f70f5e..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Ini.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Ini extends Zend_Translate_Adapter
-{
-    private $_data = array();
-
-    /**
-     * Load translation data
-     *
-     * @param  string|array  $data
-     * @param  string        $locale  Locale/Language to add data for, identical with locale identifier,
-     *                                see Zend_Locale for more information
-     * @param  array         $options OPTIONAL Options to use
-     * @throws Zend_Translate_Exception Ini file not found
-     * @return array
-     */
-    protected function _loadTranslationData($data, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!file_exists($data)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("Ini file '".$data."' not found");
-        }
-
-        $inidata = parse_ini_file($data, false);
-        if (!isset($this->_data[$locale])) {
-            $this->_data[$locale] = array();
-        }
-
-        $this->_data[$locale] = array_merge($this->_data[$locale], $inidata);
-        return $this->_data;
-    }
-
-    /**
-     * returns the adapters name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Ini";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Qt.php b/airtime_mvc/library/Zend/Translate/Adapter/Qt.php
deleted file mode 100644
index 33a9ee43f..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Qt.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Qt.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_file        = false;
-    private $_cleared     = array();
-    private $_transunit   = null;
-    private $_source      = null;
-    private $_target      = null;
-    private $_scontent    = null;
-    private $_tcontent    = null;
-    private $_stag        = false;
-    private $_ttag        = true;
-    private $_data        = array();
-
-    /**
-     * Load translation data (QT file reader)
-     *
-     * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
-     *                            see Zend_Locale for more information
-     * @param  string  $filename  QT file to add, full path must be given for access
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!is_readable($filename)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
-        }
-
-        $this->_target = $locale;
-
-        $encoding = $this->_findEncoding($filename);
-        $this->_file = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
-        xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
-
-        if (!xml_parse($this->_file, file_get_contents($filename))) {
-            $ex = sprintf('XML error: %s at line %d',
-                          xml_error_string(xml_get_error_code($this->_file)),
-                          xml_get_current_line_number($this->_file));
-            xml_parser_free($this->_file);
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception($ex);
-        }
-
-        return $this->_data;
-    }
-
-    private function _startElement($file, $name, $attrib)
-    {
-        switch(strtolower($name)) {
-            case 'message':
-                $this->_source = null;
-                $this->_stag = false;
-                $this->_ttag = false;
-                $this->_scontent = null;
-                $this->_tcontent = null;
-                break;
-            case 'source':
-                $this->_stag = true;
-                break;
-            case 'translation':
-                $this->_ttag = true;
-                break;
-            default:
-                break;
-        }
-    }
-
-    private function _endElement($file, $name)
-    {
-        switch (strtolower($name)) {
-            case 'source':
-                $this->_stag = false;
-                break;
-
-            case 'translation':
-                if (!empty($this->_scontent) and !empty($this->_tcontent) or
-                    (isset($this->_data[$this->_target][$this->_scontent]) === false)) {
-                    $this->_data[$this->_target][$this->_scontent] = $this->_tcontent;
-                }
-                $this->_ttag = false;
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    private function _contentElement($file, $data)
-    {
-        if ($this->_stag === true) {
-            $this->_scontent .= $data;
-        }
-
-        if ($this->_ttag === true) {
-            $this->_tcontent .= $data;
-        }
-    }
-
-    private function _findEncoding($filename)
-    {
-        $file = file_get_contents($filename, null, null, 0, 100);
-        if (strpos($file, "encoding") !== false) {
-            $encoding = substr($file, strpos($file, "encoding") + 9);
-            $encoding = substr($encoding, 1, strpos($encoding, $encoding[0], 1) - 1);
-            return $encoding;
-        }
-        return 'UTF-8';
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Qt";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Tbx.php b/airtime_mvc/library/Zend/Translate/Adapter/Tbx.php
deleted file mode 100644
index 629686753..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Tbx.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Tbx.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_file        = false;
-    private $_cleared     = array();
-    private $_langset     = null;
-    private $_termentry   = null;
-    private $_content     = null;
-    private $_term        = null;
-    private $_data        = array();
-
-    /**
-     * Load translation data (TBX file reader)
-     *
-     * @param  string  $filename  TBX file to add, full path must be given for access
-     * @param  string  $locale    Locale has no effect for TBX because TBX defines all languages within
-     *                            the source file
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!is_readable($filename)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
-        }
-
-        $encoding = $this->_findEncoding($filename);
-        $this->_file = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
-        xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
-
-        if (!xml_parse($this->_file, file_get_contents($filename))) {
-            $ex = sprintf('XML error: %s at line %d',
-                          xml_error_string(xml_get_error_code($this->_file)),
-                          xml_get_current_line_number($this->_file));
-            xml_parser_free($this->_file);
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception($ex);
-        }
-
-        return $this->_data;
-    }
-
-    private function _startElement($file, $name, $attrib)
-    {
-        if ($this->_term !== null) {
-            $this->_content .= "<".$name;
-            foreach($attrib as $key => $value) {
-                $this->_content .= " $key=\"$value\"";
-            }
-            $this->_content .= ">";
-        } else {
-            switch(strtolower($name)) {
-                case 'termentry':
-                    $this->_termentry = null;
-                    break;
-                case 'langset':
-                    if (isset($attrib['xml:lang']) === true) {
-                        $this->_langset = $attrib['xml:lang'];
-                        if (isset($this->_data[$this->_langset]) === false) {
-                            $this->_data[$this->_langset] = array();
-                        }
-                    }
-                    break;
-                case 'term':
-                    $this->_term    = true;
-                    $this->_content = null;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private function _endElement($file, $name)
-    {
-        if (($this->_term !== null) and ($name != "term")) {
-            $this->_content .= "</".$name.">";
-        } else {
-            switch (strtolower($name)) {
-                case 'langset':
-                    $this->_langset = null;
-                    break;
-                case 'term':
-                    $this->_term = null;
-                    if (empty($this->_termentry)) {
-                        $this->_termentry = $this->_content;
-                    }
-                    if (!empty($this->_content) or (isset($this->_data[$this->_langset][$this->_termentry]) === false)) {
-                        $this->_data[$this->_langset][$this->_termentry] = $this->_content;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private function _contentElement($file, $data)
-    {
-        if ($this->_term !== null) {
-            $this->_content .= $data;
-        }
-    }
-
-    private function _findEncoding($filename)
-    {
-        $file = file_get_contents($filename, null, null, 0, 100);
-        if (strpos($file, "encoding") !== false) {
-            $encoding = substr($file, strpos($file, "encoding") + 9);
-            $encoding = substr($encoding, 1, strpos($encoding, $encoding[0], 1) - 1);
-            return $encoding;
-        }
-        return 'UTF-8';
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Tbx";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Tmx.php b/airtime_mvc/library/Zend/Translate/Adapter/Tmx.php
deleted file mode 100644
index aabe5ca70..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Tmx.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Tmx.php 21050 2010-02-13 22:53:40Z thomas $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_file    = false;
-    private $_useId   = true;
-    private $_srclang = null;
-    private $_tu      = null;
-    private $_tuv     = null;
-    private $_seg     = null;
-    private $_content = null;
-    private $_data    = array();
-
-    /**
-     * Load translation data (TMX file reader)
-     *
-     * @param  string  $filename  TMX file to add, full path must be given for access
-     * @param  string  $locale    Locale has no effect for TMX because TMX defines all languages within
-     *                            the source file
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!is_readable($filename)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
-        }
-
-        if (isset($options['useId'])) {
-            $this->_useId = (boolean) $options['useId'];
-        }
-
-        $encoding = $this->_findEncoding($filename);
-        $this->_file = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
-        xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
-
-        if (!xml_parse($this->_file, file_get_contents($filename))) {
-            $ex = sprintf('XML error: %s at line %d',
-                          xml_error_string(xml_get_error_code($this->_file)),
-                          xml_get_current_line_number($this->_file));
-            xml_parser_free($this->_file);
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception($ex);
-        }
-
-        return $this->_data;
-    }
-
-    /**
-     * Internal method, called by xml element handler at start
-     *
-     * @param resource $file   File handler
-     * @param string   $name   Elements name
-     * @param array    $attrib Attributes for this element
-     */
-    protected function _startElement($file, $name, $attrib)
-    {
-        if ($this->_seg !== null) {
-            $this->_content .= "<".$name;
-            foreach($attrib as $key => $value) {
-                $this->_content .= " $key=\"$value\"";
-            }
-            $this->_content .= ">";
-        } else {
-            switch(strtolower($name)) {
-                case 'header':
-                    if (empty($this->_useId) && isset($attrib['srclang'])) {
-                        if (Zend_Locale::isLocale($attrib['srclang'])) {
-                            $this->_srclang = Zend_Locale::findLocale($attrib['srclang']);
-                        } else {
-                            if (!$this->_options['disableNotices']) {
-                                if ($this->_options['log']) {
-                                    $this->_options['log']->notice("The language '{$attrib['srclang']}' can not be set because it does not exist.");
-                                } else {
-                                    trigger_error("The language '{$attrib['srclang']}' can not be set because it does not exist.", E_USER_NOTICE);
-                                }
-                            }
-
-                            $this->_srclang = $attrib['srclang'];
-                        }
-                    }
-                    break;
-                case 'tu':
-                    if (isset($attrib['tuid'])) {
-                        $this->_tu = $attrib['tuid'];
-                    }
-                    break;
-                case 'tuv':
-                    if (isset($attrib['xml:lang'])) {
-                        if (Zend_Locale::isLocale($attrib['xml:lang'])) {
-                            $this->_tuv = Zend_Locale::findLocale($attrib['xml:lang']);
-                        } else {
-                            if (!$this->_options['disableNotices']) {
-                                if ($this->_options['log']) {
-                                    $this->_options['log']->notice("The language '{$attrib['xml:lang']}' can not be set because it does not exist.");
-                                } else {
-                                    trigger_error("The language '{$attrib['xml:lang']}' can not be set because it does not exist.", E_USER_NOTICE);
-                                }
-                            }
-
-                            $this->_tuv = $attrib['xml:lang'];
-                        }
-
-                        if (!isset($this->_data[$this->_tuv])) {
-                            $this->_data[$this->_tuv] = array();
-                        }
-                    }
-                    break;
-                case 'seg':
-                    $this->_seg     = true;
-                    $this->_content = null;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-
-    /**
-     * Internal method, called by xml element handler at end
-     *
-     * @param resource $file   File handler
-     * @param string   $name   Elements name
-     */
-    protected function _endElement($file, $name)
-    {
-        if (($this->_seg !== null) and ($name !== 'seg')) {
-            $this->_content .= "</".$name.">";
-        } else {
-            switch (strtolower($name)) {
-                case 'tu':
-                    $this->_tu = null;
-                    break;
-                case 'tuv':
-                    $this->_tuv = null;
-                    break;
-                case 'seg':
-                    $this->_seg = null;
-                    if (!empty($this->_srclang) && ($this->_srclang == $this->_tuv)) {
-                        $this->_tu = $this->_content;
-                    }
-
-                    if (!empty($this->_content) or (!isset($this->_data[$this->_tuv][$this->_tu]))) {
-                        $this->_data[$this->_tuv][$this->_tu] = $this->_content;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Internal method, called by xml element handler for content
-     *
-     * @param resource $file File handler
-     * @param string   $data Elements content
-     */
-    protected function _contentElement($file, $data)
-    {
-        if (($this->_seg !== null) and ($this->_tu !== null) and ($this->_tuv !== null)) {
-            $this->_content .= $data;
-        }
-    }
-
-
-    /**
-     * Internal method, detects the encoding of the xml file
-     *
-     * @param string $name Filename
-     * @return string Encoding
-     */
-    protected function _findEncoding($filename)
-    {
-        $file = file_get_contents($filename, null, null, 0, 100);
-        if (strpos($file, "encoding") !== false) {
-            $encoding = substr($file, strpos($file, "encoding") + 9);
-            $encoding = substr($encoding, 1, strpos($encoding, $encoding[0], 1) - 1);
-            return $encoding;
-        }
-        return 'UTF-8';
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Tmx";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/Xliff.php b/airtime_mvc/library/Zend/Translate/Adapter/Xliff.php
deleted file mode 100644
index c30a32efd..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/Xliff.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Xliff.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_file        = false;
-    private $_useId       = true;
-    private $_cleared     = array();
-    private $_transunit   = null;
-    private $_source      = null;
-    private $_target      = null;
-    private $_langId      = null;
-    private $_scontent    = null;
-    private $_tcontent    = null;
-    private $_stag        = false;
-    private $_ttag        = false;
-    private $_data        = array();
-
-    /**
-     * Load translation data (XLIFF file reader)
-     *
-     * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
-     *                            see Zend_Locale for more information
-     * @param  string  $filename  XLIFF file to add, full path must be given for access
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        if (!is_readable($filename)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
-        }
-
-        if (empty($options['useId'])) {
-            $this->_useId = false;
-        } else {
-            $this->_useId = true;
-        }
-
-        $encoding      = $this->_findEncoding($filename);
-        $this->_target = $locale;
-        $this->_file   = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
-        xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
-
-        if (!xml_parse($this->_file, file_get_contents($filename))) {
-            $ex = sprintf('XML error: %s at line %d',
-                          xml_error_string(xml_get_error_code($this->_file)),
-                          xml_get_current_line_number($this->_file));
-            xml_parser_free($this->_file);
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception($ex);
-        }
-
-        return $this->_data;
-    }
-
-    private function _startElement($file, $name, $attrib)
-    {
-        if ($this->_stag === true) {
-            $this->_scontent .= "<".$name;
-            foreach($attrib as $key => $value) {
-                $this->_scontent .= " $key=\"$value\"";
-            }
-            $this->_scontent .= ">";
-        } else if ($this->_ttag === true) {
-            $this->_tcontent .= "<".$name;
-            foreach($attrib as $key => $value) {
-                $this->_tcontent .= " $key=\"$value\"";
-            }
-            $this->_tcontent .= ">";
-        } else {
-            switch(strtolower($name)) {
-                case 'file':
-                    $this->_source = $attrib['source-language'];
-                    if (isset($attrib['target-language'])) {
-                        $this->_target = $attrib['target-language'];
-                    }
-
-                    if (!isset($this->_data[$this->_source])) {
-                        $this->_data[$this->_source] = array();
-                    }
-
-                    if (!isset($this->_data[$this->_target])) {
-                        $this->_data[$this->_target] = array();
-                    }
-
-                    break;
-                case 'trans-unit':
-                    $this->_transunit = true;
-                    $this->_langId = $attrib['id'];
-                    break;
-                case 'source':
-                    if ($this->_transunit === true) {
-                        $this->_scontent = null;
-                        $this->_stag = true;
-                        $this->_ttag = false;
-                    }
-                    break;
-                case 'target':
-                    if ($this->_transunit === true) {
-                        $this->_tcontent = null;
-                        $this->_ttag = true;
-                        $this->_stag = false;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private function _endElement($file, $name)
-    {
-        if (($this->_stag === true) and ($name !== 'source')) {
-            $this->_scontent .= "</".$name.">";
-        } else if (($this->_ttag === true) and ($name !== 'target')) {
-            $this->_tcontent .= "</".$name.">";
-        } else {
-            switch (strtolower($name)) {
-                case 'trans-unit':
-                    $this->_transunit = null;
-                    $this->_langId    = null;
-                    $this->_scontent  = null;
-                    $this->_tcontent  = null;
-                    break;
-                case 'source':
-                    if ($this->_useId) {
-                        if (!empty($this->_scontent) && !empty($this->_langId) &&
-                            !isset($this->_data[$this->_source][$this->_langId])) {
-                            $this->_data[$this->_source][$this->_langId] = $this->_scontent;
-                        }
-                    } else {
-                        if (!empty($this->_scontent) &&
-                            !isset($this->_data[$this->_source][$this->_scontent])) {
-                            $this->_data[$this->_source][$this->_scontent] = $this->_scontent;
-                        }
-                    }
-                    $this->_stag = false;
-                    break;
-                case 'target':
-                    if ($this->_useId) {
-                        if (!empty($this->_tcontent) && !empty($this->_langId) &&
-                            !isset($this->_data[$this->_target][$this->_langId])) {
-                            $this->_data[$this->_target][$this->_langId] = $this->_tcontent;
-                        }
-                    } else {
-                        if (!empty($this->_tcontent) && !empty($this->_scontent) &&
-                            !isset($this->_data[$this->_target][$this->_scontent])) {
-                            $this->_data[$this->_target][$this->_scontent] = $this->_tcontent;
-                        }
-                    }
-                    $this->_ttag = false;
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private function _contentElement($file, $data)
-    {
-        if (($this->_transunit !== null) and ($this->_source !== null) and ($this->_stag === true)) {
-            $this->_scontent .= $data;
-        }
-
-        if (($this->_transunit !== null) and ($this->_target !== null) and ($this->_ttag === true)) {
-            $this->_tcontent .= $data;
-        }
-    }
-
-    private function _findEncoding($filename)
-    {
-        $file = file_get_contents($filename, null, null, 0, 100);
-        if (strpos($file, "encoding") !== false) {
-            $encoding = substr($file, strpos($file, "encoding") + 9);
-            $encoding = substr($encoding, 1, strpos($encoding, $encoding[0], 1) - 1);
-            return $encoding;
-        }
-        return 'UTF-8';
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Xliff";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Adapter/XmlTm.php b/airtime_mvc/library/Zend/Translate/Adapter/XmlTm.php
deleted file mode 100644
index bcb56bd2a..000000000
--- a/airtime_mvc/library/Zend/Translate/Adapter/XmlTm.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: XmlTm.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once 'Zend/Translate/Adapter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter {
-    // Internal variables
-    private $_file        = false;
-    private $_cleared     = array();
-    private $_lang        = null;
-    private $_content     = null;
-    private $_tag         = null;
-    private $_data        = array();
-
-    /**
-     * Load translation data (XMLTM file reader)
-     *
-     * @param  string  $locale    Locale/Language to add data for, identical with locale identifier,
-     *                            see Zend_Locale for more information
-     * @param  string  $filename  XMLTM file to add, full path must be given for access
-     * @param  array   $option    OPTIONAL Options to use
-     * @throws Zend_Translation_Exception
-     * @return array
-     */
-    protected function _loadTranslationData($filename, $locale, array $options = array())
-    {
-        $this->_data = array();
-        $this->_lang = $locale;
-        if (!is_readable($filename)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.');
-        }
-
-        $encoding    = $this->_findEncoding($filename);
-        $this->_file = xml_parser_create($encoding);
-        xml_set_object($this->_file, $this);
-        xml_parser_set_option($this->_file, XML_OPTION_CASE_FOLDING, 0);
-        xml_set_element_handler($this->_file, "_startElement", "_endElement");
-        xml_set_character_data_handler($this->_file, "_contentElement");
-
-        if (!xml_parse($this->_file, file_get_contents($filename))) {
-            $ex = sprintf('XML error: %s at line %d',
-                          xml_error_string(xml_get_error_code($this->_file)),
-                          xml_get_current_line_number($this->_file));
-            xml_parser_free($this->_file);
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception($ex);
-        }
-
-        return $this->_data;
-    }
-
-    private function _startElement($file, $name, $attrib)
-    {
-        switch(strtolower($name)) {
-            case 'tm:tu':
-                $this->_tag     = $attrib['id'];
-                $this->_content = null;
-                break;
-            default:
-                break;
-        }
-    }
-
-    private function _endElement($file, $name)
-    {
-        switch (strtolower($name)) {
-            case 'tm:tu':
-                if (!empty($this->_tag) and !empty($this->_content) or
-                    (isset($this->_data[$this->_lang][$this->_tag]) === false)) {
-                    $this->_data[$this->_lang][$this->_tag] = $this->_content;
-                }
-                $this->_tag     = null;
-                $this->_content = null;
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    private function _contentElement($file, $data)
-    {
-        if (($this->_tag !== null)) {
-            $this->_content .= $data;
-        }
-    }
-
-    private function _findEncoding($filename)
-    {
-        $file = file_get_contents($filename, null, null, 0, 100);
-        if (strpos($file, "encoding") !== false) {
-            $encoding = substr($file, strpos($file, "encoding") + 9);
-            $encoding = substr($encoding, 1, strpos($encoding, $encoding[0], 1) - 1);
-            return $encoding;
-        }
-        return 'UTF-8';
-    }
-
-    /**
-     * Returns the adapter name
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "XmlTm";
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Exception.php b/airtime_mvc/library/Zend/Translate/Exception.php
deleted file mode 100644
index 1083beba2..000000000
--- a/airtime_mvc/library/Zend/Translate/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Translate/Plural.php b/airtime_mvc/library/Zend/Translate/Plural.php
deleted file mode 100644
index ecc18dee6..000000000
--- a/airtime_mvc/library/Zend/Translate/Plural.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Plural.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Utility class for returning the plural rules according to the given locale
- *
- * @category   Zend
- * @package    Zend_Locale
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate_Plural
-{
-    /**
-     * Manual rule to use
-     *
-     * @var string
-     */
-    protected static $_plural = array();
-
-    /**
-     * Returns the plural definition to use
-     *
-     * @param  integer $number Number for plural selection
-     * @param  string  $locale Locale to use
-     * @return integer Plural number to use
-     */
-    public static function getPlural($number, $locale)
-    {
-        if ($locale == "pt_BR") {
-            // temporary set a locale for brasilian
-            $locale = "xbr";
-        }
-
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-        }
-
-        if (isset(self::$_plural[$locale])) {
-            $return = call_user_func(self::$_plural[$locale], $number);
-
-            if (!is_int($return) || ($return < 0)) {
-                $return = 0;
-            }
-
-            return $return;
-        }
-
-        switch($locale) {
-            case 'bo':
-            case 'dz':
-            case 'id':
-            case 'ja':
-            case 'jv':
-            case 'ka':
-            case 'km':
-            case 'kn':
-            case 'ko':
-            case 'ms':
-            case 'th':
-            case 'tr':
-            case 'vi':
-            case 'zh':
-                return 0;
-                break;
-
-            case 'af':
-            case 'az':
-            case 'bn':
-            case 'bg':
-            case 'ca':
-            case 'da':
-            case 'de':
-            case 'el':
-            case 'en':
-            case 'eo':
-            case 'es':
-            case 'et':
-            case 'eu':
-            case 'fa':
-            case 'fi':
-            case 'fo':
-            case 'fur':
-            case 'fy':
-            case 'gl':
-            case 'gu':
-            case 'ha':
-            case 'he':
-            case 'hu':
-            case 'is':
-            case 'it':
-            case 'ku':
-            case 'lb':
-            case 'ml':
-            case 'mn':
-            case 'mr':
-            case 'nah':
-            case 'nb':
-            case 'ne':
-            case 'nl':
-            case 'nn':
-            case 'no':
-            case 'om':
-            case 'or':
-            case 'pa':
-            case 'pap':
-            case 'ps':
-            case 'pt':
-            case 'so':
-            case 'sq':
-            case 'sv':
-            case 'sw':
-            case 'ta':
-            case 'te':
-            case 'tk':
-            case 'ur':
-            case 'zu':
-                return ($number == 1) ? 0 : 1;
-
-            case 'am':
-            case 'bh':
-            case 'fil':
-            case 'fr':
-            case 'gun':
-            case 'hi':
-            case 'ln':
-            case 'mg':
-            case 'nso':
-            case 'xbr':
-            case 'ti':
-            case 'wa':
-                return (($number == 0) || ($number == 1)) ? 0 : 1;
-
-            case 'be':
-            case 'bs':
-            case 'hr':
-            case 'ru':
-            case 'sr':
-            case 'uk':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-
-            case 'cs':
-            case 'sk':
-                return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
-
-            case 'ga':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
-
-            case 'lt':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-
-            case 'sl':
-                return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
-
-            case 'mk':
-                return ($number % 10 == 1) ? 0 : 1;
-
-            case 'mt':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
-
-            case 'lv':
-                return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
-
-            case 'pl':
-                return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 > 29))) ? 1 : 2);
-
-            case 'cy':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
-
-            case 'ro':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
-
-            case 'ar':
-                return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number >= 3) && ($number <= 10)) ? 3 : ((($number >= 11) && ($number <= 99)) ? 4 : 5))));
-
-            default:
-                return 0;
-        }
-    }
-
-    /**
-     * Set's a new plural rule
-     *
-     * @param string $rule   Callback which acts as rule
-     * @param string $locale Locale which is used for this callback
-     * @return null
-     */
-    public static function setPlural($rule, $locale)
-    {
-        if ($locale == "pt_BR") {
-            // temporary set a locale for brasilian
-            $locale = "xbr";
-        }
-
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-        }
-
-        if (!is_callable($rule)) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception('The given rule can not be called');
-        }
-
-        self::$_plural[$locale] = $rule;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Translate/Translate.php b/airtime_mvc/library/Zend/Translate/Translate.php
deleted file mode 100644
index 2edb35c8c..000000000
--- a/airtime_mvc/library/Zend/Translate/Translate.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Translate.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Translate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Translate {
-    /**
-     * Adapter names constants
-     */
-    const AN_ARRAY   = 'Array';
-    const AN_CSV     = 'Csv';
-    const AN_GETTEXT = 'Gettext';
-    const AN_INI     = 'Ini';
-    const AN_QT      = 'Qt';
-    const AN_TBX     = 'Tbx';
-    const AN_TMX     = 'Tmx';
-    const AN_XLIFF   = 'Xliff';
-    const AN_XMLTM   = 'XmlTm';
-
-    const LOCALE_DIRECTORY = 'directory';
-    const LOCALE_FILENAME  = 'filename';
-
-    /**
-     * Adapter
-     *
-     * @var Zend_Translate_Adapter
-     */
-    private $_adapter;
-    private static $_cache = null;
-
-    /**
-     * Generates the standard translation object
-     *
-     * @param  string              $adapter  Adapter to use
-     * @param  array               $data     OPTIONAL Translation source data for the adapter
-     *                                       Depends on the Adapter
-     * @param  string|Zend_Locale  $locale   OPTIONAL locale to use
-     * @param  array               $options  OPTIONAL options for the adapter
-     * @throws Zend_Translate_Exception
-     */
-    public function __construct($adapter, $data = null, $locale = null, array $options = array())
-    {
-        $this->setAdapter($adapter, $data, $locale, $options);
-    }
-
-    /**
-     * Sets a new adapter
-     *
-     * @param  string              $adapter  Adapter to use
-     * @param  string|array        $data     OPTIONAL Translation data
-     * @param  string|Zend_Locale  $locale   OPTIONAL locale to use
-     * @param  array               $options  OPTIONAL Options to use
-     * @throws Zend_Translate_Exception
-     */
-    public function setAdapter($adapter, $data = null, $locale = null, array $options = array())
-    {
-        if (Zend_Loader::isReadable('Zend/Translate/Adapter/' . ucfirst($adapter). '.php')) {
-            $adapter = 'Zend_Translate_Adapter_' . ucfirst($adapter);
-        }
-
-        if (!class_exists($adapter)) {
-            Zend_Loader::loadClass($adapter);
-        }
-
-        if (self::$_cache !== null) {
-            call_user_func(array($adapter, 'setCache'), self::$_cache);
-        }
-
-        $this->_adapter = new $adapter($data, $locale, $options);
-        if (!$this->_adapter instanceof Zend_Translate_Adapter) {
-            require_once 'Zend/Translate/Exception.php';
-            throw new Zend_Translate_Exception("Adapter " . $adapter . " does not extend Zend_Translate_Adapter");
-        }
-    }
-
-    /**
-     * Returns the adapters name and it's options
-     *
-     * @return Zend_Translate_Adapter
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Returns the set cache
-     *
-     * @return Zend_Cache_Core The set cache
-     */
-    public static function getCache()
-    {
-        return self::$_cache;
-    }
-
-    /**
-     * Sets a cache for all instances of Zend_Translate
-     *
-     * @param  Zend_Cache_Core $cache Cache to store to
-     * @return void
-     */
-    public static function setCache(Zend_Cache_Core $cache)
-    {
-        self::$_cache = $cache;
-    }
-
-    /**
-     * Returns true when a cache is set
-     *
-     * @return boolean
-     */
-    public static function hasCache()
-    {
-        if (self::$_cache !== null) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Removes any set cache
-     *
-     * @return void
-     */
-    public static function removeCache()
-    {
-        self::$_cache = null;
-    }
-
-    /**
-     * Clears all set cache data
-     *
-     * @return void
-     */
-    public static function clearCache()
-    {
-        self::$_cache->clean();
-    }
-
-    /**
-     * Calls all methods from the adapter
-     */
-    public function __call($method, array $options)
-    {
-        if (method_exists($this->_adapter, $method)) {
-            return call_user_func_array(array($this->_adapter, $method), $options);
-        }
-        require_once 'Zend/Translate/Exception.php';
-        throw new Zend_Translate_Exception("Unknown method '" . $method . "' called!");
-    }
-}
diff --git a/airtime_mvc/library/Zend/Uri.php b/airtime_mvc/library/Zend/Uri.php
deleted file mode 100644
index 6e7a2822e..000000000
--- a/airtime_mvc/library/Zend/Uri.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class for all Zend_Uri handlers
- *
- * @category  Zend
- * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Uri
-{
-    /**
-     * Scheme of this URI (http, ftp, etc.)
-     *
-     * @var string
-     */
-    protected $_scheme = '';
-
-    /**
-     * Global configuration array
-     *
-     * @var array
-     */
-    static protected $_config = array(
-        'allow_unwise' => false
-    );
-
-    /**
-     * Return a string representation of this URI.
-     *
-     * @see    getUri()
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getUri();
-    }
-
-    /**
-     * Convenience function, checks that a $uri string is well-formed
-     * by validating it but not returning an object.  Returns TRUE if
-     * $uri is a well-formed URI, or FALSE otherwise.
-     *
-     * @param  string $uri The URI to check
-     * @return boolean
-     */
-    public static function check($uri)
-    {
-        try {
-            $uri = self::factory($uri);
-        } catch (Exception $e) {
-            return false;
-        }
-
-        return $uri->valid();
-    }
-
-    /**
-     * Create a new Zend_Uri object for a URI.  If building a new URI, then $uri should contain
-     * only the scheme (http, ftp, etc).  Otherwise, supply $uri with the complete URI.
-     *
-     * @param  string $uri The URI form which a Zend_Uri instance is created
-     * @throws Zend_Uri_Exception When an empty string was supplied for the scheme
-     * @throws Zend_Uri_Exception When an illegal scheme is supplied
-     * @throws Zend_Uri_Exception When the scheme is not supported
-     * @return Zend_Uri
-     * @link   http://www.faqs.org/rfcs/rfc2396.html
-     */
-    public static function factory($uri = 'http')
-    {
-        // Separate the scheme from the scheme-specific parts
-        $uri            = explode(':', $uri, 2);
-        $scheme         = strtolower($uri[0]);
-        $schemeSpecific = isset($uri[1]) === true ? $uri[1] : '';
-
-        if (strlen($scheme) === 0) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('An empty string was supplied for the scheme');
-        }
-
-        // Security check: $scheme is used to load a class file, so only alphanumerics are allowed.
-        if (ctype_alnum($scheme) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted');
-        }
-
-        /**
-         * Create a new Zend_Uri object for the $uri. If a subclass of Zend_Uri exists for the
-         * scheme, return an instance of that class. Otherwise, a Zend_Uri_Exception is thrown.
-         */
-        switch ($scheme) {
-            case 'http':
-                // Break intentionally omitted
-            case 'https':
-                $className = 'Zend_Uri_Http';
-                break;
-
-            case 'mailto':
-                // TODO
-            default:
-                require_once 'Zend/Uri/Exception.php';
-                throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported");
-                break;
-        }
-
-        if (!class_exists($className)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($className);
-        }
-        $schemeHandler = new $className($scheme, $schemeSpecific);
-
-        return $schemeHandler;
-    }
-
-    /**
-     * Get the URI's scheme
-     *
-     * @return string|false Scheme or false if no scheme is set.
-     */
-    public function getScheme()
-    {
-        if (empty($this->_scheme) === false) {
-            return $this->_scheme;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Set global configuration options
-     *
-     * @param Zend_Config|array $config
-     */
-    static public function setConfig($config)
-    {
-        if ($config instanceof Zend_Config) {
-            $config = $config->toArray();
-        } elseif (!is_array($config)) {
-            throw new Zend_Uri_Exception("Config must be an array or an instance of Zend_Config.");
-        }
-
-        foreach ($config as $k => $v) {
-            self::$_config[$k] = $v;
-        }
-    }
-
-    /**
-     * Zend_Uri and its subclasses cannot be instantiated directly.
-     * Use Zend_Uri::factory() to return a new Zend_Uri object.
-     *
-     * @param string $scheme         The scheme of the URI
-     * @param string $schemeSpecific The scheme-specific part of the URI
-     */
-    abstract protected function __construct($scheme, $schemeSpecific = '');
-
-    /**
-     * Return a string representation of this URI.
-     *
-     * @return string
-     */
-    abstract public function getUri();
-
-    /**
-     * Returns TRUE if this URI is valid, or FALSE otherwise.
-     *
-     * @return boolean
-     */
-    abstract public function valid();
-}
diff --git a/airtime_mvc/library/Zend/Uri/Exception.php b/airtime_mvc/library/Zend/Uri/Exception.php
deleted file mode 100644
index e71c32e1a..000000000
--- a/airtime_mvc/library/Zend/Uri/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * Exceptions for Zend_Uri
- *
- * @category  Zend
- * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Uri_Exception extends Zend_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/Uri/Http.php b/airtime_mvc/library/Zend/Uri/Http.php
deleted file mode 100644
index 28f315953..000000000
--- a/airtime_mvc/library/Zend/Uri/Http.php
+++ /dev/null
@@ -1,769 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * @see Zend_Validate_Hostname
- */
-require_once 'Zend/Validate/Hostname.php';
-
-/**
- * HTTP(S) URI handler
- *
- * @category  Zend
- * @package   Zend_Uri
- * @uses      Zend_Uri
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Uri_Http extends Zend_Uri
-{
-    /**
-     * Character classes for validation regular expressions
-     */
-    const CHAR_ALNUM    = 'A-Za-z0-9';
-    const CHAR_MARK     = '-_.!~*\'()\[\]';
-    const CHAR_RESERVED = ';\/?:@&=+$,';
-    const CHAR_SEGMENT  = ':@&=+$,;';
-    const CHAR_UNWISE   = '{}|\\\\^`';
-
-    /**
-     * HTTP username
-     *
-     * @var string
-     */
-    protected $_username = '';
-
-    /**
-     * HTTP password
-     *
-     * @var string
-     */
-    protected $_password = '';
-
-    /**
-     * HTTP host
-     *
-     * @var string
-     */
-    protected $_host = '';
-
-    /**
-     * HTTP post
-     *
-     * @var string
-     */
-    protected $_port = '';
-
-    /**
-     * HTTP part
-     *
-     * @var string
-     */
-    protected $_path = '';
-
-    /**
-     * HTTP query
-     *
-     * @var string
-     */
-    protected $_query = '';
-
-    /**
-     * HTTP fragment
-     *
-     * @var string
-     */
-    protected $_fragment = '';
-
-    /**
-     * Regular expression grammar rules for validation; values added by constructor
-     *
-     * @var array
-     */
-    protected $_regex = array();
-
-    /**
-     * Constructor accepts a string $scheme (e.g., http, https) and a scheme-specific part of the URI
-     * (e.g., example.com/path/to/resource?query=param#fragment)
-     *
-     * @param  string $scheme         The scheme of the URI
-     * @param  string $schemeSpecific The scheme-specific part of the URI
-     * @throws Zend_Uri_Exception When the URI is not valid
-     */
-    protected function __construct($scheme, $schemeSpecific = '')
-    {
-        // Set the scheme
-        $this->_scheme = $scheme;
-
-        // Set up grammar rules for validation via regular expressions. These
-        // are to be used with slash-delimited regular expression strings.
-
-        // Escaped special characters (eg. '%25' for '%')
-        $this->_regex['escaped']    = '%[[:xdigit:]]{2}';
-
-        // Unreserved characters
-        $this->_regex['unreserved'] = '[' . self::CHAR_ALNUM . self::CHAR_MARK . ']';
-
-        // Segment can use escaped, unreserved or a set of additional chars
-        $this->_regex['segment']    = '(?:' . $this->_regex['escaped'] . '|[' .
-            self::CHAR_ALNUM . self::CHAR_MARK . self::CHAR_SEGMENT . '])*';
-
-        // Path can be a series of segmets char strings seperated by '/'
-        $this->_regex['path']       = '(?:\/(?:' . $this->_regex['segment'] . ')?)+';
-
-        // URI characters can be escaped, alphanumeric, mark or reserved chars
-        $this->_regex['uric']       = '(?:' . $this->_regex['escaped'] . '|[' .
-            self::CHAR_ALNUM . self::CHAR_MARK . self::CHAR_RESERVED .
-
-        // If unwise chars are allowed, add them to the URI chars class
-            (self::$_config['allow_unwise'] ? self::CHAR_UNWISE : '') . '])';
-
-        // If no scheme-specific part was supplied, the user intends to create
-        // a new URI with this object.  No further parsing is required.
-        if (strlen($schemeSpecific) === 0) {
-            return;
-        }
-
-        // Parse the scheme-specific URI parts into the instance variables.
-        $this->_parseUri($schemeSpecific);
-
-        // Validate the URI
-        if ($this->valid() === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Invalid URI supplied');
-        }
-    }
-
-    /**
-     * Creates a Zend_Uri_Http from the given string
-     *
-     * @param  string $uri String to create URI from, must start with
-     *                     'http://' or 'https://'
-     * @throws InvalidArgumentException  When the given $uri is not a string or
-     *                                   does not start with http:// or https://
-     * @throws Zend_Uri_Exception        When the given $uri is invalid
-     * @return Zend_Uri_Http
-     */
-    public static function fromString($uri)
-    {
-        if (is_string($uri) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('$uri is not a string');
-        }
-
-        $uri            = explode(':', $uri, 2);
-        $scheme         = strtolower($uri[0]);
-        $schemeSpecific = isset($uri[1]) === true ? $uri[1] : '';
-
-        if (in_array($scheme, array('http', 'https')) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Invalid scheme: '$scheme'");
-        }
-
-        $schemeHandler = new Zend_Uri_Http($scheme, $schemeSpecific);
-        return $schemeHandler;
-    }
-
-    /**
-     * Parse the scheme-specific portion of the URI and place its parts into instance variables.
-     *
-     * @param  string $schemeSpecific The scheme-specific portion to parse
-     * @throws Zend_Uri_Exception When scheme-specific decoposition fails
-     * @throws Zend_Uri_Exception When authority decomposition fails
-     * @return void
-     */
-    protected function _parseUri($schemeSpecific)
-    {
-        // High-level decomposition parser
-        $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~';
-        $status  = @preg_match($pattern, $schemeSpecific, $matches);
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed');
-        }
-
-        // Failed decomposition; no further processing needed
-        if ($status === false) {
-            return;
-        }
-
-        // Save URI components that need no further decomposition
-        $this->_path     = isset($matches[4]) === true ? $matches[4] : '';
-        $this->_query    = isset($matches[6]) === true ? $matches[6] : '';
-        $this->_fragment = isset($matches[8]) === true ? $matches[8] : '';
-
-        // Additional decomposition to get username, password, host, and port
-        $combo   = isset($matches[3]) === true ? $matches[3] : '';
-        $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~';
-        $status  = @preg_match($pattern, $combo, $matches);
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: authority decomposition failed');
-        }
-
-        // Failed decomposition; no further processing needed
-        if ($status === false) {
-            return;
-        }
-
-        // Save remaining URI components
-        $this->_username = isset($matches[2]) === true ? $matches[2] : '';
-        $this->_password = isset($matches[4]) === true ? $matches[4] : '';
-        $this->_host     = isset($matches[5]) === true ? $matches[5] : '';
-        $this->_port     = isset($matches[7]) === true ? $matches[7] : '';
-
-    }
-
-    /**
-     * Returns a URI based on current values of the instance variables. If any
-     * part of the URI does not pass validation, then an exception is thrown.
-     *
-     * @throws Zend_Uri_Exception When one or more parts of the URI are invalid
-     * @return string
-     */
-    public function getUri()
-    {
-        if ($this->valid() === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('One or more parts of the URI are invalid');
-        }
-
-        $password = strlen($this->_password) > 0 ? ":$this->_password" : '';
-        $auth     = strlen($this->_username) > 0 ? "$this->_username$password@" : '';
-        $port     = strlen($this->_port) > 0 ? ":$this->_port" : '';
-        $query    = strlen($this->_query) > 0 ? "?$this->_query" : '';
-        $fragment = strlen($this->_fragment) > 0 ? "#$this->_fragment" : '';
-
-        return $this->_scheme
-             . '://'
-             . $auth
-             . $this->_host
-             . $port
-             . $this->_path
-             . $query
-             . $fragment;
-    }
-
-    /**
-     * Validate the current URI from the instance variables. Returns true if and only if all
-     * parts pass validation.
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        // Return true if and only if all parts of the URI have passed validation
-        return $this->validateUsername()
-           and $this->validatePassword()
-           and $this->validateHost()
-           and $this->validatePort()
-           and $this->validatePath()
-           and $this->validateQuery()
-           and $this->validateFragment();
-    }
-
-    /**
-     * Returns the username portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return strlen($this->_username) > 0 ? $this->_username : false;
-    }
-
-    /**
-     * Returns true if and only if the username passes validation. If no username is passed,
-     * then the username contained in the instance variable is used.
-     *
-     * @param  string $username The HTTP username
-     * @throws Zend_Uri_Exception When username validation fails
-     * @return boolean
-     * @link   http://www.faqs.org/rfcs/rfc2396.html
-     */
-    public function validateUsername($username = null)
-    {
-        if ($username === null) {
-            $username = $this->_username;
-        }
-
-        // If the username is empty, then it is considered valid
-        if (strlen($username) === 0) {
-            return true;
-        }
-
-        // Check the username against the allowed values
-        $status = @preg_match('/^(?:' . $this->_regex['escaped'] . '|[' .
-            self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $username);
-
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: username validation failed');
-        }
-
-        return $status === 1;
-    }
-
-    /**
-     * Sets the username for the current URI, and returns the old username
-     *
-     * @param  string $username The HTTP username
-     * @throws Zend_Uri_Exception When $username is not a valid HTTP username
-     * @return string
-     */
-    public function setUsername($username)
-    {
-        if ($this->validateUsername($username) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username");
-        }
-
-        $oldUsername     = $this->_username;
-        $this->_username = $username;
-
-        return $oldUsername;
-    }
-
-    /**
-     * Returns the password portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPassword()
-    {
-        return strlen($this->_password) > 0 ? $this->_password : false;
-    }
-
-    /**
-     * Returns true if and only if the password passes validation. If no password is passed,
-     * then the password contained in the instance variable is used.
-     *
-     * @param  string $password The HTTP password
-     * @throws Zend_Uri_Exception When password validation fails
-     * @return boolean
-     * @link   http://www.faqs.org/rfcs/rfc2396.html
-     */
-    public function validatePassword($password = null)
-    {
-        if ($password === null) {
-            $password = $this->_password;
-        }
-
-        // If the password is empty, then it is considered valid
-        if (strlen($password) === 0) {
-            return true;
-        }
-
-        // If the password is nonempty, but there is no username, then it is considered invalid
-        if (strlen($password) > 0 and strlen($this->_username) === 0) {
-            return false;
-        }
-
-        // Check the password against the allowed values
-        $status = @preg_match('/^(?:' . $this->_regex['escaped'] . '|[' .
-            self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $password);
-
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: password validation failed.');
-        }
-
-        return $status == 1;
-    }
-
-    /**
-     * Sets the password for the current URI, and returns the old password
-     *
-     * @param  string $password The HTTP password
-     * @throws Zend_Uri_Exception When $password is not a valid HTTP password
-     * @return string
-     */
-    public function setPassword($password)
-    {
-        if ($this->validatePassword($password) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password.");
-        }
-
-        $oldPassword     = $this->_password;
-        $this->_password = $password;
-
-        return $oldPassword;
-    }
-
-    /**
-     * Returns the domain or host IP portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getHost()
-    {
-        return strlen($this->_host) > 0 ? $this->_host : false;
-    }
-
-    /**
-     * Returns true if and only if the host string passes validation. If no host is passed,
-     * then the host contained in the instance variable is used.
-     *
-     * @param  string $host The HTTP host
-     * @return boolean
-     * @uses   Zend_Filter
-     */
-    public function validateHost($host = null)
-    {
-        if ($host === null) {
-            $host = $this->_host;
-        }
-
-        // If the host is empty, then it is considered invalid
-        if (strlen($host) === 0) {
-            return false;
-        }
-
-        // Check the host against the allowed values; delegated to Zend_Filter.
-        $validate = new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL);
-
-        return $validate->isValid($host);
-    }
-
-    /**
-     * Sets the host for the current URI, and returns the old host
-     *
-     * @param  string $host The HTTP host
-     * @throws Zend_Uri_Exception When $host is nota valid HTTP host
-     * @return string
-     */
-    public function setHost($host)
-    {
-        if ($this->validateHost($host) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host");
-        }
-
-        $oldHost     = $this->_host;
-        $this->_host = $host;
-
-        return $oldHost;
-    }
-
-    /**
-     * Returns the TCP port, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPort()
-    {
-        return strlen($this->_port) > 0 ? $this->_port : false;
-    }
-
-    /**
-     * Returns true if and only if the TCP port string passes validation. If no port is passed,
-     * then the port contained in the instance variable is used.
-     *
-     * @param  string $port The HTTP port
-     * @return boolean
-     */
-    public function validatePort($port = null)
-    {
-        if ($port === null) {
-            $port = $this->_port;
-        }
-
-        // If the port is empty, then it is considered valid
-        if (strlen($port) === 0) {
-            return true;
-        }
-
-        // Check the port against the allowed values
-        return ctype_digit((string) $port) and 1 <= $port and $port <= 65535;
-    }
-
-    /**
-     * Sets the port for the current URI, and returns the old port
-     *
-     * @param  string $port The HTTP port
-     * @throws Zend_Uri_Exception When $port is not a valid HTTP port
-     * @return string
-     */
-    public function setPort($port)
-    {
-        if ($this->validatePort($port) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port.");
-        }
-
-        $oldPort     = $this->_port;
-        $this->_port = $port;
-
-        return $oldPort;
-    }
-
-    /**
-     * Returns the path and filename portion of the URL, or FALSE if none.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return strlen($this->_path) > 0 ? $this->_path : '/';
-    }
-
-    /**
-     * Returns true if and only if the path string passes validation. If no path is passed,
-     * then the path contained in the instance variable is used.
-     *
-     * @param  string $path The HTTP path
-     * @throws Zend_Uri_Exception When path validation fails
-     * @return boolean
-     */
-    public function validatePath($path = null)
-    {
-        if ($path === null) {
-            $path = $this->_path;
-        }
-
-        // If the path is empty, then it is considered valid
-        if (strlen($path) === 0) {
-            return true;
-        }
-
-        // Determine whether the path is well-formed
-        $pattern = '/^' . $this->_regex['path'] . '$/';
-        $status  = @preg_match($pattern, $path);
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: path validation failed');
-        }
-
-        return (boolean) $status;
-    }
-
-    /**
-     * Sets the path for the current URI, and returns the old path
-     *
-     * @param  string $path The HTTP path
-     * @throws Zend_Uri_Exception When $path is not a valid HTTP path
-     * @return string
-     */
-    public function setPath($path)
-    {
-        if ($this->validatePath($path) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path");
-        }
-
-        $oldPath     = $this->_path;
-        $this->_path = $path;
-
-        return $oldPath;
-    }
-
-    /**
-     * Returns the query portion of the URL (after ?), or FALSE if none.
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return strlen($this->_query) > 0 ? $this->_query : false;
-    }
-
-    /**
-     * Returns the query portion of the URL (after ?) as a
-     * key-value-array. If the query is empty an empty array
-     * is returned
-     *
-     * @return array
-     */
-    public function getQueryAsArray()
-    {
-        $query = $this->getQuery();
-        $querryArray = array();
-        if ($query !== false) {
-            parse_str($query, $querryArray);
-        }
-        return $querryArray;
-    }
-
-    /**
-     * Returns true if and only if the query string passes validation. If no query is passed,
-     * then the query string contained in the instance variable is used.
-     *
-     * @param  string $query The query to validate
-     * @throws Zend_Uri_Exception When query validation fails
-     * @return boolean
-     * @link   http://www.faqs.org/rfcs/rfc2396.html
-     */
-    public function validateQuery($query = null)
-    {
-        if ($query === null) {
-            $query = $this->_query;
-        }
-
-        // If query is empty, it is considered to be valid
-        if (strlen($query) === 0) {
-            return true;
-        }
-
-        // Determine whether the query is well-formed
-        $pattern = '/^' . $this->_regex['uric'] . '*$/';
-        $status  = @preg_match($pattern, $query);
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: query validation failed');
-        }
-
-        return $status == 1;
-    }
-
-    /**
-     * Add or replace params in the query string for the current URI, and
-     * return the old query.
-     *
-     * @param  array $queryParams
-     * @return string Old query string
-     */
-    public function addReplaceQueryParameters(array $queryParams)
-    {
-        $queryParams = array_merge($this->getQueryAsArray(), $queryParams);
-        return $this->setQuery($queryParams);
-    }
-
-    /**
-     * Remove params in the query string for the current URI, and
-     * return the old query.
-     *
-     * @param  array $queryParamKeys
-     * @return string Old query string
-     */
-    public function removeQueryParameters(array $queryParamKeys)
-    {
-        $queryParams = array_diff_key($this->getQueryAsArray(), array_fill_keys($queryParamKeys, 0));
-        return $this->setQuery($queryParams);
-    }
-
-    /**
-     * Set the query string for the current URI, and return the old query
-     * string This method accepts both strings and arrays.
-     *
-     * @param  string|array $query The query string or array
-     * @throws Zend_Uri_Exception When $query is not a valid query string
-     * @return string              Old query string
-     */
-    public function setQuery($query)
-    {
-        $oldQuery = $this->_query;
-
-        // If query is empty, set an empty string
-        if (empty($query) === true) {
-            $this->_query = '';
-            return $oldQuery;
-        }
-
-        // If query is an array, make a string out of it
-        if (is_array($query) === true) {
-            $query = http_build_query($query, '', '&');
-        } else {
-            // If it is a string, make sure it is valid. If not parse and encode it
-            $query = (string) $query;
-            if ($this->validateQuery($query) === false) {
-                parse_str($query, $queryArray);
-                $query = http_build_query($queryArray, '', '&');
-            }
-        }
-
-        // Make sure the query is valid, and set it
-        if ($this->validateQuery($query) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("'$query' is not a valid query string");
-        }
-
-        $this->_query = $query;
-
-        return $oldQuery;
-    }
-
-    /**
-     * Returns the fragment portion of the URL (after #), or FALSE if none.
-     *
-     * @return string|false
-     */
-    public function getFragment()
-    {
-        return strlen($this->_fragment) > 0 ? $this->_fragment : false;
-    }
-
-    /**
-     * Returns true if and only if the fragment passes validation. If no fragment is passed,
-     * then the fragment contained in the instance variable is used.
-     *
-     * @param  string $fragment Fragment of an URI
-     * @throws Zend_Uri_Exception When fragment validation fails
-     * @return boolean
-     * @link   http://www.faqs.org/rfcs/rfc2396.html
-     */
-    public function validateFragment($fragment = null)
-    {
-        if ($fragment === null) {
-            $fragment = $this->_fragment;
-        }
-
-        // If fragment is empty, it is considered to be valid
-        if (strlen($fragment) === 0) {
-            return true;
-        }
-
-        // Determine whether the fragment is well-formed
-        $pattern = '/^' . $this->_regex['uric'] . '*$/';
-        $status  = @preg_match($pattern, $fragment);
-        if ($status === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception('Internal error: fragment validation failed');
-        }
-
-        return (boolean) $status;
-    }
-
-    /**
-     * Sets the fragment for the current URI, and returns the old fragment
-     *
-     * @param  string $fragment Fragment of the current URI
-     * @throws Zend_Uri_Exception When $fragment is not a valid HTTP fragment
-     * @return string
-     */
-    public function setFragment($fragment)
-    {
-        if ($this->validateFragment($fragment) === false) {
-            require_once 'Zend/Uri/Exception.php';
-            throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment");
-        }
-
-        $oldFragment     = $this->_fragment;
-        $this->_fragment = $fragment;
-
-        return $oldFragment;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate.php b/airtime_mvc/library/Zend/Validate.php
deleted file mode 100644
index 98b9c310b..000000000
--- a/airtime_mvc/library/Zend/Validate.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Validate.php 21340 2010-03-05 15:33:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Interface
- */
-require_once 'Zend/Validate/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate implements Zend_Validate_Interface
-{
-    /**
-     * Validator chain
-     *
-     * @var array
-     */
-    protected $_validators = array();
-
-    /**
-     * Array of validation failure messages
-     *
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * Default Namespaces
-     *
-     * @var array
-     */
-    protected static $_defaultNamespaces = array();
-
-    /**
-     * Array of validation failure message codes
-     *
-     * @var array
-     * @deprecated Since 1.5.0
-     */
-    protected $_errors = array();
-
-    /**
-     * Adds a validator to the end of the chain
-     *
-     * If $breakChainOnFailure is true, then if the validator fails, the next validator in the chain,
-     * if one exists, will not be executed.
-     *
-     * @param  Zend_Validate_Interface $validator
-     * @param  boolean                 $breakChainOnFailure
-     * @return Zend_Validate Provides a fluent interface
-     */
-    public function addValidator(Zend_Validate_Interface $validator, $breakChainOnFailure = false)
-    {
-        $this->_validators[] = array(
-            'instance' => $validator,
-            'breakChainOnFailure' => (boolean) $breakChainOnFailure
-            );
-        return $this;
-    }
-
-    /**
-     * Returns true if and only if $value passes all validations in the chain
-     *
-     * Validators are run in the order in which they were added to the chain (FIFO).
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_messages = array();
-        $this->_errors   = array();
-        $result = true;
-        foreach ($this->_validators as $element) {
-            $validator = $element['instance'];
-            if ($validator->isValid($value)) {
-                continue;
-            }
-            $result = false;
-            $messages = $validator->getMessages();
-            $this->_messages = array_merge($this->_messages, $messages);
-            $this->_errors   = array_merge($this->_errors,   array_keys($messages));
-            if ($element['breakChainOnFailure']) {
-                break;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns array of validation failure messages
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->_messages;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns array of validation failure message codes
-     *
-     * @return array
-     * @deprecated Since 1.5.0
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Returns the set default namespaces
-     *
-     * @return array
-     */
-    public static function getDefaultNamespaces()
-    {
-        return self::$_defaultNamespaces;
-    }
-
-    /**
-     * Sets new default namespaces
-     *
-     * @param array|string $namespace
-     * @return null
-     */
-    public static function setDefaultNamespaces($namespace)
-    {
-        if (!is_array($namespace)) {
-            $namespace = array((string) $namespace);
-        }
-
-        self::$_defaultNamespaces = $namespace;
-    }
-
-    /**
-     * Adds a new default namespace
-     *
-     * @param array|string $namespace
-     * @return null
-     */
-    public static function addDefaultNamespaces($namespace)
-    {
-        if (!is_array($namespace)) {
-            $namespace = array((string) $namespace);
-        }
-
-        self::$_defaultNamespaces = array_unique(array_merge(self::$_defaultNamespaces, $namespace));
-    }
-
-    /**
-     * Returns true when defaultNamespaces are set
-     *
-     * @return boolean
-     */
-    public static function hasDefaultNamespaces()
-    {
-        return (!empty(self::$_defaultNamespaces));
-    }
-
-    /**
-     * @param  mixed    $value
-     * @param  string   $classBaseName
-     * @param  array    $args          OPTIONAL
-     * @param  mixed    $namespaces    OPTIONAL
-     * @return boolean
-     * @throws Zend_Validate_Exception
-     */
-    public static function is($value, $classBaseName, array $args = array(), $namespaces = array())
-    {
-        $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Validate'));
-        $className  = ucfirst($classBaseName);
-        try {
-            if (!class_exists($className, false)) {
-                require_once 'Zend/Loader.php';
-                foreach($namespaces as $namespace) {
-                    $class = $namespace . '_' . $className;
-                    $file  = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-                    if (Zend_Loader::isReadable($file)) {
-                        Zend_Loader::loadClass($class);
-                        $className = $class;
-                        break;
-                    }
-                }
-            }
-
-            $class = new ReflectionClass($className);
-            if ($class->implementsInterface('Zend_Validate_Interface')) {
-                if ($class->hasMethod('__construct')) {
-                    $keys    = array_keys($args);
-                    $numeric = false;
-                    foreach($keys as $key) {
-                        if (is_numeric($key)) {
-                            $numeric = true;
-                            break;
-                        }
-                    }
-
-                    if ($numeric) {
-                        $object = $class->newInstanceArgs($args);
-                    } else {
-                        $object = $class->newInstance($args);
-                    }
-                } else {
-                    $object = $class->newInstance();
-                }
-
-                return $object->isValid($value);
-            }
-        } catch (Zend_Validate_Exception $ze) {
-            // if there is an exception while validating throw it
-            throw $ze;
-        } catch (Exception $e) {
-            // fallthrough and continue for missing validation classes
-        }
-
-        require_once 'Zend/Validate/Exception.php';
-        throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'");
-    }
-
-    /**
-     * Returns the maximum allowed message length
-     *
-     * @return integer
-     */
-    public static function getMessageLength()
-    {
-        require_once 'Zend/Validate/Abstract.php';
-        return Zend_Validate_Abstract::getMessageLength();
-    }
-
-    /**
-     * Sets the maximum allowed message length
-     *
-     * @param integer $length
-     */
-    public static function setMessageLength($length = -1)
-    {
-        require_once 'Zend/Validate/Abstract.php';
-        Zend_Validate_Abstract::setMessageLength($length);
-    }
-
-    /**
-     * Returns the default translation object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public static function getDefaultTranslator($translator = null)
-    {
-        require_once 'Zend/Validate/Abstract.php';
-        return Zend_Validate_Abstract::getDefaultTranslator();
-    }
-
-    /**
-     * Sets a default translation object for all validation objects
-     *
-     * @param Zend_Translate|Zend_Translate_Adapter|null $translator
-     */
-    public static function setDefaultTranslator($translator = null)
-    {
-        require_once 'Zend/Validate/Abstract.php';
-        Zend_Validate_Abstract::setDefaultTranslator($translator);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Abstract.php b/airtime_mvc/library/Zend/Validate/Abstract.php
deleted file mode 100644
index b59478e97..000000000
--- a/airtime_mvc/library/Zend/Validate/Abstract.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Interface
- */
-require_once 'Zend/Validate/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Validate_Abstract implements Zend_Validate_Interface
-{
-    /**
-     * The value to be validated
-     *
-     * @var mixed
-     */
-    protected $_value;
-
-    /**
-     * Additional variables available for validation failure messages
-     *
-     * @var array
-     */
-    protected $_messageVariables = array();
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array();
-
-    /**
-     * Array of validation failure messages
-     *
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * Flag indidcating whether or not value should be obfuscated in error
-     * messages
-     * @var bool
-     */
-    protected $_obscureValue = false;
-
-    /**
-     * Array of validation failure message codes
-     *
-     * @var array
-     * @deprecated Since 1.5.0
-     */
-    protected $_errors = array();
-
-    /**
-     * Translation object
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Default translation object for all validate objects
-     * @var Zend_Translate
-     */
-    protected static $_defaultTranslator;
-
-    /**
-     * Is translation disabled?
-     * @var Boolean
-     */
-    protected $_translatorDisabled = false;
-
-    /**
-     * Limits the maximum returned length of a error message
-     *
-     * @var Integer
-     */
-    protected static $_messageLength = -1;
-
-    /**
-     * Returns array of validation failure messages
-     *
-     * @return array
-     */
-    public function getMessages()
-    {
-        return $this->_messages;
-    }
-
-    /**
-     * Returns an array of the names of variables that are used in constructing validation failure messages
-     *
-     * @return array
-     */
-    public function getMessageVariables()
-    {
-        return array_keys($this->_messageVariables);
-    }
-
-    /**
-     * Returns the message templates from the validator
-     *
-     * @return array
-     */
-    public function getMessageTemplates()
-    {
-        return $this->_messageTemplates;
-    }
-
-    /**
-     * Sets the validation failure message template for a particular key
-     *
-     * @param  string $messageString
-     * @param  string $messageKey     OPTIONAL
-     * @return Zend_Validate_Abstract Provides a fluent interface
-     * @throws Zend_Validate_Exception
-     */
-    public function setMessage($messageString, $messageKey = null)
-    {
-        if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            foreach($keys as $key) {
-                $this->setMessage($messageString, $key);
-            }
-            return $this;
-        }
-
-        if (!isset($this->_messageTemplates[$messageKey])) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("No message template exists for key '$messageKey'");
-        }
-
-        $this->_messageTemplates[$messageKey] = $messageString;
-        return $this;
-    }
-
-    /**
-     * Sets validation failure message templates given as an array, where the array keys are the message keys,
-     * and the array values are the message template strings.
-     *
-     * @param  array $messages
-     * @return Zend_Validate_Abstract
-     */
-    public function setMessages(array $messages)
-    {
-        foreach ($messages as $key => $message) {
-            $this->setMessage($message, $key);
-        }
-        return $this;
-    }
-
-    /**
-     * Magic function returns the value of the requested property, if and only if it is the value or a
-     * message variable.
-     *
-     * @param  string $property
-     * @return mixed
-     * @throws Zend_Validate_Exception
-     */
-    public function __get($property)
-    {
-        if ($property == 'value') {
-            return $this->_value;
-        }
-        if (array_key_exists($property, $this->_messageVariables)) {
-            return $this->{$this->_messageVariables[$property]};
-        }
-        /**
-         * @see Zend_Validate_Exception
-         */
-        require_once 'Zend/Validate/Exception.php';
-        throw new Zend_Validate_Exception("No property exists by the name '$property'");
-    }
-
-    /**
-     * Constructs and returns a validation failure message with the given message key and value.
-     *
-     * Returns null if and only if $messageKey does not correspond to an existing template.
-     *
-     * If a translator is available and a translation exists for $messageKey,
-     * the translation will be used.
-     *
-     * @param  string $messageKey
-     * @param  string $value
-     * @return string
-     */
-    protected function _createMessage($messageKey, $value)
-    {
-        if (!isset($this->_messageTemplates[$messageKey])) {
-            return null;
-        }
-
-        $message = $this->_messageTemplates[$messageKey];
-
-        if (null !== ($translator = $this->getTranslator())) {
-            if ($translator->isTranslated($message)) {
-                $message = $translator->translate($message);
-            } elseif ($translator->isTranslated($messageKey)) {
-                $message = $translator->translate($messageKey);
-            }
-        }
-
-        if (is_object($value)) {
-            if (!in_array('__toString', get_class_methods($value))) {
-                $value = get_class($value) . ' object';
-            } else {
-                $value = $value->__toString();
-            }
-        } else {
-            $value = (string)$value;
-        }
-
-        if ($this->getObscureValue()) {
-            $value = str_repeat('*', strlen($value));
-        }
-
-        $message = str_replace('%value%', (string) $value, $message);
-        foreach ($this->_messageVariables as $ident => $property) {
-            $message = str_replace("%$ident%", (string) $this->$property, $message);
-        }
-
-        $length = self::getMessageLength();
-        if (($length > -1) && (strlen($message) > $length)) {
-            $message = substr($message, 0, (self::getMessageLength() - 3)) . '...';
-        }
-
-        return $message;
-    }
-
-    /**
-     * @param  string $messageKey
-     * @param  string $value      OPTIONAL
-     * @return void
-     */
-    protected function _error($messageKey, $value = null)
-    {
-        if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKey = current($keys);
-        }
-        if ($value === null) {
-            $value = $this->_value;
-        }
-        $this->_errors[]              = $messageKey;
-        $this->_messages[$messageKey] = $this->_createMessage($messageKey, $value);
-    }
-
-    /**
-     * Sets the value to be validated and clears the messages and errors arrays
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    protected function _setValue($value)
-    {
-        $this->_value    = $value;
-        $this->_messages = array();
-        $this->_errors   = array();
-    }
-
-    /**
-     * Returns array of validation failure message codes
-     *
-     * @return array
-     * @deprecated Since 1.5.0
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Set flag indicating whether or not value should be obfuscated in messages
-     *
-     * @param  bool $flag
-     * @return Zend_Validate_Abstract
-     */
-    public function setObscureValue($flag)
-    {
-        $this->_obscureValue = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve flag indicating whether or not value should be obfuscated in
-     * messages
-     *
-     * @return bool
-     */
-    public function getObscureValue()
-    {
-        return $this->_obscureValue;
-    }
-
-    /**
-     * Set translation object
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return Zend_Validate_Abstract
-     */
-    public function setTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid translator specified');
-        }
-        return $this;
-    }
-
-    /**
-     * Return translation object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->translatorIsDisabled()) {
-            return null;
-        }
-
-        if (null === $this->_translator) {
-            return self::getDefaultTranslator();
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Set default translation object for all validate objects
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter|null $translator
-     * @return void
-     */
-    public static function setDefaultTranslator($translator = null)
-    {
-        if ((null === $translator) || ($translator instanceof Zend_Translate_Adapter)) {
-            self::$_defaultTranslator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            self::$_defaultTranslator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid translator specified');
-        }
-    }
-
-    /**
-     * Get default translation object for all validate objects
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public static function getDefaultTranslator()
-    {
-        if (null === self::$_defaultTranslator) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $translator = Zend_Registry::get('Zend_Translate');
-                if ($translator instanceof Zend_Translate_Adapter) {
-                    return $translator;
-                } elseif ($translator instanceof Zend_Translate) {
-                    return $translator->getAdapter();
-                }
-            }
-        }
-
-        return self::$_defaultTranslator;
-    }
-
-    /**
-     * Indicate whether or not translation should be disabled
-     *
-     * @param  bool $flag
-     * @return Zend_Validate_Abstract
-     */
-    public function setDisableTranslator($flag)
-    {
-        $this->_translatorDisabled = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Is translation disabled?
-     *
-     * @return bool
-     */
-    public function translatorIsDisabled()
-    {
-        return $this->_translatorDisabled;
-    }
-
-    /**
-     * Returns the maximum allowed message length
-     *
-     * @return integer
-     */
-    public static function getMessageLength()
-    {
-        return self::$_messageLength;
-    }
-
-    /**
-     * Sets the maximum allowed message length
-     *
-     * @param integer $length
-     */
-    public static function setMessageLength($length = -1)
-    {
-        self::$_messageLength = $length;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Alnum.php b/airtime_mvc/library/Zend/Validate/Alnum.php
deleted file mode 100644
index d222a368f..000000000
--- a/airtime_mvc/library/Zend/Validate/Alnum.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Alnum.php 20442 2010-01-20 15:15:40Z matthew $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Alnum extends Zend_Validate_Abstract
-{
-    const INVALID      = 'alnumInvalid';
-    const NOT_ALNUM    = 'notAlnum';
-    const STRING_EMPTY = 'alnumStringEmpty';
-
-    /**
-     * Whether to allow white space characters; off by default
-     *
-     * @var boolean
-     * @deprecated
-     */
-    public $allowWhiteSpace;
-
-    /**
-     * Alphanumeric filter used for validation
-     *
-     * @var Zend_Filter_Alnum
-     */
-    protected static $_filter = null;
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID      => "Invalid type given, value should be float, string, or integer",
-        self::NOT_ALNUM    => "'%value%' contains characters which are non alphabetic and no digits",
-        self::STRING_EMPTY => "'%value%' is an empty string",
-    );
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        if ($allowWhiteSpace instanceof Zend_Config) {
-            $allowWhiteSpace = $allowWhiteSpace->toArray();
-        }
-
-        if (is_array($allowWhiteSpace)) {
-            if (array_key_exists('allowWhiteSpace', $allowWhiteSpace)) {
-                $allowWhiteSpace = $allowWhiteSpace['allowWhiteSpace'];
-            } else {
-                $allowWhiteSpace = false;
-            }
-        }
-
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-    }
-
-    /**
-     * Returns the allowWhiteSpace option
-     *
-     * @return boolean
-     */
-    public function getAllowWhiteSpace()
-    {
-        return $this->allowWhiteSpace;
-    }
-
-    /**
-     * Sets the allowWhiteSpace option
-     *
-     * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alnum Provides a fluent interface
-     */
-    public function setAllowWhiteSpace($allowWhiteSpace)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only alphabetic and digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-
-        if ('' === $value) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Alnum
-             */
-            require_once 'Zend/Filter/Alnum.php';
-            self::$_filter = new Zend_Filter_Alnum();
-        }
-
-        self::$_filter->allowWhiteSpace = $this->allowWhiteSpace;
-
-        if ($value != self::$_filter->filter($value)) {
-            $this->_error(self::NOT_ALNUM);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/Alpha.php b/airtime_mvc/library/Zend/Validate/Alpha.php
deleted file mode 100644
index 547417774..000000000
--- a/airtime_mvc/library/Zend/Validate/Alpha.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Alpha.php 20442 2010-01-20 15:15:40Z matthew $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Alpha extends Zend_Validate_Abstract
-{
-    const INVALID      = 'alphaInvalid';
-    const NOT_ALPHA    = 'notAlpha';
-    const STRING_EMPTY = 'alphaStringEmpty';
-
-    /**
-     * Whether to allow white space characters; off by default
-     *
-     * @var boolean
-     * @deprecated
-     */
-    public $allowWhiteSpace;
-
-    /**
-     * Alphabetic filter used for validation
-     *
-     * @var Zend_Filter_Alpha
-     */
-    protected static $_filter = null;
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID      => "Invalid type given, value should be a string",
-        self::NOT_ALPHA    => "'%value%' contains non alphabetic characters",
-        self::STRING_EMPTY => "'%value%' is an empty string"
-    );
-
-    /**
-     * Sets default option values for this instance
-     *
-     * @param  boolean|Zend_Config $allowWhiteSpace
-     * @return void
-     */
-    public function __construct($allowWhiteSpace = false)
-    {
-        if ($allowWhiteSpace instanceof Zend_Config) {
-            $allowWhiteSpace = $allowWhiteSpace->toArray();
-        }
-
-        if (is_array($allowWhiteSpace)) {
-            if (array_key_exists('allowWhiteSpace', $allowWhiteSpace)) {
-                $allowWhiteSpace = $allowWhiteSpace['allowWhiteSpace'];
-            } else {
-                $allowWhiteSpace = false;
-            }
-        }
-
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-    }
-
-    /**
-     * Returns the allowWhiteSpace option
-     *
-     * @return boolean
-     */
-    public function getAllowWhiteSpace()
-    {
-        return $this->allowWhiteSpace;
-    }
-
-    /**
-     * Sets the allowWhiteSpace option
-     *
-     * @param boolean $allowWhiteSpace
-     * @return Zend_Filter_Alpha Provides a fluent interface
-     */
-    public function setAllowWhiteSpace($allowWhiteSpace)
-    {
-        $this->allowWhiteSpace = (boolean) $allowWhiteSpace;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only alphabetic characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-
-        if ('' === $value) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Alpha
-             */
-            require_once 'Zend/Filter/Alpha.php';
-            self::$_filter = new Zend_Filter_Alpha();
-        }
-
-        self::$_filter->allowWhiteSpace = $this->allowWhiteSpace;
-
-        if ($value !== self::$_filter->filter($value)) {
-            $this->_error(self::NOT_ALPHA);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode.php b/airtime_mvc/library/Zend/Validate/Barcode.php
deleted file mode 100644
index 933999a50..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Barcode.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode extends Zend_Validate_Abstract
-{
-    const INVALID        = 'barcodeInvalid';
-    const FAILED         = 'barcodeFailed';
-    const INVALID_CHARS  = 'barcodeInvalidChars';
-    const INVALID_LENGTH = 'barcodeInvalidLength';
-
-    protected $_messageTemplates = array(
-        self::FAILED         => "'%value%' failed checksum validation",
-        self::INVALID_CHARS  => "'%value%' contains invalid characters",
-        self::INVALID_LENGTH => "'%value%' should have a length of %length% characters",
-        self::INVALID        => "Invalid type given, value should be string",
-    );
-
-    /**
-     * Additional variables available for validation failure messages
-     *
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'length' => '_length'
-    );
-
-    /**
-     * Length for the set subtype
-     *
-     * @var integer
-     */
-    protected $_length;
-
-    /**
-     * Barcode adapter
-     *
-     * @var Zend_Validate_Barcode_BarcodeAdapter
-     */
-    protected $_adapter;
-
-    /**
-     * Generates the standard validator object
-     *
-     * @param  string|Zend_Config|
-     *         Zend_Validate_Barcode_BarcodeAdapter $adapter Barcode adapter to use
-     * @return void
-     * @throws Zend_Validate_Exception
-     */
-    public function __construct($adapter)
-    {
-        if ($adapter instanceof Zend_Config) {
-            $adapter = $adapter->toArray();
-        }
-
-        $options  = null;
-        $checksum = null;
-        if (is_array($adapter)) {
-            if (array_key_exists('options', $adapter)) {
-                $options = $adapter['options'];
-            }
-
-            if (array_key_exists('checksum', $adapter)) {
-                $checksum = $adapter['checksum'];
-            }
-
-            if (array_key_exists('adapter', $adapter)) {
-                $adapter = $adapter['adapter'];
-            } else {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("Missing option 'adapter'");
-            }
-        }
-
-        $this->setAdapter($adapter, $options);
-        if ($checksum !== null) {
-            $this->setChecksum($checksum);
-        }
-    }
-
-    /**
-     * Returns the set adapter
-     *
-     * @return Zend_Validate_Barcode_BarcodeAdapter
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Sets a new barcode adapter
-     *
-     * @param  string|Zend_Validate_Barcode $adapter Barcode adapter to use
-     * @param  array  $options Options for this adapter
-     * @return void
-     * @throws Zend_Validate_Exception
-     */
-    public function setAdapter($adapter, $options = null)
-    {
-        $adapter = ucfirst(strtolower($adapter));
-        require_once 'Zend/Loader.php';
-        if (Zend_Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) {
-            $adapter = 'Zend_Validate_Barcode_' . $adapter;
-        }
-
-        if (!class_exists($adapter)) {
-            Zend_Loader::loadClass($adapter);
-        }
-
-        $this->_adapter = new $adapter($options);
-        if (!$this->_adapter instanceof Zend_Validate_Barcode_AdapterInterface) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception(
-                "Adapter " . $adapter . " does not implement Zend_Validate_Barcode_AdapterInterface"
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the checksum option
-     *
-     * @return boolean
-     */
-    public function getChecksum()
-    {
-        return $this->getAdapter()->getCheck();
-    }
-
-    /**
-     * Sets the checksum option
-     *
-     * @param  boolean $checksum
-     * @return Zend_Validate_Barcode
-     */
-    public function setChecksum($checksum)
-    {
-        $this->getAdapter()->setCheck($checksum);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains a valid barcode
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_value  = (string) $value;
-        $adapter       = $this->getAdapter();
-        $this->_length = $adapter->getLength();
-        $result        = $adapter->checkLength($value);
-        if (!$result) {
-            $this->_error(self::INVALID_LENGTH);
-            return false;
-        }
-
-        $result = $adapter->checkChars($value);
-        if (!$result) {
-            $this->_error(self::INVALID_CHARS);
-            return false;
-        }
-
-        if ($this->getChecksum()) {
-            $result = $adapter->checksum($value);
-            if (!$result) {
-                $this->_error(self::FAILED);
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/AdapterAbstract.php b/airtime_mvc/library/Zend/Validate/Barcode/AdapterAbstract.php
deleted file mode 100644
index 043189e6c..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/AdapterAbstract.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterInterface
- */
-require_once 'Zend/Validate/Barcode/AdapterInterface.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Validate_Barcode_AdapterAbstract
-    implements Zend_Validate_Barcode_AdapterInterface
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer|array|string
-     */
-    protected $_length;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters;
-
-    /**
-     * Callback to checksum function
-     * @var string|array
-     */
-    protected $_checksum;
-
-    /**
-     * Is a checksum value included?
-     * @var boolean
-     */
-    protected $_hasChecksum = true;
-
-    /**
-     * Checks the length of a barcode
-     *
-     * @param  string $value The barcode to check for proper length
-     * @return boolean
-     */
-    public function checkLength($value)
-    {
-        if (!is_string($value)) {
-            return false;
-        }
-
-        $fixum  = strlen($value);
-        $found  = false;
-        $length = $this->getLength();
-        if (is_array($length)) {
-            foreach ($length as $value) {
-                if ($fixum == $value) {
-                    $found = true;
-                }
-
-                if ($value == -1) {
-                    $found = true;
-                }
-            }
-        } elseif ($fixum == $length) {
-            $found = true;
-        } elseif ($length == -1) {
-            $found = true;
-        } elseif ($length == 'even') {
-            $count = $fixum % 2;
-            $found = ($count == 0) ? true : false;
-        } elseif ($length == 'odd') {
-            $count = $fixum % 2;
-            $found = ($count == 1) ? true : false;
-        }
-
-        return $found;
-    }
-
-    /**
-     * Checks for allowed characters within the barcode
-     *
-     * @param  string $value The barcode to check for allowed characters
-     * @return boolean
-     */
-    public function checkChars($value)
-    {
-        if (!is_string($value)) {
-            return false;
-        }
-
-        $characters = $this->getCharacters();
-        if ($characters == 128) {
-            for ($x = 0; $x < 128; ++$x) {
-                $value = str_replace(chr($x), '', $value);
-            }
-        } else {
-            $chars = str_split($characters);
-            foreach ($chars as $char) {
-                $value = str_replace($char, '', $value);
-            }
-        }
-
-        if (strlen($value) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the checksum
-     *
-     * @param  string $value The barcode to check the checksum for
-     * @return boolean
-     */
-    public function checksum($value)
-    {
-        $checksum = $this->getChecksum();
-        if (!empty($checksum)) {
-            if (method_exists($this, $checksum)) {
-                return call_user_func(array($this, $checksum), $value);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the allowed barcode length
-     *
-     * @return string
-     */
-    public function getLength()
-    {
-        return $this->_length;
-    }
-
-    /**
-     * Returns the allowed characters
-     *
-     * @return integer|string
-     */
-    public function getCharacters()
-    {
-        return $this->_characters;
-    }
-
-    /**
-     * Returns the checksum function name
-     *
-     */
-    public function getChecksum()
-    {
-        return $this->_checksum;
-    }
-
-    /**
-     * Returns if barcode uses checksum
-     *
-     * @return boolean
-     */
-    public function getCheck()
-    {
-        return $this->_hasChecksum;
-    }
-
-    /**
-     * Sets the checksum validation
-     *
-     * @param  boolean $check
-     * @return Zend_Validate_Barcode_AdapterAbstract
-     */
-    public function setCheck($check)
-    {
-        $this->_hasChecksum = (boolean) $check;
-        return $this;
-    }
-
-    /**
-     * Validates the checksum (Modulo 10)
-     * GTIN implementation factor 3
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _gtin($value)
-    {
-        $barcode = substr($value, 0, -1);
-        $sum     = 0;
-        $length  = strlen($barcode) - 1;
-
-        for ($i = 0; $i <= $length; $i++) {
-            if (($i % 2) === 0) {
-                $sum += $barcode[$length - $i] * 3;
-            } else {
-                $sum += $barcode[$length - $i];
-            }
-        }
-
-        $calc     = $sum % 10;
-        $checksum = ($calc === 0) ? 0 : (10 - $calc);
-        if ($value[$length + 1] != $checksum) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the checksum (Modulo 10)
-     * IDENTCODE implementation factors 9 and 4
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _identcode($value)
-    {
-        $barcode = substr($value, 0, -1);
-        $sum     = 0;
-        $length  = strlen($value) - 2;
-
-        for ($i = 0; $i <= $length; $i++) {
-            if (($i % 2) === 0) {
-                $sum += $barcode[$length - $i] * 4;
-            } else {
-                $sum += $barcode[$length - $i] * 9;
-            }
-        }
-
-        $calc     = $sum % 10;
-        $checksum = ($calc === 0) ? 0 : (10 - $calc);
-        if ($value[$length + 1] != $checksum) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the checksum (Modulo 10)
-     * CODE25 implementation factor 3
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _code25($value)
-    {
-        $barcode = substr($value, 0, -1);
-        $sum     = 0;
-        $length  = strlen($barcode) - 1;
-
-        for ($i = 0; $i <= $length; $i++) {
-            if (($i % 2) === 0) {
-                $sum += $barcode[$i] * 3;
-            } else {
-                $sum += $barcode[$i];
-            }
-        }
-
-        $calc     = $sum % 10;
-        $checksum = ($calc === 0) ? 0 : (10 - $calc);
-        if ($value[$length + 1] != $checksum) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates the checksum ()
-     * POSTNET implementation
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _postnet($value)
-    {
-        $checksum = substr($value, -1, 1);
-        $values   = str_split(substr($value, 0, -1));
-
-        $check = 0;
-        foreach($values as $row) {
-            $check += $row;
-        }
-
-        $check %= 10;
-        $check = 10 - $check;
-        if ($check == $checksum) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/AdapterInterface.php b/airtime_mvc/library/Zend/Validate/Barcode/AdapterInterface.php
deleted file mode 100644
index 325c6048f..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/AdapterInterface.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Validate_Barcode_AdapterInterface
-{
-    /**
-     * Checks the length of a barcode
-     *
-     * @param  string $value  The barcode to check for proper length
-     * @return boolean
-     */
-    public function checkLength($value);
-
-    /**
-     * Checks for allowed characters within the barcode
-     *
-     * @param  string $value The barcode to check for allowed characters
-     * @return boolean
-     */
-    public function checkChars($value);
-
-    /**
-     * Validates the checksum
-     *
-     * @param string $value The barcode to check the checksum for
-     * @return boolean
-     */
-    public function checksum($value);
-
-    /**
-     * Returns if barcode uses a checksum
-     *
-     * @return boolean
-     */
-    public function getCheck();
-
-    /**
-     * Sets the checksum validation
-     *
-     * @param  boolean $check
-     * @return Zend_Validate_Barcode_Adapter Provides fluid interface
-     */
-    public function setCheck($check);
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code25.php b/airtime_mvc/library/Zend/Validate/Barcode/Code25.php
deleted file mode 100644
index efb5a395c..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code25.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_code25';
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code25interleaved.php b/airtime_mvc/library/Zend/Validate/Barcode/Code25interleaved.php
deleted file mode 100644
index 7e5a8d919..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code25interleaved.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 'even';
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_code25';
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code39.php b/airtime_mvc/library/Zend/Validate/Barcode/Code39.php
deleted file mode 100644
index 858084fe2..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code39.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ -.$/+%';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_code39';
-
-    /**
-     * @var array
-     */
-    protected $_check = array(
-        '0' =>  0, '1' =>  1, '2' =>  2, '3' =>  3, '4' =>  4, '5' =>  5, '6' =>  6,
-        '7' =>  7, '8' =>  8, '9' =>  9, 'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13,
-        'E' => 14, 'F' => 15, 'G' => 16, 'H' => 17, 'I' => 18, 'J' => 19, 'K' => 20,
-        'L' => 21, 'M' => 22, 'N' => 23, 'O' => 24, 'P' => 25, 'Q' => 26, 'R' => 27,
-        'S' => 28, 'T' => 29, 'U' => 30, 'V' => 31, 'W' => 32, 'X' => 33, 'Y' => 34,
-        'Z' => 35, '-' => 36, '.' => 37, ' ' => 38, '$' => 39, '/' => 40, '+' => 41,
-        '%' => 42,
-    );
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-
-    /**
-     * Validates the checksum (Modulo 43)
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _code39($value)
-    {
-        $checksum = substr($value, -1, 1);
-        $value    = str_split(substr($value, 0, -1));
-        $count    = 0;
-        foreach($value as $char) {
-            $count += $this->_check[$char];
-        }
-
-        $mod = $count % 43;
-        if ($mod == $this->_check[$checksum]) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code39ext.php b/airtime_mvc/library/Zend/Validate/Barcode/Code39ext.php
deleted file mode 100644
index 5c1d65ee6..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code39ext.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = 128;
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code93.php b/airtime_mvc/library/Zend/Validate/Barcode/Code93.php
deleted file mode 100644
index deb5183d4..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code93.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ -.$/+%';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_code93';
-
-    /**
-     * Note that the characters !"§& are only synonyms
-     * @var array
-     */
-    protected $_check = array(
-        '0' =>  0, '1' =>  1, '2' =>  2, '3' =>  3, '4' =>  4, '5' =>  5, '6' =>  6,
-        '7' =>  7, '8' =>  8, '9' =>  9, 'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13,
-        'E' => 14, 'F' => 15, 'G' => 16, 'H' => 17, 'I' => 18, 'J' => 19, 'K' => 20,
-        'L' => 21, 'M' => 22, 'N' => 23, 'O' => 24, 'P' => 25, 'Q' => 26, 'R' => 27,
-        'S' => 28, 'T' => 29, 'U' => 30, 'V' => 31, 'W' => 32, 'X' => 33, 'Y' => 34,
-        'Z' => 35, '-' => 36, '.' => 37, ' ' => 38, '$' => 39, '/' => 40, '+' => 41,
-        '%' => 42, '!' => 43, '"' => 44, '§' => 45, '&' => 46,
-    );
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-
-    /**
-     * Validates the checksum (Modulo CK)
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _code93($value)
-    {
-        $checksum = substr($value, -2, 2);
-        $value    = str_split(substr($value, 0, -2));
-        $count    = 0;
-        $length   = count($value) % 20;
-        foreach($value as $char) {
-            if ($length == 0) {
-                $length = 20;
-            }
-
-            $count += $this->_check[$char] * $length;
-            --$length;
-        }
-
-        $check   = array_search(($count % 47), $this->_check);
-        $value[] = $check;
-        $count   = 0;
-        $length  = count($value) % 15;
-        foreach($value as $char) {
-            if ($length == 0) {
-                $length = 15;
-            }
-
-            $count += $this->_check[$char] * $length;
-            --$length;
-        }
-        $check .= array_search(($count % 47), $this->_check);
-
-        if ($check == $checksum) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Code93ext.php b/airtime_mvc/library/Zend/Validate/Barcode/Code93ext.php
deleted file mode 100644
index 740d485c4..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Code93ext.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = 128;
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean12.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean12.php
deleted file mode 100644
index 56a2384be..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean12.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean12 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 12;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean13.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean13.php
deleted file mode 100644
index b7e52f4c1..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean13.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean13 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 13;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean14.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean14.php
deleted file mode 100644
index 93d46d8c4..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean14.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean14 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 14;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean18.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean18.php
deleted file mode 100644
index 93398dd91..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean18.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean18 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 18;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean2.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean2.php
deleted file mode 100644
index deab558ea..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean2.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 2;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean5.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean5.php
deleted file mode 100644
index af6e49324..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean5.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 5;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Ean8.php b/airtime_mvc/library/Zend/Validate/Barcode/Ean8.php
deleted file mode 100644
index c87af039f..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Ean8.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Ean8 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(7, 8);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-
-    /**
-     * Overrides parent checkLength
-     *
-     * @param string $value Value
-     * @return boolean
-     */
-    public function checkLength($value)
-    {
-        if (strlen($value) == 7) {
-            $this->setCheck(false);
-        } else {
-            $this->setCheck(true);
-        }
-
-        return parent::checkLength($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Gtin12.php b/airtime_mvc/library/Zend/Validate/Barcode/Gtin12.php
deleted file mode 100644
index 8915c4ec4..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Gtin12.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Gtin12 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 12;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Gtin13.php b/airtime_mvc/library/Zend/Validate/Barcode/Gtin13.php
deleted file mode 100644
index 0719b31eb..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Gtin13.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Gtin13 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 13;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Gtin14.php b/airtime_mvc/library/Zend/Validate/Barcode/Gtin14.php
deleted file mode 100644
index d1dad5106..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Gtin14.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Gtin14 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 14;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Identcode.php b/airtime_mvc/library/Zend/Validate/Barcode/Identcode.php
deleted file mode 100644
index c0119a5cd..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Identcode.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Identcode extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 12;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_identcode';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Intelligentmail.php b/airtime_mvc/library/Zend/Validate/Barcode/Intelligentmail.php
deleted file mode 100644
index 4c266db8a..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Intelligentmail.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(20, 25, 29, 31);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Constructor
-     *
-     * Sets check flag to false.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setCheck(false);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Issn.php b/airtime_mvc/library/Zend/Validate/Barcode/Issn.php
deleted file mode 100644
index be629920e..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Issn.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Issn extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(8, 13);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789X';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-
-    /**
-     * Allows X on length of 8 chars
-     *
-     * @param  string $value The barcode to check for allowed characters
-     * @return boolean
-     */
-    public function checkChars($value)
-    {
-        if (strlen($value) != 8) {
-            if (strpos($value, 'X') !== false) {
-                return false;
-            }
-        }
-
-        return parent::checkChars($value);
-    }
-
-    /**
-     * Validates the checksum
-     *
-     * @param  string $value The barcode to check the checksum for
-     * @return boolean
-     */
-    public function checksum($value)
-    {
-        if (strlen($value) == 8) {
-            $this->_checksum = '_issn';
-        } else {
-            $this->_checksum = '_gtin';
-        }
-
-        return parent::checksum($value);
-    }
-
-    /**
-     * Validates the checksum ()
-     * ISSN implementation (reversed mod11)
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _issn($value)
-    {
-        $checksum = substr($value, -1, 1);
-        $values   = str_split(substr($value, 0, -1));
-        $check    = 0;
-        $multi    = 8;
-        foreach($values as $token) {
-            if ($token == 'X') {
-                $token = 10;
-            }
-
-            $check += ($token * $multi);
-            --$multi;
-        }
-
-        $check %= 11;
-        $check  = 11 - $check;
-        if ($check == $checksum) {
-            return true;
-        } else if (($check == 10) && ($checksum == 'X')) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Itf14.php b/airtime_mvc/library/Zend/Validate/Barcode/Itf14.php
deleted file mode 100644
index d207a314c..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Itf14.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Itf14 extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 14;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Leitcode.php b/airtime_mvc/library/Zend/Validate/Barcode/Leitcode.php
deleted file mode 100644
index 551ded064..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Leitcode.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Leitcode extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 14;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_identcode';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Planet.php b/airtime_mvc/library/Zend/Validate/Barcode/Planet.php
deleted file mode 100644
index 72608fa38..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Planet.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Planet extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(12, 14);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_postnet';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Postnet.php b/airtime_mvc/library/Zend/Validate/Barcode/Postnet.php
deleted file mode 100644
index c638dc731..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Postnet.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Postnet extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(6, 7, 10, 12);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_postnet';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Royalmail.php b/airtime_mvc/library/Zend/Validate/Barcode/Royalmail.php
deleted file mode 100644
index 8c4b733b5..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Royalmail.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Royalmail extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = -1;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-    protected $_rows = array(
-        '0' => 1, '1' => 1, '2' => 1, '3' => 1, '4' => 1, '5' => 1,
-        '6' => 2, '7' => 2, '8' => 2, '9' => 2, 'A' => 2, 'B' => 2,
-        'C' => 3, 'D' => 3, 'E' => 3, 'F' => 3, 'G' => 3, 'H' => 3,
-        'I' => 4, 'J' => 4, 'K' => 4, 'L' => 4, 'M' => 4, 'N' => 4,
-        'O' => 5, 'P' => 5, 'Q' => 5, 'R' => 5, 'S' => 5, 'T' => 5,
-        'U' => 0, 'V' => 0, 'W' => 0, 'X' => 0, 'Y' => 0, 'Z' => 0,
-     );
-
-    protected $_columns = array(
-        '0' => 1, '1' => 2, '2' => 3, '3' => 4, '4' => 5, '5' => 0,
-        '6' => 1, '7' => 2, '8' => 3, '9' => 4, 'A' => 5, 'B' => 0,
-        'C' => 1, 'D' => 2, 'E' => 3, 'F' => 4, 'G' => 5, 'H' => 0,
-        'I' => 1, 'J' => 2, 'K' => 3, 'L' => 4, 'M' => 5, 'N' => 0,
-        'O' => 1, 'P' => 2, 'Q' => 3, 'R' => 4, 'S' => 5, 'T' => 0,
-        'U' => 1, 'V' => 2, 'W' => 3, 'X' => 4, 'Y' => 5, 'Z' => 0,
-    );
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_royalmail';
-
-    /**
-     * Validates the checksum ()
-     *
-     * @param  string $value The barcode to validate
-     * @return boolean
-     */
-    protected function _royalmail($value)
-    {
-        $checksum = substr($value, -1, 1);
-        $values   = str_split(substr($value, 0, -1));
-        $rowvalue = 0;
-        $colvalue = 0;
-        foreach($values as $row) {
-            $rowvalue += $this->_rows[$row];
-            $colvalue += $this->_columns[$row];
-        }
-
-        $rowvalue %= 6;
-        $colvalue %= 6;
-
-        $rowchkvalue = array_keys($this->_rows, $rowvalue);
-        $colchkvalue = array_keys($this->_columns, $colvalue);
-        $chkvalue    = current(array_intersect($rowchkvalue, $colchkvalue));
-        if ($chkvalue == $checksum) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Allows start and stop tag within checked chars
-     *
-     * @param  string $value The barcode to check for allowed characters
-     * @return boolean
-     */
-    public function checkChars($value)
-    {
-        if ($value[0] == '(') {
-            $value = substr($value, 1);
-
-            if ($value[strlen($value) - 1] == ')') {
-                $value = substr($value, 0, -1);
-            } else {
-                return false;
-            }
-        }
-
-        return parent::checkChars($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Sscc.php b/airtime_mvc/library/Zend/Validate/Barcode/Sscc.php
deleted file mode 100644
index 50dd82079..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Sscc.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ean13.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Sscc extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 18;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Upca.php b/airtime_mvc/library/Zend/Validate/Barcode/Upca.php
deleted file mode 100644
index 449c78dd3..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Upca.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Upca.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Upca extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = 12;
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-}
diff --git a/airtime_mvc/library/Zend/Validate/Barcode/Upce.php b/airtime_mvc/library/Zend/Validate/Barcode/Upce.php
deleted file mode 100644
index f4ccc74eb..000000000
--- a/airtime_mvc/library/Zend/Validate/Barcode/Upce.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: UpcA.php 18028 2009-09-08 20:52:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Barcode_AdapterAbstract
- */
-require_once 'Zend/Validate/Barcode/AdapterAbstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Barcode_Upce extends Zend_Validate_Barcode_AdapterAbstract
-{
-    /**
-     * Allowed barcode lengths
-     * @var integer
-     */
-    protected $_length = array(6, 7, 8);
-
-    /**
-     * Allowed barcode characters
-     * @var string
-     */
-    protected $_characters = '0123456789';
-
-    /**
-     * Checksum function
-     * @var string
-     */
-    protected $_checksum = '_gtin';
-
-    /**
-     * Overrides parent checkLength
-     *
-     * @param string $value Value
-     * @return boolean
-     */
-    public function checkLength($value)
-    {
-        if (strlen($value) != 8) {
-            $this->setCheck(false);
-        } else {
-            $this->setCheck(true);
-        }
-
-        return parent::checkLength($value);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Between.php b/airtime_mvc/library/Zend/Validate/Between.php
deleted file mode 100644
index 332d7cb1e..000000000
--- a/airtime_mvc/library/Zend/Validate/Between.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Between.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Between extends Zend_Validate_Abstract
-{
-    /**
-     * Validation failure message key for when the value is not between the min and max, inclusively
-     */
-    const NOT_BETWEEN        = 'notBetween';
-
-    /**
-     * Validation failure message key for when the value is not strictly between the min and max
-     */
-    const NOT_BETWEEN_STRICT = 'notBetweenStrict';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_BETWEEN        => "'%value%' is not between '%min%' and '%max%', inclusively",
-        self::NOT_BETWEEN_STRICT => "'%value%' is not strictly between '%min%' and '%max%'"
-    );
-
-    /**
-     * Additional variables available for validation failure messages
-     *
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min',
-        'max' => '_max'
-    );
-
-    /**
-     * Minimum value
-     *
-     * @var mixed
-     */
-    protected $_min;
-
-    /**
-     * Maximum value
-     *
-     * @var mixed
-     */
-    protected $_max;
-
-    /**
-     * Whether to do inclusive comparisons, allowing equivalence to min and/or max
-     *
-     * If false, then strict comparisons are done, and the value may equal neither
-     * the min nor max options
-     *
-     * @var boolean
-     */
-    protected $_inclusive;
-
-    /**
-     * Sets validator options
-     * Accepts the following option keys:
-     *   'min' => scalar, minimum border
-     *   'max' => scalar, maximum border
-     *   'inclusive' => boolean, inclusive border values
-     *
-     * @param  array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['min'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['max'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['inclusive'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Missing option. 'min' and 'max' has to be given");
-        }
-
-        if (!array_key_exists('inclusive', $options)) {
-            $options['inclusive'] = true;
-        }
-
-        $this->setMin($options['min'])
-             ->setMax($options['max'])
-             ->setInclusive($options['inclusive']);
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return mixed
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  mixed $min
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return mixed
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  mixed $max
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Returns the inclusive option
-     *
-     * @return boolean
-     */
-    public function getInclusive()
-    {
-        return $this->_inclusive;
-    }
-
-    /**
-     * Sets the inclusive option
-     *
-     * @param  boolean $inclusive
-     * @return Zend_Validate_Between Provides a fluent interface
-     */
-    public function setInclusive($inclusive)
-    {
-        $this->_inclusive = $inclusive;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is between min and max options, inclusively
-     * if inclusive option is true.
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if ($this->_inclusive) {
-            if ($this->_min > $value || $value > $this->_max) {
-                $this->_error(self::NOT_BETWEEN);
-                return false;
-            }
-        } else {
-            if ($this->_min >= $value || $value >= $this->_max) {
-                $this->_error(self::NOT_BETWEEN_STRICT);
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/Callback.php b/airtime_mvc/library/Zend/Validate/Callback.php
deleted file mode 100644
index 7dbade86a..000000000
--- a/airtime_mvc/library/Zend/Validate/Callback.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Callback extends Zend_Validate_Abstract
-{
-    /**
-     * Invalid callback
-     */
-    const INVALID_CALLBACK = 'callbackInvalid';
-
-    /**
-     * Invalid value
-     */
-    const INVALID_VALUE = 'callbackValue';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID_VALUE    => "'%value%' is not valid",
-        self::INVALID_CALLBACK => "Failure within the callback, exception returned",
-    );
-
-    /**
-     * Callback in a call_user_func format
-     *
-     * @var string|array
-     */
-    protected $_callback = null;
-
-    /**
-     * Default options to set for the filter
-     *
-     * @var mixed
-     */
-    protected $_options = array();
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array $callback
-     * @param  mixed   $max
-     * @param  boolean $inclusive
-     * @return void
-     */
-    public function __construct($callback = null)
-    {
-        if (is_callable($callback)) {
-            $this->setCallback($callback);
-        } elseif (is_array($callback)) {
-            if (isset($callback['callback'])) {
-                $this->setCallback($callback['callback']);
-            }
-            if (isset($callback['options'])) {
-                $this->setOptions($callback['options']);
-            }
-        }
-
-        if (null === ($initializedCallack = $this->getCallback())) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('No callback registered');
-        }
-    }
-
-    /**
-     * Returns the set callback
-     *
-     * @return mixed
-     */
-    public function getCallback()
-    {
-        return $this->_callback;
-    }
-
-    /**
-     * Sets the callback
-     *
-     * @param  string|array $callback
-     * @return Zend_Validate_Callback Provides a fluent interface
-     */
-    public function setCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid callback given');
-        }
-        $this->_callback = $callback;
-        return $this;
-    }
-
-    /**
-     * Returns the set options for the callback
-     *
-     * @return mixed
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets options for the callback
-     *
-     * @param  mixed $max
-     * @return Zend_Validate_Callback Provides a fluent interface
-     */
-    public function setOptions($options)
-    {
-        $this->_options = (array) $options;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the set callback returns
-     * for the provided $value
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        $options  = $this->getOptions();
-        $callback = $this->getCallback();
-        $args     = func_get_args();
-        $options  = array_merge($args, $options);
-
-        try {
-            if (!call_user_func_array($callback, $options)) {
-                $this->_error(self::INVALID_VALUE);
-                return false;
-            }
-        } catch (Exception $e) {
-            $this->_error(self::INVALID_CALLBACK);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Ccnum.php b/airtime_mvc/library/Zend/Validate/Ccnum.php
deleted file mode 100644
index 71f0f83bf..000000000
--- a/airtime_mvc/library/Zend/Validate/Ccnum.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ccnum.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Ccnum extends Zend_Validate_Abstract
-{
-    /**
-     * Validation failure message key for when the value is not of valid length
-     */
-    const LENGTH   = 'ccnumLength';
-
-    /**
-     * Validation failure message key for when the value fails the mod-10 checksum
-     */
-    const CHECKSUM = 'ccnumChecksum';
-
-    /**
-     * Digits filter for input
-     *
-     * @var Zend_Filter_Digits
-     */
-    protected static $_filter = null;
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::LENGTH   => "'%value%' must contain between 13 and 19 digits",
-        self::CHECKSUM => "Luhn algorithm (mod-10 checksum) failed on '%value%'"
-    );
-
-    public function __construct()
-    {
-        trigger_error('Using the Ccnum validator is deprecated in favor of the CreditCard validator');
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value follows the Luhn algorithm (mod-10 checksum)
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if (null === self::$_filter) {
-            /**
-             * @see Zend_Filter_Digits
-             */
-            require_once 'Zend/Filter/Digits.php';
-            self::$_filter = new Zend_Filter_Digits();
-        }
-
-        $valueFiltered = self::$_filter->filter($value);
-
-        $length = strlen($valueFiltered);
-
-        if ($length < 13 || $length > 19) {
-            $this->_error(self::LENGTH);
-            return false;
-        }
-
-        $sum    = 0;
-        $weight = 2;
-
-        for ($i = $length - 2; $i >= 0; $i--) {
-            $digit = $weight * $valueFiltered[$i];
-            $sum += floor($digit / 10) + $digit % 10;
-            $weight = $weight % 2 + 1;
-        }
-
-        if ((10 - $sum % 10) % 10 != $valueFiltered[$length - 1]) {
-            $this->_error(self::CHECKSUM, $valueFiltered);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/CreditCard.php b/airtime_mvc/library/Zend/Validate/CreditCard.php
deleted file mode 100644
index e96b92a97..000000000
--- a/airtime_mvc/library/Zend/Validate/CreditCard.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: CreditCard.php 21570 2010-03-19 19:00:50Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_CreditCard extends Zend_Validate_Abstract
-{
-    /**
-     * Detected CCI list
-     *
-     * @var string
-     */
-    const ALL              = 'All';
-    const AMERICAN_EXPRESS = 'American_Express';
-    const UNIONPAY         = 'Unionpay';
-    const DINERS_CLUB      = 'Diners_Club';
-    const DINERS_CLUB_US   = 'Diners_Club_US';
-    const DISCOVER         = 'Discover';
-    const JCB              = 'JCB';
-    const LASER            = 'Laser';
-    const MAESTRO          = 'Maestro';
-    const MASTERCARD       = 'Mastercard';
-    const SOLO             = 'Solo';
-    const VISA             = 'Visa';
-
-    const CHECKSUM       = 'creditcardChecksum';
-    const CONTENT        = 'creditcardContent';
-    const INVALID        = 'creditcardInvalid';
-    const LENGTH         = 'creditcardLength';
-    const PREFIX         = 'creditcardPrefix';
-    const SERVICE        = 'creditcardService';
-    const SERVICEFAILURE = 'creditcardServiceFailure';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::CHECKSUM       => "Luhn algorithm (mod-10 checksum) failed on '%value%'",
-        self::CONTENT        => "'%value%' must contain only digits",
-        self::INVALID        => "Invalid type given, value should be a string",
-        self::LENGTH         => "'%value%' contains an invalid amount of digits",
-        self::PREFIX         => "'%value%' is not from an allowed institute",
-        self::SERVICE        => "Validation of '%value%' has been failed by the service",
-        self::SERVICEFAILURE => "The service returned a failure while validating '%value%'",
-    );
-
-    /**
-     * List of allowed CCV lengths
-     *
-     * @var array
-     */
-    protected $_cardLength = array(
-        self::AMERICAN_EXPRESS => array(15),
-        self::DINERS_CLUB      => array(14),
-        self::DINERS_CLUB_US   => array(16),
-        self::DISCOVER         => array(16),
-        self::JCB              => array(16),
-        self::LASER            => array(16, 17, 18, 19),
-        self::MAESTRO          => array(12, 13, 14, 15, 16, 17, 18, 19),
-        self::MASTERCARD       => array(16),
-        self::SOLO             => array(16, 18, 19),
-        self::UNIONPAY         => array(16, 17, 18, 19),
-        self::VISA             => array(16),
-    );
-
-    /**
-     * List of accepted CCV provider tags
-     *
-     * @var array
-     */
-    protected $_cardType = array(
-        self::AMERICAN_EXPRESS => array('34', '37'),
-        self::DINERS_CLUB      => array('300', '301', '302', '303', '304', '305', '36'),
-        self::DINERS_CLUB_US   => array('54', '55'),
-        self::DISCOVER         => array('6011', '622126', '622127', '622128', '622129', '62213',
-                                        '62214', '62215', '62216', '62217', '62218', '62219',
-                                        '6222', '6223', '6224', '6225', '6226', '6227', '6228',
-                                        '62290', '62291', '622920', '622921', '622922', '622923',
-                                        '622924', '622925', '644', '645', '646', '647', '648',
-                                        '649', '65'),
-        self::JCB              => array('3528', '3529', '353', '354', '355', '356', '357', '358'),
-        self::LASER            => array('6304', '6706', '6771', '6709'),
-        self::MAESTRO          => array('5018', '5020', '5038', '6304', '6759', '6761', '6763'),
-        self::MASTERCARD       => array('51', '52', '53', '54', '55'),
-        self::SOLO             => array('6334', '6767'),
-        self::UNIONPAY         => array('622126', '622127', '622128', '622129', '62213', '62214',
-                                        '62215', '62216', '62217', '62218', '62219', '6222', '6223',
-                                        '6224', '6225', '6226', '6227', '6228', '62290', '62291',
-                                        '622920', '622921', '622922', '622923', '622924', '622925'),
-        self::VISA             => array('4'),
-    );
-
-    /**
-     * CCIs which are accepted by validation
-     *
-     * @var array
-     */
-    protected $_type = array();
-
-    /**
-     * Service callback for additional validation
-     *
-     * @var callback
-     */
-    protected $_service;
-
-    /**
-     * Constructor
-     *
-     * @param string|array $type OPTIONAL Type of CCI to allow
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['type'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['service'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!array_key_exists('type', $options)) {
-            $options['type'] = self::ALL;
-        }
-
-        $this->setType($options['type']);
-        if (array_key_exists('service', $options)) {
-            $this->setService($options['service']);
-        }
-    }
-
-    /**
-     * Returns a list of accepted CCIs
-     *
-     * @return array
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Sets CCIs which are accepted by validation
-     *
-     * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluid interface
-     */
-    public function setType($type)
-    {
-        $this->_type = array();
-        return $this->addType($type);
-    }
-
-    /**
-     * Adds a CCI to be accepted by validation
-     *
-     * @param string|array $type Type to allow for validation
-     * @return Zend_Validate_CreditCard Provides a fluid interface
-     */
-    public function addType($type)
-    {
-        if (is_string($type)) {
-            $type = array($type);
-        }
-
-        foreach($type as $typ) {
-            if (defined('self::' . strtoupper($typ)) && !in_array($typ, $this->_type)) {
-                $this->_type[] = $typ;
-            }
-
-            if (($typ == self::ALL)) {
-                $this->_type = array_keys($this->_cardLength);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the actual set service
-     *
-     * @return callback
-     */
-    public function getService()
-    {
-        return $this->_service;
-    }
-
-    /**
-     * Sets a new callback for service validation
-     *
-     * @param unknown_type $service
-     */
-    public function setService($service)
-    {
-        if (!is_callable($service)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid callback given');
-        }
-
-        $this->_service = $service;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value follows the Luhn algorithm (mod-10 checksum)
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if (!is_string($value)) {
-            $this->_error(self::INVALID, $value);
-            return false;
-        }
-
-        if (!ctype_digit($value)) {
-            $this->_error(self::CONTENT, $value);
-            return false;
-        }
-
-        $length = strlen($value);
-        $types  = $this->getType();
-        $foundp = false;
-        $foundl = false;
-        foreach ($types as $type) {
-            foreach ($this->_cardType[$type] as $prefix) {
-                if (substr($value, 0, strlen($prefix)) == $prefix) {
-                    $foundp = true;
-                    if (in_array($length, $this->_cardLength[$type])) {
-                        $foundl = true;
-                        break 2;
-                    }
-                }
-            }
-        }
-
-        if ($foundp == false){
-            $this->_error(self::PREFIX, $value);
-            return false;
-        }
-
-        if ($foundl == false) {
-            $this->_error(self::LENGTH, $value);
-            return false;
-        }
-
-        $sum    = 0;
-        $weight = 2;
-
-        for ($i = $length - 2; $i >= 0; $i--) {
-            $digit = $weight * $value[$i];
-            $sum += floor($digit / 10) + $digit % 10;
-            $weight = $weight % 2 + 1;
-        }
-
-        if ((10 - $sum % 10) % 10 != $value[$length - 1]) {
-            $this->_error(self::CHECKSUM, $value);
-            return false;
-        }
-
-        if (!empty($this->_service)) {
-            try {
-                require_once 'Zend/Validate/Callback.php';
-                $callback = new Zend_Validate_Callback($this->_service);
-                $callback->setOptions($this->_type);
-                if (!$callback->isValid($value)) {
-                    $this->_error(self::SERVICE, $value);
-                    return false;
-                }
-            } catch (Zend_Exception $e) {
-                $this->_error(self::SERVICEFAILURE, $value);
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Date.php b/airtime_mvc/library/Zend/Validate/Date.php
deleted file mode 100644
index 993f99cb5..000000000
--- a/airtime_mvc/library/Zend/Validate/Date.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Date.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Date extends Zend_Validate_Abstract
-{
-    const INVALID        = 'dateInvalid';
-    const INVALID_DATE   = 'dateInvalidDate';
-    const FALSEFORMAT    = 'dateFalseFormat';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID        => "Invalid type given, value should be string, integer, array or Zend_Date",
-        self::INVALID_DATE   => "'%value%' does not appear to be a valid date",
-        self::FALSEFORMAT    => "'%value%' does not fit the date format '%format%'",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'format'  => '_format'
-    );
-
-    /**
-     * Optional format
-     *
-     * @var string|null
-     */
-    protected $_format;
-
-    /**
-     * Optional locale
-     *
-     * @var string|Zend_Locale|null
-     */
-    protected $_locale;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|Zend_Config $options OPTIONAL
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['format'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['locale'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (array_key_exists('format', $options)) {
-            $this->setFormat($options['format']);
-        }
-
-        if (!array_key_exists('locale', $options)) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $options['locale'] = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        if (array_key_exists('locale', $options)) {
-            $this->setLocale($options['locale']);
-        }
-    }
-
-    /**
-     * Returns the locale option
-     *
-     * @return string|Zend_Locale|null
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale option
-     *
-     * @param  string|Zend_Locale $locale
-     * @return Zend_Validate_Date provides a fluent interface
-     */
-    public function setLocale($locale = null)
-    {
-        require_once 'Zend/Locale.php';
-        $this->_locale = Zend_Locale::findLocale($locale);
-        return $this;
-    }
-
-    /**
-     * Returns the locale option
-     *
-     * @return string|null
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * Sets the format option
-     *
-     * @param  string $format
-     * @return Zend_Validate_Date provides a fluent interface
-     */
-    public function setFormat($format = null)
-    {
-        $this->_format = $format;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if $value is a valid date of the format YYYY-MM-DD
-     * If optional $format or $locale is set the date format is checked
-     * according to Zend_Date, see Zend_Date::isDate()
-     *
-     * @param  string|array|Zend_Date $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value) &&
-            !is_array($value) && !($value instanceof Zend_Date)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-
-        if (($this->_format !== null) || ($this->_locale !== null) || is_array($value) ||
-             $value instanceof Zend_Date) {
-            require_once 'Zend/Date.php';
-            if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) {
-                if ($this->_checkFormat($value) === false) {
-                    $this->_error(self::FALSEFORMAT);
-                } else {
-                    $this->_error(self::INVALID_DATE);
-                }
-                return false;
-            }
-        } else {
-            if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) {
-                $this->_format = 'yyyy-MM-dd';
-                $this->_error(self::FALSEFORMAT);
-                $this->_format = null;
-                return false;
-            }
-
-            list($year, $month, $day) = sscanf($value, '%d-%d-%d');
-
-            if (!checkdate($month, $day, $year)) {
-                $this->_error(self::INVALID_DATE);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if the given date fits the given format
-     *
-     * @param  string $value  Date to check
-     * @return boolean False when date does not fit the format
-     */
-    private function _checkFormat($value)
-    {
-        try {
-            require_once 'Zend/Locale/Format.php';
-            $parsed = Zend_Locale_Format::getDate($value, array(
-                                                  'date_format' => $this->_format, 'format_type' => 'iso',
-                                                  'fix_date' => false));
-            if (isset($parsed['year']) and ((strpos(strtoupper($this->_format), 'YY') !== false) and
-                (strpos(strtoupper($this->_format), 'YYYY') === false))) {
-                $parsed['year'] = Zend_Date::getFullYear($parsed['year']);
-            }
-        } catch (Exception $e) {
-            // Date can not be parsed
-            return false;
-        }
-
-        if (((strpos($this->_format, 'Y') !== false) or (strpos($this->_format, 'y') !== false)) and
-            (!isset($parsed['year']))) {
-            // Year expected but not found
-            return false;
-        }
-
-        if ((strpos($this->_format, 'M') !== false) and (!isset($parsed['month']))) {
-            // Month expected but not found
-            return false;
-        }
-
-        if ((strpos($this->_format, 'd') !== false) and (!isset($parsed['day']))) {
-            // Day expected but not found
-            return false;
-        }
-
-        if (((strpos($this->_format, 'H') !== false) or (strpos($this->_format, 'h') !== false)) and
-            (!isset($parsed['hour']))) {
-            // Hour expected but not found
-            return false;
-        }
-
-        if ((strpos($this->_format, 'm') !== false) and (!isset($parsed['minute']))) {
-            // Minute expected but not found
-            return false;
-        }
-
-        if ((strpos($this->_format, 's') !== false) and (!isset($parsed['second']))) {
-            // Second expected  but not found
-            return false;
-        }
-
-        // Date fits the format
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Db/Abstract.php b/airtime_mvc/library/Zend/Validate/Db/Abstract.php
deleted file mode 100644
index c1d2a98b3..000000000
--- a/airtime_mvc/library/Zend/Validate/Db/Abstract.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20412 2010-01-19 07:02:01Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Class for Database record validation
- *
- * @category   Zend
- * @package    Zend_Validate
- * @uses       Zend_Validate_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
-{
-    /**
-     * Error constants
-     */
-    const ERROR_NO_RECORD_FOUND = 'noRecordFound';
-    const ERROR_RECORD_FOUND    = 'recordFound';
-
-    /**
-     * @var array Message templates
-     */
-    protected $_messageTemplates = array(
-        self::ERROR_NO_RECORD_FOUND => 'No record matching %value% was found',
-        self::ERROR_RECORD_FOUND    => 'A record matching %value% was found',
-    );
-
-    /**
-     * @var string
-     */
-    protected $_schema = null;
-
-    /**
-     * @var string
-     */
-    protected $_table = '';
-
-    /**
-     * @var string
-     */
-    protected $_field = '';
-
-    /**
-     * @var mixed
-     */
-    protected $_exclude = null;
-
-    /**
-     * Database adapter to use. If null isValid() will use Zend_Db::getInstance instead
-     *
-     * @var unknown_type
-     */
-    protected $_adapter = null;
-
-    /**
-     * Provides basic configuration for use with Zend_Validate_Db Validators
-     * Setting $exclude allows a single record to be excluded from matching.
-     * Exclude can either be a String containing a where clause, or an array with `field` and `value` keys
-     * to define the where clause added to the sql.
-     * A database adapter may optionally be supplied to avoid using the registered default adapter.
-     *
-     * The following option keys are supported:
-     * 'table'   => The database table to validate against
-     * 'schema'  => The schema keys
-     * 'field'   => The field to check for a match
-     * 'exclude' => An optional where clause or field/value pair to exclude from the query
-     * 'adapter' => An optional database adapter to use
-     *
-     * @param array|Zend_Config $options Options to use for this validator
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (func_num_args() > 1) {
-            $options       = func_get_args();
-            $temp['table'] = array_shift($options);
-            $temp['field'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['exclude'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['adapter'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!array_key_exists('table', $options) && !array_key_exists('schema', $options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Table or Schema option missing!');
-        }
-
-        if (!array_key_exists('field', $options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Field option missing!');
-        }
-
-        if (array_key_exists('adapter', $options)) {
-            $this->setAdapter($options['adapter']);
-        }
-
-        if (array_key_exists('exclude', $options)) {
-            $this->setExclude($options['exclude']);
-        }
-
-        $this->setField($options['field']);
-        if (array_key_exists('table', $options)) {
-            $this->setTable($options['table']);
-        }
-
-        if (array_key_exists('schema', $options)) {
-            $this->setSchema($options['schema']);
-        }
-    }
-
-    /**
-     * Returns the set adapter
-     *
-     * @return Zend_Db_Adapter
-     */
-    public function getAdapter()
-    {
-        return $this->_adapter;
-    }
-
-    /**
-     * Sets a new database adapter
-     *
-     * @param  Zend_Db_Adapter_Abstract $adapter
-     * @return Zend_Validate_Db_Abstract
-     */
-    public function setAdapter($adapter)
-    {
-        if (!($adapter instanceof Zend_Db_Adapter_Abstract)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Adapter option must be a database adapter!');
-        }
-
-        $this->_adapter = $adapter;
-        return $this;
-    }
-
-    /**
-     * Returns the set exclude clause
-     *
-     * @return string|array
-     */
-    public function getExclude()
-    {
-        return $this->_exclude;
-    }
-
-    /**
-     * Sets a new exclude clause
-     *
-     * @param string|array $exclude
-     * @return Zend_Validate_Db_Abstract
-     */
-    public function setExclude($exclude)
-    {
-        $this->_exclude = $exclude;
-        return $this;
-    }
-
-    /**
-     * Returns the set field
-     *
-     * @return string|array
-     */
-    public function getField()
-    {
-        return $this->_field;
-    }
-
-    /**
-     * Sets a new field
-     *
-     * @param string $field
-     * @return Zend_Validate_Db_Abstract
-     */
-    public function setField($field)
-    {
-        $this->_field = (string) $field;
-        return $this;
-    }
-
-    /**
-     * Returns the set table
-     *
-     * @return string
-     */
-    public function getTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Sets a new table
-     *
-     * @param string $table
-     * @return Zend_Validate_Db_Abstract
-     */
-    public function setTable($table)
-    {
-        $this->_table = (string) $table;
-        return $this;
-    }
-
-    /**
-     * Returns the set schema
-     *
-     * @return string
-     */
-    public function getSchema()
-    {
-        return $this->_schema;
-    }
-
-    /**
-     * Sets a new schema
-     *
-     * @param string $schema
-     * @return Zend_Validate_Db_Abstract
-     */
-    public function setSchema($schema)
-    {
-        $this->_schema = $schema;
-        return $this;
-    }
-
-    /**
-     * Run query and returns matches, or null if no matches are found.
-     *
-     * @param  String $value
-     * @return Array when matches are found.
-     */
-    protected function _query($value)
-    {
-        /**
-         * Check for an adapter being defined. if not, fetch the default adapter.
-         */
-        if ($this->_adapter === null) {
-            $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter();
-            if (null === $this->_adapter) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('No database adapter present');
-            }
-        }
-
-        /**
-         * Build select object
-         */
-        $select = new Zend_Db_Select($this->_adapter);
-        $select->from($this->_table, array($this->_field), $this->_schema)
-               ->where($this->_adapter->quoteIdentifier($this->_field).' = ?', $value);
-        if ($this->_exclude !== null) {
-            if (is_array($this->_exclude)) {
-                $select->where($this->_adapter->quoteIdentifier($this->_exclude['field']).' != ?', $this->_exclude['value']);
-            } else {
-                $select->where($this->_exclude);
-            }
-        }
-        $select->limit(1);
-
-        /**
-         * Run query
-         */
-        $result = $this->_adapter->fetchRow($select, array(), Zend_Db::FETCH_ASSOC);
-
-        return $result;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Db/NoRecordExists.php b/airtime_mvc/library/Zend/Validate/Db/NoRecordExists.php
deleted file mode 100644
index 98dc59b8a..000000000
--- a/airtime_mvc/library/Zend/Validate/Db/NoRecordExists.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NoRecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Db_Abstract
- */
-require_once 'Zend/Validate/Db/Abstract.php';
-
-/**
- * Confirms a record does not exist in a table.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @uses       Zend_Validate_Db_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Db_NoRecordExists extends Zend_Validate_Db_Abstract
-{
-    public function isValid($value)
-    {
-        $valid = true;
-        $this->_setValue($value);
-
-        $result = $this->_query($value);
-        if ($result) {
-            $valid = false;
-            $this->_error(self::ERROR_RECORD_FOUND);
-        }
-
-        return $valid;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Db/RecordExists.php b/airtime_mvc/library/Zend/Validate/Db/RecordExists.php
deleted file mode 100644
index 4a9122ad0..000000000
--- a/airtime_mvc/library/Zend/Validate/Db/RecordExists.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: RecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_Db_Abstract
- */
-require_once 'Zend/Validate/Db/Abstract.php';
-
-/**
- * Confirms a record exists in a table.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @uses       Zend_Validate_Db_Abstract
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Db_RecordExists extends Zend_Validate_Db_Abstract
-{
-    public function isValid($value)
-    {
-        $valid = true;
-        $this->_setValue($value);
-
-        $result = $this->_query($value);
-        if (!$result) {
-            $valid = false;
-            $this->_error(self::ERROR_NO_RECORD_FOUND);
-        }
-
-        return $valid;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Digits.php b/airtime_mvc/library/Zend/Validate/Digits.php
deleted file mode 100644
index 6439d37e0..000000000
--- a/airtime_mvc/library/Zend/Validate/Digits.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Digits.php 21136 2010-02-22 22:30:50Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Digits extends Zend_Validate_Abstract
-{
-    const NOT_DIGITS   = 'notDigits';
-    const STRING_EMPTY = 'digitsStringEmpty';
-    const INVALID      = 'digitsInvalid';
-
-    /**
-     * Digits filter used for validation
-     *
-     * @var Zend_Filter_Digits
-     */
-    protected static $_filter = null;
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_DIGITS   => "'%value%' contains characters which are not digits; but only digits are allowed",
-        self::STRING_EMPTY => "'%value%' is an empty string",
-        self::INVALID      => "Invalid type given, value should be string, integer or float",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value only contains digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue((string) $value);
-
-        if ('' === $this->_value) {
-            $this->_error(self::STRING_EMPTY);
-            return false;
-        }
-
-        if (null === self::$_filter) {
-            require_once 'Zend/Filter/Digits.php';
-            self::$_filter = new Zend_Filter_Digits();
-        }
-
-        if ($this->_value !== self::$_filter->filter($this->_value)) {
-            $this->_error(self::NOT_DIGITS);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/EmailAddress.php b/airtime_mvc/library/Zend/Validate/EmailAddress.php
deleted file mode 100644
index 834ed65e7..000000000
--- a/airtime_mvc/library/Zend/Validate/EmailAddress.php
+++ /dev/null
@@ -1,560 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: EmailAddress.php 21461 2010-03-10 22:34:03Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Validate_Hostname
- */
-require_once 'Zend/Validate/Hostname.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
-{
-    const INVALID            = 'emailAddressInvalid';
-    const INVALID_FORMAT     = 'emailAddressInvalidFormat';
-    const INVALID_HOSTNAME   = 'emailAddressInvalidHostname';
-    const INVALID_MX_RECORD  = 'emailAddressInvalidMxRecord';
-    const INVALID_SEGMENT    = 'emailAddressInvalidSegment';
-    const DOT_ATOM           = 'emailAddressDotAtom';
-    const QUOTED_STRING      = 'emailAddressQuotedString';
-    const INVALID_LOCAL_PART = 'emailAddressInvalidLocalPart';
-    const LENGTH_EXCEEDED    = 'emailAddressLengthExceeded';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID            => "Invalid type given, value should be a string",
-        self::INVALID_FORMAT     => "'%value%' is no valid email address in the basic format local-part@hostname",
-        self::INVALID_HOSTNAME   => "'%hostname%' is no valid hostname for email address '%value%'",
-        self::INVALID_MX_RECORD  => "'%hostname%' does not appear to have a valid MX record for the email address '%value%'",
-        self::INVALID_SEGMENT    => "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network.",
-        self::DOT_ATOM           => "'%localPart%' can not be matched against dot-atom format",
-        self::QUOTED_STRING      => "'%localPart%' can not be matched against quoted-string format",
-        self::INVALID_LOCAL_PART => "'%localPart%' is no valid local part for email address '%value%'",
-        self::LENGTH_EXCEEDED    => "'%value%' exceeds the allowed length",
-    );
-
-    /**
-     * @see http://en.wikipedia.org/wiki/IPv4
-     * @var array
-     */
-    protected $_invalidIp = array(
-        '0'   => '0.0.0.0/8',
-        '10'  => '10.0.0.0/8',
-        '127' => '127.0.0.0/8',
-        '128' => '128.0.0.0/16',
-        '169' => '169.254.0.0/16',
-        '172' => '172.16.0.0/12',
-        '191' => '191.255.0.0/16',
-        '192' => array(
-            '192.0.0.0/24',
-            '192.0.2.0/24',
-            '192.88.99.0/24',
-            '192.168.0.0/16'
-        ),
-        '198' => '198.18.0.0/15',
-        '223' => '223.255.255.0/24',
-        '224' => '224.0.0.0/4',
-        '240' => '240.0.0.0/4'
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'hostname'  => '_hostname',
-        'localPart' => '_localPart'
-    );
-
-    /**
-     * @var string
-     */
-    protected $_hostname;
-
-    /**
-     * @var string
-     */
-    protected $_localPart;
-
-    /**
-     * Internal options array
-     */
-    protected $_options = array(
-        'mx'       => false,
-        'deep'     => false,
-        'domain'   => true,
-        'allow'    => Zend_Validate_Hostname::ALLOW_DNS,
-        'hostname' => null
-    );
-
-    /**
-     * Instantiates hostname validator for local use
-     *
-     * The following option keys are supported:
-     * 'hostname' => A hostname validator, see Zend_Validate_Hostname
-     * 'allow'    => Options for the hostname validator, see Zend_Validate_Hostname::ALLOW_*
-     * 'mx'       => If MX check should be enabled, boolean
-     * 'deep'     => If a deep MX check should be done, boolean
-     *
-     * @param array|Zend_Config $options OPTIONAL
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['allow'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['mx'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['hostname'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        $options += $this->_options;
-        $this->setOptions($options);
-    }
-
-    /**
-     * Returns all set Options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Set options for the email validator
-     *
-     * @param array $options
-     * @return Zend_Validate_EmailAddress fluid interface
-     */
-    public function setOptions(array $options = array())
-    {
-        if (array_key_exists('messages', $options)) {
-            $this->setMessages($options['messages']);
-        }
-
-        if (array_key_exists('hostname', $options)) {
-            if (array_key_exists('allow', $options)) {
-                $this->setHostnameValidator($options['hostname'], $options['allow']);
-            } else {
-                $this->setHostnameValidator($options['hostname']);
-            }
-        }
-
-        if (array_key_exists('mx', $options)) {
-            $this->setValidateMx($options['mx']);
-        }
-
-        if (array_key_exists('deep', $options)) {
-            $this->setDeepMxCheck($options['deep']);
-        }
-
-        if (array_key_exists('domain', $options)) {
-            $this->setDomainCheck($options['domain']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the validation failure message template for a particular key
-     * Adds the ability to set messages to the attached hostname validator
-     *
-     * @param  string $messageString
-     * @param  string $messageKey     OPTIONAL
-     * @return Zend_Validate_Abstract Provides a fluent interface
-     * @throws Zend_Validate_Exception
-     */
-    public function setMessage($messageString, $messageKey = null)
-    {
-        $messageKeys = $messageKey;
-        if ($messageKey === null) {
-            $keys = array_keys($this->_messageTemplates);
-            $messageKeys = current($keys);
-        }
-
-        if (!isset($this->_messageTemplates[$messageKeys])) {
-            $this->_options['hostname']->setMessage($messageString, $messageKey);
-        }
-
-        $this->_messageTemplates[$messageKeys] = $messageString;
-        return $this;
-    }
-
-    /**
-     * Returns the set hostname validator
-     *
-     * @return Zend_Validate_Hostname
-     */
-    public function getHostnameValidator()
-    {
-        return $this->_options['hostname'];
-    }
-
-    /**
-     * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
-     * @param int                    $allow             OPTIONAL
-     * @return void
-     */
-    public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
-    {
-        if (!$hostnameValidator) {
-            $hostnameValidator = new Zend_Validate_Hostname($allow);
-        }
-
-        $this->_options['hostname'] = $hostnameValidator;
-        $this->_options['allow']    = $allow;
-        return $this;
-    }
-
-    /**
-     * Whether MX checking via getmxrr is supported or not
-     *
-     * This currently only works on UNIX systems
-     *
-     * @return boolean
-     */
-    public function validateMxSupported()
-    {
-        return function_exists('getmxrr');
-    }
-
-    /**
-     * Returns the set validateMx option
-     *
-     * @return boolean
-     */
-    public function getValidateMx()
-    {
-        return $this->_options['mx'];
-    }
-
-    /**
-     * Set whether we check for a valid MX record via DNS
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them
-     * @return Zend_Validate_EmailAddress Fluid Interface
-     */
-    public function setValidateMx($mx)
-    {
-        if ((bool) $mx && !$this->validateMxSupported()) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('MX checking not available on this system');
-        }
-
-        $this->_options['mx'] = (bool) $mx;
-        return $this;
-    }
-
-    /**
-     * Returns the set deepMxCheck option
-     *
-     * @return boolean
-     */
-    public function getDeepMxCheck()
-    {
-        return $this->_options['deep'];
-    }
-
-    /**
-     * Set whether we check MX record should be a deep validation
-     *
-     * @param boolean $deep Set deep to true to perform a deep validation process for MX records
-     * @return Zend_Validate_EmailAddress Fluid Interface
-     */
-    public function setDeepMxCheck($deep)
-    {
-        $this->_options['deep'] = (bool) $deep;
-        return $this;
-    }
-
-    /**
-     * Returns the set domainCheck option
-     *
-     * @return unknown
-     */
-    public function getDomainCheck()
-    {
-        return $this->_options['domain'];
-    }
-
-    /**
-     * Sets if the domain should also be checked
-     * or only the local part of the email address
-     *
-     * @param boolean $domain
-     * @return Zend_Validate_EmailAddress Fluid Interface
-     */
-    public function setDomainCheck($domain = true)
-    {
-        $this->_options['domain'] = (boolean) $domain;
-        return $this;
-    }
-
-    /**
-     * Returns if the given host is reserved
-     *
-     * @param string $host
-     * @return boolean
-     */
-    private function _isReserved($host){
-        if (!preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}$/', $host)) {
-            $host = gethostbyname($host);
-        }
-
-        $octet = explode('.',$host);
-        if ((int)$octet[0] >= 224) {
-            return true;
-        } else if (array_key_exists($octet[0], $this->_invalidIp)) {
-            foreach ((array)$this->_invalidIp[$octet[0]] as $subnetData) {
-                // we skip the first loop as we already know that octet matches
-                for ($i = 1; $i < 4; $i++) {
-                    if (strpos($subnetData, $octet[$i]) !== $i * 4) {
-                        break;
-                    }
-                }
-
-                $host       = explode("/", $subnetData);
-                $binaryHost = "";
-                $tmp        = explode(".", $host[0]);
-                for ($i = 0; $i < 4 ; $i++) {
-                    $binaryHost .= str_pad(decbin($tmp[$i]), 8, "0", STR_PAD_LEFT);
-                }
-
-                $segmentData = array(
-                    'network'   => (int)$this->_toIp(str_pad(substr($binaryHost, 0, $host[1]), 32, 0)),
-                    'broadcast' => (int)$this->_toIp(str_pad(substr($binaryHost, 0, $host[1]), 32, 1))
-                );
-
-                for ($j = $i; $j < 4; $j++) {
-                    if ((int)$octet[$j] < $segmentData['network'][$j] ||
-                        (int)$octet[$j] > $segmentData['broadcast'][$j]) {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Converts a binary string to an IP address
-     *
-     * @param string $binary
-     * @return mixed
-     */
-    private function _toIp($binary)
-    {
-        $ip  = array();
-        $tmp = explode(".", chunk_split($binary, 8, "."));
-        for ($i = 0; $i < 4 ; $i++) {
-            $ip[$i] = bindec($tmp[$i]);
-        }
-
-        return $ip;
-    }
-
-    /**
-     * Internal method to validate the local part of the email address
-     *
-     * @return boolean
-     */
-    private function _validateLocalPart()
-    {
-        // First try to match the local part on the common dot-atom format
-        $result = false;
-
-        // Dot-atom characters are: 1*atext *("." 1*atext)
-        // atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*",
-        //        "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~"
-        $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e';
-        if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) {
-            $result = true;
-        } else {
-            // Try quoted string format
-
-            // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
-            // qtext: Non white space controls, and the rest of the US-ASCII characters not
-            //   including "\" or the quote character
-            $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
-            $qtext   = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
-            $ws      = '\x20\x09';
-            if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) {
-                $result = true;
-            } else {
-                $this->_error(self::DOT_ATOM);
-                $this->_error(self::QUOTED_STRING);
-                $this->_error(self::INVALID_LOCAL_PART);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Internal method to validate the servers MX records
-     *
-     * @return boolean
-     */
-    private function _validateMXRecords()
-    {
-        $mxHosts = array();
-        $result = getmxrr($this->_hostname, $mxHosts);
-        if (!$result) {
-            $this->_error(self::INVALID_MX_RECORD);
-        } else if ($this->_options['deep'] && function_exists('checkdnsrr')) {
-            $validAddress = false;
-            $reserved     = true;
-            foreach ($mxHosts as $hostname) {
-                $res = $this->_isReserved($hostname);
-                if (!$res) {
-                    $reserved = false;
-                }
-
-                if (!$res
-                    && (checkdnsrr($hostname, "A")
-                    || checkdnsrr($hostname, "AAAA")
-                    || checkdnsrr($hostname, "A6"))) {
-                    $validAddress = true;
-                    break;
-                }
-            }
-
-            if (!$validAddress) {
-                $result = false;
-                if ($reserved) {
-                    $this->_error(self::INVALID_SEGMENT);
-                } else {
-                    $this->_error(self::INVALID_MX_RECORD);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Internal method to validate the hostname part of the email address
-     *
-     * @return boolean
-     */
-    private function _validateHostnamePart()
-    {
-        $hostname = $this->_options['hostname']->setTranslator($this->getTranslator())
-                         ->isValid($this->_hostname);
-        if (!$hostname) {
-            $this->_error(self::INVALID_HOSTNAME);
-
-            // Get messages and errors from hostnameValidator
-            foreach ($this->_options['hostname']->getMessages() as $code => $message) {
-                $this->_messages[$code] = $message;
-            }
-
-            foreach ($this->_options['hostname']->getErrors() as $error) {
-                $this->_errors[] = $error;
-            }
-        } else if ($this->_options['mx']) {
-            // MX check on hostname
-            $hostname = $this->_validateMXRecords();
-        }
-
-        return $hostname;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid email address
-     * according to RFC2822
-     *
-     * @link   http://www.ietf.org/rfc/rfc2822.txt RFC2822
-     * @link   http://www.columbia.edu/kermit/ascii.html US-ASCII characters
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $matches = array();
-        $length  = true;
-        $this->_setValue($value);
-
-        // Split email address up and disallow '..'
-        if ((strpos($value, '..') !== false) or
-            (!preg_match('/^(.+)@([^@]+)$/', $value, $matches))) {
-            $this->_error(self::INVALID_FORMAT);
-            return false;
-        }
-
-        $this->_localPart = $matches[1];
-        $this->_hostname  = $matches[2];
-
-        if ((strlen($this->_localPart) > 64) || (strlen($this->_hostname) > 255)) {
-            $length = false;
-            $this->_error(self::LENGTH_EXCEEDED);
-        }
-
-        // Match hostname part
-        if ($this->_options['domain']) {
-            $hostname = $this->_validateHostnamePart();
-        }
-
-        $local = $this->_validateLocalPart();
-
-        // If both parts valid, return true
-        if ($local && $length) {
-            if (($this->_options['domain'] && $hostname) || !$this->_options['domain']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Exception.php b/airtime_mvc/library/Zend/Validate/Exception.php
deleted file mode 100644
index fa875e14e..000000000
--- a/airtime_mvc/library/Zend/Validate/Exception.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Exception extends Zend_Exception
-{}
diff --git a/airtime_mvc/library/Zend/Validate/File/Count.php b/airtime_mvc/library/Zend/Validate/File/Count.php
deleted file mode 100644
index b2a4e27a0..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Count.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Count.php 21326 2010-03-04 20:32:39Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for counting all given files
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Count extends Zend_Validate_Abstract
-{
-    /**#@+
-     * @const string Error constants
-     */
-    const TOO_MANY = 'fileCountTooMany';
-    const TOO_FEW  = 'fileCountTooFew';
-    /**#@-*/
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::TOO_MANY => "Too many files, maximum '%max%' are allowed but '%count%' are given",
-        self::TOO_FEW  => "Too few files, minimum '%min%' are expected but '%count%' are given",
-    );
-
-    /**
-     * @var array Error message template variables
-     */
-    protected $_messageVariables = array(
-        'min'   => '_min',
-        'max'   => '_max',
-        'count' => '_count'
-    );
-
-    /**
-     * Minimum file count
-     *
-     * If null, there is no minimum file count
-     *
-     * @var integer
-     */
-    protected $_min;
-
-    /**
-     * Maximum file count
-     *
-     * If null, there is no maximum file count
-     *
-     * @var integer|null
-     */
-    protected $_max;
-
-    /**
-     * Actual filecount
-     *
-     * @var integer
-     */
-    protected $_count;
-
-    /**
-     * Internal file array
-     * @var array
-     */
-    protected $_files;
-
-    /**
-     * Sets validator options
-     *
-     * Min limits the file count, when used with max=null it is the maximum file count
-     * It also accepts an array with the keys 'min' and 'max'
-     *
-     * If $options is a integer, it will be used as maximum file count
-     * As Array is accepts the following keys:
-     * 'min': Minimum filecount
-     * 'max': Maximum filecount
-     *
-     * @param  integer|array|Zend_Config $options Options for the adapter
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_string($options) || is_numeric($options)) {
-            $options = array('max' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        if (1 < func_num_args()) {
-            $options['min'] = func_get_arg(0);
-            $options['max'] = func_get_arg(1);
-        }
-
-        if (isset($options['min'])) {
-            $this->setMin($options);
-        }
-
-        if (isset($options['max'])) {
-            $this->setMax($options);
-        }
-    }
-
-    /**
-     * Returns the minimum file count
-     *
-     * @return integer
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the minimum file count
-     *
-     * @param  integer|array $min The minimum file count
-     * @return Zend_Validate_File_Count Provides a fluent interface
-     * @throws Zend_Validate_Exception When min is greater than max
-     */
-    public function setMin($min)
-    {
-        if (is_array($min) and isset($min['min'])) {
-            $min = $min['min'];
-        }
-
-        if (!is_string($min) and !is_numeric($min)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        $min = (integer) $min;
-        if (($this->_max !== null) && ($min > $this->_max)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum file count, but $min >"
-                                            . " {$this->_max}");
-        }
-
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Returns the maximum file count
-     *
-     * @return integer
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the maximum file count
-     *
-     * @param  integer|array $max The maximum file count
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     * @throws Zend_Validate_Exception When max is smaller than min
-     */
-    public function setMax($max)
-    {
-        if (is_array($max) and isset($max['max'])) {
-            $max = $max['max'];
-        }
-
-        if (!is_string($max) and !is_numeric($max)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        $max = (integer) $max;
-        if (($this->_min !== null) && ($max < $this->_min)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum file count, but "
-                                            . "$max < {$this->_min}");
-        }
-
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Adds a file for validation
-     *
-     * @param string|array $file
-     */
-    public function addFile($file)
-    {
-        if (is_string($file)) {
-            $file = array($file);
-        }
-
-        if (is_array($file)) {
-            foreach ($file as $name) {
-                if (!isset($this->_files[$name]) && !empty($name)) {
-                    $this->_files[$name] = $name;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the file count of all checked files is at least min and
-     * not bigger than max (when max is not null). Attention: When checking with set min you
-     * must give all files with the first call, otherwise you will get an false.
-     *
-     * @param  string|array $value Filenames to check for count
-     * @param  array        $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        if (($file !== null) && !array_key_exists('destination', $file)) {
-            $file['destination'] = dirname($value);
-        }
-
-        if (($file !== null) && array_key_exists('tmp_name', $file)) {
-            $value = $file['destination'] . DIRECTORY_SEPARATOR . $file['name'];
-        }
-
-        if (($file === null) || !empty($file['tmp_name'])) {
-            $this->addFile($value);
-        }
-
-        $this->_count = count($this->_files);
-        if (($this->_max !== null) && ($this->_count > $this->_max)) {
-            return $this->_throw($file, self::TOO_MANY);
-        }
-
-        if (($this->_min !== null) && ($this->_count < $this->_min)) {
-            return $this->_throw($file, self::TOO_FEW);
-        }
-
-        return true;
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Crc32.php b/airtime_mvc/library/Zend/Validate/File/Crc32.php
deleted file mode 100644
index e7c06d603..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Crc32.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Crc32.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_Hash
- */
-require_once 'Zend/Validate/File/Hash.php';
-
-/**
- * Validator for the crc32 hash of given files
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_NOT_MATCH = 'fileCrc32DoesNotMatch';
-    const NOT_DETECTED   = 'fileCrc32NotDetected';
-    const NOT_FOUND      = 'fileCrc32NotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_NOT_MATCH => "File '%value%' does not match the given crc32 hashes",
-        self::NOT_DETECTED   => "A crc32 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
-    );
-
-    /**
-     * Hash of the file
-     *
-     * @var string
-     */
-    protected $_hash;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_scalar($options)) {
-            $options = array('hash1' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options to validator provided');
-        }
-
-        $this->setCrc32($options);
-    }
-
-    /**
-     * Returns all set crc32 hashes
-     *
-     * @return array
-     */
-    public function getCrc32()
-    {
-        return $this->getHash();
-    }
-
-    /**
-     * Sets the crc32 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setHash($options)
-    {
-        if (!is_array($options)) {
-            $options = array($options);
-        }
-
-        $options['algorithm'] = 'crc32';
-        parent::setHash($options);
-        return $this;
-    }
-
-    /**
-     * Sets the crc32 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setCrc32($options)
-    {
-        $this->setHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the crc32 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addHash($options)
-    {
-        if (!is_array($options)) {
-            $options = array($options);
-        }
-
-        $options['algorithm'] = 'crc32';
-        parent::addHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the crc32 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addCrc32($options)
-    {
-        $this->addHash($options);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the given file confirms the set hash
-     *
-     * @param  string $value Filename to check for hash
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        $hashes = array_unique(array_keys($this->_hash));
-        $filehash = hash_file('crc32', $value);
-        if ($filehash === false) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        foreach($hashes as $hash) {
-            if ($filehash === $hash) {
-                return true;
-            }
-        }
-
-        return $this->_throw($file, self::DOES_NOT_MATCH);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Validate/File/ExcludeExtension.php b/airtime_mvc/library/Zend/Validate/File/ExcludeExtension.php
deleted file mode 100644
index b31e37274..000000000
--- a/airtime_mvc/library/Zend/Validate/File/ExcludeExtension.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: ExcludeExtension.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/File/Extension.php';
-
-/**
- * Validator for the excluding file extensions
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension
-{
-    /**
-     * @const string Error constants
-     */
-    const FALSE_EXTENSION = 'fileExcludeExtensionFalse';
-    const NOT_FOUND       = 'fileExcludeExtensionNotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::FALSE_EXTENSION => "File '%value%' has a false extension",
-        self::NOT_FOUND       => "File '%value%' could not be found",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the fileextension of $value is not included in the
-     * set extension list
-     *
-     * @param  string  $value Real file to check for extension
-     * @param  array   $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        if ($file !== null) {
-            $info['extension'] = substr($file['name'], strrpos($file['name'], '.') + 1);
-        } else {
-            $info = pathinfo($value);
-        }
-
-        $extensions = $this->getExtension();
-
-        if ($this->_case and (!in_array($info['extension'], $extensions))) {
-            return true;
-        } else if (!$this->_case) {
-            $found = false;
-            foreach ($extensions as $extension) {
-                if (strtolower($extension) == strtolower($info['extension'])) {
-                    $found = true;
-                }
-            }
-
-            if (!$found) {
-                return true;
-            }
-        }
-
-        return $this->_throw($file, self::FALSE_EXTENSION);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/ExcludeMimeType.php b/airtime_mvc/library/Zend/Validate/File/ExcludeMimeType.php
deleted file mode 100644
index 22f74fba8..000000000
--- a/airtime_mvc/library/Zend/Validate/File/ExcludeMimeType.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: ExcludeMimeType.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_Validate_File_MimeType
- */
-require_once 'Zend/Validate/File/MimeType.php';
-
-/**
- * Validator for the mime type of a file
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType
-{
-    const FALSE_TYPE   = 'fileExcludeMimeTypeFalse';
-    const NOT_DETECTED = 'fileExcludeMimeTypeNotDetected';
-    const NOT_READABLE = 'fileExcludeMimeTypeNotReadable';
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if the mimetype of the file does not matche the given ones. Also parts
-     * of mimetypes can be checked. If you give for example "image" all image
-     * mime types will not be accepted like "image/gif", "image/jpeg" and so on.
-     *
-     * @param  string $value Real file to check for mimetype
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        if ($file === null) {
-            $file = array(
-                'type' => null,
-                'name' => $value
-            );
-        }
-
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_READABLE);
-        }
-
-        $mimefile = $this->getMagicFile();
-        if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            if (!empty($mimefile)) {
-                $mime = new finfo($const, $mimefile);
-            } else {
-                $mime = new finfo($const);
-            }
-
-            if ($mime !== false) {
-                $this->_type = $mime->file($value);
-            }
-            unset($mime);
-        }
-
-        if (empty($this->_type)) {
-            if (function_exists('mime_content_type') && ini_get('mime_magic.magicfile')) {
-                $this->_type = mime_content_type($value);
-            } elseif ($this->_headerCheck) {
-                $this->_type = $file['type'];
-            }
-        }
-
-        if (empty($this->_type)) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        $mimetype = $this->getMimeType(true);
-        if (in_array($this->_type, $mimetype)) {
-            return $this->_throw($file, self::FALSE_TYPE);
-        }
-
-        $types = explode('/', $this->_type);
-        $types = array_merge($types, explode('-', $this->_type));
-        foreach($mimetype as $mime) {
-            if (in_array($mime, $types)) {
-                return $this->_throw($file, self::FALSE_TYPE);
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Exists.php b/airtime_mvc/library/Zend/Validate/File/Exists.php
deleted file mode 100644
index 86a21780f..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Exists.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Exists.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator which checks if the file already exists in the directory
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Exists extends Zend_Validate_Abstract
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_NOT_EXIST = 'fileExistsDoesNotExist';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_NOT_EXIST => "File '%value%' does not exist",
-    );
-
-    /**
-     * Internal list of directories
-     * @var string
-     */
-    protected $_directory = '';
-
-    /**
-     * @var array Error message template variables
-     */
-    protected $_messageVariables = array(
-        'directory' => '_directory'
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array|Zend_Config $directory
-     * @return void
-     */
-    public function __construct($directory = array())
-    {
-        if ($directory instanceof Zend_Config) {
-            $directory = $directory->toArray();
-        } else if (is_string($directory)) {
-            $directory = explode(',', $directory);
-        } else if (!is_array($directory)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        $this->setDirectory($directory);
-    }
-
-    /**
-     * Returns the set file directories which are checked
-     *
-     * @param  boolean $asArray Returns the values as array, when false an concated string is returned
-     * @return string
-     */
-    public function getDirectory($asArray = false)
-    {
-        $asArray   = (bool) $asArray;
-        $directory = (string) $this->_directory;
-        if ($asArray) {
-            $directory = explode(',', $directory);
-        }
-
-        return $directory;
-    }
-
-    /**
-     * Sets the file directory which will be checked
-     *
-     * @param  string|array $directory The directories to validate
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function setDirectory($directory)
-    {
-        $this->_directory = null;
-        $this->addDirectory($directory);
-        return $this;
-    }
-
-    /**
-     * Adds the file directory which will be checked
-     *
-     * @param  string|array $directory The directory to add for validation
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function addDirectory($directory)
-    {
-        $directories = $this->getDirectory(true);
-
-        if (is_string($directory)) {
-            $directory = explode(',', $directory);
-        } else if (!is_array($directory)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        foreach ($directory as $content) {
-            if (empty($content) || !is_string($content)) {
-                continue;
-            }
-
-            $directories[] = trim($content);
-        }
-        $directories = array_unique($directories);
-
-        // Sanity check to ensure no empty values
-        foreach ($directories as $key => $dir) {
-            if (empty($dir)) {
-                unset($directories[$key]);
-            }
-        }
-
-        $this->_directory = implode(',', $directories);
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the file already exists in the set directories
-     *
-     * @param  string  $value Real file to check for existance
-     * @param  array   $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        $directories = $this->getDirectory(true);
-        if (($file !== null) and (!empty($file['destination']))) {
-            $directories[] = $file['destination'];
-        } else if (!isset($file['name'])) {
-            $file['name'] = $value;
-        }
-
-        $check = false;
-        foreach ($directories as $directory) {
-            if (empty($directory)) {
-                continue;
-            }
-
-            $check = true;
-            if (!file_exists($directory . DIRECTORY_SEPARATOR . $file['name'])) {
-                return $this->_throw($file, self::DOES_NOT_EXIST);
-            }
-        }
-
-        if (!$check) {
-            return $this->_throw($file, self::DOES_NOT_EXIST);
-        }
-
-        return true;
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Extension.php b/airtime_mvc/library/Zend/Validate/File/Extension.php
deleted file mode 100644
index 021b5e03b..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Extension.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Extension.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the file extension of a file
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Extension extends Zend_Validate_Abstract
-{
-    /**
-     * @const string Error constants
-     */
-    const FALSE_EXTENSION = 'fileExtensionFalse';
-    const NOT_FOUND       = 'fileExtensionNotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::FALSE_EXTENSION => "File '%value%' has a false extension",
-        self::NOT_FOUND       => "File '%value%' could not be found",
-    );
-
-    /**
-     * Internal list of extensions
-     * @var string
-     */
-    protected $_extension = '';
-
-    /**
-     * Validate case sensitive
-     *
-     * @var boolean
-     */
-    protected $_case = false;
-
-    /**
-     * @var array Error message template variables
-     */
-    protected $_messageVariables = array(
-        'extension' => '_extension'
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (1 < func_num_args()) {
-            $case = func_get_arg(1);
-            $this->setCase($case);
-        }
-
-        if (is_array($options) and isset($options['case'])) {
-            $this->setCase($options['case']);
-            unset($options['case']);
-        }
-
-        $this->setExtension($options);
-    }
-
-    /**
-     * Returns the case option
-     *
-     * @return boolean
-     */
-    public function getCase()
-    {
-        return $this->_case;
-    }
-
-    /**
-     * Sets the case to use
-     *
-     * @param  boolean $case
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function setCase($case)
-    {
-        $this->_case = (boolean) $case;
-        return $this;
-    }
-
-    /**
-     * Returns the set file extension
-     *
-     * @return array
-     */
-    public function getExtension()
-    {
-        $extension = explode(',', $this->_extension);
-
-        return $extension;
-    }
-
-    /**
-     * Sets the file extensions
-     *
-     * @param  string|array $extension The extensions to validate
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function setExtension($extension)
-    {
-        $this->_extension = null;
-        $this->addExtension($extension);
-        return $this;
-    }
-
-    /**
-     * Adds the file extensions
-     *
-     * @param  string|array $extension The extensions to add for validation
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function addExtension($extension)
-    {
-        $extensions = $this->getExtension();
-        if (is_string($extension)) {
-            $extension = explode(',', $extension);
-        }
-
-        foreach ($extension as $content) {
-            if (empty($content) || !is_string($content)) {
-                continue;
-            }
-
-            $extensions[] = trim($content);
-        }
-        $extensions = array_unique($extensions);
-
-        // Sanity check to ensure no empty values
-        foreach ($extensions as $key => $ext) {
-            if (empty($ext)) {
-                unset($extensions[$key]);
-            }
-        }
-
-        $this->_extension = implode(',', $extensions);
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the fileextension of $value is included in the
-     * set extension list
-     *
-     * @param  string  $value Real file to check for extension
-     * @param  array   $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        if ($file !== null) {
-            $info['extension'] = substr($file['name'], strrpos($file['name'], '.') + 1);
-        } else {
-            $info = pathinfo($value);
-        }
-
-        $extensions = $this->getExtension();
-
-        if ($this->_case && (in_array($info['extension'], $extensions))) {
-            return true;
-        } else if (!$this->getCase()) {
-            foreach ($extensions as $extension) {
-                if (strtolower($extension) == strtolower($info['extension'])) {
-                    return true;
-                }
-            }
-        }
-
-        return $this->_throw($file, self::FALSE_EXTENSION);
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if (null !== $file) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/FilesSize.php b/airtime_mvc/library/Zend/Validate/File/FilesSize.php
deleted file mode 100644
index 05c660b81..000000000
--- a/airtime_mvc/library/Zend/Validate/File/FilesSize.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: FilesSize.php 20455 2010-01-20 22:54:18Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_Size
- */
-require_once 'Zend/Validate/File/Size.php';
-
-/**
- * Validator for the size of all files which will be validated in sum
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size
-{
-    /**
-     * @const string Error constants
-     */
-    const TOO_BIG      = 'fileFilesSizeTooBig';
-    const TOO_SMALL    = 'fileFilesSizeTooSmall';
-    const NOT_READABLE = 'fileFilesSizeNotReadable';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::TOO_BIG      => "All files in sum should have a maximum size of '%max%' but '%size%' were detected",
-        self::TOO_SMALL    => "All files in sum should have a minimum size of '%min%' but '%size%' were detected",
-        self::NOT_READABLE => "One or more files can not be read",
-    );
-
-    /**
-     * Internal file array
-     *
-     * @var array
-     */
-    protected $_files;
-
-    /**
-     * Sets validator options
-     *
-     * Min limits the used diskspace for all files, when used with max=null it is the maximum filesize
-     * It also accepts an array with the keys 'min' and 'max'
-     *
-     * @param  integer|array|Zend_Config $options Options for this validator
-     * @return void
-     */
-    public function __construct($options)
-    {
-        $this->_files = array();
-        $this->_setSize(0);
-
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_scalar($options)) {
-            $options = array('max' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options to validator provided');
-        }
-
-        if (1 < func_num_args()) {
-            $argv = func_get_args();
-            array_shift($argv);
-            $options['max'] = array_shift($argv);
-            if (!empty($argv)) {
-                $options['bytestring'] = array_shift($argv);
-            }
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the disk usage of all files is at least min and
-     * not bigger than max (when max is not null).
-     *
-     * @param  string|array $value Real file to check for size
-     * @param  array        $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        require_once 'Zend/Loader.php';
-        if (is_string($value)) {
-            $value = array($value);
-        }
-
-        $min  = $this->getMin(true);
-        $max  = $this->getMax(true);
-        $size = $this->_getSize();
-        foreach ($value as $files) {
-            // Is file readable ?
-            if (!Zend_Loader::isReadable($files)) {
-                $this->_throw($file, self::NOT_READABLE);
-                continue;
-            }
-
-            if (!isset($this->_files[$files])) {
-                $this->_files[$files] = $files;
-            } else {
-                // file already counted... do not count twice
-                continue;
-            }
-
-            // limited to 2GB files
-            $size += @filesize($files);
-            $this->_size = $size;
-            if (($max !== null) && ($max < $size)) {
-                if ($this->useByteString()) {
-                    $this->_max  = $this->_toByteString($max);
-                    $this->_size = $this->_toByteString($size);
-                    $this->_throw($file, self::TOO_BIG);
-                    $this->_max  = $max;
-                    $this->_size = $size;
-                } else {
-                    $this->_throw($file, self::TOO_BIG);
-                }
-            }
-        }
-
-        // Check that aggregate files are >= minimum size
-        if (($min !== null) && ($size < $min)) {
-            if ($this->useByteString()) {
-                $this->_min  = $this->_toByteString($min);
-                $this->_size = $this->_toByteString($size);
-                $this->_throw($file, self::TOO_SMALL);
-                $this->_min  = $min;
-                $this->_size = $size;
-            } else {
-                $this->_throw($file, self::TOO_SMALL);
-            }
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Hash.php b/airtime_mvc/library/Zend/Validate/File/Hash.php
deleted file mode 100644
index 2b20cac69..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Hash.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Hash.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the hash of given files
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Hash extends Zend_Validate_Abstract
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_NOT_MATCH = 'fileHashDoesNotMatch';
-    const NOT_DETECTED   = 'fileHashHashNotDetected';
-    const NOT_FOUND      = 'fileHashNotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_NOT_MATCH => "File '%value%' does not match the given hashes",
-        self::NOT_DETECTED   => "A hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found"
-    );
-
-    /**
-     * Hash of the file
-     *
-     * @var string
-     */
-    protected $_hash;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_scalar($options)) {
-            $options = array('hash1' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options to validator provided');
-        }
-
-        if (1 < func_num_args()) {
-            $options['algorithm'] = func_get_arg(1);
-        }
-
-        $this->setHash($options);
-    }
-
-    /**
-     * Returns the set hash values as array, the hash as key and the algorithm the value
-     *
-     * @return array
-     */
-    public function getHash()
-    {
-        return $this->_hash;
-    }
-
-    /**
-     * Sets the hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setHash($options)
-    {
-        $this->_hash  = null;
-        $this->addHash($options);
-
-        return $this;
-    }
-
-    /**
-     * Adds the hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addHash($options)
-    {
-        if (is_string($options)) {
-            $options = array($options);
-        } else if (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("False parameter given");
-        }
-
-        $known = hash_algos();
-        if (!isset($options['algorithm'])) {
-            $algorithm = 'crc32';
-        } else {
-            $algorithm = $options['algorithm'];
-            unset($options['algorithm']);
-        }
-
-        if (!in_array($algorithm, $known)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Unknown algorithm '{$algorithm}'");
-        }
-
-        foreach ($options as $value) {
-            $this->_hash[$value] = $algorithm;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the given file confirms the set hash
-     *
-     * @param  string $value Filename to check for hash
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        $algos  = array_unique(array_values($this->_hash));
-        $hashes = array_unique(array_keys($this->_hash));
-        foreach ($algos as $algorithm) {
-            $filehash = hash_file($algorithm, $value);
-            if ($filehash === false) {
-                return $this->_throw($file, self::NOT_DETECTED);
-            }
-
-            foreach($hashes as $hash) {
-                if ($filehash === $hash) {
-                    return true;
-                }
-            }
-        }
-
-        return $this->_throw($file, self::DOES_NOT_MATCH);
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/ImageSize.php b/airtime_mvc/library/Zend/Validate/File/ImageSize.php
deleted file mode 100644
index 0d8a4fa74..000000000
--- a/airtime_mvc/library/Zend/Validate/File/ImageSize.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: ImageSize.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the image size of a image file
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
-{
-    /**
-     * @const string Error constants
-     */
-    const WIDTH_TOO_BIG    = 'fileImageSizeWidthTooBig';
-    const WIDTH_TOO_SMALL  = 'fileImageSizeWidthTooSmall';
-    const HEIGHT_TOO_BIG   = 'fileImageSizeHeightTooBig';
-    const HEIGHT_TOO_SMALL = 'fileImageSizeHeightTooSmall';
-    const NOT_DETECTED     = 'fileImageSizeNotDetected';
-    const NOT_READABLE     = 'fileImageSizeNotReadable';
-
-    /**
-     * @var array Error message template
-     */
-    protected $_messageTemplates = array(
-        self::WIDTH_TOO_BIG    => "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected",
-        self::WIDTH_TOO_SMALL  => "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected",
-        self::HEIGHT_TOO_BIG   => "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected",
-        self::HEIGHT_TOO_SMALL => "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected",
-        self::NOT_DETECTED     => "The size of image '%value%' could not be detected",
-        self::NOT_READABLE     => "File '%value%' can not be read",
-    );
-
-    /**
-     * @var array Error message template variables
-     */
-    protected $_messageVariables = array(
-        'minwidth'  => '_minwidth',
-        'maxwidth'  => '_maxwidth',
-        'minheight' => '_minheight',
-        'maxheight' => '_maxheight',
-        'width'     => '_width',
-        'height'    => '_height'
-    );
-
-    /**
-     * Minimum image width
-     *
-     * @var integer
-     */
-    protected $_minwidth;
-
-    /**
-     * Maximum image width
-     *
-     * @var integer
-     */
-    protected $_maxwidth;
-
-    /**
-     * Minimum image height
-     *
-     * @var integer
-     */
-    protected $_minheight;
-
-    /**
-     * Maximum image height
-     *
-     * @var integer
-     */
-    protected $_maxheight;
-
-    /**
-     * Detected width
-     *
-     * @var integer
-     */
-    protected $_width;
-
-    /**
-     * Detected height
-     *
-     * @var integer
-     */
-    protected $_height;
-
-    /**
-     * Sets validator options
-     *
-     * Accepts the following option keys:
-     * - minheight
-     * - minwidth
-     * - maxheight
-     * - maxwidth
-     *
-     * @param  Zend_Config|array $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (1 < func_num_args()) {
-            if (!is_array($options)) {
-                $options = array('minwidth' => $options);
-            }
-            $argv = func_get_args();
-            array_shift($argv);
-            $options['minheight'] = array_shift($argv);
-            if (!empty($argv)) {
-                $options['maxwidth'] = array_shift($argv);
-                if (!empty($argv)) {
-                    $options['maxheight'] = array_shift($argv);
-                }
-            }
-        } else if (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        if (isset($options['minheight']) || isset($options['minwidth'])) {
-            $this->setImageMin($options);
-        }
-
-        if (isset($options['maxheight']) || isset($options['maxwidth'])) {
-            $this->setImageMax($options);
-        }
-    }
-
-    /**
-     * Returns the set minimum image sizes
-     *
-     * @return array
-     */
-    public function getImageMin()
-    {
-        return array('minwidth' => $this->_minwidth, 'minheight' => $this->_minheight);
-    }
-
-    /**
-     * Returns the set maximum image sizes
-     *
-     * @return array
-     */
-    public function getImageMax()
-    {
-        return array('maxwidth' => $this->_maxwidth, 'maxheight' => $this->_maxheight);
-    }
-
-    /**
-     * Returns the set image width sizes
-     *
-     * @return array
-     */
-    public function getImageWidth()
-    {
-        return array('minwidth' => $this->_minwidth, 'maxwidth' => $this->_maxwidth);
-    }
-
-    /**
-     * Returns the set image height sizes
-     *
-     * @return array
-     */
-    public function getImageHeight()
-    {
-        return array('minheight' => $this->_minheight, 'maxheight' => $this->_maxheight);
-    }
-
-    /**
-     * Sets the minimum image size
-     *
-     * @param  array $options               The minimum image dimensions
-     * @throws Zend_Validate_Exception      When minwidth is greater than maxwidth
-     * @throws Zend_Validate_Exception      When minheight is greater than maxheight
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
-     */
-    public function setImageMin($options)
-    {
-        if (isset($options['minwidth'])) {
-            if (($this->_maxwidth !== null) and ($options['minwidth'] > $this->_maxwidth)) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The minimum image width must be less than or equal to the "
-                    . " maximum image width, but {$options['minwidth']} > {$this->_maxwidth}");
-            }
-        }
-
-        if (isset($options['maxheight'])) {
-            if (($this->_maxheight !== null) and ($options['minheight'] > $this->_maxheight)) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The minimum image height must be less than or equal to the "
-                    . " maximum image height, but {$options['minheight']} > {$this->_maxheight}");
-            }
-        }
-
-        if (isset($options['minwidth'])) {
-            $this->_minwidth  = (int) $options['minwidth'];
-        }
-
-        if (isset($options['minheight'])) {
-            $this->_minheight = (int) $options['minheight'];
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the maximum image size
-     *
-     * @param  array $options          The maximum image dimensions
-     * @throws Zend_Validate_Exception When maxwidth is smaller than minwidth
-     * @throws Zend_Validate_Exception When maxheight is smaller than minheight
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setImageMax($options)
-    {
-        if (isset($options['maxwidth'])) {
-            if (($this->_minwidth !== null) and ($options['maxwidth'] < $this->_minwidth)) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The maximum image width must be greater than or equal to the "
-                    . "minimum image width, but {$options['maxwidth']} < {$this->_minwidth}");
-            }
-        }
-
-        if (isset($options['maxheight'])) {
-            if (($this->_minheight !== null) and ($options['maxheight'] < $this->_minheight)) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The maximum image height must be greater than or equal to the "
-                    . "minimum image height, but {$options['maxheight']} < {$this->_minwidth}");
-            }
-        }
-
-        if (isset($options['maxwidth'])) {
-            $this->_maxwidth  = (int) $options['maxwidth'];
-        }
-
-        if (isset($options['maxheight'])) {
-            $this->_maxheight = (int) $options['maxheight'];
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the mimimum and maximum image width
-     *
-     * @param  array $options               The image width dimensions
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
-     */
-    public function setImageWidth($options)
-    {
-        $this->setImageMin($options);
-        $this->setImageMax($options);
-
-        return $this;
-    }
-
-    /**
-     * Sets the mimimum and maximum image height
-     *
-     * @param  array $options               The image height dimensions
-     * @return Zend_Validate_File_ImageSize Provides a fluent interface
-     */
-    public function setImageHeight($options)
-    {
-        $this->setImageMin($options);
-        $this->setImageMax($options);
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the imagesize of $value is at least min and
-     * not bigger than max
-     *
-     * @param  string $value Real file to check for image size
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_READABLE);
-        }
-
-        $size = @getimagesize($value);
-        $this->_setValue($file);
-
-        if (empty($size) or ($size[0] === 0) or ($size[1] === 0)) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        $this->_width  = $size[0];
-        $this->_height = $size[1];
-        if ($this->_width < $this->_minwidth) {
-            $this->_throw($file, self::WIDTH_TOO_SMALL);
-        }
-
-        if (($this->_maxwidth !== null) and ($this->_maxwidth < $this->_width)) {
-            $this->_throw($file, self::WIDTH_TOO_BIG);
-        }
-
-        if ($this->_height < $this->_minheight) {
-            $this->_throw($file, self::HEIGHT_TOO_SMALL);
-        }
-
-        if (($this->_maxheight !== null) and ($this->_maxheight < $this->_height)) {
-            $this->_throw($file, self::HEIGHT_TOO_BIG);
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/IsCompressed.php b/airtime_mvc/library/Zend/Validate/File/IsCompressed.php
deleted file mode 100644
index 3b7983f26..000000000
--- a/airtime_mvc/library/Zend/Validate/File/IsCompressed.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: IsCompressed.php 21138 2010-02-22 22:37:11Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_MimeType
- */
-require_once 'Zend/Validate/File/MimeType.php';
-
-/**
- * Validator which checks if the file already exists in the directory
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
-{
-    /**
-     * @const string Error constants
-     */
-    const FALSE_TYPE   = 'fileIsCompressedFalseType';
-    const NOT_DETECTED = 'fileIsCompressedNotDetected';
-    const NOT_READABLE = 'fileIsCompressedNotReadable';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::FALSE_TYPE   => "File '%value%' is not compressed, '%type%' detected",
-        self::NOT_DETECTED => "The mimetype of file '%value%' could not been detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array|Zend_Config $compression
-     * @return void
-     */
-    public function __construct($mimetype = array())
-    {
-        if ($mimetype instanceof Zend_Config) {
-            $mimetype = $mimetype->toArray();
-        }
-
-        $temp    = array();
-        // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
-            $default = array(
-            'application/arj',
-            'application/gnutar',
-            'application/lha',
-            'application/lzx',
-            'application/vnd.ms-cab-compressed',
-            'application/x-ace-compressed',
-            'application/x-arc',
-            'application/x-archive',
-            'application/x-arj',
-            'application/x-bzip',
-            'application/x-bzip2',
-            'application/x-cab-compressed',
-            'application/x-compress',
-            'application/x-compressed',
-            'application/x-cpio',
-            'application/x-debian-package',
-            'application/x-eet',
-            'application/x-gzip',
-            'application/x-java-pack200',
-            'application/x-lha',
-            'application/x-lharc',
-            'application/x-lzh',
-            'application/x-lzma',
-            'application/x-lzx',
-            'application/x-rar',
-            'application/x-sit',
-            'application/x-stuffit',
-            'application/x-tar',
-            'application/zip',
-            'application/zoo',
-            'multipart/x-gzip',
-        );
-
-        if (is_array($mimetype)) {
-            $temp = $mimetype;
-            if (array_key_exists('magicfile', $temp)) {
-                unset($temp['magicfile']);
-            }
-
-            if (array_key_exists('headerCheck', $temp)) {
-                unset($temp['headerCheck']);
-            }
-
-            if (empty($temp)) {
-                $mimetype += $default;
-            }
-        }
-
-        if (empty($mimetype)) {
-            $mimetype = $default;
-        }
-
-        parent::__construct($mimetype);
-    }
-
-    /**
-     * Throws an error of the given type
-     * Duplicates parent method due to OOP Problem with late static binding in PHP 5.2
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        $this->_value = $file['name'];
-        switch($errorType) {
-            case Zend_Validate_File_MimeType::FALSE_TYPE :
-                $errorType = self::FALSE_TYPE;
-                break;
-            case Zend_Validate_File_MimeType::NOT_DETECTED :
-                $errorType = self::NOT_DETECTED;
-                break;
-            case Zend_Validate_File_MimeType::NOT_READABLE :
-                $errorType = self::NOT_READABLE;
-                break;
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/IsImage.php b/airtime_mvc/library/Zend/Validate/File/IsImage.php
deleted file mode 100644
index cfff3e3c5..000000000
--- a/airtime_mvc/library/Zend/Validate/File/IsImage.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: IsImage.php 21138 2010-02-22 22:37:11Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_MimeType
- */
-require_once 'Zend/Validate/File/MimeType.php';
-
-/**
- * Validator which checks if the file already exists in the directory
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
-{
-    /**
-     * @const string Error constants
-     */
-    const FALSE_TYPE   = 'fileIsImageFalseType';
-    const NOT_DETECTED = 'fileIsImageNotDetected';
-    const NOT_READABLE = 'fileIsImageNotReadable';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::FALSE_TYPE   => "File '%value%' is no image, '%type%' detected",
-        self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|array|Zend_Config $mimetype
-     * @return void
-     */
-    public function __construct($mimetype = array())
-    {
-        if ($mimetype instanceof Zend_Config) {
-            $mimetype = $mimetype->toArray();
-        }
-
-        $temp    = array();
-        // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
-        // http://www.iana.org/assignments/media-types/image/
-        $default = array(
-            'application/cdf',
-            'application/dicom',
-            'application/fractals',
-            'application/postscript',
-            'application/vnd.hp-hpgl',
-            'application/vnd.oasis.opendocument.graphics',
-            'application/x-cdf',
-            'application/x-cmu-raster',
-            'application/x-ima',
-            'application/x-inventor',
-            'application/x-koan',
-            'application/x-portable-anymap',
-            'application/x-world-x-3dmf',
-            'image/bmp',
-            'image/c',
-            'image/cgm',
-            'image/fif',
-            'image/gif',
-            'image/jpeg',
-            'image/jpm',
-            'image/jpx',
-            'image/jp2',
-            'image/naplps',
-            'image/pjpeg',
-            'image/png',
-            'image/svg',
-            'image/svg+xml',
-            'image/tiff',
-            'image/vnd.adobe.photoshop',
-            'image/vnd.djvu',
-            'image/vnd.fpx',
-            'image/vnd.net-fpx',
-            'image/x-cmu-raster',
-            'image/x-cmx',
-            'image/x-coreldraw',
-            'image/x-cpi',
-            'image/x-emf',
-            'image/x-ico',
-            'image/x-icon',
-            'image/x-jg',
-            'image/x-ms-bmp',
-            'image/x-niff',
-            'image/x-pict',
-            'image/x-pcx',
-            'image/x-portable-anymap',
-            'image/x-portable-bitmap',
-            'image/x-portable-greymap',
-            'image/x-portable-pixmap',
-            'image/x-quicktime',
-            'image/x-rgb',
-            'image/x-tiff',
-            'image/x-unknown',
-            'image/x-windows-bmp',
-            'image/x-xpmi',
-        );
-
-        if (is_array($mimetype)) {
-            $temp = $mimetype;
-            if (array_key_exists('magicfile', $temp)) {
-                unset($temp['magicfile']);
-            }
-
-            if (array_key_exists('headerCheck', $temp)) {
-                unset($temp['headerCheck']);
-            }
-
-            if (empty($temp)) {
-                $mimetype += $default;
-            }
-        }
-
-        if (empty($mimetype)) {
-            $mimetype = $default;
-        }
-
-        parent::__construct($mimetype);
-    }
-
-    /**
-     * Throws an error of the given type
-     * Duplicates parent method due to OOP Problem with late static binding in PHP 5.2
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        $this->_value = $file['name'];
-        switch($errorType) {
-            case Zend_Validate_File_MimeType::FALSE_TYPE :
-                $errorType = self::FALSE_TYPE;
-                break;
-            case Zend_Validate_File_MimeType::NOT_DETECTED :
-                $errorType = self::NOT_DETECTED;
-                break;
-            case Zend_Validate_File_MimeType::NOT_READABLE :
-                $errorType = self::NOT_READABLE;
-                break;
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Md5.php b/airtime_mvc/library/Zend/Validate/File/Md5.php
deleted file mode 100644
index 80fed0bd2..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Md5.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Md5.php 20442 2010-01-20 15:15:40Z matthew $
- */
-
-/**
- * @see Zend_Validate_File_Hash
- */
-require_once 'Zend/Validate/File/Hash.php';
-
-/**
- * Validator for the md5 hash of given files
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_NOT_MATCH = 'fileMd5DoesNotMatch';
-    const NOT_DETECTED   = 'fileMd5NotDetected';
-    const NOT_FOUND      = 'fileMd5NotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_NOT_MATCH => "File '%value%' does not match the given md5 hashes",
-        self::NOT_DETECTED   => "A md5 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
-    );
-
-    /**
-     * Hash of the file
-     *
-     * @var string
-     */
-    protected $_hash;
-
-    /**
-     * Sets validator options
-     *
-     * $hash is the hash we accept for the file $file
-     *
-     * @param  string|array $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_scalar($options)) {
-            $options = array('hash1' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options to validator provided');
-        }
-
-        $this->setMd5($options);
-    }
-
-    /**
-     * Returns all set md5 hashes
-     *
-     * @return array
-     */
-    public function getMd5()
-    {
-        return $this->getHash();
-    }
-
-    /**
-     * Sets the md5 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setHash($options)
-    {
-        if (!is_array($options)) {
-            $options = (array) $options;
-        }
-
-        $options['algorithm'] = 'md5';
-        parent::setHash($options);
-        return $this;
-    }
-
-    /**
-     * Sets the md5 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setMd5($options)
-    {
-        $this->setHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the md5 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @param  string       $algorithm (Deprecated) Algorithm to use, fixed to md5
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addHash($options)
-    {
-        if (!is_array($options)) {
-            $options = (array) $options;
-        }
-
-        $options['algorithm'] = 'md5';
-        parent::addHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the md5 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addMd5($options)
-    {
-        $this->addHash($options);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the given file confirms the set hash
-     *
-     * @param  string $value Filename to check for hash
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        $hashes = array_unique(array_keys($this->_hash));
-        $filehash = hash_file('md5', $value);
-        if ($filehash === false) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        foreach($hashes as $hash) {
-            if ($filehash === $hash) {
-                return true;
-            }
-        }
-
-        return $this->_throw($file, self::DOES_NOT_MATCH);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/MimeType.php b/airtime_mvc/library/Zend/Validate/File/MimeType.php
deleted file mode 100644
index f70788e4e..000000000
--- a/airtime_mvc/library/Zend/Validate/File/MimeType.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: MimeType.php 21472 2010-03-11 22:16:55Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the mime type of a file
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_MimeType extends Zend_Validate_Abstract
-{
-    /**#@+
-     * @const Error type constants
-     */
-    const FALSE_TYPE   = 'fileMimeTypeFalse';
-    const NOT_DETECTED = 'fileMimeTypeNotDetected';
-    const NOT_READABLE = 'fileMimeTypeNotReadable';
-    /**#@-*/
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::FALSE_TYPE   => "File '%value%' has a false mimetype of '%type%'",
-        self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
-        self::NOT_READABLE => "File '%value%' can not be read",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'type' => '_type'
-    );
-
-    /**
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Mimetypes
-     *
-     * If null, there is no mimetype
-     *
-     * @var string|null
-     */
-    protected $_mimetype;
-
-    /**
-     * Magicfile to use
-     *
-     * @var string|null
-     */
-    protected $_magicfile;
-
-    /**
-     * Finfo object to use
-     *
-     * @var resource
-     */
-    protected $_finfo;
-
-    /**
-     * If no $_ENV['MAGIC'] is set, try and autodiscover it based on common locations
-     * @var array
-     */
-    protected $_magicFiles = array(
-        '/usr/share/misc/magic',
-        '/usr/share/misc/magic.mime',
-        '/usr/share/misc/magic.mgc',
-        '/usr/share/mime/magic',
-        '/usr/share/mime/magic.mime',
-        '/usr/share/mime/magic.mgc',
-        '/usr/share/file/magic',
-        '/usr/share/file/magic.mime',
-        '/usr/share/file/magic.mgc',
-    );
-
-    /**
-     * Option to allow header check
-     *
-     * @var boolean
-     */
-    protected $_headerCheck = false;
-
-    /**
-     * Sets validator options
-     *
-     * Mimetype to accept
-     *
-     * @param  string|array $mimetype MimeType
-     * @return void
-     */
-    public function __construct($mimetype)
-    {
-        if ($mimetype instanceof Zend_Config) {
-            $mimetype = $mimetype->toArray();
-        } elseif (is_string($mimetype)) {
-            $mimetype = explode(',', $mimetype);
-        } elseif (!is_array($mimetype)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Invalid options to validator provided");
-        }
-
-        if (isset($mimetype['magicfile'])) {
-            $this->setMagicFile($mimetype['magicfile']);
-            unset($mimetype['magicfile']);
-        }
-
-        if (isset($mimetype['headerCheck'])) {
-            $this->enableHeaderCheck($mimetype['headerCheck']);
-            unset($mimetype['headerCheck']);
-        }
-
-        $this->setMimeType($mimetype);
-    }
-
-    /**
-     * Returns the actual set magicfile
-     *
-     * @return string
-     */
-    public function getMagicFile()
-    {
-        if (null === $this->_magicfile) {
-            if (!empty($_ENV['MAGIC'])) {
-                $this->setMagicFile($_ENV['MAGIC']);
-            } elseif (!(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)) {
-                require_once 'Zend/Validate/Exception.php';
-                foreach ($this->_magicFiles as $file) {
-                    // supressing errors which are thrown due to openbase_dir restrictions
-                    try {
-                        $this->setMagicFile($file);
-                        if ($this->_magicfile !== null) {
-                            break;
-                        }
-                    } catch (Zend_Validate_Exception $e) {
-                        // Intentionally, catch and fall through
-                    }
-                }
-            }
-
-            if ($this->_magicfile === null) {
-                $this->_magicfile = false;
-            }
-        }
-
-        return $this->_magicfile;
-    }
-
-    /**
-     * Sets the magicfile to use
-     * if null, the MAGIC constant from php is used
-     * if the MAGIC file is errorous, no file will be set
-     *
-     * @param  string $file
-     * @throws Zend_Validate_Exception When finfo can not read the magicfile
-     * @return Zend_Validate_File_MimeType Provides fluid interface
-     */
-    public function setMagicFile($file)
-    {
-        if (empty($file)) {
-            $this->_magicfile = null;
-        } else if (!(class_exists('finfo', false))) {
-            $this->_magicfile = null;
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed');
-        } else if (!is_readable($file)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('The given magicfile can not be read');
-        } else {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            $this->_finfo = @finfo_open($const, $file);
-            if ($this->_finfo === false) {
-                $this->_finfo = null;
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('The given magicfile is not accepted by finfo');
-            } else {
-                $this->_magicfile = $file;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the Header Check option
-     *
-     * @return boolean
-     */
-    public function getHeaderCheck()
-    {
-        return $this->_headerCheck;
-    }
-
-    /**
-     * Defines if the http header should be used
-     * Note that this is unsave and therefor the default value is false
-     *
-     * @param  boolean $checkHeader
-     * @return Zend_Validate_File_MimeType Provides fluid interface
-     */
-    public function enableHeaderCheck($headerCheck = true)
-    {
-        $this->_headerCheck = (boolean) $headerCheck;
-        return $this;
-    }
-
-    /**
-     * Returns the set mimetypes
-     *
-     * @param  boolean $asArray Returns the values as array, when false an concated string is returned
-     * @return string|array
-     */
-    public function getMimeType($asArray = false)
-    {
-        $asArray   = (bool) $asArray;
-        $mimetype = (string) $this->_mimetype;
-        if ($asArray) {
-            $mimetype = explode(',', $mimetype);
-        }
-
-        return $mimetype;
-    }
-
-    /**
-     * Sets the mimetypes
-     *
-     * @param  string|array $mimetype The mimetypes to validate
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function setMimeType($mimetype)
-    {
-        $this->_mimetype = null;
-        $this->addMimeType($mimetype);
-        return $this;
-    }
-
-    /**
-     * Adds the mimetypes
-     *
-     * @param  string|array $mimetype The mimetypes to add for validation
-     * @return Zend_Validate_File_Extension Provides a fluent interface
-     */
-    public function addMimeType($mimetype)
-    {
-        $mimetypes = $this->getMimeType(true);
-
-        if (is_string($mimetype)) {
-            $mimetype = explode(',', $mimetype);
-        } elseif (!is_array($mimetype)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Invalid options to validator provided");
-        }
-
-        if (isset($mimetype['magicfile'])) {
-            unset($mimetype['magicfile']);
-        }
-
-        foreach ($mimetype as $content) {
-            if (empty($content) || !is_string($content)) {
-                continue;
-            }
-            $mimetypes[] = trim($content);
-        }
-        $mimetypes = array_unique($mimetypes);
-
-        // Sanity check to ensure no empty values
-        foreach ($mimetypes as $key => $mt) {
-            if (empty($mt)) {
-                unset($mimetypes[$key]);
-            }
-        }
-
-        $this->_mimetype = implode(',', $mimetypes);
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if the mimetype of the file matches the given ones. Also parts
-     * of mimetypes can be checked. If you give for example "image" all image
-     * mime types will be accepted like "image/gif", "image/jpeg" and so on.
-     *
-     * @param  string $value Real file to check for mimetype
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        if ($file === null) {
-            $file = array(
-                'type' => null,
-                'name' => $value
-            );
-        }
-
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_READABLE);
-        }
-
-        $mimefile = $this->getMagicFile();
-        if (class_exists('finfo', false)) {
-            $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME;
-            if (!empty($mimefile) && !empty($this->_finfo)) {
-                $this->_finfo = @finfo_open($const, $mimefile);
-            }
-
-            if ($this->_finfo === false) {
-                $this->_finfo = @finfo_open($const);
-            }
-
-            if ($this->_finfo !== false) {
-                $this->_type = finfo_file($this->_finfo, $value);
-            }
-
-            unset($this->_finfo);
-        }
-
-        if (empty($this->_type) &&
-            (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) {
-                $this->_type = mime_content_type($value);
-        }
-
-        if (empty($this->_type) && $this->_headerCheck) {
-            $this->_type = $file['type'];
-        }
-
-        if (empty($this->_type)) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        $mimetype = $this->getMimeType(true);
-        if (in_array($this->_type, $mimetype)) {
-            return true;
-        }
-
-        $types = explode('/', $this->_type);
-        $types = array_merge($types, explode('-', $this->_type));
-        $types = array_merge($types, explode(';', $this->_type));
-        foreach($mimetype as $mime) {
-            if (in_array($mime, $types)) {
-                return true;
-            }
-        }
-
-        return $this->_throw($file, self::FALSE_TYPE);
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        $this->_value = $file['name'];
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/NotExists.php b/airtime_mvc/library/Zend/Validate/File/NotExists.php
deleted file mode 100644
index 87ebb827b..000000000
--- a/airtime_mvc/library/Zend/Validate/File/NotExists.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: NotExists.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_Exists
- */
-require_once 'Zend/Validate/File/Exists.php';
-
-/**
- * Validator which checks if the destination file does not exist
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_EXIST = 'fileNotExistsDoesExist';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_EXIST => "File '%value%' exists",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the file does not exist in the set destinations
-     *
-     * @param  string  $value Real file to check for
-     * @param  array   $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        $directories = $this->getDirectory(true);
-        if (($file !== null) and (!empty($file['destination']))) {
-            $directories[] = $file['destination'];
-        } else if (!isset($file['name'])) {
-            $file['name'] = $value;
-        }
-
-        foreach ($directories as $directory) {
-            if (empty($directory)) {
-                continue;
-            }
-
-            $check = true;
-            if (file_exists($directory . DIRECTORY_SEPARATOR . $file['name'])) {
-                return $this->_throw($file, self::DOES_EXIST);
-            }
-        }
-
-        if (!isset($check)) {
-            return $this->_throw($file, self::DOES_EXIST);
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Sha1.php b/airtime_mvc/library/Zend/Validate/File/Sha1.php
deleted file mode 100644
index 2157bfb26..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Sha1.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Sha1.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_Hash
- */
-require_once 'Zend/Validate/File/Hash.php';
-
-/**
- * Validator for the sha1 hash of given files
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash
-{
-    /**
-     * @const string Error constants
-     */
-    const DOES_NOT_MATCH = 'fileSha1DoesNotMatch';
-    const NOT_DETECTED   = 'fileSha1NotDetected';
-    const NOT_FOUND      = 'fileSha1NotFound';
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::DOES_NOT_MATCH => "File '%value%' does not match the given sha1 hashes",
-        self::NOT_DETECTED   => "A sha1 hash could not be evaluated for the given file",
-        self::NOT_FOUND      => "File '%value%' could not be found",
-    );
-
-    /**
-     * Hash of the file
-     *
-     * @var string
-     */
-    protected $_hash;
-
-    /**
-     * Sets validator options
-     *
-     * $hash is the hash we accept for the file $file
-     *
-     * @param  string|array $options
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_scalar($options)) {
-            $options = array('hash1' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options to validator provided');
-        }
-
-        $this->setHash($options);
-    }
-
-    /**
-     * Returns all set sha1 hashes
-     *
-     * @return array
-     */
-    public function getSha1()
-    {
-        return $this->getHash();
-    }
-
-    /**
-     * Sets the sha1 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setHash($options)
-    {
-        if (!is_array($options)) {
-            $options = (array) $options;
-        }
-
-        $options['algorithm'] = 'sha1';
-        parent::setHash($options);
-        return $this;
-    }
-
-    /**
-     * Sets the sha1 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function setSha1($options)
-    {
-        $this->setHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the sha1 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addHash($options)
-    {
-        if (!is_array($options)) {
-            $options = (array) $options;
-        }
-
-        $options['algorithm'] = 'sha1';
-        parent::addHash($options);
-        return $this;
-    }
-
-    /**
-     * Adds the sha1 hash for one or multiple files
-     *
-     * @param  string|array $options
-     * @return Zend_Validate_File_Hash Provides a fluent interface
-     */
-    public function addSha1($options)
-    {
-        $this->addHash($options);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the given file confirms the set hash
-     *
-     * @param  string $value Filename to check for hash
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        $hashes = array_unique(array_keys($this->_hash));
-        $filehash = hash_file('sha1', $value);
-        if ($filehash === false) {
-            return $this->_throw($file, self::NOT_DETECTED);
-        }
-
-        foreach ($hashes as $hash) {
-            if ($filehash === $hash) {
-                return true;
-            }
-        }
-
-        return $this->_throw($file, self::DOES_NOT_MATCH);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Size.php b/airtime_mvc/library/Zend/Validate/File/Size.php
deleted file mode 100644
index bfd02aa80..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Size.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Size.php 20455 2010-01-20 22:54:18Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the maximum size of a file up to a max of 2GB
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Size extends Zend_Validate_Abstract
-{
-    /**#@+
-     * @const string Error constants
-     */
-    const TOO_BIG   = 'fileSizeTooBig';
-    const TOO_SMALL = 'fileSizeTooSmall';
-    const NOT_FOUND = 'fileSizeNotFound';
-    /**#@-*/
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::TOO_BIG   => "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected",
-        self::TOO_SMALL => "Minimum expected size for file '%value%' is '%min%' but '%size%' detected",
-        self::NOT_FOUND => "File '%value%' could not be found",
-    );
-
-    /**
-     * @var array Error message template variables
-     */
-    protected $_messageVariables = array(
-        'min'  => '_min',
-        'max'  => '_max',
-        'size' => '_size',
-    );
-
-    /**
-     * Minimum filesize
-     * @var integer
-     */
-    protected $_min;
-
-    /**
-     * Maximum filesize
-     *
-     * If null, there is no maximum filesize
-     *
-     * @var integer|null
-     */
-    protected $_max;
-
-    /**
-     * Detected size
-     *
-     * @var integer
-     */
-    protected $_size;
-
-    /**
-     * Use bytestring ?
-     *
-     * @var boolean
-     */
-    protected $_useByteString = true;
-
-    /**
-     * Sets validator options
-     *
-     * If $options is a integer, it will be used as maximum filesize
-     * As Array is accepts the following keys:
-     * 'min': Minimum filesize
-     * 'max': Maximum filesize
-     * 'bytestring': Use bytestring or real size for messages
-     *
-     * @param  integer|array $options Options for the adapter
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } elseif (is_string($options) || is_numeric($options)) {
-            $options = array('max' => $options);
-        } elseif (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        if (1 < func_num_args()) {
-            $argv = func_get_args();
-            array_shift($argv);
-            $options['max'] = array_shift($argv);
-            if (!empty($argv)) {
-                $options['bytestring'] = array_shift($argv);
-            }
-        }
-
-        if (isset($options['bytestring'])) {
-            $this->setUseByteString($options['bytestring']);
-        }
-
-        if (isset($options['min'])) {
-            $this->setMin($options['min']);
-        }
-
-        if (isset($options['max'])) {
-            $this->setMax($options['max']);
-        }
-    }
-
-    /**
-     * Returns the minimum filesize
-     *
-     * @param  boolean $byteString Use bytestring ?
-     * @return integer
-     */
-    public function setUseByteString($byteString = true)
-    {
-        $this->_useByteString = (bool) $byteString;
-        return $this;
-    }
-
-    /**
-     * Will bytestring be used?
-     *
-     * @return boolean
-     */
-    public function useByteString()
-    {
-        return $this->_useByteString;
-    }
-
-    /**
-     * Returns the minimum filesize
-     *
-     * @param  bool $raw Whether or not to force return of the raw value (defaults off)
-     * @return integer|string
-     */
-    public function getMin($raw = false)
-    {
-        $min = $this->_min;
-        if (!$raw && $this->useByteString()) {
-            $min = $this->_toByteString($min);
-        }
-
-        return $min;
-    }
-
-    /**
-     * Sets the minimum filesize
-     *
-     * @param  integer $min The minimum filesize
-     * @throws Zend_Validate_Exception When min is greater than max
-     * @return Zend_Validate_File_Size Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        if (!is_string($min) and !is_numeric($min)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        $min = (integer) $this->_fromByteString($min);
-        $max = $this->getMax(true);
-        if (($max !== null) && ($min > $max)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum filesize, but $min >"
-                                            . " $max");
-        }
-
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Returns the maximum filesize
-     *
-     * @param  bool $raw Whether or not to force return of the raw value (defaults off)
-     * @return integer|string
-     */
-    public function getMax($raw = false)
-    {
-        $max = $this->_max;
-        if (!$raw && $this->useByteString()) {
-            $max = $this->_toByteString($max);
-        }
-
-        return $max;
-    }
-
-    /**
-     * Sets the maximum filesize
-     *
-     * @param  integer $max The maximum filesize
-     * @throws Zend_Validate_Exception When max is smaller than min
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        if (!is_string($max) && !is_numeric($max)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception ('Invalid options to validator provided');
-        }
-
-        $max = (integer) $this->_fromByteString($max);
-        $min = $this->getMin(true);
-        if (($min !== null) && ($max < $min)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum filesize, but "
-                                            . "$max < $min");
-        }
-
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Retrieve current detected file size
-     *
-     * @return int
-     */
-    protected function _getSize()
-    {
-        return $this->_size;
-    }
-
-    /**
-     * Set current size
-     *
-     * @param  int $size
-     * @return Zend_Validate_File_Size
-     */
-    protected function _setSize($size)
-    {
-        $this->_size = $size;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the filesize of $value is at least min and
-     * not bigger than max (when max is not null).
-     *
-     * @param  string $value Real file to check for size
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        // limited to 4GB files
-        $size        = sprintf("%u", @filesize($value));
-        $this->_size = $size;
-
-        // Check to see if it's smaller than min size
-        $min = $this->getMin(true);
-        $max = $this->getMax(true);
-        if (($min !== null) && ($size < $min)) {
-            if ($this->useByteString()) {
-                $this->_min  = $this->_toByteString($min);
-                $this->_size = $this->_toByteString($size);
-                $this->_throw($file, self::TOO_SMALL);
-                $this->_min  = $min;
-                $this->_size = $size;
-            } else {
-                $this->_throw($file, self::TOO_SMALL);
-            }
-        }
-
-        // Check to see if it's larger than max size
-        if (($max !== null) && ($max < $size)) {
-            if ($this->useByteString()) {
-                $this->_max  = $this->_toByteString($max);
-                $this->_size = $this->_toByteString($size);
-                $this->_throw($file, self::TOO_BIG);
-                $this->_max  = $max;
-                $this->_size = $size;
-            } else {
-                $this->_throw($file, self::TOO_BIG);
-            }
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the formatted size
-     *
-     * @param  integer $size
-     * @return string
-     */
-    protected function _toByteString($size)
-    {
-        $sizes = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-        for ($i=0; $size >= 1024 && $i < 9; $i++) {
-            $size /= 1024;
-        }
-
-        return round($size, 2) . $sizes[$i];
-    }
-
-    /**
-     * Returns the unformatted size
-     *
-     * @param  string $size
-     * @return integer
-     */
-    protected function _fromByteString($size)
-    {
-        if (is_numeric($size)) {
-            return (integer) $size;
-        }
-
-        $type  = trim(substr($size, -2, 1));
-
-        $value = substr($size, 0, -1);
-        if (!is_numeric($value)) {
-            $value = substr($value, 0, -1);
-        }
-
-        switch (strtoupper($type)) {
-            case 'Y':
-                $value *= (1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024);
-                break;
-            case 'Z':
-                $value *= (1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024);
-                break;
-            case 'E':
-                $value *= (1024 * 1024 * 1024 * 1024 * 1024 * 1024);
-                break;
-            case 'P':
-                $value *= (1024 * 1024 * 1024 * 1024 * 1024);
-                break;
-            case 'T':
-                $value *= (1024 * 1024 * 1024 * 1024);
-                break;
-            case 'G':
-                $value *= (1024 * 1024 * 1024);
-                break;
-            case 'M':
-                $value *= (1024 * 1024);
-                break;
-            case 'K':
-                $value *= 1024;
-                break;
-            default:
-                break;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/Upload.php b/airtime_mvc/library/Zend/Validate/File/Upload.php
deleted file mode 100644
index 85f408c73..000000000
--- a/airtime_mvc/library/Zend/Validate/File/Upload.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: Upload.php 20431 2010-01-19 21:36:05Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validator for the maximum size of a file up to a max of 2GB
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_Upload extends Zend_Validate_Abstract
-{
-    /**@#+
-     * @const string Error constants
-     */
-    const INI_SIZE       = 'fileUploadErrorIniSize';
-    const FORM_SIZE      = 'fileUploadErrorFormSize';
-    const PARTIAL        = 'fileUploadErrorPartial';
-    const NO_FILE        = 'fileUploadErrorNoFile';
-    const NO_TMP_DIR     = 'fileUploadErrorNoTmpDir';
-    const CANT_WRITE     = 'fileUploadErrorCantWrite';
-    const EXTENSION      = 'fileUploadErrorExtension';
-    const ATTACK         = 'fileUploadErrorAttack';
-    const FILE_NOT_FOUND = 'fileUploadErrorFileNotFound';
-    const UNKNOWN        = 'fileUploadErrorUnknown';
-    /**@#-*/
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::INI_SIZE       => "File '%value%' exceeds the defined ini size",
-        self::FORM_SIZE      => "File '%value%' exceeds the defined form size",
-        self::PARTIAL        => "File '%value%' was only partially uploaded",
-        self::NO_FILE        => "File '%value%' was not uploaded",
-        self::NO_TMP_DIR     => "No temporary directory was found for file '%value%'",
-        self::CANT_WRITE     => "File '%value%' can't be written",
-        self::EXTENSION      => "A PHP extension returned an error while uploading the file '%value%'",
-        self::ATTACK         => "File '%value%' was illegally uploaded. This could be a possible attack",
-        self::FILE_NOT_FOUND => "File '%value%' was not found",
-        self::UNKNOWN        => "Unknown error while uploading file '%value%'"
-    );
-
-    /**
-     * Internal array of files
-     * @var array
-     */
-    protected $_files = array();
-
-    /**
-     * Sets validator options
-     *
-     * The array $files must be given in syntax of Zend_File_Transfer to be checked
-     * If no files are given the $_FILES array will be used automatically.
-     * NOTE: This validator will only work with HTTP POST uploads!
-     *
-     * @param  array|Zend_Config $files Array of files in syntax of Zend_File_Transfer
-     * @return void
-     */
-    public function __construct($files = array())
-    {
-        if ($files instanceof Zend_Config) {
-            $files = $files->toArray();
-        }
-
-        $this->setFiles($files);
-    }
-
-    /**
-     * Returns the array of set files
-     *
-     * @param  string $files (Optional) The file to return in detail
-     * @return array
-     * @throws Zend_Validate_Exception If file is not found
-     */
-    public function getFiles($file = null)
-    {
-        if ($file !== null) {
-            $return = array();
-            foreach ($this->_files as $name => $content) {
-                if ($name === $file) {
-                    $return[$file] = $this->_files[$name];
-                }
-
-                if ($content['name'] === $file) {
-                    $return[$name] = $this->_files[$name];
-                }
-            }
-
-            if (count($return) === 0) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("The file '$file' was not found");
-            }
-
-            return $return;
-        }
-
-        return $this->_files;
-    }
-
-    /**
-     * Sets the files to be checked
-     *
-     * @param  array $files The files to check in syntax of Zend_File_Transfer
-     * @return Zend_Validate_File_Upload Provides a fluent interface
-     */
-    public function setFiles($files = array())
-    {
-        if (count($files) === 0) {
-            $this->_files = $_FILES;
-        } else {
-            $this->_files = $files;
-        }
-
-        foreach($this->_files as $file => $content) {
-            if (!isset($content['error'])) {
-                unset($this->_files[$file]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the file was uploaded without errors
-     *
-     * @param  string $value Single file to check for upload errors, when giving null the $_FILES array
-     *                       from initialization will be used
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        if (array_key_exists($value, $this->_files)) {
-            $files[$value] = $this->_files[$value];
-        } else {
-            foreach ($this->_files as $file => $content) {
-                if (isset($content['name']) && ($content['name'] === $value)) {
-                    $files[$file] = $this->_files[$file];
-                }
-
-                if (isset($content['tmp_name']) && ($content['tmp_name'] === $value)) {
-                    $files[$file] = $this->_files[$file];
-                }
-            }
-        }
-
-        if (empty($files)) {
-            return $this->_throw($file, self::FILE_NOT_FOUND);
-        }
-
-        foreach ($files as $file => $content) {
-            $this->_value = $file;
-            switch($content['error']) {
-                case 0:
-                    if (!is_uploaded_file($content['tmp_name'])) {
-                        $this->_throw($file, self::ATTACK);
-                    }
-                    break;
-
-                case 1:
-                    $this->_throw($file, self::INI_SIZE);
-                    break;
-
-                case 2:
-                    $this->_throw($file, self::FORM_SIZE);
-                    break;
-
-                case 3:
-                    $this->_throw($file, self::PARTIAL);
-                    break;
-
-                case 4:
-                    $this->_throw($file, self::NO_FILE);
-                    break;
-
-                case 6:
-                    $this->_throw($file, self::NO_TMP_DIR);
-                    break;
-
-                case 7:
-                    $this->_throw($file, self::CANT_WRITE);
-                    break;
-
-                case 8:
-                    $this->_throw($file, self::EXTENSION);
-                    break;
-
-                default:
-                    $this->_throw($file, self::UNKNOWN);
-                    break;
-            }
-        }
-
-        if (count($this->_messages) > 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            if (is_array($file) and !empty($file['name'])) {
-                $this->_value = $file['name'];
-            }
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/File/WordCount.php b/airtime_mvc/library/Zend/Validate/File/WordCount.php
deleted file mode 100644
index 9936cb662..000000000
--- a/airtime_mvc/library/Zend/Validate/File/WordCount.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id: WordCount.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_File_Count
- */
-require_once 'Zend/Validate/File/Count.php';
-
-/**
- * Validator for counting all words in a file
- *
- * @category  Zend
- * @package   Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_File_WordCount extends Zend_Validate_File_Count
-{
-    /**#@+
-     * @const string Error constants
-     */
-    const TOO_MUCH  = 'fileWordCountTooMuch';
-    const TOO_LESS  = 'fileWordCountTooLess';
-    const NOT_FOUND = 'fileWordCountNotFound';
-    /**#@-*/
-
-    /**
-     * @var array Error message templates
-     */
-    protected $_messageTemplates = array(
-        self::TOO_MUCH => "Too much words, maximum '%max%' are allowed but '%count%' were counted",
-        self::TOO_LESS => "Too less words, minimum '%min%' are expected but '%count%' were counted",
-        self::NOT_FOUND => "File '%value%' could not be found",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the counted words are at least min and
-     * not bigger than max (when max is not null).
-     *
-     * @param  string $value Filename to check for word count
-     * @param  array  $file  File data from Zend_File_Transfer
-     * @return boolean
-     */
-    public function isValid($value, $file = null)
-    {
-        // Is file readable ?
-        require_once 'Zend/Loader.php';
-        if (!Zend_Loader::isReadable($value)) {
-            return $this->_throw($file, self::NOT_FOUND);
-        }
-
-        $content = file_get_contents($value);
-        $this->_count = str_word_count($content);
-        if (($this->_max !== null) && ($this->_count > $this->_max)) {
-            return $this->_throw($file, self::TOO_MUCH);
-        }
-
-        if (($this->_min !== null) && ($this->_count < $this->_min)) {
-            return $this->_throw($file, self::TOO_LESS);
-        }
-
-        return true;
-    }
-
-    /**
-     * Throws an error of the given type
-     *
-     * @param  string $file
-     * @param  string $errorType
-     * @return false
-     */
-    protected function _throw($file, $errorType)
-    {
-        if ($file !== null) {
-            $this->_value = $file['name'];
-        }
-
-        $this->_error($errorType);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Float.php b/airtime_mvc/library/Zend/Validate/Float.php
deleted file mode 100644
index 4b0899d5a..000000000
--- a/airtime_mvc/library/Zend/Validate/Float.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Float.php 21664 2010-03-27 21:39:38Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Locale_Format
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Float extends Zend_Validate_Abstract
-{
-    const INVALID   = 'floatInvalid';
-    const NOT_FLOAT = 'notFloat';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be float, string, or integer",
-        self::NOT_FLOAT => "'%value%' does not appear to be a float",
-    );
-
-    protected $_locale;
-
-    /**
-     * Constructor for the float validator
-     *
-     * @param string|Zend_Config|Zend_Locale $locale
-     */
-    public function __construct($locale = null)
-    {
-        if ($locale instanceof Zend_Config) {
-            $locale = $locale->toArray();
-        }
-
-        if (is_array($locale)) {
-            if (array_key_exists('locale', $locale)) {
-                $locale = $locale['locale'];
-            } else {
-                $locale = null;
-            }
-        }
-
-        if (empty($locale)) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $locale = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        $this->setLocale($locale);
-    }
-
-    /**
-     * Returns the set locale
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale to use
-     *
-     * @param string|Zend_Locale $locale
-     */
-    public function setLocale($locale = null)
-    {
-        require_once 'Zend/Locale.php';
-        $this->_locale = Zend_Locale::findLocale($locale);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a floating-point value
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        if (is_float($value)) {
-            return true;
-        }
-
-        $this->_setValue($value);
-        try {
-            if (!Zend_Locale_Format::isFloat($value, array('locale' => $this->_locale))) {
-                $this->_error(self::NOT_FLOAT);
-                return false;
-            }
-        } catch (Zend_Locale_Exception $e) {
-            $this->_error(self::NOT_FLOAT);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/GreaterThan.php b/airtime_mvc/library/Zend/Validate/GreaterThan.php
deleted file mode 100644
index 53c71ccbc..000000000
--- a/airtime_mvc/library/Zend/Validate/GreaterThan.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: GreaterThan.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_GreaterThan extends Zend_Validate_Abstract
-{
-
-    const NOT_GREATER = 'notGreaterThan';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_GREATER => "'%value%' is not greater than '%min%'",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min'
-    );
-
-    /**
-     * Minimum value
-     *
-     * @var mixed
-     */
-    protected $_min;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed|Zend_Config $min
-     * @return void
-     */
-    public function __construct($min)
-    {
-        if ($min instanceof Zend_Config) {
-            $min = $min->toArray();
-        }
-
-        if (is_array($min)) {
-            if (array_key_exists('min', $min)) {
-                $min = $min['min'];
-            } else {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("Missing option 'min'");
-            }
-        }
-
-        $this->setMin($min);
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return mixed
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  mixed $min
-     * @return Zend_Validate_GreaterThan Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        $this->_min = $min;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is greater than min option
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-
-        if ($this->_min >= $value) {
-            $this->_error(self::NOT_GREATER);
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/Hex.php b/airtime_mvc/library/Zend/Validate/Hex.php
deleted file mode 100644
index ced156dfe..000000000
--- a/airtime_mvc/library/Zend/Validate/Hex.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hex.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Hex extends Zend_Validate_Abstract
-{
-    const INVALID = 'hexInvalid';
-    const NOT_HEX = 'notHex';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID => "Invalid type given, value should be a string",
-        self::NOT_HEX => "'%value%' has not only hexadecimal digit characters",
-    );
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value contains only hexadecimal digit characters
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        if (!ctype_xdigit((string) $value)) {
-            $this->_error(self::NOT_HEX);
-            return false;
-        }
-
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/Hostname.php b/airtime_mvc/library/Zend/Validate/Hostname.php
deleted file mode 100644
index 3199767b7..000000000
--- a/airtime_mvc/library/Zend/Validate/Hostname.php
+++ /dev/null
@@ -1,740 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Hostname.php 21063 2010-02-15 23:00:17Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Validate_Ip
- */
-require_once 'Zend/Validate/Ip.php';
-
-/**
- * Please note there are two standalone test scripts for testing IDN characters due to problems
- * with file encoding.
- *
- * The first is tests/Zend/Validate/HostnameTestStandalone.php which is designed to be run on
- * the command line.
- *
- * The second is tests/Zend/Validate/HostnameTestForm.php which is designed to be run via HTML
- * to allow users to test entering UTF-8 characters in a form.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Hostname extends Zend_Validate_Abstract
-{
-    const INVALID                 = 'hostnameInvalid';
-    const IP_ADDRESS_NOT_ALLOWED  = 'hostnameIpAddressNotAllowed';
-    const UNKNOWN_TLD             = 'hostnameUnknownTld';
-    const INVALID_DASH            = 'hostnameDashCharacter';
-    const INVALID_HOSTNAME_SCHEMA = 'hostnameInvalidHostnameSchema';
-    const UNDECIPHERABLE_TLD      = 'hostnameUndecipherableTld';
-    const INVALID_HOSTNAME        = 'hostnameInvalidHostname';
-    const INVALID_LOCAL_NAME      = 'hostnameInvalidLocalName';
-    const LOCAL_NAME_NOT_ALLOWED  = 'hostnameLocalNameNotAllowed';
-    const CANNOT_DECODE_PUNYCODE  = 'hostnameCannotDecodePunycode';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID                 => "Invalid type given, value should be a string",
-        self::IP_ADDRESS_NOT_ALLOWED  => "'%value%' appears to be an IP address, but IP addresses are not allowed",
-        self::UNKNOWN_TLD             => "'%value%' appears to be a DNS hostname but cannot match TLD against known list",
-        self::INVALID_DASH            => "'%value%' appears to be a DNS hostname but contains a dash in an invalid position",
-        self::INVALID_HOSTNAME_SCHEMA => "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'",
-        self::UNDECIPHERABLE_TLD      => "'%value%' appears to be a DNS hostname but cannot extract TLD part",
-        self::INVALID_HOSTNAME        => "'%value%' does not match the expected structure for a DNS hostname",
-        self::INVALID_LOCAL_NAME      => "'%value%' does not appear to be a valid local network name",
-        self::LOCAL_NAME_NOT_ALLOWED  => "'%value%' appears to be a local network name but local network names are not allowed",
-        self::CANNOT_DECODE_PUNYCODE  => "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'tld' => '_tld'
-    );
-
-    /**
-     * Allows Internet domain names (e.g., example.com)
-     */
-    const ALLOW_DNS   = 1;
-
-    /**
-     * Allows IP addresses
-     */
-    const ALLOW_IP    = 2;
-
-    /**
-     * Allows local network names (e.g., localhost, www.localdomain)
-     */
-    const ALLOW_LOCAL = 4;
-
-    /**
-     * Allows all types of hostnames
-     */
-    const ALLOW_ALL   = 7;
-
-    /**
-     * Array of valid top-level-domains
-     *
-     * @see ftp://data.iana.org/TLD/tlds-alpha-by-domain.txt  List of all TLDs by domain
-     * @see http://www.iana.org/domains/root/db/ Official list of supported TLDs
-     * @var array
-     */
-    protected $_validTlds = array(
-        'ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa',
-        'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi',
-        'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc',
-        'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu',
-        'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er',
-        'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg',
-        'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk',
-        'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq',
-        'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp',
-        'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly',
-        'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp',
-        'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc',
-        'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe',
-        'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're',
-        'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl',
-        'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th',
-        'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua',
-        'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws',
-        'ye', 'yt', 'yu', 'za', 'zm', 'zw'
-    );
-
-    /**
-     * @var string
-     */
-    protected $_tld;
-
-    /**
-     * Array for valid Idns
-     * @see http://www.iana.org/domains/idn-tables/ Official list of supported IDN Chars
-     * (.AC) Ascension Island http://www.nic.ac/pdf/AC-IDN-Policy.pdf
-     * (.AR) Argentinia http://www.nic.ar/faqidn.html
-     * (.AS) American Samoa http://www.nic.as/idn/chars.cfm
-     * (.AT) Austria http://www.nic.at/en/service/technical_information/idn/charset_converter/
-     * (.BIZ) International http://www.iana.org/domains/idn-tables/
-     * (.BR) Brazil http://registro.br/faq/faq6.html
-     * (.BV) Bouvett Island http://www.norid.no/domeneregistrering/idn/idn_nyetegn.en.html
-     * (.CAT) Catalan http://www.iana.org/domains/idn-tables/tables/cat_ca_1.0.html
-     * (.CH) Switzerland https://nic.switch.ch/reg/ocView.action?res=EF6GW2JBPVTG67DLNIQXU234MN6SC33JNQQGI7L6#anhang1
-     * (.CL) Chile http://www.iana.org/domains/idn-tables/tables/cl_latn_1.0.html
-     * (.COM) International http://www.verisign.com/information-services/naming-services/internationalized-domain-names/index.html
-     * (.DE) Germany http://www.denic.de/en/domains/idns/liste.html
-     * (.DK) Danmark http://www.dk-hostmaster.dk/index.php?id=151
-     * (.ES) Spain https://www.nic.es/media/2008-05/1210147705287.pdf
-     * (.FI) Finland http://www.ficora.fi/en/index/palvelut/fiverkkotunnukset/aakkostenkaytto.html
-     * (.GR) Greece https://grweb.ics.forth.gr/CharacterTable1_en.jsp
-     * (.HU) Hungary http://www.domain.hu/domain/English/szabalyzat/szabalyzat.html
-     * (.INFO) International http://www.nic.info/info/idn
-     * (.IO) British Indian Ocean Territory http://www.nic.io/IO-IDN-Policy.pdf
-     * (.IR) Iran http://www.nic.ir/Allowable_Characters_dot-iran
-     * (.IS) Iceland http://www.isnic.is/domain/rules.php
-     * (.KR) Korea http://www.iana.org/domains/idn-tables/tables/kr_ko-kr_1.0.html
-     * (.LI) Liechtenstein https://nic.switch.ch/reg/ocView.action?res=EF6GW2JBPVTG67DLNIQXU234MN6SC33JNQQGI7L6#anhang1
-     * (.LT) Lithuania http://www.domreg.lt/static/doc/public/idn_symbols-en.pdf
-     * (.MD) Moldova http://www.register.md/
-     * (.MUSEUM) International http://www.iana.org/domains/idn-tables/tables/museum_latn_1.0.html
-     * (.NET) International http://www.verisign.com/information-services/naming-services/internationalized-domain-names/index.html
-     * (.NO) Norway http://www.norid.no/domeneregistrering/idn/idn_nyetegn.en.html
-     * (.NU) Niue http://www.worldnames.net/
-     * (.ORG) International http://www.pir.org/index.php?db=content/FAQs&tbl=FAQs_Registrant&id=2
-     * (.PE) Peru https://www.nic.pe/nuevas_politicas_faq_2.php
-     * (.PL) Poland http://www.dns.pl/IDN/allowed_character_sets.pdf
-     * (.PR) Puerto Rico http://www.nic.pr/idn_rules.asp
-     * (.PT) Portugal https://online.dns.pt/dns_2008/do?com=DS;8216320233;111;+PAGE(4000058)+K-CAT-CODIGO(C.125)+RCNT(100);
-     * (.RU) Russia http://www.iana.org/domains/idn-tables/tables/ru_ru-ru_1.0.html
-     * (.SA) Saudi Arabia http://www.iana.org/domains/idn-tables/tables/sa_ar_1.0.html
-     * (.SE) Sweden http://www.iis.se/english/IDN_campaignsite.shtml?lang=en
-     * (.SH) Saint Helena http://www.nic.sh/SH-IDN-Policy.pdf
-     * (.SJ) Svalbard and Jan Mayen http://www.norid.no/domeneregistrering/idn/idn_nyetegn.en.html
-     * (.TH) Thailand http://www.iana.org/domains/idn-tables/tables/th_th-th_1.0.html
-     * (.TM) Turkmenistan http://www.nic.tm/TM-IDN-Policy.pdf
-     * (.TR) Turkey https://www.nic.tr/index.php
-     * (.VE) Venice http://www.iana.org/domains/idn-tables/tables/ve_es_1.0.html
-     * (.VN) Vietnam http://www.vnnic.vn/english/5-6-300-2-2-04-20071115.htm#1.%20Introduction
-     *
-     * @var array
-     */
-    protected $_validIdns = array(
-        'AC'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ�ăąćĉċ��đēėęě�ġģĥħīįĵķĺļľŀłńņňŋőœŕŗřś�şšţťŧūŭůűųŵŷźżž]{1,63}$/iu'),
-        'AR'  => array(1 => '/^[\x{002d}0-9a-zà-ãç-êìíñ-õü]{1,63}$/iu'),
-        'AS'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįıĵķĸĺļľłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźż]{1,63}$/iu'),
-        'AT'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœšž]{1,63}$/iu'),
-        'BIZ' => 'Hostname/Biz.php',
-        'BR'  => array(1 => '/^[\x{002d}0-9a-zà-ãçéíó-õúü]{1,63}$/iu'),
-        'BV'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøü�đńŋšŧž]{1,63}$/iu'),
-        'CAT' => array(1 => '/^[\x{002d}0-9a-z·àç-éíïòóúü]{1,63}$/iu'),
-        'CH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),
-        'CL'  => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
-        'CN'  => 'Hostname/Cn.php',
-        'COM' => 'Zend/Validate/Hostname/Com.php',
-        'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăą�ćĉ�ċ�đĕěėęēğ�ġģĥħĭĩįīıĵķĺľļłńňņŋ�ő�œĸŕřŗś�šşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
-        'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'),
-        'ES'  => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'),
-        'EU'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
-            2 => '/^[\x{002d}0-9a-z�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįıĵķĺļľŀłńņňʼnŋ��őœŕŗřś�šťŧũūŭůűųŵŷźżž]{1,63}$/iu',
-            3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu',
-            4 => '/^[\x{002d}0-9a-z�άέήίΰαβγδεζηθικλμνξοπ�ςστυφχψωϊϋό�ώ]{1,63}$/iu',
-            5 => '/^[\x{002d}0-9a-zабвгдежзийклмнопр�туфхцчшщъыь�ю�]{1,63}$/iu',
-            6 => '/^[\x{002d}0-9a-zἀ-ἇ�-ἕἠ-ἧἰ-ἷὀ-ὅ�-ὗὠ-ὧὰ-ώᾀ-ᾇ�-ᾗᾠ-ᾧᾰ-ᾴᾶᾷῂῃῄῆῇ�-�ῖῗῠ-ῧῲῳῴῶῷ]{1,63}$/iu'),
-        'FI'  => array(1 => '/^[\x{002d}0-9a-zäåö]{1,63}$/iu'),
-        'GR'  => array(1 => '/^[\x{002d}0-9a-zΆΈΉΊΌΎ-ΡΣ-ώἀ-ἕἘ-�ἠ-ὅὈ-��-ὗὙὛ�Ὗ-ώᾀ-ᾴᾶ-ᾼῂῃῄῆ-ῌ�-ΐῖ-Ίῠ-Ῥῲῳῴῶ-ῼ]{1,63}$/iu'),
-        'HK'  => 'Zend/Validate/Hostname/Cn.php',
-        'HU'  => array(1 => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu'),
-        'INFO'=> array(1 => '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu',
-            2 => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu',
-            3 => '/^[\x{002d}0-9a-záæéíðóöúýþ]{1,63}$/iu',
-            4 => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu',
-            5 => '/^[\x{002d}0-9a-z��ēģīķļņ�ŗšūž]{1,63}$/iu',
-            6 => '/^[\x{002d}0-9a-zą�ėęįšūųž]{1,63}$/iu',
-            7 => '/^[\x{002d}0-9a-zóąćęłńśźż]{1,63}$/iu',
-            8 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
-        'IO'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăą�ćĉ�ċ�đĕěėęēğ�ġģĥħĭĩįīıĵķĺľļłńňņŋ�ő�œĸŕřŗś�šşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
-        'IS'  => array(1 => '/^[\x{002d}0-9a-záéýúíóþæöð]{1,63}$/iu'),
-        'JP'  => 'Zend/Validate/Hostname/Jp.php',
-        'KR'  => array(1 => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu'),
-        'LI'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿœ]{1,63}$/iu'),
-        'LT'  => array(1 => '/^[\x{002d}0-9ą�ęėįšųūž]{1,63}$/iu'),
-        'MD'  => array(1 => '/^[\x{002d}0-9ăâîşţ]{1,63}$/iu'),
-        'MUSEUM' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ�ăąćċ��đēėęěğġģħīįıķĺļľłńņňŋ�őœŕŗřśşšţťŧūůűųŵŷźżžǎ�ǒǔ\x{01E5}\x{01E7}\x{01E9}\x{01EF}ə\x{0292}�ẃẅỳ]{1,63}$/iu'),
-        'NET' => 'Zend/Validate/Hostname/Com.php',
-        'NO'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøü�đńŋšŧž]{1,63}$/iu'),
-        'NU'  => 'Zend/Validate/Hostname/Com.php',
-        'ORG' => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu',
-            2 => '/^[\x{002d}0-9a-zóąćęłńśźż]{1,63}$/iu',
-            3 => '/^[\x{002d}0-9a-záäåæéëíðóöøúüýþ]{1,63}$/iu',
-            4 => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu',
-            5 => '/^[\x{002d}0-9a-zą�ėęįšūųž]{1,63}$/iu',
-            6 => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu',
-            7 => '/^[\x{002d}0-9a-z��ēģīķļņ�ŗšūž]{1,63}$/iu'),
-        'PE'  => array(1 => '/^[\x{002d}0-9a-zñáéíóúü]{1,63}$/iu'),
-        'PL'  => array(1 => '/^[\x{002d}0-9a-z��ēģīķļņ�ŗšūž]{1,63}$/iu',
-            2 => '/^[\x{002d}а-ик-ш\x{0450}ѓѕјљњќџ]{1,63}$/iu',
-            3 => '/^[\x{002d}0-9a-zâîăşţ]{1,63}$/iu',
-            4 => '/^[\x{002d}0-9а-�ё\x{04C2}]{1,63}$/iu',
-            5 => '/^[\x{002d}0-9a-zàáâèéêìíîòóôùúûċġħż]{1,63}$/iu',
-            6 => '/^[\x{002d}0-9a-zàäåæéêòóôöøü]{1,63}$/iu',
-            7 => '/^[\x{002d}0-9a-zóąćęłńśźż]{1,63}$/iu',
-            8 => '/^[\x{002d}0-9a-zàáâãçéêíòóôõúü]{1,63}$/iu',
-            9 => '/^[\x{002d}0-9a-zâîăşţ]{1,63}$/iu',
-            10=> '/^[\x{002d}0-9a-záäéíóôúý��ĺľňŕšťž]{1,63}$/iu',
-            11=> '/^[\x{002d}0-9a-zçë]{1,63}$/iu',
-            12=> '/^[\x{002d}0-9а-ик-шђјљњћџ]{1,63}$/iu',
-            13=> '/^[\x{002d}0-9a-zć�đšž]{1,63}$/iu',
-            14=> '/^[\x{002d}0-9a-zâçöûüğış]{1,63}$/iu',
-            15=> '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu',
-            16=> '/^[\x{002d}0-9a-zäõöüšž]{1,63}$/iu',
-            17=> '/^[\x{002d}0-9a-zĉ�ĥĵ�ŭ]{1,63}$/iu',
-            18=> '/^[\x{002d}0-9a-zâäéëîô]{1,63}$/iu',
-            19=> '/^[\x{002d}0-9a-zàáâäåæçèéêëìíîïðñòôöøùúûüýć�łńřśš]{1,63}$/iu',
-            20=> '/^[\x{002d}0-9a-zäåæõöøüšž]{1,63}$/iu',
-            21=> '/^[\x{002d}0-9a-zàáçèéìíòóùú]{1,63}$/iu',
-            22=> '/^[\x{002d}0-9a-zàáéíóöúüőű]{1,63}$/iu',
-            23=> '/^[\x{002d}0-9�ά-ώ]{1,63}$/iu',
-            24=> '/^[\x{002d}0-9a-zàáâåæçèéêëðóôöøüþœ]{1,63}$/iu',
-            25=> '/^[\x{002d}0-9a-záäéíóöúüý��ěňřšťůž]{1,63}$/iu',
-            26=> '/^[\x{002d}0-9a-z·àçèéíïòóúü]{1,63}$/iu',
-            27=> '/^[\x{002d}0-9а-ъью�\x{0450}\x{045D}]{1,63}$/iu',
-            28=> '/^[\x{002d}0-9а-�ёіў]{1,63}$/iu',
-            29=> '/^[\x{002d}0-9a-zą�ėęįšūųž]{1,63}$/iu',
-            30=> '/^[\x{002d}0-9a-záäåæéëíðóöøúüýþ]{1,63}$/iu',
-            31=> '/^[\x{002d}0-9a-zàâæçèéêëîïñôùûüÿœ]{1,63}$/iu',
-            32=> '/^[\x{002d}0-9а-щъыь�ю�ёєіїґ]{1,63}$/iu',
-            33=> '/^[\x{002d}0-9�-ת]{1,63}$/iu'),
-        'PR'  => array(1 => '/^[\x{002d}0-9a-záéíóúñäëïüöâêîôûàèùæçœãõ]{1,63}$/iu'),
-        'PT'  => array(1 => '/^[\x{002d}0-9a-záàâãçéêíóôõú]{1,63}$/iu'),
-        'RU'  => array(1 => '/^[\x{002d}0-9а-�ё]{1,63}$/iu'),
-        'SA'  => array(1 => '/^[\x{002d}.0-9\x{0621}-\x{063A}\x{0641}-\x{064A}\x{0660}-\x{0669}]{1,63}$/iu'),
-        'SE'  => array(1 => '/^[\x{002d}0-9a-zäåéöü]{1,63}$/iu'),
-        'SH'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăą�ćĉ�ċ�đĕěėęēğ�ġģĥħĭĩįīıĵķĺľļłńňņŋ�ő�œĸŕřŗś�šşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
-        'SJ'  => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøü�đńŋšŧž]{1,63}$/iu'),
-        'TH'  => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'),
-        'TM'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ�ăąćĉċ��đēėęě�ġģĥħīįĵķĺļľŀłńņňŋőœŕŗřś�şšţťŧūŭůűųŵŷźżž]{1,63}$/iu'),
-        'TW'  => 'Zend/Validate/Hostname/Cn.php',
-        'TR'  => array(1 => '/^[\x{002d}0-9a-zğıüşöç]{1,63}$/iu'),
-        'VE'  => array(1 => '/^[\x{002d}0-9a-záéíóúüñ]{1,63}$/iu'),
-        'VN'  => array(1 => '/^[À�ÂÃÈÉÊÌ�ÒÓÔÕÙÚ�àáâãèéêìíòóôõùúýĂă�đĨĩŨũƠơƯư\x{1EA0}-\x{1EF9}]{1,63}$/iu'),
-        'ایران' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
-        '中国' => 'Zend/Validate/Hostname/Cn.php',
-        '公�' => 'Zend/Validate/Hostname/Cn.php',
-        '网络' => 'Zend/Validate/Hostname/Cn.php'
-    );
-
-    protected $_idnLength = array(
-        'BIZ' => array(5 => 17, 11 => 15, 12 => 20),
-        'CN'  => array(1 => 20),
-        'COM' => array(3 => 17, 5 => 20),
-        'HK'  => array(1 => 15),
-        'INFO'=> array(4 => 17),
-        'KR'  => array(1 => 17),
-        'NET' => array(3 => 17, 5 => 20),
-        'ORG' => array(6 => 17),
-        'TW'  => array(1 => 20),
-        'ایران' => array(1 => 30),
-        '中国' => array(1 => 20),
-        '公�' => array(1 => 20),
-        '网络' => array(1 => 20),
-    );
-
-    protected $_options = array(
-        'allow' => self::ALLOW_DNS,
-        'idn'   => true,
-        'tld'   => true,
-        'ip'    => null
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param integer          $allow       OPTIONAL Set what types of hostname to allow (default ALLOW_DNS)
-     * @param boolean          $validateIdn OPTIONAL Set whether IDN domains are validated (default true)
-     * @param boolean          $validateTld OPTIONAL Set whether the TLD element of a hostname is validated (default true)
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void
-     * @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm  Technical Specifications for ccTLDs
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['allow'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['idn'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['tld'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['ip'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        $options += $this->_options;
-        $this->setOptions($options);
-    }
-
-    /**
-     * Returns all set options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets the options for this validator
-     *
-     * @param array $options
-     * @return Zend_Validate_Hostname
-     */
-    public function setOptions($options)
-    {
-        if (array_key_exists('allow', $options)) {
-            $this->setAllow($options['allow']);
-        }
-
-        if (array_key_exists('idn', $options)) {
-            $this->setValidateIdn($options['idn']);
-        }
-
-        if (array_key_exists('tld', $options)) {
-            $this->setValidateTld($options['tld']);
-        }
-
-        if (array_key_exists('ip', $options)) {
-            $this->setIpValidator($options['ip']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the set ip validator
-     *
-     * @return Zend_Validate_Ip
-     */
-    public function getIpValidator()
-    {
-        return $this->_options['ip'];
-    }
-
-    /**
-     * @param Zend_Validate_Ip $ipValidator OPTIONAL
-     * @return void;
-     */
-    public function setIpValidator(Zend_Validate_Ip $ipValidator = null)
-    {
-        if ($ipValidator === null) {
-            $ipValidator = new Zend_Validate_Ip();
-        }
-
-        $this->_options['ip'] = $ipValidator;
-        return $this;
-    }
-
-    /**
-     * Returns the allow option
-     *
-     * @return integer
-     */
-    public function getAllow()
-    {
-        return $this->_options['allow'];
-    }
-
-    /**
-     * Sets the allow option
-     *
-     * @param  integer $allow
-     * @return Zend_Validate_Hostname Provides a fluent interface
-     */
-    public function setAllow($allow)
-    {
-        $this->_options['allow'] = $allow;
-        return $this;
-    }
-
-    /**
-     * Returns the set idn option
-     *
-     * @return boolean
-     */
-    public function getValidateIdn()
-    {
-        return $this->_options['idn'];
-    }
-
-    /**
-     * Set whether IDN domains are validated
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $allowed Set allowed to true to validate IDNs, and false to not validate them
-     */
-    public function setValidateIdn ($allowed)
-    {
-        $this->_options['idn'] = (bool) $allowed;
-        return $this;
-    }
-
-    /**
-     * Returns the set tld option
-     *
-     * @return boolean
-     */
-    public function getValidateTld()
-    {
-        return $this->_options['tld'];
-    }
-
-    /**
-     * Set whether the TLD element of a hostname is validated
-     *
-     * This only applies when DNS hostnames are validated
-     *
-     * @param boolean $allowed Set allowed to true to validate TLDs, and false to not validate them
-     */
-    public function setValidateTld ($allowed)
-    {
-        $this->_options['tld'] = (bool) $allowed;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the $value is a valid hostname with respect to the current allow option
-     *
-     * @param  string $value
-     * @throws Zend_Validate_Exception if a fatal error occurs for validation process
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        // Check input against IP address schema
-        if (preg_match('/^[0-9.a-e:.]*$/i', $value) &&
-            $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) {
-            if (!($this->_options['allow'] & self::ALLOW_IP)) {
-                $this->_error(self::IP_ADDRESS_NOT_ALLOWED);
-                return false;
-            } else {
-                return true;
-            }
-        }
-
-        // Check input against DNS hostname schema
-        $domainParts = explode('.', $value);
-        if ((count($domainParts) > 1) && (strlen($value) >= 4) && (strlen($value) <= 254)) {
-            $status = false;
-
-            $origenc = iconv_get_encoding('internal_encoding');
-            iconv_set_encoding('internal_encoding', 'UTF-8');
-            do {
-                // First check TLD
-                $matches = array();
-                if (preg_match('/([^.]{2,10})$/i', end($domainParts), $matches) ||
-                    (end($domainParts) == 'ایران') || (end($domainParts) == '中国') ||
-                    (end($domainParts) == '公�') || (end($domainParts) == '网络')) {
-
-                    reset($domainParts);
-
-                    // Hostname characters are: *(label dot)(label dot label); max 254 chars
-                    // label: id-prefix [*ldh{61} id-prefix]; max 63 chars
-                    // id-prefix: alpha / digit
-                    // ldh: alpha / digit / dash
-
-                    // Match TLD against known list
-                    $this->_tld = strtolower($matches[1]);
-                    if ($this->_options['tld']) {
-                        if (!in_array($this->_tld, $this->_validTlds)) {
-                            $this->_error(self::UNKNOWN_TLD);
-                            $status = false;
-                            break;
-                        }
-                    }
-
-                    /**
-                     * Match against IDN hostnames
-                     * Note: Keep label regex short to avoid issues with long patterns when matching IDN hostnames
-                     * @see Zend_Validate_Hostname_Interface
-                     */
-                    $regexChars = array(0 => '/^[a-z0-9\x2d]{1,63}$/i');
-                    if ($this->_options['idn'] &&  isset($this->_validIdns[strtoupper($this->_tld)])) {
-                        if (is_string($this->_validIdns[strtoupper($this->_tld)])) {
-                            $regexChars += include($this->_validIdns[strtoupper($this->_tld)]);
-                        } else {
-                            $regexChars += $this->_validIdns[strtoupper($this->_tld)];
-                        }
-                    }
-
-                    // Check each hostname part
-                    $check = 0;
-                    foreach ($domainParts as $domainPart) {
-                        // Decode Punycode domainnames to IDN
-                        if (strpos($domainPart, 'xn--') === 0) {
-                            $domainPart = $this->decodePunycode(substr($domainPart, 4));
-                            if ($domainPart === false) {
-                                return false;
-                            }
-                        }
-
-                        // Check dash (-) does not start, end or appear in 3rd and 4th positions
-                        if ((strpos($domainPart, '-') === 0)
-                            || ((strlen($domainPart) > 2) && (strpos($domainPart, '-', 2) == 2) && (strpos($domainPart, '-', 3) == 3))
-                            || (strpos($domainPart, '-') === (strlen($domainPart) - 1))) {
-                                $this->_error(self::INVALID_DASH);
-                            $status = false;
-                            break 2;
-                        }
-
-                        // Check each domain part
-                        $checked = false;
-                        foreach($regexChars as $regexKey => $regexChar) {
-                            $status = @preg_match($regexChar, $domainPart);
-                            if ($status > 0) {
-                                $length = 63;
-                                if (array_key_exists(strtoupper($this->_tld), $this->_idnLength)
-                                    && (array_key_exists($regexKey, $this->_idnLength[strtoupper($this->_tld)]))) {
-                                    $length = $this->_idnLength[strtoupper($this->_tld)];
-                                }
-
-                                if (iconv_strlen($domainPart, 'UTF-8') > $length) {
-                                    $this->_error(self::INVALID_HOSTNAME);
-                                } else {
-                                    $checked = true;
-                                    break;
-                                }
-                            }
-                        }
-
-                        if ($checked) {
-                            ++$check;
-                        }
-                    }
-
-                    // If one of the labels doesn't match, the hostname is invalid
-                    if ($check !== count($domainParts)) {
-                        $this->_error(self::INVALID_HOSTNAME_SCHEMA);
-                        $status = false;
-                    }
-                } else {
-                    // Hostname not long enough
-                    $this->_error(self::UNDECIPHERABLE_TLD);
-                    $status = false;
-                }
-            } while (false);
-
-            iconv_set_encoding('internal_encoding', $origenc);
-            // If the input passes as an Internet domain name, and domain names are allowed, then the hostname
-            // passes validation
-            if ($status && ($this->_options['allow'] & self::ALLOW_DNS)) {
-                return true;
-            }
-        } else if ($this->_options['allow'] & self::ALLOW_DNS) {
-            $this->_error(self::INVALID_HOSTNAME);
-        }
-
-        // Check input against local network name schema; last chance to pass validation
-        $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/';
-        $status = @preg_match($regexLocal, $value);
-
-        // If the input passes as a local network name, and local network names are allowed, then the
-        // hostname passes validation
-        $allowLocal = $this->_options['allow'] & self::ALLOW_LOCAL;
-        if ($status && $allowLocal) {
-            return true;
-        }
-
-        // If the input does not pass as a local network name, add a message
-        if (!$status) {
-            $this->_error(self::INVALID_LOCAL_NAME);
-        }
-
-        // If local network names are not allowed, add a message
-        if ($status && !$allowLocal) {
-            $this->_error(self::LOCAL_NAME_NOT_ALLOWED);
-        }
-
-        return false;
-    }
-
-    /**
-     * Decodes a punycode encoded string to it's original utf8 string
-     * In case of a decoding failure the original string is returned
-     *
-     * @param  string $encoded Punycode encoded string to decode
-     * @return string
-     */
-    protected function decodePunycode($encoded)
-    {
-        $found = preg_match('/([^a-z0-9\x2d]{1,10})$/i', $encoded);
-        if (empty($encoded) || ($found > 0)) {
-            // no punycode encoded string, return as is
-            $this->_error(self::CANNOT_DECODE_PUNYCODE);
-            return false;
-        }
-
-        $separator = strrpos($encoded, '-');
-        if ($separator > 0) {
-            for ($x = 0; $x < $separator; ++$x) {
-                // prepare decoding matrix
-                $decoded[] = ord($encoded[$x]);
-            }
-        } else {
-            $this->_error(self::CANNOT_DECODE_PUNYCODE);
-            return false;
-        }
-
-        $lengthd = count($decoded);
-        $lengthe = strlen($encoded);
-
-        // decoding
-        $init  = true;
-        $base  = 72;
-        $index = 0;
-        $char  = 0x80;
-
-        for ($indexe = ($separator) ? ($separator + 1) : 0; $indexe < $lengthe; ++$lengthd) {
-            for ($old_index = $index, $pos = 1, $key = 36; 1 ; $key += 36) {
-                $hex   = ord($encoded[$indexe++]);
-                $digit = ($hex - 48 < 10) ? $hex - 22
-                       : (($hex - 65 < 26) ? $hex - 65
-                       : (($hex - 97 < 26) ? $hex - 97
-                       : 36));
-
-                $index += $digit * $pos;
-                $tag    = ($key <= $base) ? 1 : (($key >= $base + 26) ? 26 : ($key - $base));
-                if ($digit < $tag) {
-                    break;
-                }
-
-                $pos = (int) ($pos * (36 - $tag));
-            }
-
-            $delta   = intval($init ? (($index - $old_index) / 700) : (($index - $old_index) / 2));
-            $delta  += intval($delta / ($lengthd + 1));
-            for ($key = 0; $delta > 910 / 2; $key += 36) {
-                $delta = intval($delta / 35);
-            }
-
-            $base   = intval($key + 36 * $delta / ($delta + 38));
-            $init   = false;
-            $char  += (int) ($index / ($lengthd + 1));
-            $index %= ($lengthd + 1);
-            if ($lengthd > 0) {
-                for ($i = $lengthd; $i > $index; $i--) {
-                    $decoded[$i] = $decoded[($i - 1)];
-                }
-            }
-
-            $decoded[$index++] = $char;
-        }
-
-        // convert decoded ucs4 to utf8 string
-        foreach ($decoded as $key => $value) {
-            if ($value < 128) {
-                $decoded[$key] = chr($value);
-            } elseif ($value < (1 << 11)) {
-                $decoded[$key]  = chr(192 + ($value >> 6));
-                $decoded[$key] .= chr(128 + ($value & 63));
-            } elseif ($value < (1 << 16)) {
-                $decoded[$key]  = chr(224 + ($value >> 12));
-                $decoded[$key] .= chr(128 + (($value >> 6) & 63));
-                $decoded[$key] .= chr(128 + ($value & 63));
-            } elseif ($value < (1 << 21)) {
-                $decoded[$key]  = chr(240 + ($value >> 18));
-                $decoded[$key] .= chr(128 + (($value >> 12) & 63));
-                $decoded[$key] .= chr(128 + (($value >> 6) & 63));
-                $decoded[$key] .= chr(128 + ($value & 63));
-            } else {
-                $this->_error(self::CANNOT_DECODE_PUNYCODE);
-                return false;
-            }
-        }
-
-        return implode($decoded);
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Hostname/Biz.php b/airtime_mvc/library/Zend/Validate/Hostname/Biz.php
deleted file mode 100644
index 38762217d..000000000
--- a/airtime_mvc/library/Zend/Validate/Hostname/Biz.php
+++ /dev/null
@@ -1,2917 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Biz.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Ressource file for biz idn validation
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-return array(
-    1  => '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu',
-    2  => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu',
-    3  => '/^[\x{002d}0-9a-záéíóöúüőű]{1,63}$/iu',
-    4  => '/^[\x{002d}0-9a-záæéíðóöúýþ]{1,63}$/iu',
-    5  => '/^[\x{AC00}-\x{D7A3}]{1,17}$/iu',
-    6  => '/^[\x{002d}0-9a-zą�ėęįšūųž]{1,63}$/iu',
-    7  => '/^[\x{002d}0-9a-z��ēģīķļņ�ŗšūž]{1,63}$/iu',
-    8  => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøü�đńŋšŧž]{1,63}$/iu',
-    9  => '/^[\x{002d}0-9a-zóąćęłńśźż]{1,63}$/iu',
-    10 => '/^[\x{002d}0-9a-záàâãçéêíóôõú]{1,63}$/iu',
-    11 => '/^[\x{002d}0-9a-z\x{3005}-\x{3007}\x{3041}-\x{3093}\x{309D}\x{309E}\x{30A1}-\x{30F6}\x{30FC}' .
-'\x{30FD}\x{30FE}\x{4E00}\x{4E01}\x{4E03}\x{4E07}\x{4E08}\x{4E09}\x{4E0A}' .
-'\x{4E0B}\x{4E0D}\x{4E0E}\x{4E10}\x{4E11}\x{4E14}\x{4E15}\x{4E16}\x{4E17}' .
-'\x{4E18}\x{4E19}\x{4E1E}\x{4E21}\x{4E26}\x{4E2A}\x{4E2D}\x{4E31}\x{4E32}' .
-'\x{4E36}\x{4E38}\x{4E39}\x{4E3B}\x{4E3C}\x{4E3F}\x{4E42}\x{4E43}\x{4E45}' .
-'\x{4E4B}\x{4E4D}\x{4E4E}\x{4E4F}\x{4E55}\x{4E56}\x{4E57}\x{4E58}\x{4E59}' .
-'\x{4E5D}\x{4E5E}\x{4E5F}\x{4E62}\x{4E71}\x{4E73}\x{4E7E}\x{4E80}\x{4E82}' .
-'\x{4E85}\x{4E86}\x{4E88}\x{4E89}\x{4E8A}\x{4E8B}\x{4E8C}\x{4E8E}\x{4E91}' .
-'\x{4E92}\x{4E94}\x{4E95}\x{4E98}\x{4E99}\x{4E9B}\x{4E9C}\x{4E9E}\x{4E9F}' .
-'\x{4EA0}\x{4EA1}\x{4EA2}\x{4EA4}\x{4EA5}\x{4EA6}\x{4EA8}\x{4EAB}\x{4EAC}' .
-'\x{4EAD}\x{4EAE}\x{4EB0}\x{4EB3}\x{4EB6}\x{4EBA}\x{4EC0}\x{4EC1}\x{4EC2}' .
-'\x{4EC4}\x{4EC6}\x{4EC7}\x{4ECA}\x{4ECB}\x{4ECD}\x{4ECE}\x{4ECF}\x{4ED4}' .
-'\x{4ED5}\x{4ED6}\x{4ED7}\x{4ED8}\x{4ED9}\x{4EDD}\x{4EDE}\x{4EDF}\x{4EE3}' .
-'\x{4EE4}\x{4EE5}\x{4EED}\x{4EEE}\x{4EF0}\x{4EF2}\x{4EF6}\x{4EF7}\x{4EFB}' .
-'\x{4F01}\x{4F09}\x{4F0A}\x{4F0D}\x{4F0E}\x{4F0F}\x{4F10}\x{4F11}\x{4F1A}' .
-'\x{4F1C}\x{4F1D}\x{4F2F}\x{4F30}\x{4F34}\x{4F36}\x{4F38}\x{4F3A}\x{4F3C}' .
-'\x{4F3D}\x{4F43}\x{4F46}\x{4F47}\x{4F4D}\x{4F4E}\x{4F4F}\x{4F50}\x{4F51}' .
-'\x{4F53}\x{4F55}\x{4F57}\x{4F59}\x{4F5A}\x{4F5B}\x{4F5C}\x{4F5D}\x{4F5E}' .
-'\x{4F69}\x{4F6F}\x{4F70}\x{4F73}\x{4F75}\x{4F76}\x{4F7B}\x{4F7C}\x{4F7F}' .
-'\x{4F83}\x{4F86}\x{4F88}\x{4F8B}\x{4F8D}\x{4F8F}\x{4F91}\x{4F96}\x{4F98}' .
-'\x{4F9B}\x{4F9D}\x{4FA0}\x{4FA1}\x{4FAB}\x{4FAD}\x{4FAE}\x{4FAF}\x{4FB5}' .
-'\x{4FB6}\x{4FBF}\x{4FC2}\x{4FC3}\x{4FC4}\x{4FCA}\x{4FCE}\x{4FD0}\x{4FD1}' .
-'\x{4FD4}\x{4FD7}\x{4FD8}\x{4FDA}\x{4FDB}\x{4FDD}\x{4FDF}\x{4FE1}\x{4FE3}' .
-'\x{4FE4}\x{4FE5}\x{4FEE}\x{4FEF}\x{4FF3}\x{4FF5}\x{4FF6}\x{4FF8}\x{4FFA}' .
-'\x{4FFE}\x{5005}\x{5006}\x{5009}\x{500B}\x{500D}\x{500F}\x{5011}\x{5012}' .
-'\x{5014}\x{5016}\x{5019}\x{501A}\x{501F}\x{5021}\x{5023}\x{5024}\x{5025}' .
-'\x{5026}\x{5028}\x{5029}\x{502A}\x{502B}\x{502C}\x{502D}\x{5036}\x{5039}' .
-'\x{5043}\x{5047}\x{5048}\x{5049}\x{504F}\x{5050}\x{5055}\x{5056}\x{505A}' .
-'\x{505C}\x{5065}\x{506C}\x{5072}\x{5074}\x{5075}\x{5076}\x{5078}\x{507D}' .
-'\x{5080}\x{5085}\x{508D}\x{5091}\x{5098}\x{5099}\x{509A}\x{50AC}\x{50AD}' .
-'\x{50B2}\x{50B3}\x{50B4}\x{50B5}\x{50B7}\x{50BE}\x{50C2}\x{50C5}\x{50C9}' .
-'\x{50CA}\x{50CD}\x{50CF}\x{50D1}\x{50D5}\x{50D6}\x{50DA}\x{50DE}\x{50E3}' .
-'\x{50E5}\x{50E7}\x{50ED}\x{50EE}\x{50F5}\x{50F9}\x{50FB}\x{5100}\x{5101}' .
-'\x{5102}\x{5104}\x{5109}\x{5112}\x{5114}\x{5115}\x{5116}\x{5118}\x{511A}' .
-'\x{511F}\x{5121}\x{512A}\x{5132}\x{5137}\x{513A}\x{513B}\x{513C}\x{513F}' .
-'\x{5140}\x{5141}\x{5143}\x{5144}\x{5145}\x{5146}\x{5147}\x{5148}\x{5149}' .
-'\x{514B}\x{514C}\x{514D}\x{514E}\x{5150}\x{5152}\x{5154}\x{515A}\x{515C}' .
-'\x{5162}\x{5165}\x{5168}\x{5169}\x{516A}\x{516B}\x{516C}\x{516D}\x{516E}' .
-'\x{5171}\x{5175}\x{5176}\x{5177}\x{5178}\x{517C}\x{5180}\x{5182}\x{5185}' .
-'\x{5186}\x{5189}\x{518A}\x{518C}\x{518D}\x{518F}\x{5190}\x{5191}\x{5192}' .
-'\x{5193}\x{5195}\x{5196}\x{5197}\x{5199}\x{51A0}\x{51A2}\x{51A4}\x{51A5}' .
-'\x{51A6}\x{51A8}\x{51A9}\x{51AA}\x{51AB}\x{51AC}\x{51B0}\x{51B1}\x{51B2}' .
-'\x{51B3}\x{51B4}\x{51B5}\x{51B6}\x{51B7}\x{51BD}\x{51C4}\x{51C5}\x{51C6}' .
-'\x{51C9}\x{51CB}\x{51CC}\x{51CD}\x{51D6}\x{51DB}\x{51DC}\x{51DD}\x{51E0}' .
-'\x{51E1}\x{51E6}\x{51E7}\x{51E9}\x{51EA}\x{51ED}\x{51F0}\x{51F1}\x{51F5}' .
-'\x{51F6}\x{51F8}\x{51F9}\x{51FA}\x{51FD}\x{51FE}\x{5200}\x{5203}\x{5204}' .
-'\x{5206}\x{5207}\x{5208}\x{520A}\x{520B}\x{520E}\x{5211}\x{5214}\x{5217}' .
-'\x{521D}\x{5224}\x{5225}\x{5227}\x{5229}\x{522A}\x{522E}\x{5230}\x{5233}' .
-'\x{5236}\x{5237}\x{5238}\x{5239}\x{523A}\x{523B}\x{5243}\x{5244}\x{5247}' .
-'\x{524A}\x{524B}\x{524C}\x{524D}\x{524F}\x{5254}\x{5256}\x{525B}\x{525E}' .
-'\x{5263}\x{5264}\x{5265}\x{5269}\x{526A}\x{526F}\x{5270}\x{5271}\x{5272}' .
-'\x{5273}\x{5274}\x{5275}\x{527D}\x{527F}\x{5283}\x{5287}\x{5288}\x{5289}' .
-'\x{528D}\x{5291}\x{5292}\x{5294}\x{529B}\x{529F}\x{52A0}\x{52A3}\x{52A9}' .
-'\x{52AA}\x{52AB}\x{52AC}\x{52AD}\x{52B1}\x{52B4}\x{52B5}\x{52B9}\x{52BC}' .
-'\x{52BE}\x{52C1}\x{52C3}\x{52C5}\x{52C7}\x{52C9}\x{52CD}\x{52D2}\x{52D5}' .
-'\x{52D7}\x{52D8}\x{52D9}\x{52DD}\x{52DE}\x{52DF}\x{52E0}\x{52E2}\x{52E3}' .
-'\x{52E4}\x{52E6}\x{52E7}\x{52F2}\x{52F3}\x{52F5}\x{52F8}\x{52F9}\x{52FA}' .
-'\x{52FE}\x{52FF}\x{5301}\x{5302}\x{5305}\x{5306}\x{5308}\x{530D}\x{530F}' .
-'\x{5310}\x{5315}\x{5316}\x{5317}\x{5319}\x{531A}\x{531D}\x{5320}\x{5321}' .
-'\x{5323}\x{532A}\x{532F}\x{5331}\x{5333}\x{5338}\x{5339}\x{533A}\x{533B}' .
-'\x{533F}\x{5340}\x{5341}\x{5343}\x{5345}\x{5346}\x{5347}\x{5348}\x{5349}' .
-'\x{534A}\x{534D}\x{5351}\x{5352}\x{5353}\x{5354}\x{5357}\x{5358}\x{535A}' .
-'\x{535C}\x{535E}\x{5360}\x{5366}\x{5369}\x{536E}\x{536F}\x{5370}\x{5371}' .
-'\x{5373}\x{5374}\x{5375}\x{5377}\x{5378}\x{537B}\x{537F}\x{5382}\x{5384}' .
-'\x{5396}\x{5398}\x{539A}\x{539F}\x{53A0}\x{53A5}\x{53A6}\x{53A8}\x{53A9}' .
-'\x{53AD}\x{53AE}\x{53B0}\x{53B3}\x{53B6}\x{53BB}\x{53C2}\x{53C3}\x{53C8}' .
-'\x{53C9}\x{53CA}\x{53CB}\x{53CC}\x{53CD}\x{53CE}\x{53D4}\x{53D6}\x{53D7}' .
-'\x{53D9}\x{53DB}\x{53DF}\x{53E1}\x{53E2}\x{53E3}\x{53E4}\x{53E5}\x{53E8}' .
-'\x{53E9}\x{53EA}\x{53EB}\x{53EC}\x{53ED}\x{53EE}\x{53EF}\x{53F0}\x{53F1}' .
-'\x{53F2}\x{53F3}\x{53F6}\x{53F7}\x{53F8}\x{53FA}\x{5401}\x{5403}\x{5404}' .
-'\x{5408}\x{5409}\x{540A}\x{540B}\x{540C}\x{540D}\x{540E}\x{540F}\x{5410}' .
-'\x{5411}\x{541B}\x{541D}\x{541F}\x{5420}\x{5426}\x{5429}\x{542B}\x{542C}' .
-'\x{542D}\x{542E}\x{5436}\x{5438}\x{5439}\x{543B}\x{543C}\x{543D}\x{543E}' .
-'\x{5440}\x{5442}\x{5446}\x{5448}\x{5449}\x{544A}\x{544E}\x{5451}\x{545F}' .
-'\x{5468}\x{546A}\x{5470}\x{5471}\x{5473}\x{5475}\x{5476}\x{5477}\x{547B}' .
-'\x{547C}\x{547D}\x{5480}\x{5484}\x{5486}\x{548B}\x{548C}\x{548E}\x{548F}' .
-'\x{5490}\x{5492}\x{54A2}\x{54A4}\x{54A5}\x{54A8}\x{54AB}\x{54AC}\x{54AF}' .
-'\x{54B2}\x{54B3}\x{54B8}\x{54BC}\x{54BD}\x{54BE}\x{54C0}\x{54C1}\x{54C2}' .
-'\x{54C4}\x{54C7}\x{54C8}\x{54C9}\x{54D8}\x{54E1}\x{54E2}\x{54E5}\x{54E6}' .
-'\x{54E8}\x{54E9}\x{54ED}\x{54EE}\x{54F2}\x{54FA}\x{54FD}\x{5504}\x{5506}' .
-'\x{5507}\x{550F}\x{5510}\x{5514}\x{5516}\x{552E}\x{552F}\x{5531}\x{5533}' .
-'\x{5538}\x{5539}\x{553E}\x{5540}\x{5544}\x{5545}\x{5546}\x{554C}\x{554F}' .
-'\x{5553}\x{5556}\x{5557}\x{555C}\x{555D}\x{5563}\x{557B}\x{557C}\x{557E}' .
-'\x{5580}\x{5583}\x{5584}\x{5587}\x{5589}\x{558A}\x{558B}\x{5598}\x{5599}' .
-'\x{559A}\x{559C}\x{559D}\x{559E}\x{559F}\x{55A7}\x{55A8}\x{55A9}\x{55AA}' .
-'\x{55AB}\x{55AC}\x{55AE}\x{55B0}\x{55B6}\x{55C4}\x{55C5}\x{55C7}\x{55D4}' .
-'\x{55DA}\x{55DC}\x{55DF}\x{55E3}\x{55E4}\x{55F7}\x{55F9}\x{55FD}\x{55FE}' .
-'\x{5606}\x{5609}\x{5614}\x{5616}\x{5617}\x{5618}\x{561B}\x{5629}\x{562F}' .
-'\x{5631}\x{5632}\x{5634}\x{5636}\x{5638}\x{5642}\x{564C}\x{564E}\x{5650}' .
-'\x{565B}\x{5664}\x{5668}\x{566A}\x{566B}\x{566C}\x{5674}\x{5678}\x{567A}' .
-'\x{5680}\x{5686}\x{5687}\x{568A}\x{568F}\x{5694}\x{56A0}\x{56A2}\x{56A5}' .
-'\x{56AE}\x{56B4}\x{56B6}\x{56BC}\x{56C0}\x{56C1}\x{56C2}\x{56C3}\x{56C8}' .
-'\x{56CE}\x{56D1}\x{56D3}\x{56D7}\x{56D8}\x{56DA}\x{56DB}\x{56DE}\x{56E0}' .
-'\x{56E3}\x{56EE}\x{56F0}\x{56F2}\x{56F3}\x{56F9}\x{56FA}\x{56FD}\x{56FF}' .
-'\x{5700}\x{5703}\x{5704}\x{5708}\x{5709}\x{570B}\x{570D}\x{570F}\x{5712}' .
-'\x{5713}\x{5716}\x{5718}\x{571C}\x{571F}\x{5726}\x{5727}\x{5728}\x{572D}' .
-'\x{5730}\x{5737}\x{5738}\x{573B}\x{5740}\x{5742}\x{5747}\x{574A}\x{574E}' .
-'\x{574F}\x{5750}\x{5751}\x{5761}\x{5764}\x{5766}\x{5769}\x{576A}\x{577F}' .
-'\x{5782}\x{5788}\x{5789}\x{578B}\x{5793}\x{57A0}\x{57A2}\x{57A3}\x{57A4}' .
-'\x{57AA}\x{57B0}\x{57B3}\x{57C0}\x{57C3}\x{57C6}\x{57CB}\x{57CE}\x{57D2}' .
-'\x{57D3}\x{57D4}\x{57D6}\x{57DC}\x{57DF}\x{57E0}\x{57E3}\x{57F4}\x{57F7}' .
-'\x{57F9}\x{57FA}\x{57FC}\x{5800}\x{5802}\x{5805}\x{5806}\x{580A}\x{580B}' .
-'\x{5815}\x{5819}\x{581D}\x{5821}\x{5824}\x{582A}\x{582F}\x{5830}\x{5831}' .
-'\x{5834}\x{5835}\x{583A}\x{583D}\x{5840}\x{5841}\x{584A}\x{584B}\x{5851}' .
-'\x{5852}\x{5854}\x{5857}\x{5858}\x{5859}\x{585A}\x{585E}\x{5862}\x{5869}' .
-'\x{586B}\x{5870}\x{5872}\x{5875}\x{5879}\x{587E}\x{5883}\x{5885}\x{5893}' .
-'\x{5897}\x{589C}\x{589F}\x{58A8}\x{58AB}\x{58AE}\x{58B3}\x{58B8}\x{58B9}' .
-'\x{58BA}\x{58BB}\x{58BE}\x{58C1}\x{58C5}\x{58C7}\x{58CA}\x{58CC}\x{58D1}' .
-'\x{58D3}\x{58D5}\x{58D7}\x{58D8}\x{58D9}\x{58DC}\x{58DE}\x{58DF}\x{58E4}' .
-'\x{58E5}\x{58EB}\x{58EC}\x{58EE}\x{58EF}\x{58F0}\x{58F1}\x{58F2}\x{58F7}' .
-'\x{58F9}\x{58FA}\x{58FB}\x{58FC}\x{58FD}\x{5902}\x{5909}\x{590A}\x{590F}' .
-'\x{5910}\x{5915}\x{5916}\x{5918}\x{5919}\x{591A}\x{591B}\x{591C}\x{5922}' .
-'\x{5925}\x{5927}\x{5929}\x{592A}\x{592B}\x{592C}\x{592D}\x{592E}\x{5931}' .
-'\x{5932}\x{5937}\x{5938}\x{593E}\x{5944}\x{5947}\x{5948}\x{5949}\x{594E}' .
-'\x{594F}\x{5950}\x{5951}\x{5954}\x{5955}\x{5957}\x{5958}\x{595A}\x{5960}' .
-'\x{5962}\x{5965}\x{5967}\x{5968}\x{5969}\x{596A}\x{596C}\x{596E}\x{5973}' .
-'\x{5974}\x{5978}\x{597D}\x{5981}\x{5982}\x{5983}\x{5984}\x{598A}\x{598D}' .
-'\x{5993}\x{5996}\x{5999}\x{599B}\x{599D}\x{59A3}\x{59A5}\x{59A8}\x{59AC}' .
-'\x{59B2}\x{59B9}\x{59BB}\x{59BE}\x{59C6}\x{59C9}\x{59CB}\x{59D0}\x{59D1}' .
-'\x{59D3}\x{59D4}\x{59D9}\x{59DA}\x{59DC}\x{59E5}\x{59E6}\x{59E8}\x{59EA}' .
-'\x{59EB}\x{59F6}\x{59FB}\x{59FF}\x{5A01}\x{5A03}\x{5A09}\x{5A11}\x{5A18}' .
-'\x{5A1A}\x{5A1C}\x{5A1F}\x{5A20}\x{5A25}\x{5A29}\x{5A2F}\x{5A35}\x{5A36}' .
-'\x{5A3C}\x{5A40}\x{5A41}\x{5A46}\x{5A49}\x{5A5A}\x{5A62}\x{5A66}\x{5A6A}' .
-'\x{5A6C}\x{5A7F}\x{5A92}\x{5A9A}\x{5A9B}\x{5ABC}\x{5ABD}\x{5ABE}\x{5AC1}' .
-'\x{5AC2}\x{5AC9}\x{5ACB}\x{5ACC}\x{5AD0}\x{5AD6}\x{5AD7}\x{5AE1}\x{5AE3}' .
-'\x{5AE6}\x{5AE9}\x{5AFA}\x{5AFB}\x{5B09}\x{5B0B}\x{5B0C}\x{5B16}\x{5B22}' .
-'\x{5B2A}\x{5B2C}\x{5B30}\x{5B32}\x{5B36}\x{5B3E}\x{5B40}\x{5B43}\x{5B45}' .
-'\x{5B50}\x{5B51}\x{5B54}\x{5B55}\x{5B57}\x{5B58}\x{5B5A}\x{5B5B}\x{5B5C}' .
-'\x{5B5D}\x{5B5F}\x{5B63}\x{5B64}\x{5B65}\x{5B66}\x{5B69}\x{5B6B}\x{5B70}' .
-'\x{5B71}\x{5B73}\x{5B75}\x{5B78}\x{5B7A}\x{5B80}\x{5B83}\x{5B85}\x{5B87}' .
-'\x{5B88}\x{5B89}\x{5B8B}\x{5B8C}\x{5B8D}\x{5B8F}\x{5B95}\x{5B97}\x{5B98}' .
-'\x{5B99}\x{5B9A}\x{5B9B}\x{5B9C}\x{5B9D}\x{5B9F}\x{5BA2}\x{5BA3}\x{5BA4}' .
-'\x{5BA5}\x{5BA6}\x{5BAE}\x{5BB0}\x{5BB3}\x{5BB4}\x{5BB5}\x{5BB6}\x{5BB8}' .
-'\x{5BB9}\x{5BBF}\x{5BC2}\x{5BC3}\x{5BC4}\x{5BC5}\x{5BC6}\x{5BC7}\x{5BC9}' .
-'\x{5BCC}\x{5BD0}\x{5BD2}\x{5BD3}\x{5BD4}\x{5BDB}\x{5BDD}\x{5BDE}\x{5BDF}' .
-'\x{5BE1}\x{5BE2}\x{5BE4}\x{5BE5}\x{5BE6}\x{5BE7}\x{5BE8}\x{5BE9}\x{5BEB}' .
-'\x{5BEE}\x{5BF0}\x{5BF3}\x{5BF5}\x{5BF6}\x{5BF8}\x{5BFA}\x{5BFE}\x{5BFF}' .
-'\x{5C01}\x{5C02}\x{5C04}\x{5C05}\x{5C06}\x{5C07}\x{5C08}\x{5C09}\x{5C0A}' .
-'\x{5C0B}\x{5C0D}\x{5C0E}\x{5C0F}\x{5C11}\x{5C13}\x{5C16}\x{5C1A}\x{5C20}' .
-'\x{5C22}\x{5C24}\x{5C28}\x{5C2D}\x{5C31}\x{5C38}\x{5C39}\x{5C3A}\x{5C3B}' .
-'\x{5C3C}\x{5C3D}\x{5C3E}\x{5C3F}\x{5C40}\x{5C41}\x{5C45}\x{5C46}\x{5C48}' .
-'\x{5C4A}\x{5C4B}\x{5C4D}\x{5C4E}\x{5C4F}\x{5C50}\x{5C51}\x{5C53}\x{5C55}' .
-'\x{5C5E}\x{5C60}\x{5C61}\x{5C64}\x{5C65}\x{5C6C}\x{5C6E}\x{5C6F}\x{5C71}' .
-'\x{5C76}\x{5C79}\x{5C8C}\x{5C90}\x{5C91}\x{5C94}\x{5CA1}\x{5CA8}\x{5CA9}' .
-'\x{5CAB}\x{5CAC}\x{5CB1}\x{5CB3}\x{5CB6}\x{5CB7}\x{5CB8}\x{5CBB}\x{5CBC}' .
-'\x{5CBE}\x{5CC5}\x{5CC7}\x{5CD9}\x{5CE0}\x{5CE1}\x{5CE8}\x{5CE9}\x{5CEA}' .
-'\x{5CED}\x{5CEF}\x{5CF0}\x{5CF6}\x{5CFA}\x{5CFB}\x{5CFD}\x{5D07}\x{5D0B}' .
-'\x{5D0E}\x{5D11}\x{5D14}\x{5D15}\x{5D16}\x{5D17}\x{5D18}\x{5D19}\x{5D1A}' .
-'\x{5D1B}\x{5D1F}\x{5D22}\x{5D29}\x{5D4B}\x{5D4C}\x{5D4E}\x{5D50}\x{5D52}' .
-'\x{5D5C}\x{5D69}\x{5D6C}\x{5D6F}\x{5D73}\x{5D76}\x{5D82}\x{5D84}\x{5D87}' .
-'\x{5D8B}\x{5D8C}\x{5D90}\x{5D9D}\x{5DA2}\x{5DAC}\x{5DAE}\x{5DB7}\x{5DBA}' .
-'\x{5DBC}\x{5DBD}\x{5DC9}\x{5DCC}\x{5DCD}\x{5DD2}\x{5DD3}\x{5DD6}\x{5DDB}' .
-'\x{5DDD}\x{5DDE}\x{5DE1}\x{5DE3}\x{5DE5}\x{5DE6}\x{5DE7}\x{5DE8}\x{5DEB}' .
-'\x{5DEE}\x{5DF1}\x{5DF2}\x{5DF3}\x{5DF4}\x{5DF5}\x{5DF7}\x{5DFB}\x{5DFD}' .
-'\x{5DFE}\x{5E02}\x{5E03}\x{5E06}\x{5E0B}\x{5E0C}\x{5E11}\x{5E16}\x{5E19}' .
-'\x{5E1A}\x{5E1B}\x{5E1D}\x{5E25}\x{5E2B}\x{5E2D}\x{5E2F}\x{5E30}\x{5E33}' .
-'\x{5E36}\x{5E37}\x{5E38}\x{5E3D}\x{5E40}\x{5E43}\x{5E44}\x{5E45}\x{5E47}' .
-'\x{5E4C}\x{5E4E}\x{5E54}\x{5E55}\x{5E57}\x{5E5F}\x{5E61}\x{5E62}\x{5E63}' .
-'\x{5E64}\x{5E72}\x{5E73}\x{5E74}\x{5E75}\x{5E76}\x{5E78}\x{5E79}\x{5E7A}' .
-'\x{5E7B}\x{5E7C}\x{5E7D}\x{5E7E}\x{5E7F}\x{5E81}\x{5E83}\x{5E84}\x{5E87}' .
-'\x{5E8A}\x{5E8F}\x{5E95}\x{5E96}\x{5E97}\x{5E9A}\x{5E9C}\x{5EA0}\x{5EA6}' .
-'\x{5EA7}\x{5EAB}\x{5EAD}\x{5EB5}\x{5EB6}\x{5EB7}\x{5EB8}\x{5EC1}\x{5EC2}' .
-'\x{5EC3}\x{5EC8}\x{5EC9}\x{5ECA}\x{5ECF}\x{5ED0}\x{5ED3}\x{5ED6}\x{5EDA}' .
-'\x{5EDB}\x{5EDD}\x{5EDF}\x{5EE0}\x{5EE1}\x{5EE2}\x{5EE3}\x{5EE8}\x{5EE9}' .
-'\x{5EEC}\x{5EF0}\x{5EF1}\x{5EF3}\x{5EF4}\x{5EF6}\x{5EF7}\x{5EF8}\x{5EFA}' .
-'\x{5EFB}\x{5EFC}\x{5EFE}\x{5EFF}\x{5F01}\x{5F03}\x{5F04}\x{5F09}\x{5F0A}' .
-'\x{5F0B}\x{5F0C}\x{5F0D}\x{5F0F}\x{5F10}\x{5F11}\x{5F13}\x{5F14}\x{5F15}' .
-'\x{5F16}\x{5F17}\x{5F18}\x{5F1B}\x{5F1F}\x{5F25}\x{5F26}\x{5F27}\x{5F29}' .
-'\x{5F2D}\x{5F2F}\x{5F31}\x{5F35}\x{5F37}\x{5F38}\x{5F3C}\x{5F3E}\x{5F41}' .
-'\x{5F48}\x{5F4A}\x{5F4C}\x{5F4E}\x{5F51}\x{5F53}\x{5F56}\x{5F57}\x{5F59}' .
-'\x{5F5C}\x{5F5D}\x{5F61}\x{5F62}\x{5F66}\x{5F69}\x{5F6A}\x{5F6B}\x{5F6C}' .
-'\x{5F6D}\x{5F70}\x{5F71}\x{5F73}\x{5F77}\x{5F79}\x{5F7C}\x{5F7F}\x{5F80}' .
-'\x{5F81}\x{5F82}\x{5F83}\x{5F84}\x{5F85}\x{5F87}\x{5F88}\x{5F8A}\x{5F8B}' .
-'\x{5F8C}\x{5F90}\x{5F91}\x{5F92}\x{5F93}\x{5F97}\x{5F98}\x{5F99}\x{5F9E}' .
-'\x{5FA0}\x{5FA1}\x{5FA8}\x{5FA9}\x{5FAA}\x{5FAD}\x{5FAE}\x{5FB3}\x{5FB4}' .
-'\x{5FB9}\x{5FBC}\x{5FBD}\x{5FC3}\x{5FC5}\x{5FCC}\x{5FCD}\x{5FD6}\x{5FD7}' .
-'\x{5FD8}\x{5FD9}\x{5FDC}\x{5FDD}\x{5FE0}\x{5FE4}\x{5FEB}\x{5FF0}\x{5FF1}' .
-'\x{5FF5}\x{5FF8}\x{5FFB}\x{5FFD}\x{5FFF}\x{600E}\x{600F}\x{6010}\x{6012}' .
-'\x{6015}\x{6016}\x{6019}\x{601B}\x{601C}\x{601D}\x{6020}\x{6021}\x{6025}' .
-'\x{6026}\x{6027}\x{6028}\x{6029}\x{602A}\x{602B}\x{602F}\x{6031}\x{603A}' .
-'\x{6041}\x{6042}\x{6043}\x{6046}\x{604A}\x{604B}\x{604D}\x{6050}\x{6052}' .
-'\x{6055}\x{6059}\x{605A}\x{605F}\x{6060}\x{6062}\x{6063}\x{6064}\x{6065}' .
-'\x{6068}\x{6069}\x{606A}\x{606B}\x{606C}\x{606D}\x{606F}\x{6070}\x{6075}' .
-'\x{6077}\x{6081}\x{6083}\x{6084}\x{6089}\x{608B}\x{608C}\x{608D}\x{6092}' .
-'\x{6094}\x{6096}\x{6097}\x{609A}\x{609B}\x{609F}\x{60A0}\x{60A3}\x{60A6}' .
-'\x{60A7}\x{60A9}\x{60AA}\x{60B2}\x{60B3}\x{60B4}\x{60B5}\x{60B6}\x{60B8}' .
-'\x{60BC}\x{60BD}\x{60C5}\x{60C6}\x{60C7}\x{60D1}\x{60D3}\x{60D8}\x{60DA}' .
-'\x{60DC}\x{60DF}\x{60E0}\x{60E1}\x{60E3}\x{60E7}\x{60E8}\x{60F0}\x{60F1}' .
-'\x{60F3}\x{60F4}\x{60F6}\x{60F7}\x{60F9}\x{60FA}\x{60FB}\x{6100}\x{6101}' .
-'\x{6103}\x{6106}\x{6108}\x{6109}\x{610D}\x{610E}\x{610F}\x{6115}\x{611A}' .
-'\x{611B}\x{611F}\x{6121}\x{6127}\x{6128}\x{612C}\x{6134}\x{613C}\x{613D}' .
-'\x{613E}\x{613F}\x{6142}\x{6144}\x{6147}\x{6148}\x{614A}\x{614B}\x{614C}' .
-'\x{614D}\x{614E}\x{6153}\x{6155}\x{6158}\x{6159}\x{615A}\x{615D}\x{615F}' .
-'\x{6162}\x{6163}\x{6165}\x{6167}\x{6168}\x{616B}\x{616E}\x{616F}\x{6170}' .
-'\x{6171}\x{6173}\x{6174}\x{6175}\x{6176}\x{6177}\x{617E}\x{6182}\x{6187}' .
-'\x{618A}\x{618E}\x{6190}\x{6191}\x{6194}\x{6196}\x{6199}\x{619A}\x{61A4}' .
-'\x{61A7}\x{61A9}\x{61AB}\x{61AC}\x{61AE}\x{61B2}\x{61B6}\x{61BA}\x{61BE}' .
-'\x{61C3}\x{61C6}\x{61C7}\x{61C8}\x{61C9}\x{61CA}\x{61CB}\x{61CC}\x{61CD}' .
-'\x{61D0}\x{61E3}\x{61E6}\x{61F2}\x{61F4}\x{61F6}\x{61F7}\x{61F8}\x{61FA}' .
-'\x{61FC}\x{61FD}\x{61FE}\x{61FF}\x{6200}\x{6208}\x{6209}\x{620A}\x{620C}' .
-'\x{620D}\x{620E}\x{6210}\x{6211}\x{6212}\x{6214}\x{6216}\x{621A}\x{621B}' .
-'\x{621D}\x{621E}\x{621F}\x{6221}\x{6226}\x{622A}\x{622E}\x{622F}\x{6230}' .
-'\x{6232}\x{6233}\x{6234}\x{6238}\x{623B}\x{623F}\x{6240}\x{6241}\x{6247}' .
-'\x{6248}\x{6249}\x{624B}\x{624D}\x{624E}\x{6253}\x{6255}\x{6258}\x{625B}' .
-'\x{625E}\x{6260}\x{6263}\x{6268}\x{626E}\x{6271}\x{6276}\x{6279}\x{627C}' .
-'\x{627E}\x{627F}\x{6280}\x{6282}\x{6283}\x{6284}\x{6289}\x{628A}\x{6291}' .
-'\x{6292}\x{6293}\x{6294}\x{6295}\x{6296}\x{6297}\x{6298}\x{629B}\x{629C}' .
-'\x{629E}\x{62AB}\x{62AC}\x{62B1}\x{62B5}\x{62B9}\x{62BB}\x{62BC}\x{62BD}' .
-'\x{62C2}\x{62C5}\x{62C6}\x{62C7}\x{62C8}\x{62C9}\x{62CA}\x{62CC}\x{62CD}' .
-'\x{62CF}\x{62D0}\x{62D1}\x{62D2}\x{62D3}\x{62D4}\x{62D7}\x{62D8}\x{62D9}' .
-'\x{62DB}\x{62DC}\x{62DD}\x{62E0}\x{62E1}\x{62EC}\x{62ED}\x{62EE}\x{62EF}' .
-'\x{62F1}\x{62F3}\x{62F5}\x{62F6}\x{62F7}\x{62FE}\x{62FF}\x{6301}\x{6302}' .
-'\x{6307}\x{6308}\x{6309}\x{630C}\x{6311}\x{6319}\x{631F}\x{6327}\x{6328}' .
-'\x{632B}\x{632F}\x{633A}\x{633D}\x{633E}\x{633F}\x{6349}\x{634C}\x{634D}' .
-'\x{634F}\x{6350}\x{6355}\x{6357}\x{635C}\x{6367}\x{6368}\x{6369}\x{636B}' .
-'\x{636E}\x{6372}\x{6376}\x{6377}\x{637A}\x{637B}\x{6380}\x{6383}\x{6388}' .
-'\x{6389}\x{638C}\x{638E}\x{638F}\x{6392}\x{6396}\x{6398}\x{639B}\x{639F}' .
-'\x{63A0}\x{63A1}\x{63A2}\x{63A3}\x{63A5}\x{63A7}\x{63A8}\x{63A9}\x{63AA}' .
-'\x{63AB}\x{63AC}\x{63B2}\x{63B4}\x{63B5}\x{63BB}\x{63BE}\x{63C0}\x{63C3}' .
-'\x{63C4}\x{63C6}\x{63C9}\x{63CF}\x{63D0}\x{63D2}\x{63D6}\x{63DA}\x{63DB}' .
-'\x{63E1}\x{63E3}\x{63E9}\x{63EE}\x{63F4}\x{63F6}\x{63FA}\x{6406}\x{640D}' .
-'\x{640F}\x{6413}\x{6416}\x{6417}\x{641C}\x{6426}\x{6428}\x{642C}\x{642D}' .
-'\x{6434}\x{6436}\x{643A}\x{643E}\x{6442}\x{644E}\x{6458}\x{6467}\x{6469}' .
-'\x{646F}\x{6476}\x{6478}\x{647A}\x{6483}\x{6488}\x{6492}\x{6493}\x{6495}' .
-'\x{649A}\x{649E}\x{64A4}\x{64A5}\x{64A9}\x{64AB}\x{64AD}\x{64AE}\x{64B0}' .
-'\x{64B2}\x{64B9}\x{64BB}\x{64BC}\x{64C1}\x{64C2}\x{64C5}\x{64C7}\x{64CD}' .
-'\x{64D2}\x{64D4}\x{64D8}\x{64DA}\x{64E0}\x{64E1}\x{64E2}\x{64E3}\x{64E6}' .
-'\x{64E7}\x{64EC}\x{64EF}\x{64F1}\x{64F2}\x{64F4}\x{64F6}\x{64FA}\x{64FD}' .
-'\x{64FE}\x{6500}\x{6505}\x{6518}\x{651C}\x{651D}\x{6523}\x{6524}\x{652A}' .
-'\x{652B}\x{652C}\x{652F}\x{6534}\x{6535}\x{6536}\x{6537}\x{6538}\x{6539}' .
-'\x{653B}\x{653E}\x{653F}\x{6545}\x{6548}\x{654D}\x{654F}\x{6551}\x{6555}' .
-'\x{6556}\x{6557}\x{6558}\x{6559}\x{655D}\x{655E}\x{6562}\x{6563}\x{6566}' .
-'\x{656C}\x{6570}\x{6572}\x{6574}\x{6575}\x{6577}\x{6578}\x{6582}\x{6583}' .
-'\x{6587}\x{6588}\x{6589}\x{658C}\x{658E}\x{6590}\x{6591}\x{6597}\x{6599}' .
-'\x{659B}\x{659C}\x{659F}\x{65A1}\x{65A4}\x{65A5}\x{65A7}\x{65AB}\x{65AC}' .
-'\x{65AD}\x{65AF}\x{65B0}\x{65B7}\x{65B9}\x{65BC}\x{65BD}\x{65C1}\x{65C3}' .
-'\x{65C4}\x{65C5}\x{65C6}\x{65CB}\x{65CC}\x{65CF}\x{65D2}\x{65D7}\x{65D9}' .
-'\x{65DB}\x{65E0}\x{65E1}\x{65E2}\x{65E5}\x{65E6}\x{65E7}\x{65E8}\x{65E9}' .
-'\x{65EC}\x{65ED}\x{65F1}\x{65FA}\x{65FB}\x{6602}\x{6603}\x{6606}\x{6607}' .
-'\x{660A}\x{660C}\x{660E}\x{660F}\x{6613}\x{6614}\x{661C}\x{661F}\x{6620}' .
-'\x{6625}\x{6627}\x{6628}\x{662D}\x{662F}\x{6634}\x{6635}\x{6636}\x{663C}' .
-'\x{663F}\x{6641}\x{6642}\x{6643}\x{6644}\x{6649}\x{664B}\x{664F}\x{6652}' .
-'\x{665D}\x{665E}\x{665F}\x{6662}\x{6664}\x{6666}\x{6667}\x{6668}\x{6669}' .
-'\x{666E}\x{666F}\x{6670}\x{6674}\x{6676}\x{667A}\x{6681}\x{6683}\x{6684}' .
-'\x{6687}\x{6688}\x{6689}\x{668E}\x{6691}\x{6696}\x{6697}\x{6698}\x{669D}' .
-'\x{66A2}\x{66A6}\x{66AB}\x{66AE}\x{66B4}\x{66B8}\x{66B9}\x{66BC}\x{66BE}' .
-'\x{66C1}\x{66C4}\x{66C7}\x{66C9}\x{66D6}\x{66D9}\x{66DA}\x{66DC}\x{66DD}' .
-'\x{66E0}\x{66E6}\x{66E9}\x{66F0}\x{66F2}\x{66F3}\x{66F4}\x{66F5}\x{66F7}' .
-'\x{66F8}\x{66F9}\x{66FC}\x{66FD}\x{66FE}\x{66FF}\x{6700}\x{6703}\x{6708}' .
-'\x{6709}\x{670B}\x{670D}\x{670F}\x{6714}\x{6715}\x{6716}\x{6717}\x{671B}' .
-'\x{671D}\x{671E}\x{671F}\x{6726}\x{6727}\x{6728}\x{672A}\x{672B}\x{672C}' .
-'\x{672D}\x{672E}\x{6731}\x{6734}\x{6736}\x{6737}\x{6738}\x{673A}\x{673D}' .
-'\x{673F}\x{6741}\x{6746}\x{6749}\x{674E}\x{674F}\x{6750}\x{6751}\x{6753}' .
-'\x{6756}\x{6759}\x{675C}\x{675E}\x{675F}\x{6760}\x{6761}\x{6762}\x{6763}' .
-'\x{6764}\x{6765}\x{676A}\x{676D}\x{676F}\x{6770}\x{6771}\x{6772}\x{6773}' .
-'\x{6775}\x{6777}\x{677C}\x{677E}\x{677F}\x{6785}\x{6787}\x{6789}\x{678B}' .
-'\x{678C}\x{6790}\x{6795}\x{6797}\x{679A}\x{679C}\x{679D}\x{67A0}\x{67A1}' .
-'\x{67A2}\x{67A6}\x{67A9}\x{67AF}\x{67B3}\x{67B4}\x{67B6}\x{67B7}\x{67B8}' .
-'\x{67B9}\x{67C1}\x{67C4}\x{67C6}\x{67CA}\x{67CE}\x{67CF}\x{67D0}\x{67D1}' .
-'\x{67D3}\x{67D4}\x{67D8}\x{67DA}\x{67DD}\x{67DE}\x{67E2}\x{67E4}\x{67E7}' .
-'\x{67E9}\x{67EC}\x{67EE}\x{67EF}\x{67F1}\x{67F3}\x{67F4}\x{67F5}\x{67FB}' .
-'\x{67FE}\x{67FF}\x{6802}\x{6803}\x{6804}\x{6813}\x{6816}\x{6817}\x{681E}' .
-'\x{6821}\x{6822}\x{6829}\x{682A}\x{682B}\x{6832}\x{6834}\x{6838}\x{6839}' .
-'\x{683C}\x{683D}\x{6840}\x{6841}\x{6842}\x{6843}\x{6846}\x{6848}\x{684D}' .
-'\x{684E}\x{6850}\x{6851}\x{6853}\x{6854}\x{6859}\x{685C}\x{685D}\x{685F}' .
-'\x{6863}\x{6867}\x{6874}\x{6876}\x{6877}\x{687E}\x{687F}\x{6881}\x{6883}' .
-'\x{6885}\x{688D}\x{688F}\x{6893}\x{6894}\x{6897}\x{689B}\x{689D}\x{689F}' .
-'\x{68A0}\x{68A2}\x{68A6}\x{68A7}\x{68A8}\x{68AD}\x{68AF}\x{68B0}\x{68B1}' .
-'\x{68B3}\x{68B5}\x{68B6}\x{68B9}\x{68BA}\x{68BC}\x{68C4}\x{68C6}\x{68C9}' .
-'\x{68CA}\x{68CB}\x{68CD}\x{68D2}\x{68D4}\x{68D5}\x{68D7}\x{68D8}\x{68DA}' .
-'\x{68DF}\x{68E0}\x{68E1}\x{68E3}\x{68E7}\x{68EE}\x{68EF}\x{68F2}\x{68F9}' .
-'\x{68FA}\x{6900}\x{6901}\x{6904}\x{6905}\x{6908}\x{690B}\x{690C}\x{690D}' .
-'\x{690E}\x{690F}\x{6912}\x{6919}\x{691A}\x{691B}\x{691C}\x{6921}\x{6922}' .
-'\x{6923}\x{6925}\x{6926}\x{6928}\x{692A}\x{6930}\x{6934}\x{6936}\x{6939}' .
-'\x{693D}\x{693F}\x{694A}\x{6953}\x{6954}\x{6955}\x{6959}\x{695A}\x{695C}' .
-'\x{695D}\x{695E}\x{6960}\x{6961}\x{6962}\x{696A}\x{696B}\x{696D}\x{696E}' .
-'\x{696F}\x{6973}\x{6974}\x{6975}\x{6977}\x{6978}\x{6979}\x{697C}\x{697D}' .
-'\x{697E}\x{6981}\x{6982}\x{698A}\x{698E}\x{6991}\x{6994}\x{6995}\x{699B}' .
-'\x{699C}\x{69A0}\x{69A7}\x{69AE}\x{69B1}\x{69B2}\x{69B4}\x{69BB}\x{69BE}' .
-'\x{69BF}\x{69C1}\x{69C3}\x{69C7}\x{69CA}\x{69CB}\x{69CC}\x{69CD}\x{69CE}' .
-'\x{69D0}\x{69D3}\x{69D8}\x{69D9}\x{69DD}\x{69DE}\x{69E7}\x{69E8}\x{69EB}' .
-'\x{69ED}\x{69F2}\x{69F9}\x{69FB}\x{69FD}\x{69FF}\x{6A02}\x{6A05}\x{6A0A}' .
-'\x{6A0B}\x{6A0C}\x{6A12}\x{6A13}\x{6A14}\x{6A17}\x{6A19}\x{6A1B}\x{6A1E}' .
-'\x{6A1F}\x{6A21}\x{6A22}\x{6A23}\x{6A29}\x{6A2A}\x{6A2B}\x{6A2E}\x{6A35}' .
-'\x{6A36}\x{6A38}\x{6A39}\x{6A3A}\x{6A3D}\x{6A44}\x{6A47}\x{6A48}\x{6A4B}' .
-'\x{6A58}\x{6A59}\x{6A5F}\x{6A61}\x{6A62}\x{6A66}\x{6A72}\x{6A78}\x{6A7F}' .
-'\x{6A80}\x{6A84}\x{6A8D}\x{6A8E}\x{6A90}\x{6A97}\x{6A9C}\x{6AA0}\x{6AA2}' .
-'\x{6AA3}\x{6AAA}\x{6AAC}\x{6AAE}\x{6AB3}\x{6AB8}\x{6ABB}\x{6AC1}\x{6AC2}' .
-'\x{6AC3}\x{6AD1}\x{6AD3}\x{6ADA}\x{6ADB}\x{6ADE}\x{6ADF}\x{6AE8}\x{6AEA}' .
-'\x{6AFA}\x{6AFB}\x{6B04}\x{6B05}\x{6B0A}\x{6B12}\x{6B16}\x{6B1D}\x{6B1F}' .
-'\x{6B20}\x{6B21}\x{6B23}\x{6B27}\x{6B32}\x{6B37}\x{6B38}\x{6B39}\x{6B3A}' .
-'\x{6B3D}\x{6B3E}\x{6B43}\x{6B47}\x{6B49}\x{6B4C}\x{6B4E}\x{6B50}\x{6B53}' .
-'\x{6B54}\x{6B59}\x{6B5B}\x{6B5F}\x{6B61}\x{6B62}\x{6B63}\x{6B64}\x{6B66}' .
-'\x{6B69}\x{6B6A}\x{6B6F}\x{6B73}\x{6B74}\x{6B78}\x{6B79}\x{6B7B}\x{6B7F}' .
-'\x{6B80}\x{6B83}\x{6B84}\x{6B86}\x{6B89}\x{6B8A}\x{6B8B}\x{6B8D}\x{6B95}' .
-'\x{6B96}\x{6B98}\x{6B9E}\x{6BA4}\x{6BAA}\x{6BAB}\x{6BAF}\x{6BB1}\x{6BB2}' .
-'\x{6BB3}\x{6BB4}\x{6BB5}\x{6BB7}\x{6BBA}\x{6BBB}\x{6BBC}\x{6BBF}\x{6BC0}' .
-'\x{6BC5}\x{6BC6}\x{6BCB}\x{6BCD}\x{6BCE}\x{6BD2}\x{6BD3}\x{6BD4}\x{6BD8}' .
-'\x{6BDB}\x{6BDF}\x{6BEB}\x{6BEC}\x{6BEF}\x{6BF3}\x{6C08}\x{6C0F}\x{6C11}' .
-'\x{6C13}\x{6C14}\x{6C17}\x{6C1B}\x{6C23}\x{6C24}\x{6C34}\x{6C37}\x{6C38}' .
-'\x{6C3E}\x{6C40}\x{6C41}\x{6C42}\x{6C4E}\x{6C50}\x{6C55}\x{6C57}\x{6C5A}' .
-'\x{6C5D}\x{6C5E}\x{6C5F}\x{6C60}\x{6C62}\x{6C68}\x{6C6A}\x{6C70}\x{6C72}' .
-'\x{6C73}\x{6C7A}\x{6C7D}\x{6C7E}\x{6C81}\x{6C82}\x{6C83}\x{6C88}\x{6C8C}' .
-'\x{6C8D}\x{6C90}\x{6C92}\x{6C93}\x{6C96}\x{6C99}\x{6C9A}\x{6C9B}\x{6CA1}' .
-'\x{6CA2}\x{6CAB}\x{6CAE}\x{6CB1}\x{6CB3}\x{6CB8}\x{6CB9}\x{6CBA}\x{6CBB}' .
-'\x{6CBC}\x{6CBD}\x{6CBE}\x{6CBF}\x{6CC1}\x{6CC4}\x{6CC5}\x{6CC9}\x{6CCA}' .
-'\x{6CCC}\x{6CD3}\x{6CD5}\x{6CD7}\x{6CD9}\x{6CDB}\x{6CDD}\x{6CE1}\x{6CE2}' .
-'\x{6CE3}\x{6CE5}\x{6CE8}\x{6CEA}\x{6CEF}\x{6CF0}\x{6CF1}\x{6CF3}\x{6D0B}' .
-'\x{6D0C}\x{6D12}\x{6D17}\x{6D19}\x{6D1B}\x{6D1E}\x{6D1F}\x{6D25}\x{6D29}' .
-'\x{6D2A}\x{6D2B}\x{6D32}\x{6D33}\x{6D35}\x{6D36}\x{6D38}\x{6D3B}\x{6D3D}' .
-'\x{6D3E}\x{6D41}\x{6D44}\x{6D45}\x{6D59}\x{6D5A}\x{6D5C}\x{6D63}\x{6D64}' .
-'\x{6D66}\x{6D69}\x{6D6A}\x{6D6C}\x{6D6E}\x{6D74}\x{6D77}\x{6D78}\x{6D79}' .
-'\x{6D85}\x{6D88}\x{6D8C}\x{6D8E}\x{6D93}\x{6D95}\x{6D99}\x{6D9B}\x{6D9C}' .
-'\x{6DAF}\x{6DB2}\x{6DB5}\x{6DB8}\x{6DBC}\x{6DC0}\x{6DC5}\x{6DC6}\x{6DC7}' .
-'\x{6DCB}\x{6DCC}\x{6DD1}\x{6DD2}\x{6DD5}\x{6DD8}\x{6DD9}\x{6DDE}\x{6DE1}' .
-'\x{6DE4}\x{6DE6}\x{6DE8}\x{6DEA}\x{6DEB}\x{6DEC}\x{6DEE}\x{6DF1}\x{6DF3}' .
-'\x{6DF5}\x{6DF7}\x{6DF9}\x{6DFA}\x{6DFB}\x{6E05}\x{6E07}\x{6E08}\x{6E09}' .
-'\x{6E0A}\x{6E0B}\x{6E13}\x{6E15}\x{6E19}\x{6E1A}\x{6E1B}\x{6E1D}\x{6E1F}' .
-'\x{6E20}\x{6E21}\x{6E23}\x{6E24}\x{6E25}\x{6E26}\x{6E29}\x{6E2B}\x{6E2C}' .
-'\x{6E2D}\x{6E2E}\x{6E2F}\x{6E38}\x{6E3A}\x{6E3E}\x{6E43}\x{6E4A}\x{6E4D}' .
-'\x{6E4E}\x{6E56}\x{6E58}\x{6E5B}\x{6E5F}\x{6E67}\x{6E6B}\x{6E6E}\x{6E6F}' .
-'\x{6E72}\x{6E76}\x{6E7E}\x{6E7F}\x{6E80}\x{6E82}\x{6E8C}\x{6E8F}\x{6E90}' .
-'\x{6E96}\x{6E98}\x{6E9C}\x{6E9D}\x{6E9F}\x{6EA2}\x{6EA5}\x{6EAA}\x{6EAF}' .
-'\x{6EB2}\x{6EB6}\x{6EB7}\x{6EBA}\x{6EBD}\x{6EC2}\x{6EC4}\x{6EC5}\x{6EC9}' .
-'\x{6ECB}\x{6ECC}\x{6ED1}\x{6ED3}\x{6ED4}\x{6ED5}\x{6EDD}\x{6EDE}\x{6EEC}' .
-'\x{6EEF}\x{6EF2}\x{6EF4}\x{6EF7}\x{6EF8}\x{6EFE}\x{6EFF}\x{6F01}\x{6F02}' .
-'\x{6F06}\x{6F09}\x{6F0F}\x{6F11}\x{6F13}\x{6F14}\x{6F15}\x{6F20}\x{6F22}' .
-'\x{6F23}\x{6F2B}\x{6F2C}\x{6F31}\x{6F32}\x{6F38}\x{6F3E}\x{6F3F}\x{6F41}' .
-'\x{6F45}\x{6F54}\x{6F58}\x{6F5B}\x{6F5C}\x{6F5F}\x{6F64}\x{6F66}\x{6F6D}' .
-'\x{6F6E}\x{6F6F}\x{6F70}\x{6F74}\x{6F78}\x{6F7A}\x{6F7C}\x{6F80}\x{6F81}' .
-'\x{6F82}\x{6F84}\x{6F86}\x{6F8E}\x{6F91}\x{6F97}\x{6FA1}\x{6FA3}\x{6FA4}' .
-'\x{6FAA}\x{6FB1}\x{6FB3}\x{6FB9}\x{6FC0}\x{6FC1}\x{6FC2}\x{6FC3}\x{6FC6}' .
-'\x{6FD4}\x{6FD5}\x{6FD8}\x{6FDB}\x{6FDF}\x{6FE0}\x{6FE1}\x{6FE4}\x{6FEB}' .
-'\x{6FEC}\x{6FEE}\x{6FEF}\x{6FF1}\x{6FF3}\x{6FF6}\x{6FFA}\x{6FFE}\x{7001}' .
-'\x{7009}\x{700B}\x{700F}\x{7011}\x{7015}\x{7018}\x{701A}\x{701B}\x{701D}' .
-'\x{701E}\x{701F}\x{7026}\x{7027}\x{702C}\x{7030}\x{7032}\x{703E}\x{704C}' .
-'\x{7051}\x{7058}\x{7063}\x{706B}\x{706F}\x{7070}\x{7078}\x{707C}\x{707D}' .
-'\x{7089}\x{708A}\x{708E}\x{7092}\x{7099}\x{70AC}\x{70AD}\x{70AE}\x{70AF}' .
-'\x{70B3}\x{70B8}\x{70B9}\x{70BA}\x{70C8}\x{70CB}\x{70CF}\x{70D9}\x{70DD}' .
-'\x{70DF}\x{70F1}\x{70F9}\x{70FD}\x{7109}\x{7114}\x{7119}\x{711A}\x{711C}' .
-'\x{7121}\x{7126}\x{7136}\x{713C}\x{7149}\x{714C}\x{714E}\x{7155}\x{7156}' .
-'\x{7159}\x{7162}\x{7164}\x{7165}\x{7166}\x{7167}\x{7169}\x{716C}\x{716E}' .
-'\x{717D}\x{7184}\x{7188}\x{718A}\x{718F}\x{7194}\x{7195}\x{7199}\x{719F}' .
-'\x{71A8}\x{71AC}\x{71B1}\x{71B9}\x{71BE}\x{71C3}\x{71C8}\x{71C9}\x{71CE}' .
-'\x{71D0}\x{71D2}\x{71D4}\x{71D5}\x{71D7}\x{71DF}\x{71E0}\x{71E5}\x{71E6}' .
-'\x{71E7}\x{71EC}\x{71ED}\x{71EE}\x{71F5}\x{71F9}\x{71FB}\x{71FC}\x{71FF}' .
-'\x{7206}\x{720D}\x{7210}\x{721B}\x{7228}\x{722A}\x{722C}\x{722D}\x{7230}' .
-'\x{7232}\x{7235}\x{7236}\x{723A}\x{723B}\x{723C}\x{723D}\x{723E}\x{723F}' .
-'\x{7240}\x{7246}\x{7247}\x{7248}\x{724B}\x{724C}\x{7252}\x{7258}\x{7259}' .
-'\x{725B}\x{725D}\x{725F}\x{7261}\x{7262}\x{7267}\x{7269}\x{7272}\x{7274}' .
-'\x{7279}\x{727D}\x{727E}\x{7280}\x{7281}\x{7282}\x{7287}\x{7292}\x{7296}' .
-'\x{72A0}\x{72A2}\x{72A7}\x{72AC}\x{72AF}\x{72B2}\x{72B6}\x{72B9}\x{72C2}' .
-'\x{72C3}\x{72C4}\x{72C6}\x{72CE}\x{72D0}\x{72D2}\x{72D7}\x{72D9}\x{72DB}' .
-'\x{72E0}\x{72E1}\x{72E2}\x{72E9}\x{72EC}\x{72ED}\x{72F7}\x{72F8}\x{72F9}' .
-'\x{72FC}\x{72FD}\x{730A}\x{7316}\x{7317}\x{731B}\x{731C}\x{731D}\x{731F}' .
-'\x{7325}\x{7329}\x{732A}\x{732B}\x{732E}\x{732F}\x{7334}\x{7336}\x{7337}' .
-'\x{733E}\x{733F}\x{7344}\x{7345}\x{734E}\x{734F}\x{7357}\x{7363}\x{7368}' .
-'\x{736A}\x{7370}\x{7372}\x{7375}\x{7378}\x{737A}\x{737B}\x{7384}\x{7387}' .
-'\x{7389}\x{738B}\x{7396}\x{73A9}\x{73B2}\x{73B3}\x{73BB}\x{73C0}\x{73C2}' .
-'\x{73C8}\x{73CA}\x{73CD}\x{73CE}\x{73DE}\x{73E0}\x{73E5}\x{73EA}\x{73ED}' .
-'\x{73EE}\x{73F1}\x{73F8}\x{73FE}\x{7403}\x{7405}\x{7406}\x{7409}\x{7422}' .
-'\x{7425}\x{7432}\x{7433}\x{7434}\x{7435}\x{7436}\x{743A}\x{743F}\x{7441}' .
-'\x{7455}\x{7459}\x{745A}\x{745B}\x{745C}\x{745E}\x{745F}\x{7460}\x{7463}' .
-'\x{7464}\x{7469}\x{746A}\x{746F}\x{7470}\x{7473}\x{7476}\x{747E}\x{7483}' .
-'\x{748B}\x{749E}\x{74A2}\x{74A7}\x{74B0}\x{74BD}\x{74CA}\x{74CF}\x{74D4}' .
-'\x{74DC}\x{74E0}\x{74E2}\x{74E3}\x{74E6}\x{74E7}\x{74E9}\x{74EE}\x{74F0}' .
-'\x{74F1}\x{74F2}\x{74F6}\x{74F7}\x{74F8}\x{7503}\x{7504}\x{7505}\x{750C}' .
-'\x{750D}\x{750E}\x{7511}\x{7513}\x{7515}\x{7518}\x{751A}\x{751C}\x{751E}' .
-'\x{751F}\x{7523}\x{7525}\x{7526}\x{7528}\x{752B}\x{752C}\x{7530}\x{7531}' .
-'\x{7532}\x{7533}\x{7537}\x{7538}\x{753A}\x{753B}\x{753C}\x{7544}\x{7546}' .
-'\x{7549}\x{754A}\x{754B}\x{754C}\x{754D}\x{754F}\x{7551}\x{7554}\x{7559}' .
-'\x{755A}\x{755B}\x{755C}\x{755D}\x{7560}\x{7562}\x{7564}\x{7565}\x{7566}' .
-'\x{7567}\x{7569}\x{756A}\x{756B}\x{756D}\x{7570}\x{7573}\x{7574}\x{7576}' .
-'\x{7577}\x{7578}\x{757F}\x{7582}\x{7586}\x{7587}\x{7589}\x{758A}\x{758B}' .
-'\x{758E}\x{758F}\x{7591}\x{7594}\x{759A}\x{759D}\x{75A3}\x{75A5}\x{75AB}' .
-'\x{75B1}\x{75B2}\x{75B3}\x{75B5}\x{75B8}\x{75B9}\x{75BC}\x{75BD}\x{75BE}' .
-'\x{75C2}\x{75C3}\x{75C5}\x{75C7}\x{75CA}\x{75CD}\x{75D2}\x{75D4}\x{75D5}' .
-'\x{75D8}\x{75D9}\x{75DB}\x{75DE}\x{75E2}\x{75E3}\x{75E9}\x{75F0}\x{75F2}' .
-'\x{75F3}\x{75F4}\x{75FA}\x{75FC}\x{75FE}\x{75FF}\x{7601}\x{7609}\x{760B}' .
-'\x{760D}\x{761F}\x{7620}\x{7621}\x{7622}\x{7624}\x{7627}\x{7630}\x{7634}' .
-'\x{763B}\x{7642}\x{7646}\x{7647}\x{7648}\x{764C}\x{7652}\x{7656}\x{7658}' .
-'\x{765C}\x{7661}\x{7662}\x{7667}\x{7668}\x{7669}\x{766A}\x{766C}\x{7670}' .
-'\x{7672}\x{7676}\x{7678}\x{767A}\x{767B}\x{767C}\x{767D}\x{767E}\x{7680}' .
-'\x{7683}\x{7684}\x{7686}\x{7687}\x{7688}\x{768B}\x{768E}\x{7690}\x{7693}' .
-'\x{7696}\x{7699}\x{769A}\x{76AE}\x{76B0}\x{76B4}\x{76B7}\x{76B8}\x{76B9}' .
-'\x{76BA}\x{76BF}\x{76C2}\x{76C3}\x{76C6}\x{76C8}\x{76CA}\x{76CD}\x{76D2}' .
-'\x{76D6}\x{76D7}\x{76DB}\x{76DC}\x{76DE}\x{76DF}\x{76E1}\x{76E3}\x{76E4}' .
-'\x{76E5}\x{76E7}\x{76EA}\x{76EE}\x{76F2}\x{76F4}\x{76F8}\x{76FB}\x{76FE}' .
-'\x{7701}\x{7704}\x{7707}\x{7708}\x{7709}\x{770B}\x{770C}\x{771B}\x{771E}' .
-'\x{771F}\x{7720}\x{7724}\x{7725}\x{7726}\x{7729}\x{7737}\x{7738}\x{773A}' .
-'\x{773C}\x{7740}\x{7747}\x{775A}\x{775B}\x{7761}\x{7763}\x{7765}\x{7766}' .
-'\x{7768}\x{776B}\x{7779}\x{777E}\x{777F}\x{778B}\x{778E}\x{7791}\x{779E}' .
-'\x{77A0}\x{77A5}\x{77AC}\x{77AD}\x{77B0}\x{77B3}\x{77B6}\x{77B9}\x{77BB}' .
-'\x{77BC}\x{77BD}\x{77BF}\x{77C7}\x{77CD}\x{77D7}\x{77DA}\x{77DB}\x{77DC}' .
-'\x{77E2}\x{77E3}\x{77E5}\x{77E7}\x{77E9}\x{77ED}\x{77EE}\x{77EF}\x{77F3}' .
-'\x{77FC}\x{7802}\x{780C}\x{7812}\x{7814}\x{7815}\x{7820}\x{7825}\x{7826}' .
-'\x{7827}\x{7832}\x{7834}\x{783A}\x{783F}\x{7845}\x{785D}\x{786B}\x{786C}' .
-'\x{786F}\x{7872}\x{7874}\x{787C}\x{7881}\x{7886}\x{7887}\x{788C}\x{788D}' .
-'\x{788E}\x{7891}\x{7893}\x{7895}\x{7897}\x{789A}\x{78A3}\x{78A7}\x{78A9}' .
-'\x{78AA}\x{78AF}\x{78B5}\x{78BA}\x{78BC}\x{78BE}\x{78C1}\x{78C5}\x{78C6}' .
-'\x{78CA}\x{78CB}\x{78D0}\x{78D1}\x{78D4}\x{78DA}\x{78E7}\x{78E8}\x{78EC}' .
-'\x{78EF}\x{78F4}\x{78FD}\x{7901}\x{7907}\x{790E}\x{7911}\x{7912}\x{7919}' .
-'\x{7926}\x{792A}\x{792B}\x{792C}\x{793A}\x{793C}\x{793E}\x{7940}\x{7941}' .
-'\x{7947}\x{7948}\x{7949}\x{7950}\x{7953}\x{7955}\x{7956}\x{7957}\x{795A}' .
-'\x{795D}\x{795E}\x{795F}\x{7960}\x{7962}\x{7965}\x{7968}\x{796D}\x{7977}' .
-'\x{797A}\x{797F}\x{7980}\x{7981}\x{7984}\x{7985}\x{798A}\x{798D}\x{798E}' .
-'\x{798F}\x{799D}\x{79A6}\x{79A7}\x{79AA}\x{79AE}\x{79B0}\x{79B3}\x{79B9}' .
-'\x{79BA}\x{79BD}\x{79BE}\x{79BF}\x{79C0}\x{79C1}\x{79C9}\x{79CB}\x{79D1}' .
-'\x{79D2}\x{79D5}\x{79D8}\x{79DF}\x{79E1}\x{79E3}\x{79E4}\x{79E6}\x{79E7}' .
-'\x{79E9}\x{79EC}\x{79F0}\x{79FB}\x{7A00}\x{7A08}\x{7A0B}\x{7A0D}\x{7A0E}' .
-'\x{7A14}\x{7A17}\x{7A18}\x{7A19}\x{7A1A}\x{7A1C}\x{7A1F}\x{7A20}\x{7A2E}' .
-'\x{7A31}\x{7A32}\x{7A37}\x{7A3B}\x{7A3C}\x{7A3D}\x{7A3E}\x{7A3F}\x{7A40}' .
-'\x{7A42}\x{7A43}\x{7A46}\x{7A49}\x{7A4D}\x{7A4E}\x{7A4F}\x{7A50}\x{7A57}' .
-'\x{7A61}\x{7A62}\x{7A63}\x{7A69}\x{7A6B}\x{7A70}\x{7A74}\x{7A76}\x{7A79}' .
-'\x{7A7A}\x{7A7D}\x{7A7F}\x{7A81}\x{7A83}\x{7A84}\x{7A88}\x{7A92}\x{7A93}' .
-'\x{7A95}\x{7A96}\x{7A97}\x{7A98}\x{7A9F}\x{7AA9}\x{7AAA}\x{7AAE}\x{7AAF}' .
-'\x{7AB0}\x{7AB6}\x{7ABA}\x{7ABF}\x{7AC3}\x{7AC4}\x{7AC5}\x{7AC7}\x{7AC8}' .
-'\x{7ACA}\x{7ACB}\x{7ACD}\x{7ACF}\x{7AD2}\x{7AD3}\x{7AD5}\x{7AD9}\x{7ADA}' .
-'\x{7ADC}\x{7ADD}\x{7ADF}\x{7AE0}\x{7AE1}\x{7AE2}\x{7AE3}\x{7AE5}\x{7AE6}' .
-'\x{7AEA}\x{7AED}\x{7AEF}\x{7AF0}\x{7AF6}\x{7AF8}\x{7AF9}\x{7AFA}\x{7AFF}' .
-'\x{7B02}\x{7B04}\x{7B06}\x{7B08}\x{7B0A}\x{7B0B}\x{7B0F}\x{7B11}\x{7B18}' .
-'\x{7B19}\x{7B1B}\x{7B1E}\x{7B20}\x{7B25}\x{7B26}\x{7B28}\x{7B2C}\x{7B33}' .
-'\x{7B35}\x{7B36}\x{7B39}\x{7B45}\x{7B46}\x{7B48}\x{7B49}\x{7B4B}\x{7B4C}' .
-'\x{7B4D}\x{7B4F}\x{7B50}\x{7B51}\x{7B52}\x{7B54}\x{7B56}\x{7B5D}\x{7B65}' .
-'\x{7B67}\x{7B6C}\x{7B6E}\x{7B70}\x{7B71}\x{7B74}\x{7B75}\x{7B7A}\x{7B86}' .
-'\x{7B87}\x{7B8B}\x{7B8D}\x{7B8F}\x{7B92}\x{7B94}\x{7B95}\x{7B97}\x{7B98}' .
-'\x{7B99}\x{7B9A}\x{7B9C}\x{7B9D}\x{7B9F}\x{7BA1}\x{7BAA}\x{7BAD}\x{7BB1}' .
-'\x{7BB4}\x{7BB8}\x{7BC0}\x{7BC1}\x{7BC4}\x{7BC6}\x{7BC7}\x{7BC9}\x{7BCB}' .
-'\x{7BCC}\x{7BCF}\x{7BDD}\x{7BE0}\x{7BE4}\x{7BE5}\x{7BE6}\x{7BE9}\x{7BED}' .
-'\x{7BF3}\x{7BF6}\x{7BF7}\x{7C00}\x{7C07}\x{7C0D}\x{7C11}\x{7C12}\x{7C13}' .
-'\x{7C14}\x{7C17}\x{7C1F}\x{7C21}\x{7C23}\x{7C27}\x{7C2A}\x{7C2B}\x{7C37}' .
-'\x{7C38}\x{7C3D}\x{7C3E}\x{7C3F}\x{7C40}\x{7C43}\x{7C4C}\x{7C4D}\x{7C4F}' .
-'\x{7C50}\x{7C54}\x{7C56}\x{7C58}\x{7C5F}\x{7C60}\x{7C64}\x{7C65}\x{7C6C}' .
-'\x{7C73}\x{7C75}\x{7C7E}\x{7C81}\x{7C82}\x{7C83}\x{7C89}\x{7C8B}\x{7C8D}' .
-'\x{7C90}\x{7C92}\x{7C95}\x{7C97}\x{7C98}\x{7C9B}\x{7C9F}\x{7CA1}\x{7CA2}' .
-'\x{7CA4}\x{7CA5}\x{7CA7}\x{7CA8}\x{7CAB}\x{7CAD}\x{7CAE}\x{7CB1}\x{7CB2}' .
-'\x{7CB3}\x{7CB9}\x{7CBD}\x{7CBE}\x{7CC0}\x{7CC2}\x{7CC5}\x{7CCA}\x{7CCE}' .
-'\x{7CD2}\x{7CD6}\x{7CD8}\x{7CDC}\x{7CDE}\x{7CDF}\x{7CE0}\x{7CE2}\x{7CE7}' .
-'\x{7CEF}\x{7CF2}\x{7CF4}\x{7CF6}\x{7CF8}\x{7CFA}\x{7CFB}\x{7CFE}\x{7D00}' .
-'\x{7D02}\x{7D04}\x{7D05}\x{7D06}\x{7D0A}\x{7D0B}\x{7D0D}\x{7D10}\x{7D14}' .
-'\x{7D15}\x{7D17}\x{7D18}\x{7D19}\x{7D1A}\x{7D1B}\x{7D1C}\x{7D20}\x{7D21}' .
-'\x{7D22}\x{7D2B}\x{7D2C}\x{7D2E}\x{7D2F}\x{7D30}\x{7D32}\x{7D33}\x{7D35}' .
-'\x{7D39}\x{7D3A}\x{7D3F}\x{7D42}\x{7D43}\x{7D44}\x{7D45}\x{7D46}\x{7D4B}' .
-'\x{7D4C}\x{7D4E}\x{7D4F}\x{7D50}\x{7D56}\x{7D5B}\x{7D5E}\x{7D61}\x{7D62}' .
-'\x{7D63}\x{7D66}\x{7D68}\x{7D6E}\x{7D71}\x{7D72}\x{7D73}\x{7D75}\x{7D76}' .
-'\x{7D79}\x{7D7D}\x{7D89}\x{7D8F}\x{7D93}\x{7D99}\x{7D9A}\x{7D9B}\x{7D9C}' .
-'\x{7D9F}\x{7DA2}\x{7DA3}\x{7DAB}\x{7DAC}\x{7DAD}\x{7DAE}\x{7DAF}\x{7DB0}' .
-'\x{7DB1}\x{7DB2}\x{7DB4}\x{7DB5}\x{7DB8}\x{7DBA}\x{7DBB}\x{7DBD}\x{7DBE}' .
-'\x{7DBF}\x{7DC7}\x{7DCA}\x{7DCB}\x{7DCF}\x{7DD1}\x{7DD2}\x{7DD5}\x{7DD8}' .
-'\x{7DDA}\x{7DDC}\x{7DDD}\x{7DDE}\x{7DE0}\x{7DE1}\x{7DE4}\x{7DE8}\x{7DE9}' .
-'\x{7DEC}\x{7DEF}\x{7DF2}\x{7DF4}\x{7DFB}\x{7E01}\x{7E04}\x{7E05}\x{7E09}' .
-'\x{7E0A}\x{7E0B}\x{7E12}\x{7E1B}\x{7E1E}\x{7E1F}\x{7E21}\x{7E22}\x{7E23}' .
-'\x{7E26}\x{7E2B}\x{7E2E}\x{7E31}\x{7E32}\x{7E35}\x{7E37}\x{7E39}\x{7E3A}' .
-'\x{7E3B}\x{7E3D}\x{7E3E}\x{7E41}\x{7E43}\x{7E46}\x{7E4A}\x{7E4B}\x{7E4D}' .
-'\x{7E54}\x{7E55}\x{7E56}\x{7E59}\x{7E5A}\x{7E5D}\x{7E5E}\x{7E66}\x{7E67}' .
-'\x{7E69}\x{7E6A}\x{7E6D}\x{7E70}\x{7E79}\x{7E7B}\x{7E7C}\x{7E7D}\x{7E7F}' .
-'\x{7E82}\x{7E83}\x{7E88}\x{7E89}\x{7E8C}\x{7E8E}\x{7E8F}\x{7E90}\x{7E92}' .
-'\x{7E93}\x{7E94}\x{7E96}\x{7E9B}\x{7E9C}\x{7F36}\x{7F38}\x{7F3A}\x{7F45}' .
-'\x{7F4C}\x{7F4D}\x{7F4E}\x{7F50}\x{7F51}\x{7F54}\x{7F55}\x{7F58}\x{7F5F}' .
-'\x{7F60}\x{7F67}\x{7F68}\x{7F69}\x{7F6A}\x{7F6B}\x{7F6E}\x{7F70}\x{7F72}' .
-'\x{7F75}\x{7F77}\x{7F78}\x{7F79}\x{7F82}\x{7F83}\x{7F85}\x{7F86}\x{7F87}' .
-'\x{7F88}\x{7F8A}\x{7F8C}\x{7F8E}\x{7F94}\x{7F9A}\x{7F9D}\x{7F9E}\x{7FA3}' .
-'\x{7FA4}\x{7FA8}\x{7FA9}\x{7FAE}\x{7FAF}\x{7FB2}\x{7FB6}\x{7FB8}\x{7FB9}' .
-'\x{7FBD}\x{7FC1}\x{7FC5}\x{7FC6}\x{7FCA}\x{7FCC}\x{7FD2}\x{7FD4}\x{7FD5}' .
-'\x{7FE0}\x{7FE1}\x{7FE6}\x{7FE9}\x{7FEB}\x{7FF0}\x{7FF3}\x{7FF9}\x{7FFB}' .
-'\x{7FFC}\x{8000}\x{8001}\x{8003}\x{8004}\x{8005}\x{8006}\x{800B}\x{800C}' .
-'\x{8010}\x{8012}\x{8015}\x{8017}\x{8018}\x{8019}\x{801C}\x{8021}\x{8028}' .
-'\x{8033}\x{8036}\x{803B}\x{803D}\x{803F}\x{8046}\x{804A}\x{8052}\x{8056}' .
-'\x{8058}\x{805A}\x{805E}\x{805F}\x{8061}\x{8062}\x{8068}\x{806F}\x{8070}' .
-'\x{8072}\x{8073}\x{8074}\x{8076}\x{8077}\x{8079}\x{807D}\x{807E}\x{807F}' .
-'\x{8084}\x{8085}\x{8086}\x{8087}\x{8089}\x{808B}\x{808C}\x{8093}\x{8096}' .
-'\x{8098}\x{809A}\x{809B}\x{809D}\x{80A1}\x{80A2}\x{80A5}\x{80A9}\x{80AA}' .
-'\x{80AC}\x{80AD}\x{80AF}\x{80B1}\x{80B2}\x{80B4}\x{80BA}\x{80C3}\x{80C4}' .
-'\x{80C6}\x{80CC}\x{80CE}\x{80D6}\x{80D9}\x{80DA}\x{80DB}\x{80DD}\x{80DE}' .
-'\x{80E1}\x{80E4}\x{80E5}\x{80EF}\x{80F1}\x{80F4}\x{80F8}\x{80FC}\x{80FD}' .
-'\x{8102}\x{8105}\x{8106}\x{8107}\x{8108}\x{8109}\x{810A}\x{811A}\x{811B}' .
-'\x{8123}\x{8129}\x{812F}\x{8131}\x{8133}\x{8139}\x{813E}\x{8146}\x{814B}' .
-'\x{814E}\x{8150}\x{8151}\x{8153}\x{8154}\x{8155}\x{815F}\x{8165}\x{8166}' .
-'\x{816B}\x{816E}\x{8170}\x{8171}\x{8174}\x{8178}\x{8179}\x{817A}\x{817F}' .
-'\x{8180}\x{8182}\x{8183}\x{8188}\x{818A}\x{818F}\x{8193}\x{8195}\x{819A}' .
-'\x{819C}\x{819D}\x{81A0}\x{81A3}\x{81A4}\x{81A8}\x{81A9}\x{81B0}\x{81B3}' .
-'\x{81B5}\x{81B8}\x{81BA}\x{81BD}\x{81BE}\x{81BF}\x{81C0}\x{81C2}\x{81C6}' .
-'\x{81C8}\x{81C9}\x{81CD}\x{81D1}\x{81D3}\x{81D8}\x{81D9}\x{81DA}\x{81DF}' .
-'\x{81E0}\x{81E3}\x{81E5}\x{81E7}\x{81E8}\x{81EA}\x{81ED}\x{81F3}\x{81F4}' .
-'\x{81FA}\x{81FB}\x{81FC}\x{81FE}\x{8201}\x{8202}\x{8205}\x{8207}\x{8208}' .
-'\x{8209}\x{820A}\x{820C}\x{820D}\x{820E}\x{8210}\x{8212}\x{8216}\x{8217}' .
-'\x{8218}\x{821B}\x{821C}\x{821E}\x{821F}\x{8229}\x{822A}\x{822B}\x{822C}' .
-'\x{822E}\x{8233}\x{8235}\x{8236}\x{8237}\x{8238}\x{8239}\x{8240}\x{8247}' .
-'\x{8258}\x{8259}\x{825A}\x{825D}\x{825F}\x{8262}\x{8264}\x{8266}\x{8268}' .
-'\x{826A}\x{826B}\x{826E}\x{826F}\x{8271}\x{8272}\x{8276}\x{8277}\x{8278}' .
-'\x{827E}\x{828B}\x{828D}\x{8292}\x{8299}\x{829D}\x{829F}\x{82A5}\x{82A6}' .
-'\x{82AB}\x{82AC}\x{82AD}\x{82AF}\x{82B1}\x{82B3}\x{82B8}\x{82B9}\x{82BB}' .
-'\x{82BD}\x{82C5}\x{82D1}\x{82D2}\x{82D3}\x{82D4}\x{82D7}\x{82D9}\x{82DB}' .
-'\x{82DC}\x{82DE}\x{82DF}\x{82E1}\x{82E3}\x{82E5}\x{82E6}\x{82E7}\x{82EB}' .
-'\x{82F1}\x{82F3}\x{82F4}\x{82F9}\x{82FA}\x{82FB}\x{8302}\x{8303}\x{8304}' .
-'\x{8305}\x{8306}\x{8309}\x{830E}\x{8316}\x{8317}\x{8318}\x{831C}\x{8323}' .
-'\x{8328}\x{832B}\x{832F}\x{8331}\x{8332}\x{8334}\x{8335}\x{8336}\x{8338}' .
-'\x{8339}\x{8340}\x{8345}\x{8349}\x{834A}\x{834F}\x{8350}\x{8352}\x{8358}' .
-'\x{8373}\x{8375}\x{8377}\x{837B}\x{837C}\x{8385}\x{8387}\x{8389}\x{838A}' .
-'\x{838E}\x{8393}\x{8396}\x{839A}\x{839E}\x{839F}\x{83A0}\x{83A2}\x{83A8}' .
-'\x{83AA}\x{83AB}\x{83B1}\x{83B5}\x{83BD}\x{83C1}\x{83C5}\x{83CA}\x{83CC}' .
-'\x{83CE}\x{83D3}\x{83D6}\x{83D8}\x{83DC}\x{83DF}\x{83E0}\x{83E9}\x{83EB}' .
-'\x{83EF}\x{83F0}\x{83F1}\x{83F2}\x{83F4}\x{83F7}\x{83FB}\x{83FD}\x{8403}' .
-'\x{8404}\x{8407}\x{840B}\x{840C}\x{840D}\x{840E}\x{8413}\x{8420}\x{8422}' .
-'\x{8429}\x{842A}\x{842C}\x{8431}\x{8435}\x{8438}\x{843C}\x{843D}\x{8446}' .
-'\x{8449}\x{844E}\x{8457}\x{845B}\x{8461}\x{8462}\x{8463}\x{8466}\x{8469}' .
-'\x{846B}\x{846C}\x{846D}\x{846E}\x{846F}\x{8471}\x{8475}\x{8477}\x{8479}' .
-'\x{847A}\x{8482}\x{8484}\x{848B}\x{8490}\x{8494}\x{8499}\x{849C}\x{849F}' .
-'\x{84A1}\x{84AD}\x{84B2}\x{84B8}\x{84B9}\x{84BB}\x{84BC}\x{84BF}\x{84C1}' .
-'\x{84C4}\x{84C6}\x{84C9}\x{84CA}\x{84CB}\x{84CD}\x{84D0}\x{84D1}\x{84D6}' .
-'\x{84D9}\x{84DA}\x{84EC}\x{84EE}\x{84F4}\x{84FC}\x{84FF}\x{8500}\x{8506}' .
-'\x{8511}\x{8513}\x{8514}\x{8515}\x{8517}\x{8518}\x{851A}\x{851F}\x{8521}' .
-'\x{8526}\x{852C}\x{852D}\x{8535}\x{853D}\x{8540}\x{8541}\x{8543}\x{8548}' .
-'\x{8549}\x{854A}\x{854B}\x{854E}\x{8555}\x{8557}\x{8558}\x{855A}\x{8563}' .
-'\x{8568}\x{8569}\x{856A}\x{856D}\x{8577}\x{857E}\x{8580}\x{8584}\x{8587}' .
-'\x{8588}\x{858A}\x{8590}\x{8591}\x{8594}\x{8597}\x{8599}\x{859B}\x{859C}' .
-'\x{85A4}\x{85A6}\x{85A8}\x{85A9}\x{85AA}\x{85AB}\x{85AC}\x{85AE}\x{85AF}' .
-'\x{85B9}\x{85BA}\x{85C1}\x{85C9}\x{85CD}\x{85CF}\x{85D0}\x{85D5}\x{85DC}' .
-'\x{85DD}\x{85E4}\x{85E5}\x{85E9}\x{85EA}\x{85F7}\x{85F9}\x{85FA}\x{85FB}' .
-'\x{85FE}\x{8602}\x{8606}\x{8607}\x{860A}\x{860B}\x{8613}\x{8616}\x{8617}' .
-'\x{861A}\x{8622}\x{862D}\x{862F}\x{8630}\x{863F}\x{864D}\x{864E}\x{8650}' .
-'\x{8654}\x{8655}\x{865A}\x{865C}\x{865E}\x{865F}\x{8667}\x{866B}\x{8671}' .
-'\x{8679}\x{867B}\x{868A}\x{868B}\x{868C}\x{8693}\x{8695}\x{86A3}\x{86A4}' .
-'\x{86A9}\x{86AA}\x{86AB}\x{86AF}\x{86B0}\x{86B6}\x{86C4}\x{86C6}\x{86C7}' .
-'\x{86C9}\x{86CB}\x{86CD}\x{86CE}\x{86D4}\x{86D9}\x{86DB}\x{86DE}\x{86DF}' .
-'\x{86E4}\x{86E9}\x{86EC}\x{86ED}\x{86EE}\x{86EF}\x{86F8}\x{86F9}\x{86FB}' .
-'\x{86FE}\x{8700}\x{8702}\x{8703}\x{8706}\x{8708}\x{8709}\x{870A}\x{870D}' .
-'\x{8711}\x{8712}\x{8718}\x{871A}\x{871C}\x{8725}\x{8729}\x{8734}\x{8737}' .
-'\x{873B}\x{873F}\x{8749}\x{874B}\x{874C}\x{874E}\x{8753}\x{8755}\x{8757}' .
-'\x{8759}\x{875F}\x{8760}\x{8763}\x{8766}\x{8768}\x{876A}\x{876E}\x{8774}' .
-'\x{8776}\x{8778}\x{877F}\x{8782}\x{878D}\x{879F}\x{87A2}\x{87AB}\x{87AF}' .
-'\x{87B3}\x{87BA}\x{87BB}\x{87BD}\x{87C0}\x{87C4}\x{87C6}\x{87C7}\x{87CB}' .
-'\x{87D0}\x{87D2}\x{87E0}\x{87EF}\x{87F2}\x{87F6}\x{87F7}\x{87F9}\x{87FB}' .
-'\x{87FE}\x{8805}\x{880D}\x{880E}\x{880F}\x{8811}\x{8815}\x{8816}\x{8821}' .
-'\x{8822}\x{8823}\x{8827}\x{8831}\x{8836}\x{8839}\x{883B}\x{8840}\x{8842}' .
-'\x{8844}\x{8846}\x{884C}\x{884D}\x{8852}\x{8853}\x{8857}\x{8859}\x{885B}' .
-'\x{885D}\x{885E}\x{8861}\x{8862}\x{8863}\x{8868}\x{886B}\x{8870}\x{8872}' .
-'\x{8875}\x{8877}\x{887D}\x{887E}\x{887F}\x{8881}\x{8882}\x{8888}\x{888B}' .
-'\x{888D}\x{8892}\x{8896}\x{8897}\x{8899}\x{889E}\x{88A2}\x{88A4}\x{88AB}' .
-'\x{88AE}\x{88B0}\x{88B1}\x{88B4}\x{88B5}\x{88B7}\x{88BF}\x{88C1}\x{88C2}' .
-'\x{88C3}\x{88C4}\x{88C5}\x{88CF}\x{88D4}\x{88D5}\x{88D8}\x{88D9}\x{88DC}' .
-'\x{88DD}\x{88DF}\x{88E1}\x{88E8}\x{88F2}\x{88F3}\x{88F4}\x{88F8}\x{88F9}' .
-'\x{88FC}\x{88FD}\x{88FE}\x{8902}\x{8904}\x{8907}\x{890A}\x{890C}\x{8910}' .
-'\x{8912}\x{8913}\x{891D}\x{891E}\x{8925}\x{892A}\x{892B}\x{8936}\x{8938}' .
-'\x{893B}\x{8941}\x{8943}\x{8944}\x{894C}\x{894D}\x{8956}\x{895E}\x{895F}' .
-'\x{8960}\x{8964}\x{8966}\x{896A}\x{896D}\x{896F}\x{8972}\x{8974}\x{8977}' .
-'\x{897E}\x{897F}\x{8981}\x{8983}\x{8986}\x{8987}\x{8988}\x{898A}\x{898B}' .
-'\x{898F}\x{8993}\x{8996}\x{8997}\x{8998}\x{899A}\x{89A1}\x{89A6}\x{89A7}' .
-'\x{89A9}\x{89AA}\x{89AC}\x{89AF}\x{89B2}\x{89B3}\x{89BA}\x{89BD}\x{89BF}' .
-'\x{89C0}\x{89D2}\x{89DA}\x{89DC}\x{89DD}\x{89E3}\x{89E6}\x{89E7}\x{89F4}' .
-'\x{89F8}\x{8A00}\x{8A02}\x{8A03}\x{8A08}\x{8A0A}\x{8A0C}\x{8A0E}\x{8A10}' .
-'\x{8A13}\x{8A16}\x{8A17}\x{8A18}\x{8A1B}\x{8A1D}\x{8A1F}\x{8A23}\x{8A25}' .
-'\x{8A2A}\x{8A2D}\x{8A31}\x{8A33}\x{8A34}\x{8A36}\x{8A3A}\x{8A3B}\x{8A3C}' .
-'\x{8A41}\x{8A46}\x{8A48}\x{8A50}\x{8A51}\x{8A52}\x{8A54}\x{8A55}\x{8A5B}' .
-'\x{8A5E}\x{8A60}\x{8A62}\x{8A63}\x{8A66}\x{8A69}\x{8A6B}\x{8A6C}\x{8A6D}' .
-'\x{8A6E}\x{8A70}\x{8A71}\x{8A72}\x{8A73}\x{8A7C}\x{8A82}\x{8A84}\x{8A85}' .
-'\x{8A87}\x{8A89}\x{8A8C}\x{8A8D}\x{8A91}\x{8A93}\x{8A95}\x{8A98}\x{8A9A}' .
-'\x{8A9E}\x{8AA0}\x{8AA1}\x{8AA3}\x{8AA4}\x{8AA5}\x{8AA6}\x{8AA8}\x{8AAC}' .
-'\x{8AAD}\x{8AB0}\x{8AB2}\x{8AB9}\x{8ABC}\x{8ABF}\x{8AC2}\x{8AC4}\x{8AC7}' .
-'\x{8ACB}\x{8ACC}\x{8ACD}\x{8ACF}\x{8AD2}\x{8AD6}\x{8ADA}\x{8ADB}\x{8ADC}' .
-'\x{8ADE}\x{8AE0}\x{8AE1}\x{8AE2}\x{8AE4}\x{8AE6}\x{8AE7}\x{8AEB}\x{8AED}' .
-'\x{8AEE}\x{8AF1}\x{8AF3}\x{8AF7}\x{8AF8}\x{8AFA}\x{8AFE}\x{8B00}\x{8B01}' .
-'\x{8B02}\x{8B04}\x{8B07}\x{8B0C}\x{8B0E}\x{8B10}\x{8B14}\x{8B16}\x{8B17}' .
-'\x{8B19}\x{8B1A}\x{8B1B}\x{8B1D}\x{8B20}\x{8B21}\x{8B26}\x{8B28}\x{8B2B}' .
-'\x{8B2C}\x{8B33}\x{8B39}\x{8B3E}\x{8B41}\x{8B49}\x{8B4C}\x{8B4E}\x{8B4F}' .
-'\x{8B56}\x{8B58}\x{8B5A}\x{8B5B}\x{8B5C}\x{8B5F}\x{8B66}\x{8B6B}\x{8B6C}' .
-'\x{8B6F}\x{8B70}\x{8B71}\x{8B72}\x{8B74}\x{8B77}\x{8B7D}\x{8B80}\x{8B83}' .
-'\x{8B8A}\x{8B8C}\x{8B8E}\x{8B90}\x{8B92}\x{8B93}\x{8B96}\x{8B99}\x{8B9A}' .
-'\x{8C37}\x{8C3A}\x{8C3F}\x{8C41}\x{8C46}\x{8C48}\x{8C4A}\x{8C4C}\x{8C4E}' .
-'\x{8C50}\x{8C55}\x{8C5A}\x{8C61}\x{8C62}\x{8C6A}\x{8C6B}\x{8C6C}\x{8C78}' .
-'\x{8C79}\x{8C7A}\x{8C7C}\x{8C82}\x{8C85}\x{8C89}\x{8C8A}\x{8C8C}\x{8C8D}' .
-'\x{8C8E}\x{8C94}\x{8C98}\x{8C9D}\x{8C9E}\x{8CA0}\x{8CA1}\x{8CA2}\x{8CA7}' .
-'\x{8CA8}\x{8CA9}\x{8CAA}\x{8CAB}\x{8CAC}\x{8CAD}\x{8CAE}\x{8CAF}\x{8CB0}' .
-'\x{8CB2}\x{8CB3}\x{8CB4}\x{8CB6}\x{8CB7}\x{8CB8}\x{8CBB}\x{8CBC}\x{8CBD}' .
-'\x{8CBF}\x{8CC0}\x{8CC1}\x{8CC2}\x{8CC3}\x{8CC4}\x{8CC7}\x{8CC8}\x{8CCA}' .
-'\x{8CCD}\x{8CCE}\x{8CD1}\x{8CD3}\x{8CDA}\x{8CDB}\x{8CDC}\x{8CDE}\x{8CE0}' .
-'\x{8CE2}\x{8CE3}\x{8CE4}\x{8CE6}\x{8CEA}\x{8CED}\x{8CFA}\x{8CFB}\x{8CFC}' .
-'\x{8CFD}\x{8D04}\x{8D05}\x{8D07}\x{8D08}\x{8D0A}\x{8D0B}\x{8D0D}\x{8D0F}' .
-'\x{8D10}\x{8D13}\x{8D14}\x{8D16}\x{8D64}\x{8D66}\x{8D67}\x{8D6B}\x{8D6D}' .
-'\x{8D70}\x{8D71}\x{8D73}\x{8D74}\x{8D77}\x{8D81}\x{8D85}\x{8D8A}\x{8D99}' .
-'\x{8DA3}\x{8DA8}\x{8DB3}\x{8DBA}\x{8DBE}\x{8DC2}\x{8DCB}\x{8DCC}\x{8DCF}' .
-'\x{8DD6}\x{8DDA}\x{8DDB}\x{8DDD}\x{8DDF}\x{8DE1}\x{8DE3}\x{8DE8}\x{8DEA}' .
-'\x{8DEB}\x{8DEF}\x{8DF3}\x{8DF5}\x{8DFC}\x{8DFF}\x{8E08}\x{8E09}\x{8E0A}' .
-'\x{8E0F}\x{8E10}\x{8E1D}\x{8E1E}\x{8E1F}\x{8E2A}\x{8E30}\x{8E34}\x{8E35}' .
-'\x{8E42}\x{8E44}\x{8E47}\x{8E48}\x{8E49}\x{8E4A}\x{8E4C}\x{8E50}\x{8E55}' .
-'\x{8E59}\x{8E5F}\x{8E60}\x{8E63}\x{8E64}\x{8E72}\x{8E74}\x{8E76}\x{8E7C}' .
-'\x{8E81}\x{8E84}\x{8E85}\x{8E87}\x{8E8A}\x{8E8B}\x{8E8D}\x{8E91}\x{8E93}' .
-'\x{8E94}\x{8E99}\x{8EA1}\x{8EAA}\x{8EAB}\x{8EAC}\x{8EAF}\x{8EB0}\x{8EB1}' .
-'\x{8EBE}\x{8EC5}\x{8EC6}\x{8EC8}\x{8ECA}\x{8ECB}\x{8ECC}\x{8ECD}\x{8ED2}' .
-'\x{8EDB}\x{8EDF}\x{8EE2}\x{8EE3}\x{8EEB}\x{8EF8}\x{8EFB}\x{8EFC}\x{8EFD}' .
-'\x{8EFE}\x{8F03}\x{8F05}\x{8F09}\x{8F0A}\x{8F0C}\x{8F12}\x{8F13}\x{8F14}' .
-'\x{8F15}\x{8F19}\x{8F1B}\x{8F1C}\x{8F1D}\x{8F1F}\x{8F26}\x{8F29}\x{8F2A}' .
-'\x{8F2F}\x{8F33}\x{8F38}\x{8F39}\x{8F3B}\x{8F3E}\x{8F3F}\x{8F42}\x{8F44}' .
-'\x{8F45}\x{8F46}\x{8F49}\x{8F4C}\x{8F4D}\x{8F4E}\x{8F57}\x{8F5C}\x{8F5F}' .
-'\x{8F61}\x{8F62}\x{8F63}\x{8F64}\x{8F9B}\x{8F9C}\x{8F9E}\x{8F9F}\x{8FA3}' .
-'\x{8FA7}\x{8FA8}\x{8FAD}\x{8FAE}\x{8FAF}\x{8FB0}\x{8FB1}\x{8FB2}\x{8FB7}' .
-'\x{8FBA}\x{8FBB}\x{8FBC}\x{8FBF}\x{8FC2}\x{8FC4}\x{8FC5}\x{8FCE}\x{8FD1}' .
-'\x{8FD4}\x{8FDA}\x{8FE2}\x{8FE5}\x{8FE6}\x{8FE9}\x{8FEA}\x{8FEB}\x{8FED}' .
-'\x{8FEF}\x{8FF0}\x{8FF4}\x{8FF7}\x{8FF8}\x{8FF9}\x{8FFA}\x{8FFD}\x{9000}' .
-'\x{9001}\x{9003}\x{9005}\x{9006}\x{900B}\x{900D}\x{900E}\x{900F}\x{9010}' .
-'\x{9011}\x{9013}\x{9014}\x{9015}\x{9016}\x{9017}\x{9019}\x{901A}\x{901D}' .
-'\x{901E}\x{901F}\x{9020}\x{9021}\x{9022}\x{9023}\x{9027}\x{902E}\x{9031}' .
-'\x{9032}\x{9035}\x{9036}\x{9038}\x{9039}\x{903C}\x{903E}\x{9041}\x{9042}' .
-'\x{9045}\x{9047}\x{9049}\x{904A}\x{904B}\x{904D}\x{904E}\x{904F}\x{9050}' .
-'\x{9051}\x{9052}\x{9053}\x{9054}\x{9055}\x{9056}\x{9058}\x{9059}\x{905C}' .
-'\x{905E}\x{9060}\x{9061}\x{9063}\x{9065}\x{9068}\x{9069}\x{906D}\x{906E}' .
-'\x{906F}\x{9072}\x{9075}\x{9076}\x{9077}\x{9078}\x{907A}\x{907C}\x{907D}' .
-'\x{907F}\x{9080}\x{9081}\x{9082}\x{9083}\x{9084}\x{9087}\x{9089}\x{908A}' .
-'\x{908F}\x{9091}\x{90A3}\x{90A6}\x{90A8}\x{90AA}\x{90AF}\x{90B1}\x{90B5}' .
-'\x{90B8}\x{90C1}\x{90CA}\x{90CE}\x{90DB}\x{90E1}\x{90E2}\x{90E4}\x{90E8}' .
-'\x{90ED}\x{90F5}\x{90F7}\x{90FD}\x{9102}\x{9112}\x{9119}\x{912D}\x{9130}' .
-'\x{9132}\x{9149}\x{914A}\x{914B}\x{914C}\x{914D}\x{914E}\x{9152}\x{9154}' .
-'\x{9156}\x{9158}\x{9162}\x{9163}\x{9165}\x{9169}\x{916A}\x{916C}\x{9172}' .
-'\x{9173}\x{9175}\x{9177}\x{9178}\x{9182}\x{9187}\x{9189}\x{918B}\x{918D}' .
-'\x{9190}\x{9192}\x{9197}\x{919C}\x{91A2}\x{91A4}\x{91AA}\x{91AB}\x{91AF}' .
-'\x{91B4}\x{91B5}\x{91B8}\x{91BA}\x{91C0}\x{91C1}\x{91C6}\x{91C7}\x{91C8}' .
-'\x{91C9}\x{91CB}\x{91CC}\x{91CD}\x{91CE}\x{91CF}\x{91D0}\x{91D1}\x{91D6}' .
-'\x{91D8}\x{91DB}\x{91DC}\x{91DD}\x{91DF}\x{91E1}\x{91E3}\x{91E6}\x{91E7}' .
-'\x{91F5}\x{91F6}\x{91FC}\x{91FF}\x{920D}\x{920E}\x{9211}\x{9214}\x{9215}' .
-'\x{921E}\x{9229}\x{922C}\x{9234}\x{9237}\x{923F}\x{9244}\x{9245}\x{9248}' .
-'\x{9249}\x{924B}\x{9250}\x{9257}\x{925A}\x{925B}\x{925E}\x{9262}\x{9264}' .
-'\x{9266}\x{9271}\x{927E}\x{9280}\x{9283}\x{9285}\x{9291}\x{9293}\x{9295}' .
-'\x{9296}\x{9298}\x{929A}\x{929B}\x{929C}\x{92AD}\x{92B7}\x{92B9}\x{92CF}' .
-'\x{92D2}\x{92E4}\x{92E9}\x{92EA}\x{92ED}\x{92F2}\x{92F3}\x{92F8}\x{92FA}' .
-'\x{92FC}\x{9306}\x{930F}\x{9310}\x{9318}\x{9319}\x{931A}\x{9320}\x{9322}' .
-'\x{9323}\x{9326}\x{9328}\x{932B}\x{932C}\x{932E}\x{932F}\x{9332}\x{9335}' .
-'\x{933A}\x{933B}\x{9344}\x{934B}\x{934D}\x{9354}\x{9356}\x{935B}\x{935C}' .
-'\x{9360}\x{936C}\x{936E}\x{9375}\x{937C}\x{937E}\x{938C}\x{9394}\x{9396}' .
-'\x{9397}\x{939A}\x{93A7}\x{93AC}\x{93AD}\x{93AE}\x{93B0}\x{93B9}\x{93C3}' .
-'\x{93C8}\x{93D0}\x{93D1}\x{93D6}\x{93D7}\x{93D8}\x{93DD}\x{93E1}\x{93E4}' .
-'\x{93E5}\x{93E8}\x{9403}\x{9407}\x{9410}\x{9413}\x{9414}\x{9418}\x{9419}' .
-'\x{941A}\x{9421}\x{942B}\x{9435}\x{9436}\x{9438}\x{943A}\x{9441}\x{9444}' .
-'\x{9451}\x{9452}\x{9453}\x{945A}\x{945B}\x{945E}\x{9460}\x{9462}\x{946A}' .
-'\x{9470}\x{9475}\x{9477}\x{947C}\x{947D}\x{947E}\x{947F}\x{9481}\x{9577}' .
-'\x{9580}\x{9582}\x{9583}\x{9587}\x{9589}\x{958A}\x{958B}\x{958F}\x{9591}' .
-'\x{9593}\x{9594}\x{9596}\x{9598}\x{9599}\x{95A0}\x{95A2}\x{95A3}\x{95A4}' .
-'\x{95A5}\x{95A7}\x{95A8}\x{95AD}\x{95B2}\x{95B9}\x{95BB}\x{95BC}\x{95BE}' .
-'\x{95C3}\x{95C7}\x{95CA}\x{95CC}\x{95CD}\x{95D4}\x{95D5}\x{95D6}\x{95D8}' .
-'\x{95DC}\x{95E1}\x{95E2}\x{95E5}\x{961C}\x{9621}\x{9628}\x{962A}\x{962E}' .
-'\x{962F}\x{9632}\x{963B}\x{963F}\x{9640}\x{9642}\x{9644}\x{964B}\x{964C}' .
-'\x{964D}\x{964F}\x{9650}\x{965B}\x{965C}\x{965D}\x{965E}\x{965F}\x{9662}' .
-'\x{9663}\x{9664}\x{9665}\x{9666}\x{966A}\x{966C}\x{9670}\x{9672}\x{9673}' .
-'\x{9675}\x{9676}\x{9677}\x{9678}\x{967A}\x{967D}\x{9685}\x{9686}\x{9688}' .
-'\x{968A}\x{968B}\x{968D}\x{968E}\x{968F}\x{9694}\x{9695}\x{9697}\x{9698}' .
-'\x{9699}\x{969B}\x{969C}\x{96A0}\x{96A3}\x{96A7}\x{96A8}\x{96AA}\x{96B0}' .
-'\x{96B1}\x{96B2}\x{96B4}\x{96B6}\x{96B7}\x{96B8}\x{96B9}\x{96BB}\x{96BC}' .
-'\x{96C0}\x{96C1}\x{96C4}\x{96C5}\x{96C6}\x{96C7}\x{96C9}\x{96CB}\x{96CC}' .
-'\x{96CD}\x{96CE}\x{96D1}\x{96D5}\x{96D6}\x{96D9}\x{96DB}\x{96DC}\x{96E2}' .
-'\x{96E3}\x{96E8}\x{96EA}\x{96EB}\x{96F0}\x{96F2}\x{96F6}\x{96F7}\x{96F9}' .
-'\x{96FB}\x{9700}\x{9704}\x{9706}\x{9707}\x{9708}\x{970A}\x{970D}\x{970E}' .
-'\x{970F}\x{9711}\x{9713}\x{9716}\x{9719}\x{971C}\x{971E}\x{9724}\x{9727}' .
-'\x{972A}\x{9730}\x{9732}\x{9738}\x{9739}\x{973D}\x{973E}\x{9742}\x{9744}' .
-'\x{9746}\x{9748}\x{9749}\x{9752}\x{9756}\x{9759}\x{975C}\x{975E}\x{9760}' .
-'\x{9761}\x{9762}\x{9764}\x{9766}\x{9768}\x{9769}\x{976B}\x{976D}\x{9771}' .
-'\x{9774}\x{9779}\x{977A}\x{977C}\x{9781}\x{9784}\x{9785}\x{9786}\x{978B}' .
-'\x{978D}\x{978F}\x{9790}\x{9798}\x{979C}\x{97A0}\x{97A3}\x{97A6}\x{97A8}' .
-'\x{97AB}\x{97AD}\x{97B3}\x{97B4}\x{97C3}\x{97C6}\x{97C8}\x{97CB}\x{97D3}' .
-'\x{97DC}\x{97ED}\x{97EE}\x{97F2}\x{97F3}\x{97F5}\x{97F6}\x{97FB}\x{97FF}' .
-'\x{9801}\x{9802}\x{9803}\x{9805}\x{9806}\x{9808}\x{980C}\x{980F}\x{9810}' .
-'\x{9811}\x{9812}\x{9813}\x{9817}\x{9818}\x{981A}\x{9821}\x{9824}\x{982C}' .
-'\x{982D}\x{9834}\x{9837}\x{9838}\x{983B}\x{983C}\x{983D}\x{9846}\x{984B}' .
-'\x{984C}\x{984D}\x{984E}\x{984F}\x{9854}\x{9855}\x{9858}\x{985B}\x{985E}' .
-'\x{9867}\x{986B}\x{986F}\x{9870}\x{9871}\x{9873}\x{9874}\x{98A8}\x{98AA}' .
-'\x{98AF}\x{98B1}\x{98B6}\x{98C3}\x{98C4}\x{98C6}\x{98DB}\x{98DC}\x{98DF}' .
-'\x{98E2}\x{98E9}\x{98EB}\x{98ED}\x{98EE}\x{98EF}\x{98F2}\x{98F4}\x{98FC}' .
-'\x{98FD}\x{98FE}\x{9903}\x{9905}\x{9909}\x{990A}\x{990C}\x{9910}\x{9912}' .
-'\x{9913}\x{9914}\x{9918}\x{991D}\x{991E}\x{9920}\x{9921}\x{9924}\x{9928}' .
-'\x{992C}\x{992E}\x{993D}\x{993E}\x{9942}\x{9945}\x{9949}\x{994B}\x{994C}' .
-'\x{9950}\x{9951}\x{9952}\x{9955}\x{9957}\x{9996}\x{9997}\x{9998}\x{9999}' .
-'\x{99A5}\x{99A8}\x{99AC}\x{99AD}\x{99AE}\x{99B3}\x{99B4}\x{99BC}\x{99C1}' .
-'\x{99C4}\x{99C5}\x{99C6}\x{99C8}\x{99D0}\x{99D1}\x{99D2}\x{99D5}\x{99D8}' .
-'\x{99DB}\x{99DD}\x{99DF}\x{99E2}\x{99ED}\x{99EE}\x{99F1}\x{99F2}\x{99F8}' .
-'\x{99FB}\x{99FF}\x{9A01}\x{9A05}\x{9A0E}\x{9A0F}\x{9A12}\x{9A13}\x{9A19}' .
-'\x{9A28}\x{9A2B}\x{9A30}\x{9A37}\x{9A3E}\x{9A40}\x{9A42}\x{9A43}\x{9A45}' .
-'\x{9A4D}\x{9A55}\x{9A57}\x{9A5A}\x{9A5B}\x{9A5F}\x{9A62}\x{9A64}\x{9A65}' .
-'\x{9A69}\x{9A6A}\x{9A6B}\x{9AA8}\x{9AAD}\x{9AB0}\x{9AB8}\x{9ABC}\x{9AC0}' .
-'\x{9AC4}\x{9ACF}\x{9AD1}\x{9AD3}\x{9AD4}\x{9AD8}\x{9ADE}\x{9ADF}\x{9AE2}' .
-'\x{9AE3}\x{9AE6}\x{9AEA}\x{9AEB}\x{9AED}\x{9AEE}\x{9AEF}\x{9AF1}\x{9AF4}' .
-'\x{9AF7}\x{9AFB}\x{9B06}\x{9B18}\x{9B1A}\x{9B1F}\x{9B22}\x{9B23}\x{9B25}' .
-'\x{9B27}\x{9B28}\x{9B29}\x{9B2A}\x{9B2E}\x{9B2F}\x{9B31}\x{9B32}\x{9B3B}' .
-'\x{9B3C}\x{9B41}\x{9B42}\x{9B43}\x{9B44}\x{9B45}\x{9B4D}\x{9B4E}\x{9B4F}' .
-'\x{9B51}\x{9B54}\x{9B58}\x{9B5A}\x{9B6F}\x{9B74}\x{9B83}\x{9B8E}\x{9B91}' .
-'\x{9B92}\x{9B93}\x{9B96}\x{9B97}\x{9B9F}\x{9BA0}\x{9BA8}\x{9BAA}\x{9BAB}' .
-'\x{9BAD}\x{9BAE}\x{9BB4}\x{9BB9}\x{9BC0}\x{9BC6}\x{9BC9}\x{9BCA}\x{9BCF}' .
-'\x{9BD1}\x{9BD2}\x{9BD4}\x{9BD6}\x{9BDB}\x{9BE1}\x{9BE2}\x{9BE3}\x{9BE4}' .
-'\x{9BE8}\x{9BF0}\x{9BF1}\x{9BF2}\x{9BF5}\x{9C04}\x{9C06}\x{9C08}\x{9C09}' .
-'\x{9C0A}\x{9C0C}\x{9C0D}\x{9C10}\x{9C12}\x{9C13}\x{9C14}\x{9C15}\x{9C1B}' .
-'\x{9C21}\x{9C24}\x{9C25}\x{9C2D}\x{9C2E}\x{9C2F}\x{9C30}\x{9C32}\x{9C39}' .
-'\x{9C3A}\x{9C3B}\x{9C3E}\x{9C46}\x{9C47}\x{9C48}\x{9C52}\x{9C57}\x{9C5A}' .
-'\x{9C60}\x{9C67}\x{9C76}\x{9C78}\x{9CE5}\x{9CE7}\x{9CE9}\x{9CEB}\x{9CEC}' .
-'\x{9CF0}\x{9CF3}\x{9CF4}\x{9CF6}\x{9D03}\x{9D06}\x{9D07}\x{9D08}\x{9D09}' .
-'\x{9D0E}\x{9D12}\x{9D15}\x{9D1B}\x{9D1F}\x{9D23}\x{9D26}\x{9D28}\x{9D2A}' .
-'\x{9D2B}\x{9D2C}\x{9D3B}\x{9D3E}\x{9D3F}\x{9D41}\x{9D44}\x{9D46}\x{9D48}' .
-'\x{9D50}\x{9D51}\x{9D59}\x{9D5C}\x{9D5D}\x{9D5E}\x{9D60}\x{9D61}\x{9D64}' .
-'\x{9D6C}\x{9D6F}\x{9D72}\x{9D7A}\x{9D87}\x{9D89}\x{9D8F}\x{9D9A}\x{9DA4}' .
-'\x{9DA9}\x{9DAB}\x{9DAF}\x{9DB2}\x{9DB4}\x{9DB8}\x{9DBA}\x{9DBB}\x{9DC1}' .
-'\x{9DC2}\x{9DC4}\x{9DC6}\x{9DCF}\x{9DD3}\x{9DD9}\x{9DE6}\x{9DED}\x{9DEF}' .
-'\x{9DF2}\x{9DF8}\x{9DF9}\x{9DFA}\x{9DFD}\x{9E1A}\x{9E1B}\x{9E1E}\x{9E75}' .
-'\x{9E78}\x{9E79}\x{9E7D}\x{9E7F}\x{9E81}\x{9E88}\x{9E8B}\x{9E8C}\x{9E91}' .
-'\x{9E92}\x{9E93}\x{9E95}\x{9E97}\x{9E9D}\x{9E9F}\x{9EA5}\x{9EA6}\x{9EA9}' .
-'\x{9EAA}\x{9EAD}\x{9EB8}\x{9EB9}\x{9EBA}\x{9EBB}\x{9EBC}\x{9EBE}\x{9EBF}' .
-'\x{9EC4}\x{9ECC}\x{9ECD}\x{9ECE}\x{9ECF}\x{9ED0}\x{9ED2}\x{9ED4}\x{9ED8}' .
-'\x{9ED9}\x{9EDB}\x{9EDC}\x{9EDD}\x{9EDE}\x{9EE0}\x{9EE5}\x{9EE8}\x{9EEF}' .
-'\x{9EF4}\x{9EF6}\x{9EF7}\x{9EF9}\x{9EFB}\x{9EFC}\x{9EFD}\x{9F07}\x{9F08}' .
-'\x{9F0E}\x{9F13}\x{9F15}\x{9F20}\x{9F21}\x{9F2C}\x{9F3B}\x{9F3E}\x{9F4A}' .
-'\x{9F4B}\x{9F4E}\x{9F4F}\x{9F52}\x{9F54}\x{9F5F}\x{9F60}\x{9F61}\x{9F62}' .
-'\x{9F63}\x{9F66}\x{9F67}\x{9F6A}\x{9F6C}\x{9F72}\x{9F76}\x{9F77}\x{9F8D}' .
-'\x{9F95}\x{9F9C}\x{9F9D}\x{9FA0}]{1,15}$/iu',
-    12 => '/^[\x{002d}0-9a-z\x{3447}\x{3473}\x{359E}\x{360E}\x{361A}\x{3918}\x{396E}\x{39CF}\x{39D0}' .
-'\x{39DF}\x{3A73}\x{3B4E}\x{3C6E}\x{3CE0}\x{4056}\x{415F}\x{4337}\x{43AC}' .
-'\x{43B1}\x{43DD}\x{44D6}\x{464C}\x{4661}\x{4723}\x{4729}\x{477C}\x{478D}' .
-'\x{4947}\x{497A}\x{497D}\x{4982}\x{4983}\x{4985}\x{4986}\x{499B}\x{499F}' .
-'\x{49B6}\x{49B7}\x{4C77}\x{4C9F}\x{4CA0}\x{4CA1}\x{4CA2}\x{4CA3}\x{4D13}' .
-'\x{4D14}\x{4D15}\x{4D16}\x{4D17}\x{4D18}\x{4D19}\x{4DAE}\x{4E00}\x{4E01}' .
-'\x{4E02}\x{4E03}\x{4E04}\x{4E05}\x{4E06}\x{4E07}\x{4E08}\x{4E09}\x{4E0A}' .
-'\x{4E0B}\x{4E0C}\x{4E0D}\x{4E0E}\x{4E0F}\x{4E10}\x{4E11}\x{4E13}\x{4E14}' .
-'\x{4E15}\x{4E16}\x{4E17}\x{4E18}\x{4E19}\x{4E1A}\x{4E1B}\x{4E1C}\x{4E1D}' .
-'\x{4E1E}\x{4E1F}\x{4E20}\x{4E21}\x{4E22}\x{4E23}\x{4E24}\x{4E25}\x{4E26}' .
-'\x{4E27}\x{4E28}\x{4E2A}\x{4E2B}\x{4E2C}\x{4E2D}\x{4E2E}\x{4E2F}\x{4E30}' .
-'\x{4E31}\x{4E32}\x{4E33}\x{4E34}\x{4E35}\x{4E36}\x{4E37}\x{4E38}\x{4E39}' .
-'\x{4E3A}\x{4E3B}\x{4E3C}\x{4E3D}\x{4E3E}\x{4E3F}\x{4E40}\x{4E41}\x{4E42}' .
-'\x{4E43}\x{4E44}\x{4E45}\x{4E46}\x{4E47}\x{4E48}\x{4E49}\x{4E4A}\x{4E4B}' .
-'\x{4E4C}\x{4E4D}\x{4E4E}\x{4E4F}\x{4E50}\x{4E51}\x{4E52}\x{4E53}\x{4E54}' .
-'\x{4E56}\x{4E57}\x{4E58}\x{4E59}\x{4E5A}\x{4E5B}\x{4E5C}\x{4E5D}\x{4E5E}' .
-'\x{4E5F}\x{4E60}\x{4E61}\x{4E62}\x{4E63}\x{4E64}\x{4E65}\x{4E66}\x{4E67}' .
-'\x{4E69}\x{4E6A}\x{4E6B}\x{4E6C}\x{4E6D}\x{4E6E}\x{4E6F}\x{4E70}\x{4E71}' .
-'\x{4E72}\x{4E73}\x{4E74}\x{4E75}\x{4E76}\x{4E77}\x{4E78}\x{4E7A}\x{4E7B}' .
-'\x{4E7C}\x{4E7D}\x{4E7E}\x{4E7F}\x{4E80}\x{4E81}\x{4E82}\x{4E83}\x{4E84}' .
-'\x{4E85}\x{4E86}\x{4E87}\x{4E88}\x{4E89}\x{4E8B}\x{4E8C}\x{4E8D}\x{4E8E}' .
-'\x{4E8F}\x{4E90}\x{4E91}\x{4E92}\x{4E93}\x{4E94}\x{4E95}\x{4E97}\x{4E98}' .
-'\x{4E99}\x{4E9A}\x{4E9B}\x{4E9C}\x{4E9D}\x{4E9E}\x{4E9F}\x{4EA0}\x{4EA1}' .
-'\x{4EA2}\x{4EA4}\x{4EA5}\x{4EA6}\x{4EA7}\x{4EA8}\x{4EA9}\x{4EAA}\x{4EAB}' .
-'\x{4EAC}\x{4EAD}\x{4EAE}\x{4EAF}\x{4EB0}\x{4EB1}\x{4EB2}\x{4EB3}\x{4EB4}' .
-'\x{4EB5}\x{4EB6}\x{4EB7}\x{4EB8}\x{4EB9}\x{4EBA}\x{4EBB}\x{4EBD}\x{4EBE}' .
-'\x{4EBF}\x{4EC0}\x{4EC1}\x{4EC2}\x{4EC3}\x{4EC4}\x{4EC5}\x{4EC6}\x{4EC7}' .
-'\x{4EC8}\x{4EC9}\x{4ECA}\x{4ECB}\x{4ECD}\x{4ECE}\x{4ECF}\x{4ED0}\x{4ED1}' .
-'\x{4ED2}\x{4ED3}\x{4ED4}\x{4ED5}\x{4ED6}\x{4ED7}\x{4ED8}\x{4ED9}\x{4EDA}' .
-'\x{4EDB}\x{4EDC}\x{4EDD}\x{4EDE}\x{4EDF}\x{4EE0}\x{4EE1}\x{4EE2}\x{4EE3}' .
-'\x{4EE4}\x{4EE5}\x{4EE6}\x{4EE8}\x{4EE9}\x{4EEA}\x{4EEB}\x{4EEC}\x{4EEF}' .
-'\x{4EF0}\x{4EF1}\x{4EF2}\x{4EF3}\x{4EF4}\x{4EF5}\x{4EF6}\x{4EF7}\x{4EFB}' .
-'\x{4EFD}\x{4EFF}\x{4F00}\x{4F01}\x{4F02}\x{4F03}\x{4F04}\x{4F05}\x{4F06}' .
-'\x{4F08}\x{4F09}\x{4F0A}\x{4F0B}\x{4F0C}\x{4F0D}\x{4F0E}\x{4F0F}\x{4F10}' .
-'\x{4F11}\x{4F12}\x{4F13}\x{4F14}\x{4F15}\x{4F17}\x{4F18}\x{4F19}\x{4F1A}' .
-'\x{4F1B}\x{4F1C}\x{4F1D}\x{4F1E}\x{4F1F}\x{4F20}\x{4F21}\x{4F22}\x{4F23}' .
-'\x{4F24}\x{4F25}\x{4F26}\x{4F27}\x{4F29}\x{4F2A}\x{4F2B}\x{4F2C}\x{4F2D}' .
-'\x{4F2E}\x{4F2F}\x{4F30}\x{4F32}\x{4F33}\x{4F34}\x{4F36}\x{4F38}\x{4F39}' .
-'\x{4F3A}\x{4F3B}\x{4F3C}\x{4F3D}\x{4F3E}\x{4F3F}\x{4F41}\x{4F42}\x{4F43}' .
-'\x{4F45}\x{4F46}\x{4F47}\x{4F48}\x{4F49}\x{4F4A}\x{4F4B}\x{4F4C}\x{4F4D}' .
-'\x{4F4E}\x{4F4F}\x{4F50}\x{4F51}\x{4F52}\x{4F53}\x{4F54}\x{4F55}\x{4F56}' .
-'\x{4F57}\x{4F58}\x{4F59}\x{4F5A}\x{4F5B}\x{4F5C}\x{4F5D}\x{4F5E}\x{4F5F}' .
-'\x{4F60}\x{4F61}\x{4F62}\x{4F63}\x{4F64}\x{4F65}\x{4F66}\x{4F67}\x{4F68}' .
-'\x{4F69}\x{4F6A}\x{4F6B}\x{4F6C}\x{4F6D}\x{4F6E}\x{4F6F}\x{4F70}\x{4F72}' .
-'\x{4F73}\x{4F74}\x{4F75}\x{4F76}\x{4F77}\x{4F78}\x{4F79}\x{4F7A}\x{4F7B}' .
-'\x{4F7C}\x{4F7D}\x{4F7E}\x{4F7F}\x{4F80}\x{4F81}\x{4F82}\x{4F83}\x{4F84}' .
-'\x{4F85}\x{4F86}\x{4F87}\x{4F88}\x{4F89}\x{4F8A}\x{4F8B}\x{4F8D}\x{4F8F}' .
-'\x{4F90}\x{4F91}\x{4F92}\x{4F93}\x{4F94}\x{4F95}\x{4F96}\x{4F97}\x{4F98}' .
-'\x{4F99}\x{4F9A}\x{4F9B}\x{4F9C}\x{4F9D}\x{4F9E}\x{4F9F}\x{4FA0}\x{4FA1}' .
-'\x{4FA3}\x{4FA4}\x{4FA5}\x{4FA6}\x{4FA7}\x{4FA8}\x{4FA9}\x{4FAA}\x{4FAB}' .
-'\x{4FAC}\x{4FAE}\x{4FAF}\x{4FB0}\x{4FB1}\x{4FB2}\x{4FB3}\x{4FB4}\x{4FB5}' .
-'\x{4FB6}\x{4FB7}\x{4FB8}\x{4FB9}\x{4FBA}\x{4FBB}\x{4FBC}\x{4FBE}\x{4FBF}' .
-'\x{4FC0}\x{4FC1}\x{4FC2}\x{4FC3}\x{4FC4}\x{4FC5}\x{4FC7}\x{4FC9}\x{4FCA}' .
-'\x{4FCB}\x{4FCD}\x{4FCE}\x{4FCF}\x{4FD0}\x{4FD1}\x{4FD2}\x{4FD3}\x{4FD4}' .
-'\x{4FD5}\x{4FD6}\x{4FD7}\x{4FD8}\x{4FD9}\x{4FDA}\x{4FDB}\x{4FDC}\x{4FDD}' .
-'\x{4FDE}\x{4FDF}\x{4FE0}\x{4FE1}\x{4FE3}\x{4FE4}\x{4FE5}\x{4FE6}\x{4FE7}' .
-'\x{4FE8}\x{4FE9}\x{4FEA}\x{4FEB}\x{4FEC}\x{4FED}\x{4FEE}\x{4FEF}\x{4FF0}' .
-'\x{4FF1}\x{4FF2}\x{4FF3}\x{4FF4}\x{4FF5}\x{4FF6}\x{4FF7}\x{4FF8}\x{4FF9}' .
-'\x{4FFA}\x{4FFB}\x{4FFE}\x{4FFF}\x{5000}\x{5001}\x{5002}\x{5003}\x{5004}' .
-'\x{5005}\x{5006}\x{5007}\x{5008}\x{5009}\x{500A}\x{500B}\x{500C}\x{500D}' .
-'\x{500E}\x{500F}\x{5011}\x{5012}\x{5013}\x{5014}\x{5015}\x{5016}\x{5017}' .
-'\x{5018}\x{5019}\x{501A}\x{501B}\x{501C}\x{501D}\x{501E}\x{501F}\x{5020}' .
-'\x{5021}\x{5022}\x{5023}\x{5024}\x{5025}\x{5026}\x{5027}\x{5028}\x{5029}' .
-'\x{502A}\x{502B}\x{502C}\x{502D}\x{502E}\x{502F}\x{5030}\x{5031}\x{5032}' .
-'\x{5033}\x{5035}\x{5036}\x{5037}\x{5039}\x{503A}\x{503B}\x{503C}\x{503E}' .
-'\x{503F}\x{5040}\x{5041}\x{5043}\x{5044}\x{5045}\x{5046}\x{5047}\x{5048}' .
-'\x{5049}\x{504A}\x{504B}\x{504C}\x{504D}\x{504E}\x{504F}\x{5051}\x{5053}' .
-'\x{5054}\x{5055}\x{5056}\x{5057}\x{5059}\x{505A}\x{505B}\x{505C}\x{505D}' .
-'\x{505E}\x{505F}\x{5060}\x{5061}\x{5062}\x{5063}\x{5064}\x{5065}\x{5066}' .
-'\x{5067}\x{5068}\x{5069}\x{506A}\x{506B}\x{506C}\x{506D}\x{506E}\x{506F}' .
-'\x{5070}\x{5071}\x{5072}\x{5073}\x{5074}\x{5075}\x{5076}\x{5077}\x{5078}' .
-'\x{5079}\x{507A}\x{507B}\x{507D}\x{507E}\x{507F}\x{5080}\x{5082}\x{5083}' .
-'\x{5084}\x{5085}\x{5086}\x{5087}\x{5088}\x{5089}\x{508A}\x{508B}\x{508C}' .
-'\x{508D}\x{508E}\x{508F}\x{5090}\x{5091}\x{5092}\x{5094}\x{5095}\x{5096}' .
-'\x{5098}\x{5099}\x{509A}\x{509B}\x{509C}\x{509D}\x{509E}\x{50A2}\x{50A3}' .
-'\x{50A4}\x{50A5}\x{50A6}\x{50A7}\x{50A8}\x{50A9}\x{50AA}\x{50AB}\x{50AC}' .
-'\x{50AD}\x{50AE}\x{50AF}\x{50B0}\x{50B1}\x{50B2}\x{50B3}\x{50B4}\x{50B5}' .
-'\x{50B6}\x{50B7}\x{50B8}\x{50BA}\x{50BB}\x{50BC}\x{50BD}\x{50BE}\x{50BF}' .
-'\x{50C0}\x{50C1}\x{50C2}\x{50C4}\x{50C5}\x{50C6}\x{50C7}\x{50C8}\x{50C9}' .
-'\x{50CA}\x{50CB}\x{50CC}\x{50CD}\x{50CE}\x{50CF}\x{50D0}\x{50D1}\x{50D2}' .
-'\x{50D3}\x{50D4}\x{50D5}\x{50D6}\x{50D7}\x{50D9}\x{50DA}\x{50DB}\x{50DC}' .
-'\x{50DD}\x{50DE}\x{50E0}\x{50E3}\x{50E4}\x{50E5}\x{50E6}\x{50E7}\x{50E8}' .
-'\x{50E9}\x{50EA}\x{50EC}\x{50ED}\x{50EE}\x{50EF}\x{50F0}\x{50F1}\x{50F2}' .
-'\x{50F3}\x{50F5}\x{50F6}\x{50F8}\x{50F9}\x{50FA}\x{50FB}\x{50FC}\x{50FD}' .
-'\x{50FE}\x{50FF}\x{5100}\x{5101}\x{5102}\x{5103}\x{5104}\x{5105}\x{5106}' .
-'\x{5107}\x{5108}\x{5109}\x{510A}\x{510B}\x{510C}\x{510D}\x{510E}\x{510F}' .
-'\x{5110}\x{5111}\x{5112}\x{5113}\x{5114}\x{5115}\x{5116}\x{5117}\x{5118}' .
-'\x{5119}\x{511A}\x{511C}\x{511D}\x{511E}\x{511F}\x{5120}\x{5121}\x{5122}' .
-'\x{5123}\x{5124}\x{5125}\x{5126}\x{5127}\x{5129}\x{512A}\x{512C}\x{512D}' .
-'\x{512E}\x{512F}\x{5130}\x{5131}\x{5132}\x{5133}\x{5134}\x{5135}\x{5136}' .
-'\x{5137}\x{5138}\x{5139}\x{513A}\x{513B}\x{513C}\x{513D}\x{513E}\x{513F}' .
-'\x{5140}\x{5141}\x{5143}\x{5144}\x{5145}\x{5146}\x{5147}\x{5148}\x{5149}' .
-'\x{514B}\x{514C}\x{514D}\x{514E}\x{5150}\x{5151}\x{5152}\x{5154}\x{5155}' .
-'\x{5156}\x{5157}\x{5159}\x{515A}\x{515B}\x{515C}\x{515D}\x{515E}\x{515F}' .
-'\x{5161}\x{5162}\x{5163}\x{5165}\x{5166}\x{5167}\x{5168}\x{5169}\x{516A}' .
-'\x{516B}\x{516C}\x{516D}\x{516E}\x{516F}\x{5170}\x{5171}\x{5173}\x{5174}' .
-'\x{5175}\x{5176}\x{5177}\x{5178}\x{5179}\x{517A}\x{517B}\x{517C}\x{517D}' .
-'\x{517F}\x{5180}\x{5181}\x{5182}\x{5185}\x{5186}\x{5187}\x{5188}\x{5189}' .
-'\x{518A}\x{518B}\x{518C}\x{518D}\x{518F}\x{5190}\x{5191}\x{5192}\x{5193}' .
-'\x{5194}\x{5195}\x{5196}\x{5197}\x{5198}\x{5199}\x{519A}\x{519B}\x{519C}' .
-'\x{519D}\x{519E}\x{519F}\x{51A0}\x{51A2}\x{51A4}\x{51A5}\x{51A6}\x{51A7}' .
-'\x{51A8}\x{51AA}\x{51AB}\x{51AC}\x{51AE}\x{51AF}\x{51B0}\x{51B1}\x{51B2}' .
-'\x{51B3}\x{51B5}\x{51B6}\x{51B7}\x{51B9}\x{51BB}\x{51BC}\x{51BD}\x{51BE}' .
-'\x{51BF}\x{51C0}\x{51C1}\x{51C3}\x{51C4}\x{51C5}\x{51C6}\x{51C7}\x{51C8}' .
-'\x{51C9}\x{51CA}\x{51CB}\x{51CC}\x{51CD}\x{51CE}\x{51CF}\x{51D0}\x{51D1}' .
-'\x{51D4}\x{51D5}\x{51D6}\x{51D7}\x{51D8}\x{51D9}\x{51DA}\x{51DB}\x{51DC}' .
-'\x{51DD}\x{51DE}\x{51E0}\x{51E1}\x{51E2}\x{51E3}\x{51E4}\x{51E5}\x{51E7}' .
-'\x{51E8}\x{51E9}\x{51EA}\x{51EB}\x{51ED}\x{51EF}\x{51F0}\x{51F1}\x{51F3}' .
-'\x{51F4}\x{51F5}\x{51F6}\x{51F7}\x{51F8}\x{51F9}\x{51FA}\x{51FB}\x{51FC}' .
-'\x{51FD}\x{51FE}\x{51FF}\x{5200}\x{5201}\x{5202}\x{5203}\x{5204}\x{5205}' .
-'\x{5206}\x{5207}\x{5208}\x{5209}\x{520A}\x{520B}\x{520C}\x{520D}\x{520E}' .
-'\x{520F}\x{5210}\x{5211}\x{5212}\x{5213}\x{5214}\x{5215}\x{5216}\x{5217}' .
-'\x{5218}\x{5219}\x{521A}\x{521B}\x{521C}\x{521D}\x{521E}\x{521F}\x{5220}' .
-'\x{5221}\x{5222}\x{5223}\x{5224}\x{5225}\x{5226}\x{5228}\x{5229}\x{522A}' .
-'\x{522B}\x{522C}\x{522D}\x{522E}\x{522F}\x{5230}\x{5231}\x{5232}\x{5233}' .
-'\x{5234}\x{5235}\x{5236}\x{5237}\x{5238}\x{5239}\x{523A}\x{523B}\x{523C}' .
-'\x{523D}\x{523E}\x{523F}\x{5240}\x{5241}\x{5242}\x{5243}\x{5244}\x{5245}' .
-'\x{5246}\x{5247}\x{5248}\x{5249}\x{524A}\x{524B}\x{524C}\x{524D}\x{524E}' .
-'\x{5250}\x{5251}\x{5252}\x{5254}\x{5255}\x{5256}\x{5257}\x{5258}\x{5259}' .
-'\x{525A}\x{525B}\x{525C}\x{525D}\x{525E}\x{525F}\x{5260}\x{5261}\x{5262}' .
-'\x{5263}\x{5264}\x{5265}\x{5267}\x{5268}\x{5269}\x{526A}\x{526B}\x{526C}' .
-'\x{526D}\x{526E}\x{526F}\x{5270}\x{5272}\x{5273}\x{5274}\x{5275}\x{5276}' .
-'\x{5277}\x{5278}\x{527A}\x{527B}\x{527C}\x{527D}\x{527E}\x{527F}\x{5280}' .
-'\x{5281}\x{5282}\x{5283}\x{5284}\x{5286}\x{5287}\x{5288}\x{5289}\x{528A}' .
-'\x{528B}\x{528C}\x{528D}\x{528F}\x{5290}\x{5291}\x{5292}\x{5293}\x{5294}' .
-'\x{5295}\x{5296}\x{5297}\x{5298}\x{5299}\x{529A}\x{529B}\x{529C}\x{529D}' .
-'\x{529E}\x{529F}\x{52A0}\x{52A1}\x{52A2}\x{52A3}\x{52A5}\x{52A6}\x{52A7}' .
-'\x{52A8}\x{52A9}\x{52AA}\x{52AB}\x{52AC}\x{52AD}\x{52AE}\x{52AF}\x{52B0}' .
-'\x{52B1}\x{52B2}\x{52B3}\x{52B4}\x{52B5}\x{52B6}\x{52B7}\x{52B8}\x{52B9}' .
-'\x{52BA}\x{52BB}\x{52BC}\x{52BD}\x{52BE}\x{52BF}\x{52C0}\x{52C1}\x{52C2}' .
-'\x{52C3}\x{52C6}\x{52C7}\x{52C9}\x{52CA}\x{52CB}\x{52CD}\x{52CF}\x{52D0}' .
-'\x{52D2}\x{52D3}\x{52D5}\x{52D6}\x{52D7}\x{52D8}\x{52D9}\x{52DA}\x{52DB}' .
-'\x{52DC}\x{52DD}\x{52DE}\x{52DF}\x{52E0}\x{52E2}\x{52E3}\x{52E4}\x{52E6}' .
-'\x{52E7}\x{52E8}\x{52E9}\x{52EA}\x{52EB}\x{52EC}\x{52ED}\x{52EF}\x{52F0}' .
-'\x{52F1}\x{52F2}\x{52F3}\x{52F4}\x{52F5}\x{52F6}\x{52F7}\x{52F8}\x{52F9}' .
-'\x{52FA}\x{52FB}\x{52FC}\x{52FD}\x{52FE}\x{52FF}\x{5300}\x{5301}\x{5302}' .
-'\x{5305}\x{5306}\x{5307}\x{5308}\x{5309}\x{530A}\x{530B}\x{530C}\x{530D}' .
-'\x{530E}\x{530F}\x{5310}\x{5311}\x{5312}\x{5313}\x{5314}\x{5315}\x{5316}' .
-'\x{5317}\x{5319}\x{531A}\x{531C}\x{531D}\x{531F}\x{5320}\x{5321}\x{5322}' .
-'\x{5323}\x{5324}\x{5325}\x{5326}\x{5328}\x{532A}\x{532B}\x{532C}\x{532D}' .
-'\x{532E}\x{532F}\x{5330}\x{5331}\x{5333}\x{5334}\x{5337}\x{5339}\x{533A}' .
-'\x{533B}\x{533C}\x{533D}\x{533E}\x{533F}\x{5340}\x{5341}\x{5343}\x{5344}' .
-'\x{5345}\x{5346}\x{5347}\x{5348}\x{5349}\x{534A}\x{534B}\x{534C}\x{534D}' .
-'\x{534E}\x{534F}\x{5350}\x{5351}\x{5352}\x{5353}\x{5354}\x{5355}\x{5356}' .
-'\x{5357}\x{5358}\x{5359}\x{535A}\x{535C}\x{535E}\x{535F}\x{5360}\x{5361}' .
-'\x{5362}\x{5363}\x{5364}\x{5365}\x{5366}\x{5367}\x{5369}\x{536B}\x{536C}' .
-'\x{536E}\x{536F}\x{5370}\x{5371}\x{5372}\x{5373}\x{5374}\x{5375}\x{5376}' .
-'\x{5377}\x{5378}\x{5379}\x{537A}\x{537B}\x{537C}\x{537D}\x{537E}\x{537F}' .
-'\x{5381}\x{5382}\x{5383}\x{5384}\x{5385}\x{5386}\x{5387}\x{5388}\x{5389}' .
-'\x{538A}\x{538B}\x{538C}\x{538D}\x{538E}\x{538F}\x{5390}\x{5391}\x{5392}' .
-'\x{5393}\x{5394}\x{5395}\x{5396}\x{5397}\x{5398}\x{5399}\x{539A}\x{539B}' .
-'\x{539C}\x{539D}\x{539E}\x{539F}\x{53A0}\x{53A2}\x{53A3}\x{53A4}\x{53A5}' .
-'\x{53A6}\x{53A7}\x{53A8}\x{53A9}\x{53AC}\x{53AD}\x{53AE}\x{53B0}\x{53B1}' .
-'\x{53B2}\x{53B3}\x{53B4}\x{53B5}\x{53B6}\x{53B7}\x{53B8}\x{53B9}\x{53BB}' .
-'\x{53BC}\x{53BD}\x{53BE}\x{53BF}\x{53C0}\x{53C1}\x{53C2}\x{53C3}\x{53C4}' .
-'\x{53C6}\x{53C7}\x{53C8}\x{53C9}\x{53CA}\x{53CB}\x{53CC}\x{53CD}\x{53CE}' .
-'\x{53D0}\x{53D1}\x{53D2}\x{53D3}\x{53D4}\x{53D5}\x{53D6}\x{53D7}\x{53D8}' .
-'\x{53D9}\x{53DB}\x{53DC}\x{53DF}\x{53E0}\x{53E1}\x{53E2}\x{53E3}\x{53E4}' .
-'\x{53E5}\x{53E6}\x{53E8}\x{53E9}\x{53EA}\x{53EB}\x{53EC}\x{53ED}\x{53EE}' .
-'\x{53EF}\x{53F0}\x{53F1}\x{53F2}\x{53F3}\x{53F4}\x{53F5}\x{53F6}\x{53F7}' .
-'\x{53F8}\x{53F9}\x{53FA}\x{53FB}\x{53FC}\x{53FD}\x{53FE}\x{5401}\x{5402}' .
-'\x{5403}\x{5404}\x{5405}\x{5406}\x{5407}\x{5408}\x{5409}\x{540A}\x{540B}' .
-'\x{540C}\x{540D}\x{540E}\x{540F}\x{5410}\x{5411}\x{5412}\x{5413}\x{5414}' .
-'\x{5415}\x{5416}\x{5417}\x{5418}\x{5419}\x{541B}\x{541C}\x{541D}\x{541E}' .
-'\x{541F}\x{5420}\x{5421}\x{5423}\x{5424}\x{5425}\x{5426}\x{5427}\x{5428}' .
-'\x{5429}\x{542A}\x{542B}\x{542C}\x{542D}\x{542E}\x{542F}\x{5430}\x{5431}' .
-'\x{5432}\x{5433}\x{5434}\x{5435}\x{5436}\x{5437}\x{5438}\x{5439}\x{543A}' .
-'\x{543B}\x{543C}\x{543D}\x{543E}\x{543F}\x{5440}\x{5441}\x{5442}\x{5443}' .
-'\x{5444}\x{5445}\x{5446}\x{5447}\x{5448}\x{5449}\x{544A}\x{544B}\x{544D}' .
-'\x{544E}\x{544F}\x{5450}\x{5451}\x{5452}\x{5453}\x{5454}\x{5455}\x{5456}' .
-'\x{5457}\x{5458}\x{5459}\x{545A}\x{545B}\x{545C}\x{545E}\x{545F}\x{5460}' .
-'\x{5461}\x{5462}\x{5463}\x{5464}\x{5465}\x{5466}\x{5467}\x{5468}\x{546A}' .
-'\x{546B}\x{546C}\x{546D}\x{546E}\x{546F}\x{5470}\x{5471}\x{5472}\x{5473}' .
-'\x{5474}\x{5475}\x{5476}\x{5477}\x{5478}\x{5479}\x{547A}\x{547B}\x{547C}' .
-'\x{547D}\x{547E}\x{547F}\x{5480}\x{5481}\x{5482}\x{5483}\x{5484}\x{5485}' .
-'\x{5486}\x{5487}\x{5488}\x{5489}\x{548B}\x{548C}\x{548D}\x{548E}\x{548F}' .
-'\x{5490}\x{5491}\x{5492}\x{5493}\x{5494}\x{5495}\x{5496}\x{5497}\x{5498}' .
-'\x{5499}\x{549A}\x{549B}\x{549C}\x{549D}\x{549E}\x{549F}\x{54A0}\x{54A1}' .
-'\x{54A2}\x{54A3}\x{54A4}\x{54A5}\x{54A6}\x{54A7}\x{54A8}\x{54A9}\x{54AA}' .
-'\x{54AB}\x{54AC}\x{54AD}\x{54AE}\x{54AF}\x{54B0}\x{54B1}\x{54B2}\x{54B3}' .
-'\x{54B4}\x{54B6}\x{54B7}\x{54B8}\x{54B9}\x{54BA}\x{54BB}\x{54BC}\x{54BD}' .
-'\x{54BE}\x{54BF}\x{54C0}\x{54C1}\x{54C2}\x{54C3}\x{54C4}\x{54C5}\x{54C6}' .
-'\x{54C7}\x{54C8}\x{54C9}\x{54CA}\x{54CB}\x{54CC}\x{54CD}\x{54CE}\x{54CF}' .
-'\x{54D0}\x{54D1}\x{54D2}\x{54D3}\x{54D4}\x{54D5}\x{54D6}\x{54D7}\x{54D8}' .
-'\x{54D9}\x{54DA}\x{54DB}\x{54DC}\x{54DD}\x{54DE}\x{54DF}\x{54E0}\x{54E1}' .
-'\x{54E2}\x{54E3}\x{54E4}\x{54E5}\x{54E6}\x{54E7}\x{54E8}\x{54E9}\x{54EA}' .
-'\x{54EB}\x{54EC}\x{54ED}\x{54EE}\x{54EF}\x{54F0}\x{54F1}\x{54F2}\x{54F3}' .
-'\x{54F4}\x{54F5}\x{54F7}\x{54F8}\x{54F9}\x{54FA}\x{54FB}\x{54FC}\x{54FD}' .
-'\x{54FE}\x{54FF}\x{5500}\x{5501}\x{5502}\x{5503}\x{5504}\x{5505}\x{5506}' .
-'\x{5507}\x{5508}\x{5509}\x{550A}\x{550B}\x{550C}\x{550D}\x{550E}\x{550F}' .
-'\x{5510}\x{5511}\x{5512}\x{5513}\x{5514}\x{5516}\x{5517}\x{551A}\x{551B}' .
-'\x{551C}\x{551D}\x{551E}\x{551F}\x{5520}\x{5521}\x{5522}\x{5523}\x{5524}' .
-'\x{5525}\x{5526}\x{5527}\x{5528}\x{5529}\x{552A}\x{552B}\x{552C}\x{552D}' .
-'\x{552E}\x{552F}\x{5530}\x{5531}\x{5532}\x{5533}\x{5534}\x{5535}\x{5536}' .
-'\x{5537}\x{5538}\x{5539}\x{553A}\x{553B}\x{553C}\x{553D}\x{553E}\x{553F}' .
-'\x{5540}\x{5541}\x{5542}\x{5543}\x{5544}\x{5545}\x{5546}\x{5548}\x{5549}' .
-'\x{554A}\x{554B}\x{554C}\x{554D}\x{554E}\x{554F}\x{5550}\x{5551}\x{5552}' .
-'\x{5553}\x{5554}\x{5555}\x{5556}\x{5557}\x{5558}\x{5559}\x{555A}\x{555B}' .
-'\x{555C}\x{555D}\x{555E}\x{555F}\x{5561}\x{5562}\x{5563}\x{5564}\x{5565}' .
-'\x{5566}\x{5567}\x{5568}\x{5569}\x{556A}\x{556B}\x{556C}\x{556D}\x{556E}' .
-'\x{556F}\x{5570}\x{5571}\x{5572}\x{5573}\x{5574}\x{5575}\x{5576}\x{5577}' .
-'\x{5578}\x{5579}\x{557B}\x{557C}\x{557D}\x{557E}\x{557F}\x{5580}\x{5581}' .
-'\x{5582}\x{5583}\x{5584}\x{5585}\x{5586}\x{5587}\x{5588}\x{5589}\x{558A}' .
-'\x{558B}\x{558C}\x{558D}\x{558E}\x{558F}\x{5590}\x{5591}\x{5592}\x{5593}' .
-'\x{5594}\x{5595}\x{5596}\x{5597}\x{5598}\x{5599}\x{559A}\x{559B}\x{559C}' .
-'\x{559D}\x{559E}\x{559F}\x{55A0}\x{55A1}\x{55A2}\x{55A3}\x{55A4}\x{55A5}' .
-'\x{55A6}\x{55A7}\x{55A8}\x{55A9}\x{55AA}\x{55AB}\x{55AC}\x{55AD}\x{55AE}' .
-'\x{55AF}\x{55B0}\x{55B1}\x{55B2}\x{55B3}\x{55B4}\x{55B5}\x{55B6}\x{55B7}' .
-'\x{55B8}\x{55B9}\x{55BA}\x{55BB}\x{55BC}\x{55BD}\x{55BE}\x{55BF}\x{55C0}' .
-'\x{55C1}\x{55C2}\x{55C3}\x{55C4}\x{55C5}\x{55C6}\x{55C7}\x{55C8}\x{55C9}' .
-'\x{55CA}\x{55CB}\x{55CC}\x{55CD}\x{55CE}\x{55CF}\x{55D0}\x{55D1}\x{55D2}' .
-'\x{55D3}\x{55D4}\x{55D5}\x{55D6}\x{55D7}\x{55D8}\x{55D9}\x{55DA}\x{55DB}' .
-'\x{55DC}\x{55DD}\x{55DE}\x{55DF}\x{55E1}\x{55E2}\x{55E3}\x{55E4}\x{55E5}' .
-'\x{55E6}\x{55E7}\x{55E8}\x{55E9}\x{55EA}\x{55EB}\x{55EC}\x{55ED}\x{55EE}' .
-'\x{55EF}\x{55F0}\x{55F1}\x{55F2}\x{55F3}\x{55F4}\x{55F5}\x{55F6}\x{55F7}' .
-'\x{55F9}\x{55FA}\x{55FB}\x{55FC}\x{55FD}\x{55FE}\x{55FF}\x{5600}\x{5601}' .
-'\x{5602}\x{5603}\x{5604}\x{5606}\x{5607}\x{5608}\x{5609}\x{560C}\x{560D}' .
-'\x{560E}\x{560F}\x{5610}\x{5611}\x{5612}\x{5613}\x{5614}\x{5615}\x{5616}' .
-'\x{5617}\x{5618}\x{5619}\x{561A}\x{561B}\x{561C}\x{561D}\x{561E}\x{561F}' .
-'\x{5621}\x{5622}\x{5623}\x{5624}\x{5625}\x{5626}\x{5627}\x{5628}\x{5629}' .
-'\x{562A}\x{562C}\x{562D}\x{562E}\x{562F}\x{5630}\x{5631}\x{5632}\x{5633}' .
-'\x{5634}\x{5635}\x{5636}\x{5638}\x{5639}\x{563A}\x{563B}\x{563D}\x{563E}' .
-'\x{563F}\x{5640}\x{5641}\x{5642}\x{5643}\x{5645}\x{5646}\x{5647}\x{5648}' .
-'\x{5649}\x{564A}\x{564C}\x{564D}\x{564E}\x{564F}\x{5650}\x{5652}\x{5653}' .
-'\x{5654}\x{5655}\x{5657}\x{5658}\x{5659}\x{565A}\x{565B}\x{565C}\x{565D}' .
-'\x{565E}\x{5660}\x{5662}\x{5663}\x{5664}\x{5665}\x{5666}\x{5667}\x{5668}' .
-'\x{5669}\x{566A}\x{566B}\x{566C}\x{566D}\x{566E}\x{566F}\x{5670}\x{5671}' .
-'\x{5672}\x{5673}\x{5674}\x{5676}\x{5677}\x{5678}\x{5679}\x{567A}\x{567B}' .
-'\x{567C}\x{567E}\x{567F}\x{5680}\x{5681}\x{5682}\x{5683}\x{5684}\x{5685}' .
-'\x{5686}\x{5687}\x{568A}\x{568C}\x{568D}\x{568E}\x{568F}\x{5690}\x{5691}' .
-'\x{5692}\x{5693}\x{5694}\x{5695}\x{5697}\x{5698}\x{5699}\x{569A}\x{569B}' .
-'\x{569C}\x{569D}\x{569F}\x{56A0}\x{56A1}\x{56A3}\x{56A4}\x{56A5}\x{56A6}' .
-'\x{56A7}\x{56A8}\x{56A9}\x{56AA}\x{56AB}\x{56AC}\x{56AD}\x{56AE}\x{56AF}' .
-'\x{56B0}\x{56B1}\x{56B2}\x{56B3}\x{56B4}\x{56B5}\x{56B6}\x{56B7}\x{56B8}' .
-'\x{56B9}\x{56BB}\x{56BC}\x{56BD}\x{56BE}\x{56BF}\x{56C0}\x{56C1}\x{56C2}' .
-'\x{56C3}\x{56C4}\x{56C5}\x{56C6}\x{56C7}\x{56C8}\x{56C9}\x{56CA}\x{56CB}' .
-'\x{56CC}\x{56CD}\x{56CE}\x{56D0}\x{56D1}\x{56D2}\x{56D3}\x{56D4}\x{56D5}' .
-'\x{56D6}\x{56D7}\x{56D8}\x{56DA}\x{56DB}\x{56DC}\x{56DD}\x{56DE}\x{56DF}' .
-'\x{56E0}\x{56E1}\x{56E2}\x{56E3}\x{56E4}\x{56E5}\x{56E7}\x{56E8}\x{56E9}' .
-'\x{56EA}\x{56EB}\x{56EC}\x{56ED}\x{56EE}\x{56EF}\x{56F0}\x{56F1}\x{56F2}' .
-'\x{56F3}\x{56F4}\x{56F5}\x{56F7}\x{56F9}\x{56FA}\x{56FD}\x{56FE}\x{56FF}' .
-'\x{5700}\x{5701}\x{5702}\x{5703}\x{5704}\x{5706}\x{5707}\x{5708}\x{5709}' .
-'\x{570A}\x{570B}\x{570C}\x{570D}\x{570E}\x{570F}\x{5710}\x{5712}\x{5713}' .
-'\x{5714}\x{5715}\x{5716}\x{5718}\x{5719}\x{571A}\x{571B}\x{571C}\x{571D}' .
-'\x{571E}\x{571F}\x{5720}\x{5722}\x{5723}\x{5725}\x{5726}\x{5727}\x{5728}' .
-'\x{5729}\x{572A}\x{572B}\x{572C}\x{572D}\x{572E}\x{572F}\x{5730}\x{5731}' .
-'\x{5732}\x{5733}\x{5734}\x{5735}\x{5736}\x{5737}\x{5738}\x{5739}\x{573A}' .
-'\x{573B}\x{573C}\x{573E}\x{573F}\x{5740}\x{5741}\x{5742}\x{5744}\x{5745}' .
-'\x{5746}\x{5747}\x{5749}\x{574A}\x{574B}\x{574C}\x{574D}\x{574E}\x{574F}' .
-'\x{5750}\x{5751}\x{5752}\x{5753}\x{5754}\x{5757}\x{5759}\x{575A}\x{575B}' .
-'\x{575C}\x{575D}\x{575E}\x{575F}\x{5760}\x{5761}\x{5762}\x{5764}\x{5765}' .
-'\x{5766}\x{5767}\x{5768}\x{5769}\x{576A}\x{576B}\x{576C}\x{576D}\x{576F}' .
-'\x{5770}\x{5771}\x{5772}\x{5773}\x{5774}\x{5775}\x{5776}\x{5777}\x{5779}' .
-'\x{577A}\x{577B}\x{577C}\x{577D}\x{577E}\x{577F}\x{5780}\x{5782}\x{5783}' .
-'\x{5784}\x{5785}\x{5786}\x{5788}\x{5789}\x{578A}\x{578B}\x{578C}\x{578D}' .
-'\x{578E}\x{578F}\x{5790}\x{5791}\x{5792}\x{5793}\x{5794}\x{5795}\x{5797}' .
-'\x{5798}\x{5799}\x{579A}\x{579B}\x{579C}\x{579D}\x{579E}\x{579F}\x{57A0}' .
-'\x{57A1}\x{57A2}\x{57A3}\x{57A4}\x{57A5}\x{57A6}\x{57A7}\x{57A9}\x{57AA}' .
-'\x{57AB}\x{57AC}\x{57AD}\x{57AE}\x{57AF}\x{57B0}\x{57B1}\x{57B2}\x{57B3}' .
-'\x{57B4}\x{57B5}\x{57B6}\x{57B7}\x{57B8}\x{57B9}\x{57BA}\x{57BB}\x{57BC}' .
-'\x{57BD}\x{57BE}\x{57BF}\x{57C0}\x{57C1}\x{57C2}\x{57C3}\x{57C4}\x{57C5}' .
-'\x{57C6}\x{57C7}\x{57C8}\x{57C9}\x{57CB}\x{57CC}\x{57CD}\x{57CE}\x{57CF}' .
-'\x{57D0}\x{57D2}\x{57D3}\x{57D4}\x{57D5}\x{57D6}\x{57D8}\x{57D9}\x{57DA}' .
-'\x{57DC}\x{57DD}\x{57DF}\x{57E0}\x{57E1}\x{57E2}\x{57E3}\x{57E4}\x{57E5}' .
-'\x{57E6}\x{57E7}\x{57E8}\x{57E9}\x{57EA}\x{57EB}\x{57EC}\x{57ED}\x{57EE}' .
-'\x{57EF}\x{57F0}\x{57F1}\x{57F2}\x{57F3}\x{57F4}\x{57F5}\x{57F6}\x{57F7}' .
-'\x{57F8}\x{57F9}\x{57FA}\x{57FB}\x{57FC}\x{57FD}\x{57FE}\x{57FF}\x{5800}' .
-'\x{5801}\x{5802}\x{5803}\x{5804}\x{5805}\x{5806}\x{5807}\x{5808}\x{5809}' .
-'\x{580A}\x{580B}\x{580C}\x{580D}\x{580E}\x{580F}\x{5810}\x{5811}\x{5812}' .
-'\x{5813}\x{5814}\x{5815}\x{5816}\x{5819}\x{581A}\x{581B}\x{581C}\x{581D}' .
-'\x{581E}\x{581F}\x{5820}\x{5821}\x{5822}\x{5823}\x{5824}\x{5825}\x{5826}' .
-'\x{5827}\x{5828}\x{5829}\x{582A}\x{582B}\x{582C}\x{582D}\x{582E}\x{582F}' .
-'\x{5830}\x{5831}\x{5832}\x{5833}\x{5834}\x{5835}\x{5836}\x{5837}\x{5838}' .
-'\x{5839}\x{583A}\x{583B}\x{583C}\x{583D}\x{583E}\x{583F}\x{5840}\x{5842}' .
-'\x{5843}\x{5844}\x{5845}\x{5846}\x{5847}\x{5848}\x{5849}\x{584A}\x{584B}' .
-'\x{584C}\x{584D}\x{584E}\x{584F}\x{5851}\x{5852}\x{5853}\x{5854}\x{5855}' .
-'\x{5857}\x{5858}\x{5859}\x{585A}\x{585B}\x{585C}\x{585D}\x{585E}\x{585F}' .
-'\x{5861}\x{5862}\x{5863}\x{5864}\x{5865}\x{5868}\x{5869}\x{586A}\x{586B}' .
-'\x{586C}\x{586D}\x{586E}\x{586F}\x{5870}\x{5871}\x{5872}\x{5873}\x{5874}' .
-'\x{5875}\x{5876}\x{5878}\x{5879}\x{587A}\x{587B}\x{587C}\x{587D}\x{587E}' .
-'\x{587F}\x{5880}\x{5881}\x{5882}\x{5883}\x{5884}\x{5885}\x{5886}\x{5887}' .
-'\x{5888}\x{5889}\x{588A}\x{588B}\x{588C}\x{588D}\x{588E}\x{588F}\x{5890}' .
-'\x{5891}\x{5892}\x{5893}\x{5894}\x{5896}\x{5897}\x{5898}\x{5899}\x{589A}' .
-'\x{589B}\x{589C}\x{589D}\x{589E}\x{589F}\x{58A0}\x{58A1}\x{58A2}\x{58A3}' .
-'\x{58A4}\x{58A5}\x{58A6}\x{58A7}\x{58A8}\x{58A9}\x{58AB}\x{58AC}\x{58AD}' .
-'\x{58AE}\x{58AF}\x{58B0}\x{58B1}\x{58B2}\x{58B3}\x{58B4}\x{58B7}\x{58B8}' .
-'\x{58B9}\x{58BA}\x{58BB}\x{58BC}\x{58BD}\x{58BE}\x{58BF}\x{58C1}\x{58C2}' .
-'\x{58C5}\x{58C6}\x{58C7}\x{58C8}\x{58C9}\x{58CA}\x{58CB}\x{58CE}\x{58CF}' .
-'\x{58D1}\x{58D2}\x{58D3}\x{58D4}\x{58D5}\x{58D6}\x{58D7}\x{58D8}\x{58D9}' .
-'\x{58DA}\x{58DB}\x{58DD}\x{58DE}\x{58DF}\x{58E0}\x{58E2}\x{58E3}\x{58E4}' .
-'\x{58E5}\x{58E7}\x{58E8}\x{58E9}\x{58EA}\x{58EB}\x{58EC}\x{58ED}\x{58EE}' .
-'\x{58EF}\x{58F0}\x{58F1}\x{58F2}\x{58F3}\x{58F4}\x{58F6}\x{58F7}\x{58F8}' .
-'\x{58F9}\x{58FA}\x{58FB}\x{58FC}\x{58FD}\x{58FE}\x{58FF}\x{5900}\x{5902}' .
-'\x{5903}\x{5904}\x{5906}\x{5907}\x{5909}\x{590A}\x{590B}\x{590C}\x{590D}' .
-'\x{590E}\x{590F}\x{5910}\x{5912}\x{5914}\x{5915}\x{5916}\x{5917}\x{5918}' .
-'\x{5919}\x{591A}\x{591B}\x{591C}\x{591D}\x{591E}\x{591F}\x{5920}\x{5921}' .
-'\x{5922}\x{5924}\x{5925}\x{5926}\x{5927}\x{5928}\x{5929}\x{592A}\x{592B}' .
-'\x{592C}\x{592D}\x{592E}\x{592F}\x{5930}\x{5931}\x{5932}\x{5934}\x{5935}' .
-'\x{5937}\x{5938}\x{5939}\x{593A}\x{593B}\x{593C}\x{593D}\x{593E}\x{593F}' .
-'\x{5940}\x{5941}\x{5942}\x{5943}\x{5944}\x{5945}\x{5946}\x{5947}\x{5948}' .
-'\x{5949}\x{594A}\x{594B}\x{594C}\x{594D}\x{594E}\x{594F}\x{5950}\x{5951}' .
-'\x{5952}\x{5953}\x{5954}\x{5955}\x{5956}\x{5957}\x{5958}\x{595A}\x{595C}' .
-'\x{595D}\x{595E}\x{595F}\x{5960}\x{5961}\x{5962}\x{5963}\x{5964}\x{5965}' .
-'\x{5966}\x{5967}\x{5968}\x{5969}\x{596A}\x{596B}\x{596C}\x{596D}\x{596E}' .
-'\x{596F}\x{5970}\x{5971}\x{5972}\x{5973}\x{5974}\x{5975}\x{5976}\x{5977}' .
-'\x{5978}\x{5979}\x{597A}\x{597B}\x{597C}\x{597D}\x{597E}\x{597F}\x{5980}' .
-'\x{5981}\x{5982}\x{5983}\x{5984}\x{5985}\x{5986}\x{5987}\x{5988}\x{5989}' .
-'\x{598A}\x{598B}\x{598C}\x{598D}\x{598E}\x{598F}\x{5990}\x{5991}\x{5992}' .
-'\x{5993}\x{5994}\x{5995}\x{5996}\x{5997}\x{5998}\x{5999}\x{599A}\x{599C}' .
-'\x{599D}\x{599E}\x{599F}\x{59A0}\x{59A1}\x{59A2}\x{59A3}\x{59A4}\x{59A5}' .
-'\x{59A6}\x{59A7}\x{59A8}\x{59A9}\x{59AA}\x{59AB}\x{59AC}\x{59AD}\x{59AE}' .
-'\x{59AF}\x{59B0}\x{59B1}\x{59B2}\x{59B3}\x{59B4}\x{59B5}\x{59B6}\x{59B8}' .
-'\x{59B9}\x{59BA}\x{59BB}\x{59BC}\x{59BD}\x{59BE}\x{59BF}\x{59C0}\x{59C1}' .
-'\x{59C2}\x{59C3}\x{59C4}\x{59C5}\x{59C6}\x{59C7}\x{59C8}\x{59C9}\x{59CA}' .
-'\x{59CB}\x{59CC}\x{59CD}\x{59CE}\x{59CF}\x{59D0}\x{59D1}\x{59D2}\x{59D3}' .
-'\x{59D4}\x{59D5}\x{59D6}\x{59D7}\x{59D8}\x{59D9}\x{59DA}\x{59DB}\x{59DC}' .
-'\x{59DD}\x{59DE}\x{59DF}\x{59E0}\x{59E1}\x{59E2}\x{59E3}\x{59E4}\x{59E5}' .
-'\x{59E6}\x{59E8}\x{59E9}\x{59EA}\x{59EB}\x{59EC}\x{59ED}\x{59EE}\x{59EF}' .
-'\x{59F0}\x{59F1}\x{59F2}\x{59F3}\x{59F4}\x{59F5}\x{59F6}\x{59F7}\x{59F8}' .
-'\x{59F9}\x{59FA}\x{59FB}\x{59FC}\x{59FD}\x{59FE}\x{59FF}\x{5A00}\x{5A01}' .
-'\x{5A02}\x{5A03}\x{5A04}\x{5A05}\x{5A06}\x{5A07}\x{5A08}\x{5A09}\x{5A0A}' .
-'\x{5A0B}\x{5A0C}\x{5A0D}\x{5A0E}\x{5A0F}\x{5A10}\x{5A11}\x{5A12}\x{5A13}' .
-'\x{5A14}\x{5A15}\x{5A16}\x{5A17}\x{5A18}\x{5A19}\x{5A1A}\x{5A1B}\x{5A1C}' .
-'\x{5A1D}\x{5A1E}\x{5A1F}\x{5A20}\x{5A21}\x{5A22}\x{5A23}\x{5A25}\x{5A27}' .
-'\x{5A28}\x{5A29}\x{5A2A}\x{5A2B}\x{5A2D}\x{5A2E}\x{5A2F}\x{5A31}\x{5A32}' .
-'\x{5A33}\x{5A34}\x{5A35}\x{5A36}\x{5A37}\x{5A38}\x{5A39}\x{5A3A}\x{5A3B}' .
-'\x{5A3C}\x{5A3D}\x{5A3E}\x{5A3F}\x{5A40}\x{5A41}\x{5A42}\x{5A43}\x{5A44}' .
-'\x{5A45}\x{5A46}\x{5A47}\x{5A48}\x{5A49}\x{5A4A}\x{5A4B}\x{5A4C}\x{5A4D}' .
-'\x{5A4E}\x{5A4F}\x{5A50}\x{5A51}\x{5A52}\x{5A53}\x{5A55}\x{5A56}\x{5A57}' .
-'\x{5A58}\x{5A5A}\x{5A5B}\x{5A5C}\x{5A5D}\x{5A5E}\x{5A5F}\x{5A60}\x{5A61}' .
-'\x{5A62}\x{5A63}\x{5A64}\x{5A65}\x{5A66}\x{5A67}\x{5A68}\x{5A69}\x{5A6A}' .
-'\x{5A6B}\x{5A6C}\x{5A6D}\x{5A6E}\x{5A70}\x{5A72}\x{5A73}\x{5A74}\x{5A75}' .
-'\x{5A76}\x{5A77}\x{5A78}\x{5A79}\x{5A7A}\x{5A7B}\x{5A7C}\x{5A7D}\x{5A7E}' .
-'\x{5A7F}\x{5A80}\x{5A81}\x{5A82}\x{5A83}\x{5A84}\x{5A85}\x{5A86}\x{5A88}' .
-'\x{5A89}\x{5A8A}\x{5A8B}\x{5A8C}\x{5A8E}\x{5A8F}\x{5A90}\x{5A91}\x{5A92}' .
-'\x{5A93}\x{5A94}\x{5A95}\x{5A96}\x{5A97}\x{5A98}\x{5A99}\x{5A9A}\x{5A9B}' .
-'\x{5A9C}\x{5A9D}\x{5A9E}\x{5A9F}\x{5AA0}\x{5AA1}\x{5AA2}\x{5AA3}\x{5AA4}' .
-'\x{5AA5}\x{5AA6}\x{5AA7}\x{5AA8}\x{5AA9}\x{5AAA}\x{5AAC}\x{5AAD}\x{5AAE}' .
-'\x{5AAF}\x{5AB0}\x{5AB1}\x{5AB2}\x{5AB3}\x{5AB4}\x{5AB5}\x{5AB6}\x{5AB7}' .
-'\x{5AB8}\x{5AB9}\x{5ABA}\x{5ABB}\x{5ABC}\x{5ABD}\x{5ABE}\x{5ABF}\x{5AC0}' .
-'\x{5AC1}\x{5AC2}\x{5AC3}\x{5AC4}\x{5AC5}\x{5AC6}\x{5AC7}\x{5AC8}\x{5AC9}' .
-'\x{5ACA}\x{5ACB}\x{5ACC}\x{5ACD}\x{5ACE}\x{5ACF}\x{5AD1}\x{5AD2}\x{5AD4}' .
-'\x{5AD5}\x{5AD6}\x{5AD7}\x{5AD8}\x{5AD9}\x{5ADA}\x{5ADB}\x{5ADC}\x{5ADD}' .
-'\x{5ADE}\x{5ADF}\x{5AE0}\x{5AE1}\x{5AE2}\x{5AE3}\x{5AE4}\x{5AE5}\x{5AE6}' .
-'\x{5AE7}\x{5AE8}\x{5AE9}\x{5AEA}\x{5AEB}\x{5AEC}\x{5AED}\x{5AEE}\x{5AF1}' .
-'\x{5AF2}\x{5AF3}\x{5AF4}\x{5AF5}\x{5AF6}\x{5AF7}\x{5AF8}\x{5AF9}\x{5AFA}' .
-'\x{5AFB}\x{5AFC}\x{5AFD}\x{5AFE}\x{5AFF}\x{5B00}\x{5B01}\x{5B02}\x{5B03}' .
-'\x{5B04}\x{5B05}\x{5B06}\x{5B07}\x{5B08}\x{5B09}\x{5B0B}\x{5B0C}\x{5B0E}' .
-'\x{5B0F}\x{5B10}\x{5B11}\x{5B12}\x{5B13}\x{5B14}\x{5B15}\x{5B16}\x{5B17}' .
-'\x{5B18}\x{5B19}\x{5B1A}\x{5B1B}\x{5B1C}\x{5B1D}\x{5B1E}\x{5B1F}\x{5B20}' .
-'\x{5B21}\x{5B22}\x{5B23}\x{5B24}\x{5B25}\x{5B26}\x{5B27}\x{5B28}\x{5B29}' .
-'\x{5B2A}\x{5B2B}\x{5B2C}\x{5B2D}\x{5B2E}\x{5B2F}\x{5B30}\x{5B31}\x{5B32}' .
-'\x{5B33}\x{5B34}\x{5B35}\x{5B36}\x{5B37}\x{5B38}\x{5B3A}\x{5B3B}\x{5B3C}' .
-'\x{5B3D}\x{5B3E}\x{5B3F}\x{5B40}\x{5B41}\x{5B42}\x{5B43}\x{5B44}\x{5B45}' .
-'\x{5B47}\x{5B48}\x{5B49}\x{5B4A}\x{5B4B}\x{5B4C}\x{5B4D}\x{5B4E}\x{5B50}' .
-'\x{5B51}\x{5B53}\x{5B54}\x{5B55}\x{5B56}\x{5B57}\x{5B58}\x{5B59}\x{5B5A}' .
-'\x{5B5B}\x{5B5C}\x{5B5D}\x{5B5E}\x{5B5F}\x{5B62}\x{5B63}\x{5B64}\x{5B65}' .
-'\x{5B66}\x{5B67}\x{5B68}\x{5B69}\x{5B6A}\x{5B6B}\x{5B6C}\x{5B6D}\x{5B6E}' .
-'\x{5B70}\x{5B71}\x{5B72}\x{5B73}\x{5B74}\x{5B75}\x{5B76}\x{5B77}\x{5B78}' .
-'\x{5B7A}\x{5B7B}\x{5B7C}\x{5B7D}\x{5B7F}\x{5B80}\x{5B81}\x{5B82}\x{5B83}' .
-'\x{5B84}\x{5B85}\x{5B87}\x{5B88}\x{5B89}\x{5B8A}\x{5B8B}\x{5B8C}\x{5B8D}' .
-'\x{5B8E}\x{5B8F}\x{5B91}\x{5B92}\x{5B93}\x{5B94}\x{5B95}\x{5B96}\x{5B97}' .
-'\x{5B98}\x{5B99}\x{5B9A}\x{5B9B}\x{5B9C}\x{5B9D}\x{5B9E}\x{5B9F}\x{5BA0}' .
-'\x{5BA1}\x{5BA2}\x{5BA3}\x{5BA4}\x{5BA5}\x{5BA6}\x{5BA7}\x{5BA8}\x{5BAA}' .
-'\x{5BAB}\x{5BAC}\x{5BAD}\x{5BAE}\x{5BAF}\x{5BB0}\x{5BB1}\x{5BB3}\x{5BB4}' .
-'\x{5BB5}\x{5BB6}\x{5BB8}\x{5BB9}\x{5BBA}\x{5BBB}\x{5BBD}\x{5BBE}\x{5BBF}' .
-'\x{5BC0}\x{5BC1}\x{5BC2}\x{5BC3}\x{5BC4}\x{5BC5}\x{5BC6}\x{5BC7}\x{5BCA}' .
-'\x{5BCB}\x{5BCC}\x{5BCD}\x{5BCE}\x{5BCF}\x{5BD0}\x{5BD1}\x{5BD2}\x{5BD3}' .
-'\x{5BD4}\x{5BD5}\x{5BD6}\x{5BD8}\x{5BD9}\x{5BDB}\x{5BDC}\x{5BDD}\x{5BDE}' .
-'\x{5BDF}\x{5BE0}\x{5BE1}\x{5BE2}\x{5BE3}\x{5BE4}\x{5BE5}\x{5BE6}\x{5BE7}' .
-'\x{5BE8}\x{5BE9}\x{5BEA}\x{5BEB}\x{5BEC}\x{5BED}\x{5BEE}\x{5BEF}\x{5BF0}' .
-'\x{5BF1}\x{5BF2}\x{5BF3}\x{5BF4}\x{5BF5}\x{5BF6}\x{5BF7}\x{5BF8}\x{5BF9}' .
-'\x{5BFA}\x{5BFB}\x{5BFC}\x{5BFD}\x{5BFF}\x{5C01}\x{5C03}\x{5C04}\x{5C05}' .
-'\x{5C06}\x{5C07}\x{5C08}\x{5C09}\x{5C0A}\x{5C0B}\x{5C0C}\x{5C0D}\x{5C0E}' .
-'\x{5C0F}\x{5C10}\x{5C11}\x{5C12}\x{5C13}\x{5C14}\x{5C15}\x{5C16}\x{5C17}' .
-'\x{5C18}\x{5C19}\x{5C1A}\x{5C1C}\x{5C1D}\x{5C1E}\x{5C1F}\x{5C20}\x{5C21}' .
-'\x{5C22}\x{5C24}\x{5C25}\x{5C27}\x{5C28}\x{5C2A}\x{5C2B}\x{5C2C}\x{5C2D}' .
-'\x{5C2E}\x{5C2F}\x{5C30}\x{5C31}\x{5C32}\x{5C33}\x{5C34}\x{5C35}\x{5C37}' .
-'\x{5C38}\x{5C39}\x{5C3A}\x{5C3B}\x{5C3C}\x{5C3D}\x{5C3E}\x{5C3F}\x{5C40}' .
-'\x{5C41}\x{5C42}\x{5C43}\x{5C44}\x{5C45}\x{5C46}\x{5C47}\x{5C48}\x{5C49}' .
-'\x{5C4A}\x{5C4B}\x{5C4C}\x{5C4D}\x{5C4E}\x{5C4F}\x{5C50}\x{5C51}\x{5C52}' .
-'\x{5C53}\x{5C54}\x{5C55}\x{5C56}\x{5C57}\x{5C58}\x{5C59}\x{5C5B}\x{5C5C}' .
-'\x{5C5D}\x{5C5E}\x{5C5F}\x{5C60}\x{5C61}\x{5C62}\x{5C63}\x{5C64}\x{5C65}' .
-'\x{5C66}\x{5C67}\x{5C68}\x{5C69}\x{5C6A}\x{5C6B}\x{5C6C}\x{5C6D}\x{5C6E}' .
-'\x{5C6F}\x{5C70}\x{5C71}\x{5C72}\x{5C73}\x{5C74}\x{5C75}\x{5C76}\x{5C77}' .
-'\x{5C78}\x{5C79}\x{5C7A}\x{5C7B}\x{5C7C}\x{5C7D}\x{5C7E}\x{5C7F}\x{5C80}' .
-'\x{5C81}\x{5C82}\x{5C83}\x{5C84}\x{5C86}\x{5C87}\x{5C88}\x{5C89}\x{5C8A}' .
-'\x{5C8B}\x{5C8C}\x{5C8D}\x{5C8E}\x{5C8F}\x{5C90}\x{5C91}\x{5C92}\x{5C93}' .
-'\x{5C94}\x{5C95}\x{5C96}\x{5C97}\x{5C98}\x{5C99}\x{5C9A}\x{5C9B}\x{5C9C}' .
-'\x{5C9D}\x{5C9E}\x{5C9F}\x{5CA0}\x{5CA1}\x{5CA2}\x{5CA3}\x{5CA4}\x{5CA5}' .
-'\x{5CA6}\x{5CA7}\x{5CA8}\x{5CA9}\x{5CAA}\x{5CAB}\x{5CAC}\x{5CAD}\x{5CAE}' .
-'\x{5CAF}\x{5CB0}\x{5CB1}\x{5CB2}\x{5CB3}\x{5CB5}\x{5CB6}\x{5CB7}\x{5CB8}' .
-'\x{5CBA}\x{5CBB}\x{5CBC}\x{5CBD}\x{5CBE}\x{5CBF}\x{5CC1}\x{5CC2}\x{5CC3}' .
-'\x{5CC4}\x{5CC5}\x{5CC6}\x{5CC7}\x{5CC8}\x{5CC9}\x{5CCA}\x{5CCB}\x{5CCC}' .
-'\x{5CCD}\x{5CCE}\x{5CCF}\x{5CD0}\x{5CD1}\x{5CD2}\x{5CD3}\x{5CD4}\x{5CD6}' .
-'\x{5CD7}\x{5CD8}\x{5CD9}\x{5CDA}\x{5CDB}\x{5CDC}\x{5CDE}\x{5CDF}\x{5CE0}' .
-'\x{5CE1}\x{5CE2}\x{5CE3}\x{5CE4}\x{5CE5}\x{5CE6}\x{5CE7}\x{5CE8}\x{5CE9}' .
-'\x{5CEA}\x{5CEB}\x{5CEC}\x{5CED}\x{5CEE}\x{5CEF}\x{5CF0}\x{5CF1}\x{5CF2}' .
-'\x{5CF3}\x{5CF4}\x{5CF6}\x{5CF7}\x{5CF8}\x{5CF9}\x{5CFA}\x{5CFB}\x{5CFC}' .
-'\x{5CFD}\x{5CFE}\x{5CFF}\x{5D00}\x{5D01}\x{5D02}\x{5D03}\x{5D04}\x{5D05}' .
-'\x{5D06}\x{5D07}\x{5D08}\x{5D09}\x{5D0A}\x{5D0B}\x{5D0C}\x{5D0D}\x{5D0E}' .
-'\x{5D0F}\x{5D10}\x{5D11}\x{5D12}\x{5D13}\x{5D14}\x{5D15}\x{5D16}\x{5D17}' .
-'\x{5D18}\x{5D19}\x{5D1A}\x{5D1B}\x{5D1C}\x{5D1D}\x{5D1E}\x{5D1F}\x{5D20}' .
-'\x{5D21}\x{5D22}\x{5D23}\x{5D24}\x{5D25}\x{5D26}\x{5D27}\x{5D28}\x{5D29}' .
-'\x{5D2A}\x{5D2C}\x{5D2D}\x{5D2E}\x{5D30}\x{5D31}\x{5D32}\x{5D33}\x{5D34}' .
-'\x{5D35}\x{5D36}\x{5D37}\x{5D38}\x{5D39}\x{5D3A}\x{5D3C}\x{5D3D}\x{5D3E}' .
-'\x{5D3F}\x{5D40}\x{5D41}\x{5D42}\x{5D43}\x{5D44}\x{5D45}\x{5D46}\x{5D47}' .
-'\x{5D48}\x{5D49}\x{5D4A}\x{5D4B}\x{5D4C}\x{5D4D}\x{5D4E}\x{5D4F}\x{5D50}' .
-'\x{5D51}\x{5D52}\x{5D54}\x{5D55}\x{5D56}\x{5D58}\x{5D59}\x{5D5A}\x{5D5B}' .
-'\x{5D5D}\x{5D5E}\x{5D5F}\x{5D61}\x{5D62}\x{5D63}\x{5D64}\x{5D65}\x{5D66}' .
-'\x{5D67}\x{5D68}\x{5D69}\x{5D6A}\x{5D6B}\x{5D6C}\x{5D6D}\x{5D6E}\x{5D6F}' .
-'\x{5D70}\x{5D71}\x{5D72}\x{5D73}\x{5D74}\x{5D75}\x{5D76}\x{5D77}\x{5D78}' .
-'\x{5D79}\x{5D7A}\x{5D7B}\x{5D7C}\x{5D7D}\x{5D7E}\x{5D7F}\x{5D80}\x{5D81}' .
-'\x{5D82}\x{5D84}\x{5D85}\x{5D86}\x{5D87}\x{5D88}\x{5D89}\x{5D8A}\x{5D8B}' .
-'\x{5D8C}\x{5D8D}\x{5D8E}\x{5D8F}\x{5D90}\x{5D91}\x{5D92}\x{5D93}\x{5D94}' .
-'\x{5D95}\x{5D97}\x{5D98}\x{5D99}\x{5D9A}\x{5D9B}\x{5D9C}\x{5D9D}\x{5D9E}' .
-'\x{5D9F}\x{5DA0}\x{5DA1}\x{5DA2}\x{5DA5}\x{5DA6}\x{5DA7}\x{5DA8}\x{5DA9}' .
-'\x{5DAA}\x{5DAC}\x{5DAD}\x{5DAE}\x{5DAF}\x{5DB0}\x{5DB1}\x{5DB2}\x{5DB4}' .
-'\x{5DB5}\x{5DB6}\x{5DB7}\x{5DB8}\x{5DBA}\x{5DBB}\x{5DBC}\x{5DBD}\x{5DBE}' .
-'\x{5DBF}\x{5DC0}\x{5DC1}\x{5DC2}\x{5DC3}\x{5DC5}\x{5DC6}\x{5DC7}\x{5DC8}' .
-'\x{5DC9}\x{5DCA}\x{5DCB}\x{5DCC}\x{5DCD}\x{5DCE}\x{5DCF}\x{5DD0}\x{5DD1}' .
-'\x{5DD2}\x{5DD3}\x{5DD4}\x{5DD5}\x{5DD6}\x{5DD8}\x{5DD9}\x{5DDB}\x{5DDD}' .
-'\x{5DDE}\x{5DDF}\x{5DE0}\x{5DE1}\x{5DE2}\x{5DE3}\x{5DE4}\x{5DE5}\x{5DE6}' .
-'\x{5DE7}\x{5DE8}\x{5DE9}\x{5DEA}\x{5DEB}\x{5DEC}\x{5DED}\x{5DEE}\x{5DEF}' .
-'\x{5DF0}\x{5DF1}\x{5DF2}\x{5DF3}\x{5DF4}\x{5DF5}\x{5DF7}\x{5DF8}\x{5DF9}' .
-'\x{5DFA}\x{5DFB}\x{5DFC}\x{5DFD}\x{5DFE}\x{5DFF}\x{5E00}\x{5E01}\x{5E02}' .
-'\x{5E03}\x{5E04}\x{5E05}\x{5E06}\x{5E07}\x{5E08}\x{5E09}\x{5E0A}\x{5E0B}' .
-'\x{5E0C}\x{5E0D}\x{5E0E}\x{5E0F}\x{5E10}\x{5E11}\x{5E13}\x{5E14}\x{5E15}' .
-'\x{5E16}\x{5E17}\x{5E18}\x{5E19}\x{5E1A}\x{5E1B}\x{5E1C}\x{5E1D}\x{5E1E}' .
-'\x{5E1F}\x{5E20}\x{5E21}\x{5E22}\x{5E23}\x{5E24}\x{5E25}\x{5E26}\x{5E27}' .
-'\x{5E28}\x{5E29}\x{5E2A}\x{5E2B}\x{5E2C}\x{5E2D}\x{5E2E}\x{5E2F}\x{5E30}' .
-'\x{5E31}\x{5E32}\x{5E33}\x{5E34}\x{5E35}\x{5E36}\x{5E37}\x{5E38}\x{5E39}' .
-'\x{5E3A}\x{5E3B}\x{5E3C}\x{5E3D}\x{5E3E}\x{5E40}\x{5E41}\x{5E42}\x{5E43}' .
-'\x{5E44}\x{5E45}\x{5E46}\x{5E47}\x{5E49}\x{5E4A}\x{5E4B}\x{5E4C}\x{5E4D}' .
-'\x{5E4E}\x{5E4F}\x{5E50}\x{5E52}\x{5E53}\x{5E54}\x{5E55}\x{5E56}\x{5E57}' .
-'\x{5E58}\x{5E59}\x{5E5A}\x{5E5B}\x{5E5C}\x{5E5D}\x{5E5E}\x{5E5F}\x{5E60}' .
-'\x{5E61}\x{5E62}\x{5E63}\x{5E64}\x{5E65}\x{5E66}\x{5E67}\x{5E68}\x{5E69}' .
-'\x{5E6A}\x{5E6B}\x{5E6C}\x{5E6D}\x{5E6E}\x{5E6F}\x{5E70}\x{5E71}\x{5E72}' .
-'\x{5E73}\x{5E74}\x{5E75}\x{5E76}\x{5E77}\x{5E78}\x{5E79}\x{5E7A}\x{5E7B}' .
-'\x{5E7C}\x{5E7D}\x{5E7E}\x{5E7F}\x{5E80}\x{5E81}\x{5E82}\x{5E83}\x{5E84}' .
-'\x{5E85}\x{5E86}\x{5E87}\x{5E88}\x{5E89}\x{5E8A}\x{5E8B}\x{5E8C}\x{5E8D}' .
-'\x{5E8E}\x{5E8F}\x{5E90}\x{5E91}\x{5E93}\x{5E94}\x{5E95}\x{5E96}\x{5E97}' .
-'\x{5E98}\x{5E99}\x{5E9A}\x{5E9B}\x{5E9C}\x{5E9D}\x{5E9E}\x{5E9F}\x{5EA0}' .
-'\x{5EA1}\x{5EA2}\x{5EA3}\x{5EA4}\x{5EA5}\x{5EA6}\x{5EA7}\x{5EA8}\x{5EA9}' .
-'\x{5EAA}\x{5EAB}\x{5EAC}\x{5EAD}\x{5EAE}\x{5EAF}\x{5EB0}\x{5EB1}\x{5EB2}' .
-'\x{5EB3}\x{5EB4}\x{5EB5}\x{5EB6}\x{5EB7}\x{5EB8}\x{5EB9}\x{5EBB}\x{5EBC}' .
-'\x{5EBD}\x{5EBE}\x{5EBF}\x{5EC1}\x{5EC2}\x{5EC3}\x{5EC4}\x{5EC5}\x{5EC6}' .
-'\x{5EC7}\x{5EC8}\x{5EC9}\x{5ECA}\x{5ECB}\x{5ECC}\x{5ECD}\x{5ECE}\x{5ECF}' .
-'\x{5ED0}\x{5ED1}\x{5ED2}\x{5ED3}\x{5ED4}\x{5ED5}\x{5ED6}\x{5ED7}\x{5ED8}' .
-'\x{5ED9}\x{5EDA}\x{5EDB}\x{5EDC}\x{5EDD}\x{5EDE}\x{5EDF}\x{5EE0}\x{5EE1}' .
-'\x{5EE2}\x{5EE3}\x{5EE4}\x{5EE5}\x{5EE6}\x{5EE7}\x{5EE8}\x{5EE9}\x{5EEA}' .
-'\x{5EEC}\x{5EED}\x{5EEE}\x{5EEF}\x{5EF0}\x{5EF1}\x{5EF2}\x{5EF3}\x{5EF4}' .
-'\x{5EF5}\x{5EF6}\x{5EF7}\x{5EF8}\x{5EFA}\x{5EFB}\x{5EFC}\x{5EFD}\x{5EFE}' .
-'\x{5EFF}\x{5F00}\x{5F01}\x{5F02}\x{5F03}\x{5F04}\x{5F05}\x{5F06}\x{5F07}' .
-'\x{5F08}\x{5F0A}\x{5F0B}\x{5F0C}\x{5F0D}\x{5F0F}\x{5F11}\x{5F12}\x{5F13}' .
-'\x{5F14}\x{5F15}\x{5F16}\x{5F17}\x{5F18}\x{5F19}\x{5F1A}\x{5F1B}\x{5F1C}' .
-'\x{5F1D}\x{5F1E}\x{5F1F}\x{5F20}\x{5F21}\x{5F22}\x{5F23}\x{5F24}\x{5F25}' .
-'\x{5F26}\x{5F27}\x{5F28}\x{5F29}\x{5F2A}\x{5F2B}\x{5F2C}\x{5F2D}\x{5F2E}' .
-'\x{5F2F}\x{5F30}\x{5F31}\x{5F32}\x{5F33}\x{5F34}\x{5F35}\x{5F36}\x{5F37}' .
-'\x{5F38}\x{5F39}\x{5F3A}\x{5F3C}\x{5F3E}\x{5F3F}\x{5F40}\x{5F41}\x{5F42}' .
-'\x{5F43}\x{5F44}\x{5F45}\x{5F46}\x{5F47}\x{5F48}\x{5F49}\x{5F4A}\x{5F4B}' .
-'\x{5F4C}\x{5F4D}\x{5F4E}\x{5F4F}\x{5F50}\x{5F51}\x{5F52}\x{5F53}\x{5F54}' .
-'\x{5F55}\x{5F56}\x{5F57}\x{5F58}\x{5F59}\x{5F5A}\x{5F5B}\x{5F5C}\x{5F5D}' .
-'\x{5F5E}\x{5F5F}\x{5F60}\x{5F61}\x{5F62}\x{5F63}\x{5F64}\x{5F65}\x{5F66}' .
-'\x{5F67}\x{5F68}\x{5F69}\x{5F6A}\x{5F6B}\x{5F6C}\x{5F6D}\x{5F6E}\x{5F6F}' .
-'\x{5F70}\x{5F71}\x{5F72}\x{5F73}\x{5F74}\x{5F75}\x{5F76}\x{5F77}\x{5F78}' .
-'\x{5F79}\x{5F7A}\x{5F7B}\x{5F7C}\x{5F7D}\x{5F7E}\x{5F7F}\x{5F80}\x{5F81}' .
-'\x{5F82}\x{5F83}\x{5F84}\x{5F85}\x{5F86}\x{5F87}\x{5F88}\x{5F89}\x{5F8A}' .
-'\x{5F8B}\x{5F8C}\x{5F8D}\x{5F8E}\x{5F90}\x{5F91}\x{5F92}\x{5F93}\x{5F94}' .
-'\x{5F95}\x{5F96}\x{5F97}\x{5F98}\x{5F99}\x{5F9B}\x{5F9C}\x{5F9D}\x{5F9E}' .
-'\x{5F9F}\x{5FA0}\x{5FA1}\x{5FA2}\x{5FA5}\x{5FA6}\x{5FA7}\x{5FA8}\x{5FA9}' .
-'\x{5FAA}\x{5FAB}\x{5FAC}\x{5FAD}\x{5FAE}\x{5FAF}\x{5FB1}\x{5FB2}\x{5FB3}' .
-'\x{5FB4}\x{5FB5}\x{5FB6}\x{5FB7}\x{5FB8}\x{5FB9}\x{5FBA}\x{5FBB}\x{5FBC}' .
-'\x{5FBD}\x{5FBE}\x{5FBF}\x{5FC0}\x{5FC1}\x{5FC3}\x{5FC4}\x{5FC5}\x{5FC6}' .
-'\x{5FC7}\x{5FC8}\x{5FC9}\x{5FCA}\x{5FCB}\x{5FCC}\x{5FCD}\x{5FCF}\x{5FD0}' .
-'\x{5FD1}\x{5FD2}\x{5FD3}\x{5FD4}\x{5FD5}\x{5FD6}\x{5FD7}\x{5FD8}\x{5FD9}' .
-'\x{5FDA}\x{5FDC}\x{5FDD}\x{5FDE}\x{5FE0}\x{5FE1}\x{5FE3}\x{5FE4}\x{5FE5}' .
-'\x{5FE6}\x{5FE7}\x{5FE8}\x{5FE9}\x{5FEA}\x{5FEB}\x{5FED}\x{5FEE}\x{5FEF}' .
-'\x{5FF0}\x{5FF1}\x{5FF2}\x{5FF3}\x{5FF4}\x{5FF5}\x{5FF6}\x{5FF7}\x{5FF8}' .
-'\x{5FF9}\x{5FFA}\x{5FFB}\x{5FFD}\x{5FFE}\x{5FFF}\x{6000}\x{6001}\x{6002}' .
-'\x{6003}\x{6004}\x{6005}\x{6006}\x{6007}\x{6008}\x{6009}\x{600A}\x{600B}' .
-'\x{600C}\x{600D}\x{600E}\x{600F}\x{6010}\x{6011}\x{6012}\x{6013}\x{6014}' .
-'\x{6015}\x{6016}\x{6017}\x{6018}\x{6019}\x{601A}\x{601B}\x{601C}\x{601D}' .
-'\x{601E}\x{601F}\x{6020}\x{6021}\x{6022}\x{6024}\x{6025}\x{6026}\x{6027}' .
-'\x{6028}\x{6029}\x{602A}\x{602B}\x{602C}\x{602D}\x{602E}\x{602F}\x{6030}' .
-'\x{6031}\x{6032}\x{6033}\x{6034}\x{6035}\x{6036}\x{6037}\x{6038}\x{6039}' .
-'\x{603A}\x{603B}\x{603C}\x{603D}\x{603E}\x{603F}\x{6040}\x{6041}\x{6042}' .
-'\x{6043}\x{6044}\x{6045}\x{6046}\x{6047}\x{6048}\x{6049}\x{604A}\x{604B}' .
-'\x{604C}\x{604D}\x{604E}\x{604F}\x{6050}\x{6051}\x{6052}\x{6053}\x{6054}' .
-'\x{6055}\x{6057}\x{6058}\x{6059}\x{605A}\x{605B}\x{605C}\x{605D}\x{605E}' .
-'\x{605F}\x{6062}\x{6063}\x{6064}\x{6065}\x{6066}\x{6067}\x{6068}\x{6069}' .
-'\x{606A}\x{606B}\x{606C}\x{606D}\x{606E}\x{606F}\x{6070}\x{6072}\x{6073}' .
-'\x{6075}\x{6076}\x{6077}\x{6078}\x{6079}\x{607A}\x{607B}\x{607C}\x{607D}' .
-'\x{607E}\x{607F}\x{6080}\x{6081}\x{6082}\x{6083}\x{6084}\x{6085}\x{6086}' .
-'\x{6087}\x{6088}\x{6089}\x{608A}\x{608B}\x{608C}\x{608D}\x{608E}\x{608F}' .
-'\x{6090}\x{6092}\x{6094}\x{6095}\x{6096}\x{6097}\x{6098}\x{6099}\x{609A}' .
-'\x{609B}\x{609C}\x{609D}\x{609E}\x{609F}\x{60A0}\x{60A1}\x{60A2}\x{60A3}' .
-'\x{60A4}\x{60A6}\x{60A7}\x{60A8}\x{60AA}\x{60AB}\x{60AC}\x{60AD}\x{60AE}' .
-'\x{60AF}\x{60B0}\x{60B1}\x{60B2}\x{60B3}\x{60B4}\x{60B5}\x{60B6}\x{60B7}' .
-'\x{60B8}\x{60B9}\x{60BA}\x{60BB}\x{60BC}\x{60BD}\x{60BE}\x{60BF}\x{60C0}' .
-'\x{60C1}\x{60C2}\x{60C3}\x{60C4}\x{60C5}\x{60C6}\x{60C7}\x{60C8}\x{60C9}' .
-'\x{60CA}\x{60CB}\x{60CC}\x{60CD}\x{60CE}\x{60CF}\x{60D0}\x{60D1}\x{60D3}' .
-'\x{60D4}\x{60D5}\x{60D7}\x{60D8}\x{60D9}\x{60DA}\x{60DB}\x{60DC}\x{60DD}' .
-'\x{60DF}\x{60E0}\x{60E1}\x{60E2}\x{60E4}\x{60E6}\x{60E7}\x{60E8}\x{60E9}' .
-'\x{60EA}\x{60EB}\x{60EC}\x{60ED}\x{60EE}\x{60EF}\x{60F0}\x{60F1}\x{60F2}' .
-'\x{60F3}\x{60F4}\x{60F5}\x{60F6}\x{60F7}\x{60F8}\x{60F9}\x{60FA}\x{60FB}' .
-'\x{60FC}\x{60FE}\x{60FF}\x{6100}\x{6101}\x{6103}\x{6104}\x{6105}\x{6106}' .
-'\x{6108}\x{6109}\x{610A}\x{610B}\x{610C}\x{610D}\x{610E}\x{610F}\x{6110}' .
-'\x{6112}\x{6113}\x{6114}\x{6115}\x{6116}\x{6117}\x{6118}\x{6119}\x{611A}' .
-'\x{611B}\x{611C}\x{611D}\x{611F}\x{6120}\x{6122}\x{6123}\x{6124}\x{6125}' .
-'\x{6126}\x{6127}\x{6128}\x{6129}\x{612A}\x{612B}\x{612C}\x{612D}\x{612E}' .
-'\x{612F}\x{6130}\x{6132}\x{6134}\x{6136}\x{6137}\x{613A}\x{613B}\x{613C}' .
-'\x{613D}\x{613E}\x{613F}\x{6140}\x{6141}\x{6142}\x{6143}\x{6144}\x{6145}' .
-'\x{6146}\x{6147}\x{6148}\x{6149}\x{614A}\x{614B}\x{614C}\x{614D}\x{614E}' .
-'\x{614F}\x{6150}\x{6151}\x{6152}\x{6153}\x{6154}\x{6155}\x{6156}\x{6157}' .
-'\x{6158}\x{6159}\x{615A}\x{615B}\x{615C}\x{615D}\x{615E}\x{615F}\x{6161}' .
-'\x{6162}\x{6163}\x{6164}\x{6165}\x{6166}\x{6167}\x{6168}\x{6169}\x{616A}' .
-'\x{616B}\x{616C}\x{616D}\x{616E}\x{6170}\x{6171}\x{6172}\x{6173}\x{6174}' .
-'\x{6175}\x{6176}\x{6177}\x{6178}\x{6179}\x{617A}\x{617C}\x{617E}\x{6180}' .
-'\x{6181}\x{6182}\x{6183}\x{6184}\x{6185}\x{6187}\x{6188}\x{6189}\x{618A}' .
-'\x{618B}\x{618C}\x{618D}\x{618E}\x{618F}\x{6190}\x{6191}\x{6192}\x{6193}' .
-'\x{6194}\x{6195}\x{6196}\x{6198}\x{6199}\x{619A}\x{619B}\x{619D}\x{619E}' .
-'\x{619F}\x{61A0}\x{61A1}\x{61A2}\x{61A3}\x{61A4}\x{61A5}\x{61A6}\x{61A7}' .
-'\x{61A8}\x{61A9}\x{61AA}\x{61AB}\x{61AC}\x{61AD}\x{61AE}\x{61AF}\x{61B0}' .
-'\x{61B1}\x{61B2}\x{61B3}\x{61B4}\x{61B5}\x{61B6}\x{61B7}\x{61B8}\x{61BA}' .
-'\x{61BC}\x{61BD}\x{61BE}\x{61BF}\x{61C0}\x{61C1}\x{61C2}\x{61C3}\x{61C4}' .
-'\x{61C5}\x{61C6}\x{61C7}\x{61C8}\x{61C9}\x{61CA}\x{61CB}\x{61CC}\x{61CD}' .
-'\x{61CE}\x{61CF}\x{61D0}\x{61D1}\x{61D2}\x{61D4}\x{61D6}\x{61D7}\x{61D8}' .
-'\x{61D9}\x{61DA}\x{61DB}\x{61DC}\x{61DD}\x{61DE}\x{61DF}\x{61E0}\x{61E1}' .
-'\x{61E2}\x{61E3}\x{61E4}\x{61E5}\x{61E6}\x{61E7}\x{61E8}\x{61E9}\x{61EA}' .
-'\x{61EB}\x{61ED}\x{61EE}\x{61F0}\x{61F1}\x{61F2}\x{61F3}\x{61F5}\x{61F6}' .
-'\x{61F7}\x{61F8}\x{61F9}\x{61FA}\x{61FB}\x{61FC}\x{61FD}\x{61FE}\x{61FF}' .
-'\x{6200}\x{6201}\x{6202}\x{6203}\x{6204}\x{6206}\x{6207}\x{6208}\x{6209}' .
-'\x{620A}\x{620B}\x{620C}\x{620D}\x{620E}\x{620F}\x{6210}\x{6211}\x{6212}' .
-'\x{6213}\x{6214}\x{6215}\x{6216}\x{6217}\x{6218}\x{6219}\x{621A}\x{621B}' .
-'\x{621C}\x{621D}\x{621E}\x{621F}\x{6220}\x{6221}\x{6222}\x{6223}\x{6224}' .
-'\x{6225}\x{6226}\x{6227}\x{6228}\x{6229}\x{622A}\x{622B}\x{622C}\x{622D}' .
-'\x{622E}\x{622F}\x{6230}\x{6231}\x{6232}\x{6233}\x{6234}\x{6236}\x{6237}' .
-'\x{6238}\x{623A}\x{623B}\x{623C}\x{623D}\x{623E}\x{623F}\x{6240}\x{6241}' .
-'\x{6242}\x{6243}\x{6244}\x{6245}\x{6246}\x{6247}\x{6248}\x{6249}\x{624A}' .
-'\x{624B}\x{624C}\x{624D}\x{624E}\x{624F}\x{6250}\x{6251}\x{6252}\x{6253}' .
-'\x{6254}\x{6255}\x{6256}\x{6258}\x{6259}\x{625A}\x{625B}\x{625C}\x{625D}' .
-'\x{625E}\x{625F}\x{6260}\x{6261}\x{6262}\x{6263}\x{6264}\x{6265}\x{6266}' .
-'\x{6267}\x{6268}\x{6269}\x{626A}\x{626B}\x{626C}\x{626D}\x{626E}\x{626F}' .
-'\x{6270}\x{6271}\x{6272}\x{6273}\x{6274}\x{6275}\x{6276}\x{6277}\x{6278}' .
-'\x{6279}\x{627A}\x{627B}\x{627C}\x{627D}\x{627E}\x{627F}\x{6280}\x{6281}' .
-'\x{6283}\x{6284}\x{6285}\x{6286}\x{6287}\x{6288}\x{6289}\x{628A}\x{628B}' .
-'\x{628C}\x{628E}\x{628F}\x{6290}\x{6291}\x{6292}\x{6293}\x{6294}\x{6295}' .
-'\x{6296}\x{6297}\x{6298}\x{6299}\x{629A}\x{629B}\x{629C}\x{629E}\x{629F}' .
-'\x{62A0}\x{62A1}\x{62A2}\x{62A3}\x{62A4}\x{62A5}\x{62A7}\x{62A8}\x{62A9}' .
-'\x{62AA}\x{62AB}\x{62AC}\x{62AD}\x{62AE}\x{62AF}\x{62B0}\x{62B1}\x{62B2}' .
-'\x{62B3}\x{62B4}\x{62B5}\x{62B6}\x{62B7}\x{62B8}\x{62B9}\x{62BA}\x{62BB}' .
-'\x{62BC}\x{62BD}\x{62BE}\x{62BF}\x{62C0}\x{62C1}\x{62C2}\x{62C3}\x{62C4}' .
-'\x{62C5}\x{62C6}\x{62C7}\x{62C8}\x{62C9}\x{62CA}\x{62CB}\x{62CC}\x{62CD}' .
-'\x{62CE}\x{62CF}\x{62D0}\x{62D1}\x{62D2}\x{62D3}\x{62D4}\x{62D5}\x{62D6}' .
-'\x{62D7}\x{62D8}\x{62D9}\x{62DA}\x{62DB}\x{62DC}\x{62DD}\x{62DF}\x{62E0}' .
-'\x{62E1}\x{62E2}\x{62E3}\x{62E4}\x{62E5}\x{62E6}\x{62E7}\x{62E8}\x{62E9}' .
-'\x{62EB}\x{62EC}\x{62ED}\x{62EE}\x{62EF}\x{62F0}\x{62F1}\x{62F2}\x{62F3}' .
-'\x{62F4}\x{62F5}\x{62F6}\x{62F7}\x{62F8}\x{62F9}\x{62FA}\x{62FB}\x{62FC}' .
-'\x{62FD}\x{62FE}\x{62FF}\x{6300}\x{6301}\x{6302}\x{6303}\x{6304}\x{6305}' .
-'\x{6306}\x{6307}\x{6308}\x{6309}\x{630B}\x{630C}\x{630D}\x{630E}\x{630F}' .
-'\x{6310}\x{6311}\x{6312}\x{6313}\x{6314}\x{6315}\x{6316}\x{6318}\x{6319}' .
-'\x{631A}\x{631B}\x{631C}\x{631D}\x{631E}\x{631F}\x{6320}\x{6321}\x{6322}' .
-'\x{6323}\x{6324}\x{6325}\x{6326}\x{6327}\x{6328}\x{6329}\x{632A}\x{632B}' .
-'\x{632C}\x{632D}\x{632E}\x{632F}\x{6330}\x{6332}\x{6333}\x{6334}\x{6336}' .
-'\x{6338}\x{6339}\x{633A}\x{633B}\x{633C}\x{633D}\x{633E}\x{6340}\x{6341}' .
-'\x{6342}\x{6343}\x{6344}\x{6345}\x{6346}\x{6347}\x{6348}\x{6349}\x{634A}' .
-'\x{634B}\x{634C}\x{634D}\x{634E}\x{634F}\x{6350}\x{6351}\x{6352}\x{6353}' .
-'\x{6354}\x{6355}\x{6356}\x{6357}\x{6358}\x{6359}\x{635A}\x{635C}\x{635D}' .
-'\x{635E}\x{635F}\x{6360}\x{6361}\x{6362}\x{6363}\x{6364}\x{6365}\x{6366}' .
-'\x{6367}\x{6368}\x{6369}\x{636A}\x{636B}\x{636C}\x{636D}\x{636E}\x{636F}' .
-'\x{6370}\x{6371}\x{6372}\x{6373}\x{6374}\x{6375}\x{6376}\x{6377}\x{6378}' .
-'\x{6379}\x{637A}\x{637B}\x{637C}\x{637D}\x{637E}\x{6380}\x{6381}\x{6382}' .
-'\x{6383}\x{6384}\x{6385}\x{6386}\x{6387}\x{6388}\x{6389}\x{638A}\x{638C}' .
-'\x{638D}\x{638E}\x{638F}\x{6390}\x{6391}\x{6392}\x{6394}\x{6395}\x{6396}' .
-'\x{6397}\x{6398}\x{6399}\x{639A}\x{639B}\x{639C}\x{639D}\x{639E}\x{639F}' .
-'\x{63A0}\x{63A1}\x{63A2}\x{63A3}\x{63A4}\x{63A5}\x{63A6}\x{63A7}\x{63A8}' .
-'\x{63A9}\x{63AA}\x{63AB}\x{63AC}\x{63AD}\x{63AE}\x{63AF}\x{63B0}\x{63B1}' .
-'\x{63B2}\x{63B3}\x{63B4}\x{63B5}\x{63B6}\x{63B7}\x{63B8}\x{63B9}\x{63BA}' .
-'\x{63BC}\x{63BD}\x{63BE}\x{63BF}\x{63C0}\x{63C1}\x{63C2}\x{63C3}\x{63C4}' .
-'\x{63C5}\x{63C6}\x{63C7}\x{63C8}\x{63C9}\x{63CA}\x{63CB}\x{63CC}\x{63CD}' .
-'\x{63CE}\x{63CF}\x{63D0}\x{63D2}\x{63D3}\x{63D4}\x{63D5}\x{63D6}\x{63D7}' .
-'\x{63D8}\x{63D9}\x{63DA}\x{63DB}\x{63DC}\x{63DD}\x{63DE}\x{63DF}\x{63E0}' .
-'\x{63E1}\x{63E2}\x{63E3}\x{63E4}\x{63E5}\x{63E6}\x{63E7}\x{63E8}\x{63E9}' .
-'\x{63EA}\x{63EB}\x{63EC}\x{63ED}\x{63EE}\x{63EF}\x{63F0}\x{63F1}\x{63F2}' .
-'\x{63F3}\x{63F4}\x{63F5}\x{63F6}\x{63F7}\x{63F8}\x{63F9}\x{63FA}\x{63FB}' .
-'\x{63FC}\x{63FD}\x{63FE}\x{63FF}\x{6400}\x{6401}\x{6402}\x{6403}\x{6404}' .
-'\x{6405}\x{6406}\x{6408}\x{6409}\x{640A}\x{640B}\x{640C}\x{640D}\x{640E}' .
-'\x{640F}\x{6410}\x{6411}\x{6412}\x{6413}\x{6414}\x{6415}\x{6416}\x{6417}' .
-'\x{6418}\x{6419}\x{641A}\x{641B}\x{641C}\x{641D}\x{641E}\x{641F}\x{6420}' .
-'\x{6421}\x{6422}\x{6423}\x{6424}\x{6425}\x{6426}\x{6427}\x{6428}\x{6429}' .
-'\x{642A}\x{642B}\x{642C}\x{642D}\x{642E}\x{642F}\x{6430}\x{6431}\x{6432}' .
-'\x{6433}\x{6434}\x{6435}\x{6436}\x{6437}\x{6438}\x{6439}\x{643A}\x{643D}' .
-'\x{643E}\x{643F}\x{6440}\x{6441}\x{6443}\x{6444}\x{6445}\x{6446}\x{6447}' .
-'\x{6448}\x{644A}\x{644B}\x{644C}\x{644D}\x{644E}\x{644F}\x{6450}\x{6451}' .
-'\x{6452}\x{6453}\x{6454}\x{6455}\x{6456}\x{6457}\x{6458}\x{6459}\x{645B}' .
-'\x{645C}\x{645D}\x{645E}\x{645F}\x{6460}\x{6461}\x{6462}\x{6463}\x{6464}' .
-'\x{6465}\x{6466}\x{6467}\x{6468}\x{6469}\x{646A}\x{646B}\x{646C}\x{646D}' .
-'\x{646E}\x{646F}\x{6470}\x{6471}\x{6472}\x{6473}\x{6474}\x{6475}\x{6476}' .
-'\x{6477}\x{6478}\x{6479}\x{647A}\x{647B}\x{647C}\x{647D}\x{647F}\x{6480}' .
-'\x{6481}\x{6482}\x{6483}\x{6484}\x{6485}\x{6487}\x{6488}\x{6489}\x{648A}' .
-'\x{648B}\x{648C}\x{648D}\x{648E}\x{648F}\x{6490}\x{6491}\x{6492}\x{6493}' .
-'\x{6494}\x{6495}\x{6496}\x{6497}\x{6498}\x{6499}\x{649A}\x{649B}\x{649C}' .
-'\x{649D}\x{649E}\x{649F}\x{64A0}\x{64A2}\x{64A3}\x{64A4}\x{64A5}\x{64A6}' .
-'\x{64A7}\x{64A8}\x{64A9}\x{64AA}\x{64AB}\x{64AC}\x{64AD}\x{64AE}\x{64B0}' .
-'\x{64B1}\x{64B2}\x{64B3}\x{64B4}\x{64B5}\x{64B7}\x{64B8}\x{64B9}\x{64BA}' .
-'\x{64BB}\x{64BC}\x{64BD}\x{64BE}\x{64BF}\x{64C0}\x{64C1}\x{64C2}\x{64C3}' .
-'\x{64C4}\x{64C5}\x{64C6}\x{64C7}\x{64C9}\x{64CA}\x{64CB}\x{64CC}\x{64CD}' .
-'\x{64CE}\x{64CF}\x{64D0}\x{64D1}\x{64D2}\x{64D3}\x{64D4}\x{64D6}\x{64D7}' .
-'\x{64D8}\x{64D9}\x{64DA}\x{64DB}\x{64DC}\x{64DD}\x{64DE}\x{64DF}\x{64E0}' .
-'\x{64E2}\x{64E3}\x{64E4}\x{64E6}\x{64E7}\x{64E8}\x{64E9}\x{64EA}\x{64EB}' .
-'\x{64EC}\x{64ED}\x{64EF}\x{64F0}\x{64F1}\x{64F2}\x{64F3}\x{64F4}\x{64F6}' .
-'\x{64F7}\x{64F8}\x{64FA}\x{64FB}\x{64FC}\x{64FD}\x{64FE}\x{64FF}\x{6500}' .
-'\x{6501}\x{6503}\x{6504}\x{6505}\x{6506}\x{6507}\x{6508}\x{6509}\x{650B}' .
-'\x{650C}\x{650D}\x{650E}\x{650F}\x{6510}\x{6511}\x{6512}\x{6513}\x{6514}' .
-'\x{6515}\x{6516}\x{6517}\x{6518}\x{6519}\x{651A}\x{651B}\x{651C}\x{651D}' .
-'\x{651E}\x{6520}\x{6521}\x{6522}\x{6523}\x{6524}\x{6525}\x{6526}\x{6527}' .
-'\x{6529}\x{652A}\x{652B}\x{652C}\x{652D}\x{652E}\x{652F}\x{6530}\x{6531}' .
-'\x{6532}\x{6533}\x{6534}\x{6535}\x{6536}\x{6537}\x{6538}\x{6539}\x{653A}' .
-'\x{653B}\x{653C}\x{653D}\x{653E}\x{653F}\x{6541}\x{6543}\x{6544}\x{6545}' .
-'\x{6546}\x{6547}\x{6548}\x{6549}\x{654A}\x{654B}\x{654C}\x{654D}\x{654E}' .
-'\x{654F}\x{6550}\x{6551}\x{6552}\x{6553}\x{6554}\x{6555}\x{6556}\x{6557}' .
-'\x{6558}\x{6559}\x{655B}\x{655C}\x{655D}\x{655E}\x{6560}\x{6561}\x{6562}' .
-'\x{6563}\x{6564}\x{6565}\x{6566}\x{6567}\x{6568}\x{6569}\x{656A}\x{656B}' .
-'\x{656C}\x{656E}\x{656F}\x{6570}\x{6571}\x{6572}\x{6573}\x{6574}\x{6575}' .
-'\x{6576}\x{6577}\x{6578}\x{6579}\x{657A}\x{657B}\x{657C}\x{657E}\x{657F}' .
-'\x{6580}\x{6581}\x{6582}\x{6583}\x{6584}\x{6585}\x{6586}\x{6587}\x{6588}' .
-'\x{6589}\x{658B}\x{658C}\x{658D}\x{658E}\x{658F}\x{6590}\x{6591}\x{6592}' .
-'\x{6593}\x{6594}\x{6595}\x{6596}\x{6597}\x{6598}\x{6599}\x{659B}\x{659C}' .
-'\x{659D}\x{659E}\x{659F}\x{65A0}\x{65A1}\x{65A2}\x{65A3}\x{65A4}\x{65A5}' .
-'\x{65A6}\x{65A7}\x{65A8}\x{65A9}\x{65AA}\x{65AB}\x{65AC}\x{65AD}\x{65AE}' .
-'\x{65AF}\x{65B0}\x{65B1}\x{65B2}\x{65B3}\x{65B4}\x{65B6}\x{65B7}\x{65B8}' .
-'\x{65B9}\x{65BA}\x{65BB}\x{65BC}\x{65BD}\x{65BF}\x{65C0}\x{65C1}\x{65C2}' .
-'\x{65C3}\x{65C4}\x{65C5}\x{65C6}\x{65C7}\x{65CA}\x{65CB}\x{65CC}\x{65CD}' .
-'\x{65CE}\x{65CF}\x{65D0}\x{65D2}\x{65D3}\x{65D4}\x{65D5}\x{65D6}\x{65D7}' .
-'\x{65DA}\x{65DB}\x{65DD}\x{65DE}\x{65DF}\x{65E0}\x{65E1}\x{65E2}\x{65E3}' .
-'\x{65E5}\x{65E6}\x{65E7}\x{65E8}\x{65E9}\x{65EB}\x{65EC}\x{65ED}\x{65EE}' .
-'\x{65EF}\x{65F0}\x{65F1}\x{65F2}\x{65F3}\x{65F4}\x{65F5}\x{65F6}\x{65F7}' .
-'\x{65F8}\x{65FA}\x{65FB}\x{65FC}\x{65FD}\x{6600}\x{6601}\x{6602}\x{6603}' .
-'\x{6604}\x{6605}\x{6606}\x{6607}\x{6608}\x{6609}\x{660A}\x{660B}\x{660C}' .
-'\x{660D}\x{660E}\x{660F}\x{6610}\x{6611}\x{6612}\x{6613}\x{6614}\x{6615}' .
-'\x{6616}\x{6618}\x{6619}\x{661A}\x{661B}\x{661C}\x{661D}\x{661F}\x{6620}' .
-'\x{6621}\x{6622}\x{6623}\x{6624}\x{6625}\x{6626}\x{6627}\x{6628}\x{6629}' .
-'\x{662A}\x{662B}\x{662D}\x{662E}\x{662F}\x{6630}\x{6631}\x{6632}\x{6633}' .
-'\x{6634}\x{6635}\x{6636}\x{6639}\x{663A}\x{663C}\x{663D}\x{663E}\x{6640}' .
-'\x{6641}\x{6642}\x{6643}\x{6644}\x{6645}\x{6646}\x{6647}\x{6649}\x{664A}' .
-'\x{664B}\x{664C}\x{664E}\x{664F}\x{6650}\x{6651}\x{6652}\x{6653}\x{6654}' .
-'\x{6655}\x{6656}\x{6657}\x{6658}\x{6659}\x{665A}\x{665B}\x{665C}\x{665D}' .
-'\x{665E}\x{665F}\x{6661}\x{6662}\x{6664}\x{6665}\x{6666}\x{6668}\x{6669}' .
-'\x{666A}\x{666B}\x{666C}\x{666D}\x{666E}\x{666F}\x{6670}\x{6671}\x{6672}' .
-'\x{6673}\x{6674}\x{6675}\x{6676}\x{6677}\x{6678}\x{6679}\x{667A}\x{667B}' .
-'\x{667C}\x{667D}\x{667E}\x{667F}\x{6680}\x{6681}\x{6682}\x{6683}\x{6684}' .
-'\x{6685}\x{6686}\x{6687}\x{6688}\x{6689}\x{668A}\x{668B}\x{668C}\x{668D}' .
-'\x{668E}\x{668F}\x{6690}\x{6691}\x{6693}\x{6694}\x{6695}\x{6696}\x{6697}' .
-'\x{6698}\x{6699}\x{669A}\x{669B}\x{669D}\x{669F}\x{66A0}\x{66A1}\x{66A2}' .
-'\x{66A3}\x{66A4}\x{66A5}\x{66A6}\x{66A7}\x{66A8}\x{66A9}\x{66AA}\x{66AB}' .
-'\x{66AE}\x{66AF}\x{66B0}\x{66B1}\x{66B2}\x{66B3}\x{66B4}\x{66B5}\x{66B6}' .
-'\x{66B7}\x{66B8}\x{66B9}\x{66BA}\x{66BB}\x{66BC}\x{66BD}\x{66BE}\x{66BF}' .
-'\x{66C0}\x{66C1}\x{66C2}\x{66C3}\x{66C4}\x{66C5}\x{66C6}\x{66C7}\x{66C8}' .
-'\x{66C9}\x{66CA}\x{66CB}\x{66CC}\x{66CD}\x{66CE}\x{66CF}\x{66D1}\x{66D2}' .
-'\x{66D4}\x{66D5}\x{66D6}\x{66D8}\x{66D9}\x{66DA}\x{66DB}\x{66DC}\x{66DD}' .
-'\x{66DE}\x{66E0}\x{66E1}\x{66E2}\x{66E3}\x{66E4}\x{66E5}\x{66E6}\x{66E7}' .
-'\x{66E8}\x{66E9}\x{66EA}\x{66EB}\x{66EC}\x{66ED}\x{66EE}\x{66F0}\x{66F1}' .
-'\x{66F2}\x{66F3}\x{66F4}\x{66F5}\x{66F6}\x{66F7}\x{66F8}\x{66F9}\x{66FA}' .
-'\x{66FB}\x{66FC}\x{66FE}\x{66FF}\x{6700}\x{6701}\x{6703}\x{6704}\x{6705}' .
-'\x{6706}\x{6708}\x{6709}\x{670A}\x{670B}\x{670C}\x{670D}\x{670E}\x{670F}' .
-'\x{6710}\x{6711}\x{6712}\x{6713}\x{6714}\x{6715}\x{6716}\x{6717}\x{6718}' .
-'\x{671A}\x{671B}\x{671C}\x{671D}\x{671E}\x{671F}\x{6720}\x{6721}\x{6722}' .
-'\x{6723}\x{6725}\x{6726}\x{6727}\x{6728}\x{672A}\x{672B}\x{672C}\x{672D}' .
-'\x{672E}\x{672F}\x{6730}\x{6731}\x{6732}\x{6733}\x{6734}\x{6735}\x{6736}' .
-'\x{6737}\x{6738}\x{6739}\x{673A}\x{673B}\x{673C}\x{673D}\x{673E}\x{673F}' .
-'\x{6740}\x{6741}\x{6742}\x{6743}\x{6744}\x{6745}\x{6746}\x{6747}\x{6748}' .
-'\x{6749}\x{674A}\x{674B}\x{674C}\x{674D}\x{674E}\x{674F}\x{6750}\x{6751}' .
-'\x{6752}\x{6753}\x{6754}\x{6755}\x{6756}\x{6757}\x{6758}\x{6759}\x{675A}' .
-'\x{675B}\x{675C}\x{675D}\x{675E}\x{675F}\x{6760}\x{6761}\x{6762}\x{6763}' .
-'\x{6764}\x{6765}\x{6766}\x{6768}\x{6769}\x{676A}\x{676B}\x{676C}\x{676D}' .
-'\x{676E}\x{676F}\x{6770}\x{6771}\x{6772}\x{6773}\x{6774}\x{6775}\x{6776}' .
-'\x{6777}\x{6778}\x{6779}\x{677A}\x{677B}\x{677C}\x{677D}\x{677E}\x{677F}' .
-'\x{6780}\x{6781}\x{6782}\x{6783}\x{6784}\x{6785}\x{6786}\x{6787}\x{6789}' .
-'\x{678A}\x{678B}\x{678C}\x{678D}\x{678E}\x{678F}\x{6790}\x{6791}\x{6792}' .
-'\x{6793}\x{6794}\x{6795}\x{6797}\x{6798}\x{6799}\x{679A}\x{679B}\x{679C}' .
-'\x{679D}\x{679E}\x{679F}\x{67A0}\x{67A1}\x{67A2}\x{67A3}\x{67A4}\x{67A5}' .
-'\x{67A6}\x{67A7}\x{67A8}\x{67AA}\x{67AB}\x{67AC}\x{67AD}\x{67AE}\x{67AF}' .
-'\x{67B0}\x{67B1}\x{67B2}\x{67B3}\x{67B4}\x{67B5}\x{67B6}\x{67B7}\x{67B8}' .
-'\x{67B9}\x{67BA}\x{67BB}\x{67BC}\x{67BE}\x{67C0}\x{67C1}\x{67C2}\x{67C3}' .
-'\x{67C4}\x{67C5}\x{67C6}\x{67C7}\x{67C8}\x{67C9}\x{67CA}\x{67CB}\x{67CC}' .
-'\x{67CD}\x{67CE}\x{67CF}\x{67D0}\x{67D1}\x{67D2}\x{67D3}\x{67D4}\x{67D6}' .
-'\x{67D8}\x{67D9}\x{67DA}\x{67DB}\x{67DC}\x{67DD}\x{67DE}\x{67DF}\x{67E0}' .
-'\x{67E1}\x{67E2}\x{67E3}\x{67E4}\x{67E5}\x{67E6}\x{67E7}\x{67E8}\x{67E9}' .
-'\x{67EA}\x{67EB}\x{67EC}\x{67ED}\x{67EE}\x{67EF}\x{67F0}\x{67F1}\x{67F2}' .
-'\x{67F3}\x{67F4}\x{67F5}\x{67F6}\x{67F7}\x{67F8}\x{67FA}\x{67FB}\x{67FC}' .
-'\x{67FD}\x{67FE}\x{67FF}\x{6800}\x{6802}\x{6803}\x{6804}\x{6805}\x{6806}' .
-'\x{6807}\x{6808}\x{6809}\x{680A}\x{680B}\x{680C}\x{680D}\x{680E}\x{680F}' .
-'\x{6810}\x{6811}\x{6812}\x{6813}\x{6814}\x{6816}\x{6817}\x{6818}\x{6819}' .
-'\x{681A}\x{681B}\x{681C}\x{681D}\x{681F}\x{6820}\x{6821}\x{6822}\x{6823}' .
-'\x{6824}\x{6825}\x{6826}\x{6828}\x{6829}\x{682A}\x{682B}\x{682C}\x{682D}' .
-'\x{682E}\x{682F}\x{6831}\x{6832}\x{6833}\x{6834}\x{6835}\x{6836}\x{6837}' .
-'\x{6838}\x{6839}\x{683A}\x{683B}\x{683C}\x{683D}\x{683E}\x{683F}\x{6840}' .
-'\x{6841}\x{6842}\x{6843}\x{6844}\x{6845}\x{6846}\x{6847}\x{6848}\x{6849}' .
-'\x{684A}\x{684B}\x{684C}\x{684D}\x{684E}\x{684F}\x{6850}\x{6851}\x{6852}' .
-'\x{6853}\x{6854}\x{6855}\x{6856}\x{6857}\x{685B}\x{685D}\x{6860}\x{6861}' .
-'\x{6862}\x{6863}\x{6864}\x{6865}\x{6866}\x{6867}\x{6868}\x{6869}\x{686A}' .
-'\x{686B}\x{686C}\x{686D}\x{686E}\x{686F}\x{6870}\x{6871}\x{6872}\x{6873}' .
-'\x{6874}\x{6875}\x{6876}\x{6877}\x{6878}\x{6879}\x{687B}\x{687C}\x{687D}' .
-'\x{687E}\x{687F}\x{6880}\x{6881}\x{6882}\x{6883}\x{6884}\x{6885}\x{6886}' .
-'\x{6887}\x{6888}\x{6889}\x{688A}\x{688B}\x{688C}\x{688D}\x{688E}\x{688F}' .
-'\x{6890}\x{6891}\x{6892}\x{6893}\x{6894}\x{6896}\x{6897}\x{6898}\x{689A}' .
-'\x{689B}\x{689C}\x{689D}\x{689E}\x{689F}\x{68A0}\x{68A1}\x{68A2}\x{68A3}' .
-'\x{68A4}\x{68A6}\x{68A7}\x{68A8}\x{68A9}\x{68AA}\x{68AB}\x{68AC}\x{68AD}' .
-'\x{68AE}\x{68AF}\x{68B0}\x{68B1}\x{68B2}\x{68B3}\x{68B4}\x{68B5}\x{68B6}' .
-'\x{68B7}\x{68B9}\x{68BB}\x{68BC}\x{68BD}\x{68BE}\x{68BF}\x{68C0}\x{68C1}' .
-'\x{68C2}\x{68C4}\x{68C6}\x{68C7}\x{68C8}\x{68C9}\x{68CA}\x{68CB}\x{68CC}' .
-'\x{68CD}\x{68CE}\x{68CF}\x{68D0}\x{68D1}\x{68D2}\x{68D3}\x{68D4}\x{68D5}' .
-'\x{68D6}\x{68D7}\x{68D8}\x{68DA}\x{68DB}\x{68DC}\x{68DD}\x{68DE}\x{68DF}' .
-'\x{68E0}\x{68E1}\x{68E3}\x{68E4}\x{68E6}\x{68E7}\x{68E8}\x{68E9}\x{68EA}' .
-'\x{68EB}\x{68EC}\x{68ED}\x{68EE}\x{68EF}\x{68F0}\x{68F1}\x{68F2}\x{68F3}' .
-'\x{68F4}\x{68F5}\x{68F6}\x{68F7}\x{68F8}\x{68F9}\x{68FA}\x{68FB}\x{68FC}' .
-'\x{68FD}\x{68FE}\x{68FF}\x{6901}\x{6902}\x{6903}\x{6904}\x{6905}\x{6906}' .
-'\x{6907}\x{6908}\x{690A}\x{690B}\x{690C}\x{690D}\x{690E}\x{690F}\x{6910}' .
-'\x{6911}\x{6912}\x{6913}\x{6914}\x{6915}\x{6916}\x{6917}\x{6918}\x{6919}' .
-'\x{691A}\x{691B}\x{691C}\x{691D}\x{691E}\x{691F}\x{6920}\x{6921}\x{6922}' .
-'\x{6923}\x{6924}\x{6925}\x{6926}\x{6927}\x{6928}\x{6929}\x{692A}\x{692B}' .
-'\x{692C}\x{692D}\x{692E}\x{692F}\x{6930}\x{6931}\x{6932}\x{6933}\x{6934}' .
-'\x{6935}\x{6936}\x{6937}\x{6938}\x{6939}\x{693A}\x{693B}\x{693C}\x{693D}' .
-'\x{693F}\x{6940}\x{6941}\x{6942}\x{6943}\x{6944}\x{6945}\x{6946}\x{6947}' .
-'\x{6948}\x{6949}\x{694A}\x{694B}\x{694C}\x{694E}\x{694F}\x{6950}\x{6951}' .
-'\x{6952}\x{6953}\x{6954}\x{6955}\x{6956}\x{6957}\x{6958}\x{6959}\x{695A}' .
-'\x{695B}\x{695C}\x{695D}\x{695E}\x{695F}\x{6960}\x{6961}\x{6962}\x{6963}' .
-'\x{6964}\x{6965}\x{6966}\x{6967}\x{6968}\x{6969}\x{696A}\x{696B}\x{696C}' .
-'\x{696D}\x{696E}\x{696F}\x{6970}\x{6971}\x{6972}\x{6973}\x{6974}\x{6975}' .
-'\x{6976}\x{6977}\x{6978}\x{6979}\x{697A}\x{697B}\x{697C}\x{697D}\x{697E}' .
-'\x{697F}\x{6980}\x{6981}\x{6982}\x{6983}\x{6984}\x{6985}\x{6986}\x{6987}' .
-'\x{6988}\x{6989}\x{698A}\x{698B}\x{698C}\x{698D}\x{698E}\x{698F}\x{6990}' .
-'\x{6991}\x{6992}\x{6993}\x{6994}\x{6995}\x{6996}\x{6997}\x{6998}\x{6999}' .
-'\x{699A}\x{699B}\x{699C}\x{699D}\x{699E}\x{69A0}\x{69A1}\x{69A3}\x{69A4}' .
-'\x{69A5}\x{69A6}\x{69A7}\x{69A8}\x{69A9}\x{69AA}\x{69AB}\x{69AC}\x{69AD}' .
-'\x{69AE}\x{69AF}\x{69B0}\x{69B1}\x{69B2}\x{69B3}\x{69B4}\x{69B5}\x{69B6}' .
-'\x{69B7}\x{69B8}\x{69B9}\x{69BA}\x{69BB}\x{69BC}\x{69BD}\x{69BE}\x{69BF}' .
-'\x{69C1}\x{69C2}\x{69C3}\x{69C4}\x{69C5}\x{69C6}\x{69C7}\x{69C8}\x{69C9}' .
-'\x{69CA}\x{69CB}\x{69CC}\x{69CD}\x{69CE}\x{69CF}\x{69D0}\x{69D3}\x{69D4}' .
-'\x{69D8}\x{69D9}\x{69DA}\x{69DB}\x{69DC}\x{69DD}\x{69DE}\x{69DF}\x{69E0}' .
-'\x{69E1}\x{69E2}\x{69E3}\x{69E4}\x{69E5}\x{69E6}\x{69E7}\x{69E8}\x{69E9}' .
-'\x{69EA}\x{69EB}\x{69EC}\x{69ED}\x{69EE}\x{69EF}\x{69F0}\x{69F1}\x{69F2}' .
-'\x{69F3}\x{69F4}\x{69F5}\x{69F6}\x{69F7}\x{69F8}\x{69FA}\x{69FB}\x{69FC}' .
-'\x{69FD}\x{69FE}\x{69FF}\x{6A00}\x{6A01}\x{6A02}\x{6A04}\x{6A05}\x{6A06}' .
-'\x{6A07}\x{6A08}\x{6A09}\x{6A0A}\x{6A0B}\x{6A0D}\x{6A0E}\x{6A0F}\x{6A10}' .
-'\x{6A11}\x{6A12}\x{6A13}\x{6A14}\x{6A15}\x{6A16}\x{6A17}\x{6A18}\x{6A19}' .
-'\x{6A1A}\x{6A1B}\x{6A1D}\x{6A1E}\x{6A1F}\x{6A20}\x{6A21}\x{6A22}\x{6A23}' .
-'\x{6A25}\x{6A26}\x{6A27}\x{6A28}\x{6A29}\x{6A2A}\x{6A2B}\x{6A2C}\x{6A2D}' .
-'\x{6A2E}\x{6A2F}\x{6A30}\x{6A31}\x{6A32}\x{6A33}\x{6A34}\x{6A35}\x{6A36}' .
-'\x{6A38}\x{6A39}\x{6A3A}\x{6A3B}\x{6A3C}\x{6A3D}\x{6A3E}\x{6A3F}\x{6A40}' .
-'\x{6A41}\x{6A42}\x{6A43}\x{6A44}\x{6A45}\x{6A46}\x{6A47}\x{6A48}\x{6A49}' .
-'\x{6A4B}\x{6A4C}\x{6A4D}\x{6A4E}\x{6A4F}\x{6A50}\x{6A51}\x{6A52}\x{6A54}' .
-'\x{6A55}\x{6A56}\x{6A57}\x{6A58}\x{6A59}\x{6A5A}\x{6A5B}\x{6A5D}\x{6A5E}' .
-'\x{6A5F}\x{6A60}\x{6A61}\x{6A62}\x{6A63}\x{6A64}\x{6A65}\x{6A66}\x{6A67}' .
-'\x{6A68}\x{6A69}\x{6A6A}\x{6A6B}\x{6A6C}\x{6A6D}\x{6A6F}\x{6A71}\x{6A72}' .
-'\x{6A73}\x{6A74}\x{6A75}\x{6A76}\x{6A77}\x{6A78}\x{6A79}\x{6A7A}\x{6A7B}' .
-'\x{6A7C}\x{6A7D}\x{6A7E}\x{6A7F}\x{6A80}\x{6A81}\x{6A82}\x{6A83}\x{6A84}' .
-'\x{6A85}\x{6A87}\x{6A88}\x{6A89}\x{6A8B}\x{6A8C}\x{6A8D}\x{6A8E}\x{6A90}' .
-'\x{6A91}\x{6A92}\x{6A93}\x{6A94}\x{6A95}\x{6A96}\x{6A97}\x{6A98}\x{6A9A}' .
-'\x{6A9B}\x{6A9C}\x{6A9E}\x{6A9F}\x{6AA0}\x{6AA1}\x{6AA2}\x{6AA3}\x{6AA4}' .
-'\x{6AA5}\x{6AA6}\x{6AA7}\x{6AA8}\x{6AA9}\x{6AAB}\x{6AAC}\x{6AAD}\x{6AAE}' .
-'\x{6AAF}\x{6AB0}\x{6AB2}\x{6AB3}\x{6AB4}\x{6AB5}\x{6AB6}\x{6AB7}\x{6AB8}' .
-'\x{6AB9}\x{6ABA}\x{6ABB}\x{6ABC}\x{6ABD}\x{6ABF}\x{6AC1}\x{6AC2}\x{6AC3}' .
-'\x{6AC5}\x{6AC6}\x{6AC7}\x{6ACA}\x{6ACB}\x{6ACC}\x{6ACD}\x{6ACE}\x{6ACF}' .
-'\x{6AD0}\x{6AD1}\x{6AD2}\x{6AD3}\x{6AD4}\x{6AD5}\x{6AD6}\x{6AD7}\x{6AD9}' .
-'\x{6ADA}\x{6ADB}\x{6ADC}\x{6ADD}\x{6ADE}\x{6ADF}\x{6AE0}\x{6AE1}\x{6AE2}' .
-'\x{6AE3}\x{6AE4}\x{6AE5}\x{6AE6}\x{6AE7}\x{6AE8}\x{6AEA}\x{6AEB}\x{6AEC}' .
-'\x{6AED}\x{6AEE}\x{6AEF}\x{6AF0}\x{6AF1}\x{6AF2}\x{6AF3}\x{6AF4}\x{6AF5}' .
-'\x{6AF6}\x{6AF7}\x{6AF8}\x{6AF9}\x{6AFA}\x{6AFB}\x{6AFC}\x{6AFD}\x{6AFE}' .
-'\x{6AFF}\x{6B00}\x{6B01}\x{6B02}\x{6B03}\x{6B04}\x{6B05}\x{6B06}\x{6B07}' .
-'\x{6B08}\x{6B09}\x{6B0A}\x{6B0B}\x{6B0C}\x{6B0D}\x{6B0F}\x{6B10}\x{6B11}' .
-'\x{6B12}\x{6B13}\x{6B14}\x{6B15}\x{6B16}\x{6B17}\x{6B18}\x{6B19}\x{6B1A}' .
-'\x{6B1C}\x{6B1D}\x{6B1E}\x{6B1F}\x{6B20}\x{6B21}\x{6B22}\x{6B23}\x{6B24}' .
-'\x{6B25}\x{6B26}\x{6B27}\x{6B28}\x{6B29}\x{6B2A}\x{6B2B}\x{6B2C}\x{6B2D}' .
-'\x{6B2F}\x{6B30}\x{6B31}\x{6B32}\x{6B33}\x{6B34}\x{6B36}\x{6B37}\x{6B38}' .
-'\x{6B39}\x{6B3A}\x{6B3B}\x{6B3C}\x{6B3D}\x{6B3E}\x{6B3F}\x{6B41}\x{6B42}' .
-'\x{6B43}\x{6B44}\x{6B45}\x{6B46}\x{6B47}\x{6B48}\x{6B49}\x{6B4A}\x{6B4B}' .
-'\x{6B4C}\x{6B4D}\x{6B4E}\x{6B4F}\x{6B50}\x{6B51}\x{6B52}\x{6B53}\x{6B54}' .
-'\x{6B55}\x{6B56}\x{6B59}\x{6B5A}\x{6B5B}\x{6B5C}\x{6B5E}\x{6B5F}\x{6B60}' .
-'\x{6B61}\x{6B62}\x{6B63}\x{6B64}\x{6B65}\x{6B66}\x{6B67}\x{6B69}\x{6B6A}' .
-'\x{6B6B}\x{6B6D}\x{6B6F}\x{6B70}\x{6B72}\x{6B73}\x{6B74}\x{6B76}\x{6B77}' .
-'\x{6B78}\x{6B79}\x{6B7A}\x{6B7B}\x{6B7C}\x{6B7E}\x{6B7F}\x{6B80}\x{6B81}' .
-'\x{6B82}\x{6B83}\x{6B84}\x{6B85}\x{6B86}\x{6B87}\x{6B88}\x{6B89}\x{6B8A}' .
-'\x{6B8B}\x{6B8C}\x{6B8D}\x{6B8E}\x{6B8F}\x{6B90}\x{6B91}\x{6B92}\x{6B93}' .
-'\x{6B94}\x{6B95}\x{6B96}\x{6B97}\x{6B98}\x{6B99}\x{6B9A}\x{6B9B}\x{6B9C}' .
-'\x{6B9D}\x{6B9E}\x{6B9F}\x{6BA0}\x{6BA1}\x{6BA2}\x{6BA3}\x{6BA4}\x{6BA5}' .
-'\x{6BA6}\x{6BA7}\x{6BA8}\x{6BA9}\x{6BAA}\x{6BAB}\x{6BAC}\x{6BAD}\x{6BAE}' .
-'\x{6BAF}\x{6BB0}\x{6BB2}\x{6BB3}\x{6BB4}\x{6BB5}\x{6BB6}\x{6BB7}\x{6BB9}' .
-'\x{6BBA}\x{6BBB}\x{6BBC}\x{6BBD}\x{6BBE}\x{6BBF}\x{6BC0}\x{6BC1}\x{6BC2}' .
-'\x{6BC3}\x{6BC4}\x{6BC5}\x{6BC6}\x{6BC7}\x{6BC8}\x{6BC9}\x{6BCA}\x{6BCB}' .
-'\x{6BCC}\x{6BCD}\x{6BCE}\x{6BCF}\x{6BD0}\x{6BD1}\x{6BD2}\x{6BD3}\x{6BD4}' .
-'\x{6BD5}\x{6BD6}\x{6BD7}\x{6BD8}\x{6BD9}\x{6BDA}\x{6BDB}\x{6BDC}\x{6BDD}' .
-'\x{6BDE}\x{6BDF}\x{6BE0}\x{6BE1}\x{6BE2}\x{6BE3}\x{6BE4}\x{6BE5}\x{6BE6}' .
-'\x{6BE7}\x{6BE8}\x{6BEA}\x{6BEB}\x{6BEC}\x{6BED}\x{6BEE}\x{6BEF}\x{6BF0}' .
-'\x{6BF2}\x{6BF3}\x{6BF5}\x{6BF6}\x{6BF7}\x{6BF8}\x{6BF9}\x{6BFB}\x{6BFC}' .
-'\x{6BFD}\x{6BFE}\x{6BFF}\x{6C00}\x{6C01}\x{6C02}\x{6C03}\x{6C04}\x{6C05}' .
-'\x{6C06}\x{6C07}\x{6C08}\x{6C09}\x{6C0B}\x{6C0C}\x{6C0D}\x{6C0E}\x{6C0F}' .
-'\x{6C10}\x{6C11}\x{6C12}\x{6C13}\x{6C14}\x{6C15}\x{6C16}\x{6C18}\x{6C19}' .
-'\x{6C1A}\x{6C1B}\x{6C1D}\x{6C1E}\x{6C1F}\x{6C20}\x{6C21}\x{6C22}\x{6C23}' .
-'\x{6C24}\x{6C25}\x{6C26}\x{6C27}\x{6C28}\x{6C29}\x{6C2A}\x{6C2B}\x{6C2C}' .
-'\x{6C2E}\x{6C2F}\x{6C30}\x{6C31}\x{6C32}\x{6C33}\x{6C34}\x{6C35}\x{6C36}' .
-'\x{6C37}\x{6C38}\x{6C3A}\x{6C3B}\x{6C3D}\x{6C3E}\x{6C3F}\x{6C40}\x{6C41}' .
-'\x{6C42}\x{6C43}\x{6C44}\x{6C46}\x{6C47}\x{6C48}\x{6C49}\x{6C4A}\x{6C4B}' .
-'\x{6C4C}\x{6C4D}\x{6C4E}\x{6C4F}\x{6C50}\x{6C51}\x{6C52}\x{6C53}\x{6C54}' .
-'\x{6C55}\x{6C56}\x{6C57}\x{6C58}\x{6C59}\x{6C5A}\x{6C5B}\x{6C5C}\x{6C5D}' .
-'\x{6C5E}\x{6C5F}\x{6C60}\x{6C61}\x{6C62}\x{6C63}\x{6C64}\x{6C65}\x{6C66}' .
-'\x{6C67}\x{6C68}\x{6C69}\x{6C6A}\x{6C6B}\x{6C6D}\x{6C6F}\x{6C70}\x{6C71}' .
-'\x{6C72}\x{6C73}\x{6C74}\x{6C75}\x{6C76}\x{6C77}\x{6C78}\x{6C79}\x{6C7A}' .
-'\x{6C7B}\x{6C7C}\x{6C7D}\x{6C7E}\x{6C7F}\x{6C80}\x{6C81}\x{6C82}\x{6C83}' .
-'\x{6C84}\x{6C85}\x{6C86}\x{6C87}\x{6C88}\x{6C89}\x{6C8A}\x{6C8B}\x{6C8C}' .
-'\x{6C8D}\x{6C8E}\x{6C8F}\x{6C90}\x{6C91}\x{6C92}\x{6C93}\x{6C94}\x{6C95}' .
-'\x{6C96}\x{6C97}\x{6C98}\x{6C99}\x{6C9A}\x{6C9B}\x{6C9C}\x{6C9D}\x{6C9E}' .
-'\x{6C9F}\x{6CA1}\x{6CA2}\x{6CA3}\x{6CA4}\x{6CA5}\x{6CA6}\x{6CA7}\x{6CA8}' .
-'\x{6CA9}\x{6CAA}\x{6CAB}\x{6CAC}\x{6CAD}\x{6CAE}\x{6CAF}\x{6CB0}\x{6CB1}' .
-'\x{6CB2}\x{6CB3}\x{6CB4}\x{6CB5}\x{6CB6}\x{6CB7}\x{6CB8}\x{6CB9}\x{6CBA}' .
-'\x{6CBB}\x{6CBC}\x{6CBD}\x{6CBE}\x{6CBF}\x{6CC0}\x{6CC1}\x{6CC2}\x{6CC3}' .
-'\x{6CC4}\x{6CC5}\x{6CC6}\x{6CC7}\x{6CC8}\x{6CC9}\x{6CCA}\x{6CCB}\x{6CCC}' .
-'\x{6CCD}\x{6CCE}\x{6CCF}\x{6CD0}\x{6CD1}\x{6CD2}\x{6CD3}\x{6CD4}\x{6CD5}' .
-'\x{6CD6}\x{6CD7}\x{6CD9}\x{6CDA}\x{6CDB}\x{6CDC}\x{6CDD}\x{6CDE}\x{6CDF}' .
-'\x{6CE0}\x{6CE1}\x{6CE2}\x{6CE3}\x{6CE4}\x{6CE5}\x{6CE6}\x{6CE7}\x{6CE8}' .
-'\x{6CE9}\x{6CEA}\x{6CEB}\x{6CEC}\x{6CED}\x{6CEE}\x{6CEF}\x{6CF0}\x{6CF1}' .
-'\x{6CF2}\x{6CF3}\x{6CF5}\x{6CF6}\x{6CF7}\x{6CF8}\x{6CF9}\x{6CFA}\x{6CFB}' .
-'\x{6CFC}\x{6CFD}\x{6CFE}\x{6CFF}\x{6D00}\x{6D01}\x{6D03}\x{6D04}\x{6D05}' .
-'\x{6D06}\x{6D07}\x{6D08}\x{6D09}\x{6D0A}\x{6D0B}\x{6D0C}\x{6D0D}\x{6D0E}' .
-'\x{6D0F}\x{6D10}\x{6D11}\x{6D12}\x{6D13}\x{6D14}\x{6D15}\x{6D16}\x{6D17}' .
-'\x{6D18}\x{6D19}\x{6D1A}\x{6D1B}\x{6D1D}\x{6D1E}\x{6D1F}\x{6D20}\x{6D21}' .
-'\x{6D22}\x{6D23}\x{6D25}\x{6D26}\x{6D27}\x{6D28}\x{6D29}\x{6D2A}\x{6D2B}' .
-'\x{6D2C}\x{6D2D}\x{6D2E}\x{6D2F}\x{6D30}\x{6D31}\x{6D32}\x{6D33}\x{6D34}' .
-'\x{6D35}\x{6D36}\x{6D37}\x{6D38}\x{6D39}\x{6D3A}\x{6D3B}\x{6D3C}\x{6D3D}' .
-'\x{6D3E}\x{6D3F}\x{6D40}\x{6D41}\x{6D42}\x{6D43}\x{6D44}\x{6D45}\x{6D46}' .
-'\x{6D47}\x{6D48}\x{6D49}\x{6D4A}\x{6D4B}\x{6D4C}\x{6D4D}\x{6D4E}\x{6D4F}' .
-'\x{6D50}\x{6D51}\x{6D52}\x{6D53}\x{6D54}\x{6D55}\x{6D56}\x{6D57}\x{6D58}' .
-'\x{6D59}\x{6D5A}\x{6D5B}\x{6D5C}\x{6D5D}\x{6D5E}\x{6D5F}\x{6D60}\x{6D61}' .
-'\x{6D62}\x{6D63}\x{6D64}\x{6D65}\x{6D66}\x{6D67}\x{6D68}\x{6D69}\x{6D6A}' .
-'\x{6D6B}\x{6D6C}\x{6D6D}\x{6D6E}\x{6D6F}\x{6D70}\x{6D72}\x{6D73}\x{6D74}' .
-'\x{6D75}\x{6D76}\x{6D77}\x{6D78}\x{6D79}\x{6D7A}\x{6D7B}\x{6D7C}\x{6D7D}' .
-'\x{6D7E}\x{6D7F}\x{6D80}\x{6D82}\x{6D83}\x{6D84}\x{6D85}\x{6D86}\x{6D87}' .
-'\x{6D88}\x{6D89}\x{6D8A}\x{6D8B}\x{6D8C}\x{6D8D}\x{6D8E}\x{6D8F}\x{6D90}' .
-'\x{6D91}\x{6D92}\x{6D93}\x{6D94}\x{6D95}\x{6D97}\x{6D98}\x{6D99}\x{6D9A}' .
-'\x{6D9B}\x{6D9D}\x{6D9E}\x{6D9F}\x{6DA0}\x{6DA1}\x{6DA2}\x{6DA3}\x{6DA4}' .
-'\x{6DA5}\x{6DA6}\x{6DA7}\x{6DA8}\x{6DA9}\x{6DAA}\x{6DAB}\x{6DAC}\x{6DAD}' .
-'\x{6DAE}\x{6DAF}\x{6DB2}\x{6DB3}\x{6DB4}\x{6DB5}\x{6DB7}\x{6DB8}\x{6DB9}' .
-'\x{6DBA}\x{6DBB}\x{6DBC}\x{6DBD}\x{6DBE}\x{6DBF}\x{6DC0}\x{6DC1}\x{6DC2}' .
-'\x{6DC3}\x{6DC4}\x{6DC5}\x{6DC6}\x{6DC7}\x{6DC8}\x{6DC9}\x{6DCA}\x{6DCB}' .
-'\x{6DCC}\x{6DCD}\x{6DCE}\x{6DCF}\x{6DD0}\x{6DD1}\x{6DD2}\x{6DD3}\x{6DD4}' .
-'\x{6DD5}\x{6DD6}\x{6DD7}\x{6DD8}\x{6DD9}\x{6DDA}\x{6DDB}\x{6DDC}\x{6DDD}' .
-'\x{6DDE}\x{6DDF}\x{6DE0}\x{6DE1}\x{6DE2}\x{6DE3}\x{6DE4}\x{6DE5}\x{6DE6}' .
-'\x{6DE7}\x{6DE8}\x{6DE9}\x{6DEA}\x{6DEB}\x{6DEC}\x{6DED}\x{6DEE}\x{6DEF}' .
-'\x{6DF0}\x{6DF1}\x{6DF2}\x{6DF3}\x{6DF4}\x{6DF5}\x{6DF6}\x{6DF7}\x{6DF8}' .
-'\x{6DF9}\x{6DFA}\x{6DFB}\x{6DFC}\x{6DFD}\x{6E00}\x{6E03}\x{6E04}\x{6E05}' .
-'\x{6E07}\x{6E08}\x{6E09}\x{6E0A}\x{6E0B}\x{6E0C}\x{6E0D}\x{6E0E}\x{6E0F}' .
-'\x{6E10}\x{6E11}\x{6E14}\x{6E15}\x{6E16}\x{6E17}\x{6E19}\x{6E1A}\x{6E1B}' .
-'\x{6E1C}\x{6E1D}\x{6E1E}\x{6E1F}\x{6E20}\x{6E21}\x{6E22}\x{6E23}\x{6E24}' .
-'\x{6E25}\x{6E26}\x{6E27}\x{6E28}\x{6E29}\x{6E2B}\x{6E2C}\x{6E2D}\x{6E2E}' .
-'\x{6E2F}\x{6E30}\x{6E31}\x{6E32}\x{6E33}\x{6E34}\x{6E35}\x{6E36}\x{6E37}' .
-'\x{6E38}\x{6E39}\x{6E3A}\x{6E3B}\x{6E3C}\x{6E3D}\x{6E3E}\x{6E3F}\x{6E40}' .
-'\x{6E41}\x{6E42}\x{6E43}\x{6E44}\x{6E45}\x{6E46}\x{6E47}\x{6E48}\x{6E49}' .
-'\x{6E4A}\x{6E4B}\x{6E4D}\x{6E4E}\x{6E4F}\x{6E50}\x{6E51}\x{6E52}\x{6E53}' .
-'\x{6E54}\x{6E55}\x{6E56}\x{6E57}\x{6E58}\x{6E59}\x{6E5A}\x{6E5B}\x{6E5C}' .
-'\x{6E5D}\x{6E5E}\x{6E5F}\x{6E60}\x{6E61}\x{6E62}\x{6E63}\x{6E64}\x{6E65}' .
-'\x{6E66}\x{6E67}\x{6E68}\x{6E69}\x{6E6A}\x{6E6B}\x{6E6D}\x{6E6E}\x{6E6F}' .
-'\x{6E70}\x{6E71}\x{6E72}\x{6E73}\x{6E74}\x{6E75}\x{6E77}\x{6E78}\x{6E79}' .
-'\x{6E7E}\x{6E7F}\x{6E80}\x{6E81}\x{6E82}\x{6E83}\x{6E84}\x{6E85}\x{6E86}' .
-'\x{6E87}\x{6E88}\x{6E89}\x{6E8A}\x{6E8D}\x{6E8E}\x{6E8F}\x{6E90}\x{6E91}' .
-'\x{6E92}\x{6E93}\x{6E94}\x{6E96}\x{6E97}\x{6E98}\x{6E99}\x{6E9A}\x{6E9B}' .
-'\x{6E9C}\x{6E9D}\x{6E9E}\x{6E9F}\x{6EA0}\x{6EA1}\x{6EA2}\x{6EA3}\x{6EA4}' .
-'\x{6EA5}\x{6EA6}\x{6EA7}\x{6EA8}\x{6EA9}\x{6EAA}\x{6EAB}\x{6EAC}\x{6EAD}' .
-'\x{6EAE}\x{6EAF}\x{6EB0}\x{6EB1}\x{6EB2}\x{6EB3}\x{6EB4}\x{6EB5}\x{6EB6}' .
-'\x{6EB7}\x{6EB8}\x{6EB9}\x{6EBA}\x{6EBB}\x{6EBC}\x{6EBD}\x{6EBE}\x{6EBF}' .
-'\x{6EC0}\x{6EC1}\x{6EC2}\x{6EC3}\x{6EC4}\x{6EC5}\x{6EC6}\x{6EC7}\x{6EC8}' .
-'\x{6EC9}\x{6ECA}\x{6ECB}\x{6ECC}\x{6ECD}\x{6ECE}\x{6ECF}\x{6ED0}\x{6ED1}' .
-'\x{6ED2}\x{6ED3}\x{6ED4}\x{6ED5}\x{6ED6}\x{6ED7}\x{6ED8}\x{6ED9}\x{6EDA}' .
-'\x{6EDC}\x{6EDE}\x{6EDF}\x{6EE0}\x{6EE1}\x{6EE2}\x{6EE4}\x{6EE5}\x{6EE6}' .
-'\x{6EE7}\x{6EE8}\x{6EE9}\x{6EEA}\x{6EEB}\x{6EEC}\x{6EED}\x{6EEE}\x{6EEF}' .
-'\x{6EF0}\x{6EF1}\x{6EF2}\x{6EF3}\x{6EF4}\x{6EF5}\x{6EF6}\x{6EF7}\x{6EF8}' .
-'\x{6EF9}\x{6EFA}\x{6EFB}\x{6EFC}\x{6EFD}\x{6EFE}\x{6EFF}\x{6F00}\x{6F01}' .
-'\x{6F02}\x{6F03}\x{6F05}\x{6F06}\x{6F07}\x{6F08}\x{6F09}\x{6F0A}\x{6F0C}' .
-'\x{6F0D}\x{6F0E}\x{6F0F}\x{6F10}\x{6F11}\x{6F12}\x{6F13}\x{6F14}\x{6F15}' .
-'\x{6F16}\x{6F17}\x{6F18}\x{6F19}\x{6F1A}\x{6F1B}\x{6F1C}\x{6F1D}\x{6F1E}' .
-'\x{6F1F}\x{6F20}\x{6F21}\x{6F22}\x{6F23}\x{6F24}\x{6F25}\x{6F26}\x{6F27}' .
-'\x{6F28}\x{6F29}\x{6F2A}\x{6F2B}\x{6F2C}\x{6F2D}\x{6F2E}\x{6F2F}\x{6F30}' .
-'\x{6F31}\x{6F32}\x{6F33}\x{6F34}\x{6F35}\x{6F36}\x{6F37}\x{6F38}\x{6F39}' .
-'\x{6F3A}\x{6F3B}\x{6F3C}\x{6F3D}\x{6F3E}\x{6F3F}\x{6F40}\x{6F41}\x{6F43}' .
-'\x{6F44}\x{6F45}\x{6F46}\x{6F47}\x{6F49}\x{6F4B}\x{6F4C}\x{6F4D}\x{6F4E}' .
-'\x{6F4F}\x{6F50}\x{6F51}\x{6F52}\x{6F53}\x{6F54}\x{6F55}\x{6F56}\x{6F57}' .
-'\x{6F58}\x{6F59}\x{6F5A}\x{6F5B}\x{6F5C}\x{6F5D}\x{6F5E}\x{6F5F}\x{6F60}' .
-'\x{6F61}\x{6F62}\x{6F63}\x{6F64}\x{6F65}\x{6F66}\x{6F67}\x{6F68}\x{6F69}' .
-'\x{6F6A}\x{6F6B}\x{6F6C}\x{6F6D}\x{6F6E}\x{6F6F}\x{6F70}\x{6F71}\x{6F72}' .
-'\x{6F73}\x{6F74}\x{6F75}\x{6F76}\x{6F77}\x{6F78}\x{6F7A}\x{6F7B}\x{6F7C}' .
-'\x{6F7D}\x{6F7E}\x{6F7F}\x{6F80}\x{6F81}\x{6F82}\x{6F83}\x{6F84}\x{6F85}' .
-'\x{6F86}\x{6F87}\x{6F88}\x{6F89}\x{6F8A}\x{6F8B}\x{6F8C}\x{6F8D}\x{6F8E}' .
-'\x{6F8F}\x{6F90}\x{6F91}\x{6F92}\x{6F93}\x{6F94}\x{6F95}\x{6F96}\x{6F97}' .
-'\x{6F99}\x{6F9B}\x{6F9C}\x{6F9D}\x{6F9E}\x{6FA0}\x{6FA1}\x{6FA2}\x{6FA3}' .
-'\x{6FA4}\x{6FA5}\x{6FA6}\x{6FA7}\x{6FA8}\x{6FA9}\x{6FAA}\x{6FAB}\x{6FAC}' .
-'\x{6FAD}\x{6FAE}\x{6FAF}\x{6FB0}\x{6FB1}\x{6FB2}\x{6FB3}\x{6FB4}\x{6FB5}' .
-'\x{6FB6}\x{6FB8}\x{6FB9}\x{6FBA}\x{6FBB}\x{6FBC}\x{6FBD}\x{6FBE}\x{6FBF}' .
-'\x{6FC0}\x{6FC1}\x{6FC2}\x{6FC3}\x{6FC4}\x{6FC6}\x{6FC7}\x{6FC8}\x{6FC9}' .
-'\x{6FCA}\x{6FCB}\x{6FCC}\x{6FCD}\x{6FCE}\x{6FCF}\x{6FD1}\x{6FD2}\x{6FD4}' .
-'\x{6FD5}\x{6FD6}\x{6FD7}\x{6FD8}\x{6FD9}\x{6FDA}\x{6FDB}\x{6FDC}\x{6FDD}' .
-'\x{6FDE}\x{6FDF}\x{6FE0}\x{6FE1}\x{6FE2}\x{6FE3}\x{6FE4}\x{6FE5}\x{6FE6}' .
-'\x{6FE7}\x{6FE8}\x{6FE9}\x{6FEA}\x{6FEB}\x{6FEC}\x{6FED}\x{6FEE}\x{6FEF}' .
-'\x{6FF0}\x{6FF1}\x{6FF2}\x{6FF3}\x{6FF4}\x{6FF6}\x{6FF7}\x{6FF8}\x{6FF9}' .
-'\x{6FFA}\x{6FFB}\x{6FFC}\x{6FFE}\x{6FFF}\x{7000}\x{7001}\x{7002}\x{7003}' .
-'\x{7004}\x{7005}\x{7006}\x{7007}\x{7008}\x{7009}\x{700A}\x{700B}\x{700C}' .
-'\x{700D}\x{700E}\x{700F}\x{7011}\x{7012}\x{7014}\x{7015}\x{7016}\x{7017}' .
-'\x{7018}\x{7019}\x{701A}\x{701B}\x{701C}\x{701D}\x{701F}\x{7020}\x{7021}' .
-'\x{7022}\x{7023}\x{7024}\x{7025}\x{7026}\x{7027}\x{7028}\x{7029}\x{702A}' .
-'\x{702B}\x{702C}\x{702D}\x{702E}\x{702F}\x{7030}\x{7031}\x{7032}\x{7033}' .
-'\x{7034}\x{7035}\x{7036}\x{7037}\x{7038}\x{7039}\x{703A}\x{703B}\x{703C}' .
-'\x{703D}\x{703E}\x{703F}\x{7040}\x{7041}\x{7042}\x{7043}\x{7044}\x{7045}' .
-'\x{7046}\x{7048}\x{7049}\x{704A}\x{704C}\x{704D}\x{704F}\x{7050}\x{7051}' .
-'\x{7052}\x{7053}\x{7054}\x{7055}\x{7056}\x{7057}\x{7058}\x{7059}\x{705A}' .
-'\x{705B}\x{705C}\x{705D}\x{705E}\x{705F}\x{7060}\x{7061}\x{7062}\x{7063}' .
-'\x{7064}\x{7065}\x{7066}\x{7067}\x{7068}\x{7069}\x{706A}\x{706B}\x{706C}' .
-'\x{706D}\x{706E}\x{706F}\x{7070}\x{7071}\x{7074}\x{7075}\x{7076}\x{7077}' .
-'\x{7078}\x{7079}\x{707A}\x{707C}\x{707D}\x{707E}\x{707F}\x{7080}\x{7082}' .
-'\x{7083}\x{7084}\x{7085}\x{7086}\x{7087}\x{7088}\x{7089}\x{708A}\x{708B}' .
-'\x{708C}\x{708E}\x{708F}\x{7090}\x{7091}\x{7092}\x{7093}\x{7094}\x{7095}' .
-'\x{7096}\x{7098}\x{7099}\x{709A}\x{709C}\x{709D}\x{709E}\x{709F}\x{70A0}' .
-'\x{70A1}\x{70A2}\x{70A3}\x{70A4}\x{70A5}\x{70A6}\x{70A7}\x{70A8}\x{70A9}' .
-'\x{70AB}\x{70AC}\x{70AD}\x{70AE}\x{70AF}\x{70B0}\x{70B1}\x{70B3}\x{70B4}' .
-'\x{70B5}\x{70B7}\x{70B8}\x{70B9}\x{70BA}\x{70BB}\x{70BC}\x{70BD}\x{70BE}' .
-'\x{70BF}\x{70C0}\x{70C1}\x{70C2}\x{70C3}\x{70C4}\x{70C5}\x{70C6}\x{70C7}' .
-'\x{70C8}\x{70C9}\x{70CA}\x{70CB}\x{70CC}\x{70CD}\x{70CE}\x{70CF}\x{70D0}' .
-'\x{70D1}\x{70D2}\x{70D3}\x{70D4}\x{70D6}\x{70D7}\x{70D8}\x{70D9}\x{70DA}' .
-'\x{70DB}\x{70DC}\x{70DD}\x{70DE}\x{70DF}\x{70E0}\x{70E1}\x{70E2}\x{70E3}' .
-'\x{70E4}\x{70E5}\x{70E6}\x{70E7}\x{70E8}\x{70E9}\x{70EA}\x{70EB}\x{70EC}' .
-'\x{70ED}\x{70EE}\x{70EF}\x{70F0}\x{70F1}\x{70F2}\x{70F3}\x{70F4}\x{70F5}' .
-'\x{70F6}\x{70F7}\x{70F8}\x{70F9}\x{70FA}\x{70FB}\x{70FC}\x{70FD}\x{70FF}' .
-'\x{7100}\x{7101}\x{7102}\x{7103}\x{7104}\x{7105}\x{7106}\x{7107}\x{7109}' .
-'\x{710A}\x{710B}\x{710C}\x{710D}\x{710E}\x{710F}\x{7110}\x{7111}\x{7112}' .
-'\x{7113}\x{7115}\x{7116}\x{7117}\x{7118}\x{7119}\x{711A}\x{711B}\x{711C}' .
-'\x{711D}\x{711E}\x{711F}\x{7120}\x{7121}\x{7122}\x{7123}\x{7125}\x{7126}' .
-'\x{7127}\x{7128}\x{7129}\x{712A}\x{712B}\x{712C}\x{712D}\x{712E}\x{712F}' .
-'\x{7130}\x{7131}\x{7132}\x{7135}\x{7136}\x{7137}\x{7138}\x{7139}\x{713A}' .
-'\x{713B}\x{713D}\x{713E}\x{713F}\x{7140}\x{7141}\x{7142}\x{7143}\x{7144}' .
-'\x{7145}\x{7146}\x{7147}\x{7148}\x{7149}\x{714A}\x{714B}\x{714C}\x{714D}' .
-'\x{714E}\x{714F}\x{7150}\x{7151}\x{7152}\x{7153}\x{7154}\x{7156}\x{7158}' .
-'\x{7159}\x{715A}\x{715B}\x{715C}\x{715D}\x{715E}\x{715F}\x{7160}\x{7161}' .
-'\x{7162}\x{7163}\x{7164}\x{7165}\x{7166}\x{7167}\x{7168}\x{7169}\x{716A}' .
-'\x{716C}\x{716E}\x{716F}\x{7170}\x{7171}\x{7172}\x{7173}\x{7174}\x{7175}' .
-'\x{7176}\x{7177}\x{7178}\x{7179}\x{717A}\x{717B}\x{717C}\x{717D}\x{717E}' .
-'\x{717F}\x{7180}\x{7181}\x{7182}\x{7183}\x{7184}\x{7185}\x{7186}\x{7187}' .
-'\x{7188}\x{7189}\x{718A}\x{718B}\x{718C}\x{718E}\x{718F}\x{7190}\x{7191}' .
-'\x{7192}\x{7193}\x{7194}\x{7195}\x{7197}\x{7198}\x{7199}\x{719A}\x{719B}' .
-'\x{719C}\x{719D}\x{719E}\x{719F}\x{71A0}\x{71A1}\x{71A2}\x{71A3}\x{71A4}' .
-'\x{71A5}\x{71A7}\x{71A8}\x{71A9}\x{71AA}\x{71AC}\x{71AD}\x{71AE}\x{71AF}' .
-'\x{71B0}\x{71B1}\x{71B2}\x{71B3}\x{71B4}\x{71B5}\x{71B7}\x{71B8}\x{71B9}' .
-'\x{71BA}\x{71BB}\x{71BC}\x{71BD}\x{71BE}\x{71BF}\x{71C0}\x{71C1}\x{71C2}' .
-'\x{71C3}\x{71C4}\x{71C5}\x{71C6}\x{71C7}\x{71C8}\x{71C9}\x{71CA}\x{71CB}' .
-'\x{71CD}\x{71CE}\x{71CF}\x{71D0}\x{71D1}\x{71D2}\x{71D4}\x{71D5}\x{71D6}' .
-'\x{71D7}\x{71D8}\x{71D9}\x{71DA}\x{71DB}\x{71DC}\x{71DD}\x{71DE}\x{71DF}' .
-'\x{71E0}\x{71E1}\x{71E2}\x{71E3}\x{71E4}\x{71E5}\x{71E6}\x{71E7}\x{71E8}' .
-'\x{71E9}\x{71EA}\x{71EB}\x{71EC}\x{71ED}\x{71EE}\x{71EF}\x{71F0}\x{71F1}' .
-'\x{71F2}\x{71F4}\x{71F5}\x{71F6}\x{71F7}\x{71F8}\x{71F9}\x{71FB}\x{71FC}' .
-'\x{71FD}\x{71FE}\x{71FF}\x{7201}\x{7202}\x{7203}\x{7204}\x{7205}\x{7206}' .
-'\x{7207}\x{7208}\x{7209}\x{720A}\x{720C}\x{720D}\x{720E}\x{720F}\x{7210}' .
-'\x{7212}\x{7213}\x{7214}\x{7216}\x{7218}\x{7219}\x{721A}\x{721B}\x{721C}' .
-'\x{721D}\x{721E}\x{721F}\x{7221}\x{7222}\x{7223}\x{7226}\x{7227}\x{7228}' .
-'\x{7229}\x{722A}\x{722B}\x{722C}\x{722D}\x{722E}\x{7230}\x{7231}\x{7232}' .
-'\x{7233}\x{7235}\x{7236}\x{7237}\x{7238}\x{7239}\x{723A}\x{723B}\x{723C}' .
-'\x{723D}\x{723E}\x{723F}\x{7240}\x{7241}\x{7242}\x{7243}\x{7244}\x{7246}' .
-'\x{7247}\x{7248}\x{7249}\x{724A}\x{724B}\x{724C}\x{724D}\x{724F}\x{7251}' .
-'\x{7252}\x{7253}\x{7254}\x{7256}\x{7257}\x{7258}\x{7259}\x{725A}\x{725B}' .
-'\x{725C}\x{725D}\x{725E}\x{725F}\x{7260}\x{7261}\x{7262}\x{7263}\x{7264}' .
-'\x{7265}\x{7266}\x{7267}\x{7268}\x{7269}\x{726A}\x{726B}\x{726C}\x{726D}' .
-'\x{726E}\x{726F}\x{7270}\x{7271}\x{7272}\x{7273}\x{7274}\x{7275}\x{7276}' .
-'\x{7277}\x{7278}\x{7279}\x{727A}\x{727B}\x{727C}\x{727D}\x{727E}\x{727F}' .
-'\x{7280}\x{7281}\x{7282}\x{7283}\x{7284}\x{7285}\x{7286}\x{7287}\x{7288}' .
-'\x{7289}\x{728A}\x{728B}\x{728C}\x{728D}\x{728E}\x{728F}\x{7290}\x{7291}' .
-'\x{7292}\x{7293}\x{7294}\x{7295}\x{7296}\x{7297}\x{7298}\x{7299}\x{729A}' .
-'\x{729B}\x{729C}\x{729D}\x{729E}\x{729F}\x{72A1}\x{72A2}\x{72A3}\x{72A4}' .
-'\x{72A5}\x{72A6}\x{72A7}\x{72A8}\x{72A9}\x{72AA}\x{72AC}\x{72AD}\x{72AE}' .
-'\x{72AF}\x{72B0}\x{72B1}\x{72B2}\x{72B3}\x{72B4}\x{72B5}\x{72B6}\x{72B7}' .
-'\x{72B8}\x{72B9}\x{72BA}\x{72BB}\x{72BC}\x{72BD}\x{72BF}\x{72C0}\x{72C1}' .
-'\x{72C2}\x{72C3}\x{72C4}\x{72C5}\x{72C6}\x{72C7}\x{72C8}\x{72C9}\x{72CA}' .
-'\x{72CB}\x{72CC}\x{72CD}\x{72CE}\x{72CF}\x{72D0}\x{72D1}\x{72D2}\x{72D3}' .
-'\x{72D4}\x{72D5}\x{72D6}\x{72D7}\x{72D8}\x{72D9}\x{72DA}\x{72DB}\x{72DC}' .
-'\x{72DD}\x{72DE}\x{72DF}\x{72E0}\x{72E1}\x{72E2}\x{72E3}\x{72E4}\x{72E5}' .
-'\x{72E6}\x{72E7}\x{72E8}\x{72E9}\x{72EA}\x{72EB}\x{72EC}\x{72ED}\x{72EE}' .
-'\x{72EF}\x{72F0}\x{72F1}\x{72F2}\x{72F3}\x{72F4}\x{72F5}\x{72F6}\x{72F7}' .
-'\x{72F8}\x{72F9}\x{72FA}\x{72FB}\x{72FC}\x{72FD}\x{72FE}\x{72FF}\x{7300}' .
-'\x{7301}\x{7303}\x{7304}\x{7305}\x{7306}\x{7307}\x{7308}\x{7309}\x{730A}' .
-'\x{730B}\x{730C}\x{730D}\x{730E}\x{730F}\x{7311}\x{7312}\x{7313}\x{7314}' .
-'\x{7315}\x{7316}\x{7317}\x{7318}\x{7319}\x{731A}\x{731B}\x{731C}\x{731D}' .
-'\x{731E}\x{7320}\x{7321}\x{7322}\x{7323}\x{7324}\x{7325}\x{7326}\x{7327}' .
-'\x{7329}\x{732A}\x{732B}\x{732C}\x{732D}\x{732E}\x{7330}\x{7331}\x{7332}' .
-'\x{7333}\x{7334}\x{7335}\x{7336}\x{7337}\x{7338}\x{7339}\x{733A}\x{733B}' .
-'\x{733C}\x{733D}\x{733E}\x{733F}\x{7340}\x{7341}\x{7342}\x{7343}\x{7344}' .
-'\x{7345}\x{7346}\x{7347}\x{7348}\x{7349}\x{734A}\x{734B}\x{734C}\x{734D}' .
-'\x{734E}\x{7350}\x{7351}\x{7352}\x{7354}\x{7355}\x{7356}\x{7357}\x{7358}' .
-'\x{7359}\x{735A}\x{735B}\x{735C}\x{735D}\x{735E}\x{735F}\x{7360}\x{7361}' .
-'\x{7362}\x{7364}\x{7365}\x{7366}\x{7367}\x{7368}\x{7369}\x{736A}\x{736B}' .
-'\x{736C}\x{736D}\x{736E}\x{736F}\x{7370}\x{7371}\x{7372}\x{7373}\x{7374}' .
-'\x{7375}\x{7376}\x{7377}\x{7378}\x{7379}\x{737A}\x{737B}\x{737C}\x{737D}' .
-'\x{737E}\x{737F}\x{7380}\x{7381}\x{7382}\x{7383}\x{7384}\x{7385}\x{7386}' .
-'\x{7387}\x{7388}\x{7389}\x{738A}\x{738B}\x{738C}\x{738D}\x{738E}\x{738F}' .
-'\x{7390}\x{7391}\x{7392}\x{7393}\x{7394}\x{7395}\x{7396}\x{7397}\x{7398}' .
-'\x{7399}\x{739A}\x{739B}\x{739D}\x{739E}\x{739F}\x{73A0}\x{73A1}\x{73A2}' .
-'\x{73A3}\x{73A4}\x{73A5}\x{73A6}\x{73A7}\x{73A8}\x{73A9}\x{73AA}\x{73AB}' .
-'\x{73AC}\x{73AD}\x{73AE}\x{73AF}\x{73B0}\x{73B1}\x{73B2}\x{73B3}\x{73B4}' .
-'\x{73B5}\x{73B6}\x{73B7}\x{73B8}\x{73B9}\x{73BA}\x{73BB}\x{73BC}\x{73BD}' .
-'\x{73BE}\x{73BF}\x{73C0}\x{73C2}\x{73C3}\x{73C4}\x{73C5}\x{73C6}\x{73C7}' .
-'\x{73C8}\x{73C9}\x{73CA}\x{73CB}\x{73CC}\x{73CD}\x{73CE}\x{73CF}\x{73D0}' .
-'\x{73D1}\x{73D2}\x{73D3}\x{73D4}\x{73D5}\x{73D6}\x{73D7}\x{73D8}\x{73D9}' .
-'\x{73DA}\x{73DB}\x{73DC}\x{73DD}\x{73DE}\x{73DF}\x{73E0}\x{73E2}\x{73E3}' .
-'\x{73E5}\x{73E6}\x{73E7}\x{73E8}\x{73E9}\x{73EA}\x{73EB}\x{73EC}\x{73ED}' .
-'\x{73EE}\x{73EF}\x{73F0}\x{73F1}\x{73F2}\x{73F4}\x{73F5}\x{73F6}\x{73F7}' .
-'\x{73F8}\x{73F9}\x{73FA}\x{73FC}\x{73FD}\x{73FE}\x{73FF}\x{7400}\x{7401}' .
-'\x{7402}\x{7403}\x{7404}\x{7405}\x{7406}\x{7407}\x{7408}\x{7409}\x{740A}' .
-'\x{740B}\x{740C}\x{740D}\x{740E}\x{740F}\x{7410}\x{7411}\x{7412}\x{7413}' .
-'\x{7414}\x{7415}\x{7416}\x{7417}\x{7419}\x{741A}\x{741B}\x{741C}\x{741D}' .
-'\x{741E}\x{741F}\x{7420}\x{7421}\x{7422}\x{7423}\x{7424}\x{7425}\x{7426}' .
-'\x{7427}\x{7428}\x{7429}\x{742A}\x{742B}\x{742C}\x{742D}\x{742E}\x{742F}' .
-'\x{7430}\x{7431}\x{7432}\x{7433}\x{7434}\x{7435}\x{7436}\x{7437}\x{7438}' .
-'\x{743A}\x{743B}\x{743C}\x{743D}\x{743F}\x{7440}\x{7441}\x{7442}\x{7443}' .
-'\x{7444}\x{7445}\x{7446}\x{7448}\x{744A}\x{744B}\x{744C}\x{744D}\x{744E}' .
-'\x{744F}\x{7450}\x{7451}\x{7452}\x{7453}\x{7454}\x{7455}\x{7456}\x{7457}' .
-'\x{7459}\x{745A}\x{745B}\x{745C}\x{745D}\x{745E}\x{745F}\x{7461}\x{7462}' .
-'\x{7463}\x{7464}\x{7465}\x{7466}\x{7467}\x{7468}\x{7469}\x{746A}\x{746B}' .
-'\x{746C}\x{746D}\x{746E}\x{746F}\x{7470}\x{7471}\x{7472}\x{7473}\x{7474}' .
-'\x{7475}\x{7476}\x{7477}\x{7478}\x{7479}\x{747A}\x{747C}\x{747D}\x{747E}' .
-'\x{747F}\x{7480}\x{7481}\x{7482}\x{7483}\x{7485}\x{7486}\x{7487}\x{7488}' .
-'\x{7489}\x{748A}\x{748B}\x{748C}\x{748D}\x{748E}\x{748F}\x{7490}\x{7491}' .
-'\x{7492}\x{7493}\x{7494}\x{7495}\x{7497}\x{7498}\x{7499}\x{749A}\x{749B}' .
-'\x{749C}\x{749E}\x{749F}\x{74A0}\x{74A1}\x{74A3}\x{74A4}\x{74A5}\x{74A6}' .
-'\x{74A7}\x{74A8}\x{74A9}\x{74AA}\x{74AB}\x{74AC}\x{74AD}\x{74AE}\x{74AF}' .
-'\x{74B0}\x{74B1}\x{74B2}\x{74B3}\x{74B4}\x{74B5}\x{74B6}\x{74B7}\x{74B8}' .
-'\x{74B9}\x{74BA}\x{74BB}\x{74BC}\x{74BD}\x{74BE}\x{74BF}\x{74C0}\x{74C1}' .
-'\x{74C2}\x{74C3}\x{74C4}\x{74C5}\x{74C6}\x{74CA}\x{74CB}\x{74CD}\x{74CE}' .
-'\x{74CF}\x{74D0}\x{74D1}\x{74D2}\x{74D3}\x{74D4}\x{74D5}\x{74D6}\x{74D7}' .
-'\x{74D8}\x{74D9}\x{74DA}\x{74DB}\x{74DC}\x{74DD}\x{74DE}\x{74DF}\x{74E0}' .
-'\x{74E1}\x{74E2}\x{74E3}\x{74E4}\x{74E5}\x{74E6}\x{74E7}\x{74E8}\x{74E9}' .
-'\x{74EA}\x{74EC}\x{74ED}\x{74EE}\x{74EF}\x{74F0}\x{74F1}\x{74F2}\x{74F3}' .
-'\x{74F4}\x{74F5}\x{74F6}\x{74F7}\x{74F8}\x{74F9}\x{74FA}\x{74FB}\x{74FC}' .
-'\x{74FD}\x{74FE}\x{74FF}\x{7500}\x{7501}\x{7502}\x{7503}\x{7504}\x{7505}' .
-'\x{7506}\x{7507}\x{7508}\x{7509}\x{750A}\x{750B}\x{750C}\x{750D}\x{750F}' .
-'\x{7510}\x{7511}\x{7512}\x{7513}\x{7514}\x{7515}\x{7516}\x{7517}\x{7518}' .
-'\x{7519}\x{751A}\x{751B}\x{751C}\x{751D}\x{751E}\x{751F}\x{7521}\x{7522}' .
-'\x{7523}\x{7524}\x{7525}\x{7526}\x{7527}\x{7528}\x{7529}\x{752A}\x{752B}' .
-'\x{752C}\x{752D}\x{752E}\x{752F}\x{7530}\x{7531}\x{7532}\x{7533}\x{7535}' .
-'\x{7536}\x{7537}\x{7538}\x{7539}\x{753A}\x{753B}\x{753C}\x{753D}\x{753E}' .
-'\x{753F}\x{7540}\x{7542}\x{7543}\x{7544}\x{7545}\x{7546}\x{7547}\x{7548}' .
-'\x{7549}\x{754B}\x{754C}\x{754D}\x{754E}\x{754F}\x{7550}\x{7551}\x{7553}' .
-'\x{7554}\x{7556}\x{7557}\x{7558}\x{7559}\x{755A}\x{755B}\x{755C}\x{755D}' .
-'\x{755F}\x{7560}\x{7562}\x{7563}\x{7564}\x{7565}\x{7566}\x{7567}\x{7568}' .
-'\x{7569}\x{756A}\x{756B}\x{756C}\x{756D}\x{756E}\x{756F}\x{7570}\x{7572}' .
-'\x{7574}\x{7575}\x{7576}\x{7577}\x{7578}\x{7579}\x{757C}\x{757D}\x{757E}' .
-'\x{757F}\x{7580}\x{7581}\x{7582}\x{7583}\x{7584}\x{7586}\x{7587}\x{7588}' .
-'\x{7589}\x{758A}\x{758B}\x{758C}\x{758D}\x{758F}\x{7590}\x{7591}\x{7592}' .
-'\x{7593}\x{7594}\x{7595}\x{7596}\x{7597}\x{7598}\x{7599}\x{759A}\x{759B}' .
-'\x{759C}\x{759D}\x{759E}\x{759F}\x{75A0}\x{75A1}\x{75A2}\x{75A3}\x{75A4}' .
-'\x{75A5}\x{75A6}\x{75A7}\x{75A8}\x{75AA}\x{75AB}\x{75AC}\x{75AD}\x{75AE}' .
-'\x{75AF}\x{75B0}\x{75B1}\x{75B2}\x{75B3}\x{75B4}\x{75B5}\x{75B6}\x{75B8}' .
-'\x{75B9}\x{75BA}\x{75BB}\x{75BC}\x{75BD}\x{75BE}\x{75BF}\x{75C0}\x{75C1}' .
-'\x{75C2}\x{75C3}\x{75C4}\x{75C5}\x{75C6}\x{75C7}\x{75C8}\x{75C9}\x{75CA}' .
-'\x{75CB}\x{75CC}\x{75CD}\x{75CE}\x{75CF}\x{75D0}\x{75D1}\x{75D2}\x{75D3}' .
-'\x{75D4}\x{75D5}\x{75D6}\x{75D7}\x{75D8}\x{75D9}\x{75DA}\x{75DB}\x{75DD}' .
-'\x{75DE}\x{75DF}\x{75E0}\x{75E1}\x{75E2}\x{75E3}\x{75E4}\x{75E5}\x{75E6}' .
-'\x{75E7}\x{75E8}\x{75EA}\x{75EB}\x{75EC}\x{75ED}\x{75EF}\x{75F0}\x{75F1}' .
-'\x{75F2}\x{75F3}\x{75F4}\x{75F5}\x{75F6}\x{75F7}\x{75F8}\x{75F9}\x{75FA}' .
-'\x{75FB}\x{75FC}\x{75FD}\x{75FE}\x{75FF}\x{7600}\x{7601}\x{7602}\x{7603}' .
-'\x{7604}\x{7605}\x{7606}\x{7607}\x{7608}\x{7609}\x{760A}\x{760B}\x{760C}' .
-'\x{760D}\x{760E}\x{760F}\x{7610}\x{7611}\x{7612}\x{7613}\x{7614}\x{7615}' .
-'\x{7616}\x{7617}\x{7618}\x{7619}\x{761A}\x{761B}\x{761C}\x{761D}\x{761E}' .
-'\x{761F}\x{7620}\x{7621}\x{7622}\x{7623}\x{7624}\x{7625}\x{7626}\x{7627}' .
-'\x{7628}\x{7629}\x{762A}\x{762B}\x{762D}\x{762E}\x{762F}\x{7630}\x{7631}' .
-'\x{7632}\x{7633}\x{7634}\x{7635}\x{7636}\x{7637}\x{7638}\x{7639}\x{763A}' .
-'\x{763B}\x{763C}\x{763D}\x{763E}\x{763F}\x{7640}\x{7641}\x{7642}\x{7643}' .
-'\x{7646}\x{7647}\x{7648}\x{7649}\x{764A}\x{764B}\x{764C}\x{764D}\x{764F}' .
-'\x{7650}\x{7652}\x{7653}\x{7654}\x{7656}\x{7657}\x{7658}\x{7659}\x{765A}' .
-'\x{765B}\x{765C}\x{765D}\x{765E}\x{765F}\x{7660}\x{7661}\x{7662}\x{7663}' .
-'\x{7664}\x{7665}\x{7666}\x{7667}\x{7668}\x{7669}\x{766A}\x{766B}\x{766C}' .
-'\x{766D}\x{766E}\x{766F}\x{7670}\x{7671}\x{7672}\x{7674}\x{7675}\x{7676}' .
-'\x{7677}\x{7678}\x{7679}\x{767B}\x{767C}\x{767D}\x{767E}\x{767F}\x{7680}' .
-'\x{7681}\x{7682}\x{7683}\x{7684}\x{7685}\x{7686}\x{7687}\x{7688}\x{7689}' .
-'\x{768A}\x{768B}\x{768C}\x{768E}\x{768F}\x{7690}\x{7691}\x{7692}\x{7693}' .
-'\x{7694}\x{7695}\x{7696}\x{7697}\x{7698}\x{7699}\x{769A}\x{769B}\x{769C}' .
-'\x{769D}\x{769E}\x{769F}\x{76A0}\x{76A3}\x{76A4}\x{76A6}\x{76A7}\x{76A9}' .
-'\x{76AA}\x{76AB}\x{76AC}\x{76AD}\x{76AE}\x{76AF}\x{76B0}\x{76B1}\x{76B2}' .
-'\x{76B4}\x{76B5}\x{76B7}\x{76B8}\x{76BA}\x{76BB}\x{76BC}\x{76BD}\x{76BE}' .
-'\x{76BF}\x{76C0}\x{76C2}\x{76C3}\x{76C4}\x{76C5}\x{76C6}\x{76C7}\x{76C8}' .
-'\x{76C9}\x{76CA}\x{76CD}\x{76CE}\x{76CF}\x{76D0}\x{76D1}\x{76D2}\x{76D3}' .
-'\x{76D4}\x{76D5}\x{76D6}\x{76D7}\x{76D8}\x{76DA}\x{76DB}\x{76DC}\x{76DD}' .
-'\x{76DE}\x{76DF}\x{76E0}\x{76E1}\x{76E2}\x{76E3}\x{76E4}\x{76E5}\x{76E6}' .
-'\x{76E7}\x{76E8}\x{76E9}\x{76EA}\x{76EC}\x{76ED}\x{76EE}\x{76EF}\x{76F0}' .
-'\x{76F1}\x{76F2}\x{76F3}\x{76F4}\x{76F5}\x{76F6}\x{76F7}\x{76F8}\x{76F9}' .
-'\x{76FA}\x{76FB}\x{76FC}\x{76FD}\x{76FE}\x{76FF}\x{7701}\x{7703}\x{7704}' .
-'\x{7705}\x{7706}\x{7707}\x{7708}\x{7709}\x{770A}\x{770B}\x{770C}\x{770D}' .
-'\x{770F}\x{7710}\x{7711}\x{7712}\x{7713}\x{7714}\x{7715}\x{7716}\x{7717}' .
-'\x{7718}\x{7719}\x{771A}\x{771B}\x{771C}\x{771D}\x{771E}\x{771F}\x{7720}' .
-'\x{7722}\x{7723}\x{7725}\x{7726}\x{7727}\x{7728}\x{7729}\x{772A}\x{772C}' .
-'\x{772D}\x{772E}\x{772F}\x{7730}\x{7731}\x{7732}\x{7733}\x{7734}\x{7735}' .
-'\x{7736}\x{7737}\x{7738}\x{7739}\x{773A}\x{773B}\x{773C}\x{773D}\x{773E}' .
-'\x{7740}\x{7741}\x{7743}\x{7744}\x{7745}\x{7746}\x{7747}\x{7748}\x{7749}' .
-'\x{774A}\x{774B}\x{774C}\x{774D}\x{774E}\x{774F}\x{7750}\x{7751}\x{7752}' .
-'\x{7753}\x{7754}\x{7755}\x{7756}\x{7757}\x{7758}\x{7759}\x{775A}\x{775B}' .
-'\x{775C}\x{775D}\x{775E}\x{775F}\x{7760}\x{7761}\x{7762}\x{7763}\x{7765}' .
-'\x{7766}\x{7767}\x{7768}\x{7769}\x{776A}\x{776B}\x{776C}\x{776D}\x{776E}' .
-'\x{776F}\x{7770}\x{7771}\x{7772}\x{7773}\x{7774}\x{7775}\x{7776}\x{7777}' .
-'\x{7778}\x{7779}\x{777A}\x{777B}\x{777C}\x{777D}\x{777E}\x{777F}\x{7780}' .
-'\x{7781}\x{7782}\x{7783}\x{7784}\x{7785}\x{7786}\x{7787}\x{7788}\x{7789}' .
-'\x{778A}\x{778B}\x{778C}\x{778D}\x{778E}\x{778F}\x{7790}\x{7791}\x{7792}' .
-'\x{7793}\x{7794}\x{7795}\x{7797}\x{7798}\x{7799}\x{779A}\x{779B}\x{779C}' .
-'\x{779D}\x{779E}\x{779F}\x{77A0}\x{77A1}\x{77A2}\x{77A3}\x{77A5}\x{77A6}' .
-'\x{77A7}\x{77A8}\x{77A9}\x{77AA}\x{77AB}\x{77AC}\x{77AD}\x{77AE}\x{77AF}' .
-'\x{77B0}\x{77B1}\x{77B2}\x{77B3}\x{77B4}\x{77B5}\x{77B6}\x{77B7}\x{77B8}' .
-'\x{77B9}\x{77BA}\x{77BB}\x{77BC}\x{77BD}\x{77BF}\x{77C0}\x{77C2}\x{77C3}' .
-'\x{77C4}\x{77C5}\x{77C6}\x{77C7}\x{77C8}\x{77C9}\x{77CA}\x{77CB}\x{77CC}' .
-'\x{77CD}\x{77CE}\x{77CF}\x{77D0}\x{77D1}\x{77D3}\x{77D4}\x{77D5}\x{77D6}' .
-'\x{77D7}\x{77D8}\x{77D9}\x{77DA}\x{77DB}\x{77DC}\x{77DE}\x{77DF}\x{77E0}' .
-'\x{77E1}\x{77E2}\x{77E3}\x{77E5}\x{77E7}\x{77E8}\x{77E9}\x{77EA}\x{77EB}' .
-'\x{77EC}\x{77ED}\x{77EE}\x{77EF}\x{77F0}\x{77F1}\x{77F2}\x{77F3}\x{77F6}' .
-'\x{77F7}\x{77F8}\x{77F9}\x{77FA}\x{77FB}\x{77FC}\x{77FD}\x{77FE}\x{77FF}' .
-'\x{7800}\x{7801}\x{7802}\x{7803}\x{7804}\x{7805}\x{7806}\x{7808}\x{7809}' .
-'\x{780A}\x{780B}\x{780C}\x{780D}\x{780E}\x{780F}\x{7810}\x{7811}\x{7812}' .
-'\x{7813}\x{7814}\x{7815}\x{7816}\x{7817}\x{7818}\x{7819}\x{781A}\x{781B}' .
-'\x{781C}\x{781D}\x{781E}\x{781F}\x{7820}\x{7821}\x{7822}\x{7823}\x{7825}' .
-'\x{7826}\x{7827}\x{7828}\x{7829}\x{782A}\x{782B}\x{782C}\x{782D}\x{782E}' .
-'\x{782F}\x{7830}\x{7831}\x{7832}\x{7833}\x{7834}\x{7835}\x{7837}\x{7838}' .
-'\x{7839}\x{783A}\x{783B}\x{783C}\x{783D}\x{783E}\x{7840}\x{7841}\x{7843}' .
-'\x{7844}\x{7845}\x{7847}\x{7848}\x{7849}\x{784A}\x{784C}\x{784D}\x{784E}' .
-'\x{7850}\x{7851}\x{7852}\x{7853}\x{7854}\x{7855}\x{7856}\x{7857}\x{7858}' .
-'\x{7859}\x{785A}\x{785B}\x{785C}\x{785D}\x{785E}\x{785F}\x{7860}\x{7861}' .
-'\x{7862}\x{7863}\x{7864}\x{7865}\x{7866}\x{7867}\x{7868}\x{7869}\x{786A}' .
-'\x{786B}\x{786C}\x{786D}\x{786E}\x{786F}\x{7870}\x{7871}\x{7872}\x{7873}' .
-'\x{7874}\x{7875}\x{7877}\x{7878}\x{7879}\x{787A}\x{787B}\x{787C}\x{787D}' .
-'\x{787E}\x{787F}\x{7880}\x{7881}\x{7882}\x{7883}\x{7884}\x{7885}\x{7886}' .
-'\x{7887}\x{7889}\x{788A}\x{788B}\x{788C}\x{788D}\x{788E}\x{788F}\x{7890}' .
-'\x{7891}\x{7892}\x{7893}\x{7894}\x{7895}\x{7896}\x{7897}\x{7898}\x{7899}' .
-'\x{789A}\x{789B}\x{789C}\x{789D}\x{789E}\x{789F}\x{78A0}\x{78A1}\x{78A2}' .
-'\x{78A3}\x{78A4}\x{78A5}\x{78A6}\x{78A7}\x{78A8}\x{78A9}\x{78AA}\x{78AB}' .
-'\x{78AC}\x{78AD}\x{78AE}\x{78AF}\x{78B0}\x{78B1}\x{78B2}\x{78B3}\x{78B4}' .
-'\x{78B5}\x{78B6}\x{78B7}\x{78B8}\x{78B9}\x{78BA}\x{78BB}\x{78BC}\x{78BD}' .
-'\x{78BE}\x{78BF}\x{78C0}\x{78C1}\x{78C3}\x{78C4}\x{78C5}\x{78C6}\x{78C8}' .
-'\x{78C9}\x{78CA}\x{78CB}\x{78CC}\x{78CD}\x{78CE}\x{78CF}\x{78D0}\x{78D1}' .
-'\x{78D3}\x{78D4}\x{78D5}\x{78D6}\x{78D7}\x{78D8}\x{78D9}\x{78DA}\x{78DB}' .
-'\x{78DC}\x{78DD}\x{78DE}\x{78DF}\x{78E0}\x{78E1}\x{78E2}\x{78E3}\x{78E4}' .
-'\x{78E5}\x{78E6}\x{78E7}\x{78E8}\x{78E9}\x{78EA}\x{78EB}\x{78EC}\x{78ED}' .
-'\x{78EE}\x{78EF}\x{78F1}\x{78F2}\x{78F3}\x{78F4}\x{78F5}\x{78F6}\x{78F7}' .
-'\x{78F9}\x{78FA}\x{78FB}\x{78FC}\x{78FD}\x{78FE}\x{78FF}\x{7901}\x{7902}' .
-'\x{7903}\x{7904}\x{7905}\x{7906}\x{7907}\x{7909}\x{790A}\x{790B}\x{790C}' .
-'\x{790E}\x{790F}\x{7910}\x{7911}\x{7912}\x{7913}\x{7914}\x{7916}\x{7917}' .
-'\x{7918}\x{7919}\x{791A}\x{791B}\x{791C}\x{791D}\x{791E}\x{7921}\x{7922}' .
-'\x{7923}\x{7924}\x{7925}\x{7926}\x{7927}\x{7928}\x{7929}\x{792A}\x{792B}' .
-'\x{792C}\x{792D}\x{792E}\x{792F}\x{7930}\x{7931}\x{7933}\x{7934}\x{7935}' .
-'\x{7937}\x{7938}\x{7939}\x{793A}\x{793B}\x{793C}\x{793D}\x{793E}\x{793F}' .
-'\x{7940}\x{7941}\x{7942}\x{7943}\x{7944}\x{7945}\x{7946}\x{7947}\x{7948}' .
-'\x{7949}\x{794A}\x{794B}\x{794C}\x{794D}\x{794E}\x{794F}\x{7950}\x{7951}' .
-'\x{7952}\x{7953}\x{7954}\x{7955}\x{7956}\x{7957}\x{7958}\x{795A}\x{795B}' .
-'\x{795C}\x{795D}\x{795E}\x{795F}\x{7960}\x{7961}\x{7962}\x{7963}\x{7964}' .
-'\x{7965}\x{7966}\x{7967}\x{7968}\x{7969}\x{796A}\x{796B}\x{796D}\x{796F}' .
-'\x{7970}\x{7971}\x{7972}\x{7973}\x{7974}\x{7977}\x{7978}\x{7979}\x{797A}' .
-'\x{797B}\x{797C}\x{797D}\x{797E}\x{797F}\x{7980}\x{7981}\x{7982}\x{7983}' .
-'\x{7984}\x{7985}\x{7988}\x{7989}\x{798A}\x{798B}\x{798C}\x{798D}\x{798E}' .
-'\x{798F}\x{7990}\x{7991}\x{7992}\x{7993}\x{7994}\x{7995}\x{7996}\x{7997}' .
-'\x{7998}\x{7999}\x{799A}\x{799B}\x{799C}\x{799F}\x{79A0}\x{79A1}\x{79A2}' .
-'\x{79A3}\x{79A4}\x{79A5}\x{79A6}\x{79A7}\x{79A8}\x{79AA}\x{79AB}\x{79AC}' .
-'\x{79AD}\x{79AE}\x{79AF}\x{79B0}\x{79B1}\x{79B2}\x{79B3}\x{79B4}\x{79B5}' .
-'\x{79B6}\x{79B7}\x{79B8}\x{79B9}\x{79BA}\x{79BB}\x{79BD}\x{79BE}\x{79BF}' .
-'\x{79C0}\x{79C1}\x{79C2}\x{79C3}\x{79C5}\x{79C6}\x{79C8}\x{79C9}\x{79CA}' .
-'\x{79CB}\x{79CD}\x{79CE}\x{79CF}\x{79D0}\x{79D1}\x{79D2}\x{79D3}\x{79D5}' .
-'\x{79D6}\x{79D8}\x{79D9}\x{79DA}\x{79DB}\x{79DC}\x{79DD}\x{79DE}\x{79DF}' .
-'\x{79E0}\x{79E1}\x{79E2}\x{79E3}\x{79E4}\x{79E5}\x{79E6}\x{79E7}\x{79E8}' .
-'\x{79E9}\x{79EA}\x{79EB}\x{79EC}\x{79ED}\x{79EE}\x{79EF}\x{79F0}\x{79F1}' .
-'\x{79F2}\x{79F3}\x{79F4}\x{79F5}\x{79F6}\x{79F7}\x{79F8}\x{79F9}\x{79FA}' .
-'\x{79FB}\x{79FC}\x{79FD}\x{79FE}\x{79FF}\x{7A00}\x{7A02}\x{7A03}\x{7A04}' .
-'\x{7A05}\x{7A06}\x{7A08}\x{7A0A}\x{7A0B}\x{7A0C}\x{7A0D}\x{7A0E}\x{7A0F}' .
-'\x{7A10}\x{7A11}\x{7A12}\x{7A13}\x{7A14}\x{7A15}\x{7A16}\x{7A17}\x{7A18}' .
-'\x{7A19}\x{7A1A}\x{7A1B}\x{7A1C}\x{7A1D}\x{7A1E}\x{7A1F}\x{7A20}\x{7A21}' .
-'\x{7A22}\x{7A23}\x{7A24}\x{7A25}\x{7A26}\x{7A27}\x{7A28}\x{7A29}\x{7A2A}' .
-'\x{7A2B}\x{7A2D}\x{7A2E}\x{7A2F}\x{7A30}\x{7A31}\x{7A32}\x{7A33}\x{7A34}' .
-'\x{7A35}\x{7A37}\x{7A39}\x{7A3B}\x{7A3C}\x{7A3D}\x{7A3E}\x{7A3F}\x{7A40}' .
-'\x{7A41}\x{7A42}\x{7A43}\x{7A44}\x{7A45}\x{7A46}\x{7A47}\x{7A48}\x{7A49}' .
-'\x{7A4A}\x{7A4B}\x{7A4C}\x{7A4D}\x{7A4E}\x{7A50}\x{7A51}\x{7A52}\x{7A53}' .
-'\x{7A54}\x{7A55}\x{7A56}\x{7A57}\x{7A58}\x{7A59}\x{7A5A}\x{7A5B}\x{7A5C}' .
-'\x{7A5D}\x{7A5E}\x{7A5F}\x{7A60}\x{7A61}\x{7A62}\x{7A65}\x{7A66}\x{7A67}' .
-'\x{7A68}\x{7A69}\x{7A6B}\x{7A6C}\x{7A6D}\x{7A6E}\x{7A70}\x{7A71}\x{7A72}' .
-'\x{7A73}\x{7A74}\x{7A75}\x{7A76}\x{7A77}\x{7A78}\x{7A79}\x{7A7A}\x{7A7B}' .
-'\x{7A7C}\x{7A7D}\x{7A7E}\x{7A7F}\x{7A80}\x{7A81}\x{7A83}\x{7A84}\x{7A85}' .
-'\x{7A86}\x{7A87}\x{7A88}\x{7A89}\x{7A8A}\x{7A8B}\x{7A8C}\x{7A8D}\x{7A8E}' .
-'\x{7A8F}\x{7A90}\x{7A91}\x{7A92}\x{7A93}\x{7A94}\x{7A95}\x{7A96}\x{7A97}' .
-'\x{7A98}\x{7A99}\x{7A9C}\x{7A9D}\x{7A9E}\x{7A9F}\x{7AA0}\x{7AA1}\x{7AA2}' .
-'\x{7AA3}\x{7AA4}\x{7AA5}\x{7AA6}\x{7AA7}\x{7AA8}\x{7AA9}\x{7AAA}\x{7AAB}' .
-'\x{7AAC}\x{7AAD}\x{7AAE}\x{7AAF}\x{7AB0}\x{7AB1}\x{7AB2}\x{7AB3}\x{7AB4}' .
-'\x{7AB5}\x{7AB6}\x{7AB7}\x{7AB8}\x{7ABA}\x{7ABE}\x{7ABF}\x{7AC0}\x{7AC1}' .
-'\x{7AC4}\x{7AC5}\x{7AC7}\x{7AC8}\x{7AC9}\x{7ACA}\x{7ACB}\x{7ACC}\x{7ACD}' .
-'\x{7ACE}\x{7ACF}\x{7AD0}\x{7AD1}\x{7AD2}\x{7AD3}\x{7AD4}\x{7AD5}\x{7AD6}' .
-'\x{7AD8}\x{7AD9}\x{7ADB}\x{7ADC}\x{7ADD}\x{7ADE}\x{7ADF}\x{7AE0}\x{7AE1}' .
-'\x{7AE2}\x{7AE3}\x{7AE4}\x{7AE5}\x{7AE6}\x{7AE7}\x{7AE8}\x{7AEA}\x{7AEB}' .
-'\x{7AEC}\x{7AED}\x{7AEE}\x{7AEF}\x{7AF0}\x{7AF1}\x{7AF2}\x{7AF3}\x{7AF4}' .
-'\x{7AF6}\x{7AF7}\x{7AF8}\x{7AF9}\x{7AFA}\x{7AFB}\x{7AFD}\x{7AFE}\x{7AFF}' .
-'\x{7B00}\x{7B01}\x{7B02}\x{7B03}\x{7B04}\x{7B05}\x{7B06}\x{7B08}\x{7B09}' .
-'\x{7B0A}\x{7B0B}\x{7B0C}\x{7B0D}\x{7B0E}\x{7B0F}\x{7B10}\x{7B11}\x{7B12}' .
-'\x{7B13}\x{7B14}\x{7B15}\x{7B16}\x{7B17}\x{7B18}\x{7B19}\x{7B1A}\x{7B1B}' .
-'\x{7B1C}\x{7B1D}\x{7B1E}\x{7B20}\x{7B21}\x{7B22}\x{7B23}\x{7B24}\x{7B25}' .
-'\x{7B26}\x{7B28}\x{7B2A}\x{7B2B}\x{7B2C}\x{7B2D}\x{7B2E}\x{7B2F}\x{7B30}' .
-'\x{7B31}\x{7B32}\x{7B33}\x{7B34}\x{7B35}\x{7B36}\x{7B37}\x{7B38}\x{7B39}' .
-'\x{7B3A}\x{7B3B}\x{7B3C}\x{7B3D}\x{7B3E}\x{7B3F}\x{7B40}\x{7B41}\x{7B43}' .
-'\x{7B44}\x{7B45}\x{7B46}\x{7B47}\x{7B48}\x{7B49}\x{7B4A}\x{7B4B}\x{7B4C}' .
-'\x{7B4D}\x{7B4E}\x{7B4F}\x{7B50}\x{7B51}\x{7B52}\x{7B54}\x{7B55}\x{7B56}' .
-'\x{7B57}\x{7B58}\x{7B59}\x{7B5A}\x{7B5B}\x{7B5C}\x{7B5D}\x{7B5E}\x{7B5F}' .
-'\x{7B60}\x{7B61}\x{7B62}\x{7B63}\x{7B64}\x{7B65}\x{7B66}\x{7B67}\x{7B68}' .
-'\x{7B69}\x{7B6A}\x{7B6B}\x{7B6C}\x{7B6D}\x{7B6E}\x{7B70}\x{7B71}\x{7B72}' .
-'\x{7B73}\x{7B74}\x{7B75}\x{7B76}\x{7B77}\x{7B78}\x{7B79}\x{7B7B}\x{7B7C}' .
-'\x{7B7D}\x{7B7E}\x{7B7F}\x{7B80}\x{7B81}\x{7B82}\x{7B83}\x{7B84}\x{7B85}' .
-'\x{7B87}\x{7B88}\x{7B89}\x{7B8A}\x{7B8B}\x{7B8C}\x{7B8D}\x{7B8E}\x{7B8F}' .
-'\x{7B90}\x{7B91}\x{7B93}\x{7B94}\x{7B95}\x{7B96}\x{7B97}\x{7B98}\x{7B99}' .
-'\x{7B9A}\x{7B9B}\x{7B9C}\x{7B9D}\x{7B9E}\x{7B9F}\x{7BA0}\x{7BA1}\x{7BA2}' .
-'\x{7BA4}\x{7BA6}\x{7BA7}\x{7BA8}\x{7BA9}\x{7BAA}\x{7BAB}\x{7BAC}\x{7BAD}' .
-'\x{7BAE}\x{7BAF}\x{7BB1}\x{7BB3}\x{7BB4}\x{7BB5}\x{7BB6}\x{7BB7}\x{7BB8}' .
-'\x{7BB9}\x{7BBA}\x{7BBB}\x{7BBC}\x{7BBD}\x{7BBE}\x{7BBF}\x{7BC0}\x{7BC1}' .
-'\x{7BC2}\x{7BC3}\x{7BC4}\x{7BC5}\x{7BC6}\x{7BC7}\x{7BC8}\x{7BC9}\x{7BCA}' .
-'\x{7BCB}\x{7BCC}\x{7BCD}\x{7BCE}\x{7BD0}\x{7BD1}\x{7BD2}\x{7BD3}\x{7BD4}' .
-'\x{7BD5}\x{7BD6}\x{7BD7}\x{7BD8}\x{7BD9}\x{7BDA}\x{7BDB}\x{7BDC}\x{7BDD}' .
-'\x{7BDE}\x{7BDF}\x{7BE0}\x{7BE1}\x{7BE2}\x{7BE3}\x{7BE4}\x{7BE5}\x{7BE6}' .
-'\x{7BE7}\x{7BE8}\x{7BE9}\x{7BEA}\x{7BEB}\x{7BEC}\x{7BED}\x{7BEE}\x{7BEF}' .
-'\x{7BF0}\x{7BF1}\x{7BF2}\x{7BF3}\x{7BF4}\x{7BF5}\x{7BF6}\x{7BF7}\x{7BF8}' .
-'\x{7BF9}\x{7BFB}\x{7BFC}\x{7BFD}\x{7BFE}\x{7BFF}\x{7C00}\x{7C01}\x{7C02}' .
-'\x{7C03}\x{7C04}\x{7C05}\x{7C06}\x{7C07}\x{7C08}\x{7C09}\x{7C0A}\x{7C0B}' .
-'\x{7C0C}\x{7C0D}\x{7C0E}\x{7C0F}\x{7C10}\x{7C11}\x{7C12}\x{7C13}\x{7C15}' .
-'\x{7C16}\x{7C17}\x{7C18}\x{7C19}\x{7C1A}\x{7C1C}\x{7C1D}\x{7C1E}\x{7C1F}' .
-'\x{7C20}\x{7C21}\x{7C22}\x{7C23}\x{7C24}\x{7C25}\x{7C26}\x{7C27}\x{7C28}' .
-'\x{7C29}\x{7C2A}\x{7C2B}\x{7C2C}\x{7C2D}\x{7C30}\x{7C31}\x{7C32}\x{7C33}' .
-'\x{7C34}\x{7C35}\x{7C36}\x{7C37}\x{7C38}\x{7C39}\x{7C3A}\x{7C3B}\x{7C3C}' .
-'\x{7C3D}\x{7C3E}\x{7C3F}\x{7C40}\x{7C41}\x{7C42}\x{7C43}\x{7C44}\x{7C45}' .
-'\x{7C46}\x{7C47}\x{7C48}\x{7C49}\x{7C4A}\x{7C4B}\x{7C4C}\x{7C4D}\x{7C4E}' .
-'\x{7C50}\x{7C51}\x{7C53}\x{7C54}\x{7C56}\x{7C57}\x{7C58}\x{7C59}\x{7C5A}' .
-'\x{7C5B}\x{7C5C}\x{7C5E}\x{7C5F}\x{7C60}\x{7C61}\x{7C62}\x{7C63}\x{7C64}' .
-'\x{7C65}\x{7C66}\x{7C67}\x{7C68}\x{7C69}\x{7C6A}\x{7C6B}\x{7C6C}\x{7C6D}' .
-'\x{7C6E}\x{7C6F}\x{7C70}\x{7C71}\x{7C72}\x{7C73}\x{7C74}\x{7C75}\x{7C77}' .
-'\x{7C78}\x{7C79}\x{7C7A}\x{7C7B}\x{7C7C}\x{7C7D}\x{7C7E}\x{7C7F}\x{7C80}' .
-'\x{7C81}\x{7C82}\x{7C84}\x{7C85}\x{7C86}\x{7C88}\x{7C89}\x{7C8A}\x{7C8B}' .
-'\x{7C8C}\x{7C8D}\x{7C8E}\x{7C8F}\x{7C90}\x{7C91}\x{7C92}\x{7C94}\x{7C95}' .
-'\x{7C96}\x{7C97}\x{7C98}\x{7C99}\x{7C9B}\x{7C9C}\x{7C9D}\x{7C9E}\x{7C9F}' .
-'\x{7CA0}\x{7CA1}\x{7CA2}\x{7CA3}\x{7CA4}\x{7CA5}\x{7CA6}\x{7CA7}\x{7CA8}' .
-'\x{7CA9}\x{7CAA}\x{7CAD}\x{7CAE}\x{7CAF}\x{7CB0}\x{7CB1}\x{7CB2}\x{7CB3}' .
-'\x{7CB4}\x{7CB5}\x{7CB6}\x{7CB7}\x{7CB8}\x{7CB9}\x{7CBA}\x{7CBB}\x{7CBC}' .
-'\x{7CBD}\x{7CBE}\x{7CBF}\x{7CC0}\x{7CC1}\x{7CC2}\x{7CC3}\x{7CC4}\x{7CC5}' .
-'\x{7CC6}\x{7CC7}\x{7CC8}\x{7CC9}\x{7CCA}\x{7CCB}\x{7CCC}\x{7CCD}\x{7CCE}' .
-'\x{7CCF}\x{7CD0}\x{7CD1}\x{7CD2}\x{7CD4}\x{7CD5}\x{7CD6}\x{7CD7}\x{7CD8}' .
-'\x{7CD9}\x{7CDC}\x{7CDD}\x{7CDE}\x{7CDF}\x{7CE0}\x{7CE2}\x{7CE4}\x{7CE7}' .
-'\x{7CE8}\x{7CE9}\x{7CEA}\x{7CEB}\x{7CEC}\x{7CED}\x{7CEE}\x{7CEF}\x{7CF0}' .
-'\x{7CF1}\x{7CF2}\x{7CF3}\x{7CF4}\x{7CF5}\x{7CF6}\x{7CF7}\x{7CF8}\x{7CF9}' .
-'\x{7CFA}\x{7CFB}\x{7CFD}\x{7CFE}\x{7D00}\x{7D01}\x{7D02}\x{7D03}\x{7D04}' .
-'\x{7D05}\x{7D06}\x{7D07}\x{7D08}\x{7D09}\x{7D0A}\x{7D0B}\x{7D0C}\x{7D0D}' .
-'\x{7D0E}\x{7D0F}\x{7D10}\x{7D11}\x{7D12}\x{7D13}\x{7D14}\x{7D15}\x{7D16}' .
-'\x{7D17}\x{7D18}\x{7D19}\x{7D1A}\x{7D1B}\x{7D1C}\x{7D1D}\x{7D1E}\x{7D1F}' .
-'\x{7D20}\x{7D21}\x{7D22}\x{7D24}\x{7D25}\x{7D26}\x{7D27}\x{7D28}\x{7D29}' .
-'\x{7D2B}\x{7D2C}\x{7D2E}\x{7D2F}\x{7D30}\x{7D31}\x{7D32}\x{7D33}\x{7D34}' .
-'\x{7D35}\x{7D36}\x{7D37}\x{7D38}\x{7D39}\x{7D3A}\x{7D3B}\x{7D3C}\x{7D3D}' .
-'\x{7D3E}\x{7D3F}\x{7D40}\x{7D41}\x{7D42}\x{7D43}\x{7D44}\x{7D45}\x{7D46}' .
-'\x{7D47}\x{7D49}\x{7D4A}\x{7D4B}\x{7D4C}\x{7D4E}\x{7D4F}\x{7D50}\x{7D51}' .
-'\x{7D52}\x{7D53}\x{7D54}\x{7D55}\x{7D56}\x{7D57}\x{7D58}\x{7D59}\x{7D5B}' .
-'\x{7D5C}\x{7D5D}\x{7D5E}\x{7D5F}\x{7D60}\x{7D61}\x{7D62}\x{7D63}\x{7D65}' .
-'\x{7D66}\x{7D67}\x{7D68}\x{7D69}\x{7D6A}\x{7D6B}\x{7D6C}\x{7D6D}\x{7D6E}' .
-'\x{7D6F}\x{7D70}\x{7D71}\x{7D72}\x{7D73}\x{7D74}\x{7D75}\x{7D76}\x{7D77}' .
-'\x{7D79}\x{7D7A}\x{7D7B}\x{7D7C}\x{7D7D}\x{7D7E}\x{7D7F}\x{7D80}\x{7D81}' .
-'\x{7D83}\x{7D84}\x{7D85}\x{7D86}\x{7D87}\x{7D88}\x{7D89}\x{7D8A}\x{7D8B}' .
-'\x{7D8C}\x{7D8D}\x{7D8E}\x{7D8F}\x{7D90}\x{7D91}\x{7D92}\x{7D93}\x{7D94}' .
-'\x{7D96}\x{7D97}\x{7D99}\x{7D9B}\x{7D9C}\x{7D9D}\x{7D9E}\x{7D9F}\x{7DA0}' .
-'\x{7DA1}\x{7DA2}\x{7DA3}\x{7DA5}\x{7DA6}\x{7DA7}\x{7DA9}\x{7DAA}\x{7DAB}' .
-'\x{7DAC}\x{7DAD}\x{7DAE}\x{7DAF}\x{7DB0}\x{7DB1}\x{7DB2}\x{7DB3}\x{7DB4}' .
-'\x{7DB5}\x{7DB6}\x{7DB7}\x{7DB8}\x{7DB9}\x{7DBA}\x{7DBB}\x{7DBC}\x{7DBD}' .
-'\x{7DBE}\x{7DBF}\x{7DC0}\x{7DC1}\x{7DC2}\x{7DC3}\x{7DC4}\x{7DC5}\x{7DC6}' .
-'\x{7DC7}\x{7DC8}\x{7DC9}\x{7DCA}\x{7DCB}\x{7DCC}\x{7DCE}\x{7DCF}\x{7DD0}' .
-'\x{7DD1}\x{7DD2}\x{7DD4}\x{7DD5}\x{7DD6}\x{7DD7}\x{7DD8}\x{7DD9}\x{7DDA}' .
-'\x{7DDB}\x{7DDD}\x{7DDE}\x{7DDF}\x{7DE0}\x{7DE1}\x{7DE2}\x{7DE3}\x{7DE6}' .
-'\x{7DE7}\x{7DE8}\x{7DE9}\x{7DEA}\x{7DEC}\x{7DED}\x{7DEE}\x{7DEF}\x{7DF0}' .
-'\x{7DF1}\x{7DF2}\x{7DF3}\x{7DF4}\x{7DF5}\x{7DF6}\x{7DF7}\x{7DF8}\x{7DF9}' .
-'\x{7DFA}\x{7DFB}\x{7DFC}\x{7E00}\x{7E01}\x{7E02}\x{7E03}\x{7E04}\x{7E05}' .
-'\x{7E06}\x{7E07}\x{7E08}\x{7E09}\x{7E0A}\x{7E0B}\x{7E0C}\x{7E0D}\x{7E0E}' .
-'\x{7E0F}\x{7E10}\x{7E11}\x{7E12}\x{7E13}\x{7E14}\x{7E15}\x{7E16}\x{7E17}' .
-'\x{7E19}\x{7E1A}\x{7E1B}\x{7E1C}\x{7E1D}\x{7E1E}\x{7E1F}\x{7E20}\x{7E21}' .
-'\x{7E22}\x{7E23}\x{7E24}\x{7E25}\x{7E26}\x{7E27}\x{7E28}\x{7E29}\x{7E2A}' .
-'\x{7E2B}\x{7E2C}\x{7E2D}\x{7E2E}\x{7E2F}\x{7E30}\x{7E31}\x{7E32}\x{7E33}' .
-'\x{7E34}\x{7E35}\x{7E36}\x{7E37}\x{7E38}\x{7E39}\x{7E3A}\x{7E3B}\x{7E3C}' .
-'\x{7E3D}\x{7E3E}\x{7E3F}\x{7E40}\x{7E41}\x{7E42}\x{7E43}\x{7E44}\x{7E45}' .
-'\x{7E46}\x{7E47}\x{7E48}\x{7E49}\x{7E4C}\x{7E4D}\x{7E4E}\x{7E4F}\x{7E50}' .
-'\x{7E51}\x{7E52}\x{7E53}\x{7E54}\x{7E55}\x{7E56}\x{7E57}\x{7E58}\x{7E59}' .
-'\x{7E5A}\x{7E5C}\x{7E5D}\x{7E5E}\x{7E5F}\x{7E60}\x{7E61}\x{7E62}\x{7E63}' .
-'\x{7E65}\x{7E66}\x{7E67}\x{7E68}\x{7E69}\x{7E6A}\x{7E6B}\x{7E6C}\x{7E6D}' .
-'\x{7E6E}\x{7E6F}\x{7E70}\x{7E71}\x{7E72}\x{7E73}\x{7E74}\x{7E75}\x{7E76}' .
-'\x{7E77}\x{7E78}\x{7E79}\x{7E7A}\x{7E7B}\x{7E7C}\x{7E7D}\x{7E7E}\x{7E7F}' .
-'\x{7E80}\x{7E81}\x{7E82}\x{7E83}\x{7E84}\x{7E85}\x{7E86}\x{7E87}\x{7E88}' .
-'\x{7E89}\x{7E8A}\x{7E8B}\x{7E8C}\x{7E8D}\x{7E8E}\x{7E8F}\x{7E90}\x{7E91}' .
-'\x{7E92}\x{7E93}\x{7E94}\x{7E95}\x{7E96}\x{7E97}\x{7E98}\x{7E99}\x{7E9A}' .
-'\x{7E9B}\x{7E9C}\x{7E9E}\x{7E9F}\x{7EA0}\x{7EA1}\x{7EA2}\x{7EA3}\x{7EA4}' .
-'\x{7EA5}\x{7EA6}\x{7EA7}\x{7EA8}\x{7EA9}\x{7EAA}\x{7EAB}\x{7EAC}\x{7EAD}' .
-'\x{7EAE}\x{7EAF}\x{7EB0}\x{7EB1}\x{7EB2}\x{7EB3}\x{7EB4}\x{7EB5}\x{7EB6}' .
-'\x{7EB7}\x{7EB8}\x{7EB9}\x{7EBA}\x{7EBB}\x{7EBC}\x{7EBD}\x{7EBE}\x{7EBF}' .
-'\x{7EC0}\x{7EC1}\x{7EC2}\x{7EC3}\x{7EC4}\x{7EC5}\x{7EC6}\x{7EC7}\x{7EC8}' .
-'\x{7EC9}\x{7ECA}\x{7ECB}\x{7ECC}\x{7ECD}\x{7ECE}\x{7ECF}\x{7ED0}\x{7ED1}' .
-'\x{7ED2}\x{7ED3}\x{7ED4}\x{7ED5}\x{7ED6}\x{7ED7}\x{7ED8}\x{7ED9}\x{7EDA}' .
-'\x{7EDB}\x{7EDC}\x{7EDD}\x{7EDE}\x{7EDF}\x{7EE0}\x{7EE1}\x{7EE2}\x{7EE3}' .
-'\x{7EE4}\x{7EE5}\x{7EE6}\x{7EE7}\x{7EE8}\x{7EE9}\x{7EEA}\x{7EEB}\x{7EEC}' .
-'\x{7EED}\x{7EEE}\x{7EEF}\x{7EF0}\x{7EF1}\x{7EF2}\x{7EF3}\x{7EF4}\x{7EF5}' .
-'\x{7EF6}\x{7EF7}\x{7EF8}\x{7EF9}\x{7EFA}\x{7EFB}\x{7EFC}\x{7EFD}\x{7EFE}' .
-'\x{7EFF}\x{7F00}\x{7F01}\x{7F02}\x{7F03}\x{7F04}\x{7F05}\x{7F06}\x{7F07}' .
-'\x{7F08}\x{7F09}\x{7F0A}\x{7F0B}\x{7F0C}\x{7F0D}\x{7F0E}\x{7F0F}\x{7F10}' .
-'\x{7F11}\x{7F12}\x{7F13}\x{7F14}\x{7F15}\x{7F16}\x{7F17}\x{7F18}\x{7F19}' .
-'\x{7F1A}\x{7F1B}\x{7F1C}\x{7F1D}\x{7F1E}\x{7F1F}\x{7F20}\x{7F21}\x{7F22}' .
-'\x{7F23}\x{7F24}\x{7F25}\x{7F26}\x{7F27}\x{7F28}\x{7F29}\x{7F2A}\x{7F2B}' .
-'\x{7F2C}\x{7F2D}\x{7F2E}\x{7F2F}\x{7F30}\x{7F31}\x{7F32}\x{7F33}\x{7F34}' .
-'\x{7F35}\x{7F36}\x{7F37}\x{7F38}\x{7F39}\x{7F3A}\x{7F3D}\x{7F3E}\x{7F3F}' .
-'\x{7F40}\x{7F42}\x{7F43}\x{7F44}\x{7F45}\x{7F47}\x{7F48}\x{7F49}\x{7F4A}' .
-'\x{7F4B}\x{7F4C}\x{7F4D}\x{7F4E}\x{7F4F}\x{7F50}\x{7F51}\x{7F52}\x{7F53}' .
-'\x{7F54}\x{7F55}\x{7F56}\x{7F57}\x{7F58}\x{7F5A}\x{7F5B}\x{7F5C}\x{7F5D}' .
-'\x{7F5E}\x{7F5F}\x{7F60}\x{7F61}\x{7F62}\x{7F63}\x{7F64}\x{7F65}\x{7F66}' .
-'\x{7F67}\x{7F68}\x{7F69}\x{7F6A}\x{7F6B}\x{7F6C}\x{7F6D}\x{7F6E}\x{7F6F}' .
-'\x{7F70}\x{7F71}\x{7F72}\x{7F73}\x{7F74}\x{7F75}\x{7F76}\x{7F77}\x{7F78}' .
-'\x{7F79}\x{7F7A}\x{7F7B}\x{7F7C}\x{7F7D}\x{7F7E}\x{7F7F}\x{7F80}\x{7F81}' .
-'\x{7F82}\x{7F83}\x{7F85}\x{7F86}\x{7F87}\x{7F88}\x{7F89}\x{7F8A}\x{7F8B}' .
-'\x{7F8C}\x{7F8D}\x{7F8E}\x{7F8F}\x{7F91}\x{7F92}\x{7F93}\x{7F94}\x{7F95}' .
-'\x{7F96}\x{7F98}\x{7F9A}\x{7F9B}\x{7F9C}\x{7F9D}\x{7F9E}\x{7F9F}\x{7FA0}' .
-'\x{7FA1}\x{7FA2}\x{7FA3}\x{7FA4}\x{7FA5}\x{7FA6}\x{7FA7}\x{7FA8}\x{7FA9}' .
-'\x{7FAA}\x{7FAB}\x{7FAC}\x{7FAD}\x{7FAE}\x{7FAF}\x{7FB0}\x{7FB1}\x{7FB2}' .
-'\x{7FB3}\x{7FB5}\x{7FB6}\x{7FB7}\x{7FB8}\x{7FB9}\x{7FBA}\x{7FBB}\x{7FBC}' .
-'\x{7FBD}\x{7FBE}\x{7FBF}\x{7FC0}\x{7FC1}\x{7FC2}\x{7FC3}\x{7FC4}\x{7FC5}' .
-'\x{7FC6}\x{7FC7}\x{7FC8}\x{7FC9}\x{7FCA}\x{7FCB}\x{7FCC}\x{7FCD}\x{7FCE}' .
-'\x{7FCF}\x{7FD0}\x{7FD1}\x{7FD2}\x{7FD3}\x{7FD4}\x{7FD5}\x{7FD7}\x{7FD8}' .
-'\x{7FD9}\x{7FDA}\x{7FDB}\x{7FDC}\x{7FDE}\x{7FDF}\x{7FE0}\x{7FE1}\x{7FE2}' .
-'\x{7FE3}\x{7FE5}\x{7FE6}\x{7FE7}\x{7FE8}\x{7FE9}\x{7FEA}\x{7FEB}\x{7FEC}' .
-'\x{7FED}\x{7FEE}\x{7FEF}\x{7FF0}\x{7FF1}\x{7FF2}\x{7FF3}\x{7FF4}\x{7FF5}' .
-'\x{7FF6}\x{7FF7}\x{7FF8}\x{7FF9}\x{7FFA}\x{7FFB}\x{7FFC}\x{7FFD}\x{7FFE}' .
-'\x{7FFF}\x{8000}\x{8001}\x{8002}\x{8003}\x{8004}\x{8005}\x{8006}\x{8007}' .
-'\x{8008}\x{8009}\x{800B}\x{800C}\x{800D}\x{800E}\x{800F}\x{8010}\x{8011}' .
-'\x{8012}\x{8013}\x{8014}\x{8015}\x{8016}\x{8017}\x{8018}\x{8019}\x{801A}' .
-'\x{801B}\x{801C}\x{801D}\x{801E}\x{801F}\x{8020}\x{8021}\x{8022}\x{8023}' .
-'\x{8024}\x{8025}\x{8026}\x{8027}\x{8028}\x{8029}\x{802A}\x{802B}\x{802C}' .
-'\x{802D}\x{802E}\x{8030}\x{8031}\x{8032}\x{8033}\x{8034}\x{8035}\x{8036}' .
-'\x{8037}\x{8038}\x{8039}\x{803A}\x{803B}\x{803D}\x{803E}\x{803F}\x{8041}' .
-'\x{8042}\x{8043}\x{8044}\x{8045}\x{8046}\x{8047}\x{8048}\x{8049}\x{804A}' .
-'\x{804B}\x{804C}\x{804D}\x{804E}\x{804F}\x{8050}\x{8051}\x{8052}\x{8053}' .
-'\x{8054}\x{8055}\x{8056}\x{8057}\x{8058}\x{8059}\x{805A}\x{805B}\x{805C}' .
-'\x{805D}\x{805E}\x{805F}\x{8060}\x{8061}\x{8062}\x{8063}\x{8064}\x{8065}' .
-'\x{8067}\x{8068}\x{8069}\x{806A}\x{806B}\x{806C}\x{806D}\x{806E}\x{806F}' .
-'\x{8070}\x{8071}\x{8072}\x{8073}\x{8074}\x{8075}\x{8076}\x{8077}\x{8078}' .
-'\x{8079}\x{807A}\x{807B}\x{807C}\x{807D}\x{807E}\x{807F}\x{8080}\x{8081}' .
-'\x{8082}\x{8083}\x{8084}\x{8085}\x{8086}\x{8087}\x{8089}\x{808A}\x{808B}' .
-'\x{808C}\x{808D}\x{808F}\x{8090}\x{8091}\x{8092}\x{8093}\x{8095}\x{8096}' .
-'\x{8097}\x{8098}\x{8099}\x{809A}\x{809B}\x{809C}\x{809D}\x{809E}\x{809F}' .
-'\x{80A0}\x{80A1}\x{80A2}\x{80A3}\x{80A4}\x{80A5}\x{80A9}\x{80AA}\x{80AB}' .
-'\x{80AD}\x{80AE}\x{80AF}\x{80B0}\x{80B1}\x{80B2}\x{80B4}\x{80B5}\x{80B6}' .
-'\x{80B7}\x{80B8}\x{80BA}\x{80BB}\x{80BC}\x{80BD}\x{80BE}\x{80BF}\x{80C0}' .
-'\x{80C1}\x{80C2}\x{80C3}\x{80C4}\x{80C5}\x{80C6}\x{80C7}\x{80C8}\x{80C9}' .
-'\x{80CA}\x{80CB}\x{80CC}\x{80CD}\x{80CE}\x{80CF}\x{80D0}\x{80D1}\x{80D2}' .
-'\x{80D3}\x{80D4}\x{80D5}\x{80D6}\x{80D7}\x{80D8}\x{80D9}\x{80DA}\x{80DB}' .
-'\x{80DC}\x{80DD}\x{80DE}\x{80E0}\x{80E1}\x{80E2}\x{80E3}\x{80E4}\x{80E5}' .
-'\x{80E6}\x{80E7}\x{80E8}\x{80E9}\x{80EA}\x{80EB}\x{80EC}\x{80ED}\x{80EE}' .
-'\x{80EF}\x{80F0}\x{80F1}\x{80F2}\x{80F3}\x{80F4}\x{80F5}\x{80F6}\x{80F7}' .
-'\x{80F8}\x{80F9}\x{80FA}\x{80FB}\x{80FC}\x{80FD}\x{80FE}\x{80FF}\x{8100}' .
-'\x{8101}\x{8102}\x{8105}\x{8106}\x{8107}\x{8108}\x{8109}\x{810A}\x{810B}' .
-'\x{810C}\x{810D}\x{810E}\x{810F}\x{8110}\x{8111}\x{8112}\x{8113}\x{8114}' .
-'\x{8115}\x{8116}\x{8118}\x{8119}\x{811A}\x{811B}\x{811C}\x{811D}\x{811E}' .
-'\x{811F}\x{8120}\x{8121}\x{8122}\x{8123}\x{8124}\x{8125}\x{8126}\x{8127}' .
-'\x{8128}\x{8129}\x{812A}\x{812B}\x{812C}\x{812D}\x{812E}\x{812F}\x{8130}' .
-'\x{8131}\x{8132}\x{8136}\x{8137}\x{8138}\x{8139}\x{813A}\x{813B}\x{813C}' .
-'\x{813D}\x{813E}\x{813F}\x{8140}\x{8141}\x{8142}\x{8143}\x{8144}\x{8145}' .
-'\x{8146}\x{8147}\x{8148}\x{8149}\x{814A}\x{814B}\x{814C}\x{814D}\x{814E}' .
-'\x{814F}\x{8150}\x{8151}\x{8152}\x{8153}\x{8154}\x{8155}\x{8156}\x{8157}' .
-'\x{8158}\x{8159}\x{815A}\x{815B}\x{815C}\x{815D}\x{815E}\x{8160}\x{8161}' .
-'\x{8162}\x{8163}\x{8164}\x{8165}\x{8166}\x{8167}\x{8168}\x{8169}\x{816A}' .
-'\x{816B}\x{816C}\x{816D}\x{816E}\x{816F}\x{8170}\x{8171}\x{8172}\x{8173}' .
-'\x{8174}\x{8175}\x{8176}\x{8177}\x{8178}\x{8179}\x{817A}\x{817B}\x{817C}' .
-'\x{817D}\x{817E}\x{817F}\x{8180}\x{8181}\x{8182}\x{8183}\x{8185}\x{8186}' .
-'\x{8187}\x{8188}\x{8189}\x{818A}\x{818B}\x{818C}\x{818D}\x{818E}\x{818F}' .
-'\x{8191}\x{8192}\x{8193}\x{8194}\x{8195}\x{8197}\x{8198}\x{8199}\x{819A}' .
-'\x{819B}\x{819C}\x{819D}\x{819E}\x{819F}\x{81A0}\x{81A1}\x{81A2}\x{81A3}' .
-'\x{81A4}\x{81A5}\x{81A6}\x{81A7}\x{81A8}\x{81A9}\x{81AA}\x{81AB}\x{81AC}' .
-'\x{81AD}\x{81AE}\x{81AF}\x{81B0}\x{81B1}\x{81B2}\x{81B3}\x{81B4}\x{81B5}' .
-'\x{81B6}\x{81B7}\x{81B8}\x{81B9}\x{81BA}\x{81BB}\x{81BC}\x{81BD}\x{81BE}' .
-'\x{81BF}\x{81C0}\x{81C1}\x{81C2}\x{81C3}\x{81C4}\x{81C5}\x{81C6}\x{81C7}' .
-'\x{81C8}\x{81C9}\x{81CA}\x{81CC}\x{81CD}\x{81CE}\x{81CF}\x{81D0}\x{81D1}' .
-'\x{81D2}\x{81D4}\x{81D5}\x{81D6}\x{81D7}\x{81D8}\x{81D9}\x{81DA}\x{81DB}' .
-'\x{81DC}\x{81DD}\x{81DE}\x{81DF}\x{81E0}\x{81E1}\x{81E2}\x{81E3}\x{81E5}' .
-'\x{81E6}\x{81E7}\x{81E8}\x{81E9}\x{81EA}\x{81EB}\x{81EC}\x{81ED}\x{81EE}' .
-'\x{81F1}\x{81F2}\x{81F3}\x{81F4}\x{81F5}\x{81F6}\x{81F7}\x{81F8}\x{81F9}' .
-'\x{81FA}\x{81FB}\x{81FC}\x{81FD}\x{81FE}\x{81FF}\x{8200}\x{8201}\x{8202}' .
-'\x{8203}\x{8204}\x{8205}\x{8206}\x{8207}\x{8208}\x{8209}\x{820A}\x{820B}' .
-'\x{820C}\x{820D}\x{820E}\x{820F}\x{8210}\x{8211}\x{8212}\x{8214}\x{8215}' .
-'\x{8216}\x{8218}\x{8219}\x{821A}\x{821B}\x{821C}\x{821D}\x{821E}\x{821F}' .
-'\x{8220}\x{8221}\x{8222}\x{8223}\x{8225}\x{8226}\x{8227}\x{8228}\x{8229}' .
-'\x{822A}\x{822B}\x{822C}\x{822D}\x{822F}\x{8230}\x{8231}\x{8232}\x{8233}' .
-'\x{8234}\x{8235}\x{8236}\x{8237}\x{8238}\x{8239}\x{823A}\x{823B}\x{823C}' .
-'\x{823D}\x{823E}\x{823F}\x{8240}\x{8242}\x{8243}\x{8244}\x{8245}\x{8246}' .
-'\x{8247}\x{8248}\x{8249}\x{824A}\x{824B}\x{824C}\x{824D}\x{824E}\x{824F}' .
-'\x{8250}\x{8251}\x{8252}\x{8253}\x{8254}\x{8255}\x{8256}\x{8257}\x{8258}' .
-'\x{8259}\x{825A}\x{825B}\x{825C}\x{825D}\x{825E}\x{825F}\x{8260}\x{8261}' .
-'\x{8263}\x{8264}\x{8266}\x{8267}\x{8268}\x{8269}\x{826A}\x{826B}\x{826C}' .
-'\x{826D}\x{826E}\x{826F}\x{8270}\x{8271}\x{8272}\x{8273}\x{8274}\x{8275}' .
-'\x{8276}\x{8277}\x{8278}\x{8279}\x{827A}\x{827B}\x{827C}\x{827D}\x{827E}' .
-'\x{827F}\x{8280}\x{8281}\x{8282}\x{8283}\x{8284}\x{8285}\x{8286}\x{8287}' .
-'\x{8288}\x{8289}\x{828A}\x{828B}\x{828D}\x{828E}\x{828F}\x{8290}\x{8291}' .
-'\x{8292}\x{8293}\x{8294}\x{8295}\x{8296}\x{8297}\x{8298}\x{8299}\x{829A}' .
-'\x{829B}\x{829C}\x{829D}\x{829E}\x{829F}\x{82A0}\x{82A1}\x{82A2}\x{82A3}' .
-'\x{82A4}\x{82A5}\x{82A6}\x{82A7}\x{82A8}\x{82A9}\x{82AA}\x{82AB}\x{82AC}' .
-'\x{82AD}\x{82AE}\x{82AF}\x{82B0}\x{82B1}\x{82B3}\x{82B4}\x{82B5}\x{82B6}' .
-'\x{82B7}\x{82B8}\x{82B9}\x{82BA}\x{82BB}\x{82BC}\x{82BD}\x{82BE}\x{82BF}' .
-'\x{82C0}\x{82C1}\x{82C2}\x{82C3}\x{82C4}\x{82C5}\x{82C6}\x{82C7}\x{82C8}' .
-'\x{82C9}\x{82CA}\x{82CB}\x{82CC}\x{82CD}\x{82CE}\x{82CF}\x{82D0}\x{82D1}' .
-'\x{82D2}\x{82D3}\x{82D4}\x{82D5}\x{82D6}\x{82D7}\x{82D8}\x{82D9}\x{82DA}' .
-'\x{82DB}\x{82DC}\x{82DD}\x{82DE}\x{82DF}\x{82E0}\x{82E1}\x{82E3}\x{82E4}' .
-'\x{82E5}\x{82E6}\x{82E7}\x{82E8}\x{82E9}\x{82EA}\x{82EB}\x{82EC}\x{82ED}' .
-'\x{82EE}\x{82EF}\x{82F0}\x{82F1}\x{82F2}\x{82F3}\x{82F4}\x{82F5}\x{82F6}' .
-'\x{82F7}\x{82F8}\x{82F9}\x{82FA}\x{82FB}\x{82FD}\x{82FE}\x{82FF}\x{8300}' .
-'\x{8301}\x{8302}\x{8303}\x{8304}\x{8305}\x{8306}\x{8307}\x{8308}\x{8309}' .
-'\x{830B}\x{830C}\x{830D}\x{830E}\x{830F}\x{8311}\x{8312}\x{8313}\x{8314}' .
-'\x{8315}\x{8316}\x{8317}\x{8318}\x{8319}\x{831A}\x{831B}\x{831C}\x{831D}' .
-'\x{831E}\x{831F}\x{8320}\x{8321}\x{8322}\x{8323}\x{8324}\x{8325}\x{8326}' .
-'\x{8327}\x{8328}\x{8329}\x{832A}\x{832B}\x{832C}\x{832D}\x{832E}\x{832F}' .
-'\x{8331}\x{8332}\x{8333}\x{8334}\x{8335}\x{8336}\x{8337}\x{8338}\x{8339}' .
-'\x{833A}\x{833B}\x{833C}\x{833D}\x{833E}\x{833F}\x{8340}\x{8341}\x{8342}' .
-'\x{8343}\x{8344}\x{8345}\x{8346}\x{8347}\x{8348}\x{8349}\x{834A}\x{834B}' .
-'\x{834C}\x{834D}\x{834E}\x{834F}\x{8350}\x{8351}\x{8352}\x{8353}\x{8354}' .
-'\x{8356}\x{8357}\x{8358}\x{8359}\x{835A}\x{835B}\x{835C}\x{835D}\x{835E}' .
-'\x{835F}\x{8360}\x{8361}\x{8362}\x{8363}\x{8364}\x{8365}\x{8366}\x{8367}' .
-'\x{8368}\x{8369}\x{836A}\x{836B}\x{836C}\x{836D}\x{836E}\x{836F}\x{8370}' .
-'\x{8371}\x{8372}\x{8373}\x{8374}\x{8375}\x{8376}\x{8377}\x{8378}\x{8379}' .
-'\x{837A}\x{837B}\x{837C}\x{837D}\x{837E}\x{837F}\x{8380}\x{8381}\x{8382}' .
-'\x{8383}\x{8384}\x{8385}\x{8386}\x{8387}\x{8388}\x{8389}\x{838A}\x{838B}' .
-'\x{838C}\x{838D}\x{838E}\x{838F}\x{8390}\x{8391}\x{8392}\x{8393}\x{8394}' .
-'\x{8395}\x{8396}\x{8397}\x{8398}\x{8399}\x{839A}\x{839B}\x{839C}\x{839D}' .
-'\x{839E}\x{83A0}\x{83A1}\x{83A2}\x{83A3}\x{83A4}\x{83A5}\x{83A6}\x{83A7}' .
-'\x{83A8}\x{83A9}\x{83AA}\x{83AB}\x{83AC}\x{83AD}\x{83AE}\x{83AF}\x{83B0}' .
-'\x{83B1}\x{83B2}\x{83B3}\x{83B4}\x{83B6}\x{83B7}\x{83B8}\x{83B9}\x{83BA}' .
-'\x{83BB}\x{83BC}\x{83BD}\x{83BF}\x{83C0}\x{83C1}\x{83C2}\x{83C3}\x{83C4}' .
-'\x{83C5}\x{83C6}\x{83C7}\x{83C8}\x{83C9}\x{83CA}\x{83CB}\x{83CC}\x{83CD}' .
-'\x{83CE}\x{83CF}\x{83D0}\x{83D1}\x{83D2}\x{83D3}\x{83D4}\x{83D5}\x{83D6}' .
-'\x{83D7}\x{83D8}\x{83D9}\x{83DA}\x{83DB}\x{83DC}\x{83DD}\x{83DE}\x{83DF}' .
-'\x{83E0}\x{83E1}\x{83E2}\x{83E3}\x{83E4}\x{83E5}\x{83E7}\x{83E8}\x{83E9}' .
-'\x{83EA}\x{83EB}\x{83EC}\x{83EE}\x{83EF}\x{83F0}\x{83F1}\x{83F2}\x{83F3}' .
-'\x{83F4}\x{83F5}\x{83F6}\x{83F7}\x{83F8}\x{83F9}\x{83FA}\x{83FB}\x{83FC}' .
-'\x{83FD}\x{83FE}\x{83FF}\x{8400}\x{8401}\x{8402}\x{8403}\x{8404}\x{8405}' .
-'\x{8406}\x{8407}\x{8408}\x{8409}\x{840A}\x{840B}\x{840C}\x{840D}\x{840E}' .
-'\x{840F}\x{8410}\x{8411}\x{8412}\x{8413}\x{8415}\x{8418}\x{8419}\x{841A}' .
-'\x{841B}\x{841C}\x{841D}\x{841E}\x{8421}\x{8422}\x{8423}\x{8424}\x{8425}' .
-'\x{8426}\x{8427}\x{8428}\x{8429}\x{842A}\x{842B}\x{842C}\x{842D}\x{842E}' .
-'\x{842F}\x{8430}\x{8431}\x{8432}\x{8433}\x{8434}\x{8435}\x{8436}\x{8437}' .
-'\x{8438}\x{8439}\x{843A}\x{843B}\x{843C}\x{843D}\x{843E}\x{843F}\x{8440}' .
-'\x{8441}\x{8442}\x{8443}\x{8444}\x{8445}\x{8446}\x{8447}\x{8448}\x{8449}' .
-'\x{844A}\x{844B}\x{844C}\x{844D}\x{844E}\x{844F}\x{8450}\x{8451}\x{8452}' .
-'\x{8453}\x{8454}\x{8455}\x{8456}\x{8457}\x{8459}\x{845A}\x{845B}\x{845C}' .
-'\x{845D}\x{845E}\x{845F}\x{8460}\x{8461}\x{8462}\x{8463}\x{8464}\x{8465}' .
-'\x{8466}\x{8467}\x{8468}\x{8469}\x{846A}\x{846B}\x{846C}\x{846D}\x{846E}' .
-'\x{846F}\x{8470}\x{8471}\x{8472}\x{8473}\x{8474}\x{8475}\x{8476}\x{8477}' .
-'\x{8478}\x{8479}\x{847A}\x{847B}\x{847C}\x{847D}\x{847E}\x{847F}\x{8480}' .
-'\x{8481}\x{8482}\x{8484}\x{8485}\x{8486}\x{8487}\x{8488}\x{8489}\x{848A}' .
-'\x{848B}\x{848C}\x{848D}\x{848E}\x{848F}\x{8490}\x{8491}\x{8492}\x{8493}' .
-'\x{8494}\x{8496}\x{8497}\x{8498}\x{8499}\x{849A}\x{849B}\x{849C}\x{849D}' .
-'\x{849E}\x{849F}\x{84A0}\x{84A1}\x{84A2}\x{84A3}\x{84A4}\x{84A5}\x{84A6}' .
-'\x{84A7}\x{84A8}\x{84A9}\x{84AA}\x{84AB}\x{84AC}\x{84AE}\x{84AF}\x{84B0}' .
-'\x{84B1}\x{84B2}\x{84B3}\x{84B4}\x{84B5}\x{84B6}\x{84B8}\x{84B9}\x{84BA}' .
-'\x{84BB}\x{84BC}\x{84BD}\x{84BE}\x{84BF}\x{84C0}\x{84C1}\x{84C2}\x{84C4}' .
-'\x{84C5}\x{84C6}\x{84C7}\x{84C8}\x{84C9}\x{84CA}\x{84CB}\x{84CC}\x{84CD}' .
-'\x{84CE}\x{84CF}\x{84D0}\x{84D1}\x{84D2}\x{84D3}\x{84D4}\x{84D5}\x{84D6}' .
-'\x{84D7}\x{84D8}\x{84D9}\x{84DB}\x{84DC}\x{84DD}\x{84DE}\x{84DF}\x{84E0}' .
-'\x{84E1}\x{84E2}\x{84E3}\x{84E4}\x{84E5}\x{84E6}\x{84E7}\x{84E8}\x{84E9}' .
-'\x{84EA}\x{84EB}\x{84EC}\x{84EE}\x{84EF}\x{84F0}\x{84F1}\x{84F2}\x{84F3}' .
-'\x{84F4}\x{84F5}\x{84F6}\x{84F7}\x{84F8}\x{84F9}\x{84FA}\x{84FB}\x{84FC}' .
-'\x{84FD}\x{84FE}\x{84FF}\x{8500}\x{8501}\x{8502}\x{8503}\x{8504}\x{8506}' .
-'\x{8507}\x{8508}\x{8509}\x{850A}\x{850B}\x{850C}\x{850D}\x{850E}\x{850F}' .
-'\x{8511}\x{8512}\x{8513}\x{8514}\x{8515}\x{8516}\x{8517}\x{8518}\x{8519}' .
-'\x{851A}\x{851B}\x{851C}\x{851D}\x{851E}\x{851F}\x{8520}\x{8521}\x{8522}' .
-'\x{8523}\x{8524}\x{8525}\x{8526}\x{8527}\x{8528}\x{8529}\x{852A}\x{852B}' .
-'\x{852C}\x{852D}\x{852E}\x{852F}\x{8530}\x{8531}\x{8534}\x{8535}\x{8536}' .
-'\x{8537}\x{8538}\x{8539}\x{853A}\x{853B}\x{853C}\x{853D}\x{853E}\x{853F}' .
-'\x{8540}\x{8541}\x{8542}\x{8543}\x{8544}\x{8545}\x{8546}\x{8547}\x{8548}' .
-'\x{8549}\x{854A}\x{854B}\x{854D}\x{854E}\x{854F}\x{8551}\x{8552}\x{8553}' .
-'\x{8554}\x{8555}\x{8556}\x{8557}\x{8558}\x{8559}\x{855A}\x{855B}\x{855C}' .
-'\x{855D}\x{855E}\x{855F}\x{8560}\x{8561}\x{8562}\x{8563}\x{8564}\x{8565}' .
-'\x{8566}\x{8567}\x{8568}\x{8569}\x{856A}\x{856B}\x{856C}\x{856D}\x{856E}' .
-'\x{856F}\x{8570}\x{8571}\x{8572}\x{8573}\x{8574}\x{8575}\x{8576}\x{8577}' .
-'\x{8578}\x{8579}\x{857A}\x{857B}\x{857C}\x{857D}\x{857E}\x{8580}\x{8581}' .
-'\x{8582}\x{8583}\x{8584}\x{8585}\x{8586}\x{8587}\x{8588}\x{8589}\x{858A}' .
-'\x{858B}\x{858C}\x{858D}\x{858E}\x{858F}\x{8590}\x{8591}\x{8592}\x{8594}' .
-'\x{8595}\x{8596}\x{8598}\x{8599}\x{859A}\x{859B}\x{859C}\x{859D}\x{859E}' .
-'\x{859F}\x{85A0}\x{85A1}\x{85A2}\x{85A3}\x{85A4}\x{85A5}\x{85A6}\x{85A7}' .
-'\x{85A8}\x{85A9}\x{85AA}\x{85AB}\x{85AC}\x{85AD}\x{85AE}\x{85AF}\x{85B0}' .
-'\x{85B1}\x{85B3}\x{85B4}\x{85B5}\x{85B6}\x{85B7}\x{85B8}\x{85B9}\x{85BA}' .
-'\x{85BC}\x{85BD}\x{85BE}\x{85BF}\x{85C0}\x{85C1}\x{85C2}\x{85C3}\x{85C4}' .
-'\x{85C5}\x{85C6}\x{85C7}\x{85C8}\x{85C9}\x{85CA}\x{85CB}\x{85CD}\x{85CE}' .
-'\x{85CF}\x{85D0}\x{85D1}\x{85D2}\x{85D3}\x{85D4}\x{85D5}\x{85D6}\x{85D7}' .
-'\x{85D8}\x{85D9}\x{85DA}\x{85DB}\x{85DC}\x{85DD}\x{85DE}\x{85DF}\x{85E0}' .
-'\x{85E1}\x{85E2}\x{85E3}\x{85E4}\x{85E5}\x{85E6}\x{85E7}\x{85E8}\x{85E9}' .
-'\x{85EA}\x{85EB}\x{85EC}\x{85ED}\x{85EF}\x{85F0}\x{85F1}\x{85F2}\x{85F4}' .
-'\x{85F5}\x{85F6}\x{85F7}\x{85F8}\x{85F9}\x{85FA}\x{85FB}\x{85FD}\x{85FE}' .
-'\x{85FF}\x{8600}\x{8601}\x{8602}\x{8604}\x{8605}\x{8606}\x{8607}\x{8608}' .
-'\x{8609}\x{860A}\x{860B}\x{860C}\x{860F}\x{8611}\x{8612}\x{8613}\x{8614}' .
-'\x{8616}\x{8617}\x{8618}\x{8619}\x{861A}\x{861B}\x{861C}\x{861E}\x{861F}' .
-'\x{8620}\x{8621}\x{8622}\x{8623}\x{8624}\x{8625}\x{8626}\x{8627}\x{8628}' .
-'\x{8629}\x{862A}\x{862B}\x{862C}\x{862D}\x{862E}\x{862F}\x{8630}\x{8631}' .
-'\x{8632}\x{8633}\x{8634}\x{8635}\x{8636}\x{8638}\x{8639}\x{863A}\x{863B}' .
-'\x{863C}\x{863D}\x{863E}\x{863F}\x{8640}\x{8641}\x{8642}\x{8643}\x{8644}' .
-'\x{8645}\x{8646}\x{8647}\x{8648}\x{8649}\x{864A}\x{864B}\x{864C}\x{864D}' .
-'\x{864E}\x{864F}\x{8650}\x{8651}\x{8652}\x{8653}\x{8654}\x{8655}\x{8656}' .
-'\x{8658}\x{8659}\x{865A}\x{865B}\x{865C}\x{865D}\x{865E}\x{865F}\x{8660}' .
-'\x{8661}\x{8662}\x{8663}\x{8664}\x{8665}\x{8666}\x{8667}\x{8668}\x{8669}' .
-'\x{866A}\x{866B}\x{866C}\x{866D}\x{866E}\x{866F}\x{8670}\x{8671}\x{8672}' .
-'\x{8673}\x{8674}\x{8676}\x{8677}\x{8678}\x{8679}\x{867A}\x{867B}\x{867C}' .
-'\x{867D}\x{867E}\x{867F}\x{8680}\x{8681}\x{8682}\x{8683}\x{8684}\x{8685}' .
-'\x{8686}\x{8687}\x{8688}\x{868A}\x{868B}\x{868C}\x{868D}\x{868E}\x{868F}' .
-'\x{8690}\x{8691}\x{8693}\x{8694}\x{8695}\x{8696}\x{8697}\x{8698}\x{8699}' .
-'\x{869A}\x{869B}\x{869C}\x{869D}\x{869E}\x{869F}\x{86A1}\x{86A2}\x{86A3}' .
-'\x{86A4}\x{86A5}\x{86A7}\x{86A8}\x{86A9}\x{86AA}\x{86AB}\x{86AC}\x{86AD}' .
-'\x{86AE}\x{86AF}\x{86B0}\x{86B1}\x{86B2}\x{86B3}\x{86B4}\x{86B5}\x{86B6}' .
-'\x{86B7}\x{86B8}\x{86B9}\x{86BA}\x{86BB}\x{86BC}\x{86BD}\x{86BE}\x{86BF}' .
-'\x{86C0}\x{86C1}\x{86C2}\x{86C3}\x{86C4}\x{86C5}\x{86C6}\x{86C7}\x{86C8}' .
-'\x{86C9}\x{86CA}\x{86CB}\x{86CC}\x{86CE}\x{86CF}\x{86D0}\x{86D1}\x{86D2}' .
-'\x{86D3}\x{86D4}\x{86D6}\x{86D7}\x{86D8}\x{86D9}\x{86DA}\x{86DB}\x{86DC}' .
-'\x{86DD}\x{86DE}\x{86DF}\x{86E1}\x{86E2}\x{86E3}\x{86E4}\x{86E5}\x{86E6}' .
-'\x{86E8}\x{86E9}\x{86EA}\x{86EB}\x{86EC}\x{86ED}\x{86EE}\x{86EF}\x{86F0}' .
-'\x{86F1}\x{86F2}\x{86F3}\x{86F4}\x{86F5}\x{86F6}\x{86F7}\x{86F8}\x{86F9}' .
-'\x{86FA}\x{86FB}\x{86FC}\x{86FE}\x{86FF}\x{8700}\x{8701}\x{8702}\x{8703}' .
-'\x{8704}\x{8705}\x{8706}\x{8707}\x{8708}\x{8709}\x{870A}\x{870B}\x{870C}' .
-'\x{870D}\x{870E}\x{870F}\x{8710}\x{8711}\x{8712}\x{8713}\x{8714}\x{8715}' .
-'\x{8716}\x{8717}\x{8718}\x{8719}\x{871A}\x{871B}\x{871C}\x{871E}\x{871F}' .
-'\x{8720}\x{8721}\x{8722}\x{8723}\x{8724}\x{8725}\x{8726}\x{8727}\x{8728}' .
-'\x{8729}\x{872A}\x{872B}\x{872C}\x{872D}\x{872E}\x{8730}\x{8731}\x{8732}' .
-'\x{8733}\x{8734}\x{8735}\x{8736}\x{8737}\x{8738}\x{8739}\x{873A}\x{873B}' .
-'\x{873C}\x{873E}\x{873F}\x{8740}\x{8741}\x{8742}\x{8743}\x{8744}\x{8746}' .
-'\x{8747}\x{8748}\x{8749}\x{874A}\x{874C}\x{874D}\x{874E}\x{874F}\x{8750}' .
-'\x{8751}\x{8752}\x{8753}\x{8754}\x{8755}\x{8756}\x{8757}\x{8758}\x{8759}' .
-'\x{875A}\x{875B}\x{875C}\x{875D}\x{875E}\x{875F}\x{8760}\x{8761}\x{8762}' .
-'\x{8763}\x{8764}\x{8765}\x{8766}\x{8767}\x{8768}\x{8769}\x{876A}\x{876B}' .
-'\x{876C}\x{876D}\x{876E}\x{876F}\x{8770}\x{8772}\x{8773}\x{8774}\x{8775}' .
-'\x{8776}\x{8777}\x{8778}\x{8779}\x{877A}\x{877B}\x{877C}\x{877D}\x{877E}' .
-'\x{8780}\x{8781}\x{8782}\x{8783}\x{8784}\x{8785}\x{8786}\x{8787}\x{8788}' .
-'\x{8789}\x{878A}\x{878B}\x{878C}\x{878D}\x{878F}\x{8790}\x{8791}\x{8792}' .
-'\x{8793}\x{8794}\x{8795}\x{8796}\x{8797}\x{8798}\x{879A}\x{879B}\x{879C}' .
-'\x{879D}\x{879E}\x{879F}\x{87A0}\x{87A1}\x{87A2}\x{87A3}\x{87A4}\x{87A5}' .
-'\x{87A6}\x{87A7}\x{87A8}\x{87A9}\x{87AA}\x{87AB}\x{87AC}\x{87AD}\x{87AE}' .
-'\x{87AF}\x{87B0}\x{87B1}\x{87B2}\x{87B3}\x{87B4}\x{87B5}\x{87B6}\x{87B7}' .
-'\x{87B8}\x{87B9}\x{87BA}\x{87BB}\x{87BC}\x{87BD}\x{87BE}\x{87BF}\x{87C0}' .
-'\x{87C1}\x{87C2}\x{87C3}\x{87C4}\x{87C5}\x{87C6}\x{87C7}\x{87C8}\x{87C9}' .
-'\x{87CA}\x{87CB}\x{87CC}\x{87CD}\x{87CE}\x{87CF}\x{87D0}\x{87D1}\x{87D2}' .
-'\x{87D3}\x{87D4}\x{87D5}\x{87D6}\x{87D7}\x{87D8}\x{87D9}\x{87DB}\x{87DC}' .
-'\x{87DD}\x{87DE}\x{87DF}\x{87E0}\x{87E1}\x{87E2}\x{87E3}\x{87E4}\x{87E5}' .
-'\x{87E6}\x{87E7}\x{87E8}\x{87E9}\x{87EA}\x{87EB}\x{87EC}\x{87ED}\x{87EE}' .
-'\x{87EF}\x{87F1}\x{87F2}\x{87F3}\x{87F4}\x{87F5}\x{87F6}\x{87F7}\x{87F8}' .
-'\x{87F9}\x{87FA}\x{87FB}\x{87FC}\x{87FD}\x{87FE}\x{87FF}\x{8800}\x{8801}' .
-'\x{8802}\x{8803}\x{8804}\x{8805}\x{8806}\x{8808}\x{8809}\x{880A}\x{880B}' .
-'\x{880C}\x{880D}\x{880E}\x{880F}\x{8810}\x{8811}\x{8813}\x{8814}\x{8815}' .
-'\x{8816}\x{8817}\x{8818}\x{8819}\x{881A}\x{881B}\x{881C}\x{881D}\x{881E}' .
-'\x{881F}\x{8820}\x{8821}\x{8822}\x{8823}\x{8824}\x{8825}\x{8826}\x{8827}' .
-'\x{8828}\x{8829}\x{882A}\x{882B}\x{882C}\x{882E}\x{882F}\x{8830}\x{8831}' .
-'\x{8832}\x{8833}\x{8834}\x{8835}\x{8836}\x{8837}\x{8838}\x{8839}\x{883B}' .
-'\x{883C}\x{883D}\x{883E}\x{883F}\x{8840}\x{8841}\x{8842}\x{8843}\x{8844}' .
-'\x{8845}\x{8846}\x{8848}\x{8849}\x{884A}\x{884B}\x{884C}\x{884D}\x{884E}' .
-'\x{884F}\x{8850}\x{8851}\x{8852}\x{8853}\x{8854}\x{8855}\x{8856}\x{8857}' .
-'\x{8859}\x{885A}\x{885B}\x{885D}\x{885E}\x{8860}\x{8861}\x{8862}\x{8863}' .
-'\x{8864}\x{8865}\x{8866}\x{8867}\x{8868}\x{8869}\x{886A}\x{886B}\x{886C}' .
-'\x{886D}\x{886E}\x{886F}\x{8870}\x{8871}\x{8872}\x{8873}\x{8874}\x{8875}' .
-'\x{8876}\x{8877}\x{8878}\x{8879}\x{887B}\x{887C}\x{887D}\x{887E}\x{887F}' .
-'\x{8880}\x{8881}\x{8882}\x{8883}\x{8884}\x{8885}\x{8886}\x{8887}\x{8888}' .
-'\x{8889}\x{888A}\x{888B}\x{888C}\x{888D}\x{888E}\x{888F}\x{8890}\x{8891}' .
-'\x{8892}\x{8893}\x{8894}\x{8895}\x{8896}\x{8897}\x{8898}\x{8899}\x{889A}' .
-'\x{889B}\x{889C}\x{889D}\x{889E}\x{889F}\x{88A0}\x{88A1}\x{88A2}\x{88A3}' .
-'\x{88A4}\x{88A5}\x{88A6}\x{88A7}\x{88A8}\x{88A9}\x{88AA}\x{88AB}\x{88AC}' .
-'\x{88AD}\x{88AE}\x{88AF}\x{88B0}\x{88B1}\x{88B2}\x{88B3}\x{88B4}\x{88B6}' .
-'\x{88B7}\x{88B8}\x{88B9}\x{88BA}\x{88BB}\x{88BC}\x{88BD}\x{88BE}\x{88BF}' .
-'\x{88C0}\x{88C1}\x{88C2}\x{88C3}\x{88C4}\x{88C5}\x{88C6}\x{88C7}\x{88C8}' .
-'\x{88C9}\x{88CA}\x{88CB}\x{88CC}\x{88CD}\x{88CE}\x{88CF}\x{88D0}\x{88D1}' .
-'\x{88D2}\x{88D3}\x{88D4}\x{88D5}\x{88D6}\x{88D7}\x{88D8}\x{88D9}\x{88DA}' .
-'\x{88DB}\x{88DC}\x{88DD}\x{88DE}\x{88DF}\x{88E0}\x{88E1}\x{88E2}\x{88E3}' .
-'\x{88E4}\x{88E5}\x{88E7}\x{88E8}\x{88EA}\x{88EB}\x{88EC}\x{88EE}\x{88EF}' .
-'\x{88F0}\x{88F1}\x{88F2}\x{88F3}\x{88F4}\x{88F5}\x{88F6}\x{88F7}\x{88F8}' .
-'\x{88F9}\x{88FA}\x{88FB}\x{88FC}\x{88FD}\x{88FE}\x{88FF}\x{8900}\x{8901}' .
-'\x{8902}\x{8904}\x{8905}\x{8906}\x{8907}\x{8908}\x{8909}\x{890A}\x{890B}' .
-'\x{890C}\x{890D}\x{890E}\x{8910}\x{8911}\x{8912}\x{8913}\x{8914}\x{8915}' .
-'\x{8916}\x{8917}\x{8918}\x{8919}\x{891A}\x{891B}\x{891C}\x{891D}\x{891E}' .
-'\x{891F}\x{8920}\x{8921}\x{8922}\x{8923}\x{8925}\x{8926}\x{8927}\x{8928}' .
-'\x{8929}\x{892A}\x{892B}\x{892C}\x{892D}\x{892E}\x{892F}\x{8930}\x{8931}' .
-'\x{8932}\x{8933}\x{8934}\x{8935}\x{8936}\x{8937}\x{8938}\x{8939}\x{893A}' .
-'\x{893B}\x{893C}\x{893D}\x{893E}\x{893F}\x{8940}\x{8941}\x{8942}\x{8943}' .
-'\x{8944}\x{8945}\x{8946}\x{8947}\x{8948}\x{8949}\x{894A}\x{894B}\x{894C}' .
-'\x{894E}\x{894F}\x{8950}\x{8951}\x{8952}\x{8953}\x{8954}\x{8955}\x{8956}' .
-'\x{8957}\x{8958}\x{8959}\x{895A}\x{895B}\x{895C}\x{895D}\x{895E}\x{895F}' .
-'\x{8960}\x{8961}\x{8962}\x{8963}\x{8964}\x{8966}\x{8967}\x{8968}\x{8969}' .
-'\x{896A}\x{896B}\x{896C}\x{896D}\x{896E}\x{896F}\x{8970}\x{8971}\x{8972}' .
-'\x{8973}\x{8974}\x{8976}\x{8977}\x{8978}\x{8979}\x{897A}\x{897B}\x{897C}' .
-'\x{897E}\x{897F}\x{8980}\x{8981}\x{8982}\x{8983}\x{8984}\x{8985}\x{8986}' .
-'\x{8987}\x{8988}\x{8989}\x{898A}\x{898B}\x{898C}\x{898E}\x{898F}\x{8991}' .
-'\x{8992}\x{8993}\x{8995}\x{8996}\x{8997}\x{8998}\x{899A}\x{899B}\x{899C}' .
-'\x{899D}\x{899E}\x{899F}\x{89A0}\x{89A1}\x{89A2}\x{89A3}\x{89A4}\x{89A5}' .
-'\x{89A6}\x{89A7}\x{89A8}\x{89AA}\x{89AB}\x{89AC}\x{89AD}\x{89AE}\x{89AF}' .
-'\x{89B1}\x{89B2}\x{89B3}\x{89B5}\x{89B6}\x{89B7}\x{89B8}\x{89B9}\x{89BA}' .
-'\x{89BD}\x{89BE}\x{89BF}\x{89C0}\x{89C1}\x{89C2}\x{89C3}\x{89C4}\x{89C5}' .
-'\x{89C6}\x{89C7}\x{89C8}\x{89C9}\x{89CA}\x{89CB}\x{89CC}\x{89CD}\x{89CE}' .
-'\x{89CF}\x{89D0}\x{89D1}\x{89D2}\x{89D3}\x{89D4}\x{89D5}\x{89D6}\x{89D7}' .
-'\x{89D8}\x{89D9}\x{89DA}\x{89DB}\x{89DC}\x{89DD}\x{89DE}\x{89DF}\x{89E0}' .
-'\x{89E1}\x{89E2}\x{89E3}\x{89E4}\x{89E5}\x{89E6}\x{89E7}\x{89E8}\x{89E9}' .
-'\x{89EA}\x{89EB}\x{89EC}\x{89ED}\x{89EF}\x{89F0}\x{89F1}\x{89F2}\x{89F3}' .
-'\x{89F4}\x{89F6}\x{89F7}\x{89F8}\x{89FA}\x{89FB}\x{89FC}\x{89FE}\x{89FF}' .
-'\x{8A00}\x{8A01}\x{8A02}\x{8A03}\x{8A04}\x{8A07}\x{8A08}\x{8A09}\x{8A0A}' .
-'\x{8A0B}\x{8A0C}\x{8A0D}\x{8A0E}\x{8A0F}\x{8A10}\x{8A11}\x{8A12}\x{8A13}' .
-'\x{8A15}\x{8A16}\x{8A17}\x{8A18}\x{8A1A}\x{8A1B}\x{8A1C}\x{8A1D}\x{8A1E}' .
-'\x{8A1F}\x{8A22}\x{8A23}\x{8A24}\x{8A25}\x{8A26}\x{8A27}\x{8A28}\x{8A29}' .
-'\x{8A2A}\x{8A2C}\x{8A2D}\x{8A2E}\x{8A2F}\x{8A30}\x{8A31}\x{8A32}\x{8A34}' .
-'\x{8A35}\x{8A36}\x{8A37}\x{8A38}\x{8A39}\x{8A3A}\x{8A3B}\x{8A3C}\x{8A3E}' .
-'\x{8A3F}\x{8A40}\x{8A41}\x{8A42}\x{8A43}\x{8A44}\x{8A45}\x{8A46}\x{8A47}' .
-'\x{8A48}\x{8A49}\x{8A4A}\x{8A4C}\x{8A4D}\x{8A4E}\x{8A4F}\x{8A50}\x{8A51}' .
-'\x{8A52}\x{8A53}\x{8A54}\x{8A55}\x{8A56}\x{8A57}\x{8A58}\x{8A59}\x{8A5A}' .
-'\x{8A5B}\x{8A5C}\x{8A5D}\x{8A5E}\x{8A5F}\x{8A60}\x{8A61}\x{8A62}\x{8A63}' .
-'\x{8A65}\x{8A66}\x{8A67}\x{8A68}\x{8A69}\x{8A6A}\x{8A6B}\x{8A6C}\x{8A6D}' .
-'\x{8A6E}\x{8A6F}\x{8A70}\x{8A71}\x{8A72}\x{8A73}\x{8A74}\x{8A75}\x{8A76}' .
-'\x{8A77}\x{8A79}\x{8A7A}\x{8A7B}\x{8A7C}\x{8A7E}\x{8A7F}\x{8A80}\x{8A81}' .
-'\x{8A82}\x{8A83}\x{8A84}\x{8A85}\x{8A86}\x{8A87}\x{8A89}\x{8A8A}\x{8A8B}' .
-'\x{8A8C}\x{8A8D}\x{8A8E}\x{8A8F}\x{8A90}\x{8A91}\x{8A92}\x{8A93}\x{8A94}' .
-'\x{8A95}\x{8A96}\x{8A97}\x{8A98}\x{8A99}\x{8A9A}\x{8A9B}\x{8A9C}\x{8A9D}' .
-'\x{8A9E}\x{8AA0}\x{8AA1}\x{8AA2}\x{8AA3}\x{8AA4}\x{8AA5}\x{8AA6}\x{8AA7}' .
-'\x{8AA8}\x{8AA9}\x{8AAA}\x{8AAB}\x{8AAC}\x{8AAE}\x{8AB0}\x{8AB1}\x{8AB2}' .
-'\x{8AB3}\x{8AB4}\x{8AB5}\x{8AB6}\x{8AB8}\x{8AB9}\x{8ABA}\x{8ABB}\x{8ABC}' .
-'\x{8ABD}\x{8ABE}\x{8ABF}\x{8AC0}\x{8AC1}\x{8AC2}\x{8AC3}\x{8AC4}\x{8AC5}' .
-'\x{8AC6}\x{8AC7}\x{8AC8}\x{8AC9}\x{8ACA}\x{8ACB}\x{8ACC}\x{8ACD}\x{8ACE}' .
-'\x{8ACF}\x{8AD1}\x{8AD2}\x{8AD3}\x{8AD4}\x{8AD5}\x{8AD6}\x{8AD7}\x{8AD8}' .
-'\x{8AD9}\x{8ADA}\x{8ADB}\x{8ADC}\x{8ADD}\x{8ADE}\x{8ADF}\x{8AE0}\x{8AE1}' .
-'\x{8AE2}\x{8AE3}\x{8AE4}\x{8AE5}\x{8AE6}\x{8AE7}\x{8AE8}\x{8AE9}\x{8AEA}' .
-'\x{8AEB}\x{8AED}\x{8AEE}\x{8AEF}\x{8AF0}\x{8AF1}\x{8AF2}\x{8AF3}\x{8AF4}' .
-'\x{8AF5}\x{8AF6}\x{8AF7}\x{8AF8}\x{8AF9}\x{8AFA}\x{8AFB}\x{8AFC}\x{8AFD}' .
-'\x{8AFE}\x{8AFF}\x{8B00}\x{8B01}\x{8B02}\x{8B03}\x{8B04}\x{8B05}\x{8B06}' .
-'\x{8B07}\x{8B08}\x{8B09}\x{8B0A}\x{8B0B}\x{8B0D}\x{8B0E}\x{8B0F}\x{8B10}' .
-'\x{8B11}\x{8B12}\x{8B13}\x{8B14}\x{8B15}\x{8B16}\x{8B17}\x{8B18}\x{8B19}' .
-'\x{8B1A}\x{8B1B}\x{8B1C}\x{8B1D}\x{8B1E}\x{8B1F}\x{8B20}\x{8B21}\x{8B22}' .
-'\x{8B23}\x{8B24}\x{8B25}\x{8B26}\x{8B27}\x{8B28}\x{8B2A}\x{8B2B}\x{8B2C}' .
-'\x{8B2D}\x{8B2E}\x{8B2F}\x{8B30}\x{8B31}\x{8B33}\x{8B34}\x{8B35}\x{8B36}' .
-'\x{8B37}\x{8B39}\x{8B3A}\x{8B3B}\x{8B3C}\x{8B3D}\x{8B3E}\x{8B40}\x{8B41}' .
-'\x{8B42}\x{8B43}\x{8B44}\x{8B45}\x{8B46}\x{8B47}\x{8B48}\x{8B49}\x{8B4A}' .
-'\x{8B4B}\x{8B4C}\x{8B4D}\x{8B4E}\x{8B4F}\x{8B50}\x{8B51}\x{8B52}\x{8B53}' .
-'\x{8B54}\x{8B55}\x{8B56}\x{8B57}\x{8B58}\x{8B59}\x{8B5A}\x{8B5B}\x{8B5C}' .
-'\x{8B5D}\x{8B5E}\x{8B5F}\x{8B60}\x{8B63}\x{8B64}\x{8B65}\x{8B66}\x{8B67}' .
-'\x{8B68}\x{8B6A}\x{8B6B}\x{8B6C}\x{8B6D}\x{8B6E}\x{8B6F}\x{8B70}\x{8B71}' .
-'\x{8B73}\x{8B74}\x{8B76}\x{8B77}\x{8B78}\x{8B79}\x{8B7A}\x{8B7B}\x{8B7D}' .
-'\x{8B7E}\x{8B7F}\x{8B80}\x{8B82}\x{8B83}\x{8B84}\x{8B85}\x{8B86}\x{8B88}' .
-'\x{8B89}\x{8B8A}\x{8B8B}\x{8B8C}\x{8B8E}\x{8B90}\x{8B91}\x{8B92}\x{8B93}' .
-'\x{8B94}\x{8B95}\x{8B96}\x{8B97}\x{8B98}\x{8B99}\x{8B9A}\x{8B9C}\x{8B9D}' .
-'\x{8B9E}\x{8B9F}\x{8BA0}\x{8BA1}\x{8BA2}\x{8BA3}\x{8BA4}\x{8BA5}\x{8BA6}' .
-'\x{8BA7}\x{8BA8}\x{8BA9}\x{8BAA}\x{8BAB}\x{8BAC}\x{8BAD}\x{8BAE}\x{8BAF}' .
-'\x{8BB0}\x{8BB1}\x{8BB2}\x{8BB3}\x{8BB4}\x{8BB5}\x{8BB6}\x{8BB7}\x{8BB8}' .
-'\x{8BB9}\x{8BBA}\x{8BBB}\x{8BBC}\x{8BBD}\x{8BBE}\x{8BBF}\x{8BC0}\x{8BC1}' .
-'\x{8BC2}\x{8BC3}\x{8BC4}\x{8BC5}\x{8BC6}\x{8BC7}\x{8BC8}\x{8BC9}\x{8BCA}' .
-'\x{8BCB}\x{8BCC}\x{8BCD}\x{8BCE}\x{8BCF}\x{8BD0}\x{8BD1}\x{8BD2}\x{8BD3}' .
-'\x{8BD4}\x{8BD5}\x{8BD6}\x{8BD7}\x{8BD8}\x{8BD9}\x{8BDA}\x{8BDB}\x{8BDC}' .
-'\x{8BDD}\x{8BDE}\x{8BDF}\x{8BE0}\x{8BE1}\x{8BE2}\x{8BE3}\x{8BE4}\x{8BE5}' .
-'\x{8BE6}\x{8BE7}\x{8BE8}\x{8BE9}\x{8BEA}\x{8BEB}\x{8BEC}\x{8BED}\x{8BEE}' .
-'\x{8BEF}\x{8BF0}\x{8BF1}\x{8BF2}\x{8BF3}\x{8BF4}\x{8BF5}\x{8BF6}\x{8BF7}' .
-'\x{8BF8}\x{8BF9}\x{8BFA}\x{8BFB}\x{8BFC}\x{8BFD}\x{8BFE}\x{8BFF}\x{8C00}' .
-'\x{8C01}\x{8C02}\x{8C03}\x{8C04}\x{8C05}\x{8C06}\x{8C07}\x{8C08}\x{8C09}' .
-'\x{8C0A}\x{8C0B}\x{8C0C}\x{8C0D}\x{8C0E}\x{8C0F}\x{8C10}\x{8C11}\x{8C12}' .
-'\x{8C13}\x{8C14}\x{8C15}\x{8C16}\x{8C17}\x{8C18}\x{8C19}\x{8C1A}\x{8C1B}' .
-'\x{8C1C}\x{8C1D}\x{8C1E}\x{8C1F}\x{8C20}\x{8C21}\x{8C22}\x{8C23}\x{8C24}' .
-'\x{8C25}\x{8C26}\x{8C27}\x{8C28}\x{8C29}\x{8C2A}\x{8C2B}\x{8C2C}\x{8C2D}' .
-'\x{8C2E}\x{8C2F}\x{8C30}\x{8C31}\x{8C32}\x{8C33}\x{8C34}\x{8C35}\x{8C36}' .
-'\x{8C37}\x{8C39}\x{8C3A}\x{8C3B}\x{8C3C}\x{8C3D}\x{8C3E}\x{8C3F}\x{8C41}' .
-'\x{8C42}\x{8C43}\x{8C45}\x{8C46}\x{8C47}\x{8C48}\x{8C49}\x{8C4A}\x{8C4B}' .
-'\x{8C4C}\x{8C4D}\x{8C4E}\x{8C4F}\x{8C50}\x{8C54}\x{8C55}\x{8C56}\x{8C57}' .
-'\x{8C59}\x{8C5A}\x{8C5B}\x{8C5C}\x{8C5D}\x{8C5E}\x{8C5F}\x{8C60}\x{8C61}' .
-'\x{8C62}\x{8C63}\x{8C64}\x{8C65}\x{8C66}\x{8C67}\x{8C68}\x{8C69}\x{8C6A}' .
-'\x{8C6B}\x{8C6C}\x{8C6D}\x{8C6E}\x{8C6F}\x{8C70}\x{8C71}\x{8C72}\x{8C73}' .
-'\x{8C75}\x{8C76}\x{8C77}\x{8C78}\x{8C79}\x{8C7A}\x{8C7B}\x{8C7D}\x{8C7E}' .
-'\x{8C80}\x{8C81}\x{8C82}\x{8C84}\x{8C85}\x{8C86}\x{8C88}\x{8C89}\x{8C8A}' .
-'\x{8C8C}\x{8C8D}\x{8C8F}\x{8C90}\x{8C91}\x{8C92}\x{8C93}\x{8C94}\x{8C95}' .
-'\x{8C96}\x{8C97}\x{8C98}\x{8C99}\x{8C9A}\x{8C9C}\x{8C9D}\x{8C9E}\x{8C9F}' .
-'\x{8CA0}\x{8CA1}\x{8CA2}\x{8CA3}\x{8CA4}\x{8CA5}\x{8CA7}\x{8CA8}\x{8CA9}' .
-'\x{8CAA}\x{8CAB}\x{8CAC}\x{8CAD}\x{8CAE}\x{8CAF}\x{8CB0}\x{8CB1}\x{8CB2}' .
-'\x{8CB3}\x{8CB4}\x{8CB5}\x{8CB6}\x{8CB7}\x{8CB8}\x{8CB9}\x{8CBA}\x{8CBB}' .
-'\x{8CBC}\x{8CBD}\x{8CBE}\x{8CBF}\x{8CC0}\x{8CC1}\x{8CC2}\x{8CC3}\x{8CC4}' .
-'\x{8CC5}\x{8CC6}\x{8CC7}\x{8CC8}\x{8CC9}\x{8CCA}\x{8CCC}\x{8CCE}\x{8CCF}' .
-'\x{8CD0}\x{8CD1}\x{8CD2}\x{8CD3}\x{8CD4}\x{8CD5}\x{8CD7}\x{8CD9}\x{8CDA}' .
-'\x{8CDB}\x{8CDC}\x{8CDD}\x{8CDE}\x{8CDF}\x{8CE0}\x{8CE1}\x{8CE2}\x{8CE3}' .
-'\x{8CE4}\x{8CE5}\x{8CE6}\x{8CE7}\x{8CE8}\x{8CEA}\x{8CEB}\x{8CEC}\x{8CED}' .
-'\x{8CEE}\x{8CEF}\x{8CF0}\x{8CF1}\x{8CF2}\x{8CF3}\x{8CF4}\x{8CF5}\x{8CF6}' .
-'\x{8CF8}\x{8CF9}\x{8CFA}\x{8CFB}\x{8CFC}\x{8CFD}\x{8CFE}\x{8CFF}\x{8D00}' .
-'\x{8D02}\x{8D03}\x{8D04}\x{8D05}\x{8D06}\x{8D07}\x{8D08}\x{8D09}\x{8D0A}' .
-'\x{8D0B}\x{8D0C}\x{8D0D}\x{8D0E}\x{8D0F}\x{8D10}\x{8D13}\x{8D14}\x{8D15}' .
-'\x{8D16}\x{8D17}\x{8D18}\x{8D19}\x{8D1A}\x{8D1B}\x{8D1C}\x{8D1D}\x{8D1E}' .
-'\x{8D1F}\x{8D20}\x{8D21}\x{8D22}\x{8D23}\x{8D24}\x{8D25}\x{8D26}\x{8D27}' .
-'\x{8D28}\x{8D29}\x{8D2A}\x{8D2B}\x{8D2C}\x{8D2D}\x{8D2E}\x{8D2F}\x{8D30}' .
-'\x{8D31}\x{8D32}\x{8D33}\x{8D34}\x{8D35}\x{8D36}\x{8D37}\x{8D38}\x{8D39}' .
-'\x{8D3A}\x{8D3B}\x{8D3C}\x{8D3D}\x{8D3E}\x{8D3F}\x{8D40}\x{8D41}\x{8D42}' .
-'\x{8D43}\x{8D44}\x{8D45}\x{8D46}\x{8D47}\x{8D48}\x{8D49}\x{8D4A}\x{8D4B}' .
-'\x{8D4C}\x{8D4D}\x{8D4E}\x{8D4F}\x{8D50}\x{8D51}\x{8D52}\x{8D53}\x{8D54}' .
-'\x{8D55}\x{8D56}\x{8D57}\x{8D58}\x{8D59}\x{8D5A}\x{8D5B}\x{8D5C}\x{8D5D}' .
-'\x{8D5E}\x{8D5F}\x{8D60}\x{8D61}\x{8D62}\x{8D63}\x{8D64}\x{8D65}\x{8D66}' .
-'\x{8D67}\x{8D68}\x{8D69}\x{8D6A}\x{8D6B}\x{8D6C}\x{8D6D}\x{8D6E}\x{8D6F}' .
-'\x{8D70}\x{8D71}\x{8D72}\x{8D73}\x{8D74}\x{8D75}\x{8D76}\x{8D77}\x{8D78}' .
-'\x{8D79}\x{8D7A}\x{8D7B}\x{8D7D}\x{8D7E}\x{8D7F}\x{8D80}\x{8D81}\x{8D82}' .
-'\x{8D83}\x{8D84}\x{8D85}\x{8D86}\x{8D87}\x{8D88}\x{8D89}\x{8D8A}\x{8D8B}' .
-'\x{8D8C}\x{8D8D}\x{8D8E}\x{8D8F}\x{8D90}\x{8D91}\x{8D92}\x{8D93}\x{8D94}' .
-'\x{8D95}\x{8D96}\x{8D97}\x{8D98}\x{8D99}\x{8D9A}\x{8D9B}\x{8D9C}\x{8D9D}' .
-'\x{8D9E}\x{8D9F}\x{8DA0}\x{8DA1}\x{8DA2}\x{8DA3}\x{8DA4}\x{8DA5}\x{8DA7}' .
-'\x{8DA8}\x{8DA9}\x{8DAA}\x{8DAB}\x{8DAC}\x{8DAD}\x{8DAE}\x{8DAF}\x{8DB0}' .
-'\x{8DB1}\x{8DB2}\x{8DB3}\x{8DB4}\x{8DB5}\x{8DB6}\x{8DB7}\x{8DB8}\x{8DB9}' .
-'\x{8DBA}\x{8DBB}\x{8DBC}\x{8DBD}\x{8DBE}\x{8DBF}\x{8DC1}\x{8DC2}\x{8DC3}' .
-'\x{8DC4}\x{8DC5}\x{8DC6}\x{8DC7}\x{8DC8}\x{8DC9}\x{8DCA}\x{8DCB}\x{8DCC}' .
-'\x{8DCD}\x{8DCE}\x{8DCF}\x{8DD0}\x{8DD1}\x{8DD2}\x{8DD3}\x{8DD4}\x{8DD5}' .
-'\x{8DD6}\x{8DD7}\x{8DD8}\x{8DD9}\x{8DDA}\x{8DDB}\x{8DDC}\x{8DDD}\x{8DDE}' .
-'\x{8DDF}\x{8DE0}\x{8DE1}\x{8DE2}\x{8DE3}\x{8DE4}\x{8DE6}\x{8DE7}\x{8DE8}' .
-'\x{8DE9}\x{8DEA}\x{8DEB}\x{8DEC}\x{8DED}\x{8DEE}\x{8DEF}\x{8DF0}\x{8DF1}' .
-'\x{8DF2}\x{8DF3}\x{8DF4}\x{8DF5}\x{8DF6}\x{8DF7}\x{8DF8}\x{8DF9}\x{8DFA}' .
-'\x{8DFB}\x{8DFC}\x{8DFD}\x{8DFE}\x{8DFF}\x{8E00}\x{8E02}\x{8E03}\x{8E04}' .
-'\x{8E05}\x{8E06}\x{8E07}\x{8E08}\x{8E09}\x{8E0A}\x{8E0C}\x{8E0D}\x{8E0E}' .
-'\x{8E0F}\x{8E10}\x{8E11}\x{8E12}\x{8E13}\x{8E14}\x{8E15}\x{8E16}\x{8E17}' .
-'\x{8E18}\x{8E19}\x{8E1A}\x{8E1B}\x{8E1C}\x{8E1D}\x{8E1E}\x{8E1F}\x{8E20}' .
-'\x{8E21}\x{8E22}\x{8E23}\x{8E24}\x{8E25}\x{8E26}\x{8E27}\x{8E28}\x{8E29}' .
-'\x{8E2A}\x{8E2B}\x{8E2C}\x{8E2D}\x{8E2E}\x{8E2F}\x{8E30}\x{8E31}\x{8E33}' .
-'\x{8E34}\x{8E35}\x{8E36}\x{8E37}\x{8E38}\x{8E39}\x{8E3A}\x{8E3B}\x{8E3C}' .
-'\x{8E3D}\x{8E3E}\x{8E3F}\x{8E40}\x{8E41}\x{8E42}\x{8E43}\x{8E44}\x{8E45}' .
-'\x{8E47}\x{8E48}\x{8E49}\x{8E4A}\x{8E4B}\x{8E4C}\x{8E4D}\x{8E4E}\x{8E50}' .
-'\x{8E51}\x{8E52}\x{8E53}\x{8E54}\x{8E55}\x{8E56}\x{8E57}\x{8E58}\x{8E59}' .
-'\x{8E5A}\x{8E5B}\x{8E5C}\x{8E5D}\x{8E5E}\x{8E5F}\x{8E60}\x{8E61}\x{8E62}' .
-'\x{8E63}\x{8E64}\x{8E65}\x{8E66}\x{8E67}\x{8E68}\x{8E69}\x{8E6A}\x{8E6B}' .
-'\x{8E6C}\x{8E6D}\x{8E6F}\x{8E70}\x{8E71}\x{8E72}\x{8E73}\x{8E74}\x{8E76}' .
-'\x{8E78}\x{8E7A}\x{8E7B}\x{8E7C}\x{8E7D}\x{8E7E}\x{8E7F}\x{8E80}\x{8E81}' .
-'\x{8E82}\x{8E83}\x{8E84}\x{8E85}\x{8E86}\x{8E87}\x{8E88}\x{8E89}\x{8E8A}' .
-'\x{8E8B}\x{8E8C}\x{8E8D}\x{8E8E}\x{8E8F}\x{8E90}\x{8E91}\x{8E92}\x{8E93}' .
-'\x{8E94}\x{8E95}\x{8E96}\x{8E97}\x{8E98}\x{8E9A}\x{8E9C}\x{8E9D}\x{8E9E}' .
-'\x{8E9F}\x{8EA0}\x{8EA1}\x{8EA3}\x{8EA4}\x{8EA5}\x{8EA6}\x{8EA7}\x{8EA8}' .
-'\x{8EA9}\x{8EAA}\x{8EAB}\x{8EAC}\x{8EAD}\x{8EAE}\x{8EAF}\x{8EB0}\x{8EB1}' .
-'\x{8EB2}\x{8EB4}\x{8EB5}\x{8EB8}\x{8EB9}\x{8EBA}\x{8EBB}\x{8EBC}\x{8EBD}' .
-'\x{8EBE}\x{8EBF}\x{8EC0}\x{8EC2}\x{8EC3}\x{8EC5}\x{8EC6}\x{8EC7}\x{8EC8}' .
-'\x{8EC9}\x{8ECA}\x{8ECB}\x{8ECC}\x{8ECD}\x{8ECE}\x{8ECF}\x{8ED0}\x{8ED1}' .
-'\x{8ED2}\x{8ED3}\x{8ED4}\x{8ED5}\x{8ED6}\x{8ED7}\x{8ED8}\x{8EDA}\x{8EDB}' .
-'\x{8EDC}\x{8EDD}\x{8EDE}\x{8EDF}\x{8EE0}\x{8EE1}\x{8EE4}\x{8EE5}\x{8EE6}' .
-'\x{8EE7}\x{8EE8}\x{8EE9}\x{8EEA}\x{8EEB}\x{8EEC}\x{8EED}\x{8EEE}\x{8EEF}' .
-'\x{8EF1}\x{8EF2}\x{8EF3}\x{8EF4}\x{8EF5}\x{8EF6}\x{8EF7}\x{8EF8}\x{8EF9}' .
-'\x{8EFA}\x{8EFB}\x{8EFC}\x{8EFD}\x{8EFE}\x{8EFF}\x{8F00}\x{8F01}\x{8F02}' .
-'\x{8F03}\x{8F04}\x{8F05}\x{8F06}\x{8F07}\x{8F08}\x{8F09}\x{8F0A}\x{8F0B}' .
-'\x{8F0D}\x{8F0E}\x{8F10}\x{8F11}\x{8F12}\x{8F13}\x{8F14}\x{8F15}\x{8F16}' .
-'\x{8F17}\x{8F18}\x{8F1A}\x{8F1B}\x{8F1C}\x{8F1D}\x{8F1E}\x{8F1F}\x{8F20}' .
-'\x{8F21}\x{8F22}\x{8F23}\x{8F24}\x{8F25}\x{8F26}\x{8F27}\x{8F28}\x{8F29}' .
-'\x{8F2A}\x{8F2B}\x{8F2C}\x{8F2E}\x{8F2F}\x{8F30}\x{8F31}\x{8F32}\x{8F33}' .
-'\x{8F34}\x{8F35}\x{8F36}\x{8F37}\x{8F38}\x{8F39}\x{8F3B}\x{8F3C}\x{8F3D}' .
-'\x{8F3E}\x{8F3F}\x{8F40}\x{8F42}\x{8F43}\x{8F44}\x{8F45}\x{8F46}\x{8F47}' .
-'\x{8F48}\x{8F49}\x{8F4A}\x{8F4B}\x{8F4C}\x{8F4D}\x{8F4E}\x{8F4F}\x{8F50}' .
-'\x{8F51}\x{8F52}\x{8F53}\x{8F54}\x{8F55}\x{8F56}\x{8F57}\x{8F58}\x{8F59}' .
-'\x{8F5A}\x{8F5B}\x{8F5D}\x{8F5E}\x{8F5F}\x{8F60}\x{8F61}\x{8F62}\x{8F63}' .
-'\x{8F64}\x{8F65}\x{8F66}\x{8F67}\x{8F68}\x{8F69}\x{8F6A}\x{8F6B}\x{8F6C}' .
-'\x{8F6D}\x{8F6E}\x{8F6F}\x{8F70}\x{8F71}\x{8F72}\x{8F73}\x{8F74}\x{8F75}' .
-'\x{8F76}\x{8F77}\x{8F78}\x{8F79}\x{8F7A}\x{8F7B}\x{8F7C}\x{8F7D}\x{8F7E}' .
-'\x{8F7F}\x{8F80}\x{8F81}\x{8F82}\x{8F83}\x{8F84}\x{8F85}\x{8F86}\x{8F87}' .
-'\x{8F88}\x{8F89}\x{8F8A}\x{8F8B}\x{8F8C}\x{8F8D}\x{8F8E}\x{8F8F}\x{8F90}' .
-'\x{8F91}\x{8F92}\x{8F93}\x{8F94}\x{8F95}\x{8F96}\x{8F97}\x{8F98}\x{8F99}' .
-'\x{8F9A}\x{8F9B}\x{8F9C}\x{8F9E}\x{8F9F}\x{8FA0}\x{8FA1}\x{8FA2}\x{8FA3}' .
-'\x{8FA5}\x{8FA6}\x{8FA7}\x{8FA8}\x{8FA9}\x{8FAA}\x{8FAB}\x{8FAC}\x{8FAD}' .
-'\x{8FAE}\x{8FAF}\x{8FB0}\x{8FB1}\x{8FB2}\x{8FB4}\x{8FB5}\x{8FB6}\x{8FB7}' .
-'\x{8FB8}\x{8FB9}\x{8FBB}\x{8FBC}\x{8FBD}\x{8FBE}\x{8FBF}\x{8FC0}\x{8FC1}' .
-'\x{8FC2}\x{8FC4}\x{8FC5}\x{8FC6}\x{8FC7}\x{8FC8}\x{8FC9}\x{8FCB}\x{8FCC}' .
-'\x{8FCD}\x{8FCE}\x{8FCF}\x{8FD0}\x{8FD1}\x{8FD2}\x{8FD3}\x{8FD4}\x{8FD5}' .
-'\x{8FD6}\x{8FD7}\x{8FD8}\x{8FD9}\x{8FDA}\x{8FDB}\x{8FDC}\x{8FDD}\x{8FDE}' .
-'\x{8FDF}\x{8FE0}\x{8FE1}\x{8FE2}\x{8FE3}\x{8FE4}\x{8FE5}\x{8FE6}\x{8FE8}' .
-'\x{8FE9}\x{8FEA}\x{8FEB}\x{8FEC}\x{8FED}\x{8FEE}\x{8FEF}\x{8FF0}\x{8FF1}' .
-'\x{8FF2}\x{8FF3}\x{8FF4}\x{8FF5}\x{8FF6}\x{8FF7}\x{8FF8}\x{8FF9}\x{8FFA}' .
-'\x{8FFB}\x{8FFC}\x{8FFD}\x{8FFE}\x{8FFF}\x{9000}\x{9001}\x{9002}\x{9003}' .
-'\x{9004}\x{9005}\x{9006}\x{9007}\x{9008}\x{9009}\x{900A}\x{900B}\x{900C}' .
-'\x{900D}\x{900F}\x{9010}\x{9011}\x{9012}\x{9013}\x{9014}\x{9015}\x{9016}' .
-'\x{9017}\x{9018}\x{9019}\x{901A}\x{901B}\x{901C}\x{901D}\x{901E}\x{901F}' .
-'\x{9020}\x{9021}\x{9022}\x{9023}\x{9024}\x{9025}\x{9026}\x{9027}\x{9028}' .
-'\x{9029}\x{902B}\x{902D}\x{902E}\x{902F}\x{9030}\x{9031}\x{9032}\x{9033}' .
-'\x{9034}\x{9035}\x{9036}\x{9038}\x{903A}\x{903B}\x{903C}\x{903D}\x{903E}' .
-'\x{903F}\x{9041}\x{9042}\x{9043}\x{9044}\x{9045}\x{9047}\x{9048}\x{9049}' .
-'\x{904A}\x{904B}\x{904C}\x{904D}\x{904E}\x{904F}\x{9050}\x{9051}\x{9052}' .
-'\x{9053}\x{9054}\x{9055}\x{9056}\x{9057}\x{9058}\x{9059}\x{905A}\x{905B}' .
-'\x{905C}\x{905D}\x{905E}\x{905F}\x{9060}\x{9061}\x{9062}\x{9063}\x{9064}' .
-'\x{9065}\x{9066}\x{9067}\x{9068}\x{9069}\x{906A}\x{906B}\x{906C}\x{906D}' .
-'\x{906E}\x{906F}\x{9070}\x{9071}\x{9072}\x{9073}\x{9074}\x{9075}\x{9076}' .
-'\x{9077}\x{9078}\x{9079}\x{907A}\x{907B}\x{907C}\x{907D}\x{907E}\x{907F}' .
-'\x{9080}\x{9081}\x{9082}\x{9083}\x{9084}\x{9085}\x{9086}\x{9087}\x{9088}' .
-'\x{9089}\x{908A}\x{908B}\x{908C}\x{908D}\x{908E}\x{908F}\x{9090}\x{9091}' .
-'\x{9092}\x{9093}\x{9094}\x{9095}\x{9096}\x{9097}\x{9098}\x{9099}\x{909A}' .
-'\x{909B}\x{909C}\x{909D}\x{909E}\x{909F}\x{90A0}\x{90A1}\x{90A2}\x{90A3}' .
-'\x{90A4}\x{90A5}\x{90A6}\x{90A7}\x{90A8}\x{90A9}\x{90AA}\x{90AC}\x{90AD}' .
-'\x{90AE}\x{90AF}\x{90B0}\x{90B1}\x{90B2}\x{90B3}\x{90B4}\x{90B5}\x{90B6}' .
-'\x{90B7}\x{90B8}\x{90B9}\x{90BA}\x{90BB}\x{90BC}\x{90BD}\x{90BE}\x{90BF}' .
-'\x{90C0}\x{90C1}\x{90C2}\x{90C3}\x{90C4}\x{90C5}\x{90C6}\x{90C7}\x{90C8}' .
-'\x{90C9}\x{90CA}\x{90CB}\x{90CE}\x{90CF}\x{90D0}\x{90D1}\x{90D3}\x{90D4}' .
-'\x{90D5}\x{90D6}\x{90D7}\x{90D8}\x{90D9}\x{90DA}\x{90DB}\x{90DC}\x{90DD}' .
-'\x{90DE}\x{90DF}\x{90E0}\x{90E1}\x{90E2}\x{90E3}\x{90E4}\x{90E5}\x{90E6}' .
-'\x{90E7}\x{90E8}\x{90E9}\x{90EA}\x{90EB}\x{90EC}\x{90ED}\x{90EE}\x{90EF}' .
-'\x{90F0}\x{90F1}\x{90F2}\x{90F3}\x{90F4}\x{90F5}\x{90F7}\x{90F8}\x{90F9}' .
-'\x{90FA}\x{90FB}\x{90FC}\x{90FD}\x{90FE}\x{90FF}\x{9100}\x{9101}\x{9102}' .
-'\x{9103}\x{9104}\x{9105}\x{9106}\x{9107}\x{9108}\x{9109}\x{910B}\x{910C}' .
-'\x{910D}\x{910E}\x{910F}\x{9110}\x{9111}\x{9112}\x{9113}\x{9114}\x{9115}' .
-'\x{9116}\x{9117}\x{9118}\x{9119}\x{911A}\x{911B}\x{911C}\x{911D}\x{911E}' .
-'\x{911F}\x{9120}\x{9121}\x{9122}\x{9123}\x{9124}\x{9125}\x{9126}\x{9127}' .
-'\x{9128}\x{9129}\x{912A}\x{912B}\x{912C}\x{912D}\x{912E}\x{912F}\x{9130}' .
-'\x{9131}\x{9132}\x{9133}\x{9134}\x{9135}\x{9136}\x{9137}\x{9138}\x{9139}' .
-'\x{913A}\x{913B}\x{913E}\x{913F}\x{9140}\x{9141}\x{9142}\x{9143}\x{9144}' .
-'\x{9145}\x{9146}\x{9147}\x{9148}\x{9149}\x{914A}\x{914B}\x{914C}\x{914D}' .
-'\x{914E}\x{914F}\x{9150}\x{9151}\x{9152}\x{9153}\x{9154}\x{9155}\x{9156}' .
-'\x{9157}\x{9158}\x{915A}\x{915B}\x{915C}\x{915D}\x{915E}\x{915F}\x{9160}' .
-'\x{9161}\x{9162}\x{9163}\x{9164}\x{9165}\x{9166}\x{9167}\x{9168}\x{9169}' .
-'\x{916A}\x{916B}\x{916C}\x{916D}\x{916E}\x{916F}\x{9170}\x{9171}\x{9172}' .
-'\x{9173}\x{9174}\x{9175}\x{9176}\x{9177}\x{9178}\x{9179}\x{917A}\x{917C}' .
-'\x{917D}\x{917E}\x{917F}\x{9180}\x{9181}\x{9182}\x{9183}\x{9184}\x{9185}' .
-'\x{9186}\x{9187}\x{9188}\x{9189}\x{918A}\x{918B}\x{918C}\x{918D}\x{918E}' .
-'\x{918F}\x{9190}\x{9191}\x{9192}\x{9193}\x{9194}\x{9196}\x{9199}\x{919A}' .
-'\x{919B}\x{919C}\x{919D}\x{919E}\x{919F}\x{91A0}\x{91A1}\x{91A2}\x{91A3}' .
-'\x{91A5}\x{91A6}\x{91A7}\x{91A8}\x{91AA}\x{91AB}\x{91AC}\x{91AD}\x{91AE}' .
-'\x{91AF}\x{91B0}\x{91B1}\x{91B2}\x{91B3}\x{91B4}\x{91B5}\x{91B6}\x{91B7}' .
-'\x{91B9}\x{91BA}\x{91BB}\x{91BC}\x{91BD}\x{91BE}\x{91C0}\x{91C1}\x{91C2}' .
-'\x{91C3}\x{91C5}\x{91C6}\x{91C7}\x{91C9}\x{91CA}\x{91CB}\x{91CC}\x{91CD}' .
-'\x{91CE}\x{91CF}\x{91D0}\x{91D1}\x{91D2}\x{91D3}\x{91D4}\x{91D5}\x{91D7}' .
-'\x{91D8}\x{91D9}\x{91DA}\x{91DB}\x{91DC}\x{91DD}\x{91DE}\x{91DF}\x{91E2}' .
-'\x{91E3}\x{91E4}\x{91E5}\x{91E6}\x{91E7}\x{91E8}\x{91E9}\x{91EA}\x{91EB}' .
-'\x{91EC}\x{91ED}\x{91EE}\x{91F0}\x{91F1}\x{91F2}\x{91F3}\x{91F4}\x{91F5}' .
-'\x{91F7}\x{91F8}\x{91F9}\x{91FA}\x{91FB}\x{91FD}\x{91FE}\x{91FF}\x{9200}' .
-'\x{9201}\x{9202}\x{9203}\x{9204}\x{9205}\x{9206}\x{9207}\x{9208}\x{9209}' .
-'\x{920A}\x{920B}\x{920C}\x{920D}\x{920E}\x{920F}\x{9210}\x{9211}\x{9212}' .
-'\x{9214}\x{9215}\x{9216}\x{9217}\x{9218}\x{9219}\x{921A}\x{921B}\x{921C}' .
-'\x{921D}\x{921E}\x{9220}\x{9221}\x{9223}\x{9224}\x{9225}\x{9226}\x{9227}' .
-'\x{9228}\x{9229}\x{922A}\x{922B}\x{922D}\x{922E}\x{922F}\x{9230}\x{9231}' .
-'\x{9232}\x{9233}\x{9234}\x{9235}\x{9236}\x{9237}\x{9238}\x{9239}\x{923A}' .
-'\x{923B}\x{923C}\x{923D}\x{923E}\x{923F}\x{9240}\x{9241}\x{9242}\x{9245}' .
-'\x{9246}\x{9247}\x{9248}\x{9249}\x{924A}\x{924B}\x{924C}\x{924D}\x{924E}' .
-'\x{924F}\x{9250}\x{9251}\x{9252}\x{9253}\x{9254}\x{9255}\x{9256}\x{9257}' .
-'\x{9258}\x{9259}\x{925A}\x{925B}\x{925C}\x{925D}\x{925E}\x{925F}\x{9260}' .
-'\x{9261}\x{9262}\x{9263}\x{9264}\x{9265}\x{9266}\x{9267}\x{9268}\x{926B}' .
-'\x{926C}\x{926D}\x{926E}\x{926F}\x{9270}\x{9272}\x{9273}\x{9274}\x{9275}' .
-'\x{9276}\x{9277}\x{9278}\x{9279}\x{927A}\x{927B}\x{927C}\x{927D}\x{927E}' .
-'\x{927F}\x{9280}\x{9282}\x{9283}\x{9285}\x{9286}\x{9287}\x{9288}\x{9289}' .
-'\x{928A}\x{928B}\x{928C}\x{928D}\x{928E}\x{928F}\x{9290}\x{9291}\x{9292}' .
-'\x{9293}\x{9294}\x{9295}\x{9296}\x{9297}\x{9298}\x{9299}\x{929A}\x{929B}' .
-'\x{929C}\x{929D}\x{929F}\x{92A0}\x{92A1}\x{92A2}\x{92A3}\x{92A4}\x{92A5}' .
-'\x{92A6}\x{92A7}\x{92A8}\x{92A9}\x{92AA}\x{92AB}\x{92AC}\x{92AD}\x{92AE}' .
-'\x{92AF}\x{92B0}\x{92B1}\x{92B2}\x{92B3}\x{92B4}\x{92B5}\x{92B6}\x{92B7}' .
-'\x{92B8}\x{92B9}\x{92BA}\x{92BB}\x{92BC}\x{92BE}\x{92BF}\x{92C0}\x{92C1}' .
-'\x{92C2}\x{92C3}\x{92C4}\x{92C5}\x{92C6}\x{92C7}\x{92C8}\x{92C9}\x{92CA}' .
-'\x{92CB}\x{92CC}\x{92CD}\x{92CE}\x{92CF}\x{92D0}\x{92D1}\x{92D2}\x{92D3}' .
-'\x{92D5}\x{92D6}\x{92D7}\x{92D8}\x{92D9}\x{92DA}\x{92DC}\x{92DD}\x{92DE}' .
-'\x{92DF}\x{92E0}\x{92E1}\x{92E3}\x{92E4}\x{92E5}\x{92E6}\x{92E7}\x{92E8}' .
-'\x{92E9}\x{92EA}\x{92EB}\x{92EC}\x{92ED}\x{92EE}\x{92EF}\x{92F0}\x{92F1}' .
-'\x{92F2}\x{92F3}\x{92F4}\x{92F5}\x{92F6}\x{92F7}\x{92F8}\x{92F9}\x{92FA}' .
-'\x{92FB}\x{92FC}\x{92FD}\x{92FE}\x{92FF}\x{9300}\x{9301}\x{9302}\x{9303}' .
-'\x{9304}\x{9305}\x{9306}\x{9307}\x{9308}\x{9309}\x{930A}\x{930B}\x{930C}' .
-'\x{930D}\x{930E}\x{930F}\x{9310}\x{9311}\x{9312}\x{9313}\x{9314}\x{9315}' .
-'\x{9316}\x{9317}\x{9318}\x{9319}\x{931A}\x{931B}\x{931D}\x{931E}\x{931F}' .
-'\x{9320}\x{9321}\x{9322}\x{9323}\x{9324}\x{9325}\x{9326}\x{9327}\x{9328}' .
-'\x{9329}\x{932A}\x{932B}\x{932D}\x{932E}\x{932F}\x{9332}\x{9333}\x{9334}' .
-'\x{9335}\x{9336}\x{9337}\x{9338}\x{9339}\x{933A}\x{933B}\x{933C}\x{933D}' .
-'\x{933E}\x{933F}\x{9340}\x{9341}\x{9342}\x{9343}\x{9344}\x{9345}\x{9346}' .
-'\x{9347}\x{9348}\x{9349}\x{934A}\x{934B}\x{934C}\x{934D}\x{934E}\x{934F}' .
-'\x{9350}\x{9351}\x{9352}\x{9353}\x{9354}\x{9355}\x{9356}\x{9357}\x{9358}' .
-'\x{9359}\x{935A}\x{935B}\x{935C}\x{935D}\x{935E}\x{935F}\x{9360}\x{9361}' .
-'\x{9363}\x{9364}\x{9365}\x{9366}\x{9367}\x{9369}\x{936A}\x{936C}\x{936D}' .
-'\x{936E}\x{9370}\x{9371}\x{9372}\x{9374}\x{9375}\x{9376}\x{9377}\x{9379}' .
-'\x{937A}\x{937B}\x{937C}\x{937D}\x{937E}\x{9380}\x{9382}\x{9383}\x{9384}' .
-'\x{9385}\x{9386}\x{9387}\x{9388}\x{9389}\x{938A}\x{938C}\x{938D}\x{938E}' .
-'\x{938F}\x{9390}\x{9391}\x{9392}\x{9393}\x{9394}\x{9395}\x{9396}\x{9397}' .
-'\x{9398}\x{9399}\x{939A}\x{939B}\x{939D}\x{939E}\x{939F}\x{93A1}\x{93A2}' .
-'\x{93A3}\x{93A4}\x{93A5}\x{93A6}\x{93A7}\x{93A8}\x{93A9}\x{93AA}\x{93AC}' .
-'\x{93AD}\x{93AE}\x{93AF}\x{93B0}\x{93B1}\x{93B2}\x{93B3}\x{93B4}\x{93B5}' .
-'\x{93B6}\x{93B7}\x{93B8}\x{93B9}\x{93BA}\x{93BC}\x{93BD}\x{93BE}\x{93BF}' .
-'\x{93C0}\x{93C1}\x{93C2}\x{93C3}\x{93C4}\x{93C5}\x{93C6}\x{93C7}\x{93C8}' .
-'\x{93C9}\x{93CA}\x{93CB}\x{93CC}\x{93CD}\x{93CE}\x{93CF}\x{93D0}\x{93D1}' .
-'\x{93D2}\x{93D3}\x{93D4}\x{93D5}\x{93D6}\x{93D7}\x{93D8}\x{93D9}\x{93DA}' .
-'\x{93DB}\x{93DC}\x{93DD}\x{93DE}\x{93DF}\x{93E1}\x{93E2}\x{93E3}\x{93E4}' .
-'\x{93E6}\x{93E7}\x{93E8}\x{93E9}\x{93EA}\x{93EB}\x{93EC}\x{93ED}\x{93EE}' .
-'\x{93EF}\x{93F0}\x{93F1}\x{93F2}\x{93F4}\x{93F5}\x{93F6}\x{93F7}\x{93F8}' .
-'\x{93F9}\x{93FA}\x{93FB}\x{93FC}\x{93FD}\x{93FE}\x{93FF}\x{9400}\x{9401}' .
-'\x{9403}\x{9404}\x{9405}\x{9406}\x{9407}\x{9408}\x{9409}\x{940A}\x{940B}' .
-'\x{940C}\x{940D}\x{940E}\x{940F}\x{9410}\x{9411}\x{9412}\x{9413}\x{9414}' .
-'\x{9415}\x{9416}\x{9418}\x{9419}\x{941B}\x{941D}\x{9420}\x{9422}\x{9423}' .
-'\x{9425}\x{9426}\x{9427}\x{9428}\x{9429}\x{942A}\x{942B}\x{942C}\x{942D}' .
-'\x{942E}\x{942F}\x{9430}\x{9431}\x{9432}\x{9433}\x{9434}\x{9435}\x{9436}' .
-'\x{9437}\x{9438}\x{9439}\x{943A}\x{943B}\x{943C}\x{943D}\x{943E}\x{943F}' .
-'\x{9440}\x{9441}\x{9442}\x{9444}\x{9445}\x{9446}\x{9447}\x{9448}\x{9449}' .
-'\x{944A}\x{944B}\x{944C}\x{944D}\x{944F}\x{9450}\x{9451}\x{9452}\x{9453}' .
-'\x{9454}\x{9455}\x{9456}\x{9457}\x{9458}\x{9459}\x{945B}\x{945C}\x{945D}' .
-'\x{945E}\x{945F}\x{9460}\x{9461}\x{9462}\x{9463}\x{9464}\x{9465}\x{9466}' .
-'\x{9467}\x{9468}\x{9469}\x{946A}\x{946B}\x{946D}\x{946E}\x{946F}\x{9470}' .
-'\x{9471}\x{9472}\x{9473}\x{9474}\x{9475}\x{9476}\x{9477}\x{9478}\x{9479}' .
-'\x{947A}\x{947C}\x{947D}\x{947E}\x{947F}\x{9480}\x{9481}\x{9482}\x{9483}' .
-'\x{9484}\x{9485}\x{9486}\x{9487}\x{9488}\x{9489}\x{948A}\x{948B}\x{948C}' .
-'\x{948D}\x{948E}\x{948F}\x{9490}\x{9491}\x{9492}\x{9493}\x{9494}\x{9495}' .
-'\x{9496}\x{9497}\x{9498}\x{9499}\x{949A}\x{949B}\x{949C}\x{949D}\x{949E}' .
-'\x{949F}\x{94A0}\x{94A1}\x{94A2}\x{94A3}\x{94A4}\x{94A5}\x{94A6}\x{94A7}' .
-'\x{94A8}\x{94A9}\x{94AA}\x{94AB}\x{94AC}\x{94AD}\x{94AE}\x{94AF}\x{94B0}' .
-'\x{94B1}\x{94B2}\x{94B3}\x{94B4}\x{94B5}\x{94B6}\x{94B7}\x{94B8}\x{94B9}' .
-'\x{94BA}\x{94BB}\x{94BC}\x{94BD}\x{94BE}\x{94BF}\x{94C0}\x{94C1}\x{94C2}' .
-'\x{94C3}\x{94C4}\x{94C5}\x{94C6}\x{94C7}\x{94C8}\x{94C9}\x{94CA}\x{94CB}' .
-'\x{94CC}\x{94CD}\x{94CE}\x{94CF}\x{94D0}\x{94D1}\x{94D2}\x{94D3}\x{94D4}' .
-'\x{94D5}\x{94D6}\x{94D7}\x{94D8}\x{94D9}\x{94DA}\x{94DB}\x{94DC}\x{94DD}' .
-'\x{94DE}\x{94DF}\x{94E0}\x{94E1}\x{94E2}\x{94E3}\x{94E4}\x{94E5}\x{94E6}' .
-'\x{94E7}\x{94E8}\x{94E9}\x{94EA}\x{94EB}\x{94EC}\x{94ED}\x{94EE}\x{94EF}' .
-'\x{94F0}\x{94F1}\x{94F2}\x{94F3}\x{94F4}\x{94F5}\x{94F6}\x{94F7}\x{94F8}' .
-'\x{94F9}\x{94FA}\x{94FB}\x{94FC}\x{94FD}\x{94FE}\x{94FF}\x{9500}\x{9501}' .
-'\x{9502}\x{9503}\x{9504}\x{9505}\x{9506}\x{9507}\x{9508}\x{9509}\x{950A}' .
-'\x{950B}\x{950C}\x{950D}\x{950E}\x{950F}\x{9510}\x{9511}\x{9512}\x{9513}' .
-'\x{9514}\x{9515}\x{9516}\x{9517}\x{9518}\x{9519}\x{951A}\x{951B}\x{951C}' .
-'\x{951D}\x{951E}\x{951F}\x{9520}\x{9521}\x{9522}\x{9523}\x{9524}\x{9525}' .
-'\x{9526}\x{9527}\x{9528}\x{9529}\x{952A}\x{952B}\x{952C}\x{952D}\x{952E}' .
-'\x{952F}\x{9530}\x{9531}\x{9532}\x{9533}\x{9534}\x{9535}\x{9536}\x{9537}' .
-'\x{9538}\x{9539}\x{953A}\x{953B}\x{953C}\x{953D}\x{953E}\x{953F}\x{9540}' .
-'\x{9541}\x{9542}\x{9543}\x{9544}\x{9545}\x{9546}\x{9547}\x{9548}\x{9549}' .
-'\x{954A}\x{954B}\x{954C}\x{954D}\x{954E}\x{954F}\x{9550}\x{9551}\x{9552}' .
-'\x{9553}\x{9554}\x{9555}\x{9556}\x{9557}\x{9558}\x{9559}\x{955A}\x{955B}' .
-'\x{955C}\x{955D}\x{955E}\x{955F}\x{9560}\x{9561}\x{9562}\x{9563}\x{9564}' .
-'\x{9565}\x{9566}\x{9567}\x{9568}\x{9569}\x{956A}\x{956B}\x{956C}\x{956D}' .
-'\x{956E}\x{956F}\x{9570}\x{9571}\x{9572}\x{9573}\x{9574}\x{9575}\x{9576}' .
-'\x{9577}\x{957A}\x{957B}\x{957C}\x{957D}\x{957F}\x{9580}\x{9581}\x{9582}' .
-'\x{9583}\x{9584}\x{9586}\x{9587}\x{9588}\x{9589}\x{958A}\x{958B}\x{958C}' .
-'\x{958D}\x{958E}\x{958F}\x{9590}\x{9591}\x{9592}\x{9593}\x{9594}\x{9595}' .
-'\x{9596}\x{9598}\x{9599}\x{959A}\x{959B}\x{959C}\x{959D}\x{959E}\x{959F}' .
-'\x{95A1}\x{95A2}\x{95A3}\x{95A4}\x{95A5}\x{95A6}\x{95A7}\x{95A8}\x{95A9}' .
-'\x{95AA}\x{95AB}\x{95AC}\x{95AD}\x{95AE}\x{95AF}\x{95B0}\x{95B1}\x{95B2}' .
-'\x{95B5}\x{95B6}\x{95B7}\x{95B9}\x{95BA}\x{95BB}\x{95BC}\x{95BD}\x{95BE}' .
-'\x{95BF}\x{95C0}\x{95C2}\x{95C3}\x{95C4}\x{95C5}\x{95C6}\x{95C7}\x{95C8}' .
-'\x{95C9}\x{95CA}\x{95CB}\x{95CC}\x{95CD}\x{95CE}\x{95CF}\x{95D0}\x{95D1}' .
-'\x{95D2}\x{95D3}\x{95D4}\x{95D5}\x{95D6}\x{95D7}\x{95D8}\x{95DA}\x{95DB}' .
-'\x{95DC}\x{95DE}\x{95DF}\x{95E0}\x{95E1}\x{95E2}\x{95E3}\x{95E4}\x{95E5}' .
-'\x{95E6}\x{95E7}\x{95E8}\x{95E9}\x{95EA}\x{95EB}\x{95EC}\x{95ED}\x{95EE}' .
-'\x{95EF}\x{95F0}\x{95F1}\x{95F2}\x{95F3}\x{95F4}\x{95F5}\x{95F6}\x{95F7}' .
-'\x{95F8}\x{95F9}\x{95FA}\x{95FB}\x{95FC}\x{95FD}\x{95FE}\x{95FF}\x{9600}' .
-'\x{9601}\x{9602}\x{9603}\x{9604}\x{9605}\x{9606}\x{9607}\x{9608}\x{9609}' .
-'\x{960A}\x{960B}\x{960C}\x{960D}\x{960E}\x{960F}\x{9610}\x{9611}\x{9612}' .
-'\x{9613}\x{9614}\x{9615}\x{9616}\x{9617}\x{9618}\x{9619}\x{961A}\x{961B}' .
-'\x{961C}\x{961D}\x{961E}\x{961F}\x{9620}\x{9621}\x{9622}\x{9623}\x{9624}' .
-'\x{9627}\x{9628}\x{962A}\x{962B}\x{962C}\x{962D}\x{962E}\x{962F}\x{9630}' .
-'\x{9631}\x{9632}\x{9633}\x{9634}\x{9635}\x{9636}\x{9637}\x{9638}\x{9639}' .
-'\x{963A}\x{963B}\x{963C}\x{963D}\x{963F}\x{9640}\x{9641}\x{9642}\x{9643}' .
-'\x{9644}\x{9645}\x{9646}\x{9647}\x{9648}\x{9649}\x{964A}\x{964B}\x{964C}' .
-'\x{964D}\x{964E}\x{964F}\x{9650}\x{9651}\x{9652}\x{9653}\x{9654}\x{9655}' .
-'\x{9658}\x{9659}\x{965A}\x{965B}\x{965C}\x{965D}\x{965E}\x{965F}\x{9660}' .
-'\x{9661}\x{9662}\x{9663}\x{9664}\x{9666}\x{9667}\x{9668}\x{9669}\x{966A}' .
-'\x{966B}\x{966C}\x{966D}\x{966E}\x{966F}\x{9670}\x{9671}\x{9672}\x{9673}' .
-'\x{9674}\x{9675}\x{9676}\x{9677}\x{9678}\x{967C}\x{967D}\x{967E}\x{9680}' .
-'\x{9683}\x{9684}\x{9685}\x{9686}\x{9687}\x{9688}\x{9689}\x{968A}\x{968B}' .
-'\x{968D}\x{968E}\x{968F}\x{9690}\x{9691}\x{9692}\x{9693}\x{9694}\x{9695}' .
-'\x{9697}\x{9698}\x{9699}\x{969B}\x{969C}\x{969E}\x{96A0}\x{96A1}\x{96A2}' .
-'\x{96A3}\x{96A4}\x{96A5}\x{96A6}\x{96A7}\x{96A8}\x{96A9}\x{96AA}\x{96AC}' .
-'\x{96AD}\x{96AE}\x{96B0}\x{96B1}\x{96B3}\x{96B4}\x{96B6}\x{96B7}\x{96B8}' .
-'\x{96B9}\x{96BA}\x{96BB}\x{96BC}\x{96BD}\x{96BE}\x{96BF}\x{96C0}\x{96C1}' .
-'\x{96C2}\x{96C3}\x{96C4}\x{96C5}\x{96C6}\x{96C7}\x{96C8}\x{96C9}\x{96CA}' .
-'\x{96CB}\x{96CC}\x{96CD}\x{96CE}\x{96CF}\x{96D0}\x{96D1}\x{96D2}\x{96D3}' .
-'\x{96D4}\x{96D5}\x{96D6}\x{96D7}\x{96D8}\x{96D9}\x{96DA}\x{96DB}\x{96DC}' .
-'\x{96DD}\x{96DE}\x{96DF}\x{96E0}\x{96E1}\x{96E2}\x{96E3}\x{96E5}\x{96E8}' .
-'\x{96E9}\x{96EA}\x{96EB}\x{96EC}\x{96ED}\x{96EE}\x{96EF}\x{96F0}\x{96F1}' .
-'\x{96F2}\x{96F3}\x{96F4}\x{96F5}\x{96F6}\x{96F7}\x{96F8}\x{96F9}\x{96FA}' .
-'\x{96FB}\x{96FD}\x{96FE}\x{96FF}\x{9700}\x{9701}\x{9702}\x{9703}\x{9704}' .
-'\x{9705}\x{9706}\x{9707}\x{9708}\x{9709}\x{970A}\x{970B}\x{970C}\x{970D}' .
-'\x{970E}\x{970F}\x{9710}\x{9711}\x{9712}\x{9713}\x{9715}\x{9716}\x{9718}' .
-'\x{9719}\x{971C}\x{971D}\x{971E}\x{971F}\x{9720}\x{9721}\x{9722}\x{9723}' .
-'\x{9724}\x{9725}\x{9726}\x{9727}\x{9728}\x{9729}\x{972A}\x{972B}\x{972C}' .
-'\x{972D}\x{972E}\x{972F}\x{9730}\x{9731}\x{9732}\x{9735}\x{9736}\x{9738}' .
-'\x{9739}\x{973A}\x{973B}\x{973C}\x{973D}\x{973E}\x{973F}\x{9742}\x{9743}' .
-'\x{9744}\x{9745}\x{9746}\x{9747}\x{9748}\x{9749}\x{974A}\x{974B}\x{974C}' .
-'\x{974E}\x{974F}\x{9750}\x{9751}\x{9752}\x{9753}\x{9754}\x{9755}\x{9756}' .
-'\x{9758}\x{9759}\x{975A}\x{975B}\x{975C}\x{975D}\x{975E}\x{975F}\x{9760}' .
-'\x{9761}\x{9762}\x{9765}\x{9766}\x{9767}\x{9768}\x{9769}\x{976A}\x{976B}' .
-'\x{976C}\x{976D}\x{976E}\x{976F}\x{9770}\x{9772}\x{9773}\x{9774}\x{9776}' .
-'\x{9777}\x{9778}\x{9779}\x{977A}\x{977B}\x{977C}\x{977D}\x{977E}\x{977F}' .
-'\x{9780}\x{9781}\x{9782}\x{9783}\x{9784}\x{9785}\x{9786}\x{9788}\x{978A}' .
-'\x{978B}\x{978C}\x{978D}\x{978E}\x{978F}\x{9790}\x{9791}\x{9792}\x{9793}' .
-'\x{9794}\x{9795}\x{9796}\x{9797}\x{9798}\x{9799}\x{979A}\x{979C}\x{979D}' .
-'\x{979E}\x{979F}\x{97A0}\x{97A1}\x{97A2}\x{97A3}\x{97A4}\x{97A5}\x{97A6}' .
-'\x{97A7}\x{97A8}\x{97AA}\x{97AB}\x{97AC}\x{97AD}\x{97AE}\x{97AF}\x{97B2}' .
-'\x{97B3}\x{97B4}\x{97B6}\x{97B7}\x{97B8}\x{97B9}\x{97BA}\x{97BB}\x{97BC}' .
-'\x{97BD}\x{97BF}\x{97C1}\x{97C2}\x{97C3}\x{97C4}\x{97C5}\x{97C6}\x{97C7}' .
-'\x{97C8}\x{97C9}\x{97CA}\x{97CB}\x{97CC}\x{97CD}\x{97CE}\x{97CF}\x{97D0}' .
-'\x{97D1}\x{97D3}\x{97D4}\x{97D5}\x{97D6}\x{97D7}\x{97D8}\x{97D9}\x{97DA}' .
-'\x{97DB}\x{97DC}\x{97DD}\x{97DE}\x{97DF}\x{97E0}\x{97E1}\x{97E2}\x{97E3}' .
-'\x{97E4}\x{97E5}\x{97E6}\x{97E7}\x{97E8}\x{97E9}\x{97EA}\x{97EB}\x{97EC}' .
-'\x{97ED}\x{97EE}\x{97EF}\x{97F0}\x{97F1}\x{97F2}\x{97F3}\x{97F4}\x{97F5}' .
-'\x{97F6}\x{97F7}\x{97F8}\x{97F9}\x{97FA}\x{97FB}\x{97FD}\x{97FE}\x{97FF}' .
-'\x{9800}\x{9801}\x{9802}\x{9803}\x{9804}\x{9805}\x{9806}\x{9807}\x{9808}' .
-'\x{9809}\x{980A}\x{980B}\x{980C}\x{980D}\x{980E}\x{980F}\x{9810}\x{9811}' .
-'\x{9812}\x{9813}\x{9814}\x{9815}\x{9816}\x{9817}\x{9818}\x{9819}\x{981A}' .
-'\x{981B}\x{981C}\x{981D}\x{981E}\x{9820}\x{9821}\x{9822}\x{9823}\x{9824}' .
-'\x{9826}\x{9827}\x{9828}\x{9829}\x{982B}\x{982D}\x{982E}\x{982F}\x{9830}' .
-'\x{9831}\x{9832}\x{9834}\x{9835}\x{9836}\x{9837}\x{9838}\x{9839}\x{983B}' .
-'\x{983C}\x{983D}\x{983F}\x{9840}\x{9841}\x{9843}\x{9844}\x{9845}\x{9846}' .
-'\x{9848}\x{9849}\x{984A}\x{984C}\x{984D}\x{984E}\x{984F}\x{9850}\x{9851}' .
-'\x{9852}\x{9853}\x{9854}\x{9855}\x{9857}\x{9858}\x{9859}\x{985A}\x{985B}' .
-'\x{985C}\x{985D}\x{985E}\x{985F}\x{9860}\x{9861}\x{9862}\x{9863}\x{9864}' .
-'\x{9865}\x{9867}\x{9869}\x{986A}\x{986B}\x{986C}\x{986D}\x{986E}\x{986F}' .
-'\x{9870}\x{9871}\x{9872}\x{9873}\x{9874}\x{9875}\x{9876}\x{9877}\x{9878}' .
-'\x{9879}\x{987A}\x{987B}\x{987C}\x{987D}\x{987E}\x{987F}\x{9880}\x{9881}' .
-'\x{9882}\x{9883}\x{9884}\x{9885}\x{9886}\x{9887}\x{9888}\x{9889}\x{988A}' .
-'\x{988B}\x{988C}\x{988D}\x{988E}\x{988F}\x{9890}\x{9891}\x{9892}\x{9893}' .
-'\x{9894}\x{9895}\x{9896}\x{9897}\x{9898}\x{9899}\x{989A}\x{989B}\x{989C}' .
-'\x{989D}\x{989E}\x{989F}\x{98A0}\x{98A1}\x{98A2}\x{98A3}\x{98A4}\x{98A5}' .
-'\x{98A6}\x{98A7}\x{98A8}\x{98A9}\x{98AA}\x{98AB}\x{98AC}\x{98AD}\x{98AE}' .
-'\x{98AF}\x{98B0}\x{98B1}\x{98B2}\x{98B3}\x{98B4}\x{98B5}\x{98B6}\x{98B8}' .
-'\x{98B9}\x{98BA}\x{98BB}\x{98BC}\x{98BD}\x{98BE}\x{98BF}\x{98C0}\x{98C1}' .
-'\x{98C2}\x{98C3}\x{98C4}\x{98C5}\x{98C6}\x{98C8}\x{98C9}\x{98CB}\x{98CC}' .
-'\x{98CD}\x{98CE}\x{98CF}\x{98D0}\x{98D1}\x{98D2}\x{98D3}\x{98D4}\x{98D5}' .
-'\x{98D6}\x{98D7}\x{98D8}\x{98D9}\x{98DA}\x{98DB}\x{98DC}\x{98DD}\x{98DE}' .
-'\x{98DF}\x{98E0}\x{98E2}\x{98E3}\x{98E5}\x{98E6}\x{98E7}\x{98E8}\x{98E9}' .
-'\x{98EA}\x{98EB}\x{98ED}\x{98EF}\x{98F0}\x{98F2}\x{98F3}\x{98F4}\x{98F5}' .
-'\x{98F6}\x{98F7}\x{98F9}\x{98FA}\x{98FC}\x{98FD}\x{98FE}\x{98FF}\x{9900}' .
-'\x{9901}\x{9902}\x{9903}\x{9904}\x{9905}\x{9906}\x{9907}\x{9908}\x{9909}' .
-'\x{990A}\x{990B}\x{990C}\x{990D}\x{990E}\x{990F}\x{9910}\x{9911}\x{9912}' .
-'\x{9913}\x{9914}\x{9915}\x{9916}\x{9917}\x{9918}\x{991A}\x{991B}\x{991C}' .
-'\x{991D}\x{991E}\x{991F}\x{9920}\x{9921}\x{9922}\x{9923}\x{9924}\x{9925}' .
-'\x{9926}\x{9927}\x{9928}\x{9929}\x{992A}\x{992B}\x{992C}\x{992D}\x{992E}' .
-'\x{992F}\x{9930}\x{9931}\x{9932}\x{9933}\x{9934}\x{9935}\x{9936}\x{9937}' .
-'\x{9938}\x{9939}\x{993A}\x{993C}\x{993D}\x{993E}\x{993F}\x{9940}\x{9941}' .
-'\x{9942}\x{9943}\x{9945}\x{9946}\x{9947}\x{9948}\x{9949}\x{994A}\x{994B}' .
-'\x{994C}\x{994E}\x{994F}\x{9950}\x{9951}\x{9952}\x{9953}\x{9954}\x{9955}' .
-'\x{9956}\x{9957}\x{9958}\x{9959}\x{995B}\x{995C}\x{995E}\x{995F}\x{9960}' .
-'\x{9961}\x{9962}\x{9963}\x{9964}\x{9965}\x{9966}\x{9967}\x{9968}\x{9969}' .
-'\x{996A}\x{996B}\x{996C}\x{996D}\x{996E}\x{996F}\x{9970}\x{9971}\x{9972}' .
-'\x{9973}\x{9974}\x{9975}\x{9976}\x{9977}\x{9978}\x{9979}\x{997A}\x{997B}' .
-'\x{997C}\x{997D}\x{997E}\x{997F}\x{9980}\x{9981}\x{9982}\x{9983}\x{9984}' .
-'\x{9985}\x{9986}\x{9987}\x{9988}\x{9989}\x{998A}\x{998B}\x{998C}\x{998D}' .
-'\x{998E}\x{998F}\x{9990}\x{9991}\x{9992}\x{9993}\x{9994}\x{9995}\x{9996}' .
-'\x{9997}\x{9998}\x{9999}\x{999A}\x{999B}\x{999C}\x{999D}\x{999E}\x{999F}' .
-'\x{99A0}\x{99A1}\x{99A2}\x{99A3}\x{99A4}\x{99A5}\x{99A6}\x{99A7}\x{99A8}' .
-'\x{99A9}\x{99AA}\x{99AB}\x{99AC}\x{99AD}\x{99AE}\x{99AF}\x{99B0}\x{99B1}' .
-'\x{99B2}\x{99B3}\x{99B4}\x{99B5}\x{99B6}\x{99B7}\x{99B8}\x{99B9}\x{99BA}' .
-'\x{99BB}\x{99BC}\x{99BD}\x{99BE}\x{99C0}\x{99C1}\x{99C2}\x{99C3}\x{99C4}' .
-'\x{99C6}\x{99C7}\x{99C8}\x{99C9}\x{99CA}\x{99CB}\x{99CC}\x{99CD}\x{99CE}' .
-'\x{99CF}\x{99D0}\x{99D1}\x{99D2}\x{99D3}\x{99D4}\x{99D5}\x{99D6}\x{99D7}' .
-'\x{99D8}\x{99D9}\x{99DA}\x{99DB}\x{99DC}\x{99DD}\x{99DE}\x{99DF}\x{99E1}' .
-'\x{99E2}\x{99E3}\x{99E4}\x{99E5}\x{99E7}\x{99E8}\x{99E9}\x{99EA}\x{99EC}' .
-'\x{99ED}\x{99EE}\x{99EF}\x{99F0}\x{99F1}\x{99F2}\x{99F3}\x{99F4}\x{99F6}' .
-'\x{99F7}\x{99F8}\x{99F9}\x{99FA}\x{99FB}\x{99FC}\x{99FD}\x{99FE}\x{99FF}' .
-'\x{9A00}\x{9A01}\x{9A02}\x{9A03}\x{9A04}\x{9A05}\x{9A06}\x{9A07}\x{9A08}' .
-'\x{9A09}\x{9A0A}\x{9A0B}\x{9A0C}\x{9A0D}\x{9A0E}\x{9A0F}\x{9A11}\x{9A14}' .
-'\x{9A15}\x{9A16}\x{9A19}\x{9A1A}\x{9A1B}\x{9A1C}\x{9A1D}\x{9A1E}\x{9A1F}' .
-'\x{9A20}\x{9A21}\x{9A22}\x{9A23}\x{9A24}\x{9A25}\x{9A26}\x{9A27}\x{9A29}' .
-'\x{9A2A}\x{9A2B}\x{9A2C}\x{9A2D}\x{9A2E}\x{9A2F}\x{9A30}\x{9A31}\x{9A32}' .
-'\x{9A33}\x{9A34}\x{9A35}\x{9A36}\x{9A37}\x{9A38}\x{9A39}\x{9A3A}\x{9A3C}' .
-'\x{9A3D}\x{9A3E}\x{9A3F}\x{9A40}\x{9A41}\x{9A42}\x{9A43}\x{9A44}\x{9A45}' .
-'\x{9A46}\x{9A47}\x{9A48}\x{9A49}\x{9A4A}\x{9A4B}\x{9A4C}\x{9A4D}\x{9A4E}' .
-'\x{9A4F}\x{9A50}\x{9A52}\x{9A53}\x{9A54}\x{9A55}\x{9A56}\x{9A57}\x{9A59}' .
-'\x{9A5A}\x{9A5B}\x{9A5C}\x{9A5E}\x{9A5F}\x{9A60}\x{9A61}\x{9A62}\x{9A64}' .
-'\x{9A65}\x{9A66}\x{9A67}\x{9A68}\x{9A69}\x{9A6A}\x{9A6B}\x{9A6C}\x{9A6D}' .
-'\x{9A6E}\x{9A6F}\x{9A70}\x{9A71}\x{9A72}\x{9A73}\x{9A74}\x{9A75}\x{9A76}' .
-'\x{9A77}\x{9A78}\x{9A79}\x{9A7A}\x{9A7B}\x{9A7C}\x{9A7D}\x{9A7E}\x{9A7F}' .
-'\x{9A80}\x{9A81}\x{9A82}\x{9A83}\x{9A84}\x{9A85}\x{9A86}\x{9A87}\x{9A88}' .
-'\x{9A89}\x{9A8A}\x{9A8B}\x{9A8C}\x{9A8D}\x{9A8E}\x{9A8F}\x{9A90}\x{9A91}' .
-'\x{9A92}\x{9A93}\x{9A94}\x{9A95}\x{9A96}\x{9A97}\x{9A98}\x{9A99}\x{9A9A}' .
-'\x{9A9B}\x{9A9C}\x{9A9D}\x{9A9E}\x{9A9F}\x{9AA0}\x{9AA1}\x{9AA2}\x{9AA3}' .
-'\x{9AA4}\x{9AA5}\x{9AA6}\x{9AA7}\x{9AA8}\x{9AAA}\x{9AAB}\x{9AAC}\x{9AAD}' .
-'\x{9AAE}\x{9AAF}\x{9AB0}\x{9AB1}\x{9AB2}\x{9AB3}\x{9AB4}\x{9AB5}\x{9AB6}' .
-'\x{9AB7}\x{9AB8}\x{9AB9}\x{9ABA}\x{9ABB}\x{9ABC}\x{9ABE}\x{9ABF}\x{9AC0}' .
-'\x{9AC1}\x{9AC2}\x{9AC3}\x{9AC4}\x{9AC5}\x{9AC6}\x{9AC7}\x{9AC9}\x{9ACA}' .
-'\x{9ACB}\x{9ACC}\x{9ACD}\x{9ACE}\x{9ACF}\x{9AD0}\x{9AD1}\x{9AD2}\x{9AD3}' .
-'\x{9AD4}\x{9AD5}\x{9AD6}\x{9AD8}\x{9AD9}\x{9ADA}\x{9ADB}\x{9ADC}\x{9ADD}' .
-'\x{9ADE}\x{9ADF}\x{9AE1}\x{9AE2}\x{9AE3}\x{9AE5}\x{9AE6}\x{9AE7}\x{9AEA}' .
-'\x{9AEB}\x{9AEC}\x{9AED}\x{9AEE}\x{9AEF}\x{9AF1}\x{9AF2}\x{9AF3}\x{9AF4}' .
-'\x{9AF5}\x{9AF6}\x{9AF7}\x{9AF8}\x{9AF9}\x{9AFA}\x{9AFB}\x{9AFC}\x{9AFD}' .
-'\x{9AFE}\x{9AFF}\x{9B01}\x{9B03}\x{9B04}\x{9B05}\x{9B06}\x{9B07}\x{9B08}' .
-'\x{9B0A}\x{9B0B}\x{9B0C}\x{9B0D}\x{9B0E}\x{9B0F}\x{9B10}\x{9B11}\x{9B12}' .
-'\x{9B13}\x{9B15}\x{9B16}\x{9B17}\x{9B18}\x{9B19}\x{9B1A}\x{9B1C}\x{9B1D}' .
-'\x{9B1E}\x{9B1F}\x{9B20}\x{9B21}\x{9B22}\x{9B23}\x{9B24}\x{9B25}\x{9B26}' .
-'\x{9B27}\x{9B28}\x{9B29}\x{9B2A}\x{9B2B}\x{9B2C}\x{9B2D}\x{9B2E}\x{9B2F}' .
-'\x{9B30}\x{9B31}\x{9B32}\x{9B33}\x{9B35}\x{9B36}\x{9B37}\x{9B38}\x{9B39}' .
-'\x{9B3A}\x{9B3B}\x{9B3C}\x{9B3E}\x{9B3F}\x{9B41}\x{9B42}\x{9B43}\x{9B44}' .
-'\x{9B45}\x{9B46}\x{9B47}\x{9B48}\x{9B49}\x{9B4A}\x{9B4B}\x{9B4C}\x{9B4D}' .
-'\x{9B4E}\x{9B4F}\x{9B51}\x{9B52}\x{9B53}\x{9B54}\x{9B55}\x{9B56}\x{9B58}' .
-'\x{9B59}\x{9B5A}\x{9B5B}\x{9B5C}\x{9B5D}\x{9B5E}\x{9B5F}\x{9B60}\x{9B61}' .
-'\x{9B63}\x{9B64}\x{9B65}\x{9B66}\x{9B67}\x{9B68}\x{9B69}\x{9B6A}\x{9B6B}' .
-'\x{9B6C}\x{9B6D}\x{9B6E}\x{9B6F}\x{9B70}\x{9B71}\x{9B73}\x{9B74}\x{9B75}' .
-'\x{9B76}\x{9B77}\x{9B78}\x{9B79}\x{9B7A}\x{9B7B}\x{9B7C}\x{9B7D}\x{9B7E}' .
-'\x{9B7F}\x{9B80}\x{9B81}\x{9B82}\x{9B83}\x{9B84}\x{9B85}\x{9B86}\x{9B87}' .
-'\x{9B88}\x{9B8A}\x{9B8B}\x{9B8D}\x{9B8E}\x{9B8F}\x{9B90}\x{9B91}\x{9B92}' .
-'\x{9B93}\x{9B94}\x{9B95}\x{9B96}\x{9B97}\x{9B98}\x{9B9A}\x{9B9B}\x{9B9C}' .
-'\x{9B9D}\x{9B9E}\x{9B9F}\x{9BA0}\x{9BA1}\x{9BA2}\x{9BA3}\x{9BA4}\x{9BA5}' .
-'\x{9BA6}\x{9BA7}\x{9BA8}\x{9BA9}\x{9BAA}\x{9BAB}\x{9BAC}\x{9BAD}\x{9BAE}' .
-'\x{9BAF}\x{9BB0}\x{9BB1}\x{9BB2}\x{9BB3}\x{9BB4}\x{9BB5}\x{9BB6}\x{9BB7}' .
-'\x{9BB8}\x{9BB9}\x{9BBA}\x{9BBB}\x{9BBC}\x{9BBD}\x{9BBE}\x{9BBF}\x{9BC0}' .
-'\x{9BC1}\x{9BC3}\x{9BC4}\x{9BC5}\x{9BC6}\x{9BC7}\x{9BC8}\x{9BC9}\x{9BCA}' .
-'\x{9BCB}\x{9BCC}\x{9BCD}\x{9BCE}\x{9BCF}\x{9BD0}\x{9BD1}\x{9BD2}\x{9BD3}' .
-'\x{9BD4}\x{9BD5}\x{9BD6}\x{9BD7}\x{9BD8}\x{9BD9}\x{9BDA}\x{9BDB}\x{9BDC}' .
-'\x{9BDD}\x{9BDE}\x{9BDF}\x{9BE0}\x{9BE1}\x{9BE2}\x{9BE3}\x{9BE4}\x{9BE5}' .
-'\x{9BE6}\x{9BE7}\x{9BE8}\x{9BE9}\x{9BEA}\x{9BEB}\x{9BEC}\x{9BED}\x{9BEE}' .
-'\x{9BEF}\x{9BF0}\x{9BF1}\x{9BF2}\x{9BF3}\x{9BF4}\x{9BF5}\x{9BF7}\x{9BF8}' .
-'\x{9BF9}\x{9BFA}\x{9BFB}\x{9BFC}\x{9BFD}\x{9BFE}\x{9BFF}\x{9C02}\x{9C05}' .
-'\x{9C06}\x{9C07}\x{9C08}\x{9C09}\x{9C0A}\x{9C0B}\x{9C0C}\x{9C0D}\x{9C0E}' .
-'\x{9C0F}\x{9C10}\x{9C11}\x{9C12}\x{9C13}\x{9C14}\x{9C15}\x{9C16}\x{9C17}' .
-'\x{9C18}\x{9C19}\x{9C1A}\x{9C1B}\x{9C1C}\x{9C1D}\x{9C1E}\x{9C1F}\x{9C20}' .
-'\x{9C21}\x{9C22}\x{9C23}\x{9C24}\x{9C25}\x{9C26}\x{9C27}\x{9C28}\x{9C29}' .
-'\x{9C2A}\x{9C2B}\x{9C2C}\x{9C2D}\x{9C2F}\x{9C30}\x{9C31}\x{9C32}\x{9C33}' .
-'\x{9C34}\x{9C35}\x{9C36}\x{9C37}\x{9C38}\x{9C39}\x{9C3A}\x{9C3B}\x{9C3C}' .
-'\x{9C3D}\x{9C3E}\x{9C3F}\x{9C40}\x{9C41}\x{9C43}\x{9C44}\x{9C45}\x{9C46}' .
-'\x{9C47}\x{9C48}\x{9C49}\x{9C4A}\x{9C4B}\x{9C4C}\x{9C4D}\x{9C4E}\x{9C50}' .
-'\x{9C52}\x{9C53}\x{9C54}\x{9C55}\x{9C56}\x{9C57}\x{9C58}\x{9C59}\x{9C5A}' .
-'\x{9C5B}\x{9C5C}\x{9C5D}\x{9C5E}\x{9C5F}\x{9C60}\x{9C62}\x{9C63}\x{9C65}' .
-'\x{9C66}\x{9C67}\x{9C68}\x{9C69}\x{9C6A}\x{9C6B}\x{9C6C}\x{9C6D}\x{9C6E}' .
-'\x{9C6F}\x{9C70}\x{9C71}\x{9C72}\x{9C73}\x{9C74}\x{9C75}\x{9C77}\x{9C78}' .
-'\x{9C79}\x{9C7A}\x{9C7C}\x{9C7D}\x{9C7E}\x{9C7F}\x{9C80}\x{9C81}\x{9C82}' .
-'\x{9C83}\x{9C84}\x{9C85}\x{9C86}\x{9C87}\x{9C88}\x{9C89}\x{9C8A}\x{9C8B}' .
-'\x{9C8C}\x{9C8D}\x{9C8E}\x{9C8F}\x{9C90}\x{9C91}\x{9C92}\x{9C93}\x{9C94}' .
-'\x{9C95}\x{9C96}\x{9C97}\x{9C98}\x{9C99}\x{9C9A}\x{9C9B}\x{9C9C}\x{9C9D}' .
-'\x{9C9E}\x{9C9F}\x{9CA0}\x{9CA1}\x{9CA2}\x{9CA3}\x{9CA4}\x{9CA5}\x{9CA6}' .
-'\x{9CA7}\x{9CA8}\x{9CA9}\x{9CAA}\x{9CAB}\x{9CAC}\x{9CAD}\x{9CAE}\x{9CAF}' .
-'\x{9CB0}\x{9CB1}\x{9CB2}\x{9CB3}\x{9CB4}\x{9CB5}\x{9CB6}\x{9CB7}\x{9CB8}' .
-'\x{9CB9}\x{9CBA}\x{9CBB}\x{9CBC}\x{9CBD}\x{9CBE}\x{9CBF}\x{9CC0}\x{9CC1}' .
-'\x{9CC2}\x{9CC3}\x{9CC4}\x{9CC5}\x{9CC6}\x{9CC7}\x{9CC8}\x{9CC9}\x{9CCA}' .
-'\x{9CCB}\x{9CCC}\x{9CCD}\x{9CCE}\x{9CCF}\x{9CD0}\x{9CD1}\x{9CD2}\x{9CD3}' .
-'\x{9CD4}\x{9CD5}\x{9CD6}\x{9CD7}\x{9CD8}\x{9CD9}\x{9CDA}\x{9CDB}\x{9CDC}' .
-'\x{9CDD}\x{9CDE}\x{9CDF}\x{9CE0}\x{9CE1}\x{9CE2}\x{9CE3}\x{9CE4}\x{9CE5}' .
-'\x{9CE6}\x{9CE7}\x{9CE8}\x{9CE9}\x{9CEA}\x{9CEB}\x{9CEC}\x{9CED}\x{9CEE}' .
-'\x{9CEF}\x{9CF0}\x{9CF1}\x{9CF2}\x{9CF3}\x{9CF4}\x{9CF5}\x{9CF6}\x{9CF7}' .
-'\x{9CF8}\x{9CF9}\x{9CFA}\x{9CFB}\x{9CFC}\x{9CFD}\x{9CFE}\x{9CFF}\x{9D00}' .
-'\x{9D01}\x{9D02}\x{9D03}\x{9D04}\x{9D05}\x{9D06}\x{9D07}\x{9D08}\x{9D09}' .
-'\x{9D0A}\x{9D0B}\x{9D0F}\x{9D10}\x{9D12}\x{9D13}\x{9D14}\x{9D15}\x{9D16}' .
-'\x{9D17}\x{9D18}\x{9D19}\x{9D1A}\x{9D1B}\x{9D1C}\x{9D1D}\x{9D1E}\x{9D1F}' .
-'\x{9D20}\x{9D21}\x{9D22}\x{9D23}\x{9D24}\x{9D25}\x{9D26}\x{9D28}\x{9D29}' .
-'\x{9D2B}\x{9D2D}\x{9D2E}\x{9D2F}\x{9D30}\x{9D31}\x{9D32}\x{9D33}\x{9D34}' .
-'\x{9D36}\x{9D37}\x{9D38}\x{9D39}\x{9D3A}\x{9D3B}\x{9D3D}\x{9D3E}\x{9D3F}' .
-'\x{9D40}\x{9D41}\x{9D42}\x{9D43}\x{9D45}\x{9D46}\x{9D47}\x{9D48}\x{9D49}' .
-'\x{9D4A}\x{9D4B}\x{9D4C}\x{9D4D}\x{9D4E}\x{9D4F}\x{9D50}\x{9D51}\x{9D52}' .
-'\x{9D53}\x{9D54}\x{9D55}\x{9D56}\x{9D57}\x{9D58}\x{9D59}\x{9D5A}\x{9D5B}' .
-'\x{9D5C}\x{9D5D}\x{9D5E}\x{9D5F}\x{9D60}\x{9D61}\x{9D62}\x{9D63}\x{9D64}' .
-'\x{9D65}\x{9D66}\x{9D67}\x{9D68}\x{9D69}\x{9D6A}\x{9D6B}\x{9D6C}\x{9D6E}' .
-'\x{9D6F}\x{9D70}\x{9D71}\x{9D72}\x{9D73}\x{9D74}\x{9D75}\x{9D76}\x{9D77}' .
-'\x{9D78}\x{9D79}\x{9D7A}\x{9D7B}\x{9D7C}\x{9D7D}\x{9D7E}\x{9D7F}\x{9D80}' .
-'\x{9D81}\x{9D82}\x{9D83}\x{9D84}\x{9D85}\x{9D86}\x{9D87}\x{9D88}\x{9D89}' .
-'\x{9D8A}\x{9D8B}\x{9D8C}\x{9D8D}\x{9D8E}\x{9D90}\x{9D91}\x{9D92}\x{9D93}' .
-'\x{9D94}\x{9D96}\x{9D97}\x{9D98}\x{9D99}\x{9D9A}\x{9D9B}\x{9D9C}\x{9D9D}' .
-'\x{9D9E}\x{9D9F}\x{9DA0}\x{9DA1}\x{9DA2}\x{9DA3}\x{9DA4}\x{9DA5}\x{9DA6}' .
-'\x{9DA7}\x{9DA8}\x{9DA9}\x{9DAA}\x{9DAB}\x{9DAC}\x{9DAD}\x{9DAF}\x{9DB0}' .
-'\x{9DB1}\x{9DB2}\x{9DB3}\x{9DB4}\x{9DB5}\x{9DB6}\x{9DB7}\x{9DB8}\x{9DB9}' .
-'\x{9DBA}\x{9DBB}\x{9DBC}\x{9DBE}\x{9DBF}\x{9DC1}\x{9DC2}\x{9DC3}\x{9DC4}' .
-'\x{9DC5}\x{9DC7}\x{9DC8}\x{9DC9}\x{9DCA}\x{9DCB}\x{9DCC}\x{9DCD}\x{9DCE}' .
-'\x{9DCF}\x{9DD0}\x{9DD1}\x{9DD2}\x{9DD3}\x{9DD4}\x{9DD5}\x{9DD6}\x{9DD7}' .
-'\x{9DD8}\x{9DD9}\x{9DDA}\x{9DDB}\x{9DDC}\x{9DDD}\x{9DDE}\x{9DDF}\x{9DE0}' .
-'\x{9DE1}\x{9DE2}\x{9DE3}\x{9DE4}\x{9DE5}\x{9DE6}\x{9DE7}\x{9DE8}\x{9DE9}' .
-'\x{9DEB}\x{9DEC}\x{9DED}\x{9DEE}\x{9DEF}\x{9DF0}\x{9DF1}\x{9DF2}\x{9DF3}' .
-'\x{9DF4}\x{9DF5}\x{9DF6}\x{9DF7}\x{9DF8}\x{9DF9}\x{9DFA}\x{9DFB}\x{9DFD}' .
-'\x{9DFE}\x{9DFF}\x{9E00}\x{9E01}\x{9E02}\x{9E03}\x{9E04}\x{9E05}\x{9E06}' .
-'\x{9E07}\x{9E08}\x{9E09}\x{9E0A}\x{9E0B}\x{9E0C}\x{9E0D}\x{9E0F}\x{9E10}' .
-'\x{9E11}\x{9E12}\x{9E13}\x{9E14}\x{9E15}\x{9E17}\x{9E18}\x{9E19}\x{9E1A}' .
-'\x{9E1B}\x{9E1D}\x{9E1E}\x{9E1F}\x{9E20}\x{9E21}\x{9E22}\x{9E23}\x{9E24}' .
-'\x{9E25}\x{9E26}\x{9E27}\x{9E28}\x{9E29}\x{9E2A}\x{9E2B}\x{9E2C}\x{9E2D}' .
-'\x{9E2E}\x{9E2F}\x{9E30}\x{9E31}\x{9E32}\x{9E33}\x{9E34}\x{9E35}\x{9E36}' .
-'\x{9E37}\x{9E38}\x{9E39}\x{9E3A}\x{9E3B}\x{9E3C}\x{9E3D}\x{9E3E}\x{9E3F}' .
-'\x{9E40}\x{9E41}\x{9E42}\x{9E43}\x{9E44}\x{9E45}\x{9E46}\x{9E47}\x{9E48}' .
-'\x{9E49}\x{9E4A}\x{9E4B}\x{9E4C}\x{9E4D}\x{9E4E}\x{9E4F}\x{9E50}\x{9E51}' .
-'\x{9E52}\x{9E53}\x{9E54}\x{9E55}\x{9E56}\x{9E57}\x{9E58}\x{9E59}\x{9E5A}' .
-'\x{9E5B}\x{9E5C}\x{9E5D}\x{9E5E}\x{9E5F}\x{9E60}\x{9E61}\x{9E62}\x{9E63}' .
-'\x{9E64}\x{9E65}\x{9E66}\x{9E67}\x{9E68}\x{9E69}\x{9E6A}\x{9E6B}\x{9E6C}' .
-'\x{9E6D}\x{9E6E}\x{9E6F}\x{9E70}\x{9E71}\x{9E72}\x{9E73}\x{9E74}\x{9E75}' .
-'\x{9E76}\x{9E77}\x{9E79}\x{9E7A}\x{9E7C}\x{9E7D}\x{9E7E}\x{9E7F}\x{9E80}' .
-'\x{9E81}\x{9E82}\x{9E83}\x{9E84}\x{9E85}\x{9E86}\x{9E87}\x{9E88}\x{9E89}' .
-'\x{9E8A}\x{9E8B}\x{9E8C}\x{9E8D}\x{9E8E}\x{9E91}\x{9E92}\x{9E93}\x{9E94}' .
-'\x{9E96}\x{9E97}\x{9E99}\x{9E9A}\x{9E9B}\x{9E9C}\x{9E9D}\x{9E9F}\x{9EA0}' .
-'\x{9EA1}\x{9EA3}\x{9EA4}\x{9EA5}\x{9EA6}\x{9EA7}\x{9EA8}\x{9EA9}\x{9EAA}' .
-'\x{9EAD}\x{9EAE}\x{9EAF}\x{9EB0}\x{9EB2}\x{9EB3}\x{9EB4}\x{9EB5}\x{9EB6}' .
-'\x{9EB7}\x{9EB8}\x{9EBB}\x{9EBC}\x{9EBD}\x{9EBE}\x{9EBF}\x{9EC0}\x{9EC1}' .
-'\x{9EC2}\x{9EC3}\x{9EC4}\x{9EC5}\x{9EC6}\x{9EC7}\x{9EC8}\x{9EC9}\x{9ECA}' .
-'\x{9ECB}\x{9ECC}\x{9ECD}\x{9ECE}\x{9ECF}\x{9ED0}\x{9ED1}\x{9ED2}\x{9ED3}' .
-'\x{9ED4}\x{9ED5}\x{9ED6}\x{9ED7}\x{9ED8}\x{9ED9}\x{9EDA}\x{9EDB}\x{9EDC}' .
-'\x{9EDD}\x{9EDE}\x{9EDF}\x{9EE0}\x{9EE1}\x{9EE2}\x{9EE3}\x{9EE4}\x{9EE5}' .
-'\x{9EE6}\x{9EE7}\x{9EE8}\x{9EE9}\x{9EEA}\x{9EEB}\x{9EED}\x{9EEE}\x{9EEF}' .
-'\x{9EF0}\x{9EF2}\x{9EF3}\x{9EF4}\x{9EF5}\x{9EF6}\x{9EF7}\x{9EF8}\x{9EF9}' .
-'\x{9EFA}\x{9EFB}\x{9EFC}\x{9EFD}\x{9EFE}\x{9EFF}\x{9F00}\x{9F01}\x{9F02}' .
-'\x{9F04}\x{9F05}\x{9F06}\x{9F07}\x{9F08}\x{9F09}\x{9F0A}\x{9F0B}\x{9F0C}' .
-'\x{9F0D}\x{9F0E}\x{9F0F}\x{9F10}\x{9F12}\x{9F13}\x{9F15}\x{9F16}\x{9F17}' .
-'\x{9F18}\x{9F19}\x{9F1A}\x{9F1B}\x{9F1C}\x{9F1D}\x{9F1E}\x{9F1F}\x{9F20}' .
-'\x{9F22}\x{9F23}\x{9F24}\x{9F25}\x{9F27}\x{9F28}\x{9F29}\x{9F2A}\x{9F2B}' .
-'\x{9F2C}\x{9F2D}\x{9F2E}\x{9F2F}\x{9F30}\x{9F31}\x{9F32}\x{9F33}\x{9F34}' .
-'\x{9F35}\x{9F36}\x{9F37}\x{9F38}\x{9F39}\x{9F3A}\x{9F3B}\x{9F3C}\x{9F3D}' .
-'\x{9F3E}\x{9F3F}\x{9F40}\x{9F41}\x{9F42}\x{9F43}\x{9F44}\x{9F46}\x{9F47}' .
-'\x{9F48}\x{9F49}\x{9F4A}\x{9F4B}\x{9F4C}\x{9F4D}\x{9F4E}\x{9F4F}\x{9F50}' .
-'\x{9F51}\x{9F52}\x{9F54}\x{9F55}\x{9F56}\x{9F57}\x{9F58}\x{9F59}\x{9F5A}' .
-'\x{9F5B}\x{9F5C}\x{9F5D}\x{9F5E}\x{9F5F}\x{9F60}\x{9F61}\x{9F63}\x{9F64}' .
-'\x{9F65}\x{9F66}\x{9F67}\x{9F68}\x{9F69}\x{9F6A}\x{9F6B}\x{9F6C}\x{9F6E}' .
-'\x{9F6F}\x{9F70}\x{9F71}\x{9F72}\x{9F73}\x{9F74}\x{9F75}\x{9F76}\x{9F77}' .
-'\x{9F78}\x{9F79}\x{9F7A}\x{9F7B}\x{9F7C}\x{9F7D}\x{9F7E}\x{9F7F}\x{9F80}' .
-'\x{9F81}\x{9F82}\x{9F83}\x{9F84}\x{9F85}\x{9F86}\x{9F87}\x{9F88}\x{9F89}' .
-'\x{9F8A}\x{9F8B}\x{9F8C}\x{9F8D}\x{9F8E}\x{9F8F}\x{9F90}\x{9F91}\x{9F92}' .
-'\x{9F93}\x{9F94}\x{9F95}\x{9F96}\x{9F97}\x{9F98}\x{9F99}\x{9F9A}\x{9F9B}' .
-'\x{9F9C}\x{9F9D}\x{9F9E}\x{9F9F}\x{9FA0}\x{9FA2}\x{9FA4}\x{9FA5}]{1,20}$/iu');
diff --git a/airtime_mvc/library/Zend/Validate/Hostname/Cn.php b/airtime_mvc/library/Zend/Validate/Hostname/Cn.php
deleted file mode 100644
index feee54ade..000000000
--- a/airtime_mvc/library/Zend/Validate/Hostname/Cn.php
+++ /dev/null
@@ -1,2199 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cn.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Ressource file for chinese idn validation
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-return array(
-    1  => '/^[\x{002d}0-9a-z\x{3447}\x{3473}\x{359E}\x{360E}\x{361A}\x{3918}\x{396E}\x{39CF}\x{39D0}' .
-'\x{39DF}\x{3A73}\x{3B4E}\x{3C6E}\x{3CE0}\x{4056}\x{415F}\x{4337}\x{43AC}' .
-'\x{43B1}\x{43DD}\x{44D6}\x{464C}\x{4661}\x{4723}\x{4729}\x{477C}\x{478D}' .
-'\x{4947}\x{497A}\x{497D}\x{4982}\x{4983}\x{4985}\x{4986}\x{499B}\x{499F}' .
-'\x{49B6}\x{49B7}\x{4C77}\x{4C9F}\x{4CA0}\x{4CA1}\x{4CA2}\x{4CA3}\x{4D13}' .
-'\x{4D14}\x{4D15}\x{4D16}\x{4D17}\x{4D18}\x{4D19}\x{4DAE}\x{4E00}\x{4E01}' .
-'\x{4E02}\x{4E03}\x{4E04}\x{4E05}\x{4E06}\x{4E07}\x{4E08}\x{4E09}\x{4E0A}' .
-'\x{4E0B}\x{4E0C}\x{4E0D}\x{4E0E}\x{4E0F}\x{4E10}\x{4E11}\x{4E13}\x{4E14}' .
-'\x{4E15}\x{4E16}\x{4E17}\x{4E18}\x{4E19}\x{4E1A}\x{4E1B}\x{4E1C}\x{4E1D}' .
-'\x{4E1E}\x{4E1F}\x{4E20}\x{4E21}\x{4E22}\x{4E23}\x{4E24}\x{4E25}\x{4E26}' .
-'\x{4E27}\x{4E28}\x{4E2A}\x{4E2B}\x{4E2C}\x{4E2D}\x{4E2E}\x{4E2F}\x{4E30}' .
-'\x{4E31}\x{4E32}\x{4E33}\x{4E34}\x{4E35}\x{4E36}\x{4E37}\x{4E38}\x{4E39}' .
-'\x{4E3A}\x{4E3B}\x{4E3C}\x{4E3D}\x{4E3E}\x{4E3F}\x{4E40}\x{4E41}\x{4E42}' .
-'\x{4E43}\x{4E44}\x{4E45}\x{4E46}\x{4E47}\x{4E48}\x{4E49}\x{4E4A}\x{4E4B}' .
-'\x{4E4C}\x{4E4D}\x{4E4E}\x{4E4F}\x{4E50}\x{4E51}\x{4E52}\x{4E53}\x{4E54}' .
-'\x{4E56}\x{4E57}\x{4E58}\x{4E59}\x{4E5A}\x{4E5B}\x{4E5C}\x{4E5D}\x{4E5E}' .
-'\x{4E5F}\x{4E60}\x{4E61}\x{4E62}\x{4E63}\x{4E64}\x{4E65}\x{4E66}\x{4E67}' .
-'\x{4E69}\x{4E6A}\x{4E6B}\x{4E6C}\x{4E6D}\x{4E6E}\x{4E6F}\x{4E70}\x{4E71}' .
-'\x{4E72}\x{4E73}\x{4E74}\x{4E75}\x{4E76}\x{4E77}\x{4E78}\x{4E7A}\x{4E7B}' .
-'\x{4E7C}\x{4E7D}\x{4E7E}\x{4E7F}\x{4E80}\x{4E81}\x{4E82}\x{4E83}\x{4E84}' .
-'\x{4E85}\x{4E86}\x{4E87}\x{4E88}\x{4E89}\x{4E8B}\x{4E8C}\x{4E8D}\x{4E8E}' .
-'\x{4E8F}\x{4E90}\x{4E91}\x{4E92}\x{4E93}\x{4E94}\x{4E95}\x{4E97}\x{4E98}' .
-'\x{4E99}\x{4E9A}\x{4E9B}\x{4E9C}\x{4E9D}\x{4E9E}\x{4E9F}\x{4EA0}\x{4EA1}' .
-'\x{4EA2}\x{4EA4}\x{4EA5}\x{4EA6}\x{4EA7}\x{4EA8}\x{4EA9}\x{4EAA}\x{4EAB}' .
-'\x{4EAC}\x{4EAD}\x{4EAE}\x{4EAF}\x{4EB0}\x{4EB1}\x{4EB2}\x{4EB3}\x{4EB4}' .
-'\x{4EB5}\x{4EB6}\x{4EB7}\x{4EB8}\x{4EB9}\x{4EBA}\x{4EBB}\x{4EBD}\x{4EBE}' .
-'\x{4EBF}\x{4EC0}\x{4EC1}\x{4EC2}\x{4EC3}\x{4EC4}\x{4EC5}\x{4EC6}\x{4EC7}' .
-'\x{4EC8}\x{4EC9}\x{4ECA}\x{4ECB}\x{4ECD}\x{4ECE}\x{4ECF}\x{4ED0}\x{4ED1}' .
-'\x{4ED2}\x{4ED3}\x{4ED4}\x{4ED5}\x{4ED6}\x{4ED7}\x{4ED8}\x{4ED9}\x{4EDA}' .
-'\x{4EDB}\x{4EDC}\x{4EDD}\x{4EDE}\x{4EDF}\x{4EE0}\x{4EE1}\x{4EE2}\x{4EE3}' .
-'\x{4EE4}\x{4EE5}\x{4EE6}\x{4EE8}\x{4EE9}\x{4EEA}\x{4EEB}\x{4EEC}\x{4EEF}' .
-'\x{4EF0}\x{4EF1}\x{4EF2}\x{4EF3}\x{4EF4}\x{4EF5}\x{4EF6}\x{4EF7}\x{4EFB}' .
-'\x{4EFD}\x{4EFF}\x{4F00}\x{4F01}\x{4F02}\x{4F03}\x{4F04}\x{4F05}\x{4F06}' .
-'\x{4F08}\x{4F09}\x{4F0A}\x{4F0B}\x{4F0C}\x{4F0D}\x{4F0E}\x{4F0F}\x{4F10}' .
-'\x{4F11}\x{4F12}\x{4F13}\x{4F14}\x{4F15}\x{4F17}\x{4F18}\x{4F19}\x{4F1A}' .
-'\x{4F1B}\x{4F1C}\x{4F1D}\x{4F1E}\x{4F1F}\x{4F20}\x{4F21}\x{4F22}\x{4F23}' .
-'\x{4F24}\x{4F25}\x{4F26}\x{4F27}\x{4F29}\x{4F2A}\x{4F2B}\x{4F2C}\x{4F2D}' .
-'\x{4F2E}\x{4F2F}\x{4F30}\x{4F32}\x{4F33}\x{4F34}\x{4F36}\x{4F38}\x{4F39}' .
-'\x{4F3A}\x{4F3B}\x{4F3C}\x{4F3D}\x{4F3E}\x{4F3F}\x{4F41}\x{4F42}\x{4F43}' .
-'\x{4F45}\x{4F46}\x{4F47}\x{4F48}\x{4F49}\x{4F4A}\x{4F4B}\x{4F4C}\x{4F4D}' .
-'\x{4F4E}\x{4F4F}\x{4F50}\x{4F51}\x{4F52}\x{4F53}\x{4F54}\x{4F55}\x{4F56}' .
-'\x{4F57}\x{4F58}\x{4F59}\x{4F5A}\x{4F5B}\x{4F5C}\x{4F5D}\x{4F5E}\x{4F5F}' .
-'\x{4F60}\x{4F61}\x{4F62}\x{4F63}\x{4F64}\x{4F65}\x{4F66}\x{4F67}\x{4F68}' .
-'\x{4F69}\x{4F6A}\x{4F6B}\x{4F6C}\x{4F6D}\x{4F6E}\x{4F6F}\x{4F70}\x{4F72}' .
-'\x{4F73}\x{4F74}\x{4F75}\x{4F76}\x{4F77}\x{4F78}\x{4F79}\x{4F7A}\x{4F7B}' .
-'\x{4F7C}\x{4F7D}\x{4F7E}\x{4F7F}\x{4F80}\x{4F81}\x{4F82}\x{4F83}\x{4F84}' .
-'\x{4F85}\x{4F86}\x{4F87}\x{4F88}\x{4F89}\x{4F8A}\x{4F8B}\x{4F8D}\x{4F8F}' .
-'\x{4F90}\x{4F91}\x{4F92}\x{4F93}\x{4F94}\x{4F95}\x{4F96}\x{4F97}\x{4F98}' .
-'\x{4F99}\x{4F9A}\x{4F9B}\x{4F9C}\x{4F9D}\x{4F9E}\x{4F9F}\x{4FA0}\x{4FA1}' .
-'\x{4FA3}\x{4FA4}\x{4FA5}\x{4FA6}\x{4FA7}\x{4FA8}\x{4FA9}\x{4FAA}\x{4FAB}' .
-'\x{4FAC}\x{4FAE}\x{4FAF}\x{4FB0}\x{4FB1}\x{4FB2}\x{4FB3}\x{4FB4}\x{4FB5}' .
-'\x{4FB6}\x{4FB7}\x{4FB8}\x{4FB9}\x{4FBA}\x{4FBB}\x{4FBC}\x{4FBE}\x{4FBF}' .
-'\x{4FC0}\x{4FC1}\x{4FC2}\x{4FC3}\x{4FC4}\x{4FC5}\x{4FC7}\x{4FC9}\x{4FCA}' .
-'\x{4FCB}\x{4FCD}\x{4FCE}\x{4FCF}\x{4FD0}\x{4FD1}\x{4FD2}\x{4FD3}\x{4FD4}' .
-'\x{4FD5}\x{4FD6}\x{4FD7}\x{4FD8}\x{4FD9}\x{4FDA}\x{4FDB}\x{4FDC}\x{4FDD}' .
-'\x{4FDE}\x{4FDF}\x{4FE0}\x{4FE1}\x{4FE3}\x{4FE4}\x{4FE5}\x{4FE6}\x{4FE7}' .
-'\x{4FE8}\x{4FE9}\x{4FEA}\x{4FEB}\x{4FEC}\x{4FED}\x{4FEE}\x{4FEF}\x{4FF0}' .
-'\x{4FF1}\x{4FF2}\x{4FF3}\x{4FF4}\x{4FF5}\x{4FF6}\x{4FF7}\x{4FF8}\x{4FF9}' .
-'\x{4FFA}\x{4FFB}\x{4FFE}\x{4FFF}\x{5000}\x{5001}\x{5002}\x{5003}\x{5004}' .
-'\x{5005}\x{5006}\x{5007}\x{5008}\x{5009}\x{500A}\x{500B}\x{500C}\x{500D}' .
-'\x{500E}\x{500F}\x{5011}\x{5012}\x{5013}\x{5014}\x{5015}\x{5016}\x{5017}' .
-'\x{5018}\x{5019}\x{501A}\x{501B}\x{501C}\x{501D}\x{501E}\x{501F}\x{5020}' .
-'\x{5021}\x{5022}\x{5023}\x{5024}\x{5025}\x{5026}\x{5027}\x{5028}\x{5029}' .
-'\x{502A}\x{502B}\x{502C}\x{502D}\x{502E}\x{502F}\x{5030}\x{5031}\x{5032}' .
-'\x{5033}\x{5035}\x{5036}\x{5037}\x{5039}\x{503A}\x{503B}\x{503C}\x{503E}' .
-'\x{503F}\x{5040}\x{5041}\x{5043}\x{5044}\x{5045}\x{5046}\x{5047}\x{5048}' .
-'\x{5049}\x{504A}\x{504B}\x{504C}\x{504D}\x{504E}\x{504F}\x{5051}\x{5053}' .
-'\x{5054}\x{5055}\x{5056}\x{5057}\x{5059}\x{505A}\x{505B}\x{505C}\x{505D}' .
-'\x{505E}\x{505F}\x{5060}\x{5061}\x{5062}\x{5063}\x{5064}\x{5065}\x{5066}' .
-'\x{5067}\x{5068}\x{5069}\x{506A}\x{506B}\x{506C}\x{506D}\x{506E}\x{506F}' .
-'\x{5070}\x{5071}\x{5072}\x{5073}\x{5074}\x{5075}\x{5076}\x{5077}\x{5078}' .
-'\x{5079}\x{507A}\x{507B}\x{507D}\x{507E}\x{507F}\x{5080}\x{5082}\x{5083}' .
-'\x{5084}\x{5085}\x{5086}\x{5087}\x{5088}\x{5089}\x{508A}\x{508B}\x{508C}' .
-'\x{508D}\x{508E}\x{508F}\x{5090}\x{5091}\x{5092}\x{5094}\x{5095}\x{5096}' .
-'\x{5098}\x{5099}\x{509A}\x{509B}\x{509C}\x{509D}\x{509E}\x{50A2}\x{50A3}' .
-'\x{50A4}\x{50A5}\x{50A6}\x{50A7}\x{50A8}\x{50A9}\x{50AA}\x{50AB}\x{50AC}' .
-'\x{50AD}\x{50AE}\x{50AF}\x{50B0}\x{50B1}\x{50B2}\x{50B3}\x{50B4}\x{50B5}' .
-'\x{50B6}\x{50B7}\x{50B8}\x{50BA}\x{50BB}\x{50BC}\x{50BD}\x{50BE}\x{50BF}' .
-'\x{50C0}\x{50C1}\x{50C2}\x{50C4}\x{50C5}\x{50C6}\x{50C7}\x{50C8}\x{50C9}' .
-'\x{50CA}\x{50CB}\x{50CC}\x{50CD}\x{50CE}\x{50CF}\x{50D0}\x{50D1}\x{50D2}' .
-'\x{50D3}\x{50D4}\x{50D5}\x{50D6}\x{50D7}\x{50D9}\x{50DA}\x{50DB}\x{50DC}' .
-'\x{50DD}\x{50DE}\x{50E0}\x{50E3}\x{50E4}\x{50E5}\x{50E6}\x{50E7}\x{50E8}' .
-'\x{50E9}\x{50EA}\x{50EC}\x{50ED}\x{50EE}\x{50EF}\x{50F0}\x{50F1}\x{50F2}' .
-'\x{50F3}\x{50F5}\x{50F6}\x{50F8}\x{50F9}\x{50FA}\x{50FB}\x{50FC}\x{50FD}' .
-'\x{50FE}\x{50FF}\x{5100}\x{5101}\x{5102}\x{5103}\x{5104}\x{5105}\x{5106}' .
-'\x{5107}\x{5108}\x{5109}\x{510A}\x{510B}\x{510C}\x{510D}\x{510E}\x{510F}' .
-'\x{5110}\x{5111}\x{5112}\x{5113}\x{5114}\x{5115}\x{5116}\x{5117}\x{5118}' .
-'\x{5119}\x{511A}\x{511C}\x{511D}\x{511E}\x{511F}\x{5120}\x{5121}\x{5122}' .
-'\x{5123}\x{5124}\x{5125}\x{5126}\x{5127}\x{5129}\x{512A}\x{512C}\x{512D}' .
-'\x{512E}\x{512F}\x{5130}\x{5131}\x{5132}\x{5133}\x{5134}\x{5135}\x{5136}' .
-'\x{5137}\x{5138}\x{5139}\x{513A}\x{513B}\x{513C}\x{513D}\x{513E}\x{513F}' .
-'\x{5140}\x{5141}\x{5143}\x{5144}\x{5145}\x{5146}\x{5147}\x{5148}\x{5149}' .
-'\x{514B}\x{514C}\x{514D}\x{514E}\x{5150}\x{5151}\x{5152}\x{5154}\x{5155}' .
-'\x{5156}\x{5157}\x{5159}\x{515A}\x{515B}\x{515C}\x{515D}\x{515E}\x{515F}' .
-'\x{5161}\x{5162}\x{5163}\x{5165}\x{5166}\x{5167}\x{5168}\x{5169}\x{516A}' .
-'\x{516B}\x{516C}\x{516D}\x{516E}\x{516F}\x{5170}\x{5171}\x{5173}\x{5174}' .
-'\x{5175}\x{5176}\x{5177}\x{5178}\x{5179}\x{517A}\x{517B}\x{517C}\x{517D}' .
-'\x{517F}\x{5180}\x{5181}\x{5182}\x{5185}\x{5186}\x{5187}\x{5188}\x{5189}' .
-'\x{518A}\x{518B}\x{518C}\x{518D}\x{518F}\x{5190}\x{5191}\x{5192}\x{5193}' .
-'\x{5194}\x{5195}\x{5196}\x{5197}\x{5198}\x{5199}\x{519A}\x{519B}\x{519C}' .
-'\x{519D}\x{519E}\x{519F}\x{51A0}\x{51A2}\x{51A4}\x{51A5}\x{51A6}\x{51A7}' .
-'\x{51A8}\x{51AA}\x{51AB}\x{51AC}\x{51AE}\x{51AF}\x{51B0}\x{51B1}\x{51B2}' .
-'\x{51B3}\x{51B5}\x{51B6}\x{51B7}\x{51B9}\x{51BB}\x{51BC}\x{51BD}\x{51BE}' .
-'\x{51BF}\x{51C0}\x{51C1}\x{51C3}\x{51C4}\x{51C5}\x{51C6}\x{51C7}\x{51C8}' .
-'\x{51C9}\x{51CA}\x{51CB}\x{51CC}\x{51CD}\x{51CE}\x{51CF}\x{51D0}\x{51D1}' .
-'\x{51D4}\x{51D5}\x{51D6}\x{51D7}\x{51D8}\x{51D9}\x{51DA}\x{51DB}\x{51DC}' .
-'\x{51DD}\x{51DE}\x{51E0}\x{51E1}\x{51E2}\x{51E3}\x{51E4}\x{51E5}\x{51E7}' .
-'\x{51E8}\x{51E9}\x{51EA}\x{51EB}\x{51ED}\x{51EF}\x{51F0}\x{51F1}\x{51F3}' .
-'\x{51F4}\x{51F5}\x{51F6}\x{51F7}\x{51F8}\x{51F9}\x{51FA}\x{51FB}\x{51FC}' .
-'\x{51FD}\x{51FE}\x{51FF}\x{5200}\x{5201}\x{5202}\x{5203}\x{5204}\x{5205}' .
-'\x{5206}\x{5207}\x{5208}\x{5209}\x{520A}\x{520B}\x{520C}\x{520D}\x{520E}' .
-'\x{520F}\x{5210}\x{5211}\x{5212}\x{5213}\x{5214}\x{5215}\x{5216}\x{5217}' .
-'\x{5218}\x{5219}\x{521A}\x{521B}\x{521C}\x{521D}\x{521E}\x{521F}\x{5220}' .
-'\x{5221}\x{5222}\x{5223}\x{5224}\x{5225}\x{5226}\x{5228}\x{5229}\x{522A}' .
-'\x{522B}\x{522C}\x{522D}\x{522E}\x{522F}\x{5230}\x{5231}\x{5232}\x{5233}' .
-'\x{5234}\x{5235}\x{5236}\x{5237}\x{5238}\x{5239}\x{523A}\x{523B}\x{523C}' .
-'\x{523D}\x{523E}\x{523F}\x{5240}\x{5241}\x{5242}\x{5243}\x{5244}\x{5245}' .
-'\x{5246}\x{5247}\x{5248}\x{5249}\x{524A}\x{524B}\x{524C}\x{524D}\x{524E}' .
-'\x{5250}\x{5251}\x{5252}\x{5254}\x{5255}\x{5256}\x{5257}\x{5258}\x{5259}' .
-'\x{525A}\x{525B}\x{525C}\x{525D}\x{525E}\x{525F}\x{5260}\x{5261}\x{5262}' .
-'\x{5263}\x{5264}\x{5265}\x{5267}\x{5268}\x{5269}\x{526A}\x{526B}\x{526C}' .
-'\x{526D}\x{526E}\x{526F}\x{5270}\x{5272}\x{5273}\x{5274}\x{5275}\x{5276}' .
-'\x{5277}\x{5278}\x{527A}\x{527B}\x{527C}\x{527D}\x{527E}\x{527F}\x{5280}' .
-'\x{5281}\x{5282}\x{5283}\x{5284}\x{5286}\x{5287}\x{5288}\x{5289}\x{528A}' .
-'\x{528B}\x{528C}\x{528D}\x{528F}\x{5290}\x{5291}\x{5292}\x{5293}\x{5294}' .
-'\x{5295}\x{5296}\x{5297}\x{5298}\x{5299}\x{529A}\x{529B}\x{529C}\x{529D}' .
-'\x{529E}\x{529F}\x{52A0}\x{52A1}\x{52A2}\x{52A3}\x{52A5}\x{52A6}\x{52A7}' .
-'\x{52A8}\x{52A9}\x{52AA}\x{52AB}\x{52AC}\x{52AD}\x{52AE}\x{52AF}\x{52B0}' .
-'\x{52B1}\x{52B2}\x{52B3}\x{52B4}\x{52B5}\x{52B6}\x{52B7}\x{52B8}\x{52B9}' .
-'\x{52BA}\x{52BB}\x{52BC}\x{52BD}\x{52BE}\x{52BF}\x{52C0}\x{52C1}\x{52C2}' .
-'\x{52C3}\x{52C6}\x{52C7}\x{52C9}\x{52CA}\x{52CB}\x{52CD}\x{52CF}\x{52D0}' .
-'\x{52D2}\x{52D3}\x{52D5}\x{52D6}\x{52D7}\x{52D8}\x{52D9}\x{52DA}\x{52DB}' .
-'\x{52DC}\x{52DD}\x{52DE}\x{52DF}\x{52E0}\x{52E2}\x{52E3}\x{52E4}\x{52E6}' .
-'\x{52E7}\x{52E8}\x{52E9}\x{52EA}\x{52EB}\x{52EC}\x{52ED}\x{52EF}\x{52F0}' .
-'\x{52F1}\x{52F2}\x{52F3}\x{52F4}\x{52F5}\x{52F6}\x{52F7}\x{52F8}\x{52F9}' .
-'\x{52FA}\x{52FB}\x{52FC}\x{52FD}\x{52FE}\x{52FF}\x{5300}\x{5301}\x{5302}' .
-'\x{5305}\x{5306}\x{5307}\x{5308}\x{5309}\x{530A}\x{530B}\x{530C}\x{530D}' .
-'\x{530E}\x{530F}\x{5310}\x{5311}\x{5312}\x{5313}\x{5314}\x{5315}\x{5316}' .
-'\x{5317}\x{5319}\x{531A}\x{531C}\x{531D}\x{531F}\x{5320}\x{5321}\x{5322}' .
-'\x{5323}\x{5324}\x{5325}\x{5326}\x{5328}\x{532A}\x{532B}\x{532C}\x{532D}' .
-'\x{532E}\x{532F}\x{5330}\x{5331}\x{5333}\x{5334}\x{5337}\x{5339}\x{533A}' .
-'\x{533B}\x{533C}\x{533D}\x{533E}\x{533F}\x{5340}\x{5341}\x{5343}\x{5344}' .
-'\x{5345}\x{5346}\x{5347}\x{5348}\x{5349}\x{534A}\x{534B}\x{534C}\x{534D}' .
-'\x{534E}\x{534F}\x{5350}\x{5351}\x{5352}\x{5353}\x{5354}\x{5355}\x{5356}' .
-'\x{5357}\x{5358}\x{5359}\x{535A}\x{535C}\x{535E}\x{535F}\x{5360}\x{5361}' .
-'\x{5362}\x{5363}\x{5364}\x{5365}\x{5366}\x{5367}\x{5369}\x{536B}\x{536C}' .
-'\x{536E}\x{536F}\x{5370}\x{5371}\x{5372}\x{5373}\x{5374}\x{5375}\x{5376}' .
-'\x{5377}\x{5378}\x{5379}\x{537A}\x{537B}\x{537C}\x{537D}\x{537E}\x{537F}' .
-'\x{5381}\x{5382}\x{5383}\x{5384}\x{5385}\x{5386}\x{5387}\x{5388}\x{5389}' .
-'\x{538A}\x{538B}\x{538C}\x{538D}\x{538E}\x{538F}\x{5390}\x{5391}\x{5392}' .
-'\x{5393}\x{5394}\x{5395}\x{5396}\x{5397}\x{5398}\x{5399}\x{539A}\x{539B}' .
-'\x{539C}\x{539D}\x{539E}\x{539F}\x{53A0}\x{53A2}\x{53A3}\x{53A4}\x{53A5}' .
-'\x{53A6}\x{53A7}\x{53A8}\x{53A9}\x{53AC}\x{53AD}\x{53AE}\x{53B0}\x{53B1}' .
-'\x{53B2}\x{53B3}\x{53B4}\x{53B5}\x{53B6}\x{53B7}\x{53B8}\x{53B9}\x{53BB}' .
-'\x{53BC}\x{53BD}\x{53BE}\x{53BF}\x{53C0}\x{53C1}\x{53C2}\x{53C3}\x{53C4}' .
-'\x{53C6}\x{53C7}\x{53C8}\x{53C9}\x{53CA}\x{53CB}\x{53CC}\x{53CD}\x{53CE}' .
-'\x{53D0}\x{53D1}\x{53D2}\x{53D3}\x{53D4}\x{53D5}\x{53D6}\x{53D7}\x{53D8}' .
-'\x{53D9}\x{53DB}\x{53DC}\x{53DF}\x{53E0}\x{53E1}\x{53E2}\x{53E3}\x{53E4}' .
-'\x{53E5}\x{53E6}\x{53E8}\x{53E9}\x{53EA}\x{53EB}\x{53EC}\x{53ED}\x{53EE}' .
-'\x{53EF}\x{53F0}\x{53F1}\x{53F2}\x{53F3}\x{53F4}\x{53F5}\x{53F6}\x{53F7}' .
-'\x{53F8}\x{53F9}\x{53FA}\x{53FB}\x{53FC}\x{53FD}\x{53FE}\x{5401}\x{5402}' .
-'\x{5403}\x{5404}\x{5405}\x{5406}\x{5407}\x{5408}\x{5409}\x{540A}\x{540B}' .
-'\x{540C}\x{540D}\x{540E}\x{540F}\x{5410}\x{5411}\x{5412}\x{5413}\x{5414}' .
-'\x{5415}\x{5416}\x{5417}\x{5418}\x{5419}\x{541B}\x{541C}\x{541D}\x{541E}' .
-'\x{541F}\x{5420}\x{5421}\x{5423}\x{5424}\x{5425}\x{5426}\x{5427}\x{5428}' .
-'\x{5429}\x{542A}\x{542B}\x{542C}\x{542D}\x{542E}\x{542F}\x{5430}\x{5431}' .
-'\x{5432}\x{5433}\x{5434}\x{5435}\x{5436}\x{5437}\x{5438}\x{5439}\x{543A}' .
-'\x{543B}\x{543C}\x{543D}\x{543E}\x{543F}\x{5440}\x{5441}\x{5442}\x{5443}' .
-'\x{5444}\x{5445}\x{5446}\x{5447}\x{5448}\x{5449}\x{544A}\x{544B}\x{544D}' .
-'\x{544E}\x{544F}\x{5450}\x{5451}\x{5452}\x{5453}\x{5454}\x{5455}\x{5456}' .
-'\x{5457}\x{5458}\x{5459}\x{545A}\x{545B}\x{545C}\x{545E}\x{545F}\x{5460}' .
-'\x{5461}\x{5462}\x{5463}\x{5464}\x{5465}\x{5466}\x{5467}\x{5468}\x{546A}' .
-'\x{546B}\x{546C}\x{546D}\x{546E}\x{546F}\x{5470}\x{5471}\x{5472}\x{5473}' .
-'\x{5474}\x{5475}\x{5476}\x{5477}\x{5478}\x{5479}\x{547A}\x{547B}\x{547C}' .
-'\x{547D}\x{547E}\x{547F}\x{5480}\x{5481}\x{5482}\x{5483}\x{5484}\x{5485}' .
-'\x{5486}\x{5487}\x{5488}\x{5489}\x{548B}\x{548C}\x{548D}\x{548E}\x{548F}' .
-'\x{5490}\x{5491}\x{5492}\x{5493}\x{5494}\x{5495}\x{5496}\x{5497}\x{5498}' .
-'\x{5499}\x{549A}\x{549B}\x{549C}\x{549D}\x{549E}\x{549F}\x{54A0}\x{54A1}' .
-'\x{54A2}\x{54A3}\x{54A4}\x{54A5}\x{54A6}\x{54A7}\x{54A8}\x{54A9}\x{54AA}' .
-'\x{54AB}\x{54AC}\x{54AD}\x{54AE}\x{54AF}\x{54B0}\x{54B1}\x{54B2}\x{54B3}' .
-'\x{54B4}\x{54B6}\x{54B7}\x{54B8}\x{54B9}\x{54BA}\x{54BB}\x{54BC}\x{54BD}' .
-'\x{54BE}\x{54BF}\x{54C0}\x{54C1}\x{54C2}\x{54C3}\x{54C4}\x{54C5}\x{54C6}' .
-'\x{54C7}\x{54C8}\x{54C9}\x{54CA}\x{54CB}\x{54CC}\x{54CD}\x{54CE}\x{54CF}' .
-'\x{54D0}\x{54D1}\x{54D2}\x{54D3}\x{54D4}\x{54D5}\x{54D6}\x{54D7}\x{54D8}' .
-'\x{54D9}\x{54DA}\x{54DB}\x{54DC}\x{54DD}\x{54DE}\x{54DF}\x{54E0}\x{54E1}' .
-'\x{54E2}\x{54E3}\x{54E4}\x{54E5}\x{54E6}\x{54E7}\x{54E8}\x{54E9}\x{54EA}' .
-'\x{54EB}\x{54EC}\x{54ED}\x{54EE}\x{54EF}\x{54F0}\x{54F1}\x{54F2}\x{54F3}' .
-'\x{54F4}\x{54F5}\x{54F7}\x{54F8}\x{54F9}\x{54FA}\x{54FB}\x{54FC}\x{54FD}' .
-'\x{54FE}\x{54FF}\x{5500}\x{5501}\x{5502}\x{5503}\x{5504}\x{5505}\x{5506}' .
-'\x{5507}\x{5508}\x{5509}\x{550A}\x{550B}\x{550C}\x{550D}\x{550E}\x{550F}' .
-'\x{5510}\x{5511}\x{5512}\x{5513}\x{5514}\x{5516}\x{5517}\x{551A}\x{551B}' .
-'\x{551C}\x{551D}\x{551E}\x{551F}\x{5520}\x{5521}\x{5522}\x{5523}\x{5524}' .
-'\x{5525}\x{5526}\x{5527}\x{5528}\x{5529}\x{552A}\x{552B}\x{552C}\x{552D}' .
-'\x{552E}\x{552F}\x{5530}\x{5531}\x{5532}\x{5533}\x{5534}\x{5535}\x{5536}' .
-'\x{5537}\x{5538}\x{5539}\x{553A}\x{553B}\x{553C}\x{553D}\x{553E}\x{553F}' .
-'\x{5540}\x{5541}\x{5542}\x{5543}\x{5544}\x{5545}\x{5546}\x{5548}\x{5549}' .
-'\x{554A}\x{554B}\x{554C}\x{554D}\x{554E}\x{554F}\x{5550}\x{5551}\x{5552}' .
-'\x{5553}\x{5554}\x{5555}\x{5556}\x{5557}\x{5558}\x{5559}\x{555A}\x{555B}' .
-'\x{555C}\x{555D}\x{555E}\x{555F}\x{5561}\x{5562}\x{5563}\x{5564}\x{5565}' .
-'\x{5566}\x{5567}\x{5568}\x{5569}\x{556A}\x{556B}\x{556C}\x{556D}\x{556E}' .
-'\x{556F}\x{5570}\x{5571}\x{5572}\x{5573}\x{5574}\x{5575}\x{5576}\x{5577}' .
-'\x{5578}\x{5579}\x{557B}\x{557C}\x{557D}\x{557E}\x{557F}\x{5580}\x{5581}' .
-'\x{5582}\x{5583}\x{5584}\x{5585}\x{5586}\x{5587}\x{5588}\x{5589}\x{558A}' .
-'\x{558B}\x{558C}\x{558D}\x{558E}\x{558F}\x{5590}\x{5591}\x{5592}\x{5593}' .
-'\x{5594}\x{5595}\x{5596}\x{5597}\x{5598}\x{5599}\x{559A}\x{559B}\x{559C}' .
-'\x{559D}\x{559E}\x{559F}\x{55A0}\x{55A1}\x{55A2}\x{55A3}\x{55A4}\x{55A5}' .
-'\x{55A6}\x{55A7}\x{55A8}\x{55A9}\x{55AA}\x{55AB}\x{55AC}\x{55AD}\x{55AE}' .
-'\x{55AF}\x{55B0}\x{55B1}\x{55B2}\x{55B3}\x{55B4}\x{55B5}\x{55B6}\x{55B7}' .
-'\x{55B8}\x{55B9}\x{55BA}\x{55BB}\x{55BC}\x{55BD}\x{55BE}\x{55BF}\x{55C0}' .
-'\x{55C1}\x{55C2}\x{55C3}\x{55C4}\x{55C5}\x{55C6}\x{55C7}\x{55C8}\x{55C9}' .
-'\x{55CA}\x{55CB}\x{55CC}\x{55CD}\x{55CE}\x{55CF}\x{55D0}\x{55D1}\x{55D2}' .
-'\x{55D3}\x{55D4}\x{55D5}\x{55D6}\x{55D7}\x{55D8}\x{55D9}\x{55DA}\x{55DB}' .
-'\x{55DC}\x{55DD}\x{55DE}\x{55DF}\x{55E1}\x{55E2}\x{55E3}\x{55E4}\x{55E5}' .
-'\x{55E6}\x{55E7}\x{55E8}\x{55E9}\x{55EA}\x{55EB}\x{55EC}\x{55ED}\x{55EE}' .
-'\x{55EF}\x{55F0}\x{55F1}\x{55F2}\x{55F3}\x{55F4}\x{55F5}\x{55F6}\x{55F7}' .
-'\x{55F9}\x{55FA}\x{55FB}\x{55FC}\x{55FD}\x{55FE}\x{55FF}\x{5600}\x{5601}' .
-'\x{5602}\x{5603}\x{5604}\x{5606}\x{5607}\x{5608}\x{5609}\x{560C}\x{560D}' .
-'\x{560E}\x{560F}\x{5610}\x{5611}\x{5612}\x{5613}\x{5614}\x{5615}\x{5616}' .
-'\x{5617}\x{5618}\x{5619}\x{561A}\x{561B}\x{561C}\x{561D}\x{561E}\x{561F}' .
-'\x{5621}\x{5622}\x{5623}\x{5624}\x{5625}\x{5626}\x{5627}\x{5628}\x{5629}' .
-'\x{562A}\x{562C}\x{562D}\x{562E}\x{562F}\x{5630}\x{5631}\x{5632}\x{5633}' .
-'\x{5634}\x{5635}\x{5636}\x{5638}\x{5639}\x{563A}\x{563B}\x{563D}\x{563E}' .
-'\x{563F}\x{5640}\x{5641}\x{5642}\x{5643}\x{5645}\x{5646}\x{5647}\x{5648}' .
-'\x{5649}\x{564A}\x{564C}\x{564D}\x{564E}\x{564F}\x{5650}\x{5652}\x{5653}' .
-'\x{5654}\x{5655}\x{5657}\x{5658}\x{5659}\x{565A}\x{565B}\x{565C}\x{565D}' .
-'\x{565E}\x{5660}\x{5662}\x{5663}\x{5664}\x{5665}\x{5666}\x{5667}\x{5668}' .
-'\x{5669}\x{566A}\x{566B}\x{566C}\x{566D}\x{566E}\x{566F}\x{5670}\x{5671}' .
-'\x{5672}\x{5673}\x{5674}\x{5676}\x{5677}\x{5678}\x{5679}\x{567A}\x{567B}' .
-'\x{567C}\x{567E}\x{567F}\x{5680}\x{5681}\x{5682}\x{5683}\x{5684}\x{5685}' .
-'\x{5686}\x{5687}\x{568A}\x{568C}\x{568D}\x{568E}\x{568F}\x{5690}\x{5691}' .
-'\x{5692}\x{5693}\x{5694}\x{5695}\x{5697}\x{5698}\x{5699}\x{569A}\x{569B}' .
-'\x{569C}\x{569D}\x{569F}\x{56A0}\x{56A1}\x{56A3}\x{56A4}\x{56A5}\x{56A6}' .
-'\x{56A7}\x{56A8}\x{56A9}\x{56AA}\x{56AB}\x{56AC}\x{56AD}\x{56AE}\x{56AF}' .
-'\x{56B0}\x{56B1}\x{56B2}\x{56B3}\x{56B4}\x{56B5}\x{56B6}\x{56B7}\x{56B8}' .
-'\x{56B9}\x{56BB}\x{56BC}\x{56BD}\x{56BE}\x{56BF}\x{56C0}\x{56C1}\x{56C2}' .
-'\x{56C3}\x{56C4}\x{56C5}\x{56C6}\x{56C7}\x{56C8}\x{56C9}\x{56CA}\x{56CB}' .
-'\x{56CC}\x{56CD}\x{56CE}\x{56D0}\x{56D1}\x{56D2}\x{56D3}\x{56D4}\x{56D5}' .
-'\x{56D6}\x{56D7}\x{56D8}\x{56DA}\x{56DB}\x{56DC}\x{56DD}\x{56DE}\x{56DF}' .
-'\x{56E0}\x{56E1}\x{56E2}\x{56E3}\x{56E4}\x{56E5}\x{56E7}\x{56E8}\x{56E9}' .
-'\x{56EA}\x{56EB}\x{56EC}\x{56ED}\x{56EE}\x{56EF}\x{56F0}\x{56F1}\x{56F2}' .
-'\x{56F3}\x{56F4}\x{56F5}\x{56F7}\x{56F9}\x{56FA}\x{56FD}\x{56FE}\x{56FF}' .
-'\x{5700}\x{5701}\x{5702}\x{5703}\x{5704}\x{5706}\x{5707}\x{5708}\x{5709}' .
-'\x{570A}\x{570B}\x{570C}\x{570D}\x{570E}\x{570F}\x{5710}\x{5712}\x{5713}' .
-'\x{5714}\x{5715}\x{5716}\x{5718}\x{5719}\x{571A}\x{571B}\x{571C}\x{571D}' .
-'\x{571E}\x{571F}\x{5720}\x{5722}\x{5723}\x{5725}\x{5726}\x{5727}\x{5728}' .
-'\x{5729}\x{572A}\x{572B}\x{572C}\x{572D}\x{572E}\x{572F}\x{5730}\x{5731}' .
-'\x{5732}\x{5733}\x{5734}\x{5735}\x{5736}\x{5737}\x{5738}\x{5739}\x{573A}' .
-'\x{573B}\x{573C}\x{573E}\x{573F}\x{5740}\x{5741}\x{5742}\x{5744}\x{5745}' .
-'\x{5746}\x{5747}\x{5749}\x{574A}\x{574B}\x{574C}\x{574D}\x{574E}\x{574F}' .
-'\x{5750}\x{5751}\x{5752}\x{5753}\x{5754}\x{5757}\x{5759}\x{575A}\x{575B}' .
-'\x{575C}\x{575D}\x{575E}\x{575F}\x{5760}\x{5761}\x{5762}\x{5764}\x{5765}' .
-'\x{5766}\x{5767}\x{5768}\x{5769}\x{576A}\x{576B}\x{576C}\x{576D}\x{576F}' .
-'\x{5770}\x{5771}\x{5772}\x{5773}\x{5774}\x{5775}\x{5776}\x{5777}\x{5779}' .
-'\x{577A}\x{577B}\x{577C}\x{577D}\x{577E}\x{577F}\x{5780}\x{5782}\x{5783}' .
-'\x{5784}\x{5785}\x{5786}\x{5788}\x{5789}\x{578A}\x{578B}\x{578C}\x{578D}' .
-'\x{578E}\x{578F}\x{5790}\x{5791}\x{5792}\x{5793}\x{5794}\x{5795}\x{5797}' .
-'\x{5798}\x{5799}\x{579A}\x{579B}\x{579C}\x{579D}\x{579E}\x{579F}\x{57A0}' .
-'\x{57A1}\x{57A2}\x{57A3}\x{57A4}\x{57A5}\x{57A6}\x{57A7}\x{57A9}\x{57AA}' .
-'\x{57AB}\x{57AC}\x{57AD}\x{57AE}\x{57AF}\x{57B0}\x{57B1}\x{57B2}\x{57B3}' .
-'\x{57B4}\x{57B5}\x{57B6}\x{57B7}\x{57B8}\x{57B9}\x{57BA}\x{57BB}\x{57BC}' .
-'\x{57BD}\x{57BE}\x{57BF}\x{57C0}\x{57C1}\x{57C2}\x{57C3}\x{57C4}\x{57C5}' .
-'\x{57C6}\x{57C7}\x{57C8}\x{57C9}\x{57CB}\x{57CC}\x{57CD}\x{57CE}\x{57CF}' .
-'\x{57D0}\x{57D2}\x{57D3}\x{57D4}\x{57D5}\x{57D6}\x{57D8}\x{57D9}\x{57DA}' .
-'\x{57DC}\x{57DD}\x{57DF}\x{57E0}\x{57E1}\x{57E2}\x{57E3}\x{57E4}\x{57E5}' .
-'\x{57E6}\x{57E7}\x{57E8}\x{57E9}\x{57EA}\x{57EB}\x{57EC}\x{57ED}\x{57EE}' .
-'\x{57EF}\x{57F0}\x{57F1}\x{57F2}\x{57F3}\x{57F4}\x{57F5}\x{57F6}\x{57F7}' .
-'\x{57F8}\x{57F9}\x{57FA}\x{57FB}\x{57FC}\x{57FD}\x{57FE}\x{57FF}\x{5800}' .
-'\x{5801}\x{5802}\x{5803}\x{5804}\x{5805}\x{5806}\x{5807}\x{5808}\x{5809}' .
-'\x{580A}\x{580B}\x{580C}\x{580D}\x{580E}\x{580F}\x{5810}\x{5811}\x{5812}' .
-'\x{5813}\x{5814}\x{5815}\x{5816}\x{5819}\x{581A}\x{581B}\x{581C}\x{581D}' .
-'\x{581E}\x{581F}\x{5820}\x{5821}\x{5822}\x{5823}\x{5824}\x{5825}\x{5826}' .
-'\x{5827}\x{5828}\x{5829}\x{582A}\x{582B}\x{582C}\x{582D}\x{582E}\x{582F}' .
-'\x{5830}\x{5831}\x{5832}\x{5833}\x{5834}\x{5835}\x{5836}\x{5837}\x{5838}' .
-'\x{5839}\x{583A}\x{583B}\x{583C}\x{583D}\x{583E}\x{583F}\x{5840}\x{5842}' .
-'\x{5843}\x{5844}\x{5845}\x{5846}\x{5847}\x{5848}\x{5849}\x{584A}\x{584B}' .
-'\x{584C}\x{584D}\x{584E}\x{584F}\x{5851}\x{5852}\x{5853}\x{5854}\x{5855}' .
-'\x{5857}\x{5858}\x{5859}\x{585A}\x{585B}\x{585C}\x{585D}\x{585E}\x{585F}' .
-'\x{5861}\x{5862}\x{5863}\x{5864}\x{5865}\x{5868}\x{5869}\x{586A}\x{586B}' .
-'\x{586C}\x{586D}\x{586E}\x{586F}\x{5870}\x{5871}\x{5872}\x{5873}\x{5874}' .
-'\x{5875}\x{5876}\x{5878}\x{5879}\x{587A}\x{587B}\x{587C}\x{587D}\x{587E}' .
-'\x{587F}\x{5880}\x{5881}\x{5882}\x{5883}\x{5884}\x{5885}\x{5886}\x{5887}' .
-'\x{5888}\x{5889}\x{588A}\x{588B}\x{588C}\x{588D}\x{588E}\x{588F}\x{5890}' .
-'\x{5891}\x{5892}\x{5893}\x{5894}\x{5896}\x{5897}\x{5898}\x{5899}\x{589A}' .
-'\x{589B}\x{589C}\x{589D}\x{589E}\x{589F}\x{58A0}\x{58A1}\x{58A2}\x{58A3}' .
-'\x{58A4}\x{58A5}\x{58A6}\x{58A7}\x{58A8}\x{58A9}\x{58AB}\x{58AC}\x{58AD}' .
-'\x{58AE}\x{58AF}\x{58B0}\x{58B1}\x{58B2}\x{58B3}\x{58B4}\x{58B7}\x{58B8}' .
-'\x{58B9}\x{58BA}\x{58BB}\x{58BC}\x{58BD}\x{58BE}\x{58BF}\x{58C1}\x{58C2}' .
-'\x{58C5}\x{58C6}\x{58C7}\x{58C8}\x{58C9}\x{58CA}\x{58CB}\x{58CE}\x{58CF}' .
-'\x{58D1}\x{58D2}\x{58D3}\x{58D4}\x{58D5}\x{58D6}\x{58D7}\x{58D8}\x{58D9}' .
-'\x{58DA}\x{58DB}\x{58DD}\x{58DE}\x{58DF}\x{58E0}\x{58E2}\x{58E3}\x{58E4}' .
-'\x{58E5}\x{58E7}\x{58E8}\x{58E9}\x{58EA}\x{58EB}\x{58EC}\x{58ED}\x{58EE}' .
-'\x{58EF}\x{58F0}\x{58F1}\x{58F2}\x{58F3}\x{58F4}\x{58F6}\x{58F7}\x{58F8}' .
-'\x{58F9}\x{58FA}\x{58FB}\x{58FC}\x{58FD}\x{58FE}\x{58FF}\x{5900}\x{5902}' .
-'\x{5903}\x{5904}\x{5906}\x{5907}\x{5909}\x{590A}\x{590B}\x{590C}\x{590D}' .
-'\x{590E}\x{590F}\x{5910}\x{5912}\x{5914}\x{5915}\x{5916}\x{5917}\x{5918}' .
-'\x{5919}\x{591A}\x{591B}\x{591C}\x{591D}\x{591E}\x{591F}\x{5920}\x{5921}' .
-'\x{5922}\x{5924}\x{5925}\x{5926}\x{5927}\x{5928}\x{5929}\x{592A}\x{592B}' .
-'\x{592C}\x{592D}\x{592E}\x{592F}\x{5930}\x{5931}\x{5932}\x{5934}\x{5935}' .
-'\x{5937}\x{5938}\x{5939}\x{593A}\x{593B}\x{593C}\x{593D}\x{593E}\x{593F}' .
-'\x{5940}\x{5941}\x{5942}\x{5943}\x{5944}\x{5945}\x{5946}\x{5947}\x{5948}' .
-'\x{5949}\x{594A}\x{594B}\x{594C}\x{594D}\x{594E}\x{594F}\x{5950}\x{5951}' .
-'\x{5952}\x{5953}\x{5954}\x{5955}\x{5956}\x{5957}\x{5958}\x{595A}\x{595C}' .
-'\x{595D}\x{595E}\x{595F}\x{5960}\x{5961}\x{5962}\x{5963}\x{5964}\x{5965}' .
-'\x{5966}\x{5967}\x{5968}\x{5969}\x{596A}\x{596B}\x{596C}\x{596D}\x{596E}' .
-'\x{596F}\x{5970}\x{5971}\x{5972}\x{5973}\x{5974}\x{5975}\x{5976}\x{5977}' .
-'\x{5978}\x{5979}\x{597A}\x{597B}\x{597C}\x{597D}\x{597E}\x{597F}\x{5980}' .
-'\x{5981}\x{5982}\x{5983}\x{5984}\x{5985}\x{5986}\x{5987}\x{5988}\x{5989}' .
-'\x{598A}\x{598B}\x{598C}\x{598D}\x{598E}\x{598F}\x{5990}\x{5991}\x{5992}' .
-'\x{5993}\x{5994}\x{5995}\x{5996}\x{5997}\x{5998}\x{5999}\x{599A}\x{599C}' .
-'\x{599D}\x{599E}\x{599F}\x{59A0}\x{59A1}\x{59A2}\x{59A3}\x{59A4}\x{59A5}' .
-'\x{59A6}\x{59A7}\x{59A8}\x{59A9}\x{59AA}\x{59AB}\x{59AC}\x{59AD}\x{59AE}' .
-'\x{59AF}\x{59B0}\x{59B1}\x{59B2}\x{59B3}\x{59B4}\x{59B5}\x{59B6}\x{59B8}' .
-'\x{59B9}\x{59BA}\x{59BB}\x{59BC}\x{59BD}\x{59BE}\x{59BF}\x{59C0}\x{59C1}' .
-'\x{59C2}\x{59C3}\x{59C4}\x{59C5}\x{59C6}\x{59C7}\x{59C8}\x{59C9}\x{59CA}' .
-'\x{59CB}\x{59CC}\x{59CD}\x{59CE}\x{59CF}\x{59D0}\x{59D1}\x{59D2}\x{59D3}' .
-'\x{59D4}\x{59D5}\x{59D6}\x{59D7}\x{59D8}\x{59D9}\x{59DA}\x{59DB}\x{59DC}' .
-'\x{59DD}\x{59DE}\x{59DF}\x{59E0}\x{59E1}\x{59E2}\x{59E3}\x{59E4}\x{59E5}' .
-'\x{59E6}\x{59E8}\x{59E9}\x{59EA}\x{59EB}\x{59EC}\x{59ED}\x{59EE}\x{59EF}' .
-'\x{59F0}\x{59F1}\x{59F2}\x{59F3}\x{59F4}\x{59F5}\x{59F6}\x{59F7}\x{59F8}' .
-'\x{59F9}\x{59FA}\x{59FB}\x{59FC}\x{59FD}\x{59FE}\x{59FF}\x{5A00}\x{5A01}' .
-'\x{5A02}\x{5A03}\x{5A04}\x{5A05}\x{5A06}\x{5A07}\x{5A08}\x{5A09}\x{5A0A}' .
-'\x{5A0B}\x{5A0C}\x{5A0D}\x{5A0E}\x{5A0F}\x{5A10}\x{5A11}\x{5A12}\x{5A13}' .
-'\x{5A14}\x{5A15}\x{5A16}\x{5A17}\x{5A18}\x{5A19}\x{5A1A}\x{5A1B}\x{5A1C}' .
-'\x{5A1D}\x{5A1E}\x{5A1F}\x{5A20}\x{5A21}\x{5A22}\x{5A23}\x{5A25}\x{5A27}' .
-'\x{5A28}\x{5A29}\x{5A2A}\x{5A2B}\x{5A2D}\x{5A2E}\x{5A2F}\x{5A31}\x{5A32}' .
-'\x{5A33}\x{5A34}\x{5A35}\x{5A36}\x{5A37}\x{5A38}\x{5A39}\x{5A3A}\x{5A3B}' .
-'\x{5A3C}\x{5A3D}\x{5A3E}\x{5A3F}\x{5A40}\x{5A41}\x{5A42}\x{5A43}\x{5A44}' .
-'\x{5A45}\x{5A46}\x{5A47}\x{5A48}\x{5A49}\x{5A4A}\x{5A4B}\x{5A4C}\x{5A4D}' .
-'\x{5A4E}\x{5A4F}\x{5A50}\x{5A51}\x{5A52}\x{5A53}\x{5A55}\x{5A56}\x{5A57}' .
-'\x{5A58}\x{5A5A}\x{5A5B}\x{5A5C}\x{5A5D}\x{5A5E}\x{5A5F}\x{5A60}\x{5A61}' .
-'\x{5A62}\x{5A63}\x{5A64}\x{5A65}\x{5A66}\x{5A67}\x{5A68}\x{5A69}\x{5A6A}' .
-'\x{5A6B}\x{5A6C}\x{5A6D}\x{5A6E}\x{5A70}\x{5A72}\x{5A73}\x{5A74}\x{5A75}' .
-'\x{5A76}\x{5A77}\x{5A78}\x{5A79}\x{5A7A}\x{5A7B}\x{5A7C}\x{5A7D}\x{5A7E}' .
-'\x{5A7F}\x{5A80}\x{5A81}\x{5A82}\x{5A83}\x{5A84}\x{5A85}\x{5A86}\x{5A88}' .
-'\x{5A89}\x{5A8A}\x{5A8B}\x{5A8C}\x{5A8E}\x{5A8F}\x{5A90}\x{5A91}\x{5A92}' .
-'\x{5A93}\x{5A94}\x{5A95}\x{5A96}\x{5A97}\x{5A98}\x{5A99}\x{5A9A}\x{5A9B}' .
-'\x{5A9C}\x{5A9D}\x{5A9E}\x{5A9F}\x{5AA0}\x{5AA1}\x{5AA2}\x{5AA3}\x{5AA4}' .
-'\x{5AA5}\x{5AA6}\x{5AA7}\x{5AA8}\x{5AA9}\x{5AAA}\x{5AAC}\x{5AAD}\x{5AAE}' .
-'\x{5AAF}\x{5AB0}\x{5AB1}\x{5AB2}\x{5AB3}\x{5AB4}\x{5AB5}\x{5AB6}\x{5AB7}' .
-'\x{5AB8}\x{5AB9}\x{5ABA}\x{5ABB}\x{5ABC}\x{5ABD}\x{5ABE}\x{5ABF}\x{5AC0}' .
-'\x{5AC1}\x{5AC2}\x{5AC3}\x{5AC4}\x{5AC5}\x{5AC6}\x{5AC7}\x{5AC8}\x{5AC9}' .
-'\x{5ACA}\x{5ACB}\x{5ACC}\x{5ACD}\x{5ACE}\x{5ACF}\x{5AD1}\x{5AD2}\x{5AD4}' .
-'\x{5AD5}\x{5AD6}\x{5AD7}\x{5AD8}\x{5AD9}\x{5ADA}\x{5ADB}\x{5ADC}\x{5ADD}' .
-'\x{5ADE}\x{5ADF}\x{5AE0}\x{5AE1}\x{5AE2}\x{5AE3}\x{5AE4}\x{5AE5}\x{5AE6}' .
-'\x{5AE7}\x{5AE8}\x{5AE9}\x{5AEA}\x{5AEB}\x{5AEC}\x{5AED}\x{5AEE}\x{5AF1}' .
-'\x{5AF2}\x{5AF3}\x{5AF4}\x{5AF5}\x{5AF6}\x{5AF7}\x{5AF8}\x{5AF9}\x{5AFA}' .
-'\x{5AFB}\x{5AFC}\x{5AFD}\x{5AFE}\x{5AFF}\x{5B00}\x{5B01}\x{5B02}\x{5B03}' .
-'\x{5B04}\x{5B05}\x{5B06}\x{5B07}\x{5B08}\x{5B09}\x{5B0B}\x{5B0C}\x{5B0E}' .
-'\x{5B0F}\x{5B10}\x{5B11}\x{5B12}\x{5B13}\x{5B14}\x{5B15}\x{5B16}\x{5B17}' .
-'\x{5B18}\x{5B19}\x{5B1A}\x{5B1B}\x{5B1C}\x{5B1D}\x{5B1E}\x{5B1F}\x{5B20}' .
-'\x{5B21}\x{5B22}\x{5B23}\x{5B24}\x{5B25}\x{5B26}\x{5B27}\x{5B28}\x{5B29}' .
-'\x{5B2A}\x{5B2B}\x{5B2C}\x{5B2D}\x{5B2E}\x{5B2F}\x{5B30}\x{5B31}\x{5B32}' .
-'\x{5B33}\x{5B34}\x{5B35}\x{5B36}\x{5B37}\x{5B38}\x{5B3A}\x{5B3B}\x{5B3C}' .
-'\x{5B3D}\x{5B3E}\x{5B3F}\x{5B40}\x{5B41}\x{5B42}\x{5B43}\x{5B44}\x{5B45}' .
-'\x{5B47}\x{5B48}\x{5B49}\x{5B4A}\x{5B4B}\x{5B4C}\x{5B4D}\x{5B4E}\x{5B50}' .
-'\x{5B51}\x{5B53}\x{5B54}\x{5B55}\x{5B56}\x{5B57}\x{5B58}\x{5B59}\x{5B5A}' .
-'\x{5B5B}\x{5B5C}\x{5B5D}\x{5B5E}\x{5B5F}\x{5B62}\x{5B63}\x{5B64}\x{5B65}' .
-'\x{5B66}\x{5B67}\x{5B68}\x{5B69}\x{5B6A}\x{5B6B}\x{5B6C}\x{5B6D}\x{5B6E}' .
-'\x{5B70}\x{5B71}\x{5B72}\x{5B73}\x{5B74}\x{5B75}\x{5B76}\x{5B77}\x{5B78}' .
-'\x{5B7A}\x{5B7B}\x{5B7C}\x{5B7D}\x{5B7F}\x{5B80}\x{5B81}\x{5B82}\x{5B83}' .
-'\x{5B84}\x{5B85}\x{5B87}\x{5B88}\x{5B89}\x{5B8A}\x{5B8B}\x{5B8C}\x{5B8D}' .
-'\x{5B8E}\x{5B8F}\x{5B91}\x{5B92}\x{5B93}\x{5B94}\x{5B95}\x{5B96}\x{5B97}' .
-'\x{5B98}\x{5B99}\x{5B9A}\x{5B9B}\x{5B9C}\x{5B9D}\x{5B9E}\x{5B9F}\x{5BA0}' .
-'\x{5BA1}\x{5BA2}\x{5BA3}\x{5BA4}\x{5BA5}\x{5BA6}\x{5BA7}\x{5BA8}\x{5BAA}' .
-'\x{5BAB}\x{5BAC}\x{5BAD}\x{5BAE}\x{5BAF}\x{5BB0}\x{5BB1}\x{5BB3}\x{5BB4}' .
-'\x{5BB5}\x{5BB6}\x{5BB8}\x{5BB9}\x{5BBA}\x{5BBB}\x{5BBD}\x{5BBE}\x{5BBF}' .
-'\x{5BC0}\x{5BC1}\x{5BC2}\x{5BC3}\x{5BC4}\x{5BC5}\x{5BC6}\x{5BC7}\x{5BCA}' .
-'\x{5BCB}\x{5BCC}\x{5BCD}\x{5BCE}\x{5BCF}\x{5BD0}\x{5BD1}\x{5BD2}\x{5BD3}' .
-'\x{5BD4}\x{5BD5}\x{5BD6}\x{5BD8}\x{5BD9}\x{5BDB}\x{5BDC}\x{5BDD}\x{5BDE}' .
-'\x{5BDF}\x{5BE0}\x{5BE1}\x{5BE2}\x{5BE3}\x{5BE4}\x{5BE5}\x{5BE6}\x{5BE7}' .
-'\x{5BE8}\x{5BE9}\x{5BEA}\x{5BEB}\x{5BEC}\x{5BED}\x{5BEE}\x{5BEF}\x{5BF0}' .
-'\x{5BF1}\x{5BF2}\x{5BF3}\x{5BF4}\x{5BF5}\x{5BF6}\x{5BF7}\x{5BF8}\x{5BF9}' .
-'\x{5BFA}\x{5BFB}\x{5BFC}\x{5BFD}\x{5BFF}\x{5C01}\x{5C03}\x{5C04}\x{5C05}' .
-'\x{5C06}\x{5C07}\x{5C08}\x{5C09}\x{5C0A}\x{5C0B}\x{5C0C}\x{5C0D}\x{5C0E}' .
-'\x{5C0F}\x{5C10}\x{5C11}\x{5C12}\x{5C13}\x{5C14}\x{5C15}\x{5C16}\x{5C17}' .
-'\x{5C18}\x{5C19}\x{5C1A}\x{5C1C}\x{5C1D}\x{5C1E}\x{5C1F}\x{5C20}\x{5C21}' .
-'\x{5C22}\x{5C24}\x{5C25}\x{5C27}\x{5C28}\x{5C2A}\x{5C2B}\x{5C2C}\x{5C2D}' .
-'\x{5C2E}\x{5C2F}\x{5C30}\x{5C31}\x{5C32}\x{5C33}\x{5C34}\x{5C35}\x{5C37}' .
-'\x{5C38}\x{5C39}\x{5C3A}\x{5C3B}\x{5C3C}\x{5C3D}\x{5C3E}\x{5C3F}\x{5C40}' .
-'\x{5C41}\x{5C42}\x{5C43}\x{5C44}\x{5C45}\x{5C46}\x{5C47}\x{5C48}\x{5C49}' .
-'\x{5C4A}\x{5C4B}\x{5C4C}\x{5C4D}\x{5C4E}\x{5C4F}\x{5C50}\x{5C51}\x{5C52}' .
-'\x{5C53}\x{5C54}\x{5C55}\x{5C56}\x{5C57}\x{5C58}\x{5C59}\x{5C5B}\x{5C5C}' .
-'\x{5C5D}\x{5C5E}\x{5C5F}\x{5C60}\x{5C61}\x{5C62}\x{5C63}\x{5C64}\x{5C65}' .
-'\x{5C66}\x{5C67}\x{5C68}\x{5C69}\x{5C6A}\x{5C6B}\x{5C6C}\x{5C6D}\x{5C6E}' .
-'\x{5C6F}\x{5C70}\x{5C71}\x{5C72}\x{5C73}\x{5C74}\x{5C75}\x{5C76}\x{5C77}' .
-'\x{5C78}\x{5C79}\x{5C7A}\x{5C7B}\x{5C7C}\x{5C7D}\x{5C7E}\x{5C7F}\x{5C80}' .
-'\x{5C81}\x{5C82}\x{5C83}\x{5C84}\x{5C86}\x{5C87}\x{5C88}\x{5C89}\x{5C8A}' .
-'\x{5C8B}\x{5C8C}\x{5C8D}\x{5C8E}\x{5C8F}\x{5C90}\x{5C91}\x{5C92}\x{5C93}' .
-'\x{5C94}\x{5C95}\x{5C96}\x{5C97}\x{5C98}\x{5C99}\x{5C9A}\x{5C9B}\x{5C9C}' .
-'\x{5C9D}\x{5C9E}\x{5C9F}\x{5CA0}\x{5CA1}\x{5CA2}\x{5CA3}\x{5CA4}\x{5CA5}' .
-'\x{5CA6}\x{5CA7}\x{5CA8}\x{5CA9}\x{5CAA}\x{5CAB}\x{5CAC}\x{5CAD}\x{5CAE}' .
-'\x{5CAF}\x{5CB0}\x{5CB1}\x{5CB2}\x{5CB3}\x{5CB5}\x{5CB6}\x{5CB7}\x{5CB8}' .
-'\x{5CBA}\x{5CBB}\x{5CBC}\x{5CBD}\x{5CBE}\x{5CBF}\x{5CC1}\x{5CC2}\x{5CC3}' .
-'\x{5CC4}\x{5CC5}\x{5CC6}\x{5CC7}\x{5CC8}\x{5CC9}\x{5CCA}\x{5CCB}\x{5CCC}' .
-'\x{5CCD}\x{5CCE}\x{5CCF}\x{5CD0}\x{5CD1}\x{5CD2}\x{5CD3}\x{5CD4}\x{5CD6}' .
-'\x{5CD7}\x{5CD8}\x{5CD9}\x{5CDA}\x{5CDB}\x{5CDC}\x{5CDE}\x{5CDF}\x{5CE0}' .
-'\x{5CE1}\x{5CE2}\x{5CE3}\x{5CE4}\x{5CE5}\x{5CE6}\x{5CE7}\x{5CE8}\x{5CE9}' .
-'\x{5CEA}\x{5CEB}\x{5CEC}\x{5CED}\x{5CEE}\x{5CEF}\x{5CF0}\x{5CF1}\x{5CF2}' .
-'\x{5CF3}\x{5CF4}\x{5CF6}\x{5CF7}\x{5CF8}\x{5CF9}\x{5CFA}\x{5CFB}\x{5CFC}' .
-'\x{5CFD}\x{5CFE}\x{5CFF}\x{5D00}\x{5D01}\x{5D02}\x{5D03}\x{5D04}\x{5D05}' .
-'\x{5D06}\x{5D07}\x{5D08}\x{5D09}\x{5D0A}\x{5D0B}\x{5D0C}\x{5D0D}\x{5D0E}' .
-'\x{5D0F}\x{5D10}\x{5D11}\x{5D12}\x{5D13}\x{5D14}\x{5D15}\x{5D16}\x{5D17}' .
-'\x{5D18}\x{5D19}\x{5D1A}\x{5D1B}\x{5D1C}\x{5D1D}\x{5D1E}\x{5D1F}\x{5D20}' .
-'\x{5D21}\x{5D22}\x{5D23}\x{5D24}\x{5D25}\x{5D26}\x{5D27}\x{5D28}\x{5D29}' .
-'\x{5D2A}\x{5D2C}\x{5D2D}\x{5D2E}\x{5D30}\x{5D31}\x{5D32}\x{5D33}\x{5D34}' .
-'\x{5D35}\x{5D36}\x{5D37}\x{5D38}\x{5D39}\x{5D3A}\x{5D3C}\x{5D3D}\x{5D3E}' .
-'\x{5D3F}\x{5D40}\x{5D41}\x{5D42}\x{5D43}\x{5D44}\x{5D45}\x{5D46}\x{5D47}' .
-'\x{5D48}\x{5D49}\x{5D4A}\x{5D4B}\x{5D4C}\x{5D4D}\x{5D4E}\x{5D4F}\x{5D50}' .
-'\x{5D51}\x{5D52}\x{5D54}\x{5D55}\x{5D56}\x{5D58}\x{5D59}\x{5D5A}\x{5D5B}' .
-'\x{5D5D}\x{5D5E}\x{5D5F}\x{5D61}\x{5D62}\x{5D63}\x{5D64}\x{5D65}\x{5D66}' .
-'\x{5D67}\x{5D68}\x{5D69}\x{5D6A}\x{5D6B}\x{5D6C}\x{5D6D}\x{5D6E}\x{5D6F}' .
-'\x{5D70}\x{5D71}\x{5D72}\x{5D73}\x{5D74}\x{5D75}\x{5D76}\x{5D77}\x{5D78}' .
-'\x{5D79}\x{5D7A}\x{5D7B}\x{5D7C}\x{5D7D}\x{5D7E}\x{5D7F}\x{5D80}\x{5D81}' .
-'\x{5D82}\x{5D84}\x{5D85}\x{5D86}\x{5D87}\x{5D88}\x{5D89}\x{5D8A}\x{5D8B}' .
-'\x{5D8C}\x{5D8D}\x{5D8E}\x{5D8F}\x{5D90}\x{5D91}\x{5D92}\x{5D93}\x{5D94}' .
-'\x{5D95}\x{5D97}\x{5D98}\x{5D99}\x{5D9A}\x{5D9B}\x{5D9C}\x{5D9D}\x{5D9E}' .
-'\x{5D9F}\x{5DA0}\x{5DA1}\x{5DA2}\x{5DA5}\x{5DA6}\x{5DA7}\x{5DA8}\x{5DA9}' .
-'\x{5DAA}\x{5DAC}\x{5DAD}\x{5DAE}\x{5DAF}\x{5DB0}\x{5DB1}\x{5DB2}\x{5DB4}' .
-'\x{5DB5}\x{5DB6}\x{5DB7}\x{5DB8}\x{5DBA}\x{5DBB}\x{5DBC}\x{5DBD}\x{5DBE}' .
-'\x{5DBF}\x{5DC0}\x{5DC1}\x{5DC2}\x{5DC3}\x{5DC5}\x{5DC6}\x{5DC7}\x{5DC8}' .
-'\x{5DC9}\x{5DCA}\x{5DCB}\x{5DCC}\x{5DCD}\x{5DCE}\x{5DCF}\x{5DD0}\x{5DD1}' .
-'\x{5DD2}\x{5DD3}\x{5DD4}\x{5DD5}\x{5DD6}\x{5DD8}\x{5DD9}\x{5DDB}\x{5DDD}' .
-'\x{5DDE}\x{5DDF}\x{5DE0}\x{5DE1}\x{5DE2}\x{5DE3}\x{5DE4}\x{5DE5}\x{5DE6}' .
-'\x{5DE7}\x{5DE8}\x{5DE9}\x{5DEA}\x{5DEB}\x{5DEC}\x{5DED}\x{5DEE}\x{5DEF}' .
-'\x{5DF0}\x{5DF1}\x{5DF2}\x{5DF3}\x{5DF4}\x{5DF5}\x{5DF7}\x{5DF8}\x{5DF9}' .
-'\x{5DFA}\x{5DFB}\x{5DFC}\x{5DFD}\x{5DFE}\x{5DFF}\x{5E00}\x{5E01}\x{5E02}' .
-'\x{5E03}\x{5E04}\x{5E05}\x{5E06}\x{5E07}\x{5E08}\x{5E09}\x{5E0A}\x{5E0B}' .
-'\x{5E0C}\x{5E0D}\x{5E0E}\x{5E0F}\x{5E10}\x{5E11}\x{5E13}\x{5E14}\x{5E15}' .
-'\x{5E16}\x{5E17}\x{5E18}\x{5E19}\x{5E1A}\x{5E1B}\x{5E1C}\x{5E1D}\x{5E1E}' .
-'\x{5E1F}\x{5E20}\x{5E21}\x{5E22}\x{5E23}\x{5E24}\x{5E25}\x{5E26}\x{5E27}' .
-'\x{5E28}\x{5E29}\x{5E2A}\x{5E2B}\x{5E2C}\x{5E2D}\x{5E2E}\x{5E2F}\x{5E30}' .
-'\x{5E31}\x{5E32}\x{5E33}\x{5E34}\x{5E35}\x{5E36}\x{5E37}\x{5E38}\x{5E39}' .
-'\x{5E3A}\x{5E3B}\x{5E3C}\x{5E3D}\x{5E3E}\x{5E40}\x{5E41}\x{5E42}\x{5E43}' .
-'\x{5E44}\x{5E45}\x{5E46}\x{5E47}\x{5E49}\x{5E4A}\x{5E4B}\x{5E4C}\x{5E4D}' .
-'\x{5E4E}\x{5E4F}\x{5E50}\x{5E52}\x{5E53}\x{5E54}\x{5E55}\x{5E56}\x{5E57}' .
-'\x{5E58}\x{5E59}\x{5E5A}\x{5E5B}\x{5E5C}\x{5E5D}\x{5E5E}\x{5E5F}\x{5E60}' .
-'\x{5E61}\x{5E62}\x{5E63}\x{5E64}\x{5E65}\x{5E66}\x{5E67}\x{5E68}\x{5E69}' .
-'\x{5E6A}\x{5E6B}\x{5E6C}\x{5E6D}\x{5E6E}\x{5E6F}\x{5E70}\x{5E71}\x{5E72}' .
-'\x{5E73}\x{5E74}\x{5E75}\x{5E76}\x{5E77}\x{5E78}\x{5E79}\x{5E7A}\x{5E7B}' .
-'\x{5E7C}\x{5E7D}\x{5E7E}\x{5E7F}\x{5E80}\x{5E81}\x{5E82}\x{5E83}\x{5E84}' .
-'\x{5E85}\x{5E86}\x{5E87}\x{5E88}\x{5E89}\x{5E8A}\x{5E8B}\x{5E8C}\x{5E8D}' .
-'\x{5E8E}\x{5E8F}\x{5E90}\x{5E91}\x{5E93}\x{5E94}\x{5E95}\x{5E96}\x{5E97}' .
-'\x{5E98}\x{5E99}\x{5E9A}\x{5E9B}\x{5E9C}\x{5E9D}\x{5E9E}\x{5E9F}\x{5EA0}' .
-'\x{5EA1}\x{5EA2}\x{5EA3}\x{5EA4}\x{5EA5}\x{5EA6}\x{5EA7}\x{5EA8}\x{5EA9}' .
-'\x{5EAA}\x{5EAB}\x{5EAC}\x{5EAD}\x{5EAE}\x{5EAF}\x{5EB0}\x{5EB1}\x{5EB2}' .
-'\x{5EB3}\x{5EB4}\x{5EB5}\x{5EB6}\x{5EB7}\x{5EB8}\x{5EB9}\x{5EBB}\x{5EBC}' .
-'\x{5EBD}\x{5EBE}\x{5EBF}\x{5EC1}\x{5EC2}\x{5EC3}\x{5EC4}\x{5EC5}\x{5EC6}' .
-'\x{5EC7}\x{5EC8}\x{5EC9}\x{5ECA}\x{5ECB}\x{5ECC}\x{5ECD}\x{5ECE}\x{5ECF}' .
-'\x{5ED0}\x{5ED1}\x{5ED2}\x{5ED3}\x{5ED4}\x{5ED5}\x{5ED6}\x{5ED7}\x{5ED8}' .
-'\x{5ED9}\x{5EDA}\x{5EDB}\x{5EDC}\x{5EDD}\x{5EDE}\x{5EDF}\x{5EE0}\x{5EE1}' .
-'\x{5EE2}\x{5EE3}\x{5EE4}\x{5EE5}\x{5EE6}\x{5EE7}\x{5EE8}\x{5EE9}\x{5EEA}' .
-'\x{5EEC}\x{5EED}\x{5EEE}\x{5EEF}\x{5EF0}\x{5EF1}\x{5EF2}\x{5EF3}\x{5EF4}' .
-'\x{5EF5}\x{5EF6}\x{5EF7}\x{5EF8}\x{5EFA}\x{5EFB}\x{5EFC}\x{5EFD}\x{5EFE}' .
-'\x{5EFF}\x{5F00}\x{5F01}\x{5F02}\x{5F03}\x{5F04}\x{5F05}\x{5F06}\x{5F07}' .
-'\x{5F08}\x{5F0A}\x{5F0B}\x{5F0C}\x{5F0D}\x{5F0F}\x{5F11}\x{5F12}\x{5F13}' .
-'\x{5F14}\x{5F15}\x{5F16}\x{5F17}\x{5F18}\x{5F19}\x{5F1A}\x{5F1B}\x{5F1C}' .
-'\x{5F1D}\x{5F1E}\x{5F1F}\x{5F20}\x{5F21}\x{5F22}\x{5F23}\x{5F24}\x{5F25}' .
-'\x{5F26}\x{5F27}\x{5F28}\x{5F29}\x{5F2A}\x{5F2B}\x{5F2C}\x{5F2D}\x{5F2E}' .
-'\x{5F2F}\x{5F30}\x{5F31}\x{5F32}\x{5F33}\x{5F34}\x{5F35}\x{5F36}\x{5F37}' .
-'\x{5F38}\x{5F39}\x{5F3A}\x{5F3C}\x{5F3E}\x{5F3F}\x{5F40}\x{5F41}\x{5F42}' .
-'\x{5F43}\x{5F44}\x{5F45}\x{5F46}\x{5F47}\x{5F48}\x{5F49}\x{5F4A}\x{5F4B}' .
-'\x{5F4C}\x{5F4D}\x{5F4E}\x{5F4F}\x{5F50}\x{5F51}\x{5F52}\x{5F53}\x{5F54}' .
-'\x{5F55}\x{5F56}\x{5F57}\x{5F58}\x{5F59}\x{5F5A}\x{5F5B}\x{5F5C}\x{5F5D}' .
-'\x{5F5E}\x{5F5F}\x{5F60}\x{5F61}\x{5F62}\x{5F63}\x{5F64}\x{5F65}\x{5F66}' .
-'\x{5F67}\x{5F68}\x{5F69}\x{5F6A}\x{5F6B}\x{5F6C}\x{5F6D}\x{5F6E}\x{5F6F}' .
-'\x{5F70}\x{5F71}\x{5F72}\x{5F73}\x{5F74}\x{5F75}\x{5F76}\x{5F77}\x{5F78}' .
-'\x{5F79}\x{5F7A}\x{5F7B}\x{5F7C}\x{5F7D}\x{5F7E}\x{5F7F}\x{5F80}\x{5F81}' .
-'\x{5F82}\x{5F83}\x{5F84}\x{5F85}\x{5F86}\x{5F87}\x{5F88}\x{5F89}\x{5F8A}' .
-'\x{5F8B}\x{5F8C}\x{5F8D}\x{5F8E}\x{5F90}\x{5F91}\x{5F92}\x{5F93}\x{5F94}' .
-'\x{5F95}\x{5F96}\x{5F97}\x{5F98}\x{5F99}\x{5F9B}\x{5F9C}\x{5F9D}\x{5F9E}' .
-'\x{5F9F}\x{5FA0}\x{5FA1}\x{5FA2}\x{5FA5}\x{5FA6}\x{5FA7}\x{5FA8}\x{5FA9}' .
-'\x{5FAA}\x{5FAB}\x{5FAC}\x{5FAD}\x{5FAE}\x{5FAF}\x{5FB1}\x{5FB2}\x{5FB3}' .
-'\x{5FB4}\x{5FB5}\x{5FB6}\x{5FB7}\x{5FB8}\x{5FB9}\x{5FBA}\x{5FBB}\x{5FBC}' .
-'\x{5FBD}\x{5FBE}\x{5FBF}\x{5FC0}\x{5FC1}\x{5FC3}\x{5FC4}\x{5FC5}\x{5FC6}' .
-'\x{5FC7}\x{5FC8}\x{5FC9}\x{5FCA}\x{5FCB}\x{5FCC}\x{5FCD}\x{5FCF}\x{5FD0}' .
-'\x{5FD1}\x{5FD2}\x{5FD3}\x{5FD4}\x{5FD5}\x{5FD6}\x{5FD7}\x{5FD8}\x{5FD9}' .
-'\x{5FDA}\x{5FDC}\x{5FDD}\x{5FDE}\x{5FE0}\x{5FE1}\x{5FE3}\x{5FE4}\x{5FE5}' .
-'\x{5FE6}\x{5FE7}\x{5FE8}\x{5FE9}\x{5FEA}\x{5FEB}\x{5FED}\x{5FEE}\x{5FEF}' .
-'\x{5FF0}\x{5FF1}\x{5FF2}\x{5FF3}\x{5FF4}\x{5FF5}\x{5FF6}\x{5FF7}\x{5FF8}' .
-'\x{5FF9}\x{5FFA}\x{5FFB}\x{5FFD}\x{5FFE}\x{5FFF}\x{6000}\x{6001}\x{6002}' .
-'\x{6003}\x{6004}\x{6005}\x{6006}\x{6007}\x{6008}\x{6009}\x{600A}\x{600B}' .
-'\x{600C}\x{600D}\x{600E}\x{600F}\x{6010}\x{6011}\x{6012}\x{6013}\x{6014}' .
-'\x{6015}\x{6016}\x{6017}\x{6018}\x{6019}\x{601A}\x{601B}\x{601C}\x{601D}' .
-'\x{601E}\x{601F}\x{6020}\x{6021}\x{6022}\x{6024}\x{6025}\x{6026}\x{6027}' .
-'\x{6028}\x{6029}\x{602A}\x{602B}\x{602C}\x{602D}\x{602E}\x{602F}\x{6030}' .
-'\x{6031}\x{6032}\x{6033}\x{6034}\x{6035}\x{6036}\x{6037}\x{6038}\x{6039}' .
-'\x{603A}\x{603B}\x{603C}\x{603D}\x{603E}\x{603F}\x{6040}\x{6041}\x{6042}' .
-'\x{6043}\x{6044}\x{6045}\x{6046}\x{6047}\x{6048}\x{6049}\x{604A}\x{604B}' .
-'\x{604C}\x{604D}\x{604E}\x{604F}\x{6050}\x{6051}\x{6052}\x{6053}\x{6054}' .
-'\x{6055}\x{6057}\x{6058}\x{6059}\x{605A}\x{605B}\x{605C}\x{605D}\x{605E}' .
-'\x{605F}\x{6062}\x{6063}\x{6064}\x{6065}\x{6066}\x{6067}\x{6068}\x{6069}' .
-'\x{606A}\x{606B}\x{606C}\x{606D}\x{606E}\x{606F}\x{6070}\x{6072}\x{6073}' .
-'\x{6075}\x{6076}\x{6077}\x{6078}\x{6079}\x{607A}\x{607B}\x{607C}\x{607D}' .
-'\x{607E}\x{607F}\x{6080}\x{6081}\x{6082}\x{6083}\x{6084}\x{6085}\x{6086}' .
-'\x{6087}\x{6088}\x{6089}\x{608A}\x{608B}\x{608C}\x{608D}\x{608E}\x{608F}' .
-'\x{6090}\x{6092}\x{6094}\x{6095}\x{6096}\x{6097}\x{6098}\x{6099}\x{609A}' .
-'\x{609B}\x{609C}\x{609D}\x{609E}\x{609F}\x{60A0}\x{60A1}\x{60A2}\x{60A3}' .
-'\x{60A4}\x{60A6}\x{60A7}\x{60A8}\x{60AA}\x{60AB}\x{60AC}\x{60AD}\x{60AE}' .
-'\x{60AF}\x{60B0}\x{60B1}\x{60B2}\x{60B3}\x{60B4}\x{60B5}\x{60B6}\x{60B7}' .
-'\x{60B8}\x{60B9}\x{60BA}\x{60BB}\x{60BC}\x{60BD}\x{60BE}\x{60BF}\x{60C0}' .
-'\x{60C1}\x{60C2}\x{60C3}\x{60C4}\x{60C5}\x{60C6}\x{60C7}\x{60C8}\x{60C9}' .
-'\x{60CA}\x{60CB}\x{60CC}\x{60CD}\x{60CE}\x{60CF}\x{60D0}\x{60D1}\x{60D3}' .
-'\x{60D4}\x{60D5}\x{60D7}\x{60D8}\x{60D9}\x{60DA}\x{60DB}\x{60DC}\x{60DD}' .
-'\x{60DF}\x{60E0}\x{60E1}\x{60E2}\x{60E4}\x{60E6}\x{60E7}\x{60E8}\x{60E9}' .
-'\x{60EA}\x{60EB}\x{60EC}\x{60ED}\x{60EE}\x{60EF}\x{60F0}\x{60F1}\x{60F2}' .
-'\x{60F3}\x{60F4}\x{60F5}\x{60F6}\x{60F7}\x{60F8}\x{60F9}\x{60FA}\x{60FB}' .
-'\x{60FC}\x{60FE}\x{60FF}\x{6100}\x{6101}\x{6103}\x{6104}\x{6105}\x{6106}' .
-'\x{6108}\x{6109}\x{610A}\x{610B}\x{610C}\x{610D}\x{610E}\x{610F}\x{6110}' .
-'\x{6112}\x{6113}\x{6114}\x{6115}\x{6116}\x{6117}\x{6118}\x{6119}\x{611A}' .
-'\x{611B}\x{611C}\x{611D}\x{611F}\x{6120}\x{6122}\x{6123}\x{6124}\x{6125}' .
-'\x{6126}\x{6127}\x{6128}\x{6129}\x{612A}\x{612B}\x{612C}\x{612D}\x{612E}' .
-'\x{612F}\x{6130}\x{6132}\x{6134}\x{6136}\x{6137}\x{613A}\x{613B}\x{613C}' .
-'\x{613D}\x{613E}\x{613F}\x{6140}\x{6141}\x{6142}\x{6143}\x{6144}\x{6145}' .
-'\x{6146}\x{6147}\x{6148}\x{6149}\x{614A}\x{614B}\x{614C}\x{614D}\x{614E}' .
-'\x{614F}\x{6150}\x{6151}\x{6152}\x{6153}\x{6154}\x{6155}\x{6156}\x{6157}' .
-'\x{6158}\x{6159}\x{615A}\x{615B}\x{615C}\x{615D}\x{615E}\x{615F}\x{6161}' .
-'\x{6162}\x{6163}\x{6164}\x{6165}\x{6166}\x{6167}\x{6168}\x{6169}\x{616A}' .
-'\x{616B}\x{616C}\x{616D}\x{616E}\x{6170}\x{6171}\x{6172}\x{6173}\x{6174}' .
-'\x{6175}\x{6176}\x{6177}\x{6178}\x{6179}\x{617A}\x{617C}\x{617E}\x{6180}' .
-'\x{6181}\x{6182}\x{6183}\x{6184}\x{6185}\x{6187}\x{6188}\x{6189}\x{618A}' .
-'\x{618B}\x{618C}\x{618D}\x{618E}\x{618F}\x{6190}\x{6191}\x{6192}\x{6193}' .
-'\x{6194}\x{6195}\x{6196}\x{6198}\x{6199}\x{619A}\x{619B}\x{619D}\x{619E}' .
-'\x{619F}\x{61A0}\x{61A1}\x{61A2}\x{61A3}\x{61A4}\x{61A5}\x{61A6}\x{61A7}' .
-'\x{61A8}\x{61A9}\x{61AA}\x{61AB}\x{61AC}\x{61AD}\x{61AE}\x{61AF}\x{61B0}' .
-'\x{61B1}\x{61B2}\x{61B3}\x{61B4}\x{61B5}\x{61B6}\x{61B7}\x{61B8}\x{61BA}' .
-'\x{61BC}\x{61BD}\x{61BE}\x{61BF}\x{61C0}\x{61C1}\x{61C2}\x{61C3}\x{61C4}' .
-'\x{61C5}\x{61C6}\x{61C7}\x{61C8}\x{61C9}\x{61CA}\x{61CB}\x{61CC}\x{61CD}' .
-'\x{61CE}\x{61CF}\x{61D0}\x{61D1}\x{61D2}\x{61D4}\x{61D6}\x{61D7}\x{61D8}' .
-'\x{61D9}\x{61DA}\x{61DB}\x{61DC}\x{61DD}\x{61DE}\x{61DF}\x{61E0}\x{61E1}' .
-'\x{61E2}\x{61E3}\x{61E4}\x{61E5}\x{61E6}\x{61E7}\x{61E8}\x{61E9}\x{61EA}' .
-'\x{61EB}\x{61ED}\x{61EE}\x{61F0}\x{61F1}\x{61F2}\x{61F3}\x{61F5}\x{61F6}' .
-'\x{61F7}\x{61F8}\x{61F9}\x{61FA}\x{61FB}\x{61FC}\x{61FD}\x{61FE}\x{61FF}' .
-'\x{6200}\x{6201}\x{6202}\x{6203}\x{6204}\x{6206}\x{6207}\x{6208}\x{6209}' .
-'\x{620A}\x{620B}\x{620C}\x{620D}\x{620E}\x{620F}\x{6210}\x{6211}\x{6212}' .
-'\x{6213}\x{6214}\x{6215}\x{6216}\x{6217}\x{6218}\x{6219}\x{621A}\x{621B}' .
-'\x{621C}\x{621D}\x{621E}\x{621F}\x{6220}\x{6221}\x{6222}\x{6223}\x{6224}' .
-'\x{6225}\x{6226}\x{6227}\x{6228}\x{6229}\x{622A}\x{622B}\x{622C}\x{622D}' .
-'\x{622E}\x{622F}\x{6230}\x{6231}\x{6232}\x{6233}\x{6234}\x{6236}\x{6237}' .
-'\x{6238}\x{623A}\x{623B}\x{623C}\x{623D}\x{623E}\x{623F}\x{6240}\x{6241}' .
-'\x{6242}\x{6243}\x{6244}\x{6245}\x{6246}\x{6247}\x{6248}\x{6249}\x{624A}' .
-'\x{624B}\x{624C}\x{624D}\x{624E}\x{624F}\x{6250}\x{6251}\x{6252}\x{6253}' .
-'\x{6254}\x{6255}\x{6256}\x{6258}\x{6259}\x{625A}\x{625B}\x{625C}\x{625D}' .
-'\x{625E}\x{625F}\x{6260}\x{6261}\x{6262}\x{6263}\x{6264}\x{6265}\x{6266}' .
-'\x{6267}\x{6268}\x{6269}\x{626A}\x{626B}\x{626C}\x{626D}\x{626E}\x{626F}' .
-'\x{6270}\x{6271}\x{6272}\x{6273}\x{6274}\x{6275}\x{6276}\x{6277}\x{6278}' .
-'\x{6279}\x{627A}\x{627B}\x{627C}\x{627D}\x{627E}\x{627F}\x{6280}\x{6281}' .
-'\x{6283}\x{6284}\x{6285}\x{6286}\x{6287}\x{6288}\x{6289}\x{628A}\x{628B}' .
-'\x{628C}\x{628E}\x{628F}\x{6290}\x{6291}\x{6292}\x{6293}\x{6294}\x{6295}' .
-'\x{6296}\x{6297}\x{6298}\x{6299}\x{629A}\x{629B}\x{629C}\x{629E}\x{629F}' .
-'\x{62A0}\x{62A1}\x{62A2}\x{62A3}\x{62A4}\x{62A5}\x{62A7}\x{62A8}\x{62A9}' .
-'\x{62AA}\x{62AB}\x{62AC}\x{62AD}\x{62AE}\x{62AF}\x{62B0}\x{62B1}\x{62B2}' .
-'\x{62B3}\x{62B4}\x{62B5}\x{62B6}\x{62B7}\x{62B8}\x{62B9}\x{62BA}\x{62BB}' .
-'\x{62BC}\x{62BD}\x{62BE}\x{62BF}\x{62C0}\x{62C1}\x{62C2}\x{62C3}\x{62C4}' .
-'\x{62C5}\x{62C6}\x{62C7}\x{62C8}\x{62C9}\x{62CA}\x{62CB}\x{62CC}\x{62CD}' .
-'\x{62CE}\x{62CF}\x{62D0}\x{62D1}\x{62D2}\x{62D3}\x{62D4}\x{62D5}\x{62D6}' .
-'\x{62D7}\x{62D8}\x{62D9}\x{62DA}\x{62DB}\x{62DC}\x{62DD}\x{62DF}\x{62E0}' .
-'\x{62E1}\x{62E2}\x{62E3}\x{62E4}\x{62E5}\x{62E6}\x{62E7}\x{62E8}\x{62E9}' .
-'\x{62EB}\x{62EC}\x{62ED}\x{62EE}\x{62EF}\x{62F0}\x{62F1}\x{62F2}\x{62F3}' .
-'\x{62F4}\x{62F5}\x{62F6}\x{62F7}\x{62F8}\x{62F9}\x{62FA}\x{62FB}\x{62FC}' .
-'\x{62FD}\x{62FE}\x{62FF}\x{6300}\x{6301}\x{6302}\x{6303}\x{6304}\x{6305}' .
-'\x{6306}\x{6307}\x{6308}\x{6309}\x{630B}\x{630C}\x{630D}\x{630E}\x{630F}' .
-'\x{6310}\x{6311}\x{6312}\x{6313}\x{6314}\x{6315}\x{6316}\x{6318}\x{6319}' .
-'\x{631A}\x{631B}\x{631C}\x{631D}\x{631E}\x{631F}\x{6320}\x{6321}\x{6322}' .
-'\x{6323}\x{6324}\x{6325}\x{6326}\x{6327}\x{6328}\x{6329}\x{632A}\x{632B}' .
-'\x{632C}\x{632D}\x{632E}\x{632F}\x{6330}\x{6332}\x{6333}\x{6334}\x{6336}' .
-'\x{6338}\x{6339}\x{633A}\x{633B}\x{633C}\x{633D}\x{633E}\x{6340}\x{6341}' .
-'\x{6342}\x{6343}\x{6344}\x{6345}\x{6346}\x{6347}\x{6348}\x{6349}\x{634A}' .
-'\x{634B}\x{634C}\x{634D}\x{634E}\x{634F}\x{6350}\x{6351}\x{6352}\x{6353}' .
-'\x{6354}\x{6355}\x{6356}\x{6357}\x{6358}\x{6359}\x{635A}\x{635C}\x{635D}' .
-'\x{635E}\x{635F}\x{6360}\x{6361}\x{6362}\x{6363}\x{6364}\x{6365}\x{6366}' .
-'\x{6367}\x{6368}\x{6369}\x{636A}\x{636B}\x{636C}\x{636D}\x{636E}\x{636F}' .
-'\x{6370}\x{6371}\x{6372}\x{6373}\x{6374}\x{6375}\x{6376}\x{6377}\x{6378}' .
-'\x{6379}\x{637A}\x{637B}\x{637C}\x{637D}\x{637E}\x{6380}\x{6381}\x{6382}' .
-'\x{6383}\x{6384}\x{6385}\x{6386}\x{6387}\x{6388}\x{6389}\x{638A}\x{638C}' .
-'\x{638D}\x{638E}\x{638F}\x{6390}\x{6391}\x{6392}\x{6394}\x{6395}\x{6396}' .
-'\x{6397}\x{6398}\x{6399}\x{639A}\x{639B}\x{639C}\x{639D}\x{639E}\x{639F}' .
-'\x{63A0}\x{63A1}\x{63A2}\x{63A3}\x{63A4}\x{63A5}\x{63A6}\x{63A7}\x{63A8}' .
-'\x{63A9}\x{63AA}\x{63AB}\x{63AC}\x{63AD}\x{63AE}\x{63AF}\x{63B0}\x{63B1}' .
-'\x{63B2}\x{63B3}\x{63B4}\x{63B5}\x{63B6}\x{63B7}\x{63B8}\x{63B9}\x{63BA}' .
-'\x{63BC}\x{63BD}\x{63BE}\x{63BF}\x{63C0}\x{63C1}\x{63C2}\x{63C3}\x{63C4}' .
-'\x{63C5}\x{63C6}\x{63C7}\x{63C8}\x{63C9}\x{63CA}\x{63CB}\x{63CC}\x{63CD}' .
-'\x{63CE}\x{63CF}\x{63D0}\x{63D2}\x{63D3}\x{63D4}\x{63D5}\x{63D6}\x{63D7}' .
-'\x{63D8}\x{63D9}\x{63DA}\x{63DB}\x{63DC}\x{63DD}\x{63DE}\x{63DF}\x{63E0}' .
-'\x{63E1}\x{63E2}\x{63E3}\x{63E4}\x{63E5}\x{63E6}\x{63E7}\x{63E8}\x{63E9}' .
-'\x{63EA}\x{63EB}\x{63EC}\x{63ED}\x{63EE}\x{63EF}\x{63F0}\x{63F1}\x{63F2}' .
-'\x{63F3}\x{63F4}\x{63F5}\x{63F6}\x{63F7}\x{63F8}\x{63F9}\x{63FA}\x{63FB}' .
-'\x{63FC}\x{63FD}\x{63FE}\x{63FF}\x{6400}\x{6401}\x{6402}\x{6403}\x{6404}' .
-'\x{6405}\x{6406}\x{6408}\x{6409}\x{640A}\x{640B}\x{640C}\x{640D}\x{640E}' .
-'\x{640F}\x{6410}\x{6411}\x{6412}\x{6413}\x{6414}\x{6415}\x{6416}\x{6417}' .
-'\x{6418}\x{6419}\x{641A}\x{641B}\x{641C}\x{641D}\x{641E}\x{641F}\x{6420}' .
-'\x{6421}\x{6422}\x{6423}\x{6424}\x{6425}\x{6426}\x{6427}\x{6428}\x{6429}' .
-'\x{642A}\x{642B}\x{642C}\x{642D}\x{642E}\x{642F}\x{6430}\x{6431}\x{6432}' .
-'\x{6433}\x{6434}\x{6435}\x{6436}\x{6437}\x{6438}\x{6439}\x{643A}\x{643D}' .
-'\x{643E}\x{643F}\x{6440}\x{6441}\x{6443}\x{6444}\x{6445}\x{6446}\x{6447}' .
-'\x{6448}\x{644A}\x{644B}\x{644C}\x{644D}\x{644E}\x{644F}\x{6450}\x{6451}' .
-'\x{6452}\x{6453}\x{6454}\x{6455}\x{6456}\x{6457}\x{6458}\x{6459}\x{645B}' .
-'\x{645C}\x{645D}\x{645E}\x{645F}\x{6460}\x{6461}\x{6462}\x{6463}\x{6464}' .
-'\x{6465}\x{6466}\x{6467}\x{6468}\x{6469}\x{646A}\x{646B}\x{646C}\x{646D}' .
-'\x{646E}\x{646F}\x{6470}\x{6471}\x{6472}\x{6473}\x{6474}\x{6475}\x{6476}' .
-'\x{6477}\x{6478}\x{6479}\x{647A}\x{647B}\x{647C}\x{647D}\x{647F}\x{6480}' .
-'\x{6481}\x{6482}\x{6483}\x{6484}\x{6485}\x{6487}\x{6488}\x{6489}\x{648A}' .
-'\x{648B}\x{648C}\x{648D}\x{648E}\x{648F}\x{6490}\x{6491}\x{6492}\x{6493}' .
-'\x{6494}\x{6495}\x{6496}\x{6497}\x{6498}\x{6499}\x{649A}\x{649B}\x{649C}' .
-'\x{649D}\x{649E}\x{649F}\x{64A0}\x{64A2}\x{64A3}\x{64A4}\x{64A5}\x{64A6}' .
-'\x{64A7}\x{64A8}\x{64A9}\x{64AA}\x{64AB}\x{64AC}\x{64AD}\x{64AE}\x{64B0}' .
-'\x{64B1}\x{64B2}\x{64B3}\x{64B4}\x{64B5}\x{64B7}\x{64B8}\x{64B9}\x{64BA}' .
-'\x{64BB}\x{64BC}\x{64BD}\x{64BE}\x{64BF}\x{64C0}\x{64C1}\x{64C2}\x{64C3}' .
-'\x{64C4}\x{64C5}\x{64C6}\x{64C7}\x{64C9}\x{64CA}\x{64CB}\x{64CC}\x{64CD}' .
-'\x{64CE}\x{64CF}\x{64D0}\x{64D1}\x{64D2}\x{64D3}\x{64D4}\x{64D6}\x{64D7}' .
-'\x{64D8}\x{64D9}\x{64DA}\x{64DB}\x{64DC}\x{64DD}\x{64DE}\x{64DF}\x{64E0}' .
-'\x{64E2}\x{64E3}\x{64E4}\x{64E6}\x{64E7}\x{64E8}\x{64E9}\x{64EA}\x{64EB}' .
-'\x{64EC}\x{64ED}\x{64EF}\x{64F0}\x{64F1}\x{64F2}\x{64F3}\x{64F4}\x{64F6}' .
-'\x{64F7}\x{64F8}\x{64FA}\x{64FB}\x{64FC}\x{64FD}\x{64FE}\x{64FF}\x{6500}' .
-'\x{6501}\x{6503}\x{6504}\x{6505}\x{6506}\x{6507}\x{6508}\x{6509}\x{650B}' .
-'\x{650C}\x{650D}\x{650E}\x{650F}\x{6510}\x{6511}\x{6512}\x{6513}\x{6514}' .
-'\x{6515}\x{6516}\x{6517}\x{6518}\x{6519}\x{651A}\x{651B}\x{651C}\x{651D}' .
-'\x{651E}\x{6520}\x{6521}\x{6522}\x{6523}\x{6524}\x{6525}\x{6526}\x{6527}' .
-'\x{6529}\x{652A}\x{652B}\x{652C}\x{652D}\x{652E}\x{652F}\x{6530}\x{6531}' .
-'\x{6532}\x{6533}\x{6534}\x{6535}\x{6536}\x{6537}\x{6538}\x{6539}\x{653A}' .
-'\x{653B}\x{653C}\x{653D}\x{653E}\x{653F}\x{6541}\x{6543}\x{6544}\x{6545}' .
-'\x{6546}\x{6547}\x{6548}\x{6549}\x{654A}\x{654B}\x{654C}\x{654D}\x{654E}' .
-'\x{654F}\x{6550}\x{6551}\x{6552}\x{6553}\x{6554}\x{6555}\x{6556}\x{6557}' .
-'\x{6558}\x{6559}\x{655B}\x{655C}\x{655D}\x{655E}\x{6560}\x{6561}\x{6562}' .
-'\x{6563}\x{6564}\x{6565}\x{6566}\x{6567}\x{6568}\x{6569}\x{656A}\x{656B}' .
-'\x{656C}\x{656E}\x{656F}\x{6570}\x{6571}\x{6572}\x{6573}\x{6574}\x{6575}' .
-'\x{6576}\x{6577}\x{6578}\x{6579}\x{657A}\x{657B}\x{657C}\x{657E}\x{657F}' .
-'\x{6580}\x{6581}\x{6582}\x{6583}\x{6584}\x{6585}\x{6586}\x{6587}\x{6588}' .
-'\x{6589}\x{658B}\x{658C}\x{658D}\x{658E}\x{658F}\x{6590}\x{6591}\x{6592}' .
-'\x{6593}\x{6594}\x{6595}\x{6596}\x{6597}\x{6598}\x{6599}\x{659B}\x{659C}' .
-'\x{659D}\x{659E}\x{659F}\x{65A0}\x{65A1}\x{65A2}\x{65A3}\x{65A4}\x{65A5}' .
-'\x{65A6}\x{65A7}\x{65A8}\x{65A9}\x{65AA}\x{65AB}\x{65AC}\x{65AD}\x{65AE}' .
-'\x{65AF}\x{65B0}\x{65B1}\x{65B2}\x{65B3}\x{65B4}\x{65B6}\x{65B7}\x{65B8}' .
-'\x{65B9}\x{65BA}\x{65BB}\x{65BC}\x{65BD}\x{65BF}\x{65C0}\x{65C1}\x{65C2}' .
-'\x{65C3}\x{65C4}\x{65C5}\x{65C6}\x{65C7}\x{65CA}\x{65CB}\x{65CC}\x{65CD}' .
-'\x{65CE}\x{65CF}\x{65D0}\x{65D2}\x{65D3}\x{65D4}\x{65D5}\x{65D6}\x{65D7}' .
-'\x{65DA}\x{65DB}\x{65DD}\x{65DE}\x{65DF}\x{65E0}\x{65E1}\x{65E2}\x{65E3}' .
-'\x{65E5}\x{65E6}\x{65E7}\x{65E8}\x{65E9}\x{65EB}\x{65EC}\x{65ED}\x{65EE}' .
-'\x{65EF}\x{65F0}\x{65F1}\x{65F2}\x{65F3}\x{65F4}\x{65F5}\x{65F6}\x{65F7}' .
-'\x{65F8}\x{65FA}\x{65FB}\x{65FC}\x{65FD}\x{6600}\x{6601}\x{6602}\x{6603}' .
-'\x{6604}\x{6605}\x{6606}\x{6607}\x{6608}\x{6609}\x{660A}\x{660B}\x{660C}' .
-'\x{660D}\x{660E}\x{660F}\x{6610}\x{6611}\x{6612}\x{6613}\x{6614}\x{6615}' .
-'\x{6616}\x{6618}\x{6619}\x{661A}\x{661B}\x{661C}\x{661D}\x{661F}\x{6620}' .
-'\x{6621}\x{6622}\x{6623}\x{6624}\x{6625}\x{6626}\x{6627}\x{6628}\x{6629}' .
-'\x{662A}\x{662B}\x{662D}\x{662E}\x{662F}\x{6630}\x{6631}\x{6632}\x{6633}' .
-'\x{6634}\x{6635}\x{6636}\x{6639}\x{663A}\x{663C}\x{663D}\x{663E}\x{6640}' .
-'\x{6641}\x{6642}\x{6643}\x{6644}\x{6645}\x{6646}\x{6647}\x{6649}\x{664A}' .
-'\x{664B}\x{664C}\x{664E}\x{664F}\x{6650}\x{6651}\x{6652}\x{6653}\x{6654}' .
-'\x{6655}\x{6656}\x{6657}\x{6658}\x{6659}\x{665A}\x{665B}\x{665C}\x{665D}' .
-'\x{665E}\x{665F}\x{6661}\x{6662}\x{6664}\x{6665}\x{6666}\x{6668}\x{6669}' .
-'\x{666A}\x{666B}\x{666C}\x{666D}\x{666E}\x{666F}\x{6670}\x{6671}\x{6672}' .
-'\x{6673}\x{6674}\x{6675}\x{6676}\x{6677}\x{6678}\x{6679}\x{667A}\x{667B}' .
-'\x{667C}\x{667D}\x{667E}\x{667F}\x{6680}\x{6681}\x{6682}\x{6683}\x{6684}' .
-'\x{6685}\x{6686}\x{6687}\x{6688}\x{6689}\x{668A}\x{668B}\x{668C}\x{668D}' .
-'\x{668E}\x{668F}\x{6690}\x{6691}\x{6693}\x{6694}\x{6695}\x{6696}\x{6697}' .
-'\x{6698}\x{6699}\x{669A}\x{669B}\x{669D}\x{669F}\x{66A0}\x{66A1}\x{66A2}' .
-'\x{66A3}\x{66A4}\x{66A5}\x{66A6}\x{66A7}\x{66A8}\x{66A9}\x{66AA}\x{66AB}' .
-'\x{66AE}\x{66AF}\x{66B0}\x{66B1}\x{66B2}\x{66B3}\x{66B4}\x{66B5}\x{66B6}' .
-'\x{66B7}\x{66B8}\x{66B9}\x{66BA}\x{66BB}\x{66BC}\x{66BD}\x{66BE}\x{66BF}' .
-'\x{66C0}\x{66C1}\x{66C2}\x{66C3}\x{66C4}\x{66C5}\x{66C6}\x{66C7}\x{66C8}' .
-'\x{66C9}\x{66CA}\x{66CB}\x{66CC}\x{66CD}\x{66CE}\x{66CF}\x{66D1}\x{66D2}' .
-'\x{66D4}\x{66D5}\x{66D6}\x{66D8}\x{66D9}\x{66DA}\x{66DB}\x{66DC}\x{66DD}' .
-'\x{66DE}\x{66E0}\x{66E1}\x{66E2}\x{66E3}\x{66E4}\x{66E5}\x{66E6}\x{66E7}' .
-'\x{66E8}\x{66E9}\x{66EA}\x{66EB}\x{66EC}\x{66ED}\x{66EE}\x{66F0}\x{66F1}' .
-'\x{66F2}\x{66F3}\x{66F4}\x{66F5}\x{66F6}\x{66F7}\x{66F8}\x{66F9}\x{66FA}' .
-'\x{66FB}\x{66FC}\x{66FE}\x{66FF}\x{6700}\x{6701}\x{6703}\x{6704}\x{6705}' .
-'\x{6706}\x{6708}\x{6709}\x{670A}\x{670B}\x{670C}\x{670D}\x{670E}\x{670F}' .
-'\x{6710}\x{6711}\x{6712}\x{6713}\x{6714}\x{6715}\x{6716}\x{6717}\x{6718}' .
-'\x{671A}\x{671B}\x{671C}\x{671D}\x{671E}\x{671F}\x{6720}\x{6721}\x{6722}' .
-'\x{6723}\x{6725}\x{6726}\x{6727}\x{6728}\x{672A}\x{672B}\x{672C}\x{672D}' .
-'\x{672E}\x{672F}\x{6730}\x{6731}\x{6732}\x{6733}\x{6734}\x{6735}\x{6736}' .
-'\x{6737}\x{6738}\x{6739}\x{673A}\x{673B}\x{673C}\x{673D}\x{673E}\x{673F}' .
-'\x{6740}\x{6741}\x{6742}\x{6743}\x{6744}\x{6745}\x{6746}\x{6747}\x{6748}' .
-'\x{6749}\x{674A}\x{674B}\x{674C}\x{674D}\x{674E}\x{674F}\x{6750}\x{6751}' .
-'\x{6752}\x{6753}\x{6754}\x{6755}\x{6756}\x{6757}\x{6758}\x{6759}\x{675A}' .
-'\x{675B}\x{675C}\x{675D}\x{675E}\x{675F}\x{6760}\x{6761}\x{6762}\x{6763}' .
-'\x{6764}\x{6765}\x{6766}\x{6768}\x{6769}\x{676A}\x{676B}\x{676C}\x{676D}' .
-'\x{676E}\x{676F}\x{6770}\x{6771}\x{6772}\x{6773}\x{6774}\x{6775}\x{6776}' .
-'\x{6777}\x{6778}\x{6779}\x{677A}\x{677B}\x{677C}\x{677D}\x{677E}\x{677F}' .
-'\x{6780}\x{6781}\x{6782}\x{6783}\x{6784}\x{6785}\x{6786}\x{6787}\x{6789}' .
-'\x{678A}\x{678B}\x{678C}\x{678D}\x{678E}\x{678F}\x{6790}\x{6791}\x{6792}' .
-'\x{6793}\x{6794}\x{6795}\x{6797}\x{6798}\x{6799}\x{679A}\x{679B}\x{679C}' .
-'\x{679D}\x{679E}\x{679F}\x{67A0}\x{67A1}\x{67A2}\x{67A3}\x{67A4}\x{67A5}' .
-'\x{67A6}\x{67A7}\x{67A8}\x{67AA}\x{67AB}\x{67AC}\x{67AD}\x{67AE}\x{67AF}' .
-'\x{67B0}\x{67B1}\x{67B2}\x{67B3}\x{67B4}\x{67B5}\x{67B6}\x{67B7}\x{67B8}' .
-'\x{67B9}\x{67BA}\x{67BB}\x{67BC}\x{67BE}\x{67C0}\x{67C1}\x{67C2}\x{67C3}' .
-'\x{67C4}\x{67C5}\x{67C6}\x{67C7}\x{67C8}\x{67C9}\x{67CA}\x{67CB}\x{67CC}' .
-'\x{67CD}\x{67CE}\x{67CF}\x{67D0}\x{67D1}\x{67D2}\x{67D3}\x{67D4}\x{67D6}' .
-'\x{67D8}\x{67D9}\x{67DA}\x{67DB}\x{67DC}\x{67DD}\x{67DE}\x{67DF}\x{67E0}' .
-'\x{67E1}\x{67E2}\x{67E3}\x{67E4}\x{67E5}\x{67E6}\x{67E7}\x{67E8}\x{67E9}' .
-'\x{67EA}\x{67EB}\x{67EC}\x{67ED}\x{67EE}\x{67EF}\x{67F0}\x{67F1}\x{67F2}' .
-'\x{67F3}\x{67F4}\x{67F5}\x{67F6}\x{67F7}\x{67F8}\x{67FA}\x{67FB}\x{67FC}' .
-'\x{67FD}\x{67FE}\x{67FF}\x{6800}\x{6802}\x{6803}\x{6804}\x{6805}\x{6806}' .
-'\x{6807}\x{6808}\x{6809}\x{680A}\x{680B}\x{680C}\x{680D}\x{680E}\x{680F}' .
-'\x{6810}\x{6811}\x{6812}\x{6813}\x{6814}\x{6816}\x{6817}\x{6818}\x{6819}' .
-'\x{681A}\x{681B}\x{681C}\x{681D}\x{681F}\x{6820}\x{6821}\x{6822}\x{6823}' .
-'\x{6824}\x{6825}\x{6826}\x{6828}\x{6829}\x{682A}\x{682B}\x{682C}\x{682D}' .
-'\x{682E}\x{682F}\x{6831}\x{6832}\x{6833}\x{6834}\x{6835}\x{6836}\x{6837}' .
-'\x{6838}\x{6839}\x{683A}\x{683B}\x{683C}\x{683D}\x{683E}\x{683F}\x{6840}' .
-'\x{6841}\x{6842}\x{6843}\x{6844}\x{6845}\x{6846}\x{6847}\x{6848}\x{6849}' .
-'\x{684A}\x{684B}\x{684C}\x{684D}\x{684E}\x{684F}\x{6850}\x{6851}\x{6852}' .
-'\x{6853}\x{6854}\x{6855}\x{6856}\x{6857}\x{685B}\x{685D}\x{6860}\x{6861}' .
-'\x{6862}\x{6863}\x{6864}\x{6865}\x{6866}\x{6867}\x{6868}\x{6869}\x{686A}' .
-'\x{686B}\x{686C}\x{686D}\x{686E}\x{686F}\x{6870}\x{6871}\x{6872}\x{6873}' .
-'\x{6874}\x{6875}\x{6876}\x{6877}\x{6878}\x{6879}\x{687B}\x{687C}\x{687D}' .
-'\x{687E}\x{687F}\x{6880}\x{6881}\x{6882}\x{6883}\x{6884}\x{6885}\x{6886}' .
-'\x{6887}\x{6888}\x{6889}\x{688A}\x{688B}\x{688C}\x{688D}\x{688E}\x{688F}' .
-'\x{6890}\x{6891}\x{6892}\x{6893}\x{6894}\x{6896}\x{6897}\x{6898}\x{689A}' .
-'\x{689B}\x{689C}\x{689D}\x{689E}\x{689F}\x{68A0}\x{68A1}\x{68A2}\x{68A3}' .
-'\x{68A4}\x{68A6}\x{68A7}\x{68A8}\x{68A9}\x{68AA}\x{68AB}\x{68AC}\x{68AD}' .
-'\x{68AE}\x{68AF}\x{68B0}\x{68B1}\x{68B2}\x{68B3}\x{68B4}\x{68B5}\x{68B6}' .
-'\x{68B7}\x{68B9}\x{68BB}\x{68BC}\x{68BD}\x{68BE}\x{68BF}\x{68C0}\x{68C1}' .
-'\x{68C2}\x{68C4}\x{68C6}\x{68C7}\x{68C8}\x{68C9}\x{68CA}\x{68CB}\x{68CC}' .
-'\x{68CD}\x{68CE}\x{68CF}\x{68D0}\x{68D1}\x{68D2}\x{68D3}\x{68D4}\x{68D5}' .
-'\x{68D6}\x{68D7}\x{68D8}\x{68DA}\x{68DB}\x{68DC}\x{68DD}\x{68DE}\x{68DF}' .
-'\x{68E0}\x{68E1}\x{68E3}\x{68E4}\x{68E6}\x{68E7}\x{68E8}\x{68E9}\x{68EA}' .
-'\x{68EB}\x{68EC}\x{68ED}\x{68EE}\x{68EF}\x{68F0}\x{68F1}\x{68F2}\x{68F3}' .
-'\x{68F4}\x{68F5}\x{68F6}\x{68F7}\x{68F8}\x{68F9}\x{68FA}\x{68FB}\x{68FC}' .
-'\x{68FD}\x{68FE}\x{68FF}\x{6901}\x{6902}\x{6903}\x{6904}\x{6905}\x{6906}' .
-'\x{6907}\x{6908}\x{690A}\x{690B}\x{690C}\x{690D}\x{690E}\x{690F}\x{6910}' .
-'\x{6911}\x{6912}\x{6913}\x{6914}\x{6915}\x{6916}\x{6917}\x{6918}\x{6919}' .
-'\x{691A}\x{691B}\x{691C}\x{691D}\x{691E}\x{691F}\x{6920}\x{6921}\x{6922}' .
-'\x{6923}\x{6924}\x{6925}\x{6926}\x{6927}\x{6928}\x{6929}\x{692A}\x{692B}' .
-'\x{692C}\x{692D}\x{692E}\x{692F}\x{6930}\x{6931}\x{6932}\x{6933}\x{6934}' .
-'\x{6935}\x{6936}\x{6937}\x{6938}\x{6939}\x{693A}\x{693B}\x{693C}\x{693D}' .
-'\x{693F}\x{6940}\x{6941}\x{6942}\x{6943}\x{6944}\x{6945}\x{6946}\x{6947}' .
-'\x{6948}\x{6949}\x{694A}\x{694B}\x{694C}\x{694E}\x{694F}\x{6950}\x{6951}' .
-'\x{6952}\x{6953}\x{6954}\x{6955}\x{6956}\x{6957}\x{6958}\x{6959}\x{695A}' .
-'\x{695B}\x{695C}\x{695D}\x{695E}\x{695F}\x{6960}\x{6961}\x{6962}\x{6963}' .
-'\x{6964}\x{6965}\x{6966}\x{6967}\x{6968}\x{6969}\x{696A}\x{696B}\x{696C}' .
-'\x{696D}\x{696E}\x{696F}\x{6970}\x{6971}\x{6972}\x{6973}\x{6974}\x{6975}' .
-'\x{6976}\x{6977}\x{6978}\x{6979}\x{697A}\x{697B}\x{697C}\x{697D}\x{697E}' .
-'\x{697F}\x{6980}\x{6981}\x{6982}\x{6983}\x{6984}\x{6985}\x{6986}\x{6987}' .
-'\x{6988}\x{6989}\x{698A}\x{698B}\x{698C}\x{698D}\x{698E}\x{698F}\x{6990}' .
-'\x{6991}\x{6992}\x{6993}\x{6994}\x{6995}\x{6996}\x{6997}\x{6998}\x{6999}' .
-'\x{699A}\x{699B}\x{699C}\x{699D}\x{699E}\x{69A0}\x{69A1}\x{69A3}\x{69A4}' .
-'\x{69A5}\x{69A6}\x{69A7}\x{69A8}\x{69A9}\x{69AA}\x{69AB}\x{69AC}\x{69AD}' .
-'\x{69AE}\x{69AF}\x{69B0}\x{69B1}\x{69B2}\x{69B3}\x{69B4}\x{69B5}\x{69B6}' .
-'\x{69B7}\x{69B8}\x{69B9}\x{69BA}\x{69BB}\x{69BC}\x{69BD}\x{69BE}\x{69BF}' .
-'\x{69C1}\x{69C2}\x{69C3}\x{69C4}\x{69C5}\x{69C6}\x{69C7}\x{69C8}\x{69C9}' .
-'\x{69CA}\x{69CB}\x{69CC}\x{69CD}\x{69CE}\x{69CF}\x{69D0}\x{69D3}\x{69D4}' .
-'\x{69D8}\x{69D9}\x{69DA}\x{69DB}\x{69DC}\x{69DD}\x{69DE}\x{69DF}\x{69E0}' .
-'\x{69E1}\x{69E2}\x{69E3}\x{69E4}\x{69E5}\x{69E6}\x{69E7}\x{69E8}\x{69E9}' .
-'\x{69EA}\x{69EB}\x{69EC}\x{69ED}\x{69EE}\x{69EF}\x{69F0}\x{69F1}\x{69F2}' .
-'\x{69F3}\x{69F4}\x{69F5}\x{69F6}\x{69F7}\x{69F8}\x{69FA}\x{69FB}\x{69FC}' .
-'\x{69FD}\x{69FE}\x{69FF}\x{6A00}\x{6A01}\x{6A02}\x{6A04}\x{6A05}\x{6A06}' .
-'\x{6A07}\x{6A08}\x{6A09}\x{6A0A}\x{6A0B}\x{6A0D}\x{6A0E}\x{6A0F}\x{6A10}' .
-'\x{6A11}\x{6A12}\x{6A13}\x{6A14}\x{6A15}\x{6A16}\x{6A17}\x{6A18}\x{6A19}' .
-'\x{6A1A}\x{6A1B}\x{6A1D}\x{6A1E}\x{6A1F}\x{6A20}\x{6A21}\x{6A22}\x{6A23}' .
-'\x{6A25}\x{6A26}\x{6A27}\x{6A28}\x{6A29}\x{6A2A}\x{6A2B}\x{6A2C}\x{6A2D}' .
-'\x{6A2E}\x{6A2F}\x{6A30}\x{6A31}\x{6A32}\x{6A33}\x{6A34}\x{6A35}\x{6A36}' .
-'\x{6A38}\x{6A39}\x{6A3A}\x{6A3B}\x{6A3C}\x{6A3D}\x{6A3E}\x{6A3F}\x{6A40}' .
-'\x{6A41}\x{6A42}\x{6A43}\x{6A44}\x{6A45}\x{6A46}\x{6A47}\x{6A48}\x{6A49}' .
-'\x{6A4B}\x{6A4C}\x{6A4D}\x{6A4E}\x{6A4F}\x{6A50}\x{6A51}\x{6A52}\x{6A54}' .
-'\x{6A55}\x{6A56}\x{6A57}\x{6A58}\x{6A59}\x{6A5A}\x{6A5B}\x{6A5D}\x{6A5E}' .
-'\x{6A5F}\x{6A60}\x{6A61}\x{6A62}\x{6A63}\x{6A64}\x{6A65}\x{6A66}\x{6A67}' .
-'\x{6A68}\x{6A69}\x{6A6A}\x{6A6B}\x{6A6C}\x{6A6D}\x{6A6F}\x{6A71}\x{6A72}' .
-'\x{6A73}\x{6A74}\x{6A75}\x{6A76}\x{6A77}\x{6A78}\x{6A79}\x{6A7A}\x{6A7B}' .
-'\x{6A7C}\x{6A7D}\x{6A7E}\x{6A7F}\x{6A80}\x{6A81}\x{6A82}\x{6A83}\x{6A84}' .
-'\x{6A85}\x{6A87}\x{6A88}\x{6A89}\x{6A8B}\x{6A8C}\x{6A8D}\x{6A8E}\x{6A90}' .
-'\x{6A91}\x{6A92}\x{6A93}\x{6A94}\x{6A95}\x{6A96}\x{6A97}\x{6A98}\x{6A9A}' .
-'\x{6A9B}\x{6A9C}\x{6A9E}\x{6A9F}\x{6AA0}\x{6AA1}\x{6AA2}\x{6AA3}\x{6AA4}' .
-'\x{6AA5}\x{6AA6}\x{6AA7}\x{6AA8}\x{6AA9}\x{6AAB}\x{6AAC}\x{6AAD}\x{6AAE}' .
-'\x{6AAF}\x{6AB0}\x{6AB2}\x{6AB3}\x{6AB4}\x{6AB5}\x{6AB6}\x{6AB7}\x{6AB8}' .
-'\x{6AB9}\x{6ABA}\x{6ABB}\x{6ABC}\x{6ABD}\x{6ABF}\x{6AC1}\x{6AC2}\x{6AC3}' .
-'\x{6AC5}\x{6AC6}\x{6AC7}\x{6ACA}\x{6ACB}\x{6ACC}\x{6ACD}\x{6ACE}\x{6ACF}' .
-'\x{6AD0}\x{6AD1}\x{6AD2}\x{6AD3}\x{6AD4}\x{6AD5}\x{6AD6}\x{6AD7}\x{6AD9}' .
-'\x{6ADA}\x{6ADB}\x{6ADC}\x{6ADD}\x{6ADE}\x{6ADF}\x{6AE0}\x{6AE1}\x{6AE2}' .
-'\x{6AE3}\x{6AE4}\x{6AE5}\x{6AE6}\x{6AE7}\x{6AE8}\x{6AEA}\x{6AEB}\x{6AEC}' .
-'\x{6AED}\x{6AEE}\x{6AEF}\x{6AF0}\x{6AF1}\x{6AF2}\x{6AF3}\x{6AF4}\x{6AF5}' .
-'\x{6AF6}\x{6AF7}\x{6AF8}\x{6AF9}\x{6AFA}\x{6AFB}\x{6AFC}\x{6AFD}\x{6AFE}' .
-'\x{6AFF}\x{6B00}\x{6B01}\x{6B02}\x{6B03}\x{6B04}\x{6B05}\x{6B06}\x{6B07}' .
-'\x{6B08}\x{6B09}\x{6B0A}\x{6B0B}\x{6B0C}\x{6B0D}\x{6B0F}\x{6B10}\x{6B11}' .
-'\x{6B12}\x{6B13}\x{6B14}\x{6B15}\x{6B16}\x{6B17}\x{6B18}\x{6B19}\x{6B1A}' .
-'\x{6B1C}\x{6B1D}\x{6B1E}\x{6B1F}\x{6B20}\x{6B21}\x{6B22}\x{6B23}\x{6B24}' .
-'\x{6B25}\x{6B26}\x{6B27}\x{6B28}\x{6B29}\x{6B2A}\x{6B2B}\x{6B2C}\x{6B2D}' .
-'\x{6B2F}\x{6B30}\x{6B31}\x{6B32}\x{6B33}\x{6B34}\x{6B36}\x{6B37}\x{6B38}' .
-'\x{6B39}\x{6B3A}\x{6B3B}\x{6B3C}\x{6B3D}\x{6B3E}\x{6B3F}\x{6B41}\x{6B42}' .
-'\x{6B43}\x{6B44}\x{6B45}\x{6B46}\x{6B47}\x{6B48}\x{6B49}\x{6B4A}\x{6B4B}' .
-'\x{6B4C}\x{6B4D}\x{6B4E}\x{6B4F}\x{6B50}\x{6B51}\x{6B52}\x{6B53}\x{6B54}' .
-'\x{6B55}\x{6B56}\x{6B59}\x{6B5A}\x{6B5B}\x{6B5C}\x{6B5E}\x{6B5F}\x{6B60}' .
-'\x{6B61}\x{6B62}\x{6B63}\x{6B64}\x{6B65}\x{6B66}\x{6B67}\x{6B69}\x{6B6A}' .
-'\x{6B6B}\x{6B6D}\x{6B6F}\x{6B70}\x{6B72}\x{6B73}\x{6B74}\x{6B76}\x{6B77}' .
-'\x{6B78}\x{6B79}\x{6B7A}\x{6B7B}\x{6B7C}\x{6B7E}\x{6B7F}\x{6B80}\x{6B81}' .
-'\x{6B82}\x{6B83}\x{6B84}\x{6B85}\x{6B86}\x{6B87}\x{6B88}\x{6B89}\x{6B8A}' .
-'\x{6B8B}\x{6B8C}\x{6B8D}\x{6B8E}\x{6B8F}\x{6B90}\x{6B91}\x{6B92}\x{6B93}' .
-'\x{6B94}\x{6B95}\x{6B96}\x{6B97}\x{6B98}\x{6B99}\x{6B9A}\x{6B9B}\x{6B9C}' .
-'\x{6B9D}\x{6B9E}\x{6B9F}\x{6BA0}\x{6BA1}\x{6BA2}\x{6BA3}\x{6BA4}\x{6BA5}' .
-'\x{6BA6}\x{6BA7}\x{6BA8}\x{6BA9}\x{6BAA}\x{6BAB}\x{6BAC}\x{6BAD}\x{6BAE}' .
-'\x{6BAF}\x{6BB0}\x{6BB2}\x{6BB3}\x{6BB4}\x{6BB5}\x{6BB6}\x{6BB7}\x{6BB9}' .
-'\x{6BBA}\x{6BBB}\x{6BBC}\x{6BBD}\x{6BBE}\x{6BBF}\x{6BC0}\x{6BC1}\x{6BC2}' .
-'\x{6BC3}\x{6BC4}\x{6BC5}\x{6BC6}\x{6BC7}\x{6BC8}\x{6BC9}\x{6BCA}\x{6BCB}' .
-'\x{6BCC}\x{6BCD}\x{6BCE}\x{6BCF}\x{6BD0}\x{6BD1}\x{6BD2}\x{6BD3}\x{6BD4}' .
-'\x{6BD5}\x{6BD6}\x{6BD7}\x{6BD8}\x{6BD9}\x{6BDA}\x{6BDB}\x{6BDC}\x{6BDD}' .
-'\x{6BDE}\x{6BDF}\x{6BE0}\x{6BE1}\x{6BE2}\x{6BE3}\x{6BE4}\x{6BE5}\x{6BE6}' .
-'\x{6BE7}\x{6BE8}\x{6BEA}\x{6BEB}\x{6BEC}\x{6BED}\x{6BEE}\x{6BEF}\x{6BF0}' .
-'\x{6BF2}\x{6BF3}\x{6BF5}\x{6BF6}\x{6BF7}\x{6BF8}\x{6BF9}\x{6BFB}\x{6BFC}' .
-'\x{6BFD}\x{6BFE}\x{6BFF}\x{6C00}\x{6C01}\x{6C02}\x{6C03}\x{6C04}\x{6C05}' .
-'\x{6C06}\x{6C07}\x{6C08}\x{6C09}\x{6C0B}\x{6C0C}\x{6C0D}\x{6C0E}\x{6C0F}' .
-'\x{6C10}\x{6C11}\x{6C12}\x{6C13}\x{6C14}\x{6C15}\x{6C16}\x{6C18}\x{6C19}' .
-'\x{6C1A}\x{6C1B}\x{6C1D}\x{6C1E}\x{6C1F}\x{6C20}\x{6C21}\x{6C22}\x{6C23}' .
-'\x{6C24}\x{6C25}\x{6C26}\x{6C27}\x{6C28}\x{6C29}\x{6C2A}\x{6C2B}\x{6C2C}' .
-'\x{6C2E}\x{6C2F}\x{6C30}\x{6C31}\x{6C32}\x{6C33}\x{6C34}\x{6C35}\x{6C36}' .
-'\x{6C37}\x{6C38}\x{6C3A}\x{6C3B}\x{6C3D}\x{6C3E}\x{6C3F}\x{6C40}\x{6C41}' .
-'\x{6C42}\x{6C43}\x{6C44}\x{6C46}\x{6C47}\x{6C48}\x{6C49}\x{6C4A}\x{6C4B}' .
-'\x{6C4C}\x{6C4D}\x{6C4E}\x{6C4F}\x{6C50}\x{6C51}\x{6C52}\x{6C53}\x{6C54}' .
-'\x{6C55}\x{6C56}\x{6C57}\x{6C58}\x{6C59}\x{6C5A}\x{6C5B}\x{6C5C}\x{6C5D}' .
-'\x{6C5E}\x{6C5F}\x{6C60}\x{6C61}\x{6C62}\x{6C63}\x{6C64}\x{6C65}\x{6C66}' .
-'\x{6C67}\x{6C68}\x{6C69}\x{6C6A}\x{6C6B}\x{6C6D}\x{6C6F}\x{6C70}\x{6C71}' .
-'\x{6C72}\x{6C73}\x{6C74}\x{6C75}\x{6C76}\x{6C77}\x{6C78}\x{6C79}\x{6C7A}' .
-'\x{6C7B}\x{6C7C}\x{6C7D}\x{6C7E}\x{6C7F}\x{6C80}\x{6C81}\x{6C82}\x{6C83}' .
-'\x{6C84}\x{6C85}\x{6C86}\x{6C87}\x{6C88}\x{6C89}\x{6C8A}\x{6C8B}\x{6C8C}' .
-'\x{6C8D}\x{6C8E}\x{6C8F}\x{6C90}\x{6C91}\x{6C92}\x{6C93}\x{6C94}\x{6C95}' .
-'\x{6C96}\x{6C97}\x{6C98}\x{6C99}\x{6C9A}\x{6C9B}\x{6C9C}\x{6C9D}\x{6C9E}' .
-'\x{6C9F}\x{6CA1}\x{6CA2}\x{6CA3}\x{6CA4}\x{6CA5}\x{6CA6}\x{6CA7}\x{6CA8}' .
-'\x{6CA9}\x{6CAA}\x{6CAB}\x{6CAC}\x{6CAD}\x{6CAE}\x{6CAF}\x{6CB0}\x{6CB1}' .
-'\x{6CB2}\x{6CB3}\x{6CB4}\x{6CB5}\x{6CB6}\x{6CB7}\x{6CB8}\x{6CB9}\x{6CBA}' .
-'\x{6CBB}\x{6CBC}\x{6CBD}\x{6CBE}\x{6CBF}\x{6CC0}\x{6CC1}\x{6CC2}\x{6CC3}' .
-'\x{6CC4}\x{6CC5}\x{6CC6}\x{6CC7}\x{6CC8}\x{6CC9}\x{6CCA}\x{6CCB}\x{6CCC}' .
-'\x{6CCD}\x{6CCE}\x{6CCF}\x{6CD0}\x{6CD1}\x{6CD2}\x{6CD3}\x{6CD4}\x{6CD5}' .
-'\x{6CD6}\x{6CD7}\x{6CD9}\x{6CDA}\x{6CDB}\x{6CDC}\x{6CDD}\x{6CDE}\x{6CDF}' .
-'\x{6CE0}\x{6CE1}\x{6CE2}\x{6CE3}\x{6CE4}\x{6CE5}\x{6CE6}\x{6CE7}\x{6CE8}' .
-'\x{6CE9}\x{6CEA}\x{6CEB}\x{6CEC}\x{6CED}\x{6CEE}\x{6CEF}\x{6CF0}\x{6CF1}' .
-'\x{6CF2}\x{6CF3}\x{6CF5}\x{6CF6}\x{6CF7}\x{6CF8}\x{6CF9}\x{6CFA}\x{6CFB}' .
-'\x{6CFC}\x{6CFD}\x{6CFE}\x{6CFF}\x{6D00}\x{6D01}\x{6D03}\x{6D04}\x{6D05}' .
-'\x{6D06}\x{6D07}\x{6D08}\x{6D09}\x{6D0A}\x{6D0B}\x{6D0C}\x{6D0D}\x{6D0E}' .
-'\x{6D0F}\x{6D10}\x{6D11}\x{6D12}\x{6D13}\x{6D14}\x{6D15}\x{6D16}\x{6D17}' .
-'\x{6D18}\x{6D19}\x{6D1A}\x{6D1B}\x{6D1D}\x{6D1E}\x{6D1F}\x{6D20}\x{6D21}' .
-'\x{6D22}\x{6D23}\x{6D25}\x{6D26}\x{6D27}\x{6D28}\x{6D29}\x{6D2A}\x{6D2B}' .
-'\x{6D2C}\x{6D2D}\x{6D2E}\x{6D2F}\x{6D30}\x{6D31}\x{6D32}\x{6D33}\x{6D34}' .
-'\x{6D35}\x{6D36}\x{6D37}\x{6D38}\x{6D39}\x{6D3A}\x{6D3B}\x{6D3C}\x{6D3D}' .
-'\x{6D3E}\x{6D3F}\x{6D40}\x{6D41}\x{6D42}\x{6D43}\x{6D44}\x{6D45}\x{6D46}' .
-'\x{6D47}\x{6D48}\x{6D49}\x{6D4A}\x{6D4B}\x{6D4C}\x{6D4D}\x{6D4E}\x{6D4F}' .
-'\x{6D50}\x{6D51}\x{6D52}\x{6D53}\x{6D54}\x{6D55}\x{6D56}\x{6D57}\x{6D58}' .
-'\x{6D59}\x{6D5A}\x{6D5B}\x{6D5C}\x{6D5D}\x{6D5E}\x{6D5F}\x{6D60}\x{6D61}' .
-'\x{6D62}\x{6D63}\x{6D64}\x{6D65}\x{6D66}\x{6D67}\x{6D68}\x{6D69}\x{6D6A}' .
-'\x{6D6B}\x{6D6C}\x{6D6D}\x{6D6E}\x{6D6F}\x{6D70}\x{6D72}\x{6D73}\x{6D74}' .
-'\x{6D75}\x{6D76}\x{6D77}\x{6D78}\x{6D79}\x{6D7A}\x{6D7B}\x{6D7C}\x{6D7D}' .
-'\x{6D7E}\x{6D7F}\x{6D80}\x{6D82}\x{6D83}\x{6D84}\x{6D85}\x{6D86}\x{6D87}' .
-'\x{6D88}\x{6D89}\x{6D8A}\x{6D8B}\x{6D8C}\x{6D8D}\x{6D8E}\x{6D8F}\x{6D90}' .
-'\x{6D91}\x{6D92}\x{6D93}\x{6D94}\x{6D95}\x{6D97}\x{6D98}\x{6D99}\x{6D9A}' .
-'\x{6D9B}\x{6D9D}\x{6D9E}\x{6D9F}\x{6DA0}\x{6DA1}\x{6DA2}\x{6DA3}\x{6DA4}' .
-'\x{6DA5}\x{6DA6}\x{6DA7}\x{6DA8}\x{6DA9}\x{6DAA}\x{6DAB}\x{6DAC}\x{6DAD}' .
-'\x{6DAE}\x{6DAF}\x{6DB2}\x{6DB3}\x{6DB4}\x{6DB5}\x{6DB7}\x{6DB8}\x{6DB9}' .
-'\x{6DBA}\x{6DBB}\x{6DBC}\x{6DBD}\x{6DBE}\x{6DBF}\x{6DC0}\x{6DC1}\x{6DC2}' .
-'\x{6DC3}\x{6DC4}\x{6DC5}\x{6DC6}\x{6DC7}\x{6DC8}\x{6DC9}\x{6DCA}\x{6DCB}' .
-'\x{6DCC}\x{6DCD}\x{6DCE}\x{6DCF}\x{6DD0}\x{6DD1}\x{6DD2}\x{6DD3}\x{6DD4}' .
-'\x{6DD5}\x{6DD6}\x{6DD7}\x{6DD8}\x{6DD9}\x{6DDA}\x{6DDB}\x{6DDC}\x{6DDD}' .
-'\x{6DDE}\x{6DDF}\x{6DE0}\x{6DE1}\x{6DE2}\x{6DE3}\x{6DE4}\x{6DE5}\x{6DE6}' .
-'\x{6DE7}\x{6DE8}\x{6DE9}\x{6DEA}\x{6DEB}\x{6DEC}\x{6DED}\x{6DEE}\x{6DEF}' .
-'\x{6DF0}\x{6DF1}\x{6DF2}\x{6DF3}\x{6DF4}\x{6DF5}\x{6DF6}\x{6DF7}\x{6DF8}' .
-'\x{6DF9}\x{6DFA}\x{6DFB}\x{6DFC}\x{6DFD}\x{6E00}\x{6E03}\x{6E04}\x{6E05}' .
-'\x{6E07}\x{6E08}\x{6E09}\x{6E0A}\x{6E0B}\x{6E0C}\x{6E0D}\x{6E0E}\x{6E0F}' .
-'\x{6E10}\x{6E11}\x{6E14}\x{6E15}\x{6E16}\x{6E17}\x{6E19}\x{6E1A}\x{6E1B}' .
-'\x{6E1C}\x{6E1D}\x{6E1E}\x{6E1F}\x{6E20}\x{6E21}\x{6E22}\x{6E23}\x{6E24}' .
-'\x{6E25}\x{6E26}\x{6E27}\x{6E28}\x{6E29}\x{6E2B}\x{6E2C}\x{6E2D}\x{6E2E}' .
-'\x{6E2F}\x{6E30}\x{6E31}\x{6E32}\x{6E33}\x{6E34}\x{6E35}\x{6E36}\x{6E37}' .
-'\x{6E38}\x{6E39}\x{6E3A}\x{6E3B}\x{6E3C}\x{6E3D}\x{6E3E}\x{6E3F}\x{6E40}' .
-'\x{6E41}\x{6E42}\x{6E43}\x{6E44}\x{6E45}\x{6E46}\x{6E47}\x{6E48}\x{6E49}' .
-'\x{6E4A}\x{6E4B}\x{6E4D}\x{6E4E}\x{6E4F}\x{6E50}\x{6E51}\x{6E52}\x{6E53}' .
-'\x{6E54}\x{6E55}\x{6E56}\x{6E57}\x{6E58}\x{6E59}\x{6E5A}\x{6E5B}\x{6E5C}' .
-'\x{6E5D}\x{6E5E}\x{6E5F}\x{6E60}\x{6E61}\x{6E62}\x{6E63}\x{6E64}\x{6E65}' .
-'\x{6E66}\x{6E67}\x{6E68}\x{6E69}\x{6E6A}\x{6E6B}\x{6E6D}\x{6E6E}\x{6E6F}' .
-'\x{6E70}\x{6E71}\x{6E72}\x{6E73}\x{6E74}\x{6E75}\x{6E77}\x{6E78}\x{6E79}' .
-'\x{6E7E}\x{6E7F}\x{6E80}\x{6E81}\x{6E82}\x{6E83}\x{6E84}\x{6E85}\x{6E86}' .
-'\x{6E87}\x{6E88}\x{6E89}\x{6E8A}\x{6E8D}\x{6E8E}\x{6E8F}\x{6E90}\x{6E91}' .
-'\x{6E92}\x{6E93}\x{6E94}\x{6E96}\x{6E97}\x{6E98}\x{6E99}\x{6E9A}\x{6E9B}' .
-'\x{6E9C}\x{6E9D}\x{6E9E}\x{6E9F}\x{6EA0}\x{6EA1}\x{6EA2}\x{6EA3}\x{6EA4}' .
-'\x{6EA5}\x{6EA6}\x{6EA7}\x{6EA8}\x{6EA9}\x{6EAA}\x{6EAB}\x{6EAC}\x{6EAD}' .
-'\x{6EAE}\x{6EAF}\x{6EB0}\x{6EB1}\x{6EB2}\x{6EB3}\x{6EB4}\x{6EB5}\x{6EB6}' .
-'\x{6EB7}\x{6EB8}\x{6EB9}\x{6EBA}\x{6EBB}\x{6EBC}\x{6EBD}\x{6EBE}\x{6EBF}' .
-'\x{6EC0}\x{6EC1}\x{6EC2}\x{6EC3}\x{6EC4}\x{6EC5}\x{6EC6}\x{6EC7}\x{6EC8}' .
-'\x{6EC9}\x{6ECA}\x{6ECB}\x{6ECC}\x{6ECD}\x{6ECE}\x{6ECF}\x{6ED0}\x{6ED1}' .
-'\x{6ED2}\x{6ED3}\x{6ED4}\x{6ED5}\x{6ED6}\x{6ED7}\x{6ED8}\x{6ED9}\x{6EDA}' .
-'\x{6EDC}\x{6EDE}\x{6EDF}\x{6EE0}\x{6EE1}\x{6EE2}\x{6EE4}\x{6EE5}\x{6EE6}' .
-'\x{6EE7}\x{6EE8}\x{6EE9}\x{6EEA}\x{6EEB}\x{6EEC}\x{6EED}\x{6EEE}\x{6EEF}' .
-'\x{6EF0}\x{6EF1}\x{6EF2}\x{6EF3}\x{6EF4}\x{6EF5}\x{6EF6}\x{6EF7}\x{6EF8}' .
-'\x{6EF9}\x{6EFA}\x{6EFB}\x{6EFC}\x{6EFD}\x{6EFE}\x{6EFF}\x{6F00}\x{6F01}' .
-'\x{6F02}\x{6F03}\x{6F05}\x{6F06}\x{6F07}\x{6F08}\x{6F09}\x{6F0A}\x{6F0C}' .
-'\x{6F0D}\x{6F0E}\x{6F0F}\x{6F10}\x{6F11}\x{6F12}\x{6F13}\x{6F14}\x{6F15}' .
-'\x{6F16}\x{6F17}\x{6F18}\x{6F19}\x{6F1A}\x{6F1B}\x{6F1C}\x{6F1D}\x{6F1E}' .
-'\x{6F1F}\x{6F20}\x{6F21}\x{6F22}\x{6F23}\x{6F24}\x{6F25}\x{6F26}\x{6F27}' .
-'\x{6F28}\x{6F29}\x{6F2A}\x{6F2B}\x{6F2C}\x{6F2D}\x{6F2E}\x{6F2F}\x{6F30}' .
-'\x{6F31}\x{6F32}\x{6F33}\x{6F34}\x{6F35}\x{6F36}\x{6F37}\x{6F38}\x{6F39}' .
-'\x{6F3A}\x{6F3B}\x{6F3C}\x{6F3D}\x{6F3E}\x{6F3F}\x{6F40}\x{6F41}\x{6F43}' .
-'\x{6F44}\x{6F45}\x{6F46}\x{6F47}\x{6F49}\x{6F4B}\x{6F4C}\x{6F4D}\x{6F4E}' .
-'\x{6F4F}\x{6F50}\x{6F51}\x{6F52}\x{6F53}\x{6F54}\x{6F55}\x{6F56}\x{6F57}' .
-'\x{6F58}\x{6F59}\x{6F5A}\x{6F5B}\x{6F5C}\x{6F5D}\x{6F5E}\x{6F5F}\x{6F60}' .
-'\x{6F61}\x{6F62}\x{6F63}\x{6F64}\x{6F65}\x{6F66}\x{6F67}\x{6F68}\x{6F69}' .
-'\x{6F6A}\x{6F6B}\x{6F6C}\x{6F6D}\x{6F6E}\x{6F6F}\x{6F70}\x{6F71}\x{6F72}' .
-'\x{6F73}\x{6F74}\x{6F75}\x{6F76}\x{6F77}\x{6F78}\x{6F7A}\x{6F7B}\x{6F7C}' .
-'\x{6F7D}\x{6F7E}\x{6F7F}\x{6F80}\x{6F81}\x{6F82}\x{6F83}\x{6F84}\x{6F85}' .
-'\x{6F86}\x{6F87}\x{6F88}\x{6F89}\x{6F8A}\x{6F8B}\x{6F8C}\x{6F8D}\x{6F8E}' .
-'\x{6F8F}\x{6F90}\x{6F91}\x{6F92}\x{6F93}\x{6F94}\x{6F95}\x{6F96}\x{6F97}' .
-'\x{6F99}\x{6F9B}\x{6F9C}\x{6F9D}\x{6F9E}\x{6FA0}\x{6FA1}\x{6FA2}\x{6FA3}' .
-'\x{6FA4}\x{6FA5}\x{6FA6}\x{6FA7}\x{6FA8}\x{6FA9}\x{6FAA}\x{6FAB}\x{6FAC}' .
-'\x{6FAD}\x{6FAE}\x{6FAF}\x{6FB0}\x{6FB1}\x{6FB2}\x{6FB3}\x{6FB4}\x{6FB5}' .
-'\x{6FB6}\x{6FB8}\x{6FB9}\x{6FBA}\x{6FBB}\x{6FBC}\x{6FBD}\x{6FBE}\x{6FBF}' .
-'\x{6FC0}\x{6FC1}\x{6FC2}\x{6FC3}\x{6FC4}\x{6FC6}\x{6FC7}\x{6FC8}\x{6FC9}' .
-'\x{6FCA}\x{6FCB}\x{6FCC}\x{6FCD}\x{6FCE}\x{6FCF}\x{6FD1}\x{6FD2}\x{6FD4}' .
-'\x{6FD5}\x{6FD6}\x{6FD7}\x{6FD8}\x{6FD9}\x{6FDA}\x{6FDB}\x{6FDC}\x{6FDD}' .
-'\x{6FDE}\x{6FDF}\x{6FE0}\x{6FE1}\x{6FE2}\x{6FE3}\x{6FE4}\x{6FE5}\x{6FE6}' .
-'\x{6FE7}\x{6FE8}\x{6FE9}\x{6FEA}\x{6FEB}\x{6FEC}\x{6FED}\x{6FEE}\x{6FEF}' .
-'\x{6FF0}\x{6FF1}\x{6FF2}\x{6FF3}\x{6FF4}\x{6FF6}\x{6FF7}\x{6FF8}\x{6FF9}' .
-'\x{6FFA}\x{6FFB}\x{6FFC}\x{6FFE}\x{6FFF}\x{7000}\x{7001}\x{7002}\x{7003}' .
-'\x{7004}\x{7005}\x{7006}\x{7007}\x{7008}\x{7009}\x{700A}\x{700B}\x{700C}' .
-'\x{700D}\x{700E}\x{700F}\x{7011}\x{7012}\x{7014}\x{7015}\x{7016}\x{7017}' .
-'\x{7018}\x{7019}\x{701A}\x{701B}\x{701C}\x{701D}\x{701F}\x{7020}\x{7021}' .
-'\x{7022}\x{7023}\x{7024}\x{7025}\x{7026}\x{7027}\x{7028}\x{7029}\x{702A}' .
-'\x{702B}\x{702C}\x{702D}\x{702E}\x{702F}\x{7030}\x{7031}\x{7032}\x{7033}' .
-'\x{7034}\x{7035}\x{7036}\x{7037}\x{7038}\x{7039}\x{703A}\x{703B}\x{703C}' .
-'\x{703D}\x{703E}\x{703F}\x{7040}\x{7041}\x{7042}\x{7043}\x{7044}\x{7045}' .
-'\x{7046}\x{7048}\x{7049}\x{704A}\x{704C}\x{704D}\x{704F}\x{7050}\x{7051}' .
-'\x{7052}\x{7053}\x{7054}\x{7055}\x{7056}\x{7057}\x{7058}\x{7059}\x{705A}' .
-'\x{705B}\x{705C}\x{705D}\x{705E}\x{705F}\x{7060}\x{7061}\x{7062}\x{7063}' .
-'\x{7064}\x{7065}\x{7066}\x{7067}\x{7068}\x{7069}\x{706A}\x{706B}\x{706C}' .
-'\x{706D}\x{706E}\x{706F}\x{7070}\x{7071}\x{7074}\x{7075}\x{7076}\x{7077}' .
-'\x{7078}\x{7079}\x{707A}\x{707C}\x{707D}\x{707E}\x{707F}\x{7080}\x{7082}' .
-'\x{7083}\x{7084}\x{7085}\x{7086}\x{7087}\x{7088}\x{7089}\x{708A}\x{708B}' .
-'\x{708C}\x{708E}\x{708F}\x{7090}\x{7091}\x{7092}\x{7093}\x{7094}\x{7095}' .
-'\x{7096}\x{7098}\x{7099}\x{709A}\x{709C}\x{709D}\x{709E}\x{709F}\x{70A0}' .
-'\x{70A1}\x{70A2}\x{70A3}\x{70A4}\x{70A5}\x{70A6}\x{70A7}\x{70A8}\x{70A9}' .
-'\x{70AB}\x{70AC}\x{70AD}\x{70AE}\x{70AF}\x{70B0}\x{70B1}\x{70B3}\x{70B4}' .
-'\x{70B5}\x{70B7}\x{70B8}\x{70B9}\x{70BA}\x{70BB}\x{70BC}\x{70BD}\x{70BE}' .
-'\x{70BF}\x{70C0}\x{70C1}\x{70C2}\x{70C3}\x{70C4}\x{70C5}\x{70C6}\x{70C7}' .
-'\x{70C8}\x{70C9}\x{70CA}\x{70CB}\x{70CC}\x{70CD}\x{70CE}\x{70CF}\x{70D0}' .
-'\x{70D1}\x{70D2}\x{70D3}\x{70D4}\x{70D6}\x{70D7}\x{70D8}\x{70D9}\x{70DA}' .
-'\x{70DB}\x{70DC}\x{70DD}\x{70DE}\x{70DF}\x{70E0}\x{70E1}\x{70E2}\x{70E3}' .
-'\x{70E4}\x{70E5}\x{70E6}\x{70E7}\x{70E8}\x{70E9}\x{70EA}\x{70EB}\x{70EC}' .
-'\x{70ED}\x{70EE}\x{70EF}\x{70F0}\x{70F1}\x{70F2}\x{70F3}\x{70F4}\x{70F5}' .
-'\x{70F6}\x{70F7}\x{70F8}\x{70F9}\x{70FA}\x{70FB}\x{70FC}\x{70FD}\x{70FF}' .
-'\x{7100}\x{7101}\x{7102}\x{7103}\x{7104}\x{7105}\x{7106}\x{7107}\x{7109}' .
-'\x{710A}\x{710B}\x{710C}\x{710D}\x{710E}\x{710F}\x{7110}\x{7111}\x{7112}' .
-'\x{7113}\x{7115}\x{7116}\x{7117}\x{7118}\x{7119}\x{711A}\x{711B}\x{711C}' .
-'\x{711D}\x{711E}\x{711F}\x{7120}\x{7121}\x{7122}\x{7123}\x{7125}\x{7126}' .
-'\x{7127}\x{7128}\x{7129}\x{712A}\x{712B}\x{712C}\x{712D}\x{712E}\x{712F}' .
-'\x{7130}\x{7131}\x{7132}\x{7135}\x{7136}\x{7137}\x{7138}\x{7139}\x{713A}' .
-'\x{713B}\x{713D}\x{713E}\x{713F}\x{7140}\x{7141}\x{7142}\x{7143}\x{7144}' .
-'\x{7145}\x{7146}\x{7147}\x{7148}\x{7149}\x{714A}\x{714B}\x{714C}\x{714D}' .
-'\x{714E}\x{714F}\x{7150}\x{7151}\x{7152}\x{7153}\x{7154}\x{7156}\x{7158}' .
-'\x{7159}\x{715A}\x{715B}\x{715C}\x{715D}\x{715E}\x{715F}\x{7160}\x{7161}' .
-'\x{7162}\x{7163}\x{7164}\x{7165}\x{7166}\x{7167}\x{7168}\x{7169}\x{716A}' .
-'\x{716C}\x{716E}\x{716F}\x{7170}\x{7171}\x{7172}\x{7173}\x{7174}\x{7175}' .
-'\x{7176}\x{7177}\x{7178}\x{7179}\x{717A}\x{717B}\x{717C}\x{717D}\x{717E}' .
-'\x{717F}\x{7180}\x{7181}\x{7182}\x{7183}\x{7184}\x{7185}\x{7186}\x{7187}' .
-'\x{7188}\x{7189}\x{718A}\x{718B}\x{718C}\x{718E}\x{718F}\x{7190}\x{7191}' .
-'\x{7192}\x{7193}\x{7194}\x{7195}\x{7197}\x{7198}\x{7199}\x{719A}\x{719B}' .
-'\x{719C}\x{719D}\x{719E}\x{719F}\x{71A0}\x{71A1}\x{71A2}\x{71A3}\x{71A4}' .
-'\x{71A5}\x{71A7}\x{71A8}\x{71A9}\x{71AA}\x{71AC}\x{71AD}\x{71AE}\x{71AF}' .
-'\x{71B0}\x{71B1}\x{71B2}\x{71B3}\x{71B4}\x{71B5}\x{71B7}\x{71B8}\x{71B9}' .
-'\x{71BA}\x{71BB}\x{71BC}\x{71BD}\x{71BE}\x{71BF}\x{71C0}\x{71C1}\x{71C2}' .
-'\x{71C3}\x{71C4}\x{71C5}\x{71C6}\x{71C7}\x{71C8}\x{71C9}\x{71CA}\x{71CB}' .
-'\x{71CD}\x{71CE}\x{71CF}\x{71D0}\x{71D1}\x{71D2}\x{71D4}\x{71D5}\x{71D6}' .
-'\x{71D7}\x{71D8}\x{71D9}\x{71DA}\x{71DB}\x{71DC}\x{71DD}\x{71DE}\x{71DF}' .
-'\x{71E0}\x{71E1}\x{71E2}\x{71E3}\x{71E4}\x{71E5}\x{71E6}\x{71E7}\x{71E8}' .
-'\x{71E9}\x{71EA}\x{71EB}\x{71EC}\x{71ED}\x{71EE}\x{71EF}\x{71F0}\x{71F1}' .
-'\x{71F2}\x{71F4}\x{71F5}\x{71F6}\x{71F7}\x{71F8}\x{71F9}\x{71FB}\x{71FC}' .
-'\x{71FD}\x{71FE}\x{71FF}\x{7201}\x{7202}\x{7203}\x{7204}\x{7205}\x{7206}' .
-'\x{7207}\x{7208}\x{7209}\x{720A}\x{720C}\x{720D}\x{720E}\x{720F}\x{7210}' .
-'\x{7212}\x{7213}\x{7214}\x{7216}\x{7218}\x{7219}\x{721A}\x{721B}\x{721C}' .
-'\x{721D}\x{721E}\x{721F}\x{7221}\x{7222}\x{7223}\x{7226}\x{7227}\x{7228}' .
-'\x{7229}\x{722A}\x{722B}\x{722C}\x{722D}\x{722E}\x{7230}\x{7231}\x{7232}' .
-'\x{7233}\x{7235}\x{7236}\x{7237}\x{7238}\x{7239}\x{723A}\x{723B}\x{723C}' .
-'\x{723D}\x{723E}\x{723F}\x{7240}\x{7241}\x{7242}\x{7243}\x{7244}\x{7246}' .
-'\x{7247}\x{7248}\x{7249}\x{724A}\x{724B}\x{724C}\x{724D}\x{724F}\x{7251}' .
-'\x{7252}\x{7253}\x{7254}\x{7256}\x{7257}\x{7258}\x{7259}\x{725A}\x{725B}' .
-'\x{725C}\x{725D}\x{725E}\x{725F}\x{7260}\x{7261}\x{7262}\x{7263}\x{7264}' .
-'\x{7265}\x{7266}\x{7267}\x{7268}\x{7269}\x{726A}\x{726B}\x{726C}\x{726D}' .
-'\x{726E}\x{726F}\x{7270}\x{7271}\x{7272}\x{7273}\x{7274}\x{7275}\x{7276}' .
-'\x{7277}\x{7278}\x{7279}\x{727A}\x{727B}\x{727C}\x{727D}\x{727E}\x{727F}' .
-'\x{7280}\x{7281}\x{7282}\x{7283}\x{7284}\x{7285}\x{7286}\x{7287}\x{7288}' .
-'\x{7289}\x{728A}\x{728B}\x{728C}\x{728D}\x{728E}\x{728F}\x{7290}\x{7291}' .
-'\x{7292}\x{7293}\x{7294}\x{7295}\x{7296}\x{7297}\x{7298}\x{7299}\x{729A}' .
-'\x{729B}\x{729C}\x{729D}\x{729E}\x{729F}\x{72A1}\x{72A2}\x{72A3}\x{72A4}' .
-'\x{72A5}\x{72A6}\x{72A7}\x{72A8}\x{72A9}\x{72AA}\x{72AC}\x{72AD}\x{72AE}' .
-'\x{72AF}\x{72B0}\x{72B1}\x{72B2}\x{72B3}\x{72B4}\x{72B5}\x{72B6}\x{72B7}' .
-'\x{72B8}\x{72B9}\x{72BA}\x{72BB}\x{72BC}\x{72BD}\x{72BF}\x{72C0}\x{72C1}' .
-'\x{72C2}\x{72C3}\x{72C4}\x{72C5}\x{72C6}\x{72C7}\x{72C8}\x{72C9}\x{72CA}' .
-'\x{72CB}\x{72CC}\x{72CD}\x{72CE}\x{72CF}\x{72D0}\x{72D1}\x{72D2}\x{72D3}' .
-'\x{72D4}\x{72D5}\x{72D6}\x{72D7}\x{72D8}\x{72D9}\x{72DA}\x{72DB}\x{72DC}' .
-'\x{72DD}\x{72DE}\x{72DF}\x{72E0}\x{72E1}\x{72E2}\x{72E3}\x{72E4}\x{72E5}' .
-'\x{72E6}\x{72E7}\x{72E8}\x{72E9}\x{72EA}\x{72EB}\x{72EC}\x{72ED}\x{72EE}' .
-'\x{72EF}\x{72F0}\x{72F1}\x{72F2}\x{72F3}\x{72F4}\x{72F5}\x{72F6}\x{72F7}' .
-'\x{72F8}\x{72F9}\x{72FA}\x{72FB}\x{72FC}\x{72FD}\x{72FE}\x{72FF}\x{7300}' .
-'\x{7301}\x{7303}\x{7304}\x{7305}\x{7306}\x{7307}\x{7308}\x{7309}\x{730A}' .
-'\x{730B}\x{730C}\x{730D}\x{730E}\x{730F}\x{7311}\x{7312}\x{7313}\x{7314}' .
-'\x{7315}\x{7316}\x{7317}\x{7318}\x{7319}\x{731A}\x{731B}\x{731C}\x{731D}' .
-'\x{731E}\x{7320}\x{7321}\x{7322}\x{7323}\x{7324}\x{7325}\x{7326}\x{7327}' .
-'\x{7329}\x{732A}\x{732B}\x{732C}\x{732D}\x{732E}\x{7330}\x{7331}\x{7332}' .
-'\x{7333}\x{7334}\x{7335}\x{7336}\x{7337}\x{7338}\x{7339}\x{733A}\x{733B}' .
-'\x{733C}\x{733D}\x{733E}\x{733F}\x{7340}\x{7341}\x{7342}\x{7343}\x{7344}' .
-'\x{7345}\x{7346}\x{7347}\x{7348}\x{7349}\x{734A}\x{734B}\x{734C}\x{734D}' .
-'\x{734E}\x{7350}\x{7351}\x{7352}\x{7354}\x{7355}\x{7356}\x{7357}\x{7358}' .
-'\x{7359}\x{735A}\x{735B}\x{735C}\x{735D}\x{735E}\x{735F}\x{7360}\x{7361}' .
-'\x{7362}\x{7364}\x{7365}\x{7366}\x{7367}\x{7368}\x{7369}\x{736A}\x{736B}' .
-'\x{736C}\x{736D}\x{736E}\x{736F}\x{7370}\x{7371}\x{7372}\x{7373}\x{7374}' .
-'\x{7375}\x{7376}\x{7377}\x{7378}\x{7379}\x{737A}\x{737B}\x{737C}\x{737D}' .
-'\x{737E}\x{737F}\x{7380}\x{7381}\x{7382}\x{7383}\x{7384}\x{7385}\x{7386}' .
-'\x{7387}\x{7388}\x{7389}\x{738A}\x{738B}\x{738C}\x{738D}\x{738E}\x{738F}' .
-'\x{7390}\x{7391}\x{7392}\x{7393}\x{7394}\x{7395}\x{7396}\x{7397}\x{7398}' .
-'\x{7399}\x{739A}\x{739B}\x{739D}\x{739E}\x{739F}\x{73A0}\x{73A1}\x{73A2}' .
-'\x{73A3}\x{73A4}\x{73A5}\x{73A6}\x{73A7}\x{73A8}\x{73A9}\x{73AA}\x{73AB}' .
-'\x{73AC}\x{73AD}\x{73AE}\x{73AF}\x{73B0}\x{73B1}\x{73B2}\x{73B3}\x{73B4}' .
-'\x{73B5}\x{73B6}\x{73B7}\x{73B8}\x{73B9}\x{73BA}\x{73BB}\x{73BC}\x{73BD}' .
-'\x{73BE}\x{73BF}\x{73C0}\x{73C2}\x{73C3}\x{73C4}\x{73C5}\x{73C6}\x{73C7}' .
-'\x{73C8}\x{73C9}\x{73CA}\x{73CB}\x{73CC}\x{73CD}\x{73CE}\x{73CF}\x{73D0}' .
-'\x{73D1}\x{73D2}\x{73D3}\x{73D4}\x{73D5}\x{73D6}\x{73D7}\x{73D8}\x{73D9}' .
-'\x{73DA}\x{73DB}\x{73DC}\x{73DD}\x{73DE}\x{73DF}\x{73E0}\x{73E2}\x{73E3}' .
-'\x{73E5}\x{73E6}\x{73E7}\x{73E8}\x{73E9}\x{73EA}\x{73EB}\x{73EC}\x{73ED}' .
-'\x{73EE}\x{73EF}\x{73F0}\x{73F1}\x{73F2}\x{73F4}\x{73F5}\x{73F6}\x{73F7}' .
-'\x{73F8}\x{73F9}\x{73FA}\x{73FC}\x{73FD}\x{73FE}\x{73FF}\x{7400}\x{7401}' .
-'\x{7402}\x{7403}\x{7404}\x{7405}\x{7406}\x{7407}\x{7408}\x{7409}\x{740A}' .
-'\x{740B}\x{740C}\x{740D}\x{740E}\x{740F}\x{7410}\x{7411}\x{7412}\x{7413}' .
-'\x{7414}\x{7415}\x{7416}\x{7417}\x{7419}\x{741A}\x{741B}\x{741C}\x{741D}' .
-'\x{741E}\x{741F}\x{7420}\x{7421}\x{7422}\x{7423}\x{7424}\x{7425}\x{7426}' .
-'\x{7427}\x{7428}\x{7429}\x{742A}\x{742B}\x{742C}\x{742D}\x{742E}\x{742F}' .
-'\x{7430}\x{7431}\x{7432}\x{7433}\x{7434}\x{7435}\x{7436}\x{7437}\x{7438}' .
-'\x{743A}\x{743B}\x{743C}\x{743D}\x{743F}\x{7440}\x{7441}\x{7442}\x{7443}' .
-'\x{7444}\x{7445}\x{7446}\x{7448}\x{744A}\x{744B}\x{744C}\x{744D}\x{744E}' .
-'\x{744F}\x{7450}\x{7451}\x{7452}\x{7453}\x{7454}\x{7455}\x{7456}\x{7457}' .
-'\x{7459}\x{745A}\x{745B}\x{745C}\x{745D}\x{745E}\x{745F}\x{7461}\x{7462}' .
-'\x{7463}\x{7464}\x{7465}\x{7466}\x{7467}\x{7468}\x{7469}\x{746A}\x{746B}' .
-'\x{746C}\x{746D}\x{746E}\x{746F}\x{7470}\x{7471}\x{7472}\x{7473}\x{7474}' .
-'\x{7475}\x{7476}\x{7477}\x{7478}\x{7479}\x{747A}\x{747C}\x{747D}\x{747E}' .
-'\x{747F}\x{7480}\x{7481}\x{7482}\x{7483}\x{7485}\x{7486}\x{7487}\x{7488}' .
-'\x{7489}\x{748A}\x{748B}\x{748C}\x{748D}\x{748E}\x{748F}\x{7490}\x{7491}' .
-'\x{7492}\x{7493}\x{7494}\x{7495}\x{7497}\x{7498}\x{7499}\x{749A}\x{749B}' .
-'\x{749C}\x{749E}\x{749F}\x{74A0}\x{74A1}\x{74A3}\x{74A4}\x{74A5}\x{74A6}' .
-'\x{74A7}\x{74A8}\x{74A9}\x{74AA}\x{74AB}\x{74AC}\x{74AD}\x{74AE}\x{74AF}' .
-'\x{74B0}\x{74B1}\x{74B2}\x{74B3}\x{74B4}\x{74B5}\x{74B6}\x{74B7}\x{74B8}' .
-'\x{74B9}\x{74BA}\x{74BB}\x{74BC}\x{74BD}\x{74BE}\x{74BF}\x{74C0}\x{74C1}' .
-'\x{74C2}\x{74C3}\x{74C4}\x{74C5}\x{74C6}\x{74CA}\x{74CB}\x{74CD}\x{74CE}' .
-'\x{74CF}\x{74D0}\x{74D1}\x{74D2}\x{74D3}\x{74D4}\x{74D5}\x{74D6}\x{74D7}' .
-'\x{74D8}\x{74D9}\x{74DA}\x{74DB}\x{74DC}\x{74DD}\x{74DE}\x{74DF}\x{74E0}' .
-'\x{74E1}\x{74E2}\x{74E3}\x{74E4}\x{74E5}\x{74E6}\x{74E7}\x{74E8}\x{74E9}' .
-'\x{74EA}\x{74EC}\x{74ED}\x{74EE}\x{74EF}\x{74F0}\x{74F1}\x{74F2}\x{74F3}' .
-'\x{74F4}\x{74F5}\x{74F6}\x{74F7}\x{74F8}\x{74F9}\x{74FA}\x{74FB}\x{74FC}' .
-'\x{74FD}\x{74FE}\x{74FF}\x{7500}\x{7501}\x{7502}\x{7503}\x{7504}\x{7505}' .
-'\x{7506}\x{7507}\x{7508}\x{7509}\x{750A}\x{750B}\x{750C}\x{750D}\x{750F}' .
-'\x{7510}\x{7511}\x{7512}\x{7513}\x{7514}\x{7515}\x{7516}\x{7517}\x{7518}' .
-'\x{7519}\x{751A}\x{751B}\x{751C}\x{751D}\x{751E}\x{751F}\x{7521}\x{7522}' .
-'\x{7523}\x{7524}\x{7525}\x{7526}\x{7527}\x{7528}\x{7529}\x{752A}\x{752B}' .
-'\x{752C}\x{752D}\x{752E}\x{752F}\x{7530}\x{7531}\x{7532}\x{7533}\x{7535}' .
-'\x{7536}\x{7537}\x{7538}\x{7539}\x{753A}\x{753B}\x{753C}\x{753D}\x{753E}' .
-'\x{753F}\x{7540}\x{7542}\x{7543}\x{7544}\x{7545}\x{7546}\x{7547}\x{7548}' .
-'\x{7549}\x{754B}\x{754C}\x{754D}\x{754E}\x{754F}\x{7550}\x{7551}\x{7553}' .
-'\x{7554}\x{7556}\x{7557}\x{7558}\x{7559}\x{755A}\x{755B}\x{755C}\x{755D}' .
-'\x{755F}\x{7560}\x{7562}\x{7563}\x{7564}\x{7565}\x{7566}\x{7567}\x{7568}' .
-'\x{7569}\x{756A}\x{756B}\x{756C}\x{756D}\x{756E}\x{756F}\x{7570}\x{7572}' .
-'\x{7574}\x{7575}\x{7576}\x{7577}\x{7578}\x{7579}\x{757C}\x{757D}\x{757E}' .
-'\x{757F}\x{7580}\x{7581}\x{7582}\x{7583}\x{7584}\x{7586}\x{7587}\x{7588}' .
-'\x{7589}\x{758A}\x{758B}\x{758C}\x{758D}\x{758F}\x{7590}\x{7591}\x{7592}' .
-'\x{7593}\x{7594}\x{7595}\x{7596}\x{7597}\x{7598}\x{7599}\x{759A}\x{759B}' .
-'\x{759C}\x{759D}\x{759E}\x{759F}\x{75A0}\x{75A1}\x{75A2}\x{75A3}\x{75A4}' .
-'\x{75A5}\x{75A6}\x{75A7}\x{75A8}\x{75AA}\x{75AB}\x{75AC}\x{75AD}\x{75AE}' .
-'\x{75AF}\x{75B0}\x{75B1}\x{75B2}\x{75B3}\x{75B4}\x{75B5}\x{75B6}\x{75B8}' .
-'\x{75B9}\x{75BA}\x{75BB}\x{75BC}\x{75BD}\x{75BE}\x{75BF}\x{75C0}\x{75C1}' .
-'\x{75C2}\x{75C3}\x{75C4}\x{75C5}\x{75C6}\x{75C7}\x{75C8}\x{75C9}\x{75CA}' .
-'\x{75CB}\x{75CC}\x{75CD}\x{75CE}\x{75CF}\x{75D0}\x{75D1}\x{75D2}\x{75D3}' .
-'\x{75D4}\x{75D5}\x{75D6}\x{75D7}\x{75D8}\x{75D9}\x{75DA}\x{75DB}\x{75DD}' .
-'\x{75DE}\x{75DF}\x{75E0}\x{75E1}\x{75E2}\x{75E3}\x{75E4}\x{75E5}\x{75E6}' .
-'\x{75E7}\x{75E8}\x{75EA}\x{75EB}\x{75EC}\x{75ED}\x{75EF}\x{75F0}\x{75F1}' .
-'\x{75F2}\x{75F3}\x{75F4}\x{75F5}\x{75F6}\x{75F7}\x{75F8}\x{75F9}\x{75FA}' .
-'\x{75FB}\x{75FC}\x{75FD}\x{75FE}\x{75FF}\x{7600}\x{7601}\x{7602}\x{7603}' .
-'\x{7604}\x{7605}\x{7606}\x{7607}\x{7608}\x{7609}\x{760A}\x{760B}\x{760C}' .
-'\x{760D}\x{760E}\x{760F}\x{7610}\x{7611}\x{7612}\x{7613}\x{7614}\x{7615}' .
-'\x{7616}\x{7617}\x{7618}\x{7619}\x{761A}\x{761B}\x{761C}\x{761D}\x{761E}' .
-'\x{761F}\x{7620}\x{7621}\x{7622}\x{7623}\x{7624}\x{7625}\x{7626}\x{7627}' .
-'\x{7628}\x{7629}\x{762A}\x{762B}\x{762D}\x{762E}\x{762F}\x{7630}\x{7631}' .
-'\x{7632}\x{7633}\x{7634}\x{7635}\x{7636}\x{7637}\x{7638}\x{7639}\x{763A}' .
-'\x{763B}\x{763C}\x{763D}\x{763E}\x{763F}\x{7640}\x{7641}\x{7642}\x{7643}' .
-'\x{7646}\x{7647}\x{7648}\x{7649}\x{764A}\x{764B}\x{764C}\x{764D}\x{764F}' .
-'\x{7650}\x{7652}\x{7653}\x{7654}\x{7656}\x{7657}\x{7658}\x{7659}\x{765A}' .
-'\x{765B}\x{765C}\x{765D}\x{765E}\x{765F}\x{7660}\x{7661}\x{7662}\x{7663}' .
-'\x{7664}\x{7665}\x{7666}\x{7667}\x{7668}\x{7669}\x{766A}\x{766B}\x{766C}' .
-'\x{766D}\x{766E}\x{766F}\x{7670}\x{7671}\x{7672}\x{7674}\x{7675}\x{7676}' .
-'\x{7677}\x{7678}\x{7679}\x{767B}\x{767C}\x{767D}\x{767E}\x{767F}\x{7680}' .
-'\x{7681}\x{7682}\x{7683}\x{7684}\x{7685}\x{7686}\x{7687}\x{7688}\x{7689}' .
-'\x{768A}\x{768B}\x{768C}\x{768E}\x{768F}\x{7690}\x{7691}\x{7692}\x{7693}' .
-'\x{7694}\x{7695}\x{7696}\x{7697}\x{7698}\x{7699}\x{769A}\x{769B}\x{769C}' .
-'\x{769D}\x{769E}\x{769F}\x{76A0}\x{76A3}\x{76A4}\x{76A6}\x{76A7}\x{76A9}' .
-'\x{76AA}\x{76AB}\x{76AC}\x{76AD}\x{76AE}\x{76AF}\x{76B0}\x{76B1}\x{76B2}' .
-'\x{76B4}\x{76B5}\x{76B7}\x{76B8}\x{76BA}\x{76BB}\x{76BC}\x{76BD}\x{76BE}' .
-'\x{76BF}\x{76C0}\x{76C2}\x{76C3}\x{76C4}\x{76C5}\x{76C6}\x{76C7}\x{76C8}' .
-'\x{76C9}\x{76CA}\x{76CD}\x{76CE}\x{76CF}\x{76D0}\x{76D1}\x{76D2}\x{76D3}' .
-'\x{76D4}\x{76D5}\x{76D6}\x{76D7}\x{76D8}\x{76DA}\x{76DB}\x{76DC}\x{76DD}' .
-'\x{76DE}\x{76DF}\x{76E0}\x{76E1}\x{76E2}\x{76E3}\x{76E4}\x{76E5}\x{76E6}' .
-'\x{76E7}\x{76E8}\x{76E9}\x{76EA}\x{76EC}\x{76ED}\x{76EE}\x{76EF}\x{76F0}' .
-'\x{76F1}\x{76F2}\x{76F3}\x{76F4}\x{76F5}\x{76F6}\x{76F7}\x{76F8}\x{76F9}' .
-'\x{76FA}\x{76FB}\x{76FC}\x{76FD}\x{76FE}\x{76FF}\x{7701}\x{7703}\x{7704}' .
-'\x{7705}\x{7706}\x{7707}\x{7708}\x{7709}\x{770A}\x{770B}\x{770C}\x{770D}' .
-'\x{770F}\x{7710}\x{7711}\x{7712}\x{7713}\x{7714}\x{7715}\x{7716}\x{7717}' .
-'\x{7718}\x{7719}\x{771A}\x{771B}\x{771C}\x{771D}\x{771E}\x{771F}\x{7720}' .
-'\x{7722}\x{7723}\x{7725}\x{7726}\x{7727}\x{7728}\x{7729}\x{772A}\x{772C}' .
-'\x{772D}\x{772E}\x{772F}\x{7730}\x{7731}\x{7732}\x{7733}\x{7734}\x{7735}' .
-'\x{7736}\x{7737}\x{7738}\x{7739}\x{773A}\x{773B}\x{773C}\x{773D}\x{773E}' .
-'\x{7740}\x{7741}\x{7743}\x{7744}\x{7745}\x{7746}\x{7747}\x{7748}\x{7749}' .
-'\x{774A}\x{774B}\x{774C}\x{774D}\x{774E}\x{774F}\x{7750}\x{7751}\x{7752}' .
-'\x{7753}\x{7754}\x{7755}\x{7756}\x{7757}\x{7758}\x{7759}\x{775A}\x{775B}' .
-'\x{775C}\x{775D}\x{775E}\x{775F}\x{7760}\x{7761}\x{7762}\x{7763}\x{7765}' .
-'\x{7766}\x{7767}\x{7768}\x{7769}\x{776A}\x{776B}\x{776C}\x{776D}\x{776E}' .
-'\x{776F}\x{7770}\x{7771}\x{7772}\x{7773}\x{7774}\x{7775}\x{7776}\x{7777}' .
-'\x{7778}\x{7779}\x{777A}\x{777B}\x{777C}\x{777D}\x{777E}\x{777F}\x{7780}' .
-'\x{7781}\x{7782}\x{7783}\x{7784}\x{7785}\x{7786}\x{7787}\x{7788}\x{7789}' .
-'\x{778A}\x{778B}\x{778C}\x{778D}\x{778E}\x{778F}\x{7790}\x{7791}\x{7792}' .
-'\x{7793}\x{7794}\x{7795}\x{7797}\x{7798}\x{7799}\x{779A}\x{779B}\x{779C}' .
-'\x{779D}\x{779E}\x{779F}\x{77A0}\x{77A1}\x{77A2}\x{77A3}\x{77A5}\x{77A6}' .
-'\x{77A7}\x{77A8}\x{77A9}\x{77AA}\x{77AB}\x{77AC}\x{77AD}\x{77AE}\x{77AF}' .
-'\x{77B0}\x{77B1}\x{77B2}\x{77B3}\x{77B4}\x{77B5}\x{77B6}\x{77B7}\x{77B8}' .
-'\x{77B9}\x{77BA}\x{77BB}\x{77BC}\x{77BD}\x{77BF}\x{77C0}\x{77C2}\x{77C3}' .
-'\x{77C4}\x{77C5}\x{77C6}\x{77C7}\x{77C8}\x{77C9}\x{77CA}\x{77CB}\x{77CC}' .
-'\x{77CD}\x{77CE}\x{77CF}\x{77D0}\x{77D1}\x{77D3}\x{77D4}\x{77D5}\x{77D6}' .
-'\x{77D7}\x{77D8}\x{77D9}\x{77DA}\x{77DB}\x{77DC}\x{77DE}\x{77DF}\x{77E0}' .
-'\x{77E1}\x{77E2}\x{77E3}\x{77E5}\x{77E7}\x{77E8}\x{77E9}\x{77EA}\x{77EB}' .
-'\x{77EC}\x{77ED}\x{77EE}\x{77EF}\x{77F0}\x{77F1}\x{77F2}\x{77F3}\x{77F6}' .
-'\x{77F7}\x{77F8}\x{77F9}\x{77FA}\x{77FB}\x{77FC}\x{77FD}\x{77FE}\x{77FF}' .
-'\x{7800}\x{7801}\x{7802}\x{7803}\x{7804}\x{7805}\x{7806}\x{7808}\x{7809}' .
-'\x{780A}\x{780B}\x{780C}\x{780D}\x{780E}\x{780F}\x{7810}\x{7811}\x{7812}' .
-'\x{7813}\x{7814}\x{7815}\x{7816}\x{7817}\x{7818}\x{7819}\x{781A}\x{781B}' .
-'\x{781C}\x{781D}\x{781E}\x{781F}\x{7820}\x{7821}\x{7822}\x{7823}\x{7825}' .
-'\x{7826}\x{7827}\x{7828}\x{7829}\x{782A}\x{782B}\x{782C}\x{782D}\x{782E}' .
-'\x{782F}\x{7830}\x{7831}\x{7832}\x{7833}\x{7834}\x{7835}\x{7837}\x{7838}' .
-'\x{7839}\x{783A}\x{783B}\x{783C}\x{783D}\x{783E}\x{7840}\x{7841}\x{7843}' .
-'\x{7844}\x{7845}\x{7847}\x{7848}\x{7849}\x{784A}\x{784C}\x{784D}\x{784E}' .
-'\x{7850}\x{7851}\x{7852}\x{7853}\x{7854}\x{7855}\x{7856}\x{7857}\x{7858}' .
-'\x{7859}\x{785A}\x{785B}\x{785C}\x{785D}\x{785E}\x{785F}\x{7860}\x{7861}' .
-'\x{7862}\x{7863}\x{7864}\x{7865}\x{7866}\x{7867}\x{7868}\x{7869}\x{786A}' .
-'\x{786B}\x{786C}\x{786D}\x{786E}\x{786F}\x{7870}\x{7871}\x{7872}\x{7873}' .
-'\x{7874}\x{7875}\x{7877}\x{7878}\x{7879}\x{787A}\x{787B}\x{787C}\x{787D}' .
-'\x{787E}\x{787F}\x{7880}\x{7881}\x{7882}\x{7883}\x{7884}\x{7885}\x{7886}' .
-'\x{7887}\x{7889}\x{788A}\x{788B}\x{788C}\x{788D}\x{788E}\x{788F}\x{7890}' .
-'\x{7891}\x{7892}\x{7893}\x{7894}\x{7895}\x{7896}\x{7897}\x{7898}\x{7899}' .
-'\x{789A}\x{789B}\x{789C}\x{789D}\x{789E}\x{789F}\x{78A0}\x{78A1}\x{78A2}' .
-'\x{78A3}\x{78A4}\x{78A5}\x{78A6}\x{78A7}\x{78A8}\x{78A9}\x{78AA}\x{78AB}' .
-'\x{78AC}\x{78AD}\x{78AE}\x{78AF}\x{78B0}\x{78B1}\x{78B2}\x{78B3}\x{78B4}' .
-'\x{78B5}\x{78B6}\x{78B7}\x{78B8}\x{78B9}\x{78BA}\x{78BB}\x{78BC}\x{78BD}' .
-'\x{78BE}\x{78BF}\x{78C0}\x{78C1}\x{78C3}\x{78C4}\x{78C5}\x{78C6}\x{78C8}' .
-'\x{78C9}\x{78CA}\x{78CB}\x{78CC}\x{78CD}\x{78CE}\x{78CF}\x{78D0}\x{78D1}' .
-'\x{78D3}\x{78D4}\x{78D5}\x{78D6}\x{78D7}\x{78D8}\x{78D9}\x{78DA}\x{78DB}' .
-'\x{78DC}\x{78DD}\x{78DE}\x{78DF}\x{78E0}\x{78E1}\x{78E2}\x{78E3}\x{78E4}' .
-'\x{78E5}\x{78E6}\x{78E7}\x{78E8}\x{78E9}\x{78EA}\x{78EB}\x{78EC}\x{78ED}' .
-'\x{78EE}\x{78EF}\x{78F1}\x{78F2}\x{78F3}\x{78F4}\x{78F5}\x{78F6}\x{78F7}' .
-'\x{78F9}\x{78FA}\x{78FB}\x{78FC}\x{78FD}\x{78FE}\x{78FF}\x{7901}\x{7902}' .
-'\x{7903}\x{7904}\x{7905}\x{7906}\x{7907}\x{7909}\x{790A}\x{790B}\x{790C}' .
-'\x{790E}\x{790F}\x{7910}\x{7911}\x{7912}\x{7913}\x{7914}\x{7916}\x{7917}' .
-'\x{7918}\x{7919}\x{791A}\x{791B}\x{791C}\x{791D}\x{791E}\x{7921}\x{7922}' .
-'\x{7923}\x{7924}\x{7925}\x{7926}\x{7927}\x{7928}\x{7929}\x{792A}\x{792B}' .
-'\x{792C}\x{792D}\x{792E}\x{792F}\x{7930}\x{7931}\x{7933}\x{7934}\x{7935}' .
-'\x{7937}\x{7938}\x{7939}\x{793A}\x{793B}\x{793C}\x{793D}\x{793E}\x{793F}' .
-'\x{7940}\x{7941}\x{7942}\x{7943}\x{7944}\x{7945}\x{7946}\x{7947}\x{7948}' .
-'\x{7949}\x{794A}\x{794B}\x{794C}\x{794D}\x{794E}\x{794F}\x{7950}\x{7951}' .
-'\x{7952}\x{7953}\x{7954}\x{7955}\x{7956}\x{7957}\x{7958}\x{795A}\x{795B}' .
-'\x{795C}\x{795D}\x{795E}\x{795F}\x{7960}\x{7961}\x{7962}\x{7963}\x{7964}' .
-'\x{7965}\x{7966}\x{7967}\x{7968}\x{7969}\x{796A}\x{796B}\x{796D}\x{796F}' .
-'\x{7970}\x{7971}\x{7972}\x{7973}\x{7974}\x{7977}\x{7978}\x{7979}\x{797A}' .
-'\x{797B}\x{797C}\x{797D}\x{797E}\x{797F}\x{7980}\x{7981}\x{7982}\x{7983}' .
-'\x{7984}\x{7985}\x{7988}\x{7989}\x{798A}\x{798B}\x{798C}\x{798D}\x{798E}' .
-'\x{798F}\x{7990}\x{7991}\x{7992}\x{7993}\x{7994}\x{7995}\x{7996}\x{7997}' .
-'\x{7998}\x{7999}\x{799A}\x{799B}\x{799C}\x{799F}\x{79A0}\x{79A1}\x{79A2}' .
-'\x{79A3}\x{79A4}\x{79A5}\x{79A6}\x{79A7}\x{79A8}\x{79AA}\x{79AB}\x{79AC}' .
-'\x{79AD}\x{79AE}\x{79AF}\x{79B0}\x{79B1}\x{79B2}\x{79B3}\x{79B4}\x{79B5}' .
-'\x{79B6}\x{79B7}\x{79B8}\x{79B9}\x{79BA}\x{79BB}\x{79BD}\x{79BE}\x{79BF}' .
-'\x{79C0}\x{79C1}\x{79C2}\x{79C3}\x{79C5}\x{79C6}\x{79C8}\x{79C9}\x{79CA}' .
-'\x{79CB}\x{79CD}\x{79CE}\x{79CF}\x{79D0}\x{79D1}\x{79D2}\x{79D3}\x{79D5}' .
-'\x{79D6}\x{79D8}\x{79D9}\x{79DA}\x{79DB}\x{79DC}\x{79DD}\x{79DE}\x{79DF}' .
-'\x{79E0}\x{79E1}\x{79E2}\x{79E3}\x{79E4}\x{79E5}\x{79E6}\x{79E7}\x{79E8}' .
-'\x{79E9}\x{79EA}\x{79EB}\x{79EC}\x{79ED}\x{79EE}\x{79EF}\x{79F0}\x{79F1}' .
-'\x{79F2}\x{79F3}\x{79F4}\x{79F5}\x{79F6}\x{79F7}\x{79F8}\x{79F9}\x{79FA}' .
-'\x{79FB}\x{79FC}\x{79FD}\x{79FE}\x{79FF}\x{7A00}\x{7A02}\x{7A03}\x{7A04}' .
-'\x{7A05}\x{7A06}\x{7A08}\x{7A0A}\x{7A0B}\x{7A0C}\x{7A0D}\x{7A0E}\x{7A0F}' .
-'\x{7A10}\x{7A11}\x{7A12}\x{7A13}\x{7A14}\x{7A15}\x{7A16}\x{7A17}\x{7A18}' .
-'\x{7A19}\x{7A1A}\x{7A1B}\x{7A1C}\x{7A1D}\x{7A1E}\x{7A1F}\x{7A20}\x{7A21}' .
-'\x{7A22}\x{7A23}\x{7A24}\x{7A25}\x{7A26}\x{7A27}\x{7A28}\x{7A29}\x{7A2A}' .
-'\x{7A2B}\x{7A2D}\x{7A2E}\x{7A2F}\x{7A30}\x{7A31}\x{7A32}\x{7A33}\x{7A34}' .
-'\x{7A35}\x{7A37}\x{7A39}\x{7A3B}\x{7A3C}\x{7A3D}\x{7A3E}\x{7A3F}\x{7A40}' .
-'\x{7A41}\x{7A42}\x{7A43}\x{7A44}\x{7A45}\x{7A46}\x{7A47}\x{7A48}\x{7A49}' .
-'\x{7A4A}\x{7A4B}\x{7A4C}\x{7A4D}\x{7A4E}\x{7A50}\x{7A51}\x{7A52}\x{7A53}' .
-'\x{7A54}\x{7A55}\x{7A56}\x{7A57}\x{7A58}\x{7A59}\x{7A5A}\x{7A5B}\x{7A5C}' .
-'\x{7A5D}\x{7A5E}\x{7A5F}\x{7A60}\x{7A61}\x{7A62}\x{7A65}\x{7A66}\x{7A67}' .
-'\x{7A68}\x{7A69}\x{7A6B}\x{7A6C}\x{7A6D}\x{7A6E}\x{7A70}\x{7A71}\x{7A72}' .
-'\x{7A73}\x{7A74}\x{7A75}\x{7A76}\x{7A77}\x{7A78}\x{7A79}\x{7A7A}\x{7A7B}' .
-'\x{7A7C}\x{7A7D}\x{7A7E}\x{7A7F}\x{7A80}\x{7A81}\x{7A83}\x{7A84}\x{7A85}' .
-'\x{7A86}\x{7A87}\x{7A88}\x{7A89}\x{7A8A}\x{7A8B}\x{7A8C}\x{7A8D}\x{7A8E}' .
-'\x{7A8F}\x{7A90}\x{7A91}\x{7A92}\x{7A93}\x{7A94}\x{7A95}\x{7A96}\x{7A97}' .
-'\x{7A98}\x{7A99}\x{7A9C}\x{7A9D}\x{7A9E}\x{7A9F}\x{7AA0}\x{7AA1}\x{7AA2}' .
-'\x{7AA3}\x{7AA4}\x{7AA5}\x{7AA6}\x{7AA7}\x{7AA8}\x{7AA9}\x{7AAA}\x{7AAB}' .
-'\x{7AAC}\x{7AAD}\x{7AAE}\x{7AAF}\x{7AB0}\x{7AB1}\x{7AB2}\x{7AB3}\x{7AB4}' .
-'\x{7AB5}\x{7AB6}\x{7AB7}\x{7AB8}\x{7ABA}\x{7ABE}\x{7ABF}\x{7AC0}\x{7AC1}' .
-'\x{7AC4}\x{7AC5}\x{7AC7}\x{7AC8}\x{7AC9}\x{7ACA}\x{7ACB}\x{7ACC}\x{7ACD}' .
-'\x{7ACE}\x{7ACF}\x{7AD0}\x{7AD1}\x{7AD2}\x{7AD3}\x{7AD4}\x{7AD5}\x{7AD6}' .
-'\x{7AD8}\x{7AD9}\x{7ADB}\x{7ADC}\x{7ADD}\x{7ADE}\x{7ADF}\x{7AE0}\x{7AE1}' .
-'\x{7AE2}\x{7AE3}\x{7AE4}\x{7AE5}\x{7AE6}\x{7AE7}\x{7AE8}\x{7AEA}\x{7AEB}' .
-'\x{7AEC}\x{7AED}\x{7AEE}\x{7AEF}\x{7AF0}\x{7AF1}\x{7AF2}\x{7AF3}\x{7AF4}' .
-'\x{7AF6}\x{7AF7}\x{7AF8}\x{7AF9}\x{7AFA}\x{7AFB}\x{7AFD}\x{7AFE}\x{7AFF}' .
-'\x{7B00}\x{7B01}\x{7B02}\x{7B03}\x{7B04}\x{7B05}\x{7B06}\x{7B08}\x{7B09}' .
-'\x{7B0A}\x{7B0B}\x{7B0C}\x{7B0D}\x{7B0E}\x{7B0F}\x{7B10}\x{7B11}\x{7B12}' .
-'\x{7B13}\x{7B14}\x{7B15}\x{7B16}\x{7B17}\x{7B18}\x{7B19}\x{7B1A}\x{7B1B}' .
-'\x{7B1C}\x{7B1D}\x{7B1E}\x{7B20}\x{7B21}\x{7B22}\x{7B23}\x{7B24}\x{7B25}' .
-'\x{7B26}\x{7B28}\x{7B2A}\x{7B2B}\x{7B2C}\x{7B2D}\x{7B2E}\x{7B2F}\x{7B30}' .
-'\x{7B31}\x{7B32}\x{7B33}\x{7B34}\x{7B35}\x{7B36}\x{7B37}\x{7B38}\x{7B39}' .
-'\x{7B3A}\x{7B3B}\x{7B3C}\x{7B3D}\x{7B3E}\x{7B3F}\x{7B40}\x{7B41}\x{7B43}' .
-'\x{7B44}\x{7B45}\x{7B46}\x{7B47}\x{7B48}\x{7B49}\x{7B4A}\x{7B4B}\x{7B4C}' .
-'\x{7B4D}\x{7B4E}\x{7B4F}\x{7B50}\x{7B51}\x{7B52}\x{7B54}\x{7B55}\x{7B56}' .
-'\x{7B57}\x{7B58}\x{7B59}\x{7B5A}\x{7B5B}\x{7B5C}\x{7B5D}\x{7B5E}\x{7B5F}' .
-'\x{7B60}\x{7B61}\x{7B62}\x{7B63}\x{7B64}\x{7B65}\x{7B66}\x{7B67}\x{7B68}' .
-'\x{7B69}\x{7B6A}\x{7B6B}\x{7B6C}\x{7B6D}\x{7B6E}\x{7B70}\x{7B71}\x{7B72}' .
-'\x{7B73}\x{7B74}\x{7B75}\x{7B76}\x{7B77}\x{7B78}\x{7B79}\x{7B7B}\x{7B7C}' .
-'\x{7B7D}\x{7B7E}\x{7B7F}\x{7B80}\x{7B81}\x{7B82}\x{7B83}\x{7B84}\x{7B85}' .
-'\x{7B87}\x{7B88}\x{7B89}\x{7B8A}\x{7B8B}\x{7B8C}\x{7B8D}\x{7B8E}\x{7B8F}' .
-'\x{7B90}\x{7B91}\x{7B93}\x{7B94}\x{7B95}\x{7B96}\x{7B97}\x{7B98}\x{7B99}' .
-'\x{7B9A}\x{7B9B}\x{7B9C}\x{7B9D}\x{7B9E}\x{7B9F}\x{7BA0}\x{7BA1}\x{7BA2}' .
-'\x{7BA4}\x{7BA6}\x{7BA7}\x{7BA8}\x{7BA9}\x{7BAA}\x{7BAB}\x{7BAC}\x{7BAD}' .
-'\x{7BAE}\x{7BAF}\x{7BB1}\x{7BB3}\x{7BB4}\x{7BB5}\x{7BB6}\x{7BB7}\x{7BB8}' .
-'\x{7BB9}\x{7BBA}\x{7BBB}\x{7BBC}\x{7BBD}\x{7BBE}\x{7BBF}\x{7BC0}\x{7BC1}' .
-'\x{7BC2}\x{7BC3}\x{7BC4}\x{7BC5}\x{7BC6}\x{7BC7}\x{7BC8}\x{7BC9}\x{7BCA}' .
-'\x{7BCB}\x{7BCC}\x{7BCD}\x{7BCE}\x{7BD0}\x{7BD1}\x{7BD2}\x{7BD3}\x{7BD4}' .
-'\x{7BD5}\x{7BD6}\x{7BD7}\x{7BD8}\x{7BD9}\x{7BDA}\x{7BDB}\x{7BDC}\x{7BDD}' .
-'\x{7BDE}\x{7BDF}\x{7BE0}\x{7BE1}\x{7BE2}\x{7BE3}\x{7BE4}\x{7BE5}\x{7BE6}' .
-'\x{7BE7}\x{7BE8}\x{7BE9}\x{7BEA}\x{7BEB}\x{7BEC}\x{7BED}\x{7BEE}\x{7BEF}' .
-'\x{7BF0}\x{7BF1}\x{7BF2}\x{7BF3}\x{7BF4}\x{7BF5}\x{7BF6}\x{7BF7}\x{7BF8}' .
-'\x{7BF9}\x{7BFB}\x{7BFC}\x{7BFD}\x{7BFE}\x{7BFF}\x{7C00}\x{7C01}\x{7C02}' .
-'\x{7C03}\x{7C04}\x{7C05}\x{7C06}\x{7C07}\x{7C08}\x{7C09}\x{7C0A}\x{7C0B}' .
-'\x{7C0C}\x{7C0D}\x{7C0E}\x{7C0F}\x{7C10}\x{7C11}\x{7C12}\x{7C13}\x{7C15}' .
-'\x{7C16}\x{7C17}\x{7C18}\x{7C19}\x{7C1A}\x{7C1C}\x{7C1D}\x{7C1E}\x{7C1F}' .
-'\x{7C20}\x{7C21}\x{7C22}\x{7C23}\x{7C24}\x{7C25}\x{7C26}\x{7C27}\x{7C28}' .
-'\x{7C29}\x{7C2A}\x{7C2B}\x{7C2C}\x{7C2D}\x{7C30}\x{7C31}\x{7C32}\x{7C33}' .
-'\x{7C34}\x{7C35}\x{7C36}\x{7C37}\x{7C38}\x{7C39}\x{7C3A}\x{7C3B}\x{7C3C}' .
-'\x{7C3D}\x{7C3E}\x{7C3F}\x{7C40}\x{7C41}\x{7C42}\x{7C43}\x{7C44}\x{7C45}' .
-'\x{7C46}\x{7C47}\x{7C48}\x{7C49}\x{7C4A}\x{7C4B}\x{7C4C}\x{7C4D}\x{7C4E}' .
-'\x{7C50}\x{7C51}\x{7C53}\x{7C54}\x{7C56}\x{7C57}\x{7C58}\x{7C59}\x{7C5A}' .
-'\x{7C5B}\x{7C5C}\x{7C5E}\x{7C5F}\x{7C60}\x{7C61}\x{7C62}\x{7C63}\x{7C64}' .
-'\x{7C65}\x{7C66}\x{7C67}\x{7C68}\x{7C69}\x{7C6A}\x{7C6B}\x{7C6C}\x{7C6D}' .
-'\x{7C6E}\x{7C6F}\x{7C70}\x{7C71}\x{7C72}\x{7C73}\x{7C74}\x{7C75}\x{7C77}' .
-'\x{7C78}\x{7C79}\x{7C7A}\x{7C7B}\x{7C7C}\x{7C7D}\x{7C7E}\x{7C7F}\x{7C80}' .
-'\x{7C81}\x{7C82}\x{7C84}\x{7C85}\x{7C86}\x{7C88}\x{7C89}\x{7C8A}\x{7C8B}' .
-'\x{7C8C}\x{7C8D}\x{7C8E}\x{7C8F}\x{7C90}\x{7C91}\x{7C92}\x{7C94}\x{7C95}' .
-'\x{7C96}\x{7C97}\x{7C98}\x{7C99}\x{7C9B}\x{7C9C}\x{7C9D}\x{7C9E}\x{7C9F}' .
-'\x{7CA0}\x{7CA1}\x{7CA2}\x{7CA3}\x{7CA4}\x{7CA5}\x{7CA6}\x{7CA7}\x{7CA8}' .
-'\x{7CA9}\x{7CAA}\x{7CAD}\x{7CAE}\x{7CAF}\x{7CB0}\x{7CB1}\x{7CB2}\x{7CB3}' .
-'\x{7CB4}\x{7CB5}\x{7CB6}\x{7CB7}\x{7CB8}\x{7CB9}\x{7CBA}\x{7CBB}\x{7CBC}' .
-'\x{7CBD}\x{7CBE}\x{7CBF}\x{7CC0}\x{7CC1}\x{7CC2}\x{7CC3}\x{7CC4}\x{7CC5}' .
-'\x{7CC6}\x{7CC7}\x{7CC8}\x{7CC9}\x{7CCA}\x{7CCB}\x{7CCC}\x{7CCD}\x{7CCE}' .
-'\x{7CCF}\x{7CD0}\x{7CD1}\x{7CD2}\x{7CD4}\x{7CD5}\x{7CD6}\x{7CD7}\x{7CD8}' .
-'\x{7CD9}\x{7CDC}\x{7CDD}\x{7CDE}\x{7CDF}\x{7CE0}\x{7CE2}\x{7CE4}\x{7CE7}' .
-'\x{7CE8}\x{7CE9}\x{7CEA}\x{7CEB}\x{7CEC}\x{7CED}\x{7CEE}\x{7CEF}\x{7CF0}' .
-'\x{7CF1}\x{7CF2}\x{7CF3}\x{7CF4}\x{7CF5}\x{7CF6}\x{7CF7}\x{7CF8}\x{7CF9}' .
-'\x{7CFA}\x{7CFB}\x{7CFD}\x{7CFE}\x{7D00}\x{7D01}\x{7D02}\x{7D03}\x{7D04}' .
-'\x{7D05}\x{7D06}\x{7D07}\x{7D08}\x{7D09}\x{7D0A}\x{7D0B}\x{7D0C}\x{7D0D}' .
-'\x{7D0E}\x{7D0F}\x{7D10}\x{7D11}\x{7D12}\x{7D13}\x{7D14}\x{7D15}\x{7D16}' .
-'\x{7D17}\x{7D18}\x{7D19}\x{7D1A}\x{7D1B}\x{7D1C}\x{7D1D}\x{7D1E}\x{7D1F}' .
-'\x{7D20}\x{7D21}\x{7D22}\x{7D24}\x{7D25}\x{7D26}\x{7D27}\x{7D28}\x{7D29}' .
-'\x{7D2B}\x{7D2C}\x{7D2E}\x{7D2F}\x{7D30}\x{7D31}\x{7D32}\x{7D33}\x{7D34}' .
-'\x{7D35}\x{7D36}\x{7D37}\x{7D38}\x{7D39}\x{7D3A}\x{7D3B}\x{7D3C}\x{7D3D}' .
-'\x{7D3E}\x{7D3F}\x{7D40}\x{7D41}\x{7D42}\x{7D43}\x{7D44}\x{7D45}\x{7D46}' .
-'\x{7D47}\x{7D49}\x{7D4A}\x{7D4B}\x{7D4C}\x{7D4E}\x{7D4F}\x{7D50}\x{7D51}' .
-'\x{7D52}\x{7D53}\x{7D54}\x{7D55}\x{7D56}\x{7D57}\x{7D58}\x{7D59}\x{7D5B}' .
-'\x{7D5C}\x{7D5D}\x{7D5E}\x{7D5F}\x{7D60}\x{7D61}\x{7D62}\x{7D63}\x{7D65}' .
-'\x{7D66}\x{7D67}\x{7D68}\x{7D69}\x{7D6A}\x{7D6B}\x{7D6C}\x{7D6D}\x{7D6E}' .
-'\x{7D6F}\x{7D70}\x{7D71}\x{7D72}\x{7D73}\x{7D74}\x{7D75}\x{7D76}\x{7D77}' .
-'\x{7D79}\x{7D7A}\x{7D7B}\x{7D7C}\x{7D7D}\x{7D7E}\x{7D7F}\x{7D80}\x{7D81}' .
-'\x{7D83}\x{7D84}\x{7D85}\x{7D86}\x{7D87}\x{7D88}\x{7D89}\x{7D8A}\x{7D8B}' .
-'\x{7D8C}\x{7D8D}\x{7D8E}\x{7D8F}\x{7D90}\x{7D91}\x{7D92}\x{7D93}\x{7D94}' .
-'\x{7D96}\x{7D97}\x{7D99}\x{7D9B}\x{7D9C}\x{7D9D}\x{7D9E}\x{7D9F}\x{7DA0}' .
-'\x{7DA1}\x{7DA2}\x{7DA3}\x{7DA5}\x{7DA6}\x{7DA7}\x{7DA9}\x{7DAA}\x{7DAB}' .
-'\x{7DAC}\x{7DAD}\x{7DAE}\x{7DAF}\x{7DB0}\x{7DB1}\x{7DB2}\x{7DB3}\x{7DB4}' .
-'\x{7DB5}\x{7DB6}\x{7DB7}\x{7DB8}\x{7DB9}\x{7DBA}\x{7DBB}\x{7DBC}\x{7DBD}' .
-'\x{7DBE}\x{7DBF}\x{7DC0}\x{7DC1}\x{7DC2}\x{7DC3}\x{7DC4}\x{7DC5}\x{7DC6}' .
-'\x{7DC7}\x{7DC8}\x{7DC9}\x{7DCA}\x{7DCB}\x{7DCC}\x{7DCE}\x{7DCF}\x{7DD0}' .
-'\x{7DD1}\x{7DD2}\x{7DD4}\x{7DD5}\x{7DD6}\x{7DD7}\x{7DD8}\x{7DD9}\x{7DDA}' .
-'\x{7DDB}\x{7DDD}\x{7DDE}\x{7DDF}\x{7DE0}\x{7DE1}\x{7DE2}\x{7DE3}\x{7DE6}' .
-'\x{7DE7}\x{7DE8}\x{7DE9}\x{7DEA}\x{7DEC}\x{7DED}\x{7DEE}\x{7DEF}\x{7DF0}' .
-'\x{7DF1}\x{7DF2}\x{7DF3}\x{7DF4}\x{7DF5}\x{7DF6}\x{7DF7}\x{7DF8}\x{7DF9}' .
-'\x{7DFA}\x{7DFB}\x{7DFC}\x{7E00}\x{7E01}\x{7E02}\x{7E03}\x{7E04}\x{7E05}' .
-'\x{7E06}\x{7E07}\x{7E08}\x{7E09}\x{7E0A}\x{7E0B}\x{7E0C}\x{7E0D}\x{7E0E}' .
-'\x{7E0F}\x{7E10}\x{7E11}\x{7E12}\x{7E13}\x{7E14}\x{7E15}\x{7E16}\x{7E17}' .
-'\x{7E19}\x{7E1A}\x{7E1B}\x{7E1C}\x{7E1D}\x{7E1E}\x{7E1F}\x{7E20}\x{7E21}' .
-'\x{7E22}\x{7E23}\x{7E24}\x{7E25}\x{7E26}\x{7E27}\x{7E28}\x{7E29}\x{7E2A}' .
-'\x{7E2B}\x{7E2C}\x{7E2D}\x{7E2E}\x{7E2F}\x{7E30}\x{7E31}\x{7E32}\x{7E33}' .
-'\x{7E34}\x{7E35}\x{7E36}\x{7E37}\x{7E38}\x{7E39}\x{7E3A}\x{7E3B}\x{7E3C}' .
-'\x{7E3D}\x{7E3E}\x{7E3F}\x{7E40}\x{7E41}\x{7E42}\x{7E43}\x{7E44}\x{7E45}' .
-'\x{7E46}\x{7E47}\x{7E48}\x{7E49}\x{7E4C}\x{7E4D}\x{7E4E}\x{7E4F}\x{7E50}' .
-'\x{7E51}\x{7E52}\x{7E53}\x{7E54}\x{7E55}\x{7E56}\x{7E57}\x{7E58}\x{7E59}' .
-'\x{7E5A}\x{7E5C}\x{7E5D}\x{7E5E}\x{7E5F}\x{7E60}\x{7E61}\x{7E62}\x{7E63}' .
-'\x{7E65}\x{7E66}\x{7E67}\x{7E68}\x{7E69}\x{7E6A}\x{7E6B}\x{7E6C}\x{7E6D}' .
-'\x{7E6E}\x{7E6F}\x{7E70}\x{7E71}\x{7E72}\x{7E73}\x{7E74}\x{7E75}\x{7E76}' .
-'\x{7E77}\x{7E78}\x{7E79}\x{7E7A}\x{7E7B}\x{7E7C}\x{7E7D}\x{7E7E}\x{7E7F}' .
-'\x{7E80}\x{7E81}\x{7E82}\x{7E83}\x{7E84}\x{7E85}\x{7E86}\x{7E87}\x{7E88}' .
-'\x{7E89}\x{7E8A}\x{7E8B}\x{7E8C}\x{7E8D}\x{7E8E}\x{7E8F}\x{7E90}\x{7E91}' .
-'\x{7E92}\x{7E93}\x{7E94}\x{7E95}\x{7E96}\x{7E97}\x{7E98}\x{7E99}\x{7E9A}' .
-'\x{7E9B}\x{7E9C}\x{7E9E}\x{7E9F}\x{7EA0}\x{7EA1}\x{7EA2}\x{7EA3}\x{7EA4}' .
-'\x{7EA5}\x{7EA6}\x{7EA7}\x{7EA8}\x{7EA9}\x{7EAA}\x{7EAB}\x{7EAC}\x{7EAD}' .
-'\x{7EAE}\x{7EAF}\x{7EB0}\x{7EB1}\x{7EB2}\x{7EB3}\x{7EB4}\x{7EB5}\x{7EB6}' .
-'\x{7EB7}\x{7EB8}\x{7EB9}\x{7EBA}\x{7EBB}\x{7EBC}\x{7EBD}\x{7EBE}\x{7EBF}' .
-'\x{7EC0}\x{7EC1}\x{7EC2}\x{7EC3}\x{7EC4}\x{7EC5}\x{7EC6}\x{7EC7}\x{7EC8}' .
-'\x{7EC9}\x{7ECA}\x{7ECB}\x{7ECC}\x{7ECD}\x{7ECE}\x{7ECF}\x{7ED0}\x{7ED1}' .
-'\x{7ED2}\x{7ED3}\x{7ED4}\x{7ED5}\x{7ED6}\x{7ED7}\x{7ED8}\x{7ED9}\x{7EDA}' .
-'\x{7EDB}\x{7EDC}\x{7EDD}\x{7EDE}\x{7EDF}\x{7EE0}\x{7EE1}\x{7EE2}\x{7EE3}' .
-'\x{7EE4}\x{7EE5}\x{7EE6}\x{7EE7}\x{7EE8}\x{7EE9}\x{7EEA}\x{7EEB}\x{7EEC}' .
-'\x{7EED}\x{7EEE}\x{7EEF}\x{7EF0}\x{7EF1}\x{7EF2}\x{7EF3}\x{7EF4}\x{7EF5}' .
-'\x{7EF6}\x{7EF7}\x{7EF8}\x{7EF9}\x{7EFA}\x{7EFB}\x{7EFC}\x{7EFD}\x{7EFE}' .
-'\x{7EFF}\x{7F00}\x{7F01}\x{7F02}\x{7F03}\x{7F04}\x{7F05}\x{7F06}\x{7F07}' .
-'\x{7F08}\x{7F09}\x{7F0A}\x{7F0B}\x{7F0C}\x{7F0D}\x{7F0E}\x{7F0F}\x{7F10}' .
-'\x{7F11}\x{7F12}\x{7F13}\x{7F14}\x{7F15}\x{7F16}\x{7F17}\x{7F18}\x{7F19}' .
-'\x{7F1A}\x{7F1B}\x{7F1C}\x{7F1D}\x{7F1E}\x{7F1F}\x{7F20}\x{7F21}\x{7F22}' .
-'\x{7F23}\x{7F24}\x{7F25}\x{7F26}\x{7F27}\x{7F28}\x{7F29}\x{7F2A}\x{7F2B}' .
-'\x{7F2C}\x{7F2D}\x{7F2E}\x{7F2F}\x{7F30}\x{7F31}\x{7F32}\x{7F33}\x{7F34}' .
-'\x{7F35}\x{7F36}\x{7F37}\x{7F38}\x{7F39}\x{7F3A}\x{7F3D}\x{7F3E}\x{7F3F}' .
-'\x{7F40}\x{7F42}\x{7F43}\x{7F44}\x{7F45}\x{7F47}\x{7F48}\x{7F49}\x{7F4A}' .
-'\x{7F4B}\x{7F4C}\x{7F4D}\x{7F4E}\x{7F4F}\x{7F50}\x{7F51}\x{7F52}\x{7F53}' .
-'\x{7F54}\x{7F55}\x{7F56}\x{7F57}\x{7F58}\x{7F5A}\x{7F5B}\x{7F5C}\x{7F5D}' .
-'\x{7F5E}\x{7F5F}\x{7F60}\x{7F61}\x{7F62}\x{7F63}\x{7F64}\x{7F65}\x{7F66}' .
-'\x{7F67}\x{7F68}\x{7F69}\x{7F6A}\x{7F6B}\x{7F6C}\x{7F6D}\x{7F6E}\x{7F6F}' .
-'\x{7F70}\x{7F71}\x{7F72}\x{7F73}\x{7F74}\x{7F75}\x{7F76}\x{7F77}\x{7F78}' .
-'\x{7F79}\x{7F7A}\x{7F7B}\x{7F7C}\x{7F7D}\x{7F7E}\x{7F7F}\x{7F80}\x{7F81}' .
-'\x{7F82}\x{7F83}\x{7F85}\x{7F86}\x{7F87}\x{7F88}\x{7F89}\x{7F8A}\x{7F8B}' .
-'\x{7F8C}\x{7F8D}\x{7F8E}\x{7F8F}\x{7F91}\x{7F92}\x{7F93}\x{7F94}\x{7F95}' .
-'\x{7F96}\x{7F98}\x{7F9A}\x{7F9B}\x{7F9C}\x{7F9D}\x{7F9E}\x{7F9F}\x{7FA0}' .
-'\x{7FA1}\x{7FA2}\x{7FA3}\x{7FA4}\x{7FA5}\x{7FA6}\x{7FA7}\x{7FA8}\x{7FA9}' .
-'\x{7FAA}\x{7FAB}\x{7FAC}\x{7FAD}\x{7FAE}\x{7FAF}\x{7FB0}\x{7FB1}\x{7FB2}' .
-'\x{7FB3}\x{7FB5}\x{7FB6}\x{7FB7}\x{7FB8}\x{7FB9}\x{7FBA}\x{7FBB}\x{7FBC}' .
-'\x{7FBD}\x{7FBE}\x{7FBF}\x{7FC0}\x{7FC1}\x{7FC2}\x{7FC3}\x{7FC4}\x{7FC5}' .
-'\x{7FC6}\x{7FC7}\x{7FC8}\x{7FC9}\x{7FCA}\x{7FCB}\x{7FCC}\x{7FCD}\x{7FCE}' .
-'\x{7FCF}\x{7FD0}\x{7FD1}\x{7FD2}\x{7FD3}\x{7FD4}\x{7FD5}\x{7FD7}\x{7FD8}' .
-'\x{7FD9}\x{7FDA}\x{7FDB}\x{7FDC}\x{7FDE}\x{7FDF}\x{7FE0}\x{7FE1}\x{7FE2}' .
-'\x{7FE3}\x{7FE5}\x{7FE6}\x{7FE7}\x{7FE8}\x{7FE9}\x{7FEA}\x{7FEB}\x{7FEC}' .
-'\x{7FED}\x{7FEE}\x{7FEF}\x{7FF0}\x{7FF1}\x{7FF2}\x{7FF3}\x{7FF4}\x{7FF5}' .
-'\x{7FF6}\x{7FF7}\x{7FF8}\x{7FF9}\x{7FFA}\x{7FFB}\x{7FFC}\x{7FFD}\x{7FFE}' .
-'\x{7FFF}\x{8000}\x{8001}\x{8002}\x{8003}\x{8004}\x{8005}\x{8006}\x{8007}' .
-'\x{8008}\x{8009}\x{800B}\x{800C}\x{800D}\x{800E}\x{800F}\x{8010}\x{8011}' .
-'\x{8012}\x{8013}\x{8014}\x{8015}\x{8016}\x{8017}\x{8018}\x{8019}\x{801A}' .
-'\x{801B}\x{801C}\x{801D}\x{801E}\x{801F}\x{8020}\x{8021}\x{8022}\x{8023}' .
-'\x{8024}\x{8025}\x{8026}\x{8027}\x{8028}\x{8029}\x{802A}\x{802B}\x{802C}' .
-'\x{802D}\x{802E}\x{8030}\x{8031}\x{8032}\x{8033}\x{8034}\x{8035}\x{8036}' .
-'\x{8037}\x{8038}\x{8039}\x{803A}\x{803B}\x{803D}\x{803E}\x{803F}\x{8041}' .
-'\x{8042}\x{8043}\x{8044}\x{8045}\x{8046}\x{8047}\x{8048}\x{8049}\x{804A}' .
-'\x{804B}\x{804C}\x{804D}\x{804E}\x{804F}\x{8050}\x{8051}\x{8052}\x{8053}' .
-'\x{8054}\x{8055}\x{8056}\x{8057}\x{8058}\x{8059}\x{805A}\x{805B}\x{805C}' .
-'\x{805D}\x{805E}\x{805F}\x{8060}\x{8061}\x{8062}\x{8063}\x{8064}\x{8065}' .
-'\x{8067}\x{8068}\x{8069}\x{806A}\x{806B}\x{806C}\x{806D}\x{806E}\x{806F}' .
-'\x{8070}\x{8071}\x{8072}\x{8073}\x{8074}\x{8075}\x{8076}\x{8077}\x{8078}' .
-'\x{8079}\x{807A}\x{807B}\x{807C}\x{807D}\x{807E}\x{807F}\x{8080}\x{8081}' .
-'\x{8082}\x{8083}\x{8084}\x{8085}\x{8086}\x{8087}\x{8089}\x{808A}\x{808B}' .
-'\x{808C}\x{808D}\x{808F}\x{8090}\x{8091}\x{8092}\x{8093}\x{8095}\x{8096}' .
-'\x{8097}\x{8098}\x{8099}\x{809A}\x{809B}\x{809C}\x{809D}\x{809E}\x{809F}' .
-'\x{80A0}\x{80A1}\x{80A2}\x{80A3}\x{80A4}\x{80A5}\x{80A9}\x{80AA}\x{80AB}' .
-'\x{80AD}\x{80AE}\x{80AF}\x{80B0}\x{80B1}\x{80B2}\x{80B4}\x{80B5}\x{80B6}' .
-'\x{80B7}\x{80B8}\x{80BA}\x{80BB}\x{80BC}\x{80BD}\x{80BE}\x{80BF}\x{80C0}' .
-'\x{80C1}\x{80C2}\x{80C3}\x{80C4}\x{80C5}\x{80C6}\x{80C7}\x{80C8}\x{80C9}' .
-'\x{80CA}\x{80CB}\x{80CC}\x{80CD}\x{80CE}\x{80CF}\x{80D0}\x{80D1}\x{80D2}' .
-'\x{80D3}\x{80D4}\x{80D5}\x{80D6}\x{80D7}\x{80D8}\x{80D9}\x{80DA}\x{80DB}' .
-'\x{80DC}\x{80DD}\x{80DE}\x{80E0}\x{80E1}\x{80E2}\x{80E3}\x{80E4}\x{80E5}' .
-'\x{80E6}\x{80E7}\x{80E8}\x{80E9}\x{80EA}\x{80EB}\x{80EC}\x{80ED}\x{80EE}' .
-'\x{80EF}\x{80F0}\x{80F1}\x{80F2}\x{80F3}\x{80F4}\x{80F5}\x{80F6}\x{80F7}' .
-'\x{80F8}\x{80F9}\x{80FA}\x{80FB}\x{80FC}\x{80FD}\x{80FE}\x{80FF}\x{8100}' .
-'\x{8101}\x{8102}\x{8105}\x{8106}\x{8107}\x{8108}\x{8109}\x{810A}\x{810B}' .
-'\x{810C}\x{810D}\x{810E}\x{810F}\x{8110}\x{8111}\x{8112}\x{8113}\x{8114}' .
-'\x{8115}\x{8116}\x{8118}\x{8119}\x{811A}\x{811B}\x{811C}\x{811D}\x{811E}' .
-'\x{811F}\x{8120}\x{8121}\x{8122}\x{8123}\x{8124}\x{8125}\x{8126}\x{8127}' .
-'\x{8128}\x{8129}\x{812A}\x{812B}\x{812C}\x{812D}\x{812E}\x{812F}\x{8130}' .
-'\x{8131}\x{8132}\x{8136}\x{8137}\x{8138}\x{8139}\x{813A}\x{813B}\x{813C}' .
-'\x{813D}\x{813E}\x{813F}\x{8140}\x{8141}\x{8142}\x{8143}\x{8144}\x{8145}' .
-'\x{8146}\x{8147}\x{8148}\x{8149}\x{814A}\x{814B}\x{814C}\x{814D}\x{814E}' .
-'\x{814F}\x{8150}\x{8151}\x{8152}\x{8153}\x{8154}\x{8155}\x{8156}\x{8157}' .
-'\x{8158}\x{8159}\x{815A}\x{815B}\x{815C}\x{815D}\x{815E}\x{8160}\x{8161}' .
-'\x{8162}\x{8163}\x{8164}\x{8165}\x{8166}\x{8167}\x{8168}\x{8169}\x{816A}' .
-'\x{816B}\x{816C}\x{816D}\x{816E}\x{816F}\x{8170}\x{8171}\x{8172}\x{8173}' .
-'\x{8174}\x{8175}\x{8176}\x{8177}\x{8178}\x{8179}\x{817A}\x{817B}\x{817C}' .
-'\x{817D}\x{817E}\x{817F}\x{8180}\x{8181}\x{8182}\x{8183}\x{8185}\x{8186}' .
-'\x{8187}\x{8188}\x{8189}\x{818A}\x{818B}\x{818C}\x{818D}\x{818E}\x{818F}' .
-'\x{8191}\x{8192}\x{8193}\x{8194}\x{8195}\x{8197}\x{8198}\x{8199}\x{819A}' .
-'\x{819B}\x{819C}\x{819D}\x{819E}\x{819F}\x{81A0}\x{81A1}\x{81A2}\x{81A3}' .
-'\x{81A4}\x{81A5}\x{81A6}\x{81A7}\x{81A8}\x{81A9}\x{81AA}\x{81AB}\x{81AC}' .
-'\x{81AD}\x{81AE}\x{81AF}\x{81B0}\x{81B1}\x{81B2}\x{81B3}\x{81B4}\x{81B5}' .
-'\x{81B6}\x{81B7}\x{81B8}\x{81B9}\x{81BA}\x{81BB}\x{81BC}\x{81BD}\x{81BE}' .
-'\x{81BF}\x{81C0}\x{81C1}\x{81C2}\x{81C3}\x{81C4}\x{81C5}\x{81C6}\x{81C7}' .
-'\x{81C8}\x{81C9}\x{81CA}\x{81CC}\x{81CD}\x{81CE}\x{81CF}\x{81D0}\x{81D1}' .
-'\x{81D2}\x{81D4}\x{81D5}\x{81D6}\x{81D7}\x{81D8}\x{81D9}\x{81DA}\x{81DB}' .
-'\x{81DC}\x{81DD}\x{81DE}\x{81DF}\x{81E0}\x{81E1}\x{81E2}\x{81E3}\x{81E5}' .
-'\x{81E6}\x{81E7}\x{81E8}\x{81E9}\x{81EA}\x{81EB}\x{81EC}\x{81ED}\x{81EE}' .
-'\x{81F1}\x{81F2}\x{81F3}\x{81F4}\x{81F5}\x{81F6}\x{81F7}\x{81F8}\x{81F9}' .
-'\x{81FA}\x{81FB}\x{81FC}\x{81FD}\x{81FE}\x{81FF}\x{8200}\x{8201}\x{8202}' .
-'\x{8203}\x{8204}\x{8205}\x{8206}\x{8207}\x{8208}\x{8209}\x{820A}\x{820B}' .
-'\x{820C}\x{820D}\x{820E}\x{820F}\x{8210}\x{8211}\x{8212}\x{8214}\x{8215}' .
-'\x{8216}\x{8218}\x{8219}\x{821A}\x{821B}\x{821C}\x{821D}\x{821E}\x{821F}' .
-'\x{8220}\x{8221}\x{8222}\x{8223}\x{8225}\x{8226}\x{8227}\x{8228}\x{8229}' .
-'\x{822A}\x{822B}\x{822C}\x{822D}\x{822F}\x{8230}\x{8231}\x{8232}\x{8233}' .
-'\x{8234}\x{8235}\x{8236}\x{8237}\x{8238}\x{8239}\x{823A}\x{823B}\x{823C}' .
-'\x{823D}\x{823E}\x{823F}\x{8240}\x{8242}\x{8243}\x{8244}\x{8245}\x{8246}' .
-'\x{8247}\x{8248}\x{8249}\x{824A}\x{824B}\x{824C}\x{824D}\x{824E}\x{824F}' .
-'\x{8250}\x{8251}\x{8252}\x{8253}\x{8254}\x{8255}\x{8256}\x{8257}\x{8258}' .
-'\x{8259}\x{825A}\x{825B}\x{825C}\x{825D}\x{825E}\x{825F}\x{8260}\x{8261}' .
-'\x{8263}\x{8264}\x{8266}\x{8267}\x{8268}\x{8269}\x{826A}\x{826B}\x{826C}' .
-'\x{826D}\x{826E}\x{826F}\x{8270}\x{8271}\x{8272}\x{8273}\x{8274}\x{8275}' .
-'\x{8276}\x{8277}\x{8278}\x{8279}\x{827A}\x{827B}\x{827C}\x{827D}\x{827E}' .
-'\x{827F}\x{8280}\x{8281}\x{8282}\x{8283}\x{8284}\x{8285}\x{8286}\x{8287}' .
-'\x{8288}\x{8289}\x{828A}\x{828B}\x{828D}\x{828E}\x{828F}\x{8290}\x{8291}' .
-'\x{8292}\x{8293}\x{8294}\x{8295}\x{8296}\x{8297}\x{8298}\x{8299}\x{829A}' .
-'\x{829B}\x{829C}\x{829D}\x{829E}\x{829F}\x{82A0}\x{82A1}\x{82A2}\x{82A3}' .
-'\x{82A4}\x{82A5}\x{82A6}\x{82A7}\x{82A8}\x{82A9}\x{82AA}\x{82AB}\x{82AC}' .
-'\x{82AD}\x{82AE}\x{82AF}\x{82B0}\x{82B1}\x{82B3}\x{82B4}\x{82B5}\x{82B6}' .
-'\x{82B7}\x{82B8}\x{82B9}\x{82BA}\x{82BB}\x{82BC}\x{82BD}\x{82BE}\x{82BF}' .
-'\x{82C0}\x{82C1}\x{82C2}\x{82C3}\x{82C4}\x{82C5}\x{82C6}\x{82C7}\x{82C8}' .
-'\x{82C9}\x{82CA}\x{82CB}\x{82CC}\x{82CD}\x{82CE}\x{82CF}\x{82D0}\x{82D1}' .
-'\x{82D2}\x{82D3}\x{82D4}\x{82D5}\x{82D6}\x{82D7}\x{82D8}\x{82D9}\x{82DA}' .
-'\x{82DB}\x{82DC}\x{82DD}\x{82DE}\x{82DF}\x{82E0}\x{82E1}\x{82E3}\x{82E4}' .
-'\x{82E5}\x{82E6}\x{82E7}\x{82E8}\x{82E9}\x{82EA}\x{82EB}\x{82EC}\x{82ED}' .
-'\x{82EE}\x{82EF}\x{82F0}\x{82F1}\x{82F2}\x{82F3}\x{82F4}\x{82F5}\x{82F6}' .
-'\x{82F7}\x{82F8}\x{82F9}\x{82FA}\x{82FB}\x{82FD}\x{82FE}\x{82FF}\x{8300}' .
-'\x{8301}\x{8302}\x{8303}\x{8304}\x{8305}\x{8306}\x{8307}\x{8308}\x{8309}' .
-'\x{830B}\x{830C}\x{830D}\x{830E}\x{830F}\x{8311}\x{8312}\x{8313}\x{8314}' .
-'\x{8315}\x{8316}\x{8317}\x{8318}\x{8319}\x{831A}\x{831B}\x{831C}\x{831D}' .
-'\x{831E}\x{831F}\x{8320}\x{8321}\x{8322}\x{8323}\x{8324}\x{8325}\x{8326}' .
-'\x{8327}\x{8328}\x{8329}\x{832A}\x{832B}\x{832C}\x{832D}\x{832E}\x{832F}' .
-'\x{8331}\x{8332}\x{8333}\x{8334}\x{8335}\x{8336}\x{8337}\x{8338}\x{8339}' .
-'\x{833A}\x{833B}\x{833C}\x{833D}\x{833E}\x{833F}\x{8340}\x{8341}\x{8342}' .
-'\x{8343}\x{8344}\x{8345}\x{8346}\x{8347}\x{8348}\x{8349}\x{834A}\x{834B}' .
-'\x{834C}\x{834D}\x{834E}\x{834F}\x{8350}\x{8351}\x{8352}\x{8353}\x{8354}' .
-'\x{8356}\x{8357}\x{8358}\x{8359}\x{835A}\x{835B}\x{835C}\x{835D}\x{835E}' .
-'\x{835F}\x{8360}\x{8361}\x{8362}\x{8363}\x{8364}\x{8365}\x{8366}\x{8367}' .
-'\x{8368}\x{8369}\x{836A}\x{836B}\x{836C}\x{836D}\x{836E}\x{836F}\x{8370}' .
-'\x{8371}\x{8372}\x{8373}\x{8374}\x{8375}\x{8376}\x{8377}\x{8378}\x{8379}' .
-'\x{837A}\x{837B}\x{837C}\x{837D}\x{837E}\x{837F}\x{8380}\x{8381}\x{8382}' .
-'\x{8383}\x{8384}\x{8385}\x{8386}\x{8387}\x{8388}\x{8389}\x{838A}\x{838B}' .
-'\x{838C}\x{838D}\x{838E}\x{838F}\x{8390}\x{8391}\x{8392}\x{8393}\x{8394}' .
-'\x{8395}\x{8396}\x{8397}\x{8398}\x{8399}\x{839A}\x{839B}\x{839C}\x{839D}' .
-'\x{839E}\x{83A0}\x{83A1}\x{83A2}\x{83A3}\x{83A4}\x{83A5}\x{83A6}\x{83A7}' .
-'\x{83A8}\x{83A9}\x{83AA}\x{83AB}\x{83AC}\x{83AD}\x{83AE}\x{83AF}\x{83B0}' .
-'\x{83B1}\x{83B2}\x{83B3}\x{83B4}\x{83B6}\x{83B7}\x{83B8}\x{83B9}\x{83BA}' .
-'\x{83BB}\x{83BC}\x{83BD}\x{83BF}\x{83C0}\x{83C1}\x{83C2}\x{83C3}\x{83C4}' .
-'\x{83C5}\x{83C6}\x{83C7}\x{83C8}\x{83C9}\x{83CA}\x{83CB}\x{83CC}\x{83CD}' .
-'\x{83CE}\x{83CF}\x{83D0}\x{83D1}\x{83D2}\x{83D3}\x{83D4}\x{83D5}\x{83D6}' .
-'\x{83D7}\x{83D8}\x{83D9}\x{83DA}\x{83DB}\x{83DC}\x{83DD}\x{83DE}\x{83DF}' .
-'\x{83E0}\x{83E1}\x{83E2}\x{83E3}\x{83E4}\x{83E5}\x{83E7}\x{83E8}\x{83E9}' .
-'\x{83EA}\x{83EB}\x{83EC}\x{83EE}\x{83EF}\x{83F0}\x{83F1}\x{83F2}\x{83F3}' .
-'\x{83F4}\x{83F5}\x{83F6}\x{83F7}\x{83F8}\x{83F9}\x{83FA}\x{83FB}\x{83FC}' .
-'\x{83FD}\x{83FE}\x{83FF}\x{8400}\x{8401}\x{8402}\x{8403}\x{8404}\x{8405}' .
-'\x{8406}\x{8407}\x{8408}\x{8409}\x{840A}\x{840B}\x{840C}\x{840D}\x{840E}' .
-'\x{840F}\x{8410}\x{8411}\x{8412}\x{8413}\x{8415}\x{8418}\x{8419}\x{841A}' .
-'\x{841B}\x{841C}\x{841D}\x{841E}\x{8421}\x{8422}\x{8423}\x{8424}\x{8425}' .
-'\x{8426}\x{8427}\x{8428}\x{8429}\x{842A}\x{842B}\x{842C}\x{842D}\x{842E}' .
-'\x{842F}\x{8430}\x{8431}\x{8432}\x{8433}\x{8434}\x{8435}\x{8436}\x{8437}' .
-'\x{8438}\x{8439}\x{843A}\x{843B}\x{843C}\x{843D}\x{843E}\x{843F}\x{8440}' .
-'\x{8441}\x{8442}\x{8443}\x{8444}\x{8445}\x{8446}\x{8447}\x{8448}\x{8449}' .
-'\x{844A}\x{844B}\x{844C}\x{844D}\x{844E}\x{844F}\x{8450}\x{8451}\x{8452}' .
-'\x{8453}\x{8454}\x{8455}\x{8456}\x{8457}\x{8459}\x{845A}\x{845B}\x{845C}' .
-'\x{845D}\x{845E}\x{845F}\x{8460}\x{8461}\x{8462}\x{8463}\x{8464}\x{8465}' .
-'\x{8466}\x{8467}\x{8468}\x{8469}\x{846A}\x{846B}\x{846C}\x{846D}\x{846E}' .
-'\x{846F}\x{8470}\x{8471}\x{8472}\x{8473}\x{8474}\x{8475}\x{8476}\x{8477}' .
-'\x{8478}\x{8479}\x{847A}\x{847B}\x{847C}\x{847D}\x{847E}\x{847F}\x{8480}' .
-'\x{8481}\x{8482}\x{8484}\x{8485}\x{8486}\x{8487}\x{8488}\x{8489}\x{848A}' .
-'\x{848B}\x{848C}\x{848D}\x{848E}\x{848F}\x{8490}\x{8491}\x{8492}\x{8493}' .
-'\x{8494}\x{8496}\x{8497}\x{8498}\x{8499}\x{849A}\x{849B}\x{849C}\x{849D}' .
-'\x{849E}\x{849F}\x{84A0}\x{84A1}\x{84A2}\x{84A3}\x{84A4}\x{84A5}\x{84A6}' .
-'\x{84A7}\x{84A8}\x{84A9}\x{84AA}\x{84AB}\x{84AC}\x{84AE}\x{84AF}\x{84B0}' .
-'\x{84B1}\x{84B2}\x{84B3}\x{84B4}\x{84B5}\x{84B6}\x{84B8}\x{84B9}\x{84BA}' .
-'\x{84BB}\x{84BC}\x{84BD}\x{84BE}\x{84BF}\x{84C0}\x{84C1}\x{84C2}\x{84C4}' .
-'\x{84C5}\x{84C6}\x{84C7}\x{84C8}\x{84C9}\x{84CA}\x{84CB}\x{84CC}\x{84CD}' .
-'\x{84CE}\x{84CF}\x{84D0}\x{84D1}\x{84D2}\x{84D3}\x{84D4}\x{84D5}\x{84D6}' .
-'\x{84D7}\x{84D8}\x{84D9}\x{84DB}\x{84DC}\x{84DD}\x{84DE}\x{84DF}\x{84E0}' .
-'\x{84E1}\x{84E2}\x{84E3}\x{84E4}\x{84E5}\x{84E6}\x{84E7}\x{84E8}\x{84E9}' .
-'\x{84EA}\x{84EB}\x{84EC}\x{84EE}\x{84EF}\x{84F0}\x{84F1}\x{84F2}\x{84F3}' .
-'\x{84F4}\x{84F5}\x{84F6}\x{84F7}\x{84F8}\x{84F9}\x{84FA}\x{84FB}\x{84FC}' .
-'\x{84FD}\x{84FE}\x{84FF}\x{8500}\x{8501}\x{8502}\x{8503}\x{8504}\x{8506}' .
-'\x{8507}\x{8508}\x{8509}\x{850A}\x{850B}\x{850C}\x{850D}\x{850E}\x{850F}' .
-'\x{8511}\x{8512}\x{8513}\x{8514}\x{8515}\x{8516}\x{8517}\x{8518}\x{8519}' .
-'\x{851A}\x{851B}\x{851C}\x{851D}\x{851E}\x{851F}\x{8520}\x{8521}\x{8522}' .
-'\x{8523}\x{8524}\x{8525}\x{8526}\x{8527}\x{8528}\x{8529}\x{852A}\x{852B}' .
-'\x{852C}\x{852D}\x{852E}\x{852F}\x{8530}\x{8531}\x{8534}\x{8535}\x{8536}' .
-'\x{8537}\x{8538}\x{8539}\x{853A}\x{853B}\x{853C}\x{853D}\x{853E}\x{853F}' .
-'\x{8540}\x{8541}\x{8542}\x{8543}\x{8544}\x{8545}\x{8546}\x{8547}\x{8548}' .
-'\x{8549}\x{854A}\x{854B}\x{854D}\x{854E}\x{854F}\x{8551}\x{8552}\x{8553}' .
-'\x{8554}\x{8555}\x{8556}\x{8557}\x{8558}\x{8559}\x{855A}\x{855B}\x{855C}' .
-'\x{855D}\x{855E}\x{855F}\x{8560}\x{8561}\x{8562}\x{8563}\x{8564}\x{8565}' .
-'\x{8566}\x{8567}\x{8568}\x{8569}\x{856A}\x{856B}\x{856C}\x{856D}\x{856E}' .
-'\x{856F}\x{8570}\x{8571}\x{8572}\x{8573}\x{8574}\x{8575}\x{8576}\x{8577}' .
-'\x{8578}\x{8579}\x{857A}\x{857B}\x{857C}\x{857D}\x{857E}\x{8580}\x{8581}' .
-'\x{8582}\x{8583}\x{8584}\x{8585}\x{8586}\x{8587}\x{8588}\x{8589}\x{858A}' .
-'\x{858B}\x{858C}\x{858D}\x{858E}\x{858F}\x{8590}\x{8591}\x{8592}\x{8594}' .
-'\x{8595}\x{8596}\x{8598}\x{8599}\x{859A}\x{859B}\x{859C}\x{859D}\x{859E}' .
-'\x{859F}\x{85A0}\x{85A1}\x{85A2}\x{85A3}\x{85A4}\x{85A5}\x{85A6}\x{85A7}' .
-'\x{85A8}\x{85A9}\x{85AA}\x{85AB}\x{85AC}\x{85AD}\x{85AE}\x{85AF}\x{85B0}' .
-'\x{85B1}\x{85B3}\x{85B4}\x{85B5}\x{85B6}\x{85B7}\x{85B8}\x{85B9}\x{85BA}' .
-'\x{85BC}\x{85BD}\x{85BE}\x{85BF}\x{85C0}\x{85C1}\x{85C2}\x{85C3}\x{85C4}' .
-'\x{85C5}\x{85C6}\x{85C7}\x{85C8}\x{85C9}\x{85CA}\x{85CB}\x{85CD}\x{85CE}' .
-'\x{85CF}\x{85D0}\x{85D1}\x{85D2}\x{85D3}\x{85D4}\x{85D5}\x{85D6}\x{85D7}' .
-'\x{85D8}\x{85D9}\x{85DA}\x{85DB}\x{85DC}\x{85DD}\x{85DE}\x{85DF}\x{85E0}' .
-'\x{85E1}\x{85E2}\x{85E3}\x{85E4}\x{85E5}\x{85E6}\x{85E7}\x{85E8}\x{85E9}' .
-'\x{85EA}\x{85EB}\x{85EC}\x{85ED}\x{85EF}\x{85F0}\x{85F1}\x{85F2}\x{85F4}' .
-'\x{85F5}\x{85F6}\x{85F7}\x{85F8}\x{85F9}\x{85FA}\x{85FB}\x{85FD}\x{85FE}' .
-'\x{85FF}\x{8600}\x{8601}\x{8602}\x{8604}\x{8605}\x{8606}\x{8607}\x{8608}' .
-'\x{8609}\x{860A}\x{860B}\x{860C}\x{860F}\x{8611}\x{8612}\x{8613}\x{8614}' .
-'\x{8616}\x{8617}\x{8618}\x{8619}\x{861A}\x{861B}\x{861C}\x{861E}\x{861F}' .
-'\x{8620}\x{8621}\x{8622}\x{8623}\x{8624}\x{8625}\x{8626}\x{8627}\x{8628}' .
-'\x{8629}\x{862A}\x{862B}\x{862C}\x{862D}\x{862E}\x{862F}\x{8630}\x{8631}' .
-'\x{8632}\x{8633}\x{8634}\x{8635}\x{8636}\x{8638}\x{8639}\x{863A}\x{863B}' .
-'\x{863C}\x{863D}\x{863E}\x{863F}\x{8640}\x{8641}\x{8642}\x{8643}\x{8644}' .
-'\x{8645}\x{8646}\x{8647}\x{8648}\x{8649}\x{864A}\x{864B}\x{864C}\x{864D}' .
-'\x{864E}\x{864F}\x{8650}\x{8651}\x{8652}\x{8653}\x{8654}\x{8655}\x{8656}' .
-'\x{8658}\x{8659}\x{865A}\x{865B}\x{865C}\x{865D}\x{865E}\x{865F}\x{8660}' .
-'\x{8661}\x{8662}\x{8663}\x{8664}\x{8665}\x{8666}\x{8667}\x{8668}\x{8669}' .
-'\x{866A}\x{866B}\x{866C}\x{866D}\x{866E}\x{866F}\x{8670}\x{8671}\x{8672}' .
-'\x{8673}\x{8674}\x{8676}\x{8677}\x{8678}\x{8679}\x{867A}\x{867B}\x{867C}' .
-'\x{867D}\x{867E}\x{867F}\x{8680}\x{8681}\x{8682}\x{8683}\x{8684}\x{8685}' .
-'\x{8686}\x{8687}\x{8688}\x{868A}\x{868B}\x{868C}\x{868D}\x{868E}\x{868F}' .
-'\x{8690}\x{8691}\x{8693}\x{8694}\x{8695}\x{8696}\x{8697}\x{8698}\x{8699}' .
-'\x{869A}\x{869B}\x{869C}\x{869D}\x{869E}\x{869F}\x{86A1}\x{86A2}\x{86A3}' .
-'\x{86A4}\x{86A5}\x{86A7}\x{86A8}\x{86A9}\x{86AA}\x{86AB}\x{86AC}\x{86AD}' .
-'\x{86AE}\x{86AF}\x{86B0}\x{86B1}\x{86B2}\x{86B3}\x{86B4}\x{86B5}\x{86B6}' .
-'\x{86B7}\x{86B8}\x{86B9}\x{86BA}\x{86BB}\x{86BC}\x{86BD}\x{86BE}\x{86BF}' .
-'\x{86C0}\x{86C1}\x{86C2}\x{86C3}\x{86C4}\x{86C5}\x{86C6}\x{86C7}\x{86C8}' .
-'\x{86C9}\x{86CA}\x{86CB}\x{86CC}\x{86CE}\x{86CF}\x{86D0}\x{86D1}\x{86D2}' .
-'\x{86D3}\x{86D4}\x{86D6}\x{86D7}\x{86D8}\x{86D9}\x{86DA}\x{86DB}\x{86DC}' .
-'\x{86DD}\x{86DE}\x{86DF}\x{86E1}\x{86E2}\x{86E3}\x{86E4}\x{86E5}\x{86E6}' .
-'\x{86E8}\x{86E9}\x{86EA}\x{86EB}\x{86EC}\x{86ED}\x{86EE}\x{86EF}\x{86F0}' .
-'\x{86F1}\x{86F2}\x{86F3}\x{86F4}\x{86F5}\x{86F6}\x{86F7}\x{86F8}\x{86F9}' .
-'\x{86FA}\x{86FB}\x{86FC}\x{86FE}\x{86FF}\x{8700}\x{8701}\x{8702}\x{8703}' .
-'\x{8704}\x{8705}\x{8706}\x{8707}\x{8708}\x{8709}\x{870A}\x{870B}\x{870C}' .
-'\x{870D}\x{870E}\x{870F}\x{8710}\x{8711}\x{8712}\x{8713}\x{8714}\x{8715}' .
-'\x{8716}\x{8717}\x{8718}\x{8719}\x{871A}\x{871B}\x{871C}\x{871E}\x{871F}' .
-'\x{8720}\x{8721}\x{8722}\x{8723}\x{8724}\x{8725}\x{8726}\x{8727}\x{8728}' .
-'\x{8729}\x{872A}\x{872B}\x{872C}\x{872D}\x{872E}\x{8730}\x{8731}\x{8732}' .
-'\x{8733}\x{8734}\x{8735}\x{8736}\x{8737}\x{8738}\x{8739}\x{873A}\x{873B}' .
-'\x{873C}\x{873E}\x{873F}\x{8740}\x{8741}\x{8742}\x{8743}\x{8744}\x{8746}' .
-'\x{8747}\x{8748}\x{8749}\x{874A}\x{874C}\x{874D}\x{874E}\x{874F}\x{8750}' .
-'\x{8751}\x{8752}\x{8753}\x{8754}\x{8755}\x{8756}\x{8757}\x{8758}\x{8759}' .
-'\x{875A}\x{875B}\x{875C}\x{875D}\x{875E}\x{875F}\x{8760}\x{8761}\x{8762}' .
-'\x{8763}\x{8764}\x{8765}\x{8766}\x{8767}\x{8768}\x{8769}\x{876A}\x{876B}' .
-'\x{876C}\x{876D}\x{876E}\x{876F}\x{8770}\x{8772}\x{8773}\x{8774}\x{8775}' .
-'\x{8776}\x{8777}\x{8778}\x{8779}\x{877A}\x{877B}\x{877C}\x{877D}\x{877E}' .
-'\x{8780}\x{8781}\x{8782}\x{8783}\x{8784}\x{8785}\x{8786}\x{8787}\x{8788}' .
-'\x{8789}\x{878A}\x{878B}\x{878C}\x{878D}\x{878F}\x{8790}\x{8791}\x{8792}' .
-'\x{8793}\x{8794}\x{8795}\x{8796}\x{8797}\x{8798}\x{879A}\x{879B}\x{879C}' .
-'\x{879D}\x{879E}\x{879F}\x{87A0}\x{87A1}\x{87A2}\x{87A3}\x{87A4}\x{87A5}' .
-'\x{87A6}\x{87A7}\x{87A8}\x{87A9}\x{87AA}\x{87AB}\x{87AC}\x{87AD}\x{87AE}' .
-'\x{87AF}\x{87B0}\x{87B1}\x{87B2}\x{87B3}\x{87B4}\x{87B5}\x{87B6}\x{87B7}' .
-'\x{87B8}\x{87B9}\x{87BA}\x{87BB}\x{87BC}\x{87BD}\x{87BE}\x{87BF}\x{87C0}' .
-'\x{87C1}\x{87C2}\x{87C3}\x{87C4}\x{87C5}\x{87C6}\x{87C7}\x{87C8}\x{87C9}' .
-'\x{87CA}\x{87CB}\x{87CC}\x{87CD}\x{87CE}\x{87CF}\x{87D0}\x{87D1}\x{87D2}' .
-'\x{87D3}\x{87D4}\x{87D5}\x{87D6}\x{87D7}\x{87D8}\x{87D9}\x{87DB}\x{87DC}' .
-'\x{87DD}\x{87DE}\x{87DF}\x{87E0}\x{87E1}\x{87E2}\x{87E3}\x{87E4}\x{87E5}' .
-'\x{87E6}\x{87E7}\x{87E8}\x{87E9}\x{87EA}\x{87EB}\x{87EC}\x{87ED}\x{87EE}' .
-'\x{87EF}\x{87F1}\x{87F2}\x{87F3}\x{87F4}\x{87F5}\x{87F6}\x{87F7}\x{87F8}' .
-'\x{87F9}\x{87FA}\x{87FB}\x{87FC}\x{87FD}\x{87FE}\x{87FF}\x{8800}\x{8801}' .
-'\x{8802}\x{8803}\x{8804}\x{8805}\x{8806}\x{8808}\x{8809}\x{880A}\x{880B}' .
-'\x{880C}\x{880D}\x{880E}\x{880F}\x{8810}\x{8811}\x{8813}\x{8814}\x{8815}' .
-'\x{8816}\x{8817}\x{8818}\x{8819}\x{881A}\x{881B}\x{881C}\x{881D}\x{881E}' .
-'\x{881F}\x{8820}\x{8821}\x{8822}\x{8823}\x{8824}\x{8825}\x{8826}\x{8827}' .
-'\x{8828}\x{8829}\x{882A}\x{882B}\x{882C}\x{882E}\x{882F}\x{8830}\x{8831}' .
-'\x{8832}\x{8833}\x{8834}\x{8835}\x{8836}\x{8837}\x{8838}\x{8839}\x{883B}' .
-'\x{883C}\x{883D}\x{883E}\x{883F}\x{8840}\x{8841}\x{8842}\x{8843}\x{8844}' .
-'\x{8845}\x{8846}\x{8848}\x{8849}\x{884A}\x{884B}\x{884C}\x{884D}\x{884E}' .
-'\x{884F}\x{8850}\x{8851}\x{8852}\x{8853}\x{8854}\x{8855}\x{8856}\x{8857}' .
-'\x{8859}\x{885A}\x{885B}\x{885D}\x{885E}\x{8860}\x{8861}\x{8862}\x{8863}' .
-'\x{8864}\x{8865}\x{8866}\x{8867}\x{8868}\x{8869}\x{886A}\x{886B}\x{886C}' .
-'\x{886D}\x{886E}\x{886F}\x{8870}\x{8871}\x{8872}\x{8873}\x{8874}\x{8875}' .
-'\x{8876}\x{8877}\x{8878}\x{8879}\x{887B}\x{887C}\x{887D}\x{887E}\x{887F}' .
-'\x{8880}\x{8881}\x{8882}\x{8883}\x{8884}\x{8885}\x{8886}\x{8887}\x{8888}' .
-'\x{8889}\x{888A}\x{888B}\x{888C}\x{888D}\x{888E}\x{888F}\x{8890}\x{8891}' .
-'\x{8892}\x{8893}\x{8894}\x{8895}\x{8896}\x{8897}\x{8898}\x{8899}\x{889A}' .
-'\x{889B}\x{889C}\x{889D}\x{889E}\x{889F}\x{88A0}\x{88A1}\x{88A2}\x{88A3}' .
-'\x{88A4}\x{88A5}\x{88A6}\x{88A7}\x{88A8}\x{88A9}\x{88AA}\x{88AB}\x{88AC}' .
-'\x{88AD}\x{88AE}\x{88AF}\x{88B0}\x{88B1}\x{88B2}\x{88B3}\x{88B4}\x{88B6}' .
-'\x{88B7}\x{88B8}\x{88B9}\x{88BA}\x{88BB}\x{88BC}\x{88BD}\x{88BE}\x{88BF}' .
-'\x{88C0}\x{88C1}\x{88C2}\x{88C3}\x{88C4}\x{88C5}\x{88C6}\x{88C7}\x{88C8}' .
-'\x{88C9}\x{88CA}\x{88CB}\x{88CC}\x{88CD}\x{88CE}\x{88CF}\x{88D0}\x{88D1}' .
-'\x{88D2}\x{88D3}\x{88D4}\x{88D5}\x{88D6}\x{88D7}\x{88D8}\x{88D9}\x{88DA}' .
-'\x{88DB}\x{88DC}\x{88DD}\x{88DE}\x{88DF}\x{88E0}\x{88E1}\x{88E2}\x{88E3}' .
-'\x{88E4}\x{88E5}\x{88E7}\x{88E8}\x{88EA}\x{88EB}\x{88EC}\x{88EE}\x{88EF}' .
-'\x{88F0}\x{88F1}\x{88F2}\x{88F3}\x{88F4}\x{88F5}\x{88F6}\x{88F7}\x{88F8}' .
-'\x{88F9}\x{88FA}\x{88FB}\x{88FC}\x{88FD}\x{88FE}\x{88FF}\x{8900}\x{8901}' .
-'\x{8902}\x{8904}\x{8905}\x{8906}\x{8907}\x{8908}\x{8909}\x{890A}\x{890B}' .
-'\x{890C}\x{890D}\x{890E}\x{8910}\x{8911}\x{8912}\x{8913}\x{8914}\x{8915}' .
-'\x{8916}\x{8917}\x{8918}\x{8919}\x{891A}\x{891B}\x{891C}\x{891D}\x{891E}' .
-'\x{891F}\x{8920}\x{8921}\x{8922}\x{8923}\x{8925}\x{8926}\x{8927}\x{8928}' .
-'\x{8929}\x{892A}\x{892B}\x{892C}\x{892D}\x{892E}\x{892F}\x{8930}\x{8931}' .
-'\x{8932}\x{8933}\x{8934}\x{8935}\x{8936}\x{8937}\x{8938}\x{8939}\x{893A}' .
-'\x{893B}\x{893C}\x{893D}\x{893E}\x{893F}\x{8940}\x{8941}\x{8942}\x{8943}' .
-'\x{8944}\x{8945}\x{8946}\x{8947}\x{8948}\x{8949}\x{894A}\x{894B}\x{894C}' .
-'\x{894E}\x{894F}\x{8950}\x{8951}\x{8952}\x{8953}\x{8954}\x{8955}\x{8956}' .
-'\x{8957}\x{8958}\x{8959}\x{895A}\x{895B}\x{895C}\x{895D}\x{895E}\x{895F}' .
-'\x{8960}\x{8961}\x{8962}\x{8963}\x{8964}\x{8966}\x{8967}\x{8968}\x{8969}' .
-'\x{896A}\x{896B}\x{896C}\x{896D}\x{896E}\x{896F}\x{8970}\x{8971}\x{8972}' .
-'\x{8973}\x{8974}\x{8976}\x{8977}\x{8978}\x{8979}\x{897A}\x{897B}\x{897C}' .
-'\x{897E}\x{897F}\x{8980}\x{8981}\x{8982}\x{8983}\x{8984}\x{8985}\x{8986}' .
-'\x{8987}\x{8988}\x{8989}\x{898A}\x{898B}\x{898C}\x{898E}\x{898F}\x{8991}' .
-'\x{8992}\x{8993}\x{8995}\x{8996}\x{8997}\x{8998}\x{899A}\x{899B}\x{899C}' .
-'\x{899D}\x{899E}\x{899F}\x{89A0}\x{89A1}\x{89A2}\x{89A3}\x{89A4}\x{89A5}' .
-'\x{89A6}\x{89A7}\x{89A8}\x{89AA}\x{89AB}\x{89AC}\x{89AD}\x{89AE}\x{89AF}' .
-'\x{89B1}\x{89B2}\x{89B3}\x{89B5}\x{89B6}\x{89B7}\x{89B8}\x{89B9}\x{89BA}' .
-'\x{89BD}\x{89BE}\x{89BF}\x{89C0}\x{89C1}\x{89C2}\x{89C3}\x{89C4}\x{89C5}' .
-'\x{89C6}\x{89C7}\x{89C8}\x{89C9}\x{89CA}\x{89CB}\x{89CC}\x{89CD}\x{89CE}' .
-'\x{89CF}\x{89D0}\x{89D1}\x{89D2}\x{89D3}\x{89D4}\x{89D5}\x{89D6}\x{89D7}' .
-'\x{89D8}\x{89D9}\x{89DA}\x{89DB}\x{89DC}\x{89DD}\x{89DE}\x{89DF}\x{89E0}' .
-'\x{89E1}\x{89E2}\x{89E3}\x{89E4}\x{89E5}\x{89E6}\x{89E7}\x{89E8}\x{89E9}' .
-'\x{89EA}\x{89EB}\x{89EC}\x{89ED}\x{89EF}\x{89F0}\x{89F1}\x{89F2}\x{89F3}' .
-'\x{89F4}\x{89F6}\x{89F7}\x{89F8}\x{89FA}\x{89FB}\x{89FC}\x{89FE}\x{89FF}' .
-'\x{8A00}\x{8A01}\x{8A02}\x{8A03}\x{8A04}\x{8A07}\x{8A08}\x{8A09}\x{8A0A}' .
-'\x{8A0B}\x{8A0C}\x{8A0D}\x{8A0E}\x{8A0F}\x{8A10}\x{8A11}\x{8A12}\x{8A13}' .
-'\x{8A15}\x{8A16}\x{8A17}\x{8A18}\x{8A1A}\x{8A1B}\x{8A1C}\x{8A1D}\x{8A1E}' .
-'\x{8A1F}\x{8A22}\x{8A23}\x{8A24}\x{8A25}\x{8A26}\x{8A27}\x{8A28}\x{8A29}' .
-'\x{8A2A}\x{8A2C}\x{8A2D}\x{8A2E}\x{8A2F}\x{8A30}\x{8A31}\x{8A32}\x{8A34}' .
-'\x{8A35}\x{8A36}\x{8A37}\x{8A38}\x{8A39}\x{8A3A}\x{8A3B}\x{8A3C}\x{8A3E}' .
-'\x{8A3F}\x{8A40}\x{8A41}\x{8A42}\x{8A43}\x{8A44}\x{8A45}\x{8A46}\x{8A47}' .
-'\x{8A48}\x{8A49}\x{8A4A}\x{8A4C}\x{8A4D}\x{8A4E}\x{8A4F}\x{8A50}\x{8A51}' .
-'\x{8A52}\x{8A53}\x{8A54}\x{8A55}\x{8A56}\x{8A57}\x{8A58}\x{8A59}\x{8A5A}' .
-'\x{8A5B}\x{8A5C}\x{8A5D}\x{8A5E}\x{8A5F}\x{8A60}\x{8A61}\x{8A62}\x{8A63}' .
-'\x{8A65}\x{8A66}\x{8A67}\x{8A68}\x{8A69}\x{8A6A}\x{8A6B}\x{8A6C}\x{8A6D}' .
-'\x{8A6E}\x{8A6F}\x{8A70}\x{8A71}\x{8A72}\x{8A73}\x{8A74}\x{8A75}\x{8A76}' .
-'\x{8A77}\x{8A79}\x{8A7A}\x{8A7B}\x{8A7C}\x{8A7E}\x{8A7F}\x{8A80}\x{8A81}' .
-'\x{8A82}\x{8A83}\x{8A84}\x{8A85}\x{8A86}\x{8A87}\x{8A89}\x{8A8A}\x{8A8B}' .
-'\x{8A8C}\x{8A8D}\x{8A8E}\x{8A8F}\x{8A90}\x{8A91}\x{8A92}\x{8A93}\x{8A94}' .
-'\x{8A95}\x{8A96}\x{8A97}\x{8A98}\x{8A99}\x{8A9A}\x{8A9B}\x{8A9C}\x{8A9D}' .
-'\x{8A9E}\x{8AA0}\x{8AA1}\x{8AA2}\x{8AA3}\x{8AA4}\x{8AA5}\x{8AA6}\x{8AA7}' .
-'\x{8AA8}\x{8AA9}\x{8AAA}\x{8AAB}\x{8AAC}\x{8AAE}\x{8AB0}\x{8AB1}\x{8AB2}' .
-'\x{8AB3}\x{8AB4}\x{8AB5}\x{8AB6}\x{8AB8}\x{8AB9}\x{8ABA}\x{8ABB}\x{8ABC}' .
-'\x{8ABD}\x{8ABE}\x{8ABF}\x{8AC0}\x{8AC1}\x{8AC2}\x{8AC3}\x{8AC4}\x{8AC5}' .
-'\x{8AC6}\x{8AC7}\x{8AC8}\x{8AC9}\x{8ACA}\x{8ACB}\x{8ACC}\x{8ACD}\x{8ACE}' .
-'\x{8ACF}\x{8AD1}\x{8AD2}\x{8AD3}\x{8AD4}\x{8AD5}\x{8AD6}\x{8AD7}\x{8AD8}' .
-'\x{8AD9}\x{8ADA}\x{8ADB}\x{8ADC}\x{8ADD}\x{8ADE}\x{8ADF}\x{8AE0}\x{8AE1}' .
-'\x{8AE2}\x{8AE3}\x{8AE4}\x{8AE5}\x{8AE6}\x{8AE7}\x{8AE8}\x{8AE9}\x{8AEA}' .
-'\x{8AEB}\x{8AED}\x{8AEE}\x{8AEF}\x{8AF0}\x{8AF1}\x{8AF2}\x{8AF3}\x{8AF4}' .
-'\x{8AF5}\x{8AF6}\x{8AF7}\x{8AF8}\x{8AF9}\x{8AFA}\x{8AFB}\x{8AFC}\x{8AFD}' .
-'\x{8AFE}\x{8AFF}\x{8B00}\x{8B01}\x{8B02}\x{8B03}\x{8B04}\x{8B05}\x{8B06}' .
-'\x{8B07}\x{8B08}\x{8B09}\x{8B0A}\x{8B0B}\x{8B0D}\x{8B0E}\x{8B0F}\x{8B10}' .
-'\x{8B11}\x{8B12}\x{8B13}\x{8B14}\x{8B15}\x{8B16}\x{8B17}\x{8B18}\x{8B19}' .
-'\x{8B1A}\x{8B1B}\x{8B1C}\x{8B1D}\x{8B1E}\x{8B1F}\x{8B20}\x{8B21}\x{8B22}' .
-'\x{8B23}\x{8B24}\x{8B25}\x{8B26}\x{8B27}\x{8B28}\x{8B2A}\x{8B2B}\x{8B2C}' .
-'\x{8B2D}\x{8B2E}\x{8B2F}\x{8B30}\x{8B31}\x{8B33}\x{8B34}\x{8B35}\x{8B36}' .
-'\x{8B37}\x{8B39}\x{8B3A}\x{8B3B}\x{8B3C}\x{8B3D}\x{8B3E}\x{8B40}\x{8B41}' .
-'\x{8B42}\x{8B43}\x{8B44}\x{8B45}\x{8B46}\x{8B47}\x{8B48}\x{8B49}\x{8B4A}' .
-'\x{8B4B}\x{8B4C}\x{8B4D}\x{8B4E}\x{8B4F}\x{8B50}\x{8B51}\x{8B52}\x{8B53}' .
-'\x{8B54}\x{8B55}\x{8B56}\x{8B57}\x{8B58}\x{8B59}\x{8B5A}\x{8B5B}\x{8B5C}' .
-'\x{8B5D}\x{8B5E}\x{8B5F}\x{8B60}\x{8B63}\x{8B64}\x{8B65}\x{8B66}\x{8B67}' .
-'\x{8B68}\x{8B6A}\x{8B6B}\x{8B6C}\x{8B6D}\x{8B6E}\x{8B6F}\x{8B70}\x{8B71}' .
-'\x{8B73}\x{8B74}\x{8B76}\x{8B77}\x{8B78}\x{8B79}\x{8B7A}\x{8B7B}\x{8B7D}' .
-'\x{8B7E}\x{8B7F}\x{8B80}\x{8B82}\x{8B83}\x{8B84}\x{8B85}\x{8B86}\x{8B88}' .
-'\x{8B89}\x{8B8A}\x{8B8B}\x{8B8C}\x{8B8E}\x{8B90}\x{8B91}\x{8B92}\x{8B93}' .
-'\x{8B94}\x{8B95}\x{8B96}\x{8B97}\x{8B98}\x{8B99}\x{8B9A}\x{8B9C}\x{8B9D}' .
-'\x{8B9E}\x{8B9F}\x{8BA0}\x{8BA1}\x{8BA2}\x{8BA3}\x{8BA4}\x{8BA5}\x{8BA6}' .
-'\x{8BA7}\x{8BA8}\x{8BA9}\x{8BAA}\x{8BAB}\x{8BAC}\x{8BAD}\x{8BAE}\x{8BAF}' .
-'\x{8BB0}\x{8BB1}\x{8BB2}\x{8BB3}\x{8BB4}\x{8BB5}\x{8BB6}\x{8BB7}\x{8BB8}' .
-'\x{8BB9}\x{8BBA}\x{8BBB}\x{8BBC}\x{8BBD}\x{8BBE}\x{8BBF}\x{8BC0}\x{8BC1}' .
-'\x{8BC2}\x{8BC3}\x{8BC4}\x{8BC5}\x{8BC6}\x{8BC7}\x{8BC8}\x{8BC9}\x{8BCA}' .
-'\x{8BCB}\x{8BCC}\x{8BCD}\x{8BCE}\x{8BCF}\x{8BD0}\x{8BD1}\x{8BD2}\x{8BD3}' .
-'\x{8BD4}\x{8BD5}\x{8BD6}\x{8BD7}\x{8BD8}\x{8BD9}\x{8BDA}\x{8BDB}\x{8BDC}' .
-'\x{8BDD}\x{8BDE}\x{8BDF}\x{8BE0}\x{8BE1}\x{8BE2}\x{8BE3}\x{8BE4}\x{8BE5}' .
-'\x{8BE6}\x{8BE7}\x{8BE8}\x{8BE9}\x{8BEA}\x{8BEB}\x{8BEC}\x{8BED}\x{8BEE}' .
-'\x{8BEF}\x{8BF0}\x{8BF1}\x{8BF2}\x{8BF3}\x{8BF4}\x{8BF5}\x{8BF6}\x{8BF7}' .
-'\x{8BF8}\x{8BF9}\x{8BFA}\x{8BFB}\x{8BFC}\x{8BFD}\x{8BFE}\x{8BFF}\x{8C00}' .
-'\x{8C01}\x{8C02}\x{8C03}\x{8C04}\x{8C05}\x{8C06}\x{8C07}\x{8C08}\x{8C09}' .
-'\x{8C0A}\x{8C0B}\x{8C0C}\x{8C0D}\x{8C0E}\x{8C0F}\x{8C10}\x{8C11}\x{8C12}' .
-'\x{8C13}\x{8C14}\x{8C15}\x{8C16}\x{8C17}\x{8C18}\x{8C19}\x{8C1A}\x{8C1B}' .
-'\x{8C1C}\x{8C1D}\x{8C1E}\x{8C1F}\x{8C20}\x{8C21}\x{8C22}\x{8C23}\x{8C24}' .
-'\x{8C25}\x{8C26}\x{8C27}\x{8C28}\x{8C29}\x{8C2A}\x{8C2B}\x{8C2C}\x{8C2D}' .
-'\x{8C2E}\x{8C2F}\x{8C30}\x{8C31}\x{8C32}\x{8C33}\x{8C34}\x{8C35}\x{8C36}' .
-'\x{8C37}\x{8C39}\x{8C3A}\x{8C3B}\x{8C3C}\x{8C3D}\x{8C3E}\x{8C3F}\x{8C41}' .
-'\x{8C42}\x{8C43}\x{8C45}\x{8C46}\x{8C47}\x{8C48}\x{8C49}\x{8C4A}\x{8C4B}' .
-'\x{8C4C}\x{8C4D}\x{8C4E}\x{8C4F}\x{8C50}\x{8C54}\x{8C55}\x{8C56}\x{8C57}' .
-'\x{8C59}\x{8C5A}\x{8C5B}\x{8C5C}\x{8C5D}\x{8C5E}\x{8C5F}\x{8C60}\x{8C61}' .
-'\x{8C62}\x{8C63}\x{8C64}\x{8C65}\x{8C66}\x{8C67}\x{8C68}\x{8C69}\x{8C6A}' .
-'\x{8C6B}\x{8C6C}\x{8C6D}\x{8C6E}\x{8C6F}\x{8C70}\x{8C71}\x{8C72}\x{8C73}' .
-'\x{8C75}\x{8C76}\x{8C77}\x{8C78}\x{8C79}\x{8C7A}\x{8C7B}\x{8C7D}\x{8C7E}' .
-'\x{8C80}\x{8C81}\x{8C82}\x{8C84}\x{8C85}\x{8C86}\x{8C88}\x{8C89}\x{8C8A}' .
-'\x{8C8C}\x{8C8D}\x{8C8F}\x{8C90}\x{8C91}\x{8C92}\x{8C93}\x{8C94}\x{8C95}' .
-'\x{8C96}\x{8C97}\x{8C98}\x{8C99}\x{8C9A}\x{8C9C}\x{8C9D}\x{8C9E}\x{8C9F}' .
-'\x{8CA0}\x{8CA1}\x{8CA2}\x{8CA3}\x{8CA4}\x{8CA5}\x{8CA7}\x{8CA8}\x{8CA9}' .
-'\x{8CAA}\x{8CAB}\x{8CAC}\x{8CAD}\x{8CAE}\x{8CAF}\x{8CB0}\x{8CB1}\x{8CB2}' .
-'\x{8CB3}\x{8CB4}\x{8CB5}\x{8CB6}\x{8CB7}\x{8CB8}\x{8CB9}\x{8CBA}\x{8CBB}' .
-'\x{8CBC}\x{8CBD}\x{8CBE}\x{8CBF}\x{8CC0}\x{8CC1}\x{8CC2}\x{8CC3}\x{8CC4}' .
-'\x{8CC5}\x{8CC6}\x{8CC7}\x{8CC8}\x{8CC9}\x{8CCA}\x{8CCC}\x{8CCE}\x{8CCF}' .
-'\x{8CD0}\x{8CD1}\x{8CD2}\x{8CD3}\x{8CD4}\x{8CD5}\x{8CD7}\x{8CD9}\x{8CDA}' .
-'\x{8CDB}\x{8CDC}\x{8CDD}\x{8CDE}\x{8CDF}\x{8CE0}\x{8CE1}\x{8CE2}\x{8CE3}' .
-'\x{8CE4}\x{8CE5}\x{8CE6}\x{8CE7}\x{8CE8}\x{8CEA}\x{8CEB}\x{8CEC}\x{8CED}' .
-'\x{8CEE}\x{8CEF}\x{8CF0}\x{8CF1}\x{8CF2}\x{8CF3}\x{8CF4}\x{8CF5}\x{8CF6}' .
-'\x{8CF8}\x{8CF9}\x{8CFA}\x{8CFB}\x{8CFC}\x{8CFD}\x{8CFE}\x{8CFF}\x{8D00}' .
-'\x{8D02}\x{8D03}\x{8D04}\x{8D05}\x{8D06}\x{8D07}\x{8D08}\x{8D09}\x{8D0A}' .
-'\x{8D0B}\x{8D0C}\x{8D0D}\x{8D0E}\x{8D0F}\x{8D10}\x{8D13}\x{8D14}\x{8D15}' .
-'\x{8D16}\x{8D17}\x{8D18}\x{8D19}\x{8D1A}\x{8D1B}\x{8D1C}\x{8D1D}\x{8D1E}' .
-'\x{8D1F}\x{8D20}\x{8D21}\x{8D22}\x{8D23}\x{8D24}\x{8D25}\x{8D26}\x{8D27}' .
-'\x{8D28}\x{8D29}\x{8D2A}\x{8D2B}\x{8D2C}\x{8D2D}\x{8D2E}\x{8D2F}\x{8D30}' .
-'\x{8D31}\x{8D32}\x{8D33}\x{8D34}\x{8D35}\x{8D36}\x{8D37}\x{8D38}\x{8D39}' .
-'\x{8D3A}\x{8D3B}\x{8D3C}\x{8D3D}\x{8D3E}\x{8D3F}\x{8D40}\x{8D41}\x{8D42}' .
-'\x{8D43}\x{8D44}\x{8D45}\x{8D46}\x{8D47}\x{8D48}\x{8D49}\x{8D4A}\x{8D4B}' .
-'\x{8D4C}\x{8D4D}\x{8D4E}\x{8D4F}\x{8D50}\x{8D51}\x{8D52}\x{8D53}\x{8D54}' .
-'\x{8D55}\x{8D56}\x{8D57}\x{8D58}\x{8D59}\x{8D5A}\x{8D5B}\x{8D5C}\x{8D5D}' .
-'\x{8D5E}\x{8D5F}\x{8D60}\x{8D61}\x{8D62}\x{8D63}\x{8D64}\x{8D65}\x{8D66}' .
-'\x{8D67}\x{8D68}\x{8D69}\x{8D6A}\x{8D6B}\x{8D6C}\x{8D6D}\x{8D6E}\x{8D6F}' .
-'\x{8D70}\x{8D71}\x{8D72}\x{8D73}\x{8D74}\x{8D75}\x{8D76}\x{8D77}\x{8D78}' .
-'\x{8D79}\x{8D7A}\x{8D7B}\x{8D7D}\x{8D7E}\x{8D7F}\x{8D80}\x{8D81}\x{8D82}' .
-'\x{8D83}\x{8D84}\x{8D85}\x{8D86}\x{8D87}\x{8D88}\x{8D89}\x{8D8A}\x{8D8B}' .
-'\x{8D8C}\x{8D8D}\x{8D8E}\x{8D8F}\x{8D90}\x{8D91}\x{8D92}\x{8D93}\x{8D94}' .
-'\x{8D95}\x{8D96}\x{8D97}\x{8D98}\x{8D99}\x{8D9A}\x{8D9B}\x{8D9C}\x{8D9D}' .
-'\x{8D9E}\x{8D9F}\x{8DA0}\x{8DA1}\x{8DA2}\x{8DA3}\x{8DA4}\x{8DA5}\x{8DA7}' .
-'\x{8DA8}\x{8DA9}\x{8DAA}\x{8DAB}\x{8DAC}\x{8DAD}\x{8DAE}\x{8DAF}\x{8DB0}' .
-'\x{8DB1}\x{8DB2}\x{8DB3}\x{8DB4}\x{8DB5}\x{8DB6}\x{8DB7}\x{8DB8}\x{8DB9}' .
-'\x{8DBA}\x{8DBB}\x{8DBC}\x{8DBD}\x{8DBE}\x{8DBF}\x{8DC1}\x{8DC2}\x{8DC3}' .
-'\x{8DC4}\x{8DC5}\x{8DC6}\x{8DC7}\x{8DC8}\x{8DC9}\x{8DCA}\x{8DCB}\x{8DCC}' .
-'\x{8DCD}\x{8DCE}\x{8DCF}\x{8DD0}\x{8DD1}\x{8DD2}\x{8DD3}\x{8DD4}\x{8DD5}' .
-'\x{8DD6}\x{8DD7}\x{8DD8}\x{8DD9}\x{8DDA}\x{8DDB}\x{8DDC}\x{8DDD}\x{8DDE}' .
-'\x{8DDF}\x{8DE0}\x{8DE1}\x{8DE2}\x{8DE3}\x{8DE4}\x{8DE6}\x{8DE7}\x{8DE8}' .
-'\x{8DE9}\x{8DEA}\x{8DEB}\x{8DEC}\x{8DED}\x{8DEE}\x{8DEF}\x{8DF0}\x{8DF1}' .
-'\x{8DF2}\x{8DF3}\x{8DF4}\x{8DF5}\x{8DF6}\x{8DF7}\x{8DF8}\x{8DF9}\x{8DFA}' .
-'\x{8DFB}\x{8DFC}\x{8DFD}\x{8DFE}\x{8DFF}\x{8E00}\x{8E02}\x{8E03}\x{8E04}' .
-'\x{8E05}\x{8E06}\x{8E07}\x{8E08}\x{8E09}\x{8E0A}\x{8E0C}\x{8E0D}\x{8E0E}' .
-'\x{8E0F}\x{8E10}\x{8E11}\x{8E12}\x{8E13}\x{8E14}\x{8E15}\x{8E16}\x{8E17}' .
-'\x{8E18}\x{8E19}\x{8E1A}\x{8E1B}\x{8E1C}\x{8E1D}\x{8E1E}\x{8E1F}\x{8E20}' .
-'\x{8E21}\x{8E22}\x{8E23}\x{8E24}\x{8E25}\x{8E26}\x{8E27}\x{8E28}\x{8E29}' .
-'\x{8E2A}\x{8E2B}\x{8E2C}\x{8E2D}\x{8E2E}\x{8E2F}\x{8E30}\x{8E31}\x{8E33}' .
-'\x{8E34}\x{8E35}\x{8E36}\x{8E37}\x{8E38}\x{8E39}\x{8E3A}\x{8E3B}\x{8E3C}' .
-'\x{8E3D}\x{8E3E}\x{8E3F}\x{8E40}\x{8E41}\x{8E42}\x{8E43}\x{8E44}\x{8E45}' .
-'\x{8E47}\x{8E48}\x{8E49}\x{8E4A}\x{8E4B}\x{8E4C}\x{8E4D}\x{8E4E}\x{8E50}' .
-'\x{8E51}\x{8E52}\x{8E53}\x{8E54}\x{8E55}\x{8E56}\x{8E57}\x{8E58}\x{8E59}' .
-'\x{8E5A}\x{8E5B}\x{8E5C}\x{8E5D}\x{8E5E}\x{8E5F}\x{8E60}\x{8E61}\x{8E62}' .
-'\x{8E63}\x{8E64}\x{8E65}\x{8E66}\x{8E67}\x{8E68}\x{8E69}\x{8E6A}\x{8E6B}' .
-'\x{8E6C}\x{8E6D}\x{8E6F}\x{8E70}\x{8E71}\x{8E72}\x{8E73}\x{8E74}\x{8E76}' .
-'\x{8E78}\x{8E7A}\x{8E7B}\x{8E7C}\x{8E7D}\x{8E7E}\x{8E7F}\x{8E80}\x{8E81}' .
-'\x{8E82}\x{8E83}\x{8E84}\x{8E85}\x{8E86}\x{8E87}\x{8E88}\x{8E89}\x{8E8A}' .
-'\x{8E8B}\x{8E8C}\x{8E8D}\x{8E8E}\x{8E8F}\x{8E90}\x{8E91}\x{8E92}\x{8E93}' .
-'\x{8E94}\x{8E95}\x{8E96}\x{8E97}\x{8E98}\x{8E9A}\x{8E9C}\x{8E9D}\x{8E9E}' .
-'\x{8E9F}\x{8EA0}\x{8EA1}\x{8EA3}\x{8EA4}\x{8EA5}\x{8EA6}\x{8EA7}\x{8EA8}' .
-'\x{8EA9}\x{8EAA}\x{8EAB}\x{8EAC}\x{8EAD}\x{8EAE}\x{8EAF}\x{8EB0}\x{8EB1}' .
-'\x{8EB2}\x{8EB4}\x{8EB5}\x{8EB8}\x{8EB9}\x{8EBA}\x{8EBB}\x{8EBC}\x{8EBD}' .
-'\x{8EBE}\x{8EBF}\x{8EC0}\x{8EC2}\x{8EC3}\x{8EC5}\x{8EC6}\x{8EC7}\x{8EC8}' .
-'\x{8EC9}\x{8ECA}\x{8ECB}\x{8ECC}\x{8ECD}\x{8ECE}\x{8ECF}\x{8ED0}\x{8ED1}' .
-'\x{8ED2}\x{8ED3}\x{8ED4}\x{8ED5}\x{8ED6}\x{8ED7}\x{8ED8}\x{8EDA}\x{8EDB}' .
-'\x{8EDC}\x{8EDD}\x{8EDE}\x{8EDF}\x{8EE0}\x{8EE1}\x{8EE4}\x{8EE5}\x{8EE6}' .
-'\x{8EE7}\x{8EE8}\x{8EE9}\x{8EEA}\x{8EEB}\x{8EEC}\x{8EED}\x{8EEE}\x{8EEF}' .
-'\x{8EF1}\x{8EF2}\x{8EF3}\x{8EF4}\x{8EF5}\x{8EF6}\x{8EF7}\x{8EF8}\x{8EF9}' .
-'\x{8EFA}\x{8EFB}\x{8EFC}\x{8EFD}\x{8EFE}\x{8EFF}\x{8F00}\x{8F01}\x{8F02}' .
-'\x{8F03}\x{8F04}\x{8F05}\x{8F06}\x{8F07}\x{8F08}\x{8F09}\x{8F0A}\x{8F0B}' .
-'\x{8F0D}\x{8F0E}\x{8F10}\x{8F11}\x{8F12}\x{8F13}\x{8F14}\x{8F15}\x{8F16}' .
-'\x{8F17}\x{8F18}\x{8F1A}\x{8F1B}\x{8F1C}\x{8F1D}\x{8F1E}\x{8F1F}\x{8F20}' .
-'\x{8F21}\x{8F22}\x{8F23}\x{8F24}\x{8F25}\x{8F26}\x{8F27}\x{8F28}\x{8F29}' .
-'\x{8F2A}\x{8F2B}\x{8F2C}\x{8F2E}\x{8F2F}\x{8F30}\x{8F31}\x{8F32}\x{8F33}' .
-'\x{8F34}\x{8F35}\x{8F36}\x{8F37}\x{8F38}\x{8F39}\x{8F3B}\x{8F3C}\x{8F3D}' .
-'\x{8F3E}\x{8F3F}\x{8F40}\x{8F42}\x{8F43}\x{8F44}\x{8F45}\x{8F46}\x{8F47}' .
-'\x{8F48}\x{8F49}\x{8F4A}\x{8F4B}\x{8F4C}\x{8F4D}\x{8F4E}\x{8F4F}\x{8F50}' .
-'\x{8F51}\x{8F52}\x{8F53}\x{8F54}\x{8F55}\x{8F56}\x{8F57}\x{8F58}\x{8F59}' .
-'\x{8F5A}\x{8F5B}\x{8F5D}\x{8F5E}\x{8F5F}\x{8F60}\x{8F61}\x{8F62}\x{8F63}' .
-'\x{8F64}\x{8F65}\x{8F66}\x{8F67}\x{8F68}\x{8F69}\x{8F6A}\x{8F6B}\x{8F6C}' .
-'\x{8F6D}\x{8F6E}\x{8F6F}\x{8F70}\x{8F71}\x{8F72}\x{8F73}\x{8F74}\x{8F75}' .
-'\x{8F76}\x{8F77}\x{8F78}\x{8F79}\x{8F7A}\x{8F7B}\x{8F7C}\x{8F7D}\x{8F7E}' .
-'\x{8F7F}\x{8F80}\x{8F81}\x{8F82}\x{8F83}\x{8F84}\x{8F85}\x{8F86}\x{8F87}' .
-'\x{8F88}\x{8F89}\x{8F8A}\x{8F8B}\x{8F8C}\x{8F8D}\x{8F8E}\x{8F8F}\x{8F90}' .
-'\x{8F91}\x{8F92}\x{8F93}\x{8F94}\x{8F95}\x{8F96}\x{8F97}\x{8F98}\x{8F99}' .
-'\x{8F9A}\x{8F9B}\x{8F9C}\x{8F9E}\x{8F9F}\x{8FA0}\x{8FA1}\x{8FA2}\x{8FA3}' .
-'\x{8FA5}\x{8FA6}\x{8FA7}\x{8FA8}\x{8FA9}\x{8FAA}\x{8FAB}\x{8FAC}\x{8FAD}' .
-'\x{8FAE}\x{8FAF}\x{8FB0}\x{8FB1}\x{8FB2}\x{8FB4}\x{8FB5}\x{8FB6}\x{8FB7}' .
-'\x{8FB8}\x{8FB9}\x{8FBB}\x{8FBC}\x{8FBD}\x{8FBE}\x{8FBF}\x{8FC0}\x{8FC1}' .
-'\x{8FC2}\x{8FC4}\x{8FC5}\x{8FC6}\x{8FC7}\x{8FC8}\x{8FC9}\x{8FCB}\x{8FCC}' .
-'\x{8FCD}\x{8FCE}\x{8FCF}\x{8FD0}\x{8FD1}\x{8FD2}\x{8FD3}\x{8FD4}\x{8FD5}' .
-'\x{8FD6}\x{8FD7}\x{8FD8}\x{8FD9}\x{8FDA}\x{8FDB}\x{8FDC}\x{8FDD}\x{8FDE}' .
-'\x{8FDF}\x{8FE0}\x{8FE1}\x{8FE2}\x{8FE3}\x{8FE4}\x{8FE5}\x{8FE6}\x{8FE8}' .
-'\x{8FE9}\x{8FEA}\x{8FEB}\x{8FEC}\x{8FED}\x{8FEE}\x{8FEF}\x{8FF0}\x{8FF1}' .
-'\x{8FF2}\x{8FF3}\x{8FF4}\x{8FF5}\x{8FF6}\x{8FF7}\x{8FF8}\x{8FF9}\x{8FFA}' .
-'\x{8FFB}\x{8FFC}\x{8FFD}\x{8FFE}\x{8FFF}\x{9000}\x{9001}\x{9002}\x{9003}' .
-'\x{9004}\x{9005}\x{9006}\x{9007}\x{9008}\x{9009}\x{900A}\x{900B}\x{900C}' .
-'\x{900D}\x{900F}\x{9010}\x{9011}\x{9012}\x{9013}\x{9014}\x{9015}\x{9016}' .
-'\x{9017}\x{9018}\x{9019}\x{901A}\x{901B}\x{901C}\x{901D}\x{901E}\x{901F}' .
-'\x{9020}\x{9021}\x{9022}\x{9023}\x{9024}\x{9025}\x{9026}\x{9027}\x{9028}' .
-'\x{9029}\x{902B}\x{902D}\x{902E}\x{902F}\x{9030}\x{9031}\x{9032}\x{9033}' .
-'\x{9034}\x{9035}\x{9036}\x{9038}\x{903A}\x{903B}\x{903C}\x{903D}\x{903E}' .
-'\x{903F}\x{9041}\x{9042}\x{9043}\x{9044}\x{9045}\x{9047}\x{9048}\x{9049}' .
-'\x{904A}\x{904B}\x{904C}\x{904D}\x{904E}\x{904F}\x{9050}\x{9051}\x{9052}' .
-'\x{9053}\x{9054}\x{9055}\x{9056}\x{9057}\x{9058}\x{9059}\x{905A}\x{905B}' .
-'\x{905C}\x{905D}\x{905E}\x{905F}\x{9060}\x{9061}\x{9062}\x{9063}\x{9064}' .
-'\x{9065}\x{9066}\x{9067}\x{9068}\x{9069}\x{906A}\x{906B}\x{906C}\x{906D}' .
-'\x{906E}\x{906F}\x{9070}\x{9071}\x{9072}\x{9073}\x{9074}\x{9075}\x{9076}' .
-'\x{9077}\x{9078}\x{9079}\x{907A}\x{907B}\x{907C}\x{907D}\x{907E}\x{907F}' .
-'\x{9080}\x{9081}\x{9082}\x{9083}\x{9084}\x{9085}\x{9086}\x{9087}\x{9088}' .
-'\x{9089}\x{908A}\x{908B}\x{908C}\x{908D}\x{908E}\x{908F}\x{9090}\x{9091}' .
-'\x{9092}\x{9093}\x{9094}\x{9095}\x{9096}\x{9097}\x{9098}\x{9099}\x{909A}' .
-'\x{909B}\x{909C}\x{909D}\x{909E}\x{909F}\x{90A0}\x{90A1}\x{90A2}\x{90A3}' .
-'\x{90A4}\x{90A5}\x{90A6}\x{90A7}\x{90A8}\x{90A9}\x{90AA}\x{90AC}\x{90AD}' .
-'\x{90AE}\x{90AF}\x{90B0}\x{90B1}\x{90B2}\x{90B3}\x{90B4}\x{90B5}\x{90B6}' .
-'\x{90B7}\x{90B8}\x{90B9}\x{90BA}\x{90BB}\x{90BC}\x{90BD}\x{90BE}\x{90BF}' .
-'\x{90C0}\x{90C1}\x{90C2}\x{90C3}\x{90C4}\x{90C5}\x{90C6}\x{90C7}\x{90C8}' .
-'\x{90C9}\x{90CA}\x{90CB}\x{90CE}\x{90CF}\x{90D0}\x{90D1}\x{90D3}\x{90D4}' .
-'\x{90D5}\x{90D6}\x{90D7}\x{90D8}\x{90D9}\x{90DA}\x{90DB}\x{90DC}\x{90DD}' .
-'\x{90DE}\x{90DF}\x{90E0}\x{90E1}\x{90E2}\x{90E3}\x{90E4}\x{90E5}\x{90E6}' .
-'\x{90E7}\x{90E8}\x{90E9}\x{90EA}\x{90EB}\x{90EC}\x{90ED}\x{90EE}\x{90EF}' .
-'\x{90F0}\x{90F1}\x{90F2}\x{90F3}\x{90F4}\x{90F5}\x{90F7}\x{90F8}\x{90F9}' .
-'\x{90FA}\x{90FB}\x{90FC}\x{90FD}\x{90FE}\x{90FF}\x{9100}\x{9101}\x{9102}' .
-'\x{9103}\x{9104}\x{9105}\x{9106}\x{9107}\x{9108}\x{9109}\x{910B}\x{910C}' .
-'\x{910D}\x{910E}\x{910F}\x{9110}\x{9111}\x{9112}\x{9113}\x{9114}\x{9115}' .
-'\x{9116}\x{9117}\x{9118}\x{9119}\x{911A}\x{911B}\x{911C}\x{911D}\x{911E}' .
-'\x{911F}\x{9120}\x{9121}\x{9122}\x{9123}\x{9124}\x{9125}\x{9126}\x{9127}' .
-'\x{9128}\x{9129}\x{912A}\x{912B}\x{912C}\x{912D}\x{912E}\x{912F}\x{9130}' .
-'\x{9131}\x{9132}\x{9133}\x{9134}\x{9135}\x{9136}\x{9137}\x{9138}\x{9139}' .
-'\x{913A}\x{913B}\x{913E}\x{913F}\x{9140}\x{9141}\x{9142}\x{9143}\x{9144}' .
-'\x{9145}\x{9146}\x{9147}\x{9148}\x{9149}\x{914A}\x{914B}\x{914C}\x{914D}' .
-'\x{914E}\x{914F}\x{9150}\x{9151}\x{9152}\x{9153}\x{9154}\x{9155}\x{9156}' .
-'\x{9157}\x{9158}\x{915A}\x{915B}\x{915C}\x{915D}\x{915E}\x{915F}\x{9160}' .
-'\x{9161}\x{9162}\x{9163}\x{9164}\x{9165}\x{9166}\x{9167}\x{9168}\x{9169}' .
-'\x{916A}\x{916B}\x{916C}\x{916D}\x{916E}\x{916F}\x{9170}\x{9171}\x{9172}' .
-'\x{9173}\x{9174}\x{9175}\x{9176}\x{9177}\x{9178}\x{9179}\x{917A}\x{917C}' .
-'\x{917D}\x{917E}\x{917F}\x{9180}\x{9181}\x{9182}\x{9183}\x{9184}\x{9185}' .
-'\x{9186}\x{9187}\x{9188}\x{9189}\x{918A}\x{918B}\x{918C}\x{918D}\x{918E}' .
-'\x{918F}\x{9190}\x{9191}\x{9192}\x{9193}\x{9194}\x{9196}\x{9199}\x{919A}' .
-'\x{919B}\x{919C}\x{919D}\x{919E}\x{919F}\x{91A0}\x{91A1}\x{91A2}\x{91A3}' .
-'\x{91A5}\x{91A6}\x{91A7}\x{91A8}\x{91AA}\x{91AB}\x{91AC}\x{91AD}\x{91AE}' .
-'\x{91AF}\x{91B0}\x{91B1}\x{91B2}\x{91B3}\x{91B4}\x{91B5}\x{91B6}\x{91B7}' .
-'\x{91B9}\x{91BA}\x{91BB}\x{91BC}\x{91BD}\x{91BE}\x{91C0}\x{91C1}\x{91C2}' .
-'\x{91C3}\x{91C5}\x{91C6}\x{91C7}\x{91C9}\x{91CA}\x{91CB}\x{91CC}\x{91CD}' .
-'\x{91CE}\x{91CF}\x{91D0}\x{91D1}\x{91D2}\x{91D3}\x{91D4}\x{91D5}\x{91D7}' .
-'\x{91D8}\x{91D9}\x{91DA}\x{91DB}\x{91DC}\x{91DD}\x{91DE}\x{91DF}\x{91E2}' .
-'\x{91E3}\x{91E4}\x{91E5}\x{91E6}\x{91E7}\x{91E8}\x{91E9}\x{91EA}\x{91EB}' .
-'\x{91EC}\x{91ED}\x{91EE}\x{91F0}\x{91F1}\x{91F2}\x{91F3}\x{91F4}\x{91F5}' .
-'\x{91F7}\x{91F8}\x{91F9}\x{91FA}\x{91FB}\x{91FD}\x{91FE}\x{91FF}\x{9200}' .
-'\x{9201}\x{9202}\x{9203}\x{9204}\x{9205}\x{9206}\x{9207}\x{9208}\x{9209}' .
-'\x{920A}\x{920B}\x{920C}\x{920D}\x{920E}\x{920F}\x{9210}\x{9211}\x{9212}' .
-'\x{9214}\x{9215}\x{9216}\x{9217}\x{9218}\x{9219}\x{921A}\x{921B}\x{921C}' .
-'\x{921D}\x{921E}\x{9220}\x{9221}\x{9223}\x{9224}\x{9225}\x{9226}\x{9227}' .
-'\x{9228}\x{9229}\x{922A}\x{922B}\x{922D}\x{922E}\x{922F}\x{9230}\x{9231}' .
-'\x{9232}\x{9233}\x{9234}\x{9235}\x{9236}\x{9237}\x{9238}\x{9239}\x{923A}' .
-'\x{923B}\x{923C}\x{923D}\x{923E}\x{923F}\x{9240}\x{9241}\x{9242}\x{9245}' .
-'\x{9246}\x{9247}\x{9248}\x{9249}\x{924A}\x{924B}\x{924C}\x{924D}\x{924E}' .
-'\x{924F}\x{9250}\x{9251}\x{9252}\x{9253}\x{9254}\x{9255}\x{9256}\x{9257}' .
-'\x{9258}\x{9259}\x{925A}\x{925B}\x{925C}\x{925D}\x{925E}\x{925F}\x{9260}' .
-'\x{9261}\x{9262}\x{9263}\x{9264}\x{9265}\x{9266}\x{9267}\x{9268}\x{926B}' .
-'\x{926C}\x{926D}\x{926E}\x{926F}\x{9270}\x{9272}\x{9273}\x{9274}\x{9275}' .
-'\x{9276}\x{9277}\x{9278}\x{9279}\x{927A}\x{927B}\x{927C}\x{927D}\x{927E}' .
-'\x{927F}\x{9280}\x{9282}\x{9283}\x{9285}\x{9286}\x{9287}\x{9288}\x{9289}' .
-'\x{928A}\x{928B}\x{928C}\x{928D}\x{928E}\x{928F}\x{9290}\x{9291}\x{9292}' .
-'\x{9293}\x{9294}\x{9295}\x{9296}\x{9297}\x{9298}\x{9299}\x{929A}\x{929B}' .
-'\x{929C}\x{929D}\x{929F}\x{92A0}\x{92A1}\x{92A2}\x{92A3}\x{92A4}\x{92A5}' .
-'\x{92A6}\x{92A7}\x{92A8}\x{92A9}\x{92AA}\x{92AB}\x{92AC}\x{92AD}\x{92AE}' .
-'\x{92AF}\x{92B0}\x{92B1}\x{92B2}\x{92B3}\x{92B4}\x{92B5}\x{92B6}\x{92B7}' .
-'\x{92B8}\x{92B9}\x{92BA}\x{92BB}\x{92BC}\x{92BE}\x{92BF}\x{92C0}\x{92C1}' .
-'\x{92C2}\x{92C3}\x{92C4}\x{92C5}\x{92C6}\x{92C7}\x{92C8}\x{92C9}\x{92CA}' .
-'\x{92CB}\x{92CC}\x{92CD}\x{92CE}\x{92CF}\x{92D0}\x{92D1}\x{92D2}\x{92D3}' .
-'\x{92D5}\x{92D6}\x{92D7}\x{92D8}\x{92D9}\x{92DA}\x{92DC}\x{92DD}\x{92DE}' .
-'\x{92DF}\x{92E0}\x{92E1}\x{92E3}\x{92E4}\x{92E5}\x{92E6}\x{92E7}\x{92E8}' .
-'\x{92E9}\x{92EA}\x{92EB}\x{92EC}\x{92ED}\x{92EE}\x{92EF}\x{92F0}\x{92F1}' .
-'\x{92F2}\x{92F3}\x{92F4}\x{92F5}\x{92F6}\x{92F7}\x{92F8}\x{92F9}\x{92FA}' .
-'\x{92FB}\x{92FC}\x{92FD}\x{92FE}\x{92FF}\x{9300}\x{9301}\x{9302}\x{9303}' .
-'\x{9304}\x{9305}\x{9306}\x{9307}\x{9308}\x{9309}\x{930A}\x{930B}\x{930C}' .
-'\x{930D}\x{930E}\x{930F}\x{9310}\x{9311}\x{9312}\x{9313}\x{9314}\x{9315}' .
-'\x{9316}\x{9317}\x{9318}\x{9319}\x{931A}\x{931B}\x{931D}\x{931E}\x{931F}' .
-'\x{9320}\x{9321}\x{9322}\x{9323}\x{9324}\x{9325}\x{9326}\x{9327}\x{9328}' .
-'\x{9329}\x{932A}\x{932B}\x{932D}\x{932E}\x{932F}\x{9332}\x{9333}\x{9334}' .
-'\x{9335}\x{9336}\x{9337}\x{9338}\x{9339}\x{933A}\x{933B}\x{933C}\x{933D}' .
-'\x{933E}\x{933F}\x{9340}\x{9341}\x{9342}\x{9343}\x{9344}\x{9345}\x{9346}' .
-'\x{9347}\x{9348}\x{9349}\x{934A}\x{934B}\x{934C}\x{934D}\x{934E}\x{934F}' .
-'\x{9350}\x{9351}\x{9352}\x{9353}\x{9354}\x{9355}\x{9356}\x{9357}\x{9358}' .
-'\x{9359}\x{935A}\x{935B}\x{935C}\x{935D}\x{935E}\x{935F}\x{9360}\x{9361}' .
-'\x{9363}\x{9364}\x{9365}\x{9366}\x{9367}\x{9369}\x{936A}\x{936C}\x{936D}' .
-'\x{936E}\x{9370}\x{9371}\x{9372}\x{9374}\x{9375}\x{9376}\x{9377}\x{9379}' .
-'\x{937A}\x{937B}\x{937C}\x{937D}\x{937E}\x{9380}\x{9382}\x{9383}\x{9384}' .
-'\x{9385}\x{9386}\x{9387}\x{9388}\x{9389}\x{938A}\x{938C}\x{938D}\x{938E}' .
-'\x{938F}\x{9390}\x{9391}\x{9392}\x{9393}\x{9394}\x{9395}\x{9396}\x{9397}' .
-'\x{9398}\x{9399}\x{939A}\x{939B}\x{939D}\x{939E}\x{939F}\x{93A1}\x{93A2}' .
-'\x{93A3}\x{93A4}\x{93A5}\x{93A6}\x{93A7}\x{93A8}\x{93A9}\x{93AA}\x{93AC}' .
-'\x{93AD}\x{93AE}\x{93AF}\x{93B0}\x{93B1}\x{93B2}\x{93B3}\x{93B4}\x{93B5}' .
-'\x{93B6}\x{93B7}\x{93B8}\x{93B9}\x{93BA}\x{93BC}\x{93BD}\x{93BE}\x{93BF}' .
-'\x{93C0}\x{93C1}\x{93C2}\x{93C3}\x{93C4}\x{93C5}\x{93C6}\x{93C7}\x{93C8}' .
-'\x{93C9}\x{93CA}\x{93CB}\x{93CC}\x{93CD}\x{93CE}\x{93CF}\x{93D0}\x{93D1}' .
-'\x{93D2}\x{93D3}\x{93D4}\x{93D5}\x{93D6}\x{93D7}\x{93D8}\x{93D9}\x{93DA}' .
-'\x{93DB}\x{93DC}\x{93DD}\x{93DE}\x{93DF}\x{93E1}\x{93E2}\x{93E3}\x{93E4}' .
-'\x{93E6}\x{93E7}\x{93E8}\x{93E9}\x{93EA}\x{93EB}\x{93EC}\x{93ED}\x{93EE}' .
-'\x{93EF}\x{93F0}\x{93F1}\x{93F2}\x{93F4}\x{93F5}\x{93F6}\x{93F7}\x{93F8}' .
-'\x{93F9}\x{93FA}\x{93FB}\x{93FC}\x{93FD}\x{93FE}\x{93FF}\x{9400}\x{9401}' .
-'\x{9403}\x{9404}\x{9405}\x{9406}\x{9407}\x{9408}\x{9409}\x{940A}\x{940B}' .
-'\x{940C}\x{940D}\x{940E}\x{940F}\x{9410}\x{9411}\x{9412}\x{9413}\x{9414}' .
-'\x{9415}\x{9416}\x{9418}\x{9419}\x{941B}\x{941D}\x{9420}\x{9422}\x{9423}' .
-'\x{9425}\x{9426}\x{9427}\x{9428}\x{9429}\x{942A}\x{942B}\x{942C}\x{942D}' .
-'\x{942E}\x{942F}\x{9430}\x{9431}\x{9432}\x{9433}\x{9434}\x{9435}\x{9436}' .
-'\x{9437}\x{9438}\x{9439}\x{943A}\x{943B}\x{943C}\x{943D}\x{943E}\x{943F}' .
-'\x{9440}\x{9441}\x{9442}\x{9444}\x{9445}\x{9446}\x{9447}\x{9448}\x{9449}' .
-'\x{944A}\x{944B}\x{944C}\x{944D}\x{944F}\x{9450}\x{9451}\x{9452}\x{9453}' .
-'\x{9454}\x{9455}\x{9456}\x{9457}\x{9458}\x{9459}\x{945B}\x{945C}\x{945D}' .
-'\x{945E}\x{945F}\x{9460}\x{9461}\x{9462}\x{9463}\x{9464}\x{9465}\x{9466}' .
-'\x{9467}\x{9468}\x{9469}\x{946A}\x{946B}\x{946D}\x{946E}\x{946F}\x{9470}' .
-'\x{9471}\x{9472}\x{9473}\x{9474}\x{9475}\x{9476}\x{9477}\x{9478}\x{9479}' .
-'\x{947A}\x{947C}\x{947D}\x{947E}\x{947F}\x{9480}\x{9481}\x{9482}\x{9483}' .
-'\x{9484}\x{9485}\x{9486}\x{9487}\x{9488}\x{9489}\x{948A}\x{948B}\x{948C}' .
-'\x{948D}\x{948E}\x{948F}\x{9490}\x{9491}\x{9492}\x{9493}\x{9494}\x{9495}' .
-'\x{9496}\x{9497}\x{9498}\x{9499}\x{949A}\x{949B}\x{949C}\x{949D}\x{949E}' .
-'\x{949F}\x{94A0}\x{94A1}\x{94A2}\x{94A3}\x{94A4}\x{94A5}\x{94A6}\x{94A7}' .
-'\x{94A8}\x{94A9}\x{94AA}\x{94AB}\x{94AC}\x{94AD}\x{94AE}\x{94AF}\x{94B0}' .
-'\x{94B1}\x{94B2}\x{94B3}\x{94B4}\x{94B5}\x{94B6}\x{94B7}\x{94B8}\x{94B9}' .
-'\x{94BA}\x{94BB}\x{94BC}\x{94BD}\x{94BE}\x{94BF}\x{94C0}\x{94C1}\x{94C2}' .
-'\x{94C3}\x{94C4}\x{94C5}\x{94C6}\x{94C7}\x{94C8}\x{94C9}\x{94CA}\x{94CB}' .
-'\x{94CC}\x{94CD}\x{94CE}\x{94CF}\x{94D0}\x{94D1}\x{94D2}\x{94D3}\x{94D4}' .
-'\x{94D5}\x{94D6}\x{94D7}\x{94D8}\x{94D9}\x{94DA}\x{94DB}\x{94DC}\x{94DD}' .
-'\x{94DE}\x{94DF}\x{94E0}\x{94E1}\x{94E2}\x{94E3}\x{94E4}\x{94E5}\x{94E6}' .
-'\x{94E7}\x{94E8}\x{94E9}\x{94EA}\x{94EB}\x{94EC}\x{94ED}\x{94EE}\x{94EF}' .
-'\x{94F0}\x{94F1}\x{94F2}\x{94F3}\x{94F4}\x{94F5}\x{94F6}\x{94F7}\x{94F8}' .
-'\x{94F9}\x{94FA}\x{94FB}\x{94FC}\x{94FD}\x{94FE}\x{94FF}\x{9500}\x{9501}' .
-'\x{9502}\x{9503}\x{9504}\x{9505}\x{9506}\x{9507}\x{9508}\x{9509}\x{950A}' .
-'\x{950B}\x{950C}\x{950D}\x{950E}\x{950F}\x{9510}\x{9511}\x{9512}\x{9513}' .
-'\x{9514}\x{9515}\x{9516}\x{9517}\x{9518}\x{9519}\x{951A}\x{951B}\x{951C}' .
-'\x{951D}\x{951E}\x{951F}\x{9520}\x{9521}\x{9522}\x{9523}\x{9524}\x{9525}' .
-'\x{9526}\x{9527}\x{9528}\x{9529}\x{952A}\x{952B}\x{952C}\x{952D}\x{952E}' .
-'\x{952F}\x{9530}\x{9531}\x{9532}\x{9533}\x{9534}\x{9535}\x{9536}\x{9537}' .
-'\x{9538}\x{9539}\x{953A}\x{953B}\x{953C}\x{953D}\x{953E}\x{953F}\x{9540}' .
-'\x{9541}\x{9542}\x{9543}\x{9544}\x{9545}\x{9546}\x{9547}\x{9548}\x{9549}' .
-'\x{954A}\x{954B}\x{954C}\x{954D}\x{954E}\x{954F}\x{9550}\x{9551}\x{9552}' .
-'\x{9553}\x{9554}\x{9555}\x{9556}\x{9557}\x{9558}\x{9559}\x{955A}\x{955B}' .
-'\x{955C}\x{955D}\x{955E}\x{955F}\x{9560}\x{9561}\x{9562}\x{9563}\x{9564}' .
-'\x{9565}\x{9566}\x{9567}\x{9568}\x{9569}\x{956A}\x{956B}\x{956C}\x{956D}' .
-'\x{956E}\x{956F}\x{9570}\x{9571}\x{9572}\x{9573}\x{9574}\x{9575}\x{9576}' .
-'\x{9577}\x{957A}\x{957B}\x{957C}\x{957D}\x{957F}\x{9580}\x{9581}\x{9582}' .
-'\x{9583}\x{9584}\x{9586}\x{9587}\x{9588}\x{9589}\x{958A}\x{958B}\x{958C}' .
-'\x{958D}\x{958E}\x{958F}\x{9590}\x{9591}\x{9592}\x{9593}\x{9594}\x{9595}' .
-'\x{9596}\x{9598}\x{9599}\x{959A}\x{959B}\x{959C}\x{959D}\x{959E}\x{959F}' .
-'\x{95A1}\x{95A2}\x{95A3}\x{95A4}\x{95A5}\x{95A6}\x{95A7}\x{95A8}\x{95A9}' .
-'\x{95AA}\x{95AB}\x{95AC}\x{95AD}\x{95AE}\x{95AF}\x{95B0}\x{95B1}\x{95B2}' .
-'\x{95B5}\x{95B6}\x{95B7}\x{95B9}\x{95BA}\x{95BB}\x{95BC}\x{95BD}\x{95BE}' .
-'\x{95BF}\x{95C0}\x{95C2}\x{95C3}\x{95C4}\x{95C5}\x{95C6}\x{95C7}\x{95C8}' .
-'\x{95C9}\x{95CA}\x{95CB}\x{95CC}\x{95CD}\x{95CE}\x{95CF}\x{95D0}\x{95D1}' .
-'\x{95D2}\x{95D3}\x{95D4}\x{95D5}\x{95D6}\x{95D7}\x{95D8}\x{95DA}\x{95DB}' .
-'\x{95DC}\x{95DE}\x{95DF}\x{95E0}\x{95E1}\x{95E2}\x{95E3}\x{95E4}\x{95E5}' .
-'\x{95E6}\x{95E7}\x{95E8}\x{95E9}\x{95EA}\x{95EB}\x{95EC}\x{95ED}\x{95EE}' .
-'\x{95EF}\x{95F0}\x{95F1}\x{95F2}\x{95F3}\x{95F4}\x{95F5}\x{95F6}\x{95F7}' .
-'\x{95F8}\x{95F9}\x{95FA}\x{95FB}\x{95FC}\x{95FD}\x{95FE}\x{95FF}\x{9600}' .
-'\x{9601}\x{9602}\x{9603}\x{9604}\x{9605}\x{9606}\x{9607}\x{9608}\x{9609}' .
-'\x{960A}\x{960B}\x{960C}\x{960D}\x{960E}\x{960F}\x{9610}\x{9611}\x{9612}' .
-'\x{9613}\x{9614}\x{9615}\x{9616}\x{9617}\x{9618}\x{9619}\x{961A}\x{961B}' .
-'\x{961C}\x{961D}\x{961E}\x{961F}\x{9620}\x{9621}\x{9622}\x{9623}\x{9624}' .
-'\x{9627}\x{9628}\x{962A}\x{962B}\x{962C}\x{962D}\x{962E}\x{962F}\x{9630}' .
-'\x{9631}\x{9632}\x{9633}\x{9634}\x{9635}\x{9636}\x{9637}\x{9638}\x{9639}' .
-'\x{963A}\x{963B}\x{963C}\x{963D}\x{963F}\x{9640}\x{9641}\x{9642}\x{9643}' .
-'\x{9644}\x{9645}\x{9646}\x{9647}\x{9648}\x{9649}\x{964A}\x{964B}\x{964C}' .
-'\x{964D}\x{964E}\x{964F}\x{9650}\x{9651}\x{9652}\x{9653}\x{9654}\x{9655}' .
-'\x{9658}\x{9659}\x{965A}\x{965B}\x{965C}\x{965D}\x{965E}\x{965F}\x{9660}' .
-'\x{9661}\x{9662}\x{9663}\x{9664}\x{9666}\x{9667}\x{9668}\x{9669}\x{966A}' .
-'\x{966B}\x{966C}\x{966D}\x{966E}\x{966F}\x{9670}\x{9671}\x{9672}\x{9673}' .
-'\x{9674}\x{9675}\x{9676}\x{9677}\x{9678}\x{967C}\x{967D}\x{967E}\x{9680}' .
-'\x{9683}\x{9684}\x{9685}\x{9686}\x{9687}\x{9688}\x{9689}\x{968A}\x{968B}' .
-'\x{968D}\x{968E}\x{968F}\x{9690}\x{9691}\x{9692}\x{9693}\x{9694}\x{9695}' .
-'\x{9697}\x{9698}\x{9699}\x{969B}\x{969C}\x{969E}\x{96A0}\x{96A1}\x{96A2}' .
-'\x{96A3}\x{96A4}\x{96A5}\x{96A6}\x{96A7}\x{96A8}\x{96A9}\x{96AA}\x{96AC}' .
-'\x{96AD}\x{96AE}\x{96B0}\x{96B1}\x{96B3}\x{96B4}\x{96B6}\x{96B7}\x{96B8}' .
-'\x{96B9}\x{96BA}\x{96BB}\x{96BC}\x{96BD}\x{96BE}\x{96BF}\x{96C0}\x{96C1}' .
-'\x{96C2}\x{96C3}\x{96C4}\x{96C5}\x{96C6}\x{96C7}\x{96C8}\x{96C9}\x{96CA}' .
-'\x{96CB}\x{96CC}\x{96CD}\x{96CE}\x{96CF}\x{96D0}\x{96D1}\x{96D2}\x{96D3}' .
-'\x{96D4}\x{96D5}\x{96D6}\x{96D7}\x{96D8}\x{96D9}\x{96DA}\x{96DB}\x{96DC}' .
-'\x{96DD}\x{96DE}\x{96DF}\x{96E0}\x{96E1}\x{96E2}\x{96E3}\x{96E5}\x{96E8}' .
-'\x{96E9}\x{96EA}\x{96EB}\x{96EC}\x{96ED}\x{96EE}\x{96EF}\x{96F0}\x{96F1}' .
-'\x{96F2}\x{96F3}\x{96F4}\x{96F5}\x{96F6}\x{96F7}\x{96F8}\x{96F9}\x{96FA}' .
-'\x{96FB}\x{96FD}\x{96FE}\x{96FF}\x{9700}\x{9701}\x{9702}\x{9703}\x{9704}' .
-'\x{9705}\x{9706}\x{9707}\x{9708}\x{9709}\x{970A}\x{970B}\x{970C}\x{970D}' .
-'\x{970E}\x{970F}\x{9710}\x{9711}\x{9712}\x{9713}\x{9715}\x{9716}\x{9718}' .
-'\x{9719}\x{971C}\x{971D}\x{971E}\x{971F}\x{9720}\x{9721}\x{9722}\x{9723}' .
-'\x{9724}\x{9725}\x{9726}\x{9727}\x{9728}\x{9729}\x{972A}\x{972B}\x{972C}' .
-'\x{972D}\x{972E}\x{972F}\x{9730}\x{9731}\x{9732}\x{9735}\x{9736}\x{9738}' .
-'\x{9739}\x{973A}\x{973B}\x{973C}\x{973D}\x{973E}\x{973F}\x{9742}\x{9743}' .
-'\x{9744}\x{9745}\x{9746}\x{9747}\x{9748}\x{9749}\x{974A}\x{974B}\x{974C}' .
-'\x{974E}\x{974F}\x{9750}\x{9751}\x{9752}\x{9753}\x{9754}\x{9755}\x{9756}' .
-'\x{9758}\x{9759}\x{975A}\x{975B}\x{975C}\x{975D}\x{975E}\x{975F}\x{9760}' .
-'\x{9761}\x{9762}\x{9765}\x{9766}\x{9767}\x{9768}\x{9769}\x{976A}\x{976B}' .
-'\x{976C}\x{976D}\x{976E}\x{976F}\x{9770}\x{9772}\x{9773}\x{9774}\x{9776}' .
-'\x{9777}\x{9778}\x{9779}\x{977A}\x{977B}\x{977C}\x{977D}\x{977E}\x{977F}' .
-'\x{9780}\x{9781}\x{9782}\x{9783}\x{9784}\x{9785}\x{9786}\x{9788}\x{978A}' .
-'\x{978B}\x{978C}\x{978D}\x{978E}\x{978F}\x{9790}\x{9791}\x{9792}\x{9793}' .
-'\x{9794}\x{9795}\x{9796}\x{9797}\x{9798}\x{9799}\x{979A}\x{979C}\x{979D}' .
-'\x{979E}\x{979F}\x{97A0}\x{97A1}\x{97A2}\x{97A3}\x{97A4}\x{97A5}\x{97A6}' .
-'\x{97A7}\x{97A8}\x{97AA}\x{97AB}\x{97AC}\x{97AD}\x{97AE}\x{97AF}\x{97B2}' .
-'\x{97B3}\x{97B4}\x{97B6}\x{97B7}\x{97B8}\x{97B9}\x{97BA}\x{97BB}\x{97BC}' .
-'\x{97BD}\x{97BF}\x{97C1}\x{97C2}\x{97C3}\x{97C4}\x{97C5}\x{97C6}\x{97C7}' .
-'\x{97C8}\x{97C9}\x{97CA}\x{97CB}\x{97CC}\x{97CD}\x{97CE}\x{97CF}\x{97D0}' .
-'\x{97D1}\x{97D3}\x{97D4}\x{97D5}\x{97D6}\x{97D7}\x{97D8}\x{97D9}\x{97DA}' .
-'\x{97DB}\x{97DC}\x{97DD}\x{97DE}\x{97DF}\x{97E0}\x{97E1}\x{97E2}\x{97E3}' .
-'\x{97E4}\x{97E5}\x{97E6}\x{97E7}\x{97E8}\x{97E9}\x{97EA}\x{97EB}\x{97EC}' .
-'\x{97ED}\x{97EE}\x{97EF}\x{97F0}\x{97F1}\x{97F2}\x{97F3}\x{97F4}\x{97F5}' .
-'\x{97F6}\x{97F7}\x{97F8}\x{97F9}\x{97FA}\x{97FB}\x{97FD}\x{97FE}\x{97FF}' .
-'\x{9800}\x{9801}\x{9802}\x{9803}\x{9804}\x{9805}\x{9806}\x{9807}\x{9808}' .
-'\x{9809}\x{980A}\x{980B}\x{980C}\x{980D}\x{980E}\x{980F}\x{9810}\x{9811}' .
-'\x{9812}\x{9813}\x{9814}\x{9815}\x{9816}\x{9817}\x{9818}\x{9819}\x{981A}' .
-'\x{981B}\x{981C}\x{981D}\x{981E}\x{9820}\x{9821}\x{9822}\x{9823}\x{9824}' .
-'\x{9826}\x{9827}\x{9828}\x{9829}\x{982B}\x{982D}\x{982E}\x{982F}\x{9830}' .
-'\x{9831}\x{9832}\x{9834}\x{9835}\x{9836}\x{9837}\x{9838}\x{9839}\x{983B}' .
-'\x{983C}\x{983D}\x{983F}\x{9840}\x{9841}\x{9843}\x{9844}\x{9845}\x{9846}' .
-'\x{9848}\x{9849}\x{984A}\x{984C}\x{984D}\x{984E}\x{984F}\x{9850}\x{9851}' .
-'\x{9852}\x{9853}\x{9854}\x{9855}\x{9857}\x{9858}\x{9859}\x{985A}\x{985B}' .
-'\x{985C}\x{985D}\x{985E}\x{985F}\x{9860}\x{9861}\x{9862}\x{9863}\x{9864}' .
-'\x{9865}\x{9867}\x{9869}\x{986A}\x{986B}\x{986C}\x{986D}\x{986E}\x{986F}' .
-'\x{9870}\x{9871}\x{9872}\x{9873}\x{9874}\x{9875}\x{9876}\x{9877}\x{9878}' .
-'\x{9879}\x{987A}\x{987B}\x{987C}\x{987D}\x{987E}\x{987F}\x{9880}\x{9881}' .
-'\x{9882}\x{9883}\x{9884}\x{9885}\x{9886}\x{9887}\x{9888}\x{9889}\x{988A}' .
-'\x{988B}\x{988C}\x{988D}\x{988E}\x{988F}\x{9890}\x{9891}\x{9892}\x{9893}' .
-'\x{9894}\x{9895}\x{9896}\x{9897}\x{9898}\x{9899}\x{989A}\x{989B}\x{989C}' .
-'\x{989D}\x{989E}\x{989F}\x{98A0}\x{98A1}\x{98A2}\x{98A3}\x{98A4}\x{98A5}' .
-'\x{98A6}\x{98A7}\x{98A8}\x{98A9}\x{98AA}\x{98AB}\x{98AC}\x{98AD}\x{98AE}' .
-'\x{98AF}\x{98B0}\x{98B1}\x{98B2}\x{98B3}\x{98B4}\x{98B5}\x{98B6}\x{98B8}' .
-'\x{98B9}\x{98BA}\x{98BB}\x{98BC}\x{98BD}\x{98BE}\x{98BF}\x{98C0}\x{98C1}' .
-'\x{98C2}\x{98C3}\x{98C4}\x{98C5}\x{98C6}\x{98C8}\x{98C9}\x{98CB}\x{98CC}' .
-'\x{98CD}\x{98CE}\x{98CF}\x{98D0}\x{98D1}\x{98D2}\x{98D3}\x{98D4}\x{98D5}' .
-'\x{98D6}\x{98D7}\x{98D8}\x{98D9}\x{98DA}\x{98DB}\x{98DC}\x{98DD}\x{98DE}' .
-'\x{98DF}\x{98E0}\x{98E2}\x{98E3}\x{98E5}\x{98E6}\x{98E7}\x{98E8}\x{98E9}' .
-'\x{98EA}\x{98EB}\x{98ED}\x{98EF}\x{98F0}\x{98F2}\x{98F3}\x{98F4}\x{98F5}' .
-'\x{98F6}\x{98F7}\x{98F9}\x{98FA}\x{98FC}\x{98FD}\x{98FE}\x{98FF}\x{9900}' .
-'\x{9901}\x{9902}\x{9903}\x{9904}\x{9905}\x{9906}\x{9907}\x{9908}\x{9909}' .
-'\x{990A}\x{990B}\x{990C}\x{990D}\x{990E}\x{990F}\x{9910}\x{9911}\x{9912}' .
-'\x{9913}\x{9914}\x{9915}\x{9916}\x{9917}\x{9918}\x{991A}\x{991B}\x{991C}' .
-'\x{991D}\x{991E}\x{991F}\x{9920}\x{9921}\x{9922}\x{9923}\x{9924}\x{9925}' .
-'\x{9926}\x{9927}\x{9928}\x{9929}\x{992A}\x{992B}\x{992C}\x{992D}\x{992E}' .
-'\x{992F}\x{9930}\x{9931}\x{9932}\x{9933}\x{9934}\x{9935}\x{9936}\x{9937}' .
-'\x{9938}\x{9939}\x{993A}\x{993C}\x{993D}\x{993E}\x{993F}\x{9940}\x{9941}' .
-'\x{9942}\x{9943}\x{9945}\x{9946}\x{9947}\x{9948}\x{9949}\x{994A}\x{994B}' .
-'\x{994C}\x{994E}\x{994F}\x{9950}\x{9951}\x{9952}\x{9953}\x{9954}\x{9955}' .
-'\x{9956}\x{9957}\x{9958}\x{9959}\x{995B}\x{995C}\x{995E}\x{995F}\x{9960}' .
-'\x{9961}\x{9962}\x{9963}\x{9964}\x{9965}\x{9966}\x{9967}\x{9968}\x{9969}' .
-'\x{996A}\x{996B}\x{996C}\x{996D}\x{996E}\x{996F}\x{9970}\x{9971}\x{9972}' .
-'\x{9973}\x{9974}\x{9975}\x{9976}\x{9977}\x{9978}\x{9979}\x{997A}\x{997B}' .
-'\x{997C}\x{997D}\x{997E}\x{997F}\x{9980}\x{9981}\x{9982}\x{9983}\x{9984}' .
-'\x{9985}\x{9986}\x{9987}\x{9988}\x{9989}\x{998A}\x{998B}\x{998C}\x{998D}' .
-'\x{998E}\x{998F}\x{9990}\x{9991}\x{9992}\x{9993}\x{9994}\x{9995}\x{9996}' .
-'\x{9997}\x{9998}\x{9999}\x{999A}\x{999B}\x{999C}\x{999D}\x{999E}\x{999F}' .
-'\x{99A0}\x{99A1}\x{99A2}\x{99A3}\x{99A4}\x{99A5}\x{99A6}\x{99A7}\x{99A8}' .
-'\x{99A9}\x{99AA}\x{99AB}\x{99AC}\x{99AD}\x{99AE}\x{99AF}\x{99B0}\x{99B1}' .
-'\x{99B2}\x{99B3}\x{99B4}\x{99B5}\x{99B6}\x{99B7}\x{99B8}\x{99B9}\x{99BA}' .
-'\x{99BB}\x{99BC}\x{99BD}\x{99BE}\x{99C0}\x{99C1}\x{99C2}\x{99C3}\x{99C4}' .
-'\x{99C6}\x{99C7}\x{99C8}\x{99C9}\x{99CA}\x{99CB}\x{99CC}\x{99CD}\x{99CE}' .
-'\x{99CF}\x{99D0}\x{99D1}\x{99D2}\x{99D3}\x{99D4}\x{99D5}\x{99D6}\x{99D7}' .
-'\x{99D8}\x{99D9}\x{99DA}\x{99DB}\x{99DC}\x{99DD}\x{99DE}\x{99DF}\x{99E1}' .
-'\x{99E2}\x{99E3}\x{99E4}\x{99E5}\x{99E7}\x{99E8}\x{99E9}\x{99EA}\x{99EC}' .
-'\x{99ED}\x{99EE}\x{99EF}\x{99F0}\x{99F1}\x{99F2}\x{99F3}\x{99F4}\x{99F6}' .
-'\x{99F7}\x{99F8}\x{99F9}\x{99FA}\x{99FB}\x{99FC}\x{99FD}\x{99FE}\x{99FF}' .
-'\x{9A00}\x{9A01}\x{9A02}\x{9A03}\x{9A04}\x{9A05}\x{9A06}\x{9A07}\x{9A08}' .
-'\x{9A09}\x{9A0A}\x{9A0B}\x{9A0C}\x{9A0D}\x{9A0E}\x{9A0F}\x{9A11}\x{9A14}' .
-'\x{9A15}\x{9A16}\x{9A19}\x{9A1A}\x{9A1B}\x{9A1C}\x{9A1D}\x{9A1E}\x{9A1F}' .
-'\x{9A20}\x{9A21}\x{9A22}\x{9A23}\x{9A24}\x{9A25}\x{9A26}\x{9A27}\x{9A29}' .
-'\x{9A2A}\x{9A2B}\x{9A2C}\x{9A2D}\x{9A2E}\x{9A2F}\x{9A30}\x{9A31}\x{9A32}' .
-'\x{9A33}\x{9A34}\x{9A35}\x{9A36}\x{9A37}\x{9A38}\x{9A39}\x{9A3A}\x{9A3C}' .
-'\x{9A3D}\x{9A3E}\x{9A3F}\x{9A40}\x{9A41}\x{9A42}\x{9A43}\x{9A44}\x{9A45}' .
-'\x{9A46}\x{9A47}\x{9A48}\x{9A49}\x{9A4A}\x{9A4B}\x{9A4C}\x{9A4D}\x{9A4E}' .
-'\x{9A4F}\x{9A50}\x{9A52}\x{9A53}\x{9A54}\x{9A55}\x{9A56}\x{9A57}\x{9A59}' .
-'\x{9A5A}\x{9A5B}\x{9A5C}\x{9A5E}\x{9A5F}\x{9A60}\x{9A61}\x{9A62}\x{9A64}' .
-'\x{9A65}\x{9A66}\x{9A67}\x{9A68}\x{9A69}\x{9A6A}\x{9A6B}\x{9A6C}\x{9A6D}' .
-'\x{9A6E}\x{9A6F}\x{9A70}\x{9A71}\x{9A72}\x{9A73}\x{9A74}\x{9A75}\x{9A76}' .
-'\x{9A77}\x{9A78}\x{9A79}\x{9A7A}\x{9A7B}\x{9A7C}\x{9A7D}\x{9A7E}\x{9A7F}' .
-'\x{9A80}\x{9A81}\x{9A82}\x{9A83}\x{9A84}\x{9A85}\x{9A86}\x{9A87}\x{9A88}' .
-'\x{9A89}\x{9A8A}\x{9A8B}\x{9A8C}\x{9A8D}\x{9A8E}\x{9A8F}\x{9A90}\x{9A91}' .
-'\x{9A92}\x{9A93}\x{9A94}\x{9A95}\x{9A96}\x{9A97}\x{9A98}\x{9A99}\x{9A9A}' .
-'\x{9A9B}\x{9A9C}\x{9A9D}\x{9A9E}\x{9A9F}\x{9AA0}\x{9AA1}\x{9AA2}\x{9AA3}' .
-'\x{9AA4}\x{9AA5}\x{9AA6}\x{9AA7}\x{9AA8}\x{9AAA}\x{9AAB}\x{9AAC}\x{9AAD}' .
-'\x{9AAE}\x{9AAF}\x{9AB0}\x{9AB1}\x{9AB2}\x{9AB3}\x{9AB4}\x{9AB5}\x{9AB6}' .
-'\x{9AB7}\x{9AB8}\x{9AB9}\x{9ABA}\x{9ABB}\x{9ABC}\x{9ABE}\x{9ABF}\x{9AC0}' .
-'\x{9AC1}\x{9AC2}\x{9AC3}\x{9AC4}\x{9AC5}\x{9AC6}\x{9AC7}\x{9AC9}\x{9ACA}' .
-'\x{9ACB}\x{9ACC}\x{9ACD}\x{9ACE}\x{9ACF}\x{9AD0}\x{9AD1}\x{9AD2}\x{9AD3}' .
-'\x{9AD4}\x{9AD5}\x{9AD6}\x{9AD8}\x{9AD9}\x{9ADA}\x{9ADB}\x{9ADC}\x{9ADD}' .
-'\x{9ADE}\x{9ADF}\x{9AE1}\x{9AE2}\x{9AE3}\x{9AE5}\x{9AE6}\x{9AE7}\x{9AEA}' .
-'\x{9AEB}\x{9AEC}\x{9AED}\x{9AEE}\x{9AEF}\x{9AF1}\x{9AF2}\x{9AF3}\x{9AF4}' .
-'\x{9AF5}\x{9AF6}\x{9AF7}\x{9AF8}\x{9AF9}\x{9AFA}\x{9AFB}\x{9AFC}\x{9AFD}' .
-'\x{9AFE}\x{9AFF}\x{9B01}\x{9B03}\x{9B04}\x{9B05}\x{9B06}\x{9B07}\x{9B08}' .
-'\x{9B0A}\x{9B0B}\x{9B0C}\x{9B0D}\x{9B0E}\x{9B0F}\x{9B10}\x{9B11}\x{9B12}' .
-'\x{9B13}\x{9B15}\x{9B16}\x{9B17}\x{9B18}\x{9B19}\x{9B1A}\x{9B1C}\x{9B1D}' .
-'\x{9B1E}\x{9B1F}\x{9B20}\x{9B21}\x{9B22}\x{9B23}\x{9B24}\x{9B25}\x{9B26}' .
-'\x{9B27}\x{9B28}\x{9B29}\x{9B2A}\x{9B2B}\x{9B2C}\x{9B2D}\x{9B2E}\x{9B2F}' .
-'\x{9B30}\x{9B31}\x{9B32}\x{9B33}\x{9B35}\x{9B36}\x{9B37}\x{9B38}\x{9B39}' .
-'\x{9B3A}\x{9B3B}\x{9B3C}\x{9B3E}\x{9B3F}\x{9B41}\x{9B42}\x{9B43}\x{9B44}' .
-'\x{9B45}\x{9B46}\x{9B47}\x{9B48}\x{9B49}\x{9B4A}\x{9B4B}\x{9B4C}\x{9B4D}' .
-'\x{9B4E}\x{9B4F}\x{9B51}\x{9B52}\x{9B53}\x{9B54}\x{9B55}\x{9B56}\x{9B58}' .
-'\x{9B59}\x{9B5A}\x{9B5B}\x{9B5C}\x{9B5D}\x{9B5E}\x{9B5F}\x{9B60}\x{9B61}' .
-'\x{9B63}\x{9B64}\x{9B65}\x{9B66}\x{9B67}\x{9B68}\x{9B69}\x{9B6A}\x{9B6B}' .
-'\x{9B6C}\x{9B6D}\x{9B6E}\x{9B6F}\x{9B70}\x{9B71}\x{9B73}\x{9B74}\x{9B75}' .
-'\x{9B76}\x{9B77}\x{9B78}\x{9B79}\x{9B7A}\x{9B7B}\x{9B7C}\x{9B7D}\x{9B7E}' .
-'\x{9B7F}\x{9B80}\x{9B81}\x{9B82}\x{9B83}\x{9B84}\x{9B85}\x{9B86}\x{9B87}' .
-'\x{9B88}\x{9B8A}\x{9B8B}\x{9B8D}\x{9B8E}\x{9B8F}\x{9B90}\x{9B91}\x{9B92}' .
-'\x{9B93}\x{9B94}\x{9B95}\x{9B96}\x{9B97}\x{9B98}\x{9B9A}\x{9B9B}\x{9B9C}' .
-'\x{9B9D}\x{9B9E}\x{9B9F}\x{9BA0}\x{9BA1}\x{9BA2}\x{9BA3}\x{9BA4}\x{9BA5}' .
-'\x{9BA6}\x{9BA7}\x{9BA8}\x{9BA9}\x{9BAA}\x{9BAB}\x{9BAC}\x{9BAD}\x{9BAE}' .
-'\x{9BAF}\x{9BB0}\x{9BB1}\x{9BB2}\x{9BB3}\x{9BB4}\x{9BB5}\x{9BB6}\x{9BB7}' .
-'\x{9BB8}\x{9BB9}\x{9BBA}\x{9BBB}\x{9BBC}\x{9BBD}\x{9BBE}\x{9BBF}\x{9BC0}' .
-'\x{9BC1}\x{9BC3}\x{9BC4}\x{9BC5}\x{9BC6}\x{9BC7}\x{9BC8}\x{9BC9}\x{9BCA}' .
-'\x{9BCB}\x{9BCC}\x{9BCD}\x{9BCE}\x{9BCF}\x{9BD0}\x{9BD1}\x{9BD2}\x{9BD3}' .
-'\x{9BD4}\x{9BD5}\x{9BD6}\x{9BD7}\x{9BD8}\x{9BD9}\x{9BDA}\x{9BDB}\x{9BDC}' .
-'\x{9BDD}\x{9BDE}\x{9BDF}\x{9BE0}\x{9BE1}\x{9BE2}\x{9BE3}\x{9BE4}\x{9BE5}' .
-'\x{9BE6}\x{9BE7}\x{9BE8}\x{9BE9}\x{9BEA}\x{9BEB}\x{9BEC}\x{9BED}\x{9BEE}' .
-'\x{9BEF}\x{9BF0}\x{9BF1}\x{9BF2}\x{9BF3}\x{9BF4}\x{9BF5}\x{9BF7}\x{9BF8}' .
-'\x{9BF9}\x{9BFA}\x{9BFB}\x{9BFC}\x{9BFD}\x{9BFE}\x{9BFF}\x{9C02}\x{9C05}' .
-'\x{9C06}\x{9C07}\x{9C08}\x{9C09}\x{9C0A}\x{9C0B}\x{9C0C}\x{9C0D}\x{9C0E}' .
-'\x{9C0F}\x{9C10}\x{9C11}\x{9C12}\x{9C13}\x{9C14}\x{9C15}\x{9C16}\x{9C17}' .
-'\x{9C18}\x{9C19}\x{9C1A}\x{9C1B}\x{9C1C}\x{9C1D}\x{9C1E}\x{9C1F}\x{9C20}' .
-'\x{9C21}\x{9C22}\x{9C23}\x{9C24}\x{9C25}\x{9C26}\x{9C27}\x{9C28}\x{9C29}' .
-'\x{9C2A}\x{9C2B}\x{9C2C}\x{9C2D}\x{9C2F}\x{9C30}\x{9C31}\x{9C32}\x{9C33}' .
-'\x{9C34}\x{9C35}\x{9C36}\x{9C37}\x{9C38}\x{9C39}\x{9C3A}\x{9C3B}\x{9C3C}' .
-'\x{9C3D}\x{9C3E}\x{9C3F}\x{9C40}\x{9C41}\x{9C43}\x{9C44}\x{9C45}\x{9C46}' .
-'\x{9C47}\x{9C48}\x{9C49}\x{9C4A}\x{9C4B}\x{9C4C}\x{9C4D}\x{9C4E}\x{9C50}' .
-'\x{9C52}\x{9C53}\x{9C54}\x{9C55}\x{9C56}\x{9C57}\x{9C58}\x{9C59}\x{9C5A}' .
-'\x{9C5B}\x{9C5C}\x{9C5D}\x{9C5E}\x{9C5F}\x{9C60}\x{9C62}\x{9C63}\x{9C65}' .
-'\x{9C66}\x{9C67}\x{9C68}\x{9C69}\x{9C6A}\x{9C6B}\x{9C6C}\x{9C6D}\x{9C6E}' .
-'\x{9C6F}\x{9C70}\x{9C71}\x{9C72}\x{9C73}\x{9C74}\x{9C75}\x{9C77}\x{9C78}' .
-'\x{9C79}\x{9C7A}\x{9C7C}\x{9C7D}\x{9C7E}\x{9C7F}\x{9C80}\x{9C81}\x{9C82}' .
-'\x{9C83}\x{9C84}\x{9C85}\x{9C86}\x{9C87}\x{9C88}\x{9C89}\x{9C8A}\x{9C8B}' .
-'\x{9C8C}\x{9C8D}\x{9C8E}\x{9C8F}\x{9C90}\x{9C91}\x{9C92}\x{9C93}\x{9C94}' .
-'\x{9C95}\x{9C96}\x{9C97}\x{9C98}\x{9C99}\x{9C9A}\x{9C9B}\x{9C9C}\x{9C9D}' .
-'\x{9C9E}\x{9C9F}\x{9CA0}\x{9CA1}\x{9CA2}\x{9CA3}\x{9CA4}\x{9CA5}\x{9CA6}' .
-'\x{9CA7}\x{9CA8}\x{9CA9}\x{9CAA}\x{9CAB}\x{9CAC}\x{9CAD}\x{9CAE}\x{9CAF}' .
-'\x{9CB0}\x{9CB1}\x{9CB2}\x{9CB3}\x{9CB4}\x{9CB5}\x{9CB6}\x{9CB7}\x{9CB8}' .
-'\x{9CB9}\x{9CBA}\x{9CBB}\x{9CBC}\x{9CBD}\x{9CBE}\x{9CBF}\x{9CC0}\x{9CC1}' .
-'\x{9CC2}\x{9CC3}\x{9CC4}\x{9CC5}\x{9CC6}\x{9CC7}\x{9CC8}\x{9CC9}\x{9CCA}' .
-'\x{9CCB}\x{9CCC}\x{9CCD}\x{9CCE}\x{9CCF}\x{9CD0}\x{9CD1}\x{9CD2}\x{9CD3}' .
-'\x{9CD4}\x{9CD5}\x{9CD6}\x{9CD7}\x{9CD8}\x{9CD9}\x{9CDA}\x{9CDB}\x{9CDC}' .
-'\x{9CDD}\x{9CDE}\x{9CDF}\x{9CE0}\x{9CE1}\x{9CE2}\x{9CE3}\x{9CE4}\x{9CE5}' .
-'\x{9CE6}\x{9CE7}\x{9CE8}\x{9CE9}\x{9CEA}\x{9CEB}\x{9CEC}\x{9CED}\x{9CEE}' .
-'\x{9CEF}\x{9CF0}\x{9CF1}\x{9CF2}\x{9CF3}\x{9CF4}\x{9CF5}\x{9CF6}\x{9CF7}' .
-'\x{9CF8}\x{9CF9}\x{9CFA}\x{9CFB}\x{9CFC}\x{9CFD}\x{9CFE}\x{9CFF}\x{9D00}' .
-'\x{9D01}\x{9D02}\x{9D03}\x{9D04}\x{9D05}\x{9D06}\x{9D07}\x{9D08}\x{9D09}' .
-'\x{9D0A}\x{9D0B}\x{9D0F}\x{9D10}\x{9D12}\x{9D13}\x{9D14}\x{9D15}\x{9D16}' .
-'\x{9D17}\x{9D18}\x{9D19}\x{9D1A}\x{9D1B}\x{9D1C}\x{9D1D}\x{9D1E}\x{9D1F}' .
-'\x{9D20}\x{9D21}\x{9D22}\x{9D23}\x{9D24}\x{9D25}\x{9D26}\x{9D28}\x{9D29}' .
-'\x{9D2B}\x{9D2D}\x{9D2E}\x{9D2F}\x{9D30}\x{9D31}\x{9D32}\x{9D33}\x{9D34}' .
-'\x{9D36}\x{9D37}\x{9D38}\x{9D39}\x{9D3A}\x{9D3B}\x{9D3D}\x{9D3E}\x{9D3F}' .
-'\x{9D40}\x{9D41}\x{9D42}\x{9D43}\x{9D45}\x{9D46}\x{9D47}\x{9D48}\x{9D49}' .
-'\x{9D4A}\x{9D4B}\x{9D4C}\x{9D4D}\x{9D4E}\x{9D4F}\x{9D50}\x{9D51}\x{9D52}' .
-'\x{9D53}\x{9D54}\x{9D55}\x{9D56}\x{9D57}\x{9D58}\x{9D59}\x{9D5A}\x{9D5B}' .
-'\x{9D5C}\x{9D5D}\x{9D5E}\x{9D5F}\x{9D60}\x{9D61}\x{9D62}\x{9D63}\x{9D64}' .
-'\x{9D65}\x{9D66}\x{9D67}\x{9D68}\x{9D69}\x{9D6A}\x{9D6B}\x{9D6C}\x{9D6E}' .
-'\x{9D6F}\x{9D70}\x{9D71}\x{9D72}\x{9D73}\x{9D74}\x{9D75}\x{9D76}\x{9D77}' .
-'\x{9D78}\x{9D79}\x{9D7A}\x{9D7B}\x{9D7C}\x{9D7D}\x{9D7E}\x{9D7F}\x{9D80}' .
-'\x{9D81}\x{9D82}\x{9D83}\x{9D84}\x{9D85}\x{9D86}\x{9D87}\x{9D88}\x{9D89}' .
-'\x{9D8A}\x{9D8B}\x{9D8C}\x{9D8D}\x{9D8E}\x{9D90}\x{9D91}\x{9D92}\x{9D93}' .
-'\x{9D94}\x{9D96}\x{9D97}\x{9D98}\x{9D99}\x{9D9A}\x{9D9B}\x{9D9C}\x{9D9D}' .
-'\x{9D9E}\x{9D9F}\x{9DA0}\x{9DA1}\x{9DA2}\x{9DA3}\x{9DA4}\x{9DA5}\x{9DA6}' .
-'\x{9DA7}\x{9DA8}\x{9DA9}\x{9DAA}\x{9DAB}\x{9DAC}\x{9DAD}\x{9DAF}\x{9DB0}' .
-'\x{9DB1}\x{9DB2}\x{9DB3}\x{9DB4}\x{9DB5}\x{9DB6}\x{9DB7}\x{9DB8}\x{9DB9}' .
-'\x{9DBA}\x{9DBB}\x{9DBC}\x{9DBE}\x{9DBF}\x{9DC1}\x{9DC2}\x{9DC3}\x{9DC4}' .
-'\x{9DC5}\x{9DC7}\x{9DC8}\x{9DC9}\x{9DCA}\x{9DCB}\x{9DCC}\x{9DCD}\x{9DCE}' .
-'\x{9DCF}\x{9DD0}\x{9DD1}\x{9DD2}\x{9DD3}\x{9DD4}\x{9DD5}\x{9DD6}\x{9DD7}' .
-'\x{9DD8}\x{9DD9}\x{9DDA}\x{9DDB}\x{9DDC}\x{9DDD}\x{9DDE}\x{9DDF}\x{9DE0}' .
-'\x{9DE1}\x{9DE2}\x{9DE3}\x{9DE4}\x{9DE5}\x{9DE6}\x{9DE7}\x{9DE8}\x{9DE9}' .
-'\x{9DEB}\x{9DEC}\x{9DED}\x{9DEE}\x{9DEF}\x{9DF0}\x{9DF1}\x{9DF2}\x{9DF3}' .
-'\x{9DF4}\x{9DF5}\x{9DF6}\x{9DF7}\x{9DF8}\x{9DF9}\x{9DFA}\x{9DFB}\x{9DFD}' .
-'\x{9DFE}\x{9DFF}\x{9E00}\x{9E01}\x{9E02}\x{9E03}\x{9E04}\x{9E05}\x{9E06}' .
-'\x{9E07}\x{9E08}\x{9E09}\x{9E0A}\x{9E0B}\x{9E0C}\x{9E0D}\x{9E0F}\x{9E10}' .
-'\x{9E11}\x{9E12}\x{9E13}\x{9E14}\x{9E15}\x{9E17}\x{9E18}\x{9E19}\x{9E1A}' .
-'\x{9E1B}\x{9E1D}\x{9E1E}\x{9E1F}\x{9E20}\x{9E21}\x{9E22}\x{9E23}\x{9E24}' .
-'\x{9E25}\x{9E26}\x{9E27}\x{9E28}\x{9E29}\x{9E2A}\x{9E2B}\x{9E2C}\x{9E2D}' .
-'\x{9E2E}\x{9E2F}\x{9E30}\x{9E31}\x{9E32}\x{9E33}\x{9E34}\x{9E35}\x{9E36}' .
-'\x{9E37}\x{9E38}\x{9E39}\x{9E3A}\x{9E3B}\x{9E3C}\x{9E3D}\x{9E3E}\x{9E3F}' .
-'\x{9E40}\x{9E41}\x{9E42}\x{9E43}\x{9E44}\x{9E45}\x{9E46}\x{9E47}\x{9E48}' .
-'\x{9E49}\x{9E4A}\x{9E4B}\x{9E4C}\x{9E4D}\x{9E4E}\x{9E4F}\x{9E50}\x{9E51}' .
-'\x{9E52}\x{9E53}\x{9E54}\x{9E55}\x{9E56}\x{9E57}\x{9E58}\x{9E59}\x{9E5A}' .
-'\x{9E5B}\x{9E5C}\x{9E5D}\x{9E5E}\x{9E5F}\x{9E60}\x{9E61}\x{9E62}\x{9E63}' .
-'\x{9E64}\x{9E65}\x{9E66}\x{9E67}\x{9E68}\x{9E69}\x{9E6A}\x{9E6B}\x{9E6C}' .
-'\x{9E6D}\x{9E6E}\x{9E6F}\x{9E70}\x{9E71}\x{9E72}\x{9E73}\x{9E74}\x{9E75}' .
-'\x{9E76}\x{9E77}\x{9E79}\x{9E7A}\x{9E7C}\x{9E7D}\x{9E7E}\x{9E7F}\x{9E80}' .
-'\x{9E81}\x{9E82}\x{9E83}\x{9E84}\x{9E85}\x{9E86}\x{9E87}\x{9E88}\x{9E89}' .
-'\x{9E8A}\x{9E8B}\x{9E8C}\x{9E8D}\x{9E8E}\x{9E91}\x{9E92}\x{9E93}\x{9E94}' .
-'\x{9E96}\x{9E97}\x{9E99}\x{9E9A}\x{9E9B}\x{9E9C}\x{9E9D}\x{9E9F}\x{9EA0}' .
-'\x{9EA1}\x{9EA3}\x{9EA4}\x{9EA5}\x{9EA6}\x{9EA7}\x{9EA8}\x{9EA9}\x{9EAA}' .
-'\x{9EAD}\x{9EAE}\x{9EAF}\x{9EB0}\x{9EB2}\x{9EB3}\x{9EB4}\x{9EB5}\x{9EB6}' .
-'\x{9EB7}\x{9EB8}\x{9EBB}\x{9EBC}\x{9EBD}\x{9EBE}\x{9EBF}\x{9EC0}\x{9EC1}' .
-'\x{9EC2}\x{9EC3}\x{9EC4}\x{9EC5}\x{9EC6}\x{9EC7}\x{9EC8}\x{9EC9}\x{9ECA}' .
-'\x{9ECB}\x{9ECC}\x{9ECD}\x{9ECE}\x{9ECF}\x{9ED0}\x{9ED1}\x{9ED2}\x{9ED3}' .
-'\x{9ED4}\x{9ED5}\x{9ED6}\x{9ED7}\x{9ED8}\x{9ED9}\x{9EDA}\x{9EDB}\x{9EDC}' .
-'\x{9EDD}\x{9EDE}\x{9EDF}\x{9EE0}\x{9EE1}\x{9EE2}\x{9EE3}\x{9EE4}\x{9EE5}' .
-'\x{9EE6}\x{9EE7}\x{9EE8}\x{9EE9}\x{9EEA}\x{9EEB}\x{9EED}\x{9EEE}\x{9EEF}' .
-'\x{9EF0}\x{9EF2}\x{9EF3}\x{9EF4}\x{9EF5}\x{9EF6}\x{9EF7}\x{9EF8}\x{9EF9}' .
-'\x{9EFA}\x{9EFB}\x{9EFC}\x{9EFD}\x{9EFE}\x{9EFF}\x{9F00}\x{9F01}\x{9F02}' .
-'\x{9F04}\x{9F05}\x{9F06}\x{9F07}\x{9F08}\x{9F09}\x{9F0A}\x{9F0B}\x{9F0C}' .
-'\x{9F0D}\x{9F0E}\x{9F0F}\x{9F10}\x{9F12}\x{9F13}\x{9F15}\x{9F16}\x{9F17}' .
-'\x{9F18}\x{9F19}\x{9F1A}\x{9F1B}\x{9F1C}\x{9F1D}\x{9F1E}\x{9F1F}\x{9F20}' .
-'\x{9F22}\x{9F23}\x{9F24}\x{9F25}\x{9F27}\x{9F28}\x{9F29}\x{9F2A}\x{9F2B}' .
-'\x{9F2C}\x{9F2D}\x{9F2E}\x{9F2F}\x{9F30}\x{9F31}\x{9F32}\x{9F33}\x{9F34}' .
-'\x{9F35}\x{9F36}\x{9F37}\x{9F38}\x{9F39}\x{9F3A}\x{9F3B}\x{9F3C}\x{9F3D}' .
-'\x{9F3E}\x{9F3F}\x{9F40}\x{9F41}\x{9F42}\x{9F43}\x{9F44}\x{9F46}\x{9F47}' .
-'\x{9F48}\x{9F49}\x{9F4A}\x{9F4B}\x{9F4C}\x{9F4D}\x{9F4E}\x{9F4F}\x{9F50}' .
-'\x{9F51}\x{9F52}\x{9F54}\x{9F55}\x{9F56}\x{9F57}\x{9F58}\x{9F59}\x{9F5A}' .
-'\x{9F5B}\x{9F5C}\x{9F5D}\x{9F5E}\x{9F5F}\x{9F60}\x{9F61}\x{9F63}\x{9F64}' .
-'\x{9F65}\x{9F66}\x{9F67}\x{9F68}\x{9F69}\x{9F6A}\x{9F6B}\x{9F6C}\x{9F6E}' .
-'\x{9F6F}\x{9F70}\x{9F71}\x{9F72}\x{9F73}\x{9F74}\x{9F75}\x{9F76}\x{9F77}' .
-'\x{9F78}\x{9F79}\x{9F7A}\x{9F7B}\x{9F7C}\x{9F7D}\x{9F7E}\x{9F7F}\x{9F80}' .
-'\x{9F81}\x{9F82}\x{9F83}\x{9F84}\x{9F85}\x{9F86}\x{9F87}\x{9F88}\x{9F89}' .
-'\x{9F8A}\x{9F8B}\x{9F8C}\x{9F8D}\x{9F8E}\x{9F8F}\x{9F90}\x{9F91}\x{9F92}' .
-'\x{9F93}\x{9F94}\x{9F95}\x{9F96}\x{9F97}\x{9F98}\x{9F99}\x{9F9A}\x{9F9B}' .
-'\x{9F9C}\x{9F9D}\x{9F9E}\x{9F9F}\x{9FA0}\x{9FA2}\x{9FA4}\x{9FA5}]{1,20}$/iu');
diff --git a/airtime_mvc/library/Zend/Validate/Hostname/Com.php b/airtime_mvc/library/Zend/Validate/Hostname/Com.php
deleted file mode 100644
index 413971fec..000000000
--- a/airtime_mvc/library/Zend/Validate/Hostname/Com.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Com.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Ressource file for com and net idn validation
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-return array(
-    1  => '/^[\x{002d}0-9\x{0400}-\x{052f}]{1,63}$/iu',
-    2  => '/^[\x{002d}0-9\x{0370}-\x{03ff}]{1,63}$/iu',
-    3  => '/^[\x{002d}0-9a-z\x{ac00}-\x{d7a3}]{1,17}$/iu',
-    4  => '/^[\x{002d}0-9a-z·à-öø-ÿ�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįıĵķĸĺļľłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźżž]{1,63}$/iu',
-    5  => '/^[\x{002d}0-9A-Za-z\x{3400}-\x{3401}\x{3404}-\x{3406}\x{340C}\x{3416}\x{341C}' .
-'\x{3421}\x{3424}\x{3428}-\x{3429}\x{342B}-\x{342E}\x{3430}-\x{3434}\x{3436}' .
-'\x{3438}-\x{343C}\x{343E}\x{3441}-\x{3445}\x{3447}\x{3449}-\x{3451}\x{3453}' .
-'\x{3457}-\x{345F}\x{3463}-\x{3467}\x{346E}-\x{3471}\x{3473}-\x{3477}\x{3479}-\x{348E}\x{3491}-\x{3497}' .
-'\x{3499}-\x{34A1}\x{34A4}-\x{34AD}\x{34AF}-\x{34B0}\x{34B2}-\x{34BF}\x{34C2}-\x{34C5}\x{34C7}-\x{34CC}' .
-'\x{34CE}-\x{34D1}\x{34D3}-\x{34D8}\x{34DA}-\x{34E4}\x{34E7}-\x{34E9}\x{34EC}-\x{34EF}\x{34F1}-\x{34FE}' .
-'\x{3500}-\x{3507}\x{350A}-\x{3513}\x{3515}\x{3517}-\x{351A}\x{351C}-\x{351E}\x{3520}-\x{352A}' .
-'\x{352C}-\x{3552}\x{3554}-\x{355C}\x{355E}-\x{3567}\x{3569}-\x{3573}\x{3575}-\x{357C}\x{3580}-\x{3588}' .
-'\x{358F}-\x{3598}\x{359E}-\x{35AB}\x{35B4}-\x{35CD}\x{35D0}\x{35D3}-\x{35DC}\x{35E2}-\x{35ED}' .
-'\x{35F0}-\x{35F6}\x{35FB}-\x{3602}\x{3605}-\x{360E}\x{3610}-\x{3611}\x{3613}-\x{3616}\x{3619}-\x{362D}' .
-'\x{362F}-\x{3634}\x{3636}-\x{363B}\x{363F}-\x{3645}\x{3647}-\x{364B}\x{364D}-\x{3653}\x{3655}' .
-'\x{3659}-\x{365E}\x{3660}-\x{3665}\x{3667}-\x{367C}\x{367E}\x{3680}-\x{3685}\x{3687}' .
-'\x{3689}-\x{3690}\x{3692}-\x{3698}\x{369A}\x{369C}-\x{36AE}\x{36B0}-\x{36BF}\x{36C1}-\x{36C5}' .
-'\x{36C9}-\x{36CA}\x{36CD}-\x{36DE}\x{36E1}-\x{36E2}\x{36E5}-\x{36FE}\x{3701}-\x{3713}\x{3715}-\x{371E}' .
-'\x{3720}-\x{372C}\x{372E}-\x{3745}\x{3747}-\x{3748}\x{374A}\x{374C}-\x{3759}\x{375B}-\x{3760}' .
-'\x{3762}-\x{3767}\x{3769}-\x{3772}\x{3774}-\x{378C}\x{378F}-\x{379C}\x{379F}\x{37A1}-\x{37AD}' .
-'\x{37AF}-\x{37B7}\x{37B9}-\x{37C1}\x{37C3}-\x{37C5}\x{37C7}-\x{37D4}\x{37D6}-\x{37E0}\x{37E2}' .
-'\x{37E5}-\x{37ED}\x{37EF}-\x{37F6}\x{37F8}-\x{3802}\x{3804}-\x{381D}\x{3820}-\x{3822}\x{3825}-\x{382A}' .
-'\x{382D}-\x{382F}\x{3831}-\x{3832}\x{3834}-\x{384C}\x{384E}-\x{3860}\x{3862}-\x{3863}\x{3865}-\x{386B}' .
-'\x{386D}-\x{3886}\x{3888}-\x{38A1}\x{38A3}\x{38A5}-\x{38AA}\x{38AC}\x{38AE}-\x{38B0}' .
-'\x{38B2}-\x{38B6}\x{38B8}\x{38BA}-\x{38BE}\x{38C0}-\x{38C9}\x{38CB}-\x{38D4}\x{38D8}-\x{38E0}' .
-'\x{38E2}-\x{38E6}\x{38EB}-\x{38ED}\x{38EF}-\x{38F2}\x{38F5}-\x{38F7}\x{38FA}-\x{38FF}\x{3901}-\x{392A}' .
-'\x{392C}\x{392E}-\x{393B}\x{393E}-\x{3956}\x{395A}-\x{3969}\x{396B}-\x{397A}\x{397C}-\x{3987}' .
-'\x{3989}-\x{3998}\x{399A}-\x{39B0}\x{39B2}\x{39B4}-\x{39D0}\x{39D2}-\x{39DA}\x{39DE}-\x{39DF}' .
-'\x{39E1}-\x{39EF}\x{39F1}-\x{3A17}\x{3A19}-\x{3A2A}\x{3A2D}-\x{3A40}\x{3A43}-\x{3A4E}\x{3A50}' .
-'\x{3A52}-\x{3A5E}\x{3A60}-\x{3A6D}\x{3A6F}-\x{3A77}\x{3A79}-\x{3A82}\x{3A84}-\x{3A85}\x{3A87}-\x{3A89}' .
-'\x{3A8B}-\x{3A8F}\x{3A91}-\x{3A93}\x{3A95}-\x{3A96}\x{3A9A}\x{3A9C}-\x{3AA6}\x{3AA8}-\x{3AA9}' .
-'\x{3AAB}-\x{3AB1}\x{3AB4}-\x{3ABC}\x{3ABE}-\x{3AC5}\x{3ACA}-\x{3ACB}\x{3ACD}-\x{3AD5}\x{3AD7}-\x{3AE1}' .
-'\x{3AE4}-\x{3AE7}\x{3AE9}-\x{3AEC}\x{3AEE}-\x{3AFD}\x{3B01}-\x{3B10}\x{3B12}-\x{3B15}\x{3B17}-\x{3B1E}' .
-'\x{3B20}-\x{3B23}\x{3B25}-\x{3B27}\x{3B29}-\x{3B36}\x{3B38}-\x{3B39}\x{3B3B}-\x{3B3C}\x{3B3F}' .
-'\x{3B41}-\x{3B44}\x{3B47}-\x{3B4C}\x{3B4E}\x{3B51}-\x{3B55}\x{3B58}-\x{3B62}\x{3B68}-\x{3B72}' .
-'\x{3B78}-\x{3B88}\x{3B8B}-\x{3B9F}\x{3BA1}\x{3BA3}-\x{3BBA}\x{3BBC}\x{3BBF}-\x{3BD0}' .
-'\x{3BD3}-\x{3BE6}\x{3BEA}-\x{3BFB}\x{3BFE}-\x{3C12}\x{3C14}-\x{3C1B}\x{3C1D}-\x{3C37}\x{3C39}-\x{3C4F}' .
-'\x{3C52}\x{3C54}-\x{3C5C}\x{3C5E}-\x{3C68}\x{3C6A}-\x{3C76}\x{3C78}-\x{3C8F}\x{3C91}-\x{3CA8}' .
-'\x{3CAA}-\x{3CAD}\x{3CAF}-\x{3CBE}\x{3CC0}-\x{3CC8}\x{3CCA}-\x{3CD3}\x{3CD6}-\x{3CE0}\x{3CE4}-\x{3CEE}' .
-'\x{3CF3}-\x{3D0A}\x{3D0E}-\x{3D1E}\x{3D20}-\x{3D21}\x{3D25}-\x{3D38}\x{3D3B}-\x{3D46}\x{3D4A}-\x{3D59}' .
-'\x{3D5D}-\x{3D7B}\x{3D7D}-\x{3D81}\x{3D84}-\x{3D88}\x{3D8C}-\x{3D8F}\x{3D91}-\x{3D98}\x{3D9A}-\x{3D9C}' .
-'\x{3D9E}-\x{3DA1}\x{3DA3}-\x{3DB0}\x{3DB2}-\x{3DB5}\x{3DB9}-\x{3DBC}\x{3DBE}-\x{3DCB}\x{3DCD}-\x{3DDB}' .
-'\x{3DDF}-\x{3DE8}\x{3DEB}-\x{3DF0}\x{3DF3}-\x{3DF9}\x{3DFB}-\x{3DFC}\x{3DFE}-\x{3E05}\x{3E08}-\x{3E33}' .
-'\x{3E35}-\x{3E3E}\x{3E40}-\x{3E47}\x{3E49}-\x{3E67}\x{3E6B}-\x{3E6F}\x{3E71}-\x{3E85}\x{3E87}-\x{3E8C}' .
-'\x{3E8E}-\x{3E98}\x{3E9A}-\x{3EA1}\x{3EA3}-\x{3EAE}\x{3EB0}-\x{3EB5}\x{3EB7}-\x{3EBA}\x{3EBD}' .
-'\x{3EBF}-\x{3EC4}\x{3EC7}-\x{3ECE}\x{3ED1}-\x{3ED7}\x{3ED9}-\x{3EDA}\x{3EDD}-\x{3EE3}\x{3EE7}-\x{3EE8}' .
-'\x{3EEB}-\x{3EF2}\x{3EF5}-\x{3EFF}\x{3F01}-\x{3F02}\x{3F04}-\x{3F07}\x{3F09}-\x{3F44}\x{3F46}-\x{3F4E}' .
-'\x{3F50}-\x{3F53}\x{3F55}-\x{3F72}\x{3F74}-\x{3F75}\x{3F77}-\x{3F7B}\x{3F7D}-\x{3FB0}\x{3FB6}-\x{3FBF}' .
-'\x{3FC1}-\x{3FCF}\x{3FD1}-\x{3FD3}\x{3FD5}-\x{3FDF}\x{3FE1}-\x{400B}\x{400D}-\x{401C}\x{401E}-\x{4024}' .
-'\x{4027}-\x{403F}\x{4041}-\x{4060}\x{4062}-\x{4069}\x{406B}-\x{408A}\x{408C}-\x{40A7}\x{40A9}-\x{40B4}' .
-'\x{40B6}-\x{40C2}\x{40C7}-\x{40CF}\x{40D1}-\x{40DE}\x{40E0}-\x{40E7}\x{40E9}-\x{40EE}\x{40F0}-\x{40FB}' .
-'\x{40FD}-\x{4109}\x{410B}-\x{4115}\x{4118}-\x{411D}\x{411F}-\x{4122}\x{4124}-\x{4133}\x{4136}-\x{4138}' .
-'\x{413A}-\x{4148}\x{414A}-\x{4169}\x{416C}-\x{4185}\x{4188}-\x{418B}\x{418D}-\x{41AD}\x{41AF}-\x{41B3}' .
-'\x{41B5}-\x{41C3}\x{41C5}-\x{41C9}\x{41CB}-\x{41F2}\x{41F5}-\x{41FE}\x{4200}-\x{4227}\x{422A}-\x{4246}' .
-'\x{4248}-\x{4263}\x{4265}-\x{428B}\x{428D}-\x{42A1}\x{42A3}-\x{42C4}\x{42C8}-\x{42DC}\x{42DE}-\x{430A}' .
-'\x{430C}-\x{4335}\x{4337}\x{4342}-\x{435F}\x{4361}-\x{439A}\x{439C}-\x{439D}\x{439F}-\x{43A4}' .
-'\x{43A6}-\x{43EC}\x{43EF}-\x{4405}\x{4407}-\x{4429}\x{442B}-\x{4455}\x{4457}-\x{4468}\x{446A}-\x{446D}' .
-'\x{446F}-\x{4476}\x{4479}-\x{447D}\x{447F}-\x{4486}\x{4488}-\x{4490}\x{4492}-\x{4498}\x{449A}-\x{44AD}' .
-'\x{44B0}-\x{44BD}\x{44C1}-\x{44D3}\x{44D6}-\x{44E7}\x{44EA}\x{44EC}-\x{44FA}\x{44FC}-\x{4541}' .
-'\x{4543}-\x{454F}\x{4551}-\x{4562}\x{4564}-\x{4575}\x{4577}-\x{45AB}\x{45AD}-\x{45BD}\x{45BF}-\x{45D5}' .
-'\x{45D7}-\x{45EC}\x{45EE}-\x{45F2}\x{45F4}-\x{45FA}\x{45FC}-\x{461A}\x{461C}-\x{461D}\x{461F}-\x{4631}' .
-'\x{4633}-\x{4649}\x{464C}\x{464E}-\x{4652}\x{4654}-\x{466A}\x{466C}-\x{4675}\x{4677}-\x{467A}' .
-'\x{467C}-\x{4694}\x{4696}-\x{46A3}\x{46A5}-\x{46AB}\x{46AD}-\x{46D2}\x{46D4}-\x{4723}\x{4729}-\x{4732}' .
-'\x{4734}-\x{4758}\x{475A}\x{475C}-\x{478B}\x{478D}\x{4791}-\x{47B1}\x{47B3}-\x{47F1}' .
-'\x{47F3}-\x{480B}\x{480D}-\x{4815}\x{4817}-\x{4839}\x{483B}-\x{4870}\x{4872}-\x{487A}\x{487C}-\x{487F}' .
-'\x{4883}-\x{488E}\x{4890}-\x{4896}\x{4899}-\x{48A2}\x{48A4}-\x{48B9}\x{48BB}-\x{48C8}\x{48CA}-\x{48D1}' .
-'\x{48D3}-\x{48E5}\x{48E7}-\x{48F2}\x{48F4}-\x{48FF}\x{4901}-\x{4922}\x{4924}-\x{4928}\x{492A}-\x{4931}' .
-'\x{4933}-\x{495B}\x{495D}-\x{4978}\x{497A}\x{497D}\x{4982}-\x{4983}\x{4985}-\x{49A8}' .
-'\x{49AA}-\x{49AF}\x{49B1}-\x{49B7}\x{49B9}-\x{49BD}\x{49C1}-\x{49C7}\x{49C9}-\x{49CE}\x{49D0}-\x{49E8}' .
-'\x{49EA}\x{49EC}\x{49EE}-\x{4A19}\x{4A1B}-\x{4A43}\x{4A45}-\x{4A4D}\x{4A4F}-\x{4A9E}' .
-'\x{4AA0}-\x{4AA9}\x{4AAB}-\x{4B4E}\x{4B50}-\x{4B5B}\x{4B5D}-\x{4B69}\x{4B6B}-\x{4BC2}\x{4BC6}-\x{4BE8}' .
-'\x{4BEA}-\x{4BFA}\x{4BFC}-\x{4C06}\x{4C08}-\x{4C2D}\x{4C2F}-\x{4C32}\x{4C34}-\x{4C35}\x{4C37}-\x{4C69}' .
-'\x{4C6B}-\x{4C73}\x{4C75}-\x{4C86}\x{4C88}-\x{4C97}\x{4C99}-\x{4C9C}\x{4C9F}-\x{4CA3}\x{4CA5}-\x{4CB5}' .
-'\x{4CB7}-\x{4CF8}\x{4CFA}-\x{4D27}\x{4D29}-\x{4DAC}\x{4DAE}-\x{4DB1}\x{4DB3}-\x{4DB5}\x{4E00}-\x{4E54}' .
-'\x{4E56}-\x{4E89}\x{4E8B}-\x{4EEC}\x{4EEE}-\x{4FAC}\x{4FAE}-\x{503C}\x{503E}-\x{51E5}\x{51E7}-\x{5270}' .
-'\x{5272}-\x{56A1}\x{56A3}-\x{5840}\x{5842}-\x{58B5}\x{58B7}-\x{58CB}\x{58CD}-\x{5BC8}\x{5BCA}-\x{5C01}' .
-'\x{5C03}-\x{5C25}\x{5C27}-\x{5D5B}\x{5D5D}-\x{5F08}\x{5F0A}-\x{61F3}\x{61F5}-\x{63BA}\x{63BC}-\x{6441}' .
-'\x{6443}-\x{657C}\x{657E}-\x{663E}\x{6640}-\x{66FC}\x{66FE}-\x{6728}\x{672A}-\x{6766}\x{6768}-\x{67A8}' .
-'\x{67AA}-\x{685B}\x{685D}-\x{685E}\x{6860}-\x{68B9}\x{68BB}-\x{6AC8}\x{6ACA}-\x{6BB0}\x{6BB2}-\x{6C16}' .
-'\x{6C18}-\x{6D9B}\x{6D9D}-\x{6E12}\x{6E14}-\x{6E8B}\x{6E8D}-\x{704D}\x{704F}-\x{7113}\x{7115}-\x{713B}' .
-'\x{713D}-\x{7154}\x{7156}-\x{729F}\x{72A1}-\x{731E}\x{7320}-\x{7362}\x{7364}-\x{7533}\x{7535}-\x{7551}' .
-'\x{7553}-\x{7572}\x{7574}-\x{75E8}\x{75EA}-\x{7679}\x{767B}-\x{783E}\x{7840}-\x{7A62}\x{7A64}-\x{7AC2}' .
-'\x{7AC4}-\x{7B06}\x{7B08}-\x{7B79}\x{7B7B}-\x{7BCE}\x{7BD0}-\x{7D99}\x{7D9B}-\x{7E49}\x{7E4C}-\x{8132}' .
-'\x{8134}\x{8136}-\x{81D2}\x{81D4}-\x{8216}\x{8218}-\x{822D}\x{822F}-\x{83B4}\x{83B6}-\x{841F}' .
-'\x{8421}-\x{86CC}\x{86CE}-\x{874A}\x{874C}-\x{877E}\x{8780}-\x{8A32}\x{8A34}-\x{8B71}\x{8B73}-\x{8B8E}' .
-'\x{8B90}-\x{8DE4}\x{8DE6}-\x{8E9A}\x{8E9C}-\x{8EE1}\x{8EE4}-\x{8F0B}\x{8F0D}-\x{8FB9}\x{8FBB}-\x{9038}' .
-'\x{903A}-\x{9196}\x{9198}-\x{91A3}\x{91A5}-\x{91B7}\x{91B9}-\x{91C7}\x{91C9}-\x{91E0}\x{91E2}-\x{91FB}' .
-'\x{91FD}-\x{922B}\x{922D}-\x{9270}\x{9272}-\x{9420}\x{9422}-\x{9664}\x{9666}-\x{9679}\x{967B}-\x{9770}' .
-'\x{9772}-\x{982B}\x{982D}-\x{98ED}\x{98EF}-\x{99C4}\x{99C6}-\x{9A11}\x{9A14}-\x{9A27}\x{9A29}-\x{9D0D}' .
-'\x{9D0F}-\x{9D2B}\x{9D2D}-\x{9D8E}\x{9D90}-\x{9DC5}\x{9DC7}-\x{9E77}\x{9E79}-\x{9EB8}\x{9EBB}-\x{9F20}' .
-'\x{9F22}-\x{9F61}\x{9F63}-\x{9FA5}\x{FA28}]{1,20}$/iu',
-    6 => '/^[\x{002d}0-9A-Za-z]{1,63}$/iu',
-    7 => '/^[\x{00A1}-\x{00FF}]{1,63}$/iu',
-    8 => '/^[\x{0100}-\x{017f}]{1,63}$/iu',
-    9 => '/^[\x{0180}-\x{024f}]{1,63}$/iu',
-    10 => '/^[\x{0250}-\x{02af}]{1,63}$/iu',
-    11 => '/^[\x{02b0}-\x{02ff}]{1,63}$/iu',
-    12 => '/^[\x{0300}-\x{036f}]{1,63}$/iu',
-    13 => '/^[\x{0370}-\x{03ff}]{1,63}$/iu',
-    14 => '/^[\x{0400}-\x{04ff}]{1,63}$/iu',
-    15 => '/^[\x{0500}-\x{052f}]{1,63}$/iu',
-    16 => '/^[\x{0530}-\x{058F}]{1,63}$/iu',
-    17 => '/^[\x{0590}-\x{05FF}]{1,63}$/iu',
-    18 => '/^[\x{0600}-\x{06FF}]{1,63}$/iu',
-    19 => '/^[\x{0700}-\x{074F}]{1,63}$/iu',
-    20 => '/^[\x{0780}-\x{07BF}]{1,63}$/iu',
-    21 => '/^[\x{0900}-\x{097F}]{1,63}$/iu',
-    22 => '/^[\x{0980}-\x{09FF}]{1,63}$/iu',
-    23 => '/^[\x{0A00}-\x{0A7F}]{1,63}$/iu',
-    24 => '/^[\x{0A80}-\x{0AFF}]{1,63}$/iu',
-    25 => '/^[\x{0B00}-\x{0B7F}]{1,63}$/iu',
-    26 => '/^[\x{0B80}-\x{0BFF}]{1,63}$/iu',
-    27 => '/^[\x{0C00}-\x{0C7F}]{1,63}$/iu',
-    28 => '/^[\x{0C80}-\x{0CFF}]{1,63}$/iu',
-    29 => '/^[\x{0D00}-\x{0D7F}]{1,63}$/iu',
-    30 => '/^[\x{0D80}-\x{0DFF}]{1,63}$/iu',
-    31 => '/^[\x{0E00}-\x{0E7F}]{1,63}$/iu',
-    32 => '/^[\x{0E80}-\x{0EFF}]{1,63}$/iu',
-    33 => '/^[\x{0F00}-\x{0FFF}]{1,63}$/iu',
-    34 => '/^[\x{1000}-\x{109F}]{1,63}$/iu',
-    35 => '/^[\x{10A0}-\x{10FF}]{1,63}$/iu',
-    36 => '/^[\x{1100}-\x{11FF}]{1,63}$/iu',
-    37 => '/^[\x{1200}-\x{137F}]{1,63}$/iu',
-    38 => '/^[\x{13A0}-\x{13FF}]{1,63}$/iu',
-    39 => '/^[\x{1400}-\x{167F}]{1,63}$/iu',
-    40 => '/^[\x{1680}-\x{169F}]{1,63}$/iu',
-    41 => '/^[\x{16A0}-\x{16FF}]{1,63}$/iu',
-    42 => '/^[\x{1700}-\x{171F}]{1,63}$/iu',
-    43 => '/^[\x{1720}-\x{173F}]{1,63}$/iu',
-    44 => '/^[\x{1740}-\x{175F}]{1,63}$/iu',
-    45 => '/^[\x{1760}-\x{177F}]{1,63}$/iu',
-    46 => '/^[\x{1780}-\x{17FF}]{1,63}$/iu',
-    47 => '/^[\x{1800}-\x{18AF}]{1,63}$/iu',
-    48 => '/^[\x{1E00}-\x{1EFF}]{1,63}$/iu',
-    49 => '/^[\x{1F00}-\x{1FFF}]{1,63}$/iu',
-    50 => '/^[\x{2070}-\x{209F}]{1,63}$/iu',
-    51 => '/^[\x{2100}-\x{214F}]{1,63}$/iu',
-    52 => '/^[\x{2150}-\x{218F}]{1,63}$/iu',
-    53 => '/^[\x{2460}-\x{24FF}]{1,63}$/iu',
-    54 => '/^[\x{2E80}-\x{2EFF}]{1,63}$/iu',
-    55 => '/^[\x{2F00}-\x{2FDF}]{1,63}$/iu',
-    56 => '/^[\x{2FF0}-\x{2FFF}]{1,63}$/iu',
-    57 => '/^[\x{3040}-\x{309F}]{1,63}$/iu',
-    58 => '/^[\x{30A0}-\x{30FF}]{1,63}$/iu',
-    59 => '/^[\x{3100}-\x{312F}]{1,63}$/iu',
-    60 => '/^[\x{3130}-\x{318F}]{1,63}$/iu',
-    61 => '/^[\x{3190}-\x{319F}]{1,63}$/iu',
-    62 => '/^[\x{31A0}-\x{31BF}]{1,63}$/iu',
-    63 => '/^[\x{31F0}-\x{31FF}]{1,63}$/iu',
-    64 => '/^[\x{3200}-\x{32FF}]{1,63}$/iu',
-    65 => '/^[\x{3300}-\x{33FF}]{1,63}$/iu',
-    66 => '/^[\x{3400}-\x{4DBF}]{1,63}$/iu',
-    67 => '/^[\x{4E00}-\x{9FFF}]{1,63}$/iu',
-    68 => '/^[\x{A000}-\x{A48F}]{1,63}$/iu',
-    69 => '/^[\x{A490}-\x{A4CF}]{1,63}$/iu',
-    70 => '/^[\x{AC00}-\x{D7AF}]{1,63}$/iu',
-    71 => '/^[\x{D800}-\x{DB7F}]{1,63}$/iu',
-    72 => '/^[\x{DC00}-\x{DFFF}]{1,63}$/iu',
-    73 => '/^[\x{F900}-\x{FAFF}]{1,63}$/iu',
-    74 => '/^[\x{FB00}-\x{FB4F}]{1,63}$/iu',
-    75 => '/^[\x{FB50}-\x{FDFF}]{1,63}$/iu',
-    76 => '/^[\x{FE20}-\x{FE2F}]{1,63}$/iu',
-    77 => '/^[\x{FE70}-\x{FEFF}]{1,63}$/iu',
-    78 => '/^[\x{FF00}-\x{FFEF}]{1,63}$/iu',
-    79 => '/^[\x{20000}-\x{2A6DF}]{1,63}$/iu',
-    80 => '/^[\x{2F800}-\x{2FA1F}]{1,63}$/iu'
-
-);
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/Validate/Hostname/Jp.php b/airtime_mvc/library/Zend/Validate/Hostname/Jp.php
deleted file mode 100644
index 02f278e2b..000000000
--- a/airtime_mvc/library/Zend/Validate/Hostname/Jp.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Jp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Ressource file for japanese idn validation
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-return array(
-    1  => '/^[\x{002d}0-9a-z\x{3005}-\x{3007}\x{3041}-\x{3093}\x{309D}\x{309E}' .
-'\x{30A1}-\x{30F6}\x{30FC}' .
-'\x{30FD}\x{30FE}\x{4E00}\x{4E01}\x{4E03}\x{4E07}\x{4E08}\x{4E09}\x{4E0A}' .
-'\x{4E0B}\x{4E0D}\x{4E0E}\x{4E10}\x{4E11}\x{4E14}\x{4E15}\x{4E16}\x{4E17}' .
-'\x{4E18}\x{4E19}\x{4E1E}\x{4E21}\x{4E26}\x{4E2A}\x{4E2D}\x{4E31}\x{4E32}' .
-'\x{4E36}\x{4E38}\x{4E39}\x{4E3B}\x{4E3C}\x{4E3F}\x{4E42}\x{4E43}\x{4E45}' .
-'\x{4E4B}\x{4E4D}\x{4E4E}\x{4E4F}\x{4E55}\x{4E56}\x{4E57}\x{4E58}\x{4E59}' .
-'\x{4E5D}\x{4E5E}\x{4E5F}\x{4E62}\x{4E71}\x{4E73}\x{4E7E}\x{4E80}\x{4E82}' .
-'\x{4E85}\x{4E86}\x{4E88}\x{4E89}\x{4E8A}\x{4E8B}\x{4E8C}\x{4E8E}\x{4E91}' .
-'\x{4E92}\x{4E94}\x{4E95}\x{4E98}\x{4E99}\x{4E9B}\x{4E9C}\x{4E9E}\x{4E9F}' .
-'\x{4EA0}\x{4EA1}\x{4EA2}\x{4EA4}\x{4EA5}\x{4EA6}\x{4EA8}\x{4EAB}\x{4EAC}' .
-'\x{4EAD}\x{4EAE}\x{4EB0}\x{4EB3}\x{4EB6}\x{4EBA}\x{4EC0}\x{4EC1}\x{4EC2}' .
-'\x{4EC4}\x{4EC6}\x{4EC7}\x{4ECA}\x{4ECB}\x{4ECD}\x{4ECE}\x{4ECF}\x{4ED4}' .
-'\x{4ED5}\x{4ED6}\x{4ED7}\x{4ED8}\x{4ED9}\x{4EDD}\x{4EDE}\x{4EDF}\x{4EE3}' .
-'\x{4EE4}\x{4EE5}\x{4EED}\x{4EEE}\x{4EF0}\x{4EF2}\x{4EF6}\x{4EF7}\x{4EFB}' .
-'\x{4F01}\x{4F09}\x{4F0A}\x{4F0D}\x{4F0E}\x{4F0F}\x{4F10}\x{4F11}\x{4F1A}' .
-'\x{4F1C}\x{4F1D}\x{4F2F}\x{4F30}\x{4F34}\x{4F36}\x{4F38}\x{4F3A}\x{4F3C}' .
-'\x{4F3D}\x{4F43}\x{4F46}\x{4F47}\x{4F4D}\x{4F4E}\x{4F4F}\x{4F50}\x{4F51}' .
-'\x{4F53}\x{4F55}\x{4F57}\x{4F59}\x{4F5A}\x{4F5B}\x{4F5C}\x{4F5D}\x{4F5E}' .
-'\x{4F69}\x{4F6F}\x{4F70}\x{4F73}\x{4F75}\x{4F76}\x{4F7B}\x{4F7C}\x{4F7F}' .
-'\x{4F83}\x{4F86}\x{4F88}\x{4F8B}\x{4F8D}\x{4F8F}\x{4F91}\x{4F96}\x{4F98}' .
-'\x{4F9B}\x{4F9D}\x{4FA0}\x{4FA1}\x{4FAB}\x{4FAD}\x{4FAE}\x{4FAF}\x{4FB5}' .
-'\x{4FB6}\x{4FBF}\x{4FC2}\x{4FC3}\x{4FC4}\x{4FCA}\x{4FCE}\x{4FD0}\x{4FD1}' .
-'\x{4FD4}\x{4FD7}\x{4FD8}\x{4FDA}\x{4FDB}\x{4FDD}\x{4FDF}\x{4FE1}\x{4FE3}' .
-'\x{4FE4}\x{4FE5}\x{4FEE}\x{4FEF}\x{4FF3}\x{4FF5}\x{4FF6}\x{4FF8}\x{4FFA}' .
-'\x{4FFE}\x{5005}\x{5006}\x{5009}\x{500B}\x{500D}\x{500F}\x{5011}\x{5012}' .
-'\x{5014}\x{5016}\x{5019}\x{501A}\x{501F}\x{5021}\x{5023}\x{5024}\x{5025}' .
-'\x{5026}\x{5028}\x{5029}\x{502A}\x{502B}\x{502C}\x{502D}\x{5036}\x{5039}' .
-'\x{5043}\x{5047}\x{5048}\x{5049}\x{504F}\x{5050}\x{5055}\x{5056}\x{505A}' .
-'\x{505C}\x{5065}\x{506C}\x{5072}\x{5074}\x{5075}\x{5076}\x{5078}\x{507D}' .
-'\x{5080}\x{5085}\x{508D}\x{5091}\x{5098}\x{5099}\x{509A}\x{50AC}\x{50AD}' .
-'\x{50B2}\x{50B3}\x{50B4}\x{50B5}\x{50B7}\x{50BE}\x{50C2}\x{50C5}\x{50C9}' .
-'\x{50CA}\x{50CD}\x{50CF}\x{50D1}\x{50D5}\x{50D6}\x{50DA}\x{50DE}\x{50E3}' .
-'\x{50E5}\x{50E7}\x{50ED}\x{50EE}\x{50F5}\x{50F9}\x{50FB}\x{5100}\x{5101}' .
-'\x{5102}\x{5104}\x{5109}\x{5112}\x{5114}\x{5115}\x{5116}\x{5118}\x{511A}' .
-'\x{511F}\x{5121}\x{512A}\x{5132}\x{5137}\x{513A}\x{513B}\x{513C}\x{513F}' .
-'\x{5140}\x{5141}\x{5143}\x{5144}\x{5145}\x{5146}\x{5147}\x{5148}\x{5149}' .
-'\x{514B}\x{514C}\x{514D}\x{514E}\x{5150}\x{5152}\x{5154}\x{515A}\x{515C}' .
-'\x{5162}\x{5165}\x{5168}\x{5169}\x{516A}\x{516B}\x{516C}\x{516D}\x{516E}' .
-'\x{5171}\x{5175}\x{5176}\x{5177}\x{5178}\x{517C}\x{5180}\x{5182}\x{5185}' .
-'\x{5186}\x{5189}\x{518A}\x{518C}\x{518D}\x{518F}\x{5190}\x{5191}\x{5192}' .
-'\x{5193}\x{5195}\x{5196}\x{5197}\x{5199}\x{51A0}\x{51A2}\x{51A4}\x{51A5}' .
-'\x{51A6}\x{51A8}\x{51A9}\x{51AA}\x{51AB}\x{51AC}\x{51B0}\x{51B1}\x{51B2}' .
-'\x{51B3}\x{51B4}\x{51B5}\x{51B6}\x{51B7}\x{51BD}\x{51C4}\x{51C5}\x{51C6}' .
-'\x{51C9}\x{51CB}\x{51CC}\x{51CD}\x{51D6}\x{51DB}\x{51DC}\x{51DD}\x{51E0}' .
-'\x{51E1}\x{51E6}\x{51E7}\x{51E9}\x{51EA}\x{51ED}\x{51F0}\x{51F1}\x{51F5}' .
-'\x{51F6}\x{51F8}\x{51F9}\x{51FA}\x{51FD}\x{51FE}\x{5200}\x{5203}\x{5204}' .
-'\x{5206}\x{5207}\x{5208}\x{520A}\x{520B}\x{520E}\x{5211}\x{5214}\x{5217}' .
-'\x{521D}\x{5224}\x{5225}\x{5227}\x{5229}\x{522A}\x{522E}\x{5230}\x{5233}' .
-'\x{5236}\x{5237}\x{5238}\x{5239}\x{523A}\x{523B}\x{5243}\x{5244}\x{5247}' .
-'\x{524A}\x{524B}\x{524C}\x{524D}\x{524F}\x{5254}\x{5256}\x{525B}\x{525E}' .
-'\x{5263}\x{5264}\x{5265}\x{5269}\x{526A}\x{526F}\x{5270}\x{5271}\x{5272}' .
-'\x{5273}\x{5274}\x{5275}\x{527D}\x{527F}\x{5283}\x{5287}\x{5288}\x{5289}' .
-'\x{528D}\x{5291}\x{5292}\x{5294}\x{529B}\x{529F}\x{52A0}\x{52A3}\x{52A9}' .
-'\x{52AA}\x{52AB}\x{52AC}\x{52AD}\x{52B1}\x{52B4}\x{52B5}\x{52B9}\x{52BC}' .
-'\x{52BE}\x{52C1}\x{52C3}\x{52C5}\x{52C7}\x{52C9}\x{52CD}\x{52D2}\x{52D5}' .
-'\x{52D7}\x{52D8}\x{52D9}\x{52DD}\x{52DE}\x{52DF}\x{52E0}\x{52E2}\x{52E3}' .
-'\x{52E4}\x{52E6}\x{52E7}\x{52F2}\x{52F3}\x{52F5}\x{52F8}\x{52F9}\x{52FA}' .
-'\x{52FE}\x{52FF}\x{5301}\x{5302}\x{5305}\x{5306}\x{5308}\x{530D}\x{530F}' .
-'\x{5310}\x{5315}\x{5316}\x{5317}\x{5319}\x{531A}\x{531D}\x{5320}\x{5321}' .
-'\x{5323}\x{532A}\x{532F}\x{5331}\x{5333}\x{5338}\x{5339}\x{533A}\x{533B}' .
-'\x{533F}\x{5340}\x{5341}\x{5343}\x{5345}\x{5346}\x{5347}\x{5348}\x{5349}' .
-'\x{534A}\x{534D}\x{5351}\x{5352}\x{5353}\x{5354}\x{5357}\x{5358}\x{535A}' .
-'\x{535C}\x{535E}\x{5360}\x{5366}\x{5369}\x{536E}\x{536F}\x{5370}\x{5371}' .
-'\x{5373}\x{5374}\x{5375}\x{5377}\x{5378}\x{537B}\x{537F}\x{5382}\x{5384}' .
-'\x{5396}\x{5398}\x{539A}\x{539F}\x{53A0}\x{53A5}\x{53A6}\x{53A8}\x{53A9}' .
-'\x{53AD}\x{53AE}\x{53B0}\x{53B3}\x{53B6}\x{53BB}\x{53C2}\x{53C3}\x{53C8}' .
-'\x{53C9}\x{53CA}\x{53CB}\x{53CC}\x{53CD}\x{53CE}\x{53D4}\x{53D6}\x{53D7}' .
-'\x{53D9}\x{53DB}\x{53DF}\x{53E1}\x{53E2}\x{53E3}\x{53E4}\x{53E5}\x{53E8}' .
-'\x{53E9}\x{53EA}\x{53EB}\x{53EC}\x{53ED}\x{53EE}\x{53EF}\x{53F0}\x{53F1}' .
-'\x{53F2}\x{53F3}\x{53F6}\x{53F7}\x{53F8}\x{53FA}\x{5401}\x{5403}\x{5404}' .
-'\x{5408}\x{5409}\x{540A}\x{540B}\x{540C}\x{540D}\x{540E}\x{540F}\x{5410}' .
-'\x{5411}\x{541B}\x{541D}\x{541F}\x{5420}\x{5426}\x{5429}\x{542B}\x{542C}' .
-'\x{542D}\x{542E}\x{5436}\x{5438}\x{5439}\x{543B}\x{543C}\x{543D}\x{543E}' .
-'\x{5440}\x{5442}\x{5446}\x{5448}\x{5449}\x{544A}\x{544E}\x{5451}\x{545F}' .
-'\x{5468}\x{546A}\x{5470}\x{5471}\x{5473}\x{5475}\x{5476}\x{5477}\x{547B}' .
-'\x{547C}\x{547D}\x{5480}\x{5484}\x{5486}\x{548B}\x{548C}\x{548E}\x{548F}' .
-'\x{5490}\x{5492}\x{54A2}\x{54A4}\x{54A5}\x{54A8}\x{54AB}\x{54AC}\x{54AF}' .
-'\x{54B2}\x{54B3}\x{54B8}\x{54BC}\x{54BD}\x{54BE}\x{54C0}\x{54C1}\x{54C2}' .
-'\x{54C4}\x{54C7}\x{54C8}\x{54C9}\x{54D8}\x{54E1}\x{54E2}\x{54E5}\x{54E6}' .
-'\x{54E8}\x{54E9}\x{54ED}\x{54EE}\x{54F2}\x{54FA}\x{54FD}\x{5504}\x{5506}' .
-'\x{5507}\x{550F}\x{5510}\x{5514}\x{5516}\x{552E}\x{552F}\x{5531}\x{5533}' .
-'\x{5538}\x{5539}\x{553E}\x{5540}\x{5544}\x{5545}\x{5546}\x{554C}\x{554F}' .
-'\x{5553}\x{5556}\x{5557}\x{555C}\x{555D}\x{5563}\x{557B}\x{557C}\x{557E}' .
-'\x{5580}\x{5583}\x{5584}\x{5587}\x{5589}\x{558A}\x{558B}\x{5598}\x{5599}' .
-'\x{559A}\x{559C}\x{559D}\x{559E}\x{559F}\x{55A7}\x{55A8}\x{55A9}\x{55AA}' .
-'\x{55AB}\x{55AC}\x{55AE}\x{55B0}\x{55B6}\x{55C4}\x{55C5}\x{55C7}\x{55D4}' .
-'\x{55DA}\x{55DC}\x{55DF}\x{55E3}\x{55E4}\x{55F7}\x{55F9}\x{55FD}\x{55FE}' .
-'\x{5606}\x{5609}\x{5614}\x{5616}\x{5617}\x{5618}\x{561B}\x{5629}\x{562F}' .
-'\x{5631}\x{5632}\x{5634}\x{5636}\x{5638}\x{5642}\x{564C}\x{564E}\x{5650}' .
-'\x{565B}\x{5664}\x{5668}\x{566A}\x{566B}\x{566C}\x{5674}\x{5678}\x{567A}' .
-'\x{5680}\x{5686}\x{5687}\x{568A}\x{568F}\x{5694}\x{56A0}\x{56A2}\x{56A5}' .
-'\x{56AE}\x{56B4}\x{56B6}\x{56BC}\x{56C0}\x{56C1}\x{56C2}\x{56C3}\x{56C8}' .
-'\x{56CE}\x{56D1}\x{56D3}\x{56D7}\x{56D8}\x{56DA}\x{56DB}\x{56DE}\x{56E0}' .
-'\x{56E3}\x{56EE}\x{56F0}\x{56F2}\x{56F3}\x{56F9}\x{56FA}\x{56FD}\x{56FF}' .
-'\x{5700}\x{5703}\x{5704}\x{5708}\x{5709}\x{570B}\x{570D}\x{570F}\x{5712}' .
-'\x{5713}\x{5716}\x{5718}\x{571C}\x{571F}\x{5726}\x{5727}\x{5728}\x{572D}' .
-'\x{5730}\x{5737}\x{5738}\x{573B}\x{5740}\x{5742}\x{5747}\x{574A}\x{574E}' .
-'\x{574F}\x{5750}\x{5751}\x{5761}\x{5764}\x{5766}\x{5769}\x{576A}\x{577F}' .
-'\x{5782}\x{5788}\x{5789}\x{578B}\x{5793}\x{57A0}\x{57A2}\x{57A3}\x{57A4}' .
-'\x{57AA}\x{57B0}\x{57B3}\x{57C0}\x{57C3}\x{57C6}\x{57CB}\x{57CE}\x{57D2}' .
-'\x{57D3}\x{57D4}\x{57D6}\x{57DC}\x{57DF}\x{57E0}\x{57E3}\x{57F4}\x{57F7}' .
-'\x{57F9}\x{57FA}\x{57FC}\x{5800}\x{5802}\x{5805}\x{5806}\x{580A}\x{580B}' .
-'\x{5815}\x{5819}\x{581D}\x{5821}\x{5824}\x{582A}\x{582F}\x{5830}\x{5831}' .
-'\x{5834}\x{5835}\x{583A}\x{583D}\x{5840}\x{5841}\x{584A}\x{584B}\x{5851}' .
-'\x{5852}\x{5854}\x{5857}\x{5858}\x{5859}\x{585A}\x{585E}\x{5862}\x{5869}' .
-'\x{586B}\x{5870}\x{5872}\x{5875}\x{5879}\x{587E}\x{5883}\x{5885}\x{5893}' .
-'\x{5897}\x{589C}\x{589F}\x{58A8}\x{58AB}\x{58AE}\x{58B3}\x{58B8}\x{58B9}' .
-'\x{58BA}\x{58BB}\x{58BE}\x{58C1}\x{58C5}\x{58C7}\x{58CA}\x{58CC}\x{58D1}' .
-'\x{58D3}\x{58D5}\x{58D7}\x{58D8}\x{58D9}\x{58DC}\x{58DE}\x{58DF}\x{58E4}' .
-'\x{58E5}\x{58EB}\x{58EC}\x{58EE}\x{58EF}\x{58F0}\x{58F1}\x{58F2}\x{58F7}' .
-'\x{58F9}\x{58FA}\x{58FB}\x{58FC}\x{58FD}\x{5902}\x{5909}\x{590A}\x{590F}' .
-'\x{5910}\x{5915}\x{5916}\x{5918}\x{5919}\x{591A}\x{591B}\x{591C}\x{5922}' .
-'\x{5925}\x{5927}\x{5929}\x{592A}\x{592B}\x{592C}\x{592D}\x{592E}\x{5931}' .
-'\x{5932}\x{5937}\x{5938}\x{593E}\x{5944}\x{5947}\x{5948}\x{5949}\x{594E}' .
-'\x{594F}\x{5950}\x{5951}\x{5954}\x{5955}\x{5957}\x{5958}\x{595A}\x{5960}' .
-'\x{5962}\x{5965}\x{5967}\x{5968}\x{5969}\x{596A}\x{596C}\x{596E}\x{5973}' .
-'\x{5974}\x{5978}\x{597D}\x{5981}\x{5982}\x{5983}\x{5984}\x{598A}\x{598D}' .
-'\x{5993}\x{5996}\x{5999}\x{599B}\x{599D}\x{59A3}\x{59A5}\x{59A8}\x{59AC}' .
-'\x{59B2}\x{59B9}\x{59BB}\x{59BE}\x{59C6}\x{59C9}\x{59CB}\x{59D0}\x{59D1}' .
-'\x{59D3}\x{59D4}\x{59D9}\x{59DA}\x{59DC}\x{59E5}\x{59E6}\x{59E8}\x{59EA}' .
-'\x{59EB}\x{59F6}\x{59FB}\x{59FF}\x{5A01}\x{5A03}\x{5A09}\x{5A11}\x{5A18}' .
-'\x{5A1A}\x{5A1C}\x{5A1F}\x{5A20}\x{5A25}\x{5A29}\x{5A2F}\x{5A35}\x{5A36}' .
-'\x{5A3C}\x{5A40}\x{5A41}\x{5A46}\x{5A49}\x{5A5A}\x{5A62}\x{5A66}\x{5A6A}' .
-'\x{5A6C}\x{5A7F}\x{5A92}\x{5A9A}\x{5A9B}\x{5ABC}\x{5ABD}\x{5ABE}\x{5AC1}' .
-'\x{5AC2}\x{5AC9}\x{5ACB}\x{5ACC}\x{5AD0}\x{5AD6}\x{5AD7}\x{5AE1}\x{5AE3}' .
-'\x{5AE6}\x{5AE9}\x{5AFA}\x{5AFB}\x{5B09}\x{5B0B}\x{5B0C}\x{5B16}\x{5B22}' .
-'\x{5B2A}\x{5B2C}\x{5B30}\x{5B32}\x{5B36}\x{5B3E}\x{5B40}\x{5B43}\x{5B45}' .
-'\x{5B50}\x{5B51}\x{5B54}\x{5B55}\x{5B57}\x{5B58}\x{5B5A}\x{5B5B}\x{5B5C}' .
-'\x{5B5D}\x{5B5F}\x{5B63}\x{5B64}\x{5B65}\x{5B66}\x{5B69}\x{5B6B}\x{5B70}' .
-'\x{5B71}\x{5B73}\x{5B75}\x{5B78}\x{5B7A}\x{5B80}\x{5B83}\x{5B85}\x{5B87}' .
-'\x{5B88}\x{5B89}\x{5B8B}\x{5B8C}\x{5B8D}\x{5B8F}\x{5B95}\x{5B97}\x{5B98}' .
-'\x{5B99}\x{5B9A}\x{5B9B}\x{5B9C}\x{5B9D}\x{5B9F}\x{5BA2}\x{5BA3}\x{5BA4}' .
-'\x{5BA5}\x{5BA6}\x{5BAE}\x{5BB0}\x{5BB3}\x{5BB4}\x{5BB5}\x{5BB6}\x{5BB8}' .
-'\x{5BB9}\x{5BBF}\x{5BC2}\x{5BC3}\x{5BC4}\x{5BC5}\x{5BC6}\x{5BC7}\x{5BC9}' .
-'\x{5BCC}\x{5BD0}\x{5BD2}\x{5BD3}\x{5BD4}\x{5BDB}\x{5BDD}\x{5BDE}\x{5BDF}' .
-'\x{5BE1}\x{5BE2}\x{5BE4}\x{5BE5}\x{5BE6}\x{5BE7}\x{5BE8}\x{5BE9}\x{5BEB}' .
-'\x{5BEE}\x{5BF0}\x{5BF3}\x{5BF5}\x{5BF6}\x{5BF8}\x{5BFA}\x{5BFE}\x{5BFF}' .
-'\x{5C01}\x{5C02}\x{5C04}\x{5C05}\x{5C06}\x{5C07}\x{5C08}\x{5C09}\x{5C0A}' .
-'\x{5C0B}\x{5C0D}\x{5C0E}\x{5C0F}\x{5C11}\x{5C13}\x{5C16}\x{5C1A}\x{5C20}' .
-'\x{5C22}\x{5C24}\x{5C28}\x{5C2D}\x{5C31}\x{5C38}\x{5C39}\x{5C3A}\x{5C3B}' .
-'\x{5C3C}\x{5C3D}\x{5C3E}\x{5C3F}\x{5C40}\x{5C41}\x{5C45}\x{5C46}\x{5C48}' .
-'\x{5C4A}\x{5C4B}\x{5C4D}\x{5C4E}\x{5C4F}\x{5C50}\x{5C51}\x{5C53}\x{5C55}' .
-'\x{5C5E}\x{5C60}\x{5C61}\x{5C64}\x{5C65}\x{5C6C}\x{5C6E}\x{5C6F}\x{5C71}' .
-'\x{5C76}\x{5C79}\x{5C8C}\x{5C90}\x{5C91}\x{5C94}\x{5CA1}\x{5CA8}\x{5CA9}' .
-'\x{5CAB}\x{5CAC}\x{5CB1}\x{5CB3}\x{5CB6}\x{5CB7}\x{5CB8}\x{5CBB}\x{5CBC}' .
-'\x{5CBE}\x{5CC5}\x{5CC7}\x{5CD9}\x{5CE0}\x{5CE1}\x{5CE8}\x{5CE9}\x{5CEA}' .
-'\x{5CED}\x{5CEF}\x{5CF0}\x{5CF6}\x{5CFA}\x{5CFB}\x{5CFD}\x{5D07}\x{5D0B}' .
-'\x{5D0E}\x{5D11}\x{5D14}\x{5D15}\x{5D16}\x{5D17}\x{5D18}\x{5D19}\x{5D1A}' .
-'\x{5D1B}\x{5D1F}\x{5D22}\x{5D29}\x{5D4B}\x{5D4C}\x{5D4E}\x{5D50}\x{5D52}' .
-'\x{5D5C}\x{5D69}\x{5D6C}\x{5D6F}\x{5D73}\x{5D76}\x{5D82}\x{5D84}\x{5D87}' .
-'\x{5D8B}\x{5D8C}\x{5D90}\x{5D9D}\x{5DA2}\x{5DAC}\x{5DAE}\x{5DB7}\x{5DBA}' .
-'\x{5DBC}\x{5DBD}\x{5DC9}\x{5DCC}\x{5DCD}\x{5DD2}\x{5DD3}\x{5DD6}\x{5DDB}' .
-'\x{5DDD}\x{5DDE}\x{5DE1}\x{5DE3}\x{5DE5}\x{5DE6}\x{5DE7}\x{5DE8}\x{5DEB}' .
-'\x{5DEE}\x{5DF1}\x{5DF2}\x{5DF3}\x{5DF4}\x{5DF5}\x{5DF7}\x{5DFB}\x{5DFD}' .
-'\x{5DFE}\x{5E02}\x{5E03}\x{5E06}\x{5E0B}\x{5E0C}\x{5E11}\x{5E16}\x{5E19}' .
-'\x{5E1A}\x{5E1B}\x{5E1D}\x{5E25}\x{5E2B}\x{5E2D}\x{5E2F}\x{5E30}\x{5E33}' .
-'\x{5E36}\x{5E37}\x{5E38}\x{5E3D}\x{5E40}\x{5E43}\x{5E44}\x{5E45}\x{5E47}' .
-'\x{5E4C}\x{5E4E}\x{5E54}\x{5E55}\x{5E57}\x{5E5F}\x{5E61}\x{5E62}\x{5E63}' .
-'\x{5E64}\x{5E72}\x{5E73}\x{5E74}\x{5E75}\x{5E76}\x{5E78}\x{5E79}\x{5E7A}' .
-'\x{5E7B}\x{5E7C}\x{5E7D}\x{5E7E}\x{5E7F}\x{5E81}\x{5E83}\x{5E84}\x{5E87}' .
-'\x{5E8A}\x{5E8F}\x{5E95}\x{5E96}\x{5E97}\x{5E9A}\x{5E9C}\x{5EA0}\x{5EA6}' .
-'\x{5EA7}\x{5EAB}\x{5EAD}\x{5EB5}\x{5EB6}\x{5EB7}\x{5EB8}\x{5EC1}\x{5EC2}' .
-'\x{5EC3}\x{5EC8}\x{5EC9}\x{5ECA}\x{5ECF}\x{5ED0}\x{5ED3}\x{5ED6}\x{5EDA}' .
-'\x{5EDB}\x{5EDD}\x{5EDF}\x{5EE0}\x{5EE1}\x{5EE2}\x{5EE3}\x{5EE8}\x{5EE9}' .
-'\x{5EEC}\x{5EF0}\x{5EF1}\x{5EF3}\x{5EF4}\x{5EF6}\x{5EF7}\x{5EF8}\x{5EFA}' .
-'\x{5EFB}\x{5EFC}\x{5EFE}\x{5EFF}\x{5F01}\x{5F03}\x{5F04}\x{5F09}\x{5F0A}' .
-'\x{5F0B}\x{5F0C}\x{5F0D}\x{5F0F}\x{5F10}\x{5F11}\x{5F13}\x{5F14}\x{5F15}' .
-'\x{5F16}\x{5F17}\x{5F18}\x{5F1B}\x{5F1F}\x{5F25}\x{5F26}\x{5F27}\x{5F29}' .
-'\x{5F2D}\x{5F2F}\x{5F31}\x{5F35}\x{5F37}\x{5F38}\x{5F3C}\x{5F3E}\x{5F41}' .
-'\x{5F48}\x{5F4A}\x{5F4C}\x{5F4E}\x{5F51}\x{5F53}\x{5F56}\x{5F57}\x{5F59}' .
-'\x{5F5C}\x{5F5D}\x{5F61}\x{5F62}\x{5F66}\x{5F69}\x{5F6A}\x{5F6B}\x{5F6C}' .
-'\x{5F6D}\x{5F70}\x{5F71}\x{5F73}\x{5F77}\x{5F79}\x{5F7C}\x{5F7F}\x{5F80}' .
-'\x{5F81}\x{5F82}\x{5F83}\x{5F84}\x{5F85}\x{5F87}\x{5F88}\x{5F8A}\x{5F8B}' .
-'\x{5F8C}\x{5F90}\x{5F91}\x{5F92}\x{5F93}\x{5F97}\x{5F98}\x{5F99}\x{5F9E}' .
-'\x{5FA0}\x{5FA1}\x{5FA8}\x{5FA9}\x{5FAA}\x{5FAD}\x{5FAE}\x{5FB3}\x{5FB4}' .
-'\x{5FB9}\x{5FBC}\x{5FBD}\x{5FC3}\x{5FC5}\x{5FCC}\x{5FCD}\x{5FD6}\x{5FD7}' .
-'\x{5FD8}\x{5FD9}\x{5FDC}\x{5FDD}\x{5FE0}\x{5FE4}\x{5FEB}\x{5FF0}\x{5FF1}' .
-'\x{5FF5}\x{5FF8}\x{5FFB}\x{5FFD}\x{5FFF}\x{600E}\x{600F}\x{6010}\x{6012}' .
-'\x{6015}\x{6016}\x{6019}\x{601B}\x{601C}\x{601D}\x{6020}\x{6021}\x{6025}' .
-'\x{6026}\x{6027}\x{6028}\x{6029}\x{602A}\x{602B}\x{602F}\x{6031}\x{603A}' .
-'\x{6041}\x{6042}\x{6043}\x{6046}\x{604A}\x{604B}\x{604D}\x{6050}\x{6052}' .
-'\x{6055}\x{6059}\x{605A}\x{605F}\x{6060}\x{6062}\x{6063}\x{6064}\x{6065}' .
-'\x{6068}\x{6069}\x{606A}\x{606B}\x{606C}\x{606D}\x{606F}\x{6070}\x{6075}' .
-'\x{6077}\x{6081}\x{6083}\x{6084}\x{6089}\x{608B}\x{608C}\x{608D}\x{6092}' .
-'\x{6094}\x{6096}\x{6097}\x{609A}\x{609B}\x{609F}\x{60A0}\x{60A3}\x{60A6}' .
-'\x{60A7}\x{60A9}\x{60AA}\x{60B2}\x{60B3}\x{60B4}\x{60B5}\x{60B6}\x{60B8}' .
-'\x{60BC}\x{60BD}\x{60C5}\x{60C6}\x{60C7}\x{60D1}\x{60D3}\x{60D8}\x{60DA}' .
-'\x{60DC}\x{60DF}\x{60E0}\x{60E1}\x{60E3}\x{60E7}\x{60E8}\x{60F0}\x{60F1}' .
-'\x{60F3}\x{60F4}\x{60F6}\x{60F7}\x{60F9}\x{60FA}\x{60FB}\x{6100}\x{6101}' .
-'\x{6103}\x{6106}\x{6108}\x{6109}\x{610D}\x{610E}\x{610F}\x{6115}\x{611A}' .
-'\x{611B}\x{611F}\x{6121}\x{6127}\x{6128}\x{612C}\x{6134}\x{613C}\x{613D}' .
-'\x{613E}\x{613F}\x{6142}\x{6144}\x{6147}\x{6148}\x{614A}\x{614B}\x{614C}' .
-'\x{614D}\x{614E}\x{6153}\x{6155}\x{6158}\x{6159}\x{615A}\x{615D}\x{615F}' .
-'\x{6162}\x{6163}\x{6165}\x{6167}\x{6168}\x{616B}\x{616E}\x{616F}\x{6170}' .
-'\x{6171}\x{6173}\x{6174}\x{6175}\x{6176}\x{6177}\x{617E}\x{6182}\x{6187}' .
-'\x{618A}\x{618E}\x{6190}\x{6191}\x{6194}\x{6196}\x{6199}\x{619A}\x{61A4}' .
-'\x{61A7}\x{61A9}\x{61AB}\x{61AC}\x{61AE}\x{61B2}\x{61B6}\x{61BA}\x{61BE}' .
-'\x{61C3}\x{61C6}\x{61C7}\x{61C8}\x{61C9}\x{61CA}\x{61CB}\x{61CC}\x{61CD}' .
-'\x{61D0}\x{61E3}\x{61E6}\x{61F2}\x{61F4}\x{61F6}\x{61F7}\x{61F8}\x{61FA}' .
-'\x{61FC}\x{61FD}\x{61FE}\x{61FF}\x{6200}\x{6208}\x{6209}\x{620A}\x{620C}' .
-'\x{620D}\x{620E}\x{6210}\x{6211}\x{6212}\x{6214}\x{6216}\x{621A}\x{621B}' .
-'\x{621D}\x{621E}\x{621F}\x{6221}\x{6226}\x{622A}\x{622E}\x{622F}\x{6230}' .
-'\x{6232}\x{6233}\x{6234}\x{6238}\x{623B}\x{623F}\x{6240}\x{6241}\x{6247}' .
-'\x{6248}\x{6249}\x{624B}\x{624D}\x{624E}\x{6253}\x{6255}\x{6258}\x{625B}' .
-'\x{625E}\x{6260}\x{6263}\x{6268}\x{626E}\x{6271}\x{6276}\x{6279}\x{627C}' .
-'\x{627E}\x{627F}\x{6280}\x{6282}\x{6283}\x{6284}\x{6289}\x{628A}\x{6291}' .
-'\x{6292}\x{6293}\x{6294}\x{6295}\x{6296}\x{6297}\x{6298}\x{629B}\x{629C}' .
-'\x{629E}\x{62AB}\x{62AC}\x{62B1}\x{62B5}\x{62B9}\x{62BB}\x{62BC}\x{62BD}' .
-'\x{62C2}\x{62C5}\x{62C6}\x{62C7}\x{62C8}\x{62C9}\x{62CA}\x{62CC}\x{62CD}' .
-'\x{62CF}\x{62D0}\x{62D1}\x{62D2}\x{62D3}\x{62D4}\x{62D7}\x{62D8}\x{62D9}' .
-'\x{62DB}\x{62DC}\x{62DD}\x{62E0}\x{62E1}\x{62EC}\x{62ED}\x{62EE}\x{62EF}' .
-'\x{62F1}\x{62F3}\x{62F5}\x{62F6}\x{62F7}\x{62FE}\x{62FF}\x{6301}\x{6302}' .
-'\x{6307}\x{6308}\x{6309}\x{630C}\x{6311}\x{6319}\x{631F}\x{6327}\x{6328}' .
-'\x{632B}\x{632F}\x{633A}\x{633D}\x{633E}\x{633F}\x{6349}\x{634C}\x{634D}' .
-'\x{634F}\x{6350}\x{6355}\x{6357}\x{635C}\x{6367}\x{6368}\x{6369}\x{636B}' .
-'\x{636E}\x{6372}\x{6376}\x{6377}\x{637A}\x{637B}\x{6380}\x{6383}\x{6388}' .
-'\x{6389}\x{638C}\x{638E}\x{638F}\x{6392}\x{6396}\x{6398}\x{639B}\x{639F}' .
-'\x{63A0}\x{63A1}\x{63A2}\x{63A3}\x{63A5}\x{63A7}\x{63A8}\x{63A9}\x{63AA}' .
-'\x{63AB}\x{63AC}\x{63B2}\x{63B4}\x{63B5}\x{63BB}\x{63BE}\x{63C0}\x{63C3}' .
-'\x{63C4}\x{63C6}\x{63C9}\x{63CF}\x{63D0}\x{63D2}\x{63D6}\x{63DA}\x{63DB}' .
-'\x{63E1}\x{63E3}\x{63E9}\x{63EE}\x{63F4}\x{63F6}\x{63FA}\x{6406}\x{640D}' .
-'\x{640F}\x{6413}\x{6416}\x{6417}\x{641C}\x{6426}\x{6428}\x{642C}\x{642D}' .
-'\x{6434}\x{6436}\x{643A}\x{643E}\x{6442}\x{644E}\x{6458}\x{6467}\x{6469}' .
-'\x{646F}\x{6476}\x{6478}\x{647A}\x{6483}\x{6488}\x{6492}\x{6493}\x{6495}' .
-'\x{649A}\x{649E}\x{64A4}\x{64A5}\x{64A9}\x{64AB}\x{64AD}\x{64AE}\x{64B0}' .
-'\x{64B2}\x{64B9}\x{64BB}\x{64BC}\x{64C1}\x{64C2}\x{64C5}\x{64C7}\x{64CD}' .
-'\x{64D2}\x{64D4}\x{64D8}\x{64DA}\x{64E0}\x{64E1}\x{64E2}\x{64E3}\x{64E6}' .
-'\x{64E7}\x{64EC}\x{64EF}\x{64F1}\x{64F2}\x{64F4}\x{64F6}\x{64FA}\x{64FD}' .
-'\x{64FE}\x{6500}\x{6505}\x{6518}\x{651C}\x{651D}\x{6523}\x{6524}\x{652A}' .
-'\x{652B}\x{652C}\x{652F}\x{6534}\x{6535}\x{6536}\x{6537}\x{6538}\x{6539}' .
-'\x{653B}\x{653E}\x{653F}\x{6545}\x{6548}\x{654D}\x{654F}\x{6551}\x{6555}' .
-'\x{6556}\x{6557}\x{6558}\x{6559}\x{655D}\x{655E}\x{6562}\x{6563}\x{6566}' .
-'\x{656C}\x{6570}\x{6572}\x{6574}\x{6575}\x{6577}\x{6578}\x{6582}\x{6583}' .
-'\x{6587}\x{6588}\x{6589}\x{658C}\x{658E}\x{6590}\x{6591}\x{6597}\x{6599}' .
-'\x{659B}\x{659C}\x{659F}\x{65A1}\x{65A4}\x{65A5}\x{65A7}\x{65AB}\x{65AC}' .
-'\x{65AD}\x{65AF}\x{65B0}\x{65B7}\x{65B9}\x{65BC}\x{65BD}\x{65C1}\x{65C3}' .
-'\x{65C4}\x{65C5}\x{65C6}\x{65CB}\x{65CC}\x{65CF}\x{65D2}\x{65D7}\x{65D9}' .
-'\x{65DB}\x{65E0}\x{65E1}\x{65E2}\x{65E5}\x{65E6}\x{65E7}\x{65E8}\x{65E9}' .
-'\x{65EC}\x{65ED}\x{65F1}\x{65FA}\x{65FB}\x{6602}\x{6603}\x{6606}\x{6607}' .
-'\x{660A}\x{660C}\x{660E}\x{660F}\x{6613}\x{6614}\x{661C}\x{661F}\x{6620}' .
-'\x{6625}\x{6627}\x{6628}\x{662D}\x{662F}\x{6634}\x{6635}\x{6636}\x{663C}' .
-'\x{663F}\x{6641}\x{6642}\x{6643}\x{6644}\x{6649}\x{664B}\x{664F}\x{6652}' .
-'\x{665D}\x{665E}\x{665F}\x{6662}\x{6664}\x{6666}\x{6667}\x{6668}\x{6669}' .
-'\x{666E}\x{666F}\x{6670}\x{6674}\x{6676}\x{667A}\x{6681}\x{6683}\x{6684}' .
-'\x{6687}\x{6688}\x{6689}\x{668E}\x{6691}\x{6696}\x{6697}\x{6698}\x{669D}' .
-'\x{66A2}\x{66A6}\x{66AB}\x{66AE}\x{66B4}\x{66B8}\x{66B9}\x{66BC}\x{66BE}' .
-'\x{66C1}\x{66C4}\x{66C7}\x{66C9}\x{66D6}\x{66D9}\x{66DA}\x{66DC}\x{66DD}' .
-'\x{66E0}\x{66E6}\x{66E9}\x{66F0}\x{66F2}\x{66F3}\x{66F4}\x{66F5}\x{66F7}' .
-'\x{66F8}\x{66F9}\x{66FC}\x{66FD}\x{66FE}\x{66FF}\x{6700}\x{6703}\x{6708}' .
-'\x{6709}\x{670B}\x{670D}\x{670F}\x{6714}\x{6715}\x{6716}\x{6717}\x{671B}' .
-'\x{671D}\x{671E}\x{671F}\x{6726}\x{6727}\x{6728}\x{672A}\x{672B}\x{672C}' .
-'\x{672D}\x{672E}\x{6731}\x{6734}\x{6736}\x{6737}\x{6738}\x{673A}\x{673D}' .
-'\x{673F}\x{6741}\x{6746}\x{6749}\x{674E}\x{674F}\x{6750}\x{6751}\x{6753}' .
-'\x{6756}\x{6759}\x{675C}\x{675E}\x{675F}\x{6760}\x{6761}\x{6762}\x{6763}' .
-'\x{6764}\x{6765}\x{676A}\x{676D}\x{676F}\x{6770}\x{6771}\x{6772}\x{6773}' .
-'\x{6775}\x{6777}\x{677C}\x{677E}\x{677F}\x{6785}\x{6787}\x{6789}\x{678B}' .
-'\x{678C}\x{6790}\x{6795}\x{6797}\x{679A}\x{679C}\x{679D}\x{67A0}\x{67A1}' .
-'\x{67A2}\x{67A6}\x{67A9}\x{67AF}\x{67B3}\x{67B4}\x{67B6}\x{67B7}\x{67B8}' .
-'\x{67B9}\x{67C1}\x{67C4}\x{67C6}\x{67CA}\x{67CE}\x{67CF}\x{67D0}\x{67D1}' .
-'\x{67D3}\x{67D4}\x{67D8}\x{67DA}\x{67DD}\x{67DE}\x{67E2}\x{67E4}\x{67E7}' .
-'\x{67E9}\x{67EC}\x{67EE}\x{67EF}\x{67F1}\x{67F3}\x{67F4}\x{67F5}\x{67FB}' .
-'\x{67FE}\x{67FF}\x{6802}\x{6803}\x{6804}\x{6813}\x{6816}\x{6817}\x{681E}' .
-'\x{6821}\x{6822}\x{6829}\x{682A}\x{682B}\x{6832}\x{6834}\x{6838}\x{6839}' .
-'\x{683C}\x{683D}\x{6840}\x{6841}\x{6842}\x{6843}\x{6846}\x{6848}\x{684D}' .
-'\x{684E}\x{6850}\x{6851}\x{6853}\x{6854}\x{6859}\x{685C}\x{685D}\x{685F}' .
-'\x{6863}\x{6867}\x{6874}\x{6876}\x{6877}\x{687E}\x{687F}\x{6881}\x{6883}' .
-'\x{6885}\x{688D}\x{688F}\x{6893}\x{6894}\x{6897}\x{689B}\x{689D}\x{689F}' .
-'\x{68A0}\x{68A2}\x{68A6}\x{68A7}\x{68A8}\x{68AD}\x{68AF}\x{68B0}\x{68B1}' .
-'\x{68B3}\x{68B5}\x{68B6}\x{68B9}\x{68BA}\x{68BC}\x{68C4}\x{68C6}\x{68C9}' .
-'\x{68CA}\x{68CB}\x{68CD}\x{68D2}\x{68D4}\x{68D5}\x{68D7}\x{68D8}\x{68DA}' .
-'\x{68DF}\x{68E0}\x{68E1}\x{68E3}\x{68E7}\x{68EE}\x{68EF}\x{68F2}\x{68F9}' .
-'\x{68FA}\x{6900}\x{6901}\x{6904}\x{6905}\x{6908}\x{690B}\x{690C}\x{690D}' .
-'\x{690E}\x{690F}\x{6912}\x{6919}\x{691A}\x{691B}\x{691C}\x{6921}\x{6922}' .
-'\x{6923}\x{6925}\x{6926}\x{6928}\x{692A}\x{6930}\x{6934}\x{6936}\x{6939}' .
-'\x{693D}\x{693F}\x{694A}\x{6953}\x{6954}\x{6955}\x{6959}\x{695A}\x{695C}' .
-'\x{695D}\x{695E}\x{6960}\x{6961}\x{6962}\x{696A}\x{696B}\x{696D}\x{696E}' .
-'\x{696F}\x{6973}\x{6974}\x{6975}\x{6977}\x{6978}\x{6979}\x{697C}\x{697D}' .
-'\x{697E}\x{6981}\x{6982}\x{698A}\x{698E}\x{6991}\x{6994}\x{6995}\x{699B}' .
-'\x{699C}\x{69A0}\x{69A7}\x{69AE}\x{69B1}\x{69B2}\x{69B4}\x{69BB}\x{69BE}' .
-'\x{69BF}\x{69C1}\x{69C3}\x{69C7}\x{69CA}\x{69CB}\x{69CC}\x{69CD}\x{69CE}' .
-'\x{69D0}\x{69D3}\x{69D8}\x{69D9}\x{69DD}\x{69DE}\x{69E7}\x{69E8}\x{69EB}' .
-'\x{69ED}\x{69F2}\x{69F9}\x{69FB}\x{69FD}\x{69FF}\x{6A02}\x{6A05}\x{6A0A}' .
-'\x{6A0B}\x{6A0C}\x{6A12}\x{6A13}\x{6A14}\x{6A17}\x{6A19}\x{6A1B}\x{6A1E}' .
-'\x{6A1F}\x{6A21}\x{6A22}\x{6A23}\x{6A29}\x{6A2A}\x{6A2B}\x{6A2E}\x{6A35}' .
-'\x{6A36}\x{6A38}\x{6A39}\x{6A3A}\x{6A3D}\x{6A44}\x{6A47}\x{6A48}\x{6A4B}' .
-'\x{6A58}\x{6A59}\x{6A5F}\x{6A61}\x{6A62}\x{6A66}\x{6A72}\x{6A78}\x{6A7F}' .
-'\x{6A80}\x{6A84}\x{6A8D}\x{6A8E}\x{6A90}\x{6A97}\x{6A9C}\x{6AA0}\x{6AA2}' .
-'\x{6AA3}\x{6AAA}\x{6AAC}\x{6AAE}\x{6AB3}\x{6AB8}\x{6ABB}\x{6AC1}\x{6AC2}' .
-'\x{6AC3}\x{6AD1}\x{6AD3}\x{6ADA}\x{6ADB}\x{6ADE}\x{6ADF}\x{6AE8}\x{6AEA}' .
-'\x{6AFA}\x{6AFB}\x{6B04}\x{6B05}\x{6B0A}\x{6B12}\x{6B16}\x{6B1D}\x{6B1F}' .
-'\x{6B20}\x{6B21}\x{6B23}\x{6B27}\x{6B32}\x{6B37}\x{6B38}\x{6B39}\x{6B3A}' .
-'\x{6B3D}\x{6B3E}\x{6B43}\x{6B47}\x{6B49}\x{6B4C}\x{6B4E}\x{6B50}\x{6B53}' .
-'\x{6B54}\x{6B59}\x{6B5B}\x{6B5F}\x{6B61}\x{6B62}\x{6B63}\x{6B64}\x{6B66}' .
-'\x{6B69}\x{6B6A}\x{6B6F}\x{6B73}\x{6B74}\x{6B78}\x{6B79}\x{6B7B}\x{6B7F}' .
-'\x{6B80}\x{6B83}\x{6B84}\x{6B86}\x{6B89}\x{6B8A}\x{6B8B}\x{6B8D}\x{6B95}' .
-'\x{6B96}\x{6B98}\x{6B9E}\x{6BA4}\x{6BAA}\x{6BAB}\x{6BAF}\x{6BB1}\x{6BB2}' .
-'\x{6BB3}\x{6BB4}\x{6BB5}\x{6BB7}\x{6BBA}\x{6BBB}\x{6BBC}\x{6BBF}\x{6BC0}' .
-'\x{6BC5}\x{6BC6}\x{6BCB}\x{6BCD}\x{6BCE}\x{6BD2}\x{6BD3}\x{6BD4}\x{6BD8}' .
-'\x{6BDB}\x{6BDF}\x{6BEB}\x{6BEC}\x{6BEF}\x{6BF3}\x{6C08}\x{6C0F}\x{6C11}' .
-'\x{6C13}\x{6C14}\x{6C17}\x{6C1B}\x{6C23}\x{6C24}\x{6C34}\x{6C37}\x{6C38}' .
-'\x{6C3E}\x{6C40}\x{6C41}\x{6C42}\x{6C4E}\x{6C50}\x{6C55}\x{6C57}\x{6C5A}' .
-'\x{6C5D}\x{6C5E}\x{6C5F}\x{6C60}\x{6C62}\x{6C68}\x{6C6A}\x{6C70}\x{6C72}' .
-'\x{6C73}\x{6C7A}\x{6C7D}\x{6C7E}\x{6C81}\x{6C82}\x{6C83}\x{6C88}\x{6C8C}' .
-'\x{6C8D}\x{6C90}\x{6C92}\x{6C93}\x{6C96}\x{6C99}\x{6C9A}\x{6C9B}\x{6CA1}' .
-'\x{6CA2}\x{6CAB}\x{6CAE}\x{6CB1}\x{6CB3}\x{6CB8}\x{6CB9}\x{6CBA}\x{6CBB}' .
-'\x{6CBC}\x{6CBD}\x{6CBE}\x{6CBF}\x{6CC1}\x{6CC4}\x{6CC5}\x{6CC9}\x{6CCA}' .
-'\x{6CCC}\x{6CD3}\x{6CD5}\x{6CD7}\x{6CD9}\x{6CDB}\x{6CDD}\x{6CE1}\x{6CE2}' .
-'\x{6CE3}\x{6CE5}\x{6CE8}\x{6CEA}\x{6CEF}\x{6CF0}\x{6CF1}\x{6CF3}\x{6D0B}' .
-'\x{6D0C}\x{6D12}\x{6D17}\x{6D19}\x{6D1B}\x{6D1E}\x{6D1F}\x{6D25}\x{6D29}' .
-'\x{6D2A}\x{6D2B}\x{6D32}\x{6D33}\x{6D35}\x{6D36}\x{6D38}\x{6D3B}\x{6D3D}' .
-'\x{6D3E}\x{6D41}\x{6D44}\x{6D45}\x{6D59}\x{6D5A}\x{6D5C}\x{6D63}\x{6D64}' .
-'\x{6D66}\x{6D69}\x{6D6A}\x{6D6C}\x{6D6E}\x{6D74}\x{6D77}\x{6D78}\x{6D79}' .
-'\x{6D85}\x{6D88}\x{6D8C}\x{6D8E}\x{6D93}\x{6D95}\x{6D99}\x{6D9B}\x{6D9C}' .
-'\x{6DAF}\x{6DB2}\x{6DB5}\x{6DB8}\x{6DBC}\x{6DC0}\x{6DC5}\x{6DC6}\x{6DC7}' .
-'\x{6DCB}\x{6DCC}\x{6DD1}\x{6DD2}\x{6DD5}\x{6DD8}\x{6DD9}\x{6DDE}\x{6DE1}' .
-'\x{6DE4}\x{6DE6}\x{6DE8}\x{6DEA}\x{6DEB}\x{6DEC}\x{6DEE}\x{6DF1}\x{6DF3}' .
-'\x{6DF5}\x{6DF7}\x{6DF9}\x{6DFA}\x{6DFB}\x{6E05}\x{6E07}\x{6E08}\x{6E09}' .
-'\x{6E0A}\x{6E0B}\x{6E13}\x{6E15}\x{6E19}\x{6E1A}\x{6E1B}\x{6E1D}\x{6E1F}' .
-'\x{6E20}\x{6E21}\x{6E23}\x{6E24}\x{6E25}\x{6E26}\x{6E29}\x{6E2B}\x{6E2C}' .
-'\x{6E2D}\x{6E2E}\x{6E2F}\x{6E38}\x{6E3A}\x{6E3E}\x{6E43}\x{6E4A}\x{6E4D}' .
-'\x{6E4E}\x{6E56}\x{6E58}\x{6E5B}\x{6E5F}\x{6E67}\x{6E6B}\x{6E6E}\x{6E6F}' .
-'\x{6E72}\x{6E76}\x{6E7E}\x{6E7F}\x{6E80}\x{6E82}\x{6E8C}\x{6E8F}\x{6E90}' .
-'\x{6E96}\x{6E98}\x{6E9C}\x{6E9D}\x{6E9F}\x{6EA2}\x{6EA5}\x{6EAA}\x{6EAF}' .
-'\x{6EB2}\x{6EB6}\x{6EB7}\x{6EBA}\x{6EBD}\x{6EC2}\x{6EC4}\x{6EC5}\x{6EC9}' .
-'\x{6ECB}\x{6ECC}\x{6ED1}\x{6ED3}\x{6ED4}\x{6ED5}\x{6EDD}\x{6EDE}\x{6EEC}' .
-'\x{6EEF}\x{6EF2}\x{6EF4}\x{6EF7}\x{6EF8}\x{6EFE}\x{6EFF}\x{6F01}\x{6F02}' .
-'\x{6F06}\x{6F09}\x{6F0F}\x{6F11}\x{6F13}\x{6F14}\x{6F15}\x{6F20}\x{6F22}' .
-'\x{6F23}\x{6F2B}\x{6F2C}\x{6F31}\x{6F32}\x{6F38}\x{6F3E}\x{6F3F}\x{6F41}' .
-'\x{6F45}\x{6F54}\x{6F58}\x{6F5B}\x{6F5C}\x{6F5F}\x{6F64}\x{6F66}\x{6F6D}' .
-'\x{6F6E}\x{6F6F}\x{6F70}\x{6F74}\x{6F78}\x{6F7A}\x{6F7C}\x{6F80}\x{6F81}' .
-'\x{6F82}\x{6F84}\x{6F86}\x{6F8E}\x{6F91}\x{6F97}\x{6FA1}\x{6FA3}\x{6FA4}' .
-'\x{6FAA}\x{6FB1}\x{6FB3}\x{6FB9}\x{6FC0}\x{6FC1}\x{6FC2}\x{6FC3}\x{6FC6}' .
-'\x{6FD4}\x{6FD5}\x{6FD8}\x{6FDB}\x{6FDF}\x{6FE0}\x{6FE1}\x{6FE4}\x{6FEB}' .
-'\x{6FEC}\x{6FEE}\x{6FEF}\x{6FF1}\x{6FF3}\x{6FF6}\x{6FFA}\x{6FFE}\x{7001}' .
-'\x{7009}\x{700B}\x{700F}\x{7011}\x{7015}\x{7018}\x{701A}\x{701B}\x{701D}' .
-'\x{701E}\x{701F}\x{7026}\x{7027}\x{702C}\x{7030}\x{7032}\x{703E}\x{704C}' .
-'\x{7051}\x{7058}\x{7063}\x{706B}\x{706F}\x{7070}\x{7078}\x{707C}\x{707D}' .
-'\x{7089}\x{708A}\x{708E}\x{7092}\x{7099}\x{70AC}\x{70AD}\x{70AE}\x{70AF}' .
-'\x{70B3}\x{70B8}\x{70B9}\x{70BA}\x{70C8}\x{70CB}\x{70CF}\x{70D9}\x{70DD}' .
-'\x{70DF}\x{70F1}\x{70F9}\x{70FD}\x{7109}\x{7114}\x{7119}\x{711A}\x{711C}' .
-'\x{7121}\x{7126}\x{7136}\x{713C}\x{7149}\x{714C}\x{714E}\x{7155}\x{7156}' .
-'\x{7159}\x{7162}\x{7164}\x{7165}\x{7166}\x{7167}\x{7169}\x{716C}\x{716E}' .
-'\x{717D}\x{7184}\x{7188}\x{718A}\x{718F}\x{7194}\x{7195}\x{7199}\x{719F}' .
-'\x{71A8}\x{71AC}\x{71B1}\x{71B9}\x{71BE}\x{71C3}\x{71C8}\x{71C9}\x{71CE}' .
-'\x{71D0}\x{71D2}\x{71D4}\x{71D5}\x{71D7}\x{71DF}\x{71E0}\x{71E5}\x{71E6}' .
-'\x{71E7}\x{71EC}\x{71ED}\x{71EE}\x{71F5}\x{71F9}\x{71FB}\x{71FC}\x{71FF}' .
-'\x{7206}\x{720D}\x{7210}\x{721B}\x{7228}\x{722A}\x{722C}\x{722D}\x{7230}' .
-'\x{7232}\x{7235}\x{7236}\x{723A}\x{723B}\x{723C}\x{723D}\x{723E}\x{723F}' .
-'\x{7240}\x{7246}\x{7247}\x{7248}\x{724B}\x{724C}\x{7252}\x{7258}\x{7259}' .
-'\x{725B}\x{725D}\x{725F}\x{7261}\x{7262}\x{7267}\x{7269}\x{7272}\x{7274}' .
-'\x{7279}\x{727D}\x{727E}\x{7280}\x{7281}\x{7282}\x{7287}\x{7292}\x{7296}' .
-'\x{72A0}\x{72A2}\x{72A7}\x{72AC}\x{72AF}\x{72B2}\x{72B6}\x{72B9}\x{72C2}' .
-'\x{72C3}\x{72C4}\x{72C6}\x{72CE}\x{72D0}\x{72D2}\x{72D7}\x{72D9}\x{72DB}' .
-'\x{72E0}\x{72E1}\x{72E2}\x{72E9}\x{72EC}\x{72ED}\x{72F7}\x{72F8}\x{72F9}' .
-'\x{72FC}\x{72FD}\x{730A}\x{7316}\x{7317}\x{731B}\x{731C}\x{731D}\x{731F}' .
-'\x{7325}\x{7329}\x{732A}\x{732B}\x{732E}\x{732F}\x{7334}\x{7336}\x{7337}' .
-'\x{733E}\x{733F}\x{7344}\x{7345}\x{734E}\x{734F}\x{7357}\x{7363}\x{7368}' .
-'\x{736A}\x{7370}\x{7372}\x{7375}\x{7378}\x{737A}\x{737B}\x{7384}\x{7387}' .
-'\x{7389}\x{738B}\x{7396}\x{73A9}\x{73B2}\x{73B3}\x{73BB}\x{73C0}\x{73C2}' .
-'\x{73C8}\x{73CA}\x{73CD}\x{73CE}\x{73DE}\x{73E0}\x{73E5}\x{73EA}\x{73ED}' .
-'\x{73EE}\x{73F1}\x{73F8}\x{73FE}\x{7403}\x{7405}\x{7406}\x{7409}\x{7422}' .
-'\x{7425}\x{7432}\x{7433}\x{7434}\x{7435}\x{7436}\x{743A}\x{743F}\x{7441}' .
-'\x{7455}\x{7459}\x{745A}\x{745B}\x{745C}\x{745E}\x{745F}\x{7460}\x{7463}' .
-'\x{7464}\x{7469}\x{746A}\x{746F}\x{7470}\x{7473}\x{7476}\x{747E}\x{7483}' .
-'\x{748B}\x{749E}\x{74A2}\x{74A7}\x{74B0}\x{74BD}\x{74CA}\x{74CF}\x{74D4}' .
-'\x{74DC}\x{74E0}\x{74E2}\x{74E3}\x{74E6}\x{74E7}\x{74E9}\x{74EE}\x{74F0}' .
-'\x{74F1}\x{74F2}\x{74F6}\x{74F7}\x{74F8}\x{7503}\x{7504}\x{7505}\x{750C}' .
-'\x{750D}\x{750E}\x{7511}\x{7513}\x{7515}\x{7518}\x{751A}\x{751C}\x{751E}' .
-'\x{751F}\x{7523}\x{7525}\x{7526}\x{7528}\x{752B}\x{752C}\x{7530}\x{7531}' .
-'\x{7532}\x{7533}\x{7537}\x{7538}\x{753A}\x{753B}\x{753C}\x{7544}\x{7546}' .
-'\x{7549}\x{754A}\x{754B}\x{754C}\x{754D}\x{754F}\x{7551}\x{7554}\x{7559}' .
-'\x{755A}\x{755B}\x{755C}\x{755D}\x{7560}\x{7562}\x{7564}\x{7565}\x{7566}' .
-'\x{7567}\x{7569}\x{756A}\x{756B}\x{756D}\x{7570}\x{7573}\x{7574}\x{7576}' .
-'\x{7577}\x{7578}\x{757F}\x{7582}\x{7586}\x{7587}\x{7589}\x{758A}\x{758B}' .
-'\x{758E}\x{758F}\x{7591}\x{7594}\x{759A}\x{759D}\x{75A3}\x{75A5}\x{75AB}' .
-'\x{75B1}\x{75B2}\x{75B3}\x{75B5}\x{75B8}\x{75B9}\x{75BC}\x{75BD}\x{75BE}' .
-'\x{75C2}\x{75C3}\x{75C5}\x{75C7}\x{75CA}\x{75CD}\x{75D2}\x{75D4}\x{75D5}' .
-'\x{75D8}\x{75D9}\x{75DB}\x{75DE}\x{75E2}\x{75E3}\x{75E9}\x{75F0}\x{75F2}' .
-'\x{75F3}\x{75F4}\x{75FA}\x{75FC}\x{75FE}\x{75FF}\x{7601}\x{7609}\x{760B}' .
-'\x{760D}\x{761F}\x{7620}\x{7621}\x{7622}\x{7624}\x{7627}\x{7630}\x{7634}' .
-'\x{763B}\x{7642}\x{7646}\x{7647}\x{7648}\x{764C}\x{7652}\x{7656}\x{7658}' .
-'\x{765C}\x{7661}\x{7662}\x{7667}\x{7668}\x{7669}\x{766A}\x{766C}\x{7670}' .
-'\x{7672}\x{7676}\x{7678}\x{767A}\x{767B}\x{767C}\x{767D}\x{767E}\x{7680}' .
-'\x{7683}\x{7684}\x{7686}\x{7687}\x{7688}\x{768B}\x{768E}\x{7690}\x{7693}' .
-'\x{7696}\x{7699}\x{769A}\x{76AE}\x{76B0}\x{76B4}\x{76B7}\x{76B8}\x{76B9}' .
-'\x{76BA}\x{76BF}\x{76C2}\x{76C3}\x{76C6}\x{76C8}\x{76CA}\x{76CD}\x{76D2}' .
-'\x{76D6}\x{76D7}\x{76DB}\x{76DC}\x{76DE}\x{76DF}\x{76E1}\x{76E3}\x{76E4}' .
-'\x{76E5}\x{76E7}\x{76EA}\x{76EE}\x{76F2}\x{76F4}\x{76F8}\x{76FB}\x{76FE}' .
-'\x{7701}\x{7704}\x{7707}\x{7708}\x{7709}\x{770B}\x{770C}\x{771B}\x{771E}' .
-'\x{771F}\x{7720}\x{7724}\x{7725}\x{7726}\x{7729}\x{7737}\x{7738}\x{773A}' .
-'\x{773C}\x{7740}\x{7747}\x{775A}\x{775B}\x{7761}\x{7763}\x{7765}\x{7766}' .
-'\x{7768}\x{776B}\x{7779}\x{777E}\x{777F}\x{778B}\x{778E}\x{7791}\x{779E}' .
-'\x{77A0}\x{77A5}\x{77AC}\x{77AD}\x{77B0}\x{77B3}\x{77B6}\x{77B9}\x{77BB}' .
-'\x{77BC}\x{77BD}\x{77BF}\x{77C7}\x{77CD}\x{77D7}\x{77DA}\x{77DB}\x{77DC}' .
-'\x{77E2}\x{77E3}\x{77E5}\x{77E7}\x{77E9}\x{77ED}\x{77EE}\x{77EF}\x{77F3}' .
-'\x{77FC}\x{7802}\x{780C}\x{7812}\x{7814}\x{7815}\x{7820}\x{7825}\x{7826}' .
-'\x{7827}\x{7832}\x{7834}\x{783A}\x{783F}\x{7845}\x{785D}\x{786B}\x{786C}' .
-'\x{786F}\x{7872}\x{7874}\x{787C}\x{7881}\x{7886}\x{7887}\x{788C}\x{788D}' .
-'\x{788E}\x{7891}\x{7893}\x{7895}\x{7897}\x{789A}\x{78A3}\x{78A7}\x{78A9}' .
-'\x{78AA}\x{78AF}\x{78B5}\x{78BA}\x{78BC}\x{78BE}\x{78C1}\x{78C5}\x{78C6}' .
-'\x{78CA}\x{78CB}\x{78D0}\x{78D1}\x{78D4}\x{78DA}\x{78E7}\x{78E8}\x{78EC}' .
-'\x{78EF}\x{78F4}\x{78FD}\x{7901}\x{7907}\x{790E}\x{7911}\x{7912}\x{7919}' .
-'\x{7926}\x{792A}\x{792B}\x{792C}\x{793A}\x{793C}\x{793E}\x{7940}\x{7941}' .
-'\x{7947}\x{7948}\x{7949}\x{7950}\x{7953}\x{7955}\x{7956}\x{7957}\x{795A}' .
-'\x{795D}\x{795E}\x{795F}\x{7960}\x{7962}\x{7965}\x{7968}\x{796D}\x{7977}' .
-'\x{797A}\x{797F}\x{7980}\x{7981}\x{7984}\x{7985}\x{798A}\x{798D}\x{798E}' .
-'\x{798F}\x{799D}\x{79A6}\x{79A7}\x{79AA}\x{79AE}\x{79B0}\x{79B3}\x{79B9}' .
-'\x{79BA}\x{79BD}\x{79BE}\x{79BF}\x{79C0}\x{79C1}\x{79C9}\x{79CB}\x{79D1}' .
-'\x{79D2}\x{79D5}\x{79D8}\x{79DF}\x{79E1}\x{79E3}\x{79E4}\x{79E6}\x{79E7}' .
-'\x{79E9}\x{79EC}\x{79F0}\x{79FB}\x{7A00}\x{7A08}\x{7A0B}\x{7A0D}\x{7A0E}' .
-'\x{7A14}\x{7A17}\x{7A18}\x{7A19}\x{7A1A}\x{7A1C}\x{7A1F}\x{7A20}\x{7A2E}' .
-'\x{7A31}\x{7A32}\x{7A37}\x{7A3B}\x{7A3C}\x{7A3D}\x{7A3E}\x{7A3F}\x{7A40}' .
-'\x{7A42}\x{7A43}\x{7A46}\x{7A49}\x{7A4D}\x{7A4E}\x{7A4F}\x{7A50}\x{7A57}' .
-'\x{7A61}\x{7A62}\x{7A63}\x{7A69}\x{7A6B}\x{7A70}\x{7A74}\x{7A76}\x{7A79}' .
-'\x{7A7A}\x{7A7D}\x{7A7F}\x{7A81}\x{7A83}\x{7A84}\x{7A88}\x{7A92}\x{7A93}' .
-'\x{7A95}\x{7A96}\x{7A97}\x{7A98}\x{7A9F}\x{7AA9}\x{7AAA}\x{7AAE}\x{7AAF}' .
-'\x{7AB0}\x{7AB6}\x{7ABA}\x{7ABF}\x{7AC3}\x{7AC4}\x{7AC5}\x{7AC7}\x{7AC8}' .
-'\x{7ACA}\x{7ACB}\x{7ACD}\x{7ACF}\x{7AD2}\x{7AD3}\x{7AD5}\x{7AD9}\x{7ADA}' .
-'\x{7ADC}\x{7ADD}\x{7ADF}\x{7AE0}\x{7AE1}\x{7AE2}\x{7AE3}\x{7AE5}\x{7AE6}' .
-'\x{7AEA}\x{7AED}\x{7AEF}\x{7AF0}\x{7AF6}\x{7AF8}\x{7AF9}\x{7AFA}\x{7AFF}' .
-'\x{7B02}\x{7B04}\x{7B06}\x{7B08}\x{7B0A}\x{7B0B}\x{7B0F}\x{7B11}\x{7B18}' .
-'\x{7B19}\x{7B1B}\x{7B1E}\x{7B20}\x{7B25}\x{7B26}\x{7B28}\x{7B2C}\x{7B33}' .
-'\x{7B35}\x{7B36}\x{7B39}\x{7B45}\x{7B46}\x{7B48}\x{7B49}\x{7B4B}\x{7B4C}' .
-'\x{7B4D}\x{7B4F}\x{7B50}\x{7B51}\x{7B52}\x{7B54}\x{7B56}\x{7B5D}\x{7B65}' .
-'\x{7B67}\x{7B6C}\x{7B6E}\x{7B70}\x{7B71}\x{7B74}\x{7B75}\x{7B7A}\x{7B86}' .
-'\x{7B87}\x{7B8B}\x{7B8D}\x{7B8F}\x{7B92}\x{7B94}\x{7B95}\x{7B97}\x{7B98}' .
-'\x{7B99}\x{7B9A}\x{7B9C}\x{7B9D}\x{7B9F}\x{7BA1}\x{7BAA}\x{7BAD}\x{7BB1}' .
-'\x{7BB4}\x{7BB8}\x{7BC0}\x{7BC1}\x{7BC4}\x{7BC6}\x{7BC7}\x{7BC9}\x{7BCB}' .
-'\x{7BCC}\x{7BCF}\x{7BDD}\x{7BE0}\x{7BE4}\x{7BE5}\x{7BE6}\x{7BE9}\x{7BED}' .
-'\x{7BF3}\x{7BF6}\x{7BF7}\x{7C00}\x{7C07}\x{7C0D}\x{7C11}\x{7C12}\x{7C13}' .
-'\x{7C14}\x{7C17}\x{7C1F}\x{7C21}\x{7C23}\x{7C27}\x{7C2A}\x{7C2B}\x{7C37}' .
-'\x{7C38}\x{7C3D}\x{7C3E}\x{7C3F}\x{7C40}\x{7C43}\x{7C4C}\x{7C4D}\x{7C4F}' .
-'\x{7C50}\x{7C54}\x{7C56}\x{7C58}\x{7C5F}\x{7C60}\x{7C64}\x{7C65}\x{7C6C}' .
-'\x{7C73}\x{7C75}\x{7C7E}\x{7C81}\x{7C82}\x{7C83}\x{7C89}\x{7C8B}\x{7C8D}' .
-'\x{7C90}\x{7C92}\x{7C95}\x{7C97}\x{7C98}\x{7C9B}\x{7C9F}\x{7CA1}\x{7CA2}' .
-'\x{7CA4}\x{7CA5}\x{7CA7}\x{7CA8}\x{7CAB}\x{7CAD}\x{7CAE}\x{7CB1}\x{7CB2}' .
-'\x{7CB3}\x{7CB9}\x{7CBD}\x{7CBE}\x{7CC0}\x{7CC2}\x{7CC5}\x{7CCA}\x{7CCE}' .
-'\x{7CD2}\x{7CD6}\x{7CD8}\x{7CDC}\x{7CDE}\x{7CDF}\x{7CE0}\x{7CE2}\x{7CE7}' .
-'\x{7CEF}\x{7CF2}\x{7CF4}\x{7CF6}\x{7CF8}\x{7CFA}\x{7CFB}\x{7CFE}\x{7D00}' .
-'\x{7D02}\x{7D04}\x{7D05}\x{7D06}\x{7D0A}\x{7D0B}\x{7D0D}\x{7D10}\x{7D14}' .
-'\x{7D15}\x{7D17}\x{7D18}\x{7D19}\x{7D1A}\x{7D1B}\x{7D1C}\x{7D20}\x{7D21}' .
-'\x{7D22}\x{7D2B}\x{7D2C}\x{7D2E}\x{7D2F}\x{7D30}\x{7D32}\x{7D33}\x{7D35}' .
-'\x{7D39}\x{7D3A}\x{7D3F}\x{7D42}\x{7D43}\x{7D44}\x{7D45}\x{7D46}\x{7D4B}' .
-'\x{7D4C}\x{7D4E}\x{7D4F}\x{7D50}\x{7D56}\x{7D5B}\x{7D5E}\x{7D61}\x{7D62}' .
-'\x{7D63}\x{7D66}\x{7D68}\x{7D6E}\x{7D71}\x{7D72}\x{7D73}\x{7D75}\x{7D76}' .
-'\x{7D79}\x{7D7D}\x{7D89}\x{7D8F}\x{7D93}\x{7D99}\x{7D9A}\x{7D9B}\x{7D9C}' .
-'\x{7D9F}\x{7DA2}\x{7DA3}\x{7DAB}\x{7DAC}\x{7DAD}\x{7DAE}\x{7DAF}\x{7DB0}' .
-'\x{7DB1}\x{7DB2}\x{7DB4}\x{7DB5}\x{7DB8}\x{7DBA}\x{7DBB}\x{7DBD}\x{7DBE}' .
-'\x{7DBF}\x{7DC7}\x{7DCA}\x{7DCB}\x{7DCF}\x{7DD1}\x{7DD2}\x{7DD5}\x{7DD8}' .
-'\x{7DDA}\x{7DDC}\x{7DDD}\x{7DDE}\x{7DE0}\x{7DE1}\x{7DE4}\x{7DE8}\x{7DE9}' .
-'\x{7DEC}\x{7DEF}\x{7DF2}\x{7DF4}\x{7DFB}\x{7E01}\x{7E04}\x{7E05}\x{7E09}' .
-'\x{7E0A}\x{7E0B}\x{7E12}\x{7E1B}\x{7E1E}\x{7E1F}\x{7E21}\x{7E22}\x{7E23}' .
-'\x{7E26}\x{7E2B}\x{7E2E}\x{7E31}\x{7E32}\x{7E35}\x{7E37}\x{7E39}\x{7E3A}' .
-'\x{7E3B}\x{7E3D}\x{7E3E}\x{7E41}\x{7E43}\x{7E46}\x{7E4A}\x{7E4B}\x{7E4D}' .
-'\x{7E54}\x{7E55}\x{7E56}\x{7E59}\x{7E5A}\x{7E5D}\x{7E5E}\x{7E66}\x{7E67}' .
-'\x{7E69}\x{7E6A}\x{7E6D}\x{7E70}\x{7E79}\x{7E7B}\x{7E7C}\x{7E7D}\x{7E7F}' .
-'\x{7E82}\x{7E83}\x{7E88}\x{7E89}\x{7E8C}\x{7E8E}\x{7E8F}\x{7E90}\x{7E92}' .
-'\x{7E93}\x{7E94}\x{7E96}\x{7E9B}\x{7E9C}\x{7F36}\x{7F38}\x{7F3A}\x{7F45}' .
-'\x{7F4C}\x{7F4D}\x{7F4E}\x{7F50}\x{7F51}\x{7F54}\x{7F55}\x{7F58}\x{7F5F}' .
-'\x{7F60}\x{7F67}\x{7F68}\x{7F69}\x{7F6A}\x{7F6B}\x{7F6E}\x{7F70}\x{7F72}' .
-'\x{7F75}\x{7F77}\x{7F78}\x{7F79}\x{7F82}\x{7F83}\x{7F85}\x{7F86}\x{7F87}' .
-'\x{7F88}\x{7F8A}\x{7F8C}\x{7F8E}\x{7F94}\x{7F9A}\x{7F9D}\x{7F9E}\x{7FA3}' .
-'\x{7FA4}\x{7FA8}\x{7FA9}\x{7FAE}\x{7FAF}\x{7FB2}\x{7FB6}\x{7FB8}\x{7FB9}' .
-'\x{7FBD}\x{7FC1}\x{7FC5}\x{7FC6}\x{7FCA}\x{7FCC}\x{7FD2}\x{7FD4}\x{7FD5}' .
-'\x{7FE0}\x{7FE1}\x{7FE6}\x{7FE9}\x{7FEB}\x{7FF0}\x{7FF3}\x{7FF9}\x{7FFB}' .
-'\x{7FFC}\x{8000}\x{8001}\x{8003}\x{8004}\x{8005}\x{8006}\x{800B}\x{800C}' .
-'\x{8010}\x{8012}\x{8015}\x{8017}\x{8018}\x{8019}\x{801C}\x{8021}\x{8028}' .
-'\x{8033}\x{8036}\x{803B}\x{803D}\x{803F}\x{8046}\x{804A}\x{8052}\x{8056}' .
-'\x{8058}\x{805A}\x{805E}\x{805F}\x{8061}\x{8062}\x{8068}\x{806F}\x{8070}' .
-'\x{8072}\x{8073}\x{8074}\x{8076}\x{8077}\x{8079}\x{807D}\x{807E}\x{807F}' .
-'\x{8084}\x{8085}\x{8086}\x{8087}\x{8089}\x{808B}\x{808C}\x{8093}\x{8096}' .
-'\x{8098}\x{809A}\x{809B}\x{809D}\x{80A1}\x{80A2}\x{80A5}\x{80A9}\x{80AA}' .
-'\x{80AC}\x{80AD}\x{80AF}\x{80B1}\x{80B2}\x{80B4}\x{80BA}\x{80C3}\x{80C4}' .
-'\x{80C6}\x{80CC}\x{80CE}\x{80D6}\x{80D9}\x{80DA}\x{80DB}\x{80DD}\x{80DE}' .
-'\x{80E1}\x{80E4}\x{80E5}\x{80EF}\x{80F1}\x{80F4}\x{80F8}\x{80FC}\x{80FD}' .
-'\x{8102}\x{8105}\x{8106}\x{8107}\x{8108}\x{8109}\x{810A}\x{811A}\x{811B}' .
-'\x{8123}\x{8129}\x{812F}\x{8131}\x{8133}\x{8139}\x{813E}\x{8146}\x{814B}' .
-'\x{814E}\x{8150}\x{8151}\x{8153}\x{8154}\x{8155}\x{815F}\x{8165}\x{8166}' .
-'\x{816B}\x{816E}\x{8170}\x{8171}\x{8174}\x{8178}\x{8179}\x{817A}\x{817F}' .
-'\x{8180}\x{8182}\x{8183}\x{8188}\x{818A}\x{818F}\x{8193}\x{8195}\x{819A}' .
-'\x{819C}\x{819D}\x{81A0}\x{81A3}\x{81A4}\x{81A8}\x{81A9}\x{81B0}\x{81B3}' .
-'\x{81B5}\x{81B8}\x{81BA}\x{81BD}\x{81BE}\x{81BF}\x{81C0}\x{81C2}\x{81C6}' .
-'\x{81C8}\x{81C9}\x{81CD}\x{81D1}\x{81D3}\x{81D8}\x{81D9}\x{81DA}\x{81DF}' .
-'\x{81E0}\x{81E3}\x{81E5}\x{81E7}\x{81E8}\x{81EA}\x{81ED}\x{81F3}\x{81F4}' .
-'\x{81FA}\x{81FB}\x{81FC}\x{81FE}\x{8201}\x{8202}\x{8205}\x{8207}\x{8208}' .
-'\x{8209}\x{820A}\x{820C}\x{820D}\x{820E}\x{8210}\x{8212}\x{8216}\x{8217}' .
-'\x{8218}\x{821B}\x{821C}\x{821E}\x{821F}\x{8229}\x{822A}\x{822B}\x{822C}' .
-'\x{822E}\x{8233}\x{8235}\x{8236}\x{8237}\x{8238}\x{8239}\x{8240}\x{8247}' .
-'\x{8258}\x{8259}\x{825A}\x{825D}\x{825F}\x{8262}\x{8264}\x{8266}\x{8268}' .
-'\x{826A}\x{826B}\x{826E}\x{826F}\x{8271}\x{8272}\x{8276}\x{8277}\x{8278}' .
-'\x{827E}\x{828B}\x{828D}\x{8292}\x{8299}\x{829D}\x{829F}\x{82A5}\x{82A6}' .
-'\x{82AB}\x{82AC}\x{82AD}\x{82AF}\x{82B1}\x{82B3}\x{82B8}\x{82B9}\x{82BB}' .
-'\x{82BD}\x{82C5}\x{82D1}\x{82D2}\x{82D3}\x{82D4}\x{82D7}\x{82D9}\x{82DB}' .
-'\x{82DC}\x{82DE}\x{82DF}\x{82E1}\x{82E3}\x{82E5}\x{82E6}\x{82E7}\x{82EB}' .
-'\x{82F1}\x{82F3}\x{82F4}\x{82F9}\x{82FA}\x{82FB}\x{8302}\x{8303}\x{8304}' .
-'\x{8305}\x{8306}\x{8309}\x{830E}\x{8316}\x{8317}\x{8318}\x{831C}\x{8323}' .
-'\x{8328}\x{832B}\x{832F}\x{8331}\x{8332}\x{8334}\x{8335}\x{8336}\x{8338}' .
-'\x{8339}\x{8340}\x{8345}\x{8349}\x{834A}\x{834F}\x{8350}\x{8352}\x{8358}' .
-'\x{8373}\x{8375}\x{8377}\x{837B}\x{837C}\x{8385}\x{8387}\x{8389}\x{838A}' .
-'\x{838E}\x{8393}\x{8396}\x{839A}\x{839E}\x{839F}\x{83A0}\x{83A2}\x{83A8}' .
-'\x{83AA}\x{83AB}\x{83B1}\x{83B5}\x{83BD}\x{83C1}\x{83C5}\x{83CA}\x{83CC}' .
-'\x{83CE}\x{83D3}\x{83D6}\x{83D8}\x{83DC}\x{83DF}\x{83E0}\x{83E9}\x{83EB}' .
-'\x{83EF}\x{83F0}\x{83F1}\x{83F2}\x{83F4}\x{83F7}\x{83FB}\x{83FD}\x{8403}' .
-'\x{8404}\x{8407}\x{840B}\x{840C}\x{840D}\x{840E}\x{8413}\x{8420}\x{8422}' .
-'\x{8429}\x{842A}\x{842C}\x{8431}\x{8435}\x{8438}\x{843C}\x{843D}\x{8446}' .
-'\x{8449}\x{844E}\x{8457}\x{845B}\x{8461}\x{8462}\x{8463}\x{8466}\x{8469}' .
-'\x{846B}\x{846C}\x{846D}\x{846E}\x{846F}\x{8471}\x{8475}\x{8477}\x{8479}' .
-'\x{847A}\x{8482}\x{8484}\x{848B}\x{8490}\x{8494}\x{8499}\x{849C}\x{849F}' .
-'\x{84A1}\x{84AD}\x{84B2}\x{84B8}\x{84B9}\x{84BB}\x{84BC}\x{84BF}\x{84C1}' .
-'\x{84C4}\x{84C6}\x{84C9}\x{84CA}\x{84CB}\x{84CD}\x{84D0}\x{84D1}\x{84D6}' .
-'\x{84D9}\x{84DA}\x{84EC}\x{84EE}\x{84F4}\x{84FC}\x{84FF}\x{8500}\x{8506}' .
-'\x{8511}\x{8513}\x{8514}\x{8515}\x{8517}\x{8518}\x{851A}\x{851F}\x{8521}' .
-'\x{8526}\x{852C}\x{852D}\x{8535}\x{853D}\x{8540}\x{8541}\x{8543}\x{8548}' .
-'\x{8549}\x{854A}\x{854B}\x{854E}\x{8555}\x{8557}\x{8558}\x{855A}\x{8563}' .
-'\x{8568}\x{8569}\x{856A}\x{856D}\x{8577}\x{857E}\x{8580}\x{8584}\x{8587}' .
-'\x{8588}\x{858A}\x{8590}\x{8591}\x{8594}\x{8597}\x{8599}\x{859B}\x{859C}' .
-'\x{85A4}\x{85A6}\x{85A8}\x{85A9}\x{85AA}\x{85AB}\x{85AC}\x{85AE}\x{85AF}' .
-'\x{85B9}\x{85BA}\x{85C1}\x{85C9}\x{85CD}\x{85CF}\x{85D0}\x{85D5}\x{85DC}' .
-'\x{85DD}\x{85E4}\x{85E5}\x{85E9}\x{85EA}\x{85F7}\x{85F9}\x{85FA}\x{85FB}' .
-'\x{85FE}\x{8602}\x{8606}\x{8607}\x{860A}\x{860B}\x{8613}\x{8616}\x{8617}' .
-'\x{861A}\x{8622}\x{862D}\x{862F}\x{8630}\x{863F}\x{864D}\x{864E}\x{8650}' .
-'\x{8654}\x{8655}\x{865A}\x{865C}\x{865E}\x{865F}\x{8667}\x{866B}\x{8671}' .
-'\x{8679}\x{867B}\x{868A}\x{868B}\x{868C}\x{8693}\x{8695}\x{86A3}\x{86A4}' .
-'\x{86A9}\x{86AA}\x{86AB}\x{86AF}\x{86B0}\x{86B6}\x{86C4}\x{86C6}\x{86C7}' .
-'\x{86C9}\x{86CB}\x{86CD}\x{86CE}\x{86D4}\x{86D9}\x{86DB}\x{86DE}\x{86DF}' .
-'\x{86E4}\x{86E9}\x{86EC}\x{86ED}\x{86EE}\x{86EF}\x{86F8}\x{86F9}\x{86FB}' .
-'\x{86FE}\x{8700}\x{8702}\x{8703}\x{8706}\x{8708}\x{8709}\x{870A}\x{870D}' .
-'\x{8711}\x{8712}\x{8718}\x{871A}\x{871C}\x{8725}\x{8729}\x{8734}\x{8737}' .
-'\x{873B}\x{873F}\x{8749}\x{874B}\x{874C}\x{874E}\x{8753}\x{8755}\x{8757}' .
-'\x{8759}\x{875F}\x{8760}\x{8763}\x{8766}\x{8768}\x{876A}\x{876E}\x{8774}' .
-'\x{8776}\x{8778}\x{877F}\x{8782}\x{878D}\x{879F}\x{87A2}\x{87AB}\x{87AF}' .
-'\x{87B3}\x{87BA}\x{87BB}\x{87BD}\x{87C0}\x{87C4}\x{87C6}\x{87C7}\x{87CB}' .
-'\x{87D0}\x{87D2}\x{87E0}\x{87EF}\x{87F2}\x{87F6}\x{87F7}\x{87F9}\x{87FB}' .
-'\x{87FE}\x{8805}\x{880D}\x{880E}\x{880F}\x{8811}\x{8815}\x{8816}\x{8821}' .
-'\x{8822}\x{8823}\x{8827}\x{8831}\x{8836}\x{8839}\x{883B}\x{8840}\x{8842}' .
-'\x{8844}\x{8846}\x{884C}\x{884D}\x{8852}\x{8853}\x{8857}\x{8859}\x{885B}' .
-'\x{885D}\x{885E}\x{8861}\x{8862}\x{8863}\x{8868}\x{886B}\x{8870}\x{8872}' .
-'\x{8875}\x{8877}\x{887D}\x{887E}\x{887F}\x{8881}\x{8882}\x{8888}\x{888B}' .
-'\x{888D}\x{8892}\x{8896}\x{8897}\x{8899}\x{889E}\x{88A2}\x{88A4}\x{88AB}' .
-'\x{88AE}\x{88B0}\x{88B1}\x{88B4}\x{88B5}\x{88B7}\x{88BF}\x{88C1}\x{88C2}' .
-'\x{88C3}\x{88C4}\x{88C5}\x{88CF}\x{88D4}\x{88D5}\x{88D8}\x{88D9}\x{88DC}' .
-'\x{88DD}\x{88DF}\x{88E1}\x{88E8}\x{88F2}\x{88F3}\x{88F4}\x{88F8}\x{88F9}' .
-'\x{88FC}\x{88FD}\x{88FE}\x{8902}\x{8904}\x{8907}\x{890A}\x{890C}\x{8910}' .
-'\x{8912}\x{8913}\x{891D}\x{891E}\x{8925}\x{892A}\x{892B}\x{8936}\x{8938}' .
-'\x{893B}\x{8941}\x{8943}\x{8944}\x{894C}\x{894D}\x{8956}\x{895E}\x{895F}' .
-'\x{8960}\x{8964}\x{8966}\x{896A}\x{896D}\x{896F}\x{8972}\x{8974}\x{8977}' .
-'\x{897E}\x{897F}\x{8981}\x{8983}\x{8986}\x{8987}\x{8988}\x{898A}\x{898B}' .
-'\x{898F}\x{8993}\x{8996}\x{8997}\x{8998}\x{899A}\x{89A1}\x{89A6}\x{89A7}' .
-'\x{89A9}\x{89AA}\x{89AC}\x{89AF}\x{89B2}\x{89B3}\x{89BA}\x{89BD}\x{89BF}' .
-'\x{89C0}\x{89D2}\x{89DA}\x{89DC}\x{89DD}\x{89E3}\x{89E6}\x{89E7}\x{89F4}' .
-'\x{89F8}\x{8A00}\x{8A02}\x{8A03}\x{8A08}\x{8A0A}\x{8A0C}\x{8A0E}\x{8A10}' .
-'\x{8A13}\x{8A16}\x{8A17}\x{8A18}\x{8A1B}\x{8A1D}\x{8A1F}\x{8A23}\x{8A25}' .
-'\x{8A2A}\x{8A2D}\x{8A31}\x{8A33}\x{8A34}\x{8A36}\x{8A3A}\x{8A3B}\x{8A3C}' .
-'\x{8A41}\x{8A46}\x{8A48}\x{8A50}\x{8A51}\x{8A52}\x{8A54}\x{8A55}\x{8A5B}' .
-'\x{8A5E}\x{8A60}\x{8A62}\x{8A63}\x{8A66}\x{8A69}\x{8A6B}\x{8A6C}\x{8A6D}' .
-'\x{8A6E}\x{8A70}\x{8A71}\x{8A72}\x{8A73}\x{8A7C}\x{8A82}\x{8A84}\x{8A85}' .
-'\x{8A87}\x{8A89}\x{8A8C}\x{8A8D}\x{8A91}\x{8A93}\x{8A95}\x{8A98}\x{8A9A}' .
-'\x{8A9E}\x{8AA0}\x{8AA1}\x{8AA3}\x{8AA4}\x{8AA5}\x{8AA6}\x{8AA8}\x{8AAC}' .
-'\x{8AAD}\x{8AB0}\x{8AB2}\x{8AB9}\x{8ABC}\x{8ABF}\x{8AC2}\x{8AC4}\x{8AC7}' .
-'\x{8ACB}\x{8ACC}\x{8ACD}\x{8ACF}\x{8AD2}\x{8AD6}\x{8ADA}\x{8ADB}\x{8ADC}' .
-'\x{8ADE}\x{8AE0}\x{8AE1}\x{8AE2}\x{8AE4}\x{8AE6}\x{8AE7}\x{8AEB}\x{8AED}' .
-'\x{8AEE}\x{8AF1}\x{8AF3}\x{8AF7}\x{8AF8}\x{8AFA}\x{8AFE}\x{8B00}\x{8B01}' .
-'\x{8B02}\x{8B04}\x{8B07}\x{8B0C}\x{8B0E}\x{8B10}\x{8B14}\x{8B16}\x{8B17}' .
-'\x{8B19}\x{8B1A}\x{8B1B}\x{8B1D}\x{8B20}\x{8B21}\x{8B26}\x{8B28}\x{8B2B}' .
-'\x{8B2C}\x{8B33}\x{8B39}\x{8B3E}\x{8B41}\x{8B49}\x{8B4C}\x{8B4E}\x{8B4F}' .
-'\x{8B56}\x{8B58}\x{8B5A}\x{8B5B}\x{8B5C}\x{8B5F}\x{8B66}\x{8B6B}\x{8B6C}' .
-'\x{8B6F}\x{8B70}\x{8B71}\x{8B72}\x{8B74}\x{8B77}\x{8B7D}\x{8B80}\x{8B83}' .
-'\x{8B8A}\x{8B8C}\x{8B8E}\x{8B90}\x{8B92}\x{8B93}\x{8B96}\x{8B99}\x{8B9A}' .
-'\x{8C37}\x{8C3A}\x{8C3F}\x{8C41}\x{8C46}\x{8C48}\x{8C4A}\x{8C4C}\x{8C4E}' .
-'\x{8C50}\x{8C55}\x{8C5A}\x{8C61}\x{8C62}\x{8C6A}\x{8C6B}\x{8C6C}\x{8C78}' .
-'\x{8C79}\x{8C7A}\x{8C7C}\x{8C82}\x{8C85}\x{8C89}\x{8C8A}\x{8C8C}\x{8C8D}' .
-'\x{8C8E}\x{8C94}\x{8C98}\x{8C9D}\x{8C9E}\x{8CA0}\x{8CA1}\x{8CA2}\x{8CA7}' .
-'\x{8CA8}\x{8CA9}\x{8CAA}\x{8CAB}\x{8CAC}\x{8CAD}\x{8CAE}\x{8CAF}\x{8CB0}' .
-'\x{8CB2}\x{8CB3}\x{8CB4}\x{8CB6}\x{8CB7}\x{8CB8}\x{8CBB}\x{8CBC}\x{8CBD}' .
-'\x{8CBF}\x{8CC0}\x{8CC1}\x{8CC2}\x{8CC3}\x{8CC4}\x{8CC7}\x{8CC8}\x{8CCA}' .
-'\x{8CCD}\x{8CCE}\x{8CD1}\x{8CD3}\x{8CDA}\x{8CDB}\x{8CDC}\x{8CDE}\x{8CE0}' .
-'\x{8CE2}\x{8CE3}\x{8CE4}\x{8CE6}\x{8CEA}\x{8CED}\x{8CFA}\x{8CFB}\x{8CFC}' .
-'\x{8CFD}\x{8D04}\x{8D05}\x{8D07}\x{8D08}\x{8D0A}\x{8D0B}\x{8D0D}\x{8D0F}' .
-'\x{8D10}\x{8D13}\x{8D14}\x{8D16}\x{8D64}\x{8D66}\x{8D67}\x{8D6B}\x{8D6D}' .
-'\x{8D70}\x{8D71}\x{8D73}\x{8D74}\x{8D77}\x{8D81}\x{8D85}\x{8D8A}\x{8D99}' .
-'\x{8DA3}\x{8DA8}\x{8DB3}\x{8DBA}\x{8DBE}\x{8DC2}\x{8DCB}\x{8DCC}\x{8DCF}' .
-'\x{8DD6}\x{8DDA}\x{8DDB}\x{8DDD}\x{8DDF}\x{8DE1}\x{8DE3}\x{8DE8}\x{8DEA}' .
-'\x{8DEB}\x{8DEF}\x{8DF3}\x{8DF5}\x{8DFC}\x{8DFF}\x{8E08}\x{8E09}\x{8E0A}' .
-'\x{8E0F}\x{8E10}\x{8E1D}\x{8E1E}\x{8E1F}\x{8E2A}\x{8E30}\x{8E34}\x{8E35}' .
-'\x{8E42}\x{8E44}\x{8E47}\x{8E48}\x{8E49}\x{8E4A}\x{8E4C}\x{8E50}\x{8E55}' .
-'\x{8E59}\x{8E5F}\x{8E60}\x{8E63}\x{8E64}\x{8E72}\x{8E74}\x{8E76}\x{8E7C}' .
-'\x{8E81}\x{8E84}\x{8E85}\x{8E87}\x{8E8A}\x{8E8B}\x{8E8D}\x{8E91}\x{8E93}' .
-'\x{8E94}\x{8E99}\x{8EA1}\x{8EAA}\x{8EAB}\x{8EAC}\x{8EAF}\x{8EB0}\x{8EB1}' .
-'\x{8EBE}\x{8EC5}\x{8EC6}\x{8EC8}\x{8ECA}\x{8ECB}\x{8ECC}\x{8ECD}\x{8ED2}' .
-'\x{8EDB}\x{8EDF}\x{8EE2}\x{8EE3}\x{8EEB}\x{8EF8}\x{8EFB}\x{8EFC}\x{8EFD}' .
-'\x{8EFE}\x{8F03}\x{8F05}\x{8F09}\x{8F0A}\x{8F0C}\x{8F12}\x{8F13}\x{8F14}' .
-'\x{8F15}\x{8F19}\x{8F1B}\x{8F1C}\x{8F1D}\x{8F1F}\x{8F26}\x{8F29}\x{8F2A}' .
-'\x{8F2F}\x{8F33}\x{8F38}\x{8F39}\x{8F3B}\x{8F3E}\x{8F3F}\x{8F42}\x{8F44}' .
-'\x{8F45}\x{8F46}\x{8F49}\x{8F4C}\x{8F4D}\x{8F4E}\x{8F57}\x{8F5C}\x{8F5F}' .
-'\x{8F61}\x{8F62}\x{8F63}\x{8F64}\x{8F9B}\x{8F9C}\x{8F9E}\x{8F9F}\x{8FA3}' .
-'\x{8FA7}\x{8FA8}\x{8FAD}\x{8FAE}\x{8FAF}\x{8FB0}\x{8FB1}\x{8FB2}\x{8FB7}' .
-'\x{8FBA}\x{8FBB}\x{8FBC}\x{8FBF}\x{8FC2}\x{8FC4}\x{8FC5}\x{8FCE}\x{8FD1}' .
-'\x{8FD4}\x{8FDA}\x{8FE2}\x{8FE5}\x{8FE6}\x{8FE9}\x{8FEA}\x{8FEB}\x{8FED}' .
-'\x{8FEF}\x{8FF0}\x{8FF4}\x{8FF7}\x{8FF8}\x{8FF9}\x{8FFA}\x{8FFD}\x{9000}' .
-'\x{9001}\x{9003}\x{9005}\x{9006}\x{900B}\x{900D}\x{900E}\x{900F}\x{9010}' .
-'\x{9011}\x{9013}\x{9014}\x{9015}\x{9016}\x{9017}\x{9019}\x{901A}\x{901D}' .
-'\x{901E}\x{901F}\x{9020}\x{9021}\x{9022}\x{9023}\x{9027}\x{902E}\x{9031}' .
-'\x{9032}\x{9035}\x{9036}\x{9038}\x{9039}\x{903C}\x{903E}\x{9041}\x{9042}' .
-'\x{9045}\x{9047}\x{9049}\x{904A}\x{904B}\x{904D}\x{904E}\x{904F}\x{9050}' .
-'\x{9051}\x{9052}\x{9053}\x{9054}\x{9055}\x{9056}\x{9058}\x{9059}\x{905C}' .
-'\x{905E}\x{9060}\x{9061}\x{9063}\x{9065}\x{9068}\x{9069}\x{906D}\x{906E}' .
-'\x{906F}\x{9072}\x{9075}\x{9076}\x{9077}\x{9078}\x{907A}\x{907C}\x{907D}' .
-'\x{907F}\x{9080}\x{9081}\x{9082}\x{9083}\x{9084}\x{9087}\x{9089}\x{908A}' .
-'\x{908F}\x{9091}\x{90A3}\x{90A6}\x{90A8}\x{90AA}\x{90AF}\x{90B1}\x{90B5}' .
-'\x{90B8}\x{90C1}\x{90CA}\x{90CE}\x{90DB}\x{90E1}\x{90E2}\x{90E4}\x{90E8}' .
-'\x{90ED}\x{90F5}\x{90F7}\x{90FD}\x{9102}\x{9112}\x{9119}\x{912D}\x{9130}' .
-'\x{9132}\x{9149}\x{914A}\x{914B}\x{914C}\x{914D}\x{914E}\x{9152}\x{9154}' .
-'\x{9156}\x{9158}\x{9162}\x{9163}\x{9165}\x{9169}\x{916A}\x{916C}\x{9172}' .
-'\x{9173}\x{9175}\x{9177}\x{9178}\x{9182}\x{9187}\x{9189}\x{918B}\x{918D}' .
-'\x{9190}\x{9192}\x{9197}\x{919C}\x{91A2}\x{91A4}\x{91AA}\x{91AB}\x{91AF}' .
-'\x{91B4}\x{91B5}\x{91B8}\x{91BA}\x{91C0}\x{91C1}\x{91C6}\x{91C7}\x{91C8}' .
-'\x{91C9}\x{91CB}\x{91CC}\x{91CD}\x{91CE}\x{91CF}\x{91D0}\x{91D1}\x{91D6}' .
-'\x{91D8}\x{91DB}\x{91DC}\x{91DD}\x{91DF}\x{91E1}\x{91E3}\x{91E6}\x{91E7}' .
-'\x{91F5}\x{91F6}\x{91FC}\x{91FF}\x{920D}\x{920E}\x{9211}\x{9214}\x{9215}' .
-'\x{921E}\x{9229}\x{922C}\x{9234}\x{9237}\x{923F}\x{9244}\x{9245}\x{9248}' .
-'\x{9249}\x{924B}\x{9250}\x{9257}\x{925A}\x{925B}\x{925E}\x{9262}\x{9264}' .
-'\x{9266}\x{9271}\x{927E}\x{9280}\x{9283}\x{9285}\x{9291}\x{9293}\x{9295}' .
-'\x{9296}\x{9298}\x{929A}\x{929B}\x{929C}\x{92AD}\x{92B7}\x{92B9}\x{92CF}' .
-'\x{92D2}\x{92E4}\x{92E9}\x{92EA}\x{92ED}\x{92F2}\x{92F3}\x{92F8}\x{92FA}' .
-'\x{92FC}\x{9306}\x{930F}\x{9310}\x{9318}\x{9319}\x{931A}\x{9320}\x{9322}' .
-'\x{9323}\x{9326}\x{9328}\x{932B}\x{932C}\x{932E}\x{932F}\x{9332}\x{9335}' .
-'\x{933A}\x{933B}\x{9344}\x{934B}\x{934D}\x{9354}\x{9356}\x{935B}\x{935C}' .
-'\x{9360}\x{936C}\x{936E}\x{9375}\x{937C}\x{937E}\x{938C}\x{9394}\x{9396}' .
-'\x{9397}\x{939A}\x{93A7}\x{93AC}\x{93AD}\x{93AE}\x{93B0}\x{93B9}\x{93C3}' .
-'\x{93C8}\x{93D0}\x{93D1}\x{93D6}\x{93D7}\x{93D8}\x{93DD}\x{93E1}\x{93E4}' .
-'\x{93E5}\x{93E8}\x{9403}\x{9407}\x{9410}\x{9413}\x{9414}\x{9418}\x{9419}' .
-'\x{941A}\x{9421}\x{942B}\x{9435}\x{9436}\x{9438}\x{943A}\x{9441}\x{9444}' .
-'\x{9451}\x{9452}\x{9453}\x{945A}\x{945B}\x{945E}\x{9460}\x{9462}\x{946A}' .
-'\x{9470}\x{9475}\x{9477}\x{947C}\x{947D}\x{947E}\x{947F}\x{9481}\x{9577}' .
-'\x{9580}\x{9582}\x{9583}\x{9587}\x{9589}\x{958A}\x{958B}\x{958F}\x{9591}' .
-'\x{9593}\x{9594}\x{9596}\x{9598}\x{9599}\x{95A0}\x{95A2}\x{95A3}\x{95A4}' .
-'\x{95A5}\x{95A7}\x{95A8}\x{95AD}\x{95B2}\x{95B9}\x{95BB}\x{95BC}\x{95BE}' .
-'\x{95C3}\x{95C7}\x{95CA}\x{95CC}\x{95CD}\x{95D4}\x{95D5}\x{95D6}\x{95D8}' .
-'\x{95DC}\x{95E1}\x{95E2}\x{95E5}\x{961C}\x{9621}\x{9628}\x{962A}\x{962E}' .
-'\x{962F}\x{9632}\x{963B}\x{963F}\x{9640}\x{9642}\x{9644}\x{964B}\x{964C}' .
-'\x{964D}\x{964F}\x{9650}\x{965B}\x{965C}\x{965D}\x{965E}\x{965F}\x{9662}' .
-'\x{9663}\x{9664}\x{9665}\x{9666}\x{966A}\x{966C}\x{9670}\x{9672}\x{9673}' .
-'\x{9675}\x{9676}\x{9677}\x{9678}\x{967A}\x{967D}\x{9685}\x{9686}\x{9688}' .
-'\x{968A}\x{968B}\x{968D}\x{968E}\x{968F}\x{9694}\x{9695}\x{9697}\x{9698}' .
-'\x{9699}\x{969B}\x{969C}\x{96A0}\x{96A3}\x{96A7}\x{96A8}\x{96AA}\x{96B0}' .
-'\x{96B1}\x{96B2}\x{96B4}\x{96B6}\x{96B7}\x{96B8}\x{96B9}\x{96BB}\x{96BC}' .
-'\x{96C0}\x{96C1}\x{96C4}\x{96C5}\x{96C6}\x{96C7}\x{96C9}\x{96CB}\x{96CC}' .
-'\x{96CD}\x{96CE}\x{96D1}\x{96D5}\x{96D6}\x{96D9}\x{96DB}\x{96DC}\x{96E2}' .
-'\x{96E3}\x{96E8}\x{96EA}\x{96EB}\x{96F0}\x{96F2}\x{96F6}\x{96F7}\x{96F9}' .
-'\x{96FB}\x{9700}\x{9704}\x{9706}\x{9707}\x{9708}\x{970A}\x{970D}\x{970E}' .
-'\x{970F}\x{9711}\x{9713}\x{9716}\x{9719}\x{971C}\x{971E}\x{9724}\x{9727}' .
-'\x{972A}\x{9730}\x{9732}\x{9738}\x{9739}\x{973D}\x{973E}\x{9742}\x{9744}' .
-'\x{9746}\x{9748}\x{9749}\x{9752}\x{9756}\x{9759}\x{975C}\x{975E}\x{9760}' .
-'\x{9761}\x{9762}\x{9764}\x{9766}\x{9768}\x{9769}\x{976B}\x{976D}\x{9771}' .
-'\x{9774}\x{9779}\x{977A}\x{977C}\x{9781}\x{9784}\x{9785}\x{9786}\x{978B}' .
-'\x{978D}\x{978F}\x{9790}\x{9798}\x{979C}\x{97A0}\x{97A3}\x{97A6}\x{97A8}' .
-'\x{97AB}\x{97AD}\x{97B3}\x{97B4}\x{97C3}\x{97C6}\x{97C8}\x{97CB}\x{97D3}' .
-'\x{97DC}\x{97ED}\x{97EE}\x{97F2}\x{97F3}\x{97F5}\x{97F6}\x{97FB}\x{97FF}' .
-'\x{9801}\x{9802}\x{9803}\x{9805}\x{9806}\x{9808}\x{980C}\x{980F}\x{9810}' .
-'\x{9811}\x{9812}\x{9813}\x{9817}\x{9818}\x{981A}\x{9821}\x{9824}\x{982C}' .
-'\x{982D}\x{9834}\x{9837}\x{9838}\x{983B}\x{983C}\x{983D}\x{9846}\x{984B}' .
-'\x{984C}\x{984D}\x{984E}\x{984F}\x{9854}\x{9855}\x{9858}\x{985B}\x{985E}' .
-'\x{9867}\x{986B}\x{986F}\x{9870}\x{9871}\x{9873}\x{9874}\x{98A8}\x{98AA}' .
-'\x{98AF}\x{98B1}\x{98B6}\x{98C3}\x{98C4}\x{98C6}\x{98DB}\x{98DC}\x{98DF}' .
-'\x{98E2}\x{98E9}\x{98EB}\x{98ED}\x{98EE}\x{98EF}\x{98F2}\x{98F4}\x{98FC}' .
-'\x{98FD}\x{98FE}\x{9903}\x{9905}\x{9909}\x{990A}\x{990C}\x{9910}\x{9912}' .
-'\x{9913}\x{9914}\x{9918}\x{991D}\x{991E}\x{9920}\x{9921}\x{9924}\x{9928}' .
-'\x{992C}\x{992E}\x{993D}\x{993E}\x{9942}\x{9945}\x{9949}\x{994B}\x{994C}' .
-'\x{9950}\x{9951}\x{9952}\x{9955}\x{9957}\x{9996}\x{9997}\x{9998}\x{9999}' .
-'\x{99A5}\x{99A8}\x{99AC}\x{99AD}\x{99AE}\x{99B3}\x{99B4}\x{99BC}\x{99C1}' .
-'\x{99C4}\x{99C5}\x{99C6}\x{99C8}\x{99D0}\x{99D1}\x{99D2}\x{99D5}\x{99D8}' .
-'\x{99DB}\x{99DD}\x{99DF}\x{99E2}\x{99ED}\x{99EE}\x{99F1}\x{99F2}\x{99F8}' .
-'\x{99FB}\x{99FF}\x{9A01}\x{9A05}\x{9A0E}\x{9A0F}\x{9A12}\x{9A13}\x{9A19}' .
-'\x{9A28}\x{9A2B}\x{9A30}\x{9A37}\x{9A3E}\x{9A40}\x{9A42}\x{9A43}\x{9A45}' .
-'\x{9A4D}\x{9A55}\x{9A57}\x{9A5A}\x{9A5B}\x{9A5F}\x{9A62}\x{9A64}\x{9A65}' .
-'\x{9A69}\x{9A6A}\x{9A6B}\x{9AA8}\x{9AAD}\x{9AB0}\x{9AB8}\x{9ABC}\x{9AC0}' .
-'\x{9AC4}\x{9ACF}\x{9AD1}\x{9AD3}\x{9AD4}\x{9AD8}\x{9ADE}\x{9ADF}\x{9AE2}' .
-'\x{9AE3}\x{9AE6}\x{9AEA}\x{9AEB}\x{9AED}\x{9AEE}\x{9AEF}\x{9AF1}\x{9AF4}' .
-'\x{9AF7}\x{9AFB}\x{9B06}\x{9B18}\x{9B1A}\x{9B1F}\x{9B22}\x{9B23}\x{9B25}' .
-'\x{9B27}\x{9B28}\x{9B29}\x{9B2A}\x{9B2E}\x{9B2F}\x{9B31}\x{9B32}\x{9B3B}' .
-'\x{9B3C}\x{9B41}\x{9B42}\x{9B43}\x{9B44}\x{9B45}\x{9B4D}\x{9B4E}\x{9B4F}' .
-'\x{9B51}\x{9B54}\x{9B58}\x{9B5A}\x{9B6F}\x{9B74}\x{9B83}\x{9B8E}\x{9B91}' .
-'\x{9B92}\x{9B93}\x{9B96}\x{9B97}\x{9B9F}\x{9BA0}\x{9BA8}\x{9BAA}\x{9BAB}' .
-'\x{9BAD}\x{9BAE}\x{9BB4}\x{9BB9}\x{9BC0}\x{9BC6}\x{9BC9}\x{9BCA}\x{9BCF}' .
-'\x{9BD1}\x{9BD2}\x{9BD4}\x{9BD6}\x{9BDB}\x{9BE1}\x{9BE2}\x{9BE3}\x{9BE4}' .
-'\x{9BE8}\x{9BF0}\x{9BF1}\x{9BF2}\x{9BF5}\x{9C04}\x{9C06}\x{9C08}\x{9C09}' .
-'\x{9C0A}\x{9C0C}\x{9C0D}\x{9C10}\x{9C12}\x{9C13}\x{9C14}\x{9C15}\x{9C1B}' .
-'\x{9C21}\x{9C24}\x{9C25}\x{9C2D}\x{9C2E}\x{9C2F}\x{9C30}\x{9C32}\x{9C39}' .
-'\x{9C3A}\x{9C3B}\x{9C3E}\x{9C46}\x{9C47}\x{9C48}\x{9C52}\x{9C57}\x{9C5A}' .
-'\x{9C60}\x{9C67}\x{9C76}\x{9C78}\x{9CE5}\x{9CE7}\x{9CE9}\x{9CEB}\x{9CEC}' .
-'\x{9CF0}\x{9CF3}\x{9CF4}\x{9CF6}\x{9D03}\x{9D06}\x{9D07}\x{9D08}\x{9D09}' .
-'\x{9D0E}\x{9D12}\x{9D15}\x{9D1B}\x{9D1F}\x{9D23}\x{9D26}\x{9D28}\x{9D2A}' .
-'\x{9D2B}\x{9D2C}\x{9D3B}\x{9D3E}\x{9D3F}\x{9D41}\x{9D44}\x{9D46}\x{9D48}' .
-'\x{9D50}\x{9D51}\x{9D59}\x{9D5C}\x{9D5D}\x{9D5E}\x{9D60}\x{9D61}\x{9D64}' .
-'\x{9D6C}\x{9D6F}\x{9D72}\x{9D7A}\x{9D87}\x{9D89}\x{9D8F}\x{9D9A}\x{9DA4}' .
-'\x{9DA9}\x{9DAB}\x{9DAF}\x{9DB2}\x{9DB4}\x{9DB8}\x{9DBA}\x{9DBB}\x{9DC1}' .
-'\x{9DC2}\x{9DC4}\x{9DC6}\x{9DCF}\x{9DD3}\x{9DD9}\x{9DE6}\x{9DED}\x{9DEF}' .
-'\x{9DF2}\x{9DF8}\x{9DF9}\x{9DFA}\x{9DFD}\x{9E1A}\x{9E1B}\x{9E1E}\x{9E75}' .
-'\x{9E78}\x{9E79}\x{9E7D}\x{9E7F}\x{9E81}\x{9E88}\x{9E8B}\x{9E8C}\x{9E91}' .
-'\x{9E92}\x{9E93}\x{9E95}\x{9E97}\x{9E9D}\x{9E9F}\x{9EA5}\x{9EA6}\x{9EA9}' .
-'\x{9EAA}\x{9EAD}\x{9EB8}\x{9EB9}\x{9EBA}\x{9EBB}\x{9EBC}\x{9EBE}\x{9EBF}' .
-'\x{9EC4}\x{9ECC}\x{9ECD}\x{9ECE}\x{9ECF}\x{9ED0}\x{9ED2}\x{9ED4}\x{9ED8}' .
-'\x{9ED9}\x{9EDB}\x{9EDC}\x{9EDD}\x{9EDE}\x{9EE0}\x{9EE5}\x{9EE8}\x{9EEF}' .
-'\x{9EF4}\x{9EF6}\x{9EF7}\x{9EF9}\x{9EFB}\x{9EFC}\x{9EFD}\x{9F07}\x{9F08}' .
-'\x{9F0E}\x{9F13}\x{9F15}\x{9F20}\x{9F21}\x{9F2C}\x{9F3B}\x{9F3E}\x{9F4A}' .
-'\x{9F4B}\x{9F4E}\x{9F4F}\x{9F52}\x{9F54}\x{9F5F}\x{9F60}\x{9F61}\x{9F62}' .
-'\x{9F63}\x{9F66}\x{9F67}\x{9F6A}\x{9F6C}\x{9F72}\x{9F76}\x{9F77}\x{9F8D}' .
-'\x{9F95}\x{9F9C}\x{9F9D}\x{9FA0}]{1,15}$/iu');
diff --git a/airtime_mvc/library/Zend/Validate/Iban.php b/airtime_mvc/library/Zend/Validate/Iban.php
deleted file mode 100644
index a35dff526..000000000
--- a/airtime_mvc/library/Zend/Validate/Iban.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Iban.php 21563 2010-03-19 10:10:45Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validates IBAN Numbers (International Bank Account Numbers)
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Iban extends Zend_Validate_Abstract
-{
-    const NOTSUPPORTED = 'ibanNotSupported';
-    const FALSEFORMAT  = 'ibanFalseFormat';
-    const CHECKFAILED  = 'ibanCheckFailed';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOTSUPPORTED => "Unknown country within the IBAN '%value%'",
-        self::FALSEFORMAT  => "'%value%' has a false IBAN format",
-        self::CHECKFAILED  => "'%value%' has failed the IBAN check",
-    );
-
-    /**
-     * Optional locale
-     *
-     * @var string|Zend_Locale|null
-     */
-    protected $_locale;
-
-    /**
-     * IBAN regexes by region
-     *
-     * @var array
-     */
-    protected $_ibanregex = array(
-        'AD' => '/^AD[0-9]{2}[0-9]{8}[A-Z0-9]{12}$/',
-        'AT' => '/^AT[0-9]{2}[0-9]{5}[0-9]{11}$/',
-        'BA' => '/^BA[0-9]{2}[0-9]{6}[0-9]{10}$/',
-        'BE' => '/^BE[0-9]{2}[0-9]{3}[0-9]{9}$/',
-        'BG' => '/^BG[0-9]{2}[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}$/',
-        'CH' => '/^CH[0-9]{2}[0-9]{5}[A-Z0-9]{12}$/',
-        'CS' => '/^CS[0-9]{2}[0-9]{3}[0-9]{15}$/',
-        'CY' => '/^CY[0-9]{2}[0-9]{8}[A-Z0-9]{16}$/',
-        'CZ' => '/^CZ[0-9]{2}[0-9]{4}[0-9]{16}$/',
-        'DE' => '/^DE[0-9]{2}[0-9]{8}[0-9]{10}$/',
-        'DK' => '/^DK[0-9]{2}[0-9]{4}[0-9]{10}$/',
-        'EE' => '/^EE[0-9]{2}[0-9]{4}[0-9]{12}$/',
-        'ES' => '/^ES[0-9]{2}[0-9]{8}[0-9]{12}$/',
-        'FR' => '/^FR[0-9]{2}[0-9]{10}[A-Z0-9]{13}$/',
-        'FI' => '/^FI[0-9]{2}[0-9]{6}[0-9]{8}$/',
-        'GB' => '/^GB[0-9]{2}[A-Z]{4}[0-9]{14}$/',
-        'GI' => '/^GI[0-9]{2}[A-Z]{4}[A-Z0-9]{15}$/',
-        'GR' => '/^GR[0-9]{2}[0-9]{7}[A-Z0-9]{16}$/',
-        'HR' => '/^HR[0-9]{2}[0-9]{7}[0-9]{10}$/',
-        'HU' => '/^HU[0-9]{2}[0-9]{7}[0-9]{1}[0-9]{15}[0-9]{1}$/',
-        'IE' => '/^IE[0-9]{2}[A-Z0-9]{4}[0-9]{6}[0-9]{8}$/',
-        'IS' => '/^IS[0-9]{2}[0-9]{4}[0-9]{18}$/',
-        'IT' => '/^IT[0-9]{2}[A-Z]{1}[0-9]{10}[A-Z0-9]{12}$/',
-        'LI' => '/^LI[0-9]{2}[0-9]{5}[A-Z0-9]{12}$/',
-        'LU' => '/^LU[0-9]{2}[0-9]{3}[A-Z0-9]{13}$/',
-        'LT' => '/^LT[0-9]{2}[0-9]{5}[0-9]{11}$/',
-        'LV' => '/^LV[0-9]{2}[A-Z]{4}[A-Z0-9]{13}$/',
-        'MK' => '/^MK[0-9]{2}[A-Z]{3}[A-Z0-9]{10}[0-9]{2}$/',
-        'MT' => '/^MT[0-9]{2}[A-Z]{4}[0-9]{5}[A-Z0-9]{18}$/',
-        'NL' => '/^NL[0-9]{2}[A-Z]{4}[0-9]{10}$/',
-        'NO' => '/^NO[0-9]{2}[0-9]{4}[0-9]{7}$/',
-        'PL' => '/^PL[0-9]{2}[0-9]{8}[0-9]{16}$/',
-        'PT' => '/^PT[0-9]{2}[0-9]{8}[0-9]{13}$/',
-        'RO' => '/^RO[0-9]{2}[A-Z]{4}[A-Z0-9]{16}$/',
-        'SE' => '/^SE[0-9]{2}[0-9]{3}[0-9]{17}$/',
-        'SI' => '/^SI[0-9]{2}[0-9]{5}[0-9]{8}[0-9]{2}$/',
-        'SK' => '/^SK[0-9]{2}[0-9]{4}[0-9]{16}$/',
-        'TN' => '/^TN[0-9]{2}[0-9]{5}[0-9]{15}$/',
-        'TR' => '/^TR[0-9]{2}[0-9]{5}[A-Z0-9]{17}$/'
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|Zend_Config|Zend_Locale $locale OPTIONAL
-     * @return void
-     */
-    public function __construct($locale = null)
-    {
-        if ($locale instanceof Zend_Config) {
-            $locale = $locale->toArray();
-        }
-
-        if (is_array($locale)) {
-            if (array_key_exists('locale', $locale)) {
-                $locale = $locale['locale'];
-            } else {
-                $locale = null;
-            }
-        }
-
-        if ($locale !== false) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $locale = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        if (!empty($locale)) {
-            $this->setLocale($locale);
-        }
-    }
-
-    /**
-     * Returns the locale option
-     *
-     * @return string|Zend_Locale|null
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale option
-     *
-     * @param  string|Zend_Locale $locale
-     * @return Zend_Validate_Date provides a fluent interface
-     */
-    public function setLocale($locale = null)
-    {
-        if ($locale !== false) {
-            require_once 'Zend/Locale.php';
-            $locale = Zend_Locale::findLocale($locale);
-            if (strlen($locale) < 4) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('Region must be given for IBAN validation');
-            }
-        }
-
-        $this->_locale = $locale;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if $value is a valid IBAN
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $value = strtoupper($value);
-        $this->_setValue($value);
-
-        if (empty($this->_locale)) {
-            $region = substr($value, 0, 2);
-        } else {
-            $region = new Zend_Locale($this->_locale);
-            $region = $region->getRegion();
-        }
-
-        if (!array_key_exists($region, $this->_ibanregex)) {
-            $this->_setValue($region);
-            $this->_error(self::NOTSUPPORTED);
-            return false;
-        }
-
-        if (!preg_match($this->_ibanregex[$region], $value)) {
-            $this->_error(self::FALSEFORMAT);
-            return false;
-        }
-
-        $format = substr($value, 4) . substr($value, 0, 4);
-        $format = str_replace(
-            array('A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',  'I',  'J',  'K',  'L',  'M',
-                  'N',  'O',  'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z'),
-            array('10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22',
-                  '23', '24', '25', '26', '27', '28', '29', '30', '31', '32', '33', '34', '35'),
-            $format);
-
-        $temp = intval(substr($format, 0, 1));
-        $len  = strlen($format);
-        for ($x = 1; $x < $len; ++$x) {
-            $temp *= 10;
-            $temp += intval(substr($format, $x, 1));
-            $temp %= 97;
-        }
-
-        if ($temp != 1) {
-            $this->_error(self::CHECKFAILED);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Identical.php b/airtime_mvc/library/Zend/Validate/Identical.php
deleted file mode 100644
index 3886f3975..000000000
--- a/airtime_mvc/library/Zend/Validate/Identical.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Identical.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** @see Zend_Validate_Abstract */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Identical extends Zend_Validate_Abstract
-{
-    /**
-     * Error codes
-     * @const string
-     */
-    const NOT_SAME      = 'notSame';
-    const MISSING_TOKEN = 'missingToken';
-
-    /**
-     * Error messages
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_SAME      => "The token '%token%' does not match the given token '%value%'",
-        self::MISSING_TOKEN => 'No token was provided to match against',
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'token' => '_tokenString'
-    );
-
-    /**
-     * Original token against which to validate
-     * @var string
-     */
-    protected $_tokenString;
-    protected $_token;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed $token
-     * @return void
-     */
-    public function __construct($token = null)
-    {
-        if ($token instanceof Zend_Config) {
-            $token = $token->toArray();
-        }
-
-        if (is_array($token) && (count($token) == 1) && array_key_exists('token', $token)) {
-            $token = $token['token'];
-        }
-
-        if (null !== $token) {
-            $this->setToken($token);
-        }
-    }
-
-    /**
-     * Set token against which to compare
-     *
-     * @param  mixed $token
-     * @return Zend_Validate_Identical
-     */
-    public function setToken($token)
-    {
-        $this->_tokenString = (string) $token;
-        $this->_token       = $token;
-        return $this;
-    }
-
-    /**
-     * Retrieve token
-     *
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->_token;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if a token has been set and the provided value
-     * matches that token.
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue((string) $value);
-        $token        = $this->getToken();
-
-        if ($token === null) {
-            $this->_error(self::MISSING_TOKEN);
-            return false;
-        }
-
-        if ($value !== $token)  {
-            $this->_error(self::NOT_SAME);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/InArray.php b/airtime_mvc/library/Zend/Validate/InArray.php
deleted file mode 100644
index 1d8196025..000000000
--- a/airtime_mvc/library/Zend/Validate/InArray.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: InArray.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_InArray extends Zend_Validate_Abstract
-{
-    const NOT_IN_ARRAY = 'notInArray';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_IN_ARRAY => "'%value%' was not found in the haystack",
-    );
-
-    /**
-     * Haystack of possible values
-     *
-     * @var array
-     */
-    protected $_haystack;
-
-    /**
-     * Whether a strict in_array() invocation is used
-     *
-     * @var boolean
-     */
-    protected $_strict = false;
-
-    /**
-     * Whether a recursive search should be done
-     *
-     * @var boolean
-     */
-    protected $_recursive = false;
-
-    /**
-     * Sets validator options
-     *
-     * @param  array|Zend_Config $haystack
-     * @return void
-     */
-    public function __construct($options)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Array expected as parameter');
-        } else {
-            $count = func_num_args();
-            $temp  = array();
-            if ($count > 1) {
-                $temp['haystack'] = func_get_arg(0);
-                $temp['strict']   = func_get_arg(1);
-                $options = $temp;
-            } else {
-                $temp = func_get_arg(0);
-                if (!array_key_exists('haystack', $options)) {
-                    $options = array();
-                    $options['haystack'] = $temp;
-                } else {
-                    $options = $temp;
-                }
-            }
-        }
-
-        $this->setHaystack($options['haystack']);
-        if (array_key_exists('strict', $options)) {
-            $this->setStrict($options['strict']);
-        }
-
-        if (array_key_exists('recursive', $options)) {
-            $this->setRecursive($options['recursive']);
-        }
-    }
-
-    /**
-     * Returns the haystack option
-     *
-     * @return mixed
-     */
-    public function getHaystack()
-    {
-        return $this->_haystack;
-    }
-
-    /**
-     * Sets the haystack option
-     *
-     * @param  mixed $haystack
-     * @return Zend_Validate_InArray Provides a fluent interface
-     */
-    public function setHaystack(array $haystack)
-    {
-        $this->_haystack = $haystack;
-        return $this;
-    }
-
-    /**
-     * Returns the strict option
-     *
-     * @return boolean
-     */
-    public function getStrict()
-    {
-        return $this->_strict;
-    }
-
-    /**
-     * Sets the strict option
-     *
-     * @param  boolean $strict
-     * @return Zend_Validate_InArray Provides a fluent interface
-     */
-    public function setStrict($strict)
-    {
-        $this->_strict = (boolean) $strict;
-        return $this;
-    }
-
-    /**
-     * Returns the recursive option
-     *
-     * @return boolean
-     */
-    public function getRecursive()
-    {
-        return $this->_recursive;
-    }
-
-    /**
-     * Sets the recursive option
-     *
-     * @param  boolean $recursive
-     * @return Zend_Validate_InArray Provides a fluent interface
-     */
-    public function setRecursive($recursive)
-    {
-        $this->_recursive = (boolean) $recursive;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is contained in the haystack option. If the strict
-     * option is true, then the type of $value is also checked.
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        if ($this->getRecursive()) {
-            $iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($this->_haystack));
-            foreach($iterator as $element) {
-                if ($this->_strict) {
-                    if ($element === $value) {
-                        return true;
-                    }
-                } else if ($element == $value) {
-                    return true;
-                }
-            }
-        } else {
-            if (in_array($value, $this->_haystack, $this->_strict)) {
-                return true;
-            }
-        }
-
-        $this->_error(self::NOT_IN_ARRAY);
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Int.php b/airtime_mvc/library/Zend/Validate/Int.php
deleted file mode 100644
index 4c14f25e4..000000000
--- a/airtime_mvc/library/Zend/Validate/Int.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Int.php 20532 2010-01-22 20:18:23Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Locale_Format
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Int extends Zend_Validate_Abstract
-{
-    const INVALID = 'intInvalid';
-    const NOT_INT = 'notInt';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID => "Invalid type given, value should be string or integer",
-        self::NOT_INT => "'%value%' does not appear to be an integer",
-    );
-
-    protected $_locale;
-
-    /**
-     * Constructor for the integer validator
-     *
-     * @param string|Zend_Config|Zend_Locale $locale
-     */
-    public function __construct($locale = null)
-    {
-        if ($locale instanceof Zend_Config) {
-            $locale = $locale->toArray();
-        }
-
-        if (is_array($locale)) {
-            if (array_key_exists('locale', $locale)) {
-                $locale = $locale['locale'];
-            } else {
-                $locale = null;
-            }
-        }
-
-        if (empty($locale)) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $locale = Zend_Registry::get('Zend_Locale');
-            }
-        }
-
-        if ($locale !== null) {
-            $this->setLocale($locale);
-        }
-    }
-
-    /**
-     * Returns the set locale
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale to use
-     *
-     * @param string|Zend_Locale $locale
-     */
-    public function setLocale($locale = null)
-    {
-        require_once 'Zend/Locale.php';
-        $this->_locale = Zend_Locale::findLocale($locale);
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid integer
-     *
-     * @param  string|integer $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        if (is_int($value)) {
-            return true;
-        }
-
-        $this->_setValue($value);
-        if ($this->_locale === null) {
-            $locale        = localeconv();
-            $valueFiltered = str_replace($locale['decimal_point'], '.', $value);
-            $valueFiltered = str_replace($locale['thousands_sep'], '', $valueFiltered);
-
-            if (strval(intval($valueFiltered)) != $valueFiltered) {
-                $this->_error(self::NOT_INT);
-                return false;
-            }
-
-        } else {
-            try {
-                if (!Zend_Locale_Format::isInteger($value, array('locale' => $this->_locale))) {
-                    $this->_error(self::NOT_INT);
-                    return false;
-                }
-            } catch (Zend_Locale_Exception $e) {
-                $this->_error(self::NOT_INT);
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Interface.php b/airtime_mvc/library/Zend/Validate/Interface.php
deleted file mode 100644
index 9dfca9421..000000000
--- a/airtime_mvc/library/Zend/Validate/Interface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Validate_Interface
-{
-    /**
-     * Returns true if and only if $value meets the validation requirements
-     *
-     * If $value fails validation, then this method returns false, and
-     * getMessages() will return an array of messages that explain why the
-     * validation failed.
-     *
-     * @param  mixed $value
-     * @return boolean
-     * @throws Zend_Valid_Exception If validation of $value is impossible
-     */
-    public function isValid($value);
-
-    /**
-     * Returns an array of messages that explain why the most recent isValid()
-     * call returned false. The array keys are validation failure message identifiers,
-     * and the array values are the corresponding human-readable message strings.
-     *
-     * If isValid() was never called or if the most recent isValid() call
-     * returned true, then this method returns an empty array.
-     *
-     * @return array
-     */
-    public function getMessages();
-}
diff --git a/airtime_mvc/library/Zend/Validate/Ip.php b/airtime_mvc/library/Zend/Validate/Ip.php
deleted file mode 100644
index 7892b8a62..000000000
--- a/airtime_mvc/library/Zend/Validate/Ip.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Ip.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Ip extends Zend_Validate_Abstract
-{
-    const INVALID        = 'ipInvalid';
-    const NOT_IP_ADDRESS = 'notIpAddress';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID        => "Invalid type given, value should be a string",
-        self::NOT_IP_ADDRESS => "'%value%' does not appear to be a valid IP address",
-    );
-
-    /**
-     * internal options
-     *
-     * @var array
-     */
-    protected $_options = array(
-        'allowipv6' => true,
-        'allowipv4' => true
-    );
-
-    /**
-     * Sets validator options
-     *
-     * @param array $options OPTIONAL Options to set, see the manual for all available options
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp['allowipv6'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['allowipv4'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        $options += $this->_options;
-        $this->setOptions($options);
-    }
-
-    /**
-     * Returns all set options
-     *
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Sets the options for this validator
-     *
-     * @param array $options
-     * @return Zend_Validate_Ip
-     */
-    public function setOptions($options)
-    {
-        if (array_key_exists('allowipv6', $options)) {
-            $this->_options['allowipv6'] = (boolean) $options['allowipv6'];
-        }
-
-        if (array_key_exists('allowipv4', $options)) {
-            $this->_options['allowipv4'] = (boolean) $options['allowipv4'];
-        }
-
-        if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Nothing to validate. Check your options');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid IP address
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        if (($this->_options['allowipv4'] && !$this->_options['allowipv6'] && !$this->_validateIPv4($value)) ||
-            (!$this->_options['allowipv4'] && $this->_options['allowipv6'] && !$this->_validateIPv6($value)) ||
-            ($this->_options['allowipv4'] && $this->_options['allowipv6'] && !$this->_validateIPv4($value) && !$this->_validateIPv6($value))) {
-            $this->_error(self::NOT_IP_ADDRESS);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validates an IPv4 address
-     *
-     * @param string $value
-     */
-    protected function _validateIPv4($value) {
-        $ip2long = ip2long($value);
-        if($ip2long === false) {
-            return false;
-        }
-
-        return $value == long2ip($ip2long);
-    }
-
-    /**
-     * Validates an IPv6 address
-     *
-     * @param  string $value Value to check against
-     * @return boolean True when $value is a valid ipv6 address
-     *                 False otherwise
-     */
-    protected function _validateIPv6($value) {
-        if (strlen($value) < 3) {
-            return $value == '::';
-        }
-
-        if (strpos($value, '.')) {
-            $lastcolon = strrpos($value, ':');
-            if (!($lastcolon && $this->_validateIPv4(substr($value, $lastcolon + 1)))) {
-                return false;
-            }
-
-            $value = substr($value, 0, $lastcolon) . ':0:0';
-        }
-
-        if (strpos($value, '::') === false) {
-            return preg_match('/\A(?:[a-f0-9]{1,4}:){7}[a-f0-9]{1,4}\z/i', $value);
-        }
-
-        $colonCount = substr_count($value, ':');
-        if ($colonCount < 8) {
-            return preg_match('/\A(?::|(?:[a-f0-9]{1,4}:)+):(?:(?:[a-f0-9]{1,4}:)*[a-f0-9]{1,4})?\z/i', $value);
-        }
-
-        // special case with ending or starting double colon
-        if ($colonCount == 8) {
-            return preg_match('/\A(?:::)?(?:[a-f0-9]{1,4}:){6}[a-f0-9]{1,4}(?:::)?\z/i', $value);
-        }
-
-        return false;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Isbn.php b/airtime_mvc/library/Zend/Validate/Isbn.php
deleted file mode 100644
index 0d392ffbb..000000000
--- a/airtime_mvc/library/Zend/Validate/Isbn.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Isbn.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Isbn extends Zend_Validate_Abstract
-{
-    const AUTO    = 'auto';
-    const ISBN10  = '10';
-    const ISBN13  = '13';
-    const INVALID = 'isbnInvalid';
-
-    /**
-     * Validation failure message template definitions.
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID => "'%value%' is no valid ISBN number",
-    );
-
-    /**
-     * Allowed type.
-     *
-     * @var string
-     */
-    protected $_type = self::AUTO;
-
-    /**
-     * Separator character.
-     *
-     * @var string
-     */
-    protected $_separator = '';
-
-    /**
-     * Set up options.
-     *
-     * @param  Zend_Config|array $options
-     * @throws Zend_Validate_Exception When $options is not valid
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        // prepare options
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-        if (!is_array($options)) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid options provided.');
-        }
-
-        // set type
-        if (array_key_exists('type', $options)) {
-            $this->setType($options['type']);
-        }
-
-        // set separator
-        if (array_key_exists('separator', $options)) {
-            $this->setSeparator($options['separator']);
-        }
-    }
-
-    /**
-     * Detect input format.
-     *
-     * @return string
-     */
-    protected function _detectFormat()
-    {
-        // prepare separator and pattern list
-        $sep      = quotemeta($this->_separator);
-        $patterns = array();
-        $lengths  = array();
-
-        // check for ISBN-10
-        if ($this->_type == self::ISBN10 || $this->_type == self::AUTO) {
-            if (empty($sep)) {
-                $pattern = '/^[0-9]{9}[0-9X]{1}$/';
-                $length  = 10;
-            } else {
-                $pattern = "/^[0-9]{1,7}[{$sep}]{1}[0-9]{1,7}[{$sep}]{1}[0-9]{1,7}[{$sep}]{1}[0-9X]{1}$/";
-                $length  = 13;
-            }
-
-            $patterns[$pattern] = self::ISBN10;
-            $lengths[$pattern]  = $length;
-        }
-
-        // check for ISBN-13
-        if ($this->_type == self::ISBN13 || $this->_type == self::AUTO) {
-            if (empty($sep)) {
-                $pattern = '/^[0-9]{13}$/';
-                $length  = 13;
-            } else {
-                $pattern = "/^[0-9]{1,9}[{$sep}]{1}[0-9]{1,5}[{$sep}]{1}[0-9]{1,9}[{$sep}]{1}[0-9]{1,9}[{$sep}]{1}[0-9]{1}$/";
-                $length  = 17;
-            }
-
-            $patterns[$pattern] = self::ISBN13;
-            $lengths[$pattern]  = $length;
-        }
-
-        // check pattern list
-        foreach ($patterns as $pattern => $type) {
-            if ((strlen($this->_value) == $lengths[$pattern]) && preg_match($pattern, $this->_value)) {
-                return $type;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface.
-     *
-     * Returns true if and only if $value contains a valid ISBN.
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        // save value
-        $value = (string) $value;
-        $this->_setValue($value);
-
-        switch ($this->_detectFormat()) {
-            case self::ISBN10:
-                // sum
-                $isbn10 = preg_replace('/[^0-9X]/', '', $value);
-                $sum    = 0;
-                for ($i = 0; $i < 9; $i++) {
-                    $sum += (10 - $i) * $isbn10{$i};
-                }
-
-                // checksum
-                $checksum = 11 - ($sum % 11);
-                if ($checksum == 11) {
-                    $checksum = '0';
-                } elseif ($checksum == 10) {
-                    $checksum = 'X';
-                }
-                break;
-
-            case self::ISBN13:
-                // sum
-                $isbn13 = preg_replace('/[^0-9]/', '', $value);
-                $sum    = 0;
-                for ($i = 0; $i < 12; $i++) {
-                    if ($i % 2 == 0) {
-                        $sum += $isbn13{$i};
-                    } else {
-                        $sum += 3 * $isbn13{$i};
-                    }
-                }
-                // checksum
-                $checksum = 10 - ($sum % 10);
-                if ($checksum == 10) {
-                    $checksum = '0';
-                }
-                break;
-
-            default:
-                $this->_error(self::INVALID);
-                return false;
-        }
-
-        // validate
-        if (substr($this->_value, -1) != $checksum) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Set separator characters.
-     *
-     * It is allowed only empty string, hyphen and space.
-     *
-     * @param  string $separator
-     * @throws Zend_Validate_Exception When $separator is not valid
-     * @return Zend_Validate_Isbn Provides a fluent interface
-     */
-    public function setSeparator($separator)
-    {
-        // check separator
-        if (!in_array($separator, array('-', ' ', ''))) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid ISBN separator.');
-        }
-
-        $this->_separator = $separator;
-        return $this;
-    }
-
-    /**
-     * Get separator characters.
-     *
-     * @return string
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Set allowed ISBN type.
-     *
-     * @param  string $type
-     * @throws Zend_Validate_Exception When $type is not valid
-     * @return Zend_Validate_Isbn Provides a fluent interface
-     */
-    public function setType($type)
-    {
-        // check type
-        if (!in_array($type, array(self::AUTO, self::ISBN10, self::ISBN13))) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Invalid ISBN type');
-        }
-
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Get allowed ISBN type.
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/LessThan.php b/airtime_mvc/library/Zend/Validate/LessThan.php
deleted file mode 100644
index e730603f0..000000000
--- a/airtime_mvc/library/Zend/Validate/LessThan.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: LessThan.php 20182 2010-01-10 21:12:01Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_LessThan extends Zend_Validate_Abstract
-{
-    const NOT_LESS = 'notLessThan';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_LESS => "'%value%' is not less than '%max%'"
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'max' => '_max'
-    );
-
-    /**
-     * Maximum value
-     *
-     * @var mixed
-     */
-    protected $_max;
-
-    /**
-     * Sets validator options
-     *
-     * @param  mixed|Zend_Config $max
-     * @return void
-     */
-    public function __construct($max)
-    {
-        if ($max instanceof Zend_Config) {
-            $max = $max->toArray();
-        }
-
-        if (is_array($max)) {
-            if (array_key_exists('max', $max)) {
-                $max = $max['max'];
-            } else {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("Missing option 'max'");
-            }
-        }
-
-        $this->setMax($max);
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return mixed
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  mixed $max
-     * @return Zend_Validate_LessThan Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        $this->_max = $max;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is less than max option
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        if ($this->_max <= $value) {
-            $this->_error(self::NOT_LESS);
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/Validate/NotEmpty.php b/airtime_mvc/library/Zend/Validate/NotEmpty.php
deleted file mode 100644
index 40eeb993e..000000000
--- a/airtime_mvc/library/Zend/Validate/NotEmpty.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: NotEmpty.php 20193 2010-01-11 10:40:43Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_NotEmpty extends Zend_Validate_Abstract
-{
-    const BOOLEAN      = 1;
-    const INTEGER      = 2;
-    const FLOAT        = 4;
-    const STRING       = 8;
-    const ZERO         = 16;
-    const EMPTY_ARRAY  = 32;
-    const NULL         = 64;
-    const PHP          = 127;
-    const SPACE        = 128;
-    const ALL          = 255;
-
-    const INVALID  = 'notEmptyInvalid';
-    const IS_EMPTY = 'isEmpty';
-
-    protected $_constants = array(
-        self::BOOLEAN      => 'boolean',
-        self::INTEGER      => 'integer',
-        self::FLOAT        => 'float',
-        self::STRING       => 'string',
-        self::ZERO         => 'zero',
-        self::EMPTY_ARRAY  => 'array',
-        self::NULL         => 'null',
-        self::PHP          => 'php',
-        self::SPACE        => 'space',
-        self::ALL          => 'all'
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::IS_EMPTY => "Value is required and can't be empty",
-        self::INVALID  => "Invalid type given, value should be float, string, array, boolean or integer",
-    );
-
-    /**
-     * Internal type to detect
-     *
-     * @var integer
-     */
-    protected $_type = 237;
-
-    /**
-     * Constructor
-     *
-     * @param string|array|Zend_Config $options OPTIONAL
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options = func_get_args();
-            $temp    = array();
-            if (!empty($options)) {
-                $temp['type'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (is_array($options) && array_key_exists('type', $options)) {
-            $this->setType($options['type']);
-        }
-    }
-
-    /**
-     * Returns the set types
-     *
-     * @return array
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Set the types
-     *
-     * @param  integer|array $type
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_NotEmpty
-     */
-    public function setType($type = null)
-    {
-        if (is_array($type)) {
-            $detected = 0;
-            foreach($type as $value) {
-                if (is_int($value)) {
-                    $detected += $value;
-                } else if (in_array($value, $this->_constants)) {
-                    $detected += array_search($value, $this->_constants);
-                }
-            }
-
-            $type = $detected;
-        } else if (is_string($type) && in_array($type, $this->_constants)) {
-            $type = array_search($type, $this->_constants);
-        }
-
-        if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception('Unknown type');
-        }
-
-        $this->_type = $type;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is not an empty value.
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_null($value) && !is_string($value) && !is_int($value) && !is_float($value) &&
-            !is_bool($value) && !is_array($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $type    = $this->getType();
-        $this->_setValue($value);
-
-        // SPACE ('   ')
-        if ($type >= self::SPACE) {
-            $type -= self::SPACE;
-            if (is_string($value) && (preg_match('/^\s+$/s', $value))) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // NULL (null)
-        if ($type >= self::NULL) {
-            $type -= self::NULL;
-            if (is_null($value)) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // EMPTY_ARRAY (array())
-        if ($type >= self::EMPTY_ARRAY) {
-            $type -= self::EMPTY_ARRAY;
-            if (is_array($value) && ($value == array())) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // ZERO ('0')
-        if ($type >= self::ZERO) {
-            $type -= self::ZERO;
-            if (is_string($value) && ($value == '0')) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // STRING ('')
-        if ($type >= self::STRING) {
-            $type -= self::STRING;
-            if (is_string($value) && ($value == '')) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // FLOAT (0.0)
-        if ($type >= self::FLOAT) {
-            $type -= self::FLOAT;
-            if (is_float($value) && ($value == 0.0)) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // INTEGER (0)
-        if ($type >= self::INTEGER) {
-            $type -= self::INTEGER;
-            if (is_int($value) && ($value == 0)) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        // BOOLEAN (false)
-        if ($type >= self::BOOLEAN) {
-            $type -= self::BOOLEAN;
-            if (is_bool($value) && ($value == false)) {
-                $this->_error(self::IS_EMPTY);
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/PostCode.php b/airtime_mvc/library/Zend/Validate/PostCode.php
deleted file mode 100644
index 9d122c93e..000000000
--- a/airtime_mvc/library/Zend/Validate/PostCode.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PostCode.php 21487 2010-03-14 10:17:35Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Locale_Format
- */
-require_once 'Zend/Locale/Format.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_PostCode extends Zend_Validate_Abstract
-{
-    const INVALID  = 'postcodeInvalid';
-    const NO_MATCH = 'postcodeNoMatch';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID  => "Invalid type given. The value should be a string or a integer",
-        self::NO_MATCH => "'%value%' does not appear to be a postal code",
-    );
-
-    /**
-     * Locale to use
-     *
-     * @var string
-     */
-    protected $_locale;
-
-    /**
-     * Manual postal code format
-     *
-     * @var unknown_type
-     */
-    protected $_format;
-
-    /**
-     * Constructor for the integer validator
-     *
-     * Accepts either a string locale, a Zend_Locale object, or an array or
-     * Zend_Config object containing the keys "locale" and/or "format".
-     *
-     * @param string|Zend_Locale|array|Zend_Config $options
-     * @throws Zend_Validate_Exception On empty format
-     */
-    public function __construct($options = null)
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        }
-
-        if (empty($options)) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Locale')) {
-                $this->setLocale(Zend_Registry::get('Zend_Locale'));
-            }
-        } elseif (is_array($options)) {
-            // Received
-            if (array_key_exists('locale', $options)) {
-                $this->setLocale($options['locale']);
-            }
-
-            if (array_key_exists('format', $options)) {
-                $this->setFormat($options['format']);
-            }
-        } elseif ($options instanceof Zend_Locale || is_string($options)) {
-            // Received Locale object or string locale
-            $this->setLocale($options);
-        }
-
-        $format = $this->getFormat();
-        if (empty($format)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("A postcode-format string has to be given for validation");
-        }
-    }
-
-    /**
-     * Returns the set locale
-     *
-     * @return string|Zend_Locale The set locale
-     */
-    public function getLocale()
-    {
-        return $this->_locale;
-    }
-
-    /**
-     * Sets the locale to use
-     *
-     * @param string|Zend_Locale $locale
-     * @throws Zend_Validate_Exception On unrecognised region
-     * @throws Zend_Validate_Exception On not detected format
-     * @return Zend_Validate_PostCode  Provides fluid interface
-     */
-    public function setLocale($locale = null)
-    {
-        require_once 'Zend/Locale.php';
-        $this->_locale = Zend_Locale::findLocale($locale);
-        $locale        = new Zend_Locale($this->_locale);
-        $region        = $locale->getRegion();
-        if (empty($region)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Unable to detect a region for the locale '$locale'");
-        }
-
-        $format = Zend_Locale::getTranslation(
-            $locale->getRegion(),
-            'postaltoterritory',
-            $this->_locale
-        );
-
-        if (empty($format)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Unable to detect a postcode format for the region '{$locale->getRegion()}'");
-        }
-
-        $this->setFormat($format);
-        return $this;
-    }
-
-    /**
-     * Returns the set postal code format
-     *
-     * @return string
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * Sets a self defined postal format as regex
-     *
-     * @param string $format
-     * @throws Zend_Validate_Exception On empty format
-     * @return Zend_Validate_PostCode  Provides fluid interface
-     */
-    public function setFormat($format)
-    {
-        if (empty($format) || !is_string($format)) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("A postcode-format string has to be given for validation");
-        }
-
-        if ($format[0] !== '/') {
-            $format = '/^' . $format;
-        }
-
-        if ($format[strlen($format) - 1] !== '/') {
-            $format .= '$/';
-        }
-
-        $this->_format = $format;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value is a valid postalcode
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        $this->_setValue($value);
-        if (!is_string($value) && !is_int($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $format = $this->getFormat();
-        if (!preg_match($format, $value)) {
-            $this->_error(self::NO_MATCH);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Regex.php b/airtime_mvc/library/Zend/Validate/Regex.php
deleted file mode 100644
index 4c9b5ed36..000000000
--- a/airtime_mvc/library/Zend/Validate/Regex.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Regex.php 21574 2010-03-19 20:00:37Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Regex extends Zend_Validate_Abstract
-{
-    const INVALID   = 'regexInvalid';
-    const NOT_MATCH = 'regexNotMatch';
-    const ERROROUS  = 'regexErrorous';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be string, integer or float",
-        self::NOT_MATCH => "'%value%' does not match against pattern '%pattern%'",
-        self::ERROROUS  => "There was an internal error while using the pattern '%pattern%'",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'pattern' => '_pattern'
-    );
-
-    /**
-     * Regular expression pattern
-     *
-     * @var string
-     */
-    protected $_pattern;
-
-    /**
-     * Sets validator options
-     *
-     * @param  string|Zend_Config $pattern
-     * @throws Zend_Validate_Exception On missing 'pattern' parameter
-     * @return void
-     */
-    public function __construct($pattern)
-    {
-        if ($pattern instanceof Zend_Config) {
-            $pattern = $pattern->toArray();
-        }
-
-        if (is_array($pattern)) {
-            if (array_key_exists('pattern', $pattern)) {
-                $pattern = $pattern['pattern'];
-            } else {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception("Missing option 'pattern'");
-            }
-        }
-
-        $this->setPattern($pattern);
-    }
-
-    /**
-     * Returns the pattern option
-     *
-     * @return string
-     */
-    public function getPattern()
-    {
-        return $this->_pattern;
-    }
-
-    /**
-     * Sets the pattern option
-     *
-     * @param  string $pattern
-     * @throws Zend_Validate_Exception if there is a fatal error in pattern matching
-     * @return Zend_Validate_Regex Provides a fluent interface
-     */
-    public function setPattern($pattern)
-    {
-        $this->_pattern = (string) $pattern;
-        $status         = @preg_match($this->_pattern, "Test");
-
-        if (false === $status) {
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("Internal error while using the pattern '$this->_pattern'");
-        }
-
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if $value matches against the pattern option
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value) && !is_int($value) && !is_float($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-
-        $status = @preg_match($this->_pattern, $value);
-        if (false === $status) {
-            $this->_error(self::ERROROUS);
-            return false;
-        }
-
-        if (!$status) {
-            $this->_error(self::NOT_MATCH);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Sitemap/Changefreq.php b/airtime_mvc/library/Zend/Validate/Sitemap/Changefreq.php
deleted file mode 100644
index 517f9b577..000000000
--- a/airtime_mvc/library/Zend/Validate/Sitemap/Changefreq.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Changefreq.php 21365 2010-03-07 09:38:41Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validates whether a given value is valid as a sitemap <changefreq> value
- *
- * @link       http://www.sitemaps.org/protocol.php Sitemaps XML format
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract
-{
-    /**
-     * Validation key for not valid
-     *
-     */
-    const NOT_VALID = 'sitemapChangefreqNotValid';
-    const INVALID   = 'sitemapChangefreqInvalid';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap changefreq",
-        self::INVALID   => "Invalid type given, the value should be a string",
-    );
-
-    /**
-     * Valid change frequencies
-     *
-     * @var array
-     */
-    protected $_changeFreqs = array(
-        'always',  'hourly', 'daily', 'weekly',
-        'monthly', 'yearly', 'never'
-    );
-
-    /**
-     * Validates if a string is valid as a sitemap changefreq
-     *
-     * @link http://www.sitemaps.org/protocol.php#changefreqdef <changefreq>
-     *
-     * @param  string  $value  value to validate
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        if (!is_string($value)) {
-            return false;
-        }
-
-        if (!in_array($value, $this->_changeFreqs, true)) {
-            $this->_error(self::NOT_VALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Sitemap/Lastmod.php b/airtime_mvc/library/Zend/Validate/Sitemap/Lastmod.php
deleted file mode 100644
index 5644137da..000000000
--- a/airtime_mvc/library/Zend/Validate/Sitemap/Lastmod.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Lastmod.php 21365 2010-03-07 09:38:41Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validates whether a given value is valid as a sitemap <lastmod> value
- *
- * @link       http://www.sitemaps.org/protocol.php Sitemaps XML format
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract
-{
-    /**
-     * Regular expression to use when validating
-     *
-     */
-    const LASTMOD_REGEX = '/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])(T([0-1][0-9]|2[0-3])(:[0-5][0-9])(:[0-5][0-9])?(\\+|-)([0-1][0-9]|2[0-3]):[0-5][0-9])?$/';
-
-    /**
-     * Validation key for not valid
-     *
-     */
-    const NOT_VALID = 'sitemapLastmodNotValid';
-    const INVALID   = 'sitemapLastmodInvalid';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap lastmod",
-        self::INVALID   => "Invalid type given, the value should be a string",
-    );
-
-    /**
-     * Validates if a string is valid as a sitemap lastmod
-     *
-     * @link http://www.sitemaps.org/protocol.php#lastmoddef <lastmod>
-     *
-     * @param  string  $value  value to validate
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        $result = @preg_match(self::LASTMOD_REGEX, $value);
-        if ($result != 1) {
-            $this->_error(self::NOT_VALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Sitemap/Loc.php b/airtime_mvc/library/Zend/Validate/Sitemap/Loc.php
deleted file mode 100644
index 7e0668f9f..000000000
--- a/airtime_mvc/library/Zend/Validate/Sitemap/Loc.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Loc.php 21365 2010-03-07 09:38:41Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @see Zend_Uri
- */
-require_once 'Zend/Uri.php';
-
-/**
- * Validates whether a given value is valid as a sitemap <loc> value
- *
- * @link       http://www.sitemaps.org/protocol.php Sitemaps XML format
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract
-{
-    /**
-     * Validation key for not valid
-     *
-     */
-    const NOT_VALID = 'sitemapLocNotValid';
-    const INVALID   = 'sitemapLocInvalid';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap location",
-        self::INVALID   => "Invalid type given, the value should be a string",
-    );
-
-    /**
-     * Validates if a string is valid as a sitemap location
-     *
-     * @link http://www.sitemaps.org/protocol.php#locdef <loc>
-     *
-     * @param  string  $value  value to validate
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        $result = Zend_Uri::check($value);
-        if ($result !== true) {
-            $this->_error(self::NOT_VALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/Sitemap/Priority.php b/airtime_mvc/library/Zend/Validate/Sitemap/Priority.php
deleted file mode 100644
index 9875ecd20..000000000
--- a/airtime_mvc/library/Zend/Validate/Sitemap/Priority.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Priority.php 21365 2010-03-07 09:38:41Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * Validates whether a given value is valid as a sitemap <priority> value
- *
- * @link       http://www.sitemaps.org/protocol.php Sitemaps XML format
- *
- * @category   Zend
- * @package    Zend_Validate
- * @subpackage Sitemap
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract
-{
-    /**
-     * Validation key for not valid
-     *
-     */
-    const NOT_VALID = 'sitemapPriorityNotValid';
-    const INVALID   = 'sitemapPriorityInvalid';
-
-    /**
-     * Validation failure message template definitions
-     *
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::NOT_VALID => "'%value%' is no valid sitemap priority",
-        self::INVALID   => "Invalid type given, the value should be a integer, a float or a numeric string",
-    );
-
-    /**
-     * Validates if a string is valid as a sitemap priority
-     *
-     * @link http://www.sitemaps.org/protocol.php#prioritydef <priority>
-     *
-     * @param  string  $value  value to validate
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_numeric($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        $value = (float) $value;
-        if ($value < 0 || $value > 1) {
-            $this->_error(self::NOT_VALID);
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Validate/StringLength.php b/airtime_mvc/library/Zend/Validate/StringLength.php
deleted file mode 100644
index c9c5b80ff..000000000
--- a/airtime_mvc/library/Zend/Validate/StringLength.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: StringLength.php 20358 2010-01-17 19:03:49Z thomas $
- */
-
-/**
- * @see Zend_Validate_Abstract
- */
-require_once 'Zend/Validate/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_Validate
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Validate_StringLength extends Zend_Validate_Abstract
-{
-    const INVALID   = 'stringLengthInvalid';
-    const TOO_SHORT = 'stringLengthTooShort';
-    const TOO_LONG  = 'stringLengthTooLong';
-
-    /**
-     * @var array
-     */
-    protected $_messageTemplates = array(
-        self::INVALID   => "Invalid type given, value should be a string",
-        self::TOO_SHORT => "'%value%' is less than %min% characters long",
-        self::TOO_LONG  => "'%value%' is more than %max% characters long",
-    );
-
-    /**
-     * @var array
-     */
-    protected $_messageVariables = array(
-        'min' => '_min',
-        'max' => '_max'
-    );
-
-    /**
-     * Minimum length
-     *
-     * @var integer
-     */
-    protected $_min;
-
-    /**
-     * Maximum length
-     *
-     * If null, there is no maximum length
-     *
-     * @var integer|null
-     */
-    protected $_max;
-
-    /**
-     * Encoding to use
-     *
-     * @var string|null
-     */
-    protected $_encoding;
-
-    /**
-     * Sets validator options
-     *
-     * @param  integer|array|Zend_Config $options
-     * @return void
-     */
-    public function __construct($options = array())
-    {
-        if ($options instanceof Zend_Config) {
-            $options = $options->toArray();
-        } else if (!is_array($options)) {
-            $options     = func_get_args();
-            $temp['min'] = array_shift($options);
-            if (!empty($options)) {
-                $temp['max'] = array_shift($options);
-            }
-
-            if (!empty($options)) {
-                $temp['encoding'] = array_shift($options);
-            }
-
-            $options = $temp;
-        }
-
-        if (!array_key_exists('min', $options)) {
-            $options['min'] = 0;
-        }
-
-        $this->setMin($options['min']);
-        if (array_key_exists('max', $options)) {
-            $this->setMax($options['max']);
-        }
-
-        if (array_key_exists('encoding', $options)) {
-            $this->setEncoding($options['encoding']);
-        }
-    }
-
-    /**
-     * Returns the min option
-     *
-     * @return integer
-     */
-    public function getMin()
-    {
-        return $this->_min;
-    }
-
-    /**
-     * Sets the min option
-     *
-     * @param  integer $min
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setMin($min)
-    {
-        if (null !== $this->_max && $min > $this->_max) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >"
-                                            . " $this->_max");
-        }
-        $this->_min = max(0, (integer) $min);
-        return $this;
-    }
-
-    /**
-     * Returns the max option
-     *
-     * @return integer|null
-     */
-    public function getMax()
-    {
-        return $this->_max;
-    }
-
-    /**
-     * Sets the max option
-     *
-     * @param  integer|null $max
-     * @throws Zend_Validate_Exception
-     * @return Zend_Validate_StringLength Provides a fluent interface
-     */
-    public function setMax($max)
-    {
-        if (null === $max) {
-            $this->_max = null;
-        } else if ($max < $this->_min) {
-            /**
-             * @see Zend_Validate_Exception
-             */
-            require_once 'Zend/Validate/Exception.php';
-            throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but "
-                                            . "$max < $this->_min");
-        } else {
-            $this->_max = (integer) $max;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the actual encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Sets a new encoding to use
-     *
-     * @param string $encoding
-     * @return Zend_Validate_StringLength
-     */
-    public function setEncoding($encoding = null)
-    {
-        if ($encoding !== null) {
-            $orig   = iconv_get_encoding('internal_encoding');
-            $result = iconv_set_encoding('internal_encoding', $encoding);
-            if (!$result) {
-                require_once 'Zend/Validate/Exception.php';
-                throw new Zend_Validate_Exception('Given encoding not supported on this OS!');
-            }
-
-            iconv_set_encoding('internal_encoding', $orig);
-        }
-
-        $this->_encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * Defined by Zend_Validate_Interface
-     *
-     * Returns true if and only if the string length of $value is at least the min option and
-     * no greater than the max option (when the max option is not null).
-     *
-     * @param  string $value
-     * @return boolean
-     */
-    public function isValid($value)
-    {
-        if (!is_string($value)) {
-            $this->_error(self::INVALID);
-            return false;
-        }
-
-        $this->_setValue($value);
-        if ($this->_encoding !== null) {
-            $length = iconv_strlen($value, $this->_encoding);
-        } else {
-            $length = iconv_strlen($value);
-        }
-
-        if ($length < $this->_min) {
-            $this->_error(self::TOO_SHORT);
-        }
-
-        if (null !== $this->_max && $this->_max < $length) {
-            $this->_error(self::TOO_LONG);
-        }
-
-        if (count($this->_messages)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Version.php b/airtime_mvc/library/Zend/Version.php
deleted file mode 100644
index 78d425e8c..000000000
--- a/airtime_mvc/library/Zend/Version.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Version.php 21181 2010-02-23 22:02:38Z matthew $
- */
-
-/**
- * Class to store and retrieve the version of Zend Framework.
- *
- * @category   Zend
- * @package    Zend_Version
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-final class Zend_Version
-{
-    /**
-     * Zend Framework version identification - see compareVersion()
-     */
-    const VERSION = '1.10.3';
-
-    /**
-     * Compare the specified Zend Framework version string $version
-     * with the current Zend_Version::VERSION of Zend Framework.
-     *
-     * @param  string  $version  A version string (e.g. "0.7.1").
-     * @return boolean           -1 if the $version is older,
-     *                           0 if they are the same,
-     *                           and +1 if $version is newer.
-     *
-     */
-    public static function compareVersion($version)
-    {
-        $version = strtolower($version);
-        $version = preg_replace('/(\d)pr(\d?)/', '$1a$2', $version);
-        return version_compare($version, strtolower(self::VERSION));
-    }
-}
diff --git a/airtime_mvc/library/Zend/View.php b/airtime_mvc/library/Zend/View.php
deleted file mode 100644
index 75e9c9e2d..000000000
--- a/airtime_mvc/library/Zend/View.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract master class for extension.
- */
-require_once 'Zend/View/Abstract.php';
-
-
-/**
- * Concrete class for handling view scripts.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View extends Zend_View_Abstract
-{
-    /**
-     * Whether or not to use streams to mimic short tags
-     * @var bool
-     */
-    private $_useViewStream = false;
-
-    /**
-     * Whether or not to use stream wrapper if short_open_tag is false
-     * @var bool
-     */
-    private $_useStreamWrapper = false;
-
-    /**
-     * Constructor
-     *
-     * Register Zend_View_Stream stream wrapper if short tags are disabled.
-     *
-     * @param  array $config
-     * @return void
-     */
-    public function __construct($config = array())
-    {
-        $this->_useViewStream = (bool) ini_get('short_open_tag') ? false : true;
-        if ($this->_useViewStream) {
-            if (!in_array('zend.view', stream_get_wrappers())) {
-                require_once 'Zend/View/Stream.php';
-                stream_wrapper_register('zend.view', 'Zend_View_Stream');
-            }
-        }
-
-        if (array_key_exists('useStreamWrapper', $config)) {
-            $this->setUseStreamWrapper($config['useStreamWrapper']);
-        }
-
-        parent::__construct($config);
-    }
-
-    /**
-     * Set flag indicating if stream wrapper should be used if short_open_tag is off
-     *
-     * @param  bool $flag
-     * @return Zend_View
-     */
-    public function setUseStreamWrapper($flag)
-    {
-        $this->_useStreamWrapper = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Should the stream wrapper be used if short_open_tag is off?
-     *
-     * @return bool
-     */
-    public function useStreamWrapper()
-    {
-        return $this->_useStreamWrapper;
-    }
-
-    /**
-     * Includes the view script in a scope with only public $this variables.
-     *
-     * @param string The view script to execute.
-     */
-    protected function _run()
-    {
-        if ($this->_useViewStream && $this->useStreamWrapper()) {
-            include 'zend.view://' . func_get_arg(0);
-        } else {
-            include func_get_arg(0);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Abstract.php b/airtime_mvc/library/Zend/View/Abstract.php
deleted file mode 100644
index 6b96990f8..000000000
--- a/airtime_mvc/library/Zend/View/Abstract.php
+++ /dev/null
@@ -1,1188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20907 2010-02-04 18:08:01Z matthew $
- */
-
-/** @see Zend_Loader */
-require_once 'Zend/Loader.php';
-
-/** @see Zend_Loader_PluginLoader */
-require_once 'Zend/Loader/PluginLoader.php';
-
-/** @see Zend_View_Interface */
-require_once 'Zend/View/Interface.php';
-
-/**
- * Abstract class for Zend_View to help enforce private constructs.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Abstract implements Zend_View_Interface
-{
-    /**
-     * Path stack for script, helper, and filter directories.
-     *
-     * @var array
-     */
-    private $_path = array(
-        'script' => array(),
-        'helper' => array(),
-        'filter' => array(),
-    );
-
-    /**
-     * Script file name to execute
-     *
-     * @var string
-     */
-    private $_file = null;
-
-    /**
-     * Instances of helper objects.
-     *
-     * @var array
-     */
-    private $_helper = array();
-
-    /**
-     * Map of helper => class pairs to help in determining helper class from
-     * name
-     * @var array
-     */
-    private $_helperLoaded = array();
-
-    /**
-     * Map of helper => classfile pairs to aid in determining helper classfile
-     * @var array
-     */
-    private $_helperLoadedDir = array();
-
-    /**
-     * Stack of Zend_View_Filter names to apply as filters.
-     * @var array
-     */
-    private $_filter = array();
-
-    /**
-     * Stack of Zend_View_Filter objects that have been loaded
-     * @var array
-     */
-    private $_filterClass = array();
-
-    /**
-     * Map of filter => class pairs to help in determining filter class from
-     * name
-     * @var array
-     */
-    private $_filterLoaded = array();
-
-    /**
-     * Map of filter => classfile pairs to aid in determining filter classfile
-     * @var array
-     */
-    private $_filterLoadedDir = array();
-
-    /**
-     * Callback for escaping.
-     *
-     * @var string
-     */
-    private $_escape = 'htmlspecialchars';
-
-    /**
-     * Encoding to use in escaping mechanisms; defaults to utf-8
-     * @var string
-     */
-    private $_encoding = 'UTF-8';
-
-    /**
-     * Flag indicating whether or not LFI protection for rendering view scripts is enabled
-     * @var bool
-     */
-    private $_lfiProtectionOn = true;
-
-    /**
-     * Plugin loaders
-     * @var array
-     */
-    private $_loaders = array();
-
-    /**
-     * Plugin types
-     * @var array
-     */
-    private $_loaderTypes = array('filter', 'helper');
-
-    /**
-     * Strict variables flag; when on, undefined variables accessed in the view
-     * scripts will trigger notices
-     * @var boolean
-     */
-    private $_strictVars = false;
-
-    /**
-     * Constructor.
-     *
-     * @param array $config Configuration key-value pairs.
-     */
-    public function __construct($config = array())
-    {
-        // set inital paths and properties
-        $this->setScriptPath(null);
-
-        // $this->setHelperPath(null);
-        $this->setFilterPath(null);
-
-        // user-defined escaping callback
-        if (array_key_exists('escape', $config)) {
-            $this->setEscape($config['escape']);
-        }
-
-        // encoding
-        if (array_key_exists('encoding', $config)) {
-            $this->setEncoding($config['encoding']);
-        }
-
-        // base path
-        if (array_key_exists('basePath', $config)) {
-            $prefix = 'Zend_View';
-            if (array_key_exists('basePathPrefix', $config)) {
-                $prefix = $config['basePathPrefix'];
-            }
-            $this->setBasePath($config['basePath'], $prefix);
-        }
-
-        // user-defined view script path
-        if (array_key_exists('scriptPath', $config)) {
-            $this->addScriptPath($config['scriptPath']);
-        }
-
-        // user-defined helper path
-        if (array_key_exists('helperPath', $config)) {
-            if (is_array($config['helperPath'])) {
-                foreach ($config['helperPath'] as $prefix => $path) {
-                    $this->addHelperPath($path, $prefix);
-                }
-            } else {
-                $prefix = 'Zend_View_Helper';
-                if (array_key_exists('helperPathPrefix', $config)) {
-                    $prefix = $config['helperPathPrefix'];
-                }
-                $this->addHelperPath($config['helperPath'], $prefix);
-            }
-        }
-
-        // user-defined filter path
-        if (array_key_exists('filterPath', $config)) {
-            if (is_array($config['filterPath'])) {
-                foreach ($config['filterPath'] as $prefix => $path) {
-                    $this->addFilterPath($path, $prefix);
-                }
-            } else {
-                $prefix = 'Zend_View_Filter';
-                if (array_key_exists('filterPathPrefix', $config)) {
-                    $prefix = $config['filterPathPrefix'];
-                }
-                $this->addFilterPath($config['filterPath'], $prefix);
-            }
-        }
-
-        // user-defined filters
-        if (array_key_exists('filter', $config)) {
-            $this->addFilter($config['filter']);
-        }
-
-        // strict vars
-        if (array_key_exists('strictVars', $config)) {
-            $this->strictVars($config['strictVars']);
-        }
-
-        // LFI protection flag
-        if (array_key_exists('lfiProtectionOn', $config)) {
-            $this->setLfiProtection($config['lfiProtectionOn']);
-        }
-
-        $this->init();
-    }
-
-    /**
-     * Return the template engine object
-     *
-     * Returns the object instance, as it is its own template engine
-     *
-     * @return Zend_View_Abstract
-     */
-    public function getEngine()
-    {
-        return $this;
-    }
-
-    /**
-     * Allow custom object initialization when extending Zend_View_Abstract or
-     * Zend_View
-     *
-     * Triggered by {@link __construct() the constructor} as its final action.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Prevent E_NOTICE for nonexistent values
-     *
-     * If {@link strictVars()} is on, raises a notice.
-     *
-     * @param  string $key
-     * @return null
-     */
-    public function __get($key)
-    {
-        if ($this->_strictVars) {
-            trigger_error('Key "' . $key . '" does not exist', E_USER_NOTICE);
-        }
-
-        return null;
-    }
-
-    /**
-     * Allows testing with empty() and isset() to work inside
-     * templates.
-     *
-     * @param  string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        if ('_' != substr($key, 0, 1)) {
-            return isset($this->$key);
-        }
-
-        return false;
-    }
-
-    /**
-     * Directly assigns a variable to the view script.
-     *
-     * Checks first to ensure that the caller is not attempting to set a
-     * protected or private member (by checking for a prefixed underscore); if
-     * not, the public member is set; otherwise, an exception is raised.
-     *
-     * @param string $key The variable name.
-     * @param mixed $val The variable value.
-     * @return void
-     * @throws Zend_View_Exception if an attempt to set a private or protected
-     * member is detected
-     */
-    public function __set($key, $val)
-    {
-        if ('_' != substr($key, 0, 1)) {
-            $this->$key = $val;
-            return;
-        }
-
-        require_once 'Zend/View/Exception.php';
-        $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
-        $e->setView($this);
-        throw $e;
-    }
-
-    /**
-     * Allows unset() on object properties to work
-     *
-     * @param string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ('_' != substr($key, 0, 1) && isset($this->$key)) {
-            unset($this->$key);
-        }
-    }
-
-    /**
-     * Accesses a helper object from within a script.
-     *
-     * If the helper class has a 'view' property, sets it with the current view
-     * object.
-     *
-     * @param string $name The helper name.
-     * @param array $args The parameters for the helper.
-     * @return string The result of the helper output.
-     */
-    public function __call($name, $args)
-    {
-        // is the helper already loaded?
-        $helper = $this->getHelper($name);
-
-        // call the helper method
-        return call_user_func_array(
-            array($helper, $name),
-            $args
-        );
-    }
-
-    /**
-     * Given a base path, sets the script, helper, and filter paths relative to it
-     *
-     * Assumes a directory structure of:
-     * <code>
-     * basePath/
-     *     scripts/
-     *     helpers/
-     *     filters/
-     * </code>
-     *
-     * @param  string $path
-     * @param  string $prefix Prefix to use for helper and filter paths
-     * @return Zend_View_Abstract
-     */
-    public function setBasePath($path, $classPrefix = 'Zend_View')
-    {
-        $path        = rtrim($path, '/');
-        $path        = rtrim($path, '\\');
-        $path       .= DIRECTORY_SEPARATOR;
-        $classPrefix = rtrim($classPrefix, '_') . '_';
-        $this->setScriptPath($path . 'scripts');
-        $this->setHelperPath($path . 'helpers', $classPrefix . 'Helper');
-        $this->setFilterPath($path . 'filters', $classPrefix . 'Filter');
-        return $this;
-    }
-
-    /**
-     * Given a base path, add script, helper, and filter paths relative to it
-     *
-     * Assumes a directory structure of:
-     * <code>
-     * basePath/
-     *     scripts/
-     *     helpers/
-     *     filters/
-     * </code>
-     *
-     * @param  string $path
-     * @param  string $prefix Prefix to use for helper and filter paths
-     * @return Zend_View_Abstract
-     */
-    public function addBasePath($path, $classPrefix = 'Zend_View')
-    {
-        $path        = rtrim($path, '/');
-        $path        = rtrim($path, '\\');
-        $path       .= DIRECTORY_SEPARATOR;
-        $classPrefix = rtrim($classPrefix, '_') . '_';
-        $this->addScriptPath($path . 'scripts');
-        $this->addHelperPath($path . 'helpers', $classPrefix . 'Helper');
-        $this->addFilterPath($path . 'filters', $classPrefix . 'Filter');
-        return $this;
-    }
-
-    /**
-     * Adds to the stack of view script paths in LIFO order.
-     *
-     * @param string|array The directory (-ies) to add.
-     * @return Zend_View_Abstract
-     */
-    public function addScriptPath($path)
-    {
-        $this->_addPath('script', $path);
-        return $this;
-    }
-
-    /**
-     * Resets the stack of view script paths.
-     *
-     * To clear all paths, use Zend_View::setScriptPath(null).
-     *
-     * @param string|array The directory (-ies) to set as the path.
-     * @return Zend_View_Abstract
-     */
-    public function setScriptPath($path)
-    {
-        $this->_path['script'] = array();
-        $this->_addPath('script', $path);
-        return $this;
-    }
-
-    /**
-     * Return full path to a view script specified by $name
-     *
-     * @param  string $name
-     * @return false|string False if script not found
-     * @throws Zend_View_Exception if no script directory set
-     */
-    public function getScriptPath($name)
-    {
-        try {
-            $path = $this->_script($name);
-            return $path;
-        } catch (Zend_View_Exception $e) {
-            if (strstr($e->getMessage(), 'no view script directory set')) {
-                throw $e;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Returns an array of all currently set script paths
-     *
-     * @return array
-     */
-    public function getScriptPaths()
-    {
-        return $this->_getPaths('script');
-    }
-
-    /**
-     * Set plugin loader for a particular plugin type
-     *
-     * @param  Zend_Loader_PluginLoader $loader
-     * @param  string $type
-     * @return Zend_View_Abstract
-     */
-    public function setPluginLoader(Zend_Loader_PluginLoader $loader, $type)
-    {
-        $type = strtolower($type);
-        if (!in_array($type, $this->_loaderTypes)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"', $type));
-            $e->setView($this);
-            throw $e;
-        }
-
-        $this->_loaders[$type] = $loader;
-        return $this;
-    }
-
-    /**
-     * Retrieve plugin loader for a specific plugin type
-     *
-     * @param  string $type
-     * @return Zend_Loader_PluginLoader
-     */
-    public function getPluginLoader($type)
-    {
-        $type = strtolower($type);
-        if (!in_array($type, $this->_loaderTypes)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"; cannot retrieve', $type));
-            $e->setView($this);
-            throw $e;
-        }
-
-        if (!array_key_exists($type, $this->_loaders)) {
-            $prefix     = 'Zend_View_';
-            $pathPrefix = 'Zend/View/';
-
-            $pType = ucfirst($type);
-            switch ($type) {
-                case 'filter':
-                case 'helper':
-                default:
-                    $prefix     .= $pType;
-                    $pathPrefix .= $pType;
-                    $loader = new Zend_Loader_PluginLoader(array(
-                        $prefix => $pathPrefix
-                    ));
-                    $this->_loaders[$type] = $loader;
-                    break;
-            }
-        }
-        return $this->_loaders[$type];
-    }
-
-    /**
-     * Adds to the stack of helper paths in LIFO order.
-     *
-     * @param string|array The directory (-ies) to add.
-     * @param string $classPrefix Class prefix to use with classes in this
-     * directory; defaults to Zend_View_Helper
-     * @return Zend_View_Abstract
-     */
-    public function addHelperPath($path, $classPrefix = 'Zend_View_Helper_')
-    {
-        return $this->_addPluginPath('helper', $classPrefix, (array) $path);
-    }
-
-    /**
-     * Resets the stack of helper paths.
-     *
-     * To clear all paths, use Zend_View::setHelperPath(null).
-     *
-     * @param string|array $path The directory (-ies) to set as the path.
-     * @param string $classPrefix The class prefix to apply to all elements in
-     * $path; defaults to Zend_View_Helper
-     * @return Zend_View_Abstract
-     */
-    public function setHelperPath($path, $classPrefix = 'Zend_View_Helper_')
-    {
-        unset($this->_loaders['helper']);
-        return $this->addHelperPath($path, $classPrefix);
-    }
-
-    /**
-     * Get full path to a helper class file specified by $name
-     *
-     * @param  string $name
-     * @return string|false False on failure, path on success
-     */
-    public function getHelperPath($name)
-    {
-        return $this->_getPluginPath('helper', $name);
-    }
-
-    /**
-     * Returns an array of all currently set helper paths
-     *
-     * @return array
-     */
-    public function getHelperPaths()
-    {
-        return $this->getPluginLoader('helper')->getPaths();
-    }
-
-    /**
-     * Registers a helper object, bypassing plugin loader
-     *
-     * @param  Zend_View_Helper_Abstract|object $helper
-     * @param  string $name
-     * @return Zend_View_Abstract
-     * @throws Zend_View_Exception
-     */
-    public function registerHelper($helper, $name)
-    {
-        if (!is_object($helper)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('View helper must be an object');
-            $e->setView($this);
-            throw $e;
-        }
-
-        if (!$helper instanceof Zend_View_Interface) {
-            if (!method_exists($helper, $name)) {
-                require_once 'Zend/View/Exception.php';
-                $e =  new Zend_View_Exception(
-                    'View helper must implement Zend_View_Interface or have a method matching the name provided'
-                );
-                $e->setView($this);
-                throw $e;
-            }
-        }
-
-        if (method_exists($helper, 'setView')) {
-            $helper->setView($this);
-        }
-
-        $name = ucfirst($name);
-        $this->_helper[$name] = $helper;
-        return $this;
-    }
-
-    /**
-     * Get a helper by name
-     *
-     * @param  string $name
-     * @return object
-     */
-    public function getHelper($name)
-    {
-        return $this->_getPlugin('helper', $name);
-    }
-
-    /**
-     * Get array of all active helpers
-     *
-     * Only returns those that have already been instantiated.
-     *
-     * @return array
-     */
-    public function getHelpers()
-    {
-        return $this->_helper;
-    }
-
-    /**
-     * Adds to the stack of filter paths in LIFO order.
-     *
-     * @param string|array The directory (-ies) to add.
-     * @param string $classPrefix Class prefix to use with classes in this
-     * directory; defaults to Zend_View_Filter
-     * @return Zend_View_Abstract
-     */
-    public function addFilterPath($path, $classPrefix = 'Zend_View_Filter_')
-    {
-        return $this->_addPluginPath('filter', $classPrefix, (array) $path);
-    }
-
-    /**
-     * Resets the stack of filter paths.
-     *
-     * To clear all paths, use Zend_View::setFilterPath(null).
-     *
-     * @param string|array The directory (-ies) to set as the path.
-     * @param string $classPrefix The class prefix to apply to all elements in
-     * $path; defaults to Zend_View_Filter
-     * @return Zend_View_Abstract
-     */
-    public function setFilterPath($path, $classPrefix = 'Zend_View_Filter_')
-    {
-        unset($this->_loaders['filter']);
-        return $this->addFilterPath($path, $classPrefix);
-    }
-
-    /**
-     * Get full path to a filter class file specified by $name
-     *
-     * @param  string $name
-     * @return string|false False on failure, path on success
-     */
-    public function getFilterPath($name)
-    {
-        return $this->_getPluginPath('filter', $name);
-    }
-
-    /**
-     * Get a filter object by name
-     *
-     * @param  string $name
-     * @return object
-     */
-    public function getFilter($name)
-    {
-        return $this->_getPlugin('filter', $name);
-    }
-
-    /**
-     * Return array of all currently active filters
-     *
-     * Only returns those that have already been instantiated.
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        return $this->_filter;
-    }
-
-    /**
-     * Returns an array of all currently set filter paths
-     *
-     * @return array
-     */
-    public function getFilterPaths()
-    {
-        return $this->getPluginLoader('filter')->getPaths();
-    }
-
-    /**
-     * Return associative array of path types => paths
-     *
-     * @return array
-     */
-    public function getAllPaths()
-    {
-        $paths = $this->_path;
-        $paths['helper'] = $this->getHelperPaths();
-        $paths['filter'] = $this->getFilterPaths();
-        return $paths;
-    }
-
-    /**
-     * Add one or more filters to the stack in FIFO order.
-     *
-     * @param string|array One or more filters to add.
-     * @return Zend_View_Abstract
-     */
-    public function addFilter($name)
-    {
-        foreach ((array) $name as $val) {
-            $this->_filter[] = $val;
-        }
-        return $this;
-    }
-
-    /**
-     * Resets the filter stack.
-     *
-     * To clear all filters, use Zend_View::setFilter(null).
-     *
-     * @param string|array One or more filters to set.
-     * @return Zend_View_Abstract
-     */
-    public function setFilter($name)
-    {
-        $this->_filter = array();
-        $this->addFilter($name);
-        return $this;
-    }
-
-    /**
-     * Sets the _escape() callback.
-     *
-     * @param mixed $spec The callback for _escape() to use.
-     * @return Zend_View_Abstract
-     */
-    public function setEscape($spec)
-    {
-        $this->_escape = $spec;
-        return $this;
-    }
-
-    /**
-     * Set LFI protection flag
-     *
-     * @param  bool $flag
-     * @return Zend_View_Abstract
-     */
-    public function setLfiProtection($flag)
-    {
-        $this->_lfiProtectionOn = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Return status of LFI protection flag
-     *
-     * @return bool
-     */
-    public function isLfiProtectionOn()
-    {
-        return $this->_lfiProtectionOn;
-    }
-
-    /**
-     * Assigns variables to the view script via differing strategies.
-     *
-     * Zend_View::assign('name', $value) assigns a variable called 'name'
-     * with the corresponding $value.
-     *
-     * Zend_View::assign($array) assigns the array keys as variable
-     * names (with the corresponding array values).
-     *
-     * @see    __set()
-     * @param  string|array The assignment strategy to use.
-     * @param  mixed (Optional) If assigning a named variable, use this
-     * as the value.
-     * @return Zend_View_Abstract Fluent interface
-     * @throws Zend_View_Exception if $spec is neither a string nor an array,
-     * or if an attempt to set a private or protected member is detected
-     */
-    public function assign($spec, $value = null)
-    {
-        // which strategy to use?
-        if (is_string($spec)) {
-            // assign by name and value
-            if ('_' == substr($spec, 0, 1)) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
-                $e->setView($this);
-                throw $e;
-            }
-            $this->$spec = $value;
-        } elseif (is_array($spec)) {
-            // assign from associative array
-            $error = false;
-            foreach ($spec as $key => $val) {
-                if ('_' == substr($key, 0, 1)) {
-                    $error = true;
-                    break;
-                }
-                $this->$key = $val;
-            }
-            if ($error) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception('Setting private or protected class members is not allowed');
-                $e->setView($this);
-                throw $e;
-            }
-        } else {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('assign() expects a string or array, received ' . gettype($spec));
-            $e->setView($this);
-            throw $e;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return list of all assigned variables
-     *
-     * Returns all public properties of the object. Reflection is not used
-     * here as testing reflection properties for visibility is buggy.
-     *
-     * @return array
-     */
-    public function getVars()
-    {
-        $vars   = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if ('_' == substr($key, 0, 1)) {
-                unset($vars[$key]);
-            }
-        }
-
-        return $vars;
-    }
-
-    /**
-     * Clear all assigned variables
-     *
-     * Clears all variables assigned to Zend_View either via {@link assign()} or
-     * property overloading ({@link __set()}).
-     *
-     * @return void
-     */
-    public function clearVars()
-    {
-        $vars   = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if ('_' != substr($key, 0, 1)) {
-                unset($this->$key);
-            }
-        }
-    }
-
-    /**
-     * Processes a view script and returns the output.
-     *
-     * @param string $name The script name to process.
-     * @return string The script output.
-     */
-    public function render($name)
-    {
-        // find the script file name using the parent private method
-        $this->_file = $this->_script($name);
-        unset($name); // remove $name from local scope
-
-        ob_start();
-        $this->_run($this->_file);
-
-        return $this->_filter(ob_get_clean()); // filter output
-    }
-
-    /**
-     * Escapes a value for output in a view script.
-     *
-     * If escaping mechanism is one of htmlspecialchars or htmlentities, uses
-     * {@link $_encoding} setting.
-     *
-     * @param mixed $var The output to escape.
-     * @return mixed The escaped value.
-     */
-    public function escape($var)
-    {
-        if (in_array($this->_escape, array('htmlspecialchars', 'htmlentities'))) {
-            return call_user_func($this->_escape, $var, ENT_COMPAT, $this->_encoding);
-        }
-
-        return call_user_func($this->_escape, $var);
-    }
-
-    /**
-     * Set encoding to use with htmlentities() and htmlspecialchars()
-     *
-     * @param string $encoding
-     * @return Zend_View_Abstract
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * Return current escape encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Enable or disable strict vars
-     *
-     * If strict variables are enabled, {@link __get()} will raise a notice
-     * when a variable is not defined.
-     *
-     * Use in conjunction with {@link Zend_View_Helper_DeclareVars the declareVars() helper}
-     * to enforce strict variable handling in your view scripts.
-     *
-     * @param  boolean $flag
-     * @return Zend_View_Abstract
-     */
-    public function strictVars($flag = true)
-    {
-        $this->_strictVars = ($flag) ? true : false;
-
-        return $this;
-    }
-
-    /**
-     * Finds a view script from the available directories.
-     *
-     * @param $name string The base name of the script.
-     * @return void
-     */
-    protected function _script($name)
-    {
-        if ($this->isLfiProtectionOn() && preg_match('#\.\.[\\\/]#', $name)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Requested scripts may not include parent directory traversal ("../", "..\\" notation)');
-            $e->setView($this);
-            throw $e;
-        }
-
-        if (0 == count($this->_path['script'])) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('no view script directory set; unable to determine location for view script');
-            $e->setView($this);
-            throw $e;
-        }
-
-        foreach ($this->_path['script'] as $dir) {
-            if (is_readable($dir . $name)) {
-                return $dir . $name;
-            }
-        }
-
-        require_once 'Zend/View/Exception.php';
-        $message = "script '$name' not found in path ("
-                 . implode(PATH_SEPARATOR, $this->_path['script'])
-                 . ")";
-        $e = new Zend_View_Exception($message);
-        $e->setView($this);
-        throw $e;
-    }
-
-    /**
-     * Applies the filter callback to a buffer.
-     *
-     * @param string $buffer The buffer contents.
-     * @return string The filtered buffer.
-     */
-    private function _filter($buffer)
-    {
-        // loop through each filter class
-        foreach ($this->_filter as $name) {
-            // load and apply the filter class
-            $filter = $this->getFilter($name);
-            $buffer = call_user_func(array($filter, 'filter'), $buffer);
-        }
-
-        // done!
-        return $buffer;
-    }
-
-    /**
-     * Adds paths to the path stack in LIFO order.
-     *
-     * Zend_View::_addPath($type, 'dirname') adds one directory
-     * to the path stack.
-     *
-     * Zend_View::_addPath($type, $array) adds one directory for
-     * each array element value.
-     *
-     * In the case of filter and helper paths, $prefix should be used to
-     * specify what class prefix to use with the given path.
-     *
-     * @param string $type The path type ('script', 'helper', or 'filter').
-     * @param string|array $path The path specification.
-     * @param string $prefix Class prefix to use with path (helpers and filters
-     * only)
-     * @return void
-     */
-    private function _addPath($type, $path, $prefix = null)
-    {
-        foreach ((array) $path as $dir) {
-            // attempt to strip any possible separator and
-            // append the system directory separator
-            $dir  = rtrim($dir, '/');
-            $dir  = rtrim($dir, '\\');
-            $dir .= '/';
-
-            switch ($type) {
-                case 'script':
-                    // add to the top of the stack.
-                    array_unshift($this->_path[$type], $dir);
-                    break;
-                case 'filter':
-                case 'helper':
-                default:
-                    // add as array with prefix and dir keys
-                    array_unshift($this->_path[$type], array('prefix' => $prefix, 'dir' => $dir));
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Resets the path stack for helpers and filters.
-     *
-     * @param string $type The path type ('helper' or 'filter').
-     * @param string|array $path The directory (-ies) to set as the path.
-     * @param string $classPrefix Class prefix to apply to elements of $path
-     */
-    private function _setPath($type, $path, $classPrefix = null)
-    {
-        $dir = DIRECTORY_SEPARATOR . ucfirst($type) . DIRECTORY_SEPARATOR;
-
-        switch ($type) {
-            case 'script':
-                $this->_path[$type] = array(dirname(__FILE__) . $dir);
-                $this->_addPath($type, $path);
-                break;
-            case 'filter':
-            case 'helper':
-            default:
-                $this->_path[$type] = array(array(
-                    'prefix' => 'Zend_View_' . ucfirst($type) . '_',
-                    'dir'    => dirname(__FILE__) . $dir
-                ));
-                $this->_addPath($type, $path, $classPrefix);
-                break;
-        }
-    }
-
-    /**
-     * Return all paths for a given path type
-     *
-     * @param string $type The path type  ('helper', 'filter', 'script')
-     * @return array
-     */
-    private function _getPaths($type)
-    {
-        return $this->_path[$type];
-    }
-
-    /**
-     * Register helper class as loaded
-     *
-     * @param  string $name
-     * @param  string $class
-     * @param  string $file path to class file
-     * @return void
-     */
-    private function _setHelperClass($name, $class, $file)
-    {
-        $this->_helperLoadedDir[$name] = $file;
-        $this->_helperLoaded[$name]    = $class;
-    }
-
-    /**
-     * Register filter class as loaded
-     *
-     * @param  string $name
-     * @param  string $class
-     * @param  string $file path to class file
-     * @return void
-     */
-    private function _setFilterClass($name, $class, $file)
-    {
-        $this->_filterLoadedDir[$name] = $file;
-        $this->_filterLoaded[$name]    = $class;
-    }
-
-    /**
-     * Add a prefixPath for a plugin type
-     *
-     * @param  string $type
-     * @param  string $classPrefix
-     * @param  array $paths
-     * @return Zend_View_Abstract
-     */
-    private function _addPluginPath($type, $classPrefix, array $paths)
-    {
-        $loader = $this->getPluginLoader($type);
-        foreach ($paths as $path) {
-            $loader->addPrefixPath($classPrefix, $path);
-        }
-        return $this;
-    }
-
-    /**
-     * Get a path to a given plugin class of a given type
-     *
-     * @param  string $type
-     * @param  string $name
-     * @return string|false
-     */
-    private function _getPluginPath($type, $name)
-    {
-        $loader = $this->getPluginLoader($type);
-        if ($loader->isLoaded($name)) {
-            return $loader->getClassPath($name);
-        }
-
-        try {
-            $loader->load($name);
-            return $loader->getClassPath($name);
-        } catch (Zend_Loader_Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Retrieve a plugin object
-     *
-     * @param  string $type
-     * @param  string $name
-     * @return object
-     */
-    private function _getPlugin($type, $name)
-    {
-        $name = ucfirst($name);
-        switch ($type) {
-            case 'filter':
-                $storeVar = '_filterClass';
-                $store    = $this->_filterClass;
-                break;
-            case 'helper':
-                $storeVar = '_helper';
-                $store    = $this->_helper;
-                break;
-        }
-
-        if (!isset($store[$name])) {
-            $class = $this->getPluginLoader($type)->load($name);
-            $store[$name] = new $class();
-            if (method_exists($store[$name], 'setView')) {
-                $store[$name]->setView($this);
-            }
-        }
-
-        $this->$storeVar = $store;
-        return $store[$name];
-    }
-
-    /**
-     * Use to include the view script in a scope that only allows public
-     * members.
-     *
-     * @return mixed
-     */
-    abstract protected function _run();
-}
diff --git a/airtime_mvc/library/Zend/View/Exception.php b/airtime_mvc/library/Zend/View/Exception.php
deleted file mode 100644
index 70afa4ae2..000000000
--- a/airtime_mvc/library/Zend/View/Exception.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * Exception for Zend_View class.
- *
- * @category   Zend
- * @package    Zend_Date
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Exception extends Zend_Exception
-{
-    protected $view = null;
-
-    public function setView(Zend_View_Interface $view = null)
-    {
-        $this->view = $view;
-        return $this;
-    }
-
-    public function getView()
-    {
-        return $this->view;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Abstract.php b/airtime_mvc/library/Zend/View/Helper/Abstract.php
deleted file mode 100644
index a1560b849..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Abstract.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Interface
- */
-require_once 'Zend/View/Helper/Interface.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_Abstract implements Zend_View_Helper_Interface
-{
-    /**
-     * View object
-     *
-     * @var Zend_View_Interface
-     */
-    public $view = null;
-
-    /**
-     * Set the View object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_View_Helper_Abstract
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-        return $this;
-    }
-
-    /**
-     * Strategy pattern: currently unutilized
-     *
-     * @return void
-     */
-    public function direct()
-    {
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Action.php b/airtime_mvc/library/Zend/View/Helper/Action.php
deleted file mode 100644
index e677cd38e..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Action.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Action.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for rendering output of a controller action
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Action extends Zend_View_Helper_Abstract
-{
-    /**
-     * @var string
-     */
-    public $defaultModule;
-
-    /**
-     * @var Zend_Controller_Dispatcher_Interface
-     */
-    public $dispatcher;
-
-    /**
-     * @var Zend_Controller_Request_Abstract
-     */
-    public $request;
-
-    /**
-     * @var Zend_Controller_Response_Abstract
-     */
-    public $response;
-
-    /**
-     * Constructor
-     *
-     * Grab local copies of various MVC objects
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $front   = Zend_Controller_Front::getInstance();
-        $modules = $front->getControllerDirectory();
-        if (empty($modules)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Action helper depends on valid front controller instance');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $request  = $front->getRequest();
-        $response = $front->getResponse();
-
-        if (empty($request) || empty($response)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Action view helper requires both a registered request and response object in the front controller instance');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->request       = clone $request;
-        $this->response      = clone $response;
-        $this->dispatcher    = clone $front->getDispatcher();
-        $this->defaultModule = $front->getDefaultModule();
-    }
-
-    /**
-     * Reset object states
-     *
-     * @return void
-     */
-    public function resetObjects()
-    {
-        $params = $this->request->getUserParams();
-        foreach (array_keys($params) as $key) {
-            $this->request->setParam($key, null);
-        }
-
-        $this->response->clearBody();
-        $this->response->clearHeaders()
-                       ->clearRawHeaders();
-    }
-
-    /**
-     * Retrieve rendered contents of a controller action
-     *
-     * If the action results in a forward or redirect, returns empty string.
-     *
-     * @param  string $action
-     * @param  string $controller
-     * @param  string $module Defaults to default module
-     * @param  array $params
-     * @return string
-     */
-    public function action($action, $controller, $module = null, array $params = array())
-    {
-        $this->resetObjects();
-        if (null === $module) {
-            $module = $this->defaultModule;
-        }
-
-        // clone the view object to prevent over-writing of view variables
-        $viewRendererObj = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
-        Zend_Controller_Action_HelperBroker::addHelper(clone $viewRendererObj);
-
-        $this->request->setParams($params)
-                      ->setModuleName($module)
-                      ->setControllerName($controller)
-                      ->setActionName($action)
-                      ->setDispatched(true);
-
-        $this->dispatcher->dispatch($this->request, $this->response);
-
-        // reset the viewRenderer object to it's original state
-        Zend_Controller_Action_HelperBroker::addHelper($viewRendererObj);
-
-
-        if (!$this->request->isDispatched()
-            || $this->response->isRedirect())
-        {
-            // forwards and redirects render nothing
-            return '';
-        }
-
-        $return = $this->response->getBody();
-        $this->resetObjects();
-        return $return;
-    }
-
-    /**
-     * Clone the current View
-     *
-     * @return Zend_View_Interface
-     */
-    public function cloneView()
-    {
-        $view = clone $this->view;
-        $view->clearVars();
-        return $view;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/BaseUrl.php b/airtime_mvc/library/Zend/View/Helper/BaseUrl.php
deleted file mode 100644
index 2c7da7e7a..000000000
--- a/airtime_mvc/library/Zend/View/Helper/BaseUrl.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: BaseUrl.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** @see Zend_View_Helper_Abstract */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for retrieving the BaseUrl
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_BaseUrl extends Zend_View_Helper_Abstract
-{
-    /**
-     * BaseUrl
-     *
-     * @var string
-     */
-    protected $_baseUrl;
-
-    /**
-     * Returns site's base url, or file with base url prepended
-     *
-     * $file is appended to the base url for simplicity
-     *
-     * @param  string|null $file
-     * @return string
-     */
-    public function baseUrl($file = null)
-    {
-        // Get baseUrl
-        $baseUrl = $this->getBaseUrl();
-
-        // Remove trailing slashes
-        if (null !== $file) {
-            $file = '/' . ltrim($file, '/\\');
-        }
-
-        return $baseUrl . $file;
-    }
-
-    /**
-     * Set BaseUrl
-     *
-     * @param  string $base
-     * @return Zend_View_Helper_BaseUrl
-     */
-    public function setBaseUrl($base)
-    {
-        $this->_baseUrl = rtrim($base, '/\\');
-        return $this;
-    }
-
-    /**
-     * Get BaseUrl
-     *
-     * @return string
-     */
-    public function getBaseUrl()
-    {
-        if ($this->_baseUrl === null) {
-            /** @see Zend_Controller_Front */
-            require_once 'Zend/Controller/Front.php';
-            $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
-
-            // Remove scriptname, eg. index.php from baseUrl
-            $baseUrl = $this->_removeScriptName($baseUrl);
-
-            $this->setBaseUrl($baseUrl);
-        }
-
-        return $this->_baseUrl;
-    }
-
-    /**
-     * Remove Script filename from baseurl
-     *
-     * @param  string $url
-     * @return string
-     */
-    protected function _removeScriptName($url)
-    {
-        if (!isset($_SERVER['SCRIPT_NAME'])) {
-            // We can't do much now can we? (Well, we could parse out by ".")
-            return $url;
-        }
-
-        if (($pos = strripos($url, basename($_SERVER['SCRIPT_NAME']))) !== false) {
-            $url = substr($url, 0, $pos);
-        }
-
-        return $url;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Currency.php b/airtime_mvc/library/Zend/View/Helper/Currency.php
deleted file mode 100644
index 08bdbce63..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Currency.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id:$
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Currency view helper
- *
- * @category  Zend
- * @package   Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract
-{
-    /**
-     * Currency object
-     *
-     * @var Zend_Currency
-     */
-    protected $_currency;
-
-    /**
-     * Constructor for manually handling
-     *
-     * @param  Zend_Currency $currency Instance of Zend_Currency
-     * @return void
-     */
-    public function __construct($currency = null)
-    {
-        if ($currency === null) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Currency')) {
-                $currency = Zend_Registry::get('Zend_Currency');
-            }
-        }
-
-        $this->setCurrency($currency);
-    }
-
-    /**
-     * Output a formatted currency
-     *
-     * @param  integer|float                    $value    Currency value to output
-     * @param  string|Zend_Locale|Zend_Currency $currency OPTIONAL Currency to use for this call
-     * @return string Formatted currency
-     */
-    public function currency($value = null, $currency = null)
-    {
-        if ($value === null) {
-            return $this;
-        }
-
-        if (is_string($currency) || ($currency instanceof Zend_Locale)) {
-            require_once 'Zend/Locale.php';
-            if (Zend_Locale::isLocale($currency)) {
-                $currency = array('locale' => $currency);
-            }
-        }
-
-        if (is_string($currency)) {
-            $currency = array('currency' => $currency);
-        }
-
-        if (is_array($currency)) {
-            return $this->_currency->toCurrency($value, $currency);
-        }
-
-        return $this->_currency->toCurrency($value);
-    }
-
-    /**
-     * Sets a currency to use
-     *
-     * @param  Zend_Currency|String|Zend_Locale $currency Currency to use
-     * @throws Zend_View_Exception When no or a false currency was set
-     * @return Zend_View_Helper_Currency
-     */
-    public function setCurrency($currency = null)
-    {
-        if (!$currency instanceof Zend_Currency) {
-            require_once 'Zend/Currency.php';
-            $currency = new Zend_Currency($currency);
-        }
-        $this->_currency = $currency;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve currency object
-     *
-     * @return Zend_Currency|null
-     */
-    public function getCurrency()
-    {
-        return $this->_currency;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Cycle.php b/airtime_mvc/library/Zend/View/Helper/Cycle.php
deleted file mode 100644
index 7f42bb100..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Cycle.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Cycle.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Helper for alternating between set of values
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Cycle implements Iterator
-{
-
-    /**
-     * Default name
-     * @var string
-     */
-    const DEFAULT_NAME = 'default';
-
-    /**
-     * Pointers
-     *
-     * @var array
-     */
-    protected $_pointers = array(self::DEFAULT_NAME =>-1) ;
-
-    /**
-     * Array of values
-     *
-     * @var array
-     */
-    protected $_data = array(self::DEFAULT_NAME=>array());
-
-    /**
-     * Actual name of cycle
-     *
-     * @var string
-     */
-    protected $_name = self::DEFAULT_NAME;
-
-    /**
-     * Add elements to alternate
-     *
-     * @param array $data
-     * @param string $name
-     * @return Zend_View_Helper_Cycle
-     */
-    public function cycle(array $data = array(), $name = self::DEFAULT_NAME)
-    {
-        if(!empty($data))
-           $this->_data[$name] = $data;
-
-        $this->setName($name);
-        return $this;
-    }
-
-    /**
-     * Add elements to alternate
-     *
-     * @param array $data
-     * @param string $name
-     * @return Zend_View_Helper_Cycle
-     */
-    public function assign(Array $data , $name = self::DEFAULT_NAME)
-    {
-        $this->setName($name);
-        $this->_data[$name] = $data;
-        $this->rewind();
-        return $this;
-    }
-
-    /**
-     * Sets actual name of cycle
-     *
-     * @param $name
-     * @return Zend_View_Helper_Cycle
-     */
-    public function setName($name = self::DEFAULT_NAME)
-    {
-       $this->_name = $name;
-
-       if(!isset($this->_data[$this->_name]))
-         $this->_data[$this->_name] = array();
-
-       if(!isset($this->_pointers[$this->_name]))
-         $this->rewind();
-
-       return $this;
-    }
-
-    /**
-     * Gets actual name of cycle
-     *
-     * @param $name
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-
-    /**
-     * Return all elements
-     *
-     * @return array
-     */
-    public function getAll()
-    {
-        return $this->_data[$this->_name];
-    }
-
-    /**
-     * Turn helper into string
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return (string) $this->_data[$this->_name][$this->key()];
-    }
-
-    /**
-     * Cast to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Move to next value
-     *
-     * @return Zend_View_Helper_Cycle
-     */
-    public function next()
-    {
-        $count = count($this->_data[$this->_name]);
-        if ($this->_pointers[$this->_name] == ($count - 1))
-            $this->_pointers[$this->_name] = 0;
-        else
-            $this->_pointers[$this->_name] = ++$this->_pointers[$this->_name];
-        return $this;
-    }
-
-    /**
-     * Move to previous value
-     *
-     * @return Zend_View_Helper_Cycle
-     */
-    public function prev()
-    {
-        $count = count($this->_data[$this->_name]);
-        if ($this->_pointers[$this->_name] <= 0)
-            $this->_pointers[$this->_name] = $count - 1;
-        else
-            $this->_pointers[$this->_name] = --$this->_pointers[$this->_name];
-        return $this;
-    }
-
-    /**
-     * Return iteration number
-     *
-     * @return int
-     */
-    public function key()
-    {
-        if ($this->_pointers[$this->_name] < 0)
-            return 0;
-        else
-            return $this->_pointers[$this->_name];
-    }
-
-    /**
-     * Rewind pointer
-     *
-     * @return Zend_View_Helper_Cycle
-     */
-    public function rewind()
-    {
-        $this->_pointers[$this->_name] = -1;
-        return $this;
-    }
-
-    /**
-     * Check if element is valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return isset($this->_data[$this->_name][$this->key()]);
-    }
-
-    /**
-     * Return  current element
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        return $this->_data[$this->_name][$this->key()];
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/DeclareVars.php b/airtime_mvc/library/Zend/View/Helper/DeclareVars.php
deleted file mode 100644
index 251bff07d..000000000
--- a/airtime_mvc/library/Zend/View/Helper/DeclareVars.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: DeclareVars.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for declaring default values of template variables
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_DeclareVars extends Zend_View_Helper_Abstract
-{
-    /**
-     * The view object that created this helper object.
-     * @var Zend_View
-     */
-    public $view;
-
-    /**
-     * Declare template vars to set default values and avoid notices when using strictVars
-     *
-     * Primarily for use when using {@link Zend_View_Abstract::strictVars() Zend_View strictVars()},
-     * this helper can be used to declare template variables that may or may
-     * not already be set in the view object, as well as to set default values.
-     * Arrays passed as arguments to the method will be used to set default
-     * values; otherwise, if the variable does not exist, it is set to an empty
-     * string.
-     *
-     * Usage:
-     * <code>
-     * $this->declareVars(
-     *     'varName1',
-     *     'varName2',
-     *     array('varName3' => 'defaultValue',
-     *           'varName4' => array()
-     *     )
-     * );
-     * </code>
-     *
-     * @param string|array variable number of arguments, all string names of variables to test
-     * @return void
-     */
-    public function declareVars()
-    {
-        $args = func_get_args();
-        foreach($args as $key) {
-            if (is_array($key)) {
-                foreach ($key as $name => $value) {
-                    $this->_declareVar($name, $value);
-                }
-            } else if (!isset($view->$key)) {
-                $this->_declareVar($key);
-            }
-        }
-    }
-
-    /**
-     * Set a view variable
-     *
-     * Checks to see if a $key is set in the view object; if not, sets it to $value.
-     *
-     * @param  string $key
-     * @param  string $value Defaults to an empty string
-     * @return void
-     */
-    protected function _declareVar($key, $value = '')
-    {
-        if (!isset($this->view->$key)) {
-            $this->view->$key = $value;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Doctype.php b/airtime_mvc/library/Zend/View/Helper/Doctype.php
deleted file mode 100644
index 4c13cb1bf..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Doctype.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Doctype.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Registry */
-require_once 'Zend/Registry.php';
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for setting and retrieving the doctype
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
-{
-    /**#@+
-     * DocType constants
-     */
-    const XHTML11             = 'XHTML11';
-    const XHTML1_STRICT       = 'XHTML1_STRICT';
-    const XHTML1_TRANSITIONAL = 'XHTML1_TRANSITIONAL';
-    const XHTML1_FRAMESET     = 'XHTML1_FRAMESET';
-    const XHTML_BASIC1        = 'XHTML_BASIC1';
-    const XHTML5              = 'XHTML5';
-    const HTML4_STRICT        = 'HTML4_STRICT';
-    const HTML4_LOOSE         = 'HTML4_LOOSE';
-    const HTML4_FRAMESET      = 'HTML4_FRAMESET';
-    const HTML5               = 'HTML5';
-    const CUSTOM_XHTML        = 'CUSTOM_XHTML';
-    const CUSTOM              = 'CUSTOM';
-    /**#@-*/
-
-    /**
-     * Default DocType
-     * @var string
-     */
-    protected $_defaultDoctype = self::HTML4_LOOSE;
-
-    /**
-     * Registry containing current doctype and mappings
-     * @var ArrayObject
-     */
-    protected $_registry;
-
-    /**
-     * Registry key in which helper is stored
-     * @var string
-     */
-    protected $_regKey = 'Zend_View_Helper_Doctype';
-
-    /**
-     * Constructor
-     *
-     * Map constants to doctype strings, and set default doctype
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        if (!Zend_Registry::isRegistered($this->_regKey)) {
-            $this->_registry = new ArrayObject(array(
-                'doctypes' => array(
-                    self::XHTML11             => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-                    self::XHTML1_STRICT       => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-                    self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-                    self::XHTML1_FRAMESET     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-                    self::XHTML_BASIC1        => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">',
-                    self::XHTML5              => '<!DOCTYPE html>',
-                    self::HTML4_STRICT        => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-                    self::HTML4_LOOSE         => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-                    self::HTML4_FRAMESET      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
-                    self::HTML5               => '<!DOCTYPE html>',
-                )
-            ));
-            Zend_Registry::set($this->_regKey, $this->_registry);
-            $this->setDoctype($this->_defaultDoctype);
-        } else {
-            $this->_registry = Zend_Registry::get($this->_regKey);
-        }
-    }
-
-    /**
-     * Set or retrieve doctype
-     *
-     * @param  string $doctype
-     * @return Zend_View_Helper_Doctype
-     */
-    public function doctype($doctype = null)
-    {
-        if (null !== $doctype) {
-            switch ($doctype) {
-                case self::XHTML11:
-                case self::XHTML1_STRICT:
-                case self::XHTML1_TRANSITIONAL:
-                case self::XHTML1_FRAMESET:
-                case self::XHTML_BASIC1:
-                case self::XHTML5:
-                case self::HTML4_STRICT:
-                case self::HTML4_LOOSE:
-                case self::HTML4_FRAMESET:
-                case self::HTML5:
-                    $this->setDoctype($doctype);
-                    break;
-                default:
-                    if (substr($doctype, 0, 9) != '<!DOCTYPE') {
-                        require_once 'Zend/View/Exception.php';
-                        $e = new Zend_View_Exception('The specified doctype is malformed');
-                        $e->setView($this->view);
-                        throw $e;
-                    }
-                    if (stristr($doctype, 'xhtml')) {
-                        $type = self::CUSTOM_XHTML;
-                    } else {
-                        $type = self::CUSTOM;
-                    }
-                    $this->setDoctype($type);
-                    $this->_registry['doctypes'][$type] = $doctype;
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set doctype
-     *
-     * @param  string $doctype
-     * @return Zend_View_Helper_Doctype
-     */
-    public function setDoctype($doctype)
-    {
-        $this->_registry['doctype'] = $doctype;
-        return $this;
-    }
-
-    /**
-     * Retrieve doctype
-     *
-     * @return string
-     */
-    public function getDoctype()
-    {
-        return $this->_registry['doctype'];
-    }
-
-    /**
-     * Get doctype => string mappings
-     *
-     * @return array
-     */
-    public function getDoctypes()
-    {
-        return $this->_registry['doctypes'];
-    }
-
-    /**
-     * Is doctype XHTML?
-     *
-     * @return boolean
-     */
-    public function isXhtml()
-    {
-        return (stristr($this->getDoctype(), 'xhtml') ? true : false);
-    }
-	
-	/**
-	 * Is doctype HTML5? (HeadMeta uses this for validation)
-	 *
-	 * @return booleean
-	 */
-	public function isHtml5() {
-		return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false);
-	}
-
-    /**
-     * String representation of doctype
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $doctypes = $this->getDoctypes();
-        return $doctypes[$this->getDoctype()];
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Fieldset.php b/airtime_mvc/library/Zend/View/Helper/Fieldset.php
deleted file mode 100644
index 8d9ee267d..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Fieldset.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Fieldset.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_FormElement */
-require_once 'Zend/View/Helper/FormElement.php';
-
-/**
- * Helper for rendering fieldsets
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Fieldset extends Zend_View_Helper_FormElement
-{
-    /**
-     * Render HTML form
-     *
-     * @param  string $name Form name
-     * @param  string $content Form content
-     * @param  array $attribs HTML form attributes
-     * @return string
-     */
-    public function fieldset($name, $content, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $content, $attribs);
-        extract($info);
-
-        // get legend
-        $legend = '';
-        if (isset($attribs['legend'])) {
-            $legendString = trim($attribs['legend']);
-            if (!empty($legendString)) {
-                $legend = '<legend>'
-                        . (($escape) ? $this->view->escape($legendString) : $legendString)
-                        . '</legend>' . PHP_EOL;
-            }
-            unset($attribs['legend']);
-        }
-
-        // get id
-        if (!empty($id)) {
-            $id = ' id="' . $this->view->escape($id) . '"';
-        } else {
-            $id = '';
-        }
-
-        // render fieldset
-        $xhtml = '<fieldset'
-               . $id
-               . $this->_htmlAttribs($attribs)
-               . '>'
-               . $legend
-               . $content
-               . '</fieldset>';
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Form.php b/airtime_mvc/library/Zend/View/Helper/Form.php
deleted file mode 100644
index c0fac06a7..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Form.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_FormElement */
-require_once 'Zend/View/Helper/FormElement.php';
-
-/**
- * Helper for rendering HTML forms
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Form extends Zend_View_Helper_FormElement
-{
-    /**
-     * Render HTML form
-     *
-     * @param  string $name Form name
-     * @param  null|array $attribs HTML form attributes
-     * @param  false|string $content Form content
-     * @return string
-     */
-    public function form($name, $attribs = null, $content = false)
-    {
-        $info = $this->_getInfo($name, $content, $attribs);
-        extract($info);
-
-        if (!empty($id)) {
-            $id = ' id="' . $this->view->escape($id) . '"';
-        } else {
-            $id = '';
-        }
-
-        if (array_key_exists('id', $attribs) && empty($attribs['id'])) {
-            unset($attribs['id']);
-        }
-
-        $xhtml = '<form'
-               . $id
-               . $this->_htmlAttribs($attribs)
-               . '>';
-
-        if (false !== $content) {
-            $xhtml .= $content
-                   .  '</form>';
-        }
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormButton.php b/airtime_mvc/library/Zend/View/Helper/FormButton.php
deleted file mode 100644
index bfb1e2c1e..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormButton.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormButton.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "button" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormButton extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'button' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formButton($name, $value = null, $attribs = null)
-    {
-        $info    = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, id, value, attribs, options, listsep, disable
-
-        // Get content
-        $content = '';
-        if (isset($attribs['content'])) {
-            $content = $attribs['content'];
-            unset($attribs['content']);
-        } else {
-            $content = $value;
-        }
-
-        // Ensure type is sane
-        $type = 'button';
-        if (isset($attribs['type'])) {
-            $attribs['type'] = strtolower($attribs['type']);
-            if (in_array($attribs['type'], array('submit', 'reset', 'button'))) {
-                $type = $attribs['type'];
-            }
-            unset($attribs['type']);
-        }
-
-        // build the element
-        if ($disable) {
-            $attribs['disabled'] = 'disabled';
-        }
-
-        $content = ($escape) ? $this->view->escape($content) : $content;
-
-        $xhtml = '<button'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . ' type="' . $type . '"';
-
-        // add a value if one is given
-        if (!empty($value)) {
-            $xhtml .= ' value="' . $this->view->escape($value) . '"';
-        }
-
-        // add attributes and close start tag
-        $xhtml .= $this->_htmlAttribs($attribs) . '>';
-
-        // add content and end tag
-        $xhtml .= $content . '</button>';
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormCheckbox.php b/airtime_mvc/library/Zend/View/Helper/FormCheckbox.php
deleted file mode 100644
index 1baef884c..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormCheckbox.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "checkbox" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormCheckbox extends Zend_View_Helper_FormElement
-{
-    /**
-     * Default checked/unchecked options
-     * @var array
-     */
-    protected static $_defaultCheckedOptions = array(
-        'checkedValue'   => '1',
-        'uncheckedValue' => '0'
-    );
-
-    /**
-     * Generates a 'checkbox' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     * @param mixed $value The element value.
-     * @param array $attribs Attributes for the element tag.
-     * @return string The element XHTML.
-     */
-    public function formCheckbox($name, $value = null, $attribs = null, array $checkedOptions = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, id, value, attribs, options, listsep, disable
-
-        $checked = false;
-        if (isset($attribs['checked']) && $attribs['checked']) {
-            $checked = true;
-            unset($attribs['checked']);
-        } elseif (isset($attribs['checked'])) {
-            $checked = false;
-            unset($attribs['checked']);
-        }
-
-        $checkedOptions = self::determineCheckboxInfo($value, $checked, $checkedOptions);
-
-        // is the element disabled?
-        $disabled = '';
-        if ($disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // build the element
-        $xhtml = '';
-        if (!$disable && !strstr($name, '[]')) {
-            $xhtml = $this->_hidden($name, $checkedOptions['uncheckedValue']);
-        }
-        $xhtml .= '<input type="checkbox"'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . ' value="' . $this->view->escape($checkedOptions['checkedValue']) . '"'
-                . $checkedOptions['checkedString']
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . $endTag;
-
-        return $xhtml;
-    }
-
-    /**
-     * Determine checkbox information
-     *
-     * @param  string $value
-     * @param  bool $checked
-     * @param  array|null $checkedOptions
-     * @return array
-     */
-    public static function determineCheckboxInfo($value, $checked, array $checkedOptions = null)
-    {
-        // Checked/unchecked values
-        $checkedValue   = null;
-        $uncheckedValue = null;
-        if (is_array($checkedOptions)) {
-            if (array_key_exists('checkedValue', $checkedOptions)) {
-                $checkedValue = (string) $checkedOptions['checkedValue'];
-                unset($checkedOptions['checkedValue']);
-            }
-            if (array_key_exists('uncheckedValue', $checkedOptions)) {
-                $uncheckedValue = (string) $checkedOptions['uncheckedValue'];
-                unset($checkedOptions['uncheckedValue']);
-            }
-            if (null === $checkedValue) {
-                $checkedValue = (string) array_shift($checkedOptions);
-            }
-            if (null === $uncheckedValue) {
-                $uncheckedValue = (string) array_shift($checkedOptions);
-            }
-        } elseif ($value !== null) {
-            $uncheckedValue = self::$_defaultCheckedOptions['uncheckedValue'];
-        } else {
-            $checkedValue   = self::$_defaultCheckedOptions['checkedValue'];
-            $uncheckedValue = self::$_defaultCheckedOptions['uncheckedValue'];
-        }
-
-        // is the element checked?
-        $checkedString = '';
-        if ($checked || ((string) $value === $checkedValue)) {
-            $checkedString = ' checked="checked"';
-            $checked = true;
-        } else {
-            $checked = false;
-        }
-
-        // Checked value should be value if no checked options provided
-        if ($checkedValue == null) {
-            $checkedValue = $value;
-        }
-
-        return array(
-            'checked'        => $checked,
-            'checkedString'  => $checkedString,
-            'checkedValue'   => $checkedValue,
-            'uncheckedValue' => $uncheckedValue,
-        );
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormElement.php b/airtime_mvc/library/Zend/View/Helper/FormElement.php
deleted file mode 100644
index 08736271d..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormElement.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormElement.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_HtmlElement
- */
-require_once 'Zend/View/Helper/HtmlElement.php';
-
-/**
- * Base helper for form elements.  Extend this, don't use it on its own.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_FormElement extends Zend_View_Helper_HtmlElement
-{
-    /**
-     * @var Zend_Translate
-     */
-    protected $_translator;
-
-    /**
-     * Get translator
-     *
-     * @return Zend_Translate
-     */
-    public function getTranslator()
-    {
-         return $this->_translator;
-    }
-
-    /**
-     * Set translator
-     *
-     * @param  $translator|null Zend_Translate
-     * @return Zend_View_Helper_FormElement
-     */
-    public function setTranslator($translator = null)
-    {
-        if (null === $translator) {
-            $this->_translator = null;
-        } elseif ($translator instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        } else {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid translator specified');
-            $e->setView($this->view);
-            throw $e;
-        }
-         return $this;
-    }
-
-    /**
-     * Converts parameter arguments to an element info array.
-     *
-     * E.g, formExample($name, $value, $attribs, $options, $listsep) is
-     * the same thing as formExample(array('name' => ...)).
-     *
-     * Note that you cannot pass a 'disable' param; you need to pass
-     * it as an 'attribs' key.
-     *
-     * @access protected
-     *
-     * @return array An element info array with keys for name, value,
-     * attribs, options, listsep, disable, and escape.
-     */
-    protected function _getInfo($name, $value = null, $attribs = null,
-        $options = null, $listsep = null
-    ) {
-        // the baseline info.  note that $name serves a dual purpose;
-        // if an array, it's an element info array that will override
-        // these baseline values.  as such, ignore it for the 'name'
-        // if it's an array.
-        $info = array(
-            'name'    => is_array($name) ? '' : $name,
-            'id'      => is_array($name) ? '' : $name,
-            'value'   => $value,
-            'attribs' => $attribs,
-            'options' => $options,
-            'listsep' => $listsep,
-            'disable' => false,
-            'escape'  => true,
-        );
-
-        // override with named args
-        if (is_array($name)) {
-            // only set keys that are already in info
-            foreach ($info as $key => $val) {
-                if (isset($name[$key])) {
-                    $info[$key] = $name[$key];
-                }
-            }
-        }
-
-        // force attribs to an array, per note from Orjan Persson.
-        settype($info['attribs'], 'array');
-
-        // Normalize readonly tag
-        if (isset($info['attribs']['readonly'])
-            && $info['attribs']['readonly'] != 'readonly')
-        {
-            $info['attribs']['readonly'] = 'readonly';
-        }
-
-        // Disable attribute
-        if (isset($info['attribs']['disable'])
-            && is_scalar($info['attribs']['disable']))
-        {
-            // disable the element
-            $info['disable'] = (bool)$info['attribs']['disable'];
-            unset($info['attribs']['disable']);
-        } elseif (isset($info['attribs']['disable'])
-            && is_array($info['attribs']['disable']))
-        {
-            $info['disable'] = $info['attribs']['disable'];
-            unset($info['attribs']['disable']);
-        }
-
-        // Set ID for element
-        if (isset($info['attribs']['id'])) {
-            $info['id'] = (string) $info['attribs']['id'];
-        } elseif (!isset($info['attribs']['id']) && !empty($info['name'])) {
-            $id = $info['name'];
-            if (substr($id, -2) == '[]') {
-                $id = substr($id, 0, strlen($id) - 2);
-            }
-            if (strstr($id, ']')) {
-                $id = trim($id, ']');
-                $id = str_replace('][', '-', $id);
-                $id = str_replace('[', '-', $id);
-            }
-            $info['id'] = $id;
-        }
-
-        // Determine escaping from attributes
-        if (isset($info['attribs']['escape'])) {
-            $info['escape'] = (bool) $info['attribs']['escape'];
-        }
-
-        // Determine listsetp from attributes
-        if (isset($info['attribs']['listsep'])) {
-            $info['listsep'] = (string) $info['attribs']['listsep'];
-        }
-
-        // Remove attribs that might overwrite the other keys. We do this LAST
-        // because we needed the other attribs values earlier.
-        foreach ($info as $key => $val) {
-            if (isset($info['attribs'][$key])) {
-                unset($info['attribs'][$key]);
-            }
-        }
-
-        // done!
-        return $info;
-    }
-
-    /**
-     * Creates a hidden element.
-     *
-     * We have this as a common method because other elements often
-     * need hidden elements for their operation.
-     *
-     * @access protected
-     *
-     * @param $name The element name.
-     *
-     * @param $value The element value.
-     *
-     * @param $attribs Attributes for the element.
-     *
-     * @return string A hidden element.
-     */
-    protected function _hidden($name, $value = null, $attribs = null)
-    {
-        return '<input type="hidden"'
-             . ' name="' . $this->view->escape($name) . '"'
-             . ' value="' . $this->view->escape($value) . '"'
-             . $this->_htmlAttribs($attribs) . $this->getClosingBracket();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormErrors.php b/airtime_mvc/library/Zend/View/Helper/FormErrors.php
deleted file mode 100644
index a3a44cd14..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormErrors.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormErrors.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to render errors for a form element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormErrors extends Zend_View_Helper_FormElement
-{
-    /**
-     * @var Zend_Form_Element
-     */
-    protected $_element;
-
-    /**#@+
-     * @var string Element block start/end tags and separator
-     */
-    protected $_htmlElementEnd       = '</li></ul>';
-    protected $_htmlElementStart     = '<ul%s><li>';
-    protected $_htmlElementSeparator = '</li><li>';
-    /**#@-*/
-
-    /**
-     * Render form errors
-     *
-     * @param  string|array $errors Error(s) to render
-     * @param  array $options
-     * @return string
-     */
-    public function formErrors($errors, array $options = null)
-    {
-        $escape = true;
-        if (isset($options['escape'])) {
-            $escape = (bool) $options['escape'];
-            unset($options['escape']);
-        }
-
-        if (empty($options['class'])) {
-            $options['class'] = 'errors';
-        }
-
-        $start = $this->getElementStart();
-        if (strstr($start, '%s')) {
-            $attribs = $this->_htmlAttribs($options);
-            $start   = sprintf($start, $attribs);
-        }
-
-        if ($escape) {
-            foreach ($errors as $key => $error) {
-                $errors[$key] = $this->view->escape($error);
-            }
-        }
-
-        $html  = $start
-               . implode($this->getElementSeparator(), (array) $errors)
-               . $this->getElementEnd();
-
-        return $html;
-    }
-
-    /**
-     * Set end string for displaying errors
-     *
-     * @param  string $string
-     * @return Zend_View_Helper_FormErrors
-     */
-    public function setElementEnd($string)
-    {
-        $this->_htmlElementEnd = (string) $string;
-        return $this;
-    }
-
-    /**
-     * Retrieve end string for displaying errors
-     *
-     * @return string
-     */
-    public function getElementEnd()
-    {
-        return $this->_htmlElementEnd;
-    }
-
-    /**
-     * Set separator string for displaying errors
-     *
-     * @param  string $string
-     * @return Zend_View_Helper_FormErrors
-     */
-    public function setElementSeparator($string)
-    {
-        $this->_htmlElementSeparator = (string) $string;
-        return $this;
-    }
-
-    /**
-     * Retrieve separator string for displaying errors
-     *
-     * @return string
-     */
-    public function getElementSeparator()
-    {
-        return $this->_htmlElementSeparator;
-    }
-
-    /**
-     * Set start string for displaying errors
-     *
-     * @param  string $string
-     * @return Zend_View_Helper_FormErrors
-     */
-    public function setElementStart($string)
-    {
-        $this->_htmlElementStart = (string) $string;
-        return $this;
-    }
-
-    /**
-     * Retrieve start string for displaying errors
-     *
-     * @return string
-     */
-    public function getElementStart()
-    {
-        return $this->_htmlElementStart;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormFile.php b/airtime_mvc/library/Zend/View/Helper/FormFile.php
deleted file mode 100644
index b8de480fe..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormFile.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormFile.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "file" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormFile extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'file' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formFile($name, $attribs = null)
-    {
-        $info = $this->_getInfo($name, null, $attribs);
-        extract($info); // name, id, value, attribs, options, listsep, disable
-
-        // is it disabled?
-        $disabled = '';
-        if ($disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // build the element
-        $xhtml = '<input type="file"'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . $endTag;
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormHidden.php b/airtime_mvc/library/Zend/View/Helper/FormHidden.php
deleted file mode 100644
index 387ae3bd8..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormHidden.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormHidden.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "hidden" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormHidden extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'hidden' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     * @param mixed $value The element value.
-     * @param array $attribs Attributes for the element tag.
-     * @return string The element XHTML.
-     */
-    public function formHidden($name, $value = null, array $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-        if (isset($id)) {
-            if (isset($attribs) && is_array($attribs)) {
-                $attribs['id'] = $id;
-            } else {
-                $attribs = array('id' => $id);
-            }
-        }
-        return $this->_hidden($name, $value, $attribs);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormImage.php b/airtime_mvc/library/Zend/View/Helper/FormImage.php
deleted file mode 100644
index 1226cb701..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormImage.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormImage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate an "image" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormImage extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates an 'image' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The source ('src="..."') for the image.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formImage($name, $value = null, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // Determine if we should use the value or the src attribute
-        if (isset($attribs['src'])) {
-            $src = ' src="' . $this->view->escape($attribs['src']) . '"';
-            unset($attribs['src']);
-        } else {
-            $src = ' src="' . $this->view->escape($value) . '"';
-            unset($value);
-        }
-
-        // Do we have a value?
-        if (isset($value) && !empty($value)) {
-            $value = ' value="' . $this->view->escape($value) . '"';
-        } else {
-            $value = '';
-        }
-
-        // Disabled?
-        $disabled = '';
-        if ($disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // build the element
-        $xhtml = '<input type="image"'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . $src
-                . $value
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . $endTag;
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormLabel.php b/airtime_mvc/library/Zend/View/Helper/FormLabel.php
deleted file mode 100644
index dca842f0a..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormLabel.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormLabel.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_View_Helper_FormElement **/
-require_once 'Zend/View/Helper/FormElement.php';
-
-/**
- * Form label helper
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormLabel extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'label' element.
-     *
-     * @param  string $name The form element name for which the label is being generated
-     * @param  string $value The label text
-     * @param  array $attribs Form element attributes (used to determine if disabled)
-     * @return string The element XHTML.
-     */
-    public function formLabel($name, $value = null, array $attribs = array())
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable, escape
-
-        // build the element
-        if ($disable) {
-            // disabled; display nothing
-            return  '';
-        }
-
-        $value = ($escape) ? $this->view->escape($value) : $value;
-        $for   = (empty($attribs['disableFor']) || !$attribs['disableFor'])
-               ? ' for="' . $this->view->escape($id) . '"'
-               : '';
-        if (array_key_exists('disableFor', $attribs)) {
-            unset($attribs['disableFor']);
-        }
-
-        // enabled; display label
-        $xhtml = '<label'
-                . $for
-                . $this->_htmlAttribs($attribs)
-                . '>' . $value . '</label>';
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormMultiCheckbox.php b/airtime_mvc/library/Zend/View/Helper/FormMultiCheckbox.php
deleted file mode 100644
index 4f1b98638..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormMultiCheckbox.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormMultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_View_Helper_FormRadio */
-require_once 'Zend/View/Helper/FormRadio.php';
-
-
-/**
- * Helper to generate a set of checkbox button elements
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormMultiCheckbox extends Zend_View_Helper_FormRadio
-{
-    /**
-     * Input type to use
-     * @var string
-     */
-    protected $_inputType = 'checkbox';
-
-    /**
-     * Whether or not this element represents an array collection by default
-     * @var bool
-     */
-    protected $_isArray = true;
-
-    /**
-     * Generates a set of checkbox button elements.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The checkbox value to mark as 'checked'.
-     *
-     * @param array $options An array of key-value pairs where the array
-     * key is the checkbox value, and the array value is the radio text.
-     *
-     * @param array|string $attribs Attributes added to each radio.
-     *
-     * @return string The radio buttons XHTML.
-     */
-    public function formMultiCheckbox($name, $value = null, $attribs = null,
-        $options = null, $listsep = "<br />\n")
-    {
-        return $this->formRadio($name, $value, $attribs, $options, $listsep);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormNote.php b/airtime_mvc/library/Zend/View/Helper/FormNote.php
deleted file mode 100644
index 36837275d..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormNote.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormNote.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to show an HTML note
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormNote extends Zend_View_Helper_FormElement
-{
-    /**
-    * Helper to show a "note" based on a hidden value.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param array $value The note to display.  HTML is *not* escaped; the
-     * note is displayed as-is.
-     *
-     * @return string The element XHTML.
-     */
-    public function formNote($name, $value = null)
-    {
-        $info = $this->_getInfo($name, $value);
-        extract($info); // name, value, attribs, options, listsep, disable
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormPassword.php b/airtime_mvc/library/Zend/View/Helper/FormPassword.php
deleted file mode 100644
index ccae1e5d8..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormPassword.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormPassword.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "password" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormPassword extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'password' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formPassword($name, $value = null, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // is it disabled?
-        $disabled = '';
-        if ($disable) {
-            // disabled
-            $disabled = ' disabled="disabled"';
-        }
-
-        // determine the XHTML value
-        $valueString = ' value=""';
-        if (array_key_exists('renderPassword', $attribs)) {
-            if ($attribs['renderPassword']) {
-                $valueString = ' value="' . $this->view->escape($value) . '"';
-            }
-            unset($attribs['renderPassword']);
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // render the element
-        $xhtml = '<input type="password"'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . $valueString
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . $endTag;
-
-        return $xhtml;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormRadio.php b/airtime_mvc/library/Zend/View/Helper/FormRadio.php
deleted file mode 100644
index d559b34f6..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormRadio.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormRadio.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a set of radio button elements
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormRadio extends Zend_View_Helper_FormElement
-{
-    /**
-     * Input type to use
-     * @var string
-     */
-    protected $_inputType = 'radio';
-
-    /**
-     * Whether or not this element represents an array collection by default
-     * @var bool
-     */
-    protected $_isArray = false;
-
-    /**
-     * Generates a set of radio button elements.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The radio value to mark as 'checked'.
-     *
-     * @param array $options An array of key-value pairs where the array
-     * key is the radio value, and the array value is the radio text.
-     *
-     * @param array|string $attribs Attributes added to each radio.
-     *
-     * @return string The radio buttons XHTML.
-     */
-    public function formRadio($name, $value = null, $attribs = null,
-        $options = null, $listsep = "<br />\n")
-    {
-
-        $info = $this->_getInfo($name, $value, $attribs, $options, $listsep);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // retrieve attributes for labels (prefixed with 'label_' or 'label')
-        $label_attribs = array();
-        foreach ($attribs as $key => $val) {
-            $tmp    = false;
-            $keyLen = strlen($key);
-            if ((6 < $keyLen) && (substr($key, 0, 6) == 'label_')) {
-                $tmp = substr($key, 6);
-            } elseif ((5 < $keyLen) && (substr($key, 0, 5) == 'label')) {
-                $tmp = substr($key, 5);
-            }
-
-            if ($tmp) {
-                // make sure first char is lowercase
-                $tmp[0] = strtolower($tmp[0]);
-                $label_attribs[$tmp] = $val;
-                unset($attribs[$key]);
-            }
-        }
-
-        $labelPlacement = 'append';
-        foreach ($label_attribs as $key => $val) {
-            switch (strtolower($key)) {
-                case 'placement':
-                    unset($label_attribs[$key]);
-                    $val = strtolower($val);
-                    if (in_array($val, array('prepend', 'append'))) {
-                        $labelPlacement = $val;
-                    }
-                    break;
-            }
-        }
-
-        // the radio button values and labels
-        $options = (array) $options;
-
-        // build the element
-        $xhtml = '';
-        $list  = array();
-
-        // should the name affect an array collection?
-        $name = $this->view->escape($name);
-        if ($this->_isArray && ('[]' != substr($name, -2))) {
-            $name .= '[]';
-        }
-
-        // ensure value is an array to allow matching multiple times
-        $value = (array) $value;
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // add radio buttons to the list.
-        require_once 'Zend/Filter/Alnum.php';
-        $filter = new Zend_Filter_Alnum();
-        foreach ($options as $opt_value => $opt_label) {
-
-            // Should the label be escaped?
-            if ($escape) {
-                $opt_label = $this->view->escape($opt_label);
-            }
-
-            // is it disabled?
-            $disabled = '';
-            if (true === $disable) {
-                $disabled = ' disabled="disabled"';
-            } elseif (is_array($disable) && in_array($opt_value, $disable)) {
-                $disabled = ' disabled="disabled"';
-            }
-
-            // is it checked?
-            $checked = '';
-            if (in_array($opt_value, $value)) {
-                $checked = ' checked="checked"';
-            }
-
-            // generate ID
-            $optId = $id . '-' . $filter->filter($opt_value);
-
-            // Wrap the radios in labels
-            $radio = '<label'
-                    . $this->_htmlAttribs($label_attribs) . ' for="' . $optId . '">'
-                    . (('prepend' == $labelPlacement) ? $opt_label : '')
-                    . '<input type="' . $this->_inputType . '"'
-                    . ' name="' . $name . '"'
-                    . ' id="' . $optId . '"'
-                    . ' value="' . $this->view->escape($opt_value) . '"'
-                    . $checked
-                    . $disabled
-                    . $this->_htmlAttribs($attribs)
-                    . $endTag
-                    . (('append' == $labelPlacement) ? $opt_label : '')
-                    . '</label>';
-
-            // add to the array of radio buttons
-            $list[] = $radio;
-        }
-
-        // done!
-        $xhtml .= implode($listsep, $list);
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormReset.php b/airtime_mvc/library/Zend/View/Helper/FormReset.php
deleted file mode 100644
index 05556fe74..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormReset.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormReset.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "reset" button
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormReset extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'reset' button.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formReset($name = '', $value = 'Reset', $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // check if disabled
-        $disabled = '';
-        if ($disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // get closing tag
-        $endTag = '>';
-        if ($this->view->doctype()->isXhtml()) {
-            $endTag = ' />';
-        }
-
-        // Render button
-        $xhtml = '<input type="reset"'
-               . ' name="' . $this->view->escape($name) . '"'
-               . ' id="' . $this->view->escape($id) . '"'
-               . $disabled;
-
-        // add a value if one is given
-        if (! empty($value)) {
-            $xhtml .= ' value="' . $this->view->escape($value) . '"';
-        }
-
-        // add attributes, close, and return
-        $xhtml .= $this->_htmlAttribs($attribs) . $endTag;
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormSelect.php b/airtime_mvc/library/Zend/View/Helper/FormSelect.php
deleted file mode 100644
index bb5c777e8..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormSelect.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormSelect.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate "select" list of options
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormSelect extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates 'select' list of options.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The option value to mark as 'selected'; if an
-     * array, will mark all values in the array as 'selected' (used for
-     * multiple-select elements).
-     *
-     * @param array|string $attribs Attributes added to the 'select' tag.
-     *
-     * @param array $options An array of key-value pairs where the array
-     * key is the radio value, and the array value is the radio text.
-     *
-     * @param string $listsep When disabled, use this list separator string
-     * between list values.
-     *
-     * @return string The select tag and options XHTML.
-     */
-    public function formSelect($name, $value = null, $attribs = null,
-        $options = null, $listsep = "<br />\n")
-    {
-        $info = $this->_getInfo($name, $value, $attribs, $options, $listsep);
-        extract($info); // name, id, value, attribs, options, listsep, disable
-
-        // force $value to array so we can compare multiple values to multiple
-        // options; also ensure it's a string for comparison purposes.
-        $value = array_map('strval', (array) $value);
-
-        // check if element may have multiple values
-        $multiple = '';
-
-        if (substr($name, -2) == '[]') {
-            // multiple implied by the name
-            $multiple = ' multiple="multiple"';
-        }
-
-        if (isset($attribs['multiple'])) {
-            // Attribute set
-            if ($attribs['multiple']) {
-                // True attribute; set multiple attribute
-                $multiple = ' multiple="multiple"';
-
-                // Make sure name indicates multiple values are allowed
-                if (!empty($multiple) && (substr($name, -2) != '[]')) {
-                    $name .= '[]';
-                }
-            } else {
-                // False attribute; ensure attribute not set
-                $multiple = '';
-            }
-            unset($attribs['multiple']);
-        }
-
-        // now start building the XHTML.
-        $disabled = '';
-        if (true === $disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // Build the surrounding select element first.
-        $xhtml = '<select'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . $multiple
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . ">\n    ";
-
-        // build the list of options
-        $list       = array();
-        $translator = $this->getTranslator();
-        foreach ((array) $options as $opt_value => $opt_label) {
-            if (is_array($opt_label)) {
-                $opt_disable = '';
-                if (is_array($disable) && in_array($opt_value, $disable)) {
-                    $opt_disable = ' disabled="disabled"';
-                }
-                if (null !== $translator) {
-                    $opt_value = $translator->translate($opt_value);
-                }
-                $list[] = '<optgroup'
-                        . $opt_disable
-                        . ' label="' . $this->view->escape($opt_value) .'">';
-                foreach ($opt_label as $val => $lab) {
-                    $list[] = $this->_build($val, $lab, $value, $disable);
-                }
-                $list[] = '</optgroup>';
-            } else {
-                $list[] = $this->_build($opt_value, $opt_label, $value, $disable);
-            }
-        }
-
-        // add the options to the xhtml and close the select
-        $xhtml .= implode("\n    ", $list) . "\n</select>";
-
-        return $xhtml;
-    }
-
-    /**
-     * Builds the actual <option> tag
-     *
-     * @param string $value Options Value
-     * @param string $label Options Label
-     * @param array  $selected The option value(s) to mark as 'selected'
-     * @param array|bool $disable Whether the select is disabled, or individual options are
-     * @return string Option Tag XHTML
-     */
-    protected function _build($value, $label, $selected, $disable)
-    {
-        if (is_bool($disable)) {
-            $disable = array();
-        }
-
-        $opt = '<option'
-             . ' value="' . $this->view->escape($value) . '"'
-             . ' label="' . $this->view->escape($label) . '"';
-
-        // selected?
-        if (in_array((string) $value, $selected)) {
-            $opt .= ' selected="selected"';
-        }
-
-        // disabled?
-        if (in_array($value, $disable)) {
-            $opt .= ' disabled="disabled"';
-        }
-
-        $opt .= '>' . $this->view->escape($label) . "</option>";
-
-        return $opt;
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormSubmit.php b/airtime_mvc/library/Zend/View/Helper/FormSubmit.php
deleted file mode 100644
index d38d35d73..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormSubmit.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormSubmit.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "submit" button
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormSubmit extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'submit' button.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formSubmit($name, $value = null, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // check if disabled
-        $disabled = '';
-        if ($disable) {
-            $disabled = ' disabled="disabled"';
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        // Render the button.
-        $xhtml = '<input type="submit"'
-               . ' name="' . $this->view->escape($name) . '"'
-               . ' id="' . $this->view->escape($id) . '"'
-               . ' value="' . $this->view->escape($value) . '"'
-               . $disabled
-               . $this->_htmlAttribs($attribs)
-               . $endTag;
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormText.php b/airtime_mvc/library/Zend/View/Helper/FormText.php
deleted file mode 100644
index 420b28862..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormText.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormText.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "text" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormText extends Zend_View_Helper_FormElement
-{
-    /**
-     * Generates a 'text' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are used in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formText($name, $value = null, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // build the element
-        $disabled = '';
-        if ($disable) {
-            // disabled
-            $disabled = ' disabled="disabled"';
-        }
-
-        // XHTML or HTML end tag?
-        $endTag = ' />';
-        if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) {
-            $endTag= '>';
-        }
-
-        $xhtml = '<input type="text"'
-                . ' name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . ' value="' . $this->view->escape($value) . '"'
-                . $disabled
-                . $this->_htmlAttribs($attribs)
-                . $endTag;
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/FormTextarea.php b/airtime_mvc/library/Zend/View/Helper/FormTextarea.php
deleted file mode 100644
index 47783ef93..000000000
--- a/airtime_mvc/library/Zend/View/Helper/FormTextarea.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FormTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Abstract class for extension
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-
-/**
- * Helper to generate a "textarea" element
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_FormTextarea extends Zend_View_Helper_FormElement
-{
-    /**
-     * The default number of rows for a textarea.
-     *
-     * @access public
-     *
-     * @var int
-     */
-    public $rows = 24;
-
-    /**
-     * The default number of columns for a textarea.
-     *
-     * @access public
-     *
-     * @var int
-     */
-    public $cols = 80;
-
-    /**
-     * Generates a 'textarea' element.
-     *
-     * @access public
-     *
-     * @param string|array $name If a string, the element name.  If an
-     * array, all other parameters are ignored, and the array elements
-     * are extracted in place of added parameters.
-     *
-     * @param mixed $value The element value.
-     *
-     * @param array $attribs Attributes for the element tag.
-     *
-     * @return string The element XHTML.
-     */
-    public function formTextarea($name, $value = null, $attribs = null)
-    {
-        $info = $this->_getInfo($name, $value, $attribs);
-        extract($info); // name, value, attribs, options, listsep, disable
-
-        // is it disabled?
-        $disabled = '';
-        if ($disable) {
-            // disabled.
-            $disabled = ' disabled="disabled"';
-        }
-
-        // Make sure that there are 'rows' and 'cols' values
-        // as required by the spec.  noted by Orjan Persson.
-        if (empty($attribs['rows'])) {
-            $attribs['rows'] = (int) $this->rows;
-        }
-        if (empty($attribs['cols'])) {
-            $attribs['cols'] = (int) $this->cols;
-        }
-
-        // build the element
-        $xhtml = '<textarea name="' . $this->view->escape($name) . '"'
-                . ' id="' . $this->view->escape($id) . '"'
-                . $disabled
-                . $this->_htmlAttribs($attribs) . '>'
-                . $this->view->escape($value) . '</textarea>';
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HeadLink.php b/airtime_mvc/library/Zend/View/Helper/HeadLink.php
deleted file mode 100644
index f3c4d8627..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HeadLink.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: HeadLink.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Zend_Layout_View_Helper_HeadLink
- *
- * @see        http://www.w3.org/TR/xhtml1/dtds.html
- * @uses       Zend_View_Helper_Placeholder_Container_Standalone
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone
-{
-    /**
-     * $_validAttributes
-     *
-     * @var array
-     */
-    protected $_itemKeys = array('charset', 'href', 'hreflang', 'media', 'rel', 'rev', 'type', 'title', 'extras');
-
-    /**
-     * @var string registry key
-     */
-    protected $_regKey = 'Zend_View_Helper_HeadLink';
-
-    /**
-     * Constructor
-     *
-     * Use PHP_EOL as separator
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setSeparator(PHP_EOL);
-    }
-
-    /**
-     * headLink() - View Helper Method
-     *
-     * Returns current object instance. Optionally, allows passing array of
-     * values to build link.
-     *
-     * @return Zend_View_Helper_HeadLink
-     */
-    public function headLink(array $attributes = null, $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
-    {
-        if (null !== $attributes) {
-            $item = $this->createData($attributes);
-            switch ($placement) {
-                case Zend_View_Helper_Placeholder_Container_Abstract::SET:
-                    $this->set($item);
-                    break;
-                case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
-                    $this->prepend($item);
-                    break;
-                case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
-                default:
-                    $this->append($item);
-                    break;
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Overload method access
-     *
-     * Creates the following virtual methods:
-     * - appendStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
-     * - prependStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - setStylesheet($href, $media, $conditionalStylesheet, $extras)
-     * - appendAlternate($href, $type, $title, $extras)
-     * - offsetSetAlternate($index, $href, $type, $title, $extras)
-     * - prependAlternate($href, $type, $title, $extras)
-     * - setAlternate($href, $type, $title, $extras)
-     *
-     * Items that may be added in the future:
-     * - Navigation?  need to find docs on this
-     *   - public function appendStart()
-     *   - public function appendContents()
-     *   - public function appendPrev()
-     *   - public function appendNext()
-     *   - public function appendIndex()
-     *   - public function appendEnd()
-     *   - public function appendGlossary()
-     *   - public function appendAppendix()
-     *   - public function appendHelp()
-     *   - public function appendBookmark()
-     * - Other?
-     *   - public function appendCopyright()
-     *   - public function appendChapter()
-     *   - public function appendSection()
-     *   - public function appendSubsection()
-     *
-     * @param mixed $method
-     * @param mixed $args
-     * @return void
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(?P<type>Stylesheet|Alternate)$/', $method, $matches)) {
-            $argc   = count($args);
-            $action = $matches['action'];
-            $type   = $matches['type'];
-            $index  = null;
-
-            if ('offsetSet' == $action) {
-                if (0 < $argc) {
-                    $index = array_shift($args);
-                    --$argc;
-                }
-            }
-
-            if (1 > $argc) {
-                require_once 'Zend/View/Exception.php';
-                $e =  new Zend_View_Exception(sprintf('%s requires at least one argument', $method));
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            if (is_array($args[0])) {
-                $item = $this->createData($args[0]);
-            } else {
-                $dataMethod = 'createData' . $type;
-                $item       = $this->$dataMethod($args);
-            }
-
-            if ($item) {
-                if ('offsetSet' == $action) {
-                    $this->offsetSet($index, $item);
-                } else {
-                    $this->$action($item);
-                }
-            }
-
-            return $this;
-        }
-
-        return parent::__call($method, $args);
-    }
-
-    /**
-     * Check if value is valid
-     *
-     * @param  mixed $value
-     * @return boolean
-     */
-    protected function _isValid($value)
-    {
-        if (!$value instanceof stdClass) {
-            return false;
-        }
-
-        $vars         = get_object_vars($value);
-        $keys         = array_keys($vars);
-        $intersection = array_intersect($this->_itemKeys, $keys);
-        if (empty($intersection)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * append()
-     *
-     * @param  array $value
-     * @return void
-     */
-    public function append($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('append() expects a data token; please use one of the custom append*() methods');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->append($value);
-    }
-
-    /**
-     * offsetSet()
-     *
-     * @param  string|int $index
-     * @param  array $value
-     * @return void
-     */
-    public function offsetSet($index, $value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('offsetSet() expects a data token; please use one of the custom offsetSet*() methods');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->offsetSet($index, $value);
-    }
-
-    /**
-     * prepend()
-     *
-     * @param  array $value
-     * @return Zend_Layout_ViewHelper_HeadLink
-     */
-    public function prepend($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('prepend() expects a data token; please use one of the custom prepend*() methods');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->prepend($value);
-    }
-
-    /**
-     * set()
-     *
-     * @param  array $value
-     * @return Zend_Layout_ViewHelper_HeadLink
-     */
-    public function set($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('set() expects a data token; please use one of the custom set*() methods');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->set($value);
-    }
-
-
-    /**
-     * Create HTML link element from data item
-     *
-     * @param  stdClass $item
-     * @return string
-     */
-    public function itemToString(stdClass $item)
-    {
-        $attributes = (array) $item;
-        $link       = '<link ';
-
-        foreach ($this->_itemKeys as $itemKey) {
-            if (isset($attributes[$itemKey])) {
-                if(is_array($attributes[$itemKey])) {
-                    foreach($attributes[$itemKey] as $key => $value) {
-                        $link .= sprintf('%s="%s" ', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
-                    }
-                } else {
-                    $link .= sprintf('%s="%s" ', $itemKey, ($this->_autoEscape) ? $this->_escape($attributes[$itemKey]) : $attributes[$itemKey]);
-                }
-            }
-        }
-
-        if ($this->view instanceof Zend_View_Abstract) {
-            $link .= ($this->view->doctype()->isXhtml()) ? '/>' : '>';
-        } else {
-            $link .= '/>';
-        }
-
-        if (($link == '<link />') || ($link == '<link >')) {
-            return '';
-        }
-
-        if (isset($attributes['conditionalStylesheet'])
-            && !empty($attributes['conditionalStylesheet'])
-            && is_string($attributes['conditionalStylesheet']))
-        {
-            $link = '<!--[if ' . $attributes['conditionalStylesheet'] . ']> ' . $link . '<![endif]-->';
-        }
-
-        return $link;
-    }
-
-    /**
-     * Render link elements as string
-     *
-     * @param  string|int $indent
-     * @return string
-     */
-    public function toString($indent = null)
-    {
-        $indent = (null !== $indent)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        $items = array();
-        $this->getContainer()->ksort();
-        foreach ($this as $item) {
-            $items[] = $this->itemToString($item);
-        }
-
-        return $indent . implode($this->_escape($this->getSeparator()) . $indent, $items);
-    }
-
-    /**
-     * Create data item for stack
-     *
-     * @param  array $attributes
-     * @return stdClass
-     */
-    public function createData(array $attributes)
-    {
-        $data = (object) $attributes;
-        return $data;
-    }
-
-    /**
-     * Create item for stylesheet link item
-     *
-     * @param  array $args
-     * @return stdClass|false Returns fals if stylesheet is a duplicate
-     */
-    public function createDataStylesheet(array $args)
-    {
-        $rel                   = 'stylesheet';
-        $type                  = 'text/css';
-        $media                 = 'screen';
-        $conditionalStylesheet = false;
-        $href                  = array_shift($args);
-
-        if ($this->_isDuplicateStylesheet($href)) {
-            return false;
-        }
-
-        if (0 < count($args)) {
-            $media = array_shift($args);
-            if(is_array($media)) {
-                $media = implode(',', $media);
-            } else {
-                $media = (string) $media;
-            }
-        }
-        if (0 < count($args)) {
-            $conditionalStylesheet = array_shift($args);
-            if(!empty($conditionalStylesheet) && is_string($conditionalStylesheet)) {
-                $conditionalStylesheet = (string) $conditionalStylesheet;
-            } else {
-                $conditionalStylesheet = null;
-            }
-        }
-
-        if(0 < count($args) && is_array($args[0])) {
-            $extras = array_shift($args);
-            $extras = (array) $extras;
-        }
-
-        $attributes = compact('rel', 'type', 'href', 'media', 'conditionalStylesheet', 'extras');
-        return $this->createData($attributes);
-    }
-
-    /**
-     * Is the linked stylesheet a duplicate?
-     *
-     * @param  string $uri
-     * @return bool
-     */
-    protected function _isDuplicateStylesheet($uri)
-    {
-        foreach ($this->getContainer() as $item) {
-            if (($item->rel == 'stylesheet') && ($item->href == $uri)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Create item for alternate link item
-     *
-     * @param  array $args
-     * @return stdClass
-     */
-    public function createDataAlternate(array $args)
-    {
-        if (3 > count($args)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf('Alternate tags require 3 arguments; %s provided', count($args)));
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $rel   = 'alternate';
-        $href  = array_shift($args);
-        $type  = array_shift($args);
-        $title = array_shift($args);
-
-        if(0 < count($args) && is_array($args[0])) {
-            $extras = array_shift($args);
-            $extras = (array) $extras;
-
-            if(isset($extras['media']) && is_array($extras['media'])) {
-                $extras['media'] = implode(',', $extras['media']);
-            }
-        }
-
-        $href  = (string) $href;
-        $type  = (string) $type;
-        $title = (string) $title;
-
-        $attributes = compact('rel', 'href', 'type', 'title', 'extras');
-        return $this->createData($attributes);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HeadMeta.php b/airtime_mvc/library/Zend/View/Helper/HeadMeta.php
deleted file mode 100644
index 837ad7384..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HeadMeta.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: HeadMeta.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Zend_Layout_View_Helper_HeadMeta
- *
- * @see        http://www.w3.org/TR/xhtml1/dtds.html
- * @uses       Zend_View_Helper_Placeholder_Container_Standalone
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone
-{
-    /**
-     * Types of attributes
-     * @var array
-     */
-    protected $_typeKeys     = array('name', 'http-equiv', 'charset');
-    protected $_requiredKeys = array('content');
-    protected $_modifierKeys = array('lang', 'scheme');
-
-    /**
-     * @var string registry key
-     */
-    protected $_regKey = 'Zend_View_Helper_HeadMeta';
-
-    /**
-     * Constructor
-     *
-     * Set separator to PHP_EOL
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setSeparator(PHP_EOL);
-    }
-
-    /**
-     * Retrieve object instance; optionally add meta tag
-     *
-     * @param  string $content
-     * @param  string $keyValue
-     * @param  string $keyType
-     * @param  array $modifiers
-     * @param  string $placement
-     * @return Zend_View_Helper_HeadMeta
-     */
-    public function headMeta($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
-    {
-        if ((null !== $content) && (null !== $keyValue)) {
-            $item   = $this->createData($keyType, $keyValue, $content, $modifiers);
-            $action = strtolower($placement);
-            switch ($action) {
-                case 'append':
-                case 'prepend':
-                case 'set':
-                    $this->$action($item);
-                    break;
-                default:
-                    $this->append($item);
-                    break;
-            }
-        }
-
-        return $this;
-    }
-
-    protected function _normalizeType($type)
-    {
-        switch ($type) {
-            case 'Name':
-                return 'name';
-            case 'HttpEquiv':
-                return 'http-equiv';
-            default:
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type));
-                $e->setView($this->view);
-                throw $e;
-        }
-    }
-
-    /**
-     * Overload method access
-     *
-     * Allows the following 'virtual' methods:
-     * - appendName($keyValue, $content, $modifiers = array())
-     * - offsetGetName($index, $keyValue, $content, $modifers = array())
-     * - prependName($keyValue, $content, $modifiers = array())
-     * - setName($keyValue, $content, $modifiers = array())
-     * - appendHttpEquiv($keyValue, $content, $modifiers = array())
-     * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array())
-     * - prependHttpEquiv($keyValue, $content, $modifiers = array())
-     * - setHttpEquiv($keyValue, $content, $modifiers = array())
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return Zend_View_Helper_HeadMeta
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv)$/', $method, $matches)) {
-            $action = $matches['action'];
-            $type   = $this->_normalizeType($matches['type']);
-            $argc   = count($args);
-            $index  = null;
-
-            if ('offsetSet' == $action) {
-                if (0 < $argc) {
-                    $index = array_shift($args);
-                    --$argc;
-                }
-            }
-
-            if (2 > $argc) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception('Too few arguments provided; requires key value, and content');
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            if (3 > $argc) {
-                $args[] = array();
-            }
-
-            $item  = $this->createData($type, $args[0], $args[1], $args[2]);
-
-            if ('offsetSet' == $action) {
-                return $this->offsetSet($index, $item);
-            }
-
-            $this->$action($item);
-            return $this;
-        }
-
-        return parent::__call($method, $args);
-    }
-
-	/**
-	 * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
-	 * 
-	 * Not valid in a non-HTML5 doctype
-	 *
-	 * @param string $charset 
-	 * @return Zend_View_Helper_HeadMeta Provides a fluent interface
-	 */
-    public function setCharset($charset)
-    {
-        $item = new stdClass;
-        $item->type = 'charset';
-        $item->charset = $charset;
-        $item->content = null;
-        $item->modifiers = array();
-        $this->set($item);
-        return $this;
-    }
-
-    /**
-     * Determine if item is valid
-     *
-     * @param  mixed $item
-     * @return boolean
-     */
-    protected function _isValid($item)
-    {
-        if ((!$item instanceof stdClass)
-            || !isset($item->type)
-            || !isset($item->modifiers))
-        {
-            return false;
-        }
-
-        if (!isset($item->content)
-        && (! $this->view->doctype()->isHtml5()
-        || (! $this->view->doctype()->isHtml5() && $item->type !== 'charset'))) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Append
-     *
-     * @param  string $value
-     * @return void
-     * @throws Zend_View_Exception
-     */
-    public function append($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to append; please use appendMeta()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->append($value);
-    }
-
-    /**
-     * OffsetSet
-     *
-     * @param  string|int $index
-     * @param  string $value
-     * @return void
-     * @throws Zend_View_Exception
-     */
-    public function offsetSet($index, $value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e =  new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetName() or offsetSetHttpEquiv()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->offsetSet($index, $value);
-    }
-
-    /**
-     * OffsetUnset
-     *
-     * @param  string|int $index
-     * @return void
-     * @throws Zend_View_Exception
-     */
-    public function offsetUnset($index)
-    {
-        if (!in_array($index, $this->getContainer()->getKeys())) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid index passed to offsetUnset()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->offsetUnset($index);
-    }
-
-    /**
-     * Prepend
-     *
-     * @param  string $value
-     * @return void
-     * @throws Zend_View_Exception
-     */
-    public function prepend($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependMeta()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->prepend($value);
-    }
-
-    /**
-     * Set
-     *
-     * @param  string $value
-     * @return void
-     * @throws Zend_View_Exception
-     */
-    public function set($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to set; please use setMeta()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $container = $this->getContainer();
-        foreach ($container->getArrayCopy() as $index => $item) {
-            if ($item->type == $value->type && $item->{$item->type} == $value->{$value->type}) {
-                $this->offsetUnset($index);
-            }
-        }
-
-        return $this->append($value);
-    }
-
-    /**
-     * Build meta HTML string
-     *
-     * @param  string $type
-     * @param  string $typeValue
-     * @param  string $content
-     * @param  array $modifiers
-     * @return string
-     */
-    public function itemToString(stdClass $item)
-    {
-        if (!in_array($item->type, $this->_typeKeys)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf('Invalid type "%s" provided for meta', $item->type));
-            $e->setView($this->view);
-            throw $e;
-        }
-        $type = $item->type;
-
-        $modifiersString = '';
-        foreach ($item->modifiers as $key => $value) {
-            if ($this->view->doctype()->isHtml5()
-            && $key == 'scheme') {
-                require_once 'Zend/View/Exception.php';
-                throw new Zend_View_Exception('Invalid modifier '
-                . '"scheme" provided; not supported by HTML5');
-            }
-            if (!in_array($key, $this->_modifierKeys)) {
-                continue;
-            }
-            $modifiersString .= $key . '="' . $this->_escape($value) . '" ';
-        }
-
-        if ($this->view instanceof Zend_View_Abstract) {
-            if ($this->view->doctype()->isHtml5()
-            && $type == 'charset') {
-				$tpl = ($this->view->doctype()->isXhtml())
-					? '<meta %s="%s"/>'
-					: '<meta %s="%s">';
-            } elseif ($this->view->doctype()->isXhtml()) {
-                $tpl = '<meta %s="%s" content="%s" %s/>';
-            } else {
-                $tpl = '<meta %s="%s" content="%s" %s>';
-            }
-        } else {
-            $tpl = '<meta %s="%s" content="%s" %s/>';
-        }
-
-        $meta = sprintf(
-            $tpl,
-            $type,
-            $this->_escape($item->$type),
-            $this->_escape($item->content),
-            $modifiersString
-        );
-        return $meta;
-    }
-
-    /**
-     * Render placeholder as string
-     *
-     * @param  string|int $indent
-     * @return string
-     */
-    public function toString($indent = null)
-    {
-        $indent = (null !== $indent)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        $items = array();
-        $this->getContainer()->ksort();
-        try {
-            foreach ($this as $item) {
-                $items[] = $this->itemToString($item);
-            }
-        } catch (Zend_View_Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            return '';
-        }
-        return $indent . implode($this->_escape($this->getSeparator()) . $indent, $items);
-    }
-
-    /**
-     * Create data item for inserting into stack
-     *
-     * @param  string $type
-     * @param  string $typeValue
-     * @param  string $content
-     * @param  array $modifiers
-     * @return stdClass
-     */
-    public function createData($type, $typeValue, $content, array $modifiers)
-    {
-        $data            = new stdClass;
-        $data->type      = $type;
-        $data->$type     = $typeValue;
-        $data->content   = $content;
-        $data->modifiers = $modifiers;
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HeadScript.php b/airtime_mvc/library/Zend/View/Helper/HeadScript.php
deleted file mode 100644
index db3e80296..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HeadScript.php
+++ /dev/null
@@ -1,495 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: HeadScript.php 20364 2010-01-17 23:00:14Z mabe $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for setting and retrieving script elements for HTML head section
- *
- * @uses       Zend_View_Helper_Placeholder_Container_Standalone
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone
-{
-    /**#@+
-     * Script type contants
-     * @const string
-     */
-    const FILE   = 'FILE';
-    const SCRIPT = 'SCRIPT';
-    /**#@-*/
-
-    /**
-     * Registry key for placeholder
-     * @var string
-     */
-    protected $_regKey = 'Zend_View_Helper_HeadScript';
-
-    /**
-     * Are arbitrary attributes allowed?
-     * @var bool
-     */
-    protected $_arbitraryAttributes = false;
-
-    /**#@+
-     * Capture type and/or attributes (used for hinting during capture)
-     * @var string
-     */
-    protected $_captureLock;
-    protected $_captureScriptType  = null;
-    protected $_captureScriptAttrs = null;
-    protected $_captureType;
-    /**#@-*/
-
-    /**
-     * Optional allowed attributes for script tag
-     * @var array
-     */
-    protected $_optionalAttributes = array(
-        'charset', 'defer', 'language', 'src'
-    );
-
-    /**
-     * Required attributes for script tag
-     * @var string
-     */
-    protected $_requiredAttributes = array('type');
-
-    /**
-     * Whether or not to format scripts using CDATA; used only if doctype
-     * helper is not accessible
-     * @var bool
-     */
-    public $useCdata = false;
-
-    /**
-     * Constructor
-     *
-     * Set separator to PHP_EOL.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setSeparator(PHP_EOL);
-    }
-
-    /**
-     * Return headScript object
-     *
-     * Returns headScript helper object; optionally, allows specifying a script
-     * or script file to include.
-     *
-     * @param  string $mode Script or file
-     * @param  string $spec Script/url
-     * @param  string $placement Append, prepend, or set
-     * @param  array $attrs Array of script attributes
-     * @param  string $type Script type and/or array of script attributes
-     * @return Zend_View_Helper_HeadScript
-     */
-    public function headScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
-    {
-        if ((null !== $spec) && is_string($spec)) {
-            $action    = ucfirst(strtolower($mode));
-            $placement = strtolower($placement);
-            switch ($placement) {
-                case 'set':
-                case 'prepend':
-                case 'append':
-                    $action = $placement . $action;
-                    break;
-                default:
-                    $action = 'append' . $action;
-                    break;
-            }
-            $this->$action($spec, $type, $attrs);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Start capture action
-     *
-     * @param  mixed $captureType
-     * @param  string $typeOrAttrs
-     * @return void
-     */
-    public function captureStart($captureType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $type = 'text/javascript', $attrs = array())
-    {
-        if ($this->_captureLock) {
-            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
-            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headScript captures');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->_captureLock        = true;
-        $this->_captureType        = $captureType;
-        $this->_captureScriptType  = $type;
-        $this->_captureScriptAttrs = $attrs;
-        ob_start();
-    }
-
-    /**
-     * End capture action and store
-     *
-     * @return void
-     */
-    public function captureEnd()
-    {
-        $content                   = ob_get_clean();
-        $type                      = $this->_captureScriptType;
-        $attrs                     = $this->_captureScriptAttrs;
-        $this->_captureScriptType  = null;
-        $this->_captureScriptAttrs = null;
-        $this->_captureLock        = false;
-
-        switch ($this->_captureType) {
-            case Zend_View_Helper_Placeholder_Container_Abstract::SET:
-            case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
-            case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
-                $action = strtolower($this->_captureType) . 'Script';
-                break;
-            default:
-                $action = 'appendScript';
-                break;
-        }
-        $this->$action($content, $type, $attrs);
-    }
-
-    /**
-     * Overload method access
-     *
-     * Allows the following method calls:
-     * - appendFile($src, $type = 'text/javascript', $attrs = array())
-     * - offsetSetFile($index, $src, $type = 'text/javascript', $attrs = array())
-     * - prependFile($src, $type = 'text/javascript', $attrs = array())
-     * - setFile($src, $type = 'text/javascript', $attrs = array())
-     * - appendScript($script, $type = 'text/javascript', $attrs = array())
-     * - offsetSetScript($index, $src, $type = 'text/javascript', $attrs = array())
-     * - prependScript($script, $type = 'text/javascript', $attrs = array())
-     * - setScript($script, $type = 'text/javascript', $attrs = array())
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return Zend_View_Helper_HeadScript
-     * @throws Zend_View_Exception if too few arguments or invalid method
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(?P<mode>File|Script)$/', $method, $matches)) {
-            if (1 > count($args)) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf('Method "%s" requires at least one argument', $method));
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            $action  = $matches['action'];
-            $mode    = strtolower($matches['mode']);
-            $type    = 'text/javascript';
-            $attrs   = array();
-
-            if ('offsetSet' == $action) {
-                $index = array_shift($args);
-                if (1 > count($args)) {
-                    require_once 'Zend/View/Exception.php';
-                    $e = new Zend_View_Exception(sprintf('Method "%s" requires at least two arguments, an index and source', $method));
-                    $e->setView($this->view);
-                    throw $e;
-                }
-            }
-
-            $content = $args[0];
-
-            if (isset($args[1])) {
-                $type = (string) $args[1];
-            }
-            if (isset($args[2])) {
-                $attrs = (array) $args[2];
-            }
-
-            switch ($mode) {
-                case 'script':
-                    $item = $this->createData($type, $attrs, $content);
-                    if ('offsetSet' == $action) {
-                        $this->offsetSet($index, $item);
-                    } else {
-                        $this->$action($item);
-                    }
-                    break;
-                case 'file':
-                default:
-                    if (!$this->_isDuplicate($content)) {
-                        $attrs['src'] = $content;
-                        $item = $this->createData($type, $attrs);
-                        if ('offsetSet' == $action) {
-                            $this->offsetSet($index, $item);
-                        } else {
-                            $this->$action($item);
-                        }
-                    }
-                    break;
-            }
-
-            return $this;
-        }
-
-        return parent::__call($method, $args);
-    }
-
-    /**
-     * Is the file specified a duplicate?
-     *
-     * @param  string $file
-     * @return bool
-     */
-    protected function _isDuplicate($file)
-    {
-        foreach ($this->getContainer() as $item) {
-            if (($item->source === null)
-                && array_key_exists('src', $item->attributes)
-                && ($file == $item->attributes['src']))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Is the script provided valid?
-     *
-     * @param  mixed $value
-     * @param  string $method
-     * @return bool
-     */
-    protected function _isValid($value)
-    {
-        if ((!$value instanceof stdClass)
-            || !isset($value->type)
-            || (!isset($value->source) && !isset($value->attributes)))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Override append
-     *
-     * @param  string $value
-     * @return void
-     */
-    public function append($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->append($value);
-    }
-
-    /**
-     * Override prepend
-     *
-     * @param  string $value
-     * @return void
-     */
-    public function prepend($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->prepend($value);
-    }
-
-    /**
-     * Override set
-     *
-     * @param  string $value
-     * @return void
-     */
-    public function set($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->set($value);
-    }
-
-    /**
-     * Override offsetSet
-     *
-     * @param  string|int $index
-     * @param  mixed $value
-     * @return void
-     */
-    public function offsetSet($index, $value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->_isValid($value);
-        return $this->getContainer()->offsetSet($index, $value);
-    }
-
-    /**
-     * Set flag indicating if arbitrary attributes are allowed
-     *
-     * @param  bool $flag
-     * @return Zend_View_Helper_HeadScript
-     */
-    public function setAllowArbitraryAttributes($flag)
-    {
-        $this->_arbitraryAttributes = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Are arbitrary attributes allowed?
-     *
-     * @return bool
-     */
-    public function arbitraryAttributesAllowed()
-    {
-        return $this->_arbitraryAttributes;
-    }
-
-    /**
-     * Create script HTML
-     *
-     * @param  string $type
-     * @param  array $attributes
-     * @param  string $content
-     * @param  string|int $indent
-     * @return string
-     */
-    public function itemToString($item, $indent, $escapeStart, $escapeEnd)
-    {
-        $attrString = '';
-        if (!empty($item->attributes)) {
-            foreach ($item->attributes as $key => $value) {
-                if (!$this->arbitraryAttributesAllowed()
-                    && !in_array($key, $this->_optionalAttributes))
-                {
-                    continue;
-                }
-                if ('defer' == $key) {
-                    $value = 'defer';
-                }
-                $attrString .= sprintf(' %s="%s"', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
-            }
-        }
-
-        $type = ($this->_autoEscape) ? $this->_escape($item->type) : $item->type;
-        $html  = '<script type="' . $type . '"' . $attrString . '>';
-        if (!empty($item->source)) {
-              $html .= PHP_EOL . $indent . '    ' . $escapeStart . PHP_EOL . $item->source . $indent . '    ' . $escapeEnd . PHP_EOL . $indent;
-        }
-        $html .= '</script>';
-
-        if (isset($item->attributes['conditional'])
-            && !empty($item->attributes['conditional'])
-            && is_string($item->attributes['conditional']))
-        {
-            $html = $indent . '<!--[if ' . $item->attributes['conditional'] . ']> ' . $html . '<![endif]-->';
-        } else {
-            $html = $indent . $html;
-        }
-
-        return $html;
-    }
-
-    /**
-     * Retrieve string representation
-     *
-     * @param  string|int $indent
-     * @return string
-     */
-    public function toString($indent = null)
-    {
-        $indent = (null !== $indent)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        if ($this->view) {
-            $useCdata = $this->view->doctype()->isXhtml() ? true : false;
-        } else {
-            $useCdata = $this->useCdata ? true : false;
-        }
-        $escapeStart = ($useCdata) ? '//<![CDATA[' : '//<!--';
-        $escapeEnd   = ($useCdata) ? '//]]>'       : '//-->';
-
-        $items = array();
-        $this->getContainer()->ksort();
-        foreach ($this as $item) {
-            if (!$this->_isValid($item)) {
-                continue;
-            }
-
-            $items[] = $this->itemToString($item, $indent, $escapeStart, $escapeEnd);
-        }
-
-        $return = implode($this->getSeparator(), $items);
-        return $return;
-    }
-
-    /**
-     * Create data item containing all necessary components of script
-     *
-     * @param  string $type
-     * @param  array $attributes
-     * @param  string $content
-     * @return stdClass
-     */
-    public function createData($type, array $attributes, $content = null)
-    {
-        $data             = new stdClass();
-        $data->type       = $type;
-        $data->attributes = $attributes;
-        $data->source     = $content;
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HeadStyle.php b/airtime_mvc/library/Zend/View/Helper/HeadStyle.php
deleted file mode 100644
index a27af6221..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HeadStyle.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: HeadStyle.php 20104 2010-01-06 21:26:01Z matthew $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for setting and retrieving stylesheets
- *
- * @uses       Zend_View_Helper_Placeholder_Container_Standalone
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone
-{
-    /**
-     * Registry key for placeholder
-     * @var string
-     */
-    protected $_regKey = 'Zend_View_Helper_HeadStyle';
-
-    /**
-     * Allowed optional attributes
-     * @var array
-     */
-    protected $_optionalAttributes = array('lang', 'title', 'media', 'dir');
-
-    /**
-     * Allowed media types
-     * @var array
-     */
-    protected $_mediaTypes = array(
-        'all', 'aural', 'braille', 'handheld', 'print',
-        'projection', 'screen', 'tty', 'tv'
-    );
-
-    /**
-     * Capture type and/or attributes (used for hinting during capture)
-     * @var string
-     */
-    protected $_captureAttrs = null;
-
-    /**
-     * Capture lock
-     * @var bool
-     */
-    protected $_captureLock;
-
-    /**
-     * Capture type (append, prepend, set)
-     * @var string
-     */
-    protected $_captureType;
-
-    /**
-     * Constructor
-     *
-     * Set separator to PHP_EOL.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setSeparator(PHP_EOL);
-    }
-
-    /**
-     * Return headStyle object
-     *
-     * Returns headStyle helper object; optionally, allows specifying
-     *
-     * @param  string $content Stylesheet contents
-     * @param  string $placement Append, prepend, or set
-     * @param  string|array $attributes Optional attributes to utilize
-     * @return Zend_View_Helper_HeadStyle
-     */
-    public function headStyle($content = null, $placement = 'APPEND', $attributes = array())
-    {
-        if ((null !== $content) && is_string($content)) {
-            switch (strtoupper($placement)) {
-                case 'SET':
-                    $action = 'setStyle';
-                    break;
-                case 'PREPEND':
-                    $action = 'prependStyle';
-                    break;
-                case 'APPEND':
-                default:
-                    $action = 'appendStyle';
-                    break;
-            }
-            $this->$action($content, $attributes);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Overload method calls
-     *
-     * Allows the following method calls:
-     * - appendStyle($content, $attributes = array())
-     * - offsetSetStyle($index, $content, $attributes = array())
-     * - prependStyle($content, $attributes = array())
-     * - setStyle($content, $attributes = array())
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return void
-     * @throws Zend_View_Exception When no $content provided or invalid method
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/^(?P<action>set|(ap|pre)pend|offsetSet)(Style)$/', $method, $matches)) {
-            $index  = null;
-            $argc   = count($args);
-            $action = $matches['action'];
-
-            if ('offsetSet' == $action) {
-                if (0 < $argc) {
-                    $index = array_shift($args);
-                    --$argc;
-                }
-            }
-
-            if (1 > $argc) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf('Method "%s" requires minimally content for the stylesheet', $method));
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            $content = $args[0];
-            $attrs   = array();
-            if (isset($args[1])) {
-                $attrs = (array) $args[1];
-            }
-
-            $item = $this->createData($content, $attrs);
-
-            if ('offsetSet' == $action) {
-                $this->offsetSet($index, $item);
-            } else {
-                $this->$action($item);
-            }
-
-            return $this;
-        }
-
-        return parent::__call($method, $args);
-    }
-
-    /**
-     * Determine if a value is a valid style tag
-     *
-     * @param  mixed $value
-     * @param  string $method
-     * @return boolean
-     */
-    protected function _isValid($value)
-    {
-        if ((!$value instanceof stdClass)
-            || !isset($value->content)
-            || !isset($value->attributes))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Override append to enforce style creation
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function append($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to append; please use appendStyle()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->append($value);
-    }
-
-    /**
-     * Override offsetSet to enforce style creation
-     *
-     * @param  string|int $index
-     * @param  mixed $value
-     * @return void
-     */
-    public function offsetSet($index, $value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetStyle()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->offsetSet($index, $value);
-    }
-
-    /**
-     * Override prepend to enforce style creation
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function prepend($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependStyle()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->prepend($value);
-    }
-
-    /**
-     * Override set to enforce style creation
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function set($value)
-    {
-        if (!$this->_isValid($value)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('Invalid value passed to set; please use setStyle()');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this->getContainer()->set($value);
-    }
-
-    /**
-     * Start capture action
-     *
-     * @param  mixed $captureType
-     * @param  string $typeOrAttrs
-     * @return void
-     */
-    public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $attrs = null)
-    {
-        if ($this->_captureLock) {
-            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
-            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headStyle captures');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->_captureLock        = true;
-        $this->_captureAttrs       = $attrs;
-        $this->_captureType        = $type;
-        ob_start();
-    }
-
-    /**
-     * End capture action and store
-     *
-     * @return void
-     */
-    public function captureEnd()
-    {
-        $content             = ob_get_clean();
-        $attrs               = $this->_captureAttrs;
-        $this->_captureAttrs = null;
-        $this->_captureLock  = false;
-
-        switch ($this->_captureType) {
-            case Zend_View_Helper_Placeholder_Container_Abstract::SET:
-                $this->setStyle($content, $attrs);
-                break;
-            case Zend_View_Helper_Placeholder_Container_Abstract::PREPEND:
-                $this->prependStyle($content, $attrs);
-                break;
-            case Zend_View_Helper_Placeholder_Container_Abstract::APPEND:
-            default:
-                $this->appendStyle($content, $attrs);
-                break;
-        }
-    }
-
-    /**
-     * Convert content and attributes into valid style tag
-     *
-     * @param  stdClass $item Item to render
-     * @param  string $indent Indentation to use
-     * @return string
-     */
-    public function itemToString(stdClass $item, $indent)
-    {
-        $attrString = '';
-        if (!empty($item->attributes)) {
-            $enc = 'UTF-8';
-            if ($this->view instanceof Zend_View_Interface
-                && method_exists($this->view, 'getEncoding')
-            ) {
-                $enc = $this->view->getEncoding();
-            }
-            foreach ($item->attributes as $key => $value) {
-                if (!in_array($key, $this->_optionalAttributes)) {
-                    continue;
-                }
-                if ('media' == $key) {
-                    if(false === strpos($value, ',')) {
-                        if (!in_array($value, $this->_mediaTypes)) {
-                            continue;
-                        }
-                    } else {
-                        $media_types = explode(',', $value);
-                        $value = '';
-                        foreach($media_types as $type) {
-                            $type = trim($type);
-                            if (!in_array($type, $this->_mediaTypes)) {
-                                continue;
-                            }
-                            $value .= $type .',';
-                        }
-                        $value = substr($value, 0, -1);
-                    }
-                }
-                $attrString .= sprintf(' %s="%s"', $key, htmlspecialchars($value, ENT_COMPAT, $enc));
-            }
-        }
-
-        $html = '<style type="text/css"' . $attrString . '>' . PHP_EOL
-              . $indent . '<!--' . PHP_EOL . $indent . $item->content . PHP_EOL . $indent . '-->' . PHP_EOL
-              . '</style>';
-
-        if (isset($item->attributes['conditional'])
-            && !empty($item->attributes['conditional'])
-            && is_string($item->attributes['conditional']))
-        {
-            $html = '<!--[if ' . $item->attributes['conditional'] . ']> ' . $html . '<![endif]-->';
-        }
-
-        return $html;
-    }
-
-    /**
-     * Create string representation of placeholder
-     *
-     * @param  string|int $indent
-     * @return string
-     */
-    public function toString($indent = null)
-    {
-        $indent = (null !== $indent)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        $items = array();
-        $this->getContainer()->ksort();
-        foreach ($this as $item) {
-            if (!$this->_isValid($item)) {
-                continue;
-            }
-            $items[] = $this->itemToString($item, $indent);
-        }
-
-        $return = $indent . implode($this->getSeparator() . $indent, $items);
-        $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
-        return $return;
-    }
-
-    /**
-     * Create data item for use in stack
-     *
-     * @param  string $content
-     * @param  array $attributes
-     * @return stdClass
-     */
-    public function createData($content, array $attributes)
-    {
-        if (!isset($attributes['media'])) {
-            $attributes['media'] = 'screen';
-        } else if(is_array($attributes['media'])) {
-            $attributes['media'] = implode(',', $attributes['media']);
-        }
-
-        $data = new stdClass();
-        $data->content    = $content;
-        $data->attributes = $attributes;
-
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HeadTitle.php b/airtime_mvc/library/Zend/View/Helper/HeadTitle.php
deleted file mode 100644
index c2748bf80..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HeadTitle.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: HeadTitle.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for setting and retrieving title element for HTML head
- *
- * @uses       Zend_View_Helper_Placeholder_Container_Standalone
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_Standalone
-{
-    /**
-     * Registry key for placeholder
-     * @var string
-     */
-    protected $_regKey = 'Zend_View_Helper_HeadTitle';
-
-    /**
-     * Whether or not auto-translation is enabled
-     * @var boolean
-     */
-    protected $_translate = false;
-
-    /**
-     * Translation object
-     *
-     * @var Zend_Translate_Adapter
-     */
-    protected $_translator;
-
-    /**
-     * Retrieve placeholder for title element and optionally set state
-     *
-     * @param  string $title
-     * @param  string $setType
-     * @param  string $separator
-     * @return Zend_View_Helper_HeadTitle
-     */
-    public function headTitle($title = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND)
-    {
-        $title = (string) $title;
-        if ($title !== '') {
-            if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
-                $this->set($title);
-            } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
-                $this->prepend($title);
-            } else {
-                $this->append($title);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a translation Adapter for translation
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter $translate
-     * @return Zend_View_Helper_HeadTitle
-     */
-    public function setTranslator($translate)
-    {
-        if ($translate instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translate;
-        } elseif ($translate instanceof Zend_Translate) {
-            $this->_translator = $translate->getAdapter();
-        } else {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception("You must set an instance of Zend_Translate or Zend_Translate_Adapter");
-            $e->setView($this->view);
-            throw $e;
-        }
-        return $this;
-    }
-
-    /*
-     * Retrieve translation object
-     *
-     * If none is currently registered, attempts to pull it from the registry
-     * using the key 'Zend_Translate'.
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if (null === $this->_translator) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
-            }
-        }
-        return $this->_translator;
-    }
-
-    /**
-     * Enables translation
-     *
-     * @return Zend_View_Helper_HeadTitle
-     */
-    public function enableTranslation()
-    {
-        $this->_translate = true;
-        return $this;
-    }
-
-    /**
-     * Disables translation
-     *
-     * @return Zend_View_Helper_HeadTitle
-     */
-    public function disableTranslation()
-    {
-        $this->_translate = false;
-        return $this;
-    }
-
-    /**
-     * Turn helper into string
-     *
-     * @param  string|null $indent
-     * @param  string|null $locale
-     * @return string
-     */
-    public function toString($indent = null, $locale = null)
-    {
-        $indent = (null !== $indent)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        $items = array();
-
-        if($this->_translate && $translator = $this->getTranslator()) {
-            foreach ($this as $item) {
-                $items[] = $translator->translate($item, $locale);
-            }
-        } else {
-            foreach ($this as $item) {
-                $items[] = $item;
-            }
-        }
-
-        $separator = $this->getSeparator();
-        $output = '';
-        if(($prefix = $this->getPrefix())) {
-            $output  .= $prefix;
-        }
-        $output .= implode($separator, $items);
-        if(($postfix = $this->getPostfix())) {
-            $output .= $postfix;
-        }
-
-        $output = ($this->_autoEscape) ? $this->_escape($output) : $output;
-
-        return $indent . '<title>' . $output . '</title>';
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlElement.php b/airtime_mvc/library/Zend/View/Helper/HtmlElement.php
deleted file mode 100644
index d4d7ae3b0..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlElement.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlElement.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Abstract
- */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_HtmlElement extends Zend_View_Helper_Abstract
-{
-    /**
-     * EOL character
-     */
-    const EOL = "\n";
-
-    /**
-     * The tag closing bracket
-     *
-     * @var string
-     */
-    protected $_closingBracket = null;
-
-    /**
-     * Get the tag closing bracket
-     *
-     * @return string
-     */
-    public function getClosingBracket()
-    {
-        if (!$this->_closingBracket) {
-            if ($this->_isXhtml()) {
-                $this->_closingBracket = ' />';
-            } else {
-                $this->_closingBracket = '>';
-            }
-        }
-
-        return $this->_closingBracket;
-    }
-
-    /**
-     * Is doctype XHTML?
-     *
-     * @return boolean
-     */
-    protected function _isXhtml()
-    {
-        $doctype = $this->view->doctype();
-        return $doctype->isXhtml();
-    }
-
-    /**
-     * Converts an associative array to a string of tag attributes.
-     *
-     * @access public
-     *
-     * @param array $attribs From this array, each key-value pair is
-     * converted to an attribute name and value.
-     *
-     * @return string The XHTML for the attributes.
-     */
-    protected function _htmlAttribs($attribs)
-    {
-        $xhtml = '';
-        foreach ((array) $attribs as $key => $val) {
-            $key = $this->view->escape($key);
-
-            if (('on' == substr($key, 0, 2)) || ('constraints' == $key)) {
-                // Don't escape event attributes; _do_ substitute double quotes with singles
-                if (!is_scalar($val)) {
-                    // non-scalar data should be cast to JSON first
-                    require_once 'Zend/Json.php';
-                    $val = Zend_Json::encode($val);
-                }
-                $val = preg_replace('/"([^"]*)":/', '$1:', $val);
-            } else {
-                if (is_array($val)) {
-                    $val = implode(' ', $val);
-                }
-                $val = $this->view->escape($val);
-            }
-
-            if ('id' == $key) {
-                $val = $this->_normalizeId($val);
-            }
-
-            if (strpos($val, '"') !== false) {
-                $xhtml .= " $key='$val'";
-            } else {
-                $xhtml .= " $key=\"$val\"";
-            }
-
-        }
-        return $xhtml;
-    }
-
-    /**
-     * Normalize an ID
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _normalizeId($value)
-    {
-        if (strstr($value, '[')) {
-            if ('[]' == substr($value, -2)) {
-                $value = substr($value, 0, strlen($value) - 2);
-            }
-            $value = trim($value, ']');
-            $value = str_replace('][', '-', $value);
-            $value = str_replace('[', '-', $value);
-        }
-        return $value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlFlash.php b/airtime_mvc/library/Zend/View/Helper/HtmlFlash.php
deleted file mode 100644
index 700218042..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlFlash.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlFlash.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_HtmlObject
- */
-require_once 'Zend/View/Helper/HtmlObject.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HtmlFlash extends Zend_View_Helper_HtmlObject
-{
-    /**
-     * Default file type for a flash applet
-     *
-     */
-    const TYPE = 'application/x-shockwave-flash';
-
-    /**
-     * Output a flash movie object tag
-     *
-     * @param string $data The flash file
-     * @param array  $attribs Attribs for the object tag
-     * @param array  $params Params for in the object tag
-     * @param string $content Alternative content
-     * @return string
-     */
-    public function htmlFlash($data, array $attribs = array(), array $params = array(), $content = null)
-    {
-        // Params
-        $params = array_merge(array('movie'   => $data,
-                                    'quality' => 'high'), $params);
-
-        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlList.php b/airtime_mvc/library/Zend/View/Helper/HtmlList.php
deleted file mode 100644
index 8a59498a1..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlList.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlList.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_View_Helper_FormELement
- */
-require_once 'Zend/View/Helper/FormElement.php';
-
-/**
- * Helper for ordered and unordered lists
- *
- * @uses Zend_View_Helper_FormElement
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement
-{
-
-    /**
-     * Generates a 'List' element.
-     *
-     * @param array   $items   Array with the elements of the list
-     * @param boolean $ordered Specifies ordered/unordered list; default unordered
-     * @param array   $attribs Attributes for the ol/ul tag.
-     * @return string The list XHTML.
-     */
-    public function htmlList(array $items, $ordered = false, $attribs = false, $escape = true)
-    {
-        if (!is_array($items)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('First param must be an array');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $list = '';
-
-        foreach ($items as $item) {
-            if (!is_array($item)) {
-                if ($escape) {
-                    $item = $this->view->escape($item);
-                }
-                $list .= '<li>' . $item . '</li>' . self::EOL;
-            } else {
-                if (6 < strlen($list)) {
-                    $list = substr($list, 0, strlen($list) - 6)
-                     . $this->htmlList($item, $ordered, $attribs, $escape) . '</li>' . self::EOL;
-                } else {
-                    $list .= '<li>' . $this->htmlList($item, $ordered, $attribs, $escape) . '</li>' . self::EOL;
-                }
-            }
-        }
-
-        if ($attribs) {
-            $attribs = $this->_htmlAttribs($attribs);
-        } else {
-            $attribs = '';
-        }
-
-        $tag = 'ul';
-        if ($ordered) {
-            $tag = 'ol';
-        }
-
-        return '<' . $tag . $attribs . '>' . self::EOL . $list . '</' . $tag . '>' . self::EOL;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlObject.php b/airtime_mvc/library/Zend/View/Helper/HtmlObject.php
deleted file mode 100644
index 05562ce07..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlObject.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlObject.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_HtmlElement
- */
-require_once 'Zend/View/Helper/HtmlElement.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HtmlObject extends Zend_View_Helper_HtmlElement
-{
-    /**
-     * Output an object set
-     *
-     * @param string $data The data file
-     * @param string $type Data file type
-     * @param array  $attribs Attribs for the object tag
-     * @param array  $params Params for in the object tag
-     * @param string $content Alternative content for object
-     * @return string
-     */
-    public function htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)
-    {
-        // Merge data and type
-        $attribs = array_merge(array('data' => $data,
-                                     'type' => $type), $attribs);
-
-        // Params
-        $paramHtml = array();
-        $closingBracket = $this->getClosingBracket();
-
-        foreach ($params as $param => $options) {
-            if (is_string($options)) {
-                $options = array('value' => $options);
-            }
-
-            $options = array_merge(array('name' => $param), $options);
-
-            $paramHtml[] = '<param' . $this->_htmlAttribs($options) . $closingBracket;
-        }
-
-        // Content
-        if (is_array($content)) {
-            $content = implode(self::EOL, $content);
-        }
-
-        // Object header
-        $xhtml = '<object' . $this->_htmlAttribs($attribs) . '>' . self::EOL
-                 . implode(self::EOL, $paramHtml) . self::EOL
-                 . ($content ? $content . self::EOL : '')
-                 . '</object>';
-
-        return $xhtml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlPage.php b/airtime_mvc/library/Zend/View/Helper/HtmlPage.php
deleted file mode 100644
index bfcddcca1..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlPage.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlPage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_HtmlObject
- */
-require_once 'Zend/View/Helper/HtmlObject.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HtmlPage extends Zend_View_Helper_HtmlObject
-{
-    /**
-     * Default file type for html
-     *
-     */
-    const TYPE = 'text/html';
-
-    /**
-     * Object classid
-     *
-     */
-    const ATTRIB_CLASSID  = 'clsid:25336920-03F9-11CF-8FD0-00AA00686F13';
-
-    /**
-     * Default attributes
-     *
-     * @var array
-     */
-    protected $_attribs = array('classid' => self::ATTRIB_CLASSID);
-
-    /**
-     * Output a html object tag
-     *
-     * @param string $data The html url
-     * @param array  $attribs Attribs for the object tag
-     * @param array  $params Params for in the object tag
-     * @param string $content Alternative content
-     * @return string
-     */
-    public function htmlPage($data, array $attribs = array(), array $params = array(), $content = null)
-    {
-        // Attrs
-        $attribs = array_merge($this->_attribs, $attribs);
-
-        // Params
-        $params = array_merge(array('data' => $data), $params);
-
-        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/HtmlQuicktime.php b/airtime_mvc/library/Zend/View/Helper/HtmlQuicktime.php
deleted file mode 100644
index b06f38014..000000000
--- a/airtime_mvc/library/Zend/View/Helper/HtmlQuicktime.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HtmlQuicktime.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_HtmlObject
- */
-require_once 'Zend/View/Helper/HtmlObject.php';
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_HtmlQuicktime extends Zend_View_Helper_HtmlObject
-{
-    /**
-     * Default file type for a movie applet
-     *
-     */
-    const TYPE = 'video/quicktime';
-
-    /**
-     * Object classid
-     *
-     */
-    const ATTRIB_CLASSID  = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
-
-    /**
-     * Object Codebase
-     *
-     */
-    const ATTRIB_CODEBASE = 'http://www.apple.com/qtactivex/qtplugin.cab';
-
-    /**
-     * Default attributes
-     *
-     * @var array
-     */
-    protected $_attribs = array('classid'  => self::ATTRIB_CLASSID,
-                                'codebase' => self::ATTRIB_CODEBASE);
-
-    /**
-     * Output a quicktime movie object tag
-     *
-     * @param string $data The quicktime file
-     * @param array  $attribs Attribs for the object tag
-     * @param array  $params Params for in the object tag
-     * @param string $content Alternative content
-     * @return string
-     */
-    public function htmlQuicktime($data, array $attribs = array(), array $params = array(), $content = null)
-    {
-        // Attrs
-        $attribs = array_merge($this->_attribs, $attribs);
-
-        // Params
-        $params = array_merge(array('src' => $data), $params);
-
-        return $this->htmlObject($data, self::TYPE, $attribs, $params, $content);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/InlineScript.php b/airtime_mvc/library/Zend/View/Helper/InlineScript.php
deleted file mode 100644
index e95b30d4c..000000000
--- a/airtime_mvc/library/Zend/View/Helper/InlineScript.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: InlineScript.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_HeadScript */
-require_once 'Zend/View/Helper/HeadScript.php';
-
-/**
- * Helper for setting and retrieving script elements for inclusion in HTML body
- * section
- *
- * @uses       Zend_View_Helper_Head_Script
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_InlineScript extends Zend_View_Helper_HeadScript
-{
-    /**
-     * Registry key for placeholder
-     * @var string
-     */
-    protected $_regKey = 'Zend_View_Helper_InlineScript';
-
-    /**
-     * Return InlineScript object
-     *
-     * Returns InlineScript helper object; optionally, allows specifying a
-     * script or script file to include.
-     *
-     * @param  string $mode Script or file
-     * @param  string $spec Script/url
-     * @param  string $placement Append, prepend, or set
-     * @param  array $attrs Array of script attributes
-     * @param  string $type Script type and/or array of script attributes
-     * @return Zend_View_Helper_InlineScript
-     */
-    public function inlineScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
-    {
-        return $this->headScript($mode, $spec, $placement, $attrs, $type);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Interface.php b/airtime_mvc/library/Zend/View/Helper/Interface.php
deleted file mode 100644
index 26ea148d2..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Interface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_View_Helper_Interface
-{
-    /**
-     * Set the View object
-     *
-     * @param  Zend_View_Interface $view
-     * @return Zend_View_Helper_Interface
-     */
-    public function setView(Zend_View_Interface $view);
-
-    /**
-     * Strategy pattern: helper method to invoke
-     *
-     * @return mixed
-     */
-    public function direct();
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Json.php b/airtime_mvc/library/Zend/View/Helper/Json.php
deleted file mode 100644
index 959465bb6..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Json.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Json.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Json */
-require_once 'Zend/Json.php';
-
-/** Zend_Controller_Front */
-require_once 'Zend/Controller/Front.php';
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for simplifying JSON responses
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Json extends Zend_View_Helper_Abstract
-{
-    /**
-     * Encode data as JSON, disable layouts, and set response header
-     *
-     * If $keepLayouts is true, does not disable layouts.
-     *
-     * @param  mixed $data
-     * @param  bool $keepLayouts
-     * NOTE:   if boolean, establish $keepLayouts to true|false
-     *         if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
-     *         this array can contains a 'keepLayout'=>true|false
-     *         that will not be passed to Zend_Json::encode method but will be used here
-     * @return string|void
-     */
-    public function json($data, $keepLayouts = false)
-    {
-        $options = array();
-        if (is_array($keepLayouts))
-        {
-            $options     = $keepLayouts;
-            $keepLayouts = (array_key_exists('keepLayouts', $keepLayouts))
-                            ? $keepLayouts['keepLayouts']
-                            : false;
-            unset($options['keepLayouts']);
-        }
-
-        $data = Zend_Json::encode($data, null, $options);
-        if (!$keepLayouts) {
-            require_once 'Zend/Layout.php';
-            $layout = Zend_Layout::getMvcInstance();
-            if ($layout instanceof Zend_Layout) {
-                $layout->disableLayout();
-            }
-        }
-
-        $response = Zend_Controller_Front::getInstance()->getResponse();
-        $response->setHeader('Content-Type', 'application/json');
-        return $data;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Layout.php b/airtime_mvc/library/Zend/View/Helper/Layout.php
deleted file mode 100644
index 20613f231..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Layout.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * View helper for retrieving layout object
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract
-{
-    /** @var Zend_Layout */
-    protected $_layout;
-
-    /**
-     * Get layout object
-     *
-     * @return Zend_Layout
-     */
-    public function getLayout()
-    {
-        if (null === $this->_layout) {
-            require_once 'Zend/Layout.php';
-            $this->_layout = Zend_Layout::getMvcInstance();
-            if (null === $this->_layout) {
-                // Implicitly creates layout object
-                $this->_layout = new Zend_Layout();
-            }
-        }
-
-        return $this->_layout;
-    }
-
-    /**
-     * Set layout object
-     *
-     * @param  Zend_Layout $layout
-     * @return Zend_Layout_Controller_Action_Helper_Layout
-     */
-    public function setLayout(Zend_Layout $layout)
-    {
-        $this->_layout = $layout;
-        return $this;
-    }
-
-    /**
-     * Return layout object
-     *
-     * Usage: $this->layout()->setLayout('alternate');
-     *
-     * @return Zend_Layout
-     */
-    public function layout()
-    {
-        return $this->getLayout();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation.php b/airtime_mvc/library/Zend/View/Helper/Navigation.php
deleted file mode 100644
index 6c5013cc0..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation.php
+++ /dev/null
@@ -1,338 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_HelperAbstract
- */
-require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
-
-/**
- * Proxy helper for retrieving navigational helpers and forwarding calls
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Navigation
-    extends Zend_View_Helper_Navigation_HelperAbstract
-{
-    /**
-     * View helper namespace
-     *
-     * @var string
-     */
-    const NS = 'Zend_View_Helper_Navigation';
-
-    /**
-     * Default proxy to use in {@link render()}
-     *
-     * @var string
-     */
-    protected $_defaultProxy = 'menu';
-
-    /**
-     * Contains references to proxied helpers
-     *
-     * @var array
-     */
-    protected $_helpers = array();
-
-    /**
-     * Whether container should be injected when proxying
-     *
-     * @var bool
-     */
-    protected $_injectContainer = true;
-
-    /**
-     * Whether ACL should be injected when proxying
-     *
-     * @var bool
-     */
-    protected $_injectAcl = true;
-
-    /**
-     * Whether translator should be injected when proxying
-     *
-     * @var bool
-     */
-    protected $_injectTranslator = true;
-
-    /**
-     * Helper entry point
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               operate on
-     * @return Zend_View_Helper_Navigation           fluent interface, returns
-     *                                               self
-     */
-    public function navigation(Zend_Navigation_Container $container = null)
-    {
-        if (null !== $container) {
-            $this->setContainer($container);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Magic overload: Proxy to other navigation helpers or the container
-     *
-     * Examples of usage from a view script or layout:
-     * <code>
-     * // proxy to Menu helper and render container:
-     * echo $this->navigation()->menu();
-     *
-     * // proxy to Breadcrumbs helper and set indentation:
-     * $this->navigation()->breadcrumbs()->setIndent(8);
-     *
-     * // proxy to container and find all pages with 'blog' route:
-     * $blogPages = $this->navigation()->findAllByRoute('blog');
-     * </code>
-     *
-     * @param  string $method             helper name or method name in
-     *                                    container
-     * @param  array  $arguments          [optional] arguments to pass
-     * @return mixed                      returns what the proxied call returns
-     * @throws Zend_View_Exception        if proxying to a helper, and the
-     *                                    helper is not an instance of the
-     *                                    interface specified in
-     *                                    {@link findHelper()}
-     * @throws Zend_Navigation_Exception  if method does not exist in container
-     */
-    public function __call($method, array $arguments = array())
-    {
-        // check if call should proxy to another helper
-        if ($helper = $this->findHelper($method, false)) {
-            return call_user_func_array(array($helper, $method), $arguments);
-        }
-
-        // default behaviour: proxy call to container
-        return parent::__call($method, $arguments);
-    }
-
-    /**
-     * Returns the helper matching $proxy
-     *
-     * The helper must implement the interface
-     * {@link Zend_View_Helper_Navigation_Helper}.
-     *
-     * @param string $proxy                        helper name
-     * @param bool   $strict                       [optional] whether
-     *                                             exceptions should be
-     *                                             thrown if something goes
-     *                                             wrong. Default is true.
-     * @return Zend_View_Helper_Navigation_Helper  helper instance
-     * @throws Zend_Loader_PluginLoader_Exception  if $strict is true and
-     *                                             helper cannot be found
-     * @throws Zend_View_Exception                 if $strict is true and
-     *                                             helper does not implement
-     *                                             the specified interface
-     */
-    public function findHelper($proxy, $strict = true)
-    {
-        if (isset($this->_helpers[$proxy])) {
-            return $this->_helpers[$proxy];
-        }
-
-        if (!$this->view->getPluginLoader('helper')->getPaths(self::NS)) {
-            $this->view->addHelperPath(
-                    str_replace('_', '/', self::NS),
-                    self::NS);
-        }
-
-        if ($strict) {
-            $helper = $this->view->getHelper($proxy);
-        } else {
-            try {
-                $helper = $this->view->getHelper($proxy);
-            } catch (Zend_Loader_PluginLoader_Exception $e) {
-                return null;
-            }
-        }
-
-        if (!$helper instanceof Zend_View_Helper_Navigation_Helper) {
-            if ($strict) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf(
-                        'Proxy helper "%s" is not an instance of ' .
-                        'Zend_View_Helper_Navigation_Helper',
-                        get_class($helper)));
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            return null;
-        }
-
-        $this->_inject($helper);
-        $this->_helpers[$proxy] = $helper;
-
-        return $helper;
-    }
-
-    /**
-     * Injects container, ACL, and translator to the given $helper if this
-     * helper is configured to do so
-     *
-     * @param  Zend_View_Helper_Navigation_Helper $helper  helper instance
-     * @return void
-     */
-    protected function _inject(Zend_View_Helper_Navigation_Helper $helper)
-    {
-        if ($this->getInjectContainer() && !$helper->hasContainer()) {
-            $helper->setContainer($this->getContainer());
-        }
-
-        if ($this->getInjectAcl()) {
-            if (!$helper->hasAcl()) {
-                $helper->setAcl($this->getAcl());
-            }
-            if (!$helper->hasRole()) {
-                $helper->setRole($this->getRole());
-            }
-        }
-
-        if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
-            $helper->setTranslator($this->getTranslator());
-        }
-    }
-
-    // Accessors:
-
-    /**
-     * Sets the default proxy to use in {@link render()}
-     *
-     * @param  string $proxy                default proxy
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
-     */
-    public function setDefaultProxy($proxy)
-    {
-        $this->_defaultProxy = (string) $proxy;
-        return $this;
-    }
-
-    /**
-     * Returns the default proxy to use in {@link render()}
-     *
-     * @return string  the default proxy to use in {@link render()}
-     */
-    public function getDefaultProxy()
-    {
-        return $this->_defaultProxy;
-    }
-
-    /**
-     * Sets whether container should be injected when proxying
-     *
-     * @param bool $injectContainer         [optional] whether container should
-     *                                      be injected when proxying. Default
-     *                                      is true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
-     */
-    public function setInjectContainer($injectContainer = true)
-    {
-        $this->_injectContainer = (bool) $injectContainer;
-        return $this;
-    }
-
-    /**
-     * Returns whether container should be injected when proxying
-     *
-     * @return bool  whether container should be injected when proxying
-     */
-    public function getInjectContainer()
-    {
-        return $this->_injectContainer;
-    }
-
-    /**
-     * Sets whether ACL should be injected when proxying
-     *
-     * @param  bool $injectAcl              [optional] whether ACL should be
-     *                                      injected when proxying. Default is
-     *                                      true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
-     */
-    public function setInjectAcl($injectAcl = true)
-    {
-        $this->_injectAcl = (bool) $injectAcl;
-        return $this;
-    }
-
-    /**
-     * Returns whether ACL should be injected when proxying
-     *
-     * @return bool  whether ACL should be injected when proxying
-     */
-    public function getInjectAcl()
-    {
-        return $this->_injectAcl;
-    }
-
-    /**
-     * Sets whether translator should be injected when proxying
-     *
-     * @param  bool $injectTranslator       [optional] whether translator should
-     *                                      be injected when proxying. Default
-     *                                      is true.
-     * @return Zend_View_Helper_Navigation  fluent interface, returns self
-     */
-    public function setInjectTranslator($injectTranslator = true)
-    {
-        $this->_injectTranslator = (bool) $injectTranslator;
-        return $this;
-    }
-
-    /**
-     * Returns whether translator should be injected when proxying
-     *
-     * @return bool  whether translator should be injected when proxying
-     */
-    public function getInjectTranslator()
-    {
-        return $this->_injectTranslator;
-    }
-
-    // Zend_View_Helper_Navigation_Helper:
-
-    /**
-     * Renders helper
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     * @throws Zend_Loader_PluginLoader_Exception    if helper cannot be found
-     * @throws Zend_View_Exception                   if helper doesn't implement
-     *                                               the interface specified in
-     *                                               {@link findHelper()}
-     */
-    public function render(Zend_Navigation_Container $container = null)
-    {
-        $helper = $this->findHelper($this->getDefaultProxy());
-        return $helper->render($container);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/airtime_mvc/library/Zend/View/Helper/Navigation/Breadcrumbs.php
deleted file mode 100644
index 7ec3cc02b..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Breadcrumbs.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_HelperAbstract
- */
-require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
-
-/**
- * Helper for printing breadcrumbs
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Navigation_Breadcrumbs
-    extends Zend_View_Helper_Navigation_HelperAbstract
-{
-    /**
-     * Breadcrumbs separator string
-     *
-     * @var string
-     */
-    protected $_separator = ' &gt; ';
-
-    /**
-     * The minimum depth a page must have to be included when rendering
-     *
-     * @var int
-     */
-    protected $_minDepth = 1;
-
-    /**
-     * Whether last page in breadcrumb should be hyperlinked
-     *
-     * @var bool
-     */
-    protected $_linkLast = false;
-
-    /**
-     * Partial view script to use for rendering menu
-     *
-     * @var string|array
-     */
-    protected $_partial;
-
-    /**
-     * View helper entry point:
-     * Retrieves helper and optionally sets container to operate on
-     *
-     * @param  Zend_Navigation_Container $container     [optional] container to
-     *                                                  operate on
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
-     *                                                  returns self
-     */
-    public function breadcrumbs(Zend_Navigation_Container $container = null)
-    {
-        if (null !== $container) {
-            $this->setContainer($container);
-        }
-
-        return $this;
-    }
-
-    // Accessors:
-
-    /**
-     * Sets breadcrumb separator
-     *
-     * @param  string $separator                        separator string
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
-     *                                                  returns self
-     */
-    public function setSeparator($separator)
-    {
-        if (is_string($separator)) {
-            $this->_separator = $separator;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns breadcrumb separator
-     *
-     * @return string  breadcrumb separator
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Sets whether last page in breadcrumbs should be hyperlinked
-     *
-     * @param  bool $linkLast                           whether last page should
-     *                                                  be hyperlinked
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
-     *                                                  returns self
-     */
-    public function setLinkLast($linkLast)
-    {
-        $this->_linkLast = (bool) $linkLast;
-        return $this;
-    }
-
-    /**
-     * Returns whether last page in breadcrumbs should be hyperlinked
-     *
-     * @return bool  whether last page in breadcrumbs should be hyperlinked
-     */
-    public function getLinkLast()
-    {
-        return $this->_linkLast;
-    }
-
-    /**
-     * Sets which partial view script to use for rendering menu
-     *
-     * @param  string|array $partial                    partial view script or
-     *                                                  null. If an array is
-     *                                                  given, it is expected to
-     *                                                  contain two values;
-     *                                                  the partial view script
-     *                                                  to use, and the module
-     *                                                  where the script can be
-     *                                                  found.
-     * @return Zend_View_Helper_Navigation_Breadcrumbs  fluent interface,
-     *                                                  returns self
-     */
-    public function setPartial($partial)
-    {
-        if (null === $partial || is_string($partial) || is_array($partial)) {
-            $this->_partial = $partial;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns partial view script to use for rendering menu
-     *
-     * @return string|array|null
-     */
-    public function getPartial()
-    {
-        return $this->_partial;
-    }
-
-    // Render methods:
-
-    /**
-     * Renders breadcrumbs by chaining 'a' elements with the separator
-     * registered in the helper
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     */
-    public function renderStraight(Zend_Navigation_Container $container = null)
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        // find deepest active
-        if (!$active = $this->findActive($container)) {
-            return '';
-        }
-
-        $active = $active['page'];
-
-        // put the deepest active page last in breadcrumbs
-        if ($this->getLinkLast()) {
-            $html = $this->htmlify($active);
-        } else {
-            $html = $active->getLabel();
-            if ($this->getUseTranslator() && $t = $this->getTranslator()) {
-                $html = $t->translate($html);
-            }
-            $html = $this->view->escape($html);
-        }
-
-        // walk back to root
-        while ($parent = $active->getParent()) {
-            if ($parent instanceof Zend_Navigation_Page) {
-                // prepend crumb to html
-                $html = $this->htmlify($parent)
-                      . $this->getSeparator()
-                      . $html;
-            }
-
-            if ($parent === $container) {
-                // at the root of the given container
-                break;
-            }
-
-            $active = $parent;
-        }
-
-        return strlen($html) ? $this->getIndent() . $html : '';
-    }
-
-    /**
-     * Renders the given $container by invoking the partial view helper
-     *
-     * The container will simply be passed on as a model to the view script,
-     * so in the script it will be available in <code>$this->container</code>.
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               pass to view script.
-     *                                               Default is to use the
-     *                                               container registered in the
-     *                                               helper.
-     * @param  string|array             $partial     [optional] partial view
-     *                                               script to use. Default is
-     *                                               to use the partial
-     *                                               registered in the helper.
-     *                                               If an array is given, it is
-     *                                               expected to contain two
-     *                                               values; the partial view
-     *                                               script to use, and the
-     *                                               module where the script can
-     *                                               be found.
-     * @return string                                helper output
-     */
-    public function renderPartial(Zend_Navigation_Container $container = null,
-                                  $partial = null)
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        if (null === $partial) {
-            $partial = $this->getPartial();
-        }
-
-        if (empty($partial)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(
-                'Unable to render menu: No partial view script provided'
-            );
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        // put breadcrumb pages in model
-        $model = array('pages' => array());
-        if ($active = $this->findActive($container)) {
-            $active = $active['page'];
-            $model['pages'][] = $active;
-            while ($parent = $active->getParent()) {
-                if ($parent instanceof Zend_Navigation_Page) {
-                    $model['pages'][] = $parent;
-                } else {
-                    break;
-                }
-
-                if ($parent === $container) {
-                    // break if at the root of the given container
-                    break;
-                }
-
-                $active = $parent;
-            }
-            $model['pages'] = array_reverse($model['pages']);
-        }
-
-        if (is_array($partial)) {
-            if (count($partial) != 2) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(
-                    'Unable to render menu: A view partial supplied as ' 
-                    .  'an array must contain two values: partial view ' 
-                    .  'script and module where script can be found'
-                );
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            return $this->view->partial($partial[0], $partial[1], $model);
-        }
-
-        return $this->view->partial($partial, null, $model);
-    }
-
-    // Zend_View_Helper_Navigation_Helper:
-
-    /**
-     * Renders helper
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     */
-    public function render(Zend_Navigation_Container $container = null)
-    {
-        if ($partial = $this->getPartial()) {
-            return $this->renderPartial($container, $partial);
-        } else {
-            return $this->renderStraight($container);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/Helper.php b/airtime_mvc/library/Zend/View/Helper/Navigation/Helper.php
deleted file mode 100644
index 48c0ae8c9..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/Helper.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Helper.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Interface for navigational helpers
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_View_Helper_Navigation_Helper
-{
-    /**
-     * Sets navigation container the helper should operate on by default
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               operate on. Default is
-     *                                               null, which indicates that
-     *                                               the container should be
-     *                                               reset.
-     * @return Zend_View_Helper_Navigation_Helper    fluent interface, returns
-     *                                               self
-     */
-    public function setContainer(Zend_Navigation_Container $container = null);
-
-    /**
-     * Returns the navigation container the helper operates on by default
-     *
-     * @return Zend_Navigation_Container  navigation container
-     */
-    public function getContainer();
-
-    /**
-     * Sets translator to use in helper
-     *
-     * @param  mixed $translator                   [optional] translator.
-     *                                             Expects an object of type
-     *                                             {@link Zend_Translate_Adapter}
-     *                                             or {@link Zend_Translate},
-     *                                             or null. Default is null.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
-     *                                             self
-     */
-    public function setTranslator($translator = null);
-
-    /**
-     * Returns translator used in helper
-     *
-     * @return Zend_Translate_Adapter|null  translator or null
-     */
-    public function getTranslator();
-
-    /**
-     * Sets ACL to use when iterating pages
-     *
-     * @param  Zend_Acl $acl                       [optional] ACL instance
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
-     *                                             self
-     */
-    public function setAcl(Zend_Acl $acl = null);
-
-    /**
-     * Returns ACL or null if it isn't set using {@link setAcl()} or
-     * {@link setDefaultAcl()}
-     *
-     * @return Zend_Acl|null  ACL object or null
-     */
-    public function getAcl();
-
-    /**
-     * Sets ACL role to use when iterating pages
-     *
-     * @param  mixed $role                         [optional] role to set.
-     *                                             Expects a string, an
-     *                                             instance of type
-     *                                             {@link Zend_Acl_Role_Interface},
-     *                                             or null. Default is null.
-     * @throws Zend_View_Exception                 if $role is invalid
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
-     *                                             self
-     */
-    public function setRole($role = null);
-
-    /**
-     * Returns ACL role to use when iterating pages, or null if it isn't set
-     *
-     * @return string|Zend_Acl_Role_Interface|null  role or null
-     */
-    public function getRole();
-
-    /**
-     * Sets whether ACL should be used
-     *
-     * @param  bool $useAcl                        [optional] whether ACL
-     *                                             should be used. Default is
-     *                                             true.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
-     *                                             self
-     */
-    public function setUseAcl($useAcl = true);
-
-    /**
-     * Returns whether ACL should be used
-     *
-     * @return bool  whether ACL should be used
-     */
-    public function getUseAcl();
-
-    /**
-     * Return renderInvisible flag
-     *
-     * @return bool
-     */
-    public function getRenderInvisible();
-
-    /**
-     * Render invisible items?
-     *
-     * @param  bool $renderInvisible                       [optional] boolean flag
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
-     *                                                     returns self
-     */
-    public function setRenderInvisible($renderInvisible = true);
-
-    /**
-     * Sets whether translator should be used
-     *
-     * @param  bool $useTranslator                 [optional] whether
-     *                                             translator should be used.
-     *                                             Default is true.
-     * @return Zend_View_Helper_Navigation_Helper  fluent interface, returns
-     *                                             self
-     */
-    public function setUseTranslator($useTranslator = true);
-
-    /**
-     * Returns whether translator should be used
-     *
-     * @return bool  whether translator should be used
-     */
-    public function getUseTranslator();
-
-    /**
-     * Checks if the helper has a container
-     *
-     * @return bool  whether the helper has a container or not
-     */
-    public function hasContainer();
-
-    /**
-     * Checks if the helper has an ACL instance
-     *
-     * @return bool  whether the helper has a an ACL instance or not
-     */
-    public function hasAcl();
-
-    /**
-     * Checks if the helper has an ACL role
-     *
-     * @return bool  whether the helper has a an ACL role or not
-     */
-    public function hasRole();
-
-    /**
-     * Checks if the helper has a translator
-     *
-     * @return bool  whether the helper has a translator or not
-     */
-    public function hasTranslator();
-
-    /**
-     * Magic overload: Should proxy to {@link render()}.
-     *
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Renders helper
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is null,
-     *                                               which indicates that the
-     *                                               helper should render the
-     *                                               container returned by
-     *                                               {@link getContainer()}.
-     * @return string                                helper output
-     * @throws Zend_View_Exception                   if unable to render
-     */
-    public function render(Zend_Navigation_Container $container = null);
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/HelperAbstract.php b/airtime_mvc/library/Zend/View/Helper/Navigation/HelperAbstract.php
deleted file mode 100644
index 177afcc77..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/HelperAbstract.php
+++ /dev/null
@@ -1,855 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HelperAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_Helper
- */
-require_once 'Zend/View/Helper/Navigation/Helper.php';
-
-/**
- * @see Zend_View_Helper_HtmlElement
- */
-require_once 'Zend/View/Helper/HtmlElement.php';
-
-/**
- * Base class for navigational helpers
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_Navigation_HelperAbstract
-    extends Zend_View_Helper_HtmlElement
-    implements Zend_View_Helper_Navigation_Helper
-{
-    /**
-     * Container to operate on by default
-     *
-     * @var Zend_Navigation_Container
-     */
-    protected $_container;
-
-    /**
-     * The minimum depth a page must have to be included when rendering
-     *
-     * @var int
-     */
-    protected $_minDepth;
-
-    /**
-     * The maximum depth a page can have to be included when rendering
-     *
-     * @var int
-     */
-    protected $_maxDepth;
-
-    /**
-     * Indentation string
-     *
-     * @var string
-     */
-    protected $_indent = '';
-
-    /**
-     * Translator
-     *
-     * @var Zend_Translate_Adapter
-     */
-    protected $_translator;
-
-    /**
-     * ACL to use when iterating pages
-     *
-     * @var Zend_Acl
-     */
-    protected $_acl;
-
-    /**
-     * Wheter invisible items should be rendered by this helper
-     *
-     * @var bool
-     */
-    protected $_renderInvisible = false;
-
-    /**
-     * ACL role to use when iterating pages
-     *
-     * @var string|Zend_Acl_Role_Interface
-     */
-    protected $_role;
-
-    /**
-     * Whether translator should be used for page labels and titles
-     *
-     * @var bool
-     */
-    protected $_useTranslator = true;
-
-    /**
-     * Whether ACL should be used for filtering out pages
-     *
-     * @var bool
-     */
-    protected $_useAcl = true;
-
-    /**
-     * Default ACL to use when iterating pages if not explicitly set in the
-     * instance by calling {@link setAcl()}
-     *
-     * @var Zend_Acl
-     */
-    protected static $_defaultAcl;
-
-    /**
-     * Default ACL role to use when iterating pages if not explicitly set in the
-     * instance by calling {@link setRole()}
-     *
-     * @var string|Zend_Acl_Role_Interface
-     */
-    protected static $_defaultRole;
-
-    // Accessors:
-
-    /**
-     * Sets navigation container the helper operates on by default
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Interface::setContainer()}.
-     *
-     * @param  Zend_Navigation_Container $container        [optional] container
-     *                                                     to operate on.
-     *                                                     Default is null,
-     *                                                     meaning container
-     *                                                     will be reset.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setContainer(Zend_Navigation_Container $container = null)
-    {
-        $this->_container = $container;
-        return $this;
-    }
-
-    /**
-     * Returns the navigation container helper operates on by default
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Interface::getContainer()}.
-     *
-     * If a helper is not explicitly set in this helper instance by calling
-     * {@link setContainer()} or by passing it through the helper entry point,
-     * this method will look in {@link Zend_Registry} for a container by using
-     * the key 'Zend_Navigation'.
-     *
-     * If no container is set, and nothing is found in Zend_Registry, a new
-     * container will be instantiated and stored in the helper.
-     *
-     * @return Zend_Navigation_Container  navigation container
-     */
-    public function getContainer()
-    {
-        if (null === $this->_container) {
-            // try to fetch from registry first
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Navigation')) {
-                $nav = Zend_Registry::get('Zend_Navigation');
-                if ($nav instanceof Zend_Navigation_Container) {
-                    return $this->_container = $nav;
-                }
-            }
-
-            // nothing found in registry, create new container
-            require_once 'Zend/Navigation.php';
-            $this->_container = new Zend_Navigation();
-        }
-
-        return $this->_container;
-    }
-
-    /**
-     * Sets the minimum depth a page must have to be included when rendering
-     *
-     * @param  int $minDepth                               [optional] minimum
-     *                                                     depth. Default is
-     *                                                     null, which sets
-     *                                                     no minimum depth.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setMinDepth($minDepth = null)
-    {
-        if (null === $minDepth || is_int($minDepth)) {
-            $this->_minDepth = $minDepth;
-        } else {
-            $this->_minDepth = (int) $minDepth;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns minimum depth a page must have to be included when rendering
-     *
-     * @return int|null  minimum depth or null
-     */
-    public function getMinDepth()
-    {
-        if (!is_int($this->_minDepth) || $this->_minDepth < 0) {
-            return 0;
-        }
-        return $this->_minDepth;
-    }
-
-    /**
-     * Sets the maximum depth a page can have to be included when rendering
-     *
-     * @param  int $maxDepth                               [optional] maximum
-     *                                                     depth. Default is
-     *                                                     null, which sets no
-     *                                                     maximum depth.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setMaxDepth($maxDepth = null)
-    {
-        if (null === $maxDepth || is_int($maxDepth)) {
-            $this->_maxDepth = $maxDepth;
-        } else {
-            $this->_maxDepth = (int) $maxDepth;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns maximum depth a page can have to be included when rendering
-     *
-     * @return int|null  maximum depth or null
-     */
-    public function getMaxDepth()
-    {
-        return $this->_maxDepth;
-    }
-
-    /**
-     * Set the indentation string for using in {@link render()}, optionally a
-     * number of spaces to indent with
-     *
-     * @param  string|int $indent                          indentation string or
-     *                                                     number of spaces
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setIndent($indent)
-    {
-        $this->_indent = $this->_getWhitespace($indent);
-        return $this;
-    }
-
-    /**
-     * Returns indentation
-     *
-     * @return string
-     */
-    public function getIndent()
-    {
-        return $this->_indent;
-    }
-
-    /**
-     * Sets translator to use in helper
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::setTranslator()}.
-     *
-     * @param  mixed $translator                           [optional] translator.
-     *                                                     Expects an object of
-     *                                                     type
-     *                                                     {@link Zend_Translate_Adapter}
-     *                                                     or {@link Zend_Translate},
-     *                                                     or null. Default is
-     *                                                     null, which sets no
-     *                                                     translator.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setTranslator($translator = null)
-    {
-        if (null == $translator ||
-            $translator instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translator;
-        } elseif ($translator instanceof Zend_Translate) {
-            $this->_translator = $translator->getAdapter();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns translator used in helper
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::getTranslator()}.
-     *
-     * @return Zend_Translate_Adapter|null  translator or null
-     */
-    public function getTranslator()
-    {
-        if (null === $this->_translator) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
-            }
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Sets ACL to use when iterating pages
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::setAcl()}.
-     *
-     * @param  Zend_Acl $acl                               [optional] ACL object.
-     *                                                     Default is null.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setAcl(Zend_Acl $acl = null)
-    {
-        $this->_acl = $acl;
-        return $this;
-    }
-
-    /**
-     * Returns ACL or null if it isn't set using {@link setAcl()} or
-     * {@link setDefaultAcl()}
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::getAcl()}.
-     *
-     * @return Zend_Acl|null  ACL object or null
-     */
-    public function getAcl()
-    {
-        if ($this->_acl === null && self::$_defaultAcl !== null) {
-            return self::$_defaultAcl;
-        }
-
-        return $this->_acl;
-    }
-
-    /**
-     * Sets ACL role(s) to use when iterating pages
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::setRole()}.
-     *
-     * @param  mixed $role                                 [optional] role to
-     *                                                     set. Expects a string,
-     *                                                     an instance of type
-     *                                                     {@link Zend_Acl_Role_Interface},
-     *                                                     or null. Default is
-     *                                                     null, which will set
-     *                                                     no role.
-     * @throws Zend_View_Exception                         if $role is invalid
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setRole($role = null)
-    {
-        if (null === $role || is_string($role) ||
-            $role instanceof Zend_Acl_Role_Interface) {
-            $this->_role = $role;
-        } else {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf(
-                '$role must be a string, null, or an instance of ' 
-                .  'Zend_Acl_Role_Interface; %s given',
-                gettype($role)
-            ));
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns ACL role to use when iterating pages, or null if it isn't set
-     * using {@link setRole()} or {@link setDefaultRole()}
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::getRole()}.
-     *
-     * @return string|Zend_Acl_Role_Interface|null  role or null
-     */
-    public function getRole()
-    {
-        if ($this->_role === null && self::$_defaultRole !== null) {
-            return self::$_defaultRole;
-        }
-
-        return $this->_role;
-    }
-
-    /**
-     * Sets whether ACL should be used
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::setUseAcl()}.
-     *
-     * @param  bool $useAcl                                [optional] whether ACL
-     *                                                     should be used.
-     *                                                     Default is true.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setUseAcl($useAcl = true)
-    {
-        $this->_useAcl = (bool) $useAcl;
-        return $this;
-    }
-
-    /**
-     * Returns whether ACL should be used
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::getUseAcl()}.
-     *
-     * @return bool  whether ACL should be used
-     */
-    public function getUseAcl()
-    {
-        return $this->_useAcl;
-    }
-
-    /**
-     * Return renderInvisible flag
-     *
-     * @return bool
-     */
-    public function getRenderInvisible()
-    {
-        return $this->_renderInvisible;
-    }
-
-    /**
-     * Render invisible items?
-     *
-     * @param  bool $renderInvisible                       [optional] boolean flag
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface
-     *                                                     returns self
-     */
-    public function setRenderInvisible($renderInvisible = true)
-    {
-        $this->_renderInvisible = (bool) $renderInvisible;
-        return $this;
-    }
-
-    /**
-     * Sets whether translator should be used
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::setUseTranslator()}.
-     *
-     * @param  bool $useTranslator                         [optional] whether
-     *                                                     translator should be
-     *                                                     used. Default is true.
-     * @return Zend_View_Helper_Navigation_HelperAbstract  fluent interface,
-     *                                                     returns self
-     */
-    public function setUseTranslator($useTranslator = true)
-    {
-        $this->_useTranslator = (bool) $useTranslator;
-        return $this;
-    }
-
-    /**
-     * Returns whether translator should be used
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::getUseTranslator()}.
-     *
-     * @return bool  whether translator should be used
-     */
-    public function getUseTranslator()
-    {
-        return $this->_useTranslator;
-    }
-
-    // Magic overloads:
-
-    /**
-     * Magic overload: Proxy calls to the navigation container
-     *
-     * @param  string $method             method name in container
-     * @param  array  $arguments          [optional] arguments to pass
-     * @return mixed                      returns what the container returns
-     * @throws Zend_Navigation_Exception  if method does not exist in container
-     */
-    public function __call($method, array $arguments = array())
-    {
-        return call_user_func_array(
-                array($this->getContainer(), $method),
-                $arguments);
-    }
-
-    /**
-     * Magic overload: Proxy to {@link render()}.
-     *
-     * This method will trigger an E_USER_ERROR if rendering the helper causes
-     * an exception to be thrown.
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::__toString()}.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            return $this->render();
-        } catch (Exception $e) {
-            $msg = get_class($e) . ': ' . $e->getMessage();
-            trigger_error($msg, E_USER_ERROR);
-            return '';
-        }
-    }
-
-    // Public methods:
-
-    /**
-     * Finds the deepest active page in the given container
-     *
-     * @param  Zend_Navigation_Container $container  container to search
-     * @param  int|null                  $minDepth   [optional] minimum depth
-     *                                               required for page to be
-     *                                               valid. Default is to use
-     *                                               {@link getMinDepth()}. A
-     *                                               null value means no minimum
-     *                                               depth required.
-     * @param  int|null                  $minDepth   [optional] maximum depth
-     *                                               a page can have to be
-     *                                               valid. Default is to use
-     *                                               {@link getMaxDepth()}. A
-     *                                               null value means no maximum
-     *                                               depth required.
-     * @return array                                 an associative array with
-     *                                               the values 'depth' and
-     *                                               'page', or an empty array
-     *                                               if not found
-     */
-    public function findActive(Zend_Navigation_Container $container,
-                               $minDepth = null,
-                               $maxDepth = -1)
-    {
-        if (!is_int($minDepth)) {
-            $minDepth = $this->getMinDepth();
-        }
-        if ((!is_int($maxDepth) || $maxDepth < 0) && null !== $maxDepth) {
-            $maxDepth = $this->getMaxDepth();
-        }
-
-        $found  = null;
-        $foundDepth = -1;
-        $iterator = new RecursiveIteratorIterator($container,
-                RecursiveIteratorIterator::CHILD_FIRST);
-
-        foreach ($iterator as $page) {
-            $currDepth = $iterator->getDepth();
-            if ($currDepth < $minDepth || !$this->accept($page)) {
-                // page is not accepted
-                continue;
-            }
-
-            if ($page->isActive(false) && $currDepth > $foundDepth) {
-                // found an active page at a deeper level than before
-                $found = $page;
-                $foundDepth = $currDepth;
-            }
-        }
-
-        if (is_int($maxDepth) && $foundDepth > $maxDepth) {
-            while ($foundDepth > $maxDepth) {
-                if (--$foundDepth < $minDepth) {
-                    $found = null;
-                    break;
-                }
-
-                $found = $found->getParent();
-                if (!$found instanceof Zend_Navigation_Page) {
-                    $found = null;
-                    break;
-                }
-            }
-        }
-
-        if ($found) {
-            return array('page' => $found, 'depth' => $foundDepth);
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Checks if the helper has a container
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::hasContainer()}.
-     *
-     * @return bool  whether the helper has a container or not
-     */
-    public function hasContainer()
-    {
-        return null !== $this->_container;
-    }
-
-    /**
-     * Checks if the helper has an ACL instance
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::hasAcl()}.
-     *
-     * @return bool  whether the helper has a an ACL instance or not
-     */
-    public function hasAcl()
-    {
-        return null !== $this->_acl;
-    }
-
-    /**
-     * Checks if the helper has an ACL role
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::hasRole()}.
-     *
-     * @return bool  whether the helper has a an ACL role or not
-     */
-    public function hasRole()
-    {
-        return null !== $this->_role;
-    }
-
-    /**
-     * Checks if the helper has a translator
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::hasTranslator()}.
-     *
-     * @return bool  whether the helper has a translator or not
-     */
-    public function hasTranslator()
-    {
-        return null !== $this->_translator;
-    }
-
-    /**
-     * Returns an HTML string containing an 'a' element for the given page
-     *
-     * @param  Zend_Navigation_Page $page  page to generate HTML for
-     * @return string                      HTML string for the given page
-     */
-    public function htmlify(Zend_Navigation_Page $page)
-    {
-        // get label and title for translating
-        $label = $page->getLabel();
-        $title = $page->getTitle();
-
-        if ($this->getUseTranslator() && $t = $this->getTranslator()) {
-            if (is_string($label) && !empty($label)) {
-                $label = $t->translate($label);
-            }
-            if (is_string($title) && !empty($title)) {
-                $title = $t->translate($title);
-            }
-        }
-
-        // get attribs for anchor element
-        $attribs = array(
-            'id'     => $page->getId(),
-            'title'  => $title,
-            'class'  => $page->getClass(),
-            'href'   => $page->getHref(),
-            'target' => $page->getTarget()
-        );
-
-        return '<a' . $this->_htmlAttribs($attribs) . '>'
-             . $this->view->escape($label)
-             . '</a>';
-    }
-
-    // Iterator filter methods:
-
-    /**
-     * Determines whether a page should be accepted when iterating
-     *
-     * Rules:
-     * - If a page is not visible it is not accepted, unless RenderInvisible has
-     *   been set to true.
-     * - If helper has no ACL, page is accepted
-     * - If helper has ACL, but no role, page is not accepted
-     * - If helper has ACL and role:
-     *  - Page is accepted if it has no resource or privilege
-     *  - Page is accepted if ACL allows page's resource or privilege
-     * - If page is accepted by the rules above and $recursive is true, the page
-     *   will not be accepted if it is the descendant of a non-accepted page.
-     *
-     * @param  Zend_Navigation_Page $page      page to check
-     * @param  bool                $recursive  [optional] if true, page will not
-     *                                         be accepted if it is the
-     *                                         descendant of a page that is not
-     *                                         accepted. Default is true.
-     * @return bool                            whether page should be accepted
-     */
-    public function accept(Zend_Navigation_Page $page, $recursive = true)
-    {
-        // accept by default
-        $accept = true;
-
-        if (!$page->isVisible(false) && !$this->getRenderInvisible()) {
-            // don't accept invisible pages
-            $accept = false;
-        } elseif ($this->getUseAcl() && !$this->_acceptAcl($page)) {
-            // acl is not amused
-            $accept = false;
-        }
-
-        if ($accept && $recursive) {
-            $parent = $page->getParent();
-            if ($parent instanceof Zend_Navigation_Page) {
-                $accept = $this->accept($parent, true);
-            }
-        }
-
-        return $accept;
-    }
-
-    /**
-     * Determines whether a page should be accepted by ACL when iterating
-     *
-     * Rules:
-     * - If helper has no ACL, page is accepted
-     * - If page has a resource or privilege defined, page is accepted
-     *   if the ACL allows access to it using the helper's role
-     * - If page has no resource or privilege, page is accepted
-     *
-     * @param  Zend_Navigation_Page $page  page to check
-     * @return bool                        whether page is accepted by ACL
-     */
-    protected function _acceptAcl(Zend_Navigation_Page $page)
-    {
-        if (!$acl = $this->getAcl()) {
-            // no acl registered means don't use acl
-            return true;
-        }
-
-        $role = $this->getRole();
-        $resource = $page->getResource();
-        $privilege = $page->getPrivilege();
-
-        if ($resource || $privilege) {
-            // determine using helper role and page resource/privilege
-            return $acl->isAllowed($role, $resource, $privilege);
-        }
-
-        return true;
-    }
-
-    // Util methods:
-
-    /**
-     * Retrieve whitespace representation of $indent
-     *
-     * @param  int|string $indent
-     * @return string
-     */
-    protected function _getWhitespace($indent)
-    {
-        if (is_int($indent)) {
-            $indent = str_repeat(' ', $indent);
-        }
-
-        return (string) $indent;
-    }
-
-    /**
-     * Converts an associative array to a string of tag attributes.
-     *
-     * Overloads {@link Zend_View_Helper_HtmlElement::_htmlAttribs()}.
-     *
-     * @param  array $attribs  an array where each key-value pair is converted
-     *                         to an attribute name and value
-     * @return string          an attribute string
-     */
-    protected function _htmlAttribs($attribs)
-    {
-        // filter out null values and empty string values
-        foreach ($attribs as $key => $value) {
-            if ($value === null || (is_string($value) && !strlen($value))) {
-                unset($attribs[$key]);
-            }
-        }
-
-        return parent::_htmlAttribs($attribs);
-    }
-
-    /**
-     * Normalize an ID
-     *
-     * Overrides {@link Zend_View_Helper_HtmlElement::_normalizeId()}.
-     *
-     * @param  string $value
-     * @return string
-     */
-    protected function _normalizeId($value)
-    {
-        $prefix = get_class($this);
-        $prefix = strtolower(trim(substr($prefix, strrpos($prefix, '_')), '_'));
-
-        return $prefix . '-' . $value;
-    }
-
-    // Static methods:
-
-    /**
-     * Sets default ACL to use if another ACL is not explicitly set
-     *
-     * @param  Zend_Acl $acl  [optional] ACL object. Default is null, which
-     *                        sets no ACL object.
-     * @return void
-     */
-    public static function setDefaultAcl(Zend_Acl $acl = null)
-    {
-        self::$_defaultAcl = $acl;
-    }
-
-    /**
-     * Sets default ACL role(s) to use when iterating pages if not explicitly
-     * set later with {@link setRole()}
-     *
-     * @param  midex $role               [optional] role to set. Expects null,
-     *                                   string, or an instance of
-     *                                   {@link Zend_Acl_Role_Interface}.
-     *                                   Default is null, which sets no default
-     *                                   role.
-     * @throws Zend_View_Exception       if role is invalid
-     * @return void
-     */
-    public static function setDefaultRole($role = null)
-    {
-        if (null === $role ||
-            is_string($role) ||
-            $role instanceof Zend_Acl_Role_Interface) {
-            self::$_defaultRole = $role;
-        } else {
-            require_once 'Zend/View/Exception.php';
-            throw new Zend_View_Exception(
-                '$role must be null|string|Zend_Acl_Role_Interface'
-            );
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/Links.php b/airtime_mvc/library/Zend/View/Helper/Navigation/Links.php
deleted file mode 100644
index 7a735daaf..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/Links.php
+++ /dev/null
@@ -1,783 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Links.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_HelperAbstract
- */
-require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
-
-/**
- * Helper for printing <link> elements
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Navigation_Links
-    extends Zend_View_Helper_Navigation_HelperAbstract
-{
-    /**#@+
-     * Constants used for specifying which link types to find and render
-     *
-     * @var int
-     */
-    const RENDER_ALTERNATE  = 0x0001;
-    const RENDER_STYLESHEET = 0x0002;
-    const RENDER_START      = 0x0004;
-    const RENDER_NEXT       = 0x0008;
-    const RENDER_PREV       = 0x0010;
-    const RENDER_CONTENTS   = 0x0020;
-    const RENDER_INDEX      = 0x0040;
-    const RENDER_GLOSSARY   = 0x0080;
-    const RENDER_COPYRIGHT  = 0x0100;
-    const RENDER_CHAPTER    = 0x0200;
-    const RENDER_SECTION    = 0x0400;
-    const RENDER_SUBSECTION = 0x0800;
-    const RENDER_APPENDIX   = 0x1000;
-    const RENDER_HELP       = 0x2000;
-    const RENDER_BOOKMARK   = 0x4000;
-    const RENDER_CUSTOM     = 0x8000;
-    const RENDER_ALL        = 0xffff;
-    /**#@+**/
-
-    /**
-     * Maps render constants to W3C link types
-     *
-     * @var array
-     */
-    protected static $_RELATIONS = array(
-        self::RENDER_ALTERNATE  => 'alternate',
-        self::RENDER_STYLESHEET => 'stylesheet',
-        self::RENDER_START      => 'start',
-        self::RENDER_NEXT       => 'next',
-        self::RENDER_PREV       => 'prev',
-        self::RENDER_CONTENTS   => 'contents',
-        self::RENDER_INDEX      => 'index',
-        self::RENDER_GLOSSARY   => 'glossary',
-        self::RENDER_COPYRIGHT  => 'copyright',
-        self::RENDER_CHAPTER    => 'chapter',
-        self::RENDER_SECTION    => 'section',
-        self::RENDER_SUBSECTION => 'subsection',
-        self::RENDER_APPENDIX   => 'appendix',
-        self::RENDER_HELP       => 'help',
-        self::RENDER_BOOKMARK   => 'bookmark'
-    );
-
-    /**
-     * The helper's render flag
-     *
-     * @see render()
-     * @see setRenderFlag()
-     * @var int
-     */
-    protected $_renderFlag = self::RENDER_ALL;
-
-    /**
-     * Root container
-     *
-     * Used for preventing methods to traverse above the container given to
-     * the {@link render()} method.
-     *
-     * @see _findRoot()
-     *
-     * @var Zend_Navigation_Container
-     */
-    protected $_root;
-
-    /**
-     * View helper entry point:
-     * Retrieves helper and optionally sets container to operate on
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               operate on
-     * @return Zend_View_Helper_Navigation_Links     fluent interface, returns
-     *                                               self
-     */
-    public function links(Zend_Navigation_Container $container = null)
-    {
-        if (null !== $container) {
-            $this->setContainer($container);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Magic overload: Proxy calls to {@link findRelation()} or container
-     *
-     * Examples of finder calls:
-     * <code>
-     * // METHOD                  // SAME AS
-     * $h->findRelNext($page);    // $h->findRelation($page, 'rel', 'next')
-     * $h->findRevSection($page); // $h->findRelation($page, 'rev', 'section');
-     * $h->findRelFoo($page);     // $h->findRelation($page, 'rel', 'foo');
-     * </code>
-     *
-     * @param  string $method             method name
-     * @param  array  $arguments          method arguments
-     * @throws Zend_Navigation_Exception  if method does not exist in container
-     */
-    public function __call($method, array $arguments = array())
-    {
-        if (@preg_match('/find(Rel|Rev)(.+)/', $method, $match)) {
-            return $this->findRelation($arguments[0],
-                                       strtolower($match[1]),
-                                       strtolower($match[2]));
-        }
-
-        return parent::__call($method, $arguments);
-    }
-
-    // Accessors:
-
-    /**
-     * Sets the helper's render flag
-     *
-     * The helper uses the bitwise '&' operator against the hex values of the
-     * render constants. This means that the flag can is "bitwised" value of
-     * the render constants. Examples:
-     * <code>
-     * // render all links except glossary
-     * $flag = Zend_View_Helper_Navigation_Links:RENDER_ALL ^
-     *         Zend_View_Helper_Navigation_Links:RENDER_GLOSSARY;
-     * $helper->setRenderFlag($flag);
-     *
-     * // render only chapters and sections
-     * $flag = Zend_View_Helper_Navigation_Links:RENDER_CHAPTER |
-     *         Zend_View_Helper_Navigation_Links:RENDER_SECTION;
-     * $helper->setRenderFlag($flag);
-     *
-     * // render only relations that are not native W3C relations
-     * $helper->setRenderFlag(Zend_View_Helper_Navigation_Links:RENDER_CUSTOM);
-     *
-     * // render all relations (default)
-     * $helper->setRenderFlag(Zend_View_Helper_Navigation_Links:RENDER_ALL);
-     * </code>
-     *
-     * Note that custom relations can also be rendered directly using the
-     * {@link renderLink()} method.
-     *
-     * @param  int $renderFlag                    render flag
-     * @return Zend_View_Helper_Navigation_Links  fluent interface, returns self
-     */
-    public function setRenderFlag($renderFlag)
-    {
-        $this->_renderFlag = (int) $renderFlag;
-        return $this;
-    }
-
-    /**
-     * Returns the helper's render flag
-     *
-     * @return int  render flag
-     */
-    public function getRenderFlag()
-    {
-        return $this->_renderFlag;
-    }
-
-    // Finder methods:
-
-    /**
-     * Finds all relations (forward and reverse) for the given $page
-     *
-     * The form of the returned array:
-     * <code>
-     * // $page denotes an instance of Zend_Navigation_Page
-     * $returned = array(
-     *     'rel' => array(
-     *         'alternate' => array($page, $page, $page),
-     *         'start'     => array($page),
-     *         'next'      => array($page),
-     *         'prev'      => array($page),
-     *         'canonical' => array($page)
-     *     ),
-     *     'rev' => array(
-     *         'section'   => array($page)
-     *     )
-     * );
-     * </code>
-     *
-     * @param  Zend_Navigation_Page $page  page to find links for
-     * @return array                       related pages
-     */
-    public function findAllRelations(Zend_Navigation_Page $page,
-                                     $flag = null)
-    {
-        if (!is_int($flag)) {
-            $flag = self::RENDER_ALL;
-        }
-
-        $result = array('rel' => array(), 'rev' => array());
-        $native = array_values(self::$_RELATIONS);
-
-        foreach (array_keys($result) as $rel) {
-            $meth = 'getDefined' . ucfirst($rel);
-            $types = array_merge($native, array_diff($page->$meth(), $native));
-
-            foreach ($types as $type) {
-                if (!$relFlag = array_search($type, self::$_RELATIONS)) {
-                    $relFlag = self::RENDER_CUSTOM;
-                }
-                if (!($flag & $relFlag)) {
-                    continue;
-                }
-                if ($found = $this->findRelation($page, $rel, $type)) {
-                    if (!is_array($found)) {
-                        $found = array($found);
-                    }
-                    $result[$rel][$type] = $found;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds relations of the given $rel=$type from $page
-     *
-     * This method will first look for relations in the page instance, then
-     * by searching the root container if nothing was found in the page.
-     *
-     * @param  Zend_Navigation_Page $page       page to find relations for
-     * @param  string              $rel         relation, "rel" or "rev"
-     * @param  string              $type        link type, e.g. 'start', 'next'
-     * @return Zend_Navigaiton_Page|array|null  page(s), or null if not found
-     * @throws Zend_View_Exception              if $rel is not "rel" or "rev"
-     */
-    public function findRelation(Zend_Navigation_Page $page, $rel, $type)
-    {
-        if (!in_array($rel, array('rel', 'rev'))) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf(
-                'Invalid argument: $rel must be "rel" or "rev"; "%s" given',
-                $rel));
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        if (!$result = $this->_findFromProperty($page, $rel, $type)) {
-            $result = $this->_findFromSearch($page, $rel, $type);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Finds relations of given $type for $page by checking if the
-     * relation is specified as a property of $page
-     *
-     * @param  Zend_Navigation_Page $page       page to find relations for
-     * @param  string              $rel         relation, 'rel' or 'rev'
-     * @param  string              $type        link type, e.g. 'start', 'next'
-     * @return Zend_Navigation_Page|array|null  page(s), or null if not found
-     */
-    protected function _findFromProperty(Zend_Navigation_Page $page, $rel, $type)
-    {
-        $method = 'get' . ucfirst($rel);
-        if ($result = $page->$method($type)) {
-            if ($result = $this->_convertToPages($result)) {
-                if (!is_array($result)) {
-                    $result = array($result);
-                }
-
-                foreach ($result as $key => $page) {
-                    if (!$this->accept($page)) {
-                        unset($result[$key]);
-                    }
-                }
-
-                return count($result) == 1 ? $result[0] : $result;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Finds relations of given $rel=$type for $page by using the helper to
-     * search for the relation in the root container
-     *
-     * @param  Zend_Navigation_Page $page  page to find relations for
-     * @param  string              $rel    relation, 'rel' or 'rev'
-     * @param  string              $type   link type, e.g. 'start', 'next', etc
-     * @return array|null                  array of pages, or null if not found
-     */
-    protected function _findFromSearch(Zend_Navigation_Page $page, $rel, $type)
-    {
-        $found = null;
-
-        $method = 'search' . ucfirst($rel) . ucfirst($type);
-        if (method_exists($this, $method)) {
-            $found = $this->$method($page);
-        }
-
-        return $found;
-    }
-
-    // Search methods:
-
-    /**
-     * Searches the root container for the forward 'start' relation of the given
-     * $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to the first document in a collection of documents. This link type
-     * tells search engines which document is considered by the author to be the
-     * starting point of the collection.
-     *
-     * @param  Zend_Navigation_Page $page  page to find relation for
-     * @return Zend_Navigation_Page|null   page or null
-     */
-    public function searchRelStart(Zend_Navigation_Page $page)
-    {
-        $found = $this->_findRoot($page);
-        if (!$found instanceof Zend_Navigation_Page) {
-            $found->rewind();
-            $found = $found->current();
-        }
-
-        if ($found === $page || !$this->accept($found)) {
-            $found = null;
-        }
-
-        return $found;
-    }
-
-    /**
-     * Searches the root container for the forward 'next' relation of the given
-     * $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to the next document in a linear sequence of documents. User
-     * agents may choose to preload the "next" document, to reduce the perceived
-     * load time.
-     *
-     * @param  Zend_Navigation_Page $page  page to find relation for
-     * @return Zend_Navigation_Page|null   page(s) or null
-     */
-    public function searchRelNext(Zend_Navigation_Page $page)
-    {
-        $found = null;
-        $break = false;
-        $iterator = new RecursiveIteratorIterator($this->_findRoot($page),
-                RecursiveIteratorIterator::SELF_FIRST);
-        foreach ($iterator as $intermediate) {
-            if ($intermediate === $page) {
-                // current page; break at next accepted page
-                $break = true;
-                continue;
-            }
-
-            if ($break && $this->accept($intermediate)) {
-                $found = $intermediate;
-                break;
-            }
-        }
-
-        return $found;
-    }
-
-    /**
-     * Searches the root container for the forward 'prev' relation of the given
-     * $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to the previous document in an ordered series of documents. Some
-     * user agents also support the synonym "Previous".
-     *
-     * @param  Zend_Navigation_Page $page  page to find relation for
-     * @return Zend_Navigation_Page|null   page or null
-     */
-    public function searchRelPrev(Zend_Navigation_Page $page)
-    {
-        $found = null;
-        $prev = null;
-        $iterator = new RecursiveIteratorIterator(
-                $this->_findRoot($page),
-                RecursiveIteratorIterator::SELF_FIRST);
-        foreach ($iterator as $intermediate) {
-            if (!$this->accept($intermediate)) {
-                continue;
-            }
-            if ($intermediate === $page) {
-                $found = $prev;
-                break;
-            }
-
-            $prev = $intermediate;
-        }
-
-        return $found;
-    }
-
-    /**
-     * Searches the root container for forward 'chapter' relations of the given
-     * $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to a document serving as a chapter in a collection of documents.
-     *
-     * @param  Zend_Navigation_Page $page       page to find relation for
-     * @return Zend_Navigation_Page|array|null  page(s) or null
-     */
-    public function searchRelChapter(Zend_Navigation_Page $page)
-    {
-        $found = array();
-
-        // find first level of pages
-        $root = $this->_findRoot($page);
-
-        // find start page(s)
-        $start = $this->findRelation($page, 'rel', 'start');
-        if (!is_array($start)) {
-            $start = array($start);
-        }
-
-        foreach ($root as $chapter) {
-            // exclude self and start page from chapters
-            if ($chapter !== $page &&
-                !in_array($chapter, $start) &&
-                $this->accept($chapter)) {
-                $found[] = $chapter;
-            }
-        }
-
-        switch (count($found)) {
-            case 0:
-                return null;
-            case 1:
-                return $found[0];
-            default:
-                return $found;
-        }
-    }
-
-    /**
-     * Searches the root container for forward 'section' relations of the given
-     * $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to a document serving as a section in a collection of documents.
-     *
-     * @param  Zend_Navigation_Page $page       page to find relation for
-     * @return Zend_Navigation_Page|array|null  page(s) or null
-     */
-    public function searchRelSection(Zend_Navigation_Page $page)
-    {
-        $found = array();
-
-        // check if given page has pages and is a chapter page
-        if ($page->hasPages() && $this->_findRoot($page)->hasPage($page)) {
-            foreach ($page as $section) {
-                if ($this->accept($section)) {
-                    $found[] = $section;
-                }
-            }
-        }
-
-        switch (count($found)) {
-            case 0:
-                return null;
-            case 1:
-                return $found[0];
-            default:
-                return $found;
-        }
-    }
-
-    /**
-     * Searches the root container for forward 'subsection' relations of the
-     * given $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to a document serving as a subsection in a collection of
-     * documents.
-     *
-     * @param  Zend_Navigation_Page $page       page to find relation for
-     * @return Zend_Navigation_Page|array|null  page(s) or null
-     */
-    public function searchRelSubsection(Zend_Navigation_Page $page)
-    {
-        $found = array();
-
-        if ($page->hasPages()) {
-            // given page has child pages, loop chapters
-            foreach ($this->_findRoot($page) as $chapter) {
-                // is page a section?
-                if ($chapter->hasPage($page)) {
-                    foreach ($page as $subsection) {
-                        if ($this->accept($subsection)) {
-                            $found[] = $subsection;
-                        }
-                    }
-                }
-            }
-        }
-
-        switch (count($found)) {
-            case 0:
-                return null;
-            case 1:
-                return $found[0];
-            default:
-                return $found;
-        }
-    }
-
-    /**
-     * Searches the root container for the reverse 'section' relation of the
-     * given $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to a document serving as a section in a collection of documents.
-     *
-     * @param  Zend_Navigation_Page $page  page to find relation for
-     * @return Zend_Navigation_Page|null   page(s) or null
-     */
-    public function searchRevSection(Zend_Navigation_Page $page)
-    {
-        $found = null;
-
-        if ($parent = $page->getParent()) {
-            if ($parent instanceof Zend_Navigation_Page &&
-                $this->_findRoot($page)->hasPage($parent)) {
-                $found = $parent;
-            }
-        }
-
-        return $found;
-    }
-
-    /**
-     * Searches the root container for the reverse 'section' relation of the
-     * given $page
-     *
-     * From {@link http://www.w3.org/TR/html4/types.html#type-links}:
-     * Refers to a document serving as a subsection in a collection of
-     * documents.
-     *
-     * @param  Zend_Navigation_Page $page  page to find relation for
-     * @return Zend_Navigation_Page|null   page(s) or null
-     */
-    public function searchRevSubsection(Zend_Navigation_Page $page)
-    {
-        $found = null;
-
-        if ($parent = $page->getParent()) {
-            if ($parent instanceof Zend_Navigation_Page) {
-                $root = $this->_findRoot($page);
-                foreach ($root as $chapter) {
-                    if ($chapter->hasPage($parent)) {
-                        $found = $parent;
-                        break;
-                    }
-                }
-            }
-        }
-
-        return $found;
-    }
-
-    // Util methods:
-
-    /**
-     * Returns the root container of the given page
-     *
-     * When rendering a container, the render method still store the given
-     * container as the root container, and unset it when done rendering. This
-     * makes sure finder methods will not traverse above the container given
-     * to the render method.
-     *
-     * @param  Zend_Navigaiton_Page $page  page to find root for
-     * @return Zend_Navigation_Container   the root container of the given page
-     */
-    protected function _findRoot(Zend_Navigation_Page $page)
-    {
-        if ($this->_root) {
-            return $this->_root;
-        }
-
-        $root = $page;
-
-        while ($parent = $page->getParent()) {
-            $root = $parent;
-            if ($parent instanceof Zend_Navigation_Page) {
-                $page = $parent;
-            } else {
-                break;
-            }
-        }
-
-        return $root;
-    }
-
-    /**
-     * Converts a $mixed value to an array of pages
-     *
-     * @param  mixed $mixed                     mixed value to get page(s) from
-     * @param  bool  $recursive                 whether $value should be looped
-     *                                          if it is an array or a config
-     * @return Zend_Navigation_Page|array|null  empty if unable to convert
-     */
-    protected function _convertToPages($mixed, $recursive = true)
-    {
-        if (is_object($mixed)) {
-            if ($mixed instanceof Zend_Navigation_Page) {
-                // value is a page instance; return directly
-                return $mixed;
-            } elseif ($mixed instanceof Zend_Navigation_Container) {
-                // value is a container; return pages in it
-                $pages = array();
-                foreach ($mixed as $page) {
-                    $pages[] = $page;
-                }
-                return $pages;
-            } elseif ($mixed instanceof Zend_Config) {
-                // convert config object to array and extract
-                return $this->_convertToPages($mixed->toArray(), $recursive);
-            }
-        } elseif (is_string($mixed)) {
-            // value is a string; make an URI page
-            return Zend_Navigation_Page::factory(array(
-                'type' => 'uri',
-                'uri'  => $mixed
-            ));
-        } elseif (is_array($mixed) && !empty($mixed)) {
-            if ($recursive && is_numeric(key($mixed))) {
-                // first key is numeric; assume several pages
-                $pages = array();
-                foreach ($mixed as $value) {
-                    if ($value = $this->_convertToPages($value, false)) {
-                        $pages[] = $value;
-                    }
-                }
-                return $pages;
-            } else {
-                // pass array to factory directly
-                try {
-                    $page = Zend_Navigation_Page::factory($mixed);
-                    return $page;
-                } catch (Exception $e) {
-                }
-            }
-        }
-
-        // nothing found
-        return null;
-    }
-
-    // Render methods:
-
-    /**
-     * Renders the given $page as a link element, with $attrib = $relation
-     *
-     * @param  Zend_Navigation_Page $page      the page to render the link for
-     * @param  string               $attrib    the attribute to use for $type,
-     *                                         either 'rel' or 'rev'
-     * @param  string               $relation  relation type, muse be one of;
-     *                                         alternate, appendix, bookmark,
-     *                                         chapter, contents, copyright,
-     *                                         glossary, help, home, index, next,
-     *                                         prev, section, start, stylesheet,
-     *                                         subsection
-     * @return string                          rendered link element
-     * @throws Zend_View_Exception             if $attrib is invalid
-     */
-    public function renderLink(Zend_Navigation_Page $page, $attrib, $relation)
-    {
-        if (!in_array($attrib, array('rel', 'rev'))) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(sprintf(
-                    'Invalid relation attribute "%s", must be "rel" or "rev"',
-                    $attrib));
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        if (!$href = $page->getHref()) {
-            return '';
-        }
-
-        // TODO: add more attribs
-        // http://www.w3.org/TR/html401/struct/links.html#h-12.2
-        $attribs = array(
-            $attrib  => $relation,
-            'href'   => $href,
-            'title'  => $page->getLabel()
-        );
-
-        return '<link' .
-               $this->_htmlAttribs($attribs) .
-               $this->getClosingBracket();
-    }
-
-    // Zend_View_Helper_Navigation_Helper:
-
-    /**
-     * Renders helper
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     */
-    public function render(Zend_Navigation_Container $container = null)
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        if ($active = $this->findActive($container)) {
-            $active = $active['page'];
-        } else {
-            // no active page
-            return '';
-        }
-
-        $output = '';
-        $indent = $this->getIndent();
-        $this->_root = $container;
-
-        $result = $this->findAllRelations($active, $this->getRenderFlag());
-        foreach ($result as $attrib => $types) {
-            foreach ($types as $relation => $pages) {
-                foreach ($pages as $page) {
-                    if ($r = $this->renderLink($page, $attrib, $relation)) {
-                        $output .= $indent . $r . self::EOL;
-                    }
-                }
-            }
-        }
-
-        $this->_root = null;
-
-        // return output (trim last newline by spec)
-        return strlen($output) ? rtrim($output, self::EOL) : '';
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/Menu.php b/airtime_mvc/library/Zend/View/Helper/Navigation/Menu.php
deleted file mode 100644
index f805e339e..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/Menu.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Menu.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_HelperAbstract
- */
-require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
-
-/**
- * Helper for rendering menus from navigation containers
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Navigation_Menu
-    extends Zend_View_Helper_Navigation_HelperAbstract
-{
-    /**
-     * CSS class to use for the ul element
-     *
-     * @var string
-     */
-    protected $_ulClass = 'navigation';
-
-    /**
-     * Whether only active branch should be rendered
-     *
-     * @var bool
-     */
-    protected $_onlyActiveBranch = false;
-
-    /**
-     * Whether parents should be rendered when only rendering active branch
-     *
-     * @var bool
-     */
-    protected $_renderParents = true;
-
-    /**
-     * Partial view script to use for rendering menu
-     *
-     * @var string|array
-     */
-    protected $_partial = null;
-
-    /**
-     * View helper entry point:
-     * Retrieves helper and optionally sets container to operate on
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               operate on
-     * @return Zend_View_Helper_Navigation_Menu      fluent interface,
-     *                                               returns self
-     */
-    public function menu(Zend_Navigation_Container $container = null)
-    {
-        if (null !== $container) {
-            $this->setContainer($container);
-        }
-
-        return $this;
-    }
-
-    // Accessors:
-
-    /**
-     * Sets CSS class to use for the first 'ul' element when rendering
-     *
-     * @param  string $ulClass                   CSS class to set
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
-     */
-    public function setUlClass($ulClass)
-    {
-        if (is_string($ulClass)) {
-            $this->_ulClass = $ulClass;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns CSS class to use for the first 'ul' element when rendering
-     *
-     * @return string  CSS class
-     */
-    public function getUlClass()
-    {
-        return $this->_ulClass;
-    }
-
-    /**
-     * Sets a flag indicating whether only active branch should be rendered
-     *
-     * @param  bool $flag                        [optional] render only active
-     *                                           branch. Default is true.
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
-     */
-    public function setOnlyActiveBranch($flag = true)
-    {
-        $this->_onlyActiveBranch = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Returns a flag indicating whether only active branch should be rendered
-     *
-     * By default, this value is false, meaning the entire menu will be
-     * be rendered.
-     *
-     * @return bool  whether only active branch should be rendered
-     */
-    public function getOnlyActiveBranch()
-    {
-        return $this->_onlyActiveBranch;
-    }
-
-    /**
-     * Enables/disables rendering of parents when only rendering active branch
-     *
-     * See {@link setOnlyActiveBranch()} for more information.
-     *
-     * @param  bool $flag                        [optional] render parents when
-     *                                           rendering active branch.
-     *                                           Default is true.
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
-     */
-    public function setRenderParents($flag = true)
-    {
-        $this->_renderParents = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Returns flag indicating whether parents should be rendered when rendering
-     * only the active branch
-     *
-     * By default, this value is true.
-     *
-     * @return bool  whether parents should be rendered
-     */
-    public function getRenderParents()
-    {
-        return $this->_renderParents;
-    }
-
-    /**
-     * Sets which partial view script to use for rendering menu
-     *
-     * @param  string|array $partial             partial view script or null. If
-     *                                           an array is given, it is
-     *                                           expected to contain two values;
-     *                                           the partial view script to use,
-     *                                           and the module where the script
-     *                                           can be found.
-     * @return Zend_View_Helper_Navigation_Menu  fluent interface, returns self
-     */
-    public function setPartial($partial)
-    {
-        if (null === $partial || is_string($partial) || is_array($partial)) {
-            $this->_partial = $partial;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns partial view script to use for rendering menu
-     *
-     * @return string|array|null
-     */
-    public function getPartial()
-    {
-        return $this->_partial;
-    }
-
-    // Public methods:
-
-    /**
-     * Returns an HTML string containing an 'a' element for the given page if
-     * the page's href is not empty, and a 'span' element if it is empty
-     *
-     * Overrides {@link Zend_View_Helper_Navigation_Abstract::htmlify()}.
-     *
-     * @param  Zend_Navigation_Page $page  page to generate HTML for
-     * @return string                      HTML string for the given page
-     */
-    public function htmlify(Zend_Navigation_Page $page)
-    {
-        // get label and title for translating
-        $label = $page->getLabel();
-        $title = $page->getTitle();
-
-        // translate label and title?
-        if ($this->getUseTranslator() && $t = $this->getTranslator()) {
-            if (is_string($label) && !empty($label)) {
-                $label = $t->translate($label);
-            }
-            if (is_string($title) && !empty($title)) {
-                $title = $t->translate($title);
-            }
-        }
-
-        // get attribs for element
-        $attribs = array(
-            'id'     => $page->getId(),
-            'title'  => $title,
-            'class'  => $page->getClass()
-        );
-
-        // does page have a href?
-        if ($href = $page->getHref()) {
-            $element = 'a';
-            $attribs['href'] = $href;
-            $attribs['target'] = $page->getTarget();
-        } else {
-            $element = 'span';
-        }
-
-        return '<' . $element . $this->_htmlAttribs($attribs) . '>'
-             . $this->view->escape($label)
-             . '</' . $element . '>';
-    }
-
-    /**
-     * Normalizes given render options
-     *
-     * @param  array $options  [optional] options to normalize
-     * @return array           normalized options
-     */
-    protected function _normalizeOptions(array $options = array())
-    {
-        if (isset($options['indent'])) {
-            $options['indent'] = $this->_getWhitespace($options['indent']);
-        } else {
-            $options['indent'] = $this->getIndent();
-        }
-
-        if (isset($options['ulClass']) && $options['ulClass'] !== null) {
-            $options['ulClass'] = (string) $options['ulClass'];
-        } else {
-            $options['ulClass'] = $this->getUlClass();
-        }
-
-        if (array_key_exists('minDepth', $options)) {
-            if (null !== $options['minDepth']) {
-                $options['minDepth'] = (int) $options['minDepth'];
-            }
-        } else {
-            $options['minDepth'] = $this->getMinDepth();
-        }
-
-        if ($options['minDepth'] < 0 || $options['minDepth'] === null) {
-            $options['minDepth'] = 0;
-        }
-
-        if (array_key_exists('maxDepth', $options)) {
-            if (null !== $options['maxDepth']) {
-                $options['maxDepth'] = (int) $options['maxDepth'];
-            }
-        } else {
-            $options['maxDepth'] = $this->getMaxDepth();
-        }
-
-        if (!isset($options['onlyActiveBranch'])) {
-            $options['onlyActiveBranch'] = $this->getOnlyActiveBranch();
-        }
-
-        if (!isset($options['renderParents'])) {
-            $options['renderParents'] = $this->getRenderParents();
-        }
-
-        return $options;
-    }
-
-    // Render methods:
-
-    /**
-     * Renders the deepest active menu within [$minDepth, $maxDeth], (called
-     * from {@link renderMenu()})
-     *
-     * @param  Zend_Navigation_Container $container  container to render
-     * @param  array                     $active     active page and depth
-     * @param  string                    $ulClass    CSS class for first UL
-     * @param  string                    $indent     initial indentation
-     * @param  int|null                  $minDepth   minimum depth
-     * @param  int|null                  $maxDepth   maximum depth
-     * @return string                                rendered menu
-     */
-    protected function _renderDeepestMenu(Zend_Navigation_Container $container,
-                                          $ulClass,
-                                          $indent,
-                                          $minDepth,
-                                          $maxDepth)
-    {
-        if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) {
-            return '';
-        }
-
-        // special case if active page is one below minDepth
-        if ($active['depth'] < $minDepth) {
-            if (!$active['page']->hasPages()) {
-                return '';
-            }
-        } else if (!$active['page']->hasPages()) {
-            // found pages has no children; render siblings
-            $active['page'] = $active['page']->getParent();
-        } else if (is_int($maxDepth) && $active['depth'] +1 > $maxDepth) {
-            // children are below max depth; render siblings
-            $active['page'] = $active['page']->getParent();
-        }
-
-        $ulClass = $ulClass ? ' class="' . $ulClass . '"' : '';
-        $html = $indent . '<ul' . $ulClass . '>' . self::EOL;
-
-        foreach ($active['page'] as $subPage) {
-            if (!$this->accept($subPage)) {
-                continue;
-            }
-            $liClass = $subPage->isActive(true) ? ' class="active"' : '';
-            $html .= $indent . '    <li' . $liClass . '>' . self::EOL;
-            $html .= $indent . '        ' . $this->htmlify($subPage) . self::EOL;
-            $html .= $indent . '    </li>' . self::EOL;
-        }
-
-        $html .= $indent . '</ul>';
-
-        return $html;
-    }
-
-    /**
-     * Renders a normal menu (called from {@link renderMenu()})
-     *
-     * @param  Zend_Navigation_Container $container   container to render
-     * @param  string                    $ulClass     CSS class for first UL
-     * @param  string                    $indent      initial indentation
-     * @param  int|null                  $minDepth    minimum depth
-     * @param  int|null                  $maxDepth    maximum depth
-     * @param  bool                      $onlyActive  render only active branch?
-     * @return string
-     */
-    protected function _renderMenu(Zend_Navigation_Container $container,
-                                   $ulClass,
-                                   $indent,
-                                   $minDepth,
-                                   $maxDepth,
-                                   $onlyActive)
-    {
-        $html = '';
-
-        // find deepest active
-        if ($found = $this->findActive($container, $minDepth, $maxDepth)) {
-            $foundPage = $found['page'];
-            $foundDepth = $found['depth'];
-        } else {
-            $foundPage = null;
-        }
-
-        // create iterator
-        $iterator = new RecursiveIteratorIterator($container,
-                            RecursiveIteratorIterator::SELF_FIRST);
-        if (is_int($maxDepth)) {
-            $iterator->setMaxDepth($maxDepth);
-        }
-
-        // iterate container
-        $prevDepth = -1;
-        foreach ($iterator as $page) {
-            $depth = $iterator->getDepth();
-            $isActive = $page->isActive(true);
-            if ($depth < $minDepth || !$this->accept($page)) {
-                // page is below minDepth or not accepted by acl/visibilty
-                continue;
-            } else if ($onlyActive && !$isActive) {
-                // page is not active itself, but might be in the active branch
-                $accept = false;
-                if ($foundPage) {
-                    if ($foundPage->hasPage($page)) {
-                        // accept if page is a direct child of the active page
-                        $accept = true;
-                    } else if ($foundPage->getParent()->hasPage($page)) {
-                        // page is a sibling of the active page...
-                        if (!$foundPage->hasPages() ||
-                            is_int($maxDepth) && $foundDepth + 1 > $maxDepth) {
-                            // accept if active page has no children, or the
-                            // children are too deep to be rendered
-                            $accept = true;
-                        }
-                    }
-                }
-
-                if (!$accept) {
-                    continue;
-                }
-            }
-
-            // make sure indentation is correct
-            $depth -= $minDepth;
-            $myIndent = $indent . str_repeat('        ', $depth);
-
-            if ($depth > $prevDepth) {
-                // start new ul tag
-                if ($ulClass && $depth ==  0) {
-                    $ulClass = ' class="' . $ulClass . '"';
-                } else {
-                    $ulClass = '';
-                }
-                $html .= $myIndent . '<ul' . $ulClass . '>' . self::EOL;
-            } else if ($prevDepth > $depth) {
-                // close li/ul tags until we're at current depth
-                for ($i = $prevDepth; $i > $depth; $i--) {
-                    $ind = $indent . str_repeat('        ', $i);
-                    $html .= $ind . '    </li>' . self::EOL;
-                    $html .= $ind . '</ul>' . self::EOL;
-                }
-                // close previous li tag
-                $html .= $myIndent . '    </li>' . self::EOL;
-            } else {
-                // close previous li tag
-                $html .= $myIndent . '    </li>' . self::EOL;
-            }
-
-            // render li tag and page
-            $liClass = $isActive ? ' class="active"' : '';
-            $html .= $myIndent . '    <li' . $liClass . '>' . self::EOL
-                   . $myIndent . '        ' . $this->htmlify($page) . self::EOL;
-
-            // store as previous depth for next iteration
-            $prevDepth = $depth;
-        }
-
-        if ($html) {
-            // done iterating container; close open ul/li tags
-            for ($i = $prevDepth+1; $i > 0; $i--) {
-                $myIndent = $indent . str_repeat('        ', $i-1);
-                $html .= $myIndent . '    </li>' . self::EOL
-                       . $myIndent . '</ul>' . self::EOL;
-            }
-            $html = rtrim($html, self::EOL);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Renders helper
-     *
-     * Renders a HTML 'ul' for the given $container. If $container is not given,
-     * the container registered in the helper will be used.
-     *
-     * Available $options:
-     *
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               create menu from. Default
-     *                                               is to use the container
-     *                                               retrieved from
-     *                                               {@link getContainer()}.
-     * @param  array                     $options    [optional] options for
-     *                                               controlling rendering
-     * @return string                                rendered menu
-     */
-    public function renderMenu(Zend_Navigation_Container $container = null,
-                               array $options = array())
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        $options = $this->_normalizeOptions($options);
-
-        if ($options['onlyActiveBranch'] && !$options['renderParents']) {
-            $html = $this->_renderDeepestMenu($container,
-                                              $options['ulClass'],
-                                              $options['indent'],
-                                              $options['minDepth'],
-                                              $options['maxDepth']);
-        } else {
-            $html = $this->_renderMenu($container,
-                                       $options['ulClass'],
-                                       $options['indent'],
-                                       $options['minDepth'],
-                                       $options['maxDepth'],
-                                       $options['onlyActiveBranch']);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Renders the inner-most sub menu for the active page in the $container
-     *
-     * This is a convenience method which is equivalent to the following call:
-     * <code>
-     * renderMenu($container, array(
-     *     'indent'           => $indent,
-     *     'ulClass'          => $ulClass,
-     *     'minDepth'         => null,
-     *     'maxDepth'         => null,
-     *     'onlyActiveBranch' => true,
-     *     'renderParents'    => false
-     * ));
-     * </code>
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to render
-     *                                               the container registered in
-     *                                               the helper.
-     * @param  string                    $ulClass    [optional] CSS class to
-     *                                               use for UL element. Default
-     *                                               is to use the value from
-     *                                               {@link getUlClass()}.
-     * @param  string|int                $indent     [optional] indentation as
-     *                                               a string or number of
-     *                                               spaces. Default is to use
-     *                                               the value retrieved from
-     *                                               {@link getIndent()}.
-     * @return string                                rendered content
-     */
-    public function renderSubMenu(Zend_Navigation_Container $container = null,
-                                  $ulClass = null,
-                                  $indent = null)
-    {
-        return $this->renderMenu($container, array(
-            'indent'           => $indent,
-            'ulClass'          => $ulClass,
-            'minDepth'         => null,
-            'maxDepth'         => null,
-            'onlyActiveBranch' => true,
-            'renderParents'    => false
-        ));
-    }
-
-    /**
-     * Renders the given $container by invoking the partial view helper
-     *
-     * The container will simply be passed on as a model to the view script
-     * as-is, and will be available in the partial script as 'container', e.g.
-     * <code>echo 'Number of pages: ', count($this->container);</code>.
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               pass to view script. Default
-     *                                               is to use the container
-     *                                               registered in the helper.
-     * @param  string|array             $partial     [optional] partial view
-     *                                               script to use. Default is to
-     *                                               use the partial registered
-     *                                               in the helper. If an array
-     *                                               is given, it is expected to
-     *                                               contain two values; the
-     *                                               partial view script to use,
-     *                                               and the module where the
-     *                                               script can be found.
-     * @return string                                helper output
-     */
-    public function renderPartial(Zend_Navigation_Container $container = null,
-                                  $partial = null)
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        if (null === $partial) {
-            $partial = $this->getPartial();
-        }
-
-        if (empty($partial)) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception(
-                'Unable to render menu: No partial view script provided'
-            );
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $model = array(
-            'container' => $container
-        );
-
-        if (is_array($partial)) {
-            if (count($partial) != 2) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(
-                    'Unable to render menu: A view partial supplied as ' 
-                    .  'an array must contain two values: partial view ' 
-                    .  'script and module where script can be found'
-                );
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            return $this->view->partial($partial[0], $partial[1], $model);
-        }
-
-        return $this->view->partial($partial, null, $model);
-    }
-
-    // Zend_View_Helper_Navigation_Helper:
-
-    /**
-     * Renders menu
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
-     *
-     * If a partial view is registered in the helper, the menu will be rendered
-     * using the given partial script. If no partial is registered, the menu
-     * will be rendered as an 'ul' element by the helper's internal method.
-     *
-     * @see renderPartial()
-     * @see renderMenu()
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     */
-    public function render(Zend_Navigation_Container $container = null)
-    {
-        if ($partial = $this->getPartial()) {
-            return $this->renderPartial($container, $partial);
-        } else {
-            return $this->renderMenu($container);
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Navigation/Sitemap.php b/airtime_mvc/library/Zend/View/Helper/Navigation/Sitemap.php
deleted file mode 100644
index 78a0e167f..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Navigation/Sitemap.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Sitemap.php 20104 2010-01-06 21:26:01Z matthew $
- */
-
-/**
- * @see Zend_View_Helper_Navigation_HelperAbstract
- */
-require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
-
-/**
- * Helper for printing sitemaps
- *
- * @link http://www.sitemaps.org/protocol.php
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Navigation_Sitemap
-    extends Zend_View_Helper_Navigation_HelperAbstract
-{
-    /**
-     * Namespace for the <urlset> tag
-     *
-     * @var string
-     */
-    const SITEMAP_NS = 'http://www.sitemaps.org/schemas/sitemap/0.9';
-
-    /**
-     * Schema URL
-     *
-     * @var string
-     */
-    const SITEMAP_XSD = 'http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd';
-
-    /**
-     * Whether XML output should be formatted
-     *
-     * @var bool
-     */
-    protected $_formatOutput = false;
-
-    /**
-     * Whether the XML declaration should be included in XML output
-     *
-     * @var bool
-     */
-    protected $_useXmlDeclaration = true;
-
-    /**
-     * Whether sitemap should be validated using Zend_Validate_Sitemap_*
-     *
-     * @var bool
-     */
-    protected $_useSitemapValidators = true;
-
-    /**
-     * Whether sitemap should be schema validated when generated
-     *
-     * @var bool
-     */
-    protected $_useSchemaValidation = false;
-
-    /**
-     * Server url
-     *
-     * @var string
-     */
-    protected $_serverUrl;
-
-    /**
-     * View helper entry point:
-     * Retrieves helper and optionally sets container to operate on
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               operate on
-     * @return Zend_View_Helper_Navigation_Sitemap   fluent interface, returns
-     *                                               self
-     */
-    public function sitemap(Zend_Navigation_Container $container = null)
-    {
-        if (null !== $container) {
-            $this->setContainer($container);
-        }
-
-        return $this;
-    }
-
-    // Accessors:
-
-    /**
-     * Sets whether XML output should be formatted
-     *
-     * @param  bool $formatOutput                   [optional] whether output
-     *                                              should be formatted. Default
-     *                                              is true.
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
-     *                                              self
-     */
-    public function setFormatOutput($formatOutput = true)
-    {
-        $this->_formatOutput = (bool) $formatOutput;
-        return $this;
-    }
-
-    /**
-     * Returns whether XML output should be formatted
-     *
-     * @return bool  whether XML output should be formatted
-     */
-    public function getFormatOutput()
-    {
-        return $this->_formatOutput;
-    }
-
-    /**
-     * Sets whether the XML declaration should be used in output
-     *
-     * @param  bool $useXmlDecl                     whether XML delcaration
-     *                                              should be rendered
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
-     *                                              self
-     */
-    public function setUseXmlDeclaration($useXmlDecl)
-    {
-        $this->_useXmlDeclaration = (bool) $useXmlDecl;
-        return $this;
-    }
-
-    /**
-     * Returns whether the XML declaration should be used in output
-     *
-     * @return bool  whether the XML declaration should be used in output
-     */
-    public function getUseXmlDeclaration()
-    {
-        return $this->_useXmlDeclaration;
-    }
-
-    /**
-     * Sets whether sitemap should be validated using Zend_Validate_Sitemap_*
-     *
-     * @param  bool $useSitemapValidators           whether sitemap validators
-     *                                              should be used
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
-     *                                              self
-     */
-    public function setUseSitemapValidators($useSitemapValidators)
-    {
-        $this->_useSitemapValidators = (bool) $useSitemapValidators;
-        return $this;
-    }
-
-    /**
-     * Returns whether sitemap should be validated using Zend_Validate_Sitemap_*
-     *
-     * @return bool  whether sitemap should be validated using validators
-     */
-    public function getUseSitemapValidators()
-    {
-        return $this->_useSitemapValidators;
-    }
-
-    /**
-     * Sets whether sitemap should be schema validated when generated
-     *
-     * @param  bool $schemaValidation               whether sitemap should
-     *                                              validated using XSD Schema
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
-     *                                              self
-     */
-    public function setUseSchemaValidation($schemaValidation)
-    {
-        $this->_useSchemaValidation = (bool) $schemaValidation;
-        return $this;
-    }
-
-    /**
-     * Returns true if sitemap should be schema validated when generated
-     *
-     * @return bool
-     */
-    public function getUseSchemaValidation()
-    {
-        return $this->_useSchemaValidation;
-    }
-
-    /**
-     * Sets server url (scheme and host-related stuff without request URI)
-     *
-     * E.g. http://www.example.com
-     *
-     * @param  string $serverUrl                    server URL to set (only
-     *                                              scheme and host)
-     * @throws Zend_Uri_Exception                   if invalid server URL
-     * @return Zend_View_Helper_Navigation_Sitemap  fluent interface, returns
-     *                                              self
-     */
-    public function setServerUrl($serverUrl)
-    {
-        require_once 'Zend/Uri.php';
-        $uri = Zend_Uri::factory($serverUrl);
-        $uri->setFragment('');
-        $uri->setPath('');
-        $uri->setQuery('');
-
-        if ($uri->valid()) {
-            $this->_serverUrl = $uri->getUri();
-        } else {
-            require_once 'Zend/Uri/Exception.php';
-            $e = new Zend_Uri_Exception(sprintf(
-                    'Invalid server URL: "%s"',
-                    $serverUrl));
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns server URL
-     *
-     * @return string  server URL
-     */
-    public function getServerUrl()
-    {
-        if (!isset($this->_serverUrl)) {
-            $this->_serverUrl = $this->view->serverUrl();
-        }
-
-        return $this->_serverUrl;
-    }
-
-    // Helper methods:
-
-    /**
-     * Escapes string for XML usage
-     *
-     * @param  string $string  string to escape
-     * @return string          escaped string
-     */
-    protected function _xmlEscape($string)
-    {
-        $enc = 'UTF-8';
-        if ($this->view instanceof Zend_View_Interface
-            && method_exists($this->view, 'getEncoding')
-        ) {
-            $enc = $this->view->getEncoding();
-        }
-
-        // TODO: remove check when minimum PHP version is >= 5.2.3
-        if (version_compare(PHP_VERSION, '5.2.3', '>=')) {
-            // do not encode existing HTML entities
-            return htmlspecialchars($string, ENT_QUOTES, $enc, false);
-        } else {
-            $string = preg_replace('/&(?!(?:#\d++|[a-z]++);)/ui', '&amp;', $string);
-            $string = str_replace(array('<', '>', '\'', '"'), array('&lt;', '&gt;', '&#39;', '&quot;'), $string);
-            return $string;
-        }
-    }
-
-    // Public methods:
-
-    /**
-     * Returns an escaped absolute URL for the given page
-     *
-     * @param  Zend_Navigation_Page $page  page to get URL from
-     * @return string
-     */
-    public function url(Zend_Navigation_Page $page)
-    {
-        $href = $page->getHref();
-
-        if (!isset($href{0})) {
-            // no href
-            return '';
-        } elseif ($href{0} == '/') {
-            // href is relative to root; use serverUrl helper
-            $url = $this->getServerUrl() . $href;
-        } elseif (preg_match('/^[a-z]+:/im', (string) $href)) {
-            // scheme is given in href; assume absolute URL already
-            $url = (string) $href;
-        } else {
-            // href is relative to current document; use url helpers
-            $url = $this->getServerUrl()
-                 . rtrim($this->view->url(), '/') . '/'
-                 . $href;
-        }
-
-        return $this->_xmlEscape($url);
-    }
-
-    /**
-     * Returns a DOMDocument containing the Sitemap XML for the given container
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to get
-     *                                               breadcrumbs from, defaults
-     *                                               to what is registered in the
-     *                                               helper
-     * @return DOMDocument                           DOM representation of the
-     *                                               container
-     * @throws Zend_View_Exception                   if schema validation is on
-     *                                               and the sitemap is invalid
-     *                                               according to the sitemap
-     *                                               schema, or if sitemap
-     *                                               validators are used and the
-     *                                               loc element fails validation
-     */
-    public function getDomSitemap(Zend_Navigation_Container $container = null)
-    {
-        if (null === $container) {
-            $container = $this->getContainer();
-        }
-
-        // check if we should validate using our own validators
-        if ($this->getUseSitemapValidators()) {
-            require_once 'Zend/Validate/Sitemap/Changefreq.php';
-            require_once 'Zend/Validate/Sitemap/Lastmod.php';
-            require_once 'Zend/Validate/Sitemap/Loc.php';
-            require_once 'Zend/Validate/Sitemap/Priority.php';
-
-            // create validators
-            $locValidator        = new Zend_Validate_Sitemap_Loc();
-            $lastmodValidator    = new Zend_Validate_Sitemap_Lastmod();
-            $changefreqValidator = new Zend_Validate_Sitemap_Changefreq();
-            $priorityValidator   = new Zend_Validate_Sitemap_Priority();
-        }
-
-        // create document
-        $dom = new DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = $this->getFormatOutput();
-
-        // ...and urlset (root) element
-        $urlSet = $dom->createElementNS(self::SITEMAP_NS, 'urlset');
-        $dom->appendChild($urlSet);
-
-        // create iterator
-        $iterator = new RecursiveIteratorIterator($container,
-            RecursiveIteratorIterator::SELF_FIRST);
-
-        $maxDepth = $this->getMaxDepth();
-        if (is_int($maxDepth)) {
-            $iterator->setMaxDepth($maxDepth);
-        }
-        $minDepth = $this->getMinDepth();
-        if (!is_int($minDepth) || $minDepth < 0) {
-            $minDepth = 0;
-        }
-
-        // iterate container
-        foreach ($iterator as $page) {
-            if ($iterator->getDepth() < $minDepth || !$this->accept($page)) {
-                // page should not be included
-                continue;
-            }
-
-            // get absolute url from page
-            if (!$url = $this->url($page)) {
-                // skip page if it has no url (rare case)
-                continue;
-            }
-
-            // create url node for this page
-            $urlNode = $dom->createElementNS(self::SITEMAP_NS, 'url');
-            $urlSet->appendChild($urlNode);
-
-            if ($this->getUseSitemapValidators() &&
-                !$locValidator->isValid($url)) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf(
-                        'Encountered an invalid URL for Sitemap XML: "%s"',
-                        $url));
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            // put url in 'loc' element
-            $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
-                                                        'loc', $url));
-
-            // add 'lastmod' element if a valid lastmod is set in page
-            if (isset($page->lastmod)) {
-                $lastmod = strtotime((string) $page->lastmod);
-
-                // prevent 1970-01-01...
-                if ($lastmod !== false) {
-                    $lastmod = date('c', $lastmod);
-                }
-
-                if (!$this->getUseSitemapValidators() ||
-                    $lastmodValidator->isValid($lastmod)) {
-                    $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'lastmod',
-                                              $lastmod)
-                    );
-                }
-            }
-
-            // add 'changefreq' element if a valid changefreq is set in page
-            if (isset($page->changefreq)) {
-                $changefreq = $page->changefreq;
-                if (!$this->getUseSitemapValidators() ||
-                    $changefreqValidator->isValid($changefreq)) {
-                    $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'changefreq',
-                                              $changefreq)
-                    );
-                }
-            }
-
-            // add 'priority' element if a valid priority is set in page
-            if (isset($page->priority)) {
-                $priority = $page->priority;
-                if (!$this->getUseSitemapValidators() ||
-                    $priorityValidator->isValid($priority)) {
-                    $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'priority',
-                                              $priority)
-                    );
-                }
-            }
-        }
-
-        // validate using schema if specified
-        if ($this->getUseSchemaValidation()) {
-            if (!@$dom->schemaValidate(self::SITEMAP_XSD)) {
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception(sprintf(
-                        'Sitemap is invalid according to XML Schema at "%s"',
-                        self::SITEMAP_XSD));
-                $e->setView($this->view);
-                throw $e;
-            }
-        }
-
-        return $dom;
-    }
-
-    // Zend_View_Helper_Navigation_Helper:
-
-    /**
-     * Renders helper
-     *
-     * Implements {@link Zend_View_Helper_Navigation_Helper::render()}.
-     *
-     * @param  Zend_Navigation_Container $container  [optional] container to
-     *                                               render. Default is to
-     *                                               render the container
-     *                                               registered in the helper.
-     * @return string                                helper output
-     */
-    public function render(Zend_Navigation_Container $container = null)
-    {
-        $dom = $this->getDomSitemap($container);
-
-        $xml = $this->getUseXmlDeclaration() ?
-               $dom->saveXML() :
-               $dom->saveXML($dom->documentElement);
-
-        return rtrim($xml, PHP_EOL);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/PaginationControl.php b/airtime_mvc/library/Zend/View/Helper/PaginationControl.php
deleted file mode 100644
index 2599da932..000000000
--- a/airtime_mvc/library/Zend/View/Helper/PaginationControl.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: PaginationControl.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_PaginationControl
-{
-    /**
-     * View instance
-     *
-     * @var Zend_View_Instance
-     */
-    public $view = null;
-
-    /**
-     * Default view partial
-     *
-     * @var string|array
-     */
-    protected static $_defaultViewPartial = null;
-
-    /**
-     * Sets the view instance.
-     *
-     * @param  Zend_View_Interface $view View instance
-     * @return Zend_View_Helper_PaginationControl
-     */
-    public function setView(Zend_View_Interface $view)
-    {
-        $this->view = $view;
-        return $this;
-    }
-
-    /**
-     * Sets the default view partial.
-     *
-     * @param string|array $partial View partial
-     */
-    public static function setDefaultViewPartial($partial)
-    {
-        self::$_defaultViewPartial = $partial;
-    }
-
-    /**
-     * Gets the default view partial
-     *
-     * @return string|array
-     */
-    public static function getDefaultViewPartial()
-    {
-        return self::$_defaultViewPartial;
-    }
-
-    /**
-     * Render the provided pages.  This checks if $view->paginator is set and,
-     * if so, uses that.  Also, if no scrolling style or partial are specified,
-     * the defaults will be used (if set).
-     *
-     * @param  Zend_Paginator (Optional) $paginator
-     * @param  string $scrollingStyle (Optional) Scrolling style
-     * @param  string $partial (Optional) View partial
-     * @param  array|string $params (Optional) params to pass to the partial
-     * @return string
-     * @throws Zend_View_Exception
-     */
-    public function paginationControl(Zend_Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
-    {
-        if ($paginator === null) {
-            if (isset($this->view->paginator) and $this->view->paginator !== null and $this->view->paginator instanceof Zend_Paginator) {
-                $paginator = $this->view->paginator;
-            } else {
-                /**
-                 * @see Zend_View_Exception
-                 */
-                require_once 'Zend/View/Exception.php';
-
-                $e = new Zend_View_Exception('No paginator instance provided or incorrect type');
-                $e->setView($this->view);
-                throw $e;
-            }
-        }
-
-        if ($partial === null) {
-            if (self::$_defaultViewPartial === null) {
-                /**
-                 * @see Zend_View_Exception
-                 */
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception('No view partial provided and no default set');
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            $partial = self::$_defaultViewPartial;
-        }
-
-        $pages = get_object_vars($paginator->getPages($scrollingStyle));
-
-        if ($params !== null) {
-            $pages = array_merge($pages, (array) $params);
-        }
-
-        if (is_array($partial)) {
-            if (count($partial) != 2) {
-                /**
-                 * @see Zend_View_Exception
-                 */
-                require_once 'Zend/View/Exception.php';
-                $e = new Zend_View_Exception('A view partial supplied as an array must contain two values: the filename and its module');
-                $e->setView($this->view);
-                throw $e;
-            }
-
-            if ($partial[1] !== null) {
-                return $this->view->partial($partial[0], $partial[1], $pages);
-            }
-
-            $partial = $partial[0];
-        }
-
-        return $this->view->partial($partial, $pages);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Partial.php b/airtime_mvc/library/Zend/View/Helper/Partial.php
deleted file mode 100644
index 6b4a89247..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Partial.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Partial.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for rendering a template fragment in its own variable scope.
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Partial extends Zend_View_Helper_Abstract
-{
-    /**
-     * Variable to which object will be assigned
-     * @var string
-     */
-    protected $_objectKey;
-
-    /**
-     * Renders a template fragment within a variable scope distinct from the
-     * calling View object.
-     *
-     * If no arguments are passed, returns the helper instance.
-     *
-     * If the $model is an array, it is passed to the view object's assign()
-     * method.
-     *
-     * If the $model is an object, it first checks to see if the object
-     * implements a 'toArray' method; if so, it passes the result of that
-     * method to to the view object's assign() method. Otherwise, the result of
-     * get_object_vars() is passed.
-     *
-     * @param  string $name Name of view script
-     * @param  string|array $module If $model is empty, and $module is an array,
-     *                              these are the variables to populate in the
-     *                              view. Otherwise, the module in which the
-     *                              partial resides
-     * @param  array $model Variables to populate in the view
-     * @return string|Zend_View_Helper_Partial
-     */
-    public function partial($name = null, $module = null, $model = null)
-    {
-        if (0 == func_num_args()) {
-            return $this;
-        }
-
-        $view = $this->cloneView();
-        if (isset($this->partialCounter)) {
-            $view->partialCounter = $this->partialCounter;
-        }
-        if ((null !== $module) && is_string($module)) {
-            require_once 'Zend/Controller/Front.php';
-            $moduleDir = Zend_Controller_Front::getInstance()->getControllerDirectory($module);
-            if (null === $moduleDir) {
-                require_once 'Zend/View/Helper/Partial/Exception.php';
-                $e = new Zend_View_Helper_Partial_Exception('Cannot render partial; module does not exist');
-                $e->setView($this->view);
-                throw $e;
-            }
-            $viewsDir = dirname($moduleDir) . '/views';
-            $view->addBasePath($viewsDir);
-        } elseif ((null == $model) && (null !== $module)
-            && (is_array($module) || is_object($module)))
-        {
-            $model = $module;
-        }
-
-        if (!empty($model)) {
-            if (is_array($model)) {
-                $view->assign($model);
-            } elseif (is_object($model)) {
-                if (null !== ($objectKey = $this->getObjectKey())) {
-                    $view->assign($objectKey, $model);
-                } elseif (method_exists($model, 'toArray')) {
-                    $view->assign($model->toArray());
-                } else {
-                    $view->assign(get_object_vars($model));
-                }
-            }
-        }
-
-        return $view->render($name);
-    }
-
-    /**
-     * Clone the current View
-     *
-     * @return Zend_View_Interface
-     */
-    public function cloneView()
-    {
-        $view = clone $this->view;
-        $view->clearVars();
-        return $view;
-    }
-
-    /**
-     * Set object key
-     *
-     * @param  string $key
-     * @return Zend_View_Helper_Partial
-     */
-    public function setObjectKey($key)
-    {
-        if (null === $key) {
-            $this->_objectKey = null;
-        } else {
-            $this->_objectKey = (string) $key;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve object key
-     *
-     * The objectKey is the variable to which an object in the iterator will be
-     * assigned.
-     *
-     * @return null|string
-     */
-    public function getObjectKey()
-    {
-        return $this->_objectKey;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Partial/Exception.php b/airtime_mvc/library/Zend/View/Helper/Partial/Exception.php
deleted file mode 100644
index 237b4f55a..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Partial/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_View_Exception */
-require_once 'Zend/View/Exception.php';
-
-
-/**
- * Exception for Zend_View_Helper_Partial class.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Partial_Exception extends Zend_View_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/PartialLoop.php b/airtime_mvc/library/Zend/View/Helper/PartialLoop.php
deleted file mode 100644
index 56bad7de6..000000000
--- a/airtime_mvc/library/Zend/View/Helper/PartialLoop.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: PartialLoop.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Partial */
-require_once 'Zend/View/Helper/Partial.php';
-
-/**
- * Helper for rendering a template fragment in its own variable scope; iterates
- * over data provided and renders for each iteration.
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_PartialLoop extends Zend_View_Helper_Partial
-{
-
-    /**
-     * Marker to where the pointer is at in the loop
-     * @var integer
-     */
-    protected $partialCounter = 0;
-
-    /**
-     * Renders a template fragment within a variable scope distinct from the
-     * calling View object.
-     *
-     * If no arguments are provided, returns object instance.
-     *
-     * @param  string $name Name of view script
-     * @param  string|array $module If $model is empty, and $module is an array,
-     *                              these are the variables to populate in the
-     *                              view. Otherwise, the module in which the
-     *                              partial resides
-     * @param  array $model Variables to populate in the view
-     * @return string
-     */
-    public function partialLoop($name = null, $module = null, $model = null)
-    {
-        if (0 == func_num_args()) {
-            return $this;
-        }
-
-        if ((null === $model) && (null !== $module)) {
-            $model  = $module;
-            $module = null;
-        }
-
-        if (!is_array($model)
-            && (!$model instanceof Traversable)
-            && (is_object($model) && !method_exists($model, 'toArray'))
-        ) {
-            require_once 'Zend/View/Helper/Partial/Exception.php';
-            $e = new Zend_View_Helper_Partial_Exception('PartialLoop helper requires iterable data');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        if (is_object($model)
-            && (!$model instanceof Traversable)
-            && method_exists($model, 'toArray')
-        ) {
-            $model = $model->toArray();
-        }
-
-        $content = '';
-        // reset the counter if it's call again
-        $this->partialCounter = 0;
-        foreach ($model as $item) {
-            // increment the counter variable
-            $this->partialCounter++;
-
-            $content .= $this->partial($name, $module, $item);
-        }
-
-        return $content;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder.php b/airtime_mvc/library/Zend/View/Helper/Placeholder.php
deleted file mode 100644
index 3ef212891..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Placeholder.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Registry */
-require_once 'Zend/View/Helper/Placeholder/Registry.php';
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for passing data between otherwise segregated Views. It's called
- * Placeholder to make its typical usage obvious, but can be used just as easily
- * for non-Placeholder things. That said, the support for this is only
- * guaranteed to effect subsequently rendered templates, and of course Layouts.
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Placeholder extends Zend_View_Helper_Abstract
-{
-    /**
-     * Placeholder items
-     * @var array
-     */
-    protected $_items = array();
-
-    /**
-     * @var Zend_View_Helper_Placeholder_Registry
-     */
-    protected $_registry;
-
-    /**
-     * Constructor
-     *
-     * Retrieve container registry from Zend_Registry, or create new one and register it.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->_registry = Zend_View_Helper_Placeholder_Registry::getRegistry();
-    }
-
-
-    /**
-     * Placeholder helper
-     *
-     * @param  string $name
-     * @return Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    public function placeholder($name)
-    {
-        $name = (string) $name;
-        return $this->_registry->getContainer($name);
-    }
-
-    /**
-     * Retrieve the registry
-     *
-     * @return Zend_View_Helper_Placeholder_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->_registry;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Container.php
deleted file mode 100644
index ef7d2bf7f..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Abstract */
-require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php';
-
-/**
- * Container for placeholder values
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Placeholder_Container extends Zend_View_Helper_Placeholder_Container_Abstract
-{
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Abstract.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Abstract.php
deleted file mode 100644
index 882259c4e..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Abstract.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Abstract class representing container for placeholder values
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObject
-{
-    /**
-     * Whether or not to override all contents of placeholder
-     * @const string
-     */
-    const SET    = 'SET';
-
-    /**
-     * Whether or not to append contents to placeholder
-     * @const string
-     */
-    const APPEND = 'APPEND';
-
-    /**
-     * Whether or not to prepend contents to placeholder
-     * @const string
-     */
-    const PREPEND = 'PREPEND';
-
-    /**
-     * What text to prefix the placeholder with when rendering
-     * @var string
-     */
-    protected $_prefix    = '';
-
-    /**
-     * What text to append the placeholder with when rendering
-     * @var string
-     */
-    protected $_postfix   = '';
-
-    /**
-     * What string to use between individual items in the placeholder when rendering
-     * @var string
-     */
-    protected $_separator = '';
-
-    /**
-     * What string to use as the indentation of output, this will typically be spaces. Eg: '    '
-     * @var string
-     */
-    protected $_indent = '';
-
-    /**
-     * Whether or not we're already capturing for this given container
-     * @var bool
-     */
-    protected $_captureLock = false;
-
-    /**
-     * What type of capture (overwrite (set), append, prepend) to use
-     * @var string
-     */
-    protected $_captureType;
-
-    /**
-     * Key to which to capture content
-     * @var string
-     */
-    protected $_captureKey;
-
-    /**
-     * Constructor - This is needed so that we can attach a class member as the ArrayObject container
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct(array(), parent::ARRAY_AS_PROPS);
-    }
-
-    /**
-     * Set a single value
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function set($value)
-    {
-        $this->exchangeArray(array($value));
-    }
-
-    /**
-     * Prepend a value to the top of the container
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function prepend($value)
-    {
-        $values = $this->getArrayCopy();
-        array_unshift($values, $value);
-        $this->exchangeArray($values);
-    }
-
-    /**
-     * Retrieve container value
-     *
-     * If single element registered, returns that element; otherwise,
-     * serializes to array.
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        if (1 == count($this)) {
-            $keys = $this->getKeys();
-            $key  = array_shift($keys);
-            return $this[$key];
-        }
-
-        return $this->getArrayCopy();
-    }
-
-    /**
-     * Set prefix for __toString() serialization
-     *
-     * @param  string $prefix
-     * @return Zend_View_Helper_Placeholder_Container
-     */
-    public function setPrefix($prefix)
-    {
-        $this->_prefix = (string) $prefix;
-        return $this;
-    }
-
-    /**
-     * Retrieve prefix
-     *
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->_prefix;
-    }
-
-    /**
-     * Set postfix for __toString() serialization
-     *
-     * @param  string $postfix
-     * @return Zend_View_Helper_Placeholder_Container
-     */
-    public function setPostfix($postfix)
-    {
-        $this->_postfix = (string) $postfix;
-        return $this;
-    }
-
-    /**
-     * Retrieve postfix
-     *
-     * @return string
-     */
-    public function getPostfix()
-    {
-        return $this->_postfix;
-    }
-
-    /**
-     * Set separator for __toString() serialization
-     *
-     * Used to implode elements in container
-     *
-     * @param  string $separator
-     * @return Zend_View_Helper_Placeholder_Container
-     */
-    public function setSeparator($separator)
-    {
-        $this->_separator = (string) $separator;
-        return $this;
-    }
-
-    /**
-     * Retrieve separator
-     *
-     * @return string
-     */
-    public function getSeparator()
-    {
-        return $this->_separator;
-    }
-
-    /**
-     * Set the indentation string for __toString() serialization,
-     * optionally, if a number is passed, it will be the number of spaces
-     *
-     * @param  string|int $indent
-     * @return Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    public function setIndent($indent)
-    {
-        $this->_indent = $this->getWhitespace($indent);
-        return $this;
-    }
-
-    /**
-     * Retrieve indentation
-     *
-     * @return string
-     */
-    public function getIndent()
-    {
-        return $this->_indent;
-    }
-
-    /**
-     * Retrieve whitespace representation of $indent
-     *
-     * @param  int|string $indent
-     * @return string
-     */
-    public function getWhitespace($indent)
-    {
-        if (is_int($indent)) {
-            $indent = str_repeat(' ', $indent);
-        }
-
-        return (string) $indent;
-    }
-
-    /**
-     * Start capturing content to push into placeholder
-     *
-     * @param  int $type How to capture content into placeholder; append, prepend, or set
-     * @return void
-     * @throws Zend_View_Helper_Placeholder_Exception if nested captures detected
-     */
-    public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $key = null)
-    {
-        if ($this->_captureLock) {
-            require_once 'Zend/View/Helper/Placeholder/Container/Exception.php';
-            $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest placeholder captures for the same placeholder');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->_captureLock = true;
-        $this->_captureType = $type;
-        if ((null !== $key) && is_scalar($key)) {
-            $this->_captureKey = (string) $key;
-        }
-        ob_start();
-    }
-
-    /**
-     * End content capture
-     *
-     * @return void
-     */
-    public function captureEnd()
-    {
-        $data               = ob_get_clean();
-        $key                = null;
-        $this->_captureLock = false;
-        if (null !== $this->_captureKey) {
-            $key = $this->_captureKey;
-        }
-        switch ($this->_captureType) {
-            case self::SET:
-                if (null !== $key) {
-                    $this[$key] = $data;
-                } else {
-                    $this->exchangeArray(array($data));
-                }
-                break;
-            case self::PREPEND:
-                if (null !== $key) {
-                    $array  = array($key => $data);
-                    $values = $this->getArrayCopy();
-                    $final  = $array + $values;
-                    $this->exchangeArray($final);
-                } else {
-                    $this->prepend($data);
-                }
-                break;
-            case self::APPEND:
-            default:
-                if (null !== $key) {
-                    if (empty($this[$key])) {
-                        $this[$key] = $data;
-                    } else {
-                        $this[$key] .= $data;
-                    }
-                } else {
-                    $this[$this->nextIndex()] = $data;
-                }
-                break;
-        }
-    }
-
-    /**
-     * Get keys
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        $array = $this->getArrayCopy();
-        return array_keys($array);
-    }
-
-    /**
-     * Next Index
-     *
-     * as defined by the PHP manual
-     * @return int
-     */
-    public function nextIndex()
-    {
-        $keys = $this->getKeys();
-        if (0 == count($keys)) {
-            return 0;
-        }
-
-        return $nextIndex = max($keys) + 1;
-    }
-
-    /**
-     * Render the placeholder
-     *
-     * @return string
-     */
-    public function toString($indent = null)
-    {
-        $indent = ($indent !== null)
-                ? $this->getWhitespace($indent)
-                : $this->getIndent();
-
-        $items  = $this->getArrayCopy();
-        $return = $indent
-                . $this->getPrefix()
-                . implode($this->getSeparator(), $items)
-                . $this->getPostfix();
-        $return = preg_replace("/(\r\n?|\n)/", '$1' . $indent, $return);
-        return $return;
-    }
-
-    /**
-     * Serialize object to string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Exception.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Exception.php
deleted file mode 100644
index 293c3ff40..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_View_Exception */
-require_once 'Zend/View/Exception.php';
-
-
-/**
- * Exception for Zend_View_Helper_Placeholder_Container class.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Placeholder_Container_Exception extends Zend_View_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Standalone.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Standalone.php
deleted file mode 100644
index f1e12dc02..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Container/Standalone.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Standalone.php 20143 2010-01-08 15:17:11Z matthew $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Registry */
-require_once 'Zend/View/Helper/Placeholder/Registry.php';
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Base class for targetted placeholder helpers
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_View_Helper_Abstract implements IteratorAggregate, Countable, ArrayAccess
-{
-    /**
-     * @var Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    protected $_container;
-
-    /**
-     * @var Zend_View_Helper_Placeholder_Registry
-     */
-    protected $_registry;
-
-    /**
-     * Registry key under which container registers itself
-     * @var string
-     */
-    protected $_regKey;
-
-    /**
-     * Flag wheter to automatically escape output, must also be
-     * enforced in the child class if __toString/toString is overriden
-     * @var book
-     */
-    protected $_autoEscape = true;
-
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->setRegistry(Zend_View_Helper_Placeholder_Registry::getRegistry());
-        $this->setContainer($this->getRegistry()->getContainer($this->_regKey));
-    }
-
-    /**
-     * Retrieve registry
-     *
-     * @return Zend_View_Helper_Placeholder_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->_registry;
-    }
-
-    /**
-     * Set registry object
-     *
-     * @param  Zend_View_Helper_Placeholder_Registry $registry
-     * @return Zend_View_Helper_Placeholder_Container_Standalone
-     */
-    public function setRegistry(Zend_View_Helper_Placeholder_Registry $registry)
-    {
-        $this->_registry = $registry;
-        return $this;
-    }
-
-    /**
-     * Set whether or not auto escaping should be used
-     *
-     * @param  bool $autoEscape whether or not to auto escape output
-     * @return Zend_View_Helper_Placeholder_Container_Standalone
-     */
-    public function setAutoEscape($autoEscape = true)
-    {
-        $this->_autoEscape = ($autoEscape) ? true : false;
-        return $this;
-    }
-
-    /**
-     * Return whether autoEscaping is enabled or disabled
-     *
-     * return bool
-     */
-    public function getAutoEscape()
-    {
-        return $this->_autoEscape;
-    }
-
-    /**
-     * Escape a string
-     *
-     * @param  string $string
-     * @return string
-     */
-    protected function _escape($string)
-    {
-        $enc = 'UTF-8';
-        if ($this->view instanceof Zend_View_Interface
-            && method_exists($this->view, 'getEncoding')
-        ) {
-            $enc = $this->view->getEncoding();
-        }
-
-        return htmlspecialchars((string) $string, ENT_COMPAT, $enc);
-    }
-
-    /**
-     * Set container on which to operate
-     *
-     * @param  Zend_View_Helper_Placeholder_Container_Abstract $container
-     * @return Zend_View_Helper_Placeholder_Container_Standalone
-     */
-    public function setContainer(Zend_View_Helper_Placeholder_Container_Abstract $container)
-    {
-        $this->_container = $container;
-        return $this;
-    }
-
-    /**
-     * Retrieve placeholder container
-     *
-     * @return Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    public function getContainer()
-    {
-        return $this->_container;
-    }
-
-    /**
-     * Overloading: set property value
-     *
-     * @param  string $key
-     * @param  mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $container = $this->getContainer();
-        $container[$key] = $value;
-    }
-
-    /**
-     * Overloading: retrieve property
-     *
-     * @param  string $key
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        $container = $this->getContainer();
-        if (isset($container[$key])) {
-            return $container[$key];
-        }
-
-        return null;
-    }
-
-    /**
-     * Overloading: check if property is set
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        $container = $this->getContainer();
-        return isset($container[$key]);
-    }
-
-    /**
-     * Overloading: unset property
-     *
-     * @param  string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        $container = $this->getContainer();
-        if (isset($container[$key])) {
-            unset($container[$key]);
-        }
-    }
-
-    /**
-     * Overload
-     *
-     * Proxy to container methods
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        $container = $this->getContainer();
-        if (method_exists($container, $method)) {
-            $return = call_user_func_array(array($container, $method), $args);
-            if ($return === $container) {
-                // If the container is returned, we really want the current object
-                return $this;
-            }
-            return $return;
-        }
-
-        require_once 'Zend/View/Exception.php';
-        $e = new Zend_View_Exception('Method "' . $method . '" does not exist');
-        $e->setView($this->view);
-        throw $e;
-    }
-
-    /**
-     * String representation
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getContainer()->toString();
-    }
-
-    /**
-     * Cast to string representation
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Countable
-     *
-     * @return int
-     */
-    public function count()
-    {
-        $container = $this->getContainer();
-        return count($container);
-    }
-
-    /**
-     * ArrayAccess: offsetExists
-     *
-     * @param  string|int $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return $this->getContainer()->offsetExists($offset);
-    }
-
-    /**
-     * ArrayAccess: offsetGet
-     *
-     * @param  string|int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getContainer()->offsetGet($offset);
-    }
-
-    /**
-     * ArrayAccess: offsetSet
-     *
-     * @param  string|int $offset
-     * @param  mixed $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        return $this->getContainer()->offsetSet($offset, $value);
-    }
-
-    /**
-     * ArrayAccess: offsetUnset
-     *
-     * @param  string|int $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        return $this->getContainer()->offsetUnset($offset);
-    }
-
-    /**
-     * IteratorAggregate: get Iterator
-     *
-     * @return Iterator
-     */
-    public function getIterator()
-    {
-        return $this->getContainer()->getIterator();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry.php
deleted file mode 100644
index 1e793e4d7..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_Registry */
-require_once 'Zend/Registry.php';
-
-/** Zend_View_Helper_Placeholder_Container_Abstract */
-require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php';
-
-/** Zend_View_Helper_Placeholder_Container */
-require_once 'Zend/View/Helper/Placeholder/Container.php';
-
-/**
- * Registry for placeholder containers
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Placeholder_Registry
-{
-    /**
-     * Zend_Registry key under which placeholder registry exists
-     * @const string
-     */
-    const REGISTRY_KEY = 'Zend_View_Helper_Placeholder_Registry';
-
-    /**
-     * Default container class
-     * @var string
-     */
-    protected $_containerClass = 'Zend_View_Helper_Placeholder_Container';
-
-    /**
-     * Placeholder containers
-     * @var array
-     */
-    protected $_items = array();
-
-    /**
-     * Retrieve or create registry instnace
-     *
-     * @return void
-     */
-    public static function getRegistry()
-    {
-        if (Zend_Registry::isRegistered(self::REGISTRY_KEY)) {
-            $registry = Zend_Registry::get(self::REGISTRY_KEY);
-        } else {
-            $registry = new self();
-            Zend_Registry::set(self::REGISTRY_KEY, $registry);
-        }
-
-        return $registry;
-    }
-
-    /**
-     * createContainer
-     *
-     * @param  string $key
-     * @param  array $value
-     * @return Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    public function createContainer($key, array $value = array())
-    {
-        $key = (string) $key;
-
-        $this->_items[$key] = new $this->_containerClass(array());
-        return $this->_items[$key];
-    }
-
-    /**
-     * Retrieve a placeholder container
-     *
-     * @param  string $key
-     * @return Zend_View_Helper_Placeholder_Container_Abstract
-     */
-    public function getContainer($key)
-    {
-        $key = (string) $key;
-        if (isset($this->_items[$key])) {
-            return $this->_items[$key];
-        }
-
-        $container = $this->createContainer($key);
-
-        return $container;
-    }
-
-    /**
-     * Does a particular container exist?
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function containerExists($key)
-    {
-        $key = (string) $key;
-        $return =  array_key_exists($key, $this->_items);
-        return $return;
-    }
-
-    /**
-     * Set the container for an item in the registry
-     *
-     * @param  string $key
-     * @param  Zend_View_Placeholder_Container_Abstract $container
-     * @return Zend_View_Placeholder_Registry
-     */
-    public function setContainer($key, Zend_View_Helper_Placeholder_Container_Abstract $container)
-    {
-        $key = (string) $key;
-        $this->_items[$key] = $container;
-        return $this;
-    }
-
-    /**
-     * Delete a container
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function deleteContainer($key)
-    {
-        $key = (string) $key;
-        if (isset($this->_items[$key])) {
-            unset($this->_items[$key]);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the container class to use
-     *
-     * @param  string $name
-     * @return Zend_View_Helper_Placeholder_Registry
-     */
-    public function setContainerClass($name)
-    {
-        if (!class_exists($name)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($name);
-        }
-
-        $reflection = new ReflectionClass($name);
-        if (!$reflection->isSubclassOf(new ReflectionClass('Zend_View_Helper_Placeholder_Container_Abstract'))) {
-            require_once 'Zend/View/Helper/Placeholder/Registry/Exception.php';
-            $e = new Zend_View_Helper_Placeholder_Registry_Exception('Invalid Container class specified');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $this->_containerClass = $name;
-        return $this;
-    }
-
-    /**
-     * Retrieve the container class
-     *
-     * @return string
-     */
-    public function getContainerClass()
-    {
-        return $this->_containerClass;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry/Exception.php b/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry/Exception.php
deleted file mode 100644
index 74cc46b9f..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Placeholder/Registry/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_View_Exception */
-require_once 'Zend/View/Exception.php';
-
-
-/**
- * Exception for Zend_View_Helper_Placeholder_Registry class.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Placeholder_Registry_Exception extends Zend_View_Exception
-{
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/RenderToPlaceholder.php b/airtime_mvc/library/Zend/View/Helper/RenderToPlaceholder.php
deleted file mode 100644
index e54777b43..000000000
--- a/airtime_mvc/library/Zend/View/Helper/RenderToPlaceholder.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: RenderToPlaceholder.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Renders a template and stores the rendered output as a placeholder
- * variable for later use.
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_View_Helper_RenderToPlaceholder extends Zend_View_Helper_Abstract
-{
-
-    /**
-     * Renders a template and stores the rendered output as a placeholder
-     * variable for later use.
-     *
-     * @param $script The template script to render
-     * @param $placeholder The placeholder variable name in which to store the rendered output
-     * @return void
-     */
-    public function renderToPlaceholder($script, $placeholder)
-    {
-        $this->view->placeholder($placeholder)->captureStart();
-        echo $this->view->render($script);
-        $this->view->placeholder($placeholder)->captureEnd();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/ServerUrl.php b/airtime_mvc/library/Zend/View/Helper/ServerUrl.php
deleted file mode 100644
index 0461725eb..000000000
--- a/airtime_mvc/library/Zend/View/Helper/ServerUrl.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ServerUrl.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Helper for returning the current server URL (optionally with request URI)
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_ServerUrl
-{
-    /**
-     * Scheme
-     *
-     * @var string
-     */
-    protected $_scheme;
-
-    /**
-     * Host (including port)
-     *
-     * @var string
-     */
-    protected $_host;
-
-    /**
-     * Constructor
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] === true)) {
-            $scheme = 'https';
-        } else {
-            $scheme = 'http';
-        }
-        $this->setScheme($scheme);
-
-        if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
-            $this->setHost($_SERVER['HTTP_HOST']);
-        } else if (isset($_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'])) {
-            $name = $_SERVER['SERVER_NAME'];
-            $port = $_SERVER['SERVER_PORT'];
-
-            if (($scheme == 'http' && $port == 80) ||
-                ($scheme == 'https' && $port == 443)) {
-                $this->setHost($name);
-            } else {
-                $this->setHost($name . ':' . $port);
-            }
-        }
-    }
-
-    /**
-     * View helper entry point:
-     * Returns the current host's URL like http://site.com
-     *
-     * @param  string|boolean $requestUri  [optional] if true, the request URI
-     *                                     found in $_SERVER will be appended
-     *                                     as a path. If a string is given, it
-     *                                     will be appended as a path. Default
-     *                                     is to not append any path.
-     * @return string                      server url
-     */
-    public function serverUrl($requestUri = null)
-    {
-        if ($requestUri === true) {
-            $path = $_SERVER['REQUEST_URI'];
-        } else if (is_string($requestUri)) {
-            $path = $requestUri;
-        } else {
-            $path = '';
-        }
-
-        return $this->getScheme() . '://' . $this->getHost() . $path;
-    }
-
-    /**
-     * Returns host
-     *
-     * @return string  host
-     */
-    public function getHost()
-    {
-        return $this->_host;
-    }
-
-    /**
-     * Sets host
-     *
-     * @param  string $host                new host
-     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
-     */
-    public function setHost($host)
-    {
-        $this->_host = $host;
-        return $this;
-    }
-
-    /**
-     * Returns scheme (typically http or https)
-     *
-     * @return string  scheme (typically http or https)
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * Sets scheme (typically http or https)
-     *
-     * @param  string $scheme              new scheme (typically http or https)
-     * @return Zend_View_Helper_ServerUrl  fluent interface, returns self
-     */
-    public function setScheme($scheme)
-    {
-        $this->_scheme = $scheme;
-        return $this;
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Translate.php b/airtime_mvc/library/Zend/View/Helper/Translate.php
deleted file mode 100644
index ec310f27b..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Translate.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Translate.php 20140 2010-01-08 05:21:04Z thomas $
- */
-
-/** Zend_Locale */
-require_once 'Zend/Locale.php';
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Translation view helper
- *
- * @category  Zend
- * @package   Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract
-{
-    /**
-     * Translation object
-     *
-     * @var Zend_Translate_Adapter
-     */
-    protected $_translator;
-
-    /**
-     * Constructor for manually handling
-     *
-     * @param Zend_Translate|Zend_Translate_Adapter $translate Instance of Zend_Translate
-     */
-    public function __construct($translate = null)
-    {
-        if ($translate !== null) {
-            $this->setTranslator($translate);
-        }
-    }
-
-    /**
-     * Translate a message
-     * You can give multiple params or an array of params.
-     * If you want to output another locale just set it as last single parameter
-     * Example 1: translate('%1\$s + %2\$s', $value1, $value2, $locale);
-     * Example 2: translate('%1\$s + %2\$s', array($value1, $value2), $locale);
-     *
-     * @param  string $messageid Id of the message to be translated
-     * @return string|Zend_View_Helper_Translate Translated message
-     */
-    public function translate($messageid = null)
-    {
-        if ($messageid === null) {
-            return $this;
-        }
-
-        $translate = $this->getTranslator();
-        $options   = func_get_args();
-
-        array_shift($options);
-        $count  = count($options);
-        $locale = null;
-        if ($count > 0) {
-            if (Zend_Locale::isLocale($options[($count - 1)], null, false) !== false) {
-                $locale = array_pop($options);
-            }
-        }
-
-        if ((count($options) === 1) and (is_array($options[0]) === true)) {
-            $options = $options[0];
-        }
-
-        if ($translate !== null) {
-            $messageid = $translate->translate($messageid, $locale);
-        }
-
-        if (count($options) === 0) {
-            return $messageid;
-        }
-
-        return vsprintf($messageid, $options);
-    }
-
-    /**
-     * Sets a translation Adapter for translation
-     *
-     * @param  Zend_Translate|Zend_Translate_Adapter $translate Instance of Zend_Translate
-     * @throws Zend_View_Exception When no or a false instance was set
-     * @return Zend_View_Helper_Translate
-     */
-    public function setTranslator($translate)
-    {
-        if ($translate instanceof Zend_Translate_Adapter) {
-            $this->_translator = $translate;
-        } else if ($translate instanceof Zend_Translate) {
-            $this->_translator = $translate->getAdapter();
-        } else {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Retrieve translation object
-     *
-     * @return Zend_Translate_Adapter|null
-     */
-    public function getTranslator()
-    {
-        if ($this->_translator === null) {
-            require_once 'Zend/Registry.php';
-            if (Zend_Registry::isRegistered('Zend_Translate')) {
-                $this->setTranslator(Zend_Registry::get('Zend_Translate'));
-            }
-        }
-
-        return $this->_translator;
-    }
-
-    /**
-     * Set's an new locale for all further translations
-     *
-     * @param  string|Zend_Locale $locale New locale to set
-     * @throws Zend_View_Exception When no Zend_Translate instance was set
-     * @return Zend_View_Helper_Translate
-     */
-    public function setLocale($locale = null)
-    {
-        $translate = $this->getTranslator();
-        if ($translate === null) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        $translate->setLocale($locale);
-        return $this;
-    }
-
-    /**
-     * Returns the set locale for translations
-     *
-     * @throws Zend_View_Exception When no Zend_Translate instance was set
-     * @return string|Zend_Locale
-     */
-    public function getLocale()
-    {
-        $translate = $this->getTranslator();
-        if ($translate === null) {
-            require_once 'Zend/View/Exception.php';
-            $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter');
-            $e->setView($this->view);
-            throw $e;
-        }
-
-        return $translate->getLocale();
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Helper/Url.php b/airtime_mvc/library/Zend/View/Helper/Url.php
deleted file mode 100644
index 1932f0357..000000000
--- a/airtime_mvc/library/Zend/View/Helper/Url.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/** Zend_View_Helper_Abstract.php */
-require_once 'Zend/View/Helper/Abstract.php';
-
-/**
- * Helper for making easy links and getting urls that depend on the routes and router
- *
- * @package    Zend_View
- * @subpackage Helper
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Helper_Url extends Zend_View_Helper_Abstract
-{
-    /**
-     * Generates an url given the name of a route.
-     *
-     * @access public
-     *
-     * @param  array $urlOptions Options passed to the assemble method of the Route object.
-     * @param  mixed $name The name of a Route to use. If null it will use the current Route
-     * @param  bool $reset Whether or not to reset the route defaults with those provided
-     * @return string Url for the link href attribute.
-     */
-    public function url(array $urlOptions = array(), $name = null, $reset = false, $encode = true)
-    {
-        $router = Zend_Controller_Front::getInstance()->getRouter();
-        return $router->assemble($urlOptions, $name, $reset, $encode);
-    }
-}
diff --git a/airtime_mvc/library/Zend/View/Interface.php b/airtime_mvc/library/Zend/View/Interface.php
deleted file mode 100644
index 501535e82..000000000
--- a/airtime_mvc/library/Zend/View/Interface.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20210 2010-01-12 02:06:34Z yoshida@zend.co.jp $
- */
-
-
-/**
- * Interface class for Zend_View compatible template engine implementations
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_View_Interface
-{
-    /**
-     * Return the template engine object, if any
-     *
-     * If using a third-party template engine, such as Smarty, patTemplate,
-     * phplib, etc, return the template engine object. Useful for calling
-     * methods on these objects, such as for setting filters, modifiers, etc.
-     *
-     * @return mixed
-     */
-    public function getEngine();
-
-    /**
-     * Set the path to find the view script used by render()
-     *
-     * @param string|array The directory (-ies) to set as the path. Note that
-     * the concrete view implentation may not necessarily support multiple
-     * directories.
-     * @return void
-     */
-    public function setScriptPath($path);
-
-    /**
-     * Retrieve all view script paths
-     *
-     * @return array
-     */
-    public function getScriptPaths();
-
-    /**
-     * Set a base path to all view resources
-     *
-     * @param  string $path
-     * @param  string $classPrefix
-     * @return void
-     */
-    public function setBasePath($path, $classPrefix = 'Zend_View');
-
-    /**
-     * Add an additional path to view resources
-     *
-     * @param  string $path
-     * @param  string $classPrefix
-     * @return void
-     */
-    public function addBasePath($path, $classPrefix = 'Zend_View');
-
-    /**
-     * Assign a variable to the view
-     *
-     * @param string $key The variable name.
-     * @param mixed $val The variable value.
-     * @return void
-     */
-    public function __set($key, $val);
-
-    /**
-     * Allows testing with empty() and isset() to work
-     *
-     * @param string $key
-     * @return boolean
-     */
-    public function __isset($key);
-
-    /**
-     * Allows unset() on object properties to work
-     *
-     * @param string $key
-     * @return void
-     */
-    public function __unset($key);
-
-    /**
-     * Assign variables to the view script via differing strategies.
-     *
-     * Suggested implementation is to allow setting a specific key to the
-     * specified value, OR passing an array of key => value pairs to set en
-     * masse.
-     *
-     * @see __set()
-     * @param string|array $spec The assignment strategy to use (key or array of key
-     * => value pairs)
-     * @param mixed $value (Optional) If assigning a named variable, use this
-     * as the value.
-     * @return void
-     */
-    public function assign($spec, $value = null);
-
-    /**
-     * Clear all assigned variables
-     *
-     * Clears all variables assigned to Zend_View either via {@link assign()} or
-     * property overloading ({@link __get()}/{@link __set()}).
-     *
-     * @return void
-     */
-    public function clearVars();
-
-    /**
-     * Processes a view script and returns the output.
-     *
-     * @param string $name The script name to process.
-     * @return string The script output.
-     */
-    public function render($name);
-}
diff --git a/airtime_mvc/library/Zend/View/Stream.php b/airtime_mvc/library/Zend/View/Stream.php
deleted file mode 100644
index f4869ddc9..000000000
--- a/airtime_mvc/library/Zend/View/Stream.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Stream wrapper to convert markup of mostly-PHP templates into PHP prior to
- * include().
- *
- * Based in large part on the example at
- * http://www.php.net/manual/en/function.stream-wrapper-register.php
- *
- * As well as the example provided at:
- *     http://mikenaberezny.com/2006/02/19/symphony-templates-ruby-erb/
- * written by
- *     Mike Naberezny (@link http://mikenaberezny.com)
- *     Paul M. Jones  (@link http://paul-m-jones.com)
- *
- * @category   Zend
- * @package    Zend_View
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_View_Stream
-{
-    /**
-     * Current stream position.
-     *
-     * @var int
-     */
-    protected $_pos = 0;
-
-    /**
-     * Data for streaming.
-     *
-     * @var string
-     */
-    protected $_data;
-
-    /**
-     * Stream stats.
-     *
-     * @var array
-     */
-    protected $_stat;
-
-    /**
-     * Opens the script file and converts markup.
-     */
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        // get the view script source
-        $path        = str_replace('zend.view://', '', $path);
-        $this->_data = file_get_contents($path);
-
-        /**
-         * If reading the file failed, update our local stat store
-         * to reflect the real stat of the file, then return on failure
-         */
-        if ($this->_data === false) {
-            $this->_stat = stat($path);
-            return false;
-        }
-
-        /**
-         * Convert <?= ?> to long-form <?php echo ?> and <? ?> to <?php ?>
-         *
-         */
-        $this->_data = preg_replace('/\<\?\=/',          "<?php echo ",  $this->_data);
-        $this->_data = preg_replace('/<\?(?!xml|php)/s', '<?php ',       $this->_data);
-
-        /**
-         * file_get_contents() won't update PHP's stat cache, so we grab a stat
-         * of the file to prevent additional reads should the script be
-         * requested again, which will make include() happy.
-         */
-        $this->_stat = stat($path);
-
-        return true;
-    }
-
-    /**
-     * Included so that __FILE__ returns the appropriate info
-     *
-     * @return array
-     */
-    public function url_stat()
-    {
-        return $this->_stat;
-    }
-
-    /**
-     * Reads from the stream.
-     */
-    public function stream_read($count)
-    {
-        $ret = substr($this->_data, $this->_pos, $count);
-        $this->_pos += strlen($ret);
-        return $ret;
-    }
-
-
-    /**
-     * Tells the current position in the stream.
-     */
-    public function stream_tell()
-    {
-        return $this->_pos;
-    }
-
-
-    /**
-     * Tells if we are at the end of the stream.
-     */
-    public function stream_eof()
-    {
-        return $this->_pos >= strlen($this->_data);
-    }
-
-
-    /**
-     * Stream statistics.
-     */
-    public function stream_stat()
-    {
-        return $this->_stat;
-    }
-
-
-    /**
-     * Seek to a specific point in the stream.
-     */
-    public function stream_seek($offset, $whence)
-    {
-        switch ($whence) {
-            case SEEK_SET:
-                if ($offset < strlen($this->_data) && $offset >= 0) {
-                $this->_pos = $offset;
-                    return true;
-                } else {
-                    return false;
-                }
-                break;
-
-            case SEEK_CUR:
-                if ($offset >= 0) {
-                    $this->_pos += $offset;
-                    return true;
-                } else {
-                    return false;
-                }
-                break;
-
-            case SEEK_END:
-                if (strlen($this->_data) + $offset >= 0) {
-                    $this->_pos = strlen($this->_data) + $offset;
-                    return true;
-                } else {
-                    return false;
-                }
-                break;
-
-            default:
-                return false;
-        }
-    }
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Channel/HttpHeaders.php b/airtime_mvc/library/Zend/Wildfire/Channel/HttpHeaders.php
deleted file mode 100644
index 5ef70798a..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Channel/HttpHeaders.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Channel
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpHeaders.php 21353 2010-03-06 02:21:47Z cadorn $
- */
-
-/** Zend_Wildfire_Channel_Interface */
-require_once 'Zend/Wildfire/Channel/Interface.php';
-
-/** Zend_Controller_Request_Abstract */
-require_once('Zend/Controller/Request/Abstract.php');
-
-/** Zend_Controller_Response_Abstract */
-require_once('Zend/Controller/Response/Abstract.php');
-
-/** Zend_Controller_Plugin_Abstract */
-require_once 'Zend/Controller/Plugin/Abstract.php';
-
-/** Zend_Wildfire_Protocol_JsonStream */
-require_once 'Zend/Wildfire/Protocol/JsonStream.php';
-
-/** Zend_Controller_Front **/
-require_once 'Zend/Controller/Front.php';
-
-/**
- * Implements communication via HTTP request and response headers for Wildfire Protocols.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Channel
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract implements Zend_Wildfire_Channel_Interface
-{
-    /**
-     * The string to be used to prefix the headers.
-     * @var string
-     */
-    protected static $_headerPrefix = 'X-WF-';
-
-    /**
-     * Singleton instance
-     * @var Zend_Wildfire_Channel_HttpHeaders
-     */
-    protected static $_instance = null;
-
-    /**
-     * The index of the plugin in the controller dispatch loop plugin stack
-     * @var integer
-     */
-    protected static $_controllerPluginStackIndex = 999;
-
-    /**
-     * The protocol instances for this channel
-     * @var array
-     */
-    protected $_protocols = null;
-
-    /**
-     * Initialize singleton instance.
-     *
-     * @param string $class OPTIONAL Subclass of Zend_Wildfire_Channel_HttpHeaders
-     * @return Zend_Wildfire_Channel_HttpHeaders Returns the singleton Zend_Wildfire_Channel_HttpHeaders instance
-     * @throws Zend_Wildfire_Exception
-     */
-    public static function init($class = null)
-    {
-        if (self::$_instance !== null) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Channel_HttpHeaders already exists!');
-        }
-        if ($class !== null) {
-            if (!is_string($class)) {
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Third argument is not a class string');
-            }
-
-            if (!class_exists($class)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($class);
-            }
-
-            self::$_instance = new $class();
-
-            if (!self::$_instance instanceof Zend_Wildfire_Channel_HttpHeaders) {
-                self::$_instance = null;
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Channel_HttpHeaders.');
-            }
-        } else {
-            self::$_instance = new self();
-        }
-
-        return self::$_instance;
-    }
-
-
-    /**
-     * Get or create singleton instance
-     *
-     * @param $skipCreate boolean True if an instance should not be created
-     * @return Zend_Wildfire_Channel_HttpHeaders
-     */
-    public static function getInstance($skipCreate=false)
-    {
-        if (self::$_instance===null && $skipCreate!==true) {
-            return self::init();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Destroys the singleton instance
-     *
-     * Primarily used for testing.
-     *
-     * @return void
-     */
-    public static function destroyInstance()
-    {
-        self::$_instance = null;
-    }
-
-    /**
-     * Get the instance of a give protocol for this channel
-     *
-     * @param string $uri The URI for the protocol
-     * @return object Returns the protocol instance for the diven URI
-     */
-    public function getProtocol($uri)
-    {
-        if (!isset($this->_protocols[$uri])) {
-            $this->_protocols[$uri] = $this->_initProtocol($uri);
-        }
-
-        $this->_registerControllerPlugin();
-
-        return $this->_protocols[$uri];
-    }
-
-    /**
-     * Initialize a new protocol
-     *
-     * @param string $uri The URI for the protocol to be initialized
-     * @return object Returns the new initialized protocol instance
-     * @throws Zend_Wildfire_Exception
-     */
-    protected function _initProtocol($uri)
-    {
-        switch ($uri) {
-            case Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI;
-                return new Zend_Wildfire_Protocol_JsonStream();
-        }
-        require_once 'Zend/Wildfire/Exception.php';
-        throw new Zend_Wildfire_Exception('Tyring to initialize unknown protocol for URI "'.$uri.'".');
-    }
-
-
-    /**
-     * Flush all data from all protocols and send all data to response headers.
-     *
-     * @return boolean Returns TRUE if data was flushed
-     */
-    public function flush()
-    {
-        if (!$this->_protocols || !$this->isReady()) {
-            return false;
-        }
-
-        foreach ( $this->_protocols as $protocol ) {
-
-            $payload = $protocol->getPayload($this);
-
-            if ($payload) {
-                foreach( $payload as $message ) {
-
-                    $this->getResponse()->setHeader(self::$_headerPrefix.$message[0],
-                                                    $message[1], true);
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Set the index of the plugin in the controller dispatch loop plugin stack
-     *
-     * @param integer $index The index of the plugin in the stack
-     * @return integer The previous index.
-     */
-    public static function setControllerPluginStackIndex($index)
-    {
-        $previous = self::$_controllerPluginStackIndex;
-        self::$_controllerPluginStackIndex = $index;
-        return $previous;
-    }
-
-    /**
-     * Register this object as a controller plugin.
-     *
-     * @return void
-     */
-    protected function _registerControllerPlugin()
-    {
-        $controller = Zend_Controller_Front::getInstance();
-        if (!$controller->hasPlugin(get_class($this))) {
-            $controller->registerPlugin($this, self::$_controllerPluginStackIndex);
-        }
-    }
-
-
-    /*
-     * Zend_Wildfire_Channel_Interface
-     */
-
-    /**
-     * Determine if channel is ready.
-     *
-     * The channel is ready as long as the request and response objects are initialized,
-     * can send headers and the FirePHP header exists in the User-Agent.
-     *
-     * If the header does not exist in the User-Agent, no appropriate client
-     * is making this request and the messages should not be sent.
-     *
-     * A timing issue arises when messages are logged before the request/response
-     * objects are initialized. In this case we do not yet know if the client
-     * will be able to accept the messages. If we consequently indicate that
-     * the channel is not ready, these messages will be dropped which is in
-     * most cases not the intended behaviour. The intent is to send them at the
-     * end of the request when the request/response objects will be available
-     * for sure.
-     *
-     * If the request/response objects are not yet initialized we assume if messages are
-     * logged, the client will be able to receive them. As soon as the request/response
-     * objects are availoable and a message is logged this assumption is challenged.
-     * If the client cannot accept the messages any further messages are dropped
-     * and messages sent prior are kept but discarded when the channel is finally
-     * flushed at the end of the request.
-     *
-     * When the channel is flushed the $forceCheckRequest option is used to force
-     * a check of the request/response objects. This is the last verification to ensure
-     * messages are only sent when the client can accept them.
-     *
-     * @param boolean $forceCheckRequest OPTIONAL Set to TRUE if the request must be checked
-     * @return boolean Returns TRUE if channel is ready.
-     */
-    public function isReady($forceCheckRequest=false)
-    {
-        if (!$forceCheckRequest
-            && !$this->_request
-            && !$this->_response
-        ) {
-            return true;
-        }
-        
-        return ($this->getResponse()->canSendHeaders()
-                && (preg_match_all(
-                        '/\s?FirePHP\/([\.\d]*)\s?/si',
-                        $this->getRequest()->getHeader('User-Agent'),
-                        $m
-                    ) ||
-                    (($header = $this->getRequest()->getHeader('X-FirePHP-Version'))
-                     && preg_match_all('/^([\.\d]*)$/si', $header, $m)
-                   ))
-               );
-    }
-
-
-    /*
-     * Zend_Controller_Plugin_Abstract
-     */
-
-    /**
-     * Flush messages to headers as late as possible but before headers have been sent.
-     *
-     * @return void
-     */
-    public function dispatchLoopShutdown()
-    {
-        $this->flush();
-    }
-
-    /**
-     * Get the request object
-     *
-     * @return Zend_Controller_Request_Abstract
-     * @throws Zend_Wildfire_Exception
-     */
-    public function getRequest()
-    {
-        if (!$this->_request) {
-            $controller = Zend_Controller_Front::getInstance();
-            $this->setRequest($controller->getRequest());
-        }
-        if (!$this->_request) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Request objects not initialized.');
-        }
-        return $this->_request;
-    }
-
-    /**
-     * Get the response object
-     *
-     * @return Zend_Controller_Response_Abstract
-     * @throws Zend_Wildfire_Exception
-     */
-    public function getResponse()
-    {
-        if (!$this->_response) {
-            $response = Zend_Controller_Front::getInstance()->getResponse();
-            if ($response) {
-                $this->setResponse($response);
-            }
-        }
-        if (!$this->_response) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Response objects not initialized.');
-        }
-        return $this->_response;
-    }
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Channel/Interface.php b/airtime_mvc/library/Zend/Wildfire/Channel/Interface.php
deleted file mode 100644
index 46c9bf2ab..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Channel/Interface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Wildfire_Channel_Interface
-{
-
-    /**
-     * Determine if channel is ready.
-     *
-     * @return boolean Returns TRUE if channel is ready.
-     */
-    public function isReady();
-
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Exception.php b/airtime_mvc/library/Zend/Wildfire/Exception.php
deleted file mode 100644
index a5e96a371..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Exception.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-
-/** Zend_Exception */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Wildfire
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp.php b/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp.php
deleted file mode 100644
index 77275625c..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp.php
+++ /dev/null
@@ -1,800 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FirePhp.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Controller_Request_Abstract */
-require_once('Zend/Controller/Request/Abstract.php');
-
-/** Zend_Controller_Response_Abstract */
-require_once('Zend/Controller/Response/Abstract.php');
-
-/** Zend_Wildfire_Channel_HttpHeaders */
-require_once 'Zend/Wildfire/Channel/HttpHeaders.php';
-
-/** Zend_Wildfire_Protocol_JsonStream */
-require_once 'Zend/Wildfire/Protocol/JsonStream.php';
-
-/** Zend_Wildfire_Plugin_Interface */
-require_once 'Zend/Wildfire/Plugin/Interface.php';
-
-/**
- * Primary class for communicating with the FirePHP Firefox Extension.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
-{
-    /**
-     * Plain log style.
-     */
-    const LOG = 'LOG';
-
-    /**
-     * Information style.
-     */
-    const INFO = 'INFO';
-
-    /**
-     * Warning style.
-     */
-    const WARN = 'WARN';
-
-    /**
-     * Error style that increments Firebug's error counter.
-     */
-    const ERROR = 'ERROR';
-
-    /**
-     * Trace style showing message and expandable full stack trace.
-     */
-    const TRACE = 'TRACE';
-
-    /**
-     * Exception style showing message and expandable full stack trace.
-     * Also increments Firebug's error counter.
-     */
-    const EXCEPTION = 'EXCEPTION';
-
-    /**
-     * Table style showing summary line and expandable table
-     */
-    const TABLE = 'TABLE';
-
-    /**
-     * Dump variable to Server panel in Firebug Request Inspector
-     */
-    const DUMP = 'DUMP';
-
-    /**
-     * Start a group in the Firebug Console
-     */
-    const GROUP_START = 'GROUP_START';
-
-    /**
-     * End a group in the Firebug Console
-     */
-    const GROUP_END = 'GROUP_END';
-
-    /**
-     * The plugin URI for this plugin
-     */
-    const PLUGIN_URI = 'http://meta.firephp.org/Wildfire/Plugin/ZendFramework/FirePHP/1.6.2';
-
-    /**
-     * The protocol URI for this plugin
-     */
-    const PROTOCOL_URI = Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI;
-
-    /**
-     * The structure URI for the Dump structure
-     */
-    const STRUCTURE_URI_DUMP = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1';
-
-    /**
-     * The structure URI for the Firebug Console structure
-     */
-    const STRUCTURE_URI_FIREBUGCONSOLE = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1';
-
-    /**
-     * Singleton instance
-     * @var Zend_Wildfire_Plugin_FirePhp
-     */
-    protected static $_instance = null;
-
-    /**
-     * Flag indicating whether FirePHP should send messages to the user-agent.
-     * @var boolean
-     */
-    protected $_enabled = true;
-
-    /**
-     * The channel via which to send the encoded messages.
-     * @var Zend_Wildfire_Channel_Interface
-     */
-    protected $_channel = null;
-
-    /**
-     * Messages that are buffered to be sent when protocol flushes
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * Options for the object
-     * @var array
-     */
-    protected $_options = array(
-        'traceOffset' => 1, /* The offset in the trace which identifies the source of the message */
-        'maxTraceDepth' => 99, /* Maximum depth for stack traces */
-        'maxObjectDepth' => 10, /* The maximum depth to traverse objects when encoding */
-        'maxArrayDepth' => 20, /* The maximum depth to traverse nested arrays when encoding */
-        'includeLineNumbers' => true /* Whether to include line and file info for each message */
-    );
-
-    /**
-     * Filters used to exclude object members when encoding
-     * @var array
-     */
-    protected $_objectFilters = array();
-
-    /**
-     * A stack of objects used during encoding to detect recursion
-     * @var array
-     */
-    protected $_objectStack = array();
-
-    /**
-     * Create singleton instance.
-     *
-     * @param string $class OPTIONAL Subclass of Zend_Wildfire_Plugin_FirePhp
-     * @return Zend_Wildfire_Plugin_FirePhp Returns the singleton Zend_Wildfire_Plugin_FirePhp instance
-     * @throws Zend_Wildfire_Exception
-     */
-    public static function init($class = null)
-    {
-        if (self::$_instance !== null) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Plugin_FirePhp already exists!');
-        }
-        if ($class !== null) {
-            if (!is_string($class)) {
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Third argument is not a class string');
-            }
-
-            if (!class_exists($class)) {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($class);
-            }
-            self::$_instance = new $class();
-            if (!self::$_instance instanceof Zend_Wildfire_Plugin_FirePhp) {
-                self::$_instance = null;
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Plugin_FirePhp.');
-            }
-        } else {
-            self::$_instance = new self();
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * Constructor
-     * @return void
-     */
-    protected function __construct()
-    {
-        $this->_channel = Zend_Wildfire_Channel_HttpHeaders::getInstance();
-        $this->_channel->getProtocol(self::PROTOCOL_URI)->registerPlugin($this);
-    }
-
-    /**
-     * Get or create singleton instance
-     *
-     * @param $skipCreate boolean True if an instance should not be created
-     * @return Zend_Wildfire_Plugin_FirePhp
-     */
-    public static function getInstance($skipCreate=false)
-    {
-        if (self::$_instance===null && $skipCreate!==true) {
-            return self::init();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * Destroys the singleton instance
-     *
-     * Primarily used for testing.
-     *
-     * @return void
-     */
-    public static function destroyInstance()
-    {
-        self::$_instance = null;
-    }
-
-    /**
-     * Enable or disable sending of messages to user-agent.
-     * If disabled all headers to be sent will be removed.
-     *
-     * @param boolean $enabled Set to TRUE to enable sending of messages.
-     * @return boolean The previous value.
-     */
-    public function setEnabled($enabled)
-    {
-        $previous = $this->_enabled;
-        $this->_enabled = $enabled;
-        if (!$this->_enabled) {
-            $this->_messages = array();
-            $this->_channel->getProtocol(self::PROTOCOL_URI)->clearMessages($this);
-        }
-        return $previous;
-    }
-
-    /**
-     * Determine if logging to user-agent is enabled.
-     *
-     * @return boolean Returns TRUE if logging is enabled.
-     */
-    public function getEnabled()
-    {
-        return $this->_enabled;
-    }
-
-    /**
-     * Set a single option
-     *
-     * @param  string $key The name of the option
-     * @param  mixed $value The value of the option
-     * @return mixed The previous value of the option
-     */
-    public function setOption($key, $value)
-    {
-      if (!array_key_exists($key,$this->_options)) {
-        throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
-      }
-      $previous = $this->_options[$key];
-      $this->_options[$key] = $value;
-      return $previous;
-    }
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $key The name of the option
-     * @return mixed The value of the option
-     */
-    public function getOption($key)
-    {
-      if (!array_key_exists($key,$this->_options)) {
-        throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
-      }
-      return $this->_options[$key];
-    }
-
-    /**
-     * Retrieve all options
-     *
-     * @return array All options
-     */
-    public function getOptions()
-    {
-      return $this->_options;
-    }
-
-    /**
-     * Specify a filter to be used when encoding an object
-     *
-     * Filters are used to exclude object members.
-     *
-     * @param string $Class The class name of the object
-     * @param array $Filter An array of members to exclude
-     * @return void
-     */
-    public function setObjectFilter($class, $filter) {
-      $this->_objectFilters[$class] = $filter;
-    }
-
-    /**
-     * Starts a group in the Firebug Console
-     *
-     * @param string $title The title of the group
-     * @return TRUE if the group instruction was added to the response headers or buffered.
-     */
-    public static function group($title)
-    {
-        return self::send(null, $title, self::GROUP_START);
-    }
-
-    /**
-     * Ends a group in the Firebug Console
-     *
-     * @return TRUE if the group instruction was added to the response headers or buffered.
-     */
-    public static function groupEnd()
-    {
-        return self::send(null, null, self::GROUP_END);
-    }
-
-    /**
-     * Logs variables to the Firebug Console
-     * via HTTP response headers and the FirePHP Firefox Extension.
-     *
-     * @param  mixed  $var   The variable to log.
-     * @param  string  $label OPTIONAL Label to prepend to the log event.
-     * @param  string  $style  OPTIONAL Style of the log event.
-     * @param  array  $options OPTIONAL Options to change how messages are processed and sent
-     * @return boolean Returns TRUE if the variable was added to the response headers or buffered.
-     * @throws Zend_Wildfire_Exception
-     */
-    public static function send($var, $label=null, $style=null, $options=array())
-    {
-        $firephp = self::getInstance();
-
-        if (!$firephp->getEnabled()) {
-            return false;
-        }
-
-        if ($var instanceof Zend_Wildfire_Plugin_FirePhp_Message) {
-
-            if ($var->getBuffered()) {
-                if (!in_array($var, self::$_instance->_messages)) {
-                    self::$_instance->_messages[] = $var;
-                }
-                return true;
-            }
-
-            if ($var->getDestroy()) {
-                return false;
-            }
-
-            $style = $var->getStyle();
-            $label = $var->getLabel();
-            $options = $var->getOptions();
-            $var = $var->getMessage();
-        }
-
-        if (!self::$_instance->_channel->isReady()) {
-            return false;
-        }
-
-        foreach ($options as $name => $value) {
-            if ($value===null) {
-                unset($options[$name]);
-            }
-        }
-        $options = array_merge($firephp->getOptions(), $options);
-
-        $trace = null;
-
-        $skipFinalEncode = false;
-
-        $meta = array();
-        $meta['Type'] = $style;
-
-        if ($var instanceof Exception) {
-
-            $eTrace = $var->getTrace();
-            $eTrace = array_splice($eTrace, 0, $options['maxTraceDepth']);
-
-            $var = array('Class'=>get_class($var),
-                         'Message'=>$var->getMessage(),
-                         'File'=>$var->getFile(),
-                         'Line'=>$var->getLine(),
-                         'Type'=>'throw',
-                         'Trace'=>$firephp->_encodeTrace($eTrace));
-
-            $meta['Type'] = self::EXCEPTION;
-
-            $skipFinalEncode = true;
-
-        } else
-        if ($meta['Type']==self::TRACE) {
-
-            if (!$label && $var) {
-                $label = $var;
-                $var = null;
-            }
-
-            if (!$trace) {
-                $trace = $firephp->_getStackTrace(array_merge($options,
-                                                              array('maxTraceDepth'=>$options['maxTraceDepth']+1)));
-            }
-
-            $var = array('Class'=>$trace[0]['class'],
-                         'Type'=>$trace[0]['type'],
-                         'Function'=>$trace[0]['function'],
-                         'Message'=>$label,
-                         'File'=>isset($trace[0]['file'])?$trace[0]['file']:'',
-                         'Line'=>isset($trace[0]['line'])?$trace[0]['line']:'',
-                         'Args'=>isset($trace[0]['args'])?$firephp->_encodeObject($trace[0]['args']):'',
-                         'Trace'=>$firephp->_encodeTrace(array_splice($trace,1)));
-
-          $skipFinalEncode = true;
-
-        } else
-        if ($meta['Type']==self::TABLE) {
-
-          $var = $firephp->_encodeTable($var);
-
-          $skipFinalEncode = true;
-
-        } else {
-            if ($meta['Type']===null) {
-                $meta['Type'] = self::LOG;
-            }
-        }
-
-        if ($label!=null) {
-            $meta['Label'] = $label;
-        }
-
-        switch ($meta['Type']) {
-            case self::LOG:
-            case self::INFO:
-            case self::WARN:
-            case self::ERROR:
-            case self::EXCEPTION:
-            case self::TRACE:
-            case self::TABLE:
-            case self::DUMP:
-            case self::GROUP_START:
-            case self::GROUP_END:
-                break;
-            default:
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Log style "'.$meta['Type'].'" not recognized!');
-                break;
-        }
-
-        if ($meta['Type'] != self::DUMP && $options['includeLineNumbers']) {
-            if (!isset($meta['File']) || !isset($meta['Line'])) {
-
-                if (!$trace) {
-                    $trace = $firephp->_getStackTrace($options);
-                }
-
-                $meta['File'] = isset($trace[0]['file'])?$trace[0]['file']:'';
-                $meta['Line'] = isset($trace[0]['line'])?$trace[0]['line']:'';
-
-            }
-        } else {
-            unset($meta['File']);
-            unset($meta['Line']);
-        }
-
-        if ($meta['Type'] == self::DUMP) {
-
-          return $firephp->_recordMessage(self::STRUCTURE_URI_DUMP,
-                                          array('key'=>$meta['Label'],
-                                                'data'=>$var),
-                                          $skipFinalEncode);
-
-        } else {
-
-          return $firephp->_recordMessage(self::STRUCTURE_URI_FIREBUGCONSOLE,
-                                          array('data'=>$var,
-                                                'meta'=>$meta),
-                                          $skipFinalEncode);
-        }
-    }
-
-    /**
-     * Gets a stack trace
-     *
-     * @param array $options Options to change how the stack trace is returned
-     * @return array The stack trace
-     */
-    protected function _getStackTrace($options)
-    {
-        $trace = debug_backtrace();
-
-        return array_splice($trace, $options['traceOffset'], $options['maxTraceDepth']);
-    }
-
-    /**
-     * Record a message with the given data in the given structure
-     *
-     * @param string $structure The structure to be used for the data
-     * @param array $data The data to be recorded
-     * @param boolean $skipEncode TRUE if variable encoding should be skipped
-     * @return boolean Returns TRUE if message was recorded
-     * @throws Zend_Wildfire_Exception
-     */
-    protected function _recordMessage($structure, $data, $skipEncode=false)
-    {
-        switch($structure) {
-
-            case self::STRUCTURE_URI_DUMP:
-
-                if (!isset($data['key'])) {
-                    require_once 'Zend/Wildfire/Exception.php';
-                    throw new Zend_Wildfire_Exception('You must supply a key.');
-                }
-                if (!array_key_exists('data',$data)) {
-                    require_once 'Zend/Wildfire/Exception.php';
-                    throw new Zend_Wildfire_Exception('You must supply data.');
-                }
-
-                $value = $data['data'];
-                if (!$skipEncode) {
-                  $value = $this->_encodeObject($data['data']);
-                }
-
-                return $this->_channel->getProtocol(self::PROTOCOL_URI)->
-                           recordMessage($this,
-                                         $structure,
-                                         array($data['key']=>$value));
-
-            case self::STRUCTURE_URI_FIREBUGCONSOLE:
-
-                if (!isset($data['meta']) ||
-                    !is_array($data['meta']) ||
-                    !array_key_exists('Type',$data['meta'])) {
-
-                    require_once 'Zend/Wildfire/Exception.php';
-                    throw new Zend_Wildfire_Exception('You must supply a "Type" in the meta information.');
-                }
-                if (!array_key_exists('data',$data)) {
-                    require_once 'Zend/Wildfire/Exception.php';
-                    throw new Zend_Wildfire_Exception('You must supply data.');
-                }
-
-                $value = $data['data'];
-                if (!$skipEncode) {
-                  $value = $this->_encodeObject($data['data']);
-                }
-
-                return $this->_channel->getProtocol(self::PROTOCOL_URI)->
-                           recordMessage($this,
-                                         $structure,
-                                         array($data['meta'],
-                                               $value));
-
-            default:
-                require_once 'Zend/Wildfire/Exception.php';
-                throw new Zend_Wildfire_Exception('Structure of name "'.$structure.'" is not recognized.');
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * Encodes a table by encoding each row and column with _encodeObject()
-     *
-     * @param array $Table The table to be encoded
-     * @return array
-     */
-    protected function _encodeTable($table)
-    {
-      if (!$table) {
-          return $table;
-      }
-      for ($i=0 ; $i<count($table) ; $i++) {
-          if (is_array($table[$i])) {
-              for ($j=0 ; $j<count($table[$i]) ; $j++) {
-                  $table[$i][$j] = $this->_encodeObject($table[$i][$j]);
-              }
-          }
-        }
-      return $table;
-    }
-
-    /**
-     * Encodes a trace by encoding all "args" with _encodeObject()
-     *
-     * @param array $Trace The trace to be encoded
-     * @return array The encoded trace
-     */
-    protected function _encodeTrace($trace)
-    {
-      if (!$trace) {
-          return $trace;
-      }
-      for ($i=0 ; $i<sizeof($trace) ; $i++) {
-          if (isset($trace[$i]['args'])) {
-              $trace[$i]['args'] = $this->_encodeObject($trace[$i]['args']);
-          }
-      }
-      return $trace;
-    }
-
-    /**
-     * Encode an object by generating an array containing all object members.
-     *
-     * All private and protected members are included. Some meta info about
-     * the object class is added.
-     *
-     * @param mixed $object The object/array/value to be encoded
-     * @return array The encoded object
-     */
-    protected function _encodeObject($object, $objectDepth = 1, $arrayDepth = 1)
-    {
-        $return = array();
-
-        if (is_resource($object)) {
-
-            return '** '.(string)$object.' **';
-
-        } else
-        if (is_object($object)) {
-
-            if ($objectDepth > $this->_options['maxObjectDepth']) {
-              return '** Max Object Depth ('.$this->_options['maxObjectDepth'].') **';
-            }
-
-            foreach ($this->_objectStack as $refVal) {
-                if ($refVal === $object) {
-                    return '** Recursion ('.get_class($object).') **';
-                }
-            }
-            array_push($this->_objectStack, $object);
-
-            $return['__className'] = $class = get_class($object);
-
-            $reflectionClass = new ReflectionClass($class);
-            $properties = array();
-            foreach ( $reflectionClass->getProperties() as $property) {
-                $properties[$property->getName()] = $property;
-            }
-
-            $members = (array)$object;
-
-            foreach ($properties as $just_name => $property) {
-
-                $name = $raw_name = $just_name;
-
-                if ($property->isStatic()) {
-                    $name = 'static:'.$name;
-                }
-                if ($property->isPublic()) {
-                    $name = 'public:'.$name;
-                } else
-                if ($property->isPrivate()) {
-                    $name = 'private:'.$name;
-                    $raw_name = "\0".$class."\0".$raw_name;
-                } else
-                if ($property->isProtected()) {
-                    $name = 'protected:'.$name;
-                    $raw_name = "\0".'*'."\0".$raw_name;
-                }
-
-                if (!(isset($this->_objectFilters[$class])
-                      && is_array($this->_objectFilters[$class])
-                      && in_array($just_name,$this->_objectFilters[$class]))) {
-
-                    if (array_key_exists($raw_name,$members)
-                        && !$property->isStatic()) {
-
-                        $return[$name] = $this->_encodeObject($members[$raw_name], $objectDepth + 1, 1);
-
-                    } else {
-                        if (method_exists($property,'setAccessible')) {
-                            $property->setAccessible(true);
-                            $return[$name] = $this->_encodeObject($property->getValue($object), $objectDepth + 1, 1);
-                        } else
-                        if ($property->isPublic()) {
-                            $return[$name] = $this->_encodeObject($property->getValue($object), $objectDepth + 1, 1);
-                        } else {
-                            $return[$name] = '** Need PHP 5.3 to get value **';
-                        }
-                    }
-                } else {
-                  $return[$name] = '** Excluded by Filter **';
-                }
-            }
-
-            // Include all members that are not defined in the class
-            // but exist in the object
-            foreach($members as $just_name => $value) {
-
-                $name = $raw_name = $just_name;
-
-                if ($name{0} == "\0") {
-                    $parts = explode("\0", $name);
-                    $name = $parts[2];
-                }
-                if (!isset($properties[$name])) {
-                    $name = 'undeclared:'.$name;
-
-                    if (!(isset($this->objectFilters[$class])
-                          && is_array($this->objectFilters[$class])
-                          && in_array($just_name,$this->objectFilters[$class]))) {
-
-                      $return[$name] = $this->_encodeObject($value, $objectDepth + 1, 1);
-                    } else {
-                      $return[$name] = '** Excluded by Filter **';
-                    }
-                }
-            }
-
-            array_pop($this->_objectStack);
-
-        } elseif (is_array($object)) {
-
-            if ($arrayDepth > $this->_options['maxArrayDepth']) {
-              return '** Max Array Depth ('.$this->_options['maxArrayDepth'].') **';
-            }
-
-            foreach ($object as $key => $val) {
-
-              // Encoding the $GLOBALS PHP array causes an infinite loop
-              // if the recursion is not reset here as it contains
-              // a reference to itself. This is the only way I have come up
-              // with to stop infinite recursion in this case.
-              if ($key=='GLOBALS'
-                  && is_array($val)
-                  && array_key_exists('GLOBALS',$val)) {
-
-                  $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-              }
-              $return[$key] = $this->_encodeObject($val, 1, $arrayDepth + 1);
-            }
-        } else {
-            return $object;
-        }
-        return $return;
-    }
-
-    /*
-     * Zend_Wildfire_Plugin_Interface
-     */
-
-    /**
-     * Get the unique indentifier for this plugin.
-     *
-     * @return string Returns the URI of the plugin.
-     */
-    public function getUri()
-    {
-        return self::PLUGIN_URI;
-    }
-
-    /**
-     * Flush any buffered data.
-     *
-     * @param string $protocolUri The URI of the protocol that should be flushed to
-     * @return void
-     */
-    public function flushMessages($protocolUri)
-    {
-        if (!$this->_messages || $protocolUri!=self::PROTOCOL_URI) {
-            return;
-        }
-
-        foreach( $this->_messages as $message ) {
-            if (!$message->getDestroy()) {
-                $this->send($message->getMessage(),
-                            $message->getLabel(),
-                            $message->getStyle(),
-                            $message->getOptions());
-            }
-        }
-
-        $this->_messages = array();
-    }
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/Message.php b/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/Message.php
deleted file mode 100644
index f6e2cad09..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/Message.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * A message envelope that can be passed to Zend_Wildfire_Plugin_FirePhp to be
- * logged to Firebug instead of a variable.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Plugin_FirePhp_Message
-{
-    /**
-     * The style of the message
-     * @var string
-     */
-    protected $_style = null;
-
-    /**
-     * The label of the message
-     * @var string
-     */
-    protected $_label = null;
-
-    /**
-     * The message value
-     * @var mixed
-     */
-    protected $_message = null;
-
-    /**
-     * Flag indicating if message buffering is enabled
-     * @var boolean
-     */
-    protected $_buffered = false;
-
-    /**
-     * Flag indicating if message should be destroyed and not delivered
-     * @var boolean
-     */
-    protected $_destroy = false;
-
-    /**
-     * Random unique ID used to identify message in comparison operations
-     * @var string
-     */
-    protected $_ruid = false;
-
-    /**
-     * Options for the object
-     * @var array
-     */
-    protected $_options = array(
-        'traceOffset' => null, /* The offset in the trace which identifies the source of the message */
-        'includeLineNumbers' => null /* Whether to include line and file info for this message */
-    );
-
-    /**
-     * Creates a new message with the given style and message
-     *
-     * @param string $style Style of the message.
-     * @param mixed $message The message
-     * @return void
-     */
-    function __construct($style, $message)
-    {
-        $this->_style = $style;
-        $this->_message = $message;
-        $this->_ruid = md5(microtime().mt_rand());
-    }
-
-    /**
-     * Set the label of the message
-     *
-     * @param string $label The label to be set
-     * @return void
-     */
-    public function setLabel($label)
-    {
-        $this->_label = $label;
-    }
-
-    /**
-     * Get the label of the message
-     *
-     * @return string The label of the message
-     */
-    public function getLabel()
-    {
-        return $this->_label;
-    }
-
-    /**
-     * Enable or disable message buffering
-     *
-     * If a message is buffered it can be updated for the duration of the
-     * request and is only flushed at the end of the request.
-     *
-     * @param boolean $buffered TRUE to enable buffering FALSE otherwise
-     * @return boolean Returns previous buffering value
-     */
-    public function setBuffered($buffered)
-    {
-        $previous = $this->_buffered;
-        $this->_buffered = $buffered;
-        return $previous;
-    }
-
-    /**
-     * Determine if buffering is enabled or disabled
-     *
-     * @return boolean Returns TRUE if buffering is enabled, FALSE otherwise.
-     */
-    public function getBuffered()
-    {
-        return $this->_buffered;
-    }
-
-    /**
-     * Destroy the message to prevent delivery
-     *
-     * @param boolean $destroy TRUE to destroy FALSE otherwise
-     * @return boolean Returns previous destroy value
-     */
-    public function setDestroy($destroy)
-    {
-        $previous = $this->_destroy;
-        $this->_destroy = $destroy;
-        return $previous;
-    }
-
-    /**
-     * Determine if message should be destroyed
-     *
-     * @return boolean Returns TRUE if message should be destroyed, FALSE otherwise.
-     */
-    public function getDestroy()
-    {
-        return $this->_destroy;
-    }
-
-    /**
-     * Set the style of the message
-     *
-     * @return void
-     */
-    public function setStyle($style)
-    {
-        $this->_style = $style;
-    }
-
-    /**
-     * Get the style of the message
-     *
-     * @return string The style of the message
-     */
-    public function getStyle()
-    {
-        return $this->_style;
-    }
-
-    /**
-     * Set the actual message to be sent in its final format.
-     *
-     * @return void
-     */
-    public function setMessage($message)
-    {
-        $this->_message = $message;
-    }
-
-    /**
-     * Get the actual message to be sent in its final format.
-     *
-     * @return mixed Returns the message to be sent.
-     */
-    public function getMessage()
-    {
-        return $this->_message;
-    }
-
-    /**
-     * Set a single option
-     *
-     * @param  string $key The name of the option
-     * @param  mixed $value The value of the option
-     * @return mixed The previous value of the option
-     */
-    public function setOption($key, $value)
-    {
-      if(!array_key_exists($key,$this->_options)) {
-        throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
-      }
-      $previous = $this->_options[$key];
-      $this->_options[$key] = $value;
-      return $previous;
-    }
-
-    /**
-     * Retrieve a single option
-     *
-     * @param  string $key The name of the option
-     * @return mixed The value of the option
-     */
-    public function getOption($key)
-    {
-      if(!array_key_exists($key,$this->_options)) {
-        throw new Zend_Wildfire_Exception('Option with name "'.$key.'" does not exist!');
-      }
-      return $this->_options[$key];
-    }
-
-    /**
-     * Retrieve all options
-     *
-     * @return array All options
-     */
-    public function getOptions()
-    {
-      return $this->_options;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php b/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
deleted file mode 100644
index e62e6e8b8..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: TableMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Wildfire_Plugin_FirePhp */
-require_once 'Zend/Wildfire/Plugin/FirePhp.php';
-
-/** Zend_Wildfire_Plugin_FirePhp_Message */
-require_once 'Zend/Wildfire/Plugin/FirePhp/Message.php';
-
-/**
- * A message envelope that can be updated for the duration of the requet before
- * it gets flushed at the end of the request.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_FirePhp_Message
-{
-    /**
-     * The header of the table containing all columns
-     * @var array
-     */
-    protected $_header = null;
-
-    /**
-     * The rows of the table
-     * $var array
-     */
-    protected $_rows = array();
-
-    /**
-     * Constructor
-     *
-     * @param string $label The label of the table
-     */
-    function __construct($label)
-    {
-        parent::__construct(Zend_Wildfire_Plugin_FirePhp::TABLE, null);
-        $this->setLabel($label);
-    }
-
-    /**
-     * Set the table header
-     *
-     * @param array $header The header columns
-     * @return void
-     */
-    public function setHeader($header)
-    {
-        $this->_header = $header;
-    }
-
-    /**
-     * Append a row to the end of the table.
-     *
-     * @param array $row An array of column values representing a row.
-     * @return void
-     */
-    public function addRow($row)
-    {
-        $this->_rows[] = $row;
-    }
-
-    /**
-     * Get the actual message to be sent in its final format.
-     *
-     * @return mixed Returns the message to be sent.
-     */
-    public function getMessage()
-    {
-        $table = $this->_rows;
-        if($this->_header) {
-            array_unshift($table,$this->_header);
-        }
-        return $table;
-    }
-
-    /**
-     * Returns the row at the given index
-     *
-     * @param integer $index The index of the row
-     * @return array Returns the row
-     * @throws Zend_Wildfire_Exception
-     */
-    public function getRowAt($index)
-    {
-        $count = $this->getRowCount();
-
-        if($index < 0 || $index > $count-1) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!');
-        }
-
-        return $this->_rows[$index];
-    }
-
-    /**
-     * Sets the row on the given index to a new row
-     *
-     * @param integer $index The index of the row
-     * @param array $row The new data for the row
-     * @throws Zend_Wildfire_Exception
-     */
-    public function setRowAt($index, $row)
-    {
-        $count = $this->getRowCount();
-
-        if($index < 0 || $index > $count-1) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!');
-        }
-
-        $this->_rows[$index] = $row;
-    }
-
-    /**
-     * Returns the number of rows
-     *
-     * @return integer
-     */
-    public function getRowCount()
-    {
-        return count($this->_rows);
-    }
-
-    /**
-     * Returns the last row of the table
-     *
-     * @return array Returns the last row
-     * @throws Zend_Wildfire_Exception
-     */
-    public function getLastRow()
-    {
-        $count = $this->getRowCount();
-
-        if($count==0) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('Cannot get last row as no rows exist!');
-        }
-
-        return $this->_rows[$count-1];
-    }
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Plugin/Interface.php b/airtime_mvc/library/Zend/Wildfire/Plugin/Interface.php
deleted file mode 100644
index ae948102e..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Plugin/Interface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Plugin
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-interface Zend_Wildfire_Plugin_Interface
-{
-
-    /**
-     * Flush any buffered data.
-     *
-     * @param string $protocolUri The URI of the protocol that should be flushed to
-     * @return void
-     */
-    public function flushMessages($protocolUri);
-
-    /**
-     * Get the unique indentifier for this plugin.
-     *
-     * @return string Returns the URI of the plugin.
-     */
-    public function getUri();
-
-}
diff --git a/airtime_mvc/library/Zend/Wildfire/Protocol/JsonStream.php b/airtime_mvc/library/Zend/Wildfire/Protocol/JsonStream.php
deleted file mode 100644
index 75c1787fe..000000000
--- a/airtime_mvc/library/Zend/Wildfire/Protocol/JsonStream.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: JsonStream.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Wildfire_Plugin_Interface */
-require_once 'Zend/Wildfire/Plugin/Interface.php';
-
-/** Zend_Wildfire_Channel_Interface */
-require_once 'Zend/Wildfire/Channel/Interface.php';
-
-/** Zend_Json */
-require_once 'Zend/Json.php';
-
-/**
- * Encodes messages into the Wildfire JSON Stream Communication Protocol.
- *
- * @category   Zend
- * @package    Zend_Wildfire
- * @subpackage Protocol
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Wildfire_Protocol_JsonStream
-{
-    /**
-     * The protocol URI for this protocol
-     */
-    const PROTOCOL_URI = 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2';
-
-    /**
-     * All messages to be sent.
-     * @var array
-     */
-    protected $_messages = array();
-
-    /**
-     * Plugins that are using this protocol
-     * @var array
-     */
-    protected $_plugins = array();
-
-    /**
-     * Register a plugin that uses this protocol
-     *
-     * @param Zend_Wildfire_Plugin_Interface $plugin The plugin to be registered
-     * @return boolean Returns TRUE if plugin was registered, false if it was already registered
-     */
-    public function registerPlugin(Zend_Wildfire_Plugin_Interface $plugin)
-    {
-        if (in_array($plugin,$this->_plugins)) {
-            return false;
-        }
-        $this->_plugins[] = $plugin;
-        return true;
-    }
-
-    /**
-     * Record a message with the given data in the given structure
-     *
-     * @param Zend_Wildfire_Plugin_Interface $plugin The plugin recording the message
-     * @param string $structure The structure to be used for the data
-     * @param array $data The data to be recorded
-     * @return boolean Returns TRUE if message was recorded
-     */
-    public function recordMessage(Zend_Wildfire_Plugin_Interface $plugin, $structure, $data)
-    {
-        if(!isset($this->_messages[$structure])) {
-            $this->_messages[$structure] = array();
-        }
-
-        $uri = $plugin->getUri();
-
-        if(!isset($this->_messages[$structure][$uri])) {
-            $this->_messages[$structure][$uri] = array();
-        }
-
-        $this->_messages[$structure][$uri][] = $this->_encode($data);
-        return true;
-    }
-
-    /**
-     * Remove all qued messages
-     *
-     * @param Zend_Wildfire_Plugin_Interface $plugin The plugin for which to clear messages
-     * @return boolean Returns TRUE if messages were present
-     */
-    public function clearMessages(Zend_Wildfire_Plugin_Interface $plugin)
-    {
-        $uri = $plugin->getUri();
-
-        $present = false;
-        foreach ($this->_messages as $structure => $messages) {
-
-            if(!isset($this->_messages[$structure][$uri])) {
-                continue;
-            }
-
-            $present = true;
-
-            unset($this->_messages[$structure][$uri]);
-
-            if (!$this->_messages[$structure]) {
-                unset($this->_messages[$structure]);
-            }
-        }
-        return $present;
-    }
-
-    /**
-     * Get all qued messages
-     *
-     * @return mixed Returns qued messages or FALSE if no messages are qued
-     */
-    public function getMessages()
-    {
-        if (!$this->_messages) {
-            return false;
-        }
-        return $this->_messages;
-    }
-
-    /**
-     * Use the JSON encoding scheme for the value specified
-     *
-     * @param mixed $value The value to be encoded
-     * @return string  The encoded value
-     */
-    protected function _encode($value)
-    {
-        return Zend_Json::encode($value, true, array('silenceCyclicalExceptions'=>true));
-    }
-
-    /**
-     * Retrieves all formatted data ready to be sent by the channel.
-     *
-     * @param Zend_Wildfire_Channel_Interface $channel The instance of the channel that will be transmitting the data
-     * @return mixed Returns the data to be sent by the channel.
-     * @throws Zend_Wildfire_Exception
-     */
-    public function getPayload(Zend_Wildfire_Channel_Interface $channel)
-    {
-        if (!$channel instanceof Zend_Wildfire_Channel_HttpHeaders) {
-            require_once 'Zend/Wildfire/Exception.php';
-            throw new Zend_Wildfire_Exception('The '.get_class($channel).' channel is not supported by the '.get_class($this).' protocol.');
-        }
-
-        if ($this->_plugins) {
-            foreach ($this->_plugins as $plugin) {
-                $plugin->flushMessages(self::PROTOCOL_URI);
-            }
-        }
-
-        if (!$this->_messages) {
-            return false;
-        }
-
-        $protocol_index = 1;
-        $structure_index = 1;
-        $plugin_index = 1;
-        $message_index = 1;
-
-        $payload = array();
-
-        $payload[] = array('Protocol-'.$protocol_index, self::PROTOCOL_URI);
-
-        foreach ($this->_messages as $structure_uri => $plugin_messages ) {
-
-            $payload[] = array($protocol_index.'-Structure-'.$structure_index, $structure_uri);
-
-            foreach ($plugin_messages as $plugin_uri => $messages ) {
-
-                $payload[] = array($protocol_index.'-Plugin-'.$plugin_index, $plugin_uri);
-
-                foreach ($messages as $message) {
-
-                    $parts = explode("\n",chunk_split($message, 5000, "\n"));
-
-                    for ($i=0 ; $i<count($parts) ; $i++) {
-
-                        $part = $parts[$i];
-                        if ($part) {
-
-                            $msg = '';
-
-                            if (count($parts)>2) {
-                                $msg = (($i==0)?strlen($message):'')
-                                       . '|' . $part . '|'
-                                       . (($i<count($parts)-2)?'\\':'');
-                            } else {
-                                $msg = strlen($part) . '|' . $part . '|';
-                            }
-
-                            $payload[] = array($protocol_index . '-'
-                                               . $structure_index . '-'
-                                               . $plugin_index . '-'
-                                               . $message_index,
-                                               $msg);
-
-                            $message_index++;
-
-                            if ($message_index > 99999) {
-                                require_once 'Zend/Wildfire/Exception.php';
-                                throw new Zend_Wildfire_Exception('Maximum number (99,999) of messages reached!');
-                            }
-                        }
-                    }
-                }
-                $plugin_index++;
-            }
-            $structure_index++;
-        }
-
-        return $payload;
-    }
-
-}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client.php b/airtime_mvc/library/Zend/XmlRpc/Client.php
deleted file mode 100644
index 69cefc359..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * For handling the HTTP connection to the XML-RPC service
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * Enables object chaining for calling namespaced XML-RPC methods.
- * @see Zend_XmlRpc_Client_ServerProxy
- */
-require_once 'Zend/XmlRpc/Client/ServerProxy.php';
-
-/**
- * Introspects remote servers using the XML-RPC de facto system.* methods
- * @see Zend_XmlRpc_Client_ServerIntrospection
- */
-require_once 'Zend/XmlRpc/Client/ServerIntrospection.php';
-
-/**
- * Represent a native XML-RPC value, used both in sending parameters
- * to methods and as the parameters retrieve from method calls
- * @see Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-/**
- * XML-RPC Request
- * @see Zend_XmlRpc_Request
- */
-require_once 'Zend/XmlRpc/Request.php';
-
-/**
- * XML-RPC Response
- * @see Zend_XmlRpc_Response
- */
-require_once 'Zend/XmlRpc/Response.php';
-
-/**
- * XML-RPC Fault
- * @see Zend_XmlRpc_Fault
- */
-require_once 'Zend/XmlRpc/Fault.php';
-
-
-/**
- * An XML-RPC client implementation
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client
-{
-    /**
-     * Full address of the XML-RPC service
-     * @var string
-     * @example http://time.xmlrpc.com/RPC2
-     */
-    protected $_serverAddress;
-
-    /**
-     * HTTP Client to use for requests
-     * @var Zend_Http_Client
-     */
-    protected $_httpClient = null;
-
-    /**
-     * Introspection object
-     * @var Zend_Http_Client_Introspector
-     */
-    protected $_introspector = null;
-
-    /**
-     * Request of the last method call
-     * @var Zend_XmlRpc_Request
-     */
-    protected $_lastRequest = null;
-
-    /**
-     * Response received from the last method call
-     * @var Zend_XmlRpc_Response
-     */
-    protected $_lastResponse = null;
-
-    /**
-     * Proxy object for more convenient method calls
-     * @var array of Zend_XmlRpc_Client_ServerProxy
-     */
-    protected $_proxyCache = array();
-
-    /**
-     * Flag for skipping system lookup
-     * @var bool
-     */
-    protected $_skipSystemLookup = false;
-
-    /**
-     * Create a new XML-RPC client to a remote server
-     *
-     * @param  string $server      Full address of the XML-RPC service
-     *                             (e.g. http://time.xmlrpc.com/RPC2)
-     * @param  Zend_Http_Client $httpClient HTTP Client to use for requests
-     * @return void
-     */
-    public function __construct($server, Zend_Http_Client $httpClient = null)
-    {
-        if ($httpClient === null) {
-            $this->_httpClient = new Zend_Http_Client();
-        } else {
-            $this->_httpClient = $httpClient;
-        }
-
-        $this->_introspector  = new Zend_XmlRpc_Client_ServerIntrospection($this);
-        $this->_serverAddress = $server;
-    }
-
-
-    /**
-     * Sets the HTTP client object to use for connecting the XML-RPC server.
-     *
-     * @param  Zend_Http_Client $httpClient
-     * @return Zend_Http_Client
-     */
-    public function setHttpClient(Zend_Http_Client $httpClient)
-    {
-        return $this->_httpClient = $httpClient;
-    }
-
-
-    /**
-     * Gets the HTTP client object.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_httpClient;
-    }
-
-
-    /**
-     * Sets the object used to introspect remote servers
-     *
-     * @param  Zend_XmlRpc_Client_ServerIntrospection
-     * @return Zend_XmlRpc_Client_ServerIntrospection
-     */
-    public function setIntrospector(Zend_XmlRpc_Client_ServerIntrospection $introspector)
-    {
-        return $this->_introspector = $introspector;
-    }
-
-
-    /**
-     * Gets the introspection object.
-     *
-     * @return Zend_XmlRpc_Client_ServerIntrospection
-     */
-    public function getIntrospector()
-    {
-        return $this->_introspector;
-    }
-
-
-   /**
-     * The request of the last method call
-     *
-     * @return Zend_XmlRpc_Request
-     */
-    public function getLastRequest()
-    {
-        return $this->_lastRequest;
-    }
-
-
-    /**
-     * The response received from the last method call
-     *
-     * @return Zend_XmlRpc_Response
-     */
-    public function getLastResponse()
-    {
-        return $this->_lastResponse;
-    }
-
-
-    /**
-     * Returns a proxy object for more convenient method calls
-     *
-     * @param $namespace  Namespace to proxy or empty string for none
-     * @return Zend_XmlRpc_Client_ServerProxy
-     */
-    public function getProxy($namespace = '')
-    {
-        if (empty($this->_proxyCache[$namespace])) {
-            $proxy = new Zend_XmlRpc_Client_ServerProxy($this, $namespace);
-            $this->_proxyCache[$namespace] = $proxy;
-        }
-        return $this->_proxyCache[$namespace];
-    }
-
-    /**
-     * Set skip system lookup flag
-     *
-     * @param  bool $flag
-     * @return Zend_XmlRpc_Client
-     */
-    public function setSkipSystemLookup($flag = true)
-    {
-        $this->_skipSystemLookup = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Skip system lookup when determining if parameter should be array or struct?
-     *
-     * @return bool
-     */
-    public function skipSystemLookup()
-    {
-        return $this->_skipSystemLookup;
-    }
-
-    /**
-     * Perform an XML-RPC request and return a response.
-     *
-     * @param Zend_XmlRpc_Request $request
-     * @param null|Zend_XmlRpc_Response $response
-     * @return void
-     * @throws Zend_XmlRpc_Client_HttpException
-     */
-    public function doRequest($request, $response = null)
-    {
-        $this->_lastRequest = $request;
-
-        iconv_set_encoding('input_encoding', 'UTF-8');
-        iconv_set_encoding('output_encoding', 'UTF-8');
-        iconv_set_encoding('internal_encoding', 'UTF-8');
-
-        $http = $this->getHttpClient();
-        if($http->getUri() === null) {
-            $http->setUri($this->_serverAddress);
-        }
-
-        $http->setHeaders(array(
-            'Content-Type: text/xml; charset=utf-8',
-            'Accept: text/xml',
-        ));
-
-        if ($http->getHeader('user-agent') === null) {
-            $http->setHeaders(array('User-Agent: Zend_XmlRpc_Client'));
-        }
-
-        $xml = $this->_lastRequest->__toString();
-        $http->setRawData($xml);
-        $httpResponse = $http->request(Zend_Http_Client::POST);
-
-        if (! $httpResponse->isSuccessful()) {
-            /**
-             * Exception thrown when an HTTP error occurs
-             * @see Zend_XmlRpc_Client_HttpException
-             */
-            require_once 'Zend/XmlRpc/Client/HttpException.php';
-            throw new Zend_XmlRpc_Client_HttpException(
-                                    $httpResponse->getMessage(),
-                                    $httpResponse->getStatus());
-        }
-
-        if ($response === null) {
-            $response = new Zend_XmlRpc_Response();
-        }
-        $this->_lastResponse = $response;
-        $this->_lastResponse->loadXml($httpResponse->getBody());
-    }
-
-    /**
-     * Send an XML-RPC request to the service (for a specific method)
-     *
-     * @param  string $method Name of the method we want to call
-     * @param  array $params Array of parameters for the method
-     * @return mixed
-     * @throws Zend_XmlRpc_Client_FaultException
-     */
-    public function call($method, $params=array())
-    {
-        if (!$this->skipSystemLookup() && ('system.' != substr($method, 0, 7))) {
-            // Ensure empty array/struct params are cast correctly
-            // If system.* methods are not available, bypass. (ZF-2978)
-            $success = true;
-            try {
-                $signatures = $this->getIntrospector()->getMethodSignature($method);
-            } catch (Zend_XmlRpc_Exception $e) {
-                $success = false;
-            }
-            if ($success) {
-                $validTypes = array(
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_ARRAY,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_BASE64,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_BOOLEAN,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_DATETIME,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_DOUBLE,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_I4,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_INTEGER,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_NIL,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_STRING,
-                    Zend_XmlRpc_Value::XMLRPC_TYPE_STRUCT,
-                );
-
-                if (!is_array($params)) {
-                    $params = array($params);
-                }
-                foreach ($params as $key => $param) {
-
-                    if ($param instanceof Zend_XmlRpc_Value) {
-                        continue;
-                    }
-
-                    $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
-                    foreach ($signatures as $signature) {
-                        if (!is_array($signature)) {
-                            continue;
-                        }
-
-                        if (isset($signature['parameters'][$key])) {
-                            $type = $signature['parameters'][$key];
-                            $type = in_array($type, $validTypes) ? $type : Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
-                        }
-                    }
-
-                    $params[$key] = Zend_XmlRpc_Value::getXmlRpcValue($param, $type);
-                }
-            }
-        }
-
-        $request = $this->_createRequest($method, $params);
-
-        $this->doRequest($request);
-
-        if ($this->_lastResponse->isFault()) {
-            $fault = $this->_lastResponse->getFault();
-            /**
-             * Exception thrown when an XML-RPC fault is returned
-             * @see Zend_XmlRpc_Client_FaultException
-             */
-            require_once 'Zend/XmlRpc/Client/FaultException.php';
-            throw new Zend_XmlRpc_Client_FaultException($fault->getMessage(),
-                                                        $fault->getCode());
-        }
-
-        return $this->_lastResponse->getReturnValue();
-    }
-
-    /**
-     * Create request object
-     *
-     * @return Zend_XmlRpc_Request
-     */
-    protected function _createRequest($method, $params)
-    {
-        return new Zend_XmlRpc_Request($method, $params);
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/Exception.php b/airtime_mvc/library/Zend/XmlRpc/Client/Exception.php
deleted file mode 100644
index 9ee06d5b1..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/Exception.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Exception
- */
-require_once 'Zend/XmlRpc/Exception.php';
-
-
-/**
- * Base class for all Zend_XmlRpc_Client_* exceptions
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_Exception extends Zend_XmlRpc_Exception
-{}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/FaultException.php b/airtime_mvc/library/Zend/XmlRpc/Client/FaultException.php
deleted file mode 100644
index 14fbf6d71..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/FaultException.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: FaultException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/** Zend_XmlRpc_Client_Exception */
-require_once 'Zend/XmlRpc/Client/Exception.php';
-
-
-/**
- * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_FaultException extends Zend_XmlRpc_Client_Exception
-{}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/HttpException.php b/airtime_mvc/library/Zend/XmlRpc/Client/HttpException.php
deleted file mode 100644
index 413619ea3..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/HttpException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Exception
- */
-require_once 'Zend/XmlRpc/Client/Exception.php';
-
-
-/**
- * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
- * XML-RPC method call.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_HttpException extends Zend_XmlRpc_Client_Exception
-{}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/IntrospectException.php b/airtime_mvc/library/Zend/XmlRpc/Client/IntrospectException.php
deleted file mode 100644
index a7d627bfe..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/IntrospectException.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: IntrospectException.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Client_Exception
- */
-require_once 'Zend/XmlRpc/Client/Exception.php';
-
-
-/**
- * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_IntrospectException extends Zend_XmlRpc_Client_Exception
-{}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/ServerIntrospection.php b/airtime_mvc/library/Zend/XmlRpc/Client/ServerIntrospection.php
deleted file mode 100644
index f3349bc1d..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/ServerIntrospection.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ServerIntrospection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Wraps the XML-RPC system.* introspection methods
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_ServerIntrospection
-{
-    /**
-     * @var Zend_XmlRpc_Client_ServerProxy
-     */
-    private $_system = null;
-
-
-    /**
-     * @param Zend_XmlRpc_Client $client
-     */
-    public function __construct(Zend_XmlRpc_Client $client)
-    {
-        $this->_system = $client->getProxy('system');
-    }
-
-    /**
-     * Returns the signature for each method on the server,
-     * autodetecting whether system.multicall() is supported and
-     * using it if so.
-     *
-     * @return array
-     */
-    public function getSignatureForEachMethod()
-    {
-        $methods = $this->listMethods();
-
-        require_once 'Zend/XmlRpc/Client/FaultException.php';
-        try {
-            $signatures = $this->getSignatureForEachMethodByMulticall($methods);
-        } catch (Zend_XmlRpc_Client_FaultException $e) {
-            // degrade to looping
-        }
-
-        if (empty($signatures)) {
-            $signatures = $this->getSignatureForEachMethodByLooping($methods);
-        }
-
-        return $signatures;
-    }
-
-    /**
-     * Attempt to get the method signatures in one request via system.multicall().
-     * This is a boxcar feature of XML-RPC and is found on fewer servers.  However,
-     * can significantly improve performance if present.
-     *
-     * @param  array $methods
-     * @return array array(array(return, param, param, param...))
-     */
-    public function getSignatureForEachMethodByMulticall($methods = null)
-    {
-        if ($methods === null) {
-            $methods = $this->listMethods();
-        }
-
-        $multicallParams = array();
-        foreach ($methods as $method) {
-            $multicallParams[] = array('methodName' => 'system.methodSignature',
-                                       'params'     => array($method));
-        }
-
-        $serverSignatures = $this->_system->multicall($multicallParams);
-
-        if (! is_array($serverSignatures)) {
-            $type = gettype($serverSignatures);
-            $error = "Multicall return is malformed.  Expected array, got $type";
-            require_once 'Zend/XmlRpc/Client/IntrospectException.php';
-            throw new Zend_XmlRpc_Client_IntrospectException($error);
-        }
-
-        if (count($serverSignatures) != count($methods)) {
-            $error = 'Bad number of signatures received from multicall';
-            require_once 'Zend/XmlRpc/Client/IntrospectException.php';
-            throw new Zend_XmlRpc_Client_IntrospectException($error);
-        }
-
-        // Create a new signatures array with the methods name as keys and the signature as value
-        $signatures = array();
-        foreach ($serverSignatures as $i => $signature) {
-            $signatures[$methods[$i]] = $signature;
-        }
-
-        return $signatures;
-    }
-
-    /**
-     * Get the method signatures for every method by
-     * successively calling system.methodSignature
-     *
-     * @param array $methods
-     * @return array
-     */
-    public function getSignatureForEachMethodByLooping($methods = null)
-    {
-        if ($methods === null) {
-            $methods = $this->listMethods();
-        }
-
-        $signatures = array();
-        foreach ($methods as $method) {
-            $signatures[$method] = $this->getMethodSignature($method);
-        }
-
-        return $signatures;
-    }
-
-    /**
-     * Call system.methodSignature() for the given method
-     *
-     * @param  array  $method
-     * @return array  array(array(return, param, param, param...))
-     */
-    public function getMethodSignature($method)
-    {
-        $signature = $this->_system->methodSignature($method);
-        if (!is_array($signature)) {
-            $error = 'Invalid signature for method "' . $method . '"';
-            require_once 'Zend/XmlRpc/Client/IntrospectException.php';
-            throw new Zend_XmlRpc_Client_IntrospectException($error);
-        }
-        return $signature;
-    }
-
-    /**
-     * Call system.listMethods()
-     *
-     * @param  array  $method
-     * @return array  array(method, method, method...)
-     */
-    public function listMethods()
-    {
-        return $this->_system->listMethods();
-    }
-
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Client/ServerProxy.php b/airtime_mvc/library/Zend/XmlRpc/Client/ServerProxy.php
deleted file mode 100644
index 621843fec..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Client/ServerProxy.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: ServerProxy.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * The namespace decorator enables object chaining to permit
- * calling XML-RPC namespaced functions like "foo.bar.baz()"
- * as "$remote->foo->bar->baz()".
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Client_ServerProxy
-{
-    /**
-     * @var Zend_XmlRpc_Client
-     */
-    private $_client = null;
-
-    /**
-     * @var string
-     */
-    private $_namespace = '';
-
-
-    /**
-     * @var array of Zend_XmlRpc_Client_ServerProxy
-     */
-    private $_cache = array();
-
-
-    /**
-     * Class constructor
-     *
-     * @param string             $namespace
-     * @param Zend_XmlRpc_Client $client
-     */
-    public function __construct($client, $namespace = '')
-    {
-        $this->_namespace = $namespace;
-        $this->_client    = $client;
-    }
-
-
-    /**
-     * Get the next successive namespace
-     *
-     * @param string $name
-     * @return Zend_XmlRpc_Client_ServerProxy
-     */
-    public function __get($namespace)
-    {
-        $namespace = ltrim("$this->_namespace.$namespace", '.');
-        if (!isset($this->_cache[$namespace])) {
-            $this->_cache[$namespace] = new $this($this->_client, $namespace);
-        }
-        return $this->_cache[$namespace];
-    }
-
-
-    /**
-     * Call a method in this namespace.
-     *
-     * @param  string $methodN
-     * @param  array $args
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        $method = ltrim("$this->_namespace.$method", '.');
-        return $this->_client->call($method, $args);
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Exception.php b/airtime_mvc/library/Zend/XmlRpc/Exception.php
deleted file mode 100644
index 86fde322e..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Exception.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Exception extends Zend_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Fault.php b/airtime_mvc/library/Zend/XmlRpc/Fault.php
deleted file mode 100644
index bf6b90501..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Fault.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fault.php 20208 2010-01-11 22:37:37Z lars $
- */
-
-/**
- * Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-/**
- * XMLRPC Faults
- *
- * Container for XMLRPC faults, containing both a code and a message;
- * additionally, has methods for determining if an XML response is an XMLRPC
- * fault, as well as generating the XML for an XMLRPC fault response.
- *
- * To allow method chaining, you may only use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Fault
-{
-    /**
-     * Fault code
-     * @var int
-     */
-    protected $_code;
-
-    /**
-     * Fault character encoding
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Fault message
-     * @var string
-     */
-    protected $_message;
-
-    /**
-     * Internal fault codes => messages
-     * @var array
-     */
-    protected $_internal = array(
-        404 => 'Unknown Error',
-
-        // 610 - 619 reflection errors
-        610 => 'Invalid method class',
-        611 => 'Unable to attach function or callback; not callable',
-        612 => 'Unable to load array; not an array',
-        613 => 'One or more method records are corrupt or otherwise unusable',
-
-        // 620 - 629 dispatch errors
-        620 => 'Method does not exist',
-        621 => 'Error instantiating class to invoke method',
-        622 => 'Method missing implementation',
-        623 => 'Calling parameters do not match signature',
-
-        // 630 - 639 request errors
-        630 => 'Unable to read request',
-        631 => 'Failed to parse request',
-        632 => 'Invalid request, no method passed; request must contain a \'methodName\' tag',
-        633 => 'Param must contain a value',
-        634 => 'Invalid method name',
-        635 => 'Invalid XML provided to request',
-        636 => 'Error creating xmlrpc value',
-
-        // 640 - 649 system.* errors
-        640 => 'Method does not exist',
-
-        // 650 - 659 response errors
-        650 => 'Invalid XML provided for response',
-        651 => 'Failed to parse response',
-        652 => 'Invalid response',
-        653 => 'Invalid XMLRPC value in response',
-    );
-
-    /**
-     * Constructor
-     *
-     * @return Zend_XmlRpc_Fault
-     */
-    public function __construct($code = 404, $message = '')
-    {
-        $this->setCode($code);
-        $code = $this->getCode();
-
-        if (empty($message) && isset($this->_internal[$code])) {
-            $message = $this->_internal[$code];
-        } elseif (empty($message)) {
-            $message = 'Unknown error';
-        }
-        $this->setMessage($message);
-    }
-
-    /**
-     * Set the fault code
-     *
-     * @param int $code
-     * @return Zend_XmlRpc_Fault
-     */
-    public function setCode($code)
-    {
-        $this->_code = (int) $code;
-        return $this;
-    }
-
-    /**
-     * Return fault code
-     *
-     * @return int
-     */
-    public function getCode()
-    {
-        return $this->_code;
-    }
-
-    /**
-     * Retrieve fault message
-     *
-     * @param string
-     * @return Zend_XmlRpc_Fault
-     */
-    public function setMessage($message)
-    {
-        $this->_message = (string) $message;
-        return $this;
-    }
-
-    /**
-     * Retrieve fault message
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->_message;
-    }
-
-    /**
-     * Set encoding to use in fault response
-     *
-     * @param string $encoding
-     * @return Zend_XmlRpc_Fault
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-        Zend_XmlRpc_Value::setEncoding($encoding);
-        return $this;
-    }
-
-    /**
-     * Retrieve current fault encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Load an XMLRPC fault from XML
-     *
-     * @param string $fault
-     * @return boolean Returns true if successfully loaded fault response, false
-     * if response was not a fault response
-     * @throws Zend_XmlRpc_Exception if no or faulty XML provided, or if fault
-     * response does not contain either code or message
-     */
-    public function loadXml($fault)
-    {
-        if (!is_string($fault)) {
-            require_once 'Zend/XmlRpc/Exception.php';
-            throw new Zend_XmlRpc_Exception('Invalid XML provided to fault');
-        }
-
-        try {
-            $xml = @new SimpleXMLElement($fault);
-        } catch (Exception $e) {
-            // Not valid XML
-            require_once 'Zend/XmlRpc/Exception.php';
-            throw new Zend_XmlRpc_Exception('Failed to parse XML fault: ' .  $e->getMessage(), 500, $e);
-        }
-
-        // Check for fault
-        if (!$xml->fault) {
-            // Not a fault
-            return false;
-        }
-
-        if (!$xml->fault->value->struct) {
-            // not a proper fault
-            require_once 'Zend/XmlRpc/Exception.php';
-            throw new Zend_XmlRpc_Exception('Invalid fault structure', 500);
-        }
-
-        $structXml = $xml->fault->value->asXML();
-        $struct    = Zend_XmlRpc_Value::getXmlRpcValue($structXml, Zend_XmlRpc_Value::XML_STRING);
-        $struct    = $struct->getValue();
-
-        if (isset($struct['faultCode'])) {
-            $code = $struct['faultCode'];
-        }
-        if (isset($struct['faultString'])) {
-            $message = $struct['faultString'];
-        }
-
-        if (empty($code) && empty($message)) {
-            require_once 'Zend/XmlRpc/Exception.php';
-            throw new Zend_XmlRpc_Exception('Fault code and string required');
-        }
-
-        if (empty($code)) {
-            $code = '404';
-        }
-
-        if (empty($message)) {
-            if (isset($this->_internal[$code])) {
-                $message = $this->_internal[$code];
-            } else {
-                $message = 'Unknown Error';
-            }
-        }
-
-        $this->setCode($code);
-        $this->setMessage($message);
-
-        return true;
-    }
-
-    /**
-     * Determine if an XML response is an XMLRPC fault
-     *
-     * @param string $xml
-     * @return boolean
-     */
-    public static function isFault($xml)
-    {
-        $fault = new self();
-        require_once 'Zend/XmlRpc/Exception.php';
-        try {
-            $isFault = $fault->loadXml($xml);
-        } catch (Zend_XmlRpc_Exception $e) {
-            $isFault = false;
-        }
-
-        return $isFault;
-    }
-
-    /**
-     * Serialize fault to XML
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        // Create fault value
-        $faultStruct = array(
-            'faultCode'   => $this->getCode(),
-            'faultString' => $this->getMessage()
-        );
-        $value = Zend_XmlRpc_Value::getXmlRpcValue($faultStruct);
-
-        $generator = Zend_XmlRpc_Value::getGenerator();
-        $generator->openElement('methodResponse')
-                  ->openElement('fault');
-        $value->generateXml();
-        $generator->closeElement('fault')
-                  ->closeElement('methodResponse');
-
-        return $generator->flush();
-    }
-
-    /**
-     * Return XML fault response
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->saveXML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Generator/DomDocument.php b/airtime_mvc/library/Zend/XmlRpc/Generator/DomDocument.php
deleted file mode 100644
index 7113c4a00..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Generator/DomDocument.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 17752 2009-08-22 15:49:54Z lars $
- */
-
-/**
- * @var Zend_XmlRpc_Generator_GeneratorAbstract
- */
-require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php';
-
-/**
- * DOMDocument based implementation of a XML/RPC generator
- */
-class Zend_XmlRpc_Generator_DomDocument extends Zend_XmlRpc_Generator_GeneratorAbstract
-{
-    /**
-     * @var DOMDocument
-     */
-    protected $_dom;
-
-    /**
-     * @var DOMNode
-     */
-    protected $_currentElement;
-
-    /**
-     * Start XML element
-     *
-     * @param string $name
-     * @return void
-     */
-    protected function _openElement($name)
-    {
-        $newElement = $this->_dom->createElement($name);
-
-        $this->_currentElement = $this->_currentElement->appendChild($newElement);
-    }
-
-    /**
-     * Write XML text data into the currently opened XML element
-     *
-     * @param string $text
-     */
-    protected function _writeTextData($text)
-    {
-        $this->_currentElement->appendChild($this->_dom->createTextNode($text));
-    }
-
-    /**
-     * Close an previously opened XML element
-     *
-     * Resets $_currentElement to the next parent node in the hierarchy
-     *
-     * @param string $name
-     * @return void
-     */
-    protected function _closeElement($name)
-    {
-        if (isset($this->_currentElement->parentNode)) {
-            $this->_currentElement = $this->_currentElement->parentNode;
-        }
-    }
-
-    /**
-     * Save XML as a string
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        return $this->_dom->saveXml();
-    }
-
-    /**
-     * Initializes internal objects
-     *
-     * @return void
-     */
-    protected function _init()
-    {
-        $this->_dom = new DOMDocument('1.0', $this->_encoding);
-        $this->_currentElement = $this->_dom;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Generator/GeneratorAbstract.php b/airtime_mvc/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
deleted file mode 100644
index 87f44c517..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Generator/GeneratorAbstract.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 17752 2009-08-22 15:49:54Z lars $
- */
-
-/**
- * Abstract XML generator adapter
- */
-abstract class Zend_XmlRpc_Generator_GeneratorAbstract
-{
-    /**
-     * XML encoding string
-     *
-     * @var string
-     */
-    protected $_encoding;
-
-    /**
-     * Construct new instance of the generator
-     *
-     * @param string $encoding XML encoding, default UTF-8
-     */
-    public function __construct($encoding = 'UTF-8')
-    {
-        $this->_encoding = $encoding;
-        $this->_init();
-    }
-
-    /**
-     * Start XML element
-     *
-     * Method opens a new XML element with an element name and an optional value
-     * 
-     * @param string $name XML tag name
-     * @param string $value Optional value of the XML tag
-     * @return Zend_XmlRpc_Generator_Abstract Fluent interface
-     */
-    public function openElement($name, $value = null)
-    {
-        $this->_openElement($name);
-        if ($value !== null) {
-            $this->_writeTextData($value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * End of an XML element
-     *
-     * Method marks the end of an XML element
-     *
-     * @param string $name XML tag name
-     * @return Zend_XmlRpc_Generator_Abstract Fluent interface
-     */
-    public function closeElement($name)
-    {
-        $this->_closeElement($name);
-
-        return $this;
-    }
-
-    /**
-     * Return XML as a string
-     *
-     * @return string
-     */
-    abstract public function saveXml();
-
-    /**
-     * Return encoding
-     * 
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Returns the XML as a string and flushes all internal buffers
-     *
-     * @return string
-     */
-    public function flush()
-    {
-        $xml = $this->saveXml();
-        $this->_init();
-        return $xml;
-    }
-
-    /**
-     * Returns XML without document declaration
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->stripDeclaration($this->saveXml());
-    }
-
-    /**
-     * Removes XML declaration from a string
-     *
-     * @param string $xml
-     * @return string
-     */
-    public function stripDeclaration($xml)
-    {
-        return preg_replace('/<\?xml version="1.0"( encoding="[^\"]*")?\?>\n/u', '', $xml);
-    }
-
-    /**
-     * Start XML element
-     *
-     * @param string $name XML element name
-     */
-    abstract protected function _openElement($name);
-
-    /**
-     * Write XML text data into the currently opened XML element
-     *
-     * @param string $text
-     */
-    abstract protected function _writeTextData($text);
-
-    /**
-     * End XML element
-     * 
-     * @param string $name
-     */
-    abstract protected function _closeElement($name);
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Generator/XmlWriter.php b/airtime_mvc/library/Zend/XmlRpc/Generator/XmlWriter.php
deleted file mode 100644
index 70f64b7af..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Generator/XmlWriter.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Generator
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Client.php 17752 2009-08-22 15:49:54Z lars $
- */
-
-/**
- * @var Zend_XmlRpc_Generator_GeneratorAbstract
- */
-require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php';
-
-/**
- * XML generator adapter based on XMLWriter
- */
-class Zend_XmlRpc_Generator_XmlWriter extends Zend_XmlRpc_Generator_GeneratorAbstract
-{
-    /**
-     * XMLWriter instance
-     *
-     * @var XMLWriter
-     */
-    protected $_xmlWriter;
-
-    /**
-     * Initialized XMLWriter instance
-     *
-     * @return void
-     */
-    protected function _init()
-    {
-        $this->_xmlWriter = new XMLWriter();
-        $this->_xmlWriter->openMemory();
-        $this->_xmlWriter->startDocument('1.0', $this->_encoding);
-    }
-
-
-    /**
-     * Open a new XML element
-     *
-     * @param string $name XML element name
-     * @return void
-     */
-    protected function _openElement($name)
-    {
-        $this->_xmlWriter->startElement($name);
-    }
-
-    /**
-     * Write XML text data into the currently opened XML element
-     *
-     * @param string $text XML text data
-     * @return void
-     */
-    protected function _writeTextData($text)
-    {
-        $this->_xmlWriter->text($text);
-    }
-
-    /**
-     * Close an previously opened XML element
-     *
-     * @param string $name
-     * @return void
-     */
-    protected function _closeElement($name)
-    {
-        $this->_xmlWriter->endElement();
-
-        return $this;
-    }
-
-    public function saveXml()
-    {
-        return $this->_xmlWriter->flush(false);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Request.php b/airtime_mvc/library/Zend/XmlRpc/Request.php
deleted file mode 100644
index 64e284b76..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Request.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-/**
- * Zend_XmlRpc_Fault
- */
-require_once 'Zend/XmlRpc/Fault.php';
-
-/**
- * XmlRpc Request object
- *
- * Encapsulates an XmlRpc request, holding the method call and all parameters.
- * Provides accessors for these, as well as the ability to load from XML and to
- * create the XML request string.
- *
- * Additionally, if errors occur setting the method or parsing XML, a fault is
- * generated and stored in {@link $_fault}; developers may check for it using
- * {@link isFault()} and {@link getFault()}.
- *
- * @category Zend
- * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Request.php 20208 2010-01-11 22:37:37Z lars $
- */
-class Zend_XmlRpc_Request
-{
-    /**
-     * Request character encoding
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Method to call
-     * @var string
-     */
-    protected $_method;
-
-    /**
-     * XML request
-     * @var string
-     */
-    protected $_xml;
-
-    /**
-     * Method parameters
-     * @var array
-     */
-    protected $_params = array();
-
-    /**
-     * Fault object, if any
-     * @var Zend_XmlRpc_Fault
-     */
-    protected $_fault = null;
-
-    /**
-     * XML-RPC type for each param
-     * @var array
-     */
-    protected $_types = array();
-
-    /**
-     * XML-RPC request params
-     * @var array
-     */
-    protected $_xmlRpcParams = array();
-
-    /**
-     * Create a new XML-RPC request
-     *
-     * @param string $method (optional)
-     * @param array $params  (optional)
-     */
-    public function __construct($method = null, $params = null)
-    {
-        if ($method !== null) {
-            $this->setMethod($method);
-        }
-
-        if ($params !== null) {
-            $this->setParams($params);
-        }
-    }
-
-
-    /**
-     * Set encoding to use in request
-     *
-     * @param string $encoding
-     * @return Zend_XmlRpc_Request
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-        Zend_XmlRpc_Value::setEncoding($encoding);
-        return $this;
-    }
-
-    /**
-     * Retrieve current request encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set method to call
-     *
-     * @param string $method
-     * @return boolean Returns true on success, false if method name is invalid
-     */
-    public function setMethod($method)
-    {
-        if (!is_string($method) || !preg_match('/^[a-z0-9_.:\/]+$/i', $method)) {
-            $this->_fault = new Zend_XmlRpc_Fault(634, 'Invalid method name ("' . $method . '")');
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        $this->_method = $method;
-        return true;
-    }
-
-    /**
-     * Retrieve call method
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->_method;
-    }
-
-    /**
-     * Add a parameter to the parameter stack
-     *
-     * Adds a parameter to the parameter stack, associating it with the type
-     * $type if provided
-     *
-     * @param mixed $value
-     * @param string $type Optional; type hinting
-     * @return void
-     */
-    public function addParam($value, $type = null)
-    {
-        $this->_params[] = $value;
-        if (null === $type) {
-            // Detect type if not provided explicitly
-            if ($value instanceof Zend_XmlRpc_Value) {
-                $type = $value->getType();
-            } else {
-                $xmlRpcValue = Zend_XmlRpc_Value::getXmlRpcValue($value);
-                $type        = $xmlRpcValue->getType();
-            }
-        }
-        $this->_types[]  = $type;
-        $this->_xmlRpcParams[] = array('value' => $value, 'type' => $type);
-    }
-
-    /**
-     * Set the parameters array
-     *
-     * If called with a single, array value, that array is used to set the
-     * parameters stack. If called with multiple values or a single non-array
-     * value, the arguments are used to set the parameters stack.
-     *
-     * Best is to call with array of the format, in order to allow type hinting
-     * when creating the XMLRPC values for each parameter:
-     * <code>
-     * $array = array(
-     *     array(
-     *         'value' => $value,
-     *         'type'  => $type
-     *     )[, ... ]
-     * );
-     * </code>
-     *
-     * @access public
-     * @return void
-     */
-    public function setParams()
-    {
-        $argc = func_num_args();
-        $argv = func_get_args();
-        if (0 == $argc) {
-            return;
-        }
-
-        if ((1 == $argc) && is_array($argv[0])) {
-            $params     = array();
-            $types      = array();
-            $wellFormed = true;
-            foreach ($argv[0] as $arg) {
-                if (!is_array($arg) || !isset($arg['value'])) {
-                    $wellFormed = false;
-                    break;
-                }
-                $params[] = $arg['value'];
-
-                if (!isset($arg['type'])) {
-                    $xmlRpcValue = Zend_XmlRpc_Value::getXmlRpcValue($arg['value']);
-                    $arg['type'] = $xmlRpcValue->getType();
-                }
-                $types[] = $arg['type'];
-            }
-            if ($wellFormed) {
-                $this->_xmlRpcParams = $argv[0];
-                $this->_params = $params;
-                $this->_types  = $types;
-            } else {
-                $this->_params = $argv[0];
-                $this->_types  = array();
-                $xmlRpcParams  = array();
-                foreach ($argv[0] as $arg) {
-                    if ($arg instanceof Zend_XmlRpc_Value) {
-                        $type = $arg->getType();
-                    } else {
-                        $xmlRpcValue = Zend_XmlRpc_Value::getXmlRpcValue($arg);
-                        $type        = $xmlRpcValue->getType();
-                    }
-                    $xmlRpcParams[] = array('value' => $arg, 'type' => $type);
-                    $this->_types[] = $type;
-                }
-                $this->_xmlRpcParams = $xmlRpcParams;
-            }
-            return;
-        }
-
-        $this->_params = $argv;
-        $this->_types  = array();
-        $xmlRpcParams  = array();
-        foreach ($argv as $arg) {
-            if ($arg instanceof Zend_XmlRpc_Value) {
-                $type = $arg->getType();
-            } else {
-                $xmlRpcValue = Zend_XmlRpc_Value::getXmlRpcValue($arg);
-                $type        = $xmlRpcValue->getType();
-            }
-            $xmlRpcParams[] = array('value' => $arg, 'type' => $type);
-            $this->_types[] = $type;
-        }
-        $this->_xmlRpcParams = $xmlRpcParams;
-    }
-
-    /**
-     * Retrieve the array of parameters
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->_params;
-    }
-
-    /**
-     * Return parameter types
-     *
-     * @return array
-     */
-    public function getTypes()
-    {
-        return $this->_types;
-    }
-
-    /**
-     * Load XML and parse into request components
-     *
-     * @param string $request
-     * @return boolean True on success, false if an error occurred.
-     */
-    public function loadXml($request)
-    {
-        if (!is_string($request)) {
-            $this->_fault = new Zend_XmlRpc_Fault(635);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        try {
-            $xml = new SimpleXMLElement($request);
-        } catch (Exception $e) {
-            // Not valid XML
-            $this->_fault = new Zend_XmlRpc_Fault(631);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        // Check for method name
-        if (empty($xml->methodName)) {
-            // Missing method name
-            $this->_fault = new Zend_XmlRpc_Fault(632);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        $this->_method = (string) $xml->methodName;
-
-        // Check for parameters
-        if (!empty($xml->params)) {
-            $types = array();
-            $argv  = array();
-            foreach ($xml->params->children() as $param) {
-                if (!isset($param->value)) {
-                    $this->_fault = new Zend_XmlRpc_Fault(633);
-                    $this->_fault->setEncoding($this->getEncoding());
-                    return false;
-                }
-
-                try {
-                    $param   = Zend_XmlRpc_Value::getXmlRpcValue($param->value, Zend_XmlRpc_Value::XML_STRING);
-                    $types[] = $param->getType();
-                    $argv[]  = $param->getValue();
-                } catch (Exception $e) {
-                    $this->_fault = new Zend_XmlRpc_Fault(636);
-                    $this->_fault->setEncoding($this->getEncoding());
-                    return false;
-                }
-            }
-
-            $this->_types  = $types;
-            $this->_params = $argv;
-        }
-
-        $this->_xml = $request;
-
-        return true;
-    }
-
-    /**
-     * Does the current request contain errors and should it return a fault
-     * response?
-     *
-     * @return boolean
-     */
-    public function isFault()
-    {
-        return $this->_fault instanceof Zend_XmlRpc_Fault;
-    }
-
-    /**
-     * Retrieve the fault response, if any
-     *
-     * @return null|Zend_XmlRpc_Fault
-     */
-    public function getFault()
-    {
-        return $this->_fault;
-    }
-
-    /**
-     * Retrieve method parameters as XMLRPC values
-     *
-     * @return array
-     */
-    protected function _getXmlRpcParams()
-    {
-        $params = array();
-        if (is_array($this->_xmlRpcParams)) {
-            foreach ($this->_xmlRpcParams as $param) {
-                $value = $param['value'];
-                $type  = isset($param['type']) ? $param['type'] : Zend_XmlRpc_Value::AUTO_DETECT_TYPE;
-
-                if (!$value instanceof Zend_XmlRpc_Value) {
-                    $value = Zend_XmlRpc_Value::getXmlRpcValue($value, $type);
-                }
-                $params[] = $value;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Create XML request
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        $args   = $this->_getXmlRpcParams();
-        $method = $this->getMethod();
-
-        $generator = Zend_XmlRpc_Value::getGenerator();
-        $generator->openElement('methodCall')
-                  ->openElement('methodName', $method)
-                  ->closeElement('methodName');
-
-        if (is_array($args) && count($args)) {
-            $generator->openElement('params');
-
-            foreach ($args as $arg) {
-                $generator->openElement('param');
-                $arg->generateXml();
-                $generator->closeElement('param');
-            }
-            $generator->closeElement('params');
-        }
-        $generator->closeElement('methodCall');
-
-        return $generator->flush();
-    }
-
-    /**
-     * Return XML request
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->saveXML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Request/Http.php b/airtime_mvc/library/Zend/XmlRpc/Request/Http.php
deleted file mode 100644
index 29b8b4b78..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Request/Http.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_XmlRpc_Request
- */
-require_once 'Zend/XmlRpc/Request.php';
-
-/**
- * XmlRpc Request object -- Request via HTTP
- *
- * Extends {@link Zend_XmlRpc_Request} to accept a request via HTTP. Request is
- * built at construction time using a raw POST; if no data is available, the
- * request is declared a fault.
- *
- * @category Zend
- * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_XmlRpc_Request_Http extends Zend_XmlRpc_Request
-{
-    /**
-     * Array of headers
-     * @var array
-     */
-    protected $_headers;
-
-    /**
-     * Raw XML as received via request
-     * @var string
-     */
-    protected $_xml;
-
-    /**
-     * Constructor
-     *
-     * Attempts to read from php://input to get raw POST request; if an error
-     * occurs in doing so, or if the XML is invalid, the request is declared a
-     * fault.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $xml = @file_get_contents('php://input');
-        if (!$xml) {
-            require_once 'Zend/XmlRpc/Fault.php';
-            $this->_fault = new Zend_XmlRpc_Fault(630);
-            return;
-        }
-
-        $this->_xml = $xml;
-
-        $this->loadXml($xml);
-    }
-
-    /**
-     * Retrieve the raw XML request
-     *
-     * @return string
-     */
-    public function getRawRequest()
-    {
-        return $this->_xml;
-    }
-
-    /**
-     * Get headers
-     *
-     * Gets all headers as key => value pairs and returns them.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        if (null === $this->_headers) {
-            $this->_headers = array();
-            foreach ($_SERVER as $key => $value) {
-                if ('HTTP_' == substr($key, 0, 5)) {
-                    $header = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
-                    $this->_headers[$header] = $value;
-                }
-            }
-        }
-
-        return $this->_headers;
-    }
-
-    /**
-     * Retrieve the full HTTP request, including headers and XML
-     *
-     * @return string
-     */
-    public function getFullRequest()
-    {
-        $request = '';
-        foreach ($this->getHeaders() as $key => $value) {
-            $request .= $key . ': ' . $value . "\n";
-        }
-
-        $request .= $this->_xml;
-
-        return $request;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Request/Stdin.php b/airtime_mvc/library/Zend/XmlRpc/Request/Stdin.php
deleted file mode 100644
index 3d16dde1d..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Request/Stdin.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_XmlRpc_Request
- */
-require_once 'Zend/XmlRpc/Request.php';
-
-/**
- * XmlRpc Request object -- Request via STDIN
- *
- * Extends {@link Zend_XmlRpc_Request} to accept a request via STDIN. Request is
- * built at construction time using data from STDIN; if no data is available, the
- * request is declared a fault.
- *
- * @category Zend
- * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Stdin.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_XmlRpc_Request_Stdin extends Zend_XmlRpc_Request
-{
-    /**
-     * Raw XML as received via request
-     * @var string
-     */
-    protected $_xml;
-
-    /**
-     * Constructor
-     *
-     * Attempts to read from php://stdin to get raw POST request; if an error
-     * occurs in doing so, or if the XML is invalid, the request is declared a
-     * fault.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $fh = fopen('php://stdin', 'r');
-        if (!$fh) {
-            $this->_fault = new Zend_XmlRpc_Server_Exception(630);
-            return;
-        }
-
-        $xml = '';
-        while (!feof($fh)) {
-            $xml .= fgets($fh);
-        }
-        fclose($fh);
-
-        $this->_xml = $xml;
-
-        $this->loadXml($xml);
-    }
-
-    /**
-     * Retrieve the raw XML request
-     *
-     * @return string
-     */
-    public function getRawRequest()
-    {
-        return $this->_xml;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Response.php b/airtime_mvc/library/Zend/XmlRpc/Response.php
deleted file mode 100644
index 3dce6d546..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Response.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-/**
- * Zend_XmlRpc_Fault
- */
-require_once 'Zend/XmlRpc/Fault.php';
-
-/**
- * XmlRpc Response
- *
- * Container for accessing an XMLRPC return value and creating the XML response.
- *
- * @category Zend
- * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Response.php 20208 2010-01-11 22:37:37Z lars $
- */
-class Zend_XmlRpc_Response
-{
-    /**
-     * Return value
-     * @var mixed
-     */
-    protected $_return;
-
-    /**
-     * Return type
-     * @var string
-     */
-    protected $_type;
-
-    /**
-     * Response character encoding
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Fault, if response is a fault response
-     * @var null|Zend_XmlRpc_Fault
-     */
-    protected $_fault = null;
-
-    /**
-     * Constructor
-     *
-     * Can optionally pass in the return value and type hinting; otherwise, the
-     * return value can be set via {@link setReturnValue()}.
-     *
-     * @param mixed $return
-     * @param string $type
-     * @return void
-     */
-    public function __construct($return = null, $type = null)
-    {
-        $this->setReturnValue($return, $type);
-    }
-
-    /**
-     * Set encoding to use in response
-     *
-     * @param string $encoding
-     * @return Zend_XmlRpc_Response
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-        Zend_XmlRpc_Value::setEncoding($encoding);
-        return $this;
-    }
-
-    /**
-     * Retrieve current response encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Set the return value
-     *
-     * Sets the return value, with optional type hinting if provided.
-     *
-     * @param mixed $value
-     * @param string $type
-     * @return void
-     */
-    public function setReturnValue($value, $type = null)
-    {
-        $this->_return = $value;
-        $this->_type = (string) $type;
-    }
-
-    /**
-     * Retrieve the return value
-     *
-     * @return mixed
-     */
-    public function getReturnValue()
-    {
-        return $this->_return;
-    }
-
-    /**
-     * Retrieve the XMLRPC value for the return value
-     *
-     * @return Zend_XmlRpc_Value
-     */
-    protected function _getXmlRpcReturn()
-    {
-        return Zend_XmlRpc_Value::getXmlRpcValue($this->_return);
-    }
-
-    /**
-     * Is the response a fault response?
-     *
-     * @return boolean
-     */
-    public function isFault()
-    {
-        return $this->_fault instanceof Zend_XmlRpc_Fault;
-    }
-
-    /**
-     * Returns the fault, if any.
-     *
-     * @return null|Zend_XmlRpc_Fault
-     */
-    public function getFault()
-    {
-        return $this->_fault;
-    }
-
-    /**
-     * Load a response from an XML response
-     *
-     * Attempts to load a response from an XMLRPC response, autodetecting if it
-     * is a fault response.
-     *
-     * @param string $response
-     * @return boolean True if a valid XMLRPC response, false if a fault
-     * response or invalid input
-     */
-    public function loadXml($response)
-    {
-        if (!is_string($response)) {
-            $this->_fault = new Zend_XmlRpc_Fault(650);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        try {
-            $xml = new SimpleXMLElement($response);
-        } catch (Exception $e) {
-            // Not valid XML
-            $this->_fault = new Zend_XmlRpc_Fault(651);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        if (!empty($xml->fault)) {
-            // fault response
-            $this->_fault = new Zend_XmlRpc_Fault();
-            $this->_fault->setEncoding($this->getEncoding());
-            $this->_fault->loadXml($response);
-            return false;
-        }
-
-        if (empty($xml->params)) {
-            // Invalid response
-            $this->_fault = new Zend_XmlRpc_Fault(652);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        try {
-            if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) {
-                throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML');
-            }
-            $valueXml = $xml->params->param->value->asXML();
-            $value = Zend_XmlRpc_Value::getXmlRpcValue($valueXml, Zend_XmlRpc_Value::XML_STRING);
-        } catch (Zend_XmlRpc_Value_Exception $e) {
-            $this->_fault = new Zend_XmlRpc_Fault(653);
-            $this->_fault->setEncoding($this->getEncoding());
-            return false;
-        }
-
-        $this->setReturnValue($value->getValue());
-        return true;
-    }
-
-    /**
-     * Return response as XML
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        $value = $this->_getXmlRpcReturn();
-        $generator = Zend_XmlRpc_Value::getGenerator();
-        $generator->openElement('methodResponse')
-                  ->openElement('params')
-                  ->openElement('param');
-        $value->generateXml();
-        $generator->closeElement('param')
-                  ->closeElement('params')
-                  ->closeElement('methodResponse');
-
-        return $generator->flush();
-    }
-
-    /**
-     * Return XML response
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->saveXML();
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Response/Http.php b/airtime_mvc/library/Zend/XmlRpc/Response/Http.php
deleted file mode 100644
index 63f0854e1..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Response/Http.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Controller
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-/**
- * Zend_XmlRpc_Response
- */
-require_once 'Zend/XmlRpc/Response.php';
-
-/**
- * HTTP response
- *
- * @uses Zend_XmlRpc_Response
- * @category Zend
- * @package  Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-class Zend_XmlRpc_Response_Http extends Zend_XmlRpc_Response
-{
-    /**
-     * Override __toString() to send HTTP Content-Type header
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!headers_sent()) {
-            header('Content-Type: text/xml; charset=' . strtolower($this->getEncoding()));
-        }
-
-        return parent::__toString();
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Server.php b/airtime_mvc/library/Zend/XmlRpc/Server.php
deleted file mode 100644
index d00daf430..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Server.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Extends Zend_Server_Abstract
- */
-require_once 'Zend/Server/Abstract.php';
-
-/**
- * XMLRPC Request
- */
-require_once 'Zend/XmlRpc/Request.php';
-
-/**
- * XMLRPC Response
- */
-require_once 'Zend/XmlRpc/Response.php';
-
-/**
- * XMLRPC HTTP Response
- */
-require_once 'Zend/XmlRpc/Response/Http.php';
-
-/**
- * XMLRPC server fault class
- */
-require_once 'Zend/XmlRpc/Server/Fault.php';
-
-/**
- * XMLRPC server system methods class
- */
-require_once 'Zend/XmlRpc/Server/System.php';
-
-/**
- * Convert PHP to and from xmlrpc native types
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-/**
- * Reflection API for function/method introspection
- */
-require_once 'Zend/Server/Reflection.php';
-
-/**
- * Zend_Server_Reflection_Function_Abstract
- */
-require_once 'Zend/Server/Reflection/Function/Abstract.php';
-
-/**
- * Specifically grab the Zend_Server_Reflection_Method for manually setting up
- * system.* methods and handling callbacks in {@link loadFunctions()}.
- */
-require_once 'Zend/Server/Reflection/Method.php';
-
-/**
- * An XML-RPC server implementation
- *
- * Example:
- * <code>
- * require_once 'Zend/XmlRpc/Server.php';
- * require_once 'Zend/XmlRpc/Server/Cache.php';
- * require_once 'Zend/XmlRpc/Server/Fault.php';
- * require_once 'My/Exception.php';
- * require_once 'My/Fault/Observer.php';
- *
- * // Instantiate server
- * $server = new Zend_XmlRpc_Server();
- *
- * // Allow some exceptions to report as fault responses:
- * Zend_XmlRpc_Server_Fault::attachFaultException('My_Exception');
- * Zend_XmlRpc_Server_Fault::attachObserver('My_Fault_Observer');
- *
- * // Get or build dispatch table:
- * if (!Zend_XmlRpc_Server_Cache::get($filename, $server)) {
- *     require_once 'Some/Service/Class.php';
- *     require_once 'Another/Service/Class.php';
- *
- *     // Attach Some_Service_Class in 'some' namespace
- *     $server->setClass('Some_Service_Class', 'some');
- *
- *     // Attach Another_Service_Class in 'another' namespace
- *     $server->setClass('Another_Service_Class', 'another');
- *
- *     // Create dispatch table cache file
- *     Zend_XmlRpc_Server_Cache::save($filename, $server);
- * }
- *
- * $response = $server->handle();
- * echo $response;
- * </code>
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Server extends Zend_Server_Abstract
-{
-    /**
-     * Character encoding
-     * @var string
-     */
-    protected $_encoding = 'UTF-8';
-
-    /**
-     * Request processed
-     * @var null|Zend_XmlRpc_Request
-     */
-    protected $_request = null;
-
-    /**
-     * Class to use for responses; defaults to {@link Zend_XmlRpc_Response_Http}
-     * @var string
-     */
-    protected $_responseClass = 'Zend_XmlRpc_Response_Http';
-
-    /**
-     * Dispatch table of name => method pairs
-     * @var Zend_Server_Definition
-     */
-    protected $_table;
-
-    /**
-     * PHP types => XML-RPC types
-     * @var array
-     */
-    protected $_typeMap = array(
-        'i4'                         => 'i4',
-        'int'                        => 'int',
-        'integer'                    => 'int',
-        'Zend_Crypt_Math_BigInteger' => 'i8',
-        'i8'                         => 'i8',
-        'ex:i8'                      => 'i8',
-        'double'                     => 'double',
-        'float'                      => 'double',
-        'real'                       => 'double',
-        'boolean'                    => 'boolean',
-        'bool'                       => 'boolean',
-        'true'                       => 'boolean',
-        'false'                      => 'boolean',
-        'string'                     => 'string',
-        'str'                        => 'string',
-        'base64'                     => 'base64',
-        'dateTime.iso8601'           => 'dateTime.iso8601',
-        'date'                       => 'dateTime.iso8601',
-        'time'                       => 'dateTime.iso8601',
-        'time'                       => 'dateTime.iso8601',
-        'Zend_Date'                  => 'dateTime.iso8601',
-        'DateTime'                   => 'dateTime.iso8601',
-        'array'                      => 'array',
-        'struct'                     => 'struct',
-        'null'                       => 'nil',
-        'nil'                        => 'nil',
-        'ex:nil'                     => 'nil',
-        'void'                       => 'void',
-        'mixed'                      => 'struct',
-    );
-
-    /**
-     * Send arguments to all methods or just constructor?
-     *
-     * @var bool
-     */
-    protected $_sendArgumentsToAllMethods = true;
-
-    /**
-     * Constructor
-     *
-     * Creates system.* methods.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->_table = new Zend_Server_Definition();
-        $this->_registerSystemMethods();
-    }
-
-    /**
-     * Proxy calls to system object
-     *
-     * @param  string $method
-     * @param  array $params
-     * @return mixed
-     * @throws Zend_XmlRpc_Server_Exception
-     */
-    public function __call($method, $params)
-    {
-        $system = $this->getSystem();
-        if (!method_exists($system, $method)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Unknown instance method called on server: ' . $method);
-        }
-        return call_user_func_array(array($system, $method), $params);
-    }
-
-    /**
-     * Attach a callback as an XMLRPC method
-     *
-     * Attaches a callback as an XMLRPC method, prefixing the XMLRPC method name
-     * with $namespace, if provided. Reflection is done on the callback's
-     * docblock to create the methodHelp for the XMLRPC method.
-     *
-     * Additional arguments to pass to the function at dispatch may be passed;
-     * any arguments following the namespace will be aggregated and passed at
-     * dispatch time.
-     *
-     * @param string|array $function Valid callback
-     * @param string $namespace Optional namespace prefix
-     * @return void
-     * @throws Zend_XmlRpc_Server_Exception
-     */
-    public function addFunction($function, $namespace = '')
-    {
-        if (!is_string($function) && !is_array($function)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611);
-        }
-
-        $argv = null;
-        if (2 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 2);
-        }
-
-        $function = (array) $function;
-        foreach ($function as $func) {
-            if (!is_string($func) || !function_exists($func)) {
-                require_once 'Zend/XmlRpc/Server/Exception.php';
-                throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611);
-            }
-            $reflection = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace);
-            $this->_buildSignature($reflection);
-        }
-    }
-
-    /**
-     * Attach class methods as XMLRPC method handlers
-     *
-     * $class may be either a class name or an object. Reflection is done on the
-     * class or object to determine the available public methods, and each is
-     * attached to the server as an available method; if a $namespace has been
-     * provided, that namespace is used to prefix the XMLRPC method names.
-     *
-     * Any additional arguments beyond $namespace will be passed to a method at
-     * invocation.
-     *
-     * @param string|object $class
-     * @param string $namespace Optional
-     * @param mixed $argv Optional arguments to pass to methods
-     * @return void
-     * @throws Zend_XmlRpc_Server_Exception on invalid input
-     */
-    public function setClass($class, $namespace = '', $argv = null)
-    {
-        if (is_string($class) && !class_exists($class)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Invalid method class', 610);
-        }
-
-        $argv = null;
-        if (2 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 2);
-        }
-
-        $dispatchable = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
-        foreach ($dispatchable->getMethods() as $reflection) {
-            $this->_buildSignature($reflection, $class);
-        }
-    }
-
-    /**
-     * Raise an xmlrpc server fault
-     *
-     * @param string|Exception $fault
-     * @param int $code
-     * @return Zend_XmlRpc_Server_Fault
-     */
-    public function fault($fault = null, $code = 404)
-    {
-        if (!$fault instanceof Exception) {
-            $fault = (string) $fault;
-            if (empty($fault)) {
-                $fault = 'Unknown Error';
-            }
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            $fault = new Zend_XmlRpc_Server_Exception($fault, $code);
-        }
-
-        return Zend_XmlRpc_Server_Fault::getInstance($fault);
-    }
-
-    /**
-     * Handle an xmlrpc call
-     *
-     * @param Zend_XmlRpc_Request $request Optional
-     * @return Zend_XmlRpc_Response|Zend_XmlRpc_Fault
-     */
-    public function handle($request = false)
-    {
-        // Get request
-        if ((!$request || !$request instanceof Zend_XmlRpc_Request)
-            && (null === ($request = $this->getRequest()))
-        ) {
-            require_once 'Zend/XmlRpc/Request/Http.php';
-            $request = new Zend_XmlRpc_Request_Http();
-            $request->setEncoding($this->getEncoding());
-        }
-
-        $this->setRequest($request);
-
-        if ($request->isFault()) {
-            $response = $request->getFault();
-        } else {
-            try {
-                $response = $this->_handle($request);
-            } catch (Exception $e) {
-                $response = $this->fault($e);
-            }
-        }
-
-        // Set output encoding
-        $response->setEncoding($this->getEncoding());
-
-        return $response;
-    }
-
-    /**
-     * Load methods as returned from {@link getFunctions}
-     *
-     * Typically, you will not use this method; it will be called using the
-     * results pulled from {@link Zend_XmlRpc_Server_Cache::get()}.
-     *
-     * @param  array|Zend_Server_Definition $definition
-     * @return void
-     * @throws Zend_XmlRpc_Server_Exception on invalid input
-     */
-    public function loadFunctions($definition)
-    {
-        if (!is_array($definition) && (!$definition instanceof Zend_Server_Definition)) {
-            if (is_object($definition)) {
-                $type = get_class($definition);
-            } else {
-                $type = gettype($definition);
-            }
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Unable to load server definition; must be an array or Zend_Server_Definition, received ' . $type, 612);
-        }
-
-        $this->_table->clearMethods();
-        $this->_registerSystemMethods();
-
-        if ($definition instanceof Zend_Server_Definition) {
-            $definition = $definition->getMethods();
-        }
-
-        foreach ($definition as $key => $method) {
-            if ('system.' == substr($key, 0, 7)) {
-                continue;
-            }
-            $this->_table->addMethod($method, $key);
-        }
-    }
-
-    /**
-     * Set encoding
-     *
-     * @param string $encoding
-     * @return Zend_XmlRpc_Server
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-        Zend_XmlRpc_Value::setEncoding($encoding);
-        return $this;
-    }
-
-    /**
-     * Retrieve current encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->_encoding;
-    }
-
-    /**
-     * Do nothing; persistence is handled via {@link Zend_XmlRpc_Server_Cache}
-     *
-     * @param  mixed $mode
-     * @return void
-     */
-    public function setPersistence($mode)
-    {
-    }
-
-    /**
-     * Set the request object
-     *
-     * @param string|Zend_XmlRpc_Request $request
-     * @return Zend_XmlRpc_Server
-     * @throws Zend_XmlRpc_Server_Exception on invalid request class or object
-     */
-    public function setRequest($request)
-    {
-        if (is_string($request) && class_exists($request)) {
-            $request = new $request();
-            if (!$request instanceof Zend_XmlRpc_Request) {
-                require_once 'Zend/XmlRpc/Server/Exception.php';
-                throw new Zend_XmlRpc_Server_Exception('Invalid request class');
-            }
-            $request->setEncoding($this->getEncoding());
-        } elseif (!$request instanceof Zend_XmlRpc_Request) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Invalid request object');
-        }
-
-        $this->_request = $request;
-        return $this;
-    }
-
-    /**
-     * Return currently registered request object
-     *
-     * @return null|Zend_XmlRpc_Request
-     */
-    public function getRequest()
-    {
-        return $this->_request;
-    }
-
-    /**
-     * Set the class to use for the response
-     *
-     * @param string $class
-     * @return boolean True if class was set, false if not
-     */
-    public function setResponseClass($class)
-    {
-        if (!class_exists($class) or
-            ($c = new ReflectionClass($class) and !$c->isSubclassOf('Zend_XmlRpc_Response'))) {
-
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Invalid response class');
-        }
-        $this->_responseClass = $class;
-        return true;
-    }
-
-    /**
-     * Retrieve current response class
-     *
-     * @return string
-     */
-    public function getResponseClass()
-    {
-        return $this->_responseClass;
-    }
-
-    /**
-     * Retrieve dispatch table
-     *
-     * @return array
-     */
-    public function getDispatchTable()
-    {
-        return $this->_table;
-    }
-
-    /**
-     * Returns a list of registered methods
-     *
-     * Returns an array of dispatchables (Zend_Server_Reflection_Function,
-     * _Method, and _Class items).
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return $this->_table->toArray();
-    }
-
-    /**
-     * Retrieve system object
-     *
-     * @return Zend_XmlRpc_Server_System
-     */
-    public function getSystem()
-    {
-        return $this->_system;
-    }
-
-    /**
-     * Send arguments to all methods?
-     *
-     * If setClass() is used to add classes to the server, this flag defined
-     * how to handle arguments. If set to true, all methods including constructor
-     * will receive the arguments. If set to false, only constructor will receive the
-     * arguments
-     */
-    public function sendArgumentsToAllMethods($flag = null)
-    {
-        if ($flag === null) {
-            return $this->_sendArgumentsToAllMethods;
-        }
-
-        $this->_sendArgumentsToAllMethods = (bool)$flag;
-        return $this;
-    }
-
-    /**
-     * Map PHP type to XML-RPC type
-     *
-     * @param  string $type
-     * @return string
-     */
-    protected function _fixType($type)
-    {
-        if (isset($this->_typeMap[$type])) {
-            return $this->_typeMap[$type];
-        }
-        return 'void';
-    }
-
-    /**
-     * Handle an xmlrpc call (actual work)
-     *
-     * @param Zend_XmlRpc_Request $request
-     * @return Zend_XmlRpc_Response
-     * @throws Zend_XmlRpcServer_Exception|Exception
-     * Zend_XmlRpcServer_Exceptions are thrown for internal errors; otherwise,
-     * any other exception may be thrown by the callback
-     */
-    protected function _handle(Zend_XmlRpc_Request $request)
-    {
-        $method = $request->getMethod();
-
-        // Check for valid method
-        if (!$this->_table->hasMethod($method)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 620);
-        }
-
-        $info     = $this->_table->getMethod($method);
-        $params   = $request->getParams();
-        $argv     = $info->getInvokeArguments();
-        if (0 < count($argv) and $this->sendArgumentsToAllMethods()) {
-            $params = array_merge($params, $argv);
-        }
-
-        // Check calling parameters against signatures
-        $matched    = false;
-        $sigCalled  = $request->getTypes();
-
-        $sigLength  = count($sigCalled);
-        $paramsLen  = count($params);
-        if ($sigLength < $paramsLen) {
-            for ($i = $sigLength; $i < $paramsLen; ++$i) {
-                $xmlRpcValue = Zend_XmlRpc_Value::getXmlRpcValue($params[$i]);
-                $sigCalled[] = $xmlRpcValue->getType();
-            }
-        }
-
-        $signatures = $info->getPrototypes();
-        foreach ($signatures as $signature) {
-            $sigParams = $signature->getParameters();
-            if ($sigCalled === $sigParams) {
-                $matched = true;
-                break;
-            }
-        }
-        if (!$matched) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Calling parameters do not match signature', 623);
-        }
-
-        $return        = $this->_dispatch($info, $params);
-        $responseClass = $this->getResponseClass();
-        return new $responseClass($return);
-    }
-
-    /**
-     * Register system methods with the server
-     *
-     * @return void
-     */
-    protected function _registerSystemMethods()
-    {
-        $system = new Zend_XmlRpc_Server_System($this);
-        $this->_system = $system;
-        $this->setClass($system, 'system');
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Server/Cache.php b/airtime_mvc/library/Zend/XmlRpc/Server/Cache.php
deleted file mode 100644
index 1b24d0d47..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Server/Cache.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/** Zend_Server_Cache */
-require_once 'Zend/Server/Cache.php';
-
-/**
- * Zend_XmlRpc_Server_Cache: cache Zend_XmlRpc_Server server definition
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Server_Cache extends Zend_Server_Cache
-{
-    /**
-     * @var array Skip system methods when caching XML-RPC server
-     */
-    protected static $_skipMethods = array(
-        'system.listMethods',
-        'system.methodHelp',
-        'system.methodSignature',
-        'system.multicall',
-    );
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Server/Exception.php b/airtime_mvc/library/Zend/XmlRpc/Server/Exception.php
deleted file mode 100644
index be8de4fe1..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Server/Exception.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Exception
- */
-require_once 'Zend/XmlRpc/Exception.php';
-
-
-/**
- * Zend_XmlRpc_Server_Exception
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Server_Exception extends Zend_XmlRpc_Exception
-{
-}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Server/Fault.php b/airtime_mvc/library/Zend/XmlRpc/Server/Fault.php
deleted file mode 100644
index b0e56e12b..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Server/Fault.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Fault.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Zend_XmlRpc_Fault
- */
-require_once 'Zend/XmlRpc/Fault.php';
-
-
-/**
- * XMLRPC Server Faults
- *
- * Encapsulates an exception for use as an XMLRPC fault response. Valid
- * exception classes that may be used for generating the fault code and fault
- * string can be attached using {@link attachFaultException()}; all others use a
- * generic '404 Unknown error' response.
- *
- * You may also attach fault observers, which would allow you to monitor
- * particular fault cases; this is done via {@link attachObserver()}. Observers
- * need only implement a static 'observe' method.
- *
- * To allow method chaining, you may use the {@link getInstance()} factory
- * to instantiate a Zend_XmlRpc_Server_Fault.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Server_Fault extends Zend_XmlRpc_Fault
-{
-    /**
-     * @var Exception
-     */
-    protected $_exception;
-
-    /**
-     * @var array Array of exception classes that may define xmlrpc faults
-     */
-    protected static $_faultExceptionClasses = array('Zend_XmlRpc_Server_Exception' => true);
-
-    /**
-     * @var array Array of fault observers
-     */
-    protected static $_observers = array();
-
-    /**
-     * Constructor
-     *
-     * @param Exception $e
-     * @return Zend_XmlRpc_Server_Fault
-     */
-    public function __construct(Exception $e)
-    {
-        $this->_exception = $e;
-        $code             = 404;
-        $message          = 'Unknown error';
-        $exceptionClass   = get_class($e);
-
-        foreach (array_keys(self::$_faultExceptionClasses) as $class) {
-            if ($e instanceof $class) {
-                $code    = $e->getCode();
-                $message = $e->getMessage();
-                break;
-            }
-        }
-
-        parent::__construct($code, $message);
-
-        // Notify exception observers, if present
-        if (!empty(self::$_observers)) {
-            foreach (array_keys(self::$_observers) as $observer) {
-                call_user_func(array($observer, 'observe'), $this);
-            }
-        }
-    }
-
-    /**
-     * Return Zend_XmlRpc_Server_Fault instance
-     *
-     * @param Exception $e
-     * @return Zend_XmlRpc_Server_Fault
-     */
-    public static function getInstance(Exception $e)
-    {
-        return new self($e);
-    }
-
-    /**
-     * Attach valid exceptions that can be used to define xmlrpc faults
-     *
-     * @param string|array $classes Class name or array of class names
-     * @return void
-     */
-    public static function attachFaultException($classes)
-    {
-        if (!is_array($classes)) {
-            $classes = (array) $classes;
-        }
-
-        foreach ($classes as $class) {
-            if (is_string($class) && class_exists($class)) {
-                self::$_faultExceptionClasses[$class] = true;
-            }
-        }
-    }
-
-    /**
-     * Detach fault exception classes
-     *
-     * @param string|array $classes Class name or array of class names
-     * @return void
-     */
-    public static function detachFaultException($classes)
-    {
-        if (!is_array($classes)) {
-            $classes = (array) $classes;
-        }
-
-        foreach ($classes as $class) {
-            if (is_string($class) && isset(self::$_faultExceptionClasses[$class])) {
-                unset(self::$_faultExceptionClasses[$class]);
-            }
-        }
-    }
-
-    /**
-     * Attach an observer class
-     *
-     * Allows observation of xmlrpc server faults, thus allowing logging or mail
-     * notification of fault responses on the xmlrpc server.
-     *
-     * Expects a valid class name; that class must have a public static method
-     * 'observe' that accepts an exception as its sole argument.
-     *
-     * @param string $class
-     * @return boolean
-     */
-    public static function attachObserver($class)
-    {
-        if (!is_string($class)
-            || !class_exists($class)
-            || !is_callable(array($class, 'observe')))
-        {
-            return false;
-        }
-
-        if (!isset(self::$_observers[$class])) {
-            self::$_observers[$class] = true;
-        }
-
-        return true;
-    }
-
-    /**
-     * Detach an observer
-     *
-     * @param string $class
-     * @return boolean
-     */
-    public static function detachObserver($class)
-    {
-        if (!isset(self::$_observers[$class])) {
-            return false;
-        }
-
-        unset(self::$_observers[$class]);
-        return true;
-    }
-
-    /**
-     * Retrieve the exception
-     *
-     * @access public
-     * @return Exception
-     */
-    public function getException()
-    {
-        return $this->_exception;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Server/System.php b/airtime_mvc/library/Zend/XmlRpc/Server/System.php
deleted file mode 100644
index 6c01dde57..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Server/System.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: System.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * XML-RPC system.* methods
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Server
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Server_System
-{
-    /**
-     * @var Zend_XmlRpc_Server
-     */
-    protected $_server;
-
-    /**
-     * Constructor
-     *
-     * @param  Zend_XmlRpc_Server $server
-     * @return void
-     */
-    public function __construct(Zend_XmlRpc_Server $server)
-    {
-        $this->_server = $server;
-    }
-
-    /**
-     * List all available XMLRPC methods
-     *
-     * Returns an array of methods.
-     *
-     * @return array
-     */
-    public function listMethods()
-    {
-        $table = $this->_server->getDispatchTable()->getMethods();
-        return array_keys($table);
-    }
-
-    /**
-     * Display help message for an XMLRPC method
-     *
-     * @param string $method
-     * @return string
-     */
-    public function methodHelp($method)
-    {
-        $table = $this->_server->getDispatchTable();
-        if (!$table->hasMethod($method)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640);
-        }
-
-        return $table->getMethod($method)->getMethodHelp();
-    }
-
-    /**
-     * Return a method signature
-     *
-     * @param string $method
-     * @return array
-     */
-    public function methodSignature($method)
-    {
-        $table = $this->_server->getDispatchTable();
-        if (!$table->hasMethod($method)) {
-            require_once 'Zend/XmlRpc/Server/Exception.php';
-            throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640);
-        }
-        $method = $table->getMethod($method)->toArray();
-        return $method['prototypes'];
-    }
-
-    /**
-     * Multicall - boxcar feature of XML-RPC for calling multiple methods
-     * in a single request.
-     *
-     * Expects a an array of structs representing method calls, each element
-     * having the keys:
-     * - methodName
-     * - params
-     *
-     * Returns an array of responses, one for each method called, with the value
-     * returned by the method. If an error occurs for a given method, returns a
-     * struct with a fault response.
-     *
-     * @see http://www.xmlrpc.com/discuss/msgReader$1208
-     * @param  array $methods
-     * @return array
-     */
-    public function multicall($methods)
-    {
-        $responses = array();
-        foreach ($methods as $method) {
-            $fault = false;
-            if (!is_array($method)) {
-                $fault = $this->_server->fault('system.multicall expects each method to be a struct', 601);
-            } elseif (!isset($method['methodName'])) {
-                $fault = $this->_server->fault('Missing methodName: ' . var_export($methods, 1), 602);
-            } elseif (!isset($method['params'])) {
-                $fault = $this->_server->fault('Missing params', 603);
-            } elseif (!is_array($method['params'])) {
-                $fault = $this->_server->fault('Params must be an array', 604);
-            } else {
-                if ('system.multicall' == $method['methodName']) {
-                    // don't allow recursive calls to multicall
-                    $fault = $this->_server->fault('Recursive system.multicall forbidden', 605);
-                }
-            }
-
-            if (!$fault) {
-                try {
-                    $request = new Zend_XmlRpc_Request();
-                    $request->setMethod($method['methodName']);
-                    $request->setParams($method['params']);
-                    $response = $this->_server->handle($request);
-                    if ($response instanceof Zend_XmlRpc_Fault
-                        || $response->isFault()
-                    ) {
-                        $fault = $response;
-                    } else {
-                        $responses[] = $response->getReturnValue();
-                    }
-                } catch (Exception $e) {
-                    $fault = $this->_server->fault($e);
-                }
-            }
-
-            if ($fault) {
-                $responses[] = array(
-                    'faultCode'   => $fault->getCode(),
-                    'faultString' => $fault->getMessage()
-                );
-            }
-        }
-
-        return $responses;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value.php b/airtime_mvc/library/Zend/XmlRpc/Value.php
deleted file mode 100644
index f5833bd72..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Value.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-/**
- * Represent a native XML-RPC value entity, used as parameters for the methods
- * called by the Zend_XmlRpc_Client object and as the return value for those calls.
- *
- * This object as a very important static function Zend_XmlRpc_Value::getXmlRpcValue, this
- * function acts likes a factory for the Zend_XmlRpc_Value objects
- *
- * Using this function, users/Zend_XmlRpc_Client object can create the Zend_XmlRpc_Value objects
- * from PHP variables, XML string or by specifing the exact XML-RPC natvie type
- *
- * @package    Zend_XmlRpc
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_XmlRpc_Value
-{
-    /**
-     * The native XML-RPC representation of this object's value
-     *
-     * If the native type of this object is array or struct, this will be an array
-     * of Zend_XmlRpc_Value objects
-     */
-    protected $_value;
-
-    /**
-     * The native XML-RPC type of this object
-     * One of the XMLRPC_TYPE_* constants
-     */
-    protected $_type;
-
-    /**
-     * XML code representation of this object (will be calculated only once)
-     */
-    protected $_xml;
-
-    /**
-     * @var Zend_XmlRpc_Generator_GeneratorAbstract
-     */
-    protected static $_generator;
-
-    /**
-     * Specify that the XML-RPC native type will be auto detected from a PHP variable type
-     */
-    const AUTO_DETECT_TYPE = 'auto_detect';
-
-    /**
-     * Specify that the XML-RPC value will be parsed out from a given XML code
-     */
-    const XML_STRING = 'xml';
-
-    /**
-     * All the XML-RPC native types
-     */
-    const XMLRPC_TYPE_I4        = 'i4';
-    const XMLRPC_TYPE_INTEGER   = 'int';
-    const XMLRPC_TYPE_I8        = 'i8';
-    const XMLRPC_TYPE_APACHEI8  = 'ex:i8';
-    const XMLRPC_TYPE_DOUBLE    = 'double';
-    const XMLRPC_TYPE_BOOLEAN   = 'boolean';
-    const XMLRPC_TYPE_STRING    = 'string';
-    const XMLRPC_TYPE_DATETIME  = 'dateTime.iso8601';
-    const XMLRPC_TYPE_BASE64    = 'base64';
-    const XMLRPC_TYPE_ARRAY     = 'array';
-    const XMLRPC_TYPE_STRUCT    = 'struct';
-    const XMLRPC_TYPE_NIL       = 'nil';
-    const XMLRPC_TYPE_APACHENIL = 'ex:nil';
-
-    /**
-     * Get the native XML-RPC type (the type is one of the Zend_XmlRpc_Value::XMLRPC_TYPE_* constants)
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->_type;
-    }
-
-    /**
-     * Get XML generator instance
-     *
-     * @return Zend_XmlRpc_Generator_GeneratorAbstract
-     */
-    public static function getGenerator()
-    {
-        if (!self::$_generator) {
-            if (extension_loaded('xmlwriter')) {
-                require_once 'Zend/XmlRpc/Generator/XmlWriter.php';
-                self::$_generator = new Zend_XmlRpc_Generator_XmlWriter();
-            } else {
-                require_once 'Zend/XmlRpc/Generator/DomDocument.php';
-                self::$_generator = new Zend_XmlRpc_Generator_DomDocument();
-            }
-        }
-
-        return self::$_generator;
-    }
-
-    /**
-     * Sets XML generator instance
-     *
-     * @param Zend_XmlRpc_Generator_GeneratorAbstract $generator
-     * @return void
-     */
-    public static function setGenerator(Zend_XmlRpc_Generator_GeneratorAbstract $generator)
-    {
-        self::$_generator = $generator;
-    }
-
-    /**
-     * Changes the encoding of the generator
-     *
-     * @param string $encoding
-     * @return void
-     */
-    public static function setEncoding($encoding)
-    {
-        $generator = self::getGenerator();
-        $newGenerator = new $generator($encoding);
-        self::setGenerator($newGenerator);
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native value into a PHP variable
-     *
-     * @return mixed
-     */
-    abstract public function getValue();
-
-
-    /**
-     * Return the XML code that represent a native MXL-RPC value
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        if (!$this->_xml) {
-            $this->generateXml();
-        }
-        return $this->_xml;
-    }
-
-    /**
-     * Generate XML code that represent a native XML/RPC value
-     *
-     * @return void
-     */
-    public function generateXml()
-    {
-        if (!$this->_xml) {
-            $this->_generateXml();
-        }
-    }
-
-    /**
-     * Creates a Zend_XmlRpc_Value* object, representing a native XML-RPC value
-     * A XmlRpcValue object can be created in 3 ways:
-     * 1. Autodetecting the native type out of a PHP variable
-     *    (if $type is not set or equal to Zend_XmlRpc_Value::AUTO_DETECT_TYPE)
-     * 2. By specifing the native type ($type is one of the Zend_XmlRpc_Value::XMLRPC_TYPE_* constants)
-     * 3. From a XML string ($type is set to Zend_XmlRpc_Value::XML_STRING)
-     *
-     * By default the value type is autodetected according to it's PHP type
-     *
-     * @param mixed $value
-     * @param Zend_XmlRpc_Value::constant $type
-     *
-     * @return Zend_XmlRpc_Value
-     * @static
-     */
-    public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE)
-    {
-        switch ($type) {
-            case self::AUTO_DETECT_TYPE:
-                // Auto detect the XML-RPC native type from the PHP type of $value
-                return self::_phpVarToNativeXmlRpc($value);
-
-            case self::XML_STRING:
-                // Parse the XML string given in $value and get the XML-RPC value in it
-                return self::_xmlStringToNativeXmlRpc($value);
-
-            case self::XMLRPC_TYPE_I4:
-                // fall through to the next case
-            case self::XMLRPC_TYPE_INTEGER:
-                require_once 'Zend/XmlRpc/Value/Integer.php';
-                return new Zend_XmlRpc_Value_Integer($value);
-
-            case self::XMLRPC_TYPE_I8:
-                // fall through to the next case
-            case self::XMLRPC_TYPE_APACHEI8:
-                require_once 'Zend/XmlRpc/Value/BigInteger.php';
-                return new Zend_XmlRpc_Value_BigInteger($value);
-
-            case self::XMLRPC_TYPE_DOUBLE:
-                require_once 'Zend/XmlRpc/Value/Double.php';
-                return new Zend_XmlRpc_Value_Double($value);
-
-            case self::XMLRPC_TYPE_BOOLEAN:
-                require_once 'Zend/XmlRpc/Value/Boolean.php';
-                return new Zend_XmlRpc_Value_Boolean($value);
-
-            case self::XMLRPC_TYPE_STRING:
-                require_once 'Zend/XmlRpc/Value/String.php';
-                return new Zend_XmlRpc_Value_String($value);
-
-            case self::XMLRPC_TYPE_BASE64:
-                require_once 'Zend/XmlRpc/Value/Base64.php';
-                return new Zend_XmlRpc_Value_Base64($value);
-
-            case self::XMLRPC_TYPE_NIL:
-                // fall through to the next case
-            case self::XMLRPC_TYPE_APACHENIL:
-                require_once 'Zend/XmlRpc/Value/Nil.php';
-                return new Zend_XmlRpc_Value_Nil();
-
-            case self::XMLRPC_TYPE_DATETIME:
-                require_once 'Zend/XmlRpc/Value/DateTime.php';
-                return new Zend_XmlRpc_Value_DateTime($value);
-
-            case self::XMLRPC_TYPE_ARRAY:
-                require_once 'Zend/XmlRpc/Value/Array.php';
-                return new Zend_XmlRpc_Value_Array($value);
-
-            case self::XMLRPC_TYPE_STRUCT:
-                require_once 'Zend/XmlRpc/Value/Struct.php';
-                return new Zend_XmlRpc_Value_Struct($value);
-
-            default:
-                require_once 'Zend/XmlRpc/Value/Exception.php';
-                throw new Zend_XmlRpc_Value_Exception('Given type is not a '. __CLASS__ .' constant');
-        }
-    }
-
-
-    /**
-     * Transform a PHP native variable into a XML-RPC native value
-     *
-     * @param mixed $value The PHP variable for convertion
-     *
-     * @return Zend_XmlRpc_Value
-     * @static
-     */
-    protected static function _phpVarToNativeXmlRpc($value)
-    {
-        switch (gettype($value)) {
-            case 'object':
-                // Check to see if it's an XmlRpc value
-                if ($value instanceof Zend_XmlRpc_Value) {
-                    return $value;
-                }
-
-                if ($value instanceof Zend_Crypt_Math_BigInteger) {
-                    require_once 'Zend/XmlRpc/Value/BigInteger.php';
-                    return new Zend_XmlRpc_Value_BigInteger($value);
-                }
-
-                if ($value instanceof Zend_Date or $value instanceof DateTime) {
-                    require_once 'Zend/XmlRpc/Value/DateTime.php';
-                    return new Zend_XmlRpc_Value_DateTime($value);
-                }
-
-                // Otherwise, we convert the object into a struct
-                $value = get_object_vars($value);
-                // Break intentionally omitted
-            case 'array':
-                // Default native type for a PHP array (a simple numeric array) is 'array'
-                require_once 'Zend/XmlRpc/Value/Array.php';
-                $obj = 'Zend_XmlRpc_Value_Array';
-
-                // Determine if this is an associative array
-                if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) {
-                    require_once 'Zend/XmlRpc/Value/Struct.php';
-                    $obj = 'Zend_XmlRpc_Value_Struct';
-                }
-                return new $obj($value);
-
-            case 'integer':
-                require_once 'Zend/XmlRpc/Value/Integer.php';
-                return new Zend_XmlRpc_Value_Integer($value);
-
-            case 'double':
-                require_once 'Zend/XmlRpc/Value/Double.php';
-                return new Zend_XmlRpc_Value_Double($value);
-
-            case 'boolean':
-                require_once 'Zend/XmlRpc/Value/Boolean.php';
-                return new Zend_XmlRpc_Value_Boolean($value);
-
-            case 'NULL':
-            case 'null':
-                require_once 'Zend/XmlRpc/Value/Nil.php';
-                return new Zend_XmlRpc_Value_Nil();
-
-            case 'string':
-                // Fall through to the next case
-            default:
-                // If type isn't identified (or identified as string), it treated as string
-                require_once 'Zend/XmlRpc/Value/String.php';
-                return new Zend_XmlRpc_Value_String($value);
-        }
-    }
-
-
-    /**
-     * Transform an XML string into a XML-RPC native value
-     *
-     * @param string|SimpleXMLElement $xml A SimpleXMLElement object represent the XML string
-     *                                            It can be also a valid XML string for convertion
-     *
-     * @return Zend_XmlRpc_Value
-     * @static
-     */
-    protected static function _xmlStringToNativeXmlRpc($xml)
-    {
-        self::_createSimpleXMLElement($xml);
-
-        self::_extractTypeAndValue($xml, $type, $value);
-
-        switch ($type) {
-            // All valid and known XML-RPC native values
-            case self::XMLRPC_TYPE_I4:
-                // Fall through to the next case
-            case self::XMLRPC_TYPE_INTEGER:
-                require_once 'Zend/XmlRpc/Value/Integer.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Integer($value);
-                break;
-            case self::XMLRPC_TYPE_APACHEI8:
-                // Fall through to the next case
-            case self::XMLRPC_TYPE_I8:
-                require_once 'Zend/XmlRpc/Value/BigInteger.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_BigInteger($value);
-                break;
-            case self::XMLRPC_TYPE_DOUBLE:
-                require_once 'Zend/XmlRpc/Value/Double.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Double($value);
-                break;
-            case self::XMLRPC_TYPE_BOOLEAN:
-                require_once 'Zend/XmlRpc/Value/Boolean.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Boolean($value);
-                break;
-            case self::XMLRPC_TYPE_STRING:
-                require_once 'Zend/XmlRpc/Value/String.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_String($value);
-                break;
-            case self::XMLRPC_TYPE_DATETIME:  // The value should already be in a iso8601 format
-                require_once 'Zend/XmlRpc/Value/DateTime.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_DateTime($value);
-                break;
-            case self::XMLRPC_TYPE_BASE64:    // The value should already be base64 encoded
-                require_once 'Zend/XmlRpc/Value/Base64.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Base64($value, true);
-                break;
-            case self::XMLRPC_TYPE_NIL:
-                // Fall through to the next case
-            case self::XMLRPC_TYPE_APACHENIL:
-                // The value should always be NULL
-                require_once 'Zend/XmlRpc/Value/Nil.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Nil();
-                break;
-            case self::XMLRPC_TYPE_ARRAY:
-                // PHP 5.2.4 introduced a regression in how empty($xml->value)
-                // returns; need to look for the item specifically
-                $data = null;
-                foreach ($value->children() as $key => $value) {
-                    if ('data' == $key) {
-                        $data = $value;
-                        break;
-                    }
-                }
-
-                if (null === $data) {
-                    require_once 'Zend/XmlRpc/Value/Exception.php';
-                    throw new Zend_XmlRpc_Value_Exception('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag');
-                }
-                $values = array();
-                // Parse all the elements of the array from the XML string
-                // (simple xml element) to Zend_XmlRpc_Value objects
-                foreach ($data->value as $element) {
-                    $values[] = self::_xmlStringToNativeXmlRpc($element);
-                }
-                require_once 'Zend/XmlRpc/Value/Array.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Array($values);
-                break;
-            case self::XMLRPC_TYPE_STRUCT:
-                $values = array();
-                // Parse all the memebers of the struct from the XML string
-                // (simple xml element) to Zend_XmlRpc_Value objects
-                foreach ($value->member as $member) {
-                    // @todo? If a member doesn't have a <value> tag, we don't add it to the struct
-                    // Maybe we want to throw an exception here ?
-                    if (!isset($member->value) or !isset($member->name)) {
-                        continue;
-                        //throw new Zend_XmlRpc_Value_Exception('Member of the '. self::XMLRPC_TYPE_STRUCT .' XML-RPC native type must contain a VALUE tag');
-                    }
-                    $values[(string)$member->name] = self::_xmlStringToNativeXmlRpc($member->value);
-                }
-                require_once 'Zend/XmlRpc/Value/Struct.php';
-                $xmlrpcValue = new Zend_XmlRpc_Value_Struct($values);
-                break;
-            default:
-                require_once 'Zend/XmlRpc/Value/Exception.php';
-                throw new Zend_XmlRpc_Value_Exception('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type');
-                break;
-        }
-        $xmlrpcValue->_setXML($xml->asXML());
-
-        return $xmlrpcValue;
-    }
-
-    protected static function _createSimpleXMLElement(&$xml)
-    {
-        if ($xml instanceof SimpleXMLElement) {
-            return;
-        }
-
-        try {
-            $xml = new SimpleXMLElement($xml);
-        } catch (Exception $e) {
-            // The given string is not a valid XML
-            require_once 'Zend/XmlRpc/Value/Exception.php';
-            throw new Zend_XmlRpc_Value_Exception('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * Extract XML/RPC type and value from SimpleXMLElement object
-     *
-     * @param SimpleXMLElement $xml
-     * @param string &$type Type bind variable
-     * @param string &$value Value bind variable
-     * @return void
-     */
-    protected static function _extractTypeAndValue(SimpleXMLElement $xml, &$type, &$value)
-    {
-        list($type, $value) = each($xml);
-
-        if (!$type and $value === null) {
-            $namespaces = array('ex' => 'http://ws.apache.org/xmlrpc/namespaces/extensions');
-            foreach ($namespaces as $namespaceName => $namespaceUri) {
-                $namespaceXml = $xml->children($namespaceUri);
-                list($type, $value) = each($namespaceXml);
-                if ($type !== null) {
-                    $type = $namespaceName . ':' . $type;
-                    break;
-                }
-            }
-        }
-
-        // If no type was specified, the default is string
-        if (!$type) {
-            $type = self::XMLRPC_TYPE_STRING;
-        }
-    }
-
-    /**
-     * @param $xml
-     * @return void
-     */
-    protected function _setXML($xml)
-    {
-        $this->_xml = $this->getGenerator()->stripDeclaration($xml);
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Array.php b/airtime_mvc/library/Zend/XmlRpc/Value/Array.php
deleted file mode 100644
index 873930685..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Array.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Array.php 20208 2010-01-11 22:37:37Z lars $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Collection
- */
-require_once 'Zend/XmlRpc/Value/Collection.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection
-{
-    /**
-     * Set the value of an array native type
-     *
-     * @param array $value
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_ARRAY;
-        parent::__construct($value);
-    }
-
-
-    /**
-     * Generate the XML code that represent an array native MXL-RPC value
-     *
-     * @return void
-     */
-    protected function _generateXml()
-    {
-        $generator = $this->getGenerator();
-        $generator->openElement('value')
-                  ->openElement('array')
-                  ->openElement('data');
-
-        if (is_array($this->_value)) {
-            foreach ($this->_value as $val) {
-                $val->generateXml();
-            }
-        }
-        $generator->closeElement('data')
-                  ->closeElement('array')
-                  ->closeElement('value');
-
-        $this->_xml = (string)$generator;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Base64.php b/airtime_mvc/library/Zend/XmlRpc/Value/Base64.php
deleted file mode 100644
index 050900ca4..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Base64.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Base64.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of a base64 native type
-     * We keep this value in base64 encoding
-     *
-     * @param string $value
-     * @param bool $already_encoded If set, it means that the given string is already base64 encoded
-     */
-    public function __construct($value, $alreadyEncoded = false)
-    {
-        $this->_type = self::XMLRPC_TYPE_BASE64;
-
-        $value = (string)$value;    // Make sure this value is string
-        if (!$alreadyEncoded) {
-            $value = base64_encode($value);     // We encode it in base64
-        }
-        $this->_value = $value;
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native base64 value into a PHP string
-     * We return this value decoded (a normal string)
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return base64_decode($this->_value);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/BigInteger.php b/airtime_mvc/library/Zend/XmlRpc/Value/BigInteger.php
deleted file mode 100644
index 3db442d8d..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/BigInteger.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Integer.php 17753 2009-08-22 16:09:37Z lars $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Integer
- */
-require_once 'Zend/XmlRpc/Value/Integer.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer
-{
-    /**
-     * @var Zend_Crypt_Math_BigInteger
-     */
-    protected $_integer;
-
-    /**
-     * @param mixed $value
-     */
-    public function __construct($value)
-    {
-        require_once 'Zend/Crypt/Math/BigInteger.php';
-        $this->_integer = new Zend_Crypt_Math_BigInteger();
-        $this->_value = $this->_integer->init($this->_value);
-
-        $this->_type = self::XMLRPC_TYPE_I8;
-    }
-
-    /**
-     * Return bigint value object
-     *
-     * @return Zend_Crypt_Math_BigInteger
-     */
-    public function getValue()
-    {
-        return $this->_integer;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Boolean.php b/airtime_mvc/library/Zend/XmlRpc/Value/Boolean.php
deleted file mode 100644
index e73d940d1..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Boolean.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of a boolean native type
-     * We hold the boolean type as an integer (0 or 1)
-     *
-     * @param bool $value
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_BOOLEAN;
-        // Make sure the value is boolean and then convert it into a integer
-        // The double convertion is because a bug in the ZendOptimizer in PHP version 5.0.4
-        $this->_value = (int)(bool)$value;
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native boolean value into a PHP boolean
-     *
-     * @return bool
-     */
-    public function getValue()
-    {
-        return (bool)$this->_value;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Collection.php b/airtime_mvc/library/Zend/XmlRpc/Value/Collection.php
deleted file mode 100644
index 51a204470..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Collection.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_XmlRpc_Value_Collection extends Zend_XmlRpc_Value
-{
-
-    /**
-     * Set the value of a collection type (array and struct) native types
-     *
-     * @param array $value
-     */
-    public function __construct($value)
-    {
-        $values = (array)$value;   // Make sure that the value is an array
-        foreach ($values as $key => $value) {
-            // If the elements of the given array are not Zend_XmlRpc_Value objects,
-            // we need to convert them as such (using auto-detection from PHP value)
-            if (!$value instanceof parent) {
-                $value = self::getXmlRpcValue($value, self::AUTO_DETECT_TYPE);
-            }
-            $this->_value[$key] = $value;
-        }
-    }
-
-
-    /**
-     * Return the value of this object, convert the XML-RPC native collection values into a PHP array
-     *
-     * @return arary
-     */
-    public function getValue()
-    {
-        $values = (array)$this->_value;
-        foreach ($values as $key => $value) {
-            /* @var $value Zend_XmlRpc_Value */
-            $values[$key] = $value->getValue();
-        }
-        return $values;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/DateTime.php b/airtime_mvc/library/Zend/XmlRpc/Value/DateTime.php
deleted file mode 100644
index 55ddf8a23..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/DateTime.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: DateTime.php 20278 2010-01-14 14:48:59Z ralph $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar
-{
-    /**
-     * PHP compatible format string for XML/RPC datetime values
-     *
-     * @var string
-     */
-    protected $_phpFormatString = 'Ymd\\TH:i:s';
-
-    /**
-     * ISO compatible format string for XML/RPC datetime values
-     *
-     * @var string
-     */
-    protected $_isoFormatString = 'YYYYMMddTHH:mm:ss';
-
-    /**
-     * Set the value of a dateTime.iso8601 native type
-     *
-     * The value is in iso8601 format, minus any timezone information or dashes
-     *
-     * @param mixed $value Integer of the unix timestamp or any string that can be parsed
-     *                     to a unix timestamp using the PHP strtotime() function
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_DATETIME;
-
-        if ($value instanceof Zend_Date) {
-            $this->_value = $value->toString($this->_isoFormatString);
-        } elseif ($value instanceof DateTime) {
-            $this->_value = $value->format($this->_phpFormatString);
-        } elseif (is_numeric($value)) { // The value is numeric, we make sure it is an integer
-            $this->_value = date($this->_phpFormatString, (int)$value);
-        } else {
-            $timestamp = strtotime($value);
-            if ($timestamp === false || $timestamp == -1) { // cannot convert the value to a timestamp
-                require_once 'Zend/XmlRpc/Value/Exception.php';
-                throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp');
-            }
-
-            $this->_value = date($this->_phpFormatString, $timestamp); // Convert the timestamp to iso8601 format
-        }
-    }
-
-    /**
-     * Return the value of this object as iso8601 dateTime value
-     *
-     * @return int As a Unix timestamp
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Double.php b/airtime_mvc/library/Zend/XmlRpc/Value/Double.php
deleted file mode 100644
index 940e76631..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Double.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Double.php 21159 2010-02-23 17:56:52Z matthew $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of a double native type
-     *
-     * @param float $value
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_DOUBLE;
-        $precision = (int)ini_get('precision');
-        $formatString = '%1.' . $precision . 'F';
-        $this->_value = rtrim(sprintf($formatString, (float)$value), '0');
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native double value into a PHP float
-     *
-     * @return float
-     */
-    public function getValue()
-    {
-        return (float)$this->_value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Exception.php b/airtime_mvc/library/Zend/XmlRpc/Value/Exception.php
deleted file mode 100644
index 37ae0d8bf..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Exception.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Exception
- */
-require_once 'Zend/XmlRpc/Exception.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Exception extends Zend_XmlRpc_Exception
-{}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Integer.php b/airtime_mvc/library/Zend/XmlRpc/Value/Integer.php
deleted file mode 100644
index 230810008..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Integer.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Integer.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of an integer native type
-     *
-     * @param int $value
-     */
-    public function __construct($value)
-    {
-        if ($value > PHP_INT_MAX) {
-            require_once 'Zend/XmlRpc/Value/Exception.php';
-            throw new Zend_XmlRpc_Value_Exception('Overlong integer given');
-        }
-
-        $this->_type = self::XMLRPC_TYPE_INTEGER;
-        $this->_value = (int)$value;    // Make sure this value is integer
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native integer value into a PHP integer
-     *
-     * @return int
-     */
-    public function getValue()
-    {
-        return $this->_value;
-    }
-}
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Nil.php b/airtime_mvc/library/Zend/XmlRpc/Value/Nil.php
deleted file mode 100644
index 2e5ce92e9..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Nil.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Nil.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Nil extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of a nil native type
-     *
-     */
-    public function __construct()
-    {
-        $this->_type = self::XMLRPC_TYPE_NIL;
-        $this->_value = null;
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native nill value into a PHP NULL
-     *
-     * @return null
-     */
-    public function getValue()
-    {
-        return null;
-    }
-}
-
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Scalar.php b/airtime_mvc/library/Zend/XmlRpc/Value/Scalar.php
deleted file mode 100644
index 62a72b46d..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Scalar.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Scalar.php 20208 2010-01-11 22:37:37Z lars $
- */
-
-
-/**
- * Zend_XmlRpc_Value
- */
-require_once 'Zend/XmlRpc/Value.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value
-{
-    /**
-     * Generate the XML code that represent a scalar native MXL-RPC value
-     *
-     * @return void
-     */
-    protected function _generateXml()
-    {
-        $generator = $this->getGenerator();
-
-        $generator->openElement('value')
-                  ->openElement($this->_type, $this->_value)
-                  ->closeElement($this->_type)
-                  ->closeElement('value');
-
-        $this->_xml = (string)$generator;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/String.php b/airtime_mvc/library/Zend/XmlRpc/Value/String.php
deleted file mode 100644
index 83e8c5ac5..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/String.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Scalar
- */
-require_once 'Zend/XmlRpc/Value/Scalar.php';
-
-/**
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar
-{
-
-    /**
-     * Set the value of a string native type
-     *
-     * @param string $value
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_STRING;
-
-        // Make sure this value is string and all XML characters are encoded
-        $this->_value = (string)$value;
-    }
-
-    /**
-     * Return the value of this object, convert the XML-RPC native string value into a PHP string
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return (string)$this->_value;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/library/Zend/XmlRpc/Value/Struct.php b/airtime_mvc/library/Zend/XmlRpc/Value/Struct.php
deleted file mode 100644
index 6c54cba83..000000000
--- a/airtime_mvc/library/Zend/XmlRpc/Value/Struct.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id: Struct.php 20208 2010-01-11 22:37:37Z lars $
- */
-
-
-/**
- * Zend_XmlRpc_Value_Collection
- */
-require_once 'Zend/XmlRpc/Value/Collection.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection
-{
-    /**
-     * Set the value of an struct native type
-     *
-     * @param array $value
-     */
-    public function __construct($value)
-    {
-        $this->_type = self::XMLRPC_TYPE_STRUCT;
-        parent::__construct($value);
-    }
-
-
-    /**
-     * Generate the XML code that represent struct native MXL-RPC value
-     *
-     * @return void
-     */
-    protected function _generateXML()
-    {
-        $generator = $this->getGenerator();
-        $generator->openElement('value')
-                  ->openElement('struct');
-
-        if (is_array($this->_value)) {
-            foreach ($this->_value as $name => $val) {
-                /* @var $val Zend_XmlRpc_Value */
-                $generator->openElement('member')
-                          ->openElement('name', $name)
-                          ->closeElement('name');
-                $val->generateXml();
-                $generator->closeElement('member');
-            }
-        }
-        $generator->closeElement('struct')
-                  ->closeElement('value');
-        $this->_xml = (string)$generator;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index cf8059bb9..5a4edab44 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -21,9 +21,6 @@ set_include_path(implode(PATH_SEPARATOR, array(
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
 
-//Pear classes.
-set_include_path(APPLICATION_PATH . '/../library/pear' . PATH_SEPARATOR . get_include_path());
-
 //Controller plugins.
 set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
 
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index 211ff24c6..33421fa93 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -45,6 +45,18 @@ libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 #of Debian, where these packages are unauthorized)
 apt-get -y --force-yes install libmp3lame-dev lame icecast2
 
+
+#Debian Squeeze only has zendframework package. Newer versions of Ubuntu have zend-framework package.
+#Ubuntu Lucid has both zendframework and zend-framework. Difference appears to be that zendframework is for
+#1.10 and zend-framework is 1.11 
+if [ "$dist" = "Debian" ]; then
+    apt-get -y install zendframework
+else
+    apt-get -y install zend-framework
+fi
+
+
+
 if [ "$?" -ne "0" ]; then
    echo ""
    echo "There was a problem with apt-get. Please check the above error and try again."
diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx
index 3c129e350..f11b0e7e0 100755
--- a/install_full/ubuntu/airtime-full-install-nginx
+++ b/install_full/ubuntu/airtime-full-install-nginx
@@ -48,6 +48,16 @@ libvorbis-ocaml libpulse0 vorbis-tools lsb-release php-db zendframework
 #of Debian, where these packages are unauthorized)
 apt-get -y --force-yes install libmp3lame-dev lame icecast2
 
+#Debian Squeeze only has zendframework package. Newer versions of Ubuntu have zend-framework package.
+#Ubuntu Lucid has both zendframework and zend-framework. Difference appears to be that zendframework is for
+#1.10 and zend-framework is 1.11
+if [ "$dist" = "Debian" ]; then
+    apt-get -y install zendframework
+else
+    apt-get -y install zend-framework
+fi
+
+
 if [ "$?" -ne "0" ]; then
    echo ""
    echo "There was a problem with apt-get. Please check the above error and try again."
diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index 6fa293271..a6d6b8c25 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -51,8 +51,7 @@ $CC_CONFIG = array(
     'soundcloud-connection-retries' => $values['soundcloud']['connection_retries'],
     'soundcloud-connection-wait' => $values['soundcloud']['time_between_retries'],
 
-    "rootDir" => __DIR__."/../..",
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
+    "rootDir" => __DIR__."/../.."
 );
 
 AirtimeInstall::DbConnect(true);
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 4ecbed071..a657c2524 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -34,8 +34,7 @@ $CC_CONFIG = array(
     'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
-    "rootDir" => __DIR__."/../..",
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
+    "rootDir" => __DIR__."/../.."
 );
 
 $CC_CONFIG = LoadConfig($CC_CONFIG);
@@ -64,11 +63,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id';
 $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id';
 $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
-// Add libs to the PHP path
-$old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
-					.PATH_SEPARATOR.$old_include_path);
-
 function LoadConfig($CC_CONFIG) {
     $values = parse_ini_file(CONF_FILE_AIRTIME, true);
 
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index fa5e9541e..42cde5c69 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -35,8 +35,7 @@ $CC_CONFIG = array(
     'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
-    "rootDir" => __DIR__."/../..",
-    'zendPath'      =>  dirname(__FILE__).'/../../library/Zend'
+    "rootDir" => __DIR__."/../.."
 );
 
 $CC_CONFIG = LoadConfig($CC_CONFIG);
@@ -65,11 +64,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id';
 $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id';
 $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
-// Add libs to the PHP path
-$old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
-					.PATH_SEPARATOR.$old_include_path);
-
 function LoadConfig($CC_CONFIG) {
     $values = parse_ini_file(CONF_FILE_AIRTIME, true);
 
diff --git a/install_minimal/upgrades/airtime-1.9.0/conf.php b/install_minimal/upgrades/airtime-1.9.0/conf.php
index 51b884511..0a75ef1b6 100644
--- a/install_minimal/upgrades/airtime-1.9.0/conf.php
+++ b/install_minimal/upgrades/airtime-1.9.0/conf.php
@@ -17,8 +17,7 @@ $CC_CONFIG = array(
     'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
     'soundcloud-client-secret' => 'pZ7beWmF06epXLHVUP1ufOg2oEnIt9XhE8l8xt0bBs',
 
-    "rootDir" => __DIR__."/../..",
-    'zendPath'      =>  dirname(__FILE__).'/../../../airtime_mvc/library/Zend'
+    "rootDir" => __DIR__."/../.."
 );
 
 $CC_CONFIG = Config::loadConfig($CC_CONFIG);
@@ -47,11 +46,6 @@ $CC_CONFIG['permSequence'] = $CC_CONFIG['permTable'].'_id';
 $CC_CONFIG['subjSequence'] = $CC_CONFIG['subjTable'].'_id';
 $CC_CONFIG['smembSequence'] = $CC_CONFIG['smembTable'].'_id';
 
-// Add libs to the PHP path
-$old_include_path = get_include_path();
-set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['zendPath']
-					.PATH_SEPARATOR.$old_include_path);
-
 class Config {
     public static function loadConfig($CC_CONFIG) {
         $values = parse_ini_file('/etc/airtime/airtime.conf', true);

From 22a53dd250ed8d7ced258a5f219d5a92ffa4a1cd Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Tue, 7 Feb 2012 13:37:27 -0500
Subject: [PATCH 28/29] CC-3282: Issue with file causing media-monitor to crash
 (Spotted on Resonance FM)

- removed part of the code where it tries to handle cp1252 which ended up
causing more issues

Conflicts:

	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
---
 .../airtimefilemonitor/airtimemetadata.py     | 50 ++-----------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
index dd9b481af..ad5047380 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
@@ -49,36 +49,6 @@ class AirtimeMetadata:
         "isrc": "MDATA_KEY_ISRC",\
         "copyright": "MDATA_KEY_COPYRIGHT",\
         }
-        
-        self.cp1252toUnicode = {
-        u"\x80": u"\u20AC", # EURO SIGN
-        u"\x82": u"\u201A", # SINGLE LOW-9 QUOTATION MARK
-        u"\x83": u"\u0192", # LATIN SMALL LETTER F WITH HOOK
-        u"\x84": u"\u201E", # DOUBLE LOW-9 QUOTATION MARK
-        u"\x85": u"\u2026", # HORIZONTAL ELLIPSIS
-        u"\x86": u"\u2020", # DAGGER
-        u"\x87": u"\u2021", # DOUBLE DAGGER
-        u"\x88": u"\u02C6", # MODIFIER LETTER CIRCUMFLEX ACCENT
-        u"\x89": u"\u2030", # PER MILLE SIGN
-        u"\x8A": u"\u0160", # LATIN CAPITAL LETTER S WITH CARON
-        u"\x8B": u"\u2039", # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-        u"\x8C": u"\u0152", # LATIN CAPITAL LIGATURE OE
-        u"\x8E": u"\u017D", # LATIN CAPITAL LETTER Z WITH CARON
-        u"\x91": u"\u2018", # LEFT SINGLE QUOTATION MARK
-        u"\x92": u"\u2019", # RIGHT SINGLE QUOTATION MARK
-        u"\x93": u"\u201C", # LEFT DOUBLE QUOTATION MARK
-        u"\x94": u"\u201D", # RIGHT DOUBLE QUOTATION MARK
-        u"\x95": u"\u2022", # BULLET
-        u"\x96": u"\u2013", # EN DASH
-        u"\x97": u"\u2014", # EM DASH
-        u"\x98": u"\u02DC", # SMALL TILDE
-        u"\x99": u"\u2122", # TRADE MARK SIGN
-        u"\x9A": u"\u0161", # LATIN SMALL LETTER S WITH CARON
-        u"\x9B": u"\u203A", # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-        u"\x9C": u"\u0153", # LATIN SMALL LIGATURE OE
-        u"\x9E": u"\u017E", # LATIN SMALL LETTER Z WITH CARON
-        u"\x9F": u"\u0178", # LATIN CAPITAL LETTER Y WITH DIAERESIS
-        }
 
         self.logger = logging.getLogger()
 
@@ -164,21 +134,11 @@ class AirtimeMetadata:
         #check if file has any metadata
         if file_info is None:
             return None
-
-        for key in file_info.keys() :
-            if key in self.mutagen2airtime and len(file_info[key]) > 0:
-                info = file_info[key][0]
-                while True:
-                    temp = re.search(u"[\x80-\x9f]", info)
-                    if temp is not None:
-                        s = temp.group(0)
-                        replace = self.cp1252toUnicode.get(s)
-                        info = re.sub(s, replace, info)
-                    else:
-                        break
-                md[self.mutagen2airtime[key]] = info
-                    
-                    
+        #check if file has any metadata
+        if file_info is not None:
+            for key in file_info.keys() :
+                if key in self.mutagen2airtime and len(file_info[key]) > 0:
+                    md[self.mutagen2airtime[key]] = file_info[key][0]
         if 'MDATA_KEY_TITLE' not in md:
             #get rid of file extention from original name, name might have more than 1 '.' in it.
             #filepath = to_unicode(filepath)

From b08e7787d3c12f533ce74bee16f276a18b8686bc Mon Sep 17 00:00:00 2001
From: james <james@james-P35-DS3L.(none)>
Date: Tue, 7 Feb 2012 13:34:04 -0500
Subject: [PATCH 29/29] CC-3299: Media monitor should not change the owner of
 watched files

- bug fix
- better logging
---
 .../media-monitor/airtimefilemonitor/airtimeprocessevent.py  | 5 ++++-
 .../media-monitor/airtimefilemonitor/mediamonitorcommon.py   | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
index cfd605cf2..4fbc210cd 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
@@ -294,6 +294,9 @@ class AirtimeProcessEvent(ProcessEvent):
         except socket.timeout:
             pass
         except Exception, e:
-            self.logger.info("%s", e)
+            import traceback
+            top = traceback.format_exc()
+            self.logger.error('Exception: %s', e)
+            self.logger.error("traceback: %s", top)
             time.sleep(3)
 
diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index 76cfaed98..c9c3e2daf 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -51,8 +51,8 @@ class MediaMonitorCommon:
         gid = grp.getgrnam(egid)[2]
         
         #drop root permissions and become "nobody"
-        os.seteuid(uid)
         os.setegid(gid)
+        os.seteuid(uid)
 
         try:
             open(filepath)
@@ -66,6 +66,7 @@ class MediaMonitorCommon:
         finally:
             #reset effective user to root
             os.seteuid(0)
+            os.setegid(0)
 
         return readable
 
@@ -74,7 +75,7 @@ class MediaMonitorCommon:
         try:
             omask = os.umask(0)
             
-            if not has_correct_permissions(item, 'www-data', 'www-data'):
+            if not self.has_correct_permissions(item, 'www-data', 'www-data'):
                 uid = pwd.getpwnam('www-data')[2]
                 gid = grp.getgrnam('www-data')[2]